10528 files changed, 889281 insertions, 521265 deletions

diff --git a/.dir-locals.el b/.dir-locals.el
new file mode 100644
index 0000000000..8f4b96445c
--- /dev/null
+++ b/.dir-locals.el
@@ -0,0 +1,39 @@
+;; Copyright (c) 2018 Urabe, Shyouhei.  All rights reserved.
+;;
+;; This file is a part of  the programming language Ruby.  Permission is hereby
+;; granted, to either  redistribute and/or modify this file,  provided that the
+;; conditions mentioned  in the  file COPYING  are met.   Consult the  file for
+;; details.
+
+((nil .
+     ((indent-tabs-mode . nil)
+      (require-final-newline . t)
+      (tab-width . 8)
+      (show-trailing-whitespace . t)
+      (whitespace-line-column . 80))) ;; See also [Misc #12277]
+
+ ;; (bat-mode . ((buffer-file-coding-system . utf-8-dos)))
+
+ (ruby-mode . ((ruby-indent-level . 2)))
+
+ (rdoc-mode . ((fill-column . 74)))
+
+ (yaml-mode . ((yaml-indent-offset . 2)))
+
+ (makefile-mode . ((indent-tabs-mode . t)))
+
+ (c-mode . ((c-file-style . "ruby")))
+
+ (c++-mode . ((c-file-style . "ruby")))
+
+ (change-log-mode .
+     ((buffer-file-coding-system . us-ascii)
+      (indent-tabs-mode . t)
+      (change-log-indent-text . 2)
+      (add-log-time-format . (lambda (&optional x y)
+        (let* ((time (or x (current-time)))
+	       (system-time-locale "C")
+	       (diff (+ (cadr time) 32400))
+	       (lo (% diff 65536))
+	       (hi (+ (car time) (/ diff 65536))))
+        (format-time-string "%a %b %e %H:%M:%S %Y" (list hi lo) t)))))))
diff --git a/.document b/.document
index fb27ba325d..8616203552 100644
--- a/.document
+++ b/.document
@@ -5,9 +5,22 @@
 
 # Process all the C source files
 *.c
+*.y
 
 # prelude
 prelude.rb
+rbconfig.rb
+array.rb
+ast.rb
+dir.rb
+gc.rb
+integer.rb
+io.rb
+kernel.rb
+pack.rb
+trace_point.rb
+warning.rb
+ractor.rb
 
 # the lib/ directory (which has its own .document file)
 lib
@@ -16,11 +29,18 @@ lib
 ext
 
 # rdoc files
-ChangeLog
-
-NEWS
+NEWS.md
 
 README.md
 README.ja.md
 
+COPYING
+COPYING.ja
+CONTRIBUTING.md
+
+LEGAL
+
+# win32/README.win32 linked from README.md
+win32
+
 doc
diff --git a/.editorconfig b/.editorconfig
index 67abf4b978..4633a7acae 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -2,15 +2,29 @@ root = true
 
 [*]
 end_of_line = lf
+indent_size = 4
+indent_style = space
 insert_final_newline = true
-trim_trailing_whitespace = true
 tab_width = 8
-indent_style = tab
-indent_size = 4
+trim_trailing_whitespace = true
 
-[**.bat]
+[*.bat]
 end_of_line = crlf
 
-[**.rb]
-indent_style = space
+[*.gemspec]
+indent_size = 2
+
+[*.rb]
+indent_size = 2
+
+[*.yml]
+indent_size = 2
+
+[{*[Mm]akefile*,*.mak,*.mk,depend}]
+indent_style = tab
+
+[enc/*]
+indent_size = 2
+
+[reg*.[ch]]
 indent_size = 2
diff --git a/.gdbinit b/.gdbinit
index 04680c17a9..49380951b8 100644
--- a/.gdbinit
+++ b/.gdbinit
@@ -1,3 +1,5 @@
+set startup-with-shell off
+
 define hook-run
   set $color_type = 0
   set $color_highlite = 0
@@ -63,7 +65,15 @@ define rp
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_OBJECT
     printf "%sT_OBJECT%s: ", $color_type, $color_end
-    print (struct RObject *)($arg0)
+    print ((struct RObject *)($arg0))->basic
+    if ($flags & ROBJECT_EMBED)
+      print/x *((VALUE*)((struct RObject*)($arg0))->as.ary) @ (ROBJECT_EMBED_LEN_MAX+0)
+    else
+      print (((struct RObject *)($arg0))->as.heap)
+      if (((struct RObject*)($arg0))->as.heap.numiv) > 0
+        print/x *(((struct RObject*)($arg0))->as.heap.ivptr) @ (((struct RObject*)($arg0))->as.heap.numiv)
+      end
+    end
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_CLASS
     printf "%sT_CLASS%s%s: ", $color_type, ($flags & RUBY_FL_SINGLETON) ? "*" : "", $color_end
@@ -89,14 +99,15 @@ define rp
     set $regsrc = ((struct RRegexp*)($arg0))->src
     set $rsflags = ((struct RBasic*)$regsrc)->flags
     printf "%sT_REGEXP%s: ", $color_type, $color_end
+    set $len = ($rsflags & RUBY_FL_USER1) ? \
+            ((struct RString*)$regsrc)->as.heap.len : \
+            (($rsflags & (RUBY_FL_USER2|RUBY_FL_USER3|RUBY_FL_USER4|RUBY_FL_USER5|RUBY_FL_USER6)) >> RUBY_FL_USHIFT+2)
     set print address off
-    output (char *)(($rsflags & RUBY_FL_USER1) ? \
+    output *(char *)(($rsflags & RUBY_FL_USER1) ? \
 	    ((struct RString*)$regsrc)->as.heap.ptr : \
-	    ((struct RString*)$regsrc)->as.ary)
+	    ((struct RString*)$regsrc)->as.ary) @ $len
     set print address on
-    printf " len:%ld ", ($rsflags & RUBY_FL_USER1) ? \
-            ((struct RString*)$regsrc)->as.heap.len : \
-            (($rsflags & (RUBY_FL_USER2|RUBY_FL_USER3|RUBY_FL_USER4|RUBY_FL_USER5|RUBY_FL_USER6)) >> RUBY_FL_USHIFT+2)
+    printf " len:%ld ", $len
     if $flags & RUBY_FL_USER6
       printf "(none) "
     end
@@ -117,7 +128,7 @@ define rp
       if ($len == 0)
 	printf "{(empty)} "
       else
-	output/x *((VALUE*)((struct RArray*)($arg0))->as.ary) @ $len
+	print/x *((VALUE*)((struct RArray*)($arg0))->as.ary) @ $len
 	printf " "
       end
     else
@@ -125,7 +136,7 @@ define rp
       printf "%sT_ARRAY%s: len=%ld ", $color_type, $color_end, $len
       if ($flags & RUBY_FL_USER2)
 	printf "(shared) shared="
-	output/x ((struct RArray*)($arg0))->as.heap.aux.shared
+	output/x ((struct RArray*)($arg0))->as.heap.aux.shared_root
 	printf " "
       else
 	printf "(ownership) capa=%ld ", ((struct RArray*)($arg0))->as.heap.aux.capa
@@ -133,7 +144,7 @@ define rp
       if ($len == 0)
 	printf "{(empty)} "
       else
-	output/x *((VALUE*)((struct RArray*)($arg0))->as.heap.ptr) @ $len
+	print/x *((VALUE*)((struct RArray*)($arg0))->as.heap.ptr) @ $len
 	printf " "
       end
     end
@@ -145,34 +156,27 @@ define rp
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_HASH
     printf "%sT_HASH%s: ", $color_type, $color_end,
-    if ((struct RHash *)($arg0))->ntbl
-      printf "len=%ld ", ((struct RHash *)($arg0))->ntbl->num_entries
+    if (((struct RHash *)($arg0))->basic.flags & RHASH_ST_TABLE_FLAG)
+      printf "st len=%ld ", ((struct RHash *)($arg0))->as.st->num_entries
+    else
+      printf "li len=%ld bound=%ld ", \
+        ((((struct RHash *)($arg0))->basic.flags & RHASH_AR_TABLE_SIZE_MASK) >> RHASH_AR_TABLE_SIZE_SHIFT), \
+        ((((struct RHash *)($arg0))->basic.flags & RHASH_AR_TABLE_BOUND_MASK) >> RHASH_AR_TABLE_BOUND_SHIFT)
     end
     print (struct RHash *)($arg0)
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_STRUCT
-    printf "%sT_STRUCT%s: len=%ld ", $color_type, $color_end, \
-      (($flags & (RUBY_FL_USER1|RUBY_FL_USER2)) ? \
+    set $len = (($flags & (RUBY_FL_USER1|RUBY_FL_USER2)) ? \
        ($flags & (RUBY_FL_USER1|RUBY_FL_USER2)) >> (RUBY_FL_USHIFT+1) : \
        ((struct RStruct *)($arg0))->as.heap.len)
+    printf "%sT_STRUCT%s: len=%ld ", $color_type, $color_end, $len
     print (struct RStruct *)($arg0)
-    x/xw (($flags & (RUBY_FL_USER1|RUBY_FL_USER2)) ? \
-          ((struct RStruct *)($arg0))->as.ary : \
-          ((struct RStruct *)($arg0))->as.heap.ptr)
+    output/x *(($flags & (RUBY_FL_USER1|RUBY_FL_USER2)) ? \
+              ((struct RStruct *)($arg0))->as.ary : \
+              ((struct RStruct *)($arg0))->as.heap.ptr) @ $len
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_BIGNUM
-    printf "%sT_BIGNUM%s: sign=%d len=%ld ", $color_type, $color_end, \
-      (($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)
+    rp_bignum $arg0
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_RATIONAL
     printf "%sT_RATIONAL%s: ", $color_type, $color_end
@@ -247,7 +251,7 @@ define rp
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_IMEMO
     printf "%sT_IMEMO%s(", $color_type, $color_end
-    output (enum imemo_type)(($flags>>RUBY_FL_USHIFT)&imemo_mask)
+    output (enum imemo_type)(($flags>>RUBY_FL_USHIFT)&RUBY_IMEMO_MASK)
     printf "): "
     rp_imemo $arg0
   else
@@ -261,6 +265,10 @@ define rp
     printf "%sT_ZOMBIE%s: ", $color_type, $color_end
     print (struct RData *)($arg0)
   else
+  if ($flags & RUBY_T_MASK) == RUBY_T_MOVED
+    printf "%sT_MOVED%s: ", $color_type, $color_end
+    print *(struct RMoved *)$arg0
+  else
     printf "%sunknown%s: ", $color_type, $color_end
     print (struct RBasic *)($arg0)
   end
@@ -296,6 +304,7 @@ define rp
   end
   end
   end
+  end
 end
 document rp
   Print a Ruby's VALUE.
@@ -327,6 +336,9 @@ define rp_id
   if $id == idLTLT
     printf "(:<<)\n"
   else
+  if $id == idGTGT
+    printf "(:>>)\n"
+  else
   if $id == idLE
     printf "(:<=)\n"
   else
@@ -354,6 +366,18 @@ define rp_id
   if $id == idASET
     printf "(:[]=)\n"
   else
+  if $id == idCOLON2
+    printf "(:'::')\n"
+  else
+  if $id == idANDOP
+    printf "(:&&)\n"
+  else
+  if $id == idOROP
+    printf "(:||)\n"
+  else
+  if $id == idANDDOT
+    printf "(:&.)\n"
+  else
     if $id <= tLAST_OP_ID
       printf "O"
     else
@@ -385,12 +409,13 @@ define rp_id
       end
     end
     printf "(%ld): ", $id
-    set $str = lookup_id_str($id)
-    if $str
-      rp_string $str
-    else
-      echo undef\n
-    end
+    print_id $id
+    echo \n
+  end
+  end
+  end
+  end
+  end
   end
   end
   end
@@ -413,16 +438,35 @@ document rp_id
   Print an ID.
 end
 
-define rp_string
+define output_string
   set $flags = ((struct RBasic*)($arg0))->flags
-  set print address off
-  output (char *)(($flags & RUBY_FL_USER1) ? \
+  set $len = ($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 $len > 0
+    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.ary) @ $len
+  else
+    output ""
+  end
+end
+
+define print_string
+  set $flags = ((struct RBasic*)($arg0))->flags
+  set $len = ($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 $len > 0
+    printf "%s", *(char *)(($flags & RUBY_FL_USER1) ? \
+	    ((struct RString*)($arg0))->as.heap.ptr : \
+	    ((struct RString*)($arg0))->as.ary) @ $len
+  end
+end
+
+define rp_string
+  output_string $arg0
+  printf " bytesize:%ld ", $len
   if !($flags & RUBY_FL_USER1)
     printf "(embed) "
   else
@@ -453,6 +497,51 @@ document rp_string
   Print the content of a String.
 end
 
+define rp_bignum
+  set $flags = ((struct RBignum*)($arg0))->basic.flags
+  set $len = (($flags & RUBY_FL_USER2) ? \
+       ($flags & (RUBY_FL_USER5|RUBY_FL_USER4|RUBY_FL_USER3)) >> (RUBY_FL_USHIFT+3) : \
+       ((struct RBignum*)($arg0))->as.heap.len)
+  printf "%sT_BIGNUM%s: sign=%d len=%ld ", $color_type, $color_end, \
+         (($flags & RUBY_FL_USER1) != 0), $len
+  if $flags & RUBY_FL_USER2
+    printf "(embed) "
+  end
+  print (struct RBignum *)($arg0)
+  set $ptr = (($flags & RUBY_FL_USER2) ? \
+              ((struct RBignum*)($arg0))->as.ary : \
+              ((struct RBignum*)($arg0))->as.heap.digits)
+  set $len = $len-1
+  printf "0x%x", $ptr[$len]
+  while $len > 0
+    set $len = $len-1
+    set $val = $ptr[$len]
+    set $w = sizeof($ptr[0])
+    printf "_"
+    if $w > 8
+      printf "%.32x", $val
+    else
+    if $w > 4
+      printf "%.16x", $val
+    else
+    if $w > 2
+      printf "%.8x", $val
+    else
+    if $w > 1
+      printf "%.4x", $val
+    else
+      printf "%.2x", $val
+    end
+    end
+    end
+    end
+  end
+  printf "\n"
+end
+document rp_bignum
+  Print the content of a Bignum.
+end
+
 define rp_class
   printf "(struct RClass *) %p", (void*)$arg0
   if ((struct RClass *)($arg0))->ptr.origin_ != $arg0
@@ -460,7 +549,7 @@ define rp_class
   end
   printf "\n"
   rb_classname $arg0
-  print *(struct RClass *)($arg0)
+  print/x *(struct RClass *)($arg0)
   print *((struct RClass *)($arg0))->ptr
 end
 document rp_class
@@ -468,7 +557,7 @@ document rp_class
 end
 
 define rp_imemo
-  set $flags = (enum imemo_type)((((struct RBasic *)($arg0))->flags >> RUBY_FL_USHIFT) & imemo_mask)
+  set $flags = (enum imemo_type)((((struct RBasic *)($arg0))->flags >> RUBY_FL_USHIFT) & RUBY_IMEMO_MASK)
   if $flags == imemo_cref
     printf "(rb_cref_t *) %p\n", (void*)$arg0
     print *(rb_cref_t *)$arg0
@@ -620,12 +709,6 @@ define nd_cval
   rp ($arg0).u3.value
 end
 
-
-define nd_cnt
-  printf "%su3.cnt%s: ", $color_highlite, $color_end
-  p ($arg0).u3.cnt
-end
-
 define nd_tbl
   printf "%su1.tbl%s: ", $color_highlite, $color_end
   p ($arg0).u1.tbl
@@ -664,12 +747,6 @@ define nd_lit
   rp ($arg0).u1.value
 end
 
-
-define nd_frml
-  printf "%su1.node%s: ", $color_highlite, $color_end
-  rp ($arg0).u1.node
-end
-
 define nd_rest
   printf "%su2.argc%s: ", $color_highlite, $color_end
   p ($arg0).u2.argc
@@ -696,12 +773,6 @@ define nd_args
   rp ($arg0).u3.node
 end
 
-
-define nd_noex
-  printf "%su1.id%s: ", $color_highlite, $color_end
-  p ($arg0).u1.id
-end
-
 define nd_defn
   printf "%su3.node%s: ", $color_highlite, $color_end
   rp ($arg0).u3.node
@@ -719,17 +790,6 @@ define nd_new
 end
 
 
-define nd_cfnc
-  printf "%su1.cfunc%s: ", $color_highlite, $color_end
-  p ($arg0).u1.cfunc
-end
-
-define nd_argc
-  printf "%su2.argc%s: ", $color_highlite, $color_end
-  p ($arg0).u2.argc
-end
-
-
 define nd_cname
   printf "%su1.id%s: ", $color_highlite, $color_end
   p ($arg0).u1.id
@@ -791,7 +851,7 @@ end
 
 define nd_tree
   set $buf = (struct RString *)rb_str_buf_new(0)
-  call dump_node((VALUE)($buf), rb_str_new(0, 0), 0, ($arg0))
+  call dump_node((VALUE)($buf), rb_str_tmp_new(0), 0, ($arg0))
   printf "%s\n", $buf->as.heap.ptr
 end
 
@@ -862,8 +922,7 @@ end
 
 define rb_classname
   # up to 128bit int
-  set $rb_classname_permanent = "0123456789ABCDEF"
-  set $rb_classname = classname($arg0, $rb_classname_permanent)
+  set $rb_classname = rb_mod_name($arg0)
   if $rb_classname != RUBY_Qnil
     rp $rb_classname
   else
@@ -912,7 +971,7 @@ define iseq
 end
 
 define rb_ps
-  rb_ps_vm ruby_current_vm
+  rb_ps_vm ruby_current_vm_ptr
 end
 document rb_ps
 Dump all threads and their callstacks
@@ -936,14 +995,291 @@ document rb_ps_vm
 Dump all threads in a (rb_vm_t*) and their callstacks
 end
 
+define print_lineno
+  set $cfp = $arg0
+  set $iseq = $cfp->iseq
+  set $pos = $cfp->pc - $iseq->body->iseq_encoded
+  if $pos != 0
+    set $pos = $pos - 1
+  end
+
+  set $index = 0
+  set $size = $iseq->body->insns_info.size
+  set $table = $iseq->body->insns_info.body
+  set $positions = $iseq->body->insns_info.positions
+  #printf "size: %d\n", $size
+  if $size == 0
+  else
+  if $size == 1
+    printf "%d", $table[0].line_no
+  else
+    if $positions
+      # get_insn_info_linear_search
+      set $index = 1
+      while $index < $size
+        #printf "table[%d]: position: %d, line: %d, pos: %d\n", $i, $positions[$i], $table[$i].line_no, $pos
+        if $positions[$index] > $pos
+          loop_break
+        end
+        set $index = $index + 1
+        if $positions[$index] == $pos
+          loop_break
+        end
+      end
+    else
+      # get_insn_info_succinct_bitvector
+      set $sd = $iseq->body->insns_info.succ_index_table
+      set $immediate_table_size = sizeof($sd->imm_part) / sizeof(uint64_t) * 9
+      if $pos < $immediate_table_size
+        set $i = $pos / 9
+        set $j = $pos % 9
+        set $index = ((int)($sd->imm_part[$i] >> ($j * 7))) & 0x7f
+      else
+        set $block_index = ($pos - $immediate_table_size) / 512
+        set $block = &$sd->succ_part[$block_index]
+        set $block_bit_index = ($pos - $immediate_table_size) % 512
+        set $small_block_index = $block_bit_index / 64
+        set $small_block_popcount = $small_block_index == 0 ? 0 : (((int)($block->small_block_ranks >> (($small_block_index - 1) * 9))) & 0x1ff)
+        set $x = $block->bits[$small_block_index] << (63 - $block_bit_index % 64)
+        set $x = ($x & 0x5555555555555555) + ($x >> 1 & 0x5555555555555555)
+        set $x = ($x & 0x3333333333333333) + ($x >> 2 & 0x3333333333333333)
+        set $x = ($x & 0x0707070707070707) + ($x >> 4 & 0x0707070707070707)
+        set $x = ($x & 0x001f001f001f001f) + ($x >> 8 & 0x001f001f001f001f)
+        set $x = ($x & 0x0000003f0000003f) + ($x >>16 & 0x0000003f0000003f)
+        set $popcnt = ($x & 0x7f) + ($x >>32 & 0x7f)
+        set $index = $block->rank + $small_block_popcount + $popcnt
+      end
+    end
+    printf "%d", $table[$index-1].line_no
+  end
+  end
+end
+
+define check_method_entry
+  set $imemo = (struct RBasic *)$arg0
+  if $imemo != RUBY_Qfalse
+    set $type = ($imemo->flags >> 12) & 0x07
+    if $type == imemo_ment
+      set $me = (rb_callable_method_entry_t *)$imemo
+    else
+    if $type == imemo_svar
+      set $imemo = ((struct vm_svar *)$imemo)->cref_or_me
+      check_method_entry $imemo
+    end
+    end
+  end
+end
+
+define print_id
+  set $id = $arg0
+  # rb_id_to_serial
+  if $id > tLAST_OP_ID
+    set $serial = (rb_id_serial_t)($id >> RUBY_ID_SCOPE_SHIFT)
+  else
+    set $serial = (rb_id_serial_t)$id
+  end
+  if $serial && $serial <= ruby_global_symbols.last_id
+    set $idx = $serial / ID_ENTRY_UNIT
+    set $ids = (struct RArray *)ruby_global_symbols.ids
+    set $flags = $ids->basic.flags
+    if ($flags & RUBY_FL_USER1)
+      set $idsptr = $ids->as.ary
+      set $idslen = (($flags & (RUBY_FL_USER3|RUBY_FL_USER4)) >> (RUBY_FL_USHIFT+3))
+    else
+      set $idsptr = $ids->as.heap.ptr
+      set $idslen = $ids->as.heap.len
+    end
+    if $idx < $idslen
+      set $t = 0
+      set $ary = (struct RArray *)$idsptr[$idx]
+      if $ary != RUBY_Qnil
+        set $flags = $ary->basic.flags
+        if ($flags & RUBY_FL_USER1)
+          set $aryptr = $ary->as.ary
+          set $arylen = (($flags & (RUBY_FL_USER3|RUBY_FL_USER4)) >> (RUBY_FL_USHIFT+3))
+        else
+          set $aryptr = $ary->as.heap.ptr
+          set $arylen = $ary->as.heap.len
+        end
+        set $result = $aryptr[($serial % ID_ENTRY_UNIT) * ID_ENTRY_SIZE + $t]
+	if $result != RUBY_Qnil
+          print_string $result
+	else
+	  echo undef
+	end
+      end
+    end
+  end
+end
+
+define print_pathobj
+  set $flags = ((struct RBasic*)($arg0))->flags
+  if ($flags & RUBY_T_MASK) == RUBY_T_STRING
+    print_string $arg0
+  end
+  if ($flags & RUBY_T_MASK) == RUBY_T_ARRAY
+    if $flags & RUBY_FL_USER1
+      set $str = ((struct RArray*)($arg0))->as.ary[0]
+    else
+      set $str = ((struct RArray*)($arg0))->as.heap.ptr[0]
+    end
+    print_string $str
+  end
+end
+
 define rb_ps_thread
   set $ps_thread = (struct RTypedData*)$arg0
   set $ps_thread_th = (rb_thread_t*)$ps_thread->data
   printf "* #<Thread:%p rb_thread_t:%p native_thread:%p>\n", \
     $ps_thread, $ps_thread_th, $ps_thread_th->thread_id
-end
-
-# Details: https://bugs.ruby-lang.org/projects/ruby-trunk/wiki/MachineInstructionsTraceWithGDB
+  set $cfp = $ps_thread_th->ec->cfp
+  set $cfpend = (rb_control_frame_t *)($ps_thread_th->ec->vm_stack + $ps_thread_th->ec->vm_stack_size)-1
+  while $cfp < $cfpend
+    if $cfp->iseq
+      if !((VALUE)$cfp->iseq & RUBY_IMMEDIATE_MASK) && (((imemo_ifunc << RUBY_FL_USHIFT) | RUBY_T_IMEMO)==$cfp->iseq->flags & ((RUBY_IMEMO_MASK << RUBY_FL_USHIFT) | RUBY_T_MASK))
+        printf "%d:ifunc ", $cfpend-$cfp
+        set print symbol-filename on
+        output/a $cfp->iseq.body
+        set print symbol-filename off
+        printf "\n"
+      else
+      if $cfp->pc
+        set $location = $cfp->iseq->body->location
+        printf "%d:", $cfpend-$cfp
+        print_pathobj $location.pathobj
+        printf ":"
+        print_lineno $cfp
+        printf ":in `"
+        print_string $location.label
+        printf "'\n"
+      else
+        printf "%d: ???.rb:???:in `???'\n", $cfpend-$cfp
+      end
+      end
+    else
+      # if VM_FRAME_TYPE($cfp->flag) == VM_FRAME_MAGIC_CFUNC
+      set $ep = $cfp->ep
+      if ($ep[0] & 0xffff0001) == 0x55550001
+        #define VM_ENV_FLAG_LOCAL 0x02
+        #define VM_ENV_PREV_EP(ep)   GC_GUARDED_PTR_REF(ep[VM_ENV_DATA_INDEX_SPECVAL])
+        set $me = 0
+        set $env_specval = $ep[-1]
+        set $env_me_cref = $ep[-2]
+        while ($env_specval & 0x02) != 0
+          check_method_entry $env_me_cref
+          if $me != 0
+            loop_break
+          end
+          set $ep = $ep[0]
+          set $env_specval = $ep[-1]
+          set $env_me_cref = $ep[-2]
+        end
+        if $me == 0
+          check_method_entry $env_me_cref
+        end
+        printf "%d:", $cfpend-$cfp
+        set print symbol-filename on
+        output/a $me->def->body.cfunc.func
+        set print symbol-filename off
+        set $mid = $me->def->original_id
+        printf ":in `"
+        print_id $mid
+        printf "'\n"
+      else
+        printf "%d:unknown_frame:???:in `???'\n", $cfpend-$cfp
+      end
+    end
+    set $cfp = $cfp + 1
+  end
+end
+
+define rb_count_objects
+  set $objspace = ruby_current_vm_ptr->objspace
+  set $counts_00 = 0
+  set $counts_01 = 0
+  set $counts_02 = 0
+  set $counts_03 = 0
+  set $counts_04 = 0
+  set $counts_05 = 0
+  set $counts_06 = 0
+  set $counts_07 = 0
+  set $counts_08 = 0
+  set $counts_09 = 0
+  set $counts_0a = 0
+  set $counts_0b = 0
+  set $counts_0c = 0
+  set $counts_0d = 0
+  set $counts_0e = 0
+  set $counts_0f = 0
+  set $counts_10 = 0
+  set $counts_11 = 0
+  set $counts_12 = 0
+  set $counts_13 = 0
+  set $counts_14 = 0
+  set $counts_15 = 0
+  set $counts_16 = 0
+  set $counts_17 = 0
+  set $counts_18 = 0
+  set $counts_19 = 0
+  set $counts_1a = 0
+  set $counts_1b = 0
+  set $counts_1c = 0
+  set $counts_1d = 0
+  set $counts_1e = 0
+  set $counts_1f = 0
+  set $total = 0
+  set $i = 0
+  while $i < $objspace->heap_pages.allocated_pages
+    printf "\rcounting... %d/%d", $i, $objspace->heap_pages.allocated_pages
+    set $page = $objspace->heap_pages.sorted[$i]
+    set $p = $page->start
+    set $pend = $p + $page->total_slots
+    while $p < $pend
+      set $flags = $p->as.basic.flags & 0x1f
+      eval "set $counts_%02x = $counts_%02x + 1", $flags, $flags
+      set $p = $p + 1
+    end
+    set $total = $total + $page->total_slots
+    set $i = $i + 1
+  end
+  printf "\rTOTAL: %d, FREE: %d\n", $total, $counts_00
+  printf "T_OBJECT: %d\n", $counts_01
+  printf "T_CLASS: %d\n", $counts_02
+  printf "T_MODULE: %d\n", $counts_03
+  printf "T_FLOAT: %d\n", $counts_04
+  printf "T_STRING: %d\n", $counts_05
+  printf "T_REGEXP: %d\n", $counts_06
+  printf "T_ARRAY: %d\n", $counts_07
+  printf "T_HASH: %d\n", $counts_08
+  printf "T_STRUCT: %d\n", $counts_09
+  printf "T_BIGNUM: %d\n", $counts_0a
+  printf "T_FILE: %d\n", $counts_0b
+  printf "T_DATA: %d\n", $counts_0c
+  printf "T_MATCH: %d\n", $counts_0d
+  printf "T_COMPLEX: %d\n", $counts_0e
+  printf "T_RATIONAL: %d\n", $counts_0f
+  #printf "UNKNOWN_10: %d\n", $counts_10
+  printf "T_NIL: %d\n", $counts_11
+  printf "T_TRUE: %d\n", $counts_12
+  printf "T_FALSE: %d\n", $counts_13
+  printf "T_SYMBOL: %d\n", $counts_14
+  printf "T_FIXNUM: %d\n", $counts_15
+  printf "T_UNDEF: %d\n", $counts_16
+  #printf "UNKNOWN_17: %d\n", $counts_17
+  #printf "UNKNOWN_18: %d\n", $counts_18
+  #printf "UNKNOWN_19: %d\n", $counts_19
+  printf "T_IMEMO: %d\n", $counts_1a
+  printf "T_NODE: %d\n", $counts_1b
+  printf "T_ICLASS: %d\n", $counts_1c
+  printf "T_ZOMBIE: %d\n", $counts_1d
+  #printf "UNKNOWN_1E: %d\n", $counts_1e
+  printf "T_MASK: %d\n", $counts_1f
+end
+document rb_count_objects
+  Counts all objects grouped by type.
+end
+
+# Details: https://bugs.ruby-lang.org/projects/ruby-master/wiki/MachineInstructionsTraceWithGDB
 define trace_machine_instructions
   set logging on
   set height 0
@@ -982,3 +1318,34 @@ define dump_node
                         ((struct RString*)$str)->as.heap.ptr : \
                         ((struct RString*)$str)->as.ary)
 end
+
+define print_flags
+  printf "RUBY_FL_WB_PROTECTED: %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_WB_PROTECTED ? "1" : "0"
+  printf "RUBY_FL_PROMOTED0   : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_PROMOTED0 ? "1" : "0"
+  printf "RUBY_FL_PROMOTED1   : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_PROMOTED1 ? "1" : "0"
+  printf "RUBY_FL_FINALIZE    : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_FINALIZE ? "1" : "0"
+  printf "RUBY_FL_TAINT       : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_TAINT ? "1" : "0"
+  printf "RUBY_FL_UNTRUSTED   : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_UNTRUSTED ? "1" : "0"
+  printf "RUBY_FL_EXIVAR      : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_EXIVAR ? "1" : "0"
+  printf "RUBY_FL_FREEZE      : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_FREEZE ? "1" : "0"
+
+  printf "RUBY_FL_USER0       : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER0 ? "1" : "0"
+  printf "RUBY_FL_USER1       : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER1 ? "1" : "0"
+  printf "RUBY_FL_USER2       : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER2 ? "1" : "0"
+  printf "RUBY_FL_USER3       : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER3 ? "1" : "0"
+  printf "RUBY_FL_USER4       : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER4 ? "1" : "0"
+  printf "RUBY_FL_USER5       : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER5 ? "1" : "0"
+  printf "RUBY_FL_USER6       : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER6 ? "1" : "0"
+  printf "RUBY_FL_USER7       : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER7 ? "1" : "0"
+  printf "RUBY_FL_USER8       : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER8 ? "1" : "0"
+  printf "RUBY_FL_USER9       : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER9 ? "1" : "0"
+  printf "RUBY_FL_USER10      : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER10 ? "1" : "0"
+  printf "RUBY_FL_USER11      : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER11 ? "1" : "0"
+  printf "RUBY_FL_USER12      : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER12 ? "1" : "0"
+  printf "RUBY_FL_USER13      : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER13 ? "1" : "0"
+  printf "RUBY_FL_USER14      : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER14 ? "1" : "0"
+  printf "RUBY_FL_USER15      : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER15 ? "1" : "0"
+  printf "RUBY_FL_USER16      : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER16 ? "1" : "0"
+  printf "RUBY_FL_USER17      : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER17 ? "1" : "0"
+  printf "RUBY_FL_USER18      : %s\n", ((struct RBasic*)($arg0))->flags & RUBY_FL_USER18 ? "1" : "0"
+end
diff --git a/.gitattributes b/.gitattributes
index d9785fad00..d0c2d266b4 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,8 @@
 *.gemspec diff=ruby
 *.rb diff=ruby
+bin svn-properties=svn:ignore=ruby
 bin/* diff=ruby
 tool/update-deps diff=ruby
 tool/make-snapshot diff=ruby
+tool/format-release diff=ruby
+tool/leaked-globals diff=ruby
diff --git a/.github/SECURITY.md b/.github/SECURITY.md
new file mode 100644
index 0000000000..56baa29942
--- /dev/null
+++ b/.github/SECURITY.md
@@ -0,0 +1,9 @@
+# Security Policy
+
+## Supported Versions
+
+See <https://www.ruby-lang.org/en/downloads/branches/>.
+
+## Reporting a Vulnerability
+
+See <https://www.ruby-lang.org/en/security/>.
diff --git a/.github/codeql/codeql-config.yml b/.github/codeql/codeql-config.yml
new file mode 100644
index 0000000000..7196708b21
--- /dev/null
+++ b/.github/codeql/codeql-config.yml
@@ -0,0 +1,4 @@
+name: "CodeQL config for the Ruby language"
+
+paths-ignore:
+  - '/ext/**/*/conftest.c'
diff --git a/.github/workflows/baseruby.yml b/.github/workflows/baseruby.yml
new file mode 100644
index 0000000000..16d1e4a85a
--- /dev/null
+++ b/.github/workflows/baseruby.yml
@@ -0,0 +1,47 @@
+name: BASERUBY Check
+
+on: [push, pull_request]
+
+jobs:
+  baseruby:
+    name: BASERUBY
+    runs-on: ubuntu-20.04
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    strategy:
+      matrix:
+        ruby:
+          - ruby-2.2
+#         - ruby-2.3
+#         - ruby-2.4
+#         - ruby-2.5
+#         - ruby-2.6
+          - ruby-2.7
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler: none
+      - run: echo "make=make -sj$((1 + $(nproc --all)))" >> $GITHUB_ENV
+      - run: sudo apt-get install build-essential autoconf bison
+      - run: ./autogen.sh
+      - run: ./configure --disable-install-doc
+      - run: $make update-unicode
+      - run: $make common-srcs
+      - run: $make incs
+      - run: $make all
+      - run: $make test
+      - uses: k0kubun/action-slack@v2.0.0
+        with:
+          payload: |
+            {
+              "ci": "GitHub Actions",
+              "env": "${{ github.workflow }} / BASERUBY @ ${{ matrix.ruby }}",
+              "url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}",
+              "commit": "${{ github.sha }}",
+              "branch": "${{ github.ref }}".split('/').reverse()[0]
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
+        if: failure() && github.event_name == 'push'
diff --git a/.github/workflows/check_dependencies.yml b/.github/workflows/check_dependencies.yml
new file mode 100644
index 0000000000..26d2ca473d
--- /dev/null
+++ b/.github/workflows/check_dependencies.yml
@@ -0,0 +1,45 @@
+name: Check Dependencies
+on: [push, pull_request]
+jobs:
+  update-deps:
+    strategy:
+      matrix:
+        os: [ubuntu-20.04, macos-latest]
+      fail-fast: true
+    runs-on: ${{ matrix.os }}
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    steps:
+      - name: Install libraries
+        run: |
+          set -x
+          sudo apt-get update -q || :
+          sudo apt-get install --no-install-recommends -q -y build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev libgdbm-dev bison autoconf ruby
+        if: "contains(matrix.os, 'ubuntu')"
+      - name: Install libraries
+        run: |
+          brew update
+          brew install gdbm gmp libffi openssl@1.1 zlib autoconf automake libtool readline
+        if: "contains(matrix.os, 'macos')"
+      - name: git config
+        run: |
+          git config --global advice.detachedHead 0
+      - uses: actions/checkout@v2
+      - run: ./autogen.sh
+      - name: Run configure
+        run: ./configure -C --disable-install-doc --disable-rubygems --with-gcc 'optflags=-O0' 'debugflags=-save-temps=obj -g'
+      - run: make all golf
+      - run: ruby tool/update-deps --fix
+      - run: git diff --no-ext-diff --ignore-submodules --exit-code
+      - uses: k0kubun/action-slack@v2.0.0
+        with:
+          payload: |
+            {
+              "ci": "GitHub Actions",
+              "env": "${{ matrix.os }} / Dependencies need to update",
+              "url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}",
+              "commit": "${{ github.sha }}",
+              "branch": "${{ github.ref }}".split('/').reverse()[0]
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
+        if: failure() && github.event_name == 'push'
diff --git a/.github/workflows/check_misc.yml b/.github/workflows/check_misc.yml
new file mode 100644
index 0000000000..576341bf88
--- /dev/null
+++ b/.github/workflows/check_misc.yml
@@ -0,0 +1,17 @@
+name: Miscellaneous checks
+on: [push, pull_request]
+
+jobs:
+  checks:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: Check if C-sources are US-ASCII
+        run: |
+          ! grep -r -n '[^	 -~]' *.[chy] include internal win32/*.[ch]
+      - name: Check for header macros
+        run: |
+          ! for header in ruby/*.h; do \
+            git grep -l -F -e $header -e HAVE_`echo $header | tr a-z./ A-Z__` -- . > /dev/null || echo $header
+          done | grep -F .
+        working-directory: include
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
new file mode 100644
index 0000000000..2dc47c0683
--- /dev/null
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,43 @@
+name: "Code scanning - action"
+
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: '0 12 * * 4'
+
+jobs:
+  CodeQL-Build:
+
+    # CodeQL runs on ubuntu-20.04 and windows-latest
+    runs-on: ubuntu-20.04
+
+    steps:
+    - name: Install libraries
+      run: |
+        set -x
+        sudo apt-get update -q || :
+        sudo apt-get install --no-install-recommends -q -y build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev libgdbm-dev bison autoconf ruby
+
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 2
+
+    - run: git checkout HEAD^2
+      if: ${{ github.event_name == 'pull_request' }}
+
+    - name: Remove an obsolete rubygems vendored file
+      run: sudo rm /usr/lib/ruby/vendor_ruby/rubygems/defaults/operating_system.rb
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: cpp
+        config-file: ./.github/codeql/codeql-config.yml
+
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
diff --git a/.github/workflows/compilers.yml b/.github/workflows/compilers.yml
new file mode 100644
index 0000000000..47b73fb907
--- /dev/null
+++ b/.github/workflows/compilers.yml
@@ -0,0 +1,245 @@
+name: Compilations
+
+on:
+  push:
+    paths-ignore:
+      - 'doc/**'
+      - '**.md'
+      - '**.rdoc'
+  pull_request:
+    paths-ignore:
+      - 'doc/**'
+      - '**.md'
+      - '**.rdoc'
+
+concurrency:
+  group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
+  cancel-in-progress: ${{ startsWith(github.event_name, 'pull') }}
+
+# Github actions does not support YAML anchors.  This creative use of
+# environment variables (plus the "echo $GITHUB_ENV" hack) is to reroute that
+# restriction.
+env:
+  default_cc: clang-14
+  append_cc: ''
+  crosshost: ''
+
+  # -O1 is faster than -O3 in our tests... Majority of time are consumed trying
+  # to optimize binaries.  Also Github Actions run on relatively modern CPUs
+  # compared to, say, GCC 4 or Clang 3.  We don't specify `-march=native`
+  # because compilers tend not understand what the CPU is.
+  optflags: '-O1'
+
+  # -g0 disables backtraces when SEGV.  Do not set that.
+  debugflags: '-ggdb3'
+
+  default_configure: >-
+    --enable-debug-env
+    --disable-install-doc
+    --with-ext=-test-/cxxanyargs,+
+  append_configure: >-
+    --without-valgrind
+    --without-jemalloc
+    --without-gmp
+
+  UPDATE_UNICODE: >-
+    UNICODE_FILES=.
+    UNICODE_PROPERTY_FILES=.
+    UNICODE_AUXILIARY_FILES=.
+    UNICODE_EMOJI_FILES=.
+  CONFIGURE_TTY: never
+  GITPULLOPTIONS: --no-tags origin ${{github.ref}}
+  RUBY_DEBUG: ci rgengc
+  RUBY_TESTOPTS: >-
+    -q
+    --color=always
+    --tty=no
+
+jobs:
+  compile:
+    strategy:
+      fail-fast: false
+      matrix:
+        entry:
+          - { key: default_cc, name: gcc-11,    value: gcc-11,    container: gcc-11 }
+          - { key: default_cc, name: gcc-10,    value: gcc-10,    container: gcc-10 }
+          - { key: default_cc, name: gcc-9,     value: gcc-9,     container: gcc-9 }
+          - { key: default_cc, name: gcc-8,     value: gcc-8,     container: gcc-8 }
+          - { key: default_cc, name: gcc-7,     value: gcc-7,     container: gcc-7 }
+          - { key: default_cc, name: gcc-6,     value: gcc-6,     container: gcc-6 }
+          - { key: default_cc, name: gcc-5,     value: gcc-5,     container: gcc-5 }
+          - { key: default_cc, name: gcc-4.8,   value: gcc-4.8,   container: gcc-4.8 }
+          - key: default_cc
+            name: 'gcc-11 LTO'
+            value: 'gcc-11 -O2 -flto=auto -ffat-lto-objects'
+            container: gcc-11
+            shared: '--disable-shared'
+            # check: true
+          - { key: default_cc, name: clang-14,  value: clang-14,  container: clang-14 }
+          - { key: default_cc, name: clang-13,  value: clang-13,  container: clang-13 }
+          - { key: default_cc, name: clang-12,  value: clang-12,  container: clang-12 }
+          - { key: default_cc, name: clang-11,  value: clang-11,  container: clang-11 }
+          - { key: default_cc, name: clang-10,  value: clang-10,  container: clang-10 }
+          - { key: default_cc, name: clang-9,   value: clang-9,   container: clang-9 }
+          - { key: default_cc, name: clang-8,   value: clang-8,   container: clang-8 }
+          - { key: default_cc, name: clang-7,   value: clang-7,   container: clang-7 }
+          - { key: default_cc, name: clang-6.0, value: clang-6.0, container: clang-6.0 }
+          - { key: default_cc, name: clang-5.0, value: clang-5.0, container: clang-5.0 }
+          - { key: default_cc, name: clang-4.0, value: clang-4.0, container: clang-4.0 }
+          - { key: default_cc, name: clang-3.9, value: clang-3.9, container: clang-3.9 }
+          - key: default_cc
+            name: 'clang-14 LTO'
+            value: 'clang-14 -O2 -flto=auto'
+            container: clang-14
+            shared: '--disable-shared'
+            # check: true
+
+          - { key: crosshost, name: aarch64-linux-gnu,     value: aarch64-linux-gnu, container: crossbuild-essential-arm64 }
+#         - { key: crosshost, name: arm-linux-gnueabi,     value: arm-linux-gnueabi }
+#         - { key: crosshost, name: arm-linux-gnueabihf,   value: arm-linux-gnueabihf }
+#         - { key: crosshost, name: i686-w64-mingw32,      value: i686-w64-mingw32 }
+#         - { key: crosshost, name: powerpc-linux-gnu,     value: powerpc-linux-gnu }
+          - { key: crosshost, name: powerpc64le-linux-gnu, value: powerpc64le-linux-gnu, container: crossbuild-essential-ppc64el }
+          - { key: crosshost, name: s390x-linux-gnu,       value: s390x-linux-gnu, container: crossbuild-essential-s390x }
+          - { key: crosshost, name: x86_64-w64-mingw32,    value: x86_64-w64-mingw32, container: mingw-w64 }
+
+          - { key: append_cc, name: c99,   value: '-std=c99   -Werror=pedantic -pedantic-errors' }
+#         - { key: append_cc, name: c11,   value: '-std=c11   -Werror=pedantic -pedantic-errors' }
+#         - { key: append_cc, name: c17,   value: '-std=c17   -Werror=pedantic -pedantic-errors' }
+#         - { key: append_cc, name: c2x,   value: '-std=c2x   -Werror=pedantic -pedantic-errors' }
+          - { key: CXXFLAGS,  name: c++98, value: '-std=c++98 -Werror=pedantic -pedantic-errors -Wno-c++11-long-long' }
+#         - { key: CXXFLAGS,  name: c++11, value: '-std=c++11 -Werror=pedantic -pedantic-errors -Wno-c++11-long-long' }
+#         - { key: CXXFLAGS,  name: c++14, value: '-std=c++14 -Werror=pedantic -pedantic-errors -Wno-c++11-long-long' }
+#         - { key: CXXFLAGS,  name: c++17, value: '-std=c++17 -Werror=pedantic -pedantic-errors -Wno-c++11-long-long' }
+          - { key: CXXFLAGS,  name: c++2a, value: '-std=c++2a -Werror=pedantic -pedantic-errors -Wno-c++11-long-long' }
+
+          - { key: optflags, name: '-O0', value: '-O0 -march=x86-64 -mtune=generic' }
+#         - { key: optflags, name: '-O3', value: '-O3 -march=x86-64 -mtune=generic', check: true }
+
+          - { key: append_configure, name: gmp,                  value: '--with-gmp' }
+          - { key: append_configure, name: jemalloc,             value: '--with-jemalloc' }
+          - { key: append_configure, name: valgrind,             value: '--with-valgrind' }
+          - { key: append_configure, name: 'coroutine=ucontext', value: '--with-coroutine=ucontext' }
+          - { key: append_configure, name: 'coroutine=copy',     value: '--with-coroutine=copy' }
+          - { key: append_configure, name: disable-jit-support,  value: '--disable-jit-support' }
+          - { key: append_configure, name: disable-dln,          value: '--disable-dln' }
+          - { key: append_configure, name: disable-rubygems,     value: '--disable-rubygems' }
+
+          - { key: cppflags, name: OPT_THREADED_CODE=1,            value: '-DOPT_THREADED_CODE=1' }
+          - { key: cppflags, name: OPT_THREADED_CODE=2,            value: '-DOPT_THREADED_CODE=2' }
+          - { key: cppflags, name: OPT_THREADED_CODE=3,            value: '-DOPT_THREADED_CODE=3' }
+
+          - { key: cppflags, name: NDEBUG,                         value: '-DNDEBUG' }
+          - { key: cppflags, name: RUBY_DEBUG,                     value: '-DRUBY_DEBUG' }
+#         - { key: cppflags, name: ARRAY_DEBUG,                    value: '-DARRAY_DEBUG' }
+#         - { key: cppflags, name: BIGNUM_DEBUG,                   value: '-DBIGNUM_DEBUG' }
+#         - { key: cppflags, name: CCAN_LIST_DEBUG,                value: '-DCCAN_LIST_DEBUG' }
+#         - { key: cppflags, name: CPDEBUG=-1,                     value: '-DCPDEBUG=-1' }
+#         - { key: cppflags, name: ENC_DEBUG,                      value: '-DENC_DEBUG' }
+#         - { key: cppflags, name: GC_DEBUG,                       value: '-DGC_DEBUG' }
+#         - { key: cppflags, name: HASH_DEBUG,                     value: '-DHASH_DEBUG' }
+#         - { key: cppflags, name: ID_TABLE_DEBUG,                 value: '-DID_TABLE_DEBUG' }
+#         - { key: cppflags, name: RGENGC_DEBUG=-1,                value: '-DRGENGC_DEBUG=-1' }
+#         - { key: cppflags, name: SYMBOL_DEBUG,                   value: '-DSYMBOL_DEBUG' }
+#         - { key: cppflags, name: THREAD_DEBUG=-1,                value: '-DTHREAD_DEBUG=-1' }
+
+#         - { key: cppflags, name: RGENGC_CHECK_MODE,              value: '-DRGENGC_CHECK_MODE' }
+#         - { key: cppflags, name: TRANSIENT_HEAP_CHECK_MODE,      value: '-DTRANSIENT_HEAP_CHECK_MODE' }
+#         - { key: cppflags, name: VM_CHECK_MODE,                  value: '-DVM_CHECK_MODE' }
+
+          - { key: cppflags, name: USE_EMBED_CI=0,                 value: '-DUSE_EMBED_CI=0' }
+          - { key: cppflags, name: USE_FLONUM=0,                   value: '-DUSE_FLONUM=0' }
+#         - { key: cppflags, name: USE_GC_MALLOC_OBJ_INFO_DETAILS, value: '-DUSE_GC_MALLOC_OBJ_INFO_DETAILS' }
+          - { key: cppflags, name: USE_LAZY_LOAD,                  value: '-DUSE_LAZY_LOAD' }
+#         - { key: cppflags, name: USE_RINCGC=0,                   value: '-DUSE_RINCGC=0' }
+#         - { key: cppflags, name: USE_SYMBOL_GC=0,                value: '-DUSE_SYMBOL_GC=0' }
+#         - { key: cppflags, name: USE_THREAD_CACHE=0,             value: '-DUSE_THREAD_CACHE=0' }
+#         - { key: cppflags, name: USE_TRANSIENT_HEAP=0,           value: '-DUSE_TRANSIENT_HEAP=0' }
+#         - { key: cppflags, name: USE_RUBY_DEBUG_LOG=1,           value: '-DUSE_RUBY_DEBUG_LOG=1' }
+
+          - { key: cppflags, name: DEBUG_FIND_TIME_NUMGUESS,       value: '-DDEBUG_FIND_TIME_NUMGUESS' }
+          - { key: cppflags, name: DEBUG_INTEGER_PACK,             value: '-DDEBUG_INTEGER_PACK' }
+#         - { key: cppflags, name: ENABLE_PATH_CHECK,              value: '-DENABLE_PATH_CHECK' }
+
+          - { key: cppflags, name: GC_DEBUG_STRESS_TO_CLASS,       value: '-DGC_DEBUG_STRESS_TO_CLASS' }
+#         - { key: cppflags, name: GC_ENABLE_LAZY_SWEEP=0,         value: '-DGC_ENABLE_LAZY_SWEEP=0' }
+#         - { key: cppflags, name: GC_PROFILE_DETAIL_MEMOTY,       value: '-DGC_PROFILE_DETAIL_MEMOTY' }
+#         - { key: cppflags, name: GC_PROFILE_MORE_DETAIL,         value: '-DGC_PROFILE_MORE_DETAIL' }
+
+#         - { key: cppflags, name: CALC_EXACT_MALLOC_SIZE,         value: '-DCALC_EXACT_MALLOC_SIZE' }
+#         - { key: cppflags, name: MALLOC_ALLOCATED_SIZE_CHECK,    value: '-DMALLOC_ALLOCATED_SIZE_CHECK' }
+
+#         - { key: cppflags, name: IBF_ISEQ_ENABLE_LOCAL_BUFFER,   value: '-DIBF_ISEQ_ENABLE_LOCAL_BUFFER' }
+
+#         - { key: cppflags, name: RGENGC_ESTIMATE_OLDMALLOC,      value: '-DRGENGC_ESTIMATE_OLDMALLOC' }
+#         - { key: cppflags, name: RGENGC_FORCE_MAJOR_GC,          value: '-DRGENGC_FORCE_MAJOR_GC' }
+#         - { key: cppflags, name: RGENGC_OBJ_INFO,                value: '-DRGENGC_OBJ_INFO' }
+#         - { key: cppflags, name: RGENGC_OLD_NEWOBJ_CHECK,        value: '-DRGENGC_OLD_NEWOBJ_CHECK' }
+#         - { key: cppflags, name: RGENGC_PROFILE,                 value: '-DRGENGC_PROFILE' }
+
+#         - { key: cppflags, name: VM_DEBUG_BP_CHECK,              value: '-DVM_DEBUG_BP_CHECK' }
+#         - { key: cppflags, name: VM_DEBUG_VERIFY_METHOD_CACHE,   value: '-DVM_DEBUG_VERIFY_METHOD_CACHE' }
+
+          - { key: cppflags, name: MJIT_FORCE_ENABLE,              value: '-DMJIT_FORCE_ENABLE' }
+          - { key: cppflags, name: YJIT_FORCE_ENABLE,              value: '-DYJIT_FORCE_ENABLE' }
+
+    name: ${{ matrix.entry.name }}
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/ruby/ruby-ci-image:${{ matrix.entry.container || 'clang-14' }}
+      options: --user root
+    if: ${{ !startsWith(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }}
+    steps:
+      - run: id
+        working-directory:
+      - run: mkdir build
+        working-directory:
+      - name: setenv
+        run: |
+          echo "${{ matrix.entry.key }}=${{ matrix.entry.value }}" >> $GITHUB_ENV
+          echo "GNUMAKEFLAGS=-sj$((1 + $(nproc --all)))" >> $GITHUB_ENV
+      - uses: actions/checkout@v3
+        with:
+          path: src
+      - uses: actions/cache@v3
+        with:
+          path: src/.downloaded-cache
+          key: downloaded-cache
+      - run: ./autogen.sh
+        working-directory: src
+      - name: Run configure
+        run: >
+          ../src/configure -C ${default_configure} ${append_configure}
+          ${{ matrix.entry.key == 'crosshost' && '--host="${crosshost}"' || '--with-gcc="${default_cc} ${append_cc}"' }}
+          ${{ matrix.entry.shared || '--enable-shared' }}
+      - run: make extract-extlibs
+      - run: make incs
+      - run: make
+#     - run: make leaked-globals
+      - run: make test
+      - run: make install
+        if: ${{ matrix.entry.check }}
+      - run: make test-tool
+        if: ${{ matrix.entry.check }}
+      - run: make test-all TESTS='-- ruby -ext-'
+        if: ${{ matrix.entry.check }}
+      - run: make test-spec
+        if: ${{ matrix.entry.check }}
+
+      - uses: k0kubun/action-slack@v2.0.0
+        with:
+          payload: |
+            {
+              "ci": "GitHub Actions",
+              "env": "${{ github.workflow }} / ${{ matrix.entry.name }}",
+              "url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}",
+              "commit": "${{ github.sha }}",
+              "branch": "${{ github.ref }}".split('/').reverse()[0]
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
+        if: ${{ failure() && github.event_name == 'push' }}
+
+defaults:
+  run:
+    working-directory: build
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
new file mode 100644
index 0000000000..1da94630fe
--- /dev/null
+++ b/.github/workflows/macos.yml
@@ -0,0 +1,66 @@
+name: macOS
+on: [push, pull_request]
+jobs:
+  make:
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        test_task: [ "check" ] #, "test-bundler-parallel", "test-bundled-gems" ] matrix tests has unknown issues
+      fail-fast: false
+    env:
+      GITPULLOPTIONS: --no-tags origin ${{github.ref}}
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    steps:
+      - run: mkdir build
+        working-directory:
+      - name: Disable Firewall
+        run: |
+          sudo /usr/libexec/ApplicationFirewall/socketfilterfw --setglobalstate off
+          sudo /usr/libexec/ApplicationFirewall/socketfilterfw --getglobalstate
+      - name: git config
+        run: |
+          git config --global advice.detachedHead 0
+      - uses: actions/checkout@v2
+        with:
+          path: src
+      - name: Install libraries
+        run: |
+          export WAITS='5 60'
+          tool/travis_retry.sh brew update
+          tool/travis_retry.sh brew install gdbm gmp libffi openssl@1.1 zlib autoconf automake libtool readline
+        working-directory: src
+      - name: Set ENV
+        run: |
+          echo "JOBS=-j$((1 + $(sysctl -n hw.activecpu)))" >> $GITHUB_ENV
+      - run: ./autogen.sh
+        working-directory: src
+      - name: Run configure
+        run: ../src/configure -C --disable-install-doc --with-openssl-dir=$(brew --prefix openssl@1.1) --with-readline-dir=$(brew --prefix readline)
+      - run: make $JOBS incs
+      - run: make $JOBS
+      - run: make leaked-globals
+        if: matrix.test_task == 'check'
+      - run: make prepare-gems
+        if: matrix.test_task == 'check'
+      - run: make $JOBS -s ${{ matrix.test_task }}
+        timeout-minutes: 60
+        env:
+          RUBY_TESTOPTS: "-q --tty=no"
+          TEST_BUNDLED_GEMS_ALLOW_FAILURES: "rexml"
+      - uses: k0kubun/action-slack@v2.0.0
+        with:
+          payload: |
+            {
+              "ci": "GitHub Actions",
+              "env": "${{ github.workflow }} / ${{ matrix.test_task }}",
+              "url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}",
+              "commit": "${{ github.sha }}",
+              "branch": "${{ github.ref }}".split('/').reverse()[0]
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
+        if: failure() && github.event_name == 'push'
+
+defaults:
+  run:
+    working-directory: build
diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
new file mode 100644
index 0000000000..a5d64c7b2d
--- /dev/null
+++ b/.github/workflows/mingw.yml
@@ -0,0 +1,141 @@
+name: MinGW
+on: [push, pull_request]
+
+# Notes:
+# Actions console encoding causes issues, see test-all & test-spec steps
+#
+jobs:
+  make:
+    runs-on: windows-2022
+    name: ${{ github.workflow }} (${{ matrix.msystem }})
+    env:
+      MSYSTEM: MINGW64
+      MSYSTEM_PREFIX: /mingw64
+      MSYS2_ARCH: x86_64
+      CHOST: "x86_64-w64-mingw32"
+      CFLAGS:   "-march=x86-64 -mtune=generic -O3 -pipe -fstack-protector-strong"
+      CXXFLAGS: "-march=x86-64 -mtune=generic -O3 -pipe"
+      CPPFLAGS: "-D_FORTIFY_SOURCE=2 -D__USE_MINGW_ANSI_STDIO=1 -DFD_SETSIZE=2048"
+      LDFLAGS:  "-pipe -fstack-protector-strong"
+      UPDATE_UNICODE: "UNICODE_FILES=. UNICODE_PROPERTY_FILES=. UNICODE_AUXILIARY_FILES=. UNICODE_EMOJI_FILES=."
+      GITPULLOPTIONS: --no-tags origin ${{github.ref}}
+    strategy:
+      matrix:
+        test_task: [ "check" ] # to make job names consistent
+      fail-fast: false
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    steps:
+      - run: mkdir build
+        working-directory:
+      - name: git config
+        run: |
+          git config --system core.autocrlf false
+          git config --system core.eol lf
+          git config --system advice.detachedHead 0
+      - uses: actions/checkout@v2
+        with:
+          path: src
+      - name: Set up Ruby & MSYS2
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.6
+          mingw: _upgrade_ gdbm gmp libffi libyaml openssl ragel readline
+          msys2: automake1.16 bison
+      - name: where check
+        run: |
+          # show where
+          Write-Host
+          $where = 'gcc.exe', 'ragel.exe', 'make.exe', 'bison.exe', 'libcrypto-1_1-x64.dll', 'libssl-1_1-x64.dll'
+          foreach ($e in $where) {
+            $rslt = where.exe $e 2>&1 | Out-String
+            if ($rslt.contains($e)) { Write-Host $rslt }
+            else { Write-Host "`nCan't find $e" }
+          }
+
+      - name: autogen
+        run: |
+          ./autogen.sh
+        working-directory: src
+        shell: sh
+
+      - name: configure
+        run: |
+          # Actions uses UTF8, causes test failures, similar to normal OS setup
+          $PSDefaultParameterValues['*:Encoding'] = 'utf8'
+          [Console]::OutputEncoding = [System.Text.Encoding]::GetEncoding("IBM437")
+          [Console]::InputEncoding  = [System.Text.Encoding]::GetEncoding("IBM437")
+          $config_args = "--build=$env:CHOST --host=$env:CHOST --target=$env:CHOST"
+          Write-Host $config_args
+          sh -c "../src/configure --disable-install-doc --prefix=/. $config_args"
+          # Write-Host "-------------------------------------- config.log"
+          # Get-Content ./config.log | foreach {Write-Output $_}
+
+      - name: update
+        run: |
+          $jobs = [int](2 * $env:NUMBER_OF_PROCESSORS)
+          make -j $jobs incs
+
+      - name: download gems
+        run: |
+          $jobs = [int](2 * $env:NUMBER_OF_PROCESSORS)
+          make -j $jobs update-gems
+
+      - name: make all
+        timeout-minutes: 40
+        run: |
+          $jobs = [int](2 * $env:NUMBER_OF_PROCESSORS)
+          make -j $jobs
+
+      - name: make install
+        run: |
+          # Actions uses UTF8, causes test failures, similar to normal OS setup
+          $PSDefaultParameterValues['*:Encoding'] = 'utf8'
+          [Console]::OutputEncoding = [System.Text.Encoding]::GetEncoding("IBM437")
+          [Console]::InputEncoding  = [System.Text.Encoding]::GetEncoding("IBM437")
+          make DESTDIR=../install install-nodoc
+
+      - name: test
+        timeout-minutes: 5
+        run: |
+          make test
+
+      - name: test-all
+        timeout-minutes: 60
+        run: |
+          # Actions uses UTF8, causes test failures, similar to normal OS setup
+          $PSDefaultParameterValues['*:Encoding'] = 'utf8'
+          [Console]::OutputEncoding = [System.Text.Encoding]::GetEncoding("IBM437")
+          [Console]::InputEncoding  = [System.Text.Encoding]::GetEncoding("IBM437")
+          $jobs = [int](1.5 * $env:NUMBER_OF_PROCESSORS)
+          if ($env:BUNDLER_VERSION) { Remove-Item env:\BUNDLER_VERSION }
+          make test-all TESTOPTS="-j $jobs --retry --job-status=normal --show-skip --timeout-scale=1.5"
+
+      - name: test-spec
+        timeout-minutes: 10
+        working-directory: src/spec/ruby
+        run: |
+          $env:Path = "$pwd/../../../install/bin;$env:Path"
+          # Actions uses UTF8, causes test failures, similar to normal OS setup
+          $PSDefaultParameterValues['*:Encoding'] = 'utf8'
+          [Console]::OutputEncoding = [System.Text.Encoding]::GetEncoding("IBM437")
+          [Console]::InputEncoding  = [System.Text.Encoding]::GetEncoding("IBM437")
+          ruby -v
+          ruby ../mspec/bin/mspec -I../../tool/lib -j
+
+      - uses: k0kubun/action-slack@v2.0.0
+        with:
+          payload: |
+            {
+              "ci": "GitHub Actions",
+              "env": "${{ github.workflow }} ${{ matrix.msystem }} / ${{ matrix.test_task }}",
+              "url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}",
+              "commit": "${{ github.sha }}",
+              "branch": "${{ github.ref }}".split('/').reverse()[0]
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
+        if: failure() && github.event_name == 'push'
+
+defaults:
+  run:
+    working-directory: build
diff --git a/.github/workflows/mjit.yml b/.github/workflows/mjit.yml
new file mode 100644
index 0000000000..8dcbcf7760
--- /dev/null
+++ b/.github/workflows/mjit.yml
@@ -0,0 +1,77 @@
+name: MJIT
+on: [push, pull_request]
+jobs:
+  make:
+    strategy:
+      matrix:
+        test_task: [check] # to make job names consistent
+        jit_opts: [--jit-wait]
+      fail-fast: false
+    runs-on: ubuntu-20.04
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    env:
+      TESTOPTS: '-q --tty=no'
+      RUN_OPTS: '--disable-gems ${{ matrix.jit_opts }} --jit-debug=-ggdb3'
+      GITPULLOPTIONS: --no-tags origin ${{github.ref}}
+    steps:
+      - run: mkdir build
+        working-directory:
+      - name: Install libraries
+        run: |
+          set -x
+          sudo apt-get update -q || :
+          sudo apt-get install --no-install-recommends -q -y build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev libgdbm-dev bison autoconf ruby
+      - name: git config
+        run: |
+          git config --global advice.detachedHead 0
+      - uses: actions/checkout@v2
+        with:
+          path: src
+      - name: Fixed world writable dirs
+        run: |
+          chmod -v go-w $HOME $HOME/.config
+          sudo chmod -R go-w /usr/share
+          sudo bash -c 'IFS=:; for d in '"$PATH"'; do chmod -v go-w $d; done' || :
+      - name: Set ENV
+        run: |
+          echo "GNUMAKEFLAGS=-j$((1 + $(nproc --all)))" >> $GITHUB_ENV
+      - run: ./autogen.sh
+        working-directory: src
+      - name: Run configure
+        run: ../src/configure -C --disable-install-doc cppflags=-DVM_CHECK_MODE
+      - run: make incs
+      - run: make
+      - run: sudo make -s install
+      - run: sudo apt-get install gdb # used by test / test-all failure
+      - name: Run test
+        run: |
+          ulimit -c unlimited
+          make -s test RUN_OPTS="$RUN_OPTS"
+        timeout-minutes: 60
+      # - name: Run test-all
+      #   run: |
+      #     ulimit -c unlimited
+      #     make -s test-all RUN_OPTS="$RUN_OPTS"
+      #   timeout-minutes: 60
+      - name: Run test-spec
+        run: |
+          ulimit -c unlimited
+          make -s test-spec RUN_OPTS="$RUN_OPTS"
+        timeout-minutes: 60
+      - uses: k0kubun/action-slack@v2.0.0
+        with:
+          payload: |
+            {
+              "ci": "GitHub Actions",
+              "env": "${{ github.workflow }} / ${{ matrix.test_task }} ${{ matrix.jit_opts }}",
+              "url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}",
+              "commit": "${{ github.sha }}",
+              "branch": "${{ github.ref }}".split('/').reverse()[0]
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
+        if: failure() && github.event_name == 'push'
+
+defaults:
+  run:
+    working-directory: build
diff --git a/.github/workflows/spec_guards.yml b/.github/workflows/spec_guards.yml
new file mode 100644
index 0000000000..bf053cdd05
--- /dev/null
+++ b/.github/workflows/spec_guards.yml
@@ -0,0 +1,41 @@
+name: Rubyspec Version Guards Check
+
+on: [push, pull_request]
+
+jobs:
+  rubyspec:
+    name: Rubyspec
+    runs-on: ubuntu-20.04
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    strategy:
+      matrix:
+        # Specs from ruby/spec should still run on all supported Ruby versions.
+        # This also ensures the needed ruby_version_is guards are there, see spec/README.md.
+        ruby:
+          - ruby-2.5
+#         - ruby-2.6
+          - ruby-2.7
+          - ruby-3.0
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler: none
+      - run: gem install webrick
+      - run: ruby ../mspec/bin/mspec
+        working-directory: spec/ruby
+      - uses: k0kubun/action-slack@v2.0.0
+        with:
+          payload: |
+            {
+              "ci": "GitHub Actions",
+              "env": "${{ github.workflow }} / rubyspec @ ${{ matrix.ruby }}",
+              "url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}",
+              "commit": "${{ github.sha }}",
+              "branch": "${{ github.ref }}".split('/').reverse()[0]
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
+        if: failure() && github.event_name == 'push'
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
new file mode 100644
index 0000000000..93187699be
--- /dev/null
+++ b/.github/workflows/ubuntu.yml
@@ -0,0 +1,87 @@
+name: Ubuntu
+on: [push, pull_request]
+jobs:
+  make:
+    strategy:
+      matrix:
+        test_task: [ "check", "test-bundler-parallel", "test-bundled-gems", "test-all TESTS=--repeat-count=2" ]
+        os:
+          - ubuntu-20.04
+#         - ubuntu-18.04
+#         - ubuntu-16.04
+        debug: ["", "-DRUBY_DEBUG"]
+        exclude:
+          - test_task: test-bundler-parallel
+            os: ubuntu-16.04
+          - test_task: test-bundled-gems
+            os: ubuntu-16.04
+          - test_task: "test-all TESTS=--repeat-count=2"
+            os: ubuntu-16.04
+          - os: ubuntu-16.04
+            debug: -DRUBY_DEBUG
+          - test_task: "test-all TESTS=--repeat-count=2"
+            debug: -DRUBY_DEBUG
+      fail-fast: false
+    env:
+      GITPULLOPTIONS: --no-tags origin ${{github.ref}}
+      RUBY_DEBUG: ci
+    runs-on: ${{ matrix.os }}
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    steps:
+      - run: mkdir build
+        working-directory:
+      - name: Install libraries
+        run: |
+          set -x
+          sudo apt-get update -q || :
+          sudo apt-get install --no-install-recommends -q -y build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev libgdbm-dev bison autoconf ruby
+      - name: git config
+        run: |
+          git config --global advice.detachedHead 0
+      - uses: actions/checkout@v2
+        with:
+          path: src
+      - name: Fixed world writable dirs
+        run: |
+          chmod -v go-w $HOME $HOME/.config
+          sudo chmod -R go-w /usr/share
+          sudo bash -c 'IFS=:; for d in '"$PATH"'; do chmod -v go-w $d; done' || :
+      - name: Set ENV
+        run: |
+          echo "JOBS=-j$((1 + $(nproc --all)))" >> $GITHUB_ENV
+      - run: ./autogen.sh
+        working-directory: src
+      - name: Run configure
+        run: ../src/configure -C --disable-install-doc cppflags=${{ matrix.debug }}
+      - run: make $JOBS incs
+      - run: make $JOBS
+      - run: make leaked-globals
+        if: matrix.test_task == 'check'
+      - run: make prepare-gems
+        if: matrix.test_task == 'check'
+      - name: Create dummy files in build dir
+        run: |
+          ./miniruby -e '(("a".."z").to_a+("A".."Z").to_a+("0".."9").to_a+%w[foo bar test zzz]).each{|basename|File.write("#{basename}.rb", "raise %(do not load #{basename}.rb)")}'
+        if: matrix.test_task == 'check'
+      - run: make $JOBS -s ${{ matrix.test_task }}
+        timeout-minutes: 30
+        env:
+          RUBY_TESTOPTS: "-q --tty=no"
+          TEST_BUNDLED_GEMS_ALLOW_FAILURES: ""
+      - uses: k0kubun/action-slack@v2.0.0
+        with:
+          payload: |
+            {
+              "ci": "GitHub Actions",
+              "env": "${{ matrix.os }} / ${{ matrix.test_task }}${{ matrix.debug }}",
+              "url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}",
+              "commit": "${{ github.sha }}",
+              "branch": "${{ github.ref }}".split('/').reverse()[0]
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
+        if: failure() && github.event_name == 'push'
+
+defaults:
+  run:
+    working-directory: build
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
new file mode 100644
index 0000000000..98e59ae188
--- /dev/null
+++ b/.github/workflows/windows.yml
@@ -0,0 +1,80 @@
+name: Windows
+on: [push, pull_request]
+jobs:
+  make:
+    strategy:
+      matrix:
+        test_task: [test]
+        os: [windows-2019]
+        vs: [2019]
+      fail-fast: false
+    runs-on: ${{ matrix.os }}
+    env:
+      GITPULLOPTIONS: --no-tags origin ${{github.ref}}
+      VCVARS: C:\Program Files (x86)\Microsoft Visual Studio\${{ matrix.vs }}\Enterprise\VC\Auxiliary\Build\vcvars64.bat
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    steps:
+      - run: md build
+        working-directory:
+      - uses: actions/cache@v2
+        with:
+          path: C:\vcpkg\downloads
+          key: ${{ runner.os }}-vcpkg-download-${{ matrix.os }}-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-vcpkg-download-${{ matrix.os }}-
+            ${{ runner.os }}-vcpkg-download-
+      - name: Install libraries with vcpkg
+        run: |
+          vcpkg --triplet x64-windows install readline zlib
+      - uses: actions/cache@v2
+        with:
+          path: C:\Users\runneradmin\AppData\Local\Temp\chocolatey
+          key: ${{ runner.os }}-chocolatey-${{ matrix.os }}-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-chocolatey-${{ matrix.os }}-
+            ${{ runner.os }}-chocolatey-
+      - name: Install libraries with chocolatey
+        run: |
+          choco install --no-progress openssl
+          choco install --no-progress winflexbison3 --version=2.5.18.20190508
+      - name: git config
+        run: |
+          git config --system advice.detachedHead 0
+      - uses: actions/checkout@v2
+        with:
+          path: src
+      - name: Configure
+        run: |
+          call "%VCVARS%"
+          ../src/win32/configure.bat --disable-install-doc --without-ext=+,dbm,gdbm --enable-bundled-libffi --with-opt-dir=C:/vcpkg/installed/x64-windows --with-openssl-dir="C:/Program Files/OpenSSL-Win64"
+      - name: nmake
+        run: |
+          call "%VCVARS%"
+          set YACC=win_bison
+          echo on
+          nmake incs
+          nmake extract-extlibs
+          nmake
+      - name: nmake test
+        timeout-minutes: 30
+        run: |
+          call "%VCVARS%"
+          nmake ${{ matrix.test_task }}
+      - uses: k0kubun/action-slack@v2.0.0
+        with:
+          payload: |
+            {
+              "ci": "GitHub Actions",
+              "env": "${{ matrix.os }} / ${{ matrix.test_task }}",
+              "url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}",
+              "commit": "${{ github.sha }}",
+              "branch": "${{ github.ref }}".split('/').reverse()[0]
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
+        if: failure() && github.event_name == 'push'
+
+defaults:
+  run:
+    working-directory: build
+    shell: cmd
diff --git a/.gitignore b/.gitignore
index 320ccc2dc5..8d11d7278a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,36 +3,51 @@
 *-*-*.lib
 *.a
 *.bak
+*.bc
+*.bundle
 *.dSYM
 *.dmyh
 *.dylib
 *.elc
+*.i
 *.inc
 *.log
 *.o
 *.obj
+*.old
 *.orig
+*.pch
 *.pdb
+*.rbinc
 *.rej
+*.s
 *.sav
+*.sl
+*.so
 *.swp
 *.yarb
 *~
-.*-*
 .*.list
 .*.time
 .DS_Store
+.bundle
 .ccmalloc
 .ext
 .pc
 .ppack
 .svn
+.time
+.ruby-version
 Makefile
-Makefile.old
 cygruby*.def
 extconf.h
 y.output
 y.tab.c
+*.gcda
+*.gcno
+*.gcov
+*.vscode
+lcov*.info
 
 # /
 /*-fake.rb
@@ -42,13 +57,13 @@ y.tab.c
 /*.pc
 /*.rc
 /*_prelude.c
+/.downloaded-cache
+/.top-enc.mk
+/build*/
 /COPYING.LIB
-/ChangeLog-*
-/ChangeLog.pre-alpha
-/ChangeLog.pre1_1
+/ChangeLog
 /Doxyfile
 /GNUmakefile
-/GNUmakefile.old
 /README.atheos
 /README.fat-patch
 /README.v6
@@ -56,6 +71,7 @@ y.tab.c
 /archive
 /autom4te*.cache
 /automake
+/benchmark/benchmark-driver
 /beos
 /bmlog-*
 /breakpoints.gdb
@@ -79,6 +95,9 @@ y.tab.c
 /goruby
 /id.[ch]
 /largefile.h
+/lcov-c-out
+/lcov-rb-out
+/lcov-out
 /lex.c
 /libruby*.*
 /miniprelude.c
@@ -94,19 +113,24 @@ y.tab.c
 /ppack
 /prelude.c
 /preview
+/probes.dmyh
 /probes.h
 /rbconfig.rb
 /rename2.h
 /repack
 /revision.h
+/revision.tmp
 /riscos
 /rubicon
 /ruby
 /ruby-runner
 /ruby-runner.h
 /ruby-man.rd.gz
+/run.gdb
 /sizes.c
+/static-ruby
 /test.rb
+/test-coverage.dat
 /tmp
 /transdb.h
 /uncommon.mk
@@ -115,7 +139,13 @@ y.tab.c
 /web
 /yasmdata.rb
 
+# /bin/
+
+/bin/*.exe
+/bin/*.dll
+
 # /benchmark/
+/benchmark/bm_require.data
 /benchmark/bmx_*.rb
 /benchmark/fasta.output.*
 /benchmark/wc.input
@@ -123,26 +153,35 @@ y.tab.c
 /enc/*.def
 /enc/*.exp
 /enc/*.lib
+/enc/jis/props.h
 /enc/unicode/data
 
+# /coroutine/
+!/coroutine/**/*.s
+
 # /enc/trans/
 /enc/trans/*.c
 /enc/trans/*.def
 /enc/trans/*.exp
 /enc/trans/*.lib
-/enc/trans/.time
+
+# /exe/
+/exe/goruby
+/exe/ruby
 
 # /ext/
 /ext/extinit.c
+/ext/configure-ext.mk
+/ext/*/exts.mk
+
+# /ext/-test-/cxxanyargs
+/ext/-test-/cxxanyargs/failure*.failed
 
 # /ext/-test-/win32/dln/
+/ext/-test-/win32/dln/dlntest.dll
 /ext/-test-/win32/dln/dlntest.exp
 /ext/-test-/win32/dln/dlntest.lib
 
-# /ext/dl/callback/
-/ext/dl/callback/callback-*.c
-/ext/dl/callback/callback.c
-
 # /ext/etc/
 /ext/etc/constdefs.h
 
@@ -151,9 +190,11 @@ y.tab.c
 
 # /ext/rbconfig/
 /ext/rbconfig/sizeof/sizes.c
+/ext/rbconfig/sizeof/limits.c
 
 # /ext/ripper/
 /ext/ripper/eventids1.c
+/ext/ripper/.eventids2-check
 /ext/ripper/eventids2table.c
 /ext/ripper/ripper.*
 /ext/ripper/ids1
@@ -164,15 +205,17 @@ y.tab.c
 /ext/socket/constdefs.h
 /ext/socket/constdefs.c
 
-# /ext/tk/
-/ext/tk/config_list
-
 # /gems
 /gems/*.gem
+/gems/src
+/gems/*-*
 
-# /spec/
-/spec/mspec
-/spec/rubyspec
+# /lib/
+/lib/ruby/[1-9]*.*
+/lib/ruby/vendor_ruby
+
+# /spec/bundler
+/.rspec_status
 
 # /tool/
 /tool/config.guess
@@ -180,4 +223,8 @@ y.tab.c
 
 # /win32/
 /win32/*.ico
-/win32/.time
+
+# MJIT
+/rb_mjit_header.h
+/mjit_config.h
+/include/ruby-*/*/rb_mjit_min_header-*.h
diff --git a/.indent.pro b/.indent.pro
deleted file mode 100644
index 6a207a0554..0000000000
--- a/.indent.pro
+++ /dev/null
@@ -1,21 +0,0 @@
--bap
--nbbb
--nbc
--br
--nbs
--ncdb
--ce
--cli0.5
--ndj
--ei
--nfc1
--i4
--l120
--lp
--npcs
--psl
--sc
--sob
-
--TID
--TVALUE
diff --git a/.rspec_parallel b/.rspec_parallel
new file mode 100644
index 0000000000..aaff198a32
--- /dev/null
+++ b/.rspec_parallel
@@ -0,0 +1,2 @@
+--format progress
+--format ParallelTests::RSpec::RuntimeLogger --out tmp/parallel_runtime_rspec.log
diff --git a/.travis.yml b/.travis.yml
index 24ce0c9113..d480307dd6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+# -*- YAML -*-
 # Copyright (C) 2011 Urabe, Shyouhei.  All rights reserved.
 #
 # This file is  a part of the programming language  Ruby.  Permission is hereby
@@ -16,87 +17,275 @@
 #
 # is also a good place to look at.
 
-# Language specification.
 language: c
-sudo: false
-
-# Compilers.  Several  compilers are  provided in Travis,  so we try  them all.
-# The value set here is visible via $CC environment variable.
-compiler:
-  - gcc
-
-os:
-  - linux
-
-# Dependencies.  Some  header files are missing  in a Travis' worker  VM, so we
-# have  to install  them.  The  "1.9.1" here  is OK.   It is  the  most adopted
-# version string  for Debian/Ubuntu, and  no dependencies have been  changed so
-# far since the 1.9.1 release.
-before_install:
-  - "CONFIG_FLAG="
-  - "JOBS='-j 4'"
-
-# Script is where the test runs.  Note  we just do "make test", not other tests
-# like  test-all, test-rubyspec.   This is  because  they take  too much  time,
-# enough for Travis to shut down the VM as being stalled.
+
+os: linux
+
+dist: xenial
+
+git:
+  quiet: true
+
+cache:
+  ccache: true
+  directories:
+    - $HOME/config_2nd
+    - $HOME/.downloaded-cache
+
+env:
+  global:
+    # Reset timestamps early
+    - _=$(touch NEWS && find . -type f -exec touch -r NEWS {} +)
+    - CONFIGURE_TTY=no
+    - CCACHE_COMPILERCHECK=none
+    - CCACHE_NOCOMPRESS=1
+    - CCACHE_MAXSIZE=512Mi
+    - NPROC="`nproc`"
+    # JOBS and SETARCH are overridden when necessary; see below.
+    - JOBS=-j$((1+${NPROC}))
+    - SETARCH=
+    - RUBY_PREFIX=/tmp/ruby-prefix
+    - GEMS_FOR_TEST='timezone tzinfo'
+    - UPDATE_UNICODE="UNICODE_FILES=. UNICODE_PROPERTY_FILES=. UNICODE_AUXILIARY_FILES=. UNICODE_EMOJI_FILES=."
+    - BEFORE_INSTALL=true
+    # https://github.com/travis-ci/travis-build/blob/e411371dda21430a60f61b8f3f57943d2fe4d344/lib/travis/build/bash/travis_apt_get_options.bash#L7
+    - travis_apt_get_options='--allow-downgrades --allow-remove-essential --allow-change-held-packages'
+    - travis_apt_get_options="-yq --no-install-suggests --no-install-recommends $travis_apt_get_options"
+
+.org.ruby-lang.ci.matrix-definitions:
+
+  - &make-test-only
+    script:
+      - $SETARCH make -s test TESTOPTS="${TESTOPTS=$JOBS -q --tty=no}"
+
+  - &gcc-8
+    compiler: gcc-8
+    # # Not using addon to control retries
+    # addons:
+    #   apt:
+    #     sources:
+    #       - ubuntu-toolchain-r-test
+    before_install:
+      - bash -cx "${BEFORE_INSTALL}"
+      - tool/travis_retry.sh sudo -E apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
+      - tool/travis_retry.sh sudo bash -c "rm -rf '${TRAVIS_ROOT}/var/lib/apt/lists/'* && exec apt-get update -yq"
+      - >-
+        tool/travis_retry.sh sudo -E apt-get $travis_apt_get_options install
+        ccache
+        gcc-8
+        g++-8
+        libffi-dev
+        libgdbm-dev
+        libncurses5-dev
+        libncursesw5-dev
+        libreadline6-dev
+        libssl-dev
+        libyaml-dev
+        openssl
+        zlib1g-dev
+
+  - &clang-8
+    compiler: clang-8
+    addons:
+      apt:
+        # Not doing this manually unlike other sources, because it has been stable.
+        sources:
+          - llvm-toolchain-xenial-8
+        config:
+          retries: true
+    before_install:
+      - tool/travis_retry.sh sudo bash -c "rm -rf '${TRAVIS_ROOT}/var/lib/apt/lists/'* && exec apt-get update -yq"
+      - >-
+        tool/travis_retry.sh sudo -E apt-get $travis_apt_get_options install
+        clang-8
+        llvm-8-tools
+        libffi-dev
+        libgdbm-dev
+        libncurses5-dev
+        libncursesw5-dev
+        libreadline6-dev
+        libssl-dev
+        libyaml-dev
+        openssl
+        zlib1g-dev
+
+  # --------
+
+  - &x86_64-linux
+    name: x86_64-linux
+    <<: *gcc-8
+
+  - &arm64-linux
+    name: arm64-linux
+    arch: arm64
+    <<: *gcc-8
+
+  - &s390x-linux
+    name: s390x-linux
+    arch: s390x
+    <<: *gcc-8
+
+  - &i686-linux
+    name: i686-linux
+    compiler: gcc-8
+    env:
+      - GCC_FLAGS=-m32
+      - CXX='g++-8 -m32'
+      - debugflags=-g0
+      - SETARCH='setarch i686 --verbose --3gb'
+    # # Not using addon to control retries
+    # addons:
+    #   apt:
+    #     sources:
+    #       - ubuntu-toolchain-r-test
+    before_install:
+      - tool/travis_retry.sh sudo -E apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
+      - tool/travis_retry.sh sudo bash -c "rm -rf '${TRAVIS_ROOT}/var/lib/apt/lists/'* && exec apt-get update -yq"
+      - >-
+        tool/travis_retry.sh sudo -E apt-get $travis_apt_get_options install
+        gcc-8-multilib
+        g++-8
+        g++-8-multilib
+        libstdc++-8-dev:i386
+        libffi-dev:i386
+        libffi6:i386
+        libgdbm-dev:i386
+        libgdbm3:i386
+        libncurses5-dev:i386
+        libncurses5:i386
+        libncursesw5-dev:i386
+        libreadline6-dev:i386
+        libreadline6:i386
+        libssl-dev:i386
+        libssl1.0.0:i386
+        linux-libc-dev:i386
+        zlib1g-dev:i386
+        zlib1g:i386
+
+  - &arm32-linux
+    name: arm32-linux
+    arch: arm64
+    # https://packages.ubuntu.com/xenial/crossbuild-essential-armhf
+    compiler: arm-linux-gnueabihf-gcc
+    env:
+      - debugflags=-g0
+      - SETARCH='setarch linux32 --verbose --32bit'
+    before_install:
+      - sudo dpkg --add-architecture armhf
+      - tool/travis_retry.sh sudo bash -c "rm -rf '${TRAVIS_ROOT}/var/lib/apt/lists/'* && exec apt-get update -yq"
+      - >-
+        tool/travis_retry.sh sudo -E apt-get $travis_apt_get_options install
+        ccache
+        crossbuild-essential-armhf
+        libc6:armhf
+        libstdc++-5-dev:armhf
+        libffi-dev:armhf
+        libffi6:armhf
+        libgdbm-dev:armhf
+        libgdbm3:armhf
+        libncurses5-dev:armhf
+        libncurses5:armhf
+        libncursesw5-dev:armhf
+        libreadline6-dev:armhf
+        libreadline6:armhf
+        libssl-dev:armhf
+        libssl1.0.0:armhf
+        linux-libc-dev:armhf
+        zlib1g-dev:armhf
+        zlib1g:armhf
+
+matrix:
+  include:
+    # Build every commit:
+    - <<: *i686-linux
+    # Build every commit (Allowed Failures):
+    - <<: *arm32-linux
+    - <<: *arm64-linux
+    - <<: *s390x-linux
+  allow_failures:
+    - name: arm32-linux
+    - name: arm64-linux
+    - name: s390x-linux
+  fast_finish: true
+
 before_script:
-  - "uname -a"
-  - "uname -r"
-  - "rm -fr .ext autom4te.cache"
-  - "echo $TERM"
-  - "make -f common.mk BASERUBY=ruby MAKEDIRS='mkdir -p' srcdir=. update-config_files"
-  - "autoconf"
-  - "mkdir config_1st config_2nd"
-  - "./configure -C --disable-install-doc --with-gcc=$CC $CONFIG_FLAG"
-  - "cp -pr config.status .ext/include config_1st"
-  - "make reconfig"
-  - "cp -pr config.status .ext/include config_2nd"
-  - "diff -ru config_1st config_2nd"
-  - "make after-update BASERUBY=ruby"
-  - "make -s $JOBS"
-  - "make update-rubyspec"
+  - rm -fr .ext autom4te.cache
+  - |-
+    [ -d ~/.downloaded-cache ] ||
+    mkdir ~/.downloaded-cache
+  - ln -s ~/.downloaded-cache
+  - "> config.status"
+  - "> .rbconfig.time"
+  - sed -f tool/prereq.status template/Makefile.in common.mk > Makefile
+  - make touch-unicode-files
+  - make -s $JOBS $UPDATE_UNICODE up
+  - make -s $JOBS srcs
+  - rm -f config.status Makefile rbconfig.rb .rbconfig.time
+  - |-
+    if [ -d ~/config_2nd ]; then
+      cp -pr ~/config_2nd build
+    else
+      mkdir build
+    fi
+  - mkdir config_1st config_2nd
+  - chmod -R a-w .
+  - chmod -R u+w build config_1st config_2nd
+  - cd build
+  - |-
+    case "$CC" in
+    gcc*)   CC="ccache $CC${GCC_FLAGS:+ }$GCC_FLAGS -fno-diagnostics-color";;
+    clang*) CC="ccache $CC${GCC_FLAGS:+ }$GCC_FLAGS -fno-color-diagnostics";;
+    esac
+  - |-
+    [ ! -f config.cache ] ||
+    [ "$CC" = "`sed -n s/^ac_cv_prog_CC=//p config.cache`" ] ||
+    (set -x; exec rm config.cache)
+  - $SETARCH ../configure -C --disable-install-doc --prefix=$RUBY_PREFIX $CONFIG_FLAG
+  - cp -pr config.cache config.status .ext/include ../config_1st
+  - $SETARCH make reconfig
+  - cp -pr config.cache config.status .ext/include ../config_2nd
+  - (cd .. && exec diff -ru config_1st config_2nd)
+  - chmod u+w ..
+  - rm -rf ~/config_2nd
+  - mv ../config_2nd ~
+  - chmod u-w ..
+  - $SETARCH make -s $JOBS
+  - make -s install
+  - |-
+    [ -z "${GEMS_FOR_TEST}" ] ||
+    $RUBY_PREFIX/bin/gem install --no-document $GEMS_FOR_TEST
+  - echo "raise 'do not load ~/.irbrc in test'" > ~/.irbrc
+
 script:
-  - "make test TESTOPTS=--color=never"
-  - "make test-all TESTOPTS='-q -j3 --color=never --job-status=normal'"
-  - "make test-rubyspec MSPECOPT=-fm"
+  - $SETARCH make -s test -o showflags TESTOPTS="${TESTOPTS=$JOBS -q --tty=no}"
+  - travis_wait 50 $SETARCH make -s test-all -o exts TESTOPTS="${TESTOPTS} ${TEST_ALL_OPTS}" RUBYOPT="-w"
+  - $SETARCH make -s test-spec MSPECOPT=-ff # not using `-j` because sometimes `mspec -j` silently dies
+  - $SETARCH make -s -o showflags leaked-globals
 
 # Branch matrix.  Not all branches are Travis-ready so we limit branches here.
 branches:
   only:
-    - trunk
-    - ruby_2_1
-    - ruby_2_2
-    - ruby_2_3
-    - /^feature\//
-    - /^bug\//
+    - master
+    - ruby_2_4
+    - ruby_2_5
+    - ruby_2_6
+    - ruby_2_7
 
 # We want to be notified when something happens.
 notifications:
   irc:
     channels:
-      - "irc.freenode.org#ruby-core"
-      - "irc.freenode.org#ruby-ja"
+      - "chat.freenode.net#ruby-core"
     on_success: change # [always|never|change] # default: always
     on_failure: always # [always|never|change] # default: always
     template:
       - "%{message} by @%{author}: See %{build_url}"
 
-  # Update ruby-head installed on Travis CI so other projects can test against it.
   webhooks:
     urls:
-      - "https://rubies.travis-ci.org/rebuild/ruby-head"
-    on_success: always
-    on_failure: never
+      - secure: mRsoS/UbqDkKkW5p3AEqM27d4SZnV6Gsylo3bm8T/deltQzTsGzZwrm7OIBXZv0UFZdE68XmPlyHfZFLSP2V9QZ7apXMf9/vw0GtcSe1gchtnjpAPF6lYBn7nMCbVPPx9cS0dwL927fjdRM1vj7IKZ2bk4F0lAJ25R25S6teqdk= # ruby-lang slack: ruby/simpler-alerts-bot (travis)
+    on_success: never
+    on_failure: always
 
   email:
     - ko1c-failure@atdot.net
-    - shibata.hiroshi@gmail.com
-
-# Local Variables:
-# mode: YAML
-# coding: utf-8-unix
-# indent-tabs-mode: nil
-# tab-width: 4
-# fill-column: 79
-# default-justification: full
-# End:
diff --git a/BSDL b/BSDL
index a009caefea..66d93598aa 100644
--- a/BSDL
+++ b/BSDL
@@ -4,10 +4,10 @@ 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.
+   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.
+   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
diff --git a/COPYING b/COPYING
index 426810a7fb..48e5a96de7 100644
--- a/COPYING
+++ b/COPYING
@@ -2,55 +2,55 @@ Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.jp>.
 You can redistribute it and/or modify it under either the terms of the
 2-clause BSDL (see the file BSDL), or the conditions below:
 
-  1. You may make and give away verbatim copies of the source form of the
-     software without restriction, provided that you duplicate all of the
-     original copyright notices and associated disclaimers.
+1. You may make and give away verbatim copies of the source form of the
+   software without restriction, provided that you duplicate all of the
+   original copyright notices and associated disclaimers.
 
-  2. You may modify your copy of the software in any way, provided that
-     you do at least ONE of the following:
+2. You may modify your copy of the software in any way, provided that
+   you do at least ONE of the following:
 
-       a) place your modifications in the Public Domain or otherwise
-          make them Freely Available, such as by posting said
-	  modifications to Usenet or an equivalent medium, or by allowing
-	  the author to include your modifications in the software.
+   a. place your modifications in the Public Domain or otherwise
+      make them Freely Available, such as by posting said
+      modifications to Usenet or an equivalent medium, or by allowing
+      the author to include your modifications in the software.
 
-       b) use the modified software only within your corporation or
-          organization.
+   b. use the modified software only within your corporation or
+      organization.
 
-       c) give non-standard binaries non-standard names, with
-          instructions on where to get the original software distribution.
+   c. give non-standard binaries non-standard names, with
+      instructions on where to get the original software distribution.
 
-       d) make other distribution arrangements with the author.
+   d. make other distribution arrangements with the author.
 
-  3. You may distribute the software in object code or binary form,
-     provided that you do at least ONE of the following:
+3. You may distribute the software in object code or binary form,
+   provided that you do at least ONE of the following:
 
-       a) distribute the binaries and library files of the software,
-	  together with instructions (in the manual page or equivalent)
-	  on where to get the original distribution.
+   a. distribute the binaries and library files of the software,
+      together with instructions (in the manual page or equivalent)
+      on where to get the original distribution.
 
-       b) accompany the distribution with the machine-readable source of
-	  the software.
+   b. accompany the distribution with the machine-readable source of
+      the software.
 
-       c) give non-standard binaries non-standard names, with
-          instructions on where to get the original software distribution.
+   c. give non-standard binaries non-standard names, with
+      instructions on where to get the original software distribution.
 
-       d) make other distribution arrangements with the author.
+   d. make other distribution arrangements with the author.
 
-  4. You may modify and include the part of the software into any other
-     software (possibly commercial).  But some files in the distribution
-     are not written by the author, so that they are not under these terms.
+4. You may modify and include the part of the software into any other
+   software (possibly commercial).  But some files in the distribution
+   are not written by the author, so that they are not under these terms.
 
-     For the list of those files and their copying conditions, see the
-     file LEGAL.
+   For the list of those files and their copying conditions, see the
+   file LEGAL.
 
-  5. The scripts and library files supplied as input to or produced as
-     output from the software do not automatically fall under the
-     copyright of the software, but belong to whomever generated them,
-     and may be sold commercially, and may be aggregated with this
-     software.
+5. The scripts and library files supplied as input to or produced as
+   output from the software do not automatically fall under the
+   copyright of the software, but belong to whomever generated them,
+   and may be sold commercially, and may be aggregated with this
+   software.
 
-  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     PURPOSE.
+6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+   IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+   WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+   PURPOSE.
diff --git a/COPYING.ja b/COPYING.ja
index e50d01c8d1..230376bc60 100644
--- a/COPYING.ja
+++ b/COPYING.ja
@@ -2,50 +2,50 @@
 または以下に示す条件で本プログラムを再配布できます
 2-clause BSDLについてはBSDLファイルを参照して下さい．
 
-  1. 複製は制限なく自由です．
+1. 複製は制限なく自由です．
 
-  2. 以下の条件のいずれかを満たす時に本プログラムのソースを
-     自由に変更できます．
+2. 以下の条件のいずれかを満たす時に本プログラムのソースを
+   自由に変更できます．
 
-     (a) ネットニューズにポストしたり，作者に変更を送付する
-         などの方法で，変更を公開する．
+   a.  ネットニューズにポストしたり，作者に変更を送付する
+       などの方法で，変更を公開する．
 
-     (b) 変更した本プログラムを自分の所属する組織内部だけで
-         使う．
+   b.  変更した本プログラムを自分の所属する組織内部だけで
+       使う．
 
-     (c) 変更点を明示したうえ，ソフトウェアの名前を変更する．
-         そのソフトウェアを配布する時には変更前の本プログラ
-         ムも同時に配布する．または変更前の本プログラムのソー
-         スの入手法を明示する．
+   c.  変更点を明示したうえ，ソフトウェアの名前を変更する．
+       そのソフトウェアを配布する時には変更前の本プログラ
+       ムも同時に配布する．または変更前の本プログラムのソー
+       スの入手法を明示する．
 
-     (d) その他の変更条件を作者と合意する．
+   d.  その他の変更条件を作者と合意する．
 
-  3. 以下の条件のいずれかを満たす時に本プログラムをコンパイ
-     ルしたオブジェクトコードや実行形式でも配布できます．
+3. 以下の条件のいずれかを満たす時に本プログラムをコンパイ
+   ルしたオブジェクトコードや実行形式でも配布できます．
 
-     (a) バイナリを受け取った人がソースを入手できるように，
-         ソースの入手法を明示する．
+   a.  バイナリを受け取った人がソースを入手できるように，
+       ソースの入手法を明示する．
 
-     (b) 機械可読なソースコードを添付する．
+   b.  機械可読なソースコードを添付する．
 
-     (c) 変更を行ったバイナリは名前を変更したうえ，オリジナ
-         ルのソースコードの入手法を明示する．
+   c.  変更を行ったバイナリは名前を変更したうえ，オリジナ
+       ルのソースコードの入手法を明示する．
 
-     (d) その他の配布条件を作者と合意する．
+   d.  その他の配布条件を作者と合意する．
 
-  4. 他のプログラムへの引用はいかなる目的であれ自由です．た
-     だし，本プログラムに含まれる他の作者によるコードは，そ
-     れぞれの作者の意向による制限が加えられる場合があります．
+4. 他のプログラムへの引用はいかなる目的であれ自由です．た
+   だし，本プログラムに含まれる他の作者によるコードは，そ
+   れぞれの作者の意向による制限が加えられる場合があります．
 
-     それらファイルの一覧とそれぞれの配布条件などに付いては
-     LEGALファイルを参照してください．
+   それらファイルの一覧とそれぞれの配布条件などに付いては
+   LEGALファイルを参照してください．
 
-  5. 本プログラムへの入力となるスクリプトおよび，本プログラ
-     ムからの出力の権利は本プログラムの作者ではなく，それぞ
-     れの入出力を生成した人に属します．また，本プログラムに
-     組み込まれるための拡張ライブラリについても同様です．
+5. 本プログラムへの入力となるスクリプトおよび，本プログラ
+   ムからの出力の権利は本プログラムの作者ではなく，それぞ
+   れの入出力を生成した人に属します．また，本プログラムに
+   組み込まれるための拡張ライブラリについても同様です．
 
-  6. 本プログラムは無保証です．作者は本プログラムをサポート
-     する意志はありますが，プログラム自身のバグあるいは本プ
-     ログラムの実行などから発生するいかなる損害に対しても責
-     任を持ちません．
+6. 本プログラムは無保証です．作者は本プログラムをサポート
+   する意志はありますが，プログラム自身のバグあるいは本プ
+   ログラムの実行などから発生するいかなる損害に対しても責
+   任を持ちません．
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index ea906ebcd3..0000000000
--- a/ChangeLog
+++ /dev/null
@@ -1,6401 +0,0 @@
-Mon Jun 20 13:35:06 2016  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* vm.c (invoke_bmethod, invoke_block_from_c_0): revert r52104
-	  partially to avoid "self has wrong type to call super in this
-	  context" errors.
-	  [ruby-core:72724] [Bug #11954]
-
-Mon Jun 20 12:53:38 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* test/rubygems/test_gem_remote_fetcher.rb: OpenSSL::PKey::DH#priv_key=
-	  is not defined when ext/openssl is built with OpenSSL 1.1.0.
-	  https://github.com/rubygems/rubygems/pull/1648
-	  [ruby-core:75225] [Feature #12324]
-
-Sun Jun 19 21:25:43 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_ocsp.c: Add OCSP::SingleResponse that represents an
-	  OCSP SingleResponse structure. Also add two new methods #responses
-	  and #find_response to OCSP::BasicResponse. A BasicResponse has one or
-	  more SingleResponse. We have OCSP::BasicResponse#status that returns
-	  them as an array of arrays, each containing the content of a
-	  SingleResponse, but this is not useful. When validating an OCSP
-	  response, we need to look into the each SingleResponse and check their
-	  validity but it is not simple. For example, when validating for a
-	  certificate 'cert', the code would be like:
-
-	    # certid_target is an OpenSSL::OCSP::CertificateId for cert
-	    basic = res.basic
-	    result = basic.status.any? do |ary|
-	      ary[0].cmp(certid_target) &&
-	        ary[4] <= Time.now && (!ary[5] || Time.now <= ary[5])
-	    end
-
-	  Adding OCSP::SingleResponse at the same time allows exposing
-	  OCSP_check_validity(). With this, the code above can be rewritten as:
-
-	    basic = res.basic
-	    single = basic.find_response(certid_target)
-	    result = single.check_validity
-
-	* test/openssl/test_ocsp.rb: Test this.
-
-Sun Jun 19 18:40:19 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_ocsp.c (ossl_ocspbres_add_status): Allow specifying
-	  the times (thisUpdate, nextUpdate and revocationTime) with Time
-	  objects. Currently they accepts only relative seconds from the current
-	  time. This is inconvenience, especially for revocationTime. When
-	  Integer is passed, they are still treated as relative times. Since the
-	  type check is currently done with rb_Integer(), this is a slightly
-	  incompatible change. Hope no one passes a relative time as String or
-	  Time object...
-	  Also, allow passing nil as nextUpdate. It is optional.
-
-	* ext/openssl/ruby_missing.h: Define RB_INTEGER_TYPE_P() if not defined.
-	  openssl gem will be released before Ruby 2.4.0.
-
-Sun Jun 19 18:39:38 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_ocsp.c: Implement OCSP::{CertificateId,Request,
-	  BasicResponse,Response}#initialize_copy.
-	  [ruby-core:75504] [Bug #12381]
-
-	* test/openssl/test_ocsp.rb: Test them.
-
-Sun Jun 19 18:29:50 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_pkey_dh.c, ext/openssl/ossl_pkey_dsa.c,
-	  ext/openssl/ossl_pkey_ec.c, ext/openssl/ossl_pkey_rsa.c: Implement
-	  initialize_copy method for OpenSSL::PKey::*.
-	  [ruby-core:75504] [Bug #12381]
-
-	* test/openssl/test_pkey_dh.rb, test/openssl/test_pkey_dsa.rb,
-	  test/openssl/test_pkey_ec.rb, test/openssl/test_pkey_rsa.rb: Test they
-	  actually copy the OpenSSL objects, and modifications to cloned object
-	  don't affect the original object.
-
-Sun Jun 19 16:55:16 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/test_dir_m17n.rb: Skip tests with non-UTF-8 encodings
-	  on cygwin. Cygwin can use the Unicode PUA (private use area) to store
-	  bytes from non-UTF-8 filenames (see
-	  https://cygwin.com/cygwin-ug-net/using-specialnames.html#pathnames-specialchars),
-	  but we are not supporting this. [Bug #12443]
-
-Sun Jun 19 15:01:18 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* localeinit.c: Fix filesystem encoding for cygwin to UTF-8 (see
-	  https://cygwin.com/cygwin-ug-net/using-specialnames.html#pathnames-unusual)
-
-Sun Jun 19 14:31:07 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_pkey.h, ext/openssl/ossl_pkey_dh.c,
-	  ext/openssl/ossl_pkey_dsa.c, ext/openssl/ossl_pkey_rsa.c: A few days
-	  ago, OpenSSL changed {DH,DSA,RSA}_get0_*() to take const BIGNUM **.
-	  https://git.openssl.org/gitweb/?p=openssl.git;a=commit;h=fd809cfdbd6e32b6b67b68c59f6d55fbed7a9327
-	  [ruby-core:75225] [Feature #12324]
-
-Sun Jun 19 11:19:43 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* variable.c (rb_path_to_class): consider the string length
-	  instead of a terminator.
-
-	* variable.c (rb_path_to_class): search the constant at once
-	  instead of checking if defined and then getting it.
-
-Sat Jun 18 14:01:40 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* test/rubygems/test_gem_installer.rb: Fixed broken test with extension
-	  build. https://github.com/rubygems/rubygems/pull/1645
-
-Sat Jun 18 13:59:54 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update rubygems
-	  HEAD(2c6d256). It contains to update vendored Molinillo to 0.5.0.
-	  https://github.com/rubygems/rubygems/pull/1638
-
-Sat Jun 18 10:13:37 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (build-ext), ext/extmk.rb: use variable EXTENCS
-	  different than ENCOBJS, to get rid of circular dependency.
-	  build libencs when linking encodings statically.
-	  [ruby-core:75618] [Bug #12401]
-
-Sat Jun 18 08:52:46 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/stringio/stringio.c (strio_getline): fix pointer index
-	  overflow.  reported by Guido Vranken <guido AT guidovranken.nl>.
-
-Thu Jun 16 16:35:35 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* class.c (Init_class_hierarchy): prevent rb_cObject which is the
-	  class tree root, from GC.  [ruby-dev:49666] [Bug #12492]
-
-Thu Jun 16 12:17:52 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (tr_trans): adjust buffer size by processed and rest
-	  lengths, instead of doubling repeatedly.
-
-Thu Jun 16 11:15:25 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (tr_trans): consider terminator length and fix heap
-	  overflow.  reported by Guido Vranken <guido AT guidovranken.nl>.
-
-Thu Jun 16 00:02:32 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_ocsp.c (ossl_ocspreq_verify, ossl_ocspbres_verify):
-	  Use ossl_clear_error() so that they don't print warnings to stderr and
-	  leak errors in the OpenSSL error queue. Also, check the return value
-	  of OCSP_*_verify() correctly. They can return -1 on verification
-	  failure.
-
-Wed Jun 15 19:52:23 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_ocsp.c (ossl_ocspreq_sign, ossl_ocspbres_sign): Allow
-	  specifying hash algorithm used in signing. They are hard coded to use
-	  SHA-1.
-	  Based on a patch provided by Tim Shirley <tidoublemy@gmail.com>.
-	  [ruby-core:70915] [Feature #11552] [GH ruby/openssl#28]
-
-	* test/openssl/test_ocsp.rb: Test sign-verify works.
-
-Wed Jun 15 01:46:16 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c: [DOC] fix rdoc directive, and an example of negative
-	  value.  [ruby-core:76025] [Bug #12487]
-
-Wed Jun 15 01:44:42 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/mkconfig.rb: provide Unicode Version information as
-	  RbConfig::CONFIG['UNICODE_VERSION'].
-	  [ruby-core:75845] [Feature #12460]
-
-Wed Jun 15 00:01:18 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* test/ruby/enc/test_case_comprehensive.rb
-	  (TestComprehensiveCaseFold::read_data): use \A and \z instead of
-	  ^ and $ in regexp.
-
-Tue Jun 14 23:43:00 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/backward.h (rb_cFixnum, rb_cBignum): remove the
-	  backward compatibility macros, to fail incompatible extension
-	  libraries early.  [Bug #12427]
-
-Tue Jun 14 22:22:07 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* strftime.c (rb_strftime_with_timespec): limit the result string
-	  size by the format length, to get rid of unlimited memory use.
-
-Tue Jun 14 22:11:11 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_ocsp.c (ossl_ocspcid_get_issuer_name_hash,
-	  ossl_ocspcid_get_issuer_key_hash, ossl_ocspcid_get_hash_algorithm):
-	  Add accessor methods OCSP::CertificateId#issuer_name_hash,
-	  #issuer_key_hash, #hash_algorithm.
-	  Based on a patch provided by Paul Kehrer <paul.l.kehrer@gmail.com>.
-	  [ruby-core:48062] [Feature #7181]
-
-	* test/openssl/test_ocsp.rb: Test these new methods.
-
-Tue Jun 14 22:07:25 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/date/date_strftime.c (date_strftime_with_tmx): reject too
-	  large precision to get rid of buffer overflow.
-	  reported by Guido Vranken <guido AT guidovranken.nl>.
-
-Tue Jun 14 21:40:42 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_ocsp.c (ossl_ocspbres_to_der, ossl_ocspcid_to_der):
-	  Implement #to_der methods for OCSP::BasicResponse and
-	  OCSP::CertificateId.
-
-	  (ossl_ocspreq_initialize, ossl_ocspres_initialize): Use GetOCSP*()
-	  instead of raw DATA_PTR().
-
-	  (ossl_ocspbres_initialize, ossl_ocspcid_initialize): Allow
-	  initializing from DER string.
-
-	  (Init_ossl_ocsp): Define new #to_der methods.
-
-	* test/openssl/test_ocsp.rb: Test these changes. Also add missing tests
-	  for OCSP::{Response,Request}#to_der.
-
-Tue Jun 14 21:35:00 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/openssl_missing.h (DH_set0_pqg, RSA_set0_key):
-	  DH_set0_pqg() allows 'q' to be NULL. Fix a typo in RSA_set0_key().
-	  Fixes r55285.  [ruby-core:75225] [Feature #12324]
-
-Mon Jun 14 10:19:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* NEWS: describe Integer#digits.
-
-Mon Jun 13 21:09:40 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* thread.c (debug_deadlock_check): show thread lock dependency and
-	  backtrace [Feature #8214] [ruby-dev:47217]
-
-	* thread.c (thread_status_name): show "sleep_forever" instead of
-	  "sleep" if called from inspect.
-
-Mon Jun 13 20:50:07 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (reg_named_capture_assign_iter): remove named capture
-	  conflict warnings.  it is just annoying rather than useful.
-	  [ruby-core:75416] [Bug #12359]
-
-Mon Jun 13 20:04:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* numeric.c (rb_int_digits, rb_fix_digits, rb_int_digits_bigbase):
-	  Add Integer#digits to extract columns in place-value notation
-	  [Feature #12447] [ruby-core:75799]
-
-	* test/ruby/test_integer.rb: Add tests for the above change.
-
-	* test/ruby/test_bignum.rb: ditto.
-
-Mon Jun 13 20:34:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (RUBY_INTEGER_UNIFICATION): macro to tell if
-	  Integer is integrated.  [ruby-core:75718][Bug #12427]
-
-	* include/ruby/backward.h, internal.h (rb_cFixnum, rb_cBignum):
-	  fallback to rb_cInteger.
-
-	* bignum.c, numeric.c, ext/json/generator/generator.{c,h}: use the
-	  macro.
-
-Mon Jun 13 16:58:53 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_case_comprehensive.rb: Add tests for full Unicode
-	  swapcase.
-
-Sun Jun 12 14:48:00 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_case_comprehensive.rb: Add tests for ASCII-only
-	  swapcase; store calculated values in hashes.
-
-Sun Jun 12 14:05:45 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_cipher.c (ossl_cipher_get_auth_tag,
-	  ossl_cipher_set_auth_tag): Check if the cipher flags retrieved by
-	  EVP_CIPHER_CTX_flags() includes EVP_CIPH_FLAG_AEAD_CIPHER to see if
-	  the cipher supports AEAD. AES-GCM was the only supported in OpenSSL
-	  1.0.1.
-
-	  (Init_ossl_cipher): Fix doc; OpenSSL::Cipher::AES.new(128, :GCM) can't
-	  work.
-
-	* ext/openssl/openssl_missing.h: Define EVP_CTRL_AEAD_{GET,SET}_TAG if
-	  missing. They are added in OpenSSL 1.1.0, and have the same value as
-	  EVP_CTRL_GCM_{GET,SET}_TAG and EVP_CTRL_CCM_{GET,SET}_TAG.
-
-Sun Jun 12 13:47:42 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* test/openssl/test_engine.rb (test_openssl_engine_builtin,
-	  test_openssl_engine_by_id_string): Skip test if 'openssl' engine is
-	  already loaded. And test the number increased by Engine.load{_by_id,},
-	  not the total count of loaded engines. Previously, we called
-	  OpenSSL::Engine.cleanup every time running a test case, but we no
-	  longer can do it.
-	  [ruby-core:75225] [Feature #12324]
-
-Sun Jun 12 09:24:34 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (append_fspath): normalize directory name to be appended
-	  on OS X.  [ruby-core:75957] [Ruby trunk Bug#12483]
-	  https://github.com/rails/rails/issues/25303#issuecomment-224834804
-
-Sat Jun 11 23:07:32 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/forwardable.rb (_delegator_method): get rid of a warning which
-	  causes test failures introduced at r55376.
-
-Sat Jun 11 18:37:58 2016  Marcus Stollsteimer  <sto.mar@web.de>
-
-	* ext/json/lib/*.rb: Removed some comments. Because these are unnecessary
-	  class description. [ci skip][Bug #12255][ruby-core:74835]
-
-Sat Jun 11 15:19:38 2016  takiy33  <takiy33@users.noreply.github.com>
-
-	* lib/net/smtp.rb: [DOC] Remove dead link on documentation for
-	  Japanese of SMTP.  [Fix GH-1380]
-
-Sat Jun 11 15:02:45 2016  Grant Hutchins  <github@nertzy.com>
-
-	* string.c (rb_str_oct): [DOC] fix typo, hornored -> honored.
-	  [Fix GH-1379]
-
-Sat Jun 11 14:04:19 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/objspace/objspace_dump.c: generate valid JSON for dump_all.
-
-Sat Jun 11 13:52:33 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/forwardable.rb (_delegator_method): remove __send__ call if
-	  possible, so that more optimizations will be enabled.
-
-Sat Jun 11 11:24:36 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enc/iso_8859.h (SHARP_s): name frequently used codepoint.
-
-Sat Jun 11 09:58:45 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/iso_8859_1.c: Revert to older version of code.
-
-Sat Jun 11 09:46:17 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/iso_8859_1.c: Implement non-ASCII case mapping.
-
-	* test/ruby/enc/test_case_comprehensive.rb: Tests for above.
-
-	* string.c: Add iso-8859-1 to supported encodings.
-
-Sat Jun 11 09:31:28 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/forwardable.rb (_delegator_method): leave the backtrace
-	  untouched during accessor.  forwardable.rb does not appear in
-	  the backtrace during delegated method because of tail-call
-	  optimization.
-
-Sat Jun 11 01:38:31 2016  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* include/ruby/defines.h (GCC_VERSION_SINCE): Fix logic error by
-	  adding parentheses. Fix failures of TestMkmf::TestConvertible
-	  with GCC 3.4.3 on Solaris 10. [Bug #12479] [ruby-dev:49660]
-
-Fri Jun 10 21:54:24 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/forwardable.rb (Forwardable._delegator_method): extract
-	  method generator and deal with non-module objects.
-	  [ruby-dev:49656] [Bug #12478]
-
-Fri Jun 10 17:35:11 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* string.c: Special-case :ascii option in rb_str_capitalize_bang and
-	  rb_str_swapcase_bang.
-
-Fri Jun 10 17:12:24 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* string.c: Special-case :ascii option in rb_str_upcase_bang (retry).
-
-Fri Jun 10 14:48:36 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* hash.c (get_env_cstr): ensure NUL-terminated.
-	  [ruby-dev:49655] [Bug #12475]
-
-	* string.c (rb_str_fill_terminator): return the pointer to the
-	  NUL-terminated content.
-
-Thu Jun  9 21:42:00 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_asn1.c (asn1integer_to_num): Use
-	  ASN1_ENUMERATED_to_BN() to convert an ASN1_ENUMERATED to a BN.
-	  Starting from OpenSSL 1.1.0, ASN1_INTEGER_to_BN() rejects
-	  non-ASN1_INTEGER objects. The format of INTEGER and ENUMERATED are
-	  almost identical so they behaved in the same way in OpenSSL <= 1.0.2.
-	  [ruby-core:75225] [Feature #12324]
-
-	* test/openssl/test_asn1.rb (test_decode_enumerated): Test that it
-	  works.
-
-Thu Jun  9 21:10:04 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* tool/ifchange: fix timestamp error when target without
-	  directory.
-
-Thu Jun  9 19:46:22 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_ssl.c: Add define guards for OPENSSL_NO_EC.
-	  SSL_CTX_set_ecdh_auto() is defined even when ECDH is disabled in
-	  OpenSSL's configuration. This fixes r55214.
-
-	* test/openssl/test_pair.rb (test_ecdh_curves): Skip if the OpenSSL does
-	  not support ECDH.
-
-	* test/openssl/utils.rb (start_server): Ignore error in
-	  SSLContext#ecdh_curves=.
-
-Thu Jun  9 18:12:42 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* Makefile.in (un-runnable): fail with proper error message.
-	  [ruby-core:75905] [Bug #12472]
-
-Thu Jun  9 15:32:17 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (RBCONFIG): use ifchange tool to see if the content is
-	  changed and update the timestamp file.
-
-	* tool/mkconfig.rb: remove ifchange features.
-
-	* tool/ifchange: make target directory if it does not exist with
-	  its parent directories.
-
-	* win32/ifchange.bat: drop support for command.com used on old
-	  systems.
-
-Thu Jun  9 15:03:35 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/extconf.rb: Check for CRYPTO_malloc() and SSL_new().
-	  OpenSSL_add_all_digests() and SSL_library_init() are deprecated and
-	  converted to macros in OpenSSL 1.1.0.
-	  [ruby-core:75225] [Feature #12324]
-
-Wed Jun  8 23:09:51 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* string.c (rb_str_ascii_casemap): fix compile error.
-
-Wed Jun  8 22:22:24 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* string.c: Revert previous commit (possibility of endless loop).
-
-Wed Jun  8 21:57:41 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* string.c: Special-case :ascii option in rb_str_upcase_bang.
-
-Wed Jun  8 21:28:36 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* string.c: New static function rb_str_ascii_casemap; special-casing
-	  :ascii option in rb_str_upcase_bang and rb_str_downcase_bang.
-
-	* regenc.c: Fix a bug (wrong use of unnecessary slack at end of string).
-
-	* regenc.h -> include/ruby/oniguruma.h: Move declaration of
-	  onigenc_ascii_only_case_map so that it is visible in string.c.
-
-Wed Jun  8 20:33:44 2016  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* include/ruby/intern.h: Remove excess semicolons in PUREFUNC().
-	  Fix failure of TestMkmf::TestConvertible on Solaris with
-	  Oracle Solaris Studio 12. [ruby-dev:49651] [Bug #12470]
-	* internal.h: ditto.
-
-Wed Jun  8 16:03:09 2016  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/smtp.rb (getok, get_response): raise an ArgumentError when
-	  CR or LF is included in a line, because they are not allowed in
-	  RFC5321.  Thanks, Jeremy Daer.
-
-Tue Jun  7 21:27:25 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* test/rubygems/*_{cert,cert_32}.pem: Regenerate test certificates for
-	  OpenSSL 1.1.0. This is already in upstream.
-	  https://github.com/rubygems/rubygems/commit/9be5c53939440a61c4bba73cfffbeb5cfadf72be
-	  [ruby-core:75225] [Feature #12324]
-
-Tue Jun  7 21:27:17 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* test/open-uri/test_ssl.rb: Regenerate test certificates. The test CA
-	  certificate was incorrectly generated. A CA certificate must have the
-	  basic constraints extension with cA bit set to TRUE. OpenSSL <= 1.0.2
-	  allowed the error when the certificate is in the trusted store but
-	  OpenSSL 1.1.0 no longer does.
-	  [ruby-core:75225] [Feature #12324]
-
-Tue Jun  7 21:20:38 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* test/openssl/test_x509name.rb: Don't register OID for 'emailAddress'
-	  and 'serialNumber'. A recent change in OpenSSL made OBJ_create()
-	  reject an already existing OID. They were needed to run tests with
-	  OpenSSL 0.9.6 which is now unsupported.
-	  https://git.openssl.org/gitweb/?p=openssl.git;a=commit;h=52832e470f5fe8c222249ae5b539aeb3c74cdb25
-	  [ruby-core:75225] [Feature #12324]
-
-	* test/openssl/test_ssl_session.rb (test_server_session): Duplicate
-	  SSL::Session before re-adding to the session store. OpenSSL 1.1.0
-	  starts rejecting SSL_SESSION once removed by SSL_CTX_remove_session().
-	  https://git.openssl.org/gitweb/?p=openssl.git;a=commit;h=7c2d4fee2547650102cd16d23f8125b76112ae75
-
-	* test/openssl/test_pkey_ec.rb (setup): Remove X25519 from @keys. X25519
-	  is new in OpenSSL 1.1.0 but this is for key agreement and not for
-	  signing.
-
-	* test/openssl/test_pair.rb, test/openssl/test_ssl.rb,
-	  test/openssl/utils.rb: Set security level to 0 when using aNULL cipher
-	  suites.
-
-	* test/openssl/utils.rb: Use 1024 bits DSA key for client certificates.
-
-	* test/openssl/test_engine.rb: Run each test in separate process.
-	  We can no longer cleanup engines explicitly as ENGINE_cleanup() was
-	  removed.
-	  https://git.openssl.org/gitweb/?p=openssl.git;a=commit;h=6d4fb1d59e61aacefa25edc4fe5acfe1ac93f743
-
-	* ext/openssl/ossl_engine.c (ossl_engine_s_cleanup): Add a note to the
-	  RDoc for Engine.cleanup.
-
-	* ext/openssl/lib/openssl/digest.rb: Don't define constants for DSS,
-	  DSS1 and SHA(-0) when using with OpenSSL 1.1.0. They are removed.
-
-	* test/openssl/test_digest.rb, test/openssl/test_pkey_dsa.rb,
-	  test/openssl/test_pkey_dsa.rb, test/openssl/test_ssl.rb,
-	  test/openssl/test_x509cert.rb, test/openssl/test_x509req.rb: Don't
-	  test unsupported hash functions.
-
-Tue Jun  7 17:49:52 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_case_comprehensive: Change test for encodings
-	  without any non-ASCII case conversions from ASCII-only test
-	  to full test.
-
-Tue Jun  7 17:18:39 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* string.c (rb_str_upcase_bang, rb_str_capitalize_bang,
-	  rb_str_swapcase_bang): Switch to use primitive.
-
-Tue Jun  7 16:44:16 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* string.c (rb_str_downcase_bang): Switch to use primitive except if
-	  conversion can be done ASCII-only.
-
-Tue Jun  7 16:13:36 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_case_comprehensive: Add regression tests for
-	  current ASCII-only case conversion.
-
-Tue Jun  7 15:28:38 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_case_comprehensive: Fix method name
-	  (generate_casefold_tests -> generate_case_mapping_tests).
-
-Tue Jun  7 15:05:13 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* regenc.h/c: Rename onigenc_not_support_case_map to
-	  onigenc_ascii_only_case_map.
-
-	* regenc.h: Add definition of onigenc_single_byte_ascii_only_case_map.
-
-	* enc/iso_8859_X.c, windows_125X.c, ascii.c, us-ascii.c, koi8_x.c:
-	  Replace onigenc_not_support_case_map by
-	  onigenc_single_byte_ascii_only_case_map.
-
-	* enc/big5.c, cp949.c, emacs_mule.c, euc_X.c, gbX.c, shift_jis.c,
-	  windows_31j.c: Replace onigenc_not_support_case_map by
-	  onigenc_ascii_only_case_map.
-
-Tue Jun  7 14:57:09 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/extconf.rb: Check for SSL_CTX_set_min_proto_version()
-	  macro added in OpenSSL 1.1.0. Version-specific methods, such as
-	  TLSv1_method(), are deprecated in OpenSSL 1.1.0. We need to use
-	  version-flexible methods (TLS_*method() or SSLv23_*method()) and
-	  disable other protocol versions as necessary.
-	  [ruby-core:75225] [Feature #12324]
-
-	* ext/openssl/ossl_ssl.c: Use SSL_CTX_set_{min,max}_proto_version() to
-	  fix the protocol version.
-
-Tue Jun  7 12:55:34 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* regenc.c (onigenc_not_support_case_map): Move to end of file;
-	  (onigenc_single_byte_ascii_only_case_map): Add new function.
-
-Tue Jun  7 09:26:37 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* regenc.c (onigenc_not_support_case_map): Rewrite to work correctly
-	  in ASCII range.
-
-Mon Jun  6 23:00:00 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* appveyor.yml: Update libressl version to 2.3.5.
-
-Mon Jun  6 18:37:57 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_insnhelper.c (vm_throw_start): check if the iseq is symbol
-	  proc, class definition should not be a symbol proc.
-	  [ruby-core:75856] [Bug #12462]
-
-Mon Jun  6 18:36:34 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* string.c: Added UTF-16BE/LE and UTF-32BE/LE to supported encodings
-	  for Unicode case mapping.
-
-	* test/ruby/enc/test_case_comprehensive.rb: Tests for above
-	  functionality; fixed an encoding issue in assertion error message.
-
-Mon Jun  6 17:29:35 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_case_comprehensive.rb: Speed up testing for small
-	  encodings by preselecting codepoints.
-
-Mon Jun  6 17:10:50 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_cipher.c (ossl_cipher_free): Use EVP_CIPHER_CTX_free()
-	  to free EVP_CIPHER_CTX allocated by EVP_CIPHER_CTX_new().
-	  [ruby-core:75225] [Feature #12324]
-
-Mon Jun  6 13:37:08 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* string.c Change rb_str_casemap to use encoding primitive
-	  case_map instead of directly calling onigenc_unicode_case_map.
-
-Mon Jun  6 13:16:46 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_case_mapping.rb:
-	  Remove :lithuanian guard for Unicode case mapping.
-
-Mon Jun  6 10:39:56 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/openssl_missing.h: Include ruby/config.h. r55285 added
-	  some inline functions but VC does not recognize 'inline' keyword.
-
-Mon Jun  6 09:25:34 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (thread_start_func_2): report raised exception if
-	  report_on_exception flag is set.  [Feature #6647]
-
-Mon Jun  6 01:36:24 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/extconf.rb: Check existence of SSL_is_server(). This
-	  function was introduced in OpenSSL 1.0.2.
-	  [ruby-core:75225] [Feature #12324]
-
-	* ext/openssl/openssl_missing.h: Implement SSL_is_server() if missing.
-
-	* ext/openssl/ossl_ssl.c (ssl_info_cb): Use SSL_is_server() to see if
-	  the SSL is server. The state machine in OpenSSL was rewritten and
-	  SSL_get_state() no longer returns SSL_ST_ACCEPT.
-
-	  (ossl_ssl_cipher_to_ary, ossl_sslctx_session_get_cb): Add some
-	  `const`s to suppress warning.
-
-Mon Jun  6 01:18:10 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_asn1.c (decode_bool): Do the same thing as
-	  d2i_ASN1_BOOLEAN() does by ourselves. This function is removed in
-	  OpenSSL 1.1.0.
-	  [ruby-core:75225] [Feature #12324]
-
-Mon Jun  6 00:34:16 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/extconf.rb: Check existence of accessor functions that
-	  don't exist in OpenSSL 0.9.8. OpenSSL 1.1.0 made most of its
-	  structures opaque and requires use of these accessor functions.
-	  [ruby-core:75225] [Feature #12324]
-
-	* ext/openssl/openssl_missing.[ch]: Implement them if missing.
-
-	* ext/openssl/ossl*.c: Use these accessor functions.
-
-	* test/openssl/test_hmac.rb: Add missing test for HMAC#reset.
-
-Mon Jun  6 00:00:13 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/openssl_missing.[ch]: Implement EVP_PKEY_get0_*() and
-	  {RSA,DSA,EC_KEY,DH}_get0_*() functions.
-	  OpenSSL 1.1.0 makes EVP_PKEY/RSA/DSA/DH opaque. We used to provide
-	  setter methods for each parameter of each PKey type, for example
-	  PKey::RSA#e=, but this is no longer possible because the new API
-	  RSA_set0_key() requires the 'n' at the same time. This commit adds
-	  deprecation warning to them and adds PKey::*#set_* methods as direct
-	  wrapper for those new APIs. For example, 'rsa.e = 3' now needs to be
-	  rewritten as 'rsa.set_key(rsa.n, 3, rsa.d)'.
-	  [ruby-core:75225] [Feature #12324]
-
-	* ext/openssl/ossl_pkey*.[ch]: Use the new accessor functions. Implement
-	  RSA#set_{key,factors,crt_params}, DSA#set_{key,pqg}, DH#set_{key,pqg}.
-	  Emit a warning with rb_warning() when old setter methods are used.
-
-	* test/drb/ut_array_drbssl.rb, test/drb/ut_drb_drbssl.rb,
-	  test/rubygems/test_gem_remote_fetcher.rb: Don't set a priv_key for DH
-	  object that are used in tmp_dh_callback. Generating a new key pair
-	  every time should be fine - actually the private exponent is ignored
-	  in OpenSSL >= 1.0.2f/1.0.1r even if we explicitly set.
-	  https://www.openssl.org/news/secadv/20160128.txt
-
-Sun Jun  5 22:06:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* configure.in: Fix the timing to detect the appropriate C++ compiler
-	  in OS X.
-
-Sun Jun  5 21:42:24 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/extconf.rb: Check absence of CRYPTO_lock() to see if the
-	  OpenSSL has the new threading API. In OpenSSL <= 1.0.2, an application
-	  had to set locking callbacks to use OpenSSL in a multi-threaded
-	  environment. OpenSSL 1.1.0 now finds pthreads or Windows threads so we
-	  don't need to do something special.
-	  [ruby-core:75225] [Feature #12324]
-
-	  Also check existence of *_up_ref(). Some structures in OpenSSL have
-	  a reference counter. We used to increment it with CRYPTO_add() which
-	  is a part of the old API.
-
-	* ext/openssl/openssl_missing.h: Implement *_up_ref() if missing.
-
-	* ext/openssl/ossl.c: Don't set locking callbacks if unneeded.
-
-	* ext/openssl/ossl_pkey.c, ext/openssl/ossl_ssl.c,
-	  ext/openssl/ossl_x509cert.c, ext/openssl/ossl_x509crl.c,
-	  ext/openssl/ossl_x509store.c: Use *_up_ref() instead of CRYPTO_add().
-
-Sun Jun  5 21:38:13 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/extconf.rb: Check if RAND_pseudo_bytes() is usable. It is
-	  marked as deprecated in OpenSSL 1.1.0.
-	  [ruby-core:75225] [Feature #12324]
-
-	* ext/openssl/ossl_rand.c: Disable Random.pseudo_bytes if
-	  RAND_pseudo_bytes() is unavailable.
-
-	* test/openssl/test_random.rb: Don't test Random.pseudo_bytes if not
-	  defined.
-
-Sun Jun  5 19:06:40 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* NEWS: Add news about Unicode-wide case mapping for
-	  String/Symbol#upcase/downcase/swapcase/capitalize(!).
-
-Sun Jun  5 15:24:33 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_case_comprehensive.rb:
-	  Remove :lithuanian guard for Unicode case mapping.
-
-Sun Jun  5 14:46:34 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* string.c: Remove :lithuanian guard for Unicode case mapping.
-
-Sat Jun  4 10:54:52 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* missing/crypt.h (struct crypt_data): remove unnecessary member
-	  "initialized".
-
-	* missing/crypt.c (des_setkey_r): nothing to be initialized in
-	  crypt_data.
-
-	* configure.in (struct crypt_data): check for "initialized" in
-	  struct crypt_data, which may be only in glibc, and isn't on AIX
-	  at least.
-
-Sat Jun  4 10:38:39 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/win32.c: unify MAX_PATH, _MAX_PATH, and MAXPATHLEN to
-	  PATH_MAX, except for MAX_PATH in get_special_folder for an API
-	  limit.
-
-Fri Jun  3 21:27:22 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (process_options): rb_str_conv_enc() never set encoding
-	  of the source string, but returns the string itself if the
-	  conversion failed.  then the instance variable does not need to
-	  be set again.
-
-Fri Jun  3 18:04:37 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ruby.c (process_options): need to duplicate path before passing it to
-	  rb_str_conv_enc() because the function might call rb_enc_associate()
-	  internally.  this fixes test failures on Windows introduced at r55260.
-
-Fri Jun  3 17:44:25 2016  Reiner Herrmann  <reiner@reiner-h.de>
-
-	* lib/mkmf.rb (create_makefile): sort lists of source and object
-	  files in generated Makefile, unless given by extconf.rb.
-	  [Fix GH-1367]
-
-Thu Jun  2 21:18:10 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/win32.c (get_special_folder): use SHGetPathFromIDListEx if
-	  available instead of old SHGetPathFromIDListW, to check the
-	  buffer size.
-
-Thu Jun  2 17:05:19 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (ruby_init_loadpath_safe): remove MAXPATHLEN restriction
-	  for Windows 10.
-
-Thu Jun  2 16:51:35 2016  Koichi ITO  <koic.ito@gmail.com>
-
-	* misc/ruby-mode.el (ruby-here-doc-beg-re),
-	  (ruby-here-doc-beg-match, ruby-parse-partial): Support for
-	  `squiggly heredoc' syntax in ruby-mode.  [Fix GH-1372]
-
-Thu Jun  2 10:24:48 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* string.c: Raise ArgumentError when invalid string is detected in
-	  case mapping methods.
-
-	* enc/unicode.c: Check for invalid string and signal with negative
-	  length value.
-
-	* test/ruby/enc/test_case_mapping.rb: Add tests for above.
-
-	* test/ruby/test_m17n_comb.rb: Add a message to clarify test failure.
-
-Wed Jun  1 21:41:05 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/extconf.rb: Check existence of ASN1_TIME_adj(). The old
-	  ASN1_TIME_set() is not Year 2038 ready on sizeof(time_t) == 4
-	  environment. This function was added in OpenSSL 1.0.0.
-	  [ruby-core:45552] [Bug #6571]
-
-	* ext/openssl/ossl_asn1.c (ossl_time_split): Added. Split the argument
-	  (Time) into the number of days elapsed since the epoch and the
-	  remainder seconds to conform to ASN1_TIME_adj().
-	  (obj_to_asn1utime, obj_to_asn1gtime): Use ossl_time_split() and
-	  ASN1_*TIME_adj().
-
-	* ext/openssl/ossl_asn1.h: Add the function prototype for
-	  ossl_time_split().
-
-	* ext/openssl/ossl_x509.[ch]: Add ossl_x509_time_adjust(). Similarly to
-	  obj_to_asn1*time(), use X509_time_adj_ex() instead of X509_time_adj().
-
-	* ext/openssl/ossl_x509cert.c, ext/openssl/ossl_x509crl.c,
-	  ext/openssl/ossl_x509revoked.c: Use ossl_x509_time_adjust().
-
-Wed Jun  1 15:58:20 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in: revert r55237.  replace crypt, not crypt_r, and
-	  check if crypt is broken more.
-
-	* missing/crypt.c: move crypt_r.c
-
-	* string.c (rb_str_crypt): use crypt_r if provided by the system.
-
-Wed Jun  1 14:07:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* missing/crypt_r.c (a64toi): initialize statically and fix out of
-	  bounds access when salt is not 7bit clean.
-
-Wed Jun  1 11:34:59 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/Makefile.sub (MISSING): fixed build error introduced at r55237.
-
-Wed Jun  1 09:48:06 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_crypt): use reentrant crypt_r.
-
-Wed Jun  1 09:37:26 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* missing/crypt.c (des_setkey): void function never returns any value.
-
-Wed Jun  1 09:16:22 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* crypt.h: separate header file from missing/crypt.c.
-
-	* missing/crypt.c (crypt_r, setkey_r, encrypt_r): add reentrant
-	  versions.
-
-Wed Jun  1 02:25:38 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* missing/crypt.c: fix size macros to use configured values
-	  for platforms long is larger than 32bit.
-	  [ruby-core:75792] [Bug #12446]
-
-Tue May 31 17:28:46 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/optparse.rb (OptionParser::Completion.candidate): get rid of
-	  nil as key names.  [ruby-core:75773] [Bug #12438]
-
-	* lib/optparse.rb (OptionParser#make_switch): char class option
-	  cannot be NoArgument, default to RequiredArgument.
-
-Tue May 31 00:30:11 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/socket/raddrinfo.c (host_str, port_str): Use StringValueCStr
-	  instead of (Safe)StringValue, to detect NUL byte in the string.
-
-Mon May 30 22:02:01 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_asn1.c (time_to_time_t): Use NUM2TIMET() instead of
-	  NUM2LONG(). time_t may be larger than long.
-	  [ruby-core:45552] [Bug #6571]
-
-Mon May 30 21:15:37 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* string.c: Document current behavior for other case mapping methods
-	  on String. [ci skip]
-
-Mon May 30 20:00:25 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* string.c: Document current situation for String#downcase. [ci skip]
-
-Mon May 30 18:29:28 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_ssl.c (ossl_sslctx_s_alloc): Enable the automatic
-	  curve selection for ECDH by calling SSL_CTX_set_ecdh_auto(). With
-	  this a TLS server automatically selects a curve which both the client
-	  and the server support to use in ECDH. This changes the default
-	  behavior but users can still disable ECDH by excluding 'ECDH' cipher
-	  suites from the cipher list (with SSLContext#ciphers=). This commit
-	  also deprecate #tmp_ecdh_callback=. It was added in Ruby 2.3.0. It
-	  wraps SSL_CTX_set_tmp_ecdh_callback() which will be removed in OpenSSL
-	  1.1.0. Its callback receives two values 'is_export' and 'keylength'
-	  but both are completely useless for determining a curve to use in
-	  ECDH. The automatic curve selection was introduced to replace this.
-
-	  (ossl_sslctx_setup): Deprecate SSLContext#tmp_ecdh_callback=. Emit a
-	  warning if this is in use.
-
-	  (ossl_sslctx_set_ecdh_curves): Add SSLContext#ecdh_curves=. Wrap
-	  SSL_CTX_set1_curves_list(). If it is not available, this falls back
-	  to SSL_CTX_set_tmp_ecdh().
-
-	  (Init_ossl_ssl): Define SSLContext#ecdh_curves=.
-
-	* ext/openssl/extconf.rb: Check the existence of EC_curve_nist2nid(),
-	  SSL_CTX_set1_curves_list(), SSL_CTX_set_ecdh_auto() and
-	  SSL_CTX_set_tmp_ecdh_callback().
-
-	* ext/openssl/openssl_missing.[ch]: Implement EC_curve_nist2nid() if
-	  missing.
-
-	* test/openssl/test_pair.rb (test_ecdh_callback): Use
-	  EnvUtil.suppress_warning to suppress deprecated warning.
-
-	  (test_ecdh_curves): Test that SSLContext#ecdh_curves= works.
-
-	* test/openssl/utils.rb (start_server): Use SSLContext#ecdh_curves=.
-
-Mon May 30 16:28:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/socket/raddrinfo.c (host_str, port_str): use RSTRING_LEN
-	  instead of strlen, since RSTRING_PTR StringValueCStr may not be
-	  NUL-terminated when SHARABLE_MIDDLE_SUBSTRING=1.  reported by
-	  @tmtms, http://twitter.com/tmtms/status/736910516229005312
-
-Mon May 30 16:20:26 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (str_fill_term): return new pointer reallocated by
-	  filling terminator.
-
-Mon May 30 14:54:58 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/stringio/stringio.c (enc_subseq): share the return value and
-	  the buffer as possible.
-
-Mon May 30 14:50:25 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (str_substr, rb_str_aref): refactor not to create
-	  unnecessary empty string.
-
-	* string.c (str_byte_substr, str_byte_aref): ditto.
-
-Mon May 30 00:09:37 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/-test-/auto_ext.rb: fixed a heedless bug introduced at r55198.
-	  this change will make RubyCI green.
-
-Sun May 29 22:58:19 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* regexec.c (ONIGENC_IS_MBC_ASCII_WORD): redefine optimized one.
-	  WORD of Ruby's ascii compatible encoding is always [a-zA-Z0-9_].
-
-Sun May 29 22:44:19 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* regexec.c (match_at): make compilers optimize harder.
-
-Sun May 29 12:08:42 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/-test-/auto_ext.rb (auto_ext): utility method to create
-	  extension libraries for tests.
-
-Sat May 28 20:40:57 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* misc/ruby-additional.el (ruby-insert-heredoc-code-block): insert
-	  here document code block for assert_separately mainly.
-
-Sat May 28 20:34:19 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/test_unicode_normalize.rb: Add test to check for availability of
-	  Unicode data file; refactoring; fix an error with tests for destructive
-	  method (unicode_normalize!).
-
-Sat May 28 19:08:36 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_case_comprehensive.rb: Add error messages to tests
-	  for data file availability; refactoring.
-
-Sat May 28 14:00:10 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/lib/openssl/ssl.rb (SSLSocket): Move the implementation of
-	  SSLSocket#initialize to C. Initialize the SSL (OpenSSL object) in it.
-	  Currently this is delayed until ossl_ssl_setup(), which is called from
-	  SSLSocket#accept or #connect. Say we call SSLSocket#hostname= with an
-	  illegal value. We expect an exception to be raised in #hostname= but
-	  actually we get it in the later SSLSocket#connect. Because the SSL is
-	  not ready at #hostname=, the actual call of SSL_set_tlsext_host_name()
-	  is also delayed.
-	  This also fixes: [ruby-dev:49376] [Bug #11724]
-
-	* ext/openssl/ossl_ssl.c (ossl_ssl_initialize): Added. Almost the same
-	  as the Ruby version but this instantiate the SSL object at the same
-	  time.
-
-	  (ossl_ssl_setup): Adjust to the changes. Just set the underlying IO to
-	  the SSL.
-
-	  (ssl_started): Added. Make use of SSL_get_fd(). This returns -1 if not
-	  yet set by SSL_set_fd().
-
-	  (ossl_ssl_data_get_struct): Removed. Now GetSSL() checks that the SSL
-	  exists.
-
-	  (ossl_ssl_set_session): Don't call ossl_ssl_setup() here as now the
-	  SSL is already instantiated in #initialize.
-
-	  (ossl_ssl_shutdown, ossl_start_ssl, ossl_ssl_read_internal,
-	   ossl_ssl_write_internal, ossl_ssl_stop, ossl_ssl_get_cert,
-	   ossl_ssl_get_peer_cert, ossl_ssl_get_peer_cert_chain,
-	   ossl_ssl_get_version, ossl_ssl_get_cipher, ossl_ssl_get_state,
-	   ossl_ssl_pending, ossl_ssl_session_reused,
-	   ossl_ssl_get_verify_result, ossl_ssl_get_client_ca_list,
-	   ossl_ssl_npn_protocol, ossl_ssl_alpn_protocol, ossl_ssl_tmp_key): Use
-	  GetSSL() instead of ossl_ssl_data_get_struct(). Use ssl_started().
-
-	  (Init_ossl_ssl): Add method declarations of SSLSocket#{initialize,
-	  hostname=}.
-
-	* ext/openssl/ossl_ssl.h (GetSSL): Check that the SSL is not NULL. It
-	  should not be NULL because we now set it in #initialize.
-
-	* ext/openssl/ossl_ssl_session.c (ossl_ssl_session_initialize): No need
-	  to check if the SSL is NULL.
-
-Sat May 28 10:47:40 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* gems/bundled_gems: Update latest releases, power_assert-0.3.0,
-	  test-unit 3.1.9, minitest 5.9.0, did_you_mean 1.0.1
-
-Sat May 28 10:45:40 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* addr2line.c: drop support for ATARI ST platform. It was
-	  discontinued more than two decades ago. [fix GH-1350] Patch by
-	  @cremno
-	* include/ruby/ruby.h: ditto.
-	* io.c: ditto.
-
-Sat May 28 10:39:47 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_case_comprehensive.rb: Converted exception for
-	  unavailable Unicode data files to failed assertion.
-
-Sat May 28 10:26:18 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/cgi/util.rb: added missing quote.
-	  [fix GH-1363][ci skip] Patch by @dwaller
-
-Fri May 27 17:38:49 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* variable.c (rb_local_constants_i): exclude hidden constants.
-	  [ruby-core:75575] [Bug #12389]
-
-Fri May 27 17:09:44 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* transcode.c (str_transcode0): scrub in the given encoding when
-	  the source encoding is given, not in the encoding of the
-	  receiver.  [ruby-core:75732] [Bug #12431]
-
-Fri May 27 15:07:32 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (rb_scan_args): remove nul padding which
-	  caused syntax error if fmt is not a string literal.
-
-	* include/ruby/ruby.h (rb_scan_args_verify): suppress array-bounds
-	  warnings by old clang.
-
-	* include/ruby/ruby.h (rb_scan_args0): make extractor macros
-	  inline functions, which do not validate the format and are
-	  unnecessary to be expanded.
-
-Fri May 27 01:00:36 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* symbol.c (is_identchar): use ISDIGIT instead of rb_enc_isalnum.
-	  Though rb_enc_isalnum is encoding aware function, its argument here
-	  is *m, which is a single byte. Therefore ISDIGIT is faster.
-
-	* symbol.c (is_special_global_name): ditto.
-
-	* symbol.c (rb_enc_symname_type): ditto.
-
-Fri May 27 00:39:40 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (rb_scan_args): add nul padding here to
-	  apply to all references.
-
-	* include/ruby/ruby.h (rb_scan_args_verify): move length mismatch
-	  check outside conditional operators.
-
-Thu May 26 14:21:10 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_pkey_dh.c (ossl_dh_compute_key): Check that the DH
-	  has 'p' (the prime) before calling DH_size(). We can create a DH with
-	  no parameter but DH_size() does not check and dereferences NULL.
-	  [ruby-core:75720] [Bug #12428]
-
-	* ext/openssl/ossl_pkey_dsa.c (ossl_dsa_sign): Ditto. DSA_size() does
-	  not check dsa->q.
-
-	* ext/openssl/ossl_pkey_rsa.c (ossl_rsa_public_encrypt,
-	  ossl_rsa_public_decrypt, ossl_rsa_private_encrypt,
-	  ossl_rsa_private_decrypt): Ditto. RSA_size() does not check rsa->n.
-
-Thu May 26 14:13:52 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (rb_scan_args_count): verify length with
-	  counting variables together.
-
-Thu May 26 09:45:41 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_case_comprehensive.rb: Add set of comprehensive
-	  (across most Unicode characters; later across most character encodings)
-	  tests for case mapping.
-
-Thu May 26 05:00:13 2016  Benoit Daloze  <eregontp@gmail.com>
-
-	* class.c (rb_define_class): Fix documentation.
-
-Wed May 25 20:50:12 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* re.c (unescape_nonascii): scan hex up to only 3 characters.
-	  [Bug #12420] [Bug #12423]
-
-Wed May 25 19:07:19 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode.c: Handle DOTLESS_i by hand because it isn't involved in folding.
-
-Wed May 25 18:30:53 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* regparse.c (fetch_token_in_cc): raise error if given octal escaped
-	  character is too big. [Bug #12420] [Bug #12423]
-
-Wed May 25 17:45:15 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl, test/openssl: Drop OpenSSL < 0.9.8 support.
-
-Wed May 25 17:43:30 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/openssl_missing.h, ext/openssl/ossl.h: Remove
-	  unnecessary 'extern "C"' blocks. We don't use C++ and these headers
-	  are local to ext/openssl, so there is no need to enclose with it.
-
-Wed May 25 17:42:58 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/extconf.rb: Remove check of OPENSSL_FIPS macro. This is
-	  unneeded because we can check the macro directly in source code,
-	  just as we already do for OPENSSL_NO_* macros.
-
-	* ext/openssl/ossl.c: Replace occurrences of HAVE_OPENSSL_FIPS with
-	  OPENSSL_FIPS.
-
-Wed May 25 17:13:35 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* class.c (rb_scan_args): merge code for n_trail.
-
-Wed May 25 17:11:34 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (rb_scan_args_validate): move failed
-	  condition to the terminal.  [ruby-core:75714] [Bug #12426]
-
-Wed May 25 13:13:37 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* regcomp.c: remove condition for debug output because prelude
-	  doesn't use regexp now.
-
-Wed May 25 13:10:30 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* regcomp.c (compile_length_tree): return error code immediately
-	  if compile_length_tree raised error [Bug #12418]
-
-Wed May 25 08:01:39 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode.c: Fix flag error for switch from titlecase to lowercase.
-
-	* test/ruby/enc/test_case_mapping.rb: Tests for above error.
-
-Wed May 25 01:13:55 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_pkey_ec.c (ec_key_new_from_group): Create a new
-	  EC_KEY on given EC group. Extracted from ossl_ec_key_initialize().
-	  (ossl_ec_key_s_generate): Added. Create a new EC instance and
-	  generate a random private and public key.
-	  (ossl_ec_key_initialize): Use ec_key_new_from_group().
-	  (Init_ossl_ec): Define the new method EC.generate. This change is
-	  for consistency with other PKey types.  [ruby-core:45541] [Bug #6567]
-
-	* test/openssl/test_pkey_ec.rb: Test that EC.generate works.
-
-Wed May 25 00:37:16 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_pkey_ec.c (ossl_ec_key_generate_key): Fix up RDoc.
-	  (Init_ossl_ec): Rename EC#generate_key to EC#generate_key!. Make the
-	  old name an alias of #generate_key!. This change is for consistency
-	  with other PKey types.  [ruby-core:45541] [Bug #6567]
-
-	* test/openssl/test_pkey_ec.rb: Use EC#generate_key! instead of
-	  EC#generate_key.
-
-Wed May 25 00:23:05 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (rb_scan_args_set): check the arity after
-	  adjusting argc for an option hash, for optimization in simpler
-	  cases.
-
-Wed May 25 00:21:52 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (XCFLAGS): merge flags only for ruby itself from
-	  ruby_cflags.
-
-Tue May 24 22:04:15 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_cipher.c (ossl_cipher_set_key, ossl_cipher_set_iv):
-	  Reject too long values as well as too short ones. Currently they
-	  just truncate the input but this would hide bugs and lead to
-	  unexpected encryption/decryption results.
-
-	* test/openssl/test_cipher.rb: Test that Cipher#key= and #iv= reject
-	  Strings with invalid length.
-
-Tue May 24 21:32:21 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_x509ext.c (ossl_x509ext_set_value): Use
-	  ASN1_OCTET_STRING_set() instead of M_ASN1_OCTET_STRING_set(). Macros
-	  prefixed by "M_" are discouraged to be used from outside OpenSSL
-	  library[1].
-	  (ossl_x509ext_get_value): Likewise, use ASN1_STRING_print() instead
-	  of M_ASN1_OCTET_STRING_print().
-	  [1] https://git.openssl.org/gitweb/?p=openssl.git;a=blob;f=CHANGES;h=bf61913d7b01212b4d8b2f3c13d71d645914f67c;hb=b6079a7835f61daa9fb2cbf9addfa86049523933#l878
-
-	* ext/openssl/ossl.h: Include openssl/asn1.h instead of
-	  openssl/asn1_mac.h. It just includes openssl/asn1.h and defines some
-	  additional "M_" macros.
-
-Tue May 24 18:52:11 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (rb_scan_args_verify): verify the format to
-	  scan if no invalid chars and variable argument length matching,
-	  at the compile time if possible.
-
-Tue May 24 17:18:46 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/defines.h (ERRORFUNC, WARNINGFUNC): add fallback
-	  definitions.
-
-Tue May 24 16:37:43 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in (ruby_cflags): separate from optflags [Bug #12409]
-	  -fexcess-precision=standard and -fp-model precise are set to this now.
-
-	* configure.in (cflags): use ruby_cflags.
-
-Tue May 24 16:20:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (ERRORFUNC, WARNINGFUNC): __error__ and __warning__
-	  attributes take a parenthesized string literal.
-
-Tue May 24 12:35:56 2016  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* common.mk: sort lines, and add missing dependencies suggested
-	  by tool/update-deps
-
-Mon May 23 21:33:36 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/missing.h (isfinite): move from numeric.c.
-
-Mon May 23 21:09:06 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl.c (Init_openssl): Avoid reference to unset global
-	  variable. ossl_raise() may be called before dOSSL is set. Since
-	  global variables default to 0 and the default value of dOSSL set in
-	  Init_openssl() is also Qfalse, there is no real issue but confusing.
-	  Patch by Bertram Scharpf <software@bertram-scharpf.de>
-	  [ruby-core:58264] [Bug #9101]
-
-Mon May 23 20:32:16 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_asn1.c, ext/openssl/ossl_bn.c,
-	  ext/openssl/ossl_cipher.c, ext/openssl/ossl_digest.c
-	  ext/openssl/ossl_engine.c, ext/openssl/ossl_ns_spki.c
-	  ext/openssl/ossl_pkcs12.c, ext/openssl/ossl_pkcs7.c
-	  ext/openssl/ossl_pkey.c, ext/openssl/ossl_pkey_ec.c
-	  ext/openssl/ossl_rand.c, ext/openssl/ossl_ssl.c
-	  ext/openssl/ossl_x509attr.c, ext/openssl/ossl_x509cert.c
-	  ext/openssl/ossl_x509ext.c, ext/openssl/ossl_x509store.c: Use
-	  StringValueCStr() where NUL-terminated string is expected.
-
-Mon May 23 20:20:12 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/bigdecimal/bigdecimal.c (isfinite): get rid of a warning on
-	  cygwin. [Bug #12417][ruby-core:75691]
-
-Mon May 23 19:41:27 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_rand.c (ossl_rand_egd, ossl_rand_egd_bytes):
-	  RAND_egd{_bytes,}() return -1 on failure, not 0.
-	  Patch by cremno phobia <cremno@mail.ru>
-	  [ruby-core:63795] [Bug #10053]
-	  (ossl_pseudo_bytes): Similar, RAND_pseudo_bytes() may return 0 or
-	  -1 on failure.
-
-Mon May 23 15:52:07 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/bigdecimal/bigdecimal.c (isfinite): isfinite does not always
-	  exist.  fixed build error on Windows introduced at r55123.
-
-Mon May 23 13:19:41 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (rb_scan_args0): make compile error if the
-	  format is wrong or does not match with the variable argument
-	  length if possible.
-
-Mon May 23 12:47:09 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (rb_scan_args0): raise fatal error if
-	  variable argument length does not match, it is a bug in the code
-	  which uses rb_scan_args, not a runtime error.
-
-Mon May 23 12:30:29 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/bigdecimal/bigdecimal.c (GetVpValueWithPrec): consider
-	  non-finite float values not to raise FloatDomainError.
-	  [ruby-core:75682] [Bug #12414]
-
-Mon May 23 12:21:18 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* array.c (rb_ary_fill): suppress warnings: 'item' may be used
-	  uninitialized in this function
-
-Mon May 23 07:41:49 2016  Eric Wong  <e@80x24.org>
-
-	* dir.c (dir_close): update RDoc for 2.3 #close change
-	  [ruby-core:75679] [Bug #12413]
-
-Sun May 22 20:01:21 2016  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/timeridconv.rb: use finalizer trick instead of thread.
-
-	* test/drb/ut_timerholder.rb: ditto.
-
-Sun May 22 17:25:18 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_case_options.rb: adjust test class name
-	  to match file name
-
-Sun May 22 17:24:07 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* rename test/ruby/enc/test_casing_options.rb to test_case_options.rb
-	  for consistency
-
-Sun May 22 17:06:55 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* transcode.c (enc_arg, str_transcode_enc_args, econv_args):
-	  remove volatile, and add GC guards in callers.
-	  [ruby-core:75664] [Bug #12411]
-
-Sun May 22 16:27:00 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/-test-/integer/core_ext.c: move testutil/integer.c.
-
-	* test/lib/-test-/integer.rb: extract implementation details from
-	  test/unit/assertions.rb.  [Bug #12408]
-
-Sun May 22 14:57:43 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* include/ruby/oniguruma.h: Extend OnigEncodingTypeDefine to define a
-	  new encoding primitive 'case_map' for case mapping
-
-	* enc/utf-8.c, utf_16be/le.c, utf_32be/le.c:
-	  add onigenc_unicode_case_map as case_map primitive
-
-	* enc/ascii.c, big5.c, cp949.c, emacs_mule.c, euc_jp/kr/tw.c, gb18030.c,
-	  gbk.c, iso_8859_1/2/3/4/5/6/7/8/9/10/11/13/14/15/16.c, koi8_r/u.c,
-	  shift_jis.c, us_ascii.c, windows_1250/1251/1252.c:
-	  add onigenc_not_support_case_map as case_map primitive
-
-Sun May 22 14:45:45 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* regenc.h/c: Define new function onigenc_not_support_case_map
-
-Sun May 22 12:14:06 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* include/ruby/ruby.h (rb_scan_args): use original rb_scan_args
-	  when fmt is dynamic.
-
-Sun May 22 11:41:12 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* class.c (rb_scan_args): moved to bottom of the file to make the
-	  effect of `#undef rb_scan_args` the minimum.
-
-	* include/ruby/ruby.h (rb_scan_args): overwrite only if GCC and
-	  optimized. Visual C++ 14 or later can compile it but make it
-	  conservative.
-
-Sat May 21 22:45:50 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* include/ruby/ruby.h (rb_scan_args): don't use ALWAYS_INLINE with
-	  `inline`.  if gcc needs this duplication, do in ALWAYS_INLINE macro.
-
-Sat May 21 21:11:56 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* include/ruby/ruby.h (rb_scan_args): use __VA_ARGS__ instead of
-	  va_arg to allow compilers optimize more aggressive.
-	  https://gustedt.wordpress.com/2011/07/10/avoid-writing-va_arg-functions/
-	  rb_scan_args is now expected to be statically resolved.
-
-Sun May 22 02:41:52 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/zlib/zlib.c: remove hacky macro introduced at r30437.
-
-	* ext/zlib/zlib.c (gzfile_make_header): cast as long (instead of int).
-
-	* ext/zlib/zlib.c (gzfile_make_footer): ditto.
-
-Sat May 21 21:07:18 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in (ALWAYS_INLINE): force compilers the function inlined.
-
-Sat May 21 16:16:03 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_ssl.c (ossl_ssl_stop): Don't free the SSL struct
-	  here. Since some methods such as SSLSocket#connect releases GVL,
-	  there is a chance of use after free if we free the SSL from another
-	  thread. SSLSocket#stop was documented as "prepares it for another
-	  connection" so this is a slightly incompatible change. However when
-	  this sentence was added (r30090, Add toplevel documentation for
-	  OpenSSL, 2010-12-06), it didn't actually. The current behavior is
-	  from r40304 (Correct shutdown behavior w.r.t GC., 2013-04-15).
-	  [ruby-core:74978] [Bug #12292]
-
-	* ext/openssl/lib/openssl/ssl.rb (sysclose): Update doc.
-
-	* test/openssl/test_ssl.rb: Test this.
-
-Sat May 21 14:41:14 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl.c: [DOC] Fix SSL client example. The variable name
-	  was wrong. Patch by Andreas Tiefenthaler <at@an-ti.eu> (@pxlpnk).
-	  [GH ruby/openssl#32]
-
-Sat May 21 14:25:38 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_pkey_ec.c: rename PKey::EC#private_key? and
-	  #public_key? to #private? and #public? for consistency with other
-	  PKey types. Old names remain as alias.  [ruby-core:45541] [Bug #6567]
-
-	* test/openssl/test_pkey_ec.rb (test_check_key): check private? and
-	  public? works correctly.
-
-Sat May 21 12:40:36 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/lib/openssl/buffering.rb (read_nonblock, readpartial):
-	  Remove impossible EOFError raise. Patch by Zach Anker
-	  <zanker@squareup.com>.  [GH ruby/openssl#23]
-
-Sat May 21 11:18:42 2016  Evgeni Golov  <evgeni@golov.de>
-
-	* lib/ipaddr.rb: [DOC] fix documentation of IN6MASK to mention
-	  IPv6.  [Fix GH-1349]
-
-Sat May 21 11:12:53 2016  Dan Martinez  <dfm@razorwind.org>
-
-	* io.c (Init_IO): [DOC] define dummy ARGF instead of ARGF.class to
-	  re-enable the generation of ARGF documentation.  [Fix GH-1358]
-
-Sat May 21 11:07:29 2016  0x01f7  <souk.0x01f7@gmail.com>
-
-	* doc/syntax/methods.rdoc (Method Names): add proper closing tag.
-	  [Fix GH-1356]
-
-Sat May 21 09:26:28 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (RUBY_CHECK_SETJMP): fix missing macro definition
-	  for the configured result.  fix up r55021.
-
-Sat May 21 00:36:32 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (rb_execarg_commandline): build command line string
-	  from argument vector in rb_execarg.
-	  [ruby-core:75611] [Bug #12398]
-
-Fri May 20 23:25:42 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl.c (ossl_pem_passwd_value): Added. Convert the
-	  argument to String with StringValue() and validate the length is in
-	  4..PEM_BUFSIZE. PEM_BUFSIZE is a macro defined in OpenSSL headers.
-	  (ossl_pem_passwd_cb): When reading/writing encrypted PEM format, we
-	  used to pass the password to PEM_def_callback() directly but it was
-	  problematic. It is not NUL character safe. And surprisingly, it
-	  silently truncates the password to 1024 bytes.  [GH ruby/openssl#51]
-
-	* ext/openssl/ossl.h: Add function prototype declaration of newly
-	  added ossl_pem_passwd_value().
-
-	* ext/openssl/ossl_pkey.c (ossl_pkey_new_from_data): Use
-	  ossl_pem_passwd_value() to validate the password String.
-
-	* ext/openssl/ossl_pkey_dsa.c (ossl_dsa_initialize, ossl_dsa_export):
-	  ditto.
-
-	* ext/openssl/ossl_pkey_ec.c (ossl_ec_key_initialize,
-	  ossl_ec_key_to_string): ditto.
-
-	* ext/openssl/ossl_pkey_rsa.c (ossl_rsa_initialize, ossl_rsa_export):
-	  ditto.
-
-	* test/openssl/test_pkey_{dsa,ec,rsa}.rb: test this.
-
-Fri May 20 23:45:53 2016  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* id_table.c (list_id_table_init): When unaligned word access is
-	  prohibited and sizeof(VALUE) is 8 (64-bit machines),
-	  capa should always be even number for 8-byte word alignment
-	  of the values of a table. This code assumes that sizeof(ID) is 4,
-	  sizeof(VALUE) is 8, and xmalloc() returns 8-byte aligned memory.
-	  This fixes bus error on 64-bit SPARC Solaris 10.
-	  [Bug #12406][ruby-dev:49631]
-
-Fri May 20 22:30:09 2016  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* symbol.h (rb_id2sym): Use HAVE_BUILTIN___BUILTIN_CONSTANT_P
-
-Fri May 20 22:19:00 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* ext/date/date_core.c: [DOC] fix typos.
-	  [fix GH-1360] patched by @soundasleep
-
-Fri May 20 21:26:58 2016  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* include/ruby/defines.h (RB_GNUC_EXTENSION, RB_GNUC_EXTENSION_BLOCK):
-	  macros for skipping __extension__ on non-GCC compilers.
-	* eval_error.c (warn_print): use RB_GNUC_EXTENSION_BLOCK instead of
-	  __extension__ because __extension__ is a GNU extension.
-	  Fix compile error on Solaris 10 with Oracle Solaris Studio 12.x.
-	  [Bug #12397] [ruby-dev:49629].
-	* internal.h (rb_fstring_cstr, rb_fstring_enc_cstr): ditto
-	* include/ruby/encoding.h (rb_enc_str_new, rb_enc_str_new_cstr): ditto
-	* include/ruby/intern.h (rb_str_new, rb_str_new_cstr,
-	  rb_usascii_str_new, rb_utf8_str_new, rb_tainted_str_new_cstr,
-	  rb_usascii_str_new_cstr, rb_utf8_str_new_cstr,
-	  rb_external_str_new_cstr, rb_locale_str_new_cstr,
-	  rb_str_buf_new_cstr, rb_str_cat_cstr, rb_exc_new_cstr): ditto
-
-Fri May 20 21:17:13 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/win32ole/win32ole.c (fole_missing): make substring or dup to
-	  share the content if possible.
-
-Fri May 20 19:48:48 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* internal.h (NEW_PARTIAL_MEMO_FOR): shrink buffer array not to
-	  mark non-VALUE fields.  fix check_rvalue_consistency abort with
-	  RGENGC_CHECK_MODE=2.
-
-	* internal.h (NEW_CMP_OPT_MEMO): exclude struct cmp_opt_data from
-	  the valid array range.
-
-	* enum.c (slicewhen_i): exclude inverted too.
-
-Thu May 19 21:21:57 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* re.c (rb_reg_match_m_p): [DOC] fix return value in rdoc.
-
-	* test/ruby/test_regexp.rb (TestRegexp#test_match_p): add some
-	  tests from document.
-
-Thu May 19 13:22:44 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl.c (Init_openssl): register an ex_data index for
-	  X509_STORE and X509_STORE_CTX respectively. Since they don't share
-	  the ex_data index registry, we can't use the same index.
-	  (ossl_verify_cb): use the the correct index.
-
-	* ext/openssl/ossl_ssl.c (ossl_ssl_verify_callback): ditto.
-
-	* ext/openssl/ossl_x509store.c (ossl_x509store_set_vfy_cb): ditto.
-	  (ossl_x509stctx_verify): ditto.
-
-	* ext/openssl/ossl.h (void ossl_clear_error): add extern declarations
-	  of ossl_store_{ctx_,}ex_verify_cb_idx.
-
-	* ext/openssl/openssl_missing.c: remove X509_STORE_set_ex_data and
-	  X509_STORE_get_ex_data.
-
-	* ext/openssl/openssl_missing.h: implement X509_STORE_get_ex_data,
-	  X509_STORE_set_ex_data and X509_STORE_get_ex_new_index as macros.
-
-Thu May 19 13:11:35 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_x509attr.c (ossl_x509attr_set_value): check that the
-	  argument is an OpenSSL::ASN1::Data before converting to ASN1_TYPE.
-	  This fixes SEGV on OpenSSL::X509::Attribute#value=(non-asn1-value).
-
-	* test/openssl/test_x509attr.rb: add tests for OpenSSL::X509::Attribute.
-
-Thu May 19 12:10:10 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* re.c (rb_reg_match_m_p): fix match against empty string.
-	  rb_str_offset returns the end when the position exceeds the
-	  length.  fix the range parameter of onig_search.
-	  [ruby-core:75604] [Bug #12394]
-
-Thu May 19 11:37:36 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* re.c (rb_reg_match_m_p): should return false if no match, as the
-	  document says.  [Feature #8110]
-
-Thu May 19 00:17:01 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* re.c (reg_names_iter): specify capacify
-
-Wed May 18 21:29:59 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* thread.c (recursive_list_access): a object id may be a Bignum.  so,
-	  the list must be a objhash, instead of a identhash.
-	  this fixes many test errors on mswin64 CI.
-
-Wed May 18 19:33:54 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* re.c (rb_reg_match_m_p): Introduce Regexp#match?, which returns
-	  bool and doesn't save backref.
-
-Wed May 18 16:52:03 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_pkcs12.c (ossl_pkcs12_initialize): pop errors
-	  leaked by PKCS12_parse(). This is a bug in OpenSSL, which exists
-	  in the versions before the version 1.0.0t, 1.0.1p, 1.0.2d.
-
-Wed May 18 16:04:54 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/downloader.rb (Downloader::RubyGems.download): verify gems
-	  only if RubyGems is 2.4 or later.  old RubyGems fails to verify
-	  almost all of bundled gems.
-
-Wed May 18 14:52:38 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_modify_expand): check integer overflow.
-	  [ruby-core:75592] [Bug #12390]
-
-Wed May 18 13:11:44 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* re.c (match_ary_subseq): get subseq of match array without creating
-	  temporary array.
-
-	* re.c (match_ary_aref): get element(s) of match array without creating
-	  temporary array.
-
-	* re.c (match_aref): Use match_ary_subseq with handling irregulars.
-
-	* re.c (match_values_at): Use match_ary_aref.
-
-Wed May 18 13:03:07 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_x509cert.c (ossl_x509_verify): X509_verify()
-	  family may put errors on 0 return (0 means verification failure).
-	  Clear OpenSSL error queue before return to Ruby. Since the queue is
-	  thread global, remaining errors in the queue can cause an unexpected
-	  error in the next OpenSSL operation.  [ruby-core:48284] [Bug #7215]
-
-	* ext/openssl/ossl_x509crl.c (ossl_x509crl_verify): ditto.
-
-	* ext/openssl/ossl_x509req.c (ossl_x509req_verify): ditto.
-
-	* ext/openssl/ossl_x509store.c (ossl_x509stctx_verify): ditto.
-
-	* ext/openssl/ossl_pkey_dh.c (dh_generate): clear the OpenSSL error
-	  queue before re-raising exception.
-
-	* ext/openssl/ossl_pkey_dsa.c (dsa_generate): ditto.
-
-	* ext/openssl/ossl_pkey_rsa.c (rsa_generate): ditto.
-
-	* ext/openssl/ossl_ssl.c (ossl_start_ssl): ditto.
-
-	* test/openssl: check that OpenSSL.errors is empty every time after
-	  running a test case.
-
-Wed May 18 12:07:42 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl.c (ossl_clear_error): Extracted from
-	  ossl_make_error(). This prints errors in the OpenSSL error queue if
-	  OpenSSL.debug is true, and clears the queue.
-	  (ossl_make_error): use ossl_clear_error().
-
-	* ext/openssl/ossl.h: add prototype declaration of ossl_make_error().
-	  (OSSL_BIO_reset) use ossl_clear_error() to clear the queue. Clearing
-	  silently makes debugging difficult.
-
-	* ext/openssl/ossl_engine.c (ossl_engine_s_by_id): ditto.
-
-	* ext/openssl/ossl_ns_spki.c (ossl_spki_initialize): ditto.
-
-	* ext/openssl/ossl_pkcs7.c (ossl_pkcs7_verify): ditto.
-
-	* ext/openssl/ossl_pkey_dsa.c (ossl_dsa_initialize): ditto.
-
-	* ext/openssl/ossl_pkey_ec.c (ossl_ec_key_initialize): ditto.
-	  (ossl_ec_group_initialize): ditto.
-
-	* ext/openssl/ossl_ssl.c (ossl_ssl_shutdown): ditto.
-
-Wed May 18 11:53:49 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_pkey_ec.c (ossl_ec_point_mul): Validate the
-	  arguments before passing to EC_POINT(s)_mul(). Add description of this
-	  method.  [ruby-core:65152] [Bug #10268]
-
-	* test/openssl/test_pkey_ec.rb (test_ec_point_mul): Test that
-	  OpenSSL::PKey::EC::Point#mul works.
-
-Wed May 18 11:19:59 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_bn.c (try_convert_to_bnptr): Extracted from
-	  GetBNPtr(). This doesn't raise exception but returns NULL on error.
-	  (GetBNPtr): Raise TypeError if conversion fails.
-	  (ossl_bn_eq): Implement BN#==.
-	  (ossl_bn_eql): #eql? should not raise TypeError even if the argument
-	  is not compatible with BN.
-	  (ossl_bn_hash): Implement BN#hash.
-
-	* ext/openssl/ossl_bn.c (Init_ossl_bn): Define #== and #hash.
-
-	* test/openssl/test_bn.rb: Test BN#eql?, #== and #hash
-
-Wed May 18 10:17:41 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (RB_INTEGER_TYPE_P): new macro and
-	  underlying inline function to check if the object is an
-	  Integer (Fixnum or Bignum).
-
-Wed May 18 09:52:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* enum.c (enum_sum, hash_sum, hash_sum_i, enum_sum_i, sum_iter):
-	  Optimize for hashes when each method isn't redefined.
-
-Wed May 18 09:14:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* enum.c (enum_sum, int_range_sum): Extract int_range_sum from
-	  enum_sum.
-
-Wed May 18 03:16:06 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* re.c (match_values_at): fix regression at r55036.
-	  MatchData#values_at accepts Range.
-
-Wed May 18 02:02:58 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* re.c (match_aref): remove useless condition and call rb_fix2int.
-	  rb_reg_nth_match handles negative index.
-
-Wed May 18 01:57:43 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* re.c (match_values_at): MatchData#values_at supports named captures
-	  [Feature #9179]
-
-	* re.c (namev_to_backref_number): separated.
-
-Wed May 18 00:05:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* enum.c (enum_sum): Optimize for a range from int to int.
-
-	* test/ruby/test_enum.rb (test_range_sum): Move from test_range.rb,
-	  and add assertions for some conditions.
-
-	* test/ruby/test_enum.rb (test_hash_sum): Move from test_hash.rb.
-
-	* test/ruby/test_hash.rb, test/ruby/test_range.rb: Remove test_sum.
-
-Tue May 17 23:08:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* enum.c (enum_sum): [DOC] Write documentation.
-
-Tue May 17 22:53:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* enum.c (enum_sum): Implement Enumerable#sum.
-
-	* test/ruby/test_enum.rb (test_sum): Test sum for Enumerable.
-
-	* test/ruby/test_hash.rb (test_sum): Test sum for Hash.
-
-	* test/ruby/test_range.rb (test_sum): Test sum for Range.
-
-Tue May 17 22:11:41 2016  Tanaka Akira  <akr@fsij.org>
-
-	* object.c, numeric.c, enum.c, ext/-test-/bignum/mul.c,
-	  lib/rexml/quickpath.rb, lib/rexml/text.rb, lib/rexml/xpath_parser.rb,
-	  lib/rubygems/specification.rb, lib/uri/generic.rb,
-	  bootstraptest/test_eval.rb, basictest/test.rb,
-	  test/-ext-/bignum/test_big2str.rb, test/-ext-/bignum/test_div.rb,
-	  test/-ext-/bignum/test_mul.rb, test/-ext-/bignum/test_str2big.rb,
-	  test/csv/test_data_converters.rb, test/date/test_date.rb,
-	  test/json/test_json_generate.rb, test/minitest/test_minitest_mock.rb,
-	  test/openssl/test_cipher.rb, test/rexml/test_jaxen.rb,
-	  test/ruby/test_array.rb, test/ruby/test_basicinstructions.rb,
-	  test/ruby/test_bignum.rb, test/ruby/test_case.rb,
-	  test/ruby/test_class.rb, test/ruby/test_complex.rb,
-	  test/ruby/test_enum.rb, test/ruby/test_eval.rb,
-	  test/ruby/test_iseq.rb, test/ruby/test_literal.rb,
-	  test/ruby/test_math.rb, test/ruby/test_module.rb,
-	  test/ruby/test_numeric.rb, test/ruby/test_range.rb,
-	  test/ruby/test_rational.rb, test/ruby/test_refinement.rb,
-	  test/ruby/test_rubyvm.rb, test/ruby/test_struct.rb,
-	  test/ruby/test_variable.rb, test/rubygems/test_gem_specification.rb,
-	  test/thread/test_queue.rb: Use Integer instead of Fixnum and Bignum.
-
-Tue May 17 15:26:10 2016  Tanaka Akira  <akr@fsij.org>
-
-	* [Feature #12005] Unify Fixnum and Bignum into Integer
-
-	* include/ruby/ruby.h (rb_class_of): Return rb_cInteger for fixnums.
-
-	* insns.def (INTEGER_REDEFINED_OP_FLAG): Unified from
-	  FIXNUM_REDEFINED_OP_FLAG and BIGNUM_REDEFINED_OP_FLAG.
-
-	* vm_core.h: Ditto.
-
-	* vm_insnhelper.c (opt_eq_func): Use INTEGER_REDEFINED_OP_FLAG instead
-	  of FIXNUM_REDEFINED_OP_FLAG.
-
-	* vm.c (vm_redefinition_check_flag): Use rb_cInteger instead of
-	  rb_cFixnum and rb_cBignum.
-	  (C): Use Integer instead of Fixnum and Bignum.
-
-	* numeric.c (fix_succ): Removed.
-	  (Init_Numeric): Define Fixnum as Integer.
-
-	* bignum.c (bignew): Use rb_cInteger instead of rb_cBignum.
-	  (rb_int_coerce): replaced from rb_big_coerce and return fixnums
-	  as-is.
-	  (Init_Bignum): Define Bignum as Integer.
-	  Don't define ===.
-
-	* error.c (builtin_class_name): Return "Integer" for fixnums.
-
-	* sprintf.c (ruby__sfvextra): Use rb_cInteger instead of rb_cFixnum.
-
-	* ext/-test-/testutil: New directory to test.
-	  Currently it provides utilities for fixnum and bignum.
-
-	* ext/json/generator/generator.c: Define mInteger_to_json.
-
-	* lib/mathn.rb (Fixnum#/): Redefinition removed.
-
-Tue May 17 11:58:58 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (RUBY_CHECK_BUILTIN_SETJMP): declare t as NORETURN
-	  to suppress warnings by -Wsuggest-attribute=noreturn.
-	  [ruby-core:75510] [Bug #12383]
-
-Tue May 17 10:40:18 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (RUBY_CHECK_SETJMP): needs the header and proper
-	  arguments for builtin setjmp functions.
-
-Mon May 16 20:00:30 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode.h: Additional uses of ONIG_CASE_MAPPING compilation switch
-
-Mon May 16 19:46:33 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* include/ruby/oniguruma.h: Introducing ONIG_CASE_MAPPING compilation
-	  switch
-
-	* include/ruby/oniguruma.h, enc/unicode.h: Using ONIG_CASE_MAPPING
-	  compilation switch
-
-Mon May 16 19:29:31 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* gems/bundled_gems: Update xmlrpc-0.1.1. xmlrpc-0.1.0 didn't allow
-	  to install on 2.4.0dev.
-
-Mon May 16 13:28:59 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (FUNC_STDCALL, FUNC_CDECL, FUNC_FASTCALL): set
-	  macro names explicitly to the old names, which are accidentally
-	  changed at r54985, for backward compatibilities.
-	  fiddle also depends on these names to fallback to ANSI names.
-	  [ruby-core:75494] [Bug #12377]
-
-Mon May 16 11:39:02 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/xmlrpc.rb, lib/xmlrpc/*, test/xmlrpc: XMLRPC is bundled gem
-	  on Ruby 2.4. It is extracted to https://github.com/ruby/xmlrpc
-	  [Feature #12160][ruby-core:74239]
-	* gems/bundled_gems: ditto.
-
-Mon May 16 06:06:21 2016  Eric Wong  <e@80x24.org>
-
-	* proc.c: fix RDoc of Proc#===/call/yield/[]
-	  [Bug #12332]
-
-Sun May 15 20:55:31 2016  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/timeridconv.rb: don't use keeper thread. [Bug #12342]
-
-	* test/drb/ut_timerholder.rb: ditto.
-
-Sun May 15 16:15:25 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* array.c (rb_ary_entry): extract rb_ary_elt to organize if-conditions
-	  and check whether is embedded at once.
-
-Sun May 15 10:57:26 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_insnhelper.c (vm_get_ev_const): warn deprecated constant even
-	  in the class context.  [ruby-core:75505] [Bug #12382]
-
-Sun May 15 03:13:01 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* iseq.h (struct iseq_compile_data): use struct rb_id_table
-	  instead of st_table.
-
-	* iseq.c (prepare_iseq_build): don't allocate ivar_cache_table
-	  until it has at least one element.
-
-	* iseq.c (compile_data_free): free ivar_cache_table only if it
-	  is allocated.
-
-	* compile.c (get_ivar_ic_value): allocate if the table is not
-	  allocated yet.
-
-Sat May 14 09:04:34 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (pkg_config): use xsystem consistently to set up
-	  library path environment variable as well as latter pkg-config
-	  calls.  [ruby-dev:49619] [Bug #12379]
-
-Sat May 14 00:16:54 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* random.c (make_seed_value): append leading-zero-guard and get
-	  rid of making a local copy of the seed.
-
-Fri May 13 08:46:42 2016  cremno  <cremno@mail.ru>
-
-	* NEWS: drop FreeBSD < 4 support.  [Fix GH-1339]
-	  The most recent version affected by this is 3.5 and was released
-	  in 2000.
-	  https://www.freebsd.org/releases/3.5R/announce.html
-	  https://en.wikipedia.org/wiki/History_of_FreeBSD#Version_history
-
-Fri May 13 03:12:09 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* include/ruby/defines.h (GCC_VERSION_SINCE): moved from internal.h.
-
-Fri May 13 03:11:20 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in (__builtin_constant_p): check.
-
-	* internal.h: Use HAVE_BUILTIN___BUILTIN_CONSTANT_P
-
-Fri May 13 03:10:39 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in: use alternative keyword
-	  to avoid macros conflicts with them.
-
-Thu May 12 01:54:08 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (try_func): get rid of conflict of declarations of
-	  main().  checking local symbol reference does not make sense.
-
-Thu May 12 00:18:19 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/Makefile.sub (HAVE_QSORT_S): use qsort_s only for Visual Studio
-	  2012 or later, because VS2010 seems to causes a SEGV in
-	  test/ruby/test_enum.rb.
-
-Wed May 11 23:59:47 2016  Masaya Tarui  <tarui@ruby-lang.org>
-
-	* vm_insnhelper.c (vm_getivar): describe fast-path explicit
-	  (compiler friendly). [Bug #12274].
-
-Wed May 11 21:30:07 2016  Masaya Tarui  <tarui@ruby-lang.org>
-
-	* compile.c (iseq_compile_each): share InlineCache during same
-	  instance variable accesses. Reducing memory consumption,
-	  rising cache hit rate and rising branch prediction hit rate
-	  are expected. A part of [Bug #12274].
-
-	* iseq.h (struct iseq_compile_data): introduce instance
-	  variable IC table for sharing.
-
-	* iseq.c (prepare_iseq_build, compile_data_free):
-	  construct/destruct above table.
-
-Wed May 11 17:18:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* util.c (ruby_qsort): use qsort_s if available, for Microsoft
-	  Visual Studio 2005 (msvcr80.dll) and mingw.
-
-Wed May 11 10:33:26 2016  Marcus Stollsteimer  <sto.mar@web.de>
-
-	* COPYING: Remove trailing-whitespaces.
-	  [ci skip][fix GH-1348]
-
-Tue May 10 21:05:45 2016  Benoit Daloze  <eregontp@gmail.com>
-
-	* insns.def (defineclass): Also raise an error when redeclaring the
-	  superclass of a class as Object and it has another superclass.
-	  [Bug #12367] [ruby-core:75446]
-
-	* test/ruby/test_class.rb: test for above.
-
-Tue May 10 14:57:09 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* random.c (obj_random_bytes): base on bytes method instead of
-	  rand method, not to call toplevel rand method.
-
-Tue May 10 13:07:28 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in (-fexcess-precision=standard): before r54895 -std=c99
-	  is specified and it implied -fexcess-precision=standard.
-	  Now with -std=gnu99, it should be explicitly specified.
-	  https://gcc.gnu.org/onlinedocs/gcc/Optimize-Options.html
-
-Mon May  9 10:51:59 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (rb_thread_atfork_internal): move th to an argument.
-
-	* thread.c (rb_thread_atfork): do not repeat GET_THREAD().
-
-Mon May  9 10:46:36 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (rb_thread_atfork, rb_thread_atfork_before_exec): do
-	  nothing unless working fork is available.
-
-	* thread_sync.c (rb_mutex_abandon_all): define only if working
-	  fork is available.
-
-	* thread_sync.c (rb_mutex_abandon_keeping_mutexes): ditto.
-
-	* thread_sync.c (rb_mutex_abandon_locking_mutex): ditto.
-
-	* thread_win32.c (gvl_init): never used.
-
-Mon May  9 07:18:06 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* include/ruby/{defines,ruby}.h: need to define function attributes
-	  alternatives in defines.h instead of ruby.h, because they are used
-	  in oniguruma.h and the header used without including ruby.h at
-	  encoding library sources.
-
-Mon May  9 06:30:12 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* include/ruby/ruby.h (CONSTFUNC, PUREFUNC): fixed build errors on
-	  non-gcc build environments introduced at r54952.
-
-Mon May  9 02:51:51 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* gc.c (rb_gc_unprotect_logging): throw rb_memerror when it cannot
-	  allocate memory. This is pointed out by Facebook's Infer.
-
-	* gc.c (gc_prof_setup_new_record): ditto.
-
-	* regparse.c (parse_regexp): ditto.
-
-	* util.c (MALLOC): use xmalloc and xfree like above.
-
-Mon May  9 02:39:16 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in: check function attribute const and pure,
-	  and define CONSTFUNC and PUREFUNC if available.
-	  Note that I don't add those options as default because
-	  it still shows many false-positive (it seems not to consider
-	  longjmp).
-
-	* vm_eval.c (stack_check): get rb_thread_t* as an argument
-	  to avoid duplicate call of GET_THREAD().
-
-Sun May  8 21:01:14 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/openssl/extconf.rb: assume it doesn't have SSLv2 related
-	  functions when OPENSSL_NO_SSL2 is defined.
-	  Usually openssl's header and the library (libssl) have the same
-	  set of functions, but on some environment the library has functions
-	  whose headers doesn't declare. (openssl/opensslconf.h and libssl.so
-	  aren't be synchronized)
-	  To detect such case explicitly check feature macro and remove
-	  related functions.
-
-Sun May  8 18:51:33 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_home_dir_of): return the default home path if the
-	  user name is the current user name, on platforms where struct
-	  pwd is not supported.  a temporary measure against
-	  [Bug #12226].
-
-Sun May  8 08:51:38 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in: add -Wsuggest-attribute=format and suppress warnings.
-
-Sun May  8 08:31:03 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in: add -Wsuggest-attribute=noreturn and suppress warnings.
-
-Sun May  8 08:19:16 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in: add -Werror=implicit-int to avoid missing type of
-	  function declaration.
-
-Sat May  7 22:22:37 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/webrick/ssl.rb: Accept string value for SSLCertName. It is used
-	  to invoke ssl server with command line.
-	  [fix GH-1329] Patch by @kerlin
-	* test/webrick/test_ssl_server.rb: Added test for GH-1329
-
-Sat May  7 21:55:12 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* test/webrick/test_ssl_server.rb: Added basic test for `webrick/ssl`
-
-Sat May  7 16:22:13 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* random.c (int_pair_to_real_inclusive): optimize to multiply
-	  without Bignum.
-
-Sat May  7 07:58:02 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (rb_exec_getargs): honor the expected argument types
-	  over the conversion method.  the basic language functionality
-	  should be robust.  [ruby-core:75388] [Bug #12355]
-
-Fri May  6 08:16:26 2016  David Silva  <david.silva@digital.cabinet-office.gov.uk>
-
-	* enum.c (enum_find): [DOC] add more examples to the documentation
-	  of Enumerable#detect, to show that it equals to Enumerable#find.
-	  [Fix GH-1340]
-
-Thu May  5 18:08:31 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
-
-	* test/ruby/test_complexrational.rb: Remove duplicated raise.
-
-Thu May  5 14:41:05 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
-
-	* string.c (rb_str_sub): Fix a special match variable name.
-	  [ci skip]
-
-Thu May  5 12:22:17 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_eval.c (rb_eval_cmd, rb_catch_obj): use TH_JUMP_TAG with the
-	  same rb_thread_t used for TH_PUSH_TAG, instead of JUMP_TAG with
-	  the current thread global variable.
-
-Thu May  5 10:49:33 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* random.c (fill_random_bytes_syscall): use arc4random_buf if
-	  available.
-
-Wed May  4 23:13:58 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
-
-	* numeric.c (fix_plus): Remove rb_nucomp_add prototype
-	  declaration.
-
-	* numeric.c (fix_mul): Remove rb_nucomp_mul prototype
-	  declaration.
-
-	* internal.h (rb_nucomp_add, rb_nucomp_mul): add prototype
-	  declarations.
-
-Wed May  4 18:38:00 2016  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* lib/net/http/header.rb (Net::HTTPHeader#{each_header,each_name,
-	  each_capitalized_name,each_value,each_capitalized}): Return
-	  sized enumerators.
-
-	* test/net/http/test_httpheader.rb: add test for above.
-
-Wed May  4 17:53:15 2016  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* lib/set.rb (Set#{delete_if,keep_if,collect!,reject!,select!,classify,divide},
-	  SortedSet#{delete_if,keep_if}): Return sized enumerators.
-
-	* test/test_set.rb: add test for above.
-
-Tue May  3 23:25:48 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* numeric.c: [DOC] Update result of 123456789 ** -2.
-	  [ruby-dev:49606] [Bug #12339]
-
-Tue May  3 23:13:16 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
-
-	* internal.h (RCOMPLEX_SET_IMAG): undef RCOMPLEX_SET_IMAG
-	  instead of duplicated undef RCOMPLEX_SET_REAL.
-
-Tue May  3 22:55:07 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
-
-	* complex.c (rb_complex_set_imag): Fix to properly set imag
-	  of complex.
-
-Tue May  3 22:19:55 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in (warnflags): use -std=gnu99 instead of
-	  -std=iso9899:1999. [Feature #12336]
-
-Tue May  3 22:10:09 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (count_utf8_lead_bytes_with_word): Use __builtin_popcount
-	  only if it can use SSE 4.2 POPCNT whose latency is 3 cycle.
-
-	* internal.h (rb_popcount64): use __builtin_popcountll because now
-	  it is in fast path.
-
-Tue May  3 14:19:18 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (new_if_gen): set newline flag to NODE_IF to trace all
-	  if/elsif statements.  [ruby-core:67720] [Bug #10763]
-
-Tue May  3 05:35:54 2016  Eric Wong  <e@80x24.org>
-
-	* process.c (disable_child_handler_fork_child):
-	  initialize handler for SIGPIPE for !POSIX_SIGNAL
-
-Mon May  2 23:03:42 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c, include/ruby/win32.h (rb_w32_utruncate): implements new
-	  truncate alternative which accepts UTF-8 path.
-
-	* file.c (truncate): use above function.
-	  [Bug #12340]
-
-Mon May  2 20:59:21 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* re.c (str_coderange): to avoid function call when the string already
-	  has coderange information.
-
-	* re.c (rb_reg_prepare_enc): add shortcut path when the regexp has
-	  the same encoding of given string.
-
-	* re.c (rb_reg_prepare_re): avoid duplicated allocation of
-	  onig_errmsg_buffer.
-
-
-Mon May  2 12:34:52 2016  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/test_refinement.rb (test_inspect): Use Integer instead of
-	  Fixnum.
-
-Mon May  2 06:58:38 2016  Tanaka Akira  <akr@fsij.org>
-
-	* complex.c: Don't refer rb_cFixnum and rb_cBignum.
-	  (k_fixnum_p): Use FIXNUM_P.
-	  (k_bignum_p): Use RB_TYPE_P.
-
-Mon May  2 01:27:59 2016  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/test_numeric.rb (test_step): Use Integer::FIXNUM_MAX.
-
-Mon May  2 01:15:01 2016  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/test_module.rb (test_name): Use Integer instead of Fixnum.
-
-Mon May  2 01:00:04 2016  Tanaka Akira  <akr@fsij.org>
-
-	* test/lib/test/unit/assertions.rb (assert_fixnum): Defined.
-	  (assert_bignum): Defined.
-
-	* test/ruby/test_bignum.rb: Use assert_bignum.
-
-	* test/ruby/test_integer_comb.rb: Use assert_fixnum and assert_bignum.
-
-	* test/ruby/test_optimization.rb: Ditto.
-
-Mon May  2 00:41:53 2016  Tanaka Akira  <akr@fsij.org>
-
-	* vm_trace.c (recalc_remove_ruby_vm_event_flags): Add a cast to
-	  avoid signed integer overflow.
-
-Mon May  2 00:06:04 2016  Tanaka Akira  <akr@fsij.org>
-
-	* test/lib/envutil.rb: Define Integer::{FIXNUM_MIN,FIXNUM_MAX}.
-
-	* test/ruby/test_bignum.rb: Use Integer::{FIXNUM_MIN,FIXNUM_MAX}.
-
-	* test/ruby/test_bignum.rb: Ditto.
-
-	* test/ruby/test_integer_comb.rb: Ditto.
-
-	* test/ruby/test_marshal.rb: Ditto.
-
-	* test/ruby/test_optimization.rb: Ditto.
-
-Sun May  1 23:59:59 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* array.c (rb_ary_sum): fix for mathn
-
-	* test/ruby/test_array.rb (test_sum): ditto.
-
-Sun May  1 23:51:54 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/lib/test/unit.rb (Options#non_options): fixed wrong regexp.
-	  if both positives and negatives were specified, positives had to
-	  be specified from the beginning.
-
-Sun May  1 21:00:07 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c: drop Win2K support.
-
-Sun May  1 20:39:47 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* cont.c, hash.c, random.c, win32/win32.c: cleanup some Win9x/ME/NT4
-	  support leftovers.
-	  [fix GH-1328] patched by @cremno
-
-Sun May  1 07:30:44 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (search_nonascii): use nlz on big endian environments.
-
-	* internal.h (nlz_intptr): defined.
-
-Sun May  1 00:03:30 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in (__builtin_ctz): check.
-
-	* configure.in (__builtin_ctzll): check.
-
-	* internal.h (rb_popcount32): defined for ntz_int32.
-	  it can use __builtin_popcount but this function is not used on
-	  GCC environment because it uses __builtin_ctz.
-	  When another function uses this, using __builtin_popcount
-	  should be re-considered.
-
-	* internal.h (rb_popcount64): ditto.
-
-	* internal.h (ntz_int32): defined for ntz_intptr.
-
-	* internal.h (ntz_int64): defined for ntz_intptr.
-
-	* internal.h (ntz_intptr): defined as ntz for uintptr_t.
-
-	* string.c (search_nonascii): unroll and use ntz.
-
-Sat Apr 30 21:54:13 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (Init_Numeric): Gather Fixnum method definitions.
-
-Sat Apr 30 21:28:14 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (rb_int_div): Define Integer#/.
-
-	* bignum.c (rb_big_div): Don't define Bignum#/.
-
-	* lib/mathn.rb (Integer#/): Replace Integer#/ instead of Bignum#/.
-
-Sat Apr 30 21:11:08 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (rb_int_plus): Define Integer#+.
-
-	* bignum.c (rb_big_plus): Don't define Bignum#+.
-
-Sat Apr 30 21:01:20 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (rb_int_minus): Define Integer#-.
-
-	* bignum.c (rb_big_minus): Don't define Bignum#-.
-
-Sat Apr 30 20:53:33 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (rb_int_mul): Define Integer#*.
-
-	* bignum.c (rb_big_mul): Don't define Bignum#*.
-
-Sat Apr 30 20:30:44 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (rb_int_modulo): Define Integer#%.
-
-	* bignum.c (rb_big_modulo): Don't define Bignum#%.
-
-Sat Apr 30 20:17:08 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (int_equal): Define Integer#==.
-
-	* bignum.c (rb_big_eq): Don't define Bignum#==.
-
-Sat Apr 30 19:41:15 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (int_gt): Define Integer#>.
-
-	* bignum.c (rb_big_gt): Don't define Bignum#>.
-	  Renamed from big_gt.
-
-	* internal.h (rb_big_gt): Declared.
-
-Sat Apr 30 19:24:40 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (int_ge): Define Integer#>=.
-
-	* bignum.c (rb_big_ge): Don't define Bignum#>=.
-	  Renamed from big_ge.
-
-	* internal.h (rb_big_ge): Declared.
-
-Sat Apr 30 19:20:40 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* doc/standard_library.rdoc: Remove obsoleted classes and modules.
-
-Sat Apr 30 19:09:23 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (int_lt): Define Integer#<.
-
-	* bignum.c (rb_big_lt): Don't define Bignum#<.
-	  Renamed from big_lt.
-
-	* internal.h (rb_big_lt): Declared.
-
-Sat Apr 30 18:44:05 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (int_le): Define Integer#<=.
-
-	* bignum.c (rb_big_le): Don't define Bignum#<=.
-	  Renamed from big_le.
-
-	* internal.h (rb_big_le): Declared.
-
-Sat Apr 30 18:11:44 2016  Tanaka Akira  <akr@fsij.org>
-
-	* bignum.c (Init_Bignum): Define Integer::GMP_VERSION.
-
-Sat Apr 30 16:58:18 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (int_remainder): Define Integer#remainder.
-
-	* bignum.c (rb_big_remainder): Don't define Bignum#remainder.
-
-	* internal.h (rb_big_remainder): Declared.
-
-Sat Apr 30 15:29:24 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (rb_int_uminus): {Fixnum,Bignum}#-@ is unified into
-	  Integer.
-
-	* bignum.c (rb_big_uminus): Don't define Bignum#-@.
-
-Sat Apr 30 14:42:20 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (rb_int_idiv): {Fixnum,Bignum}#div is unified into
-	  Integer.
-
-	* bignum.c (rb_big_idiv): Don't define Bignum#div.
-
-Sat Apr 30 14:25:55 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (rb_int_modulo): {Fixnum,Bignum}#modulo is unified into
-	  Integer.
-
-	* bignum.c (rb_big_modulo): Don't define Bignum#modulo.
-
-Sat Apr 30 14:04:30 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (int_divmod): {Fixnum,Bignum}#divmod is unified into
-	  Integer.
-
-	* bignum.c (rb_big_divmod): Don't define Bignum#divmod.
-
-Sat Apr 30 13:20:00 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (int_fdiv): {Fixnum,Bignum}#fdiv is unified into
-	  Integer.
-
-	* bignum.c (rb_big_fdiv): Don't define Bignum#fdiv.
-
-Sat Apr 30 12:25:43 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (rb_int_pow): {Fixnum,Bignum}#** is unified into
-	  Integer.
-
-	* bignum.c (rb_big_pow): Don't define Bignum#**.
-
-Sat Apr 30 12:28:59 2016  Tanaka Akira  <akr@fsij.org>
-
-	* bignum.c (rb_big_comp): Renamed from rb_big_neg.
-
-	* numeric.c (fix_comp): Renamed from fix_rev.
-
-Sat Apr 30 12:25:43 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (int_comp): {Fixnum,Bignum}#~ is unified into
-	  Integer.
-
-	* bignum.c (rb_big_neg): Don't define Bignum#~.
-
-	* internal.h (rb_big_neg): Declared.
-
-Sat Apr 30 12:07:42 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (int_and): {Fixnum,Bignum}#& is unified into
-	  Integer.
-
-	* bignum.c (rb_big_and): Don't define Bignum#&.
-
-Sat Apr 30 11:56:15 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/thread: removed dummy extension library.  thread_sync.c
-	  provides "thread.rb" already.
-
-Sat Apr 30 11:53:48 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (int_or): {Fixnum,Bignum}#| is unified into
-	  Integer.
-
-	* bignum.c (rb_big_or): Don't define Bignum#|.
-
-Sat Apr 30 11:18:47 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
-
-	* vm_trace.c: Fix typos. [ci skip]
-
-Sat Apr 30 10:09:04 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/pty/pty.c (establishShell): honor USER environment variable
-	  and login name over uid, one uid can be shared by some login
-	  names.
-
-Fri Apr 29 22:40:28 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* doc/maintainers.rdoc (ext/io/nonblock): still maintained, as
-	  well as ext/io/wait, which is the origin.
-
-Fri Apr 29 21:18:12 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* doc/maintainers.rdoc (ext/win32): of course, it's still maintained.
-
-Fri Apr 29 21:03:10 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* gems/bundled_gems: Update latest gems, test-unit-3.1.8 and rake-11.1.2.
-
-Fri Apr 29 20:43:02 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* doc/maintainers.rdoc: Update latest maintainers list on Ruby 2.4
-
-Fri Apr 29 19:52:45 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* doc/maintainers.rdoc: Removed deprecated entries. These are already deleted.
-
-Fri Apr 29 19:48:45 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* doc/maintainers.rdoc: Removed Ruby 1.8 entries. It's not necessary to
-	  Ruby 2.4 or later.
-
-Thu Apr 28 17:03:17 2016  Nicholas Maccharoli  <nmaccharoli@gmail.com>
-
-	* hash.c (rb_hash_update_{block,func}_callback): dry up hash
-	  update callback code.  [Fix GH-1338]
-
-Thu Apr 28 16:52:05 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* re.c (rb_reg_prepare_enc): use rb_enc_asciicompat(enc) instead of
-	  rb_enc_str_asciicompat_p(str) to avoid useless rb_enc_get(str) call.
-
-Thu Apr 28 16:33:41 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/optparse.rb: [DOC] fix example code.  base on the code by
-	  Semyon Gaivoronskiy in [ruby-core:75224].  [Bug #12323]
-
-Thu Apr 28 09:33:03 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update rubygems-2.6.4.
-	  Please see entries of 2.6.4 on
-	  https://github.com/rubygems/rubygems/blob/master/History.txt
-
-Thu Apr 28 04:49:07 2016  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* configure.in (rb_cv_lgamma_r_pm0): check if lgamma_r(+0.0)
-	  returns positive infinity, in addition to lgamma_r(-0.0).
-	  AIX returns an incorrect result of negative infinity.
-
-	* math.c (ruby_lgamma_r): handle +0.0, in addition to -0.0.
-
-Thu Apr 28 01:11:14 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* time.c: define _DEFAULT_SOURCE because glibc 2.20 deprecates
-	  _BSD_SOURCE.
-	  https://sourceware.org/glibc/wiki/Release/2.20
-
-Thu Apr 28 00:27:55 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (int_xor): {Fixnum,Bignum}#^ is unified into
-	  Integer.
-
-	* bignum.c (rb_big_xor): Don't define Bignum#^.
-
-Wed Apr 27 20:53:59 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (int_aref): {Fixnum,Bignum}#[] is unified into
-	  Integer.
-
-	* bignum.c (rb_big_aref): Don't define Bignum#<<.
-
-	* internal.h (rb_big_aref): Declared.
-
-Wed Apr 27 16:10:35 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* tool/instruction.rb: fix to follow current implementation.
-
-Wed Apr 27 15:47:54 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/stringio/stringio.c (strio_s_new): warn if a block is given,
-	  as well as IO.new.
-
-Wed Apr 27 14:29:47 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* error.c (ruby_only_for_internal_use): raise fatal error when
-	  deprecated function only for internal use is called, not just a
-	  warning.
-
-Tue Apr 26 23:42:30 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* tool/redmine-backporter.rb (rel): should not raise exceptions even if
-	  the user input is wrong.  only reports the error and continue process.
-
-Tue Apr 26 23:35:23 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (process_options): convert -e script to the encoding
-	  given by a command line option on Windows.  assume it is the
-	  expected encoding.  [ruby-dev:49461] [Bug #11900]
-
-Tue Apr 26 21:11:02 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (rb_int_lshift): {Fixnum,Bignum}#<< is unified into
-	  Integer.
-
-	* bignum.c (rb_big_lshift): Don't define Bignum#<<.
-
-Tue Apr 26 20:59:40 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (rb_int_rshift): {Fixnum,Bignum}#>> is unified into
-	  Integer.
-
-	* bignum.c (rb_big_rshift): Don't define Bignum#>>.
-
-Tue Apr 26 20:46:16 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (int_size): {Fixnum,Bignum}#size is unified into Integer.
-
-	* bignum.c (rb_big_size_m): Don't define Bignum#size.
-
-	* internal.h (rb_big_size_m): Declared.
-
-Tue Apr 26 20:09:08 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (rb_int_bit_length): {Fixnum,Bignum}#bit_length is
-	  unified into Integer.
-
-	* bignum.c (rb_big_bit_length): Don't define Bignum#bit_length.
-
-	* internal.h (rb_big_bit_length): Declared.
-
-Tue Apr 26 19:56:16 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (int_abs): Integer#{abs,magnitude} moved from
-	  Fixnum and Bignum.
-
-	* bignum.c (rb_big_abs): Don't define Bignum#{abs,magnitude}.
-
-	* internal.h (rb_big_abs): Declared.
-
-Mon Apr 25 14:39:11 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/rbconfig/sizeof/extconf.rb: just check the existence of each
-	  types, to reduce configuration time, especially cross-compiling.
-
-	* template/sizes.c.tmpl: calculate sizes of checked types at
-	  compilation time.
-
-Mon Apr 25 11:27:27 2016  Marcus Stollsteimer  <sto.mar@web.de>
-
-	* doc/extension.rdoc: Improvements to english grammars.
-	  [Bug #12246][ruby-core:74792][ci skip]
-
-Mon Apr 25 11:17:50 2016  Marcus Stollsteimer  <sto.mar@web.de>
-
-	* encoding.c: Fix return value of `Encoding::ISO8859_1.name`
-	  [Bug #12313][ruby-core:75147][ci skip]
-	* ext/bigdecimal/bigdecimal.c: Fix code sample of `BigDecimal.new`
-
-Sun Apr 24 23:29:16 2016  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* configure.in: add missing -lm for AIX.
-
-Sun Apr 24 18:33:58 2016  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* vm_insnhelper.c (INLINE): disable r54738 if __NO_INLINE__ is defined.
-	  It caused "undefined reference to `vm_getivar'".
-
-Sun Apr 24 09:32:12 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
-
-	* test/ruby/test_array.rb: Add test cases for Array#sum with
-	  non-numeric objects.
-
-Sun Apr 24 04:21:27 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* vm_insnhelper.c (INLINE): define as `inline` when it is optimized.
-	  define as `static inline` when it is not optimized to keep
-	  the symbol generated.
-
-	* vm_insnhelper.c (vm_getivar): use `INLINE` to force inline
-	  so that a compiler inlines it into vm_getinstancevariable
-	  and optimizes out is_attr and related branches.
-
-	* vm_insnhelper.c (vm_getivar): use `inline` to recommend inline.
-	  Without this vm1_ivar_set is degraded.
-
-	  benchmark results:
-	  minimum results in each 5 measurements.
-	  Execution time (sec)
-	  name    ruby 2.4.0dev (2016-04-23 trunk 54727) [x86_64-linux]   ruby 2.4.0dev (2016-04-23 trunk 54733) [x86_64-linux]       built-ruby
-	  loop_whileloop 0.641                                                   0.642 0.646
-	  vm1_ivar* 1.002                                                   0.999 0.831
-	  vm1_ivar_set* 0.369                                                   1.106 0.362
-
-	  Speedup ratio: compare with the result of `ruby 2.4.0dev (2016-04-23
-	  trunk 54727) [x86_64-linux]' (greater is better)
-	  name    ruby 2.4.0dev (2016-04-23 trunk 54733) [x86_64-linux]
-	  built-ruby
-	  loop_whileloop
-	  0.998        0.991
-	  vm1_ivar*
-	  1.003        1.205
-	  vm1_ivar_set*
-	  0.334        1.018
-
-Sat Apr 23 18:01:21 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* vm_insnhelper.c (vm_getivar): specify inline instead of static inline.
-	  vm_getivar is called by vm_call_ivar and vm_getinstancevariable.
-	  At least with GCC 4.8 and 5.3 on Linux, they are inlining it into
-	  vm_call_ivar but not vm_getinstancevariable.
-	  By `inline`, they correctly inline it and gains performance.
-
-	  Speedup ratio: compare with the result of `ruby 2.4.0dev (2016-04-23
-	  trunk 54727) [x86_64-linux]' (greater is better)
-	  name    built-ruby
-	  loop_whileloop       1.001
-	  vm1_ivar*            1.189
-	  vm1_ivar_set*        1.024
-
-	  Note the `inline`'s meaning is different between old GCC
-	  and C99. Old GCC's inline means C99's extern inline.
-	  https://gcc.gnu.org/onlinedocs/gcc/Inline.html
-	  Since Ruby specify -std=iso9899:1999, it works like C99.
-
-Sat Apr 23 16:11:39 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* include/ruby/ruby.h (rb_mul_size_overflow): use UNLIKELY
-	  by user side to improve generality.
-
-Sat Apr 23 16:10:02 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* include/ruby/ruby.h (RB_LIKELY): use prefix in ruby.h.
-
-	* intern.h (LIKELY): define with RB_LIKELY.
-
-Sat Apr 23 13:27:25 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
-
-	* NEWS: Add descriptions for Time#to_time updates.
-	  [Bug #12271]
-
-Sat Apr 23 13:21:24 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
-
-	* NEWS: Add descriptions for DateTime#to_time updates.
-	  [Bug #12189]
-
-Sat Apr 23 11:21:27 2016  Marcus Stollsteimer  <sto.mar@web.de>
-
-	* ext/date/date_core.c (Init_date_core): [DOC] Convert DateTime
-	  documentation to RDoc from Markdown.
-	  [ruby-core:75136] [Bug #12311]
-
-Sat Apr 23 09:03:35 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c: cygwin does not use w32_cmdvector, command line can be
-	  other than UTF-8.  [ruby-dev:49519] [Bug #12184]
-
-Sat Apr 23 01:00:03 2016  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* configure.in: don't use the system-provided round(3) on AIX.
-	  In AIX, round(0.49999999999999994) returns 1.0.
-	  Use round() in numeric.c instead.
-
-Fri Apr 22 21:00:44 2016  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/test_time_tz.rb: Tests depends on Europe/Moscow removed
-	  to avoid test failures due to the tzdata change.
-	  https://github.com/eggert/tz/commit/8ee11a301cf173afb0c76e0315b9f9ec8ebb9d95
-	  Found by naruse.
-
-Fri Apr 22 20:18:40 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* include/ruby/ruby.h (rb_mul_size_overflow): added to handle
-	  mul overflow efficiently.
-
-	* include/ruby/ruby.h (rb_alloc_tmp_buffer2): use rb_mul_size_overflow
-	  and avoid division where it can define DSIZE_T.
-
-	* gc.c (xmalloc2_size): moved from ruby.h and use rb_mul_size_overflow.
-
-Fri Apr 22 20:34:04 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* time.c (time_asctime): [DOC] add ctime example, not only
-	  asctime.  [ruby-core:75126] [Bug #12310]
-
-Fri Apr 22 18:44:32 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* variable.c: use uint32_t instead of long to avoid confusion about
-	  the type of ivtbl->numiv.
-
-Fri Apr 22 15:09:27 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval_jump.c (exec_end_procs_chain): restore previous error info
-	  for each end procs.  [ruby-core:75038] [Bug #12302]
-
-Fri Apr 22 15:04:56 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* tool/redmine-backporter.rb: the fullpath of merger.rb is too long to
-	  copy&paste on Windows.  show shorter name instead on the platform.
-	  I'm sure that the user of this command on Windows is only me.
-
-Fri Apr 22 14:52:04 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* tool/merger.rb: remove temporary file.
-
-Fri Apr 22 11:27:03 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/net/http.rb: Improve documentation for SSL requests via GET method.
-	  [fix GH-1325][ci skip] Patch by @jsyeo
-
-Fri Apr 22 10:51:13 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/webrick/ssl.rb: Support to add SSLCiphers option.
-	  [fix GH-1321] Patch by @rhadoo
-
-Fri Apr 22 10:43:19 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* file.c, win32/file.c: Removed obsoleted safe level checks.
-	  [fix GH-1327] Patch by @cremno
-
-Fri Apr 22 10:01:48 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* benchmark/bm_so_meteor_contest.rb: fix a typo.
-	  [fix GH-1330][ci skip] Patch by @sachin21
-
-Fri Apr 22 04:57:01 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* gc.c (rb_alloc_tmp_buffer_with_count): added like xmalloc2 to
-	  avoid duplicated check of size.
-
-	* gc.c (ruby_xmalloc2): added to keep separate layers.
-
-	* include/ruby/ruby.h (rb_alloc_tmp_buffer2): added to check
-	  the size more statically.
-
-Fri Apr 22 04:54:40 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* include/ruby/ruby.h (LIKELY): moved from internal.h.
-
-	* include/ruby/ruby.h (UNLIKELY): ditto.
-
-Thu Apr 21 01:44:19 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* gc.c (objspace_malloc_prepare): remove size check because it is
-	  used by objspace_xmalloc and objspace_xcalloc.
-	  objspace_xmalloc introduces its own check in this commit.
-	  objspace_xcalloc checks with xmalloc2_size (ruby_xmalloc2_size).
-
-	* gc.c (objspace_xmalloc0): common xmalloc function.
-
-	* gc.c (objspace_xmalloc): introduce its own size check.
-
-	* gc.c (objspace_xmalloc2): separated from ruby_xmalloc2 to clarify
-	  the layer who has the responsibility to check the size.
-
-	* gc.c (objspace_xrealloc): remove duplicated size check.
-
-	* gc.c (ruby_xmalloc2): use objspace_xmalloc2.
-
-	* include/ruby/ruby.h (ruby_xmalloc2_size): follow the size limit
-	  as SSIZE_MAX. Note that ISO C says size_t is unsigned integer.
-
-Thu Apr 21 12:14:04 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in: check if succeeded in creating config.h.
-
-	* tool/ifchange: ignore failures when TEST_COLORS unmatched. just
-	  use the default value if expected name is not contained in it.
-	  [ruby-core:75046] [Bug #12303]
-
-Wed Apr 20 17:33:31 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/cgi/escape/escape.c (cgiesc_unescape): define unescape
-	  method instead of _unescape, and should pass the optional
-	  argument to the super method.
-
-	* lib/cgi/util.rb (CGI::Util#_unescape): remove intermediate
-	  method.
-
-Wed Apr 20 15:52:28 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* error.c (syntax_error_initialize): move the default message,
-	  "compile error", from parse.y.  the default parameter should
-	  belong to the class definition.
-
-	* parse.y (yycompile0): use the default parameter.
-
-Wed Apr 20 10:25:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (append_compile_error): use rb_syntax_error_append.
-
-	* error.c (rb_syntax_error_append): append messages into a
-	  SyntaxError exception instance.
-
-	* parse.y (yycompile0): make new SyntaxError instance in main
-	  mode, otherwise error_buffer should be a SyntaxError if error
-	  has occurred.
-
-Tue Apr 19 17:42:47 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* error.c (err_vcatf): rename, and separate appending message from
-	  creating a string buffer.
-
-	* error.c (rb_syntax_error_append): merge rb_error_vsprintf and
-	  rb_compile_err_append.
-
-	* parse.y (parser_compile_error): use rb_syntax_error_append.
-
-Tue Apr 19 13:46:19 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (append_compile_error, compile_bug): pass iseq and get
-	  error info and file from it, not by the thread error info.
-
-	* error.c (rb_report_bug_valist): take va_list instead of variadic
-	  arguments, and just report the bug but not abort.
-
-Tue Apr 19 13:18:12 2016  Naotoshi Seo  <sonots@gmail.com>
-
-	* lib/time.rb: revert r54167 because it would break
-	  backward compatibilities, and it is documented that
-	  Time.parse does not take into account time zone
-	  abbreations other than ones described in RFC 822
-
-Tue Apr 19 13:12:03 2016  Naotoshi Seo  <sonots@gmail.com>
-
-	* ChangeLog: Fix dates of previous commits
-
-Tue Apr 19 12:45:03 2016  Naotoshi Seo  <sonots@gmail.com>
-
-	* ChangeLog: Add descriptions for logger updates
-	* NEWS: Add descriptions for logger updates
-
-Tue Apr 19 12:45:02 2016  Naotoshi Seo  <sonots@gmail.com>
-
-	* lib/logger.rb: Add shift_period_suffix option
-
-Tue Apr 19 12:45:01 2016  Naotoshi Seo  <sonots@gmail.com>
-
-	* lib/logger.rb: Allow specifying logger parameters in constructor
-	  such as level, progname, datetime_format, formatter.
-
-Mon Apr 18 16:07:01 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (iseq_peephole_optimize): should not replace the
-	  current target INSN, not to follow the replaced dangling link in
-	  the caller.  [ruby-core:74993] [Bug #11816]
-
-Mon Apr 18 12:56:31 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (flo_truncate): add an optional parameter, digits, as
-	  well as Float#round.  [Feature #12245]
-
-	* numeric.c (int_truncate): add an optional parameter, digits, as
-	  well as Integer#round.  [Feature #12245]
-
-Sun Apr 17 04:18:56 2016  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
-
-	* tool/redmine-backporter.rb: revisions are strings.
-
-Sat Apr 16 14:26:49 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
-
-	* ext/date/date_core.c : remove not used f_getlocal macro.
-	  After r54553 f_getlocal macro is not used.
-
-Sat Apr 16 14:15:24 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
-
-	* ext/date/date_core.c : remove not used f_utc6 macro.
-	  After r54169 f_utc6 macro is not used.
-
-Sat Apr 16 10:00:11 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* struct.c (struct_make_members_list, rb_struct_s_def): member
-	  names should be unique. [ruby-core:74971] [Bug #12291]
-
-	* struct.c (struct_make_members_list): extract making member name
-	  list from char* va_list, with creating symbols without
-	  intermediate IDs.
-
-Sat Apr 16 01:33:27 2016  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
-
-	* tool/redmine-backporter.rb: sort revisions.
-
-Sat Apr 16 01:16:02 2016  Tanaka Akira  <akr@fsij.org>
-
-	* array.c (rb_ary_sum): Don't yield same element twice.
-	  Found by nagachika.
-
-Sat Apr 16 01:03:32 2016  Tanaka Akira  <akr@fsij.org>
-
-	* array.c (rb_ary_sum): Fix SEGV by [1/2r, 1].sum.
-
-Fri Apr 15 23:52:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* rational.c (rb_rational_plus): rename from rb_rational_add
-	  to be aligned with rb_fix_plus.
-
-	* array.c (rb_ary_sum): ditto.
-
-	* internal.h: ditto.
-
-Fri Apr 15 23:42:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* rational.c (rb_rational_add): rename from nurat_add.
-
-	* array.c (rb_ary_sum): use rb_rational_add directly.
-
-	* test/ruby/test_array.rb (test_sum): add assertions for an array of
-	  Rational values.
-
-Fri Apr 15 22:31:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* array.c (rb_ary_sum): apply the precision compensated algorithm
-	  for an array in which Rational and Float values are mixed.
-
-	* test/ruby/test_array.rb (test_sum): add assertions for the above
-	  change.
-
-Fri Apr 15 22:30:01 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (rb_thread_setname): defer setting native thread name
-	  set in initialize until the native thread is created.
-	  [ruby-core:74963] [Bug #12290]
-
-Fri Apr 15 20:27:16 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/irb/ext/save-history.rb: Fix NoMethodError when method is not defined.
-
-Fri Apr 15 15:38:58 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* common.mk (benchmark): order options for built-ruby and compare-ruby.
-
-Fri Apr 15 14:14:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* test/ruby/test_array.rb (test_sum): add assertions for Rational and
-	  Complex numbers.
-
-Fri Apr 15 10:07:11 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/io/console/console.c (console_key_pressed_p): raise the same
-	  exception, "unknown virtual key code", for names with nul chars.
-	  though console_win32_vk() considers the length and can deal with
-	  nul chars, rb_sprintf() raised at PRIsVALUE previously, so quote
-	  it if it is unprintable.
-
-Fri Apr 15 09:02:58 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/io/console/console.c (rb_sym2str): fallback definition for
-	  older ruby.  [ruby-core:74953] [Bug #12284]
-
-Thu Apr 14 21:46:36 2016  Tanaka Akira  <akr@fsij.org>
-
-	* array.c (rb_ary_sum): Support the optional argument, init, and
-	  block.
-
-Thu Apr 14 19:02:41 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/irb/ext/save-history.rb: suppress warning: method redefined;
-	  discarding old save_history=.
-
-Thu Apr 14 14:58:14 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/tk/tkutil/tkutil.c (tk_hash_kv): the third argument can be
-	  nil not only an Array.  reported by @windwiny at
-	  https://github.com/ruby/ruby/commit/cdaa94e#commitcomment-17096618
-
-Thu Apr 14 14:28:55 2016  cremno phobia  <cremno@mail.ru>
-
-	* cont.c (fiber_initialize_machine_stack_context): fix wrong
-	  _MSC_VER check, should be decimal but not hexadecimal.
-	  [ruby-core:74936] [Bug #12279]
-
-Wed Apr 13 22:51:38 2016  Tanaka Akira  <akr@fsij.org>
-
-	* array.c (rb_ary_sum): Array#sum is implemented.
-	  Kahan's compensated summation algorithm for precise sum of float
-	  numbers is moved from ary_inject_op in enum.c.
-
-	* enum.c (ary_inject_op): Don't specialize for float numbers.
-
-	  [ruby-core:74569] [Feature #12217] proposed by mrkn.
-
-Wed Apr 13 15:56:35 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (flo_ceil): add an optional parameter, digits, as
-	  well as Float#round.  [Feature #12245]
-
-	* numeric.c (flo_floor): add an optional parameter, digits, as
-	  well as Float#round.  [Feature #12245]
-
-	* numeric.c (int_ceil): add an optional parameter, digits, as
-	  well as Integer#round.  [Feature #12245]
-
-	* numeric.c (int_floor): add an optional parameter, digits, as
-	  well as Integer#round.  [Feature #12245]
-
-Wed Apr 13 14:47:47 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (Init_File): add alias File.empty? to File.zero?.
-	  [Feature #9969]
-
-Wed Apr 13 14:36:24 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (assign_in_cond): allow multiple assignment in
-	  conditional expression.  [Feature #10617]
-
-Wed Apr 13 14:11:59 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bignum.c (rb_big_size): add wrapper function of BIGSIZE and
-	  rename the method function with _m suffix.
-
-	* numeric.c (int_round_zero_p): extracted from rb_int_round.
-	  optimize for Bignum, and convert VALUE returned by Numeric#size
-	  to long.
-
-Wed Apr 13 12:00:08 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* test/ruby/test_basicinstructions.rb: add a test to check access
-	  instance variables on special const objects.
-
-	  All of such objects are frozen, so that we can not set instance
-	  variables for them. But we can read instance variables and return
-	  default value (nil).
-
-Tue Apr 12 20:40:35 2016  Kaneko Yuichiro  <spiketeika@gmail.com>
-
-	* ext/date/date_core.c (time_to_time): should preserve timezone
-	  info.  [ruby-core:74889] [Bug #12271]
-
-Tue Apr 12 11:51:18 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (new_label_body): initialize bit fields, since
-	  compile_data_alloc does not clear the memory.  [Bug #12082]
-
-Mon Apr 11 20:18:43 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_backtrace.c (frame2klass): filter only for imemo_ment.
-	  T_IMEMO/imemo_iseq can be passed here.
-
-Mon Apr 11 17:43:04 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (iseq_optimize): disable tail call optimization in
-	  rescued, rescue, and ensure blocks.
-	  [ruby-core:73871] [Bug #12082]
-
-Mon Apr 11 06:54:39 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (apply2files): apply to a VALUE vector instead of a
-	  temporary array.
-
-Sun Apr 10 20:54:16 2016  Joe Swatosh  <joe.swatosh@gmail.com>
-
-	* ext/win32/lib/win32/registry.rb (DeleteValue, DeleteKey): fix
-	  API names.  [ruby-core:74863] [Bug #12264]
-
-Sun Apr 10 17:47:42 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_realpath_internal): no argument conversions since
-	  this internal function does not need to_path and encoding
-	  conversions, not to be affected by the default internal
-	  encoding.
-
-Sat Apr  9 10:03:12 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* load.c (rb_f_load): raise with the original path name before
-	  encoding conversion.
-
-Sat Apr  9 02:05:10 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bignum.c (rb_cstr_parse_inum): [EXPERIMENTAL] new function to
-	  parse integer in C-string with length.  the name and the
-	  arguments may be changed in the future.
-
-	* bignum.c (rb_str_to_inum): preserve encoding of the argument in
-	  error messages, and no longer needs to copy non-terminated
-	  strings.
-
-	* bignum.c (rb_str2big_{poweroftwo,normal,karatsuba,gmp}): ditto.
-
-Thu Apr  7 19:04:03 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* doc/regexp.rdoc (comments): [DOC] terminators cannot appear in
-	  comments.  [ruby-core:74838] [Bug #12256]
-
-Thu Apr  7 11:24:14 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/tk/tkutil/tkutil.c (cbsubst_initialize): fix out-of-bound
-	  access when no arguments given.  `p Tk::Event.new` crashed.
-
-Fri Apr  1 01:26:00 2016  Benoit Daloze  <eregontp@gmail.com>
-
-	* ext/coverage/coverage.c: Fully reset coverage to not persist global state.
-	  It was returning old file coverages as empty arrays to the user.
-	  [ruby-core:74596] [Bug #12220]
-
-	* ext/coverage/coverage.c (rb_coverages): remove unused static state.
-
-	* thread.c: Moved and renamed coverage_clear_result_i to reset_coverage_i.
-
-	* test/coverage/test_coverage.rb: improve precision of tests.
-
-Wed Apr  6 22:41:31 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (rb_cv_lgamma_r_m0): fix the condition for
-	  lgamma_r(-0.0).  [Bug #12249]
-
-Wed Apr  6 17:38:42 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* tool/downloader.rb (RubyGems.download): follow the change of the
-	  rubygems ssl_certs directory tree introduced by previous commit.
-
-Wed Apr  6 15:00:27 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update rubygems-2.6.3.
-	  Please see entries of 2.6.3 on
-	  https://github.com/rubygems/rubygems/blob/master/History.txt
-
-Wed Apr  6 14:13:28 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (rb_cv_lgamma_r_m0): check if lgamma_r(-0.0)
-	  returns negative infinity.  [Bug #12249]
-
-	* math.c (ruby_lgamma_r): define by the configured result.
-
-Wed Apr  6 10:56:15 2016  Anton Davydov  <antondavydov.o@gmail.com>
-
-	* lib/logger.rb (Logger#level=): remove unnecessary local
-	  variable.
-
-	* lib/logger.rb (Logger#initialize, Logger#reopen): [DOC] mention
-	  the default values.  cherrypicked from [GH-1319].
-
-Wed Apr  6 10:17:53 2016  cremno phobia  <cremno@mail.ru>
-
-	* math.c (ruby_lgamma_r): missing/lgamma_r.c is used on Windows,
-	  since msvcrt does not provide it.
-
-	* missing/lgamma_r.c (lgamma_r): fix lgamma(-0.0).
-	  [ruby-core:74823] [Bug #12249]
-
-Wed Apr  6 01:22:55 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* math.c (ruby_lgamma_r): mswin's lgamma_r also seems to be wrong.
-	  cf. [Bug #12249]
-
-Wed Apr  6 00:53:31 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* math.c (ruby_lgamma_r): fix lgamma(-0.0) on mingw and OSX.
-
-	* math.c (ruby_tgamma): fix tgamma(-0.0) on mingw.
-	  [ruby-core:74817] [Bug #12249]
-
-Tue Apr  5 14:50:28 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8/nkf.c (mime_putc): fix typo.
-	  [Bug #12202] [ruby-core:74802]
-
-Tue Apr  5 00:06:44 2016  Aeris  <aeris@imirhil.fr>
-
-	* ext/openssl/ossl_ssl.c (ossl_ssl_tmp_key): Access to ephemeral
-	  TLS session key in case of forward secrecy cipher.  Only
-	  available since OpenSSL 1.0.2.  [Fix GH-1318]
-
-	* ext/openssl/extconf.rb: Check for SSL_get_server_tmp_key.
-
-Mon Apr  4 23:37:05 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_core.h (rb_vm_struct): make at_exit a single linked list but
-	  not RArray, not to mark the registered functions by the write
-	  barrier.  based on the patches by Evan Phoenix.
-	  [ruby-core:73908] [Bug #12095]
-
-Mon Apr  4 17:43:45 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: change default value of
-	  RUBY_GC_HEAP_FREE_SLOTS_MIN_RATIO 0.3 -> 0.2
-	  RUBY_GC_HEAP_FREE_SLOTS_MAX_RATIO 0.8 -> 0.65
-
-	  These values are same as Ruby 2.0.0.
-
-	  This change cause GC counts.
-	  However, generational GC reduced each (minor) GC time and
-	  increase memory locality. So that not so big impact on my
-	  benchmarking results.
-	  (surprisingly, this fix speed up programs on some cases)
-
-	  You can change these values by environment variables
-	  if you feel wrong.
-
-Mon Apr  4 17:36:52 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (get_envparam_double): take an upper_bound.
-
-	  And also take an accept_zero flag which allow to accept zero
-	  even if lower_bound is set.
-
-	* gc.c (ruby_gc_set_params): fix parameters.
-
-	  RUBY_GC_HEAP_FREE_SLOTS_MAX_RATIO set 0.9 as *lower_bound*, so that
-	  it should be upper_bound.
-	  Set RUBY_GC_HEAP_FREE_SLOTS_MIN_RATIO as lower bound.
-
-	  Also set lower/upper bound of RUBY_GC_HEAP_FREE_SLOTS_GOAL_RATIO to
-	  RUBY_GC_HEAP_FREE_SLOTS_MIN/MAX_RATIO.
-
-Mon Apr  4 16:41:32 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c (Init_VM): should pass tokens.
-
-Sun Apr  3 09:34:29 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (flodivmod): round division if it is a finite number
-	  and module is required.
-
-	* numeric.c (dbl2ival): do not round here.
-
-	* numeric.c (flo_ceil): use dbl2ival.
-
-	* numeric.c (flo_round): round explicitly.
-
-Sat Apr  2 15:24:18 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/intern.h (rb_check_arity): returns argc.
-
-Fri Apr  1 20:58:33 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode/case-folding.rb, casefold.h: Data generation to implement
-	  swapcase functionality for titlecase characters. Swapcase isn't defined
-	  by Unicode, because the purpose/usage of swapcase is unclear anyway.
-	  The implementation follows a proposal from Nobu, swapping the case of
-	  each component of a titlecase character individually.
-	  This means that the titlecase characters have to be decomposed.
-
-	* enc/unicode.c: Code using the above data.
-
-	* test/ruby/enc/test_case_mapping.rb: Tests for the above.
-
-Fri Apr  1 14:55:28 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* configure.in (AC_CONFIG_FILES): $srcdir/.git can be a file pointing
-	  the real git_dir, such as when the git working tree is a "linked
-	  working tree" (a working tree created by git-worktree). So use
-	  git-rev-parse --git-dir to check if $srcdir is the top-level of a git
-	  repository, not just checking if the $srcdir/.git directory does exist
-	  or not.  [ruby-core:74759] [Bug #12239]
-
-	* tool/change_maker.rb: use tool/vcs.rb to detect VCS. This used to have
-	  its own VCS detection code, while we have tool/vcs.rb.
-
-	* tool/vcs.rb (detect): remove code duplication
-
-Fri Apr  1 04:50:44 2016  Eric Wong  <e@80x24.org>
-
-	* ext/openssl/ossl_ssl.c (ossl_sslctx_s_alloc):
-	  enable SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER by default
-	  [Bug #12126]
-
-Fri Apr  1 01:13:55 2016  Benoit Daloze  <eregontp@gmail.com>
-
-	* thread.c (update_coverage): Do not track coverage in loaded files
-	  after Coverage.result. Avoids out-of-bounds access. [Bug #12237]
-
-	* ext/coverage/coverage.c (coverage_clear_result_i): document.
-
-Thu Mar 31 19:16:16 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: need to set initial value of GC_HEAP_FREE_SLOTS_GOAL_RATIO.
-
-Thu Mar 31 17:50:27 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: change additional allocation policy.
-
-	  Introduce new environment variable
-	  RUBY_GC_HEAP_FREE_SLOTS_GOAL_RATIO (goal_ratio) to calculate the
-	  ratio of additional memory.
-
-	  Before this change, we add pages with the following formula
-	  (when free_slots < total_pages * RUBY_GC_HEAP_FREE_SLOTS_MIN_RATIO):
-	    next_pages = total_pages * RUBY_GC_HEAP_GROWTH_FACTOR
-
-	  This addition can allocate too much.
-
-	  With this change, we increase pages to satisfy the following formula:
-	    next_free_slots = next_total_slots * goal_ratio
-	  where
-	    next_free_slots = free_slots + adding_slots
-	    next_total_slots = total_slots + adding_slots.
-
-	  If you want to prepare many free slots, increase this ratio.
-
-	  If this variable is 0, then simply multiply
-	  RUBY_GC_HEAP_GROWTH_FACTOR.
-
-	* gc.c (get_envparam_double): enable to accept 0.
-
-Thu Mar 31 17:48:25 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (gc_marks_finish): fix syntax error.
-
-Thu Mar 31 16:49:36 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: simplify allocate/free detecting logic at the end of marking.
-
-	  Before this change, heap_pages_min_slots are calculated at the
-	  beginning sweeping phase. And this value is used at the end of
-	  *next* marking phase.
-
-	  To simplify it, we use this value at the end of this marking phase.
-	  It means that we don't need to store this value as global state.
-
-	  Also heap_pages_max_slots is calculated at the begging of sweeping
-	  phase and used at the end of sweeping phase.
-	  To simplify this logic, we introduced new global value
-	  heap_pages_freeable_pages it means extra pages count we can free.
-	  gc_sweep_step() checks this value and moves empty pages to tomb_heap
-	  not more than this value.
-
-	  Because of this fix, heap_pages_swept_slots is no longer needed.
-
-	* gc.c (rb_objspace_t::heap_pages): restruct the objspace global
-	  status.
-
-	  remove the following fields
-	    * swept_slots (and heap_pages_swept_slots)
-	    * min_free_slots (and heap_pages_min_free_slots)
-	    * max_free_slots (and heap_pages_max_free_slots)
-	  And add the following filed.
-	    * freeable_pages (and heap_pages_freeable_pages)
-
-	* gc.c (heap_pages_free_unused_pages): unlink tomb heap pages
-	  because tomb heap should have only freeable pages.
-
-	* gc.c (heap_extend_pages): add parameters for future extension.
-
-Thu Mar 31 16:43:02 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: add GC parameters to configure the following values:
-	  * RUBY_GC_HEAP_FREE_SLOTS_MIN_RATIO:
-	    allocate additional pages when free slots is lower than
-	    the value (total_slots * (this ratio)).
-	  * RUBY_GC_HEAP_FREE_SLOTS_MAX_RATIO:
-	    allow to free pages when free slots is greater than
-	    the value (total_slots * (this ratio)).
-
-	  Before this change, these values are hard coded.
-
-	* gc.c (ruby_gc_params_t): ditto.
-
-	* gc.c (ruby_gc_set_params): ditto.
-
-Thu Mar 31 15:59:17 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (gc_verify_heap_page): check the number of zombies.
-
-	* gc.c (gc_verify_heap_pages): check also tomb heap.
-
-Thu Mar 31 15:48:18 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (gc_page_sweep): return free slots count.
-
-	* gc.c (gc_sweep_step): use returned free slots count.
-
-	* gc.c (gc_sweep_step): change variable name `next'
-	  to `next_sweep_page'.
-
-Thu Mar 31 11:33:49 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/date/date_core.c (d_lite_strftime, dt_lite_strftime): [DOC]
-	  fix indent not to be a big sole verbatim.
-
-Thu Mar 31 11:18:19 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/date/date_core.c (Init_date_core): [DOC] fix misplaced doc
-	  of DateTime.  [ruby-core:74729] [Bug #12233]
-
-Thu Mar 31 03:41:02 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8/nkf.c: Merge upstream 69f7e74dde.
-	  fix indent.
-
-Wed Mar 30 16:33:19 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* extension.rdoc, extension.ja.rdoc: [DOC] Fix some errors.
-	  Renamed files, wrong method names or argument types; the example
-	  GetDBM macro is now updated to the current version of the actual
-	  code.  patch by Marcus Stollsteimer in [ruby-core:74690].
-	  [Bug #12228]
-
-Wed Mar 30 09:46:01 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/open-uri.rb: Use `userinfo` for authenticated proxy.
-	  [fix GH-1148] Patch by @SokichiFujita
-	* test/open-uri/test_open-uri.rb: ditto.
-	  [fix GH-1309] Patch by @jdamick
-
-Wed Mar 30 01:56:06 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8/nkf.c: Merge upstream 4f3edf80a0.
-	  patched by Anton Sivakov [Bug #12201] [Bug #12202]
-
-Wed Mar 30 01:54:30 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* tool/redmine-backporter.rb: add given revision to current changesets
-	  on associating the revision to the related ticket.
-
-Wed Mar 30 01:53:17 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* tool/merger.rb: update revision.h before merge.
-
-Tue Mar 29 19:33:54 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* addr2line.c: define toupper for its use. fix r54391.
-
-Tue Mar 29 19:23:46 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* include/ruby/ruby.h (rb_isupper, rb_islower, rb_isalpha, rb_isdigit,
-	  rb_isalnum, rb_isxdigit, rb_isblank, rb_isspace, rb_isblank,
-	  rb_iscntrl, rb_isprint, rb_ispunct, rb_isgraph,
-	  rb_tolower, rb_toupper): use inline function to avoid function call.
-
-	* include/ruby/ruby.h (rb_isascii): use inline function to clarify
-	  the logic.
-
-Tue Mar 29 18:56:55 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* tool/redmine-backporter.rb (backport): show merger.rb's path.
-
-	* tool/redmine-backporter.rb (show): show current issue again if no
-	  ticket number is given.
-
-	* tool/redmine-backporter.rb (rel): show error message if current
-	  bugs.ruby-lang.org doesn't support the API.
-
-Tue Mar 29 18:54:34 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* tool/merger.rb: support to backport header as backport identifier.
-	  Now you can specify by 'merge revision(s) 49254: [Backport #10738]'.
-
-Tue Mar 29 16:53:44 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode/case-folding.rb, casefold.h: Tweaked handling of 6
-	  special cases in CaseUnfold_11_Table.
-
-	* enc/unicode.c: Adjustments for above.
-
-	* test/ruby/enc/test_case_mapping.rb: Tests for the above: Some tests in
-	  test_titlecase activated; test_greek added. A test in test_cherokee fixed.
-
-Tue Mar 29 13:31:00 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode.c: Cleaned up some comments.
-
-Tue Mar 29 13:24:56 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode/case-folding.rb, casefold.h: Removing data for idempotent
-	  titlecasing.
-
-	* enc/unicode.c: Adjust code to data removal.
-
-Tue Mar 29 12:45:18 2016  Laurent Arnoud  <laurent@spkdev.net>
-
-	* lib/webrick/httpresponse.rb: Move error_body to method. It allow to
-	  override the body more easily. [fix GH-1307]
-	* test/webrick/test_httpresponse.rb: ditto.
-
-Tue Mar 29 06:40:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* error.c (rb_compile_err_append): rb_thread_t::base_block is no
-	  longer used.
-
-	* iseq.c (rb_iseq_compile_with_option): ditto, no protection is
-	  needed.
-
-Tue Mar 29 06:39:22 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (struct parser_params): move parse_in_eval flag from
-	  rb_thread_t.
-
-	* parse.y (rb_parser_set_context): set parsing context, not only
-	  mild error flag.
-
-	* iseq.c (rb_iseq_compile_with_option): the parser now refers no
-	  thread local states to be restored.
-
-	* vm_eval.c (eval_string_with_cref): ditto.
-
-Mon Mar 28 21:24:02 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* numeric.c (int_pos_p): fix typos.
-
-Mon Mar 28 14:54:49 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode.c: Refactoring in preparation for data reduction for
-	  titlecase.
-
-Mon Mar 28 14:36:36 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode.c: Minor refactoring for I WITH DOT ABOVE.
-
-Mon Mar 28 14:26:24 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode.c: Removed code now covered by data from table.
-
-Mon Mar 28 11:49:21 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode.c: Adding comments. [ci skip]
-
-Mon Mar 28 11:30:23 2016  Shinichi Maeshima  <netwillnet@gmail.com>
-
-	* lib/rubygems.rb: Fix `Gem.find_spec_for_exe` picks oldest gem.
-	  https://github.com/travis-ci/travis-ci/issues/5798
-	  https://github.com/rubygems/rubygems/pull/1566
-	* test/rubygems/test_gem.rb: ditto.
-
-Mon Mar 28 11:26:31 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update rubygems-2.6.2.
-	  Please see entries of 2.6.2 on
-	  https://github.com/rubygems/rubygems/blob/master/History.txt
-
-Mon Mar 28 11:02:31 2016  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
-
-	* lib/rubygems/test_case.rb: Fix test on Windows for inconsistent temp path.
-	  https://github.com/rubygems/rubygems/pull/1554
-	  [Bug #12193][ruby-core:74431]
-
-Mon Mar 28 08:19:49 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* sprintf.c (rb_str_format): refactor floating point format of
-	  Rational by using generic Integer functions.
-
-	* sprintf.c (rb_str_format): fix buffer overflow, length must be
-	  greater than precision.  reported by William Bowling <will AT
-	  wbowling.info>.
-
-Sun Mar 27 12:13:37 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* sprintf.c (rb_str_format): convert Rational to floating point
-	  format by using generic Integer functions, not by methods which
-	  can be overwritten.
-
-Sat Mar 26 10:55:12 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (rb_int2str): conversion function to String for
-	  generic Integer.
-
-	* numeric.c (rb_int_round): rounding function for generic
-	  Integers.
-
-	* numeric.c (rb_int_{uminus,plus,minus,mul,idiv,modulo}): basic
-	  arithmetic functions for generic Integers.
-
-	* numeric.c (FIXNUM_{POSITIVE,NEGATIVE,ZERO}_P): predict macros
-	  only for Fixnum.
-
-Sat Mar 26 06:34:24 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* localeinit.c (rb_locale_charmap_index): fix prototype.
-	  patched by Andreas Schwab [Bug #12218]
-
-Fri Mar 25 16:40:48 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_case_mapping.rb: Additional tests title case;
-	  some not yet activated.
-
-Fri Mar 25 13:38:11 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/extconf.rb: check SSL_CTX_set_next_proto_select_cb
-	  function rather than OPENSSL_NPN_NEGOTIATED macro. it exists
-	  even if it is disabled by OpenSSL configuration.
-	  [ruby-core:74384] [Bug #12182]
-
-	* ext/openssl/ossl_ssl.c: update #ifdef(s) as above.
-
-	* test/openssl/test_ssl.rb: skip NPN tests if NPN is disabled.
-
-Fri Mar 25 11:08:37 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/uri/http.rb (URI::HTTP#initialize): [DOC] fix example,
-	  missing mandatory arguments.  [ruby-core:74540] [Bug #12215]
-
-Fri Mar 25 01:50:58 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* thread_pthread.c (reserve_stack): fix reserving position where
-	  the stack growing bottom to top. [Bug #12118]
-
-Fri Mar 25 01:10:42 2016  Sebastian Schuberth  <sschuberth@gmail.com>
-
-	* lib/mkmf.rb (find_executable0): On Windows, it is actually valid
-	  to surround individual PATH directory entries with double
-	  quotes. Remove these before joining the path as otherwise the
-	  literal quotes would become part of the path, resulting in the
-	  executable not to be found.  [Fix GH-1305]
-
-Thu Mar 24 22:38:18 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* strftime.c (FMT, FMTV): remove recursive-assignments to get rid
-	  of undefined behavior.  [ruby-core:74532] [Bug #12213]
-
-Thu Mar 24 17:44:02 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* strftime.c (FMT_PADDING): extract format for padding.
-
-	* strftime.c (FMT_PRECISION): extract precision formula.
-
-	* strftime.c (FMTV): append formatted string to expand the result.
-
-Thu Mar 24 14:20:21 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* strftime.c (STRFTIME): deal with case conversion flags for
-	  recursive formats.
-
-Thu Mar 24 12:43:26 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/date/date_core.c (dt_lite_iso8601): strftimev() always
-	  returns a String, so append them directly.
-
-	* ext/date/date_core.c (d_lite_jisx0301, iso8601_timediv),
-	  (dt_lite_jisx0301): format by the format string in local buffer
-	  to prevent intermediate strings from GC.
-
-	* ext/date/date_core.c (mk_inspect_raw, mk_inspect): inspect by
-	  "%+"PRIsVALUE, to prevent intermediate strings from GC.
-
-Thu Mar 24 11:43:32 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* strftime.c (rb_strftime_with_timespec): remove unnecessary
-	  check, as `s` equals to `endp` when recursed STRFTIME resized
-	  the capacity same as the size.
-
-Wed Mar 23 21:48:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* enum.c (ary_inject_op): put subtract operation out of if-clause.
-
-Wed Mar 23 21:38:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* enum.c (ary_inject_op): Use Kahan's compensated summation algorithm
-	  for summing up float values.
-
-Wed Mar 23 20:56:59 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* strftime.c (rb_strftime_with_timespec): append formatted results
-	  to the given string with expanding, and also deal with NUL chars.
-
-	* strftime.c (rb_strftime, rb_strftime_timespec): return formatted
-	  string, not the length put in the given buffer.
-
-	* time.c (rb_strftime_alloc): no longer needs to retry with
-	  reallocating buffers.
-
-	* time.c (time_strftime): no longer needs to split by NUL chars.
-
-Wed Mar 23 14:23:54 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/rdoc/ri/driver.rb (interactive): rescue NotFoundError raised in
-	  expand_name. (display_name rescues NotFoundError by itself,
-	  the original logic looks buggy...)
-
-Wed Mar 23 11:44:53 2016  cremno  <cremno@mail.ru>
-
-	* marshal.c (r_long): cast to `signed char`, which is used
-	  already, instead of SIGN_EXTEND_CHAR.
-
-	* parse.y: SIGN_EXTEND_CHAR is no longer used.  [Fix GH-1302]
-
-Wed Mar 23 11:38:47 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* cygwin/GNUmakefile.in (MSYS2_ARG_CONV_EXCL_PARAM):
-	  * add missing parentheses and remove double quotes.
-	  * rename to get rid of recursive references.
-	  * as --excludes-dir option is for a path name, its argument
-	    should be converted.
-	  [ruby-dev:49526] [Bug #12199]
-
-Wed Mar 23 10:39:38 2016  Koichi ITO  <koic.ito@gmail.com>
-
-	* variable.c: Added documentation about order of `Module#constants`
-	  [ci skip][Bug #12121][ruby-dev:49505][fix GH-1301]
-
-Tue Mar 22 21:08:30 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* include/ruby/oniguruma.h: Additional flag for characters that are titlecase.
-
-	* enc/unicode/case-folding.rb, casefold.h: Using above flag in data.
-
-	* enc/unicode.c: Marking capitalized character as unmodified if it is
-	  already titlecase.
-
-	* test/ruby/enc/test_case_mapping.rb: Tests for above functionality.
-
-Tue Mar 22 14:18:59 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (lambda_body, parser_yylex): warn mismatched indentation
-	  of lambda block.
-
-Tue Mar 22 11:36:49 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* time.c (wmul): wrong condition.
-	  fixed many test failures on 32bit and LLP64 platforms.
-
-Tue Mar 22 10:31:34 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* time.c (wdiv, wmod): wdivmod0() assumes the 3rd and the 4th arguments
-	  are valid pointers.
-	  maybe checking them in wdivmod0() is better manner, but I guess that
-	  passing real dummy pointers may be faster than checking and branching
-	  in wdivmod0().
-	  this commit fixes SEGV on 32bit and LLP64 platforms.
-
-Tue Mar 22 10:24:04 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* time.c (divmodv): void function never returns any value.
-
-Tue Mar 22 10:11:01 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/lib/test/unit.rb (Test::Unit::StatusLine#failed): print
-	  failed messages only if replacing mode, otherwise defer them
-	  until the end, to get rid of interleaving failures with progress
-	  messages.  refix r54195.
-
-Tue Mar 22 03:45:03 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* time.c (MUL_OVERFLOW_FIXWV_P): defined for FIXWV.
-
-	* time.c (wmul): use MUL_OVERFLOW_FIXWV_P and only switch.
-
-	* time.c (wmul): use mul which has Fixnum optimization.
-
-	* time.c (rb_time_magnify): If WIDEVALUE_IS_WIDER, wmul() has the same
-	  optimized logic, else mul() has also the similar logic for Fixnum.
-
-	* time.c (rb_time_unmagnify): almost ditto.
-
-Tue Mar 22 03:10:09 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* time.c (divmodv): add the case both arguments are Fixnum.
-
-	* time.c (wquo): use quo which has Fixnum optimization.
-
-	* time.c (wdivmod0): added for WIDEVALUE_IS_WIDER.
-
-	* time.c (wdivmod): use wdivmod0 and divmodv.
-	  divmodv has Fixnum optimization.
-
-	* time.c (wdiv): use wdivmod0 and div to avoid the use of divmodv which
-	  calls id_quo whose return value is array.
-
-	* time.c (wmod): use wdivmod0 and mod to avoid the use of divmodv which
-	  calls id_quo whose return value is array.
-
-Mon Mar 21 22:32:50 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* internal.h (rb_fix_divmod_fix): like r54213, use FIX2NUM only if
-	  x == FIXNUM_MIN && y == -1. This must be a rare case and it is
-	  expected compiler to handle well.
-
-Mon Mar 21 22:15:11 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* time.c (mod): Add Fixnum case.
-
-	* time.c (quo): c can be Fixnum except a == FIXNUM_MIN && b == -1.
-	  Such case can be optimized out because quo()'s argument is constant.
-
-Mon Mar 21 22:09:24 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* internal.h (rb_fix_mul_fix): multiply converted values, not
-	  object VALUEs.
-
-Mon Mar 21 20:18:29 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (TEST_EXCLUDES, EXCLUDE_TESTFRAMEWORK): use full spell
-	  long option.
-
-	* cygwin/GNUmakefile.in (MSYS2_ARG_CONV_EXCL): suppress path name
-	  conversions by msys2.  [ruby-dev:49525] [Bug #12199]
-
-Mon Mar 21 19:09:31 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (enc_succ_alnum_char): try to skip an invalid character
-	  gap between GREEK CAPITAL RHO and SIGMA.
-	  [ruby-core:74478] [Bug #12204]
-
-Mon Mar 21 18:55:49 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* node.c (rb_gc_mark_node): NODE_MATCH2 can have nd_args, u3,
-	  since r54100.
-
-Sun Mar 20 21:17:13 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* internal.h (rb_int128t2big): declare only when HAVE_INT128_T.
-	  fixed a compile error with VC++ introduced at r54203.
-
-Sun Mar 20 20:10:14 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* internal.h (DLONG): defined if long is 32bit (and LONG_LONG is 64bit;
-	  but LONG_LONG is always defined as 64bit), or there's int128_t.
-
-	* internal.h (DL2NUM): defined if DLONG is defined.
-
-	* internal.h (rb_fix_mul_fix): defined for `Fixnum * Fixnum`.
-
-	* insns.def (opt_mul): use rb_fix_mul_fix().
-
-	* numeric.c (fix_mul): ditto.
-
-	* time.c (mul): ditto.
-
-Sun Mar 20 18:53:49 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (fix_gt, fix_ge, fix_lt, fix_le): optimize comparisons
-	  Fixnum against Bignum by rb_big_cmp in inversed order without
-	  new Bignum instance.
-
-Sun Mar 20 18:44:52 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* time.c (add): remove FIXABLE() which is in LONG2NUM().
-
-	* time.c (sub): ditto.
-
-	* time.c (mul): ditto.
-
-Sun Mar 20 04:46:02 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* bignum.c (rb_big_cmp): reduce the code.
-
-	* bignum.c (rb_big_eq): If normalized bignum is still bignum,
-	  it must be larger than fixnum.
-
-Sat Mar 20 00:58:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* include/ruby/intern.h (rb_big_odd_p, rb_big_even_p): move to
-	  internal.h so that they are exported only for ruby itself.
-
-	* internal.h (rb_big_odd_p, rb_big_even_p): ditto.
-
-Sat Mar 19 21:56:23 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/lib/test/unit.rb (Test::Unit::StatusLine#failed): defer
-	  failed messages until the end in verbose mode, to get rid of
-	  interleaving failures with progress messages.
-
-Sat Mar 19 21:53:35 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (fix_cmp): invert the result as the comparison is
-	  inverted.
-
-Sat Mar 19 18:32:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* numeric.c (int_to_f): raise NotImplementedError when a receiver
-	  class is unknown.
-
-	* test/-ext-/integer/test_my_integer.rb (test_my_integer_to_f): modify
-	  a test for the above change.
-
-Sat Mar 19 18:21:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* bignum.c (Bignum#<=>): remove it because they are unified with
-	  Integer#<=>.
-
-	* numeric.c (Integer#<=>, Fixnum#<=>): move <=> method from Fixnum to
-	  Integer.
-
-	* numeric.c (int_cmp): add this method for Integer#<=>.
-
-	* test/-ext-/integer/test_my_integer.rb (test_my_integer_cmp): add a
-	  test to examine Integer#<=> for unknown subclasses.
-
-Sat Mar 19 14:46:18 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* iseq.c (rb_iseq_compile_with_option): make the parser in mild
-	  error.
-
-	* load.c (rb_load_internal0): ditto.
-
-	* parse.y (yycompile0): return the error message within the error
-	  to be raised.  [Feature #11951]
-
-	* parse.y (parser_compile_error): accumulate error messages in the
-	  error_buffer.
-
-Sat Mar 19 03:57:13 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* time.c (LOCALTIME): organize #ifdefs.
-
-	* time.c (GMTIME): define only ifndef HAVE_STRUCT_TM_TM_GMTOFF.
-
-Sat Mar 19 03:53:31 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in (rb_cv_member_struct_tm_tm_gmtoff): For Linux (glibc)
-	  define _BSD_SOURCE for time.h to define struct tm.tm_gmtoff.
-
-	* time.c: define _BSD_SOURCE at the top.
-
-Sat Mar 19 03:00:50 2016  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* test/-ext-/time/test_new.rb (test_timespec_new): change a gmtoff
-	  test to a better one that does not depend on whether the current
-	  time is in summer time or not.
-
-Fri Mar 19 00:00:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* bignum.c (rb_big_to_f, Bignum#to_f): removed them because they are
-	  unified with int_to_f and Integer#to_f.
-
-	* numeric.c (int_to_f): treat Bignum values directly.
-
-Fri Mar 18 23:41:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* numeric.c (int_to_f, fix_to_f): rename fix_to_f to int_to_f, and add
-	  treatment for subclasses which don't have definitions of to_f method.
-
-	* numeric.c (Integer#to_f, Fixnum#to_f): move to_f method from Fixnum
-	  to Integer.
-
-	* ext/-test-/integer/my_integer.c: define helper class for testing
-	  to_f method for a subclass of Integer.
-
-	* ext/-test-/integer/extconf.rb: ditto.
-
-	* ext/-test-/integer/init.c: ditto.
-
-	* test/-ext-/integer/test_my_integer.rb: examine to_f method for a
-	  subclass of Integer.
-
-Fri Mar 18 22:32:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* include/ruby/intern.h (rb_big_hash): Move to internal.h.
-
-	* internal.h: ditto.
-
-Fri Mar 18 22:10:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* bignum.c (Bignum#eql?): remove its definition because it is unified
-	  with Numeric#eql?.
-
-	* numeric.c (num_eql): treat Bignum values directly.
-
-Fri Mar 18 21:57:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* bignum.c (rb_big_to_s, Bignum#to_s): remove its definition because
-	  it is unified with Integer#to_s.
-
-	* numeric.c (int_to_s): treat Bignum values directly.
-
-Fri Mar 18 21:30:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* numeric.c (int_to_s): Move from fix_to_s.
-
-	* numeric.c (Integer#to_s): Move from Fixnum#to_s.
-
-Fri Mar 18 16:22:24 2016  Victor Nawothnig  <Victor.Nawothnig@gmail.com>
-
-	* parse.y (parse_numvar): NTH_REF must be less than a half of
-	  INT_MAX, as it is left-shifted to be ORed with back-ref flag.
-	  [ruby-core:74444] [Bug#12192] [Fix GH-1296]
-
-Fri Mar 18 12:25:30 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (tick): fix missing close parenthesis.  [Fix GH-1291]
-
-Fri Mar 18 10:24:12 2016  Naotoshi Seo  <sonots@gmail.com>
-
-	* ext/date/date_core.c (datetime_to_time): preserve timezone info
-	  [Bug #12189] [Fix GH-1295]
-
-Fri Mar 18 10:17:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* bignum.c (rb_big_hash): make it public function to be available in
-	  other source files, and remove documentation comment for Bignum#hash.
-
-	* bignum.c (Bignum#hash): remove its definition because it is unified
-	  with Object#hash.
-
-	* include/ruby/intern.h (rb_big_hash): add a prototype declaration.
-
-	* hash.c (any_hash): treat Bignum values directly.
-
-Fri Mar 18 02:35:12 2016  Naotoshi Seo  <sonots@gmail.com>
-
-	* lib/time.rb (parse, strptime): Fix Time.parse/strptime does not
-	  have compatibility with DateTime.parse/strptime in terms of parsing
-	  timezone [Bug #12190] [Fix GH-1297]
-
-Fri Mar 18 02:17:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* numeric.c (fix_zero_p, fix_even_p, fix_odd_p): remove needless
-	  functions.
-
-Fri Mar 18 02:15:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* numeric.c (int_even_p): treat Fixnum and Bignum values directly.
-
-Fri Mar 18 02:07:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* bignum.c (Bignum#even?, Bignum#odd?): remove definitions
-	  because they are unified with Integer#even? and Integer#odd?.
-
-	* numeric.c (Fixnum#zero?, Fixnum#even?, Fixnum#odd?): remove
-	  definitions because they are unified with Numeric#zero?,
-	  Integer#even?, and Integer#odd?.
-
-	* numeric.c (num_zero_p, int_odd_p): treat Fixnum and
-	  Bignum values directly.
-
-	* test/ruby/test_integer.rb (test_odd_p_even_p): remove meaningless
-	  test case.
-
-Fri Mar 18 01:51:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* bignum.c (rb_big_even_p, rb_big_odd_p): make them public functions
-	  to be available in other source files.
-
-	* include/ruby/intern.h (rb_big_even_p, rb_big_odd_p): add prototype
-	  declarations.
-
-Fri Mar 18 00:25:56 2016  Tanaka Akira  <akr@fsij.org>
-
-	* enum.c (ary_inject_op): Implement the specialized code for sum of
-	  float numbers.
-
-Fri Mar 18 00:15:05 2016  Yusuke Endoh  <mame@ruby-lang.org>
-
-	* numeric.c (num_step): use rb_equal for zero check. rb_num_coerce_cmp
-	  created an object which caused extra overhead.
-
-Thu Mar 17 22:21:34 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (RB_GC_GUARD_PTR): remove intermediate
-	  macro, and expand for each RB_GC_GUARD.  [Fix GH-1293]
-
-Thu Mar 17 22:08:33 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (iseq_specialized_instruction): move specialization
-	  for opt_newarray_max/min from translation phase.
-
-Thu Mar 17 21:52:09 2016  Yusuke Endoh  <mame@ruby-lang.org>
-
-	* array.c, enum.c: make rdoc format consistent.
-
-Thu Mar 17 21:47:57 2016  Yusuke Endoh  <mame@ruby-lang.org>
-
-	* NEWS: add Array#max, #min, and the optimization.  [Feature #12172]
-
-Thu Mar 17 21:45:02 2016  Yusuke Endoh  <mame@ruby-lang.org>
-
-	* compile.c (NODE_CALL): add optimization shortcut for Array#max/min.
-	  Now `[x, y].max` is optimized so that a temporal array object is not
-	  created in some condition.  [Feature #12172]
-
-	* insns.def (opt_newarray_max, opt_newarray_min): added.
-
-Thu Mar 17 21:35:52 2016  Yusuke Endoh  <mame@ruby-lang.org>
-
-	* array.c (rb_ary_max, rb_ary_min): implement Array#max and min with
-	  arguments.  replace super call with rb_nmin_run.
-
-	* enum.c (nmin_run): exported (as rb_nmin_run).
-
-	* internal.h: added a prototype for rb_nmin_run.
-
-Thu Mar 17 21:24:52 2016  Yusuke Endoh  <mame@ruby-lang.org>
-
-	* array.c (rb_ary_max, rb_ary_min): implement a block by itself instead
-	  of delegating Enumerable#max/min.
-
-Thu Mar 17 21:09:34 2016  Yusuke Endoh  <mame@ruby-lang.org>
-
-	* array.c (rb_ary_max, rb_ary_min): Array#max and Array#min added.
-	  [Feature #12172]
-
-	* internal.h (OPTIMIZED_CMP): moved from enum.c so that array.c can
-	  use it.
-
-	* test/ruby/test_array.rb (test_max, test_min): tests for Array#max
-	  and Array#min.
-
-	* test/ruby/test_enum.rb (test_max, test_min): revised a bit to test
-	  Enumerable#max and #min explicitly.
-
-Thu Mar 17 21:02:42 2016  Yusuke Endoh  <mame@ruby-lang.org>
-
-	* internal.c: struct cmp_opt_data added for refactoring out a data
-	  structure for CMP_OPTIMIZABLE
-
-	* array.c (struct ary_sort_data): use struct cmp_opt_data.
-
-	* enum.c (struct min_t, max_t, min_max_t): use struct cmp_opt_data.
-
-Thu Mar 17 20:55:21 2016  Tanaka Akira  <akr@fsij.org>
-
-	* enum.c (ary_inject_op): Extracted from enum_inject.
-
-Thu Mar 17 18:39:04 2016  Tanaka Akira  <akr@fsij.org>
-
-	* enum.c (enum_inject): Implement the specialized code for sum of
-	  integers including Bignums.
-
-	* internal.h (rb_fix_plus): Declared to be usable from enum_inject.
-
-	* numeric.c (rb_fix_plus): Defined.
-
-Thu Mar 17 17:20:28 2016  Anton Davydov  <antondavydov.o@gmail.com>
-
-	* thread_sync.c: [DOC] Update documentation for Queue class
-	  description.  [Fix GH-1292]
-
-Thu Mar 17 17:14:51 2016  Dinar Valeev  <dvaleev@suse.com>
-
-	* gc.c (tick): Use __builtin_ppc_get_timebase for POWER arch.
-	  [Fix GH-1291]
-
-Thu Mar 17 11:51:48 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/securerandom.rb (gen_random): to avoid blocking on Windows.
-	  On Windows OpenSSL RAND_bytes (underlying implementation is
-	  RAND_poll in crypto/rand/rand_win.c) may be blocked at
-	  NetStatisticsGet.
-	  https://wiki.openssl.org/index.php/Random_Numbers#Windows_Issues
-	  Instead of this, use Random.raw_seed directly (whose implementation
-	  CryptGenRandom is one of the source of
-	  entropy of RAND_poll on Windows).
-	  https://wiki.openssl.org/index.php/Random_Numbers
-	  Note: CryptGenRandom function is PRNG and doesn't check its entropy,
-	  so it won't block. [Bug #12139]
-	  https://msdn.microsoft.com/ja-jp/library/windows/desktop/aa379942.aspx
-	  https://tools.ietf.org/html/rfc4086#section-7.1.3
-	  https://eprint.iacr.org/2007/419.pdf
-	  http://www.cs.huji.ac.il/~dolev/pubs/thesis/msc-thesis-leo.pdf
-
-Thu Mar 17 12:09:00 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode.c: Fixed two macro definitions.
-	* test/ruby/enc/test_case_mapping.rb: Test cases that detected
-	  the above bugs.
-
-Thu Mar 17 11:36:27 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/socket/option.c (inspect_tcpi_msec): more accurate condition
-	  for TCPI msec member inspection function.
-	  [ruby-core:74388] [Bug #12185]
-
-Thu Mar 17 08:13:43 2016  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* test/-ext-/time/test_new.rb (test_timespec_new): Time#gmtoff values
-	  are the same only when both or neither of the Time objects are in
-	  summer time (daylight-saving time).
-
-Thu Mar 17 07:17:36 2016  Eric Hodel  <drbrain@segment7.net>
-
-	* marshal.c (r_object0):  raise ArgumentError when linking to undefined
-	  object.
-
-Thu Mar 17 00:45:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* test/ruby/test_bignum.rb: Make sure to use Bignum values in the tests.
-
-Wed Mar 16 23:10:25 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* defs/keywords (alias, undef): symbol literals are allowed.
-
-	* parse.y (parse_percent): should parse symbol literals for alias
-	  and undef.  [ruby-dev:47681] [Bug #8851]
-
-Wed Mar 16 21:39:39 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enc/trans/JIS: update Unicode's notice. [Bug #11844]
-
-Wed Mar 16 20:03:35 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* proc.c (proc_binding): proc from symbol can not make a binding.
-	  [ruby-core:74100] [Bug #12137]
-
-Wed Mar 16 18:42:45 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_case_mapping.rb: Fixed and activated a test for Cherokee.
-
-Wed Mar 16 17:58:56 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_case_mapping.rb: Fixed a logical error.
-
-Wed Mar 16 17:57:34 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_case_mapping.rb: Adding tests for Cherokee.
-	  One test not yet working.
-	  (with Kimihito Matsui)
-
-Wed Mar 16 15:44:05 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_case_mapping.rb: Adding tests for actual Unicode
-	  case mapping. Fixing some aliasing issues.
-	  (with Kimihito Matsui)
-
-Tue Mar 15 21:38:28 2016  Tanaka Akira  <akr@fsij.org>
-
-	* enum.c (enum_inject): Consider redefinition of Fixnum#+.
-	  [ruby-dev:49510] [Bug#12178] Reported by usa.
-
-Tue Mar 15 20:32:57 2016  Tanaka Akira  <akr@fsij.org>
-
-	* enum.c (enum_inject): Implement the specialized code for :+ operator
-	  for Fixnums.
-
-Tue Mar 15 20:21:01 2016  Tanaka Akira  <akr@fsij.org>
-
-	* enum.c (enum_inject): Implement the specialized code for self is an
-	  array and a symbol operator is given.
-
-Tue Mar 15 16:29:51 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode.c: Eliminating common code.
-	  (with Kimihito Matsui)
-
-Tue Mar 15 16:17:09 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode.c: Expansion of some code repetition in preparation for
-	  elimination of common code pieces.
-	  (with Kimihito Matsui)
-
-Tue Mar 15 13:49:23 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode.c: Additional macros and code to use mapping data in
-	  CaseMappingSpecials array.
-	  (with Kimihito Matsui)
-
-Tue Mar 15 13:41:22 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* internal.h (rb_gc_mark_global_tbl): should be private,
-	  but was accidentally exported.
-
-Tue Mar 15 12:51:06 2016  Marcus Stollsteimer  <sto.mar@web.de>
-
-	* doc/extension.ja.rdoc: Fix RDoc markup in doc/extension*.rdoc.
-	  [ci skip][Bug #12143][ruby-core:74143]
-	* doc/extension.rdoc: ditto.
-
-Tue Mar 15 09:56:41 2016  Ian Lunderskov  <ian.lunderskov@gmail.com>
-
-	* time.c: Minor typo in Time#dst? documentation.
-	  [ci skip][fix GH-1290]
-
-Tue Mar 15 04:36:41 2016  Charles Oliver Nutter  <headius@headius.com>
-
-	* test/ruby/test_rubyoptions.rb (test_disable): add tests for
-	  --disable-gems and --disable-did_you_mean.
-
-Tue Mar 15 03:35:04 2016  Eric Hodel  <drbrain@segment7.net>
-
-	* marshal.c (r_object0): Fix Marshal crash for corrupt extended object.
-
-Tue Mar 15 01:22:27 2016  Charles Oliver Nutter  <headius@headius.com>
-
-	* test/ruby/test_rubyoptions.rb: make version matching support
-	  JRuby's version output.
-
-Mon Mar 14 19:05:39 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* bignum.c (big2str_2bdigits): reduce div instruction.
-
-Mon Mar 14 18:39:53 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* include/ruby/oniguruma.h, enc/unicode.c: Adjusting flag assignments
-	  and macros to work with unified CaseMappingSpecials array.
-	  (with Kimihito Matsui)
-
-Mon Mar 14 16:53:37 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (compile_named_capture_assign): optimize named capture
-	  assignments, by replacing repeating global variable accesses
-	  with `dup`, and by returning the matched result instead of
-	  re-getting it from the MatchData.
-
-	* parse.y (reg_named_capture_assign_gen): build just assignment
-	  nodes for the optimization.
-
-Mon Mar 14 16:02:59 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (ruby_is_fd_loadable): now return -1 if loadable but
-	  may block.
-
-	* ruby.c (open_load_file): wait to read by the result of
-	  ruby_is_fd_loadable, without fstat.
-
-Mon Mar 14 13:38:38 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* numeric.c (fix2str): improve r54092 like rb_int2big().
-
-Mon Mar 14 10:02:23 2016  Eric Wong  <e@80x24.org>
-
-	* ext/openssl/ossl_ssl.c (ossl_sslctx_setup): document as MT-unsafe
-	  [ruby-core:73803] [Bug #12069]
-
-Sun Mar 13 09:43:23 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/win32.h (O_SHARE_DELETE): change to fit Fixnum
-	  limit.  [ruby-core:74285] [Bug #12171]
-
-Sun Mar 13 09:15:45 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (rb_fix2str): fix edge case, accidentally generated
-	  wrong Fixnum from LONG_MIN.
-
-Sat Mar 12 09:50:27 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_eval.c (rb_f_catch): [DOC] fix malformed RDoc syntax, "+...+"
-	  cannot enclose non-identifier characters.
-	  a patch by Sebastian S in [ruby-core:74278].  [Bug#12170]
-
-Sat Mar 12 02:44:48 2016  Tanaka Akira  <akr@fsij.org>
-
-	* test/lib/test/unit.rb: describe !/REGEXP/ in the help message.
-
-Fri Mar 11 17:03:09 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/lib/test/unit.rb (Options#non_options): make regexp name
-	  options prefixed with "!" negative filters.
-
-	* common.mk (TEST_EXCLUDES): use negative filter to exclude memory
-	  leak tests.  -x option excludes test files, not test methods.
-
-Fri Mar 11 16:11:27 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode/case-folding.rb, casefold.h: Streamlining approach to
-	  case mapping data not available from case folding by unifying all
-	  three cases (special title, special upper, special lower).
-	* enc/unicode.c: Adjust macro names for above (macros are currently inactive).
-	  (with Kimihito Matsui)
-
-Thu Mar 10 17:34:16 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* iseq.c (prepare_iseq_build): enable coverage by coverage_enabled
-	  option, not by parse_in_eval flag in the thread context.
-
-	* iseq.h (rb_compile_option_struct): add coverage_enabled flag.
-
-	* parse.y (yycompile0): set coverage_enabled flag if coverage
-	  array is made.
-
-Thu Mar 10 15:19:54 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* node.c (dump_option): nd_compile_option is a hidden hash object,
-	  cannot call inspect on it.
-
-Thu Mar 10 09:49:54 2016  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* test/socket/test_socket.rb (test_udp_recvmsg_truncation):
-	  AIX does not set the MSG_TRUNC flag for a message partially read
-	  by recvmsg(2) with the MSG_PEEK flag set.
-
-Wed Mar  9 16:48:45 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/driver.rb: fix my last commit (syntax error).
-
-Wed Mar  9 16:41:44 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/driver.rb: fix output messages.
-
-	* benchmark/memory_wrapper.rb: use respond_to? because
-	  member? does not work well.
-
-Wed Mar  9 16:20:25 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/driver.rb: support memory usage benchmark.
-	  use `--measure-target=[target]'.
-	  Now, we can use the following targets:
-	    * real (default): real time which returns process time in sec.
-	    * peak: peak memory usage (physical memory) in bytes.
-	    * size: last memory usage (physical memory) in bytes.
-
-	* benchmark/memory_wrapper.rb: ditto.
-
-Wed Mar  9 15:04:22 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/bm_vm3_gc_old_full.rb: add GC.start benchmark.
-
-	* benchmark/bm_vm3_gc_old_immediate.rb: ditto.
-
-	* benchmark/bm_vm3_gc_old_lazy.rb: ditto.
-
-Wed Mar  9 14:59:11 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/driver.rb: exit benchmarking if a benchmark process
-	  receives signals.
-
-Wed Mar  9 13:22:49 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/lib/memory_status.rb: make Memory::Status independent of
-	  MiniTest::Skip.
-
-	* test/lib/test/unit/assertions.rb (assert_no_memory_leak): skip
-	  if Memory::Status is not available.
-
-Wed Mar  9 09:19:55 2016  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* test/io/wait/test_io_wait.rb (test_wait_readwrite_timeout):
-	  select(2) in AIX returns "readable" for the write-side fd
-	  of a pipe, so it is not possible to use a pipe to test
-	  the read-write timeout of IO#wait on AIX.
-
-Wed Mar  9 03:35:22 2016  Charles Oliver Nutter  <headius@headius.com>
-
-	* test/ruby/test_require.rb (test_require_with_loaded_features_pop):
-	  Only remove PATH so threads don't accidentally double-pop.
-
-Wed Mar  9 00:29:46 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_method.c (rb_alias): the original name should be properly
-	  available method_added method, set the name before calling the
-	  hook.
-
-Wed Mar  9 00:07:03 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/logger.rb (Logger::LogDevice#initialize): define using
-	  keyword arguments.
-
-Tue Mar  8 23:37:07 2016  Charles Oliver Nutter  <headius@headius.com>
-
-	* test/ruby/test_array.rb: split out the test for no stack error
-	  on large input for test_permutation, test_repeated_permutation,
-	  and test_repeated_combination, and make them all timeout:30.
-
-Tue Mar  8 17:20:21 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* intern.h (rb_divmod): assume compilers `/` and `%` comply C99
-	  and reduce branching. If a compiler doesn't comply, add #ifdefs.
-
-	* intern.h (rb_div): added for Ruby's behavior.
-
-	* intern.h (rb_mod): added for Ruby's behavior.
-
-	* insns.def (opt_div): use rb_div.
-
-	* insns.def (opt_mod): use rb_mod.
-
-	* numeric.c (fixdivmod): removed.
-
-	* numeric.c (fix_divide): use rb_div.
-
-	* numeric.c (fix_mod): use rb_mod.
-
-	* numeric.c (fix_divmod): use rb_divmod.
-
-Tue Mar  8 17:53:09 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* insns.def (opt_mod): show its method name on ZeroDivisionError.
-	  [Bug #12158]
-
-Tue Mar  8 17:33:38 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_write_console): now no need to check
-	  ERROR_CALL_NOT_IMPLEMENTED because it is for old Win9X.
-
-Tue Mar  8 16:54:29 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_write_console): stop the VT100 emulation if the
-	  console supports it natively.
-
-Tue Mar  8 08:13:01 2016  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* test/net/imap/test_imap.rb (test_idle_timeout): Because of the
-	  timeout specified in "imap.idle(0.2)", there is no guarantee that
-	  the server thread has done all the work before the client thread
-	  performs the assertions. It depends on the thread scheduling.
-	  Add checks to avoid false positives (on AIX, particularly).
-
-Tue Mar  8 00:42:22 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ruby.c (warn_cr_in_shebang): meaningless check on DOSISH platforms.
-	  fixed a test failure introduced at r53998.
-
-Tue Mar  8 00:27:53 2016  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
-
-	* ext/tk/lib/tkextlib/tcllib/tablelist_tile.rb: fix method name typo.
-	  [ruby-core:72513] [Bug #11893] The patch provided by Akira Matsuda.
-
-
-Tue Mar  8 00:25:08 2016  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
-
-	* ext/tk/lib/tkextlib/tcllib/toolbar.rb: fix method name typo.
-	  [ruby-core:72511] [Bug #11891] The patch provided by Akira Matsuda.
-
-
-Tue Mar  8 00:21:58 2016  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
-
-	* ext/tk/lib/tkextlib/blt/tree.rb: fix method name typo.
-	  [ruby-core:72510] [Bug #11890] The patch provided by Akira Matsuda.
-
-
-Tue Mar  8 00:11:47 2016  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
-
-	* ext/tk/lib/tk/menubar.rb: fix a typo in font name. [ruby-core:72505]
-	  [Bug #11886] The patch provided by Akira Matsuda.
-
-	* ext/tk/sample/*.rb: ditto.
-
-Mon Mar  7 13:32:58 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* class.c (rb_define_class, rb_define_class_id_under): raise
-	  ArgumentError if super is 0, deprecated behavior which has been
-	  warned long time.
-
-Mon Mar  7 13:28:30 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* internal.h: move function declarations for class internals from
-	  include/ruby/intern.h.
-
-Mon Mar  7 10:58:07 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/win32ole/win32ole_event.c (rescue_callback): use
-	  rb_write_error_str instead of rb_write_error, to respect
-	  the encoding and prevent the message from GC.
-
-	* internal.h (rb_write_error_str): export.
-
-Mon Mar  7 01:38:41 2016  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* test/ruby/test_process.rb (test_execopts_gid): Skip a test
-	  that is known to fail on AIX. AIX allows setgid to
-	  a supplementary group, but Ruby does not allow the "-e"
-	  option when setgid'ed, so the test does not work as intended.
-
-Sun Mar  6 22:43:41 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_obj_display): [DOC] fix output of Array, as Array#to_s
-	  is same as Array#inspect since 1.9.
-
-Sat Mar  5 09:50:58 2016  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* test/socket/test_addrinfo.rb (test_ipv6_address_predicates):
-	  IN6_IS_ADDR_V4COMPAT and IN6_IS_ADDR_V4MAPPED are broken
-	  on AIX, so skip related tests.
-
-Sat Mar  5 09:17:54 2016  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* test/rinda/test_rinda.rb (test_make_socket_ipv4_multicast):
-	  The fifth argument to getsockopt(2) should be modified to
-	  indicate the actual size of the value on return,
-	  but not in AIX. This is a know bug. Skip related tests.
-	* test/rinda/test_rinda.rb (test_ring_server_ipv4_multicast):
-	  ditto.
-	* test/rinda/test_rinda.rb (test_make_socket_unicast): ditto.
-	* test/socket/test_basicsocket.rb (test_getsockopt): ditto.
-	* test/socket/test_sockopt.rb (test_bool): ditto.
-
-Sat Mar  5 07:36:27 2016  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* test/-ext-/float/test_nextafter.rb: In AIX,
-	  nextafter(+0.0,-0.0)=+0.0, and nextafter(-0.0,+0.0)=-0.0,
-	  but they should return -0.0 and +0.0, respectively. This is
-	  a known bug in nextafter(3) on AIX, so skip related tests.
-
-Sat Mar  5 07:14:10 2016  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* test/zlib/test_zlib.rb (test_adler32_combine, test_crc32_combine):
-	  Skip two tests on AIX because zconf.h in zlib does not correctly
-	  recognize _LARGE_FILES in AIX. The problem was already reported
-	  to zlib, and skip these tests until it is fixed.
-
-Sat Mar  5 03:07:40 2016  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* thread_pthread.c (getstack): __pi_stacksize returned by
-	  pthread_getthrds_np() is wrong on AIX. Use
-	  __pi_stackend - __pi_stackaddr instead.
-
-Fri Mar  4 19:19:42 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: use 2 bits with unsigned int for rb_objspace::flags::mode
-	  because it always returns 0 to 2 (non-negative value).
-
-Fri Mar  4 18:42:08 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: rename "enum gc_stat" to "enum gc_mode"
-	  because there is a same name (no related) function gc_stat().
-
-	  Also gc_stat_* are renamed to gc_mode_*,
-	  gc_stat_transition() to gc_mode_transition(),
-	  rb_objspace::flags::stat is renamed to rb_objspace::flags::mode.
-
-	  Change rb_objspace::flags::mode from 2 bits to 3 bits because VC++
-	  returns negative enum value with 2 bits.
-
-	* gc.c (gc_mode): add a macro to access rb_objspace::flags::mode
-	  with verification code (verification is enabled only on
-	  RGENGC_CHECK_MODE > 0).
-
-	* gc.c (gc_mode_set): same macro for setter.
-
-Fri Mar  4 09:28:18 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update rubygems-2.6.1.
-	  Please see entries of 2.6.0 and 2.6.1 on
-	  https://github.com/rubygems/rubygems/blob/master/History.txt
-	  [fix GH-1270] Patch by @segiddins
-
-Thu Mar  3 14:09:00 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/ostruct.rb (modifiable?, new_ostruct_member!, table!):
-	  rename methods for internal use with suffixes and make private,
-	  [ruby-core:71069] [Bug #11587]
-
-Wed Mar  2 16:28:48 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_eval.c (method_missing): call by found method entry and get
-	  rid of searching the same method entry twice.
-
-	* vm_eval.c (vm_call0_body): calling method_missing method is
-	  method_missing().
-
-Wed Mar  2 15:13:33 2016  herwinw  <herwin@quarantainenet.nl>
-
-	* lib/xmlrpc.rb: Removed broken parser named XMLScanStreamParser.
-	  It's not works with current Ruby version.
-	  [fix GH-1271][ruby-core:59588][Bug #9369]
-	* lib/xmlrpc/config.rb: ditto.
-	* lib/xmlrpc/parser.rb: ditto.
-
-Wed Mar  2 15:08:33 2016  herwinw  <herwin@quarantainenet.nl>
-
-	* lib/xmlrpc.rb: Removed broken parser named XMLTreeParser.
-	  Required gem of its parser didn't compile on newer Ruby versions.
-	  [fix GH-1271][ruby-core:59590][Bug #9370]
-	* lib/xmlrpc/config.rb: ditto.
-	* lib/xmlrpc/parser.rb: ditto.
-
-Tue Mar  1 11:25:48 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/fileutils.rb: use keyword arguments instead of option
-	  hashes.
-
-Mon Feb 29 16:50:20 2016  hanachin  <hanachin@gmail.com>
-
-	* array.c (rb_ary_push_m): [DOC] Remove trailing comma from
-	  Array#push example, as other Array examples doesn't put trailing
-	  comma.  [Fix GH-1279]
-
-Mon Feb 29 16:31:01 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk, tool/mkconfig.rb: set cross_compiling option from
-	  Makefile, but not from rbconfig.rb, which is just going to be
-	  created by this command.
-
-Sun Feb 28 23:13:49 2016  C.J. Collier  <cjcollier@linuxfoundation.org>
-
-	* configure.in: Add summary to end of configure output.
-	  [Fix GH-1275]
-
-Sun Feb 28 20:23:36 2016  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/drb.rb (error_print): Add verbose failure messages and
-	  avoid infamous DRb::DRbConnError. [Feature #12101]
-
-Sun Feb 28 13:40:46 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* error.c (nometh_err_initialize): add private_call? parameter.
-
-	* error.c (nometh_err_private_call_p): add private_call? method,
-	  to tell if the exception raised in private form FCALL or VCALL.
-	  [Feature #12043]
-
-	* vm_eval.c (make_no_method_exception): append private_call?
-	  argument.
-
-	* vm_insnhelper.c (ci_missing_reason): copy FCALL flag.
-
-Sun Feb 28 10:19:47 2016  Ryan T. Hosford  <tad.hosford@gmail.com>
-
-	* array.c (rb_ary_and): clarify that set intersection returns the
-	  unique elements common to both arrays.
-
-	* array.c (rb_ary_or): clarify that union preserves the order from
-	  the given arrays.
-
-Sat Feb 27 17:05:29 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode/case-folding.rb, casefold.h: Reducing size of TitleCase
-	  table by eliminating duplicates.
-	  (with Kimihito Matsui)
-
-Fri Feb 26 14:40:48 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (num_step_scan_args): comparison String with Numeric
-	  should raise TypeError. it is an invalid type, but not a
-	  mismatch the number of arguments.  [ruby-core:62430] [Bug #9810]
-
-Fri Feb 26 14:39:39 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* doc/extension.rdoc, doc/extension.ja.rdoc: add editor local
-	  variables, with commenting out by :enddoc: directives which are
-	  just ignored unless code object mode.  [Bug #12111]
-
-Fri Feb 26 12:25:56 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* doc/extension.ja.rdoc: removed rendering error caused by editor specific
-	  configuration on http://docs.ruby-lang.org/en/trunk/extension_rdoc.html .
-	  [Bug #12111][ruby-core:73990]
-
-Fri Feb 26 11:21:41 2016  herwinw  <herwin@quarantainenet.nl>
-
-	* lib/xmlrpc.rb: Removed references to NQXML. It's obsoleted parser.
-	  [fix GH-1245][ruby-core:59593][Feature #9371]
-	* lib/xmlrpc/config.rb: ditto.
-	* lib/xmlrpc/parser.rb: ditto.
-
-Fri Feb 26 11:10:19 2016  Rick Salevsky  <rsalevsky@suse.com>
-
-	* lib/tmpdir.rb: Unify to coding-style for method definition.
-	  [fix GH-1252]
-
-Fri Feb 26 11:02:04 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* README.md: update markdown syntax for anchor tag.
-	  [fix GH-1265] Patch by @lukBarros
-
-Fri Feb 26 10:52:29 2016  Alex Boyd  <alex@opengroove.org>
-
-	* lib/irb.rb: avoid to needless truncation when using back_trace_limit option.
-	  [fix GH-1205][ruby-core:72773][Bug #11969]
-
-Fri Feb 26 08:11:58 2016  Aaron Patterson <tenderlove@ruby-lang.org>
-
-	* gem_prelude.rb: Reduce system calls by activating the `did_you_mean`
-	  gem before requiring the gem.  Activating the gem puts the gem on
-	  the load path, where simply requiring the file will search every gem
-	  that's installed until it can find a gem that contains the
-	  `did_you_mean` file.
-
-Thu Feb 25 19:04:13 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode/case-folding.rb: Adding possibility for debugging output
-	  for TitleCase table in casefold.h.
-	  (with Kimihito Matsui)
-
-Wed Feb 24 22:31:13 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* include/ruby/oniguruma.h: Rearranging flag assignments and making
-	  space for titlecase indices; adding additional macros to add or
-	  extract titlecase index; adding comments for better documentation.
-	* enc/unicode.c: Moving some macros to include/ruby/oniguruma.h;
-	  activating use of titlecase indices.
-	  (with Kimihito Matsui)
-
-Wed Feb 24 21:03:04 2016  Tanaka Akira  <akr@fsij.org>
-
-	* random.c (limited_rand): Add a specialized path for when the limit fits
-	  in 32 bit.
-
-Tue Feb 23 21:52:24 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode/case-folding.rb, casefold.h: Outputting actual titlecase
-	  data (new table, with indices from other tables).
-	* enc/unicode.c: Ignoring titlecase data indices for the moment.
-	  (with Kimihito Matsui)
-
-Tue Feb 23 15:21:14 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode/case-folding.rb, casefold.h: Reading casing data from
-	  SpecialCasing.txt.
-	  (with Kimihito Matsui)
-
-Mon Feb 22 18:33:55 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode/case-folding.rb, casefold.h: Adding flag for title-case,
-	  not yet operational.
-	  (with Kimihito Matsui)
-
-Mon Feb 22 18:17:03 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode/case-folding.rb, casefold.h: Fixed bug that avoided inclusion
-	  of compatibility characters in upper-/lower-case mappings.
-	  (with Kimihito Matsui)
-
-Sun Feb 21 13:57:18 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* cgi/escape/escape.c: Optimize CGI.unescape performance by C ext
-	  for ASCII-compatible encodings.  [Fix GH-1250]
-
-Sun Feb 21 13:56:57 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* cgi/escape/escape.c: Optimize CGI.unescapeHTML performance by C
-	  ext for ASCII-compatible encodings.  [Fix GH-1242]
-
-Sat Feb 20 15:38:16 2016  Eric Wong  <e@80x24.org>
-
-	* doc/extension.rdoc: update paths for defs/ directory
-
-Sat Feb 20 14:44:15 2016  Lucas Buchala  <lucasbuchala@gmail.com>
-
-	* vm_eval.c (rb_mod_module_eval): [DOC] Fix documentation
-	  signature for Module#module_eval.  [Fix GH-1258]
-
-Sat Feb 20 14:40:44 2016  Adam O'Connor  <northband@gmail.com>
-
-	* README.md: a few grammatical changes to the main Ruby README.md.
-	  [Fix GH-1259]
-
-Sat Feb 20 13:04:22 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (push_pattern, push_glob): deal with read paths as UTF-8
-	  to stat later, on Windows as well as OS X.
-	  [ruby-core:73868] [Bug #12081]
-
-Sat Feb 20 01:53:33 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* object.c (rb_mod_const_get): make error message at uninterned
-	  string consistent with symbols.  [ruby-dev:49498] [Bug #12089]
-
-Fri Feb 19 23:37:52 2016  Masahiro Tomita  <tommy@tmtm.org>
-
-	* lib/find.rb (Find#find): raise with the given path name if it
-	  does not exist.  [ruby-dev:49497] [Bug #12087]
-
-Fri Feb 19 12:44:57 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode.c: Activated use of case mapping data in CaseUnfold_11 array.
-	  (with Kimihito Matsui)
-
-Fri Feb 19 11:08:32 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb: add cygwin case, nothing excluded.
-	  [ruby-core:73806] [Bug#12071]
-
-Thu Feb 18 21:32:15 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* man/irb.1: fix output in EXAMPLES.
-
-Thu Feb 18 21:05:47 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (sym_match_m): delegate to String#match but not
-	  String#=~.  [ruby-core:72864] [Bug #11991]
-
-Thu Feb 18 14:15:38 2016  Shota Fukumori  <her@sorah.jp>
-
-	* re.c: Add MatchData#named_captures
-	  [Feature #11999] [ruby-core:72897]
-
-	* test/ruby/test_regexp.rb(test_match_data_named_captures): Test for above.
-
-	* NEWS: News about MatchData#named_captures.
-
-Wed Feb 17 21:41:29 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* defs/id.def (predefined): add idLASTLINE and idBACKREF for $_
-	  and $~ respectively.
-
-	* parse.y: use idLASTLINE and idBACKREF instead of rb_intern.
-
-Wed Feb 17 20:23:38 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_init): fix segfault and memory leak, consider
-	  wide char encoding terminator.
-
-Wed Feb 17 12:14:59 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (rb_str_init): introduce String.new(capacity: size)
-	  [Feature #12024]
-
-Tue Feb 16 19:10:08 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode/case-folding.rb, casefold.h: Used only first element
-	  (rather than all) of target in CaseUnfold_11 array.
-	  (with Kimihito Matsui)
-
-Tue Feb 16 18:24:38 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (compare_with_zero): fix variable name, rb_cmperr
-	  requires VALUEs but not an ID.
-
-Tue Feb 16 17:34:18 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (rb_dir_s_empty_p): add Dir.empty? method, which tells the
-	  argument is the name of an empty directory.  [Feature #10121]
-
-Tue Feb 16 09:51:20 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/rbinstall.rb (without_destdir): just strip a drive letter
-	  which is prepended by with_destdir.
-	  pointed out by @DavidEGrayson.
-	  https://github.com/ruby/ruby/commit/0e5f9ae#commitcomment-16101763
-
-Tue Feb 16 04:42:13 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* insns.def (opt_plus): simply use LONG2NUM() instead of wrongly
-	  complex overflow case.
-
-	* insns.def (opt_sub): ditto.
-
-Tue Feb 16 02:49:41 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/rbinstall.rb (without_destdir): compare with the destdir
-	  after stripping a drive letter, on dosish platforms.
-	  pointed out by @DavidEGrayson.
-	  https://github.com/ruby/ruby/commit/d0cf23b#commitcomment-16100407
-
-Mon Feb 15 15:44:09 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parse_ident): allow keyword arguments just after a
-	  method where the same name local variable is defined.
-	  [ruby-core:73816] [Bug#12073]
-
-Mon Feb 15 14:43:28 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode/case-folding.rb: Added debugging option
-	  (with Kimihito Matsui)
-
-Sun Feb 14 17:31:50 2016  Lars Kanis  <lars@greiz-reinsdorf.de>
-
-	* lib/mkmf.rb (with_{cpp,c,ld}flags): copy caller strings not to
-	  be modified, in append_{cpp,c,ld}flags respectively.
-	  [Fix GH-1246]
-
-Sun Feb 14 16:18:57 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (setup_exception): set the cause only if it is explicitly
-	  given or not set yet.  [Bug #12068]
-
-Sat Feb 13 21:44:58 2016  Tanaka Akira  <akr@fsij.org>
-
-	* hash.c (rb_hash_invert): [DOC] more examples.
-
-Sat Feb 13 17:30:49 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/uri/generic.rb (URI::Generic#find_proxy): support CIDR in
-	  no_proxy.  [ruby-core:73769] [Feature#12062]
-
-Sat Feb 13 17:11:58 2016  Fabian Wiesel  <fabian.wiesel@sap.com>
-
-	* lib/uri/generic.rb (find_proxy): exclude white-spaces and allow
-	  for a leading dot in the domain name in no_proxy.
-	  [ruby-core:54542] [Feature #8317]
-
-Fri Feb 12 12:20:56 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* error.c (name_err_initialize, nometh_err_initialize): [DOC] fix
-	  argument positions.  optional parameters except for the message
-	  are placed at the last.
-
-Fri Feb 12 11:49:49 2016  Anthony Dmitriyev  <antstorm@gmail.com>
-
-	* net/ftp.rb: add NullSocket#closed? to fix closing not opened
-	  connection.  [Fix GH-1232]
-
-Fri Feb 12 11:17:38 2016  Bogdan  <bogdanvlviv@gmail.com>
-
-	* re.c (rb_reg_initialize_m): [DOC] fix missing right bracket.
-	  [Fix GH-1243]
-
-Thu Feb 11 14:57:58 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (RUBY_CHECK_SIZEOF, RUBY_DEFINT): fix for types
-	  which are conditionally available depending on architectures
-	  when universal binary, e.g., __int128.
-
-Thu Feb 11 06:26:18 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in (RUBY_DEFINT): use Parameter Expansion.
-
-Thu Feb 11 05:33:24 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in (int128_t): don't check HAVE_XXX (for example
-	  HAVE___INT128) because RUBY_CHECK_SIZEOF() don't define it for
-	  config.h and use of $ac_cv_sizeof___int128 alternates the check.
-	  (and don't need to define because users shouldn't know that)
-
-Wed Feb 10 12:03:41 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (ARFLAGS): check if deterministic mode flag is
-	  effective, which is on by default on Ubuntu.
-
-Tue Feb  9 16:36:23 2016  Naotoshi Seo  <sonots@gmail.com>
-
-	* lib/logger.rb: Remove block from Logger.add as it's not needed
-	  patch provided by Daniel Lobato Garcia [fix GH-1240] [Bug #12054]
-
-Tue Feb  9 14:32:23 2016  Zachary Scott  <zzak@ruby-lang.org>
-
-	* ext/zlib/zlib.c: Document mtime header behavior with patch by @schneems
-	  Fixes [GH-1129]: https://github.com/ruby/ruby/pull/1129
-
-Tue Feb  9 13:52:49 2016  Zachary Scott  <zzak@ruby-lang.org>
-
-	* re.c: Remove deprecated kcode argument from Regexp.new and compile
-	  patch provided by Dylan Pulliam [Bug #11495]
-
-Mon Feb  8 21:26:19 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode/case-folding.rb, enc/unicode/casefold.h: Flags for
-	  upper/lower conversion added (titlecase and SpecialCasing still missing)
-	  (with Kimihito Matsui)
-
-Mon Feb  8 20:43:57 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* string.c, enc/unicode.c: Disassociating ONIGENC_CASE_FOLD flag from
-	  ONIGENC_CASE_DOWNCASE.
-	  (with Kimihito Matsui)
-
-Mon Feb  8 13:00:17 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode.c: Shortened macros for enc/unicode/casefold.h to
-	  single-letter; use flags in casefold.h for logic.
-
-	* enc/unicode/case-folding.rb: Added flag for case folding.
-	  Changed parameter passing.
-
-	* enc/unicode/casefold.h: New flags added.
-	  (with Kimihito Matsui)
-
-Mon Feb  8 10:30:10 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (feature_option): raise a runtime error if ambiguous
-	  feature name is given, in the future.  [Bug #12050]
-
-Mon Feb  8 09:43:57 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* common.mk: Removed enc/unicode/casefold.h from automatic build because
-	  some CI systems don't have gperf. Creation of enc/unicode/casefold.h
-	  is now possible with make unicode-up. This is intended as a temporary measure.
-
-Sun Feb  7 22:10:08 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* common.mk: Added two more precondition files for enc/unicode/casefold.h
-
-	* enc/unicode.c: Added shortening macros for enc/unicode/casefold.h
-
-	* enc/unicode/case-folding.rb: Fixed file encoding for CaseFolding.txt
-	  to ASCII-8BIT (should fix some ci errors). Clarified usage. Created
-	  class MapItem. Partially implemented class CaseMapping.
-	  (with Kimihito Matsui)
-
-Sun Feb  7 14:12:32 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode/case-folding.rb: Fixing parameter passing.
-	  (with Kimihito Matsui)
-
-Sun Feb  7 11:44:03 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode/case-folding.rb: New classes CaseMapping/CaseMappingDummy
-	  to pass as parameters; not yet implemented or used.
-	  (with Kimihito Matsui)
-
-Sun Feb  7 11:16:00 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* common.mk: using new option in recipe for enc/unicode/casefold.h
-
-	* enc/unicode/case-folding.rb: Correctly specify argument to new option.
-	  (with Kimihito Matsui)
-
-Sun Feb  7 10:43:27 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	(this commit message applies to the previous commit)
-	* common.mk: explicit recipe for enc/unicode/casefold.h
-
-	* enc/unicode/case-folding.rb: Adding -m option to prepare for using
-	  multiple data files.
-	  (with Kimihito Matsui)
-
-Sat Feb  6 22:30:57 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/cgi/util.rb (escapeHTML, unescapeHTML): consider
-	  ASCII-incompatible encodings.  [Fix GH-1239]
-
-Sat Feb  6 15:18:28 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_regex_casefold.rb: Added data-based testing for
-	  String#downcase :fold.
-
-	* enc/unicode.c: Fixed a range error (lowest non-ASCII character affected
-	  by case operations is U+00B5, MICRO SIGN)
-
-	* test/ruby/enc/test_case_mapping.rb: Explicit test for case folding of
-	  MICRO SIGN to Greek mu.
-	  (with Kimihito Matsui)
-
-Sat Feb  6 14:51:23 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_regex_casefold.rb: Tests for three case folding
-	  primitives (mbc_case_fold, get_case_fold_codes_by_str,
-	  apply_all_case_fold) in the various encodings. Currently only known
-	  good encodings are tested to avoid test failures. For bug hunting,
-	  start by adding more encodings with
-	  generate_test_casefold encoding
-	  (with Kimihito Matsui)
-
-Sat Feb  6 14:37:16 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode.c, test/ruby/enc/test_case_mapping.rb: Implemented :fold
-	  option for String#downcase by using case folding data from
-	  regular expression engine, and added a few simple tests.
-	  (with Kimihito Matsui)
-
-Fri Feb  5 20:08:59 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_case_mapping.rb: added tests for :ascii option.
-	  (with Kimihito Matsui)
-
-Fri Feb  5 12:22:20 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* insns.def (opt_mult): Use int128_t for overflow detection.
-
-	* bignum.c (rb_uint128t2big): added for opt_mult.
-
-	* bignum.c (rb_uint128t2big): added for rb_uint128t2big..
-
-	* configure.in: define int128_t, uint128_t and related MACROs.
-	  Initially introduced by r41379 but reverted by r50749.
-
-Thu Feb  4 21:05:17 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode.c: Activated :ascii flag for ASCII-only case conversion
-	  (with Kimihito Matsui)
-
-Thu Feb  4 17:38:01 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* re.c (reg_set_source): make source string frozen without
-	  copying.
-
-	* re.c (rb_reg_initialize_m): refactor initialization with
-	  encoding.
-
-Thu Feb  4 15:35:29 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_fstring_enc_new, rb_fstring_enc_cstr): functions to
-	  make fstring with encoding.
-
-Thu Feb  4 14:42:29 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* common.mk: Added Unicode data file SpecialCasing.txt to be additionally
-	  downloaded (with Kimihito Matsui)
-
-Thu Feb  4 12:39:08 2016  joker1007  <kakyoin.hierophant@gmail.com>
-
-	* cgi/escape/escape.c: Optimize CGI.escape performance by C ext
-	  for ASCII-compatible encodings.  [Fix GH-1238]
-
-Thu Feb  4 11:53:56 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* common.mk: Introduce two variables (UNICODE_DATA_DIR and
-	  UNICODE_SRC_DATA_DIR) to eliminate repetitions.
-
-Wed Feb  3 12:13:20 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (str_new_frozen): if the given string is embeddedable
-	  but not embedded, embed a new copied string. [Bug #11946]
-
-Wed Feb  3 08:25:38 2016  boshan  <boshan@subsplash.com>
-
-	* ext/openssl/ossl_pkey.c (Init_ossl_pkey): [DOC] Fix typo
-	  "encrypted" to "decrypted".  [Fix GH-1235]
-
-Wed Feb  3 08:21:32 2016  Seiei Miyagi  <hanachin@gmail.com>
-
-	* ext/ripper/lib/ripper/lexer.rb (on_heredoc_dedent): Fix
-	  Ripper.lex error in dedenting squiggly heredoc.  heredoc tree is
-	  also an array of Elem in the outer tree.  [Fix GH-1234]
-
-Wed Feb  3 02:33:39 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* re.c (rb_reg_prepare_enc): use already compiled US-ASCII regexp
-	  if given string is ASCII only.
-	  121.2s to 113.9s on my x86_64-freebsd10.2 Intel Core i5 661
-
-Tue Feb  2 13:02:03 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* re.c: Introduce RREGEXP_PTR.
-	  patch by dbussink.
-	  partially merge https://github.com/ruby/ruby/pull/497
-
-	* include/ruby/ruby.h: ditto.
-
-	* gc.c: ditto.
-
-	* ext/strscan/strscan.c: ditto.
-
-	* parse.y: ditto.
-
-	* string.c: ditto.
-
-Tue Feb  2 09:08:27 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/rubygems/specification.rb: `coding` is effective only first
-	  line except shebang.
-
-	* lib/rubygems/package.rb, lib/rubygems/package/*: ditto.
-
-Mon Feb  1 21:41:58 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update rubygems-2.5.2.
-	  It supports to enable frozen string literal and add `--norc` option for
-	  disable to `.gemrc` configuration.
-	  See 2.5.2 release notes for other fixes and enhancements.
-	  https://github.com/rubygems/rubygems/blob/a8aa3bac723f045c52471c7b9328310a048561e0/History.txt#L3
-
-Sun Jan 31 12:33:13 2016  Dan Kreiger  <dan@dankreiger.com>
-
-	* test/drb/ut_large.rb (multiply, avg, median): add additional
-	  math operations to DRbLarge.  [Fix GH-1086]
-
-Sun Jan 31 12:19:15 2016  Kuniaki IGARASHI  <igaiga@gmail.com>
-
-	* test/ruby/test_file_exhaustive.rb (test_lstat): Add lacking test
-	  for File#lstat.  [Fix GH-1231]
-
-Sun Jan 31 12:15:33 2016  Prayag Verma  <prayag.verma@gmail.com>
-
-	* doc/standard_library.rdoc: fix typo  [Fix GH-1230]
-	  Spelling mistakes -
-	  outputing > outputting
-	  publich > publish
-
-Sat Jan 30 15:18:07 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_eval.c (rb_check_funcall_with_hook): also should call the
-	  given hook before returning Qundef when overridden respond_to?
-	  method returned false.  [ruby-core:73556] [Bug #12030]
-
-Fri Jan 29 17:40:07 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/file.c (rb_readlink): drop garbage after the substitute
-	  name, as rb_w32_read_reparse_point returns the expected buffer
-	  size but "\??\" prefix is dropped from the result.
-
-	* win32/win32.c (w32_readlink): ditto, including NUL-terminator.
-
-Fri Jan 29 17:07:27 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (fileattr_to_unixmode, rb_w32_reparse_symlink_p): volume
-	  mount point should be treated as directory, not symlink.
-	  [ruby-core:72483] [Bug #11874]
-
-	* win32/win32.c (rb_w32_read_reparse_point): check the reparse point is
-	  a volume mount point or not.
-
-	* win32/file.c (rb_readlink): follow above change (but this pass won't
-	  be used).
-
-Fri Jan 29 16:17:07 2016  Lucas Buchala  <lucasbuchala@gmail.com>
-
-	* enum.c (enum_take_while, enum_drop_while): rename block
-	  parameter to obj, since they are generic objects.  [Fix GH-1226]
-
-Fri Jan 29 14:15:26 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/erb.rb (ERB::Compiler#detect_magic_comment): allow
-	  frozen-string-literal in comment as well as encoding.
-
-	* lib/erb.rb (ERB#def_method): insert def line just before the
-	  first non-comment and non-empty line, not to leave duplicated
-	  and stale magic comments.
-
-Fri Jan 29 11:13:33 2016  Jeremy Evans  <code@jeremyevans.net>
-
-	* lib/erb.rb (ERB#set_eoutvar): explicitly make mutable string as
-	  a buffer to make ERB work with --enable-frozen-string-literal.
-	  [ruby-core:73561] [Bug #12031]
-
-Fri Jan 29 10:44:56 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/net/http/header.rb: Warn nil variable on HTTP Header.
-	  It caused to NoMethodError. [fix GH-952][fix GH-641] Patch by @teosz
-	* test/net/http/test_httpheader.rb: Added test for nil HTTP Header.
-
-Thu Jan 28 17:31:43 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/socket/socket.c (sock_gethostname): support unlimited size
-	  hostname.
-
-Wed Jan 27 21:03:45 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* test/-ext-/string/test_capacity.rb: Added missing library.
-
-Wed Jan 27 18:53:40 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode.c: Fixed bit mask in macro OnigCodePointCount
-
-Wed Jan 27 17:54:42 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode.c: Protect code point count by macro, in order to
-	  be able to use the remaining bits for flags.
-	  (with Kimihito Matsui)
-
-Wed Jan 27 16:34:35 2016  boshan  <boshan@subsplash.com>
-
-	* lib/tempfile.rb (Tempfile#initialize): [DOC] the first parameter
-	  `basename` is optional and defaulted to an empty string since
-	  [GH-523].  [Fix GH-1225]
-
-Wed Jan 27 16:25:54 2016  Koichi ITO  <koic.ito@gmail.com>
-
-	* array.c (rb_ary_dig): [DOC] fix the exception class to be raised
-	  when intermediate object does not have dig method.  TypeError
-	  will be raised now.  [Fix GH-1224]
-
-Tue Jan 26 19:36:15 2016  Aggelos Avgerinos  <evaggelos.avgerinos@gmail.com>
-
-	* array.c (permute0, rpermute0): [DOC] Substitute indexes ->
-	  indices in documentation for consistency.  [Fix GH-1222]
-
-Tue Jan 26 15:21:37 2016  Eric Wong  <e@80x24.org>
-
-	* compile.c (caller_location): use rb_fstring_cstr for "<compiled>"
-	  (it is converted to fstring anyways inside rb_iseq_new_with_opt)
-	* iseq.c (iseqw_s_compile): ditto
-	* iseq.c (rb_iseq_new_main): use rb_fstring_cstr for "<main>"
-	* vm.c (Init_VM): ditto, share with with above
-	* iseq.c (iseqw_s_compile_file): rb_fstring before rb_io_t->pathv
-	  share "<main>" with above
-	* vm.c (rb_binding_add_dynavars): fstring "<temp>" immediately
-
-Tue Jan 26 15:14:01 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* compile.c (iseq_peephole_optimize): don't apply tailcall
-	  optimization to send/invokesuper instructions with blockiseq.
-	  This is a follow-up to the changes in r51903; blockiseq is now
-	  the third operand of send/invokesuper instructions.
-	  [ruby-core:73413] [Bug #12018]
-
-Tue Jan 26 14:26:46 2016  Eric Wong  <e@80x24.org>
-
-	* signal.c (sig_list): use fstring for hash key
-	* test/ruby/test_signal.rb (test_signal_list_dedupe_keys): added
-
-Tue Jan 26 13:08:34 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* signal.c (rb_f_kill): should immediately deliver reserved
-	  signals SIGILL and SIGFPE, not only SIGSEGV and SIGBUS.
-
-Tue Jan 26 07:57:28 2016  Joseph Tibbertsma  <josephtibbertsma@gmail.com>
-
-	* gc.c (RVALUE_PAGE_WB_UNPROTECTED): fix a typo of argument name.
-	  [Fix GH-1221]
-
-Mon Jan 25 17:26:54 2016  Eric Wong  <e@80x24.org>
-
-	* ruby_assert.h (RUBY_ASSERT_WHEN): fix reference to macro name
-	* vm_core.h: include ruby_assert.h before using
-	  [ruby-core:73371]
-
-Mon Jan 25 15:55:30 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* symbol.c (sym_check_asciionly): more informative error message
-	  with the encoding name and the inspected content.
-	  [ruby-core:73398] [Feature #12016]
-
-Mon Jan 25 09:38:26 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* test/ruby/test_string.rb: added testcase for next!, succ and succ!
-	  [fix GH-1213] Patch by @K0mAtoru
-
-Mon Jan 25 09:32:25 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/webrick/httpservlet/filehandler.rb: fix documentation for namespace.
-	  [fix GH-1219][ci skip] Patch by @leafac
-
-Sun Jan 24 19:34:23 2016  Eric Wong  <e@80x24.org>
-
-	* vm_insnhelper.c (vm_check_if_namespace): tiny size reduction
-
-Sun Jan 24 18:12:36 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* common.mk: Simplifying Unicode data file download logic to make
-	  it more reliable (including additional fix not in r53633) [Bug #12007]
-
-Sun Jan 24 16:54:11 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/io/wait/wait.c (io_wait_readwrite): [EXPERIMENTAL] allow to
-	  wait for multiple modes, readable and writable, at once.  the
-	  arguments may change in the future.  [Feature #12013]
-
-Sat Jan 23 22:30:59 2016  K0mA  <mctj1218@gmail.com>
-
-	* test/ruby/test_array.rb (test_keep_if): Add test for
-	  Array#keep_if separate from Array#select!  [Fix GH-1218]
-
-Sat Jan 23 20:54:26 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* common.mk: revert r53633. It broke rubyci and travis.
-	  https://travis-ci.org/ruby/ruby/builds/104259623
-
-Sat Jan 23 20:10:29 2016  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* range.c (range_eqq): revert r51585 because rb_call_super() is
-	  called in range_include() and thus r51585 doesn't work when the
-	  receiver Range object consists of non linear objects such as Date
-	  objects.
-	  [ruby-core:72908] [Bug #12003]
-
-Sat Jan 23 18:37:37 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* ChangeLog: Fixing wrong time on previous commit, and adding
-	  previous commit message to svn [ci skip]
-
-Sat Jan 23 18:30:30 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* common.mk: Simplifying Unicode data file download logic to make
-	  it more reliable [Bug #12007]
-
-Sat Jan 23 16:29:42 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* tool/downloader.rb: Fixed a logical error, improved documentation
-
-Sat Jan 23 11:42:43 2016  Peter Suschlik  <ps@neopoly.de>
-
-	* README.md: Use SVG Travis badge over PNG for better quality and
-	  device support.  [Fix GH-1214] [Fix GH-1216]
-
-Sat Jan 23 11:29:16 2016  Pascal Betz  <pascal.betz@simplificator.com>
-
-	* lib/csv.rb: Update documentation of CSV header converter for
-	  r45498, [GH-575].  [Fix GH-1215]
-
-Fri Jan 22 17:36:46 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_core.h (VM_ASSERT): use RUBY_ASSERT instead of rb_bug.
-
-	* error.c (rb_assert_failure): assertion with stack dump.
-
-	* ruby_assert.h (RUBY_ASSERT): new header for the assertion.
-
-Fri Jan 22 00:25:57 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* regparse.c (fetch_name_with_level): allow non word characters
-	  at the first character.  [Feature #11949]
-
-	* regparse.c (fetch_name): ditto.
-
-Thu Jan 21 17:34:01 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* marshal.c (r_object0): honor Marshal.load post proc
-	  value for TYPE_LINK.  by Hiroshi Nakamura <nahi@ruby-lang.org>
-	  https://github.com/ruby/ruby/pull/1204 fix GH-1204
-
-Thu Jan 21 16:37:50 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* Makefile.in (update-rubyspec): fix r53208 like r53451.
-
-Wed Jan 20 20:58:25 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* common.mk, Makefile.in: update-config_files is only for Unix
-	  platforms.
-
-Wed Jan 20 17:13:39 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/extlibs.rb: add --cache option to change cache directory.
-
-Tue Jan 19 17:03:40 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* common.mk: Added Unicode data file CaseFolding.txt to be additionally
-	  downloaded (with Kimihito Matsui)
-
-Tue Jan 19 10:09:58 2016  Sho Hashimoto  <sho-h@ruby-lang.org>
-
-	* lib/shell.rb (Shell.debug_output_exclusive_unlock): remove
-	  because Mutex#exclusive_unlock was already deleted. [fix GH-1185]
-
-Tue Jan 19 09:38:27 2016  Nick Cox  <nick@nickcox.me>
-
-	* vm_method.c: fix grammar in respond_to? warning.
-	  [fix GH-1047]
-
-Mon Jan 18 14:37:07 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_here_document): an escaped newline is not an
-	  actual newline, and the rest part should not be dedented.
-	  [ruby-core:72855] [Bug #11989]
-
-Mon Jan 18 12:04:34 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* test/ruby/test_string.rb: Added extra testcase for test_rstrip_bang
-	  and test_lstrip_bang. [fix GH-1178] Patch by @Matrixbirds
-
-Mon Jan 18 11:47:27 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* string.c: fix a typo. [fix GH-1202][ci skip] Patch by @sunboshan
-
-Sun Jan 17 21:15:30 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in: improve ICC (Intel C Compiler) support.
-
-	* configure.in (CXX): The name of icc's c++ compiler is `icpc`.
-
-	* configure.in (warnings): Add `-diag-disable=2259` to suppress
-	  noisy warnings: "non-pointer conversion from "..." to "..." may
-	  lose significant bits".
-
-	* configure.in (optflags): Add `-fp-model precise` like -fno-fast-math.
-
-	* lib/mkmf.rb: icc supports -Werror=division-by-zero
-	  and -Werror=deprecated-declarations, but doesn't support
-	  -Wdivision-by-zero and -Wdeprecated-declarations.
-
-Sun Jan 17 20:40:10 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* string.c: Any kind of option is now taking the new code path for
-	  upcase/downcase/capitalize/swapcase. :lithuanian can be used for
-	  testing if no specific option is desired.
-	* test/ruby/enc/test_case_mapping.rb: Adjusted to above.
-	  (with Kimihito Matsui)
-
-Sun Jan 17 20:10:10 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode.c: Fixed a logical error and some comments.
-	* test/ruby/enc/test_case_mapping.rb: Made tests more general.
-	  (with Kimihito Matsui)
-
-Sun Jan 17 17:41:41 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode.c: Removed artificial expansion for Turkic,
-	  added hand-coded support for Turkic, fixed logic for swapcase.
-	* string.c: Made use of new case mapping code possible from upcase,
-	  capitalize, and swapcase (with :lithuanian as a guard).
-	* test/ruby/enc/test_case_mapping.rb: Adjusted for above.
-	  (with Kimihito Matsui)
-
-Sun Jan 17 15:30:57 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/socket/option.c (sockopt_bool): relax boolean size to be one
-	  too not only sizeof(int).  Winsock getsockopt() returns a single
-	  byte as a boolean socket option.  [ruby-core:72730] [Bug #11958]
-
-Sun Jan 17 14:43:01 2016  Kuniaki IGARASHI  <igaiga@gmail.com>
-
-	* test/ruby/test_env.rb: [Fix GH-1201]
-	  * Extract test code for ENV#keep_if from ENV#select_bang
-	  * Add a test case for ENV#select_bang,keep_if
-
-Sun Jan 17 14:42:25 2016  Kuniaki IGARASHI  <igaiga@gmail.com>
-
-	* test/ruby/test_env.rb: [Fix GH-1201]
-	  * Extract test code for ENV#delete_if from ENV#reject_bang
-	  * Add a test case for ENV#reject_bang,delete_if
-
-Sun Jan 17 14:40:22 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/socket/option.c (check_size): extract a macro to check
-	  binary data size, with a consistent message.
-
-	* ext/socket/option.c (sockopt_byte): fix error message,
-	  sizeof(int) differs from sizeof(unsigned char) in general.
-
-Sat Jan 16 21:16:21 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (xstring): reset heredoc indent after dedenting,
-	  so that following string literal would not be dedented.
-	  [ruby-core:72857] [Bug #11990]
-
-Sat Jan 16 17:24:24 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode.c: Artificial mapping to test buffer expansion code.
-	* string.c: Fixed buffer expansion logic.
-	* test/ruby/enc/test_case_mapping.rb: Tests for above.
-	  (with Kimihito Matsui)
-
-Sat Jan 16 16:47:14 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* ext/openssl/lib/openssl/pkey.rb: Added 2048 bit DH parameter.
-	* test/openssl/test_pkey_dh.rb: ditto.
-
-Sat Jan 16 10:51:19 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* enc/unicode.c: fix implicit conversion error with clang. fixup r53548.
-	* string.c: ditto.
-
-Sat Jan 16 10:31:00 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* common.mk: test-sample was changed to test-basic.
-	  [Feature #11982][ruby-core:72823]
-	* basictest/runner.rb: ditto. rename from tool/rubytest.rb.
-	* basictest/test.rb: ditto. rename from sample/test.rb.
-	* defs/gmake.mk: picked from r53540
-	* sample/test.rb: backward compatibility for chkbuild.
-
-Sat Jan 16 10:23:23 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* string.c, enc/unicode.c: New code path as a preparation for Unicode-wide
-	  case mapping. The code path is currently guarded by the :lithuanian
-	  option to avoid accidental problems in daily use.
-	* test/ruby/enc/test_case_mapping.rb: Test for above.
-	* string.c: function 'check_case_options': fixed logical errors
-	  (with Kimihito Matsui)
-
-Fri Jan 15 20:20:20 2016  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* regint.h (PLATFORM_UNALIGNED_WORD_ACCESS): The value of
-	  UNALIGNED_WORD_ACCESS should be used to determine whether
-	  unaligned word access is allowed or not. After this commit,
-	  ./configure CPPFLAGS="-DUNALIGNED_WORD_ACCESS=0" disables
-	  unaligned word access even on platforms that support the feature.
-
-Fri Jan 15 16:12:10 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (string1): reset heredoc indent for each string literal
-	  so that concatenated string would not be dedented.
-	  [ruby-core:72857] [Bug #11990]
-
-Thu Jan 14 20:01:00 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/uri/generic.rb (URI::Generic#to_s): change encoding to
-	  UTF-8 as Ruby 2.2/ by Koichi ITO <koic.ito@gmail.com>
-	  https://github.com/ruby/ruby/pull/1188 fix GH-1188
-
-Thu Jan 14 17:36:16 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* variable.c (rb_f_global_variables): add matched back references
-	  only, as well as defined? operator.
-
-Thu Jan 14 16:12:09 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* sprintf.c (rb_str_format): format exact number more exactly.
-
-Thu Jan 14 15:08:43 2016  Tony Arcieri  <bascule@gmail.com>
-
-	* Remove 512-bit DH group. It's affected by LogJam Attack.
-	  https://weakdh.org/
-	  [fix GH-1196][Bug #11968][ruby-core:72766]
-
-Thu Jan 14 11:44:29 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* variable.c (rb_f_global_variables): add $1..$9 only if $~ is
-	  set.  fix the condition removed at r14014.
-
-Wed Jan 13 17:21:45 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* .travis.yml: removed commented-out code.
-
-Wed Jan 13 17:14:54 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* .travis.yml: removed osx code. follow up with r53517
-
-Wed Jan 13 16:56:19 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* iseq.c (rb_iseq_mark): mark parent iseq to prevent dynamically
-	  generated iseq by eval from GC.  [ruby-core:72620] [Bug #11928]
-
-Wed Jan 13 03:42:58 2016  Eric Wong  <e@80x24.org>
-
-	* class.c (Init_class_hierarchy): resolve name for rb_cObject ASAP
-	* object.c (rb_mod_const_set): move name resolution to rb_const_set
-	* variable.c (rb_const_set): do class resolution here
-	  [ruby-core:72807] [Bug #11977]
-
-Wed Jan 13 00:37:12 2016  Satoshi Ohmori  <sachin21dev@gmail.com>
-
-	* man/ruby.1: fix double word typo.  [Fix GH-1194]
-
-Tue Jan 12 21:01:09 2016  Benoit Daloze  <eregontp@gmail.com>
-
-	* common.mk: update URL and name for the Ruby spec suite.
-
-Tue Jan 12 19:52:19 2016  sorah (Shota Fukumori)  <her@sorah.jp>
-
-	* lib/forwardable.rb: Convert given accessors to String.
-
-	  r53381 changed to accept only Symbol or String for accessors, but
-	  there are several rubygems that pass classes (e.g. Array,
-	  Hash, ...) as accessors. Prior r53381, it was accepted because Class#to_s
-	  returns its class name. After r53381 given accessors are checked
-	  with define_method, but it accepts only Symbol or String, otherwise
-	  raises TypeError.
-
-	      def_delegator Foo, :some_method
-
-	  This change is to revert unexpected incompatibility. But this behavior
-	  may change in the future.
-
-Mon Jan 12 18:41:41 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* string.c: made a variable name more grammatically correct
-
-Mon Jan 12 18:34:34 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* string.c: minor grammar fix [ci skip]
-
-Mon Jan 12 16:09:09 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_casing_options.rb: Tests for option
-	  parsing/checking for upcase/downcase/capitalize/swapcase
-	  (see r53503; with Kimihito Matsui)
-
-Mon Jan 12 16:03:03 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* string.c: Added option parsing/checking for upcase/downcase/
-	  capitalize/swapcase (with Kimihito Matsui)
-
-Mon Jan 11 21:28:28 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* include/ruby/oniguruma.h: Added flags needed for upcase/downcase
-	  Unicode addition (with Kimihito Matsui)
-
-Mon Jan 11 09:50:24 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in: check if the API version number is consistent with
-	  the program version number.
-
-Sun Jan 10 20:57:25 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (compile_massign_lhs): when index ends with splat,
-	  append rhs value to it like POSTARG, since VM_CALL_ARGS_SPLAT
-	  splats the last argument only.  [ruby-core:72777] [Bug #11970]
-
-Sun Jan 10 15:45:10 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/missing.h (explicit_bzero_by_memset_s): remove
-	  inline implementation by memset_s, which needs a macro before
-	  including headers and can cause problems in extension libraries
-	  by the order of the macro and headers.
-
-Sun Jan 10 13:41:36 2016  Eric Wong  <e@80x24.org>
-
-	* io.c (rb_deferr): remove long obsolete global
-
-Sun Jan 10 09:14:42 2016  Eric Wong  <e@80x24.org>
-
-	* ext/psych/lib/psych/visitors/yaml_tree.rb (visit_String):
-	  eliminate chomp
-	* lib/net/http.rb (connect): eliminate delete
-	* lib/net/http/header.rb (basic_encode): ditto
-	* lib/net/imap.rb (authenticate): eliminate gsub
-	  (self.encode_utf7): shorten delete arg
-	* lib/net/smtp.rb (base64_encode): eliminate gsub
-	* lib/open-uri.rb (OpenURI.open_http): eliminate delete
-	* lib/rss/rss.rb: ditto
-	* lib/securerandom.rb (base64): ditto
-	  (urlsafe_base64): eliminate delete!
-	* lib/webrick/httpauth/digestauth.rb (split_param_value):
-	  eliminate chop
-	* lib/webrick/httpproxy.rb (do_CONNECT): eliminate delete
-	  (setup_upstream_proxy_authentication): ditto
-	  [ruby-core:72666] [Feature #11938]
-
-Sat Jan  9 23:19:14 2016  Kuniaki IGARASHI  <igaiga@gmail.com>
-
-	* test/ruby/test_hash.rb (test_try_convert): Add test for
-	  Hash.try_convert.  [Fix GH-1190]
-
-Sat Jan  9 23:15:25 2016  Jon Moss  <maclover7@users.noreply.github.com>
-
-	* ext/openssl/ossl.c: Add missing variables to documentation
-	  examples.  [Fix GH-1189]
-
-Sat Jan  9 18:25:57 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* symbol.h (is_attrset_id): ASET is an attrset ID.  fix
-	  unexpected safe call instead of an ordinary ASET.
-
-Sat Jan  9 10:44:33 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in, win32/setup.mak: extract RUBY_PROGRAM_VERSION from
-	  RUBY_VERSION in version.h instead of RUBY_API_VERSION numbers in
-	  include/ruby/version.h, and cut it into version numbers.
-
-Sat Jan  9 07:13:33 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: rename PAGE_* to HEAP_PAGE_* because PAGE_SIZE is used
-	  in Mac OS X.
-
-	* test/ruby/test_gc.rb: catch up this fix.
-
-Sat Jan  9 05:45:40 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: PAGE_BITMAP_PLANES (the number of bitmap) is 4, not 3.
-
-Sat Jan  9 05:42:57 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: rename constant names HEAP_* to PAGE_*.
-
-	  Keys of GC::INTERNAL_CONSTANTS are also renamed.
-
-	* test/ruby/test_gc.rb: catch up this fix.
-
-Fri Jan  8 22:30:06 2016  Akinori MUSHA  <knu@iDaemons.org>
-
-	* doc/regexp.rdoc: [DOC] Elaborate on the \G anchor. [ci skip]
-
-Fri Jan  8 19:49:27 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: remove heap_page::body. Instead of this field,
-	  heap_page::start field works well.
-
-Fri Jan  8 19:31:52 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: rename rb_heap_t::page_length to rb_heap_t::total_pages.
-
-	  `page_length' is not clear (we may understand with length of
-	  a page).
-
-Fri Jan  8 17:07:14 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: remove heap_page::heap. This field is only used to recognize
-	  whether a page is in a tomb or not. Instead of this field,
-	  heap_page::flags::in_tomb (1 bit field) is added.
-
-	  Also type of heap_page::(total|free|final)_slots are changed from
-	  int to short. 2B is enough for them.
-
-Fri Jan  8 09:33:59 2016  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* iseq.c (rb_iseq_compile_with_option): move variable initialization
-	  code to avoid maybe-uninitialized warnings by gcc 4.8.
-
-Fri Jan  8 00:03:22 2016  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* enum.c (enum_min, enum_max): do the same optimization as r53454.
-
-Thu Jan  7 22:32:21 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* ruby.h: undef HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P
-	  and HAVE_BUILTIN___BUILTIN_TYPES_COMPATIBLE_P on C++.
-	  [ruby-core:72736] [Bug #11962]
-
-Thu Jan  7 22:02:21 2016  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* enum.c (enum_minmax): optimize object comparison in
-	  Enumerable#minmax.
-
-Thu Jan  7 14:49:12 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (rb_thread_pending_interrupt_p): no pending interrupt
-	  before initialization.
-
-	* thread.c (thread_raise_m, rb_thread_kill): uninitialized thread
-	  cannot interrupt.  [ruby-core:72732] [Bug #11959]
-
-Thu Jan  7 11:34:14 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/backward.h (ruby_show_copyright_to_die): for source
-	  code backward compatibility.
-
-	* ruby.c (process_options): return Qtrue to exit the process
-	  successfully.
-
-	* version.c (ruby_show_copyright): no longer exit.
-
-Wed Jan  6 17:22:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/optparse.rb (OptionParser#order!): add `into` optional
-	  keyword argument to store the results.  [Feature #11191]
-
-Tue Jan  5 21:44:37 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* ChangeLog: fix wrong class name.
-
-Tue Jan  5 21:43:50 2016  Kuniaki IGARASHI  <igaiga@gmail.com>
-
-	* test/ruby/test_string.rb(test_chr): added test for String#chr
-	  [fix GH-1179]
-
-Tue Jan  5 21:32:26 2016  Kuniaki IGARASHI  <igaiga@gmail.com>
-
-	* test/ruby/test_numeric.rb (test_nonzero_p): added test for Numeric#nonzero?
-	  [fix GH-1187]
-
-Tue Jan  5 11:47:23 2016  Damir Gaynetdinov  <damir.gaynetdinov@gmail.com>
-
-	* doc/marshal.rdoc: Clarify object references example, that the
-	  reference is same object.  [Fix GH-1156]
-
-Tue Jan  5 05:06:51 2016  Eric Wong  <e@80x24.org>
-
-	* ext/stringio/stringio.c (strio_binmode): implement to set encoding
-	* test/stringio/test_stringio.rb (test_binmode): new test
-	  [ruby-core:72699] [Bug #11945]
-
-Mon Jan  4 15:44:37 2016  Sho Hashimoto  <sho-h@ruby-lang.org>
-
-	* variable.c (rb_mod_deprecate_constant): [DOC] added
-	  documentation for Module#deprecate_constant. [ci skip]
-
-Mon Jan  4 15:36:38 2016  Sho Hashimoto  <sho-h@ruby-lang.org>
-
-	* thread_sync.c: [DOC] remove SizedQueue#close argument.
-	  [ci skip]
-
-Mon Jan  4 10:14:24 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* test/coverage/test_coverage.rb: ignored test when enabled to coverage.
-	  It lead to crash with `make test-all`.
-
-Mon Jan  4 08:10:44 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
-
-	* insns.def (opt_case_dispatch): Move a comment to the
-	  appropriate position.
-	  [ci skip]
-
-Sun Jan  3 23:55:13 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/rubygems/security.rb (DIGEST_ALGORITHM, KEY_ALGORITHM):
-	  should check same name as the used constants.
-	  [ruby-core:72674] [Bug #11940]
-
-Sun Jan  3 19:22:01 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* aclocal.m4: add fallback file for non-aclocal environments.
-	  [ruby-core:72683] [Bug #11942]
-
-Sun Jan  3 13:56:49 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
-
-	* eval_error.c (rb_print_undef): Use `rb_method_visibility_t`
-	  instead of `int`.
-	* eval_intern.h (rb_print_undef): ditto
-	* proc.c (mnew_internal): ditto
-	* vm_method.c (rb_export_method): ditto
-	  [Misc #11649] [ruby-core:71311] [fix GH-1078]
-
-Sun Jan  3 12:12:09 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* acinclude.m4: rename aclocal.m4, which should be generated by
-	  aclocal.  [ruby-core:72675] [Bug #11941]
-
-Sat Jan  2 21:07:55 2016  Eric Wong  <e@80x24.org>
-
-	* thread_sync.c (queue_do_pop): avoid cast with Qfalse
-	  (rb_szqueue_push): ditto, use queue_sleep wrapper
-
-Sat Jan  2 16:16:14 2016  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/erb.rb: Allow ERB subclass to add token easily.
-	  [Feature #11936]
-
-	* test/erb/test_erb.rb: ditto.
-
-Sat Jan  2 14:44:31 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (regexp): set_yylval_num sets u1, should use nd_tag
-	  instead of nd_state.  [ruby-core:72638] [Bug #11932]
-
-Sat Jan  2 02:27:22 2016  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/ostruct.rb: Fix case of frozen object with initializer.
-	  Bug revealed by RubySpec [ruby-core:72639]
-
-Fri Jan  1 22:01:52 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* NEWS: mention CSV's liberal_parsing option.
-
-Fri Jan  1 19:38:23 2016  okkez  <okkez000@gmail.com>
-
-	* doc/NEWS-2.3.0: fix double words typo.
-	  [ci skip][fix GH-1183]
-
-Fri Jan  1 15:28:56 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (remove_unreachable_chunk): decrease count of
-	  call_info in removed instructions.  fix up r53402.
-
-Fri Jan  1 12:05:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (remove_unreachable_chunk): remove unreferred label
-	  to optimize away unreachable chunk.
-
-Fri Jan  1 11:42:57 2016  James Edward Gray II  <james@graysoftinc.com>
-
-	* lib/csv.rb (CSV): Add a liberal_parsing option.
-	  Patch by Braden Anderson. [#11839]
-	* test/csv/test_features.rb:  test liberal_parsing
-
-Fri Jan  1 10:27:28 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/mkconfig.rb (RbConfig): prefix SDKROOT to oldincludedir
-	  not includedir, the latter is outside the ruby installation.
-	  [ruby-core:72496] [Bug #11881]
-
-Fri Jan  1 08:53:02 2016  Yuki Kurihara  <co000ri@gmail.com>
-
-	* test/ruby/test_lazy_enumerator.rb (test_take_bad_arg): Add test
-	  code in case of Enumerator::Lazy#take called with negative number.
-	  [ruby-dev:49467] [Bug #11933]
-
-Fri Jan  1 05:06:20 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_here_document): update indent for each line in
-	  indented here document with single-quotes.
-	  [ruby-core:72479] [Bug #11871]
-
-Fri Jan  1 03:26:44 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/ostruct.rb (freeze): define deferred accessors before
-	  freezing to get rid of an error when just reading frozen
-	  OpenStruct.
-
-Thu Dec 31 14:36:45 2015  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/ostruct.rb: Fix new_ostruct_member to correctly avoid
-	  redefinition [#11901]
-
-Thu Dec 31 02:45:12 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* test/ruby/test_module.rb (test_classpath): r53376 may change
-	  the order of m.constants.
-	  `make TESTS='-v ruby/test_class.rb ruby/test_module.rb' test-all`
-	  may fail after that.
-	  http://rubyci.s3.amazonaws.com/tk2-243-31075/ruby-trunk/log/20151230T164202Z.log.html.gz
-
-Thu Dec 31 02:20:00 2015  Benoit Daloze  <eregontp@gmail.com>
-
-	* common.mk (help): Fix typo.
-
-Wed Dec 30 20:53:09 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/net/http/responses.rb: Added new response class for 451 status code.
-	* lib/net/http.rb: documentation for HTTPUnavailableForLegalReasons
-
-Wed Dec 30 20:45:45 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/webrick/httpstatus.rb: Added HTTP 451 Status Code.
-	  [fix GH-1167] Patch by @MuhammetDilmac
-	  https://tools.ietf.org/html/draft-tbray-http-legally-restricted-status-00
-
-Wed Dec 30 20:25:52 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* doc/syntax/calling_methods.rdoc: fix old operator for safe navigation
-	  operator. [ci skip][fix GH-1182] Patch by @dougo
-
-Wed Dec 30 16:43:23 2015  Kuniaki IGARASHI  <igaiga@gmail.com>
-
-	* test/ruby/test_string.rb (test_ord): Add test for String#ord.
-	  [Fix GH-1181]
-
-Wed Dec 30 11:28:57 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/forwardable.rb (def_instance_delegator): adjust backtrace of
-	  method body by tail call optimization.  adjusting the delegated
-	  target is still done by deleting backtrace.
-
-	* lib/forwardable.rb (def_single_delegator): ditto.
-
-Wed Dec 30 11:18:42 2015  Elliot Winkler  <elliot.winkler@gmail.com>
-
-	* lib/forwardable.rb (def_instance_delegator) fix delegating to
-	  'args' and 'block', clashing with local variables in generated
-	  methods.  [ruby-core:72579] [Bug #11916]
-
-	* lib/forwardable.rb (def_single_delegator): ditto.
-
-Wed Dec 30 09:58:56 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* object.c (rb_class_inherited_p): search the corresponding
-	  ancestor to prepended module from prepending class itself.
-	  [ruby-core:72493] [Bug #11878]
-
-Wed Dec 30 09:20:00 2015  Yuki Kurihara  <co000ri@gmail.com>
-
-	* test/stringio/test_io.rb (test_flag): add assertion for error when
-	  text and binary mode are mixed.
-	  [ruby-dev:49465] [Feature #11921]
-
-Wed Dec 30 08:43:59 2015  Yuki Kurihara  <co000ri@gmail.com>
-
-	* test/stringio/test_stringio.rb (test_initialize): add test for
-	  StringIO#initialize.  [ruby-core:72585] [Feature #11920]
-
-Wed Dec 30 05:19:24 2015  Eric Wong  <e@80x24.org>
-
-	* class.c (struct clone_const_arg): adjust for id_table
-	  (clone_const): ditto
-	  (clone_const_i): ditto
-	  (rb_mod_init_copy): ditto
-	  (rb_singleton_class_clone_and_attach): ditto
-	  (rb_include_class_new): ditto
-	  (include_modules_at): ditto
-	* constant.h (rb_free_const_table): ditto
-	* gc.c (free_const_entry_i): ditto
-	  (rb_free_const_table): ditto
-	  (obj_memsize_of): ditto
-	  (mark_const_entry_i): ditto
-	  (mark_const_tbl): ditto
-	* internal.h (struct rb_classext_struct): ditto
-	* object.c (rb_mod_const_set): resolve class name on assignment
-	* variable.c (const_update): replace with const_tbl_update
-	  (const_tbl_update): new function
-	  (fc_i): adjust for id_table
-	  (find_class_path): ditto
-	  (autoload_const_set): st_update => const_tbl_update
-	  (rb_const_remove): adjust for id_table
-	  (sv_i): ditto
-	  (rb_local_constants_i): ditto
-	  (rb_local_constants): ditto
-	  (rb_mod_const_at): ditto
-	  (rb_mod_const_set): ditto
-	  (rb_const_lookup): ditto
-	  [ruby-core:72112] [Feature #11614]
-
-Wed Dec 30 04:10:13 2015  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
-
-	* thread_pthread.c (rb_thread_create_timer_thread): destroy attr even
-	  if pthread_create() failed.
-
-Wed Dec 30 02:55:09 2015  Eric Wong  <e@80x24.org>
-
-	* thread_pthread.c (setup_communication_pipe): delay setting owner
-	  (rb_thread_create_timer_thread): until thread creation succeeds
-	  [ruby-core:72590] [Bug #11922]
-
-Tue Dec 29 19:12:46 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (proc_options): -W command line option should be able to
-	  override -w in RUBYOPT environment variable.
-
-Tue Dec 29 17:54:16 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (ignored_block): warn if a block is given to `using`,
-	  which is probably for `Module.new`.
-
-Tue Dec 29 12:48:34 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/ostruct.rb (OpenStruct): make respond_to? working on
-	  just-allocated objects for workaround of Psych.
-	  [ruby-core:72501] [Bug #11884]
-
-Tue Dec 29 10:35:00 2015  Kenta Murata  <mrkn@mrkn.jp>
-
-	* test/mkmf/test_have_func.rb (test_have_func):
-	  Add assertion to examine the existence of HAVE_RUBY_INIT.
-
-	* test/mkmf/test_have_func.rb (test_not_have_func):
-	  Add assertion to examine the absence of HAVE_RUBY_INIT.
-
-Tue Dec 29 06:50:42 2015  Eric Wong  <e@80x24.org>
-
-	* thread_sync.c: static classes
-
-Tue Dec 29 05:30:30 2015  Eric Wong  <e@80x24.org>
-
-	* lib/resolv.rb (Resolv::IPv6.create): avoid modifying frozen
-	* test/resolv/test_dns.rb (test_ipv6_create): test for above
-	  [Bug #11910] [ruby-core:72559]
-
-Mon Dec 28 14:55:57 2015  Kuniaki IGARASHI  <igaiga@gmail.com>
-
-	* test/ruby/test_string.rb (TestString#test_rstrip_bang): Add test
-	  for String#rstrip!.  [Fix GH-1176]
-
-Mon Dec 28 09:18:53 2015  Kuniaki IGARASHI  <igaiga@gmail.com>
-
-	* test/ruby/test_string.rb (TestString#test_lstrip_bang): Add test
-	  for String#lstrip!.  [Fix GH-1176]
-
-Sun Dec 27 23:32:26 2015  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_variant2val): refactoring.
-
-Sun Dec 27 21:14:42 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* process.c (rb_execarg_parent_start1): need to convert the encoding to
-	  ospath's one.
-
-Sun Dec 27 20:54:22 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* process.c: use rb_w32_uchdir() instead of plain chdir() on Windows.
-	  reported by naruse via twitter.
-
-	* process.c (rb_execarg_addopt): need to convert the encoding to
-	  ospath's one.
-
-Sun Dec 27 20:00:31 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* enc/x_emoji.h: fix dead-link.
-
-Sun Dec 27 19:55:55 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* doc/NEWS-2.3.0: fix a typo.
-
-Sun Dec 27 18:08:15 2015  Kuniaki IGARASHI  <igaiga@gmail.com>
-
-	* string.c (rb_str_lstrip_bang, rb_str_rstrip_bang): [DOC] Fix
-	  ruby-doc comments for String#rstrip! and lstrip!.  It looks like
-	  dropped bang.  [Fix GH-1175]
-
-Sun Dec 27 15:14:20 2015  Eric Wong  <e@80x24.org>
-
-	* io.c (io_getpartial): remove unused kwarg from template
-	* test/ruby/test_io.rb (test_readpartial_bad_args): new
-	  [Bug #11885]
-
-Sun Dec 27 11:50:53 2015  Kuniaki IGARASHI  <igaiga@gmail.com>
-
-	* test/ruby/test_string.rb (test_rstrip, test_lstrip): Add tests
-	  for String#lstrip and rstrip.  The test cases are used from
-	  string.c ruby-doc comments.  [Fix GH-1174]
-
-Sun Dec 27 11:47:46 2015  Kuniaki IGARASHI  <igaiga@gmail.com>
-
-	* test/ruby/test_string.rb (test_insert): Add test for
-	  String#insert.  The test cases are written in string.c
-	  comments as a reference.  [Fix GH-1173]
-
-Sun Dec 27 11:03:33 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (show_bitstack): trace stack_type value if yydebug.
-
-Sun Dec 27 10:03:14 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enc/depend (enc, trans): fix version dependency, shared object
-	  files depend on the RUBY_SO_NAME value for runtime link.
-
-Sun Dec 27 09:47:20 2015  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_vstr2wc, ole_variant2val): fix blank
-	  string conversion.
-	  [Bug #11880]
-	  Thanks Akio Tajima for the patch!
-
-Sun Dec 27 09:34:53 2015  craft4coder  <yooobuntu@163.com>
-
-	* doc/extension.rdoc: [DOC] `nul` should be uppercase.
-	  change 'nul' => 'NUL'.  [Fix GH-1172]
-
-Sat Dec 26 18:29:01 2015  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/xmlrpc/client.rb: Support SSL options in async methods of
-	  XMLRPC::Client.
-	  [Bug #11489]
-	  Reported by Aleksandar Kostadinov. Thanks!!!
-
-Sat Dec 26 11:26:38 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* miniinit.c (Init_enc): add some common aliases of built-in
-	  encodings.  [ruby-core:72481] [Bug #11872]
-
-Fri Dec 25 22:43:26 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in: extract RUBY_RELEASE_DAY at generating Makefile.
-
-	* version.h (RUBY_RELEASE_DATE): construct from RUBY_RELEASE_YEAR,
-	  RUBY_RELEASE_MONTH, and RUBY_RELEASE_DAY.
-
-Fri Dec 25 21:33:06 2015  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* version.h (RUBY_VERSION): 2.4.0 development has started.
-
-Fri Dec 25 14:12:12 2015  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* doc/ChangeLog-2.3.0, ext/tk/lib/tkextlib/SUPPORT_STATUS,
-	  include/ruby/version.h: minor grammar fixes [ci skip]
-
-Fri Dec 25 08:23:22 2015  Tadashi Saito  <tad.a.digger@gmail.com>
-
-	* compile.c, cont.c, doc, man: fix common misspelling.
-	  [ruby-core:72466] [Bug #11870]
-
-
-For the changes before 2.3.0, see doc/ChangeLog-2.3.0
-For the changes before 2.2.0, see doc/ChangeLog-2.2.0
-For the changes before 2.1.0, see doc/ChangeLog-2.1.0
-For the changes before 2.0.0, see doc/ChangeLog-2.0.0
-For the changes before 1.9.3, see doc/ChangeLog-1.9.3
-For the changes before 1.8.0, see doc/ChangeLog-1.8.0
-
-Local variables:
-coding: us-ascii
-add-log-time-format: (lambda ()
-  (let* ((time (current-time))
-	 (system-time-locale "C")
-	 (diff (+ (cadr time) 32400))
-	 (lo (% diff 65536))
-	 (hi (+ (car time) (/ diff 65536))))
-  (format-time-string "%a %b %e %H:%M:%S %Y" (list hi lo) t)))
-indent-tabs-mode: t
-tab-width: 8
-change-log-indent-text: 2
-end:
-vim: tabstop=8 shiftwidth=2
diff --git a/LEGAL b/LEGAL
index 2607f0082a..2a7964e771 100644
--- a/LEGAL
+++ b/LEGAL
@@ -1,116 +1,342 @@
-LEGAL NOTICE INFORMATION
-------------------------
+# -*- rdoc -*-
+
+= LEGAL NOTICE INFORMATION
+--------------------------
 
 All the files in this distribution are covered under either the Ruby's
 license (see the file COPYING) or public-domain except some files
 mentioned below.
 
-ccan/build_assert/build_assert.h
-ccan/check_type/check_type.h
-ccan/container_of/container_of.h
-ccan/str/str.h
+[addr2line.c]
 
-  These files are licensed under the CC0.
+  A part of this file is from FreeBSD.
 
-    http://creativecommons.org/choose/zero/
+  >>>
+    Copyright (c) 1986, 1988, 1991, 1993::
+    The Regents of the University of California.  All rights reserved.
 
-ccan/list/list.h
+    (c) UNIX System Laboratories, Inc.
 
-  This file is licensed under the MIT License.
+    All or some portions of this file are derived from material licensed
+    to the University of California by American Telephone and Telegraph
+    Co. or Unix System Laboratories, Inc. and are reproduced herein with
+    the permission of UNIX System Laboratories, Inc.
 
-    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:
+    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.
+    4. Neither the name of the University nor the names of its contributors
+       may be used to endorse or promote products derived from this software
+       without specific prior written permission.
 
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
+    THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+    ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.
 
-    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.
-
-include/ruby/oniguruma.h:
-regcomp.c:
-regenc.[ch]:
-regerror.c:
-regexec.c:
-regint.h:
-regparse.[ch]:
-enc/ascii.c
-enc/big5.c
-enc/cp949.c
-enc/emacs_mule.c
-enc/encdb.c
-enc/euc_jp.c
-enc/euc_kr.c
-enc/euc_tw.c
-enc/gb18030.c
-enc/gb2312.c
-enc/gbk.c
-enc/iso_8859_1.c
-enc/iso_8859_10.c
-enc/iso_8859_11.c
-enc/iso_8859_13.c
-enc/iso_8859_14.c
-enc/iso_8859_15.c
-enc/iso_8859_16.c
-enc/iso_8859_2.c
-enc/iso_8859_3.c
-enc/iso_8859_4.c
-enc/iso_8859_5.c
-enc/iso_8859_6.c
-enc/iso_8859_7.c
-enc/iso_8859_8.c
-enc/iso_8859_9.c
-enc/koi8_r.c
-enc/koi8_u.c
-enc/shift_jis.c
-enc/unicode.c
-enc/us_ascii.c
-enc/utf_16be.c
-enc/utf_16le.c
-enc/utf_32be.c
-enc/utf_32le.c
-enc/utf_8.c
-enc/windows_1251.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.
-
-configure:
+	@(#)subr_prf.c	8.3 (Berkeley) 1/21/94
+
+
+[ccan/build_assert/build_assert.h]
+[ccan/check_type/check_type.h]
+[ccan/container_of/container_of.h]
+[ccan/str/str.h]
+
+  These files are licensed under the {CC0}[https://creativecommons.org/choose/zero/].
+
+[ccan/list/list.h]
+
+  This file is licensed under the {MIT License}[rdoc-label:label-MIT+License].
+
+[coroutine]
+
+  Unless otherwise specified, these files are licensed under the
+  {MIT License}[rdoc-label:label-MIT+License].
+
+[include/ruby/onigmo.h]
+[include/ruby/oniguruma.h]
+[regcomp.c]
+[regenc.c]
+[regenc.h]
+[regerror.c]
+[regexec.c]
+[regint.h]
+[regparse.c]
+[regparse.h]
+[enc/ascii.c]
+[enc/big5.c]
+[enc/cp949.c]
+[enc/emacs_mule.c]
+[enc/encdb.c]
+[enc/euc_jp.c]
+[enc/euc_kr.c]
+[enc/euc_tw.c]
+[enc/gb18030.c]
+[enc/gb2312.c]
+[enc/gbk.c]
+[enc/iso_8859_1.c]
+[enc/iso_8859_10.c]
+[enc/iso_8859_11.c]
+[enc/iso_8859_13.c]
+[enc/iso_8859_14.c]
+[enc/iso_8859_15.c]
+[enc/iso_8859_16.c]
+[enc/iso_8859_2.c]
+[enc/iso_8859_3.c]
+[enc/iso_8859_4.c]
+[enc/iso_8859_5.c]
+[enc/iso_8859_6.c]
+[enc/iso_8859_7.c]
+[enc/iso_8859_8.c]
+[enc/iso_8859_9.c]
+[enc/koi8_r.c]
+[enc/koi8_u.c]
+[enc/shift_jis.c]
+[enc/unicode.c]
+[enc/us_ascii.c]
+[enc/utf_16be.c]
+[enc/utf_16le.c]
+[enc/utf_32be.c]
+[enc/utf_32le.c]
+[enc/utf_8.c]
+[enc/windows_1251.c]
+[enc/windows_31j.c]
+
+  Onigmo (Oniguruma-mod) LICENSE
+
+  >>>
+    Copyright (c) 2002-2009::  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+    Copyright (c) 2011-2014::  K.Takata  <kentkt AT csc 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.
+
+  Oniguruma LICENSE
+
+  >>>
+    Copyright (c) 2002-2009::  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.
+
+  * https://github.com/k-takata/Onigmo/
+  * https://github.com/kkos/oniguruma
+  * https://svnweb.freebsd.org/ports/head/devel/oniguruma/
+
+    When this software is partly used or it is distributed with Ruby,
+    this of Ruby follows the license of Ruby.
+
+[enc/windows_1250.c]
+[enc/windows_1252.c]
+
+  >>>
+    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.
+
+[enc/cesu_8.c]
+[enc/windows_1253.c]
+[enc/windows_1254.c]
+[enc/windows_1257.c]
+
+  >>>
+    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.
+
+[enc/trans/GB/GB12345%UCS.src]
+[enc/trans/GB/UCS%GB12345.src]
+[enc/trans/GB/GB2312%UCS.src]
+[enc/trans/GB/UCS%GB2312.src]
+
+  These files have this explanatory texts.
+
+  >>>
+    This mapping data was created from files provided by Unicode, Inc.
+    (The Unicode Consortium). The files were used to create a product supporting
+    Unicode, as explicitly permitted in the files' copyright notices.
+    Please note that Unicode, Inc. never made any claims as to fitness of these
+    files for any particular purpose, and has ceased to publish the files many
+    years ago.
+
+[enc/trans/JIS/JISX0201-KANA%UCS.src]
+[enc/trans/JIS/JISX0208\@1990%UCS.src]
+[enc/trans/JIS/JISX0212%UCS.src]
+[enc/trans/JIS/UCS%JISX0201-KANA.src]
+[enc/trans/JIS/UCS%JISX0208@1990.src]
+[enc/trans/JIS/UCS%JISX0212.src]
+
+  These files are copyrighted as the following.
+
+  >>>
+    © 2015 Unicode®, Inc.
+
+    For terms of use, see http://www.unicode.org/terms_of_use.html
+
+[enc/trans/JIS/JISX0213-1%UCS@BMP.src]
+[enc/trans/JIS/JISX0213-1%UCS@SIP.src]
+[enc/trans/JIS/JISX0213-2%UCS@BMP.src]
+[enc/trans/JIS/JISX0213-2%UCS@SIP.src]
+
+  These files are copyrighted as the following.
+
+  >>>
+    Copyright (C) 2001:: earthian@tama.or.jp, All Rights Reserved.
+    Copyright (C) 2001:: I'O, All Rights Reserved.
+    Copyright (C) 2006:: Project X0213, All Rights Reserved.
+    You can use, modify, distribute this table freely.
+
+[enc/trans/JIS/UCS@BMP%JISX0213-1.src]
+[enc/trans/JIS/UCS@BMP%JISX0213-2.src]
+[enc/trans/JIS/UCS@SIP%JISX0213-1.src]
+[enc/trans/JIS/UCS@SIP%JISX0213-2.src]
+
+  These files are copyrighted as the following.
+
+  >>>
+    Copyright (C) 2001:: earthian@tama.or.jp, All Rights Reserved.
+    Copyright (C) 2001:: I'O, All Rights Reserved.
+    You can use, modify, distribute this table freely.
+
+[enc/trans/ucm/glibc-BIG5-2.3.3.ucm]
+[enc/trans/ucm/glibc-BIG5HKSCS-2.3.3.ucm]
+
+  >>>
+    Copyright (C) 2001-2005:: International Business Machines
+                              Corporation and others.  All Rights Reserved.
+
+[enc/trans/ucm/windows-950-2000.ucm]
+[enc/trans/ucm/windows-950_hkscs-2001.ucm]
+
+  >>>
+    Copyright (C) 2001-2002:: International Business Machines
+                              Corporation and others.  All Rights Reserved.
+
+
+[configure]
 
   This file is free software.
 
-    Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
+  >>>
+    Copyright (C) 1992-1996, 1998-2012:: Free Software Foundation, Inc.
 
     This configure script is free software; the Free Software Foundation
     gives unlimited permission to copy, distribute and modify it.
 
-tool/config.guess:
-tool/config.sub:
+[aclocal.m4]
+
+  This file is free software.
+
+  >>>
+    Copyright (C) 1996-2020:: Free Software Foundation, Inc.
+
+    This file is free software; the Free Software Foundation
+    gives unlimited permission to copy and/or distribute it,
+    with or without modifications, as long as this notice is preserved.
+
+[tool/config.guess]
+[tool/config.sub]
 
   As long as you distribute these files with the file configure, they
   are covered under the Ruby's license.
 
-      Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
-      Free Software Foundation, Inc.
+  >>>
+    Copyright 1992-2018:: Free Software Foundation, Inc.
 
     This file is free software; you can redistribute it and/or modify it
     under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
+    the Free Software Foundation; either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful, but
@@ -119,54 +345,57 @@ tool/config.sub:
     General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+    along with this program; if not, see <https://www.gnu.org/licenses/>.
 
     As a special exception to the GNU General Public License, if you
     distribute this file as part of a program that contains a
     configuration script generated by Autoconf, you may include it under
-    the same distribution terms that you use for the rest of that program.
+    the same distribution terms that you use for the rest of that
+    program.  This Exception is an additional permission under section 7
+    of the GNU General Public License, version 3 ("GPLv3").
 
-parse.c:
+[parse.c]
+[parse.h]
 
-  This file is licensed under the GPL, but is incorporated into Ruby and
+  These files are licensed under the GPL, but are incorporated into Ruby and
   redistributed under the terms of the Ruby license, as permitted by the
   exception to the GPL below.
 
-     Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-     Free Software Foundation, Inc.
+  >>>
+    Copyright (C) 1984, 1989-1990, 2000-2015, 2018:: Free Software Foundation, Inc.
 
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; either version 2, or (at your option)
-     any later version.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-     This program is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-     GNU General Public License for more details.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
-     You should have received a copy of the GNU General Public License
-     along with this program; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.  */
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-  /* As a special exception, you may create a larger work that contains
-     part or all of the Bison parser skeleton and distribute that work
-     under terms of your choice, so long as that work isn't itself a
-     parser generator using the skeleton or a modified version thereof
-     as a parser skeleton.  Alternatively, if you modify or redistribute
-     the parser skeleton itself, you may (at your option) remove this
-     special exception, which will cause the skeleton and the resulting
-     Bison output files to be licensed under the GNU General Public
-     License without this special exception.
+    As a special exception, you may create a larger work that contains
+    part or all of the Bison parser skeleton and distribute that work
+    under terms of your choice, so long as that work isn't itself a
+    parser generator using the skeleton or a modified version thereof
+    as a parser skeleton.  Alternatively, if you modify or redistribute
+    the parser skeleton itself, you may (at your option) remove this
+    special exception, which will cause the skeleton and the resulting
+    Bison output files to be licensed under the GNU General Public
+    License without this special exception.
 
-     This special exception was added by the Free Software Foundation in
-     version 2.2 of Bison.  */
+    This special exception was added by the Free Software Foundation in
+    version 2.2 of Bison.
 
-util.c (partly):
+[missing/dtoa.c]
 
-    Copyright (c) 1991, 2000, 2001 by Lucent Technologies.
+  This file is under these licenses.
+
+  >>>
+    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
@@ -179,71 +408,73 @@ util.c (partly):
     REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
     OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
 
-win32/win32.[ch]:
+  >>>
+    Copyright (c) 2004-2008:: David Schultz <das@FreeBSD.ORG>
+                              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.
+
+[win32/win32.c]
+[include/ruby/win32.h]
 
   You can apply the Artistic License to these files. (or GPL,
   alternatively)
 
-    Copyright (c) 1993, Intergraph Corporation
+  >>>
+    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.
 
-util.c (partly):
-
-   Copyright (c) 2004-2008 David Schultz <das@FreeBSD.ORG>
-   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.
-
-random.c
+[missing/mt19937.c]
 
   This file is under the new-style BSD license.
 
-    A C-program for MT19937, with initialization improved 2002/2/10.
-    Coded by Takuji Nishimura and Makoto Matsumoto.
+  >>>
+    A C-program for MT19937, with initialization improved 2002/2/10.::
+    Coded by Takuji Nishimura and Makoto Matsumoto.  
     This is a faster version by taking Shawn Cokus's optimization,
     Matthe Bellew's simplification, Isaku Wada's real version.
 
     Before using, initialize the state by using init_genrand(seed)
     or init_by_array(init_key, key_length).
 
-    Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
-    All rights reserved.
+    Copyright (C) 1997 - 2002:: Makoto Matsumoto and Takuji Nishimura,
+                                All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions
     are met:
 
-      1. Redistributions of source code must retain the above copyright
-	 notice, this list of conditions and the following disclaimer.
+    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.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
 
-      3. The names of its contributors may not be used to endorse or promote
-	 products derived from this software without specific prior written
-	 permission.
+    3. The names of its contributors may not be used to endorse or promote
+       products derived from this software without specific prior written
+       permission.
 
     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -262,12 +493,15 @@ random.c
     http://www.math.keio.ac.jp/matumoto/emt.html
     email: matumoto@math.keio.ac.jp
 
-vm_dump.c:procstat_vm
+  The Wayback Machine url: http://web.archive.org/web/19990429082237/http://www.math.keio.ac.jp/matumoto/emt.html
+
+[missing/procstat_vm.c]
 
   This file is under the new-style BSD license.
 
-    Copyright (c) 2007 Robert N. M. Watson
-    All rights reserved.
+  >>>
+    Copyright (c) 2007:: Robert N. M. Watson
+                         All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions
@@ -292,181 +526,102 @@ vm_dump.c:procstat_vm
 
     $FreeBSD: head/usr.bin/procstat/procstat_vm.c 261780 2014-02-11 21:57:37Z jhb $
 
-vsnprintf.c:
+[vsnprintf.c]
 
-  This file is under the old-style BSD license.  Note that the
-  paragraph 3 below is now null and void.
+  This file is under the {old-style BSD license}[rdoc-label:label-Old-style+BSD+license].
 
-    Copyright (c) 1990, 1993
-         The Regents of the University of California.  All rights reserved.
+  >>>
+    Copyright (c) 1990, 1993::
+    The Regents of the University of California.  All rights reserved.
 
     This code is derived from software contributed to Berkeley by
     Chris Torek.
 
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:
-    1. Redistributions of source code must retain the above copyright
-       notice, this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-    3. Neither the name of the University nor the names of its contributors
-       may be used to endorse or promote products derived from this software
-       without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-    SUCH DAMAGE.
-
-    IMPORTANT NOTE:
-    --------------
-    From ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
-    paragraph 3 above is now null and void.
-
-st.[ch]:
-missing/alloca.c:
-missing/dup2.c:
-missing/erf.c:
-missing/finite.c:
-missing/hypot.c:
-missing/isinf.c:
-missing/isnan.c:
-missing/lgamma_r.c:
-missing/memcmp.c:
-missing/memmove.c:
-missing/strchr.c:
-missing/strstr.c:
-missing/strtol.c:
-missing/tgamma.c:
-ext/digest/sha1/sha1.[ch]:
+[st.c]
+[strftime.c]
+[include/ruby/st.h]
+[missing/acosh.c]
+[missing/alloca.c]
+[missing/dup2.c]
+[missing/erf.c]
+[missing/finite.c]
+[missing/hypot.c]
+[missing/isinf.c]
+[missing/isnan.c]
+[missing/lgamma_r.c]
+[missing/memcmp.c]
+[missing/memmove.c]
+[missing/strchr.c]
+[missing/strerror.c]
+[missing/strstr.c]
+[missing/tgamma.c]
+[ext/date/date_strftime.c]
+[ext/digest/sha1/sha1.c]
+[ext/digest/sha1/sha1.h]
 
   These files are all under public domain.
 
-missing/crypt.c:
+[missing/crypt.c]
 
-  This file is under the old-style BSD license.  Note that the
-  paragraph 3 below is now null and void.
+  This file is under the {old-style BSD license}[rdoc-label:label-Old-style+BSD+license].
 
-    Copyright (c) 1989, 1993
-    	The Regents of the University of California.  All rights reserved.
+  >>>
+    Copyright (c) 1989, 1993::
+    The Regents of the University of California.  All rights reserved.
 
     This code is derived from software contributed to Berkeley by
     Tom Truscott.
 
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:
-    1. Redistributions of source code must retain the above copyright
-       notice, this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-    3. Neither the name of the University nor the names of its contributors
-       may be used to endorse or promote products derived from this software
-       without specific prior written permission.
+[missing/setproctitle.c]
 
-    THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-    SUCH DAMAGE.
+  This file is under the {old-style BSD license}[rdoc-label:label-Old-style+BSD+license].
 
-missing/setproctitle.c
+  >>>
+    Copyright 2003:: Damien Miller
+    Copyright (c) 1983, 1995-1997:: Eric P. Allman
+    Copyright (c) 1988, 1993::
+    The Regents of the University of California.  All rights reserved.
 
-  This file is under the old-style BSD license.  Note that the
-  paragraph 3 below is now null and void.
+[missing/strlcat.c]
+[missing/strlcpy.c]
 
-    Copyright 2003 Damien Miller
-    Copyright (c) 1983, 1995-1997 Eric P. Allman
-    Copyright (c) 1988, 1993
-    	The Regents of the University of California.  All rights reserved.
+  These files are under an ISC-style license.
 
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:
-    1. Redistributions of source code must retain the above copyright
-       notice, this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-    3. Neither the name of the University nor the names of its contributors
-       may be used to endorse or promote products derived from this software
-       without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-    SUCH DAMAGE.
-
-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.
+  >>>
+    Copyright (c) 1998, 2015:: Todd C. Miller <Todd.Miller@courtesan.com>
 
-    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.
+    Permission to use, copy, modify, and distribute this software for any
+    purpose with or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
 
-    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.
+    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+    MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-missing/langinfo.c
+[missing/langinfo.c]
 
   This file is from http://www.cl.cam.ac.uk/~mgk25/ucs/langinfo.c.
   Ruby uses a modified version. The file contains the following
   author/copyright notice:
 
-  Markus.Kuhn@cl.cam.ac.uk -- 2002-03-11
-  Permission to use, copy, modify, and distribute this software
-  for any purpose and without fee is hereby granted. The author
-  disclaims all warranties with regard to this software.
+  >>>
+    Markus.Kuhn@cl.cam.ac.uk -- 2002-03-11::
+    Permission to use, copy, modify, and distribute this software
+    for any purpose and without fee is hereby granted. The author
+    disclaims all warranties with regard to this software.
 
-ext/digest/md5/md5.[ch]:
+[ext/digest/md5/md5.c]
+[ext/digest/md5/md5.h]
 
   These files are under the following license.  Ruby uses modified
   versions of them.
 
-    Copyright (C) 1999, 2000 Aladdin Enterprises.  All rights reserved.
+  >>>
+    Copyright (C) 1999, 2000:: Aladdin Enterprises.  All rights reserved.
 
     This software is provided 'as-is', without any express or implied
     warranty.  In no event will the authors be held liable for any damages
@@ -487,23 +642,27 @@ ext/digest/md5/md5.[ch]:
     L. Peter Deutsch
     ghost@aladdin.com
 
-ext/digest/rmd160/rmd160.[ch]:
+[ext/digest/rmd160/rmd160.c]
+[ext/digest/rmd160/rmd160.h]
 
   These files have the following copyright information, and by the
   author we are allowed to use it under the new-style BSD license.
 
-    AUTHOR:   Antoon Bosselaers, ESAT-COSIC
+  >>>
+    AUTHOR::  Antoon Bosselaers, ESAT-COSIC
               (Arranged for libc by Todd C. Miller)
-    DATE:     1 March 1996
+    DATE::    1 March 1996
 
-    Copyright (c) Katholieke Universiteit Leuven
+    Copyright (c):: Katholieke Universiteit Leuven
     1996, All Rights Reserved
 
-ext/digest/sha2/sha2.[ch]:
+[ext/digest/sha2/sha2.c]
+[ext/digest/sha2/sha2.h]
 
   These files are under the new-style BSD license.
 
-    Copyright 2000 Aaron D. Gifford.  All rights reserved.
+  >>>
+    Copyright 2000:: Aaron D. Gifford.  All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions
@@ -529,29 +688,123 @@ ext/digest/sha2/sha2.[ch]:
     OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
     SUCH DAMAGE.
 
-ext/nkf/nkf-utf8/config.h:
-ext/nkf/nkf-utf8/nkf.c:
-ext/nkf/nkf-utf8/utf8tbl.c:
+[ext/json/generator/generator.c]
+
+  The file contains the following copyright notice.
+
+  >>>
+    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.
+
+[ext/nkf/nkf-utf8/config.h]
+[ext/nkf/nkf-utf8/nkf.c]
+[ext/nkf/nkf-utf8/utf8tbl.c]
 
   These files are under the following license.  So to speak, it is
   copyrighted semi-public-domain software.
 
-    Copyright (C) 1987, Fujitsu LTD. (Itaru ICHIKAWA)
-       Everyone is permitted to do anything on this program
-       including copying, modifying, improving,
-       as long as you don't try to pretend that you wrote it.
-       i.e., the above copyright notice has to appear in all copies.
-       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)
+
+    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.
+
+[ext/psych]
+[test/psych]
 
-ext/socket/addrinfo.h:
-ext/socket/getaddrinfo.c:
-ext/socket/getnameinfo.c:
+  The files under these directories are under the following license, except for
+  ext/psych/yaml.
+
+  >>>
+    Copyright 2009:: Aaron Patterson, et al.
+
+    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.
+
+[ext/psych/yaml]
+
+  The files under this directory are under the following license.
+
+  >>>
+    Copyright (c) 2006:: Kirill Simonov
+
+    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.
+
+[ext/pty/pty.c]
+
+  >>>
+    C) Copyright 1998:: by Akinori Ito.
+
+    This software may be redistributed freely for this purpose, in full
+    or in part, provided that this entire copyright notice is included
+    on any copies of this software and applications and derivations thereof.
+
+    This software is provided on an "as is" basis, without warranty of any
+    kind, either expressed or implied, as to any matter including, but not
+    limited to warranty of fitness of purpose, or merchantability, or
+    results obtained from use of this software.
+
+[ext/socket/addrinfo.h]
+[ext/socket/getaddrinfo.c]
+[ext/socket/getnameinfo.c]
 
   These files are under the new-style BSD license.
 
-    Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
+  >>>
+    Copyright (C) 1995, 1996, 1997, 1998, and 1999:: WIDE Project.
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
@@ -578,17 +831,221 @@ ext/socket/getnameinfo.c:
     OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
     SUCH DAMAGE.
 
-ext/win32ole/win32ole.c:
+[ext/win32ole/win32ole.c]
 
   You can apply the Artistic License to this file. (or GPL,
   alternatively)
 
-    (c) 1995 Microsoft Corporation. All rights reserved.
+  >>>
+    (c) 1995:: Microsoft Corporation. All rights reserved.
     Developed by ActiveWare Internet Corp., http://www.ActiveWare.com
 
-    Other modifications Copyright (c) 1997, 1998 by Gurusamy Sarathy
+    Other modifications Copyright (c) 1997, 1998:: by Gurusamy Sarathy
     <gsar@umich.edu> and Jan Dubois <jan.dubois@ibm.net>
 
     You may distribute under the terms of either the GNU General Public
     License or the Artistic License, as specified in the README file
     of the Perl distribution.
+
+  The Wayback Machine url: http://web.archive.org/web/19970607104352/http://www.activeware.com:80/
+
+[lib/rdoc/generator/template/darkfish/css/fonts.css]
+
+  This file is licensed under the {SIL Open Font License}[http://scripts.sil.org/OFL].
+
+[spec/mspec]
+[spec/ruby]
+
+  The files under these directories are under the following license.
+
+  >>>
+    Copyright (c) 2008:: Engine Yard, Inc. All rights reserved.
+
+    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.
+
+[lib/rubygems.rb]
+[lib/rubygems]
+[test/rubygems]
+
+  RubyGems is under the following license.
+
+  >>>
+    RubyGems is copyrighted free software by Chad Fowler, Rich Kilmer, Jim
+    Weirich and others.  You can redistribute it and/or modify it under
+    either the terms of the {MIT license}[rdoc-label:label-MIT+License], or the conditions
+    below:
+
+    1. You may make and give away verbatim copies of the source form of the
+       software without restriction, provided that you duplicate all of the
+       original copyright notices and associated disclaimers.
+
+    2. You may modify your copy of the software in any way, provided that
+       you do at least ONE of the following:
+
+       a. place your modifications in the Public Domain or otherwise
+          make them Freely Available, such as by posting said
+          modifications to Usenet or an equivalent medium, or by allowing
+          the author to include your modifications in the software.
+
+       b. use the modified software only within your corporation or
+          organization.
+
+       c. give non-standard executables non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d. make other distribution arrangements with the author.
+
+    3. You may distribute the software in object code or executable
+       form, provided that you do at least ONE of the following:
+
+       a. distribute the executables and library files of the software,
+          together with instructions (in the manual page or equivalent)
+          on where to get the original distribution.
+
+       b. accompany the distribution with the machine-readable source of
+          the software.
+
+       c. give non-standard executables non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d. make other distribution arrangements with the author.
+
+    4. You may modify and include the part of the software into any other
+       software (possibly commercial).
+
+    5. The scripts and library files supplied as input to or produced as
+       output from the software do not automatically fall under the
+       copyright of the software, but belong to whomever generated them,
+       and may be sold commercially, and may be aggregated with this
+       software.
+
+    6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+       IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+       WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+       PURPOSE.
+
+[lib/bundler]
+[lib/bundler.rb]
+[lib/bundler.gemspec]
+[spec/bundler]
+[man/bundle-*,gemfile.*]
+
+  Bundler is under the following license.
+
+  >>>
+    Portions copyright (c) 2010:: Andre Arko
+    Portions copyright (c) 2009:: Engine Yard
+
+    {MIT License}[rdoc-label:label-MIT+License]
+
+[lib/did_you_mean]
+[lib/did_you_mean.rb]
+[test/did_you_mean]
+
+  did_you_mean is under the following license.
+
+  >>>
+    Copyright (c) 2014-2016 Yuki Nishijima
+
+    {MIT License}[rdoc-label:label-MIT+License]
+
+[benchmark/so_ackermann.rb]
+[benchmark/so_array.rb]
+[benchmark/so_binary_trees.rb]
+[benchmark/so_concatenate.rb]
+[benchmark/so_count_words.yml]
+[benchmark/so_exception.rb]
+[benchmark/so_fannkuch.rb]
+[benchmark/so_fasta.rb]
+[benchmark/so_k_nucleotide.yml]
+[benchmark/so_lists.rb]
+[benchmark/so_mandelbrot.rb]
+[benchmark/so_matrix.rb]
+[benchmark/so_meteor_contest.rb]
+[benchmark/so_nbody.rb]
+[benchmark/so_nested_loop.rb]
+[benchmark/so_nsieve.rb]
+[benchmark/so_nsieve_bits.rb]
+[benchmark/so_object.rb]
+[benchmark/so_partial_sums.rb]
+[benchmark/so_pidigits.rb]
+[benchmark/so_random.rb]
+[benchmark/so_reverse_complement.yml]
+[benchmark/so_sieve.rb]
+[benchmark/so_spectralnorm.rb]
+
+  These files are very old copy of then-called "The Great Computer Language
+  Shootout".  LEGAL SITUATION OF THESE FILES ARE UNCLEAR because the original
+  site has been lost.  Upstream diverged to delete several benchmarks listed
+  above.
+
+== MIT License
+>>>
+      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.
+
+== Old-style BSD license
+>>>
+      Redistribution and use in source and binary forms, with or without
+      modification, are permitted provided that the following conditions
+      are met:
+      1. Redistributions of source code must retain the above copyright
+         notice, this list of conditions and the following disclaimer.
+      2. Redistributions in binary form must reproduce the above copyright
+         notice, this list of conditions and the following disclaimer in the
+         documentation and/or other materials provided with the distribution.
+      3. Neither the name of the University nor the names of its contributors
+         may be used to endorse or promote products derived from this software
+         without specific prior written permission.
+
+      THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+      ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+      IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+      ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+      FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+      DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+      OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+      HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+      LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+      OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+      SUCH DAMAGE.
+
+      IMPORTANT NOTE::
+
+      From ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
+      paragraph 3 above is now null and void.
diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index 3550433690..0000000000
--- a/Makefile.in
+++ /dev/null
@@ -1,569 +0,0 @@
-SHELL = /bin/sh
-NULLCMD = @NULLCMD@
-n=$(NULLCMD)
-ECHO1 = $(V:1=$n)
-RUNCMD = $(SHELL)
-CDPATH = .
-CHDIR = @CHDIR@
-exec = exec
-NULL = /dev/null
-PATH_SEPARATOR = @PATH_SEPARATOR@
-
-#### Start of system configuration section. ####
-
-srcdir = @srcdir@
-top_srcdir = $(srcdir)
-hdrdir = $(srcdir)/include
-PLATFORM_DIR = @PLATFORM_DIR@
-
-CC = @CC@
-CPP = @CPP@
-LD = @LD@
-YACC = bison
-PURIFY =
-AUTOCONF = autoconf
-ACLOCAL = aclocal
-CONFIGURE = @CONFIGURE@
-@SET_MAKE@
-MKFILES = @MAKEFILES@
-BASERUBY = @BASERUBY@
-HAVE_BASERUBY = @HAVE_BASERUBY@
-TEST_RUNNABLE = @TEST_RUNNABLE@
-CROSS_COMPILING = @CROSS_COMPILING@
-DOXYGEN = @DOXYGEN@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-sbindir = @sbindir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-datarootdir = @datarootdir@
-datadir = @datadir@
-arch = @arch@
-sitearch = @sitearch@
-sitedir = @sitedir@
-archlibdir = @archlibdir@
-ruby_version = @ruby_version@
-
-TESTUI = console
-TESTS =
-INSTALLDOC = @INSTALLDOC@
-DOCTARGETS = @RDOCTARGET@ @CAPITARGET@
-
-EXTOUT = @EXTOUT@
-arch_hdrdir = $(EXTOUT)/include/$(arch)
-VPATH = $(arch_hdrdir)/ruby:$(hdrdir)/ruby:$(srcdir):$(srcdir)/missing
-
-empty =
-CC_VERSION = @CC_VERSION@
-OUTFLAG = @OUTFLAG@$(empty)
-COUTFLAG = @COUTFLAG@$(empty)
-ARCH_FLAG = @ARCH_FLAG@
-CFLAGS_NO_ARCH = @CFLAGS@
-CFLAGS = $(CFLAGS_NO_ARCH) $(ARCH_FLAG)
-cflags = @cflags@
-optflags = @optflags@
-debugflags = @debugflags@
-warnflags = @warnflags@ @strict_warnflags@
-cppflags = @cppflags@
-INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir)
-XCFLAGS = @XCFLAGS@
-CPPFLAGS = @CPPFLAGS@ $(INCFLAGS)
-LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@
-EXTLDFLAGS = @EXTLDFLAGS@
-XLDFLAGS = @XLDFLAGS@ $(EXTLDFLAGS)
-EXTLIBS =
-LIBS = @LIBS@ $(EXTLIBS)
-MISSING = @LIBOBJS@ @ALLOCA@
-LDSHARED = @LIBRUBY_LDSHARED@
-DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG)
-SOLIBS = @SOLIBS@
-MAINLIBS = @MAINLIBS@
-ARCHMINIOBJS = @MINIOBJS@
-DLNOBJ = @DLNOBJ@
-ENCOBJS = @ENCOBJS@
-EXTOBJS = @EXTOBJS@
-BUILTIN_ENCOBJS = @BUILTIN_ENCOBJS@
-BUILTIN_TRANSSRCS = @BUILTIN_TRANSSRCS@
-BUILTIN_TRANSOBJS = @BUILTIN_TRANSOBJS@
-POSTLINK = @POSTLINK@
-
-RUBY_BASE_NAME=@RUBY_BASE_NAME@
-RUBY_PROGRAM_VERSION=@RUBY_PROGRAM_VERSION@
-RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@
-RUBY_SO_NAME=@RUBY_SO_NAME@
-EXEEXT = @EXEEXT@
-LIBEXT = @LIBEXT@
-PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
-RUBY = $(RUBY_INSTALL_NAME)
-MINIRUBY = @MINIRUBY@\
-	$(MINIRUBYOPT)
-# RUNRUBY_COMMAND:: runruby.rb or baseruby. do not append options directly
-RUNRUBY_COMMAND = @RUNRUBY_COMMAND@
-# RUNRUBY:: run ruby with RUN_OPTS which is passed to ruby
-RUNRUBY = @RUNRUBY@ $(RUN_OPTS)
-# RUNRUBY_DEBUGGER:: debugging option for runruby.rb
-RUNRUBY_DEBUGGER = --debugger='gdb -x run.gdb --quiet --args'
-XRUBY = @XRUBY@
-BTESTRUBY = @BTESTRUBY@\
-	$(MINIRUBYOPT)
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-XRUBY_LIBDIR = @XRUBY_LIBDIR@
-XRUBY_RUBYLIBDIR = @XRUBY_RUBYLIBDIR@
-XRUBY_RUBYHDRDIR = @XRUBY_RUBYHDRDIR@
-BOOTSTRAPRUBY = @BOOTSTRAPRUBY@
-
-#### End of system configuration section. ####
-
-MAJOR=	@MAJOR@
-MINOR=	@MINOR@
-TEENY=	@TEENY@
-RUBY_PROGRAM_VERSION = @RUBY_PROGRAM_VERSION@
-
-LIBRUBY_A     = @LIBRUBY_A@
-LIBRUBY_SO    = @LIBRUBY_SO@
-LIBRUBY_ALIASES= @LIBRUBY_ALIASES@
-LIBRUBY	      = @LIBRUBY@
-LIBRUBYARG    = @LIBRUBYARG@
-LIBRUBYARG_STATIC = @LIBRUBYARG_STATIC@
-LIBRUBYARG_SHARED = @LIBRUBYARG_SHARED@
-LIBRUBY_RELATIVE = @LIBRUBY_RELATIVE@
-LIBRUBY_A_OBJS = @LIBRUBY_A_OBJS@
-
-DTRACE_REBUILD_OBJS = $(DTRACE_REBUILD:yes=$(DTRACE_DEPENDENT_OBJS))
-
-DTRACE_DEPENDENT_OBJS = array.$(OBJEXT) \
-			eval.$(OBJEXT) \
-			gc.$(OBJEXT) \
-			hash.$(OBJEXT) \
-			load.$(OBJEXT) \
-			object.$(OBJEXT) \
-			parse.$(OBJEXT) \
-			string.$(OBJEXT) \
-			symbol.$(OBJEXT) \
-			vm.$(OBJEXT)
-
-THREAD_MODEL  = @THREAD_MODEL@
-
-PREP          = @PREP@
-ARCHFILE      = @ARCHFILE@
-SETUP         =
-EXTSTATIC     = @EXTSTATIC@
-ENCSTATIC     = @ENCSTATIC@
-SET_LC_MESSAGES = env LC_MESSAGES=C
-
-MAKEDIRS      = @MKDIR_P@
-CP            = cp
-MV            = mv
-RM            = rm -f
-RMDIR         = @RMDIR@
-RMDIRS        = @RMDIRS@
-RMALL         = @RMALL@
-NM            = @NM@
-AR            = @AR@
-ARFLAGS       = @ARFLAGS@
-RANLIB        = @RANLIB@
-AS            = @AS@
-ASFLAGS       = @ASFLAGS@ $(INCFLAGS)
-IFCHANGE      = $(srcdir)/tool/ifchange
-SET_LC_MESSAGES = env LC_MESSAGES=C
-OBJDUMP       = @OBJDUMP@
-OBJCOPY       = @OBJCOPY@
-VCS           = @VCS@
-VCSUP         = @VCSUP@
-DTRACE        = @DTRACE@
-DTRACE_EXT    = @DTRACE_EXT@
-DTRACE_OBJ    = @DTRACE_OBJ@
-DTRACE_REBUILD= @DTRACE_REBUILD@
-DTRACE_GLOMMED_OBJ = $(DTRACE_REBUILD:yes=ruby-glommed.$(OBJEXT))
-
-OBJEXT        = @OBJEXT@
-ASMEXT        = S
-DLEXT         = @DLEXT@
-MANTYPE	      = @MANTYPE@
-SYMBOL_PREFIX = @SYMBOL_PREFIX@
-
-INSTALLED_LIST= .installed.list
-
-NEWLINE_C     = enc/trans/newline.c
-MINIPRELUDE_C = miniprelude.c
-PRELUDE_C     = prelude.c
-RBCONFIG      = .rbconfig.time
-
-SRC_FILE      = $<
-OS_SRC_FILE   = $<
-DEST_FILE     = $@
-OS_DEST_FILE  = $@
-
-MESSAGE_BEGIN = @for line in
-MESSAGE_END = ; do echo "$$line"; done
-ECHO_BEGIN = @sep=''; for word in
-ECHO_END = ; do echo @ECHO_N@ "$$sep'$$word'@ECHO_C@"; sep=' '; done; echo
-
-DESTDIR       = @DESTDIR@
-
-configure_args = @configure_args@
-#### End of variables
-
-.SUFFIXES: .inc .h .c .y .i .$(DTRACE_EXT)
-
-all:
-
-# Prevent GNU make v3 from overflowing arg limit on SysV.
-.NOEXPORT:
-
-miniruby$(EXEEXT):
-		@-if test -f $@; then $(MV) -f $@ $@.old; $(RM) $@.old; fi
-		$(ECHO) linking $@
-		$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(MAINLIBS) $(LIBS) $(OUTFLAG)$@
-
-$(PROGRAM):
-		@$(RM) $@
-		$(ECHO) linking $@
-		$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(MAINLIBS) $(LIBS) $(EXTLIBS) $(OUTFLAG)$@
-		$(Q) $(POSTLINK)
-
-# We must `rm' the library each time this rule is invoked because "updating" a
-# MAB library on Apple/NeXT (see --enable-fat-binary in configure) is not
-# supported.
-$(LIBRUBY_A):
-		@$(RM) $@
-		$(ECHO) linking static-library $@
-		$(Q) $(AR) $(ARFLAGS) $@ $(LIBRUBY_A_OBJS) $(INITOBJS)
-		@-$(RANLIB) $@ 2> /dev/null || true
-		$(ECHO) verifying static-library $@
-		@$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)conftest$(EXEEXT)
-		@$(RM) conftest$(EXEEXT) conftest.c
-
-$(LIBRUBY_SO):
-		@-$(PRE_LIBRUBY_UPDATE)
-		$(ECHO) linking shared-library $@
-		$(Q) $(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) $(EXTSOLIBS) $(OUTFLAG)$@
-		-$(Q) $(OBJCOPY) -w -L '$(SYMBOL_PREFIX)Init_*' -L '$(SYMBOL_PREFIX)ruby_static_id_*' \
-			-L '$(SYMBOL_PREFIX)*_threadptr_*' $@
-		$(Q) $(POSTLINK)
-		@-$(MINIRUBY) -e 'ARGV.each{|link| File.delete link rescue nil; \
-						  File.symlink "$(LIBRUBY_SO)", link}' \
-				$(LIBRUBY_ALIASES) || true
-
-ruby_pc = @ruby_pc@
-$(ruby_pc):
-		@./config.status --file=$@:$(srcdir)/template/ruby.pc.in
-
-ruby-runner.h: template/ruby-runner.h.in
-		@./config.status --file=$@:$(srcdir)/template/$(@F).in
-
-ruby-runner$(EXEEXT): ruby-runner.c ruby-runner.h
-	$(Q) $(PURIFY) $(CC) $(CFLAGS) $(CPPFLAGS) -DRUBY_INSTALL_NAME=$(RUBY_INSTALL_NAME) $(LDFLAGS) $(LIBS) $(OUTFLAG)$@ $<
-
-$(RBCONFIG): $(PREP)
-
-rbconfig.rb: $(RBCONFIG)
-
-install-cross: $(arch)-fake.rb $(RBCONFIG) rbconfig.rb $(arch_hdrdir)/ruby/config.h \
-	$(LIBRUBY_A) $(LIBRUBY_SO) $(ARCHFILE)
-	$(ECHO) installing cross-compiling stuff
-	$(Q) $(MAKEDIRS) $(XRUBY_RUBYLIBDIR)/$(arch) $(XRUBY_RUBYHDRDIR)/$(arch)/ruby
-	$(Q) sed '/^\$$:\.unshift/q' $(arch)-fake.rb > fake.rb
-	$(Q) $(BASERUBY) -p \
-	-e '~/^\s*CONFIG\["LDFLAGS"\]/ and' \
-	-e '$$_[/(?=\s*"$$)/] = %q[ #{(CONFIG["LIBPATHFLAG"]%File.dirname(__FILE__)).strip}]' \
-	rbconfig.rb > fake-rbconfig.rb
-	$(INSTALL_SCRIPT) fake.rb $(XRUBY_RUBYLIBDIR)/$(arch)/fake.rb
-	$(INSTALL_SCRIPT) fake-rbconfig.rb $(XRUBY_RUBYLIBDIR)/$(arch)/rbconfig.rb
-	@$(RM) fake.rb fake-rbconfig.rb
-	$(INSTALL_DATA) $(arch_hdrdir)/ruby/config.h $(XRUBY_RUBYHDRDIR)/$(arch)/ruby
-	$(INSTALL_DATA) $(top_srcdir)/include/ruby/win32.h $(XRUBY_RUBYHDRDIR)/ruby
-	$(INSTALL_DATA) $(LIBRUBY) $(LIBRUBY_A) $(XRUBY_RUBYLIBDIR)/$(arch)
-	$(INSTALL_PROGRAM) $(LIBRUBY_SO) $(XRUBY_RUBYLIBDIR)/$(arch)
-
-Makefile:	$(srcdir)/Makefile.in $(srcdir)/enc/Makefile.in
-
-$(MKFILES): config.status $(srcdir)/version.h
-		@[ -f $@ ] && mv $@ $@.old
-		MAKE=$(MAKE) $(SHELL) ./config.status $@
-		@cmp $@ $@.old > /dev/null 2>&1 && echo $@ unchanged && exit 0; \
-		{ \
-		    echo "all:; -@rm -f conftest.mk"; \
-		    echo "conftest.mk: .force; @echo AUTO_REMAKE"; \
-		    echo ".force:"; \
-		} > conftest.mk || exit 1; \
-		$(MAKE) -f conftest.mk | grep '^AUTO_REMAKE$$' >/dev/null 2>&1 || \
-		{ echo "$@ updated, restart."; exit 1; }
-
-uncommon.mk: $(srcdir)/common.mk
-		sed 's/{\$$([^(){}]*)[^{}]*}//g' $< > $@
-
-.PHONY: reconfig
-reconfig-args = $(srcdir)/$(CONFIGURE) $(configure_args)
-config.status-args = ./config.status --recheck
-reconfig-exec-0 = test -t 1 && { CONFIGURE_TTY=yes; export CONFIGURE_TTY; }; exec 3>&1; exit `exec 4>&1; { "$$@" 3>&- 4>&-; echo $$? 1>&4; } | fgrep -v '(cached)' 1>&3 3>&- 4>&-`
-reconfig-exec-1 = set -x; "$$@"
-
-reconfig config.status:	$(srcdir)/$(CONFIGURE) $(srcdir)/enc/Makefile.in \
-			$(srcdir)/include/ruby/version.h
-	@PWD= MINIRUBY="$(MINIRUBY)"; export MINIRUBY; \
-	set $(SHELL) $($@-args); $(reconfig-exec-$(V))
-
-$(srcdir)/$(CONFIGURE): $(srcdir)/configure.in $(srcdir)/aclocal.m4
-	$(CHDIR) $(srcdir) && exec $(AUTOCONF) -o $(@F)
-
-$(srcdir)/aclocal.m4:
-	$(CHDIR) $(srcdir) && \
-	type $(ACLOCAL) >/dev/null 2>&1 && exec $(ACLOCAL); \
-	touch $(@F)
-
-incs: id.h
-all-incs: probes.h
-
-# Things which should be considered:
-# * with gperf v.s. without gperf
-# * committers may have various versions of 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
-# * ext4 and XFS has a mtime with fractional part
-lex.c: defs/keywords
-	@\
-	if cmp -s $(srcdir)/defs/lex.c.src $?; then \
-	  [ $(Q) ] && echo copying $@ || set -x; \
-	  $(CP) $(srcdir)/lex.c.blt $@; \
-	else \
-	  [ $(Q) ] && echo generating $@ || set -x; \
-	  gperf -C -P -p -j1 -i 1 -g -o -t -N rb_reserved_word -k1,3,$$ $? \
-	  | sed 's/(long)&((\(struct stringpool_t\) *\*)0)->\(stringpool_[a-z0-9]*\)/offsetof(\1, \2)/g' \
-	  > $@.tmp && \
-	  $(MV) $@.tmp $@ && \
-	  $(CP) $? $(srcdir)/defs/lex.c.src && \
-	  $(CP) $@ $(srcdir)/lex.c.blt; \
-	fi
-
-NAME2CTYPE_OPTIONS = -7 -c -j1 -i1 -t -C -P -T -H uniname2ctype_hash -Q uniname2ctype_pool -N uniname2ctype_p
-
-enc/unicode/name2ctype.h: enc/unicode/name2ctype.kwd
-	$(MAKEDIRS) $(@D)
-	@set +e; \
-	if cmp -s $(?:.kwd=.src) $?; then \
-	  set -x; \
-	  $(CP) $(?:.kwd=.h.blt) $@; \
-	else \
-	  trap '$(RM) $@-1.h $@-2.h' 0 && \
-	  set -x; \
-	  sed '/^#ifdef USE_UNICODE_PROPERTIES/,/^#endif/d' $? | gperf $(NAME2CTYPE_OPTIONS) > $@-1.h && \
-	  sed '/^#ifdef USE_UNICODE_PROPERTIES/d;/^#endif/d' $? | gperf $(NAME2CTYPE_OPTIONS) > $@-2.h && \
-	  diff -DUSE_UNICODE_PROPERTIES $@-1.h $@-2.h > $@.tmp || :; \
-	  $(MV) $@.tmp $@ && \
-	  $(CP) $? $(?:.kwd=.src) && \
-	  $(CP) $@ $(?:.kwd=.h.blt); \
-	fi
-
-JIS_PROPS_OPTIONS = -k1,3 -7 -c -j1 -i1 -t -C -P -t --ignore-case -H onig_jis_property_hash -Q onig_jis_property_pool -N onig_jis_property
-
-enc/jis/props.h: enc/jis/props.kwd
-	$(MAKEDIRS) $(@D)
-	@set +e; \
-	if cmp -s $(?:.kwd=.src) $?; then \
-	  set -x; \
-	  $(CP) $(?:.kwd=.h.blt) $@; \
-	else \
-	  set -x; \
-	  gperf $(JIS_PROPS_OPTIONS) $? | \
-	  sed 's/(int)(long)&((\([a-zA-Z_0-9 ]*[a-zA-Z_0-9]\) *\*)0)->\([a-zA-Z0-9_]*\),/(char)offsetof(\1, \2),/g' > $@ && \
-	  $(CP) $? $(?:.kwd=.src) && \
-	  $(CP) $@ $(?:.kwd=.h.blt); \
-	fi
-
-.c.@OBJEXT@:
-	@$(ECHO) compiling $<
-	$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $<
-
-.s.@OBJEXT@:
-	@$(ECHO) assembling $<
-	$(Q) $(AS) $(ASFLAGS) -o $@ $<
-
-.c.S:
-	@$(ECHO) translating $<
-	$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -S $<
-
-.c.i:
-	@$(ECHO) preprocessing $<
-	$(Q) $(CPP) $(warnflags) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -E $< > $@
-
-.d.h:
-	@$(ECHO) translating probes $<
-	$(Q) $(DTRACE) -o $@.tmp -h -C $(INCFLAGS) -s $<
-	$(Q) sed -e 's/RUBY_/RUBY_DTRACE_/g' -e 's/PROBES_H_TMP/RUBY_PROBES_H/' -e 's/(char \*/(const char */g' -e 's/, char \*/, const char */g' $@.tmp > $@
-	$(Q) $(RM) $@.tmp
-
-.dmyh.h:
-	@$(ECHO) making dummy $(DEST_FILE)
-	$(Q)echo '#include "$(*F).dmyh"' > $@
-
-probes.stamp: $(DTRACE_REBUILD_OBJS)
-	$(Q) if test -f $@ -o -f probes.$(OBJEXT); then \
-	  $(RM) $(DTRACE_REBUILD_OBJS) $@; \
-	  $(ECHO0) "rebuilding objects which were modified by \"dtrace -G\""; \
-	  $(MAKE) $(DTRACE_REBUILD_OBJS); \
-	fi
-	$(Q) touch $@
-
-probes.@OBJEXT@: $(srcdir)/probes.d $(DTRACE_REBUILD:yes=probes.stamp)
-	@$(ECHO) processing probes in object files
-	$(Q) $(RM) $@
-	$(Q) $(DTRACE) -G -C $(INCFLAGS) -s $(srcdir)/probes.d -o $@ $(DTRACE_REBUILD_OBJS)
-
-# DTrace static library hacks described here:
-# http://mail.opensolaris.org/pipermail/dtrace-discuss/2005-August/000207.html
-ruby-glommed.$(OBJEXT):
-	@$(ECHO) generating a glommed object with DTrace probes for static library
-	$(Q) $(LD) -r -o $@ $(OBJS)
-
-clean-local::
-	$(Q)$(RM) ext/extinit.c ext/extinit.$(OBJEXT) ext/ripper/y.output \
-		enc/encinit.c enc/encinit.$(OBJEXT)
-	-$(Q)$(RM) $(pkgconfig_DATA)
-
-distclean-local::
-	$(Q)$(RM) ext/config.cache $(RBCONFIG) Doxyfile
-	-$(Q)$(RM) run.gdb
-	-$(Q)$(RM) $(INSTALLED_LIST) $(arch_hdrdir)/ruby/config.h verconf.h
-	-$(Q)$(RMDIRS) $(arch_hdrdir)/ruby 2> /dev/null || true
-
-clean-ext distclean-ext realclean-ext::
-	@cd ext 2>/dev/null || exit 0; set dummy `echo "${EXTS}" | tr , ' '`; shift; \
-	test "$$#" = 0 && set .; \
-	set dummy `\
-	    find "$$@" -name Makefile -print | sed 's:^\./::;s:/Makefile$$::' | sort; \
-	`; shift; \
-	cd ..; \
-	for dir do \
-	    echo $(@:-ext=)ing "$$dir"; \
-	    (cd "ext/$$dir" && exec $(MAKE) $(MFLAGS) $(@:-ext=)) && \
-	    case "$@" in \
-	    *distclean-ext*|*realclean-ext*) \
-		$(RMDIRS) "ext/$$dir" 2> /dev/null || true;; \
-	    esac; \
-	done
-	-$(Q)$(RM) ext/extinit.$(OBJEXT)
-
-distclean-ext realclean-ext::
-	-$(Q)$(RM) ext/extinit.c
-	-$(Q)$(RMDIR) ext 2> /dev/null || true
-
-clean-extout:
-
-clean-enc distclean-enc realclean-enc:
-	@test -f "$(ENC_MK)" || exit 0; \
-	echo $(@:-enc=ing) encodings; \
-	exec $(MAKE) -f $(ENC_MK) $(MFLAGS) $(@:-enc=)
-
-ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP)
-	$(ECHO) compiling $@
-	$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c
-
-enc/encinit.$(OBJEXT): enc/encinit.c $(SETUP)
-
-update-src::
-	@$(CHDIR) "$(srcdir)" && LC_TIME=C exec $(VCSUP)
-
-update-download:: update-config_files
-
-after-update:: common-srcs
-
-update-mspec:
-	@$(CHDIR) $(srcdir); \
-	if [ -d spec/mspec ]; then \
-	  echo updating mspec ...; \
-	  $(Q1:0=:) set -x; \
-	  cd spec/mspec && \
-	  exec git pull; \
-	else \
-	  echo retrieving mspec ...; \
-	  $(Q1:0=:) set -x; \
-	  exec git clone $(MSPEC_GIT_URL) spec/mspec; \
-	fi
-	$(Q)cd $(srcdir)/spec/mspec && exec git --no-pager log -1 --oneline
-
-update-rubyspec: update-mspec
-	@$(CHDIR) $(srcdir); \
-	if [ -d spec/rubyspec ]; then \
-	  echo updating rubyspec ...; \
-	  $(Q1:0=:) set -x; \
-	  cd spec/rubyspec && \
-	  exec git pull; \
-	else \
-	  echo retrieving rubyspec ...; \
-	  $(Q1:0=:) set -x; \
-	  exec git clone $(RUBYSPEC_GIT_URL) spec/rubyspec; \
-	fi
-	$(Q)cd $(srcdir)/spec/rubyspec && exec git --no-pager log -1 --oneline
-
-test-rubyspec-precheck:
-	@if [ ! -d $(srcdir)/spec/rubyspec ]; then echo No rubyspec here.  make update-rubyspec first.; exit 1; fi
-
-update-doclie:
-	@$(CHDIR) $(srcdir); \
-	if [ -d coverage/doclie ]; then \
-	  echo updating doclie ...; \
-	  $(Q1:0=:) set -x; \
-	  cd coverage/doclie && \
-	  git fetch && \
-	  exec git checkout $(DOCLIE_GIT_REF); \
-	else \
-	  echo retrieving doclie ...; \
-	  $(Q1:0=:) set -x; \
-	  exec git clone --branch $(DOCLIE_GIT_REF) $(DOCLIE_GIT_URL) coverage/doclie; \
-	fi
-
-update-simplecov-html:
-	@$(CHDIR) $(srcdir); \
-	if [ -d coverage/simplecov-html ]; then \
-	  echo updating simplecov-html ...; \
-	  $(Q1:0=:) set -x; \
-	  cd coverage/simplecov-html && \
-	  git fetch && \
-	  exec git checkout $(SIMPLECOV_HTML_GIT_REF); \
-	else \
-	  echo retrieving simplecov-html ...; \
-	  exec git clone --branch $(SIMPLECOV_HTML_GIT_REF) $(SIMPLECOV_HTML_GIT_URL) coverage/simplecov-html; \
-	fi
-
-update-simplecov:
-	@$(CHDIR) $(srcdir); \
-	if [ -d coverage/simplecov ]; then \
-	  echo updating simplecov ...; \
-	  $(Q1:0=:) set -x; \
-	  cd coverage/simplecov && \
-	  git fetch && \
-	  exec git checkout $(SIMPLECOV_GIT_REF); \
-	else \
-	  echo retrieving simplecov ...; \
-	  $(Q1:0=:) set -x; \
-	  exec git clone --branch $(SIMPLECOV_GIT_REF) $(SIMPLECOV_GIT_URL) coverage/simplecov; \
-	fi
-
-update-coverage: update-simplecov update-simplecov-html update-doclie
-
-INSNS	= opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \
-	  vmtc.inc vm.inc
-
-$(INSNS): $(srcdir)/insns.def vm_opts.h \
-	  $(srcdir)/defs/opt_operand.def $(srcdir)/defs/opt_insn_unif.def \
-	  $(srcdir)/tool/instruction.rb $(srcdir)/tool/insns2vm.rb
-	$(ECHO) generating $@
-	$(Q) $(BASERUBY) -Ku $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@
-
-verconf.h: $(RBCONFIG)
-
-loadpath: verconf.h
-	@$(CPP) $(XCFLAGS) $(CPPFLAGS) $(srcdir)/loadpath.c | \
-	sed -e '1,/^const char ruby_initial_load_paths/d;/;/,$$d' \
-	    -e '/^ /!d;s/ *"\\0"$$//;s/" *"//g'
-
-un-runnable:
-	$(ECHO) cannot make runnable, configure with --enable-load-relative.
-	$(Q) exit 1
diff --git a/NEWS b/NEWS
deleted file mode 100644
index b562ea1a83..0000000000
--- a/NEWS
+++ /dev/null
@@ -1,175 +0,0 @@
-# -*- rdoc -*-
-
-= NEWS for Ruby 2.4.0
-
-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 or Redmine
-(e.g. <tt>https://bugs.ruby-lang.org/issues/$FEATURE_OR_BUG_NUMBER</tt>)
-
-== Changes since the 2.3.0 release
-
-=== Language changes
-
-* Multiple assignment in conditional expression is now allowed.
-  [Feature #10617]
-
-=== Core classes updates (outstanding ones only)
-
-* Array
-
-  * Array#max and Array#min.  [Feature #12172]
-    This may cause a tiny incompatibility: if you redefine
-    Enumerable#max and call max to an Array, your redefinition will be
-    now ignored.  You should also redefine Array#max.
-
-  * Array#sum  [Feature #12217]
-    This is different from Enumerable#sum in that Array#sum doesn't depend on
-    the definition of each method.
-
-* Dir
-
-  * Dir.empty?.  [Feature #10121]
-
-* Enumerable
-
-  * Enumerable#sum  [Feature #12217]
-
-* File
-
-  * File.empty?.  [Feature #9969]
-
-* Float
-
-  * Float#ceil, Float#floor, and Float#truncate now take an optional
-    digits, as well as Float#round.  [Feature #12245]
-
-* Integer
-
-  * Integer#ceil, Integer#floor, and Integer#truncate now take an optional
-    digits, as well as Integer#round.  [Feature #12245]
-
-  * Fixnum and Bignum are unified into Integer  [Feature #12005]
-
-  * Integer#digits for extracting columns of place-value notation [Feature #12447]
-
-* Regexp
-
-  * Regexp#match? [Feature #8110]
-    This returns bool and doesn't save backref.
-
-* String
-
-  * String#upcase, String#downcase, String#capitalize, String#swapcase and
-    their bang variants work for all of Unicode, and are no longer limited
-    to ASCII. Variations are available with options. See the documentation
-    of String#downcase for details. [Feature #10085]
-
-  * String.new(capacity: size) [Feature #12024]
-
-* Symbol
-
-  * Symbol#match now returns MatchData.  [Bug #11991]
-
-  * Symbol#upcase, Symbol#downcase, Symbol#capitalize, and Symbol#swapcase now
-    work for all of Unicode. See the documentation of String#downcase
-    for details. [Feature #10085]
-
-* MatchData
-
-  * MatchData#named_captures [Feature #11999]
-  * MatchData#values_at supports named captures [Feature #9179]
-
-* Thread
-
-  * Thread#report_on_exception and Thread.report_on_exception
-    [Feature #6647]
-
-=== Stdlib updates (outstanding ones only)
-
-* CSV
-
-  * Add a liberal_parsing option. [Feature #11839]
-
-* Logger
-
-	* Allow specifying logger parameters in constructor such
-	  as level, progname, datetime_format, formatter. [Feature #12224]
-	* Add shift_period_suffix option. [Feature #10772]
-
-* optparse
-
-  * Add an into option. [Feature #11191]
-
-=== Compatibility issues (excluding feature bug fixes)
-
-* Array#sum and Enumerable#sum are implemented.  [Feature #12217]
-  Ruby itself has no compatibility problem because Ruby didn't have sum method
-  for arrays before Ruby 2.4.
-  However many third party gems, activesupport, facets, simple_stats, etc,
-  defines sum method.  These implementations are mostly compatible but
-  there are subtle differences.
-  Ruby's sum method should be mostly compatible but it is impossible to
-  be perfectly compatible with all of them.
-
-* Fixnum and Bignum are unified into Integer  [Feature #12005]
-  Fixnum class and Bignum class is removed.
-  Integer class is changed from abstract class to concrete class.
-  For example, 0 is an instance of Integer: 0.class returns Integer.
-  The constants Fixnum and Bignum is bound to Integer.
-  So obj.kind_of?(Fixnum) works as obj.kind_of?(Integer).
-  At C-level, Fixnum object and Bignum object should be distinguished by
-  FIXNUM_P(obj) and RB_TYPE_P(obj, T_BIGNUM).
-  ruby-2.4.0-preview1 (temporally) removes rb_cFixnum and rb_cBignum
-  to check the effect of incompatibility.
-  (rb_cFixnum and rb_cBignum may be defined as rb_cInteger later if
-  compilation failure of extension library is too big problem.)
-
-* String/Symbol#upcase/downcase/swapcase/capitalize(!) now work for all of
-  Unicode, not only for ASCII. [Feature #10085]
-  No change is needed if the data is in ASCII anyway or if the limitation
-  to ASCII was only tolerated while waiting for a more extensive implementation.
-  A change (using the :ascii option) is needed in cases where Unicode data
-  is processed, but the operation has to be limited to ASCII only.
-  A good example of this are internationalized domain names.
-
-=== Stdlib compatibility issues (excluding feature bug fixes)
-
-* Time
-
-  * Time#to_time now preserves timezone.  [Bug #12271]
-
-* DateTime
-
-  * DateTime#to_time now preserves timezone.  [Bug #12189]
-
-* thread
-
-  * the extension library is removed.  Till 2.0 it was a pure ruby script
-    "thread.rb", which has precedence over "thread.so", and has been provided
-    in $LOADED_FEATURES since 2.1.
-
-=== C API updates
-
-* ruby_show_version() will no longer exits the process, if
-  RUBY_SHOW_COPYRIGHT_TO_DIE is set to 0.  This will be the default in
-  the future.
-
-=== Supported platform changes
-
-* FreeBSD < 4 is no longer supported
-
-=== Implementation improvements
-
-* In some condition, `[x, y].max` and `[x, y].min` are optimized
-  so that a temporal array is not created.  The concrete condition is
-  an implementation detail: currently, the array literal must have no
-  splat, must have at least one expression but literal, the length must
-  be <= 0x100, and Array#max and min must not be redefined.  It will work
-  in most casual and real-life use case where it is written with intent
-  to `Math.max(x, y)`.
-
-* Thread deadlock detection now shows their backtrace and dependency. [Feature #8214]
diff --git a/NEWS.md b/NEWS.md
new file mode 100644
index 0000000000..2dcfacb6e2
--- /dev/null
+++ b/NEWS.md
@@ -0,0 +1,820 @@
+# NEWS for Ruby 3.0.0
+
+This document is a list of user visible feature changes
+since the **2.7.0** release, 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 or Redmine
+(e.g. `https://bugs.ruby-lang.org/issues/$FEATURE_OR_BUG_NUMBER`).
+
+## Language changes
+
+* Keyword arguments are now separated from positional arguments.
+  Code that resulted in deprecation warnings in Ruby 2.7 will now
+  result in ArgumentError or different behavior. [[Feature #14183]]
+
+* Procs accepting a single rest argument and keywords are no longer
+  subject to autosplatting.  This now matches the behavior of Procs
+  accepting a single rest argument and no keywords.
+  [[Feature #16166]]
+
+    ```ruby
+    pr = proc{|*a, **kw| [a, kw]}
+
+    pr.call([1])
+    # 2.7 => [[1], {}]
+    # 3.0 => [[[1]], {}]
+
+    pr.call([1, {a: 1}])
+    # 2.7 => [[1], {:a=>1}] # and deprecation warning
+    # 3.0 => [[[1, {:a=>1}]], {}]
+    ```
+
+* Arguments forwarding (`...`) now supports leading arguments.
+  [[Feature #16378]]
+
+    ```ruby
+    def method_missing(meth, ...)
+      send(:"do_#{meth}", ...)
+    end
+    ```
+
+* Pattern matching (`case/in`) is no longer experimental. [[Feature #17260]]
+
+* One-line pattern matching is redesigned.  [EXPERIMENTAL]
+
+    * `=>` is added. It can be used like a rightward assignment.
+      [[Feature #17260]]
+
+        ```ruby
+        0 => a
+        p a #=> 0
+
+        {b: 0, c: 1} => {b:}
+        p b #=> 0
+        ```
+
+    * `in` is changed to return `true` or `false`. [[Feature #17371]]
+
+        ```ruby
+        # version 3.0
+        0 in 1 #=> false
+
+        # version 2.7
+        0 in 1 #=> raise NoMatchingPatternError
+        ```
+
+* Find-pattern is added.  [EXPERIMENTAL]
+  [[Feature #16828]]
+
+    ```ruby
+    case ["a", 1, "b", "c", 2, "d", "e", "f", 3]
+    in [*pre, String => x, String => y, *post]
+      p pre  #=> ["a", 1]
+      p x    #=> "b"
+      p y    #=> "c"
+      p post #=> [2, "d", "e", "f", 3]
+    end
+    ```
+
+* Endless method definition is added.  [EXPERIMENTAL]
+  [[Feature #16746]]
+
+    ```ruby
+    def square(x) = x * x
+    ```
+
+* Interpolated String literals are no longer frozen when
+  `# frozen-string-literal: true` is used. [[Feature #17104]]
+
+* Magic comment `shareable_constant_value` added to freeze constants.
+  See {Magic Comments}[rdoc-ref:doc/syntax/comments.rdoc@Magic+Comments] for more details.
+  [[Feature #17273]]
+
+* A {static analysis}[rdoc-label:label-Static+analysis] foundation is
+  introduced.
+    * {RBS}[rdoc-label:label-RBS] is introduced. It is a type definition
+      language for Ruby programs.
+    * {TypeProf}[rdoc-label:label-TypeProf] is experimentally bundled. It is a
+      type analysis tool for Ruby programs.
+
+* Deprecation warnings are no longer shown by default (since Ruby 2.7.2).
+  Turn them on with `-W:deprecated` (or with `-w` to show other warnings too).
+  [[Feature #16345]]
+
+* $SAFE and $KCODE are now normal global variables with no special behavior.
+  C-API methods related to $SAFE have been removed.
+  [[Feature #16131]] [[Feature #17136]]
+
+* yield in singleton class definitions in methods is now a SyntaxError
+  instead of a warning. yield in a class definition outside of a method
+  is now a SyntaxError instead of a LocalJumpError.  [[Feature #15575]]
+
+* When a class variable is overtaken by the same definition in an
+  ancestor class/module, a RuntimeError is now raised (previously,
+  it only issued a warning in verbose mode).  Additionally, accessing a
+  class variable from the toplevel scope is now a RuntimeError.
+  [[Bug #14541]]
+
+* Assigning to a numbered parameter is now a SyntaxError instead of
+  a warning.
+
+## Command line options
+
+### `--help` option
+
+When the environment variable `RUBY_PAGER` or `PAGER` is present and has
+a non-empty value, and the standard input and output are tty, the `--help`
+option shows the help message via the pager designated by the value.
+[[Feature #16754]]
+
+### `--backtrace-limit` option
+
+The `--backtrace-limit` option limits the maximum length of a backtrace.
+[[Feature #8661]]
+
+## Core classes updates
+
+Outstanding ones only.
+
+* Array
+
+    * The following methods now return Array instances instead of
+      subclass instances when called on subclass instances:
+      [[Bug #6087]]
+
+        * Array#drop
+        * Array#drop_while
+        * Array#flatten
+        * Array#slice!
+        * Array#slice / Array#[]
+        * Array#take
+        * Array#take_while
+        * Array#uniq
+        * Array#*
+
+    * Can be sliced with Enumerator::ArithmeticSequence
+
+        ```ruby
+        dirty_data = ['--', 'data1', '--', 'data2', '--', 'data3']
+        dirty_data[(1..).step(2)] # take each second element
+        # => ["data1", "data2", "data3"]
+        ```
+
+* Binding
+
+    * Binding#eval when called with one argument will use "(eval)"
+      for `__FILE__` and 1 for `__LINE__` in the evaluated code.
+      [[Bug #4352]] [[Bug #17419]]
+
+* ConditionVariable
+
+    * ConditionVariable#wait may now invoke the `block`/`unblock` scheduler
+      hooks in a non-blocking context. [[Feature #16786]]
+
+* Dir
+
+    * Dir.glob and Dir.[] now sort the results by default, and
+      accept the `sort:` keyword option.  [[Feature #8709]]
+
+* ENV
+
+    * ENV.except has been added, which returns a hash excluding the
+      given keys and their values.  [[Feature #15822]]
+
+    * Windows: Read ENV names and values as UTF-8 encoded Strings
+      [[Feature #12650]]
+
+* Encoding
+
+    * Added new encoding IBM720.  [[Feature #16233]]
+
+    * Changed default for Encoding.default_external to UTF-8 on Windows
+      [[Feature #16604]]
+
+* Fiber
+
+    * Fiber.new(blocking: true/false) allows you to create non-blocking
+      execution contexts. [[Feature #16786]]
+
+    * Fiber#blocking? tells whether the fiber is non-blocking. [[Feature #16786]]
+
+    * Fiber#backtrace and Fiber#backtrace_locations provide per-fiber backtrace.
+      [[Feature #16815]]
+
+    * The limitation of Fiber#transfer is relaxed. [[Bug #17221]]
+
+* GC
+
+    * GC.auto_compact= and GC.auto_compact have been added to control
+      when compaction runs.  Setting `auto_compact=` to true will cause
+      compaction to occur during major collections.  At the moment,
+      compaction adds significant overhead to major collections, so please
+      test first!  [[Feature #17176]]
+
+* Hash
+
+    * Hash#transform_keys and Hash#transform_keys! now accept a hash that maps
+      keys to new keys.  [[Feature #16274]]
+
+    * Hash#except has been added, which returns a hash excluding the
+      given keys and their values.  [[Feature #15822]]
+
+* IO
+
+    * IO#nonblock? now defaults to `true`. [[Feature #16786]]
+
+    * IO#wait_readable, IO#wait_writable, IO#read, IO#write and other
+      related methods (e.g. IO#puts, IO#gets) may invoke the scheduler hook
+      `#io_wait(io, events, timeout)` in a non-blocking execution context.
+      [[Feature #16786]]
+
+* Kernel
+
+    * Kernel#clone when called with the `freeze: false` keyword will call
+      `#initialize_clone` with the `freeze: false` keyword.
+      [[Bug #14266]]
+
+    * Kernel#clone when called with the `freeze: true` keyword will call
+      `#initialize_clone` with the `freeze: true` keyword, and will
+      return a frozen copy even if the receiver is unfrozen.
+      [[Feature #16175]]
+
+    * Kernel#eval when called with two arguments will use "(eval)"
+      for `__FILE__` and 1 for `__LINE__` in the evaluated code.
+      [[Bug #4352]]
+
+    * Kernel#lambda now warns if called without a literal block.
+      [[Feature #15973]]
+
+    * Kernel.sleep invokes the scheduler hook `#kernel_sleep(...)` in a
+      non-blocking execution context. [[Feature #16786]]
+
+* Module
+
+    * Module#include and Module#prepend now affect classes and modules
+      that have already included or prepended the receiver, mirroring the
+      behavior if the arguments were included in the receiver before
+      the other modules and classes included or prepended the receiver.
+      [[Feature #9573]]
+
+        ```ruby
+        class C; end
+        module M1; end
+        module M2; end
+        C.include M1
+        M1.include M2
+        p C.ancestors #=> [C, M1, M2, Object, Kernel, BasicObject]
+        ```
+
+    * Module#public, Module#protected, Module#private, Module#public_class_method,
+      Module#private_class_method, toplevel "private" and "public" methods
+      now accept single array argument with a list of method names. [[Feature #17314]]
+
+    * Module#attr_accessor, Module#attr_reader, Module#attr_writer and Module#attr
+      methods now return an array of defined method names as symbols.
+      [[Feature #17314]]
+
+    * Module#alias_method now returns the defined alias as a symbol.
+      [[Feature #17314]]
+
+* Mutex
+
+    * `Mutex` is now acquired per-`Fiber` instead of per-`Thread`. This change
+      should be compatible for essentially all usages and avoids blocking when
+      using a scheduler. [[Feature #16792]]
+
+* Proc
+
+    * Proc#== and Proc#eql? are now defined and will return true for
+      separate Proc instances if the procs were created from the same block.
+      [[Feature #14267]]
+
+* Queue / SizedQueue
+
+    * Queue#pop, SizedQueue#push and related methods may now invoke the
+      `block`/`unblock` scheduler hooks in a non-blocking context.
+      [[Feature #16786]]
+
+* Ractor
+
+    * New class added to enable parallel execution. See rdoc-ref:ractor.md for
+      more details.
+
+* Random
+
+    * `Random::DEFAULT` now refers to the `Random` class instead of being a `Random` instance,
+      so it can work with `Ractor`.
+      [[Feature #17322]]
+
+    * `Random::DEFAULT` is deprecated since its value is now confusing and it is no longer global,
+      use `Kernel.rand`/`Random.rand` directly, or create a `Random` instance with `Random.new` instead.
+      [[Feature #17351]]
+
+
+* String
+
+    * The following methods now return or yield String instances
+      instead of subclass instances when called on subclass instances:
+      [[Bug #10845]]
+
+        * String#*
+        * String#capitalize
+        * String#center
+        * String#chomp
+        * String#chop
+        * String#delete
+        * String#delete_prefix
+        * String#delete_suffix
+        * String#downcase
+        * String#dump
+        * String#each_char
+        * String#each_grapheme_cluster
+        * String#each_line
+        * String#gsub
+        * String#ljust
+        * String#lstrip
+        * String#partition
+        * String#reverse
+        * String#rjust
+        * String#rpartition
+        * String#rstrip
+        * String#scrub
+        * String#slice!
+        * String#slice / String#[]
+        * String#split
+        * String#squeeze
+        * String#strip
+        * String#sub
+        * String#succ / String#next
+        * String#swapcase
+        * String#tr
+        * String#tr_s
+        * String#upcase
+
+* Symbol
+
+    * Symbol#to_proc now returns a lambda Proc.  [[Feature #16260]]
+
+    * Symbol#name has been added, which returns the name of the symbol
+      if it is named.  The returned string is frozen.  [[Feature #16150]]
+
+* Fiber
+
+    * Introduce Fiber.set_scheduler for intercepting blocking operations and
+      Fiber.scheduler for accessing the current scheduler. See
+      rdoc-ref:fiber.md for more details about what operations are supported and
+      how to implement the scheduler hooks. [[Feature #16786]]
+
+    * Fiber.blocking? tells whether the current execution context is
+      blocking. [[Feature #16786]]
+
+    * Thread#join invokes the scheduler hooks `block`/`unblock` in a
+      non-blocking execution context. [[Feature #16786]]
+
+* Thread
+
+    * Thread.ignore_deadlock accessor has been added for disabling the
+      default deadlock detection, allowing the use of signal handlers to
+      break deadlock. [[Bug #13768]]
+
+* Warning
+
+    * Warning#warn now supports a category keyword argument.
+      [[Feature #17122]]
+
+## Stdlib updates
+
+Outstanding ones only.
+
+* BigDecimal
+
+    * Update to BigDecimal 3.0.0
+
+    * This version is Ractor compatible.
+
+* Bundler
+
+    * Update to Bundler 2.2.3
+
+* CGI
+
+    * Update to 0.2.0
+
+    * This version is Ractor compatible.
+
+* CSV
+
+    * Update to CSV 3.1.9
+
+* Date
+
+    * Update to Date 3.1.1
+
+    * This version is Ractor compatible.
+
+* Digest
+
+    * Update to Digest 3.0.0
+
+    * This version is Ractor compatible.
+
+* Etc
+
+    * Update to Etc 1.2.0
+
+    * This version is Ractor compatible.
+
+* Fiddle
+
+    * Update to Fiddle 1.0.5
+
+* IRB
+
+    * Update to IRB 1.2.6
+
+* JSON
+
+    * Update to JSON 2.5.0
+
+    * This version is Ractor compatible.
+
+* Set
+
+    * Update to set 1.0.0
+
+    * SortedSet has been removed for dependency and performance reasons.
+
+    * Set#join is added as a shorthand for `.to_a.join`.
+
+    * Set#<=> is added.
+
+* Socket
+
+    * Add :connect_timeout to TCPSocket.new [[Feature #17187]]
+
+* Net::HTTP
+
+    * Net::HTTP#verify_hostname= and Net::HTTP#verify_hostname have been
+      added to skip hostname verification.  [[Feature #16555]]
+
+    * Net::HTTP.get, Net::HTTP.get_response, and Net::HTTP.get_print
+      can take the request headers as a Hash in the second argument when the
+      first argument is a URI.  [[Feature #16686]]
+
+* Net::SMTP
+
+    * Add SNI support.
+
+    * Net::SMTP.start arguments are keyword arguments.
+
+    * TLS should not check the host name by default.
+
+* OpenStruct
+
+    * Initialization is no longer lazy. [[Bug #12136]]
+
+    * Builtin methods can now be overridden safely. [[Bug #15409]]
+
+    * Implementation uses only methods ending with `!`.
+
+    * Ractor compatible.
+
+    * Improved support for YAML. [[Bug #8382]]
+
+    * Use officially discouraged. Read OpenStruct@Caveats section.
+
+* Pathname
+
+    * Ractor compatible.
+
+* Psych
+
+    * Update to Psych 3.3.0
+
+    * This version is Ractor compatible.
+
+* Reline
+
+    * Update to Reline 0.1.5
+
+* RubyGems
+
+    * Update to RubyGems 3.2.3
+
+* StringIO
+
+    * Update to StringIO 3.0.0
+
+    * This version is Ractor compatible.
+
+* StringScanner
+
+    * Update to StringScanner 3.0.0
+
+    * This version is Ractor compatible.
+
+## Compatibility issues
+
+Excluding feature bug fixes.
+
+* Regexp literals and all Range objects are frozen. [[Feature #8948]] [[Feature #16377]] [[Feature #15504]]
+
+    ```ruby
+    /foo/.frozen? #=> true
+    (42...).frozen? # => true
+    ```
+
+* EXPERIMENTAL: Hash#each consistently yields a 2-element array. [[Bug #12706]]
+
+    * Now `{ a: 1 }.each(&->(k, v) { })` raises an ArgumentError
+      due to lambda's arity check.
+
+* When writing to STDOUT redirected to a closed pipe, no broken pipe
+  error message will be shown now.  [[Feature #14413]]
+
+* `TRUE`/`FALSE`/`NIL` constants are no longer defined.
+
+* Integer#zero? overrides Numeric#zero? for optimization.  [[Misc #16961]]
+
+* Enumerable#grep and Enumerable#grep_v when passed a Regexp and no block no longer modify
+  Regexp.last_match. [[Bug #17030]]
+
+* Requiring 'open-uri' no longer redefines `Kernel#open`.
+  Call `URI.open` directly or `use URI#open` instead. [[Misc #15893]]
+
+* SortedSet has been removed for dependency and performance reasons.
+
+## Stdlib compatibility issues
+
+* Default gems
+
+    * The following libraries are promoted to default gems from stdlib.
+
+        * English
+        * abbrev
+        * base64
+        * drb
+        * debug
+        * erb
+        * find
+        * net-ftp
+        * net-http
+        * net-imap
+        * net-protocol
+        * open-uri
+        * optparse
+        * pp
+        * prettyprint
+        * resolv-replace
+        * resolv
+        * rinda
+        * set
+        * securerandom
+        * shellwords
+        * tempfile
+        * tmpdir
+        * time
+        * tsort
+        * un
+        * weakref
+
+    * The following extensions are promoted to default gems from stdlib.
+
+        * digest
+        * io-nonblock
+        * io-wait
+        * nkf
+        * pathname
+        * syslog
+        * win32ole
+
+* Bundled gems
+
+    * net-telnet and xmlrpc have been removed from the bundled gems.
+      If you are interested in maintaining them, please comment on
+      your plan to https://github.com/ruby/xmlrpc
+      or https://github.com/ruby/net-telnet.
+
+* SDBM has been removed from the Ruby standard library. [[Bug #8446]]
+
+    * The issues of sdbm will be handled at https://github.com/ruby/sdbm
+
+* WEBrick has been removed from the Ruby standard library. [[Feature #17303]]
+
+    * The issues of WEBrick will be handled at https://github.com/ruby/webrick
+
+## C API updates
+
+* C API functions related to $SAFE have been removed.
+  [[Feature #16131]]
+
+* C API header file `ruby/ruby.h` was split. [[GH-2991]]
+
+    This should have no impact on extension libraries,
+    but users might experience slow compilations.
+
+* Memory view interface [EXPERIMENTAL]
+
+    * The memory view interface is a C-API set to exchange a raw memory area,
+      such as a numeric array or a bitmap image, between extension libraries.
+      The extension libraries can share also the metadata of the memory area
+      that consists of the shape, the element format, and so on.
+      Using these kinds of metadata, the extension libraries can share even
+      a multidimensional array appropriately.
+      This feature is designed by referring to Python's buffer protocol.
+      [[Feature #13767]] [[Feature #14722]]
+
+* Ractor related C APIs are introduced (experimental) in "include/ruby/ractor.h".
+
+## Implementation improvements
+
+* New method cache mechanism for Ractor. [[Feature #16614]]
+
+    * Inline method caches pointed from ISeq can be accessed by multiple Ractors
+      in parallel and synchronization is needed even for method caches. However,
+      such synchronization can be overhead so introducing new inline method cache
+      mechanisms, (1) Disposable inline method cache (2) per-Class method cache
+      and (3) new invalidation mechanism. (1) can avoid per-method call
+      synchronization because it only uses atomic operations.
+      See the ticket for more details.
+
+* The number of hashes allocated when using a keyword splat in
+  a method call has been reduced to a maximum of 1, and passing
+  a keyword splat to a method that accepts specific keywords
+  does not allocate a hash.
+
+* `super` is optimized when the same type of method is called in the previous call
+  if it's not refinements or an attr reader or writer.
+
+### JIT
+
+* Performance improvements of JIT-ed code
+
+    * Microarchitectural optimizations
+
+        * Native functions shared by multiple methods are deduplicated on JIT compaction.
+
+        * Decrease code size of hot paths by some optimizations and partitioning cold paths.
+
+    * Instance variables
+
+        * Eliminate some redundant checks.
+
+        * Skip checking a class and a object multiple times in a method when possible.
+
+        * Optimize accesses in some core classes like Hash and their subclasses.
+
+    * Method inlining support for some C methods
+
+        * `Kernel`: `#class`, `#frozen?`
+
+        * `Integer`: `#-@`, `#~`, `#abs`, `#bit_length`, `#even?`, `#integer?`, `#magnitude`,
+          `#odd?`, `#ord`, `#to_i`, `#to_int`, `#zero?`
+
+        * `Struct`: reader methods for 10th or later members
+
+    * Constant references are inlined.
+
+    * Always generate appropriate code for `==`, `nil?`, and `!` calls depending on
+      a receiver class.
+
+    * Reduce the number of PC accesses on branches and method returns.
+
+    * Optimize C method calls a little.
+
+* Compilation process improvements
+
+    * It does not keep temporary files in /tmp anymore.
+
+    * Throttle GC and compaction of JIT-ed code.
+
+    * Avoid GC-ing JIT-ed code when not necessary.
+
+    * GC-ing JIT-ed code is executed in a background thread.
+
+    * Reduce the number of locks between Ruby and JIT threads.
+
+## Static analysis
+
+### RBS
+
+* RBS is a new language for type definition of Ruby programs.
+  It allows writing types of classes and modules with advanced
+  types including union types, overloading, generics, and
+  _interface types_ for duck typing.
+
+* Ruby ships with type definitions for core/stdlib classes.
+
+* `rbs` gem is bundled to load and process RBS files.
+
+### TypeProf
+
+* TypeProf is a type analysis tool for Ruby code based on abstract interpretation.
+
+    * It reads non-annotated Ruby code, tries inferring its type signature, and prints
+      the analysis result in RBS format.
+
+    * Though it supports only a subset of the Ruby language yet, we will continuously
+      improve the coverage of language features, analysis performance, and usability.
+
+```ruby
+# test.rb
+def foo(x)
+  if x > 10
+    x.to_s
+  else
+    nil
+  end
+end
+
+foo(42)
+```
+
+```
+$ typeprof test.rb
+# Classes
+class Object
+  def foo : (Integer) -> String?
+end
+```
+
+## Miscellaneous changes
+
+* Methods using `ruby2_keywords` will no longer keep empty keyword
+  splats, those are now removed just as they are for methods not
+  using `ruby2_keywords`.
+
+* When an exception is caught in the default handler, the error
+  message and backtrace are printed in order from the innermost.
+  [[Feature #8661]]
+
+* Accessing an uninitialized instance variable no longer emits a
+  warning in verbose mode. [[Feature #17055]]
+
+[Bug #4352]:      https://bugs.ruby-lang.org/issues/4352
+[Bug #6087]:      https://bugs.ruby-lang.org/issues/6087
+[Bug #8382]:      https://bugs.ruby-lang.org/issues/8382
+[Bug #8446]:      https://bugs.ruby-lang.org/issues/8446
+[Feature #8661]:  https://bugs.ruby-lang.org/issues/8661
+[Feature #8709]:  https://bugs.ruby-lang.org/issues/8709
+[Feature #8948]:  https://bugs.ruby-lang.org/issues/8948
+[Feature #9573]:  https://bugs.ruby-lang.org/issues/9573
+[Bug #10845]:     https://bugs.ruby-lang.org/issues/10845
+[Bug #12136]:     https://bugs.ruby-lang.org/issues/12136
+[Feature #12650]: https://bugs.ruby-lang.org/issues/12650
+[Bug #12706]:     https://bugs.ruby-lang.org/issues/12706
+[Feature #13767]: https://bugs.ruby-lang.org/issues/13767
+[Bug #13768]:     https://bugs.ruby-lang.org/issues/13768
+[Feature #14183]: https://bugs.ruby-lang.org/issues/14183
+[Bug #14266]:     https://bugs.ruby-lang.org/issues/14266
+[Feature #14267]: https://bugs.ruby-lang.org/issues/14267
+[Feature #14413]: https://bugs.ruby-lang.org/issues/14413
+[Bug #14541]:     https://bugs.ruby-lang.org/issues/14541
+[Feature #14722]: https://bugs.ruby-lang.org/issues/14722
+[Bug #15409]:     https://bugs.ruby-lang.org/issues/15409
+[Feature #15504]: https://bugs.ruby-lang.org/issues/15504
+[Feature #15575]: https://bugs.ruby-lang.org/issues/15575
+[Feature #15822]: https://bugs.ruby-lang.org/issues/15822
+[Misc #15893]:    https://bugs.ruby-lang.org/issues/15893
+[Feature #15921]: https://bugs.ruby-lang.org/issues/15921
+[Feature #15973]: https://bugs.ruby-lang.org/issues/15973
+[Feature #16131]: https://bugs.ruby-lang.org/issues/16131
+[Feature #16150]: https://bugs.ruby-lang.org/issues/16150
+[Feature #16166]: https://bugs.ruby-lang.org/issues/16166
+[Feature #16175]: https://bugs.ruby-lang.org/issues/16175
+[Feature #16233]: https://bugs.ruby-lang.org/issues/16233
+[Feature #16260]: https://bugs.ruby-lang.org/issues/16260
+[Feature #16274]: https://bugs.ruby-lang.org/issues/16274
+[Feature #16345]: https://bugs.ruby-lang.org/issues/16345
+[Feature #16377]: https://bugs.ruby-lang.org/issues/16377
+[Feature #16378]: https://bugs.ruby-lang.org/issues/16378
+[Feature #16555]: https://bugs.ruby-lang.org/issues/16555
+[Feature #16604]: https://bugs.ruby-lang.org/issues/16604
+[Feature #16614]: https://bugs.ruby-lang.org/issues/16614
+[Feature #16686]: https://bugs.ruby-lang.org/issues/16686
+[Feature #16746]: https://bugs.ruby-lang.org/issues/16746
+[Feature #16754]: https://bugs.ruby-lang.org/issues/16754
+[Feature #16786]: https://bugs.ruby-lang.org/issues/16786
+[Feature #16792]: https://bugs.ruby-lang.org/issues/16792
+[Feature #16815]: https://bugs.ruby-lang.org/issues/16815
+[Feature #16828]: https://bugs.ruby-lang.org/issues/16828
+[Misc #16961]:    https://bugs.ruby-lang.org/issues/16961
+[Bug #17030]:     https://bugs.ruby-lang.org/issues/17030
+[Feature #17055]: https://bugs.ruby-lang.org/issues/17055
+[Feature #17104]: https://bugs.ruby-lang.org/issues/17104
+[Feature #17122]: https://bugs.ruby-lang.org/issues/17122
+[Feature #17136]: https://bugs.ruby-lang.org/issues/17136
+[Feature #17176]: https://bugs.ruby-lang.org/issues/17176
+[Feature #17187]: https://bugs.ruby-lang.org/issues/17187
+[Bug #17221]:     https://bugs.ruby-lang.org/issues/17221
+[Feature #17260]: https://bugs.ruby-lang.org/issues/17260
+[Feature #17273]: https://bugs.ruby-lang.org/issues/17273
+[Feature #17303]: https://bugs.ruby-lang.org/issues/17303
+[Feature #17314]: https://bugs.ruby-lang.org/issues/17314
+[Feature #17322]: https://bugs.ruby-lang.org/issues/17322
+[Feature #17351]: https://bugs.ruby-lang.org/issues/17351
+[Feature #17371]: https://bugs.ruby-lang.org/issues/17371
+[Bug #17419]:     https://bugs.ruby-lang.org/issues/17419
+[GH-2991]:        https://github.com/ruby/ruby/pull/2991
diff --git a/README.ja.md b/README.ja.md
index 9d6131e416..6663b94680 100644
--- a/README.ja.md
+++ b/README.ja.md
@@ -1,3 +1,11 @@
+[![Build Status](https://travis-ci.org/ruby/ruby.svg?branch=master)](https://travis-ci.org/ruby/ruby)
+[![Build status](https://ci.appveyor.com/api/projects/status/0sy8rrxut4o0k960/branch/master?svg=true)](https://ci.appveyor.com/project/ruby/ruby/branch/master)
+[![Actions Status](https://github.com/ruby/ruby/workflows/macOS/badge.svg)](https://github.com/ruby/ruby/actions?query=workflow%3A"macOS")
+[![Actions Status](https://github.com/ruby/ruby/workflows/MinGW/badge.svg)](https://github.com/ruby/ruby/actions?query=workflow%3A"MinGW")
+[![Actions Status](https://github.com/ruby/ruby/workflows/MJIT/badge.svg)](https://github.com/ruby/ruby/actions?query=workflow%3A"MJIT")
+[![Actions Status](https://github.com/ruby/ruby/workflows/Ubuntu/badge.svg)](https://github.com/ruby/ruby/actions?query=workflow%3A"Ubuntu")
+[![Actions Status](https://github.com/ruby/ruby/workflows/Windows/badge.svg)](https://github.com/ruby/ruby/actions?query=workflow%3A"Windows")
+
 # Rubyとは
 
 Rubyはシンプルかつ強力なオブジェクト指向スクリプト言語です． Rubyは純粋なオブジェクト指向言語として設計されているので，
@@ -10,83 +18,86 @@ Rubyはテキスト処理関係の能力などに優れ，Perlと同じくらい
 
 *   シンプルな文法
 *   普通のオブジェクト指向機能(クラス，メソッドコールなど)
-*   特殊なオブジェクト指向機能(Mixin, 特異メソッドなど)
+*   特殊なオブジェクト指向機能(Mixin，特異メソッドなど)
 *   演算子オーバーロード
 *   例外処理機能
 *   イテレータとクロージャ
 *   ガーベージコレクタ
 *   ダイナミックローディング (アーキテクチャによる)
-*   移植性が高い．多くのUnix-like/POSIX互換プラットフォーム上で動くだけでなく，Windows， Mac OS
-    X，BeOSなどの上でも動く cf.
-    http://bugs.ruby-lang.org/projects/ruby-trunk/wiki/SupportedPlatformsJa
+*   移植性が高い．多くのUnix-like/POSIX互換プラットフォーム上で動くだけでなく，Windows， macOS，
+    Haikuなどの上でも動く cf.
+    https://github.com/ruby/ruby/blob/master/doc/contributing.rdoc#platform-maintainers
 
 
 ## 入手法
 
-### FTPで
+サードパーティーツールを使った方法を含むRubyのインストール方法の一覧は
+
+https://www.ruby-lang.org/ja/downloads/
+
+を参照してください．
 
-以下の場所においてあります．
+### Git
 
-ftp://ftp.ruby-lang.org/pub/ruby/
+ミラーをGitHubに公開しています． 以下のコマンドでリポジトリを取得できます．
 
-### Subversionで
+    $ git clone https://github.com/ruby/ruby.git
 
-開発先端のソースコードは次のコマンドで取得できます．
+他のブランチの一覧は次のコマンドで見られます．
 
-    $ svn co http://svn.ruby-lang.org/repos/ruby/trunk/ ruby
+    $ git ls-remote https://github.com/ruby/ruby.git
 
-他に開発中のブランチの一覧は次のコマンドで見られます．
+Rubyリポジトリの本来のmasterは https://git.ruby-lang.org/ruby.git にあります．
+コミッタはこちらを使います．
 
-    $ svn ls http://svn.ruby-lang.org/repos/ruby/branches/
+### Subversion
 
-### Gitで
+古いRubyのバージョンのソースコードは次のコマンドでも取得できます．
 
-SubversionのミラーをGitHubに公開しています． 以下のコマンドでリポジトリを取得できます．
+    $ svn co https://svn.ruby-lang.org/repos/ruby/branches/ruby_2_6/ ruby
+
+他のブランチの一覧は次のコマンドで見られます．
+
+    $ svn ls https://svn.ruby-lang.org/repos/ruby/branches/
 
-    $ git clone git://github.com/ruby/ruby.git
 
 ## ホームページ
 
 RubyのホームページのURLは
 
-http://www.ruby-lang.org/
+https://www.ruby-lang.org/
 
 です．
 
 ## メーリングリスト
 
-Rubyのメーリングリストがあります．参加希望の方は
-
-mailto:ruby-list-request@ruby-lang.org
-
-まで本文に
+Rubyのメーリングリストがあります．参加希望の方は [ruby-list-request@ruby-lang.org] まで本文に
 
     subscribe
 
 と書いて送って下さい．
 
-Ruby開発者向けメーリングリストもあります．こちらではrubyのバグ，将来の仕様拡張など実装上の問題について議論されています． 参加希望の方は
-
-mailto:ruby-dev-request@ruby-lang.org
-
-までruby-listと同様の方法でメールしてください．
+Ruby開発者向けメーリングリストもあります．こちらではrubyのバグ，将来の仕様拡張など実装上の問題について議論されています．
+参加希望の方は [ruby-dev-request@ruby-lang.org] までruby-listと同様の方法でメールしてください．
 
 Ruby拡張モジュールについて話し合うruby-extメーリングリストと数学関係の話題について話し合うruby-mathメーリングリストと
 英語でrubyについて話し合うruby-talkメーリングリストもあります．参加方法はどれも同じです．
 
+[ruby-list-request@ruby-lang.org]: mailto:ruby-list-request@ruby-lang.org?subject=Join%20Ruby%20Mailing%20List&body=subscribe
+[ruby-dev-request@ruby-lang.org]: mailto:ruby-dev-request@ruby-lang.org?subject=Join%20Ruby%20Mailing%20List&body=subscribe
+
 ## コンパイル・インストール
 
 以下の手順で行ってください．
 
-1.  もし `configure` ファイルが見つからない，もしくは `configure.in` より古いようなら， `autoconf` を実行して
-    新しく `configure` を生成する
+1.  (Gitリポジトリから取得したソースをビルドする場合) `./autogen.sh` を実行して新しく `configure` を生成する
 
 2.  `configure` を実行して `Makefile` などを生成する
 
     環境によってはデフォルトのCコンパイラ用オプションが付きます． `configure` オプションで `optflags=..`
     `warnflags=..` 等で上書きできます．
 
-3.  (必要ならば)`defines.h` を編集する
+3.  (必要ならば)`include/ruby/defines.h` を編集する
 
     多分，必要無いと思います．
 
@@ -95,7 +106,8 @@ Ruby拡張モジュールについて話し合うruby-extメーリングリス�
     `ext/Setup` に記述したモジュールは静的にリンクされます．
 
     ダイナミックローディングをサポートしていないアーキテクチャでは `Setup` の1行目の「`option nodynamic`」という行のコ
-    メントを外す必要があります．また，このアーキテクチャで拡張モジュールを利用するためには，あらかじめ静的にリンクをしておく必要があります．
+    メントを外す必要があります．
+    また，このアーキテクチャで拡張モジュールを利用するためには，あらかじめ静的にリンクをしておく必要があります．
 
 5.  `make` を実行してコンパイルする
 
@@ -156,9 +168,9 @@ UNIXであれば `configure` がほとんどの差異を吸収してくれるは
 ## フィードバック
 
 Rubyに関する質問は Ruby-Talk（英語）や Ruby-List（日本語） (https://www.ruby-lang.org/ja/community/mailing-lists) や，
-stackoverflow (http://ja.stackoverflow.com/) などのWebサイトに投稿してください．
+stackoverflow (https://ja.stackoverflow.com/) などのWebサイトに投稿してください．
 
-バグ報告は http://bugs.ruby-lang.org で受け付けています．
+バグ報告は https://bugs.ruby-lang.org で受け付けています．
 
 
 ## 著者
@@ -166,6 +178,3 @@ stackoverflow (http://ja.stackoverflow.com/) などのWebサイトに投稿し�
 Rubyのオリジナル版は，1995年にまつもとゆきひろ氏によって設計・開発されました．
 
 <mailto:matz@ruby-lang.org>
-
----
-created at: Thu Aug  3 11:57:36 JST 1995
diff --git a/README.md b/README.md
index f79ba9c718..bd7c7813a7 100644
--- a/README.md
+++ b/README.md
@@ -1,26 +1,31 @@
-[![Build Status](https://travis-ci.org/ruby/ruby.svg)](https://travis-ci.org/ruby/ruby)
-[![Build status](https://ci.appveyor.com/api/projects/status/0sy8rrxut4o0k960/branch/trunk?svg=true)](https://ci.appveyor.com/project/ruby/ruby/branch/trunk)
+[![Build Status](https://travis-ci.org/ruby/ruby.svg?branch=master)](https://travis-ci.org/ruby/ruby)
+[![Build status](https://ci.appveyor.com/api/projects/status/0sy8rrxut4o0k960/branch/master?svg=true)](https://ci.appveyor.com/project/ruby/ruby/branch/master)
+[![Actions Status](https://github.com/ruby/ruby/workflows/macOS/badge.svg)](https://github.com/ruby/ruby/actions?query=workflow%3A"macOS")
+[![Actions Status](https://github.com/ruby/ruby/workflows/MinGW/badge.svg)](https://github.com/ruby/ruby/actions?query=workflow%3A"MinGW")
+[![Actions Status](https://github.com/ruby/ruby/workflows/MJIT/badge.svg)](https://github.com/ruby/ruby/actions?query=workflow%3A"MJIT")
+[![Actions Status](https://github.com/ruby/ruby/workflows/Ubuntu/badge.svg)](https://github.com/ruby/ruby/actions?query=workflow%3A"Ubuntu")
+[![Actions Status](https://github.com/ruby/ruby/workflows/Windows/badge.svg)](https://github.com/ruby/ruby/actions?query=workflow%3A"Windows")
 
 # What's Ruby
 
-Ruby is the interpreted scripting language for quick and easy object-oriented
-programming.  It has many features to process text files and to do system
-management tasks (as in Perl).  It is simple, straight-forward, and
-extensible.
+Ruby is an interpreted object-oriented programming language often
+used for web development. It also offers many scripting features
+to process plain text and serialized files, or manage system tasks.
+It is simple, straightforward, and extensible.
 
 ## Features of Ruby
 
 *   Simple Syntax
 *   **Normal** Object-oriented Features (e.g. class, method calls)
-*   **Advanced** Object-oriented Features (e.g. Mix-in, Singleton-method)
+*   **Advanced** Object-oriented Features (e.g. mix-in, singleton-method)
 *   Operator Overloading
 *   Exception Handling
 *   Iterators and Closures
 *   Garbage Collection
 *   Dynamic Loading of Object Files (on some architectures)
 *   Highly Portable (works on many Unix-like/POSIX compatible platforms as
-    well as Windows, Mac OS X, BeOS, etc.) cf.
-    http://bugs.ruby-lang.org/projects/ruby-trunk/wiki/SupportedPlatforms
+    well as Windows, macOS, etc.) cf.
+    https://github.com/ruby/ruby/blob/master/doc/contributing.rdoc#label-Platform+Maintainers
 
 
 ## How to get Ruby
@@ -28,63 +33,64 @@ extensible.
 For a complete list of ways to install Ruby, including using third-party tools
 like rvm, see:
 
-http://www.ruby-lang.org/en/downloads/
+https://www.ruby-lang.org/en/downloads/
 
-The Ruby distribution files can be found on the following FTP site:
+### Git
 
-ftp://ftp.ruby-lang.org/pub/ruby/
+The mirror of the Ruby source tree can be checked out with the following command:
 
-The trunk of the Ruby source tree can be checked out with the following
-command:
+    $ git clone https://github.com/ruby/ruby.git
 
-    $ svn co http://svn.ruby-lang.org/repos/ruby/trunk/ ruby
+There are some other branches under development. Try the following command
+to see the list of branches:
 
-Or if you are using git then use the following command:
+    $ git ls-remote https://github.com/ruby/ruby.git
 
-    $ git clone git://github.com/ruby/ruby.git
+You may also want to use https://git.ruby-lang.org/ruby.git (actual master of Ruby source)
+if you are a committer.
 
-There are some other branches under development.  Try the following command
-to see the list of branches:
+### Subversion
 
-    $ svn ls http://svn.ruby-lang.org/repos/ruby/branches/
+Stable branches for older Ruby versions can be checked out with also the
+following command:
 
-Or if you are using git then use the following command:
+    $ svn co https://svn.ruby-lang.org/repos/ruby/branches/ruby_2_6/ ruby
 
-    $ git ls-remote git://github.com/ruby/ruby.git
+Try the following command to see the list of branches:
 
-## Ruby home page
+    $ svn ls https://svn.ruby-lang.org/repos/ruby/branches/
 
-The URL of the Ruby home page is:
 
-http://www.ruby-lang.org/
+## Ruby home page
+
+https://www.ruby-lang.org/
 
 ## Mailing list
 
-There is a mailing list to talk about Ruby. To subscribe to this list, please
+There is a mailing list to discuss Ruby. To subscribe to this list, please
 send the following phrase:
 
     subscribe
 
-in the mail body (not subject) to the address
-<mailto:ruby-talk-request@ruby-lang.org>.
+in the mail body (not subject) to the address [ruby-talk-request@ruby-lang.org].
 
-## How to compile and install
+[ruby-talk-request@ruby-lang.org]: mailto:ruby-talk-request@ruby-lang.org?subject=Join%20Ruby%20Mailing%20List&body=subscribe
 
-This is what you need to do to compile and install Ruby:
+## How to compile and install
 
-1.  If you want to use Microsoft Visual C++ to compile ruby, read
-    win32/README.win32 instead of this document.
+1.  If you want to use Microsoft Visual C++ to compile Ruby, read
+    [win32/README.win32](win32/README.win32) instead of this document.
 
-2.  If `./configure` does not exist or is older than configure.in, run
-    `autoconf` to (re)generate configure.
+2.  Run `./autogen.sh` to generate configure, when you build the source checked
+    out from the Git repository.
 
 3.  Run `./configure`, which will generate `config.h` and `Makefile`.
 
     Some C compiler flags may be added by default depending on your
-    environment.  Specify `optflags=..` and `warnflags=..` as necessary to
+    environment. Specify `optflags=..` and `warnflags=..` as necessary to
     override them.
 
-4.  Edit `defines.h` if you need. Usually this step will not be needed.
+4.  Edit `include/ruby/defines.h` if you need. Usually this step will not be needed.
 
 5.  Remove comment mark(`#`) before the module names from `ext/Setup` (or add
     module names if not present), if you want to link modules statically.
@@ -97,11 +103,14 @@ This is what you need to do to compile and install Ruby:
 
 6.  Run `make`.
 
+    * On Mac, set RUBY\_CODESIGN environment variable with a signing identity.
+      It uses the identity to sign `ruby` binary. See also codesign(1).
+
 7.  Optionally, run '`make check`' to check whether the compiled Ruby
     interpreter works well. If you see the message "`check succeeded`", your
-    ruby works as it should (hopefully).
+    Ruby works as it should (hopefully).
 
-8.  Run '`make install`'
+8.  Run '`make install`'.
 
     This command will create the following directories and install files into
     them.
@@ -130,10 +139,9 @@ This is what you need to do to compile and install Ruby:
     **NOTE**: teeny of the API version may be different from one of Ruby's
     program version
 
-    You may have to be a super user to install ruby.
+    You may have to be a super user to install Ruby.
 
-
-If you fail to compile ruby, please send the detailed error report with the
+If you fail to compile Ruby, please send the detailed error report with the
 error log and machine/OS type, to help others.
 
 Some extension libraries may not get compiled because of lack of necessary
@@ -147,21 +155,19 @@ See the file [COPYING](COPYING).
 ## Feedback
 
 Questions about the Ruby language can be asked on the Ruby-Talk mailing list
-(http://www.ruby-lang.org/en/community/mailing-lists) or on websites like
-(http://stackoverflow.com).
+(https://www.ruby-lang.org/en/community/mailing-lists) or on websites like
+(https://stackoverflow.com).
 
-Bug reports should be filed at http://bugs.ruby-lang.org. Read [HowToReport] for more information.
+Bugs should be reported at https://bugs.ruby-lang.org. Read [HowToReport] for more information.
 
 [HowToReport]: https://bugs.ruby-lang.org/projects/ruby/wiki/HowToReport
 
-##Contributing
+## Contributing
 
 See the file [CONTRIBUTING.md](CONTRIBUTING.md)
 
-
 ## The Author
 
-Ruby was originally designed and developed by Yukihiro Matsumoto (Matz) in
-1995.
+Ruby was originally designed and developed by Yukihiro Matsumoto (Matz) in 1995.
 
-<mailto:matz@ruby-lang.org>
+<matz@ruby-lang.org>
diff --git a/acinclude.m4 b/acinclude.m4
deleted file mode 100644
index 99b24e6d93..0000000000
--- a/acinclude.m4
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- autoconf -*-
-
-AC_DEFUN([_COLORIZE_RESULT_PREPARE], [
-    msg_checking= msg_result_yes= msg_result_no= msg_result_other= msg_reset=
-    AS_IF([test "x${CONFIGURE_TTY}" = xyes -o -t 1], [
-	msg_begin="`tput smso 2>/dev/null`"
-	AS_CASE(["$msg_begin"], ['@<:@'*m],
-	    [msg_begin="`echo "$msg_begin" | sed ['s/[0-9]*m$//']`"
-	    msg_checking="${msg_begin}33m"
-	    AS_IF([test ${TEST_COLORS:+set}], [
-		msg_result_yes=[`expr ":$TEST_COLORS:" : ".*:pass=\([^:]*\):"`]
-		msg_result_no=[`expr ":$TEST_COLORS:" : ".*:fail=\([^:]*\):"`]
-		msg_result_other=[`expr ":$TEST_COLORS:" : ".*:skip=\([^:]*\):"`]
-	    ])
-	    msg_result_yes="${msg_begin}${msg_result_yes:-32;1}m"
-	    msg_result_no="${msg_begin}${msg_result_no:-31;1}m"
-	    msg_result_other="${msg_begin}${msg_result_other:-33;1}m"
-	    msg_reset="${msg_begin}m"
-	    ])
-	AS_UNSET(msg_begin)
-	])
-    AS_REQUIRE_SHELL_FN([colorize_result],
-	[AS_FUNCTION_DESCRIBE([colorize_result], [MSG], [Colorize result])],
-        [AS_CASE(["$[]1"],
-            [yes], [AS_ECHO(["${msg_result_yes}$[]1${msg_reset}]")],
-            [no], [AS_ECHO(["${msg_result_no}$[]1${msg_reset}]")],
-            [AS_ECHO(["${msg_result_other}$[]1${msg_reset}]")])])
-])
-
-AC_DEFUN([COLORIZE_RESULT], [AC_REQUIRE([_COLORIZE_RESULT_PREPARE])dnl
-    AS_LITERAL_IF([$1],
-	[m4_case([$1],
-		[yes], [AS_ECHO(["${msg_result_yes}$1${msg_reset}"])],
-		[no], [AS_ECHO(["${msg_result_no}$1${msg_reset}"])],
-		[AS_ECHO(["${msg_result_other}$1${msg_reset}"])])],
-	[colorize_result "$1"]) dnl
-])
-
-AC_DEFUN([AC_CHECKING],[dnl
-AC_REQUIRE([_COLORIZE_RESULT_PREPARE])dnl
-AS_MESSAGE([checking ${msg_checking}$1${msg_reset}...])])
-
-AC_DEFUN([AC_MSG_RESULT], [dnl
-{ _AS_ECHO_LOG([result: $1])
-COLORIZE_RESULT([$1]); dnl
-}])
diff --git a/aclocal.m4 b/aclocal.m4
index 56e944be8f..e69de29bb2 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,15 +0,0 @@
-# generated automatically by aclocal 1.15 -*- Autoconf -*-
-
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
-
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
-m4_include([acinclude.m4])
diff --git a/addr2line.c b/addr2line.c
index a20e5000c4..0029cffbca 100644
--- a/addr2line.c
+++ b/addr2line.c
@@ -8,14 +8,26 @@
 
 **********************************************************************/
 
-#include "ruby/config.h"
+#if defined(__clang__)
+#pragma clang diagnostic ignored "-Wgnu-empty-initializer"
+#pragma clang diagnostic ignored "-Wgcc-compat"
+#endif
+
+#include "ruby/internal/config.h"
+#include "ruby/defines.h"
 #include "ruby/missing.h"
 #include "addr2line.h"
 
 #include <stdio.h>
 #include <errno.h>
 
-#ifdef USE_ELF
+#ifdef HAVE_LIBPROC_H
+#include <libproc.h>
+#endif
+
+#include "ruby/internal/stdbool.h"
+
+#if defined(USE_ELF) || defined(HAVE_MACH_O_LOADER_H)
 
 #include <fcntl.h>
 #include <limits.h>
@@ -28,12 +40,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#ifdef __OpenBSD__
-#include <elf_abi.h>
-#else
-#include <elf.h>
-#endif
-
 /* Make alloca work the best possible way.  */
 #ifdef __GNUC__
 # ifndef alloca
@@ -57,24 +63,20 @@ void *alloca();
 # include <dlfcn.h>
 #endif
 
-#define DW_LNS_copy                     0x01
-#define DW_LNS_advance_pc               0x02
-#define DW_LNS_advance_line             0x03
-#define DW_LNS_set_file                 0x04
-#define DW_LNS_set_column               0x05
-#define DW_LNS_negate_stmt              0x06
-#define DW_LNS_set_basic_block          0x07
-#define DW_LNS_const_add_pc             0x08
-#define DW_LNS_fixed_advance_pc         0x09
-#define DW_LNS_set_prologue_end         0x0a /* DWARF3 */
-#define DW_LNS_set_epilogue_begin       0x0b /* DWARF3 */
-#define DW_LNS_set_isa                  0x0c /* DWARF3 */
+#ifdef HAVE_MACH_O_LOADER_H
+# include <crt_externs.h>
+# include <mach-o/fat.h>
+# include <mach-o/loader.h>
+# include <mach-o/nlist.h>
+# include <mach-o/stab.h>
+#endif
 
-/* Line number extended opcode name. */
-#define DW_LNE_end_sequence             0x01
-#define DW_LNE_set_address              0x02
-#define DW_LNE_define_file              0x03
-#define DW_LNE_set_discriminator        0x04  /* DWARF4 */
+#ifdef USE_ELF
+# ifdef __OpenBSD__
+#  include <elf_abi.h>
+# else
+#  include <elf.h>
+# endif
 
 #ifndef ElfW
 # if SIZEOF_VOIDP == 8
@@ -90,13 +92,44 @@ void *alloca();
 #  define ELF_ST_TYPE ELF32_ST_TYPE
 # endif
 #endif
+#endif
+
+#ifdef SHF_COMPRESSED
+# if defined(ELFCOMPRESS_ZLIB) && defined(HAVE_LIBZ)
+   /* FreeBSD 11.0 lacks ELFCOMPRESS_ZLIB */
+#  include <zlib.h>
+#  define SUPPORT_COMPRESSED_DEBUG_LINE
+# endif
+#else /* compatibility with glibc < 2.22 */
+# define SHF_COMPRESSED 0
+#endif
+
 #ifndef PATH_MAX
 #define PATH_MAX 4096
 #endif
 
-int kprintf(const char *fmt, ...);
+#define DW_LNS_copy                     0x01
+#define DW_LNS_advance_pc               0x02
+#define DW_LNS_advance_line             0x03
+#define DW_LNS_set_file                 0x04
+#define DW_LNS_set_column               0x05
+#define DW_LNS_negate_stmt              0x06
+#define DW_LNS_set_basic_block          0x07
+#define DW_LNS_const_add_pc             0x08
+#define DW_LNS_fixed_advance_pc         0x09
+#define DW_LNS_set_prologue_end         0x0a /* DWARF3 */
+#define DW_LNS_set_epilogue_begin       0x0b /* DWARF3 */
+#define DW_LNS_set_isa                  0x0c /* DWARF3 */
 
-typedef struct {
+/* Line number extended opcode name. */
+#define DW_LNE_end_sequence             0x01
+#define DW_LNE_set_address              0x02
+#define DW_LNE_define_file              0x03
+#define DW_LNE_set_discriminator        0x04  /* DWARF4 */
+
+PRINTF_ARGS(static int kprintf(const char *fmt, ...), 1, 2);
+
+typedef struct line_info {
     const char *dirname;
     const char *filename;
     const char *path; /* object path */
@@ -105,19 +138,56 @@ typedef struct {
     uintptr_t base_addr;
     uintptr_t saddr;
     const char *sname; /* function name */
+
+    struct line_info *next;
 } line_info_t;
-typedef struct obj_info obj_info_t;
-struct obj_info {
+
+struct dwarf_section {
+    char *ptr;
+    size_t size;
+    uint64_t flags;
+};
+
+typedef struct obj_info {
     const char *path; /* object path */
-    int fd;
-    void *mapped;
+    char *mapped;
     size_t mapped_size;
+    void *uncompressed;
     uintptr_t base_addr;
-    obj_info_t *next;
+    uintptr_t vmaddr;
+    struct dwarf_section debug_abbrev;
+    struct dwarf_section debug_info;
+    struct dwarf_section debug_line;
+    struct dwarf_section debug_ranges;
+    struct dwarf_section debug_str;
+    struct obj_info *next;
+} obj_info_t;
+
+#define DWARF_SECTION_COUNT 5
+
+static struct dwarf_section *
+obj_dwarf_section_at(obj_info_t *obj, int n)
+{
+    struct dwarf_section *ary[] = {
+        &obj->debug_abbrev,
+        &obj->debug_info,
+        &obj->debug_line,
+        &obj->debug_ranges,
+        &obj->debug_str
+    };
+    if (n < 0 || DWARF_SECTION_COUNT <= n) {
+        abort();
+    }
+    return ary[n];
+}
+
+struct debug_section_definition {
+    const char *name;
+    struct dwarf_section *dwarf;
 };
 
 /* Avoid consuming stack as this module may be used from signal handler */
-static char binary_filename[PATH_MAX];
+static char binary_filename[PATH_MAX + 1];
 
 static unsigned long
 uleb128(char **p)
@@ -177,8 +247,7 @@ get_nth_dirname(unsigned long dir, char *p)
 }
 
 static void
-fill_filename(int file, char *include_directories, char *filenames,
-	      line_info_t *line)
+fill_filename(int file, char *include_directories, char *filenames, line_info_t *line, obj_info_t *obj)
 {
     int i;
     char *p = filenames;
@@ -188,8 +257,8 @@ fill_filename(int file, char *include_directories, char *filenames,
 	filename = p;
 	if (!*p) {
 	    /* Need to output binary file name? */
-	    kprintf("Unexpected file number %d in %s\n",
-		    file, binary_filename);
+	    kprintf("Unexpected file number %d in %s at %tx\n",
+		    file, binary_filename, filenames - obj->mapped);
 	    return;
 	}
 	while (*p) p++;
@@ -213,100 +282,128 @@ fill_line(int num_traces, void **traces, uintptr_t addr, int file, int line,
 	  obj_info_t *obj, line_info_t *lines, int offset)
 {
     int i;
-    addr += obj->base_addr;
+    addr += obj->base_addr - obj->vmaddr;
     for (i = offset; i < num_traces; i++) {
 	uintptr_t a = (uintptr_t)traces[i];
 	/* We assume one line code doesn't result >100 bytes of native code.
        We may want more reliable way eventually... */
 	if (addr < a && a < addr + 100) {
-	    fill_filename(file, include_directories, filenames, &lines[i]);
+	    fill_filename(file, include_directories, filenames, &lines[i], obj);
 	    lines[i].line = line;
 	}
     }
 }
 
-static void
-parse_debug_line_cu(int num_traces, void **traces, char **debug_line,
-		obj_info_t *obj, line_info_t *lines, int offset)
-{
-    char *p, *cu_end, *cu_start, *include_directories, *filenames;
-    unsigned long unit_length;
-    int default_is_stmt, line_base;
-    unsigned int header_length, minimum_instruction_length, line_range,
-		 opcode_base;
-    /* unsigned char *standard_opcode_lengths; */
-
-    /* The registers. */
-    unsigned long addr = 0;
-    unsigned int file = 1;
-    unsigned int line = 1;
-    /* unsigned int column = 0; */
-    int is_stmt;
-    /* int basic_block = 0; */
-    /* int end_sequence = 0; */
-    /* int prologue_end = 0; */
-    /* int epilogue_begin = 0; */
-    /* unsigned int isa = 0; */
-
-    p = *debug_line;
+struct LineNumberProgramHeader {
+    uint64_t unit_length;
+    uint16_t version;
+    uint8_t format; /* 4 or 8 */
+    uint64_t header_length;
+    uint8_t minimum_instruction_length;
+    uint8_t maximum_operations_per_instruction;
+    uint8_t default_is_stmt;
+    int8_t line_base;
+    uint8_t line_range;
+    uint8_t opcode_base;
+    /* uint8_t standard_opcode_lengths[opcode_base-1]; */
+    const char *include_directories;
+    const char *filenames;
+    const char *cu_start;
+    const char *cu_end;
+};
 
-    unit_length = *(unsigned int *)p;
-    p += sizeof(unsigned int);
-    if (unit_length == 0xffffffff) {
-	unit_length = *(unsigned long *)p;
-	p += sizeof(unsigned long);
+static int
+parse_debug_line_header(const char **pp, struct LineNumberProgramHeader *header)
+{
+    const char *p = *pp;
+    header->unit_length = *(uint32_t *)p;
+    p += sizeof(uint32_t);
+
+    header->format = 4;
+    if (header->unit_length == 0xffffffff) {
+	header->unit_length = *(uint64_t *)p;
+	p += sizeof(uint64_t);
+        header->format = 8;
     }
 
-    cu_end = p + unit_length;
+    header->cu_end = p + header->unit_length;
 
-    /*dwarf_version = *(unsigned short *)p;*/
-    p += 2;
+    header->version = *(uint16_t *)p;
+    p += sizeof(uint16_t);
+    if (header->version > 4) return -1;
 
-    header_length = *(unsigned int *)p;
-    p += sizeof(unsigned int);
+    header->header_length = header->format == 4 ? *(uint32_t *)p : *(uint64_t *)p;
+    p += header->format;
+    header->cu_start = p + header->header_length;
 
-    cu_start = p + header_length;
+    header->minimum_instruction_length = *(uint8_t *)p++;
 
-    minimum_instruction_length = *(unsigned char *)p;
-    p++;
-
-    is_stmt = default_is_stmt = *(unsigned char *)p;
-    p++;
-
-    line_base = *(signed char *)p;
-    p++;
-
-    line_range = *(unsigned char *)p;
-    p++;
+    if (header->version >= 4) {
+        /* maximum_operations_per_instruction = *(uint8_t *)p; */
+        if (*p != 1) return -1; /* For non-VLIW architectures, this field is 1 */
+        p++;
+    }
 
-    opcode_base = *(unsigned char *)p;
-    p++;
+    header->default_is_stmt = *(uint8_t *)p++;
+    header->line_base = *(int8_t *)p++;
+    header->line_range = *(uint8_t *)p++;
+    header->opcode_base = *(uint8_t *)p++;
+    /* header->standard_opcode_lengths = (uint8_t *)p - 1; */
+    p += header->opcode_base - 1;
 
-    /* standard_opcode_lengths = (unsigned char *)p - 1; */
-    p += opcode_base - 1;
+    header->include_directories = p;
 
-    include_directories = p;
+    /* temporary measure for compress-debug-sections */
+    if (p >= header->cu_end) return -1;
 
     /* skip include directories */
     while (*p) {
-	while (*p) p++;
+	p = memchr(p, '\0', header->cu_end - p);
+	if (!p) return -1;
 	p++;
     }
     p++;
 
-    filenames = p;
+    header->filenames = p;
+
+    *pp = header->cu_start;
+
+    return 0;
+}
+
+static int
+parse_debug_line_cu(int num_traces, void **traces, char **debug_line,
+		obj_info_t *obj, line_info_t *lines, int offset)
+{
+    const char *p = (const char *)*debug_line;
+    struct LineNumberProgramHeader header;
+
+    /* The registers. */
+    unsigned long addr = 0;
+    unsigned int file = 1;
+    unsigned int line = 1;
+    /* unsigned int column = 0; */
+    int is_stmt;
+    /* int basic_block = 0; */
+    /* int end_sequence = 0; */
+    /* int prologue_end = 0; */
+    /* int epilogue_begin = 0; */
+    /* unsigned int isa = 0; */
 
-    p = cu_start;
+    if (parse_debug_line_header(&p, &header))
+        return -1;
+    is_stmt = header.default_is_stmt;
 
 #define FILL_LINE()						    \
     do {							    \
 	fill_line(num_traces, traces, addr, file, line,		    \
-		  include_directories, filenames,		    \
+                  (char *)header.include_directories,               \
+                  (char *)header.filenames,                         \
 		  obj, lines, offset);				    \
 	/*basic_block = prologue_end = epilogue_begin = 0;*/	    \
     } while (0)
 
-    while (p < cu_end) {
+    while (p < header.cu_end) {
 	unsigned long a;
 	unsigned char op = *p++;
 	switch (op) {
@@ -314,19 +411,19 @@ parse_debug_line_cu(int num_traces, void **traces, char **debug_line,
 	    FILL_LINE();
 	    break;
 	case DW_LNS_advance_pc:
-	    a = uleb128(&p);
+	    a = uleb128((char **)&p);
 	    addr += a;
 	    break;
 	case DW_LNS_advance_line: {
-	    long a = sleb128(&p);
+	    long a = sleb128((char **)&p);
 	    line += a;
 	    break;
 	}
 	case DW_LNS_set_file:
-	    file = (unsigned int)uleb128(&p);
+	    file = (unsigned int)uleb128((char **)&p);
 	    break;
 	case DW_LNS_set_column:
-	    /*column = (unsigned int)*/(void)uleb128(&p);
+	    /*column = (unsigned int)*/(void)uleb128((char **)&p);
 	    break;
 	case DW_LNS_negate_stmt:
 	    is_stmt = !is_stmt;
@@ -335,12 +432,13 @@ parse_debug_line_cu(int num_traces, void **traces, char **debug_line,
 	    /*basic_block = 1; */
 	    break;
 	case DW_LNS_const_add_pc:
-	    a = ((255 - opcode_base) / line_range) *
-		minimum_instruction_length;
+	    a = ((255UL - header.opcode_base) / header.line_range) *
+		header.minimum_instruction_length;
 	    addr += a;
 	    break;
 	case DW_LNS_fixed_advance_pc:
-	    a = *(unsigned char *)p++;
+	    a = *(uint16_t *)p;
+	    p += sizeof(uint16_t);
 	    addr += a;
 	    break;
 	case DW_LNS_set_prologue_end:
@@ -350,7 +448,7 @@ parse_debug_line_cu(int num_traces, void **traces, char **debug_line,
 	    /* epilogue_begin = 1; */
 	    break;
 	case DW_LNS_set_isa:
-	    /* isa = (unsigned int)*/(void)uleb128(&p);
+	    /* isa = (unsigned int)*/(void)uleb128((char **)&p);
 	    break;
 	case 0:
 	    a = *(unsigned char *)p++;
@@ -363,7 +461,7 @@ parse_debug_line_cu(int num_traces, void **traces, char **debug_line,
 		file = 1;
 		line = 1;
 		/* column = 0; */
-		is_stmt = default_is_stmt;
+		is_stmt = header.default_is_stmt;
 		/* end_sequence = 0; */
 		/* isa = 0; */
 		break;
@@ -377,7 +475,7 @@ parse_debug_line_cu(int num_traces, void **traces, char **debug_line,
 		break;
 	    case DW_LNE_set_discriminator:
 		/* TODO:currently ignore */
-		uleb128(&p);
+		uleb128((char **)&p);
 		break;
 	    default:
 		kprintf("Unknown extended opcode: %d in %s\n",
@@ -385,33 +483,34 @@ parse_debug_line_cu(int num_traces, void **traces, char **debug_line,
 	    }
 	    break;
 	default: {
-	    unsigned long addr_incr;
-	    unsigned long line_incr;
-	    a = op - opcode_base;
-	    addr_incr = (a / line_range) * minimum_instruction_length;
-	    line_incr = line_base + (a % line_range);
-	    addr += (unsigned int)addr_incr;
-	    line += (unsigned int)line_incr;
+            uint8_t adjusted_opcode = op - header.opcode_base;
+            uint8_t operation_advance = adjusted_opcode / header.line_range;
+            /* NOTE: this code doesn't support VLIW */
+            addr += operation_advance * header.minimum_instruction_length;
+            line += header.line_base + (adjusted_opcode % header.line_range);
 	    FILL_LINE();
 	}
 	}
     }
-    *debug_line = p;
+    *debug_line = (char *)p;
+    return 0;
 }
 
-static void
+static int
 parse_debug_line(int num_traces, void **traces,
 		 char *debug_line, unsigned long size,
 		 obj_info_t *obj, line_info_t *lines, int offset)
 {
     char *debug_line_end = debug_line + size;
     while (debug_line < debug_line_end) {
-	parse_debug_line_cu(num_traces, traces, &debug_line, obj, lines, offset);
+	if (parse_debug_line_cu(num_traces, traces, &debug_line, obj, lines, offset))
+	    return -1;
     }
     if (debug_line != debug_line_end) {
 	kprintf("Unexpected size of .debug_line in %s\n",
 		binary_filename);
     }
+    return 0;
 }
 
 /* read file and fill lines */
@@ -420,22 +519,38 @@ fill_lines(int num_traces, void **traces, int check_debuglink,
 	   obj_info_t **objp, line_info_t *lines, int offset);
 
 static void
-append_obj(obj_info_t **objp) {
+append_obj(obj_info_t **objp)
+{
     obj_info_t *newobj = calloc(1, sizeof(obj_info_t));
     if (*objp) (*objp)->next = newobj;
     *objp = newobj;
 }
 
+#ifdef USE_ELF
+/* Ideally we should check 4 paths to follow gnu_debuglink:
+ *
+ *   - /usr/lib/debug/.build-id/ab/cdef1234.debug
+ *   - /usr/bin/ruby.debug
+ *   - /usr/bin/.debug/ruby.debug
+ *   - /usr/lib/debug/usr/bin/ruby.debug.
+ *
+ * but we handle only two cases for now as the two formats are
+ * used by some linux distributions.
+ *
+ * See GDB's info for detail.
+ * https://sourceware.org/gdb/onlinedocs/gdb/Separate-Debug-Files.html
+ */
+
+// check the path pattern of "/usr/lib/debug/usr/bin/ruby.debug"
 static void
-follow_debuglink(char *debuglink, int num_traces, void **traces,
+follow_debuglink(const char *debuglink, int num_traces, void **traces,
 		 obj_info_t **objp, line_info_t *lines, int offset)
 {
-    /* Ideally we should check 4 paths to follow gnu_debuglink,
-       but we handle only one case for now as this format is used
-       by some linux distributions. See GDB's info for detail. */
     static const char global_debug_dir[] = "/usr/lib/debug";
-    char *p, *subdir;
+    const size_t global_debug_dir_len = sizeof(global_debug_dir) - 1;
+    char *p;
     obj_info_t *o1 = *objp, *o2;
+    size_t len;
 
     p = strrchr(binary_filename, '/');
     if (!p) {
@@ -443,11 +558,44 @@ follow_debuglink(char *debuglink, int num_traces, void **traces,
     }
     p[1] = '\0';
 
-    subdir = (char *)alloca(strlen(binary_filename) + 1);
-    strcpy(subdir, binary_filename);
-    strcpy(binary_filename, global_debug_dir);
-    strlcat(binary_filename, subdir, PATH_MAX);
-    strlcat(binary_filename, debuglink, PATH_MAX);
+    len = strlen(binary_filename);
+    if (len >= PATH_MAX - global_debug_dir_len)
+	len = PATH_MAX - global_debug_dir_len - 1;
+    memmove(binary_filename + global_debug_dir_len, binary_filename, len);
+    memcpy(binary_filename, global_debug_dir, global_debug_dir_len);
+    len += global_debug_dir_len;
+    strlcpy(binary_filename + len, debuglink, PATH_MAX - len);
+
+    append_obj(objp);
+    o2 = *objp;
+    o2->base_addr = o1->base_addr;
+    o2->path = o1->path;
+    fill_lines(num_traces, traces, 0, objp, lines, offset);
+}
+
+// check the path pattern of "/usr/lib/debug/.build-id/ab/cdef1234.debug"
+static void
+follow_debuglink_build_id(const char *build_id, size_t build_id_size, int num_traces, void **traces,
+                          obj_info_t **objp, line_info_t *lines, int offset)
+{
+    static const char global_debug_dir[] = "/usr/lib/debug/.build-id/";
+    const size_t global_debug_dir_len = sizeof(global_debug_dir) - 1;
+    char *p;
+    obj_info_t *o1 = *objp, *o2;
+    size_t i;
+
+    if (PATH_MAX < global_debug_dir_len + 1 + build_id_size * 2 + 6) return;
+
+    memcpy(binary_filename, global_debug_dir, global_debug_dir_len);
+    p = binary_filename + global_debug_dir_len;
+    for (i = 0; i < build_id_size; i++) {
+        static const char tbl[] = "0123456789abcdef";
+        unsigned char n = build_id[i];
+        *p++ = tbl[n / 16];
+        *p++ = tbl[n % 16];
+        if (i == 0) *p++ = '/';
+    }
+    strcpy(p, ".debug");
 
     append_obj(objp);
     o2 = *objp;
@@ -455,6 +603,1054 @@ follow_debuglink(char *debuglink, int num_traces, void **traces,
     o2->path = o1->path;
     fill_lines(num_traces, traces, 0, objp, lines, offset);
 }
+#endif
+
+enum
+{
+    DW_TAG_compile_unit = 0x11,
+    DW_TAG_inlined_subroutine = 0x1d,
+    DW_TAG_subprogram = 0x2e,
+};
+
+/* Attributes encodings */
+enum
+{
+    DW_AT_sibling = 0x01,
+    DW_AT_location = 0x02,
+    DW_AT_name = 0x03,
+    /* Reserved 0x04 */
+    /* Reserved 0x05 */
+    /* Reserved 0x06 */
+    /* Reserved 0x07 */
+    /* Reserved 0x08 */
+    DW_AT_ordering = 0x09,
+    /* Reserved 0x0a */
+    DW_AT_byte_size = 0x0b,
+    /* Reserved 0x0c */
+    DW_AT_bit_size = 0x0d,
+    /* Reserved 0x0e */
+    /* Reserved 0x0f */
+    DW_AT_stmt_list = 0x10,
+    DW_AT_low_pc = 0x11,
+    DW_AT_high_pc = 0x12,
+    DW_AT_language = 0x13,
+    /* Reserved 0x14 */
+    DW_AT_discr = 0x15,
+    DW_AT_discr_value = 0x16,
+    DW_AT_visibility = 0x17,
+    DW_AT_import = 0x18,
+    DW_AT_string_length = 0x19,
+    DW_AT_common_reference = 0x1a,
+    DW_AT_comp_dir = 0x1b,
+    DW_AT_const_value = 0x1c,
+    DW_AT_containing_type = 0x1d,
+    DW_AT_default_value = 0x1e,
+    /* Reserved 0x1f */
+    DW_AT_inline = 0x20,
+    DW_AT_is_optional = 0x21,
+    DW_AT_lower_bound = 0x22,
+    /* Reserved 0x23 */
+    /* Reserved 0x24 */
+    DW_AT_producer = 0x25,
+    /* Reserved 0x26 */
+    DW_AT_prototyped = 0x27,
+    /* Reserved 0x28 */
+    /* Reserved 0x29 */
+    DW_AT_return_addr = 0x2a,
+    /* Reserved 0x2b */
+    DW_AT_start_scope = 0x2c,
+    /* Reserved 0x2d */
+    DW_AT_bit_stride = 0x2e,
+    DW_AT_upper_bound = 0x2f,
+    /* Reserved 0x30 */
+    DW_AT_abstract_origin = 0x31,
+    DW_AT_accessibility = 0x32,
+    DW_AT_address_class = 0x33,
+    DW_AT_artificial = 0x34,
+    DW_AT_base_types = 0x35,
+    DW_AT_calling_convention = 0x36,
+    DW_AT_count = 0x37,
+    DW_AT_data_member_location = 0x38,
+    DW_AT_decl_column = 0x39,
+    DW_AT_decl_file = 0x3a,
+    DW_AT_decl_line = 0x3b,
+    DW_AT_declaration = 0x3c,
+    DW_AT_discr_list = 0x3d,
+    DW_AT_encoding = 0x3e,
+    DW_AT_external = 0x3f,
+    DW_AT_frame_base = 0x40,
+    DW_AT_friend = 0x41,
+    DW_AT_identifier_case = 0x42,
+    /* Reserved 0x43 */
+    DW_AT_namelist_item = 0x44,
+    DW_AT_priority = 0x45,
+    DW_AT_segment = 0x46,
+    DW_AT_specification = 0x47,
+    DW_AT_static_link = 0x48,
+    DW_AT_type = 0x49,
+    DW_AT_use_location = 0x4a,
+    DW_AT_variable_parameter = 0x4b,
+    DW_AT_virtuality = 0x4c,
+    DW_AT_vtable_elem_location = 0x4d,
+    DW_AT_allocated = 0x4e,
+    DW_AT_associated = 0x4f,
+    DW_AT_data_location = 0x50,
+    DW_AT_byte_stride = 0x51,
+    DW_AT_entry_pc = 0x52,
+    DW_AT_use_UTF8 = 0x53,
+    DW_AT_extension = 0x54,
+    DW_AT_ranges = 0x55,
+    DW_AT_trampoline = 0x56,
+    DW_AT_call_column = 0x57,
+    DW_AT_call_file = 0x58,
+    DW_AT_call_line = 0x59,
+    DW_AT_description = 0x5a,
+    DW_AT_binary_scale = 0x5b,
+    DW_AT_decimal_scale = 0x5c,
+    DW_AT_small = 0x5d,
+    DW_AT_decimal_sign = 0x5e,
+    DW_AT_digit_count = 0x5f,
+    DW_AT_picture_string = 0x60,
+    DW_AT_mutable = 0x61,
+    DW_AT_threads_scaled = 0x62,
+    DW_AT_explicit = 0x63,
+    DW_AT_object_pointer = 0x64,
+    DW_AT_endianity = 0x65,
+    DW_AT_elemental = 0x66,
+    DW_AT_pure = 0x67,
+    DW_AT_recursive = 0x68,
+    DW_AT_signature = 0x69,
+    DW_AT_main_subprogram = 0x6a,
+    DW_AT_data_bit_offset = 0x6b,
+    DW_AT_const_expr = 0x6c,
+    DW_AT_enum_class = 0x6d,
+    DW_AT_linkage_name = 0x6e,
+    DW_AT_string_length_bit_size = 0x6f,
+    DW_AT_string_length_byte_size = 0x70,
+    DW_AT_rank = 0x71,
+    DW_AT_str_offsets_base = 0x72,
+    DW_AT_addr_base = 0x73,
+    DW_AT_rnglists_base = 0x74,
+    /* Reserved 0x75 */
+    DW_AT_dwo_name = 0x76,
+    DW_AT_reference = 0x77,
+    DW_AT_rvalue_reference = 0x78,
+    DW_AT_macros = 0x79,
+    DW_AT_call_all_calls = 0x7a,
+    DW_AT_call_all_source_calls = 0x7b,
+    DW_AT_call_all_tail_calls = 0x7c,
+    DW_AT_call_return_pc = 0x7d,
+    DW_AT_call_value = 0x7e,
+    DW_AT_call_origin = 0x7f,
+    DW_AT_call_parameter = 0x80,
+    DW_AT_call_pc = 0x81,
+    DW_AT_call_tail_call = 0x82,
+    DW_AT_call_target = 0x83,
+    DW_AT_call_target_clobbered = 0x84,
+    DW_AT_call_data_location = 0x85,
+    DW_AT_call_data_value = 0x86,
+    DW_AT_noreturn = 0x87,
+    DW_AT_alignment = 0x88,
+    DW_AT_export_symbols = 0x89,
+    DW_AT_deleted = 0x8a,
+    DW_AT_defaulted = 0x8b,
+    DW_AT_loclists_base = 0x8c,
+    DW_AT_lo_user = 0x2000,
+    DW_AT_hi_user = 0x3fff
+};
+
+/* Attribute form encodings */
+enum
+{
+    DW_FORM_addr = 0x01,
+    /* Reserved 0x02 */
+    DW_FORM_block2 = 0x03,
+    DW_FORM_block4 = 0x04,
+    DW_FORM_data2 = 0x05,
+    DW_FORM_data4 = 0x06,
+    DW_FORM_data8 = 0x07,
+    DW_FORM_string = 0x08,
+    DW_FORM_block = 0x09,
+    DW_FORM_block1 = 0x0a,
+    DW_FORM_data1 = 0x0b,
+    DW_FORM_flag = 0x0c,
+    DW_FORM_sdata = 0x0d,
+    DW_FORM_strp = 0x0e,
+    DW_FORM_udata = 0x0f,
+    DW_FORM_ref_addr = 0x10,
+    DW_FORM_ref1 = 0x11,
+    DW_FORM_ref2 = 0x12,
+    DW_FORM_ref4 = 0x13,
+    DW_FORM_ref8 = 0x14,
+    DW_FORM_ref_udata = 0x15,
+    DW_FORM_indirect = 0x16,
+    DW_FORM_sec_offset = 0x17,
+    DW_FORM_exprloc = 0x18,
+    DW_FORM_flag_present = 0x19,
+    DW_FORM_strx = 0x1a,
+    DW_FORM_addrx = 0x1b,
+    DW_FORM_ref_sup4 = 0x1c,
+    DW_FORM_strp_sup = 0x1d,
+    DW_FORM_data16 = 0x1e,
+    DW_FORM_line_strp = 0x1f,
+    DW_FORM_ref_sig8 = 0x20,
+    DW_FORM_implicit_const = 0x21,
+    DW_FORM_loclistx = 0x22,
+    DW_FORM_rnglistx = 0x23,
+    DW_FORM_ref_sup8 = 0x24,
+    DW_FORM_strx1 = 0x25,
+    DW_FORM_strx2 = 0x26,
+    DW_FORM_strx3 = 0x27,
+    DW_FORM_strx4 = 0x28,
+    DW_FORM_addrx1 = 0x29,
+    DW_FORM_addrx2 = 0x2a,
+    DW_FORM_addrx3 = 0x2b,
+    DW_FORM_addrx4 = 0x2c
+};
+
+enum {
+    VAL_none = 0,
+    VAL_cstr = 1,
+    VAL_data = 2,
+    VAL_uint = 3,
+    VAL_int = 4
+};
+
+# define ABBREV_TABLE_SIZE 256
+typedef struct {
+    obj_info_t *obj;
+    char *file;
+    char *current_cu;
+    uint64_t current_low_pc;
+    char *debug_line_cu_end;
+    char *debug_line_files;
+    char *debug_line_directories;
+    char *p;
+    char *cu_end;
+    char *pend;
+    char *q0;
+    char *q;
+    int format; // 4 or 8
+    uint8_t address_size;
+    int level;
+    char *abbrev_table[ABBREV_TABLE_SIZE];
+} DebugInfoReader;
+
+typedef struct {
+    ptrdiff_t pos;
+    int tag;
+    int has_children;
+} DIE;
+
+typedef struct {
+    union {
+        char *ptr;
+        uint64_t uint64;
+        int64_t int64;
+    } as;
+    uint64_t off;
+    uint64_t at;
+    uint64_t form;
+    size_t size;
+    int type;
+} DebugInfoValue;
+
+/* TODO: Big Endian */
+#define MERGE_2INTS(a,b,sz) (((uint64_t)(b)<<sz)|(a))
+
+static uint16_t
+get_uint16(const uint8_t *p)
+{
+    return (uint16_t)MERGE_2INTS(p[0],p[1],8);
+}
+
+static uint32_t
+get_uint32(const uint8_t *p)
+{
+    return (uint32_t)MERGE_2INTS(get_uint16(p),get_uint16(p+2),16);
+}
+
+static uint64_t
+get_uint64(const uint8_t *p)
+{
+    return MERGE_2INTS(get_uint32(p),get_uint32(p+4),32);
+}
+
+static uint8_t
+read_uint8(char **ptr)
+{
+    const unsigned char *p = (const unsigned char *)*ptr;
+    *ptr = (char *)(p + 1);
+    return *p;
+}
+
+static uint16_t
+read_uint16(char **ptr)
+{
+    const unsigned char *p = (const unsigned char *)*ptr;
+    *ptr = (char *)(p + 2);
+    return get_uint16(p);
+}
+
+static uint32_t
+read_uint24(char **ptr)
+{
+    const unsigned char *p = (const unsigned char *)*ptr;
+    *ptr = (char *)(p + 3);
+    return (*p << 16) | get_uint16(p+1);
+}
+
+static uint32_t
+read_uint32(char **ptr)
+{
+    const unsigned char *p = (const unsigned char *)*ptr;
+    *ptr = (char *)(p + 4);
+    return get_uint32(p);
+}
+
+static uint64_t
+read_uint64(char **ptr)
+{
+    const unsigned char *p = (const unsigned char *)*ptr;
+    *ptr = (char *)(p + 8);
+    return get_uint64(p);
+}
+
+static uintptr_t
+read_uintptr(char **ptr)
+{
+    const unsigned char *p = (const unsigned char *)*ptr;
+    *ptr = (char *)(p + SIZEOF_VOIDP);
+#if SIZEOF_VOIDP == 8
+    return get_uint64(p);
+#else
+    return get_uint32(p);
+#endif
+}
+
+static uint64_t
+read_uint(DebugInfoReader *reader)
+{
+    if (reader->format == 4) {
+        return read_uint32(&reader->p);
+    } else { /* 64 bit */
+        return read_uint64(&reader->p);
+    }
+}
+
+static uint64_t
+read_uleb128(DebugInfoReader *reader)
+{
+    return uleb128(&reader->p);
+}
+
+static int64_t
+read_sleb128(DebugInfoReader *reader)
+{
+    return sleb128(&reader->p);
+}
+
+static void
+debug_info_reader_init(DebugInfoReader *reader, obj_info_t *obj)
+{
+    reader->file = obj->mapped;
+    reader->obj = obj;
+    reader->p = obj->debug_info.ptr;
+    reader->pend = obj->debug_info.ptr + obj->debug_info.size;
+    reader->debug_line_cu_end = obj->debug_line.ptr;
+    reader->current_low_pc = 0;
+}
+
+static void
+di_read_debug_abbrev_cu(DebugInfoReader *reader)
+{
+    uint64_t prev = 0;
+    char *p = reader->q0;
+    for (;;) {
+        uint64_t abbrev_number = uleb128(&p);
+        if (abbrev_number <= prev) break;
+        if (abbrev_number < ABBREV_TABLE_SIZE) {
+            reader->abbrev_table[abbrev_number] = p;
+        }
+        prev = abbrev_number;
+        uleb128(&p); /* tag */
+        p++; /* has_children */
+        /* skip content */
+        for (;;) {
+            uint64_t at = uleb128(&p);
+            uint64_t form = uleb128(&p);
+            if (!at && !form) break;
+        }
+    }
+}
+
+static int
+di_read_debug_line_cu(DebugInfoReader *reader)
+{
+    const char *p;
+    struct LineNumberProgramHeader header;
+
+    p = (const char *)reader->debug_line_cu_end;
+    if (parse_debug_line_header(&p, &header))
+        return -1;
+
+    reader->debug_line_cu_end = (char *)header.cu_end;
+    reader->debug_line_directories = (char *)header.include_directories;
+    reader->debug_line_files = (char *)header.filenames;
+
+    return 0;
+}
+
+static void
+set_uint_value(DebugInfoValue *v, uint64_t n)
+{
+    v->as.uint64 = n;
+    v->type = VAL_uint;
+}
+
+static void
+set_int_value(DebugInfoValue *v, int64_t n)
+{
+    v->as.int64 = n;
+    v->type = VAL_int;
+}
+
+static void
+set_cstr_value(DebugInfoValue *v, char *s)
+{
+    v->as.ptr = s;
+    v->off = 0;
+    v->type = VAL_cstr;
+}
+
+static void
+set_cstrp_value(DebugInfoValue *v, char *s, uint64_t off)
+{
+    v->as.ptr = s;
+    v->off = off;
+    v->type = VAL_cstr;
+}
+
+static void
+set_data_value(DebugInfoValue *v, char *s)
+{
+    v->as.ptr = s;
+    v->type = VAL_data;
+}
+
+static const char *
+get_cstr_value(DebugInfoValue *v)
+{
+    if (v->as.ptr) {
+        return v->as.ptr + v->off;
+    } else {
+        return NULL;
+    }
+}
+
+static void
+debug_info_reader_read_value(DebugInfoReader *reader, uint64_t form, DebugInfoValue *v)
+{
+    switch (form) {
+      case DW_FORM_addr:
+        if (reader->address_size == 4) {
+            set_uint_value(v, read_uint32(&reader->p));
+        } else if (reader->address_size == 8) {
+            set_uint_value(v, read_uint64(&reader->p));
+        } else {
+            fprintf(stderr,"unknown address_size:%d", reader->address_size);
+            abort();
+        }
+        break;
+      case DW_FORM_block2:
+        v->size = read_uint16(&reader->p);
+        set_data_value(v, reader->p);
+        reader->p += v->size;
+        break;
+      case DW_FORM_block4:
+        v->size = read_uint32(&reader->p);
+        set_data_value(v, reader->p);
+        reader->p += v->size;
+        break;
+      case DW_FORM_data2:
+        set_uint_value(v, read_uint16(&reader->p));
+        break;
+      case DW_FORM_data4:
+        set_uint_value(v, read_uint32(&reader->p));
+        break;
+      case DW_FORM_data8:
+        set_uint_value(v, read_uint64(&reader->p));
+        break;
+      case DW_FORM_string:
+        v->size = strlen(reader->p);
+        set_cstr_value(v, reader->p);
+        reader->p += v->size + 1;
+        break;
+      case DW_FORM_block:
+        v->size = uleb128(&reader->p);
+        set_data_value(v, reader->p);
+        reader->p += v->size;
+        break;
+      case DW_FORM_block1:
+        v->size = read_uint8(&reader->p);
+        set_data_value(v, reader->p);
+        reader->p += v->size;
+        break;
+      case DW_FORM_data1:
+        set_uint_value(v, read_uint8(&reader->p));
+        break;
+      case DW_FORM_flag:
+        set_uint_value(v, read_uint8(&reader->p));
+        break;
+      case DW_FORM_sdata:
+        set_int_value(v, read_sleb128(reader));
+        break;
+      case DW_FORM_strp:
+        set_cstrp_value(v, reader->obj->debug_str.ptr, read_uint(reader));
+        break;
+      case DW_FORM_udata:
+        set_uint_value(v, read_uleb128(reader));
+        break;
+      case DW_FORM_ref_addr:
+        if (reader->address_size == 4) {
+            set_uint_value(v, read_uint32(&reader->p));
+        } else if (reader->address_size == 8) {
+            set_uint_value(v, read_uint64(&reader->p));
+        } else {
+            fprintf(stderr,"unknown address_size:%d", reader->address_size);
+            abort();
+        }
+        break;
+      case DW_FORM_ref1:
+        set_uint_value(v, read_uint8(&reader->p));
+        break;
+      case DW_FORM_ref2:
+        set_uint_value(v, read_uint16(&reader->p));
+        break;
+      case DW_FORM_ref4:
+        set_uint_value(v, read_uint32(&reader->p));
+        break;
+      case DW_FORM_ref8:
+        set_uint_value(v, read_uint64(&reader->p));
+        break;
+      case DW_FORM_ref_udata:
+        set_uint_value(v, uleb128(&reader->p));
+        break;
+      case DW_FORM_indirect:
+        /* TODO: read the referred value */
+        set_uint_value(v, uleb128(&reader->p));
+        break;
+      case DW_FORM_sec_offset:
+        set_uint_value(v, read_uint(reader)); /* offset */
+        /* addrptr: debug_addr */
+        /* lineptr: debug_line */
+        /* loclist: debug_loclists */
+        /* loclistptr: debug_loclists */
+        /* macptr: debug_macro */
+        /* rnglist: debug_rnglists */
+        /* rnglistptr: debug_rnglists */
+        /* stroffsetsptr: debug_str_offsets */
+        break;
+      case DW_FORM_exprloc:
+        v->size = (size_t)read_uleb128(reader);
+        set_data_value(v, reader->p);
+        reader->p += v->size;
+        break;
+      case DW_FORM_flag_present:
+        set_uint_value(v, 1);
+        break;
+      case DW_FORM_strx:
+        set_uint_value(v, uleb128(&reader->p));
+        break;
+      case DW_FORM_addrx:
+        /* TODO: read .debug_addr */
+        set_uint_value(v, uleb128(&reader->p));
+        break;
+      case DW_FORM_ref_sup4:
+        set_uint_value(v, read_uint32(&reader->p));
+        break;
+      case DW_FORM_strp_sup:
+        set_uint_value(v, read_uint(reader));
+        /* *p = reader->sup_file + reader->sup_str->sh_offset + ret; */
+        break;
+      case DW_FORM_data16:
+        v->size = 16;
+        set_data_value(v, reader->p);
+        reader->p += v->size;
+        break;
+      case DW_FORM_line_strp:
+        set_uint_value(v, read_uint(reader));
+        /* *p = reader->file + reader->line->sh_offset + ret; */
+        break;
+      case DW_FORM_ref_sig8:
+        set_uint_value(v, read_uint64(&reader->p));
+        break;
+      case DW_FORM_implicit_const:
+        set_int_value(v, sleb128(&reader->q));
+        break;
+      case DW_FORM_loclistx:
+        set_uint_value(v, read_uleb128(reader));
+        break;
+      case DW_FORM_rnglistx:
+        set_uint_value(v, read_uleb128(reader));
+        break;
+      case DW_FORM_ref_sup8:
+        set_uint_value(v, read_uint64(&reader->p));
+        break;
+      case DW_FORM_strx1:
+        set_uint_value(v, read_uint8(&reader->p));
+        break;
+      case DW_FORM_strx2:
+        set_uint_value(v, read_uint16(&reader->p));
+        break;
+      case DW_FORM_strx3:
+        set_uint_value(v, read_uint24(&reader->p));
+        break;
+      case DW_FORM_strx4:
+        set_uint_value(v, read_uint32(&reader->p));
+        break;
+      case DW_FORM_addrx1:
+        set_uint_value(v, read_uint8(&reader->p));
+        break;
+      case DW_FORM_addrx2:
+        set_uint_value(v, read_uint16(&reader->p));
+        break;
+      case DW_FORM_addrx3:
+        set_uint_value(v, read_uint24(&reader->p));
+        break;
+      case DW_FORM_addrx4:
+        set_uint_value(v, read_uint32(&reader->p));
+        break;
+      case 0:
+        goto fail;
+        break;
+    }
+    return;
+
+  fail:
+    fprintf(stderr, "%d: unsupported form: %#"PRIx64"\n", __LINE__, form);
+    exit(1);
+}
+
+/* find abbrev in current compilation unit */
+static char *
+di_find_abbrev(DebugInfoReader *reader, uint64_t abbrev_number)
+{
+    char *p;
+    if (abbrev_number < ABBREV_TABLE_SIZE) {
+        return reader->abbrev_table[abbrev_number];
+    }
+    p = reader->abbrev_table[ABBREV_TABLE_SIZE-1];
+    /* skip 255th record */
+    uleb128(&p); /* tag */
+    p++; /* has_children */
+    /* skip content */
+    for (;;) {
+        uint64_t at = uleb128(&p);
+        uint64_t form = uleb128(&p);
+        if (!at && !form) break;
+    }
+    for (uint64_t n = uleb128(&p); abbrev_number != n; n = uleb128(&p)) {
+        if (n == 0) {
+            fprintf(stderr,"%d: Abbrev Number %"PRId64" not found\n",__LINE__, abbrev_number);
+            exit(1);
+        }
+        uleb128(&p); /* tag */
+        p++; /* has_children */
+        /* skip content */
+        for (;;) {
+            uint64_t at = uleb128(&p);
+            uint64_t form = uleb128(&p);
+            if (!at && !form) break;
+        }
+    }
+    return p;
+}
+
+#if 0
+static void
+hexdump0(const unsigned char *p, size_t n)
+{
+    size_t i;
+    fprintf(stderr, "     0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F\n");
+    for (i=0; i < n; i++){
+        switch (i & 15) {
+          case 0:
+            fprintf(stderr, "%02zd: %02X ", i/16, p[i]);
+            break;
+          case 15:
+            fprintf(stderr, "%02X\n", p[i]);
+            break;
+          default:
+            fprintf(stderr, "%02X ", p[i]);
+            break;
+        }
+    }
+    if ((i & 15) != 15) {
+        fprintf(stderr, "\n");
+    }
+}
+#define hexdump(p,n) hexdump0((const unsigned char *)p, n)
+
+static void
+div_inspect(DebugInfoValue *v)
+{
+    switch (v->type) {
+      case VAL_uint:
+        fprintf(stderr,"%d: type:%d size:%zx v:%lx\n",__LINE__,v->type,v->size,v->as.uint64);
+        break;
+      case VAL_int:
+        fprintf(stderr,"%d: type:%d size:%zx v:%ld\n",__LINE__,v->type,v->size,(int64_t)v->as.uint64);
+        break;
+      case VAL_cstr:
+        fprintf(stderr,"%d: type:%d size:%zx v:'%s'\n",__LINE__,v->type,v->size,v->as.ptr);
+        break;
+      case VAL_data:
+        fprintf(stderr,"%d: type:%d size:%zx v:\n",__LINE__,v->type,v->size);
+        hexdump(v->as.ptr, 16);
+        break;
+    }
+}
+#endif
+
+static DIE *
+di_read_die(DebugInfoReader *reader, DIE *die)
+{
+    uint64_t abbrev_number = uleb128(&reader->p);
+    if (abbrev_number == 0) {
+        reader->level--;
+        return NULL;
+    }
+
+    reader->q = di_find_abbrev(reader, abbrev_number);
+
+    die->pos = reader->p - reader->obj->debug_info.ptr - 1;
+    die->tag = (int)uleb128(&reader->q); /* tag */
+    die->has_children = *reader->q++; /* has_children */
+    if (die->has_children) {
+        reader->level++;
+    }
+    return die;
+}
+
+static DebugInfoValue *
+di_read_record(DebugInfoReader *reader, DebugInfoValue *vp)
+{
+    uint64_t at = uleb128(&reader->q);
+    uint64_t form = uleb128(&reader->q);
+    if (!at || !form) return NULL;
+    vp->at = at;
+    vp->form = form;
+    debug_info_reader_read_value(reader, form, vp);
+    return vp;
+}
+
+static void
+di_skip_records(DebugInfoReader *reader)
+{
+    for (;;) {
+        DebugInfoValue v = {{}};
+        uint64_t at = uleb128(&reader->q);
+        uint64_t form = uleb128(&reader->q);
+        if (!at || !form) return;
+        debug_info_reader_read_value(reader, form, &v);
+    }
+}
+
+typedef struct {
+    uint64_t low_pc;
+    uint64_t high_pc;
+    uint64_t ranges;
+    bool low_pc_set;
+    bool high_pc_set;
+    bool ranges_set;
+} ranges_t;
+
+static void
+ranges_set(ranges_t *ptr, DebugInfoValue *v)
+{
+    switch (v->at) {
+      case DW_AT_low_pc:
+        ptr->low_pc = v->as.uint64;
+        ptr->low_pc_set = true;
+        break;
+      case DW_AT_high_pc:
+        if (v->form == DW_FORM_addr) {
+            ptr->high_pc = v->as.uint64;
+        }
+        else {
+            ptr->high_pc = ptr->low_pc + v->as.uint64;
+        }
+        ptr->high_pc_set = true;
+        break;
+      case DW_AT_ranges:
+        ptr->ranges = v->as.uint64;
+        ptr->ranges_set = true;
+        break;
+    }
+}
+
+static uintptr_t
+ranges_include(DebugInfoReader *reader, ranges_t *ptr, uint64_t addr)
+{
+    if (ptr->high_pc_set) {
+        if (ptr->ranges_set || !ptr->low_pc_set) {
+            exit(1);
+        }
+        if (ptr->low_pc <= addr && addr <= ptr->high_pc) {
+            return (uintptr_t)ptr->low_pc;
+        }
+    }
+    else if (ptr->ranges_set) {
+        /* TODO: support base address selection entry */
+        char *p = reader->obj->debug_ranges.ptr + ptr->ranges;
+        uint64_t base = ptr->low_pc_set ? ptr->low_pc : reader->current_low_pc;
+        for (;;) {
+            uintptr_t from = read_uintptr(&p);
+            uintptr_t to = read_uintptr(&p);
+            if (!from && !to) break;
+            if (from == UINTPTR_MAX) {
+                /* base address selection entry */
+                base = to;
+            }
+            else if (base + from <= addr && addr < base + to) {
+                return from;
+            }
+        }
+    }
+    else if (ptr->low_pc_set) {
+        if (ptr->low_pc == addr) {
+            return (uintptr_t)ptr->low_pc;
+        }
+    }
+    return false;
+}
+
+#if 0
+static void
+ranges_inspect(DebugInfoReader *reader, ranges_t *ptr)
+{
+    if (ptr->high_pc_set) {
+        if (ptr->ranges_set || !ptr->low_pc_set) {
+            fprintf(stderr,"low_pc_set:%d high_pc_set:%d ranges_set:%d\n",ptr->low_pc_set,ptr->high_pc_set,ptr->ranges_set);
+            exit(1);
+        }
+        fprintf(stderr,"low_pc:%"PRIx64" high_pc:%"PRIx64"\n",ptr->low_pc,ptr->high_pc);
+    }
+    else if (ptr->ranges_set) {
+        char *p = reader->obj->debug_ranges.ptr + ptr->ranges;
+        fprintf(stderr,"low_pc:%"PRIx64" ranges:%"PRIx64" %lx ",ptr->low_pc,ptr->ranges, p-reader->obj->mapped);
+        for (;;) {
+            uintptr_t from = read_uintptr(&p);
+            uintptr_t to = read_uintptr(&p);
+            if (!from && !to) break;
+            fprintf(stderr,"%"PRIx64"-%"PRIx64" ",ptr->low_pc+from,ptr->low_pc+to);
+        }
+        fprintf(stderr,"\n");
+    }
+    else if (ptr->low_pc_set) {
+        fprintf(stderr,"low_pc:%"PRIx64"\n",ptr->low_pc);
+    }
+    else {
+        fprintf(stderr,"empty\n");
+    }
+}
+#endif
+
+static int
+di_read_cu(DebugInfoReader *reader)
+{
+    uint64_t unit_length;
+    uint16_t version;
+    uint64_t debug_abbrev_offset;
+    reader->format = 4;
+    reader->current_cu = reader->p;
+    unit_length = read_uint32(&reader->p);
+    if (unit_length == 0xffffffff) {
+        unit_length = read_uint64(&reader->p);
+        reader->format = 8;
+    }
+    reader->cu_end = reader->p + unit_length;
+    version = read_uint16(&reader->p);
+    if (version > 5) {
+        return -1;
+    }
+    else if (version == 5) {
+        /* unit_type = */ read_uint8(&reader->p);
+        reader->address_size = read_uint8(&reader->p);
+        debug_abbrev_offset = read_uint(reader);
+    }
+    else {
+        debug_abbrev_offset = read_uint(reader);
+        reader->address_size = read_uint8(&reader->p);
+    }
+    reader->q0 = reader->obj->debug_abbrev.ptr + debug_abbrev_offset;
+
+    reader->level = 0;
+    di_read_debug_abbrev_cu(reader);
+    if (di_read_debug_line_cu(reader)) return -1;
+
+#if defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER_BUILD_DATE)
+    /* Though DWARF specifies "the applicable base address defaults to the base
+       address of the compilation unit", but GCC seems to use zero as default */
+#else
+    do {
+        DIE die;
+
+        if (!di_read_die(reader, &die)) continue;
+
+        if (die.tag != DW_TAG_compile_unit) {
+            di_skip_records(reader);
+            break;
+        }
+
+        /* enumerate abbrev */
+        for (;;) {
+            DebugInfoValue v = {{}};
+            if (!di_read_record(reader, &v)) break;
+            switch (v.at) {
+              case DW_AT_low_pc:
+                reader->current_low_pc = v.as.uint64;
+                break;
+            }
+        }
+    } while (0);
+#endif
+    return 0;
+}
+
+static void
+read_abstract_origin(DebugInfoReader *reader, uint64_t abstract_origin, line_info_t *line)
+{
+    char *p = reader->p;
+    char *q = reader->q;
+    int level = reader->level;
+    DIE die;
+
+    reader->p = reader->current_cu + abstract_origin;
+    if (!di_read_die(reader, &die)) goto finish;
+
+    /* enumerate abbrev */
+    for (;;) {
+        DebugInfoValue v = {{}};
+        if (!di_read_record(reader, &v)) break;
+        switch (v.at) {
+          case DW_AT_name:
+            line->sname = get_cstr_value(&v);
+            break;
+        }
+    }
+
+  finish:
+    reader->p = p;
+    reader->q = q;
+    reader->level = level;
+}
+
+static void
+debug_info_read(DebugInfoReader *reader, int num_traces, void **traces,
+         line_info_t *lines, int offset) {
+    while (reader->p < reader->cu_end) {
+        DIE die;
+        ranges_t ranges = {};
+        line_info_t line = {};
+
+        if (!di_read_die(reader, &die)) continue;
+        /* fprintf(stderr,"%d:%tx: <%d>\n",__LINE__,die.pos,reader->level,die.tag); */
+
+        if (die.tag != DW_TAG_subprogram && die.tag != DW_TAG_inlined_subroutine) {
+          skip_die:
+            di_skip_records(reader);
+            continue;
+        }
+
+        /* enumerate abbrev */
+        for (;;) {
+            DebugInfoValue v = {{}};
+            /* ptrdiff_t pos = reader->p - reader->p0; */
+            if (!di_read_record(reader, &v)) break;
+            /* fprintf(stderr,"\n%d:%tx: AT:%lx FORM:%lx\n",__LINE__,pos,v.at,v.form); */
+            /* div_inspect(&v); */
+            switch (v.at) {
+              case DW_AT_name:
+                line.sname = get_cstr_value(&v);
+                break;
+              case DW_AT_call_file:
+                fill_filename((int)v.as.uint64, reader->debug_line_directories, reader->debug_line_files, &line, reader->obj);
+                break;
+              case DW_AT_call_line:
+                line.line = (int)v.as.uint64;
+                break;
+              case DW_AT_low_pc:
+              case DW_AT_high_pc:
+              case DW_AT_ranges:
+                ranges_set(&ranges, &v);
+                break;
+              case DW_AT_declaration:
+                goto skip_die;
+              case DW_AT_inline:
+                /* 1 or 3 */
+                break; /* goto skip_die; */
+              case DW_AT_abstract_origin:
+                read_abstract_origin(reader, v.as.uint64, &line);
+                break; /* goto skip_die; */
+            }
+        }
+        /* ranges_inspect(reader, &ranges); */
+        /* fprintf(stderr,"%d:%tx: %x ",__LINE__,diepos,die.tag); */
+        for (int i=offset; i < num_traces; i++) {
+            uintptr_t addr = (uintptr_t)traces[i];
+            uintptr_t offset = addr - reader->obj->base_addr + reader->obj->vmaddr;
+            uintptr_t saddr = ranges_include(reader, &ranges, offset);
+            if (saddr) {
+                /* fprintf(stderr, "%d:%tx: %d %lx->%lx %x %s: %s/%s %d %s %s %s\n",__LINE__,die.pos, i,addr,offset, die.tag,line.sname,line.dirname,line.filename,line.line,reader->obj->path,line.sname,lines[i].sname); */
+                if (lines[i].sname) {
+                    line_info_t *lp = malloc(sizeof(line_info_t));
+                    memcpy(lp, &lines[i], sizeof(line_info_t));
+                    lines[i].next = lp;
+                    lp->dirname = line.dirname;
+                    lp->filename = line.filename;
+                    lp->line = line.line;
+                    lp->saddr = 0;
+                }
+                lines[i].path = reader->obj->path;
+                lines[i].base_addr = line.base_addr;
+                lines[i].sname = line.sname;
+                lines[i].saddr = saddr + reader->obj->base_addr - reader->obj->vmaddr;
+            }
+        }
+    }
+}
+
+#ifdef USE_ELF
+static unsigned long
+uncompress_debug_section(ElfW(Shdr) *shdr, char *file, char **ptr)
+{
+    *ptr = NULL;
+#ifdef SUPPORT_COMPRESSED_DEBUG_LINE
+    ElfW(Chdr) *chdr = (ElfW(Chdr) *)(file + shdr->sh_offset);
+    unsigned long destsize = chdr->ch_size;
+    int ret = 0;
+
+    if (chdr->ch_type != ELFCOMPRESS_ZLIB) {
+	/* unsupported compression type */
+	return 0;
+    }
+
+    *ptr = malloc(destsize);
+    if (!*ptr) return 0;
+    ret = uncompress((Bytef *)*ptr, &destsize,
+	    (const Bytef*)chdr + sizeof(ElfW(Chdr)),
+            shdr->sh_size - sizeof(ElfW(Chdr)));
+    if (ret != Z_OK) goto fail;
+    return destsize;
+
+fail:
+    free(*ptr);
+    *ptr = NULL;
+#endif
+    return 0;
+}
 
 /* read file and fill lines */
 static uintptr_t
@@ -463,10 +1659,10 @@ fill_lines(int num_traces, void **traces, int check_debuglink,
 {
     int i, j;
     char *shstr;
-    char *section_name;
     ElfW(Ehdr) *ehdr;
     ElfW(Shdr) *shdr, *shstr_shdr;
-    ElfW(Shdr) *debug_line_shdr = NULL, *gnu_debuglink_shdr = NULL;
+    ElfW(Shdr) *gnu_debuglink_shdr = NULL;
+    ElfW(Shdr) *note_gnu_build_id = NULL;
     int fd;
     off_t filesize;
     char *file;
@@ -502,6 +1698,7 @@ fill_lines(int num_traces, void **traces, int check_debuglink,
 	kprintf("mmap: %s\n", strerror(e));
 	goto fail;
     }
+    close(fd);
 
     ehdr = (ElfW(Ehdr) *)file;
     if (memcmp(ehdr->e_ident, "\177ELF", 4) != 0) {
@@ -509,11 +1706,8 @@ fill_lines(int num_traces, void **traces, int check_debuglink,
 	 * Huh? Maybe filename was overridden by setproctitle() and
 	 * it match non-elf file.
 	 */
-	close(fd);
 	goto fail;
     }
-
-    obj->fd = fd;
     obj->mapped = file;
     obj->mapped_size = (size_t)filesize;
 
@@ -523,7 +1717,7 @@ fill_lines(int num_traces, void **traces, int check_debuglink,
     shstr = file + shstr_shdr->sh_offset;
 
     for (i = 0; i < ehdr->e_shnum; i++) {
-	section_name = shstr + shdr[i].sh_name;
+        char *section_name = shstr + shdr[i].sh_name;
 	switch (shdr[i].sh_type) {
 	  case SHT_STRTAB:
 	    if (!strcmp(section_name, ".strtab")) {
@@ -541,13 +1735,40 @@ fill_lines(int num_traces, void **traces, int check_debuglink,
 	    /* if (!strcmp(section_name, ".dynsym")) */
 	    dynsym_shdr = shdr + i;
 	    break;
+          case SHT_NOTE:
+            if (!strcmp(section_name, ".note.gnu.build-id")) {
+                note_gnu_build_id = shdr + i;
+            }
+            break;
 	  case SHT_PROGBITS:
-	    if (!strcmp(section_name, ".debug_line")) {
-		debug_line_shdr = shdr + i;
-	    }
-	    else if (!strcmp(section_name, ".gnu_debuglink")) {
+	    if (!strcmp(section_name, ".gnu_debuglink")) {
 		gnu_debuglink_shdr = shdr + i;
 	    }
+            else {
+                const char *debug_section_names[] = {
+                    ".debug_abbrev",
+                    ".debug_info",
+                    ".debug_line",
+                    ".debug_ranges",
+                    ".debug_str"
+                };
+
+                for (j=0; j < DWARF_SECTION_COUNT; j++) {
+                    struct dwarf_section *s = obj_dwarf_section_at(obj, j);
+
+                    if (strcmp(section_name, debug_section_names[j]) != 0)
+                        continue;
+
+                    s->ptr = file + shdr[i].sh_offset;
+                    s->size = shdr[i].sh_size;
+                    s->flags = shdr[i].sh_flags;
+                    if (s->flags & SHF_COMPRESSED) {
+                        s->size = uncompress_debug_section(&shdr[i], file, &s->ptr);
+                        if (!s->size) goto fail;
+                    }
+                    break;
+                }
+            }
 	    break;
 	}
     }
@@ -559,20 +1780,22 @@ fill_lines(int num_traces, void **traces, int check_debuglink,
 	    char *strtab = file + dynstr_shdr->sh_offset;
 	    ElfW(Sym) *symtab = (ElfW(Sym) *)(file + dynsym_shdr->sh_offset);
 	    int symtab_count = (int)(dynsym_shdr->sh_size / sizeof(ElfW(Sym)));
-	    for (j = 0; j < symtab_count; j++) {
-		ElfW(Sym) *sym = &symtab[j];
-		Dl_info info;
-		void *h, *s;
-		if (ELF_ST_TYPE(sym->st_info) != STT_FUNC || sym->st_size <= 0) continue;
-		h = dlopen(NULL, RTLD_NOW|RTLD_LOCAL);
-		if (!h) continue;
-		s = dlsym(h, strtab + sym->st_name);
-		if (!s) continue;
-		if (dladdr(s, &info)) {
-		    dladdr_fbase = (uintptr_t)info.dli_fbase;
-		    break;
-		}
-	    }
+            void *handle = dlopen(NULL, RTLD_NOW|RTLD_LOCAL);
+            if (handle) {
+                for (j = 0; j < symtab_count; j++) {
+                    ElfW(Sym) *sym = &symtab[j];
+                    Dl_info info;
+                    void *s;
+                    if (ELF_ST_TYPE(sym->st_info) != STT_FUNC || sym->st_size == 0) continue;
+                    s = dlsym(handle, strtab + sym->st_name);
+                    if (s && dladdr(s, &info)) {
+                        obj->base_addr = dladdr_fbase;
+                        dladdr_fbase = (uintptr_t)info.dli_fbase;
+                        break;
+                    }
+                }
+                dlclose(handle);
+            }
 	    if (ehdr->e_type == ET_EXEC) {
 		obj->base_addr = 0;
 	    }
@@ -583,33 +1806,48 @@ fill_lines(int num_traces, void **traces, int check_debuglink,
 	}
     }
 
-    if (!symtab_shdr) {
-	symtab_shdr = dynsym_shdr;
-	strtab_shdr = dynstr_shdr;
-    }
-
-    if (symtab_shdr && strtab_shdr) {
-	char *strtab = file + strtab_shdr->sh_offset;
-	ElfW(Sym) *symtab = (ElfW(Sym) *)(file + symtab_shdr->sh_offset);
-	int symtab_count = (int)(symtab_shdr->sh_size / sizeof(ElfW(Sym)));
-	for (j = 0; j < symtab_count; j++) {
-	    ElfW(Sym) *sym = &symtab[j];
-	    uintptr_t saddr = (uintptr_t)sym->st_value + obj->base_addr;
-	    if (ELF_ST_TYPE(sym->st_info) != STT_FUNC || sym->st_size <= 0) continue;
-	    for (i = offset; i < num_traces; i++) {
-		uintptr_t d = (uintptr_t)traces[i] - saddr;
-		if (lines[i].line > 0 || d <= 0 || d > (uintptr_t)sym->st_size)
-		    continue;
-		/* fill symbol name and addr from .symtab */
-		lines[i].sname = strtab + sym->st_name;
-		lines[i].saddr = saddr;
-		lines[i].path  = obj->path;
-		lines[i].base_addr = obj->base_addr;
-	    }
-	}
+    if (obj->debug_info.ptr && obj->debug_abbrev.ptr) {
+        DebugInfoReader reader;
+        debug_info_reader_init(&reader, obj);
+        i = 0;
+        while (reader.p < reader.pend) {
+            /* fprintf(stderr, "%d:%tx: CU[%d]\n", __LINE__, reader.p - reader.obj->debug_info.ptr, i++); */
+            if (di_read_cu(&reader)) goto use_symtab;
+            debug_info_read(&reader, num_traces, traces, lines, offset);
+        }
+    }
+    else {
+        /* This file doesn't have dwarf, use symtab or dynsym */
+use_symtab:
+        if (!symtab_shdr) {
+            /* This file doesn't have symtab, use dynsym instead */
+            symtab_shdr = dynsym_shdr;
+            strtab_shdr = dynstr_shdr;
+        }
+
+        if (symtab_shdr && strtab_shdr) {
+            char *strtab = file + strtab_shdr->sh_offset;
+            ElfW(Sym) *symtab = (ElfW(Sym) *)(file + symtab_shdr->sh_offset);
+            int symtab_count = (int)(symtab_shdr->sh_size / sizeof(ElfW(Sym)));
+            for (j = 0; j < symtab_count; j++) {
+                ElfW(Sym) *sym = &symtab[j];
+                uintptr_t saddr = (uintptr_t)sym->st_value + obj->base_addr;
+                if (ELF_ST_TYPE(sym->st_info) != STT_FUNC) continue;
+                for (i = offset; i < num_traces; i++) {
+                    uintptr_t d = (uintptr_t)traces[i] - saddr;
+                    if (lines[i].line > 0 || d > (uintptr_t)sym->st_size)
+                        continue;
+                    /* fill symbol name and addr from .symtab */
+                    if (!lines[i].sname) lines[i].sname = strtab + sym->st_name;
+                    lines[i].saddr = saddr;
+                    lines[i].path  = obj->path;
+                    lines[i].base_addr = obj->base_addr;
+                }
+            }
+        }
     }
 
-    if (!debug_line_shdr) {
+    if (!obj->debug_line.ptr) {
 	/* This file doesn't have .debug_line section,
 	   let's check .gnu_debuglink section instead. */
 	if (gnu_debuglink_shdr && check_debuglink) {
@@ -617,18 +1855,244 @@ fill_lines(int num_traces, void **traces, int check_debuglink,
 			     num_traces, traces,
 			     objp, lines, offset);
 	}
+        if (note_gnu_build_id && check_debuglink) {
+            ElfW(Nhdr) *nhdr = (ElfW(Nhdr)*) (file + note_gnu_build_id->sh_offset);
+            const char *build_id = (char *)(nhdr + 1) + nhdr->n_namesz;
+            follow_debuglink_build_id(build_id, nhdr->n_descsz,
+			       num_traces, traces,
+			       objp, lines, offset);
+        }
 	goto finish;
     }
 
-    parse_debug_line(num_traces, traces,
-		     file + debug_line_shdr->sh_offset,
-		     debug_line_shdr->sh_size,
-		     obj, lines, offset);
+    if (parse_debug_line(num_traces, traces,
+            obj->debug_line.ptr,
+            obj->debug_line.size,
+            obj, lines, offset) == -1)
+        goto fail;
+
 finish:
     return dladdr_fbase;
 fail:
     return (uintptr_t)-1;
 }
+#else /* Mach-O */
+/* read file and fill lines */
+static uintptr_t
+fill_lines(int num_traces, void **traces, int check_debuglink,
+        obj_info_t **objp, line_info_t *lines, int offset)
+{
+# ifdef __LP64__
+#  define LP(x) x##_64
+# else
+#  define LP(x) x
+# endif
+    int fd;
+    off_t filesize;
+    char *file, *p = NULL;
+    obj_info_t *obj = *objp;
+    struct LP(mach_header) *header;
+    uintptr_t dladdr_fbase = 0;
+
+    {
+        char *s = binary_filename;
+        char *base = strrchr(binary_filename, '/')+1;
+        size_t max = PATH_MAX;
+        size_t size = strlen(binary_filename);
+        size_t basesize = size - (base - binary_filename);
+        s += size;
+        max -= size;
+        p = s;
+        size = strlcpy(s, ".dSYM/Contents/Resources/DWARF/", max);
+        if (size == 0) goto fail;
+        s += size;
+        max -= size;
+        if (max <= basesize) goto fail;
+        memcpy(s, base, basesize);
+        s[basesize] = 0;
+
+        fd = open(binary_filename, O_RDONLY);
+        if (fd < 0) {
+            *p = 0; /* binary_filename becomes original file name */
+            fd = open(binary_filename, O_RDONLY);
+            if (fd < 0) {
+                goto fail;
+            }
+        }
+    }
+
+    filesize = lseek(fd, 0, SEEK_END);
+    if (filesize < 0) {
+        int e = errno;
+        close(fd);
+        kprintf("lseek: %s\n", strerror(e));
+        goto fail;
+    }
+#if SIZEOF_OFF_T > SIZEOF_SIZE_T
+    if (filesize > (off_t)SIZE_MAX) {
+        close(fd);
+        kprintf("Too large file %s\n", binary_filename);
+        goto fail;
+    }
+#endif
+    lseek(fd, 0, SEEK_SET);
+    /* async-signal unsafe */
+    file = (char *)mmap(NULL, (size_t)filesize, PROT_READ, MAP_SHARED, fd, 0);
+    if (file == MAP_FAILED) {
+        int e = errno;
+        close(fd);
+        kprintf("mmap: %s\n", strerror(e));
+        goto fail;
+    }
+    close(fd);
+
+    obj->mapped = file;
+    obj->mapped_size = (size_t)filesize;
+
+    header = (struct LP(mach_header) *)file;
+    if (header->magic == LP(MH_MAGIC)) {
+        /* non universal binary */
+        p = file;
+    }
+    else if (header->magic == FAT_CIGAM) {
+        struct LP(mach_header) *mhp = _NSGetMachExecuteHeader();
+        struct fat_header *fat = (struct fat_header *)file;
+        char *q = file + sizeof(*fat);
+        uint32_t nfat_arch = __builtin_bswap32(fat->nfat_arch);
+        /* fprintf(stderr,"%d: fat:%s %d\n",__LINE__, binary_filename,nfat_arch); */
+        for (uint32_t i = 0; i < nfat_arch; i++) {
+            struct fat_arch *arch = (struct fat_arch *)q;
+            cpu_type_t cputype = __builtin_bswap32(arch->cputype);
+            cpu_subtype_t cpusubtype = __builtin_bswap32(arch->cpusubtype);
+            uint32_t offset = __builtin_bswap32(arch->offset);
+            /* fprintf(stderr,"%d: fat %d %x/%x %x/%x\n",__LINE__, i, mhp->cputype,mhp->cpusubtype, cputype,cpusubtype); */
+            if (mhp->cputype == cputype &&
+                    (cpu_subtype_t)(mhp->cpusubtype & ~CPU_SUBTYPE_MASK) == cpusubtype) {
+                p = file + offset;
+                file = p;
+                header = (struct LP(mach_header) *)p;
+                if (header->magic == LP(MH_MAGIC)) {
+                    goto found_mach_header;
+                }
+                break;
+            }
+            q += sizeof(*arch);
+        }
+        kprintf("'%s' is not a Mach-O universal binary file!\n",binary_filename);
+        close(fd);
+        goto fail;
+    }
+    else {
+        kprintf("'%s' is not a "
+# ifdef __LP64__
+                "64"
+# else
+                "32"
+# endif
+                "-bit Mach-O file!\n",binary_filename);
+        close(fd);
+        goto fail;
+    }
+found_mach_header:
+    p += sizeof(*header);
+
+    for (uint32_t i = 0; i < (uint32_t)header->ncmds; i++) {
+        struct load_command *lcmd = (struct load_command *)p;
+        switch (lcmd->cmd) {
+          case LP(LC_SEGMENT):
+            {
+                static const char *debug_section_names[] = {
+                    "__debug_abbrev",
+                    "__debug_info",
+                    "__debug_line",
+                    "__debug_ranges",
+                    "__debug_str"
+                };
+                struct LP(segment_command) *scmd = (struct LP(segment_command) *)lcmd;
+                if (strcmp(scmd->segname, "__TEXT") == 0) {
+                    obj->vmaddr = scmd->vmaddr;
+                }
+                else if (strcmp(scmd->segname, "__DWARF") == 0) {
+                    p += sizeof(struct LP(segment_command));
+                    for (uint64_t i = 0; i < scmd->nsects; i++) {
+                        struct LP(section) *sect = (struct LP(section) *)p;
+                        p += sizeof(struct LP(section));
+                        for (int j=0; j < DWARF_SECTION_COUNT; j++) {
+                            struct dwarf_section *s = obj_dwarf_section_at(obj, j);
+
+                            if (strcmp(sect->sectname, debug_section_names[j]) != 0)
+                                continue;
+
+                            s->ptr = file + sect->offset;
+                            s->size = sect->size;
+                            s->flags = sect->flags;
+                            if (s->flags & SHF_COMPRESSED) {
+                                goto fail;
+                            }
+                            break;
+                        }
+                    }
+                }
+            }
+            break;
+
+          case LC_SYMTAB:
+            {
+                struct symtab_command *cmd = (struct symtab_command *)lcmd;
+                struct LP(nlist) *nl = (struct LP(nlist) *)(file + cmd->symoff);
+                char *strtab = file + cmd->stroff, *sname = 0;
+                uint32_t j;
+                uintptr_t saddr = 0;
+                /* kprintf("[%2d]: %x/symtab %p\n", i, cmd->cmd, p); */
+                for (j = 0; j < cmd->nsyms; j++) {
+                    uintptr_t symsize, d;
+                    struct LP(nlist) *e = &nl[j];
+                        /* kprintf("[%2d][%4d]: %02x/%x/%x: %s %llx\n", i, j, e->n_type,e->n_sect,e->n_desc,strtab+e->n_un.n_strx,e->n_value); */
+                    if (e->n_type != N_FUN) continue;
+                    if (e->n_sect) {
+                        saddr = (uintptr_t)e->n_value + obj->base_addr - obj->vmaddr;
+                        sname = strtab + e->n_un.n_strx;
+                        /* kprintf("[%2d][%4d]: %02x/%x/%x: %s %llx\n", i, j, e->n_type,e->n_sect,e->n_desc,strtab+e->n_un.n_strx,e->n_value); */
+                        continue;
+                    }
+                    for (int k = offset; k < num_traces; k++) {
+                        d = (uintptr_t)traces[k] - saddr;
+                        symsize = e->n_value;
+                        /* kprintf("%lx %lx %lx\n",saddr,symsize,traces[k]); */
+                        if (lines[k].line > 0 || d > (uintptr_t)symsize)
+                            continue;
+                        /* fill symbol name and addr from .symtab */
+                        if (!lines[k].sname) lines[k].sname = sname;
+                        lines[k].saddr = saddr;
+                        lines[k].path  = obj->path;
+                        lines[k].base_addr = obj->base_addr;
+                    }
+                }
+            }
+        }
+        p += lcmd->cmdsize;
+    }
+
+    if (obj->debug_info.ptr && obj->debug_abbrev.ptr) {
+        DebugInfoReader reader;
+        debug_info_reader_init(&reader, obj);
+        while (reader.p < reader.pend) {
+            if (di_read_cu(&reader)) goto fail;
+            debug_info_read(&reader, num_traces, traces, lines, offset);
+        }
+    }
+
+    if (parse_debug_line(num_traces, traces,
+            obj->debug_line.ptr,
+            obj->debug_line.size,
+            obj, lines, offset) == -1)
+        goto fail;
+
+    return dladdr_fbase;
+fail:
+    return (uintptr_t)-1;
+}
+#endif
 
 #define HAVE_MAIN_EXE_PATH
 #if defined(__FreeBSD__)
@@ -640,17 +2104,22 @@ fail:
  * and returns strlen(binary_filename).
  * it is NUL terminated.
  */
-#if defined(__linux__)
-ssize_t
+#if defined(__linux__) || defined(__NetBSD__)
+static ssize_t
 main_exe_path(void)
 {
-# define PROC_SELF_EXE "/proc/self/exe"
+# if defined(__linux__)
+#  define PROC_SELF_EXE "/proc/self/exe"
+# elif defined(__NetBSD__)
+#  define PROC_SELF_EXE "/proc/curproc/exe"
+# endif
     ssize_t len = readlink(PROC_SELF_EXE, binary_filename, PATH_MAX);
+    if (len < 0) return 0;
     binary_filename[len] = 0;
     return len;
 }
 #elif defined(__FreeBSD__)
-ssize_t
+static ssize_t
 main_exe_path(void)
 {
     int mib[4] = {CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1};
@@ -663,10 +2132,66 @@ main_exe_path(void)
     len--; /* sysctl sets strlen+1 */
     return len;
 }
+#elif defined(HAVE_LIBPROC_H)
+static ssize_t
+main_exe_path(void)
+{
+    int len = proc_pidpath(getpid(), binary_filename, PATH_MAX);
+    if (len == 0) return 0;
+    binary_filename[len] = 0;
+    return len;
+}
 #else
 #undef HAVE_MAIN_EXE_PATH
 #endif
 
+static void
+print_line0(line_info_t *line, void *address)
+{
+    uintptr_t addr = (uintptr_t)address;
+    uintptr_t d = addr - line->saddr;
+    if (!address) {
+        /* inlined */
+        if (line->dirname && line->dirname[0]) {
+            kprintf("%s(%s) %s/%s:%d\n", line->path, line->sname, line->dirname, line->filename, line->line);
+        }
+        else {
+            kprintf("%s(%s) %s:%d\n", line->path, line->sname, line->filename, line->line);
+        }
+    }
+    else if (!line->path) {
+        kprintf("[0x%"PRIxPTR"]\n", addr);
+    }
+    else if (!line->saddr || !line->sname) {
+        kprintf("%s(0x%"PRIxPTR") [0x%"PRIxPTR"]\n", line->path, addr-line->base_addr, addr);
+    }
+    else if (line->line <= 0) {
+        kprintf("%s(%s+0x%"PRIxPTR") [0x%"PRIxPTR"]\n", line->path, line->sname,
+                d, addr);
+    }
+    else if (!line->filename) {
+        kprintf("%s(%s+0x%"PRIxPTR") [0x%"PRIxPTR"] ???:%d\n", line->path, line->sname,
+                d, addr, line->line);
+    }
+    else if (line->dirname && line->dirname[0]) {
+        kprintf("%s(%s+0x%"PRIxPTR") [0x%"PRIxPTR"] %s/%s:%d\n", line->path, line->sname,
+                d, addr, line->dirname, line->filename, line->line);
+    }
+    else {
+        kprintf("%s(%s+0x%"PRIxPTR") [0x%"PRIxPTR"] %s:%d\n", line->path, line->sname,
+                d, addr, line->filename, line->line);
+    }
+}
+
+static void
+print_line(line_info_t *line, void *address)
+{
+    print_line0(line, address);
+    if (line->next) {
+        print_line(line->next, NULL);
+    }
+}
+
 void
 rb_dump_backtrace_with_lines(int num_traces, void **traces)
 {
@@ -718,8 +2243,11 @@ rb_dump_backtrace_with_lines(int num_traces, void **traces)
 	    path = info.dli_fname;
 	    obj->path = path;
 	    lines[i].path = path;
-	    strcpy(binary_filename, path);
-	    fill_lines(num_traces, traces, 1, &obj, lines, i);
+            lines[i].sname = info.dli_sname;
+            lines[i].saddr = (uintptr_t)info.dli_saddr;
+	    strlcpy(binary_filename, path, PATH_MAX);
+	    if (fill_lines(num_traces, traces, 1, &obj, lines, i) == (uintptr_t)-1)
+		break;
 	}
 next_line:
 	continue;
@@ -727,46 +2255,36 @@ next_line:
 
     /* output */
     for (i = 0; i < num_traces; i++) {
-	line_info_t *line = &lines[i];
-	uintptr_t addr = (uintptr_t)traces[i];
-	uintptr_t d = addr - line->saddr;
-	if (!line->path) {
-	    kprintf("[0x%lx]\n", addr);
-	}
-	else if (!line->saddr || !line->sname) {
-	    kprintf("%s [0x%lx]\n", line->path, addr);
-	}
-	else if (line->line <= 0) {
-	    kprintf("%s(%s+0x%lx) [0x%lx]\n", line->path, line->sname,
-		    d, addr);
-	}
-	else if (!line->filename) {
-	    kprintf("%s(%s+0x%lx) [0x%lx] ???:%d\n", line->path, line->sname,
-		    d, addr, line->line);
-	}
-	else if (line->dirname && line->dirname[0]) {
-	    kprintf("%s(%s+0x%lx) [0x%lx] %s/%s:%d\n", line->path, line->sname,
-		    d, addr, line->dirname, line->filename, line->line);
-	}
-	else {
-	    kprintf("%s(%s+0x%lx) [0x%lx] %s:%d\n", line->path, line->sname,
-		    d, addr, line->filename, line->line);
-	}
+        print_line(&lines[i], traces[i]);
+
 	/* FreeBSD's backtrace may show _start and so on */
-	if (line->sname && strcmp("main", line->sname) == 0)
+	if (lines[i].sname && strcmp("main", lines[i].sname) == 0)
 	    break;
     }
 
     /* free */
     while (obj) {
 	obj_info_t *o = obj;
-	obj = o->next;
-	if (o->fd) {
-	    munmap(o->mapped, o->mapped_size);
-	    close(o->fd);
+        for (i=0; i < DWARF_SECTION_COUNT; i++) {
+            struct dwarf_section *s = obj_dwarf_section_at(obj, i);
+            if (s->flags & SHF_COMPRESSED) {
+                free(s->ptr);
+            }
+        }
+	if (obj->mapped_size) {
+	    munmap(obj->mapped, obj->mapped_size);
 	}
+	obj = o->next;
 	free(o);
     }
+    for (i = 0; i < num_traces; i++) {
+        line_info_t *line = lines[i].next;
+        while (line) {
+            line_info_t *l = line;
+            line = line->next;
+            free(l);
+        }
+    }
     free(lines);
     free(dladdr_fbases);
 }
@@ -812,7 +2330,7 @@ next_line:
 #define MAXNBUF (sizeof(intmax_t) * CHAR_BIT + 1)
 static inline int toupper(int c) { return ('A' <= c && c <= 'Z') ? (c&0x5f) : c; }
 #define    hex2ascii(hex)  (hex2ascii_data[hex])
-char const hex2ascii_data[] = "0123456789abcdefghijklmnopqrstuvwxyz";
+static const char hex2ascii_data[] = "0123456789abcdefghijklmnopqrstuvwxyz";
 static inline int imax(int a, int b) { return (a > b ? a : b); }
 static int kvprintf(char const *fmt, void (*func)(int), void *arg, int radix, va_list ap);
 
@@ -826,7 +2344,7 @@ static void putce(int c)
     (void)ret;
 }
 
-int
+static int
 kprintf(const char *fmt, ...)
 {
 	va_list ap;
diff --git a/addr2line.h b/addr2line.h
index d99f010934..f09b665800 100644
--- a/addr2line.h
+++ b/addr2line.h
@@ -1,3 +1,5 @@
+#ifndef RUBY_ADDR2LINE_H
+#define RUBY_ADDR2LINE_H
 /**********************************************************************
 
   addr2line.h -
@@ -8,10 +10,7 @@
 
 **********************************************************************/
 
-#ifndef RUBY_ADDR2LINE_H
-#define RUBY_ADDR2LINE_H
-
-#ifdef USE_ELF
+#if (defined(USE_ELF) || defined(HAVE_MACH_O_LOADER_H))
 
 void
 rb_dump_backtrace_with_lines(int num_traces, void **traces);
diff --git a/appveyor.yml b/appveyor.yml
index e08314003d..78e3102008 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,37 +1,104 @@
 ---
-shallow_clone: true
-platform: x64
-install:
-  - SET
-  - '"C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64'
-  - SET PATH=\usr\local\bin;C:\Ruby22-x64\bin;C:\Ruby21-x64\Devkit\mingw\bin;%PATH%;C:\msys64\usr\bin
-  - ruby --version
-  - 'cl'
-  - SET
-  - mkdir \usr\local\bin
-  - mkdir \usr\local\include
-  - mkdir \usr\local\lib
-  - ps: Start-FileDownload 'http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.3.5-windows.zip'
-  - 7z x libressl-2.3.5-windows.zip
-  - copy libressl-2.3.5-windows\x64\libcrypto-37.lib \usr\local\lib\crypto.lib
-  - copy libressl-2.3.5-windows\x64\libssl-38.lib    \usr\local\lib\ssl.lib
-  - copy libressl-2.3.5-windows\x64\libcrypto-37.dll \usr\local\bin
-  - copy libressl-2.3.5-windows\x64\libssl-38.dll    \usr\local\bin
-  - xcopy /e libressl-2.3.5-windows\include          \usr\local\include
-  - ps: Start-FileDownload 'http://zlib.net/zlib128.zip'
-  - 7z x zlib128.zip
-  - cd zlib-1.2.8
-  - nmake -f win32/Makefile.msc
-  - copy zlib1.dll \usr\local\bin
-  - copy zlib.lib  \usr\local\lib
-  - copy zconf.h   \usr\local\include
-  - copy zlib.h    \usr\local\include
-build_script:
-  - cd %APPVEYOR_BUILD_FOLDER%
-  - win32\configure.bat --without-ext=+,dbm,gdbm,readline,tk* --with-opt-dir=/usr/local
-  - nmake -l up
-  - nmake -l
-  - nmake install-nodoc
-test_script:
-  - nmake -l "OPTS=-v -q" btest
-  - nmake -l "OPTS=-v -q" test-basic
+version: '{build}'
+init:
+  - git config --global user.name git
+  - git config --global user.email svn-admin@ruby-lang.org
+clone_depth: 10
+platform:
+  - x64
+environment:
+  ruby_version: "24-%Platform%"
+  matrix:
+    - build: vs
+      vs: 120
+      ssl: OpenSSL
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      GEMS_FOR_TEST: ""
+    - build: vs
+      vs: 140
+      ssl: OpenSSL-v111
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      GEMS_FOR_TEST: ""
+  RELINE_TEST_ENCODING: "Windows-31J"
+  UPDATE_UNICODE: "UNICODE_FILES=. UNICODE_PROPERTY_FILES=. UNICODE_AUXILIARY_FILES=. UNICODE_EMOJI_FILES=."
+cache:
+  - c:\Tools\vcpkg\installed\
+for:
+-
+  matrix:
+    only:
+      - build: vs
+  install:
+    - ver
+    - chcp
+    - SET BITS=%Platform:x86=32%
+    - SET BITS=%BITS:x=%
+    - SET OPENSSL_DIR=C:\%ssl%-Win%BITS%
+    - cd C:\Tools\vcpkg
+    - git pull -q
+    - .\bootstrap-vcpkg.bat
+    - cd %APPVEYOR_BUILD_FOLDER%
+    - vcpkg --triplet %Platform%-windows install libffi libyaml zlib
+    - set PATH=c:\Tools\vcpkg\installed\%Platform%-windows\bin;%PATH%
+    - CALL SET vcvars=%%^VS%VS%COMNTOOLS^%%..\..\VC\vcvarsall.bat
+    - SET vcvars
+    - '"%vcvars%" %Platform:x64=amd64%'
+    - SET ruby_path=C:\Ruby%ruby_version:-x86=%
+    - SET PATH=\usr\local\bin;%ruby_path%\bin;%PATH%;C:\msys64\mingw64\bin;C:\msys64\usr\bin
+    - ruby --version
+    - 'cl'
+    - echo> Makefile srcdir=.
+    - echo>> Makefile MSC_VER=0
+    - echo>> Makefile RT=none
+    - echo>> Makefile RT_VER=0
+    - echo>> Makefile BUILTIN_ENCOBJS=nul
+    - type win32\Makefile.sub >> Makefile
+    - nmake %mflags% touch-unicode-files
+    - nmake %mflags% %UPDATE_UNICODE% incs
+    - nmake %mflags% extract-extlibs
+    - del Makefile
+    - mkdir \usr\local\bin
+    - mkdir \usr\local\include
+    - mkdir \usr\local\lib
+    - for %%I in (%OPENSSL_DIR%\*.dll) do mklink /h \usr\local\bin\%%~nxI %%I
+    - attrib +r /s /d
+    - mkdir %Platform%-mswin_%vs%
+  build_script:
+    - cd %APPVEYOR_BUILD_FOLDER%
+    - cd %Platform%-mswin_%vs%
+    - >-
+      ..\win32\configure.bat
+      --without-ext=+,dbm,gdbm,readline
+      --with-opt-dir="/usr/local;c:/Tools/vcpkg/installed/%Platform%-windows"
+      --with-openssl-dir=%OPENSSL_DIR:\=/%
+    - nmake -l
+    - nmake install-nodoc
+    - \usr\bin\ruby -v -e "p :locale => Encoding.find('locale'), :filesystem => Encoding.find('filesystem')"
+    - if not "%GEMS_FOR_TEST%" == "" \usr\bin\gem install --no-document %GEMS_FOR_TEST%
+    - \usr\bin\ruby -ropenssl -e "puts 'Build    ' + OpenSSL::OPENSSL_VERSION, 'Runtime  ' + OpenSSL::OPENSSL_LIBRARY_VERSION"
+  test_script:
+    - set /a JOBS=%NUMBER_OF_PROCESSORS%
+    - nmake -l "TESTOPTS=-v -q" btest
+    - nmake -l "TESTOPTS=-v -q" test-basic
+    - nmake -l "TESTOPTS=-v --timeout-scale=3.0 --excludes=../test/excludes/_appveyor -j%JOBS% --exclude readline --exclude win32ole --exclude test_bignum --exclude test_syntax --exclude test_open-uri --exclude test_bundled_ca" test-all
+    # separately execute tests without -j which may crash worker with -j.
+    - nmake -l "TESTOPTS=-v --timeout-scale=3.0 --excludes=../test/excludes/_appveyor" test-all TESTS="../test/win32ole ../test/ruby/test_bignum.rb ../test/ruby/test_syntax.rb ../test/open-uri/test_open-uri.rb ../test/rubygems/test_bundled_ca.rb"
+    - nmake -l test-spec MSPECOPT=-fs # not using `-j` because sometimes `mspec -j` silently dies on Windows
+notifications:
+  - provider: Webhook
+    method: POST
+    url:
+      secure: CcFlJNDJ/a6to7u3Z4Fnz6dScEPNx7hTha2GkSRlV+1U6dqmxY/7uBcLXYb9gR3jfQk6w+2o/HrjNAyXMNGU/JOka3s2WRI4VKitzM+lQ08owvJIh0R7LxrGH0J2e81U # ruby-lang slack: ruby/simpler-alerts-bot
+    body: >-
+      {{^isPullRequest}}
+        {
+          "ci": "AppVeyor CI",
+          "env": "Visual Studio 2013 / 2015",
+          "url": "{{buildUrl}}",
+          "commit": "{{commitId}}",
+          "branch": "{{branch}}"
+        }
+      {{/isPullRequest}}
+    on_build_success: false
+    on_build_failure: true
+    on_build_status_changed: false
diff --git a/array.c b/array.c
index 6f1d65a88e..b48a6431e7 100644
--- a/array.c
+++ b/array.c
@@ -11,45 +11,87 @@
 
 **********************************************************************/
 
+#include "debug_counter.h"
+#include "id.h"
 #include "internal.h"
-#include "ruby/util.h"
-#include "ruby/st.h"
+#include "internal/array.h"
+#include "internal/compar.h"
+#include "internal/enum.h"
+#include "internal/gc.h"
+#include "internal/hash.h"
+#include "internal/numeric.h"
+#include "internal/object.h"
+#include "internal/proc.h"
+#include "internal/rational.h"
+#include "internal/vm.h"
 #include "probes.h"
-#include "id.h"
+#include "ruby/encoding.h"
+#include "ruby/st.h"
+#include "ruby/util.h"
+#include "transient_heap.h"
+#include "builtin.h"
 
-#ifndef ARRAY_DEBUG
+#if !ARRAY_DEBUG
+# undef NDEBUG
 # define NDEBUG
 #endif
 #include "ruby_assert.h"
 
 VALUE rb_cArray;
 
-static ID id_cmp, id_div, id_power;
+/* for OPTIMIZED_CMP: */
+#define id_cmp idCmp
 
 #define ARY_DEFAULT_SIZE 16
 #define ARY_MAX_SIZE (LONG_MAX / (int)sizeof(VALUE))
+#define SMALL_ARRAY_LEN 16
 
-# define ARY_SHARED_P(ary) \
-    (assert(!FL_TEST((ary), ELTS_SHARED) || !FL_TEST((ary), RARRAY_EMBED_FLAG)), \
-     FL_TEST((ary),ELTS_SHARED)!=0)
-# define ARY_EMBED_P(ary) \
-    (assert(!FL_TEST((ary), ELTS_SHARED) || !FL_TEST((ary), RARRAY_EMBED_FLAG)), \
-     FL_TEST((ary), RARRAY_EMBED_FLAG)!=0)
+RBIMPL_ATTR_MAYBE_UNUSED()
+static int
+should_be_T_ARRAY(VALUE ary)
+{
+    return RB_TYPE_P(ary, T_ARRAY);
+}
+
+RBIMPL_ATTR_MAYBE_UNUSED()
+static int
+should_not_be_shared_and_embedded(VALUE ary)
+{
+    return !FL_TEST((ary), ELTS_SHARED) || !FL_TEST((ary), RARRAY_EMBED_FLAG);
+}
+
+#define ARY_SHARED_P(ary) \
+  (assert(should_be_T_ARRAY((VALUE)(ary))), \
+   assert(should_not_be_shared_and_embedded((VALUE)ary)), \
+   FL_TEST_RAW((ary),ELTS_SHARED)!=0)
+
+#define ARY_EMBED_P(ary) \
+  (assert(should_be_T_ARRAY((VALUE)(ary))), \
+   assert(should_not_be_shared_and_embedded((VALUE)ary)), \
+   FL_TEST_RAW((ary), RARRAY_EMBED_FLAG) != 0)
 
 #define ARY_HEAP_PTR(a) (assert(!ARY_EMBED_P(a)), RARRAY(a)->as.heap.ptr)
 #define ARY_HEAP_LEN(a) (assert(!ARY_EMBED_P(a)), RARRAY(a)->as.heap.len)
+#define ARY_HEAP_CAPA(a) (assert(!ARY_EMBED_P(a)), assert(!ARY_SHARED_ROOT_P(a)), \
+                          RARRAY(a)->as.heap.aux.capa)
+
 #define ARY_EMBED_PTR(a) (assert(ARY_EMBED_P(a)), RARRAY(a)->as.ary)
 #define ARY_EMBED_LEN(a) \
     (assert(ARY_EMBED_P(a)), \
      (long)((RBASIC(a)->flags >> RARRAY_EMBED_LEN_SHIFT) & \
 	 (RARRAY_EMBED_LEN_MASK >> RARRAY_EMBED_LEN_SHIFT)))
-#define ARY_HEAP_SIZE(a) (assert(!ARY_EMBED_P(a)), assert(ARY_OWNS_HEAP_P(a)), RARRAY(a)->as.heap.aux.capa * sizeof(VALUE))
+#define ARY_HEAP_SIZE(a) (assert(!ARY_EMBED_P(a)), assert(ARY_OWNS_HEAP_P(a)), ARY_CAPA(a) * sizeof(VALUE))
+
+#define ARY_OWNS_HEAP_P(a) (assert(should_be_T_ARRAY((VALUE)(a))), \
+                            !FL_TEST_RAW((a), ELTS_SHARED|RARRAY_EMBED_FLAG))
 
-#define ARY_OWNS_HEAP_P(a) (!FL_TEST((a), ELTS_SHARED|RARRAY_EMBED_FLAG))
 #define FL_SET_EMBED(a) do { \
     assert(!ARY_SHARED_P(a)); \
     FL_SET((a), RARRAY_EMBED_FLAG); \
+    RARY_TRANSIENT_UNSET(a); \
+    ary_verify(a); \
 } while (0)
+
 #define FL_UNSET_EMBED(ary) FL_UNSET((ary), RARRAY_EMBED_FLAG|RARRAY_EMBED_LEN_MASK)
 #define FL_SET_SHARED(ary) do { \
     assert(!ARY_EMBED_P(ary)); \
@@ -98,7 +140,7 @@ static ID id_cmp, id_div, id_power;
 } while (0)
 
 #define ARY_CAPA(ary) (ARY_EMBED_P(ary) ? RARRAY_EMBED_LEN_MAX : \
-		       ARY_SHARED_ROOT_P(ary) ? RARRAY_LEN(ary) : RARRAY(ary)->as.heap.aux.capa)
+                       ARY_SHARED_ROOT_P(ary) ? RARRAY_LEN(ary) : ARY_HEAP_CAPA(ary))
 #define ARY_SET_CAPA(ary, n) do { \
     assert(!ARY_EMBED_P(ary)); \
     assert(!ARY_SHARED_P(ary)); \
@@ -106,33 +148,116 @@ static ID id_cmp, id_div, id_power;
     RARRAY(ary)->as.heap.aux.capa = (n); \
 } while (0)
 
-#define ARY_SHARED(ary) (assert(ARY_SHARED_P(ary)), RARRAY(ary)->as.heap.aux.shared)
+#define ARY_SHARED_ROOT(ary) (assert(ARY_SHARED_P(ary)), RARRAY(ary)->as.heap.aux.shared_root)
 #define ARY_SET_SHARED(ary, value) do { \
     const VALUE _ary_ = (ary); \
     const VALUE _value_ = (value); \
     assert(!ARY_EMBED_P(_ary_)); \
     assert(ARY_SHARED_P(_ary_)); \
     assert(ARY_SHARED_ROOT_P(_value_)); \
-    RB_OBJ_WRITE(_ary_, &RARRAY(_ary_)->as.heap.aux.shared, _value_); \
+    RB_OBJ_WRITE(_ary_, &RARRAY(_ary_)->as.heap.aux.shared_root, _value_); \
 } while (0)
 #define RARRAY_SHARED_ROOT_FLAG FL_USER5
-#define ARY_SHARED_ROOT_P(ary) (FL_TEST((ary), RARRAY_SHARED_ROOT_FLAG))
-#define ARY_SHARED_NUM(ary) \
+#define ARY_SHARED_ROOT_P(ary) (assert(should_be_T_ARRAY((VALUE)(ary))), \
+                                FL_TEST_RAW((ary), RARRAY_SHARED_ROOT_FLAG))
+#define ARY_SHARED_ROOT_REFCNT(ary) \
     (assert(ARY_SHARED_ROOT_P(ary)), RARRAY(ary)->as.heap.aux.capa)
-#define ARY_SHARED_OCCUPIED(ary) (ARY_SHARED_NUM(ary) == 1)
-#define ARY_SET_SHARED_NUM(ary, value) do { \
+#define ARY_SHARED_ROOT_OCCUPIED(ary) (ARY_SHARED_ROOT_REFCNT(ary) == 1)
+#define ARY_SET_SHARED_ROOT_REFCNT(ary, value) do { \
     assert(ARY_SHARED_ROOT_P(ary)); \
     RARRAY(ary)->as.heap.aux.capa = (value); \
 } while (0)
 #define FL_SET_SHARED_ROOT(ary) do { \
     assert(!ARY_EMBED_P(ary)); \
+    assert(!RARRAY_TRANSIENT_P(ary)); \
     FL_SET((ary), RARRAY_SHARED_ROOT_FLAG); \
 } while (0)
 
-#define ARY_SET(a, i, v) RARRAY_ASET((assert(!ARY_SHARED_P(a)), (a)), (i), (v))
+static inline void
+ARY_SET(VALUE a, long i, VALUE v)
+{
+    assert(!ARY_SHARED_P(a));
+    assert(!OBJ_FROZEN(a));
+
+    RARRAY_ASET(a, i, v);
+}
+#undef RARRAY_ASET
+
+
+#if ARRAY_DEBUG
+#define ary_verify(ary) ary_verify_(ary, __FILE__, __LINE__)
+
+static VALUE
+ary_verify_(VALUE ary, const char *file, int line)
+{
+    assert(RB_TYPE_P(ary, T_ARRAY));
+
+    if (FL_TEST(ary, ELTS_SHARED)) {
+        VALUE root = RARRAY(ary)->as.heap.aux.shared_root;
+        const VALUE *ptr = ARY_HEAP_PTR(ary);
+        const VALUE *root_ptr = RARRAY_CONST_PTR_TRANSIENT(root);
+        long len = ARY_HEAP_LEN(ary), root_len = RARRAY_LEN(root);
+        assert(FL_TEST(root, RARRAY_SHARED_ROOT_FLAG));
+        assert(root_ptr <= ptr && ptr + len <= root_ptr + root_len);
+        ary_verify(root);
+    }
+    else if (ARY_EMBED_P(ary)) {
+        assert(!RARRAY_TRANSIENT_P(ary));
+        assert(!ARY_SHARED_P(ary));
+        assert(RARRAY_LEN(ary) <= RARRAY_EMBED_LEN_MAX);
+    }
+    else {
+#if 1
+        const VALUE *ptr = RARRAY_CONST_PTR_TRANSIENT(ary);
+        long i, len = RARRAY_LEN(ary);
+        volatile VALUE v;
+        if (len > 1) len = 1; /* check only HEAD */
+        for (i=0; i<len; i++) {
+            v = ptr[i]; /* access check */
+        }
+        v = v;
+#endif
+    }
+
+#if USE_TRANSIENT_HEAP
+    if (RARRAY_TRANSIENT_P(ary)) {
+        assert(rb_transient_heap_managed_ptr_p(RARRAY_CONST_PTR_TRANSIENT(ary)));
+    }
+#endif
+
+    rb_transient_heap_verify();
+
+    return ary;
+}
+
+void
+rb_ary_verify(VALUE ary)
+{
+    ary_verify(ary);
+}
+#else
+#define ary_verify(ary) ((void)0)
+#endif
+
+VALUE *
+rb_ary_ptr_use_start(VALUE ary)
+{
+#if ARRAY_DEBUG
+    FL_SET_RAW(ary, RARRAY_PTR_IN_USE_FLAG);
+#endif
+    return (VALUE *)RARRAY_CONST_PTR_TRANSIENT(ary);
+}
+
+void
+rb_ary_ptr_use_end(VALUE ary)
+{
+#if ARRAY_DEBUG
+    FL_UNSET_RAW(ary, RARRAY_PTR_IN_USE_FLAG);
+#endif
+}
 
 void
-rb_mem_clear(register VALUE *mem, register long size)
+rb_mem_clear(VALUE *mem, long size)
 {
     while (size--) {
 	*mem++ = Qnil;
@@ -142,7 +267,7 @@ rb_mem_clear(register VALUE *mem, register long size)
 static void
 ary_mem_clear(VALUE ary, long beg, long size)
 {
-    RARRAY_PTR_USE(ary, ptr, {
+    RARRAY_PTR_USE_TRANSIENT(ary, ptr, {
 	rb_mem_clear(ptr + beg, size);
     });
 }
@@ -158,7 +283,7 @@ memfill(register VALUE *mem, register long size, register VALUE val)
 static void
 ary_memfill(VALUE ary, long beg, long size, VALUE val)
 {
-    RARRAY_PTR_USE(ary, ptr, {
+    RARRAY_PTR_USE_TRANSIENT(ary, ptr, {
 	memfill(ptr + beg, size, val);
 	RB_OBJ_WRITTEN(ary, Qundef, val);
     });
@@ -167,28 +292,22 @@ ary_memfill(VALUE ary, long beg, long size, VALUE val)
 static void
 ary_memcpy0(VALUE ary, long beg, long argc, const VALUE *argv, VALUE buff_owner_ary)
 {
-#if 1
     assert(!ARY_SHARED_P(buff_owner_ary));
 
     if (argc > (int)(128/sizeof(VALUE)) /* is magic number (cache line size) */) {
-	rb_gc_writebarrier_remember(buff_owner_ary);
-	RARRAY_PTR_USE(ary, ptr, {
-	    MEMCPY(ptr+beg, argv, VALUE, argc);
-	});
+        rb_gc_writebarrier_remember(buff_owner_ary);
+        RARRAY_PTR_USE_TRANSIENT(ary, ptr, {
+            MEMCPY(ptr+beg, argv, VALUE, argc);
+        });
     }
     else {
-	int i;
-	RARRAY_PTR_USE(ary, ptr, {
-	    for (i=0; i<argc; i++) {
-		RB_OBJ_WRITE(buff_owner_ary, &ptr[i+beg], argv[i]);
-	    }
-	});
+        int i;
+        RARRAY_PTR_USE_TRANSIENT(ary, ptr, {
+            for (i=0; i<argc; i++) {
+                RB_OBJ_WRITE(buff_owner_ary, &ptr[i+beg], argv[i]);
+            }
+        });
     }
-#else
-    /* giveup write barrier (traditional way) */
-    RARRAY_PTR(buff_owner_ary);
-    MEMCPY(RARRAY_PTR(ary)+beg, argv, VALUE, argc);
-#endif
 }
 
 static void
@@ -197,49 +316,175 @@ ary_memcpy(VALUE ary, long beg, long argc, const VALUE *argv)
     ary_memcpy0(ary, beg, argc, argv, ary);
 }
 
+static VALUE *
+ary_heap_alloc(VALUE ary, size_t capa)
+{
+    VALUE *ptr = rb_transient_heap_alloc(ary, sizeof(VALUE) * capa);
+
+    if (ptr != NULL) {
+        RARY_TRANSIENT_SET(ary);
+    }
+    else {
+        RARY_TRANSIENT_UNSET(ary);
+        ptr = ALLOC_N(VALUE, capa);
+    }
+
+    return ptr;
+}
+
+static void
+ary_heap_free_ptr(VALUE ary, const VALUE *ptr, long size)
+{
+    if (RARRAY_TRANSIENT_P(ary)) {
+        /* ignore it */
+    }
+    else {
+        ruby_sized_xfree((void *)ptr, size);
+    }
+}
+
+static void
+ary_heap_free(VALUE ary)
+{
+    if (RARRAY_TRANSIENT_P(ary)) {
+        RARY_TRANSIENT_UNSET(ary);
+    }
+    else {
+        ary_heap_free_ptr(ary, ARY_HEAP_PTR(ary), ARY_HEAP_SIZE(ary));
+    }
+}
+
+static void
+ary_heap_realloc(VALUE ary, size_t new_capa)
+{
+    size_t old_capa = ARY_HEAP_CAPA(ary);
+
+    if (RARRAY_TRANSIENT_P(ary)) {
+        if (new_capa <= old_capa) {
+            /* do nothing */
+        }
+        else {
+            VALUE *new_ptr = rb_transient_heap_alloc(ary, sizeof(VALUE) * new_capa);
+
+            if (new_ptr == NULL) {
+                new_ptr = ALLOC_N(VALUE, new_capa);
+                RARY_TRANSIENT_UNSET(ary);
+            }
+
+            MEMCPY(new_ptr, ARY_HEAP_PTR(ary), VALUE, old_capa);
+            ARY_SET_PTR(ary, new_ptr);
+        }
+    }
+    else {
+        SIZED_REALLOC_N(RARRAY(ary)->as.heap.ptr, VALUE, new_capa, old_capa);
+    }
+    ary_verify(ary);
+}
+
+#if USE_TRANSIENT_HEAP
+static inline void
+rb_ary_transient_heap_evacuate_(VALUE ary, int transient, int promote)
+{
+    if (transient) {
+        VALUE *new_ptr;
+        const VALUE *old_ptr = ARY_HEAP_PTR(ary);
+        long capa = ARY_HEAP_CAPA(ary);
+        long len  = ARY_HEAP_LEN(ary);
+
+        if (ARY_SHARED_ROOT_P(ary)) {
+            capa = len;
+        }
+
+        assert(ARY_OWNS_HEAP_P(ary));
+        assert(RARRAY_TRANSIENT_P(ary));
+        assert(!ARY_PTR_USING_P(ary));
+
+        if (promote) {
+            new_ptr = ALLOC_N(VALUE, capa);
+            RARY_TRANSIENT_UNSET(ary);
+        }
+        else {
+            new_ptr = ary_heap_alloc(ary, capa);
+        }
+
+        MEMCPY(new_ptr, old_ptr, VALUE, capa);
+        /* do not use ARY_SET_PTR() because they assert !frozen */
+        RARRAY(ary)->as.heap.ptr = new_ptr;
+    }
+
+    ary_verify(ary);
+}
+
+void
+rb_ary_transient_heap_evacuate(VALUE ary, int promote)
+{
+    rb_ary_transient_heap_evacuate_(ary, RARRAY_TRANSIENT_P(ary), promote);
+}
+
+void
+rb_ary_detransient(VALUE ary)
+{
+    assert(RARRAY_TRANSIENT_P(ary));
+    rb_ary_transient_heap_evacuate_(ary, TRUE, TRUE);
+}
+#else
+void
+rb_ary_detransient(VALUE ary)
+{
+    /* do nothing */
+}
+#endif
+
 static void
 ary_resize_capa(VALUE ary, long capacity)
 {
     assert(RARRAY_LEN(ary) <= capacity);
     assert(!OBJ_FROZEN(ary));
     assert(!ARY_SHARED_P(ary));
+
     if (capacity > RARRAY_EMBED_LEN_MAX) {
         if (ARY_EMBED_P(ary)) {
             long len = ARY_EMBED_LEN(ary);
-            VALUE *ptr = ALLOC_N(VALUE, (capacity));
+            VALUE *ptr = ary_heap_alloc(ary, capacity);
+
             MEMCPY(ptr, ARY_EMBED_PTR(ary), VALUE, len);
             FL_UNSET_EMBED(ary);
             ARY_SET_PTR(ary, ptr);
             ARY_SET_HEAP_LEN(ary, len);
         }
         else {
-	    SIZED_REALLOC_N(RARRAY(ary)->as.heap.ptr, VALUE, capacity, RARRAY(ary)->as.heap.aux.capa);
+            ary_heap_realloc(ary, capacity);
         }
-        ARY_SET_CAPA(ary, (capacity));
+        ARY_SET_CAPA(ary, capacity);
     }
     else {
         if (!ARY_EMBED_P(ary)) {
-            long len = RARRAY_LEN(ary);
-	    const VALUE *ptr = RARRAY_CONST_PTR(ary);
+            long len = ARY_HEAP_LEN(ary);
+            long old_capa = ARY_HEAP_CAPA(ary);
+            const VALUE *ptr = ARY_HEAP_PTR(ary);
 
-	    if (len > capacity) len = capacity;
+            if (len > capacity) len = capacity;
             MEMCPY((VALUE *)RARRAY(ary)->as.ary, ptr, VALUE, len);
+            ary_heap_free_ptr(ary, ptr, old_capa);
+
             FL_SET_EMBED(ary);
             ARY_SET_LEN(ary, len);
-	    ruby_xfree((VALUE *)ptr);
         }
     }
+
+    ary_verify(ary);
 }
 
 static inline void
 ary_shrink_capa(VALUE ary)
 {
     long capacity = ARY_HEAP_LEN(ary);
-    long old_capa = RARRAY(ary)->as.heap.aux.capa;
+    long old_capa = ARY_HEAP_CAPA(ary);
     assert(!ARY_SHARED_P(ary));
     assert(old_capa >= capacity);
-    if (old_capa > capacity)
-	REALLOC_N(RARRAY(ary)->as.heap.ptr, VALUE, capacity);
+    if (old_capa > capacity) ary_heap_realloc(ary, capacity);
+
+    ary_verify(ary);
 }
 
 static void
@@ -255,19 +500,21 @@ ary_double_capa(VALUE ary, long min)
     }
     new_capa += min;
     ary_resize_capa(ary, new_capa);
+
+    ary_verify(ary);
 }
 
 static void
-rb_ary_decrement_share(VALUE shared)
+rb_ary_decrement_share(VALUE shared_root)
 {
-    if (shared) {
-	long num = ARY_SHARED_NUM(shared) - 1;
+    if (shared_root) {
+        long num = ARY_SHARED_ROOT_REFCNT(shared_root) - 1;
 	if (num == 0) {
-	    rb_ary_free(shared);
-	    rb_gc_force_recycle(shared);
+            rb_ary_free(shared_root);
+            rb_gc_force_recycle(shared_root);
 	}
 	else if (num > 0) {
-	    ARY_SET_SHARED_NUM(shared, num);
+            ARY_SET_SHARED_ROOT_REFCNT(shared_root, num);
 	}
     }
 }
@@ -275,8 +522,8 @@ rb_ary_decrement_share(VALUE shared)
 static void
 rb_ary_unshare(VALUE ary)
 {
-    VALUE shared = RARRAY(ary)->as.heap.aux.shared;
-    rb_ary_decrement_share(shared);
+    VALUE shared_root = RARRAY(ary)->as.heap.aux.shared_root;
+    rb_ary_decrement_share(shared_root);
     FL_UNSET_SHARED(ary);
 }
 
@@ -289,65 +536,77 @@ rb_ary_unshare_safe(VALUE ary)
 }
 
 static VALUE
-rb_ary_increment_share(VALUE shared)
+rb_ary_increment_share(VALUE shared_root)
 {
-    long num = ARY_SHARED_NUM(shared);
+    long num = ARY_SHARED_ROOT_REFCNT(shared_root);
     if (num >= 0) {
-	ARY_SET_SHARED_NUM(shared, num + 1);
+        ARY_SET_SHARED_ROOT_REFCNT(shared_root, num + 1);
     }
-    return shared;
+    return shared_root;
 }
 
 static void
-rb_ary_set_shared(VALUE ary, VALUE shared)
+rb_ary_set_shared(VALUE ary, VALUE shared_root)
 {
-    rb_ary_increment_share(shared);
+    rb_ary_increment_share(shared_root);
     FL_SET_SHARED(ary);
-    ARY_SET_SHARED(ary, shared);
+    RB_DEBUG_COUNTER_INC(obj_ary_shared_create);
+    ARY_SET_SHARED(ary, shared_root);
 }
 
 static inline void
 rb_ary_modify_check(VALUE ary)
 {
     rb_check_frozen(ary);
+    ary_verify(ary);
 }
 
 void
-rb_ary_modify(VALUE ary)
+rb_ary_cancel_sharing(VALUE ary)
 {
-    rb_ary_modify_check(ary);
     if (ARY_SHARED_P(ary)) {
-	long shared_len, len = RARRAY_LEN(ary);
-	VALUE shared = ARY_SHARED(ary);
+        long shared_len, len = RARRAY_LEN(ary);
+        VALUE shared_root = ARY_SHARED_ROOT(ary);
+
+        ary_verify(shared_root);
+
         if (len <= RARRAY_EMBED_LEN_MAX) {
-	    const VALUE *ptr = ARY_HEAP_PTR(ary);
+            const VALUE *ptr = ARY_HEAP_PTR(ary);
             FL_UNSET_SHARED(ary);
             FL_SET_EMBED(ary);
-	    MEMCPY((VALUE *)ARY_EMBED_PTR(ary), ptr, VALUE, len);
-            rb_ary_decrement_share(shared);
+            MEMCPY((VALUE *)ARY_EMBED_PTR(ary), ptr, VALUE, len);
+            rb_ary_decrement_share(shared_root);
             ARY_SET_EMBED_LEN(ary, len);
         }
-	else if (ARY_SHARED_OCCUPIED(shared) && len > ((shared_len = RARRAY_LEN(shared))>>1)) {
-	    long shift = RARRAY_CONST_PTR(ary) - RARRAY_CONST_PTR(shared);
-	    FL_UNSET_SHARED(ary);
-	    ARY_SET_PTR(ary, RARRAY_CONST_PTR(shared));
-	    ARY_SET_CAPA(ary, shared_len);
-	    RARRAY_PTR_USE(ary, ptr, {
-		MEMMOVE(ptr, ptr+shift, VALUE, len);
-	    });
-	    FL_SET_EMBED(shared);
-	    rb_ary_decrement_share(shared);
-	}
+        else if (ARY_SHARED_ROOT_OCCUPIED(shared_root) && len > ((shared_len = RARRAY_LEN(shared_root))>>1)) {
+            long shift = RARRAY_CONST_PTR_TRANSIENT(ary) - RARRAY_CONST_PTR_TRANSIENT(shared_root);
+            FL_UNSET_SHARED(ary);
+            ARY_SET_PTR(ary, RARRAY_CONST_PTR_TRANSIENT(shared_root));
+            ARY_SET_CAPA(ary, shared_len);
+            RARRAY_PTR_USE_TRANSIENT(ary, ptr, {
+                MEMMOVE(ptr, ptr+shift, VALUE, len);
+            });
+            FL_SET_EMBED(shared_root);
+            rb_ary_decrement_share(shared_root);
+        }
         else {
-            VALUE *ptr = ALLOC_N(VALUE, len);
-            MEMCPY(ptr, RARRAY_CONST_PTR(ary), VALUE, len);
+            VALUE *ptr = ary_heap_alloc(ary, len);
+            MEMCPY(ptr, ARY_HEAP_PTR(ary), VALUE, len);
             rb_ary_unshare(ary);
             ARY_SET_CAPA(ary, len);
             ARY_SET_PTR(ary, ptr);
         }
 
-	rb_gc_writebarrier_remember(ary);
+        rb_gc_writebarrier_remember(ary);
     }
+    ary_verify(ary);
+}
+
+void
+rb_ary_modify(VALUE ary)
+{
+    rb_ary_modify_check(ary);
+    rb_ary_cancel_sharing(ary);
 }
 
 static VALUE
@@ -362,11 +621,14 @@ ary_ensure_room_for_push(VALUE ary, long add_len)
     }
     if (ARY_SHARED_P(ary)) {
 	if (new_len > RARRAY_EMBED_LEN_MAX) {
-	    VALUE shared = ARY_SHARED(ary);
-	    if (ARY_SHARED_OCCUPIED(shared)) {
-		if (RARRAY_CONST_PTR(ary) - RARRAY_CONST_PTR(shared) + new_len <= RARRAY_LEN(shared)) {
+            VALUE shared_root = ARY_SHARED_ROOT(ary);
+            if (ARY_SHARED_ROOT_OCCUPIED(shared_root)) {
+                if (ARY_HEAP_PTR(ary) - RARRAY_CONST_PTR_TRANSIENT(shared_root) + new_len <= RARRAY_LEN(shared_root)) {
 		    rb_ary_modify_check(ary);
-		    return shared;
+
+                    ary_verify(ary);
+                    ary_verify(shared_root);
+                    return shared_root;
 		}
 		else {
 		    /* if array is shared, then it is likely it participate in push/shift pattern */
@@ -375,28 +637,37 @@ ary_ensure_room_for_push(VALUE ary, long add_len)
 		    if (new_len > capa - (capa >> 6)) {
 			ary_double_capa(ary, new_len);
 		    }
+                    ary_verify(ary);
 		    return ary;
 		}
 	    }
 	}
+        ary_verify(ary);
+        rb_ary_modify(ary);
+    }
+    else {
+	rb_ary_modify_check(ary);
     }
-    rb_ary_modify(ary);
     capa = ARY_CAPA(ary);
     if (new_len > capa) {
 	ary_double_capa(ary, new_len);
     }
 
+    ary_verify(ary);
     return ary;
 }
 
 /*
  *  call-seq:
- *      ary.freeze -> ary
+ *    array.freeze -> self
  *
- *  Calls Object#freeze on +ary+ to prevent any further
- *  modification. A RuntimeError will be raised if a modification
- *  attempt is made.
+ *  Freezes +self+; returns +self+:
+ *    a = []
+ *    a.frozen? # => false
+ *    a.freeze
+ *    a.frozen? # => true
  *
+ *  An attempt to modify a frozen \Array raises FrozenError.
  */
 
 VALUE
@@ -405,21 +676,6 @@ rb_ary_freeze(VALUE ary)
     return rb_obj_freeze(ary);
 }
 
-/*
- *  call-seq:
- *     ary.frozen?  -> true or false
- *
- *  Return +true+ if this array is frozen (or temporarily frozen
- *  while being sorted). See also Object#frozen?
- */
-
-static VALUE
-rb_ary_frozen_p(VALUE ary)
-{
-    if (OBJ_FROZEN(ary)) return Qtrue;
-    return Qfalse;
-}
-
 /* This can be used to take a snapshot of an array (with
    e.g. rb_ary_replace) and check later whether the array has been
    modified from the snapshot.  The snapshot is cheap, though if
@@ -432,7 +688,7 @@ rb_ary_shared_with_p(VALUE ary1, VALUE ary2)
 {
     if (!ARY_EMBED_P(ary1) && ARY_SHARED_P(ary1) &&
 	!ARY_EMBED_P(ary2) && ARY_SHARED_P(ary2) &&
-	RARRAY(ary1)->as.heap.aux.shared == RARRAY(ary2)->as.heap.aux.shared &&
+        RARRAY(ary1)->as.heap.aux.shared_root == RARRAY(ary2)->as.heap.aux.shared_root &&
 	RARRAY(ary1)->as.heap.len == RARRAY(ary2)->as.heap.len) {
 	return Qtrue;
     }
@@ -473,7 +729,7 @@ ary_new(VALUE klass, long capa)
 
     ary = ary_alloc(klass);
     if (capa > RARRAY_EMBED_LEN_MAX) {
-	ptr = ALLOC_N(VALUE, capa);
+        ptr = ary_heap_alloc(ary, capa);
         FL_UNSET_EMBED(ary);
         ARY_SET_PTR(ary, ptr);
         ARY_SET_CAPA(ary, capa);
@@ -514,12 +770,70 @@ VALUE
     return ary;
 }
 
+MJIT_FUNC_EXPORTED VALUE
+rb_ary_tmp_new_from_values(VALUE klass, long n, const VALUE *elts)
+{
+    VALUE ary;
+
+    ary = ary_new(klass, n);
+    if (n > 0 && elts) {
+	ary_memcpy(ary, 0, n, elts);
+	ARY_SET_LEN(ary, n);
+    }
+
+    return ary;
+}
+
 VALUE
 rb_ary_new_from_values(long n, const VALUE *elts)
 {
+    return rb_ary_tmp_new_from_values(rb_cArray, n, elts);
+}
+
+static VALUE
+ec_ary_alloc(rb_execution_context_t *ec, VALUE klass)
+{
+    RB_EC_NEWOBJ_OF(ec, ary, struct RArray, klass, T_ARRAY | RARRAY_EMBED_FLAG | (RGENGC_WB_PROTECTED_ARRAY ? FL_WB_PROTECTED : 0));
+    /* Created array is:
+     *   FL_SET_EMBED((VALUE)ary);
+     *   ARY_SET_EMBED_LEN((VALUE)ary, 0);
+     */
+    return (VALUE)ary;
+}
+
+static VALUE
+ec_ary_new(rb_execution_context_t *ec, VALUE klass, long capa)
+{
+    VALUE ary,*ptr;
+
+    if (capa < 0) {
+	rb_raise(rb_eArgError, "negative array size (or size too big)");
+    }
+    if (capa > ARY_MAX_SIZE) {
+	rb_raise(rb_eArgError, "array size too big");
+    }
+
+    RUBY_DTRACE_CREATE_HOOK(ARRAY, capa);
+
+    ary = ec_ary_alloc(ec, klass);
+
+    if (capa > RARRAY_EMBED_LEN_MAX) {
+        ptr = ary_heap_alloc(ary, capa);
+        FL_UNSET_EMBED(ary);
+        ARY_SET_PTR(ary, ptr);
+        ARY_SET_CAPA(ary, capa);
+        ARY_SET_HEAP_LEN(ary, 0);
+    }
+
+    return ary;
+}
+
+VALUE
+rb_ec_ary_new_from_values(rb_execution_context_t *ec, long n, const VALUE *elts)
+{
     VALUE ary;
 
-    ary = rb_ary_new2(n);
+    ary = ec_ary_new(ec, rb_cArray, n);
     if (n > 0 && elts) {
 	ary_memcpy(ary, 0, n, elts);
 	ARY_SET_LEN(ary, n);
@@ -531,7 +845,9 @@ rb_ary_new_from_values(long n, const VALUE *elts)
 VALUE
 rb_ary_tmp_new(long capa)
 {
-    return ary_new(0, capa);
+    VALUE ary = ary_new(0, capa);
+    rb_ary_transient_heap_evacuate(ary, TRUE);
+    return ary;
 }
 
 VALUE
@@ -540,6 +856,7 @@ rb_ary_tmp_new_fill(long capa)
     VALUE ary = ary_new(0, capa);
     ary_memfill(ary, 0, capa, Qnil);
     ARY_SET_LEN(ary, capa);
+    rb_ary_transient_heap_evacuate(ary, TRUE);
     return ary;
 }
 
@@ -547,7 +864,29 @@ void
 rb_ary_free(VALUE ary)
 {
     if (ARY_OWNS_HEAP_P(ary)) {
-	ruby_sized_xfree((void *)ARY_HEAP_PTR(ary), ARY_HEAP_SIZE(ary));
+        if (USE_DEBUG_COUNTER &&
+            !ARY_SHARED_ROOT_P(ary) &&
+            ARY_HEAP_CAPA(ary) > RARRAY_LEN(ary)) {
+            RB_DEBUG_COUNTER_INC(obj_ary_extracapa);
+        }
+
+        if (RARRAY_TRANSIENT_P(ary)) {
+            RB_DEBUG_COUNTER_INC(obj_ary_transient);
+        }
+        else {
+            RB_DEBUG_COUNTER_INC(obj_ary_ptr);
+            ary_heap_free(ary);
+        }
+    }
+    else {
+        RB_DEBUG_COUNTER_INC(obj_ary_embed);
+    }
+
+    if (ARY_SHARED_P(ary)) {
+        RB_DEBUG_COUNTER_INC(obj_ary_shared);
+    }
+    if (ARY_SHARED_ROOT_P(ary) && ARY_SHARED_ROOT_OCCUPIED(ary)) {
+        RB_DEBUG_COUNTER_INC(obj_ary_shared_root_occupied);
     }
 }
 
@@ -555,7 +894,7 @@ RUBY_FUNC_EXPORTED size_t
 rb_ary_memsize(VALUE ary)
 {
     if (ARY_OWNS_HEAP_P(ary)) {
-	return RARRAY(ary)->as.heap.aux.capa * sizeof(VALUE);
+	return ARY_CAPA(ary) * sizeof(VALUE);
     }
     else {
 	return 0;
@@ -567,39 +906,52 @@ ary_discard(VALUE ary)
 {
     rb_ary_free(ary);
     RBASIC(ary)->flags |= RARRAY_EMBED_FLAG;
-    RBASIC(ary)->flags &= ~RARRAY_EMBED_LEN_MASK;
+    RBASIC(ary)->flags &= ~(RARRAY_EMBED_LEN_MASK | RARRAY_TRANSIENT_FLAG);
 }
 
 static VALUE
 ary_make_shared(VALUE ary)
 {
     assert(!ARY_EMBED_P(ary));
+    ary_verify(ary);
+
     if (ARY_SHARED_P(ary)) {
-	return ARY_SHARED(ary);
+        return ARY_SHARED_ROOT(ary);
     }
     else if (ARY_SHARED_ROOT_P(ary)) {
 	return ary;
     }
     else if (OBJ_FROZEN(ary)) {
+        rb_ary_transient_heap_evacuate(ary, TRUE);
 	ary_shrink_capa(ary);
 	FL_SET_SHARED_ROOT(ary);
-	ARY_SET_SHARED_NUM(ary, 1);
+        ARY_SET_SHARED_ROOT_REFCNT(ary, 1);
 	return ary;
     }
     else {
 	long capa = ARY_CAPA(ary), len = RARRAY_LEN(ary);
+        const VALUE *ptr;
 	NEWOBJ_OF(shared, struct RArray, 0, T_ARRAY | (RGENGC_WB_PROTECTED_ARRAY ? FL_WB_PROTECTED : 0));
-        FL_UNSET_EMBED(shared);
+        VALUE vshared = (VALUE)shared;
+
+        rb_ary_transient_heap_evacuate(ary, TRUE);
+        ptr = ARY_HEAP_PTR(ary);
 
-	ARY_SET_LEN((VALUE)shared, capa);
-	ARY_SET_PTR((VALUE)shared, RARRAY_CONST_PTR(ary));
-	ary_mem_clear((VALUE)shared, len, capa - len);
-	FL_SET_SHARED_ROOT(shared);
-	ARY_SET_SHARED_NUM((VALUE)shared, 1);
+        FL_UNSET_EMBED(vshared);
+        ARY_SET_LEN(vshared, capa);
+        ARY_SET_PTR(vshared, ptr);
+        ary_mem_clear(vshared, len, capa - len);
+        FL_SET_SHARED_ROOT(vshared);
+        ARY_SET_SHARED_ROOT_REFCNT(vshared, 1);
 	FL_SET_SHARED(ary);
-	ARY_SET_SHARED(ary, (VALUE)shared);
-	OBJ_FREEZE(shared);
-	return (VALUE)shared;
+        RB_DEBUG_COUNTER_INC(obj_ary_shared_create);
+        ARY_SET_SHARED(ary, vshared);
+        OBJ_FREEZE(vshared);
+
+        ary_verify(vshared);
+        ary_verify(ary);
+
+        return vshared;
     }
 }
 
@@ -610,7 +962,7 @@ ary_make_substitution(VALUE ary)
 
     if (len <= RARRAY_EMBED_LEN_MAX) {
 	VALUE subst = rb_ary_new2(len);
-	ary_memcpy(subst, 0, len, RARRAY_CONST_PTR(ary));
+        ary_memcpy(subst, 0, len, RARRAY_CONST_PTR_TRANSIENT(ary));
         ARY_SET_EMBED_LEN(subst, len);
         return subst;
     }
@@ -625,35 +977,37 @@ rb_assoc_new(VALUE car, VALUE cdr)
     return rb_ary_new3(2, car, cdr);
 }
 
-static VALUE
-to_ary(VALUE ary)
+VALUE
+rb_to_array_type(VALUE ary)
 {
-    return rb_convert_type(ary, T_ARRAY, "Array", "to_ary");
+    return rb_convert_type_with_id(ary, T_ARRAY, "Array", idTo_ary);
 }
+#define to_ary rb_to_array_type
 
 VALUE
 rb_check_array_type(VALUE ary)
 {
-    return rb_check_convert_type(ary, T_ARRAY, "Array", "to_ary");
+    return rb_check_convert_type_with_id(ary, T_ARRAY, "Array", idTo_ary);
+}
+
+MJIT_FUNC_EXPORTED VALUE
+rb_check_to_array(VALUE ary)
+{
+    return rb_check_convert_type_with_id(ary, T_ARRAY, "Array", idTo_a);
 }
 
 /*
  *  call-seq:
- *     Array.try_convert(obj) -> array or nil
+ *    Array.try_convert(object) -> object, new_array, or nil
  *
- *  Tries to convert +obj+ into an array, using +to_ary+ method.  Returns the
- *  converted array or +nil+ if +obj+ cannot be converted for any reason.
- *  This method can be used to check if an argument is an array.
+ *  If +object+ is an \Array object, returns +object+.
  *
- *     Array.try_convert([1])   #=> [1]
- *     Array.try_convert("1")   #=> nil
+ *  Otherwise if +object+ responds to <tt>:to_ary</tt>,
+ *  calls <tt>object.to_ary</tt> and returns the result.
  *
- *     if tmp = Array.try_convert(arg)
- *       # the argument is an array
- *     elsif tmp = String.try_convert(arg)
- *       # the argument is a string
- *     end
+ *  Returns +nil+ if +object+ does not respond to <tt>:to_ary</tt>
  *
+ *  Raises an exception unless <tt>object.to_ary</tt> returns an \Array object.
  */
 
 static VALUE
@@ -664,58 +1018,46 @@ rb_ary_s_try_convert(VALUE dummy, VALUE ary)
 
 /*
  *  call-seq:
- *     Array.new(size=0, default=nil)
- *     Array.new(array)
- *     Array.new(size) {|index| block }
- *
- *  Returns a new array.
- *
- *  In the first form, if no arguments are sent, the new array will be empty.
- *  When a +size+ and an optional +default+ are sent, an array is created with
- *  +size+ copies of +default+.  Take notice that all elements will reference the
- *  same object +default+.
- *
- *  The second form creates a copy of the array passed as a parameter (the
- *  array is generated by calling to_ary on the parameter).
- *
- *    first_array = ["Matz", "Guido"]
- *
- *    second_array = Array.new(first_array) #=> ["Matz", "Guido"]
- *
- *    first_array.equal? second_array       #=> false
- *
- *  In the last form, an array of the given size is created.  Each element in
- *  this array is created by passing the element's index to the given block
- *  and storing the return value.
- *
- *    Array.new(3){ |index| index ** 2 }
- *    # => [0, 1, 4]
- *
- *  == Common gotchas
- *
- *  When sending the second parameter, the same object will be used as the
- *  value for all the array elements:
- *
- *     a = Array.new(2, Hash.new)
- *     # => [{}, {}]
- *
- *     a[0]['cat'] = 'feline'
- *     a # => [{"cat"=>"feline"}, {"cat"=>"feline"}]
- *
- *     a[1]['cat'] = 'Felix'
- *     a # => [{"cat"=>"Felix"}, {"cat"=>"Felix"}]
- *
- *  Since all the Array elements store the same hash, changes to one of them
- *  will affect them all.
- *
- *  If multiple copies are what you want, you should use the block
- *  version which uses the result of that block each time an element
- *  of the array needs to be initialized:
- *
- *     a = Array.new(2) { Hash.new }
- *     a[0]['cat'] = 'feline'
- *     a # => [{"cat"=>"feline"}, {}]
- *
+ *    Array.new -> new_empty_array
+ *    Array.new(array) -> new_array
+ *    Array.new(size) -> new_array
+ *    Array.new(size, default_value) -> new_array
+ *    Array.new(size) {|index| ... } -> new_array
+ *
+ *  Returns a new \Array.
+ *
+ *  With no block and no arguments, returns a new empty \Array object.
+ *
+ *  With no block and a single \Array argument +array+,
+ *  returns a new \Array formed from +array+:
+ *    a = Array.new([:foo, 'bar', 2])
+ *    a.class # => Array
+ *    a # => [:foo, "bar", 2]
+ *
+ *  With no block and a single \Integer argument +size+,
+ *  returns a new \Array of the given size
+ *  whose elements are all +nil+:
+ *    a = Array.new(3)
+ *    a # => [nil, nil, nil]
+ *
+ *  With no block and arguments +size+ and +default_value+,
+ *  returns an \Array of the given size;
+ *  each element is that same +default_value+:
+ *    a = Array.new(3, 'x')
+ *    a # => ['x', 'x', 'x']
+ *
+ *  With a block and argument +size+,
+ *  returns an \Array of the given size;
+ *  the block is called with each successive integer +index+;
+ *  the element for that +index+ is the return value from the block:
+ *    a = Array.new(3) {|index| "Element #{index}" }
+ *    a # => ["Element 0", "Element 1", "Element 2"]
+ *
+ *  Raises ArgumentError if +size+ is negative.
+ *
+ *  With a block and no argument,
+ *  or a single argument +0+,
+ *  ignores the block and returns a new empty \Array.
  */
 
 static VALUE
@@ -726,8 +1068,8 @@ rb_ary_initialize(int argc, VALUE *argv, VALUE ary)
 
     rb_ary_modify(ary);
     if (argc == 0) {
-	if (ARY_OWNS_HEAP_P(ary) && RARRAY_CONST_PTR(ary) != 0) {
-	    ruby_sized_xfree((void *)RARRAY_CONST_PTR(ary), ARY_HEAP_SIZE(ary));
+        if (ARY_OWNS_HEAP_P(ary) && ARY_HEAP_PTR(ary) != NULL) {
+            ary_heap_free(ary);
 	}
         rb_ary_unshare_safe(ary);
         FL_SET_EMBED(ary);
@@ -778,7 +1120,7 @@ rb_ary_initialize(int argc, VALUE *argv, VALUE ary)
 /*
  * Returns a new array populated with the given objects.
  *
- *   Array.[]( 1, 'a', /^A/ ) # => [1, "a", /^A/]
+ *   Array.[]( 1, 'a', /^A/)  # => [1, "a", /^A/]
  *   Array[ 1, 'a', /^A/ ]    # => [1, "a", /^A/]
  *   [ 1, 'a', /^A/ ]         # => [1, "a", /^A/]
  */
@@ -834,7 +1176,7 @@ ary_make_partial(VALUE ary, VALUE klass, long offset, long len)
 
     if (len <= RARRAY_EMBED_LEN_MAX) {
         VALUE result = ary_alloc(klass);
-	ary_memcpy(result, 0, len, RARRAY_CONST_PTR(ary) + offset);
+        ary_memcpy(result, 0, len, RARRAY_CONST_PTR_TRANSIENT(ary) + offset);
         ARY_SET_EMBED_LEN(result, len);
         return result;
     }
@@ -843,20 +1185,69 @@ ary_make_partial(VALUE ary, VALUE klass, long offset, long len)
         FL_UNSET_EMBED(result);
 
         shared = ary_make_shared(ary);
-        ARY_SET_PTR(result, RARRAY_CONST_PTR(ary));
+        ARY_SET_PTR(result, RARRAY_CONST_PTR_TRANSIENT(ary));
         ARY_SET_LEN(result, RARRAY_LEN(ary));
         rb_ary_set_shared(result, shared);
 
         ARY_INCREASE_PTR(result, offset);
         ARY_SET_LEN(result, len);
+
+        ary_verify(shared);
+        ary_verify(result);
+        return result;
+    }
+}
+
+static VALUE
+ary_make_partial_step(VALUE ary, VALUE klass, long offset, long len, long step)
+{
+    assert(offset >= 0);
+    assert(len >= 0);
+    assert(offset+len <= RARRAY_LEN(ary));
+    assert(step != 0);
+
+    const VALUE *values = RARRAY_CONST_PTR_TRANSIENT(ary);
+    const long orig_len = len;
+
+    if ((step > 0 && step >= len) || (step < 0 && (step < -len))) {
+        VALUE result = ary_new(klass, 1);
+        VALUE *ptr = (VALUE *)ARY_EMBED_PTR(result);
+        RB_OBJ_WRITE(result, ptr, values[offset]);
+        ARY_SET_EMBED_LEN(result, 1);
         return result;
     }
+
+    long ustep = (step < 0) ? -step : step;
+    len = (len + ustep - 1) / ustep;
+
+    long i;
+    long j = offset + ((step > 0) ? 0 : (orig_len - 1));
+    VALUE result = ary_new(klass, len);
+    if (len <= RARRAY_EMBED_LEN_MAX) {
+        VALUE *ptr = (VALUE *)ARY_EMBED_PTR(result);
+        for (i = 0; i < len; ++i) {
+            RB_OBJ_WRITE(result, ptr+i, values[j]);
+            j += step;
+        }
+        ARY_SET_EMBED_LEN(result, len);
+    }
+    else {
+        RARRAY_PTR_USE_TRANSIENT(result, ptr, {
+            for (i = 0; i < len; ++i) {
+                RB_OBJ_WRITE(result, ptr+i, values[j]);
+                j += step;
+            }
+        });
+        ARY_SET_LEN(result, len);
+    }
+
+    return result;
 }
 
 static VALUE
 ary_make_shared_copy(VALUE ary)
 {
-    return ary_make_partial(ary, rb_obj_class(ary), 0, RARRAY_LEN(ary));
+    return ary_make_partial(ary, rb_cArray, 0, RARRAY_LEN(ary));
 }
 
 enum ary_take_pos_flags
@@ -868,13 +1259,17 @@ enum ary_take_pos_flags
 static VALUE
 ary_take_first_or_last(int argc, const VALUE *argv, VALUE ary, enum ary_take_pos_flags last)
 {
-    VALUE nv;
     long n;
     long len;
     long offset = 0;
 
-    rb_scan_args(argc, argv, "1", &nv);
-    n = NUM2LONG(nv);
+    argc = rb_check_arity(argc, 0, 1);
+    /* the case optional argument is omitted should be handled in
+     * callers of this function.  if another arity case is added,
+     * this arity check needs to rewrite. */
+    RUBY_ASSERT_ALWAYS(argc == 1);
+
+    n = NUM2LONG(argv[0]);
     len = RARRAY_LEN(ary);
     if (n > len) {
 	n = len;
@@ -890,26 +1285,28 @@ ary_take_first_or_last(int argc, const VALUE *argv, VALUE ary, enum ary_take_pos
 
 /*
  *  call-seq:
- *     ary << obj            -> ary
+ *    array << object -> self
  *
- *  Append---Pushes the given object on to the end of this array. This
- *  expression returns the array itself, so several appends
- *  may be chained together.
- *
- *     [ 1, 2 ] << "c" << "d" << [ 3, 4 ]
- *             #=>  [ 1, 2, "c", "d", [ 3, 4 ] ]
+ *  Appends +object+ to +self+; returns +self+:
+ *    a = [:foo, 'bar', 2]
+ *    a << :baz # => [:foo, "bar", 2, :baz]
  *
+ *  Appends +object+ as one element, even if it is another \Array:
+ *    a = [:foo, 'bar', 2]
+ *    a1 = a << [3, 4]
+ *    a1 # => [:foo, "bar", 2, [3, 4]]
  */
 
 VALUE
 rb_ary_push(VALUE ary, VALUE item)
 {
-    long idx = RARRAY_LEN(ary);
+    long idx = RARRAY_LEN((ary_verify(ary), ary));
     VALUE target_ary = ary_ensure_room_for_push(ary, 1);
-    RARRAY_PTR_USE(ary, ptr, {
+    RARRAY_PTR_USE_TRANSIENT(ary, ptr, {
 	RB_OBJ_WRITE(target_ary, &ptr[idx], item);
     });
     ARY_SET_LEN(ary, idx + 1);
+    ary_verify(ary);
     return ary;
 }
 
@@ -925,18 +1322,22 @@ rb_ary_cat(VALUE ary, const VALUE *argv, long len)
 
 /*
  *  call-seq:
- *     ary.push(obj, ... )   -> ary
- *
- *  Append --- Pushes the given object(s) on to the end of this array. This
- *  expression returns the array itself, so several appends
- *  may be chained together. See also Array#pop for the opposite
- *  effect.
- *
- *     a = [ "a", "b", "c" ]
- *     a.push("d", "e", "f")
- *             #=> ["a", "b", "c", "d", "e", "f"]
- *     [1, 2, 3].push(4).push(5)
- *             #=> [1, 2, 3, 4, 5]
+ *    array.push(*objects) -> self
+ *
+ *  Appends trailing elements.
+ *
+ *  Appends each argument in +objects+ to +self+;  returns +self+:
+ *    a = [:foo, 'bar', 2]
+ *    a.push(:baz, :bat) # => [:foo, "bar", 2, :baz, :bat]
+ *
+ *  Appends each argument as one element, even if it is another \Array:
+ *    a = [:foo, 'bar', 2]
+ *    a1 = a.push([:baz, :bat], [:bam, :bad])
+ *    a1 # => [:foo, "bar", 2, [:baz, :bat], [:bam, :bad]]
+ *
+ *  Array#append is an alias for \Array#push.
+ *
+ *  Related: #pop, #shift, #unshift.
  */
 
 static VALUE
@@ -960,25 +1361,36 @@ rb_ary_pop(VALUE ary)
     }
     --n;
     ARY_SET_LEN(ary, n);
+    ary_verify(ary);
     return RARRAY_AREF(ary, n);
 }
 
 /*
  *  call-seq:
- *     ary.pop    -> obj or nil
- *     ary.pop(n) -> new_ary
+ *    array.pop -> object or nil
+ *    array.pop(n) -> new_array
+ *
+ *  Removes and returns trailing elements.
+ *
+ *  When no argument is given and +self+ is not empty,
+ *  removes and returns the last element:
+ *    a = [:foo, 'bar', 2]
+ *    a.pop # => 2
+ *    a # => [:foo, "bar"]
  *
- *  Removes the last element from +self+ and returns it, or
- *  +nil+ if the array is empty.
+ *  Returns +nil+ if the array is empty.
  *
- *  If a number +n+ is given, returns an array of the last +n+ elements
- *  (or less) just like <code>array.slice!(-n, n)</code> does. See also
- *  Array#push for the opposite effect.
+ *  When a non-negative \Integer argument +n+ is given and is in range,
+ *  removes and returns the last +n+ elements in a new \Array:
+ *    a = [:foo, 'bar', 2]
+ *    a.pop(2) # => ["bar", 2]
  *
- *     a = [ "a", "b", "c", "d" ]
- *     a.pop     #=> "d"
- *     a.pop(2)  #=> ["b", "c"]
- *     a         #=> ["a"]
+ *  If +n+ is positive and out of range,
+ *  removes and returns all elements:
+ *    a = [:foo, 'bar', 2]
+ *    a.pop(50) # => [:foo, "bar", 2]
+ *
+ *  Related: #push, #shift, #unshift.
  */
 
 static VALUE
@@ -993,6 +1405,7 @@ rb_ary_pop_m(int argc, VALUE *argv, VALUE ary)
     rb_ary_modify_check(ary);
     result = ary_take_first_or_last(argc, argv, ary, ARY_TAKE_LAST);
     ARY_INCREASE_LEN(ary, -RARRAY_LEN(result));
+    ary_verify(ary);
     return result;
 }
 
@@ -1007,10 +1420,11 @@ rb_ary_shift(VALUE ary)
     top = RARRAY_AREF(ary, 0);
     if (!ARY_SHARED_P(ary)) {
 	if (len < ARY_DEFAULT_SIZE) {
-	    RARRAY_PTR_USE(ary, ptr, {
+            RARRAY_PTR_USE_TRANSIENT(ary, ptr, {
 		MEMMOVE(ptr, ptr+1, VALUE, len-1);
 	    }); /* WB: no new reference */
             ARY_INCREASE_LEN(ary, -1);
+            ary_verify(ary);
 	    return top;
 	}
         assert(!ARY_EMBED_P(ary)); /* ARY_EMBED_LEN_MAX < ARY_DEFAULT_SIZE */
@@ -1018,36 +1432,45 @@ rb_ary_shift(VALUE ary)
 	ARY_SET(ary, 0, Qnil);
 	ary_make_shared(ary);
     }
-    else if (ARY_SHARED_OCCUPIED(ARY_SHARED(ary))) {
-	RARRAY_PTR_USE(ary, ptr, ptr[0] = Qnil);
+    else if (ARY_SHARED_ROOT_OCCUPIED(ARY_SHARED_ROOT(ary))) {
+        RARRAY_PTR_USE_TRANSIENT(ary, ptr, ptr[0] = Qnil);
     }
     ARY_INCREASE_PTR(ary, 1);		/* shift ptr */
     ARY_INCREASE_LEN(ary, -1);
 
+    ary_verify(ary);
+
     return top;
 }
 
 /*
  *  call-seq:
- *     ary.shift    -> obj or nil
- *     ary.shift(n) -> new_ary
+ *     array.shift -> object or nil
+ *     array.shift(n) -> new_array
+ *
+ *  Removes and returns leading elements.
+ *
+ *  When no argument is given, removes and returns the first element:
+ *    a = [:foo, 'bar', 2]
+ *    a.shift # => :foo
+ *    a # => ['bar', 2]
+ *
+ *  Returns +nil+ if +self+ is empty.
  *
- *  Removes the first element of +self+ and returns it (shifting all
- *  other elements down by one). Returns +nil+ if the array
- *  is empty.
+ *  When positive \Integer argument +n+ is given, removes the first +n+ elements;
+ *  returns those elements in a new \Array:
+ *    a = [:foo, 'bar', 2]
+ *    a.shift(2) # => [:foo, 'bar']
+ *    a # => [2]
  *
- *  If a number +n+ is given, returns an array of the first +n+ elements
- *  (or less) just like <code>array.slice!(0, n)</code> does. With +ary+
- *  containing only the remainder elements, not including what was shifted to
- *  +new_ary+. See also Array#unshift for the opposite effect.
+ *  If +n+ is as large as or larger than <tt>self.length</tt>,
+ *  removes all elements; returns those elements in a new \Array:
+ *    a = [:foo, 'bar', 2]
+ *    a.shift(3) # => [:foo, 'bar', 2]
  *
- *     args = [ "-m", "-q", "filename" ]
- *     args.shift     #=> "-m"
- *     args           #=> ["-q", "filename"]
+ *  If +n+ is zero, returns a new empty \Array; +self+ is unmodified.
  *
- *     args = [ "-m", "-q", "filename" ]
- *     args.shift(2)  #=> ["-m", "-q"]
- *     args           #=> ["filename"]
+ *  Related: #push, #pop, #unshift.
  */
 
 static VALUE
@@ -1063,51 +1486,80 @@ rb_ary_shift_m(int argc, VALUE *argv, VALUE ary)
     rb_ary_modify_check(ary);
     result = ary_take_first_or_last(argc, argv, ary, ARY_TAKE_FIRST);
     n = RARRAY_LEN(result);
-    if (ARY_SHARED_P(ary)) {
-	if (ARY_SHARED_OCCUPIED(ARY_SHARED(ary))) {
-	  setup_occupied_shared:
-	    ary_mem_clear(ary, 0, n);
-	}
-        ARY_INCREASE_PTR(ary, n);
+    rb_ary_behead(ary,n);
+
+    return result;
+}
+
+static VALUE
+behead_shared(VALUE ary, long n)
+{
+    assert(ARY_SHARED_P(ary));
+    rb_ary_modify_check(ary);
+    if (ARY_SHARED_ROOT_OCCUPIED(ARY_SHARED_ROOT(ary))) {
+        ary_mem_clear(ary, 0, n);
+    }
+    ARY_INCREASE_PTR(ary, n);
+    ARY_INCREASE_LEN(ary, -n);
+    ary_verify(ary);
+    return ary;
+}
+
+static VALUE
+behead_transient(VALUE ary, long n)
+{
+    rb_ary_modify_check(ary);
+    RARRAY_PTR_USE_TRANSIENT(ary, ptr, {
+        MEMMOVE(ptr, ptr+n, VALUE, RARRAY_LEN(ary)-n);
+    }); /* WB: no new reference */
+    ARY_INCREASE_LEN(ary, -n);
+    ary_verify(ary);
+    return ary;
+}
+
+MJIT_FUNC_EXPORTED VALUE
+rb_ary_behead(VALUE ary, long n)
+{
+    if (n <= 0) {
+        return ary;
+    }
+    else if (ARY_SHARED_P(ary)) {
+        return behead_shared(ary, n);
+    }
+    else if (RARRAY_LEN(ary) >= ARY_DEFAULT_SIZE) {
+        ary_make_shared(ary);
+        return behead_shared(ary, n);
     }
     else {
-	if (RARRAY_LEN(ary) < ARY_DEFAULT_SIZE) {
-	    RARRAY_PTR_USE(ary, ptr, {
-		MEMMOVE(ptr, ptr+n, VALUE, RARRAY_LEN(ary)-n);
-	    }); /* WB: no new reference */
-	}
-	else {
-	    ary_make_shared(ary);
-	    goto setup_occupied_shared;
-	}
+        return behead_transient(ary, n);
     }
-    ARY_INCREASE_LEN(ary, -n);
+}
 
-    return result;
+static VALUE
+make_room_for_unshift(VALUE ary, const VALUE *head, VALUE *sharedp, int argc, long capa, long len)
+{
+    if (head - sharedp < argc) {
+        long room = capa - len - argc;
+
+        room -= room >> 4;
+        MEMMOVE((VALUE *)sharedp + argc + room, head, VALUE, len);
+        head = sharedp + argc + room;
+    }
+    ARY_SET_PTR(ary, head - argc);
+    assert(ARY_SHARED_ROOT_OCCUPIED(ARY_SHARED_ROOT(ary)));
+
+    ary_verify(ary);
+    return ARY_SHARED_ROOT(ary);
 }
 
 static VALUE
-ary_ensure_room_for_unshift(VALUE ary, int argc)
+ary_modify_for_unshift(VALUE ary, int argc)
 {
     long len = RARRAY_LEN(ary);
     long new_len = len + argc;
     long capa;
     const VALUE *head, *sharedp;
 
-    if (len > ARY_MAX_SIZE - argc) {
-	rb_raise(rb_eIndexError, "index %ld too big", new_len);
-    }
-
-    if (ARY_SHARED_P(ary)) {
-	VALUE shared = ARY_SHARED(ary);
-	capa = RARRAY_LEN(shared);
-	if (ARY_SHARED_OCCUPIED(shared) && capa > new_len) {
-	    head = RARRAY_CONST_PTR(ary);
-	    sharedp = RARRAY_CONST_PTR(shared);
-	    goto makeroom_if_need;
-	}
-    }
-
     rb_ary_modify(ary);
     capa = ARY_CAPA(ary);
     if (capa - (capa >> 6) <= new_len) {
@@ -1116,45 +1568,69 @@ ary_ensure_room_for_unshift(VALUE ary, int argc)
 
     /* use shared array for big "queues" */
     if (new_len > ARY_DEFAULT_SIZE * 4) {
-	/* make a room for unshifted items */
+        ary_verify(ary);
+
+        /* make a room for unshifted items */
 	capa = ARY_CAPA(ary);
 	ary_make_shared(ary);
 
-	head = sharedp = RARRAY_CONST_PTR(ary);
-	goto makeroom;
-      makeroom_if_need:
-	if (head - sharedp < argc) {
-	    long room;
-	  makeroom:
-	    room = capa - new_len;
-	    room -= room >> 4;
-	    MEMMOVE((VALUE *)sharedp + argc + room, head, VALUE, len);
-	    head = sharedp + argc + room;
-	}
-	ARY_SET_PTR(ary, head - argc);
-	assert(ARY_SHARED_OCCUPIED(ARY_SHARED(ary)));
-	return ARY_SHARED(ary);
+        head = sharedp = RARRAY_CONST_PTR_TRANSIENT(ary);
+        return make_room_for_unshift(ary, head, (void *)sharedp, argc, capa, len);
     }
     else {
 	/* sliding items */
-	RARRAY_PTR_USE(ary, ptr, {
+        RARRAY_PTR_USE_TRANSIENT(ary, ptr, {
 	    MEMMOVE(ptr + argc, ptr, VALUE, len);
 	});
 
+        ary_verify(ary);
 	return ary;
     }
 }
 
+static VALUE
+ary_ensure_room_for_unshift(VALUE ary, int argc)
+{
+    long len = RARRAY_LEN(ary);
+    long new_len = len + argc;
+
+    if (len > ARY_MAX_SIZE - argc) {
+        rb_raise(rb_eIndexError, "index %ld too big", new_len);
+    }
+    else if (! ARY_SHARED_P(ary)) {
+        return ary_modify_for_unshift(ary, argc);
+    }
+    else {
+        VALUE shared_root = ARY_SHARED_ROOT(ary);
+        long capa = RARRAY_LEN(shared_root);
+
+        if (! ARY_SHARED_ROOT_OCCUPIED(shared_root)) {
+            return ary_modify_for_unshift(ary, argc);
+        }
+        else if (new_len > capa) {
+            return ary_modify_for_unshift(ary, argc);
+        }
+        else {
+            const VALUE * head = RARRAY_CONST_PTR_TRANSIENT(ary);
+            void *sharedp = (void *)RARRAY_CONST_PTR_TRANSIENT(shared_root);
+
+            rb_ary_modify_check(ary);
+            return make_room_for_unshift(ary, head, sharedp, argc, capa, len);
+        }
+    }
+}
+
 /*
  *  call-seq:
- *     ary.unshift(obj, ...)  -> ary
+ *    array.unshift(*objects) -> self
+ *
+ *  Prepends the given +objects+ to +self+:
+ *    a = [:foo, 'bar', 2]
+ *    a.unshift(:bam, :bat) # => [:bam, :bat, :foo, "bar", 2]
  *
- *  Prepends objects to the front of +self+, moving other elements upwards.
- *  See also Array#shift for the opposite effect.
+ *  Array#prepend is an alias for Array#unshift.
  *
- *     a = [ "b", "c", "d" ]
- *     a.unshift("a")   #=> ["a", "b", "c", "d"]
- *     a.unshift(1, 2)  #=> [ 1, 2, "a", "b", "c", "d"]
+ *  Related: #push, #pop, #shift.
  */
 
 static VALUE
@@ -1195,21 +1671,11 @@ rb_ary_elt(VALUE ary, long offset)
 VALUE
 rb_ary_entry(VALUE ary, long offset)
 {
-    long len = RARRAY_LEN(ary);
-    const VALUE *ptr = RARRAY_CONST_PTR(ary);
-    if (len == 0) return Qnil;
-    if (offset < 0) {
-        offset += len;
-        if (offset < 0) return Qnil;
-    }
-    else if (len <= offset) {
-        return Qnil;
-    }
-    return ptr[offset];
+    return rb_ary_entry_internal(ary, offset);
 }
 
 VALUE
-rb_ary_subseq(VALUE ary, long beg, long len)
+rb_ary_subseq_step(VALUE ary, long beg, long len, long step)
 {
     VALUE klass;
     long alen = RARRAY_LEN(ary);
@@ -1220,93 +1686,169 @@ rb_ary_subseq(VALUE ary, long beg, long len)
     if (alen < len || alen < beg + len) {
 	len = alen - beg;
     }
-    klass = rb_obj_class(ary);
+    klass = rb_cArray;
     if (len == 0) return ary_new(klass, 0);
+    if (step == 0)
+        rb_raise(rb_eArgError, "slice step cannot be zero");
+    if (step == 1)
+        return ary_make_partial(ary, klass, beg, len);
+    else
+        return ary_make_partial_step(ary, klass, beg, len, step);
+}
 
-    return ary_make_partial(ary, klass, beg, len);
+VALUE
+rb_ary_subseq(VALUE ary, long beg, long len)
+{
+    return rb_ary_subseq_step(ary, beg, len, 1);
 }
 
+static VALUE rb_ary_aref2(VALUE ary, VALUE b, VALUE e);
+
 /*
  *  call-seq:
- *     ary[index]                -> obj     or nil
- *     ary[start, length]        -> new_ary or nil
- *     ary[range]                -> new_ary or nil
- *     ary.slice(index)          -> obj     or nil
- *     ary.slice(start, length)  -> new_ary or nil
- *     ary.slice(range)          -> new_ary or nil
- *
- *  Element Reference --- Returns the element at +index+, or returns a
- *  subarray starting at the +start+ index and continuing for +length+
- *  elements, or returns a subarray specified by +range+ of indices.
- *
- *  Negative indices count backward from the end of the array (-1 is the last
- *  element).  For +start+ and +range+ cases the starting index is just before
- *  an element.  Additionally, an empty array is returned when the starting
- *  index for an element range is at the end of the array.
- *
- *  Returns +nil+ if the index (or starting index) are out of range.
- *
- *     a = [ "a", "b", "c", "d", "e" ]
- *     a[2] +  a[0] + a[1]    #=> "cab"
- *     a[6]                   #=> nil
- *     a[1, 2]                #=> [ "b", "c" ]
- *     a[1..3]                #=> [ "b", "c", "d" ]
- *     a[4..7]                #=> [ "e" ]
- *     a[6..10]               #=> nil
- *     a[-3, 3]               #=> [ "c", "d", "e" ]
- *     # special cases
- *     a[5]                   #=> nil
- *     a[6, 1]                #=> nil
- *     a[5, 1]                #=> []
- *     a[5..10]               #=> []
- *
+ *    array[index] -> object or nil
+ *    array[start, length] -> object or nil
+ *    array[range] -> object or nil
+ *    array[aseq] -> object or nil
+ *    array.slice(index) -> object or nil
+ *    array.slice(start, length) -> object or nil
+ *    array.slice(range) -> object or nil
+ *    array.slice(aseq) -> object or nil
+ *
+ *  Returns elements from +self+; does not modify +self+.
+ *
+ *  When a single \Integer argument +index+ is given, returns the element at offset +index+:
+ *    a = [:foo, 'bar', 2]
+ *    a[0] # => :foo
+ *    a[2] # => 2
+ *    a # => [:foo, "bar", 2]
+ *
+ *  If +index+ is negative, counts relative to the end of +self+:
+ *    a = [:foo, 'bar', 2]
+ *    a[-1] # => 2
+ *    a[-2] # => "bar"
+ *
+ *  If +index+ is out of range, returns +nil+.
+ *
+ *  When two \Integer arguments +start+ and +length+ are given,
+ *  returns a new \Array of size +length+ containing successive elements beginning at offset +start+:
+ *    a = [:foo, 'bar', 2]
+ *    a[0, 2] # => [:foo, "bar"]
+ *    a[1, 2] # => ["bar", 2]
+ *
+ *  If <tt>start + length</tt> is greater than <tt>self.length</tt>,
+ *  returns all elements from offset +start+ to the end:
+ *    a = [:foo, 'bar', 2]
+ *    a[0, 4] # => [:foo, "bar", 2]
+ *    a[1, 3] # => ["bar", 2]
+ *    a[2, 2] # => [2]
+ *
+ *  If <tt>start == self.size</tt> and <tt>length >= 0</tt>,
+ *  returns a new empty \Array.
+ *
+ *  If +length+ is negative, returns +nil+.
+ *
+ *  When a single \Range argument +range+ is given,
+ *  treats <tt>range.min</tt> as +start+ above
+ *  and <tt>range.size</tt> as +length+ above:
+ *    a = [:foo, 'bar', 2]
+ *    a[0..1] # => [:foo, "bar"]
+ *    a[1..2] # => ["bar", 2]
+ *
+ *  Special case: If <tt>range.start == a.size</tt>, returns a new empty \Array.
+ *
+ *  If <tt>range.end</tt> is negative, calculates the end index from the end:
+ *    a = [:foo, 'bar', 2]
+ *    a[0..-1] # => [:foo, "bar", 2]
+ *    a[0..-2] # => [:foo, "bar"]
+ *    a[0..-3] # => [:foo]
+ *
+ *  If <tt>range.start</tt> is negative, calculates the start index from the end:
+ *    a = [:foo, 'bar', 2]
+ *    a[-1..2] # => [2]
+ *    a[-2..2] # => ["bar", 2]
+ *    a[-3..2] # => [:foo, "bar", 2]
+ *
+ *  If <tt>range.start</tt> is larger than the array size, returns +nil+.
+ *    a = [:foo, 'bar', 2]
+ *    a[4..1] # => nil
+ *    a[4..0] # => nil
+ *    a[4..-1] # => nil
+ *
+ *  When a single Enumerator::ArithmeticSequence argument +aseq+ is given,
+ *  returns an Array of elements corresponding to the indexes produced by
+ *  the sequence.
+ *    a = ['--', 'data1', '--', 'data2', '--', 'data3']
+ *    a[(1..).step(2)] # => ["data1", "data2", "data3"]
+ *
+ *  Unlike slicing with range, if the start or the end of the arithmetic sequence
+ *  is larger than array size, throws RangeError.
+ *    a = ['--', 'data1', '--', 'data2', '--', 'data3']
+ *    a[(1..11).step(2)]
+ *    # RangeError (((1..11).step(2)) out of range)
+ *    a[(7..).step(2)]
+ *    # RangeError (((7..).step(2)) out of range)
+ *
+ *  If given a single argument, and its type is not one of the listed, tries to
+ *  convert it to Integer, and raises if it is impossible:
+ *    a = [:foo, 'bar', 2]
+ *    # Raises TypeError (no implicit conversion of Symbol into Integer):
+ *    a[:foo]
+ *
+ *  Array#slice is an alias for Array#[].
  */
 
 VALUE
 rb_ary_aref(int argc, const VALUE *argv, VALUE ary)
 {
-    VALUE arg;
-    long beg, len;
-
+    rb_check_arity(argc, 1, 2);
     if (argc == 2) {
-	beg = NUM2LONG(argv[0]);
-	len = NUM2LONG(argv[1]);
-	if (beg < 0) {
-	    beg += RARRAY_LEN(ary);
-	}
-	return rb_ary_subseq(ary, beg, len);
+	return rb_ary_aref2(ary, argv[0], argv[1]);
     }
-    if (argc != 1) {
-	rb_scan_args(argc, argv, "11", NULL, NULL);
+    return rb_ary_aref1(ary, argv[0]);
+}
+
+static VALUE
+rb_ary_aref2(VALUE ary, VALUE b, VALUE e)
+{
+    long beg = NUM2LONG(b);
+    long len = NUM2LONG(e);
+    if (beg < 0) {
+	beg += RARRAY_LEN(ary);
     }
-    arg = argv[0];
+    return rb_ary_subseq(ary, beg, len);
+}
+
+MJIT_FUNC_EXPORTED VALUE
+rb_ary_aref1(VALUE ary, VALUE arg)
+{
+    long beg, len, step;
+
     /* special case - speeding up */
     if (FIXNUM_P(arg)) {
 	return rb_ary_entry(ary, FIX2LONG(arg));
     }
-    /* check if idx is Range */
-    switch (rb_range_beg_len(arg, &beg, &len, RARRAY_LEN(ary), 0)) {
+    /* check if idx is Range or ArithmeticSequence */
+    switch (rb_arithmetic_sequence_beg_len_step(arg, &beg, &len, &step, RARRAY_LEN(ary), 0)) {
       case Qfalse:
-	break;
+        break;
       case Qnil:
-	return Qnil;
+        return Qnil;
       default:
-	return rb_ary_subseq(ary, beg, len);
+        return rb_ary_subseq_step(ary, beg, len, step);
     }
+
     return rb_ary_entry(ary, NUM2LONG(arg));
 }
 
 /*
  *  call-seq:
- *     ary.at(index)   ->   obj  or nil
+ *    array.at(index) -> object
  *
- *  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
- *  Array#[].
- *
- *     a = [ "a", "b", "c", "d", "e" ]
- *     a.at(0)     #=> "a"
- *     a.at(-1)    #=> "e"
+ *  Returns the element at \Integer offset +index+; does not modify +self+.
+ *    a = [:foo, 'bar', 2]
+ *    a.at(0) # => :foo
+ *    a.at(2) # => 2
  */
 
 VALUE
@@ -1317,19 +1859,33 @@ rb_ary_at(VALUE ary, VALUE pos)
 
 /*
  *  call-seq:
- *     ary.first     ->   obj or nil
- *     ary.first(n)  ->   new_ary
+ *    array.first -> object or nil
+ *    array.first(n) -> new_array
+ *
+ *  Returns elements from +self+; does not modify +self+.
  *
- *  Returns the first element, or the first +n+ elements, of the array.
- *  If the array is empty, the first form returns +nil+, and the
- *  second form returns an empty array. See also Array#last for
- *  the opposite effect.
+ *  When no argument is given, returns the first element:
+ *    a = [:foo, 'bar', 2]
+ *    a.first # => :foo
+ *    a # => [:foo, "bar", 2]
  *
- *     a = [ "q", "r", "s", "t" ]
- *     a.first     #=> "q"
- *     a.first(2)  #=> ["q", "r"]
+ *  If +self+ is empty, returns +nil+.
+ *
+ *  When non-negative \Integer argument +n+ is given,
+ *  returns the first +n+ elements in a new \Array:
+ *    a = [:foo, 'bar', 2]
+ *    a.first(2) # => [:foo, "bar"]
+ *
+ *  If <tt>n >= array.size</tt>, returns all elements:
+ *    a = [:foo, 'bar', 2]
+ *    a.first(50) # => [:foo, "bar", 2]
+ *
+ *  If <tt>n == 0</tt> returns an new empty \Array:
+ *    a = [:foo, 'bar', 2]
+ *    a.first(0) # []
+ *
+ *  Related: #last.
  */
-
 static VALUE
 rb_ary_first(int argc, VALUE *argv, VALUE ary)
 {
@@ -1344,17 +1900,32 @@ rb_ary_first(int argc, VALUE *argv, VALUE ary)
 
 /*
  *  call-seq:
- *     ary.last     ->  obj or nil
- *     ary.last(n)  ->  new_ary
+ *    array.last  -> object or nil
+ *    array.last(n) -> new_array
  *
- *  Returns the last element(s) of +self+. If the array is empty,
- *  the first form returns +nil+.
+ *  Returns elements from +self+; +self+ is not modified.
  *
- *  See also Array#first for the opposite effect.
+ *  When no argument is given, returns the last element:
+ *    a = [:foo, 'bar', 2]
+ *    a.last # => 2
+ *    a # => [:foo, "bar", 2]
  *
- *     a = [ "w", "x", "y", "z" ]
- *     a.last     #=> "z"
- *     a.last(2)  #=> ["y", "z"]
+ *  If +self+ is empty, returns +nil+.
+ *
+ *  When non-negative \Innteger argument +n+ is given,
+ *  returns the last +n+ elements in a new \Array:
+ *    a = [:foo, 'bar', 2]
+ *    a.last(2) # => ["bar", 2]
+ *
+ *  If <tt>n >= array.size</tt>, returns all elements:
+ *    a = [:foo, 'bar', 2]
+ *    a.last(50) # => [:foo, "bar", 2]
+ *
+ *  If <tt>n == 0</tt>, returns an new empty \Array:
+ *    a = [:foo, 'bar', 2]
+ *    a.last(0) # []
+ *
+ *  Related: #first.
  */
 
 VALUE
@@ -1372,25 +1943,35 @@ rb_ary_last(int argc, const VALUE *argv, VALUE ary)
 
 /*
  *  call-seq:
- *     ary.fetch(index)                    -> obj
- *     ary.fetch(index, default)           -> obj
- *     ary.fetch(index) { |index| block }  -> obj
- *
- *  Tries to return the element at position +index+, but throws an IndexError
- *  exception if the referenced +index+ lies outside of the array bounds.  This
- *  error can be prevented by supplying a second argument, which will act as a
- *  +default+ value.
- *
- *  Alternatively, if a block is given it will only be executed when an
- *  invalid +index+ is referenced.  Negative values of +index+ count from the
- *  end of the array.
- *
- *     a = [ 11, 22, 33, 44 ]
- *     a.fetch(1)               #=> 22
- *     a.fetch(-1)              #=> 44
- *     a.fetch(4, 'cat')        #=> "cat"
- *     a.fetch(100) { |i| puts "#{i} is out of bounds" }
- *                              #=> "100 is out of bounds"
+ *    array.fetch(index) -> element
+ *    array.fetch(index, default_value) -> element
+ *    array.fetch(index) {|index| ... } -> element
+ *
+ *  Returns the element at offset  +index+.
+ *
+ *  With the single \Integer argument +index+,
+ *  returns the element at offset +index+:
+ *    a = [:foo, 'bar', 2]
+ *    a.fetch(1) # => "bar"
+ *
+ *  If +index+ is negative, counts from the end of the array:
+ *    a = [:foo, 'bar', 2]
+ *    a.fetch(-1) # => 2
+ *    a.fetch(-2) # => "bar"
+ *
+ *  With arguments +index+ and +default_value+,
+ *  returns the element at offset +index+ if index is in range,
+ *  otherwise returns +default_value+:
+ *    a = [:foo, 'bar', 2]
+ *    a.fetch(1, nil) # => "bar"
+ *
+ *  With argument +index+ and a block,
+ *  returns the element at offset +index+ if index is in range
+ *  (and the block is not called); otherwise calls the block with index and returns its return value:
+ *
+ *    a = [:foo, 'bar', 2]
+ *    a.fetch(1) {|index| raise 'Cannot happen' } # => "bar"
+ *    a.fetch(50) {|index| "Value for #{index}" } # => "Value for 50"
  */
 
 static VALUE
@@ -1423,36 +2004,44 @@ rb_ary_fetch(int argc, VALUE *argv, VALUE ary)
 
 /*
  *  call-seq:
- *     ary.find_index(obj)             ->  int or nil
- *     ary.find_index { |item| block } ->  int or nil
- *     ary.find_index                  ->  Enumerator
- *     ary.index(obj)             ->  int or nil
- *     ary.index { |item| block } ->  int or nil
- *     ary.index                  ->  Enumerator
+ *    array.index(object) -> integer or nil
+ *    array.index {|element| ... } -> integer or nil
+ *    array.index -> new_enumerator
+ *
+ *  Returns the index of a specified element.
  *
- *  Returns the _index_ of the first object in +ary+ such that the object is
- *  <code>==</code> to +obj+.
+ *  When argument +object+ is given but no block,
+ *  returns the index of the first element +element+
+ *  for which <tt>object == element</tt>:
+ *    a = [:foo, 'bar', 2, 'bar']
+ *    a.index('bar') # => 1
  *
- *  If a block is given instead of an argument, returns the _index_ of the
- *  first object for which the block returns +true+.  Returns +nil+ if no
- *  match is found.
+ *  Returns +nil+ if no such element found.
  *
- *  See also Array#rindex.
+ *  When both argument +object+ and a block are given,
+ *  calls the block with each successive element;
+ *  returns the index of the first element for which the block returns a truthy value:
+ *    a = [:foo, 'bar', 2, 'bar']
+ *    a.index {|element| element == 'bar' } # => 1
  *
- *  An Enumerator is returned if neither a block nor argument is given.
+ *  Returns +nil+ if the block never returns a truthy value.
  *
- *     a = [ "a", "b", "c" ]
- *     a.index("b")              #=> 1
- *     a.index("z")              #=> nil
- *     a.index { |x| x == "b" }  #=> 1
+ *  When neither an argument nor a block is given, returns a new Enumerator:
+ *    a = [:foo, 'bar', 2]
+ *    e = a.index
+ *    e # => #<Enumerator: [:foo, "bar", 2]:index>
+ *    e.each {|element| element == 'bar' } # => 1
+ *
+ *  Array#find_index is an alias for Array#index.
+ *
+ *  Related: #rindex.
  */
 
 static VALUE
 rb_ary_index(int argc, VALUE *argv, VALUE ary)
 {
-    const VALUE *ptr;
     VALUE val;
-    long i, len;
+    long i;
 
     if (argc == 0) {
 	RETURN_ENUMERATOR(ary, 0, 0);
@@ -1467,52 +2056,49 @@ rb_ary_index(int argc, VALUE *argv, VALUE ary)
     val = argv[0];
     if (rb_block_given_p())
 	rb_warn("given block not used");
-    len = RARRAY_LEN(ary);
-    ptr = RARRAY_CONST_PTR(ary);
-    for (i=0; i<len; i++) {
-	VALUE e = ptr[i];
-	switch (rb_equal_opt(e, val)) {
-	  case Qundef:
-	    if (!rb_equal(e, val)) break;
-	  case Qtrue:
+    for (i=0; i<RARRAY_LEN(ary); i++) {
+	VALUE e = RARRAY_AREF(ary, i);
+	if (rb_equal(e, val)) {
 	    return LONG2NUM(i);
-	  case Qfalse:
-	    continue;
 	}
-	len = RARRAY_LEN(ary);
-	ptr = RARRAY_CONST_PTR(ary);
     }
     return Qnil;
 }
 
 /*
  *  call-seq:
- *     ary.rindex(obj)             ->  int or nil
- *     ary.rindex { |item| block } ->  int or nil
- *     ary.rindex                  ->  Enumerator
+ *    array.rindex(object) -> integer or nil
+ *    array.rindex {|element| ... } -> integer or nil
+ *    array.rindex -> new_enumerator
+ *
+ *  Returns the index of the last element for which <tt>object == element</tt>.
  *
- *  Returns the _index_ of the last object in +self+ <code>==</code> to +obj+.
+ *  When argument +object+ is given but no block, returns the index of the last such element found:
+ *    a = [:foo, 'bar', 2, 'bar']
+ *    a.rindex('bar') # => 3
  *
- *  If a block is given instead of an argument, returns the _index_ of the
- *  first object for which the block returns +true+, starting from the last
- *  object.
+ *  Returns +nil+ if no such object found.
  *
- *  Returns +nil+ if no match is found.
+ *  When a block is given but no argument, calls the block with each successive element;
+ *  returns the index of the last element for which the block returns a truthy value:
+ *    a = [:foo, 'bar', 2, 'bar']
+ *    a.rindex {|element| element == 'bar' } # => 3
  *
- *  See also Array#index.
+ *  Returns +nil+ if the block never returns a truthy value.
  *
- *  If neither block nor argument is given, an Enumerator is returned instead.
+ *  When neither an argument nor a block is given, returns a new \Enumerator:
  *
- *     a = [ "a", "b", "b", "b", "c" ]
- *     a.rindex("b")             #=> 3
- *     a.rindex("z")             #=> nil
- *     a.rindex { |x| x == "b" } #=> 3
+ *    a = [:foo, 'bar', 2, 'bar']
+ *    e = a.rindex
+ *    e # => #<Enumerator: [:foo, "bar", 2, "bar"]:rindex>
+ *    e.each {|element| element == 'bar' } # => 3
+ *
+ *  Related: #index.
  */
 
 static VALUE
 rb_ary_rindex(int argc, VALUE *argv, VALUE ary)
 {
-    const VALUE *ptr;
     VALUE val;
     long i = RARRAY_LEN(ary), len;
 
@@ -1531,21 +2117,14 @@ rb_ary_rindex(int argc, VALUE *argv, VALUE ary)
     val = argv[0];
     if (rb_block_given_p())
 	rb_warn("given block not used");
-    ptr = RARRAY_CONST_PTR(ary);
     while (i--) {
-	VALUE e = ptr[i];
-	switch (rb_equal_opt(e, val)) {
-	  case Qundef:
-	    if (!rb_equal(e, val)) break;
-	  case Qtrue:
+	VALUE e = RARRAY_AREF(ary, i);
+	if (rb_equal(e, val)) {
 	    return LONG2NUM(i);
-	  case Qfalse:
-	    continue;
-	}
-	if (i > (len = RARRAY_LEN(ary))) {
-	    i = len;
 	}
-	ptr = RARRAY_CONST_PTR(ary);
+        if (i > RARRAY_LEN(ary)) {
+            break;
+        }
     }
     return Qnil;
 }
@@ -1560,10 +2139,10 @@ rb_ary_to_ary(VALUE obj)
 }
 
 static void
-rb_ary_splice(VALUE ary, long beg, long len, VALUE rpl)
+rb_ary_splice(VALUE ary, long beg, long len, const VALUE *rptr, long rlen)
 {
-    long rlen;
     long olen;
+    long rofs;
 
     if (len < 0) rb_raise(rb_eIndexError, "negative length (%ld)", len);
     olen = RARRAY_LEN(ary);
@@ -1578,14 +2157,11 @@ rb_ary_splice(VALUE ary, long beg, long len, VALUE rpl)
 	len = olen - beg;
     }
 
-    if (rpl == Qundef) {
-	rlen = 0;
-    }
-    else {
-	rpl = rb_ary_to_ary(rpl);
-	rlen = RARRAY_LEN(rpl);
-	olen = RARRAY_LEN(ary);	/* ary may be resized in rpl.to_ary too */
+    {
+        const VALUE *optr = RARRAY_CONST_PTR_TRANSIENT(ary);
+	rofs = (rptr >= optr && rptr < optr + olen) ? rptr - optr : -1;
     }
+
     if (beg >= olen) {
 	VALUE target_ary;
 	if (beg > ARY_MAX_SIZE - rlen) {
@@ -1595,7 +2171,8 @@ rb_ary_splice(VALUE ary, long beg, long len, VALUE rpl)
 	len = beg + rlen;
 	ary_mem_clear(ary, olen, beg - olen);
 	if (rlen > 0) {
-	    ary_memcpy0(ary, beg, rlen, RARRAY_CONST_PTR(rpl), target_ary);
+            if (rofs != -1) rptr = RARRAY_CONST_PTR_TRANSIENT(ary) + rofs;
+	    ary_memcpy0(ary, beg, rlen, rptr, target_ary);
 	}
 	ARY_SET_LEN(ary, len);
     }
@@ -1612,16 +2189,23 @@ rb_ary_splice(VALUE ary, long beg, long len, VALUE rpl)
 	}
 
 	if (len != rlen) {
-	    RARRAY_PTR_USE(ary, ptr,
-			   MEMMOVE(ptr + beg + rlen, ptr + beg + len,
-				   VALUE, olen - (beg + len)));
+            RARRAY_PTR_USE_TRANSIENT(ary, ptr,
+                                     MEMMOVE(ptr + beg + rlen, ptr + beg + len,
+                                             VALUE, olen - (beg + len)));
 	    ARY_SET_LEN(ary, alen);
 	}
 	if (rlen > 0) {
-	    MEMMOVE(RARRAY_PTR(ary) + beg, RARRAY_CONST_PTR(rpl), VALUE, rlen);
+            if (rofs != -1) rptr = RARRAY_CONST_PTR_TRANSIENT(ary) + rofs;
+            /* give up wb-protected ary */
+            RB_OBJ_WB_UNPROTECT_FOR(ARRAY, ary);
+
+            /* do not use RARRAY_PTR() because it can causes GC.
+             * ary can contain T_NONE object because it is not cleared.
+             */
+            RARRAY_PTR_USE_TRANSIENT(ary, ptr,
+                                     MEMMOVE(ptr + beg, rptr, VALUE, rlen));
 	}
     }
-    RB_GC_GUARD(rpl);
 }
 
 void
@@ -1677,47 +2261,128 @@ rb_ary_resize(VALUE ary, long len)
     }
     else {
 	if (olen > len + ARY_DEFAULT_SIZE) {
-	    SIZED_REALLOC_N(RARRAY(ary)->as.heap.ptr, VALUE, len, RARRAY(ary)->as.heap.aux.capa);
+            ary_heap_realloc(ary, len);
 	    ARY_SET_CAPA(ary, len);
 	}
 	ARY_SET_HEAP_LEN(ary, len);
     }
+    ary_verify(ary);
     return ary;
 }
 
+static VALUE
+ary_aset_by_rb_ary_store(VALUE ary, long key, VALUE val)
+{
+    rb_ary_store(ary, key, val);
+    return val;
+}
+
+static VALUE
+ary_aset_by_rb_ary_splice(VALUE ary, long beg, long len, VALUE val)
+{
+    VALUE rpl = rb_ary_to_ary(val);
+    rb_ary_splice(ary, beg, len, RARRAY_CONST_PTR_TRANSIENT(rpl), RARRAY_LEN(rpl));
+    RB_GC_GUARD(rpl);
+    return val;
+}
+
 /*
  *  call-seq:
- *     ary[index]         = obj                      ->  obj
- *     ary[start, length] = obj or other_ary or nil  ->  obj or other_ary or nil
- *     ary[range]         = obj or other_ary or nil  ->  obj or other_ary or nil
- *
- *  Element Assignment --- Sets the element at +index+, or replaces a subarray
- *  from the +start+ index for +length+ elements, or replaces a subarray
- *  specified by the +range+ of indices.
- *
- *  If indices are greater than the current capacity of the array, the array
- *  grows automatically.  Elements are inserted into the array at +start+ if
- *  +length+ is zero.
- *
- *  Negative indices will count backward from the end of the array.  For
- *  +start+ and +range+ cases the starting index is just before an element.
- *
- *  An IndexError is raised if a negative index points past the beginning of
- *  the array.
- *
- *  See also Array#push, and Array#unshift.
- *
- *     a = Array.new
- *     a[4] = "4";                 #=> [nil, nil, nil, nil, "4"]
- *     a[0, 3] = [ 'a', 'b', 'c' ] #=> ["a", "b", "c", nil, "4"]
- *     a[1..2] = [ 1, 2 ]          #=> ["a", 1, 2, nil, "4"]
- *     a[0, 2] = "?"               #=> ["?", 2, nil, "4"]
- *     a[0..2] = "A"               #=> ["A", "4"]
- *     a[-1]   = "Z"               #=> ["A", "Z"]
- *     a[1..-1] = nil              #=> ["A", nil]
- *     a[1..-1] = []               #=> ["A"]
- *     a[0, 0] = [ 1, 2 ]          #=> [1, 2, "A"]
- *     a[3, 0] = "B"               #=> [1, 2, "A", "B"]
+ *    array[index] = object -> object
+ *    array[start, length] = object -> object
+ *    array[range] = object -> object
+ *
+ *  Assigns elements in +self+; returns the given +object+.
+ *
+ *  When \Integer argument +index+ is given, assigns +object+ to an element in +self+.
+ *
+ *  If +index+ is non-negative, assigns +object+ the element at offset +index+:
+ *    a = [:foo, 'bar', 2]
+ *    a[0] = 'foo' # => "foo"
+ *    a # => ["foo", "bar", 2]
+ *
+ *  If +index+ is greater than <tt>self.length</tt>, extends the array:
+ *    a = [:foo, 'bar', 2]
+ *    a[7] = 'foo' # => "foo"
+ *    a # => [:foo, "bar", 2, nil, nil, nil, nil, "foo"]
+ *
+ *  If +index+ is negative, counts backwards from the end of the array:
+ *    a = [:foo, 'bar', 2]
+ *    a[-1] = 'two' # => "two"
+ *    a # => [:foo, "bar", "two"]
+ *
+ *  When \Integer arguments +start+ and +length+ are given and +object+ is not an \Array,
+ *  removes <tt>length - 1</tt> elements beginning at offset +start+,
+ *  and assigns +object+ at offset +start+:
+ *    a = [:foo, 'bar', 2]
+ *    a[0, 2] = 'foo' # => "foo"
+ *    a # => ["foo", 2]
+ *
+ *  If +start+ is negative, counts backwards from the end of the array:
+ *    a = [:foo, 'bar', 2]
+ *    a[-2, 2] = 'foo' # => "foo"
+ *    a # => [:foo, "foo"]
+ *
+ *  If +start+ is non-negative and outside the array (<tt> >= self.size</tt>),
+ *  extends the array with +nil+, assigns +object+ at offset +start+,
+ *  and ignores +length+:
+ *    a = [:foo, 'bar', 2]
+ *    a[6, 50] = 'foo' # => "foo"
+ *    a # => [:foo, "bar", 2, nil, nil, nil, "foo"]
+ *
+ *  If +length+ is zero, shifts elements at and following offset +start+
+ *  and assigns +object+ at offset +start+:
+ *    a = [:foo, 'bar', 2]
+ *    a[1, 0] = 'foo' # => "foo"
+ *    a # => [:foo, "foo", "bar", 2]
+ *
+ *  If +length+ is too large for the existing array, does not extend the array:
+ *    a = [:foo, 'bar', 2]
+ *    a[1, 5] = 'foo' # => "foo"
+ *    a # => [:foo, "foo"]
+ *
+ *  When \Range argument +range+ is given and +object+ is an \Array,
+ *  removes <tt>length - 1</tt> elements beginning at offset +start+,
+ *  and assigns +object+ at offset +start+:
+ *    a = [:foo, 'bar', 2]
+ *    a[0..1] = 'foo' # => "foo"
+ *    a # => ["foo", 2]
+ *
+ *  if <tt>range.begin</tt> is negative, counts backwards from the end of the array:
+ *    a = [:foo, 'bar', 2]
+ *    a[-2..2] = 'foo' # => "foo"
+ *    a # => [:foo, "foo"]
+ *
+ *  If the array length is less than <tt>range.begin</tt>,
+ *  assigns +object+ at offset <tt>range.begin</tt>, and ignores +length+:
+ *    a = [:foo, 'bar', 2]
+ *    a[6..50] = 'foo' # => "foo"
+ *    a # => [:foo, "bar", 2, nil, nil, nil, "foo"]
+ *
+ *  If <tt>range.end</tt> is zero, shifts elements at and following offset +start+
+ *  and assigns +object+ at offset +start+:
+ *    a = [:foo, 'bar', 2]
+ *    a[1..0] = 'foo' # => "foo"
+ *    a # => [:foo, "foo", "bar", 2]
+ *
+ *  If <tt>range.end</tt> is negative, assigns +object+ at offset +start+,
+ *  retains <tt>range.end.abs -1</tt> elements past that, and removes those beyond:
+ *    a = [:foo, 'bar', 2]
+ *    a[1..-1] = 'foo' # => "foo"
+ *    a # => [:foo, "foo"]
+ *    a = [:foo, 'bar', 2]
+ *    a[1..-2] = 'foo' # => "foo"
+ *    a # => [:foo, "foo", 2]
+ *    a = [:foo, 'bar', 2]
+ *    a[1..-3] = 'foo' # => "foo"
+ *    a # => [:foo, "foo", "bar", 2]
+ *    a = [:foo, 'bar', 2]
+ *
+ *  If <tt>range.end</tt> is too large for the existing array,
+ *  replaces array elements, but does not extend the array with +nil+ values:
+ *    a = [:foo, 'bar', 2]
+ *    a[1..5] = 'foo' # => "foo"
+ *    a # => [:foo, "foo"]
  */
 
 static VALUE
@@ -1725,45 +2390,55 @@ rb_ary_aset(int argc, VALUE *argv, VALUE ary)
 {
     long offset, beg, len;
 
+    rb_check_arity(argc, 2, 3);
+    rb_ary_modify_check(ary);
     if (argc == 3) {
-	rb_ary_modify_check(ary);
 	beg = NUM2LONG(argv[0]);
 	len = NUM2LONG(argv[1]);
-	rb_ary_splice(ary, beg, len, argv[2]);
-	return argv[2];
+        return ary_aset_by_rb_ary_splice(ary, beg, len, argv[2]);
     }
-    rb_check_arity(argc, 2, 2);
-    rb_ary_modify_check(ary);
     if (FIXNUM_P(argv[0])) {
 	offset = FIX2LONG(argv[0]);
-	goto fixnum;
+        return ary_aset_by_rb_ary_store(ary, offset, argv[1]);
     }
     if (rb_range_beg_len(argv[0], &beg, &len, RARRAY_LEN(ary), 1)) {
 	/* check if idx is Range */
-	rb_ary_splice(ary, beg, len, argv[1]);
-	return argv[1];
+        return ary_aset_by_rb_ary_splice(ary, beg, len, argv[1]);
     }
 
     offset = NUM2LONG(argv[0]);
-fixnum:
-    rb_ary_store(ary, offset, argv[1]);
-    return argv[1];
+    return ary_aset_by_rb_ary_store(ary, offset, argv[1]);
 }
 
 /*
  *  call-seq:
- *     ary.insert(index, obj...)  -> ary
- *
- *  Inserts the given values before the element with the given +index+.
+ *    array.insert(index, *objects) -> self
  *
- *  Negative indices count backwards from the end of the array, where +-1+ is
- *  the last element. If a negative index is used, the given values will be
- *  inserted after that element, so using an index of +-1+ will insert the
- *  values at the end of the array.
+ *  Inserts given +objects+ before or after the element at \Integer index +offset+;
+ *  returns +self+.
  *
- *     a = %w{ a b c d }
- *     a.insert(2, 99)         #=> ["a", "b", 99, "c", "d"]
- *     a.insert(-2, 1, 2, 3)   #=> ["a", "b", 99, "c", 1, 2, 3, "d"]
+ *  When +index+ is non-negative, inserts all given +objects+
+ *  before the element at offset +index+:
+ *    a = [:foo, 'bar', 2]
+ *    a.insert(1, :bat, :bam) # => [:foo, :bat, :bam, "bar", 2]
+ *
+ *  Extends the array if +index+ is beyond the array (<tt>index >= self.size</tt>):
+ *    a = [:foo, 'bar', 2]
+ *    a.insert(5, :bat, :bam)
+ *    a # => [:foo, "bar", 2, nil, nil, :bat, :bam]
+ *
+ *  Does nothing if no objects given:
+ *    a = [:foo, 'bar', 2]
+ *    a.insert(1)
+ *    a.insert(50)
+ *    a.insert(-50)
+ *    a # => [:foo, "bar", 2]
+ *
+ *  When +index+ is negative, inserts all given +objects+
+ *  _after_ the element at offset <tt>index+self.size</tt>:
+ *    a = [:foo, 'bar', 2]
+ *    a.insert(-2, :bat, :bam)
+ *    a # => [:foo, "bar", :bat, :bam, 2]
  */
 
 static VALUE
@@ -1773,15 +2448,20 @@ rb_ary_insert(int argc, VALUE *argv, VALUE ary)
 
     rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
     rb_ary_modify_check(ary);
-    if (argc == 1) return ary;
     pos = NUM2LONG(argv[0]);
+    if (argc == 1) return ary;
     if (pos == -1) {
 	pos = RARRAY_LEN(ary);
     }
-    if (pos < 0) {
+    else if (pos < 0) {
+	long minpos = -RARRAY_LEN(ary) - 1;
+	if (pos < minpos) {
+	    rb_raise(rb_eIndexError, "index %ld too small for array; minimum: %ld",
+		     pos, minpos);
+	}
 	pos++;
     }
-    rb_ary_splice(ary, pos, 0, rb_ary_new4(argc - 1, argv + 1));
+    rb_ary_splice(ary, pos, 0, argv + 1, argc - 1);
     return ary;
 }
 
@@ -1796,27 +2476,48 @@ ary_enum_length(VALUE ary, VALUE args, VALUE eobj)
 
 /*
  *  call-seq:
- *     ary.each { |item| block }  -> ary
- *     ary.each                   -> Enumerator
+ *    array.each {|element| ... } -> self
+ *    array.each -> Enumerator
+ *
+ *  Iterates over array elements.
  *
- *  Calls the given block once for each element in +self+, passing that element
- *  as a parameter.  Returns the array itself.
+ *  When a block given, passes each successive array element to the block;
+ *  returns +self+:
+ *    a = [:foo, 'bar', 2]
+ *    a.each {|element|  puts "#{element.class} #{element}" }
  *
- *  If no block is given, an Enumerator is returned.
+ *  Output:
+ *    Symbol foo
+ *    String bar
+ *    Integer 2
  *
- *     a = [ "a", "b", "c" ]
- *     a.each {|x| print x, " -- " }
+ *  Allows the array to be modified during iteration:
+ *    a = [:foo, 'bar', 2]
+ *    a.each {|element| puts element; a.clear if element.to_s.start_with?('b') }
  *
- *  produces:
+ *  Output:
+ *    foo
+ *    bar
  *
- *     a -- b -- c --
+ *  When no block given, returns a new \Enumerator:
+ *    a = [:foo, 'bar', 2]
+ *    e = a.each
+ *    e # => #<Enumerator: [:foo, "bar", 2]:each>
+ *    a1 = e.each {|element|  puts "#{element.class} #{element}" }
+ *
+ *  Output:
+ *    Symbol foo
+ *    String bar
+ *    Integer 2
+ *
+ *  Related: #each_index, #reverse_each.
  */
 
 VALUE
 rb_ary_each(VALUE ary)
 {
     long i;
-
+    ary_verify(ary);
     RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length);
     for (i=0; i<RARRAY_LEN(ary); i++) {
 	rb_yield(RARRAY_AREF(ary, i));
@@ -1826,20 +2527,41 @@ rb_ary_each(VALUE ary)
 
 /*
  *  call-seq:
- *     ary.each_index { |index| block }  -> ary
- *     ary.each_index                    -> Enumerator
+ *    array.each_index {|index| ... } -> self
+ *    array.each_index -> Enumerator
+ *
+ *  Iterates over array indexes.
  *
- *  Same as Array#each, but passes the +index+ of the element instead of the
- *  element itself.
+ *  When a block given, passes each successive array index to the block;
+ *  returns +self+:
+ *    a = [:foo, 'bar', 2]
+ *    a.each_index {|index|  puts "#{index} #{a[index]}" }
  *
- *  An Enumerator is returned if no block is given.
+ *  Output:
+ *    0 foo
+ *    1 bar
+ *    2 2
  *
- *     a = [ "a", "b", "c" ]
- *     a.each_index {|x| print x, " -- " }
+ *  Allows the array to be modified during iteration:
+ *    a = [:foo, 'bar', 2]
+ *    a.each_index {|index| puts index; a.clear if index > 0 }
  *
- *  produces:
+ *  Output:
+ *    0
+ *    1
  *
- *     0 -- 1 -- 2 --
+ *  When no block given, returns a new \Enumerator:
+ *    a = [:foo, 'bar', 2]
+ *    e = a.each_index
+ *    e # => #<Enumerator: [:foo, "bar", 2]:each_index>
+ *    a1 = e.each {|index|  puts "#{index} #{a[index]}"}
+ *
+ *  Output:
+ *    0 foo
+ *    1 bar
+ *    2 2
+ *
+ *  Related: #each, #reverse_each.
  */
 
 static VALUE
@@ -1856,17 +2578,40 @@ rb_ary_each_index(VALUE ary)
 
 /*
  *  call-seq:
- *     ary.reverse_each { |item| block }  -> ary
- *     ary.reverse_each                   -> Enumerator
- *
- *  Same as Array#each, but traverses +self+ in reverse order.
- *
- *     a = [ "a", "b", "c" ]
- *     a.reverse_each {|x| print x, " " }
- *
- *  produces:
- *
- *     c b a
+ *    array.reverse_each {|element| ... } -> self
+ *    array.reverse_each -> Enumerator
+ *
+ *  Iterates backwards over array elements.
+ *
+ *  When a block given, passes, in reverse order, each element to the block;
+ *  returns +self+:
+ *    a = [:foo, 'bar', 2]
+ *    a.reverse_each {|element|  puts "#{element.class} #{element}" }
+ *
+ *  Output:
+ *    Integer 2
+ *    String bar
+ *    Symbol foo
+ *
+ *  Allows the array to be modified during iteration:
+ *    a = [:foo, 'bar', 2]
+ *    a.reverse_each {|element| puts element; a.clear if element.to_s.start_with?('b') }
+ *
+ *  Output:
+ *    2
+ *    bar
+ *
+ *  When no block given, returns a new \Enumerator:
+ *    a = [:foo, 'bar', 2]
+ *    e = a.reverse_each
+ *    e # => #<Enumerator: [:foo, "bar", 2]:reverse_each>
+ *    a1 = e.each {|element|  puts "#{element.class} #{element}" }
+ *  Output:
+ *    Integer 2
+ *    String bar
+ *    Symbol foo
+ *
+ *  Related: #each, #each_index.
  */
 
 static VALUE
@@ -1889,12 +2634,9 @@ rb_ary_reverse_each(VALUE ary)
 
 /*
  *  call-seq:
- *     ary.length -> int
- *
- *  Returns the number of elements in +self+. May be zero.
+ *    array.length -> an_integer
  *
- *     [ 1, 2, 3, 4, 5 ].length   #=> 5
- *     [].length                  #=> 0
+ *  Returns the count of elements in +self+.
  */
 
 static VALUE
@@ -1906,11 +2648,10 @@ rb_ary_length(VALUE ary)
 
 /*
  *  call-seq:
- *     ary.empty?   -> true or false
- *
- *  Returns +true+ if +self+ contains no elements.
+ *    array.empty?  -> true or false
  *
- *     [].empty?   #=> true
+ *  Returns +true+ if the count of elements in +self+ is zero,
+ *  +false+ otherwise.
  */
 
 static VALUE
@@ -1926,15 +2667,18 @@ rb_ary_dup(VALUE ary)
 {
     long len = RARRAY_LEN(ary);
     VALUE dup = rb_ary_new2(len);
-    ary_memcpy(dup, 0, len, RARRAY_CONST_PTR(ary));
+    ary_memcpy(dup, 0, len, RARRAY_CONST_PTR_TRANSIENT(ary));
     ARY_SET_LEN(dup, len);
+
+    ary_verify(ary);
+    ary_verify(dup);
     return dup;
 }
 
 VALUE
 rb_ary_resurrect(VALUE ary)
 {
-    return rb_ary_new4(RARRAY_LEN(ary), RARRAY_CONST_PTR(ary));
+    return ary_make_partial(ary, rb_cArray, 0, RARRAY_LEN(ary));
 }
 
 extern VALUE rb_output_fs;
@@ -1959,7 +2703,7 @@ recursive_join(VALUE obj, VALUE argp, int recur)
     return Qnil;
 }
 
-static void
+static long
 ary_join_0(VALUE ary, VALUE sep, long max, VALUE result)
 {
     long i;
@@ -1968,10 +2712,39 @@ ary_join_0(VALUE ary, VALUE sep, long max, VALUE result)
     if (max > 0) rb_enc_copy(result, RARRAY_AREF(ary, 0));
     for (i=0; i<max; i++) {
 	val = RARRAY_AREF(ary, i);
+        if (!RB_TYPE_P(val, T_STRING)) break;
 	if (i > 0 && !NIL_P(sep))
 	    rb_str_buf_append(result, sep);
 	rb_str_buf_append(result, val);
-	if (OBJ_TAINTED(val)) OBJ_TAINT(result);
+    }
+    return i;
+}
+
+static void
+ary_join_1_str(VALUE dst, VALUE src, int *first)
+{
+    rb_str_buf_append(dst, src);
+    if (*first) {
+        rb_enc_copy(dst, src);
+        *first = FALSE;
+    }
+}
+
+static void
+ary_join_1_ary(VALUE obj, VALUE ary, VALUE sep, VALUE result, VALUE val, int *first)
+{
+    if (val == ary) {
+        rb_raise(rb_eArgError, "recursive array join");
+    }
+    else {
+        VALUE args[4];
+
+        *first = FALSE;
+        args[0] = val;
+        args[1] = sep;
+        args[2] = result;
+        args[3] = (VALUE)first;
+        rb_exec_recursive(recursive_join, obj, (VALUE)args);
     }
 }
 
@@ -1986,44 +2759,19 @@ ary_join_1(VALUE obj, VALUE ary, VALUE sep, long i, VALUE result, int *first)
 
 	val = RARRAY_AREF(ary, i);
 	if (RB_TYPE_P(val, T_STRING)) {
-	  str_join:
-	    rb_str_buf_append(result, val);
-	    *first = FALSE;
+            ary_join_1_str(result, val, first);
 	}
 	else if (RB_TYPE_P(val, T_ARRAY)) {
-	    obj = val;
-	  ary_join:
-	    if (val == ary) {
-		rb_raise(rb_eArgError, "recursive array join");
-	    }
-	    else {
-		VALUE args[4];
-
-		args[0] = val;
-		args[1] = sep;
-		args[2] = result;
-		args[3] = (VALUE)first;
-		rb_exec_recursive(recursive_join, obj, (VALUE)args);
-	    }
+            ary_join_1_ary(val, ary, sep, result, val, first);
 	}
-	else {
-	    tmp = rb_check_string_type(val);
-	    if (!NIL_P(tmp)) {
-		val = tmp;
-		goto str_join;
-	    }
-	    tmp = rb_check_convert_type(val, T_ARRAY, "Array", "to_ary");
-	    if (!NIL_P(tmp)) {
-		obj = val;
-		val = tmp;
-		goto ary_join;
-	    }
-	    val = rb_obj_as_string(val);
-	    if (*first) {
-		rb_enc_copy(result, val);
-		*first = FALSE;
-	    }
-	    goto str_join;
+        else if (!NIL_P(tmp = rb_check_string_type(val))) {
+            ary_join_1_str(result, tmp, first);
+        }
+        else if (!NIL_P(tmp = rb_check_array_type(val))) {
+            ary_join_1_ary(val, ary, sep, result, tmp, first);
+        }
+        else {
+            ary_join_1_str(result, rb_obj_as_string(val), first);
 	}
     }
 }
@@ -2032,11 +2780,9 @@ VALUE
 rb_ary_join(VALUE ary, VALUE sep)
 {
     long len = 1, i;
-    int taint = FALSE;
     VALUE val, tmp, result;
 
     if (RARRAY_LEN(ary) == 0) return rb_usascii_str_new(0, 0);
-    if (OBJ_TAINTED(ary)) taint = TRUE;
 
     if (!NIL_P(sep)) {
 	StringValue(sep);
@@ -2048,10 +2794,11 @@ rb_ary_join(VALUE ary, VALUE sep)
 
 	if (NIL_P(tmp) || tmp != val) {
 	    int first;
-	    result = rb_str_buf_new(len + (RARRAY_LEN(ary)-i)*10);
+            long n = RARRAY_LEN(ary);
+            if (i > n) i = n;
+            result = rb_str_buf_new(len + (n-i)*10);
 	    rb_enc_associate(result, rb_usascii_encoding());
-	    if (taint) OBJ_TAINT(result);
-	    ary_join_0(ary, sep, i, result);
+            i = ary_join_0(ary, sep, i, result);
 	    first = i == 0;
 	    ary_join_1(ary, ary, sep, i, result, &first);
 	    return result;
@@ -2060,8 +2807,9 @@ rb_ary_join(VALUE ary, VALUE sep)
 	len += RSTRING_LEN(tmp);
     }
 
-    result = rb_str_buf_new(len);
-    if (taint) OBJ_TAINT(result);
+    result = rb_str_new(0, len);
+    rb_str_set_len(result, 0);
+
     ary_join_0(ary, sep, RARRAY_LEN(ary), result);
 
     return result;
@@ -2069,24 +2817,38 @@ rb_ary_join(VALUE ary, VALUE sep)
 
 /*
  *  call-seq:
- *     ary.join(separator=$,)    -> str
- *
- *  Returns a string created by converting each element of the array to
- *  a string, separated by the given +separator+.
- *  If the +separator+ is +nil+, it uses current $,.
- *  If both the +separator+ and $, are nil, it uses empty string.
- *
- *     [ "a", "b", "c" ].join        #=> "abc"
- *     [ "a", "b", "c" ].join("-")   #=> "a-b-c"
+ *    array.join ->new_string
+ *    array.join(separator = $,) -> new_string
+ *
+ *  Returns the new \String formed by joining the array elements after conversion.
+ *  For each element +element+
+ *  - Uses <tt>element.to_s</tt> if +element+ is not a <tt>kind_of?(Array)</tt>.
+ *  - Uses recursive <tt>element.join(separator)</tt> if +element+ is a <tt>kind_of?(Array)</tt>.
+ *
+ *  With no argument, joins using the output field separator, <tt>$,</tt>:
+ *    a = [:foo, 'bar', 2]
+ *    $, # => nil
+ *    a.join # => "foobar2"
+ *
+ *  With \string argument +separator+, joins using that separator:
+ *    a = [:foo, 'bar', 2]
+ *    a.join("\n") # => "foo\nbar\n2"
+ *
+ *  Joins recursively for nested Arrays:
+ *   a = [:foo, [:bar, [:baz, :bat]]]
+ *   a.join # => "foobarbazbat"
  */
-
 static VALUE
 rb_ary_join_m(int argc, VALUE *argv, VALUE ary)
 {
     VALUE sep;
 
-    rb_scan_args(argc, argv, "01", &sep);
-    if (NIL_P(sep)) sep = rb_output_fs;
+    if (rb_check_arity(argc, 0, 1) == 0 || NIL_P(sep = argv[0])) {
+        sep = rb_output_fs;
+        if (!NIL_P(sep)) {
+            rb_category_warn(RB_WARN_CATEGORY_DEPRECATED, "$, is set to non-nil value");
+        }
+    }
 
     return rb_ary_join(ary, sep);
 }
@@ -2094,7 +2856,6 @@ rb_ary_join_m(int argc, VALUE *argv, VALUE ary)
 static VALUE
 inspect_ary(VALUE ary, VALUE dummy, int recur)
 {
-    int tainted = OBJ_TAINTED(ary);
     long i;
     VALUE s, str;
 
@@ -2102,24 +2863,24 @@ inspect_ary(VALUE ary, VALUE dummy, int recur)
     str = rb_str_buf_new2("[");
     for (i=0; i<RARRAY_LEN(ary); i++) {
 	s = rb_inspect(RARRAY_AREF(ary, i));
-	if (OBJ_TAINTED(s)) tainted = TRUE;
 	if (i > 0) rb_str_buf_cat2(str, ", ");
 	else rb_enc_copy(str, s);
 	rb_str_buf_append(str, s);
     }
     rb_str_buf_cat2(str, "]");
-    if (tainted) OBJ_TAINT(str);
     return str;
 }
 
 /*
  *  call-seq:
- *     ary.inspect  -> string
- *     ary.to_s     -> string
+ *    array.inspect -> new_string
  *
- *  Creates a string representation of +self+.
+ *  Returns the new \String formed by calling method <tt>#inspect</tt>
+ *  on each array element:
+ *    a = [:foo, 'bar', 2]
+ *    a.inspect # => "[:foo, \"bar\", 2]"
  *
- *     [ "a", "b", "c" ].to_s     #=> "[\"a\", \"b\", \"c\"]"
+ *  Array#to_s is an alias for Array#inspect.
  */
 
 static VALUE
@@ -2137,11 +2898,20 @@ rb_ary_to_s(VALUE ary)
 
 /*
  *  call-seq:
- *     ary.to_a     -> ary
- *
- *  Returns +self+.
- *
- *  If called on a subclass of Array, converts the receiver to an Array object.
+ *    to_a -> self or new_array
+ *
+ *  When +self+ is an instance of \Array, returns +self+:
+ *    a = [:foo, 'bar', 2]
+ *    a.to_a # => [:foo, "bar", 2]
+ *
+ *  Otherwise, returns a new \Array containing the elements of +self+:
+ *    class MyArray < Array; end
+ *    a = MyArray.new(['foo', 'bar', 'two'])
+ *    a.instance_of?(Array) # => false
+ *    a.kind_of?(Array) # => true
+ *    a1 = a.to_a
+ *    a1 # => ["foo", "bar", "two"]
+ *    a1.class # => Array # Not MyArray
  */
 
 static VALUE
@@ -2157,22 +2927,36 @@ rb_ary_to_a(VALUE ary)
 
 /*
  *  call-seq:
- *     ary.to_h     -> hash
- *
- *  Returns the result of interpreting <i>ary</i> as an array of
- *  <tt>[key, value]</tt> pairs.
- *
- *     [[:foo, :bar], [1, 2]].to_h
- *       # => {:foo => :bar, 1 => 2}
+ *    array.to_h -> new_hash
+ *    array.to_h {|item| ... } -> new_hash
+ *
+ *  Returns a new \Hash formed from +self+.
+ *
+ *  When a block is given, calls the block with each array element;
+ *  the block must return a 2-element \Array whose two elements
+ *  form a key-value pair in the returned \Hash:
+ *    a = ['foo', :bar, 1, [2, 3], {baz: 4}]
+ *    h = a.to_h {|item| [item, item] }
+ *    h # => {"foo"=>"foo", :bar=>:bar, 1=>1, [2, 3]=>[2, 3], {:baz=>4}=>{:baz=>4}}
+ *
+ *  When no block is given, +self+ must be an \Array of 2-element sub-arrays,
+ *  each sub-array is formed into a key-value pair in the new \Hash:
+ *    [].to_h # => {}
+ *    a = [['foo', 'zero'], ['bar', 'one'], ['baz', 'two']]
+ *    h = a.to_h
+ *    h # => {"foo"=>"zero", "bar"=>"one", "baz"=>"two"}
  */
 
 static VALUE
 rb_ary_to_h(VALUE ary)
 {
     long i;
-    VALUE hash = rb_hash_new();
+    VALUE hash = rb_hash_new_with_size(RARRAY_LEN(ary));
+    int block_given = rb_block_given_p();
+
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	const VALUE elt = rb_ary_elt(ary, i);
+	const VALUE e = rb_ary_elt(ary, i);
+	const VALUE elt = block_given ? rb_yield_force_blockarg(e) : e;
 	const VALUE key_value_pair = rb_check_array_type(elt);
 	if (NIL_P(key_value_pair)) {
 	    rb_raise(rb_eTypeError, "wrong element type %"PRIsVALUE" at %ld (expected array)",
@@ -2189,7 +2973,7 @@ rb_ary_to_h(VALUE ary)
 
 /*
  *  call-seq:
- *     ary.to_ary -> ary
+ *    array.to_ary -> self
  *
  *  Returns +self+.
  */
@@ -2218,9 +3002,9 @@ rb_ary_reverse(VALUE ary)
 
     rb_ary_modify(ary);
     if (len > 1) {
-	RARRAY_PTR_USE(ary, p1, {
-	    p2 = p1 + len - 1;	/* points last item */
-	    ary_reverse(p1, p2);
+        RARRAY_PTR_USE_TRANSIENT(ary, p1, {
+            p2 = p1 + len - 1;	/* points last item */
+            ary_reverse(p1, p2);
 	}); /* WB: no new reference */
     }
     return ary;
@@ -2228,13 +3012,11 @@ rb_ary_reverse(VALUE ary)
 
 /*
  *  call-seq:
- *     ary.reverse!   -> ary
+ *    array.reverse! -> self
  *
- *  Reverses +self+ in place.
- *
- *     a = [ "a", "b", "c" ]
- *     a.reverse!       #=> ["c", "b", "a"]
- *     a                #=> ["c", "b", "a"]
+ *  Reverses +self+ in place:
+ *    a = ['foo', 'bar', 'two']
+ *    a.reverse! # => ["two", "bar", "foo"]
  */
 
 static VALUE
@@ -2245,12 +3027,12 @@ rb_ary_reverse_bang(VALUE ary)
 
 /*
  *  call-seq:
- *     ary.reverse    -> new_ary
- *
- *  Returns a new array containing +self+'s elements in reverse order.
+ *    array.reverse -> new_array
  *
- *     [ "a", "b", "c" ].reverse   #=> ["c", "b", "a"]
- *     [ 1 ].reverse               #=> [1]
+ *  Returns a new \Array with the elements of +self+ in reverse order.
+ *    a = ['foo', 'bar', 'two']
+ *    a1 = a.reverse
+ *    a1 # => ["two", "bar", "foo"]
  */
 
 static VALUE
@@ -2260,8 +3042,8 @@ rb_ary_reverse_m(VALUE ary)
     VALUE dup = rb_ary_new2(len);
 
     if (len > 0) {
-	const VALUE *p1 = RARRAY_CONST_PTR(ary);
-	VALUE *p2 = (VALUE *)RARRAY_CONST_PTR(dup) + len - 1;
+        const VALUE *p1 = RARRAY_CONST_PTR_TRANSIENT(ary);
+        VALUE *p2 = (VALUE *)RARRAY_CONST_PTR_TRANSIENT(dup) + len - 1;
 	do *p2-- = *p1++; while (--len > 0);
     }
     ARY_SET_LEN(dup, RARRAY_LEN(ary));
@@ -2274,73 +3056,127 @@ rotate_count(long cnt, long len)
     return (cnt < 0) ? (len - (~cnt % len) - 1) : (cnt % len);
 }
 
+static void
+ary_rotate_ptr(VALUE *ptr, long len, long cnt)
+{
+    if (cnt == 1) {
+        VALUE tmp = *ptr;
+        memmove(ptr, ptr + 1, sizeof(VALUE)*(len - 1));
+        *(ptr + len - 1) = tmp;
+    } else if (cnt == len - 1) {
+        VALUE tmp = *(ptr + len - 1);
+        memmove(ptr + 1, ptr, sizeof(VALUE)*(len - 1));
+        *ptr = tmp;
+    } else {
+        --len;
+        if (cnt < len) ary_reverse(ptr + cnt, ptr + len);
+        if (--cnt > 0) ary_reverse(ptr, ptr + cnt);
+        if (len > 0) ary_reverse(ptr, ptr + len);
+    }
+}
+
 VALUE
 rb_ary_rotate(VALUE ary, long cnt)
 {
     rb_ary_modify(ary);
 
     if (cnt != 0) {
-	VALUE *ptr = RARRAY_PTR(ary);
-	long len = RARRAY_LEN(ary);
-
-	if (len > 0 && (cnt = rotate_count(cnt, len)) > 0) {
-	    --len;
-	    if (cnt < len) ary_reverse(ptr + cnt, ptr + len);
-	    if (--cnt > 0) ary_reverse(ptr, ptr + cnt);
-	    if (len > 0) ary_reverse(ptr, ptr + len);
-	    return ary;
-	}
+        long len = RARRAY_LEN(ary);
+        if (len > 1 && (cnt = rotate_count(cnt, len)) > 0) {
+            RARRAY_PTR_USE_TRANSIENT(ary, ptr, ary_rotate_ptr(ptr, len, cnt));
+            return ary;
+        }
     }
-
     return Qnil;
 }
 
 /*
  *  call-seq:
- *     ary.rotate!(count=1)   -> ary
- *
- *  Rotates +self+ in place so that the element at +count+ comes first, and
- *  returns +self+.
- *
- *  If +count+ is negative then it rotates in the opposite direction, starting
- *  from the end of the array where +-1+ is the last element.
- *
- *     a = [ "a", "b", "c", "d" ]
- *     a.rotate!        #=> ["b", "c", "d", "a"]
- *     a                #=> ["b", "c", "d", "a"]
- *     a.rotate!(2)     #=> ["d", "a", "b", "c"]
- *     a.rotate!(-3)    #=> ["a", "b", "c", "d"]
+ *    array.rotate! -> self
+ *    array.rotate!(count) -> self
+ *
+ *  Rotates +self+ in place by moving elements from one end to the other; returns +self+.
+ *
+ *  When no argument given, rotates the first element to the last position:
+ *    a = [:foo, 'bar', 2, 'bar']
+ *    a.rotate! # => ["bar", 2, "bar", :foo]
+ *
+ *  When given a non-negative \Integer +count+,
+ *  rotates +count+ elements from the beginning to the end:
+ *    a = [:foo, 'bar', 2]
+ *    a.rotate!(2)
+ *    a # => [2, :foo, "bar"]
+ *
+ *  If +count+ is large, uses <tt>count % array.size</tt> as the count:
+ *    a = [:foo, 'bar', 2]
+ *    a.rotate!(20)
+ *    a # => [2, :foo, "bar"]
+ *
+ *  If +count+ is zero, returns +self+ unmodified:
+ *    a = [:foo, 'bar', 2]
+ *    a.rotate!(0)
+ *    a # => [:foo, "bar", 2]
+ *
+ *  When given a negative Integer +count+, rotates in the opposite direction,
+ *  from end to beginning:
+ *    a = [:foo, 'bar', 2]
+ *    a.rotate!(-2)
+ *    a # => ["bar", 2, :foo]
+ *
+ *  If +count+ is small (far from zero), uses <tt>count % array.size</tt> as the count:
+ *    a = [:foo, 'bar', 2]
+ *    a.rotate!(-5)
+ *    a # => ["bar", 2, :foo]
  */
 
 static VALUE
 rb_ary_rotate_bang(int argc, VALUE *argv, VALUE ary)
 {
-    long n = 1;
-
-    switch (argc) {
-      case 1: n = NUM2LONG(argv[0]);
-      case 0: break;
-      default: rb_scan_args(argc, argv, "01", NULL);
-    }
+    long n = (rb_check_arity(argc, 0, 1) ? NUM2LONG(argv[0]) : 1);
     rb_ary_rotate(ary, n);
     return ary;
 }
 
 /*
  *  call-seq:
- *     ary.rotate(count=1)    -> new_ary
- *
- *  Returns a new array by rotating +self+ so that the element at +count+ is
- *  the first element of the new array.
- *
- *  If +count+ is negative then it rotates in the opposite direction, starting
- *  from the end of +self+ where +-1+ is the last element.
- *
- *     a = [ "a", "b", "c", "d" ]
- *     a.rotate         #=> ["b", "c", "d", "a"]
- *     a                #=> ["a", "b", "c", "d"]
- *     a.rotate(2)      #=> ["c", "d", "a", "b"]
- *     a.rotate(-3)     #=> ["b", "c", "d", "a"]
+ *    array.rotate -> new_array
+ *    array.rotate(count) -> new_array
+ *
+ *  Returns a new \Array formed from +self+ with elements
+ *  rotated from one end to the other.
+ *
+ *  When no argument given, returns a new \Array that is like +self+,
+ *  except that the first element has been rotated to the last position:
+ *    a = [:foo, 'bar', 2, 'bar']
+ *    a1 = a.rotate
+ *    a1 # => ["bar", 2, "bar", :foo]
+ *
+ *  When given a non-negative \Integer +count+,
+ *  returns a new \Array with +count+ elements rotated from the beginning to the end:
+ *    a = [:foo, 'bar', 2]
+ *    a1 = a.rotate(2)
+ *    a1 # => [2, :foo, "bar"]
+ *
+ *  If +count+ is large, uses <tt>count % array.size</tt> as the count:
+ *    a = [:foo, 'bar', 2]
+ *    a1 = a.rotate(20)
+ *    a1 # => [2, :foo, "bar"]
+ *
+ *  If +count+ is zero, returns a copy of +self+, unmodified:
+ *    a = [:foo, 'bar', 2]
+ *    a1 = a.rotate(0)
+ *    a1 # => [:foo, "bar", 2]
+ *
+ *  When given a negative \Integer +count+, rotates in the opposite direction,
+ *  from end to beginning:
+ *    a = [:foo, 'bar', 2]
+ *    a1 = a.rotate(-2)
+ *    a1 # => ["bar", 2, :foo]
+ *
+ *  If +count+ is small (far from zero), uses <tt>count % array.size</tt> as the count:
+ *    a = [:foo, 'bar', 2]
+ *    a1 = a.rotate(-5)
+ *    a1 # => ["bar", 2, :foo]
  */
 
 static VALUE
@@ -2348,19 +3184,14 @@ rb_ary_rotate_m(int argc, VALUE *argv, VALUE ary)
 {
     VALUE rotated;
     const VALUE *ptr;
-    long len, cnt = 1;
-
-    switch (argc) {
-      case 1: cnt = NUM2LONG(argv[0]);
-      case 0: break;
-      default: rb_scan_args(argc, argv, "01", NULL);
-    }
+    long len;
+    long cnt = (rb_check_arity(argc, 0, 1) ? NUM2LONG(argv[0]) : 1);
 
     len = RARRAY_LEN(ary);
     rotated = rb_ary_new2(len);
     if (len > 0) {
 	cnt = rotate_count(cnt, len);
-	ptr = RARRAY_CONST_PTR(ary);
+        ptr = RARRAY_CONST_PTR_TRANSIENT(ary);
 	len -= cnt;
 	ary_memcpy(rotated, 0, len, ptr + cnt);
 	ary_memcpy(rotated, len, cnt, ptr);
@@ -2389,9 +3220,12 @@ sort_1(const void *ap, const void *bp, void *dummy)
     struct ary_sort_data *data = dummy;
     VALUE retval = sort_reentered(data->ary);
     VALUE a = *(const VALUE *)ap, b = *(const VALUE *)bp;
+    VALUE args[2];
     int n;
 
-    retval = rb_yield_values(2, a, b);
+    args[0] = a;
+    args[1] = b;
+    retval = rb_yield_values2(2, args);
     n = rb_cmpint(retval, a, b);
     sort_reentered(data->ary);
     return n;
@@ -2405,7 +3239,7 @@ sort_2(const void *ap, const void *bp, void *dummy)
     VALUE a = *(const VALUE *)ap, b = *(const VALUE *)bp;
     int n;
 
-    if (FIXNUM_P(a) && FIXNUM_P(b) && CMP_OPTIMIZABLE(data->cmp_opt, Fixnum)) {
+    if (FIXNUM_P(a) && FIXNUM_P(b) && CMP_OPTIMIZABLE(data->cmp_opt, Integer)) {
 	if ((long)a > (long)b) return 1;
 	if ((long)a < (long)b) return -1;
 	return 0;
@@ -2413,6 +3247,9 @@ sort_2(const void *ap, const void *bp, void *dummy)
     if (STRING_P(a) && STRING_P(b) && CMP_OPTIMIZABLE(data->cmp_opt, String)) {
 	return rb_str_cmp(a, b);
     }
+    if (RB_FLOAT_TYPE_P(a) && CMP_OPTIMIZABLE(data->cmp_opt, Float)) {
+	return rb_float_cmp(a, b);
+    }
 
     retval = rb_funcallv(a, id_cmp, 1, &b);
     n = rb_cmpint(retval, a, b);
@@ -2423,23 +3260,38 @@ sort_2(const void *ap, const void *bp, void *dummy)
 
 /*
  *  call-seq:
- *     ary.sort!                   -> ary
- *     ary.sort! { |a, b| block }  -> ary
- *
- *  Sorts +self+ in place.
- *
- *  Comparisons for the sort will be done using the <code><=></code> operator
- *  or using an optional code block.
- *
- *  The block must implement a comparison between +a+ and +b+ and return
- *  an integer less than 0 when +b+ follows +a+, +0+ when +a+ and +b+
- *  are equivalent, or an integer greater than 0 when +a+ follows +b+.
- *
- *  See also Enumerable#sort_by.
- *
- *     a = [ "d", "a", "e", "c", "b" ]
- *     a.sort!                    #=> ["a", "b", "c", "d", "e"]
- *     a.sort! { |x,y| y <=> x }  #=> ["e", "d", "c", "b", "a"]
+ *    array.sort! -> self
+ *    array.sort! {|a, b| ... } -> self
+ *
+ *  Returns +self+ with its elements sorted in place.
+ *
+ *  With no block, compares elements using operator <tt><=></tt>
+ *  (see Comparable):
+ *    a = 'abcde'.split('').shuffle
+ *    a # => ["e", "b", "d", "a", "c"]
+ *    a.sort!
+ *    a # => ["a", "b", "c", "d", "e"]
+ *
+ *  With a block, calls the block with each element pair;
+ *  for each element pair +a+ and +b+, the block should return an integer:
+ *  - Negative when +b+ is to follow +a+.
+ *  - Zero when +a+ and +b+ are equivalent.
+ *  - Positive when +a+ is to follow +b+.
+ *
+ *  Example:
+ *    a = 'abcde'.split('').shuffle
+ *    a # => ["e", "b", "d", "a", "c"]
+ *    a.sort! {|a, b| a <=> b }
+ *    a # => ["a", "b", "c", "d", "e"]
+ *    a.sort! {|a, b| b <=> a }
+ *    a # => ["e", "d", "c", "b", "a"]
+ *
+ *  When the block returns zero, the order for +a+ and +b+ is indeterminate,
+ *  and may be unstable:
+ *    a = 'abcde'.split('').shuffle
+ *    a # => ["e", "b", "d", "a", "c"]
+ *    a.sort! {|a, b| 0 }
+ *    a # => ["d", "e", "c", "a", "b"]
  */
 
 VALUE
@@ -2451,14 +3303,13 @@ rb_ary_sort_bang(VALUE ary)
 	VALUE tmp = ary_make_substitution(ary); /* only ary refers tmp */
 	struct ary_sort_data data;
 	long len = RARRAY_LEN(ary);
-
 	RBASIC_CLEAR_CLASS(tmp);
 	data.ary = tmp;
 	data.cmp_opt.opt_methods = 0;
 	data.cmp_opt.opt_inited = 0;
 	RARRAY_PTR_USE(tmp, ptr, {
-	    ruby_qsort(ptr, len, sizeof(VALUE),
-		       rb_block_given_p()?sort_1:sort_2, &data);
+            ruby_qsort(ptr, len, sizeof(VALUE),
+                       rb_block_given_p()?sort_1:sort_2, &data);
 	}); /* WB: no new reference */
 	rb_ary_modify(ary);
         if (ARY_EMBED_P(tmp)) {
@@ -2484,44 +3335,61 @@ rb_ary_sort_bang(VALUE ary)
                     rb_ary_unshare(ary);
                 }
                 else {
-		    ruby_sized_xfree((void *)ARY_HEAP_PTR(ary), ARY_HEAP_SIZE(ary));
+                    ary_heap_free(ary);
                 }
-                ARY_SET_PTR(ary, RARRAY_CONST_PTR(tmp));
+                ARY_SET_PTR(ary, ARY_HEAP_PTR(tmp));
                 ARY_SET_HEAP_LEN(ary, len);
-                ARY_SET_CAPA(ary, RARRAY_LEN(tmp));
+                ARY_SET_CAPA(ary, ARY_HEAP_LEN(tmp));
             }
             /* tmp was lost ownership for the ptr */
             FL_UNSET(tmp, FL_FREEZE);
             FL_SET_EMBED(tmp);
             ARY_SET_EMBED_LEN(tmp, 0);
             FL_SET(tmp, FL_FREEZE);
-	}
+        }
         /* tmp will be GC'ed. */
         RBASIC_SET_CLASS_RAW(tmp, rb_cArray); /* rb_cArray must be marked */
     }
+    ary_verify(ary);
     return ary;
 }
 
 /*
  *  call-seq:
- *     ary.sort                   -> new_ary
- *     ary.sort { |a, b| block }  -> new_ary
- *
- *  Returns a new array created by sorting +self+.
- *
- *  Comparisons for the sort will be done using the <code><=></code> operator
- *  or using an optional code block.
- *
- *  The block must implement a comparison between +a+ and +b+ and return
- *  an integer less than 0 when +b+ follows +a+, +0+ when +a+ and +b+
- *  are equivalent, or an integer greater than 0 when +a+ follows +b+.
- *
- *
- *  See also Enumerable#sort_by.
- *
- *     a = [ "d", "a", "e", "c", "b" ]
- *     a.sort                    #=> ["a", "b", "c", "d", "e"]
- *     a.sort { |x,y| y <=> x }  #=> ["e", "d", "c", "b", "a"]
+ *    array.sort -> new_array
+ *    array.sort {|a, b| ... } -> new_array
+ *
+ *  Returns a new \Array whose elements are those from +self+, sorted.
+ *
+ *  With no block, compares elements using operator <tt><=></tt>
+ *  (see Comparable):
+ *    a = 'abcde'.split('').shuffle
+ *    a # => ["e", "b", "d", "a", "c"]
+ *    a1 = a.sort
+ *    a1 # => ["a", "b", "c", "d", "e"]
+ *
+ *  With a block, calls the block with each element pair;
+ *  for each element pair +a+ and +b+, the block should return an integer:
+ *  - Negative when +b+ is to follow +a+.
+ *  - Zero when +a+ and +b+ are equivalent.
+ *  - Positive when +a+ is to follow +b+.
+ *
+ *  Example:
+ *    a = 'abcde'.split('').shuffle
+ *    a # => ["e", "b", "d", "a", "c"]
+ *    a1 = a.sort {|a, b| a <=> b }
+ *    a1 # => ["a", "b", "c", "d", "e"]
+ *    a2 = a.sort {|a, b| b <=> a }
+ *    a2 # => ["e", "d", "c", "b", "a"]
+ *
+ *  When the block returns zero, the order for +a+ and +b+ is indeterminate,
+ *  and may be unstable:
+ *    a = 'abcde'.split('').shuffle
+ *    a # => ["e", "b", "d", "a", "c"]
+ *    a1 = a.sort {|a, b| 0 }
+ *    a1 # =>  ["c", "e", "b", "d", "a"]
+ *
+ *  Related: Enumerable#sort_by.
  */
 
 VALUE
@@ -2536,55 +3404,93 @@ static VALUE rb_ary_bsearch_index(VALUE ary);
 
 /*
  *  call-seq:
- *     ary.bsearch {|x| block }  -> elem
+ *    array.bsearch {|element| ... } -> object
+ *    array.bsearch -> new_enumerator
+ *
+ *  Returns an element from +self+ selected by a binary search.
+ *  +self+ should be sorted, but this is not checked.
  *
  *  By using binary search, finds a value from this array which meets
- *  the given condition in O(log n) where n is the size of the array.
- *
- *  You can use this method in two use cases: a find-minimum mode and
- *  a find-any mode.  In either case, the elements of the array must be
- *  monotone (or sorted) with respect to the block.
- *
- *  In find-minimum mode (this is a good choice for typical use case),
- *  the block must return true or false, and there must be an index i
- *  (0 <= i <= ary.size) so that:
- *
- *  - the block returns false for any element whose index is less than
- *    i, and
- *  - the block returns true for any element whose index is greater
- *    than or equal to i.
- *
- *  This method returns the i-th element.  If i is equal to ary.size,
- *  it returns nil.
- *
- *     ary = [0, 4, 7, 10, 12]
- *     ary.bsearch {|x| x >=   4 } #=> 4
- *     ary.bsearch {|x| x >=   6 } #=> 7
- *     ary.bsearch {|x| x >=  -1 } #=> 0
- *     ary.bsearch {|x| x >= 100 } #=> nil
- *
- *  In find-any mode (this behaves like libc's bsearch(3)), the block
- *  must return a number, and there must be two indices i and j
- *  (0 <= i <= j <= ary.size) so that:
- *
- *  - the block returns a positive number for ary[k] if 0 <= k < i,
- *  - the block returns zero for ary[k] if i <= k < j, and
- *  - the block returns a negative number for ary[k] if
- *    j <= k < ary.size.
- *
- *  Under this condition, this method returns any element whose index
- *  is within i...j.  If i is equal to j (i.e., there is no element
- *  that satisfies the block), this method returns nil.
- *
- *     ary = [0, 4, 7, 10, 12]
- *     # try to find v such that 4 <= v < 8
- *     ary.bsearch {|x| 1 - x / 4 } #=> 4 or 7
- *     # try to find v such that 8 <= v < 10
- *     ary.bsearch {|x| 4 - x / 2 } #=> nil
- *
- *  You must not mix the two modes at a time; the block must always
- *  return either true/false, or always return a number.  It is
- *  undefined which value is actually picked up at each iteration.
+ *  the given condition in <tt>O(log n)</tt> where +n+ is the size of the array.
+ *
+ *  There are two search modes:
+ *  - <b>Find-minimum mode</b>: the block should return +true+ or +false+.
+ *  - <b>Find-any mode</b>: the block should return a numeric value.
+ *
+ *  The block should not mix the modes by and sometimes returning +true+ or +false+
+ *  and sometimes returning a numeric value, but this is not checked.
+ *
+ *  <b>Find-Minimum Mode</b>
+ *
+ *  In find-minimum mode, the block always returns +true+ or +false+.
+ *  The further requirement (though not checked) is that
+ *  there are no indexes +i+ and +j+ such that:
+ *  - <tt>0 <= i < j <= self.size</tt>.
+ *  - The block returns +true+ for <tt>self[i]</tt> and +false+ for <tt>self[j]</tt>.
+ *
+ *  In find-minimum mode, method bsearch returns the first element for which the block returns true.
+ *
+ *  Examples:
+ *    a = [0, 4, 7, 10, 12]
+ *    a.bsearch {|x| x >= 4 } # => 4
+ *    a.bsearch {|x| x >= 6 } # => 7
+ *    a.bsearch {|x| x >= -1 } # => 0
+ *    a.bsearch {|x| x >= 100 } # => nil
+ *
+ *  Less formally: the block is such that all +false+-evaluating elements
+ *  precede all +true+-evaluating elements.
+ *
+ *  These make sense as blocks in find-minimum mode:
+ *    a = [0, 4, 7, 10, 12]
+ *    a.map {|x| x >= 4 } # => [false, true, true, true, true]
+ *    a.map {|x| x >= 6 } # => [false, false, true, true, true]
+ *    a.map {|x| x >= -1 } # => [true, true, true, true, true]
+ *    a.map {|x| x >= 100 } # => [false, false, false, false, false]
+ *
+ *  This would not make sense:
+ *    a = [0, 4, 7, 10, 12]
+ *    a.map {|x| x == 7 } # => [false, false, true, false, false]
+ *
+ *  <b>Find-Any Mode</b>
+ *
+ *  In find-any mode, the block always returns a numeric value.
+ *  The further requirement (though not checked) is that
+ *  there are no indexes +i+ and +j+ such that:
+ *  - <tt>0 <= i < j <= self.size</tt>.
+ *  - The block returns a negative value for <tt>self[i]</tt>
+ *    and a positive value for <tt>self[j]</tt>.
+ *  - The block returns a negative value for <tt>self[i]</tt> and zero <tt>self[j]</tt>.
+ *  - The block returns zero for <tt>self[i]</tt> and a positive value for <tt>self[j]</tt>.
+ *
+ *  In find-any mode, method bsearch returns some element
+ *  for which the block returns zero, or +nil+ if no such element is found.
+ *
+ *  Examples:
+ *    a = [0, 4, 7, 10, 12]
+ *    a.bsearch {|element| 7 <=> element } # => 7
+ *    a.bsearch {|element| -1 <=> element } # => nil
+ *    a.bsearch {|element| 5 <=> element } # => nil
+ *    a.bsearch {|element| 15 <=> element } # => nil
+ *
+ *  Less formally: the block is such that:
+ *  - All positive-evaluating elements precede all zero-evaluating elements.
+ *  - All positive-evaluating elements precede all negative-evaluating elements.
+ *  - All zero-evaluating elements precede all negative-evaluating elements.
+ *
+ *  These make sense as blocks in find-any mode:
+ *    a = [0, 4, 7, 10, 12]
+ *    a.map {|element| 7 <=> element } # => [1, 1, 0, -1, -1]
+ *    a.map {|element| -1 <=> element } # => [-1, -1, -1, -1, -1]
+ *    a.map {|element| 5 <=> element } # => [1, 1, -1, -1, -1]
+ *    a.map {|element| 15 <=> element } # => [1, 1, 1, 1, 1]
+ *
+ *  This would not make sense:
+ *    a = [0, 4, 7, 10, 12]
+ *    a.map {|element| element <=> 7 } # => [-1, -1, 0, 1, 1]
+ *
+ *  Returns an enumerator if no block given:
+ *    a = [0, 4, 7, 10, 12]
+ *    a.bsearch # => #<Enumerator: [0, 4, 7, 10, 12]:bsearch>
  */
 
 static VALUE
@@ -2600,15 +3506,11 @@ rb_ary_bsearch(VALUE ary)
 
 /*
  *  call-seq:
- *     ary.bsearch_index {|x| block }  -> int or nil
+ *    array.bsearch_index {|element| ... } -> integer or nil
+ *    array.bsearch_index -> new_enumerator
  *
- *  By using binary search, finds an index of a value from this array which
- *  meets the given condition in O(log n) where n is the size of the array.
- *
- *  It supports two modes, depending on the nature of the block and they are
- *  exactly the same as in the case of #bsearch method with the only difference
- *  being that this method returns the index of the element instead of the
- *  element itself. For more details consult the documentation for #bsearch.
+ *  Searches +self+ as described at method #bsearch,
+ *  but returns the _index_ of the found element instead of the element itself.
  */
 
 static VALUE
@@ -2667,14 +3569,26 @@ sort_by_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, dummy))
 
 /*
  *  call-seq:
- *     ary.sort_by! { |obj| block }    -> ary
- *     ary.sort_by!                    -> Enumerator
+ *    array.sort_by! {|element| ... } -> self
+ *    array.sort_by! -> new_enumerator
+ *
+ *  Sorts the elements of +self+ in place,
+ *  using an ordering determined by the block; returns self.
+ *
+ *  Calls the block with each successive element;
+ *  sorts elements based on the values returned from the block.
+ *
+ *  For duplicates returned by the block, the ordering is indeterminate, and may be unstable.
  *
- *  Sorts +self+ in place using a set of keys generated by mapping the
- *  values in +self+ through the given block.
+ *  This example sorts strings based on their sizes:
+ *    a = ['aaaa', 'bbb', 'cc', 'd']
+ *    a.sort_by! {|element| element.size }
+ *    a # => ["d", "cc", "bbb", "aaaa"]
  *
- *  If no block is given, an Enumerator is returned instead.
+ *  Returns a new \Enumerator if no block given:
  *
+ *    a = ['aaaa', 'bbb', 'cc', 'd']
+ *    a.sort_by! # => #<Enumerator: ["aaaa", "bbb", "cc", "d"]:sort_by!>
  */
 
 static VALUE
@@ -2692,23 +3606,21 @@ rb_ary_sort_by_bang(VALUE ary)
 
 /*
  *  call-seq:
- *     ary.collect { |item| block }  -> new_ary
- *     ary.map     { |item| block }  -> new_ary
- *     ary.collect                   -> Enumerator
- *     ary.map                       -> Enumerator
+ *    array.map {|element| ... } -> new_array
+ *    array.map -> new_enumerator
  *
- *  Invokes the given block once for each element of +self+.
+ *  Calls the block, if given, with each element of +self+;
+ *  returns a new \Array whose elements are the return values from the block:
+ *    a = [:foo, 'bar', 2]
+ *    a1 = a.map {|element| element.class }
+ *    a1 # => [Symbol, String, Integer]
  *
- *  Creates a new array containing the values returned by the block.
+ *  Returns a new \Enumerator if no block given:
+ *    a = [:foo, 'bar', 2]
+ *    a1 = a.map
+ *    a1 # => #<Enumerator: [:foo, "bar", 2]:map>
  *
- *  See also Enumerable#collect.
- *
- *  If no block is given, an Enumerator is returned instead.
- *
- *     a = [ "a", "b", "c", "d" ]
- *     a.collect { |x| x + "!" }         #=> ["a!", "b!", "c!", "d!"]
- *     a.map.with_index { |x, i| x * i } #=> ["", "b", "cc", "ddd"]
- *     a                                 #=> ["a", "b", "c", "d"]
+ *  Array#collect is an alias for Array#map.
  */
 
 static VALUE
@@ -2720,7 +3632,7 @@ rb_ary_collect(VALUE ary)
     RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length);
     collect = rb_ary_new2(RARRAY_LEN(ary));
     for (i = 0; i < RARRAY_LEN(ary); i++) {
-	rb_ary_push(collect, rb_yield(RARRAY_AREF(ary, i)));
+        rb_ary_push(collect, rb_yield(RARRAY_AREF(ary, i)));
     }
     return collect;
 }
@@ -2728,23 +3640,20 @@ rb_ary_collect(VALUE ary)
 
 /*
  *  call-seq:
- *     ary.collect! {|item| block }   -> ary
- *     ary.map!     {|item| block }   -> ary
- *     ary.collect!                   -> Enumerator
- *     ary.map!                       -> Enumerator
- *
- *  Invokes the given block once for each element of +self+, replacing the
- *  element with the value returned by the block.
+ *    array.map! {|element| ... } -> self
+ *    array.map! -> new_enumerator
  *
- *  See also Enumerable#collect.
+ *  Calls the block, if given, with each element;
+ *  replaces the element with the block's return value:
+ *    a = [:foo, 'bar', 2]
+ *    a.map! { |element| element.class } # => [Symbol, String, Integer]
  *
- *  If no block is given, an Enumerator is returned instead.
+ *  Returns a new \Enumerator if no block given:
+ *    a = [:foo, 'bar', 2]
+ *    a1 = a.map!
+ *    a1 # => #<Enumerator: [:foo, "bar", 2]:map!>
  *
- *     a = [ "a", "b", "c", "d" ]
- *     a.map! {|x| x + "!" }
- *     a #=>  [ "a!", "b!", "c!", "d!" ]
- *     a.collect!.with_index {|x, i| x[0...i] }
- *     a #=>  ["", "b", "c!", "d!"]
+ *  Array#collect! is an alias for Array#map!.
  */
 
 static VALUE
@@ -2786,47 +3695,98 @@ rb_get_values_at(VALUE obj, long olen, int argc, const VALUE *argv, VALUE (*func
     return result;
 }
 
+static VALUE
+append_values_at_single(VALUE result, VALUE ary, long olen, VALUE idx)
+{
+    long beg, len;
+    if (FIXNUM_P(idx)) {
+	beg = FIX2LONG(idx);
+    }
+    /* check if idx is Range */
+    else if (rb_range_beg_len(idx, &beg, &len, olen, 1)) {
+	if (len > 0) {
+            const VALUE *const src = RARRAY_CONST_PTR_TRANSIENT(ary);
+	    const long end = beg + len;
+	    const long prevlen = RARRAY_LEN(result);
+	    if (beg < olen) {
+		rb_ary_cat(result, src + beg, end > olen ? olen-beg : len);
+	    }
+	    if (end > olen) {
+		rb_ary_store(result, prevlen + len - 1, Qnil);
+	    }
+	}
+	return result;
+    }
+    else {
+	beg = NUM2LONG(idx);
+    }
+    return rb_ary_push(result, rb_ary_entry(ary, beg));
+}
+
 /*
  *  call-seq:
- *     ary.values_at(selector, ...)  -> new_ary
+ *    array.values_at(*indexes) -> new_array
+ *
+ *  Returns a new \Array whose elements are the elements
+ *  of +self+ at the given \Integer +indexes+.
+ *
+ *  For each positive +index+, returns the element at offset +index+:
+ *    a = [:foo, 'bar', 2]
+ *    a.values_at(0, 2) # => [:foo, 2]
+ *
+ *  The given +indexes+ may be in any order, and may repeat:
+ *    a = [:foo, 'bar', 2]
+ *    a.values_at(2, 0, 1, 0, 2) # => [2, :foo, "bar", :foo, 2]
  *
- *  Returns an array containing the elements in +self+ corresponding to the
- *  given +selector+(s).
+ *  Assigns +nil+ for an +index+ that is too large:
+ *    a = [:foo, 'bar', 2]
+ *    a.values_at(0, 3, 1, 3) # => [:foo, nil, "bar", nil]
  *
- *  The selectors may be either integer indices or ranges.
+ *  Returns a new empty \Array if no arguments given.
  *
- *  See also Array#select.
+ *  For each negative +index+, counts backward from the end of the array:
+ *    a = [:foo, 'bar', 2]
+ *    a.values_at(-1, -3) # => [2, :foo]
  *
- *     a = %w{ a b c d e f }
- *     a.values_at(1, 3, 5)          # => ["b", "d", "f"]
- *     a.values_at(1, 3, 5, 7)       # => ["b", "d", "f", nil]
- *     a.values_at(-1, -2, -2, -7)   # => ["f", "e", "e", nil]
- *     a.values_at(4..6, 3...6)      # => ["e", "f", nil, "d", "e", "f"]
+ *  Assigns +nil+ for an +index+ that is too small:
+ *    a = [:foo, 'bar', 2]
+ *    a.values_at(0, -5, 1, -6, 2) # => [:foo, nil, "bar", nil, 2]
+ *
+ *  The given +indexes+ may have a mixture of signs:
+ *    a = [:foo, 'bar', 2]
+ *    a.values_at(0, -2, 1, -1) # => [:foo, "bar", "bar", 2]
  */
 
 static VALUE
 rb_ary_values_at(int argc, VALUE *argv, VALUE ary)
 {
-    return rb_get_values_at(ary, RARRAY_LEN(ary), argc, argv, rb_ary_entry);
+    long i, olen = RARRAY_LEN(ary);
+    VALUE result = rb_ary_new_capa(argc);
+    for (i = 0; i < argc; ++i) {
+	append_values_at_single(result, ary, olen, argv[i]);
+    }
+    RB_GC_GUARD(ary);
+    return result;
 }
 
 
 /*
  *  call-seq:
- *     ary.select { |item| block } -> new_ary
- *     ary.select                  -> Enumerator
- *
- *  Returns a new array containing all elements of +ary+
- *  for which the given +block+ returns a true value.
- *
- *  If no block is given, an Enumerator is returned instead.
+ *    array.select {|element| ... } -> new_array
+ *    array.select -> new_enumerator
  *
- *     [1,2,3,4,5].select { |num|  num.even?  }   #=> [2, 4]
+ *  Calls the block, if given, with each element of +self+;
+ *  returns a new \Array containing those elements of +self+
+ *  for which the block returns a truthy value:
+ *    a = [:foo, 'bar', 2, :bam]
+ *    a1 = a.select {|element| element.to_s.start_with?('b') }
+ *    a1 # => ["bar", :bam]
  *
- *     a = %w{ a b c d e f }
- *     a.select { |v| v =~ /[aeiou]/ }  #=> ["a", "e"]
+ *  Returns a new \Enumerator if no block given:
+ *    a = [:foo, 'bar', 2, :bam]
+ *    a.select # => #<Enumerator: [:foo, "bar", 2, :bam]:select>
  *
- *  See also Enumerable#select.
+ *  Array#filter is an alias for Array#select.
  */
 
 static VALUE
@@ -2876,33 +3836,39 @@ select_bang_ensure(VALUE a)
     long len = RARRAY_LEN(ary);
     long i1 = arg->len[0], i2 = arg->len[1];
 
-    if (i2 < i1) {
+    if (i2 < len && i2 < i1) {
+	long tail = 0;
+        rb_ary_modify(ary);
 	if (i1 < len) {
-	    RARRAY_PTR_USE(ary, ptr, {
-		    MEMMOVE(ptr + i2, ptr + i1, VALUE, len - i1);
+	    tail = len - i1;
+            RARRAY_PTR_USE_TRANSIENT(ary, ptr, {
+		    MEMMOVE(ptr + i2, ptr + i1, VALUE, tail);
 		});
 	}
-	ARY_SET_LEN(ary, len - i1 + i2);
+	ARY_SET_LEN(ary, i2 + tail);
     }
     return ary;
 }
 
 /*
  *  call-seq:
- *     ary.select!  {|item| block } -> ary or nil
- *     ary.select!                  -> Enumerator
+ *    array.select! {|element| ... } -> self or nil
+ *    array.select! -> new_enumerator
  *
- *  Invokes the given block passing in successive elements from +self+,
- *  deleting elements for which the block returns a +false+ value.
+ *  Calls the block, if given  with each element of +self+;
+ *  removes from +self+ those elements for which the block returns +false+ or +nil+.
  *
- *  The array may not be changed instantly every time the block is called.
+ *  Returns +self+ if any elements were removed:
+ *    a = [:foo, 'bar', 2, :bam]
+ *    a.select! {|element| element.to_s.start_with?('b') } # => ["bar", :bam]
  *
- *  If changes were made, it will return +self+, otherwise it returns +nil+.
+ *  Returns +nil+ if no elements were removed.
  *
- *  See also Array#keep_if
- *
- *  If no block is given, an Enumerator is returned instead.
+ *  Returns a new \Enumerator if no block given:
+ *    a = [:foo, 'bar', 2, :bam]
+ *    a.select! # => #<Enumerator: [:foo, "bar", 2, :bam]:select!>
  *
+ *  Array#filter! is an alias for Array#select!.
  */
 
 static VALUE
@@ -2920,18 +3886,17 @@ rb_ary_select_bang(VALUE ary)
 
 /*
  *  call-seq:
- *     ary.keep_if { |item| block } -> ary
- *     ary.keep_if                  -> Enumerator
- *
- *  Deletes every element of +self+ for which the given block evaluates to
- *  +false+.
- *
- *  See also Array#select!
+ *    array.keep_if {|element| ... } -> self
+ *    array.keep_if -> new_enumeration
  *
- *  If no block is given, an Enumerator is returned instead.
+ *  Retains those elements for which the block returns a truthy value;
+ *  deletes all other elements; returns +self+:
+ *    a = [:foo, 'bar', 2, :bam]
+ *    a.keep_if {|element| element.to_s.start_with?('b') } # => ["bar", :bam]
  *
- *     a = %w{ a b c d e f }
- *     a.keep_if { |v| v =~ /[aeiou]/ }  #=> ["a", "e"]
+ *  Returns a new \Enumerator if no block given:
+ *    a = [:foo, 'bar', 2, :bam]
+ *    a.keep_if # => #<Enumerator: [:foo, "bar", 2, :bam]:keep_if>
  */
 
 static VALUE
@@ -2957,22 +3922,34 @@ ary_resize_smaller(VALUE ary, long len)
 
 /*
  *  call-seq:
- *     ary.delete(obj)            -> item or nil
- *     ary.delete(obj) { block }  -> item or result of block
- *
- *  Deletes all items from +self+ that are equal to +obj+.
- *
- *  Returns the last deleted item, or +nil+ if no matching item is found.
- *
- *  If the optional code block is given, the result of the block is returned if
- *  the item is not found.  (To remove +nil+ elements and get an informative
- *  return value, use Array#compact!)
- *
- *     a = [ "a", "b", "b", "b", "c" ]
- *     a.delete("b")                   #=> "b"
- *     a                               #=> ["a", "c"]
- *     a.delete("z")                   #=> nil
- *     a.delete("z") { "not found" }   #=> "not found"
+ *    array.delete(obj) -> deleted_object
+ *    array.delete(obj) {|nosuch| ... } -> deleted_object or block_return
+ *
+ *  Removes zero or more elements from +self+; returns +self+.
+ *
+ *  When no block is given,
+ *  removes from +self+ each element +ele+ such that <tt>ele == obj</tt>;
+ *  returns the last deleted element:
+ *    s1 = 'bar'; s2 = 'bar'
+ *    a = [:foo, s1, 2, s2]
+ *    a.delete('bar') # => "bar"
+ *    a # => [:foo, 2]
+ *
+ *  Returns +nil+ if no elements removed.
+ *
+ *  When a block is given,
+ *  removes from +self+ each element +ele+ such that <tt>ele == obj</tt>.
+ *
+ *  If any such elements are found, ignores the block
+ *  and returns the last deleted element:
+ *    s1 = 'bar'; s2 = 'bar'
+ *    a = [:foo, s1, 2, s2]
+ *    deleted_obj = a.delete('bar') {|obj| fail 'Cannot happen' }
+ *    a # => [:foo, 2]
+ *
+ *  If no such elements are found, returns the block's return value:
+ *    a = [:foo, 'bar', 2]
+ *    a.delete(:nosuch) {|obj| "#{obj} not found" } # => "nosuch not found"
  */
 
 VALUE
@@ -3002,6 +3979,7 @@ rb_ary_delete(VALUE ary, VALUE item)
 
     ary_resize_smaller(ary, i2);
 
+    ary_verify(ary);
     return v;
 }
 
@@ -3042,27 +4020,33 @@ rb_ary_delete_at(VALUE ary, long pos)
 
     rb_ary_modify(ary);
     del = RARRAY_AREF(ary, pos);
-    RARRAY_PTR_USE(ary, ptr, {
-	MEMMOVE(ptr+pos, ptr+pos+1, VALUE, len-pos-1);
+    RARRAY_PTR_USE_TRANSIENT(ary, ptr, {
+        MEMMOVE(ptr+pos, ptr+pos+1, VALUE, len-pos-1);
     });
     ARY_INCREASE_LEN(ary, -1);
-
+    ary_verify(ary);
     return del;
 }
 
 /*
  *  call-seq:
- *     ary.delete_at(index)  -> obj or nil
+ *    array.delete_at(index) -> deleted_object or nil
+ *
+ *  Deletes an element from +self+, per the given \Integer +index+.
  *
- *  Deletes the element at the specified +index+, returning that element, or
- *  +nil+ if the +index+ is out of range.
+ *  When +index+ is non-negative, deletes the element at offset +index+:
+ *    a = [:foo, 'bar', 2]
+ *    a.delete_at(1) # => "bar"
+ *    a # => [:foo, 2]
  *
- *  See also Array#slice!
+ *  If index is too large, returns +nil+.
  *
- *     a = ["ant", "bat", "cat", "dog"]
- *     a.delete_at(2)    #=> "cat"
- *     a                 #=> ["ant", "bat", "dog"]
- *     a.delete_at(99)   #=> nil
+ *  When +index+ is negative, counts backward from the end of the array:
+ *    a = [:foo, 'bar', 2]
+ *    a.delete_at(-2) # => "bar"
+ *    a # => [:foo, 2]
+ *
+ *  If +index+ is too small (far from zero), returns nil.
  */
 
 static VALUE
@@ -3071,66 +4055,118 @@ rb_ary_delete_at_m(VALUE ary, VALUE pos)
     return rb_ary_delete_at(ary, NUM2LONG(pos));
 }
 
+static VALUE
+ary_slice_bang_by_rb_ary_splice(VALUE ary, long pos, long len)
+{
+    const long orig_len = RARRAY_LEN(ary);
+
+    if (len < 0) {
+        return Qnil;
+    }
+    else if (pos < -orig_len) {
+        return Qnil;
+    }
+    else if (pos < 0) {
+        pos += orig_len;
+    }
+    else if (orig_len < pos) {
+        return Qnil;
+    }
+    if (orig_len < pos + len) {
+        len = orig_len - pos;
+    }
+    if (len == 0) {
+        return rb_ary_new2(0);
+    }
+    else {
+        VALUE arg2 = rb_ary_new4(len, RARRAY_CONST_PTR_TRANSIENT(ary)+pos);
+        rb_ary_splice(ary, pos, len, 0, 0);
+        return arg2;
+    }
+}
+
 /*
  *  call-seq:
- *     ary.slice!(index)         -> obj or nil
- *     ary.slice!(start, length) -> new_ary or nil
- *     ary.slice!(range)         -> new_ary or nil
- *
- *  Deletes the element(s) given by an +index+ (optionally up to +length+
- *  elements) or by a +range+.
- *
- *  Returns the deleted object (or objects), or +nil+ if the +index+ is out of
- *  range.
- *
- *     a = [ "a", "b", "c" ]
- *     a.slice!(1)     #=> "b"
- *     a               #=> ["a", "c"]
- *     a.slice!(-1)    #=> "c"
- *     a               #=> ["a"]
- *     a.slice!(100)   #=> nil
- *     a               #=> ["a"]
+ *    array.slice!(n) -> object or nil
+ *    array.slice!(start, length) -> new_array or nil
+ *    array.slice!(range) -> new_array or nil
+ *
+ *  Removes and returns elements from +self+.
+ *
+ *  When the only argument is an \Integer +n+,
+ *  removes and returns the _nth_ element in +self+:
+ *    a = [:foo, 'bar', 2]
+ *    a.slice!(1) # => "bar"
+ *    a # => [:foo, 2]
+ *
+ *  If +n+ is negative, counts backwards from the end of +self+:
+ *    a = [:foo, 'bar', 2]
+ *    a.slice!(-1) # => 2
+ *    a # => [:foo, "bar"]
+ *
+ *  If +n+ is out of range, returns +nil+.
+ *
+ *  When the only arguments are Integers +start+ and +length+,
+ *  removes +length+ elements from +self+ beginning at offset  +start+;
+ *  returns the deleted objects in a new Array:
+ *    a = [:foo, 'bar', 2]
+ *    a.slice!(0, 2) # => [:foo, "bar"]
+ *    a # => [2]
+ *
+ *  If <tt>start + length</tt> exceeds the array size,
+ *  removes and returns all elements from offset +start+ to the end:
+ *    a = [:foo, 'bar', 2]
+ *    a.slice!(1, 50) # => ["bar", 2]
+ *    a # => [:foo]
+ *
+ *  If <tt>start == a.size</tt> and +length+ is non-negative,
+ *  returns a new empty \Array.
+ *
+ *  If +length+ is negative, returns +nil+.
+ *
+ *  When the only argument is a \Range object +range+,
+ *  treats <tt>range.min</tt> as +start+ above and <tt>range.size</tt> as +length+ above:
+ *    a = [:foo, 'bar', 2]
+ *     a.slice!(1..2) # => ["bar", 2]
+ *    a # => [:foo]
+ *
+ *  If <tt>range.start == a.size</tt>, returns a new empty \Array.
+ *
+ *  If <tt>range.start</tt> is larger than the array size, returns +nil+.
+ *
+ *  If <tt>range.end</tt> is negative, counts backwards from the end of the array:
+ *    a = [:foo, 'bar', 2]
+ *    a.slice!(0..-2) # => [:foo, "bar"]
+ *    a # => [2]
+ *
+ *  If <tt>range.start</tt> is negative,
+ *  calculates the start index backwards from the end of the array:
+ *    a = [:foo, 'bar', 2]
+ *    a.slice!(-2..2) # => ["bar", 2]
+ *    a # => [:foo]
  */
 
 static VALUE
 rb_ary_slice_bang(int argc, VALUE *argv, VALUE ary)
 {
-    VALUE arg1, arg2;
-    long pos, len, orig_len;
+    VALUE arg1;
+    long pos, len;
 
     rb_ary_modify_check(ary);
+    rb_check_arity(argc, 1, 2);
+    arg1 = argv[0];
+
     if (argc == 2) {
 	pos = NUM2LONG(argv[0]);
 	len = NUM2LONG(argv[1]);
-      delete_pos_len:
-	if (len < 0) return Qnil;
-	orig_len = RARRAY_LEN(ary);
-	if (pos < 0) {
-	    pos += orig_len;
-	    if (pos < 0) return Qnil;
-	}
-	else if (orig_len < pos) return Qnil;
-	if (orig_len < pos + len) {
-	    len = orig_len - pos;
-	}
-	if (len == 0) return rb_ary_new2(0);
-	arg2 = rb_ary_new4(len, RARRAY_CONST_PTR(ary)+pos);
-	RBASIC_SET_CLASS(arg2, rb_obj_class(ary));
-	rb_ary_splice(ary, pos, len, Qundef);
-	return arg2;
+        return ary_slice_bang_by_rb_ary_splice(ary, pos, len);
     }
 
-    if (argc != 1) {
-	/* error report */
-	rb_scan_args(argc, argv, "11", NULL, NULL);
-    }
-    arg1 = argv[0];
-
     if (!FIXNUM_P(arg1)) {
 	switch (rb_range_beg_len(arg1, &pos, &len, RARRAY_LEN(ary), 0)) {
 	  case Qtrue:
 	    /* valid range */
-	    goto delete_pos_len;
+            return ary_slice_bang_by_rb_ary_splice(ary, pos, len);
 	  case Qnil:
 	    /* invalid range */
 	    return Qnil;
@@ -3150,7 +4186,8 @@ ary_reject(VALUE orig, VALUE result)
 
     for (i = 0; i < RARRAY_LEN(orig); i++) {
 	VALUE v = RARRAY_AREF(orig, i);
-	if (!RTEST(rb_yield(v))) {
+
+        if (!RTEST(rb_yield(v))) {
 	    rb_ary_push(result, v);
 	}
     }
@@ -3179,7 +4216,6 @@ static VALUE
 ary_reject_bang(VALUE ary)
 {
     struct select_bang_arg args;
-
     rb_ary_modify_check(ary);
     args.ary = ary;
     args.len[0] = args.len[1] = 0;
@@ -3188,37 +4224,44 @@ ary_reject_bang(VALUE ary)
 
 /*
  *  call-seq:
- *     ary.reject! { |item| block }  -> ary or nil
- *     ary.reject!                   -> Enumerator
+ *    array.reject! {|element| ... } -> self or nil
+ *    array.reject! -> new_enumerator
  *
- *  Deletes every element of +self+ for which the block evaluates to +true+,
- *  if no changes were made returns +nil+.
+ *  Removes each element for which the block returns a truthy value.
  *
- *  The array may not be changed instantly every time the block is called.
+ *  Returns +self+ if any elements removed:
+ *    a = [:foo, 'bar', 2, 'bat']
+ *    a.reject! {|element| element.to_s.start_with?('b') } # => [:foo, 2]
  *
- *  See also Enumerable#reject and Array#delete_if.
+ *  Returns +nil+ if no elements removed.
  *
- *  If no block is given, an Enumerator is returned instead.
+ *  Returns a new \Enumerator if no block given:
+ *    a = [:foo, 'bar', 2]
+ *    a.reject! # => #<Enumerator: [:foo, "bar", 2]:reject!>
  */
 
 static VALUE
 rb_ary_reject_bang(VALUE ary)
 {
     RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length);
+    rb_ary_modify(ary);
     return ary_reject_bang(ary);
 }
 
 /*
  *  call-seq:
- *     ary.reject  {|item| block }  -> new_ary
- *     ary.reject                   -> Enumerator
- *
- *  Returns a new array containing the items in +self+ for which the given
- *  block is not +true+. The ordering of non-rejected elements is maintained.
- *
- *  See also Array#delete_if
- *
- *  If no block is given, an Enumerator is returned instead.
+ *    array.reject {|element| ... } -> new_array
+ *    array.reject -> new_enumerator
+ *
+ *  Returns a new \Array whose elements are all those from +self+
+ *  for which the block returns +false+ or +nil+:
+ *    a = [:foo, 'bar', 2, 'bat']
+ *    a1 = a.reject {|element| element.to_s.start_with?('b') }
+ *    a1 # => [:foo, 2]
+ *
+ *  Returns a new \Enumerator if no block given:
+ *     a = [:foo, 'bar', 2]
+ *     a.reject # => #<Enumerator: [:foo, "bar", 2]:reject>
  */
 
 static VALUE
@@ -3234,25 +4277,23 @@ rb_ary_reject(VALUE ary)
 
 /*
  *  call-seq:
- *     ary.delete_if { |item| block }  -> ary
- *     ary.delete_if                   -> Enumerator
+ *    array.delete_if {|element| ... } -> self
+ *    array.delete_if -> Enumerator
  *
- *  Deletes every element of +self+ for which block evaluates to +true+.
+ *  Removes each element in +self+ for which the block returns a truthy value;
+ *  returns +self+:
+ *    a = [:foo, 'bar', 2, 'bat']
+ *    a.delete_if {|element| element.to_s.start_with?('b') } # => [:foo, 2]
  *
- *  The array is changed instantly every time the block is called, not after
- *  the iteration is over.
- *
- *  See also Array#reject!
- *
- *  If no block is given, an Enumerator is returned instead.
- *
- *     scores = [ 97, 42, 75 ]
- *     scores.delete_if {|score| score < 80 }   #=> [97]
+ *  Returns a new \Enumerator if no block given:
+ *    a = [:foo, 'bar', 2]
+ *    a.delete_if # => #<Enumerator: [:foo, "bar", 2]:delete_if>
  */
 
 static VALUE
 rb_ary_delete_if(VALUE ary)
 {
+    ary_verify(ary);
     RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length);
     ary_reject_bang(ary);
     return ary;
@@ -3262,7 +4303,8 @@ static VALUE
 take_i(RB_BLOCK_CALL_FUNC_ARGLIST(val, cbarg))
 {
     VALUE *args = (VALUE *)cbarg;
-    if (args[1]-- == 0) rb_iter_break();
+    if (args[1] == 0) rb_iter_break();
+    else args[1]--;
     if (argc > 1) val = rb_ary_new4(argc, argv);
     rb_ary_push(args[0], val);
     return Qnil;
@@ -3286,26 +4328,51 @@ take_items(VALUE obj, long n)
 
 /*
  *  call-seq:
- *     ary.zip(arg, ...)                  -> new_ary
- *     ary.zip(arg, ...) { |arr| block }  -> nil
- *
- *  Converts any arguments to arrays, then merges elements of +self+ with
- *  corresponding elements from each argument.
- *
- *  This generates a sequence of <code>ary.size</code> _n_-element arrays,
- *  where _n_ is one more than the count of arguments.
- *
- *  If the size of any argument is less than the size of the initial array,
- *  +nil+ values are supplied.
- *
- *  If a block is 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]]
+ *    array.zip(*other_arrays) -> new_array
+ *    array.zip(*other_arrays) {|other_array| ... } -> nil
+ *
+ *  When no block given, returns a new \Array +new_array+ of size <tt>self.size</tt>
+ *  whose elements are Arrays.
+ *
+ *  Each nested array <tt>new_array[n]</tt> is of size <tt>other_arrays.size+1</tt>,
+ *  and contains:
+ *  - The _nth_ element of +self+.
+ *  - The _nth_ element of each of the +other_arrays+.
+ *
+ *  If all +other_arrays+ and +self+ are the same size:
+ *    a = [:a0, :a1, :a2, :a3]
+ *    b = [:b0, :b1, :b2, :b3]
+ *    c = [:c0, :c1, :c2, :c3]
+ *    d = a.zip(b, c)
+ *    d # => [[:a0, :b0, :c0], [:a1, :b1, :c1], [:a2, :b2, :c2], [:a3, :b3, :c3]]
+ *
+ *  If any array in +other_arrays+ is smaller than +self+,
+ *  fills to <tt>self.size</tt> with +nil+:
+ *    a = [:a0, :a1, :a2, :a3]
+ *    b = [:b0, :b1, :b2]
+ *    c = [:c0, :c1]
+ *    d = a.zip(b, c)
+ *    d # => [[:a0, :b0, :c0], [:a1, :b1, :c1], [:a2, :b2, nil], [:a3, nil, nil]]
+ *
+ *  If any array in +other_arrays+ is larger than +self+,
+ *  its trailing elements are ignored:
+ *    a = [:a0, :a1, :a2, :a3]
+ *    b = [:b0, :b1, :b2, :b3, :b4]
+ *    c = [:c0, :c1, :c2, :c3, :c4, :c5]
+ *    d = a.zip(b, c)
+ *    d # => [[:a0, :b0, :c0], [:a1, :b1, :c1], [:a2, :b2, :c2], [:a3, :b3, :c3]]
+ *
+ *  When a block is given, calls the block with each of the sub-arrays (formed as above); returns nil
+ *    a = [:a0, :a1, :a2, :a3]
+ *    b = [:b0, :b1, :b2, :b3]
+ *    c = [:c0, :c1, :c2, :c3]
+ *    a.zip(b, c) {|sub_array| p sub_array} # => nil
+ *
+ *  Output:
+ *    [:a0, :b0, :c0]
+ *    [:a1, :b1, :c1]
+ *    [:a2, :b2, :c2]
+ *    [:a3, :b3, :c3]
  */
 
 static VALUE
@@ -3368,15 +4435,12 @@ rb_ary_zip(int argc, VALUE *argv, VALUE ary)
 
 /*
  *  call-seq:
- *     ary.transpose -> new_ary
- *
- *  Assumes that +self+ is an array of arrays and transposes the rows and
- *  columns.
+ *    array.transpose -> new_array
  *
- *     a = [[1,2], [3,4], [5,6]]
- *     a.transpose   #=> [[1, 3, 5], [2, 4, 6]]
- *
- *  If the length of the subarrays don't match, an IndexError is raised.
+ *  Transposes the rows and columns in an \Array of Arrays;
+ *  the nested Arrays must all be the same size:
+ *    a = [[:a0, :a1], [:b0, :b1], [:c0, :c1]]
+ *    a.transpose # => [[:a0, :b0, :c0], [:a1, :b1, :c1]]
  */
 
 static VALUE
@@ -3409,15 +4473,11 @@ rb_ary_transpose(VALUE ary)
 
 /*
  *  call-seq:
- *     ary.replace(other_ary)  -> ary
- *     ary.initialize_copy(other_ary)	-> ary
- *
- *  Replaces the contents of +self+ with the contents of +other_ary+,
- *  truncating or expanding if necessary.
+ *    array.replace(other_array) -> self
  *
- *     a = [ "a", "b", "c", "d", "e" ]
- *     a.replace([ "x", "y", "z" ])   #=> ["x", "y", "z"]
- *     a                              #=> ["x", "y", "z"]
+ *  Replaces the content of +self+ with the content of +other_array+; returns +self+:
+ *    a = [:foo, 'bar', 2]
+ *    a.replace(['foo', :bar, 3]) # => ["foo", :bar, 3]
  */
 
 VALUE
@@ -3428,93 +4488,236 @@ rb_ary_replace(VALUE copy, VALUE orig)
     if (copy == orig) return copy;
 
     if (RARRAY_LEN(orig) <= RARRAY_EMBED_LEN_MAX) {
-        VALUE shared = 0;
+        VALUE shared_root = 0;
 
         if (ARY_OWNS_HEAP_P(copy)) {
-	    RARRAY_PTR_USE(copy, ptr, ruby_sized_xfree(ptr, ARY_HEAP_SIZE(copy)));
+            ary_heap_free(copy);
 	}
         else if (ARY_SHARED_P(copy)) {
-            shared = ARY_SHARED(copy);
+            shared_root = ARY_SHARED_ROOT(copy);
             FL_UNSET_SHARED(copy);
         }
         FL_SET_EMBED(copy);
-	ary_memcpy(copy, 0, RARRAY_LEN(orig), RARRAY_CONST_PTR(orig));
-        if (shared) {
-            rb_ary_decrement_share(shared);
+        ary_memcpy(copy, 0, RARRAY_LEN(orig), RARRAY_CONST_PTR_TRANSIENT(orig));
+        if (shared_root) {
+            rb_ary_decrement_share(shared_root);
         }
         ARY_SET_LEN(copy, RARRAY_LEN(orig));
     }
     else {
-        VALUE shared = ary_make_shared(orig);
+        VALUE shared_root = ary_make_shared(orig);
         if (ARY_OWNS_HEAP_P(copy)) {
-	    RARRAY_PTR_USE(copy, ptr, ruby_sized_xfree(ptr, ARY_HEAP_SIZE(copy)));
+            ary_heap_free(copy);
         }
         else {
             rb_ary_unshare_safe(copy);
         }
         FL_UNSET_EMBED(copy);
-        ARY_SET_PTR(copy, RARRAY_CONST_PTR(orig));
-        ARY_SET_LEN(copy, RARRAY_LEN(orig));
-        rb_ary_set_shared(copy, shared);
+        ARY_SET_PTR(copy, ARY_HEAP_PTR(orig));
+        ARY_SET_LEN(copy, ARY_HEAP_LEN(orig));
+        rb_ary_set_shared(copy, shared_root);
     }
+    ary_verify(copy);
     return copy;
 }
 
 /*
  *  call-seq:
- *     ary.clear    -> ary
+ *     array.clear -> self
  *
- *  Removes all elements from +self+.
- *
- *     a = [ "a", "b", "c", "d", "e" ]
- *     a.clear    #=> [ ]
+ *  Removes all elements from +self+:
+ *    a = [:foo, 'bar', 2]
+ *    a.clear # => []
  */
 
 VALUE
 rb_ary_clear(VALUE ary)
 {
     rb_ary_modify_check(ary);
-    ARY_SET_LEN(ary, 0);
     if (ARY_SHARED_P(ary)) {
 	if (!ARY_EMBED_P(ary)) {
 	    rb_ary_unshare(ary);
 	    FL_SET_EMBED(ary);
+            ARY_SET_EMBED_LEN(ary, 0);
 	}
     }
-    else if (ARY_DEFAULT_SIZE * 2 < ARY_CAPA(ary)) {
-	ary_resize_capa(ary, ARY_DEFAULT_SIZE * 2);
+    else {
+        ARY_SET_LEN(ary, 0);
+        if (ARY_DEFAULT_SIZE * 2 < ARY_CAPA(ary)) {
+            ary_resize_capa(ary, ARY_DEFAULT_SIZE * 2);
+        }
     }
+    ary_verify(ary);
     return ary;
 }
 
 /*
  *  call-seq:
- *     ary.fill(obj)                                 -> ary
- *     ary.fill(obj, start [, length])               -> ary
- *     ary.fill(obj, range )                         -> ary
- *     ary.fill { |index| block }                    -> ary
- *     ary.fill(start [, length] ) { |index| block } -> ary
- *     ary.fill(range) { |index| block }             -> ary
- *
- *  The first three forms set the selected elements of +self+ (which
- *  may be the entire array) to +obj+.
- *
- *  A +start+ of +nil+ is equivalent to zero.
- *
- *  A +length+ of +nil+ is equivalent to the length of the array.
- *
- *  The last three forms fill the array with the value of the given block,
- *  which is passed the absolute index of each element to be filled.
- *
- *  Negative values of +start+ count from the end of the array, where +-1+ is
- *  the last element.
- *
- *     a = [ "a", "b", "c", "d" ]
- *     a.fill("x")              #=> ["x", "x", "x", "x"]
- *     a.fill("z", 2, 2)        #=> ["x", "x", "z", "z"]
- *     a.fill("y", 0..1)        #=> ["y", "y", "z", "z"]
- *     a.fill { |i| i*i }       #=> [0, 1, 4, 9]
- *     a.fill(-2) { |i| i*i*i } #=> [0, 1, 8, 27]
+ *    array.fill(obj) -> self
+ *    array.fill(obj, start) -> self
+ *    array.fill(obj, start, length) -> self
+ *    array.fill(obj, range) -> self
+ *    array.fill {|index| ... } -> self
+ *    array.fill(start) {|index| ... } -> self
+ *    array.fill(start, length) {|index| ... } -> self
+ *    array.fill(range) {|index| ... } -> self
+ *
+ *  Replaces specified elements in +self+ with specified objects; returns +self+.
+ *
+ *  With argument +obj+ and no block given, replaces all elements with that one object:
+ *    a = ['a', 'b', 'c', 'd']
+ *    a # => ["a", "b", "c", "d"]
+ *    a.fill(:X) # => [:X, :X, :X, :X]
+ *
+ *  With arguments +obj+ and \Integer +start+, and no block given,
+ *  replaces elements based on the given start.
+ *
+ *  If +start+ is in range (<tt>0 <= start < array.size</tt>),
+ *  replaces all elements from offset +start+ through the end:
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.fill(:X, 2) # => ["a", "b", :X, :X]
+ *
+ *  If +start+ is too large (<tt>start >= array.size</tt>), does nothing:
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.fill(:X, 4) # => ["a", "b", "c", "d"]
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.fill(:X, 5) # => ["a", "b", "c", "d"]
+ *
+ *  If +start+ is negative, counts from the end (starting index is <tt>start + array.size</tt>):
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.fill(:X, -2) # => ["a", "b", :X, :X]
+ *
+ *  If +start+ is too small (less than and far from zero), replaces all elements:
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.fill(:X, -6) # => [:X, :X, :X, :X]
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.fill(:X, -50) # => [:X, :X, :X, :X]
+ *
+ *  With arguments +obj+, \Integer +start+, and \Integer +length+, and no block given,
+ *  replaces elements based on the given +start+ and +length+.
+ *
+ *  If +start+ is in range, replaces +length+ elements beginning at offset +start+:
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.fill(:X, 1, 1) # => ["a", :X, "c", "d"]
+ *
+ *  If +start+ is negative, counts from the end:
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.fill(:X, -2, 1) # => ["a", "b", :X, "d"]
+ *
+ *  If +start+ is large (<tt>start >= array.size</tt>), extends +self+ with +nil+:
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.fill(:X, 5, 0) # => ["a", "b", "c", "d", nil]
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.fill(:X, 5, 2) # => ["a", "b", "c", "d", nil, :X, :X]
+ *
+ *  If +length+ is zero or negative, replaces no elements:
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.fill(:X, 1, 0) # => ["a", "b", "c", "d"]
+ *    a.fill(:X, 1, -1) # => ["a", "b", "c", "d"]
+ *
+ *  With arguments +obj+ and \Range +range+, and no block given,
+ *  replaces elements based on the given range.
+ *
+ *  If the range is positive and ascending (<tt>0 < range.begin <= range.end</tt>),
+ *  replaces elements from <tt>range.begin</tt> to <tt>range.end</tt>:
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.fill(:X, (1..1)) # => ["a", :X, "c", "d"]
+ *
+ *  If <tt>range.first</tt> is negative, replaces no elements:
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.fill(:X, (-1..1)) # => ["a", "b", "c", "d"]
+ *
+ *  If <tt>range.last</tt> is negative, counts from the end:
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.fill(:X, (0..-2)) # => [:X, :X, :X, "d"]
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.fill(:X, (1..-2)) # => ["a", :X, :X, "d"]
+ *
+ *  If <tt>range.last</tt> and <tt>range.last</tt> are both negative,
+ *  both count from the end of the array:
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.fill(:X, (-1..-1)) # => ["a", "b", "c", :X]
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.fill(:X, (-2..-2)) # => ["a", "b", :X, "d"]
+ *
+ *  With no arguments and a block given, calls the block with each index;
+ *  replaces the corresponding element with the block's return value:
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.fill { |index| "new_#{index}" } # => ["new_0", "new_1", "new_2", "new_3"]
+ *
+ *  With argument +start+ and a block given, calls the block with each index
+ *  from offset +start+ to the end; replaces the corresponding element
+ *  with the block's return value:
+ *
+ *  If start is in range (<tt>0 <= start < array.size</tt>),
+ *  replaces from offset +start+ to the end:
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.fill(1) { |index| "new_#{index}" } # => ["a", "new_1", "new_2", "new_3"]
+ *
+ *  If +start+ is too large(<tt>start >= array.size</tt>), does nothing:
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.fill(4) { |index| fail 'Cannot happen' } # => ["a", "b", "c", "d"]
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.fill(4) { |index| fail 'Cannot happen' } # => ["a", "b", "c", "d"]
+ *
+ *  If +start+ is negative, counts from the end:
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.fill(-2) { |index| "new_#{index}" } # => ["a", "b", "new_2", "new_3"]
+ *
+ *  If start is too small (<tt>start <= -array.size</tt>, replaces all elements:
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.fill(-6) { |index| "new_#{index}" } # => ["new_0", "new_1", "new_2", "new_3"]
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.fill(-50) { |index| "new_#{index}" } # => ["new_0", "new_1", "new_2", "new_3"]
+ *
+ *  With arguments +start+ and +length+, and a block given,
+ *  calls the block for each index specified by start length;
+ *  replaces the corresponding element with the block's return value.
+ *
+ *  If +start+ is in range, replaces +length+ elements beginning at offset +start+:
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.fill(1, 1) { |index| "new_#{index}" } # => ["a", "new_1", "c", "d"]
+ *
+ *  If start is negative, counts from the end:
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.fill(-2, 1) { |index| "new_#{index}" } # => ["a", "b", "new_2", "d"]
+ *
+ *  If +start+ is large (<tt>start >= array.size</tt>), extends +self+ with +nil+:
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.fill(5, 0) { |index| "new_#{index}" } # => ["a", "b", "c", "d", nil]
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.fill(5, 2) { |index| "new_#{index}" } # => ["a", "b", "c", "d", nil, "new_5", "new_6"]
+ *
+ *  If +length+ is zero or less, replaces no elements:
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.fill(1, 0) { |index| "new_#{index}" } # => ["a", "b", "c", "d"]
+ *    a.fill(1, -1) { |index| "new_#{index}" } # => ["a", "b", "c", "d"]
+ *
+ *  With arguments +obj+ and +range+, and a block given,
+ *  calls the block with each index in the given range;
+ *  replaces the corresponding element with the block's return value.
+ *
+ *  If the range is positive and ascending (<tt>range 0 < range.begin <= range.end</tt>,
+ *  replaces elements from <tt>range.begin</tt> to <tt>range.end</tt>:
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.fill(1..1) { |index| "new_#{index}" } # => ["a", "new_1", "c", "d"]
+ *
+ *  If +range.first+ is negative, does nothing:
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.fill(-1..1) { |index| fail 'Cannot happen' } # => ["a", "b", "c", "d"]
+ *
+ *  If <tt>range.last</tt> is negative, counts from the end:
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.fill(0..-2) { |index| "new_#{index}" } # => ["new_0", "new_1", "new_2", "d"]
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.fill(1..-2) { |index| "new_#{index}" } # => ["a", "new_1", "new_2", "d"]
+ *
+ *  If <tt>range.first</tt> and <tt>range.last</tt> are both negative,
+ *  both count from the end:
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.fill(-1..-1) { |index| "new_#{index}" } # => ["a", "b", "c", "new_3"]
+ *    a = ['a', 'b', 'c', 'd']
+ *    a.fill(-2..-2) { |index| "new_#{index}" } # => ["a", "b", "new_2", "d"]
  */
 
 static VALUE
@@ -3583,25 +4786,14 @@ rb_ary_fill(int argc, VALUE *argv, VALUE ary)
 
 /*
  *  call-seq:
- *     ary + other_ary   -> new_ary
- *
- *  Concatenation --- Returns a new array built by concatenating the
- *  two arrays together to produce a third array.
- *
- *     [ 1, 2, 3 ] + [ 4, 5 ]    #=> [ 1, 2, 3, 4, 5 ]
- *     a = [ "a", "b", "c" ]
- *     c = a + [ "d", "e", "f" ]
- *     c                         #=> [ "a", "b", "c", "d", "e", "f" ]
- *     a                         #=> [ "a", "b", "c" ]
+ *    array + other_array -> new_array
  *
- *  Note that
- *     x += y
- *  is the same as
- *     x = x + y
- *  This means that it produces a new array. As a consequence,
- *  repeated use of <code>+=</code> on arrays can be quite inefficient.
+ *  Returns a new \Array containing all elements of +array+
+ *  followed by all elements of +other_array+:
+ *    a = [0, 1] + [2, 3]
+ *    a # => [0, 1, 2, 3]
  *
- *  See also Array#concat.
+ *  Related: #concat.
  */
 
 VALUE
@@ -3616,53 +4808,72 @@ rb_ary_plus(VALUE x, VALUE y)
     len = xlen + ylen;
     z = rb_ary_new2(len);
 
-    ary_memcpy(z, 0, xlen, RARRAY_CONST_PTR(x));
-    ary_memcpy(z, xlen, ylen, RARRAY_CONST_PTR(y));
+    ary_memcpy(z, 0, xlen, RARRAY_CONST_PTR_TRANSIENT(x));
+    ary_memcpy(z, xlen, ylen, RARRAY_CONST_PTR_TRANSIENT(y));
     ARY_SET_LEN(z, len);
     return z;
 }
 
+static VALUE
+ary_append(VALUE x, VALUE y)
+{
+    long n = RARRAY_LEN(y);
+    if (n > 0) {
+        rb_ary_splice(x, RARRAY_LEN(x), 0, RARRAY_CONST_PTR_TRANSIENT(y), n);
+    }
+    RB_GC_GUARD(y);
+    return x;
+}
+
 /*
  *  call-seq:
- *     ary.concat(other_ary)   -> ary
- *
- *  Appends the elements of +other_ary+ to +self+.
+ *    array.concat(*other_arrays) -> self
  *
- *     [ "a", "b" ].concat( ["c", "d"] ) #=> [ "a", "b", "c", "d" ]
- *     a = [ 1, 2, 3 ]
- *     a.concat( [ 4, 5 ] )
- *     a                                 #=> [ 1, 2, 3, 4, 5 ]
- *
- *  See also Array#+.
+ *  Adds to +array+ all elements from each \Array in +other_arrays+; returns +self+:
+ *    a = [0, 1]
+ *    a.concat([2, 3], [4, 5]) # => [0, 1, 2, 3, 4, 5]
  */
 
-VALUE
-rb_ary_concat(VALUE x, VALUE y)
+static VALUE
+rb_ary_concat_multi(int argc, VALUE *argv, VALUE ary)
 {
-    rb_ary_modify_check(x);
-    y = to_ary(y);
-    if (RARRAY_LEN(y) > 0) {
-	rb_ary_splice(x, RARRAY_LEN(x), 0, y);
+    rb_ary_modify_check(ary);
+
+    if (argc == 1) {
+	rb_ary_concat(ary, argv[0]);
     }
-    return x;
+    else if (argc > 1) {
+	int i;
+	VALUE args = rb_ary_tmp_new(argc);
+	for (i = 0; i < argc; i++) {
+	    rb_ary_concat(args, argv[i]);
+	}
+	ary_append(ary, args);
+    }
+
+    ary_verify(ary);
+    return ary;
 }
 
+VALUE
+rb_ary_concat(VALUE x, VALUE y)
+{
+    return ary_append(x, to_ary(y));
+}
 
 /*
  *  call-seq:
- *     ary * int     -> new_ary
- *     ary * str     -> new_string
- *
- *  Repetition --- With a String argument, equivalent to
- *  <code>ary.join(str)</code>.
- *
- *  Otherwise, returns a new array built by concatenating the +int+ copies of
- *  +self+.
+ *    array * n -> new_array
+ *    array * string_separator -> new_string
  *
+ *  When non-negative argument \Integer +n+ is given,
+ *  returns a new \Array built by concatenating the +n+ copies of +self+:
+ *    a = ['x', 'y']
+ *    a * 3 # => ["x", "y", "x", "y", "x", "y"]
  *
- *     [ 1, 2, 3 ] * 3    #=> [ 1, 2, 3, 1, 2, 3, 1, 2, 3 ]
- *     [ 1, 2, 3 ] * ","  #=> "1,2,3"
- *
+ *  When \String argument +string_separator+ is given,
+ *  equivalent to <tt>array.join(string_separator)</tt>:
+ *    [0, [0, 1], {foo: 0}] * ', ' # => "0, 0, 1, {:foo=>0}"
  */
 
 static VALUE
@@ -3679,7 +4890,7 @@ rb_ary_times(VALUE ary, VALUE times)
 
     len = NUM2LONG(times);
     if (len == 0) {
-	ary2 = ary_new(rb_obj_class(ary), 0);
+        ary2 = ary_new(rb_cArray, 0);
 	goto out;
     }
     if (len < 0) {
@@ -3690,45 +4901,37 @@ rb_ary_times(VALUE ary, VALUE times)
     }
     len *= RARRAY_LEN(ary);
 
-    ary2 = ary_new(rb_obj_class(ary), len);
+    ary2 = ary_new(rb_cArray, len);
     ARY_SET_LEN(ary2, len);
 
-    ptr = RARRAY_CONST_PTR(ary);
+    ptr = RARRAY_CONST_PTR_TRANSIENT(ary);
     t = RARRAY_LEN(ary);
     if (0 < t) {
 	ary_memcpy(ary2, 0, t, ptr);
 	while (t <= len/2) {
-	    ary_memcpy(ary2, t, t, RARRAY_CONST_PTR(ary2));
+            ary_memcpy(ary2, t, t, RARRAY_CONST_PTR_TRANSIENT(ary2));
             t *= 2;
         }
         if (t < len) {
-	    ary_memcpy(ary2, t, len-t, RARRAY_CONST_PTR(ary2));
+            ary_memcpy(ary2, t, len-t, RARRAY_CONST_PTR_TRANSIENT(ary2));
         }
     }
   out:
-    OBJ_INFECT(ary2, ary);
-
     return ary2;
 }
 
 /*
  *  call-seq:
- *     ary.assoc(obj)   -> element_ary  or  nil
+ *    array.assoc(obj) -> found_array or nil
  *
- *  Searches through an array whose elements are also arrays comparing +obj+
- *  with the first element of each contained array using <code>obj.==</code>.
+ *  Returns the first element in +self+ that is an \Array
+ *  whose first element <tt>==</tt> +obj+:
+ *    a = [{foo: 0}, [2, 4], [4, 5, 6], [4, 5]]
+ *    a.assoc(4) # => [4, 5, 6]
  *
- *  Returns the first contained array that matches (that is, the first
- *  associated array), or +nil+ if no match is found.
+ *  Returns +nil+ if no such element is found.
  *
- *  See also Array#rassoc
- *
- *     s1 = [ "colors", "red", "blue", "green" ]
- *     s2 = [ "letters", "a", "b", "c" ]
- *     s3 = "foo"
- *     a  = [ s1, s2, s3 ]
- *     a.assoc("letters")  #=> [ "letters", "a", "b", "c" ]
- *     a.assoc("foo")      #=> nil
+ *  Related: #rassoc.
  */
 
 VALUE
@@ -3748,20 +4951,16 @@ rb_ary_assoc(VALUE ary, VALUE key)
 
 /*
  *  call-seq:
- *     ary.rassoc(obj) -> element_ary or nil
- *
- *  Searches through the array whose elements are also arrays.
- *
- *  Compares +obj+ with the second element of each contained array using
- *  <code>obj.==</code>.
+ *    array.rassoc(obj) -> found_array or nil
  *
- *  Returns the first contained array that matches +obj+.
+ *  Returns the first element in +self+ that is an \Array
+ *  whose second element <tt>==</tt> +obj+:
+ *    a = [{foo: 0}, [2, 4], [4, 5, 6], [4, 5]]
+ *    a.rassoc(4) # => [2, 4]
  *
- *  See also Array#assoc.
+ *  Returns +nil+ if no such element is found.
  *
- *     a = [ [ 1, "one"], [2, "two"], [3, "three"], ["ii", "two"] ]
- *     a.rassoc("two")    #=> [2, "two"]
- *     a.rassoc("four")   #=> nil
+ *  Related: #assoc.
  */
 
 VALUE
@@ -3788,6 +4987,7 @@ recursive_equal(VALUE ary1, VALUE ary2, int recur)
 
     if (recur) return Qtrue; /* Subtle! */
 
+    /* rb_equal() can evacuate ptrs */
     p1 = RARRAY_CONST_PTR(ary1);
     p2 = RARRAY_CONST_PTR(ary2);
     len1 = RARRAY_LEN(ary1);
@@ -3800,8 +5000,8 @@ recursive_equal(VALUE ary1, VALUE ary2, int recur)
 		    return Qfalse;
 		if (len1 < i)
 		    return Qtrue;
-		p1 = RARRAY_CONST_PTR(ary1) + i;
-		p2 = RARRAY_CONST_PTR(ary2) + i;
+                p1 = RARRAY_CONST_PTR(ary1) + i;
+                p2 = RARRAY_CONST_PTR(ary2) + i;
 	    }
 	    else {
 		return Qfalse;
@@ -3815,16 +5015,19 @@ recursive_equal(VALUE ary1, VALUE ary2, int recur)
 
 /*
  *  call-seq:
- *     ary == other_ary   ->   bool
+ *    array == other_array -> true or false
  *
- *  Equality --- Two arrays are equal if they contain the same number of
- *  elements and if each element is equal to (according to Object#==) the
- *  corresponding element in +other_ary+.
+ *  Returns +true+ if both <tt>array.size == other_array.size</tt>
+ *  and for each index +i+ in +array+, <tt>array[i] == other_array[i]</tt>:
+ *    a0 = [:foo, 'bar', 2]
+ *    a1 = [:foo, 'bar', 2.0]
+ *    a1 == a0 # => true
+ *    [] == [] # => true
  *
- *     [ "a", "c" ]    == [ "a", "c", 7 ]     #=> false
- *     [ "a", "c", 7 ] == [ "a", "c", 7 ]     #=> true
- *     [ "a", "c", 7 ] == [ "a", "d", "f" ]   #=> false
+ *  Otherwise, returns +false+.
  *
+ *  This method is different from method Array#eql?,
+ *  which compares elements using <tt>Object#eql?</tt>.
  */
 
 static VALUE
@@ -3838,7 +5041,7 @@ rb_ary_equal(VALUE ary1, VALUE ary2)
 	return rb_equal(ary2, ary1);
     }
     if (RARRAY_LEN(ary1) != RARRAY_LEN(ary2)) return Qfalse;
-    if (RARRAY_CONST_PTR(ary1) == RARRAY_CONST_PTR(ary2)) return Qtrue;
+    if (RARRAY_CONST_PTR_TRANSIENT(ary1) == RARRAY_CONST_PTR_TRANSIENT(ary2)) return Qtrue;
     return rb_exec_recursive_paired(recursive_equal, ary1, ary2, ary2);
 }
 
@@ -3857,10 +5060,18 @@ recursive_eql(VALUE ary1, VALUE ary2, int recur)
 
 /*
  *  call-seq:
- *     ary.eql?(other)  -> true or false
+ *    array.eql? other_array -> true or false
+ *
+ *  Returns +true+ if +self+ and +other_array+ are the same size,
+ *  and if, for each index +i+ in +self+, <tt>self[i].eql? other_array[i]</tt>:
+ *    a0 = [:foo, 'bar', 2]
+ *    a1 = [:foo, 'bar', 2]
+ *    a1.eql?(a0) # => true
+ *
+ *  Otherwise, returns +false+.
  *
- *  Returns +true+ if +self+ and +other+ are the same object,
- *  or are both arrays with the same content (according to Object#eql?).
+ *  This method is different from method {Array#==}[#method-i-3D-3D],
+ *  which compares using method <tt>Object#==</tt>.
  */
 
 static VALUE
@@ -3869,20 +5080,19 @@ rb_ary_eql(VALUE ary1, VALUE ary2)
     if (ary1 == ary2) return Qtrue;
     if (!RB_TYPE_P(ary2, T_ARRAY)) return Qfalse;
     if (RARRAY_LEN(ary1) != RARRAY_LEN(ary2)) return Qfalse;
-    if (RARRAY_CONST_PTR(ary1) == RARRAY_CONST_PTR(ary2)) return Qtrue;
+    if (RARRAY_CONST_PTR_TRANSIENT(ary1) == RARRAY_CONST_PTR_TRANSIENT(ary2)) return Qtrue;
     return rb_exec_recursive_paired(recursive_eql, ary1, ary2, ary2);
 }
 
 /*
  *  call-seq:
- *     ary.hash   -> fixnum
+ *    array.hash -> integer
  *
- *  Compute a hash-code for this array.
+ *  Returns the integer hash value for +self+.
  *
- *  Two arrays with the same content will have the same hash code (and will
- *  compare using #eql?).
- *
- *  See also Object#hash.
+ *  Two arrays with the same content will have the same hash code (and will compare using eql?):
+ *    [0, 1, 2].hash == [0, 1, 2].hash # => true
+ *    [0, 1, 2].hash == [0, 1, 3].hash # => false
  */
 
 static VALUE
@@ -3899,19 +5109,17 @@ rb_ary_hash(VALUE ary)
 	h = rb_hash_uint(h, NUM2LONG(n));
     }
     h = rb_hash_end(h);
-    return LONG2FIX(h);
+    return ST2FIX(h);
 }
 
 /*
  *  call-seq:
- *     ary.include?(object)   -> true or false
- *
- *  Returns +true+ if the given +object+ is present in +self+ (that is, if any
- *  element <code>==</code> +object+), otherwise returns +false+.
+ *    array.include?(obj) -> true or false
  *
- *     a = [ "a", "b", "c" ]
- *     a.include?("b")   #=> true
- *     a.include?("z")   #=> false
+ *  Returns +true+ if for some index +i+ in +self+, <tt>obj == self[i]</tt>;
+ *  otherwise +false+:
+ *    [0, 1, 2].include?(2) # => true
+ *    [0, 1, 2].include?(3) # => false
  */
 
 VALUE
@@ -3922,17 +5130,27 @@ rb_ary_includes(VALUE ary, VALUE item)
 
     for (i=0; i<RARRAY_LEN(ary); i++) {
 	e = RARRAY_AREF(ary, i);
-	switch (rb_equal_opt(e, item)) {
-	  case Qundef:
-	    if (rb_equal(e, item)) return Qtrue;
-	    break;
-	  case Qtrue:
+	if (rb_equal(e, item)) {
 	    return Qtrue;
 	}
     }
     return Qfalse;
 }
 
+static VALUE
+rb_ary_includes_by_eql(VALUE ary, VALUE item)
+{
+    long i;
+    VALUE e;
+
+    for (i=0; i<RARRAY_LEN(ary); i++) {
+	e = RARRAY_AREF(ary, i);
+	if (rb_eql(item, e)) {
+	    return Qtrue;
+	}
+    }
+    return Qfalse;
+}
 
 static VALUE
 recursive_cmp(VALUE ary1, VALUE ary2, int recur)
@@ -3956,32 +5174,24 @@ recursive_cmp(VALUE ary1, VALUE ary2, int recur)
 
 /*
  *  call-seq:
- *     ary <=> other_ary   ->  -1, 0, +1 or nil
- *
- *  Comparison --- Returns an integer (+-1+, +0+, or <code>+1</code>) if this
- *  array is less than, equal to, or greater than +other_ary+.
- *
- *  Each object in each array is compared (using the <=> operator).
+ *    array <=> other_array -> -1, 0, or 1
  *
- *  Arrays are compared in an "element-wise" manner; the first element of +ary+
- *  is compared with the first one of +other_ary+ using the <=> operator, then
- *  each of the second elements, etc...
- *  As soon as the result of any such comparison is non zero (i.e. the two
- *  corresponding elements are not equal), that result is returned for the
- *  whole array comparison.
+ *  Returns -1, 0, or 1 as +self+ is less than, equal to, or greater than +other_array+.
+ *  For each index +i+ in +self+, evaluates <tt>result = self[i] <=> other_array[i]</tt>.
  *
- *  If all the elements are equal, then the result is based on a comparison of
- *  the array lengths. Thus, two arrays are "equal" according to Array#<=> if,
- *  and only if, they have the same length and the value of each element is
- *  equal to the value of the corresponding element in the other array.
+ *  Returns -1 if any result is -1:
+ *    [0, 1, 2] <=> [0, 1, 3] # => -1
  *
- *  +nil+ is returned if the +other_ary+ is not an array or if the comparison
- *  of two elements returned +nil+.
- *
- *     [ "a", "a", "c" ]    <=> [ "a", "b", "c" ]   #=> -1
- *     [ 1, 2, 3, 4, 5, 6 ] <=> [ 1, 2 ]            #=> +1
- *     [ 1, 2 ]             <=> [ 1, :two ]         #=> nil
+ *  Returns 1 if any result is 1:
+ *    [0, 1, 2] <=> [0, 1, 1] # => 1
  *
+ *  When all results are zero:
+ *  - Returns -1 if +array+ is smaller than +other_array+:
+ *      [0, 1, 2] <=> [0, 1, 2, 3] # => -1
+ *  - Returns 1 if +array+ is larger than +other_array+:
+ *      [0, 1, 2] <=> [0, 1] # => 1
+ *  - Returns 0 if +array+ and +other_array+ are the same size:
+ *      [0, 1, 2] <=> [0, 1, 2] # => 0
  */
 
 VALUE
@@ -4008,17 +5218,16 @@ ary_add_hash(VALUE hash, VALUE ary)
 
     for (i=0; i<RARRAY_LEN(ary); i++) {
 	VALUE elt = RARRAY_AREF(ary, i);
-	if (rb_hash_lookup2(hash, elt, Qundef) == Qundef) {
-	    rb_hash_aset(hash, elt, elt);
-	}
+	rb_hash_add_new_element(hash, elt, elt);
     }
     return hash;
 }
 
 static inline VALUE
-ary_tmp_hash_new(void)
+ary_tmp_hash_new(VALUE ary)
 {
-    VALUE hash = rb_hash_new();
+    long size = RARRAY_LEN(ary);
+    VALUE hash = rb_hash_new_with_size(size);
 
     RBASIC_CLEAR_CLASS(hash);
     return hash;
@@ -4027,7 +5236,7 @@ ary_tmp_hash_new(void)
 static VALUE
 ary_make_hash(VALUE ary)
 {
-    VALUE hash = ary_tmp_hash_new();
+    VALUE hash = ary_tmp_hash_new(ary);
     return ary_add_hash(hash, ary);
 }
 
@@ -4038,9 +5247,7 @@ ary_add_hash_by(VALUE hash, VALUE ary)
 
     for (i = 0; i < RARRAY_LEN(ary); ++i) {
 	VALUE v = rb_ary_elt(ary, i), k = rb_yield(v);
-	if (rb_hash_lookup2(hash, k, Qundef) == Qundef) {
-	    rb_hash_aset(hash, k, v);
-	}
+	rb_hash_add_new_element(hash, k, v);
     }
     return hash;
 }
@@ -4048,36 +5255,34 @@ ary_add_hash_by(VALUE hash, VALUE ary)
 static VALUE
 ary_make_hash_by(VALUE ary)
 {
-    VALUE hash = ary_tmp_hash_new();
+    VALUE hash = ary_tmp_hash_new(ary);
     return ary_add_hash_by(hash, ary);
 }
 
 static inline void
 ary_recycle_hash(VALUE hash)
 {
-    if (RHASH(hash)->ntbl) {
-	st_table *tbl = RHASH(hash)->ntbl;
-	RHASH(hash)->ntbl = 0;
+    assert(RBASIC_CLASS(hash) == 0);
+    if (RHASH_ST_TABLE_P(hash)) {
+        st_table *tbl = RHASH_ST_TABLE(hash);
 	st_free_table(tbl);
+        RHASH_ST_CLEAR(hash);
     }
-    RB_GC_GUARD(hash);
 }
 
 /*
  *  call-seq:
- *     ary - other_ary    -> new_ary
- *
- *  Array Difference
- *
- *  Returns a new array that is a copy of the original array, removing any
- *  items that also appear in +other_ary+. The order is preserved from the
- *  original array.
+ *    array - other_array -> new_array
  *
- *  It compares elements using their #hash and #eql? methods for efficiency.
+ *  Returns a new \Array containing only those elements from +array+
+ *  that are not found in \Array +other_array+;
+ *  items are compared using <tt>eql?</tt>;
+ *  the order from +array+ is preserved:
+ *    [0, 1, 1, 2, 1, 1, 3, 1, 1] - [1] # => [0, 2, 3]
+ *    [0, 1, 2, 3] - [3, 0] # => [1, 2]
+ *    [0, 1, 2] - [4] # => [0, 1, 2]
  *
- *     [ 1, 1, 2, 2, 3, 3, 4, 5 ] - [ 1, 2, 4 ]  #=>  [ 3, 3, 5 ]
- *
- *  If you need set-like behavior, see the library class Set.
+ *  Related: Array#difference.
  */
 
 static VALUE
@@ -4087,11 +5292,21 @@ rb_ary_diff(VALUE ary1, VALUE ary2)
     VALUE hash;
     long i;
 
-    hash = ary_make_hash(to_ary(ary2));
+    ary2 = to_ary(ary2);
     ary3 = rb_ary_new();
 
+    if (RARRAY_LEN(ary1) <= SMALL_ARRAY_LEN || RARRAY_LEN(ary2) <= SMALL_ARRAY_LEN) {
+	for (i=0; i<RARRAY_LEN(ary1); i++) {
+	    VALUE elt = rb_ary_elt(ary1, i);
+	    if (rb_ary_includes_by_eql(ary2, elt)) continue;
+	    rb_ary_push(ary3, elt);
+	}
+	return ary3;
+    }
+
+    hash = ary_make_hash(ary2);
     for (i=0; i<RARRAY_LEN(ary1); i++) {
-	if (st_lookup(rb_hash_tbl_raw(hash), RARRAY_AREF(ary1, i), 0)) continue;
+        if (rb_hash_stlike_lookup(hash, RARRAY_AREF(ary1, i), NULL)) continue;
 	rb_ary_push(ary3, rb_ary_elt(ary1, i));
     }
     ary_recycle_hash(hash);
@@ -4100,17 +5315,70 @@ rb_ary_diff(VALUE ary1, VALUE ary2)
 
 /*
  *  call-seq:
- *     ary & other_ary      -> new_ary
+ *    array.difference(*other_arrays) -> new_array
+ *
+ *  Returns a new \Array containing only those elements from +self+
+ *  that are not found in any of the Arrays +other_arrays+;
+ *  items are compared using <tt>eql?</tt>;  order from +self+ is preserved:
+ *    [0, 1, 1, 2, 1, 1, 3, 1, 1].difference([1]) # => [0, 2, 3]
+ *    [0, 1, 2, 3].difference([3, 0], [1, 3]) # => [2]
+ *    [0, 1, 2].difference([4]) # => [0, 1, 2]
  *
- *  Set Intersection --- Returns a new array containing unique elements common to the
- *  two arrays. The order is preserved from the original array.
+ *  Returns a copy of +self+ if no arguments given.
+ *
+ *  Related: Array#-.
+ */
+
+static VALUE
+rb_ary_difference_multi(int argc, VALUE *argv, VALUE ary)
+{
+    VALUE ary_diff;
+    long i, length;
+    volatile VALUE t0;
+    bool *is_hash = ALLOCV_N(bool, t0, argc);
+    ary_diff = rb_ary_new();
+    length = RARRAY_LEN(ary);
+
+    for (i = 0; i < argc; i++) {
+        argv[i] = to_ary(argv[i]);
+        is_hash[i] = (length > SMALL_ARRAY_LEN && RARRAY_LEN(argv[i]) > SMALL_ARRAY_LEN);
+        if (is_hash[i]) argv[i] = ary_make_hash(argv[i]);
+    }
+
+    for (i = 0; i < RARRAY_LEN(ary); i++) {
+        int j;
+        VALUE elt = rb_ary_elt(ary, i);
+        for (j = 0; j < argc; j++) {
+            if (is_hash[j]) {
+                if (rb_hash_stlike_lookup(argv[j], RARRAY_AREF(ary, i), NULL))
+                    break;
+            }
+            else {
+                if (rb_ary_includes_by_eql(argv[j], elt)) break;
+            }
+        }
+        if (j == argc) rb_ary_push(ary_diff, elt);
+    }
+
+    ALLOCV_END(t0);
+
+    return ary_diff;
+}
+
+
+/*
+ *  call-seq:
+ *    array & other_array -> new_array
  *
- *  It compares elements using their #hash and #eql? methods for efficiency.
+ *  Returns a new \Array containing each element found in both +array+ and \Array +other_array+;
+ *  duplicates are omitted; items are compared using <tt>eql?</tt>:
+ *    [0, 1, 2, 3] & [1, 2] # => [1, 2]
+ *    [0, 1, 0, 1] & [0, 1] # => [0, 1]
  *
- *     [ 1, 1, 3, 5 ] & [ 3, 2, 1 ]                 #=> [ 1, 3 ]
- *     [ 'a', 'b', 'b', 'z' ] & [ 'a', 'b', 'c' ]   #=> [ 'a', 'b' ]
+ *  Preserves order from +array+:
+ *    [0, 1, 2] & [3, 2, 1, 0] # => [0, 1, 2]
  *
- *  See also Array#uniq.
+ *  Related: Array#intersection.
  */
 
 
@@ -4118,20 +5386,29 @@ static VALUE
 rb_ary_and(VALUE ary1, VALUE ary2)
 {
     VALUE hash, ary3, v;
-    st_table *table;
     st_data_t vv;
     long i;
 
     ary2 = to_ary(ary2);
     ary3 = rb_ary_new();
-    if (RARRAY_LEN(ary2) == 0) return ary3;
+    if (RARRAY_LEN(ary1) == 0 || RARRAY_LEN(ary2) == 0) return ary3;
+
+    if (RARRAY_LEN(ary1) <= SMALL_ARRAY_LEN && RARRAY_LEN(ary2) <= SMALL_ARRAY_LEN) {
+	for (i=0; i<RARRAY_LEN(ary1); i++) {
+	    v = RARRAY_AREF(ary1, i);
+	    if (!rb_ary_includes_by_eql(ary2, v)) continue;
+	    if (rb_ary_includes_by_eql(ary3, v)) continue;
+	    rb_ary_push(ary3, v);
+	}
+	return ary3;
+    }
+
     hash = ary_make_hash(ary2);
-    table = rb_hash_tbl_raw(hash);
 
     for (i=0; i<RARRAY_LEN(ary1); i++) {
 	v = RARRAY_AREF(ary1, i);
 	vv = (st_data_t)v;
-	if (st_delete(table, &vv, 0)) {
+        if (rb_hash_stlike_delete(hash, &vv, 0)) {
 	    rb_ary_push(ary3, v);
 	}
     }
@@ -4140,6 +5417,37 @@ rb_ary_and(VALUE ary1, VALUE ary2)
     return ary3;
 }
 
+/*
+ *  call-seq:
+ *    array.intersection(*other_arrays) -> new_array
+ *
+ *  Returns a new \Array containing each element found both in +self+
+ *  and in all of the given Arrays +other_arrays+;
+ *  duplicates are omitted; items are compared using <tt>eql?</tt>:
+ *    [0, 1, 2, 3].intersection([0, 1, 2], [0, 1, 3]) # => [0, 1]
+ *    [0, 0, 1, 1, 2, 3].intersection([0, 1, 2], [0, 1, 3]) # => [0, 1]
+ *
+ *  Preserves order from +self+:
+ *    [0, 1, 2].intersection([2, 1, 0]) # => [0, 1, 2]
+ *
+ *  Returns a copy of +self+ if no arguments given.
+ *
+ *  Related: Array#&.
+ */
+
+static VALUE
+rb_ary_intersection_multi(int argc, VALUE *argv, VALUE ary)
+{
+    VALUE result = rb_ary_dup(ary);
+    int i;
+
+    for (i = 0; i < argc; i++) {
+        result = rb_ary_and(result, argv[i]);
+    }
+
+    return result;
+}
+
 static int
 ary_hash_orset(st_data_t *key, st_data_t *value, st_data_t arg, int existing)
 {
@@ -4148,36 +5456,59 @@ ary_hash_orset(st_data_t *key, st_data_t *value, st_data_t arg, int existing)
     return ST_CONTINUE;
 }
 
+static void
+rb_ary_union(VALUE ary_union, VALUE ary)
+{
+    long i;
+    for (i = 0; i < RARRAY_LEN(ary); i++) {
+        VALUE elt = rb_ary_elt(ary, i);
+        if (rb_ary_includes_by_eql(ary_union, elt)) continue;
+        rb_ary_push(ary_union, elt);
+    }
+}
+
+static void
+rb_ary_union_hash(VALUE hash, VALUE ary2)
+{
+    long i;
+    for (i = 0; i < RARRAY_LEN(ary2); i++) {
+        VALUE elt = RARRAY_AREF(ary2, i);
+        if (!rb_hash_stlike_update(hash, (st_data_t)elt, ary_hash_orset, (st_data_t)elt)) {
+            RB_OBJ_WRITTEN(hash, Qundef, elt);
+        }
+    }
+}
+
 /*
  *  call-seq:
- *     ary | other_ary     -> new_ary
- *
- *  Set Union --- Returns a new array by joining +ary+ with +other_ary+,
- *  excluding any duplicates and preserving the order from the given arrays.
+ *    array | other_array -> new_array
  *
- *  It compares elements using their #hash and #eql? methods for efficiency.
+ *  Returns the union of +array+ and \Array +other_array+;
+ *  duplicates are removed; order is preserved;
+ *  items are compared using <tt>eql?</tt>:
+ *    [0, 1] | [2, 3] # => [0, 1, 2, 3]
+ *    [0, 1, 1] | [2, 2, 3] # => [0, 1, 2, 3]
+ *    [0, 1, 2] | [3, 2, 1, 0] # => [0, 1, 2, 3]
  *
- *     [ "a", "b", "c" ] | [ "c", "d", "a" ]    #=> [ "a", "b", "c", "d" ]
- *     [ "c", "d", "a" ] | [ "a", "b", "c" ]    #=> [ "c", "d", "a", "b" ]
- *
- *  See also Array#uniq.
+ *  Related: Array#union.
  */
 
 static VALUE
 rb_ary_or(VALUE ary1, VALUE ary2)
 {
     VALUE hash, ary3;
-    long i;
 
     ary2 = to_ary(ary2);
+    if (RARRAY_LEN(ary1) + RARRAY_LEN(ary2) <= SMALL_ARRAY_LEN) {
+	ary3 = rb_ary_new();
+        rb_ary_union(ary3, ary1);
+        rb_ary_union(ary3, ary2);
+	return ary3;
+    }
+
     hash = ary_make_hash(ary1);
+    rb_ary_union_hash(hash, ary2);
 
-    for (i=0; i<RARRAY_LEN(ary2); i++) {
-	VALUE elt = RARRAY_AREF(ary2, i);
-	if (!st_update(RHASH_TBL_RAW(hash), (st_data_t)elt, ary_hash_orset, (st_data_t)elt)) {
-	    RB_OBJ_WRITTEN(hash, Qundef, elt);
-	}
-    }
     ary3 = rb_hash_values(hash);
     ary_recycle_hash(hash);
     return ary3;
@@ -4185,25 +5516,170 @@ rb_ary_or(VALUE ary1, VALUE ary2)
 
 /*
  *  call-seq:
- *     ary.max                     -> obj
- *     ary.max { |a, b| block }    -> obj
- *     ary.max(n)                  -> array
- *     ary.max(n) { |a, b| block } -> array
+ *    array.union(*other_arrays) -> new_array
+ *
+ *  Returns a new \Array that is the union of +self+ and all given Arrays +other_arrays+;
+ *  duplicates are removed;  order is preserved;  items are compared using <tt>eql?</tt>:
+ *    [0, 1, 2, 3].union([4, 5], [6, 7]) # => [0, 1, 2, 3, 4, 5, 6, 7]
+ *    [0, 1, 1].union([2, 1], [3, 1]) # => [0, 1, 2, 3]
+ *    [0, 1, 2, 3].union([3, 2], [1, 0]) # => [0, 1, 2, 3]
  *
- *  Returns the object in _ary_ 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>.
+ *  Returns a copy of +self+ if no arguments given.
  *
- *     a = %w(albatross dog horse)
- *     a.max                                   #=> "horse"
- *     a.max { |a, b| a.length <=> b.length }  #=> "albatross"
+ *  Related: Array#|.
+ */
+
+static VALUE
+rb_ary_union_multi(int argc, VALUE *argv, VALUE ary)
+{
+    int i;
+    long sum;
+    VALUE hash, ary_union;
+
+    sum = RARRAY_LEN(ary);
+    for (i = 0; i < argc; i++) {
+        argv[i] = to_ary(argv[i]);
+        sum += RARRAY_LEN(argv[i]);
+    }
+
+    if (sum <= SMALL_ARRAY_LEN) {
+        ary_union = rb_ary_new();
+
+        rb_ary_union(ary_union, ary);
+        for (i = 0; i < argc; i++) rb_ary_union(ary_union, argv[i]);
+
+        return ary_union;
+    }
+
+    hash = ary_make_hash(ary);
+    for (i = 0; i < argc; i++) rb_ary_union_hash(hash, argv[i]);
+
+    ary_union = rb_hash_values(hash);
+    ary_recycle_hash(hash);
+    return ary_union;
+}
+
+static VALUE
+ary_max_generic(VALUE ary, long i, VALUE vmax)
+{
+    RUBY_ASSERT(i > 0 && i < RARRAY_LEN(ary));
+
+    VALUE v;
+    for (; i < RARRAY_LEN(ary); ++i) {
+        v = RARRAY_AREF(ary, i);
+
+        if (rb_cmpint(rb_funcallv(vmax, id_cmp, 1, &v), vmax, v) < 0) {
+            vmax = v;
+        }
+    }
+
+    return vmax;
+}
+
+static VALUE
+ary_max_opt_fixnum(VALUE ary, long i, VALUE vmax)
+{
+    const long n = RARRAY_LEN(ary);
+    RUBY_ASSERT(i > 0 && i < n);
+    RUBY_ASSERT(FIXNUM_P(vmax));
+
+    VALUE v;
+    for (; i < n; ++i) {
+        v = RARRAY_AREF(ary, i);
+
+        if (FIXNUM_P(v)) {
+            if ((long)vmax < (long)v) {
+                vmax = v;
+            }
+        }
+        else {
+            return ary_max_generic(ary, i, vmax);
+        }
+    }
+
+    return vmax;
+}
+
+static VALUE
+ary_max_opt_float(VALUE ary, long i, VALUE vmax)
+{
+    const long n = RARRAY_LEN(ary);
+    RUBY_ASSERT(i > 0 && i < n);
+    RUBY_ASSERT(RB_FLOAT_TYPE_P(vmax));
+
+    VALUE v;
+    for (; i < n; ++i) {
+        v = RARRAY_AREF(ary, i);
+
+        if (RB_FLOAT_TYPE_P(v)) {
+            if (rb_float_cmp(vmax, v) < 0) {
+                vmax = v;
+            }
+        }
+        else {
+            return ary_max_generic(ary, i, vmax);
+        }
+    }
+
+    return vmax;
+}
+
+static VALUE
+ary_max_opt_string(VALUE ary, long i, VALUE vmax)
+{
+    const long n = RARRAY_LEN(ary);
+    RUBY_ASSERT(i > 0 && i < n);
+    RUBY_ASSERT(STRING_P(vmax));
+
+    VALUE v;
+    for (; i < n; ++i) {
+        v = RARRAY_AREF(ary, i);
+
+        if (STRING_P(v)) {
+            if (rb_str_cmp(vmax, v) < 0) {
+                vmax = v;
+            }
+        }
+        else {
+            return ary_max_generic(ary, i, vmax);
+        }
+    }
+
+    return vmax;
+}
+
+/*
+ *  call-seq:
+ *    array.max -> element
+ *    array.max {|a, b| ... } -> element
+ *    array.max(n) -> new_array
+ *    array.max(n) {|a, b| ... } -> new_array
  *
- *  If the +n+ argument is given, maximum +n+ elements are returned
- *  as an array.
+ *  Returns one of the following:
+ *  - The maximum-valued element from +self+.
+ *  - A new \Array of maximum-valued elements selected from +self+.
  *
- *     a = %w[albatross dog horse]
- *     a.max(2)                                  #=> ["horse", "dog"]
- *     a.max(2) {|a, b| a.length <=> b.length }  #=> ["albatross", "horse"]
+ *  When no block is given, each element in +self+ must respond to method <tt><=></tt>
+ *  with an \Integer.
+ *
+ *  With no argument and no block, returns the element in +self+
+ *  having the maximum value per method <tt><=></tt>:
+ *    [0, 1, 2].max # => 2
+ *
+ *  With an argument \Integer +n+ and no block, returns a new \Array with at most +n+ elements,
+ *  in descending order per method <tt><=></tt>:
+ *    [0, 1, 2, 3].max(3) # => [3, 2, 1]
+ *    [0, 1, 2, 3].max(6) # => [3, 2, 1]
+ *
+ *  When a block is given, the block must return an \Integer.
+ *
+ *  With a block and no argument, calls the block <tt>self.size-1</tt> times to compare elements;
+ *  returns the element having the maximum value per the block:
+ *    ['0', '00', '000'].max {|a, b| a.size <=> b.size } # => "000"
+ *
+ *  With an argument +n+ and a block, returns a new \Array with at most +n+ elements,
+ *  in descending order per the block:
+ *    ['0', '00', '000'].max(2) {|a, b| a.size <=> b.size } # => ["000", "00"]
  */
 static VALUE
 rb_ary_max(int argc, VALUE *argv, VALUE ary)
@@ -4213,11 +5689,10 @@ rb_ary_max(int argc, VALUE *argv, VALUE ary)
     VALUE num;
     long i;
 
-    rb_scan_args(argc, argv, "01", &num);
-
-    if (!NIL_P(num))
+    if (rb_check_arity(argc, 0, 1) && !NIL_P(num = argv[0]))
        return rb_nmin_run(ary, num, 0, 1, 1);
 
+    const long n = RARRAY_LEN(ary);
     if (rb_block_given_p()) {
 	for (i = 0; i < RARRAY_LEN(ary); i++) {
 	   v = RARRAY_AREF(ary, i);
@@ -4226,39 +5701,149 @@ rb_ary_max(int argc, VALUE *argv, VALUE ary)
 	   }
 	}
     }
-    else {
-	for (i = 0; i < RARRAY_LEN(ary); i++) {
-	   v = RARRAY_AREF(ary, i);
-	   if (result == Qundef || OPTIMIZED_CMP(v, result, cmp_opt) > 0) {
-	       result = v;
-	   }
-	}
+    else if (n > 0) {
+        result = RARRAY_AREF(ary, 0);
+        if (n > 1) {
+            if (FIXNUM_P(result) && CMP_OPTIMIZABLE(cmp_opt, Integer)) {
+                return ary_max_opt_fixnum(ary, 1, result);
+            }
+            else if (STRING_P(result) && CMP_OPTIMIZABLE(cmp_opt, String)) {
+                return ary_max_opt_string(ary, 1, result);
+            }
+            else if (RB_FLOAT_TYPE_P(result) && CMP_OPTIMIZABLE(cmp_opt, Float)) {
+                return ary_max_opt_float(ary, 1, result);
+            }
+            else {
+                return ary_max_generic(ary, 1, result);
+            }
+        }
     }
     if (result == Qundef) return Qnil;
     return result;
 }
 
+static VALUE
+ary_min_generic(VALUE ary, long i, VALUE vmin)
+{
+    RUBY_ASSERT(i > 0 && i < RARRAY_LEN(ary));
+
+    VALUE v;
+    for (; i < RARRAY_LEN(ary); ++i) {
+        v = RARRAY_AREF(ary, i);
+
+        if (rb_cmpint(rb_funcallv(vmin, id_cmp, 1, &v), vmin, v) > 0) {
+            vmin = v;
+        }
+    }
+
+    return vmin;
+}
+
+static VALUE
+ary_min_opt_fixnum(VALUE ary, long i, VALUE vmin)
+{
+    const long n = RARRAY_LEN(ary);
+    RUBY_ASSERT(i > 0 && i < n);
+    RUBY_ASSERT(FIXNUM_P(vmin));
+
+    VALUE a;
+    for (; i < n; ++i) {
+        a = RARRAY_AREF(ary, i);
+
+        if (FIXNUM_P(a)) {
+            if ((long)vmin > (long)a) {
+                vmin = a;
+            }
+        }
+        else {
+            return ary_min_generic(ary, i, vmin);
+        }
+    }
+
+    return vmin;
+}
+
+static VALUE
+ary_min_opt_float(VALUE ary, long i, VALUE vmin)
+{
+    const long n = RARRAY_LEN(ary);
+    RUBY_ASSERT(i > 0 && i < n);
+    RUBY_ASSERT(RB_FLOAT_TYPE_P(vmin));
+
+    VALUE a;
+    for (; i < n; ++i) {
+        a = RARRAY_AREF(ary, i);
+
+        if (RB_FLOAT_TYPE_P(a)) {
+            if (rb_float_cmp(vmin, a) > 0) {
+                vmin = a;
+            }
+        }
+        else {
+            return ary_min_generic(ary, i, vmin);
+        }
+    }
+
+    return vmin;
+}
+
+static VALUE
+ary_min_opt_string(VALUE ary, long i, VALUE vmin)
+{
+    const long n = RARRAY_LEN(ary);
+    RUBY_ASSERT(i > 0 && i < n);
+    RUBY_ASSERT(STRING_P(vmin));
+
+    VALUE a;
+    for (; i < n; ++i) {
+        a = RARRAY_AREF(ary, i);
+
+        if (STRING_P(a)) {
+            if (rb_str_cmp(vmin, a) > 0) {
+                vmin = a;
+            }
+        }
+        else {
+            return ary_min_generic(ary, i, vmin);
+        }
+    }
+
+    return vmin;
+}
+
 /*
  *  call-seq:
- *     ary.min                     -> obj
- *     ary.min {| a,b | block }    -> obj
- *     ary.min(n)                  -> array
- *     ary.min(n) {| a,b | block } -> array
+ *    array.min -> element
+ *    array.min { |a, b| ... } -> element
+ *    array.min(n) -> new_array
+ *    array.min(n) { |a, b| ... } -> new_array
+ *
+ *  Returns one of the following:
+ *  - The minimum-valued element from +self+.
+ *  - A new \Array of minimum-valued elements selected from +self+.
+ *
+ *  When no block is given, each element in +self+ must respond to method <tt><=></tt>
+ *  with an \Integer.
  *
- *  Returns the object in _ary_ with the minimum value. The
- *  first form assumes all objects implement <code>Comparable</code>;
- *  the second uses the block to return <em>a <=> b</em>.
+ *  With no argument and no block, returns the element in +self+
+ *  having the minimum value per method <tt><=></tt>:
+ *    [0, 1, 2].min # => 0
  *
- *     a = %w(albatross dog horse)
- *     a.min                                   #=> "albatross"
- *     a.min { |a, b| a.length <=> b.length }  #=> "dog"
+ *  With \Integer argument +n+ and no block, returns a new \Array with at most +n+ elements,
+ *  in ascending order per method <tt><=></tt>:
+ *    [0, 1, 2, 3].min(3) # => [0, 1, 2]
+ *    [0, 1, 2, 3].min(6) # => [0, 1, 2, 3]
  *
- *  If the +n+ argument is given, minimum +n+ elements are returned
- *  as an array.
+ *  When a block is given, the block must return an Integer.
  *
- *     a = %w[albatross dog horse]
- *     a.min(2)                                  #=> ["albatross", "dog"]
- *     a.min(2) {|a, b| a.length <=> b.length }  #=> ["dog", "horse"]
+ *  With a block and no argument, calls the block <tt>self.size-1</tt> times to compare elements;
+ *  returns the element having the minimum value per the block:
+ *    ['0', '00', '000'].min { |a, b| a.size <=> b.size } # => "0"
+ *
+ *  With an argument +n+ and a block, returns a new \Array with at most +n+ elements,
+ *  in ascending order per the block:
+ *    [0, 1, 2, 3].min(3) # => [0, 1, 2]
+ *    [0, 1, 2, 3].min(6) # => [0, 1, 2, 3]
  */
 static VALUE
 rb_ary_min(int argc, VALUE *argv, VALUE ary)
@@ -4268,11 +5853,10 @@ rb_ary_min(int argc, VALUE *argv, VALUE ary)
     VALUE num;
     long i;
 
-    rb_scan_args(argc, argv, "01", &num);
-
-    if (!NIL_P(num))
+    if (rb_check_arity(argc, 0, 1) && !NIL_P(num = argv[0]))
        return rb_nmin_run(ary, num, 0, 0, 1);
 
+    const long n = RARRAY_LEN(ary);
     if (rb_block_given_p()) {
 	for (i = 0; i < RARRAY_LEN(ary); i++) {
 	   v = RARRAY_AREF(ary, i);
@@ -4281,18 +5865,56 @@ rb_ary_min(int argc, VALUE *argv, VALUE ary)
 	   }
 	}
     }
-    else {
-	for (i = 0; i < RARRAY_LEN(ary); i++) {
-	   v = RARRAY_AREF(ary, i);
-	   if (result == Qundef || OPTIMIZED_CMP(v, result, cmp_opt) < 0) {
-	       result = v;
-	   }
-	}
+    else if (n > 0) {
+        result = RARRAY_AREF(ary, 0);
+        if (n > 1) {
+            if (FIXNUM_P(result) && CMP_OPTIMIZABLE(cmp_opt, Integer)) {
+                return ary_min_opt_fixnum(ary, 1, result);
+            }
+            else if (STRING_P(result) && CMP_OPTIMIZABLE(cmp_opt, String)) {
+                return ary_min_opt_string(ary, 1, result);
+            }
+            else if (RB_FLOAT_TYPE_P(result) && CMP_OPTIMIZABLE(cmp_opt, Float)) {
+                return ary_min_opt_float(ary, 1, result);
+            }
+            else {
+                return ary_min_generic(ary, 1, result);
+            }
+        }
     }
     if (result == Qundef) return Qnil;
     return result;
 }
 
+/*
+ *  call-seq:
+ *    array.minmax -> [min_val, max_val]
+ *    array.minmax {|a, b| ... } -> [min_val, max_val]
+ *
+ *  Returns a new 2-element \Array containing the minimum and maximum values
+ *  from +self+, either per method <tt><=></tt> or per a given block:.
+ *
+ *  When no block is given, each element in +self+ must respond to method <tt><=></tt>
+ *  with an \Integer;
+ *  returns a new 2-element \Array containing the minimum and maximum values
+ *  from +self+, per method <tt><=></tt>:
+ *    [0, 1, 2].minmax # => [0, 2]
+ *
+ *  When a block is given, the block must return an \Integer;
+ *  the block is called <tt>self.size-1</tt> times to compare elements;
+ *  returns a new 2-element \Array containing the minimum and maximum values
+ *  from +self+, per the block:
+ *    ['0', '00', '000'].minmax {|a, b| a.size <=> b.size } # => ["0", "000"]
+ */
+static VALUE
+rb_ary_minmax(VALUE ary)
+{
+    if (rb_block_given_p()) {
+        return rb_call_super(0, NULL);
+    }
+    return rb_assoc_new(rb_ary_min(0, 0, ary), rb_ary_max(0, 0, ary));
+}
+
 static int
 push_value(st_data_t key, st_data_t val, st_data_t ary)
 {
@@ -4302,31 +5924,31 @@ push_value(st_data_t key, st_data_t val, st_data_t ary)
 
 /*
  *  call-seq:
- *     ary.uniq!                -> ary or nil
- *     ary.uniq! { |item| ... } -> ary or nil
- *
- *  Removes duplicate elements from +self+.
+ *    array.uniq! -> self or nil
+ *    array.uniq! {|element| ... } -> self or nil
  *
- *  If a block is given, it will use the return value of the block for
- *  comparison.
+ *  Removes duplicate elements from +self+, the first occurrence always being retained;
+ *  returns +self+ if any elements removed, +nil+ otherwise.
  *
- *  It compares values using their #hash and #eql? methods for efficiency.
+ *  With no block given, identifies and removes elements using method <tt>eql?</tt>
+ *  to compare.
  *
- *  +self+ is traversed in order, and the first occurrence is kept.
+ *  Returns +self+ if any elements removed:
+ *    a = [0, 0, 1, 1, 2, 2]
+ *    a.uniq! # => [0, 1, 2]
  *
- *  Returns +nil+ if no changes are made (that is, no duplicates are found).
+ *  Returns +nil+ if no elements removed.
  *
- *     a = [ "a", "a", "b", "b", "c" ]
- *     a.uniq!   # => ["a", "b", "c"]
+ *  With a block given, calls the block for each element;
+ *  identifies (using method <tt>eql?</tt>) and removes
+ *  elements for which the block returns duplicate values.
  *
- *     b = [ "a", "b", "c" ]
- *     b.uniq!   # => nil
- *
- *     c = [["student","sam"], ["student","george"], ["teacher","matz"]]
- *     c.uniq! { |s| s.first } # => [["student", "sam"], ["teacher", "matz"]]
+ *  Returns +self+ if any elements removed:
+ *    a = ['a', 'aa', 'aaa', 'b', 'bb', 'bbb']
+ *    a.uniq! {|element| element.size } # => ['a', 'aa', 'aaa']
  *
+ *  Returns +nil+ if no elements removed.
  */
-
 static VALUE
 rb_ary_uniq_bang(VALUE ary)
 {
@@ -4352,7 +5974,7 @@ rb_ary_uniq_bang(VALUE ary)
 	FL_SET_EMBED(ary);
     }
     ary_resize_capa(ary, hash_size);
-    st_foreach(rb_hash_tbl_raw(hash), push_value, ary);
+    rb_hash_foreach(hash, push_value, ary);
     ary_recycle_hash(hash);
 
     return ary;
@@ -4360,23 +5982,22 @@ rb_ary_uniq_bang(VALUE ary)
 
 /*
  *  call-seq:
- *     ary.uniq                -> new_ary
- *     ary.uniq { |item| ... } -> new_ary
- *
- *  Returns a new array by removing duplicate values in +self+.
- *
- *  If a block is given, it will use the return value of the block for comparison.
- *
- *  It compares values using their #hash and #eql? methods for efficiency.
- *
- *  +self+ is traversed in order, and the first occurrence is kept.
- *
- *     a = [ "a", "a", "b", "b", "c" ]
- *     a.uniq   # => ["a", "b", "c"]
- *
- *     b = [["student","sam"], ["student","george"], ["teacher","matz"]]
- *     b.uniq { |s| s.first } # => [["student", "sam"], ["teacher", "matz"]]
- *
+ *    array.uniq -> new_array
+ *    array.uniq {|element| ... } -> new_array
+ *
+ *  Returns a new \Array containing those elements from +self+ that are not duplicates,
+ *  the first occurrence always being retained.
+ *
+ *  With no block given, identifies and omits duplicates using method <tt>eql?</tt>
+ *  to compare.
+ *    a = [0, 0, 1, 1, 2, 2]
+ *    a.uniq # => [0, 1, 2]
+ *
+ *  With a block given, calls the block for each element;
+ *  identifies (using method <tt>eql?</tt>) and omits duplicate values,
+ *  that is, those elements for which the block returns the same value:
+ *    a = ['a', 'aa', 'aaa', 'b', 'bb', 'bbb']
+ *    a.uniq {|element| element.size } # => ["a", "aa", "aaa"]
  */
 
 static VALUE
@@ -4384,9 +6005,11 @@ rb_ary_uniq(VALUE ary)
 {
     VALUE hash, uniq;
 
-    if (RARRAY_LEN(ary) <= 1)
-        return rb_ary_dup(ary);
-    if (rb_block_given_p()) {
+    if (RARRAY_LEN(ary) <= 1) {
+        hash = 0;
+        uniq = rb_ary_dup(ary);
+    }
+    else if (rb_block_given_p()) {
 	hash = ary_make_hash_by(ary);
 	uniq = rb_hash_values(hash);
     }
@@ -4394,22 +6017,20 @@ rb_ary_uniq(VALUE ary)
 	hash = ary_make_hash(ary);
 	uniq = rb_hash_values(hash);
     }
-    RBASIC_SET_CLASS(uniq, rb_obj_class(ary));
-    ary_recycle_hash(hash);
+    if (hash) {
+        ary_recycle_hash(hash);
+    }
 
     return uniq;
 }
 
 /*
  *  call-seq:
- *     ary.compact!    -> ary  or  nil
+ *    array.compact! -> self or nil
  *
- *  Removes +nil+ elements from the array.
+ *  Removes all +nil+ elements from +self+.
  *
- *  Returns +nil+ if no changes were made, otherwise returns the array.
- *
- *     [ "a", nil, "b", nil, "c" ].compact! #=> [ "a", "b", "c" ]
- *     [ "a", "b", "c" ].compact!           #=> nil
+ *  Returns +self+ if any elements removed, otherwise +nil+.
  */
 
 static VALUE
@@ -4419,14 +6040,14 @@ rb_ary_compact_bang(VALUE ary)
     long n;
 
     rb_ary_modify(ary);
-    p = t = (VALUE *)RARRAY_CONST_PTR(ary); /* WB: no new reference */
+    p = t = (VALUE *)RARRAY_CONST_PTR_TRANSIENT(ary); /* WB: no new reference */
     end = p + RARRAY_LEN(ary);
 
     while (t < end) {
 	if (NIL_P(*t)) t++;
 	else *p++ = *t++;
     }
-    n = p - RARRAY_CONST_PTR(ary);
+    n = p - RARRAY_CONST_PTR_TRANSIENT(ary);
     if (RARRAY_LEN(ary) == n) {
 	return Qnil;
     }
@@ -4437,12 +6058,11 @@ rb_ary_compact_bang(VALUE ary)
 
 /*
  *  call-seq:
- *     ary.compact     -> new_ary
- *
- *  Returns a copy of +self+ with all +nil+ elements removed.
+ *    array.compact -> new_array
  *
- *     [ "a", nil, "b", nil, "c", nil ].compact
- *                       #=> [ "a", "b", "c" ]
+ *  Returns a new \Array containing all non-+nil+ elements from +self+:
+ *    a = [nil, 0, nil, 1, nil, 2, nil]
+ *    a.compact # => [0, 1, 2]
  */
 
 static VALUE
@@ -4455,23 +6075,26 @@ rb_ary_compact(VALUE ary)
 
 /*
  *  call-seq:
- *     ary.count                   -> int
- *     ary.count(obj)              -> int
- *     ary.count { |item| block }  -> int
+ *    array.count -> an_integer
+ *    array.count(obj) -> an_integer
+ *    array.count {|element| ... } -> an_integer
  *
- *  Returns the number of elements.
+ *  Returns a count of specified elements.
  *
- *  If an argument is given, counts the number of elements which equal +obj+
- *  using <code>==</code>.
+ *  With no argument and no block, returns the count of all elements:
+ *    [0, 1, 2].count # => 3
+ *    [].count # => 0
  *
- *  If a block is given, counts the number of elements for which the block
- *  returns a true value.
+ *  With argument +obj+, returns the count of elements <tt>eql?</tt> to +obj+:
+ *    [0, 1, 2, 0].count(0) # => 2
+ *    [0, 1, 2].count(3) # => 0
  *
- *     ary = [1, 2, 4, 2]
- *     ary.count                  #=> 4
- *     ary.count(2)               #=> 2
- *     ary.count { |x| x%2 == 0 } #=> 3
+ *  With no argument and a block given, calls the block with each element;
+ *  returns the count of elements for which the block returns a truthy value:
+ *    [0, 1, 2, 3].count {|element| element > 1} # => 2
  *
+ *  With argument +obj+ and a block given, issues a warning, ignores the block,
+ *  and returns the count of elements <tt>eql?</tt> to +obj+:
  */
 
 static VALUE
@@ -4479,7 +6102,7 @@ rb_ary_count(int argc, VALUE *argv, VALUE ary)
 {
     long i, n = 0;
 
-    if (argc == 0) {
+    if (rb_check_arity(argc, 0, 1) == 0) {
 	VALUE v;
 
 	if (!rb_block_given_p())
@@ -4491,9 +6114,8 @@ rb_ary_count(int argc, VALUE *argv, VALUE ary)
 	}
     }
     else {
-	VALUE obj;
+        VALUE obj = argv[0];
 
-	rb_scan_args(argc, argv, "1", &obj);
 	if (rb_block_given_p()) {
 	    rb_warn("given block not used");
 	}
@@ -4506,18 +6128,43 @@ rb_ary_count(int argc, VALUE *argv, VALUE ary)
 }
 
 static VALUE
-flatten(VALUE ary, int level, int *modified)
+flatten(VALUE ary, int level)
 {
-    long i = 0;
-    VALUE stack, result, tmp, elt;
-    st_table *memo;
+    long i;
+    VALUE stack, result, tmp = 0, elt, vmemo;
+    st_table *memo = 0;
     st_data_t id;
 
-    stack = ary_new(0, ARY_DEFAULT_SIZE);
+    for (i = 0; i < RARRAY_LEN(ary); i++) {
+        elt = RARRAY_AREF(ary, i);
+        tmp = rb_check_array_type(elt);
+        if (!NIL_P(tmp)) {
+            break;
+        }
+    }
+    if (i == RARRAY_LEN(ary)) {
+        return ary;
+    }
+
     result = ary_new(0, RARRAY_LEN(ary));
-    memo = st_init_numtable();
-    st_insert(memo, (st_data_t)ary, (st_data_t)Qtrue);
-    *modified = 0;
+    ary_memcpy(result, 0, i, RARRAY_CONST_PTR_TRANSIENT(ary));
+    ARY_SET_LEN(result, i);
+
+    stack = ary_new(0, ARY_DEFAULT_SIZE);
+    rb_ary_push(stack, ary);
+    rb_ary_push(stack, LONG2NUM(i + 1));
+
+    if (level < 0) {
+	vmemo = rb_hash_new();
+	RBASIC_CLEAR_CLASS(vmemo);
+	memo = st_init_numtable();
+	rb_hash_st_table_set(vmemo, memo);
+	st_insert(memo, (st_data_t)ary, (st_data_t)Qtrue);
+	st_insert(memo, (st_data_t)tmp, (st_data_t)Qtrue);
+    }
+
+    ary = tmp;
+    i = 0;
 
     while (1) {
 	while (i < RARRAY_LEN(ary)) {
@@ -4528,19 +6175,24 @@ flatten(VALUE ary, int level, int *modified)
 	    }
 	    tmp = rb_check_array_type(elt);
 	    if (RBASIC(result)->klass) {
+		if (memo) {
+		    RB_GC_GUARD(vmemo);
+		    st_clear(memo);
+		}
 		rb_raise(rb_eRuntimeError, "flatten reentered");
 	    }
 	    if (NIL_P(tmp)) {
 		rb_ary_push(result, elt);
 	    }
 	    else {
-		*modified = 1;
-		id = (st_data_t)tmp;
-		if (st_lookup(memo, id, 0)) {
-		    st_free_table(memo);
-		    rb_raise(rb_eArgError, "tried to flatten recursive array");
+		if (memo) {
+		    id = (st_data_t)tmp;
+		    if (st_is_member(memo, id)) {
+			st_clear(memo);
+			rb_raise(rb_eArgError, "tried to flatten recursive array");
+		    }
+		    st_insert(memo, id, (st_data_t)Qtrue);
 		}
-		st_insert(memo, id, (st_data_t)Qtrue);
 		rb_ary_push(stack, ary);
 		rb_ary_push(stack, LONG2NUM(i));
 		ary = tmp;
@@ -4550,37 +6202,49 @@ flatten(VALUE ary, int level, int *modified)
 	if (RARRAY_LEN(stack) == 0) {
 	    break;
 	}
-	id = (st_data_t)ary;
-	st_delete(memo, &id, 0);
+	if (memo) {
+	    id = (st_data_t)ary;
+	    st_delete(memo, &id, 0);
+	}
 	tmp = rb_ary_pop(stack);
 	i = NUM2LONG(tmp);
 	ary = rb_ary_pop(stack);
     }
 
-    st_free_table(memo);
+    if (memo) {
+	st_clear(memo);
+    }
 
-    RBASIC_SET_CLASS(result, rb_class_of(ary));
+    RBASIC_SET_CLASS(result, rb_cArray);
     return result;
 }
 
 /*
  *  call-seq:
- *     ary.flatten!        -> ary or nil
- *     ary.flatten!(level) -> ary or nil
- *
- *  Flattens +self+ in place.
- *
- *  Returns +nil+ if no modifications were made (i.e., the array contains no
- *  subarrays.)
- *
- *  The optional +level+ argument determines the level of recursion to flatten.
- *
- *     a = [ 1, 2, [3, [4, 5] ] ]
- *     a.flatten!   #=> [1, 2, 3, 4, 5]
- *     a.flatten!   #=> nil
- *     a            #=> [1, 2, 3, 4, 5]
- *     a = [ 1, 2, [3, [4, 5] ] ]
- *     a.flatten!(1) #=> [1, 2, 3, [4, 5]]
+ *    array.flatten! -> self or nil
+ *    array.flatten!(level) -> self or nil
+ *
+ *  Replaces each nested \Array in +self+ with the elements from that \Array;
+ *  returns +self+ if any changes, +nil+ otherwise.
+ *
+ *  With non-negative \Integer argument +level+, flattens recursively through +level+ levels:
+ *    a = [ 0, [ 1, [2, 3], 4 ], 5 ]
+ *    a.flatten!(1) # => [0, 1, [2, 3], 4, 5]
+ *    a = [ 0, [ 1, [2, 3], 4 ], 5 ]
+ *    a.flatten!(2) # => [0, 1, 2, 3, 4, 5]
+ *    a = [ 0, [ 1, [2, 3], 4 ], 5 ]
+ *    a.flatten!(3) # => [0, 1, 2, 3, 4, 5]
+ *    [0, 1, 2].flatten!(1) # => nil
+ *
+ *  With no argument, a +nil+ argument, or with negative argument +level+, flattens all levels:
+ *    a = [ 0, [ 1, [2, 3], 4 ], 5 ]
+ *    a.flatten! # => [0, 1, 2, 3, 4, 5]
+ *    [0, 1, 2].flatten! # => nil
+ *    a = [ 0, [ 1, [2, 3], 4 ], 5 ]
+ *    a.flatten!(-1) # => [0, 1, 2, 3, 4, 5]
+ *    a = [ 0, [ 1, [2, 3], 4 ], 5 ]
+ *    a.flatten!(-2) # => [0, 1, 2, 3, 4, 5]
+ *    [0, 1, 2].flatten!(-1) # => nil
  */
 
 static VALUE
@@ -4589,14 +6253,13 @@ rb_ary_flatten_bang(int argc, VALUE *argv, VALUE ary)
     int mod = 0, level = -1;
     VALUE result, lv;
 
-    rb_scan_args(argc, argv, "01", &lv);
+    lv = (rb_check_arity(argc, 0, 1) ? argv[0] : Qnil);
     rb_ary_modify_check(ary);
     if (!NIL_P(lv)) level = NUM2INT(lv);
     if (level == 0) return Qnil;
 
-    result = flatten(ary, level, &mod);
-    if (mod == 0) {
-	ary_discard(result);
+    result = flatten(ary, level);
+    if (result == ary) {
 	return Qnil;
     }
     if (!(mod = ARY_EMBED_P(result))) rb_obj_freeze(result);
@@ -4608,89 +6271,68 @@ rb_ary_flatten_bang(int argc, VALUE *argv, VALUE ary)
 
 /*
  *  call-seq:
- *     ary.flatten -> new_ary
- *     ary.flatten(level) -> new_ary
- *
- *  Returns a new array that is a one-dimensional flattening of +self+
- *  (recursively).
- *
- *  That is, for every element that is an array, extract its elements into
- *  the new array.
- *
- *  The optional +level+ argument determines the level of recursion to
- *  flatten.
- *
- *     s = [ 1, 2, 3 ]           #=> [1, 2, 3]
- *     t = [ 4, 5, 6, [7, 8] ]   #=> [4, 5, 6, [7, 8]]
- *     a = [ s, t, 9, 10 ]       #=> [[1, 2, 3], [4, 5, 6, [7, 8]], 9, 10]
- *     a.flatten                 #=> [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
- *     a = [ 1, 2, [3, [4, 5] ] ]
- *     a.flatten(1)              #=> [1, 2, 3, [4, 5]]
+ *    array.flatten -> new_array
+ *    array.flatten(level) -> new_array
+ *
+ *  Returns a new \Array that is a recursive flattening of +self+:
+ *  - Each non-Array element is unchanged.
+ *  - Each \Array is replaced by its individual elements.
+ *
+ *  With non-negative \Integer argument +level+, flattens recursively through +level+ levels:
+ *    a = [ 0, [ 1, [2, 3], 4 ], 5 ]
+ *    a.flatten(0) # => [0, [1, [2, 3], 4], 5]
+ *    a = [ 0, [ 1, [2, 3], 4 ], 5 ]
+ *    a.flatten(1) # => [0, 1, [2, 3], 4, 5]
+ *    a = [ 0, [ 1, [2, 3], 4 ], 5 ]
+ *    a.flatten(2) # => [0, 1, 2, 3, 4, 5]
+ *    a = [ 0, [ 1, [2, 3], 4 ], 5 ]
+ *    a.flatten(3) # => [0, 1, 2, 3, 4, 5]
+ *
+ *  With no argument, a +nil+ argument, or with negative argument +level+, flattens all levels:
+ *    a = [ 0, [ 1, [2, 3], 4 ], 5 ]
+ *    a.flatten # => [0, 1, 2, 3, 4, 5]
+ *    [0, 1, 2].flatten # => [0, 1, 2]
+ *    a = [ 0, [ 1, [2, 3], 4 ], 5 ]
+ *    a.flatten(-1) # => [0, 1, 2, 3, 4, 5]
+ *    a = [ 0, [ 1, [2, 3], 4 ], 5 ]
+ *    a.flatten(-2) # => [0, 1, 2, 3, 4, 5]
+ *    [0, 1, 2].flatten(-1) # => [0, 1, 2]
  */
 
 static VALUE
 rb_ary_flatten(int argc, VALUE *argv, VALUE ary)
 {
-    int mod = 0, level = -1;
-    VALUE result, lv;
+    int level = -1;
+    VALUE result;
 
-    rb_scan_args(argc, argv, "01", &lv);
-    if (!NIL_P(lv)) level = NUM2INT(lv);
-    if (level == 0) return ary_make_shared_copy(ary);
+    if (rb_check_arity(argc, 0, 1) && !NIL_P(argv[0])) {
+        level = NUM2INT(argv[0]);
+        if (level == 0) return ary_make_shared_copy(ary);
+    }
 
-    result = flatten(ary, level, &mod);
-    OBJ_INFECT(result, ary);
+    result = flatten(ary, level);
+    if (result == ary) {
+        result = ary_make_shared_copy(ary);
+    }
 
     return result;
 }
 
-#define OPTHASH_GIVEN_P(opts) \
-    (argc > 0 && !NIL_P((opts) = rb_check_hash_type(argv[argc-1])) && (--argc, 1))
-static ID id_random;
-
 #define RAND_UPTO(max) (long)rb_random_ulong_limited((randgen), (max)-1)
 
-/*
- *  call-seq:
- *     ary.shuffle!              -> ary
- *     ary.shuffle!(random: rng) -> ary
- *
- *  Shuffles elements in +self+ in place.
- *
- *     a = [ 1, 2, 3 ]           #=> [1, 2, 3]
- *     a.shuffle!                #=> [2, 3, 1]
- *     a                         #=> [2, 3, 1]
- *
- *  The optional +rng+ argument will be used as the random number generator.
- *
- *     a.shuffle!(random: Random.new(1))  #=> [1, 3, 2]
- */
-
 static VALUE
-rb_ary_shuffle_bang(int argc, VALUE *argv, VALUE ary)
+rb_ary_shuffle_bang(rb_execution_context_t *ec, VALUE ary, VALUE randgen)
 {
-    VALUE opts, randgen = rb_cRandom;
     long i, len;
 
-    if (OPTHASH_GIVEN_P(opts)) {
-	VALUE rnd;
-	ID keyword_ids[1];
-
-	keyword_ids[0] = id_random;
-	rb_get_kwargs(opts, keyword_ids, 0, 1, &rnd);
-	if (rnd != Qundef) {
-	    randgen = rnd;
-	}
-    }
-    rb_check_arity(argc, 0, 0);
     rb_ary_modify(ary);
     i = len = RARRAY_LEN(ary);
     RARRAY_PTR_USE(ary, ptr, {
 	while (i) {
 	    long j = RAND_UPTO(i);
 	    VALUE tmp;
-	    if (len != RARRAY_LEN(ary) || ptr != RARRAY_CONST_PTR(ary)) {
-		rb_raise(rb_eRuntimeError, "modified during shuffle");
+            if (len != RARRAY_LEN(ary) || ptr != RARRAY_CONST_PTR_TRANSIENT(ary)) {
+                rb_raise(rb_eRuntimeError, "modified during shuffle");
 	    }
 	    tmp = ptr[--i];
 	    ptr[i] = ptr[j];
@@ -4700,76 +6342,24 @@ rb_ary_shuffle_bang(int argc, VALUE *argv, VALUE ary)
     return ary;
 }
 
-
-/*
- *  call-seq:
- *     ary.shuffle              -> new_ary
- *     ary.shuffle(random: rng) -> new_ary
- *
- *  Returns a new array with elements of +self+ shuffled.
- *
- *     a = [ 1, 2, 3 ]           #=> [1, 2, 3]
- *     a.shuffle                 #=> [2, 3, 1]
- *     a                         #=> [1, 2, 3]
- *
- *  The optional +rng+ argument will be used as the random number generator.
- *
- *     a.shuffle(random: Random.new(1))  #=> [1, 3, 2]
- */
-
 static VALUE
-rb_ary_shuffle(int argc, VALUE *argv, VALUE ary)
+rb_ary_shuffle(rb_execution_context_t *ec, VALUE ary, VALUE randgen)
 {
     ary = rb_ary_dup(ary);
-    rb_ary_shuffle_bang(argc, argv, ary);
+    rb_ary_shuffle_bang(ec, ary, randgen);
     return ary;
 }
 
-
-/*
- *  call-seq:
- *     ary.sample                  -> obj
- *     ary.sample(random: rng)     -> obj
- *     ary.sample(n)               -> new_ary
- *     ary.sample(n, random: rng)  -> new_ary
- *
- *  Choose a random element or +n+ random elements from the array.
- *
- *  The elements are chosen by using random and unique indices into the array
- *  in order to ensure that an element doesn't repeat itself unless the array
- *  already contained duplicate elements.
- *
- *  If the array is empty the first form returns +nil+ and the second form
- *  returns an empty array.
- *
- *  The optional +rng+ argument will be used as the random number generator.
- *
- *     a = [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
- *     a.sample         #=> 7
- *     a.sample(4)      #=> [6, 4, 2, 5]
- */
-
-
 static VALUE
-rb_ary_sample(int argc, VALUE *argv, VALUE ary)
+rb_ary_sample(rb_execution_context_t *ec, VALUE ary, VALUE randgen, VALUE nv, VALUE to_array)
 {
-    VALUE nv, result;
-    VALUE opts, randgen = rb_cRandom;
+    VALUE result;
     long n, len, i, j, k, idx[10];
     long rnds[numberof(idx)];
+    long memo_threshold;
 
-    if (OPTHASH_GIVEN_P(opts)) {
-	VALUE rnd;
-	ID keyword_ids[1];
-
-	keyword_ids[0] = id_random;
-	rb_get_kwargs(opts, keyword_ids, 0, 1, &rnd);
-	if (rnd != Qundef) {
-	    randgen = rnd;
-	}
-    }
     len = RARRAY_LEN(ary);
-    if (argc == 0) {
+    if (!to_array) {
 	if (len < 2)
 	    i = 0;
 	else
@@ -4777,7 +6367,6 @@ rb_ary_sample(int argc, VALUE *argv, VALUE ary)
 
 	return rb_ary_elt(ary, i);
     }
-    rb_scan_args(argc, argv, "1", &nv);
     n = NUM2LONG(nv);
     if (n < 0) rb_raise(rb_eArgError, "negative sample number");
     if (n > len) n = len;
@@ -4799,7 +6388,7 @@ rb_ary_sample(int argc, VALUE *argv, VALUE ary)
 	return rb_ary_new_capa(0);
       case 1:
 	i = rnds[0];
-	return rb_ary_new_from_values(1, &RARRAY_AREF(ary, i));
+	return rb_ary_new_from_args(1, RARRAY_AREF(ary, i));
       case 2:
 	i = rnds[0];
 	j = rnds[1];
@@ -4816,6 +6405,11 @@ rb_ary_sample(int argc, VALUE *argv, VALUE ary)
 	}
 	return rb_ary_new_from_args(3, RARRAY_AREF(ary, i), RARRAY_AREF(ary, j), RARRAY_AREF(ary, k));
     }
+    memo_threshold =
+	len < 2560 ? len / 128 :
+	len < 5120 ? len / 64 :
+	len < 10240 ? len / 32 :
+	len / 16;
     if (n <= numberof(idx)) {
 	long sorted[numberof(idx)];
 	sorted[0] = idx[0] = rnds[0];
@@ -4829,12 +6423,44 @@ rb_ary_sample(int argc, VALUE *argv, VALUE ary)
 	    sorted[j] = idx[i] = k;
 	}
 	result = rb_ary_new_capa(n);
-	RARRAY_PTR_USE(result, ptr_result, {
+        RARRAY_PTR_USE_TRANSIENT(result, ptr_result, {
 	    for (i=0; i<n; i++) {
 		ptr_result[i] = RARRAY_AREF(ary, idx[i]);
 	    }
 	});
     }
+    else if (n <= memo_threshold / 2) {
+	long max_idx = 0;
+#undef RUBY_UNTYPED_DATA_WARNING
+#define RUBY_UNTYPED_DATA_WARNING 0
+	VALUE vmemo = Data_Wrap_Struct(0, 0, st_free_table, 0);
+	st_table *memo = st_init_numtable_with_size(n);
+	DATA_PTR(vmemo) = memo;
+	result = rb_ary_new_capa(n);
+	RARRAY_PTR_USE(result, ptr_result, {
+	    for (i=0; i<n; i++) {
+		long r = RAND_UPTO(len-i) + i;
+		ptr_result[i] = r;
+		if (r > max_idx) max_idx = r;
+	    }
+	    len = RARRAY_LEN(ary);
+	    if (len <= max_idx) n = 0;
+	    else if (n > len) n = len;
+            RARRAY_PTR_USE_TRANSIENT(ary, ptr_ary, {
+		for (i=0; i<n; i++) {
+		    long j2 = j = ptr_result[i];
+		    long i2 = i;
+		    st_data_t value;
+		    if (st_lookup(memo, (st_data_t)i, &value)) i2 = (long)value;
+		    if (st_lookup(memo, (st_data_t)j, &value)) j2 = (long)value;
+		    st_insert(memo, (st_data_t)j, (st_data_t)i2);
+		    ptr_result[i] = ptr_ary[j2];
+		}
+	    });
+	});
+	DATA_PTR(vmemo) = 0;
+	st_free_table(memo);
+    }
     else {
 	result = rb_ary_dup(ary);
 	RBASIC_CLEAR_CLASS(result);
@@ -4863,47 +6489,55 @@ rb_ary_cycle_size(VALUE self, VALUE args, VALUE eobj)
 	n = RARRAY_AREF(args, 0);
     }
     if (RARRAY_LEN(self) == 0) return INT2FIX(0);
-    if (n == Qnil) return DBL2NUM(INFINITY);
+    if (n == Qnil) return DBL2NUM(HUGE_VAL);
     mul = NUM2LONG(n);
     if (mul <= 0) return INT2FIX(0);
     n = LONG2FIX(mul);
-    return rb_funcallv(rb_ary_length(self), '*', 1, &n);
+    return rb_fix_mul_fix(rb_ary_length(self), n);
 }
 
 /*
  *  call-seq:
- *     ary.cycle(n=nil) { |obj| block }  -> nil
- *     ary.cycle(n=nil)                  -> Enumerator
- *
- *  Calls the given block for each element +n+ times or forever if +nil+ is
- *  given.
- *
- *  Does nothing if a non-positive number is given or the array is empty.
- *
- *  Returns +nil+ if the loop has finished without getting interrupted.
- *
- *  If no block is given, an Enumerator is returned instead.
- *
- *     a = ["a", "b", "c"]
- *     a.cycle { |x| puts x }     # print, a, b, c, a, b, c,.. forever.
- *     a.cycle(2) { |x| puts x }  # print, a, b, c, a, b, c.
- *
+ *    array.cycle {|element| ... } -> nil
+ *    array.cycle(count) {|element| ... } -> nil
+ *    array.cycle -> new_enumerator
+ *    array.cycle(count) -> new_enumerator
+ *
+ *  When called with positive \Integer argument +count+ and a block,
+ *  calls the block with each element, then does so again,
+ *  until it has done so +count+ times; returns +nil+:
+ *    output = []
+ *    [0, 1].cycle(2) {|element| output.push(element) } # => nil
+ *    output # => [0, 1, 0, 1]
+ *
+ *  If +count+ is zero or negative, does not call the block:
+ *    [0, 1].cycle(0) {|element| fail 'Cannot happen' } # => nil
+ *    [0, 1].cycle(-1) {|element| fail 'Cannot happen' } # => nil
+ *
+ *  When a block is given, and argument is omitted or +nil+, cycles forever:
+ *    # Prints 0 and 1 forever.
+ *    [0, 1].cycle {|element| puts element }
+ *    [0, 1].cycle(nil) {|element| puts element }
+ *
+ *  When no block is given, returns a new \Enumerator:
+ *
+ *    [0, 1].cycle(2) # => #<Enumerator: [0, 1]:cycle(2)>
+ *    [0, 1].cycle # => # => #<Enumerator: [0, 1]:cycle>
+ *    [0, 1].cycle.first(5) # => [0, 1, 0, 1, 0]
  */
-
 static VALUE
 rb_ary_cycle(int argc, VALUE *argv, VALUE ary)
 {
     long n, i;
-    VALUE nv = Qnil;
 
-    rb_scan_args(argc, argv, "01", &nv);
+    rb_check_arity(argc, 0, 1);
 
     RETURN_SIZED_ENUMERATOR(ary, argc, argv, rb_ary_cycle_size);
-    if (NIL_P(nv)) {
+    if (argc == 0 || NIL_P(argv[0])) {
         n = -1;
     }
     else {
-        n = NUM2LONG(nv);
+        n = NUM2LONG(argv[0]);
         if (n <= 0) return Qnil;
     }
 
@@ -4915,8 +6549,6 @@ rb_ary_cycle(int argc, VALUE *argv, VALUE ary)
     return Qnil;
 }
 
-#define tmpbuf(n, size) rb_str_tmp_new((n)*(size))
-#define tmpbuf_discard(s) (rb_str_resize((s), 0L), RBASIC_SET_CLASS_RAW(s, rb_cString))
 #define tmpary(n) rb_ary_tmp_new(n)
 #define tmpary_discard(a) (ary_discard(a), RBASIC_SET_CLASS_RAW(a, rb_cArray))
 
@@ -4929,11 +6561,9 @@ static int
 yield_indexed_values(const VALUE values, const long r, const long *const p)
 {
     const VALUE result = rb_ary_new2(r);
-    VALUE *const result_array = RARRAY_PTR(result);
-    const VALUE *const values_array = RARRAY_CONST_PTR(values);
     long i;
 
-    for (i = 0; i < r; i++) result_array[i] = values_array[p[i]];
+    for (i = 0; i < r; i++) ARY_SET(result, i, RARRAY_AREF(values, p[i]));
     ARY_SET_LEN(result, r);
     rb_yield(result);
     return !RBASIC(values)->klass;
@@ -4988,15 +6618,21 @@ permute0(const long n, const long r, long *const p, char *const used, const VALU
 
 /*
  * Returns the product of from, from-1, ..., from - how_many + 1.
- * http://en.wikipedia.org/wiki/Pochhammer_symbol
+ * https://en.wikipedia.org/wiki/Pochhammer_symbol
  */
 static VALUE
 descending_factorial(long from, long how_many)
 {
-    VALUE cnt = LONG2FIX(how_many >= 0);
-    while (how_many-- > 0) {
-	VALUE v = LONG2FIX(from--);
-	cnt = rb_funcallv(cnt, '*', 1, &v);
+    VALUE cnt;
+    if (how_many > 0) {
+	cnt = LONG2FIX(from);
+	while (--how_many > 0) {
+	    long v = --from;
+	    cnt = rb_int_mul(cnt, LONG2FIX(v));
+	}
+    }
+    else {
+	cnt = LONG2FIX(how_many == 0);
     }
     return cnt;
 }
@@ -5004,16 +6640,23 @@ descending_factorial(long from, long how_many)
 static VALUE
 binomial_coefficient(long comb, long size)
 {
-    VALUE r, v;
+    VALUE r;
+    long i;
     if (comb > size-comb) {
 	comb = size-comb;
     }
     if (comb < 0) {
 	return LONG2FIX(0);
     }
-    r = descending_factorial(size, comb);
-    v = descending_factorial(comb, comb);
-    return rb_funcallv(r, id_div, 1, &v);
+    else if (comb == 0) {
+	return LONG2FIX(1);
+    }
+    r = LONG2FIX(size);
+    for (i = 1; i < comb; ++i) {
+	r = rb_int_mul(r, LONG2FIX(size - i));
+	r = rb_int_idiv(r, LONG2FIX(i + 1));
+    }
+    return r;
 }
 
 static VALUE
@@ -5027,42 +6670,78 @@ rb_ary_permutation_size(VALUE ary, VALUE args, VALUE eobj)
 
 /*
  *  call-seq:
- *     ary.permutation { |p| block }          -> ary
- *     ary.permutation                        -> Enumerator
- *     ary.permutation(n) { |p| block }       -> ary
- *     ary.permutation(n)                     -> Enumerator
- *
- * When invoked with a block, yield all permutations of length +n+ of the
- * elements of the array, then return the array itself.
- *
- * If +n+ is not specified, yield all permutations of all elements.
- *
- * The implementation makes no guarantees about the order in which the
- * permutations are yielded.
- *
- * If no block is given, an Enumerator is returned instead.
- *
- * Examples:
- *
- *   a = [1, 2, 3]
- *   a.permutation.to_a    #=> [[1,2,3],[1,3,2],[2,1,3],[2,3,1],[3,1,2],[3,2,1]]
- *   a.permutation(1).to_a #=> [[1],[2],[3]]
- *   a.permutation(2).to_a #=> [[1,2],[1,3],[2,1],[2,3],[3,1],[3,2]]
- *   a.permutation(3).to_a #=> [[1,2,3],[1,3,2],[2,1,3],[2,3,1],[3,1,2],[3,2,1]]
- *   a.permutation(0).to_a #=> [[]] # one permutation of length 0
- *   a.permutation(4).to_a #=> []   # no permutations of length 4
+ *    array.permutation {|element| ... } -> self
+ *    array.permutation(n) {|element| ... } -> self
+ *    array.permutation -> new_enumerator
+ *    array.permutation(n) -> new_enumerator
+ *
+ *  When invoked with a block, yield all permutations of elements of +self+; returns +self+.
+ *  The order of permutations is indeterminate.
+ *
+ *  When a block and an in-range positive \Integer argument +n+ (<tt>0 < n <= self.size</tt>)
+ *  are given, calls the block with all +n+-tuple permutations of +self+.
+ *
+ *  Example:
+ *    a = [0, 1, 2]
+ *    a.permutation(2) {|permutation| p permutation }
+ *  Output:
+ *    [0, 1]
+ *    [0, 2]
+ *    [1, 0]
+ *    [1, 2]
+ *    [2, 0]
+ *    [2, 1]
+ *  Another example:
+ *    a = [0, 1, 2]
+ *    a.permutation(3) {|permutation| p permutation }
+ *  Output:
+ *    [0, 1, 2]
+ *    [0, 2, 1]
+ *    [1, 0, 2]
+ *    [1, 2, 0]
+ *    [2, 0, 1]
+ *    [2, 1, 0]
+ *
+ *  When +n+ is zero, calls the block once with a new empty \Array:
+ *    a = [0, 1, 2]
+ *    a.permutation(0) {|permutation| p permutation }
+ *  Output:
+ *    []
+ *
+ *  When +n+ is out of range (negative or larger than <tt>self.size</tt>),
+ *  does not call the block:
+ *    a = [0, 1, 2]
+ *    a.permutation(-1) {|permutation| fail 'Cannot happen' }
+ *    a.permutation(4) {|permutation| fail 'Cannot happen' }
+ *
+ *  When a block given but no argument,
+ *  behaves the same as <tt>a.permutation(a.size)</tt>:
+ *    a = [0, 1, 2]
+ *    a.permutation {|permutation| p permutation }
+ *  Output:
+ *    [0, 1, 2]
+ *    [0, 2, 1]
+ *    [1, 0, 2]
+ *    [1, 2, 0]
+ *    [2, 0, 1]
+ *    [2, 1, 0]
+ *
+ *  Returns a new \Enumerator if no block given:
+ *    a = [0, 1, 2]
+ *    a.permutation # => #<Enumerator: [0, 1, 2]:permutation>
+ *    a.permutation(2) # => #<Enumerator: [0, 1, 2]:permutation(2)>
  */
 
 static VALUE
 rb_ary_permutation(int argc, VALUE *argv, VALUE ary)
 {
-    VALUE num;
     long r, n, i;
 
     n = RARRAY_LEN(ary);                  /* Array length */
     RETURN_SIZED_ENUMERATOR(ary, argc, argv, rb_ary_permutation_size);   /* Return enumerator if no block */
-    rb_scan_args(argc, argv, "01", &num);
-    r = NIL_P(num) ? n : NUM2LONG(num);   /* Permutation size from argument */
+    r = n;
+    if (rb_check_arity(argc, 0, 1) && !NIL_P(argv[0]))
+        r = NUM2LONG(argv[0]);            /* Permutation size from argument */
 
     if (r < 0 || n < r) {
 	/* no permutations: yield nothing */
@@ -5123,27 +6802,44 @@ rb_ary_combination_size(VALUE ary, VALUE args, VALUE eobj)
 
 /*
  *  call-seq:
- *     ary.combination(n) { |c| block }    -> ary
- *     ary.combination(n)                  -> Enumerator
- *
- * When invoked with a block, yields all combinations of length +n+ of elements
- * from the array and then returns the array itself.
- *
- * The implementation makes no guarantees about the order in which the
- * combinations are yielded.
- *
- * If no block is given, an Enumerator is returned instead.
- *
- * Examples:
- *
- *     a = [1, 2, 3, 4]
- *     a.combination(1).to_a  #=> [[1],[2],[3],[4]]
- *     a.combination(2).to_a  #=> [[1,2],[1,3],[1,4],[2,3],[2,4],[3,4]]
- *     a.combination(3).to_a  #=> [[1,2,3],[1,2,4],[1,3,4],[2,3,4]]
- *     a.combination(4).to_a  #=> [[1,2,3,4]]
- *     a.combination(0).to_a  #=> [[]] # one combination of length 0
- *     a.combination(5).to_a  #=> []   # no combinations of length 5
- *
+ *    array.combination(n) {|element| ... } -> self
+ *    array.combination(n) -> new_enumerator
+ *
+ *  Calls the block, if given, with combinations of elements of +self+;
+ *  returns +self+. The order of combinations is indeterminate.
+ *
+ *  When a block and an in-range positive \Integer argument +n+ (<tt>0 < n <= self.size</tt>)
+ *  are given, calls the block with all +n+-tuple combinations of +self+.
+ *
+ *  Example:
+ *    a = [0, 1, 2]
+ *    a.combination(2) {|combination| p combination }
+ *  Output:
+ *    [0, 1]
+ *    [0, 2]
+ *    [1, 2]
+ *
+ *  Another example:
+ *    a = [0, 1, 2]
+ *    a.combination(3) {|combination| p combination }
+ *  Output:
+ *    [0, 1, 2]
+ *
+ *  When +n+ is zero, calls the block once with a new empty \Array:
+ *    a = [0, 1, 2]
+ *    a1 = a.combination(0) {|combination| p combination }
+ *  Output:
+ *    []
+ *
+ *  When +n+ is out of range (negative or larger than <tt>self.size</tt>),
+ *  does not call the block:
+ *    a = [0, 1, 2]
+ *    a.combination(-1) {|combination| fail 'Cannot happen' }
+ *    a.combination(4) {|combination| fail 'Cannot happen' }
+ *
+ *  Returns a new \Enumerator if no block given:
+ *    a = [0, 1, 2]
+ *    a.combination(2) # => #<Enumerator: [0, 1, 2]:combination(2)>
  */
 
 static VALUE
@@ -5161,7 +6857,7 @@ rb_ary_combination(VALUE ary, VALUE num)
 	rb_yield(rb_ary_new2(0));
     }
     else if (n == 1) {
-	for (i = 0; i < len; i++) {
+	for (i = 0; i < RARRAY_LEN(ary); i++) {
 	    rb_yield(rb_ary_new3(1, RARRAY_AREF(ary, i)));
 	}
     }
@@ -5218,39 +6914,71 @@ rb_ary_repeated_permutation_size(VALUE ary, VALUE args, VALUE eobj)
 {
     long n = RARRAY_LEN(ary);
     long k = NUM2LONG(RARRAY_AREF(args, 0));
-    VALUE v;
 
     if (k < 0) {
 	return LONG2FIX(0);
     }
-
-    v = LONG2NUM(k);
-    return rb_funcallv(LONG2NUM(n), id_power, 1, &v);
+    if (n <= 0) {
+	return LONG2FIX(!k);
+    }
+    return rb_int_positive_pow(n, (unsigned long)k);
 }
 
 /*
  *  call-seq:
- *     ary.repeated_permutation(n) { |p| block } -> ary
- *     ary.repeated_permutation(n)               -> Enumerator
- *
- * When invoked with a block, yield all repeated permutations of length +n+ of
- * the elements of the array, then return the array itself.
- *
- * The implementation makes no guarantees about the order in which the repeated
- * permutations are yielded.
- *
- * If no block is given, an Enumerator is returned instead.
- *
- * Examples:
- *
- *     a = [1, 2]
- *     a.repeated_permutation(1).to_a  #=> [[1], [2]]
- *     a.repeated_permutation(2).to_a  #=> [[1,1],[1,2],[2,1],[2,2]]
- *     a.repeated_permutation(3).to_a  #=> [[1,1,1],[1,1,2],[1,2,1],[1,2,2],
- *                                     #    [2,1,1],[2,1,2],[2,2,1],[2,2,2]]
- *     a.repeated_permutation(0).to_a  #=> [[]] # one permutation of length 0
+ *    array.repeated_permutation(n) {|permutation| ... } -> self
+ *    array.repeated_permutation(n) -> new_enumerator
+ *
+ *  Calls the block with each repeated permutation of length +n+ of the elements of +self+;
+ *  each permutation is an \Array;
+ *  returns +self+. The order of the permutations is indeterminate.
+ *
+ *  When a block and a positive \Integer argument +n+ are given, calls the block with each
+ *  +n+-tuple repeated permutation of the elements of +self+.
+ *  The number of permutations is <tt>self.size**n</tt>.
+ *
+ *  +n+ = 1:
+ *    a = [0, 1, 2]
+ *    a.repeated_permutation(1) {|permutation| p permutation }
+ *  Output:
+ *    [0]
+ *    [1]
+ *    [2]
+ *
+ *  +n+ = 2:
+ *    a.repeated_permutation(2) {|permutation| p permutation }
+ *  Output:
+ *    [0, 0]
+ *    [0, 1]
+ *    [0, 2]
+ *    [1, 0]
+ *    [1, 1]
+ *    [1, 2]
+ *    [2, 0]
+ *    [2, 1]
+ *    [2, 2]
+ *
+ *  If +n+ is zero, calls the block once with an empty \Array.
+ *
+ *  If +n+ is negative, does not call the block:
+ *    a.repeated_permutation(-1) {|permutation| fail 'Cannot happen' }
+ *
+ *  Returns a new \Enumerator if no block given:
+ *    a = [0, 1, 2]
+ *    a.repeated_permutation(2) # => #<Enumerator: [0, 1, 2]:permutation(2)>
+ *
+ *  Using Enumerators, it's convenient to show the permutations and counts
+ *  for some values of +n+:
+ *    e = a.repeated_permutation(0)
+ *    e.size # => 1
+ *    e.to_a # => [[]]
+ *    e = a.repeated_permutation(1)
+ *    e.size # => 3
+ *    e.to_a # => [[0], [1], [2]]
+ *    e = a.repeated_permutation(2)
+ *    e.size # => 9
+ *    e.to_a # => [[0, 0], [0, 1], [0, 2], [1, 0], [1, 1], [1, 2], [2, 0], [2, 1], [2, 2]]
  */
-
 static VALUE
 rb_ary_repeated_permutation(VALUE ary, VALUE num)
 {
@@ -5320,29 +7048,55 @@ rb_ary_repeated_combination_size(VALUE ary, VALUE args, VALUE eobj)
 
 /*
  *  call-seq:
- *     ary.repeated_combination(n) { |c| block } -> ary
- *     ary.repeated_combination(n)               -> Enumerator
- *
- * When invoked with a block, yields all repeated combinations of length +n+ of
- * elements from the array and then returns the array itself.
- *
- * The implementation makes no guarantees about the order in which the repeated
- * combinations are yielded.
- *
- * If no block is given, an Enumerator is returned instead.
- *
- * Examples:
- *
- *   a = [1, 2, 3]
- *   a.repeated_combination(1).to_a  #=> [[1], [2], [3]]
- *   a.repeated_combination(2).to_a  #=> [[1,1],[1,2],[1,3],[2,2],[2,3],[3,3]]
- *   a.repeated_combination(3).to_a  #=> [[1,1,1],[1,1,2],[1,1,3],[1,2,2],[1,2,3],
- *                                   #    [1,3,3],[2,2,2],[2,2,3],[2,3,3],[3,3,3]]
- *   a.repeated_combination(4).to_a  #=> [[1,1,1,1],[1,1,1,2],[1,1,1,3],[1,1,2,2],[1,1,2,3],
- *                                   #    [1,1,3,3],[1,2,2,2],[1,2,2,3],[1,2,3,3],[1,3,3,3],
- *                                   #    [2,2,2,2],[2,2,2,3],[2,2,3,3],[2,3,3,3],[3,3,3,3]]
- *   a.repeated_combination(0).to_a  #=> [[]] # one combination of length 0
- *
+ *    array.repeated_combination(n) {|combination| ... } -> self
+ *    array.repeated_combination(n) -> new_enumerator
+ *
+ *  Calls the block with each repeated combination of length +n+ of the elements of +self+;
+ *  each combination is an \Array;
+ *  returns +self+. The order of the combinations is indeterminate.
+ *
+ *  When a block and a positive \Integer argument +n+ are given, calls the block with each
+ *  +n+-tuple repeated combination of the elements of +self+.
+ *  The number of combinations is <tt>(n+1)(n+2)/2</tt>.
+ *
+ *  +n+ = 1:
+ *    a = [0, 1, 2]
+ *    a.repeated_combination(1) {|combination| p combination }
+ *  Output:
+ *    [0]
+ *    [1]
+ *    [2]
+ *
+ *  +n+ = 2:
+ *    a.repeated_combination(2) {|combination| p combination }
+ *  Output:
+ *    [0, 0]
+ *    [0, 1]
+ *    [0, 2]
+ *    [1, 1]
+ *    [1, 2]
+ *    [2, 2]
+ *
+ *  If +n+ is zero, calls the block once with an empty \Array.
+ *
+ *  If +n+ is negative, does not call the block:
+ *    a.repeated_combination(-1) {|combination| fail 'Cannot happen' }
+ *
+ *  Returns a new \Enumerator if no block given:
+ *    a = [0, 1, 2]
+ *    a.repeated_combination(2) # => #<Enumerator: [0, 1, 2]:combination(2)>
+ *
+ *  Using Enumerators, it's convenient to show the combinations and counts
+ *  for some values of +n+:
+ *    e = a.repeated_combination(0)
+ *    e.size # => 1
+ *    e.to_a # => [[]]
+ *    e = a.repeated_combination(1)
+ *    e.size # => 3
+ *    e.to_a # => [[0], [1], [2]]
+ *    e = a.repeated_combination(2)
+ *    e.size # => 6
+ *    e.to_a # => [[0, 0], [0, 1], [0, 2], [1, 1], [1, 2], [2, 2]]
  */
 
 static VALUE
@@ -5360,7 +7114,7 @@ rb_ary_repeated_combination(VALUE ary, VALUE num)
 	rb_yield(rb_ary_new2(0));
     }
     else if (n == 1) {
-	for (i = 0; i < len; i++) {
+	for (i = 0; i < RARRAY_LEN(ary); i++) {
 	    rb_yield(rb_ary_new3(1, RARRAY_AREF(ary, i)));
 	}
     }
@@ -5382,23 +7136,51 @@ rb_ary_repeated_combination(VALUE ary, VALUE num)
 
 /*
  *  call-seq:
- *     ary.product(other_ary, ...)                -> new_ary
- *     ary.product(other_ary, ...) { |p| block }  -> ary
- *
- *  Returns an array of all combinations of elements from all arrays.
- *
- *  The length of the returned array is the product of the length of +self+ and
- *  the argument arrays.
- *
- *  If given a block, #product will yield all combinations and return +self+
- *  instead.
- *
- *     [1,2,3].product([4,5])     #=> [[1,4],[1,5],[2,4],[2,5],[3,4],[3,5]]
- *     [1,2].product([1,2])       #=> [[1,1],[1,2],[2,1],[2,2]]
- *     [1,2].product([3,4],[5,6]) #=> [[1,3,5],[1,3,6],[1,4,5],[1,4,6],
- *                                #     [2,3,5],[2,3,6],[2,4,5],[2,4,6]]
- *     [1,2].product()            #=> [[1],[2]]
- *     [1,2].product([])          #=> []
+ *    array.product(*other_arrays) -> new_array
+ *    array.product(*other_arrays) {|combination| ... } -> self
+ *
+ *  Computes and returns or yields all combinations of elements from all the Arrays,
+ *  including both +self+ and +other_arrays+.
+ *  - The number of combinations is the product of the sizes of all the arrays,
+ *    including both +self+ and +other_arrays+.
+ *  - The order of the returned combinations is indeterminate.
+ *
+ *  When no block is given, returns the combinations as an \Array of Arrays:
+ *    a = [0, 1, 2]
+ *    a1 = [3, 4]
+ *    a2 = [5, 6]
+ *    p = a.product(a1)
+ *    p.size # => 6 # a.size * a1.size
+ *    p # => [[0, 3], [0, 4], [1, 3], [1, 4], [2, 3], [2, 4]]
+ *    p = a.product(a1, a2)
+ *    p.size # => 12 # a.size * a1.size * a2.size
+ *    p # => [[0, 3, 5], [0, 3, 6], [0, 4, 5], [0, 4, 6], [1, 3, 5], [1, 3, 6], [1, 4, 5], [1, 4, 6], [2, 3, 5], [2, 3, 6], [2, 4, 5], [2, 4, 6]]
+ *
+ *  If any argument is an empty \Array, returns an empty \Array.
+ *
+ *  If no argument is given, returns an \Array of 1-element Arrays,
+ *  each containing an element of +self+:
+ *    a.product # => [[0], [1], [2]]
+ *
+ *  When a block is given, yields each combination as an \Array; returns +self+:
+ *    a.product(a1) {|combination| p combination }
+ *  Output:
+ *    [0, 3]
+ *    [0, 4]
+ *    [1, 3]
+ *    [1, 4]
+ *    [2, 3]
+ *    [2, 4]
+ *
+ *  If any argument is an empty \Array, does not call the block:
+ *    a.product(a1, a2, []) {|combination| fail 'Cannot happen' }
+ *
+ *  If no argument is given, yields each element of +self+ as a 1-element \Array:
+ *    a.product {|combination| p combination }
+ *  Output:
+ *    [0]
+ *    [1]
+ *    [2]
  */
 
 static VALUE
@@ -5406,15 +7188,14 @@ rb_ary_product(int argc, VALUE *argv, VALUE ary)
 {
     int n = argc+1;    /* How many arrays we're operating on */
     volatile VALUE t0 = tmpary(n);
-    volatile VALUE t1 = tmpbuf(n, sizeof(int));
+    volatile VALUE t1 = Qundef;
     VALUE *arrays = RARRAY_PTR(t0); /* The arrays we're computing the product of */
-    int *counters = (int*)RSTRING_PTR(t1); /* The current position in each one */
+    int *counters = ALLOCV_N(int, t1, n); /* The current position in each one */
     VALUE result = Qnil;      /* The array we'll be returning, when no block given */
     long i,j;
     long resultlen = 1;
 
     RBASIC_CLEAR_CLASS(t0);
-    RBASIC_CLEAR_CLASS(t1);
 
     /* initialize the arrays of arrays */
     ARY_SET_LEN(t0, n);
@@ -5485,24 +7266,25 @@ rb_ary_product(int argc, VALUE *argv, VALUE ary)
     }
 done:
     tmpary_discard(t0);
-    tmpbuf_discard(t1);
+    ALLOCV_END(t1);
 
     return NIL_P(result) ? ary : result;
 }
 
 /*
  *  call-seq:
- *     ary.take(n)               -> new_ary
- *
- *  Returns first +n+ elements from the array.
- *
- *  If a negative number is given, raises an ArgumentError.
- *
- *  See also Array#drop
- *
- *     a = [1, 2, 3, 4, 5, 0]
- *     a.take(3)             #=> [1, 2, 3]
- *
+ *    array.take(n) -> new_array
+ *
+ *  Returns a new \Array containing the first +n+ element of +self+,
+ *  where +n+ is a non-negative \Integer;
+ *  does not modify +self+.
+ *
+ *  Examples:
+ *    a = [0, 1, 2, 3, 4, 5]
+ *    a.take(1) # => [0]
+ *    a.take(2) # => [0, 1]
+ *    a.take(50) # => [0, 1, 2, 3, 4, 5]
+ *    a # => [0, 1, 2, 3, 4, 5]
  */
 
 static VALUE
@@ -5517,19 +7299,22 @@ rb_ary_take(VALUE obj, VALUE n)
 
 /*
  *  call-seq:
- *     ary.take_while { |obj| block }  -> new_ary
- *     ary.take_while                  -> Enumerator
- *
- *  Passes elements to the block until the block returns +nil+ or +false+, then
- *  stops iterating and returns an array of all prior elements.
- *
- *  If no block is given, an Enumerator is returned instead.
- *
- *  See also Array#drop_while
- *
- *     a = [1, 2, 3, 4, 5, 0]
- *     a.take_while { |i| i < 3 }  #=> [1, 2]
- *
+ *    array.take_while {|element| ... } -> new_array
+ *    array.take_while -> new_enumerator
+ *
+ *  Returns a new \Array containing zero or more leading elements of +self+;
+ *  does not modify +self+.
+ *
+ *  With a block given, calls the block with each successive element of +self+;
+ *  stops if the block returns +false+ or +nil+;
+ *  returns a new Array containing those elements for which the block returned a truthy value:
+ *    a = [0, 1, 2, 3, 4, 5]
+ *    a.take_while {|element| element < 3 } # => [0, 1, 2]
+ *    a.take_while {|element| true } # => [0, 1, 2, 3, 4, 5]
+ *    a # => [0, 1, 2, 3, 4, 5]
+ *
+ *  With no block given, returns a new \Enumerator:
+ *    [0, 1].take_while # => #<Enumerator: [0, 1]:take_while>
  */
 
 static VALUE
@@ -5546,18 +7331,17 @@ rb_ary_take_while(VALUE ary)
 
 /*
  *  call-seq:
- *     ary.drop(n)               -> new_ary
- *
- *  Drops first +n+ elements from +ary+ and returns the rest of the elements in
- *  an array.
- *
- *  If a negative number is given, raises an ArgumentError.
- *
- *  See also Array#take
+ *    array.drop(n) -> new_array
  *
- *     a = [1, 2, 3, 4, 5, 0]
- *     a.drop(3)             #=> [4, 5, 0]
+ *  Returns a new \Array containing all but the first +n+ element of +self+,
+ *  where +n+ is a non-negative \Integer;
+ *  does not modify +self+.
  *
+ *  Examples:
+ *    a = [0, 1, 2, 3, 4, 5]
+ *    a.drop(0) # => [0, 1, 2, 3, 4, 5]
+ *    a.drop(1) # => [1, 2, 3, 4, 5]
+ *    a.drop(2) # => [2, 3, 4, 5]
  */
 
 static VALUE
@@ -5576,20 +7360,20 @@ rb_ary_drop(VALUE ary, VALUE n)
 
 /*
  *  call-seq:
- *     ary.drop_while { |obj| block }   -> new_ary
- *     ary.drop_while                  -> Enumerator
- *
- *  Drops elements up to, but not including, the first element for which the
- *  block returns +nil+ or +false+ and returns an array containing the
- *  remaining elements.
- *
- *  If no block is given, an Enumerator is returned instead.
- *
- *  See also Array#take_while
+ *    array.drop_while {|element| ... } -> new_array
+ *    array.drop_while -> new_enumerator
+
+ *  Returns a new \Array containing zero or more trailing elements of +self+;
+ *  does not modify +self+.
  *
- *     a = [1, 2, 3, 4, 5, 0]
- *     a.drop_while {|i| i < 3 }   #=> [3, 4, 5, 0]
+ *  With a block given, calls the block with each successive element of +self+;
+ *  stops if the block returns +false+ or +nil+;
+ *  returns a new Array _omitting_ those elements for which the block returned a truthy value:
+ *    a = [0, 1, 2, 3, 4, 5]
+ *    a.drop_while {|element| element < 3 } # => [3, 4, 5]
  *
+ *  With no block given, returns a new \Enumerator:
+ *    [0, 1].drop_while # => # => #<Enumerator: [0, 1]:drop_while>
  */
 
 static VALUE
@@ -5606,20 +7390,53 @@ rb_ary_drop_while(VALUE ary)
 
 /*
  *  call-seq:
- *     ary.any? [{ |obj| block }]   -> true or false
- *
- *  See also Enumerable#any?
+ *    array.any? -> true or false
+ *    array.any? {|element| ... } -> true or false
+ *    array.any?(obj) -> true or false
+ *
+ *  Returns +true+ if any element of +self+ meets a given criterion.
+ *
+ *  With no block given and no argument, returns +true+ if +self+ has any truthy element,
+ *  +false+ otherwise:
+ *    [nil, 0, false].any? # => true
+ *    [nil, false].any? # => false
+ *    [].any? # => false
+ *
+ *  With a block given and no argument, calls the block with each element in +self+;
+ *  returns +true+ if the block returns any truthy value, +false+ otherwise:
+ *    [0, 1, 2].any? {|element| element > 1 } # => true
+ *    [0, 1, 2].any? {|element| element > 2 } # => false
+ *
+ *  If argument +obj+ is given, returns +true+ if +obj+.<tt>===</tt> any element,
+ *  +false+ otherwise:
+ *    ['food', 'drink'].any?(/foo/) # => true
+ *    ['food', 'drink'].any?(/bar/) # => false
+ *    [].any?(/foo/) # => false
+ *    [0, 1, 2].any?(1) # => true
+ *    [0, 1, 2].any?(3) # => false
+ *
+ *  Related: Enumerable#any?
  */
 
 static VALUE
-rb_ary_any_p(VALUE ary)
+rb_ary_any_p(int argc, VALUE *argv, VALUE ary)
 {
     long i, len = RARRAY_LEN(ary);
-    const VALUE *ptr = RARRAY_CONST_PTR(ary);
 
+    rb_check_arity(argc, 0, 1);
     if (!len) return Qfalse;
-    if (!rb_block_given_p()) {
-	for (i = 0; i < len; ++i) if (RTEST(ptr[i])) return Qtrue;
+    if (argc) {
+        if (rb_block_given_p()) {
+            rb_warn("given block not used");
+        }
+	for (i = 0; i < RARRAY_LEN(ary); ++i) {
+	    if (RTEST(rb_funcall(argv[0], idEqq, 1, RARRAY_AREF(ary, i)))) return Qtrue;
+	}
+    }
+    else if (!rb_block_given_p()) {
+        for (i = 0; i < len; ++i) {
+            if (RTEST(RARRAY_AREF(ary, i))) return Qtrue;
+        }
     }
     else {
 	for (i = 0; i < RARRAY_LEN(ary); ++i) {
@@ -5630,22 +7447,208 @@ rb_ary_any_p(VALUE ary)
 }
 
 /*
- * call-seq:
- *   ary.dig(idx, ...)                 -> object
- *
- * Extracts the nested value specified by the sequence of <i>idx</i>
- * objects by calling +dig+ at each step, returning +nil+ if any
- * intermediate step is +nil+.
- *
- *   a = [[1, [2, 3]]]
- *
- *   a.dig(0, 1, 1)                    #=> 3
- *   a.dig(1, 2, 3)                    #=> nil
- *   a.dig(0, 0, 0)                    #=> TypeError: Fixnum does not have #dig method
- *   [42, {foo: :bar}].dig(1, :foo)    #=> :bar
+ *  call-seq:
+ *    array.all? -> true or false
+ *    array.all? {|element| ... } -> true or false
+ *    array.all?(obj) -> true or false
+ *
+ *  Returns +true+ if all elements of +self+ meet a given criterion.
+ *
+ *  With no block given and no argument, returns +true+ if +self+ contains only truthy elements,
+ *  +false+ otherwise:
+ *    [0, 1, :foo].all? # => true
+ *    [0, nil, 2].all? # => false
+ *    [].all? # => true
+ *
+ *  With a block given and no argument, calls the block with each element in +self+;
+ *  returns +true+ if the block returns only truthy values, +false+ otherwise:
+ *    [0, 1, 2].all? { |element| element < 3 } # => true
+ *    [0, 1, 2].all? { |element| element < 2 } # => false
+ *
+ *  If argument +obj+ is given, returns +true+ if <tt>obj.===</tt> every element, +false+ otherwise:
+ *    ['food', 'fool', 'foot'].all?(/foo/) # => true
+ *    ['food', 'drink'].all?(/bar/) # => false
+ *    [].all?(/foo/) # => true
+ *    [0, 0, 0].all?(0) # => true
+ *    [0, 1, 2].all?(1) # => false
+ *
+ *  Related: Enumerable#all?
  */
 
-VALUE
+static VALUE
+rb_ary_all_p(int argc, VALUE *argv, VALUE ary)
+{
+    long i, len = RARRAY_LEN(ary);
+
+    rb_check_arity(argc, 0, 1);
+    if (!len) return Qtrue;
+    if (argc) {
+        if (rb_block_given_p()) {
+            rb_warn("given block not used");
+        }
+        for (i = 0; i < RARRAY_LEN(ary); ++i) {
+            if (!RTEST(rb_funcall(argv[0], idEqq, 1, RARRAY_AREF(ary, i)))) return Qfalse;
+        }
+    }
+    else if (!rb_block_given_p()) {
+        for (i = 0; i < len; ++i) {
+            if (!RTEST(RARRAY_AREF(ary, i))) return Qfalse;
+        }
+    }
+    else {
+        for (i = 0; i < RARRAY_LEN(ary); ++i) {
+            if (!RTEST(rb_yield(RARRAY_AREF(ary, i)))) return Qfalse;
+        }
+    }
+    return Qtrue;
+}
+
+/*
+ *  call-seq:
+ *    array.none? -> true or false
+ *    array.none? {|element| ... } -> true or false
+ *    array.none?(obj) -> true or false
+ *
+ *  Returns +true+ if no element of +self+ meet a given criterion.
+ *
+ *  With no block given and no argument, returns +true+ if +self+ has no truthy elements,
+ *  +false+ otherwise:
+ *    [nil, false].none? # => true
+ *    [nil, 0, false].none? # => false
+ *    [].none? # => true
+ *
+ *  With a block given and no argument, calls the block with each element in +self+;
+ *  returns +true+ if the block returns no truthy value, +false+ otherwise:
+ *    [0, 1, 2].none? {|element| element > 3 } # => true
+ *    [0, 1, 2].none? {|element| element > 1 } # => false
+ *
+ *  If argument +obj+ is given, returns +true+ if <tt>obj.===</tt> no element, +false+ otherwise:
+ *    ['food', 'drink'].none?(/bar/) # => true
+ *    ['food', 'drink'].none?(/foo/) # => false
+ *    [].none?(/foo/) # => true
+ *    [0, 1, 2].none?(3) # => true
+ *    [0, 1, 2].none?(1) # => false
+ *
+ *  Related: Enumerable#none?
+ */
+
+static VALUE
+rb_ary_none_p(int argc, VALUE *argv, VALUE ary)
+{
+    long i, len = RARRAY_LEN(ary);
+
+    rb_check_arity(argc, 0, 1);
+    if (!len) return Qtrue;
+    if (argc) {
+        if (rb_block_given_p()) {
+            rb_warn("given block not used");
+        }
+        for (i = 0; i < RARRAY_LEN(ary); ++i) {
+            if (RTEST(rb_funcall(argv[0], idEqq, 1, RARRAY_AREF(ary, i)))) return Qfalse;
+        }
+    }
+    else if (!rb_block_given_p()) {
+        for (i = 0; i < len; ++i) {
+            if (RTEST(RARRAY_AREF(ary, i))) return Qfalse;
+        }
+    }
+    else {
+        for (i = 0; i < RARRAY_LEN(ary); ++i) {
+            if (RTEST(rb_yield(RARRAY_AREF(ary, i)))) return Qfalse;
+        }
+    }
+    return Qtrue;
+}
+
+/*
+ *  call-seq:
+ *    array.one? -> true or false
+ *    array.one? {|element| ... } -> true or false
+ *    array.one?(obj) -> true or false
+ *
+ *  Returns +true+ if exactly one element of +self+ meets a given criterion.
+ *
+ *  With no block given and no argument, returns +true+ if +self+ has exactly one truthy element,
+ *  +false+ otherwise:
+ *    [nil, 0].one? # => true
+ *    [0, 0].one? # => false
+ *    [nil, nil].one? # => false
+ *    [].one? # => false
+ *
+ *  With a block given and no argument, calls the block with each element in +self+;
+ *  returns +true+ if the block a truthy value for exactly one element, +false+ otherwise:
+ *    [0, 1, 2].one? {|element| element > 0 } # => false
+ *    [0, 1, 2].one? {|element| element > 1 } # => true
+ *    [0, 1, 2].one? {|element| element > 2 } # => false
+ *
+ *  If argument +obj+ is given, returns +true+ if <tt>obj.===</tt> exactly one element,
+ *  +false+ otherwise:
+ *    [0, 1, 2].one?(0) # => true
+ *    [0, 0, 1].one?(0) # => false
+ *    [1, 1, 2].one?(0) # => false
+ *    ['food', 'drink'].one?(/bar/) # => false
+ *    ['food', 'drink'].one?(/foo/) # => true
+ *    [].one?(/foo/) # => false
+ *
+ *  Related: Enumerable#one?
+ */
+
+static VALUE
+rb_ary_one_p(int argc, VALUE *argv, VALUE ary)
+{
+    long i, len = RARRAY_LEN(ary);
+    VALUE result = Qfalse;
+
+    rb_check_arity(argc, 0, 1);
+    if (!len) return Qfalse;
+    if (argc) {
+        if (rb_block_given_p()) {
+            rb_warn("given block not used");
+        }
+        for (i = 0; i < RARRAY_LEN(ary); ++i) {
+            if (RTEST(rb_funcall(argv[0], idEqq, 1, RARRAY_AREF(ary, i)))) {
+                if (result) return Qfalse;
+                result = Qtrue;
+            }
+        }
+    }
+    else if (!rb_block_given_p()) {
+        for (i = 0; i < len; ++i) {
+            if (RTEST(RARRAY_AREF(ary, i))) {
+                if (result) return Qfalse;
+                result = Qtrue;
+            }
+        }
+    }
+    else {
+        for (i = 0; i < RARRAY_LEN(ary); ++i) {
+            if (RTEST(rb_yield(RARRAY_AREF(ary, i)))) {
+                if (result) return Qfalse;
+                result = Qtrue;
+            }
+        }
+    }
+    return result;
+}
+
+/*
+ *  call-seq:
+ *    array.dig(index, *identifiers) -> object
+ *
+ *  Finds and returns the object in nested objects
+ *  that is specified by +index+ and +identifiers+.
+ *  The nested objects may be instances of various classes.
+ *  See {Dig Methods}[rdoc-ref:doc/dig_methods.rdoc].
+ *
+ *  Examples:
+ *    a = [:foo, [:bar, :baz, [:bat, :bam]]]
+ *    a.dig(1) # => [:bar, :baz, [:bat, :bam]]
+ *    a.dig(1, 2) # => [:bat, :bam]
+ *    a.dig(1, 2, 0) # => :bat
+ *    a.dig(1, 2, 3) # => nil
+ */
+
+static VALUE
 rb_ary_dig(int argc, VALUE *argv, VALUE self)
 {
     rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
@@ -5655,45 +7658,51 @@ rb_ary_dig(int argc, VALUE *argv, VALUE self)
     return rb_obj_dig(argc, argv, self, Qnil);
 }
 
+static inline VALUE
+finish_exact_sum(long n, VALUE r, VALUE v, int z)
+{
+    if (n != 0)
+        v = rb_fix_plus(LONG2FIX(n), v);
+    if (r != Qundef) {
+        v = rb_rational_plus(r, v);
+    }
+    else if (!n && z) {
+        v = rb_fix_plus(LONG2FIX(0), v);
+    }
+    return v;
+}
+
 /*
  * call-seq:
- *   ary.sum(init=0)                    -> number
- *   ary.sum(init=0) {|e| expr }        -> number
- *
- * Returns the sum of elements.
- * For example, [e1, e2, e3].sum returns init + e1 + e2 + e3.
- *
- * If a block is given, the block is applied to each element
- * before addition.
- *
- * If <i>ary</i> is empty, it returns <i>init</i>.
- *
- *   [].sum                             #=> 0
- *   [].sum(0.0)                        #=> 0.0
- *   [1, 2, 3].sum                      #=> 6
- *   [3, 5.5].sum                       #=> 8.5
- *   [2.5, 3.0].sum(0.0) {|e| e * e }   #=> 15.25
- *   [Object.new].sum                   #=> TypeError
- *
- * The (arithmetic) mean value of an array can be obtained as follows.
- *
- *   mean = ary.sum(0.0) / ary.length
- *
- * This method can be used for non-numeric objects by
- * explicit <i>init</i> argument.
- *
- *   ["a", "b", "c"].sum("")            #=> "abc"
- *   [[1], [[2]], [3]].sum([])          #=> [1, [2], 3]
- *
- * However, Array#join and Array#flatten is faster than Array#sum.
- *
- *   ["a", "b", "c"].join               #=> "abc"
- *   [[1], [[2]], [3]].flatten(1)       #=> [1, [2], 3]
- *
- *
- * Array#sum method may not respect method redefinition of "+" methods
- * such as Fixnum#+.
- *
+ *   array.sum(init = 0) -> object
+ *   array.sum(init = 0) {|element| ... } -> object
+ *
+ *  When no block is given, returns the object equivalent to:
+ *    sum = init
+ *    array.each {|element| sum += element }
+ *    sum
+ *  For example, <tt>[e1, e2, e3].sum</tt> returns </tt>init + e1 + e2 + e3</tt>.
+ *
+ *  Examples:
+ *    a = [0, 1, 2, 3]
+ *    a.sum # => 6
+ *    a.sum(100) # => 106
+ *
+ *  The elements need not be numeric, but must be <tt>+</tt>-compatible
+ *  with each other and with +init+:
+ *    a = ['abc', 'def', 'ghi']
+ *    a.sum('jkl') # => "jklabcdefghi"
+ *
+ *  When a block is given, it is called with each element
+ *  and the block's return value (instead of the element itself) is used as the addend:
+ *    a = ['zero', 1, :two]
+ *    s = a.sum('Coerced and concatenated: ') {|element| element.to_s }
+ *    s # => "Coerced and concatenated: zero1two"
+ *
+ *  Notes:
+ *  - Array#join and Array#flatten may be faster than Array#sum
+ *    for an \Array of Strings or an \Array of Arrays.
+ *  - Array#sum method may not respect method redefinition of "+" methods such as Integer#+.
  */
 
 static VALUE
@@ -5703,8 +7712,7 @@ rb_ary_sum(int argc, VALUE *argv, VALUE ary)
     long i, n;
     int block_given;
 
-    if (rb_scan_args(argc, argv, "01", &v) == 0)
-        v = LONG2FIX(0);
+    v = (rb_check_arity(argc, 0, 1) ? argv[0] : LONG2FIX(0));
 
     block_given = rb_block_given_p();
 
@@ -5735,41 +7743,24 @@ rb_ary_sum(int argc, VALUE *argv, VALUE ary)
         else
             goto not_exact;
     }
-    if (n != 0)
-        v = rb_fix_plus(LONG2FIX(n), v);
-    if (r != Qundef) {
-        /* r can be a Integer when mathn is loaded */
-        if (FIXNUM_P(r))
-            v = rb_fix_plus(r, v);
-        else if (RB_TYPE_P(r, T_BIGNUM))
-            v = rb_big_plus(r, v);
-        else
-            v = rb_rational_plus(r, v);
-    }
+    v = finish_exact_sum(n, r, v, argc!=0);
     return v;
 
   not_exact:
-    if (n != 0)
-        v = rb_fix_plus(LONG2FIX(n), v);
-    if (r != Qundef) {
-        /* r can be a Integer when mathn is loaded */
-        if (FIXNUM_P(r))
-            v = rb_fix_plus(r, v);
-        else if (RB_TYPE_P(r, T_BIGNUM))
-            v = rb_big_plus(r, v);
-        else
-            v = rb_rational_plus(r, v);
-    }
+    v = finish_exact_sum(n, r, v, i!=0);
 
     if (RB_FLOAT_TYPE_P(e)) {
-        /* Kahan's compensated summation algorithm */
+        /*
+         * Kahan-Babuska balancing compensated summation algorithm
+         * See https://link.springer.com/article/10.1007/s00607-005-0139-x
+         */
         double f, c;
+        double x, t;
 
         f = NUM2DBL(v);
         c = 0.0;
         goto has_float_value;
         for (; i < RARRAY_LEN(ary); i++) {
-            double x, y, t;
             e = RARRAY_AREF(ary, i);
             if (block_given)
                 e = rb_yield(e);
@@ -5785,11 +7776,28 @@ rb_ary_sum(int argc, VALUE *argv, VALUE ary)
             else
                 goto not_float;
 
-            y = x - c;
-            t = f + y;
-            c = (t - f) - y;
+            if (isnan(f)) continue;
+            if (isnan(x)) {
+                f = x;
+                continue;
+            }
+            if (isinf(x)) {
+                if (isinf(f) && signbit(x) != signbit(f))
+                    f = NAN;
+                else
+                    f = x;
+                continue;
+            }
+            if (isinf(f)) continue;
+
+            t = f + x;
+            if (fabs(f) >= fabs(x))
+                c += ((f - t) + x);
+            else
+                c += ((x - t) + f);
             f = t;
         }
+        f += c;
         return DBL2NUM(f);
 
       not_float:
@@ -5807,13 +7815,39 @@ rb_ary_sum(int argc, VALUE *argv, VALUE ary)
     return v;
 }
 
+static VALUE
+rb_ary_deconstruct(VALUE ary)
+{
+    return ary;
+}
+
 /*
- *  Arrays are ordered, integer-indexed collections of any object.
+ *  An \Array is an ordered, integer-indexed collection of objects,
+ *  called _elements_.  Any object may be an \Array element.
+ *
+ *  == \Array Indexes
+ *
+ *  \Array indexing starts at 0, as in C or Java.
+ *
+ *  A positive index is an offset from the first element:
+ *  - Index 0 indicates the first element.
+ *  - Index 1 indicates the second element.
+ *  - ...
+ *
+ *  A negative index is an offset, backwards, from the end of the array:
+ *  - Index -1 indicates the last element.
+ *  - Index -2 indicates the next-to-last element.
+ *  - ...
  *
- *  Array indexing starts at 0, as in C or Java.  A negative index is assumed
- *  to be relative to the end of the array---that is, an index of -1 indicates
- *  the last element of the array, -2 is the next to last element in the
- *  array, and so on.
+ *  A non-negative index is <i>in range</i> if it is smaller than
+ *  the size of the array.  For a 3-element array:
+ *  - Indexes 0 through 2 are in range.
+ *  - Index 3 is out of range.
+ *
+ *  A negative index is <i>in range</i> if its absolute value is
+ *  not larger than the size of the array.  For a 3-element array:
+ *  - Indexes -1 through -3 are in range.
+ *  - Index -4 is out of range.
  *
  *  == Creating Arrays
  *
@@ -5840,11 +7874,12 @@ rb_ary_sum(int argc, VALUE *argv, VALUE ary)
  *  This method is safe to use with mutable objects such as hashes, strings or
  *  other arrays:
  *
- *     Array.new(4) { Hash.new } #=> [{}, {}, {}, {}]
+ *     Array.new(4) {Hash.new}    #=> [{}, {}, {}, {}]
+ *     Array.new(4) {|i| i.to_s } #=> ["0", "1", "2", "3"]
  *
  *  This is also a quick way to build up multi-dimensional arrays:
  *
- *     empty_table = Array.new(3) { Array.new(3) }
+ *     empty_table = Array.new(3) {Array.new(3)}
  *     #=> [[nil, nil, nil], [nil, nil, nil], [nil, nil, nil]]
  *
  *  An array can also be created by using the Array() method, provided by
@@ -5991,7 +8026,7 @@ rb_ary_sum(int argc, VALUE *argv, VALUE ary)
  *  Note that this operation leaves the array unchanged.
  *
  *     arr = [1, 2, 3, 4, 5]
- *     arr.each { |a| print a -= 10, " " }
+ *     arr.each {|a| print a -= 10, " "}
  *     # prints: -9 -8 -7 -6 -5
  *     #=> [1, 2, 3, 4, 5]
  *
@@ -6000,15 +8035,15 @@ rb_ary_sum(int argc, VALUE *argv, VALUE ary)
  *
  *     words = %w[first second third fourth fifth sixth]
  *     str = ""
- *     words.reverse_each { |word| str += "#{word} " }
+ *     words.reverse_each {|word| str += "#{word} "}
  *     p str #=> "sixth fifth fourth third second first "
  *
  *  The #map method can be used to create a new array based on the original
  *  array, but with the values modified by the supplied block:
  *
- *     arr.map { |a| 2*a }   #=> [2, 4, 6, 8, 10]
+ *     arr.map {|a| 2*a}     #=> [2, 4, 6, 8, 10]
  *     arr                   #=> [1, 2, 3, 4, 5]
- *     arr.map! { |a| a**2 } #=> [1, 4, 9, 16, 25]
+ *     arr.map! {|a| a**2}   #=> [1, 4, 9, 16, 25]
  *     arr                   #=> [1, 4, 9, 16, 25]
  *
  *  == Selecting Items from an Array
@@ -6022,9 +8057,9 @@ rb_ary_sum(int argc, VALUE *argv, VALUE ary)
  *  === Non-destructive Selection
  *
  *     arr = [1, 2, 3, 4, 5, 6]
- *     arr.select { |a| a > 3 }     #=> [4, 5, 6]
- *     arr.reject { |a| a < 3 }     #=> [3, 4, 5, 6]
- *     arr.drop_while { |a| a < 4 } #=> [4, 5, 6]
+ *     arr.select {|a| a > 3}       #=> [4, 5, 6]
+ *     arr.reject {|a| a < 3}       #=> [3, 4, 5, 6]
+ *     arr.drop_while {|a| a < 4}   #=> [4, 5, 6]
  *     arr                          #=> [1, 2, 3, 4, 5, 6]
  *
  *  === Destructive Selection
@@ -6035,21 +8070,17 @@ rb_ary_sum(int argc, VALUE *argv, VALUE ary)
  *  Similar to #select vs. #reject, #delete_if and #keep_if have the exact
  *  opposite result when supplied with the same block:
  *
- *     arr.delete_if { |a| a < 4 } #=> [4, 5, 6]
+ *     arr.delete_if {|a| a < 4}   #=> [4, 5, 6]
  *     arr                         #=> [4, 5, 6]
  *
  *     arr = [1, 2, 3, 4, 5, 6]
- *     arr.keep_if { |a| a < 4 } #=> [1, 2, 3]
+ *     arr.keep_if {|a| a < 4}   #=> [1, 2, 3]
  *     arr                       #=> [1, 2, 3]
- *
  */
 
 void
 Init_Array(void)
 {
-#undef rb_intern
-#define rb_intern(str) rb_intern_const(str)
-
     rb_cArray  = rb_define_class("Array", rb_cObject);
     rb_include_module(rb_cArray, rb_mEnumerable);
 
@@ -6064,7 +8095,6 @@ Init_Array(void)
     rb_define_method(rb_cArray, "to_a", rb_ary_to_a, 0);
     rb_define_method(rb_cArray, "to_h", rb_ary_to_h, 0);
     rb_define_method(rb_cArray, "to_ary", rb_ary_to_ary_m, 0);
-    rb_define_method(rb_cArray, "frozen?",  rb_ary_frozen_p, 0);
 
     rb_define_method(rb_cArray, "==", rb_ary_equal, 1);
     rb_define_method(rb_cArray, "eql?", rb_ary_eql, 1);
@@ -6076,18 +8106,23 @@ Init_Array(void)
     rb_define_method(rb_cArray, "fetch", rb_ary_fetch, -1);
     rb_define_method(rb_cArray, "first", rb_ary_first, -1);
     rb_define_method(rb_cArray, "last", rb_ary_last, -1);
-    rb_define_method(rb_cArray, "concat", rb_ary_concat, 1);
+    rb_define_method(rb_cArray, "concat", rb_ary_concat_multi, -1);
+    rb_define_method(rb_cArray, "union", rb_ary_union_multi, -1);
+    rb_define_method(rb_cArray, "difference", rb_ary_difference_multi, -1);
+    rb_define_method(rb_cArray, "intersection", rb_ary_intersection_multi, -1);
     rb_define_method(rb_cArray, "<<", rb_ary_push, 1);
     rb_define_method(rb_cArray, "push", rb_ary_push_m, -1);
+    rb_define_alias(rb_cArray,  "append", "push");
     rb_define_method(rb_cArray, "pop", rb_ary_pop_m, -1);
     rb_define_method(rb_cArray, "shift", rb_ary_shift_m, -1);
     rb_define_method(rb_cArray, "unshift", rb_ary_unshift_m, -1);
+    rb_define_alias(rb_cArray,  "prepend", "unshift");
     rb_define_method(rb_cArray, "insert", rb_ary_insert, -1);
     rb_define_method(rb_cArray, "each", rb_ary_each, 0);
     rb_define_method(rb_cArray, "each_index", rb_ary_each_index, 0);
     rb_define_method(rb_cArray, "reverse_each", rb_ary_reverse_each, 0);
     rb_define_method(rb_cArray, "length", rb_ary_length, 0);
-    rb_define_alias(rb_cArray,  "size", "length");
+    rb_define_method(rb_cArray, "size", rb_ary_length, 0);
     rb_define_method(rb_cArray, "empty?", rb_ary_empty_p, 0);
     rb_define_method(rb_cArray, "find_index", rb_ary_index, -1);
     rb_define_method(rb_cArray, "index", rb_ary_index, -1);
@@ -6106,6 +8141,8 @@ Init_Array(void)
     rb_define_method(rb_cArray, "map!", rb_ary_collect_bang, 0);
     rb_define_method(rb_cArray, "select", rb_ary_select, 0);
     rb_define_method(rb_cArray, "select!", rb_ary_select_bang, 0);
+    rb_define_method(rb_cArray, "filter", rb_ary_select, 0);
+    rb_define_method(rb_cArray, "filter!", rb_ary_select_bang, 0);
     rb_define_method(rb_cArray, "keep_if", rb_ary_keep_if, 0);
     rb_define_method(rb_cArray, "values_at", rb_ary_values_at, -1);
     rb_define_method(rb_cArray, "delete", rb_ary_delete, 1);
@@ -6136,6 +8173,7 @@ Init_Array(void)
 
     rb_define_method(rb_cArray, "max", rb_ary_max, -1);
     rb_define_method(rb_cArray, "min", rb_ary_min, -1);
+    rb_define_method(rb_cArray, "minmax", rb_ary_minmax, 0);
 
     rb_define_method(rb_cArray, "uniq", rb_ary_uniq, 0);
     rb_define_method(rb_cArray, "uniq!", rb_ary_uniq_bang, 0);
@@ -6144,9 +8182,6 @@ Init_Array(void)
     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, "count", rb_ary_count, -1);
-    rb_define_method(rb_cArray, "shuffle!", rb_ary_shuffle_bang, -1);
-    rb_define_method(rb_cArray, "shuffle", rb_ary_shuffle, -1);
-    rb_define_method(rb_cArray, "sample", rb_ary_sample, -1);
     rb_define_method(rb_cArray, "cycle", rb_ary_cycle, -1);
     rb_define_method(rb_cArray, "permutation", rb_ary_permutation, -1);
     rb_define_method(rb_cArray, "combination", rb_ary_combination, 1);
@@ -6160,12 +8195,14 @@ Init_Array(void)
     rb_define_method(rb_cArray, "drop_while", rb_ary_drop_while, 0);
     rb_define_method(rb_cArray, "bsearch", rb_ary_bsearch, 0);
     rb_define_method(rb_cArray, "bsearch_index", rb_ary_bsearch_index, 0);
-    rb_define_method(rb_cArray, "any?", rb_ary_any_p, 0);
+    rb_define_method(rb_cArray, "any?", rb_ary_any_p, -1);
+    rb_define_method(rb_cArray, "all?", rb_ary_all_p, -1);
+    rb_define_method(rb_cArray, "none?", rb_ary_none_p, -1);
+    rb_define_method(rb_cArray, "one?", rb_ary_one_p, -1);
     rb_define_method(rb_cArray, "dig", rb_ary_dig, -1);
     rb_define_method(rb_cArray, "sum", rb_ary_sum, -1);
 
-    id_cmp = rb_intern("<=>");
-    id_random = rb_intern("random");
-    id_div = rb_intern("div");
-    id_power = rb_intern("**");
+    rb_define_method(rb_cArray, "deconstruct", rb_ary_deconstruct, 0);
 }
+
+#include "array.rbinc"
diff --git a/array.rb b/array.rb
new file mode 100644
index 0000000000..a43a3b27b1
--- /dev/null
+++ b/array.rb
@@ -0,0 +1,61 @@
+class Array
+  # call-seq:
+  #    array.shuffle!(random: Random) -> array
+  #
+  # Shuffles the elements of +self+ in place.
+  #    a = [1, 2, 3] #=> [1, 2, 3]
+  #    a.shuffle!    #=> [2, 3, 1]
+  #    a             #=> [2, 3, 1]
+  #
+  # The optional +random+ argument will be used as the random number generator:
+  #    a.shuffle!(random: Random.new(1))  #=> [1, 3, 2]
+  def shuffle!(random: Random)
+    Primitive.rb_ary_shuffle_bang(random)
+  end
+
+  # call-seq:
+  #    array.shuffle(random: Random) -> new_ary
+  #
+  # Returns a new array with elements of +self+ shuffled.
+  #    a = [1, 2, 3] #=> [1, 2, 3]
+  #    a.shuffle     #=> [2, 3, 1]
+  #    a             #=> [1, 2, 3]
+  #
+  # The optional +random+ argument will be used as the random number generator:
+  #    a.shuffle(random: Random.new(1))  #=> [1, 3, 2]
+  def shuffle(random: Random)
+    Primitive.rb_ary_shuffle(random)
+  end
+
+  # call-seq:
+  #    array.sample(random: Random) -> object
+  #    array.sample(n, random: Random) -> new_ary
+  #
+  # Returns random elements from +self+.
+  #
+  # When no arguments are given, returns a random element from +self+:
+  #    a = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
+  #    a.sample # => 3
+  #    a.sample # => 8
+  # If +self+ is empty, returns +nil+.
+  #
+  # When argument +n+ is given, returns a new \Array containing +n+ random
+  # elements from +self+:
+  #    a.sample(3) # => [8, 9, 2]
+  #    a.sample(6) # => [9, 6, 10, 3, 1, 4]
+  # Returns no more than <tt>a.size</tt> elements
+  # (because no new duplicates are introduced):
+  #    a.sample(a.size * 2) # => [6, 4, 1, 8, 5, 9, 10, 2, 3, 7]
+  # But +self+ may contain duplicates:
+  #    a = [1, 1, 1, 2, 2, 3]
+  #    a.sample(a.size * 2) # => [1, 1, 3, 2, 1, 2]
+  # Returns a new empty \Array if +self+ is empty.
+  #
+  # The optional +random+ argument will be used as the random number generator:
+  #    a = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
+  #    a.sample(random: Random.new(1))     #=> 6
+  #    a.sample(4, random: Random.new(1))  #=> [6, 10, 9, 2]
+  def sample(n = (ary = false), random: Random)
+    Primitive.rb_ary_sample(random, n, ary)
+  end
+end
diff --git a/ast.c b/ast.c
new file mode 100644
index 0000000000..2af0b3e530
--- /dev/null
+++ b/ast.c
@@ -0,0 +1,699 @@
+/* indent-tabs-mode: nil */
+#include "internal.h"
+#include "internal/parse.h"
+#include "internal/symbol.h"
+#include "internal/warnings.h"
+#include "iseq.h"
+#include "node.h"
+#include "ruby.h"
+#include "ruby/encoding.h"
+#include "ruby/util.h"
+#include "vm_core.h"
+
+#include "builtin.h"
+
+static VALUE rb_mAST;
+static VALUE rb_cNode;
+
+struct ASTNodeData {
+    rb_ast_t *ast;
+    const NODE *node;
+};
+
+static void
+node_gc_mark(void *ptr)
+{
+    struct ASTNodeData *data = (struct ASTNodeData *)ptr;
+    rb_gc_mark((VALUE)data->ast);
+}
+
+static size_t
+node_memsize(const void *ptr)
+{
+    struct ASTNodeData *data = (struct ASTNodeData *)ptr;
+    return rb_ast_memsize(data->ast);
+}
+
+static const rb_data_type_t rb_node_type = {
+    "AST/node",
+    {node_gc_mark, RUBY_TYPED_DEFAULT_FREE, node_memsize,},
+    0, 0,
+    RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
+static VALUE rb_ast_node_alloc(VALUE klass);
+
+static void
+setup_node(VALUE obj, rb_ast_t *ast, const NODE *node)
+{
+    struct ASTNodeData *data;
+
+    TypedData_Get_Struct(obj, struct ASTNodeData, &rb_node_type, data);
+    data->ast = ast;
+    data->node = node;
+}
+
+static VALUE
+ast_new_internal(rb_ast_t *ast, const NODE *node)
+{
+    VALUE obj;
+
+    obj = rb_ast_node_alloc(rb_cNode);
+    setup_node(obj, ast, node);
+
+    return obj;
+}
+
+static VALUE rb_ast_parse_str(VALUE str);
+static VALUE rb_ast_parse_file(VALUE path);
+static VALUE rb_ast_parse_array(VALUE array);
+
+static VALUE
+ast_parse_new(void)
+{
+    return rb_parser_set_context(rb_parser_new(), NULL, 0);
+}
+
+static VALUE
+ast_parse_done(rb_ast_t *ast)
+{
+    if (!ast->body.root) {
+        rb_ast_dispose(ast);
+        rb_exc_raise(GET_EC()->errinfo);
+    }
+
+    return ast_new_internal(ast, (NODE *)ast->body.root);
+}
+
+static VALUE
+ast_s_parse(rb_execution_context_t *ec, VALUE module, VALUE str)
+{
+    return rb_ast_parse_str(str);
+}
+
+static VALUE
+rb_ast_parse_str(VALUE str)
+{
+    rb_ast_t *ast = 0;
+
+    StringValue(str);
+    ast = rb_parser_compile_string_path(ast_parse_new(), Qnil, str, 1);
+    return ast_parse_done(ast);
+}
+
+static VALUE
+ast_s_parse_file(rb_execution_context_t *ec, VALUE module, VALUE path)
+{
+    return rb_ast_parse_file(path);
+}
+
+static VALUE
+rb_ast_parse_file(VALUE path)
+{
+    VALUE f;
+    rb_ast_t *ast = 0;
+    rb_encoding *enc = rb_utf8_encoding();
+
+    FilePathValue(path);
+    f = rb_file_open_str(path, "r");
+    rb_funcall(f, rb_intern("set_encoding"), 2, rb_enc_from_encoding(enc), rb_str_new_cstr("-"));
+    ast = rb_parser_compile_file_path(ast_parse_new(), Qnil, f, 1);
+    rb_io_close(f);
+    return ast_parse_done(ast);
+}
+
+static VALUE
+lex_array(VALUE array, int index)
+{
+    VALUE str = rb_ary_entry(array, index);
+    if (!NIL_P(str)) {
+        StringValue(str);
+        if (!rb_enc_asciicompat(rb_enc_get(str))) {
+            rb_raise(rb_eArgError, "invalid source encoding");
+        }
+    }
+    return str;
+}
+
+static VALUE
+rb_ast_parse_array(VALUE array)
+{
+    rb_ast_t *ast = 0;
+
+    array = rb_check_array_type(array);
+    ast = rb_parser_compile_generic(ast_parse_new(), lex_array, Qnil, array, 1);
+    return ast_parse_done(ast);
+}
+
+static VALUE node_children(rb_ast_t*, const NODE*);
+
+static VALUE
+node_find(VALUE self, const int node_id)
+{
+    VALUE ary;
+    long i;
+    struct ASTNodeData *data;
+    TypedData_Get_Struct(self, struct ASTNodeData, &rb_node_type, data);
+
+    if (nd_node_id(data->node) == node_id) return self;
+
+    ary = node_children(data->ast, data->node);
+
+    for (i = 0; i < RARRAY_LEN(ary); i++) {
+        VALUE child = RARRAY_AREF(ary, i);
+
+        if (CLASS_OF(child) == rb_cNode) {
+            VALUE result = node_find(child, node_id);
+            if (RTEST(result)) return result;
+        }
+    }
+
+    return Qnil;
+}
+
+extern VALUE rb_e_script;
+
+static VALUE
+script_lines(VALUE path)
+{
+    VALUE hash, lines;
+    ID script_lines;
+    CONST_ID(script_lines, "SCRIPT_LINES__");
+    if (!rb_const_defined_at(rb_cObject, script_lines)) return Qnil;
+    hash = rb_const_get_at(rb_cObject, script_lines);
+    if (!RB_TYPE_P(hash, T_HASH)) return Qnil;
+    lines = rb_hash_lookup(hash, path);
+    if (!RB_TYPE_P(lines, T_ARRAY)) return Qnil;
+    return lines;
+}
+
+static VALUE
+ast_s_of(rb_execution_context_t *ec, VALUE module, VALUE body)
+{
+    VALUE path, node, lines;
+    int node_id;
+    const rb_iseq_t *iseq = NULL;
+
+    if (rb_obj_is_proc(body)) {
+        iseq = vm_proc_iseq(body);
+
+        if (!rb_obj_is_iseq((VALUE)iseq)) {
+            iseq = NULL;
+        }
+    }
+    else {
+        iseq = rb_method_iseq(body);
+    }
+
+    if (!iseq) return Qnil;
+
+    path = rb_iseq_path(iseq);
+    node_id = iseq->body->location.node_id;
+    if (!NIL_P(lines = script_lines(path))) {
+        node = rb_ast_parse_array(lines);
+    }
+    else if (RSTRING_LEN(path) == 2 && memcmp(RSTRING_PTR(path), "-e", 2) == 0) {
+        node = rb_ast_parse_str(rb_e_script);
+    }
+    else {
+        node = rb_ast_parse_file(path);
+    }
+
+    return node_find(node, node_id);
+}
+
+static VALUE
+rb_ast_node_alloc(VALUE klass)
+{
+    struct ASTNodeData *data;
+    VALUE obj = TypedData_Make_Struct(klass, struct ASTNodeData, &rb_node_type, data);
+
+    return obj;
+}
+
+static const char*
+node_type_to_str(const NODE *node)
+{
+    return (ruby_node_name(nd_type(node)) + rb_strlen_lit("NODE_"));
+}
+
+static VALUE
+ast_node_type(rb_execution_context_t *ec, VALUE self)
+{
+    struct ASTNodeData *data;
+    TypedData_Get_Struct(self, struct ASTNodeData, &rb_node_type, data);
+
+    return rb_sym_intern_ascii_cstr(node_type_to_str(data->node));
+}
+
+#define NEW_CHILD(ast, node) node ? ast_new_internal(ast, node) : Qnil
+
+static VALUE
+rb_ary_new_from_node_args(rb_ast_t *ast, long n, ...)
+{
+    va_list ar;
+    VALUE ary;
+    long i;
+
+    ary = rb_ary_new2(n);
+
+    va_start(ar, n);
+    for (i=0; i<n; i++) {
+        NODE *node;
+        node = va_arg(ar, NODE *);
+        rb_ary_push(ary, NEW_CHILD(ast, node));
+    }
+    va_end(ar);
+    return ary;
+}
+
+static VALUE
+dump_block(rb_ast_t *ast, const NODE *node)
+{
+    VALUE ary = rb_ary_new();
+    do {
+        rb_ary_push(ary, NEW_CHILD(ast, node->nd_head));
+    } while (node->nd_next &&
+        nd_type(node->nd_next) == NODE_BLOCK &&
+        (node = node->nd_next, 1));
+    if (node->nd_next) {
+        rb_ary_push(ary, NEW_CHILD(ast, node->nd_next));
+    }
+
+    return ary;
+}
+
+static VALUE
+dump_array(rb_ast_t *ast, const NODE *node)
+{
+    VALUE ary = rb_ary_new();
+    rb_ary_push(ary, NEW_CHILD(ast, node->nd_head));
+
+    while (node->nd_next && nd_type(node->nd_next) == NODE_LIST) {
+        node = node->nd_next;
+        rb_ary_push(ary, NEW_CHILD(ast, node->nd_head));
+    }
+    rb_ary_push(ary, NEW_CHILD(ast, node->nd_next));
+
+    return ary;
+}
+
+static VALUE
+var_name(ID id)
+{
+    if (!id) return Qnil;
+    if (!rb_id2str(id)) return Qnil;
+    return ID2SYM(id);
+}
+
+static VALUE
+no_name_rest(void)
+{
+    ID rest;
+    CONST_ID(rest, "NODE_SPECIAL_NO_NAME_REST");
+    return ID2SYM(rest);
+}
+
+static VALUE
+rest_arg(rb_ast_t *ast, const NODE *rest_arg)
+{
+    return NODE_NAMED_REST_P(rest_arg) ? NEW_CHILD(ast, rest_arg) : no_name_rest();
+}
+
+static VALUE
+node_children(rb_ast_t *ast, const NODE *node)
+{
+    char name[DECIMAL_SIZE_OF_BITS(sizeof(long) * CHAR_BIT) + 2]; /* including '$' */
+
+    enum node_type type = nd_type(node);
+    switch (type) {
+      case NODE_BLOCK:
+        return dump_block(ast, node);
+      case NODE_IF:
+        return rb_ary_new_from_node_args(ast, 3, node->nd_cond, node->nd_body, node->nd_else);
+      case NODE_UNLESS:
+        return rb_ary_new_from_node_args(ast, 3, node->nd_cond, node->nd_body, node->nd_else);
+      case NODE_CASE:
+        return rb_ary_new_from_node_args(ast, 2, node->nd_head, node->nd_body);
+      case NODE_CASE2:
+        return rb_ary_new_from_node_args(ast, 2, node->nd_head, node->nd_body);
+      case NODE_CASE3:
+        return rb_ary_new_from_node_args(ast, 2, node->nd_head, node->nd_body);
+      case NODE_WHEN:
+        return rb_ary_new_from_node_args(ast, 3, node->nd_head, node->nd_body, node->nd_next);
+      case NODE_IN:
+        return rb_ary_new_from_node_args(ast, 3, node->nd_head, node->nd_body, node->nd_next);
+      case NODE_WHILE:
+      case NODE_UNTIL:
+        return rb_ary_push(rb_ary_new_from_node_args(ast, 2, node->nd_cond, node->nd_body),
+                           (node->nd_state ? Qtrue : Qfalse));
+      case NODE_ITER:
+      case NODE_FOR:
+        return rb_ary_new_from_node_args(ast, 2, node->nd_iter, node->nd_body);
+      case NODE_FOR_MASGN:
+        return rb_ary_new_from_node_args(ast, 1, node->nd_var);
+      case NODE_BREAK:
+      case NODE_NEXT:
+      case NODE_RETURN:
+        return rb_ary_new_from_node_args(ast, 1, node->nd_stts);
+      case NODE_REDO:
+        return rb_ary_new_from_node_args(ast, 0);
+      case NODE_RETRY:
+        return rb_ary_new_from_node_args(ast, 0);
+      case NODE_BEGIN:
+        return rb_ary_new_from_node_args(ast, 1, node->nd_body);
+      case NODE_RESCUE:
+        return rb_ary_new_from_node_args(ast, 3, node->nd_head, node->nd_resq, node->nd_else);
+      case NODE_RESBODY:
+        return rb_ary_new_from_node_args(ast, 3, node->nd_args, node->nd_body, node->nd_head);
+      case NODE_ENSURE:
+        return rb_ary_new_from_node_args(ast, 2, node->nd_head, node->nd_ensr);
+      case NODE_AND:
+      case NODE_OR:
+        {
+            VALUE ary = rb_ary_new();
+
+            while (1) {
+                rb_ary_push(ary, NEW_CHILD(ast, node->nd_1st));
+                if (!node->nd_2nd || nd_type(node->nd_2nd) != (int)type)
+                    break;
+                node = node->nd_2nd;
+            }
+            rb_ary_push(ary, NEW_CHILD(ast, node->nd_2nd));
+            return ary;
+        }
+      case NODE_MASGN:
+        if (NODE_NAMED_REST_P(node->nd_args)) {
+            return rb_ary_new_from_node_args(ast, 3, node->nd_value, node->nd_head, node->nd_args);
+        }
+        else {
+            return rb_ary_new_from_args(3, NEW_CHILD(ast, node->nd_value),
+                                        NEW_CHILD(ast, node->nd_head),
+                                        no_name_rest());
+        }
+      case NODE_LASGN:
+      case NODE_DASGN:
+      case NODE_DASGN_CURR:
+      case NODE_IASGN:
+      case NODE_CVASGN:
+      case NODE_GASGN:
+        if (NODE_REQUIRED_KEYWORD_P(node)) {
+            return rb_ary_new_from_args(2, var_name(node->nd_vid), ID2SYM(rb_intern("NODE_SPECIAL_REQUIRED_KEYWORD")));
+        }
+        return rb_ary_new_from_args(2, var_name(node->nd_vid), NEW_CHILD(ast, node->nd_value));
+      case NODE_CDECL:
+        if (node->nd_vid) {
+            return rb_ary_new_from_args(2, ID2SYM(node->nd_vid), NEW_CHILD(ast, node->nd_value));
+        }
+        return rb_ary_new_from_args(3, NEW_CHILD(ast, node->nd_else), ID2SYM(node->nd_else->nd_mid), NEW_CHILD(ast, node->nd_value));
+      case NODE_OP_ASGN1:
+        return rb_ary_new_from_args(4, NEW_CHILD(ast, node->nd_recv),
+                                    ID2SYM(node->nd_mid),
+                                    NEW_CHILD(ast, node->nd_args->nd_head),
+                                    NEW_CHILD(ast, node->nd_args->nd_body));
+      case NODE_OP_ASGN2:
+        return rb_ary_new_from_args(5, NEW_CHILD(ast, node->nd_recv),
+                                    node->nd_next->nd_aid ? Qtrue : Qfalse,
+                                    ID2SYM(node->nd_next->nd_vid),
+                                    ID2SYM(node->nd_next->nd_mid),
+                                    NEW_CHILD(ast, node->nd_value));
+      case NODE_OP_ASGN_AND:
+        return rb_ary_new_from_args(3, NEW_CHILD(ast, node->nd_head), ID2SYM(idANDOP),
+                                    NEW_CHILD(ast, node->nd_value));
+      case NODE_OP_ASGN_OR:
+        return rb_ary_new_from_args(3, NEW_CHILD(ast, node->nd_head), ID2SYM(idOROP),
+                                    NEW_CHILD(ast, node->nd_value));
+      case NODE_OP_CDECL:
+        return rb_ary_new_from_args(3, NEW_CHILD(ast, node->nd_head),
+                                    ID2SYM(node->nd_aid),
+                                    NEW_CHILD(ast, node->nd_value));
+      case NODE_CALL:
+      case NODE_OPCALL:
+      case NODE_QCALL:
+        return rb_ary_new_from_args(3, NEW_CHILD(ast, node->nd_recv),
+                                    ID2SYM(node->nd_mid),
+                                    NEW_CHILD(ast, node->nd_args));
+      case NODE_FCALL:
+        return rb_ary_new_from_args(2, ID2SYM(node->nd_mid),
+                                    NEW_CHILD(ast, node->nd_args));
+      case NODE_VCALL:
+        return rb_ary_new_from_args(1, ID2SYM(node->nd_mid));
+      case NODE_SUPER:
+        return rb_ary_new_from_node_args(ast, 1, node->nd_args);
+      case NODE_ZSUPER:
+        return rb_ary_new_from_node_args(ast, 0);
+      case NODE_LIST:
+      case NODE_VALUES:
+        return dump_array(ast, node);
+      case NODE_ZLIST:
+        return rb_ary_new_from_node_args(ast, 0);
+      case NODE_HASH:
+        return rb_ary_new_from_node_args(ast, 1, node->nd_head);
+      case NODE_YIELD:
+        return rb_ary_new_from_node_args(ast, 1, node->nd_head);
+      case NODE_LVAR:
+      case NODE_DVAR:
+        return rb_ary_new_from_args(1, var_name(node->nd_vid));
+      case NODE_IVAR:
+      case NODE_CONST:
+      case NODE_CVAR:
+      case NODE_GVAR:
+        return rb_ary_new_from_args(1, ID2SYM(node->nd_vid));
+      case NODE_NTH_REF:
+        snprintf(name, sizeof(name), "$%ld", node->nd_nth);
+        return rb_ary_new_from_args(1, ID2SYM(rb_intern(name)));
+      case NODE_BACK_REF:
+        name[0] = '$';
+        name[1] = (char)node->nd_nth;
+        name[2] = '\0';
+        return rb_ary_new_from_args(1, ID2SYM(rb_intern(name)));
+      case NODE_MATCH2:
+        if (node->nd_args) {
+            return rb_ary_new_from_node_args(ast, 3, node->nd_recv, node->nd_value, node->nd_args);
+        }
+        return rb_ary_new_from_node_args(ast, 2, node->nd_recv, node->nd_value);
+      case NODE_MATCH3:
+        return rb_ary_new_from_node_args(ast, 2, node->nd_recv, node->nd_value);
+      case NODE_MATCH:
+      case NODE_LIT:
+      case NODE_STR:
+      case NODE_XSTR:
+        return rb_ary_new_from_args(1, node->nd_lit);
+      case NODE_ONCE:
+        return rb_ary_new_from_node_args(ast, 1, node->nd_body);
+      case NODE_DSTR:
+      case NODE_DXSTR:
+      case NODE_DREGX:
+      case NODE_DSYM:
+        {
+            NODE *n = node->nd_next;
+            VALUE head = Qnil, next = Qnil;
+            if (n) {
+                head = NEW_CHILD(ast, n->nd_head);
+                next = NEW_CHILD(ast, n->nd_next);
+            }
+            return rb_ary_new_from_args(3, node->nd_lit, head, next);
+        }
+      case NODE_EVSTR:
+        return rb_ary_new_from_node_args(ast, 1, node->nd_body);
+      case NODE_ARGSCAT:
+        return rb_ary_new_from_node_args(ast, 2, node->nd_head, node->nd_body);
+      case NODE_ARGSPUSH:
+        return rb_ary_new_from_node_args(ast, 2, node->nd_head, node->nd_body);
+      case NODE_SPLAT:
+        return rb_ary_new_from_node_args(ast, 1, node->nd_head);
+      case NODE_BLOCK_PASS:
+        return rb_ary_new_from_node_args(ast, 2, node->nd_head, node->nd_body);
+      case NODE_DEFN:
+        return rb_ary_new_from_args(2, ID2SYM(node->nd_mid), NEW_CHILD(ast, node->nd_defn));
+      case NODE_DEFS:
+        return rb_ary_new_from_args(3, NEW_CHILD(ast, node->nd_recv), ID2SYM(node->nd_mid), NEW_CHILD(ast, node->nd_defn));
+      case NODE_ALIAS:
+        return rb_ary_new_from_node_args(ast, 2, node->nd_1st, node->nd_2nd);
+      case NODE_VALIAS:
+        return rb_ary_new_from_args(2, ID2SYM(node->nd_alias), ID2SYM(node->nd_orig));
+      case NODE_UNDEF:
+        return rb_ary_new_from_node_args(ast, 1, node->nd_undef);
+      case NODE_CLASS:
+        return rb_ary_new_from_node_args(ast, 3, node->nd_cpath, node->nd_super, node->nd_body);
+      case NODE_MODULE:
+        return rb_ary_new_from_node_args(ast, 2, node->nd_cpath, node->nd_body);
+      case NODE_SCLASS:
+        return rb_ary_new_from_node_args(ast, 2, node->nd_recv, node->nd_body);
+      case NODE_COLON2:
+        return rb_ary_new_from_args(2, NEW_CHILD(ast, node->nd_head), ID2SYM(node->nd_mid));
+      case NODE_COLON3:
+        return rb_ary_new_from_args(1, ID2SYM(node->nd_mid));
+      case NODE_DOT2:
+      case NODE_DOT3:
+      case NODE_FLIP2:
+      case NODE_FLIP3:
+        return rb_ary_new_from_node_args(ast, 2, node->nd_beg, node->nd_end);
+      case NODE_SELF:
+        return rb_ary_new_from_node_args(ast, 0);
+      case NODE_NIL:
+        return rb_ary_new_from_node_args(ast, 0);
+      case NODE_TRUE:
+        return rb_ary_new_from_node_args(ast, 0);
+      case NODE_FALSE:
+        return rb_ary_new_from_node_args(ast, 0);
+      case NODE_ERRINFO:
+        return rb_ary_new_from_node_args(ast, 0);
+      case NODE_DEFINED:
+        return rb_ary_new_from_node_args(ast, 1, node->nd_head);
+      case NODE_POSTEXE:
+        return rb_ary_new_from_node_args(ast, 1, node->nd_body);
+      case NODE_ATTRASGN:
+        return rb_ary_new_from_args(3, NEW_CHILD(ast, node->nd_recv), ID2SYM(node->nd_mid), NEW_CHILD(ast, node->nd_args));
+      case NODE_LAMBDA:
+        return rb_ary_new_from_node_args(ast, 1, node->nd_body);
+      case NODE_OPT_ARG:
+        return rb_ary_new_from_node_args(ast, 2, node->nd_body, node->nd_next);
+      case NODE_KW_ARG:
+        return rb_ary_new_from_node_args(ast, 2, node->nd_body, node->nd_next);
+      case NODE_POSTARG:
+        if (NODE_NAMED_REST_P(node->nd_1st)) {
+            return rb_ary_new_from_node_args(ast, 2, node->nd_1st, node->nd_2nd);
+        }
+        return rb_ary_new_from_args(2, no_name_rest(),
+                                    NEW_CHILD(ast, node->nd_2nd));
+      case NODE_ARGS:
+        {
+            struct rb_args_info *ainfo = node->nd_ainfo;
+            return rb_ary_new_from_args(10,
+                                        INT2NUM(ainfo->pre_args_num),
+                                        NEW_CHILD(ast, ainfo->pre_init),
+                                        NEW_CHILD(ast, ainfo->opt_args),
+                                        var_name(ainfo->first_post_arg),
+                                        INT2NUM(ainfo->post_args_num),
+                                        NEW_CHILD(ast, ainfo->post_init),
+                                        (ainfo->rest_arg == NODE_SPECIAL_EXCESSIVE_COMMA
+                                            ? ID2SYM(rb_intern("NODE_SPECIAL_EXCESSIVE_COMMA"))
+                                            : var_name(ainfo->rest_arg)),
+                                        (ainfo->no_kwarg ? Qfalse : NEW_CHILD(ast, ainfo->kw_args)),
+                                        (ainfo->no_kwarg ? Qfalse : NEW_CHILD(ast, ainfo->kw_rest_arg)),
+                                        var_name(ainfo->block_arg));
+        }
+      case NODE_SCOPE:
+        {
+            ID *tbl = node->nd_tbl;
+            int i, size = tbl ? (int)*tbl++ : 0;
+            VALUE locals = rb_ary_new_capa(size);
+            for (i = 0; i < size; i++) {
+                rb_ary_push(locals, var_name(tbl[i]));
+            }
+            return rb_ary_new_from_args(3, locals, NEW_CHILD(ast, node->nd_args), NEW_CHILD(ast, node->nd_body));
+        }
+      case NODE_ARYPTN:
+        {
+            struct rb_ary_pattern_info *apinfo = node->nd_apinfo;
+            VALUE rest = rest_arg(ast, apinfo->rest_arg);
+            return rb_ary_new_from_args(4,
+                                        NEW_CHILD(ast, node->nd_pconst),
+                                        NEW_CHILD(ast, apinfo->pre_args),
+                                        rest,
+                                        NEW_CHILD(ast, apinfo->post_args));
+        }
+      case NODE_FNDPTN:
+        {
+            struct rb_fnd_pattern_info *fpinfo = node->nd_fpinfo;
+            VALUE pre_rest = rest_arg(ast, fpinfo->pre_rest_arg);
+            VALUE post_rest = rest_arg(ast, fpinfo->post_rest_arg);
+            return rb_ary_new_from_args(4,
+                                        NEW_CHILD(ast, node->nd_pconst),
+                                        pre_rest,
+                                        NEW_CHILD(ast, fpinfo->args),
+                                        post_rest);
+        }
+      case NODE_HSHPTN:
+        {
+            VALUE kwrest = node->nd_pkwrestarg == NODE_SPECIAL_NO_REST_KEYWORD ? ID2SYM(rb_intern("NODE_SPECIAL_NO_REST_KEYWORD")) :
+                                                                                 NEW_CHILD(ast, node->nd_pkwrestarg);
+
+            return rb_ary_new_from_args(3,
+                                        NEW_CHILD(ast, node->nd_pconst),
+                                        NEW_CHILD(ast, node->nd_pkwargs),
+                                        kwrest);
+        }
+      case NODE_ARGS_AUX:
+      case NODE_LAST:
+        break;
+    }
+
+    rb_bug("node_children: unknown node: %s", ruby_node_name(type));
+}
+
+static VALUE
+ast_node_children(rb_execution_context_t *ec, VALUE self)
+{
+    struct ASTNodeData *data;
+    TypedData_Get_Struct(self, struct ASTNodeData, &rb_node_type, data);
+
+    return node_children(data->ast, data->node);
+}
+
+static VALUE
+ast_node_first_lineno(rb_execution_context_t *ec, VALUE self)
+{
+    struct ASTNodeData *data;
+    TypedData_Get_Struct(self, struct ASTNodeData, &rb_node_type, data);
+
+    return INT2NUM(nd_first_lineno(data->node));
+}
+
+static VALUE
+ast_node_first_column(rb_execution_context_t *ec, VALUE self)
+{
+    struct ASTNodeData *data;
+    TypedData_Get_Struct(self, struct ASTNodeData, &rb_node_type, data);
+
+    return INT2NUM(nd_first_column(data->node));
+}
+
+static VALUE
+ast_node_last_lineno(rb_execution_context_t *ec, VALUE self)
+{
+    struct ASTNodeData *data;
+    TypedData_Get_Struct(self, struct ASTNodeData, &rb_node_type, data);
+
+    return INT2NUM(nd_last_lineno(data->node));
+}
+
+static VALUE
+ast_node_last_column(rb_execution_context_t *ec, VALUE self)
+{
+    struct ASTNodeData *data;
+    TypedData_Get_Struct(self, struct ASTNodeData, &rb_node_type, data);
+
+    return INT2NUM(nd_last_column(data->node));
+}
+
+static VALUE
+ast_node_inspect(rb_execution_context_t *ec, VALUE self)
+{
+    VALUE str;
+    VALUE cname;
+    struct ASTNodeData *data;
+    TypedData_Get_Struct(self, struct ASTNodeData, &rb_node_type, data);
+
+    cname = rb_class_path(rb_obj_class(self));
+    str = rb_str_new2("#<");
+
+    rb_str_append(str, cname);
+    rb_str_catf(str, ":%s@%d:%d-%d:%d>",
+                node_type_to_str(data->node),
+                nd_first_lineno(data->node), nd_first_column(data->node),
+                nd_last_lineno(data->node), nd_last_column(data->node));
+
+    return str;
+}
+
+#include "ast.rbinc"
+
+void
+Init_ast(void)
+{
+    rb_mAST = rb_define_module_under(rb_cRubyVM, "AbstractSyntaxTree");
+    rb_cNode = rb_define_class_under(rb_mAST, "Node", rb_cObject);
+    rb_undef_alloc_func(rb_cNode);
+}
diff --git a/ast.rb b/ast.rb
new file mode 100644
index 0000000000..34fa645671
--- /dev/null
+++ b/ast.rb
@@ -0,0 +1,146 @@
+# for ast.c
+
+class RubyVM
+
+  # AbstractSyntaxTree provides methods to parse Ruby code into
+  # abstract syntax trees. The nodes in the tree
+  # are instances of RubyVM::AbstractSyntaxTree::Node.
+  #
+  # This module is MRI specific as it exposes implementation details
+  # of the MRI abstract syntax tree.
+  #
+  # This module is experimental and its API is not stable, therefore it might
+  # change without notice. As examples, the order of children nodes is not
+  # guaranteed, the number of children nodes might change, there is no way to
+  # access children nodes by name, etc.
+  #
+  # If you are looking for a stable API or an API working under multiple Ruby
+  # implementations, consider using the _parser_ gem or Ripper. If you would
+  # like to make RubyVM::AbstractSyntaxTree stable, please join the discussion
+  # at https://bugs.ruby-lang.org/issues/14844.
+  #
+  module AbstractSyntaxTree
+
+    #  call-seq:
+    #     RubyVM::AbstractSyntaxTree.parse(string) -> RubyVM::AbstractSyntaxTree::Node
+    #
+    #  Parses the given _string_ into an abstract syntax tree,
+    #  returning the root node of that tree.
+    #
+    #  SyntaxError is raised if the given _string_ is invalid syntax.
+    #
+    #    RubyVM::AbstractSyntaxTree.parse("x = 1 + 2")
+    #    # => #<RubyVM::AbstractSyntaxTree::Node:SCOPE@1:0-1:9>
+    def self.parse string
+      Primitive.ast_s_parse string
+    end
+
+    #  call-seq:
+    #     RubyVM::AbstractSyntaxTree.parse_file(pathname) -> RubyVM::AbstractSyntaxTree::Node
+    #
+    #   Reads the file from _pathname_, then parses it like ::parse,
+    #   returning the root node of the abstract syntax tree.
+    #
+    #   SyntaxError is raised if _pathname_'s contents are not
+    #   valid Ruby syntax.
+    #
+    #     RubyVM::AbstractSyntaxTree.parse_file("my-app/app.rb")
+    #     # => #<RubyVM::AbstractSyntaxTree::Node:SCOPE@1:0-31:3>
+    def self.parse_file pathname
+      Primitive.ast_s_parse_file pathname
+    end
+
+    #  call-seq:
+    #     RubyVM::AbstractSyntaxTree.of(proc)   -> RubyVM::AbstractSyntaxTree::Node
+    #     RubyVM::AbstractSyntaxTree.of(method) -> RubyVM::AbstractSyntaxTree::Node
+    #
+    #   Returns AST nodes of the given _proc_ or _method_.
+    #
+    #     RubyVM::AbstractSyntaxTree.of(proc {1 + 2})
+    #     # => #<RubyVM::AbstractSyntaxTree::Node:SCOPE@1:35-1:42>
+    #
+    #     def hello
+    #       puts "hello, world"
+    #     end
+    #
+    #     RubyVM::AbstractSyntaxTree.of(method(:hello))
+    #     # => #<RubyVM::AbstractSyntaxTree::Node:SCOPE@1:0-3:3>
+    def self.of body
+      Primitive.ast_s_of body
+    end
+
+    # RubyVM::AbstractSyntaxTree::Node instances are created by parse methods in
+    # RubyVM::AbstractSyntaxTree.
+    #
+    # This class is MRI specific.
+    #
+    class Node
+
+      #  call-seq:
+      #     node.type -> symbol
+      #
+      #  Returns the type of this node as a symbol.
+      #
+      #    root = RubyVM::AbstractSyntaxTree.parse("x = 1 + 2")
+      #    root.type # => :SCOPE
+      #    lasgn = root.children[2]
+      #    lasgn.type # => :LASGN
+      #    call = lasgn.children[1]
+      #    call.type # => :OPCALL
+      def type
+        Primitive.ast_node_type
+      end
+
+      #  call-seq:
+      #     node.first_lineno -> integer
+      #
+      #  The line number in the source code where this AST's text began.
+      def first_lineno
+        Primitive.ast_node_first_lineno
+      end
+
+      #  call-seq:
+      #     node.first_column -> integer
+      #
+      #  The column number in the source code where this AST's text began.
+      def first_column
+        Primitive.ast_node_first_column
+      end
+
+      #  call-seq:
+      #     node.last_lineno -> integer
+      #
+      #  The line number in the source code where this AST's text ended.
+      def last_lineno
+        Primitive.ast_node_last_lineno
+      end
+
+      #  call-seq:
+      #     node.last_column -> integer
+      #
+      #  The column number in the source code where this AST's text ended.
+      def last_column
+        Primitive.ast_node_last_column
+      end
+
+      #  call-seq:
+      #     node.children -> array
+      #
+      #  Returns AST nodes under this one.  Each kind of node
+      #  has different children, depending on what kind of node it is.
+      #
+      #  The returned array may contain other nodes or <code>nil</code>.
+      def children
+        Primitive.ast_node_children
+      end
+
+      #  call-seq:
+      #     node.inspect -> string
+      #
+      #  Returns debugging information about this node as a string.
+      def inspect
+        Primitive.ast_node_inspect
+      end
+    end
+  end
+end
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000000..44a1922cb0
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+PWD=
+case "$0" in
+*/*) srcdir=`dirname $0`;;
+*) srcdir="";;
+esac
+
+exec ${AUTORECONF:-autoreconf} --install --symlink "$@" ${srcdir:+"$srcdir"}
diff --git a/basictest/runner.rb b/basictest/runner.rb
index 3a60036ffa..0f398e7acc 100755
--- a/basictest/runner.rb
+++ b/basictest/runner.rb
@@ -17,6 +17,9 @@ $stderr.reopen($stdout)
 error = ''
 
 srcdir = File.expand_path('..', File.dirname(__FILE__))
+if env = ENV["RUBYOPT"]
+  ENV["RUBYOPT"] = env + " -W1"
+end
 `#{ruby} #{opt} -W1 #{srcdir}/basictest/test.rb #{ARGV.join(' ')}`.each_line do |line|
   if line =~ /^end of test/
     print "\ntest succeeded\n"
diff --git a/basictest/test.rb b/basictest/test.rb
index 0ba4503faa..52008b78db 100644..100755
--- a/basictest/test.rb
+++ b/basictest/test.rb
@@ -35,7 +35,7 @@ class Progress
       # dircolors-like style
       colors = (colors = ENV['TEST_COLORS']) ? Hash[colors.scan(/(\w+)=([^:\n]*)/)] : {}
       begin
-        File.read(File.join(__dir__, "../test/colors")).scan(/(\w+)=([^:\n]*)/) do |n, c|
+        File.read(File.join(__dir__, "../tool/colors")).scan(/(\w+)=([^:\n]*)/) do |n, c|
           colors[n] ||= c
         end
       rescue
@@ -984,13 +984,6 @@ test_ok($z == 0)
 
 test_check "iterator"
 
-test_ok(!iterator?)
-
-def ttt
-  test_ok(iterator?)
-end
-ttt{}
-
 # yield at top level
 test_ok(!defined?(yield))
 
@@ -1432,9 +1425,6 @@ marity_test(:test_ok)
 marity_test(:marity_test)
 marity_test(:p)
 
-lambda(&method(:test_ok)).call(true)
-lambda(&block_get{|a,n| test_ok(a,n)}).call(true, 2)
-
 class ITER_TEST1
    def a
      block_given?
@@ -1739,7 +1729,7 @@ a = nil
 test_ok(defined?(a))
 test_ok(a == nil)
 
-# multiple asignment
+# multiple assignment
 a, b = 1, 2
 test_ok(a == 1 && b == 2)
 
@@ -1860,11 +1850,9 @@ $bad=false
 eval 'while false; $bad = true; print "foo\n" end'
 test_ok(!$bad)
 
-test_ok(eval('TRUE'))
+test_ok(eval('Object'))
 test_ok(eval('true'))
-test_ok(!eval('NIL'))
 test_ok(!eval('nil'))
-test_ok(!eval('FALSE'))
 test_ok(!eval('false'))
 
 $foo = 'test_ok(true)'
@@ -2149,7 +2137,7 @@ $_ = foobar
 test_ok($_ == foobar)
 
 class Gods
-  @@rule = "Uranus"		# private to Gods
+  @@rule = "Uranus"
   def ruler0
     @@rule
   end
@@ -2172,7 +2160,7 @@ module Olympians
 end
 
 class Titans < Gods
-  @@rule = "Cronus"		# do not affect @@rule in Gods
+  @@rule = "Cronus"		# modifies @@rule in Gods
   include Olympians
   def ruler4
     @@rule
@@ -2187,7 +2175,14 @@ test_ok(Titans.ruler2 == "Cronus")
 atlas = Titans.new
 test_ok(atlas.ruler0 == "Cronus")
 test_ok(atlas.ruler3 == "Zeus")
-test_ok(atlas.ruler4 == "Cronus")
+begin
+  atlas.ruler4
+rescue RuntimeError => e
+  test_ok(e.message.include?("class variable @@rule of Olympians is overtaken by Gods"))
+else
+  test_ok(false)
+end
+test_ok(atlas.ruler3 == "Zeus")
 
 test_check "trace"
 $x = 1234
@@ -2244,11 +2239,11 @@ test_check "alias"
 class Alias0
   def foo; "foo" end
 end
-class Alias1<Alias0
+class Alias1 < Alias0
   alias bar foo
   def foo; "foo+" + super end
 end
-class Alias2<Alias1
+class Alias2 < Alias1
   alias baz foo
   undef foo
 end
@@ -2260,7 +2255,7 @@ test_ok(x.baz == "foo+foo")
 # test_check for cache
 test_ok(x.baz == "foo+foo")
 
-class Alias3<Alias2
+class Alias3 < Alias2
   def foo
     defined? super
   end
diff --git a/benchmark/README.md b/benchmark/README.md
new file mode 100644
index 0000000000..39a5aa139b
--- /dev/null
+++ b/benchmark/README.md
@@ -0,0 +1,72 @@
+# ruby/benchmark
+
+This directory has benchmark definitions to be run with
+[benchmark\_driver.gem](https://github.com/benchmark-driver/benchmark-driver).
+
+## Normal usage
+
+Execute `gem install benchmark_driver` and run a command like:
+
+```bash
+# Run a benchmark script with the ruby in the $PATH
+benchmark-driver benchmark/app_fib.rb
+
+# Run benchmark scripts with multiple Ruby executables or options
+benchmark-driver benchmark/*.rb -e /path/to/ruby -e '/path/to/ruby --jit'
+
+# Or compare Ruby versions managed by rbenv
+benchmark-driver benchmark/*.rb --rbenv '2.5.1;2.6.0-preview2 --jit'
+
+# You can collect many metrics in many ways
+benchmark-driver benchmark/*.rb --runner memory --output markdown
+
+# Some are defined with YAML for complex setup or accurate measurement
+benchmark-driver benchmark/*.yml
+```
+
+See also:
+
+```console
+Usage: benchmark-driver [options] RUBY|YAML...
+    -r, --runner TYPE                Specify runner type: ips, time, memory, once (default: ips)
+    -o, --output TYPE                Specify output type: compare, simple, markdown, record (default: compare)
+    -e, --executables EXECS          Ruby executables (e1::path1 arg1; e2::path2 arg2;...)
+        --rbenv VERSIONS             Ruby executables in rbenv (x.x.x arg1;y.y.y arg2;...)
+        --repeat-count NUM           Try benchmark NUM times and use the fastest result or the worst memory usage
+        --repeat-result TYPE         Yield "best", "average" or "worst" result with --repeat-count (default: best)
+        --bundler                    Install and use gems specified in Gemfile
+        --filter REGEXP              Filter out benchmarks with given regexp
+        --run-duration SECONDS       Warmup estimates loop_count to run for this duration (default: 3)
+    -v, --verbose                    Verbose mode. Multiple -v options increase visilibity (max: 2)
+```
+
+## make benchmark
+
+Using `make benchmark`, `make update-benchmark-driver` automatically downloads
+the supported version of benchmark\_driver, and it runs benchmarks with the downloaded
+benchmark\_driver.
+
+```bash
+# Run all benchmarks with the ruby in the $PATH and the built ruby
+make benchmark
+
+# Or compare with specific ruby binary
+make benchmark COMPARE_RUBY="/path/to/ruby --jit"
+
+# Run vm benchmarks
+make benchmark ITEM=vm
+
+# Run some limited benchmarks in ITEM-matched files
+make benchmark ITEM=vm OPTS=--filter=block
+
+# You can specify the benchmark by an exact filename instead of using the default argument:
+# ARGS = $$(find $(srcdir)/benchmark -maxdepth 1 -name '*$(ITEM)*.yml' -o -name '*$(ITEM)*.rb')
+make benchmark ARGS=benchmark/erb_render.yml
+
+# You can specify any option via $OPTS
+make benchmark OPTS="--help"
+
+# With `make benchmark`, some special runner plugins are available:
+#   -r peak, -r size, -r total, -r utime, -r stime, -r cutime, -r cstime
+make benchmark ITEM=vm_bigarray OPTS="-r peak"
+```
diff --git a/benchmark/bm_app_answer.rb b/benchmark/app_answer.rb
index 3cd8a8fd37..3cd8a8fd37 100644
--- a/benchmark/bm_app_answer.rb
+++ b/benchmark/app_answer.rb
diff --git a/benchmark/app_aobench.rb b/benchmark/app_aobench.rb
new file mode 100644
index 0000000000..16296af12b
--- /dev/null
+++ b/benchmark/app_aobench.rb
@@ -0,0 +1,297 @@
+# coding: US-ASCII
+
+# AO render benchmark
+# Original program (C) Syoyo Fujita in Javascript (and other languages)
+#      https://code.google.com/p/aobench/
+# Ruby(yarv2llvm) version by Hideki Miura
+#
+
+IMAGE_WIDTH = 256
+IMAGE_HEIGHT = 256
+NSUBSAMPLES = 2
+NAO_SAMPLES = 8
+
+srand(0)
+
+class Vec
+  def initialize(x, y, z)
+    @x = x
+    @y = y
+    @z = z
+  end
+
+  attr_accessor :x, :y, :z
+
+  def vadd(b)
+    Vec.new(@x + b.x, @y + b.y, @z + b.z)
+  end
+
+  def vsub(b)
+    Vec.new(@x - b.x, @y - b.y, @z - b.z)
+  end
+
+  def vcross(b)
+    Vec.new(@y * b.z - @z * b.y,
+            @z * b.x - @x * b.z,
+            @x * b.y - @y * b.x)
+  end
+
+  def vdot(b)
+    @x * b.x + @y * b.y + @z * b.z
+  end
+
+  def vlength
+    Math.sqrt(@x * @x + @y * @y + @z * @z)
+  end
+
+  def vnormalize
+    len = vlength
+    v = Vec.new(@x, @y, @z)
+    if len > 1.0e-17 then
+      v.x = v.x / len
+      v.y = v.y / len
+      v.z = v.z / len
+    end
+    v
+  end
+end
+
+
+class Sphere
+  def initialize(center, radius)
+    @center = center
+    @radius = radius
+  end
+
+  attr_reader :center, :radius
+
+  def intersect(ray, isect)
+    rs = ray.org.vsub(@center)
+    b = rs.vdot(ray.dir)
+    c = rs.vdot(rs) - (@radius * @radius)
+    d = b * b - c
+    if d > 0.0 then
+      t = - b - Math.sqrt(d)
+
+      if t > 0.0 and t < isect.t then
+        isect.t = t
+        isect.hit = true
+        isect.pl = Vec.new(ray.org.x + ray.dir.x * t,
+                          ray.org.y + ray.dir.y * t,
+                          ray.org.z + ray.dir.z * t)
+        n = isect.pl.vsub(@center)
+        isect.n = n.vnormalize
+      else
+        0.0
+      end
+    end
+    nil
+  end
+end
+
+class Plane
+  def initialize(p, n)
+    @p = p
+    @n = n
+  end
+
+  def intersect(ray, isect)
+    d = -@p.vdot(@n)
+    v = ray.dir.vdot(@n)
+    v0 = v
+    if v < 0.0 then
+      v0 = -v
+    end
+    if v0 < 1.0e-17 then
+      return
+    end
+
+    t = -(ray.org.vdot(@n) + d) / v
+
+    if t > 0.0 and t < isect.t then
+      isect.hit = true
+      isect.t = t
+      isect.n = @n
+      isect.pl = Vec.new(ray.org.x + t * ray.dir.x,
+                        ray.org.y + t * ray.dir.y,
+                        ray.org.z + t * ray.dir.z)
+    end
+    nil
+  end
+end
+
+class Ray
+  def initialize(org, dir)
+    @org = org
+    @dir = dir
+  end
+
+  attr_accessor :org, :dir
+end
+
+class Isect
+  def initialize
+    @t = 10000000.0
+    @hit = false
+    @pl = Vec.new(0.0, 0.0, 0.0)
+    @n = Vec.new(0.0, 0.0, 0.0)
+  end
+
+  attr_accessor :t, :hit, :pl, :n
+end
+
+def clamp(f)
+  i = f * 255.5
+  if i > 255.0 then
+    i = 255.0
+  end
+  if i < 0.0 then
+    i = 0.0
+  end
+  i.to_i
+end
+
+def otherBasis(basis, n)
+  basis[2] = Vec.new(n.x, n.y, n.z)
+  basis[1] = Vec.new(0.0, 0.0, 0.0)
+
+  if n.x < 0.6 and n.x > -0.6 then
+    basis[1].x = 1.0
+  elsif n.y < 0.6 and n.y > -0.6 then
+    basis[1].y = 1.0
+  elsif n.z < 0.6 and n.z > -0.6 then
+    basis[1].z = 1.0
+  else
+    basis[1].x = 1.0
+  end
+
+  basis[0] = basis[1].vcross(basis[2])
+  basis[0] = basis[0].vnormalize
+
+  basis[1] = basis[2].vcross(basis[0])
+  basis[1] = basis[1].vnormalize
+end
+
+class Scene
+  def initialize
+    @spheres = Array.new
+    @spheres[0] = Sphere.new(Vec.new(-2.0, 0.0, -3.5), 0.5)
+    @spheres[1] = Sphere.new(Vec.new(-0.5, 0.0, -3.0), 0.5)
+    @spheres[2] = Sphere.new(Vec.new(1.0, 0.0, -2.2), 0.5)
+    @plane = Plane.new(Vec.new(0.0, -0.5, 0.0), Vec.new(0.0, 1.0, 0.0))
+  end
+
+  def ambient_occlusion(isect)
+    basis = Array.new
+    otherBasis(basis, isect.n)
+
+    ntheta    = NAO_SAMPLES
+    nphi      = NAO_SAMPLES
+    eps       = 0.0001
+    occlusion = 0.0
+
+    p0 = Vec.new(isect.pl.x + eps * isect.n.x,
+                isect.pl.y + eps * isect.n.y,
+                isect.pl.z + eps * isect.n.z)
+    nphi.times do |j|
+      ntheta.times do |i|
+        r = rand
+        phi = 2.0 * 3.14159265 * rand
+        x = Math.cos(phi) * Math.sqrt(1.0 - r)
+        y = Math.sin(phi) * Math.sqrt(1.0 - r)
+        z = Math.sqrt(r)
+
+        rx = x * basis[0].x + y * basis[1].x + z * basis[2].x
+        ry = x * basis[0].y + y * basis[1].y + z * basis[2].y
+        rz = x * basis[0].z + y * basis[1].z + z * basis[2].z
+
+        raydir = Vec.new(rx, ry, rz)
+        ray = Ray.new(p0, raydir)
+
+        occisect = Isect.new
+        @spheres[0].intersect(ray, occisect)
+        @spheres[1].intersect(ray, occisect)
+        @spheres[2].intersect(ray, occisect)
+        @plane.intersect(ray, occisect)
+        if occisect.hit then
+          occlusion = occlusion + 1.0
+        else
+          0.0
+        end
+      end
+    end
+
+    occlusion = (ntheta.to_f * nphi.to_f - occlusion) / (ntheta.to_f * nphi.to_f)
+
+    Vec.new(occlusion, occlusion, occlusion)
+  end
+
+  def render(w, h, nsubsamples)
+    cnt = 0
+    nsf = nsubsamples.to_f
+    h.times do |y|
+      w.times do |x|
+        rad = Vec.new(0.0, 0.0, 0.0)
+
+        # Subsampling
+        nsubsamples.times do |v|
+          nsubsamples.times do |u|
+
+            cnt = cnt + 1
+            wf = w.to_f
+            hf = h.to_f
+            xf = x.to_f
+            yf = y.to_f
+            uf = u.to_f
+            vf = v.to_f
+
+            px = (xf + (uf / nsf) - (wf / 2.0)) / (wf / 2.0)
+            py = -(yf + (vf / nsf) - (hf / 2.0)) / (hf / 2.0)
+
+            eye = Vec.new(px, py, -1.0).vnormalize
+
+            ray = Ray.new(Vec.new(0.0, 0.0, 0.0), eye)
+
+            isect = Isect.new
+            @spheres[0].intersect(ray, isect)
+            @spheres[1].intersect(ray, isect)
+            @spheres[2].intersect(ray, isect)
+            @plane.intersect(ray, isect)
+            if isect.hit then
+              col = ambient_occlusion(isect)
+              rad.x = rad.x + col.x
+              rad.y = rad.y + col.y
+              rad.z = rad.z + col.z
+            end
+          end
+        end
+
+        r = rad.x / (nsf * nsf)
+        g = rad.y / (nsf * nsf)
+        b = rad.z / (nsf * nsf)
+        printf("%c", clamp(r))
+        printf("%c", clamp(g))
+        printf("%c", clamp(b))
+      end
+      nil
+    end
+
+    nil
+  end
+end
+
+alias printf_orig printf
+def printf *args
+  # $fp.printf(*args)
+end
+
+# File.open("ao.ppm", "w") do |fp|
+  # $fp = fp
+  printf("P6\n")
+  printf("%d %d\n", IMAGE_WIDTH, IMAGE_HEIGHT)
+  printf("255\n")
+  Scene.new.render(IMAGE_WIDTH, IMAGE_HEIGHT, NSUBSAMPLES)
+# end
+
+undef printf
+alias printf printf_orig
diff --git a/benchmark/app_erb.yml b/benchmark/app_erb.yml
new file mode 100644
index 0000000000..31e29b7644
--- /dev/null
+++ b/benchmark/app_erb.yml
@@ -0,0 +1,23 @@
+#
+# Create many HTML strings with ERB.
+#
+prelude: |
+  require 'erb'
+
+  data = <<erb
+  <html>
+    <head> <%= title %> </head>
+    <body>
+      <h1> <%= title %> </h1>
+      <p>
+        <%= content %>
+      </p>
+    </body>
+  </html>
+  erb
+
+  title = "hello world!"
+  content = "hello world!\n" * 10
+benchmark:
+  app_erb: ERB.new(data).result(binding)
+loop_count: 15000
diff --git a/benchmark/bm_app_factorial.rb b/benchmark/app_factorial.rb
index 45f471dfdb..45f471dfdb 100644
--- a/benchmark/bm_app_factorial.rb
+++ b/benchmark/app_factorial.rb
diff --git a/benchmark/bm_app_fib.rb b/benchmark/app_fib.rb
index 34a7b2e725..34a7b2e725 100644
--- a/benchmark/bm_app_fib.rb
+++ b/benchmark/app_fib.rb
diff --git a/benchmark/bm_app_lc_fizzbuzz.rb b/benchmark/app_lc_fizzbuzz.rb
index f09574bbeb..f09574bbeb 100644
--- a/benchmark/bm_app_lc_fizzbuzz.rb
+++ b/benchmark/app_lc_fizzbuzz.rb
diff --git a/benchmark/bm_app_mandelbrot.rb b/benchmark/app_mandelbrot.rb
index 801b75e8e2..801b75e8e2 100644
--- a/benchmark/bm_app_mandelbrot.rb
+++ b/benchmark/app_mandelbrot.rb
diff --git a/benchmark/app_pentomino.rb b/benchmark/app_pentomino.rb
new file mode 100644
index 0000000000..47be7b203f
--- /dev/null
+++ b/benchmark/app_pentomino.rb
@@ -0,0 +1,130 @@
+#!/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)
diff --git a/benchmark/bm_app_raise.rb b/benchmark/app_raise.rb
index 5db8f95d50..5db8f95d50 100644
--- a/benchmark/bm_app_raise.rb
+++ b/benchmark/app_raise.rb
diff --git a/benchmark/bm_app_strconcat.rb b/benchmark/app_strconcat.rb
index 7eed7c1aed..7eed7c1aed 100644
--- a/benchmark/bm_app_strconcat.rb
+++ b/benchmark/app_strconcat.rb
diff --git a/benchmark/bm_app_tak.rb b/benchmark/app_tak.rb
index efe5380f4e..efe5380f4e 100644
--- a/benchmark/bm_app_tak.rb
+++ b/benchmark/app_tak.rb
diff --git a/benchmark/bm_app_tarai.rb b/benchmark/app_tarai.rb
index 4c146f5ccf..4c146f5ccf 100644
--- a/benchmark/bm_app_tarai.rb
+++ b/benchmark/app_tarai.rb
diff --git a/benchmark/bm_app_uri.rb b/benchmark/app_uri.rb
index 586edfd5dc..586edfd5dc 100644
--- a/benchmark/bm_app_uri.rb
+++ b/benchmark/app_uri.rb
diff --git a/benchmark/array_flatten.yml b/benchmark/array_flatten.yml
new file mode 100644
index 0000000000..88ef544ba0
--- /dev/null
+++ b/benchmark/array_flatten.yml
@@ -0,0 +1,19 @@
+prelude: |
+  small_flat_ary = 5.times.to_a
+  large_flat_ary = 100.times.to_a
+  small_pairs_ary = [[1, 2]] * 5
+  large_pairs_ary = [[1, 2]] * 100
+  mostly_flat_ary = 100.times.to_a.push([101, 102])
+
+benchmark:
+  small_flat_ary.flatten: small_flat_ary.flatten
+  small_flat_ary.flatten!: small_flat_ary.flatten!
+  large_flat_ary.flatten: large_flat_ary.flatten
+  large_flat_ary.flatten!: large_flat_ary.flatten!
+  small_pairs_ary.flatten: small_pairs_ary.flatten
+  small_pairs_ary.flatten!: small_pairs_ary.dup.flatten!
+  large_pairs_ary.flatten: large_pairs_ary.flatten
+  large_pairs_ary.flatten!: large_pairs_ary.dup.flatten!
+  mostly_flat_ary.flatten: mostly_flat_ary.flatten
+  mostly_flat_ary.flatten!: mostly_flat_ary.dup.flatten!
+loop_count: 10000
diff --git a/benchmark/array_intersection.yml b/benchmark/array_intersection.yml
new file mode 100644
index 0000000000..26705323fd
--- /dev/null
+++ b/benchmark/array_intersection.yml
@@ -0,0 +1,14 @@
+prelude: |
+  small1 = [1, 2, 3]
+  small2 = [1, 2, 3, 4, 5]
+  small3 = [2, 3, 4, 5]
+  small4 = [2]
+  big1 = [1, 2, 3, 4] * 64
+  big2 = [1, 2, 3] * 64
+  big3 = [1, 2] * 64
+
+benchmark:
+  small-&: small1 & small2 & small3 & small4
+  small-intersection: small1.intersection(small2, small3, small4)
+  big-&: big1 & big2 & big3
+  big-intersection: big1.intersection(big2, big3)
diff --git a/benchmark/array_max_float.yml b/benchmark/array_max_float.yml
new file mode 100644
index 0000000000..ace1ae2e14
--- /dev/null
+++ b/benchmark/array_max_float.yml
@@ -0,0 +1,30 @@
+prelude: |
+  ary2 = 2.times.map(&:to_f).shuffle
+  ary10 = 10.times.map(&:to_f).shuffle
+  ary100 = 100.times.map(&:to_f).shuffle
+  ary500 = 500.times.map(&:to_f).shuffle
+  ary1000 = 1000.times.map(&:to_f).shuffle
+  ary2000 = 2500.times.map(&:to_f).shuffle
+  ary3000 = 2500.times.map(&:to_f).shuffle
+  ary5000 = 5000.times.map(&:to_f).shuffle
+  ary10000 = 10000.times.map(&:to_f).shuffle
+  ary20000 = 20000.times.map(&:to_f).shuffle
+  ary50000 = 50000.times.map(&:to_f).shuffle
+  ary100000 = 100000.times.map(&:to_f).shuffle
+
+benchmark:
+  ary2.max: ary2.max
+  ary10.max: ary10.max
+  ary100.max: ary100.max
+  ary500.max: ary500.max
+  ary1000.max: ary1000.max
+  ary2000.max: ary2000.max
+  ary3000.max: ary3000.max
+  ary5000.max: ary5000.max
+  ary10000.max: ary10000.max
+  ary20000.max: ary20000.max
+  ary50000.max: ary50000.max
+  ary100000.max: ary100000.max
+
+loop_count: 10000
+
diff --git a/benchmark/array_max_int.yml b/benchmark/array_max_int.yml
new file mode 100644
index 0000000000..acd83684d0
--- /dev/null
+++ b/benchmark/array_max_int.yml
@@ -0,0 +1,31 @@
+prelude: |
+  ary2 = 2.times.to_a.shuffle
+  ary10 = 10.times.to_a.shuffle
+  ary100 = 100.times.to_a.shuffle
+  ary500 = 500.times.to_a.shuffle
+  ary1000 = 1000.times.to_a.shuffle
+  ary2000 = 2500.times.to_a.shuffle
+  ary3000 = 2500.times.to_a.shuffle
+  ary5000 = 5000.times.to_a.shuffle
+  ary10000 = 10000.times.to_a.shuffle
+  ary20000 = 20000.times.to_a.shuffle
+  ary50000 = 50000.times.to_a.shuffle
+  ary100000 = 100000.times.to_a.shuffle
+  ary1000000 = 1000000.times.to_a.shuffle
+
+benchmark:
+  ary2.max: ary2.max
+  ary10.max: ary10.max
+  ary100.max: ary100.max
+  ary500.max: ary500.max
+  ary1000.max: ary1000.max
+  ary2000.max: ary2000.max
+  ary3000.max: ary3000.max
+  ary5000.max: ary5000.max
+  ary10000.max: ary10000.max
+  ary20000.max: ary20000.max
+  ary50000.max: ary50000.max
+  ary100000.max: ary100000.max
+  ary1000000.max: ary1000000.max
+
+loop_count: 10000
diff --git a/benchmark/array_max_str.yml b/benchmark/array_max_str.yml
new file mode 100644
index 0000000000..2aeed010f2
--- /dev/null
+++ b/benchmark/array_max_str.yml
@@ -0,0 +1,30 @@
+prelude: |
+  ary2 = 2.times.map(&:to_s).shuffle
+  ary10 = 10.times.map(&:to_s).shuffle
+  ary100 = 100.times.map(&:to_s).shuffle
+  ary500 = 500.times.map(&:to_s).shuffle
+  ary1000 = 1000.times.map(&:to_s).shuffle
+  ary2000 = 2500.times.map(&:to_s).shuffle
+  ary3000 = 2500.times.map(&:to_s).shuffle
+  ary5000 = 5000.times.map(&:to_s).shuffle
+  ary10000 = 10000.times.map(&:to_s).shuffle
+  ary20000 = 20000.times.map(&:to_s).shuffle
+  ary50000 = 50000.times.map(&:to_s).shuffle
+  ary100000 = 100000.times.map(&:to_s).shuffle
+
+benchmark:
+  ary2.max: ary2.max
+  ary10.max: ary10.max
+  ary100.max: ary100.max
+  ary500.max: ary500.max
+  ary1000.max: ary1000.max
+  ary2000.max: ary2000.max
+  ary3000.max: ary3000.max
+  ary5000.max: ary5000.max
+  ary10000.max: ary10000.max
+  ary20000.max: ary20000.max
+  ary50000.max: ary50000.max
+  ary100000.max: ary100000.max
+
+loop_count: 10000
+
diff --git a/benchmark/array_min.yml b/benchmark/array_min.yml
new file mode 100644
index 0000000000..53e5072b14
--- /dev/null
+++ b/benchmark/array_min.yml
@@ -0,0 +1,31 @@
+prelude: |
+  ary2 = 2.times.to_a.shuffle
+  ary10 = 10.times.to_a.shuffle
+  ary100 = 100.times.to_a.shuffle
+  ary500 = 500.times.to_a.shuffle
+  ary1000 = 1000.times.to_a.shuffle
+  ary2000 = 2500.times.to_a.shuffle
+  ary3000 = 2500.times.to_a.shuffle
+  ary5000 = 5000.times.to_a.shuffle
+  ary10000 = 10000.times.to_a.shuffle
+  ary20000 = 20000.times.to_a.shuffle
+  ary50000 = 50000.times.to_a.shuffle
+  ary100000 = 100000.times.to_a.shuffle
+  ary1000000 = 1000000.times.to_a.shuffle
+
+benchmark:
+  ary2.min: ary2.min
+  ary10.min: ary10.min
+  ary100.min: ary100.min
+  ary500.min: ary500.min
+  ary1000.min: ary1000.min
+  ary2000.min: ary2000.min
+  ary3000.min: ary3000.min
+  ary5000.min: ary5000.min
+  ary10000.min: ary10000.min
+  ary20000.min: ary20000.min
+  ary50000.min: ary50000.min
+  ary100000.min: ary100000.min
+  ary1000000.min: ary1000000.min
+
+loop_count: 10000
diff --git a/benchmark/array_sample_100k_10.rb b/benchmark/array_sample_100k_10.rb
new file mode 100644
index 0000000000..5f41ecc32b
--- /dev/null
+++ b/benchmark/array_sample_100k_10.rb
@@ -0,0 +1,2 @@
+arr = [*0...100000]
+10_000.times {arr.sample 10}
diff --git a/benchmark/array_sample_100k_11.rb b/benchmark/array_sample_100k_11.rb
new file mode 100644
index 0000000000..18b1715319
--- /dev/null
+++ b/benchmark/array_sample_100k_11.rb
@@ -0,0 +1,2 @@
+arr = [*0...100000]
+10_000.times {arr.sample 11}
diff --git a/benchmark/array_sample_100k__100.rb b/benchmark/array_sample_100k__100.rb
new file mode 100644
index 0000000000..22863afe89
--- /dev/null
+++ b/benchmark/array_sample_100k__100.rb
@@ -0,0 +1,2 @@
+arr = [*0...100000]
+10_000.times {arr.sample 100}
diff --git a/benchmark/array_sample_100k__1k.rb b/benchmark/array_sample_100k__1k.rb
new file mode 100644
index 0000000000..4cd79e6c67
--- /dev/null
+++ b/benchmark/array_sample_100k__1k.rb
@@ -0,0 +1,2 @@
+arr = [*0...100000]
+10_000.times {arr.sample 1000}
diff --git a/benchmark/array_sample_100k__6k.rb b/benchmark/array_sample_100k__6k.rb
new file mode 100644
index 0000000000..b3d264249e
--- /dev/null
+++ b/benchmark/array_sample_100k__6k.rb
@@ -0,0 +1,2 @@
+arr = [*0...100000]
+10_000.times {arr.sample 6000}
diff --git a/benchmark/array_sample_100k___10k.rb b/benchmark/array_sample_100k___10k.rb
new file mode 100644
index 0000000000..5dd55ec058
--- /dev/null
+++ b/benchmark/array_sample_100k___10k.rb
@@ -0,0 +1,2 @@
+arr = [*0...100000]
+10_000.times {arr.sample 10_000}
diff --git a/benchmark/array_sample_100k___50k.rb b/benchmark/array_sample_100k___50k.rb
new file mode 100644
index 0000000000..1506732c3c
--- /dev/null
+++ b/benchmark/array_sample_100k___50k.rb
@@ -0,0 +1,2 @@
+arr = [*0...100000]
+10_000.times {arr.sample 50_000}
diff --git a/benchmark/bm_array_shift.rb b/benchmark/array_shift.rb
index 798bb9e3f4..798bb9e3f4 100644
--- a/benchmark/bm_array_shift.rb
+++ b/benchmark/array_shift.rb
diff --git a/benchmark/array_small_and.rb b/benchmark/array_small_and.rb
new file mode 100644
index 0000000000..e53a6edae6
--- /dev/null
+++ b/benchmark/array_small_and.rb
@@ -0,0 +1,17 @@
+MIN_SIZE = ENV.fetch('SMALL_ARRAY_MIN', 0).to_i
+MAX_SIZE = ENV.fetch('SMALL_ARRAY_MAX', 16).to_i
+ITERATIONS = ENV.fetch('SMALL_ARRAY_ITERATIONS', 100).to_i
+
+ARRAYS = (MIN_SIZE..MAX_SIZE).map do |size1|
+  (MIN_SIZE..MAX_SIZE).map do |size2|
+    [Array.new(size1) { rand(MAX_SIZE) }, Array.new(size2) { rand(MAX_SIZE) }]
+  end
+end
+
+ITERATIONS.times do
+  ARRAYS.each do |group|
+    group.each do |arr1, arr2|
+      arr1 & arr2
+    end
+  end
+end
diff --git a/benchmark/array_small_diff.rb b/benchmark/array_small_diff.rb
new file mode 100644
index 0000000000..9661ee48db
--- /dev/null
+++ b/benchmark/array_small_diff.rb
@@ -0,0 +1,17 @@
+MIN_SIZE = ENV.fetch('SMALL_ARRAY_MIN', 0).to_i
+MAX_SIZE = ENV.fetch('SMALL_ARRAY_MAX', 16).to_i
+ITERATIONS = ENV.fetch('SMALL_ARRAY_ITERATIONS', 100).to_i
+
+ARRAYS = (MIN_SIZE..MAX_SIZE).map do |size1|
+  (MIN_SIZE..MAX_SIZE).map do |size2|
+    [Array.new(size1) { rand(MAX_SIZE) }, Array.new(size2) { rand(MAX_SIZE) }]
+  end
+end
+
+ITERATIONS.times do
+  ARRAYS.each do |group|
+    group.each do |arr1, arr2|
+      arr1 - arr2
+    end
+  end
+end
diff --git a/benchmark/array_small_or.rb b/benchmark/array_small_or.rb
new file mode 100644
index 0000000000..c58b5fd1ff
--- /dev/null
+++ b/benchmark/array_small_or.rb
@@ -0,0 +1,17 @@
+MIN_SIZE = ENV.fetch('SMALL_ARRAY_MIN', 0).to_i
+MAX_SIZE = ENV.fetch('SMALL_ARRAY_MAX', 16).to_i
+ITERATIONS = ENV.fetch('SMALL_ARRAY_ITERATIONS', 100).to_i
+
+ARRAYS = (MIN_SIZE..MAX_SIZE).map do |size1|
+  (MIN_SIZE..MAX_SIZE).map do |size2|
+    [Array.new(size1) { rand(MAX_SIZE) }, Array.new(size2) { rand(MAX_SIZE) }]
+  end
+end
+
+ITERATIONS.times do
+  ARRAYS.each do |group|
+    group.each do |arr1, arr2|
+      arr1 | arr2
+    end
+  end
+end
diff --git a/benchmark/array_sort_block.rb b/benchmark/array_sort_block.rb
new file mode 100644
index 0000000000..3579786056
--- /dev/null
+++ b/benchmark/array_sort_block.rb
@@ -0,0 +1,2 @@
+ary = Array.new(1000) { rand(1000) }
+10000.times { ary.sort { |a, b| a <=> b } }
diff --git a/benchmark/array_sort_float.rb b/benchmark/array_sort_float.rb
new file mode 100644
index 0000000000..9a6e2f8bd2
--- /dev/null
+++ b/benchmark/array_sort_float.rb
@@ -0,0 +1,2 @@
+arr = Array.new(1000) { rand }
+10000.times { arr.sort }
diff --git a/benchmark/array_values_at_int.rb b/benchmark/array_values_at_int.rb
new file mode 100644
index 0000000000..6cb394cb9f
--- /dev/null
+++ b/benchmark/array_values_at_int.rb
@@ -0,0 +1,2 @@
+ary = Array.new(10000) {|i| i}
+100000.times { ary.values_at(500) }
diff --git a/benchmark/array_values_at_range.rb b/benchmark/array_values_at_range.rb
new file mode 100644
index 0000000000..5b53806d1c
--- /dev/null
+++ b/benchmark/array_values_at_range.rb
@@ -0,0 +1,2 @@
+ary = Array.new(10000) {|i| i}
+100000.times { ary.values_at(1..2000) }
diff --git a/benchmark/bighash.rb b/benchmark/bighash.rb
new file mode 100644
index 0000000000..e2ad5a5c94
--- /dev/null
+++ b/benchmark/bighash.rb
@@ -0,0 +1 @@
+h = {}; 5000000.times {|n| h[n] = n }
diff --git a/benchmark/bm_app_aobench.rb b/benchmark/bm_app_aobench.rb
deleted file mode 100644
index 2bd6acfaf8..0000000000
--- a/benchmark/bm_app_aobench.rb
+++ /dev/null
@@ -1,291 +0,0 @@
-# AO render benchmark
-# Original program (C) Syoyo Fujita in Javascript (and other languages)
-#      https://code.google.com/p/aobench/
-# Ruby(yarv2llvm) version by Hideki Miura
-#
-
-IMAGE_WIDTH = 256
-IMAGE_HEIGHT = 256
-NSUBSAMPLES = 2
-NAO_SAMPLES = 8
-
-class Vec
-  def initialize(x, y, z)
-    @x = x
-    @y = y
-    @z = z
-  end
-
-  attr_accessor :x, :y, :z
-
-  def vadd(b)
-    Vec.new(@x + b.x, @y + b.y, @z + b.z)
-  end
-
-  def vsub(b)
-    Vec.new(@x - b.x, @y - b.y, @z - b.z)
-  end
-
-  def vcross(b)
-    Vec.new(@y * b.z - @z * b.y,
-            @z * b.x - @x * b.z,
-            @x * b.y - @y * b.x)
-  end
-
-  def vdot(b)
-    @x * b.x + @y * b.y + @z * b.z
-  end
-
-  def vlength
-    Math.sqrt(@x * @x + @y * @y + @z * @z)
-  end
-
-  def vnormalize
-    len = vlength
-    v = Vec.new(@x, @y, @z)
-    if len > 1.0e-17 then
-      v.x = v.x / len
-      v.y = v.y / len
-      v.z = v.z / len
-    end
-    v
-  end
-end
-
-
-class Sphere
-  def initialize(center, radius)
-    @center = center
-    @radius = radius
-  end
-
-  attr_reader :center, :radius
-
-  def intersect(ray, isect)
-    rs = ray.org.vsub(@center)
-    b = rs.vdot(ray.dir)
-    c = rs.vdot(rs) - (@radius * @radius)
-    d = b * b - c
-    if d > 0.0 then
-      t = - b - Math.sqrt(d)
-
-      if t > 0.0 and t < isect.t then
-        isect.t = t
-        isect.hit = true
-        isect.pl = Vec.new(ray.org.x + ray.dir.x * t,
-                          ray.org.y + ray.dir.y * t,
-                          ray.org.z + ray.dir.z * t)
-        n = isect.pl.vsub(@center)
-        isect.n = n.vnormalize
-      else
-        0.0
-      end
-    end
-    nil
-  end
-end
-
-class Plane
-  def initialize(p, n)
-    @p = p
-    @n = n
-  end
-
-  def intersect(ray, isect)
-    d = -@p.vdot(@n)
-    v = ray.dir.vdot(@n)
-    v0 = v
-    if v < 0.0 then
-      v0 = -v
-    end
-    if v0 < 1.0e-17 then
-      return
-    end
-
-    t = -(ray.org.vdot(@n) + d) / v
-
-    if t > 0.0 and t < isect.t then
-      isect.hit = true
-      isect.t = t
-      isect.n = @n
-      isect.pl = Vec.new(ray.org.x + t * ray.dir.x,
-                        ray.org.y + t * ray.dir.y,
-                        ray.org.z + t * ray.dir.z)
-    end
-    nil
-  end
-end
-
-class Ray
-  def initialize(org, dir)
-    @org = org
-    @dir = dir
-  end
-
-  attr_accessor :org, :dir
-end
-
-class Isect
-  def initialize
-    @t = 10000000.0
-    @hit = false
-    @pl = Vec.new(0.0, 0.0, 0.0)
-    @n = Vec.new(0.0, 0.0, 0.0)
-  end
-
-  attr_accessor :t, :hit, :pl, :n
-end
-
-def clamp(f)
-  i = f * 255.5
-  if i > 255.0 then
-    i = 255.0
-  end
-  if i < 0.0 then
-    i = 0.0
-  end
-  i.to_i
-end
-
-def otherBasis(basis, n)
-  basis[2] = Vec.new(n.x, n.y, n.z)
-  basis[1] = Vec.new(0.0, 0.0, 0.0)
-
-  if n.x < 0.6 and n.x > -0.6 then
-    basis[1].x = 1.0
-  elsif n.y < 0.6 and n.y > -0.6 then
-    basis[1].y = 1.0
-  elsif n.z < 0.6 and n.z > -0.6 then
-    basis[1].z = 1.0
-  else
-    basis[1].x = 1.0
-  end
-
-  basis[0] = basis[1].vcross(basis[2])
-  basis[0] = basis[0].vnormalize
-
-  basis[1] = basis[2].vcross(basis[0])
-  basis[1] = basis[1].vnormalize
-end
-
-class Scene
-  def initialize
-    @spheres = Array.new
-    @spheres[0] = Sphere.new(Vec.new(-2.0, 0.0, -3.5), 0.5)
-    @spheres[1] = Sphere.new(Vec.new(-0.5, 0.0, -3.0), 0.5)
-    @spheres[2] = Sphere.new(Vec.new(1.0, 0.0, -2.2), 0.5)
-    @plane = Plane.new(Vec.new(0.0, -0.5, 0.0), Vec.new(0.0, 1.0, 0.0))
-  end
-
-  def ambient_occlusion(isect)
-    basis = Array.new
-    otherBasis(basis, isect.n)
-
-    ntheta    = NAO_SAMPLES
-    nphi      = NAO_SAMPLES
-    eps       = 0.0001
-    occlusion = 0.0
-
-    p0 = Vec.new(isect.pl.x + eps * isect.n.x,
-                isect.pl.y + eps * isect.n.y,
-                isect.pl.z + eps * isect.n.z)
-    nphi.times do |j|
-      ntheta.times do |i|
-        r = rand
-        phi = 2.0 * 3.14159265 * rand
-        x = Math.cos(phi) * Math.sqrt(1.0 - r)
-        y = Math.sin(phi) * Math.sqrt(1.0 - r)
-        z = Math.sqrt(r)
-
-        rx = x * basis[0].x + y * basis[1].x + z * basis[2].x
-        ry = x * basis[0].y + y * basis[1].y + z * basis[2].y
-        rz = x * basis[0].z + y * basis[1].z + z * basis[2].z
-
-        raydir = Vec.new(rx, ry, rz)
-        ray = Ray.new(p0, raydir)
-
-        occisect = Isect.new
-        @spheres[0].intersect(ray, occisect)
-        @spheres[1].intersect(ray, occisect)
-        @spheres[2].intersect(ray, occisect)
-        @plane.intersect(ray, occisect)
-        if occisect.hit then
-          occlusion = occlusion + 1.0
-        else
-          0.0
-        end
-      end
-    end
-
-    occlusion = (ntheta.to_f * nphi.to_f - occlusion) / (ntheta.to_f * nphi.to_f)
-
-    Vec.new(occlusion, occlusion, occlusion)
-  end
-
-  def render(w, h, nsubsamples)
-    cnt = 0
-    nsf = nsubsamples.to_f
-    h.times do |y|
-      w.times do |x|
-        rad = Vec.new(0.0, 0.0, 0.0)
-
-        # Subsampling
-        nsubsamples.times do |v|
-          nsubsamples.times do |u|
-
-            cnt = cnt + 1
-            wf = w.to_f
-            hf = h.to_f
-            xf = x.to_f
-            yf = y.to_f
-            uf = u.to_f
-            vf = v.to_f
-
-            px = (xf + (uf / nsf) - (wf / 2.0)) / (wf / 2.0)
-            py = -(yf + (vf / nsf) - (hf / 2.0)) / (hf / 2.0)
-
-            eye = Vec.new(px, py, -1.0).vnormalize
-
-            ray = Ray.new(Vec.new(0.0, 0.0, 0.0), eye)
-
-            isect = Isect.new
-            @spheres[0].intersect(ray, isect)
-            @spheres[1].intersect(ray, isect)
-            @spheres[2].intersect(ray, isect)
-            @plane.intersect(ray, isect)
-            if isect.hit then
-              col = ambient_occlusion(isect)
-              rad.x = rad.x + col.x
-              rad.y = rad.y + col.y
-              rad.z = rad.z + col.z
-            end
-          end
-        end
-
-        r = rad.x / (nsf * nsf)
-        g = rad.y / (nsf * nsf)
-        b = rad.z / (nsf * nsf)
-        printf("%c", clamp(r))
-        printf("%c", clamp(g))
-        printf("%c", clamp(b))
-      end
-      nil
-    end
-
-    nil
-  end
-end
-
-alias printf_orig printf
-def printf *args
-end
-
-# File.open("ao.ppm", "w") do |fp|
-  printf("P6\n")
-  printf("%d %d\n", IMAGE_WIDTH, IMAGE_HEIGHT)
-  printf("255\n", IMAGE_WIDTH, IMAGE_HEIGHT)
-  Scene.new.render(IMAGE_WIDTH, IMAGE_HEIGHT, NSUBSAMPLES)
-# end
-
-undef printf
-alias printf printf_orig
diff --git a/benchmark/bm_app_erb.rb b/benchmark/bm_app_erb.rb
deleted file mode 100644
index 77c66a7949..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 = 15_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_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_require.rb b/benchmark/bm_require.rb
deleted file mode 100644
index b8abc88f41..0000000000
--- a/benchmark/bm_require.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-$:.push File.join(File.dirname(__FILE__), "bm_require.data")
-
-1.upto(10000) do |i|
-  require "c#{i}"
-end
-
-$:.pop
diff --git a/benchmark/bm_require_thread.rb b/benchmark/bm_require_thread.rb
deleted file mode 100644
index e54db6c6e5..0000000000
--- a/benchmark/bm_require_thread.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-$:.push File.join(File.dirname(__FILE__), "bm_require.data")
-
-i=0
-t = Thread.new do
-  while true
-    i = i+1 # dummy loop
-  end
-end
-
-1.upto(100) do |i|
-  require "c#{i}"
-end
-
-$:.pop
-t.kill
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_concatenate.rb b/benchmark/bm_so_concatenate.rb
deleted file mode 100644
index 873214de7c..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 = ''
-  4_000_000.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 deb003a594..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_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_matrix.rb b/benchmark/bm_so_matrix.rb
deleted file mode 100644
index e2c5c8e559..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 = 40
-
-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 64a7d46afe..0000000000
--- a/benchmark/bm_so_meteor_contest.rb
+++ /dev/null
@@ -1,563 +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 boundaries 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 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 across the rows
-  (location / 6).to_i.upto(9) do | row_on |
-    # obtain a set of regions representing the bits of the current 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 multiple 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
-          # following 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 achieved 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 noticeable 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_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_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_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_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_vm1_attr_ivar.rb b/benchmark/bm_vm1_attr_ivar.rb
deleted file mode 100644
index 16906f3605..0000000000
--- a/benchmark/bm_vm1_attr_ivar.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-class C
-  attr_reader :a, :b
-  def initialize
-    @a = nil
-    @b = nil
-  end
-end
-obj = C.new
-i = 0
-while i<30_000_000 # while loop 1
-  i += 1
-  j = obj.a
-  k = obj.b
-end
diff --git a/benchmark/bm_vm1_attr_ivar_set.rb b/benchmark/bm_vm1_attr_ivar_set.rb
deleted file mode 100644
index 7e7a6b48c0..0000000000
--- a/benchmark/bm_vm1_attr_ivar_set.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-class C
-  attr_accessor :a, :b
-  def initialize
-    @a = nil
-    @b = nil
-  end
-end
-obj = C.new
-i = 0
-while i<30_000_000 # while loop 1
-  i += 1
-  obj.a = 1
-  obj.b = 2
-end
diff --git a/benchmark/bm_vm1_block.rb b/benchmark/bm_vm1_block.rb
deleted file mode 100644
index a9f56b15ea..0000000000
--- a/benchmark/bm_vm1_block.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-def m
-  yield
-end
-
-i = 0
-while i<30_000_000 # while loop 1
-  i += 1
-  m{
-  }
-end
diff --git a/benchmark/bm_vm1_const.rb b/benchmark/bm_vm1_const.rb
deleted file mode 100644
index ac59ebccf1..0000000000
--- a/benchmark/bm_vm1_const.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-Const = 1
-
-i = 0
-while i<30_000_000 # 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 a1596145f2..0000000000
--- a/benchmark/bm_vm1_ensure.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-i = 0
-while i<30_000_000 # benchmark loop 1
-  i += 1
-  begin
-    begin
-    ensure
-    end
-  ensure
-  end
-end
-
diff --git a/benchmark/bm_vm1_float_simple.rb b/benchmark/bm_vm1_float_simple.rb
deleted file mode 100644
index d4581439ff..0000000000
--- a/benchmark/bm_vm1_float_simple.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-i = 0.0; f = 0.0
-while i<30_000_000
-  i += 1
-  f += 0.1; f -= 0.1
-  f += 0.1; f -= 0.1
-  f += 0.1; f -= 0.1
-end
diff --git a/benchmark/bm_vm1_gc_short_lived.rb b/benchmark/bm_vm1_gc_short_lived.rb
deleted file mode 100644
index e78bca5668..0000000000
--- a/benchmark/bm_vm1_gc_short_lived.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-i = 0
-while i<30_000_000 # while loop 1
-  a = '' # short-lived String
-  b = ''
-  c = ''
-  d = ''
-  e = ''
-  f = ''
-  i+=1
-end
diff --git a/benchmark/bm_vm1_gc_short_with_complex_long.rb b/benchmark/bm_vm1_gc_short_with_complex_long.rb
deleted file mode 100644
index b66052dee0..0000000000
--- a/benchmark/bm_vm1_gc_short_with_complex_long.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-def nested_hash h, n
-  if n == 0
-    ''
-  else
-    10.times{
-      h[Object.new] = nested_hash(h, n-1)
-    }
-  end
-end
-
-long_lived = Hash.new
-nested_hash long_lived, 6
-
-GC.start
-GC.start
-
-i = 0
-while i<30_000_000 # while loop 1
-  a = '' # short-lived String
-  b = ''
-  c = ''
-  d = ''
-  e = ''
-  f = ''
-  i+=1
-end
-
diff --git a/benchmark/bm_vm1_gc_short_with_long.rb b/benchmark/bm_vm1_gc_short_with_long.rb
deleted file mode 100644
index 298dbc845b..0000000000
--- a/benchmark/bm_vm1_gc_short_with_long.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-long_lived = Array.new(1_000_000){|i| "#{i}"}
-GC.start
-GC.start
-i = 0
-while i<30_000_000 # while loop 1
-  a = '' # short-lived String
-  b = ''
-  c = ''
-  d = ''
-  e = ''
-  f = ''
-  i+=1
-end
diff --git a/benchmark/bm_vm1_gc_short_with_symbol.rb b/benchmark/bm_vm1_gc_short_with_symbol.rb
deleted file mode 100644
index 6b15c1b7bf..0000000000
--- a/benchmark/bm_vm1_gc_short_with_symbol.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# make many symbols
-50_000.times{|i| sym = "sym#{i}".to_sym}
-GC.start
-GC.start
-
-i = 0
-while i<30_000_000 # while loop 1
-  a = '' # short-lived String
-  b = ''
-  c = ''
-  d = ''
-  e = ''
-  f = ''
-  i+=1
-end
diff --git a/benchmark/bm_vm1_gc_wb_ary.rb b/benchmark/bm_vm1_gc_wb_ary.rb
deleted file mode 100644
index 881528845b..0000000000
--- a/benchmark/bm_vm1_gc_wb_ary.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-short_lived_ary = []
-
-if RUBY_VERSION >= "2.2.0"
-  GC.start(full_mark: false, immediate_mark: true, lazy_sweep: false)
-end
-
-i = 0
-short_lived = ''
-while i<30_000_000 # while loop 1
-  short_lived_ary[0] = short_lived # write barrier
-  i+=1
-end
diff --git a/benchmark/bm_vm1_gc_wb_ary_promoted.rb b/benchmark/bm_vm1_gc_wb_ary_promoted.rb
deleted file mode 100644
index 3c8279c956..0000000000
--- a/benchmark/bm_vm1_gc_wb_ary_promoted.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-long_lived = []
-
-if RUBY_VERSION > "2.2.0"
-  3.times{ GC.start(full_mark: false, immediate_mark: true, lazy_sweep: false) }
-elsif
-  GC.start
-end
-
-i = 0
-short_lived = ''
-while i<30_000_000 # while loop 1
-  long_lived[0] = short_lived # write barrier
-  i+=1
-end
diff --git a/benchmark/bm_vm1_gc_wb_obj.rb b/benchmark/bm_vm1_gc_wb_obj.rb
deleted file mode 100644
index a4067af36b..0000000000
--- a/benchmark/bm_vm1_gc_wb_obj.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-class C
-  attr_accessor :foo
-end
-short_lived_obj = C.new
-
-if RUBY_VERSION >= "2.2.0"
-  GC.start(full_mark: false, immediate_mark: true, lazy_sweep: false)
-end
-
-i = 0
-short_lived = ''
-while i<30_000_000 # while loop 1
-  short_lived_obj.foo = short_lived # write barrier
-  i+=1
-end
diff --git a/benchmark/bm_vm1_gc_wb_obj_promoted.rb b/benchmark/bm_vm1_gc_wb_obj_promoted.rb
deleted file mode 100644
index eee07a0248..0000000000
--- a/benchmark/bm_vm1_gc_wb_obj_promoted.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-class C
-  attr_accessor :foo
-end
-long_lived = C.new
-
-if RUBY_VERSION >= "2.2.0"
-  3.times{ GC.start(full_mark: false, immediate_mark: true, lazy_sweep: false) }
-elsif
-  GC.start
-end
-
-i = 0
-short_lived = ''
-while i<30_000_000 # while loop 1
-  long_lived.foo = short_lived # write barrier
-  i+=1
-end
diff --git a/benchmark/bm_vm1_ivar.rb b/benchmark/bm_vm1_ivar.rb
deleted file mode 100644
index 68a73cf92f..0000000000
--- a/benchmark/bm_vm1_ivar.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-@a = 1
-
-i = 0
-while i<30_000_000 # 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 bd81b06c34..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 353de3ab0e..0000000000
--- a/benchmark/bm_vm1_length.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-a = 'abc'
-b = [1, 2, 3]
-i = 0
-while i<30_000_000 # while loop 1
-  i += 1
-  a.length
-  b.length
-end
-
diff --git a/benchmark/bm_vm1_lvar_init.rb b/benchmark/bm_vm1_lvar_init.rb
deleted file mode 100644
index 36f2068811..0000000000
--- a/benchmark/bm_vm1_lvar_init.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-def m v
-  unless v
-    # unreachable code
-    v1 = v2 = v3 = v4 = v5 = v6 = v7 = v8 = v9 = v10 =
-    v11 = v12 = v13 = v14 = v15 = v16 = v17 = v18 = v19 = v20 =
-    v21 = v22 = v23 = v24 = v25 = v26 = v27 = v28 = v29 = v30 =
-    v31 = v32 = v33 = v34 = v35 = v36 = v37 = v38 = v39 = v40 =
-    v41 = v42 = v43 = v44 = v45 = v46 = v47 = v48 = v49 = v50 = 1
-  end
-end
-
-i = 0
-
-while i<30_000_000 # while loop 1
-  i += 1
-  m i
-end
-
diff --git a/benchmark/bm_vm1_lvar_set.rb b/benchmark/bm_vm1_lvar_set.rb
deleted file mode 100644
index 222e864134..0000000000
--- a/benchmark/bm_vm1_lvar_set.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-i = 0
-while i<30_000_000 # while loop 1
-  i += 1
-  a = b = c = d = e = f = g = h = j = k = l = m = n = o = p = q = r = 1
-end
diff --git a/benchmark/bm_vm1_neq.rb b/benchmark/bm_vm1_neq.rb
deleted file mode 100644
index bbb4ae07a4..0000000000
--- a/benchmark/bm_vm1_neq.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-i = 0
-obj1 = Object.new
-obj2 = Object.new
-
-while i<30_000_000 # 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 b09ecdcc21..0000000000
--- a/benchmark/bm_vm1_not.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-i = 0
-obj = Object.new
-
-while i<30_000_000 # 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 b0d3e2bdfa..0000000000
--- a/benchmark/bm_vm1_rescue.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-i = 0
-while i<30_000_000 # 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 63f9f21675..0000000000
--- a/benchmark/bm_vm1_simplereturn.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-def m
-  return 1
-end
-i = 0
-while i<30_000_000 # 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 918f8b2112..0000000000
--- a/benchmark/bm_vm1_swap.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-a = 1
-b = 2
-i = 0
-while i<30_000_000 # while loop 1
-  i += 1
-  a, b = b, a
-end
-
diff --git a/benchmark/bm_vm1_yield.rb b/benchmark/bm_vm1_yield.rb
deleted file mode 100644
index 775597cea6..0000000000
--- a/benchmark/bm_vm1_yield.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-def m
-  i = 0
-  while i<30_000_000 # while loop 1
-    i += 1
-    yield
-  end
-end
-
-m{}
-
diff --git a/benchmark/bm_vm2_array.rb b/benchmark/bm_vm2_array.rb
deleted file mode 100644
index df9037c83c..0000000000
--- a/benchmark/bm_vm2_array.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-i = 0
-while i<6_000_000 # benchmark loop 2
-  i += 1
-  a = [1,2,3,4,5,6,7,8,9,10]
-end
diff --git a/benchmark/bm_vm2_bigarray.rb b/benchmark/bm_vm2_bigarray.rb
deleted file mode 100644
index b02509d6a2..0000000000
--- a/benchmark/bm_vm2_bigarray.rb
+++ /dev/null
@@ -1,106 +0,0 @@
-i = 0
-while i<6_000_000 # benchmark loop 2
-  i += 1
-  a = [
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-    1,2,3,4,5,6,7,8,9,10,
-  ]
-end
diff --git a/benchmark/bm_vm2_bighash.rb b/benchmark/bm_vm2_bighash.rb
deleted file mode 100644
index 5e3f437bb8..0000000000
--- a/benchmark/bm_vm2_bighash.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-i = 0
-while i<60_000 # benchmark loop 2
-  i += 1
-  a = {0=>0, 1=>1, 2=>2, 3=>3, 4=>4, 5=>5, 6=>6, 7=>7, 8=>8, 9=>9, 10=>10, 11=>11, 12=>12, 13=>13, 14=>14, 15=>15, 16=>16, 17=>17, 18=>18, 19=>19, 20=>20, 21=>21, 22=>22, 23=>23, 24=>24, 25=>25, 26=>26, 27=>27, 28=>28, 29=>29, 30=>30, 31=>31, 32=>32, 33=>33, 34=>34, 35=>35, 36=>36, 37=>37, 38=>38, 39=>39, 40=>40, 41=>41, 42=>42, 43=>43, 44=>44, 45=>45, 46=>46, 47=>47, 48=>48, 49=>49, 50=>50, 51=>51, 52=>52, 53=>53, 54=>54, 55=>55, 56=>56, 57=>57, 58=>58, 59=>59, 60=>60, 61=>61, 62=>62, 63=>63, 64=>64, 65=>65, 66=>66, 67=>67, 68=>68, 69=>69, 70=>70, 71=>71, 72=>72, 73=>73, 74=>74, 75=>75, 76=>76, 77=>77, 78=>78, 79=>79, 80=>80, 81=>81, 82=>82, 83=>83, 84=>84, 85=>85, 86=>86, 87=>87, 88=>88, 89=>89, 90=>90, 91=>91, 92=>92, 93=>93, 94=>94, 95=>95, 96=>96, 97=>97, 98=>98, 99=>99, 100=>100, 101=>101, 102=>102, 103=>103, 104=>104, 105=>105, 106=>106, 107=>107, 108=>108, 109=>109, 110=>110, 111=>111, 112=>112, 113=>113, 114=>114, 115=>115, 116=>116, 117=>117, 118=>118, 119=>119, 120=>120, 121=>121, 122=>122, 123=>123, 124=>124, 125=>125, 126=>126, 127=>127, 128=>128, 129=>129, 130=>130, 131=>131, 132=>132, 133=>133, 134=>134, 135=>135, 136=>136, 137=>137, 138=>138, 139=>139, 140=>140, 141=>141, 142=>142, 143=>143, 144=>144, 145=>145, 146=>146, 147=>147, 148=>148, 149=>149, 150=>150, 151=>151, 152=>152, 153=>153, 154=>154, 155=>155, 156=>156, 157=>157, 158=>158, 159=>159, 160=>160, 161=>161, 162=>162, 163=>163, 164=>164, 165=>165, 166=>166, 167=>167, 168=>168, 169=>169, 170=>170, 171=>171, 172=>172, 173=>173, 174=>174, 175=>175, 176=>176, 177=>177, 178=>178, 179=>179, 180=>180, 181=>181, 182=>182, 183=>183, 184=>184, 185=>185, 186=>186, 187=>187, 188=>188, 189=>189, 190=>190, 191=>191, 192=>192, 193=>193, 194=>194, 195=>195, 196=>196, 197=>197, 198=>198, 199=>199, 200=>200, 201=>201, 202=>202, 203=>203, 204=>204, 205=>205, 206=>206, 207=>207, 208=>208, 209=>209, 210=>210, 211=>211, 212=>212, 213=>213, 214=>214, 215=>215, 216=>216, 217=>217, 218=>218, 219=>219, 220=>220, 221=>221, 222=>222, 223=>223, 224=>224, 225=>225, 226=>226, 227=>227, 228=>228, 229=>229, 230=>230, 231=>231, 232=>232, 233=>233, 234=>234, 235=>235, 236=>236, 237=>237, 238=>238, 239=>239, 240=>240, 241=>241, 242=>242, 243=>243, 244=>244, 245=>245, 246=>246, 247=>247, 248=>248, 249=>249, 250=>250, 251=>251, 252=>252, 253=>253, 254=>254, 255=>255, 256=>256, 257=>257, 258=>258, 259=>259, 260=>260, 261=>261, 262=>262, 263=>263, 264=>264, 265=>265, 266=>266, 267=>267, 268=>268, 269=>269, 270=>270, 271=>271, 272=>272, 273=>273, 274=>274, 275=>275, 276=>276, 277=>277, 278=>278, 279=>279, 280=>280, 281=>281, 282=>282, 283=>283, 284=>284, 285=>285, 286=>286, 287=>287, 288=>288, 289=>289, 290=>290, 291=>291, 292=>292, 293=>293, 294=>294, 295=>295, 296=>296, 297=>297, 298=>298, 299=>299, 300=>300, 301=>301, 302=>302, 303=>303, 304=>304, 305=>305, 306=>306, 307=>307, 308=>308, 309=>309, 310=>310, 311=>311, 312=>312, 313=>313, 314=>314, 315=>315, 316=>316, 317=>317, 318=>318, 319=>319, 320=>320, 321=>321, 322=>322, 323=>323, 324=>324, 325=>325, 326=>326, 327=>327, 328=>328, 329=>329, 330=>330, 331=>331, 332=>332, 333=>333, 334=>334, 335=>335, 336=>336, 337=>337, 338=>338, 339=>339, 340=>340, 341=>341, 342=>342, 343=>343, 344=>344, 345=>345, 346=>346, 347=>347, 348=>348, 349=>349, 350=>350, 351=>351, 352=>352, 353=>353, 354=>354, 355=>355, 356=>356, 357=>357, 358=>358, 359=>359, 360=>360, 361=>361, 362=>362, 363=>363, 364=>364, 365=>365, 366=>366, 367=>367, 368=>368, 369=>369, 370=>370, 371=>371, 372=>372, 373=>373, 374=>374, 375=>375, 376=>376, 377=>377, 378=>378, 379=>379, 380=>380, 381=>381, 382=>382, 383=>383, 384=>384, 385=>385, 386=>386, 387=>387, 388=>388, 389=>389, 390=>390, 391=>391, 392=>392, 393=>393, 394=>394, 395=>395, 396=>396, 397=>397, 398=>398, 399=>399, 400=>400, 401=>401, 402=>402, 403=>403, 404=>404, 405=>405, 406=>406, 407=>407, 408=>408, 409=>409, 410=>410, 411=>411, 412=>412, 413=>413, 414=>414, 415=>415, 416=>416, 417=>417, 418=>418, 419=>419, 420=>420, 421=>421, 422=>422, 423=>423, 424=>424, 425=>425, 426=>426, 427=>427, 428=>428, 429=>429, 430=>430, 431=>431, 432=>432, 433=>433, 434=>434, 435=>435, 436=>436, 437=>437, 438=>438, 439=>439, 440=>440, 441=>441, 442=>442, 443=>443, 444=>444, 445=>445, 446=>446, 447=>447, 448=>448, 449=>449, 450=>450, 451=>451, 452=>452, 453=>453, 454=>454, 455=>455, 456=>456, 457=>457, 458=>458, 459=>459, 460=>460, 461=>461, 462=>462, 463=>463, 464=>464, 465=>465, 466=>466, 467=>467, 468=>468, 469=>469, 470=>470, 471=>471, 472=>472, 473=>473, 474=>474, 475=>475, 476=>476, 477=>477, 478=>478, 479=>479, 480=>480, 481=>481, 482=>482, 483=>483, 484=>484, 485=>485, 486=>486, 487=>487, 488=>488, 489=>489, 490=>490, 491=>491, 492=>492, 493=>493, 494=>494, 495=>495, 496=>496, 497=>497, 498=>498, 499=>499, 500=>500,}
-end
diff --git a/benchmark/bm_vm2_case.rb b/benchmark/bm_vm2_case.rb
deleted file mode 100644
index adc6e4df0a..0000000000
--- a/benchmark/bm_vm2_case.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-i = 0
-while i<6_000_000 # 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_case_lit.rb b/benchmark/bm_vm2_case_lit.rb
deleted file mode 100644
index c62b294e0e..0000000000
--- a/benchmark/bm_vm2_case_lit.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-i = 0
-@ret = [ "foo", true, false, :sym, 6, nil, 0.1, 0xffffffffffffffff ]
-def foo(i)
-  @ret[i % @ret.size]
-end
-
-while i<6_000_000 # while loop 2
-  case foo(i)
-  when "foo" then :foo
-  when true then true
-  when false then false
-  when :sym then :sym
-  when 6 then :fix
-  when nil then nil
-  when 0.1 then :float
-  when 0xffffffffffffffff then :big
-  end
-  i += 1
-end
diff --git a/benchmark/bm_vm2_defined_method.rb b/benchmark/bm_vm2_defined_method.rb
deleted file mode 100644
index 053ed6c912..0000000000
--- a/benchmark/bm_vm2_defined_method.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class Object
-  define_method(:m){}
-end
-
-i = 0
-while i<6_000_000 # benchmark loop 2
-  i += 1
-  m; m; m; m; m; m; m; m;
-end
diff --git a/benchmark/bm_vm2_dstr.rb b/benchmark/bm_vm2_dstr.rb
deleted file mode 100644
index 58c0f7bbc3..0000000000
--- a/benchmark/bm_vm2_dstr.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-i = 0
-x = y = 'z'
-while i<6_000_000 # benchmark loop 2
-  i += 1
-  str = "foo#{x}bar#{y}baz"
-end
diff --git a/benchmark/bm_vm2_eval.rb b/benchmark/bm_vm2_eval.rb
deleted file mode 100644
index 307cfc28ef..0000000000
--- a/benchmark/bm_vm2_eval.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-i = 0
-while i<6_000_000 # 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 a8ccff7138..0000000000
--- a/benchmark/bm_vm2_method.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-def m
-  nil
-end
-
-i = 0
-while i<6_000_000 # benchmark loop 2
-  i += 1
-  m; m; m; m; m; m; m; m;
-end
diff --git a/benchmark/bm_vm2_method_missing.rb b/benchmark/bm_vm2_method_missing.rb
deleted file mode 100644
index 2badc73101..0000000000
--- a/benchmark/bm_vm2_method_missing.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-class C
-  def method_missing mid
-  end
-end
-
-obj = C.new
-
-i = 0
-while i<6_000_000 # benchmark loop 2
-  i += 1
-  obj.m; obj.m; obj.m; obj.m; obj.m; obj.m; obj.m; obj.m;
-end
diff --git a/benchmark/bm_vm2_method_with_block.rb b/benchmark/bm_vm2_method_with_block.rb
deleted file mode 100644
index b4efb4f520..0000000000
--- a/benchmark/bm_vm2_method_with_block.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-def m
-  nil
-end
-
-i = 0
-while i<6_000_000 # 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 7362f738c5..0000000000
--- a/benchmark/bm_vm2_mutex.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'thread'
-
-m = Mutex.new
-
-i = 0
-while i<6_000_000 # benchmark loop 2
-  i += 1
-  m.synchronize{}
-end
diff --git a/benchmark/bm_vm2_newlambda.rb b/benchmark/bm_vm2_newlambda.rb
deleted file mode 100644
index 6422c9b0d0..0000000000
--- a/benchmark/bm_vm2_newlambda.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-i = 0
-while i<6_000_000 # benchmark loop 2
-  i += 1
-  lambda {}
-end
diff --git a/benchmark/bm_vm2_poly_method.rb b/benchmark/bm_vm2_poly_method.rb
deleted file mode 100644
index c82c0e4bce..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<6_000_000 # 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 aa5fd1dd38..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<6_000_000 # 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 65e5217371..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<6_000_000 # benchmark loop 2
-  i += 1
-  pr.call
-end
-
diff --git a/benchmark/bm_vm2_raise1.rb b/benchmark/bm_vm2_raise1.rb
deleted file mode 100644
index aa5387987f..0000000000
--- a/benchmark/bm_vm2_raise1.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-def rec n
-  if n > 0
-    rec n-1
-  else
-    raise
-  end
-end
-
-i = 0
-while i<6_000_000 # benchmark loop 2
-  i += 1
-
-  begin
-    rec 1
-  rescue
-    # ignore
-  end
-end
diff --git a/benchmark/bm_vm2_raise2.rb b/benchmark/bm_vm2_raise2.rb
deleted file mode 100644
index 1f61c63157..0000000000
--- a/benchmark/bm_vm2_raise2.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-def rec n
-  if n > 0
-    rec n-1
-  else
-    raise
-  end
-end
-
-i = 0
-while i<6_000_000 # benchmark loop 2
-  i += 1
-
-  begin
-    rec 10
-  rescue
-    # ignore
-  end
-end
diff --git a/benchmark/bm_vm2_regexp.rb b/benchmark/bm_vm2_regexp.rb
deleted file mode 100644
index 55f9e957a3..0000000000
--- a/benchmark/bm_vm2_regexp.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-i = 0
-str = 'xxxhogexxx'
-while i<6_000_000 # 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 6a3ab6fdab..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<6_000_000 # benchmark loop 2
-  i += 1
-  o.__send__ :m
-end
diff --git a/benchmark/bm_vm2_string_literal.rb b/benchmark/bm_vm2_string_literal.rb
deleted file mode 100644
index 1d73036849..0000000000
--- a/benchmark/bm_vm2_string_literal.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-i = 0
-while i<6_000_000 # benchmark loop 2
-  i += 1
-  x = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-end
diff --git a/benchmark/bm_vm2_struct_big_aref_hi.rb b/benchmark/bm_vm2_struct_big_aref_hi.rb
deleted file mode 100644
index 22cb26b0a5..0000000000
--- a/benchmark/bm_vm2_struct_big_aref_hi.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-s = Struct.new(*('a'..'z').map { |x| x.to_sym })
-x = s.new
-i = 0
-while i<6_000_000 # benchmark loop 2
-  i += 1
-  x.z # x[25]
-end
diff --git a/benchmark/bm_vm2_struct_big_aref_lo.rb b/benchmark/bm_vm2_struct_big_aref_lo.rb
deleted file mode 100644
index 5e61a7087e..0000000000
--- a/benchmark/bm_vm2_struct_big_aref_lo.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-s = Struct.new(*('a'..'z').map { |x| x.to_sym })
-x = s.new
-i = 0
-while i<6_000_000 # benchmark loop 2
-  i += 1
-  x.k # x[10]
-end
diff --git a/benchmark/bm_vm2_struct_big_aset.rb b/benchmark/bm_vm2_struct_big_aset.rb
deleted file mode 100644
index 5a1c3d16f3..0000000000
--- a/benchmark/bm_vm2_struct_big_aset.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-s = Struct.new(*('a'..'z').map { |x| x.to_sym })
-x = s.new
-i = 0
-while i<6_000_000 # benchmark loop 2
-  i += 1
-  x.k = i # x[10] = i
-end
diff --git a/benchmark/bm_vm2_struct_big_href_hi.rb b/benchmark/bm_vm2_struct_big_href_hi.rb
deleted file mode 100644
index fff940a80a..0000000000
--- a/benchmark/bm_vm2_struct_big_href_hi.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-s = Struct.new(*('a'..'z').map { |x| x.to_sym })
-x = s.new
-i = 0
-while i<6_000_000 # benchmark loop 2
-  i += 1
-  x[:z]
-end
diff --git a/benchmark/bm_vm2_struct_big_href_lo.rb b/benchmark/bm_vm2_struct_big_href_lo.rb
deleted file mode 100644
index 5e4085d59d..0000000000
--- a/benchmark/bm_vm2_struct_big_href_lo.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-s = Struct.new(*('a'..'z').map { |x| x.to_sym })
-x = s.new
-i = 0
-while i<6_000_000 # benchmark loop 2
-  i += 1
-  x[:k]
-end
diff --git a/benchmark/bm_vm2_struct_big_hset.rb b/benchmark/bm_vm2_struct_big_hset.rb
deleted file mode 100644
index 9c0cee4141..0000000000
--- a/benchmark/bm_vm2_struct_big_hset.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-s = Struct.new(*('a'..'z').map { |x| x.to_sym })
-x = s.new
-i = 0
-while i<6_000_000 # benchmark loop 2
-  i += 1
-  x[:k] = i
-end
diff --git a/benchmark/bm_vm2_struct_small_aref.rb b/benchmark/bm_vm2_struct_small_aref.rb
deleted file mode 100644
index 8eaa555b41..0000000000
--- a/benchmark/bm_vm2_struct_small_aref.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-s = Struct.new(:a, :b, :c)
-x = s.new
-i = 0
-while i<6_000_000 # benchmark loop 2
-  i += 1
-  x.a
-end
diff --git a/benchmark/bm_vm2_struct_small_aset.rb b/benchmark/bm_vm2_struct_small_aset.rb
deleted file mode 100644
index ecd0f95669..0000000000
--- a/benchmark/bm_vm2_struct_small_aset.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-s = Struct.new(:a, :b, :c)
-x = s.new
-i = 0
-while i<6_000_000 # benchmark loop 2
-  i += 1
-  x.a = i
-end
diff --git a/benchmark/bm_vm2_struct_small_href.rb b/benchmark/bm_vm2_struct_small_href.rb
deleted file mode 100644
index 2c88fee6bf..0000000000
--- a/benchmark/bm_vm2_struct_small_href.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-s = Struct.new(:a, :b, :c)
-x = s.new
-i = 0
-while i<6_000_000 # benchmark loop 2
-  i += 1
-  x[:a]
-end
diff --git a/benchmark/bm_vm2_struct_small_hset.rb b/benchmark/bm_vm2_struct_small_hset.rb
deleted file mode 100644
index 33c36d20f1..0000000000
--- a/benchmark/bm_vm2_struct_small_hset.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-s = Struct.new(:a, :b, :c)
-x = s.new
-i = 0
-while i<6_000_000 # benchmark loop 2
-  i += 1
-  x[:a] = 1
-end
diff --git a/benchmark/bm_vm2_super.rb b/benchmark/bm_vm2_super.rb
deleted file mode 100644
index afd8579e7b..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<6_000_000 # 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 1774625942..0000000000
--- a/benchmark/bm_vm2_unif1.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-i = 0
-def m a, b
-end
-
-while i<6_000_000 # 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 2a43e62217..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<6_000_000 # benchmark loop 2
-  obj.m 10
-  i += 1
-end
diff --git a/benchmark/bm_vm_thread_alive_check1.rb b/benchmark/bm_vm_thread_alive_check1.rb
deleted file mode 100644
index c993accdda..0000000000
--- a/benchmark/bm_vm_thread_alive_check1.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-5_000.times{
-  t = Thread.new{}
-  while t.alive?
-    Thread.pass
-  end
-}
diff --git a/benchmark/bm_vm_thread_mutex1.rb b/benchmark/bm_vm_thread_mutex1.rb
deleted file mode 100644
index 5c9f85dfb7..0000000000
--- a/benchmark/bm_vm_thread_mutex1.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# one thread, one mutex (no contention)
-
-require 'thread'
-m = Mutex.new
-r = 0
-max = 2000
-lmax = max * max
-(1..1).map{
-  Thread.new{
-    i = 0
-    while i<lmax
-      i += 1
-      m.synchronize{
-        r += 1
-      }
-    end
-  }
-}.each{|e|
-  e.join
-}
-raise r.to_s if r != max * max
diff --git a/benchmark/bm_vm_thread_mutex2.rb b/benchmark/bm_vm_thread_mutex2.rb
deleted file mode 100644
index 10de59054f..0000000000
--- a/benchmark/bm_vm_thread_mutex2.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# two threads, one mutex
-
-require 'thread'
-m = Mutex.new
-r = 0
-max = 2000
-lmax = (max * max)/2
-(1..2).map{
-  Thread.new{
-    i = 0
-    while i<lmax
-      i += 1
-      m.synchronize{
-        r += 1
-      }
-    end
-  }
-}.each{|e|
-  e.join
-}
-raise r.to_s if r != max * max
diff --git a/benchmark/bm_vm_thread_mutex3.rb b/benchmark/bm_vm_thread_mutex3.rb
deleted file mode 100644
index 7f9a44b39d..0000000000
--- a/benchmark/bm_vm_thread_mutex3.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-# 1000 threads, one mutex
-
-require 'thread'
-m = Mutex.new
-r = 0
-max = 2000
-(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/bm_vm_thread_pass.rb b/benchmark/bm_vm_thread_pass.rb
deleted file mode 100644
index b5b3c0bc85..0000000000
--- a/benchmark/bm_vm_thread_pass.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# Plenty Thtread.pass
-# A performance may depend on GVL implementation.
-
-tmax = (ARGV.shift || 2).to_i
-lmax = 200_000 / tmax
-
-(1..tmax).map{
-  Thread.new{
-    lmax.times{
-      Thread.pass
-    }
-  }
-}.each{|t| t.join}
-
-
diff --git a/benchmark/bm_vm_thread_pass_flood.rb b/benchmark/bm_vm_thread_pass_flood.rb
deleted file mode 100644
index 27157d1a6f..0000000000
--- a/benchmark/bm_vm_thread_pass_flood.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-1000.times{
-  Thread.new{loop{Thread.pass}}
-}
-
-i = 0
-while i<10000
-  i += 1
-end
diff --git a/benchmark/bm_vm_thread_queue.rb b/benchmark/bm_vm_thread_queue.rb
deleted file mode 100644
index 37381ae62b..0000000000
--- a/benchmark/bm_vm_thread_queue.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require 'thread'
-
-n = 1_000_000
-q = Queue.new
-consumer = Thread.new{
-  while q.pop
-    # consuming
-  end
-}
-
-producer = Thread.new{
-  n.times{
-    q.push true
-  }
-  q.push nil
-}
-
-consumer.join
diff --git a/benchmark/cgi_escape_html.yml b/benchmark/cgi_escape_html.yml
new file mode 100644
index 0000000000..af6abd08ac
--- /dev/null
+++ b/benchmark/cgi_escape_html.yml
@@ -0,0 +1,40 @@
+prelude: require 'cgi/escape'
+benchmark:
+  - name: escape_html_blank
+    prelude: str = ""
+    script: CGI.escapeHTML(str)
+    loop_count: 20000000
+  - name: escape_html_short_none
+    prelude: str = "abcde"
+    script: CGI.escapeHTML(str)
+    loop_count: 20000000
+  - name: escape_html_short_one
+    prelude: str = "abcd<"
+    script: CGI.escapeHTML(str)
+    loop_count: 20000000
+  - name: escape_html_short_all
+    prelude: str = "'&\"<>"
+    script: CGI.escapeHTML(str)
+    loop_count: 5000000
+  - name: escape_html_long_none
+    prelude: str = "abcde" * 300
+    script: CGI.escapeHTML(str)
+    loop_count: 1000000
+  - name: escape_html_long_all
+    prelude: str = "'&\"<>" * 10
+    script: CGI.escapeHTML(str)
+    loop_count: 1000000
+  - name: escape_html_real
+    prelude: | # http://example.com/
+      str = <<~HTML
+        <body>
+        <div>
+            <h1>Example Domain</h1>
+            <p>This domain is established to be used for illustrative examples in documents. You may use this
+            domain in examples without prior coordination or asking for permission.</p>
+            <p><a href="http://www.iana.org/domains/example">More information...</a></p>
+        </div>
+        </body>
+      HTML
+    script: CGI.escapeHTML(str)
+    loop_count: 1000000
diff --git a/benchmark/complex_float_add.yml b/benchmark/complex_float_add.yml
new file mode 100644
index 0000000000..d0150c5e5b
--- /dev/null
+++ b/benchmark/complex_float_add.yml
@@ -0,0 +1,7 @@
+prelude: |
+  max, min = 1000.0, -1000.0
+  a = Complex(rand(max)+min, rand(max)+min)
+  b = Complex(rand(max)+min, rand(max)+min)
+benchmark:
+  complex_float_add: c = a + b
+loop_count: 1000000
diff --git a/benchmark/complex_float_div.yml b/benchmark/complex_float_div.yml
new file mode 100644
index 0000000000..b9f5e1d51c
--- /dev/null
+++ b/benchmark/complex_float_div.yml
@@ -0,0 +1,7 @@
+prelude: |
+  max, min = 1000.0, -1000.0
+  a = Complex(rand(max)+min, rand(max)+min)
+  b = Complex(rand(max)+min, rand(max)+min)
+benchmark:
+  complex_float_div: c = a / b
+loop_count: 1000000
diff --git a/benchmark/complex_float_mul.yml b/benchmark/complex_float_mul.yml
new file mode 100644
index 0000000000..59b096a6dc
--- /dev/null
+++ b/benchmark/complex_float_mul.yml
@@ -0,0 +1,7 @@
+prelude: |
+  max, min = 1000.0, -1000.0
+  a = Complex(rand(max)+min, rand(max)+min)
+  b = Complex(rand(max)+min, rand(max)+min)
+benchmark:
+  complex_float_mul: c = a * b
+loop_count: 1000000
diff --git a/benchmark/complex_float_new.yml b/benchmark/complex_float_new.yml
new file mode 100644
index 0000000000..6fcde3125b
--- /dev/null
+++ b/benchmark/complex_float_new.yml
@@ -0,0 +1,7 @@
+prelude: |
+  max, min = 1000.0, -1000.0
+  a = Complex(rand(max)+min, rand(max)+min)
+  b = Complex(rand(max)+min, rand(max)+min)
+benchmark:
+  complex_float_new: c = Complex(a, b)
+loop_count: 1000000
diff --git a/benchmark/complex_float_power.yml b/benchmark/complex_float_power.yml
new file mode 100644
index 0000000000..c40a31ab55
--- /dev/null
+++ b/benchmark/complex_float_power.yml
@@ -0,0 +1,7 @@
+prelude: |
+  max, min = 1000.0, -1000.0
+  a = Complex(rand(max)+min, rand(max)+min)
+  b = Complex(rand(max)+min, rand(max)+min)
+benchmark:
+  complex_float_power: c = a ** b
+loop_count: 1000000
diff --git a/benchmark/complex_float_sub.yml b/benchmark/complex_float_sub.yml
new file mode 100644
index 0000000000..3fafe7cdbe
--- /dev/null
+++ b/benchmark/complex_float_sub.yml
@@ -0,0 +1,7 @@
+prelude: |
+  max, min = 1000.0, -1000.0
+  a = Complex(rand(max)+min, rand(max)+min)
+  b = Complex(rand(max)+min, rand(max)+min)
+benchmark:
+  complex_float_sub: c = a - b
+loop_count: 1000000
diff --git a/benchmark/dir_empty_p.rb b/benchmark/dir_empty_p.rb
new file mode 100644
index 0000000000..8329c757cf
--- /dev/null
+++ b/benchmark/dir_empty_p.rb
@@ -0,0 +1,5 @@
+require 'tmpdir'
+max = 100_000
+Dir.mktmpdir('bm_dir_empty_p') do |dir|
+  max.times { Dir.empty?(dir) }
+end
diff --git a/benchmark/driver.rb b/benchmark/driver.rb
deleted file mode 100644
index eb976b4a90..0000000000
--- a/benchmark/driver.rb
+++ /dev/null
@@ -1,427 +0,0 @@
-#
-# Ruby Benchmark driver
-#
-
-first = true
-
-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'
-require 'tempfile'
-
-class BenchmarkDriver
-  def self.benchmark(opt)
-    driver = self.new(opt[:execs], opt[:dir], opt)
-    begin
-      driver.run
-    ensure
-      driver.show_results
-    end
-  end
-
-  def self.load(input, type, opt)
-    case type
-    when 'yaml'
-      require 'yaml'
-      h = YAML.load(input)
-    when 'json'
-      require 'json'
-      h = JSON.load(input)
-    else
-      h = eval(input.read)
-    end
-    obj = allocate
-    obj.instance_variable_set("@execs", h[:executables] || h["executables"])
-    obj.instance_variable_set("@results", h[:results] || h["results"])
-    obj.instance_variable_set("@opt", opt)
-    obj
-  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
-        label = $1.strip
-        path = $2
-        version = `#{path} -v`.chomp
-      else
-        path = e
-        version = label = `#{path} -v`.chomp
-      end
-      [path, label, version]
-    }.compact
-
-    @dir = dir
-    @repeat = opt[:repeat] || 1
-    @repeat = 1 if @repeat < 1
-    @pattern = opt[:pattern] || nil
-    @exclude = opt[:exclude] || nil
-    @verbose = opt[:quiet] ? false : (opt[:verbose] || false)
-    @output = opt[:output] ? open(opt[:output], 'w') : nil
-    @loop_wl1 = @loop_wl2 = nil
-    @ruby_arg = opt[:ruby_arg] || nil
-    @measure_target = opt[:measure_target]
-    @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{|(path, label, version), i|
-        message "target #{i}: " + (label == version ? "#{label}" : "#{label} (#{version})") + " at \"#{path}\""
-      }
-      message "measure target: #{@measure_target}"
-    end
-  end
-
-  def adjusted_results name, results
-    s = nil
-    results.each_with_index{|e, i|
-      r = e.min
-      case name
-      when /^vm1_/
-        if @loop_wl1
-          r -= @loop_wl1[i]
-          r = 0 if r < 0
-          s = '*'
-        end
-      when /^vm2_/
-        if @loop_wl2
-          r -= @loop_wl2[i]
-          r = 0 if r < 0
-          s = '*'
-        end
-      end
-      yield r
-    }
-    s
-  end
-
-  def show_results
-    case @opt[:format]
-    when :tsv
-      strformat = "\t%1$s"
-      numformat = "\t%1$*2$.3f"
-      minwidth = 0
-      name_width = 0
-    when :markdown
-      markdown = true
-      strformat = "|%1$-*2$s"
-      numformat = "|%1$*2$.3f"
-    when :plain
-      strformat = " %1$-*2$s"
-      numformat = " %1$*2$.3f"
-    end
-
-    name_width ||= @results.map {|v,*| v.size}.max
-    minwidth ||= 7
-    width = @execs.map{|(_, v)| [v.size, minwidth].max}
-
-    output
-
-    if @verbose
-      message '-----------------------------------------------------------'
-      message 'raw data:'
-      message
-      message PP.pp(@results, "", 79)
-      message
-      message "Elapsed time: #{Time.now - @start_time} (sec)"
-    end
-
-    if rawdata_output = @opt[:rawdata_output]
-      h = {}
-      h[:cpuinfo] = File.read('/proc/cpuinfo') if File.exist?('/proc/cpuinfo')
-      h[:executables] = @execs
-      h[:results] = @results
-      if (type = File.extname(rawdata_output)).empty?
-        type = rawdata_output
-        rawdata_output = @output.path.sub(/\.[^.\/]+\z/, '') << '.' << rawdata_output
-      end
-      case type
-      when 'yaml'
-        require 'yaml'
-        h = YAML.dump(h)
-      when 'json'
-        require 'json'
-        h = JSON.pretty_generate(h)
-      else
-        require 'pp'
-        h = h.pretty_inspect
-      end
-      open(rawdata_output, 'w') {|f| f.puts h}
-    end
-
-    output '-----------------------------------------------------------'
-    output 'benchmark results:'
-
-    if @verbose and @repeat > 1
-      output "minimum results in each #{@repeat} measurements."
-    end
-
-    output({
-      real: "Execution time (sec)",
-      peak: "Memory usage (peak) (B)",
-      size: "Memory usage (last size) (B)",
-    }[@measure_target])
-    output if markdown
-    output ["name".ljust(name_width), @execs.map.with_index{|(_, v), i| sprintf(strformat, v, width[i])}].join("").rstrip
-    output ["-"*name_width, width.map{|n|":".rjust(n, "-")}].join("|") if markdown
-    @results.each{|v, result|
-      rets = []
-      s = adjusted_results(v, result){|r|
-        rets << sprintf(numformat, r, width[rets.size])
-      }
-      v += s if s
-      output [v.ljust(name_width), rets].join("")
-    }
-
-    if @execs.size > 1
-      output
-      output({
-        real: "Speedup ratio: compare with the result of `#{@execs[0][1]}' (greater is better)",
-        peak: "Memory consuming ratio (peak) with the result of `#{@execs[0][1]}' (greater is better)",
-        size: "Memory consuming ratio (size) with the result of `#{@execs[0][1]}' (greater is better)",
-      }[@measure_target])
-      output if markdown
-      output ["name".ljust(name_width), @execs[1..-1].map.with_index{|(_, v), i| sprintf(strformat, v, width[i])}].join("").rstrip
-      output ["-"*name_width, width[1..-1].map{|n|":".rjust(n, "-")}].join("|") if markdown
-      @results.each{|v, result|
-        rets = []
-        first_value = nil
-        s = adjusted_results(v, result){|r|
-          if first_value
-            if r == 0
-              rets << "Error"
-            else
-              rets << sprintf(numformat, first_value/Float(r), width[rets.size+1])
-            end
-          else
-            first_value = r
-          end
-        }
-        v += s if s
-        output [v.ljust(name_width), rets].join("")
-      }
-    end
-
-    if @opt[:output]
-      output
-      output "Log file: #{@opt[:output]}"
-    end
-  end
-
-  def files
-    flag = {}
-    @files = Dir.glob(File.join(@dir, 'bm*.rb')).map{|file|
-      next if @pattern && /#{@pattern}/ !~ File.basename(file)
-      next if @exclude && /#{@exclude}/ =~ 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
-
-  unless defined?(File::NULL)
-    if File.exist?('/dev/null')
-      File::NULL = '/dev/null'
-    end
-  end
-
-  def measure executable, file
-    case @measure_target
-    when :real
-      cmd = "#{executable} #{@ruby_arg} #{file}"
-      m = Benchmark.measure{
-        system(cmd, out: File::NULL)
-      }
-      result = m.real
-    when :peak, :size
-      tmp = Tempfile.new("benchmark-memory-wrapper-data")
-      wrapper = "#{File.join(__dir__, 'memory_wrapper.rb')} #{tmp.path} #{@measure_target}"
-      cmd = "#{executable} #{@ruby_arg} #{wrapper} #{file}"
-      system(cmd, out: File::NULL)
-      result = tmp.read.to_i
-      tmp.close
-    else
-      raise "unknown measure target"
-    end
-
-    if $? != 0
-      raise $?.inspect if $? && $?.signaled?
-      output "\`#{cmd}\' exited with abnormal status (#{$?})"
-      0
-    else
-      result
-    end
-  end
-end
-
-if __FILE__ == $0
-  opt = {
-    :execs => [],
-    :dir => File.dirname(__FILE__),
-    :repeat => 1,
-    :measure_target => :real,
-    :output => nil,
-    :raw_output => nil,
-    :format => :tsv,
-  }
-  formats = {
-    :tsv => ".tsv",
-    :markdown => ".md",
-    :plain => ".txt",
-  }
-
-  parser = OptionParser.new{|o|
-    o.on('-e', '--executables [EXECS]',
-      "Specify benchmark one or more targets (e1::path1; e2::path2; e3::path3;...)"){|e|
-       e.split(/;/).each{|path|
-         opt[:execs] << path
-       }
-    }
-    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('-x', '--exclude [PATTERN]', "Benchmark exclude pattern"){|e|
-      opt[:exclude] = e
-    }
-    o.on('-r', '--repeat-count [NUM]', "Repeat count"){|n|
-      opt[:repeat] = n.to_i
-    }
-    o.on('-o', '--output-file [FILE]', "Output file"){|f|
-      opt[:output] = f
-    }
-    o.on('--ruby-arg [ARG]', "Optional argument for ruby"){|a|
-      opt[:ruby_arg] = a
-    }
-    o.on('--measure-target [TARGET]', 'real (execution time), peak, size (memory)'){|mt|
-      opt[:measure_target] = mt.to_sym
-    }
-    o.on('--rawdata-output [FILE]', 'output rawdata'){|r|
-      opt[:rawdata_output] = r
-    }
-    o.on('--load-rawdata=FILE', 'input rawdata'){|r|
-      opt[:rawdata_input] = r
-    }
-    o.on('-f', "--format=FORMAT", "output format (#{formats.keys.join(",")})", formats.keys){|r|
-      opt[:format] = r
-    }
-    o.on('-v', '--verbose'){|v|
-      opt[:verbose] = v
-    }
-    o.on('-q', '--quiet', "Run without notify information except result table."){|q|
-      opt[:quiet] = q
-      opt[:verbose] = false
-    }
-  }
-
-  parser.parse!(ARGV)
-  opt[:output] ||= "bmlog-#{Time.now.strftime('%Y%m%d-%H%M%S')}.#{$$}#{formats[opt[:format]]}"
-
-  if input = opt[:rawdata_input]
-    b = open(input) {|f|
-      BenchmarkDriver.load(f, File.extname(input)[1..-1], opt)
-    }
-    b.show_results
-  else
-    BenchmarkDriver.benchmark(opt)
-  end
-end
-
diff --git a/benchmark/enum_lazy_flat_map.yml b/benchmark/enum_lazy_flat_map.yml
new file mode 100644
index 0000000000..0ee390a441
--- /dev/null
+++ b/benchmark/enum_lazy_flat_map.yml
@@ -0,0 +1,16 @@
+prelude: |
+  num = (1..).lazy.take(100)
+  ary2 = [[1,2]].cycle.lazy.take(10)
+  ary10 = [[*1..10]].cycle.lazy.take(10)
+  ary20 = [[*1..20]].cycle.lazy.take(10)
+  ary50 = [[*1..50]].cycle.lazy.take(10)
+  ary100 = [[*1..100]].cycle.lazy.take(10)
+
+benchmark:
+  num3: num.flat_map {|x| x}.take(3).to_a
+  num10: num.flat_map {|x| x}.take(3).to_a
+  ary2:  ary2.flat_map {|x| x}.take(3).to_a
+  ary10: ary10.flat_map {|x| x}.take(3).to_a
+  ary20: ary20.flat_map {|x| x}.take(3).to_a
+  ary50: ary50.flat_map {|x| x}.take(3).to_a
+  ary100: ary100.flat_map {|x| x}.take(3).to_a
diff --git a/benchmark/enum_lazy_grep_v_100.rb b/benchmark/enum_lazy_grep_v_100.rb
new file mode 100644
index 0000000000..8832392e65
--- /dev/null
+++ b/benchmark/enum_lazy_grep_v_100.rb
@@ -0,0 +1,4 @@
+grep_data = (1..10).to_a * 1000
+N = 100
+enum = grep_data.lazy.grep_v(->(i){i == 0}).grep_v(->(i){i == 0})
+N.times {enum.each {}}
diff --git a/benchmark/enum_lazy_grep_v_20.rb b/benchmark/enum_lazy_grep_v_20.rb
new file mode 100644
index 0000000000..329509fa8f
--- /dev/null
+++ b/benchmark/enum_lazy_grep_v_20.rb
@@ -0,0 +1,4 @@
+grep_data = (1..10).to_a * 1000
+N = 100
+enum = grep_data.lazy.grep_v(->(i){i > 2}).grep_v(->(i){i > 2})
+N.times {enum.each {}}
diff --git a/benchmark/enum_lazy_grep_v_50.rb b/benchmark/enum_lazy_grep_v_50.rb
new file mode 100644
index 0000000000..02ea4d4e71
--- /dev/null
+++ b/benchmark/enum_lazy_grep_v_50.rb
@@ -0,0 +1,4 @@
+grep_data = (1..10).to_a * 1000
+N = 100
+enum = grep_data.lazy.grep_v(->(i){i > 5}).grep_v(->(i){i > 5})
+N.times {enum.each {}}
diff --git a/benchmark/enum_lazy_uniq_100.rb b/benchmark/enum_lazy_uniq_100.rb
new file mode 100644
index 0000000000..2e6434d9c4
--- /dev/null
+++ b/benchmark/enum_lazy_uniq_100.rb
@@ -0,0 +1,4 @@
+uniq_data = (1..10_000).to_a
+N = 100
+enum = uniq_data.lazy.uniq {|i| i % 10000}.uniq {|i| i % 10000}
+N.times {enum.each {}}
diff --git a/benchmark/enum_lazy_uniq_20.rb b/benchmark/enum_lazy_uniq_20.rb
new file mode 100644
index 0000000000..75e6398fee
--- /dev/null
+++ b/benchmark/enum_lazy_uniq_20.rb
@@ -0,0 +1,4 @@
+uniq_data = (1..10_000).to_a
+N = 100
+enum = uniq_data.lazy.uniq {|i| i % 2000}.uniq {|i| i % 2000}
+N.times {enum.each {}}
diff --git a/benchmark/enum_lazy_uniq_50.rb b/benchmark/enum_lazy_uniq_50.rb
new file mode 100644
index 0000000000..59a39b78ff
--- /dev/null
+++ b/benchmark/enum_lazy_uniq_50.rb
@@ -0,0 +1,4 @@
+uniq_data = (1..10_000).to_a
+N = 100
+enum = uniq_data.lazy.uniq {|i| i % 5000}.uniq {|i| i % 5000}
+N.times {enum.each {}}
diff --git a/benchmark/enum_lazy_zip.yml b/benchmark/enum_lazy_zip.yml
new file mode 100644
index 0000000000..4566ff0261
--- /dev/null
+++ b/benchmark/enum_lazy_zip.yml
@@ -0,0 +1,22 @@
+prelude: |
+  a = (1..3).lazy
+  b = a.map {|x| x}
+
+benchmark:
+  first_ary: a.zip(["a", "b", "c"]).first
+  first_nonary: a.zip("a".."c").first
+  first_noarg: a.zip.first
+
+  take3_ary: a.zip(["a", "b", "c"]).take(3).force
+  take3_nonary: a.zip("a".."c").take(3).force
+  take3_noarg: a.zip.take(3).force
+
+  chain-first_ary: b.zip(["a", "b", "c"]).first
+  chain-first_nonary: b.zip("a".."c").first
+  chain-first_noarg: b.zip.first
+
+  chain-take3_ary: b.zip(["a", "b", "c"]).take(3).force
+  chain-take3_nonary: b.zip("a".."c").take(3).force
+  chain-take3_noarg: b.zip.take(3).force
+
+  block: a.zip("a".."c") {|x, y| [x, y]}
diff --git a/benchmark/erb_render.yml b/benchmark/erb_render.yml
new file mode 100644
index 0000000000..15f6c3880b
--- /dev/null
+++ b/benchmark/erb_render.yml
@@ -0,0 +1,24 @@
+prelude: |
+  require 'erb'
+
+  data = <<erb
+  <html>
+    <head> <%= title %> </head>
+    <body>
+      <h1> <%= title %> </h1>
+      <p>
+        <%= content %>
+      </p>
+    </body>
+  </html>
+  erb
+
+  title = "hello world!"
+  content = "hello world!\n" * 10
+
+  src = "def self.render(title, content); #{ERB.new(data).src}; end"
+  mod = Module.new
+  mod.instance_eval(src, "(ERB)")
+benchmark:
+  erb_render: mod.render(title, content)
+loop_count: 1500000
diff --git a/benchmark/fiber_chain.yml b/benchmark/fiber_chain.yml
new file mode 100644
index 0000000000..a36c759f8e
--- /dev/null
+++ b/benchmark/fiber_chain.yml
@@ -0,0 +1,36 @@
+prelude: |
+  def make_link(previous)
+    Fiber.new do
+      while message = previous.resume
+        Fiber.yield(message)
+      end
+    end
+  end
+
+  def make_chain(length = 1000, &block)
+    chain = Fiber.new(&block)
+
+    (length - 1).times do
+      chain = make_link(chain)
+    end
+
+    return chain
+  end
+
+  message = "Hello World!"
+
+  chain = make_chain do
+    while true
+      Fiber.yield(message)
+    end
+  end
+benchmark:
+  make_chain: |
+    make_chain(100) do
+      while true
+        Fiber.yield(message)
+      end
+    end
+  resume_chain: |
+    chain.resume
+loop_count: 5000
diff --git a/benchmark/fiber_locals.yml b/benchmark/fiber_locals.yml
new file mode 100644
index 0000000000..8588686477
--- /dev/null
+++ b/benchmark/fiber_locals.yml
@@ -0,0 +1,8 @@
+prelude: |
+  th = Thread.current
+  th[:key] = :val
+benchmark:
+  key?: th.key?(:key)
+  []: th[:key]
+  keys: th.keys
+loop_count: 1_000_000
diff --git a/benchmark/file_chmod.rb b/benchmark/file_chmod.rb
new file mode 100644
index 0000000000..1cd4760c9d
--- /dev/null
+++ b/benchmark/file_chmod.rb
@@ -0,0 +1,9 @@
+# chmod file
+require 'tempfile'
+max = 200_000
+tmp = Tempfile.new('chmod')
+path = tmp.path
+max.times do
+  File.chmod(0777, path)
+end
+tmp.close!
diff --git a/benchmark/file_rename.rb b/benchmark/file_rename.rb
new file mode 100644
index 0000000000..bbb44aebac
--- /dev/null
+++ b/benchmark/file_rename.rb
@@ -0,0 +1,11 @@
+# rename file
+require 'tempfile'
+
+max = 100_000
+tmp = [ Tempfile.new('rename-a'), Tempfile.new('rename-b') ]
+a, b = tmp.map { |x| x.path }
+tmp.each { |t| t.close } # Windows can't rename files without closing them
+max.times do
+  File.rename(a, b)
+  File.rename(b, a)
+end
diff --git a/benchmark/gc/aobench.rb b/benchmark/gc/aobench.rb
index 2eed7abc83..275f58b924 100644
--- a/benchmark/gc/aobench.rb
+++ b/benchmark/gc/aobench.rb
@@ -1 +1 @@
-require_relative '../bm_app_aobench.rb'
+require_relative '../app_aobench'
diff --git a/benchmark/gc/binary_trees.rb b/benchmark/gc/binary_trees.rb
index af8ea722aa..83347cdd20 100644
--- a/benchmark/gc/binary_trees.rb
+++ b/benchmark/gc/binary_trees.rb
@@ -1 +1 @@
-require_relative '../bm_so_binary_trees.rb'
+require_relative '../so_binary_trees'
diff --git a/benchmark/gc/gcbench.rb b/benchmark/gc/gcbench.rb
index 09a404466a..23d0b91c6c 100644
--- a/benchmark/gc/gcbench.rb
+++ b/benchmark/gc/gcbench.rb
@@ -3,11 +3,12 @@ require 'pp'
 require 'optparse'
 
 $list = true
-$gcprof = true
+$gcprof = false
 
 opt = OptionParser.new
 opt.on('-q'){$list = false}
 opt.on('-d'){$gcprof = false}
+opt.on('-p'){$gcprof = true}
 opt.parse!(ARGV)
 
 script = File.join(File.dirname(__FILE__), ARGV.shift)
diff --git a/benchmark/gc/pentomino.rb b/benchmark/gc/pentomino.rb
index 94ba74be89..8ebdff7d1d 100644
--- a/benchmark/gc/pentomino.rb
+++ b/benchmark/gc/pentomino.rb
@@ -1 +1 @@
-require_relative '../bm_app_pentomino.rb'
+require_relative '../app_pentomino'
diff --git a/benchmark/bm_hash_aref_dsym.rb b/benchmark/hash_aref_dsym.rb
index af4f8c36d4..af4f8c36d4 100644
--- a/benchmark/bm_hash_aref_dsym.rb
+++ b/benchmark/hash_aref_dsym.rb
diff --git a/benchmark/bm_hash_aref_dsym_long.rb b/benchmark/hash_aref_dsym_long.rb
index 9d7759379e..9d7759379e 100644
--- a/benchmark/bm_hash_aref_dsym_long.rb
+++ b/benchmark/hash_aref_dsym_long.rb
diff --git a/benchmark/bm_hash_aref_fix.rb b/benchmark/hash_aref_fix.rb
index 1346890582..1346890582 100644
--- a/benchmark/bm_hash_aref_fix.rb
+++ b/benchmark/hash_aref_fix.rb
diff --git a/benchmark/bm_hash_aref_flo.rb b/benchmark/hash_aref_flo.rb
index 2217274c82..2217274c82 100644
--- a/benchmark/bm_hash_aref_flo.rb
+++ b/benchmark/hash_aref_flo.rb
diff --git a/benchmark/bm_hash_aref_miss.rb b/benchmark/hash_aref_miss.rb
index b0913dd4bb..b0913dd4bb 100644
--- a/benchmark/bm_hash_aref_miss.rb
+++ b/benchmark/hash_aref_miss.rb
diff --git a/benchmark/bm_hash_aref_str.rb b/benchmark/hash_aref_str.rb
index 19439b061b..19439b061b 100644
--- a/benchmark/bm_hash_aref_str.rb
+++ b/benchmark/hash_aref_str.rb
diff --git a/benchmark/bm_hash_aref_sym.rb b/benchmark/hash_aref_sym.rb
index f75d163fe6..f75d163fe6 100644
--- a/benchmark/bm_hash_aref_sym.rb
+++ b/benchmark/hash_aref_sym.rb
diff --git a/benchmark/bm_hash_aref_sym_long.rb b/benchmark/hash_aref_sym_long.rb
index 9dab8df7be..9dab8df7be 100644
--- a/benchmark/bm_hash_aref_sym_long.rb
+++ b/benchmark/hash_aref_sym_long.rb
diff --git a/benchmark/hash_defaults.yml b/benchmark/hash_defaults.yml
new file mode 100644
index 0000000000..833f10e1c7
--- /dev/null
+++ b/benchmark/hash_defaults.yml
@@ -0,0 +1,6 @@
+prelude: |
+  h = Hash.new { :foo }
+benchmark:
+  default_aref: h[1]
+  default_method: h.default(1)
+loop_count: 1000000
diff --git a/benchmark/hash_dup.yml b/benchmark/hash_dup.yml
new file mode 100644
index 0000000000..65f521ec94
--- /dev/null
+++ b/benchmark/hash_dup.yml
@@ -0,0 +1,8 @@
+prelude: |
+  small_hash = { a: 1 }
+  larger_hash = 20.times.map { |i| [('a'.ord + i).chr.to_sym, i] }.to_h
+
+benchmark:
+  dup_small: small_hash.dup
+  dup_larger: larger_hash.dup
+loop_count: 10000
diff --git a/benchmark/bm_hash_flatten.rb b/benchmark/hash_flatten.rb
index e944aae9f2..e944aae9f2 100644
--- a/benchmark/bm_hash_flatten.rb
+++ b/benchmark/hash_flatten.rb
diff --git a/benchmark/bm_hash_ident_flo.rb b/benchmark/hash_ident_flo.rb
index 0c7edfed3e..0c7edfed3e 100644
--- a/benchmark/bm_hash_ident_flo.rb
+++ b/benchmark/hash_ident_flo.rb
diff --git a/benchmark/bm_hash_ident_num.rb b/benchmark/hash_ident_num.rb
index b226736c6f..b226736c6f 100644
--- a/benchmark/bm_hash_ident_num.rb
+++ b/benchmark/hash_ident_num.rb
diff --git a/benchmark/bm_hash_ident_obj.rb b/benchmark/hash_ident_obj.rb
index 4b3b58edec..4b3b58edec 100644
--- a/benchmark/bm_hash_ident_obj.rb
+++ b/benchmark/hash_ident_obj.rb
diff --git a/benchmark/bm_hash_ident_str.rb b/benchmark/hash_ident_str.rb
index 8582b38e31..8582b38e31 100644
--- a/benchmark/bm_hash_ident_str.rb
+++ b/benchmark/hash_ident_str.rb
diff --git a/benchmark/bm_hash_ident_sym.rb b/benchmark/hash_ident_sym.rb
index 4c81e3d28e..4c81e3d28e 100644
--- a/benchmark/bm_hash_ident_sym.rb
+++ b/benchmark/hash_ident_sym.rb
diff --git a/benchmark/bm_hash_keys.rb b/benchmark/hash_keys.rb
index 6863cd01f9..6863cd01f9 100644
--- a/benchmark/bm_hash_keys.rb
+++ b/benchmark/hash_keys.rb
diff --git a/benchmark/hash_literal_small2.rb b/benchmark/hash_literal_small2.rb
new file mode 100644
index 0000000000..c188529260
--- /dev/null
+++ b/benchmark/hash_literal_small2.rb
@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+1_000_000.times.map { { "foo" => "bar", "bar" => "baz" }  }
diff --git a/benchmark/hash_literal_small4.rb b/benchmark/hash_literal_small4.rb
new file mode 100644
index 0000000000..739f71b5b0
--- /dev/null
+++ b/benchmark/hash_literal_small4.rb
@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+1_000_000.times.map { { "foo" => "bar", "bar" => "baz", "baz" => "lol", "lol" => "lgtm" } }
diff --git a/benchmark/hash_literal_small8.rb b/benchmark/hash_literal_small8.rb
new file mode 100644
index 0000000000..53d80af535
--- /dev/null
+++ b/benchmark/hash_literal_small8.rb
@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+1_000_000.times.map { { "foo" => "bar", "bar" => "baz", "baz" => "lol", "lol" => "lgtm", "lgtm" => "nope", "nope" => "ok", "ok" => "again", "again" => "wait" } }
diff --git a/benchmark/hash_long.rb b/benchmark/hash_long.rb
new file mode 100644
index 0000000000..03d9109602
--- /dev/null
+++ b/benchmark/hash_long.rb
@@ -0,0 +1,4 @@
+k1 = "Ping Pong Ping Pong Ping Pong Ping Pong Ping Pong Ping Pong Ping Pong Ping Pong Ping Pong Ping Pong";
+k2 = "Pong Ping Pong Ping Pong Ping Pong Ping Pong Ping Pong Ping Pong Ping Pong Ping Pong Ping Pong Ping";
+h = {k1 => 0, k2 => 0};
+3000000.times{|i| k = i % 2 ? k2 : k1; h [k] = h[k] + 1}
diff --git a/benchmark/bm_hash_shift.rb b/benchmark/hash_shift.rb
index a645671a5b..a645671a5b 100644
--- a/benchmark/bm_hash_shift.rb
+++ b/benchmark/hash_shift.rb
diff --git a/benchmark/bm_hash_shift_u16.rb b/benchmark/hash_shift_u16.rb
index ec800d0342..ec800d0342 100644
--- a/benchmark/bm_hash_shift_u16.rb
+++ b/benchmark/hash_shift_u16.rb
diff --git a/benchmark/bm_hash_shift_u24.rb b/benchmark/hash_shift_u24.rb
index de4e0fa696..de4e0fa696 100644
--- a/benchmark/bm_hash_shift_u24.rb
+++ b/benchmark/hash_shift_u24.rb
diff --git a/benchmark/bm_hash_shift_u32.rb b/benchmark/hash_shift_u32.rb
index 656aa55583..656aa55583 100644
--- a/benchmark/bm_hash_shift_u32.rb
+++ b/benchmark/hash_shift_u32.rb
diff --git a/benchmark/hash_small2.rb b/benchmark/hash_small2.rb
new file mode 100644
index 0000000000..45485d9c71
--- /dev/null
+++ b/benchmark/hash_small2.rb
@@ -0,0 +1 @@
+1000000.times.map{|i| a={}; 2.times{|j| a[j]=j}; a}
diff --git a/benchmark/hash_small4.rb b/benchmark/hash_small4.rb
new file mode 100644
index 0000000000..acd4084334
--- /dev/null
+++ b/benchmark/hash_small4.rb
@@ -0,0 +1 @@
+1000000.times.map{|i| a={}; 4.times{|j| a[j]=j}; a}
diff --git a/benchmark/hash_small8.rb b/benchmark/hash_small8.rb
new file mode 100644
index 0000000000..9cffcc91b6
--- /dev/null
+++ b/benchmark/hash_small8.rb
@@ -0,0 +1 @@
+1000000.times.map{|i| a={}; 8.times{|j| a[j]=j}; a}
diff --git a/benchmark/bm_hash_to_proc.rb b/benchmark/hash_to_proc.rb
index 2b675bf509..2b675bf509 100644
--- a/benchmark/bm_hash_to_proc.rb
+++ b/benchmark/hash_to_proc.rb
diff --git a/benchmark/bm_hash_values.rb b/benchmark/hash_values.rb
index 069441302f..069441302f 100644
--- a/benchmark/bm_hash_values.rb
+++ b/benchmark/hash_values.rb
diff --git a/benchmark/int_quo.rb b/benchmark/int_quo.rb
new file mode 100644
index 0000000000..e22a3f8c30
--- /dev/null
+++ b/benchmark/int_quo.rb
@@ -0,0 +1 @@
+5000000.times { 42.quo(3) }
diff --git a/benchmark/io_copy_stream_write.rb b/benchmark/io_copy_stream_write.rb
new file mode 100644
index 0000000000..3fd87250a4
--- /dev/null
+++ b/benchmark/io_copy_stream_write.rb
@@ -0,0 +1,24 @@
+# The goal of this is to use a synthetic (non-IO) reader
+# to trigger the read/write loop of IO.copy_stream,
+# bypassing in-kernel mechanisms like sendfile for zero copy,
+# so we wrap the /dev/zero IO object:
+
+class Zero
+  def initialize
+    @n = 100000
+    @in = File.open('/dev/zero', 'rb')
+  end
+
+  def read(len, buf)
+    return if (@n -= 1) == 0
+    @in.read(len, buf)
+  end
+end
+
+begin
+  src = Zero.new
+  dst = File.open(IO::NULL, 'wb')
+  n = IO.copy_stream(src, dst)
+rescue Errno::ENOENT
+  # not *nix
+end if IO.respond_to?(:copy_stream) && IO.const_defined?(:NULL)
diff --git a/benchmark/io_copy_stream_write_socket.rb b/benchmark/io_copy_stream_write_socket.rb
new file mode 100644
index 0000000000..11f369bd0d
--- /dev/null
+++ b/benchmark/io_copy_stream_write_socket.rb
@@ -0,0 +1,35 @@
+# The goal of this is to use a synthetic (non-IO) reader
+# to trigger the read/write loop of IO.copy_stream,
+# bypassing in-kernel mechanisms like sendfile for zero copy,
+# so we wrap the /dev/zero IO object:
+class Zero
+  def initialize
+    @n = 100000
+    @in = File.open('/dev/zero', 'rb')
+  end
+
+  def read(len, buf)
+    return if (@n -= 1) == 0
+    @in.read(len, buf)
+  end
+end
+
+begin
+  require 'socket'
+  src = Zero.new
+  rd, wr = UNIXSocket.pair
+  pid = fork do
+    wr.close
+    buf = String.new
+    while rd.read(16384, buf)
+    end
+  end
+  rd.close
+  IO.copy_stream(src, wr)
+rescue Errno::ENOENT, NotImplementedError, NameError
+  # not *nix: missing /dev/zero, fork, or UNIXSocket
+rescue LoadError # no socket?
+ensure
+  wr.close if wr
+  Process.waitpid(pid) if pid
+end if IO.respond_to?(:copy_stream)
diff --git a/benchmark/bm_io_file_create.rb b/benchmark/io_file_create.rb
index 2f205c1333..2f205c1333 100644
--- a/benchmark/bm_io_file_create.rb
+++ b/benchmark/io_file_create.rb
diff --git a/benchmark/bm_io_file_read.rb b/benchmark/io_file_read.rb
index b9e796ed30..b9e796ed30 100644
--- a/benchmark/bm_io_file_read.rb
+++ b/benchmark/io_file_read.rb
diff --git a/benchmark/bm_io_file_write.rb b/benchmark/io_file_write.rb
index aa1be0e5fe..aa1be0e5fe 100644
--- a/benchmark/bm_io_file_write.rb
+++ b/benchmark/io_file_write.rb
diff --git a/benchmark/bm_io_nonblock_noex.rb b/benchmark/io_nonblock_noex.rb
index da9357fdc6..da9357fdc6 100644
--- a/benchmark/bm_io_nonblock_noex.rb
+++ b/benchmark/io_nonblock_noex.rb
diff --git a/benchmark/bm_io_nonblock_noex2.rb b/benchmark/io_nonblock_noex2.rb
index 56819d049b..56819d049b 100644
--- a/benchmark/bm_io_nonblock_noex2.rb
+++ b/benchmark/io_nonblock_noex2.rb
diff --git a/benchmark/io_pipe_rw.rb b/benchmark/io_pipe_rw.rb
new file mode 100644
index 0000000000..6862a8ae61
--- /dev/null
+++ b/benchmark/io_pipe_rw.rb
@@ -0,0 +1,13 @@
+# Measure uncontended GVL performance via read/write with 1:1 threading
+# If we switch to M:N threading, this will benchmark something else...
+r, w = IO.pipe
+src = '0'.freeze
+dst = String.new
+i = 0
+while i < 1_000_000
+  i += 1
+  w.write(src)
+  r.read(1, dst)
+end
+w.close
+r.close
diff --git a/benchmark/bm_io_select.rb b/benchmark/io_select.rb
index 19248daeb1..19248daeb1 100644
--- a/benchmark/bm_io_select.rb
+++ b/benchmark/io_select.rb
diff --git a/benchmark/bm_io_select2.rb b/benchmark/io_select2.rb
index 10e37d71b2..10e37d71b2 100644
--- a/benchmark/bm_io_select2.rb
+++ b/benchmark/io_select2.rb
diff --git a/benchmark/bm_io_select3.rb b/benchmark/io_select3.rb
index 7d0ba1f092..7d0ba1f092 100644
--- a/benchmark/bm_io_select3.rb
+++ b/benchmark/io_select3.rb
diff --git a/benchmark/irb_color.yml b/benchmark/irb_color.yml
new file mode 100644
index 0000000000..ebdc8d7e8b
--- /dev/null
+++ b/benchmark/irb_color.yml
@@ -0,0 +1,13 @@
+prelude: |
+  require 'irb/color'
+  code = <<~'CODE'
+    def self.foo # bar
+      :"erb #{ERB.new("<%= self %>", trim_mode: ?-).result}"
+    end
+  CODE
+benchmark:
+  irb_color_complete: |
+    IRB::Color.colorize_code(code, complete: true)
+  irb_color_incomplete: |
+    IRB::Color.colorize_code(code, complete: false)
+loop_count: 2000000
diff --git a/benchmark/irb_exec.yml b/benchmark/irb_exec.yml
new file mode 100644
index 0000000000..28933f8b38
--- /dev/null
+++ b/benchmark/irb_exec.yml
@@ -0,0 +1,10 @@
+prelude: |
+  # frozen_string_literal: true
+  require 'rbconfig'
+  irb_f = [File.join(File.dirname(RbConfig.ruby), 'irb'), '-f']
+benchmark:
+  irb_exec: |
+    IO.popen(irb_f, 'w') do |io|
+      io.write('exit')
+    end
+loop_count: 30
diff --git a/benchmark/kernel_clone.yml b/benchmark/kernel_clone.yml
new file mode 100644
index 0000000000..069b23abcd
--- /dev/null
+++ b/benchmark/kernel_clone.yml
@@ -0,0 +1,6 @@
+prelude: "object = Object.new"
+benchmark:
+  clone: "object.clone"
+  clone_true: "object.clone(freeze: true)"
+  clone_false: "object.clone(freeze: false)"
+loop_count: 10000
diff --git a/benchmark/kernel_float.yml b/benchmark/kernel_float.yml
new file mode 100644
index 0000000000..215f6750fc
--- /dev/null
+++ b/benchmark/kernel_float.yml
@@ -0,0 +1,5 @@
+benchmark:
+  float: "Float(42)"
+  float_true: "Float(42, exception: true)"
+  float_false: "Float(42, exception: false)"
+loop_count: 10000
diff --git a/benchmark/kernel_tap.yml b/benchmark/kernel_tap.yml
new file mode 100644
index 0000000000..4dcbb31b4d
--- /dev/null
+++ b/benchmark/kernel_tap.yml
@@ -0,0 +1,6 @@
+prelude: |
+  obj = Object.new
+  x = nil
+benchmark:
+  kernel_tap: obj.tap { |o| x = o }
+loop_count: 20000000
diff --git a/benchmark/kernel_then.yml b/benchmark/kernel_then.yml
new file mode 100644
index 0000000000..85f7341e33
--- /dev/null
+++ b/benchmark/kernel_then.yml
@@ -0,0 +1,6 @@
+benchmark:
+  kernel_then: 1.then { |i| i + 1 }
+  kernel_then_enum: 1.then
+  kernel_yield_self: 1.yield_self { |i| i + 1 }
+  kernel_yield_self_enum: 1.yield_self
+loop_count: 20000000
diff --git a/benchmark/keyword_arguments.yml b/benchmark/keyword_arguments.yml
new file mode 100644
index 0000000000..fce6bce0b8
--- /dev/null
+++ b/benchmark/keyword_arguments.yml
@@ -0,0 +1,13 @@
+prelude: |
+  h = {a: 1}
+  def kw(a: 1) a end
+  def kws(**kw) kw end
+benchmark:
+  kw_to_kw: "kw(a: 1)"
+  kw_splat_to_kw: "kw(**h)"
+  kw_to_kw_splat: "kws(a: 1)"
+  kw_splat_to_kw_splat: "kws(**h)"
+  kw_and_splat_to_kw: "kw(a: 1, **h)"
+  kw_splats_to_kw: "kw(**h, **h)"
+  kw_and_splat_to_kw_splat: "kws(a: 1, **h)"
+  kw_splats_to_kw_splat: "kws(**h, **h)"
diff --git a/benchmark/lib/benchmark_driver/output/driver.rb b/benchmark/lib/benchmark_driver/output/driver.rb
new file mode 100644
index 0000000000..d22236e9fb
--- /dev/null
+++ b/benchmark/lib/benchmark_driver/output/driver.rb
@@ -0,0 +1,36 @@
+require 'benchmark_driver/output/simple'
+
+# This replicates the legacy benchmark/driver.rb behavior.
+class BenchmarkDriver::Output::Driver < BenchmarkDriver::Output::Simple
+  def initialize(*)
+    super
+    @stdout = $stdout
+    @strio  = StringIO.new
+    $stdout = IOMultiplexer.new(@stdout, @strio)
+  end
+
+  def with_benchmark(*)
+    super
+  ensure
+    logfile = "bmlog-#{Time.now.strftime('%Y%m%d-%H%M%S')}.#{$$}.log"
+    puts "\nLog file: #{logfile}"
+
+    $stdout = @stdout
+    File.write(logfile, @strio.tap(&:rewind).read)
+  end
+
+  class IOMultiplexer
+    def initialize(io1, io2)
+      @io1 = io1
+      @io2 = io2
+    end
+
+    [:write, :sync, :sync=, :puts, :print, :flush].each do |method|
+      define_method(method) do |*args|
+        @io1.send(method, *args)
+        @io2.send(method, *args)
+      end
+    end
+  end
+  private_constant :IOMultiplexer
+end
diff --git a/benchmark/lib/benchmark_driver/runner/cstime.rb b/benchmark/lib/benchmark_driver/runner/cstime.rb
new file mode 100644
index 0000000000..3c3453e527
--- /dev/null
+++ b/benchmark/lib/benchmark_driver/runner/cstime.rb
@@ -0,0 +1,22 @@
+require 'benchmark_driver/runner/total'
+
+class BenchmarkDriver::Runner::Cstime < BenchmarkDriver::Runner::Total
+  METRIC = BenchmarkDriver::Metric.new(name: 'cstime', unit: 's', larger_better: false)
+
+  # JobParser returns this, `BenchmarkDriver::Runner.runner_for` searches "*::Job"
+  Job = Class.new(BenchmarkDriver::DefaultJob)
+  # Dynamically fetched and used by `BenchmarkDriver::JobParser.parse`
+  JobParser = BenchmarkDriver::DefaultJobParser.for(klass: Job, metrics: [METRIC])
+
+  private
+
+  # Overriding BenchmarkDriver::Runner::Total#metric
+  def metric
+    METRIC
+  end
+
+  # Overriding BenchmarkDriver::Runner::Total#target
+  def target
+    :cstime
+  end
+end
diff --git a/benchmark/lib/benchmark_driver/runner/cutime.rb b/benchmark/lib/benchmark_driver/runner/cutime.rb
new file mode 100644
index 0000000000..e139962ef2
--- /dev/null
+++ b/benchmark/lib/benchmark_driver/runner/cutime.rb
@@ -0,0 +1,22 @@
+require 'benchmark_driver/runner/total'
+
+class BenchmarkDriver::Runner::Cutime < BenchmarkDriver::Runner::Total
+  METRIC = BenchmarkDriver::Metric.new(name: 'cutime', unit: 's', larger_better: false)
+
+  # JobParser returns this, `BenchmarkDriver::Runner.runner_for` searches "*::Job"
+  Job = Class.new(BenchmarkDriver::DefaultJob)
+  # Dynamically fetched and used by `BenchmarkDriver::JobParser.parse`
+  JobParser = BenchmarkDriver::DefaultJobParser.for(klass: Job, metrics: [METRIC])
+
+  private
+
+  # Overriding BenchmarkDriver::Runner::Total#metric
+  def metric
+    METRIC
+  end
+
+  # Overriding BenchmarkDriver::Runner::Total#target
+  def target
+    :cutime
+  end
+end
diff --git a/benchmark/lib/benchmark_driver/runner/mjit.rb b/benchmark/lib/benchmark_driver/runner/mjit.rb
new file mode 100644
index 0000000000..1d4693e8be
--- /dev/null
+++ b/benchmark/lib/benchmark_driver/runner/mjit.rb
@@ -0,0 +1,34 @@
+require 'benchmark_driver/struct'
+require 'benchmark_driver/metric'
+require 'erb'
+
+# A runner to measure after-JIT performance easily
+class BenchmarkDriver::Runner::Mjit < BenchmarkDriver::Runner::Ips
+  # JobParser returns this, `BenchmarkDriver::Runner.runner_for` searches "*::Job"
+  Job = Class.new(BenchmarkDriver::DefaultJob)
+
+  # Dynamically fetched and used by `BenchmarkDriver::JobParser.parse`
+  JobParser = BenchmarkDriver::DefaultJobParser.for(klass: Job, metrics: [METRIC]).extend(Module.new{
+    def parse(**)
+      jobs = super
+      jobs.map do |job|
+        job = job.dup
+        job.prelude = "#{job.prelude}\n#{<<~EOS}"
+          if defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled?
+            __bmdv_ruby_i = 0
+            while __bmdv_ruby_i < 10000 # jit_min_calls
+              #{job.script}
+              __bmdv_ruby_i += 1
+            end
+            RubyVM::MJIT.pause # compile
+            #{job.script}
+            RubyVM::MJIT.resume; RubyVM::MJIT.pause # recompile
+            #{job.script}
+            RubyVM::MJIT.resume; RubyVM::MJIT.pause # recompile 2
+          end
+        EOS
+        job
+      end
+    end
+  })
+end
diff --git a/benchmark/lib/benchmark_driver/runner/mjit_exec.rb b/benchmark/lib/benchmark_driver/runner/mjit_exec.rb
new file mode 100644
index 0000000000..eac3dfba84
--- /dev/null
+++ b/benchmark/lib/benchmark_driver/runner/mjit_exec.rb
@@ -0,0 +1,237 @@
+require 'benchmark_driver/struct'
+require 'benchmark_driver/metric'
+require 'erb'
+
+# A special runner dedicated for measuring mjit_exec overhead.
+class BenchmarkDriver::Runner::MjitExec
+  METRIC = BenchmarkDriver::Metric.new(name: 'Iteration per second', unit: 'i/s')
+
+  # JobParser returns this, `BenchmarkDriver::Runner.runner_for` searches "*::Job"
+  Job = ::BenchmarkDriver::Struct.new(
+    :name,        # @param [String] name - This is mandatory for all runner
+    :metrics,     # @param [Array<BenchmarkDriver::Metric>]
+    :num_methods, # @param [Integer] num_methods - The number of methods to be defined
+    :loop_count,  # @param [Integer] loop_count
+    :from_jit,    # @param [TrueClass,FalseClass] from_jit - Whether the mjit_exec() is from JIT or not
+    :to_jit,      # @param [TrueClass,FalseClass] to_jit - Whether the mjit_exec() is to JIT or not
+  )
+  # Dynamically fetched and used by `BenchmarkDriver::JobParser.parse`
+  class << JobParser = Module.new
+    # @param [Array,String] num_methods
+    # @param [Integer] loop_count
+    # @param [TrueClass,FalseClass] from_jit
+    # @param [TrueClass,FalseClass] to_jit
+    def parse(num_methods:, loop_count:, from_jit:, to_jit:)
+      if num_methods.is_a?(String)
+        num_methods = eval(num_methods)
+      end
+
+      num_methods.map do |num|
+        if num_methods.size > 1
+          suffix = "[#{'%4d' % num}]"
+        else
+          suffix = "_#{num}"
+        end
+        Job.new(
+          name: "mjit_exec_#{from_jit ? 'JT' : 'VM'}2#{to_jit ? 'JT' : 'VM'}#{suffix}",
+          metrics: [METRIC],
+          num_methods: num,
+          loop_count: loop_count,
+          from_jit: from_jit,
+          to_jit: to_jit,
+        )
+      end
+    end
+  end
+
+  # @param [BenchmarkDriver::Config::RunnerConfig] config
+  # @param [BenchmarkDriver::Output] output
+  # @param [BenchmarkDriver::Context] contexts
+  def initialize(config:, output:, contexts:)
+    @config = config
+    @output = output
+    @contexts = contexts
+  end
+
+  # This method is dynamically called by `BenchmarkDriver::JobRunner.run`
+  # @param [Array<BenchmarkDriver::Runner::Peak::Job>] jobs
+  def run(jobs)
+    @output.with_benchmark do
+      jobs.each do |job|
+        @output.with_job(name: job.name) do
+          @contexts.each do |context|
+            result = BenchmarkDriver::Repeater.with_repeat(config: @config, larger_better: true, rest_on_average: :average) do
+              run_benchmark(job, context: context)
+            end
+            value, duration = result.value
+            @output.with_context(name: context.name, executable: context.executable, gems: context.gems, prelude: context.prelude) do
+              @output.report(values: { METRIC => value }, duration: duration, loop_count: job.loop_count)
+            end
+          end
+        end
+      end
+    end
+  end
+
+  private
+
+  # @param [BenchmarkDriver::Runner::Ips::Job] job - loop_count is not nil
+  # @param [BenchmarkDriver::Context] context
+  # @return [BenchmarkDriver::Metrics]
+  def run_benchmark(job, context:)
+    if job.from_jit
+      if job.to_jit
+        benchmark = BenchmarkJT2JT.new(num_methods: job.num_methods, loop_count: job.loop_count)
+      else
+        raise NotImplementedError, "JT2VM is not implemented yet"
+      end
+    else
+      if job.to_jit
+        benchmark = BenchmarkVM2JT.new(num_methods: job.num_methods, loop_count: job.loop_count)
+      else
+        benchmark = BenchmarkVM2VM.new(num_methods: job.num_methods, loop_count: job.loop_count)
+      end
+    end
+
+    duration = Tempfile.open(['benchmark_driver-result', '.txt']) do |f|
+      with_script(benchmark.render(result: f.path)) do |path|
+        opt = []
+        if context.executable.command.any? { |c| c.start_with?('--jit') }
+          opt << '--jit-min-calls=2'
+        end
+        IO.popen([*context.executable.command, '--disable-gems', *opt, path], &:read)
+        if $?.success?
+          Float(f.read)
+        else
+          BenchmarkDriver::Result::ERROR
+        end
+      end
+    end
+
+    [job.loop_count.to_f / duration, duration]
+  end
+
+  def with_script(script)
+    if @config.verbose >= 2
+      sep = '-' * 30
+      $stdout.puts "\n\n#{sep}[Script begin]#{sep}\n#{script}#{sep}[Script end]#{sep}\n\n"
+    end
+
+    Tempfile.open(['benchmark_driver-', '.rb']) do |f|
+      f.puts script
+      f.close
+      return yield(f.path)
+    end
+  end
+
+  # @param [Integer] num_methods
+  # @param [Integer] loop_count
+  BenchmarkVM2VM = ::BenchmarkDriver::Struct.new(:num_methods, :loop_count) do
+    # @param [String] result - A file to write result
+    def render(result:)
+      ERB.new(<<~EOS, trim_mode: '%').result(binding)
+        % num_methods.times do |i|
+        def a<%= i %>
+          nil
+        end
+        % end
+        RubyVM::MJIT.pause if defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled?
+
+        def vm
+          t = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+          i = 0
+          while i < <%= loop_count / 1000 %>
+        % 1000.times do |i|
+            a<%= i % num_methods %>
+        % end
+            i += 1
+          end
+        % (loop_count % 1000).times do |i|
+          a<%= i % num_methods %>
+        % end
+          Process.clock_gettime(Process::CLOCK_MONOTONIC) - t
+        end
+
+        vm # warmup call cache
+        File.write(<%= result.dump %>, vm)
+      EOS
+    end
+  end
+  private_constant :BenchmarkVM2VM
+
+  # @param [Integer] num_methods
+  # @param [Integer] loop_count
+  BenchmarkVM2JT = ::BenchmarkDriver::Struct.new(:num_methods, :loop_count) do
+    # @param [String] result - A file to write result
+    def render(result:)
+      ERB.new(<<~EOS, trim_mode: '%').result(binding)
+        % num_methods.times do |i|
+        def a<%= i %>
+          nil
+        end
+        a<%= i %>
+        a<%= i %> # --jit-min-calls=2
+        % end
+        RubyVM::MJIT.pause if defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled?
+
+        def vm
+          t = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+          i = 0
+          while i < <%= loop_count / 1000 %>
+        % 1000.times do |i|
+            a<%= i % num_methods %>
+        % end
+            i += 1
+          end
+        % (loop_count % 1000).times do |i|
+          a<%= i % num_methods %>
+        % end
+          Process.clock_gettime(Process::CLOCK_MONOTONIC) - t
+        end
+
+        vm # warmup call cache
+        File.write(<%= result.dump %>, vm)
+      EOS
+    end
+  end
+  private_constant :BenchmarkVM2JT
+
+  # @param [Integer] num_methods
+  # @param [Integer] loop_count
+  BenchmarkJT2JT = ::BenchmarkDriver::Struct.new(:num_methods, :loop_count) do
+    # @param [String] result - A file to write result
+    def render(result:)
+      ERB.new(<<~EOS, trim_mode: '%').result(binding)
+        % num_methods.times do |i|
+        def a<%= i %>
+          nil
+        end
+        % end
+
+        # You may need to:
+        #   * Increase `JIT_ISEQ_SIZE_THRESHOLD` to 10000000 in mjit.h
+        #   * Always return false in `inlinable_iseq_p()` of mjit_compile.c
+        def jit
+          t = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+          i = 0
+          while i < <%= loop_count / 1000 %>
+        % 1000.times do |i|
+            a<%= i % num_methods %>
+        % end
+            i += 1
+          end
+        % (loop_count % 1000).times do |i|
+          a<%= i % num_methods %>
+        % end
+          Process.clock_gettime(Process::CLOCK_MONOTONIC) - t
+        end
+
+        jit
+        jit
+        RubyVM::MJIT.pause if defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled?
+        File.write(<%= result.dump %>, jit)
+      EOS
+    end
+  end
+  private_constant :BenchmarkJT2JT
+end
diff --git a/benchmark/lib/benchmark_driver/runner/peak.rb b/benchmark/lib/benchmark_driver/runner/peak.rb
new file mode 100644
index 0000000000..d04f2e51ff
--- /dev/null
+++ b/benchmark/lib/benchmark_driver/runner/peak.rb
@@ -0,0 +1,151 @@
+require 'benchmark_driver/struct'
+require 'benchmark_driver/metric'
+require 'benchmark_driver/default_job'
+require 'benchmark_driver/default_job_parser'
+require 'tempfile'
+
+class BenchmarkDriver::Runner::Peak
+  METRIC = BenchmarkDriver::Metric.new(
+    name: 'Peak memory usage', unit: 'bytes', larger_better: false, worse_word: 'larger',
+  )
+
+  # JobParser returns this, `BenchmarkDriver::Runner.runner_for` searches "*::Job"
+  Job = Class.new(BenchmarkDriver::DefaultJob)
+  # Dynamically fetched and used by `BenchmarkDriver::JobParser.parse`
+  JobParser = BenchmarkDriver::DefaultJobParser.for(klass: Job, metrics: [METRIC])
+
+  # @param [BenchmarkDriver::Config::RunnerConfig] config
+  # @param [BenchmarkDriver::Output] output
+  # @param [BenchmarkDriver::Context] contexts
+  def initialize(config:, output:, contexts:)
+    @config = config
+    @output = output
+    @contexts = contexts
+  end
+
+  # This method is dynamically called by `BenchmarkDriver::JobRunner.run`
+  # @param [Array<BenchmarkDriver::Runner::Peak::Job>] jobs
+  def run(jobs)
+    if jobs.any? { |job| job.loop_count.nil? }
+      jobs = jobs.map do |job|
+        job.loop_count ? job : Job.new(job.to_h.merge(loop_count: 1))
+      end
+    end
+
+    @output.with_benchmark do
+      jobs.each do |job|
+        @output.with_job(name: job.name) do
+          job.runnable_contexts(@contexts).each do |context|
+            value = BenchmarkDriver::Repeater.with_repeat(config: @config, larger_better: false) do
+              run_benchmark(job, context: context)
+            end
+            @output.with_context(name: context.name, executable: context.executable, gems: context.gems, prelude: context.prelude) do
+              @output.report(values: { metric => value }, loop_count: job.loop_count)
+            end
+          end
+        end
+      end
+    end
+  end
+
+  private
+
+  # @param [BenchmarkDriver::Runner::Ips::Job] job - loop_count is not nil
+  # @param [BenchmarkDriver::Context] context
+  # @return [BenchmarkDriver::Metrics]
+  def run_benchmark(job, context:)
+    benchmark = BenchmarkScript.new(
+      preludes:   [context.prelude, job.prelude],
+      script:     job.script,
+      teardown:   job.teardown,
+      loop_count: job.loop_count,
+    )
+
+    memory_status = File.expand_path('../../../../tool/lib/memory_status', __dir__)
+    Tempfile.open(['benchmark_driver-', '.rb']) do |f|
+      with_script(benchmark.render) do |path|
+        output = IO.popen([*context.executable.command, path, f.path, target, memory_status], &:read)
+        if $?.success?
+          Integer(f.read)
+        else
+          $stdout.print(output)
+          BenchmarkDriver::Result::ERROR
+        end
+      end
+    end
+  end
+
+  # Overridden by BenchmarkDriver::Runner::Size
+  def target
+    'peak'
+  end
+
+  # Overridden by BenchmarkDriver::Runner::Size
+  def metric
+    METRIC
+  end
+
+  def with_script(script)
+    if @config.verbose >= 2
+      sep = '-' * 30
+      $stdout.puts "\n\n#{sep}[Script begin]#{sep}\n#{script}#{sep}[Script end]#{sep}\n\n"
+    end
+
+    Tempfile.open(['benchmark_driver-', '.rb']) do |f|
+      f.puts script
+      f.close
+      return yield(f.path)
+    end
+  end
+
+  # @param [String] prelude
+  # @param [String] script
+  # @param [String] teardown
+  # @param [Integer] loop_count
+  BenchmarkScript = ::BenchmarkDriver::Struct.new(:preludes, :script, :teardown, :loop_count) do
+    def render
+      prelude = preludes.reject(&:nil?).reject(&:empty?).join("\n")
+      <<-RUBY
+#{prelude}
+#{while_loop(script, loop_count)}
+#{teardown}
+
+result_file, target, memory_status = ARGV
+require_relative memory_status
+
+ms = Memory::Status.new
+case target.to_sym
+when :peak
+  key = ms.respond_to?(:hwm) ? :hwm : :peak
+when :size
+  key = ms.respond_to?(:rss) ? :rss : :size
+else
+  raise('unexpected target: ' + target)
+end
+
+File.write(result_file, ms[key])
+      RUBY
+    end
+
+    private
+
+    def while_loop(content, times)
+      if !times.is_a?(Integer) || times <= 0
+        raise ArgumentError.new("Unexpected times: #{times.inspect}")
+      end
+
+      if times > 1
+        <<-RUBY
+__bmdv_i = 0
+while __bmdv_i < #{times}
+  #{content}
+  __bmdv_i += 1
+end
+        RUBY
+      else
+        content
+      end
+    end
+  end
+  private_constant :BenchmarkScript
+end
diff --git a/benchmark/lib/benchmark_driver/runner/size.rb b/benchmark/lib/benchmark_driver/runner/size.rb
new file mode 100644
index 0000000000..1b31f901c7
--- /dev/null
+++ b/benchmark/lib/benchmark_driver/runner/size.rb
@@ -0,0 +1,25 @@
+require 'benchmark_driver/runner/peak'
+
+# Actually the same as BenchmarkDriver::Runner::Memory
+class BenchmarkDriver::Runner::Size < BenchmarkDriver::Runner::Peak
+  METRIC = BenchmarkDriver::Metric.new(
+    name: 'Max resident set size', unit: 'bytes', larger_better: false, worse_word: 'larger',
+  )
+
+  # JobParser returns this, `BenchmarkDriver::Runner.runner_for` searches "*::Job"
+  Job = Class.new(BenchmarkDriver::DefaultJob)
+  # Dynamically fetched and used by `BenchmarkDriver::JobParser.parse`
+  JobParser = BenchmarkDriver::DefaultJobParser.for(klass: Job, metrics: [METRIC])
+
+  private
+
+  # Overriding BenchmarkDriver::Runner::Peak#metric
+  def metric
+    METRIC
+  end
+
+  # Overriding BenchmarkDriver::Runner::Peak#target
+  def target
+    'size'
+  end
+end
diff --git a/benchmark/lib/benchmark_driver/runner/stime.rb b/benchmark/lib/benchmark_driver/runner/stime.rb
new file mode 100644
index 0000000000..4577fb0bf8
--- /dev/null
+++ b/benchmark/lib/benchmark_driver/runner/stime.rb
@@ -0,0 +1,22 @@
+require 'benchmark_driver/runner/total'
+
+class BenchmarkDriver::Runner::Stime < BenchmarkDriver::Runner::Total
+  METRIC = BenchmarkDriver::Metric.new(name: 'stime', unit: 's', larger_better: false)
+
+  # JobParser returns this, `BenchmarkDriver::Runner.runner_for` searches "*::Job"
+  Job = Class.new(BenchmarkDriver::DefaultJob)
+  # Dynamically fetched and used by `BenchmarkDriver::JobParser.parse`
+  JobParser = BenchmarkDriver::DefaultJobParser.for(klass: Job, metrics: [METRIC])
+
+  private
+
+  # Overriding BenchmarkDriver::Runner::Total#metric
+  def metric
+    METRIC
+  end
+
+  # Overriding BenchmarkDriver::Runner::Total#target
+  def target
+    :stime
+  end
+end
diff --git a/benchmark/lib/benchmark_driver/runner/total.rb b/benchmark/lib/benchmark_driver/runner/total.rb
new file mode 100644
index 0000000000..64dc14f84e
--- /dev/null
+++ b/benchmark/lib/benchmark_driver/runner/total.rb
@@ -0,0 +1,137 @@
+require 'benchmark_driver/struct'
+require 'benchmark_driver/metric'
+require 'benchmark_driver/default_job'
+require 'benchmark_driver/default_job_parser'
+require 'tempfile'
+
+class BenchmarkDriver::Runner::Total
+  METRIC = BenchmarkDriver::Metric.new(name: 'Total time', unit: 's', larger_better: false)
+
+  # JobParser returns this, `BenchmarkDriver::Runner.runner_for` searches "*::Job"
+  Job = Class.new(BenchmarkDriver::DefaultJob)
+  # Dynamically fetched and used by `BenchmarkDriver::JobParser.parse`
+  JobParser = BenchmarkDriver::DefaultJobParser.for(klass: Job, metrics: [METRIC])
+
+  # @param [BenchmarkDriver::Config::RunnerConfig] config
+  # @param [BenchmarkDriver::Output] output
+  # @param [BenchmarkDriver::Context] contexts
+  def initialize(config:, output:, contexts:)
+    @config = config
+    @output = output
+    @contexts = contexts
+  end
+
+  # This method is dynamically called by `BenchmarkDriver::JobRunner.run`
+  # @param [Array<BenchmarkDriver::Runner::Total::Job>] jobs
+  def run(jobs)
+    if jobs.any? { |job| job.loop_count.nil? }
+      raise 'missing loop_count is not supported in Ruby repository'
+    end
+
+    @output.with_benchmark do
+      jobs.each do |job|
+        @output.with_job(name: job.name) do
+          job.runnable_contexts(@contexts).each do |context|
+            duration = BenchmarkDriver::Repeater.with_repeat(config: @config, larger_better: false) do
+              run_benchmark(job, context: context)
+            end
+            @output.with_context(name: context.name, executable: context.executable, gems: context.gems, prelude: context.prelude) do
+              @output.report(values: { metric => duration }, duration: duration, loop_count: job.loop_count)
+            end
+          end
+        end
+      end
+    end
+  end
+
+  private
+
+  # @param [BenchmarkDriver::Runner::Ips::Job] job - loop_count is not nil
+  # @param [BenchmarkDriver::Context] context
+  # @return [BenchmarkDriver::Metrics]
+  def run_benchmark(job, context:)
+    benchmark = BenchmarkScript.new(
+      preludes:   [context.prelude, job.prelude],
+      script:     job.script,
+      teardown:   job.teardown,
+      loop_count: job.loop_count,
+    )
+
+    Tempfile.open(['benchmark_driver-', '.rb']) do |f|
+      with_script(benchmark.render(result: f.path, target: target)) do |path|
+        IO.popen([*context.executable.command, path], &:read) # TODO: print stdout if verbose=2
+        if $?.success?
+          Float(f.read)
+        else
+          BenchmarkDriver::Result::ERROR
+        end
+      end
+    end
+  end
+
+  # This method is overridden by some subclasses
+  def metric
+    METRIC
+  end
+
+  # This method is overridden by some subclasses
+  def target
+    :total
+  end
+
+  def with_script(script)
+    if @config.verbose >= 2
+      sep = '-' * 30
+      $stdout.puts "\n\n#{sep}[Script begin]#{sep}\n#{script}#{sep}[Script end]#{sep}\n\n"
+    end
+
+    Tempfile.open(['benchmark_driver-', '.rb']) do |f|
+      f.puts script
+      f.close
+      return yield(f.path)
+    end
+  end
+
+  # @param [String] prelude
+  # @param [String] script
+  # @param [String] teardown
+  # @param [Integer] loop_count
+  BenchmarkScript = ::BenchmarkDriver::Struct.new(:preludes, :script, :teardown, :loop_count) do
+    # @param [String] result - A file to write result
+    def render(result:, target:)
+      prelude = preludes.reject(&:nil?).reject(&:empty?).join("\n")
+      <<-RUBY
+#{prelude}
+
+require 'benchmark'
+__bmdv_result = Benchmark.measure {
+  #{while_loop(script, loop_count)}
+}
+
+#{teardown}
+
+File.write(#{result.dump}, __bmdv_result.#{target})
+      RUBY
+    end
+
+    private
+
+    def while_loop(content, times)
+      if !times.is_a?(Integer) || times <= 0
+        raise ArgumentError.new("Unexpected times: #{times.inspect}")
+      elsif times == 1
+        return content
+      end
+
+      # TODO: execute in batch
+      <<-RUBY
+__bmdv_i = 0
+while __bmdv_i < #{times}
+  #{content}
+  __bmdv_i += 1
+end
+      RUBY
+    end
+  end
+  private_constant :BenchmarkScript
+end
diff --git a/benchmark/lib/benchmark_driver/runner/utime.rb b/benchmark/lib/benchmark_driver/runner/utime.rb
new file mode 100644
index 0000000000..b61d83a188
--- /dev/null
+++ b/benchmark/lib/benchmark_driver/runner/utime.rb
@@ -0,0 +1,22 @@
+require 'benchmark_driver/runner/total'
+
+class BenchmarkDriver::Runner::Utime < BenchmarkDriver::Runner::Total
+  METRIC = BenchmarkDriver::Metric.new(name: 'utime', unit: 's', larger_better: false)
+
+  # JobParser returns this, `BenchmarkDriver::Runner.runner_for` searches "*::Job"
+  Job = Class.new(BenchmarkDriver::DefaultJob)
+  # Dynamically fetched and used by `BenchmarkDriver::JobParser.parse`
+  JobParser = BenchmarkDriver::DefaultJobParser.for(klass: Job, metrics: [METRIC])
+
+  private
+
+  # Overriding BenchmarkDriver::Runner::Total#metric
+  def metric
+    METRIC
+  end
+
+  # Overriding BenchmarkDriver::Runner::Total#target
+  def target
+    :utime
+  end
+end
diff --git a/benchmark/lib/load.rb b/benchmark/lib/load.rb
new file mode 100644
index 0000000000..31b770c484
--- /dev/null
+++ b/benchmark/lib/load.rb
@@ -0,0 +1,18 @@
+# How to use this file:
+#   1. write a `$(srcdir)/test.rb` like:
+=begin
+require_relative 'benchmark/lib/load'
+
+Benchmark.driver(repeat_count: 5){|x|
+  x.executable name: 'clean-miniruby', command: %w'../clean-trunk/miniruby'
+  x.executable name: 'modif-miniruby', command: %w'./miniruby'
+
+  x.report %q{
+    h = {a: 1, b: 2, c: 3, d: 4}
+  }
+}
+=end
+#
+#  2. `make run`
+$:.unshift(File.join(__dir__, '../benchmark-driver/lib'))
+require 'benchmark_driver'
diff --git a/benchmark/bm_loop_for.rb b/benchmark/loop_for.rb
index 0fc4cc1511..0fc4cc1511 100644
--- a/benchmark/bm_loop_for.rb
+++ b/benchmark/loop_for.rb
diff --git a/benchmark/bm_loop_generator.rb b/benchmark/loop_generator.rb
index d3375c744c..d3375c744c 100644
--- a/benchmark/bm_loop_generator.rb
+++ b/benchmark/loop_generator.rb
diff --git a/benchmark/bm_loop_times.rb b/benchmark/loop_times.rb
index 521f72ad1a..521f72ad1a 100644
--- a/benchmark/bm_loop_times.rb
+++ b/benchmark/loop_times.rb
diff --git a/benchmark/bm_loop_whileloop.rb b/benchmark/loop_whileloop.rb
index 0072822c06..0072822c06 100644
--- a/benchmark/bm_loop_whileloop.rb
+++ b/benchmark/loop_whileloop.rb
diff --git a/benchmark/bm_loop_whileloop2.rb b/benchmark/loop_whileloop2.rb
index 47d02dffc4..47d02dffc4 100644
--- a/benchmark/bm_loop_whileloop2.rb
+++ b/benchmark/loop_whileloop2.rb
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/bm_marshal_dump_flo.rb b/benchmark/marshal_dump_flo.rb
index 9b8d0c6afb..9b8d0c6afb 100644
--- a/benchmark/bm_marshal_dump_flo.rb
+++ b/benchmark/marshal_dump_flo.rb
diff --git a/benchmark/bm_marshal_dump_load_geniv.rb b/benchmark/marshal_dump_load_geniv.rb
index 8252ad90fa..8252ad90fa 100644
--- a/benchmark/bm_marshal_dump_load_geniv.rb
+++ b/benchmark/marshal_dump_load_geniv.rb
diff --git a/benchmark/bm_marshal_dump_load_time.rb b/benchmark/marshal_dump_load_time.rb
index e29743b791..e29743b791 100644
--- a/benchmark/bm_marshal_dump_load_time.rb
+++ b/benchmark/marshal_dump_load_time.rb
diff --git a/benchmark/match_gt4.rb b/benchmark/match_gt4.rb
new file mode 100644
index 0000000000..ffda109912
--- /dev/null
+++ b/benchmark/match_gt4.rb
@@ -0,0 +1 @@
+1000000.times { /(.)(.)(\d+)(\d)/.match("THX1138.") }
diff --git a/benchmark/match_small.rb b/benchmark/match_small.rb
new file mode 100644
index 0000000000..3b743d484a
--- /dev/null
+++ b/benchmark/match_small.rb
@@ -0,0 +1 @@
+1000000.times { 'haystack'.match(/hay/) }
diff --git a/benchmark/memory_wrapper.rb b/benchmark/memory_wrapper.rb
deleted file mode 100644
index 3f4451a037..0000000000
--- a/benchmark/memory_wrapper.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-
-write_file, target, script_file = ARGV
-
-load(script_file)
-require_relative '../test/lib/memory_status'
-open(write_file, 'wb'){|f|
-  ms = Memory::Status.new
-  case target.to_sym
-  when :peak
-    key = ms.respond_to?(:hwm) ? :hwm : :peak
-  when :size
-    key = ms.respond_to?(:rss) ? :rss : :size
-  end
-
-  f.puts ms[key]
-}
diff --git a/benchmark/mjit_exec_jt2jt.yml b/benchmark/mjit_exec_jt2jt.yml
new file mode 100644
index 0000000000..6c303c7a44
--- /dev/null
+++ b/benchmark/mjit_exec_jt2jt.yml
@@ -0,0 +1,6 @@
+type: lib/benchmark_driver/runner/mjit_exec
+num_methods: [1]
+#num_methods: (1..100).to_a + [200, 300, 400, 500, 600, 700, 800, 900, 1000]
+loop_count: 50000000
+from_jit: true
+to_jit: true
diff --git a/benchmark/mjit_exec_vm2jt.yml b/benchmark/mjit_exec_vm2jt.yml
new file mode 100644
index 0000000000..764883f070
--- /dev/null
+++ b/benchmark/mjit_exec_vm2jt.yml
@@ -0,0 +1,6 @@
+type: lib/benchmark_driver/runner/mjit_exec
+num_methods: [1]
+#num_methods: (1..100).to_a + [200, 300, 400, 500, 600, 700, 800, 900, 1000]
+loop_count: 50000000
+from_jit: false
+to_jit: true
diff --git a/benchmark/mjit_exec_vm2vm.yml b/benchmark/mjit_exec_vm2vm.yml
new file mode 100644
index 0000000000..030aa76c1c
--- /dev/null
+++ b/benchmark/mjit_exec_vm2vm.yml
@@ -0,0 +1,6 @@
+type: lib/benchmark_driver/runner/mjit_exec
+num_methods: [1]
+#num_methods: (1..100).to_a + [200, 300, 400, 500, 600, 700, 800, 900, 1000]
+loop_count: 50000000
+from_jit: false
+to_jit: false
diff --git a/benchmark/mjit_exivar.yml b/benchmark/mjit_exivar.yml
new file mode 100644
index 0000000000..2584fa6410
--- /dev/null
+++ b/benchmark/mjit_exivar.yml
@@ -0,0 +1,18 @@
+type: lib/benchmark_driver/runner/mjit
+prelude: |
+  class Bench < Hash
+    def initialize
+      @exivar = nil
+    end
+
+    def exivar
+      @exivar
+    end
+  end
+
+  bench = Bench.new
+
+benchmark:
+  mjit_exivar: bench.exivar
+
+loop_count: 200000000
diff --git a/benchmark/mjit_integer.yml b/benchmark/mjit_integer.yml
new file mode 100644
index 0000000000..edc3556479
--- /dev/null
+++ b/benchmark/mjit_integer.yml
@@ -0,0 +1,30 @@
+type: lib/benchmark_driver/runner/mjit
+prelude: |
+  def mjit_abs(int)        int.abs        end
+  def mjit_bit_length(int) int.bit_length end
+  def mjit_comp(int)       ~int           end
+  def mjit_even?(int)      int.even?      end
+  def mjit_integer?(int)   int.integer?   end
+  def mjit_magnitude(int)  int.magnitude  end
+  def mjit_odd?(int)       int.odd?       end
+  def mjit_ord(int)        int.ord        end
+  def mjit_to_i(int)       int.to_i       end
+  def mjit_to_int(int)     int.to_int     end
+  def mjit_uminus(int)     -int           end
+  def mjit_zero?(int)      int.zero?      end
+
+benchmark:
+  - mjit_abs(-1)
+  - mjit_bit_length(100)
+  - mjit_comp(1)
+  - mjit_even?(2)
+  - mjit_integer?(0)
+  - mjit_magnitude(-1)
+  - mjit_odd?(1)
+  - mjit_ord(1)
+  - mjit_to_i(1)
+  - mjit_to_int(1)
+  - mjit_uminus(1)
+  - mjit_zero?(0)
+
+loop_count: 40000000
diff --git a/benchmark/mjit_kernel.yml b/benchmark/mjit_kernel.yml
new file mode 100644
index 0000000000..7720e65c2c
--- /dev/null
+++ b/benchmark/mjit_kernel.yml
@@ -0,0 +1,20 @@
+type: lib/benchmark_driver/runner/mjit
+prelude: |
+  def mjit_class(obj)
+    obj.class
+  end
+
+  def mjit_frozen?(obj)
+    obj.frozen?
+  end
+
+  str = ""
+  fstr = "".freeze
+
+benchmark:
+  - mjit_class(self)
+  - mjit_class(1)
+  - mjit_frozen?(str)
+  - mjit_frozen?(fstr)
+
+loop_count: 40000000
diff --git a/benchmark/mjit_leave.yml b/benchmark/mjit_leave.yml
new file mode 100644
index 0000000000..9ac68b164b
--- /dev/null
+++ b/benchmark/mjit_leave.yml
@@ -0,0 +1,8 @@
+type: lib/benchmark_driver/runner/mjit
+prelude: |
+  def leave
+    nil
+  end
+benchmark:
+  mjit_leave: leave
+loop_count: 200000000
diff --git a/benchmark/mjit_opt_cc_insns.yml b/benchmark/mjit_opt_cc_insns.yml
new file mode 100644
index 0000000000..fed6d34bd5
--- /dev/null
+++ b/benchmark/mjit_opt_cc_insns.yml
@@ -0,0 +1,27 @@
+# opt_* insns using vm_method_cfunc_is with send-compatible operands:
+#   * opt_nil_p
+#   * opt_not
+#   * opt_eq
+type: lib/benchmark_driver/runner/mjit
+prelude: |
+  def mjit_nil?(obj)
+    obj.nil?
+  end
+
+  def mjit_not(obj)
+    !obj
+  end
+
+  def mjit_eq(a, b)
+    a == b
+  end
+
+benchmark:
+  - script: mjit_nil?(1)
+    loop_count: 40000000
+  - script: mjit_not(1)
+    loop_count: 40000000
+  - script: mjit_eq(1, nil)
+    loop_count: 8000000
+  - script: mjit_eq(nil, 1)
+    loop_count: 8000000
diff --git a/benchmark/mjit_struct_aref.yml b/benchmark/mjit_struct_aref.yml
new file mode 100644
index 0000000000..bfba1323f2
--- /dev/null
+++ b/benchmark/mjit_struct_aref.yml
@@ -0,0 +1,10 @@
+type: lib/benchmark_driver/runner/mjit
+prelude: |
+  def mjit_struct_aref(struct)
+    struct.aa
+  end
+  struct = Struct.new(:a0, :a1, :a2, :a3, :a4, :a5, :a6, :a7, :a8, :a9, :aa).new
+
+benchmark: mjit_struct_aref(struct)
+
+loop_count: 40000000
diff --git a/benchmark/nil_p.yml b/benchmark/nil_p.yml
new file mode 100644
index 0000000000..79ba4f2177
--- /dev/null
+++ b/benchmark/nil_p.yml
@@ -0,0 +1,9 @@
+prelude: |
+  class Niller; def nil?; true; end; end
+  xnil, notnil = nil, Object.new
+  niller = Niller.new
+benchmark:
+  - xnil.nil?
+  - notnil.nil?
+  - niller.nil?
+loop_count: 10000000
diff --git a/benchmark/num_zero_p.yml b/benchmark/num_zero_p.yml
new file mode 100644
index 0000000000..2195963433
--- /dev/null
+++ b/benchmark/num_zero_p.yml
@@ -0,0 +1,8 @@
+benchmark:
+  - 0.zero?
+  - 1.zero?
+  - 0r.zero?
+  - 1r.zero?
+  - 0i.zero?
+  - 1i.zero?
+loop_count: 50000000
diff --git a/benchmark/object_allocate.yml b/benchmark/object_allocate.yml
new file mode 100644
index 0000000000..93ff463e41
--- /dev/null
+++ b/benchmark/object_allocate.yml
@@ -0,0 +1,21 @@
+prelude: |
+  class Eight
+    8.times { include(Module.new) }
+  end
+  class ThirtyTwo
+    32.times { include(Module.new) }
+  end
+  class SixtyFour
+    64.times { include(Module.new) }
+  end
+  class OneTwentyEight
+    128.times { include(Module.new) }
+  end
+  # Disable GC to see raw throughput:
+  GC.disable
+benchmark:
+  allocate_8_deep: Eight.new
+  allocate_32_deep: ThirtyTwo.new
+  allocate_64_deep: SixtyFour.new
+  allocate_128_deep: OneTwentyEight.new
+loop_count: 100000
diff --git a/benchmark/objspace_dump_all.yml b/benchmark/objspace_dump_all.yml
new file mode 100644
index 0000000000..ebab562d2e
--- /dev/null
+++ b/benchmark/objspace_dump_all.yml
@@ -0,0 +1,13 @@
+prelude: |
+  require 'objspace'
+  require 'tempfile'
+  $objs = 1_000.times.map { Object.new }
+  $strings = 1_000.times.map { |i| "string #{i}" }
+  $file = Tempfile.new('heap')
+  $dev_null = File.open(File::NULL, 'w+')
+
+benchmark:
+  dump_all_string: "ObjectSpace.dump_all(output: :string)"
+  dump_all_file: "ObjectSpace.dump_all(output: $file)"
+  dump_all_dev_null: "ObjectSpace.dump_all(output: $dev_null)"
+loop_count: 1
diff --git a/benchmark/other-lang/fact.py b/benchmark/other-lang/fact.py
index 01593965d9..1ce9f76275 100644
--- a/benchmark/other-lang/fact.py
+++ b/benchmark/other-lang/fact.py
@@ -3,7 +3,7 @@
 
 def factL(n):
 	r = 1
-	for x in range(2, n):
+	for x in range(2, n+1):
 		r *= x
 	return r
 
diff --git a/benchmark/pm_array.yml b/benchmark/pm_array.yml
new file mode 100644
index 0000000000..babb65a289
--- /dev/null
+++ b/benchmark/pm_array.yml
@@ -0,0 +1,19 @@
+prelude: |
+  def call(*val)
+    case val
+      in [String => body]
+        [200, {}, [body]]
+      in [Integer => status]
+        [status, {}, [""]]
+      in [Integer, String] => response
+        [response[0], {}, [response[1]]]
+      in [Integer, Hash, String] => response
+        [response[0], response[1], [response[2]]]
+    end
+  end
+
+benchmark:
+  first_match: call("ok")
+  second_match: call(401)
+  third_match: call(200, "ok")
+  fourth_match: call(201, {}, "created")
diff --git a/benchmark/prepare_require.rb b/benchmark/prepare_require.rb
deleted file mode 100644
index c4786f04ad..0000000000
--- a/benchmark/prepare_require.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require "fileutils"
-
-def prepare
-  num_files = 10000
-
-  basename = File.dirname($0)
-  data_dir = File.join(basename, "bm_require.data")
-
-  # skip if all of files exists
-  if File.exist?(File.join(data_dir, "c#{num_files}.rb"))
-    return
-  end
-
-  FileUtils.mkdir_p(data_dir)
-
-  1.upto(num_files) do |i|
-    f = File.open("#{data_dir}/c#{i}.rb", "w")
-    f.puts <<-END
-      class C#{i}
-      end
-    END
-  end
-end
-
-prepare
diff --git a/benchmark/prepare_require_thread.rb b/benchmark/prepare_require_thread.rb
deleted file mode 100644
index 339ecb8b39..0000000000
--- a/benchmark/prepare_require_thread.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-load File.join(File.dirname(__FILE__), "prepare_require.rb")
-
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 d83aeb7a7e..0000000000
--- a/benchmark/prepare_so_k_nucleotide.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require_relative '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 da3ec2df14..0000000000
--- a/benchmark/prepare_so_reverse_complement.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require_relative 'make_fasta_output'
-prepare_fasta_output(2_500_000)
diff --git a/benchmark/range_last.yml b/benchmark/range_last.yml
new file mode 100644
index 0000000000..a6674f82ee
--- /dev/null
+++ b/benchmark/range_last.yml
@@ -0,0 +1,4 @@
+benchmark:
+  - (1..1_000_000).last(100)
+  - (1..1_000_000).last(1000)
+  - (1..1_000_000).last(10000)
diff --git a/benchmark/realpath.yml b/benchmark/realpath.yml
new file mode 100644
index 0000000000..90a029d5b9
--- /dev/null
+++ b/benchmark/realpath.yml
@@ -0,0 +1,30 @@
+prelude: |
+  f = File
+  pwd = Dir.pwd
+  Dir.mkdir('b') unless f.directory?('b')
+  f.write('b/a', '') unless f.file?('b/a')
+
+  relative = 'b/a'
+  absolute = File.join(pwd, relative)
+  dir = 'b'
+  file = 'a'
+
+  relative_dir = 'b/c'
+  absolute_dir = File.join(pwd, relative_dir)
+  file_dir = 'c'
+benchmark:
+  relative_nil: "f.realpath(relative, nil)"
+  absolute_nil: "f.realpath(absolute, nil)"
+  relative_relative: "f.realpath(file, dir)"
+  absolute_relative: "f.realpath(absolute, dir)"
+  relative_absolute: "f.realpath(relative, pwd)"
+  relative_nil_dir: "f.realdirpath(relative_dir, nil)"
+  absolute_nil_dir: "f.realdirpath(absolute_dir, nil)"
+  relative_relative_dir: "f.realdirpath(file_dir, dir)"
+  absolute_relative_dir: "f.realdirpath(absolute_dir, dir)"
+  relative_absolute_dir: "f.realdirpath(relative_dir, pwd)"
+  relative_nil_notexist: "f.realpath(relative_dir, nil) rescue nil"
+  absolute_nil_notexist: "f.realpath(absolute_dir, nil) rescue nil"
+  relative_relative_notexist: "f.realpath(file_dir, dir) rescue nil"
+  absolute_relative_notexist: "f.realpath(absolute_dir, dir) rescue nil"
+  relative_absolute_notexist: "f.realpath(relative_dir, pwd) rescue nil"
diff --git a/benchmark/report.rb b/benchmark/report.rb
deleted file mode 100644
index d2dc56b1e1..0000000000
--- a/benchmark/report.rb
+++ /dev/null
@@ -1,79 +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'] || RbConfig.ruby
-
-  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/require.yml b/benchmark/require.yml
new file mode 100644
index 0000000000..09f218cf08
--- /dev/null
+++ b/benchmark/require.yml
@@ -0,0 +1,32 @@
+prelude: |
+  require "fileutils"
+
+  def prepare
+    num_files = 10000
+
+    basename = File.dirname($0)
+    data_dir = File.join(basename, "bm_require.data")
+
+    # skip if all of files exists
+    if File.exist?(File.join(data_dir, "c#{num_files}.rb"))
+      return
+    end
+
+    FileUtils.mkdir_p(data_dir)
+
+    1.upto(num_files) do |i|
+      File.write("#{data_dir}/c#{i}.rb", "class C#{i}\n""end\n")
+    end
+  end
+
+  prepare
+benchmark:
+  require: |
+    $:.push File.join(File.dirname(__FILE__), "bm_require.data")
+
+    1.upto(10000) do |i|
+      require "c#{i}"
+    end
+
+    $:.pop
+loop_count: 1
diff --git a/benchmark/require_thread.yml b/benchmark/require_thread.yml
new file mode 100644
index 0000000000..0c63257106
--- /dev/null
+++ b/benchmark/require_thread.yml
@@ -0,0 +1,40 @@
+prelude: |
+  require "fileutils"
+
+  def prepare
+    num_files = 10000
+
+    basename = File.dirname($0)
+    data_dir = File.join(basename, "bm_require.data")
+
+    # skip if all of files exists
+    if File.exist?(File.join(data_dir, "c#{num_files}.rb"))
+      return
+    end
+
+    FileUtils.mkdir_p(data_dir)
+
+    1.upto(num_files) do |i|
+      File.write("#{data_dir}/c#{i}.rb", "class C#{i}\n""end\n")
+    end
+  end
+
+  prepare
+benchmark:
+  require_thread: |
+    $:.push File.join(File.dirname(__FILE__), "bm_require.data")
+
+    i=0
+    t = Thread.new do
+      while true
+        i = i+1 # dummy loop
+      end
+    end
+
+    1.upto(100) do |i|
+      require "c#{i}"
+    end
+
+    $:.pop
+    t.kill
+loop_count: 1
diff --git a/benchmark/run.rb b/benchmark/run.rb
deleted file mode 100644
index 0cd2363849..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 97c5cef045..0000000000
--- a/benchmark/runc.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-#
-#
-
-require 'benchmark'
-require 'rbconfig'
-
-$rubybin = ENV['RUBY'] || RbConfig.ruby
-
-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/bm_securerandom.rb b/benchmark/securerandom.rb
index a082ea6d5b..a082ea6d5b 100644
--- a/benchmark/bm_securerandom.rb
+++ b/benchmark/securerandom.rb
diff --git a/benchmark/so_ackermann.rb b/benchmark/so_ackermann.rb
new file mode 100644
index 0000000000..4effa1ecaf
--- /dev/null
+++ b/benchmark/so_ackermann.rb
@@ -0,0 +1,19 @@
+#!/usr/bin/ruby
+# -*- 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/so_array.rb b/benchmark/so_array.rb
new file mode 100644
index 0000000000..767e03db5f
--- /dev/null
+++ b/benchmark/so_array.rb
@@ -0,0 +1,23 @@
+#!/usr/bin/ruby
+# -*- 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/so_binary_trees.rb
index b1693e4109..b1693e4109 100644
--- a/benchmark/bm_so_binary_trees.rb
+++ b/benchmark/so_binary_trees.rb
diff --git a/benchmark/so_concatenate.rb b/benchmark/so_concatenate.rb
new file mode 100644
index 0000000000..4468e20ac8
--- /dev/null
+++ b/benchmark/so_concatenate.rb
@@ -0,0 +1,18 @@
+#!/usr/bin/ruby
+# -*- 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 = ''
+  4_000_000.times do |e|
+    hello << STUFF
+  end
+end
+# puts hello.length
+
+
diff --git a/benchmark/so_count_words.yml b/benchmark/so_count_words.yml
new file mode 100644
index 0000000000..99683505f9
--- /dev/null
+++ b/benchmark/so_count_words.yml
@@ -0,0 +1,65 @@
+prelude: |
+  #!/usr/bin/ruby
+
+  wc_input_base = <<EOS
+  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
+  EOS
+
+  # prepare 'wc.input'
+
+  def prepare_wc_input(wcbase)
+    wcinput = File.join(File.dirname($0), 'wc.input')
+    unless FileTest.exist?(wcinput)
+      data = wcbase.dup
+      13.times{
+        data << data
+      }
+      open(wcinput, 'w'){|f| f.write data}
+    end
+  end
+
+  prepare_wc_input(wc_input_base)
+
+benchmark:
+  so_count_words: |
+    # $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}"
+
+loop_count: 1
diff --git a/benchmark/so_exception.rb b/benchmark/so_exception.rb
new file mode 100644
index 0000000000..eb205b4df1
--- /dev/null
+++ b/benchmark/so_exception.rb
@@ -0,0 +1,61 @@
+#!/usr/bin/ruby
+# -*- 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/so_fannkuch.rb
index bac5ecd44c..bac5ecd44c 100644
--- a/benchmark/bm_so_fannkuch.rb
+++ b/benchmark/so_fannkuch.rb
diff --git a/benchmark/so_fasta.rb b/benchmark/so_fasta.rb
new file mode 100644
index 0000000000..dcc6b39507
--- /dev/null
+++ b/benchmark/so_fasta.rb
@@ -0,0 +1,81 @@
+# 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/so_k_nucleotide.yml b/benchmark/so_k_nucleotide.yml
new file mode 100644
index 0000000000..d7df086c39
--- /dev/null
+++ b/benchmark/so_k_nucleotide.yml
@@ -0,0 +1,155 @@
+prelude: |
+  bm_so_fasta = <<'EOS'
+  # 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)
+  EOS
+benchmark:
+  - name: so_k_nucleotide
+    prelude: |
+      script = File.join(File.dirname($0), 'bm_so_fasta.rb')
+      File.write(script, bm_so_fasta)
+
+      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
+      prepare_fasta_output(100_000)
+    script: |
+      # 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) }
+    loop_count: 1
diff --git a/benchmark/bm_so_lists.rb b/benchmark/so_lists.rb
index e8f4a2a5f7..e8f4a2a5f7 100644
--- a/benchmark/bm_so_lists.rb
+++ b/benchmark/so_lists.rb
diff --git a/benchmark/bm_so_mandelbrot.rb b/benchmark/so_mandelbrot.rb
index 76331c64b8..76331c64b8 100644
--- a/benchmark/bm_so_mandelbrot.rb
+++ b/benchmark/so_mandelbrot.rb
diff --git a/benchmark/so_matrix.rb b/benchmark/so_matrix.rb
new file mode 100644
index 0000000000..2d1e72bda9
--- /dev/null
+++ b/benchmark/so_matrix.rb
@@ -0,0 +1,48 @@
+#!/usr/bin/ruby
+# -*- 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 = 40
+
+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/so_meteor_contest.rb b/benchmark/so_meteor_contest.rb
new file mode 100644
index 0000000000..8c136baa6c
--- /dev/null
+++ b/benchmark/so_meteor_contest.rb
@@ -0,0 +1,563 @@
+#!/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 boundaries 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 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 across the rows
+  (location / 6).to_i.upto(9) do | row_on |
+    # obtain a set of regions representing the bits of the current 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 multiple 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
+          # following 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 achieved 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 noticeable 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/so_nbody.rb
index d6c5bb9e61..d6c5bb9e61 100644
--- a/benchmark/bm_so_nbody.rb
+++ b/benchmark/so_nbody.rb
diff --git a/benchmark/so_nested_loop.rb b/benchmark/so_nested_loop.rb
new file mode 100644
index 0000000000..766fcf7b84
--- /dev/null
+++ b/benchmark/so_nested_loop.rb
@@ -0,0 +1,24 @@
+#!/usr/bin/ruby
+# -*- 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/so_nsieve.rb
index a65cc78233..a65cc78233 100644
--- a/benchmark/bm_so_nsieve.rb
+++ b/benchmark/so_nsieve.rb
diff --git a/benchmark/bm_so_nsieve_bits.rb b/benchmark/so_nsieve_bits.rb
index 6f958ee44e..6f958ee44e 100644
--- a/benchmark/bm_so_nsieve_bits.rb
+++ b/benchmark/so_nsieve_bits.rb
diff --git a/benchmark/so_object.rb b/benchmark/so_object.rb
new file mode 100644
index 0000000000..131f44624c
--- /dev/null
+++ b/benchmark/so_object.rb
@@ -0,0 +1,56 @@
+#!/usr/bin/ruby
+# -*- 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/so_partial_sums.rb
index 630b45cb8d..630b45cb8d 100644
--- a/benchmark/bm_so_partial_sums.rb
+++ b/benchmark/so_partial_sums.rb
diff --git a/benchmark/so_pidigits.rb b/benchmark/so_pidigits.rb
new file mode 100644
index 0000000000..9a537b2d1c
--- /dev/null
+++ b/benchmark/so_pidigits.rb
@@ -0,0 +1,92 @@
+# 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/so_random.rb
index a66b9e8e63..a66b9e8e63 100644
--- a/benchmark/bm_so_random.rb
+++ b/benchmark/so_random.rb
diff --git a/benchmark/so_reverse_complement.yml b/benchmark/so_reverse_complement.yml
new file mode 100644
index 0000000000..de05eedfc4
--- /dev/null
+++ b/benchmark/so_reverse_complement.yml
@@ -0,0 +1,137 @@
+prelude: |
+  bm_so_fasta = <<'EOS'
+  # 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)
+  EOS
+benchmark:
+  - name: so_reverse_complement
+    prelude: |
+      script = File.join(File.dirname($0), 'bm_so_fasta.rb')
+      File.write(script, bm_so_fasta)
+
+      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
+      prepare_fasta_output(2_500_000)
+    script: |
+      # 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)
+    loop_count: 1
diff --git a/benchmark/bm_so_sieve.rb b/benchmark/so_sieve.rb
index 43dc302648..43dc302648 100644
--- a/benchmark/bm_so_sieve.rb
+++ b/benchmark/so_sieve.rb
diff --git a/benchmark/bm_so_spectralnorm.rb b/benchmark/so_spectralnorm.rb
index 6b97206689..6b97206689 100644
--- a/benchmark/bm_so_spectralnorm.rb
+++ b/benchmark/so_spectralnorm.rb
diff --git a/benchmark/string_capitalize.yml b/benchmark/string_capitalize.yml
new file mode 100644
index 0000000000..7d23fd3d35
--- /dev/null
+++ b/benchmark/string_capitalize.yml
@@ -0,0 +1,10 @@
+prelude: |
+  str1 = [*"a".."m",*"N".."Z",*"0".."9"].join("")
+  str10 = str1 * 10
+  str100 = str10 * 10
+  str1000 = str100 * 10
+benchmark:
+  capitalize-1: str1.capitalize
+  capitalize-10: str10.capitalize
+  capitalize-100: str100.capitalize
+  capitalize-1000: str1000.capitalize
diff --git a/benchmark/string_casecmp.yml b/benchmark/string_casecmp.yml
new file mode 100644
index 0000000000..2354040a04
--- /dev/null
+++ b/benchmark/string_casecmp.yml
@@ -0,0 +1,26 @@
+prelude: |
+  lstr1 = [*"a".."z",*"0".."9"].join("")
+  lstr10 = lstr1 * 10
+  lstr100 = lstr10 * 10
+  lstr1000 = lstr100 * 10
+  lnonascii1 = [*"\u{e0}".."\u{ff}"].join("")
+  lnonascii10 = lnonascii1 * 10
+  lnonascii100 = lnonascii10 * 10
+  lnonascii1000 = lnonascii100 * 10
+  ustr1 = [*"A".."Z",*"0".."9"].join("")
+  ustr10 = ustr1 * 10
+  ustr100 = ustr10 * 10
+  ustr1000 = ustr100 * 10
+  unonascii1 = [*"\u{c0}".."\u{df}"].join("")
+  unonascii10 = unonascii1 * 10
+  unonascii100 = unonascii10 * 10
+  unonascii1000 = unonascii100 * 10
+benchmark:
+  casecmp-1: lstr1.casecmp(ustr1)
+  casecmp-10: lstr10.casecmp(ustr10)
+  casecmp-100: lstr100.casecmp(ustr100)
+  casecmp-1000: lstr1000.casecmp(ustr1000)
+  casecmp-nonascii1: lnonascii1.casecmp(unonascii1)
+  casecmp-nonascii10: lnonascii10.casecmp(unonascii10)
+  casecmp-nonascii100: lnonascii100.casecmp(unonascii100)
+  casecmp-nonascii1000: lnonascii1000.casecmp(unonascii1000)
diff --git a/benchmark/string_casecmp_p.yml b/benchmark/string_casecmp_p.yml
new file mode 100644
index 0000000000..a790ce7d55
--- /dev/null
+++ b/benchmark/string_casecmp_p.yml
@@ -0,0 +1,26 @@
+prelude: |
+  lstr1 = [*"a".."z",*"0".."9"].join("")
+  lstr10 = lstr1 * 10
+  lstr100 = lstr10 * 10
+  lstr1000 = lstr100 * 10
+  lnonascii1 = [*"\u{e0}".."\u{ff}"].join("")
+  lnonascii10 = lnonascii1 * 10
+  lnonascii100 = lnonascii10 * 10
+  lnonascii1000 = lnonascii100 * 10
+  ustr1 = [*"A".."Z",*"0".."9"].join("")
+  ustr10 = ustr1 * 10
+  ustr100 = ustr10 * 10
+  ustr1000 = ustr100 * 10
+  unonascii1 = [*"\u{c0}".."\u{df}"].join("")
+  unonascii10 = unonascii1 * 10
+  unonascii100 = unonascii10 * 10
+  unonascii1000 = unonascii100 * 10
+benchmark:
+  casecmp_p-1: lstr1.casecmp?(ustr1)
+  casecmp_p-10: lstr10.casecmp?(ustr10)
+  casecmp_p-100: lstr100.casecmp?(ustr100)
+  casecmp_p-1000: lstr1000.casecmp?(ustr1000)
+  casecmp_p-nonascii1: lnonascii1.casecmp?(unonascii1)
+  casecmp_p-nonascii10: lnonascii10.casecmp?(unonascii10)
+  casecmp_p-nonascii100: lnonascii100.casecmp?(unonascii100)
+  casecmp_p-nonascii1000: lnonascii1000.casecmp?(unonascii1000)
diff --git a/benchmark/string_downcase.yml b/benchmark/string_downcase.yml
new file mode 100644
index 0000000000..1fea6afbec
--- /dev/null
+++ b/benchmark/string_downcase.yml
@@ -0,0 +1,18 @@
+prelude: |
+  str1 = [*"A".."Z",*"0".."9"].join("")
+  str10 = str1 * 10
+  str100 = str10 * 10
+  str1000 = str100 * 10
+  nonascii1 = [*"\u{c0}".."\u{df}"].join("")
+  nonascii10 = nonascii1 * 10
+  nonascii100 = nonascii10 * 10
+  nonascii1000 = nonascii100 * 10
+benchmark:
+  downcase-1: str1.upcase
+  downcase-10: str10.upcase
+  downcase-100: str100.upcase
+  downcase-1000: str1000.upcase
+  downcase-nonascii1: nonascii1.downcase
+  downcase-nonascii10: nonascii10.downcase
+  downcase-nonascii100: nonascii100.downcase
+  downcase-nonascii1000: nonascii1000.downcase
diff --git a/benchmark/string_index.rb b/benchmark/string_index.rb
new file mode 100644
index 0000000000..7783111082
--- /dev/null
+++ b/benchmark/string_index.rb
@@ -0,0 +1,3 @@
+str1 = "あ" * 1024 + "い" # not single byte optimizable
+str2 = "い"
+100_000.times { str1.index(str2) }
diff --git a/benchmark/string_scan_re.rb b/benchmark/string_scan_re.rb
new file mode 100644
index 0000000000..b0d60201a9
--- /dev/null
+++ b/benchmark/string_scan_re.rb
@@ -0,0 +1,2 @@
+str = Array.new(1_000, 'abc').join(',')
+1_000.times { str.scan(/abc/) }
diff --git a/benchmark/string_scan_str.rb b/benchmark/string_scan_str.rb
new file mode 100644
index 0000000000..42440bd948
--- /dev/null
+++ b/benchmark/string_scan_str.rb
@@ -0,0 +1,2 @@
+str = Array.new(1_000, 'abc').join(',')
+1_000.times { str.scan('abc') }
diff --git a/benchmark/string_slice.yml b/benchmark/string_slice.yml
new file mode 100644
index 0000000000..fc2393c5d1
--- /dev/null
+++ b/benchmark/string_slice.yml
@@ -0,0 +1,11 @@
+prelude: |
+  long_string = "x"*1000+"-hår"
+benchmark:
+  regexp-short: |
+    "x-hår".slice!(/-(.)(.)(.)/, 3)
+  regexp-long: |
+    long_string.dup.slice!(/-(.)(.)(.)/, 3)
+  string-short: |
+    "x-hår".slice!("r")
+  string-long: |
+    long_string.dup.slice!("r")
diff --git a/benchmark/string_split.yml b/benchmark/string_split.yml
new file mode 100644
index 0000000000..cc2c7d7855
--- /dev/null
+++ b/benchmark/string_split.yml
@@ -0,0 +1,22 @@
+prelude: |
+  str1 = [*0..5].join(" ") + " "
+  str10 = str1 * 10
+  str100 = str10 * 10
+  str1000 = str100 * 10
+benchmark:
+  to_chars-1: str1.split('')
+  to_chars-10: str10.split('')
+  to_chars-100: str100.split('')
+  to_chars-1000: str1000.split('')
+  to_words-1: str1.split(' ')
+  to_words-10: str10.split(' ')
+  to_words-100: str100.split(' ')
+  to_words-1000: str1000.split(' ')
+  re_chars-1: str1.split(//)
+  re_chars-10: str10.split(//)
+  re_chars-100: str100.split(//)
+  re_chars-1000: str1000.split(//)
+  re_space-1: str1.split(/ /)
+  re_space-10: str10.split(/ /)
+  re_space-100: str100.split(/ /)
+  re_space-1000: str1000.split(/ /)
diff --git a/benchmark/string_swapcase.yml b/benchmark/string_swapcase.yml
new file mode 100644
index 0000000000..eeb5928907
--- /dev/null
+++ b/benchmark/string_swapcase.yml
@@ -0,0 +1,18 @@
+prelude: |
+  str1 = [*"A".."M",*"n".."z",*"0".."9"].join("")
+  str10 = str1 * 10
+  str100 = str10 * 10
+  str1000 = str100 * 10
+  nonascii1 = [*"\u{c0}".."\u{cf}",*"\u{f0}".."\u{ff}"].join("")
+  nonascii10 = nonascii1 * 10
+  nonascii100 = nonascii10 * 10
+  nonascii1000 = nonascii100 * 10
+benchmark:
+  swapcase-1: str1.swapcase
+  swapcase-10: str10.swapcase
+  swapcase-100: str100.swapcase
+  swapcase-1000: str1000.swapcase
+  swapcase-nonascii1: nonascii1.swapcase
+  swapcase-nonascii10: nonascii10.swapcase
+  swapcase-nonascii100: nonascii100.swapcase
+  swapcase-nonascii1000: nonascii1000.swapcase
diff --git a/benchmark/string_upcase.yml b/benchmark/string_upcase.yml
new file mode 100644
index 0000000000..dab84bbde2
--- /dev/null
+++ b/benchmark/string_upcase.yml
@@ -0,0 +1,18 @@
+prelude: |
+  str1 = [*"a".."z",*"0".."9"].join("")
+  str10 = str1 * 10
+  str100 = str10 * 10
+  str1000 = str100 * 10
+  nonascii1 = [*"\u{e0}".."\u{ff}"].join("")
+  nonascii10 = nonascii1 * 10
+  nonascii100 = nonascii10 * 10
+  nonascii1000 = nonascii100 * 10
+benchmark:
+  upcase-1: str1.upcase
+  upcase-10: str10.upcase
+  upcase-100: str100.upcase
+  upcase-1000: str1000.upcase
+  upcase-nonascii1: nonascii1.upcase
+  upcase-nonascii10: nonascii10.upcase
+  upcase-nonascii100: nonascii100.upcase
+  upcase-nonascii1000: nonascii1000.upcase
diff --git a/benchmark/time_strptime.yml b/benchmark/time_strptime.yml
new file mode 100644
index 0000000000..8d89ebb7a7
--- /dev/null
+++ b/benchmark/time_strptime.yml
@@ -0,0 +1,13 @@
+prelude: |
+  require 'time'
+benchmark:
+  - Time.strptime("28/Aug/2005:06:54:20 +0000", "%d/%b/%Y:%T %z")
+  - Time.strptime("1", "%s")
+  - Time.strptime("0 +0100", "%s %z")
+  - Time.strptime("0 UTC", "%s %z")
+  - Time.strptime("1.5", "%s.%N")
+  - Time.strptime("1.000000000001", "%s.%N")
+  - Time.strptime("20010203 -0200", "%Y%m%d %z")
+  - Time.strptime("20010203 UTC", "%Y%m%d %z")
+  - Time.strptime("2018-365", "%Y-%j")
+  - Time.strptime("2018-091", "%Y-%j")
diff --git a/benchmark/time_subsec.rb b/benchmark/time_subsec.rb
new file mode 100644
index 0000000000..505021c701
--- /dev/null
+++ b/benchmark/time_subsec.rb
@@ -0,0 +1,2 @@
+t = Time.now
+4000000.times { t.subsec }
diff --git a/benchmark/vm_array.yml b/benchmark/vm_array.yml
new file mode 100644
index 0000000000..2a177237ef
--- /dev/null
+++ b/benchmark/vm_array.yml
@@ -0,0 +1,4 @@
+benchmark:
+  vm_array: |
+    a = [1,2,3,4,5,6,7,8,9,10]
+loop_count: 6000000
diff --git a/benchmark/vm_attr_ivar.yml b/benchmark/vm_attr_ivar.yml
new file mode 100644
index 0000000000..75b803478e
--- /dev/null
+++ b/benchmark/vm_attr_ivar.yml
@@ -0,0 +1,14 @@
+prelude: |
+  class C
+    attr_reader :a, :b
+    def initialize
+      @a = nil
+      @b = nil
+    end
+  end
+  obj = C.new
+benchmark:
+  vm_attr_ivar: |
+    j = obj.a
+    k = obj.b
+loop_count: 30000000
diff --git a/benchmark/vm_attr_ivar_set.yml b/benchmark/vm_attr_ivar_set.yml
new file mode 100644
index 0000000000..a0d379b18a
--- /dev/null
+++ b/benchmark/vm_attr_ivar_set.yml
@@ -0,0 +1,14 @@
+prelude: |
+  class C
+    attr_accessor :a, :b
+    def initialize
+      @a = nil
+      @b = nil
+    end
+  end
+  obj = C.new
+benchmark:
+  vm_attr_ivar_set: |
+    obj.a = 1
+    obj.b = 2
+loop_count: 30000000
diff --git a/benchmark/bm_vm3_backtrace.rb b/benchmark/vm_backtrace.rb
index 0fbf73e1ca..0fbf73e1ca 100644
--- a/benchmark/bm_vm3_backtrace.rb
+++ b/benchmark/vm_backtrace.rb
diff --git a/benchmark/vm_bigarray.yml b/benchmark/vm_bigarray.yml
new file mode 100644
index 0000000000..8b2d3f3443
--- /dev/null
+++ b/benchmark/vm_bigarray.yml
@@ -0,0 +1,105 @@
+benchmark:
+  vm_bigarray: |
+    a = [
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+      1,2,3,4,5,6,7,8,9,10,
+    ]
+loop_count: 6000000
diff --git a/benchmark/vm_bighash.yml b/benchmark/vm_bighash.yml
new file mode 100644
index 0000000000..4dacfde793
--- /dev/null
+++ b/benchmark/vm_bighash.yml
@@ -0,0 +1,4 @@
+benchmark:
+  vm_bighash: |
+    a = {0=>0, 1=>1, 2=>2, 3=>3, 4=>4, 5=>5, 6=>6, 7=>7, 8=>8, 9=>9, 10=>10, 11=>11, 12=>12, 13=>13, 14=>14, 15=>15, 16=>16, 17=>17, 18=>18, 19=>19, 20=>20, 21=>21, 22=>22, 23=>23, 24=>24, 25=>25, 26=>26, 27=>27, 28=>28, 29=>29, 30=>30, 31=>31, 32=>32, 33=>33, 34=>34, 35=>35, 36=>36, 37=>37, 38=>38, 39=>39, 40=>40, 41=>41, 42=>42, 43=>43, 44=>44, 45=>45, 46=>46, 47=>47, 48=>48, 49=>49, 50=>50, 51=>51, 52=>52, 53=>53, 54=>54, 55=>55, 56=>56, 57=>57, 58=>58, 59=>59, 60=>60, 61=>61, 62=>62, 63=>63, 64=>64, 65=>65, 66=>66, 67=>67, 68=>68, 69=>69, 70=>70, 71=>71, 72=>72, 73=>73, 74=>74, 75=>75, 76=>76, 77=>77, 78=>78, 79=>79, 80=>80, 81=>81, 82=>82, 83=>83, 84=>84, 85=>85, 86=>86, 87=>87, 88=>88, 89=>89, 90=>90, 91=>91, 92=>92, 93=>93, 94=>94, 95=>95, 96=>96, 97=>97, 98=>98, 99=>99, 100=>100, 101=>101, 102=>102, 103=>103, 104=>104, 105=>105, 106=>106, 107=>107, 108=>108, 109=>109, 110=>110, 111=>111, 112=>112, 113=>113, 114=>114, 115=>115, 116=>116, 117=>117, 118=>118, 119=>119, 120=>120, 121=>121, 122=>122, 123=>123, 124=>124, 125=>125, 126=>126, 127=>127, 128=>128, 129=>129, 130=>130, 131=>131, 132=>132, 133=>133, 134=>134, 135=>135, 136=>136, 137=>137, 138=>138, 139=>139, 140=>140, 141=>141, 142=>142, 143=>143, 144=>144, 145=>145, 146=>146, 147=>147, 148=>148, 149=>149, 150=>150, 151=>151, 152=>152, 153=>153, 154=>154, 155=>155, 156=>156, 157=>157, 158=>158, 159=>159, 160=>160, 161=>161, 162=>162, 163=>163, 164=>164, 165=>165, 166=>166, 167=>167, 168=>168, 169=>169, 170=>170, 171=>171, 172=>172, 173=>173, 174=>174, 175=>175, 176=>176, 177=>177, 178=>178, 179=>179, 180=>180, 181=>181, 182=>182, 183=>183, 184=>184, 185=>185, 186=>186, 187=>187, 188=>188, 189=>189, 190=>190, 191=>191, 192=>192, 193=>193, 194=>194, 195=>195, 196=>196, 197=>197, 198=>198, 199=>199, 200=>200, 201=>201, 202=>202, 203=>203, 204=>204, 205=>205, 206=>206, 207=>207, 208=>208, 209=>209, 210=>210, 211=>211, 212=>212, 213=>213, 214=>214, 215=>215, 216=>216, 217=>217, 218=>218, 219=>219, 220=>220, 221=>221, 222=>222, 223=>223, 224=>224, 225=>225, 226=>226, 227=>227, 228=>228, 229=>229, 230=>230, 231=>231, 232=>232, 233=>233, 234=>234, 235=>235, 236=>236, 237=>237, 238=>238, 239=>239, 240=>240, 241=>241, 242=>242, 243=>243, 244=>244, 245=>245, 246=>246, 247=>247, 248=>248, 249=>249, 250=>250, 251=>251, 252=>252, 253=>253, 254=>254, 255=>255, 256=>256, 257=>257, 258=>258, 259=>259, 260=>260, 261=>261, 262=>262, 263=>263, 264=>264, 265=>265, 266=>266, 267=>267, 268=>268, 269=>269, 270=>270, 271=>271, 272=>272, 273=>273, 274=>274, 275=>275, 276=>276, 277=>277, 278=>278, 279=>279, 280=>280, 281=>281, 282=>282, 283=>283, 284=>284, 285=>285, 286=>286, 287=>287, 288=>288, 289=>289, 290=>290, 291=>291, 292=>292, 293=>293, 294=>294, 295=>295, 296=>296, 297=>297, 298=>298, 299=>299, 300=>300, 301=>301, 302=>302, 303=>303, 304=>304, 305=>305, 306=>306, 307=>307, 308=>308, 309=>309, 310=>310, 311=>311, 312=>312, 313=>313, 314=>314, 315=>315, 316=>316, 317=>317, 318=>318, 319=>319, 320=>320, 321=>321, 322=>322, 323=>323, 324=>324, 325=>325, 326=>326, 327=>327, 328=>328, 329=>329, 330=>330, 331=>331, 332=>332, 333=>333, 334=>334, 335=>335, 336=>336, 337=>337, 338=>338, 339=>339, 340=>340, 341=>341, 342=>342, 343=>343, 344=>344, 345=>345, 346=>346, 347=>347, 348=>348, 349=>349, 350=>350, 351=>351, 352=>352, 353=>353, 354=>354, 355=>355, 356=>356, 357=>357, 358=>358, 359=>359, 360=>360, 361=>361, 362=>362, 363=>363, 364=>364, 365=>365, 366=>366, 367=>367, 368=>368, 369=>369, 370=>370, 371=>371, 372=>372, 373=>373, 374=>374, 375=>375, 376=>376, 377=>377, 378=>378, 379=>379, 380=>380, 381=>381, 382=>382, 383=>383, 384=>384, 385=>385, 386=>386, 387=>387, 388=>388, 389=>389, 390=>390, 391=>391, 392=>392, 393=>393, 394=>394, 395=>395, 396=>396, 397=>397, 398=>398, 399=>399, 400=>400, 401=>401, 402=>402, 403=>403, 404=>404, 405=>405, 406=>406, 407=>407, 408=>408, 409=>409, 410=>410, 411=>411, 412=>412, 413=>413, 414=>414, 415=>415, 416=>416, 417=>417, 418=>418, 419=>419, 420=>420, 421=>421, 422=>422, 423=>423, 424=>424, 425=>425, 426=>426, 427=>427, 428=>428, 429=>429, 430=>430, 431=>431, 432=>432, 433=>433, 434=>434, 435=>435, 436=>436, 437=>437, 438=>438, 439=>439, 440=>440, 441=>441, 442=>442, 443=>443, 444=>444, 445=>445, 446=>446, 447=>447, 448=>448, 449=>449, 450=>450, 451=>451, 452=>452, 453=>453, 454=>454, 455=>455, 456=>456, 457=>457, 458=>458, 459=>459, 460=>460, 461=>461, 462=>462, 463=>463, 464=>464, 465=>465, 466=>466, 467=>467, 468=>468, 469=>469, 470=>470, 471=>471, 472=>472, 473=>473, 474=>474, 475=>475, 476=>476, 477=>477, 478=>478, 479=>479, 480=>480, 481=>481, 482=>482, 483=>483, 484=>484, 485=>485, 486=>486, 487=>487, 488=>488, 489=>489, 490=>490, 491=>491, 492=>492, 493=>493, 494=>494, 495=>495, 496=>496, 497=>497, 498=>498, 499=>499, 500=>500,}
+loop_count: 60000
diff --git a/benchmark/vm_block.yml b/benchmark/vm_block.yml
new file mode 100644
index 0000000000..68b3e40bf5
--- /dev/null
+++ b/benchmark/vm_block.yml
@@ -0,0 +1,9 @@
+prelude: |
+  def m
+    yield
+  end
+benchmark:
+  vm_block: |
+    m{
+    }
+loop_count: 30000000
diff --git a/benchmark/vm_block_handler.yml b/benchmark/vm_block_handler.yml
new file mode 100644
index 0000000000..461d7953ad
--- /dev/null
+++ b/benchmark/vm_block_handler.yml
@@ -0,0 +1,27 @@
+# :FIXME: is there a way to benchmark block_handler_type_ifunc?
+
+prelude: |
+  p = proc{_1}
+  o = Object.new
+  def o.each
+    i = 0
+    while i < 3_000_000 do
+      yield i
+      i += 1
+    end
+  end
+
+benchmark:
+  - name: block_handler_type_iseq
+    script: |
+      o.each{_1}
+
+  - name: block_handler_type_symbol
+    script: |
+      o.each(&:itself)
+
+  - name: block_handler_type_proc
+    script: |
+      o.each(&p)
+
+loop_count: 1
diff --git a/benchmark/vm_blockparam.yml b/benchmark/vm_blockparam.yml
new file mode 100644
index 0000000000..5e5a0170a2
--- /dev/null
+++ b/benchmark/vm_blockparam.yml
@@ -0,0 +1,7 @@
+prelude: |
+  def m &b
+  end
+benchmark:
+  vm_blockparam: |
+    m{}
+loop_count: 30000000
diff --git a/benchmark/vm_blockparam_call.yml b/benchmark/vm_blockparam_call.yml
new file mode 100644
index 0000000000..a7d8d366ea
--- /dev/null
+++ b/benchmark/vm_blockparam_call.yml
@@ -0,0 +1,8 @@
+prelude: |
+  def m &b
+    b.call
+  end
+benchmark:
+  vm_blockparam_call: |
+    m{}
+loop_count: 30000000
diff --git a/benchmark/vm_blockparam_pass.yml b/benchmark/vm_blockparam_pass.yml
new file mode 100644
index 0000000000..841f5e7a63
--- /dev/null
+++ b/benchmark/vm_blockparam_pass.yml
@@ -0,0 +1,12 @@
+prelude: |
+  def bp_yield
+    yield
+  end
+
+  def bp_pass &b
+    bp_yield &b
+  end
+benchmark:
+  vm_blockparam_pass: |
+    bp_pass{}
+loop_count: 30000000
diff --git a/benchmark/vm_blockparam_yield.yml b/benchmark/vm_blockparam_yield.yml
new file mode 100644
index 0000000000..8ea9b46ed2
--- /dev/null
+++ b/benchmark/vm_blockparam_yield.yml
@@ -0,0 +1,8 @@
+prelude: |
+  def bp_yield &b
+    yield
+  end
+benchmark:
+  vm_blockparam_yield: |
+    bp_yield{}
+loop_count: 30000000
diff --git a/benchmark/vm_case.yml b/benchmark/vm_case.yml
new file mode 100644
index 0000000000..b26a491a15
--- /dev/null
+++ b/benchmark/vm_case.yml
@@ -0,0 +1,13 @@
+benchmark:
+  vm_case: |
+    case :foo
+    when :bar
+      raise
+    when :baz
+      raise
+    when :boo
+      raise
+    when :foo
+      # noop
+    end
+loop_count: 6000000
diff --git a/benchmark/vm_case_lit.yml b/benchmark/vm_case_lit.yml
new file mode 100644
index 0000000000..9f91801544
--- /dev/null
+++ b/benchmark/vm_case_lit.yml
@@ -0,0 +1,23 @@
+# loop_count is not utilized since `i` is involved in the script
+benchmark:
+  vm_case_lit: |
+    i = 0
+    @ret = [ "foo", true, false, :sym, 6, nil, 0.1, 0xffffffffffffffff ]
+    def foo(i)
+      @ret[i % @ret.size]
+    end
+
+    while i<6_000_000
+      case foo(i)
+      when "foo" then :foo
+      when true then true
+      when false then false
+      when :sym then :sym
+      when 6 then :fix
+      when nil then nil
+      when 0.1 then :float
+      when 0xffffffffffffffff then :big
+      end
+      i += 1
+    end
+loop_count: 1
diff --git a/benchmark/bm_vm3_clearmethodcache.rb b/benchmark/vm_clearmethodcache.rb
index 9661323cd2..9661323cd2 100644
--- a/benchmark/bm_vm3_clearmethodcache.rb
+++ b/benchmark/vm_clearmethodcache.rb
diff --git a/benchmark/vm_const.yml b/benchmark/vm_const.yml
new file mode 100644
index 0000000000..6064d4eed0
--- /dev/null
+++ b/benchmark/vm_const.yml
@@ -0,0 +1,7 @@
+prelude: |
+  Const = 1
+benchmark:
+  vm_const: |
+    j = Const
+    k = Const
+loop_count: 30000000
diff --git a/benchmark/vm_defined_method.yml b/benchmark/vm_defined_method.yml
new file mode 100644
index 0000000000..347e0cfd33
--- /dev/null
+++ b/benchmark/vm_defined_method.yml
@@ -0,0 +1,8 @@
+prelude: |
+  class Object
+    define_method(:m){}
+  end
+benchmark:
+  vm_defined_method: |
+    m; m; m; m; m; m; m; m;
+loop_count: 6000000
diff --git a/benchmark/vm_dstr.yml b/benchmark/vm_dstr.yml
new file mode 100644
index 0000000000..30c7a3193c
--- /dev/null
+++ b/benchmark/vm_dstr.yml
@@ -0,0 +1,6 @@
+prelude: |
+  x = y = 'z'
+benchmark:
+  vm_dstr: |
+    str = "foo#{x}bar#{y}baz"
+loop_count: 6000000
diff --git a/benchmark/vm_ensure.yml b/benchmark/vm_ensure.yml
new file mode 100644
index 0000000000..4ea62f30de
--- /dev/null
+++ b/benchmark/vm_ensure.yml
@@ -0,0 +1,14 @@
+# Not utilizing loop_count since using it for this is too unstable for now
+benchmark:
+  vm_ensure: |
+    i = 0
+    while i<30_000_000
+      i += 1
+      begin
+        begin
+        ensure
+        end
+      ensure
+      end
+    end
+loop_count: 1
diff --git a/benchmark/vm_eval.yml b/benchmark/vm_eval.yml
new file mode 100644
index 0000000000..7ba1a8d1de
--- /dev/null
+++ b/benchmark/vm_eval.yml
@@ -0,0 +1,4 @@
+benchmark:
+  vm_eval: |
+    eval("1")
+loop_count: 6000000
diff --git a/benchmark/vm_fiber_allocate.yml b/benchmark/vm_fiber_allocate.yml
new file mode 100644
index 0000000000..b5a54e1ddf
--- /dev/null
+++ b/benchmark/vm_fiber_allocate.yml
@@ -0,0 +1,8 @@
+prelude: |
+  # Disable GC to see raw throughput:
+  GC.disable
+benchmark:
+  vm_fiber_allocate: |
+    fiber = Fiber.new{Fiber.yield}
+    fiber.resume
+loop_count: 100000
diff --git a/benchmark/vm_fiber_count.yml b/benchmark/vm_fiber_count.yml
new file mode 100644
index 0000000000..b83d3152d4
--- /dev/null
+++ b/benchmark/vm_fiber_count.yml
@@ -0,0 +1,10 @@
+# On Linux, you will need to increase the maximum number of memory maps:
+# sudo sysctl -w vm.max_map_count=200000
+prelude: |
+  fibers = []
+benchmark:
+  vm_fiber_count: |
+    fiber = Fiber.new{Fiber.yield}
+    fibers << fiber
+    fiber.resume
+loop_count: 100000
diff --git a/benchmark/vm_fiber_reuse.yml b/benchmark/vm_fiber_reuse.yml
new file mode 100644
index 0000000000..4ca41085b1
--- /dev/null
+++ b/benchmark/vm_fiber_reuse.yml
@@ -0,0 +1,14 @@
+prelude: |
+  GC.disable
+  fibers = []
+benchmark:
+  vm_fiber_reuse: |
+    1024.times do
+      fiber = Fiber.new{Fiber.yield}
+      fibers << fiber
+      fiber.resume
+    end
+
+    fibers.clear
+    GC.start
+loop_count: 200
diff --git a/benchmark/vm_fiber_reuse_gc.yml b/benchmark/vm_fiber_reuse_gc.yml
new file mode 100644
index 0000000000..892622f121
--- /dev/null
+++ b/benchmark/vm_fiber_reuse_gc.yml
@@ -0,0 +1,12 @@
+# https://bugs.ruby-lang.org/issues/16009
+prelude: |
+  fibers = []
+benchmark:
+  vm_fiber_reuse_gc: |
+    2000.times do
+      fiber = Fiber.new{Fiber.yield}
+      fibers << fiber
+      fiber.resume
+    end
+    fibers.clear
+loop_count: 100
diff --git a/benchmark/vm_fiber_switch.yml b/benchmark/vm_fiber_switch.yml
new file mode 100644
index 0000000000..3de36b66eb
--- /dev/null
+++ b/benchmark/vm_fiber_switch.yml
@@ -0,0 +1,9 @@
+prelude: |
+  # based on benchmark for [ruby-core:65518] [Feature #10341] by Knut Franke
+  fib = Fiber.new do
+    loop { Fiber.yield }
+  end
+benchmark:
+  vm_fiber_switch: |
+    fib.resume
+loop_count: 20000000
diff --git a/benchmark/vm_float_simple.yml b/benchmark/vm_float_simple.yml
new file mode 100644
index 0000000000..92f5fd52ab
--- /dev/null
+++ b/benchmark/vm_float_simple.yml
@@ -0,0 +1,8 @@
+prelude: |
+  f = 0.0
+benchmark:
+  vm_float_simple: |
+    f += 0.1; f -= 0.1
+    f += 0.1; f -= 0.1
+    f += 0.1; f -= 0.1
+loop_count: 30000000
diff --git a/benchmark/vm_freezestring.yml b/benchmark/vm_freezestring.yml
new file mode 100644
index 0000000000..facc9aa043
--- /dev/null
+++ b/benchmark/vm_freezestring.yml
@@ -0,0 +1,10 @@
+prelude: |
+  class String
+    def freeze
+      -self
+    end
+  end
+benchmark:
+  vm_freezestring: |
+    "tXnL1BP5T1WPXMjuFNLQtallEtRcay1t2lHtJSrlVsDgvunlbtfpr/DGdH0NGYE9".freeze
+loop_count: 6000000
diff --git a/benchmark/bm_vm3_gc.rb b/benchmark/vm_gc.rb
index e668026915..e668026915 100644
--- a/benchmark/bm_vm3_gc.rb
+++ b/benchmark/vm_gc.rb
diff --git a/benchmark/bm_vm3_gc_old_full.rb b/benchmark/vm_gc_old_full.rb
index cfdfc8c5a5..cfdfc8c5a5 100644
--- a/benchmark/bm_vm3_gc_old_full.rb
+++ b/benchmark/vm_gc_old_full.rb
diff --git a/benchmark/bm_vm3_gc_old_immediate.rb b/benchmark/vm_gc_old_immediate.rb
index ad22feb655..ad22feb655 100644
--- a/benchmark/bm_vm3_gc_old_immediate.rb
+++ b/benchmark/vm_gc_old_immediate.rb
diff --git a/benchmark/bm_vm3_gc_old_lazy.rb b/benchmark/vm_gc_old_lazy.rb
index b74d44baf1..b74d44baf1 100644
--- a/benchmark/bm_vm3_gc_old_lazy.rb
+++ b/benchmark/vm_gc_old_lazy.rb
diff --git a/benchmark/vm_gc_short_lived.yml b/benchmark/vm_gc_short_lived.yml
new file mode 100644
index 0000000000..29c803fee3
--- /dev/null
+++ b/benchmark/vm_gc_short_lived.yml
@@ -0,0 +1,9 @@
+benchmark:
+  vm_gc_short_lived: |
+    a = '' # short-lived String
+    b = ''
+    c = ''
+    d = ''
+    e = ''
+    f = ''
+loop_count: 30000000
diff --git a/benchmark/vm_gc_short_with_complex_long.yml b/benchmark/vm_gc_short_with_complex_long.yml
new file mode 100644
index 0000000000..4b6c3ed7b9
--- /dev/null
+++ b/benchmark/vm_gc_short_with_complex_long.yml
@@ -0,0 +1,25 @@
+prelude: |
+  def nested_hash h, n
+    if n == 0
+      ''
+    else
+      10.times{
+        h[Object.new] = nested_hash(h, n-1)
+      }
+    end
+  end
+
+  long_lived = Hash.new
+  nested_hash long_lived, 6
+
+  GC.start
+  GC.start
+benchmark:
+  vm_gc_short_with_complex_long: |
+    a = '' # short-lived String
+    b = ''
+    c = ''
+    d = ''
+    e = ''
+    f = ''
+loop_count: 30000000
diff --git a/benchmark/vm_gc_short_with_long.yml b/benchmark/vm_gc_short_with_long.yml
new file mode 100644
index 0000000000..03ba0f95a9
--- /dev/null
+++ b/benchmark/vm_gc_short_with_long.yml
@@ -0,0 +1,13 @@
+prelude: |
+  long_lived = Array.new(1_000_000){|i| "#{i}"}
+  GC.start
+  GC.start
+benchmark:
+  vm_gc_short_with_long: |
+    a = '' # short-lived String
+    b = ''
+    c = ''
+    d = ''
+    e = ''
+    f = ''
+loop_count: 30000000
diff --git a/benchmark/vm_gc_short_with_symbol.yml b/benchmark/vm_gc_short_with_symbol.yml
new file mode 100644
index 0000000000..129b8bf4ed
--- /dev/null
+++ b/benchmark/vm_gc_short_with_symbol.yml
@@ -0,0 +1,13 @@
+prelude: |
+  50_000.times{|i| sym = "sym#{i}".to_sym}
+  GC.start
+  GC.start
+benchmark:
+  vm_gc_short_with_symbol: |
+    a = '' # short-lived String
+    b = ''
+    c = ''
+    d = ''
+    e = ''
+    f = ''
+loop_count: 30000000
diff --git a/benchmark/vm_gc_wb_ary.yml b/benchmark/vm_gc_wb_ary.yml
new file mode 100644
index 0000000000..e3293e72d0
--- /dev/null
+++ b/benchmark/vm_gc_wb_ary.yml
@@ -0,0 +1,12 @@
+prelude: |
+  short_lived_ary = []
+
+  if RUBY_VERSION >= "2.2.0"
+    GC.start(full_mark: false, immediate_mark: true, immediate_sweep: true)
+  end
+
+  short_lived = ''
+benchmark:
+  vm_gc_wb_ary: |
+    short_lived_ary[0] = short_lived # write barrier
+loop_count: 30000000
diff --git a/benchmark/vm_gc_wb_ary_promoted.yml b/benchmark/vm_gc_wb_ary_promoted.yml
new file mode 100644
index 0000000000..003995945b
--- /dev/null
+++ b/benchmark/vm_gc_wb_ary_promoted.yml
@@ -0,0 +1,15 @@
+prelude: |
+  long_lived = []
+
+  if RUBY_VERSION > "2.2.0"
+    3.times{ GC.start(full_mark: false, immediate_mark: true, immediate_sweep: true) }
+  elsif
+    GC.start
+  end
+
+  short_lived = ''
+
+benchmark:
+  vm_gc_wb_ary_promoted: |
+    long_lived[0] = short_lived # write barrier
+loop_count: 30000000
diff --git a/benchmark/vm_gc_wb_obj.yml b/benchmark/vm_gc_wb_obj.yml
new file mode 100644
index 0000000000..a2a2ce2d18
--- /dev/null
+++ b/benchmark/vm_gc_wb_obj.yml
@@ -0,0 +1,15 @@
+prelude: |
+  class C
+    attr_accessor :foo
+  end
+  short_lived_obj = C.new
+
+  if RUBY_VERSION >= "2.2.0"
+    GC.start(full_mark: false, immediate_mark: true, immediate_sweep: true)
+  end
+
+  short_lived = ''
+benchmark:
+  vm_gc_wb_obj: |
+    short_lived_obj.foo = short_lived # write barrier
+loop_count: 30000000
diff --git a/benchmark/vm_gc_wb_obj_promoted.yml b/benchmark/vm_gc_wb_obj_promoted.yml
new file mode 100644
index 0000000000..00a454ba72
--- /dev/null
+++ b/benchmark/vm_gc_wb_obj_promoted.yml
@@ -0,0 +1,17 @@
+prelude: |
+  class C
+    attr_accessor :foo
+  end
+  long_lived = C.new
+
+  if RUBY_VERSION >= "2.2.0"
+    3.times{ GC.start(full_mark: false, immediate_mark: true, immediate_sweep: true) }
+  elsif
+    GC.start
+  end
+
+  short_lived = ''
+benchmark:
+  vm_gc_wb_obj_promoted: |
+    long_lived.foo = short_lived # write barrier
+loop_count: 30000000
diff --git a/benchmark/vm_iclass_super.yml b/benchmark/vm_iclass_super.yml
new file mode 100644
index 0000000000..21bb7db247
--- /dev/null
+++ b/benchmark/vm_iclass_super.yml
@@ -0,0 +1,20 @@
+prelude: |
+  class C
+    def m
+      1
+    end
+
+    ("A".."M").each do |module_name|
+      eval <<-EOM
+          module #{module_name}
+            def m; super; end
+          end
+          prepend #{module_name}
+      EOM
+    end
+  end
+
+  obj = C.new
+benchmark:
+  vm_iclass_super: obj.m
+loop_count: 6000000
diff --git a/benchmark/vm_ivar.yml b/benchmark/vm_ivar.yml
new file mode 100644
index 0000000000..119531d5ef
--- /dev/null
+++ b/benchmark/vm_ivar.yml
@@ -0,0 +1,6 @@
+prelude: "@a = 1\n"
+benchmark:
+  vm_ivar: |
+    j = @a
+    k = @a
+loop_count: 30000000
diff --git a/benchmark/vm_ivar_init.yml b/benchmark/vm_ivar_init.yml
new file mode 100644
index 0000000000..c6f1633907
--- /dev/null
+++ b/benchmark/vm_ivar_init.yml
@@ -0,0 +1,14 @@
+prelude: |
+  class C
+    def initialize
+      @a = nil
+      @b = nil
+      @c = nil
+      @d = nil
+      @e = nil
+    end
+  end
+benchmark:
+  vm_ivar_init: |
+    C.new
+loop_count: 30000000
diff --git a/benchmark/vm_ivar_set.yml b/benchmark/vm_ivar_set.yml
new file mode 100644
index 0000000000..8bbb60043b
--- /dev/null
+++ b/benchmark/vm_ivar_set.yml
@@ -0,0 +1,5 @@
+benchmark:
+  vm_ivar_set: |
+    @a = 1
+    @b = 2
+loop_count: 30000000
diff --git a/benchmark/vm_ivar_set_subclass.yml b/benchmark/vm_ivar_set_subclass.yml
new file mode 100644
index 0000000000..2653d36ded
--- /dev/null
+++ b/benchmark/vm_ivar_set_subclass.yml
@@ -0,0 +1,17 @@
+prelude: |
+  class A
+    def initialize
+      @a = nil
+      @b = nil
+      @c = nil
+      @d = nil
+      @e = nil
+    end
+  end
+  class B < A; end
+  class C < A; end
+benchmark:
+  vm_ivar_init_subclass: |
+    B.new
+    C.new
+loop_count: 3000000
diff --git a/benchmark/vm_length.yml b/benchmark/vm_length.yml
new file mode 100644
index 0000000000..5fd94e7d86
--- /dev/null
+++ b/benchmark/vm_length.yml
@@ -0,0 +1,8 @@
+prelude: |
+  a = 'abc'
+  b = [1, 2, 3]
+benchmark:
+  vm_length: |
+    a.length
+    b.length
+loop_count: 30000000
diff --git a/benchmark/vm_lvar_init.yml b/benchmark/vm_lvar_init.yml
new file mode 100644
index 0000000000..70a9b1c0ca
--- /dev/null
+++ b/benchmark/vm_lvar_init.yml
@@ -0,0 +1,21 @@
+# while loop cost is not removed because `i` is used in the script
+benchmark:
+  vm_lvar_init: |
+    def m v
+      unless v
+        # unreachable code
+        v1 = v2 = v3 = v4 = v5 = v6 = v7 = v8 = v9 = v10 =
+        v11 = v12 = v13 = v14 = v15 = v16 = v17 = v18 = v19 = v20 =
+        v21 = v22 = v23 = v24 = v25 = v26 = v27 = v28 = v29 = v30 =
+        v31 = v32 = v33 = v34 = v35 = v36 = v37 = v38 = v39 = v40 =
+        v41 = v42 = v43 = v44 = v45 = v46 = v47 = v48 = v49 = v50 = 1
+      end
+    end
+
+    i = 0
+
+    while i<30_000_000
+      i += 1
+      m i
+    end
+loop_count: 1
diff --git a/benchmark/vm_lvar_set.yml b/benchmark/vm_lvar_set.yml
new file mode 100644
index 0000000000..f29f763d81
--- /dev/null
+++ b/benchmark/vm_lvar_set.yml
@@ -0,0 +1,4 @@
+benchmark:
+  vm_lvar_set: |
+    a = b = c = d = e = f = g = h = j = k = l = m = n = o = p = q = r = 1
+loop_count: 30000000
diff --git a/benchmark/vm_method.yml b/benchmark/vm_method.yml
new file mode 100644
index 0000000000..d45e4ec572
--- /dev/null
+++ b/benchmark/vm_method.yml
@@ -0,0 +1,8 @@
+prelude: |
+  def m
+    nil
+  end
+benchmark:
+  vm_method: |
+    m; m; m; m; m; m; m; m;
+loop_count: 6000000
diff --git a/benchmark/vm_method_missing.yml b/benchmark/vm_method_missing.yml
new file mode 100644
index 0000000000..3da456c0bb
--- /dev/null
+++ b/benchmark/vm_method_missing.yml
@@ -0,0 +1,11 @@
+prelude: |
+  class C
+    def method_missing mid
+    end
+  end
+
+  obj = C.new
+benchmark:
+  vm_method_missing: |
+    obj.m; obj.m; obj.m; obj.m; obj.m; obj.m; obj.m; obj.m;
+loop_count: 6000000
diff --git a/benchmark/vm_method_with_block.yml b/benchmark/vm_method_with_block.yml
new file mode 100644
index 0000000000..281a481394
--- /dev/null
+++ b/benchmark/vm_method_with_block.yml
@@ -0,0 +1,8 @@
+prelude: |
+  def m
+    nil
+  end
+benchmark:
+  vm_method_with_block: |
+    m{}; m{}; m{}; m{}; m{}; m{}; m{}; m{};
+loop_count: 6000000
diff --git a/benchmark/vm_module_ann_const_set.yml b/benchmark/vm_module_ann_const_set.yml
new file mode 100644
index 0000000000..243229ba4a
--- /dev/null
+++ b/benchmark/vm_module_ann_const_set.yml
@@ -0,0 +1,4 @@
+benchmark:
+  vm_module_ann_const_set: |
+    Module.new.const_set(:X, Module.new)
+loop_count: 6000000
diff --git a/benchmark/vm_module_const_set.yml b/benchmark/vm_module_const_set.yml
new file mode 100644
index 0000000000..e5a24181a9
--- /dev/null
+++ b/benchmark/vm_module_const_set.yml
@@ -0,0 +1,8 @@
+prelude: |
+  module M
+  end
+  $VERBOSE = nil
+benchmark:
+  vm_module_const_set: |
+    M.const_set(:X, Module.new)
+loop_count: 6000000
diff --git a/benchmark/vm_mutex.yml b/benchmark/vm_mutex.yml
new file mode 100644
index 0000000000..abcf1e28ce
--- /dev/null
+++ b/benchmark/vm_mutex.yml
@@ -0,0 +1,8 @@
+prelude: |
+  require 'thread'
+
+  m = Thread::Mutex.new
+benchmark:
+  vm_mutex: |
+    m.synchronize{}
+loop_count: 6000000
diff --git a/benchmark/vm_neq.yml b/benchmark/vm_neq.yml
new file mode 100644
index 0000000000..fb04d15ae8
--- /dev/null
+++ b/benchmark/vm_neq.yml
@@ -0,0 +1,7 @@
+prelude: |
+  obj1 = Object.new
+  obj2 = Object.new
+benchmark:
+  vm_neq: |
+    obj1 != obj2
+loop_count: 30000000
diff --git a/benchmark/vm_newlambda.yml b/benchmark/vm_newlambda.yml
new file mode 100644
index 0000000000..0b9787d91a
--- /dev/null
+++ b/benchmark/vm_newlambda.yml
@@ -0,0 +1,4 @@
+benchmark:
+  vm_newlambda: |
+    lambda {}
+loop_count: 6000000
diff --git a/benchmark/vm_not.yml b/benchmark/vm_not.yml
new file mode 100644
index 0000000000..c68dde3c50
--- /dev/null
+++ b/benchmark/vm_not.yml
@@ -0,0 +1,6 @@
+prelude: |
+  obj = Object.new
+benchmark:
+  vm_not: |
+    !obj
+loop_count: 30000000
diff --git a/benchmark/vm_poly_method.yml b/benchmark/vm_poly_method.yml
new file mode 100644
index 0000000000..dd2f4e71de
--- /dev/null
+++ b/benchmark/vm_poly_method.yml
@@ -0,0 +1,24 @@
+# loop_count is not utilized since `i` is involved in the script
+benchmark:
+  vm_poly_method: |
+    class C1
+      def m
+        1
+      end
+    end
+    class C2
+      def m
+        2
+      end
+    end
+
+    o1 = C1.new
+    o2 = C2.new
+
+    i = 0
+    while i<6_000_000
+      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
+loop_count: 1
diff --git a/benchmark/vm_poly_method_ov.yml b/benchmark/vm_poly_method_ov.yml
new file mode 100644
index 0000000000..bca1b62729
--- /dev/null
+++ b/benchmark/vm_poly_method_ov.yml
@@ -0,0 +1,24 @@
+# loop_count is not utilized since `i` is involved in the script
+benchmark:
+  vm_poly_method_ov: |
+    class C1
+      def m
+        1
+      end
+    end
+    class C2
+      def m
+        2
+      end
+    end
+
+    o1 = C1.new
+    o2 = C2.new
+
+    i = 0
+    while i<6_000_000
+      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
+loop_count: 1
diff --git a/benchmark/vm_poly_same_method.yml b/benchmark/vm_poly_same_method.yml
new file mode 100644
index 0000000000..6c5404ac84
--- /dev/null
+++ b/benchmark/vm_poly_same_method.yml
@@ -0,0 +1,25 @@
+prelude: |
+  module AR; end
+  class AR::Base
+    def create_or_update
+      nil
+    end
+    def save
+      create_or_update
+    end
+  end
+  class Foo < AR::Base; end
+  class Bar < AR::Base; end
+  o1 = Foo.new
+  o2 = Bar.new
+benchmark:
+  vm_poly_same_method: |
+    o1.save; o2.save;
+    o1.save; o2.save;
+    o1.save; o2.save;
+    o1.save; o2.save;
+    o1.save; o2.save;
+    o1.save; o2.save;
+    o1.save; o2.save;
+    o1.save; o2.save;
+loop_count: 6000000
diff --git a/benchmark/vm_poly_singleton.yml b/benchmark/vm_poly_singleton.yml
new file mode 100644
index 0000000000..c7923160fb
--- /dev/null
+++ b/benchmark/vm_poly_singleton.yml
@@ -0,0 +1,18 @@
+# loop_count is not utilized since `i` is involved in the script
+benchmark:
+  vm_poly_singleton: |
+    class C1
+      def m; 1; end
+    end
+
+    o1 = C1.new
+    o2 = C1.new
+    o2.singleton_class
+
+    i = 0
+    while i<6_000_000 # 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
+loop_count: 1
diff --git a/benchmark/vm_proc.yml b/benchmark/vm_proc.yml
new file mode 100644
index 0000000000..2f8de6c272
--- /dev/null
+++ b/benchmark/vm_proc.yml
@@ -0,0 +1,12 @@
+prelude: |
+  def m &b
+    b
+  end
+
+  pr = m{
+    a = 1
+  }
+benchmark:
+  vm_proc: |
+    pr.call
+loop_count: 6000000
diff --git a/benchmark/vm_raise1.yml b/benchmark/vm_raise1.yml
new file mode 100644
index 0000000000..247d9f70ee
--- /dev/null
+++ b/benchmark/vm_raise1.yml
@@ -0,0 +1,16 @@
+prelude: |
+  def rec n
+    if n > 0
+      rec n-1
+    else
+      raise
+    end
+  end
+benchmark:
+  vm_raise1: |
+    begin
+      rec 1
+    rescue
+      # ignore
+    end
+loop_count: 6000000
diff --git a/benchmark/vm_raise2.yml b/benchmark/vm_raise2.yml
new file mode 100644
index 0000000000..f0fa047b3c
--- /dev/null
+++ b/benchmark/vm_raise2.yml
@@ -0,0 +1,16 @@
+prelude: |
+  def rec n
+    if n > 0
+      rec n-1
+    else
+      raise
+    end
+  end
+benchmark:
+  vm_raise2: |
+    begin
+      rec 10
+    rescue
+      # ignore
+    end
+loop_count: 6000000
diff --git a/benchmark/vm_regexp.yml b/benchmark/vm_regexp.yml
new file mode 100644
index 0000000000..2aa3d94dbd
--- /dev/null
+++ b/benchmark/vm_regexp.yml
@@ -0,0 +1,8 @@
+prelude: |
+  str = 'xxxhogexxx'
+benchmark:
+  vm_regexp: |
+    /hoge/ =~ str
+  vm_regexp_invert: |
+    str =~ /hoge/
+loop_count: 6000000
diff --git a/benchmark/vm_rescue.yml b/benchmark/vm_rescue.yml
new file mode 100644
index 0000000000..b4a0af521f
--- /dev/null
+++ b/benchmark/vm_rescue.yml
@@ -0,0 +1,6 @@
+benchmark:
+  vm_rescue: |
+    begin
+    rescue
+    end
+loop_count: 30000000
diff --git a/benchmark/vm_send.yml b/benchmark/vm_send.yml
new file mode 100644
index 0000000000..f31bc7ac89
--- /dev/null
+++ b/benchmark/vm_send.yml
@@ -0,0 +1,14 @@
+prelude: |
+  class C
+    def m
+    end
+  end
+
+  o = C.new
+  m = :m
+benchmark:
+  vm_send: |
+    o.__send__ :m
+  vm_send_var: |
+    o.__send__ m
+loop_count: 6000000
diff --git a/benchmark/vm_send_cfunc.yml b/benchmark/vm_send_cfunc.yml
new file mode 100644
index 0000000000..b114ac317d
--- /dev/null
+++ b/benchmark/vm_send_cfunc.yml
@@ -0,0 +1,3 @@
+benchmark:
+  vm_send_cfunc: self.class
+loop_count: 100000000
diff --git a/benchmark/vm_simplereturn.yml b/benchmark/vm_simplereturn.yml
new file mode 100644
index 0000000000..c9829cff0b
--- /dev/null
+++ b/benchmark/vm_simplereturn.yml
@@ -0,0 +1,7 @@
+prelude: |
+  def m
+    return 1
+  end
+benchmark:
+  vm_simplereturn: m
+loop_count: 30000000
diff --git a/benchmark/vm_string_literal.yml b/benchmark/vm_string_literal.yml
new file mode 100644
index 0000000000..64439c7980
--- /dev/null
+++ b/benchmark/vm_string_literal.yml
@@ -0,0 +1,4 @@
+benchmark:
+  vm_string_literal: |
+    x = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+loop_count: 6000000
diff --git a/benchmark/vm_struct_big_aref_hi.yml b/benchmark/vm_struct_big_aref_hi.yml
new file mode 100644
index 0000000000..4cf78970cb
--- /dev/null
+++ b/benchmark/vm_struct_big_aref_hi.yml
@@ -0,0 +1,7 @@
+prelude: |
+  s = Struct.new(*('a'..'z').map { |x| x.to_sym })
+  x = s.new
+benchmark:
+  vm_struct_big_aref_hi: |
+    x.z # x[25]
+loop_count: 6000000
diff --git a/benchmark/vm_struct_big_aref_lo.yml b/benchmark/vm_struct_big_aref_lo.yml
new file mode 100644
index 0000000000..c91af27fa5
--- /dev/null
+++ b/benchmark/vm_struct_big_aref_lo.yml
@@ -0,0 +1,7 @@
+prelude: |
+  s = Struct.new(*('a'..'z').map { |x| x.to_sym })
+  x = s.new
+benchmark:
+  vm_struct_big_aref_lo: |
+    x.k # x[10]
+loop_count: 6000000
diff --git a/benchmark/vm_struct_big_aset.yml b/benchmark/vm_struct_big_aset.yml
new file mode 100644
index 0000000000..69550d14ea
--- /dev/null
+++ b/benchmark/vm_struct_big_aset.yml
@@ -0,0 +1,11 @@
+# loop_count is not utilized since `i` is involved in the script
+benchmark:
+  vm_struct_big_aset: |
+    s = Struct.new(*('a'..'z').map { |x| x.to_sym })
+    x = s.new
+    i = 0
+    while i<6_000_000
+      i += 1
+      x.k = i # x[10] = i
+    end
+loop_count: 1
diff --git a/benchmark/vm_struct_big_href_hi.yml b/benchmark/vm_struct_big_href_hi.yml
new file mode 100644
index 0000000000..09b764dd13
--- /dev/null
+++ b/benchmark/vm_struct_big_href_hi.yml
@@ -0,0 +1,7 @@
+prelude: |
+  s = Struct.new(*('a'..'z').map { |x| x.to_sym })
+  x = s.new
+benchmark:
+  vm_struct_big_href_hi: |
+    x[:z]
+loop_count: 6000000
diff --git a/benchmark/vm_struct_big_href_lo.yml b/benchmark/vm_struct_big_href_lo.yml
new file mode 100644
index 0000000000..d2f00b220f
--- /dev/null
+++ b/benchmark/vm_struct_big_href_lo.yml
@@ -0,0 +1,7 @@
+prelude: |
+  s = Struct.new(*('a'..'z').map { |x| x.to_sym })
+  x = s.new
+benchmark:
+  vm_struct_big_href_lo: |
+    x[:k]
+loop_count: 6000000
diff --git a/benchmark/vm_struct_big_hset.yml b/benchmark/vm_struct_big_hset.yml
new file mode 100644
index 0000000000..fc45cbee9c
--- /dev/null
+++ b/benchmark/vm_struct_big_hset.yml
@@ -0,0 +1,11 @@
+# loop_count is not utilized since `i` is involved in the script
+benchmark:
+  vm_struct_big_hset: |
+    s = Struct.new(*('a'..'z').map { |x| x.to_sym })
+    x = s.new
+    i = 0
+    while i<6_000_000
+      i += 1
+      x[:k] = i
+    end
+loop_count: 1
diff --git a/benchmark/vm_struct_small_aref.yml b/benchmark/vm_struct_small_aref.yml
new file mode 100644
index 0000000000..5a83251d1e
--- /dev/null
+++ b/benchmark/vm_struct_small_aref.yml
@@ -0,0 +1,7 @@
+prelude: |
+  s = Struct.new(:a, :b, :c)
+  x = s.new
+benchmark:
+  vm_struct_small_aref: |
+    x.a
+loop_count: 6000000
diff --git a/benchmark/vm_struct_small_aset.yml b/benchmark/vm_struct_small_aset.yml
new file mode 100644
index 0000000000..74f435f126
--- /dev/null
+++ b/benchmark/vm_struct_small_aset.yml
@@ -0,0 +1,11 @@
+# loop_count is not utilized since `i` is involved in the script
+benchmark:
+  vm_struct_small_aset: |
+    s = Struct.new(:a, :b, :c)
+    x = s.new
+    i = 0
+    while i<6_000_000
+      i += 1
+      x.a = i
+    end
+loop_count: 1
diff --git a/benchmark/vm_struct_small_href.yml b/benchmark/vm_struct_small_href.yml
new file mode 100644
index 0000000000..6b7d7f39e7
--- /dev/null
+++ b/benchmark/vm_struct_small_href.yml
@@ -0,0 +1,7 @@
+prelude: |
+  s = Struct.new(:a, :b, :c)
+  x = s.new
+benchmark:
+  vm_struct_small_href: |
+    x[:a]
+loop_count: 6000000
diff --git a/benchmark/vm_struct_small_hset.yml b/benchmark/vm_struct_small_hset.yml
new file mode 100644
index 0000000000..5d43b150de
--- /dev/null
+++ b/benchmark/vm_struct_small_hset.yml
@@ -0,0 +1,7 @@
+prelude: |
+  s = Struct.new(:a, :b, :c)
+  x = s.new
+benchmark:
+  vm_struct_small_hset: |
+    x[:a] = 1
+loop_count: 6000000
diff --git a/benchmark/vm_super.yml b/benchmark/vm_super.yml
new file mode 100644
index 0000000000..0d1e965c6e
--- /dev/null
+++ b/benchmark/vm_super.yml
@@ -0,0 +1,17 @@
+prelude: |
+  class C
+    def m
+      1
+    end
+  end
+
+  class CC < C
+    def m
+      super()
+    end
+  end
+
+  obj = CC.new
+benchmark:
+  vm_super: obj.m
+loop_count: 6000000
diff --git a/benchmark/vm_swap.yml b/benchmark/vm_swap.yml
new file mode 100644
index 0000000000..e824a65e0a
--- /dev/null
+++ b/benchmark/vm_swap.yml
@@ -0,0 +1,7 @@
+prelude: |
+  a = 1
+  b = 2
+benchmark:
+  vm_swap: |
+    a, b = b, a
+loop_count: 30000000
diff --git a/benchmark/bm_vm_symbol_block_pass.rb b/benchmark/vm_symbol_block_pass.rb
index 1d433353e1..1d433353e1 100644
--- a/benchmark/bm_vm_symbol_block_pass.rb
+++ b/benchmark/vm_symbol_block_pass.rb
diff --git a/benchmark/vm_thread_alive_check.yml b/benchmark/vm_thread_alive_check.yml
new file mode 100644
index 0000000000..d21737d3e8
--- /dev/null
+++ b/benchmark/vm_thread_alive_check.yml
@@ -0,0 +1,8 @@
+benchmark:
+  vm_thread_alive_check: |
+    t = Thread.new{}
+    while t.alive?
+      Thread.pass
+    end
+loop_count: 50_000
+
diff --git a/benchmark/bm_vm_thread_close.rb b/benchmark/vm_thread_close.rb
index 3e9a265ce8..3e9a265ce8 100644
--- a/benchmark/bm_vm_thread_close.rb
+++ b/benchmark/vm_thread_close.rb
diff --git a/benchmark/vm_thread_condvar1.rb b/benchmark/vm_thread_condvar1.rb
new file mode 100644
index 0000000000..cf5706b23e
--- /dev/null
+++ b/benchmark/vm_thread_condvar1.rb
@@ -0,0 +1,28 @@
+# two threads, two mutex, two condvar ping-pong
+require 'thread'
+m1 = Mutex.new
+m2 = Mutex.new
+cv1 = ConditionVariable.new
+cv2 = ConditionVariable.new
+max = 100000
+i = 0
+wait = nil
+m2.synchronize do
+  wait = Thread.new do
+    m1.synchronize do
+      m2.synchronize { cv2.signal }
+      while (i += 1) < max
+        cv1.wait(m1)
+        cv2.signal
+      end
+    end
+  end
+  cv2.wait(m2)
+end
+m1.synchronize do
+  while i < max
+    cv1.signal
+    cv2.wait(m1)
+  end
+end
+wait.join
diff --git a/benchmark/vm_thread_condvar2.rb b/benchmark/vm_thread_condvar2.rb
new file mode 100644
index 0000000000..7c8dc19481
--- /dev/null
+++ b/benchmark/vm_thread_condvar2.rb
@@ -0,0 +1,35 @@
+# many threads, one mutex, many condvars
+require 'thread'
+m = Mutex.new
+cv1 = ConditionVariable.new
+cv2 = ConditionVariable.new
+max = 1000
+n = 100
+waiting = 0
+scvs = []
+waiters = n.times.map do |i|
+  start_cv = ConditionVariable.new
+  scvs << start_cv
+  start_mtx = Mutex.new
+  start_mtx.synchronize do
+    th = Thread.new(start_mtx, start_cv) do |sm, scv|
+      m.synchronize do
+        sm.synchronize { scv.signal }
+        max.times do
+          cv2.signal if (waiting += 1) == n
+          cv1.wait(m)
+        end
+      end
+    end
+    start_cv.wait(start_mtx)
+    th
+  end
+end
+m.synchronize do
+  max.times do
+    cv2.wait(m) until waiting == n
+    waiting = 0
+    cv1.broadcast
+  end
+end
+waiters.each(&:join)
diff --git a/benchmark/bm_vm_thread_create_join.rb b/benchmark/vm_thread_create_join.rb
index 393cd45df9..393cd45df9 100644
--- a/benchmark/bm_vm_thread_create_join.rb
+++ b/benchmark/vm_thread_create_join.rb
diff --git a/benchmark/vm_thread_mutex1.rb b/benchmark/vm_thread_mutex1.rb
new file mode 100644
index 0000000000..66e42c85e1
--- /dev/null
+++ b/benchmark/vm_thread_mutex1.rb
@@ -0,0 +1,21 @@
+# one thread, one mutex (no contention)
+
+require 'thread'
+m = Thread::Mutex.new
+r = 0
+max = 2000
+lmax = max * max
+(1..1).map{
+  Thread.new{
+    i = 0
+    while i<lmax
+      i += 1
+      m.synchronize{
+        r += 1
+      }
+    end
+  }
+}.each{|e|
+  e.join
+}
+raise r.to_s if r != max * max
diff --git a/benchmark/vm_thread_mutex2.rb b/benchmark/vm_thread_mutex2.rb
new file mode 100644
index 0000000000..6e6c804c31
--- /dev/null
+++ b/benchmark/vm_thread_mutex2.rb
@@ -0,0 +1,21 @@
+# two threads, one mutex
+
+require 'thread'
+m = Thread::Mutex.new
+r = 0
+max = 2000
+lmax = (max * max)/2
+(1..2).map{
+  Thread.new{
+    i = 0
+    while i<lmax
+      i += 1
+      m.synchronize{
+        r += 1
+      }
+    end
+  }
+}.each{|e|
+  e.join
+}
+raise r.to_s if r != max * max
diff --git a/benchmark/vm_thread_mutex3.rb b/benchmark/vm_thread_mutex3.rb
new file mode 100644
index 0000000000..c750dc542a
--- /dev/null
+++ b/benchmark/vm_thread_mutex3.rb
@@ -0,0 +1,20 @@
+# 1000 threads, one mutex
+
+require 'thread'
+m = Thread::Mutex.new
+r = 0
+max = 2000
+(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/vm_thread_pass.rb b/benchmark/vm_thread_pass.rb
new file mode 100644
index 0000000000..438bd08d45
--- /dev/null
+++ b/benchmark/vm_thread_pass.rb
@@ -0,0 +1,15 @@
+# Plenty Thread.pass
+# A performance may depend on GVL implementation.
+
+tmax = (ARGV.shift || 8).to_i
+lmax = 400_000 / tmax
+
+(1..tmax).map{
+  Thread.new{
+    lmax.times{
+      Thread.pass
+    }
+  }
+}.each{|t| t.join}
+
+
diff --git a/benchmark/vm_thread_pass_flood.rb b/benchmark/vm_thread_pass_flood.rb
new file mode 100644
index 0000000000..65df8e6154
--- /dev/null
+++ b/benchmark/vm_thread_pass_flood.rb
@@ -0,0 +1,10 @@
+# n.b. this is a good test for GVL when pinned to a single CPU
+
+5_000.times{
+  Thread.new{loop{Thread.pass}}
+}
+
+i = 0
+while i<10_000
+  i += 1
+end
diff --git a/benchmark/bm_vm_thread_pipe.rb b/benchmark/vm_thread_pipe.rb
index 112a621905..112a621905 100644
--- a/benchmark/bm_vm_thread_pipe.rb
+++ b/benchmark/vm_thread_pipe.rb
diff --git a/benchmark/vm_thread_queue.rb b/benchmark/vm_thread_queue.rb
new file mode 100644
index 0000000000..1dd3696a3c
--- /dev/null
+++ b/benchmark/vm_thread_queue.rb
@@ -0,0 +1,18 @@
+require 'thread'
+
+n = 10_000_000
+q = Thread::Queue.new
+consumer = Thread.new{
+  while q.pop
+    # consuming
+  end
+}
+
+producer = Thread.new{
+  n.times{
+    q.push true
+  }
+  q.push nil
+}
+
+consumer.join
diff --git a/benchmark/vm_thread_sized_queue.rb b/benchmark/vm_thread_sized_queue.rb
new file mode 100644
index 0000000000..7b9af5482b
--- /dev/null
+++ b/benchmark/vm_thread_sized_queue.rb
@@ -0,0 +1,20 @@
+require 'thread'
+# on producer, one consumer
+
+n = 1_000_000
+q = Thread::SizedQueue.new(100)
+consumer = Thread.new{
+  while q.pop
+    # consuming
+  end
+}
+
+producer = Thread.new{
+  while n > 0
+    q.push true
+    n -= 1
+  end
+  q.push nil
+}
+
+consumer.join
diff --git a/benchmark/vm_thread_sized_queue2.rb b/benchmark/vm_thread_sized_queue2.rb
new file mode 100644
index 0000000000..de9f55e978
--- /dev/null
+++ b/benchmark/vm_thread_sized_queue2.rb
@@ -0,0 +1,23 @@
+require 'thread'
+# one producer, many consumers
+n = 1_000_000
+m = 10
+q = Thread::SizedQueue.new(100)
+consumers = m.times.map do
+  Thread.new do
+    while q.pop
+      # consuming
+    end
+  end
+end
+
+producer = Thread.new do
+  while n > 0
+    q.push true
+    n -= 1
+  end
+  m.times { q.push nil }
+end
+
+producer.join
+consumers.each(&:join)
diff --git a/benchmark/vm_thread_sized_queue3.rb b/benchmark/vm_thread_sized_queue3.rb
new file mode 100644
index 0000000000..ce5f1796d8
--- /dev/null
+++ b/benchmark/vm_thread_sized_queue3.rb
@@ -0,0 +1,22 @@
+require 'thread'
+# many producers, one consumer
+n = 1_000_000
+m = 10
+q = Thread::SizedQueue.new(100)
+consumer = Thread.new do
+  while q.pop
+    # consuming
+  end
+end
+
+producers = m.times.map do
+  Thread.new do
+    while n > 0
+      q.push true
+      n -= 1
+    end
+  end
+end
+producers.each(&:join)
+q.push nil
+consumer.join
diff --git a/benchmark/vm_thread_sized_queue4.rb b/benchmark/vm_thread_sized_queue4.rb
new file mode 100644
index 0000000000..a9b7d80ec0
--- /dev/null
+++ b/benchmark/vm_thread_sized_queue4.rb
@@ -0,0 +1,26 @@
+require 'thread'
+# many producers, many consumers
+nr = 1_000_000
+n = 10
+m = 10
+q = Thread::SizedQueue.new(100)
+consumers = n.times.map do
+  Thread.new do
+    while q.pop
+      # consuming
+    end
+  end
+end
+
+producers = m.times.map do
+  Thread.new do
+    while nr > 0
+      q.push true
+      nr -= 1
+    end
+  end
+end
+
+producers.each(&:join)
+n.times { q.push nil }
+consumers.each(&:join)
diff --git a/benchmark/vm_thread_sleep.yml b/benchmark/vm_thread_sleep.yml
new file mode 100644
index 0000000000..96901d8466
--- /dev/null
+++ b/benchmark/vm_thread_sleep.yml
@@ -0,0 +1,4 @@
+benchmark:
+  vm_thread_sleep: |
+    Thread.new { sleep }
+loop_count: 10_000
diff --git a/benchmark/vm_unif1.yml b/benchmark/vm_unif1.yml
new file mode 100644
index 0000000000..04187bb0e2
--- /dev/null
+++ b/benchmark/vm_unif1.yml
@@ -0,0 +1,7 @@
+prelude: |
+  def m a, b
+  end
+benchmark:
+  vm_unif1: |
+    m 100, 200
+loop_count: 6000000
diff --git a/benchmark/vm_yield.yml b/benchmark/vm_yield.yml
new file mode 100644
index 0000000000..230be3d84f
--- /dev/null
+++ b/benchmark/vm_yield.yml
@@ -0,0 +1,13 @@
+# while loop cost is not removed due to benchmark_driver.gem's limitation
+benchmark:
+  vm_yield: |
+    def m
+      i = 0
+      while i<30_000_000
+        i += 1
+        yield
+      end
+    end
+
+    m{}
+loop_count: 1
diff --git a/benchmark/vm_zsuper.yml b/benchmark/vm_zsuper.yml
new file mode 100644
index 0000000000..bfb5837578
--- /dev/null
+++ b/benchmark/vm_zsuper.yml
@@ -0,0 +1,18 @@
+prelude: |
+  class C
+    def m a
+      1
+    end
+  end
+
+  class CC < C
+    def m a
+      super
+    end
+  end
+
+  obj = CC.new
+benchmark:
+  vm_zsuper: |
+    obj.m 10
+loop_count: 6000000
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 767659d046..7c55366ecb 100644
--- a/bignum.c
+++ b/bignum.c
@@ -9,31 +9,42 @@
 
 **********************************************************************/
 
-#include "internal.h"
-#include "ruby/thread.h"
-#include "ruby/util.h"
+#include "ruby/internal/config.h"
+
+#include <ctype.h>
+#include <float.h>
+#include <math.h>
 
 #ifdef HAVE_STRINGS_H
-#include <strings.h>
+# include <strings.h>
 #endif
-#include <math.h>
-#include <float.h>
-#include <ctype.h>
+
 #ifdef HAVE_IEEEFP_H
-#include <ieeefp.h>
+# include <ieeefp.h>
 #endif
-#include "ruby_assert.h"
 
 #if defined(HAVE_LIBGMP) && defined(HAVE_GMP_H)
-#define USE_GMP
-#include <gmp.h>
+# define USE_GMP
+# include <gmp.h>
 #endif
 
+#include "id.h"
+#include "internal.h"
+#include "internal/bignum.h"
+#include "internal/complex.h"
+#include "internal/gc.h"
+#include "internal/numeric.h"
+#include "internal/object.h"
+#include "internal/sanitizers.h"
+#include "internal/util.h"
+#include "internal/variable.h"
+#include "internal/warnings.h"
+#include "ruby/thread.h"
+#include "ruby/util.h"
+#include "ruby_assert.h"
+
 #define RB_BIGNUM_TYPE_P(x) RB_TYPE_P((x), T_BIGNUM)
 
-#ifndef RUBY_INTEGER_UNIFICATION
-VALUE rb_cBignum;
-#endif
 const char ruby_digitmap[] = "0123456789abcdefghijklmnopqrstuvwxyz";
 
 #ifndef SIZEOF_BDIGIT_DBL
@@ -64,7 +75,6 @@ STATIC_ASSERT(sizeof_long_and_sizeof_bdigit, SIZEOF_BDIGIT % SIZEOF_LONG == 0);
 #else
 #   define HOST_BIGENDIAN_P 0
 #endif
-#define ALIGNOF(type) ((int)offsetof(struct { char f1; type f2; }, f2))
 /* (!LSHIFTABLE(d, n) ? 0 : (n)) is same as n but suppress a warning, C4293, by Visual Studio.  */
 #define LSHIFTABLE(d, n) ((n) < sizeof(d) * CHAR_BIT)
 #define LSHIFTX(d, n) (!LSHIFTABLE(d, n) ? 0 : ((d) << (!LSHIFTABLE(d, n) ? 0 : (n))))
@@ -138,6 +148,11 @@ STATIC_ASSERT(sizeof_long_and_sizeof_bdigit, SIZEOF_BDIGIT % SIZEOF_LONG == 0);
 #define GMP_DIV_DIGITS 20
 #define GMP_BIG2STR_DIGITS 20
 #define GMP_STR2BIG_DIGITS 20
+#ifdef USE_GMP
+# define NAIVE_MUL_DIGITS GMP_MUL_DIGITS
+#else
+# define NAIVE_MUL_DIGITS KARATSUBA_MUL_DIGITS
+#endif
 
 typedef void (mulfunc_t)(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn, BDIGIT *wds, size_t wn);
 
@@ -380,6 +395,7 @@ bdigitdbl2bary(BDIGIT *ds, size_t n, BDIGIT_DBL num)
 static int
 bary_cmp(const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn)
 {
+    size_t i;
     BARY_TRUNC(xds, xn);
     BARY_TRUNC(yds, yn);
 
@@ -388,11 +404,12 @@ bary_cmp(const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn)
     if (xn > yn)
         return 1;
 
-    while (xn-- && xds[xn] == yds[xn])
-        ;
-    if (xn == (size_t)-1)
+    for (i = 0; i < xn; i++)
+        if (xds[xn - i - 1] != yds[yn - i - 1])
+            break;
+    if (i == xn)
         return 0;
-    return xds[xn] < yds[xn] ? -1 : 1;
+    return xds[xn - i - 1] < yds[yn - i - 1] ? -1 : 1;
 }
 
 static BDIGIT
@@ -413,22 +430,22 @@ bary_small_lshift(BDIGIT *zds, const BDIGIT *xds, size_t n, int shift)
 static void
 bary_small_rshift(BDIGIT *zds, const BDIGIT *xds, size_t n, int shift, BDIGIT higher_bdigit)
 {
+    size_t i;
     BDIGIT_DBL num = 0;
-    BDIGIT x;
 
     assert(0 <= shift && shift < BITSPERDIG);
 
     num = BIGUP(higher_bdigit);
-    while (n--) {
-	num = (num | xds[n]) >> shift;
-        x = xds[n];
-	zds[n] = BIGLO(num);
+    for (i = 0; i < n; i++) {
+        BDIGIT x = xds[n - i - 1];
+	num = (num | x) >> shift;
+        zds[n - i - 1] = BIGLO(num);
 	num = BIGUP(x);
     }
 }
 
 static int
-bary_zero_p(BDIGIT *xds, size_t xn)
+bary_zero_p(const BDIGIT *xds, size_t xn)
 {
     if (xn == 0)
         return 1;
@@ -441,8 +458,9 @@ bary_zero_p(BDIGIT *xds, size_t xn)
 static void
 bary_neg(BDIGIT *ds, size_t n)
 {
-    while (n--)
-        ds[n] = BIGLO(~ds[n]);
+    size_t i;
+    for (i = 0; i < n; i++)
+        ds[n - i - 1] = BIGLO(~ds[n - i - 1]);
 }
 
 static int
@@ -612,8 +630,12 @@ static int
 bytes_2comp(unsigned char *buf, size_t len)
 {
     size_t i;
-    for (i = 0; i < len; i++)
-        buf[i] = ~buf[i];
+    for (i = 0; i < len; i++) {
+        signed char c = buf[i];
+        signed int d = ~c;
+        unsigned int e = d & 0xFF;
+        buf[i] = e;
+    }
     for (i = 0; i < len; i++) {
         buf[i]++;
         if (buf[i] != 0)
@@ -663,7 +685,7 @@ bary_pack(int sign, BDIGIT *ds, size_t num_bdigits, void *words, size_t numwords
                     return ((1 < de - dp || CLEAR_LOWBITS(d, 8) != 0) ? 2 : 1) * sign;
                 }
 #if defined(HAVE_UINT16_T) && 2 <= SIZEOF_BDIGIT
-                if (wordsize == 2 && (uintptr_t)words % ALIGNOF(uint16_t) == 0) {
+                if (wordsize == 2 && (uintptr_t)words % RUBY_ALIGNOF(uint16_t) == 0) {
                     uint16_t u = (uint16_t)(d = dp[0]);
                     if (need_swap) u = swap16(u);
                     *((uint16_t *)words) = u;
@@ -671,7 +693,7 @@ bary_pack(int sign, BDIGIT *ds, size_t num_bdigits, void *words, size_t numwords
                 }
 #endif
 #if defined(HAVE_UINT32_T) && 4 <= SIZEOF_BDIGIT
-                if (wordsize == 4 && (uintptr_t)words % ALIGNOF(uint32_t) == 0) {
+                if (wordsize == 4 && (uintptr_t)words % RUBY_ALIGNOF(uint32_t) == 0) {
                     uint32_t u = (uint32_t)(d = dp[0]);
                     if (need_swap) u = swap32(u);
                     *((uint32_t *)words) = u;
@@ -679,7 +701,7 @@ bary_pack(int sign, BDIGIT *ds, size_t num_bdigits, void *words, size_t numwords
                 }
 #endif
 #if defined(HAVE_UINT64_T) && 8 <= SIZEOF_BDIGIT
-                if (wordsize == 8 && (uintptr_t)words % ALIGNOF(uint64_t) == 0) {
+                if (wordsize == 8 && (uintptr_t)words % RUBY_ALIGNOF(uint64_t) == 0) {
                     uint64_t u = (uint64_t)(d = dp[0]);
                     if (need_swap) u = swap64(u);
                     *((uint64_t *)words) = u;
@@ -694,7 +716,7 @@ bary_pack(int sign, BDIGIT *ds, size_t num_bdigits, void *words, size_t numwords
                     return (1 < de - dp || FILL_LOWBITS(d, 8) != -1) ? -2 : -1;
                 }
 #if defined(HAVE_UINT16_T) && 2 <= SIZEOF_BDIGIT
-                if (wordsize == 2 && (uintptr_t)words % ALIGNOF(uint16_t) == 0) {
+                if (wordsize == 2 && (uintptr_t)words % RUBY_ALIGNOF(uint16_t) == 0) {
                     uint16_t u = (uint16_t)(d = -(BDIGIT_DBL_SIGNED)dp[0]);
                     if (need_swap) u = swap16(u);
                     *((uint16_t *)words) = u;
@@ -703,7 +725,7 @@ bary_pack(int sign, BDIGIT *ds, size_t num_bdigits, void *words, size_t numwords
                 }
 #endif
 #if defined(HAVE_UINT32_T) && 4 <= SIZEOF_BDIGIT
-                if (wordsize == 4 && (uintptr_t)words % ALIGNOF(uint32_t) == 0) {
+                if (wordsize == 4 && (uintptr_t)words % RUBY_ALIGNOF(uint32_t) == 0) {
                     uint32_t u = (uint32_t)(d = -(BDIGIT_DBL_SIGNED)dp[0]);
                     if (need_swap) u = swap32(u);
                     *((uint32_t *)words) = u;
@@ -712,7 +734,7 @@ bary_pack(int sign, BDIGIT *ds, size_t num_bdigits, void *words, size_t numwords
                 }
 #endif
 #if defined(HAVE_UINT64_T) && 8 <= SIZEOF_BDIGIT
-                if (wordsize == 8 && (uintptr_t)words % ALIGNOF(uint64_t) == 0) {
+                if (wordsize == 8 && (uintptr_t)words % RUBY_ALIGNOF(uint64_t) == 0) {
                     uint64_t u = (uint64_t)(d = -(BDIGIT_DBL_SIGNED)dp[0]);
                     if (need_swap) u = swap64(u);
                     *((uint64_t *)words) = u;
@@ -755,7 +777,7 @@ bary_pack(int sign, BDIGIT *ds, size_t num_bdigits, void *words, size_t numwords
         }
 #endif
         if (nails == 0 && SIZEOF_BDIGIT == sizeof(BDIGIT) &&
-            wordsize % SIZEOF_BDIGIT == 0 && (uintptr_t)words % ALIGNOF(BDIGIT) == 0) {
+            wordsize % SIZEOF_BDIGIT == 0 && (uintptr_t)words % RUBY_ALIGNOF(BDIGIT) == 0) {
             size_t bdigits_per_word = wordsize / SIZEOF_BDIGIT;
             size_t src_num_bdigits = de - dp;
             size_t dst_num_bdigits = numwords * bdigits_per_word;
@@ -898,8 +920,6 @@ bary_pack(int sign, BDIGIT *ds, size_t num_bdigits, void *words, size_t numwords
     }
 
     if ((flags & INTEGER_PACK_2COMP) && (sign < 0 && numwords != 0)) {
-        unsigned char *buf;
-
         int word_num_partialbits;
         size_t word_num_fullbytes;
 
@@ -1077,6 +1097,13 @@ integer_unpack_single_bdigit(BDIGIT u, size_t size, int flags, BDIGIT *dp)
     return sign;
 }
 
+#ifdef HAVE_BUILTIN___BUILTIN_ASSUME_ALIGNED
+#define reinterpret_cast(type, value) (type) \
+    __builtin_assume_aligned((value), sizeof(*(type)NULL));
+#else
+#define reinterpret_cast(type, value) (type)value
+#endif
+
 static int
 bary_unpack_internal(BDIGIT *bdigits, size_t num_bdigits, const void *words, size_t numwords, size_t wordsize, size_t nails, int flags, int nlp_bits)
 {
@@ -1097,23 +1124,24 @@ bary_unpack_internal(BDIGIT *bdigits, size_t num_bdigits, const void *words, siz
                 return integer_unpack_single_bdigit(*(uint8_t *)buf, sizeof(uint8_t), flags, dp);
             }
 #if defined(HAVE_UINT16_T) && 2 <= SIZEOF_BDIGIT
-            if (wordsize == 2 && (uintptr_t)words % ALIGNOF(uint16_t) == 0) {
-                uint16_t u = *(uint16_t *)buf;
+            if (wordsize == 2 && (uintptr_t)words % RUBY_ALIGNOF(uint16_t) == 0) {
+                uint16_t u = *reinterpret_cast(const uint16_t *, buf);
                 return integer_unpack_single_bdigit(need_swap ? swap16(u) : u, sizeof(uint16_t), flags, dp);
             }
 #endif
 #if defined(HAVE_UINT32_T) && 4 <= SIZEOF_BDIGIT
-            if (wordsize == 4 && (uintptr_t)words % ALIGNOF(uint32_t) == 0) {
-                uint32_t u = *(uint32_t *)buf;
+            if (wordsize == 4 && (uintptr_t)words % RUBY_ALIGNOF(uint32_t) == 0) {
+                uint32_t u = *reinterpret_cast(const uint32_t *, buf);
                 return integer_unpack_single_bdigit(need_swap ? swap32(u) : u, sizeof(uint32_t), flags, dp);
             }
 #endif
 #if defined(HAVE_UINT64_T) && 8 <= SIZEOF_BDIGIT
-            if (wordsize == 8 && (uintptr_t)words % ALIGNOF(uint64_t) == 0) {
-                uint64_t u = *(uint64_t *)buf;
+            if (wordsize == 8 && (uintptr_t)words % RUBY_ALIGNOF(uint64_t) == 0) {
+                uint64_t u = *reinterpret_cast(const uint64_t *, buf);
                 return integer_unpack_single_bdigit(need_swap ? swap64(u) : u, sizeof(uint64_t), flags, dp);
             }
 #endif
+#undef reinterpret_cast
         }
 #if !defined(WORDS_BIGENDIAN)
         if (nails == 0 && SIZEOF_BDIGIT == sizeof(BDIGIT) &&
@@ -1429,7 +1457,9 @@ bary_add_one(BDIGIT *ds, size_t n)
 {
     size_t i;
     for (i = 0; i < n; i++) {
-	ds[i] = BIGLO(ds[i]+1);
+        BDIGIT_DBL n = ds[i];
+        n += 1;
+        ds[i] = BIGLO(n);
         if (ds[i] != 0)
             return 0;
     }
@@ -1497,15 +1527,16 @@ bigdivrem_mulsub(BDIGIT *zds, size_t zn, BDIGIT x, const BDIGIT *yds, size_t yn)
     i = 0;
 
     do {
-        BDIGIT_DBL ee;
+        BDIGIT_DBL_SIGNED ee;
         t2 += (BDIGIT_DBL)yds[i] * x;
         ee = num - BIGLO(t2);
-        num = (BDIGIT_DBL)zds[i] + ee;
+        num = (BDIGIT_DBL_SIGNED)zds[i] + ee;
         if (ee) zds[i] = BIGLO(num);
         num = BIGDN(num);
         t2 = BIGDN(t2);
     } while (++i < yn);
-    num += zds[i] - t2; /* borrow from high digit; don't update */
+    num -= (BDIGIT_DBL_SIGNED)t2;
+    num += (BDIGIT_DBL_SIGNED)zds[yn]; /* borrow from high digit; don't update */
     return num;
 }
 
@@ -1975,7 +2006,7 @@ bary_mul_toom3(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGI
     }
 
     /*
-     * ref. http://en.wikipedia.org/wiki/Toom%E2%80%93Cook_multiplication
+     * ref. https://en.wikipedia.org/wiki/Toom%E2%80%93Cook_multiplication
      *
      * x(b) = x0 * b^0 + x1 * b^1 + x2 * b^2
      * y(b) = y0 * b^0 + y1 * b^1 + y2 * b^2
@@ -2256,10 +2287,23 @@ rb_big_mul_toom3(VALUE x, VALUE y)
 }
 
 #ifdef USE_GMP
+static inline void
+bdigits_to_mpz(mpz_t mp, const BDIGIT *digits, size_t len)
+{
+    const size_t nails = (sizeof(BDIGIT)-SIZEOF_BDIGIT)*CHAR_BIT;
+    mpz_import(mp, len, -1, sizeof(BDIGIT), 0, nails, digits);
+}
+
+static inline void
+bdigits_from_mpz(mpz_t mp, BDIGIT *digits, size_t *len)
+{
+    const size_t nails = (sizeof(BDIGIT)-SIZEOF_BDIGIT)*CHAR_BIT;
+    mpz_export(digits, len, -1, sizeof(BDIGIT), 0, nails, mp);
+}
+
 static void
 bary_mul_gmp(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn)
 {
-    const size_t nails = (sizeof(BDIGIT)-SIZEOF_BDIGIT)*CHAR_BIT;
     mpz_t x, y, z;
     size_t count;
 
@@ -2268,15 +2312,15 @@ bary_mul_gmp(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT
     mpz_init(x);
     mpz_init(y);
     mpz_init(z);
-    mpz_import(x, xn, -1, sizeof(BDIGIT), 0, nails, xds);
+    bdigits_to_mpz(x, xds, xn);
     if (xds == yds && xn == yn) {
         mpz_mul(z, x, x);
     }
     else {
-        mpz_import(y, yn, -1, sizeof(BDIGIT), 0, nails, yds);
+        bdigits_to_mpz(y, yds, yn);
         mpz_mul(z, x, y);
     }
-    mpz_export(zds, &count, -1, sizeof(BDIGIT), 0, nails, z);
+    bdigits_from_mpz(z, zds, &count);
     BDIGITS_ZERO(zds+count, zn-count);
     mpz_clear(x);
     mpz_clear(y);
@@ -2315,9 +2359,9 @@ bary_sparse_p(const BDIGIT *ds, size_t n)
 {
     long c = 0;
 
-    if (          ds[rb_genrand_ulong_limited(n / 2) + n / 4]) c++;
-    if (c <= 1 && ds[rb_genrand_ulong_limited(n / 2) + n / 4]) c++;
-    if (c <= 1 && ds[rb_genrand_ulong_limited(n / 2) + n / 4]) c++;
+    if (          ds[2 * n / 5]) c++;
+    if (c <= 1 && ds[    n / 2]) c++;
+    if (c <= 1 && ds[3 * n / 5]) c++;
 
     return (c <= 1) ? 1 : 0;
 }
@@ -2425,12 +2469,7 @@ bary_mul_karatsuba_branch(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn,
 {
     /* normal multiplication when x is small */
     if (xn < KARATSUBA_MUL_DIGITS) {
-      normal:
-        if (xds == yds && xn == yn)
-            bary_sq_fast(zds, zn, xds, xn);
-        else
-            bary_short_mul(zds, zn, xds, xn, yds, yn);
-        return;
+        goto normal;
     }
 
     /* normal multiplication when x or y is a sparse bignum */
@@ -2448,6 +2487,15 @@ bary_mul_karatsuba_branch(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn,
 
     /* multiplication by karatsuba method */
     bary_mul_karatsuba(zds, zn, xds, xn, yds, yn, wds, wn);
+    return;
+
+  normal:
+    if (xds == yds && xn == yn) {
+        bary_sq_fast(zds, zn, xds, xn);
+    }
+    else {
+        bary_short_mul(zds, zn, xds, xn, yds, yn);
+    }
 }
 
 static void
@@ -2487,13 +2535,8 @@ bary_mul_toom3_start(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const
 static void
 bary_mul(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn)
 {
-#ifdef USE_GMP
-    const size_t naive_threshold = GMP_MUL_DIGITS;
-#else
-    const size_t naive_threshold = KARATSUBA_MUL_DIGITS;
-#endif
     if (xn <= yn) {
-        if (xn < naive_threshold) {
+        if (xn < NAIVE_MUL_DIGITS) {
             if (xds == yds && xn == yn)
                 bary_sq_fast(zds, zn, xds, xn);
             else
@@ -2502,7 +2545,7 @@ bary_mul(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds
         }
     }
     else {
-        if (yn < naive_threshold) {
+        if (yn < NAIVE_MUL_DIGITS) {
             bary_short_mul(zds, zn, yds, yn, xds, xn);
             return;
         }
@@ -2556,6 +2599,7 @@ bigdivrem1(void *ptr)
     return 0;
 }
 
+/* async-signal-safe */
 static void
 rb_big_stop(void *ptr)
 {
@@ -2578,10 +2622,9 @@ bigdivrem_single1(BDIGIT *qds, const BDIGIT *xds, size_t xn, BDIGIT x_higher_bdi
         size_t i;
         BDIGIT_DBL t2;
         t2 = x_higher_bdigit;
-        i = xn;
-        while (i--) {
-            t2 = BIGUP(t2) + xds[i];
-            qds[i] = (BDIGIT)(t2 / y);
+        for (i = 0; i < xn; i++) {
+            t2 = BIGUP(t2) + xds[xn - i - 1];
+            qds[xn - i - 1] = (BDIGIT)(t2 / y);
             t2 %= y;
         }
         return (BDIGIT)t2;
@@ -2621,7 +2664,7 @@ bigdivrem_restoring(BDIGIT *zds, size_t zn, BDIGIT *yds, size_t yn)
     if (bds.zn > 10000 || bds.yn > 10000) {
       retry:
 	bds.stop = Qfalse;
-	rb_thread_call_without_gvl(bigdivrem1, &bds, rb_big_stop, &bds);
+        rb_nogvl(bigdivrem1, &bds, rb_big_stop, &bds, RB_NOGVL_UBF_ASYNC_SAFE);
 
 	if (bds.stop == Qtrue) {
 	    /* execute trap handler, but exception was not raised. */
@@ -2732,7 +2775,6 @@ rb_big_divrem_normal(VALUE x, VALUE y)
 static void
 bary_divmod_gmp(BDIGIT *qds, size_t qn, BDIGIT *rds, size_t rn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn)
 {
-    const size_t nails = (sizeof(BDIGIT)-SIZEOF_BDIGIT)*CHAR_BIT;
     mpz_t x, y, q, r;
     size_t count;
 
@@ -2746,8 +2788,8 @@ bary_divmod_gmp(BDIGIT *qds, size_t qn, BDIGIT *rds, size_t rn, const BDIGIT *xd
     if (qds) mpz_init(q);
     if (rds) mpz_init(r);
 
-    mpz_import(x, xn, -1, sizeof(BDIGIT), 0, nails, xds);
-    mpz_import(y, yn, -1, sizeof(BDIGIT), 0, nails, yds);
+    bdigits_to_mpz(x, xds, xn);
+    bdigits_to_mpz(y, yds, yn);
 
     if (!rds) {
         mpz_fdiv_q(q, x, y);
@@ -2763,13 +2805,13 @@ bary_divmod_gmp(BDIGIT *qds, size_t qn, BDIGIT *rds, size_t rn, const BDIGIT *xd
     mpz_clear(y);
 
     if (qds) {
-        mpz_export(qds, &count, -1, sizeof(BDIGIT), 0, nails, q);
+        bdigits_from_mpz(q, qds, &count);
         BDIGITS_ZERO(qds+count, qn-count);
         mpz_clear(q);
     }
 
     if (rds) {
-        mpz_export(rds, &count, -1, sizeof(BDIGIT), 0, nails, r);
+        bdigits_from_mpz(r, rds, &count);
         BDIGITS_ZERO(rds+count, rn-count);
         mpz_clear(r);
     }
@@ -2868,29 +2910,8 @@ bary_divmod(BDIGIT *qds, size_t qn, BDIGIT *rds, size_t rn, const BDIGIT *xds, s
 }
 
 
-#define BIGNUM_DEBUG 0
-#if BIGNUM_DEBUG
-#define ON_DEBUG(x) do { x; } while (0)
-static void
-dump_bignum(VALUE x)
-{
-    long i;
-    printf("%c0x0", BIGNUM_SIGN(x) ? '+' : '-');
-    for (i = BIGNUM_LEN(x); i--; ) {
-        printf("_%0*"PRIxBDIGIT, SIZEOF_BDIGIT*2, BDIGITS(x)[i]);
-    }
-    printf(", len=%"PRIuSIZE, BIGNUM_LEN(x));
-    puts("");
-}
-
-static VALUE
-rb_big_dump(VALUE x)
-{
-    dump_bignum(x);
-    return x;
-}
-#else
-#define ON_DEBUG(x)
+#ifndef BIGNUM_DEBUG
+# define BIGNUM_DEBUG (0+RUBY_DEBUG)
 #endif
 
 static int
@@ -2928,7 +2949,7 @@ rb_cmpint(VALUE val, VALUE a, VALUE b)
 }
 
 #define BIGNUM_SET_LEN(b,l) \
-    ((RBASIC(b)->flags & BIGNUM_EMBED_FLAG) ? \
+    (BIGNUM_EMBED_P(b) ? \
      (void)(RBASIC(b)->flags = \
 	    (RBASIC(b)->flags & ~BIGNUM_EMBED_LEN_MASK) | \
 	    ((l) << BIGNUM_EMBED_LEN_SHIFT)) : \
@@ -2938,19 +2959,19 @@ static void
 rb_big_realloc(VALUE big, size_t len)
 {
     BDIGIT *ds;
-    if (RBASIC(big)->flags & BIGNUM_EMBED_FLAG) {
+    if (BIGNUM_EMBED_P(big)) {
 	if (BIGNUM_EMBED_LEN_MAX < len) {
 	    ds = ALLOC_N(BDIGIT, len);
 	    MEMCPY(ds, RBIGNUM(big)->as.ary, BDIGIT, BIGNUM_EMBED_LEN_MAX);
 	    RBIGNUM(big)->as.heap.len = BIGNUM_LEN(big);
 	    RBIGNUM(big)->as.heap.digits = ds;
-	    RBASIC(big)->flags &= ~BIGNUM_EMBED_FLAG;
+            FL_UNSET_RAW(big, BIGNUM_EMBED_FLAG);
 	}
     }
     else {
 	if (len <= BIGNUM_EMBED_LEN_MAX) {
 	    ds = RBIGNUM(big)->as.heap.digits;
-	    RBASIC(big)->flags |= BIGNUM_EMBED_FLAG;
+            FL_SET_RAW(big, BIGNUM_EMBED_FLAG);
 	    BIGNUM_SET_LEN(big, len);
             (void)VALGRIND_MAKE_MEM_UNDEFINED((void*)RBIGNUM(big)->as.ary, sizeof(RBIGNUM(big)->as.ary));
 	    if (ds) {
@@ -2980,18 +3001,19 @@ static VALUE
 bignew_1(VALUE klass, size_t len, int sign)
 {
     NEWOBJ_OF(big, struct RBignum, klass, T_BIGNUM | (RGENGC_WB_PROTECTED_BIGNUM ? FL_WB_PROTECTED : 0));
-    BIGNUM_SET_SIGN(big, sign);
+    VALUE bigv = (VALUE)big;
+    BIGNUM_SET_SIGN(bigv, sign);
     if (len <= BIGNUM_EMBED_LEN_MAX) {
-	RBASIC(big)->flags |= BIGNUM_EMBED_FLAG;
-	BIGNUM_SET_LEN(big, len);
-        (void)VALGRIND_MAKE_MEM_UNDEFINED((void*)RBIGNUM(big)->as.ary, sizeof(RBIGNUM(big)->as.ary));
+        FL_SET_RAW(bigv, BIGNUM_EMBED_FLAG);
+        BIGNUM_SET_LEN(bigv, len);
+        (void)VALGRIND_MAKE_MEM_UNDEFINED((void*)big->as.ary, sizeof(big->as.ary));
     }
     else {
-	RBIGNUM(big)->as.heap.digits = ALLOC_N(BDIGIT, len);
-	RBIGNUM(big)->as.heap.len = len;
+        big->as.heap.digits = ALLOC_N(BDIGIT, len);
+        big->as.heap.len = len;
     }
-    OBJ_FREEZE(big);
-    return (VALUE)big;
+    OBJ_FREEZE(bigv);
+    return bigv;
 }
 
 VALUE
@@ -3139,7 +3161,7 @@ rb_big_norm(VALUE x)
 }
 
 VALUE
-rb_uint2big(VALUE n)
+rb_uint2big(uintptr_t n)
 {
     long i;
     VALUE big = bignew(bdigit_roomof(SIZEOF_VALUE), 1);
@@ -3161,7 +3183,7 @@ rb_uint2big(VALUE n)
 }
 
 VALUE
-rb_int2big(SIGNED_VALUE n)
+rb_int2big(intptr_t n)
 {
     long neg = 0;
     VALUE u;
@@ -3182,14 +3204,14 @@ rb_int2big(SIGNED_VALUE n)
 }
 
 VALUE
-rb_uint2inum(VALUE n)
+rb_uint2inum(uintptr_t n)
 {
     if (POSFIXABLE(n)) return LONG2FIX(n);
     return rb_uint2big(n);
 }
 
 VALUE
-rb_int2inum(SIGNED_VALUE n)
+rb_int2inum(intptr_t n)
 {
     if (FIXABLE(n)) return LONG2FIX(n);
     return rb_int2big(n);
@@ -3368,7 +3390,7 @@ rb_absint_numwords(VALUE val, size_t word_numbits, size_t *nlz_bits_ret)
     size_t numbytes;
     int nlz_bits_in_msbyte;
     size_t numwords;
-    size_t nlz_bits;
+    size_t nlz_bits = 0;
 
     if (word_numbits == 0)
         return (size_t)-1;
@@ -3570,7 +3592,7 @@ rb_integer_pack(VALUE val, void *words, size_t numwords, size_t wordsize, size_t
 }
 
 /*
- * Import an integer into a buffer.
+ * Import an integer from a buffer.
  *
  * [words] buffer to import.
  * [numwords] the size of given buffer as number of words.
@@ -3725,12 +3747,12 @@ str2big_scan_digits(const char *s, const char *str, int base, int badcheck, size
 	return TRUE;
     }
 
-    if (badcheck && *str == '_') goto bad;
+    if (badcheck && *str == '_') return FALSE;
 
     while ((c = *str++) != 0) {
 	if (c == '_') {
 	    if (nondigit) {
-		if (badcheck) goto bad;
+                if (badcheck) return FALSE;
 		break;
 	    }
 	    nondigit = (char) c;
@@ -3745,7 +3767,7 @@ str2big_scan_digits(const char *s, const char *str, int base, int badcheck, size
 	}
 	if (len > 0 && !--len) break;
     }
-    if (badcheck && nondigit) goto bad;
+    if (badcheck && nondigit) return FALSE;
     if (badcheck && len) {
 	str--;
 	while (*str && ISSPACE(*str)) {
@@ -3753,7 +3775,6 @@ str2big_scan_digits(const char *s, const char *str, int base, int badcheck, size
 	    if (len > 0 && !--len) break;
 	}
 	if (len && *str) {
-	  bad:
 	    return FALSE;
 	}
     }
@@ -3940,7 +3961,6 @@ str2big_gmp(
     size_t num_bdigits,
     int base)
 {
-    const size_t nails = (sizeof(BDIGIT)-SIZEOF_BDIGIT)*CHAR_BIT;
     char *buf, *p;
     const char *q;
     VALUE tmps;
@@ -3963,7 +3983,7 @@ str2big_gmp(
     zn = num_bdigits;
     z = bignew(zn, sign);
     zds = BDIGITS(z);
-    mpz_export(BDIGITS(z), &count, -1, sizeof(BDIGIT), 0, nails, mz);
+    bdigits_from_mpz(mz, BDIGITS(z), &count);
     BDIGITS_ZERO(zds+count, zn-count);
     mpz_clear(mz);
 
@@ -3974,6 +3994,8 @@ str2big_gmp(
 }
 #endif
 
+static VALUE rb_cstr_parse_inum(const char *str, ssize_t len, char **endp, int base);
+
 /*
  * Parse +str+ as Ruby Integer, i.e., underscores, 0d and 0b prefixes.
  *
@@ -4011,22 +4033,28 @@ rb_cstr_to_inum(const char *str, int base, int badcheck)
  *       be NUL-terminated.
  * endp: if non-NULL, the address after parsed part is stored.  if
  *       NULL, Qnil is returned when +str+ is not valid as an Integer.
+ * ndigits: if non-NULL, the number of parsed digits is stored.
  * base: see +rb_cstr_to_inum+
+ * flags: bitwise OR of below flags:
+ *       RB_INT_PARSE_SIGN: allow preceding spaces and +/- sign
+ *       RB_INT_PARSE_UNDERSCORE: allow an underscore between digits
+ *       RB_INT_PARSE_PREFIX: allow preceding prefix
  */
 
 VALUE
-rb_cstr_parse_inum(const char *str, ssize_t len, char **endp, int base)
+rb_int_parse_cstr(const char *str, ssize_t len, char **endp, size_t *ndigits,
+		  int base, int flags)
 {
     const char *const s = str;
     char sign = 1;
     int c;
-    VALUE z;
+    VALUE z = Qnil;
 
     unsigned long val;
     int ov;
 
     const char *digits_start, *digits_end;
-    size_t num_digits;
+    size_t num_digits = 0;
     size_t num_bdigits;
     const ssize_t len0 = len;
     const int badcheck = !endp;
@@ -4042,11 +4070,9 @@ rb_cstr_parse_inum(const char *str, ssize_t len, char **endp, int base)
     } while (0)
 
     if (!str) {
-      bad:
-	if (endp) *endp = (char *)str;
-	return Qnil;
+        goto bad;
     }
-    if (len) {
+    if (len && (flags & RB_INT_PARSE_SIGN)) {
 	while (ISSPACE(*str)) ADV(1);
 
 	if (str[0] == '+') {
@@ -4057,9 +4083,6 @@ rb_cstr_parse_inum(const char *str, ssize_t len, char **endp, int base)
 	    sign = 0;
 	}
 	ASSERT_LEN();
-	if (str[0] == '+' || str[0] == '-') {
-	    goto bad;
-	}
     }
     if (base <= 0) {
 	if (str[0] == '0' && len > 1) {
@@ -4091,7 +4114,7 @@ rb_cstr_parse_inum(const char *str, ssize_t len, char **endp, int base)
 	    base = 10;
 	}
     }
-    else if (len == 1) {
+    else if (len == 1 || !(flags & RB_INT_PARSE_PREFIX)) {
 	/* no prefix */
     }
     else if (base == 2) {
@@ -4118,15 +4141,19 @@ rb_cstr_parse_inum(const char *str, ssize_t len, char **endp, int base)
         invalid_radix(base);
     }
     if (!len) goto bad;
+    num_digits = str - s;
     if (*str == '0' && len != 1) { /* squeeze preceding 0s */
 	int us = 0;
 	const char *end = len < 0 ? NULL : str + len;
-	while ((c = *++str) == '0' || c == '_') {
+	++num_digits;
+	while ((c = *++str) == '0' ||
+	       ((flags & RB_INT_PARSE_UNDERSCORE) && c == '_')) {
 	    if (c == '_') {
 		if (++us >= 2)
 		    break;
 	    }
 	    else {
+		++num_digits;
 		us = 0;
 	    }
 	    if (str == end) break;
@@ -4138,14 +4165,18 @@ rb_cstr_parse_inum(const char *str, ssize_t len, char **endp, int base)
     c = *str;
     c = conv_digit(c);
     if (c < 0 || c >= base) {
+	if (!badcheck && num_digits) z = INT2FIX(0);
 	goto bad;
     }
 
+    if (ndigits) *ndigits = num_digits;
     val = ruby_scan_digits(str, len, base, &num_digits, &ov);
     if (!ov) {
 	const char *end = &str[num_digits];
-	if (num_digits > 0 && *end == '_') goto bigparse;
+	if (num_digits > 0 && *end == '_' && (flags & RB_INT_PARSE_UNDERSCORE))
+	    goto bigparse;
 	if (endp) *endp = (char *)end;
+	if (ndigits) *ndigits += num_digits;
 	if (badcheck) {
 	    if (num_digits == 0) return Qnil; /* no number */
 	    while (len < 0 ? *end : end < str + len) {
@@ -4172,6 +4203,8 @@ rb_cstr_parse_inum(const char *str, ssize_t len, char **endp, int base)
     digits_start = str;
     if (!str2big_scan_digits(s, str, base, badcheck, &num_digits, &len))
 	goto bad;
+    if (endp) *endp = (char *)(str + len);
+    if (ndigits) *ndigits += num_digits;
     digits_end = digits_start + len;
 
     if (POW2_P(base)) {
@@ -4201,10 +4234,22 @@ rb_cstr_parse_inum(const char *str, ssize_t len, char **endp, int base)
     }
 
     return bignorm(z);
+
+  bad:
+    if (endp) *endp = (char *)str;
+    if (ndigits) *ndigits = num_digits;
+    return z;
+}
+
+static VALUE
+rb_cstr_parse_inum(const char *str, ssize_t len, char **endp, int base)
+{
+    return rb_int_parse_cstr(str, len, endp, NULL, base,
+			     RB_INT_PARSE_DEFAULT);
 }
 
 VALUE
-rb_str_to_inum(VALUE str, int base, int badcheck)
+rb_str_convert_to_inum(VALUE str, int base, int badcheck, int raise_exception)
 {
     VALUE ret;
     const char *s;
@@ -4216,13 +4261,22 @@ rb_str_to_inum(VALUE str, int base, int badcheck)
     RSTRING_GETMEM(str, s, len);
     ret = rb_cstr_parse_inum(s, len, (badcheck ? NULL : &end), base);
     if (NIL_P(ret)) {
-	if (badcheck) invalid_integer(str);
-	ret = INT2FIX(0);
+        if (badcheck) {
+            if (!raise_exception) return Qnil;
+            invalid_integer(str);
+        }
+        ret = INT2FIX(0);
     }
     return ret;
 }
 
 VALUE
+rb_str_to_inum(VALUE str, int base, int badcheck)
+{
+    return rb_str_convert_to_inum(str, base, badcheck, TRUE);
+}
+
+VALUE
 rb_str2big_poweroftwo(VALUE arg, int base, int badcheck)
 {
     int positive_p = 1;
@@ -4464,7 +4518,7 @@ rb_uint128t2big(uint128_t n)
     return big;
 }
 
-VALUE
+MJIT_FUNC_EXPORTED VALUE
 rb_int128t2big(int128_t n)
 {
     int neg = 0;
@@ -4604,12 +4658,6 @@ static size_t base36_numdigits_cache[35][MAX_BASE36_POWER_TABLE_ENTRIES];
 static void
 power_cache_init(void)
 {
-    int i, j;
-    for (i = 0; i < 35; ++i) {
-	for (j = 0; j < MAX_BASE36_POWER_TABLE_ENTRIES; ++j) {
-	    base36_power_cache[i][j] = Qnil;
-	}
-    }
 }
 
 static inline VALUE
@@ -4632,8 +4680,8 @@ power_cache_get_power(int base, int power_level, size_t *numdigits_ret)
     if (MAX_BASE36_POWER_TABLE_ENTRIES <= power_level)
         rb_bug("too big power number requested: maxpow_in_bdigit_dbl(%d)**(2**%d)", base, power_level);
 
-    if (NIL_P(base36_power_cache[base - 2][power_level])) {
-        VALUE power;
+    VALUE power = base36_power_cache[base - 2][power_level];
+    if (!power) {
         size_t numdigits;
         if (power_level == 0) {
             int numdigits0;
@@ -4653,7 +4701,7 @@ power_cache_get_power(int base, int power_level, size_t *numdigits_ret)
     }
     if (numdigits_ret)
         *numdigits_ret = base36_numdigits_cache[base - 2][power_level];
-    return base36_power_cache[base - 2][power_level];
+    return power;
 }
 
 struct big2str_struct {
@@ -4962,7 +5010,6 @@ rb_big2str_generic(VALUE x, int base)
 static VALUE
 big2str_gmp(VALUE x, int base)
 {
-    const size_t nails = (sizeof(BDIGIT)-SIZEOF_BDIGIT)*CHAR_BIT;
     mpz_t mx;
     size_t size;
     VALUE str;
@@ -4970,7 +5017,7 @@ big2str_gmp(VALUE x, int base)
     size_t xn = BIGNUM_LEN(x);
 
     mpz_init(mx);
-    mpz_import(mx, xn, -1, sizeof(BDIGIT), 0, nails, xds);
+    bdigits_to_mpz(mx, xds, xn);
 
     size = mpz_sizeinbase(mx, base);
 
@@ -5048,6 +5095,9 @@ rb_big2str(VALUE x, int base)
 static unsigned long
 big2ulong(VALUE x, const char *type)
 {
+#if SIZEOF_LONG > SIZEOF_BDIGIT
+    size_t i;
+#endif
     size_t len = BIGNUM_LEN(x);
     unsigned long num;
     BDIGIT *ds;
@@ -5062,9 +5112,9 @@ big2ulong(VALUE x, const char *type)
     num = (unsigned long)ds[0];
 #else
     num = 0;
-    while (len--) {
+    for (i = 0; i < len; i++) {
 	num <<= BITSPERDIG;
-	num += (unsigned long)ds[len]; /* overflow is already checked */
+        num += (unsigned long)ds[len - i - 1]; /* overflow is already checked */
     }
 #endif
     return num;
@@ -5079,10 +5129,8 @@ rb_big2ulong(VALUE x)
         return num;
     }
     else {
-        if (num <= LONG_MAX)
-            return -(long)num;
-        if (num == 1+(unsigned long)(-(LONG_MIN+1)))
-            return LONG_MIN;
+        if (num <= 1+(unsigned long)(-(LONG_MIN+1)))
+            return -(long)(num-1)-1;
     }
     rb_raise(rb_eRangeError, "bignum out of range of unsigned long");
 }
@@ -5097,10 +5145,8 @@ rb_big2long(VALUE x)
             return num;
     }
     else {
-        if (num <= LONG_MAX)
-            return -(long)num;
-        if (num == 1+(unsigned long)(-(LONG_MIN+1)))
-            return LONG_MIN;
+        if (num <= 1+(unsigned long)(-(LONG_MIN+1)))
+            return -(long)(num-1)-1;
     }
     rb_raise(rb_eRangeError, "bignum too big to convert into `long'");
 }
@@ -5110,6 +5156,9 @@ rb_big2long(VALUE x)
 static unsigned LONG_LONG
 big2ull(VALUE x, const char *type)
 {
+#if SIZEOF_LONG_LONG > SIZEOF_BDIGIT
+    size_t i;
+#endif
     size_t len = BIGNUM_LEN(x);
     unsigned LONG_LONG num;
     BDIGIT *ds = BDIGITS(x);
@@ -5122,9 +5171,9 @@ big2ull(VALUE x, const char *type)
     num = (unsigned LONG_LONG)ds[0];
 #else
     num = 0;
-    while (len--) {
+    for (i = 0; i < len; i++) {
 	num = BIGUP(num);
-	num += ds[len];
+        num += ds[len - i - 1];
     }
 #endif
     return num;
@@ -5139,10 +5188,8 @@ rb_big2ull(VALUE x)
         return num;
     }
     else {
-        if (num <= LLONG_MAX)
-            return -(LONG_LONG)num;
-        if (num == 1+(unsigned LONG_LONG)(-(LLONG_MIN+1)))
-            return LLONG_MIN;
+        if (num <= 1+(unsigned LONG_LONG)(-(LLONG_MIN+1)))
+            return -(LONG_LONG)(num-1)-1;
     }
     rb_raise(rb_eRangeError, "bignum out of range of unsigned long long");
 }
@@ -5157,10 +5204,8 @@ rb_big2ll(VALUE x)
             return num;
     }
     else {
-        if (num <= LLONG_MAX)
-            return -(LONG_LONG)num;
-        if (num == 1+(unsigned LONG_LONG)(-(LLONG_MIN+1)))
-            return LLONG_MIN;
+        if (num <= 1+(unsigned LONG_LONG)(-(LLONG_MIN+1)))
+            return -(LONG_LONG)(num-1)-1;
     }
     rb_raise(rb_eRangeError, "bignum too big to convert into `long long'");
 }
@@ -5235,8 +5280,13 @@ big2dbl(VALUE x)
 		    }
 		}
 		if (carry) {
-		    dl &= BDIGMAX << bits;
-		    dl = BIGLO(dl + ((BDIGIT)1 << bits));
+                    BDIGIT mask = BDIGMAX;
+                    BDIGIT bit = 1;
+                    mask <<= bits;
+                    bit <<= bits;
+                    dl &= mask;
+                    dl += bit;
+                    dl = BIGLO(dl);
 		    if (!dl) d += 1;
 		}
 	    }
@@ -5320,6 +5370,15 @@ rb_integer_float_cmp(VALUE x, VALUE y)
     return INT2FIX(-1);
 }
 
+#if SIZEOF_LONG * CHAR_BIT >= DBL_MANT_DIG /* assume FLT_RADIX == 2 */
+COMPILER_WARNING_PUSH
+#if __has_warning("-Wimplicit-int-float-conversion")
+COMPILER_WARNING_IGNORED(-Wimplicit-int-float-conversion)
+#endif
+static const double LONG_MAX_as_double = LONG_MAX;
+COMPILER_WARNING_POP
+#endif
+
 VALUE
 rb_integer_float_eq(VALUE x, VALUE y)
 {
@@ -5339,7 +5398,7 @@ rb_integer_float_eq(VALUE x, VALUE y)
         return Qtrue;
 #else
         long xn, yn;
-        if (yi < LONG_MIN || LONG_MAX < yi)
+        if (yi < LONG_MIN || LONG_MAX_as_double <= yi)
             return Qfalse;
         xn = FIX2LONG(x);
         yn = (long)yi;
@@ -5352,6 +5411,7 @@ rb_integer_float_eq(VALUE x, VALUE y)
     return rb_big_eq(x, y);
 }
 
+
 VALUE
 rb_big_cmp(VALUE x, VALUE y)
 {
@@ -5375,7 +5435,7 @@ rb_big_cmp(VALUE x, VALUE y)
         return rb_integer_float_cmp(x, y);
     }
     else {
-	return rb_num_coerce_cmp(x, y, rb_intern("<=>"));
+	return rb_num_coerce_cmp(x, y, idCmp);
     }
     return INT2FIX(BIGNUM_SIGN(x) ? 1 : -1);
 }
@@ -5393,7 +5453,7 @@ big_op(VALUE x, VALUE y, enum big_op_t op)
     VALUE rel;
     int n;
 
-    if (FIXNUM_P(y) || RB_BIGNUM_TYPE_P(y)) {
+    if (RB_INTEGER_TYPE_P(y)) {
 	rel = rb_big_cmp(x, y);
     }
     else if (RB_FLOAT_TYPE_P(y)) {
@@ -5403,9 +5463,9 @@ big_op(VALUE x, VALUE y, enum big_op_t op)
 	ID id = 0;
 	switch (op) {
 	  case big_op_gt: id = '>'; break;
-	  case big_op_ge: id = rb_intern(">="); break;
+	  case big_op_ge: id = idGE; break;
 	  case big_op_lt: id = '<'; break;
-	  case big_op_le: id = rb_intern("<="); break;
+	  case big_op_le: id = idLE; break;
 	}
 	return rb_num_coerce_relop(x, y, id);
     }
@@ -5451,8 +5511,8 @@ rb_big_le(VALUE x, VALUE y)
  *     big == obj  -> true or false
  *
  *  Returns <code>true</code> only if <i>obj</i> has the same value
- *  as <i>big</i>. Contrast this with <code>Bignum#eql?</code>, which
- *  requires <i>obj</i> to be a <code>Bignum</code>.
+ *  as <i>big</i>. Contrast this with Integer#eql?, which requires
+ *  <i>obj</i> to be an Integer.
  *
  *     68719476736 == 68719476736.0   #=> true
  */
@@ -5830,17 +5890,10 @@ bigsq(VALUE x)
     xds = BDIGITS(x);
     zds = BDIGITS(z);
 
-#ifdef USE_GMP
-    if (xn < GMP_MUL_DIGITS)
-        bary_sq_fast(zds, zn, xds, xn);
-    else
-        bary_mul(zds, zn, xds, xn, xds, xn);
-#else
-    if (xn < KARATSUBA_MUL_DIGITS)
+    if (xn < NAIVE_MUL_DIGITS)
         bary_sq_fast(zds, zn, xds, xn);
     else
         bary_mul(zds, zn, xds, xn, xds, xn);
-#endif
 
     RB_GC_GUARD(x);
     return z;
@@ -5922,7 +5975,7 @@ bigdivrem(VALUE x, VALUE y, volatile VALUE *divp, volatile VALUE *modp)
 	zds = BDIGITS(z);
         dd = bigdivrem_single(zds, xds, xn, dd);
 	if (modp) {
-	    *modp = rb_uint2big((VALUE)dd);
+	    *modp = rb_uint2big((uintptr_t)dd);
 	    BIGNUM_SET_SIGN(*modp, BIGNUM_SIGN(x));
 	}
 	if (divp) *divp = z;
@@ -6012,12 +6065,15 @@ rb_big_divide(VALUE x, VALUE y, ID op)
     }
     else if (RB_FLOAT_TYPE_P(y)) {
 	if (op == '/') {
-	    return DBL2NUM(rb_big2dbl(x) / RFLOAT_VALUE(y));
+            double dx = rb_big2dbl(x);
+            return rb_flo_div_flo(DBL2NUM(dx), y);
 	}
 	else {
+            VALUE v;
 	    double dy = RFLOAT_VALUE(y);
 	    if (dy == 0.0) rb_num_zerodiv();
-	    return rb_dbl2big(rb_big2dbl(x) / dy);
+            v = rb_big_divide(x, y, '/');
+            return rb_dbl2big(RFLOAT_VALUE(v));
 	}
     }
     else {
@@ -6037,7 +6093,7 @@ rb_big_div(VALUE x, VALUE y)
 VALUE
 rb_big_idiv(VALUE x, VALUE y)
 {
-    return rb_big_divide(x, y, rb_intern("div"));
+    return rb_big_divide(x, y, idDiv);
 }
 
 VALUE
@@ -6081,7 +6137,7 @@ rb_big_divmod(VALUE x, VALUE y)
 	y = rb_int2big(FIX2LONG(y));
     }
     else if (!RB_BIGNUM_TYPE_P(y)) {
-	return rb_num_coerce_bin(x, y, rb_intern("divmod"));
+        return rb_num_coerce_bin(x, y, idDivmod);
     }
     bigdivmod(x, y, &div, &mod);
 
@@ -6098,10 +6154,11 @@ big_shift(VALUE x, long n)
     return x;
 }
 
-static VALUE
+enum {DBL_BIGDIG = ((DBL_MANT_DIG + BITSPERDIG) / BITSPERDIG)};
+
+static double
 big_fdiv(VALUE x, VALUE y, long ey)
 {
-#define DBL_BIGDIG ((DBL_MANT_DIG + BITSPERDIG) / BITSPERDIG)
     VALUE z;
     long l, ex;
 
@@ -6109,6 +6166,8 @@ big_fdiv(VALUE x, VALUE y, long ey)
     l = BIGNUM_LEN(x);
     ex = l * BITSPERDIG - nlz(BDIGITS(x)[l-1]);
     ex -= 2 * DBL_BIGDIG * BITSPERDIG;
+    if (ex > BITSPERDIG) ex -= BITSPERDIG;
+    else if (ex > 0) ex = 0;
     if (ex) x = big_shift(x, ex);
 
     bigdivrem(x, y, &z, 0);
@@ -6116,14 +6175,14 @@ big_fdiv(VALUE x, VALUE y, long ey)
 #if SIZEOF_LONG > SIZEOF_INT
     {
 	/* Visual C++ can't be here */
-	if (l > INT_MAX) return DBL2NUM(INFINITY);
-	if (l < INT_MIN) return DBL2NUM(0.0);
+	if (l > INT_MAX) return HUGE_VAL;
+	if (l < INT_MIN) return 0.0;
     }
 #endif
-    return DBL2NUM(ldexp(big2dbl(z), (int)l));
+    return ldexp(big2dbl(z), (int)l);
 }
 
-static VALUE
+static double
 big_fdiv_int(VALUE x, VALUE y)
 {
     long l, ey;
@@ -6135,7 +6194,7 @@ big_fdiv_int(VALUE x, VALUE y)
     return big_fdiv(x, y, ey);
 }
 
-static VALUE
+static double
 big_fdiv_float(VALUE x, VALUE y)
 {
     int i;
@@ -6143,10 +6202,11 @@ big_fdiv_float(VALUE x, VALUE y)
     return big_fdiv(x, y, i - DBL_MANT_DIG);
 }
 
-VALUE
-rb_big_fdiv(VALUE x, VALUE y)
+double
+rb_big_fdiv_double(VALUE x, VALUE y)
 {
     double dx, dy;
+    VALUE v;
 
     dx = big2dbl(x);
     if (FIXNUM_P(y)) {
@@ -6155,21 +6215,26 @@ rb_big_fdiv(VALUE x, VALUE y)
 	    return big_fdiv_int(x, rb_int2big(FIX2LONG(y)));
     }
     else if (RB_BIGNUM_TYPE_P(y)) {
-	dy = rb_big2dbl(y);
-	if (isinf(dx) || isinf(dy))
-	    return big_fdiv_int(x, y);
+	return big_fdiv_int(x, y);
     }
     else if (RB_FLOAT_TYPE_P(y)) {
 	dy = RFLOAT_VALUE(y);
 	if (isnan(dy))
-	    return y;
+	    return dy;
 	if (isinf(dx))
 	    return big_fdiv_float(x, y);
     }
     else {
-	return rb_num_coerce_bin(x, y, rb_intern("fdiv"));
+        return NUM2DBL(rb_num_coerce_bin(x, y, idFdiv));
     }
-    return DBL2NUM(dx / dy);
+    v = rb_flo_div_flo(DBL2NUM(dx), DBL2NUM(dy));
+    return NUM2DBL(v);
+}
+
+VALUE
+rb_big_fdiv(VALUE x, VALUE y)
+{
+    return DBL2NUM(rb_big_fdiv_double(x, y));
 }
 
 VALUE
@@ -6180,10 +6245,12 @@ rb_big_pow(VALUE x, VALUE y)
 
   again:
     if (y == INT2FIX(0)) return INT2FIX(1);
+    if (y == INT2FIX(1)) return x;
     if (RB_FLOAT_TYPE_P(y)) {
 	d = RFLOAT_VALUE(y);
-	if ((BIGNUM_NEGATIVE_P(x) && !BIGZEROP(x)) && d != round(d))
-	    return rb_funcall(rb_complex_raw1(x), rb_intern("**"), 1, y);
+	if ((BIGNUM_NEGATIVE_P(x) && !BIGZEROP(x))) {
+            return rb_dbl_complex_new_polar_pi(pow(-rb_big2dbl(x), d), d);
+	}
     }
     else if (RB_BIGNUM_TYPE_P(y)) {
 	y = bignorm(y);
@@ -6195,8 +6262,13 @@ rb_big_pow(VALUE x, VALUE y)
     else if (FIXNUM_P(y)) {
 	yy = FIX2LONG(y);
 
-	if (yy < 0)
-	    return rb_funcall(rb_rational_raw1(x), rb_intern("**"), 1, y);
+        if (yy < 0) {
+            x = rb_big_pow(x, LONG2NUM(-yy));
+            if (RB_INTEGER_TYPE_P(x))
+                return rb_rational_raw(INT2FIX(1), x);
+            else
+                return DBL2NUM(1.0 / NUM2DBL(x));
+        }
 	else {
 	    VALUE z = 0;
 	    SIGNED_VALUE mask;
@@ -6221,7 +6293,7 @@ rb_big_pow(VALUE x, VALUE y)
 	}
     }
     else {
-	return rb_num_coerce_bin(x, y, rb_intern("**"));
+	return rb_num_coerce_bin(x, y, idPow);
     }
     return DBL2NUM(pow(rb_big2dbl(x), d));
 }
@@ -6293,7 +6365,7 @@ rb_big_and(VALUE x, VALUE y)
     BDIGIT tmph;
     long tmpn;
 
-    if (!FIXNUM_P(y) && !RB_BIGNUM_TYPE_P(y)) {
+    if (!RB_INTEGER_TYPE_P(y)) {
 	return rb_num_coerce_bit(x, y, '&');
     }
 
@@ -6412,7 +6484,7 @@ rb_big_or(VALUE x, VALUE y)
     BDIGIT tmph;
     long tmpn;
 
-    if (!FIXNUM_P(y) && !RB_BIGNUM_TYPE_P(y)) {
+    if (!RB_INTEGER_TYPE_P(y)) {
 	return rb_num_coerce_bit(x, y, '|');
     }
 
@@ -6506,7 +6578,7 @@ rb_big_xor(VALUE x, VALUE y)
     BDIGIT tmph;
     long tmpn;
 
-    if (!FIXNUM_P(y) && !RB_BIGNUM_TYPE_P(y)) {
+    if (!RB_INTEGER_TYPE_P(y)) {
 	return rb_num_coerce_bit(x, y, '^');
     }
 
@@ -6616,7 +6688,6 @@ rb_big_aref(VALUE x, VALUE y)
 	    return INT2FIX(0);
 	bigtrunc(y);
 	if (BIGSIZE(y) > sizeof(size_t)) {
-	  out_of_range:
 	    return BIGNUM_SIGN(x) ? INT2FIX(0) : INT2FIX(1);
 	}
 #if SIZEOF_SIZE_T <= SIZEOF_LONG
@@ -6634,7 +6705,8 @@ rb_big_aref(VALUE x, VALUE y)
     s2 = shift%BITSPERDIG;
     bit = (BDIGIT)1 << s2;
 
-    if (s1 >= BIGNUM_LEN(x)) goto out_of_range;
+    if (s1 >= BIGNUM_LEN(x))
+        return BIGNUM_SIGN(x) ? INT2FIX(0) : INT2FIX(1);
 
     xds = BDIGITS(x);
     if (BIGNUM_POSITIVE_P(x))
@@ -6653,7 +6725,7 @@ rb_big_hash(VALUE x)
     st_index_t hash;
 
     hash = rb_memhash(BDIGITS(x), sizeof(BDIGIT)*BIGNUM_LEN(x)) ^ BIGNUM_SIGN(x);
-    return INT2FIX(hash);
+    return ST2FIX(hash);
 }
 
 /*
@@ -6673,7 +6745,7 @@ rb_big_hash(VALUE x)
 static VALUE
 rb_int_coerce(VALUE x, VALUE y)
 {
-    if (FIXNUM_P(y) || RB_BIGNUM_TYPE_P(y)) {
+    if (RB_INTEGER_TYPE_P(y)) {
         return rb_assoc_new(y, x);
     }
     else {
@@ -6693,6 +6765,12 @@ rb_big_abs(VALUE x)
     return x;
 }
 
+int
+rb_big_sign(VALUE x)
+{
+    return BIGNUM_SIGN(x);
+}
+
 size_t
 rb_big_size(VALUE big)
 {
@@ -6764,6 +6842,317 @@ rb_big_even_p(VALUE num)
     return Qtrue;
 }
 
+unsigned long rb_ulong_isqrt(unsigned long);
+#if SIZEOF_BDIGIT*2 > SIZEOF_LONG
+BDIGIT rb_bdigit_dbl_isqrt(BDIGIT_DBL);
+# ifdef ULL_TO_DOUBLE
+#   define BDIGIT_DBL_TO_DOUBLE(n) ULL_TO_DOUBLE(n)
+# endif
+#else
+# define rb_bdigit_dbl_isqrt(x) (BDIGIT)rb_ulong_isqrt(x)
+#endif
+#ifndef BDIGIT_DBL_TO_DOUBLE
+# define BDIGIT_DBL_TO_DOUBLE(n) (double)(n)
+#endif
+
+static BDIGIT *
+estimate_initial_sqrt(VALUE *xp, const size_t xn, const BDIGIT *nds, size_t len)
+{
+    enum {dbl_per_bdig = roomof(DBL_MANT_DIG,BITSPERDIG)};
+    const int zbits = nlz(nds[len-1]);
+    VALUE x = *xp = bignew_1(0, xn, 1); /* division may release the GVL */
+    BDIGIT *xds = BDIGITS(x);
+    BDIGIT_DBL d = bary2bdigitdbl(nds+len-dbl_per_bdig, dbl_per_bdig);
+    BDIGIT lowbits = 1;
+    int rshift = (int)((BITSPERDIG*2-zbits+(len&BITSPERDIG&1) - DBL_MANT_DIG + 1) & ~1);
+    double f;
+
+    if (rshift > 0) {
+	lowbits = (BDIGIT)d & ~(~(BDIGIT)1U << rshift);
+	d >>= rshift;
+    }
+    else if (rshift < 0) {
+	d <<= -rshift;
+	d |= nds[len-dbl_per_bdig-1] >> (BITSPERDIG+rshift);
+    }
+    f = sqrt(BDIGIT_DBL_TO_DOUBLE(d));
+    d = (BDIGIT_DBL)ceil(f);
+    if (BDIGIT_DBL_TO_DOUBLE(d) == f) {
+	if (lowbits || (lowbits = !bary_zero_p(nds, len-dbl_per_bdig)))
+	    ++d;
+    }
+    else {
+	lowbits = 1;
+    }
+    rshift /= 2;
+    rshift += (2-(len&1))*BITSPERDIG/2;
+    if (rshift >= 0) {
+        if (nlz((BDIGIT)d) + rshift >= BITSPERDIG) {
+            /* (d << rshift) does cause overflow.
+             * example: Integer.sqrt(0xffff_ffff_ffff_ffff ** 2)
+             */
+            d = ~(BDIGIT_DBL)0;
+        }
+        else {
+            d <<= rshift;
+        }
+    }
+    BDIGITS_ZERO(xds, xn-2);
+    bdigitdbl2bary(&xds[xn-2], 2, d);
+
+    if (!lowbits) return NULL; /* special case, exact result */
+    return xds;
+}
+
+VALUE
+rb_big_isqrt(VALUE n)
+{
+    BDIGIT *nds = BDIGITS(n);
+    size_t len = BIGNUM_LEN(n);
+    size_t xn = (len+1) / 2;
+    VALUE x;
+    BDIGIT *xds;
+
+    if (len <= 2) {
+	BDIGIT sq = rb_bdigit_dbl_isqrt(bary2bdigitdbl(nds, len));
+#if SIZEOF_BDIGIT > SIZEOF_LONG
+	return ULL2NUM(sq);
+#else
+	return ULONG2NUM(sq);
+#endif
+    }
+    else if ((xds = estimate_initial_sqrt(&x, xn, nds, len)) != 0) {
+	size_t tn = xn + BIGDIVREM_EXTRA_WORDS;
+	VALUE t = bignew_1(0, tn, 1);
+	BDIGIT *tds = BDIGITS(t);
+	tn = BIGNUM_LEN(t);
+
+	/* t = n/x */
+	while (bary_divmod_branch(tds, tn, NULL, 0, nds, len, xds, xn),
+	       bary_cmp(tds, tn, xds, xn) < 0) {
+	    int carry;
+	    BARY_TRUNC(tds, tn);
+	    /* x = (x+t)/2 */
+	    carry = bary_add(xds, xn, xds, xn, tds, tn);
+	    bary_small_rshift(xds, xds, xn, 1, carry);
+	    tn = BIGNUM_LEN(t);
+	}
+	rb_big_realloc(t, 0);
+	rb_gc_force_recycle(t);
+    }
+    RBASIC_SET_CLASS_RAW(x, rb_cInteger);
+    return x;
+}
+
+#ifdef USE_GMP
+static void
+bary_powm_gmp(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn, const BDIGIT *mds, size_t mn)
+{
+    mpz_t z, x, y, m;
+    size_t count;
+    mpz_init(x);
+    mpz_init(y);
+    mpz_init(m);
+    mpz_init(z);
+    bdigits_to_mpz(x, xds, xn);
+    bdigits_to_mpz(y, yds, yn);
+    bdigits_to_mpz(m, mds, mn);
+    mpz_powm(z, x, y, m);
+    bdigits_from_mpz(z, zds, &count);
+    BDIGITS_ZERO(zds+count, zn-count);
+    mpz_clear(x);
+    mpz_clear(y);
+    mpz_clear(m);
+    mpz_clear(z);
+}
+#endif
+
+static VALUE
+int_pow_tmp3(VALUE x, VALUE y, VALUE m, int nega_flg)
+{
+#ifdef USE_GMP
+    VALUE z;
+    size_t xn, yn, mn, zn;
+
+    if (FIXNUM_P(x)) {
+       x = rb_int2big(FIX2LONG(x));
+    }
+    if (FIXNUM_P(y)) {
+       y = rb_int2big(FIX2LONG(y));
+    }
+    assert(RB_BIGNUM_TYPE_P(m));
+    xn = BIGNUM_LEN(x);
+    yn = BIGNUM_LEN(y);
+    mn = BIGNUM_LEN(m);
+    zn = mn;
+    z = bignew(zn, 1);
+    bary_powm_gmp(BDIGITS(z), zn, BDIGITS(x), xn, BDIGITS(y), yn, BDIGITS(m), mn);
+    if (nega_flg & BIGNUM_POSITIVE_P(z)) {
+        z = rb_big_minus(z, m);
+    }
+    RB_GC_GUARD(x);
+    RB_GC_GUARD(y);
+    RB_GC_GUARD(m);
+    return rb_big_norm(z);
+#else
+    VALUE tmp = LONG2FIX(1L);
+    long yy;
+
+    for (/*NOP*/; ! FIXNUM_P(y); y = rb_big_rshift(y, LONG2FIX(1L))) {
+        if (RTEST(rb_int_odd_p(y))) {
+            tmp = rb_int_mul(tmp, x);
+            tmp = rb_int_modulo(tmp, m);
+        }
+        x = rb_int_mul(x, x);
+        x = rb_int_modulo(x, m);
+    }
+    for (yy = FIX2LONG(y); yy; yy >>= 1L) {
+        if (yy & 1L) {
+            tmp = rb_int_mul(tmp, x);
+            tmp = rb_int_modulo(tmp, m);
+        }
+        x = rb_int_mul(x, x);
+        x = rb_int_modulo(x, m);
+    }
+
+    if (nega_flg && rb_int_positive_p(tmp)) {
+        tmp = rb_int_minus(tmp, m);
+    }
+    return tmp;
+#endif
+}
+
+/*
+ * Integer#pow
+ */
+
+static VALUE
+int_pow_tmp1(VALUE x, VALUE y, long mm, int nega_flg)
+{
+    long xx = FIX2LONG(x);
+    long tmp = 1L;
+    long yy;
+
+    for (/*NOP*/; ! FIXNUM_P(y); y = rb_big_rshift(y, LONG2FIX(1L))) {
+        if (RTEST(rb_int_odd_p(y))) {
+            tmp = (tmp * xx) % mm;
+        }
+        xx = (xx * xx) % mm;
+    }
+    for (yy = FIX2LONG(y); yy; yy >>= 1L) {
+        if (yy & 1L) {
+            tmp = (tmp * xx) % mm;
+        }
+        xx = (xx * xx) % mm;
+    }
+
+    if (nega_flg && tmp) {
+        tmp -= mm;
+    }
+    return LONG2FIX(tmp);
+}
+
+static VALUE
+int_pow_tmp2(VALUE x, VALUE y, long mm, int nega_flg)
+{
+    long tmp = 1L;
+    long yy;
+#ifdef DLONG
+    const DLONG m = mm;
+    long tmp2 = tmp;
+    long xx = FIX2LONG(x);
+# define MUL_MODULO(a, b, c) (long)(((DLONG)(a) * (DLONG)(b)) % (c))
+#else
+    const VALUE m = LONG2FIX(mm);
+    VALUE tmp2 = LONG2FIX(tmp);
+    VALUE xx = x;
+# define MUL_MODULO(a, b, c) rb_int_modulo(rb_fix_mul_fix((a), (b)), (c))
+#endif
+
+    for (/*NOP*/; ! FIXNUM_P(y); y = rb_big_rshift(y, LONG2FIX(1L))) {
+        if (RTEST(rb_int_odd_p(y))) {
+            tmp2 = MUL_MODULO(tmp2, xx, m);
+        }
+        xx = MUL_MODULO(xx, xx, m);
+    }
+    for (yy = FIX2LONG(y); yy; yy >>= 1L) {
+        if (yy & 1L) {
+            tmp2 = MUL_MODULO(tmp2, xx, m);
+        }
+        xx = MUL_MODULO(xx, xx, m);
+    }
+
+#ifdef DLONG
+    tmp = tmp2;
+#else
+    tmp = FIX2LONG(tmp2);
+#endif
+    if (nega_flg && tmp) {
+        tmp -= mm;
+    }
+    return LONG2FIX(tmp);
+}
+
+/*
+ * Document-method: Integer#pow
+ * call-seq:
+ *    integer.pow(numeric)           ->  numeric
+ *    integer.pow(integer, integer)  ->  integer
+ *
+ * Returns (modular) exponentiation as:
+ *
+ *   a.pow(b)     #=> same as a**b
+ *   a.pow(b, m)  #=> same as (a**b) % m, but avoids huge temporary values
+ */
+VALUE
+rb_int_powm(int const argc, VALUE * const argv, VALUE const num)
+{
+    rb_check_arity(argc, 1, 2);
+
+    if (argc == 1) {
+        return rb_int_pow(num, argv[0]);
+    }
+    else {
+        VALUE const a = num;
+        VALUE const b = argv[0];
+        VALUE m = argv[1];
+        int nega_flg = 0;
+        if ( ! RB_INTEGER_TYPE_P(b)) {
+            rb_raise(rb_eTypeError, "Integer#pow() 2nd argument not allowed unless a 1st argument is integer");
+        }
+        if (rb_int_negative_p(b)) {
+            rb_raise(rb_eRangeError, "Integer#pow() 1st argument cannot be negative when 2nd argument specified");
+        }
+        if (!RB_INTEGER_TYPE_P(m)) {
+            rb_raise(rb_eTypeError, "Integer#pow() 2nd argument not allowed unless all arguments are integers");
+        }
+
+        if (rb_int_negative_p(m)) {
+            m = rb_int_uminus(m);
+            nega_flg = 1;
+        }
+
+        if (FIXNUM_P(m)) {
+            long const half_val = (long)HALF_LONG_MSB;
+            long const mm = FIX2LONG(m);
+            if (!mm) rb_num_zerodiv();
+            if (mm == 1) return INT2FIX(0);
+            if (mm <= half_val) {
+                return int_pow_tmp1(rb_int_modulo(a, m), b, mm, nega_flg);
+            }
+            else {
+                return int_pow_tmp2(rb_int_modulo(a, m), b, mm, nega_flg);
+            }
+        }
+        else {
+            if (rb_bigzero_p(m)) rb_num_zerodiv();
+	    if (bignorm(m) == INT2FIX(1)) return INT2FIX(0);
+            return int_pow_tmp3(rb_int_modulo(a, m), b, m, nega_flg);
+        }
+    }
+    UNREACHABLE_RETURN(Qnil);
+}
+
 /*
  *  Bignum objects hold integers outside the range of
  *  Fixnum. Bignum objects are created
@@ -6785,10 +7174,9 @@ rb_big_even_p(VALUE num)
 void
 Init_Bignum(void)
 {
-#ifndef RUBY_INTEGER_UNIFICATION
-    rb_cBignum = rb_cInteger;
-#endif
+    /* An obsolete class, use Integer */
     rb_define_const(rb_cObject, "Bignum", rb_cInteger);
+    rb_deprecate_constant(rb_cObject, "Bignum");
 
     rb_define_method(rb_cInteger, "coerce", rb_int_coerce, 1);
 
diff --git a/bin/bundle b/bin/bundle
new file mode 100755
index 0000000000..1a0b06b005
--- /dev/null
+++ b/bin/bundle
@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'bundler' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0.a"
+
+str = ARGV.first
+if str
+  str = str.b[/\A_(.*)_\z/, 1]
+  if str and Gem::Version.correct?(str)
+    version = str
+    ARGV.shift
+  end
+end
+
+if Gem.respond_to?(:activate_bin_path)
+load Gem.activate_bin_path('bundler', 'bundle', version)
+else
+gem "bundler", version
+load Gem.bin_path("bundler", "bundle", version)
+end
diff --git a/bin/bundler b/bin/bundler
new file mode 100755
index 0000000000..e15eb39ed7
--- /dev/null
+++ b/bin/bundler
@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'bundler' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0.a"
+
+str = ARGV.first
+if str
+  str = str.b[/\A_(.*)_\z/, 1]
+  if str and Gem::Version.correct?(str)
+    version = str
+    ARGV.shift
+  end
+end
+
+if Gem.respond_to?(:activate_bin_path)
+load Gem.activate_bin_path('bundler', 'bundler', version)
+else
+gem "bundler", version
+load Gem.bin_path("bundler", "bundler", version)
+end
diff --git a/bin/erb b/bin/erb
index 6a88c3b26a..89d74fc525 100755
--- a/bin/erb
+++ b/bin/erb
@@ -1,171 +1,27 @@
 #!/usr/bin/env ruby
-# Tiny eRuby --- ERB2
-# Copyright (c) 1999-2000,2002 Masatoshi SEKI
-# You can redistribute it and/or modify it under the same terms as Ruby.
-
-require 'erb'
-
-class ERB
-  module Main
-    def ARGV.switch
-      return nil if self.empty?
-      arg = self.shift
-      return nil if arg == '--'
-      case arg
-      when /\A-(.)(.*)/
-        if $1 == '-'
-          arg, @maybe_arg = arg.split(/=/, 2)
-          return arg
-        end
-        raise 'unknown switch "-"' if $2[0] == ?- and $1 != 'T'
-        if $2.size > 0
-          self.unshift "-#{$2}"
-          @maybe_arg = $2
-        else
-          @maybe_arg = nil
-        end
-        "-#{$1}"
-      when /\A(\w+)=/
-        arg
-      else
-        self.unshift arg
-        nil
-      end
-    end
-
-    def ARGV.req_arg
-      (@maybe_arg || self.shift || raise('missing argument')).tap {
-        @maybe_arg = nil
-      }
-    end
-
-    def trim_mode_opt(trim_mode, disable_percent)
-      return trim_mode if disable_percent
-      case trim_mode
-      when 0
-        return '%'
-      when 1
-        return '%>'
-      when 2
-        return '%<>'
-      when '-'
-        return '%-'
-      end
-    end
-    module_function :trim_mode_opt
-
-    def run(factory=ERB)
-      trim_mode = 0
-      disable_percent = false
-      variables = {}
-      begin
-        while switch = ARGV.switch
-          case switch
-          when '-x'                        # ruby source
-            output = true
-          when '-n'                        # line number
-            number = true
-          when '-v'                        # verbose
-            $VERBOSE = true
-          when '--version'                 # version
-            STDERR.puts factory.version
-            exit
-          when '-d', '--debug'             # debug
-            $DEBUG = true
-          when '-r'                        # require
-            require ARGV.req_arg
-          when '-S'                        # security level
-            arg = ARGV.req_arg
-            raise "invalid safe_level #{arg.dump}" unless arg =~ /\A[0-1]\z/
-            safe_level = arg.to_i
-          when '-T'                        # trim mode
-            arg = ARGV.req_arg
-            if arg == '-'
-              trim_mode = arg
-              next
-            end
-            raise "invalid trim mode #{arg.dump}" unless arg =~ /\A[0-2]\z/
-            trim_mode = arg.to_i
-          when '-E', '--encoding'
-            arg = ARGV.req_arg
-            set_encoding(*arg.split(/:/, 2))
-          when '-U'
-            set_encoding(Encoding::UTF_8, Encoding::UTF_8)
-          when '-P'
-            disable_percent = true
-          when '--help'
-            raise "print this help"
-          when /\A-/
-            raise "unknown switch #{switch.dump}"
-          else
-            var, val = *switch.split('=', 2)
-            (variables ||= {})[var] = val
-          end
-        end
-      rescue                               # usage
-        STDERR.puts $!.to_s
-        STDERR.puts File.basename($0) +
-          " [switches] [var=value...] [inputfile]"
-        STDERR.puts <<EOU
-  -x               print ruby script
-  -n               print ruby script with line number
-  -v               enable verbose mode
-  -d               set $DEBUG to true
-  -r library       load a library
-  -S safe_level    set $SAFE (0..1)
-  -E ex[:in]       set default external/internal encodings
-  -U               set default encoding to UTF-8.
-  -T trim_mode     specify trim_mode (0..2, -)
-  -P               ignore lines which start with "%"
-  var=value        set variable
-EOU
-        exit 1
-      end
-
-      $<.set_encoding(Encoding::ASCII_8BIT, nil)
-      src = $<.read
-      filename = $FILENAME
-      exit 2 unless src
-      trim = trim_mode_opt(trim_mode, disable_percent)
-      erb = factory.new(src.untaint, safe_level, trim)
-      erb.filename = filename
-      if output
-        if number
-          erb.src.each_line.with_index do |line, l|
-            puts "%3d %s"%[l+1, line]
-          end
-        else
-          puts erb.src
-        end
-      else
-        bind = TOPLEVEL_BINDING.taint
-        if variables
-          enc = erb.encoding
-          for var, val in variables do
-            val = val.encode(enc) if val
-            bind.local_variable_set(var, val)
-          end
-        end
-        erb.run(bind)
-      end
-    end
-    module_function :run
-
-    def set_encoding(extern, intern = nil)
-      verbose, $VERBOSE = $VERBOSE, nil
-      Encoding.default_external = extern unless extern.nil? || extern == ""
-      Encoding.default_internal = intern unless intern.nil? || intern == ""
-      [$stdin, $stdout, $stderr].each do |io|
-        io.set_encoding(extern, intern)
-      end
-    ensure
-      $VERBOSE = verbose
-    end
-    module_function :set_encoding
-    class << self; private :set_encoding; end
+#
+# This file was generated by RubyGems.
+#
+# The application 'erb' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0.a"
+
+str = ARGV.first
+if str
+  str = str.b[/\A_(.*)_\z/, 1]
+  if str and Gem::Version.correct?(str)
+    version = str
+    ARGV.shift
   end
 end
 
-if __FILE__ == $0
-  ERB::Main.run
+if Gem.respond_to?(:activate_bin_path)
+load Gem.activate_bin_path('erb', 'erb', version)
+else
+gem "erb", version
+load Gem.bin_path("erb", "erb", version)
 end
diff --git a/bin/irb b/bin/irb
index c64ee85fbd..ae6d358c9d 100755
--- a/bin/irb
+++ b/bin/irb
@@ -1,11 +1,27 @@
 #!/usr/bin/env ruby
 #
-#   irb.rb - interactive ruby
-#   	$Release Version: 0.9.6 $
-#   	$Revision$
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+# This file was generated by RubyGems.
 #
+# The application 'irb' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0.a"
 
-require "irb"
+str = ARGV.first
+if str
+  str = str.b[/\A_(.*)_\z/, 1]
+  if str and Gem::Version.correct?(str)
+    version = str
+    ARGV.shift
+  end
+end
 
-IRB.start(__FILE__)
+if Gem.respond_to?(:activate_bin_path)
+load Gem.activate_bin_path('irb', 'irb', version)
+else
+gem "irb", version
+load Gem.bin_path("irb", "irb", version)
+end
diff --git a/bin/racc b/bin/racc
new file mode 100755
index 0000000000..3ddac532b4
--- /dev/null
+++ b/bin/racc
@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'racc' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0.a"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/ and Gem::Version.correct?($1) then
+    version = $1
+    ARGV.shift
+  end
+end
+
+if Gem.respond_to?(:activate_bin_path)
+load Gem.activate_bin_path('racc', 'racc', version)
+else
+gem "racc", version
+load Gem.bin_path("racc", "racc", version)
+end
diff --git a/bin/rdoc b/bin/rdoc
index aaa23292df..8fa948cddb 100755
--- a/bin/rdoc
+++ b/bin/rdoc
@@ -1,44 +1,27 @@
 #!/usr/bin/env ruby
 #
-#  RDoc: Documentation tool for source code
-#        (see lib/rdoc/rdoc.rb for more information)
+# This file was generated by RubyGems.
+#
+# The application 'rdoc' is installed as part of a gem, and
+# this file is here to facilitate running it.
 #
-#  Copyright (c) 2003 Dave Thomas
-#  Released under the same terms as Ruby
 
-begin
-  gem 'rdoc'
-rescue NameError => e # --disable-gems
-  raise unless e.name == :gem
-rescue Gem::LoadError
-end
+require 'rubygems'
 
-require 'rdoc/rdoc'
+version = ">= 0.a"
 
-begin
-  r = RDoc::RDoc.new
-  r.document ARGV
-rescue Errno::ENOSPC
-  $stderr.puts 'Ran out of space creating documentation'
-  $stderr.puts
-  $stderr.puts 'Please free up some space and try again'
-rescue SystemExit
-  raise
-rescue Exception => e
-  if $DEBUG_RDOC then
-    $stderr.puts e.message
-    $stderr.puts "#{e.backtrace.join "\n\t"}"
-    $stderr.puts
-  elsif Interrupt === e then
-    $stderr.puts
-    $stderr.puts 'Interrupted'
-  else
-    $stderr.puts "uh-oh! RDoc had a problem:"
-    $stderr.puts e.message
-    $stderr.puts
-    $stderr.puts "run with --debug for full backtrace"
+str = ARGV.first
+if str
+  str = str.b[/\A_(.*)_\z/, 1]
+  if str and Gem::Version.correct?(str)
+    version = str
+    ARGV.shift
   end
-
-  exit 1
 end
 
+if Gem.respond_to?(:activate_bin_path)
+load Gem.activate_bin_path('rdoc', 'rdoc', version)
+else
+gem "rdoc", version
+load Gem.bin_path("rdoc", "rdoc", version)
+end
diff --git a/bin/ri b/bin/ri
index 7fbed0c099..0cc2f73bb6 100755
--- a/bin/ri
+++ b/bin/ri
@@ -1,12 +1,27 @@
 #!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'rdoc' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
 
-begin
-  gem 'rdoc'
-rescue NameError => e # --disable-gems
-  raise unless e.name == :gem
-rescue Gem::LoadError
-end
+require 'rubygems'
+
+version = ">= 0.a"
 
-require 'rdoc/ri/driver'
+str = ARGV.first
+if str
+  str = str.b[/\A_(.*)_\z/, 1]
+  if str and Gem::Version.correct?(str)
+    version = str
+    ARGV.shift
+  end
+end
 
-RDoc::RI::Driver.run ARGV
+if Gem.respond_to?(:activate_bin_path)
+load Gem.activate_bin_path('rdoc', 'ri', version)
+else
+gem "rdoc", version
+load Gem.bin_path("rdoc", "ri", version)
+end
diff --git a/bootstraptest/pending.rb b/bootstraptest/pending.rb
index 744c0adac1..2c4b85a419 100644
--- a/bootstraptest/pending.rb
+++ b/bootstraptest/pending.rb
@@ -1,19 +1,3 @@
-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{
@@ -31,9 +15,7 @@ assert_equal 'ok', %q{
   end
 }
 
-assert_normal_exit %q{
-  r = Range.allocate
-  def r.<=>(o) true end
-  r.instance_eval { initialize r, r }
-  r.inspect
+# This randomly fails on mswin.
+assert_equal %q{[]}, %q{
+  Thread.new{sleep}.backtrace
 }
diff --git a/bootstraptest/runner.rb b/bootstraptest/runner.rb
index 5eb468a338..2cd91ffd07 100755
--- a/bootstraptest/runner.rb
+++ b/bootstraptest/runner.rb
@@ -1,4 +1,4 @@
-"exec" "${RUBY-ruby}" "-x" "$0" "$@" || true # -*- mode: ruby; coding: utf-8 -*-
+"exec" "${RUBY-ruby}" "-x" "$0" "$@" || true # -*- Ruby -*-
 #!./ruby
 # $Id$
 
@@ -6,6 +6,7 @@
 # Never use optparse in this file.
 # Never use test/unit in this file.
 # Never use Ruby extensions in this file.
+# Maintain Ruby 1.8 compatibility for now
 
 begin
   require 'fileutils'
@@ -60,6 +61,7 @@ end
 def main
   @ruby = File.expand_path('miniruby')
   @verbose = false
+  $VERBOSE = false
   $stress = false
   @color = nil
   @tty = nil
@@ -138,7 +140,7 @@ End
     # dircolors-like style
     colors = (colors = ENV['TEST_COLORS']) ? Hash[colors.scan(/(\w+)=([^:\n]*)/)] : {}
     begin
-      File.read(File.join(__dir__, "../test/colors")).scan(/(\w+)=([^:\n]*)/) do |n, c|
+      File.read(File.join(__dir__, "../tool/colors")).scan(/(\w+)=([^:\n]*)/) do |n, c|
         colors[n] ||= c
       end
     rescue
@@ -169,8 +171,8 @@ End
 end
 
 def erase(e = true)
-  if e and @columns > 0 and !@verbose
-    "\r#{" "*@columns}\r"
+  if e and @columns > 0 and @tty and !@verbose
+    "\e[1K\r"
   else
     ""
   end
@@ -206,6 +208,9 @@ def exec_test(pathes)
     $stderr.puts unless @quiet and @tty and @error == error
   end
   $stderr.print(erase) if @quiet
+  @errbuf.each do |msg|
+    $stderr.puts msg
+  end
   if @error == 0
     if @count == 0
       $stderr.puts "No tests, no problem"
@@ -214,9 +219,6 @@ def exec_test(pathes)
     end
     exit true
   else
-    @errbuf.each do |msg|
-      $stderr.puts msg
-    end
     $stderr.puts "#{@failed}FAIL#{@reset} #{@error}/#{@count} tests failed"
     exit false
   end
@@ -242,7 +244,7 @@ def show_progress(message = '')
   else
     $stderr.print "#{@failed}F"
     $stderr.printf(" %.3f", t) if @verbose
-    $stderr.print "#{@reset}"
+    $stderr.print @reset
     $stderr.puts if @verbose
     error faildesc, message
     unless errout.empty?
@@ -253,30 +255,41 @@ def show_progress(message = '')
     end
   end
 rescue Interrupt
-  raise Interrupt
+  $stderr.puts "\##{@count} #{@location}"
+  raise
 rescue Exception => err
   $stderr.print 'E'
   $stderr.puts if @verbose
   error err.message, message
+ensure
+  begin
+    check_coredump
+  rescue CoreDumpError => err
+    $stderr.print 'E'
+    $stderr.puts if @verbose
+    error err.message, message
+  end
 end
 
-# NativeClient is special.  The binary is cross-compiled.  But runs on the build environment.
-# So RUBY_PLATFORM in this process is not useful to detect it.
-def nacl?
-  @ruby and File.basename(@ruby.split(/\s/).first)['sel_ldr']
+def show_limit(testsrc, opt = '', **argh)
+  result = get_result_string(testsrc, opt, **argh)
+  if @tty and @verbose
+    $stderr.puts ".{#@reset}\n#{erase}#{result}"
+  else
+    @errbuf.push result
+  end
 end
 
-def assert_check(testsrc, message = '', opt = '')
+def assert_check(testsrc, message = '', opt = '', **argh)
   show_progress(message) {
-    result = get_result_string(testsrc, opt)
-    check_coredump
+    result = get_result_string(testsrc, opt, **argh)
     yield(result)
   }
 end
 
-def assert_equal(expected, testsrc, message = '')
+def assert_equal(expected, testsrc, message = '', opt = '', **argh)
   newtest
-  assert_check(testsrc, message) {|result|
+  assert_check(testsrc, message, opt, **argh) {|result|
     if expected == result
       nil
     else
@@ -317,13 +330,10 @@ def assert_valid_syntax(testsrc, message = '')
   }
 end
 
-def assert_normal_exit(testsrc, *rest)
+def assert_normal_exit(testsrc, *rest, timeout: nil, **opt)
   newtest
-  opt = {}
-  opt = rest.pop if Hash === rest.last
   message, ignore_signals = rest
   message ||= ''
-  timeout = opt[:timeout]
   show_progress(message) {
     faildesc = nil
     filename = make_srcfile(testsrc)
@@ -347,7 +357,7 @@ def assert_normal_exit(testsrc, *rest)
       $stderr.reopen(old_stderr)
       old_stderr.close
     end
-    if status&.signaled?
+    if status && status.signaled?
       signo = status.termsig
       signame = Signal.list.invert[signo]
       unless ignore_signals and ignore_signals.include?(signame)
@@ -373,6 +383,9 @@ def assert_normal_exit(testsrc, *rest)
 end
 
 def assert_finish(timeout_seconds, testsrc, message = '')
+  if defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled? # for --jit-wait
+    timeout_seconds *= 3
+  end
   newtest
   show_progress(message) {
     faildesc = nil
@@ -381,12 +394,24 @@ def assert_finish(timeout_seconds, testsrc, message = '')
     pid = io.pid
     waited = false
     tlimit = Time.now + timeout_seconds
-    while Time.now < tlimit
+    diff = timeout_seconds
+    while diff > 0
       if Process.waitpid pid, Process::WNOHANG
         waited = true
         break
       end
-      sleep 0.1
+      if io.respond_to?(:read_nonblock)
+        if IO.select([io], nil, nil, diff)
+          begin
+            io.read_nonblock(1024)
+          rescue Errno::EAGAIN, IO::WaitReadable, EOFError
+            break
+          end while true
+        end
+      else
+        sleep 0.1
+      end
+      diff = tlimit - Time.now
     end
     if !waited
       Process.kill(:KILL, pid)
@@ -404,7 +429,7 @@ def flunk(message = '')
 end
 
 def pretty(src, desc, result)
-  src = src.sub(/\A.*\n/, '')
+  src = src.sub(/\A\s*\n/, '')
   (/\n/ =~ src ? "\n#{adjust_indent(src)}" : src) + "  #=> #{desc}"
 end
 
@@ -418,23 +443,23 @@ def untabify(str)
   str.gsub(/^\t+/) {' ' * (8 * $&.size) }
 end
 
-def make_srcfile(src)
+def make_srcfile(src, frozen_string_literal: nil)
   filename = 'bootstraptest.tmp.rb'
   File.open(filename, 'w') {|f|
+    f.puts "#frozen_string_literal:true" if frozen_string_literal
     f.puts "GC.stress = true" if $stress
     f.puts "print(begin; #{src}; end)"
   }
   filename
 end
 
-def get_result_string(src, opt = '')
+def get_result_string(src, opt = '', **argh)
   if @ruby
-    filename = make_srcfile(src)
+    filename = make_srcfile(src, **argh)
     begin
       `#{@ruby} -W0 #{opt} #{filename}`
     ensure
       raise Interrupt if $? and $?.signaled? && $?.termsig == Signal.list["INT"]
-      raise CoreDumpError, "core dumped" if $? and $?.coredump?
     end
   else
     eval(src).to_s
@@ -494,7 +519,21 @@ def in_temporary_working_directory(dir)
 end
 
 def cleanup_coredump
-  FileUtils.rm_f 'core'
+  if File.file?('core')
+    require 'time'
+    Dir.glob('/tmp/bootstraptest-core.*').each do |f|
+      if Time.now - File.mtime(f) > 7 * 24 * 60 * 60 # 7 days
+        warn "Deleting an old core file: #{f}"
+        FileUtils.rm(f)
+      end
+    end
+    core_path = "/tmp/bootstraptest-core.#{Time.now.utc.iso8601}"
+    warn "A core file is found. Saving it at: #{core_path.dump}"
+    FileUtils.mv('core', core_path)
+    cmd = ['gdb', @ruby, '-c', core_path, '-ex', 'bt', '-batch']
+    p cmd # debugging why it's not working
+    system(*cmd)
+  end
   FileUtils.rm_f Dir.glob('core.*')
   FileUtils.rm_f @ruby+'.stackdump' if @ruby
 end
diff --git a/bootstraptest/test_env.rb b/bootstraptest/test_env.rb
new file mode 100644
index 0000000000..7d1b45b75e
--- /dev/null
+++ b/bootstraptest/test_env.rb
@@ -0,0 +1,12 @@
+assert_equal "true", %q{
+  ENV["ENVTEST"] = "\u{e9 3042 d76c}"
+  env = ENV["ENVTEST"]
+  env.valid_encoding?
+}
+
+# different encoding is used for PATH
+assert_equal "true", %q{
+  ENV["PATH"] = "\u{e9 3042 d76c}"
+  env = ENV["PATH"]
+  env.valid_encoding?
+}
diff --git a/bootstraptest/test_eval.rb b/bootstraptest/test_eval.rb
index 8e90ac2728..5d2593c306 100644
--- a/bootstraptest/test_eval.rb
+++ b/bootstraptest/test_eval.rb
@@ -190,7 +190,8 @@ assert_equal %q{[10, main]}, %q{
 }
 
 %w[break next redo].each do |keyword|
-  assert_match %r"Can't escape from eval with #{keyword}\z", %{
+  assert_match %r"Can't escape from eval with #{keyword}\b", %{
+    STDERR.reopen(STDOUT)
     begin
       eval "0 rescue #{keyword}"
     rescue SyntaxError => e
@@ -249,7 +250,9 @@ assert_equal 'ok', %q{
 
 assert_equal 'ok', %q{
   begin
-    12.instance_eval { @@a }
+    class A
+      12.instance_eval { @@a }
+    end
   rescue NameError
     :ok
   end
@@ -257,7 +260,9 @@ assert_equal 'ok', %q{
 
 assert_equal 'ok', %q{
   begin
-    12.instance_exec { @@a }
+    class A
+      12.instance_exec { @@a }
+    end
   rescue NameError
     :ok
   end
diff --git a/bootstraptest/test_exception.rb b/bootstraptest/test_exception.rb
index 35c8d25e37..0fb6f552b8 100644
--- a/bootstraptest/test_exception.rb
+++ b/bootstraptest/test_exception.rb
@@ -402,7 +402,7 @@ assert_equal 'nil', %q{
   exc.inspect
 }, '[ruby-dev:32608]'
 
-assert_equal 'exception class/object expected', %q{
+assert_equal 'divided by 0', %q{
   class ZeroDivisionError
     def self.new(message)
       42
diff --git a/bootstraptest/test_fiber.rb b/bootstraptest/test_fiber.rb
new file mode 100644
index 0000000000..35e1bf6851
--- /dev/null
+++ b/bootstraptest/test_fiber.rb
@@ -0,0 +1,39 @@
+show_limit %q{
+  fibers = []
+  begin
+    fiber = Fiber.new{Fiber.yield}
+    fiber.resume
+    fibers << fiber
+
+    raise Exception, "skipping" if fibers.count >= 10_000
+  rescue Exception => error
+    puts "Fiber count: #{fibers.count} (#{error})"
+    break
+  end while true
+}
+
+assert_equal %q{ok}, %q{
+  Fiber.new{
+  }.resume
+  :ok
+}
+
+assert_equal %q{ok}, %q{
+  10_000.times.collect{Fiber.new{}}
+  :ok
+}
+
+assert_equal %q{ok}, %q{
+  fibers = 100.times.collect{Fiber.new{Fiber.yield}}
+  fibers.each(&:resume)
+  fibers.each(&:resume)
+  :ok
+}
+
+assert_normal_exit %q{
+  at_exit { Fiber.new{}.resume }
+}
+
+assert_normal_exit %q{
+  Fiber.new(&Object.method(:class_eval)).resume("foo")
+}, '[ruby-dev:34128]'
diff --git a/bootstraptest/test_flow.rb b/bootstraptest/test_flow.rb
index 0390062a24..35f19db588 100644
--- a/bootstraptest/test_flow.rb
+++ b/bootstraptest/test_flow.rb
@@ -534,11 +534,11 @@ assert_equal %Q{ENSURE\n}, %q{
  ['[ruby-core:39125]', %q{
   class Bug5234
     include Enumerable
-    def each
+    def each(&block)
       begin
         yield :foo
       ensure
-        proc
+        proc(&block)
       end
     end
   end
@@ -547,11 +547,11 @@ assert_equal %Q{ENSURE\n}, %q{
  ['[ruby-dev:45656]', %q{
   class Bug6460
     include Enumerable
-    def each
+    def each(&block)
       begin
         yield :foo
       ensure
-        1.times { Proc.new }
+        1.times { Proc.new(&block) }
       end
     end
   end
@@ -589,3 +589,13 @@ assert_equal "foo", %q{
   end
   Bug6460.new.m1
 }, '[ruby-dev:46372]'
+
+assert_equal "foo", %q{
+  obj = "foo"
+  if obj || any1
+    any2 = any2
+  else
+    raise obj.inspect
+  end
+  obj
+}, '[ruby-core:87830]'
diff --git a/bootstraptest/test_fork.rb b/bootstraptest/test_fork.rb
index 1cd9f7ac6c..83923dad97 100644
--- a/bootstraptest/test_fork.rb
+++ b/bootstraptest/test_fork.rb
@@ -21,7 +21,9 @@ assert_finish 10, %q{
   end
 }, '[ruby-core:22158]'
 
-assert_normal_exit(<<'End', '[ruby-dev:37934]')
+# temporarily stop this test to enable explicit failure when
+# timer thread couldn't be created (r61706 and r61717).
+assert_normal_exit(<<'End', '[ruby-dev:37934]') if false
   main = Thread.current
   Thread.new { sleep 0.01 until main.stop?; Thread.kill main }
   Process.setrlimit(:NPROC, 1) if defined?(Process::RLIMIT_NPROC)
diff --git a/bootstraptest/test_insns.rb b/bootstraptest/test_insns.rb
new file mode 100644
index 0000000000..9052cad7bd
--- /dev/null
+++ b/bootstraptest/test_insns.rb
@@ -0,0 +1,439 @@
+# C0 coverage of each instructions
+
+# :NOTE: This is for development purpose; never consider this file as
+# ISeq compilation specification.
+
+begin
+  # This library brings some additional coverage.
+  # Not mandatory.
+  require 'rbconfig/sizeof'
+rescue LoadError
+  # OK, just skip
+else
+  if defined? RbConfig::LIMITS
+    $FIXNUM_MAX = RbConfig::LIMITS["FIXNUM_MAX"]
+    $FIXNUM_MIN = RbConfig::LIMITS["FIXNUM_MIN"]
+  end
+end
+
+fsl   = { frozen_string_literal: true } # used later
+tests = [
+  # insn ,   expression to generate such insn
+  [ 'nop',   %q{ raise rescue true }, ],
+
+  [ 'setlocal *, 0', %q{ x = true }, ],
+  [ 'setlocal *, 1', %q{ x = nil; -> { x = true }.call }, ],
+  [ 'setlocal',      %q{ x = nil; -> { -> { x = true }.() }.() }, ],
+  [ 'getlocal *, 0', %q{ x = true; x }, ],
+  [ 'getlocal *, 1', %q{ x = true; -> { x }.call }, ],
+  [ 'getlocal',      %q{ x = true; -> { -> { x }.() }.() }, ],
+
+  [ 'setblockparam', <<-'},', ], # {
+    def m&b
+      b = # here
+        proc { true }
+    end
+    m { false }.call
+  },
+  [ 'getblockparam', <<-'},', ], # {
+    def m&b
+      b # here
+    end
+    m { true }.call
+  },
+  [ 'getblockparamproxy', <<-'},', ], # {
+    def m&b
+      b # here
+        .call
+    end
+    m { true }
+  },
+
+  [ 'setspecial', %q{ true if true..true }, ],
+  [ 'getspecial', %q{ $&.nil? }, ],
+  [ 'getspecial', %q{ $`.nil? }, ],
+  [ 'getspecial', %q{ $'.nil? }, ],
+  [ 'getspecial', %q{ $+.nil? }, ],
+  [ 'getspecial', %q{ $1.nil? }, ],
+  [ 'getspecial', %q{ $128.nil? }, ],
+
+  [ 'getglobal', %q{ String === $0 }, ],
+  [ 'getglobal', %q{ $_.nil? }, ],
+  [ 'setglobal', %q{ $0 = "true" }, ],
+
+  [ 'setinstancevariable', %q{ @x = true }, ],
+  [ 'getinstancevariable', %q{ @x = true; @x }, ],
+
+  [ 'setclassvariable', %q{ class A; @@x = true; end }, ],
+  [ 'getclassvariable', %q{ class A; @@x = true; @@x end }, ],
+
+  [ 'setconstant', %q{ X = true }, ],
+  [ 'setconstant', %q{ Object::X = true }, ],
+  [ 'getconstant', %q{ X = true; X }, ],
+  [ 'getconstant', %q{ X = true; Object::X }, ],
+
+  [ 'getinlinecache / setinlinecache', %q{ def x; X; end; X = true; x; x; x }, ],
+
+  [ 'putnil',               %q{ $~ == nil }, ],
+  [ 'putself',              %q{ $~ != self }, ],
+  [ 'putobject INT2FIX(0)', %q{ $~ != 0 }, ],
+  [ 'putobject INT2FIX(1)', %q{ $~ != 1 }, ],
+  [ 'putobject',            %q{ $~ != -1 }, ],
+  [ 'putobject',            %q{ $~ != /x/ }, ],
+  [ 'putobject',            %q{ $~ != :x }, ],
+  [ 'putobject',            %q{ $~ != (1..2) }, ],
+  [ 'putobject',            %q{ $~ != true }, ],
+  [ 'putobject',            %q{ /(?<x>x)/ =~ "x"; x == "x" }, ],
+
+  [ 'putspecialobject',         %q{ {//=>true}[//] }, ],
+  [ 'putstring',                %q{ "true" }, ],
+  [ 'tostring / concatstrings', %q{ "#{true}" }, ],
+  [ 'toregexp',                 %q{ /#{true}/ =~ "true" && $~ }, ],
+  [ 'intern',                   %q{ :"#{true}" }, ],
+
+  [ 'newarray',    %q{ ["true"][0] }, ],
+  [ 'newarraykwsplat', %q{ [**{x:'true'}][0][:x] }, ],
+  [ 'duparray',    %q{ [ true ][0] }, ],
+  [ 'expandarray', %q{ y = [ true, false, nil ]; x, = y; x }, ],
+  [ 'expandarray', %q{ y = [ true, false, nil ]; x, *z = y; x }, ],
+  [ 'expandarray', %q{ y = [ true, false, nil ]; x, *z, w = y; x }, ],
+  [ 'splatarray',  %q{ x, = *(y = true), false; x }, ],
+  [ 'concatarray', %q{ ["t", "r", *x = "u", "e"].join }, ],
+  [ 'concatarray', <<-'},', ],  # {
+    class X; def to_a; ['u']; end; end
+    ['t', 'r', *X.new, 'e'].join
+  },
+  [ 'concatarray', <<-'},', ],  # {
+    r = false
+    t = [true, nil]
+    q, w, e = r, *t             # here
+    w
+  },
+
+  [ 'newhash',  %q{ x = {}; x[x] = true }, ],
+  [ 'newhash',  %q{ x = true; { x => x }[x] }, ],
+  [ 'newhashfromarray', %q{ { a: true }[:a] }, ],
+  [ 'newrange', %q{ x = 1; [*(0..x)][0] == 0 }, ],
+  [ 'newrange', %q{ x = 1; [*(0...x)][0] == 0 }, ],
+
+  [ 'pop',     %q{ def x; true; end; x }, ],
+  [ 'dup',     %q{ x = y = true; x }, ],
+  [ 'dupn',    %q{ Object::X ||= true }, ],
+  [ 'reverse', %q{ q, (w, e), r = 1, [2, 3], 4; e == 3 }, ],
+  [ 'swap',    <<-'},', ],      # {
+    x = [[false, true]]
+    for i, j in x               # here
+      ;
+    end
+    j
+  },
+
+  [ 'topn',        %q{ x, y = [], 0; x[*y], = [true, false]; x[0] }, ],
+  [ 'setn',        %q{ x, y = [], 0; x[*y]  =  true        ; x[0] }, ],
+  [ 'adjuststack', %q{ x = [true]; x[0] ||= nil; x[0] }, ],
+
+  [ 'defined',      %q{ !defined?(x) }, ],
+  [ 'checkkeyword', %q{ def x x:rand;x end; x x: true }, ],
+  [ 'checktype',    %q{ x = true; "#{x}" }, ],
+  [ 'checkmatch',   <<-'},', ], # {
+    x = y = true
+    case x
+    when false
+      y = false
+    when true                   # here
+      y = nil
+    end
+    y == nil
+  },
+  [ 'checkmatch',   <<-'},', ], # {
+    x, y = true, [false]
+    case x
+    when *y                     # here
+      z = false
+    else
+      z = true
+    end
+    z
+  },
+  [ 'checkmatch',   <<-'},', ], # {
+    x = false
+    begin
+      raise
+    rescue                      # here
+      x = true
+    end
+    x
+  },
+
+  [ 'defineclass', %q{                 module X;    true end }, ],
+  [ 'defineclass', %q{ X = Module.new; module X;    true end }, ],
+  [ 'defineclass', %q{                 class X;     true end }, ],
+  [ 'defineclass', %q{ X = Class.new;  class X;     true end }, ],
+  [ 'defineclass', %q{ X = Class.new;  class Y < X; true end }, ],
+  [ 'defineclass', %q{ X = Class.new;  class << X;  true end }, ],
+  [ 'defineclass', <<-'},', ], # {
+    X = Class.new
+    Y = Class.new(X)
+    class Y < X
+      true
+    end
+  },
+
+  [ 'opt_send_without_block', %q{ true.to_s }, ],
+  [ 'send',                   %q{ true.tap {|i| i.to_s } }, ],
+  [ 'leave',                  %q{ def x; true; end; x }, ],
+  [ 'invokesuper',            <<-'},', ], # {
+    class X < String
+      def empty?
+        super                   # here
+      end
+    end
+   X.new.empty?
+  },
+  [ 'invokeblock',            <<-'},', ], # {
+    def x
+      return yield self         # here
+    end
+    x do
+      true
+    end
+  },
+
+  [ 'opt_str_freeze', %q{ 'true'.freeze }, ],
+  [ 'opt_nil_p',      %q{ nil.nil? }, ],
+  [ 'opt_nil_p',      %q{ !Object.nil? }, ],
+  [ 'opt_nil_p',      %q{ Class.new{def nil?; true end}.new.nil? }, ],
+  [ 'opt_str_uminus', %q{ -'true' }, ],
+  [ 'opt_str_freeze', <<-'},', ], # {
+    class String
+      def freeze
+        true
+      end
+    end
+    'true'.freeze
+  },
+
+  [ 'opt_newarray_max', %q{ [ ].max.nil? }, ],
+  [ 'opt_newarray_max', %q{ [1, x = 2, 3].max == 3 }, ],
+  [ 'opt_newarray_max', <<-'},', ], # {
+    class Array
+      def max
+        true
+      end
+    end
+    [1, x = 2, 3].max
+  },
+  [ 'opt_newarray_min', %q{ [ ].min.nil? }, ],
+  [ 'opt_newarray_min', %q{ [3, x = 2, 1].min == 1 }, ],
+  [ 'opt_newarray_min', <<-'},', ], # {
+    class Array
+      def min
+        true
+      end
+    end
+    [3, x = 2, 1].min
+  },
+
+  [ 'throw',        %q{ false.tap { break true } }, ],
+  [ 'branchif',     %q{ x = nil;  x ||= true }, ],
+  [ 'branchif',     %q{ x = true; x ||= nil; x }, ],
+  [ 'branchunless', %q{ x = 1;    x &&= true }, ],
+  [ 'branchunless', %q{ x = nil;  x &&= true; x.nil? }, ],
+  [ 'branchnil',    %q{ x = true; x&.to_s }, ],
+  [ 'branchnil',    %q{ x = nil;  (x&.to_s).nil? }, ],
+  [ 'jump',         <<-'},', ], # {
+    y = 1
+    x = if y == 0 then nil elsif y == 1 then true else nil end
+    x
+  },
+  [ 'jump',         <<-'},', ], # {
+    # ultra complicated situation: this ||= assignment only generates
+    # 15 instructions, not including the class definition.
+    class X; attr_accessor :x; end
+    x = X.new
+    x&.x ||= true               # here
+  },
+
+  [ 'once', %q{ /#{true}/o =~ "true" && $~ }, ],
+  [ 'once', <<-'},', ],         # {
+    def once expr
+      return /#{expr}/o         # here
+    end
+    x = once(true); x = once(false); x = once(nil);
+    x =~ "true" && $~
+  },
+  [ 'once', <<-'},', ],         # {
+    # recursive once
+    def once n
+      return %r/#{
+        if n == 0
+          true
+        else
+          once(n-1)             # here
+        end
+      }/ox
+    end
+    x = once(128); x = once(7); x = once(16);
+    x =~ "true" && $~
+  },
+  [ 'once', <<-'},', ],         # {
+    # inter-thread lockup situation
+    def once n
+      return Thread.start n do |m|
+        Thread.pass
+        next %r/#{
+          sleep m               # here
+          true
+        }/ox
+      end
+    end
+    x = once(1); y = once(0.1); z = y.value
+    z =~ "true" && $~
+  },
+
+  [ 'opt_case_dispatch', %q{ case   0 when 1.1 then false else true end }, ],
+  [ 'opt_case_dispatch', %q{ case 1.0 when 1.1 then false else true end }, ],
+
+  [ 'opt_plus',    %q{ 1 + 1 == 2 }, ],
+  if defined? $FIXNUM_MAX then
+    [ 'opt_plus',  %Q{ #{ $FIXNUM_MAX } + 1 == #{ $FIXNUM_MAX + 1 } }, ]
+  end,
+  [ 'opt_plus',    %q{ 1.0 + 1.0 == 2.0 }, ],
+  [ 'opt_plus',    %q{ x = +0.0.next_float; x + x >= x }, ],
+  [ 'opt_plus',    %q{ 't' + 'rue' }, ],
+  [ 'opt_plus',    %q{ ( ['t'] + ['r', ['u', ['e'], ], ] ).join }, ],
+  [ 'opt_plus',    %q{ Time.at(1) + 1 == Time.at(2) }, ],
+  [ 'opt_minus',   %q{ 1 - 1 == 0 }, ],
+  if defined? $FIXNUM_MIN then
+    [ 'opt_minus', %Q{ #{ $FIXNUM_MIN } - 1 == #{ $FIXNUM_MIN - 1 } }, ]
+  end,
+  [ 'opt_minus',   %q{ 1.0 - 1.0 == 0.0 }, ],
+  [ 'opt_minus',   %q{ x = -0.0.prev_float; x - x == 0.0 }, ],
+  [ 'opt_minus',   %q{ ( [false, true] - [false] )[0] }, ],
+  [ 'opt_mult',    %q{ 1 * 1 == 1 }, ],
+  [ 'opt_mult',    %q{ 1.0 * 1.0 == 1.0 }, ],
+  [ 'opt_mult',    %q{ x = +0.0.next_float; x * x <= x }, ],
+  [ 'opt_mult',    %q{ ( "ruet" * 3 )[7,4] }, ],
+  [ 'opt_div',     %q{ 1 / 1 == 1 }, ],
+  [ 'opt_div',     %q{ 1.0 / 1.0 == 1.0 }, ],
+  [ 'opt_div',     %q{ x = +0.0.next_float; x / x >= x }, ],
+  [ 'opt_div',     %q{ x = 1/2r; x / x == 1 }, ],
+  [ 'opt_mod',     %q{ 1 % 1 == 0 }, ],
+  [ 'opt_mod',     %q{ 1.0 % 1.0 == 0.0 }, ],
+  [ 'opt_mod',     %q{ x = +0.0.next_float; x % x == 0.0 }, ],
+  [ 'opt_mod',     %q{ '%s' % [ true ] }, ],
+
+  [ 'opt_eq', %q{ 1 == 1 }, ],
+  [ 'opt_eq', <<-'},', ],       # {
+    class X; def == other; true; end; end
+    X.new == true
+  },
+  [ 'opt_neq', %q{ 1 != 0 }, ],
+  [ 'opt_neq', <<-'},', ],       # {
+    class X; def != other; true; end; end
+    X.new != true
+  },
+
+  [ 'opt_lt', %q{            -1   <  0 }, ],
+  [ 'opt_lt', %q{            -1.0 <  0.0 }, ],
+  [ 'opt_lt', %q{ -0.0.prev_float <  0.0 }, ],
+  [ 'opt_lt', %q{              ?a <  ?z }, ],
+  [ 'opt_le', %q{            -1   <= 0 }, ],
+  [ 'opt_le', %q{            -1.0 <= 0.0 }, ],
+  [ 'opt_le', %q{ -0.0.prev_float <= 0.0 }, ],
+  [ 'opt_le', %q{              ?a <= ?z }, ],
+  [ 'opt_gt', %q{             1   >  0 }, ],
+  [ 'opt_gt', %q{             1.0 >  0.0 }, ],
+  [ 'opt_gt', %q{ +0.0.next_float >  0.0 }, ],
+  [ 'opt_gt', %q{              ?z >  ?a }, ],
+  [ 'opt_ge', %q{             1   >= 0 }, ],
+  [ 'opt_ge', %q{             1.0 >= 0.0 }, ],
+  [ 'opt_ge', %q{ +0.0.next_float >= 0.0 }, ],
+  [ 'opt_ge', %q{              ?z >= ?a }, ],
+
+  [ 'opt_ltlt', %q{  '' << 'true' }, ],
+  [ 'opt_ltlt', %q{ ([] << 'true').join }, ],
+  [ 'opt_ltlt', %q{ (1 << 31) == 2147483648 }, ],
+
+  [ 'opt_aref', %q{ ['true'][0] }, ],
+  [ 'opt_aref', %q{ { 0 => 'true'}[0] }, ],
+  [ 'opt_aref', %q{ 'true'[0] == ?t }, ],
+  [ 'opt_aset', %q{ [][0] = true }, ],
+  [ 'opt_aset', %q{ {}[0] = true }, ],
+  [ 'opt_aset', %q{ x = 'frue'; x[0] = 't'; x }, ],
+  [ 'opt_aset', <<-'},', ], # {
+    # opt_aref / opt_aset mixup situation
+    class X; def x; {}; end; end
+    x = X.new
+    x&.x[true] ||= true         # here
+  },
+
+  [ 'opt_aref_with', %q{ { 'true' => true }['true'] }, ],
+  [ 'opt_aref_with', %q{ Struct.new(:nil).new['nil'].nil? }, ],
+  [ 'opt_aset_with', %q{ {}['true'] = true }, ],
+  [ 'opt_aset_with', %q{ Struct.new(:true).new['true'] = true }, ],
+
+  [ 'opt_length',  %q{   'true'       .length == 4 }, ],
+  [ 'opt_length',  %q{   :true        .length == 4 }, ],
+  [ 'opt_length',  %q{ [ 'true' ]     .length == 1 }, ],
+  [ 'opt_length',  %q{ { 'true' => 1 }.length == 1 }, ],
+  [ 'opt_size',    %q{   'true'       .size   == 4 }, ],
+  [ 'opt_size',    %q{               1.size   >= 4 }, ],
+  [ 'opt_size',    %q{ [ 'true' ]     .size   == 1 }, ],
+  [ 'opt_size',    %q{ { 'true' => 1 }.size   == 1 }, ],
+  [ 'opt_empty_p', %q{ ''.empty? }, ],
+  [ 'opt_empty_p', %q{ [].empty? }, ],
+  [ 'opt_empty_p', %q{ {}.empty? }, ],
+  [ 'opt_empty_p', %q{ Queue.new.empty? }, ],
+
+  [ 'opt_succ',  %q{ 1.succ == 2 }, ],
+  if defined? $FIXNUM_MAX then
+    [ 'opt_succ',%Q{ #{ $FIXNUM_MAX }.succ == #{ $FIXNUM_MAX + 1 } }, ]
+  end,
+  [ 'opt_succ',  %q{ '1'.succ == '2' }, ],
+
+  [ 'opt_not',  %q{ ! false }, ],
+  [ 'opt_neq', <<-'},', ],       # {
+    class X; def !; true; end; end
+    ! X.new
+  },
+
+  [ 'opt_regexpmatch2',  %q{ /true/ =~ 'true' && $~ }, ],
+  [ 'opt_regexpmatch2', <<-'},', ],       # {
+    class Regexp; def =~ other; true; end; end
+    /true/ =~ 'true'
+  },
+  [ 'opt_regexpmatch2',  %q{ 'true' =~ /true/ && $~ }, ],
+  [ 'opt_regexpmatch2', <<-'},', ],       # {
+    class String; def =~ other; true; end; end
+    'true' =~ /true/
+  },
+]
+
+# normal path
+tests.compact.each do |(insn, expr, *a)|
+  if a.last.is_a?(Hash)
+    a = a.dup
+    kw = a.pop
+    assert_equal 'true', expr, insn, *a, **kw
+  else
+    assert_equal 'true', expr, insn, *a
+  end
+end
+
+# with trace
+tests.compact.each {|(insn, expr, *a)|
+  progn = "set_trace_func(proc{})\n" + expr
+  if a.last.is_a?(Hash)
+    a = a.dup
+    kw = a.pop
+    assert_equal 'true', progn, 'trace_' + insn, *a, **kw
+  else
+    assert_equal 'true', progn, 'trace_' + insn, *a
+  end
+}
+
+assert_normal_exit("#{<<-"begin;"}\n#{<<-'end;'}")
+begin;
+  RubyVM::InstructionSequence.compile("", debug_level: 5)
+end;
diff --git a/bootstraptest/test_io.rb b/bootstraptest/test_io.rb
index 1d2b19368a..89c00d0b88 100644
--- a/bootstraptest/test_io.rb
+++ b/bootstraptest/test_io.rb
@@ -52,7 +52,7 @@ assert_equal 'ok', %q{
   STDIN.reopen(rw)
   STDIN.reopen(save)
   rw.close
-  File.unlink(tmpname) unless RUBY_PLATFORM['nacl']
+  File.unlink(tmpname)
   :ok
 }
 
@@ -69,7 +69,7 @@ assert_equal 'ok', %q{
   STDIN.print "a"
   STDIN.reopen(save)
   rw.close
-  File.unlink(tmpname) unless RUBY_PLATFORM['nacl']
+  File.unlink(tmpname)
   :ok
 }
 
diff --git a/bootstraptest/test_jump.rb b/bootstraptest/test_jump.rb
index 595aaa7c4b..18a2737ea3 100644
--- a/bootstraptest/test_jump.rb
+++ b/bootstraptest/test_jump.rb
@@ -146,15 +146,16 @@ assert_equal %q{131}, %q{
     end
   }
 }
-assert_equal %q{ok}, %q{
+assert_match %r{Invalid retry}, %q{
+STDERR.reopen(STDOUT)
 begin
   eval %q{
     1.times{
       retry
     }
   }
-rescue SyntaxError
-  :ok
+rescue SyntaxError => e
+  e.message
 end
 }
 assert_equal %q{3}, %q{
@@ -295,14 +296,19 @@ assert_equal "true", %q{
   s.return_eigenclass == class << s; self; end
 }, '[ruby-core:21379]'
 
-assert_equal "true", %q{
-  class Object
-    def yield_eigenclass
-      class << self
-        yield self
+assert_match %r{Invalid yield}, %q{
+STDERR.reopen(STDOUT)
+begin
+  eval %q{
+    class Object
+      def yield_eigenclass
+        class << self
+          yield self
+        end
       end
     end
-  end
-  s = "foo"
-  s.yield_eigenclass {|c| c == class << s; self; end }
-}, '[ruby-dev:40975]'
+  }
+rescue SyntaxError => e
+  e.message
+end
+}
diff --git a/bootstraptest/test_literal.rb b/bootstraptest/test_literal.rb
index e79092e411..9b3c10d519 100644
--- a/bootstraptest/test_literal.rb
+++ b/bootstraptest/test_literal.rb
@@ -65,10 +65,8 @@ assert_equal ':a3c',            ':"a#{1+2}c".inspect'
 assert_equal 'Symbol',          ':"a#{1+2}c".class'
 
 # xstring
-unless nacl?
-  assert_equal "foo\n",           %q(`echo foo`)
-  assert_equal "foo\n",           %q(s = "foo"; `echo #{s}`)
-end
+assert_equal "foo\n",           %q(`echo foo`)
+assert_equal "foo\n",           %q(s = "foo"; `echo #{s}`)
 
 # regexp
 assert_equal '',                '//.source'
@@ -225,6 +223,24 @@ assert_equal 'ok', %q{ #  long hash literal (optimized)
   :ok
 }
 
+assert_equal 'ok', %q{ #  Bug #15536
+  eval <<-END
+    {
+      **{
+        a0: nil, a1: nil, a2: nil, a3: nil, a4: nil, a5: nil, a6: nil, a7: nil, a8: nil,
+      },
+      a0: nil, a1: nil, a2: nil, a3: nil, a4: nil, a5: nil, a6: nil, a7: nil, a8: nil,
+      **{
+        c: nil
+      },
+      b0: nil, b1: nil, b2: nil, b3: nil, b4: nil, b5: nil, b6: nil, b7: nil, b8: nil,
+      b9: nil, b10: nil, b11: nil, b12: nil, b13: nil, b14: nil, b15: nil, b16: nil,
+      b17: nil, b18: nil, b19: nil, b20: nil, b21: nil,
+    }
+  END
+  :ok
+}
+
 assert_equal 'ok', %q{
   [print(:ok), exit] # void literal with side-effect
   :dummy
diff --git a/bootstraptest/test_literal_suffix.rb b/bootstraptest/test_literal_suffix.rb
index 4316c9e040..c36fa7078f 100644
--- a/bootstraptest/test_literal_suffix.rb
+++ b/bootstraptest/test_literal_suffix.rb
@@ -46,9 +46,9 @@ assert_equal '1',               '1rescue nil'
 assert_equal '10000000000000000001/10000000000000000000',
              '1.0000000000000000001r'
 
-assert_equal 'syntax error, unexpected tIDENTIFIER, expecting end-of-input',
+assert_equal 'syntax error, unexpected local variable or method, expecting end-of-input',
              %q{begin eval('1ir', nil, '', 0); rescue SyntaxError => e; e.message[/\A:(?:\d+:)? (.*)/, 1] end}
-assert_equal 'syntax error, unexpected tIDENTIFIER, expecting end-of-input',
+assert_equal 'syntax error, unexpected local variable or method, expecting end-of-input',
              %q{begin eval('1.2ir', nil, '', 0); rescue SyntaxError => e; e.message[/\A:(?:\d+:)? (.*)/, 1] end}
-assert_equal 'syntax error, unexpected tIDENTIFIER, expecting end-of-input',
+assert_equal 'syntax error, unexpected local variable or method, expecting end-of-input',
              %q{begin eval('1e1r', nil, '', 0); rescue SyntaxError => e; e.message[/\A:(?:\d+:)? (.*)/, 1] end}
diff --git a/bootstraptest/test_objectspace.rb b/bootstraptest/test_objectspace.rb
index 862a94e376..63a8d99322 100644
--- a/bootstraptest/test_objectspace.rb
+++ b/bootstraptest/test_objectspace.rb
@@ -35,7 +35,7 @@ assert_normal_exit %q{
 
 assert_normal_exit %q{
   ObjectSpace.define_finalizer("") do
-    Mutex.new.lock
+    Thread::Mutex.new.lock
   end
 }, '[ruby-dev:44049]'
 
@@ -44,3 +44,12 @@ assert_normal_exit %q{
     Thread.new {}
   end
 }, '[ruby-core:37858]'
+
+assert_equal 'ok', %q{
+  objects_and_ids = 1000.times.map { o = Object.new; [o, o.object_id] }
+  objects_and_ids.each { |expected, id|
+    actual = ObjectSpace._id2ref(id)
+    raise "expected #{expected.inspect}, got #{actual.inspect}" unless actual.equal?(expected)
+  }
+  'ok'
+}
diff --git a/bootstraptest/test_proc.rb b/bootstraptest/test_proc.rb
index c23394e8d2..637603243d 100644
--- a/bootstraptest/test_proc.rb
+++ b/bootstraptest/test_proc.rb
@@ -224,19 +224,6 @@ assert_equal %q{[[nil, []], [1, []], [1, [2]], [1, [2, 3]]]}, %q{
   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
@@ -380,8 +367,8 @@ assert_equal 'ok', %q{
 
 assert_equal 'ok', %q{
   class Foo
-    def call_it
-      p = Proc.new
+    def call_it(&block)
+      p = Proc.new(&block)
       p.call
     end
   end
diff --git a/bootstraptest/test_ractor.rb b/bootstraptest/test_ractor.rb
new file mode 100644
index 0000000000..7d920c31b5
--- /dev/null
+++ b/bootstraptest/test_ractor.rb
@@ -0,0 +1,1444 @@
+# Ractor.current returns a current ractor
+assert_equal 'Ractor', %q{
+  Ractor.current.class
+}
+
+# Ractor.new returns new Ractor
+assert_equal 'Ractor', %q{
+  Ractor.new{}.class
+}
+
+# Ractor.allocate is not supported
+assert_equal "[:ok, :ok]", %q{
+  rs = []
+  begin
+    Ractor.allocate
+  rescue => e
+    rs << :ok if e.message == 'allocator undefined for Ractor'
+  end
+
+  begin
+    Ractor.new{}.dup
+  rescue
+    rs << :ok if e.message == 'allocator undefined for Ractor'
+  end
+
+  rs
+}
+
+# A Ractor can have a name
+assert_equal 'test-name', %q{
+  r = Ractor.new name: 'test-name' do
+  end
+  r.name
+}
+
+# If Ractor doesn't have a name, Ractor#name returns nil.
+assert_equal 'nil', %q{
+  r = Ractor.new do
+  end
+  r.name.inspect
+}
+
+# Raises exceptions if initialize with an invalid name
+assert_equal 'ok', %q{
+  begin
+    r = Ractor.new(name: [{}]) {}
+  rescue TypeError => e
+    'ok'
+  end
+}
+
+# Ractor.new must call with a block
+assert_equal "must be called with a block", %q{
+  begin
+    Ractor.new
+  rescue ArgumentError => e
+    e.message
+  end
+}
+
+# Ractor#inspect
+# Return only id and status for main ractor
+assert_equal "#<Ractor:#1 running>", %q{
+  Ractor.current.inspect
+}
+
+# Return id, loc, and status for no-name ractor
+assert_match /^#<Ractor:#([^ ]*?) .+:[0-9]+ terminated>$/, %q{
+  r = Ractor.new { '' }
+  r.take
+  sleep 0.1 until r.inspect =~ /terminated/
+  r.inspect
+}
+
+# Return id, name, loc, and status for named ractor
+assert_match /^#<Ractor:#([^ ]*?) Test Ractor .+:[0-9]+ terminated>$/, %q{
+  r = Ractor.new(name: 'Test Ractor') { '' }
+  r.take
+  sleep 0.1 until r.inspect =~ /terminated/
+  r.inspect
+}
+
+# A return value of a Ractor block will be a message from the Ractor.
+assert_equal 'ok', %q{
+  # join
+  r = Ractor.new do
+    'ok'
+  end
+  r.take
+}
+
+# Passed arguments to Ractor.new will be a block parameter
+# The values are passed with Ractor-communication pass.
+assert_equal 'ok', %q{
+  # ping-pong with arg
+  r = Ractor.new 'ok' do |msg|
+    msg
+  end
+  r.take
+}
+
+# Pass multiple arguments to Ractor.new
+assert_equal 'ok', %q{
+  # ping-pong with two args
+  r =  Ractor.new 'ping', 'pong' do |msg, msg2|
+    [msg, msg2]
+  end
+  'ok' if r.take == ['ping', 'pong']
+}
+
+# Ractor#send passes an object with copy to a Ractor
+# and Ractor.receive in the Ractor block can receive the passed value.
+assert_equal 'ok', %q{
+  r = Ractor.new do
+    msg = Ractor.receive
+  end
+  r.send 'ok'
+  r.take
+}
+
+# Ractor#receive_if can filter the message
+assert_equal '[2, 3, 1]', %q{
+  r = Ractor.new Ractor.current do |main|
+    main << 1
+    main << 2
+    main << 3
+  end
+  a = []
+  a << Ractor.receive_if{|msg| msg == 2}
+  a << Ractor.receive_if{|msg| msg == 3}
+  a << Ractor.receive
+}
+
+# Ractor#receive_if with break
+assert_equal '[2, [1, :break], 3]', %q{
+  r = Ractor.new Ractor.current do |main|
+    main << 1
+    main << 2
+    main << 3
+  end
+
+  a = []
+  a << Ractor.receive_if{|msg| msg == 2}
+  a << Ractor.receive_if{|msg| break [msg, :break]}
+  a << Ractor.receive
+}
+
+# Ractor#receive_if can't be called recursively
+assert_equal '[[:e1, 1], [:e2, 2]]', %q{
+  r = Ractor.new Ractor.current do |main|
+    main << 1
+    main << 2
+    main << 3
+  end
+
+  a = []
+
+  Ractor.receive_if do |msg|
+    begin
+      Ractor.receive
+    rescue Ractor::Error
+      a << [:e1, msg]
+    end
+    true # delete 1 from queue
+  end
+
+  Ractor.receive_if do |msg|
+    begin
+      Ractor.receive_if{}
+    rescue Ractor::Error
+      a << [:e2, msg]
+    end
+    true # delete 2 from queue
+  end
+
+  a #
+}
+
+# dtoa race condition
+assert_equal '[:ok, :ok, :ok]', %q{
+  n = 3
+  n.times.map{
+    Ractor.new{
+      10_000.times{ rand.to_s }
+      :ok
+    }
+  }.map(&:take)
+}
+
+# Ractor.make_shareable issue for locals in proc [Bug #18023]
+assert_equal '[:a, :b, :c, :d, :e]', %q{
+  v1, v2, v3, v4, v5 = :a, :b, :c, :d, :e
+  closure = Proc.new { [v1, v2, v3, v4, v5] }
+
+  Ractor.make_shareable(closure).call
+}
+
+# Ractor.make_shareable issue for locals in proc [Bug #18023]
+assert_equal '[:a, :b, :c, :d, :e, :f, :g]', %q{
+  a = :a
+  closure = -> {
+    b, c, d = :b, :c, :d
+    -> {
+      e, f, g = :e, :f, :g
+      -> { [a, b, c, d, e, f, g] }
+    }.call
+  }.call
+
+  Ractor.make_shareable(closure).call
+}
+
+###
+###
+# Ractor still has several memory corruption so skip huge number of tests
+if ENV['GITHUB_WORKFLOW'] &&
+   ENV['GITHUB_WORKFLOW'] == 'Compilations'
+   # ignore the follow
+else
+
+# Ractor.select(*ractors) receives a values from a ractors.
+# It is similar to select(2) and Go's select syntax.
+# The return value is [ch, received_value]
+assert_equal 'ok', %q{
+  # select 1
+  r1 = Ractor.new{'r1'}
+  r, obj = Ractor.select(r1)
+  'ok' if r == r1 and obj == 'r1'
+}
+
+# Ractor.select from two ractors.
+assert_equal '["r1", "r2"]', %q{
+  # select 2
+  r1 = Ractor.new{'r1'}
+  r2 = Ractor.new{'r2'}
+  rs = [r1, r2]
+  as = []
+  r, obj = Ractor.select(*rs)
+  rs.delete(r)
+  as << obj
+  r, obj = Ractor.select(*rs)
+  as << obj
+  as.sort #=> ["r1", "r2"]
+}
+
+# Ractor.select from multiple ractors.
+assert_equal 30.times.map { 'ok' }.to_s, %q{
+  def test n
+    rs = (1..n).map do |i|
+      Ractor.new(i) do |i|
+        "r#{i}"
+      end
+    end
+    as = []
+    all_rs = rs.dup
+
+    n.times{
+      r, obj = Ractor.select(*rs)
+      as << [r, obj]
+      rs.delete(r)
+    }
+
+    if as.map{|r, o| r.object_id}.sort == all_rs.map{|r| r.object_id}.sort &&
+       as.map{|r, o| o}.sort == (1..n).map{|i| "r#{i}"}.sort
+      'ok'
+    else
+      'ng'
+    end
+  end
+
+  30.times.map{|i|
+    test i
+  }
+} unless ENV['RUN_OPTS'] =~ /--jit-min-calls=5/ # This always fails with --jit-wait --jit-min-calls=5
+
+# Exception for empty select
+assert_match /specify at least one ractor/, %q{
+  begin
+    Ractor.select
+  rescue ArgumentError => e
+    e.message
+  end
+}
+
+# Outgoing port of a ractor will be closed when the Ractor is terminated.
+assert_equal 'ok', %q{
+  r = Ractor.new do
+    'finish'
+  end
+
+  r.take
+  sleep 0.1 until r.inspect =~ /terminated/
+
+  begin
+    o = r.take
+  rescue Ractor::ClosedError
+    'ok'
+  else
+    "ng: #{o}"
+  end
+}
+
+# Raise Ractor::ClosedError when try to send into a terminated ractor
+assert_equal 'ok', %q{
+  r = Ractor.new do
+  end
+
+  r.take # closed
+  sleep 0.1 until r.inspect =~ /terminated/
+
+  begin
+    r.send(1)
+  rescue Ractor::ClosedError
+    'ok'
+  else
+    'ng'
+  end
+}
+
+# Raise Ractor::ClosedError when try to send into a closed actor
+assert_equal 'ok', %q{
+  r = Ractor.new { Ractor.receive }
+  r.close_incoming
+
+  begin
+    r.send(1)
+  rescue Ractor::ClosedError
+    'ok'
+  else
+    'ng'
+  end
+}
+
+# Raise Ractor::ClosedError when try to take from closed actor
+assert_equal 'ok', %q{
+  r = Ractor.new do
+    Ractor.yield 1
+    Ractor.receive
+  end
+
+  r.close_outgoing
+  begin
+    r.take
+  rescue Ractor::ClosedError
+    'ok'
+  else
+    'ng'
+  end
+}
+
+# Can mix with Thread#interrupt and Ractor#take [Bug #17366]
+assert_equal 'err', %q{
+  Ractor.new{
+    t = Thread.current
+    begin
+      Thread.new{ t.raise "err" }.join
+    rescue => e
+      e.message
+    end
+  }.take
+}
+
+# Killed Ractor's thread yields nil
+assert_equal 'nil', %q{
+  Ractor.new{
+    t = Thread.current
+    Thread.new{ t.kill }.join
+  }.take.inspect #=> nil
+}
+
+# Ractor.yield raises Ractor::ClosedError when outgoing port is closed.
+assert_equal 'ok', %q{
+  r = Ractor.new Ractor.current do |main|
+    Ractor.receive
+    main << true
+    Ractor.yield 1
+  end
+
+  r.close_outgoing
+  r << true
+  Ractor.receive
+
+  begin
+    r.take
+  rescue Ractor::ClosedError
+    'ok'
+  else
+    'ng'
+  end
+}
+
+# Raise Ractor::ClosedError when try to send into a ractor with closed incoming port
+assert_equal 'ok', %q{
+  r = Ractor.new { Ractor.receive }
+  r.close_incoming
+
+  begin
+    r.send(1)
+  rescue Ractor::ClosedError
+    'ok'
+  else
+    'ng'
+  end
+}
+
+# A ractor with closed incoming port still can send messages out
+assert_equal '[1, 2]', %q{
+  r = Ractor.new do
+    Ractor.yield 1
+    2
+  end
+  r.close_incoming
+
+  [r.take, r.take]
+}
+
+# Raise Ractor::ClosedError when try to take from a ractor with closed outgoing port
+assert_equal 'ok', %q{
+  r = Ractor.new do
+    Ractor.yield 1
+    Ractor.receive
+  end
+
+  sleep 0.01 # wait for Ractor.yield in r
+  r.close_outgoing
+  begin
+    r.take
+  rescue Ractor::ClosedError
+    'ok'
+  else
+    'ng'
+  end
+}
+
+# A ractor with closed outgoing port still can receive messages from incoming port
+assert_equal 'ok', %q{
+  r = Ractor.new do
+    Ractor.receive
+  end
+
+  r.close_outgoing
+  begin
+    r.send(1)
+  rescue Ractor::ClosedError
+    'ng'
+  else
+    'ok'
+  end
+}
+
+# Ractor.main returns main ractor
+assert_equal 'true', %q{
+  Ractor.new{
+    Ractor.main
+  }.take == Ractor.current
+}
+
+# a ractor with closed outgoing port should terminate
+assert_equal 'ok', %q{
+  Ractor.new do
+    close_outgoing
+  end
+
+  true until Ractor.count == 1
+  :ok
+}
+
+# multiple Ractors can receive (wait) from one Ractor
+assert_equal '[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]', %q{
+  pipe = Ractor.new do
+    loop do
+      Ractor.yield Ractor.receive
+    end
+  end
+
+  RN = 10
+  rs = RN.times.map{|i|
+    Ractor.new pipe, i do |pipe, i|
+      msg = pipe.take
+      msg # ping-pong
+    end
+  }
+  RN.times{|i|
+    pipe << i
+  }
+  RN.times.map{
+    r, n = Ractor.select(*rs)
+    rs.delete r
+    n
+  }.sort
+}
+
+# Ractor.select also support multiple take, receive and yield
+assert_equal '[true, true, true]', %q{
+  RN = 10
+  CR = Ractor.current
+
+  rs = (1..RN).map{
+    Ractor.new do
+      CR.send 'send' + CR.take #=> 'sendyield'
+      'take'
+    end
+  }
+  received = []
+  take = []
+  yielded = []
+  until rs.empty?
+    r, v = Ractor.select(CR, *rs, yield_value: 'yield')
+    case r
+    when :receive
+      received << v
+    when :yield
+      yielded << v
+    else
+      take << v
+      rs.delete r
+    end
+  end
+  [received.all?('sendyield'), yielded.all?(nil), take.all?('take')]
+}
+
+# multiple Ractors can send to one Ractor
+assert_equal '[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]', %q{
+  pipe = Ractor.new do
+    loop do
+      Ractor.yield Ractor.receive
+    end
+  end
+
+  RN = 10
+  RN.times.map{|i|
+    Ractor.new pipe, i do |pipe, i|
+      pipe << i
+    end
+  }
+  RN.times.map{
+    pipe.take
+  }.sort
+}
+
+# an exception in a Ractor will be re-raised at Ractor#receive
+assert_equal '[RuntimeError, "ok", true]', %q{
+  r = Ractor.new do
+    raise 'ok' # exception will be transferred receiver
+  end
+  begin
+    r.take
+  rescue Ractor::RemoteError => e
+    [e.cause.class,   #=> RuntimeError
+     e.cause.message, #=> 'ok'
+     e.ractor == r]   #=> true
+  end
+}
+
+# threads in a ractor will killed
+assert_equal '{:ok=>3}', %q{
+  Ractor.new Ractor.current do |main|
+    q = Queue.new
+    Thread.new do
+      q << true
+      loop{}
+    ensure
+      main << :ok
+    end
+
+    Thread.new do
+      q << true
+      while true
+      end
+    ensure
+      main << :ok
+    end
+
+    Thread.new do
+      q << true
+      sleep 1
+    ensure
+      main << :ok
+    end
+
+    # wait for the start of all threads
+    3.times{q.pop}
+  end
+
+  3.times.map{Ractor.receive}.tally
+}
+
+# unshareable object are copied
+assert_equal 'false', %q{
+  obj = 'str'.dup
+  r = Ractor.new obj do |msg|
+    msg.object_id
+  end
+
+  obj.object_id == r.take
+}
+
+# To copy the object, now Marshal#dump is used
+assert_equal "allocator undefined for Thread", %q{
+  obj = Thread.new{}
+  begin
+    r = Ractor.new obj do |msg|
+      msg
+    end
+  rescue TypeError => e
+    e.message #=> no _dump_data is defined for class Thread
+  else
+    'ng'
+  end
+}
+
+# send shareable and unshareable objects
+assert_equal "ok", %q{
+  echo_ractor = Ractor.new do
+    loop do
+      v = Ractor.receive
+      Ractor.yield v
+    end
+  end
+
+  class C; end
+  module M; end
+  S = Struct.new(:a, :b, :c, :d)
+
+  shareable_objects = [
+    true,
+    false,
+    nil,
+    1,
+    1.1,    # Float
+    1+2r,   # Rational
+    3+4i,   # Complex
+    2**128, # Bignum
+    :sym,   # Symbol
+    'xyzzy'.to_sym, # dynamic symbol
+    'frozen'.freeze, # frozen String
+    /regexp/, # regexp literal
+    /reg{true}exp/.freeze, # frozen dregexp
+    [1, 2].freeze,   # frozen Array which only refers to shareable
+    {a: 1}.freeze,   # frozen Hash which only refers to shareable
+    [{a: 1}.freeze, 'str'.freeze].freeze, # nested frozen container
+    S.new(1, 2).freeze, # frozen Struct
+    S.new(1, 2, 3, 4).freeze, # frozen Struct
+    (1..2), # Range on Struct
+    (1..),  # Range on Struct
+    (..1),  # Range on Struct
+    C, # class
+    M, # module
+    Ractor.current, # Ractor
+  ]
+
+  unshareable_objects = [
+    'mutable str'.dup,
+    [:array],
+    {hash: true},
+    S.new(1, 2),
+    S.new(1, 2, 3, 4),
+    S.new("a", 2).freeze, # frozen, but refers to an unshareable object
+  ]
+
+  results = []
+
+  shareable_objects.map{|o|
+    echo_ractor << o
+    o2 = echo_ractor.take
+    results << "#{o} is copied" unless o.object_id == o2.object_id
+  }
+
+  unshareable_objects.map{|o|
+    echo_ractor << o
+    o2 = echo_ractor.take
+    results << "#{o.inspect} is not copied" if o.object_id == o2.object_id
+  }
+
+  if results.empty?
+    :ok
+  else
+    results.inspect
+  end
+}
+
+# frozen Objects are shareable
+assert_equal [false, true, false].inspect, %q{
+  class C
+    def initialize freeze
+      @a = 1
+      @b = :sym
+      @c = 'frozen_str'
+      @c.freeze if freeze
+      @d = true
+    end
+  end
+
+  def check obj1
+    obj2 = Ractor.new obj1 do |obj|
+      obj
+    end.take
+
+    obj1.object_id == obj2.object_id
+  end
+
+  results = []
+  results << check(C.new(true))         # false
+  results << check(C.new(true).freeze)  # true
+  results << check(C.new(false).freeze) # false
+}
+
+# move example2: String
+# touching moved object causes an error
+assert_equal 'hello world', %q{
+  # move
+  r = Ractor.new do
+    obj = Ractor.receive
+    obj << ' world'
+  end
+
+  str = 'hello'
+  r.send str, move: true
+  modified = r.take
+
+  begin
+    str << ' exception' # raise Ractor::MovedError
+  rescue Ractor::MovedError
+    modified #=> 'hello world'
+  else
+    raise 'unreachable'
+  end
+}
+
+# move example2: Array
+assert_equal '[0, 1]', %q{
+  r = Ractor.new do
+    ary = Ractor.receive
+    ary << 1
+  end
+
+  a1 = [0]
+  r.send a1, move: true
+  a2 = r.take
+  begin
+    a1 << 2 # raise Ractor::MovedError
+  rescue Ractor::MovedError
+    a2.inspect
+  end
+}
+
+# move with yield
+assert_equal 'hello', %q{
+  r = Ractor.new do
+    Thread.current.report_on_exception = false
+    obj = 'hello'
+    Ractor.yield obj, move: true
+    obj << 'world'
+  end
+
+  str = r.take
+  begin
+    r.take
+  rescue Ractor::RemoteError
+    str #=> "hello"
+  end
+}
+
+# yield/move should not make moved object when the yield is not succeeded
+assert_equal '"str"', %q{
+  R = Ractor.new{}
+  M = Ractor.current
+  r = Ractor.new do
+    s = 'str'
+    selected_r, v = Ractor.select R, yield_value: s, move: true
+    raise if selected_r != R # taken from R
+    M.send s.inspect # s should not be a moved object
+  end
+
+  Ractor.receive
+}
+
+# yield/move can fail
+assert_equal "allocator undefined for Thread", %q{
+  r = Ractor.new do
+    obj = Thread.new{}
+    Ractor.yield obj
+  rescue => e
+    e.message
+  end
+  r.take
+}
+
+# Access to global-variables are prohibited
+assert_equal 'can not access global variables $gv from non-main Ractors', %q{
+  $gv = 1
+  r = Ractor.new do
+    $gv
+  end
+
+  begin
+    r.take
+  rescue Ractor::RemoteError => e
+    e.cause.message
+  end
+}
+
+# Access to global-variables are prohibited
+assert_equal 'can not access global variables $gv from non-main Ractors', %q{
+  r = Ractor.new do
+    $gv = 1
+  end
+
+  begin
+    r.take
+  rescue Ractor::RemoteError => e
+    e.cause.message
+  end
+}
+
+# $stdin,out,err is Ractor local, but shared fds
+assert_equal 'ok', %q{
+  r = Ractor.new do
+    [$stdin, $stdout, $stderr].map{|io|
+      [io.object_id, io.fileno]
+    }
+  end
+
+  [$stdin, $stdout, $stderr].zip(r.take){|io, (oid, fno)|
+    raise "should not be different object" if io.object_id == oid
+    raise "fd should be same" unless io.fileno == fno
+  }
+  'ok'
+}
+
+# $stdin,out,err belong to Ractor
+assert_equal 'ok', %q{
+  r = Ractor.new do
+    $stdin.itself
+    $stdout.itself
+    $stderr.itself
+    'ok'
+  end
+
+  r.take
+}
+
+# $DEBUG, $VERBOSE are Ractor local
+assert_equal 'true', %q{
+  $DEBUG = true
+  $VERBOSE = true
+
+  def ractor_local_globals
+    /a(b)(c)d/ =~ 'abcd' # for $~
+    `echo foo` unless  /solaris/ =~ RUBY_PLATFORM
+
+    {
+     # ractor-local (derived from created ractor): debug
+     '$DEBUG' => $DEBUG,
+     '$-d' => $-d,
+
+     # ractor-local (derived from created ractor): verbose
+     '$VERBOSE' => $VERBOSE,
+     '$-w' => $-w,
+     '$-W' => $-W,
+     '$-v' => $-v,
+
+     # process-local (readonly): other commandline parameters
+     '$-p' => $-p,
+     '$-l' => $-l,
+     '$-a' => $-a,
+
+     # process-local (readonly): getpid
+     '$$'  => $$,
+
+     # thread local: process result
+     '$?'  => $?,
+
+     # scope local: match
+     '$~'  => $~.inspect,
+     '$&'  => $&,
+     '$`'  => $`,
+     '$\''  => $',
+     '$+'  => $+,
+     '$1'  => $1,
+
+     # scope local: last line
+     '$_' => $_,
+
+     # scope local: last backtrace
+     '$@' => $@,
+     '$!' => $!,
+
+     # ractor local: stdin, out, err
+     '$stdin'  => $stdin.inspect,
+     '$stdout' => $stdout.inspect,
+     '$stderr' => $stderr.inspect,
+    }
+  end
+
+  h = Ractor.new do
+    ractor_local_globals
+  end.take
+  ractor_local_globals == h #=> true
+}
+
+# selfs are different objects
+assert_equal 'false', %q{
+  r = Ractor.new do
+    self.object_id
+  end
+  r.take == self.object_id #=> false
+}
+
+# self is a Ractor instance
+assert_equal 'true', %q{
+  r = Ractor.new do
+    self.object_id
+  end
+  r.object_id == r.take #=> true
+}
+
+# given block Proc will be isolated, so can not access outer variables.
+assert_equal 'ArgumentError', %q{
+  begin
+    a = true
+    r = Ractor.new do
+      a
+    end
+  rescue => e
+    e.class
+  end
+}
+
+# ivar in shareable-objects are not allowed to access from non-main Ractor
+assert_equal 'can not access instance variables of classes/modules from non-main Ractors', %q{
+  class C
+    @iv = 'str'
+  end
+
+  r = Ractor.new do
+    class C
+      p @iv
+    end
+  end
+
+
+  begin
+    r.take
+  rescue Ractor::RemoteError => e
+    e.cause.message
+  end
+}
+
+# ivar in shareable-objects are not allowed to access from non-main Ractor
+assert_equal 'can not access instance variables of shareable objects from non-main Ractors', %q{
+  shared = Ractor.new{}
+  shared.instance_variable_set(:@iv, 'str')
+
+  r = Ractor.new shared do |shared|
+    p shared.instance_variable_get(:@iv)
+  end
+
+  begin
+    r.take
+  rescue Ractor::RemoteError => e
+    e.cause.message
+  end
+}
+
+# ivar in shareable-objects are not allowed to access from non-main Ractor, by @iv (get)
+assert_equal 'can not access instance variables of shareable objects from non-main Ractors', %q{
+  class Ractor
+    def setup
+      @foo = ''
+    end
+
+    def foo
+      @foo
+    end
+  end
+
+  shared = Ractor.new{}
+  shared.setup
+
+  r = Ractor.new shared do |shared|
+    p shared.foo
+  end
+
+  begin
+    r.take
+  rescue Ractor::RemoteError => e
+    e.cause.message
+  end
+}
+
+# ivar in shareable-objects are not allowed to access from non-main Ractor, by @iv (set)
+assert_equal 'can not access instance variables of shareable objects from non-main Ractors', %q{
+  class Ractor
+    def setup
+      @foo = ''
+    end
+  end
+
+  shared = Ractor.new{}
+
+  r = Ractor.new shared do |shared|
+    p shared.setup
+  end
+
+  begin
+    r.take
+  rescue Ractor::RemoteError => e
+    e.cause.message
+  end
+}
+
+# But a shareable object is frozen, it is allowed to access ivars from non-main Ractor
+assert_equal '11', %q{
+  [Object.new, [], ].map{|obj|
+    obj.instance_variable_set('@a', 1)
+    Ractor.make_shareable obj = obj.freeze
+
+    Ractor.new obj do |obj|
+      obj.instance_variable_get('@a')
+    end.take.to_s
+  }.join
+}
+
+# cvar in shareable-objects are not allowed to access from non-main Ractor
+assert_equal 'can not access class variables from non-main Ractors', %q{
+  class C
+    @@cv = 'str'
+  end
+
+  r = Ractor.new do
+    class C
+      p @@cv
+    end
+  end
+
+  begin
+    r.take
+  rescue Ractor::RemoteError => e
+    e.cause.message
+  end
+}
+
+# Getting non-shareable objects via constants by other Ractors is not allowed
+assert_equal 'can not access non-shareable objects in constant C::CONST by non-main Ractor.', %q{
+  class C
+    CONST = 'str'
+  end
+  r = Ractor.new do
+    C::CONST
+  end
+  begin
+    r.take
+  rescue Ractor::RemoteError => e
+    e.cause.message
+  end
+}
+
+# Constant cache should care about non-sharable constants
+assert_equal "can not access non-shareable objects in constant Object::STR by non-main Ractor.", %q{
+  STR = "hello"
+  def str; STR; end
+  s = str() # fill const cache
+  begin
+    Ractor.new{ str() }.take
+  rescue Ractor::RemoteError => e
+    e.cause.message
+  end
+}
+
+# Setting non-shareable objects into constants by other Ractors is not allowed
+assert_equal 'can not set constants with non-shareable objects by non-main Ractors', %q{
+  class C
+  end
+  r = Ractor.new do
+    C::CONST = 'str'
+  end
+  begin
+    r.take
+  rescue Ractor::RemoteError => e
+    e.cause.message
+  end
+}
+
+# define_method is not allowed
+assert_equal "defined in a different Ractor", %q{
+  str = "foo"
+  define_method(:buggy){|i| str << "#{i}"}
+  begin
+    Ractor.new{buggy(10)}.take
+  rescue => e
+    e.cause.message
+  end
+}
+
+# Immutable Array and Hash are shareable, so it can be shared with constants
+assert_equal '[1000, 3]', %q{
+  A = Array.new(1000).freeze # [nil, ...]
+  H = {a: 1, b: 2, c: 3}.freeze
+
+  Ractor.new{ [A.size, H.size] }.take
+}
+
+# Ractor.count
+assert_equal '[1, 4, 3, 2, 1]', %q{
+  counts = []
+  counts << Ractor.count
+  ractors = (1..3).map { Ractor.new { Ractor.receive } }
+  counts << Ractor.count
+
+  ractors[0].send('End 0').take
+  sleep 0.1 until ractors[0].inspect =~ /terminated/
+  counts << Ractor.count
+
+  ractors[1].send('End 1').take
+  sleep 0.1 until ractors[1].inspect =~ /terminated/
+  counts << Ractor.count
+
+  ractors[2].send('End 2').take
+  sleep 0.1 until ractors[2].inspect =~ /terminated/
+  counts << Ractor.count
+
+  counts.inspect
+}
+
+# ObjectSpace.each_object can not handle unshareable objects with Ractors
+assert_equal '0', %q{
+  Ractor.new{
+    n = 0
+    ObjectSpace.each_object{|o| n += 1 unless Ractor.shareable?(o)}
+    n
+  }.take
+}
+
+# ObjectSpace._id2ref can not handle unshareable objects with Ractors
+assert_equal 'ok', %q{
+  s = 'hello'
+
+  Ractor.new s.object_id do |id ;s|
+    begin
+      s = ObjectSpace._id2ref(id)
+    rescue => e
+      :ok
+    end
+  end.take
+}
+
+# Ractor.make_shareable(obj)
+assert_equal 'true', %q{
+  class C
+    def initialize
+      @a = 'foo'
+      @b = 'bar'
+    end
+
+    def freeze
+      @c = [:freeze_called]
+      super
+    end
+
+    attr_reader :a, :b, :c
+  end
+  S = Struct.new(:s1, :s2)
+  str = "hello"
+  str.instance_variable_set("@iv", "hello")
+  /a/ =~ 'a'
+  m = $~
+  class N < Numeric
+    def /(other)
+      1
+    end
+  end
+  ary = []; ary << ary
+
+  a = [[1, ['2', '3']],
+       {Object.new => "hello"},
+       C.new,
+       S.new("x", "y"),
+       ("a".."b"),
+       str,
+       ary,             # cycle
+       /regexp/,
+       /#{'r'.upcase}/,
+       m,
+       Complex(N.new,0),
+       Rational(N.new,0),
+       true,
+       false,
+       nil,
+       1, 1.2, 1+3r, 1+4i, # Numeric
+  ]
+  Ractor.make_shareable(a)
+
+  # check all frozen
+  a.each{|o|
+    raise o.inspect unless o.frozen?
+
+    case o
+    when C
+      raise o.a.inspect unless o.a.frozen?
+      raise o.b.inspect unless o.b.frozen?
+      raise o.c.inspect unless o.c.frozen? && o.c == [:freeze_called]
+    when Rational
+      raise o.numerator.inspect unless o.numerator.frozen?
+    when Complex
+      raise o.real.inspect unless o.real.frozen?
+    when Array
+      if o[0] == 1
+        raise o[1][1].inspect unless o[1][1].frozen?
+      end
+    when Hash
+      o.each{|k, v|
+        raise k.inspect unless k.frozen?
+        raise v.inspect unless v.frozen?
+      }
+    end
+  }
+
+  Ractor.shareable?(a)
+}
+
+# Ractor.make_shareable(obj) doesn't freeze shareable objects
+assert_equal 'true', %q{
+  r = Ractor.new{}
+  Ractor.make_shareable(a = [r])
+  [a.frozen?, a[0].frozen?] == [true, false]
+}
+
+# Ractor.make_shareable(a_proc) makes a proc shareable.
+assert_equal 'true', %q{
+  a = [1, [2, 3], {a: "4"}]
+  pr = Proc.new do
+    a
+  end
+  Ractor.make_shareable(a) # referred value should be shareable
+  Ractor.make_shareable(pr)
+  Ractor.shareable?(pr)
+}
+
+# Ractor.shareable?(recursive_objects)
+assert_equal '[false, false]', %q{
+  y = []
+  x = [y, {}].freeze
+  y << x
+  y.freeze
+  [Ractor.shareable?(x), Ractor.shareable?(y)]
+}
+
+# Ractor.make_shareable(recursive_objects)
+assert_equal '[:ok, false, false]', %q{
+  o = Object.new
+  def o.freeze; raise; end
+  y = []
+  x = [y, o].freeze
+  y << x
+  y.freeze
+  [(Ractor.make_shareable(x) rescue :ok), Ractor.shareable?(x), Ractor.shareable?(y)]
+}
+
+# Ractor.make_shareable with Class/Module
+assert_equal '[C, M]', %q{
+  class C; end
+  module M; end
+
+  Ractor.make_shareable(ary = [C, M])
+}
+
+# define_method() can invoke different Ractor's proc if the proc is shareable.
+assert_equal '1', %q{
+  class C
+    a = 1
+    define_method "foo", Ractor.make_shareable(Proc.new{ a })
+    a = 2
+  end
+
+  Ractor.new{ C.new.foo }.take
+}
+
+# Ractor.make_shareable(a_proc) makes a proc shareable.
+assert_equal 'can not make a Proc shareable because it accesses outer variables (a).', %q{
+  a = b = nil
+  pr = Proc.new do
+    c = b # assign to a is okay because c is block local variable
+          # reading b is okay
+    a = b # assign to a is not allowed #=> Ractor::Error
+  end
+
+  begin
+    Ractor.make_shareable(pr)
+  rescue => e
+    e.message
+  end
+}
+
+# Ractor.make_shareable(obj, copy: true) makes copied shareable object.
+assert_equal '[false, false, true, true]', %q{
+  r = []
+  o1 = [1, 2, ["3"]]
+
+  o2 = Ractor.make_shareable(o1, copy: true)
+  r << Ractor.shareable?(o1) # false
+  r << (o1.object_id == o2.object_id) # false
+
+  o3 = Ractor.make_shareable(o1)
+  r << Ractor.shareable?(o1) # true
+  r << (o1.object_id == o3.object_id) # false
+  r
+}
+
+# TracePoint with normal Proc should be Ractor local
+assert_equal '[4, 8]', %q{
+  rs = []
+  TracePoint.new(:line){|tp| rs << tp.lineno if tp.path == __FILE__}.enable do
+    Ractor.new{ # line 4
+      a = 1
+      b = 2
+    }.take
+    c = 3       # line 8
+  end
+  rs
+}
+
+# Ractor deep copies frozen objects (ary)
+assert_equal '[true, false]', %q{
+  Ractor.new([[]].freeze) { |ary|
+    [ary.frozen?, ary.first.frozen? ]
+  }.take
+}
+
+# Ractor deep copies frozen objects (str)
+assert_equal '[true, false]', %q{
+  s = String.new.instance_eval { @x = []; freeze}
+  Ractor.new(s) { |s|
+    [s.frozen?, s.instance_variable_get(:@x).frozen?]
+  }.take
+}
+
+# Can not trap with not isolated Proc on non-main ractor
+assert_equal '[:ok, :ok]', %q{
+  a = []
+  Ractor.new{
+    trap(:INT){p :ok}
+  }.take
+  a << :ok
+
+  begin
+    Ractor.new{
+      s = 'str'
+      trap(:INT){p s}
+    }.take
+  rescue => Ractor::RemoteError
+    a << :ok
+  end
+}
+
+# Ractor-local storage
+assert_equal '[nil, "b", "a"]', %q{
+  ans = []
+  Ractor.current[:key] = 'a'
+  r = Ractor.new{
+    Ractor.yield self[:key]
+    self[:key] = 'b'
+    self[:key]
+  }
+  ans << r.take
+  ans << r.take
+  ans << Ractor.current[:key]
+}
+
+###
+### Synchronization tests
+###
+
+N = 100_000
+
+# fstring pool
+assert_equal "#{N}#{N}", %Q{
+  N = #{N}
+  2.times.map{
+    Ractor.new{
+      N.times{|i| -(i.to_s)}
+    }
+  }.map{|r| r.take}.join
+}
+
+# enc_table
+assert_equal "#{N/10}", %Q{
+  Ractor.new do
+    loop do
+      Encoding.find("test-enc-#{rand(5_000)}").inspect
+    rescue ArgumentError => e
+    end
+  end
+
+  src = Encoding.find("UTF-8")
+  #{N/10}.times{|i|
+    src.replicate("test-enc-\#{i}")
+  }
+}
+
+# Generic ivtbl
+n = N/2
+assert_equal "#{n}#{n}", %Q{
+  2.times.map{
+    Ractor.new do
+      #{n}.times do
+        obj = ''
+        obj.instance_variable_set("@a", 1)
+        obj.instance_variable_set("@b", 1)
+        obj.instance_variable_set("@c", 1)
+        obj.instance_variable_defined?("@a")
+      end
+    end
+  }.map{|r| r.take}.join
+}
+
+# NameError
+assert_equal "ok", %q{
+  begin
+    bar
+  rescue => err
+  end
+  begin
+    Ractor.new{} << err
+  rescue TypeError
+    'ok'
+  end
+}
+
+# Can yield back values while GC is sweeping [Bug #18117]
+assert_equal "ok", %q{
+  workers = (0...8).map do
+    Ractor.new do
+      loop do
+        10_000.times.map { Object.new }
+        Ractor.yield Time.now
+      end
+    end
+  end
+
+  1_000.times { idle_worker, tmp_reporter = Ractor.select(*workers) }
+  "ok"
+}
+
+end # if !ENV['GITHUB_WORKFLOW']
diff --git a/bootstraptest/test_syntax.rb b/bootstraptest/test_syntax.rb
index a111990a1f..fa27bf2aeb 100644
--- a/bootstraptest/test_syntax.rb
+++ b/bootstraptest/test_syntax.rb
@@ -268,8 +268,10 @@ assert_equal %q{}, %q{
   defined?(@@a)
 }
 assert_equal %q{class variable}, %q{
-  @@a = 1
-  defined?(@@a)
+  class A
+    @@a = 1
+    defined?(@@a)
+  end
 }
 assert_equal %q{}, %q{
   defined?($a)
diff --git a/bootstraptest/test_thread.rb b/bootstraptest/test_thread.rb
index 747b6b88f7..38a55ff229 100644
--- a/bootstraptest/test_thread.rb
+++ b/bootstraptest/test_thread.rb
@@ -1,4 +1,14 @@
-# Thread and Fiber
+show_limit %q{
+  threads = []
+  begin
+    threads << Thread.new{sleep}
+
+    raise Exception, "skipping" if threads.count >= 10_000
+  rescue Exception => error
+    puts "Thread count: #{threads.count} (#{error})"
+    break
+  end while true
+} if false # disable to pass CI
 
 assert_equal %q{ok}, %q{
   Thread.new{
@@ -36,7 +46,7 @@ begin
     }
   }
 rescue ThreadError => e
-  :ok if /can't create Thread/ =~ e.message
+  /can't create Thread/ =~ e.message ? :ok : e.message
 end
 }
 assert_equal %q{ok}, %q{
@@ -50,7 +60,7 @@ begin
     }
   }
 rescue ThreadError => e
-  :ok if /can't create Thread/ =~ e.message
+  /can't create Thread/ =~ e.message ? :ok : e.message
 end
 }
 assert_equal %q{ok}, %q{
@@ -299,10 +309,6 @@ assert_equal 'ok', %q{
 }, '[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]'
@@ -328,10 +334,6 @@ assert_normal_exit %q{
 }, '[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]'
 
@@ -347,7 +349,7 @@ assert_equal 'ok', %q{
 
 assert_equal 'ok', %q{
   begin
-    m1, m2 = Mutex.new, Mutex.new
+    m1, m2 = Thread::Mutex.new, Thread::Mutex.new
     f1 = f2 = false
     Thread.new { m1.lock; f2 = true; sleep 0.001 until f1; m2.lock }
     m2.lock; f1 = true; sleep 0.001 until f2; m1.lock
@@ -358,32 +360,32 @@ assert_equal 'ok', %q{
 }
 
 assert_equal 'ok', %q{
-  m = Mutex.new
+  m = Thread::Mutex.new
   Thread.new { m.lock }; sleep 0.1; m.lock
   :ok
 }
 
 assert_equal 'ok', %q{
-  m = Mutex.new
+  m = Thread::Mutex.new
   Thread.new { m.lock }; m.lock
   :ok
 }
 
 assert_equal 'ok', %q{
-  m = Mutex.new
+  m = Thread::Mutex.new
   Thread.new { m.lock }.join; m.lock
   :ok
 }
 
 assert_equal 'ok', %q{
-  m = Mutex.new
+  m = Thread::Mutex.new
   Thread.new { m.lock; sleep 0.2 }
   sleep 0.1; m.lock
   :ok
 }
 
 assert_equal 'ok', %q{
-  m = Mutex.new
+  m = Thread::Mutex.new
   Thread.new { m.lock; sleep 0.2; m.unlock }
   sleep 0.1; m.lock
   :ok
@@ -409,7 +411,7 @@ assert_equal 'ok', %{
   open("zzz.rb", "w") do |f|
     f.puts <<-'end;' # do
       begin
-        m = Mutex.new
+        m = Thread::Mutex.new
         parent = Thread.current
         th1 = Thread.new { m.lock; sleep }
         sleep 0.01 until th1.stop?
@@ -437,8 +439,8 @@ assert_equal 'ok', %{
 assert_finish 3, %q{
   require 'thread'
 
-  lock = Mutex.new
-  cond = ConditionVariable.new
+  lock = Thread::Mutex.new
+  cond = Thread::ConditionVariable.new
   t = Thread.new do
     lock.synchronize do
       cond.wait(lock)
@@ -482,3 +484,17 @@ assert_equal 'foo', %q{
   GC.start
   f.call.source
 }
+assert_normal_exit %q{
+  class C
+    def inspect
+      sleep 0.5
+      'C!!'
+    end
+  end
+  Thread.new{
+    loop{
+      p C.new
+    }
+  }
+  sleep 0.1
+}, timeout: 5
diff --git a/builtin.c b/builtin.c
new file mode 100644
index 0000000000..7c3653dab7
--- /dev/null
+++ b/builtin.c
@@ -0,0 +1,69 @@
+#include "internal.h"
+#include "vm_core.h"
+#include "iseq.h"
+#include "builtin.h"
+
+#if CROSS_COMPILING
+
+#define INCLUDED_BY_BUILTIN_C 1
+#include "mini_builtin.c"
+
+#else
+
+#include "builtin_binary.inc"
+
+static const unsigned char *
+bin4feature(const struct builtin_binary *bb, const char *feature, size_t *psize)
+{
+    *psize = bb->bin_size;
+    return strcmp(bb->feature, feature) ? NULL : bb->bin;
+}
+
+static const unsigned char*
+builtin_lookup(const char *feature, size_t *psize)
+{
+    static int index = 0;
+    const unsigned char *bin = bin4feature(&builtin_binary[index++], feature, psize);
+
+    // usually, `builtin_binary` order is loading order at miniruby.
+    for (const struct builtin_binary *bb = &builtin_binary[0]; bb->feature &&! bin; bb++) {
+        bin = bin4feature(bb++, feature, psize);
+    }
+    return bin;
+}
+
+void
+rb_load_with_builtin_functions(const char *feature_name, const struct rb_builtin_function *table)
+{
+    // search binary
+    size_t size;
+    const unsigned char *bin = builtin_lookup(feature_name, &size);
+    if (! bin) {
+        rb_bug("builtin_lookup: can not find %s\n", feature_name);
+    }
+
+    // load binary
+    rb_vm_t *vm = GET_VM();
+    if (vm->builtin_function_table != NULL) rb_bug("vm->builtin_function_table should be NULL.");
+    vm->builtin_function_table = table;
+    vm->builtin_inline_index = 0;
+    const rb_iseq_t *iseq = rb_iseq_ibf_load_bytes((const char *)bin, size);
+    vm->builtin_function_table = NULL;
+
+    // exec
+    rb_iseq_eval(rb_iseq_check(iseq));
+}
+
+#endif
+
+void
+Init_builtin(void)
+{
+    // nothing
+}
+
+void
+Init_builtin_features(void)
+{
+    rb_load_with_builtin_functions("gem_prelude", NULL);
+}
diff --git a/builtin.h b/builtin.h
new file mode 100644
index 0000000000..3b2f477654
--- /dev/null
+++ b/builtin.h
@@ -0,0 +1,83 @@
+#ifndef BUILTIN_H_INCLUDED
+#define BUILTIN_H_INCLUDED
+
+// invoke
+
+struct rb_builtin_function {
+    // for invocation
+    const void * const func_ptr;
+    const int argc;
+
+    // for load
+    const int index;
+    const char * const name;
+
+    // for jit
+    void (*compiler)(FILE *, long, unsigned, bool);
+};
+
+#define RB_BUILTIN_FUNCTION(_i, _name, _fname, _arity, _compiler) {\
+  .name = #_name, \
+  .func_ptr = (void *)_fname, \
+  .argc = _arity, \
+  .index = _i, \
+  .compiler = _compiler, \
+}
+
+void rb_load_with_builtin_functions(const char *feature_name, const struct rb_builtin_function *table);
+
+#ifndef rb_execution_context_t
+typedef struct rb_execution_context_struct rb_execution_context_t;
+#define rb_execution_context_t rb_execution_context_t
+#endif
+
+/* The following code is generated by the following Ruby script:
+
+16.times{|i|
+  args = (i > 0 ? ', ' : '') + (0...i).map{"VALUE"}.join(', ')
+  puts "static inline void rb_builtin_function_check_arity#{i}(VALUE (*f)(rb_execution_context_t *ec, VALUE self#{args})){}"
+}
+*/
+
+static inline void rb_builtin_function_check_arity0(VALUE (*f)(rb_execution_context_t *ec, VALUE self)){}
+static inline void rb_builtin_function_check_arity1(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE)){}
+static inline void rb_builtin_function_check_arity2(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE, VALUE)){}
+static inline void rb_builtin_function_check_arity3(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE, VALUE, VALUE)){}
+static inline void rb_builtin_function_check_arity4(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE, VALUE, VALUE, VALUE)){}
+static inline void rb_builtin_function_check_arity5(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE, VALUE, VALUE, VALUE, VALUE)){}
+static inline void rb_builtin_function_check_arity6(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)){}
+static inline void rb_builtin_function_check_arity7(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)){}
+static inline void rb_builtin_function_check_arity8(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)){}
+static inline void rb_builtin_function_check_arity9(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)){}
+static inline void rb_builtin_function_check_arity10(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)){}
+static inline void rb_builtin_function_check_arity11(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)){}
+static inline void rb_builtin_function_check_arity12(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)){}
+static inline void rb_builtin_function_check_arity13(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)){}
+static inline void rb_builtin_function_check_arity14(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)){}
+static inline void rb_builtin_function_check_arity15(VALUE (*f)(rb_execution_context_t *ec, VALUE self, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)){}
+
+VALUE rb_vm_lvar_exposed(rb_execution_context_t *ec, int index);
+
+// __builtin_inline!
+
+PUREFUNC(static inline VALUE rb_vm_lvar(rb_execution_context_t *ec, int index));
+
+static inline VALUE
+rb_vm_lvar(rb_execution_context_t *ec, int index)
+{
+#if VM_CORE_H_EC_DEFINED
+    return ec->cfp->ep[index];
+#else
+    return rb_vm_lvar_exposed(ec, index);
+#endif
+}
+
+// dump/load
+
+struct builtin_binary {
+    const char *feature;          // feature name
+    const unsigned char *bin;     // binary by ISeq#to_binary
+    size_t bin_size;
+};
+
+#endif // BUILTIN_H_INCLUDED
diff --git a/ccan/list/list.h b/ccan/list/list.h
index ca9f9f1f7f..7d219307bc 100644
--- a/ccan/list/list.h
+++ b/ccan/list/list.h
@@ -57,7 +57,7 @@ struct list_head
  * Example:
  *	static struct list_head my_list = LIST_HEAD_INIT(my_list);
  */
-#define LIST_HEAD_INIT(name) { { &name.n, &name.n } }
+#define LIST_HEAD_INIT(name) { { &(name).n, &(name).n } }
 
 /**
  * LIST_HEAD - define and initialize an empty list_head
@@ -238,6 +238,21 @@ static inline int list_empty_nodebug(const struct list_head *h)
 #endif
 
 /**
+ * list_empty_nocheck - is a list empty?
+ * @h: the list_head
+ *
+ * If the list is empty, returns true. This doesn't perform any
+ * debug check for list consistency, so it can be called without
+ * locks, racing with the list being modified. This is ok for
+ * checks where an incorrect result is not an issue (optimized
+ * bail out path for example).
+ */
+static inline bool list_empty_nocheck(const struct list_head *h)
+{
+	return h->n.next == &h->n;
+}
+
+/**
  * list_del - delete an entry from an (unknown) linked list.
  * @n: the list_node to delete from the list.
  *
@@ -639,7 +654,7 @@ static inline void list_prepend_list_(struct list_head *to,
 /**
  * list_for_each_off - iterate through a list of memory regions.
  * @h: the list_head
- * @i: the pointer to a memory region wich contains list node data.
+ * @i: the pointer to a memory region which contains list node data.
  * @off: offset(relative to @i) at which list node data resides.
  *
  * This is a low-level wrapper to iterate @i over the entire list, used to
@@ -647,12 +662,12 @@ static inline void list_prepend_list_(struct list_head *to,
  * so you can break and continue as normal.
  *
  * WARNING! Being the low-level macro that it is, this wrapper doesn't know
- * nor care about the type of @i. The only assumtion made is that @i points
+ * nor care about the type of @i. The only assumption made is that @i points
  * to a chunk of memory that at some @offset, relative to @i, contains a
- * properly filled `struct node_list' which in turn contains pointers to
- * memory chunks and it's turtles all the way down. Whith all that in mind
+ * properly filled `struct list_node' which in turn contains pointers to
+ * memory chunks and it's turtles all the way down. With all that in mind
  * remember that given the wrong pointer/offset couple this macro will
- * happilly churn all you memory untill SEGFAULT stops it, in other words
+ * happily churn all you memory until SEGFAULT stops it, in other words
  * caveat emptor.
  *
  * It is worth mentioning that one of legitimate use-cases for that wrapper
@@ -671,7 +686,7 @@ static inline void list_prepend_list_(struct list_head *to,
 /**
  * list_for_each_rev_off - iterate through a list of memory regions backwards
  * @h: the list_head
- * @i: the pointer to a memory region wich contains list node data.
+ * @i: the pointer to a memory region which contains list node data.
  * @off: offset(relative to @i) at which list node data resides.
  *
  * See list_for_each_off for details
@@ -683,7 +698,7 @@ static inline void list_prepend_list_(struct list_head *to,
  * list_for_each_safe_off - iterate through a list of memory regions, maybe
  * during deletion
  * @h: the list_head
- * @i: the pointer to a memory region wich contains list node data.
+ * @i: the pointer to a memory region which contains list node data.
  * @nxt: the structure containing the list_node
  * @off: offset(relative to @i) at which list node data resides.
  *
@@ -702,7 +717,7 @@ static inline void list_prepend_list_(struct list_head *to,
  * list_for_each_rev_safe_off - iterate backwards through a list of
  * memory regions, maybe during deletion
  * @h: the list_head
- * @i: the pointer to a memory region wich contains list node data.
+ * @i: the pointer to a memory region which contains list node data.
  * @nxt: the structure containing the list_node
  * @off: offset(relative to @i) at which list node data resides.
  *
diff --git a/class.c b/class.c
index 6b818a326f..682a21d488 100644
--- a/class.c
+++ b/class.c
@@ -23,15 +23,27 @@
  * \{
  */
 
+#include "ruby/internal/config.h"
+#include <ctype.h>
+
+#include "gc.h"
+#include "constant.h"
+#include "id_table.h"
 #include "internal.h"
+#include "internal/class.h"
+#include "internal/eval.h"
+#include "internal/hash.h"
+#include "internal/object.h"
+#include "internal/string.h"
+#include "internal/variable.h"
 #include "ruby/st.h"
-#include "constant.h"
 #include "vm_core.h"
-#include "id_table.h"
-#include <ctype.h>
 
 #define id_attached id__attached__
 
+#define METACLASS_OF(k) RBASIC(k)->klass
+#define SET_METACLASS_OF(k, cls) RBASIC_SET_CLASS(k, cls)
+
 void
 rb_class_subclass_add(VALUE super, VALUE klass)
 {
@@ -176,7 +188,7 @@ class_alloc(VALUE flags, VALUE klass)
      */
     RCLASS_SET_ORIGIN((VALUE)obj, (VALUE)obj);
     RCLASS_SERIAL(obj) = rb_next_class_serial();
-    RCLASS_REFINED_CLASS(obj) = Qnil;
+    RB_OBJ_WRITE(obj, &RCLASS_REFINED_CLASS(obj), Qnil);
     RCLASS_EXT(obj)->allocator = 0;
 
     return (VALUE)obj;
@@ -205,7 +217,6 @@ rb_class_boot(VALUE super)
     RCLASS_SET_SUPER(klass, super);
     RCLASS_M_TBL_INIT(klass);
 
-    OBJ_INFECT(klass, super);
     return (VALUE)klass;
 }
 
@@ -220,7 +231,7 @@ void
 rb_check_inheritable(VALUE super)
 {
     if (!RB_TYPE_P(super, T_CLASS)) {
-	rb_raise(rb_eTypeError, "superclass must be a Class (%"PRIsVALUE" given)",
+        rb_raise(rb_eTypeError, "superclass must be an instance of Class (given an instance of %"PRIsVALUE")",
 		 rb_obj_class(super));
     }
     if (RBASIC(super)->flags & FL_SINGLETON) {
@@ -309,20 +320,9 @@ class_init_copy_check(VALUE clone, VALUE orig)
     }
 }
 
-/* :nodoc: */
-VALUE
-rb_mod_init_copy(VALUE clone, VALUE orig)
+static void
+copy_tables(VALUE clone, VALUE orig)
 {
-    if (RB_TYPE_P(clone, T_CLASS)) {
-	class_init_copy_check(clone, orig);
-    }
-    if (!OBJ_INIT_COPY(clone, orig)) return clone;
-    if (!FL_TEST(CLASS_OF(clone), FL_SINGLETON)) {
-	RBASIC_SET_CLASS(clone, rb_singleton_class_clone(orig));
-	rb_singleton_class_attached(RBASIC(clone)->klass, (VALUE)clone);
-    }
-    RCLASS_SET_SUPER(clone, RCLASS_SUPER(orig));
-    RCLASS_EXT(clone)->allocator = RCLASS_EXT(orig)->allocator;
     if (RCLASS_IV_TBL(clone)) {
 	st_free_table(RCLASS_IV_TBL(clone));
 	RCLASS_IV_TBL(clone) = 0;
@@ -335,7 +335,7 @@ rb_mod_init_copy(VALUE clone, VALUE orig)
     if (RCLASS_IV_TBL(orig)) {
 	st_data_t id;
 
-	RCLASS_IV_TBL(clone) = rb_st_copy(clone, RCLASS_IV_TBL(orig));
+	rb_iv_tbl_copy(clone, orig);
 	CONST_ID(id, "__tmp_classpath__");
 	st_delete(RCLASS_IV_TBL(clone), &id, 0);
 	CONST_ID(id, "__classpath__");
@@ -350,6 +350,31 @@ rb_mod_init_copy(VALUE clone, VALUE orig)
 	arg.klass = clone;
 	rb_id_table_foreach(RCLASS_CONST_TBL(orig), clone_const_i, &arg);
     }
+}
+
+static void ensure_origin(VALUE klass);
+
+/* :nodoc: */
+VALUE
+rb_mod_init_copy(VALUE clone, VALUE orig)
+{
+    if (RB_TYPE_P(clone, T_CLASS)) {
+        class_init_copy_check(clone, orig);
+    }
+    if (!OBJ_INIT_COPY(clone, orig)) return clone;
+
+    /* cloned flag is refer at constant inline cache
+     * see vm_get_const_key_cref() in vm_insnhelper.c
+     */
+    FL_SET(clone, RCLASS_CLONED);
+    FL_SET(orig , RCLASS_CLONED);
+
+    if (!FL_TEST(CLASS_OF(clone), FL_SINGLETON)) {
+        RBASIC_SET_CLASS(clone, rb_singleton_class_clone(orig));
+        rb_singleton_class_attached(RBASIC(clone)->klass, (VALUE)clone);
+    }
+    RCLASS_EXT(clone)->allocator = RCLASS_EXT(orig)->allocator;
+    copy_tables(clone, orig);
     if (RCLASS_M_TBL(orig)) {
 	struct clone_method_arg arg;
 	arg.old_klass = orig;
@@ -358,6 +383,75 @@ rb_mod_init_copy(VALUE clone, VALUE orig)
 	rb_id_table_foreach(RCLASS_M_TBL(orig), clone_method_i, &arg);
     }
 
+    if (RCLASS_ORIGIN(orig) == orig) {
+        RCLASS_SET_SUPER(clone, RCLASS_SUPER(orig));
+    }
+    else {
+        VALUE p = RCLASS_SUPER(orig);
+        VALUE orig_origin = RCLASS_ORIGIN(orig);
+        VALUE prev_clone_p = clone;
+        VALUE origin_stack = rb_ary_tmp_new(2);
+        VALUE origin[2];
+        VALUE clone_p = 0;
+        long origin_len;
+        int add_subclass;
+        VALUE clone_origin;
+
+        ensure_origin(clone);
+        clone_origin = RCLASS_ORIGIN(clone);
+
+        while (p && p != orig_origin) {
+            if (BUILTIN_TYPE(p) != T_ICLASS) {
+                rb_bug("non iclass between module/class and origin");
+            }
+            clone_p = class_alloc(RBASIC(p)->flags, RBASIC(p)->klass);
+            RCLASS_SET_SUPER(prev_clone_p, clone_p);
+            prev_clone_p = clone_p;
+            RCLASS_M_TBL(clone_p) = RCLASS_M_TBL(p);
+            RCLASS_CONST_TBL(clone_p) = RCLASS_CONST_TBL(p);
+            RCLASS_IV_TBL(clone_p) = RCLASS_IV_TBL(p);
+            RCLASS_EXT(clone_p)->allocator = RCLASS_EXT(p)->allocator;
+            if (RB_TYPE_P(clone, T_CLASS)) {
+                RCLASS_SET_INCLUDER(clone_p, clone);
+            }
+            add_subclass = TRUE;
+            if (p != RCLASS_ORIGIN(p)) {
+                origin[0] = clone_p;
+                origin[1] = RCLASS_ORIGIN(p);
+                rb_ary_cat(origin_stack, origin, 2);
+            }
+            else if ((origin_len = RARRAY_LEN(origin_stack)) > 1 &&
+                     RARRAY_AREF(origin_stack, origin_len - 1) == p) {
+                RCLASS_SET_ORIGIN(RARRAY_AREF(origin_stack, (origin_len -= 2)), clone_p);
+                RICLASS_SET_ORIGIN_SHARED_MTBL(clone_p);
+                rb_ary_resize(origin_stack, origin_len);
+                add_subclass = FALSE;
+            }
+            if (add_subclass) {
+                rb_module_add_to_subclasses_list(RBASIC(p)->klass, clone_p);
+            }
+            p = RCLASS_SUPER(p);
+        }
+
+        if (p == orig_origin) {
+            if (clone_p) {
+                RCLASS_SET_SUPER(clone_p, clone_origin);
+                RCLASS_SET_SUPER(clone_origin, RCLASS_SUPER(orig_origin));
+            }
+            copy_tables(clone_origin, orig_origin);
+            if (RCLASS_M_TBL(orig_origin)) {
+                struct clone_method_arg arg;
+                arg.old_klass = orig;
+                arg.new_klass = clone;
+                RCLASS_M_TBL_INIT(clone_origin);
+                rb_id_table_foreach(RCLASS_M_TBL(orig_origin), clone_method_i, &arg);
+            }
+        }
+        else {
+            rb_bug("no origin for class that has origin");
+        }
+    }
+
     return clone;
 }
 
@@ -367,28 +461,41 @@ rb_singleton_class_clone(VALUE obj)
     return rb_singleton_class_clone_and_attach(obj, Qundef);
 }
 
+// Clone and return the singleton class of `obj` if it has been created and is attached to `obj`.
 VALUE
 rb_singleton_class_clone_and_attach(VALUE obj, VALUE attach)
 {
     const VALUE klass = RBASIC(obj)->klass;
 
-    if (!FL_TEST(klass, FL_SINGLETON))
-	return klass;
+    // Note that `rb_singleton_class()` can create situations where `klass` is
+    // attached to an object other than `obj`. In which case `obj` does not have
+    // a material singleton class attached yet and there is no singleton class
+    // to clone.
+    if (!(FL_TEST(klass, FL_SINGLETON) && rb_attr_get(klass, id_attached) == obj)) {
+        // nothing to clone
+        return klass;
+    }
     else {
 	/* copy singleton(unnamed) class */
+        bool klass_of_clone_is_new;
 	VALUE clone = class_alloc(RBASIC(klass)->flags, 0);
 
 	if (BUILTIN_TYPE(obj) == T_CLASS) {
+            klass_of_clone_is_new = true;
 	    RBASIC_SET_CLASS(clone, clone);
 	}
 	else {
-	    RBASIC_SET_CLASS(clone, rb_singleton_class_clone(klass));
+            VALUE klass_metaclass_clone = rb_singleton_class_clone(klass);
+            // When `METACLASS_OF(klass) == klass_metaclass_clone`, it means the
+            // recursive call did not clone `METACLASS_OF(klass)`.
+            klass_of_clone_is_new = (METACLASS_OF(klass) != klass_metaclass_clone);
+            RBASIC_SET_CLASS(clone, klass_metaclass_clone);
 	}
 
 	RCLASS_SET_SUPER(clone, RCLASS_SUPER(klass));
 	RCLASS_EXT(clone)->allocator = RCLASS_EXT(klass)->allocator;
 	if (RCLASS_IV_TBL(klass)) {
-	    RCLASS_IV_TBL(clone) = rb_st_copy(clone, RCLASS_IV_TBL(klass));
+	    rb_iv_tbl_copy(clone, klass);
 	}
 	if (RCLASS_CONST_TBL(klass)) {
 	    struct clone_const_arg arg;
@@ -406,7 +513,9 @@ rb_singleton_class_clone_and_attach(VALUE obj, VALUE attach)
 	    arg.new_klass = clone;
 	    rb_id_table_foreach(RCLASS_M_TBL(klass), clone_method_i, &arg);
 	}
-	rb_singleton_class_attached(RBASIC(clone)->klass, clone);
+        if (klass_of_clone_is_new) {
+            rb_singleton_class_attached(RBASIC(clone)->klass, clone);
+        }
 	FL_SET(clone, FL_SINGLETON);
 
 	return clone;
@@ -428,11 +537,6 @@ rb_singleton_class_attached(VALUE klass, VALUE obj)
     }
 }
 
-
-
-#define METACLASS_OF(k) RBASIC(k)->klass
-#define SET_METACLASS_OF(k, cls) RBASIC_SET_CLASS(k, cls)
-
 /*!
  * whether k is a meta^(n)-class of Class class
  * @retval 1 if \a k is a meta^(n)-class of Class class (n >= 0)
@@ -505,8 +609,6 @@ make_metaclass(VALUE klass)
     while (RB_TYPE_P(super, T_ICLASS)) super = RCLASS_SUPER(super);
     RCLASS_SET_SUPER(metaclass, super ? ENSURE_EIGENCLASS(super) : rb_cClass);
 
-    OBJ_INFECT(metaclass, RCLASS_SUPER(metaclass));
-
     return metaclass;
 }
 
@@ -537,8 +639,8 @@ boot_defclass(const char *name, VALUE super)
     VALUE obj = rb_class_boot(super);
     ID id = rb_intern(name);
 
-    rb_name_class(obj, id);
     rb_const_set((rb_cObject ? rb_cObject : obj), id, obj);
+    rb_vm_add_root_module(obj);
     return obj;
 }
 
@@ -550,7 +652,7 @@ Init_class_hierarchy(void)
     rb_gc_register_mark_object(rb_cObject);
 
     /* resolve class name ASAP for order-independence */
-    rb_class_name(rb_cObject);
+    rb_set_class_path_string(rb_cObject, rb_cObject, rb_fstring_lit("Object"));
 
     rb_cModule = boot_defclass("Module", rb_cObject);
     rb_cClass =  boot_defclass("Class",  rb_cModule);
@@ -616,7 +718,7 @@ rb_define_class_id(ID id, VALUE super)
  * \return the value \c Class#inherited's returns
  * \pre Each of \a super and \a klass must be a \c Class object.
  */
-VALUE
+MJIT_FUNC_EXPORTED VALUE
 rb_class_inherited(VALUE super, VALUE klass)
 {
     ID inherited;
@@ -658,14 +760,16 @@ rb_define_class(const char *name, VALUE super)
 	if (rb_class_real(RCLASS_SUPER(klass)) != super) {
 	    rb_raise(rb_eTypeError, "superclass mismatch for class %s", name);
 	}
+
+        /* Class may have been defined in Ruby and not pin-rooted */
+        rb_vm_add_root_module(klass);
 	return klass;
     }
     if (!super) {
 	rb_raise(rb_eArgError, "no super class for `%s'", name);
     }
     klass = rb_define_class_id(id, super);
-    rb_vm_add_root_module(id, klass);
-    rb_name_class(klass, id);
+    rb_vm_add_root_module(klass);
     rb_const_set(rb_cObject, id, klass);
     rb_class_inherited(super, klass);
 
@@ -730,6 +834,9 @@ rb_define_class_id_under(VALUE outer, ID id, VALUE super)
 		     " (%"PRIsVALUE" is given but was %"PRIsVALUE")",
 		     outer, rb_id2str(id), RCLASS_SUPER(klass), super);
 	}
+        /* Class may have been defined in Ruby and not pin-rooted */
+        rb_vm_add_root_module(klass);
+
 	return klass;
     }
     if (!super) {
@@ -740,7 +847,7 @@ rb_define_class_id_under(VALUE outer, ID id, VALUE super)
     rb_set_class_path_string(klass, outer, rb_id2str(id));
     rb_const_set(outer, id, klass);
     rb_class_inherited(super, klass);
-    rb_gc_register_mark_object(klass);
+    rb_vm_add_root_module(klass);
 
     return klass;
 }
@@ -753,15 +860,11 @@ rb_module_new(void)
     return (VALUE)mdl;
 }
 
+// Kept for compatibility. Use rb_module_new() instead.
 VALUE
 rb_define_module_id(ID id)
 {
-    VALUE mdl;
-
-    mdl = rb_module_new();
-    rb_name_class(mdl, id);
-
-    return mdl;
+    return rb_module_new();
 }
 
 VALUE
@@ -777,10 +880,12 @@ rb_define_module(const char *name)
 	    rb_raise(rb_eTypeError, "%s is not a module (%"PRIsVALUE")",
 		     name, rb_obj_class(module));
 	}
+        /* Module may have been defined in Ruby and not pin-rooted */
+        rb_vm_add_root_module(module);
 	return module;
     }
-    module = rb_define_module_id(id);
-    rb_vm_add_root_module(id, module);
+    module = rb_module_new();
+    rb_vm_add_root_module(module);
     rb_const_set(rb_cObject, id, module);
 
     return module;
@@ -806,7 +911,7 @@ rb_define_module_id_under(VALUE outer, ID id)
 	}
 	return module;
     }
-    module = rb_define_module_id(id);
+    module = rb_module_new();
     rb_const_set(outer, id, module);
     rb_set_class_path_string(module, outer, rb_id2str(id));
     rb_gc_register_mark_object(module);
@@ -819,9 +924,13 @@ rb_include_class_new(VALUE module, VALUE super)
 {
     VALUE klass = class_alloc(T_ICLASS, rb_cClass);
 
+    RCLASS_M_TBL(klass) = RCLASS_M_TBL(module);
+
+    RCLASS_SET_ORIGIN(klass, klass);
     if (BUILTIN_TYPE(module) == T_ICLASS) {
 	module = RBASIC(module)->klass;
     }
+    RUBY_ASSERT(!RB_TYPE_P(module, T_ICLASS));
     if (!RCLASS_IV_TBL(module)) {
 	RCLASS_IV_TBL(module) = st_init_numtable();
     }
@@ -831,40 +940,59 @@ rb_include_class_new(VALUE module, VALUE super)
     RCLASS_IV_TBL(klass) = RCLASS_IV_TBL(module);
     RCLASS_CONST_TBL(klass) = RCLASS_CONST_TBL(module);
 
-    RCLASS_M_TBL(OBJ_WB_UNPROTECT(klass)) =
-      RCLASS_M_TBL(OBJ_WB_UNPROTECT(RCLASS_ORIGIN(module))); /* TODO: unprotected? */
-
     RCLASS_SET_SUPER(klass, super);
-    if (RB_TYPE_P(module, T_ICLASS)) {
-	RBASIC_SET_CLASS(klass, RBASIC(module)->klass);
-    }
-    else {
-	RBASIC_SET_CLASS(klass, module);
-    }
-    OBJ_INFECT(klass, module);
-    OBJ_INFECT(klass, super);
+    RBASIC_SET_CLASS(klass, module);
 
     return (VALUE)klass;
 }
 
 static int include_modules_at(const VALUE klass, VALUE c, VALUE module, int search_super);
 
+static void
+ensure_includable(VALUE klass, VALUE module)
+{
+    rb_class_modify_check(klass);
+    Check_Type(module, T_MODULE);
+    if (!NIL_P(rb_refinement_module_get_refined_class(module))) {
+	rb_raise(rb_eArgError, "refinement module is not allowed");
+    }
+}
+
 void
 rb_include_module(VALUE klass, VALUE module)
 {
     int changed = 0;
 
-    rb_frozen_class_p(klass);
-
-    if (!RB_TYPE_P(module, T_MODULE)) {
-	Check_Type(module, T_MODULE);
-    }
-
-    OBJ_INFECT(klass, module);
+    ensure_includable(klass, module);
 
     changed = include_modules_at(klass, RCLASS_ORIGIN(klass), module, TRUE);
     if (changed < 0)
 	rb_raise(rb_eArgError, "cyclic include detected");
+
+    if (RB_TYPE_P(klass, T_MODULE)) {
+        rb_subclass_entry_t *iclass = RCLASS_EXT(klass)->subclasses;
+        int do_include = 1;
+        while (iclass) {
+            VALUE check_class = iclass->klass;
+            /* During lazy sweeping, iclass->klass could be a dead object that
+             * has not yet been swept. */
+            if (!rb_objspace_garbage_object_p(check_class)) {
+                while (check_class) {
+                    if (RB_TYPE_P(check_class, T_ICLASS) &&
+                            (RBASIC(check_class)->klass == module)) {
+                        do_include = 0;
+                    }
+                    check_class = RCLASS_SUPER(check_class);
+                }
+
+                if (do_include) {
+                    include_modules_at(iclass->klass, RCLASS_ORIGIN(iclass->klass), module, TRUE);
+                }
+            }
+
+            iclass = iclass->next;
+        }
+    }
 }
 
 static enum rb_id_table_iterator_result
@@ -874,27 +1002,40 @@ add_refined_method_entry_i(ID key, VALUE value, void *data)
     return ID_TABLE_CONTINUE;
 }
 
+static enum rb_id_table_iterator_result
+clear_module_cache_i(ID id, VALUE val, void *data)
+{
+    VALUE klass = (VALUE)data;
+    rb_clear_method_cache(klass, id);
+    return ID_TABLE_CONTINUE;
+}
+
 static int
 include_modules_at(const VALUE klass, VALUE c, VALUE module, int search_super)
 {
-    VALUE p, iclass;
-    int method_changed = 0, constant_changed = 0;
+    VALUE p, iclass, origin_stack = 0;
+    int method_changed = 0, constant_changed = 0, add_subclass;
+    long origin_len;
     struct rb_id_table *const klass_m_tbl = RCLASS_M_TBL(RCLASS_ORIGIN(klass));
+    VALUE original_klass = klass;
 
     while (module) {
+        int origin_seen = FALSE;
 	int superclass_seen = FALSE;
 	struct rb_id_table *tbl;
 
-	if (RCLASS_ORIGIN(module) != module)
-	    goto skip;
+        if (klass == c)
+            origin_seen = TRUE;
 	if (klass_m_tbl && klass_m_tbl == RCLASS_M_TBL(module))
 	    return -1;
 	/* ignore if the module included already in superclasses */
-	for (p = RCLASS_SUPER(klass); p; p = RCLASS_SUPER(p)) {
+        for (p = RCLASS_SUPER(klass); p; p = RCLASS_SUPER(p)) {
 	    int type = BUILTIN_TYPE(p);
+            if (c == p)
+                origin_seen = TRUE;
 	    if (type == T_ICLASS) {
 		if (RCLASS_M_TBL(p) == RCLASS_M_TBL(module)) {
-		    if (!superclass_seen) {
+                    if (!superclass_seen && origin_seen) {
 			c = p;  /* move insertion point */
 		    }
 		    goto skip;
@@ -902,36 +1043,66 @@ include_modules_at(const VALUE klass, VALUE c, VALUE module, int search_super)
 	    }
 	    else if (type == T_CLASS) {
 		if (!search_super) break;
-		superclass_seen = TRUE;
+                superclass_seen = TRUE;
 	    }
 	}
-	iclass = rb_include_class_new(module, RCLASS_SUPER(c));
+
+        VALUE super_class = RCLASS_SUPER(c);
+
+        // invalidate inline method cache
+        tbl = RCLASS_M_TBL(module);
+        if (tbl && rb_id_table_size(tbl)) {
+            if (search_super) { // include
+                if (super_class && !RB_TYPE_P(super_class, T_MODULE)) {
+                    rb_id_table_foreach(tbl, clear_module_cache_i, (void *)super_class);
+                }
+            }
+            else { // prepend
+                if (!RB_TYPE_P(original_klass, T_MODULE)) {
+                    rb_id_table_foreach(tbl, clear_module_cache_i, (void *)original_klass);
+                }
+            }
+            method_changed = 1;
+        }
+
+        // setup T_ICLASS for the include/prepend module
+	iclass = rb_include_class_new(module, super_class);
 	c = RCLASS_SET_SUPER(c, iclass);
+        RCLASS_SET_INCLUDER(iclass, klass);
+        add_subclass = TRUE;
+        if (module != RCLASS_ORIGIN(module)) {
+            if (!origin_stack) origin_stack = rb_ary_tmp_new(2);
+            VALUE origin[2] = {iclass, RCLASS_ORIGIN(module)};
+            rb_ary_cat(origin_stack, origin, 2);
+        }
+        else if (origin_stack && (origin_len = RARRAY_LEN(origin_stack)) > 1 &&
+                 RARRAY_AREF(origin_stack, origin_len - 1) == module) {
+            RCLASS_SET_ORIGIN(RARRAY_AREF(origin_stack, (origin_len -= 2)), iclass);
+            RICLASS_SET_ORIGIN_SHARED_MTBL(iclass);
+            rb_ary_resize(origin_stack, origin_len);
+            add_subclass = FALSE;
+        }
 
 	{
 	    VALUE m = module;
-	    if (BUILTIN_TYPE(m) == T_ICLASS) m = RBASIC(m)->klass;
-	    rb_module_add_to_subclasses_list(m, iclass);
+            if (BUILTIN_TYPE(m) == T_ICLASS) m = RBASIC(m)->klass;
+            if (add_subclass) rb_module_add_to_subclasses_list(m, iclass);
 	}
 
 	if (FL_TEST(klass, RMODULE_IS_REFINEMENT)) {
 	    VALUE refined_class =
 		rb_refinement_module_get_refined_class(klass);
 
-	    rb_id_table_foreach(RMODULE_M_TBL(module), add_refined_method_entry_i, (void *)refined_class);
+            rb_id_table_foreach(RCLASS_M_TBL(module), add_refined_method_entry_i, (void *)refined_class);
 	    FL_SET(c, RMODULE_INCLUDED_INTO_REFINEMENT);
 	}
 
-	tbl = RMODULE_M_TBL(module);
-	if (tbl && rb_id_table_size(tbl)) method_changed = 1;
-
-	tbl = RMODULE_CONST_TBL(module);
+        tbl = RCLASS_CONST_TBL(module);
 	if (tbl && rb_id_table_size(tbl)) constant_changed = 1;
       skip:
 	module = RCLASS_SUPER(module);
     }
 
-    if (method_changed) rb_clear_method_cache_by_class(klass);
     if (constant_changed) rb_clear_constant_cache();
 
     return method_changed;
@@ -940,22 +1111,22 @@ include_modules_at(const VALUE klass, VALUE c, VALUE module, int search_super)
 static enum rb_id_table_iterator_result
 move_refined_method(ID key, VALUE value, void *data)
 {
-    rb_method_entry_t *me = (rb_method_entry_t *) value;
-    VALUE klass = (VALUE)data;
-    struct rb_id_table *tbl = RCLASS_M_TBL(klass);
+    rb_method_entry_t *me = (rb_method_entry_t *)value;
 
     if (me->def->type == VM_METHOD_TYPE_REFINED) {
-	if (me->def->body.refined.orig_me) {
+        VALUE klass = (VALUE)data;
+        struct rb_id_table *tbl = RCLASS_M_TBL(klass);
+
+        if (me->def->body.refined.orig_me) {
 	    const rb_method_entry_t *orig_me = me->def->body.refined.orig_me, *new_me;
 	    RB_OBJ_WRITE(me, &me->def->body.refined.orig_me, NULL);
 	    new_me = rb_method_entry_clone(me);
-	    rb_id_table_insert(tbl, key, (VALUE)new_me);
-	    RB_OBJ_WRITTEN(klass, Qundef, new_me);
+            rb_method_table_insert(klass, tbl, key, new_me);
 	    rb_method_entry_copy(me, orig_me);
 	    return ID_TABLE_CONTINUE;
 	}
 	else {
-	    rb_id_table_insert(tbl, key, (VALUE)me);
+            rb_method_table_insert(klass, tbl, key, me);
 	    return ID_TABLE_DELETE;
 	}
     }
@@ -964,52 +1135,98 @@ move_refined_method(ID key, VALUE value, void *data)
     }
 }
 
-void
-rb_prepend_module(VALUE klass, VALUE module)
+static enum rb_id_table_iterator_result
+cache_clear_refined_method(ID key, VALUE value, void *data)
 {
-    VALUE origin;
-    int changed = 0;
-
-    rb_frozen_class_p(klass);
+    rb_method_entry_t *me = (rb_method_entry_t *) value;
 
-    Check_Type(module, T_MODULE);
+    if (me->def->type == VM_METHOD_TYPE_REFINED && me->def->body.refined.orig_me) {
+        VALUE klass = (VALUE)data;
+        rb_clear_method_cache(klass, me->called_id);
+    }
+    // Refined method entries without an orig_me is going to stay in the method
+    // table of klass, like before the move, so no need to clear the cache.
 
-    OBJ_INFECT(klass, module);
+    return ID_TABLE_CONTINUE;
+}
 
-    origin = RCLASS_ORIGIN(klass);
+static void
+ensure_origin(VALUE klass)
+{
+    VALUE origin = RCLASS_ORIGIN(klass);
     if (origin == klass) {
 	origin = class_alloc(T_ICLASS, klass);
-	OBJ_WB_UNPROTECT(origin); /* TODO: conservative shading. Need more survey. */
 	RCLASS_SET_SUPER(origin, RCLASS_SUPER(klass));
 	RCLASS_SET_SUPER(klass, origin);
 	RCLASS_SET_ORIGIN(klass, origin);
 	RCLASS_M_TBL(origin) = RCLASS_M_TBL(klass);
 	RCLASS_M_TBL_INIT(klass);
+        rb_id_table_foreach(RCLASS_M_TBL(origin), cache_clear_refined_method, (void *)klass);
 	rb_id_table_foreach(RCLASS_M_TBL(origin), move_refined_method, (void *)klass);
     }
+}
+
+void
+rb_prepend_module(VALUE klass, VALUE module)
+{
+    int changed = 0;
+    bool klass_had_no_origin = RCLASS_ORIGIN(klass) == klass;
+
+    ensure_includable(klass, module);
+    ensure_origin(klass);
     changed = include_modules_at(klass, klass, module, FALSE);
     if (changed < 0)
 	rb_raise(rb_eArgError, "cyclic prepend detected");
     if (changed) {
 	rb_vm_check_redefinition_by_prepend(klass);
     }
+    if (RB_TYPE_P(klass, T_MODULE)) {
+        rb_subclass_entry_t *iclass = RCLASS_EXT(klass)->subclasses;
+        VALUE klass_origin = RCLASS_ORIGIN(klass);
+        struct rb_id_table *klass_m_tbl = RCLASS_M_TBL(klass);
+        struct rb_id_table *klass_origin_m_tbl = RCLASS_M_TBL(klass_origin);
+        while (iclass) {
+            /* During lazy sweeping, iclass->klass could be a dead object that
+             * has not yet been swept. */
+            if (!rb_objspace_garbage_object_p(iclass->klass)) {
+                if (klass_had_no_origin && klass_origin_m_tbl == RCLASS_M_TBL(iclass->klass)) {
+                    // backfill an origin iclass to handle refinements and future prepends
+                    rb_id_table_foreach(RCLASS_M_TBL(iclass->klass), clear_module_cache_i, (void *)iclass->klass);
+                    RCLASS_M_TBL(iclass->klass) = klass_m_tbl;
+                    VALUE origin = rb_include_class_new(klass_origin, RCLASS_SUPER(iclass->klass));
+                    RCLASS_SET_SUPER(iclass->klass, origin);
+                    RCLASS_SET_INCLUDER(origin, RCLASS_INCLUDER(iclass->klass));
+                    RCLASS_SET_ORIGIN(iclass->klass, origin);
+                    RICLASS_SET_ORIGIN_SHARED_MTBL(origin);
+                }
+                include_modules_at(iclass->klass, iclass->klass, module, FALSE);
+            }
+
+            iclass = iclass->next;
+        }
+    }
 }
 
 /*
  *  call-seq:
  *     mod.included_modules -> array
  *
- *  Returns the list of modules included in <i>mod</i>.
+ *  Returns the list of modules included or prepended in <i>mod</i>
+ *  or one of <i>mod</i>'s ancestors.
+ *
+ *     module Sub
+ *     end
  *
  *     module Mixin
+ *       prepend Sub
  *     end
  *
  *     module Outer
  *       include Mixin
  *     end
  *
- *     Mixin.included_modules   #=> []
- *     Outer.included_modules   #=> [Mixin]
+ *     Mixin.included_modules   #=> [Sub]
+ *     Outer.included_modules   #=> [Sub, Mixin]
  */
 
 VALUE
@@ -1020,7 +1237,7 @@ rb_mod_included_modules(VALUE mod)
     VALUE origin = RCLASS_ORIGIN(mod);
 
     for (p = RCLASS_SUPER(mod); p; p = RCLASS_SUPER(p)) {
-	if (p != origin && BUILTIN_TYPE(p) == T_ICLASS) {
+        if (p != origin && RCLASS_ORIGIN(p) == p && BUILTIN_TYPE(p) == T_ICLASS) {
 	    VALUE m = RBASIC(p)->klass;
 	    if (RB_TYPE_P(m, T_MODULE))
 		rb_ary_push(ary, m);
@@ -1033,8 +1250,8 @@ rb_mod_included_modules(VALUE mod)
  *  call-seq:
  *     mod.include?(module)    -> true or false
  *
- *  Returns <code>true</code> if <i>module</i> is included in
- *  <i>mod</i> or one of <i>mod</i>'s ancestors.
+ *  Returns <code>true</code> if <i>module</i> is included
+ *  or prepended in <i>mod</i> or one of <i>mod</i>'s ancestors.
  *
  *     module A
  *     end
@@ -1055,7 +1272,7 @@ rb_mod_include_p(VALUE mod, VALUE mod2)
 
     Check_Type(mod2, T_MODULE);
     for (p = RCLASS_SUPER(mod); p; p = RCLASS_SUPER(p)) {
-	if (BUILTIN_TYPE(p) == T_ICLASS) {
+        if (BUILTIN_TYPE(p) == T_ICLASS && !FL_TEST(p, RICLASS_IS_ORIGIN)) {
 	    if (RBASIC(p)->klass == mod2) return Qtrue;
 	}
     }
@@ -1086,56 +1303,62 @@ rb_mod_ancestors(VALUE mod)
     VALUE p, ary = rb_ary_new();
 
     for (p = mod; p; p = RCLASS_SUPER(p)) {
+        if (p != RCLASS_ORIGIN(p)) continue;
 	if (BUILTIN_TYPE(p) == T_ICLASS) {
 	    rb_ary_push(ary, RBASIC(p)->klass);
 	}
-	else if (p == RCLASS_ORIGIN(p)) {
+        else {
 	    rb_ary_push(ary, p);
 	}
     }
     return ary;
 }
 
-static int
-ins_methods_push(ID name, rb_method_visibility_t visi, VALUE ary, rb_method_visibility_t expected_visi)
+static void
+ins_methods_push(st_data_t name, st_data_t ary)
 {
-    if (visi == METHOD_VISI_UNDEF) return ST_CONTINUE;
+    rb_ary_push((VALUE)ary, ID2SYM((ID)name));
+}
 
-    switch (expected_visi) {
+static int
+ins_methods_i(st_data_t name, st_data_t type, st_data_t ary)
+{
+    switch ((rb_method_visibility_t)type) {
       case METHOD_VISI_UNDEF:
-	if (visi != METHOD_VISI_PRIVATE) rb_ary_push(ary, ID2SYM(name));
-	break;
       case METHOD_VISI_PRIVATE:
-      case METHOD_VISI_PROTECTED:
-      case METHOD_VISI_PUBLIC:
-	if (visi == expected_visi) rb_ary_push(ary, ID2SYM(name));
+	break;
+      default: /* everything but private */
+	ins_methods_push(name, ary);
 	break;
     }
     return ST_CONTINUE;
 }
 
 static int
-ins_methods_i(st_data_t name, st_data_t type, st_data_t ary)
-{
-    return ins_methods_push((ID)name, (rb_method_visibility_t)type, (VALUE)ary, METHOD_VISI_UNDEF); /* everything but private */
-}
-
-static int
 ins_methods_prot_i(st_data_t name, st_data_t type, st_data_t ary)
 {
-    return ins_methods_push((ID)name, (rb_method_visibility_t)type, (VALUE)ary, METHOD_VISI_PROTECTED);
+    if ((rb_method_visibility_t)type == METHOD_VISI_PROTECTED) {
+	ins_methods_push(name, ary);
+    }
+    return ST_CONTINUE;
 }
 
 static int
 ins_methods_priv_i(st_data_t name, st_data_t type, st_data_t ary)
 {
-    return ins_methods_push((ID)name, (rb_method_visibility_t)type, (VALUE)ary, METHOD_VISI_PRIVATE);
+    if ((rb_method_visibility_t)type == METHOD_VISI_PRIVATE) {
+	ins_methods_push(name, ary);
+    }
+    return ST_CONTINUE;
 }
 
 static int
 ins_methods_pub_i(st_data_t name, st_data_t type, st_data_t ary)
 {
-    return ins_methods_push((ID)name, (rb_method_visibility_t)type, (VALUE)ary, METHOD_VISI_PUBLIC);
+    if ((rb_method_visibility_t)type == METHOD_VISI_PUBLIC) {
+	ins_methods_push(name, ary);
+    }
+    return ST_CONTINUE;
 }
 
 struct method_entry_arg {
@@ -1156,7 +1379,7 @@ method_entry_i(ID key, VALUE value, void *data)
 	if (!me) return ID_TABLE_CONTINUE;
 	if (!arg->recur && me->owner != owner) return ID_TABLE_CONTINUE;
     }
-    if (!st_lookup(arg->list, key, 0)) {
+    if (!st_is_member(arg->list, key)) {
 	if (UNDEFINED_METHOD_ENTRY_P(me)) {
 	    type = METHOD_VISI_UNDEF; /* none */
 	}
@@ -1168,20 +1391,39 @@ method_entry_i(ID key, VALUE value, void *data)
     return ID_TABLE_CONTINUE;
 }
 
+static void
+add_instance_method_list(VALUE mod, struct method_entry_arg *me_arg)
+{
+    struct rb_id_table *m_tbl = RCLASS_M_TBL(mod);
+    if (!m_tbl) return;
+    rb_id_table_foreach(m_tbl, method_entry_i, me_arg);
+}
+
+static bool
+particular_class_p(VALUE mod)
+{
+    if (!mod) return false;
+    if (FL_TEST(mod, FL_SINGLETON)) return true;
+    if (BUILTIN_TYPE(mod) == T_ICLASS) return true;
+    return false;
+}
+
 static VALUE
 class_instance_method_list(int argc, const VALUE *argv, VALUE mod, int obj, int (*func) (st_data_t, st_data_t, st_data_t))
 {
     VALUE ary;
-    int recur, prepended = 0;
+    int recur = TRUE, prepended = 0;
     struct method_entry_arg me_arg;
 
-    if (argc == 0) {
-	recur = TRUE;
-    }
-    else {
-	VALUE r;
-	rb_scan_args(argc, argv, "01", &r);
-	recur = RTEST(r);
+    if (rb_check_arity(argc, 0, 1)) recur = RTEST(argv[0]);
+
+    me_arg.list = st_init_numtable();
+    me_arg.recur = recur;
+
+    if (obj) {
+        for (; particular_class_p(mod); mod = RCLASS_SUPER(mod)) {
+            add_instance_method_list(mod, &me_arg);
+        }
     }
 
     if (!recur && RCLASS_ORIGIN(mod) != mod) {
@@ -1189,15 +1431,12 @@ class_instance_method_list(int argc, const VALUE *argv, VALUE mod, int obj, int
 	prepended = 1;
     }
 
-    me_arg.list = st_init_numtable();
-    me_arg.recur = recur;
     for (; mod; mod = RCLASS_SUPER(mod)) {
-	if (RCLASS_M_TBL(mod)) rb_id_table_foreach(RCLASS_M_TBL(mod), method_entry_i, &me_arg);
+        add_instance_method_list(mod, &me_arg);
 	if (BUILTIN_TYPE(mod) == T_ICLASS && !prepended) continue;
-	if (obj && FL_TEST(mod, FL_SINGLETON)) continue;
 	if (!recur) break;
     }
-    ary = rb_ary_new();
+    ary = rb_ary_new2(me_arg.list->num_entries);
     st_foreach(me_arg.list, func, ary);
     st_free_table(me_arg.list);
 
@@ -1298,7 +1537,7 @@ rb_class_public_instance_methods(int argc, const VALUE *argv, VALUE mod)
  *  <i>obj</i>. This will include all the methods accessible in
  *  <i>obj</i>'s ancestors.
  *  If the optional parameter is <code>false</code>, it
- *  returns an array of <i>obj<i>'s public and protected singleton methods,
+ *  returns an array of <i>obj</i>'s public and protected singleton methods,
  *  the array will not include methods in modules included in <i>obj</i>.
  *
  *     class Klass
@@ -1411,31 +1650,30 @@ rb_obj_public_methods(int argc, const VALUE *argv, VALUE obj)
 VALUE
 rb_obj_singleton_methods(int argc, const VALUE *argv, VALUE obj)
 {
-    VALUE recur, ary, klass, origin;
+    VALUE ary, klass, origin;
     struct method_entry_arg me_arg;
     struct rb_id_table *mtbl;
+    int recur = TRUE;
 
-    if (argc == 0) {
-	recur = Qtrue;
-    }
-    else {
-	rb_scan_args(argc, argv, "01", &recur);
+    if (rb_check_arity(argc, 0, 1)) recur = RTEST(argv[0]);
+    if (RB_TYPE_P(obj, T_CLASS) && FL_TEST(obj, FL_SINGLETON)) {
+        rb_singleton_class(obj);
     }
     klass = CLASS_OF(obj);
     origin = RCLASS_ORIGIN(klass);
     me_arg.list = st_init_numtable();
-    me_arg.recur = RTEST(recur);
+    me_arg.recur = recur;
     if (klass && FL_TEST(klass, FL_SINGLETON)) {
 	if ((mtbl = RCLASS_M_TBL(origin)) != 0) rb_id_table_foreach(mtbl, method_entry_i, &me_arg);
 	klass = RCLASS_SUPER(klass);
     }
-    if (RTEST(recur)) {
+    if (recur) {
 	while (klass && (FL_TEST(klass, FL_SINGLETON) || RB_TYPE_P(klass, T_ICLASS))) {
 	    if (klass != origin && (mtbl = RCLASS_M_TBL(klass)) != 0) rb_id_table_foreach(mtbl, method_entry_i, &me_arg);
 	    klass = RCLASS_SUPER(klass);
 	}
     }
-    ary = rb_ary_new();
+    ary = rb_ary_new2(me_arg.list->num_entries);
     st_foreach(me_arg.list, ins_methods_i, ary);
     st_free_table(me_arg.list);
 
@@ -1499,24 +1737,36 @@ rb_obj_singleton_methods(int argc, const VALUE *argv, VALUE obj)
  * \{
  */
 
+#ifdef rb_define_method_id
+#undef rb_define_method_id
+#endif
 void
 rb_define_method_id(VALUE klass, ID mid, VALUE (*func)(ANYARGS), int argc)
 {
     rb_add_method_cfunc(klass, mid, func, argc, METHOD_VISI_PUBLIC);
 }
 
+#ifdef rb_define_method
+#undef rb_define_method
+#endif
 void
 rb_define_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc)
 {
     rb_add_method_cfunc(klass, rb_intern(name), func, argc, METHOD_VISI_PUBLIC);
 }
 
+#ifdef rb_define_protected_method
+#undef rb_define_protected_method
+#endif
 void
 rb_define_protected_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc)
 {
     rb_add_method_cfunc(klass, rb_intern(name), func, argc, METHOD_VISI_PROTECTED);
 }
 
+#ifdef rb_define_private_method
+#undef rb_define_private_method
+#endif
 void
 rb_define_private_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc)
 {
@@ -1529,6 +1779,23 @@ rb_undef_method(VALUE klass, const char *name)
     rb_add_method(klass, rb_intern(name), VM_METHOD_TYPE_UNDEF, 0, METHOD_VISI_UNDEF);
 }
 
+static enum rb_id_table_iterator_result
+undef_method_i(ID name, VALUE value, void *data)
+{
+    VALUE klass = (VALUE)data;
+    rb_add_method(klass, name, VM_METHOD_TYPE_UNDEF, 0, METHOD_VISI_UNDEF);
+    return ID_TABLE_CONTINUE;
+}
+
+void
+rb_undef_methods_from(VALUE klass, VALUE super)
+{
+    struct rb_id_table *mtbl = RCLASS_M_TBL(super);
+    if (mtbl) {
+	rb_id_table_foreach(mtbl, undef_method_i, (void *)klass);
+    }
+}
+
 /*!
  * \}
  */
@@ -1537,19 +1804,15 @@ rb_undef_method(VALUE klass, const char *name)
  * \{
  */
 
-#define SPECIAL_SINGLETON(x,c) do {\
-    if (obj == (x)) {\
-	return (c);\
-    }\
-} while (0)
-
 static inline VALUE
 special_singleton_class_of(VALUE obj)
 {
-    SPECIAL_SINGLETON(Qnil, rb_cNilClass);
-    SPECIAL_SINGLETON(Qfalse, rb_cFalseClass);
-    SPECIAL_SINGLETON(Qtrue, rb_cTrueClass);
-    return Qnil;
+    switch (obj) {
+      case Qnil:   return rb_cNilClass;
+      case Qfalse: return rb_cFalseClass;
+      case Qtrue:  return rb_cTrueClass;
+      default:     return Qnil;
+    }
 }
 
 VALUE
@@ -1572,36 +1835,36 @@ singleton_class_of(VALUE obj)
 {
     VALUE klass;
 
-    if (FIXNUM_P(obj) || FLONUM_P(obj) || STATIC_SYM_P(obj)) {
-      no_singleton:
+    switch (TYPE(obj)) {
+      case T_FIXNUM:
+      case T_BIGNUM:
+      case T_FLOAT:
+      case T_SYMBOL:
 	rb_raise(rb_eTypeError, "can't define singleton");
-    }
-    if (SPECIAL_CONST_P(obj)) {
+
+      case T_FALSE:
+      case T_TRUE:
+      case T_NIL:
 	klass = special_singleton_class_of(obj);
 	if (NIL_P(klass))
 	    rb_bug("unknown immediate %p", (void *)obj);
 	return klass;
-    }
-    else {
-	switch (BUILTIN_TYPE(obj)) {
-	  case T_FLOAT: case T_BIGNUM: case T_SYMBOL:
-	    goto no_singleton;
-	}
+
+      case T_STRING:
+        if (FL_TEST_RAW(obj, RSTRING_FSTR)) {
+            rb_raise(rb_eTypeError, "can't define singleton");
+        }
     }
 
     klass = RBASIC(obj)->klass;
     if (!(FL_TEST(klass, FL_SINGLETON) &&
-	  rb_ivar_get(klass, id_attached) == obj)) {
+          rb_attr_get(klass, id_attached) == obj)) {
+	rb_serial_t serial = RCLASS_SERIAL(klass);
 	klass = rb_make_metaclass(obj, klass);
+	RCLASS_SERIAL(klass) = serial;
     }
 
-    if (OBJ_TAINTED(obj)) {
-	OBJ_TAINT(klass);
-    }
-    else {
-	FL_UNSET(klass, FL_TAINT);
-    }
-    if (OBJ_FROZEN(obj)) OBJ_FREEZE_RAW(klass);
+    RB_FL_SET_RAW(klass, RB_OBJ_FROZEN_RAW(obj));
 
     return klass;
 }
@@ -1636,7 +1899,7 @@ rb_singleton_class_get(VALUE obj)
     }
     klass = RBASIC(obj)->klass;
     if (!FL_TEST(klass, FL_SINGLETON)) return Qnil;
-    if (rb_ivar_get(klass, id_attached) != obj) return Qnil;
+    if (rb_attr_get(klass, id_attached) != obj) return Qnil;
     return klass;
 }
 
@@ -1644,7 +1907,7 @@ rb_singleton_class_get(VALUE obj)
  * Returns the singleton class of \a obj. Creates it if necessary.
  *
  * \param obj an arbitrary object.
- * \throw TypeError if \a obj is a Fixnum or a Symbol.
+ * \throw TypeError if \a obj is an Integer or a Symbol.
  * \return the singleton class.
  *
  * \post \a obj has its own singleton class.
@@ -1677,6 +1940,9 @@ rb_singleton_class(VALUE obj)
  * \{
  */
 
+#ifdef rb_define_singleton_method
+#undef rb_define_singleton_method
+#endif
 /*!
  * Defines a singleton method for \a obj.
  * \param obj    an arbitrary object
@@ -1690,8 +1956,9 @@ rb_define_singleton_method(VALUE obj, const char *name, VALUE (*func)(ANYARGS),
     rb_define_method(singleton_class_of(obj), name, func, argc);
 }
 
-
-
+#ifdef rb_define_module_function
+#undef rb_define_module_function
+#endif
 /*!
  * Defines a module function for \a module.
  * \param module  an module or a class.
@@ -1706,7 +1973,9 @@ rb_define_module_function(VALUE module, const char *name, VALUE (*func)(ANYARGS)
     rb_define_singleton_method(module, name, func, argc);
 }
 
-
+#ifdef rb_define_global_function
+#undef rb_define_global_function
+#endif
 /*!
  * Defines a global function
  * \param name    name of the function
@@ -1745,32 +2014,22 @@ rb_define_attr(VALUE klass, const char *name, int read, int write)
     rb_attr(klass, rb_intern(name), read, write, FALSE);
 }
 
-int
-rb_obj_basic_to_s_p(VALUE obj)
-{
-    const rb_method_entry_t *me = rb_method_entry(CLASS_OF(obj), rb_intern("to_s"));
-    if (me && me->def && me->def->type == VM_METHOD_TYPE_CFUNC &&
-	me->def->body.cfunc.func == rb_any_to_s)
-	return 1;
-    return 0;
-}
-
-VALUE
+MJIT_FUNC_EXPORTED VALUE
 rb_keyword_error_new(const char *error, VALUE keys)
 {
-    const char *msg = "";
-    VALUE error_message;
+    long i = 0, len = RARRAY_LEN(keys);
+    VALUE error_message = rb_sprintf("%s keyword%.*s", error, len > 1, "s");
 
-    if (RARRAY_LEN(keys) == 1) {
-	keys = RARRAY_AREF(keys, 0);
-    }
-    else {
-	keys = rb_ary_join(keys, rb_usascii_str_new2(", "));
-	msg = "s";
+    if (len > 0) {
+	rb_str_cat_cstr(error_message, ": ");
+	while (1) {
+            const VALUE k = RARRAY_AREF(keys, i);
+	    rb_str_append(error_message, rb_inspect(k));
+	    if (++i >= len) break;
+	    rb_str_cat_cstr(error_message, ", ");
+	}
     }
 
-    error_message = rb_sprintf("%s keyword%s: %"PRIsVALUE, error, msg, keys);
-
     return rb_exc_new_str(rb_eArgError, error_message);
 }
 
@@ -1785,23 +2044,19 @@ NORETURN(static void unknown_keyword_error(VALUE hash, const ID *table, int keyw
 static void
 unknown_keyword_error(VALUE hash, const ID *table, int keywords)
 {
-    st_table *tbl = rb_hash_tbl_raw(hash);
-    VALUE keys;
     int i;
     for (i = 0; i < keywords; i++) {
 	st_data_t key = ID2SYM(table[i]);
-	st_delete(tbl, &key, NULL);
+        rb_hash_stlike_delete(hash, &key, NULL);
     }
-    keys = rb_funcallv(hash, rb_intern("keys"), 0, 0);
-    if (!RB_TYPE_P(keys, T_ARRAY)) rb_raise(rb_eArgError, "unknown keyword");
-    rb_keyword_error("unknown", keys);
+    rb_keyword_error("unknown", rb_hash_keys(hash));
 }
 
+
 static int
 separate_symbol(st_data_t key, st_data_t value, st_data_t arg)
 {
     VALUE *kwdhash = (VALUE *)arg;
-
     if (!SYMBOL_P(key)) kwdhash++;
     if (!*kwdhash) *kwdhash = rb_hash_new();
     rb_hash_aset(*kwdhash, (VALUE)key, (VALUE)value);
@@ -1818,8 +2073,11 @@ rb_extract_keywords(VALUE *orighash)
 	*orighash = 0;
 	return hash;
     }
-    st_foreach(rb_hash_tbl_raw(hash), separate_symbol, (st_data_t)&parthash);
+    rb_hash_foreach(hash, separate_symbol, (st_data_t)&parthash);
     *orighash = parthash[1];
+    if (parthash[1] && RBASIC_CLASS(hash) != rb_cHash) {
+        RBASIC_SET_CLASS(parthash[1], RBASIC_CLASS(hash));
+    }
     return parthash[0];
 }
 
@@ -1833,8 +2091,8 @@ rb_get_kwargs(VALUE keyword_hash, const ID *table, int required, int optional, V
 
 #define extract_kwarg(keyword, val) \
     (key = (st_data_t)(keyword), values ? \
-     st_delete(rb_hash_tbl_raw(keyword_hash), &key, (val)) : \
-     st_lookup(rb_hash_tbl_raw(keyword_hash), key, (val)))
+     (rb_hash_stlike_delete(keyword_hash, &key, &(val)) || ((val) = Qundef, 0)) : \
+     rb_hash_stlike_lookup(keyword_hash, key, NULL))
 
     if (NIL_P(keyword_hash)) keyword_hash = 0;
 
@@ -1842,18 +2100,11 @@ rb_get_kwargs(VALUE keyword_hash, const ID *table, int required, int optional, V
 	rest = 1;
 	optional = -1-optional;
     }
-    if (values) {
-	for (j = 0; j < required + optional; j++) {
-	    values[j] = Qundef;
-	}
-    }
     if (required) {
 	for (; i < required; i++) {
 	    VALUE keyword = ID2SYM(table[i]);
 	    if (keyword_hash) {
-		st_data_t val;
-		if (extract_kwarg(keyword, &val)) {
-		    if (values) values[i] = (VALUE)val;
+                if (extract_kwarg(keyword, values[i])) {
 		    continue;
 		}
 	    }
@@ -1867,100 +2118,111 @@ rb_get_kwargs(VALUE keyword_hash, const ID *table, int required, int optional, V
     j = i;
     if (optional && keyword_hash) {
 	for (i = 0; i < optional; i++) {
-	    st_data_t val;
-	    if (extract_kwarg(ID2SYM(table[required+i]), &val)) {
-		if (values) values[required+i] = (VALUE)val;
+            if (extract_kwarg(ID2SYM(table[required+i]), values[required+i])) {
 		j++;
 	    }
 	}
     }
     if (!rest && keyword_hash) {
-	if (RHASH_SIZE(keyword_hash) > (unsigned int)j) {
+	if (RHASH_SIZE(keyword_hash) > (unsigned int)(values ? 0 : j)) {
 	    unknown_keyword_error(keyword_hash, table, required+optional);
 	}
     }
+    if (values && !keyword_hash) {
+        for (i = 0; i < required + optional; i++) {
+            values[i] = Qundef;
+        }
+    }
     return j;
 #undef extract_kwarg
 }
 
-#undef rb_scan_args
-int
-rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...)
+struct rb_scan_args_t {
+    int kw_flag;
+    int n_lead;
+    int n_opt;
+    int n_trail;
+    bool f_var;
+    bool f_hash;
+    bool f_block;
+};
+
+static void
+rb_scan_args_parse(int kw_flag, const char *fmt, struct rb_scan_args_t *arg)
 {
-    int i;
     const char *p = fmt;
-    VALUE *var;
-    va_list vargs;
-    int f_var = 0, f_hash = 0, f_block = 0;
-    int n_lead = 0, n_opt = 0, n_trail = 0, n_mand;
-    int argi = 0;
-    VALUE hash = Qnil;
+
+    memset(arg, 0, sizeof(*arg));
+    arg->kw_flag = kw_flag;
 
     if (ISDIGIT(*p)) {
-	n_lead = *p - '0';
+        arg->n_lead = *p - '0';
 	p++;
 	if (ISDIGIT(*p)) {
-	    n_opt = *p - '0';
+            arg->n_opt = *p - '0';
 	    p++;
 	}
     }
     if (*p == '*') {
-	f_var = 1;
+        arg->f_var = 1;
 	p++;
     }
     if (ISDIGIT(*p)) {
-	n_trail = *p - '0';
+        arg->n_trail = *p - '0';
 	p++;
     }
     if (*p == ':') {
-	f_hash = 1;
+        arg->f_hash = 1;
 	p++;
     }
     if (*p == '&') {
-	f_block = 1;
+        arg->f_block = 1;
 	p++;
     }
     if (*p != '\0') {
 	rb_fatal("bad scan arg format: %s", fmt);
     }
-    n_mand = n_lead + n_trail;
-
-    if (argc < n_mand)
-	goto argc_error;
+}
 
-    va_start(vargs, fmt);
+static int
+rb_scan_args_assign(const struct rb_scan_args_t *arg, int argc, const VALUE *const argv, va_list vargs)
+{
+    int i, argi = 0;
+    VALUE *var, hash = Qnil;
+#define rb_scan_args_next_param() va_arg(vargs, VALUE *)
+    const int kw_flag = arg->kw_flag;
+    const int n_lead = arg->n_lead;
+    const int n_opt = arg->n_opt;
+    const int n_trail = arg->n_trail;
+    const int n_mand = n_lead + n_trail;
+    const bool f_var = arg->f_var;
+    const bool f_hash = arg->f_hash;
+    const bool f_block = arg->f_block;
 
-    /* capture an option hash - phase 1: pop */
-    if (f_hash && n_mand < argc) {
-	VALUE last = argv[argc - 1];
+    /* capture an option hash - phase 1: pop from the argv */
+    if (f_hash && argc > 0) {
+        VALUE last = argv[argc - 1];
+        if (rb_scan_args_keyword_p(kw_flag, last)) {
+            hash = rb_hash_dup(last);
+            argc--;
+        }
+    }
 
-	if (NIL_P(last)) {
-	    /* nil is taken as an empty option hash only if it is not
-	       ambiguous; i.e. '*' is not specified and arguments are
-	       given more than sufficient */
-	    if (!f_var && n_mand + n_opt < argc)
-		argc--;
-	}
-	else {
-	    hash = rb_check_hash_type(last);
-	    if (!NIL_P(hash)) {
-		VALUE opts = rb_extract_keywords(&hash);
-		if (!hash) argc--;
-		hash = opts ? opts : Qnil;
-	    }
-	}
+    if (argc < n_mand) {
+        goto argc_error;
     }
+
     /* capture leading mandatory arguments */
-    for (i = n_lead; i-- > 0; ) {
-	var = va_arg(vargs, VALUE *);
-	if (var) *var = argv[argi];
+    for (i = 0; i < n_lead; i++) {
+        var = rb_scan_args_next_param();
+        if (var) *var = argv[argi];
 	argi++;
     }
     /* capture optional arguments */
-    for (i = n_opt; i-- > 0; ) {
-	var = va_arg(vargs, VALUE *);
-	if (argi < argc - n_trail) {
-	    if (var) *var = argv[argi];
+    for (i = 0; i < n_opt; i++) {
+        var = rb_scan_args_next_param();
+        if (argi < argc - n_trail) {
+            if (var) *var = argv[argi];
 	    argi++;
 	}
 	else {
@@ -1969,11 +2231,11 @@ rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...)
     }
     /* capture variable length arguments */
     if (f_var) {
-	int n_var = argc - argi - n_trail;
+        int n_var = argc - argi - n_trail;
 
-	var = va_arg(vargs, VALUE *);
+        var = rb_scan_args_next_param();
 	if (0 < n_var) {
-	    if (var) *var = rb_ary_new4(n_var, &argv[argi]);
+            if (var) *var = rb_ary_new_from_values(n_var, &argv[argi]);
 	    argi += n_var;
 	}
 	else {
@@ -1981,19 +2243,19 @@ rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...)
 	}
     }
     /* capture trailing mandatory arguments */
-    for (i = n_trail; i-- > 0; ) {
-	var = va_arg(vargs, VALUE *);
-	if (var) *var = argv[argi];
+    for (i = 0; i < n_trail; i++) {
+        var = rb_scan_args_next_param();
+        if (var) *var = argv[argi];
 	argi++;
     }
     /* capture an option hash - phase 2: assignment */
     if (f_hash) {
-	var = va_arg(vargs, VALUE *);
-	if (var) *var = hash;
+        var = rb_scan_args_next_param();
+        if (var) *var = hash;
     }
     /* capture iterator block */
     if (f_block) {
-	var = va_arg(vargs, VALUE *);
+        var = rb_scan_args_next_param();
 	if (rb_block_given_p()) {
 	    *var = rb_block_proc();
 	}
@@ -2001,14 +2263,58 @@ rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...)
 	    *var = Qnil;
 	}
     }
-    va_end(vargs);
 
-    if (argi < argc) {
-      argc_error:
-	rb_error_arity(argc, n_mand, f_var ? UNLIMITED_ARGUMENTS : n_mand + n_opt);
+    if (argi == argc) {
+        return argc;
+    }
+
+  argc_error:
+    return -(argc + 1);
+#undef rb_scan_args_next_param
+}
+
+static int
+rb_scan_args_result(const struct rb_scan_args_t *const arg, int argc)
+{
+    const int n_lead = arg->n_lead;
+    const int n_opt = arg->n_opt;
+    const int n_trail = arg->n_trail;
+    const int n_mand = n_lead + n_trail;
+    const bool f_var = arg->f_var;
+
+    if (argc >= 0) {
+        return argc;
     }
 
-    return argc;
+    argc = -argc - 1;
+    rb_error_arity(argc, n_mand, f_var ? UNLIMITED_ARGUMENTS : n_mand + n_opt);
+    UNREACHABLE_RETURN(-1);
+}
+
+#undef rb_scan_args
+int
+rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...)
+{
+    va_list vargs;
+    struct rb_scan_args_t arg;
+    rb_scan_args_parse(RB_SCAN_ARGS_PASS_CALLED_KEYWORDS, fmt, &arg);
+    va_start(vargs,fmt);
+    argc = rb_scan_args_assign(&arg, argc, argv, vargs);
+    va_end(vargs);
+    return rb_scan_args_result(&arg, argc);
+}
+
+#undef rb_scan_args_kw
+int
+rb_scan_args_kw(int kw_flag, int argc, const VALUE *argv, const char *fmt, ...)
+{
+    va_list vargs;
+    struct rb_scan_args_t arg;
+    rb_scan_args_parse(kw_flag, fmt, &arg);
+    va_start(vargs,fmt);
+    argc = rb_scan_args_assign(&arg, argc, argv, vargs);
+    va_end(vargs);
+    return rb_scan_args_result(&arg, argc);
 }
 
 int
diff --git a/common.mk b/common.mk
index b9ced6753e..6372cbf92c 100644
--- a/common.mk
+++ b/common.mk
@@ -1,8 +1,10 @@
+# -*- mode: makefile-gmake; indent-tabs-mode: t -*-
+
 bin: $(PROGRAM) $(WPROGRAM)
 lib: $(LIBRUBY)
 dll: $(LIBRUBY_SO)
 
-.SUFFIXES: .inc .h .c .y .i .$(DTRACE_EXT)
+.SUFFIXES: .rbinc .rb .inc .h .c .y .i .$(ASMEXT) .$(DTRACE_EXT)
 
 # V=0 quiet, V=1 verbose.  other values don't work.
 V = 0
@@ -11,48 +13,76 @@ Q = $(Q1:0=@)
 ECHO0 = $(ECHO1:0=echo)
 ECHO = @$(ECHO0)
 
-UNICODE_VERSION = 8.0.0
+mflags = $(MFLAGS)
+gnumake_recursive =
+enable_shared = $(ENABLE_SHARED:no=)
+
+UNICODE_VERSION = 12.1.0
+UNICODE_EMOJI_VERSION = 12.1
+UNICODE_BETA = NO
+
+### set the following environment variable or uncomment the line if
+### the Unicode data files should be updated completely on every update ('make up',...).
+# ALWAYS_UPDATE_UNICODE = yes
+UNICODE_DATA_DIR = enc/unicode/data/$(UNICODE_VERSION)/ucd
+UNICODE_SRC_DATA_DIR = $(srcdir)/$(UNICODE_DATA_DIR)
+UNICODE_SRC_EMOJI_DATA_DIR = $(srcdir)/enc/unicode/data/emoji/$(UNICODE_EMOJI_VERSION)
+UNICODE_HDR_DIR = $(srcdir)/enc/unicode/$(UNICODE_VERSION)
+UNICODE_DATA_HEADERS = \
+	$(UNICODE_HDR_DIR)/casefold.h \
+	$(UNICODE_HDR_DIR)/name2ctype.h \
+	$(empty)
 
 RUBY_RELEASE_DATE = $(RUBY_RELEASE_YEAR)-$(RUBY_RELEASE_MONTH)-$(RUBY_RELEASE_DAY)
 RUBYLIB       = $(PATH_SEPARATOR)
 RUBYOPT       = -
 RUN_OPTS      = --disable-gems
 
+# GITPULLOPTIONS = --no-tags
+
+INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) -I$(UNICODE_HDR_DIR)
+
 GEM_HOME =
 GEM_PATH =
 GEM_VENDOR =
 
-SPEC_GIT_BASE = git://github.com/ruby
-MSPEC_GIT_URL = $(SPEC_GIT_BASE)/mspec.git
-RUBYSPEC_GIT_URL = $(SPEC_GIT_BASE)/spec.git
-
-SIMPLECOV_GIT_URL = git://github.com/colszowka/simplecov.git
-SIMPLECOV_GIT_REF = v0.10.0
-SIMPLECOV_HTML_GIT_URL = git://github.com/colszowka/simplecov-html.git
-SIMPLECOV_HTML_GIT_REF = v0.10.0
-DOCLIE_GIT_URL = git://github.com/ms-ati/docile.git
-DOCLIE_GIT_REF = v1.1.5
+BENCHMARK_DRIVER_GIT_URL = https://github.com/benchmark-driver/benchmark-driver
+BENCHMARK_DRIVER_GIT_REF = v0.15.15
+SIMPLECOV_GIT_URL = https://github.com/colszowka/simplecov.git
+SIMPLECOV_GIT_REF = v0.17.0
+SIMPLECOV_HTML_GIT_URL = https://github.com/colszowka/simplecov-html.git
+SIMPLECOV_HTML_GIT_REF = v0.10.2
+DOCLIE_GIT_URL = https://github.com/ms-ati/docile.git
+DOCLIE_GIT_REF = v1.3.2
 
 STATIC_RUBY   = static-ruby
 
+TIMESTAMPDIR  = $(EXTOUT)/.timestamp
+RUBYCOMMONDIR = $(EXTOUT)/common
 EXTCONF       = extconf.rb
 LIBRUBY_EXTS  = ./.libruby-with-ext.time
 REVISION_H    = ./.revision.time
-PLATFORM_D    = ./$(PLATFORM_DIR)/.time
-ENC_TRANS_D   = ./enc/trans/.time
+PLATFORM_D    = $(TIMESTAMPDIR)/.$(PLATFORM_DIR).time
+ENC_TRANS_D   = $(TIMESTAMPDIR)/.enc-trans.time
+RDOC          = $(XRUBY) "$(srcdir)/libexec/rdoc" --root "$(srcdir)" --encoding=UTF-8 --all
 RDOCOUT       = $(EXTOUT)/rdoc
 HTMLOUT       = $(EXTOUT)/html
 CAPIOUT       = doc/capi
+INSTALL_DOC_OPTS = --rdoc-output="$(RDOCOUT)" --html-output="$(HTMLOUT)"
+RDOC_GEN_OPTS = --page-dir "$(srcdir)/doc" --no-force-update
 
 INITOBJS      = dmyext.$(OBJEXT) dmyenc.$(OBJEXT)
 NORMALMAINOBJ = main.$(OBJEXT)
 MAINOBJ       = $(NORMALMAINOBJ)
 DLDOBJS	      = $(INITOBJS)
 EXTSOLIBS     =
-MINIOBJS      = $(ARCHMINIOBJS) miniinit.$(OBJEXT) dmyext.$(OBJEXT) miniprelude.$(OBJEXT)
+MINIOBJS      = $(ARCHMINIOBJS) miniinit.$(OBJEXT) dmyext.$(OBJEXT)
 ENC_MK        = enc.mk
+MAKE_ENC      = -f $(ENC_MK) V="$(V)" UNICODE_HDR_DIR="$(UNICODE_HDR_DIR)" \
+		RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(mflags)
 
 COMMONOBJS    = array.$(OBJEXT) \
+		ast.$(OBJEXT) \
 		bignum.$(OBJEXT) \
 		class.$(OBJEXT) \
 		compar.$(OBJEXT) \
@@ -60,6 +90,7 @@ COMMONOBJS    = array.$(OBJEXT) \
 		complex.$(OBJEXT) \
 		cont.$(OBJEXT) \
 		debug.$(OBJEXT) \
+		debug_counter.$(OBJEXT) \
 		dir.$(OBJEXT) \
 		dln_find.$(OBJEXT) \
 		encoding.$(OBJEXT) \
@@ -76,6 +107,9 @@ COMMONOBJS    = array.$(OBJEXT) \
 		load.$(OBJEXT) \
 		marshal.$(OBJEXT) \
 		math.$(OBJEXT) \
+		memory_view.$(OBJEXT) \
+		mjit.$(OBJEXT) \
+		mjit_compile.$(OBJEXT) \
 		node.$(OBJEXT) \
 		numeric.$(OBJEXT) \
 		object.$(OBJEXT) \
@@ -83,6 +117,7 @@ COMMONOBJS    = array.$(OBJEXT) \
 		parse.$(OBJEXT) \
 		proc.$(OBJEXT) \
 		process.$(OBJEXT) \
+		ractor.$(OBJEXT) \
 		random.$(OBJEXT) \
 		range.$(OBJEXT) \
 		rational.$(OBJEXT) \
@@ -94,7 +129,7 @@ COMMONOBJS    = array.$(OBJEXT) \
 		regparse.$(OBJEXT) \
 		regsyntax.$(OBJEXT) \
 		ruby.$(OBJEXT) \
-		safe.$(OBJEXT) \
+		scheduler.$(OBJEXT) \
 		signal.$(OBJEXT) \
 		sprintf.$(OBJEXT) \
 		st.$(OBJEXT) \
@@ -105,13 +140,16 @@ COMMONOBJS    = array.$(OBJEXT) \
 		thread.$(OBJEXT) \
 		time.$(OBJEXT) \
 		transcode.$(OBJEXT) \
+		transient_heap.$(OBJEXT) \
 		util.$(OBJEXT) \
 		variable.$(OBJEXT) \
 		version.$(OBJEXT) \
 		vm.$(OBJEXT) \
 		vm_backtrace.$(OBJEXT) \
 		vm_dump.$(OBJEXT) \
+		vm_sync.$(OBJEXT) \
 		vm_trace.$(OBJEXT) \
+		$(COROUTINE_OBJ) \
 		$(DTRACE_OBJ) \
 		$(BUILTIN_ENCOBJS) \
 		$(BUILTIN_TRANSOBJS) \
@@ -122,15 +160,15 @@ EXPORTOBJS    = $(DLNOBJ) \
 		loadpath.$(OBJEXT) \
 		$(COMMONOBJS)
 
-OBJS          = $(EXPORTOBJS) prelude.$(OBJEXT)
+OBJS          = $(EXPORTOBJS) builtin.$(OBJEXT)
 ALLOBJS       = $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(INITOBJS)
 
 GOLFOBJS      = goruby.$(OBJEXT) golf_prelude.$(OBJEXT)
 
 DEFAULT_PRELUDES = $(GEM_PRELUDE)
-PRELUDE_SCRIPTS = $(srcdir)/prelude.rb $(srcdir)/enc/prelude.rb $(DEFAULT_PRELUDES)
-GEM_PRELUDE   = $(srcdir)/gem_prelude.rb
-PRELUDES      = {$(srcdir)}prelude.c {$(srcdir)}miniprelude.c
+PRELUDE_SCRIPTS = $(DEFAULT_PRELUDES)
+GEM_PRELUDE   =
+PRELUDES      = {$(srcdir)}miniprelude.c
 GOLFPRELUDES  = {$(srcdir)}golf_prelude.c
 
 SCRIPT_ARGS   =	--dest-dir="$(DESTDIR)" \
@@ -141,7 +179,7 @@ EXTMK_ARGS    =	$(SCRIPT_ARGS) --extension $(EXTS) --extstatic $(EXTSTATIC) \
 		--make-flags="V=$(V) MINIRUBY='$(MINIRUBY)'" \
 		--gnumake=$(gnumake) --extflags="$(EXTLDFLAGS)" \
 		--
-INSTRUBY      =	$(SUDO) $(RUNRUBY) -r./$(arch)-fake $(srcdir)/tool/rbinstall.rb
+INSTRUBY      =	$(SUDO) $(RUNRUBY) -r./$(arch)-fake $(tooldir)/rbinstall.rb
 INSTRUBY_ARGS =	$(SCRIPT_ARGS) \
 		--data-mode=$(INSTALL_DATA_MODE) \
 		--prog-mode=$(INSTALL_PROG_MODE) \
@@ -150,30 +188,69 @@ INSTRUBY_ARGS =	$(SCRIPT_ARGS) \
 INSTALL_PROG_MODE = 0755
 INSTALL_DATA_MODE = 0644
 
-PRE_LIBRUBY_UPDATE = $(MINIRUBY) -e 'ARGV[1] or File.unlink(ARGV[0]) rescue nil' -- \
-			$(LIBRUBY_EXTS) $(LIBRUBY_SO_UPDATE)
-
 TESTSDIR      = $(srcdir)/test
+TOOL_TESTSDIR = $(tooldir)/test
 TEST_EXCLUDES = --excludes-dir=$(TESTSDIR)/excludes --name=!/memory_leak/
-EXCLUDE_TESTFRAMEWORK = --exclude=/testunit/ --exclude=/minitest/
 TESTWORKDIR   = testwork
 TESTOPTS      = $(RUBY_TESTOPTS)
 
 TESTRUN_SCRIPT = $(srcdir)/test.rb
 
-COMPILE_PRELUDE = $(srcdir)/tool/generic_erb.rb $(srcdir)/template/prelude.c.tmpl
+COMPILE_PRELUDE = $(tooldir)/generic_erb.rb $(srcdir)/template/prelude.c.tmpl \
+	$(tooldir)/ruby_vm/helpers/c_escape.rb
 
 SHOWFLAGS = showflags
 
+MAKE_LINK = $(MINIRUBY) -rfileutils -e "include FileUtils::Verbose" \
+	  -e "src, dest = ARGV" \
+	  -e "exit if File.identical?(src, dest) or cmp(src, dest) rescue nil" \
+	  -e "def noraise; yield; rescue; rescue NotImplementedError; end" \
+	  -e "noraise {ln_sf('../'*dest.count('/')+src, dest)} or" \
+	  -e "noraise {ln(src, dest)} or" \
+	  -e "cp(src, dest)"
+
+
 all: $(SHOWFLAGS) main docs
 
-main: $(SHOWFLAGS) exts $(ENCSTATIC:static=lib)encs
+main: $(SHOWFLAGS) exts $(ENCSTATIC:static=lib)encs programs
 	@$(NULLCMD)
 
+mjit-headers: $(MJIT_SUPPORT)-mjit-headers
+no-mjit-headers: PHONY
+yes-mjit-headers: mjit_config.h PHONY
+
+mjit.$(OBJEXT): mjit_config.h
+mjit_config.h: Makefile
+
+
+# These rules using MJIT_HEADER_SUFFIX must be in common.mk, not
+# Makefile.in, in order to override the macro in defs/universal.mk.
+
+# Other `-Dxxx`s preceding `-DMJIT_HEADER` will be removed in transform_mjit_header.rb.
+# So `-DMJIT_HEADER` should be passed first when rb_mjit_header.h is generated.
+$(TIMESTAMPDIR)/$(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).time: probes.h vm.$(OBJEXT) \
+		$(TIMESTAMPDIR)/$(arch)/.time $(tooldir)/mjit_tabs.rb $(PREP) $(RBCONFIG)
+	$(ECHO) building $(@F:.time=.h)
+	$(MINIRUBY) $(tooldir)/mjit_tabs.rb "$(MJIT_TABS)" \
+		$(CPP) -DMJIT_HEADER $(MJIT_HEADER_FLAGS) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(srcdir)/vm.c $(CPPOUTFLAG)$(@F:.time=.h).new
+	$(Q) $(IFCHANGE) "--timestamp=$@" $(@F:.time=.h) $(@F:.time=.h).new
+
+$(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).h: $(TIMESTAMPDIR)/$(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).time
+
+$(MJIT_MIN_HEADER:.h=)$(MJIT_HEADER_SUFFIX).h: \
+		$(TIMESTAMPDIR)/$(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).time \
+		$(tooldir)/transform_mjit_header.rb $(PREP) \
+		$(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).h
+	$(ECHO) building $@
+	$(MINIRUBY) $(tooldir)/transform_mjit_header.rb "$(CC) $(ARCH_FLAG) $(CFLAGS)" $(MJIT_HEADER:.h=)$(MJIT_HEADER_ARCH).h $@
+	$(Q) $(MAKEDIRS) $(MJIT_HEADER_INSTALL_DIR)
+	$(Q) $(MAKE_LINK) $@ $(MJIT_HEADER_INSTALL_DIR)/$(@F)
+
 .PHONY: showflags
 exts enc trans: $(SHOWFLAGS)
 showflags:
 	$(MESSAGE_BEGIN) \
+	"	BASERUBY = $(BASERUBY)" \
 	"	CC = $(CC)" \
 	"	LD = $(LD)" \
 	"	LDSHARED = $(LDSHARED)" \
@@ -182,6 +259,10 @@ showflags:
 	"	CPPFLAGS = $(CPPFLAGS)" \
 	"	DLDFLAGS = $(DLDFLAGS)" \
 	"	SOLIBS = $(SOLIBS)" \
+	"	LANG = $(LANG)" \
+	"	LC_ALL = $(LC_ALL)" \
+	"	LC_CTYPE = $(LC_CTYPE)" \
+	"	MFLAGS = $(MFLAGS)" \
 	$(MESSAGE_END)
 	-@$(CC_VERSION)
 
@@ -191,20 +272,44 @@ showconfig:
 	$(configure_args) \
 	$(ECHO_END)
 
+EXTS_NOTE = -f $(EXTS_MK) $(mflags) RUBY="$(MINIRUBY)" top_srcdir="$(srcdir)" note
+
 exts: build-ext
 
 EXTS_MK = exts.mk
-$(EXTS_MK): $(MKFILES) all-incs $(PREP) $(RBCONFIG) $(LIBRUBY)
+$(EXTS_MK): ext/configure-ext.mk $(srcdir)/template/exts.mk.tmpl \
+	    $(TIMESTAMPDIR)/$(arch)/.time $(TIMESTAMPDIR)/.RUBYCOMMONDIR.time
+	$(Q)$(MAKE) -f ext/configure-ext.mk $(mflags) V=$(V) EXTSTATIC=$(EXTSTATIC) \
+		gnumake=$(gnumake) MINIRUBY="$(MINIRUBY)" \
+		EXTLDFLAGS="$(EXTLDFLAGS)" srcdir="$(srcdir)"
 	$(ECHO) generating makefile $@
-	$(Q)$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" --command-output=$(EXTS_MK) $(EXTMK_ARGS) configure
+	$(Q)$(MINIRUBY) $(tooldir)/generic_erb.rb -o $@ -c \
+	    $(srcdir)/template/exts.mk.tmpl --gnumake=$(gnumake) --configure-exts=ext/configure-ext.mk
+
+ext/configure-ext.mk: $(PREP) all-incs $(MKFILES) $(RBCONFIG) $(LIBRUBY) \
+		$(srcdir)/template/configure-ext.mk.tmpl
+	$(ECHO) generating makefiles $@
+	$(Q)$(MAKEDIRS) $(@D)
+	$(Q)$(MINIRUBY) $(tooldir)/generic_erb.rb -o $@ -c \
+	    $(srcdir)/template/$(@F).tmpl --srcdir="$(srcdir)" \
+	    --miniruby="$(MINIRUBY)" --script-args='$(SCRIPT_ARGS)'
 
 configure-ext: $(EXTS_MK)
 
 build-ext: $(EXTS_MK)
-	$(Q)$(MAKE) -f $(EXTS_MK) $(MFLAGS) libdir="$(libdir)" LIBRUBY_EXTS=$(LIBRUBY_EXTS) \
+	$(Q)$(MAKE) -f $(EXTS_MK) $(mflags) libdir="$(libdir)" LIBRUBY_EXTS=$(LIBRUBY_EXTS) \
 	    EXTENCS="$(ENCOBJS)" UPDATE_LIBRARIES=no $(EXTSTATIC)
+	$(Q)$(MAKE) $(EXTS_NOTE)
+
+exts-note: $(EXTS_MK)
+	$(Q)$(MAKE) $(EXTS_NOTE)
+
+ext/extinit.c: $(srcdir)/template/extinit.c.tmpl $(PREP)
+	$(Q)$(MINIRUBY) $(tooldir)/generic_erb.rb -o $@ -c \
+	    $(srcdir)/template/extinit.c.tmpl $(EXTINITS)
 
 prog: program wprogram
+programs: $(PROGRAM) $(WPROGRAM) $(arch)-fake.rb
 
 $(PREP): $(MKFILES)
 
@@ -213,19 +318,27 @@ miniruby$(EXEEXT): config.status $(ALLOBJS) $(ARCHFILE)
 objs: $(ALLOBJS)
 
 GORUBY = go$(RUBY_INSTALL_NAME)
-golf: $(LIBRUBY) $(GOLFOBJS) PHONY
-	$(Q) $(MAKE) $(MFLAGS) MAINOBJ="$(GOLFOBJS)" PROGRAM=$(GORUBY)$(EXEEXT) program
+GOLF = $(GORUBY)
+golf: $(GOLF)
+$(GOLF): $(LIBRUBY) $(GOLFOBJS) PHONY
+	$(Q) $(MAKE) $(mflags) \
+		GOLF=_dummy_golf_target_to_avoid_conflict_just_in_case_ \
+		MAINOBJ=goruby.$(OBJEXT) \
+		EXTOBJS="golf_prelude.$(OBJEXT) $(EXTOBJS)" \
+		PROGRAM=$(GORUBY)$(EXEEXT) \
+		V=$(V) \
+	program
 capi: $(CAPIOUT)/.timestamp PHONY
 
 $(CAPIOUT)/.timestamp: Doxyfile $(PREP)
 	$(Q) $(MAKEDIRS) "$(@D)"
 	$(ECHO) generating capi
 	-$(Q) $(DOXYGEN) -b
-	$(Q) $(MINIRUBY) -e 'File.open(ARGV[0], "w"){|f| f.puts(Time.now)}' "$@"
+	$(Q) $(MINIRUBY) -e 'File.open(ARGV[0], "w"){'"|f|"' f.puts(Time.now)}' "$@"
 
-Doxyfile: $(srcdir)/template/Doxyfile.tmpl $(PREP) $(srcdir)/tool/generic_erb.rb $(RBCONFIG)
+Doxyfile: $(srcdir)/template/Doxyfile.tmpl $(PREP) $(tooldir)/generic_erb.rb $(RBCONFIG)
 	$(ECHO) generating $@
-	$(Q) $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ $(srcdir)/template/Doxyfile.tmpl \
+	$(Q) $(MINIRUBY) $(tooldir)/generic_erb.rb -o $@ $(srcdir)/template/Doxyfile.tmpl \
 	--srcdir="$(srcdir)" --miniruby="$(MINIRUBY)"
 
 program: $(SHOWFLAGS) $(PROGRAM)
@@ -236,18 +349,22 @@ $(PROGRAM) $(WPROGRAM): $(LIBRUBY) $(MAINOBJ) $(OBJS) $(EXTOBJS) $(SETUP) $(PREP
 
 $(LIBRUBY_A):	$(LIBRUBY_A_OBJS) $(MAINOBJ) $(INITOBJS) $(ARCHFILE)
 
-$(LIBRUBY_SO):	$(OBJS) $(DLDOBJS) $(LIBRUBY_A) $(PREP) $(LIBRUBY_SO_UPDATE) $(BUILTIN_ENCOBJS)
+$(LIBRUBY_SO):	$(OBJS) $(DLDOBJS) $(LIBRUBY_A) $(PREP) $(BUILTIN_ENCOBJS)
 
 $(LIBRUBY_EXTS):
-	@exit > $@
+	@$(NULLCMD) > $@
 
 $(STATIC_RUBY)$(EXEEXT): $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A)
 	$(Q)$(RM) $@
-	$(PURIFY) $(CC) $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)$@ $(LDFLAGS) $(XLDFLAGS)
+	$(PURIFY) $(CC) $(MAINOBJ) $(DLDOBJS) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)$@ $(LDFLAGS) $(XLDFLAGS)
 
 ruby.imp: $(COMMONOBJS)
-	$(Q)$(NM) -Pgp $(COMMONOBJS) | \
-	awk 'BEGIN{print "#!"}; $$2~/^[BDT]$$/&&$$1!~/^(Init_|ruby_static_id_|.*_threadptr_|\.)/{print $$1}' | \
+	$(Q){ \
+	$(NM) -Pgp $(COMMONOBJS) | \
+	awk 'BEGIN{print "#!"}; $$2~/^[A-TV-Z]$$/&&$$1!~/^$(SYMBOL_PREFIX)(Init_|InitVM_|ruby_static_id_|.*_threadptr_|rb_ec_)|^\./{print $$1}'; \
+	($(CHDIR) $(srcdir) && \
+	 exec sed -n '/^MJIT_FUNC_EXPORTED/!d;N;s/.*\n\(rb_[a-zA-Z_0-9]*\).*/$(SYMBOL_PREFIX)\1/p' cont.c gc.c thread*c vm*.c) \
+	} | \
 	sort -u -o $@
 
 install: install-$(INSTALLDOC)
@@ -256,17 +373,17 @@ pkgconfig-data: $(ruby_pc)
 $(ruby_pc): $(srcdir)/template/ruby.pc.in config.status
 
 install-all: docs pre-install-all do-install-all post-install-all
-pre-install-all:: all pre-install-local pre-install-ext pre-install-doc
+pre-install-all:: all pre-install-local pre-install-ext pre-install-gem pre-install-doc
 do-install-all: pre-install-all
-	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=all --rdoc-output="$(RDOCOUT)"
-post-install-all:: post-install-local post-install-ext post-install-doc
+	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) $(INSTALL_DOC_OPTS)
+post-install-all:: post-install-local post-install-ext post-install-gem post-install-doc
 	@$(NULLCMD)
 
 install-nodoc: pre-install-nodoc do-install-nodoc post-install-nodoc
-pre-install-nodoc:: pre-install-local pre-install-ext
+pre-install-nodoc:: pre-install-local pre-install-ext pre-install-gem
 do-install-nodoc: main pre-install-nodoc
-	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS)
-post-install-nodoc:: post-install-local post-install-ext
+	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --exclude=doc
+post-install-nodoc:: post-install-local post-install-ext post-install-gem
 
 install-local: pre-install-local do-install-local post-install-local
 pre-install-local:: pre-install-bin pre-install-lib pre-install-man
@@ -340,12 +457,12 @@ what-where-all: no-install-all
 no-install-all: pre-no-install-all dont-install-all post-no-install-all
 pre-no-install-all:: pre-no-install-local pre-no-install-ext pre-no-install-doc
 dont-install-all: $(PROGRAM)
-	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=all --rdoc-output="$(RDOCOUT)"
+	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=all $(INSTALL_DOC_OPTS)
 post-no-install-all:: post-no-install-local post-no-install-ext post-no-install-doc
 	@$(NULLCMD)
 
 uninstall: $(INSTALLED_LIST) sudo-precheck
-	$(Q)$(SUDO) $(MINIRUBY) $(srcdir)/tool/rbuninstall.rb --destdir=$(DESTDIR) $(INSTALLED_LIST)
+	$(Q)$(SUDO) $(MINIRUBY) $(tooldir)/rbuninstall.rb --destdir=$(DESTDIR) $(INSTALLED_LIST)
 
 reinstall: all uninstall install
 
@@ -427,28 +544,35 @@ post-no-install-man::
 install-doc: rdoc pre-install-doc do-install-doc post-install-doc
 pre-install-doc:: install-prereq
 do-install-doc: $(PROGRAM) pre-install-doc
-	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=rdoc --rdoc-output="$(RDOCOUT)"
+	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=rdoc $(INSTALL_DOC_OPTS)
 post-install-doc::
 	@$(NULLCMD)
 
 install-gem: pre-install-gem do-install-gem post-install-gem
-pre-install-gem:: pre-install-bin pre-install-lib pre-install-man
+pre-install-gem:: prepare-gems pre-install-bin pre-install-lib pre-install-man
 do-install-gem: $(PROGRAM) pre-install-gem
 	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=gem
 post-install-gem::
 	@$(NULLCMD)
 
+install-dbg: pre-install-dbg do-install-dbg post-install-dbg
+pre-install-dbg::
+do-install-dbg: $(PROGRAM) pre-install-dbg
+	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=dbg
+post-install-dbg::
+	@$(NULLCMD)
+
 rdoc: PHONY main
 	@echo Generating RDoc documentation
-	$(Q) $(XRUBY) "$(srcdir)/bin/rdoc" --root "$(srcdir)" --page-dir "$(srcdir)/doc" --encoding=UTF-8 --no-force-update --all --ri --op "$(RDOCOUT)" --debug $(RDOCFLAGS) "$(srcdir)"
+	$(Q) $(RDOC) --ri --op "$(RDOCOUT)" $(RDOC_GEN_OPTS) $(RDOCFLAGS) "$(srcdir)"
 
 html: PHONY main
 	@echo Generating RDoc HTML files
-	$(Q) $(XRUBY) "$(srcdir)/bin/rdoc" --root "$(srcdir)" --page-dir "$(srcdir)/doc" --encoding=UTF-8 --no-force-update --all --op "$(HTMLOUT)" --debug $(RDOCFLAGS) "$(srcdir)"
+	$(Q) $(RDOC) --op "$(HTMLOUT)" $(RDOC_GEN_OPTS) $(RDOCFLAGS) "$(srcdir)"
 
 rdoc-coverage: PHONY main
 	@echo Generating RDoc coverage report
-	$(Q) $(XRUBY) "$(srcdir)/bin/rdoc" --root "$(srcdir)" --encoding=UTF-8 --all --quiet -C $(RDOCFLAGS) "$(srcdir)"
+	$(Q) $(RDOC) --quiet -C $(RDOCFLAGS) "$(srcdir)"
 
 RDOCBENCHOUT=/tmp/rdocbench
 
@@ -466,7 +590,7 @@ 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)
-	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=rdoc --rdoc-output="$(RDOCOUT)"
+	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=rdoc $(INSTALL_DOC_OPTS)
 post-no-install-doc::
 	@$(NULLCMD)
 
@@ -477,17 +601,21 @@ install-prereq: $(CLEAR_INSTALLED_LIST) yes-fake sudo-precheck PHONY
 clear-installed-list: PHONY
 	@> $(INSTALLED_LIST) set MAKE="$(MAKE)"
 
-clean: clean-ext clean-enc clean-golf clean-rdoc clean-capi clean-extout clean-local clean-platform
+clean: clean-ext clean-enc clean-golf clean-docs clean-extout clean-local clean-platform clean-spec
 clean-local:: clean-runnable
 	$(Q)$(RM) $(OBJS) $(MINIOBJS) $(MAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES)
 	$(Q)$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) dmyenc.$(OBJEXT) $(ARCHFILE) .*.time
-	$(Q)$(RM) y.tab.c y.output encdb.h transdb.h config.log rbconfig.rb $(ruby_pc) probes.h probes.$(OBJEXT) probes.stamp ruby-glommed.$(OBJEXT)
-	$(Q)$(RM) GNUmakefile.old Makefile.old $(arch)-fake.rb bisect.sh $(ENC_TRANS_D)
-	-$(Q) $(RMDIR) enc/jis enc/trans enc 2> $(NULL) || exit 0
-clean-runnable:: PHONY
-	$(Q)$(CHDIR) bin 2>$(NULL) && $(RM) $(PROGRAM) $(WPROGRAM) $(GORUBY)$(EXEEXT) bin/*.$(DLEXT) 2>$(NULL) || exit 0
-	$(Q)$(CHDIR) lib 2>$(NULL) && $(RM) $(LIBRUBY_A) $(LIBRUBY) $(LIBRUBY_ALIASES) $(RUBY_BASE_NAME)/$(RUBY_PROGRAM_VERSION) $(RUBY_BASE_NAME)/vendor_ruby 2>$(NULL) || exit 0
-	$(Q)$(RMDIR) lib/$(RUBY_BASE_NAME) lib bin 2>$(NULL) || exit 0
+	$(Q)$(RM) y.tab.c y.output encdb.h transdb.h config.log rbconfig.rb $(ruby_pc) $(COROUTINE_H:/Context.h=/.time)
+	$(Q)$(RM) probes.h probes.$(OBJEXT) probes.stamp ruby-glommed.$(OBJEXT) ruby.imp ChangeLog $(STATIC_RUBY)$(EXEEXT)
+	$(Q)$(RM) GNUmakefile.old Makefile.old $(arch)-fake.rb bisect.sh $(ENC_TRANS_D) builtin_binary.inc
+	-$(Q) $(RMDIR) enc/jis enc/trans enc $(COROUTINE_H:/Context.h=) coroutine 2> $(NULL) || $(NULLCMD)
+
+bin/clean-runnable:: PHONY
+	$(Q)$(CHDIR) bin 2>$(NULL) && $(RM) $(PROGRAM) $(WPROGRAM) $(GORUBY)$(EXEEXT) bin/*.$(DLEXT) 2>$(NULL) || $(NULLCMD)
+lib/clean-runnable:: PHONY
+	$(Q)$(CHDIR) lib 2>$(NULL) && $(RM) $(LIBRUBY_A) $(LIBRUBY) $(LIBRUBY_ALIASES) $(RUBY_BASE_NAME)/$(RUBY_PROGRAM_VERSION) $(RUBY_BASE_NAME)/vendor_ruby 2>$(NULL) || $(NULLCMD)
+clean-runnable:: bin/clean-runnable lib/clean-runnable PHONY
+	$(Q)$(RMDIR) lib/$(RUBY_BASE_NAME) lib bin 2>$(NULL) || $(NULLCMD)
 clean-ext:: PHONY
 clean-golf: PHONY
 	$(Q)$(RM) $(GORUBY)$(EXEEXT) $(GOLFOBJS)
@@ -496,40 +624,85 @@ clean-html: PHONY
 clean-capi: PHONY
 clean-platform: PHONY
 clean-extout: PHONY
-	-$(Q)$(RMDIR) $(EXTOUT)/$(arch) $(EXTOUT) 2> $(NULL) || exit 0
+	-$(Q)$(RMDIR) $(EXTOUT)/$(arch) $(EXTOUT) 2> $(NULL) || $(NULLCMD)
 clean-docs: clean-rdoc clean-html clean-capi
+clean-spec: PHONY
+clean-rubyspec: clean-spec
 
-distclean: distclean-ext distclean-enc distclean-golf distclean-extout distclean-local distclean-platform
+distclean: distclean-ext distclean-enc distclean-golf distclean-docs distclean-extout distclean-local distclean-platform distclean-spec
 distclean-local:: clean-local
-	$(Q)$(RM) $(MKFILES) yasmdata.rb *.inc $(PRELUDES)
+	$(Q)$(RM) $(MKFILES) yasmdata.rb *.inc $(PRELUDES) *.rbinc
 	$(Q)$(RM) config.cache config.status config.status.lineno
 	$(Q)$(RM) *~ *.bak *.stackdump core *.core gmon.out $(PREP)
 	-$(Q)$(RMALL) $(srcdir)/autom4te.cache
 distclean-ext:: PHONY
 distclean-golf: clean-golf
-distclean-rdoc: PHONY
-distclean-html: PHONY
-distclean-capi: PHONY
+distclean-rdoc: clean-rdoc
+distclean-html: clean-html
+distclean-capi: clean-capi
+distclean-docs: clean-docs
 distclean-extout: clean-extout
 distclean-platform: clean-platform
+distclean-spec: clean-spec
+distclean-rubyspec: distclean-spec
 
 realclean:: realclean-ext realclean-local realclean-enc realclean-golf realclean-extout
-realclean-local:: distclean-local
+realclean-local:: distclean-local realclean-srcs-local
+
+clean-srcs:: clean-srcs-local clean-srcs-ext
+realclean-srcs:: realclean-srcs-local realclean-srcs-ext
+
+clean-srcs-local::
 	$(Q)$(RM) parse.c parse.h lex.c enc/trans/newline.c revision.h
-	$(Q)$(RM) id.c id.h probes.dmyh
-	$(Q)$(CHDIR) $(srcdir) && $(exec) $(RM) parse.c parse.h lex.c enc/trans/newline.c $(PRELUDES) revision.h
-	$(Q)$(CHDIR) $(srcdir) && $(exec) $(RM) id.c id.h probes.dmyh
-	$(Q)$(CHDIR) $(srcdir) && $(exec) $(RM) configure aclocal.m4 tool/config.guess tool/config.sub gems/*.gem
+	$(Q)$(RM) id.c id.h probes.dmyh probes.h
+	$(Q)$(RM) encdb.h transdb.h verconf.h ruby-runner.h
+	$(Q)$(RM) mjit_config.h rb_mjit_header.h
+	$(Q)$(RM) $(MJIT_MIN_HEADER) $(MJIT_MIN_HEADER:.h=)$(MJIT_HEADER_SUFFIX:%=*).h
+
+realclean-srcs-local:: clean-srcs-local
+	$(Q)$(CHDIR) $(srcdir) && $(RM) \
+	  parse.c parse.h lex.c enc/trans/newline.c $(PRELUDES) revision.h \
+	  id.c id.h probes.dmyh configure aclocal.m4 tool/config.guess tool/config.sub gems/*.gem \
+	|| $(NULLCMD)
+
+clean-srcs-ext::
+realclean-srcs-ext:: clean-srcs-ext
+
 realclean-ext:: PHONY
 realclean-golf: distclean-golf
 	$(Q)$(RM) $(GOLFPRELUDES)
-realclean-capi: PHONY
+realclean-rdoc: distclean-rdoc
+realclean-html: distclean-html
+realclean-capi: distclean-capi
+realclean-docs: distclean-docs
 realclean-extout: distclean-extout
+realclean-platform: distclean-platform
+realclean-spec: distclean-spec
+realclean-rubyspec: realclean-spec
+
+clean-ext:: ext/clean gems/clean timestamp/clean
+distclean-ext:: ext/distclean gems/distclean timestamp/distclean
+realclean-ext:: ext/realclean gems/realclean timestamp/realclean
+
+ext/clean.mk ext/distclean.mk ext/realclean.mk::
+ext/clean:: ext/clean.mk
+ext/distclean:: ext/distclean.mk
+ext/realclean:: ext/realclean.mk
+
+timestamp/clean:: ext/clean gems/clean
+timestamp/distclean:: ext/distclean gems/distclean
+timestamp/realclean:: ext/realclean gems/realclean
 
-clean-ext distclean-ext realclean-ext::
-	$(Q)$(RM) $(EXTS_MK)
-	$(Q)$(RM) $(EXTOUT)/.timestamp/.*.time
-	$(Q)$(RMDIR) $(EXTOUT)/.timestamp 2> $(NULL) || exit 0
+timestamp/clean timestamp/distclean timestamp/realclean::
+	$(Q)$(RM) $(TIMESTAMPDIR)/.*.time $(TIMESTAMPDIR)/$(arch)/.time
+	$(Q)$(RMDIRS) $(TIMESTAMPDIR)/$(arch) $(TIMESTAMPDIR) 2> $(NULL) || $(NULLCMD)
+
+clean-ext::
+	-$(Q)$(RM) ext/extinit.$(OBJEXT)
+
+distclean-ext realclean-ext::
+	-$(Q)$(RM) $(EXTS_MK) ext/extinit.* ext/configure-ext.mk
+	-$(Q)$(RMDIR) ext 2> $(NULL) || $(NULLCMD)
 
 clean-enc distclean-enc realclean-enc: PHONY
 
@@ -537,7 +710,7 @@ clean-enc: clean-enc.d
 
 clean-enc.d: PHONY
 	$(Q)$(RM) $(ENC_TRANS_D)
-	-$(Q) $(RMDIR) enc/jis enc/trans enc 2> $(NULL) || exit 0
+	-$(Q) $(RMDIR) enc/jis enc/trans enc 2> $(NULL) || $(NULLCMD)
 
 clean-rdoc distclean-rdoc realclean-rdoc:
 	@echo $(@:-rdoc=ing) rdoc
@@ -551,12 +724,23 @@ clean-capi distclean-capi realclean-capi:
 	@echo $(@:-capi=ing) capi
 	$(Q)$(RMALL) $(CAPIOUT)
 
-clean-platform:
+clean-platform distclean-platform realclean-platform:
 	$(Q) $(RM) $(PLATFORM_D)
-	-$(Q) $(RMDIR) $(PLATFORM_DIR) 2> $(NULL) || exit 0
+	-$(Q) $(RMDIR) $(PLATFORM_DIR) 2> $(NULL) || $(NULLCMD)
+
+RUBYSPEC_CAPIEXT = spec/ruby/optional/capi/ext
+clean-spec: PHONY
+	-$(Q) $(RM) $(RUBYSPEC_CAPIEXT)/*.$(OBJEXT) $(RUBYSPEC_CAPIEXT)/*.$(DLEXT)
+	-$(Q) $(RMDIRS) $(RUBYSPEC_CAPIEXT) 2> $(NULL) || $(NULLCMD)
+	-$(Q) $(RMALL) rubyspec_temp
 
-check: main test test-testframework test-almost
+check: main test test-tool test-all test-spec
 	$(ECHO) check succeeded
+	-$(Q) if [ x"$(GIT)" != x ] && $(CHDIR) "$(srcdir)" && \
+	    b=`$(GIT) symbolic-ref --short HEAD 2>&1` && \
+	    u=`$(GIT) branch --list --format='%(upstream:short)' $$b`; then \
+	  set -x; $(GIT) --no-pager log --format=oneline -G "^ *# *include" $$u..HEAD --; \
+	fi
 check-ruby: test test-ruby
 
 fake: $(CROSS_COMPILING)-fake
@@ -565,21 +749,24 @@ no-fake -fake: PHONY
 
 # really doesn't depend on .o, just ensure newer than headers which
 # version.o depends on.
-$(arch)-fake.rb: $(srcdir)/template/fake.rb.in $(srcdir)/tool/generic_erb.rb version.$(OBJEXT) miniruby$(EXEEXT)
+$(arch)-fake.rb: $(srcdir)/template/fake.rb.in $(tooldir)/generic_erb.rb version.$(OBJEXT) miniruby$(EXEEXT)
 	$(ECHO) generating $@
-	$(Q) $(CPP) $(warnflags) $(XCFLAGS) $(CPPFLAGS) "$(srcdir)/version.c" | \
-	$(BOOTSTRAPRUBY) "$(srcdir)/tool/generic_erb.rb" -o $@ "$(srcdir)/template/fake.rb.in" \
+	$(Q) $(CPP) -DRUBY_EXPORT $(INCFLAGS) $(CPPFLAGS) "$(srcdir)/version.c" | \
+	$(BOOTSTRAPRUBY) "$(tooldir)/generic_erb.rb" -o $@ "$(srcdir)/template/fake.rb.in" \
 		i=- srcdir="$(srcdir)" BASERUBY="$(BASERUBY)"
 
 btest: $(TEST_RUNNABLE)-btest
 no-btest: PHONY
 yes-btest: fake miniruby$(EXEEXT) PHONY
-	$(Q)$(exec) $(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(BTESTRUBY) $(RUN_OPTS)" $(OPTS) $(TESTOPTS)
+	$(Q)$(exec) $(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(BTESTRUBY) $(RUN_OPTS)" $(OPTS) $(TESTOPTS) $(BTESTS)
 
 btest-ruby: $(TEST_RUNNABLE)-btest-ruby
 no-btest-ruby: PHONY
 yes-btest-ruby: prog PHONY
-	$(Q)$(exec) $(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) -I$(srcdir)/lib $(RUN_OPTS)" -q $(OPTS) $(TESTOPTS)
+	$(Q)$(exec) $(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) -I$(srcdir)/lib $(RUN_OPTS)" -q $(OPTS) $(TESTOPTS) $(BTESTS)
+
+rtest: fake miniruby$(EXEEXT) PHONY
+	$(Q)$(exec) $(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(BTESTRUBY) $(RUN_OPTS)" --sets=ractor -v
 
 test-basic: $(TEST_RUNNABLE)-test-basic
 no-test-basic: PHONY
@@ -594,67 +781,82 @@ yes-test-knownbug: prog PHONY
 
 test-testframework: $(TEST_RUNNABLE)-test-testframework
 yes-test-testframework: prog PHONY
-	$(Q)$(exec) $(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TESTOPTS) testunit minitest
+	$(gnumake_recursive)$(Q)$(exec) $(RUNRUBY) "$(TOOL_TESTSDIR)/runner.rb" --ruby="$(RUNRUBY)" $(TESTOPTS) testunit minitest
 no-test-testframework: PHONY
 
-test-sample: test-basic # backword compatibility for mswin-build
-test: btest-ruby test-knownbug test-basic
+test-tool: $(TEST_RUNNABLE)-test-tool
+yes-test-tool: prog PHONY
+	$(gnumake_recursive)$(Q)$(exec) $(RUNRUBY) "$(TOOL_TESTSDIR)/runner.rb" --ruby="$(RUNRUBY)" $(TESTOPTS)
+no-test-tool: PHONY
+
+test-sample: test-basic # backward compatibility for mswin-build
+test-short: btest-ruby test-knownbug test-basic
+test: test-short
 
 # $ make test-all TESTOPTS="--help" displays more detail
 # for example, make test-all TESTOPTS="-j2 -v -n test-name -- test-file-name"
 test-all: $(TEST_RUNNABLE)-test-all
-yes-test-all: prog PHONY
-	$(Q)$(exec) $(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TEST_EXCLUDES) $(TESTOPTS) $(TESTS)
+yes-test-all: programs PHONY
+	$(gnumake_recursive)$(Q)$(exec) $(RUNRUBY) "$(TESTSDIR)/runner.rb" --ruby="$(RUNRUBY)" $(TEST_EXCLUDES) $(TESTOPTS) $(TESTS)
 TESTS_BUILD = mkmf
 no-test-all: PHONY
-	$(MINIRUBY) -I"$(srcdir)/lib" "$(srcdir)/test/runner.rb" $(TESTOPTS) $(TESTS_BUILD)
+	$(gnumake_recursive)$(MINIRUBY) -I"$(srcdir)/lib" "$(TESTSDIR)/runner.rb" $(TESTOPTS) $(TESTS_BUILD)
 
-test-almost: $(TEST_RUNNABLE)-test-almost
-yes-test-almost: prog PHONY
-	$(Q)$(exec) $(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TEST_EXCLUDES) $(TESTOPTS) $(EXCLUDE_TESTFRAMEWORK) $(TESTS)
-no-test-almost: PHONY
+test-almost: test-all
+yes-test-almost: yes-test-all
+no-test-almost: no-test-all
 
 test-ruby: $(TEST_RUNNABLE)-test-ruby
 no-test-ruby: PHONY
 yes-test-ruby: prog encs PHONY
-	$(RUNRUBY) "$(srcdir)/test/runner.rb" $(TEST_EXCLUDES) $(TESTOPTS) -- ruby -ext-
+	$(gnumake_recursive)$(RUNRUBY) "$(TESTSDIR)/runner.rb" $(TEST_EXCLUDES) $(TESTOPTS) -- ruby -ext-
 
 extconf: $(PREP)
 	$(Q) $(MAKEDIRS) "$(EXTCONFDIR)"
 	$(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS)
 
-$(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(srcdir)/version.h
-	$(Q)$(BOOTSTRAPRUBY) $(srcdir)/tool/mkconfig.rb \
-		-cross_compiling=$(CROSS_COMPILING) \
+$(RBCONFIG): $(tooldir)/mkconfig.rb config.status $(srcdir)/version.h
+	$(Q)$(BOOTSTRAPRUBY) -n \
+	-e 'BEGIN{version=ARGV.shift;mis=ARGV.dup}' \
+	-e 'END{abort "UNICODE version mismatch: #{mis}" unless mis.empty?}' \
+	-e '(mis.delete(ARGF.path); ARGF.close) if /ONIG_UNICODE_VERSION_STRING +"#{Regexp.quote(version)}"/o' \
+	$(UNICODE_VERSION) $(UNICODE_DATA_HEADERS)
+	$(Q)$(BOOTSTRAPRUBY) $(tooldir)/mkconfig.rb \
 		-arch=$(arch) -version=$(RUBY_PROGRAM_VERSION) \
 		-install_name=$(RUBY_INSTALL_NAME) \
 		-so_name=$(RUBY_SO_NAME) \
 		-unicode_version=$(UNICODE_VERSION) \
+		-unicode_emoji_version=$(UNICODE_EMOJI_VERSION) \
 	> rbconfig.tmp
 	$(IFCHANGE) "--timestamp=$@" rbconfig.rb rbconfig.tmp
 
-test-rubyspec-precheck:
+test-rubyspec: test-spec
+yes-test-rubyspec: yes-test-spec
+
+test-spec-precheck: main
 
-test-rubyspec: test-rubyspec-precheck $(arch)-fake.rb
-	$(RUNRUBY) -r./$(arch)-fake $(srcdir)/spec/mspec/bin/mspec run -B $(srcdir)/spec/default.mspec $(MSPECOPT)
+test-spec: $(TEST_RUNNABLE)-test-spec
+yes-test-spec: test-spec-precheck
+	$(gnumake_recursive)$(Q) \
+	$(RUNRUBY) -r./$(arch)-fake $(srcdir)/spec/mspec/bin/mspec run -B $(srcdir)/spec/default.mspec -I$(srcdir)/tool/lib $(MSPECOPT) $(SPECOPTS)
+no-test-spec:
 
 RUNNABLE = $(LIBRUBY_RELATIVE:no=un)-runnable
-runnable: $(RUNNABLE) prog $(srcdir)/tool/mkrunnable.rb PHONY
-	$(Q) $(MINIRUBY) $(srcdir)/tool/mkrunnable.rb -v $(EXTOUT)
+runnable: $(RUNNABLE) prog $(tooldir)/mkrunnable.rb PHONY
+	$(Q) $(MINIRUBY) $(tooldir)/mkrunnable.rb -v $(EXTOUT)
 yes-runnable: PHONY
 
 encs: enc trans
 libencs: libenc libtrans
 encs enc trans libencs libenc libtrans: $(SHOWFLAGS) $(ENC_MK) $(LIBRUBY) $(PREP) PHONY
 	$(ECHO) making $@
-	$(Q) $(MAKE) -f $(ENC_MK) V="$(V)" \
-		RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" \
-		$(MFLAGS) $@
+	$(Q) $(MAKE) $(MAKE_ENC) $@
 
 
 libenc enc: {$(VPATH)}encdb.h
 libtrans trans: {$(VPATH)}transdb.h
 
+# Use MINIRUBY which loads fake.rb for cross compiling
 $(ENC_MK): $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc/depend \
 	$(srcdir)/enc/encinit.c.erb $(srcdir)/lib/mkmf.rb $(RBCONFIG) fake
 	$(ECHO) generating $@
@@ -668,41 +870,69 @@ $(ENC_MK): $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc
 .PHONY: clean clean-ext clean-local clean-enc clean-golf clean-rdoc clean-html clean-extout
 .PHONY: distclean distclean-ext distclean-local distclean-enc distclean-golf distclean-extout
 .PHONY: realclean realclean-ext realclean-local realclean-enc realclean-golf realclean-extout
-.PHONY: check test test-all btest btest-ruby test-basic test-knownbug
-.PHONY: run runruby parse benchmark benchmark-each tbench gdb gdb-ruby
-.PHONY: update-mspec update-rubyspec test-rubyspec
+.PHONY: exam check test test-short test-all btest btest-ruby test-basic test-knownbug
+.PHONY: run runruby parse benchmark gdb gdb-ruby
+.PHONY: update-mspec update-rubyspec test-rubyspec test-spec
+.PHONY: touch-unicode-files
 
 PHONY:
 
-{$(VPATH)}parse.c: {$(VPATH)}parse.y $(srcdir)/tool/ytab.sed {$(VPATH)}id.h
+{$(VPATH)}parse.c: {$(VPATH)}parse.y $(tooldir)/ytab.sed {$(VPATH)}id.h
 {$(VPATH)}parse.h: {$(VPATH)}parse.c
 
 {$(srcdir)}.y.c:
 	$(ECHO) generating $@
-	$(Q)$(BASERUBY) $(srcdir)/tool/id2token.rb --path-separator=.$(PATH_SEPARATOR)./ --vpath=$(VPATH) id.h $(SRC_FILE) > parse.tmp.y
+	$(Q)$(BASERUBY) $(tooldir)/id2token.rb --path-separator=.$(PATH_SEPARATOR)./ --vpath=$(VPATH) id.h $(SRC_FILE) > parse.tmp.y
+	$(Q)$(BASERUBY) $(tooldir)/pure_parser.rb parse.tmp.y $(YACC)
+	$(Q)$(RM) parse.tmp.y.bak
 	$(Q)$(YACC) -d $(YFLAGS) -o y.tab.c parse.tmp.y
 	$(Q)$(RM) parse.tmp.y
-	$(Q)sed -f $(srcdir)/tool/ytab.sed -e "/^#/s!parse\.tmp\.[iy]!parse.y!" -e "/^#/s!y\.tab\.c!$@!" y.tab.c > $@.new
+	$(Q)sed -f $(tooldir)/ytab.sed -e "/^#/s|parse\.tmp\.[iy]|$(SRC_FILE)|" -e "/^#/s!y\.tab\.c!$@!" y.tab.c > $@.new
 	$(Q)$(MV) $@.new $@
 	$(Q)sed -e "/^#line.*y\.tab\.h/d;/^#line.*parse.*\.y/d" y.tab.h > $(@:.c=.h)
 	$(Q)$(RM) y.tab.c y.tab.h
 
 $(PLATFORM_D):
-	$(Q) $(MAKEDIRS) $(PLATFORM_DIR)
-	@exit > $@
+	$(Q) $(MAKEDIRS) $(PLATFORM_DIR) $(@D)
+	@$(NULLCMD) > $@
+
+exe/$(PROGRAM): ruby-runner.c ruby-runner.h exe/.time miniruby$(EXEEXT) {$(VPATH)}config.h
+	$(Q) $(CC) $(CFLAGS) $(INCFLAGS) $(CPPFLAGS) -DRUBY_INSTALL_NAME=$(@F) $(COUTFLAG)ruby-runner.$(OBJEXT) -c $(CSRCFLAG)$(srcdir)/ruby-runner.c
+	$(Q) $(PURIFY) $(CC) $(CFLAGS) $(LDFLAGS) $(OUTFLAG)$@ ruby-runner.$(OBJEXT) $(LIBS)
+	$(Q) $(POSTLINK)
+	$(Q) ./miniruby$(EXEEXT) \
+	    -e 'prog, dest, inst = ARGV; dest += "/ruby"' \
+	    -e 'exit unless prog==inst' \
+	    -e 'unless prog=="ruby"' \
+	    -e '  begin File.unlink(dest); rescue Errno::ENOENT; end' \
+	    -e '  File.symlink(prog, dest)' \
+	    -e 'end' \
+	$(@F) $(@D) $(RUBY_INSTALL_NAME)$(EXEEXT)
+
+exe/.time:
+	$(Q) $(MAKEDIRS) $(@D)
+	@$(NULLCMD) > $@
 
 $(BUILTIN_ENCOBJS) $(BUILTIN_TRANSOBJS): $(ENC_TRANS_D)
 
 $(ENC_TRANS_D):
-	$(Q) $(MAKEDIRS) enc/trans
-	@exit > $@
+	$(Q) $(MAKEDIRS) enc/trans $(@D)
+	@$(NULLCMD) > $@
+
+$(TIMESTAMPDIR)/$(arch)/.time:
+	$(Q)$(MAKEDIRS) $(@D) $(EXTOUT)/$(arch)
+	@$(NULLCMD) > $@
+
+$(TIMESTAMPDIR)/.RUBYCOMMONDIR.time:
+	$(Q)$(MAKEDIRS) $(@D) $(RUBYCOMMONDIR)
+	@$(NULLCMD) > $@
 
 ###
 CCAN_DIR = {$(VPATH)}ccan
 
 RUBY_H_INCLUDES    = {$(VPATH)}ruby.h {$(VPATH)}config.h {$(VPATH)}defines.h \
 		     {$(VPATH)}intern.h {$(VPATH)}missing.h {$(VPATH)}st.h \
-		     {$(VPATH)}subst.h
+		     {$(VPATH)}assert.h {$(VPATH)}subst.h
 
 ###
 
@@ -724,36 +954,39 @@ strerror.$(OBJEXT): {$(VPATH)}strerror.c
 strlcat.$(OBJEXT): {$(VPATH)}strlcat.c
 strlcpy.$(OBJEXT): {$(VPATH)}strlcpy.c
 strstr.$(OBJEXT): {$(VPATH)}strstr.c
-strtod.$(OBJEXT): {$(VPATH)}strtod.c
-strtol.$(OBJEXT): {$(VPATH)}strtol.c
 nt.$(OBJEXT): {$(VPATH)}nt.c
-ia64.$(OBJEXT): {$(VPATH)}ia64.s
-	$(CC) $(CFLAGS) -c $<
+
+.coroutine_obj $(COROUTINE_OBJ): \
+	{$(VPATH)}$(COROUTINE_SRC) \
+	$(COROUTINE_H:/Context.h=/.time)
+$(COROUTINE_H:/Context.h=/.time):
+	$(Q) $(MAKEDIRS) $(@D)
+	@$(NULLCMD) > $@
 
 ###
 
 # dependencies for generated C sources.
 parse.$(OBJEXT): {$(VPATH)}parse.c
 miniprelude.$(OBJEXT): {$(VPATH)}miniprelude.c
-prelude.$(OBJEXT): {$(VPATH)}prelude.c
 
 # dependencies for optional sources.
 compile.$(OBJEXT): {$(VPATH)}opt_sc.inc {$(VPATH)}optunifs.inc
 
 win32/win32.$(OBJEXT): {$(VPATH)}win32/win32.c {$(VPATH)}win32/file.h \
   {$(VPATH)}dln.h {$(VPATH)}dln_find.c {$(VPATH)}encindex.h \
-  {$(VPATH)}internal.h {$(VPATH)}util.h $(RUBY_H_INCLUDES) $(PLATFORM_D)
+  {$(VPATH)}internal.h {$(VPATH)}util.h $(RUBY_H_INCLUDES) \
+  {$(VPATH)}vm.h $(PLATFORM_D)
 win32/file.$(OBJEXT): {$(VPATH)}win32/file.c {$(VPATH)}win32/file.h \
   $(RUBY_H_INCLUDES) $(PLATFORM_D)
 
-$(NEWLINE_C): $(srcdir)/enc/trans/newline.trans $(srcdir)/tool/transcode-tblgen.rb
+$(NEWLINE_C): $(srcdir)/enc/trans/newline.trans $(tooldir)/transcode-tblgen.rb
 	$(Q) $(MAKEDIRS) $(@D)
-	$(Q) $(BASERUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo $@ $(srcdir)/enc/trans/newline.trans
+	$(Q) $(BASERUBY) "$(tooldir)/transcode-tblgen.rb" -vo $@ $(srcdir)/enc/trans/newline.trans
 enc/trans/newline.$(OBJEXT): $(NEWLINE_C)
 
-verconf.h: $(srcdir)/template/verconf.h.tmpl $(srcdir)/tool/generic_erb.rb
+verconf.h: $(srcdir)/template/verconf.h.tmpl $(tooldir)/generic_erb.rb
 	$(ECHO) creating $@
-	$(Q) $(BOOTSTRAPRUBY) "$(srcdir)/tool/generic_erb.rb" -o $@ $(srcdir)/template/verconf.h.tmpl
+	$(Q) $(BOOTSTRAPRUBY) "$(tooldir)/generic_erb.rb" -o $@ $(srcdir)/template/verconf.h.tmpl
 
 ruby-glommed.$(OBJEXT): $(OBJS)
 
@@ -761,24 +994,47 @@ $(OBJS):  {$(VPATH)}config.h {$(VPATH)}missing.h
 
 INSNS2VMOPT = --srcdir="$(srcdir)"
 
-{$(VPATH)}minsns.inc: $(srcdir)/template/minsns.inc.tmpl
-
-{$(VPATH)}opt_sc.inc: $(srcdir)/template/opt_sc.inc.tmpl
-
-{$(VPATH)}optinsn.inc: $(srcdir)/template/optinsn.inc.tmpl
-
-{$(VPATH)}optunifs.inc: $(srcdir)/template/optunifs.inc.tmpl
-
-{$(VPATH)}insns.inc: $(srcdir)/template/insns.inc.tmpl
-
-{$(VPATH)}insns_info.inc: $(srcdir)/template/insns_info.inc.tmpl
-
-{$(VPATH)}vmtc.inc: $(srcdir)/template/vmtc.inc.tmpl
-
-{$(VPATH)}vm.inc: $(srcdir)/template/vm.inc.tmpl
+srcs_vpath = {$(VPATH)}
+
+inc_common_headers = $(tooldir)/ruby_vm/views/_copyright.erb $(tooldir)/ruby_vm/views/_notice.erb
+$(srcs_vpath)opt_sc.inc: $(tooldir)/ruby_vm/views/opt_sc.inc.erb $(inc_common_headers)
+$(srcs_vpath)optinsn.inc: $(tooldir)/ruby_vm/views/optinsn.inc.erb $(inc_common_headers)
+$(srcs_vpath)optunifs.inc: $(tooldir)/ruby_vm/views/optunifs.inc.erb $(inc_common_headers)
+$(srcs_vpath)insns.inc: $(tooldir)/ruby_vm/views/insns.inc.erb $(inc_common_headers)
+$(srcs_vpath)insns_info.inc: $(tooldir)/ruby_vm/views/insns_info.inc.erb $(inc_common_headers) \
+  $(tooldir)/ruby_vm/views/_insn_type_chars.erb $(tooldir)/ruby_vm/views/_insn_name_info.erb \
+  $(tooldir)/ruby_vm/views/_insn_len_info.erb $(tooldir)/ruby_vm/views/_insn_operand_info.erb \
+  $(tooldir)/ruby_vm/views/_attributes.erb $(tooldir)/ruby_vm/views/_comptime_insn_stack_increase.erb \
+  $(tooldir)/ruby_vm/views/_insn_sp_pc_dependency.erb
+$(srcs_vpath)vmtc.inc: $(tooldir)/ruby_vm/views/vmtc.inc.erb $(inc_common_headers)
+$(srcs_vpath)vm.inc: $(tooldir)/ruby_vm/views/vm.inc.erb $(inc_common_headers) \
+  $(tooldir)/ruby_vm/views/_insn_entry.erb $(tooldir)/ruby_vm/views/_trace_instruction.erb
+$(srcs_vpath)mjit_compile.inc: $(tooldir)/ruby_vm/views/mjit_compile.inc.erb $(inc_common_headers) \
+  $(tooldir)/ruby_vm/views/_mjit_compile_insn.erb $(tooldir)/ruby_vm/views/_mjit_compile_send.erb \
+  $(tooldir)/ruby_vm/views/_mjit_compile_ivar.erb \
+  $(tooldir)/ruby_vm/views/_mjit_compile_insn_body.erb $(tooldir)/ruby_vm/views/_mjit_compile_pc_and_sp.erb \
+  $(tooldir)/ruby_vm/views/_mjit_compile_invokebuiltin.erb
+
+BUILTIN_RB_SRCS = \
+		$(srcdir)/ast.rb \
+		$(srcdir)/dir.rb \
+		$(srcdir)/gc.rb \
+		$(srcdir)/integer.rb \
+		$(srcdir)/io.rb \
+		$(srcdir)/pack.rb \
+		$(srcdir)/trace_point.rb \
+		$(srcdir)/warning.rb \
+		$(srcdir)/array.rb \
+		$(srcdir)/kernel.rb \
+		$(srcdir)/ractor.rb \
+		$(srcdir)/prelude.rb \
+		$(srcdir)/gem_prelude.rb \
+		$(empty)
+BUILTIN_RB_INCS = $(BUILTIN_RB_SRCS:.rb=.rbinc)
 
-common-srcs: {$(VPATH)}parse.c {$(VPATH)}lex.c {$(VPATH)}enc/trans/newline.c {$(VPATH)}id.c \
-	     srcs-lib srcs-ext
+common-srcs: $(srcs_vpath)parse.c $(srcs_vpath)lex.c $(srcs_vpath)enc/trans/newline.c $(srcs_vpath)id.c \
+	     $(BUILTIN_RB_INCS) \
+	     srcs-lib srcs-ext incs
 
 missing-srcs: $(srcdir)/missing/des_tables.c
 
@@ -786,14 +1042,22 @@ srcs: common-srcs missing-srcs srcs-enc
 
 EXT_SRCS = $(srcdir)/ext/ripper/ripper.c \
 	   $(srcdir)/ext/rbconfig/sizeof/sizes.c \
+	   $(srcdir)/ext/rbconfig/sizeof/limits.c \
 	   $(srcdir)/ext/socket/constdefs.c \
+	   $(srcdir)/ext/etc/constdefs.h \
 	   # EXT_SRCS
 
 srcs-ext: $(EXT_SRCS)
+realclean-srcs-ext::
+	$(Q)$(RM) $(EXT_SRCS)
+
+EXTRA_SRCS = $(srcdir)/ext/json/parser/parser.c \
+	     $(srcdir)/ext/date/zonetab.h \
+	     $(empty)
 
-srcs-extra: $(srcdir)/ext/json/parser/parser.c \
-	    $(srcdir)/ext/date/zonetab.h \
-	    $(empty)
+srcs-extra: $(EXTRA_SRCS)
+realclean-srcs-extra::
+	$(Q)$(RM) $(EXTRA_SRCS)
 
 LIB_SRCS = $(srcdir)/lib/unicode_normalize/tables.rb
 
@@ -801,161 +1065,180 @@ srcs-lib: $(LIB_SRCS)
 
 srcs-enc: $(ENC_MK)
 	$(ECHO) making srcs under enc
-	$(Q) $(MAKE) -f $(ENC_MK) RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) srcs
+	$(Q) $(MAKE) $(MAKE_ENC) srcs
 
 all-incs: incs {$(VPATH)}encdb.h {$(VPATH)}transdb.h
 incs: $(INSNS) {$(VPATH)}node_name.inc {$(VPATH)}known_errors.inc \
       {$(VPATH)}vm_call_iseq_optimized.inc $(srcdir)/revision.h \
-      $(REVISION_H) enc/unicode/name2ctype.h enc/jis/props.h \
+      $(REVISION_H) \
+      $(UNICODE_DATA_HEADERS) $(srcdir)/enc/jis/props.h \
       {$(VPATH)}id.h {$(VPATH)}probes.dmyh
 
 insns: $(INSNS)
 
-id.h: $(srcdir)/tool/generic_erb.rb $(srcdir)/template/id.h.tmpl $(srcdir)/defs/id.def
+id.h: $(tooldir)/generic_erb.rb $(srcdir)/template/id.h.tmpl $(srcdir)/defs/id.def
 	$(ECHO) generating $@
-	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb --output=$@ \
+	$(Q) $(BASERUBY) $(tooldir)/generic_erb.rb --output=$@ \
 		$(srcdir)/template/id.h.tmpl
 
-id.c: $(srcdir)/tool/generic_erb.rb $(srcdir)/template/id.c.tmpl $(srcdir)/defs/id.def
+id.c: $(tooldir)/generic_erb.rb $(srcdir)/template/id.c.tmpl $(srcdir)/defs/id.def
 	$(ECHO) generating $@
-	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb --output=$@ \
+	$(Q) $(BASERUBY) $(tooldir)/generic_erb.rb --output=$@ \
 		$(srcdir)/template/id.c.tmpl
 
-node_name.inc: {$(VPATH)}node.h
+node_name.inc: $(tooldir)/node_name.rb $(srcdir)/node.h
 	$(ECHO) generating $@
-	$(Q) $(BASERUBY) -n $(srcdir)/tool/node_name.rb < $? > $@
+	$(Q) $(BASERUBY) -n $(tooldir)/node_name.rb < $(srcdir)/node.h > $@
 
-encdb.h: $(PREP) $(srcdir)/tool/generic_erb.rb $(srcdir)/template/encdb.h.tmpl
+encdb.h: $(PREP) $(tooldir)/generic_erb.rb $(srcdir)/template/encdb.h.tmpl
 	$(ECHO) generating $@
-	$(Q) $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/encdb.h.tmpl $(srcdir)/enc enc
+	$(Q) $(MINIRUBY) $(tooldir)/generic_erb.rb -c -o $@ $(srcdir)/template/encdb.h.tmpl $(srcdir)/enc enc
 
-transdb.h: $(PREP) srcs-enc $(srcdir)/tool/generic_erb.rb $(srcdir)/template/transdb.h.tmpl
+transdb.h: $(PREP) srcs-enc $(tooldir)/generic_erb.rb $(srcdir)/template/transdb.h.tmpl
 	$(ECHO) generating $@
-	$(Q) $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/transdb.h.tmpl $(srcdir)/enc/trans enc/trans
+	$(Q) $(MINIRUBY) $(tooldir)/generic_erb.rb -c -o $@ $(srcdir)/template/transdb.h.tmpl $(srcdir)/enc/trans enc/trans
 
 enc/encinit.c: $(ENC_MK) $(srcdir)/enc/encinit.c.erb
 
 known_errors.inc: $(srcdir)/template/known_errors.inc.tmpl $(srcdir)/defs/known_errors.def
 	$(ECHO) generating $@
-	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/known_errors.inc.tmpl $(srcdir)/defs/known_errors.def
-
-vm_call_iseq_optimized.inc: $(srcdir)/tool/mk_call_iseq_optimized.rb
-	$(ECHO) generating $@
-	$(Q) $(BASERUBY) $(srcdir)/tool/mk_call_iseq_optimized.rb > $@
+	$(Q) $(BASERUBY) $(tooldir)/generic_erb.rb -c -o $@ $(srcdir)/template/known_errors.inc.tmpl $(srcdir)/defs/known_errors.def
 
-$(MINIPRELUDE_C): $(COMPILE_PRELUDE)
+vm_call_iseq_optimized.inc: $(srcdir)/template/call_iseq_optimized.inc.tmpl
 	$(ECHO) generating $@
-	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -I$(srcdir) -o $@ \
-		$(srcdir)/template/prelude.c.tmpl
+	$(Q) $(BASERUBY) $(tooldir)/generic_erb.rb -c -o $@ $(srcdir)/template/call_iseq_optimized.inc.tmpl
 
-$(PRELUDE_C): $(COMPILE_PRELUDE) \
-	   {$(srcdir)}lib/rubygems/defaults.rb \
-	   {$(srcdir)}lib/rubygems/core_ext/kernel_gem.rb \
-	   $(PRELUDE_SCRIPTS) $(LIB_SRCS)
+$(MINIPRELUDE_C): $(COMPILE_PRELUDE) $(BUILTIN_RB_SRCS)
 	$(ECHO) generating $@
-	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -I$(srcdir) -c -o $@ \
-		$(srcdir)/template/prelude.c.tmpl $(PRELUDE_SCRIPTS)
+	$(Q) $(BASERUBY) $(tooldir)/generic_erb.rb -I$(srcdir) -o $@ \
+		$(srcdir)/template/prelude.c.tmpl $(BUILTIN_RB_SRCS)
 
-{$(VPATH)}golf_prelude.c: $(COMPILE_PRELUDE) {$(srcdir)}golf_prelude.rb
+$(GOLF_PRELUDE_C): $(COMPILE_PRELUDE) {$(srcdir)}golf_prelude.rb
 	$(ECHO) generating $@
-	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -I$(srcdir) -c -o $@ \
+	$(Q) $(BASERUBY) $(tooldir)/generic_erb.rb -I$(srcdir) -c -o $@ \
 		$(srcdir)/template/prelude.c.tmpl golf_prelude.rb
 
-{$(VPATH)}probes.dmyh: {$(srcdir)}probes.d $(srcdir)/tool/gen_dummy_probes.rb
+MAINCPPFLAGS = $(ENABLE_DEBUG_ENV:yes=-DRUBY_DEBUG_ENV=1)
+
+$(MAINOBJ): $(srcdir)/$(MAINSRC)
+	$(ECHO) compiling $(srcdir)/$(MAINSRC)
+	$(Q) $(CC) $(MAINCPPFLAGS) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$(srcdir)/$(MAINSRC)
+
+{$(VPATH)}probes.dmyh: {$(srcdir)}probes.d $(tooldir)/gen_dummy_probes.rb
 
 probes.dmyh:
-	$(BASERUBY) $(srcdir)/tool/gen_dummy_probes.rb $(srcdir)/probes.d > $@
+	$(BASERUBY) $(tooldir)/gen_dummy_probes.rb $(srcdir)/probes.d > $@
 
 probes.h: {$(VPATH)}probes.$(DTRACE_EXT)
 
 prereq: incs srcs preludes PHONY
 
-preludes: {$(VPATH)}prelude.c
 preludes: {$(VPATH)}miniprelude.c
 preludes: {$(srcdir)}golf_prelude.c
 
+{$(srcdir)}.rb.rbinc:
+	$(ECHO) making $@
+	$(Q) $(BASERUBY) $(tooldir)/mk_builtin_loader.rb $<
+
+builtin_binary.inc: $(PREP) $(BUILTIN_RB_SRCS) $(srcdir)/template/builtin_binary.inc.tmpl
+	$(Q) $(MINIRUBY) $(tooldir)/generic_erb.rb -o $@ \
+		$(srcdir)/template/builtin_binary.inc.tmpl -- --cross=$(CROSS_COMPILING)
+
+$(BUILTIN_RB_INCS): $(top_srcdir)/tool/mk_builtin_loader.rb
+
 $(srcdir)/revision.h:
-	@exit > $@
+	$(Q)$(gnumake:yes=#) $(RM) $(@F)
+	$(Q)$(gnumake:yes=#) $(NULLCMD) > $@ || $(NULLCMD) > $(@F)
 
-$(REVISION_H): $(srcdir)/version.h $(srcdir)/ChangeLog $(srcdir)/tool/file2lastrev.rb $(REVISION_FORCE)
-	-$(Q) $(BASERUBY) $(srcdir)/tool/file2lastrev.rb --revision.h "$(srcdir)" > revision.tmp
+revision.tmp::
+	$(Q) $(NULLCMD) > $@
+revision.$(HAVE_BASERUBY:yes=tmp):: $(srcdir)/version.h $(tooldir)/file2lastrev.rb $(REVISION_FORCE)
+	$(Q) $(BASERUBY) $(tooldir)/file2lastrev.rb -q --revision.h --srcdir="$(srcdir)" > $@
+
+$(REVISION_H): revision.tmp
 	$(Q)$(IFCHANGE) "--timestamp=$@" "$(srcdir)/revision.h" revision.tmp
 
-$(srcdir)/ext/ripper/ripper.c: $(srcdir)/parse.y id.h
+$(srcdir)/ext/ripper/ripper.c: $(srcdir)/ext/ripper/tools/preproc.rb $(srcdir)/parse.y id.h $(srcdir)/ext/ripper/depend
 	$(ECHO) generating $@
-	$(Q) $(CHDIR) $(@D) && \
-	sed /AUTOGENERATED/q depend | \
-	$(exec) $(MAKE) -f - $(MFLAGS) \
-		Q=$(Q) ECHO=$(ECHO) RM="$(RM)" top_srcdir=../.. srcdir=. VPATH="$(PWD)" \
-		RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)"
+	$(Q) VPATH=$${PWD-`pwd`} && $(CHDIR) $(@D) && \
+	sed -e 's/{\$$([^(){}]*)[^{}]*}//g' -e /AUTOGENERATED/q depend | \
+	$(exec) $(MAKE) -f - $(mflags) \
+		Q=$(Q) ECHO=$(ECHO) RM="$(RM)" BISON=$(YACC) top_srcdir=../.. srcdir=. VPATH="$${VPATH}" \
+		RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)" LANG=C
 
-$(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl
+$(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl $(srcdir)/ext/json/parser/prereq.mk
 	$(ECHO) generating $@
-	$(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f prereq.mk $(MFLAGS) \
+	$(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f prereq.mk $(mflags) \
 		Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. BASERUBY="$(BASERUBY)"
 
-$(srcdir)/ext/date/zonetab.h: $(srcdir)/ext/date/zonetab.list
+$(srcdir)/ext/date/zonetab.h: $(srcdir)/ext/date/zonetab.list $(srcdir)/ext/date/prereq.mk
 	$(ECHO) generating $@
-	$(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f prereq.mk $(MFLAGS) \
-		Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. BASERUBY="$(BASERUBY)"
+	$(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f prereq.mk $(mflags) \
+		Q=$(Q) ECHO=$(ECHO) top_srcdir=../.. srcdir=. VPATH=../.. BASERUBY="$(BASERUBY)"
 
 $(srcdir)/ext/rbconfig/sizeof/sizes.c: $(srcdir)/ext/rbconfig/sizeof/depend \
-		$(srcdir)/tool/generic_erb.rb $(srcdir)/template/sizes.c.tmpl $(srcdir)/configure.in
+		$(tooldir)/generic_erb.rb $(srcdir)/template/sizes.c.tmpl $(srcdir)/configure.ac
 	$(ECHO) generating $@
 	$(Q) $(CHDIR) $(@D) && \
-	sed '/AUTOGENERATED/q;s#{.*}##' depend | \
-	$(exec) $(MAKE) -f - $(MFLAGS) \
-		Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. RUBY="$(BASERUBY)"
+	sed '/AUTOGENERATED/q' depend | \
+	$(exec) $(MAKE) -f - $(mflags) \
+		Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. RUBY="$(BASERUBY)" $(@F)
+
+$(srcdir)/ext/rbconfig/sizeof/limits.c: $(srcdir)/ext/rbconfig/sizeof/depend \
+		$(tooldir)/generic_erb.rb $(srcdir)/template/limits.c.tmpl
+	$(ECHO) generating $@
+	$(Q) $(CHDIR) $(@D) && \
+	sed '/AUTOGENERATED/q' depend | \
+	$(exec) $(MAKE) -f - $(mflags) \
+		Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. RUBY="$(BASERUBY)" $(@F)
 
 $(srcdir)/ext/socket/constdefs.c: $(srcdir)/ext/socket/depend
 	$(Q) $(CHDIR) $(@D) && \
-	sed -n "/^constdefs/,/^$$/p" depend | \
-	$(exec) $(MAKE) -f - $(MFLAGS) constdefs.h constdefs.c \
-		Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. RUBY="$(BASERUBY)"
+	sed '/AUTOGENERATED/q' depend | \
+	$(exec) $(MAKE) -f - $(mflags) \
+		Q=$(Q) ECHO=$(ECHO) top_srcdir=../.. srcdir=. VPATH=../.. RUBY="$(BASERUBY)"
+
+$(srcdir)/ext/etc/constdefs.h: $(srcdir)/ext/etc/depend
+	$(Q) $(CHDIR) $(@D) && \
+	sed '/AUTOGENERATED/q' depend | \
+	$(exec) $(MAKE) -f - $(mflags) \
+		Q=$(Q) ECHO=$(ECHO) top_srcdir=../.. srcdir=. VPATH=../.. RUBY="$(BASERUBY)"
 
 ##
 
 run: fake miniruby$(EXEEXT) PHONY
-	$(BTESTRUBY) $(TESTRUN_SCRIPT) $(RUNOPT)
+	$(BTESTRUBY) $(RUNOPT0) $(TESTRUN_SCRIPT) $(RUNOPT)
 
 runruby: $(PROGRAM) PHONY
-	$(RUNRUBY) $(TESTRUN_SCRIPT)
+	$(RUNRUBY) $(RUNOPT0) $(TESTRUN_SCRIPT) $(RUNOPT)
 
 parse: fake miniruby$(EXEEXT) PHONY
-	$(BTESTRUBY) $(srcdir)/tool/parse.rb $(TESTRUN_SCRIPT)
+	$(BTESTRUBY) --dump=parsetree_with_comment,insns $(TESTRUN_SCRIPT)
 
 bisect: PHONY
-	$(srcdir)/tool/bisect.sh miniruby $(srcdir)
+	$(tooldir)/bisect.sh miniruby $(srcdir)
 
 bisect-ruby: PHONY
-	$(srcdir)/tool/bisect.sh ruby $(srcdir)
+	$(tooldir)/bisect.sh ruby $(srcdir)
 
 COMPARE_RUBY = $(BASERUBY)
+BENCH_RUBY = $(RUNRUBY)
+BENCH_OPTS = --output=markdown --output-compare
 ITEM =
+ARGS = $$(find $(srcdir)/benchmark -maxdepth 1 -name '$(ITEM)' -o -name '*$(ITEM)*.yml' -o -name '*$(ITEM)*.rb' | sort)
 OPTS =
 
-# You can pass several options through OPTS environment variable.
-# $ make benchmark OPTS="--help" displays more detail.
-# for example,
-#  $ make benchmark COMPARE_RUBY="ruby-trunk" OPTS="-e ruby-2.2.2"
-# This command compares trunk and built-ruby and 2.2.2
-benchmark: miniruby$(EXEEXT) PHONY
-	$(BASERUBY) $(srcdir)/benchmark/driver.rb -v \
-	            --executables="$(COMPARE_RUBY) -I../../ruby/lib -I. -I.ext/common --disable-gem; built-ruby::$(MINIRUBY) --disable-gem" \
-	            --pattern='bm_' --directory=$(srcdir)/benchmark $(OPTS)
-
-benchmark-each: miniruby$(EXEEXT) PHONY
-	$(BASERUBY) $(srcdir)/benchmark/driver.rb -v \
-	            --executables="$(COMPARE_RUBY) -I../../ruby/lib -I. -I.ext/common --disable-gem; built-ruby::$(MINIRUBY) --disable-gem" \
-	            --pattern=$(ITEM) --directory=$(srcdir)/benchmark $(OPTS)
-
-tbench: miniruby$(EXEEXT) PHONY
-	$(BASERUBY) $(srcdir)/benchmark/driver.rb -v \
-	            --executables="$(COMPARE_RUBY) -I../../ruby/lib -I. -I.ext/common --disable-gem; built-ruby::$(MINIRUBY) --disable-gem" \
-	            --pattern='bmx_' --directory=$(srcdir)/benchmark $(OPTS)
+# See benchmark/README.md for details.
+benchmark: miniruby$(EXEEXT) update-benchmark-driver PHONY
+	$(BASERUBY) -rrubygems -I$(srcdir)/benchmark/lib $(srcdir)/benchmark/benchmark-driver/exe/benchmark-driver \
+	            --executables="compare-ruby::$(COMPARE_RUBY) -I$(EXTOUT)/common --disable-gem" \
+	            --executables="built-ruby::$(BENCH_RUBY) --disable-gem" \
+	            $(BENCH_OPTS) $(ARGS) $(OPTS)
 
 run.gdb:
 	echo set breakpoint pending on         > run.gdb
+	echo b rb_assert_failure              >> run.gdb
+	echo b rb_bug                         >> run.gdb
 	echo b ruby_debug_breakpoint          >> run.gdb
 	echo '# handle SIGINT nostop'         >> run.gdb
 	echo '# handle SIGPIPE nostop'        >> run.gdb
@@ -970,65 +1253,143 @@ run.gdb:
 
 
 gdb: miniruby$(EXEEXT) run.gdb PHONY
-	gdb -x run.gdb --quiet --args $(MINIRUBY) $(TESTRUN_SCRIPT)
+	gdb -x run.gdb --quiet --args $(MINIRUBY) $(RUNOPT0) $(TESTRUN_SCRIPT) $(RUNOPT)
 
 gdb-ruby: $(PROGRAM) run.gdb PHONY
-	$(Q) $(RUNRUBY_COMMAND) $(RUNRUBY_DEBUGGER) -- $(TESTRUN_SCRIPT)
+	$(Q) $(RUNRUBY_COMMAND) $(RUNRUBY_DEBUGGER) -- $(RUNOPT0) $(TESTRUN_SCRIPT) $(RUNOPT)
+
+LLDB_INIT = command script import -r $(srcdir)/misc/lldb_cruby.py
+
+lldb: miniruby$(EXEEXT) PHONY
+	lldb -o '$(LLDB_INIT)' miniruby$(EXEEXT) -- $(RUNOPT0) $(TESTRUN_SCRIPT) $(RUNOPT)
 
+lldb-ruby: $(PROGRAM) PHONY
+	lldb $(enable_shared:yes=-o 'target modules add ${LIBRUBY_SO}') -o '$(LLDB_INIT)' $(PROGRAM) -- $(RUNOPT0) $(TESTRUN_SCRIPT) $(RUNOPT)
+
+DISTPKGS = gzip,zip,all
+PKGSDIR = tmp
 dist:
-	$(BASERUBY) $(srcdir)/tool/make-snapshot -srcdir=$(srcdir) tmp $(RELNAME)
+	$(BASERUBY) $(tooldir)/make-snapshot \
+	-srcdir=$(srcdir) -packages=$(DISTPKGS) \
+	-unicode-version=$(UNICODE_VERSION) \
+	$(DISTOPTS) $(PKGSDIR) $(RELNAME)
 
 up:: update-remote
 
 up::
-	-$(Q)$(MAKE) $(MFLAGS) Q=$(Q) REVISION_FORCE=PHONY "$(REVISION_H)"
+	-$(Q)$(MAKE) $(mflags) Q=$(Q) REVISION_FORCE=PHONY after-update
 
-up::
-	-$(Q)$(MAKE) $(MFLAGS) Q=$(Q) after-update
+yes::
+no::
 
+after-update:: $(REVISION_H)
 after-update:: extract-extlibs
+after-update:: extract-gems
+
+update-remote:: update-src update-download
+update-download:: $(ALWAYS_UPDATE_UNICODE:yes=update-unicode)
+update-download:: update-gems
+update-download:: download-extlibs
 
-update-remote:: update-src update-rubyspec update-download
-update-download:: update-unicode update-gems download-extlibs
+update-mspec:
+update-rubyspec:
 
 update-config_files: PHONY
-	$(Q) $(BASERUBY) -C "$(srcdir)/tool" \
-	    ../tool/downloader.rb -e gnu \
+	$(Q) $(BASERUBY) -C "$(srcdir)" tool/downloader.rb -d tool --cache-dir=$(CACHE_DIR) -e gnu \
 	    config.guess config.sub
 
-update-gems: PHONY
+refresh-gems: update-bundled_gems prepare-gems
+prepare-gems: $(HAVE_BASERUBY:yes=update-gems) $(HAVE_BASERUBY:yes=extract-gems)
+
+update-gems$(gnumake:yes=-nongnumake): PHONY
 	$(ECHO) Downloading bundled gem files...
-	$(Q) $(BASERUBY) -C "$(srcdir)/gems" \
-	    -I../tool -rdownloader -answ \
+	$(Q) $(BASERUBY) -C "$(srcdir)" \
+	    -I./tool -rdownloader -answ \
 	    -e 'gem, ver = *$$F' \
-	    -e 'old = Dir.glob("#{gem}-*.gem")' \
+	    -e 'next if !ver or /^#/=~gem' \
+	    -e 'old = Dir.glob("gems/#{gem}-*.gem")' \
 	    -e 'gem = "#{gem}-#{ver}.gem"' \
-	    -e 'Downloader::RubyGems.download(gem, nil, nil) and' \
-	    -e 'File.unlink(*(old-[gem]))' \
-	    bundled_gems
+	    -e 'Downloader::RubyGems.download(gem, "gems", nil) and' \
+	    -e '(old.delete("gems/#{gem}"); !old.empty?) and' \
+	    -e 'File.unlink(*old) and' \
+	    -e 'FileUtils.rm_rf(old.map{'"|n|"'n.chomp(".gem")})' \
+	    gems/bundled_gems
 
-extract-gems: PHONY
+extract-gems$(gnumake:yes=-nongnumake): PHONY
 	$(ECHO) Extracting bundled gem files...
-	$(Q) $(RUNRUBY) -C "$(srcdir)/gems" \
-	    -I../tool -rgem-unpack -answ \
+	$(Q) $(RUNRUBY) -C "$(srcdir)" \
+	    -Itool -rgem-unpack -answ \
+	    -e 'BEGIN {FileUtils.mkdir_p(d = ".bundle/gems")}' \
 	    -e 'gem, ver = *$$F' \
-	    -e 'Gem.unpack("#{gem}-#{ver}.gem")' \
-	    bundled_gems
+	    -e 'next if !ver or /^#/=~gem' \
+	    -e 'g = "#{gem}-#{ver}"' \
+	    -e 'File.directory?("#{d}/#{g}") or Gem.unpack("gems/#{g}.gem", d)' \
+	    gems/bundled_gems
 
 update-bundled_gems: PHONY
 	$(Q) $(RUNRUBY) -rrubygems \
-	    -pla \
-	    -e '$$_=Gem::SpecFetcher.fetcher.detect(:latest) {|s|' \
-	    -e   'break "#{s.name} #{s.version}" if s.platform=="ruby"&&s.name==$$F[0]' \
-	    -e '}' \
+	     $(tooldir)/update-bundled_gems.rb \
 	     "$(srcdir)/gems/bundled_gems" | \
 	"$(IFCHANGE)" "$(srcdir)/gems/bundled_gems" -
 
-### set the following environment variable or uncomment the line if
-### the Unicode data files should be updated completely on every update ('make up',...).
-# ALWAYS_UPDATE_UNICODE = yes
-UNICODE_DATA_DIR = enc/unicode/data/$(UNICODE_VERSION)
-UNICODE_SRC_DATA_DIR = $(srcdir)/$(UNICODE_DATA_DIR)
+test-bundled-gems-precheck: $(TEST_RUNNABLE)-test-bundled-gems-precheck
+yes-test-bundled-gems-precheck: main
+no-test-bundled-gems-precheck:
+
+test-bundled-gems-fetch: $(PREP)
+	$(Q) $(BASERUBY) -C $(srcdir)/gems ../tool/fetch-bundled_gems.rb src bundled_gems
+
+test-bundled-gems-prepare: test-bundled-gems-precheck test-bundled-gems-fetch
+test-bundled-gems-prepare: $(TEST_RUNNABLE)-test-bundled-gems-prepare
+no-test-bundled-gems-prepare: no-test-bundled-gems-precheck
+yes-test-bundled-gems-prepare: yes-test-bundled-gems-precheck
+	$(XRUBY) -C "$(srcdir)" bin/gem install --no-document \
+		--install-dir .bundle --conservative "bundler" "minitest:~> 5" "test-unit" "rake" "hoe" "rexml" "json-schema" "rbs:~> 1.6.2"
+
+PREPARE_BUNDLED_GEMS = test-bundled-gems-prepare
+test-bundled-gems: $(TEST_RUNNABLE)-test-bundled-gems
+yes-test-bundled-gems: test-bundled-gems-run
+no-test-bundled-gems:
+
+# Override this to allow failure of specific gems on CI
+# TEST_BUNDLED_GEMS_ALLOW_FAILURES =
+
+BUNDLED_GEMS =
+test-bundled-gems-run: $(PREPARE_BUNDLED_GEMS)
+	$(Q) $(XRUBY) $(tooldir)/test-bundled-gems.rb $(BUNDLED_GEMS)
+
+test-bundler-precheck: $(TEST_RUNNABLE)-test-bundler-precheck
+no-test-bundler-precheck:
+yes-test-bundler-precheck: main
+
+no-test-bundler-prepare: no-test-bundler-precheck
+yes-test-bundler-prepare: yes-test-bundler-precheck
+	$(XRUBY) -C "$(srcdir)" bin/gem install --no-document \
+		--install-dir .bundle --conservative "rspec:~> 3.8" "rake:~> 13.0" "parallel_tests:~> 2.29"
+
+RSPECOPTS =
+BUNDLER_SPECS =
+test-bundler: $(TEST_RUNNABLE)-test-bundler
+yes-test-bundler: yes-test-bundler-prepare
+	$(XRUBY) -C $(srcdir) -Ispec/bundler .bundle/bin/rspec \
+		--require spec_helper $(RSPECOPTS) spec/bundler/$(BUNDLER_SPECS)
+no-test-bundler:
+
+PARALLELRSPECOPTS = --runtime-log $(srcdir)/tmp/parallel_runtime_rspec.log
+test-bundler-parallel: $(TEST_RUNNABLE)-test-bundler-parallel
+yes-test-bundler-parallel: yes-test-bundler-prepare
+	$(XRUBY) -I$(srcdir)/spec/bundler \
+		-e "ENV['PARALLEL_TESTS_EXECUTABLE'] = ARGV.shift" \
+		-e "load ARGV.shift" \
+		"$(XRUBY) -C $(srcdir) -Ispec/bundler .bundle/bin/rspec" \
+		$(srcdir)/.bundle/bin/parallel_rspec \
+		-o "--require spec_helper" \
+		$(PARALLELRSPECOPTS) $(srcdir)/spec/bundler/$(BUNDLER_SPECS)
+no-test-bundler-parallel:
+
+GEM = up
+sync-default-gems:
+	$(Q) $(XRUBY) -C "$(srcdir)" tool/sync_default_gems.rb $(GEM)
 
 UNICODE_FILES = $(UNICODE_SRC_DATA_DIR)/UnicodeData.txt \
 		$(UNICODE_SRC_DATA_DIR)/CompositionExclusions.txt \
@@ -1037,38 +1398,126 @@ UNICODE_FILES = $(UNICODE_SRC_DATA_DIR)/UnicodeData.txt \
 		$(UNICODE_SRC_DATA_DIR)/SpecialCasing.txt \
 		$(empty)
 
-update-unicode: $(UNICODE_FILES)
+UNICODE_PROPERTY_FILES =  \
+		$(UNICODE_SRC_DATA_DIR)/Blocks.txt \
+		$(UNICODE_SRC_DATA_DIR)/DerivedAge.txt \
+		$(UNICODE_SRC_DATA_DIR)/DerivedCoreProperties.txt \
+		$(UNICODE_SRC_DATA_DIR)/PropList.txt \
+		$(UNICODE_SRC_DATA_DIR)/PropertyAliases.txt \
+		$(UNICODE_SRC_DATA_DIR)/PropertyValueAliases.txt \
+		$(UNICODE_SRC_DATA_DIR)/Scripts.txt \
+		$(empty)
 
-$(UNICODE_FILES):
-	$(ECHO) Downloading Unicode $(UNICODE_VERSION) data files...
-	$(Q) $(MAKEDIRS) "$(UNICODE_SRC_DATA_DIR)"
-	$(Q) $(BASERUBY) -C "$(srcdir)" tool/downloader.rb \
-	    -d $(UNICODE_DATA_DIR) \
+UNICODE_AUXILIARY_FILES =  \
+		$(UNICODE_SRC_DATA_DIR)/auxiliary/GraphemeBreakProperty.txt \
+		$(UNICODE_SRC_DATA_DIR)/auxiliary/GraphemeBreakTest.txt \
+		$(empty)
+
+UNICODE_EMOJI_FILES = \
+		$(UNICODE_SRC_EMOJI_DATA_DIR)/emoji-data.txt \
+		$(UNICODE_SRC_EMOJI_DATA_DIR)/emoji-sequences.txt \
+		$(UNICODE_SRC_EMOJI_DATA_DIR)/emoji-test.txt \
+		$(UNICODE_SRC_EMOJI_DATA_DIR)/emoji-variation-sequences.txt \
+		$(UNICODE_SRC_EMOJI_DATA_DIR)/emoji-zwj-sequences.txt \
+		$(empty)
+
+update-unicode: $(UNICODE_FILES) $(UNICODE_PROPERTY_FILES) \
+		$(UNICODE_AUXILIARY_FILES) $(UNICODE_EMOJI_FILES)
+
+CACHE_DIR = $(srcdir)/.downloaded-cache
+UNICODE_DOWNLOAD = \
+	$(BASERUBY) $(tooldir)/downloader.rb \
+	    --cache-dir=$(CACHE_DIR) \
+	    --unicode-beta $(UNICODE_BETA) \
+	    -d $(UNICODE_SRC_DATA_DIR) \
 	    -p $(UNICODE_VERSION)/ucd \
-	    -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode \
-	    $(UNICODE_FILES)
+	    -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode
+UNICODE_AUXILIARY_DOWNLOAD = \
+	$(BASERUBY) $(tooldir)/downloader.rb \
+	    --cache-dir=$(CACHE_DIR) \
+	    --unicode-beta $(UNICODE_BETA) \
+	    -d $(UNICODE_SRC_DATA_DIR)/auxiliary \
+	    -p $(UNICODE_VERSION)/ucd/auxiliary \
+	    -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode
+UNICODE_EMOJI_DOWNLOAD = \
+	$(BASERUBY) $(tooldir)/downloader.rb \
+	    --cache-dir=$(CACHE_DIR) \
+	    --unicode-beta $(UNICODE_BETA) \
+	    -d $(UNICODE_SRC_EMOJI_DATA_DIR) \
+	    -p emoji/$(UNICODE_EMOJI_VERSION) \
+	    -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode
+
+$(UNICODE_FILES) $(UNICODE_PROPERTY_FILES): update-unicode-files
+update-unicode-files:
+	$(ECHO) Downloading Unicode $(UNICODE_VERSION) data and  property files...
+	$(Q) $(MAKEDIRS) "$(UNICODE_SRC_DATA_DIR)"
+	$(Q) $(UNICODE_DOWNLOAD) $(UNICODE_FILES) $(UNICODE_PROPERTY_FILES)
+
+$(UNICODE_AUXILIARY_FILES): update-unicode-auxiliary-files
+update-unicode-auxiliary-files:
+	$(ECHO) Downloading Unicode $(UNICODE_VERSION) auxiliary files...
+	$(Q) $(MAKEDIRS) "$(UNICODE_SRC_DATA_DIR)/auxiliary"
+	$(Q) $(UNICODE_AUXILIARY_DOWNLOAD) $(UNICODE_AUXILIARY_FILES)
+
+$(UNICODE_EMOJI_FILES): update-unicode-emoji-files
+update-unicode-emoji-files:
+	$(ECHO) Downloading Unicode emoji $(UNICODE_EMOJI_VERSION) files...
+	$(Q) $(MAKEDIRS) "$(UNICODE_SRC_EMOJI_DATA_DIR)"
+	$(Q) $(UNICODE_EMOJI_DOWNLOAD) $(UNICODE_EMOJI_FILES)
+
+$(srcdir)/lib/unicode_normalize/$(HAVE_BASERUBY:yes=tables.rb): \
+	$(UNICODE_SRC_DATA_DIR)/.unicode-tables.time
 
-$(srcdir)/$(HAVE_BASERUBY:yes=lib/unicode_normalize/tables.rb): \
-	$(srcdir)/.unicode-tables.time
+$(UNICODE_SRC_DATA_DIR)/$(ALWAYS_UPDATE_UNICODE:yes=.unicode-tables.time): \
+	$(UNICODE_FILES) $(UNICODE_PROPERTY_FILES) \
+	$(UNICODE_AUXILIARY_FILES) $(UNICODE_EMOJI_FILES)
 
-$(srcdir)/.unicode-tables.time: $(srcdir)/tool/generic_erb.rb \
-		$(UNICODE_FILES) \
-		$(srcdir)/template/unicode_norm_gen.tmpl
-	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb \
-		-c -t$@ -o $(srcdir)/lib/unicode_normalize/tables.rb \
+touch-unicode-files:
+	$(MAKEDIRS) $(UNICODE_SRC_DATA_DIR)
+	touch $(UNICODE_SRC_DATA_DIR)/.unicode-tables.time $(UNICODE_DATA_HEADERS)
+
+UNICODE_TABLES_TIMESTAMP = yes
+$(UNICODE_SRC_DATA_DIR)/.unicode-tables.time: $(tooldir)/generic_erb.rb \
+		$(srcdir)/template/unicode_norm_gen.tmpl \
+		$(ALWAYS_UPDATE_UNICODE:yes=update-unicode)
+	$(Q) $(MAKE) $(@D)
+	$(Q) $(BASERUBY) $(tooldir)/generic_erb.rb \
+		-c $(UNICODE_TABLES_TIMESTAMP:yes=-t$@) \
+		-o $(srcdir)/lib/unicode_normalize/tables.rb \
 		-I $(srcdir) \
 		$(srcdir)/template/unicode_norm_gen.tmpl \
 		$(UNICODE_DATA_DIR) lib/unicode_normalize
 
+$(UNICODE_SRC_DATA_DIR):
+	$(gnumake_recursive)$(Q) $(MAKEDIRS) $@
+
+$(UNICODE_HDR_DIR)/$(ALWAYS_UPDATE_UNICODE:yes=name2ctype.h): \
+		$(tooldir)/enc-unicode.rb \
+		$(UNICODE_SRC_DATA_DIR)/UnicodeData.txt \
+		$(UNICODE_PROPERTY_FILES) \
+		$(UNICODE_EMOJI_FILES)
+
+$(UNICODE_HDR_DIR)/name2ctype.h:
+	$(MAKEDIRS) $(@D)
+	$(BOOTSTRAPRUBY) $(tooldir)/enc-unicode.rb --header \
+		$(UNICODE_SRC_DATA_DIR) $(UNICODE_SRC_EMOJI_DATA_DIR) > $@.new
+	$(MV) $@.new $@
+
 # the next non-comment line was:
-# $(srcdir)/enc/unicode/casefold.h: $(srcdir)/enc/unicode/case-folding.rb \
+# $(UNICODE_HDR_DIR)/casefold.h: $(srcdir)/enc/unicode/case-folding.rb \
 # but was changed to make sure CI works on systems that don't have gperf
-unicode-up: $(srcdir)/enc/unicode/case-folding.rb \
+unicode-up: $(UNICODE_DATA_HEADERS)
+
+$(UNICODE_HDR_DIR)/$(ALWAYS_UPDATE_UNICODE:yes=casefold.h): \
+		$(srcdir)/enc/unicode/case-folding.rb \
 		$(UNICODE_SRC_DATA_DIR)/UnicodeData.txt \
 		$(UNICODE_SRC_DATA_DIR)/SpecialCasing.txt \
 		$(UNICODE_SRC_DATA_DIR)/CaseFolding.txt
+
+$(UNICODE_HDR_DIR)/casefold.h:
+	$(MAKEDIRS) $(@D)
 	$(Q) $(BASERUBY) $(srcdir)/enc/unicode/case-folding.rb \
-		--output-file=$(srcdir)/enc/unicode/casefold.h \
+		--output-file=$@ \
 		--mapping-data-directory=$(UNICODE_SRC_DATA_DIR)
 
 download-extlibs:
@@ -1095,58 +1544,69 @@ info-libruby_so: PHONY
 info-arch: PHONY
 	@echo arch=$(arch)
 
-change: PHONY
-	$(BASERUBY) -C "$(srcdir)" ./tool/change_maker.rb $(CHANGES) > change.log
-
-exam: check test-rubyspec
+exam: check
 
-love: sudo-precheck up all test install check
+love: sudo-precheck up all test exam install
 	@echo love is all you need
 
-yes-test-all: sudo-precheck
+great: exam
+
+yes-test-all no-test-all: sudo-precheck
 
 sudo-precheck: PHONY
 	@$(SUDO) echo > $(NULL)
 
 update-man-date: PHONY
-	-$(Q) $(BASERUBY) -I"$(srcdir)/tool" -rvcs -i -p \
+	-$(Q) $(BASERUBY) -I"$(tooldir)/lib" -rvcs -i -p \
 	-e 'BEGIN{@vcs=VCS.detect(ARGV.shift)}' \
 	-e '$$_.sub!(/^(\.Dd ).*/){$$1+@vcs.modified(ARGF.path).strftime("%B %d, %Y")}' \
 	"$(srcdir)" "$(srcdir)"/man/*.1
 
+.PHONY: ChangeLog
+ChangeLog:
+	$(ECHO) Generating $@
+	-$(Q) $(BASERUBY) -I"$(tooldir)/lib" -rvcs \
+	-e 'VCS.detect(ARGV[0]).export_changelog("@", nil, nil, ARGV[1])' \
+	"$(srcdir)" $@
+
+HELP_EXTRA_TASKS = ""
+
 help: PHONY
 	$(MESSAGE_BEGIN) \
 	"                Makefile of Ruby" \
 	"" \
 	"targets:" \
-	"  all (default):   builds all of below" \
-	"  miniruby:        builds only miniruby" \
-	"  encs:            builds encodings" \
-	"  exts:            builds extensions" \
-	"  main:            builds encodings, extensions and ruby" \
-	"  docs:            builds documents" \
-	"  run:             runs test.rb by miniruby" \
-	"  runruby:         runs test.rb by ruby you just built" \
-	"  gdb:             runs test.rb by miniruby under gdb" \
-	"  gdb-ruby:        runs test.rb by ruby under gdb" \
-	"  check:           equals make test test-all" \
-	"  exam:            equals make check test-rubyspec" \
-	"  test:            ruby core tests" \
-	"  test-all:        all ruby tests [TESTOPTS=-j4 TESTS=\"<test files>\"]" \
-	"  test-rubyspec:   run the Ruby spec suite" \
-	"  up:              update local copy and autogenerated files" \
-	"  update-rubyspec: update local copy of the Ruby spec suite" \
-	"  benchmark:       benchmark this ruby and COMPARE_RUBY." \
-	"  gcbench:         gc benchmark [GCBENCH_ITEM=<item_name>]" \
-	"  gcbench-rdoc:    gc benchmark with GCBENCH_ITEM=rdoc" \
-	"  install:         install all ruby distributions" \
-	"  install-nodoc:   install without rdoc" \
-	"  install-cross:   install cross compiling stuff" \
-	"  clean:           clean for tarball" \
-	"  distclean:       clean for repository" \
-	"  change:          make change log template" \
-	"  golf:            for golfers" \
-	"" \
+	"  all (default):       builds all of below" \
+	"  miniruby:            builds only miniruby" \
+	"  encs:                builds encodings" \
+	"  exts:                builds extensions" \
+	"  main:                builds encodings, extensions and ruby" \
+	"  docs:                builds documents" \
+	"  install-capi:        builds C API documents" \
+	"  run:                 runs test.rb by miniruby" \
+	"  runruby:             runs test.rb by ruby you just built" \
+	"  gdb:                 runs test.rb by miniruby under gdb" \
+	"  gdb-ruby:            runs test.rb by ruby under gdb" \
+	"  check:               equals make test test-tool test-all test-spec" \
+	"  test:                ruby core tests [BTESTS=<bootstraptest files>]" \
+	"  test-all:            all ruby tests [TESTOPTS=-j4 TESTS=<test files>]" \
+	"  test-spec:           run the Ruby spec suite [SPECOPTS=<specs, opts>]" \
+	"  test-bundler:        run the Bundler spec" \
+	"  test-bundled-gems:   run the test suite of bundled gems" \
+	"  test-tool:           tests under the tool/test" \
+	"  update-gems:         download files of the bundled gems" \
+	"  update-bundled_gems: update the latest version of bundled gems" \
+	"  sync-default-gems:   sync default gems from upstream [GEM=<gem_name>]" \
+	"  up:                  update local copy and autogenerated files" \
+	"  benchmark:           benchmark this ruby and COMPARE_RUBY." \
+	"  gcbench:             gc benchmark [GCBENCH_ITEM=<item_name>]" \
+	"  install:             install all ruby distributions" \
+	"  install-nodoc:       install without rdoc" \
+	"  install-cross:       install cross compiling stuff" \
+	"  clean:               clean for tarball" \
+	"  distclean:           clean for repository" \
+	"  golf:                build goruby for golfers" \
+	$(HELP_EXTRA_TASKS) \
 	"see DeveloperHowto for more detail: " \
 	"  https://bugs.ruby-lang.org/projects/ruby/wiki/DeveloperHowto" \
 	$(MESSAGE_END)
@@ -1154,62 +1614,995 @@ help: PHONY
 # AUTOGENERATED DEPENDENCIES START
 addr2line.$(OBJEXT): {$(VPATH)}addr2line.c
 addr2line.$(OBJEXT): {$(VPATH)}addr2line.h
+addr2line.$(OBJEXT): {$(VPATH)}assert.h
+addr2line.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+addr2line.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+addr2line.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+addr2line.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+addr2line.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+addr2line.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+addr2line.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 addr2line.$(OBJEXT): {$(VPATH)}config.h
+addr2line.$(OBJEXT): {$(VPATH)}defines.h
+addr2line.$(OBJEXT): {$(VPATH)}internal/assume.h
+addr2line.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+addr2line.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+addr2line.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+addr2line.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+addr2line.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+addr2line.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+addr2line.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+addr2line.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+addr2line.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+addr2line.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+addr2line.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+addr2line.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+addr2line.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+addr2line.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+addr2line.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+addr2line.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+addr2line.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+addr2line.$(OBJEXT): {$(VPATH)}internal/cast.h
+addr2line.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+addr2line.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+addr2line.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+addr2line.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+addr2line.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+addr2line.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+addr2line.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+addr2line.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+addr2line.$(OBJEXT): {$(VPATH)}internal/config.h
+addr2line.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+addr2line.$(OBJEXT): {$(VPATH)}internal/dosish.h
+addr2line.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+addr2line.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+addr2line.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+addr2line.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+addr2line.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+addr2line.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+addr2line.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+addr2line.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+addr2line.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+addr2line.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+addr2line.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+addr2line.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+addr2line.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 addr2line.$(OBJEXT): {$(VPATH)}missing.h
+array.$(OBJEXT): $(hdrdir)/ruby.h
 array.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-array.$(OBJEXT): $(top_srcdir)/include/ruby.h
+array.$(OBJEXT): $(top_srcdir)/internal/array.h
+array.$(OBJEXT): $(top_srcdir)/internal/bignum.h
+array.$(OBJEXT): $(top_srcdir)/internal/bits.h
+array.$(OBJEXT): $(top_srcdir)/internal/class.h
+array.$(OBJEXT): $(top_srcdir)/internal/compar.h
+array.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+array.$(OBJEXT): $(top_srcdir)/internal/enum.h
+array.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
+array.$(OBJEXT): $(top_srcdir)/internal/gc.h
+array.$(OBJEXT): $(top_srcdir)/internal/hash.h
+array.$(OBJEXT): $(top_srcdir)/internal/numeric.h
+array.$(OBJEXT): $(top_srcdir)/internal/object.h
+array.$(OBJEXT): $(top_srcdir)/internal/proc.h
+array.$(OBJEXT): $(top_srcdir)/internal/rational.h
+array.$(OBJEXT): $(top_srcdir)/internal/serial.h
+array.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+array.$(OBJEXT): $(top_srcdir)/internal/vm.h
+array.$(OBJEXT): $(top_srcdir)/internal/warnings.h
 array.$(OBJEXT): {$(VPATH)}array.c
+array.$(OBJEXT): {$(VPATH)}array.rbinc
+array.$(OBJEXT): {$(VPATH)}assert.h
+array.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+array.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+array.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+array.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+array.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+array.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+array.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+array.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+array.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
+array.$(OBJEXT): {$(VPATH)}builtin.h
 array.$(OBJEXT): {$(VPATH)}config.h
+array.$(OBJEXT): {$(VPATH)}debug_counter.h
 array.$(OBJEXT): {$(VPATH)}defines.h
 array.$(OBJEXT): {$(VPATH)}encoding.h
 array.$(OBJEXT): {$(VPATH)}id.h
+array.$(OBJEXT): {$(VPATH)}id_table.h
 array.$(OBJEXT): {$(VPATH)}intern.h
 array.$(OBJEXT): {$(VPATH)}internal.h
-array.$(OBJEXT): {$(VPATH)}io.h
+array.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+array.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+array.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+array.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+array.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+array.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+array.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+array.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+array.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+array.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+array.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+array.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+array.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+array.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+array.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+array.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+array.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+array.$(OBJEXT): {$(VPATH)}internal/assume.h
+array.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+array.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+array.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+array.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+array.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+array.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+array.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+array.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+array.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+array.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+array.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+array.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+array.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+array.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+array.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+array.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+array.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+array.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+array.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+array.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+array.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+array.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+array.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+array.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+array.$(OBJEXT): {$(VPATH)}internal/cast.h
+array.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+array.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+array.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+array.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+array.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+array.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+array.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+array.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+array.$(OBJEXT): {$(VPATH)}internal/config.h
+array.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+array.$(OBJEXT): {$(VPATH)}internal/core.h
+array.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+array.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+array.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+array.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+array.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+array.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+array.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+array.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+array.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+array.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+array.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+array.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+array.$(OBJEXT): {$(VPATH)}internal/ctype.h
+array.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+array.$(OBJEXT): {$(VPATH)}internal/dosish.h
+array.$(OBJEXT): {$(VPATH)}internal/error.h
+array.$(OBJEXT): {$(VPATH)}internal/eval.h
+array.$(OBJEXT): {$(VPATH)}internal/event.h
+array.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+array.$(OBJEXT): {$(VPATH)}internal/gc.h
+array.$(OBJEXT): {$(VPATH)}internal/glob.h
+array.$(OBJEXT): {$(VPATH)}internal/globals.h
+array.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+array.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+array.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+array.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+array.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+array.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+array.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+array.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+array.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+array.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+array.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+array.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+array.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+array.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+array.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+array.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+array.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+array.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+array.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+array.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+array.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+array.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+array.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+array.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+array.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+array.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+array.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+array.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+array.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+array.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+array.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+array.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+array.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+array.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+array.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+array.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+array.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+array.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+array.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+array.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+array.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+array.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+array.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+array.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+array.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+array.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+array.$(OBJEXT): {$(VPATH)}internal/iterator.h
+array.$(OBJEXT): {$(VPATH)}internal/memory.h
+array.$(OBJEXT): {$(VPATH)}internal/method.h
+array.$(OBJEXT): {$(VPATH)}internal/module.h
+array.$(OBJEXT): {$(VPATH)}internal/newobj.h
+array.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+array.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+array.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+array.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+array.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+array.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+array.$(OBJEXT): {$(VPATH)}internal/symbol.h
+array.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+array.$(OBJEXT): {$(VPATH)}internal/value.h
+array.$(OBJEXT): {$(VPATH)}internal/value_type.h
+array.$(OBJEXT): {$(VPATH)}internal/variable.h
+array.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+array.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 array.$(OBJEXT): {$(VPATH)}missing.h
+array.$(OBJEXT): {$(VPATH)}onigmo.h
 array.$(OBJEXT): {$(VPATH)}oniguruma.h
 array.$(OBJEXT): {$(VPATH)}probes.dmyh
 array.$(OBJEXT): {$(VPATH)}probes.h
 array.$(OBJEXT): {$(VPATH)}ruby_assert.h
 array.$(OBJEXT): {$(VPATH)}st.h
 array.$(OBJEXT): {$(VPATH)}subst.h
+array.$(OBJEXT): {$(VPATH)}transient_heap.h
 array.$(OBJEXT): {$(VPATH)}util.h
-array.$(OBJEXT): {$(VPATH)}vm_opts.h
+ast.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+ast.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+ast.$(OBJEXT): $(CCAN_DIR)/list/list.h
+ast.$(OBJEXT): $(CCAN_DIR)/str/str.h
+ast.$(OBJEXT): $(hdrdir)/ruby.h
+ast.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+ast.$(OBJEXT): $(top_srcdir)/internal/array.h
+ast.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+ast.$(OBJEXT): $(top_srcdir)/internal/gc.h
+ast.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+ast.$(OBJEXT): $(top_srcdir)/internal/parse.h
+ast.$(OBJEXT): $(top_srcdir)/internal/serial.h
+ast.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+ast.$(OBJEXT): $(top_srcdir)/internal/symbol.h
+ast.$(OBJEXT): $(top_srcdir)/internal/vm.h
+ast.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+ast.$(OBJEXT): {$(VPATH)}assert.h
+ast.$(OBJEXT): {$(VPATH)}ast.c
+ast.$(OBJEXT): {$(VPATH)}ast.rbinc
+ast.$(OBJEXT): {$(VPATH)}atomic.h
+ast.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+ast.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+ast.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+ast.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+ast.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+ast.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+ast.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+ast.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+ast.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
+ast.$(OBJEXT): {$(VPATH)}builtin.h
+ast.$(OBJEXT): {$(VPATH)}config.h
+ast.$(OBJEXT): {$(VPATH)}defines.h
+ast.$(OBJEXT): {$(VPATH)}encoding.h
+ast.$(OBJEXT): {$(VPATH)}id.h
+ast.$(OBJEXT): {$(VPATH)}intern.h
+ast.$(OBJEXT): {$(VPATH)}internal.h
+ast.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+ast.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+ast.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+ast.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+ast.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+ast.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+ast.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+ast.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+ast.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+ast.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+ast.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+ast.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+ast.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+ast.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+ast.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+ast.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+ast.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+ast.$(OBJEXT): {$(VPATH)}internal/assume.h
+ast.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+ast.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+ast.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+ast.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+ast.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+ast.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+ast.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+ast.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+ast.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+ast.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+ast.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+ast.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+ast.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+ast.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+ast.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+ast.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+ast.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+ast.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+ast.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+ast.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+ast.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+ast.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+ast.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+ast.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+ast.$(OBJEXT): {$(VPATH)}internal/cast.h
+ast.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+ast.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+ast.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+ast.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+ast.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+ast.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+ast.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+ast.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+ast.$(OBJEXT): {$(VPATH)}internal/config.h
+ast.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+ast.$(OBJEXT): {$(VPATH)}internal/core.h
+ast.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+ast.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+ast.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+ast.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+ast.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+ast.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+ast.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+ast.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+ast.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+ast.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+ast.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+ast.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+ast.$(OBJEXT): {$(VPATH)}internal/ctype.h
+ast.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+ast.$(OBJEXT): {$(VPATH)}internal/dosish.h
+ast.$(OBJEXT): {$(VPATH)}internal/error.h
+ast.$(OBJEXT): {$(VPATH)}internal/eval.h
+ast.$(OBJEXT): {$(VPATH)}internal/event.h
+ast.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+ast.$(OBJEXT): {$(VPATH)}internal/gc.h
+ast.$(OBJEXT): {$(VPATH)}internal/glob.h
+ast.$(OBJEXT): {$(VPATH)}internal/globals.h
+ast.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+ast.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+ast.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+ast.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+ast.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+ast.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+ast.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+ast.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+ast.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+ast.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+ast.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+ast.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+ast.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+ast.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+ast.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+ast.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+ast.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+ast.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+ast.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+ast.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+ast.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+ast.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+ast.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+ast.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+ast.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+ast.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+ast.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+ast.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+ast.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+ast.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+ast.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+ast.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+ast.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+ast.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+ast.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+ast.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+ast.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+ast.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+ast.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+ast.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+ast.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+ast.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+ast.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+ast.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+ast.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+ast.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+ast.$(OBJEXT): {$(VPATH)}internal/iterator.h
+ast.$(OBJEXT): {$(VPATH)}internal/memory.h
+ast.$(OBJEXT): {$(VPATH)}internal/method.h
+ast.$(OBJEXT): {$(VPATH)}internal/module.h
+ast.$(OBJEXT): {$(VPATH)}internal/newobj.h
+ast.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+ast.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+ast.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+ast.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+ast.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+ast.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+ast.$(OBJEXT): {$(VPATH)}internal/symbol.h
+ast.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+ast.$(OBJEXT): {$(VPATH)}internal/value.h
+ast.$(OBJEXT): {$(VPATH)}internal/value_type.h
+ast.$(OBJEXT): {$(VPATH)}internal/variable.h
+ast.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+ast.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
+ast.$(OBJEXT): {$(VPATH)}iseq.h
+ast.$(OBJEXT): {$(VPATH)}method.h
+ast.$(OBJEXT): {$(VPATH)}missing.h
+ast.$(OBJEXT): {$(VPATH)}node.h
+ast.$(OBJEXT): {$(VPATH)}onigmo.h
+ast.$(OBJEXT): {$(VPATH)}oniguruma.h
+ast.$(OBJEXT): {$(VPATH)}ruby_assert.h
+ast.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+ast.$(OBJEXT): {$(VPATH)}st.h
+ast.$(OBJEXT): {$(VPATH)}subst.h
+ast.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+ast.$(OBJEXT): {$(VPATH)}thread_native.h
+ast.$(OBJEXT): {$(VPATH)}util.h
+ast.$(OBJEXT): {$(VPATH)}vm_core.h
+ast.$(OBJEXT): {$(VPATH)}vm_opts.h
+bignum.$(OBJEXT): $(hdrdir)/ruby.h
 bignum.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-bignum.$(OBJEXT): $(top_srcdir)/include/ruby.h
+bignum.$(OBJEXT): $(top_srcdir)/internal/bignum.h
+bignum.$(OBJEXT): $(top_srcdir)/internal/bits.h
+bignum.$(OBJEXT): $(top_srcdir)/internal/class.h
+bignum.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+bignum.$(OBJEXT): $(top_srcdir)/internal/complex.h
+bignum.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
+bignum.$(OBJEXT): $(top_srcdir)/internal/gc.h
+bignum.$(OBJEXT): $(top_srcdir)/internal/numeric.h
+bignum.$(OBJEXT): $(top_srcdir)/internal/object.h
+bignum.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
+bignum.$(OBJEXT): $(top_srcdir)/internal/serial.h
+bignum.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+bignum.$(OBJEXT): $(top_srcdir)/internal/util.h
+bignum.$(OBJEXT): $(top_srcdir)/internal/variable.h
+bignum.$(OBJEXT): $(top_srcdir)/internal/vm.h
+bignum.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+bignum.$(OBJEXT): {$(VPATH)}assert.h
+bignum.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+bignum.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+bignum.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+bignum.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+bignum.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+bignum.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+bignum.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+bignum.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+bignum.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 bignum.$(OBJEXT): {$(VPATH)}bignum.c
 bignum.$(OBJEXT): {$(VPATH)}config.h
+bignum.$(OBJEXT): {$(VPATH)}constant.h
 bignum.$(OBJEXT): {$(VPATH)}defines.h
-bignum.$(OBJEXT): {$(VPATH)}encoding.h
+bignum.$(OBJEXT): {$(VPATH)}id.h
+bignum.$(OBJEXT): {$(VPATH)}id_table.h
 bignum.$(OBJEXT): {$(VPATH)}intern.h
 bignum.$(OBJEXT): {$(VPATH)}internal.h
-bignum.$(OBJEXT): {$(VPATH)}io.h
+bignum.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+bignum.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+bignum.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+bignum.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+bignum.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+bignum.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+bignum.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+bignum.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+bignum.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+bignum.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+bignum.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+bignum.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+bignum.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+bignum.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+bignum.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+bignum.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+bignum.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+bignum.$(OBJEXT): {$(VPATH)}internal/assume.h
+bignum.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+bignum.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+bignum.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+bignum.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+bignum.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+bignum.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+bignum.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+bignum.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+bignum.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+bignum.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+bignum.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+bignum.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+bignum.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+bignum.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+bignum.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+bignum.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+bignum.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+bignum.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+bignum.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+bignum.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+bignum.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+bignum.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+bignum.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+bignum.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+bignum.$(OBJEXT): {$(VPATH)}internal/cast.h
+bignum.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+bignum.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+bignum.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+bignum.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+bignum.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+bignum.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+bignum.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+bignum.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+bignum.$(OBJEXT): {$(VPATH)}internal/config.h
+bignum.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+bignum.$(OBJEXT): {$(VPATH)}internal/core.h
+bignum.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+bignum.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+bignum.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+bignum.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+bignum.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+bignum.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+bignum.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+bignum.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+bignum.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+bignum.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+bignum.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+bignum.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+bignum.$(OBJEXT): {$(VPATH)}internal/ctype.h
+bignum.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+bignum.$(OBJEXT): {$(VPATH)}internal/dosish.h
+bignum.$(OBJEXT): {$(VPATH)}internal/error.h
+bignum.$(OBJEXT): {$(VPATH)}internal/eval.h
+bignum.$(OBJEXT): {$(VPATH)}internal/event.h
+bignum.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+bignum.$(OBJEXT): {$(VPATH)}internal/gc.h
+bignum.$(OBJEXT): {$(VPATH)}internal/glob.h
+bignum.$(OBJEXT): {$(VPATH)}internal/globals.h
+bignum.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+bignum.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+bignum.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+bignum.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+bignum.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+bignum.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+bignum.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+bignum.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+bignum.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+bignum.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+bignum.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+bignum.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+bignum.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+bignum.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+bignum.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+bignum.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+bignum.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+bignum.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+bignum.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+bignum.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+bignum.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+bignum.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+bignum.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+bignum.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+bignum.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+bignum.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+bignum.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+bignum.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+bignum.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+bignum.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+bignum.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+bignum.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+bignum.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+bignum.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+bignum.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+bignum.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+bignum.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+bignum.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+bignum.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+bignum.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+bignum.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+bignum.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+bignum.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+bignum.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+bignum.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+bignum.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+bignum.$(OBJEXT): {$(VPATH)}internal/iterator.h
+bignum.$(OBJEXT): {$(VPATH)}internal/memory.h
+bignum.$(OBJEXT): {$(VPATH)}internal/method.h
+bignum.$(OBJEXT): {$(VPATH)}internal/module.h
+bignum.$(OBJEXT): {$(VPATH)}internal/newobj.h
+bignum.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+bignum.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+bignum.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+bignum.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+bignum.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+bignum.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+bignum.$(OBJEXT): {$(VPATH)}internal/symbol.h
+bignum.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+bignum.$(OBJEXT): {$(VPATH)}internal/value.h
+bignum.$(OBJEXT): {$(VPATH)}internal/value_type.h
+bignum.$(OBJEXT): {$(VPATH)}internal/variable.h
+bignum.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+bignum.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 bignum.$(OBJEXT): {$(VPATH)}missing.h
-bignum.$(OBJEXT): {$(VPATH)}oniguruma.h
 bignum.$(OBJEXT): {$(VPATH)}ruby_assert.h
 bignum.$(OBJEXT): {$(VPATH)}st.h
 bignum.$(OBJEXT): {$(VPATH)}subst.h
 bignum.$(OBJEXT): {$(VPATH)}thread.h
 bignum.$(OBJEXT): {$(VPATH)}util.h
+builtin.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+builtin.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+builtin.$(OBJEXT): $(CCAN_DIR)/list/list.h
+builtin.$(OBJEXT): $(CCAN_DIR)/str/str.h
+builtin.$(OBJEXT): $(hdrdir)/ruby.h
+builtin.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+builtin.$(OBJEXT): $(top_srcdir)/internal/array.h
+builtin.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+builtin.$(OBJEXT): $(top_srcdir)/internal/gc.h
+builtin.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+builtin.$(OBJEXT): $(top_srcdir)/internal/serial.h
+builtin.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+builtin.$(OBJEXT): $(top_srcdir)/internal/vm.h
+builtin.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+builtin.$(OBJEXT): {$(VPATH)}assert.h
+builtin.$(OBJEXT): {$(VPATH)}atomic.h
+builtin.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+builtin.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+builtin.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+builtin.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+builtin.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+builtin.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+builtin.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+builtin.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+builtin.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
+builtin.$(OBJEXT): {$(VPATH)}builtin.c
+builtin.$(OBJEXT): {$(VPATH)}builtin.h
+builtin.$(OBJEXT): {$(VPATH)}builtin_binary.inc
+builtin.$(OBJEXT): {$(VPATH)}config.h
+builtin.$(OBJEXT): {$(VPATH)}defines.h
+builtin.$(OBJEXT): {$(VPATH)}id.h
+builtin.$(OBJEXT): {$(VPATH)}intern.h
+builtin.$(OBJEXT): {$(VPATH)}internal.h
+builtin.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+builtin.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+builtin.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+builtin.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+builtin.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+builtin.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+builtin.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+builtin.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+builtin.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+builtin.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+builtin.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+builtin.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+builtin.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+builtin.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+builtin.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+builtin.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+builtin.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+builtin.$(OBJEXT): {$(VPATH)}internal/assume.h
+builtin.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+builtin.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+builtin.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+builtin.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+builtin.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+builtin.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+builtin.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+builtin.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+builtin.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+builtin.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+builtin.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+builtin.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+builtin.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+builtin.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+builtin.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+builtin.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+builtin.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+builtin.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+builtin.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+builtin.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+builtin.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+builtin.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+builtin.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+builtin.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+builtin.$(OBJEXT): {$(VPATH)}internal/cast.h
+builtin.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+builtin.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+builtin.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+builtin.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+builtin.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+builtin.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+builtin.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+builtin.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+builtin.$(OBJEXT): {$(VPATH)}internal/config.h
+builtin.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+builtin.$(OBJEXT): {$(VPATH)}internal/core.h
+builtin.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+builtin.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+builtin.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+builtin.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+builtin.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+builtin.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+builtin.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+builtin.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+builtin.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+builtin.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+builtin.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+builtin.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+builtin.$(OBJEXT): {$(VPATH)}internal/ctype.h
+builtin.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+builtin.$(OBJEXT): {$(VPATH)}internal/dosish.h
+builtin.$(OBJEXT): {$(VPATH)}internal/error.h
+builtin.$(OBJEXT): {$(VPATH)}internal/eval.h
+builtin.$(OBJEXT): {$(VPATH)}internal/event.h
+builtin.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+builtin.$(OBJEXT): {$(VPATH)}internal/gc.h
+builtin.$(OBJEXT): {$(VPATH)}internal/glob.h
+builtin.$(OBJEXT): {$(VPATH)}internal/globals.h
+builtin.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+builtin.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+builtin.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+builtin.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+builtin.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+builtin.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+builtin.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+builtin.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+builtin.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+builtin.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+builtin.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+builtin.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+builtin.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+builtin.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+builtin.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+builtin.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+builtin.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+builtin.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+builtin.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+builtin.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+builtin.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+builtin.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+builtin.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+builtin.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+builtin.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+builtin.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+builtin.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+builtin.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+builtin.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+builtin.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+builtin.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+builtin.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+builtin.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+builtin.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+builtin.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+builtin.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+builtin.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+builtin.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+builtin.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+builtin.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+builtin.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+builtin.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+builtin.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+builtin.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+builtin.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+builtin.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+builtin.$(OBJEXT): {$(VPATH)}internal/iterator.h
+builtin.$(OBJEXT): {$(VPATH)}internal/memory.h
+builtin.$(OBJEXT): {$(VPATH)}internal/method.h
+builtin.$(OBJEXT): {$(VPATH)}internal/module.h
+builtin.$(OBJEXT): {$(VPATH)}internal/newobj.h
+builtin.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+builtin.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+builtin.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+builtin.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+builtin.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+builtin.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+builtin.$(OBJEXT): {$(VPATH)}internal/symbol.h
+builtin.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+builtin.$(OBJEXT): {$(VPATH)}internal/value.h
+builtin.$(OBJEXT): {$(VPATH)}internal/value_type.h
+builtin.$(OBJEXT): {$(VPATH)}internal/variable.h
+builtin.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+builtin.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
+builtin.$(OBJEXT): {$(VPATH)}iseq.h
+builtin.$(OBJEXT): {$(VPATH)}method.h
+builtin.$(OBJEXT): {$(VPATH)}missing.h
+builtin.$(OBJEXT): {$(VPATH)}node.h
+builtin.$(OBJEXT): {$(VPATH)}ruby_assert.h
+builtin.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+builtin.$(OBJEXT): {$(VPATH)}st.h
+builtin.$(OBJEXT): {$(VPATH)}subst.h
+builtin.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+builtin.$(OBJEXT): {$(VPATH)}thread_native.h
+builtin.$(OBJEXT): {$(VPATH)}vm_core.h
+builtin.$(OBJEXT): {$(VPATH)}vm_opts.h
 class.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 class.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 class.$(OBJEXT): $(CCAN_DIR)/list/list.h
 class.$(OBJEXT): $(CCAN_DIR)/str/str.h
+class.$(OBJEXT): $(hdrdir)/ruby.h
 class.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-class.$(OBJEXT): $(top_srcdir)/include/ruby.h
+class.$(OBJEXT): $(top_srcdir)/internal/array.h
+class.$(OBJEXT): $(top_srcdir)/internal/class.h
+class.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+class.$(OBJEXT): $(top_srcdir)/internal/error.h
+class.$(OBJEXT): $(top_srcdir)/internal/eval.h
+class.$(OBJEXT): $(top_srcdir)/internal/gc.h
+class.$(OBJEXT): $(top_srcdir)/internal/hash.h
+class.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+class.$(OBJEXT): $(top_srcdir)/internal/object.h
+class.$(OBJEXT): $(top_srcdir)/internal/serial.h
+class.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+class.$(OBJEXT): $(top_srcdir)/internal/string.h
+class.$(OBJEXT): $(top_srcdir)/internal/variable.h
+class.$(OBJEXT): $(top_srcdir)/internal/vm.h
+class.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+class.$(OBJEXT): {$(VPATH)}assert.h
+class.$(OBJEXT): {$(VPATH)}atomic.h
+class.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+class.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+class.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+class.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+class.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+class.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+class.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+class.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+class.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 class.$(OBJEXT): {$(VPATH)}class.c
 class.$(OBJEXT): {$(VPATH)}config.h
 class.$(OBJEXT): {$(VPATH)}constant.h
 class.$(OBJEXT): {$(VPATH)}defines.h
 class.$(OBJEXT): {$(VPATH)}encoding.h
+class.$(OBJEXT): {$(VPATH)}gc.h
 class.$(OBJEXT): {$(VPATH)}id.h
 class.$(OBJEXT): {$(VPATH)}id_table.h
 class.$(OBJEXT): {$(VPATH)}intern.h
 class.$(OBJEXT): {$(VPATH)}internal.h
-class.$(OBJEXT): {$(VPATH)}io.h
+class.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+class.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+class.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+class.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+class.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+class.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+class.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+class.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+class.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+class.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+class.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+class.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+class.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+class.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+class.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+class.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+class.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+class.$(OBJEXT): {$(VPATH)}internal/assume.h
+class.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+class.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+class.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+class.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+class.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+class.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+class.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+class.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+class.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+class.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+class.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+class.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+class.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+class.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+class.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+class.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+class.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+class.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+class.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+class.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+class.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+class.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+class.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+class.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+class.$(OBJEXT): {$(VPATH)}internal/cast.h
+class.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+class.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+class.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+class.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+class.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+class.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+class.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+class.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+class.$(OBJEXT): {$(VPATH)}internal/config.h
+class.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+class.$(OBJEXT): {$(VPATH)}internal/core.h
+class.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+class.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+class.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+class.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+class.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+class.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+class.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+class.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+class.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+class.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+class.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+class.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+class.$(OBJEXT): {$(VPATH)}internal/ctype.h
+class.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+class.$(OBJEXT): {$(VPATH)}internal/dosish.h
+class.$(OBJEXT): {$(VPATH)}internal/error.h
+class.$(OBJEXT): {$(VPATH)}internal/eval.h
+class.$(OBJEXT): {$(VPATH)}internal/event.h
+class.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+class.$(OBJEXT): {$(VPATH)}internal/gc.h
+class.$(OBJEXT): {$(VPATH)}internal/glob.h
+class.$(OBJEXT): {$(VPATH)}internal/globals.h
+class.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+class.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+class.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+class.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+class.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+class.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+class.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+class.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+class.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+class.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+class.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+class.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+class.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+class.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+class.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+class.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+class.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+class.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+class.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+class.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+class.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+class.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+class.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+class.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+class.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+class.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+class.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+class.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+class.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+class.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+class.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+class.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+class.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+class.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+class.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+class.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+class.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+class.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+class.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+class.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+class.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+class.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+class.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+class.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+class.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+class.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+class.$(OBJEXT): {$(VPATH)}internal/iterator.h
+class.$(OBJEXT): {$(VPATH)}internal/memory.h
+class.$(OBJEXT): {$(VPATH)}internal/method.h
+class.$(OBJEXT): {$(VPATH)}internal/module.h
+class.$(OBJEXT): {$(VPATH)}internal/newobj.h
+class.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+class.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+class.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+class.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+class.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+class.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+class.$(OBJEXT): {$(VPATH)}internal/symbol.h
+class.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+class.$(OBJEXT): {$(VPATH)}internal/value.h
+class.$(OBJEXT): {$(VPATH)}internal/value_type.h
+class.$(OBJEXT): {$(VPATH)}internal/variable.h
+class.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+class.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 class.$(OBJEXT): {$(VPATH)}method.h
 class.$(OBJEXT): {$(VPATH)}missing.h
 class.$(OBJEXT): {$(VPATH)}node.h
+class.$(OBJEXT): {$(VPATH)}onigmo.h
 class.$(OBJEXT): {$(VPATH)}oniguruma.h
 class.$(OBJEXT): {$(VPATH)}ruby_assert.h
 class.$(OBJEXT): {$(VPATH)}ruby_atomic.h
@@ -1218,41 +2611,386 @@ class.$(OBJEXT): {$(VPATH)}subst.h
 class.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 class.$(OBJEXT): {$(VPATH)}thread_native.h
 class.$(OBJEXT): {$(VPATH)}vm_core.h
-class.$(OBJEXT): {$(VPATH)}vm_debug.h
 class.$(OBJEXT): {$(VPATH)}vm_opts.h
+compar.$(OBJEXT): $(hdrdir)/ruby.h
 compar.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+compar.$(OBJEXT): $(top_srcdir)/internal/compar.h
+compar.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+compar.$(OBJEXT): $(top_srcdir)/internal/error.h
+compar.$(OBJEXT): $(top_srcdir)/internal/serial.h
+compar.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+compar.$(OBJEXT): $(top_srcdir)/internal/string.h
+compar.$(OBJEXT): $(top_srcdir)/internal/vm.h
+compar.$(OBJEXT): {$(VPATH)}assert.h
+compar.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+compar.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+compar.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+compar.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+compar.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+compar.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+compar.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+compar.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+compar.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 compar.$(OBJEXT): {$(VPATH)}compar.c
 compar.$(OBJEXT): {$(VPATH)}config.h
 compar.$(OBJEXT): {$(VPATH)}defines.h
+compar.$(OBJEXT): {$(VPATH)}encoding.h
+compar.$(OBJEXT): {$(VPATH)}id.h
 compar.$(OBJEXT): {$(VPATH)}intern.h
+compar.$(OBJEXT): {$(VPATH)}internal.h
+compar.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+compar.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+compar.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+compar.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+compar.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+compar.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+compar.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+compar.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+compar.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+compar.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+compar.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+compar.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+compar.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+compar.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+compar.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+compar.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+compar.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+compar.$(OBJEXT): {$(VPATH)}internal/assume.h
+compar.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+compar.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+compar.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+compar.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+compar.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+compar.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+compar.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+compar.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+compar.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+compar.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+compar.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+compar.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+compar.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+compar.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+compar.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+compar.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+compar.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+compar.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+compar.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+compar.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+compar.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+compar.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+compar.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+compar.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+compar.$(OBJEXT): {$(VPATH)}internal/cast.h
+compar.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+compar.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+compar.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+compar.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+compar.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+compar.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+compar.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+compar.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+compar.$(OBJEXT): {$(VPATH)}internal/config.h
+compar.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+compar.$(OBJEXT): {$(VPATH)}internal/core.h
+compar.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+compar.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+compar.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+compar.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+compar.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+compar.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+compar.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+compar.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+compar.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+compar.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+compar.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+compar.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+compar.$(OBJEXT): {$(VPATH)}internal/ctype.h
+compar.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+compar.$(OBJEXT): {$(VPATH)}internal/dosish.h
+compar.$(OBJEXT): {$(VPATH)}internal/error.h
+compar.$(OBJEXT): {$(VPATH)}internal/eval.h
+compar.$(OBJEXT): {$(VPATH)}internal/event.h
+compar.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+compar.$(OBJEXT): {$(VPATH)}internal/gc.h
+compar.$(OBJEXT): {$(VPATH)}internal/glob.h
+compar.$(OBJEXT): {$(VPATH)}internal/globals.h
+compar.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+compar.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+compar.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+compar.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+compar.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+compar.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+compar.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+compar.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+compar.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+compar.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+compar.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+compar.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+compar.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+compar.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+compar.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+compar.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+compar.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+compar.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+compar.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+compar.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+compar.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+compar.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+compar.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+compar.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+compar.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+compar.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+compar.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+compar.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+compar.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+compar.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+compar.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+compar.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+compar.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+compar.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+compar.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+compar.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+compar.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+compar.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+compar.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+compar.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+compar.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+compar.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+compar.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+compar.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+compar.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+compar.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+compar.$(OBJEXT): {$(VPATH)}internal/iterator.h
+compar.$(OBJEXT): {$(VPATH)}internal/memory.h
+compar.$(OBJEXT): {$(VPATH)}internal/method.h
+compar.$(OBJEXT): {$(VPATH)}internal/module.h
+compar.$(OBJEXT): {$(VPATH)}internal/newobj.h
+compar.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+compar.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+compar.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+compar.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+compar.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+compar.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+compar.$(OBJEXT): {$(VPATH)}internal/symbol.h
+compar.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+compar.$(OBJEXT): {$(VPATH)}internal/value.h
+compar.$(OBJEXT): {$(VPATH)}internal/value_type.h
+compar.$(OBJEXT): {$(VPATH)}internal/variable.h
+compar.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+compar.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 compar.$(OBJEXT): {$(VPATH)}missing.h
+compar.$(OBJEXT): {$(VPATH)}onigmo.h
+compar.$(OBJEXT): {$(VPATH)}oniguruma.h
 compar.$(OBJEXT): {$(VPATH)}st.h
 compar.$(OBJEXT): {$(VPATH)}subst.h
 compile.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 compile.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 compile.$(OBJEXT): $(CCAN_DIR)/list/list.h
 compile.$(OBJEXT): $(CCAN_DIR)/str/str.h
+compile.$(OBJEXT): $(hdrdir)/ruby.h
 compile.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-compile.$(OBJEXT): $(top_srcdir)/include/ruby.h
+compile.$(OBJEXT): $(top_srcdir)/internal/array.h
+compile.$(OBJEXT): $(top_srcdir)/internal/bignum.h
+compile.$(OBJEXT): $(top_srcdir)/internal/bits.h
+compile.$(OBJEXT): $(top_srcdir)/internal/class.h
+compile.$(OBJEXT): $(top_srcdir)/internal/compile.h
+compile.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+compile.$(OBJEXT): $(top_srcdir)/internal/complex.h
+compile.$(OBJEXT): $(top_srcdir)/internal/encoding.h
+compile.$(OBJEXT): $(top_srcdir)/internal/error.h
+compile.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
+compile.$(OBJEXT): $(top_srcdir)/internal/gc.h
+compile.$(OBJEXT): $(top_srcdir)/internal/hash.h
+compile.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+compile.$(OBJEXT): $(top_srcdir)/internal/numeric.h
+compile.$(OBJEXT): $(top_srcdir)/internal/object.h
+compile.$(OBJEXT): $(top_srcdir)/internal/rational.h
+compile.$(OBJEXT): $(top_srcdir)/internal/re.h
+compile.$(OBJEXT): $(top_srcdir)/internal/serial.h
+compile.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+compile.$(OBJEXT): $(top_srcdir)/internal/string.h
+compile.$(OBJEXT): $(top_srcdir)/internal/symbol.h
+compile.$(OBJEXT): $(top_srcdir)/internal/thread.h
+compile.$(OBJEXT): $(top_srcdir)/internal/variable.h
+compile.$(OBJEXT): $(top_srcdir)/internal/vm.h
+compile.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+compile.$(OBJEXT): {$(VPATH)}assert.h
+compile.$(OBJEXT): {$(VPATH)}atomic.h
+compile.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+compile.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+compile.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+compile.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+compile.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+compile.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+compile.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+compile.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+compile.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
+compile.$(OBJEXT): {$(VPATH)}builtin.h
 compile.$(OBJEXT): {$(VPATH)}compile.c
 compile.$(OBJEXT): {$(VPATH)}config.h
+compile.$(OBJEXT): {$(VPATH)}constant.h
+compile.$(OBJEXT): {$(VPATH)}debug_counter.h
 compile.$(OBJEXT): {$(VPATH)}defines.h
 compile.$(OBJEXT): {$(VPATH)}encindex.h
 compile.$(OBJEXT): {$(VPATH)}encoding.h
 compile.$(OBJEXT): {$(VPATH)}gc.h
 compile.$(OBJEXT): {$(VPATH)}id.h
 compile.$(OBJEXT): {$(VPATH)}id_table.h
+compile.$(OBJEXT): {$(VPATH)}insns.def
 compile.$(OBJEXT): {$(VPATH)}insns.inc
 compile.$(OBJEXT): {$(VPATH)}insns_info.inc
 compile.$(OBJEXT): {$(VPATH)}intern.h
 compile.$(OBJEXT): {$(VPATH)}internal.h
-compile.$(OBJEXT): {$(VPATH)}io.h
+compile.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+compile.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+compile.$(OBJEXT): {$(VPATH)}internal/assume.h
+compile.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+compile.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+compile.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+compile.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+compile.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+compile.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+compile.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+compile.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+compile.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+compile.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+compile.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+compile.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+compile.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+compile.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+compile.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+compile.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+compile.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+compile.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+compile.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+compile.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+compile.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+compile.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+compile.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+compile.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+compile.$(OBJEXT): {$(VPATH)}internal/cast.h
+compile.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+compile.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+compile.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+compile.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+compile.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+compile.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+compile.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+compile.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+compile.$(OBJEXT): {$(VPATH)}internal/config.h
+compile.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+compile.$(OBJEXT): {$(VPATH)}internal/core.h
+compile.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+compile.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+compile.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+compile.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+compile.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+compile.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+compile.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+compile.$(OBJEXT): {$(VPATH)}internal/core/rmatch.h
+compile.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+compile.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+compile.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+compile.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+compile.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+compile.$(OBJEXT): {$(VPATH)}internal/ctype.h
+compile.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+compile.$(OBJEXT): {$(VPATH)}internal/dosish.h
+compile.$(OBJEXT): {$(VPATH)}internal/error.h
+compile.$(OBJEXT): {$(VPATH)}internal/eval.h
+compile.$(OBJEXT): {$(VPATH)}internal/event.h
+compile.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+compile.$(OBJEXT): {$(VPATH)}internal/gc.h
+compile.$(OBJEXT): {$(VPATH)}internal/glob.h
+compile.$(OBJEXT): {$(VPATH)}internal/globals.h
+compile.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+compile.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+compile.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+compile.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+compile.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+compile.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+compile.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+compile.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+compile.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+compile.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+compile.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+compile.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+compile.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+compile.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+compile.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+compile.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+compile.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+compile.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+compile.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+compile.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+compile.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+compile.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+compile.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+compile.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+compile.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+compile.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+compile.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+compile.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+compile.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+compile.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+compile.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+compile.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+compile.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+compile.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+compile.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+compile.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+compile.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+compile.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+compile.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+compile.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+compile.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+compile.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+compile.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+compile.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+compile.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+compile.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+compile.$(OBJEXT): {$(VPATH)}internal/iterator.h
+compile.$(OBJEXT): {$(VPATH)}internal/memory.h
+compile.$(OBJEXT): {$(VPATH)}internal/method.h
+compile.$(OBJEXT): {$(VPATH)}internal/module.h
+compile.$(OBJEXT): {$(VPATH)}internal/newobj.h
+compile.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+compile.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+compile.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+compile.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+compile.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+compile.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+compile.$(OBJEXT): {$(VPATH)}internal/symbol.h
+compile.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+compile.$(OBJEXT): {$(VPATH)}internal/value.h
+compile.$(OBJEXT): {$(VPATH)}internal/value_type.h
+compile.$(OBJEXT): {$(VPATH)}internal/variable.h
+compile.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+compile.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 compile.$(OBJEXT): {$(VPATH)}iseq.h
 compile.$(OBJEXT): {$(VPATH)}method.h
 compile.$(OBJEXT): {$(VPATH)}missing.h
 compile.$(OBJEXT): {$(VPATH)}node.h
+compile.$(OBJEXT): {$(VPATH)}onigmo.h
 compile.$(OBJEXT): {$(VPATH)}oniguruma.h
+compile.$(OBJEXT): {$(VPATH)}opt_sc.inc
 compile.$(OBJEXT): {$(VPATH)}optinsn.inc
+compile.$(OBJEXT): {$(VPATH)}optunifs.inc
 compile.$(OBJEXT): {$(VPATH)}re.h
 compile.$(OBJEXT): {$(VPATH)}regex.h
 compile.$(OBJEXT): {$(VPATH)}ruby_assert.h
@@ -1261,19 +2999,191 @@ compile.$(OBJEXT): {$(VPATH)}st.h
 compile.$(OBJEXT): {$(VPATH)}subst.h
 compile.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 compile.$(OBJEXT): {$(VPATH)}thread_native.h
+compile.$(OBJEXT): {$(VPATH)}util.h
+compile.$(OBJEXT): {$(VPATH)}vm_callinfo.h
 compile.$(OBJEXT): {$(VPATH)}vm_core.h
 compile.$(OBJEXT): {$(VPATH)}vm_debug.h
 compile.$(OBJEXT): {$(VPATH)}vm_opts.h
+complex.$(OBJEXT): $(hdrdir)/ruby.h
 complex.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-complex.$(OBJEXT): $(top_srcdir)/include/ruby.h
+complex.$(OBJEXT): $(top_srcdir)/internal/array.h
+complex.$(OBJEXT): $(top_srcdir)/internal/bignum.h
+complex.$(OBJEXT): $(top_srcdir)/internal/bits.h
+complex.$(OBJEXT): $(top_srcdir)/internal/class.h
+complex.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+complex.$(OBJEXT): $(top_srcdir)/internal/complex.h
+complex.$(OBJEXT): $(top_srcdir)/internal/error.h
+complex.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
+complex.$(OBJEXT): $(top_srcdir)/internal/gc.h
+complex.$(OBJEXT): $(top_srcdir)/internal/math.h
+complex.$(OBJEXT): $(top_srcdir)/internal/numeric.h
+complex.$(OBJEXT): $(top_srcdir)/internal/object.h
+complex.$(OBJEXT): $(top_srcdir)/internal/rational.h
+complex.$(OBJEXT): $(top_srcdir)/internal/serial.h
+complex.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+complex.$(OBJEXT): $(top_srcdir)/internal/string.h
+complex.$(OBJEXT): $(top_srcdir)/internal/vm.h
+complex.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+complex.$(OBJEXT): {$(VPATH)}assert.h
+complex.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+complex.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+complex.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+complex.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+complex.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+complex.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+complex.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+complex.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+complex.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 complex.$(OBJEXT): {$(VPATH)}complex.c
 complex.$(OBJEXT): {$(VPATH)}config.h
 complex.$(OBJEXT): {$(VPATH)}defines.h
 complex.$(OBJEXT): {$(VPATH)}encoding.h
+complex.$(OBJEXT): {$(VPATH)}id.h
+complex.$(OBJEXT): {$(VPATH)}id_table.h
 complex.$(OBJEXT): {$(VPATH)}intern.h
 complex.$(OBJEXT): {$(VPATH)}internal.h
-complex.$(OBJEXT): {$(VPATH)}io.h
+complex.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+complex.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+complex.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+complex.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+complex.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+complex.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+complex.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+complex.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+complex.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+complex.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+complex.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+complex.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+complex.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+complex.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+complex.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+complex.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+complex.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+complex.$(OBJEXT): {$(VPATH)}internal/assume.h
+complex.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+complex.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+complex.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+complex.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+complex.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+complex.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+complex.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+complex.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+complex.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+complex.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+complex.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+complex.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+complex.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+complex.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+complex.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+complex.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+complex.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+complex.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+complex.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+complex.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+complex.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+complex.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+complex.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+complex.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+complex.$(OBJEXT): {$(VPATH)}internal/cast.h
+complex.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+complex.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+complex.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+complex.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+complex.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+complex.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+complex.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+complex.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+complex.$(OBJEXT): {$(VPATH)}internal/config.h
+complex.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+complex.$(OBJEXT): {$(VPATH)}internal/core.h
+complex.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+complex.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+complex.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+complex.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+complex.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+complex.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+complex.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+complex.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+complex.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+complex.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+complex.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+complex.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+complex.$(OBJEXT): {$(VPATH)}internal/ctype.h
+complex.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+complex.$(OBJEXT): {$(VPATH)}internal/dosish.h
+complex.$(OBJEXT): {$(VPATH)}internal/error.h
+complex.$(OBJEXT): {$(VPATH)}internal/eval.h
+complex.$(OBJEXT): {$(VPATH)}internal/event.h
+complex.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+complex.$(OBJEXT): {$(VPATH)}internal/gc.h
+complex.$(OBJEXT): {$(VPATH)}internal/glob.h
+complex.$(OBJEXT): {$(VPATH)}internal/globals.h
+complex.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+complex.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+complex.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+complex.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+complex.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+complex.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+complex.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+complex.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+complex.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+complex.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+complex.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+complex.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+complex.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+complex.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+complex.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+complex.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+complex.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+complex.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+complex.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+complex.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+complex.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+complex.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+complex.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+complex.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+complex.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+complex.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+complex.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+complex.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+complex.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+complex.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+complex.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+complex.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+complex.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+complex.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+complex.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+complex.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+complex.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+complex.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+complex.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+complex.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+complex.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+complex.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+complex.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+complex.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+complex.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+complex.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+complex.$(OBJEXT): {$(VPATH)}internal/iterator.h
+complex.$(OBJEXT): {$(VPATH)}internal/memory.h
+complex.$(OBJEXT): {$(VPATH)}internal/method.h
+complex.$(OBJEXT): {$(VPATH)}internal/module.h
+complex.$(OBJEXT): {$(VPATH)}internal/newobj.h
+complex.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+complex.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+complex.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+complex.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+complex.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+complex.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+complex.$(OBJEXT): {$(VPATH)}internal/symbol.h
+complex.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+complex.$(OBJEXT): {$(VPATH)}internal/value.h
+complex.$(OBJEXT): {$(VPATH)}internal/value_type.h
+complex.$(OBJEXT): {$(VPATH)}internal/variable.h
+complex.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+complex.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 complex.$(OBJEXT): {$(VPATH)}missing.h
+complex.$(OBJEXT): {$(VPATH)}onigmo.h
 complex.$(OBJEXT): {$(VPATH)}oniguruma.h
 complex.$(OBJEXT): {$(VPATH)}ruby_assert.h
 complex.$(OBJEXT): {$(VPATH)}st.h
@@ -1282,22 +3192,187 @@ cont.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 cont.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 cont.$(OBJEXT): $(CCAN_DIR)/list/list.h
 cont.$(OBJEXT): $(CCAN_DIR)/str/str.h
+cont.$(OBJEXT): $(hdrdir)/ruby.h
 cont.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-cont.$(OBJEXT): $(top_srcdir)/include/ruby.h
+cont.$(OBJEXT): $(top_srcdir)/internal/array.h
+cont.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+cont.$(OBJEXT): $(top_srcdir)/internal/cont.h
+cont.$(OBJEXT): $(top_srcdir)/internal/gc.h
+cont.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+cont.$(OBJEXT): $(top_srcdir)/internal/proc.h
+cont.$(OBJEXT): $(top_srcdir)/internal/scheduler.h
+cont.$(OBJEXT): $(top_srcdir)/internal/serial.h
+cont.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+cont.$(OBJEXT): $(top_srcdir)/internal/vm.h
+cont.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+cont.$(OBJEXT): {$(VPATH)}$(COROUTINE_H)
+cont.$(OBJEXT): {$(VPATH)}assert.h
+cont.$(OBJEXT): {$(VPATH)}atomic.h
+cont.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+cont.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+cont.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+cont.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+cont.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+cont.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+cont.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+cont.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+cont.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 cont.$(OBJEXT): {$(VPATH)}config.h
 cont.$(OBJEXT): {$(VPATH)}cont.c
+cont.$(OBJEXT): {$(VPATH)}debug_counter.h
 cont.$(OBJEXT): {$(VPATH)}defines.h
-cont.$(OBJEXT): {$(VPATH)}encoding.h
 cont.$(OBJEXT): {$(VPATH)}eval_intern.h
 cont.$(OBJEXT): {$(VPATH)}gc.h
 cont.$(OBJEXT): {$(VPATH)}id.h
+cont.$(OBJEXT): {$(VPATH)}id_table.h
 cont.$(OBJEXT): {$(VPATH)}intern.h
 cont.$(OBJEXT): {$(VPATH)}internal.h
-cont.$(OBJEXT): {$(VPATH)}io.h
+cont.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+cont.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+cont.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+cont.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+cont.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+cont.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+cont.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+cont.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+cont.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+cont.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+cont.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+cont.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+cont.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+cont.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+cont.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+cont.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+cont.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+cont.$(OBJEXT): {$(VPATH)}internal/assume.h
+cont.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+cont.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+cont.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+cont.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+cont.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+cont.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+cont.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+cont.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+cont.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+cont.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+cont.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+cont.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+cont.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+cont.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+cont.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+cont.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+cont.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+cont.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+cont.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+cont.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+cont.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+cont.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+cont.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+cont.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+cont.$(OBJEXT): {$(VPATH)}internal/cast.h
+cont.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+cont.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+cont.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+cont.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+cont.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+cont.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+cont.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+cont.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+cont.$(OBJEXT): {$(VPATH)}internal/config.h
+cont.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+cont.$(OBJEXT): {$(VPATH)}internal/core.h
+cont.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+cont.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+cont.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+cont.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+cont.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+cont.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+cont.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+cont.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+cont.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+cont.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+cont.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+cont.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+cont.$(OBJEXT): {$(VPATH)}internal/ctype.h
+cont.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+cont.$(OBJEXT): {$(VPATH)}internal/dosish.h
+cont.$(OBJEXT): {$(VPATH)}internal/error.h
+cont.$(OBJEXT): {$(VPATH)}internal/eval.h
+cont.$(OBJEXT): {$(VPATH)}internal/event.h
+cont.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+cont.$(OBJEXT): {$(VPATH)}internal/gc.h
+cont.$(OBJEXT): {$(VPATH)}internal/glob.h
+cont.$(OBJEXT): {$(VPATH)}internal/globals.h
+cont.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+cont.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+cont.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+cont.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+cont.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+cont.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+cont.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+cont.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+cont.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+cont.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+cont.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+cont.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+cont.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+cont.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+cont.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+cont.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+cont.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+cont.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+cont.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+cont.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+cont.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+cont.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+cont.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+cont.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+cont.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+cont.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+cont.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+cont.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+cont.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+cont.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+cont.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+cont.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+cont.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+cont.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+cont.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+cont.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+cont.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+cont.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+cont.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+cont.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+cont.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+cont.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+cont.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+cont.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+cont.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+cont.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+cont.$(OBJEXT): {$(VPATH)}internal/iterator.h
+cont.$(OBJEXT): {$(VPATH)}internal/memory.h
+cont.$(OBJEXT): {$(VPATH)}internal/method.h
+cont.$(OBJEXT): {$(VPATH)}internal/module.h
+cont.$(OBJEXT): {$(VPATH)}internal/newobj.h
+cont.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+cont.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+cont.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+cont.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+cont.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+cont.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+cont.$(OBJEXT): {$(VPATH)}internal/symbol.h
+cont.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+cont.$(OBJEXT): {$(VPATH)}internal/value.h
+cont.$(OBJEXT): {$(VPATH)}internal/value_type.h
+cont.$(OBJEXT): {$(VPATH)}internal/variable.h
+cont.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+cont.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 cont.$(OBJEXT): {$(VPATH)}method.h
 cont.$(OBJEXT): {$(VPATH)}missing.h
+cont.$(OBJEXT): {$(VPATH)}mjit.h
 cont.$(OBJEXT): {$(VPATH)}node.h
-cont.$(OBJEXT): {$(VPATH)}oniguruma.h
+cont.$(OBJEXT): {$(VPATH)}ractor.h
+cont.$(OBJEXT): {$(VPATH)}ractor_core.h
 cont.$(OBJEXT): {$(VPATH)}ruby_assert.h
 cont.$(OBJEXT): {$(VPATH)}ruby_atomic.h
 cont.$(OBJEXT): {$(VPATH)}st.h
@@ -1311,69 +3386,1022 @@ debug.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 debug.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 debug.$(OBJEXT): $(CCAN_DIR)/list/list.h
 debug.$(OBJEXT): $(CCAN_DIR)/str/str.h
+debug.$(OBJEXT): $(hdrdir)/ruby.h
 debug.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-debug.$(OBJEXT): $(top_srcdir)/include/ruby.h
+debug.$(OBJEXT): $(top_srcdir)/internal/array.h
+debug.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+debug.$(OBJEXT): $(top_srcdir)/internal/gc.h
+debug.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+debug.$(OBJEXT): $(top_srcdir)/internal/serial.h
+debug.$(OBJEXT): $(top_srcdir)/internal/signal.h
+debug.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+debug.$(OBJEXT): $(top_srcdir)/internal/util.h
+debug.$(OBJEXT): $(top_srcdir)/internal/vm.h
+debug.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+debug.$(OBJEXT): {$(VPATH)}assert.h
+debug.$(OBJEXT): {$(VPATH)}atomic.h
+debug.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+debug.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+debug.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+debug.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+debug.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+debug.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+debug.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+debug.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+debug.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 debug.$(OBJEXT): {$(VPATH)}config.h
 debug.$(OBJEXT): {$(VPATH)}debug.c
+debug.$(OBJEXT): {$(VPATH)}debug_counter.h
 debug.$(OBJEXT): {$(VPATH)}defines.h
 debug.$(OBJEXT): {$(VPATH)}encoding.h
 debug.$(OBJEXT): {$(VPATH)}eval_intern.h
+debug.$(OBJEXT): {$(VPATH)}gc.h
 debug.$(OBJEXT): {$(VPATH)}id.h
+debug.$(OBJEXT): {$(VPATH)}id_table.h
 debug.$(OBJEXT): {$(VPATH)}intern.h
 debug.$(OBJEXT): {$(VPATH)}internal.h
+debug.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+debug.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+debug.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+debug.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+debug.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+debug.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+debug.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+debug.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+debug.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+debug.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+debug.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+debug.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+debug.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+debug.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+debug.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+debug.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+debug.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+debug.$(OBJEXT): {$(VPATH)}internal/assume.h
+debug.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+debug.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+debug.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+debug.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+debug.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+debug.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+debug.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+debug.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+debug.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+debug.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+debug.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+debug.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+debug.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+debug.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+debug.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+debug.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+debug.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+debug.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+debug.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+debug.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+debug.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+debug.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+debug.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+debug.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+debug.$(OBJEXT): {$(VPATH)}internal/cast.h
+debug.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+debug.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+debug.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+debug.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+debug.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+debug.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+debug.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+debug.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+debug.$(OBJEXT): {$(VPATH)}internal/config.h
+debug.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+debug.$(OBJEXT): {$(VPATH)}internal/core.h
+debug.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+debug.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+debug.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+debug.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+debug.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+debug.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+debug.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+debug.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+debug.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+debug.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+debug.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+debug.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+debug.$(OBJEXT): {$(VPATH)}internal/ctype.h
+debug.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+debug.$(OBJEXT): {$(VPATH)}internal/dosish.h
+debug.$(OBJEXT): {$(VPATH)}internal/error.h
+debug.$(OBJEXT): {$(VPATH)}internal/eval.h
+debug.$(OBJEXT): {$(VPATH)}internal/event.h
+debug.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+debug.$(OBJEXT): {$(VPATH)}internal/gc.h
+debug.$(OBJEXT): {$(VPATH)}internal/glob.h
+debug.$(OBJEXT): {$(VPATH)}internal/globals.h
+debug.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+debug.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+debug.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+debug.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+debug.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+debug.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+debug.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+debug.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+debug.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+debug.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+debug.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+debug.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+debug.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+debug.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+debug.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+debug.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+debug.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+debug.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+debug.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+debug.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+debug.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+debug.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+debug.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+debug.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+debug.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+debug.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+debug.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+debug.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+debug.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+debug.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+debug.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+debug.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+debug.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+debug.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+debug.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+debug.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+debug.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+debug.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+debug.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+debug.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+debug.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+debug.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+debug.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+debug.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+debug.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+debug.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+debug.$(OBJEXT): {$(VPATH)}internal/iterator.h
+debug.$(OBJEXT): {$(VPATH)}internal/memory.h
+debug.$(OBJEXT): {$(VPATH)}internal/method.h
+debug.$(OBJEXT): {$(VPATH)}internal/module.h
+debug.$(OBJEXT): {$(VPATH)}internal/newobj.h
+debug.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+debug.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+debug.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+debug.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+debug.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+debug.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+debug.$(OBJEXT): {$(VPATH)}internal/symbol.h
+debug.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+debug.$(OBJEXT): {$(VPATH)}internal/value.h
+debug.$(OBJEXT): {$(VPATH)}internal/value_type.h
+debug.$(OBJEXT): {$(VPATH)}internal/variable.h
+debug.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+debug.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 debug.$(OBJEXT): {$(VPATH)}io.h
 debug.$(OBJEXT): {$(VPATH)}method.h
 debug.$(OBJEXT): {$(VPATH)}missing.h
 debug.$(OBJEXT): {$(VPATH)}node.h
+debug.$(OBJEXT): {$(VPATH)}onigmo.h
 debug.$(OBJEXT): {$(VPATH)}oniguruma.h
+debug.$(OBJEXT): {$(VPATH)}ractor.h
+debug.$(OBJEXT): {$(VPATH)}ractor_core.h
 debug.$(OBJEXT): {$(VPATH)}ruby_assert.h
 debug.$(OBJEXT): {$(VPATH)}ruby_atomic.h
 debug.$(OBJEXT): {$(VPATH)}st.h
 debug.$(OBJEXT): {$(VPATH)}subst.h
+debug.$(OBJEXT): {$(VPATH)}symbol.h
 debug.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 debug.$(OBJEXT): {$(VPATH)}thread_native.h
 debug.$(OBJEXT): {$(VPATH)}util.h
+debug.$(OBJEXT): {$(VPATH)}vm_callinfo.h
 debug.$(OBJEXT): {$(VPATH)}vm_core.h
 debug.$(OBJEXT): {$(VPATH)}vm_debug.h
 debug.$(OBJEXT): {$(VPATH)}vm_opts.h
+debug_counter.$(OBJEXT): $(hdrdir)/ruby.h
+debug_counter.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+debug_counter.$(OBJEXT): {$(VPATH)}assert.h
+debug_counter.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+debug_counter.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+debug_counter.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+debug_counter.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+debug_counter.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+debug_counter.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+debug_counter.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+debug_counter.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+debug_counter.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
+debug_counter.$(OBJEXT): {$(VPATH)}config.h
+debug_counter.$(OBJEXT): {$(VPATH)}debug_counter.c
+debug_counter.$(OBJEXT): {$(VPATH)}debug_counter.h
+debug_counter.$(OBJEXT): {$(VPATH)}defines.h
+debug_counter.$(OBJEXT): {$(VPATH)}intern.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/assume.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/cast.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/config.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/core.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/ctype.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/dosish.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/error.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/eval.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/event.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/gc.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/glob.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/globals.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/iterator.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/memory.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/method.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/module.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/newobj.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/symbol.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/value.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/value_type.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/variable.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+debug_counter.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
+debug_counter.$(OBJEXT): {$(VPATH)}missing.h
+debug_counter.$(OBJEXT): {$(VPATH)}st.h
+debug_counter.$(OBJEXT): {$(VPATH)}subst.h
+debug_counter.$(OBJEXT): {$(VPATH)}thread_native.h
+dir.$(OBJEXT): $(hdrdir)/ruby.h
 dir.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-dir.$(OBJEXT): $(top_srcdir)/include/ruby.h
+dir.$(OBJEXT): $(top_srcdir)/internal/array.h
+dir.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+dir.$(OBJEXT): $(top_srcdir)/internal/dir.h
+dir.$(OBJEXT): $(top_srcdir)/internal/encoding.h
+dir.$(OBJEXT): $(top_srcdir)/internal/error.h
+dir.$(OBJEXT): $(top_srcdir)/internal/file.h
+dir.$(OBJEXT): $(top_srcdir)/internal/gc.h
+dir.$(OBJEXT): $(top_srcdir)/internal/io.h
+dir.$(OBJEXT): $(top_srcdir)/internal/serial.h
+dir.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+dir.$(OBJEXT): $(top_srcdir)/internal/string.h
+dir.$(OBJEXT): $(top_srcdir)/internal/vm.h
+dir.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+dir.$(OBJEXT): {$(VPATH)}assert.h
+dir.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+dir.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+dir.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+dir.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+dir.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+dir.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+dir.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+dir.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+dir.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
+dir.$(OBJEXT): {$(VPATH)}builtin.h
 dir.$(OBJEXT): {$(VPATH)}config.h
 dir.$(OBJEXT): {$(VPATH)}defines.h
 dir.$(OBJEXT): {$(VPATH)}dir.c
+dir.$(OBJEXT): {$(VPATH)}dir.rbinc
 dir.$(OBJEXT): {$(VPATH)}encindex.h
 dir.$(OBJEXT): {$(VPATH)}encoding.h
+dir.$(OBJEXT): {$(VPATH)}id.h
 dir.$(OBJEXT): {$(VPATH)}intern.h
 dir.$(OBJEXT): {$(VPATH)}internal.h
+dir.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+dir.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+dir.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+dir.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+dir.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+dir.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+dir.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+dir.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+dir.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+dir.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+dir.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+dir.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+dir.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+dir.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+dir.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+dir.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+dir.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+dir.$(OBJEXT): {$(VPATH)}internal/assume.h
+dir.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+dir.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+dir.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+dir.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+dir.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+dir.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+dir.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+dir.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+dir.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+dir.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+dir.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+dir.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+dir.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+dir.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+dir.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+dir.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+dir.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+dir.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+dir.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+dir.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+dir.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+dir.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+dir.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+dir.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+dir.$(OBJEXT): {$(VPATH)}internal/cast.h
+dir.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+dir.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+dir.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+dir.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+dir.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+dir.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+dir.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+dir.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+dir.$(OBJEXT): {$(VPATH)}internal/config.h
+dir.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+dir.$(OBJEXT): {$(VPATH)}internal/core.h
+dir.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+dir.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+dir.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+dir.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+dir.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+dir.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+dir.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+dir.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+dir.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+dir.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+dir.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+dir.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+dir.$(OBJEXT): {$(VPATH)}internal/ctype.h
+dir.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+dir.$(OBJEXT): {$(VPATH)}internal/dosish.h
+dir.$(OBJEXT): {$(VPATH)}internal/error.h
+dir.$(OBJEXT): {$(VPATH)}internal/eval.h
+dir.$(OBJEXT): {$(VPATH)}internal/event.h
+dir.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+dir.$(OBJEXT): {$(VPATH)}internal/gc.h
+dir.$(OBJEXT): {$(VPATH)}internal/glob.h
+dir.$(OBJEXT): {$(VPATH)}internal/globals.h
+dir.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+dir.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+dir.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+dir.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+dir.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+dir.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+dir.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+dir.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+dir.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+dir.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+dir.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+dir.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+dir.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+dir.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+dir.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+dir.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+dir.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+dir.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+dir.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+dir.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+dir.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+dir.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+dir.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+dir.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+dir.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+dir.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+dir.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+dir.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+dir.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+dir.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+dir.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+dir.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+dir.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+dir.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+dir.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+dir.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+dir.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+dir.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+dir.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+dir.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+dir.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+dir.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+dir.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+dir.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+dir.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+dir.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+dir.$(OBJEXT): {$(VPATH)}internal/iterator.h
+dir.$(OBJEXT): {$(VPATH)}internal/memory.h
+dir.$(OBJEXT): {$(VPATH)}internal/method.h
+dir.$(OBJEXT): {$(VPATH)}internal/module.h
+dir.$(OBJEXT): {$(VPATH)}internal/newobj.h
+dir.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+dir.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+dir.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+dir.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+dir.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+dir.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+dir.$(OBJEXT): {$(VPATH)}internal/symbol.h
+dir.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+dir.$(OBJEXT): {$(VPATH)}internal/value.h
+dir.$(OBJEXT): {$(VPATH)}internal/value_type.h
+dir.$(OBJEXT): {$(VPATH)}internal/variable.h
+dir.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+dir.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 dir.$(OBJEXT): {$(VPATH)}io.h
 dir.$(OBJEXT): {$(VPATH)}missing.h
+dir.$(OBJEXT): {$(VPATH)}onigmo.h
 dir.$(OBJEXT): {$(VPATH)}oniguruma.h
 dir.$(OBJEXT): {$(VPATH)}st.h
 dir.$(OBJEXT): {$(VPATH)}subst.h
+dir.$(OBJEXT): {$(VPATH)}thread.h
 dir.$(OBJEXT): {$(VPATH)}util.h
+dln.$(OBJEXT): $(hdrdir)/ruby.h
 dln.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+dln.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+dln.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+dln.$(OBJEXT): {$(VPATH)}assert.h
+dln.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+dln.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+dln.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+dln.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+dln.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+dln.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+dln.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+dln.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+dln.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 dln.$(OBJEXT): {$(VPATH)}config.h
 dln.$(OBJEXT): {$(VPATH)}defines.h
 dln.$(OBJEXT): {$(VPATH)}dln.c
 dln.$(OBJEXT): {$(VPATH)}dln.h
 dln.$(OBJEXT): {$(VPATH)}intern.h
+dln.$(OBJEXT): {$(VPATH)}internal.h
+dln.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+dln.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+dln.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+dln.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+dln.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+dln.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+dln.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+dln.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+dln.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+dln.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+dln.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+dln.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+dln.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+dln.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+dln.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+dln.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+dln.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+dln.$(OBJEXT): {$(VPATH)}internal/assume.h
+dln.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+dln.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+dln.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+dln.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+dln.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+dln.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+dln.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+dln.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+dln.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+dln.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+dln.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+dln.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+dln.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+dln.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+dln.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+dln.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+dln.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+dln.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+dln.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+dln.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+dln.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+dln.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+dln.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+dln.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+dln.$(OBJEXT): {$(VPATH)}internal/cast.h
+dln.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+dln.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+dln.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+dln.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+dln.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+dln.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+dln.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+dln.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+dln.$(OBJEXT): {$(VPATH)}internal/config.h
+dln.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+dln.$(OBJEXT): {$(VPATH)}internal/core.h
+dln.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+dln.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+dln.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+dln.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+dln.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+dln.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+dln.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+dln.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+dln.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+dln.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+dln.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+dln.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+dln.$(OBJEXT): {$(VPATH)}internal/ctype.h
+dln.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+dln.$(OBJEXT): {$(VPATH)}internal/dosish.h
+dln.$(OBJEXT): {$(VPATH)}internal/error.h
+dln.$(OBJEXT): {$(VPATH)}internal/eval.h
+dln.$(OBJEXT): {$(VPATH)}internal/event.h
+dln.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+dln.$(OBJEXT): {$(VPATH)}internal/gc.h
+dln.$(OBJEXT): {$(VPATH)}internal/glob.h
+dln.$(OBJEXT): {$(VPATH)}internal/globals.h
+dln.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+dln.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+dln.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+dln.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+dln.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+dln.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+dln.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+dln.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+dln.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+dln.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+dln.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+dln.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+dln.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+dln.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+dln.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+dln.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+dln.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+dln.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+dln.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+dln.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+dln.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+dln.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+dln.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+dln.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+dln.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+dln.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+dln.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+dln.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+dln.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+dln.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+dln.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+dln.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+dln.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+dln.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+dln.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+dln.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+dln.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+dln.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+dln.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+dln.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+dln.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+dln.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+dln.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+dln.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+dln.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+dln.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+dln.$(OBJEXT): {$(VPATH)}internal/iterator.h
+dln.$(OBJEXT): {$(VPATH)}internal/memory.h
+dln.$(OBJEXT): {$(VPATH)}internal/method.h
+dln.$(OBJEXT): {$(VPATH)}internal/module.h
+dln.$(OBJEXT): {$(VPATH)}internal/newobj.h
+dln.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+dln.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+dln.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+dln.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+dln.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+dln.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+dln.$(OBJEXT): {$(VPATH)}internal/symbol.h
+dln.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+dln.$(OBJEXT): {$(VPATH)}internal/value.h
+dln.$(OBJEXT): {$(VPATH)}internal/value_type.h
+dln.$(OBJEXT): {$(VPATH)}internal/variable.h
+dln.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+dln.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 dln.$(OBJEXT): {$(VPATH)}missing.h
 dln.$(OBJEXT): {$(VPATH)}st.h
 dln.$(OBJEXT): {$(VPATH)}subst.h
 dln_find.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+dln_find.$(OBJEXT): {$(VPATH)}assert.h
+dln_find.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+dln_find.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+dln_find.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+dln_find.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+dln_find.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+dln_find.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+dln_find.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+dln_find.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+dln_find.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 dln_find.$(OBJEXT): {$(VPATH)}config.h
 dln_find.$(OBJEXT): {$(VPATH)}defines.h
 dln_find.$(OBJEXT): {$(VPATH)}dln.h
 dln_find.$(OBJEXT): {$(VPATH)}dln_find.c
 dln_find.$(OBJEXT): {$(VPATH)}intern.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/assume.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/cast.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/config.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/core.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/ctype.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/dosish.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/error.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/eval.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/event.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/gc.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/glob.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/globals.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/iterator.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/memory.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/method.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/module.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/newobj.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/symbol.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/value.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/value_type.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/variable.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+dln_find.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 dln_find.$(OBJEXT): {$(VPATH)}missing.h
 dln_find.$(OBJEXT): {$(VPATH)}st.h
 dln_find.$(OBJEXT): {$(VPATH)}subst.h
 dmydln.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+dmydln.$(OBJEXT): {$(VPATH)}assert.h
+dmydln.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+dmydln.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+dmydln.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+dmydln.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+dmydln.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+dmydln.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+dmydln.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+dmydln.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+dmydln.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 dmydln.$(OBJEXT): {$(VPATH)}config.h
 dmydln.$(OBJEXT): {$(VPATH)}defines.h
 dmydln.$(OBJEXT): {$(VPATH)}dmydln.c
 dmydln.$(OBJEXT): {$(VPATH)}intern.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/assume.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/cast.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/config.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/core.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/ctype.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/dosish.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/error.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/eval.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/event.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/gc.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/glob.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/globals.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/iterator.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/memory.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/method.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/module.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/newobj.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/symbol.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/value.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/value_type.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/variable.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+dmydln.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 dmydln.$(OBJEXT): {$(VPATH)}missing.h
 dmydln.$(OBJEXT): {$(VPATH)}st.h
 dmydln.$(OBJEXT): {$(VPATH)}subst.h
@@ -1384,7 +4412,6 @@ enc/ascii.$(OBJEXT): {$(VPATH)}defines.h
 enc/ascii.$(OBJEXT): {$(VPATH)}enc/ascii.c
 enc/ascii.$(OBJEXT): {$(VPATH)}encindex.h
 enc/ascii.$(OBJEXT): {$(VPATH)}missing.h
-enc/ascii.$(OBJEXT): {$(VPATH)}oniguruma.h
 enc/ascii.$(OBJEXT): {$(VPATH)}regenc.h
 enc/trans/newline.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 enc/trans/newline.$(OBJEXT): {$(VPATH)}config.h
@@ -1395,15 +4422,15 @@ enc/trans/newline.$(OBJEXT): {$(VPATH)}missing.h
 enc/trans/newline.$(OBJEXT): {$(VPATH)}st.h
 enc/trans/newline.$(OBJEXT): {$(VPATH)}subst.h
 enc/trans/newline.$(OBJEXT): {$(VPATH)}transcode_data.h
+enc/unicode.$(OBJEXT): $(UNICODE_HDR_DIR)/casefold.h
+enc/unicode.$(OBJEXT): $(UNICODE_HDR_DIR)/name2ctype.h
 enc/unicode.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 enc/unicode.$(OBJEXT): {$(VPATH)}config.h
 enc/unicode.$(OBJEXT): {$(VPATH)}defines.h
 enc/unicode.$(OBJEXT): {$(VPATH)}enc/unicode.c
-enc/unicode.$(OBJEXT): {$(VPATH)}enc/unicode/casefold.h
-enc/unicode.$(OBJEXT): {$(VPATH)}enc/unicode/name2ctype.h
 enc/unicode.$(OBJEXT): {$(VPATH)}intern.h
 enc/unicode.$(OBJEXT): {$(VPATH)}missing.h
-enc/unicode.$(OBJEXT): {$(VPATH)}oniguruma.h
+enc/unicode.$(OBJEXT): {$(VPATH)}onigmo.h
 enc/unicode.$(OBJEXT): {$(VPATH)}regenc.h
 enc/unicode.$(OBJEXT): {$(VPATH)}regint.h
 enc/unicode.$(OBJEXT): {$(VPATH)}st.h
@@ -1413,78 +4440,762 @@ enc/us_ascii.$(OBJEXT): {$(VPATH)}defines.h
 enc/us_ascii.$(OBJEXT): {$(VPATH)}enc/us_ascii.c
 enc/us_ascii.$(OBJEXT): {$(VPATH)}encindex.h
 enc/us_ascii.$(OBJEXT): {$(VPATH)}missing.h
-enc/us_ascii.$(OBJEXT): {$(VPATH)}oniguruma.h
 enc/us_ascii.$(OBJEXT): {$(VPATH)}regenc.h
 enc/utf_8.$(OBJEXT): {$(VPATH)}config.h
 enc/utf_8.$(OBJEXT): {$(VPATH)}defines.h
 enc/utf_8.$(OBJEXT): {$(VPATH)}enc/utf_8.c
 enc/utf_8.$(OBJEXT): {$(VPATH)}encindex.h
 enc/utf_8.$(OBJEXT): {$(VPATH)}missing.h
-enc/utf_8.$(OBJEXT): {$(VPATH)}oniguruma.h
 enc/utf_8.$(OBJEXT): {$(VPATH)}regenc.h
+encoding.$(OBJEXT): $(hdrdir)/ruby.h
 encoding.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-encoding.$(OBJEXT): $(top_srcdir)/include/ruby.h
+encoding.$(OBJEXT): $(top_srcdir)/internal/class.h
+encoding.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+encoding.$(OBJEXT): $(top_srcdir)/internal/enc.h
+encoding.$(OBJEXT): $(top_srcdir)/internal/encoding.h
+encoding.$(OBJEXT): $(top_srcdir)/internal/gc.h
+encoding.$(OBJEXT): $(top_srcdir)/internal/inits.h
+encoding.$(OBJEXT): $(top_srcdir)/internal/load.h
+encoding.$(OBJEXT): $(top_srcdir)/internal/object.h
+encoding.$(OBJEXT): $(top_srcdir)/internal/serial.h
+encoding.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+encoding.$(OBJEXT): $(top_srcdir)/internal/string.h
+encoding.$(OBJEXT): $(top_srcdir)/internal/vm.h
+encoding.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+encoding.$(OBJEXT): {$(VPATH)}assert.h
+encoding.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+encoding.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+encoding.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+encoding.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+encoding.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+encoding.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+encoding.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+encoding.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+encoding.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 encoding.$(OBJEXT): {$(VPATH)}config.h
+encoding.$(OBJEXT): {$(VPATH)}debug_counter.h
 encoding.$(OBJEXT): {$(VPATH)}defines.h
 encoding.$(OBJEXT): {$(VPATH)}encindex.h
 encoding.$(OBJEXT): {$(VPATH)}encoding.c
 encoding.$(OBJEXT): {$(VPATH)}encoding.h
+encoding.$(OBJEXT): {$(VPATH)}id_table.h
 encoding.$(OBJEXT): {$(VPATH)}intern.h
 encoding.$(OBJEXT): {$(VPATH)}internal.h
-encoding.$(OBJEXT): {$(VPATH)}io.h
+encoding.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+encoding.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+encoding.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+encoding.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+encoding.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+encoding.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+encoding.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+encoding.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+encoding.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+encoding.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+encoding.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+encoding.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+encoding.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+encoding.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+encoding.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+encoding.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+encoding.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+encoding.$(OBJEXT): {$(VPATH)}internal/assume.h
+encoding.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+encoding.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+encoding.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+encoding.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+encoding.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+encoding.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+encoding.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+encoding.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+encoding.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+encoding.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+encoding.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+encoding.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+encoding.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+encoding.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+encoding.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+encoding.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+encoding.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+encoding.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+encoding.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+encoding.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+encoding.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+encoding.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+encoding.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+encoding.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+encoding.$(OBJEXT): {$(VPATH)}internal/cast.h
+encoding.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+encoding.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+encoding.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+encoding.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+encoding.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+encoding.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+encoding.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+encoding.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+encoding.$(OBJEXT): {$(VPATH)}internal/config.h
+encoding.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+encoding.$(OBJEXT): {$(VPATH)}internal/core.h
+encoding.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+encoding.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+encoding.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+encoding.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+encoding.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+encoding.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+encoding.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+encoding.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+encoding.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+encoding.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+encoding.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+encoding.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+encoding.$(OBJEXT): {$(VPATH)}internal/ctype.h
+encoding.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+encoding.$(OBJEXT): {$(VPATH)}internal/dosish.h
+encoding.$(OBJEXT): {$(VPATH)}internal/error.h
+encoding.$(OBJEXT): {$(VPATH)}internal/eval.h
+encoding.$(OBJEXT): {$(VPATH)}internal/event.h
+encoding.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+encoding.$(OBJEXT): {$(VPATH)}internal/gc.h
+encoding.$(OBJEXT): {$(VPATH)}internal/glob.h
+encoding.$(OBJEXT): {$(VPATH)}internal/globals.h
+encoding.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+encoding.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+encoding.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+encoding.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+encoding.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+encoding.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+encoding.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+encoding.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+encoding.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+encoding.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+encoding.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+encoding.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+encoding.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+encoding.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+encoding.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+encoding.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+encoding.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+encoding.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+encoding.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+encoding.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+encoding.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+encoding.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+encoding.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+encoding.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+encoding.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+encoding.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+encoding.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+encoding.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+encoding.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+encoding.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+encoding.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+encoding.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+encoding.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+encoding.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+encoding.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+encoding.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+encoding.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+encoding.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+encoding.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+encoding.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+encoding.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+encoding.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+encoding.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+encoding.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+encoding.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+encoding.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+encoding.$(OBJEXT): {$(VPATH)}internal/iterator.h
+encoding.$(OBJEXT): {$(VPATH)}internal/memory.h
+encoding.$(OBJEXT): {$(VPATH)}internal/method.h
+encoding.$(OBJEXT): {$(VPATH)}internal/module.h
+encoding.$(OBJEXT): {$(VPATH)}internal/newobj.h
+encoding.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+encoding.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+encoding.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+encoding.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+encoding.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+encoding.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+encoding.$(OBJEXT): {$(VPATH)}internal/symbol.h
+encoding.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+encoding.$(OBJEXT): {$(VPATH)}internal/value.h
+encoding.$(OBJEXT): {$(VPATH)}internal/value_type.h
+encoding.$(OBJEXT): {$(VPATH)}internal/variable.h
+encoding.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+encoding.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 encoding.$(OBJEXT): {$(VPATH)}missing.h
+encoding.$(OBJEXT): {$(VPATH)}node.h
+encoding.$(OBJEXT): {$(VPATH)}onigmo.h
 encoding.$(OBJEXT): {$(VPATH)}oniguruma.h
 encoding.$(OBJEXT): {$(VPATH)}regenc.h
 encoding.$(OBJEXT): {$(VPATH)}ruby_assert.h
 encoding.$(OBJEXT): {$(VPATH)}st.h
 encoding.$(OBJEXT): {$(VPATH)}subst.h
 encoding.$(OBJEXT): {$(VPATH)}util.h
+encoding.$(OBJEXT): {$(VPATH)}vm_debug.h
+encoding.$(OBJEXT): {$(VPATH)}vm_sync.h
+enum.$(OBJEXT): $(hdrdir)/ruby.h
 enum.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-enum.$(OBJEXT): $(top_srcdir)/include/ruby.h
+enum.$(OBJEXT): $(top_srcdir)/internal/array.h
+enum.$(OBJEXT): $(top_srcdir)/internal/bignum.h
+enum.$(OBJEXT): $(top_srcdir)/internal/bits.h
+enum.$(OBJEXT): $(top_srcdir)/internal/class.h
+enum.$(OBJEXT): $(top_srcdir)/internal/compar.h
+enum.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+enum.$(OBJEXT): $(top_srcdir)/internal/enum.h
+enum.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
+enum.$(OBJEXT): $(top_srcdir)/internal/gc.h
+enum.$(OBJEXT): $(top_srcdir)/internal/hash.h
+enum.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+enum.$(OBJEXT): $(top_srcdir)/internal/numeric.h
+enum.$(OBJEXT): $(top_srcdir)/internal/object.h
+enum.$(OBJEXT): $(top_srcdir)/internal/proc.h
+enum.$(OBJEXT): $(top_srcdir)/internal/rational.h
+enum.$(OBJEXT): $(top_srcdir)/internal/re.h
+enum.$(OBJEXT): $(top_srcdir)/internal/serial.h
+enum.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+enum.$(OBJEXT): $(top_srcdir)/internal/vm.h
+enum.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+enum.$(OBJEXT): {$(VPATH)}assert.h
+enum.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+enum.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+enum.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+enum.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+enum.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+enum.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+enum.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+enum.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+enum.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 enum.$(OBJEXT): {$(VPATH)}config.h
 enum.$(OBJEXT): {$(VPATH)}defines.h
 enum.$(OBJEXT): {$(VPATH)}encoding.h
 enum.$(OBJEXT): {$(VPATH)}enum.c
 enum.$(OBJEXT): {$(VPATH)}id.h
+enum.$(OBJEXT): {$(VPATH)}id_table.h
 enum.$(OBJEXT): {$(VPATH)}intern.h
 enum.$(OBJEXT): {$(VPATH)}internal.h
-enum.$(OBJEXT): {$(VPATH)}io.h
+enum.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+enum.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+enum.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+enum.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+enum.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+enum.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+enum.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+enum.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+enum.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+enum.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+enum.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+enum.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+enum.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+enum.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+enum.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+enum.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+enum.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+enum.$(OBJEXT): {$(VPATH)}internal/assume.h
+enum.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+enum.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+enum.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+enum.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+enum.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+enum.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+enum.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+enum.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+enum.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+enum.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+enum.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+enum.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+enum.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+enum.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+enum.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+enum.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+enum.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+enum.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+enum.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+enum.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+enum.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+enum.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+enum.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+enum.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+enum.$(OBJEXT): {$(VPATH)}internal/cast.h
+enum.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+enum.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+enum.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+enum.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+enum.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+enum.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+enum.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+enum.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+enum.$(OBJEXT): {$(VPATH)}internal/config.h
+enum.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+enum.$(OBJEXT): {$(VPATH)}internal/core.h
+enum.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+enum.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+enum.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+enum.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+enum.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+enum.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+enum.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+enum.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+enum.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+enum.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+enum.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+enum.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+enum.$(OBJEXT): {$(VPATH)}internal/ctype.h
+enum.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+enum.$(OBJEXT): {$(VPATH)}internal/dosish.h
+enum.$(OBJEXT): {$(VPATH)}internal/error.h
+enum.$(OBJEXT): {$(VPATH)}internal/eval.h
+enum.$(OBJEXT): {$(VPATH)}internal/event.h
+enum.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+enum.$(OBJEXT): {$(VPATH)}internal/gc.h
+enum.$(OBJEXT): {$(VPATH)}internal/glob.h
+enum.$(OBJEXT): {$(VPATH)}internal/globals.h
+enum.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+enum.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+enum.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+enum.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+enum.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+enum.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+enum.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+enum.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+enum.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+enum.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+enum.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+enum.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+enum.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+enum.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+enum.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+enum.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+enum.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+enum.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+enum.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+enum.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+enum.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+enum.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+enum.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+enum.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+enum.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+enum.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+enum.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+enum.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+enum.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+enum.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+enum.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+enum.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+enum.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+enum.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+enum.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+enum.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+enum.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+enum.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+enum.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+enum.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+enum.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+enum.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+enum.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+enum.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+enum.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+enum.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+enum.$(OBJEXT): {$(VPATH)}internal/iterator.h
+enum.$(OBJEXT): {$(VPATH)}internal/memory.h
+enum.$(OBJEXT): {$(VPATH)}internal/method.h
+enum.$(OBJEXT): {$(VPATH)}internal/module.h
+enum.$(OBJEXT): {$(VPATH)}internal/newobj.h
+enum.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+enum.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+enum.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+enum.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+enum.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+enum.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+enum.$(OBJEXT): {$(VPATH)}internal/symbol.h
+enum.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+enum.$(OBJEXT): {$(VPATH)}internal/value.h
+enum.$(OBJEXT): {$(VPATH)}internal/value_type.h
+enum.$(OBJEXT): {$(VPATH)}internal/variable.h
+enum.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+enum.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 enum.$(OBJEXT): {$(VPATH)}missing.h
+enum.$(OBJEXT): {$(VPATH)}onigmo.h
 enum.$(OBJEXT): {$(VPATH)}oniguruma.h
+enum.$(OBJEXT): {$(VPATH)}ruby_assert.h
 enum.$(OBJEXT): {$(VPATH)}st.h
 enum.$(OBJEXT): {$(VPATH)}subst.h
+enum.$(OBJEXT): {$(VPATH)}symbol.h
 enum.$(OBJEXT): {$(VPATH)}util.h
+enumerator.$(OBJEXT): $(hdrdir)/ruby.h
 enumerator.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-enumerator.$(OBJEXT): $(top_srcdir)/include/ruby.h
+enumerator.$(OBJEXT): $(top_srcdir)/internal/array.h
+enumerator.$(OBJEXT): $(top_srcdir)/internal/bignum.h
+enumerator.$(OBJEXT): $(top_srcdir)/internal/bits.h
+enumerator.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+enumerator.$(OBJEXT): $(top_srcdir)/internal/enumerator.h
+enumerator.$(OBJEXT): $(top_srcdir)/internal/error.h
+enumerator.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
+enumerator.$(OBJEXT): $(top_srcdir)/internal/gc.h
+enumerator.$(OBJEXT): $(top_srcdir)/internal/hash.h
+enumerator.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+enumerator.$(OBJEXT): $(top_srcdir)/internal/numeric.h
+enumerator.$(OBJEXT): $(top_srcdir)/internal/range.h
+enumerator.$(OBJEXT): $(top_srcdir)/internal/rational.h
+enumerator.$(OBJEXT): $(top_srcdir)/internal/serial.h
+enumerator.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+enumerator.$(OBJEXT): $(top_srcdir)/internal/string.h
+enumerator.$(OBJEXT): $(top_srcdir)/internal/struct.h
+enumerator.$(OBJEXT): $(top_srcdir)/internal/vm.h
+enumerator.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+enumerator.$(OBJEXT): {$(VPATH)}assert.h
+enumerator.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+enumerator.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+enumerator.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+enumerator.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+enumerator.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+enumerator.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+enumerator.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+enumerator.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+enumerator.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 enumerator.$(OBJEXT): {$(VPATH)}config.h
 enumerator.$(OBJEXT): {$(VPATH)}defines.h
 enumerator.$(OBJEXT): {$(VPATH)}encoding.h
 enumerator.$(OBJEXT): {$(VPATH)}enumerator.c
+enumerator.$(OBJEXT): {$(VPATH)}id.h
 enumerator.$(OBJEXT): {$(VPATH)}intern.h
 enumerator.$(OBJEXT): {$(VPATH)}internal.h
-enumerator.$(OBJEXT): {$(VPATH)}io.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/assume.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/cast.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/config.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/core.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/ctype.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/dosish.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/error.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/eval.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/event.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/gc.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/glob.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/globals.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/iterator.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/memory.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/method.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/module.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/newobj.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/symbol.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/value.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/value_type.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/variable.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+enumerator.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 enumerator.$(OBJEXT): {$(VPATH)}missing.h
+enumerator.$(OBJEXT): {$(VPATH)}onigmo.h
 enumerator.$(OBJEXT): {$(VPATH)}oniguruma.h
+enumerator.$(OBJEXT): {$(VPATH)}ruby_assert.h
 enumerator.$(OBJEXT): {$(VPATH)}st.h
 enumerator.$(OBJEXT): {$(VPATH)}subst.h
 error.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 error.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 error.$(OBJEXT): $(CCAN_DIR)/list/list.h
 error.$(OBJEXT): $(CCAN_DIR)/str/str.h
+error.$(OBJEXT): $(hdrdir)/ruby.h
 error.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-error.$(OBJEXT): $(top_srcdir)/include/ruby.h
+error.$(OBJEXT): $(top_srcdir)/internal/array.h
+error.$(OBJEXT): $(top_srcdir)/internal/class.h
+error.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+error.$(OBJEXT): $(top_srcdir)/internal/error.h
+error.$(OBJEXT): $(top_srcdir)/internal/eval.h
+error.$(OBJEXT): $(top_srcdir)/internal/gc.h
+error.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+error.$(OBJEXT): $(top_srcdir)/internal/io.h
+error.$(OBJEXT): $(top_srcdir)/internal/load.h
+error.$(OBJEXT): $(top_srcdir)/internal/object.h
+error.$(OBJEXT): $(top_srcdir)/internal/serial.h
+error.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+error.$(OBJEXT): $(top_srcdir)/internal/string.h
+error.$(OBJEXT): $(top_srcdir)/internal/symbol.h
+error.$(OBJEXT): $(top_srcdir)/internal/thread.h
+error.$(OBJEXT): $(top_srcdir)/internal/variable.h
+error.$(OBJEXT): $(top_srcdir)/internal/vm.h
+error.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+error.$(OBJEXT): {$(VPATH)}assert.h
+error.$(OBJEXT): {$(VPATH)}atomic.h
+error.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+error.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+error.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+error.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+error.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+error.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+error.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+error.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+error.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
+error.$(OBJEXT): {$(VPATH)}builtin.h
 error.$(OBJEXT): {$(VPATH)}config.h
+error.$(OBJEXT): {$(VPATH)}constant.h
 error.$(OBJEXT): {$(VPATH)}defines.h
 error.$(OBJEXT): {$(VPATH)}encoding.h
 error.$(OBJEXT): {$(VPATH)}error.c
+error.$(OBJEXT): {$(VPATH)}eval_intern.h
 error.$(OBJEXT): {$(VPATH)}id.h
+error.$(OBJEXT): {$(VPATH)}id_table.h
 error.$(OBJEXT): {$(VPATH)}intern.h
 error.$(OBJEXT): {$(VPATH)}internal.h
+error.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+error.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+error.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+error.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+error.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+error.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+error.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+error.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+error.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+error.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+error.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+error.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+error.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+error.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+error.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+error.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+error.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+error.$(OBJEXT): {$(VPATH)}internal/assume.h
+error.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+error.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+error.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+error.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+error.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+error.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+error.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+error.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+error.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+error.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+error.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+error.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+error.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+error.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+error.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+error.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+error.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+error.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+error.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+error.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+error.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+error.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+error.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+error.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+error.$(OBJEXT): {$(VPATH)}internal/cast.h
+error.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+error.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+error.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+error.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+error.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+error.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+error.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+error.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+error.$(OBJEXT): {$(VPATH)}internal/config.h
+error.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+error.$(OBJEXT): {$(VPATH)}internal/core.h
+error.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+error.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+error.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+error.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+error.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+error.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+error.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+error.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+error.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+error.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+error.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+error.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+error.$(OBJEXT): {$(VPATH)}internal/ctype.h
+error.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+error.$(OBJEXT): {$(VPATH)}internal/dosish.h
+error.$(OBJEXT): {$(VPATH)}internal/error.h
+error.$(OBJEXT): {$(VPATH)}internal/eval.h
+error.$(OBJEXT): {$(VPATH)}internal/event.h
+error.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+error.$(OBJEXT): {$(VPATH)}internal/gc.h
+error.$(OBJEXT): {$(VPATH)}internal/glob.h
+error.$(OBJEXT): {$(VPATH)}internal/globals.h
+error.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+error.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+error.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+error.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+error.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+error.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+error.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+error.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+error.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+error.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+error.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+error.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+error.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+error.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+error.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+error.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+error.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+error.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+error.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+error.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+error.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+error.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+error.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+error.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+error.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+error.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+error.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+error.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+error.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+error.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+error.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+error.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+error.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+error.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+error.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+error.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+error.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+error.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+error.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+error.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+error.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+error.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+error.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+error.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+error.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+error.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+error.$(OBJEXT): {$(VPATH)}internal/iterator.h
+error.$(OBJEXT): {$(VPATH)}internal/memory.h
+error.$(OBJEXT): {$(VPATH)}internal/method.h
+error.$(OBJEXT): {$(VPATH)}internal/module.h
+error.$(OBJEXT): {$(VPATH)}internal/newobj.h
+error.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+error.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+error.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+error.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+error.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+error.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+error.$(OBJEXT): {$(VPATH)}internal/symbol.h
+error.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+error.$(OBJEXT): {$(VPATH)}internal/value.h
+error.$(OBJEXT): {$(VPATH)}internal/value_type.h
+error.$(OBJEXT): {$(VPATH)}internal/variable.h
+error.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+error.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 error.$(OBJEXT): {$(VPATH)}io.h
 error.$(OBJEXT): {$(VPATH)}known_errors.inc
 error.$(OBJEXT): {$(VPATH)}method.h
 error.$(OBJEXT): {$(VPATH)}missing.h
 error.$(OBJEXT): {$(VPATH)}node.h
+error.$(OBJEXT): {$(VPATH)}onigmo.h
 error.$(OBJEXT): {$(VPATH)}oniguruma.h
 error.$(OBJEXT): {$(VPATH)}ruby_assert.h
 error.$(OBJEXT): {$(VPATH)}ruby_atomic.h
@@ -1493,15 +5204,47 @@ error.$(OBJEXT): {$(VPATH)}subst.h
 error.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 error.$(OBJEXT): {$(VPATH)}thread_native.h
 error.$(OBJEXT): {$(VPATH)}vm_core.h
-error.$(OBJEXT): {$(VPATH)}vm_debug.h
 error.$(OBJEXT): {$(VPATH)}vm_opts.h
+error.$(OBJEXT): {$(VPATH)}warning.rbinc
 eval.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 eval.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 eval.$(OBJEXT): $(CCAN_DIR)/list/list.h
 eval.$(OBJEXT): $(CCAN_DIR)/str/str.h
+eval.$(OBJEXT): $(hdrdir)/ruby.h
 eval.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-eval.$(OBJEXT): $(top_srcdir)/include/ruby.h
+eval.$(OBJEXT): $(top_srcdir)/internal/array.h
+eval.$(OBJEXT): $(top_srcdir)/internal/class.h
+eval.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+eval.$(OBJEXT): $(top_srcdir)/internal/error.h
+eval.$(OBJEXT): $(top_srcdir)/internal/eval.h
+eval.$(OBJEXT): $(top_srcdir)/internal/gc.h
+eval.$(OBJEXT): $(top_srcdir)/internal/hash.h
+eval.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+eval.$(OBJEXT): $(top_srcdir)/internal/inits.h
+eval.$(OBJEXT): $(top_srcdir)/internal/io.h
+eval.$(OBJEXT): $(top_srcdir)/internal/object.h
+eval.$(OBJEXT): $(top_srcdir)/internal/scheduler.h
+eval.$(OBJEXT): $(top_srcdir)/internal/serial.h
+eval.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+eval.$(OBJEXT): $(top_srcdir)/internal/string.h
+eval.$(OBJEXT): $(top_srcdir)/internal/thread.h
+eval.$(OBJEXT): $(top_srcdir)/internal/variable.h
+eval.$(OBJEXT): $(top_srcdir)/internal/vm.h
+eval.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+eval.$(OBJEXT): {$(VPATH)}assert.h
+eval.$(OBJEXT): {$(VPATH)}atomic.h
+eval.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+eval.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+eval.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+eval.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+eval.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+eval.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+eval.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+eval.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+eval.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 eval.$(OBJEXT): {$(VPATH)}config.h
+eval.$(OBJEXT): {$(VPATH)}constant.h
+eval.$(OBJEXT): {$(VPATH)}debug_counter.h
 eval.$(OBJEXT): {$(VPATH)}defines.h
 eval.$(OBJEXT): {$(VPATH)}encoding.h
 eval.$(OBJEXT): {$(VPATH)}eval.c
@@ -1510,17 +5253,162 @@ eval.$(OBJEXT): {$(VPATH)}eval_intern.h
 eval.$(OBJEXT): {$(VPATH)}eval_jump.c
 eval.$(OBJEXT): {$(VPATH)}gc.h
 eval.$(OBJEXT): {$(VPATH)}id.h
+eval.$(OBJEXT): {$(VPATH)}id_table.h
 eval.$(OBJEXT): {$(VPATH)}intern.h
 eval.$(OBJEXT): {$(VPATH)}internal.h
+eval.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+eval.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+eval.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+eval.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+eval.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+eval.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+eval.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+eval.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+eval.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+eval.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+eval.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+eval.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+eval.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+eval.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+eval.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+eval.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+eval.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+eval.$(OBJEXT): {$(VPATH)}internal/assume.h
+eval.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+eval.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+eval.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+eval.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+eval.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+eval.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+eval.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+eval.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+eval.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+eval.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+eval.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+eval.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+eval.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+eval.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+eval.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+eval.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+eval.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+eval.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+eval.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+eval.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+eval.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+eval.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+eval.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+eval.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+eval.$(OBJEXT): {$(VPATH)}internal/cast.h
+eval.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+eval.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+eval.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+eval.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+eval.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+eval.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+eval.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+eval.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+eval.$(OBJEXT): {$(VPATH)}internal/config.h
+eval.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+eval.$(OBJEXT): {$(VPATH)}internal/core.h
+eval.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+eval.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+eval.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+eval.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+eval.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+eval.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+eval.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+eval.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+eval.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+eval.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+eval.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+eval.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+eval.$(OBJEXT): {$(VPATH)}internal/ctype.h
+eval.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+eval.$(OBJEXT): {$(VPATH)}internal/dosish.h
+eval.$(OBJEXT): {$(VPATH)}internal/error.h
+eval.$(OBJEXT): {$(VPATH)}internal/eval.h
+eval.$(OBJEXT): {$(VPATH)}internal/event.h
+eval.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+eval.$(OBJEXT): {$(VPATH)}internal/gc.h
+eval.$(OBJEXT): {$(VPATH)}internal/glob.h
+eval.$(OBJEXT): {$(VPATH)}internal/globals.h
+eval.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+eval.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+eval.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+eval.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+eval.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+eval.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+eval.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+eval.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+eval.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+eval.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+eval.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+eval.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+eval.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+eval.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+eval.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+eval.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+eval.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+eval.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+eval.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+eval.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+eval.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+eval.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+eval.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+eval.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+eval.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+eval.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+eval.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+eval.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+eval.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+eval.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+eval.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+eval.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+eval.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+eval.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+eval.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+eval.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+eval.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+eval.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+eval.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+eval.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+eval.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+eval.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+eval.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+eval.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+eval.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+eval.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+eval.$(OBJEXT): {$(VPATH)}internal/iterator.h
+eval.$(OBJEXT): {$(VPATH)}internal/memory.h
+eval.$(OBJEXT): {$(VPATH)}internal/method.h
+eval.$(OBJEXT): {$(VPATH)}internal/module.h
+eval.$(OBJEXT): {$(VPATH)}internal/newobj.h
+eval.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+eval.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+eval.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+eval.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+eval.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+eval.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+eval.$(OBJEXT): {$(VPATH)}internal/symbol.h
+eval.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+eval.$(OBJEXT): {$(VPATH)}internal/value.h
+eval.$(OBJEXT): {$(VPATH)}internal/value_type.h
+eval.$(OBJEXT): {$(VPATH)}internal/variable.h
+eval.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+eval.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 eval.$(OBJEXT): {$(VPATH)}io.h
 eval.$(OBJEXT): {$(VPATH)}iseq.h
 eval.$(OBJEXT): {$(VPATH)}method.h
 eval.$(OBJEXT): {$(VPATH)}missing.h
+eval.$(OBJEXT): {$(VPATH)}mjit.h
 eval.$(OBJEXT): {$(VPATH)}node.h
+eval.$(OBJEXT): {$(VPATH)}onigmo.h
 eval.$(OBJEXT): {$(VPATH)}oniguruma.h
 eval.$(OBJEXT): {$(VPATH)}probes.dmyh
 eval.$(OBJEXT): {$(VPATH)}probes.h
 eval.$(OBJEXT): {$(VPATH)}probes_helper.h
+eval.$(OBJEXT): {$(VPATH)}ractor.h
+eval.$(OBJEXT): {$(VPATH)}ractor_core.h
 eval.$(OBJEXT): {$(VPATH)}ruby_assert.h
 eval.$(OBJEXT): {$(VPATH)}ruby_atomic.h
 eval.$(OBJEXT): {$(VPATH)}st.h
@@ -1533,48 +5421,417 @@ eval.$(OBJEXT): {$(VPATH)}vm_debug.h
 eval.$(OBJEXT): {$(VPATH)}vm_opts.h
 explicit_bzero.$(OBJEXT): {$(VPATH)}config.h
 explicit_bzero.$(OBJEXT): {$(VPATH)}explicit_bzero.c
+explicit_bzero.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+explicit_bzero.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+explicit_bzero.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+explicit_bzero.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+explicit_bzero.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+explicit_bzero.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+explicit_bzero.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+explicit_bzero.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+explicit_bzero.$(OBJEXT): {$(VPATH)}internal/config.h
+explicit_bzero.$(OBJEXT): {$(VPATH)}internal/dllexport.h
 explicit_bzero.$(OBJEXT): {$(VPATH)}missing.h
+file.$(OBJEXT): $(hdrdir)/ruby.h
 file.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-file.$(OBJEXT): $(top_srcdir)/include/ruby.h
+file.$(OBJEXT): $(top_srcdir)/internal/array.h
+file.$(OBJEXT): $(top_srcdir)/internal/class.h
+file.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+file.$(OBJEXT): $(top_srcdir)/internal/dir.h
+file.$(OBJEXT): $(top_srcdir)/internal/error.h
+file.$(OBJEXT): $(top_srcdir)/internal/file.h
+file.$(OBJEXT): $(top_srcdir)/internal/gc.h
+file.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+file.$(OBJEXT): $(top_srcdir)/internal/io.h
+file.$(OBJEXT): $(top_srcdir)/internal/load.h
+file.$(OBJEXT): $(top_srcdir)/internal/object.h
+file.$(OBJEXT): $(top_srcdir)/internal/process.h
+file.$(OBJEXT): $(top_srcdir)/internal/serial.h
+file.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+file.$(OBJEXT): $(top_srcdir)/internal/string.h
+file.$(OBJEXT): $(top_srcdir)/internal/thread.h
+file.$(OBJEXT): $(top_srcdir)/internal/vm.h
+file.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+file.$(OBJEXT): {$(VPATH)}assert.h
+file.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+file.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+file.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+file.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+file.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+file.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+file.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+file.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+file.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 file.$(OBJEXT): {$(VPATH)}config.h
 file.$(OBJEXT): {$(VPATH)}defines.h
 file.$(OBJEXT): {$(VPATH)}dln.h
 file.$(OBJEXT): {$(VPATH)}encindex.h
 file.$(OBJEXT): {$(VPATH)}encoding.h
 file.$(OBJEXT): {$(VPATH)}file.c
+file.$(OBJEXT): {$(VPATH)}id.h
+file.$(OBJEXT): {$(VPATH)}id_table.h
 file.$(OBJEXT): {$(VPATH)}intern.h
 file.$(OBJEXT): {$(VPATH)}internal.h
+file.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+file.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+file.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+file.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+file.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+file.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+file.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+file.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+file.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+file.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+file.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+file.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+file.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+file.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+file.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+file.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+file.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+file.$(OBJEXT): {$(VPATH)}internal/assume.h
+file.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+file.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+file.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+file.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+file.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+file.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+file.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+file.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+file.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+file.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+file.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+file.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+file.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+file.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+file.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+file.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+file.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+file.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+file.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+file.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+file.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+file.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+file.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+file.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+file.$(OBJEXT): {$(VPATH)}internal/cast.h
+file.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+file.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+file.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+file.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+file.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+file.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+file.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+file.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+file.$(OBJEXT): {$(VPATH)}internal/config.h
+file.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+file.$(OBJEXT): {$(VPATH)}internal/core.h
+file.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+file.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+file.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+file.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+file.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+file.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+file.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+file.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+file.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+file.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+file.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+file.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+file.$(OBJEXT): {$(VPATH)}internal/ctype.h
+file.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+file.$(OBJEXT): {$(VPATH)}internal/dosish.h
+file.$(OBJEXT): {$(VPATH)}internal/error.h
+file.$(OBJEXT): {$(VPATH)}internal/eval.h
+file.$(OBJEXT): {$(VPATH)}internal/event.h
+file.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+file.$(OBJEXT): {$(VPATH)}internal/gc.h
+file.$(OBJEXT): {$(VPATH)}internal/glob.h
+file.$(OBJEXT): {$(VPATH)}internal/globals.h
+file.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+file.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+file.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+file.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+file.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+file.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+file.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+file.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+file.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+file.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+file.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+file.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+file.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+file.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+file.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+file.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+file.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+file.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+file.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+file.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+file.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+file.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+file.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+file.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+file.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+file.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+file.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+file.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+file.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+file.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+file.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+file.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+file.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+file.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+file.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+file.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+file.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+file.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+file.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+file.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+file.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+file.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+file.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+file.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+file.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+file.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+file.$(OBJEXT): {$(VPATH)}internal/iterator.h
+file.$(OBJEXT): {$(VPATH)}internal/memory.h
+file.$(OBJEXT): {$(VPATH)}internal/method.h
+file.$(OBJEXT): {$(VPATH)}internal/module.h
+file.$(OBJEXT): {$(VPATH)}internal/newobj.h
+file.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+file.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+file.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+file.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+file.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+file.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+file.$(OBJEXT): {$(VPATH)}internal/symbol.h
+file.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+file.$(OBJEXT): {$(VPATH)}internal/value.h
+file.$(OBJEXT): {$(VPATH)}internal/value_type.h
+file.$(OBJEXT): {$(VPATH)}internal/variable.h
+file.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+file.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 file.$(OBJEXT): {$(VPATH)}io.h
 file.$(OBJEXT): {$(VPATH)}missing.h
+file.$(OBJEXT): {$(VPATH)}onigmo.h
 file.$(OBJEXT): {$(VPATH)}oniguruma.h
 file.$(OBJEXT): {$(VPATH)}st.h
 file.$(OBJEXT): {$(VPATH)}subst.h
+file.$(OBJEXT): {$(VPATH)}thread.h
 file.$(OBJEXT): {$(VPATH)}util.h
 gc.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 gc.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 gc.$(OBJEXT): $(CCAN_DIR)/list/list.h
 gc.$(OBJEXT): $(CCAN_DIR)/str/str.h
+gc.$(OBJEXT): $(hdrdir)/ruby.h
 gc.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-gc.$(OBJEXT): $(top_srcdir)/include/ruby.h
+gc.$(OBJEXT): $(top_srcdir)/internal/array.h
+gc.$(OBJEXT): $(top_srcdir)/internal/bignum.h
+gc.$(OBJEXT): $(top_srcdir)/internal/bits.h
+gc.$(OBJEXT): $(top_srcdir)/internal/class.h
+gc.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+gc.$(OBJEXT): $(top_srcdir)/internal/complex.h
+gc.$(OBJEXT): $(top_srcdir)/internal/cont.h
+gc.$(OBJEXT): $(top_srcdir)/internal/error.h
+gc.$(OBJEXT): $(top_srcdir)/internal/eval.h
+gc.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
+gc.$(OBJEXT): $(top_srcdir)/internal/gc.h
+gc.$(OBJEXT): $(top_srcdir)/internal/hash.h
+gc.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+gc.$(OBJEXT): $(top_srcdir)/internal/io.h
+gc.$(OBJEXT): $(top_srcdir)/internal/numeric.h
+gc.$(OBJEXT): $(top_srcdir)/internal/object.h
+gc.$(OBJEXT): $(top_srcdir)/internal/proc.h
+gc.$(OBJEXT): $(top_srcdir)/internal/rational.h
+gc.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
+gc.$(OBJEXT): $(top_srcdir)/internal/serial.h
+gc.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+gc.$(OBJEXT): $(top_srcdir)/internal/string.h
+gc.$(OBJEXT): $(top_srcdir)/internal/struct.h
+gc.$(OBJEXT): $(top_srcdir)/internal/symbol.h
+gc.$(OBJEXT): $(top_srcdir)/internal/thread.h
+gc.$(OBJEXT): $(top_srcdir)/internal/variable.h
+gc.$(OBJEXT): $(top_srcdir)/internal/vm.h
+gc.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+gc.$(OBJEXT): {$(VPATH)}assert.h
+gc.$(OBJEXT): {$(VPATH)}atomic.h
+gc.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+gc.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+gc.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+gc.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+gc.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+gc.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+gc.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+gc.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+gc.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
+gc.$(OBJEXT): {$(VPATH)}builtin.h
 gc.$(OBJEXT): {$(VPATH)}config.h
 gc.$(OBJEXT): {$(VPATH)}constant.h
 gc.$(OBJEXT): {$(VPATH)}debug.h
+gc.$(OBJEXT): {$(VPATH)}debug_counter.h
 gc.$(OBJEXT): {$(VPATH)}defines.h
 gc.$(OBJEXT): {$(VPATH)}encoding.h
 gc.$(OBJEXT): {$(VPATH)}eval_intern.h
 gc.$(OBJEXT): {$(VPATH)}gc.c
 gc.$(OBJEXT): {$(VPATH)}gc.h
+gc.$(OBJEXT): {$(VPATH)}gc.rbinc
 gc.$(OBJEXT): {$(VPATH)}id.h
 gc.$(OBJEXT): {$(VPATH)}id_table.h
 gc.$(OBJEXT): {$(VPATH)}intern.h
 gc.$(OBJEXT): {$(VPATH)}internal.h
+gc.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+gc.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+gc.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+gc.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+gc.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+gc.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+gc.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+gc.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+gc.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+gc.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+gc.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+gc.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+gc.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+gc.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+gc.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+gc.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+gc.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+gc.$(OBJEXT): {$(VPATH)}internal/assume.h
+gc.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+gc.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+gc.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+gc.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+gc.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+gc.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+gc.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+gc.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+gc.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+gc.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+gc.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+gc.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+gc.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+gc.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+gc.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+gc.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+gc.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+gc.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+gc.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+gc.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+gc.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+gc.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+gc.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+gc.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+gc.$(OBJEXT): {$(VPATH)}internal/cast.h
+gc.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+gc.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+gc.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+gc.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+gc.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+gc.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+gc.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+gc.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+gc.$(OBJEXT): {$(VPATH)}internal/config.h
+gc.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+gc.$(OBJEXT): {$(VPATH)}internal/core.h
+gc.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+gc.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+gc.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+gc.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+gc.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+gc.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+gc.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+gc.$(OBJEXT): {$(VPATH)}internal/core/rmatch.h
+gc.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+gc.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+gc.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+gc.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+gc.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+gc.$(OBJEXT): {$(VPATH)}internal/ctype.h
+gc.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+gc.$(OBJEXT): {$(VPATH)}internal/dosish.h
+gc.$(OBJEXT): {$(VPATH)}internal/error.h
+gc.$(OBJEXT): {$(VPATH)}internal/eval.h
+gc.$(OBJEXT): {$(VPATH)}internal/event.h
+gc.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+gc.$(OBJEXT): {$(VPATH)}internal/gc.h
+gc.$(OBJEXT): {$(VPATH)}internal/glob.h
+gc.$(OBJEXT): {$(VPATH)}internal/globals.h
+gc.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+gc.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+gc.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+gc.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+gc.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+gc.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+gc.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+gc.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+gc.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+gc.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+gc.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+gc.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+gc.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+gc.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+gc.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+gc.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+gc.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+gc.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+gc.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+gc.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+gc.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+gc.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+gc.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+gc.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+gc.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+gc.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+gc.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+gc.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+gc.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+gc.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+gc.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+gc.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+gc.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+gc.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+gc.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+gc.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+gc.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+gc.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+gc.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+gc.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+gc.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+gc.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+gc.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+gc.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+gc.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+gc.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+gc.$(OBJEXT): {$(VPATH)}internal/iterator.h
+gc.$(OBJEXT): {$(VPATH)}internal/memory.h
+gc.$(OBJEXT): {$(VPATH)}internal/method.h
+gc.$(OBJEXT): {$(VPATH)}internal/module.h
+gc.$(OBJEXT): {$(VPATH)}internal/newobj.h
+gc.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+gc.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+gc.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+gc.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+gc.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+gc.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+gc.$(OBJEXT): {$(VPATH)}internal/symbol.h
+gc.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+gc.$(OBJEXT): {$(VPATH)}internal/value.h
+gc.$(OBJEXT): {$(VPATH)}internal/value_type.h
+gc.$(OBJEXT): {$(VPATH)}internal/variable.h
+gc.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+gc.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 gc.$(OBJEXT): {$(VPATH)}io.h
 gc.$(OBJEXT): {$(VPATH)}method.h
 gc.$(OBJEXT): {$(VPATH)}missing.h
+gc.$(OBJEXT): {$(VPATH)}mjit.h
 gc.$(OBJEXT): {$(VPATH)}node.h
+gc.$(OBJEXT): {$(VPATH)}onigmo.h
 gc.$(OBJEXT): {$(VPATH)}oniguruma.h
 gc.$(OBJEXT): {$(VPATH)}probes.dmyh
 gc.$(OBJEXT): {$(VPATH)}probes.h
+gc.$(OBJEXT): {$(VPATH)}ractor.h
+gc.$(OBJEXT): {$(VPATH)}ractor_core.h
 gc.$(OBJEXT): {$(VPATH)}re.h
 gc.$(OBJEXT): {$(VPATH)}regenc.h
 gc.$(OBJEXT): {$(VPATH)}regex.h
@@ -1583,32 +5840,193 @@ gc.$(OBJEXT): {$(VPATH)}ruby_assert.h
 gc.$(OBJEXT): {$(VPATH)}ruby_atomic.h
 gc.$(OBJEXT): {$(VPATH)}st.h
 gc.$(OBJEXT): {$(VPATH)}subst.h
+gc.$(OBJEXT): {$(VPATH)}symbol.h
 gc.$(OBJEXT): {$(VPATH)}thread.h
 gc.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 gc.$(OBJEXT): {$(VPATH)}thread_native.h
+gc.$(OBJEXT): {$(VPATH)}transient_heap.h
 gc.$(OBJEXT): {$(VPATH)}util.h
+gc.$(OBJEXT): {$(VPATH)}vm_callinfo.h
 gc.$(OBJEXT): {$(VPATH)}vm_core.h
 gc.$(OBJEXT): {$(VPATH)}vm_debug.h
 gc.$(OBJEXT): {$(VPATH)}vm_opts.h
+gc.$(OBJEXT): {$(VPATH)}vm_sync.h
 golf_prelude.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 golf_prelude.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 golf_prelude.$(OBJEXT): $(CCAN_DIR)/list/list.h
 golf_prelude.$(OBJEXT): $(CCAN_DIR)/str/str.h
+golf_prelude.$(OBJEXT): $(hdrdir)/ruby.h
 golf_prelude.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-golf_prelude.$(OBJEXT): $(top_srcdir)/include/ruby.h
+golf_prelude.$(OBJEXT): $(top_srcdir)/internal/array.h
+golf_prelude.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+golf_prelude.$(OBJEXT): $(top_srcdir)/internal/gc.h
+golf_prelude.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+golf_prelude.$(OBJEXT): $(top_srcdir)/internal/serial.h
+golf_prelude.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+golf_prelude.$(OBJEXT): $(top_srcdir)/internal/vm.h
+golf_prelude.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+golf_prelude.$(OBJEXT): {$(VPATH)}assert.h
+golf_prelude.$(OBJEXT): {$(VPATH)}atomic.h
+golf_prelude.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+golf_prelude.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+golf_prelude.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+golf_prelude.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+golf_prelude.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+golf_prelude.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+golf_prelude.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+golf_prelude.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+golf_prelude.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 golf_prelude.$(OBJEXT): {$(VPATH)}config.h
 golf_prelude.$(OBJEXT): {$(VPATH)}defines.h
-golf_prelude.$(OBJEXT): {$(VPATH)}encoding.h
 golf_prelude.$(OBJEXT): {$(VPATH)}golf_prelude.c
+golf_prelude.$(OBJEXT): {$(VPATH)}golf_prelude.rb
 golf_prelude.$(OBJEXT): {$(VPATH)}id.h
 golf_prelude.$(OBJEXT): {$(VPATH)}intern.h
 golf_prelude.$(OBJEXT): {$(VPATH)}internal.h
-golf_prelude.$(OBJEXT): {$(VPATH)}io.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/assume.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/cast.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/config.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/core.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/ctype.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/dosish.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/error.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/eval.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/event.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/gc.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/glob.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/globals.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/iterator.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/memory.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/method.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/module.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/newobj.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/symbol.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/value.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/value_type.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/variable.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 golf_prelude.$(OBJEXT): {$(VPATH)}iseq.h
 golf_prelude.$(OBJEXT): {$(VPATH)}method.h
 golf_prelude.$(OBJEXT): {$(VPATH)}missing.h
 golf_prelude.$(OBJEXT): {$(VPATH)}node.h
-golf_prelude.$(OBJEXT): {$(VPATH)}oniguruma.h
 golf_prelude.$(OBJEXT): {$(VPATH)}ruby_assert.h
 golf_prelude.$(OBJEXT): {$(VPATH)}ruby_atomic.h
 golf_prelude.$(OBJEXT): {$(VPATH)}st.h
@@ -1616,96 +6034,936 @@ golf_prelude.$(OBJEXT): {$(VPATH)}subst.h
 golf_prelude.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 golf_prelude.$(OBJEXT): {$(VPATH)}thread_native.h
 golf_prelude.$(OBJEXT): {$(VPATH)}vm_core.h
-golf_prelude.$(OBJEXT): {$(VPATH)}vm_debug.h
 golf_prelude.$(OBJEXT): {$(VPATH)}vm_opts.h
+goruby.$(OBJEXT): $(hdrdir)/ruby.h
 goruby.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-goruby.$(OBJEXT): $(top_srcdir)/include/ruby.h
+goruby.$(OBJEXT): {$(VPATH)}assert.h
 goruby.$(OBJEXT): {$(VPATH)}backward.h
+goruby.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+goruby.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+goruby.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+goruby.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+goruby.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+goruby.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+goruby.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+goruby.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+goruby.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 goruby.$(OBJEXT): {$(VPATH)}config.h
 goruby.$(OBJEXT): {$(VPATH)}defines.h
 goruby.$(OBJEXT): {$(VPATH)}goruby.c
 goruby.$(OBJEXT): {$(VPATH)}intern.h
+goruby.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+goruby.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+goruby.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+goruby.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+goruby.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+goruby.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+goruby.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+goruby.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+goruby.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+goruby.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+goruby.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+goruby.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+goruby.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+goruby.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+goruby.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+goruby.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+goruby.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+goruby.$(OBJEXT): {$(VPATH)}internal/assume.h
+goruby.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+goruby.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+goruby.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+goruby.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+goruby.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+goruby.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+goruby.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+goruby.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+goruby.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+goruby.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+goruby.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+goruby.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+goruby.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+goruby.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+goruby.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+goruby.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+goruby.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+goruby.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+goruby.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+goruby.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+goruby.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+goruby.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+goruby.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+goruby.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+goruby.$(OBJEXT): {$(VPATH)}internal/cast.h
+goruby.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+goruby.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+goruby.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+goruby.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+goruby.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+goruby.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+goruby.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+goruby.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+goruby.$(OBJEXT): {$(VPATH)}internal/config.h
+goruby.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+goruby.$(OBJEXT): {$(VPATH)}internal/core.h
+goruby.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+goruby.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+goruby.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+goruby.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+goruby.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+goruby.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+goruby.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+goruby.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+goruby.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+goruby.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+goruby.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+goruby.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+goruby.$(OBJEXT): {$(VPATH)}internal/ctype.h
+goruby.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+goruby.$(OBJEXT): {$(VPATH)}internal/dosish.h
+goruby.$(OBJEXT): {$(VPATH)}internal/error.h
+goruby.$(OBJEXT): {$(VPATH)}internal/eval.h
+goruby.$(OBJEXT): {$(VPATH)}internal/event.h
+goruby.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+goruby.$(OBJEXT): {$(VPATH)}internal/gc.h
+goruby.$(OBJEXT): {$(VPATH)}internal/glob.h
+goruby.$(OBJEXT): {$(VPATH)}internal/globals.h
+goruby.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+goruby.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+goruby.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+goruby.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+goruby.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+goruby.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+goruby.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+goruby.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+goruby.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+goruby.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+goruby.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+goruby.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+goruby.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+goruby.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+goruby.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+goruby.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+goruby.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+goruby.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+goruby.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+goruby.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+goruby.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+goruby.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+goruby.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+goruby.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+goruby.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+goruby.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+goruby.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+goruby.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+goruby.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+goruby.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+goruby.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+goruby.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+goruby.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+goruby.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+goruby.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+goruby.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+goruby.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+goruby.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+goruby.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+goruby.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+goruby.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+goruby.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+goruby.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+goruby.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+goruby.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+goruby.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+goruby.$(OBJEXT): {$(VPATH)}internal/iterator.h
+goruby.$(OBJEXT): {$(VPATH)}internal/memory.h
+goruby.$(OBJEXT): {$(VPATH)}internal/method.h
+goruby.$(OBJEXT): {$(VPATH)}internal/module.h
+goruby.$(OBJEXT): {$(VPATH)}internal/newobj.h
+goruby.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+goruby.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+goruby.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+goruby.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+goruby.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+goruby.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+goruby.$(OBJEXT): {$(VPATH)}internal/symbol.h
+goruby.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+goruby.$(OBJEXT): {$(VPATH)}internal/value.h
+goruby.$(OBJEXT): {$(VPATH)}internal/value_type.h
+goruby.$(OBJEXT): {$(VPATH)}internal/variable.h
+goruby.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+goruby.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 goruby.$(OBJEXT): {$(VPATH)}main.c
 goruby.$(OBJEXT): {$(VPATH)}missing.h
 goruby.$(OBJEXT): {$(VPATH)}node.h
 goruby.$(OBJEXT): {$(VPATH)}st.h
 goruby.$(OBJEXT): {$(VPATH)}subst.h
 goruby.$(OBJEXT): {$(VPATH)}vm_debug.h
+hash.$(OBJEXT): $(hdrdir)/ruby.h
 hash.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-hash.$(OBJEXT): $(top_srcdir)/include/ruby.h
+hash.$(OBJEXT): $(top_srcdir)/internal/array.h
+hash.$(OBJEXT): $(top_srcdir)/internal/bignum.h
+hash.$(OBJEXT): $(top_srcdir)/internal/bits.h
+hash.$(OBJEXT): $(top_srcdir)/internal/class.h
+hash.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+hash.$(OBJEXT): $(top_srcdir)/internal/cont.h
+hash.$(OBJEXT): $(top_srcdir)/internal/error.h
+hash.$(OBJEXT): $(top_srcdir)/internal/gc.h
+hash.$(OBJEXT): $(top_srcdir)/internal/hash.h
+hash.$(OBJEXT): $(top_srcdir)/internal/object.h
+hash.$(OBJEXT): $(top_srcdir)/internal/proc.h
+hash.$(OBJEXT): $(top_srcdir)/internal/serial.h
+hash.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+hash.$(OBJEXT): $(top_srcdir)/internal/string.h
+hash.$(OBJEXT): $(top_srcdir)/internal/symbol.h
+hash.$(OBJEXT): $(top_srcdir)/internal/time.h
+hash.$(OBJEXT): $(top_srcdir)/internal/vm.h
+hash.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+hash.$(OBJEXT): {$(VPATH)}assert.h
+hash.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+hash.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+hash.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+hash.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+hash.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+hash.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+hash.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+hash.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+hash.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 hash.$(OBJEXT): {$(VPATH)}config.h
+hash.$(OBJEXT): {$(VPATH)}debug_counter.h
 hash.$(OBJEXT): {$(VPATH)}defines.h
 hash.$(OBJEXT): {$(VPATH)}encoding.h
 hash.$(OBJEXT): {$(VPATH)}hash.c
 hash.$(OBJEXT): {$(VPATH)}id.h
+hash.$(OBJEXT): {$(VPATH)}id_table.h
 hash.$(OBJEXT): {$(VPATH)}intern.h
 hash.$(OBJEXT): {$(VPATH)}internal.h
-hash.$(OBJEXT): {$(VPATH)}io.h
+hash.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+hash.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+hash.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+hash.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+hash.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+hash.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+hash.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+hash.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+hash.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+hash.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+hash.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+hash.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+hash.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+hash.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+hash.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+hash.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+hash.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+hash.$(OBJEXT): {$(VPATH)}internal/assume.h
+hash.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+hash.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+hash.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+hash.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+hash.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+hash.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+hash.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+hash.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+hash.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+hash.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+hash.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+hash.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+hash.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+hash.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+hash.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+hash.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+hash.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+hash.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+hash.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+hash.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+hash.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+hash.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+hash.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+hash.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+hash.$(OBJEXT): {$(VPATH)}internal/cast.h
+hash.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+hash.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+hash.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+hash.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+hash.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+hash.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+hash.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+hash.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+hash.$(OBJEXT): {$(VPATH)}internal/config.h
+hash.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+hash.$(OBJEXT): {$(VPATH)}internal/core.h
+hash.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+hash.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+hash.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+hash.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+hash.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+hash.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+hash.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+hash.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+hash.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+hash.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+hash.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+hash.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+hash.$(OBJEXT): {$(VPATH)}internal/ctype.h
+hash.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+hash.$(OBJEXT): {$(VPATH)}internal/dosish.h
+hash.$(OBJEXT): {$(VPATH)}internal/error.h
+hash.$(OBJEXT): {$(VPATH)}internal/eval.h
+hash.$(OBJEXT): {$(VPATH)}internal/event.h
+hash.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+hash.$(OBJEXT): {$(VPATH)}internal/gc.h
+hash.$(OBJEXT): {$(VPATH)}internal/glob.h
+hash.$(OBJEXT): {$(VPATH)}internal/globals.h
+hash.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+hash.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+hash.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+hash.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+hash.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+hash.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+hash.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+hash.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+hash.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+hash.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+hash.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+hash.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+hash.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+hash.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+hash.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+hash.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+hash.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+hash.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+hash.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+hash.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+hash.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+hash.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+hash.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+hash.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+hash.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+hash.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+hash.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+hash.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+hash.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+hash.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+hash.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+hash.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+hash.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+hash.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+hash.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+hash.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+hash.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+hash.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+hash.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+hash.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+hash.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+hash.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+hash.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+hash.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+hash.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+hash.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+hash.$(OBJEXT): {$(VPATH)}internal/iterator.h
+hash.$(OBJEXT): {$(VPATH)}internal/memory.h
+hash.$(OBJEXT): {$(VPATH)}internal/method.h
+hash.$(OBJEXT): {$(VPATH)}internal/module.h
+hash.$(OBJEXT): {$(VPATH)}internal/newobj.h
+hash.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+hash.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+hash.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+hash.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+hash.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+hash.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+hash.$(OBJEXT): {$(VPATH)}internal/symbol.h
+hash.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+hash.$(OBJEXT): {$(VPATH)}internal/value.h
+hash.$(OBJEXT): {$(VPATH)}internal/value_type.h
+hash.$(OBJEXT): {$(VPATH)}internal/variable.h
+hash.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+hash.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 hash.$(OBJEXT): {$(VPATH)}missing.h
+hash.$(OBJEXT): {$(VPATH)}onigmo.h
 hash.$(OBJEXT): {$(VPATH)}oniguruma.h
 hash.$(OBJEXT): {$(VPATH)}probes.dmyh
 hash.$(OBJEXT): {$(VPATH)}probes.h
+hash.$(OBJEXT): {$(VPATH)}ruby_assert.h
 hash.$(OBJEXT): {$(VPATH)}st.h
 hash.$(OBJEXT): {$(VPATH)}subst.h
 hash.$(OBJEXT): {$(VPATH)}symbol.h
+hash.$(OBJEXT): {$(VPATH)}transient_heap.h
 hash.$(OBJEXT): {$(VPATH)}util.h
-hash.$(OBJEXT): {$(VPATH)}vm_opts.h
+inits.$(OBJEXT): $(hdrdir)/ruby.h
 inits.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-inits.$(OBJEXT): $(top_srcdir)/include/ruby.h
+inits.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+inits.$(OBJEXT): $(top_srcdir)/internal/inits.h
+inits.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+inits.$(OBJEXT): {$(VPATH)}assert.h
+inits.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+inits.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+inits.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+inits.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+inits.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+inits.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+inits.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+inits.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+inits.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
+inits.$(OBJEXT): {$(VPATH)}builtin.h
 inits.$(OBJEXT): {$(VPATH)}config.h
 inits.$(OBJEXT): {$(VPATH)}defines.h
-inits.$(OBJEXT): {$(VPATH)}encoding.h
 inits.$(OBJEXT): {$(VPATH)}inits.c
 inits.$(OBJEXT): {$(VPATH)}intern.h
 inits.$(OBJEXT): {$(VPATH)}internal.h
-inits.$(OBJEXT): {$(VPATH)}io.h
+inits.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+inits.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+inits.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+inits.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+inits.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+inits.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+inits.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+inits.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+inits.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+inits.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+inits.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+inits.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+inits.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+inits.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+inits.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+inits.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+inits.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+inits.$(OBJEXT): {$(VPATH)}internal/assume.h
+inits.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+inits.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+inits.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+inits.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+inits.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+inits.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+inits.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+inits.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+inits.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+inits.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+inits.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+inits.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+inits.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+inits.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+inits.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+inits.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+inits.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+inits.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+inits.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+inits.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+inits.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+inits.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+inits.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+inits.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+inits.$(OBJEXT): {$(VPATH)}internal/cast.h
+inits.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+inits.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+inits.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+inits.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+inits.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+inits.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+inits.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+inits.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+inits.$(OBJEXT): {$(VPATH)}internal/config.h
+inits.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+inits.$(OBJEXT): {$(VPATH)}internal/core.h
+inits.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+inits.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+inits.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+inits.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+inits.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+inits.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+inits.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+inits.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+inits.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+inits.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+inits.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+inits.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+inits.$(OBJEXT): {$(VPATH)}internal/ctype.h
+inits.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+inits.$(OBJEXT): {$(VPATH)}internal/dosish.h
+inits.$(OBJEXT): {$(VPATH)}internal/error.h
+inits.$(OBJEXT): {$(VPATH)}internal/eval.h
+inits.$(OBJEXT): {$(VPATH)}internal/event.h
+inits.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+inits.$(OBJEXT): {$(VPATH)}internal/gc.h
+inits.$(OBJEXT): {$(VPATH)}internal/glob.h
+inits.$(OBJEXT): {$(VPATH)}internal/globals.h
+inits.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+inits.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+inits.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+inits.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+inits.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+inits.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+inits.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+inits.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+inits.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+inits.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+inits.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+inits.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+inits.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+inits.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+inits.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+inits.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+inits.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+inits.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+inits.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+inits.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+inits.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+inits.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+inits.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+inits.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+inits.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+inits.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+inits.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+inits.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+inits.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+inits.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+inits.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+inits.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+inits.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+inits.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+inits.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+inits.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+inits.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+inits.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+inits.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+inits.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+inits.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+inits.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+inits.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+inits.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+inits.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+inits.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+inits.$(OBJEXT): {$(VPATH)}internal/iterator.h
+inits.$(OBJEXT): {$(VPATH)}internal/memory.h
+inits.$(OBJEXT): {$(VPATH)}internal/method.h
+inits.$(OBJEXT): {$(VPATH)}internal/module.h
+inits.$(OBJEXT): {$(VPATH)}internal/newobj.h
+inits.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+inits.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+inits.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+inits.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+inits.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+inits.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+inits.$(OBJEXT): {$(VPATH)}internal/symbol.h
+inits.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+inits.$(OBJEXT): {$(VPATH)}internal/value.h
+inits.$(OBJEXT): {$(VPATH)}internal/value_type.h
+inits.$(OBJEXT): {$(VPATH)}internal/variable.h
+inits.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+inits.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 inits.$(OBJEXT): {$(VPATH)}missing.h
-inits.$(OBJEXT): {$(VPATH)}oniguruma.h
+inits.$(OBJEXT): {$(VPATH)}prelude.rbinc
 inits.$(OBJEXT): {$(VPATH)}st.h
 inits.$(OBJEXT): {$(VPATH)}subst.h
+io.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+io.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+io.$(OBJEXT): $(CCAN_DIR)/list/list.h
+io.$(OBJEXT): $(CCAN_DIR)/str/str.h
+io.$(OBJEXT): $(hdrdir)/ruby.h
 io.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-io.$(OBJEXT): $(top_srcdir)/include/ruby.h
+io.$(OBJEXT): $(top_srcdir)/internal/array.h
+io.$(OBJEXT): $(top_srcdir)/internal/bignum.h
+io.$(OBJEXT): $(top_srcdir)/internal/bits.h
+io.$(OBJEXT): $(top_srcdir)/internal/class.h
+io.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+io.$(OBJEXT): $(top_srcdir)/internal/encoding.h
+io.$(OBJEXT): $(top_srcdir)/internal/error.h
+io.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
+io.$(OBJEXT): $(top_srcdir)/internal/gc.h
+io.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+io.$(OBJEXT): $(top_srcdir)/internal/inits.h
+io.$(OBJEXT): $(top_srcdir)/internal/io.h
+io.$(OBJEXT): $(top_srcdir)/internal/numeric.h
+io.$(OBJEXT): $(top_srcdir)/internal/object.h
+io.$(OBJEXT): $(top_srcdir)/internal/process.h
+io.$(OBJEXT): $(top_srcdir)/internal/scheduler.h
+io.$(OBJEXT): $(top_srcdir)/internal/serial.h
+io.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+io.$(OBJEXT): $(top_srcdir)/internal/string.h
+io.$(OBJEXT): $(top_srcdir)/internal/thread.h
+io.$(OBJEXT): $(top_srcdir)/internal/transcode.h
+io.$(OBJEXT): $(top_srcdir)/internal/variable.h
+io.$(OBJEXT): $(top_srcdir)/internal/vm.h
+io.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+io.$(OBJEXT): {$(VPATH)}assert.h
+io.$(OBJEXT): {$(VPATH)}atomic.h
+io.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+io.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+io.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+io.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+io.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+io.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+io.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+io.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+io.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
+io.$(OBJEXT): {$(VPATH)}builtin.h
 io.$(OBJEXT): {$(VPATH)}config.h
+io.$(OBJEXT): {$(VPATH)}constant.h
 io.$(OBJEXT): {$(VPATH)}defines.h
 io.$(OBJEXT): {$(VPATH)}dln.h
 io.$(OBJEXT): {$(VPATH)}encindex.h
 io.$(OBJEXT): {$(VPATH)}encoding.h
 io.$(OBJEXT): {$(VPATH)}id.h
+io.$(OBJEXT): {$(VPATH)}id_table.h
 io.$(OBJEXT): {$(VPATH)}intern.h
 io.$(OBJEXT): {$(VPATH)}internal.h
+io.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+io.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+io.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+io.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+io.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+io.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+io.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+io.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+io.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+io.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+io.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+io.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+io.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+io.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+io.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+io.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+io.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+io.$(OBJEXT): {$(VPATH)}internal/assume.h
+io.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+io.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+io.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+io.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+io.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+io.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+io.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+io.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+io.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+io.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+io.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+io.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+io.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+io.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+io.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+io.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+io.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+io.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+io.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+io.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+io.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+io.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+io.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+io.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+io.$(OBJEXT): {$(VPATH)}internal/cast.h
+io.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+io.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+io.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+io.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+io.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+io.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+io.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+io.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+io.$(OBJEXT): {$(VPATH)}internal/config.h
+io.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+io.$(OBJEXT): {$(VPATH)}internal/core.h
+io.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+io.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+io.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+io.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+io.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+io.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+io.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+io.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+io.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+io.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+io.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+io.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+io.$(OBJEXT): {$(VPATH)}internal/ctype.h
+io.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+io.$(OBJEXT): {$(VPATH)}internal/dosish.h
+io.$(OBJEXT): {$(VPATH)}internal/error.h
+io.$(OBJEXT): {$(VPATH)}internal/eval.h
+io.$(OBJEXT): {$(VPATH)}internal/event.h
+io.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+io.$(OBJEXT): {$(VPATH)}internal/gc.h
+io.$(OBJEXT): {$(VPATH)}internal/glob.h
+io.$(OBJEXT): {$(VPATH)}internal/globals.h
+io.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+io.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+io.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+io.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+io.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+io.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+io.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+io.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+io.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+io.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+io.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+io.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+io.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+io.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+io.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+io.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+io.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+io.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+io.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+io.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+io.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+io.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+io.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+io.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+io.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+io.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+io.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+io.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+io.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+io.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+io.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+io.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+io.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+io.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+io.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+io.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+io.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+io.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+io.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+io.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+io.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+io.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+io.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+io.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+io.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+io.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+io.$(OBJEXT): {$(VPATH)}internal/iterator.h
+io.$(OBJEXT): {$(VPATH)}internal/memory.h
+io.$(OBJEXT): {$(VPATH)}internal/method.h
+io.$(OBJEXT): {$(VPATH)}internal/module.h
+io.$(OBJEXT): {$(VPATH)}internal/newobj.h
+io.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+io.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+io.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+io.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+io.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+io.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+io.$(OBJEXT): {$(VPATH)}internal/symbol.h
+io.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+io.$(OBJEXT): {$(VPATH)}internal/value.h
+io.$(OBJEXT): {$(VPATH)}internal/value_type.h
+io.$(OBJEXT): {$(VPATH)}internal/variable.h
+io.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+io.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 io.$(OBJEXT): {$(VPATH)}io.c
 io.$(OBJEXT): {$(VPATH)}io.h
+io.$(OBJEXT): {$(VPATH)}io.rbinc
+io.$(OBJEXT): {$(VPATH)}method.h
 io.$(OBJEXT): {$(VPATH)}missing.h
+io.$(OBJEXT): {$(VPATH)}node.h
+io.$(OBJEXT): {$(VPATH)}onigmo.h
 io.$(OBJEXT): {$(VPATH)}oniguruma.h
+io.$(OBJEXT): {$(VPATH)}ractor.h
+io.$(OBJEXT): {$(VPATH)}ruby_assert.h
 io.$(OBJEXT): {$(VPATH)}ruby_atomic.h
 io.$(OBJEXT): {$(VPATH)}st.h
 io.$(OBJEXT): {$(VPATH)}subst.h
 io.$(OBJEXT): {$(VPATH)}thread.h
+io.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+io.$(OBJEXT): {$(VPATH)}thread_native.h
 io.$(OBJEXT): {$(VPATH)}util.h
+io.$(OBJEXT): {$(VPATH)}vm_core.h
+io.$(OBJEXT): {$(VPATH)}vm_opts.h
 iseq.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 iseq.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 iseq.$(OBJEXT): $(CCAN_DIR)/list/list.h
 iseq.$(OBJEXT): $(CCAN_DIR)/str/str.h
+iseq.$(OBJEXT): $(hdrdir)/ruby.h
 iseq.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-iseq.$(OBJEXT): $(top_srcdir)/include/ruby.h
+iseq.$(OBJEXT): $(top_srcdir)/internal/array.h
+iseq.$(OBJEXT): $(top_srcdir)/internal/bits.h
+iseq.$(OBJEXT): $(top_srcdir)/internal/class.h
+iseq.$(OBJEXT): $(top_srcdir)/internal/compile.h
+iseq.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+iseq.$(OBJEXT): $(top_srcdir)/internal/error.h
+iseq.$(OBJEXT): $(top_srcdir)/internal/file.h
+iseq.$(OBJEXT): $(top_srcdir)/internal/gc.h
+iseq.$(OBJEXT): $(top_srcdir)/internal/hash.h
+iseq.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+iseq.$(OBJEXT): $(top_srcdir)/internal/parse.h
+iseq.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
+iseq.$(OBJEXT): $(top_srcdir)/internal/serial.h
+iseq.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+iseq.$(OBJEXT): $(top_srcdir)/internal/string.h
+iseq.$(OBJEXT): $(top_srcdir)/internal/symbol.h
+iseq.$(OBJEXT): $(top_srcdir)/internal/thread.h
+iseq.$(OBJEXT): $(top_srcdir)/internal/variable.h
+iseq.$(OBJEXT): $(top_srcdir)/internal/vm.h
+iseq.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+iseq.$(OBJEXT): {$(VPATH)}assert.h
+iseq.$(OBJEXT): {$(VPATH)}atomic.h
+iseq.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+iseq.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+iseq.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+iseq.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+iseq.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+iseq.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+iseq.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+iseq.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+iseq.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
+iseq.$(OBJEXT): {$(VPATH)}builtin.h
 iseq.$(OBJEXT): {$(VPATH)}config.h
+iseq.$(OBJEXT): {$(VPATH)}constant.h
+iseq.$(OBJEXT): {$(VPATH)}debug_counter.h
 iseq.$(OBJEXT): {$(VPATH)}defines.h
 iseq.$(OBJEXT): {$(VPATH)}encoding.h
 iseq.$(OBJEXT): {$(VPATH)}eval_intern.h
 iseq.$(OBJEXT): {$(VPATH)}gc.h
 iseq.$(OBJEXT): {$(VPATH)}id.h
 iseq.$(OBJEXT): {$(VPATH)}id_table.h
+iseq.$(OBJEXT): {$(VPATH)}insns.def
 iseq.$(OBJEXT): {$(VPATH)}insns.inc
 iseq.$(OBJEXT): {$(VPATH)}insns_info.inc
 iseq.$(OBJEXT): {$(VPATH)}intern.h
 iseq.$(OBJEXT): {$(VPATH)}internal.h
-iseq.$(OBJEXT): {$(VPATH)}io.h
+iseq.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+iseq.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+iseq.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+iseq.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+iseq.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+iseq.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+iseq.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+iseq.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+iseq.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+iseq.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+iseq.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+iseq.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+iseq.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+iseq.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+iseq.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+iseq.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+iseq.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+iseq.$(OBJEXT): {$(VPATH)}internal/assume.h
+iseq.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+iseq.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+iseq.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+iseq.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+iseq.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+iseq.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+iseq.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+iseq.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+iseq.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+iseq.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+iseq.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+iseq.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+iseq.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+iseq.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+iseq.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+iseq.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+iseq.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+iseq.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+iseq.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+iseq.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+iseq.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+iseq.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+iseq.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+iseq.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+iseq.$(OBJEXT): {$(VPATH)}internal/cast.h
+iseq.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+iseq.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+iseq.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+iseq.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+iseq.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+iseq.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+iseq.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+iseq.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+iseq.$(OBJEXT): {$(VPATH)}internal/config.h
+iseq.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+iseq.$(OBJEXT): {$(VPATH)}internal/core.h
+iseq.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+iseq.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+iseq.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+iseq.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+iseq.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+iseq.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+iseq.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+iseq.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+iseq.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+iseq.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+iseq.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+iseq.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+iseq.$(OBJEXT): {$(VPATH)}internal/ctype.h
+iseq.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+iseq.$(OBJEXT): {$(VPATH)}internal/dosish.h
+iseq.$(OBJEXT): {$(VPATH)}internal/error.h
+iseq.$(OBJEXT): {$(VPATH)}internal/eval.h
+iseq.$(OBJEXT): {$(VPATH)}internal/event.h
+iseq.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+iseq.$(OBJEXT): {$(VPATH)}internal/gc.h
+iseq.$(OBJEXT): {$(VPATH)}internal/glob.h
+iseq.$(OBJEXT): {$(VPATH)}internal/globals.h
+iseq.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+iseq.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+iseq.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+iseq.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+iseq.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+iseq.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+iseq.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+iseq.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+iseq.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+iseq.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+iseq.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+iseq.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+iseq.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+iseq.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+iseq.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+iseq.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+iseq.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+iseq.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+iseq.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+iseq.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+iseq.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+iseq.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+iseq.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+iseq.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+iseq.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+iseq.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+iseq.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+iseq.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+iseq.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+iseq.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+iseq.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+iseq.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+iseq.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+iseq.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+iseq.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+iseq.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+iseq.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+iseq.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+iseq.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+iseq.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+iseq.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+iseq.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+iseq.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+iseq.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+iseq.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+iseq.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+iseq.$(OBJEXT): {$(VPATH)}internal/iterator.h
+iseq.$(OBJEXT): {$(VPATH)}internal/memory.h
+iseq.$(OBJEXT): {$(VPATH)}internal/method.h
+iseq.$(OBJEXT): {$(VPATH)}internal/module.h
+iseq.$(OBJEXT): {$(VPATH)}internal/newobj.h
+iseq.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+iseq.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+iseq.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+iseq.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+iseq.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+iseq.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+iseq.$(OBJEXT): {$(VPATH)}internal/symbol.h
+iseq.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+iseq.$(OBJEXT): {$(VPATH)}internal/value.h
+iseq.$(OBJEXT): {$(VPATH)}internal/value_type.h
+iseq.$(OBJEXT): {$(VPATH)}internal/variable.h
+iseq.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+iseq.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 iseq.$(OBJEXT): {$(VPATH)}iseq.c
 iseq.$(OBJEXT): {$(VPATH)}iseq.h
 iseq.$(OBJEXT): {$(VPATH)}method.h
 iseq.$(OBJEXT): {$(VPATH)}missing.h
+iseq.$(OBJEXT): {$(VPATH)}mjit.h
 iseq.$(OBJEXT): {$(VPATH)}node.h
 iseq.$(OBJEXT): {$(VPATH)}node_name.inc
+iseq.$(OBJEXT): {$(VPATH)}onigmo.h
 iseq.$(OBJEXT): {$(VPATH)}oniguruma.h
 iseq.$(OBJEXT): {$(VPATH)}ruby_assert.h
 iseq.$(OBJEXT): {$(VPATH)}ruby_atomic.h
@@ -1714,28 +6972,198 @@ iseq.$(OBJEXT): {$(VPATH)}subst.h
 iseq.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 iseq.$(OBJEXT): {$(VPATH)}thread_native.h
 iseq.$(OBJEXT): {$(VPATH)}util.h
+iseq.$(OBJEXT): {$(VPATH)}vm_callinfo.h
 iseq.$(OBJEXT): {$(VPATH)}vm_core.h
-iseq.$(OBJEXT): {$(VPATH)}vm_debug.h
 iseq.$(OBJEXT): {$(VPATH)}vm_opts.h
 load.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 load.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 load.$(OBJEXT): $(CCAN_DIR)/list/list.h
 load.$(OBJEXT): $(CCAN_DIR)/str/str.h
+load.$(OBJEXT): $(hdrdir)/ruby.h
 load.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-load.$(OBJEXT): $(top_srcdir)/include/ruby.h
+load.$(OBJEXT): $(top_srcdir)/internal/array.h
+load.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+load.$(OBJEXT): $(top_srcdir)/internal/dir.h
+load.$(OBJEXT): $(top_srcdir)/internal/error.h
+load.$(OBJEXT): $(top_srcdir)/internal/file.h
+load.$(OBJEXT): $(top_srcdir)/internal/gc.h
+load.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+load.$(OBJEXT): $(top_srcdir)/internal/load.h
+load.$(OBJEXT): $(top_srcdir)/internal/parse.h
+load.$(OBJEXT): $(top_srcdir)/internal/serial.h
+load.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+load.$(OBJEXT): $(top_srcdir)/internal/string.h
+load.$(OBJEXT): $(top_srcdir)/internal/thread.h
+load.$(OBJEXT): $(top_srcdir)/internal/variable.h
+load.$(OBJEXT): $(top_srcdir)/internal/vm.h
+load.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+load.$(OBJEXT): {$(VPATH)}assert.h
+load.$(OBJEXT): {$(VPATH)}atomic.h
+load.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+load.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+load.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+load.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+load.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+load.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+load.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+load.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+load.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 load.$(OBJEXT): {$(VPATH)}config.h
+load.$(OBJEXT): {$(VPATH)}constant.h
 load.$(OBJEXT): {$(VPATH)}defines.h
 load.$(OBJEXT): {$(VPATH)}dln.h
 load.$(OBJEXT): {$(VPATH)}encoding.h
 load.$(OBJEXT): {$(VPATH)}eval_intern.h
 load.$(OBJEXT): {$(VPATH)}id.h
+load.$(OBJEXT): {$(VPATH)}id_table.h
 load.$(OBJEXT): {$(VPATH)}intern.h
 load.$(OBJEXT): {$(VPATH)}internal.h
-load.$(OBJEXT): {$(VPATH)}io.h
+load.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+load.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+load.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+load.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+load.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+load.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+load.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+load.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+load.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+load.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+load.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+load.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+load.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+load.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+load.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+load.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+load.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+load.$(OBJEXT): {$(VPATH)}internal/assume.h
+load.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+load.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+load.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+load.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+load.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+load.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+load.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+load.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+load.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+load.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+load.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+load.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+load.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+load.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+load.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+load.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+load.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+load.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+load.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+load.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+load.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+load.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+load.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+load.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+load.$(OBJEXT): {$(VPATH)}internal/cast.h
+load.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+load.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+load.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+load.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+load.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+load.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+load.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+load.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+load.$(OBJEXT): {$(VPATH)}internal/config.h
+load.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+load.$(OBJEXT): {$(VPATH)}internal/core.h
+load.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+load.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+load.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+load.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+load.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+load.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+load.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+load.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+load.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+load.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+load.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+load.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+load.$(OBJEXT): {$(VPATH)}internal/ctype.h
+load.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+load.$(OBJEXT): {$(VPATH)}internal/dosish.h
+load.$(OBJEXT): {$(VPATH)}internal/error.h
+load.$(OBJEXT): {$(VPATH)}internal/eval.h
+load.$(OBJEXT): {$(VPATH)}internal/event.h
+load.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+load.$(OBJEXT): {$(VPATH)}internal/gc.h
+load.$(OBJEXT): {$(VPATH)}internal/glob.h
+load.$(OBJEXT): {$(VPATH)}internal/globals.h
+load.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+load.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+load.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+load.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+load.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+load.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+load.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+load.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+load.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+load.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+load.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+load.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+load.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+load.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+load.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+load.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+load.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+load.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+load.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+load.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+load.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+load.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+load.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+load.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+load.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+load.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+load.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+load.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+load.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+load.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+load.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+load.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+load.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+load.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+load.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+load.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+load.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+load.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+load.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+load.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+load.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+load.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+load.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+load.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+load.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+load.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+load.$(OBJEXT): {$(VPATH)}internal/iterator.h
+load.$(OBJEXT): {$(VPATH)}internal/memory.h
+load.$(OBJEXT): {$(VPATH)}internal/method.h
+load.$(OBJEXT): {$(VPATH)}internal/module.h
+load.$(OBJEXT): {$(VPATH)}internal/newobj.h
+load.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+load.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+load.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+load.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+load.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+load.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+load.$(OBJEXT): {$(VPATH)}internal/symbol.h
+load.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+load.$(OBJEXT): {$(VPATH)}internal/value.h
+load.$(OBJEXT): {$(VPATH)}internal/value_type.h
+load.$(OBJEXT): {$(VPATH)}internal/variable.h
+load.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+load.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
+load.$(OBJEXT): {$(VPATH)}iseq.h
 load.$(OBJEXT): {$(VPATH)}load.c
 load.$(OBJEXT): {$(VPATH)}method.h
 load.$(OBJEXT): {$(VPATH)}missing.h
 load.$(OBJEXT): {$(VPATH)}node.h
+load.$(OBJEXT): {$(VPATH)}onigmo.h
 load.$(OBJEXT): {$(VPATH)}oniguruma.h
 load.$(OBJEXT): {$(VPATH)}probes.dmyh
 load.$(OBJEXT): {$(VPATH)}probes.h
@@ -1747,48 +7175,522 @@ load.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 load.$(OBJEXT): {$(VPATH)}thread_native.h
 load.$(OBJEXT): {$(VPATH)}util.h
 load.$(OBJEXT): {$(VPATH)}vm_core.h
-load.$(OBJEXT): {$(VPATH)}vm_debug.h
 load.$(OBJEXT): {$(VPATH)}vm_opts.h
 loadpath.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 loadpath.$(OBJEXT): $(hdrdir)/ruby/version.h
 loadpath.$(OBJEXT): $(top_srcdir)/version.h
+loadpath.$(OBJEXT): {$(VPATH)}assert.h
+loadpath.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+loadpath.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+loadpath.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+loadpath.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+loadpath.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+loadpath.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+loadpath.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+loadpath.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+loadpath.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 loadpath.$(OBJEXT): {$(VPATH)}config.h
 loadpath.$(OBJEXT): {$(VPATH)}defines.h
 loadpath.$(OBJEXT): {$(VPATH)}intern.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/assume.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/cast.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/config.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/core.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/ctype.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/dosish.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/error.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/eval.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/event.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/gc.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/glob.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/globals.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/iterator.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/memory.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/method.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/module.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/newobj.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/symbol.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/value.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/value_type.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/variable.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+loadpath.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 loadpath.$(OBJEXT): {$(VPATH)}loadpath.c
 loadpath.$(OBJEXT): {$(VPATH)}missing.h
-loadpath.$(OBJEXT): {$(VPATH)}ruby_assert.h
 loadpath.$(OBJEXT): {$(VPATH)}st.h
 loadpath.$(OBJEXT): {$(VPATH)}subst.h
 loadpath.$(OBJEXT): {$(VPATH)}verconf.h
+localeinit.$(OBJEXT): $(hdrdir)/ruby.h
 localeinit.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-localeinit.$(OBJEXT): $(top_srcdir)/include/ruby.h
+localeinit.$(OBJEXT): {$(VPATH)}assert.h
+localeinit.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+localeinit.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+localeinit.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+localeinit.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+localeinit.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+localeinit.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+localeinit.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+localeinit.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+localeinit.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 localeinit.$(OBJEXT): {$(VPATH)}config.h
 localeinit.$(OBJEXT): {$(VPATH)}defines.h
 localeinit.$(OBJEXT): {$(VPATH)}encindex.h
 localeinit.$(OBJEXT): {$(VPATH)}encoding.h
 localeinit.$(OBJEXT): {$(VPATH)}intern.h
 localeinit.$(OBJEXT): {$(VPATH)}internal.h
-localeinit.$(OBJEXT): {$(VPATH)}io.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/assume.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/cast.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/config.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/core.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/ctype.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/dosish.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/error.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/eval.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/event.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/gc.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/glob.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/globals.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/iterator.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/memory.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/method.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/module.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/newobj.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/symbol.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/value.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/value_type.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/variable.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+localeinit.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 localeinit.$(OBJEXT): {$(VPATH)}localeinit.c
 localeinit.$(OBJEXT): {$(VPATH)}missing.h
+localeinit.$(OBJEXT): {$(VPATH)}onigmo.h
 localeinit.$(OBJEXT): {$(VPATH)}oniguruma.h
 localeinit.$(OBJEXT): {$(VPATH)}st.h
 localeinit.$(OBJEXT): {$(VPATH)}subst.h
+main.$(OBJEXT): $(hdrdir)/ruby.h
 main.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-main.$(OBJEXT): $(top_srcdir)/include/ruby.h
+main.$(OBJEXT): {$(VPATH)}assert.h
 main.$(OBJEXT): {$(VPATH)}backward.h
+main.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+main.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+main.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+main.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+main.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+main.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+main.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+main.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+main.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 main.$(OBJEXT): {$(VPATH)}config.h
 main.$(OBJEXT): {$(VPATH)}defines.h
 main.$(OBJEXT): {$(VPATH)}intern.h
+main.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+main.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+main.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+main.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+main.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+main.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+main.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+main.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+main.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+main.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+main.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+main.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+main.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+main.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+main.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+main.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+main.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+main.$(OBJEXT): {$(VPATH)}internal/assume.h
+main.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+main.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+main.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+main.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+main.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+main.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+main.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+main.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+main.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+main.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+main.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+main.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+main.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+main.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+main.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+main.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+main.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+main.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+main.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+main.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+main.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+main.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+main.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+main.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+main.$(OBJEXT): {$(VPATH)}internal/cast.h
+main.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+main.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+main.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+main.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+main.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+main.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+main.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+main.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+main.$(OBJEXT): {$(VPATH)}internal/config.h
+main.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+main.$(OBJEXT): {$(VPATH)}internal/core.h
+main.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+main.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+main.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+main.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+main.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+main.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+main.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+main.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+main.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+main.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+main.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+main.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+main.$(OBJEXT): {$(VPATH)}internal/ctype.h
+main.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+main.$(OBJEXT): {$(VPATH)}internal/dosish.h
+main.$(OBJEXT): {$(VPATH)}internal/error.h
+main.$(OBJEXT): {$(VPATH)}internal/eval.h
+main.$(OBJEXT): {$(VPATH)}internal/event.h
+main.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+main.$(OBJEXT): {$(VPATH)}internal/gc.h
+main.$(OBJEXT): {$(VPATH)}internal/glob.h
+main.$(OBJEXT): {$(VPATH)}internal/globals.h
+main.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+main.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+main.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+main.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+main.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+main.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+main.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+main.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+main.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+main.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+main.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+main.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+main.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+main.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+main.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+main.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+main.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+main.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+main.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+main.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+main.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+main.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+main.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+main.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+main.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+main.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+main.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+main.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+main.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+main.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+main.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+main.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+main.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+main.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+main.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+main.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+main.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+main.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+main.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+main.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+main.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+main.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+main.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+main.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+main.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+main.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+main.$(OBJEXT): {$(VPATH)}internal/iterator.h
+main.$(OBJEXT): {$(VPATH)}internal/memory.h
+main.$(OBJEXT): {$(VPATH)}internal/method.h
+main.$(OBJEXT): {$(VPATH)}internal/module.h
+main.$(OBJEXT): {$(VPATH)}internal/newobj.h
+main.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+main.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+main.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+main.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+main.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+main.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+main.$(OBJEXT): {$(VPATH)}internal/symbol.h
+main.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+main.$(OBJEXT): {$(VPATH)}internal/value.h
+main.$(OBJEXT): {$(VPATH)}internal/value_type.h
+main.$(OBJEXT): {$(VPATH)}internal/variable.h
+main.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+main.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 main.$(OBJEXT): {$(VPATH)}main.c
 main.$(OBJEXT): {$(VPATH)}missing.h
 main.$(OBJEXT): {$(VPATH)}node.h
 main.$(OBJEXT): {$(VPATH)}st.h
 main.$(OBJEXT): {$(VPATH)}subst.h
 main.$(OBJEXT): {$(VPATH)}vm_debug.h
+marshal.$(OBJEXT): $(hdrdir)/ruby.h
 marshal.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-marshal.$(OBJEXT): $(top_srcdir)/include/ruby.h
+marshal.$(OBJEXT): $(top_srcdir)/internal/array.h
+marshal.$(OBJEXT): $(top_srcdir)/internal/bignum.h
+marshal.$(OBJEXT): $(top_srcdir)/internal/class.h
+marshal.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+marshal.$(OBJEXT): $(top_srcdir)/internal/encoding.h
+marshal.$(OBJEXT): $(top_srcdir)/internal/error.h
+marshal.$(OBJEXT): $(top_srcdir)/internal/gc.h
+marshal.$(OBJEXT): $(top_srcdir)/internal/hash.h
+marshal.$(OBJEXT): $(top_srcdir)/internal/object.h
+marshal.$(OBJEXT): $(top_srcdir)/internal/serial.h
+marshal.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+marshal.$(OBJEXT): $(top_srcdir)/internal/string.h
+marshal.$(OBJEXT): $(top_srcdir)/internal/struct.h
+marshal.$(OBJEXT): $(top_srcdir)/internal/util.h
+marshal.$(OBJEXT): $(top_srcdir)/internal/vm.h
+marshal.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+marshal.$(OBJEXT): {$(VPATH)}assert.h
+marshal.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+marshal.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+marshal.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+marshal.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+marshal.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+marshal.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+marshal.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+marshal.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+marshal.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 marshal.$(OBJEXT): {$(VPATH)}config.h
 marshal.$(OBJEXT): {$(VPATH)}defines.h
 marshal.$(OBJEXT): {$(VPATH)}encindex.h
@@ -1796,56 +7698,1327 @@ marshal.$(OBJEXT): {$(VPATH)}encoding.h
 marshal.$(OBJEXT): {$(VPATH)}id_table.h
 marshal.$(OBJEXT): {$(VPATH)}intern.h
 marshal.$(OBJEXT): {$(VPATH)}internal.h
+marshal.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+marshal.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+marshal.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+marshal.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+marshal.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+marshal.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+marshal.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+marshal.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+marshal.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+marshal.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+marshal.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+marshal.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+marshal.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+marshal.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+marshal.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+marshal.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+marshal.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+marshal.$(OBJEXT): {$(VPATH)}internal/assume.h
+marshal.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+marshal.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+marshal.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+marshal.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+marshal.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+marshal.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+marshal.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+marshal.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+marshal.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+marshal.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+marshal.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+marshal.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+marshal.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+marshal.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+marshal.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+marshal.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+marshal.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+marshal.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+marshal.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+marshal.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+marshal.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+marshal.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+marshal.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+marshal.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+marshal.$(OBJEXT): {$(VPATH)}internal/cast.h
+marshal.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+marshal.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+marshal.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+marshal.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+marshal.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+marshal.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+marshal.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+marshal.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+marshal.$(OBJEXT): {$(VPATH)}internal/config.h
+marshal.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+marshal.$(OBJEXT): {$(VPATH)}internal/core.h
+marshal.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+marshal.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+marshal.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+marshal.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+marshal.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+marshal.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+marshal.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+marshal.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+marshal.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+marshal.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+marshal.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+marshal.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+marshal.$(OBJEXT): {$(VPATH)}internal/ctype.h
+marshal.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+marshal.$(OBJEXT): {$(VPATH)}internal/dosish.h
+marshal.$(OBJEXT): {$(VPATH)}internal/error.h
+marshal.$(OBJEXT): {$(VPATH)}internal/eval.h
+marshal.$(OBJEXT): {$(VPATH)}internal/event.h
+marshal.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+marshal.$(OBJEXT): {$(VPATH)}internal/gc.h
+marshal.$(OBJEXT): {$(VPATH)}internal/glob.h
+marshal.$(OBJEXT): {$(VPATH)}internal/globals.h
+marshal.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+marshal.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+marshal.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+marshal.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+marshal.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+marshal.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+marshal.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+marshal.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+marshal.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+marshal.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+marshal.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+marshal.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+marshal.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+marshal.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+marshal.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+marshal.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+marshal.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+marshal.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+marshal.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+marshal.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+marshal.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+marshal.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+marshal.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+marshal.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+marshal.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+marshal.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+marshal.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+marshal.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+marshal.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+marshal.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+marshal.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+marshal.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+marshal.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+marshal.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+marshal.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+marshal.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+marshal.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+marshal.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+marshal.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+marshal.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+marshal.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+marshal.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+marshal.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+marshal.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+marshal.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+marshal.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+marshal.$(OBJEXT): {$(VPATH)}internal/iterator.h
+marshal.$(OBJEXT): {$(VPATH)}internal/memory.h
+marshal.$(OBJEXT): {$(VPATH)}internal/method.h
+marshal.$(OBJEXT): {$(VPATH)}internal/module.h
+marshal.$(OBJEXT): {$(VPATH)}internal/newobj.h
+marshal.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+marshal.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+marshal.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+marshal.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+marshal.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+marshal.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+marshal.$(OBJEXT): {$(VPATH)}internal/symbol.h
+marshal.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+marshal.$(OBJEXT): {$(VPATH)}internal/value.h
+marshal.$(OBJEXT): {$(VPATH)}internal/value_type.h
+marshal.$(OBJEXT): {$(VPATH)}internal/variable.h
+marshal.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+marshal.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 marshal.$(OBJEXT): {$(VPATH)}io.h
 marshal.$(OBJEXT): {$(VPATH)}marshal.c
 marshal.$(OBJEXT): {$(VPATH)}missing.h
+marshal.$(OBJEXT): {$(VPATH)}onigmo.h
 marshal.$(OBJEXT): {$(VPATH)}oniguruma.h
 marshal.$(OBJEXT): {$(VPATH)}st.h
 marshal.$(OBJEXT): {$(VPATH)}subst.h
 marshal.$(OBJEXT): {$(VPATH)}util.h
+math.$(OBJEXT): $(hdrdir)/ruby.h
 math.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-math.$(OBJEXT): $(top_srcdir)/include/ruby.h
+math.$(OBJEXT): $(top_srcdir)/internal/bignum.h
+math.$(OBJEXT): $(top_srcdir)/internal/class.h
+math.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+math.$(OBJEXT): $(top_srcdir)/internal/complex.h
+math.$(OBJEXT): $(top_srcdir)/internal/gc.h
+math.$(OBJEXT): $(top_srcdir)/internal/math.h
+math.$(OBJEXT): $(top_srcdir)/internal/object.h
+math.$(OBJEXT): $(top_srcdir)/internal/serial.h
+math.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+math.$(OBJEXT): $(top_srcdir)/internal/vm.h
+math.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+math.$(OBJEXT): {$(VPATH)}assert.h
+math.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+math.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+math.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+math.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+math.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+math.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+math.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+math.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+math.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 math.$(OBJEXT): {$(VPATH)}config.h
 math.$(OBJEXT): {$(VPATH)}defines.h
-math.$(OBJEXT): {$(VPATH)}encoding.h
+math.$(OBJEXT): {$(VPATH)}id_table.h
 math.$(OBJEXT): {$(VPATH)}intern.h
 math.$(OBJEXT): {$(VPATH)}internal.h
-math.$(OBJEXT): {$(VPATH)}io.h
+math.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+math.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+math.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+math.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+math.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+math.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+math.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+math.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+math.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+math.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+math.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+math.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+math.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+math.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+math.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+math.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+math.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+math.$(OBJEXT): {$(VPATH)}internal/assume.h
+math.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+math.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+math.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+math.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+math.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+math.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+math.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+math.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+math.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+math.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+math.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+math.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+math.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+math.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+math.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+math.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+math.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+math.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+math.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+math.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+math.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+math.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+math.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+math.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+math.$(OBJEXT): {$(VPATH)}internal/cast.h
+math.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+math.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+math.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+math.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+math.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+math.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+math.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+math.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+math.$(OBJEXT): {$(VPATH)}internal/config.h
+math.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+math.$(OBJEXT): {$(VPATH)}internal/core.h
+math.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+math.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+math.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+math.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+math.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+math.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+math.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+math.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+math.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+math.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+math.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+math.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+math.$(OBJEXT): {$(VPATH)}internal/ctype.h
+math.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+math.$(OBJEXT): {$(VPATH)}internal/dosish.h
+math.$(OBJEXT): {$(VPATH)}internal/error.h
+math.$(OBJEXT): {$(VPATH)}internal/eval.h
+math.$(OBJEXT): {$(VPATH)}internal/event.h
+math.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+math.$(OBJEXT): {$(VPATH)}internal/gc.h
+math.$(OBJEXT): {$(VPATH)}internal/glob.h
+math.$(OBJEXT): {$(VPATH)}internal/globals.h
+math.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+math.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+math.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+math.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+math.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+math.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+math.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+math.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+math.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+math.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+math.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+math.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+math.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+math.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+math.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+math.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+math.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+math.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+math.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+math.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+math.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+math.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+math.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+math.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+math.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+math.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+math.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+math.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+math.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+math.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+math.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+math.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+math.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+math.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+math.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+math.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+math.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+math.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+math.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+math.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+math.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+math.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+math.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+math.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+math.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+math.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+math.$(OBJEXT): {$(VPATH)}internal/iterator.h
+math.$(OBJEXT): {$(VPATH)}internal/memory.h
+math.$(OBJEXT): {$(VPATH)}internal/method.h
+math.$(OBJEXT): {$(VPATH)}internal/module.h
+math.$(OBJEXT): {$(VPATH)}internal/newobj.h
+math.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+math.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+math.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+math.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+math.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+math.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+math.$(OBJEXT): {$(VPATH)}internal/symbol.h
+math.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+math.$(OBJEXT): {$(VPATH)}internal/value.h
+math.$(OBJEXT): {$(VPATH)}internal/value_type.h
+math.$(OBJEXT): {$(VPATH)}internal/variable.h
+math.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+math.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 math.$(OBJEXT): {$(VPATH)}math.c
 math.$(OBJEXT): {$(VPATH)}missing.h
-math.$(OBJEXT): {$(VPATH)}oniguruma.h
 math.$(OBJEXT): {$(VPATH)}st.h
 math.$(OBJEXT): {$(VPATH)}subst.h
+memory_view.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+memory_view.$(OBJEXT): $(top_srcdir)/internal/hash.h
+memory_view.$(OBJEXT): $(top_srcdir)/internal/util.h
+memory_view.$(OBJEXT): $(top_srcdir)/internal/variable.h
+memory_view.$(OBJEXT): {$(VPATH)}assert.h
+memory_view.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+memory_view.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+memory_view.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+memory_view.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+memory_view.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+memory_view.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+memory_view.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+memory_view.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+memory_view.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
+memory_view.$(OBJEXT): {$(VPATH)}config.h
+memory_view.$(OBJEXT): {$(VPATH)}constant.h
+memory_view.$(OBJEXT): {$(VPATH)}debug_counter.h
+memory_view.$(OBJEXT): {$(VPATH)}defines.h
+memory_view.$(OBJEXT): {$(VPATH)}id_table.h
+memory_view.$(OBJEXT): {$(VPATH)}intern.h
+memory_view.$(OBJEXT): {$(VPATH)}internal.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/assume.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/cast.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/config.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/core.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/ctype.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/dosish.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/error.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/eval.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/event.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/gc.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/glob.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/globals.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/iterator.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/memory.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/method.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/module.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/newobj.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/symbol.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/value.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/value_type.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/variable.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+memory_view.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
+memory_view.$(OBJEXT): {$(VPATH)}memory_view.c
+memory_view.$(OBJEXT): {$(VPATH)}memory_view.h
+memory_view.$(OBJEXT): {$(VPATH)}missing.h
+memory_view.$(OBJEXT): {$(VPATH)}node.h
+memory_view.$(OBJEXT): {$(VPATH)}st.h
+memory_view.$(OBJEXT): {$(VPATH)}subst.h
+memory_view.$(OBJEXT): {$(VPATH)}vm_debug.h
+memory_view.$(OBJEXT): {$(VPATH)}vm_sync.h
+miniinit.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+miniinit.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+miniinit.$(OBJEXT): $(CCAN_DIR)/list/list.h
+miniinit.$(OBJEXT): $(CCAN_DIR)/str/str.h
+miniinit.$(OBJEXT): $(hdrdir)/ruby.h
 miniinit.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+miniinit.$(OBJEXT): $(top_srcdir)/internal/array.h
+miniinit.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+miniinit.$(OBJEXT): $(top_srcdir)/internal/gc.h
+miniinit.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+miniinit.$(OBJEXT): $(top_srcdir)/internal/serial.h
+miniinit.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+miniinit.$(OBJEXT): $(top_srcdir)/internal/vm.h
+miniinit.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+miniinit.$(OBJEXT): {$(VPATH)}array.rb
+miniinit.$(OBJEXT): {$(VPATH)}assert.h
+miniinit.$(OBJEXT): {$(VPATH)}ast.rb
+miniinit.$(OBJEXT): {$(VPATH)}atomic.h
+miniinit.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+miniinit.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+miniinit.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+miniinit.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+miniinit.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+miniinit.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+miniinit.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+miniinit.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+miniinit.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
+miniinit.$(OBJEXT): {$(VPATH)}builtin.h
 miniinit.$(OBJEXT): {$(VPATH)}config.h
 miniinit.$(OBJEXT): {$(VPATH)}defines.h
+miniinit.$(OBJEXT): {$(VPATH)}dir.rb
 miniinit.$(OBJEXT): {$(VPATH)}encoding.h
+miniinit.$(OBJEXT): {$(VPATH)}gc.rb
+miniinit.$(OBJEXT): {$(VPATH)}gem_prelude.rb
+miniinit.$(OBJEXT): {$(VPATH)}id.h
+miniinit.$(OBJEXT): {$(VPATH)}integer.rb
 miniinit.$(OBJEXT): {$(VPATH)}intern.h
+miniinit.$(OBJEXT): {$(VPATH)}internal.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/assume.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/cast.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/config.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/core.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/ctype.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/dosish.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/error.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/eval.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/event.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/gc.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/glob.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/globals.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/iterator.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/memory.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/method.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/module.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/newobj.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/symbol.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/value.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/value_type.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/variable.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+miniinit.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
+miniinit.$(OBJEXT): {$(VPATH)}io.rb
+miniinit.$(OBJEXT): {$(VPATH)}iseq.h
+miniinit.$(OBJEXT): {$(VPATH)}kernel.rb
+miniinit.$(OBJEXT): {$(VPATH)}method.h
+miniinit.$(OBJEXT): {$(VPATH)}mini_builtin.c
 miniinit.$(OBJEXT): {$(VPATH)}miniinit.c
+miniinit.$(OBJEXT): {$(VPATH)}miniprelude.c
 miniinit.$(OBJEXT): {$(VPATH)}missing.h
+miniinit.$(OBJEXT): {$(VPATH)}node.h
+miniinit.$(OBJEXT): {$(VPATH)}onigmo.h
 miniinit.$(OBJEXT): {$(VPATH)}oniguruma.h
+miniinit.$(OBJEXT): {$(VPATH)}pack.rb
+miniinit.$(OBJEXT): {$(VPATH)}prelude.rb
+miniinit.$(OBJEXT): {$(VPATH)}ractor.rb
+miniinit.$(OBJEXT): {$(VPATH)}ruby_assert.h
+miniinit.$(OBJEXT): {$(VPATH)}ruby_atomic.h
 miniinit.$(OBJEXT): {$(VPATH)}st.h
 miniinit.$(OBJEXT): {$(VPATH)}subst.h
+miniinit.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+miniinit.$(OBJEXT): {$(VPATH)}thread_native.h
+miniinit.$(OBJEXT): {$(VPATH)}trace_point.rb
+miniinit.$(OBJEXT): {$(VPATH)}vm_core.h
+miniinit.$(OBJEXT): {$(VPATH)}vm_opts.h
+miniinit.$(OBJEXT): {$(VPATH)}warning.rb
+miniprelude.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+miniprelude.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+miniprelude.$(OBJEXT): $(CCAN_DIR)/list/list.h
+miniprelude.$(OBJEXT): $(CCAN_DIR)/str/str.h
+miniprelude.$(OBJEXT): $(hdrdir)/ruby.h
+miniprelude.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+miniprelude.$(OBJEXT): {$(VPATH)}assert.h
+miniprelude.$(OBJEXT): {$(VPATH)}ast.rb
+miniprelude.$(OBJEXT): {$(VPATH)}atomic.h
+miniprelude.$(OBJEXT): {$(VPATH)}config.h
+miniprelude.$(OBJEXT): {$(VPATH)}defines.h
+miniprelude.$(OBJEXT): {$(VPATH)}gc.rb
+miniprelude.$(OBJEXT): {$(VPATH)}id.h
+miniprelude.$(OBJEXT): {$(VPATH)}intern.h
+miniprelude.$(OBJEXT): {$(VPATH)}internal.h
+miniprelude.$(OBJEXT): {$(VPATH)}io.rb
 miniprelude.$(OBJEXT): {$(VPATH)}iseq.h
+miniprelude.$(OBJEXT): {$(VPATH)}method.h
 miniprelude.$(OBJEXT): {$(VPATH)}miniprelude.c
+miniprelude.$(OBJEXT): {$(VPATH)}missing.h
+miniprelude.$(OBJEXT): {$(VPATH)}node.h
+miniprelude.$(OBJEXT): {$(VPATH)}pack.rb
+miniprelude.$(OBJEXT): {$(VPATH)}prelude.rb
+miniprelude.$(OBJEXT): {$(VPATH)}ruby_assert.h
+miniprelude.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+miniprelude.$(OBJEXT): {$(VPATH)}st.h
+miniprelude.$(OBJEXT): {$(VPATH)}subst.h
+miniprelude.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+miniprelude.$(OBJEXT): {$(VPATH)}thread_native.h
+miniprelude.$(OBJEXT): {$(VPATH)}trace_point.rb
+miniprelude.$(OBJEXT): {$(VPATH)}vm_core.h
+miniprelude.$(OBJEXT): {$(VPATH)}vm_opts.h
+mjit.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+mjit.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+mjit.$(OBJEXT): $(CCAN_DIR)/list/list.h
+mjit.$(OBJEXT): $(CCAN_DIR)/str/str.h
+mjit.$(OBJEXT): $(hdrdir)/ruby.h
+mjit.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+mjit.$(OBJEXT): $(hdrdir)/ruby/version.h
+mjit.$(OBJEXT): $(top_srcdir)/internal/array.h
+mjit.$(OBJEXT): $(top_srcdir)/internal/class.h
+mjit.$(OBJEXT): $(top_srcdir)/internal/compile.h
+mjit.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+mjit.$(OBJEXT): $(top_srcdir)/internal/cont.h
+mjit.$(OBJEXT): $(top_srcdir)/internal/file.h
+mjit.$(OBJEXT): $(top_srcdir)/internal/gc.h
+mjit.$(OBJEXT): $(top_srcdir)/internal/hash.h
+mjit.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+mjit.$(OBJEXT): $(top_srcdir)/internal/serial.h
+mjit.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+mjit.$(OBJEXT): $(top_srcdir)/internal/vm.h
+mjit.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+mjit.$(OBJEXT): {$(VPATH)}assert.h
+mjit.$(OBJEXT): {$(VPATH)}atomic.h
+mjit.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+mjit.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+mjit.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+mjit.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+mjit.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+mjit.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+mjit.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+mjit.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+mjit.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
+mjit.$(OBJEXT): {$(VPATH)}builtin.h
+mjit.$(OBJEXT): {$(VPATH)}config.h
+mjit.$(OBJEXT): {$(VPATH)}constant.h
+mjit.$(OBJEXT): {$(VPATH)}debug.h
+mjit.$(OBJEXT): {$(VPATH)}debug_counter.h
+mjit.$(OBJEXT): {$(VPATH)}defines.h
+mjit.$(OBJEXT): {$(VPATH)}dln.h
+mjit.$(OBJEXT): {$(VPATH)}encoding.h
+mjit.$(OBJEXT): {$(VPATH)}gc.h
+mjit.$(OBJEXT): {$(VPATH)}id.h
+mjit.$(OBJEXT): {$(VPATH)}id_table.h
+mjit.$(OBJEXT): {$(VPATH)}insns.def
+mjit.$(OBJEXT): {$(VPATH)}insns.inc
+mjit.$(OBJEXT): {$(VPATH)}insns_info.inc
+mjit.$(OBJEXT): {$(VPATH)}intern.h
+mjit.$(OBJEXT): {$(VPATH)}internal.h
+mjit.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+mjit.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+mjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+mjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+mjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+mjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+mjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+mjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+mjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+mjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+mjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+mjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+mjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+mjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+mjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+mjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+mjit.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+mjit.$(OBJEXT): {$(VPATH)}internal/assume.h
+mjit.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+mjit.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+mjit.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+mjit.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+mjit.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+mjit.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+mjit.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+mjit.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+mjit.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+mjit.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+mjit.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+mjit.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+mjit.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+mjit.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+mjit.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+mjit.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+mjit.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+mjit.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+mjit.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+mjit.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+mjit.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+mjit.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+mjit.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+mjit.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+mjit.$(OBJEXT): {$(VPATH)}internal/cast.h
+mjit.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+mjit.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+mjit.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+mjit.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+mjit.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+mjit.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+mjit.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+mjit.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+mjit.$(OBJEXT): {$(VPATH)}internal/config.h
+mjit.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+mjit.$(OBJEXT): {$(VPATH)}internal/core.h
+mjit.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+mjit.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+mjit.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+mjit.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+mjit.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+mjit.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+mjit.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+mjit.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+mjit.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+mjit.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+mjit.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+mjit.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+mjit.$(OBJEXT): {$(VPATH)}internal/ctype.h
+mjit.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+mjit.$(OBJEXT): {$(VPATH)}internal/dosish.h
+mjit.$(OBJEXT): {$(VPATH)}internal/error.h
+mjit.$(OBJEXT): {$(VPATH)}internal/eval.h
+mjit.$(OBJEXT): {$(VPATH)}internal/event.h
+mjit.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+mjit.$(OBJEXT): {$(VPATH)}internal/gc.h
+mjit.$(OBJEXT): {$(VPATH)}internal/glob.h
+mjit.$(OBJEXT): {$(VPATH)}internal/globals.h
+mjit.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+mjit.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+mjit.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+mjit.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+mjit.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+mjit.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+mjit.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+mjit.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+mjit.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+mjit.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+mjit.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+mjit.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+mjit.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+mjit.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+mjit.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+mjit.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+mjit.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+mjit.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+mjit.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+mjit.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+mjit.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+mjit.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+mjit.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+mjit.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+mjit.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+mjit.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+mjit.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+mjit.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+mjit.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+mjit.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+mjit.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+mjit.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+mjit.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+mjit.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+mjit.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+mjit.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+mjit.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+mjit.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+mjit.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+mjit.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+mjit.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+mjit.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+mjit.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+mjit.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+mjit.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+mjit.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+mjit.$(OBJEXT): {$(VPATH)}internal/iterator.h
+mjit.$(OBJEXT): {$(VPATH)}internal/memory.h
+mjit.$(OBJEXT): {$(VPATH)}internal/method.h
+mjit.$(OBJEXT): {$(VPATH)}internal/module.h
+mjit.$(OBJEXT): {$(VPATH)}internal/newobj.h
+mjit.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+mjit.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+mjit.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+mjit.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+mjit.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+mjit.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+mjit.$(OBJEXT): {$(VPATH)}internal/symbol.h
+mjit.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+mjit.$(OBJEXT): {$(VPATH)}internal/value.h
+mjit.$(OBJEXT): {$(VPATH)}internal/value_type.h
+mjit.$(OBJEXT): {$(VPATH)}internal/variable.h
+mjit.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+mjit.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
+mjit.$(OBJEXT): {$(VPATH)}iseq.h
+mjit.$(OBJEXT): {$(VPATH)}method.h
+mjit.$(OBJEXT): {$(VPATH)}missing.h
+mjit.$(OBJEXT): {$(VPATH)}mjit.c
+mjit.$(OBJEXT): {$(VPATH)}mjit.h
+mjit.$(OBJEXT): {$(VPATH)}mjit_config.h
+mjit.$(OBJEXT): {$(VPATH)}mjit_worker.c
+mjit.$(OBJEXT): {$(VPATH)}node.h
+mjit.$(OBJEXT): {$(VPATH)}onigmo.h
+mjit.$(OBJEXT): {$(VPATH)}oniguruma.h
+mjit.$(OBJEXT): {$(VPATH)}ruby_assert.h
+mjit.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+mjit.$(OBJEXT): {$(VPATH)}st.h
+mjit.$(OBJEXT): {$(VPATH)}subst.h
+mjit.$(OBJEXT): {$(VPATH)}thread.h
+mjit.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+mjit.$(OBJEXT): {$(VPATH)}thread_native.h
+mjit.$(OBJEXT): {$(VPATH)}util.h
+mjit.$(OBJEXT): {$(VPATH)}vm_callinfo.h
+mjit.$(OBJEXT): {$(VPATH)}vm_core.h
+mjit.$(OBJEXT): {$(VPATH)}vm_opts.h
+mjit_build_dir.$(OBJEXT): {$(VPATH)}config.h
+mjit_build_dir.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+mjit_build_dir.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+mjit_build_dir.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+mjit_build_dir.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+mjit_build_dir.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+mjit_build_dir.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+mjit_build_dir.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+mjit_build_dir.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+mjit_build_dir.$(OBJEXT): {$(VPATH)}internal/config.h
+mjit_build_dir.$(OBJEXT): {$(VPATH)}ruby-runner.c
+mjit_build_dir.$(OBJEXT): {$(VPATH)}ruby-runner.h
+mjit_compile.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+mjit_compile.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+mjit_compile.$(OBJEXT): $(CCAN_DIR)/list/list.h
+mjit_compile.$(OBJEXT): $(CCAN_DIR)/str/str.h
+mjit_compile.$(OBJEXT): $(hdrdir)/ruby.h
+mjit_compile.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+mjit_compile.$(OBJEXT): $(top_srcdir)/internal/array.h
+mjit_compile.$(OBJEXT): $(top_srcdir)/internal/class.h
+mjit_compile.$(OBJEXT): $(top_srcdir)/internal/compile.h
+mjit_compile.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+mjit_compile.$(OBJEXT): $(top_srcdir)/internal/gc.h
+mjit_compile.$(OBJEXT): $(top_srcdir)/internal/hash.h
+mjit_compile.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+mjit_compile.$(OBJEXT): $(top_srcdir)/internal/object.h
+mjit_compile.$(OBJEXT): $(top_srcdir)/internal/serial.h
+mjit_compile.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+mjit_compile.$(OBJEXT): $(top_srcdir)/internal/variable.h
+mjit_compile.$(OBJEXT): $(top_srcdir)/internal/vm.h
+mjit_compile.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+mjit_compile.$(OBJEXT): {$(VPATH)}assert.h
+mjit_compile.$(OBJEXT): {$(VPATH)}atomic.h
+mjit_compile.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+mjit_compile.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+mjit_compile.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+mjit_compile.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+mjit_compile.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+mjit_compile.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+mjit_compile.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+mjit_compile.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+mjit_compile.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
+mjit_compile.$(OBJEXT): {$(VPATH)}builtin.h
+mjit_compile.$(OBJEXT): {$(VPATH)}config.h
+mjit_compile.$(OBJEXT): {$(VPATH)}constant.h
+mjit_compile.$(OBJEXT): {$(VPATH)}debug_counter.h
+mjit_compile.$(OBJEXT): {$(VPATH)}defines.h
+mjit_compile.$(OBJEXT): {$(VPATH)}id.h
+mjit_compile.$(OBJEXT): {$(VPATH)}id_table.h
+mjit_compile.$(OBJEXT): {$(VPATH)}insns.def
+mjit_compile.$(OBJEXT): {$(VPATH)}insns.inc
+mjit_compile.$(OBJEXT): {$(VPATH)}insns_info.inc
+mjit_compile.$(OBJEXT): {$(VPATH)}intern.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/assume.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/cast.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/config.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/core.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/ctype.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/dosish.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/error.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/eval.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/event.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/gc.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/glob.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/globals.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/iterator.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/memory.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/method.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/module.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/newobj.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/symbol.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/value.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/value_type.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/variable.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+mjit_compile.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
+mjit_compile.$(OBJEXT): {$(VPATH)}iseq.h
+mjit_compile.$(OBJEXT): {$(VPATH)}method.h
+mjit_compile.$(OBJEXT): {$(VPATH)}missing.h
+mjit_compile.$(OBJEXT): {$(VPATH)}mjit.h
+mjit_compile.$(OBJEXT): {$(VPATH)}mjit_compile.c
+mjit_compile.$(OBJEXT): {$(VPATH)}mjit_compile.inc
+mjit_compile.$(OBJEXT): {$(VPATH)}node.h
+mjit_compile.$(OBJEXT): {$(VPATH)}ruby_assert.h
+mjit_compile.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+mjit_compile.$(OBJEXT): {$(VPATH)}st.h
+mjit_compile.$(OBJEXT): {$(VPATH)}subst.h
+mjit_compile.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+mjit_compile.$(OBJEXT): {$(VPATH)}thread_native.h
+mjit_compile.$(OBJEXT): {$(VPATH)}vm_callinfo.h
+mjit_compile.$(OBJEXT): {$(VPATH)}vm_core.h
+mjit_compile.$(OBJEXT): {$(VPATH)}vm_exec.h
+mjit_compile.$(OBJEXT): {$(VPATH)}vm_insnhelper.h
+mjit_compile.$(OBJEXT): {$(VPATH)}vm_opts.h
 node.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 node.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 node.$(OBJEXT): $(CCAN_DIR)/list/list.h
 node.$(OBJEXT): $(CCAN_DIR)/str/str.h
+node.$(OBJEXT): $(hdrdir)/ruby.h
 node.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-node.$(OBJEXT): $(top_srcdir)/include/ruby.h
+node.$(OBJEXT): $(top_srcdir)/internal/array.h
+node.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+node.$(OBJEXT): $(top_srcdir)/internal/gc.h
+node.$(OBJEXT): $(top_srcdir)/internal/hash.h
+node.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+node.$(OBJEXT): $(top_srcdir)/internal/serial.h
+node.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+node.$(OBJEXT): $(top_srcdir)/internal/variable.h
+node.$(OBJEXT): $(top_srcdir)/internal/vm.h
+node.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+node.$(OBJEXT): {$(VPATH)}assert.h
+node.$(OBJEXT): {$(VPATH)}atomic.h
+node.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+node.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+node.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+node.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+node.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+node.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+node.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+node.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+node.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 node.$(OBJEXT): {$(VPATH)}config.h
+node.$(OBJEXT): {$(VPATH)}constant.h
 node.$(OBJEXT): {$(VPATH)}defines.h
-node.$(OBJEXT): {$(VPATH)}encoding.h
 node.$(OBJEXT): {$(VPATH)}id.h
+node.$(OBJEXT): {$(VPATH)}id_table.h
 node.$(OBJEXT): {$(VPATH)}intern.h
 node.$(OBJEXT): {$(VPATH)}internal.h
-node.$(OBJEXT): {$(VPATH)}io.h
+node.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+node.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+node.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+node.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+node.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+node.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+node.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+node.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+node.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+node.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+node.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+node.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+node.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+node.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+node.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+node.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+node.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+node.$(OBJEXT): {$(VPATH)}internal/assume.h
+node.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+node.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+node.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+node.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+node.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+node.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+node.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+node.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+node.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+node.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+node.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+node.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+node.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+node.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+node.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+node.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+node.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+node.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+node.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+node.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+node.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+node.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+node.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+node.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+node.$(OBJEXT): {$(VPATH)}internal/cast.h
+node.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+node.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+node.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+node.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+node.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+node.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+node.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+node.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+node.$(OBJEXT): {$(VPATH)}internal/config.h
+node.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+node.$(OBJEXT): {$(VPATH)}internal/core.h
+node.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+node.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+node.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+node.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+node.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+node.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+node.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+node.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+node.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+node.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+node.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+node.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+node.$(OBJEXT): {$(VPATH)}internal/ctype.h
+node.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+node.$(OBJEXT): {$(VPATH)}internal/dosish.h
+node.$(OBJEXT): {$(VPATH)}internal/error.h
+node.$(OBJEXT): {$(VPATH)}internal/eval.h
+node.$(OBJEXT): {$(VPATH)}internal/event.h
+node.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+node.$(OBJEXT): {$(VPATH)}internal/gc.h
+node.$(OBJEXT): {$(VPATH)}internal/glob.h
+node.$(OBJEXT): {$(VPATH)}internal/globals.h
+node.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+node.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+node.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+node.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+node.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+node.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+node.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+node.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+node.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+node.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+node.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+node.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+node.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+node.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+node.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+node.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+node.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+node.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+node.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+node.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+node.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+node.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+node.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+node.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+node.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+node.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+node.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+node.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+node.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+node.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+node.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+node.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+node.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+node.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+node.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+node.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+node.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+node.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+node.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+node.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+node.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+node.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+node.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+node.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+node.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+node.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+node.$(OBJEXT): {$(VPATH)}internal/iterator.h
+node.$(OBJEXT): {$(VPATH)}internal/memory.h
+node.$(OBJEXT): {$(VPATH)}internal/method.h
+node.$(OBJEXT): {$(VPATH)}internal/module.h
+node.$(OBJEXT): {$(VPATH)}internal/newobj.h
+node.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+node.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+node.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+node.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+node.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+node.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+node.$(OBJEXT): {$(VPATH)}internal/symbol.h
+node.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+node.$(OBJEXT): {$(VPATH)}internal/value.h
+node.$(OBJEXT): {$(VPATH)}internal/value_type.h
+node.$(OBJEXT): {$(VPATH)}internal/variable.h
+node.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+node.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 node.$(OBJEXT): {$(VPATH)}method.h
 node.$(OBJEXT): {$(VPATH)}missing.h
 node.$(OBJEXT): {$(VPATH)}node.c
 node.$(OBJEXT): {$(VPATH)}node.h
-node.$(OBJEXT): {$(VPATH)}oniguruma.h
 node.$(OBJEXT): {$(VPATH)}ruby_assert.h
 node.$(OBJEXT): {$(VPATH)}ruby_atomic.h
 node.$(OBJEXT): {$(VPATH)}st.h
@@ -1853,99 +9026,788 @@ node.$(OBJEXT): {$(VPATH)}subst.h
 node.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 node.$(OBJEXT): {$(VPATH)}thread_native.h
 node.$(OBJEXT): {$(VPATH)}vm_core.h
-node.$(OBJEXT): {$(VPATH)}vm_debug.h
 node.$(OBJEXT): {$(VPATH)}vm_opts.h
+numeric.$(OBJEXT): $(hdrdir)/ruby.h
 numeric.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-numeric.$(OBJEXT): $(top_srcdir)/include/ruby.h
+numeric.$(OBJEXT): $(top_srcdir)/internal/array.h
+numeric.$(OBJEXT): $(top_srcdir)/internal/bignum.h
+numeric.$(OBJEXT): $(top_srcdir)/internal/bits.h
+numeric.$(OBJEXT): $(top_srcdir)/internal/class.h
+numeric.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+numeric.$(OBJEXT): $(top_srcdir)/internal/complex.h
+numeric.$(OBJEXT): $(top_srcdir)/internal/enumerator.h
+numeric.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
+numeric.$(OBJEXT): $(top_srcdir)/internal/gc.h
+numeric.$(OBJEXT): $(top_srcdir)/internal/hash.h
+numeric.$(OBJEXT): $(top_srcdir)/internal/numeric.h
+numeric.$(OBJEXT): $(top_srcdir)/internal/object.h
+numeric.$(OBJEXT): $(top_srcdir)/internal/rational.h
+numeric.$(OBJEXT): $(top_srcdir)/internal/serial.h
+numeric.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+numeric.$(OBJEXT): $(top_srcdir)/internal/util.h
+numeric.$(OBJEXT): $(top_srcdir)/internal/variable.h
+numeric.$(OBJEXT): $(top_srcdir)/internal/vm.h
+numeric.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+numeric.$(OBJEXT): {$(VPATH)}assert.h
+numeric.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+numeric.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+numeric.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+numeric.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+numeric.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+numeric.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+numeric.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+numeric.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+numeric.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
+numeric.$(OBJEXT): {$(VPATH)}builtin.h
 numeric.$(OBJEXT): {$(VPATH)}config.h
+numeric.$(OBJEXT): {$(VPATH)}constant.h
 numeric.$(OBJEXT): {$(VPATH)}defines.h
 numeric.$(OBJEXT): {$(VPATH)}encoding.h
 numeric.$(OBJEXT): {$(VPATH)}id.h
+numeric.$(OBJEXT): {$(VPATH)}id_table.h
+numeric.$(OBJEXT): {$(VPATH)}integer.rb
+numeric.$(OBJEXT): {$(VPATH)}integer.rbinc
 numeric.$(OBJEXT): {$(VPATH)}intern.h
 numeric.$(OBJEXT): {$(VPATH)}internal.h
-numeric.$(OBJEXT): {$(VPATH)}io.h
+numeric.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+numeric.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+numeric.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+numeric.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+numeric.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+numeric.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+numeric.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+numeric.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+numeric.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+numeric.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+numeric.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+numeric.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+numeric.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+numeric.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+numeric.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+numeric.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+numeric.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+numeric.$(OBJEXT): {$(VPATH)}internal/assume.h
+numeric.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+numeric.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+numeric.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+numeric.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+numeric.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+numeric.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+numeric.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+numeric.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+numeric.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+numeric.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+numeric.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+numeric.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+numeric.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+numeric.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+numeric.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+numeric.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+numeric.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+numeric.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+numeric.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+numeric.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+numeric.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+numeric.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+numeric.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+numeric.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+numeric.$(OBJEXT): {$(VPATH)}internal/cast.h
+numeric.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+numeric.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+numeric.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+numeric.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+numeric.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+numeric.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+numeric.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+numeric.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+numeric.$(OBJEXT): {$(VPATH)}internal/config.h
+numeric.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+numeric.$(OBJEXT): {$(VPATH)}internal/core.h
+numeric.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+numeric.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+numeric.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+numeric.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+numeric.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+numeric.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+numeric.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+numeric.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+numeric.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+numeric.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+numeric.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+numeric.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+numeric.$(OBJEXT): {$(VPATH)}internal/ctype.h
+numeric.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+numeric.$(OBJEXT): {$(VPATH)}internal/dosish.h
+numeric.$(OBJEXT): {$(VPATH)}internal/error.h
+numeric.$(OBJEXT): {$(VPATH)}internal/eval.h
+numeric.$(OBJEXT): {$(VPATH)}internal/event.h
+numeric.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+numeric.$(OBJEXT): {$(VPATH)}internal/gc.h
+numeric.$(OBJEXT): {$(VPATH)}internal/glob.h
+numeric.$(OBJEXT): {$(VPATH)}internal/globals.h
+numeric.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+numeric.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+numeric.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+numeric.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+numeric.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+numeric.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+numeric.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+numeric.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+numeric.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+numeric.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+numeric.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+numeric.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+numeric.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+numeric.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+numeric.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+numeric.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+numeric.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+numeric.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+numeric.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+numeric.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+numeric.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+numeric.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+numeric.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+numeric.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+numeric.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+numeric.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+numeric.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+numeric.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+numeric.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+numeric.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+numeric.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+numeric.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+numeric.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+numeric.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+numeric.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+numeric.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+numeric.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+numeric.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+numeric.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+numeric.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+numeric.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+numeric.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+numeric.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+numeric.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+numeric.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+numeric.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+numeric.$(OBJEXT): {$(VPATH)}internal/iterator.h
+numeric.$(OBJEXT): {$(VPATH)}internal/memory.h
+numeric.$(OBJEXT): {$(VPATH)}internal/method.h
+numeric.$(OBJEXT): {$(VPATH)}internal/module.h
+numeric.$(OBJEXT): {$(VPATH)}internal/newobj.h
+numeric.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+numeric.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+numeric.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+numeric.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+numeric.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+numeric.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+numeric.$(OBJEXT): {$(VPATH)}internal/symbol.h
+numeric.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+numeric.$(OBJEXT): {$(VPATH)}internal/value.h
+numeric.$(OBJEXT): {$(VPATH)}internal/value_type.h
+numeric.$(OBJEXT): {$(VPATH)}internal/variable.h
+numeric.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+numeric.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 numeric.$(OBJEXT): {$(VPATH)}missing.h
 numeric.$(OBJEXT): {$(VPATH)}numeric.c
+numeric.$(OBJEXT): {$(VPATH)}onigmo.h
 numeric.$(OBJEXT): {$(VPATH)}oniguruma.h
+numeric.$(OBJEXT): {$(VPATH)}ruby_assert.h
 numeric.$(OBJEXT): {$(VPATH)}st.h
 numeric.$(OBJEXT): {$(VPATH)}subst.h
 numeric.$(OBJEXT): {$(VPATH)}util.h
+object.$(OBJEXT): $(hdrdir)/ruby.h
 object.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-object.$(OBJEXT): $(top_srcdir)/include/ruby.h
+object.$(OBJEXT): $(top_srcdir)/internal/array.h
+object.$(OBJEXT): $(top_srcdir)/internal/bignum.h
+object.$(OBJEXT): $(top_srcdir)/internal/bits.h
+object.$(OBJEXT): $(top_srcdir)/internal/class.h
+object.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+object.$(OBJEXT): $(top_srcdir)/internal/error.h
+object.$(OBJEXT): $(top_srcdir)/internal/eval.h
+object.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
+object.$(OBJEXT): $(top_srcdir)/internal/gc.h
+object.$(OBJEXT): $(top_srcdir)/internal/inits.h
+object.$(OBJEXT): $(top_srcdir)/internal/numeric.h
+object.$(OBJEXT): $(top_srcdir)/internal/object.h
+object.$(OBJEXT): $(top_srcdir)/internal/serial.h
+object.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+object.$(OBJEXT): $(top_srcdir)/internal/string.h
+object.$(OBJEXT): $(top_srcdir)/internal/struct.h
+object.$(OBJEXT): $(top_srcdir)/internal/symbol.h
+object.$(OBJEXT): $(top_srcdir)/internal/variable.h
+object.$(OBJEXT): $(top_srcdir)/internal/vm.h
+object.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+object.$(OBJEXT): {$(VPATH)}assert.h
+object.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+object.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+object.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+object.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+object.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+object.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+object.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+object.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+object.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
+object.$(OBJEXT): {$(VPATH)}builtin.h
 object.$(OBJEXT): {$(VPATH)}config.h
 object.$(OBJEXT): {$(VPATH)}constant.h
 object.$(OBJEXT): {$(VPATH)}defines.h
 object.$(OBJEXT): {$(VPATH)}encoding.h
 object.$(OBJEXT): {$(VPATH)}id.h
+object.$(OBJEXT): {$(VPATH)}id_table.h
 object.$(OBJEXT): {$(VPATH)}intern.h
 object.$(OBJEXT): {$(VPATH)}internal.h
-object.$(OBJEXT): {$(VPATH)}io.h
+object.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+object.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+object.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+object.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+object.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+object.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+object.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+object.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+object.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+object.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+object.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+object.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+object.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+object.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+object.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+object.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+object.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+object.$(OBJEXT): {$(VPATH)}internal/assume.h
+object.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+object.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+object.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+object.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+object.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+object.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+object.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+object.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+object.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+object.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+object.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+object.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+object.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+object.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+object.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+object.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+object.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+object.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+object.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+object.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+object.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+object.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+object.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+object.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+object.$(OBJEXT): {$(VPATH)}internal/cast.h
+object.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+object.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+object.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+object.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+object.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+object.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+object.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+object.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+object.$(OBJEXT): {$(VPATH)}internal/config.h
+object.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+object.$(OBJEXT): {$(VPATH)}internal/core.h
+object.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+object.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+object.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+object.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+object.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+object.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+object.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+object.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+object.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+object.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+object.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+object.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+object.$(OBJEXT): {$(VPATH)}internal/ctype.h
+object.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+object.$(OBJEXT): {$(VPATH)}internal/dosish.h
+object.$(OBJEXT): {$(VPATH)}internal/error.h
+object.$(OBJEXT): {$(VPATH)}internal/eval.h
+object.$(OBJEXT): {$(VPATH)}internal/event.h
+object.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+object.$(OBJEXT): {$(VPATH)}internal/gc.h
+object.$(OBJEXT): {$(VPATH)}internal/glob.h
+object.$(OBJEXT): {$(VPATH)}internal/globals.h
+object.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+object.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+object.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+object.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+object.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+object.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+object.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+object.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+object.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+object.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+object.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+object.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+object.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+object.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+object.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+object.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+object.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+object.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+object.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+object.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+object.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+object.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+object.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+object.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+object.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+object.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+object.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+object.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+object.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+object.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+object.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+object.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+object.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+object.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+object.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+object.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+object.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+object.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+object.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+object.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+object.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+object.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+object.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+object.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+object.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+object.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+object.$(OBJEXT): {$(VPATH)}internal/iterator.h
+object.$(OBJEXT): {$(VPATH)}internal/memory.h
+object.$(OBJEXT): {$(VPATH)}internal/method.h
+object.$(OBJEXT): {$(VPATH)}internal/module.h
+object.$(OBJEXT): {$(VPATH)}internal/newobj.h
+object.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+object.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+object.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+object.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+object.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+object.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+object.$(OBJEXT): {$(VPATH)}internal/symbol.h
+object.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+object.$(OBJEXT): {$(VPATH)}internal/value.h
+object.$(OBJEXT): {$(VPATH)}internal/value_type.h
+object.$(OBJEXT): {$(VPATH)}internal/variable.h
+object.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+object.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
+object.$(OBJEXT): {$(VPATH)}kernel.rb
+object.$(OBJEXT): {$(VPATH)}kernel.rbinc
 object.$(OBJEXT): {$(VPATH)}missing.h
 object.$(OBJEXT): {$(VPATH)}object.c
+object.$(OBJEXT): {$(VPATH)}onigmo.h
 object.$(OBJEXT): {$(VPATH)}oniguruma.h
 object.$(OBJEXT): {$(VPATH)}probes.dmyh
 object.$(OBJEXT): {$(VPATH)}probes.h
 object.$(OBJEXT): {$(VPATH)}st.h
 object.$(OBJEXT): {$(VPATH)}subst.h
 object.$(OBJEXT): {$(VPATH)}util.h
-object.$(OBJEXT): {$(VPATH)}vm_opts.h
+pack.$(OBJEXT): $(hdrdir)/ruby.h
 pack.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-pack.$(OBJEXT): $(top_srcdir)/include/ruby.h
+pack.$(OBJEXT): $(top_srcdir)/internal/array.h
+pack.$(OBJEXT): $(top_srcdir)/internal/bits.h
+pack.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+pack.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+pack.$(OBJEXT): $(top_srcdir)/internal/string.h
+pack.$(OBJEXT): $(top_srcdir)/internal/symbol.h
+pack.$(OBJEXT): $(top_srcdir)/internal/util.h
+pack.$(OBJEXT): $(top_srcdir)/internal/variable.h
+pack.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+pack.$(OBJEXT): {$(VPATH)}assert.h
+pack.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+pack.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+pack.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+pack.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+pack.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+pack.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+pack.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+pack.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+pack.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
+pack.$(OBJEXT): {$(VPATH)}builtin.h
 pack.$(OBJEXT): {$(VPATH)}config.h
+pack.$(OBJEXT): {$(VPATH)}constant.h
 pack.$(OBJEXT): {$(VPATH)}defines.h
 pack.$(OBJEXT): {$(VPATH)}encoding.h
+pack.$(OBJEXT): {$(VPATH)}id_table.h
 pack.$(OBJEXT): {$(VPATH)}intern.h
 pack.$(OBJEXT): {$(VPATH)}internal.h
-pack.$(OBJEXT): {$(VPATH)}io.h
+pack.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+pack.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+pack.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+pack.$(OBJEXT): {$(VPATH)}internal/assume.h
+pack.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+pack.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+pack.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+pack.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+pack.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+pack.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+pack.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+pack.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+pack.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+pack.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+pack.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+pack.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+pack.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+pack.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+pack.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+pack.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+pack.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+pack.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+pack.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+pack.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+pack.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+pack.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+pack.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+pack.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+pack.$(OBJEXT): {$(VPATH)}internal/cast.h
+pack.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+pack.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+pack.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+pack.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+pack.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+pack.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+pack.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+pack.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+pack.$(OBJEXT): {$(VPATH)}internal/config.h
+pack.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+pack.$(OBJEXT): {$(VPATH)}internal/core.h
+pack.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+pack.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+pack.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+pack.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+pack.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+pack.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+pack.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+pack.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+pack.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+pack.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+pack.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+pack.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+pack.$(OBJEXT): {$(VPATH)}internal/ctype.h
+pack.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+pack.$(OBJEXT): {$(VPATH)}internal/dosish.h
+pack.$(OBJEXT): {$(VPATH)}internal/error.h
+pack.$(OBJEXT): {$(VPATH)}internal/eval.h
+pack.$(OBJEXT): {$(VPATH)}internal/event.h
+pack.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+pack.$(OBJEXT): {$(VPATH)}internal/gc.h
+pack.$(OBJEXT): {$(VPATH)}internal/glob.h
+pack.$(OBJEXT): {$(VPATH)}internal/globals.h
+pack.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+pack.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+pack.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+pack.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+pack.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+pack.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+pack.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+pack.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+pack.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+pack.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+pack.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+pack.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+pack.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+pack.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+pack.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+pack.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+pack.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+pack.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+pack.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+pack.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+pack.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+pack.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+pack.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+pack.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+pack.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+pack.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+pack.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+pack.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+pack.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+pack.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+pack.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+pack.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+pack.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+pack.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+pack.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+pack.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+pack.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+pack.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+pack.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+pack.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+pack.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+pack.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+pack.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+pack.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+pack.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+pack.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+pack.$(OBJEXT): {$(VPATH)}internal/iterator.h
+pack.$(OBJEXT): {$(VPATH)}internal/memory.h
+pack.$(OBJEXT): {$(VPATH)}internal/method.h
+pack.$(OBJEXT): {$(VPATH)}internal/module.h
+pack.$(OBJEXT): {$(VPATH)}internal/newobj.h
+pack.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+pack.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+pack.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+pack.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+pack.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+pack.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+pack.$(OBJEXT): {$(VPATH)}internal/symbol.h
+pack.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+pack.$(OBJEXT): {$(VPATH)}internal/value.h
+pack.$(OBJEXT): {$(VPATH)}internal/value_type.h
+pack.$(OBJEXT): {$(VPATH)}internal/variable.h
+pack.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+pack.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 pack.$(OBJEXT): {$(VPATH)}missing.h
+pack.$(OBJEXT): {$(VPATH)}onigmo.h
 pack.$(OBJEXT): {$(VPATH)}oniguruma.h
 pack.$(OBJEXT): {$(VPATH)}pack.c
+pack.$(OBJEXT): {$(VPATH)}pack.rbinc
 pack.$(OBJEXT): {$(VPATH)}st.h
 pack.$(OBJEXT): {$(VPATH)}subst.h
+parse.$(OBJEXT): $(hdrdir)/ruby.h
 parse.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-parse.$(OBJEXT): $(top_srcdir)/include/ruby.h
+parse.$(OBJEXT): $(top_srcdir)/internal/array.h
+parse.$(OBJEXT): $(top_srcdir)/internal/bignum.h
+parse.$(OBJEXT): $(top_srcdir)/internal/bits.h
+parse.$(OBJEXT): $(top_srcdir)/internal/compile.h
+parse.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+parse.$(OBJEXT): $(top_srcdir)/internal/complex.h
+parse.$(OBJEXT): $(top_srcdir)/internal/error.h
+parse.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
+parse.$(OBJEXT): $(top_srcdir)/internal/gc.h
+parse.$(OBJEXT): $(top_srcdir)/internal/hash.h
+parse.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+parse.$(OBJEXT): $(top_srcdir)/internal/io.h
+parse.$(OBJEXT): $(top_srcdir)/internal/numeric.h
+parse.$(OBJEXT): $(top_srcdir)/internal/parse.h
+parse.$(OBJEXT): $(top_srcdir)/internal/rational.h
+parse.$(OBJEXT): $(top_srcdir)/internal/re.h
+parse.$(OBJEXT): $(top_srcdir)/internal/serial.h
+parse.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+parse.$(OBJEXT): $(top_srcdir)/internal/string.h
+parse.$(OBJEXT): $(top_srcdir)/internal/symbol.h
+parse.$(OBJEXT): $(top_srcdir)/internal/thread.h
+parse.$(OBJEXT): $(top_srcdir)/internal/util.h
+parse.$(OBJEXT): $(top_srcdir)/internal/variable.h
+parse.$(OBJEXT): $(top_srcdir)/internal/vm.h
+parse.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+parse.$(OBJEXT): {$(VPATH)}assert.h
+parse.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+parse.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+parse.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+parse.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+parse.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+parse.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+parse.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+parse.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+parse.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 parse.$(OBJEXT): {$(VPATH)}config.h
+parse.$(OBJEXT): {$(VPATH)}constant.h
 parse.$(OBJEXT): {$(VPATH)}defines.h
 parse.$(OBJEXT): {$(VPATH)}defs/keywords
 parse.$(OBJEXT): {$(VPATH)}encoding.h
 parse.$(OBJEXT): {$(VPATH)}id.h
+parse.$(OBJEXT): {$(VPATH)}id_table.h
 parse.$(OBJEXT): {$(VPATH)}intern.h
 parse.$(OBJEXT): {$(VPATH)}internal.h
+parse.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+parse.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+parse.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+parse.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+parse.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+parse.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+parse.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+parse.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+parse.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+parse.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+parse.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+parse.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+parse.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+parse.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+parse.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+parse.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+parse.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+parse.$(OBJEXT): {$(VPATH)}internal/assume.h
+parse.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+parse.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+parse.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+parse.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+parse.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+parse.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+parse.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+parse.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+parse.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+parse.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+parse.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+parse.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+parse.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+parse.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+parse.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+parse.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+parse.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+parse.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+parse.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+parse.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+parse.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+parse.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+parse.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+parse.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+parse.$(OBJEXT): {$(VPATH)}internal/cast.h
+parse.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+parse.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+parse.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+parse.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+parse.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+parse.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+parse.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+parse.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+parse.$(OBJEXT): {$(VPATH)}internal/config.h
+parse.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+parse.$(OBJEXT): {$(VPATH)}internal/core.h
+parse.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+parse.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+parse.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+parse.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+parse.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+parse.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+parse.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+parse.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+parse.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+parse.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+parse.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+parse.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+parse.$(OBJEXT): {$(VPATH)}internal/ctype.h
+parse.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+parse.$(OBJEXT): {$(VPATH)}internal/dosish.h
+parse.$(OBJEXT): {$(VPATH)}internal/error.h
+parse.$(OBJEXT): {$(VPATH)}internal/eval.h
+parse.$(OBJEXT): {$(VPATH)}internal/event.h
+parse.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+parse.$(OBJEXT): {$(VPATH)}internal/gc.h
+parse.$(OBJEXT): {$(VPATH)}internal/glob.h
+parse.$(OBJEXT): {$(VPATH)}internal/globals.h
+parse.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+parse.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+parse.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+parse.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+parse.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+parse.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+parse.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+parse.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+parse.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+parse.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+parse.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+parse.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+parse.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+parse.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+parse.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+parse.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+parse.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+parse.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+parse.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+parse.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+parse.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+parse.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+parse.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+parse.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+parse.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+parse.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+parse.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+parse.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+parse.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+parse.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+parse.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+parse.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+parse.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+parse.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+parse.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+parse.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+parse.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+parse.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+parse.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+parse.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+parse.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+parse.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+parse.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+parse.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+parse.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+parse.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+parse.$(OBJEXT): {$(VPATH)}internal/iterator.h
+parse.$(OBJEXT): {$(VPATH)}internal/memory.h
+parse.$(OBJEXT): {$(VPATH)}internal/method.h
+parse.$(OBJEXT): {$(VPATH)}internal/module.h
+parse.$(OBJEXT): {$(VPATH)}internal/newobj.h
+parse.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+parse.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+parse.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+parse.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+parse.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+parse.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+parse.$(OBJEXT): {$(VPATH)}internal/symbol.h
+parse.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+parse.$(OBJEXT): {$(VPATH)}internal/value.h
+parse.$(OBJEXT): {$(VPATH)}internal/value_type.h
+parse.$(OBJEXT): {$(VPATH)}internal/variable.h
+parse.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+parse.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 parse.$(OBJEXT): {$(VPATH)}io.h
 parse.$(OBJEXT): {$(VPATH)}lex.c
 parse.$(OBJEXT): {$(VPATH)}missing.h
 parse.$(OBJEXT): {$(VPATH)}node.h
+parse.$(OBJEXT): {$(VPATH)}onigmo.h
 parse.$(OBJEXT): {$(VPATH)}oniguruma.h
 parse.$(OBJEXT): {$(VPATH)}parse.c
 parse.$(OBJEXT): {$(VPATH)}parse.h
 parse.$(OBJEXT): {$(VPATH)}parse.y
 parse.$(OBJEXT): {$(VPATH)}probes.dmyh
 parse.$(OBJEXT): {$(VPATH)}probes.h
+parse.$(OBJEXT): {$(VPATH)}ractor.h
 parse.$(OBJEXT): {$(VPATH)}regenc.h
 parse.$(OBJEXT): {$(VPATH)}regex.h
+parse.$(OBJEXT): {$(VPATH)}ruby_assert.h
 parse.$(OBJEXT): {$(VPATH)}st.h
 parse.$(OBJEXT): {$(VPATH)}subst.h
 parse.$(OBJEXT): {$(VPATH)}symbol.h
 parse.$(OBJEXT): {$(VPATH)}util.h
-parse.$(OBJEXT): {$(VPATH)}vm_opts.h
 prelude.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 prelude.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 prelude.$(OBJEXT): $(CCAN_DIR)/list/list.h
 prelude.$(OBJEXT): $(CCAN_DIR)/str/str.h
+prelude.$(OBJEXT): $(hdrdir)/ruby.h
 prelude.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-prelude.$(OBJEXT): $(top_srcdir)/include/ruby.h
+prelude.$(OBJEXT): {$(VPATH)}assert.h
+prelude.$(OBJEXT): {$(VPATH)}atomic.h
 prelude.$(OBJEXT): {$(VPATH)}config.h
 prelude.$(OBJEXT): {$(VPATH)}defines.h
-prelude.$(OBJEXT): {$(VPATH)}encoding.h
+prelude.$(OBJEXT): {$(VPATH)}gem_prelude.rb
 prelude.$(OBJEXT): {$(VPATH)}id.h
 prelude.$(OBJEXT): {$(VPATH)}intern.h
 prelude.$(OBJEXT): {$(VPATH)}internal.h
-prelude.$(OBJEXT): {$(VPATH)}io.h
 prelude.$(OBJEXT): {$(VPATH)}iseq.h
 prelude.$(OBJEXT): {$(VPATH)}method.h
 prelude.$(OBJEXT): {$(VPATH)}missing.h
 prelude.$(OBJEXT): {$(VPATH)}node.h
-prelude.$(OBJEXT): {$(VPATH)}oniguruma.h
 prelude.$(OBJEXT): {$(VPATH)}prelude.c
 prelude.$(OBJEXT): {$(VPATH)}ruby_assert.h
 prelude.$(OBJEXT): {$(VPATH)}ruby_atomic.h
@@ -1954,27 +9816,193 @@ prelude.$(OBJEXT): {$(VPATH)}subst.h
 prelude.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 prelude.$(OBJEXT): {$(VPATH)}thread_native.h
 prelude.$(OBJEXT): {$(VPATH)}vm_core.h
-prelude.$(OBJEXT): {$(VPATH)}vm_debug.h
 prelude.$(OBJEXT): {$(VPATH)}vm_opts.h
 proc.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 proc.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 proc.$(OBJEXT): $(CCAN_DIR)/list/list.h
 proc.$(OBJEXT): $(CCAN_DIR)/str/str.h
+proc.$(OBJEXT): $(hdrdir)/ruby.h
 proc.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-proc.$(OBJEXT): $(top_srcdir)/include/ruby.h
+proc.$(OBJEXT): $(top_srcdir)/internal/array.h
+proc.$(OBJEXT): $(top_srcdir)/internal/class.h
+proc.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+proc.$(OBJEXT): $(top_srcdir)/internal/error.h
+proc.$(OBJEXT): $(top_srcdir)/internal/eval.h
+proc.$(OBJEXT): $(top_srcdir)/internal/gc.h
+proc.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+proc.$(OBJEXT): $(top_srcdir)/internal/object.h
+proc.$(OBJEXT): $(top_srcdir)/internal/proc.h
+proc.$(OBJEXT): $(top_srcdir)/internal/serial.h
+proc.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+proc.$(OBJEXT): $(top_srcdir)/internal/string.h
+proc.$(OBJEXT): $(top_srcdir)/internal/symbol.h
+proc.$(OBJEXT): $(top_srcdir)/internal/vm.h
+proc.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+proc.$(OBJEXT): {$(VPATH)}assert.h
+proc.$(OBJEXT): {$(VPATH)}atomic.h
+proc.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+proc.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+proc.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+proc.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+proc.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+proc.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+proc.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+proc.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+proc.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 proc.$(OBJEXT): {$(VPATH)}config.h
 proc.$(OBJEXT): {$(VPATH)}defines.h
 proc.$(OBJEXT): {$(VPATH)}encoding.h
 proc.$(OBJEXT): {$(VPATH)}eval_intern.h
 proc.$(OBJEXT): {$(VPATH)}gc.h
 proc.$(OBJEXT): {$(VPATH)}id.h
+proc.$(OBJEXT): {$(VPATH)}id_table.h
 proc.$(OBJEXT): {$(VPATH)}intern.h
 proc.$(OBJEXT): {$(VPATH)}internal.h
-proc.$(OBJEXT): {$(VPATH)}io.h
+proc.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+proc.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+proc.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+proc.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+proc.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+proc.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+proc.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+proc.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+proc.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+proc.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+proc.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+proc.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+proc.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+proc.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+proc.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+proc.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+proc.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+proc.$(OBJEXT): {$(VPATH)}internal/assume.h
+proc.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+proc.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+proc.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+proc.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+proc.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+proc.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+proc.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+proc.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+proc.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+proc.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+proc.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+proc.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+proc.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+proc.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+proc.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+proc.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+proc.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+proc.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+proc.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+proc.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+proc.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+proc.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+proc.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+proc.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+proc.$(OBJEXT): {$(VPATH)}internal/cast.h
+proc.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+proc.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+proc.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+proc.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+proc.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+proc.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+proc.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+proc.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+proc.$(OBJEXT): {$(VPATH)}internal/config.h
+proc.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+proc.$(OBJEXT): {$(VPATH)}internal/core.h
+proc.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+proc.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+proc.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+proc.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+proc.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+proc.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+proc.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+proc.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+proc.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+proc.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+proc.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+proc.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+proc.$(OBJEXT): {$(VPATH)}internal/ctype.h
+proc.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+proc.$(OBJEXT): {$(VPATH)}internal/dosish.h
+proc.$(OBJEXT): {$(VPATH)}internal/error.h
+proc.$(OBJEXT): {$(VPATH)}internal/eval.h
+proc.$(OBJEXT): {$(VPATH)}internal/event.h
+proc.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+proc.$(OBJEXT): {$(VPATH)}internal/gc.h
+proc.$(OBJEXT): {$(VPATH)}internal/glob.h
+proc.$(OBJEXT): {$(VPATH)}internal/globals.h
+proc.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+proc.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+proc.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+proc.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+proc.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+proc.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+proc.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+proc.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+proc.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+proc.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+proc.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+proc.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+proc.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+proc.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+proc.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+proc.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+proc.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+proc.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+proc.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+proc.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+proc.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+proc.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+proc.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+proc.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+proc.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+proc.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+proc.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+proc.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+proc.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+proc.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+proc.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+proc.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+proc.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+proc.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+proc.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+proc.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+proc.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+proc.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+proc.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+proc.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+proc.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+proc.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+proc.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+proc.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+proc.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+proc.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+proc.$(OBJEXT): {$(VPATH)}internal/iterator.h
+proc.$(OBJEXT): {$(VPATH)}internal/memory.h
+proc.$(OBJEXT): {$(VPATH)}internal/method.h
+proc.$(OBJEXT): {$(VPATH)}internal/module.h
+proc.$(OBJEXT): {$(VPATH)}internal/newobj.h
+proc.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+proc.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+proc.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+proc.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+proc.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+proc.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+proc.$(OBJEXT): {$(VPATH)}internal/symbol.h
+proc.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+proc.$(OBJEXT): {$(VPATH)}internal/value.h
+proc.$(OBJEXT): {$(VPATH)}internal/value_type.h
+proc.$(OBJEXT): {$(VPATH)}internal/variable.h
+proc.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+proc.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 proc.$(OBJEXT): {$(VPATH)}iseq.h
 proc.$(OBJEXT): {$(VPATH)}method.h
 proc.$(OBJEXT): {$(VPATH)}missing.h
 proc.$(OBJEXT): {$(VPATH)}node.h
+proc.$(OBJEXT): {$(VPATH)}onigmo.h
 proc.$(OBJEXT): {$(VPATH)}oniguruma.h
 proc.$(OBJEXT): {$(VPATH)}proc.c
 proc.$(OBJEXT): {$(VPATH)}ruby_assert.h
@@ -1984,27 +10012,205 @@ proc.$(OBJEXT): {$(VPATH)}subst.h
 proc.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 proc.$(OBJEXT): {$(VPATH)}thread_native.h
 proc.$(OBJEXT): {$(VPATH)}vm_core.h
-proc.$(OBJEXT): {$(VPATH)}vm_debug.h
 proc.$(OBJEXT): {$(VPATH)}vm_opts.h
 process.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 process.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 process.$(OBJEXT): $(CCAN_DIR)/list/list.h
 process.$(OBJEXT): $(CCAN_DIR)/str/str.h
+process.$(OBJEXT): $(hdrdir)/ruby.h
 process.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-process.$(OBJEXT): $(top_srcdir)/include/ruby.h
+process.$(OBJEXT): $(top_srcdir)/internal/array.h
+process.$(OBJEXT): $(top_srcdir)/internal/bits.h
+process.$(OBJEXT): $(top_srcdir)/internal/class.h
+process.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+process.$(OBJEXT): $(top_srcdir)/internal/dir.h
+process.$(OBJEXT): $(top_srcdir)/internal/error.h
+process.$(OBJEXT): $(top_srcdir)/internal/eval.h
+process.$(OBJEXT): $(top_srcdir)/internal/gc.h
+process.$(OBJEXT): $(top_srcdir)/internal/hash.h
+process.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+process.$(OBJEXT): $(top_srcdir)/internal/object.h
+process.$(OBJEXT): $(top_srcdir)/internal/process.h
+process.$(OBJEXT): $(top_srcdir)/internal/scheduler.h
+process.$(OBJEXT): $(top_srcdir)/internal/serial.h
+process.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+process.$(OBJEXT): $(top_srcdir)/internal/string.h
+process.$(OBJEXT): $(top_srcdir)/internal/thread.h
+process.$(OBJEXT): $(top_srcdir)/internal/variable.h
+process.$(OBJEXT): $(top_srcdir)/internal/vm.h
+process.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+process.$(OBJEXT): {$(VPATH)}$(COROUTINE_H)
+process.$(OBJEXT): {$(VPATH)}assert.h
+process.$(OBJEXT): {$(VPATH)}atomic.h
+process.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+process.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+process.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+process.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+process.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+process.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+process.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+process.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+process.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 process.$(OBJEXT): {$(VPATH)}config.h
+process.$(OBJEXT): {$(VPATH)}constant.h
+process.$(OBJEXT): {$(VPATH)}debug_counter.h
 process.$(OBJEXT): {$(VPATH)}defines.h
 process.$(OBJEXT): {$(VPATH)}dln.h
 process.$(OBJEXT): {$(VPATH)}encoding.h
+process.$(OBJEXT): {$(VPATH)}hrtime.h
 process.$(OBJEXT): {$(VPATH)}id.h
+process.$(OBJEXT): {$(VPATH)}id_table.h
 process.$(OBJEXT): {$(VPATH)}intern.h
 process.$(OBJEXT): {$(VPATH)}internal.h
+process.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+process.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+process.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+process.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+process.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+process.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+process.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+process.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+process.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+process.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+process.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+process.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+process.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+process.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+process.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+process.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+process.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+process.$(OBJEXT): {$(VPATH)}internal/assume.h
+process.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+process.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+process.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+process.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+process.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+process.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+process.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+process.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+process.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+process.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+process.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+process.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+process.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+process.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+process.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+process.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+process.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+process.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+process.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+process.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+process.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+process.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+process.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+process.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+process.$(OBJEXT): {$(VPATH)}internal/cast.h
+process.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+process.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+process.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+process.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+process.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+process.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+process.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+process.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+process.$(OBJEXT): {$(VPATH)}internal/config.h
+process.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+process.$(OBJEXT): {$(VPATH)}internal/core.h
+process.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+process.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+process.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+process.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+process.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+process.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+process.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+process.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+process.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+process.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+process.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+process.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+process.$(OBJEXT): {$(VPATH)}internal/ctype.h
+process.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+process.$(OBJEXT): {$(VPATH)}internal/dosish.h
+process.$(OBJEXT): {$(VPATH)}internal/error.h
+process.$(OBJEXT): {$(VPATH)}internal/eval.h
+process.$(OBJEXT): {$(VPATH)}internal/event.h
+process.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+process.$(OBJEXT): {$(VPATH)}internal/gc.h
+process.$(OBJEXT): {$(VPATH)}internal/glob.h
+process.$(OBJEXT): {$(VPATH)}internal/globals.h
+process.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+process.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+process.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+process.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+process.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+process.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+process.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+process.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+process.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+process.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+process.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+process.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+process.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+process.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+process.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+process.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+process.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+process.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+process.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+process.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+process.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+process.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+process.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+process.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+process.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+process.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+process.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+process.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+process.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+process.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+process.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+process.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+process.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+process.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+process.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+process.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+process.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+process.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+process.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+process.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+process.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+process.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+process.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+process.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+process.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+process.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+process.$(OBJEXT): {$(VPATH)}internal/iterator.h
+process.$(OBJEXT): {$(VPATH)}internal/memory.h
+process.$(OBJEXT): {$(VPATH)}internal/method.h
+process.$(OBJEXT): {$(VPATH)}internal/module.h
+process.$(OBJEXT): {$(VPATH)}internal/newobj.h
+process.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+process.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+process.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+process.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+process.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+process.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+process.$(OBJEXT): {$(VPATH)}internal/symbol.h
+process.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+process.$(OBJEXT): {$(VPATH)}internal/value.h
+process.$(OBJEXT): {$(VPATH)}internal/value_type.h
+process.$(OBJEXT): {$(VPATH)}internal/variable.h
+process.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+process.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 process.$(OBJEXT): {$(VPATH)}io.h
 process.$(OBJEXT): {$(VPATH)}method.h
 process.$(OBJEXT): {$(VPATH)}missing.h
+process.$(OBJEXT): {$(VPATH)}mjit.h
 process.$(OBJEXT): {$(VPATH)}node.h
+process.$(OBJEXT): {$(VPATH)}onigmo.h
 process.$(OBJEXT): {$(VPATH)}oniguruma.h
 process.$(OBJEXT): {$(VPATH)}process.c
+process.$(OBJEXT): {$(VPATH)}ractor.h
 process.$(OBJEXT): {$(VPATH)}ruby_assert.h
 process.$(OBJEXT): {$(VPATH)}ruby_atomic.h
 process.$(OBJEXT): {$(VPATH)}st.h
@@ -2014,62 +10220,943 @@ process.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 process.$(OBJEXT): {$(VPATH)}thread_native.h
 process.$(OBJEXT): {$(VPATH)}util.h
 process.$(OBJEXT): {$(VPATH)}vm_core.h
-process.$(OBJEXT): {$(VPATH)}vm_debug.h
 process.$(OBJEXT): {$(VPATH)}vm_opts.h
+ractor.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+ractor.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+ractor.$(OBJEXT): $(CCAN_DIR)/list/list.h
+ractor.$(OBJEXT): $(CCAN_DIR)/str/str.h
+ractor.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+ractor.$(OBJEXT): $(top_srcdir)/internal/array.h
+ractor.$(OBJEXT): $(top_srcdir)/internal/bignum.h
+ractor.$(OBJEXT): $(top_srcdir)/internal/bits.h
+ractor.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+ractor.$(OBJEXT): $(top_srcdir)/internal/complex.h
+ractor.$(OBJEXT): $(top_srcdir)/internal/error.h
+ractor.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
+ractor.$(OBJEXT): $(top_srcdir)/internal/gc.h
+ractor.$(OBJEXT): $(top_srcdir)/internal/hash.h
+ractor.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+ractor.$(OBJEXT): $(top_srcdir)/internal/numeric.h
+ractor.$(OBJEXT): $(top_srcdir)/internal/rational.h
+ractor.$(OBJEXT): $(top_srcdir)/internal/serial.h
+ractor.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+ractor.$(OBJEXT): $(top_srcdir)/internal/string.h
+ractor.$(OBJEXT): $(top_srcdir)/internal/struct.h
+ractor.$(OBJEXT): $(top_srcdir)/internal/thread.h
+ractor.$(OBJEXT): $(top_srcdir)/internal/vm.h
+ractor.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+ractor.$(OBJEXT): {$(VPATH)}assert.h
+ractor.$(OBJEXT): {$(VPATH)}atomic.h
+ractor.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+ractor.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+ractor.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+ractor.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+ractor.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+ractor.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+ractor.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+ractor.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+ractor.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
+ractor.$(OBJEXT): {$(VPATH)}builtin.h
+ractor.$(OBJEXT): {$(VPATH)}config.h
+ractor.$(OBJEXT): {$(VPATH)}constant.h
+ractor.$(OBJEXT): {$(VPATH)}debug.h
+ractor.$(OBJEXT): {$(VPATH)}debug_counter.h
+ractor.$(OBJEXT): {$(VPATH)}defines.h
+ractor.$(OBJEXT): {$(VPATH)}encoding.h
+ractor.$(OBJEXT): {$(VPATH)}gc.h
+ractor.$(OBJEXT): {$(VPATH)}id.h
+ractor.$(OBJEXT): {$(VPATH)}id_table.h
+ractor.$(OBJEXT): {$(VPATH)}intern.h
+ractor.$(OBJEXT): {$(VPATH)}internal.h
+ractor.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+ractor.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+ractor.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+ractor.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+ractor.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+ractor.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+ractor.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+ractor.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+ractor.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+ractor.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+ractor.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+ractor.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+ractor.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+ractor.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+ractor.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+ractor.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+ractor.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+ractor.$(OBJEXT): {$(VPATH)}internal/assume.h
+ractor.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+ractor.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+ractor.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+ractor.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+ractor.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+ractor.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+ractor.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+ractor.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+ractor.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+ractor.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+ractor.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+ractor.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+ractor.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+ractor.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+ractor.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+ractor.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+ractor.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+ractor.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+ractor.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+ractor.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+ractor.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+ractor.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+ractor.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+ractor.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+ractor.$(OBJEXT): {$(VPATH)}internal/cast.h
+ractor.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+ractor.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+ractor.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+ractor.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+ractor.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+ractor.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+ractor.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+ractor.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+ractor.$(OBJEXT): {$(VPATH)}internal/config.h
+ractor.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+ractor.$(OBJEXT): {$(VPATH)}internal/core.h
+ractor.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+ractor.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+ractor.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+ractor.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+ractor.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+ractor.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+ractor.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+ractor.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+ractor.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+ractor.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+ractor.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+ractor.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+ractor.$(OBJEXT): {$(VPATH)}internal/ctype.h
+ractor.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+ractor.$(OBJEXT): {$(VPATH)}internal/dosish.h
+ractor.$(OBJEXT): {$(VPATH)}internal/error.h
+ractor.$(OBJEXT): {$(VPATH)}internal/eval.h
+ractor.$(OBJEXT): {$(VPATH)}internal/event.h
+ractor.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+ractor.$(OBJEXT): {$(VPATH)}internal/gc.h
+ractor.$(OBJEXT): {$(VPATH)}internal/glob.h
+ractor.$(OBJEXT): {$(VPATH)}internal/globals.h
+ractor.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+ractor.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+ractor.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+ractor.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+ractor.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+ractor.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+ractor.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+ractor.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+ractor.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+ractor.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+ractor.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+ractor.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+ractor.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+ractor.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+ractor.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+ractor.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+ractor.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+ractor.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+ractor.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+ractor.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+ractor.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+ractor.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+ractor.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+ractor.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+ractor.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+ractor.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+ractor.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+ractor.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+ractor.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+ractor.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+ractor.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+ractor.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+ractor.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+ractor.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+ractor.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+ractor.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+ractor.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+ractor.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+ractor.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+ractor.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+ractor.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+ractor.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+ractor.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+ractor.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+ractor.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+ractor.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+ractor.$(OBJEXT): {$(VPATH)}internal/iterator.h
+ractor.$(OBJEXT): {$(VPATH)}internal/memory.h
+ractor.$(OBJEXT): {$(VPATH)}internal/method.h
+ractor.$(OBJEXT): {$(VPATH)}internal/module.h
+ractor.$(OBJEXT): {$(VPATH)}internal/newobj.h
+ractor.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+ractor.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+ractor.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+ractor.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+ractor.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+ractor.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+ractor.$(OBJEXT): {$(VPATH)}internal/symbol.h
+ractor.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+ractor.$(OBJEXT): {$(VPATH)}internal/value.h
+ractor.$(OBJEXT): {$(VPATH)}internal/value_type.h
+ractor.$(OBJEXT): {$(VPATH)}internal/variable.h
+ractor.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+ractor.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
+ractor.$(OBJEXT): {$(VPATH)}method.h
+ractor.$(OBJEXT): {$(VPATH)}missing.h
+ractor.$(OBJEXT): {$(VPATH)}node.h
+ractor.$(OBJEXT): {$(VPATH)}onigmo.h
+ractor.$(OBJEXT): {$(VPATH)}oniguruma.h
+ractor.$(OBJEXT): {$(VPATH)}ractor.c
+ractor.$(OBJEXT): {$(VPATH)}ractor.h
+ractor.$(OBJEXT): {$(VPATH)}ractor.rb
+ractor.$(OBJEXT): {$(VPATH)}ractor.rbinc
+ractor.$(OBJEXT): {$(VPATH)}ractor_core.h
+ractor.$(OBJEXT): {$(VPATH)}ruby_assert.h
+ractor.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+ractor.$(OBJEXT): {$(VPATH)}st.h
+ractor.$(OBJEXT): {$(VPATH)}subst.h
+ractor.$(OBJEXT): {$(VPATH)}thread.h
+ractor.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+ractor.$(OBJEXT): {$(VPATH)}thread_native.h
+ractor.$(OBJEXT): {$(VPATH)}transient_heap.h
+ractor.$(OBJEXT): {$(VPATH)}variable.h
+ractor.$(OBJEXT): {$(VPATH)}vm_core.h
+ractor.$(OBJEXT): {$(VPATH)}vm_debug.h
+ractor.$(OBJEXT): {$(VPATH)}vm_opts.h
+ractor.$(OBJEXT): {$(VPATH)}vm_sync.h
+random.$(OBJEXT): $(hdrdir)/ruby.h
 random.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-random.$(OBJEXT): $(top_srcdir)/include/ruby.h
+random.$(OBJEXT): $(top_srcdir)/internal/array.h
+random.$(OBJEXT): $(top_srcdir)/internal/bignum.h
+random.$(OBJEXT): $(top_srcdir)/internal/bits.h
+random.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+random.$(OBJEXT): $(top_srcdir)/internal/error.h
+random.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
+random.$(OBJEXT): $(top_srcdir)/internal/numeric.h
+random.$(OBJEXT): $(top_srcdir)/internal/random.h
+random.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
+random.$(OBJEXT): $(top_srcdir)/internal/serial.h
+random.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+random.$(OBJEXT): $(top_srcdir)/internal/string.h
+random.$(OBJEXT): $(top_srcdir)/internal/variable.h
+random.$(OBJEXT): $(top_srcdir)/internal/vm.h
+random.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+random.$(OBJEXT): {$(VPATH)}assert.h
+random.$(OBJEXT): {$(VPATH)}atomic.h
+random.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+random.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+random.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+random.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+random.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+random.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+random.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+random.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+random.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 random.$(OBJEXT): {$(VPATH)}config.h
+random.$(OBJEXT): {$(VPATH)}constant.h
 random.$(OBJEXT): {$(VPATH)}defines.h
 random.$(OBJEXT): {$(VPATH)}encoding.h
+random.$(OBJEXT): {$(VPATH)}id_table.h
 random.$(OBJEXT): {$(VPATH)}intern.h
 random.$(OBJEXT): {$(VPATH)}internal.h
-random.$(OBJEXT): {$(VPATH)}io.h
+random.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+random.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+random.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+random.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+random.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+random.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+random.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+random.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+random.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+random.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+random.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+random.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+random.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+random.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+random.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+random.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+random.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+random.$(OBJEXT): {$(VPATH)}internal/assume.h
+random.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+random.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+random.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+random.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+random.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+random.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+random.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+random.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+random.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+random.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+random.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+random.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+random.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+random.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+random.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+random.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+random.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+random.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+random.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+random.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+random.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+random.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+random.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+random.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+random.$(OBJEXT): {$(VPATH)}internal/cast.h
+random.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+random.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+random.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+random.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+random.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+random.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+random.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+random.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+random.$(OBJEXT): {$(VPATH)}internal/config.h
+random.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+random.$(OBJEXT): {$(VPATH)}internal/core.h
+random.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+random.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+random.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+random.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+random.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+random.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+random.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+random.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+random.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+random.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+random.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+random.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+random.$(OBJEXT): {$(VPATH)}internal/ctype.h
+random.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+random.$(OBJEXT): {$(VPATH)}internal/dosish.h
+random.$(OBJEXT): {$(VPATH)}internal/error.h
+random.$(OBJEXT): {$(VPATH)}internal/eval.h
+random.$(OBJEXT): {$(VPATH)}internal/event.h
+random.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+random.$(OBJEXT): {$(VPATH)}internal/gc.h
+random.$(OBJEXT): {$(VPATH)}internal/glob.h
+random.$(OBJEXT): {$(VPATH)}internal/globals.h
+random.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+random.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+random.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+random.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+random.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+random.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+random.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+random.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+random.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+random.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+random.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+random.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+random.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+random.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+random.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+random.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+random.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+random.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+random.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+random.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+random.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+random.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+random.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+random.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+random.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+random.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+random.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+random.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+random.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+random.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+random.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+random.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+random.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+random.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+random.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+random.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+random.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+random.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+random.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+random.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+random.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+random.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+random.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+random.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+random.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+random.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+random.$(OBJEXT): {$(VPATH)}internal/iterator.h
+random.$(OBJEXT): {$(VPATH)}internal/memory.h
+random.$(OBJEXT): {$(VPATH)}internal/method.h
+random.$(OBJEXT): {$(VPATH)}internal/module.h
+random.$(OBJEXT): {$(VPATH)}internal/newobj.h
+random.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+random.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+random.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+random.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+random.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+random.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+random.$(OBJEXT): {$(VPATH)}internal/symbol.h
+random.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+random.$(OBJEXT): {$(VPATH)}internal/value.h
+random.$(OBJEXT): {$(VPATH)}internal/value_type.h
+random.$(OBJEXT): {$(VPATH)}internal/variable.h
+random.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+random.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 random.$(OBJEXT): {$(VPATH)}missing.h
+random.$(OBJEXT): {$(VPATH)}mt19937.c
+random.$(OBJEXT): {$(VPATH)}onigmo.h
 random.$(OBJEXT): {$(VPATH)}oniguruma.h
+random.$(OBJEXT): {$(VPATH)}ractor.h
 random.$(OBJEXT): {$(VPATH)}random.c
+random.$(OBJEXT): {$(VPATH)}random.h
 random.$(OBJEXT): {$(VPATH)}ruby_atomic.h
 random.$(OBJEXT): {$(VPATH)}siphash.c
 random.$(OBJEXT): {$(VPATH)}siphash.h
 random.$(OBJEXT): {$(VPATH)}st.h
 random.$(OBJEXT): {$(VPATH)}subst.h
+range.$(OBJEXT): $(hdrdir)/ruby.h
 range.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-range.$(OBJEXT): $(top_srcdir)/include/ruby.h
+range.$(OBJEXT): $(top_srcdir)/internal/array.h
+range.$(OBJEXT): $(top_srcdir)/internal/bignum.h
+range.$(OBJEXT): $(top_srcdir)/internal/bits.h
+range.$(OBJEXT): $(top_srcdir)/internal/compar.h
+range.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+range.$(OBJEXT): $(top_srcdir)/internal/enum.h
+range.$(OBJEXT): $(top_srcdir)/internal/enumerator.h
+range.$(OBJEXT): $(top_srcdir)/internal/error.h
+range.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
+range.$(OBJEXT): $(top_srcdir)/internal/gc.h
+range.$(OBJEXT): $(top_srcdir)/internal/numeric.h
+range.$(OBJEXT): $(top_srcdir)/internal/range.h
+range.$(OBJEXT): $(top_srcdir)/internal/serial.h
+range.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+range.$(OBJEXT): $(top_srcdir)/internal/string.h
+range.$(OBJEXT): $(top_srcdir)/internal/struct.h
+range.$(OBJEXT): $(top_srcdir)/internal/vm.h
+range.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+range.$(OBJEXT): {$(VPATH)}assert.h
+range.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+range.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+range.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+range.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+range.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+range.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+range.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+range.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+range.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 range.$(OBJEXT): {$(VPATH)}config.h
 range.$(OBJEXT): {$(VPATH)}defines.h
 range.$(OBJEXT): {$(VPATH)}encoding.h
 range.$(OBJEXT): {$(VPATH)}id.h
 range.$(OBJEXT): {$(VPATH)}intern.h
 range.$(OBJEXT): {$(VPATH)}internal.h
-range.$(OBJEXT): {$(VPATH)}io.h
+range.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+range.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+range.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+range.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+range.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+range.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+range.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+range.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+range.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+range.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+range.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+range.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+range.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+range.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+range.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+range.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+range.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+range.$(OBJEXT): {$(VPATH)}internal/assume.h
+range.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+range.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+range.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+range.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+range.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+range.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+range.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+range.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+range.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+range.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+range.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+range.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+range.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+range.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+range.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+range.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+range.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+range.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+range.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+range.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+range.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+range.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+range.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+range.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+range.$(OBJEXT): {$(VPATH)}internal/cast.h
+range.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+range.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+range.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+range.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+range.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+range.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+range.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+range.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+range.$(OBJEXT): {$(VPATH)}internal/config.h
+range.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+range.$(OBJEXT): {$(VPATH)}internal/core.h
+range.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+range.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+range.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+range.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+range.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+range.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+range.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+range.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+range.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+range.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+range.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+range.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+range.$(OBJEXT): {$(VPATH)}internal/ctype.h
+range.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+range.$(OBJEXT): {$(VPATH)}internal/dosish.h
+range.$(OBJEXT): {$(VPATH)}internal/error.h
+range.$(OBJEXT): {$(VPATH)}internal/eval.h
+range.$(OBJEXT): {$(VPATH)}internal/event.h
+range.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+range.$(OBJEXT): {$(VPATH)}internal/gc.h
+range.$(OBJEXT): {$(VPATH)}internal/glob.h
+range.$(OBJEXT): {$(VPATH)}internal/globals.h
+range.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+range.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+range.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+range.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+range.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+range.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+range.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+range.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+range.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+range.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+range.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+range.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+range.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+range.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+range.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+range.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+range.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+range.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+range.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+range.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+range.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+range.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+range.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+range.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+range.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+range.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+range.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+range.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+range.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+range.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+range.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+range.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+range.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+range.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+range.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+range.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+range.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+range.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+range.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+range.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+range.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+range.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+range.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+range.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+range.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+range.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+range.$(OBJEXT): {$(VPATH)}internal/iterator.h
+range.$(OBJEXT): {$(VPATH)}internal/memory.h
+range.$(OBJEXT): {$(VPATH)}internal/method.h
+range.$(OBJEXT): {$(VPATH)}internal/module.h
+range.$(OBJEXT): {$(VPATH)}internal/newobj.h
+range.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+range.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+range.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+range.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+range.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+range.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+range.$(OBJEXT): {$(VPATH)}internal/symbol.h
+range.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+range.$(OBJEXT): {$(VPATH)}internal/value.h
+range.$(OBJEXT): {$(VPATH)}internal/value_type.h
+range.$(OBJEXT): {$(VPATH)}internal/variable.h
+range.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+range.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 range.$(OBJEXT): {$(VPATH)}missing.h
+range.$(OBJEXT): {$(VPATH)}onigmo.h
 range.$(OBJEXT): {$(VPATH)}oniguruma.h
 range.$(OBJEXT): {$(VPATH)}range.c
 range.$(OBJEXT): {$(VPATH)}st.h
 range.$(OBJEXT): {$(VPATH)}subst.h
+rational.$(OBJEXT): $(hdrdir)/ruby.h
 rational.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-rational.$(OBJEXT): $(top_srcdir)/include/ruby.h
+rational.$(OBJEXT): $(top_srcdir)/internal/array.h
+rational.$(OBJEXT): $(top_srcdir)/internal/bignum.h
+rational.$(OBJEXT): $(top_srcdir)/internal/bits.h
+rational.$(OBJEXT): $(top_srcdir)/internal/class.h
+rational.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+rational.$(OBJEXT): $(top_srcdir)/internal/complex.h
+rational.$(OBJEXT): $(top_srcdir)/internal/error.h
+rational.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
+rational.$(OBJEXT): $(top_srcdir)/internal/gc.h
+rational.$(OBJEXT): $(top_srcdir)/internal/numeric.h
+rational.$(OBJEXT): $(top_srcdir)/internal/object.h
+rational.$(OBJEXT): $(top_srcdir)/internal/rational.h
+rational.$(OBJEXT): $(top_srcdir)/internal/serial.h
+rational.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+rational.$(OBJEXT): $(top_srcdir)/internal/string.h
+rational.$(OBJEXT): $(top_srcdir)/internal/vm.h
+rational.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+rational.$(OBJEXT): {$(VPATH)}assert.h
+rational.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+rational.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+rational.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+rational.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+rational.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+rational.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+rational.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+rational.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+rational.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 rational.$(OBJEXT): {$(VPATH)}config.h
 rational.$(OBJEXT): {$(VPATH)}defines.h
 rational.$(OBJEXT): {$(VPATH)}encoding.h
+rational.$(OBJEXT): {$(VPATH)}id.h
+rational.$(OBJEXT): {$(VPATH)}id_table.h
 rational.$(OBJEXT): {$(VPATH)}intern.h
 rational.$(OBJEXT): {$(VPATH)}internal.h
-rational.$(OBJEXT): {$(VPATH)}io.h
+rational.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+rational.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+rational.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+rational.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+rational.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+rational.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+rational.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+rational.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+rational.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+rational.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+rational.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+rational.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+rational.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+rational.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+rational.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+rational.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+rational.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+rational.$(OBJEXT): {$(VPATH)}internal/assume.h
+rational.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+rational.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+rational.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+rational.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+rational.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+rational.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+rational.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+rational.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+rational.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+rational.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+rational.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+rational.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+rational.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+rational.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+rational.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+rational.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+rational.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+rational.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+rational.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+rational.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+rational.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+rational.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+rational.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+rational.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+rational.$(OBJEXT): {$(VPATH)}internal/cast.h
+rational.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+rational.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+rational.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+rational.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+rational.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+rational.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+rational.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+rational.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+rational.$(OBJEXT): {$(VPATH)}internal/config.h
+rational.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+rational.$(OBJEXT): {$(VPATH)}internal/core.h
+rational.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+rational.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+rational.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+rational.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+rational.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+rational.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+rational.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+rational.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+rational.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+rational.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+rational.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+rational.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+rational.$(OBJEXT): {$(VPATH)}internal/ctype.h
+rational.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+rational.$(OBJEXT): {$(VPATH)}internal/dosish.h
+rational.$(OBJEXT): {$(VPATH)}internal/error.h
+rational.$(OBJEXT): {$(VPATH)}internal/eval.h
+rational.$(OBJEXT): {$(VPATH)}internal/event.h
+rational.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+rational.$(OBJEXT): {$(VPATH)}internal/gc.h
+rational.$(OBJEXT): {$(VPATH)}internal/glob.h
+rational.$(OBJEXT): {$(VPATH)}internal/globals.h
+rational.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+rational.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+rational.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+rational.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+rational.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+rational.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+rational.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+rational.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+rational.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+rational.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+rational.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+rational.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+rational.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+rational.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+rational.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+rational.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+rational.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+rational.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+rational.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+rational.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+rational.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+rational.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+rational.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+rational.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+rational.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+rational.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+rational.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+rational.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+rational.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+rational.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+rational.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+rational.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+rational.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+rational.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+rational.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+rational.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+rational.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+rational.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+rational.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+rational.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+rational.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+rational.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+rational.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+rational.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+rational.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+rational.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+rational.$(OBJEXT): {$(VPATH)}internal/iterator.h
+rational.$(OBJEXT): {$(VPATH)}internal/memory.h
+rational.$(OBJEXT): {$(VPATH)}internal/method.h
+rational.$(OBJEXT): {$(VPATH)}internal/module.h
+rational.$(OBJEXT): {$(VPATH)}internal/newobj.h
+rational.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+rational.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+rational.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+rational.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+rational.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+rational.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+rational.$(OBJEXT): {$(VPATH)}internal/symbol.h
+rational.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+rational.$(OBJEXT): {$(VPATH)}internal/value.h
+rational.$(OBJEXT): {$(VPATH)}internal/value_type.h
+rational.$(OBJEXT): {$(VPATH)}internal/variable.h
+rational.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+rational.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 rational.$(OBJEXT): {$(VPATH)}missing.h
+rational.$(OBJEXT): {$(VPATH)}onigmo.h
 rational.$(OBJEXT): {$(VPATH)}oniguruma.h
 rational.$(OBJEXT): {$(VPATH)}rational.c
 rational.$(OBJEXT): {$(VPATH)}ruby_assert.h
 rational.$(OBJEXT): {$(VPATH)}st.h
 rational.$(OBJEXT): {$(VPATH)}subst.h
+re.$(OBJEXT): $(hdrdir)/ruby.h
 re.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-re.$(OBJEXT): $(top_srcdir)/include/ruby.h
+re.$(OBJEXT): $(top_srcdir)/internal/array.h
+re.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+re.$(OBJEXT): $(top_srcdir)/internal/error.h
+re.$(OBJEXT): $(top_srcdir)/internal/gc.h
+re.$(OBJEXT): $(top_srcdir)/internal/hash.h
+re.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+re.$(OBJEXT): $(top_srcdir)/internal/re.h
+re.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+re.$(OBJEXT): $(top_srcdir)/internal/string.h
+re.$(OBJEXT): $(top_srcdir)/internal/variable.h
+re.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+re.$(OBJEXT): {$(VPATH)}assert.h
+re.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+re.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+re.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+re.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+re.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+re.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+re.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+re.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+re.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 re.$(OBJEXT): {$(VPATH)}config.h
+re.$(OBJEXT): {$(VPATH)}constant.h
 re.$(OBJEXT): {$(VPATH)}defines.h
 re.$(OBJEXT): {$(VPATH)}encindex.h
 re.$(OBJEXT): {$(VPATH)}encoding.h
+re.$(OBJEXT): {$(VPATH)}id_table.h
 re.$(OBJEXT): {$(VPATH)}intern.h
 re.$(OBJEXT): {$(VPATH)}internal.h
-re.$(OBJEXT): {$(VPATH)}io.h
+re.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+re.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+re.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+re.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+re.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+re.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+re.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+re.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+re.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+re.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+re.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+re.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+re.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+re.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+re.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+re.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+re.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+re.$(OBJEXT): {$(VPATH)}internal/assume.h
+re.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+re.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+re.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+re.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+re.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+re.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+re.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+re.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+re.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+re.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+re.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+re.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+re.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+re.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+re.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+re.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+re.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+re.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+re.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+re.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+re.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+re.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+re.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+re.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+re.$(OBJEXT): {$(VPATH)}internal/cast.h
+re.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+re.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+re.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+re.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+re.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+re.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+re.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+re.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+re.$(OBJEXT): {$(VPATH)}internal/config.h
+re.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+re.$(OBJEXT): {$(VPATH)}internal/core.h
+re.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+re.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+re.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+re.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+re.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+re.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+re.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+re.$(OBJEXT): {$(VPATH)}internal/core/rmatch.h
+re.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+re.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+re.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+re.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+re.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+re.$(OBJEXT): {$(VPATH)}internal/ctype.h
+re.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+re.$(OBJEXT): {$(VPATH)}internal/dosish.h
+re.$(OBJEXT): {$(VPATH)}internal/error.h
+re.$(OBJEXT): {$(VPATH)}internal/eval.h
+re.$(OBJEXT): {$(VPATH)}internal/event.h
+re.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+re.$(OBJEXT): {$(VPATH)}internal/gc.h
+re.$(OBJEXT): {$(VPATH)}internal/glob.h
+re.$(OBJEXT): {$(VPATH)}internal/globals.h
+re.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+re.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+re.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+re.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+re.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+re.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+re.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+re.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+re.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+re.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+re.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+re.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+re.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+re.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+re.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+re.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+re.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+re.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+re.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+re.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+re.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+re.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+re.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+re.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+re.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+re.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+re.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+re.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+re.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+re.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+re.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+re.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+re.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+re.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+re.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+re.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+re.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+re.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+re.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+re.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+re.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+re.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+re.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+re.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+re.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+re.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+re.$(OBJEXT): {$(VPATH)}internal/iterator.h
+re.$(OBJEXT): {$(VPATH)}internal/memory.h
+re.$(OBJEXT): {$(VPATH)}internal/method.h
+re.$(OBJEXT): {$(VPATH)}internal/module.h
+re.$(OBJEXT): {$(VPATH)}internal/newobj.h
+re.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+re.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+re.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+re.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+re.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+re.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+re.$(OBJEXT): {$(VPATH)}internal/symbol.h
+re.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+re.$(OBJEXT): {$(VPATH)}internal/value.h
+re.$(OBJEXT): {$(VPATH)}internal/value_type.h
+re.$(OBJEXT): {$(VPATH)}internal/variable.h
+re.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+re.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 re.$(OBJEXT): {$(VPATH)}missing.h
+re.$(OBJEXT): {$(VPATH)}onigmo.h
 re.$(OBJEXT): {$(VPATH)}oniguruma.h
 re.$(OBJEXT): {$(VPATH)}re.c
 re.$(OBJEXT): {$(VPATH)}re.h
@@ -2080,11 +11167,161 @@ re.$(OBJEXT): {$(VPATH)}st.h
 re.$(OBJEXT): {$(VPATH)}subst.h
 re.$(OBJEXT): {$(VPATH)}util.h
 regcomp.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+regcomp.$(OBJEXT): {$(VPATH)}assert.h
+regcomp.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+regcomp.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+regcomp.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+regcomp.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+regcomp.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+regcomp.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+regcomp.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+regcomp.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+regcomp.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 regcomp.$(OBJEXT): {$(VPATH)}config.h
 regcomp.$(OBJEXT): {$(VPATH)}defines.h
 regcomp.$(OBJEXT): {$(VPATH)}intern.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/assume.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/cast.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/config.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/core.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/ctype.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/dosish.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/error.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/eval.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/event.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/gc.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/glob.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/globals.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/iterator.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/memory.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/method.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/module.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/newobj.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/symbol.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/value.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/value_type.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/variable.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+regcomp.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 regcomp.$(OBJEXT): {$(VPATH)}missing.h
-regcomp.$(OBJEXT): {$(VPATH)}oniguruma.h
+regcomp.$(OBJEXT): {$(VPATH)}onigmo.h
 regcomp.$(OBJEXT): {$(VPATH)}regcomp.c
 regcomp.$(OBJEXT): {$(VPATH)}regenc.h
 regcomp.$(OBJEXT): {$(VPATH)}regint.h
@@ -2092,44 +11329,644 @@ regcomp.$(OBJEXT): {$(VPATH)}regparse.h
 regcomp.$(OBJEXT): {$(VPATH)}st.h
 regcomp.$(OBJEXT): {$(VPATH)}subst.h
 regenc.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+regenc.$(OBJEXT): {$(VPATH)}assert.h
+regenc.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+regenc.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+regenc.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+regenc.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+regenc.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+regenc.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+regenc.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+regenc.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+regenc.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 regenc.$(OBJEXT): {$(VPATH)}config.h
 regenc.$(OBJEXT): {$(VPATH)}defines.h
 regenc.$(OBJEXT): {$(VPATH)}intern.h
+regenc.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+regenc.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+regenc.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+regenc.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+regenc.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+regenc.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+regenc.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+regenc.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+regenc.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+regenc.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+regenc.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+regenc.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+regenc.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+regenc.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+regenc.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+regenc.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+regenc.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+regenc.$(OBJEXT): {$(VPATH)}internal/assume.h
+regenc.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+regenc.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+regenc.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+regenc.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+regenc.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+regenc.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+regenc.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+regenc.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+regenc.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+regenc.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+regenc.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+regenc.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+regenc.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+regenc.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+regenc.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+regenc.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+regenc.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+regenc.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+regenc.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+regenc.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+regenc.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+regenc.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+regenc.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+regenc.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+regenc.$(OBJEXT): {$(VPATH)}internal/cast.h
+regenc.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+regenc.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+regenc.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+regenc.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+regenc.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+regenc.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+regenc.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+regenc.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+regenc.$(OBJEXT): {$(VPATH)}internal/config.h
+regenc.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+regenc.$(OBJEXT): {$(VPATH)}internal/core.h
+regenc.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+regenc.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+regenc.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+regenc.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+regenc.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+regenc.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+regenc.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+regenc.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+regenc.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+regenc.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+regenc.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+regenc.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+regenc.$(OBJEXT): {$(VPATH)}internal/ctype.h
+regenc.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+regenc.$(OBJEXT): {$(VPATH)}internal/dosish.h
+regenc.$(OBJEXT): {$(VPATH)}internal/error.h
+regenc.$(OBJEXT): {$(VPATH)}internal/eval.h
+regenc.$(OBJEXT): {$(VPATH)}internal/event.h
+regenc.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+regenc.$(OBJEXT): {$(VPATH)}internal/gc.h
+regenc.$(OBJEXT): {$(VPATH)}internal/glob.h
+regenc.$(OBJEXT): {$(VPATH)}internal/globals.h
+regenc.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+regenc.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+regenc.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+regenc.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+regenc.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+regenc.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+regenc.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+regenc.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+regenc.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+regenc.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+regenc.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+regenc.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+regenc.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+regenc.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+regenc.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+regenc.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+regenc.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+regenc.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+regenc.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+regenc.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+regenc.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+regenc.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+regenc.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+regenc.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+regenc.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+regenc.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+regenc.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+regenc.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+regenc.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+regenc.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+regenc.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+regenc.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+regenc.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+regenc.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+regenc.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+regenc.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+regenc.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+regenc.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+regenc.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+regenc.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+regenc.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+regenc.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+regenc.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+regenc.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+regenc.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+regenc.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+regenc.$(OBJEXT): {$(VPATH)}internal/iterator.h
+regenc.$(OBJEXT): {$(VPATH)}internal/memory.h
+regenc.$(OBJEXT): {$(VPATH)}internal/method.h
+regenc.$(OBJEXT): {$(VPATH)}internal/module.h
+regenc.$(OBJEXT): {$(VPATH)}internal/newobj.h
+regenc.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+regenc.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+regenc.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+regenc.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+regenc.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+regenc.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+regenc.$(OBJEXT): {$(VPATH)}internal/symbol.h
+regenc.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+regenc.$(OBJEXT): {$(VPATH)}internal/value.h
+regenc.$(OBJEXT): {$(VPATH)}internal/value_type.h
+regenc.$(OBJEXT): {$(VPATH)}internal/variable.h
+regenc.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+regenc.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 regenc.$(OBJEXT): {$(VPATH)}missing.h
-regenc.$(OBJEXT): {$(VPATH)}oniguruma.h
+regenc.$(OBJEXT): {$(VPATH)}onigmo.h
 regenc.$(OBJEXT): {$(VPATH)}regenc.c
 regenc.$(OBJEXT): {$(VPATH)}regenc.h
 regenc.$(OBJEXT): {$(VPATH)}regint.h
 regenc.$(OBJEXT): {$(VPATH)}st.h
 regenc.$(OBJEXT): {$(VPATH)}subst.h
 regerror.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+regerror.$(OBJEXT): {$(VPATH)}assert.h
+regerror.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+regerror.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+regerror.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+regerror.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+regerror.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+regerror.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+regerror.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+regerror.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+regerror.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 regerror.$(OBJEXT): {$(VPATH)}config.h
 regerror.$(OBJEXT): {$(VPATH)}defines.h
 regerror.$(OBJEXT): {$(VPATH)}intern.h
+regerror.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+regerror.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+regerror.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+regerror.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+regerror.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+regerror.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+regerror.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+regerror.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+regerror.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+regerror.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+regerror.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+regerror.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+regerror.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+regerror.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+regerror.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+regerror.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+regerror.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+regerror.$(OBJEXT): {$(VPATH)}internal/assume.h
+regerror.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+regerror.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+regerror.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+regerror.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+regerror.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+regerror.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+regerror.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+regerror.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+regerror.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+regerror.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+regerror.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+regerror.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+regerror.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+regerror.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+regerror.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+regerror.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+regerror.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+regerror.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+regerror.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+regerror.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+regerror.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+regerror.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+regerror.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+regerror.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+regerror.$(OBJEXT): {$(VPATH)}internal/cast.h
+regerror.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+regerror.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+regerror.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+regerror.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+regerror.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+regerror.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+regerror.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+regerror.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+regerror.$(OBJEXT): {$(VPATH)}internal/config.h
+regerror.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+regerror.$(OBJEXT): {$(VPATH)}internal/core.h
+regerror.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+regerror.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+regerror.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+regerror.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+regerror.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+regerror.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+regerror.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+regerror.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+regerror.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+regerror.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+regerror.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+regerror.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+regerror.$(OBJEXT): {$(VPATH)}internal/ctype.h
+regerror.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+regerror.$(OBJEXT): {$(VPATH)}internal/dosish.h
+regerror.$(OBJEXT): {$(VPATH)}internal/error.h
+regerror.$(OBJEXT): {$(VPATH)}internal/eval.h
+regerror.$(OBJEXT): {$(VPATH)}internal/event.h
+regerror.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+regerror.$(OBJEXT): {$(VPATH)}internal/gc.h
+regerror.$(OBJEXT): {$(VPATH)}internal/glob.h
+regerror.$(OBJEXT): {$(VPATH)}internal/globals.h
+regerror.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+regerror.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+regerror.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+regerror.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+regerror.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+regerror.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+regerror.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+regerror.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+regerror.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+regerror.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+regerror.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+regerror.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+regerror.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+regerror.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+regerror.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+regerror.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+regerror.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+regerror.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+regerror.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+regerror.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+regerror.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+regerror.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+regerror.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+regerror.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+regerror.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+regerror.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+regerror.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+regerror.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+regerror.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+regerror.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+regerror.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+regerror.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+regerror.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+regerror.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+regerror.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+regerror.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+regerror.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+regerror.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+regerror.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+regerror.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+regerror.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+regerror.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+regerror.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+regerror.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+regerror.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+regerror.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+regerror.$(OBJEXT): {$(VPATH)}internal/iterator.h
+regerror.$(OBJEXT): {$(VPATH)}internal/memory.h
+regerror.$(OBJEXT): {$(VPATH)}internal/method.h
+regerror.$(OBJEXT): {$(VPATH)}internal/module.h
+regerror.$(OBJEXT): {$(VPATH)}internal/newobj.h
+regerror.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+regerror.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+regerror.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+regerror.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+regerror.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+regerror.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+regerror.$(OBJEXT): {$(VPATH)}internal/symbol.h
+regerror.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+regerror.$(OBJEXT): {$(VPATH)}internal/value.h
+regerror.$(OBJEXT): {$(VPATH)}internal/value_type.h
+regerror.$(OBJEXT): {$(VPATH)}internal/variable.h
+regerror.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+regerror.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 regerror.$(OBJEXT): {$(VPATH)}missing.h
-regerror.$(OBJEXT): {$(VPATH)}oniguruma.h
+regerror.$(OBJEXT): {$(VPATH)}onigmo.h
 regerror.$(OBJEXT): {$(VPATH)}regenc.h
 regerror.$(OBJEXT): {$(VPATH)}regerror.c
 regerror.$(OBJEXT): {$(VPATH)}regint.h
 regerror.$(OBJEXT): {$(VPATH)}st.h
 regerror.$(OBJEXT): {$(VPATH)}subst.h
 regexec.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+regexec.$(OBJEXT): {$(VPATH)}assert.h
+regexec.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+regexec.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+regexec.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+regexec.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+regexec.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+regexec.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+regexec.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+regexec.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+regexec.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 regexec.$(OBJEXT): {$(VPATH)}config.h
 regexec.$(OBJEXT): {$(VPATH)}defines.h
 regexec.$(OBJEXT): {$(VPATH)}intern.h
+regexec.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+regexec.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+regexec.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+regexec.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+regexec.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+regexec.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+regexec.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+regexec.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+regexec.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+regexec.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+regexec.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+regexec.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+regexec.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+regexec.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+regexec.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+regexec.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+regexec.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+regexec.$(OBJEXT): {$(VPATH)}internal/assume.h
+regexec.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+regexec.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+regexec.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+regexec.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+regexec.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+regexec.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+regexec.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+regexec.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+regexec.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+regexec.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+regexec.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+regexec.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+regexec.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+regexec.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+regexec.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+regexec.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+regexec.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+regexec.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+regexec.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+regexec.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+regexec.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+regexec.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+regexec.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+regexec.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+regexec.$(OBJEXT): {$(VPATH)}internal/cast.h
+regexec.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+regexec.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+regexec.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+regexec.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+regexec.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+regexec.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+regexec.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+regexec.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+regexec.$(OBJEXT): {$(VPATH)}internal/config.h
+regexec.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+regexec.$(OBJEXT): {$(VPATH)}internal/core.h
+regexec.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+regexec.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+regexec.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+regexec.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+regexec.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+regexec.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+regexec.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+regexec.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+regexec.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+regexec.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+regexec.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+regexec.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+regexec.$(OBJEXT): {$(VPATH)}internal/ctype.h
+regexec.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+regexec.$(OBJEXT): {$(VPATH)}internal/dosish.h
+regexec.$(OBJEXT): {$(VPATH)}internal/error.h
+regexec.$(OBJEXT): {$(VPATH)}internal/eval.h
+regexec.$(OBJEXT): {$(VPATH)}internal/event.h
+regexec.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+regexec.$(OBJEXT): {$(VPATH)}internal/gc.h
+regexec.$(OBJEXT): {$(VPATH)}internal/glob.h
+regexec.$(OBJEXT): {$(VPATH)}internal/globals.h
+regexec.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+regexec.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+regexec.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+regexec.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+regexec.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+regexec.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+regexec.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+regexec.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+regexec.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+regexec.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+regexec.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+regexec.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+regexec.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+regexec.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+regexec.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+regexec.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+regexec.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+regexec.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+regexec.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+regexec.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+regexec.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+regexec.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+regexec.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+regexec.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+regexec.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+regexec.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+regexec.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+regexec.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+regexec.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+regexec.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+regexec.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+regexec.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+regexec.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+regexec.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+regexec.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+regexec.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+regexec.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+regexec.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+regexec.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+regexec.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+regexec.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+regexec.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+regexec.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+regexec.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+regexec.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+regexec.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+regexec.$(OBJEXT): {$(VPATH)}internal/iterator.h
+regexec.$(OBJEXT): {$(VPATH)}internal/memory.h
+regexec.$(OBJEXT): {$(VPATH)}internal/method.h
+regexec.$(OBJEXT): {$(VPATH)}internal/module.h
+regexec.$(OBJEXT): {$(VPATH)}internal/newobj.h
+regexec.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+regexec.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+regexec.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+regexec.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+regexec.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+regexec.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+regexec.$(OBJEXT): {$(VPATH)}internal/symbol.h
+regexec.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+regexec.$(OBJEXT): {$(VPATH)}internal/value.h
+regexec.$(OBJEXT): {$(VPATH)}internal/value_type.h
+regexec.$(OBJEXT): {$(VPATH)}internal/variable.h
+regexec.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+regexec.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 regexec.$(OBJEXT): {$(VPATH)}missing.h
-regexec.$(OBJEXT): {$(VPATH)}oniguruma.h
+regexec.$(OBJEXT): {$(VPATH)}onigmo.h
 regexec.$(OBJEXT): {$(VPATH)}regenc.h
 regexec.$(OBJEXT): {$(VPATH)}regexec.c
 regexec.$(OBJEXT): {$(VPATH)}regint.h
 regexec.$(OBJEXT): {$(VPATH)}st.h
 regexec.$(OBJEXT): {$(VPATH)}subst.h
 regparse.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+regparse.$(OBJEXT): {$(VPATH)}assert.h
+regparse.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+regparse.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+regparse.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+regparse.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+regparse.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+regparse.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+regparse.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+regparse.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+regparse.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 regparse.$(OBJEXT): {$(VPATH)}config.h
 regparse.$(OBJEXT): {$(VPATH)}defines.h
 regparse.$(OBJEXT): {$(VPATH)}intern.h
+regparse.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+regparse.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+regparse.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+regparse.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+regparse.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+regparse.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+regparse.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+regparse.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+regparse.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+regparse.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+regparse.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+regparse.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+regparse.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+regparse.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+regparse.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+regparse.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+regparse.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+regparse.$(OBJEXT): {$(VPATH)}internal/assume.h
+regparse.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+regparse.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+regparse.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+regparse.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+regparse.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+regparse.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+regparse.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+regparse.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+regparse.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+regparse.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+regparse.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+regparse.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+regparse.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+regparse.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+regparse.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+regparse.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+regparse.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+regparse.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+regparse.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+regparse.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+regparse.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+regparse.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+regparse.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+regparse.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+regparse.$(OBJEXT): {$(VPATH)}internal/cast.h
+regparse.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+regparse.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+regparse.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+regparse.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+regparse.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+regparse.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+regparse.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+regparse.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+regparse.$(OBJEXT): {$(VPATH)}internal/config.h
+regparse.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+regparse.$(OBJEXT): {$(VPATH)}internal/core.h
+regparse.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+regparse.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+regparse.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+regparse.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+regparse.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+regparse.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+regparse.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+regparse.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+regparse.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+regparse.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+regparse.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+regparse.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+regparse.$(OBJEXT): {$(VPATH)}internal/ctype.h
+regparse.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+regparse.$(OBJEXT): {$(VPATH)}internal/dosish.h
+regparse.$(OBJEXT): {$(VPATH)}internal/error.h
+regparse.$(OBJEXT): {$(VPATH)}internal/eval.h
+regparse.$(OBJEXT): {$(VPATH)}internal/event.h
+regparse.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+regparse.$(OBJEXT): {$(VPATH)}internal/gc.h
+regparse.$(OBJEXT): {$(VPATH)}internal/glob.h
+regparse.$(OBJEXT): {$(VPATH)}internal/globals.h
+regparse.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+regparse.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+regparse.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+regparse.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+regparse.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+regparse.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+regparse.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+regparse.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+regparse.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+regparse.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+regparse.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+regparse.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+regparse.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+regparse.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+regparse.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+regparse.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+regparse.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+regparse.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+regparse.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+regparse.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+regparse.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+regparse.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+regparse.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+regparse.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+regparse.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+regparse.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+regparse.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+regparse.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+regparse.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+regparse.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+regparse.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+regparse.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+regparse.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+regparse.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+regparse.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+regparse.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+regparse.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+regparse.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+regparse.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+regparse.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+regparse.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+regparse.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+regparse.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+regparse.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+regparse.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+regparse.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+regparse.$(OBJEXT): {$(VPATH)}internal/iterator.h
+regparse.$(OBJEXT): {$(VPATH)}internal/memory.h
+regparse.$(OBJEXT): {$(VPATH)}internal/method.h
+regparse.$(OBJEXT): {$(VPATH)}internal/module.h
+regparse.$(OBJEXT): {$(VPATH)}internal/newobj.h
+regparse.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+regparse.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+regparse.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+regparse.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+regparse.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+regparse.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+regparse.$(OBJEXT): {$(VPATH)}internal/symbol.h
+regparse.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+regparse.$(OBJEXT): {$(VPATH)}internal/value.h
+regparse.$(OBJEXT): {$(VPATH)}internal/value_type.h
+regparse.$(OBJEXT): {$(VPATH)}internal/variable.h
+regparse.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+regparse.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 regparse.$(OBJEXT): {$(VPATH)}missing.h
-regparse.$(OBJEXT): {$(VPATH)}oniguruma.h
+regparse.$(OBJEXT): {$(VPATH)}onigmo.h
 regparse.$(OBJEXT): {$(VPATH)}regenc.h
 regparse.$(OBJEXT): {$(VPATH)}regint.h
 regparse.$(OBJEXT): {$(VPATH)}regparse.c
@@ -2137,36 +11974,374 @@ regparse.$(OBJEXT): {$(VPATH)}regparse.h
 regparse.$(OBJEXT): {$(VPATH)}st.h
 regparse.$(OBJEXT): {$(VPATH)}subst.h
 regsyntax.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+regsyntax.$(OBJEXT): {$(VPATH)}assert.h
+regsyntax.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+regsyntax.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+regsyntax.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+regsyntax.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+regsyntax.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+regsyntax.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+regsyntax.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+regsyntax.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+regsyntax.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 regsyntax.$(OBJEXT): {$(VPATH)}config.h
 regsyntax.$(OBJEXT): {$(VPATH)}defines.h
 regsyntax.$(OBJEXT): {$(VPATH)}intern.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/assume.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/cast.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/config.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/core.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/ctype.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/dosish.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/error.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/eval.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/event.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/gc.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/glob.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/globals.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/iterator.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/memory.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/method.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/module.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/newobj.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/symbol.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/value.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/value_type.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/variable.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+regsyntax.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 regsyntax.$(OBJEXT): {$(VPATH)}missing.h
-regsyntax.$(OBJEXT): {$(VPATH)}oniguruma.h
+regsyntax.$(OBJEXT): {$(VPATH)}onigmo.h
 regsyntax.$(OBJEXT): {$(VPATH)}regenc.h
 regsyntax.$(OBJEXT): {$(VPATH)}regint.h
 regsyntax.$(OBJEXT): {$(VPATH)}regsyntax.c
 regsyntax.$(OBJEXT): {$(VPATH)}st.h
 regsyntax.$(OBJEXT): {$(VPATH)}subst.h
+ruby-runner.$(OBJEXT): {$(VPATH)}config.h
+ruby-runner.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+ruby-runner.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+ruby-runner.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+ruby-runner.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+ruby-runner.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+ruby-runner.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+ruby-runner.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+ruby-runner.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+ruby-runner.$(OBJEXT): {$(VPATH)}internal/config.h
 ruby-runner.$(OBJEXT): {$(VPATH)}ruby-runner.c
 ruby-runner.$(OBJEXT): {$(VPATH)}ruby-runner.h
 ruby.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 ruby.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 ruby.$(OBJEXT): $(CCAN_DIR)/list/list.h
 ruby.$(OBJEXT): $(CCAN_DIR)/str/str.h
+ruby.$(OBJEXT): $(hdrdir)/ruby.h
 ruby.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-ruby.$(OBJEXT): $(top_srcdir)/include/ruby.h
+ruby.$(OBJEXT): $(hdrdir)/ruby/version.h
+ruby.$(OBJEXT): $(top_srcdir)/internal/array.h
+ruby.$(OBJEXT): $(top_srcdir)/internal/class.h
+ruby.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+ruby.$(OBJEXT): $(top_srcdir)/internal/error.h
+ruby.$(OBJEXT): $(top_srcdir)/internal/file.h
+ruby.$(OBJEXT): $(top_srcdir)/internal/gc.h
+ruby.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+ruby.$(OBJEXT): $(top_srcdir)/internal/inits.h
+ruby.$(OBJEXT): $(top_srcdir)/internal/io.h
+ruby.$(OBJEXT): $(top_srcdir)/internal/load.h
+ruby.$(OBJEXT): $(top_srcdir)/internal/loadpath.h
+ruby.$(OBJEXT): $(top_srcdir)/internal/missing.h
+ruby.$(OBJEXT): $(top_srcdir)/internal/object.h
+ruby.$(OBJEXT): $(top_srcdir)/internal/parse.h
+ruby.$(OBJEXT): $(top_srcdir)/internal/process.h
+ruby.$(OBJEXT): $(top_srcdir)/internal/serial.h
+ruby.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+ruby.$(OBJEXT): $(top_srcdir)/internal/string.h
+ruby.$(OBJEXT): $(top_srcdir)/internal/variable.h
+ruby.$(OBJEXT): $(top_srcdir)/internal/vm.h
+ruby.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+ruby.$(OBJEXT): {$(VPATH)}assert.h
+ruby.$(OBJEXT): {$(VPATH)}atomic.h
+ruby.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+ruby.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+ruby.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+ruby.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+ruby.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+ruby.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+ruby.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+ruby.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+ruby.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 ruby.$(OBJEXT): {$(VPATH)}config.h
+ruby.$(OBJEXT): {$(VPATH)}constant.h
+ruby.$(OBJEXT): {$(VPATH)}debug_counter.h
 ruby.$(OBJEXT): {$(VPATH)}defines.h
 ruby.$(OBJEXT): {$(VPATH)}dln.h
 ruby.$(OBJEXT): {$(VPATH)}encoding.h
 ruby.$(OBJEXT): {$(VPATH)}eval_intern.h
 ruby.$(OBJEXT): {$(VPATH)}id.h
+ruby.$(OBJEXT): {$(VPATH)}id_table.h
 ruby.$(OBJEXT): {$(VPATH)}intern.h
 ruby.$(OBJEXT): {$(VPATH)}internal.h
+ruby.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+ruby.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+ruby.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+ruby.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+ruby.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+ruby.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+ruby.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+ruby.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+ruby.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+ruby.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+ruby.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+ruby.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+ruby.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+ruby.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+ruby.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+ruby.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+ruby.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+ruby.$(OBJEXT): {$(VPATH)}internal/assume.h
+ruby.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+ruby.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+ruby.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+ruby.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+ruby.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+ruby.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+ruby.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+ruby.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+ruby.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+ruby.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+ruby.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+ruby.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+ruby.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+ruby.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+ruby.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+ruby.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+ruby.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+ruby.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+ruby.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+ruby.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+ruby.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+ruby.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+ruby.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+ruby.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+ruby.$(OBJEXT): {$(VPATH)}internal/cast.h
+ruby.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+ruby.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+ruby.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+ruby.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+ruby.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+ruby.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+ruby.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+ruby.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+ruby.$(OBJEXT): {$(VPATH)}internal/config.h
+ruby.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+ruby.$(OBJEXT): {$(VPATH)}internal/core.h
+ruby.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+ruby.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+ruby.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+ruby.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+ruby.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+ruby.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+ruby.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+ruby.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+ruby.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+ruby.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+ruby.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+ruby.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+ruby.$(OBJEXT): {$(VPATH)}internal/ctype.h
+ruby.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+ruby.$(OBJEXT): {$(VPATH)}internal/dosish.h
+ruby.$(OBJEXT): {$(VPATH)}internal/error.h
+ruby.$(OBJEXT): {$(VPATH)}internal/eval.h
+ruby.$(OBJEXT): {$(VPATH)}internal/event.h
+ruby.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+ruby.$(OBJEXT): {$(VPATH)}internal/gc.h
+ruby.$(OBJEXT): {$(VPATH)}internal/glob.h
+ruby.$(OBJEXT): {$(VPATH)}internal/globals.h
+ruby.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+ruby.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+ruby.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+ruby.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+ruby.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+ruby.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+ruby.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+ruby.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+ruby.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+ruby.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+ruby.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+ruby.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+ruby.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+ruby.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+ruby.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+ruby.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+ruby.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+ruby.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+ruby.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+ruby.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+ruby.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+ruby.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+ruby.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+ruby.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+ruby.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+ruby.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+ruby.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+ruby.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+ruby.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+ruby.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+ruby.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+ruby.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+ruby.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+ruby.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+ruby.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+ruby.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+ruby.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+ruby.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+ruby.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+ruby.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+ruby.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+ruby.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+ruby.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+ruby.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+ruby.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+ruby.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+ruby.$(OBJEXT): {$(VPATH)}internal/iterator.h
+ruby.$(OBJEXT): {$(VPATH)}internal/memory.h
+ruby.$(OBJEXT): {$(VPATH)}internal/method.h
+ruby.$(OBJEXT): {$(VPATH)}internal/module.h
+ruby.$(OBJEXT): {$(VPATH)}internal/newobj.h
+ruby.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+ruby.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+ruby.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+ruby.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+ruby.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+ruby.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+ruby.$(OBJEXT): {$(VPATH)}internal/symbol.h
+ruby.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+ruby.$(OBJEXT): {$(VPATH)}internal/value.h
+ruby.$(OBJEXT): {$(VPATH)}internal/value_type.h
+ruby.$(OBJEXT): {$(VPATH)}internal/variable.h
+ruby.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+ruby.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 ruby.$(OBJEXT): {$(VPATH)}io.h
 ruby.$(OBJEXT): {$(VPATH)}method.h
 ruby.$(OBJEXT): {$(VPATH)}missing.h
+ruby.$(OBJEXT): {$(VPATH)}mjit.h
 ruby.$(OBJEXT): {$(VPATH)}node.h
+ruby.$(OBJEXT): {$(VPATH)}onigmo.h
 ruby.$(OBJEXT): {$(VPATH)}oniguruma.h
 ruby.$(OBJEXT): {$(VPATH)}ruby.c
 ruby.$(OBJEXT): {$(VPATH)}ruby_assert.h
@@ -2178,40 +12353,349 @@ ruby.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 ruby.$(OBJEXT): {$(VPATH)}thread_native.h
 ruby.$(OBJEXT): {$(VPATH)}util.h
 ruby.$(OBJEXT): {$(VPATH)}vm_core.h
-ruby.$(OBJEXT): {$(VPATH)}vm_debug.h
 ruby.$(OBJEXT): {$(VPATH)}vm_opts.h
-safe.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
-safe.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
-safe.$(OBJEXT): $(CCAN_DIR)/list/list.h
-safe.$(OBJEXT): $(CCAN_DIR)/str/str.h
-safe.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-safe.$(OBJEXT): $(top_srcdir)/include/ruby.h
-safe.$(OBJEXT): {$(VPATH)}config.h
-safe.$(OBJEXT): {$(VPATH)}defines.h
-safe.$(OBJEXT): {$(VPATH)}encoding.h
-safe.$(OBJEXT): {$(VPATH)}id.h
-safe.$(OBJEXT): {$(VPATH)}intern.h
-safe.$(OBJEXT): {$(VPATH)}internal.h
-safe.$(OBJEXT): {$(VPATH)}io.h
-safe.$(OBJEXT): {$(VPATH)}method.h
-safe.$(OBJEXT): {$(VPATH)}missing.h
-safe.$(OBJEXT): {$(VPATH)}node.h
-safe.$(OBJEXT): {$(VPATH)}oniguruma.h
-safe.$(OBJEXT): {$(VPATH)}ruby_assert.h
-safe.$(OBJEXT): {$(VPATH)}ruby_atomic.h
-safe.$(OBJEXT): {$(VPATH)}safe.c
-safe.$(OBJEXT): {$(VPATH)}st.h
-safe.$(OBJEXT): {$(VPATH)}subst.h
-safe.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
-safe.$(OBJEXT): {$(VPATH)}thread_native.h
-safe.$(OBJEXT): {$(VPATH)}vm_core.h
-safe.$(OBJEXT): {$(VPATH)}vm_debug.h
-safe.$(OBJEXT): {$(VPATH)}vm_opts.h
+scheduler.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+scheduler.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+scheduler.$(OBJEXT): $(CCAN_DIR)/list/list.h
+scheduler.$(OBJEXT): $(CCAN_DIR)/str/str.h
+scheduler.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+scheduler.$(OBJEXT): $(top_srcdir)/internal/array.h
+scheduler.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+scheduler.$(OBJEXT): $(top_srcdir)/internal/gc.h
+scheduler.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+scheduler.$(OBJEXT): $(top_srcdir)/internal/scheduler.h
+scheduler.$(OBJEXT): $(top_srcdir)/internal/serial.h
+scheduler.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+scheduler.$(OBJEXT): $(top_srcdir)/internal/vm.h
+scheduler.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+scheduler.$(OBJEXT): {$(VPATH)}assert.h
+scheduler.$(OBJEXT): {$(VPATH)}atomic.h
+scheduler.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+scheduler.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+scheduler.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+scheduler.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+scheduler.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+scheduler.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+scheduler.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+scheduler.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+scheduler.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
+scheduler.$(OBJEXT): {$(VPATH)}config.h
+scheduler.$(OBJEXT): {$(VPATH)}defines.h
+scheduler.$(OBJEXT): {$(VPATH)}encoding.h
+scheduler.$(OBJEXT): {$(VPATH)}id.h
+scheduler.$(OBJEXT): {$(VPATH)}intern.h
+scheduler.$(OBJEXT): {$(VPATH)}internal.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/assume.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/cast.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/config.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/core.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/ctype.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/dosish.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/error.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/eval.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/event.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/gc.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/glob.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/globals.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/iterator.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/memory.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/method.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/module.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/newobj.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/scheduler.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/symbol.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/value.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/value_type.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/variable.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+scheduler.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
+scheduler.$(OBJEXT): {$(VPATH)}io.h
+scheduler.$(OBJEXT): {$(VPATH)}method.h
+scheduler.$(OBJEXT): {$(VPATH)}missing.h
+scheduler.$(OBJEXT): {$(VPATH)}node.h
+scheduler.$(OBJEXT): {$(VPATH)}onigmo.h
+scheduler.$(OBJEXT): {$(VPATH)}oniguruma.h
+scheduler.$(OBJEXT): {$(VPATH)}ruby_assert.h
+scheduler.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+scheduler.$(OBJEXT): {$(VPATH)}scheduler.c
+scheduler.$(OBJEXT): {$(VPATH)}st.h
+scheduler.$(OBJEXT): {$(VPATH)}subst.h
+scheduler.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+scheduler.$(OBJEXT): {$(VPATH)}thread_native.h
+scheduler.$(OBJEXT): {$(VPATH)}vm_core.h
+scheduler.$(OBJEXT): {$(VPATH)}vm_opts.h
+setproctitle.$(OBJEXT): $(hdrdir)/ruby.h
 setproctitle.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-setproctitle.$(OBJEXT): $(top_srcdir)/include/ruby.h
+setproctitle.$(OBJEXT): {$(VPATH)}assert.h
+setproctitle.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+setproctitle.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+setproctitle.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+setproctitle.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+setproctitle.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+setproctitle.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+setproctitle.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+setproctitle.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+setproctitle.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 setproctitle.$(OBJEXT): {$(VPATH)}config.h
 setproctitle.$(OBJEXT): {$(VPATH)}defines.h
 setproctitle.$(OBJEXT): {$(VPATH)}intern.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/assume.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/cast.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/config.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/core.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/ctype.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/dosish.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/error.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/eval.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/event.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/gc.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/glob.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/globals.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/iterator.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/memory.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/method.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/module.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/newobj.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/symbol.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/value.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/value_type.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/variable.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+setproctitle.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 setproctitle.$(OBJEXT): {$(VPATH)}missing.h
 setproctitle.$(OBJEXT): {$(VPATH)}setproctitle.c
 setproctitle.$(OBJEXT): {$(VPATH)}st.h
@@ -2221,20 +12705,188 @@ signal.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 signal.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 signal.$(OBJEXT): $(CCAN_DIR)/list/list.h
 signal.$(OBJEXT): $(CCAN_DIR)/str/str.h
+signal.$(OBJEXT): $(hdrdir)/ruby.h
 signal.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-signal.$(OBJEXT): $(top_srcdir)/include/ruby.h
+signal.$(OBJEXT): $(top_srcdir)/internal/array.h
+signal.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+signal.$(OBJEXT): $(top_srcdir)/internal/eval.h
+signal.$(OBJEXT): $(top_srcdir)/internal/gc.h
+signal.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+signal.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
+signal.$(OBJEXT): $(top_srcdir)/internal/serial.h
+signal.$(OBJEXT): $(top_srcdir)/internal/signal.h
+signal.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+signal.$(OBJEXT): $(top_srcdir)/internal/string.h
+signal.$(OBJEXT): $(top_srcdir)/internal/thread.h
+signal.$(OBJEXT): $(top_srcdir)/internal/vm.h
+signal.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+signal.$(OBJEXT): {$(VPATH)}assert.h
+signal.$(OBJEXT): {$(VPATH)}atomic.h
+signal.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+signal.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+signal.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+signal.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+signal.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+signal.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+signal.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+signal.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+signal.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 signal.$(OBJEXT): {$(VPATH)}config.h
+signal.$(OBJEXT): {$(VPATH)}debug_counter.h
 signal.$(OBJEXT): {$(VPATH)}defines.h
 signal.$(OBJEXT): {$(VPATH)}encoding.h
 signal.$(OBJEXT): {$(VPATH)}eval_intern.h
 signal.$(OBJEXT): {$(VPATH)}id.h
+signal.$(OBJEXT): {$(VPATH)}id_table.h
 signal.$(OBJEXT): {$(VPATH)}intern.h
 signal.$(OBJEXT): {$(VPATH)}internal.h
-signal.$(OBJEXT): {$(VPATH)}io.h
+signal.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+signal.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+signal.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+signal.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+signal.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+signal.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+signal.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+signal.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+signal.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+signal.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+signal.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+signal.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+signal.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+signal.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+signal.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+signal.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+signal.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+signal.$(OBJEXT): {$(VPATH)}internal/assume.h
+signal.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+signal.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+signal.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+signal.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+signal.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+signal.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+signal.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+signal.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+signal.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+signal.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+signal.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+signal.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+signal.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+signal.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+signal.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+signal.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+signal.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+signal.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+signal.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+signal.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+signal.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+signal.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+signal.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+signal.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+signal.$(OBJEXT): {$(VPATH)}internal/cast.h
+signal.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+signal.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+signal.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+signal.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+signal.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+signal.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+signal.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+signal.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+signal.$(OBJEXT): {$(VPATH)}internal/config.h
+signal.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+signal.$(OBJEXT): {$(VPATH)}internal/core.h
+signal.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+signal.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+signal.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+signal.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+signal.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+signal.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+signal.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+signal.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+signal.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+signal.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+signal.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+signal.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+signal.$(OBJEXT): {$(VPATH)}internal/ctype.h
+signal.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+signal.$(OBJEXT): {$(VPATH)}internal/dosish.h
+signal.$(OBJEXT): {$(VPATH)}internal/error.h
+signal.$(OBJEXT): {$(VPATH)}internal/eval.h
+signal.$(OBJEXT): {$(VPATH)}internal/event.h
+signal.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+signal.$(OBJEXT): {$(VPATH)}internal/gc.h
+signal.$(OBJEXT): {$(VPATH)}internal/glob.h
+signal.$(OBJEXT): {$(VPATH)}internal/globals.h
+signal.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+signal.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+signal.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+signal.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+signal.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+signal.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+signal.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+signal.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+signal.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+signal.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+signal.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+signal.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+signal.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+signal.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+signal.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+signal.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+signal.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+signal.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+signal.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+signal.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+signal.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+signal.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+signal.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+signal.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+signal.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+signal.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+signal.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+signal.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+signal.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+signal.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+signal.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+signal.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+signal.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+signal.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+signal.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+signal.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+signal.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+signal.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+signal.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+signal.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+signal.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+signal.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+signal.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+signal.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+signal.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+signal.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+signal.$(OBJEXT): {$(VPATH)}internal/iterator.h
+signal.$(OBJEXT): {$(VPATH)}internal/memory.h
+signal.$(OBJEXT): {$(VPATH)}internal/method.h
+signal.$(OBJEXT): {$(VPATH)}internal/module.h
+signal.$(OBJEXT): {$(VPATH)}internal/newobj.h
+signal.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+signal.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+signal.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+signal.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+signal.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+signal.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+signal.$(OBJEXT): {$(VPATH)}internal/symbol.h
+signal.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+signal.$(OBJEXT): {$(VPATH)}internal/value.h
+signal.$(OBJEXT): {$(VPATH)}internal/value_type.h
+signal.$(OBJEXT): {$(VPATH)}internal/variable.h
+signal.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+signal.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 signal.$(OBJEXT): {$(VPATH)}method.h
 signal.$(OBJEXT): {$(VPATH)}missing.h
 signal.$(OBJEXT): {$(VPATH)}node.h
+signal.$(OBJEXT): {$(VPATH)}onigmo.h
 signal.$(OBJEXT): {$(VPATH)}oniguruma.h
+signal.$(OBJEXT): {$(VPATH)}ractor.h
+signal.$(OBJEXT): {$(VPATH)}ractor_core.h
 signal.$(OBJEXT): {$(VPATH)}ruby_assert.h
 signal.$(OBJEXT): {$(VPATH)}ruby_atomic.h
 signal.$(OBJEXT): {$(VPATH)}signal.c
@@ -2245,16 +12897,186 @@ signal.$(OBJEXT): {$(VPATH)}thread_native.h
 signal.$(OBJEXT): {$(VPATH)}vm_core.h
 signal.$(OBJEXT): {$(VPATH)}vm_debug.h
 signal.$(OBJEXT): {$(VPATH)}vm_opts.h
+sprintf.$(OBJEXT): $(hdrdir)/ruby.h
 sprintf.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-sprintf.$(OBJEXT): $(top_srcdir)/include/ruby.h
+sprintf.$(OBJEXT): $(top_srcdir)/internal/bignum.h
+sprintf.$(OBJEXT): $(top_srcdir)/internal/bits.h
+sprintf.$(OBJEXT): $(top_srcdir)/internal/class.h
+sprintf.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+sprintf.$(OBJEXT): $(top_srcdir)/internal/error.h
+sprintf.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
+sprintf.$(OBJEXT): $(top_srcdir)/internal/gc.h
+sprintf.$(OBJEXT): $(top_srcdir)/internal/hash.h
+sprintf.$(OBJEXT): $(top_srcdir)/internal/numeric.h
+sprintf.$(OBJEXT): $(top_srcdir)/internal/object.h
+sprintf.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
+sprintf.$(OBJEXT): $(top_srcdir)/internal/serial.h
+sprintf.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+sprintf.$(OBJEXT): $(top_srcdir)/internal/string.h
+sprintf.$(OBJEXT): $(top_srcdir)/internal/symbol.h
+sprintf.$(OBJEXT): $(top_srcdir)/internal/util.h
+sprintf.$(OBJEXT): $(top_srcdir)/internal/vm.h
+sprintf.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+sprintf.$(OBJEXT): {$(VPATH)}assert.h
+sprintf.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+sprintf.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+sprintf.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+sprintf.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+sprintf.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+sprintf.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+sprintf.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+sprintf.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+sprintf.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 sprintf.$(OBJEXT): {$(VPATH)}config.h
 sprintf.$(OBJEXT): {$(VPATH)}defines.h
 sprintf.$(OBJEXT): {$(VPATH)}encoding.h
 sprintf.$(OBJEXT): {$(VPATH)}id.h
+sprintf.$(OBJEXT): {$(VPATH)}id_table.h
 sprintf.$(OBJEXT): {$(VPATH)}intern.h
 sprintf.$(OBJEXT): {$(VPATH)}internal.h
-sprintf.$(OBJEXT): {$(VPATH)}io.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/assume.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/cast.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/config.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/core.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/core/rmatch.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/ctype.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/dosish.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/error.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/eval.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/event.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/gc.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/glob.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/globals.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/iterator.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/memory.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/method.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/module.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/newobj.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/symbol.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/value.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/value_type.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/variable.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+sprintf.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 sprintf.$(OBJEXT): {$(VPATH)}missing.h
+sprintf.$(OBJEXT): {$(VPATH)}onigmo.h
 sprintf.$(OBJEXT): {$(VPATH)}oniguruma.h
 sprintf.$(OBJEXT): {$(VPATH)}re.h
 sprintf.$(OBJEXT): {$(VPATH)}regex.h
@@ -2262,50 +13084,530 @@ sprintf.$(OBJEXT): {$(VPATH)}sprintf.c
 sprintf.$(OBJEXT): {$(VPATH)}st.h
 sprintf.$(OBJEXT): {$(VPATH)}subst.h
 sprintf.$(OBJEXT): {$(VPATH)}vsnprintf.c
-st.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
-st.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
-st.$(OBJEXT): $(CCAN_DIR)/list/list.h
-st.$(OBJEXT): $(CCAN_DIR)/str/str.h
+st.$(OBJEXT): $(hdrdir)/ruby.h
 st.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-st.$(OBJEXT): $(top_srcdir)/include/ruby.h
+st.$(OBJEXT): $(top_srcdir)/internal/bits.h
+st.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+st.$(OBJEXT): $(top_srcdir)/internal/hash.h
+st.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
+st.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+st.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+st.$(OBJEXT): {$(VPATH)}assert.h
+st.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+st.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+st.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+st.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+st.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+st.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+st.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+st.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+st.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 st.$(OBJEXT): {$(VPATH)}config.h
 st.$(OBJEXT): {$(VPATH)}defines.h
-st.$(OBJEXT): {$(VPATH)}encoding.h
 st.$(OBJEXT): {$(VPATH)}intern.h
 st.$(OBJEXT): {$(VPATH)}internal.h
-st.$(OBJEXT): {$(VPATH)}io.h
+st.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+st.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+st.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+st.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+st.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+st.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+st.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+st.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+st.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+st.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+st.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+st.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+st.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+st.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+st.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+st.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+st.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+st.$(OBJEXT): {$(VPATH)}internal/assume.h
+st.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+st.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+st.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+st.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+st.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+st.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+st.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+st.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+st.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+st.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+st.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+st.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+st.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+st.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+st.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+st.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+st.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+st.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+st.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+st.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+st.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+st.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+st.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+st.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+st.$(OBJEXT): {$(VPATH)}internal/cast.h
+st.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+st.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+st.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+st.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+st.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+st.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+st.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+st.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+st.$(OBJEXT): {$(VPATH)}internal/config.h
+st.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+st.$(OBJEXT): {$(VPATH)}internal/core.h
+st.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+st.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+st.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+st.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+st.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+st.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+st.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+st.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+st.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+st.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+st.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+st.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+st.$(OBJEXT): {$(VPATH)}internal/ctype.h
+st.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+st.$(OBJEXT): {$(VPATH)}internal/dosish.h
+st.$(OBJEXT): {$(VPATH)}internal/error.h
+st.$(OBJEXT): {$(VPATH)}internal/eval.h
+st.$(OBJEXT): {$(VPATH)}internal/event.h
+st.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+st.$(OBJEXT): {$(VPATH)}internal/gc.h
+st.$(OBJEXT): {$(VPATH)}internal/glob.h
+st.$(OBJEXT): {$(VPATH)}internal/globals.h
+st.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+st.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+st.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+st.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+st.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+st.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+st.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+st.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+st.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+st.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+st.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+st.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+st.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+st.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+st.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+st.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+st.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+st.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+st.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+st.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+st.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+st.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+st.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+st.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+st.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+st.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+st.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+st.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+st.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+st.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+st.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+st.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+st.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+st.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+st.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+st.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+st.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+st.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+st.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+st.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+st.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+st.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+st.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+st.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+st.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+st.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+st.$(OBJEXT): {$(VPATH)}internal/iterator.h
+st.$(OBJEXT): {$(VPATH)}internal/memory.h
+st.$(OBJEXT): {$(VPATH)}internal/method.h
+st.$(OBJEXT): {$(VPATH)}internal/module.h
+st.$(OBJEXT): {$(VPATH)}internal/newobj.h
+st.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+st.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+st.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+st.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+st.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+st.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+st.$(OBJEXT): {$(VPATH)}internal/symbol.h
+st.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+st.$(OBJEXT): {$(VPATH)}internal/value.h
+st.$(OBJEXT): {$(VPATH)}internal/value_type.h
+st.$(OBJEXT): {$(VPATH)}internal/variable.h
+st.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+st.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 st.$(OBJEXT): {$(VPATH)}missing.h
-st.$(OBJEXT): {$(VPATH)}oniguruma.h
 st.$(OBJEXT): {$(VPATH)}st.c
 st.$(OBJEXT): {$(VPATH)}st.h
 st.$(OBJEXT): {$(VPATH)}subst.h
+strftime.$(OBJEXT): $(hdrdir)/ruby.h
 strftime.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-strftime.$(OBJEXT): $(top_srcdir)/include/ruby.h
+strftime.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+strftime.$(OBJEXT): $(top_srcdir)/internal/serial.h
+strftime.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+strftime.$(OBJEXT): $(top_srcdir)/internal/string.h
+strftime.$(OBJEXT): $(top_srcdir)/internal/util.h
+strftime.$(OBJEXT): $(top_srcdir)/internal/vm.h
+strftime.$(OBJEXT): {$(VPATH)}assert.h
+strftime.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+strftime.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+strftime.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+strftime.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+strftime.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+strftime.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+strftime.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+strftime.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+strftime.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 strftime.$(OBJEXT): {$(VPATH)}config.h
 strftime.$(OBJEXT): {$(VPATH)}defines.h
 strftime.$(OBJEXT): {$(VPATH)}encoding.h
 strftime.$(OBJEXT): {$(VPATH)}intern.h
 strftime.$(OBJEXT): {$(VPATH)}internal.h
-strftime.$(OBJEXT): {$(VPATH)}io.h
+strftime.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+strftime.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+strftime.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+strftime.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+strftime.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+strftime.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+strftime.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+strftime.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+strftime.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+strftime.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+strftime.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+strftime.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+strftime.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+strftime.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+strftime.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+strftime.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+strftime.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+strftime.$(OBJEXT): {$(VPATH)}internal/assume.h
+strftime.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+strftime.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+strftime.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+strftime.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+strftime.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+strftime.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+strftime.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+strftime.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+strftime.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+strftime.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+strftime.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+strftime.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+strftime.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+strftime.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+strftime.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+strftime.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+strftime.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+strftime.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+strftime.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+strftime.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+strftime.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+strftime.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+strftime.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+strftime.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+strftime.$(OBJEXT): {$(VPATH)}internal/cast.h
+strftime.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+strftime.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+strftime.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+strftime.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+strftime.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+strftime.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+strftime.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+strftime.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+strftime.$(OBJEXT): {$(VPATH)}internal/config.h
+strftime.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+strftime.$(OBJEXT): {$(VPATH)}internal/core.h
+strftime.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+strftime.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+strftime.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+strftime.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+strftime.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+strftime.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+strftime.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+strftime.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+strftime.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+strftime.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+strftime.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+strftime.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+strftime.$(OBJEXT): {$(VPATH)}internal/ctype.h
+strftime.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+strftime.$(OBJEXT): {$(VPATH)}internal/dosish.h
+strftime.$(OBJEXT): {$(VPATH)}internal/error.h
+strftime.$(OBJEXT): {$(VPATH)}internal/eval.h
+strftime.$(OBJEXT): {$(VPATH)}internal/event.h
+strftime.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+strftime.$(OBJEXT): {$(VPATH)}internal/gc.h
+strftime.$(OBJEXT): {$(VPATH)}internal/glob.h
+strftime.$(OBJEXT): {$(VPATH)}internal/globals.h
+strftime.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+strftime.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+strftime.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+strftime.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+strftime.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+strftime.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+strftime.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+strftime.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+strftime.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+strftime.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+strftime.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+strftime.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+strftime.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+strftime.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+strftime.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+strftime.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+strftime.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+strftime.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+strftime.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+strftime.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+strftime.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+strftime.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+strftime.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+strftime.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+strftime.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+strftime.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+strftime.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+strftime.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+strftime.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+strftime.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+strftime.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+strftime.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+strftime.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+strftime.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+strftime.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+strftime.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+strftime.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+strftime.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+strftime.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+strftime.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+strftime.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+strftime.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+strftime.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+strftime.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+strftime.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+strftime.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+strftime.$(OBJEXT): {$(VPATH)}internal/iterator.h
+strftime.$(OBJEXT): {$(VPATH)}internal/memory.h
+strftime.$(OBJEXT): {$(VPATH)}internal/method.h
+strftime.$(OBJEXT): {$(VPATH)}internal/module.h
+strftime.$(OBJEXT): {$(VPATH)}internal/newobj.h
+strftime.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+strftime.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+strftime.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+strftime.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+strftime.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+strftime.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+strftime.$(OBJEXT): {$(VPATH)}internal/symbol.h
+strftime.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+strftime.$(OBJEXT): {$(VPATH)}internal/value.h
+strftime.$(OBJEXT): {$(VPATH)}internal/value_type.h
+strftime.$(OBJEXT): {$(VPATH)}internal/variable.h
+strftime.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+strftime.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 strftime.$(OBJEXT): {$(VPATH)}missing.h
+strftime.$(OBJEXT): {$(VPATH)}onigmo.h
 strftime.$(OBJEXT): {$(VPATH)}oniguruma.h
 strftime.$(OBJEXT): {$(VPATH)}st.h
 strftime.$(OBJEXT): {$(VPATH)}strftime.c
 strftime.$(OBJEXT): {$(VPATH)}subst.h
 strftime.$(OBJEXT): {$(VPATH)}timev.h
+string.$(OBJEXT): $(hdrdir)/ruby.h
 string.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-string.$(OBJEXT): $(top_srcdir)/include/ruby.h
+string.$(OBJEXT): $(top_srcdir)/internal/array.h
+string.$(OBJEXT): $(top_srcdir)/internal/bignum.h
+string.$(OBJEXT): $(top_srcdir)/internal/bits.h
+string.$(OBJEXT): $(top_srcdir)/internal/class.h
+string.$(OBJEXT): $(top_srcdir)/internal/compar.h
+string.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+string.$(OBJEXT): $(top_srcdir)/internal/encoding.h
+string.$(OBJEXT): $(top_srcdir)/internal/error.h
+string.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
+string.$(OBJEXT): $(top_srcdir)/internal/gc.h
+string.$(OBJEXT): $(top_srcdir)/internal/numeric.h
+string.$(OBJEXT): $(top_srcdir)/internal/object.h
+string.$(OBJEXT): $(top_srcdir)/internal/proc.h
+string.$(OBJEXT): $(top_srcdir)/internal/re.h
+string.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
+string.$(OBJEXT): $(top_srcdir)/internal/serial.h
+string.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+string.$(OBJEXT): $(top_srcdir)/internal/string.h
+string.$(OBJEXT): $(top_srcdir)/internal/transcode.h
+string.$(OBJEXT): $(top_srcdir)/internal/vm.h
+string.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+string.$(OBJEXT): {$(VPATH)}assert.h
+string.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+string.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+string.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+string.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+string.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+string.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+string.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+string.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+string.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 string.$(OBJEXT): {$(VPATH)}config.h
 string.$(OBJEXT): {$(VPATH)}crypt.h
+string.$(OBJEXT): {$(VPATH)}debug_counter.h
 string.$(OBJEXT): {$(VPATH)}defines.h
 string.$(OBJEXT): {$(VPATH)}encindex.h
 string.$(OBJEXT): {$(VPATH)}encoding.h
 string.$(OBJEXT): {$(VPATH)}gc.h
 string.$(OBJEXT): {$(VPATH)}id.h
+string.$(OBJEXT): {$(VPATH)}id_table.h
 string.$(OBJEXT): {$(VPATH)}intern.h
 string.$(OBJEXT): {$(VPATH)}internal.h
-string.$(OBJEXT): {$(VPATH)}io.h
+string.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+string.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+string.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+string.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+string.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+string.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+string.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+string.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+string.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+string.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+string.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+string.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+string.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+string.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+string.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+string.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+string.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+string.$(OBJEXT): {$(VPATH)}internal/assume.h
+string.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+string.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+string.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+string.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+string.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+string.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+string.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+string.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+string.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+string.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+string.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+string.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+string.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+string.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+string.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+string.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+string.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+string.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+string.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+string.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+string.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+string.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+string.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+string.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+string.$(OBJEXT): {$(VPATH)}internal/cast.h
+string.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+string.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+string.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+string.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+string.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+string.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+string.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+string.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+string.$(OBJEXT): {$(VPATH)}internal/config.h
+string.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+string.$(OBJEXT): {$(VPATH)}internal/core.h
+string.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+string.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+string.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+string.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+string.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+string.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+string.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+string.$(OBJEXT): {$(VPATH)}internal/core/rmatch.h
+string.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+string.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+string.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+string.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+string.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+string.$(OBJEXT): {$(VPATH)}internal/ctype.h
+string.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+string.$(OBJEXT): {$(VPATH)}internal/dosish.h
+string.$(OBJEXT): {$(VPATH)}internal/error.h
+string.$(OBJEXT): {$(VPATH)}internal/eval.h
+string.$(OBJEXT): {$(VPATH)}internal/event.h
+string.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+string.$(OBJEXT): {$(VPATH)}internal/gc.h
+string.$(OBJEXT): {$(VPATH)}internal/glob.h
+string.$(OBJEXT): {$(VPATH)}internal/globals.h
+string.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+string.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+string.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+string.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+string.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+string.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+string.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+string.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+string.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+string.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+string.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+string.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+string.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+string.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+string.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+string.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+string.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+string.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+string.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+string.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+string.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+string.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+string.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+string.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+string.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+string.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+string.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+string.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+string.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+string.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+string.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+string.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+string.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+string.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+string.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+string.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+string.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+string.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+string.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+string.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+string.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+string.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+string.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+string.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+string.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+string.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+string.$(OBJEXT): {$(VPATH)}internal/iterator.h
+string.$(OBJEXT): {$(VPATH)}internal/memory.h
+string.$(OBJEXT): {$(VPATH)}internal/method.h
+string.$(OBJEXT): {$(VPATH)}internal/module.h
+string.$(OBJEXT): {$(VPATH)}internal/newobj.h
+string.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+string.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+string.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+string.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+string.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+string.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+string.$(OBJEXT): {$(VPATH)}internal/symbol.h
+string.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+string.$(OBJEXT): {$(VPATH)}internal/value.h
+string.$(OBJEXT): {$(VPATH)}internal/value_type.h
+string.$(OBJEXT): {$(VPATH)}internal/variable.h
+string.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+string.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 string.$(OBJEXT): {$(VPATH)}missing.h
+string.$(OBJEXT): {$(VPATH)}node.h
+string.$(OBJEXT): {$(VPATH)}onigmo.h
 string.$(OBJEXT): {$(VPATH)}oniguruma.h
 string.$(OBJEXT): {$(VPATH)}probes.dmyh
 string.$(OBJEXT): {$(VPATH)}probes.h
@@ -2315,29 +13617,220 @@ string.$(OBJEXT): {$(VPATH)}ruby_assert.h
 string.$(OBJEXT): {$(VPATH)}st.h
 string.$(OBJEXT): {$(VPATH)}string.c
 string.$(OBJEXT): {$(VPATH)}subst.h
-string.$(OBJEXT): {$(VPATH)}vm_opts.h
+string.$(OBJEXT): {$(VPATH)}util.h
+string.$(OBJEXT): {$(VPATH)}vm_debug.h
+string.$(OBJEXT): {$(VPATH)}vm_sync.h
 strlcat.$(OBJEXT): {$(VPATH)}config.h
+strlcat.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+strlcat.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+strlcat.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+strlcat.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+strlcat.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+strlcat.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+strlcat.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+strlcat.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+strlcat.$(OBJEXT): {$(VPATH)}internal/config.h
+strlcat.$(OBJEXT): {$(VPATH)}internal/dllexport.h
 strlcat.$(OBJEXT): {$(VPATH)}missing.h
 strlcat.$(OBJEXT): {$(VPATH)}strlcat.c
 strlcpy.$(OBJEXT): {$(VPATH)}config.h
+strlcpy.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+strlcpy.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+strlcpy.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+strlcpy.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+strlcpy.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+strlcpy.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+strlcpy.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+strlcpy.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+strlcpy.$(OBJEXT): {$(VPATH)}internal/config.h
+strlcpy.$(OBJEXT): {$(VPATH)}internal/dllexport.h
 strlcpy.$(OBJEXT): {$(VPATH)}missing.h
 strlcpy.$(OBJEXT): {$(VPATH)}strlcpy.c
 struct.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 struct.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 struct.$(OBJEXT): $(CCAN_DIR)/list/list.h
 struct.$(OBJEXT): $(CCAN_DIR)/str/str.h
+struct.$(OBJEXT): $(hdrdir)/ruby.h
 struct.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-struct.$(OBJEXT): $(top_srcdir)/include/ruby.h
+struct.$(OBJEXT): $(top_srcdir)/internal/array.h
+struct.$(OBJEXT): $(top_srcdir)/internal/class.h
+struct.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+struct.$(OBJEXT): $(top_srcdir)/internal/error.h
+struct.$(OBJEXT): $(top_srcdir)/internal/gc.h
+struct.$(OBJEXT): $(top_srcdir)/internal/hash.h
+struct.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+struct.$(OBJEXT): $(top_srcdir)/internal/object.h
+struct.$(OBJEXT): $(top_srcdir)/internal/proc.h
+struct.$(OBJEXT): $(top_srcdir)/internal/serial.h
+struct.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+struct.$(OBJEXT): $(top_srcdir)/internal/string.h
+struct.$(OBJEXT): $(top_srcdir)/internal/struct.h
+struct.$(OBJEXT): $(top_srcdir)/internal/symbol.h
+struct.$(OBJEXT): $(top_srcdir)/internal/vm.h
+struct.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+struct.$(OBJEXT): {$(VPATH)}assert.h
+struct.$(OBJEXT): {$(VPATH)}atomic.h
+struct.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+struct.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+struct.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+struct.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+struct.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+struct.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+struct.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+struct.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+struct.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
+struct.$(OBJEXT): {$(VPATH)}builtin.h
 struct.$(OBJEXT): {$(VPATH)}config.h
 struct.$(OBJEXT): {$(VPATH)}defines.h
 struct.$(OBJEXT): {$(VPATH)}encoding.h
 struct.$(OBJEXT): {$(VPATH)}id.h
+struct.$(OBJEXT): {$(VPATH)}id_table.h
 struct.$(OBJEXT): {$(VPATH)}intern.h
 struct.$(OBJEXT): {$(VPATH)}internal.h
-struct.$(OBJEXT): {$(VPATH)}io.h
+struct.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+struct.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+struct.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+struct.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+struct.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+struct.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+struct.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+struct.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+struct.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+struct.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+struct.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+struct.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+struct.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+struct.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+struct.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+struct.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+struct.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+struct.$(OBJEXT): {$(VPATH)}internal/assume.h
+struct.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+struct.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+struct.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+struct.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+struct.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+struct.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+struct.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+struct.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+struct.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+struct.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+struct.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+struct.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+struct.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+struct.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+struct.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+struct.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+struct.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+struct.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+struct.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+struct.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+struct.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+struct.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+struct.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+struct.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+struct.$(OBJEXT): {$(VPATH)}internal/cast.h
+struct.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+struct.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+struct.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+struct.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+struct.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+struct.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+struct.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+struct.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+struct.$(OBJEXT): {$(VPATH)}internal/config.h
+struct.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+struct.$(OBJEXT): {$(VPATH)}internal/core.h
+struct.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+struct.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+struct.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+struct.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+struct.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+struct.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+struct.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+struct.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+struct.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+struct.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+struct.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+struct.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+struct.$(OBJEXT): {$(VPATH)}internal/ctype.h
+struct.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+struct.$(OBJEXT): {$(VPATH)}internal/dosish.h
+struct.$(OBJEXT): {$(VPATH)}internal/error.h
+struct.$(OBJEXT): {$(VPATH)}internal/eval.h
+struct.$(OBJEXT): {$(VPATH)}internal/event.h
+struct.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+struct.$(OBJEXT): {$(VPATH)}internal/gc.h
+struct.$(OBJEXT): {$(VPATH)}internal/glob.h
+struct.$(OBJEXT): {$(VPATH)}internal/globals.h
+struct.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+struct.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+struct.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+struct.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+struct.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+struct.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+struct.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+struct.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+struct.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+struct.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+struct.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+struct.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+struct.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+struct.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+struct.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+struct.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+struct.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+struct.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+struct.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+struct.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+struct.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+struct.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+struct.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+struct.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+struct.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+struct.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+struct.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+struct.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+struct.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+struct.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+struct.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+struct.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+struct.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+struct.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+struct.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+struct.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+struct.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+struct.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+struct.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+struct.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+struct.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+struct.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+struct.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+struct.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+struct.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+struct.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+struct.$(OBJEXT): {$(VPATH)}internal/iterator.h
+struct.$(OBJEXT): {$(VPATH)}internal/memory.h
+struct.$(OBJEXT): {$(VPATH)}internal/method.h
+struct.$(OBJEXT): {$(VPATH)}internal/module.h
+struct.$(OBJEXT): {$(VPATH)}internal/newobj.h
+struct.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+struct.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+struct.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+struct.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+struct.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+struct.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+struct.$(OBJEXT): {$(VPATH)}internal/symbol.h
+struct.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+struct.$(OBJEXT): {$(VPATH)}internal/value.h
+struct.$(OBJEXT): {$(VPATH)}internal/value_type.h
+struct.$(OBJEXT): {$(VPATH)}internal/variable.h
+struct.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+struct.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 struct.$(OBJEXT): {$(VPATH)}method.h
 struct.$(OBJEXT): {$(VPATH)}missing.h
 struct.$(OBJEXT): {$(VPATH)}node.h
+struct.$(OBJEXT): {$(VPATH)}onigmo.h
 struct.$(OBJEXT): {$(VPATH)}oniguruma.h
 struct.$(OBJEXT): {$(VPATH)}ruby_assert.h
 struct.$(OBJEXT): {$(VPATH)}ruby_atomic.h
@@ -2346,12 +13839,35 @@ struct.$(OBJEXT): {$(VPATH)}struct.c
 struct.$(OBJEXT): {$(VPATH)}subst.h
 struct.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 struct.$(OBJEXT): {$(VPATH)}thread_native.h
+struct.$(OBJEXT): {$(VPATH)}transient_heap.h
 struct.$(OBJEXT): {$(VPATH)}vm_core.h
-struct.$(OBJEXT): {$(VPATH)}vm_debug.h
 struct.$(OBJEXT): {$(VPATH)}vm_opts.h
+symbol.$(OBJEXT): $(hdrdir)/ruby.h
 symbol.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-symbol.$(OBJEXT): $(top_srcdir)/include/ruby.h
+symbol.$(OBJEXT): $(top_srcdir)/internal/class.h
+symbol.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+symbol.$(OBJEXT): $(top_srcdir)/internal/error.h
+symbol.$(OBJEXT): $(top_srcdir)/internal/gc.h
+symbol.$(OBJEXT): $(top_srcdir)/internal/hash.h
+symbol.$(OBJEXT): $(top_srcdir)/internal/object.h
+symbol.$(OBJEXT): $(top_srcdir)/internal/serial.h
+symbol.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+symbol.$(OBJEXT): $(top_srcdir)/internal/string.h
+symbol.$(OBJEXT): $(top_srcdir)/internal/symbol.h
+symbol.$(OBJEXT): $(top_srcdir)/internal/vm.h
+symbol.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+symbol.$(OBJEXT): {$(VPATH)}assert.h
+symbol.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+symbol.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+symbol.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+symbol.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+symbol.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+symbol.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+symbol.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+symbol.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+symbol.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 symbol.$(OBJEXT): {$(VPATH)}config.h
+symbol.$(OBJEXT): {$(VPATH)}debug_counter.h
 symbol.$(OBJEXT): {$(VPATH)}defines.h
 symbol.$(OBJEXT): {$(VPATH)}encoding.h
 symbol.$(OBJEXT): {$(VPATH)}gc.h
@@ -2361,8 +13877,149 @@ symbol.$(OBJEXT): {$(VPATH)}id_table.c
 symbol.$(OBJEXT): {$(VPATH)}id_table.h
 symbol.$(OBJEXT): {$(VPATH)}intern.h
 symbol.$(OBJEXT): {$(VPATH)}internal.h
-symbol.$(OBJEXT): {$(VPATH)}io.h
+symbol.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+symbol.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+symbol.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+symbol.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+symbol.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+symbol.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+symbol.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+symbol.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+symbol.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+symbol.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+symbol.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+symbol.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+symbol.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+symbol.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+symbol.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+symbol.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+symbol.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+symbol.$(OBJEXT): {$(VPATH)}internal/assume.h
+symbol.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+symbol.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+symbol.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+symbol.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+symbol.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+symbol.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+symbol.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+symbol.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+symbol.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+symbol.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+symbol.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+symbol.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+symbol.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+symbol.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+symbol.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+symbol.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+symbol.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+symbol.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+symbol.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+symbol.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+symbol.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+symbol.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+symbol.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+symbol.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+symbol.$(OBJEXT): {$(VPATH)}internal/cast.h
+symbol.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+symbol.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+symbol.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+symbol.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+symbol.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+symbol.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+symbol.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+symbol.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+symbol.$(OBJEXT): {$(VPATH)}internal/config.h
+symbol.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+symbol.$(OBJEXT): {$(VPATH)}internal/core.h
+symbol.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+symbol.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+symbol.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+symbol.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+symbol.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+symbol.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+symbol.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+symbol.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+symbol.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+symbol.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+symbol.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+symbol.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+symbol.$(OBJEXT): {$(VPATH)}internal/ctype.h
+symbol.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+symbol.$(OBJEXT): {$(VPATH)}internal/dosish.h
+symbol.$(OBJEXT): {$(VPATH)}internal/error.h
+symbol.$(OBJEXT): {$(VPATH)}internal/eval.h
+symbol.$(OBJEXT): {$(VPATH)}internal/event.h
+symbol.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+symbol.$(OBJEXT): {$(VPATH)}internal/gc.h
+symbol.$(OBJEXT): {$(VPATH)}internal/glob.h
+symbol.$(OBJEXT): {$(VPATH)}internal/globals.h
+symbol.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+symbol.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+symbol.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+symbol.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+symbol.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+symbol.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+symbol.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+symbol.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+symbol.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+symbol.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+symbol.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+symbol.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+symbol.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+symbol.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+symbol.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+symbol.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+symbol.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+symbol.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+symbol.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+symbol.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+symbol.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+symbol.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+symbol.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+symbol.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+symbol.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+symbol.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+symbol.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+symbol.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+symbol.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+symbol.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+symbol.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+symbol.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+symbol.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+symbol.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+symbol.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+symbol.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+symbol.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+symbol.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+symbol.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+symbol.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+symbol.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+symbol.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+symbol.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+symbol.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+symbol.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+symbol.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+symbol.$(OBJEXT): {$(VPATH)}internal/iterator.h
+symbol.$(OBJEXT): {$(VPATH)}internal/memory.h
+symbol.$(OBJEXT): {$(VPATH)}internal/method.h
+symbol.$(OBJEXT): {$(VPATH)}internal/module.h
+symbol.$(OBJEXT): {$(VPATH)}internal/newobj.h
+symbol.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+symbol.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+symbol.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+symbol.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+symbol.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+symbol.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+symbol.$(OBJEXT): {$(VPATH)}internal/symbol.h
+symbol.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+symbol.$(OBJEXT): {$(VPATH)}internal/value.h
+symbol.$(OBJEXT): {$(VPATH)}internal/value_type.h
+symbol.$(OBJEXT): {$(VPATH)}internal/variable.h
+symbol.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+symbol.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 symbol.$(OBJEXT): {$(VPATH)}missing.h
+symbol.$(OBJEXT): {$(VPATH)}node.h
+symbol.$(OBJEXT): {$(VPATH)}onigmo.h
 symbol.$(OBJEXT): {$(VPATH)}oniguruma.h
 symbol.$(OBJEXT): {$(VPATH)}probes.dmyh
 symbol.$(OBJEXT): {$(VPATH)}probes.h
@@ -2371,26 +14028,209 @@ symbol.$(OBJEXT): {$(VPATH)}st.h
 symbol.$(OBJEXT): {$(VPATH)}subst.h
 symbol.$(OBJEXT): {$(VPATH)}symbol.c
 symbol.$(OBJEXT): {$(VPATH)}symbol.h
-symbol.$(OBJEXT): {$(VPATH)}vm_opts.h
+symbol.$(OBJEXT): {$(VPATH)}vm_debug.h
+symbol.$(OBJEXT): {$(VPATH)}vm_sync.h
 thread.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 thread.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 thread.$(OBJEXT): $(CCAN_DIR)/list/list.h
 thread.$(OBJEXT): $(CCAN_DIR)/str/str.h
+thread.$(OBJEXT): $(hdrdir)/ruby.h
 thread.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-thread.$(OBJEXT): $(top_srcdir)/include/ruby.h
+thread.$(OBJEXT): $(top_srcdir)/internal/array.h
+thread.$(OBJEXT): $(top_srcdir)/internal/bits.h
+thread.$(OBJEXT): $(top_srcdir)/internal/class.h
+thread.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+thread.$(OBJEXT): $(top_srcdir)/internal/cont.h
+thread.$(OBJEXT): $(top_srcdir)/internal/error.h
+thread.$(OBJEXT): $(top_srcdir)/internal/gc.h
+thread.$(OBJEXT): $(top_srcdir)/internal/hash.h
+thread.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+thread.$(OBJEXT): $(top_srcdir)/internal/io.h
+thread.$(OBJEXT): $(top_srcdir)/internal/object.h
+thread.$(OBJEXT): $(top_srcdir)/internal/proc.h
+thread.$(OBJEXT): $(top_srcdir)/internal/scheduler.h
+thread.$(OBJEXT): $(top_srcdir)/internal/serial.h
+thread.$(OBJEXT): $(top_srcdir)/internal/signal.h
+thread.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+thread.$(OBJEXT): $(top_srcdir)/internal/string.h
+thread.$(OBJEXT): $(top_srcdir)/internal/thread.h
+thread.$(OBJEXT): $(top_srcdir)/internal/time.h
+thread.$(OBJEXT): $(top_srcdir)/internal/vm.h
+thread.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+thread.$(OBJEXT): {$(VPATH)}$(COROUTINE_H)
+thread.$(OBJEXT): {$(VPATH)}assert.h
+thread.$(OBJEXT): {$(VPATH)}atomic.h
+thread.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+thread.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+thread.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+thread.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+thread.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+thread.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+thread.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+thread.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+thread.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 thread.$(OBJEXT): {$(VPATH)}config.h
+thread.$(OBJEXT): {$(VPATH)}debug.h
+thread.$(OBJEXT): {$(VPATH)}debug_counter.h
 thread.$(OBJEXT): {$(VPATH)}defines.h
 thread.$(OBJEXT): {$(VPATH)}encoding.h
 thread.$(OBJEXT): {$(VPATH)}eval_intern.h
 thread.$(OBJEXT): {$(VPATH)}gc.h
+thread.$(OBJEXT): {$(VPATH)}hrtime.h
 thread.$(OBJEXT): {$(VPATH)}id.h
+thread.$(OBJEXT): {$(VPATH)}id_table.h
 thread.$(OBJEXT): {$(VPATH)}intern.h
 thread.$(OBJEXT): {$(VPATH)}internal.h
+thread.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+thread.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+thread.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+thread.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+thread.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+thread.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+thread.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+thread.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+thread.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+thread.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+thread.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+thread.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+thread.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+thread.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+thread.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+thread.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+thread.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+thread.$(OBJEXT): {$(VPATH)}internal/assume.h
+thread.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+thread.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+thread.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+thread.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+thread.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+thread.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+thread.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+thread.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+thread.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+thread.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+thread.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+thread.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+thread.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+thread.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+thread.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+thread.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+thread.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+thread.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+thread.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+thread.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+thread.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+thread.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+thread.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+thread.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+thread.$(OBJEXT): {$(VPATH)}internal/cast.h
+thread.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+thread.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+thread.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+thread.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+thread.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+thread.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+thread.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+thread.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+thread.$(OBJEXT): {$(VPATH)}internal/config.h
+thread.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+thread.$(OBJEXT): {$(VPATH)}internal/core.h
+thread.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+thread.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+thread.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+thread.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+thread.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+thread.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+thread.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+thread.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+thread.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+thread.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+thread.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+thread.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+thread.$(OBJEXT): {$(VPATH)}internal/ctype.h
+thread.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+thread.$(OBJEXT): {$(VPATH)}internal/dosish.h
+thread.$(OBJEXT): {$(VPATH)}internal/error.h
+thread.$(OBJEXT): {$(VPATH)}internal/eval.h
+thread.$(OBJEXT): {$(VPATH)}internal/event.h
+thread.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+thread.$(OBJEXT): {$(VPATH)}internal/gc.h
+thread.$(OBJEXT): {$(VPATH)}internal/glob.h
+thread.$(OBJEXT): {$(VPATH)}internal/globals.h
+thread.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+thread.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+thread.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+thread.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+thread.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+thread.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+thread.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+thread.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+thread.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+thread.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+thread.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+thread.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+thread.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+thread.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+thread.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+thread.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+thread.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+thread.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+thread.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+thread.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+thread.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+thread.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+thread.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+thread.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+thread.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+thread.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+thread.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+thread.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+thread.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+thread.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+thread.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+thread.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+thread.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+thread.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+thread.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+thread.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+thread.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+thread.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+thread.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+thread.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+thread.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+thread.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+thread.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+thread.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+thread.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+thread.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+thread.$(OBJEXT): {$(VPATH)}internal/iterator.h
+thread.$(OBJEXT): {$(VPATH)}internal/memory.h
+thread.$(OBJEXT): {$(VPATH)}internal/method.h
+thread.$(OBJEXT): {$(VPATH)}internal/module.h
+thread.$(OBJEXT): {$(VPATH)}internal/newobj.h
+thread.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+thread.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+thread.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+thread.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+thread.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+thread.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+thread.$(OBJEXT): {$(VPATH)}internal/symbol.h
+thread.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+thread.$(OBJEXT): {$(VPATH)}internal/value.h
+thread.$(OBJEXT): {$(VPATH)}internal/value_type.h
+thread.$(OBJEXT): {$(VPATH)}internal/variable.h
+thread.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+thread.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 thread.$(OBJEXT): {$(VPATH)}io.h
+thread.$(OBJEXT): {$(VPATH)}iseq.h
 thread.$(OBJEXT): {$(VPATH)}method.h
 thread.$(OBJEXT): {$(VPATH)}missing.h
+thread.$(OBJEXT): {$(VPATH)}mjit.h
 thread.$(OBJEXT): {$(VPATH)}node.h
+thread.$(OBJEXT): {$(VPATH)}onigmo.h
 thread.$(OBJEXT): {$(VPATH)}oniguruma.h
+thread.$(OBJEXT): {$(VPATH)}ractor.h
+thread.$(OBJEXT): {$(VPATH)}ractor_core.h
 thread.$(OBJEXT): {$(VPATH)}ruby_assert.h
 thread.$(OBJEXT): {$(VPATH)}ruby_atomic.h
 thread.$(OBJEXT): {$(VPATH)}st.h
@@ -2405,44 +14245,726 @@ thread.$(OBJEXT): {$(VPATH)}timev.h
 thread.$(OBJEXT): {$(VPATH)}vm_core.h
 thread.$(OBJEXT): {$(VPATH)}vm_debug.h
 thread.$(OBJEXT): {$(VPATH)}vm_opts.h
+thread.$(OBJEXT): {$(VPATH)}vm_sync.h
+time.$(OBJEXT): $(hdrdir)/ruby.h
 time.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-time.$(OBJEXT): $(top_srcdir)/include/ruby.h
+time.$(OBJEXT): $(top_srcdir)/internal/array.h
+time.$(OBJEXT): $(top_srcdir)/internal/bignum.h
+time.$(OBJEXT): $(top_srcdir)/internal/bits.h
+time.$(OBJEXT): $(top_srcdir)/internal/compar.h
+time.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+time.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
+time.$(OBJEXT): $(top_srcdir)/internal/gc.h
+time.$(OBJEXT): $(top_srcdir)/internal/numeric.h
+time.$(OBJEXT): $(top_srcdir)/internal/rational.h
+time.$(OBJEXT): $(top_srcdir)/internal/serial.h
+time.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+time.$(OBJEXT): $(top_srcdir)/internal/string.h
+time.$(OBJEXT): $(top_srcdir)/internal/time.h
+time.$(OBJEXT): $(top_srcdir)/internal/variable.h
+time.$(OBJEXT): $(top_srcdir)/internal/vm.h
+time.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+time.$(OBJEXT): {$(VPATH)}assert.h
+time.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+time.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+time.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+time.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+time.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+time.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+time.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+time.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+time.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 time.$(OBJEXT): {$(VPATH)}config.h
+time.$(OBJEXT): {$(VPATH)}constant.h
 time.$(OBJEXT): {$(VPATH)}defines.h
 time.$(OBJEXT): {$(VPATH)}encoding.h
+time.$(OBJEXT): {$(VPATH)}id.h
+time.$(OBJEXT): {$(VPATH)}id_table.h
 time.$(OBJEXT): {$(VPATH)}intern.h
 time.$(OBJEXT): {$(VPATH)}internal.h
-time.$(OBJEXT): {$(VPATH)}io.h
+time.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+time.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+time.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+time.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+time.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+time.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+time.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+time.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+time.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+time.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+time.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+time.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+time.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+time.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+time.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+time.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+time.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+time.$(OBJEXT): {$(VPATH)}internal/assume.h
+time.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+time.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+time.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+time.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+time.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+time.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+time.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+time.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+time.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+time.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+time.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+time.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+time.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+time.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+time.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+time.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+time.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+time.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+time.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+time.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+time.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+time.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+time.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+time.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+time.$(OBJEXT): {$(VPATH)}internal/cast.h
+time.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+time.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+time.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+time.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+time.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+time.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+time.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+time.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+time.$(OBJEXT): {$(VPATH)}internal/config.h
+time.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+time.$(OBJEXT): {$(VPATH)}internal/core.h
+time.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+time.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+time.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+time.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+time.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+time.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+time.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+time.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+time.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+time.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+time.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+time.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+time.$(OBJEXT): {$(VPATH)}internal/ctype.h
+time.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+time.$(OBJEXT): {$(VPATH)}internal/dosish.h
+time.$(OBJEXT): {$(VPATH)}internal/error.h
+time.$(OBJEXT): {$(VPATH)}internal/eval.h
+time.$(OBJEXT): {$(VPATH)}internal/event.h
+time.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+time.$(OBJEXT): {$(VPATH)}internal/gc.h
+time.$(OBJEXT): {$(VPATH)}internal/glob.h
+time.$(OBJEXT): {$(VPATH)}internal/globals.h
+time.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+time.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+time.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+time.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+time.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+time.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+time.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+time.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+time.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+time.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+time.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+time.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+time.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+time.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+time.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+time.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+time.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+time.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+time.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+time.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+time.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+time.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+time.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+time.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+time.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+time.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+time.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+time.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+time.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+time.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+time.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+time.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+time.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+time.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+time.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+time.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+time.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+time.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+time.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+time.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+time.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+time.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+time.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+time.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+time.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+time.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+time.$(OBJEXT): {$(VPATH)}internal/iterator.h
+time.$(OBJEXT): {$(VPATH)}internal/memory.h
+time.$(OBJEXT): {$(VPATH)}internal/method.h
+time.$(OBJEXT): {$(VPATH)}internal/module.h
+time.$(OBJEXT): {$(VPATH)}internal/newobj.h
+time.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+time.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+time.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+time.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+time.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+time.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+time.$(OBJEXT): {$(VPATH)}internal/symbol.h
+time.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+time.$(OBJEXT): {$(VPATH)}internal/value.h
+time.$(OBJEXT): {$(VPATH)}internal/value_type.h
+time.$(OBJEXT): {$(VPATH)}internal/variable.h
+time.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+time.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 time.$(OBJEXT): {$(VPATH)}missing.h
+time.$(OBJEXT): {$(VPATH)}onigmo.h
 time.$(OBJEXT): {$(VPATH)}oniguruma.h
+time.$(OBJEXT): {$(VPATH)}ruby_assert.h
 time.$(OBJEXT): {$(VPATH)}st.h
 time.$(OBJEXT): {$(VPATH)}subst.h
 time.$(OBJEXT): {$(VPATH)}time.c
 time.$(OBJEXT): {$(VPATH)}timev.h
+transcode.$(OBJEXT): $(hdrdir)/ruby.h
 transcode.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-transcode.$(OBJEXT): $(top_srcdir)/include/ruby.h
+transcode.$(OBJEXT): $(top_srcdir)/internal/array.h
+transcode.$(OBJEXT): $(top_srcdir)/internal/class.h
+transcode.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+transcode.$(OBJEXT): $(top_srcdir)/internal/gc.h
+transcode.$(OBJEXT): $(top_srcdir)/internal/inits.h
+transcode.$(OBJEXT): $(top_srcdir)/internal/object.h
+transcode.$(OBJEXT): $(top_srcdir)/internal/serial.h
+transcode.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+transcode.$(OBJEXT): $(top_srcdir)/internal/string.h
+transcode.$(OBJEXT): $(top_srcdir)/internal/transcode.h
+transcode.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+transcode.$(OBJEXT): {$(VPATH)}assert.h
+transcode.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+transcode.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+transcode.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+transcode.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+transcode.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+transcode.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+transcode.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+transcode.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+transcode.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 transcode.$(OBJEXT): {$(VPATH)}config.h
 transcode.$(OBJEXT): {$(VPATH)}defines.h
 transcode.$(OBJEXT): {$(VPATH)}encoding.h
+transcode.$(OBJEXT): {$(VPATH)}id.h
+transcode.$(OBJEXT): {$(VPATH)}id_table.h
 transcode.$(OBJEXT): {$(VPATH)}intern.h
 transcode.$(OBJEXT): {$(VPATH)}internal.h
-transcode.$(OBJEXT): {$(VPATH)}io.h
+transcode.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+transcode.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+transcode.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+transcode.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+transcode.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+transcode.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+transcode.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+transcode.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+transcode.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+transcode.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+transcode.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+transcode.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+transcode.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+transcode.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+transcode.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+transcode.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+transcode.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+transcode.$(OBJEXT): {$(VPATH)}internal/assume.h
+transcode.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+transcode.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+transcode.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+transcode.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+transcode.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+transcode.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+transcode.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+transcode.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+transcode.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+transcode.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+transcode.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+transcode.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+transcode.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+transcode.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+transcode.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+transcode.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+transcode.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+transcode.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+transcode.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+transcode.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+transcode.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+transcode.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+transcode.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+transcode.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+transcode.$(OBJEXT): {$(VPATH)}internal/cast.h
+transcode.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+transcode.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+transcode.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+transcode.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+transcode.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+transcode.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+transcode.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+transcode.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+transcode.$(OBJEXT): {$(VPATH)}internal/config.h
+transcode.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+transcode.$(OBJEXT): {$(VPATH)}internal/core.h
+transcode.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+transcode.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+transcode.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+transcode.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+transcode.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+transcode.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+transcode.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+transcode.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+transcode.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+transcode.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+transcode.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+transcode.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+transcode.$(OBJEXT): {$(VPATH)}internal/ctype.h
+transcode.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+transcode.$(OBJEXT): {$(VPATH)}internal/dosish.h
+transcode.$(OBJEXT): {$(VPATH)}internal/error.h
+transcode.$(OBJEXT): {$(VPATH)}internal/eval.h
+transcode.$(OBJEXT): {$(VPATH)}internal/event.h
+transcode.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+transcode.$(OBJEXT): {$(VPATH)}internal/gc.h
+transcode.$(OBJEXT): {$(VPATH)}internal/glob.h
+transcode.$(OBJEXT): {$(VPATH)}internal/globals.h
+transcode.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+transcode.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+transcode.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+transcode.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+transcode.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+transcode.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+transcode.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+transcode.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+transcode.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+transcode.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+transcode.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+transcode.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+transcode.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+transcode.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+transcode.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+transcode.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+transcode.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+transcode.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+transcode.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+transcode.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+transcode.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+transcode.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+transcode.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+transcode.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+transcode.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+transcode.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+transcode.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+transcode.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+transcode.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+transcode.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+transcode.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+transcode.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+transcode.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+transcode.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+transcode.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+transcode.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+transcode.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+transcode.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+transcode.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+transcode.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+transcode.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+transcode.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+transcode.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+transcode.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+transcode.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+transcode.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+transcode.$(OBJEXT): {$(VPATH)}internal/iterator.h
+transcode.$(OBJEXT): {$(VPATH)}internal/memory.h
+transcode.$(OBJEXT): {$(VPATH)}internal/method.h
+transcode.$(OBJEXT): {$(VPATH)}internal/module.h
+transcode.$(OBJEXT): {$(VPATH)}internal/newobj.h
+transcode.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+transcode.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+transcode.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+transcode.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+transcode.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+transcode.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+transcode.$(OBJEXT): {$(VPATH)}internal/symbol.h
+transcode.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+transcode.$(OBJEXT): {$(VPATH)}internal/value.h
+transcode.$(OBJEXT): {$(VPATH)}internal/value_type.h
+transcode.$(OBJEXT): {$(VPATH)}internal/variable.h
+transcode.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+transcode.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 transcode.$(OBJEXT): {$(VPATH)}missing.h
+transcode.$(OBJEXT): {$(VPATH)}onigmo.h
 transcode.$(OBJEXT): {$(VPATH)}oniguruma.h
 transcode.$(OBJEXT): {$(VPATH)}st.h
 transcode.$(OBJEXT): {$(VPATH)}subst.h
 transcode.$(OBJEXT): {$(VPATH)}transcode.c
 transcode.$(OBJEXT): {$(VPATH)}transcode_data.h
+transient_heap.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+transient_heap.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+transient_heap.$(OBJEXT): $(CCAN_DIR)/list/list.h
+transient_heap.$(OBJEXT): $(CCAN_DIR)/str/str.h
+transient_heap.$(OBJEXT): $(hdrdir)/ruby.h
+transient_heap.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+transient_heap.$(OBJEXT): $(top_srcdir)/internal/array.h
+transient_heap.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+transient_heap.$(OBJEXT): $(top_srcdir)/internal/gc.h
+transient_heap.$(OBJEXT): $(top_srcdir)/internal/hash.h
+transient_heap.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+transient_heap.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
+transient_heap.$(OBJEXT): $(top_srcdir)/internal/serial.h
+transient_heap.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+transient_heap.$(OBJEXT): $(top_srcdir)/internal/struct.h
+transient_heap.$(OBJEXT): $(top_srcdir)/internal/variable.h
+transient_heap.$(OBJEXT): $(top_srcdir)/internal/vm.h
+transient_heap.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+transient_heap.$(OBJEXT): {$(VPATH)}assert.h
+transient_heap.$(OBJEXT): {$(VPATH)}atomic.h
+transient_heap.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+transient_heap.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+transient_heap.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+transient_heap.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+transient_heap.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+transient_heap.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+transient_heap.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+transient_heap.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+transient_heap.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
+transient_heap.$(OBJEXT): {$(VPATH)}config.h
+transient_heap.$(OBJEXT): {$(VPATH)}constant.h
+transient_heap.$(OBJEXT): {$(VPATH)}debug.h
+transient_heap.$(OBJEXT): {$(VPATH)}debug_counter.h
+transient_heap.$(OBJEXT): {$(VPATH)}defines.h
+transient_heap.$(OBJEXT): {$(VPATH)}gc.h
+transient_heap.$(OBJEXT): {$(VPATH)}id.h
+transient_heap.$(OBJEXT): {$(VPATH)}id_table.h
+transient_heap.$(OBJEXT): {$(VPATH)}intern.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/assume.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/cast.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/config.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/core.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/ctype.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/dosish.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/error.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/eval.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/event.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/gc.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/glob.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/globals.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/iterator.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/memory.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/method.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/module.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/newobj.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/symbol.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/value.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/value_type.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/variable.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+transient_heap.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
+transient_heap.$(OBJEXT): {$(VPATH)}method.h
+transient_heap.$(OBJEXT): {$(VPATH)}missing.h
+transient_heap.$(OBJEXT): {$(VPATH)}node.h
+transient_heap.$(OBJEXT): {$(VPATH)}ruby_assert.h
+transient_heap.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+transient_heap.$(OBJEXT): {$(VPATH)}st.h
+transient_heap.$(OBJEXT): {$(VPATH)}subst.h
+transient_heap.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+transient_heap.$(OBJEXT): {$(VPATH)}thread_native.h
+transient_heap.$(OBJEXT): {$(VPATH)}transient_heap.c
+transient_heap.$(OBJEXT): {$(VPATH)}transient_heap.h
+transient_heap.$(OBJEXT): {$(VPATH)}vm_core.h
+transient_heap.$(OBJEXT): {$(VPATH)}vm_debug.h
+transient_heap.$(OBJEXT): {$(VPATH)}vm_opts.h
+transient_heap.$(OBJEXT): {$(VPATH)}vm_sync.h
+util.$(OBJEXT): $(hdrdir)/ruby.h
 util.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-util.$(OBJEXT): $(top_srcdir)/include/ruby.h
+util.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+util.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
+util.$(OBJEXT): $(top_srcdir)/internal/util.h
+util.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+util.$(OBJEXT): {$(VPATH)}assert.h
+util.$(OBJEXT): {$(VPATH)}atomic.h
+util.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+util.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+util.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+util.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+util.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+util.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+util.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+util.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+util.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 util.$(OBJEXT): {$(VPATH)}config.h
 util.$(OBJEXT): {$(VPATH)}defines.h
-util.$(OBJEXT): {$(VPATH)}encoding.h
+util.$(OBJEXT): {$(VPATH)}dtoa.c
 util.$(OBJEXT): {$(VPATH)}intern.h
 util.$(OBJEXT): {$(VPATH)}internal.h
-util.$(OBJEXT): {$(VPATH)}io.h
+util.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+util.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+util.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+util.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+util.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+util.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+util.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+util.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+util.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+util.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+util.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+util.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+util.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+util.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+util.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+util.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+util.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+util.$(OBJEXT): {$(VPATH)}internal/assume.h
+util.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+util.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+util.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+util.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+util.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+util.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+util.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+util.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+util.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+util.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+util.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+util.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+util.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+util.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+util.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+util.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+util.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+util.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+util.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+util.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+util.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+util.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+util.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+util.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+util.$(OBJEXT): {$(VPATH)}internal/cast.h
+util.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+util.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+util.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+util.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+util.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+util.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+util.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+util.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+util.$(OBJEXT): {$(VPATH)}internal/config.h
+util.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+util.$(OBJEXT): {$(VPATH)}internal/core.h
+util.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+util.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+util.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+util.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+util.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+util.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+util.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+util.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+util.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+util.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+util.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+util.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+util.$(OBJEXT): {$(VPATH)}internal/ctype.h
+util.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+util.$(OBJEXT): {$(VPATH)}internal/dosish.h
+util.$(OBJEXT): {$(VPATH)}internal/error.h
+util.$(OBJEXT): {$(VPATH)}internal/eval.h
+util.$(OBJEXT): {$(VPATH)}internal/event.h
+util.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+util.$(OBJEXT): {$(VPATH)}internal/gc.h
+util.$(OBJEXT): {$(VPATH)}internal/glob.h
+util.$(OBJEXT): {$(VPATH)}internal/globals.h
+util.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+util.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+util.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+util.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+util.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+util.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+util.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+util.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+util.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+util.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+util.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+util.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+util.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+util.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+util.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+util.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+util.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+util.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+util.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+util.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+util.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+util.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+util.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+util.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+util.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+util.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+util.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+util.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+util.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+util.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+util.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+util.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+util.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+util.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+util.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+util.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+util.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+util.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+util.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+util.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+util.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+util.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+util.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+util.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+util.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+util.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+util.$(OBJEXT): {$(VPATH)}internal/iterator.h
+util.$(OBJEXT): {$(VPATH)}internal/memory.h
+util.$(OBJEXT): {$(VPATH)}internal/method.h
+util.$(OBJEXT): {$(VPATH)}internal/module.h
+util.$(OBJEXT): {$(VPATH)}internal/newobj.h
+util.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+util.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+util.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+util.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+util.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+util.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+util.$(OBJEXT): {$(VPATH)}internal/symbol.h
+util.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+util.$(OBJEXT): {$(VPATH)}internal/value.h
+util.$(OBJEXT): {$(VPATH)}internal/value_type.h
+util.$(OBJEXT): {$(VPATH)}internal/variable.h
+util.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+util.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 util.$(OBJEXT): {$(VPATH)}missing.h
-util.$(OBJEXT): {$(VPATH)}oniguruma.h
+util.$(OBJEXT): {$(VPATH)}ruby_atomic.h
 util.$(OBJEXT): {$(VPATH)}st.h
 util.$(OBJEXT): {$(VPATH)}subst.h
 util.$(OBJEXT): {$(VPATH)}util.c
@@ -2451,43 +14973,446 @@ variable.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 variable.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 variable.$(OBJEXT): $(CCAN_DIR)/list/list.h
 variable.$(OBJEXT): $(CCAN_DIR)/str/str.h
+variable.$(OBJEXT): $(hdrdir)/ruby.h
 variable.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-variable.$(OBJEXT): $(top_srcdir)/include/ruby.h
+variable.$(OBJEXT): $(top_srcdir)/internal/array.h
+variable.$(OBJEXT): $(top_srcdir)/internal/class.h
+variable.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+variable.$(OBJEXT): $(top_srcdir)/internal/error.h
+variable.$(OBJEXT): $(top_srcdir)/internal/eval.h
+variable.$(OBJEXT): $(top_srcdir)/internal/gc.h
+variable.$(OBJEXT): $(top_srcdir)/internal/hash.h
+variable.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+variable.$(OBJEXT): $(top_srcdir)/internal/object.h
+variable.$(OBJEXT): $(top_srcdir)/internal/re.h
+variable.$(OBJEXT): $(top_srcdir)/internal/serial.h
+variable.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+variable.$(OBJEXT): $(top_srcdir)/internal/string.h
+variable.$(OBJEXT): $(top_srcdir)/internal/symbol.h
+variable.$(OBJEXT): $(top_srcdir)/internal/thread.h
+variable.$(OBJEXT): $(top_srcdir)/internal/variable.h
+variable.$(OBJEXT): $(top_srcdir)/internal/vm.h
+variable.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+variable.$(OBJEXT): {$(VPATH)}assert.h
+variable.$(OBJEXT): {$(VPATH)}atomic.h
+variable.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+variable.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+variable.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+variable.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+variable.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+variable.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+variable.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+variable.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+variable.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 variable.$(OBJEXT): {$(VPATH)}config.h
 variable.$(OBJEXT): {$(VPATH)}constant.h
+variable.$(OBJEXT): {$(VPATH)}debug_counter.h
 variable.$(OBJEXT): {$(VPATH)}defines.h
 variable.$(OBJEXT): {$(VPATH)}encoding.h
 variable.$(OBJEXT): {$(VPATH)}id.h
 variable.$(OBJEXT): {$(VPATH)}id_table.h
 variable.$(OBJEXT): {$(VPATH)}intern.h
 variable.$(OBJEXT): {$(VPATH)}internal.h
-variable.$(OBJEXT): {$(VPATH)}io.h
+variable.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+variable.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+variable.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+variable.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+variable.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+variable.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+variable.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+variable.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+variable.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+variable.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+variable.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+variable.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+variable.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+variable.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+variable.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+variable.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+variable.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+variable.$(OBJEXT): {$(VPATH)}internal/assume.h
+variable.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+variable.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+variable.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+variable.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+variable.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+variable.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+variable.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+variable.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+variable.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+variable.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+variable.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+variable.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+variable.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+variable.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+variable.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+variable.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+variable.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+variable.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+variable.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+variable.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+variable.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+variable.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+variable.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+variable.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+variable.$(OBJEXT): {$(VPATH)}internal/cast.h
+variable.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+variable.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+variable.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+variable.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+variable.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+variable.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+variable.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+variable.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+variable.$(OBJEXT): {$(VPATH)}internal/config.h
+variable.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+variable.$(OBJEXT): {$(VPATH)}internal/core.h
+variable.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+variable.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+variable.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+variable.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+variable.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+variable.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+variable.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+variable.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+variable.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+variable.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+variable.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+variable.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+variable.$(OBJEXT): {$(VPATH)}internal/ctype.h
+variable.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+variable.$(OBJEXT): {$(VPATH)}internal/dosish.h
+variable.$(OBJEXT): {$(VPATH)}internal/error.h
+variable.$(OBJEXT): {$(VPATH)}internal/eval.h
+variable.$(OBJEXT): {$(VPATH)}internal/event.h
+variable.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+variable.$(OBJEXT): {$(VPATH)}internal/gc.h
+variable.$(OBJEXT): {$(VPATH)}internal/glob.h
+variable.$(OBJEXT): {$(VPATH)}internal/globals.h
+variable.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+variable.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+variable.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+variable.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+variable.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+variable.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+variable.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+variable.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+variable.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+variable.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+variable.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+variable.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+variable.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+variable.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+variable.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+variable.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+variable.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+variable.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+variable.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+variable.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+variable.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+variable.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+variable.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+variable.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+variable.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+variable.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+variable.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+variable.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+variable.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+variable.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+variable.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+variable.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+variable.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+variable.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+variable.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+variable.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+variable.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+variable.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+variable.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+variable.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+variable.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+variable.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+variable.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+variable.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+variable.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+variable.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+variable.$(OBJEXT): {$(VPATH)}internal/iterator.h
+variable.$(OBJEXT): {$(VPATH)}internal/memory.h
+variable.$(OBJEXT): {$(VPATH)}internal/method.h
+variable.$(OBJEXT): {$(VPATH)}internal/module.h
+variable.$(OBJEXT): {$(VPATH)}internal/newobj.h
+variable.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+variable.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+variable.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+variable.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+variable.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+variable.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+variable.$(OBJEXT): {$(VPATH)}internal/symbol.h
+variable.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+variable.$(OBJEXT): {$(VPATH)}internal/value.h
+variable.$(OBJEXT): {$(VPATH)}internal/value_type.h
+variable.$(OBJEXT): {$(VPATH)}internal/variable.h
+variable.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+variable.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
+variable.$(OBJEXT): {$(VPATH)}method.h
 variable.$(OBJEXT): {$(VPATH)}missing.h
+variable.$(OBJEXT): {$(VPATH)}node.h
+variable.$(OBJEXT): {$(VPATH)}onigmo.h
 variable.$(OBJEXT): {$(VPATH)}oniguruma.h
+variable.$(OBJEXT): {$(VPATH)}ractor.h
+variable.$(OBJEXT): {$(VPATH)}ractor_core.h
+variable.$(OBJEXT): {$(VPATH)}ruby_assert.h
+variable.$(OBJEXT): {$(VPATH)}ruby_atomic.h
 variable.$(OBJEXT): {$(VPATH)}st.h
 variable.$(OBJEXT): {$(VPATH)}subst.h
+variable.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+variable.$(OBJEXT): {$(VPATH)}thread_native.h
+variable.$(OBJEXT): {$(VPATH)}transient_heap.h
 variable.$(OBJEXT): {$(VPATH)}util.h
 variable.$(OBJEXT): {$(VPATH)}variable.c
+variable.$(OBJEXT): {$(VPATH)}variable.h
+variable.$(OBJEXT): {$(VPATH)}vm_core.h
+variable.$(OBJEXT): {$(VPATH)}vm_debug.h
+variable.$(OBJEXT): {$(VPATH)}vm_opts.h
+variable.$(OBJEXT): {$(VPATH)}vm_sync.h
+version.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+version.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+version.$(OBJEXT): $(CCAN_DIR)/list/list.h
+version.$(OBJEXT): $(CCAN_DIR)/str/str.h
+version.$(OBJEXT): $(hdrdir)/ruby.h
 version.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 version.$(OBJEXT): $(hdrdir)/ruby/version.h
+version.$(OBJEXT): $(top_srcdir)/internal/array.h
+version.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+version.$(OBJEXT): $(top_srcdir)/internal/gc.h
+version.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+version.$(OBJEXT): $(top_srcdir)/internal/serial.h
+version.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+version.$(OBJEXT): $(top_srcdir)/internal/vm.h
+version.$(OBJEXT): $(top_srcdir)/internal/warnings.h
 version.$(OBJEXT): $(top_srcdir)/revision.h
 version.$(OBJEXT): $(top_srcdir)/version.h
+version.$(OBJEXT): {$(VPATH)}assert.h
+version.$(OBJEXT): {$(VPATH)}atomic.h
+version.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+version.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+version.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+version.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+version.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+version.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+version.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+version.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+version.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 version.$(OBJEXT): {$(VPATH)}config.h
+version.$(OBJEXT): {$(VPATH)}debug_counter.h
 version.$(OBJEXT): {$(VPATH)}defines.h
+version.$(OBJEXT): {$(VPATH)}id.h
 version.$(OBJEXT): {$(VPATH)}intern.h
+version.$(OBJEXT): {$(VPATH)}internal.h
+version.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+version.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+version.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+version.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+version.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+version.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+version.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+version.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+version.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+version.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+version.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+version.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+version.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+version.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+version.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+version.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+version.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+version.$(OBJEXT): {$(VPATH)}internal/assume.h
+version.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+version.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+version.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+version.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+version.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+version.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+version.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+version.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+version.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+version.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+version.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+version.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+version.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+version.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+version.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+version.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+version.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+version.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+version.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+version.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+version.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+version.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+version.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+version.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+version.$(OBJEXT): {$(VPATH)}internal/cast.h
+version.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+version.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+version.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+version.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+version.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+version.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+version.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+version.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+version.$(OBJEXT): {$(VPATH)}internal/config.h
+version.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+version.$(OBJEXT): {$(VPATH)}internal/core.h
+version.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+version.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+version.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+version.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+version.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+version.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+version.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+version.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+version.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+version.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+version.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+version.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+version.$(OBJEXT): {$(VPATH)}internal/ctype.h
+version.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+version.$(OBJEXT): {$(VPATH)}internal/dosish.h
+version.$(OBJEXT): {$(VPATH)}internal/error.h
+version.$(OBJEXT): {$(VPATH)}internal/eval.h
+version.$(OBJEXT): {$(VPATH)}internal/event.h
+version.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+version.$(OBJEXT): {$(VPATH)}internal/gc.h
+version.$(OBJEXT): {$(VPATH)}internal/glob.h
+version.$(OBJEXT): {$(VPATH)}internal/globals.h
+version.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+version.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+version.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+version.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+version.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+version.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+version.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+version.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+version.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+version.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+version.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+version.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+version.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+version.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+version.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+version.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+version.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+version.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+version.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+version.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+version.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+version.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+version.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+version.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+version.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+version.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+version.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+version.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+version.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+version.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+version.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+version.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+version.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+version.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+version.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+version.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+version.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+version.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+version.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+version.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+version.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+version.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+version.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+version.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+version.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+version.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+version.$(OBJEXT): {$(VPATH)}internal/iterator.h
+version.$(OBJEXT): {$(VPATH)}internal/memory.h
+version.$(OBJEXT): {$(VPATH)}internal/method.h
+version.$(OBJEXT): {$(VPATH)}internal/module.h
+version.$(OBJEXT): {$(VPATH)}internal/newobj.h
+version.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+version.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+version.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+version.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+version.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+version.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+version.$(OBJEXT): {$(VPATH)}internal/symbol.h
+version.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+version.$(OBJEXT): {$(VPATH)}internal/value.h
+version.$(OBJEXT): {$(VPATH)}internal/value_type.h
+version.$(OBJEXT): {$(VPATH)}internal/variable.h
+version.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+version.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
+version.$(OBJEXT): {$(VPATH)}method.h
 version.$(OBJEXT): {$(VPATH)}missing.h
+version.$(OBJEXT): {$(VPATH)}mjit.h
+version.$(OBJEXT): {$(VPATH)}node.h
+version.$(OBJEXT): {$(VPATH)}ruby_assert.h
+version.$(OBJEXT): {$(VPATH)}ruby_atomic.h
 version.$(OBJEXT): {$(VPATH)}st.h
 version.$(OBJEXT): {$(VPATH)}subst.h
+version.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+version.$(OBJEXT): {$(VPATH)}thread_native.h
 version.$(OBJEXT): {$(VPATH)}version.c
+version.$(OBJEXT): {$(VPATH)}vm_core.h
+version.$(OBJEXT): {$(VPATH)}vm_opts.h
 vm.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 vm.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 vm.$(OBJEXT): $(CCAN_DIR)/list/list.h
 vm.$(OBJEXT): $(CCAN_DIR)/str/str.h
+vm.$(OBJEXT): $(hdrdir)/ruby.h
 vm.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-vm.$(OBJEXT): $(top_srcdir)/include/ruby.h
+vm.$(OBJEXT): $(top_srcdir)/internal/array.h
+vm.$(OBJEXT): $(top_srcdir)/internal/bignum.h
+vm.$(OBJEXT): $(top_srcdir)/internal/bits.h
+vm.$(OBJEXT): $(top_srcdir)/internal/class.h
+vm.$(OBJEXT): $(top_srcdir)/internal/compar.h
+vm.$(OBJEXT): $(top_srcdir)/internal/compile.h
+vm.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+vm.$(OBJEXT): $(top_srcdir)/internal/cont.h
+vm.$(OBJEXT): $(top_srcdir)/internal/error.h
+vm.$(OBJEXT): $(top_srcdir)/internal/eval.h
+vm.$(OBJEXT): $(top_srcdir)/internal/fixnum.h
+vm.$(OBJEXT): $(top_srcdir)/internal/gc.h
+vm.$(OBJEXT): $(top_srcdir)/internal/hash.h
+vm.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+vm.$(OBJEXT): $(top_srcdir)/internal/inits.h
+vm.$(OBJEXT): $(top_srcdir)/internal/numeric.h
+vm.$(OBJEXT): $(top_srcdir)/internal/object.h
+vm.$(OBJEXT): $(top_srcdir)/internal/parse.h
+vm.$(OBJEXT): $(top_srcdir)/internal/proc.h
+vm.$(OBJEXT): $(top_srcdir)/internal/random.h
+vm.$(OBJEXT): $(top_srcdir)/internal/re.h
+vm.$(OBJEXT): $(top_srcdir)/internal/sanitizers.h
+vm.$(OBJEXT): $(top_srcdir)/internal/serial.h
+vm.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+vm.$(OBJEXT): $(top_srcdir)/internal/string.h
+vm.$(OBJEXT): $(top_srcdir)/internal/symbol.h
+vm.$(OBJEXT): $(top_srcdir)/internal/variable.h
+vm.$(OBJEXT): $(top_srcdir)/internal/vm.h
+vm.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+vm.$(OBJEXT): {$(VPATH)}assert.h
+vm.$(OBJEXT): {$(VPATH)}atomic.h
+vm.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+vm.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+vm.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+vm.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+vm.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+vm.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+vm.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+vm.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+vm.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
+vm.$(OBJEXT): {$(VPATH)}builtin.h
 vm.$(OBJEXT): {$(VPATH)}config.h
 vm.$(OBJEXT): {$(VPATH)}constant.h
+vm.$(OBJEXT): {$(VPATH)}debug_counter.h
 vm.$(OBJEXT): {$(VPATH)}defines.h
+vm.$(OBJEXT): {$(VPATH)}defs/opt_operand.def
 vm.$(OBJEXT): {$(VPATH)}encoding.h
 vm.$(OBJEXT): {$(VPATH)}eval_intern.h
 vm.$(OBJEXT): {$(VPATH)}gc.h
@@ -2495,28 +15420,174 @@ vm.$(OBJEXT): {$(VPATH)}id.h
 vm.$(OBJEXT): {$(VPATH)}id_table.h
 vm.$(OBJEXT): {$(VPATH)}insns.def
 vm.$(OBJEXT): {$(VPATH)}insns.inc
+vm.$(OBJEXT): {$(VPATH)}insns_info.inc
 vm.$(OBJEXT): {$(VPATH)}intern.h
 vm.$(OBJEXT): {$(VPATH)}internal.h
-vm.$(OBJEXT): {$(VPATH)}io.h
+vm.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+vm.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+vm.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+vm.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+vm.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+vm.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+vm.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+vm.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+vm.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+vm.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+vm.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+vm.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+vm.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+vm.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+vm.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+vm.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+vm.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+vm.$(OBJEXT): {$(VPATH)}internal/assume.h
+vm.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+vm.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+vm.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+vm.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+vm.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+vm.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+vm.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+vm.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+vm.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+vm.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+vm.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+vm.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+vm.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+vm.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+vm.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+vm.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+vm.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+vm.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+vm.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+vm.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+vm.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+vm.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+vm.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+vm.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+vm.$(OBJEXT): {$(VPATH)}internal/cast.h
+vm.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+vm.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+vm.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+vm.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+vm.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+vm.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+vm.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+vm.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+vm.$(OBJEXT): {$(VPATH)}internal/config.h
+vm.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+vm.$(OBJEXT): {$(VPATH)}internal/core.h
+vm.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+vm.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+vm.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+vm.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+vm.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+vm.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+vm.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+vm.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+vm.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+vm.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+vm.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+vm.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+vm.$(OBJEXT): {$(VPATH)}internal/ctype.h
+vm.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+vm.$(OBJEXT): {$(VPATH)}internal/dosish.h
+vm.$(OBJEXT): {$(VPATH)}internal/error.h
+vm.$(OBJEXT): {$(VPATH)}internal/eval.h
+vm.$(OBJEXT): {$(VPATH)}internal/event.h
+vm.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+vm.$(OBJEXT): {$(VPATH)}internal/gc.h
+vm.$(OBJEXT): {$(VPATH)}internal/glob.h
+vm.$(OBJEXT): {$(VPATH)}internal/globals.h
+vm.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+vm.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+vm.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+vm.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+vm.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+vm.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+vm.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+vm.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+vm.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+vm.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+vm.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+vm.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+vm.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+vm.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+vm.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+vm.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+vm.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+vm.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+vm.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+vm.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+vm.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+vm.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+vm.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+vm.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+vm.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+vm.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+vm.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+vm.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+vm.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+vm.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+vm.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+vm.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+vm.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+vm.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+vm.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+vm.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+vm.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+vm.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+vm.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+vm.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+vm.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+vm.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+vm.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+vm.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+vm.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+vm.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+vm.$(OBJEXT): {$(VPATH)}internal/iterator.h
+vm.$(OBJEXT): {$(VPATH)}internal/memory.h
+vm.$(OBJEXT): {$(VPATH)}internal/method.h
+vm.$(OBJEXT): {$(VPATH)}internal/module.h
+vm.$(OBJEXT): {$(VPATH)}internal/newobj.h
+vm.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+vm.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+vm.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+vm.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+vm.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+vm.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+vm.$(OBJEXT): {$(VPATH)}internal/symbol.h
+vm.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+vm.$(OBJEXT): {$(VPATH)}internal/value.h
+vm.$(OBJEXT): {$(VPATH)}internal/value_type.h
+vm.$(OBJEXT): {$(VPATH)}internal/variable.h
+vm.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+vm.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 vm.$(OBJEXT): {$(VPATH)}iseq.h
 vm.$(OBJEXT): {$(VPATH)}method.h
 vm.$(OBJEXT): {$(VPATH)}missing.h
+vm.$(OBJEXT): {$(VPATH)}mjit.h
 vm.$(OBJEXT): {$(VPATH)}node.h
+vm.$(OBJEXT): {$(VPATH)}onigmo.h
 vm.$(OBJEXT): {$(VPATH)}oniguruma.h
 vm.$(OBJEXT): {$(VPATH)}probes.dmyh
 vm.$(OBJEXT): {$(VPATH)}probes.h
 vm.$(OBJEXT): {$(VPATH)}probes_helper.h
+vm.$(OBJEXT): {$(VPATH)}ractor.h
+vm.$(OBJEXT): {$(VPATH)}ractor_core.h
 vm.$(OBJEXT): {$(VPATH)}ruby_assert.h
 vm.$(OBJEXT): {$(VPATH)}ruby_atomic.h
 vm.$(OBJEXT): {$(VPATH)}st.h
 vm.$(OBJEXT): {$(VPATH)}subst.h
 vm.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 vm.$(OBJEXT): {$(VPATH)}thread_native.h
+vm.$(OBJEXT): {$(VPATH)}variable.h
 vm.$(OBJEXT): {$(VPATH)}vm.c
 vm.$(OBJEXT): {$(VPATH)}vm.h
 vm.$(OBJEXT): {$(VPATH)}vm.inc
 vm.$(OBJEXT): {$(VPATH)}vm_args.c
 vm.$(OBJEXT): {$(VPATH)}vm_call_iseq_optimized.inc
+vm.$(OBJEXT): {$(VPATH)}vm_callinfo.h
 vm.$(OBJEXT): {$(VPATH)}vm_core.h
 vm.$(OBJEXT): {$(VPATH)}vm_debug.h
 vm.$(OBJEXT): {$(VPATH)}vm_eval.c
@@ -2526,13 +15597,33 @@ vm.$(OBJEXT): {$(VPATH)}vm_insnhelper.c
 vm.$(OBJEXT): {$(VPATH)}vm_insnhelper.h
 vm.$(OBJEXT): {$(VPATH)}vm_method.c
 vm.$(OBJEXT): {$(VPATH)}vm_opts.h
+vm.$(OBJEXT): {$(VPATH)}vm_sync.h
 vm.$(OBJEXT): {$(VPATH)}vmtc.inc
 vm_backtrace.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 vm_backtrace.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 vm_backtrace.$(OBJEXT): $(CCAN_DIR)/list/list.h
 vm_backtrace.$(OBJEXT): $(CCAN_DIR)/str/str.h
+vm_backtrace.$(OBJEXT): $(hdrdir)/ruby.h
 vm_backtrace.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-vm_backtrace.$(OBJEXT): $(top_srcdir)/include/ruby.h
+vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/array.h
+vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/gc.h
+vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/serial.h
+vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/vm.h
+vm_backtrace.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}assert.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}atomic.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}config.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}debug.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}defines.h
@@ -2541,11 +15632,151 @@ vm_backtrace.$(OBJEXT): {$(VPATH)}eval_intern.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}id.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}intern.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}internal.h
-vm_backtrace.$(OBJEXT): {$(VPATH)}io.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/assume.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/cast.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/config.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/core.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/ctype.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/dosish.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/error.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/eval.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/event.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/gc.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/glob.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/globals.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/iterator.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/memory.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/method.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/module.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/newobj.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/symbol.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/value.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/value_type.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/variable.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}iseq.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}method.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}missing.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}node.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}onigmo.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}oniguruma.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}ruby_assert.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}ruby_atomic.h
@@ -2555,30 +15786,189 @@ vm_backtrace.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 vm_backtrace.$(OBJEXT): {$(VPATH)}thread_native.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}vm_backtrace.c
 vm_backtrace.$(OBJEXT): {$(VPATH)}vm_core.h
-vm_backtrace.$(OBJEXT): {$(VPATH)}vm_debug.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}vm_opts.h
-vm_call.$(OBJEXT): $(top_srcdir)/include/ruby.h
-vm_call.$(OBJEXT): {$(VPATH)}vm_call_iseq_optimized.inc
-vm_call.$(OBJEXT): {$(VPATH)}vm_core.h
 vm_dump.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 vm_dump.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 vm_dump.$(OBJEXT): $(CCAN_DIR)/list/list.h
 vm_dump.$(OBJEXT): $(CCAN_DIR)/str/str.h
+vm_dump.$(OBJEXT): $(hdrdir)/ruby.h
 vm_dump.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-vm_dump.$(OBJEXT): $(top_srcdir)/include/ruby.h
+vm_dump.$(OBJEXT): $(top_srcdir)/internal/array.h
+vm_dump.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+vm_dump.$(OBJEXT): $(top_srcdir)/internal/gc.h
+vm_dump.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+vm_dump.$(OBJEXT): $(top_srcdir)/internal/serial.h
+vm_dump.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+vm_dump.$(OBJEXT): $(top_srcdir)/internal/variable.h
+vm_dump.$(OBJEXT): $(top_srcdir)/internal/vm.h
+vm_dump.$(OBJEXT): $(top_srcdir)/internal/warnings.h
 vm_dump.$(OBJEXT): {$(VPATH)}addr2line.h
+vm_dump.$(OBJEXT): {$(VPATH)}assert.h
+vm_dump.$(OBJEXT): {$(VPATH)}atomic.h
+vm_dump.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+vm_dump.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+vm_dump.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+vm_dump.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+vm_dump.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+vm_dump.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+vm_dump.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+vm_dump.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+vm_dump.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
 vm_dump.$(OBJEXT): {$(VPATH)}config.h
+vm_dump.$(OBJEXT): {$(VPATH)}constant.h
 vm_dump.$(OBJEXT): {$(VPATH)}defines.h
-vm_dump.$(OBJEXT): {$(VPATH)}encoding.h
+vm_dump.$(OBJEXT): {$(VPATH)}gc.h
 vm_dump.$(OBJEXT): {$(VPATH)}id.h
+vm_dump.$(OBJEXT): {$(VPATH)}id_table.h
 vm_dump.$(OBJEXT): {$(VPATH)}intern.h
 vm_dump.$(OBJEXT): {$(VPATH)}internal.h
-vm_dump.$(OBJEXT): {$(VPATH)}io.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/assume.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/cast.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/config.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/core.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/ctype.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/dosish.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/error.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/eval.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/event.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/gc.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/glob.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/globals.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/iterator.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/memory.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/method.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/module.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/newobj.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/symbol.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/value.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/value_type.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/variable.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
 vm_dump.$(OBJEXT): {$(VPATH)}iseq.h
 vm_dump.$(OBJEXT): {$(VPATH)}method.h
 vm_dump.$(OBJEXT): {$(VPATH)}missing.h
 vm_dump.$(OBJEXT): {$(VPATH)}node.h
-vm_dump.$(OBJEXT): {$(VPATH)}oniguruma.h
+vm_dump.$(OBJEXT): {$(VPATH)}procstat_vm.c
+vm_dump.$(OBJEXT): {$(VPATH)}ractor.h
+vm_dump.$(OBJEXT): {$(VPATH)}ractor_core.h
 vm_dump.$(OBJEXT): {$(VPATH)}ruby_assert.h
 vm_dump.$(OBJEXT): {$(VPATH)}ruby_atomic.h
 vm_dump.$(OBJEXT): {$(VPATH)}st.h
@@ -2589,33 +15979,398 @@ vm_dump.$(OBJEXT): {$(VPATH)}vm_core.h
 vm_dump.$(OBJEXT): {$(VPATH)}vm_debug.h
 vm_dump.$(OBJEXT): {$(VPATH)}vm_dump.c
 vm_dump.$(OBJEXT): {$(VPATH)}vm_opts.h
+vm_sync.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+vm_sync.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+vm_sync.$(OBJEXT): $(CCAN_DIR)/list/list.h
+vm_sync.$(OBJEXT): $(CCAN_DIR)/str/str.h
+vm_sync.$(OBJEXT): $(hdrdir)/ruby.h
+vm_sync.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+vm_sync.$(OBJEXT): $(top_srcdir)/internal/array.h
+vm_sync.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+vm_sync.$(OBJEXT): $(top_srcdir)/internal/gc.h
+vm_sync.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+vm_sync.$(OBJEXT): $(top_srcdir)/internal/serial.h
+vm_sync.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+vm_sync.$(OBJEXT): $(top_srcdir)/internal/vm.h
+vm_sync.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+vm_sync.$(OBJEXT): {$(VPATH)}addr2line.h
+vm_sync.$(OBJEXT): {$(VPATH)}assert.h
+vm_sync.$(OBJEXT): {$(VPATH)}atomic.h
+vm_sync.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+vm_sync.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+vm_sync.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+vm_sync.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+vm_sync.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+vm_sync.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+vm_sync.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+vm_sync.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+vm_sync.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
+vm_sync.$(OBJEXT): {$(VPATH)}config.h
+vm_sync.$(OBJEXT): {$(VPATH)}constant.h
+vm_sync.$(OBJEXT): {$(VPATH)}debug_counter.h
+vm_sync.$(OBJEXT): {$(VPATH)}defines.h
+vm_sync.$(OBJEXT): {$(VPATH)}gc.h
+vm_sync.$(OBJEXT): {$(VPATH)}id.h
+vm_sync.$(OBJEXT): {$(VPATH)}id_table.h
+vm_sync.$(OBJEXT): {$(VPATH)}intern.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/array.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/assume.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/cast.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/compilers.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/config.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/core.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/ctype.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/dosish.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/error.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/eval.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/event.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/gc.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/glob.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/globals.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/imemo.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/iterator.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/memory.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/method.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/module.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/newobj.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/serial.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/symbol.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/value.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/value_type.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/variable.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/vm.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/warnings.h
+vm_sync.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
+vm_sync.$(OBJEXT): {$(VPATH)}iseq.h
+vm_sync.$(OBJEXT): {$(VPATH)}method.h
+vm_sync.$(OBJEXT): {$(VPATH)}missing.h
+vm_sync.$(OBJEXT): {$(VPATH)}node.h
+vm_sync.$(OBJEXT): {$(VPATH)}procstat_vm.c
+vm_sync.$(OBJEXT): {$(VPATH)}ractor.h
+vm_sync.$(OBJEXT): {$(VPATH)}ractor_core.h
+vm_sync.$(OBJEXT): {$(VPATH)}ruby_assert.h
+vm_sync.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+vm_sync.$(OBJEXT): {$(VPATH)}st.h
+vm_sync.$(OBJEXT): {$(VPATH)}subst.h
+vm_sync.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+vm_sync.$(OBJEXT): {$(VPATH)}thread_native.h
+vm_sync.$(OBJEXT): {$(VPATH)}vm_core.h
+vm_sync.$(OBJEXT): {$(VPATH)}vm_debug.h
+vm_sync.$(OBJEXT): {$(VPATH)}vm_opts.h
+vm_sync.$(OBJEXT): {$(VPATH)}vm_sync.c
+vm_sync.$(OBJEXT): {$(VPATH)}vm_sync.h
 vm_trace.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 vm_trace.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 vm_trace.$(OBJEXT): $(CCAN_DIR)/list/list.h
 vm_trace.$(OBJEXT): $(CCAN_DIR)/str/str.h
+vm_trace.$(OBJEXT): $(hdrdir)/ruby.h
 vm_trace.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-vm_trace.$(OBJEXT): $(top_srcdir)/include/ruby.h
+vm_trace.$(OBJEXT): $(top_srcdir)/internal/array.h
+vm_trace.$(OBJEXT): $(top_srcdir)/internal/compilers.h
+vm_trace.$(OBJEXT): $(top_srcdir)/internal/gc.h
+vm_trace.$(OBJEXT): $(top_srcdir)/internal/hash.h
+vm_trace.$(OBJEXT): $(top_srcdir)/internal/imemo.h
+vm_trace.$(OBJEXT): $(top_srcdir)/internal/serial.h
+vm_trace.$(OBJEXT): $(top_srcdir)/internal/static_assert.h
+vm_trace.$(OBJEXT): $(top_srcdir)/internal/symbol.h
+vm_trace.$(OBJEXT): $(top_srcdir)/internal/vm.h
+vm_trace.$(OBJEXT): $(top_srcdir)/internal/warnings.h
+vm_trace.$(OBJEXT): {$(VPATH)}assert.h
+vm_trace.$(OBJEXT): {$(VPATH)}atomic.h
+vm_trace.$(OBJEXT): {$(VPATH)}backward/2/assume.h
+vm_trace.$(OBJEXT): {$(VPATH)}backward/2/attributes.h
+vm_trace.$(OBJEXT): {$(VPATH)}backward/2/bool.h
+vm_trace.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h
+vm_trace.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h
+vm_trace.$(OBJEXT): {$(VPATH)}backward/2/limits.h
+vm_trace.$(OBJEXT): {$(VPATH)}backward/2/long_long.h
+vm_trace.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h
+vm_trace.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h
+vm_trace.$(OBJEXT): {$(VPATH)}builtin.h
 vm_trace.$(OBJEXT): {$(VPATH)}config.h
 vm_trace.$(OBJEXT): {$(VPATH)}debug.h
+vm_trace.$(OBJEXT): {$(VPATH)}debug_counter.h
 vm_trace.$(OBJEXT): {$(VPATH)}defines.h
 vm_trace.$(OBJEXT): {$(VPATH)}encoding.h
 vm_trace.$(OBJEXT): {$(VPATH)}eval_intern.h
 vm_trace.$(OBJEXT): {$(VPATH)}id.h
 vm_trace.$(OBJEXT): {$(VPATH)}intern.h
 vm_trace.$(OBJEXT): {$(VPATH)}internal.h
-vm_trace.$(OBJEXT): {$(VPATH)}io.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/anyargs.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/arithmetic.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/assume.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/attr/cold.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/attr/const.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/attr/error.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/attr/format.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/attr/pure.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/attr/warning.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/cast.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/compiler_is.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/compiler_since.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/config.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/constant_p.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/core.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/core/rarray.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/core/rclass.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/core/rdata.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/core/rfile.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/core/rhash.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/core/robject.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/core/rstring.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/ctype.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/dllexport.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/dosish.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/error.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/eval.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/event.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/fl_type.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/gc.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/glob.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/globals.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/has/attribute.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/has/builtin.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/has/extension.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/has/feature.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/has/warning.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/array.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/class.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/compar.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/complex.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/cont.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/dir.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/enum.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/error.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/eval.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/file.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/gc.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/hash.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/io.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/load.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/object.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/parse.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/proc.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/process.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/random.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/range.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/rational.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/re.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/select.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/signal.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/string.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/struct.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/thread.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/time.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/variable.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/intern/vm.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/interpreter.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/iterator.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/memory.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/method.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/module.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/newobj.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/rgengc.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/scan_args.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/special_consts.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/static_assert.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/stdalign.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/stdbool.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/symbol.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/token_paste.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/value.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/value_type.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/variable.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/warning_push.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal/xmalloc.h
+vm_trace.$(OBJEXT): {$(VPATH)}iseq.h
 vm_trace.$(OBJEXT): {$(VPATH)}method.h
 vm_trace.$(OBJEXT): {$(VPATH)}missing.h
+vm_trace.$(OBJEXT): {$(VPATH)}mjit.h
 vm_trace.$(OBJEXT): {$(VPATH)}node.h
+vm_trace.$(OBJEXT): {$(VPATH)}onigmo.h
 vm_trace.$(OBJEXT): {$(VPATH)}oniguruma.h
+vm_trace.$(OBJEXT): {$(VPATH)}ractor.h
 vm_trace.$(OBJEXT): {$(VPATH)}ruby_assert.h
 vm_trace.$(OBJEXT): {$(VPATH)}ruby_atomic.h
 vm_trace.$(OBJEXT): {$(VPATH)}st.h
 vm_trace.$(OBJEXT): {$(VPATH)}subst.h
 vm_trace.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
 vm_trace.$(OBJEXT): {$(VPATH)}thread_native.h
+vm_trace.$(OBJEXT): {$(VPATH)}trace_point.rbinc
 vm_trace.$(OBJEXT): {$(VPATH)}vm_core.h
-vm_trace.$(OBJEXT): {$(VPATH)}vm_debug.h
 vm_trace.$(OBJEXT): {$(VPATH)}vm_opts.h
 vm_trace.$(OBJEXT): {$(VPATH)}vm_trace.c
 # AUTOGENERATED DEPENDENCIES END
diff --git a/compar.c b/compar.c
index b040641651..04d4ff8c70 100644
--- a/compar.c
+++ b/compar.c
@@ -9,11 +9,20 @@
 
 **********************************************************************/
 
+#include "id.h"
+#include "internal.h"
+#include "internal/compar.h"
+#include "internal/error.h"
+#include "internal/vm.h"
 #include "ruby/ruby.h"
 
 VALUE rb_mComparable;
 
-static ID cmp;
+static VALUE
+rb_cmp(VALUE x, VALUE y)
+{
+    return rb_funcallv(x, idCmp, 1, &y);
+}
 
 void
 rb_cmperr(VALUE x, VALUE y)
@@ -34,7 +43,7 @@ static VALUE
 invcmp_recursive(VALUE x, VALUE y, int recursive)
 {
     if (recursive) return Qnil;
-    return rb_check_funcall(y, cmp, 1, &x);
+    return rb_cmp(y, x);
 }
 
 VALUE
@@ -54,7 +63,7 @@ static VALUE
 cmp_eq_recursive(VALUE arg1, VALUE arg2, int recursive)
 {
     if (recursive) return Qnil;
-    return rb_funcallv(arg1, cmp, 1, &arg2);
+    return rb_cmp(arg1, arg2);
 }
 
 /*
@@ -79,20 +88,24 @@ cmp_equal(VALUE x, VALUE y)
     return Qfalse;
 }
 
+static int
+cmpint(VALUE x, VALUE y)
+{
+    return rb_cmpint(rb_cmp(x, y), x, y);
+}
+
 /*
  *  call-seq:
  *     obj > other    -> true or false
  *
  *  Compares two objects based on the receiver's <code><=></code>
- *  method, returning true if it returns 1.
+ *  method, returning true if it returns a value greater than 0.
  */
 
 static VALUE
 cmp_gt(VALUE x, VALUE y)
 {
-    VALUE c = rb_funcall(x, cmp, 1, y);
-
-    if (rb_cmpint(c, x, y) > 0) return Qtrue;
+    if (cmpint(x, y) > 0) return Qtrue;
     return Qfalse;
 }
 
@@ -101,15 +114,13 @@ cmp_gt(VALUE x, VALUE y)
  *     obj >= other    -> true or false
  *
  *  Compares two objects based on the receiver's <code><=></code>
- *  method, returning true if it returns 0 or 1.
+ *  method, returning true if it returns a value greater than or equal to 0.
  */
 
 static VALUE
 cmp_ge(VALUE x, VALUE y)
 {
-    VALUE c = rb_funcall(x, cmp, 1, y);
-
-    if (rb_cmpint(c, x, y) >= 0) return Qtrue;
+    if (cmpint(x, y) >= 0) return Qtrue;
     return Qfalse;
 }
 
@@ -118,15 +129,13 @@ cmp_ge(VALUE x, VALUE y)
  *     obj < other    -> true or false
  *
  *  Compares two objects based on the receiver's <code><=></code>
- *  method, returning true if it returns -1.
+ *  method, returning true if it returns a value less than 0.
  */
 
 static VALUE
 cmp_lt(VALUE x, VALUE y)
 {
-    VALUE c = rb_funcall(x, cmp, 1, y);
-
-    if (rb_cmpint(c, x, y) < 0) return Qtrue;
+    if (cmpint(x, y) < 0) return Qtrue;
     return Qfalse;
 }
 
@@ -135,15 +144,13 @@ cmp_lt(VALUE x, VALUE y)
  *     obj <= other    -> true or false
  *
  *  Compares two objects based on the receiver's <code><=></code>
- *  method, returning true if it returns -1 or 0.
+ *  method, returning true if it returns a value less than or equal to 0.
  */
 
 static VALUE
 cmp_le(VALUE x, VALUE y)
 {
-    VALUE c = rb_funcall(x, cmp, 1, y);
-
-    if (rb_cmpint(c, x, y) <= 0) return Qtrue;
+    if (cmpint(x, y) <= 0) return Qtrue;
     return Qfalse;
 }
 
@@ -151,9 +158,9 @@ cmp_le(VALUE x, VALUE y)
  *  call-seq:
  *     obj.between?(min, max)    -> true or false
  *
- *  Returns <code>false</code> if <i>obj</i> <code><=></code>
- *  <i>min</i> is less than zero or if <i>anObject</i> <code><=></code>
- *  <i>max</i> is greater than zero, <code>true</code> otherwise.
+ *  Returns <code>false</code> if _obj_ <code><=></code> _min_ is less
+ *  than zero or if _obj_ <code><=></code> _max_ is greater than zero,
+ *  <code>true</code> otherwise.
  *
  *     3.between?(1, 5)               #=> true
  *     6.between?(1, 5)               #=> false
@@ -165,22 +172,97 @@ cmp_le(VALUE x, VALUE y)
 static VALUE
 cmp_between(VALUE x, VALUE min, VALUE max)
 {
-    if (RTEST(cmp_lt(x, min))) return Qfalse;
-    if (RTEST(cmp_gt(x, max))) return Qfalse;
+    if (cmpint(x, min) < 0) return Qfalse;
+    if (cmpint(x, max) > 0) return Qfalse;
     return Qtrue;
 }
 
 /*
- *  The <code>Comparable</code> mixin is used by classes whose objects
- *  may be ordered. The class must define the <code><=></code> operator,
- *  which compares the receiver against another object, returning -1, 0,
- *  or +1 depending on whether the receiver is less than, equal to, or
- *  greater than the other object. If the other object is not comparable
- *  then the <code><=></code> operator should return nil.
- *  <code>Comparable</code> uses
- *  <code><=></code> to implement the conventional comparison operators
- *  (<code><</code>, <code><=</code>, <code>==</code>, <code>>=</code>,
- *  and <code>></code>) and the method <code>between?</code>.
+ *  call-seq:
+ *     obj.clamp(min, max) ->  obj
+ *     obj.clamp(range)    ->  obj
+ *
+ * In <code>(min, max)</code> form, returns _min_ if _obj_
+ * <code><=></code> _min_ is less than zero, _max_ if _obj_
+ * <code><=></code> _max_ is greater than zero, and _obj_
+ * otherwise.
+ *
+ *     12.clamp(0, 100)         #=> 12
+ *     523.clamp(0, 100)        #=> 100
+ *     -3.123.clamp(0, 100)     #=> 0
+ *
+ *     'd'.clamp('a', 'f')      #=> 'd'
+ *     'z'.clamp('a', 'f')      #=> 'f'
+ *
+ * In <code>(range)</code> form, returns _range.begin_ if _obj_
+ * <code><=></code> _range.begin_ is less than zero, _range.end_
+ * if _obj_ <code><=></code> _range.end_ is greater than zero, and
+ * _obj_ otherwise.
+ *
+ *     12.clamp(0..100)         #=> 12
+ *     523.clamp(0..100)        #=> 100
+ *     -3.123.clamp(0..100)     #=> 0
+ *
+ *     'd'.clamp('a'..'f')      #=> 'd'
+ *     'z'.clamp('a'..'f')      #=> 'f'
+ *
+ * If _range.begin_ is +nil+, it is considered smaller than _obj_,
+ * and if _range.end_ is +nil+, it is considered greater than
+ * _obj_.
+ *
+ *     -20.clamp(0..)           #=> 0
+ *     523.clamp(..100)         #=> 100
+ *
+ * When _range.end_ is excluded and not +nil+, an exception is
+ * raised.
+ *
+ *     100.clamp(0...100)       # ArgumentError
+ */
+
+static VALUE
+cmp_clamp(int argc, VALUE *argv, VALUE x)
+{
+    VALUE min, max;
+    int c, excl = 0;
+
+    if (rb_scan_args(argc, argv, "11", &min, &max) == 1) {
+        VALUE range = min;
+        if (!rb_range_values(range, &min, &max, &excl)) {
+            rb_raise(rb_eTypeError, "wrong argument type %s (expected Range)",
+                     rb_builtin_class_name(range));
+        }
+        if (!NIL_P(max)) {
+            if (excl) rb_raise(rb_eArgError, "cannot clamp with an exclusive range");
+        }
+    }
+    if (!NIL_P(min) && !NIL_P(max) && cmpint(min, max) > 0) {
+	rb_raise(rb_eArgError, "min argument must be smaller than max argument");
+    }
+
+    if (!NIL_P(min)) {
+        c = cmpint(x, min);
+        if (c == 0) return x;
+        if (c < 0) return min;
+    }
+    if (!NIL_P(max)) {
+        c = cmpint(x, max);
+        if (c > 0) return max;
+    }
+    return x;
+}
+
+/*
+ *  The Comparable mixin is used by classes whose objects may be
+ *  ordered. The class must define the <code><=></code> operator,
+ *  which compares the receiver against another object, returning a
+ *  value less than 0, returning 0, or returning a value greater than 0,
+ *  depending on whether the receiver is less than, equal to,
+ *  or greater than the other object. If the other object is not
+ *  comparable then the <code><=></code> operator should return +nil+.
+ *  Comparable uses <code><=></code> to implement the conventional
+ *  comparison operators (<code><</code>, <code><=</code>,
+ *  <code>==</code>, <code>>=</code>, and <code>></code>) and the
+ *  method <code>between?</code>.
  *
  *     class SizeMatters
  *       include Comparable
@@ -212,9 +294,6 @@ cmp_between(VALUE x, VALUE min, VALUE max)
 void
 Init_Comparable(void)
 {
-#undef rb_intern
-#define rb_intern(str) rb_intern_const(str)
-
     rb_mComparable = rb_define_module("Comparable");
     rb_define_method(rb_mComparable, "==", cmp_equal, 1);
     rb_define_method(rb_mComparable, ">", cmp_gt, 1);
@@ -222,6 +301,5 @@ Init_Comparable(void)
     rb_define_method(rb_mComparable, "<", cmp_lt, 1);
     rb_define_method(rb_mComparable, "<=", cmp_le, 1);
     rb_define_method(rb_mComparable, "between?", cmp_between, 2);
-
-    cmp = rb_intern("<=>");
+    rb_define_method(rb_mComparable, "clamp", cmp_clamp, -1);
 }
diff --git a/compile.c b/compile.c
index cc496cbab8..9844c145bc 100644
--- a/compile.c
+++ b/compile.c
@@ -9,23 +9,41 @@
 
 **********************************************************************/
 
-#include "internal.h"
-#include "ruby/re.h"
-#include "encindex.h"
+#include "ruby/internal/config.h"
 #include <math.h>
 
-#define USE_INSN_STACK_INCREASE 1
-#include "vm_core.h"
-#include "iseq.h"
-#include "insns.inc"
-#include "insns_info.inc"
-#include "id_table.h"
-#include "gc.h"
-
 #ifdef HAVE_DLADDR
 # include <dlfcn.h>
 #endif
 
+#include "encindex.h"
+#include "gc.h"
+#include "id_table.h"
+#include "internal.h"
+#include "internal/array.h"
+#include "internal/compile.h"
+#include "internal/complex.h"
+#include "internal/encoding.h"
+#include "internal/error.h"
+#include "internal/hash.h"
+#include "internal/numeric.h"
+#include "internal/object.h"
+#include "internal/rational.h"
+#include "internal/re.h"
+#include "internal/symbol.h"
+#include "internal/thread.h"
+#include "internal/variable.h"
+#include "iseq.h"
+#include "ruby/re.h"
+#include "ruby/util.h"
+#include "vm_core.h"
+#include "vm_callinfo.h"
+#include "vm_debug.h"
+
+#include "builtin.h"
+#include "insns.inc"
+#include "insns_info.inc"
+
 #undef RUBY_UNTYPED_DATA_WARNING
 #define RUBY_UNTYPED_DATA_WARNING 0
 
@@ -34,10 +52,11 @@
 
 typedef struct iseq_link_element {
     enum {
-	ISEQ_ELEMENT_NONE,
+	ISEQ_ELEMENT_ANCHOR,
 	ISEQ_ELEMENT_LABEL,
 	ISEQ_ELEMENT_INSN,
-	ISEQ_ELEMENT_ADJUST
+	ISEQ_ELEMENT_ADJUST,
+        ISEQ_ELEMENT_TRACE,
     } type;
     struct iseq_link_element *next;
     struct iseq_link_element *prev;
@@ -64,15 +83,19 @@ typedef struct iseq_label_data {
     int refcnt;
     unsigned int set: 1;
     unsigned int rescued: 2;
+    unsigned int unremovable: 1;
 } LABEL;
 
 typedef struct iseq_insn_data {
     LINK_ELEMENT link;
     enum ruby_vminsn_type insn_id;
-    unsigned int line_no;
     int operand_size;
     int sc_state;
     VALUE *operands;
+    struct {
+	int line_no;
+	rb_event_flag_t events;
+    } insn_info;
 } INSN;
 
 typedef struct iseq_adjust_data {
@@ -81,6 +104,12 @@ typedef struct iseq_adjust_data {
     int line_no;
 } ADJUST;
 
+typedef struct iseq_trace_data {
+    LINK_ELEMENT link;
+    rb_event_flag_t event;
+    long data;
+} TRACE;
+
 struct ensure_range {
     LABEL *begin;
     LABEL *end;
@@ -88,11 +117,13 @@ struct ensure_range {
 };
 
 struct iseq_compile_data_ensure_node_stack {
-    NODE *ensure_node;
+    const NODE *ensure_node;
     struct iseq_compile_data_ensure_node_stack *prev;
     struct ensure_range *erange;
 };
 
+const ID rb_iseq_shared_exc_local_tbl[] = {idERROR_INFO};
+
 /**
  * debug function(macro) interface depend on CPDEBUG
  * if it is less than 0, runtime option is in effect.
@@ -143,35 +174,24 @@ struct iseq_compile_data_ensure_node_stack {
 
 #define debug_node_start(node)  ((void) \
   (compile_debug_print_indent(1) && \
-   (ruby_debug_print_node(1, CPDEBUG, "", (NODE *)(node)), gl_node_level)), \
+   (ruby_debug_print_node(1, CPDEBUG, "", (const 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 debugi(header, id)                 ((void)0)
+#define debugp(header, value)              ((void)0)
+#define debugp_verbose(header, value)      ((void)0)
+#define debugp_verbose_node(header, value) ((void)0)
+#define debugp_param(header, value)        ((void)0)
 #define debug_node_start(node)             ((void)0)
 #define debug_node_end()                   ((void)0)
 #endif
 
 #if CPDEBUG > 1 || CPDEBUG < 0
+#undef printf
 #define printf ruby_debug_printf
 #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))
@@ -180,12 +200,11 @@ r_value(VALUE value)
 #define debug_compile(msg, v) (v)
 #endif
 
+#define LVAR_ERRINFO (1)
 
 /* create new label */
 #define NEW_LABEL(l) new_label_body(iseq, (l))
-
-#define iseq_path(iseq) ((iseq)->body->location.path)
-#define iseq_absolute_path(iseq) ((iseq)->body->location.absolute_path)
+#define LABEL_FORMAT "<L%03d>"
 
 #define NEW_ISEQ(node, name, type, line_no) \
   new_child_iseq(iseq, (node), rb_fstring(name), 0, (type), (line_no))
@@ -201,18 +220,27 @@ r_value(VALUE value)
 #define ADD_INSN(seq, line, insn) \
   ADD_ELEM((seq), (LINK_ELEMENT *) new_insn_body(iseq, (line), BIN(insn), 0))
 
-/* insert an instruction before prev */
-#define INSERT_BEFORE_INSN(prev, line, insn) \
-  INSERT_ELEM_PREV(&(prev)->link, (LINK_ELEMENT *) new_insn_body(iseq, (line), BIN(insn), 0))
+/* insert an instruction before next */
+#define INSERT_BEFORE_INSN(next, line, insn) \
+  ELEM_INSERT_PREV(&(next)->link, (LINK_ELEMENT *) new_insn_body(iseq, (line), BIN(insn), 0))
+
+/* insert an instruction after prev */
+#define INSERT_AFTER_INSN(prev, line, insn) \
+  ELEM_INSERT_NEXT(&(prev)->link, (LINK_ELEMENT *) new_insn_body(iseq, (line), BIN(insn), 0))
 
 /* 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)))
 
-/* insert an instruction with some operands (1, 2, 3, 5) before prev */
-#define INSERT_BEFORE_INSN1(prev, line, insn, op1) \
-  INSERT_ELEM_PREV(&(prev)->link, (LINK_ELEMENT *) \
+/* insert an instruction with some operands (1, 2, 3, 5) before next */
+#define INSERT_BEFORE_INSN1(next, line, insn, op1) \
+  ELEM_INSERT_PREV(&(next)->link, (LINK_ELEMENT *) \
+           new_insn_body(iseq, (line), BIN(insn), 1, (VALUE)(op1)))
+
+/* insert an instruction with some operands (1, 2, 3, 5) after prev */
+#define INSERT_AFTER_INSN1(prev, line, insn, op1) \
+  ELEM_INSERT_NEXT(&(prev)->link, (LINK_ELEMENT *) \
            new_insn_body(iseq, (line), BIN(insn), 1, (VALUE)(op1)))
 
 #define LABEL_REF(label) ((label)->refcnt++)
@@ -250,18 +278,16 @@ r_value(VALUE value)
 #define ADD_SEND_R(seq, line, id, argc, block, flag, keywords) \
   ADD_ELEM((seq), (LINK_ELEMENT *) new_insn_send(iseq, (line), (id), (VALUE)(argc), (block), (VALUE)(flag), (keywords)))
 
-#define ADD_TRACE(seq, line, event) \
-  do { \
-      if ((event) == RUBY_EVENT_LINE && ISEQ_COVERAGE(iseq) && \
-	  (line) != ISEQ_COMPILE_DATA(iseq)->last_coverable_line) { \
-	  RARRAY_ASET(ISEQ_COVERAGE(iseq), (line) - 1, INT2FIX(0)); \
-	  ISEQ_COMPILE_DATA(iseq)->last_coverable_line = (line); \
-	  ADD_INSN1((seq), (line), trace, INT2FIX(RUBY_EVENT_COVERAGE)); \
-      } \
-      if (ISEQ_COMPILE_DATA(iseq)->option->trace_instruction) { \
-	  ADD_INSN1((seq), (line), trace, INT2FIX(event)); \
-      } \
-  } while (0)
+#define ADD_TRACE(seq, event) \
+  ADD_ELEM((seq), (LINK_ELEMENT *)new_trace_body(iseq, (event), 0))
+#define ADD_TRACE_WITH_DATA(seq, event, data) \
+  ADD_ELEM((seq), (LINK_ELEMENT *)new_trace_body(iseq, (event), (data)))
+
+static void iseq_add_getlocal(rb_iseq_t *iseq, LINK_ANCHOR *const seq, int line, int idx, int level);
+static void iseq_add_setlocal(rb_iseq_t *iseq, LINK_ANCHOR *const seq, int line, int idx, int level);
+
+#define ADD_GETLOCAL(seq, line, idx, level) iseq_add_getlocal(iseq, (seq), (line), (idx), (level))
+#define ADD_SETLOCAL(seq, line, idx, level) iseq_add_setlocal(iseq, (seq), (line), (idx), (level))
 
 /* add label */
 #define ADD_LABEL(seq, label) \
@@ -276,13 +302,17 @@ r_value(VALUE value)
 #define ADD_ADJUST_RESTORE(seq, label) \
   ADD_ELEM((seq), (LINK_ELEMENT *) new_adjust_body(iseq, (label), -1))
 
+#define LABEL_UNREMOVABLE(label) \
+    ((label) ? (LABEL_REF(label), (label)->unremovable=1) : 0)
 #define ADD_CATCH_ENTRY(type, ls, le, iseqv, lc) do {				\
     VALUE _e = rb_ary_new3(5, (type),						\
 			   (VALUE)(ls) | 1, (VALUE)(le) | 1,			\
 			   (VALUE)(iseqv), (VALUE)(lc) | 1);			\
-    if (ls) LABEL_REF(ls);							\
-    if (le) LABEL_REF(le);							\
-    if (lc) LABEL_REF(lc);							\
+    LABEL_UNREMOVABLE(ls);							\
+    LABEL_REF(le);								\
+    LABEL_REF(lc);								\
+    if (NIL_P(ISEQ_COMPILE_DATA(iseq)->catch_table_ary)) \
+        RB_OBJ_WRITE(iseq, &ISEQ_COMPILE_DATA(iseq)->catch_table_ary, rb_ary_tmp_new(3)); \
     rb_ary_push(ISEQ_COMPILE_DATA(iseq)->catch_table_ary, freeze_hide_obj(_e));	\
 } while (0)
 
@@ -292,19 +322,19 @@ r_value(VALUE value)
                  iseq_compile_each(iseq, (anchor), (node), 0)))
 
 /* compile node, this node's value will be popped */
-#define COMPILE_POPED(anchor, desc, node)    \
+#define COMPILE_POPPED(anchor, desc, node)    \
   (debug_compile("== " desc "\n", \
                  iseq_compile_each(iseq, (anchor), (node), 1)))
 
-/* compile node, which is popped when 'poped' is true */
-#define COMPILE_(anchor, desc, node, poped)  \
+/* compile node, which is popped when 'popped' is true */
+#define COMPILE_(anchor, desc, node, popped)  \
   (debug_compile("== " desc "\n", \
-                 iseq_compile_each(iseq, (anchor), (node), (poped))))
+                 iseq_compile_each(iseq, (anchor), (node), (popped))))
 
 #define COMPILE_RECV(anchor, desc, node) \
     (private_recv_p(node) ? \
      (ADD_INSN(anchor, nd_line(node), putself), VM_CALL_FCALL) : \
-     (COMPILE(anchor, desc, node->nd_recv), 0))
+     COMPILE(anchor, desc, node->nd_recv) ? 0 : -1)
 
 #define OPERAND_AT(insn, idx) \
   (((INSN*)(insn))->operands[(idx)])
@@ -315,17 +345,22 @@ r_value(VALUE value)
 #define IS_INSN(link) ((link)->type == ISEQ_ELEMENT_INSN)
 #define IS_LABEL(link) ((link)->type == ISEQ_ELEMENT_LABEL)
 #define IS_ADJUST(link) ((link)->type == ISEQ_ELEMENT_ADJUST)
+#define IS_TRACE(link) ((link)->type == ISEQ_ELEMENT_TRACE)
 #define IS_INSN_ID(iobj, insn) (INSN_OF(iobj) == BIN(insn))
+#define IS_NEXT_INSN_ID(link, insn) \
+    ((link)->next && IS_INSN((link)->next) && IS_INSN_ID((link)->next, insn))
 
 /* error */
-typedef void (*compile_error_func)(rb_iseq_t *, int, const char *, ...);
+#if CPDEBUG > 0
+NORETURN(static void append_compile_error(const rb_iseq_t *iseq, int line, const char *fmt, ...));
+#endif
 
 static void
-append_compile_error(rb_iseq_t *iseq, int line, const char *fmt, ...)
+append_compile_error(const rb_iseq_t *iseq, int line, const char *fmt, ...)
 {
     VALUE err_info = ISEQ_COMPILE_DATA(iseq)->err_info;
-    VALUE file = iseq->body->location.path;
-    VALUE err = err_info;
+    VALUE file = rb_iseq_path(iseq);
+    VALUE err = err_info == Qtrue ? Qfalse : err_info;
     va_list args;
 
     va_start(args, fmt);
@@ -335,66 +370,72 @@ append_compile_error(rb_iseq_t *iseq, int line, const char *fmt, ...)
 	RB_OBJ_WRITE(iseq, &ISEQ_COMPILE_DATA(iseq)->err_info, err);
 	rb_set_errinfo(err);
     }
+    else if (!err_info) {
+	RB_OBJ_WRITE(iseq, &ISEQ_COMPILE_DATA(iseq)->err_info, Qtrue);
+    }
+    if (compile_debug) {
+        if (SPECIAL_CONST_P(err)) err = rb_eSyntaxError;
+        rb_exc_fatal(err);
+    }
 }
 
+#if 0
 static void
 compile_bug(rb_iseq_t *iseq, int line, const char *fmt, ...)
 {
     va_list args;
     va_start(args, fmt);
-    rb_report_bug_valist(iseq->body->location.path, line, fmt, args);
+    rb_report_bug_valist(rb_iseq_path(iseq), line, fmt, args);
     va_end(args);
     abort();
 }
+#endif
 
-NOINLINE(static compile_error_func prepare_compile_error(rb_iseq_t *iseq));
-
-static compile_error_func
-prepare_compile_error(rb_iseq_t *iseq)
-{
-    if (compile_debug) return &compile_bug;
-    return &append_compile_error;
-}
-
-#define COMPILE_ERROR prepare_compile_error(iseq)
+#define COMPILE_ERROR append_compile_error
 
 #define ERROR_ARGS_AT(n) iseq, nd_line(n),
 #define ERROR_ARGS ERROR_ARGS_AT(node)
 
-#define EXPECT_NODE(prefix, node, ndtype) \
+#define EXPECT_NODE(prefix, node, ndtype, errval) \
 do { \
-    NODE *error_node = (node); \
+    const NODE *error_node = (node); \
     enum node_type error_type = nd_type(error_node); \
     if (error_type != (ndtype)) { \
-	compile_bug(ERROR_ARGS_AT(error_node) \
-		    prefix ": " #ndtype " is expected, but %s", \
-		    ruby_node_name(error_type)); \
+	COMPILE_ERROR(ERROR_ARGS_AT(error_node) \
+		      prefix ": " #ndtype " is expected, but %s", \
+		      ruby_node_name(error_type)); \
+	return errval; \
     } \
 } while (0)
 
-#define EXPECT_NODE_NONULL(prefix, parent, ndtype) \
+#define EXPECT_NODE_NONULL(prefix, parent, ndtype, errval) \
 do { \
-    compile_bug(ERROR_ARGS_AT(parent) \
-		prefix ": must be " #ndtype ", but 0"); \
+    COMPILE_ERROR(ERROR_ARGS_AT(parent) \
+		  prefix ": must be " #ndtype ", but 0"); \
+    return errval; \
 } while (0)
 
-#define UNKNOWN_NODE(prefix, node) \
+#define UNKNOWN_NODE(prefix, node, errval) \
 do { \
-    NODE *error_node = (node); \
-    compile_bug(ERROR_ARGS_AT(error_node) prefix ": unknown node (%s)", \
-		ruby_node_name(nd_type(error_node))); \
+    const NODE *error_node = (node); \
+    COMPILE_ERROR(ERROR_ARGS_AT(error_node) prefix ": unknown node (%s)", \
+		  ruby_node_name(nd_type(error_node))); \
+    return errval; \
 } while (0)
 
 #define COMPILE_OK 1
 #define COMPILE_NG 0
 
+#define CHECK(sub) if (!(sub)) {BEFORE_RETURN;return COMPILE_NG;}
+#define NO_CHECK(sub) (void)(sub)
+#define BEFORE_RETURN
 
 /* leave name uninitialized so that compiler warn if INIT_ANCHOR is
  * missing */
 #define DECL_ANCHOR(name) \
-  LINK_ANCHOR *name, name##_body__ = {{0,},}
+    LINK_ANCHOR name[1] = {{{ISEQ_ELEMENT_ANCHOR,},}}
 #define INIT_ANCHOR(name) \
-  (name##_body__.last = &name##_body__.anchor, name = &name##_body__)
+    (name->last = &name->anchor)
 
 static inline VALUE
 freeze_hide_obj(VALUE obj)
@@ -422,7 +463,8 @@ freeze_hide_obj(VALUE obj)
 #define gl_node_level ISEQ_COMPILE_DATA(iseq)->node_level
 #endif
 
-static void dump_disasm_list(LINK_ELEMENT *elem);
+static void dump_disasm_list_with_cursor(const LINK_ELEMENT *link, const LINK_ELEMENT *curr, const LABEL *dest);
+static void dump_disasm_list(const LINK_ELEMENT *elem);
 
 static int insn_data_length(INSN *iobj);
 static int calc_sp_depth(int depth, INSN *iobj);
@@ -430,27 +472,33 @@ static int calc_sp_depth(int depth, INSN *iobj);
 static INSN *new_insn_body(rb_iseq_t *iseq, int line_no, enum ruby_vminsn_type insn_id, int argc, ...);
 static LABEL *new_label_body(rb_iseq_t *iseq, long line);
 static ADJUST *new_adjust_body(rb_iseq_t *iseq, LABEL *label, int line);
+static TRACE *new_trace_body(rb_iseq_t *iseq, rb_event_flag_t event, long data);
+
 
-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_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *anchor, const NODE *n, int);
+static int iseq_setup(rb_iseq_t *iseq, LINK_ANCHOR *const anchor);
+static int iseq_setup_insn(rb_iseq_t *iseq, LINK_ANCHOR *const anchor);
+static int iseq_optimize(rb_iseq_t *iseq, LINK_ANCHOR *const anchor);
+static int iseq_insns_unification(rb_iseq_t *iseq, LINK_ANCHOR *const anchor);
 
 static int iseq_set_local_table(rb_iseq_t *iseq, const 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_arguments(rb_iseq_t *iseq, LINK_ANCHOR *const anchor, const NODE *const 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_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *const anchor);
+static int iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor);
 static int iseq_set_exception_table(rb_iseq_t *iseq);
 static int iseq_set_optargs_table(rb_iseq_t *iseq);
 
+static int compile_defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, VALUE needstr);
+static int compile_hash(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int method_call_keywords, int popped);
+
 /*
  * To make Array to LinkedList, use link_anchor
  */
 
 static void
-verify_list(ISEQ_ARG_DECLARE const char *info, LINK_ANCHOR *anchor)
+verify_list(ISEQ_ARG_DECLARE const char *info, LINK_ANCHOR *const anchor)
 {
 #if CPDEBUG
     int flag = 0;
@@ -481,11 +529,49 @@ verify_list(ISEQ_ARG_DECLARE const char *info, LINK_ANCHOR *anchor)
 #define verify_list(info, anchor) verify_list(iseq, (info), (anchor))
 #endif
 
+static void
+verify_call_cache(rb_iseq_t *iseq)
+{
+#if CPDEBUG
+    // fprintf(stderr, "ci_size:%d\t", iseq->body->ci_size); rp(iseq);
+
+    VALUE *original = rb_iseq_original_iseq(iseq);
+    size_t i = 0;
+    while (i < iseq->body->iseq_size) {
+        VALUE insn = original[i];
+        const char *types = insn_op_types(insn);
+
+        for (int j=0; types[j]; j++) {
+            if (types[j] == TS_CALLDATA) {
+                struct rb_call_data *cd = (struct rb_call_data *)original[i+j+1];
+                const struct rb_callinfo *ci = cd->ci;
+                const struct rb_callcache *cc = cd->cc;
+                if (cc != vm_cc_empty()) {
+                    vm_ci_dump(ci);
+                    rb_bug("call cache is not initialized by vm_cc_empty()");
+                }
+            }
+        }
+        i += insn_len(insn);
+    }
+
+    for (unsigned int i=0; i<iseq->body->ci_size; i++) {
+        struct rb_call_data *cd = &iseq->body->call_data[i];
+        const struct rb_callinfo *ci = cd->ci;
+        const struct rb_callcache *cc = cd->cc;
+        if (cc != NULL && cc != vm_cc_empty()) {
+            vm_ci_dump(ci);
+            rb_bug("call cache is not initialized by vm_cc_empty()");
+        }
+    }
+#endif
+}
+
 /*
  * elem1, elem2 => elem1, elem2, elem
  */
 static void
-ADD_ELEM(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor, LINK_ELEMENT *elem)
+ADD_ELEM(ISEQ_ARG_DECLARE LINK_ANCHOR *const anchor, LINK_ELEMENT *elem)
 {
     elem->prev = anchor->last;
     anchor->last->next = elem;
@@ -497,7 +583,7 @@ ADD_ELEM(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor, LINK_ELEMENT *elem)
  * elem1, before, elem2 => elem1, before, elem, elem2
  */
 static void
-APPEND_ELEM(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor, LINK_ELEMENT *before, LINK_ELEMENT *elem)
+APPEND_ELEM(ISEQ_ARG_DECLARE LINK_ANCHOR *const anchor, LINK_ELEMENT *before, LINK_ELEMENT *elem)
 {
     elem->prev = before;
     elem->next = before->next;
@@ -512,25 +598,97 @@ APPEND_ELEM(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor, LINK_ELEMENT *before, LINK_ELE
 #endif
 
 static int
-iseq_add_mark_object(const rb_iseq_t *iseq, VALUE v)
+branch_coverage_valid_p(rb_iseq_t *iseq, int first_line)
 {
-    if (!SPECIAL_CONST_P(v)) {
-	rb_iseq_add_mark_object(iseq, v);
-    }
-    return COMPILE_OK;
+    if (!ISEQ_COVERAGE(iseq)) return 0;
+    if (!ISEQ_BRANCH_COVERAGE(iseq)) return 0;
+    if (first_line <= 0) return 0;
+    return 1;
 }
 
-#define ruby_sourcefile		RSTRING_PTR(iseq->body->location.path)
+static VALUE
+decl_branch_base(rb_iseq_t *iseq, const NODE *node, const char *type)
+{
+    const int first_lineno = nd_first_lineno(node), first_column = nd_first_column(node);
+    const int last_lineno = nd_last_lineno(node), last_column = nd_last_column(node);
 
-static int
-iseq_add_mark_object_compile_time(const rb_iseq_t *iseq, VALUE v)
+    if (!branch_coverage_valid_p(iseq, first_lineno)) return Qundef;
+
+    /*
+     * if !structure[node]
+     *   structure[node] = [type, first_lineno, first_column, last_lineno, last_column, branches = {}]
+     * else
+     *   branches = structure[node][5]
+     * end
+     */
+
+    VALUE structure = RARRAY_AREF(ISEQ_BRANCH_COVERAGE(iseq), 0);
+    VALUE key = (VALUE)node | 1; // FIXNUM for hash key
+    VALUE branch_base = rb_hash_aref(structure, key);
+    VALUE branches;
+
+    if (NIL_P(branch_base)) {
+        branch_base = rb_ary_tmp_new(6);
+        rb_hash_aset(structure, key, branch_base);
+        rb_ary_push(branch_base, ID2SYM(rb_intern(type)));
+        rb_ary_push(branch_base, INT2FIX(first_lineno));
+        rb_ary_push(branch_base, INT2FIX(first_column));
+        rb_ary_push(branch_base, INT2FIX(last_lineno));
+        rb_ary_push(branch_base, INT2FIX(last_column));
+        branches = rb_hash_new();
+        rb_obj_hide(branches);
+        rb_ary_push(branch_base, branches);
+    }
+    else {
+        branches = RARRAY_AREF(branch_base, 5);
+    }
+
+    return branches;
+}
+
+static void
+add_trace_branch_coverage(rb_iseq_t *iseq, LINK_ANCHOR *const seq, const NODE *node, int branch_id, const char *type, VALUE branches)
 {
-    if (!SPECIAL_CONST_P(v)) {
-	rb_ary_push(ISEQ_COMPILE_DATA(iseq)->mark_ary, v);
+    const int first_lineno = nd_first_lineno(node), first_column = nd_first_column(node);
+    const int last_lineno = nd_last_lineno(node), last_column = nd_last_column(node);
+
+    if (!branch_coverage_valid_p(iseq, first_lineno)) return;
+
+    /*
+     * if !branches[branch_id]
+     *   branches[branch_id] = [type, first_lineno, first_column, last_lineno, last_column, counter_idx]
+     * else
+     *   counter_idx= branches[branch_id][5]
+     * end
+     */
+
+    VALUE key = INT2FIX(branch_id);
+    VALUE branch = rb_hash_aref(branches, key);
+    long counter_idx;
+
+    if (NIL_P(branch)) {
+        branch = rb_ary_tmp_new(6);
+        rb_hash_aset(branches, key, branch);
+        rb_ary_push(branch, ID2SYM(rb_intern(type)));
+        rb_ary_push(branch, INT2FIX(first_lineno));
+        rb_ary_push(branch, INT2FIX(first_column));
+        rb_ary_push(branch, INT2FIX(last_lineno));
+        rb_ary_push(branch, INT2FIX(last_column));
+        VALUE counters = RARRAY_AREF(ISEQ_BRANCH_COVERAGE(iseq), 1);
+        counter_idx = RARRAY_LEN(counters);
+        rb_ary_push(branch, LONG2FIX(counter_idx));
+        rb_ary_push(counters, INT2FIX(0));
     }
-    return COMPILE_OK;
+    else {
+        counter_idx = FIX2LONG(RARRAY_AREF(branch, 5));
+    }
+
+    ADD_TRACE_WITH_DATA(seq, RUBY_EVENT_COVERAGE_BRANCH, counter_idx);
+    ADD_INSN(seq, last_lineno, nop);
 }
 
+#define ISEQ_LAST_LINE(iseq) (ISEQ_COMPILE_DATA(iseq)->last_line)
+
 static int
 validate_label(st_data_t name, st_data_t label, st_data_t arg)
 {
@@ -540,7 +698,7 @@ validate_label(st_data_t name, st_data_t label, st_data_t arg)
 	do {
 	    COMPILE_ERROR(iseq, lobj->position,
 			  "%"PRIsVALUE": undefined label",
-			  rb_id2str((ID)name));
+			  rb_sym2str((VALUE)name));
 	} while (0);
     }
     return ST_CONTINUE;
@@ -551,21 +709,37 @@ validate_labels(rb_iseq_t *iseq, st_table *labels_table)
 {
     st_foreach(labels_table, validate_label, (st_data_t)iseq);
     st_free_table(labels_table);
-    if (!NIL_P(ISEQ_COMPILE_DATA(iseq)->err_info)) {
-	rb_exc_raise(ISEQ_COMPILE_DATA(iseq)->err_info);
-    }
 }
 
 VALUE
-rb_iseq_compile_node(rb_iseq_t *iseq, NODE *node)
+rb_iseq_compile_callback(rb_iseq_t *iseq, const struct rb_iseq_new_with_callback_callback_func * ifunc)
+{
+    DECL_ANCHOR(ret);
+    INIT_ANCHOR(ret);
+
+    (*ifunc->func)(iseq, ret, ifunc->data);
+
+    ADD_INSN(ret, ISEQ_COMPILE_DATA(iseq)->last_line, leave);
+
+    CHECK(iseq_setup_insn(iseq, ret));
+    return iseq_setup(iseq, ret);
+}
+
+VALUE
+rb_iseq_compile_node(rb_iseq_t *iseq, const NODE *node)
 {
     DECL_ANCHOR(ret);
     INIT_ANCHOR(ret);
 
+    if (IMEMO_TYPE_P(node, imemo_ifunc)) {
+        rb_raise(rb_eArgError, "unexpected imemo_ifunc");
+    }
+
     if (node == 0) {
-	COMPILE(ret, "nil", node);
+        NO_CHECK(COMPILE(ret, "nil", node));
 	iseq_set_local_table(iseq, 0);
     }
+    /* assume node is T_NODE */
     else if (nd_type(node) == NODE_SCOPE) {
 	/* iseq type of top, method, class, block */
 	iseq_set_local_table(iseq, node->nd_tbl);
@@ -580,89 +754,93 @@ rb_iseq_compile_node(rb_iseq_t *iseq, NODE *node)
 		start->rescued = LABEL_RESCUE_BEG;
 		end->rescued = LABEL_RESCUE_END;
 
-		ADD_TRACE(ret, FIX2INT(iseq->body->location.first_lineno), RUBY_EVENT_B_CALL);
+		ADD_TRACE(ret, RUBY_EVENT_B_CALL);
+		ADD_INSN (ret, FIX2INT(iseq->body->location.first_lineno), nop);
 		ADD_LABEL(ret, start);
-		COMPILE(ret, "block body", node->nd_body);
+		CHECK(COMPILE(ret, "block body", node->nd_body));
 		ADD_LABEL(ret, end);
-		ADD_TRACE(ret, nd_line(node), RUBY_EVENT_B_RETURN);
+		ADD_TRACE(ret, RUBY_EVENT_B_RETURN);
+		ISEQ_COMPILE_DATA(iseq)->last_line = iseq->body->location.code_location.end_pos.lineno;
 
 		/* 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);
+		ADD_CATCH_ENTRY(CATCH_TYPE_REDO, start, end, NULL, start);
+		ADD_CATCH_ENTRY(CATCH_TYPE_NEXT, start, end, NULL, end);
 		break;
 	    }
 	  case ISEQ_TYPE_CLASS:
 	    {
-		ADD_TRACE(ret, FIX2INT(iseq->body->location.first_lineno), RUBY_EVENT_CLASS);
-		COMPILE(ret, "scoped node", node->nd_body);
-		ADD_TRACE(ret, nd_line(node), RUBY_EVENT_END);
+		ADD_TRACE(ret, RUBY_EVENT_CLASS);
+		CHECK(COMPILE(ret, "scoped node", node->nd_body));
+		ADD_TRACE(ret, RUBY_EVENT_END);
+		ISEQ_COMPILE_DATA(iseq)->last_line = nd_line(node);
 		break;
 	    }
 	  case ISEQ_TYPE_METHOD:
 	    {
-		ADD_TRACE(ret, FIX2INT(iseq->body->location.first_lineno), RUBY_EVENT_CALL);
-		COMPILE(ret, "scoped node", node->nd_body);
-		ADD_TRACE(ret, nd_line(node), RUBY_EVENT_RETURN);
+		ADD_TRACE(ret, RUBY_EVENT_CALL);
+		CHECK(COMPILE(ret, "scoped node", node->nd_body));
+		ADD_TRACE(ret, RUBY_EVENT_RETURN);
+		ISEQ_COMPILE_DATA(iseq)->last_line = nd_line(node);
 		break;
 	    }
 	  default: {
-	    COMPILE(ret, "scoped node", node->nd_body);
+	    CHECK(COMPILE(ret, "scoped node", node->nd_body));
 	    break;
 	  }
 	}
     }
-    else if (RB_TYPE_P((VALUE)node, T_IMEMO)) {
-	const struct vm_ifunc *ifunc = (struct vm_ifunc *)node;
-	/* user callback */
-	(*ifunc->func)(iseq, ret, ifunc->data);
-    }
     else {
+	const char *m;
+#define INVALID_ISEQ_TYPE(type) \
+	ISEQ_TYPE_##type: m = #type; goto invalid_iseq_type
 	switch (iseq->body->type) {
-	  case ISEQ_TYPE_METHOD:
-	  case ISEQ_TYPE_CLASS:
-	  case ISEQ_TYPE_BLOCK:
-	  case ISEQ_TYPE_EVAL:
-	  case ISEQ_TYPE_MAIN:
-	  case ISEQ_TYPE_TOP:
-	    COMPILE_ERROR(ERROR_ARGS "compile/should not be reached: %s:%d",
-			  __FILE__, __LINE__);
-	    return COMPILE_NG;
+	  case INVALID_ISEQ_TYPE(METHOD);
+	  case INVALID_ISEQ_TYPE(CLASS);
+	  case INVALID_ISEQ_TYPE(BLOCK);
+	  case INVALID_ISEQ_TYPE(EVAL);
+	  case INVALID_ISEQ_TYPE(MAIN);
+	  case INVALID_ISEQ_TYPE(TOP);
+#undef INVALID_ISEQ_TYPE /* invalid iseq types end */
 	  case ISEQ_TYPE_RESCUE:
 	    iseq_set_exception_local_table(iseq);
-	    COMPILE(ret, "rescue", node);
+	    CHECK(COMPILE(ret, "rescue", node));
 	    break;
 	  case ISEQ_TYPE_ENSURE:
 	    iseq_set_exception_local_table(iseq);
-	    COMPILE_POPED(ret, "ensure", node);
+	    CHECK(COMPILE_POPPED(ret, "ensure", node));
 	    break;
-	  case ISEQ_TYPE_DEFINED_GUARD:
-	    iseq_set_exception_local_table(iseq);
-	    COMPILE(ret, "defined guard", node);
+	  case ISEQ_TYPE_PLAIN:
+	    CHECK(COMPILE(ret, "ensure", node));
 	    break;
 	  default:
-	    compile_bug(ERROR_ARGS "unknown scope");
+	    COMPILE_ERROR(ERROR_ARGS "unknown scope: %d", iseq->body->type);
+	    return COMPILE_NG;
+	  invalid_iseq_type:
+	    COMPILE_ERROR(ERROR_ARGS "compile/ISEQ_TYPE_%s should not be reached", m);
+	    return COMPILE_NG;
 	}
     }
 
     if (iseq->body->type == ISEQ_TYPE_RESCUE || iseq->body->type == ISEQ_TYPE_ENSURE) {
-	ADD_INSN2(ret, 0, getlocal, INT2FIX(2), INT2FIX(0));
+	ADD_GETLOCAL(ret, 0, LVAR_ERRINFO, 0);
 	ADD_INSN1(ret, 0, throw, INT2FIX(0) /* continue throw */ );
     }
     else {
 	ADD_INSN(ret, ISEQ_COMPILE_DATA(iseq)->last_line, leave);
     }
 
-#if SUPPORT_JOKE
+#if OPT_SUPPORT_JOKE
     if (ISEQ_COMPILE_DATA(iseq)->labels_table) {
 	st_table *labels_table = ISEQ_COMPILE_DATA(iseq)->labels_table;
 	ISEQ_COMPILE_DATA(iseq)->labels_table = 0;
 	validate_labels(iseq, labels_table);
     }
 #endif
+    CHECK(iseq_setup_insn(iseq, ret));
     return iseq_setup(iseq, ret);
 }
 
-int
+static int
 rb_iseq_translate_threaded_code(rb_iseq_t *iseq)
 {
 #if OPT_DIRECT_THREADED_CODE || OPT_CALL_THREADED_CODE
@@ -676,26 +854,11 @@ rb_iseq_translate_threaded_code(rb_iseq_t *iseq)
 	encoded[i] = (VALUE)table[insn];
 	i += len;
     }
+    FL_SET((VALUE)iseq, ISEQ_TRANSLATED);
 #endif
     return COMPILE_OK;
 }
 
-#if OPT_DIRECT_THREADED_CODE || OPT_CALL_THREADED_CODE
-static int
-rb_vm_insn_addr2insn(const void *addr) /* cold path */
-{
-    int insn;
-    const void * const *table = rb_vm_get_insns_address_table();
-
-    for (insn = 0; insn < VM_INSTRUCTION_SIZE; insn++) {
-	if (table[insn] == addr) {
-	    return insn;
-	}
-    }
-    rb_bug("rb_vm_insn_addr2insn: invalid insn address: %p", addr);
-}
-#endif
-
 VALUE *
 rb_iseq_original_iseq(const rb_iseq_t *iseq) /* cold path */
 {
@@ -735,6 +898,16 @@ rb_iseq_original_iseq(const rb_iseq_t *iseq) /* cold path */
   #define STRICT_ALIGNMENT
 #endif
 
+/*
+ * Some OpenBSD platforms (including sparc64) require strict alignment.
+ */
+#if defined(__OpenBSD__)
+  #include <sys/endian.h>
+  #ifdef __STRICT_ALIGNMENT
+    #define STRICT_ALIGNMENT
+  #endif
+#endif
+
 #ifdef STRICT_ALIGNMENT
   #if defined(HAVE_TRUE_LONG_LONG) && SIZEOF_LONG_LONG > SIZEOF_VALUE
     #define ALIGNMENT_SIZE SIZEOF_LONG_LONG
@@ -775,11 +948,10 @@ calc_padding(void *ptr, size_t size)
 #endif /* STRICT_ALIGNMENT */
 
 static void *
-compile_data_alloc(rb_iseq_t *iseq, size_t size)
+compile_data_alloc_with_arena(struct iseq_compile_data_storage **arena, size_t size)
 {
     void *ptr = 0;
-    struct iseq_compile_data_storage *storage =
-	ISEQ_COMPILE_DATA(iseq)->storage_current;
+    struct iseq_compile_data_storage *storage = *arena;
 #ifdef STRICT_ALIGNMENT
     size_t padding = calc_padding((void *)&storage->buff[storage->pos], size);
 #else
@@ -795,8 +967,8 @@ compile_data_alloc(rb_iseq_t *iseq, size_t size)
 	    alloc_size *= 2;
 	}
 	storage->next = (void *)ALLOC_N(char, alloc_size +
-					SIZEOF_ISEQ_COMPILE_DATA_STORAGE);
-	storage = ISEQ_COMPILE_DATA(iseq)->storage_current = storage->next;
+					offsetof(struct iseq_compile_data_storage, buff));
+	storage = *arena = storage->next;
 	storage->next = 0;
 	storage->pos = 0;
 	storage->size = alloc_size;
@@ -814,10 +986,34 @@ compile_data_alloc(rb_iseq_t *iseq, size_t size)
     return ptr;
 }
 
+static void *
+compile_data_alloc(rb_iseq_t *iseq, size_t size)
+{
+    struct iseq_compile_data_storage ** arena = &ISEQ_COMPILE_DATA(iseq)->node.storage_current;
+    return compile_data_alloc_with_arena(arena, size);
+}
+
+static inline void *
+compile_data_alloc2(rb_iseq_t *iseq, size_t x, size_t y)
+{
+    size_t size = rb_size_mul_or_raise(x, y, rb_eRuntimeError);
+    return compile_data_alloc(iseq, size);
+}
+
+static inline void *
+compile_data_calloc2(rb_iseq_t *iseq, size_t x, size_t y)
+{
+    size_t size = rb_size_mul_or_raise(x, y, rb_eRuntimeError);
+    void *p = compile_data_alloc(iseq, size);
+    memset(p, 0, size);
+    return p;
+}
+
 static INSN *
 compile_data_alloc_insn(rb_iseq_t *iseq)
 {
-    return (INSN *)compile_data_alloc(iseq, sizeof(INSN));
+    struct iseq_compile_data_storage ** arena = &ISEQ_COMPILE_DATA(iseq)->insn.storage_current;
+    return (INSN *)compile_data_alloc_with_arena(arena, sizeof(INSN));
 }
 
 static LABEL *
@@ -832,11 +1028,17 @@ compile_data_alloc_adjust(rb_iseq_t *iseq)
     return (ADJUST *)compile_data_alloc(iseq, sizeof(ADJUST));
 }
 
+static TRACE *
+compile_data_alloc_trace(rb_iseq_t *iseq)
+{
+    return (TRACE *)compile_data_alloc(iseq, sizeof(TRACE));
+}
+
 /*
  * elem1, elemX => elem1, elem2, elemX
  */
 static void
-INSERT_ELEM_NEXT(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
+ELEM_INSERT_NEXT(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
 {
     elem2->next = elem1->next;
     elem2->prev = elem1;
@@ -850,7 +1052,7 @@ INSERT_ELEM_NEXT(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
  * elem1, elemX => elemX, elem2, elem1
  */
 static void
-INSERT_ELEM_PREV(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
+ELEM_INSERT_PREV(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
 {
     elem2->prev = elem1->prev;
     elem2->next = elem1;
@@ -860,12 +1062,11 @@ INSERT_ELEM_PREV(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
     }
 }
 
-#if 0
 /*
  * elemX, elem1, elemY => elemX, elem2, elemY
  */
 static void
-REPLACE_ELEM(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
+ELEM_REPLACE(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
 {
     elem2->prev = elem1->prev;
     elem2->next = elem1->next;
@@ -876,10 +1077,9 @@ REPLACE_ELEM(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
 	elem1->next->prev = elem2;
     }
 }
-#endif
 
 static void
-REMOVE_ELEM(LINK_ELEMENT *elem)
+ELEM_REMOVE(LINK_ELEMENT *elem)
 {
     elem->prev->next = elem->next;
     if (elem->next) {
@@ -888,19 +1088,19 @@ REMOVE_ELEM(LINK_ELEMENT *elem)
 }
 
 static LINK_ELEMENT *
-FIRST_ELEMENT(LINK_ANCHOR *anchor)
+FIRST_ELEMENT(const LINK_ANCHOR *const anchor)
 {
     return anchor->anchor.next;
 }
 
 static LINK_ELEMENT *
-LAST_ELEMENT(LINK_ANCHOR *anchor)
+LAST_ELEMENT(LINK_ANCHOR *const anchor)
 {
     return anchor->last;
 }
 
 static LINK_ELEMENT *
-POP_ELEMENT(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor)
+POP_ELEMENT(ISEQ_ARG_DECLARE LINK_ANCHOR *const anchor)
 {
     LINK_ELEMENT *elem = anchor->last;
     anchor->last = anchor->last->prev;
@@ -912,14 +1112,42 @@ POP_ELEMENT(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor)
 #define POP_ELEMENT(anchor) POP_ELEMENT(iseq, (anchor))
 #endif
 
+static LINK_ELEMENT *
+ELEM_FIRST_INSN(LINK_ELEMENT *elem)
+{
+    while (elem) {
+	switch (elem->type) {
+	  case ISEQ_ELEMENT_INSN:
+	  case ISEQ_ELEMENT_ADJUST:
+	    return elem;
+	  default:
+	    elem = elem->next;
+	}
+    }
+    return NULL;
+}
+
 static int
-LIST_SIZE_ZERO(LINK_ANCHOR *anchor)
+LIST_INSN_SIZE_ONE(const LINK_ANCHOR *const anchor)
 {
-    if (anchor->anchor.next == 0) {
-	return 1;
+    LINK_ELEMENT *first_insn = ELEM_FIRST_INSN(FIRST_ELEMENT(anchor));
+    if (first_insn != NULL &&
+	ELEM_FIRST_INSN(first_insn->next) == NULL) {
+	return TRUE;
     }
     else {
-	return 0;
+	return FALSE;
+    }
+}
+
+static int
+LIST_INSN_SIZE_ZERO(const LINK_ANCHOR *const anchor)
+{
+    if (ELEM_FIRST_INSN(FIRST_ELEMENT(anchor)) == NULL) {
+	return TRUE;
+    }
+    else {
+	return FALSE;
     }
 }
 
@@ -931,7 +1159,7 @@ LIST_SIZE_ZERO(LINK_ANCHOR *anchor)
  * anc2: e4, e5 (broken)
  */
 static void
-APPEND_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *anc1, LINK_ANCHOR *anc2)
+APPEND_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *const anc1, LINK_ANCHOR *const anc2)
 {
     if (anc2->anchor.next) {
 	anc1->last->next = anc2->anchor.next;
@@ -944,38 +1172,9 @@ APPEND_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *anc1, LINK_ANCHOR *anc2)
 #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 CPDEBUG && 0
 static void
-debug_list(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor)
+debug_list(ISEQ_ARG_DECLARE LINK_ANCHOR *const anchor, LINK_ELEMENT *cur)
 {
     LINK_ELEMENT *list = FIRST_ELEMENT(anchor);
     printf("----\n");
@@ -983,19 +1182,34 @@ debug_list(ISEQ_ARG_DECLARE LINK_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->prev, (int)list->type);
 	list = list->next;
     }
     printf("----\n");
 
-    dump_disasm_list(anchor->anchor.next);
+    dump_disasm_list_with_cursor(anchor->anchor.next, cur, 0);
     verify_list("debug list", anchor);
 }
 #if CPDEBUG < 0
-#define debug_list(anc) debug_list(iseq, (anc))
+#define debug_list(anc, cur) debug_list(iseq, (anc), (cur))
 #endif
+#else
+#define debug_list(anc, cur) ((void)0)
 #endif
 
+static TRACE *
+new_trace_body(rb_iseq_t *iseq, rb_event_flag_t event, long data)
+{
+    TRACE *trace = compile_data_alloc_trace(iseq);
+
+    trace->link.type = ISEQ_ELEMENT_TRACE;
+    trace->link.next = NULL;
+    trace->event = event;
+    trace->data = data;
+
+    return trace;
+}
+
 static LABEL *
 new_label_body(rb_iseq_t *iseq, long line)
 {
@@ -1010,6 +1224,7 @@ new_label_body(rb_iseq_t *iseq, long line)
     labelobj->refcnt = 0;
     labelobj->set = 0;
     labelobj->rescued = LABEL_RESCUE_NONE;
+    labelobj->unremovable = 0;
     return labelobj;
 }
 
@@ -1021,7 +1236,7 @@ new_adjust_body(rb_iseq_t *iseq, LABEL *label, int line)
     adjust->link.next = 0;
     adjust->label = label;
     adjust->line_no = line;
-    if (label) LABEL_REF(label);
+    LABEL_UNREMOVABLE(label);
     return adjust;
 }
 
@@ -1030,12 +1245,14 @@ new_insn_core(rb_iseq_t *iseq, int line_no,
 	      int insn_id, int argc, VALUE *argv)
 {
     INSN *iobj = compile_data_alloc_insn(iseq);
+
     /* printf("insn_id: %d, line: %d\n", insn_id, line_no); */
 
     iobj->link.type = ISEQ_ELEMENT_INSN;
     iobj->link.next = 0;
     iobj->insn_id = insn_id;
-    iobj->line_no = line_no;
+    iobj->insn_info.line_no = line_no;
+    iobj->insn_info.events = 0;
     iobj->operands = argv;
     iobj->operand_size = argc;
     iobj->sc_state = 0;
@@ -1049,8 +1266,8 @@ new_insn_body(rb_iseq_t *iseq, int line_no, enum ruby_vminsn_type insn_id, int a
     va_list argv;
     if (argc > 0) {
 	int i;
-	va_init_list(argv, argc);
-	operands = (VALUE *)compile_data_alloc(iseq, sizeof(VALUE) * argc);
+        va_start(argv, argc);
+        operands = compile_data_alloc2(iseq, sizeof(VALUE), argc);
 	for (i = 0; i < argc; i++) {
 	    VALUE v = va_arg(argv, VALUE);
 	    operands[i] = v;
@@ -1060,62 +1277,163 @@ new_insn_body(rb_iseq_t *iseq, int line_no, enum ruby_vminsn_type insn_id, int a
     return new_insn_core(iseq, line_no, insn_id, argc, operands);
 }
 
-static struct rb_call_info *
-new_callinfo(rb_iseq_t *iseq, ID mid, int argc, unsigned int flag, struct rb_call_info_kw_arg *kw_arg, int has_blockiseq)
+static const struct rb_callinfo *
+new_callinfo(rb_iseq_t *iseq, ID mid, int argc, unsigned int flag, struct rb_callinfo_kwarg *kw_arg, int has_blockiseq)
 {
-    size_t size = kw_arg != NULL ? sizeof(struct rb_call_info_with_kwarg) : sizeof(struct rb_call_info);
-    struct rb_call_info *ci = (struct rb_call_info *)compile_data_alloc(iseq, size);
-    struct rb_call_info_with_kwarg *ci_kw = (struct rb_call_info_with_kwarg *)ci;
+    VM_ASSERT(argc >= 0);
 
-    ci->mid = mid;
-    ci->flag = flag;
-    ci->orig_argc = argc;
+    if (!(flag & (VM_CALL_ARGS_SPLAT | VM_CALL_ARGS_BLOCKARG | VM_CALL_KW_SPLAT)) &&
+        kw_arg == NULL && !has_blockiseq) {
+        flag |= VM_CALL_ARGS_SIMPLE;
+    }
 
     if (kw_arg) {
-	ci->flag |= VM_CALL_KWARG;
-	ci_kw->kw_arg = kw_arg;
-	ci->orig_argc += kw_arg->keyword_len;
-	iseq->body->ci_kw_size++;
-    }
-    else {
-	iseq->body->ci_size++;
+        flag |= VM_CALL_KWARG;
+        argc += kw_arg->keyword_len;
     }
 
-    if (!(ci->flag & (VM_CALL_ARGS_SPLAT | VM_CALL_ARGS_BLOCKARG)) &&
-	kw_arg == NULL && !has_blockiseq) {
-	ci->flag |= VM_CALL_ARGS_SIMPLE;
-    }
+    // fprintf(stderr, "[%d] id:%s\t", (int)iseq->body->ci_size, rb_id2name(mid)); rp(iseq);
+    iseq->body->ci_size++;
+    const struct rb_callinfo *ci = vm_ci_new(mid, flag, argc, kw_arg);
+    RB_OBJ_WRITTEN(iseq, Qundef, ci);
     return ci;
 }
 
 static INSN *
-new_insn_send(rb_iseq_t *iseq, int line_no, ID id, VALUE argc, const rb_iseq_t *blockiseq, VALUE flag, struct rb_call_info_kw_arg *keywords)
+new_insn_send(rb_iseq_t *iseq, int line_no, ID id, VALUE argc, const rb_iseq_t *blockiseq, VALUE flag, struct rb_callinfo_kwarg *keywords)
 {
-    VALUE *operands = (VALUE *)compile_data_alloc(iseq, sizeof(VALUE) * 3);
-    operands[0] = (VALUE)new_callinfo(iseq, id, FIX2INT(argc), FIX2INT(flag), keywords, blockiseq != NULL);
-    operands[1] = Qfalse; /* cache */
-    operands[2] = (VALUE)blockiseq;
-    return new_insn_core(iseq, line_no, BIN(send), 3, operands);
+    VALUE *operands = compile_data_calloc2(iseq, sizeof(VALUE), 2);
+    VALUE ci = (VALUE)new_callinfo(iseq, id, FIX2INT(argc), FIX2INT(flag), keywords, blockiseq != NULL);
+    operands[0] = ci;
+    operands[1] = (VALUE)blockiseq;
+    if (blockiseq) {
+        RB_OBJ_WRITTEN(iseq, Qundef, blockiseq);
+    }
+    INSN *insn = new_insn_core(iseq, line_no, BIN(send), 2, operands);
+    RB_OBJ_WRITTEN(iseq, Qundef, ci);
+    RB_GC_GUARD(ci);
+    return insn;
 }
 
 static rb_iseq_t *
-new_child_iseq(rb_iseq_t *iseq, NODE *node,
+new_child_iseq(rb_iseq_t *iseq, const NODE *const node,
 	       VALUE name, const rb_iseq_t *parent, enum iseq_type type, int line_no)
 {
     rb_iseq_t *ret_iseq;
+    rb_ast_body_t ast;
+
+    ast.root = node;
+    ast.compile_option = 0;
+    ast.line_count = -1;
 
     debugs("[new_child_iseq]> ---------------------------------------\n");
-    ret_iseq = rb_iseq_new_with_opt(node, name,
-				    iseq_path(iseq), iseq_absolute_path(iseq),
-				    INT2FIX(line_no), parent, type, ISEQ_COMPILE_DATA(iseq)->option);
+    int isolated_depth = ISEQ_COMPILE_DATA(iseq)->isolated_depth;
+    ret_iseq = rb_iseq_new_with_opt(&ast, name,
+				    rb_iseq_path(iseq), rb_iseq_realpath(iseq),
+                                    INT2FIX(line_no), parent,
+                                    isolated_depth ? isolated_depth + 1 : 0,
+                                    type, ISEQ_COMPILE_DATA(iseq)->option);
     debugs("[new_child_iseq]< ---------------------------------------\n");
-    iseq_add_mark_object(iseq, (VALUE)ret_iseq);
     return ret_iseq;
 }
 
+static rb_iseq_t *
+new_child_iseq_with_callback(rb_iseq_t *iseq, const struct rb_iseq_new_with_callback_callback_func *ifunc,
+		     VALUE name, const rb_iseq_t *parent, enum iseq_type type, int line_no)
+{
+    rb_iseq_t *ret_iseq;
+
+    debugs("[new_child_iseq_with_callback]> ---------------------------------------\n");
+    ret_iseq = rb_iseq_new_with_callback(ifunc, name,
+				 rb_iseq_path(iseq), rb_iseq_realpath(iseq),
+				 INT2FIX(line_no), parent, type, ISEQ_COMPILE_DATA(iseq)->option);
+    debugs("[new_child_iseq_with_callback]< ---------------------------------------\n");
+    return ret_iseq;
+}
+
+static void
+set_catch_except_p(struct rb_iseq_constant_body *body)
+{
+    body->catch_except_p = TRUE;
+    if (body->parent_iseq != NULL) {
+        set_catch_except_p(body->parent_iseq->body);
+    }
+}
+
+/* Set body->catch_except_p to TRUE if the ISeq may catch an exception. If it is FALSE,
+   JIT-ed code may be optimized.  If we are extremely conservative, we should set TRUE
+   if catch table exists.  But we want to optimize while loop, which always has catch
+   table entries for break/next/redo.
+
+   So this function sets TRUE for limited ISeqs with break/next/redo catch table entries
+   whose child ISeq would really raise an exception. */
+static void
+update_catch_except_flags(struct rb_iseq_constant_body *body)
+{
+    unsigned int pos;
+    size_t i;
+    int insn;
+    const struct iseq_catch_table *ct = body->catch_table;
+
+    /* This assumes that a block has parent_iseq which may catch an exception from the block, and that
+       BREAK/NEXT/REDO catch table entries are used only when `throw` insn is used in the block. */
+    pos = 0;
+    while (pos < body->iseq_size) {
+#if OPT_DIRECT_THREADED_CODE || OPT_CALL_THREADED_CODE
+        insn = rb_vm_insn_addr2insn((void *)body->iseq_encoded[pos]);
+#else
+        insn = (int)body->iseq_encoded[pos];
+#endif
+        if (insn == BIN(throw)) {
+            set_catch_except_p(body);
+            break;
+        }
+        pos += insn_len(insn);
+    }
+
+    if (ct == NULL)
+        return;
+
+    for (i = 0; i < ct->size; i++) {
+        const struct iseq_catch_table_entry *entry =
+            UNALIGNED_MEMBER_PTR(ct, entries[i]);
+        if (entry->type != CATCH_TYPE_BREAK
+            && entry->type != CATCH_TYPE_NEXT
+            && entry->type != CATCH_TYPE_REDO) {
+            body->catch_except_p = TRUE;
+            break;
+        }
+    }
+}
+
+static void
+iseq_insert_nop_between_end_and_cont(rb_iseq_t *iseq)
+{
+    VALUE catch_table_ary = ISEQ_COMPILE_DATA(iseq)->catch_table_ary;
+    if (NIL_P(catch_table_ary)) return;
+    unsigned int i, tlen = (unsigned int)RARRAY_LEN(catch_table_ary);
+    const VALUE *tptr = RARRAY_CONST_PTR_TRANSIENT(catch_table_ary);
+    for (i = 0; i < tlen; i++) {
+        const VALUE *ptr = RARRAY_CONST_PTR_TRANSIENT(tptr[i]);
+        LINK_ELEMENT *end = (LINK_ELEMENT *)(ptr[2] & ~1);
+        LINK_ELEMENT *cont = (LINK_ELEMENT *)(ptr[4] & ~1);
+        LINK_ELEMENT *e;
+        for (e = end; e && (IS_LABEL(e) || IS_TRACE(e)); e = e->next) {
+            if (e == cont) {
+                INSN *nop = new_insn_core(iseq, 0, BIN(nop), 0, 0);
+                ELEM_INSERT_NEXT(end, &nop->link);
+                break;
+            }
+        }
+    }
+}
+
 static int
-iseq_setup(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
+iseq_setup_insn(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 {
+    if (RTEST(ISEQ_COMPILE_DATA(iseq)->err_info))
+	return COMPILE_NG;
+
     /* debugs("[compile step 2] (iseq_array_to_linkedlist)\n"); */
 
     if (compile_debug > 5)
@@ -1141,6 +1459,20 @@ iseq_setup(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
 	    dump_disasm_list(FIRST_ELEMENT(anchor));
     }
 
+    debugs("[compile step 3.4 (iseq_insert_nop_between_end_and_cont)]\n");
+    iseq_insert_nop_between_end_and_cont(iseq);
+    if (compile_debug > 5)
+        dump_disasm_list(FIRST_ELEMENT(anchor));
+
+    return COMPILE_OK;
+}
+
+static int
+iseq_setup(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
+{
+    if (RTEST(ISEQ_COMPILE_DATA(iseq)->err_info))
+        return COMPILE_NG;
+
     debugs("[compile step 4.1 (iseq_set_sequence)]\n");
     if (!iseq_set_sequence(iseq, anchor)) return COMPILE_NG;
     if (compile_debug > 5)
@@ -1155,10 +1487,21 @@ iseq_setup(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
     debugs("[compile step 5 (iseq_translate_threaded_code)] \n");
     if (!rb_iseq_translate_threaded_code(iseq)) return COMPILE_NG;
 
+    debugs("[compile step 6 (update_catch_except_flags)] \n");
+    update_catch_except_flags(iseq->body);
+
+#if VM_INSN_INFO_TABLE_IMPL == 2
+    if (iseq->body->insns_info.succ_index_table == NULL) {
+        debugs("[compile step 7 (rb_iseq_insns_info_encode_positions)] \n");
+        rb_iseq_insns_info_encode_positions(iseq);
+    }
+#endif
+
     if (compile_debug > 1) {
 	VALUE str = rb_iseq_disasm(iseq);
 	printf("%s\n", StringValueCStr(str));
     }
+    verify_call_cache(iseq);
     debugs("[compile step: finish]\n");
 
     return COMPILE_OK;
@@ -1167,17 +1510,8 @@ iseq_setup(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
 static int
 iseq_set_exception_local_table(rb_iseq_t *iseq)
 {
-    /* TODO: every id table is same -> share it.
-     * Current problem is iseq_free().
-     */
-    ID id_dollar_bang;
-    ID *ids = (ID *)ALLOC_N(ID, 1);
-
-    CONST_ID(id_dollar_bang, "#$!");
-    iseq->body->local_table_size = 1;
-    iseq->body->local_size = iseq->body->local_table_size + 1;
-    ids[0] = id_dollar_bang;
-    iseq->body->local_table = ids;
+    iseq->body->local_table_size = numberof(rb_iseq_shared_exc_local_tbl);
+    iseq->body->local_table = rb_iseq_shared_exc_local_tbl;
     return COMPILE_OK;
 }
 
@@ -1211,7 +1545,8 @@ get_local_var_idx(const rb_iseq_t *iseq, ID id)
     int idx = get_dyna_var_idx_at_raw(iseq->body->local_iseq, id);
 
     if (idx < 0) {
-	rb_bug("get_local_var_idx: %d", idx);
+        COMPILE_ERROR(iseq, ISEQ_LAST_LINE(iseq),
+                      "get_local_var_idx: %d", idx);
     }
 
     return idx;
@@ -1221,6 +1556,7 @@ static int
 get_dyna_var_idx(const rb_iseq_t *iseq, ID id, int *level, int *ls)
 {
     int lv = 0, idx = -1;
+    const rb_iseq_t *const topmost_iseq = iseq;
 
     while (iseq) {
 	idx = get_dyna_var_idx_at_raw(iseq, id);
@@ -1232,76 +1568,193 @@ get_dyna_var_idx(const rb_iseq_t *iseq, ID id, int *level, int *ls)
     }
 
     if (idx < 0) {
-	rb_bug("get_dyna_var_idx: -1");
+        COMPILE_ERROR(topmost_iseq, ISEQ_LAST_LINE(topmost_iseq),
+                      "get_dyna_var_idx: -1");
     }
 
     *level = lv;
-    *ls = iseq->body->local_size;
+    *ls = iseq->body->local_table_size;
     return idx;
 }
 
+static int
+iseq_local_block_param_p(const rb_iseq_t *iseq, unsigned int idx, unsigned int level)
+{
+    const struct rb_iseq_constant_body *body;
+    while (level > 0) {
+	iseq = iseq->body->parent_iseq;
+	level--;
+    }
+    body = iseq->body;
+    if (body->local_iseq == iseq && /* local variables */
+	body->param.flags.has_block &&
+	body->local_table_size - body->param.block_start == idx) {
+	return TRUE;
+    }
+    else {
+	return FALSE;
+    }
+}
+
+static int
+iseq_block_param_id_p(const rb_iseq_t *iseq, ID id, int *pidx, int *plevel)
+{
+    int level, ls;
+    int idx = get_dyna_var_idx(iseq, id, &level, &ls);
+    if (iseq_local_block_param_p(iseq, ls - idx, level)) {
+	*pidx = ls - idx;
+	*plevel = level;
+	return TRUE;
+    }
+    else {
+	return FALSE;
+    }
+}
+
+static void
+access_outer_variables(const rb_iseq_t *iseq, int level, ID id, bool write)
+{
+    int isolated_depth = ISEQ_COMPILE_DATA(iseq)->isolated_depth;
+
+    if (isolated_depth && level >= isolated_depth) {
+        if (id == rb_intern("yield")) {
+            COMPILE_ERROR(iseq, ISEQ_LAST_LINE(iseq), "can not yield from isolated Proc", rb_id2name(id));
+        }
+        else {
+            COMPILE_ERROR(iseq, ISEQ_LAST_LINE(iseq), "can not access variable `%s' from isolated Proc", rb_id2name(id));
+        }
+    }
+
+    for (int i=0; i<level; i++) {
+        VALUE val;
+        struct rb_id_table *ovs = iseq->body->outer_variables;
+
+        if (!ovs) {
+            ovs = iseq->body->outer_variables = rb_id_table_create(8);
+        }
+
+        if (rb_id_table_lookup(iseq->body->outer_variables, id, &val)) {
+            if (write && !val) {
+                rb_id_table_insert(iseq->body->outer_variables, id, Qtrue);
+            }
+        }
+        else {
+            rb_id_table_insert(iseq->body->outer_variables, id, write ? Qtrue : Qfalse);
+        }
+
+        iseq = iseq->body->parent_iseq;
+    }
+}
+
+static ID
+iseq_lvar_id(const rb_iseq_t *iseq, int idx, int level)
+{
+    for (int i=0; i<level; i++) {
+        iseq = iseq->body->parent_iseq;
+    }
+
+    ID id = iseq->body->local_table[iseq->body->local_table_size - idx];
+    // fprintf(stderr, "idx:%d level:%d ID:%s\n", idx, level, rb_id2name(id));
+    return id;
+}
+
+static void
+iseq_add_getlocal(rb_iseq_t *iseq, LINK_ANCHOR *const seq, int line, int idx, int level)
+{
+    if (iseq_local_block_param_p(iseq, idx, level)) {
+	ADD_INSN2(seq, line, getblockparam, INT2FIX((idx) + VM_ENV_DATA_SIZE - 1), INT2FIX(level));
+    }
+    else {
+	ADD_INSN2(seq, line, getlocal, INT2FIX((idx) + VM_ENV_DATA_SIZE - 1), INT2FIX(level));
+    }
+    if (level > 0) access_outer_variables(iseq, level, iseq_lvar_id(iseq, idx, level), Qfalse);
+}
+
+static void
+iseq_add_setlocal(rb_iseq_t *iseq, LINK_ANCHOR *const seq, int line, int idx, int level)
+{
+    if (iseq_local_block_param_p(iseq, idx, level)) {
+	ADD_INSN2(seq, line, setblockparam, INT2FIX((idx) + VM_ENV_DATA_SIZE - 1), INT2FIX(level));
+    }
+    else {
+	ADD_INSN2(seq, line, setlocal, INT2FIX((idx) + VM_ENV_DATA_SIZE - 1), INT2FIX(level));
+    }
+    if (level > 0) access_outer_variables(iseq, level, iseq_lvar_id(iseq, idx, level), Qtrue);
+}
+
+
+
 static void
 iseq_calc_param_size(rb_iseq_t *iseq)
 {
-    if (iseq->body->param.flags.has_opt ||
-	iseq->body->param.flags.has_post ||
-	iseq->body->param.flags.has_rest ||
-	iseq->body->param.flags.has_block ||
-	iseq->body->param.flags.has_kw ||
-	iseq->body->param.flags.has_kwrest) {
+    struct rb_iseq_constant_body *const body = iseq->body;
+    if (body->param.flags.has_opt ||
+	body->param.flags.has_post ||
+	body->param.flags.has_rest ||
+	body->param.flags.has_block ||
+	body->param.flags.has_kw ||
+	body->param.flags.has_kwrest) {
 
-	if (iseq->body->param.flags.has_block) {
-	    iseq->body->param.size = iseq->body->param.block_start + 1;
+	if (body->param.flags.has_block) {
+	    body->param.size = body->param.block_start + 1;
 	}
-	else if (iseq->body->param.flags.has_kwrest) {
-	    iseq->body->param.size = iseq->body->param.keyword->rest_start + 1;
+	else if (body->param.flags.has_kwrest) {
+	    body->param.size = body->param.keyword->rest_start + 1;
 	}
-	else if (iseq->body->param.flags.has_kw) {
-	    iseq->body->param.size = iseq->body->param.keyword->bits_start + 1;
+	else if (body->param.flags.has_kw) {
+	    body->param.size = body->param.keyword->bits_start + 1;
 	}
-	else if (iseq->body->param.flags.has_post) {
-	    iseq->body->param.size = iseq->body->param.post_start + iseq->body->param.post_num;
+	else if (body->param.flags.has_post) {
+	    body->param.size = body->param.post_start + body->param.post_num;
 	}
-	else if (iseq->body->param.flags.has_rest) {
-	    iseq->body->param.size = iseq->body->param.rest_start + 1;
+	else if (body->param.flags.has_rest) {
+	    body->param.size = body->param.rest_start + 1;
 	}
-	else if (iseq->body->param.flags.has_opt) {
-	    iseq->body->param.size = iseq->body->param.lead_num + iseq->body->param.opt_num;
+	else if (body->param.flags.has_opt) {
+	    body->param.size = body->param.lead_num + body->param.opt_num;
 	}
 	else {
-	    rb_bug("unreachable");
+            UNREACHABLE;
 	}
     }
     else {
-	iseq->body->param.size = iseq->body->param.lead_num;
+	body->param.size = body->param.lead_num;
     }
 }
 
-static void
-iseq_set_arguments_keywords(rb_iseq_t *iseq, LINK_ANCHOR *optargs, const struct rb_args_info *args)
+static int
+iseq_set_arguments_keywords(rb_iseq_t *iseq, LINK_ANCHOR *const optargs,
+			    const struct rb_args_info *args, int arg_size)
 {
-    NODE *node = args->kw_args;
+    const NODE *node = args->kw_args;
+    struct rb_iseq_constant_body *const body = iseq->body;
     struct rb_iseq_param_keyword *keyword;
     const VALUE default_values = rb_ary_tmp_new(1);
     const VALUE complex_mark = rb_str_tmp_new(0);
     int kw = 0, rkw = 0, di = 0, i;
 
-    iseq->body->param.flags.has_kw = TRUE;
-    iseq->body->param.keyword = keyword = ZALLOC_N(struct rb_iseq_param_keyword, 1);
-    keyword->bits_start = get_dyna_var_idx_at_raw(iseq, args->kw_rest_arg->nd_vid);
+    body->param.flags.has_kw = TRUE;
+    body->param.keyword = keyword = ZALLOC_N(struct rb_iseq_param_keyword, 1);
+
+    while (node) {
+	kw++;
+	node = node->nd_next;
+    }
+    arg_size += kw;
+    keyword->bits_start = arg_size++;
 
+    node = args->kw_args;
     while (node) {
-	NODE *val_node = node->nd_body->nd_value;
+	const NODE *val_node = node->nd_body->nd_value;
 	VALUE dv;
 
-	if (val_node == (NODE *)-1) {
+        if (val_node == NODE_SPECIAL_REQUIRED_KEYWORD) {
 	    ++rkw;
 	}
 	else {
 	    switch (nd_type(val_node)) {
 	      case NODE_LIT:
 		dv = val_node->nd_lit;
-		iseq_add_mark_object(iseq, dv);
 		break;
 	      case NODE_NIL:
 		dv = Qnil;
@@ -1313,7 +1766,7 @@ iseq_set_arguments_keywords(rb_iseq_t *iseq, LINK_ANCHOR *optargs, const struct
 		dv = Qfalse;
 		break;
 	      default:
-		COMPILE_POPED(optargs, "kwarg", node); /* nd_type(node) == NODE_KW_ARG */
+                NO_CHECK(COMPILE_POPPED(optargs, "kwarg", node)); /* nd_type(node) == NODE_KW_ARG */
 		dv = complex_mark;
 	    }
 
@@ -1321,18 +1774,17 @@ iseq_set_arguments_keywords(rb_iseq_t *iseq, LINK_ANCHOR *optargs, const struct
 	    rb_ary_push(default_values, dv);
 	}
 
-	kw++;
 	node = node->nd_next;
     }
 
     keyword->num = kw;
 
-    if (args->kw_rest_arg->nd_cflag != 0) {
-	keyword->rest_start =  get_dyna_var_idx_at_raw(iseq, args->kw_rest_arg->nd_cflag);
-	iseq->body->param.flags.has_kwrest = TRUE;
+    if (args->kw_rest_arg->nd_vid != 0) {
+	keyword->rest_start = arg_size++;
+	body->param.flags.has_kwrest = TRUE;
     }
     keyword->required_num = rkw;
-    keyword->table = &iseq->body->local_table[keyword->bits_start - keyword->num];
+    keyword->table = &body->local_table[keyword->bits_start - keyword->num];
 
     {
 	VALUE *dvs = ALLOC_N(VALUE, RARRAY_LEN(default_values));
@@ -1340,45 +1792,46 @@ iseq_set_arguments_keywords(rb_iseq_t *iseq, LINK_ANCHOR *optargs, const struct
 	for (i = 0; i < RARRAY_LEN(default_values); i++) {
 	    VALUE dv = RARRAY_AREF(default_values, i);
 	    if (dv == complex_mark) dv = Qundef;
+	    if (!SPECIAL_CONST_P(dv)) {
+		RB_OBJ_WRITTEN(iseq, Qundef, dv);
+	    }
 	    dvs[i] = dv;
 	}
 
 	keyword->default_values = dvs;
     }
+    return arg_size;
 }
 
 static int
-iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *optargs, NODE *node_args)
+iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *const optargs, const NODE *const node_args)
 {
     debugs("iseq_set_arguments: %s\n", node_args ? "" : "0");
 
     if (node_args) {
+	struct rb_iseq_constant_body *const body = iseq->body;
 	struct rb_args_info *args = node_args->nd_ainfo;
 	ID rest_id = 0;
 	int last_comma = 0;
 	ID block_id = 0;
+	int arg_size;
 
-	EXPECT_NODE("iseq_set_arguments", node_args, NODE_ARGS);
+	EXPECT_NODE("iseq_set_arguments", node_args, NODE_ARGS, COMPILE_NG);
 
-	iseq->body->param.lead_num = (int)args->pre_args_num;
-	if (iseq->body->param.lead_num > 0) iseq->body->param.flags.has_lead = TRUE;
-	debugs("  - argc: %d\n", iseq->body->param.lead_num);
+        body->param.flags.ruby2_keywords = args->ruby2_keywords;
+	body->param.lead_num = arg_size = (int)args->pre_args_num;
+	if (body->param.lead_num > 0) body->param.flags.has_lead = TRUE;
+	debugs("  - argc: %d\n", body->param.lead_num);
 
 	rest_id = args->rest_arg;
-	if (rest_id == 1) {
+        if (rest_id == NODE_SPECIAL_EXCESSIVE_COMMA) {
 	    last_comma = 1;
 	    rest_id = 0;
 	}
 	block_id = args->block_arg;
 
-	if (args->first_post_arg) {
-	    iseq->body->param.post_start = get_dyna_var_idx_at_raw(iseq, args->first_post_arg);
-	    iseq->body->param.post_num = args->post_args_num;
-	    iseq->body->param.flags.has_post = TRUE;
-	}
-
 	if (args->opt_args) {
-	    NODE *node = args->opt_args;
+	    const NODE *node = args->opt_args;
 	    LABEL *label;
 	    VALUE labels = rb_ary_tmp_new(1);
 	    VALUE *opt_table;
@@ -1388,7 +1841,7 @@ iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *optargs, NODE *node_args)
 		label = NEW_LABEL(nd_line(node));
 		rb_ary_push(labels, (VALUE)label | 1);
 		ADD_LABEL(optargs, label);
-		COMPILE_POPED(optargs, "optarg", node->nd_body);
+                NO_CHECK(COMPILE_POPPED(optargs, "optarg", node->nd_body));
 		node = node->nd_next;
 		i += 1;
 	    }
@@ -1400,61 +1853,73 @@ iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *optargs, NODE *node_args)
 
 	    opt_table = ALLOC_N(VALUE, i+1);
 
-	    MEMCPY(opt_table, RARRAY_CONST_PTR(labels), VALUE, i+1);
+            MEMCPY(opt_table, RARRAY_CONST_PTR_TRANSIENT(labels), VALUE, i+1);
 	    for (j = 0; j < i+1; j++) {
 		opt_table[j] &= ~1;
 	    }
 	    rb_ary_clear(labels);
 
-	    iseq->body->param.flags.has_opt = TRUE;
-	    iseq->body->param.opt_num = i;
-	    iseq->body->param.opt_table = opt_table;
+	    body->param.flags.has_opt = TRUE;
+	    body->param.opt_num = i;
+	    body->param.opt_table = opt_table;
+	    arg_size += i;
 	}
 
-	if (args->kw_args) {
-	    iseq_set_arguments_keywords(iseq, optargs, args);
+	if (rest_id) {
+	    body->param.rest_start = arg_size++;
+	    body->param.flags.has_rest = TRUE;
+	    assert(body->param.rest_start != -1);
 	}
-	else if (args->kw_rest_arg) {
-	    struct rb_iseq_param_keyword *keyword = ZALLOC_N(struct rb_iseq_param_keyword, 1);
-	    keyword->rest_start = get_dyna_var_idx_at_raw(iseq, args->kw_rest_arg->nd_vid);
-	    iseq->body->param.keyword = keyword;
-	    iseq->body->param.flags.has_kwrest = TRUE;
+
+	if (args->first_post_arg) {
+	    body->param.post_start = arg_size;
+	    body->param.post_num = args->post_args_num;
+	    body->param.flags.has_post = TRUE;
+	    arg_size += args->post_args_num;
+
+	    if (body->param.flags.has_rest) { /* TODO: why that? */
+		body->param.post_start = body->param.rest_start + 1;
+	    }
 	}
 
-	if (args->pre_init) { /* m_init */
-	    COMPILE_POPED(optargs, "init arguments (m)", args->pre_init);
+	if (args->kw_args) {
+	    arg_size = iseq_set_arguments_keywords(iseq, optargs, args, arg_size);
 	}
-	if (args->post_init) { /* p_init */
-	    COMPILE_POPED(optargs, "init arguments (p)", args->post_init);
+	else if (args->kw_rest_arg) {
+	    struct rb_iseq_param_keyword *keyword = ZALLOC_N(struct rb_iseq_param_keyword, 1);
+	    keyword->rest_start = arg_size++;
+	    body->param.keyword = keyword;
+	    body->param.flags.has_kwrest = TRUE;
 	}
-
-	if (rest_id) {
-	    iseq->body->param.rest_start = get_dyna_var_idx_at_raw(iseq, rest_id);
-	    iseq->body->param.flags.has_rest = TRUE;
-	    assert(iseq->body->param.rest_start != -1);
-
-	    if (iseq->body->param.post_start == 0) { /* TODO: why that? */
-		iseq->body->param.post_start = iseq->body->param.rest_start + 1;
-	    }
+	else if (args->no_kwarg) {
+	    body->param.flags.accepts_no_kwarg = TRUE;
 	}
 
 	if (block_id) {
-	    iseq->body->param.block_start = get_dyna_var_idx_at_raw(iseq, block_id);
-	    iseq->body->param.flags.has_block = TRUE;
+	    body->param.block_start = arg_size++;
+	    body->param.flags.has_block = TRUE;
 	}
 
 	iseq_calc_param_size(iseq);
+	body->param.size = arg_size;
+
+	if (args->pre_init) { /* m_init */
+            NO_CHECK(COMPILE_POPPED(optargs, "init arguments (m)", args->pre_init));
+	}
+	if (args->post_init) { /* p_init */
+            NO_CHECK(COMPILE_POPPED(optargs, "init arguments (p)", args->post_init));
+	}
 
-	if (iseq->body->type == ISEQ_TYPE_BLOCK) {
-	    if (iseq->body->param.flags.has_opt    == FALSE &&
-		iseq->body->param.flags.has_post   == FALSE &&
-		iseq->body->param.flags.has_rest   == FALSE &&
-		iseq->body->param.flags.has_kw     == FALSE &&
-		iseq->body->param.flags.has_kwrest == FALSE) {
+	if (body->type == ISEQ_TYPE_BLOCK) {
+	    if (body->param.flags.has_opt    == FALSE &&
+		body->param.flags.has_post   == FALSE &&
+		body->param.flags.has_rest   == FALSE &&
+		body->param.flags.has_kw     == FALSE &&
+		body->param.flags.has_kwrest == FALSE) {
 
-		if (iseq->body->param.lead_num == 1 && last_comma == 0) {
+		if (body->param.lead_num == 1 && last_comma == 0) {
 		    /* {|a|} */
-		    iseq->body->param.flags.ambiguous_param0 = TRUE;
+		    body->param.flags.ambiguous_param0 = TRUE;
 		}
 	    }
 	}
@@ -1466,10 +1931,10 @@ iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *optargs, NODE *node_args)
 static int
 iseq_set_local_table(rb_iseq_t *iseq, const ID *tbl)
 {
-    int size;
+    unsigned int size;
 
     if (tbl) {
-	size = (int)*tbl;
+	size = (unsigned int)*tbl;
 	tbl++;
     }
     else {
@@ -1481,45 +1946,80 @@ iseq_set_local_table(rb_iseq_t *iseq, const ID *tbl)
 	MEMCPY(ids, tbl, ID, size);
 	iseq->body->local_table = ids;
     }
+    iseq->body->local_table_size = size;
 
-    iseq->body->local_size = iseq->body->local_table_size = size;
-    iseq->body->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->body->local_size, iseq->body->local_table_size);
+    debugs("iseq_set_local_table: %u\n", iseq->body->local_table_size);
     return COMPILE_OK;
 }
 
 static int
 cdhash_cmp(VALUE val, VALUE lit)
 {
-    if (val == lit) return 0;
-    if (SPECIAL_CONST_P(lit)) {
-	return val != lit;
+    int tval, tlit;
+
+    if (val == lit) {
+        return 0;
     }
-    if (SPECIAL_CONST_P(val) || BUILTIN_TYPE(val) != BUILTIN_TYPE(lit)) {
-	return -1;
+    else if ((tlit = OBJ_BUILTIN_TYPE(lit)) == -1) {
+        return val != lit;
     }
-    if (BUILTIN_TYPE(lit) == T_STRING) {
-	return rb_str_hash_cmp(lit, val);
+    else if ((tval = OBJ_BUILTIN_TYPE(val)) == -1) {
+        return -1;
+    }
+    else if (tlit != tval) {
+        return -1;
+    }
+    else if (tlit == T_SYMBOL) {
+        return val != lit;
+    }
+    else if (tlit == T_STRING) {
+        return rb_str_hash_cmp(lit, val);
+    }
+    else if (tlit == T_BIGNUM) {
+        long x = FIX2LONG(rb_big_cmp(lit, val));
+
+        /* Given lit and val are both Bignum, x must be -1, 0, 1.
+         * There is no need to call rb_fix2int here. */
+        RUBY_ASSERT((x == 1) || (x == 0) || (x == -1));
+        return (int)x;
+    }
+    else if (tlit == T_FLOAT) {
+        return rb_float_cmp(lit, val);
+    }
+    else if (tlit == T_RATIONAL) {
+        const struct RRational *rat1 = RRATIONAL(val);
+        const struct RRational *rat2 = RRATIONAL(lit);
+        return cdhash_cmp(rat1->num, rat2->num) || cdhash_cmp(rat1->den, rat2->den);
+    }
+    else if (tlit == T_COMPLEX) {
+        const struct RComplex *comp1 = RCOMPLEX(val);
+        const struct RComplex *comp2 = RCOMPLEX(lit);
+        return cdhash_cmp(comp1->real, comp2->real) || cdhash_cmp(comp1->imag, comp2->imag);
+    }
+    else {
+        UNREACHABLE_RETURN(-1);
     }
-    return !rb_eql(lit, val);
 }
 
 static st_index_t
 cdhash_hash(VALUE a)
 {
-    if (SPECIAL_CONST_P(a)) return (st_index_t)a;
-    if (RB_TYPE_P(a, T_STRING)) return rb_str_hash(a);
-    {
-	VALUE hval = rb_hash(a);
-	return (st_index_t)FIX2LONG(hval);
+    switch (OBJ_BUILTIN_TYPE(a)) {
+      case -1:
+      case T_SYMBOL:
+        return (st_index_t)a;
+      case T_STRING:
+        return rb_str_hash(a);
+      case T_BIGNUM:
+        return FIX2LONG(rb_big_hash(a));
+      case T_FLOAT:
+        return rb_dbl_long_hash(RFLOAT_VALUE(a));
+      case T_RATIONAL:
+        return rb_rational_hash(a);
+      case T_COMPLEX:
+        return rb_complex_hash(a);
+      default:
+        UNREACHABLE_RETURN(0);
     }
 }
 
@@ -1535,7 +2035,7 @@ struct cdhash_set_label_struct {
 };
 
 static int
-cdhash_set_label_i(VALUE key, VALUE val, void *ptr)
+cdhash_set_label_i(VALUE key, VALUE val, VALUE ptr)
 {
     struct cdhash_set_label_struct *data = (struct cdhash_set_label_struct *)ptr;
     LABEL *lobj = (LABEL *)(val & ~1);
@@ -1563,74 +2063,259 @@ get_ivar_ic_value(rb_iseq_t *iseq,ID id)
     return val;
 }
 
+#define BADINSN_DUMP(anchor, list, dest) \
+    dump_disasm_list_with_cursor(FIRST_ELEMENT(anchor), list, dest)
+
+#define BADINSN_ERROR \
+    (xfree(generated_iseq), \
+     xfree(insns_info), \
+     BADINSN_DUMP(anchor, list, NULL), \
+     COMPILE_ERROR)
+
+static int
+fix_sp_depth(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
+{
+    int stack_max = 0, sp = 0, line = 0;
+    LINK_ELEMENT *list;
+
+    for (list = FIRST_ELEMENT(anchor); list; list = list->next) {
+	if (list->type == ISEQ_ELEMENT_LABEL) {
+	    LABEL *lobj = (LABEL *)list;
+	    lobj->set = TRUE;
+	}
+    }
+
+    for (list = FIRST_ELEMENT(anchor); list; list = list->next) {
+	switch (list->type) {
+	  case ISEQ_ELEMENT_INSN:
+	    {
+		int j, len, insn;
+		const char *types;
+		VALUE *operands;
+		INSN *iobj = (INSN *)list;
+
+		/* update sp */
+		sp = calc_sp_depth(sp, iobj);
+		if (sp < 0) {
+		    BADINSN_DUMP(anchor, list, NULL);
+		    COMPILE_ERROR(iseq, iobj->insn_info.line_no,
+				  "argument stack underflow (%d)", sp);
+		    return -1;
+		}
+		if (sp > stack_max) {
+		    stack_max = sp;
+		}
+
+		line = iobj->insn_info.line_no;
+		/* fprintf(stderr, "insn: %-16s, sp: %d\n", insn_name(iobj->insn_id), sp); */
+		operands = iobj->operands;
+		insn = iobj->insn_id;
+		types = insn_op_types(insn);
+		len = insn_len(insn);
+
+		/* operand check */
+		if (iobj->operand_size != len - 1) {
+		    /* printf("operand size miss! (%d, %d)\n", iobj->operand_size, len); */
+		    BADINSN_DUMP(anchor, list, NULL);
+		    COMPILE_ERROR(iseq, iobj->insn_info.line_no,
+				  "operand size miss! (%d for %d)",
+				  iobj->operand_size, len - 1);
+		    return -1;
+		}
+
+		for (j = 0; types[j]; j++) {
+		    if (types[j] == TS_OFFSET) {
+			/* label(destination position) */
+			LABEL *lobj = (LABEL *)operands[j];
+			if (!lobj->set) {
+			    BADINSN_DUMP(anchor, list, NULL);
+			    COMPILE_ERROR(iseq, iobj->insn_info.line_no,
+					  "unknown label: "LABEL_FORMAT, lobj->label_no);
+			    return -1;
+			}
+			if (lobj->sp == -1) {
+			    lobj->sp = sp;
+                        } else if (lobj->sp != sp) {
+                            debugs("%s:%d: sp inconsistency found but ignored (" LABEL_FORMAT " sp: %d, calculated sp: %d)\n",
+                                   RSTRING_PTR(rb_iseq_path(iseq)), line,
+                                   lobj->label_no, lobj->sp, sp);
+                        }
+		    }
+		}
+		break;
+	    }
+	  case ISEQ_ELEMENT_LABEL:
+	    {
+		LABEL *lobj = (LABEL *)list;
+		if (lobj->sp == -1) {
+		    lobj->sp = sp;
+		}
+		else {
+                    if (lobj->sp != sp) {
+                        debugs("%s:%d: sp inconsistency found but ignored (" LABEL_FORMAT " sp: %d, calculated sp: %d)\n",
+                                RSTRING_PTR(rb_iseq_path(iseq)), line,
+                                lobj->label_no, lobj->sp, sp);
+                    }
+		    sp = lobj->sp;
+		}
+		break;
+	    }
+	  case ISEQ_ELEMENT_TRACE:
+	    {
+		/* ignore */
+		break;
+	    }
+	  case ISEQ_ELEMENT_ADJUST:
+	    {
+		ADJUST *adjust = (ADJUST *)list;
+		int orig_sp = sp;
+
+		sp = adjust->label ? adjust->label->sp : 0;
+		if (adjust->line_no != -1 && orig_sp - sp < 0) {
+		    BADINSN_DUMP(anchor, list, NULL);
+		    COMPILE_ERROR(iseq, adjust->line_no,
+				  "iseq_set_sequence: adjust bug %d < %d",
+				  orig_sp, sp);
+		    return -1;
+		}
+		break;
+	    }
+	  default:
+	    BADINSN_DUMP(anchor, list, NULL);
+	    COMPILE_ERROR(iseq, line, "unknown list type: %d", list->type);
+	    return -1;
+	}
+    }
+    return stack_max;
+}
+
+static int
+add_insn_info(struct iseq_insn_info_entry *insns_info, unsigned int *positions,
+              int insns_info_index, int code_index, const INSN *iobj)
+{
+    if (insns_info_index == 0 ||
+        insns_info[insns_info_index-1].line_no != iobj->insn_info.line_no ||
+        insns_info[insns_info_index-1].events  != iobj->insn_info.events) {
+        insns_info[insns_info_index].line_no    = iobj->insn_info.line_no;
+        insns_info[insns_info_index].events     = iobj->insn_info.events;
+        positions[insns_info_index]             = code_index;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+static int
+add_adjust_info(struct iseq_insn_info_entry *insns_info, unsigned int *positions,
+                int insns_info_index, int code_index, const ADJUST *adjust)
+{
+    if (insns_info_index > 0 ||
+        insns_info[insns_info_index-1].line_no != adjust->line_no) {
+        insns_info[insns_info_index].line_no    = adjust->line_no;
+        insns_info[insns_info_index].events     = 0;
+        positions[insns_info_index]             = code_index;
+        return TRUE;
+    }
+    return FALSE;
+}
+
 /**
   ruby insn object list -> raw instruction sequence
  */
 static int
-iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
+iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 {
-    struct iseq_line_info_entry *line_info_table;
-    unsigned int last_line = 0;
+    VALUE iseqv = (VALUE)iseq;
+    struct iseq_insn_info_entry *insns_info;
+    struct rb_iseq_constant_body *const body = iseq->body;
+    unsigned int *positions;
     LINK_ELEMENT *list;
     VALUE *generated_iseq;
+    rb_event_flag_t events = 0;
+    long data = 0;
 
-    int insn_num, code_index, line_info_index, sp, stack_max = 0, line = 0;
+    int insn_num, code_index, insns_info_index, sp = 0;
+    int stack_max = fix_sp_depth(iseq, anchor);
+
+    if (stack_max < 0) return COMPILE_NG;
 
     /* fix label position */
-    list = FIRST_ELEMENT(anchor);
     insn_num = code_index = 0;
-    while (list) {
+    for (list = FIRST_ELEMENT(anchor); list; list = list->next) {
 	switch (list->type) {
 	  case ISEQ_ELEMENT_INSN:
 	    {
 		INSN *iobj = (INSN *)list;
-		line = iobj->line_no;
-		code_index += insn_data_length(iobj);
+		/* update sp */
+		sp = calc_sp_depth(sp, iobj);
 		insn_num++;
+                events = iobj->insn_info.events |= events;
+                if (ISEQ_COVERAGE(iseq)) {
+                    if (ISEQ_LINE_COVERAGE(iseq) && (events & RUBY_EVENT_COVERAGE_LINE) &&
+                        !(rb_get_coverage_mode() & COVERAGE_TARGET_ONESHOT_LINES)) {
+                        int line = iobj->insn_info.line_no;
+                        if (line >= 1) {
+                            RARRAY_ASET(ISEQ_LINE_COVERAGE(iseq), line - 1, INT2FIX(0));
+                        }
+                    }
+                    if (ISEQ_BRANCH_COVERAGE(iseq) && (events & RUBY_EVENT_COVERAGE_BRANCH)) {
+                        while (RARRAY_LEN(ISEQ_PC2BRANCHINDEX(iseq)) <= code_index) {
+                            rb_ary_push(ISEQ_PC2BRANCHINDEX(iseq), Qnil);
+                        }
+                        RARRAY_ASET(ISEQ_PC2BRANCHINDEX(iseq), code_index, INT2FIX(data));
+                    }
+		}
+                code_index += insn_data_length(iobj);
+		events = 0;
+                data = 0;
 		break;
 	    }
 	  case ISEQ_ELEMENT_LABEL:
 	    {
 		LABEL *lobj = (LABEL *)list;
 		lobj->position = code_index;
-		lobj->set = TRUE;
+                if (lobj->sp != sp) {
+                    debugs("%s: sp inconsistency found but ignored (" LABEL_FORMAT " sp: %d, calculated sp: %d)\n",
+                           RSTRING_PTR(rb_iseq_path(iseq)),
+                           lobj->label_no, lobj->sp, sp);
+                }
+		sp = lobj->sp;
 		break;
 	    }
-	  case ISEQ_ELEMENT_NONE:
+	  case ISEQ_ELEMENT_TRACE:
 	    {
-		/* ignore */
+		TRACE *trace = (TRACE *)list;
+		events |= trace->event;
+                if (trace->event & RUBY_EVENT_COVERAGE_BRANCH) data = trace->data;
 		break;
 	    }
 	  case ISEQ_ELEMENT_ADJUST:
 	    {
 		ADJUST *adjust = (ADJUST *)list;
 		if (adjust->line_no != -1) {
-		    code_index += 2 /* insn + 1 operand */;
-		    insn_num++;
+		    int orig_sp = sp;
+		    sp = adjust->label ? adjust->label->sp : 0;
+		    if (orig_sp - sp > 0) {
+			if (orig_sp - sp > 1) code_index++; /* 1 operand */
+			code_index++; /* insn */
+			insn_num++;
+		    }
 		}
 		break;
 	    }
-	  default:
-	    dump_disasm_list(FIRST_ELEMENT(anchor));
-	    dump_disasm_list(list);
-	    COMPILE_ERROR(iseq, line, "error: set_sequence");
-	    return COMPILE_NG;
+	  default: break;
 	}
-	list = list->next;
     }
 
     /* make instruction sequence */
     generated_iseq = ALLOC_N(VALUE, code_index);
-    line_info_table = ALLOC_N(struct iseq_line_info_entry, insn_num);
-    iseq->body->is_entries = ZALLOC_N(union iseq_inline_storage_entry, iseq->body->is_size);
-    iseq->body->ci_entries = (struct rb_call_info *)ruby_xmalloc(sizeof(struct rb_call_info) * iseq->body->ci_size +
-								 sizeof(struct rb_call_info_with_kwarg) * iseq->body->ci_kw_size);
-    iseq->body->cc_entries = ZALLOC_N(struct rb_call_cache, iseq->body->ci_size + iseq->body->ci_kw_size);
-
-    ISEQ_COMPILE_DATA(iseq)->ci_index = ISEQ_COMPILE_DATA(iseq)->ci_kw_index = 0;
+    insns_info = ALLOC_N(struct iseq_insn_info_entry, insn_num);
+    positions = ALLOC_N(unsigned int, insn_num);
+    body->is_entries = ZALLOC_N(union iseq_inline_storage_entry, body->is_size);
+    body->call_data = ZALLOC_N(struct rb_call_data, body->ci_size);
+    ISEQ_COMPILE_DATA(iseq)->ci_index = 0;
 
     list = FIRST_ELEMENT(anchor);
-    line_info_index = code_index = sp = 0;
+    insns_info_index = code_index = sp = 0;
 
     while (list) {
 	switch (list->type) {
@@ -1643,10 +2328,6 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
 
 		/* 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;
@@ -1654,18 +2335,6 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
 		types = insn_op_types(insn);
 		len = insn_len(insn);
 
-		/* operand check */
-		if (iobj->operand_size != len - 1) {
-		    /* printf("operand size miss! (%d, %d)\n", iobj->operand_size, len); */
-		    dump_disasm_list(list);
-		    xfree(generated_iseq);
-		    xfree(line_info_table);
-		    COMPILE_ERROR(iseq, iobj->line_no,
-				  "operand size miss! (%d for %d)",
-				  iobj->operand_size, len - 1);
-		    return COMPILE_NG;
-		}
-
 		for (j = 0; types[j]; j++) {
 		    char type = types[j];
 		    /* printf("--> [%c - (%d-%d)]\n", type, k, j); */
@@ -1674,14 +2343,6 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
 			{
 			    /* label(destination position) */
 			    LABEL *lobj = (LABEL *)operands[j];
-			    if (!lobj->set) {
-				COMPILE_ERROR(iseq, iobj->line_no,
-					      "unknown label");
-				return COMPILE_NG;
-			    }
-			    if (lobj->sp == -1) {
-				lobj->sp = sp;
-			    }
 			    generated_iseq[code_index + 1 + j] = lobj->position - (code_index + len);
 			    break;
 			}
@@ -1697,101 +2358,80 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
 			    rb_hash_rehash(map);
 			    freeze_hide_obj(map);
 			    generated_iseq[code_index + 1 + j] = map;
+			    RB_OBJ_WRITTEN(iseq, Qundef, map);
+                            FL_SET(iseqv, ISEQ_MARKABLE_ISEQ);
 			    break;
 			}
 		      case TS_LINDEX:
 		      case TS_NUM:	/* ulong */
 			generated_iseq[code_index + 1 + j] = FIX2INT(operands[j]);
 			break;
-		      case TS_ISEQ:	/* iseq */
-			{
-			    VALUE v = operands[j];
-			    generated_iseq[code_index + 1 + j] = v;
-			    break;
-			}
 		      case TS_VALUE:	/* VALUE */
+		      case TS_ISEQ:	/* iseq */
 			{
 			    VALUE v = operands[j];
 			    generated_iseq[code_index + 1 + j] = v;
 			    /* to mark ruby object */
-			    iseq_add_mark_object(iseq, v);
+			    if (!SPECIAL_CONST_P(v)) {
+				RB_OBJ_WRITTEN(iseq, Qundef, v);
+                                FL_SET(iseqv, ISEQ_MARKABLE_ISEQ);
+			    }
 			    break;
 			}
 		      case TS_IC: /* inline cache */
+		      case TS_ISE: /* inline storage entry */
+		      case TS_IVC: /* inline ivar cache */
 			{
 			    unsigned int ic_index = FIX2UINT(operands[j]);
-			    IC ic = (IC)&iseq->body->is_entries[ic_index];
-			    if (UNLIKELY(ic_index >= iseq->body->is_size)) {
-				rb_bug("iseq_set_sequence: ic_index overflow: index: %d, size: %d", ic_index, iseq->body->is_size);
+			    IC ic = (IC)&body->is_entries[ic_index];
+			    if (UNLIKELY(ic_index >= body->is_size)) {
+                                BADINSN_DUMP(anchor, &iobj->link, 0);
+                                COMPILE_ERROR(iseq, iobj->insn_info.line_no,
+                                              "iseq_set_sequence: ic_index overflow: index: %d, size: %d",
+                                              ic_index, body->is_size);
 			    }
 			    generated_iseq[code_index + 1 + j] = (VALUE)ic;
+                            FL_SET(iseqv, ISEQ_MARKABLE_ISEQ);
 			    break;
 			}
-		      case TS_CALLINFO: /* call info */
-			{
-			    struct rb_call_info *base_ci = (struct rb_call_info *)operands[j];
-			    struct rb_call_info *ci;
-
-			    if (base_ci->flag & VM_CALL_KWARG) {
-				struct rb_call_info_with_kwarg *ci_kw_entries = (struct rb_call_info_with_kwarg *)&iseq->body->ci_entries[iseq->body->ci_size];
-				struct rb_call_info_with_kwarg *ci_kw = &ci_kw_entries[ISEQ_COMPILE_DATA(iseq)->ci_kw_index++];
-				*ci_kw = *((struct rb_call_info_with_kwarg *)base_ci);
-				ci = (struct rb_call_info *)ci_kw;
-				assert(ISEQ_COMPILE_DATA(iseq)->ci_kw_index <= iseq->body->ci_kw_size);
-			    }
-			    else {
-				ci = &iseq->body->ci_entries[ISEQ_COMPILE_DATA(iseq)->ci_index++];
-				*ci = *base_ci;
-				assert(ISEQ_COMPILE_DATA(iseq)->ci_index <= iseq->body->ci_size);
-			    }
-
-			    generated_iseq[code_index + 1 + j] = (VALUE)ci;
-			    break;
-			}
-		      case TS_CALLCACHE:
-			{
-			    struct rb_call_cache *cc = &iseq->body->cc_entries[ISEQ_COMPILE_DATA(iseq)->ci_index + ISEQ_COMPILE_DATA(iseq)->ci_kw_index - 1];
-			    generated_iseq[code_index + 1 + j] = (VALUE)cc;
-			    break;
-			}
+                        case TS_CALLDATA:
+                        {
+                            const struct rb_callinfo *source_ci = (const struct rb_callinfo *)operands[j];
+                            struct rb_call_data *cd = &body->call_data[ISEQ_COMPILE_DATA(iseq)->ci_index++];
+                            assert(ISEQ_COMPILE_DATA(iseq)->ci_index <= body->ci_size);
+                            cd->ci = source_ci;
+                            cd->cc = vm_cc_empty();
+                            generated_iseq[code_index + 1 + j] = (VALUE)cd;
+                            break;
+                        }
 		      case TS_ID: /* ID */
 			generated_iseq[code_index + 1 + j] = SYM2ID(operands[j]);
 			break;
-		      case TS_GENTRY:
-			{
-			    struct rb_global_entry *entry =
-				(struct rb_global_entry *)(operands[j] & (~1));
-			    generated_iseq[code_index + 1 + j] = (VALUE)entry;
-			}
-			break;
 		      case TS_FUNCPTR:
 			generated_iseq[code_index + 1 + j] = operands[j];
 			break;
+                      case TS_BUILTIN:
+                        generated_iseq[code_index + 1 + j] = operands[j];
+                        break;
 		      default:
-			xfree(generated_iseq);
-			xfree(line_info_table);
-			COMPILE_ERROR(iseq, iobj->line_no,
+			BADINSN_ERROR(iseq, iobj->insn_info.line_no,
 				      "unknown operand type: %c", type);
 			return COMPILE_NG;
 		    }
 		}
-		if (last_line != iobj->line_no) {
-		    line_info_table[line_info_index].line_no = last_line = iobj->line_no;
-		    line_info_table[line_info_index].position = code_index;
-		    line_info_index++;
-		}
+		if (add_insn_info(insns_info, positions, insns_info_index, code_index, iobj)) insns_info_index++;
 		code_index += len;
 		break;
 	    }
 	  case ISEQ_ELEMENT_LABEL:
 	    {
 		LABEL *lobj = (LABEL *)list;
-		if (lobj->sp == -1) {
-		    lobj->sp = sp;
-		}
-		else {
-		    sp = lobj->sp;
-		}
+                if (lobj->sp != sp) {
+                    debugs("%s: sp inconsistency found but ignored (" LABEL_FORMAT " sp: %d, calculated sp: %d)\n",
+                           RSTRING_PTR(rb_iseq_path(iseq)),
+                           lobj->label_no, lobj->sp, sp);
+                }
+		sp = lobj->sp;
 		break;
 	    }
 	  case ISEQ_ELEMENT_ADJUST:
@@ -1807,29 +2447,27 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
 		}
 
 		if (adjust->line_no != -1) {
-		    if (orig_sp - sp > 0) {
-			if (last_line != (unsigned int)adjust->line_no) {
-			    line_info_table[line_info_index].line_no = last_line = adjust->line_no;
-			    line_info_table[line_info_index].position = code_index;
-			    line_info_index++;
-			}
+		    const int diff = orig_sp - sp;
+		    if (diff > 0) {
+			if (add_adjust_info(insns_info, positions, insns_info_index, code_index, adjust)) insns_info_index++;
+		    }
+		    if (diff > 1) {
 			generated_iseq[code_index++] = BIN(adjuststack);
 			generated_iseq[code_index++] = orig_sp - sp;
 		    }
-		    else if (orig_sp - sp == 0) {
-			/* jump to next insn */
-			if (last_line != (unsigned int)adjust->line_no) {
-			    line_info_table[line_info_index].line_no = last_line = adjust->line_no;
-			    line_info_table[line_info_index].position = code_index;
-			    line_info_index++;
-			}
-			generated_iseq[code_index++] = BIN(nop);
-			generated_iseq[code_index++] = BIN(nop);
+		    else if (diff == 1) {
+			generated_iseq[code_index++] = BIN(pop);
 		    }
-		    else {
-			compile_bug(iseq, adjust->line_no,
-				    "iseq_set_sequence: adjust bug %d < %d",
-				    orig_sp, sp);
+		    else if (diff < 0) {
+			int label_no = adjust->label ? adjust->label->label_no : -1;
+			xfree(generated_iseq);
+			xfree(insns_info);
+			xfree(positions);
+			debug_list(anchor, list);
+			COMPILE_ERROR(iseq, adjust->line_no,
+				      "iseq_set_sequence: adjust bug to %d %d < %d",
+				      label_no, orig_sp, sp);
+			return COMPILE_NG;
 		    }
 		}
 		break;
@@ -1841,13 +2479,19 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
 	list = list->next;
     }
 
-    iseq->body->iseq_encoded = (void *)generated_iseq;
-    iseq->body->iseq_size = code_index;
-    iseq->body->stack_max = stack_max;
+    body->iseq_encoded = (void *)generated_iseq;
+    body->iseq_size = code_index;
+    body->stack_max = stack_max;
+
+    /* get rid of memory leak when REALLOC failed */
+    body->insns_info.body = insns_info;
+    body->insns_info.positions = positions;
 
-    REALLOC_N(line_info_table, struct iseq_line_info_entry, line_info_index);
-    iseq->body->line_info_table = line_info_table;
-    iseq->body->line_info_size = line_info_index;
+    REALLOC_N(insns_info, struct iseq_insn_info_entry, insns_info_index);
+    body->insns_info.body = insns_info;
+    REALLOC_N(positions, unsigned int, insns_info_index);
+    body->insns_info.positions = positions;
+    body->insns_info.size = insns_info_index;
 
     return COMPILE_OK;
 }
@@ -1871,25 +2515,23 @@ iseq_set_exception_table(rb_iseq_t *iseq)
     unsigned int tlen, i;
     struct iseq_catch_table_entry *entry;
 
+    iseq->body->catch_table = NULL;
+    if (NIL_P(ISEQ_COMPILE_DATA(iseq)->catch_table_ary)) return COMPILE_OK;
     tlen = (int)RARRAY_LEN(ISEQ_COMPILE_DATA(iseq)->catch_table_ary);
-    tptr = RARRAY_CONST_PTR(ISEQ_COMPILE_DATA(iseq)->catch_table_ary);
+    tptr = RARRAY_CONST_PTR_TRANSIENT(ISEQ_COMPILE_DATA(iseq)->catch_table_ary);
 
     if (tlen > 0) {
 	struct iseq_catch_table *table = xmalloc(iseq_catch_table_bytes(tlen));
 	table->size = tlen;
 
 	for (i = 0; i < table->size; i++) {
-	    ptr = RARRAY_CONST_PTR(tptr[i]);
-	    entry = &table->entries[i];
+            ptr = RARRAY_CONST_PTR_TRANSIENT(tptr[i]);
+	    entry = UNALIGNED_MEMBER_PTR(table, entries[i]);
 	    entry->type = (enum catch_type)(ptr[0] & 0xffff);
 	    entry->start = label_get_position((LABEL *)(ptr[1] & ~1));
 	    entry->end = label_get_position((LABEL *)(ptr[2] & ~1));
 	    entry->iseq = (rb_iseq_t *)ptr[3];
-
-	    /* register iseq as mark object */
-	    if (entry->iseq != 0) {
-		iseq_add_mark_object(iseq, (VALUE)entry->iseq);
-	    }
+	    RB_OBJ_WRITTEN(iseq, Qundef, entry->iseq);
 
 	    /* stack depth */
 	    if (ptr[4]) {
@@ -1911,9 +2553,6 @@ iseq_set_exception_table(rb_iseq_t *iseq)
 	iseq->body->catch_table = table;
 	RB_OBJ_WRITE(iseq, &ISEQ_COMPILE_DATA(iseq)->catch_table_ary, 0); /* free */
     }
-    else {
-	iseq->body->catch_table = NULL;
-    }
 
     return COMPILE_OK;
 }
@@ -1946,14 +2585,32 @@ get_destination_insn(INSN *iobj)
 {
     LABEL *lobj = (LABEL *)OPERAND_AT(iobj, 0);
     LINK_ELEMENT *list;
+    rb_event_flag_t events = 0;
 
     list = lobj->link.next;
     while (list) {
-	if (IS_INSN(list) || IS_ADJUST(list)) {
+	switch (list->type) {
+	  case ISEQ_ELEMENT_INSN:
+	  case ISEQ_ELEMENT_ADJUST:
+	    goto found;
+	  case ISEQ_ELEMENT_LABEL:
+	    /* ignore */
 	    break;
+	  case ISEQ_ELEMENT_TRACE:
+	    {
+		TRACE *trace = (TRACE *)list;
+		events |= trace->event;
+	    }
+	    break;
+	  default: break;
 	}
 	list = list->next;
     }
+  found:
+    if (list && IS_INSN(list)) {
+	INSN *iobj = (INSN *)list;
+	iobj->insn_info.events |= events;
+    }
     return list;
 }
 
@@ -1990,7 +2647,7 @@ unref_destination(INSN *iobj, int pos)
 {
     LABEL *lobj = (LABEL *)OPERAND_AT(iobj, pos);
     --lobj->refcnt;
-    if (!lobj->refcnt) REMOVE_ELEM(&lobj->link);
+    if (!lobj->refcnt) ELEM_REMOVE(&lobj->link);
 }
 
 static void
@@ -2002,14 +2659,63 @@ replace_destination(INSN *dobj, INSN *nobj)
     --dl->refcnt;
     ++nl->refcnt;
     OPERAND_AT(dobj, 0) = n;
-    if (!dl->refcnt) REMOVE_ELEM(&dl->link);
+    if (!dl->refcnt) ELEM_REMOVE(&dl->link);
+}
+
+static LABEL*
+find_destination(INSN *i)
+{
+    int pos, len = insn_len(i->insn_id);
+    for (pos = 0; pos < len; ++pos) {
+	if (insn_op_types(i->insn_id)[pos] == TS_OFFSET) {
+	    return (LABEL *)OPERAND_AT(i, pos);
+	}
+    }
+    return 0;
 }
 
 static int
 remove_unreachable_chunk(rb_iseq_t *iseq, LINK_ELEMENT *i)
 {
-    int removed = 0;
-    while (i) {
+    LINK_ELEMENT *first = i, *end;
+    int *unref_counts = 0, nlabels = ISEQ_COMPILE_DATA(iseq)->label_no;
+
+    if (!i) return 0;
+    unref_counts = ALLOCA_N(int, nlabels);
+    MEMZERO(unref_counts, int, nlabels);
+    end = i;
+    do {
+	LABEL *lab;
+	if (IS_INSN(i)) {
+	    if (IS_INSN_ID(i, leave)) {
+		end = i;
+		break;
+	    }
+	    else if ((lab = find_destination((INSN *)i)) != 0) {
+		if (lab->unremovable) break;
+		unref_counts[lab->label_no]++;
+	    }
+	}
+	else if (IS_LABEL(i)) {
+	    lab = (LABEL *)i;
+	    if (lab->unremovable) return 0;
+	    if (lab->refcnt > unref_counts[lab->label_no]) {
+		if (i == first) return 0;
+		break;
+	    }
+	    continue;
+	}
+	else if (IS_TRACE(i)) {
+	    /* do nothing */
+	}
+	else if (IS_ADJUST(i)) {
+	    LABEL *dest = ((ADJUST *)i)->label;
+	    if (dest && dest->unremovable) return 0;
+	}
+	end = i;
+    } while ((i = i->next) != 0);
+    i = first;
+    do {
 	if (IS_INSN(i)) {
 	    struct rb_iseq_constant_body *body = iseq->body;
 	    VALUE insn = INSN_OF(i);
@@ -2019,43 +2725,164 @@ remove_unreachable_chunk(rb_iseq_t *iseq, LINK_ELEMENT *i)
 		  case TS_OFFSET:
 		    unref_destination((INSN *)i, pos);
 		    break;
-		  case TS_CALLINFO:
-		    if (((struct rb_call_info *)OPERAND_AT(i, pos))->flag & VM_CALL_KWARG)
-			--(body->ci_kw_size);
-		    else
-			--(body->ci_size);
+                  case TS_CALLDATA:
+                    --(body->ci_size);
 		    break;
 		}
 	    }
 	}
-	else if (IS_LABEL(i)) {
-	    if (((LABEL *)i)->refcnt > 0) break;
+	ELEM_REMOVE(i);
+    } while ((i != end) && (i = i->next) != 0);
+    return 1;
+}
+
+static int
+iseq_pop_newarray(rb_iseq_t *iseq, INSN *iobj)
+{
+    switch (OPERAND_AT(iobj, 0)) {
+      case INT2FIX(0): /* empty array */
+	ELEM_REMOVE(&iobj->link);
+	return TRUE;
+      case INT2FIX(1): /* single element array */
+	ELEM_REMOVE(&iobj->link);
+	return FALSE;
+      default:
+	iobj->insn_id = BIN(adjuststack);
+	return TRUE;
+    }
+}
+
+static int
+is_frozen_putstring(INSN *insn, VALUE *op)
+{
+    if (IS_INSN_ID(insn, putstring)) {
+        *op = OPERAND_AT(insn, 0);
+        return 1;
+    }
+    else if (IS_INSN_ID(insn, putobject)) { /* frozen_string_literal */
+        *op = OPERAND_AT(insn, 0);
+        return RB_TYPE_P(*op, T_STRING);
+    }
+    return 0;
+}
+
+static int
+optimize_checktype(rb_iseq_t *iseq, INSN *iobj)
+{
+    /*
+     *   putobject obj
+     *   dup
+     *   checktype T_XXX
+     *   branchif l1
+     * l2:
+     *   ...
+     * l1:
+     *
+     * => obj is a T_XXX
+     *
+     *   putobject obj (T_XXX)
+     *   jump L1
+     * L1:
+     *
+     * => obj is not a T_XXX
+     *
+     *   putobject obj (T_XXX)
+     *   jump L2
+     * L2:
+     */
+    int line;
+    INSN *niobj, *ciobj, *dup = 0;
+    LABEL *dest = 0;
+    VALUE type;
+
+    switch (INSN_OF(iobj)) {
+      case BIN(putstring):
+	type = INT2FIX(T_STRING);
+	break;
+      case BIN(putnil):
+	type = INT2FIX(T_NIL);
+	break;
+      case BIN(putobject):
+	type = INT2FIX(TYPE(OPERAND_AT(iobj, 0)));
+	break;
+      default: return FALSE;
+    }
+
+    ciobj = (INSN *)get_next_insn(iobj);
+    if (IS_INSN_ID(ciobj, jump)) {
+	ciobj = (INSN *)get_next_insn((INSN*)OPERAND_AT(ciobj, 0));
+    }
+    if (IS_INSN_ID(ciobj, dup)) {
+	ciobj = (INSN *)get_next_insn(dup = ciobj);
+    }
+    if (!ciobj || !IS_INSN_ID(ciobj, checktype)) return FALSE;
+    niobj = (INSN *)get_next_insn(ciobj);
+    if (!niobj) {
+	/* TODO: putobject true/false */
+	return FALSE;
+    }
+    switch (INSN_OF(niobj)) {
+      case BIN(branchif):
+	if (OPERAND_AT(ciobj, 0) == type) {
+	    dest = (LABEL *)OPERAND_AT(niobj, 0);
+	}
+	break;
+      case BIN(branchunless):
+	if (OPERAND_AT(ciobj, 0) != type) {
+	    dest = (LABEL *)OPERAND_AT(niobj, 0);
+	}
+	break;
+      default:
+        return FALSE;
+    }
+    line = ciobj->insn_info.line_no;
+    if (!dest) {
+	if (niobj->link.next && IS_LABEL(niobj->link.next)) {
+	    dest = (LABEL *)niobj->link.next; /* reuse label */
+	}
+	else {
+	    dest = NEW_LABEL(line);
+	    ELEM_INSERT_NEXT(&niobj->link, &dest->link);
 	}
-	else break;
-	REMOVE_ELEM(i);
-	removed = 1;
-	i = i->next;
     }
-    return removed;
+    INSERT_AFTER_INSN1(iobj, line, jump, dest);
+    LABEL_REF(dest);
+    if (!dup) INSERT_AFTER_INSN(iobj, line, pop);
+    return TRUE;
+}
+
+static const struct rb_callinfo *
+ci_flag_set(const rb_iseq_t *iseq, const struct rb_callinfo *ci, unsigned int add)
+{
+    const struct rb_callinfo *nci = vm_ci_new(vm_ci_mid(ci),
+                                             vm_ci_flag(ci) | add,
+                                             vm_ci_argc(ci),
+                                             vm_ci_kwarg(ci));
+    RB_OBJ_WRITTEN(iseq, ci, nci);
+    return nci;
+}
+
+static const struct rb_callinfo *
+ci_argc_set(const rb_iseq_t *iseq, const struct rb_callinfo *ci, int argc)
+{
+    const struct rb_callinfo *nci = vm_ci_new(vm_ci_mid(ci),
+                                              vm_ci_flag(ci),
+                                              argc,
+                                              vm_ci_kwarg(ci));
+    RB_OBJ_WRITTEN(iseq, ci, nci);
+    return nci;
 }
 
 static int
 iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcallopt)
 {
-    INSN *iobj = (INSN *)list;
+    INSN *const iobj = (INSN *)list;
+
   again:
+    optimize_checktype(iseq, iobj);
+
     if (IS_INSN_ID(iobj, jump)) {
-	INSN *niobj, *diobj, *piobj;
-	/*
-	 *  useless jump elimination:
-	 *     jump LABEL1
-	 *     ...
-	 *   LABEL1:
-	 *     jump LABEL2
-	 *
-	 *   => in this case, first jump instruction should jump to
-	 *      LABEL2 directly
-	 */
+        INSN *niobj, *diobj, *piobj;
 	diobj = (INSN *)get_destination_insn(iobj);
 	niobj = (INSN *)get_next_insn(iobj);
 
@@ -2067,15 +2894,28 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
 	     *   LABEL:
 	     */
 	    unref_destination(iobj, 0);
-	    REMOVE_ELEM(&iobj->link);
+	    ELEM_REMOVE(&iobj->link);
+	    return COMPILE_OK;
 	}
-	else if (iobj != diobj && IS_INSN_ID(diobj, jump) &&
-		 OPERAND_AT(iobj, 0) != OPERAND_AT(diobj, 0)) {
+        else if (iobj != diobj && IS_INSN(&diobj->link) &&
+                 IS_INSN_ID(diobj, jump) &&
+		 OPERAND_AT(iobj, 0) != OPERAND_AT(diobj, 0) &&
+                 diobj->insn_info.events == 0) {
+	    /*
+	     *  useless jump elimination:
+	     *     jump LABEL1
+	     *     ...
+	     *   LABEL1:
+	     *     jump LABEL2
+	     *
+	     *   => in this case, first jump instruction should jump to
+	     *      LABEL2 directly
+	     */
 	    replace_destination(iobj, diobj);
 	    remove_unreachable_chunk(iseq, iobj->link.next);
 	    goto again;
 	}
-	else if (IS_INSN_ID(diobj, leave)) {
+        else if (IS_INSN_ID(diobj, leave)) {
 	    /*
 	     *  jump LABEL
 	     *  ...
@@ -2087,44 +2927,100 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
 	     * LABEL:
 	     *  leave
 	     */
-	    INSN *popiobj = new_insn_core(iseq, iobj->line_no,
-					  BIN(pop), 0, 0);
 	    /* replace */
 	    unref_destination(iobj, 0);
-	    iobj->insn_id = BIN(leave);
+            iobj->insn_id = BIN(leave);
 	    iobj->operand_size = 0;
-	    INSERT_ELEM_NEXT(&iobj->link, &popiobj->link);
+	    iobj->insn_info = diobj->insn_info;
 	    goto again;
 	}
-	/*
-	 * 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 &&
+        else if (IS_INSN(iobj->link.prev) &&
+                 (piobj = (INSN *)iobj->link.prev) &&
 		 (IS_INSN_ID(piobj, branchif) ||
 		  IS_INSN_ID(piobj, branchunless))) {
-	    if (niobj == (INSN *)get_destination_insn(piobj)) {
+	    INSN *pdiobj = (INSN *)get_destination_insn(piobj);
+	    if (niobj == pdiobj) {
+		int refcnt = IS_LABEL(piobj->link.next) ?
+		    ((LABEL *)piobj->link.next)->refcnt : 0;
+		/*
+		 * useless jump elimination (if/unless destination):
+		 *   if   L1
+		 *   jump L2
+		 * L1:
+		 *   ...
+		 * L2:
+		 *
+		 * ==>
+		 *   unless L2
+		 * L1:
+		 *   ...
+		 * L2:
+		 */
 		piobj->insn_id = (IS_INSN_ID(piobj, branchif))
 		  ? BIN(branchunless) : BIN(branchif);
 		replace_destination(piobj, iobj);
-		REMOVE_ELEM(&iobj->link);
+		if (refcnt <= 1) {
+		    ELEM_REMOVE(&iobj->link);
+		}
+		else {
+		    /* TODO: replace other branch destinations too */
+		}
+		return COMPILE_OK;
+	    }
+	    else if (diobj == pdiobj) {
+		/*
+		 * useless jump elimination (if/unless before jump):
+		 * L1:
+		 *   ...
+		 *   if   L1
+		 *   jump L1
+		 *
+		 * ==>
+		 * L1:
+		 *   ...
+		 *   pop
+		 *   jump L1
+		 */
+		INSN *popiobj = new_insn_core(iseq, iobj->insn_info.line_no,
+					      BIN(pop), 0, 0);
+		ELEM_REPLACE(&piobj->link, &popiobj->link);
 	    }
 	}
-	else if (remove_unreachable_chunk(iseq, iobj->link.next)) {
+	if (remove_unreachable_chunk(iseq, iobj->link.next)) {
 	    goto again;
 	}
     }
 
+    /*
+     * putstring "beg"
+     * putstring "end"
+     * newrange excl
+     *
+     * ==>
+     *
+     * putobject "beg".."end"
+     */
+    if (IS_INSN_ID(iobj, checkmatch)) {
+        INSN *range = (INSN *)get_prev_insn(iobj);
+        INSN *beg, *end;
+        VALUE str_beg, str_end;
+
+	if (range && IS_INSN_ID(range, newrange) &&
+                (end = (INSN *)get_prev_insn(range)) != 0 &&
+                is_frozen_putstring(end, &str_end) &&
+                (beg = (INSN *)get_prev_insn(end)) != 0 &&
+                is_frozen_putstring(beg, &str_beg)) {
+	    int excl = FIX2INT(OPERAND_AT(range, 0));
+	    VALUE lit_range = rb_range_new(str_beg, str_end, excl);
+
+	    ELEM_REMOVE(&beg->link);
+	    ELEM_REMOVE(&end->link);
+	    range->insn_id = BIN(putobject);
+	    OPERAND_AT(range, 0) = lit_range;
+	    RB_OBJ_WRITTEN(iseq, Qundef, lit_range);
+	}
+    }
+
     if (IS_INSN_ID(iobj, leave)) {
 	remove_unreachable_chunk(iseq, iobj->link.next);
     }
@@ -2141,97 +3037,135 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
 	 *   if L2
 	 */
 	INSN *nobj = (INSN *)get_destination_insn(iobj);
-	INSN *pobj = (INSN *)iobj->link.prev;
-	int prev_dup = 0;
-	if (pobj) {
-	    if (!IS_INSN(&pobj->link))
-		pobj = 0;
-	    else if (IS_INSN_ID(pobj, dup))
-		prev_dup = 1;
-	}
-
-	for (;;) {
-	    if (IS_INSN_ID(nobj, jump)) {
-		replace_destination(iobj, nobj);
-	    }
-	    else if (prev_dup && IS_INSN_ID(nobj, dup) &&
-		     !!(nobj = (INSN *)nobj->link.next) &&
-		     /* basic blocks, with no labels in the middle */
-		     nobj->insn_id == iobj->insn_id) {
-		/*
-		 *   dup
-		 *   if L1
-		 *   ...
-		 * L1:
-		 *   dup
-		 *   if L2
-		 * =>
-		 *   dup
-		 *   if L2
-		 *   ...
-		 * L1:
-		 *   dup
-		 *   if L2
-		 */
-		replace_destination(iobj, nobj);
-	    }
-	    else if (pobj) {
-		/*
-		 *   putnil
-		 *   if L1
-		 * =>
-		 *   # nothing
-		 *
-		 *   putobject true
-		 *   if L1
-		 * =>
-		 *   jump L1
-		 *
-		 *   putstring ".."
-		 *   if L1
-		 * =>
-		 *   jump L1
-		 *
-		 *   putstring ".."
-		 *   dup
-		 *   if L1
-		 * =>
-		 *   putstring ".."
-		 *   jump L1
-		 *
-		 */
-		int cond;
-		if (prev_dup && IS_INSN(pobj->link.prev)) {
-		    pobj = (INSN *)pobj->link.prev;
-		}
-		if (IS_INSN_ID(pobj, putobject)) {
-		    cond = (IS_INSN_ID(iobj, branchif) ?
-			    OPERAND_AT(pobj, 0) != Qfalse :
-			    IS_INSN_ID(iobj, branchunless) ?
-			    OPERAND_AT(pobj, 0) == Qfalse :
-			    FALSE);
-		}
-		else if (IS_INSN_ID(pobj, putstring)) {
-		    cond = IS_INSN_ID(iobj, branchif);
-		}
-		else if (IS_INSN_ID(pobj, putnil)) {
-		    cond = !IS_INSN_ID(iobj, branchif);
-		}
-		else break;
-		REMOVE_ELEM(iobj->link.prev);
-		if (cond) {
-		    iobj->insn_id = BIN(jump);
-		    goto again;
-		}
-		else {
-		    unref_destination(iobj, 0);
-		    REMOVE_ELEM(&iobj->link);
-		}
-		break;
-	    }
-	    else break;
-	    nobj = (INSN *)get_destination_insn(nobj);
-	}
+
+        /* This is super nasty hack!!!
+         *
+         * This jump-jump optimization may ignore event flags of the jump
+         * instruction being skipped.  Actually, Line 2 TracePoint event
+         * is never fired in the following code:
+         *
+         *   1: raise if 1 == 2
+         *   2: while true
+         *   3:   break
+         *   4: end
+         *
+         * This is critical for coverage measurement.  [Bug #15980]
+         *
+         * This is a stopgap measure: stop the jump-jump optimization if
+         * coverage measurement is enabled and if the skipped instruction
+         * has any event flag.
+         *
+         * Note that, still, TracePoint Line event does not occur on Line 2.
+         * This should be fixed in future.
+         */
+        int stop_optimization =
+	    ISEQ_COVERAGE(iseq) && ISEQ_LINE_COVERAGE(iseq) &&
+            nobj->insn_info.events;
+	if (!stop_optimization) {
+            INSN *pobj = (INSN *)iobj->link.prev;
+            int prev_dup = 0;
+            if (pobj) {
+                if (!IS_INSN(&pobj->link))
+                    pobj = 0;
+                else if (IS_INSN_ID(pobj, dup))
+                    prev_dup = 1;
+            }
+
+            for (;;) {
+                if (IS_INSN(&nobj->link) && IS_INSN_ID(nobj, jump)) {
+                    replace_destination(iobj, nobj);
+                }
+                else if (prev_dup && IS_INSN_ID(nobj, dup) &&
+                         !!(nobj = (INSN *)nobj->link.next) &&
+                         /* basic blocks, with no labels in the middle */
+                         nobj->insn_id == iobj->insn_id) {
+                    /*
+                     *   dup
+                     *   if L1
+                     *   ...
+                     * L1:
+                     *   dup
+                     *   if L2
+                     * =>
+                     *   dup
+                     *   if L2
+                     *   ...
+                     * L1:
+                     *   dup
+                     *   if L2
+                     */
+                    replace_destination(iobj, nobj);
+                }
+                else if (pobj) {
+                    /*
+                     *   putnil
+                     *   if L1
+                     * =>
+                     *   # nothing
+                     *
+                     *   putobject true
+                     *   if L1
+                     * =>
+                     *   jump L1
+                     *
+                     *   putstring ".."
+                     *   if L1
+                     * =>
+                     *   jump L1
+                     *
+                     *   putstring ".."
+                     *   dup
+                     *   if L1
+                     * =>
+                     *   putstring ".."
+                     *   jump L1
+                     *
+                     */
+                    int cond;
+                    if (prev_dup && IS_INSN(pobj->link.prev)) {
+                        pobj = (INSN *)pobj->link.prev;
+                    }
+                    if (IS_INSN_ID(pobj, putobject)) {
+                        cond = (IS_INSN_ID(iobj, branchif) ?
+                                OPERAND_AT(pobj, 0) != Qfalse :
+                                IS_INSN_ID(iobj, branchunless) ?
+                                OPERAND_AT(pobj, 0) == Qfalse :
+                                FALSE);
+                    }
+                    else if (IS_INSN_ID(pobj, putstring) ||
+                             IS_INSN_ID(pobj, duparray) ||
+                             IS_INSN_ID(pobj, newarray)) {
+                        cond = IS_INSN_ID(iobj, branchif);
+                    }
+                    else if (IS_INSN_ID(pobj, putnil)) {
+                        cond = !IS_INSN_ID(iobj, branchif);
+                    }
+                    else break;
+                    if (prev_dup || !IS_INSN_ID(pobj, newarray)) {
+                        ELEM_REMOVE(iobj->link.prev);
+                    }
+                    else if (!iseq_pop_newarray(iseq, pobj)) {
+                        pobj = new_insn_core(iseq, pobj->insn_info.line_no, BIN(pop), 0, NULL);
+                        ELEM_INSERT_PREV(&iobj->link, &pobj->link);
+                    }
+                    if (cond) {
+                        if (prev_dup) {
+                            pobj = new_insn_core(iseq, pobj->insn_info.line_no, BIN(putnil), 0, NULL);
+                            ELEM_INSERT_NEXT(&iobj->link, &pobj->link);
+                        }
+                        iobj->insn_id = BIN(jump);
+                        goto again;
+                    }
+                    else {
+                        unref_destination(iobj, 0);
+                        ELEM_REMOVE(&iobj->link);
+                    }
+                    break;
+                }
+                else break;
+                nobj = (INSN *)get_destination_insn(nobj);
+            }
+        }
     }
 
     if (IS_INSN_ID(iobj, pop)) {
@@ -2245,11 +3179,119 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
 	if (IS_INSN(prev)) {
 	    enum ruby_vminsn_type previ = ((INSN *)prev)->insn_id;
 	    if (previ == BIN(putobject) || previ == BIN(putnil) ||
-		previ == BIN(putself) || previ == BIN(putstring)) {
+		previ == BIN(putself) || previ == BIN(putstring) ||
+		previ == BIN(dup) ||
+		previ == BIN(getlocal) ||
+		previ == BIN(getblockparam) ||
+		previ == BIN(getblockparamproxy) ||
+		/* getinstancevariable may issue a warning */
+		previ == BIN(duparray)) {
 		/* just push operand or static value and pop soon, no
 		 * side effects */
-		REMOVE_ELEM(prev);
-		REMOVE_ELEM(&iobj->link);
+		ELEM_REMOVE(prev);
+		ELEM_REMOVE(&iobj->link);
+	    }
+	    else if (previ == BIN(newarray) && iseq_pop_newarray(iseq, (INSN*)prev)) {
+		ELEM_REMOVE(&iobj->link);
+	    }
+	    else if (previ == BIN(concatarray)) {
+		INSN *piobj = (INSN *)prev;
+		INSERT_BEFORE_INSN1(piobj, piobj->insn_info.line_no, splatarray, Qfalse);
+		INSN_OF(piobj) = BIN(pop);
+	    }
+	    else if (previ == BIN(concatstrings)) {
+		if (OPERAND_AT(prev, 0) == INT2FIX(1)) {
+		    ELEM_REMOVE(prev);
+		}
+		else {
+		    ELEM_REMOVE(&iobj->link);
+		    INSN_OF(prev) = BIN(adjuststack);
+		}
+	    }
+	}
+    }
+
+    if (IS_INSN_ID(iobj, newarray) ||
+	IS_INSN_ID(iobj, duparray) ||
+	IS_INSN_ID(iobj, expandarray) ||
+	IS_INSN_ID(iobj, concatarray) ||
+	IS_INSN_ID(iobj, splatarray) ||
+	0) {
+	/*
+	 *  newarray N
+	 *  splatarray
+	 * =>
+	 *  newarray N
+	 * newarray always puts an array
+	 */
+	LINK_ELEMENT *next = iobj->link.next;
+	if (IS_INSN(next) && IS_INSN_ID(next, splatarray)) {
+	    /* remove splatarray following always-array insn */
+	    ELEM_REMOVE(next);
+	}
+    }
+
+    if (IS_INSN_ID(iobj, tostring)) {
+	LINK_ELEMENT *next = iobj->link.next;
+	/*
+	 *  tostring
+	 *  concatstrings 1
+	 * =>
+	 *  tostring
+	 */
+	if (IS_INSN(next) && IS_INSN_ID(next, concatstrings) &&
+	    OPERAND_AT(next, 0) == INT2FIX(1)) {
+	    ELEM_REMOVE(next);
+	}
+    }
+
+    if (IS_INSN_ID(iobj, putstring) ||
+	(IS_INSN_ID(iobj, putobject) && RB_TYPE_P(OPERAND_AT(iobj, 0), T_STRING))) {
+	/*
+	 *  putstring ""
+	 *  concatstrings N
+	 * =>
+	 *  concatstrings N-1
+	 */
+	if (IS_NEXT_INSN_ID(&iobj->link, concatstrings) &&
+	    RSTRING_LEN(OPERAND_AT(iobj, 0)) == 0) {
+	    INSN *next = (INSN *)iobj->link.next;
+	    if ((OPERAND_AT(next, 0) = FIXNUM_INC(OPERAND_AT(next, 0), -1)) == INT2FIX(1)) {
+		ELEM_REMOVE(&next->link);
+	    }
+	    ELEM_REMOVE(&iobj->link);
+	}
+    }
+
+    if (IS_INSN_ID(iobj, concatstrings)) {
+	/*
+	 *  concatstrings N
+	 *  concatstrings M
+	 * =>
+	 *  concatstrings N+M-1
+	 */
+	LINK_ELEMENT *next = iobj->link.next;
+	INSN *jump = 0;
+	if (IS_INSN(next) && IS_INSN_ID(next, jump))
+	    next = get_destination_insn(jump = (INSN *)next);
+	if (IS_INSN(next) && IS_INSN_ID(next, concatstrings)) {
+	    int n = FIX2INT(OPERAND_AT(iobj, 0)) + FIX2INT(OPERAND_AT(next, 0)) - 1;
+	    OPERAND_AT(iobj, 0) = INT2FIX(n);
+	    if (jump) {
+		LABEL *label = ((LABEL *)OPERAND_AT(jump, 0));
+		if (!--label->refcnt) {
+		    ELEM_REMOVE(&label->link);
+		}
+		else {
+		    label = NEW_LABEL(0);
+		    OPERAND_AT(jump, 0) = (VALUE)label;
+		}
+		label->refcnt++;
+		ELEM_INSERT_NEXT(next, &label->link);
+		CHECK(iseq_peephole_optimize(iseq, get_next_insn(jump), do_tailcallopt));
+	    }
+	    else {
+		ELEM_REMOVE(next);
 	    }
 	}
     }
@@ -2276,11 +3318,18 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
 		}
 		switch (INSN_OF(next)) {
 		  case BIN(nop):
-		  /*case BIN(trace):*/
 		    next = next->next;
 		    break;
+		  case BIN(jump):
+		    /* if cond
+		     *   return tailcall
+		     * end
+		     */
+		    next = get_destination_insn((INSN *)next);
+		    break;
 		  case BIN(leave):
 		    piobj = iobj;
+                    /* fall through */
 		  default:
 		    next = NULL;
 		    break;
@@ -2289,28 +3338,69 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
 	}
 
 	if (piobj) {
-	    struct rb_call_info *ci = (struct rb_call_info *)piobj->operands[0];
-	    if (IS_INSN_ID(piobj, send) || IS_INSN_ID(piobj, invokesuper)) {
-		if (piobj->operands[2] == 0) { /* no blockiseq */
-		    ci->flag |= VM_CALL_TAILCALL;
+            const struct rb_callinfo *ci = (struct rb_callinfo *)OPERAND_AT(piobj, 0);
+	    if (IS_INSN_ID(piobj, send) ||
+                IS_INSN_ID(piobj, invokesuper)) {
+                if (OPERAND_AT(piobj, 1) == 0) { /* no blockiseq */
+                    ci = ci_flag_set(iseq, ci, VM_CALL_TAILCALL);
+                    OPERAND_AT(piobj, 0) = (VALUE)ci;
+                    RB_OBJ_WRITTEN(iseq, Qundef, ci);
 		}
 	    }
 	    else {
-		ci->flag |= VM_CALL_TAILCALL;
+                ci = ci_flag_set(iseq, ci, VM_CALL_TAILCALL);
+                OPERAND_AT(piobj, 0) = (VALUE)ci;
+                RB_OBJ_WRITTEN(iseq, Qundef, ci);
 	    }
 	}
     }
 
-    #define IS_TRACE_LINE(insn) \
-	(IS_INSN_ID(insn, trace) && \
-	 OPERAND_AT(insn, 0) == INT2FIX(RUBY_EVENT_LINE))
-    if (IS_TRACE_LINE(iobj) && iobj->link.prev && IS_INSN(iobj->link.prev)) {
-	INSN *piobj = (INSN *)iobj->link.prev;
-	if (IS_TRACE_LINE(piobj)) {
-	    REMOVE_ELEM(iobj->link.prev);
+    if (IS_INSN_ID(iobj, dup)) {
+	if (IS_NEXT_INSN_ID(&iobj->link, setlocal)) {
+	    LINK_ELEMENT *set1 = iobj->link.next, *set2 = NULL;
+	    if (IS_NEXT_INSN_ID(set1, setlocal)) {
+		set2 = set1->next;
+		if (OPERAND_AT(set1, 0) == OPERAND_AT(set2, 0) &&
+		    OPERAND_AT(set1, 1) == OPERAND_AT(set2, 1)) {
+		    ELEM_REMOVE(set1);
+		    ELEM_REMOVE(&iobj->link);
+		}
+	    }
+	    else if (IS_NEXT_INSN_ID(set1, dup) &&
+		     IS_NEXT_INSN_ID(set1->next, setlocal)) {
+		set2 = set1->next->next;
+		if (OPERAND_AT(set1, 0) == OPERAND_AT(set2, 0) &&
+		    OPERAND_AT(set1, 1) == OPERAND_AT(set2, 1)) {
+		    ELEM_REMOVE(set1->next);
+		    ELEM_REMOVE(set2);
+		}
+	    }
 	}
     }
 
+    if (IS_INSN_ID(iobj, getlocal)) {
+	LINK_ELEMENT *niobj = &iobj->link;
+	if (IS_NEXT_INSN_ID(niobj, dup)) {
+	    niobj = niobj->next;
+	}
+	if (IS_NEXT_INSN_ID(niobj, setlocal)) {
+	    LINK_ELEMENT *set1 = niobj->next;
+	    if (OPERAND_AT(iobj, 0) == OPERAND_AT(set1, 0) &&
+		OPERAND_AT(iobj, 1) == OPERAND_AT(set1, 1)) {
+		ELEM_REMOVE(set1);
+		ELEM_REMOVE(niobj);
+	    }
+	}
+    }
+
+    if (IS_INSN_ID(iobj, opt_invokebuiltin_delegate)) {
+        if (IS_TRACE(iobj->link.next)) {
+            if (IS_NEXT_INSN_ID(iobj->link.next, leave)) {
+                iobj->insn_id = BIN(opt_invokebuiltin_delegate_leave);
+            }
+        }
+    }
+
     return COMPILE_OK;
 }
 
@@ -2322,12 +3412,10 @@ insn_set_specialized_instruction(rb_iseq_t *iseq, INSN *iobj, int insn_id)
 
     if (insn_id == BIN(opt_neq)) {
 	VALUE *old_operands = iobj->operands;
-	iobj->operand_size = 4;
-	iobj->operands = (VALUE *)compile_data_alloc(iseq, iobj->operand_size * sizeof(VALUE));
-	iobj->operands[0] = old_operands[0];
-	iobj->operands[1] = Qfalse; /* CALL_CACHE */
-	iobj->operands[2] = (VALUE)new_callinfo(iseq, idEq, 1, 0, NULL, FALSE);
-	iobj->operands[3] = Qfalse; /* CALL_CACHE */
+        iobj->operand_size = 2;
+        iobj->operands = compile_data_calloc2(iseq, iobj->operand_size, sizeof(VALUE));
+        iobj->operands[0] = (VALUE)new_callinfo(iseq, idEq, 1, 0, NULL, FALSE);
+        iobj->operands[1] = old_operands[0];
     }
 
     return COMPILE_OK;
@@ -2343,16 +3431,16 @@ iseq_specialized_instruction(rb_iseq_t *iseq, INSN *iobj)
 	 */
 	INSN *niobj = (INSN *)iobj->link.next;
 	if (IS_INSN_ID(niobj, send)) {
-	    struct rb_call_info *ci = (struct rb_call_info *)OPERAND_AT(niobj, 0);
-	    if ((ci->flag & VM_CALL_ARGS_SIMPLE) && ci->orig_argc == 0) {
-		switch (ci->mid) {
+            const struct rb_callinfo *ci = (struct rb_callinfo *)OPERAND_AT(niobj, 0);
+            if ((vm_ci_flag(ci) & VM_CALL_ARGS_SIMPLE) && vm_ci_argc(ci) == 0) {
+		switch (vm_ci_mid(ci)) {
 		  case idMax:
 		    iobj->insn_id = BIN(opt_newarray_max);
-		    REMOVE_ELEM(&niobj->link);
+		    ELEM_REMOVE(&niobj->link);
 		    return COMPILE_OK;
 		  case idMin:
 		    iobj->insn_id = BIN(opt_newarray_min);
-		    REMOVE_ELEM(&niobj->link);
+		    ELEM_REMOVE(&niobj->link);
 		    return COMPILE_OK;
 		}
 	    }
@@ -2360,23 +3448,24 @@ iseq_specialized_instruction(rb_iseq_t *iseq, INSN *iobj)
     }
 
     if (IS_INSN_ID(iobj, send)) {
-	struct rb_call_info *ci = (struct rb_call_info *)OPERAND_AT(iobj, 0);
-	const rb_iseq_t *blockiseq = (rb_iseq_t *)OPERAND_AT(iobj, 2);
+        const struct rb_callinfo *ci = (struct rb_callinfo *)OPERAND_AT(iobj, 0);
+        const rb_iseq_t *blockiseq = (rb_iseq_t *)OPERAND_AT(iobj, 1);
 
 #define SP_INSN(opt) insn_set_specialized_instruction(iseq, iobj, BIN(opt_##opt))
-	if (ci->flag & VM_CALL_ARGS_SIMPLE) {
-	    switch (ci->orig_argc) {
+	if (vm_ci_flag(ci) & VM_CALL_ARGS_SIMPLE) {
+	    switch (vm_ci_argc(ci)) {
 	      case 0:
-		switch (ci->mid) {
+		switch (vm_ci_mid(ci)) {
 		  case idLength: SP_INSN(length); return COMPILE_OK;
 		  case idSize:	 SP_INSN(size);	  return COMPILE_OK;
 		  case idEmptyP: SP_INSN(empty_p);return COMPILE_OK;
+                  case idNilP:   SP_INSN(nil_p);  return COMPILE_OK;
 		  case idSucc:	 SP_INSN(succ);	  return COMPILE_OK;
 		  case idNot:	 SP_INSN(not);	  return COMPILE_OK;
 		}
 		break;
 	      case 1:
-		switch (ci->mid) {
+		switch (vm_ci_mid(ci)) {
 		  case idPLUS:	 SP_INSN(plus);	  return COMPILE_OK;
 		  case idMINUS:	 SP_INSN(minus);  return COMPILE_OK;
 		  case idMULT:	 SP_INSN(mult);	  return COMPILE_OK;
@@ -2384,23 +3473,26 @@ iseq_specialized_instruction(rb_iseq_t *iseq, INSN *iobj)
 		  case idMOD:	 SP_INSN(mod);	  return COMPILE_OK;
 		  case idEq:	 SP_INSN(eq);	  return COMPILE_OK;
 		  case idNeq:	 SP_INSN(neq);	  return COMPILE_OK;
+		  case idEqTilde:SP_INSN(regexpmatch2);return COMPILE_OK;
 		  case idLT:	 SP_INSN(lt);	  return COMPILE_OK;
 		  case idLE:	 SP_INSN(le);	  return COMPILE_OK;
 		  case idGT:	 SP_INSN(gt);	  return COMPILE_OK;
 		  case idGE:	 SP_INSN(ge);	  return COMPILE_OK;
 		  case idLTLT:	 SP_INSN(ltlt);	  return COMPILE_OK;
 		  case idAREF:	 SP_INSN(aref);	  return COMPILE_OK;
+                  case idAnd:    SP_INSN(and);    return COMPILE_OK;
+                  case idOr:     SP_INSN(or);    return COMPILE_OK;
 		}
 		break;
 	      case 2:
-		switch (ci->mid) {
+		switch (vm_ci_mid(ci)) {
 		  case idASET:	 SP_INSN(aset);	  return COMPILE_OK;
 		}
 		break;
 	    }
 	}
 
-	if ((ci->flag & VM_CALL_ARGS_BLOCKARG) == 0 && blockiseq == NULL) {
+	if ((vm_ci_flag(ci) & VM_CALL_ARGS_BLOCKARG) == 0 && blockiseq == NULL) {
 	    iobj->insn_id = BIN(opt_send_without_block);
 	    iobj->operand_size = insn_len(iobj->insn_id) - 1;
 	}
@@ -2414,6 +3506,10 @@ static inline int
 tailcallable_p(rb_iseq_t *iseq)
 {
     switch (iseq->body->type) {
+      case ISEQ_TYPE_TOP:
+      case ISEQ_TYPE_EVAL:
+      case ISEQ_TYPE_MAIN:
+	/* not tail callable because cfp will be over popped */
       case ISEQ_TYPE_RESCUE:
       case ISEQ_TYPE_ENSURE:
 	/* rescue block can't tail call because of errinfo */
@@ -2424,7 +3520,7 @@ tailcallable_p(rb_iseq_t *iseq)
 }
 
 static int
-iseq_optimize(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
+iseq_optimize(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 {
     LINK_ELEMENT *list;
     const int do_peepholeopt = ISEQ_COMPILE_DATA(iseq)->option->peephole_optimization;
@@ -2484,8 +3580,7 @@ new_unified_insn(rb_iseq_t *iseq,
     }
 
     if (argc > 0) {
-	ptr = operands =
-	    (VALUE *)compile_data_alloc(iseq, sizeof(VALUE) * argc);
+	ptr = operands = compile_data_alloc2(iseq, sizeof(VALUE), argc);
     }
 
     /* copy operands */
@@ -2497,7 +3592,7 @@ new_unified_insn(rb_iseq_t *iseq,
 	list = list->next;
     }
 
-    return new_insn_core(iseq, iobj->line_no, insn_id, argc, operands);
+    return new_insn_core(iseq, iobj->insn_info.line_no, insn_id, argc, operands);
 }
 #endif
 
@@ -2507,7 +3602,7 @@ new_unified_insn(rb_iseq_t *iseq,
  * It's future work (if compile time was bottle neck).
  */
 static int
-iseq_insns_unification(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
+iseq_insns_unification(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 {
 #if OPT_INSTRUCTIONS_UNIFICATION
     LINK_ELEMENT *list;
@@ -2565,7 +3660,7 @@ iseq_insns_unification(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
 #include "opt_sc.inc"
 
 static int
-insn_set_sc_state(rb_iseq_t *iseq, INSN *iobj, int state)
+insn_set_sc_state(rb_iseq_t *iseq, const LINK_ELEMENT *anchor, INSN *iobj, int state)
 {
     int nstate;
     int insn_id;
@@ -2580,11 +3675,11 @@ insn_set_sc_state(rb_iseq_t *iseq, INSN *iobj, int state)
 
 	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);
-		COMPILE_ERROR(iseq, iobj->line_no,
-			      "insn_set_sc_state error\n");
+		BADINSN_DUMP(anchor, iobj, lobj);
+		COMPILE_ERROR(iseq, iobj->insn_info.line_no,
+			      "insn_set_sc_state error: %d at "LABEL_FORMAT
+			      ", %d expected\n",
+			      lobj->sc_state, lobj->label_no, nstate);
 		return COMPILE_NG;
 	    }
 	}
@@ -2621,7 +3716,7 @@ label_set_sc_state(LABEL *lobj, int state)
 #endif
 
 static int
-iseq_set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
+iseq_set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 {
 #if OPT_STACK_CACHING
     LINK_ELEMENT *list;
@@ -2652,7 +3747,7 @@ iseq_set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
 				new_insn_body(iseq, 0, BIN(reput), 0);
 
 			    /* replace this insn */
-			    REPLACE_ELEM(list, (LINK_ELEMENT *)rpobj);
+			    ELEM_REPLACE(list, (LINK_ELEMENT *)rpobj);
 			    list = (LINK_ELEMENT *)rpobj;
 			    goto redo_point;
 			}
@@ -2663,7 +3758,7 @@ iseq_set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
 			if (state == SCS_AB || state == SCS_BA) {
 			    state = (state == SCS_AB ? SCS_BA : SCS_AB);
 
-			    REMOVE_ELEM(list);
+			    ELEM_REMOVE(list);
 			    list = list->next;
 			    goto redo_point;
 			}
@@ -2685,12 +3780,12 @@ iseq_set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
 			  case SCS_XX:
 			    goto normal_insn;
 			  default:
-			    COMPILE_ERROR(iseq, iobj->line_no,
+			    COMPILE_ERROR(iseq, iobj->insn_info.line_no,
 					  "unreachable");
 			    return COMPILE_NG;
 			}
 			/* remove useless pop */
-			REMOVE_ELEM(list);
+			ELEM_REMOVE(list);
 			list = list->next;
 			goto redo_point;
 		    }
@@ -2698,7 +3793,7 @@ iseq_set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
 		    /* none */
 		}		/* end of switch */
 	      normal_insn:
-		state = insn_set_sc_state(iseq, iobj, state);
+		state = insn_set_sc_state(iseq, anchor, iobj, state);
 		break;
 	    }
 	  case ISEQ_ELEMENT_LABEL:
@@ -2718,9 +3813,32 @@ iseq_set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
 }
 
 static int
-compile_dstr_fragments(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node, int *cntp)
+all_string_result_p(const NODE *node)
 {
-    NODE *list = node->nd_next;
+    if (!node) return FALSE;
+    switch (nd_type(node)) {
+      case NODE_STR: case NODE_DSTR:
+	return TRUE;
+      case NODE_IF: case NODE_UNLESS:
+	if (!node->nd_body || !node->nd_else) return FALSE;
+	if (all_string_result_p(node->nd_body))
+	    return all_string_result_p(node->nd_else);
+	return FALSE;
+      case NODE_AND: case NODE_OR:
+	if (!node->nd_2nd)
+	    return all_string_result_p(node->nd_1st);
+	if (!all_string_result_p(node->nd_1st))
+	    return FALSE;
+	return all_string_result_p(node->nd_2nd);
+      default:
+	return FALSE;
+    }
+}
+
+static int
+compile_dstr_fragments(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int *cntp)
+{
+    const NODE *list = node->nd_next;
     VALUE lit = node->nd_lit;
     LINK_ELEMENT *first_lit = 0;
     int cnt = 0;
@@ -2729,29 +3847,32 @@ compile_dstr_fragments(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node, int *cntp)
     if (!NIL_P(lit)) {
 	cnt++;
 	if (!RB_TYPE_P(lit, T_STRING)) {
-	    compile_bug(ERROR_ARGS "dstr: must be string: %s",
-			rb_builtin_type_name(TYPE(lit)));
+	    COMPILE_ERROR(ERROR_ARGS "dstr: must be string: %s",
+			  rb_builtin_type_name(TYPE(lit)));
+	    return COMPILE_NG;
 	}
-	lit = node->nd_lit = rb_fstring(lit);
+	lit = rb_fstring(lit);
 	ADD_INSN1(ret, nd_line(node), putobject, lit);
+        RB_OBJ_WRITTEN(iseq, Qundef, lit);
 	if (RSTRING_LEN(lit) == 0) first_lit = LAST_ELEMENT(ret);
     }
 
     while (list) {
-	node = list->nd_head;
-	if (nd_type(node) == NODE_STR) {
-	    node->nd_lit = rb_fstring(node->nd_lit);
-	    ADD_INSN1(ret, nd_line(node), putobject, node->nd_lit);
+	const NODE *const head = list->nd_head;
+	if (nd_type(head) == NODE_STR) {
+	    lit = rb_fstring(head->nd_lit);
+	    ADD_INSN1(ret, nd_line(head), putobject, lit);
+            RB_OBJ_WRITTEN(iseq, Qundef, lit);
 	    lit = Qnil;
 	}
 	else {
-	    COMPILE(ret, "each string", node);
+	    CHECK(COMPILE(ret, "each string", head));
 	}
 	cnt++;
 	list = list->nd_next;
     }
     if (NIL_P(lit) && first_lit) {
-	REMOVE_ELEM(first_lit);
+	ELEM_REMOVE(first_lit);
 	--cnt;
     }
     *cntp = cnt;
@@ -2760,96 +3881,174 @@ compile_dstr_fragments(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node, int *cntp)
 }
 
 static int
-compile_dstr(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node)
+compile_dstr(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node)
 {
     int cnt;
-    compile_dstr_fragments(iseq, ret, node, &cnt);
-    ADD_INSN1(ret, nd_line(node), concatstrings, INT2FIX(cnt));
+    if (!node->nd_next) {
+        VALUE lit = rb_fstring(node->nd_lit);
+        const int line = (int)nd_line(node);
+        ADD_INSN1(ret, line, putstring, lit);
+        RB_OBJ_WRITTEN(iseq, Qundef, lit);
+    }
+    else {
+        CHECK(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)
+compile_dregx(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node)
 {
     int cnt;
-    compile_dstr_fragments(iseq, ret, node, &cnt);
+    CHECK(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,
+compile_flip_flop(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int again,
+		  LABEL *then_label, LABEL *else_label)
+{
+    const int line = nd_line(node);
+    LABEL *lend = NEW_LABEL(line);
+    rb_num_t cnt = ISEQ_FLIP_CNT_INCREMENT(iseq->body->local_iseq)
+	+ VM_SVAR_FLIPFLOP_START;
+    VALUE key = INT2FIX(cnt);
+
+    ADD_INSN2(ret, line, getspecial, key, INT2FIX(0));
+    ADD_INSNL(ret, line, branchif, lend);
+
+    /* *flip == 0 */
+    CHECK(COMPILE(ret, "flip2 beg", node->nd_beg));
+    ADD_INSNL(ret, line, branchunless, else_label);
+    ADD_INSN1(ret, line, putobject, Qtrue);
+    ADD_INSN1(ret, line, setspecial, key);
+    if (!again) {
+	ADD_INSNL(ret, line, jump, then_label);
+    }
+
+    /* *flip == 1 */
+    ADD_LABEL(ret, lend);
+    CHECK(COMPILE(ret, "flip2 end", node->nd_end));
+    ADD_INSNL(ret, line, branchunless, then_label);
+    ADD_INSN1(ret, line, putobject, Qfalse);
+    ADD_INSN1(ret, line, setspecial, key);
+    ADD_INSNL(ret, line, jump, then_label);
+
+    return COMPILE_OK;
+}
+
+static int
+compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *cond,
 			 LABEL *then_label, LABEL *else_label)
 {
+  again:
     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);
+	    CHECK(compile_branch_condition(iseq, ret, cond->nd_1st, label,
+					   else_label));
+            if (!label->refcnt) {
+                ADD_INSN(ret, nd_line(cond), putnil);
+                break;
+            }
 	    ADD_LABEL(ret, label);
-	    compile_branch_condition(iseq, ret, cond->nd_2nd, then_label,
-				     else_label);
-	    break;
+	    cond = cond->nd_2nd;
+	    goto again;
 	}
       case NODE_OR:
 	{
 	    LABEL *label = NEW_LABEL(nd_line(cond));
-	    compile_branch_condition(iseq, ret, cond->nd_1st, then_label,
-				     label);
+	    CHECK(compile_branch_condition(iseq, ret, cond->nd_1st, then_label,
+					   label));
+            if (!label->refcnt) {
+                ADD_INSN(ret, nd_line(cond), putnil);
+                break;
+            }
 	    ADD_LABEL(ret, label);
-	    compile_branch_condition(iseq, ret, cond->nd_2nd, then_label,
-				     else_label);
-	    break;
+	    cond = cond->nd_2nd;
+	    goto again;
 	}
-      case NODE_LIT:		/* NODE_LIT is always not true */
+      case NODE_LIT:		/* NODE_LIT is always true */
       case NODE_TRUE:
       case NODE_STR:
-      case NODE_DSTR:
-      case NODE_XSTR:
-      case NODE_DXSTR:
-      case NODE_DREGX:
-      case NODE_DREGX_ONCE:
-      case NODE_DSYM:
-      case NODE_ARRAY:
-      case NODE_ZARRAY:
-      case NODE_HASH:
+      case NODE_ZLIST:
       case NODE_LAMBDA:
-      case NODE_DEFN:
-      case NODE_DEFS:
 	/* printf("useless condition eliminate (%s)\n",  ruby_node_name(nd_type(cond))); */
 	ADD_INSNL(ret, nd_line(cond), jump, then_label);
-	break;
+        return COMPILE_OK;
       case NODE_FALSE:
       case NODE_NIL:
 	/* printf("useless condition 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);
+        return COMPILE_OK;
+      case NODE_LIST:
+      case NODE_ARGSCAT:
+      case NODE_DREGX:
+      case NODE_DSTR:
+	CHECK(COMPILE_POPPED(ret, "branch condition", cond));
 	ADD_INSNL(ret, nd_line(cond), jump, then_label);
-	break;
+        return COMPILE_OK;
+      case NODE_FLIP2:
+	CHECK(compile_flip_flop(iseq, ret, cond, TRUE, then_label, else_label));
+        return COMPILE_OK;
+      case NODE_FLIP3:
+	CHECK(compile_flip_flop(iseq, ret, cond, FALSE, then_label, else_label));
+        return COMPILE_OK;
+      case NODE_DEFINED:
+	CHECK(compile_defined_expr(iseq, ret, cond, Qfalse));
+        break;
+      default:
+	CHECK(COMPILE(ret, "branch condition", cond));
+        break;
     }
+
+    ADD_INSNL(ret, nd_line(cond), branchunless, else_label);
+    ADD_INSNL(ret, nd_line(cond), jump, then_label);
     return COMPILE_OK;
 }
 
+#define HASH_BRACE 1
+
+static int
+keyword_node_p(const NODE *const node)
+{
+    return nd_type(node) == NODE_HASH && (node->nd_brace & HASH_BRACE) != HASH_BRACE;
+}
+
 static int
-compile_array_keyword_arg(rb_iseq_t *iseq, LINK_ANCHOR *ret, const NODE * const root_node, struct rb_call_info_kw_arg ** const kw_arg_ptr)
+compile_keyword_arg(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
+			  const NODE *const root_node,
+			  struct rb_callinfo_kwarg **const kw_arg_ptr,
+			  unsigned int *flag)
 {
     if (kw_arg_ptr == NULL) return FALSE;
 
-    if (nd_type(root_node) == NODE_HASH && root_node->nd_head && nd_type(root_node->nd_head) == NODE_ARRAY) {
-	NODE *node = root_node->nd_head;
+    if (root_node->nd_head && nd_type(root_node->nd_head) == NODE_LIST) {
+	const NODE *node = root_node->nd_head;
+        int seen_nodes = 0;
 
 	while (node) {
-	    NODE *key_node = node->nd_head;
+	    const NODE *key_node = node->nd_head;
+            seen_nodes++;
 
-	    assert(nd_type(node) == NODE_ARRAY);
-	    if (key_node && nd_type(key_node) == NODE_LIT && RB_TYPE_P(key_node->nd_lit, T_SYMBOL)) {
+	    assert(nd_type(node) == NODE_LIST);
+            if (key_node && nd_type(key_node) == NODE_LIT && RB_TYPE_P(key_node->nd_lit, T_SYMBOL)) {
 		/* can be keywords */
 	    }
 	    else {
+                if (flag) {
+                    *flag |= VM_CALL_KW_SPLAT;
+                    if (seen_nodes > 1 || node->nd_next->nd_next) {
+                        /* A new hash will be created for the keyword arguments
+                         * in this case, so mark the method as passing mutable
+                         * keyword splat.
+                         */
+                        *flag |= VM_CALL_KW_SPLAT_MUT;
+                    }
+                }
 		return FALSE;
 	    }
 	    node = node->nd_next; /* skip value node */
@@ -2860,7 +4059,8 @@ compile_array_keyword_arg(rb_iseq_t *iseq, LINK_ANCHOR *ret, const NODE * const
 	node = root_node->nd_head;
 	{
 	    int len = (int)node->nd_alen / 2;
-	    struct rb_call_info_kw_arg *kw_arg  = (struct rb_call_info_kw_arg *)ruby_xmalloc(sizeof(struct rb_call_info_kw_arg) + sizeof(VALUE) * (len - 1));
+            struct rb_callinfo_kwarg *kw_arg =
+                rb_xmalloc_mul_add(len, sizeof(VALUE), sizeof(struct rb_callinfo_kwarg));
 	    VALUE *keywords = kw_arg->keywords;
 	    int i = 0;
 	    kw_arg->keyword_len = len;
@@ -2868,10 +4068,10 @@ compile_array_keyword_arg(rb_iseq_t *iseq, LINK_ANCHOR *ret, const NODE * const
 	    *kw_arg_ptr = kw_arg;
 
 	    for (i=0; node != NULL; i++, node = node->nd_next->nd_next) {
-		NODE *key_node = node->nd_head;
-		NODE *val_node = node->nd_next->nd_head;
+		const NODE *key_node = node->nd_head;
+		const NODE *val_node = node->nd_next->nd_head;
 		keywords[i] = key_node->nd_lit;
-		COMPILE(ret, "keyword values", val_node);
+                NO_CHECK(COMPILE(ret, "keyword values", val_node));
 	    }
 	    assert(i == len);
 	    return TRUE;
@@ -2880,176 +4080,404 @@ compile_array_keyword_arg(rb_iseq_t *iseq, LINK_ANCHOR *ret, const NODE * const
     return FALSE;
 }
 
-enum compile_array_type_t {
-    COMPILE_ARRAY_TYPE_ARRAY,
-    COMPILE_ARRAY_TYPE_HASH,
-    COMPILE_ARRAY_TYPE_ARGS
-};
-
 static int
-compile_array_(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE* node_root,
-	       enum compile_array_type_t type, struct rb_call_info_kw_arg **keywords_ptr, int poped)
+compile_args(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node,
+                   struct rb_callinfo_kwarg **keywords_ptr, unsigned int *flag)
 {
-    NODE *node = node_root;
-    int line = (int)nd_line(node);
     int len = 0;
 
-    if (nd_type(node) == NODE_ZARRAY) {
-	if (!poped) {
-	    switch (type) {
-	      case COMPILE_ARRAY_TYPE_ARRAY: ADD_INSN1(ret, line, newarray, INT2FIX(0)); break;
-	      case COMPILE_ARRAY_TYPE_HASH: ADD_INSN1(ret, line, newhash, INT2FIX(0)); break;
-	      case COMPILE_ARRAY_TYPE_ARGS: /* do nothing */ break;
-	    }
-	}
+    for (; node; len++, node = node->nd_next) {
+        if (CPDEBUG > 0) {
+            EXPECT_NODE("compile_args", node, NODE_LIST, -1);
+        }
+
+        if (node->nd_next == NULL && keyword_node_p(node->nd_head)) { /* last node */
+            if (compile_keyword_arg(iseq, ret, node->nd_head, keywords_ptr, flag)) {
+                len--;
+            }
+            else {
+                compile_hash(iseq, ret, node->nd_head, TRUE, FALSE);
+            }
+        }
+        else {
+            NO_CHECK(COMPILE_(ret, "array element", node->nd_head, FALSE));
+        }
     }
-    else {
-	int opt_p = 1;
-	int first = 1, i;
 
-	while (node) {
-	    NODE *start_node = node, *end_node;
-	    NODE *kw = 0;
-	    const int max = 0x100;
-	    DECL_ANCHOR(anchor);
-	    INIT_ANCHOR(anchor);
-
-	    for (i=0; i<max && node; i++, len++, node = node->nd_next) {
-		if (CPDEBUG > 0) {
-		    EXPECT_NODE("compile_array", node, NODE_ARRAY);
-		}
+    return len;
+}
 
-		if (type != COMPILE_ARRAY_TYPE_ARRAY && !node->nd_head) {
-		    kw = node->nd_next;
-		    node = 0;
-		    if (kw) {
-			opt_p = 0;
-			node = kw->nd_next;
-			kw = kw->nd_head;
-		    }
-		    break;
-		}
-		if (opt_p && nd_type(node->nd_head) != NODE_LIT) {
-		    opt_p = 0;
-		}
+static inline int
+static_literal_node_p(const NODE *node, const rb_iseq_t *iseq)
+{
+    node = node->nd_head;
+    switch (nd_type(node)) {
+      case NODE_LIT:
+      case NODE_NIL:
+      case NODE_TRUE:
+      case NODE_FALSE:
+	return TRUE;
+      case NODE_STR:
+        return ISEQ_COMPILE_DATA(iseq)->option->frozen_string_literal;
+      default:
+	return FALSE;
+    }
+}
 
-		if (type == COMPILE_ARRAY_TYPE_ARGS && node->nd_next == NULL /* last node */ && compile_array_keyword_arg(iseq, anchor, node->nd_head, keywords_ptr)) {
-		    len--;
-		}
-		else {
-		    COMPILE_(anchor, "array element", node->nd_head, poped);
-		}
-	    }
+static inline VALUE
+static_literal_value(const NODE *node, rb_iseq_t *iseq)
+{
+    node = node->nd_head;
+    switch (nd_type(node)) {
+      case NODE_NIL:
+	return Qnil;
+      case NODE_TRUE:
+	return Qtrue;
+      case NODE_FALSE:
+	return Qfalse;
+      case NODE_STR:
+        if (ISEQ_COMPILE_DATA(iseq)->option->debug_frozen_string_literal || RTEST(ruby_debug)) {
+            VALUE lit;
+            VALUE debug_info = rb_ary_new_from_args(2, rb_iseq_path(iseq), INT2FIX((int)nd_line(node)));
+            lit = rb_str_dup(node->nd_lit);
+            rb_ivar_set(lit, id_debug_created_info, rb_obj_freeze(debug_info));
+            return rb_str_freeze(lit);
+        }
+        else {
+            return rb_fstring(node->nd_lit);
+        }
+      default:
+	return node->nd_lit;
+    }
+}
 
-	    if (opt_p && type != COMPILE_ARRAY_TYPE_ARGS) {
-		if (!poped) {
-		    VALUE ary = rb_ary_tmp_new(i);
+static int
+compile_array(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int popped)
+{
+    int line = (int)nd_line(node);
 
-		    end_node = node;
-		    node = start_node;
+    if (nd_type(node) == NODE_ZLIST) {
+	if (!popped) {
+	    ADD_INSN1(ret, line, newarray, INT2FIX(0));
+	}
+        return 0;
+    }
+
+    EXPECT_NODE("compile_array", node, NODE_LIST, -1);
+
+    if (popped) {
+        for (; node; node = node->nd_next) {
+            NO_CHECK(COMPILE_(ret, "array element", node->nd_head, popped));
+        }
+        return 1;
+    }
+
+    /* Compilation of an array literal.
+     * The following code is essentially the same as:
+     *
+     *     for (int count = 0; node; count++; node->nd_next) {
+     *         compile(node->nd_head);
+     *     }
+     *     ADD_INSN(newarray, count);
+     *
+     * However, there are three points.
+     *
+     * - The code above causes stack overflow for a big string literal.
+     *   The following limits the stack length up to max_stack_len.
+     *
+     *   [x1,x2,...,x10000] =>
+     *     push x1  ; push x2  ; ...; push x256; newarray 256;
+     *     push x257; push x258; ...; push x512; newarray 256; concatarray;
+     *     push x513; push x514; ...; push x768; newarray 256; concatarray;
+     *     ...
+     *
+     * - Long subarray can be optimized by pre-allocating a hidden array.
+     *
+     *   [1,2,3,...,100] =>
+     *     duparray [1,2,3,...,100]
+     *
+     *   [x, 1,2,3,...,100, z] =>
+     *     push x; newarray 1;
+     *     putobject [1,2,3,...,100] (<- hidden array); concatarray;
+     *     push z; newarray 1; concatarray
+     *
+     * - If the last element is a keyword, newarraykwsplat should be emitted
+     *   to check and remove empty keyword arguments hash from array.
+     *   (Note: a keyword is NODE_HASH which is not static_literal_node_p.)
+     *
+     *   [1,2,3,**kw] =>
+     *     putobject 1; putobject 2; putobject 3; push kw; newarraykwsplat
+     */
 
-		    while (node != end_node) {
-			rb_ary_push(ary, node->nd_head->nd_lit);
-			node = node->nd_next;
-		    }
-		    while (node && nd_type(node->nd_head) == NODE_LIT &&
-			   node->nd_next && nd_type(node->nd_next->nd_head) == NODE_LIT) {
-			rb_ary_push(ary, node->nd_head->nd_lit);
-			node = node->nd_next;
-			rb_ary_push(ary, node->nd_head->nd_lit);
-			node = node->nd_next;
-			len++;
-		    }
+    const int max_stack_len = 0x100;
+    const int min_tmp_ary_len = 0x40;
+    int stack_len = 0;
+    int first_chunk = 1;
 
-		    OBJ_FREEZE(ary);
+    /* Convert pushed elements to an array, and concatarray if needed */
+#define FLUSH_CHUNK(newarrayinsn)                               \
+    if (stack_len) {                                            \
+        ADD_INSN1(ret, line, newarrayinsn, INT2FIX(stack_len)); \
+        if (!first_chunk) ADD_INSN(ret, line, concatarray);     \
+        first_chunk = stack_len = 0;                            \
+    }
 
-		    iseq_add_mark_object_compile_time(iseq, ary);
+    while (node) {
+        int count = 1;
+
+        /* pre-allocation check (this branch can be omittable) */
+        if (static_literal_node_p(node, iseq)) {
+            /* count the elements that are optimizable */
+            const NODE *node_tmp = node->nd_next;
+            for (; node_tmp && static_literal_node_p(node_tmp, iseq); node_tmp = node_tmp->nd_next)
+                count++;
+
+            if ((first_chunk && stack_len == 0 && !node_tmp) || count >= min_tmp_ary_len) {
+                /* The literal contains only optimizable elements, or the subarray is long enough */
+                VALUE ary = rb_ary_tmp_new(count);
+
+                /* Create a hidden array */
+                for (; count; count--, node = node->nd_next)
+                    rb_ary_push(ary, static_literal_value(node, iseq));
+                OBJ_FREEZE(ary);
+
+                /* Emit optimized code */
+                FLUSH_CHUNK(newarray);
+                if (first_chunk) {
+                    ADD_INSN1(ret, line, duparray, ary);
+                    first_chunk = 0;
+                }
+                else {
+                    ADD_INSN1(ret, line, putobject, ary);
+                    ADD_INSN(ret, line, concatarray);
+                }
+                RB_OBJ_WRITTEN(iseq, Qundef, ary);
+            }
+        }
+
+        /* Base case: Compile "count" elements */
+        for (; count; count--, node = node->nd_next) {
+            if (CPDEBUG > 0) {
+                EXPECT_NODE("compile_array", node, NODE_LIST, -1);
+            }
+
+            NO_CHECK(COMPILE_(ret, "array element", node->nd_head, 0));
+            stack_len++;
+
+            if (!node->nd_next && keyword_node_p(node->nd_head)) {
+                /* Reached the end, and the last element is a keyword */
+                FLUSH_CHUNK(newarraykwsplat);
+                return 1;
+            }
+
+            /* If there are many pushed elements, flush them to avoid stack overflow */
+            if (stack_len >= max_stack_len) FLUSH_CHUNK(newarray);
+        }
+    }
+
+    FLUSH_CHUNK(newarray);
+#undef FLUSH_CHUNK
+    return 1;
+}
 
-		    if (first) {
-			first = 0;
-			if (type == COMPILE_ARRAY_TYPE_ARRAY) {
-			    ADD_INSN1(ret, line, duparray, ary);
-			}
-			else { /* COMPILE_ARRAY_TYPE_HASH */
-			    ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
-			    ADD_INSN1(ret, line, putobject, ary);
-			    ADD_SEND(ret, line, id_core_hash_from_ary, INT2FIX(1));
-			}
-		    }
-		    else {
-			if (type == COMPILE_ARRAY_TYPE_ARRAY) {
-			    ADD_INSN1(ret, line, putobject, ary);
-			    ADD_INSN(ret, line, concatarray);
-			}
-			else {
-			    ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
-			    ADD_INSN1(ret, line, putobject, ary);
-			    ADD_SEND(ret, line, id_core_hash_merge_ary, INT2FIX(1));
-			}
-		    }
-		}
-	    }
-	    else {
-		if (!poped) {
-		    switch (type) {
-		      case COMPILE_ARRAY_TYPE_ARRAY:
-			ADD_INSN1(anchor, line, newarray, INT2FIX(i));
+static inline int
+static_literal_node_pair_p(const NODE *node, const rb_iseq_t *iseq)
+{
+    return node->nd_head && static_literal_node_p(node, iseq) && static_literal_node_p(node->nd_next, iseq);
+}
 
-			if (first) {
-			    first = 0;
-			}
-			else {
-			    ADD_INSN(anchor, line, concatarray);
-			}
+static int
+compile_hash(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int method_call_keywords, int popped)
+{
+    int line = (int)nd_line(node);
 
-			APPEND_LIST(ret, anchor);
-			break;
-		      case COMPILE_ARRAY_TYPE_HASH:
-			if (i > 0) {
-			    if (first) {
-				ADD_INSN1(anchor, line, newhash, INT2FIX(i));
-				APPEND_LIST(ret, anchor);
-			    }
-			    else {
-				ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
-				ADD_INSN(ret, line, swap);
-				APPEND_LIST(ret, anchor);
-				ADD_SEND(ret, line, id_core_hash_merge_ptr, INT2FIX(i + 1));
-			    }
-			}
-			if (kw) {
-			    VALUE nhash = (i > 0 || !first) ? INT2FIX(2) : INT2FIX(1);
-			    ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
-			    if (i > 0 || !first) ADD_INSN(ret, line, swap);
-			    COMPILE(ret, "keyword splat", kw);
-			    ADD_SEND(ret, line, id_core_hash_merge_kwd, nhash);
-			    if (nhash == INT2FIX(1)) ADD_SEND(ret, line, rb_intern("dup"), INT2FIX(0));
-			}
-			first = 0;
-			break;
-		      case COMPILE_ARRAY_TYPE_ARGS:
-			APPEND_LIST(ret, anchor);
-			break;
-		    }
-		}
-		else {
-		    /* poped */
-		    APPEND_LIST(ret, anchor);
-		}
-	    }
+    node = node->nd_head;
+
+    if (!node || nd_type(node) == NODE_ZLIST) {
+	if (!popped) {
+	    ADD_INSN1(ret, line, newhash, INT2FIX(0));
 	}
+        return 0;
+    }
+
+    EXPECT_NODE("compile_hash", node, NODE_LIST, -1);
+
+    if (popped) {
+        for (; node; node = node->nd_next) {
+            NO_CHECK(COMPILE_(ret, "hash element", node->nd_head, popped));
+        }
+        return 1;
+    }
+
+    /* Compilation of a hash literal (or keyword arguments).
+     * This is very similar to compile_array, but there are some differences:
+     *
+     * - It contains key-value pairs.  So we need to take every two elements.
+     *   We can assume that the length is always even.
+     *
+     * - Merging is done by a method call (id_core_hash_merge_ptr).
+     *   Sometimes we need to insert the receiver, so "anchor" is needed.
+     *   In addition, a method call is much slower than concatarray.
+     *   So it pays only when the subsequence is really long.
+     *   (min_tmp_hash_len must be much larger than min_tmp_ary_len.)
+     *
+     * - We need to handle keyword splat: **kw.
+     *   For **kw, the key part (node->nd_head) is NULL, and the value part
+     *   (node->nd_next->nd_head) is "kw".
+     *   The code is a bit difficult to avoid hash allocation for **{}.
+     */
+
+    const int max_stack_len = 0x100;
+    const int min_tmp_hash_len = 0x800;
+    int stack_len = 0;
+    int first_chunk = 1;
+    DECL_ANCHOR(anchor);
+    INIT_ANCHOR(anchor);
+
+    /* Convert pushed elements to a hash, and merge if needed */
+#define FLUSH_CHUNK()                                                                   \
+    if (stack_len) {                                                                    \
+        if (first_chunk) {                                                              \
+            APPEND_LIST(ret, anchor);                                                   \
+            ADD_INSN1(ret, line, newhash, INT2FIX(stack_len));                          \
+        }                                                                               \
+        else {                                                                          \
+            ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));  \
+            ADD_INSN(ret, line, swap);                                                  \
+            APPEND_LIST(ret, anchor);                                                   \
+            ADD_SEND(ret, line, id_core_hash_merge_ptr, INT2FIX(stack_len + 1));        \
+        }                                                                               \
+        INIT_ANCHOR(anchor);                                                            \
+        first_chunk = stack_len = 0;                                                    \
     }
-    return len;
-}
 
-static VALUE
-compile_array(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE* node_root, enum compile_array_type_t type)
-{
-    return compile_array_(iseq, ret, node_root, type, NULL, 0);
+    while (node) {
+        int count = 1;
+
+        /* pre-allocation check (this branch can be omittable) */
+        if (static_literal_node_pair_p(node, iseq)) {
+            /* count the elements that are optimizable */
+            const NODE *node_tmp = node->nd_next->nd_next;
+            for (; node_tmp && static_literal_node_pair_p(node_tmp, iseq); node_tmp = node_tmp->nd_next->nd_next)
+                count++;
+
+            if ((first_chunk && stack_len == 0 && !node_tmp) || count >= min_tmp_hash_len) {
+                /* The literal contains only optimizable elements, or the subsequence is long enough */
+                VALUE ary = rb_ary_tmp_new(count);
+
+                /* Create a hidden hash */
+                for (; count; count--, node = node->nd_next->nd_next) {
+                    VALUE elem[2];
+                    elem[0] = static_literal_value(node, iseq);
+                    elem[1] = static_literal_value(node->nd_next, iseq);
+                    rb_ary_cat(ary, elem, 2);
+                }
+                VALUE hash = rb_hash_new_with_size(RARRAY_LEN(ary) / 2);
+                rb_hash_bulk_insert(RARRAY_LEN(ary), RARRAY_CONST_PTR_TRANSIENT(ary), hash);
+                hash = rb_obj_hide(hash);
+                OBJ_FREEZE(hash);
+
+                /* Emit optimized code */
+                FLUSH_CHUNK();
+                if (first_chunk) {
+                    ADD_INSN1(ret, line, duphash, hash);
+                    first_chunk = 0;
+                }
+                else {
+                    ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+                    ADD_INSN(ret, line, swap);
+
+                    ADD_INSN1(ret, line, putobject, hash);
+
+                    ADD_SEND(ret, line, id_core_hash_merge_kwd, INT2FIX(2));
+                }
+                RB_OBJ_WRITTEN(iseq, Qundef, hash);
+            }
+        }
+
+        /* Base case: Compile "count" elements */
+        for (; count; count--, node = node->nd_next->nd_next) {
+
+            if (CPDEBUG > 0) {
+                EXPECT_NODE("compile_hash", node, NODE_LIST, -1);
+            }
+
+            if (node->nd_head) {
+                /* Normal key-value pair */
+                NO_CHECK(COMPILE_(anchor, "hash key element", node->nd_head, 0));
+                NO_CHECK(COMPILE_(anchor, "hash value element", node->nd_next->nd_head, 0));
+                stack_len += 2;
+
+                /* If there are many pushed elements, flush them to avoid stack overflow */
+                if (stack_len >= max_stack_len) FLUSH_CHUNK();
+            }
+            else {
+                /* kwsplat case: foo(..., **kw, ...) */
+                FLUSH_CHUNK();
+
+                const NODE *kw = node->nd_next->nd_head;
+                int empty_kw = nd_type(kw) == NODE_LIT && RB_TYPE_P(kw->nd_lit, T_HASH); /* foo(  ..., **{}, ...) */
+                int first_kw = first_chunk && stack_len == 0; /* foo(1,2,3, **kw, ...) */
+                int last_kw = !node->nd_next->nd_next;        /* foo(  ..., **kw) */
+                int only_kw = last_kw && first_kw;            /* foo(1,2,3, **kw) */
+
+                if (empty_kw) {
+                    if (only_kw && method_call_keywords) {
+                        /* **{} appears at the only keyword argument in method call,
+                         * so it won't be modified.
+                         * kw is a special NODE_LIT that contains a special empty hash,
+                         * so this emits: putobject {}.
+                         * This is only done for method calls and not for literal hashes,
+                         * because literal hashes should always result in a new hash.
+                         */
+                        NO_CHECK(COMPILE(ret, "keyword splat", kw));
+                    }
+                    else if (first_kw) {
+                        /* **{} appears as the first keyword argument, so it may be modified.
+                         * We need to create a fresh hash object.
+                         */
+                        ADD_INSN1(ret, line, newhash, INT2FIX(0));
+                    }
+                    /* Any empty keyword splats that are not the first can be ignored.
+                     * since merging an empty hash into the existing hash is the same
+                     * as not merging it. */
+                }
+                else {
+                    if (only_kw && method_call_keywords) {
+                        /* **kw is only keyword argument in method call.
+                         * Use directly.  This will be not be flagged as mutable.
+                         * This is only done for method calls and not for literal hashes,
+                         * because literal hashes should always result in a new hash.
+                         */
+                        NO_CHECK(COMPILE(ret, "keyword splat", kw));
+                    }
+                    else {
+                        /* There is more than one keyword argument, or this is not a method
+                         * call.  In that case, we need to add an empty hash (if first keyword),
+                         * or merge the hash to the accumulated hash (if not the first keyword).
+                         */
+                        ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+                        if (first_kw) ADD_INSN1(ret, line, newhash, INT2FIX(0));
+                        else ADD_INSN(ret, line, swap);
+
+                        NO_CHECK(COMPILE(ret, "keyword splat", kw));
+
+                        ADD_SEND(ret, line, id_core_hash_merge_kwd, INT2FIX(2));
+                    }
+                }
+
+                first_chunk = 0;
+            }
+        }
+    }
+
+    FLUSH_CHUNK();
+#undef FLUSH_CHUNK
+    return 1;
 }
 
-static VALUE
-case_when_optimizable_literal(NODE * node)
+VALUE
+rb_node_case_when_optimizable_literal(const NODE *const node)
 {
     switch (nd_type(node)) {
       case NODE_LIT: {
@@ -3071,40 +4499,36 @@ case_when_optimizable_literal(NODE * node)
       case NODE_FALSE:
 	return Qfalse;
       case NODE_STR:
-	return node->nd_lit = rb_fstring(node->nd_lit);
+	return rb_fstring(node->nd_lit);
     }
     return Qundef;
 }
 
 static int
-when_vals(rb_iseq_t *iseq, LINK_ANCHOR *cond_seq, NODE *vals, LABEL *l1, int only_special_literals, VALUE literals)
+when_vals(rb_iseq_t *iseq, LINK_ANCHOR *const cond_seq, const NODE *vals,
+	  LABEL *l1, int only_special_literals, VALUE literals)
 {
     while (vals) {
-	NODE* val = vals->nd_head;
-	VALUE lit = case_when_optimizable_literal(val);
+	const NODE *val = vals->nd_head;
+        VALUE lit = rb_node_case_when_optimizable_literal(val);
 
 	if (lit == Qundef) {
 	    only_special_literals = 0;
 	}
-	else {
-	    if (rb_hash_lookup(literals, lit) != Qnil) {
-		rb_compile_warning(ruby_sourcefile, nd_line(val),
-				   "duplicated when clause is ignored");
-	    }
-	    else {
-		rb_hash_aset(literals, lit, (VALUE)(l1) | 1);
-	    }
+        else if (NIL_P(rb_hash_lookup(literals, lit))) {
+            rb_hash_aset(literals, lit, (VALUE)(l1) | 1);
 	}
 
 	ADD_INSN(cond_seq, nd_line(val), dup); /* dup target */
 
 	if (nd_type(val) == NODE_STR) {
-	    val->nd_lit = rb_fstring(val->nd_lit);
 	    debugp_param("nd_lit", val->nd_lit);
-	    ADD_INSN1(cond_seq, nd_line(val), putobject, val->nd_lit);
+	    lit = rb_fstring(val->nd_lit);
+	    ADD_INSN1(cond_seq, nd_line(val), putobject, lit);
+            RB_OBJ_WRITTEN(iseq, Qundef, lit);
 	}
 	else {
-	    COMPILE(cond_seq, "when cond", val);
+	    if (!COMPILE(cond_seq, "when cond", val)) return -1;
 	}
 
 	ADD_INSN1(cond_seq, nd_line(vals), checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_CASE));
@@ -3115,26 +4539,72 @@ when_vals(rb_iseq_t *iseq, LINK_ANCHOR *cond_seq, NODE *vals, LABEL *l1, int onl
 }
 
 static int
-compile_massign_lhs(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node)
+when_splat_vals(rb_iseq_t *iseq, LINK_ANCHOR *const cond_seq, const NODE *vals,
+                LABEL *l1, int only_special_literals, VALUE literals)
+{
+    const int line = nd_line(vals);
+
+    switch (nd_type(vals)) {
+      case NODE_LIST:
+        if (when_vals(iseq, cond_seq, vals, l1, only_special_literals, literals) < 0)
+            return COMPILE_NG;
+        break;
+      case NODE_SPLAT:
+        ADD_INSN (cond_seq, line, dup);
+        CHECK(COMPILE(cond_seq, "when splat", vals->nd_head));
+        ADD_INSN1(cond_seq, line, splatarray, Qfalse);
+        ADD_INSN1(cond_seq, line, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_CASE | VM_CHECKMATCH_ARRAY));
+        ADD_INSNL(cond_seq, line, branchif, l1);
+        break;
+      case NODE_ARGSCAT:
+        CHECK(when_splat_vals(iseq, cond_seq, vals->nd_head, l1, only_special_literals, literals));
+        CHECK(when_splat_vals(iseq, cond_seq, vals->nd_body, l1, only_special_literals, literals));
+        break;
+      case NODE_ARGSPUSH:
+        CHECK(when_splat_vals(iseq, cond_seq, vals->nd_head, l1, only_special_literals, literals));
+        ADD_INSN (cond_seq, line, dup);
+        CHECK(COMPILE(cond_seq, "when argspush body", vals->nd_body));
+        ADD_INSN1(cond_seq, line, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_CASE));
+        ADD_INSNL(cond_seq, line, branchif, l1);
+        break;
+      default:
+        ADD_INSN (cond_seq, line, dup);
+        CHECK(COMPILE(cond_seq, "when val", vals));
+        ADD_INSN1(cond_seq, line, splatarray, Qfalse);
+        ADD_INSN1(cond_seq, line, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_CASE | VM_CHECKMATCH_ARRAY));
+        ADD_INSNL(cond_seq, line, branchif, l1);
+        break;
+    }
+    return COMPILE_OK;
+}
+
+
+static int
+compile_massign_lhs(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node)
 {
     switch (nd_type(node)) {
       case NODE_ATTRASGN: {
 	INSN *iobj;
-	struct rb_call_info *ci;
 	VALUE dupidx;
 	int line = nd_line(node);
 
-	COMPILE_POPED(ret, "masgn lhs (NODE_ATTRASGN)", node);
+	CHECK(COMPILE_POPPED(ret, "masgn lhs (NODE_ATTRASGN)", node));
 
 	iobj = (INSN *)get_prev_insn((INSN *)LAST_ELEMENT(ret)); /* send insn */
-	ci = (struct rb_call_info *)iobj->operands[0];
-	ci->orig_argc += 1;
-	dupidx = INT2FIX(ci->orig_argc);
+        const struct rb_callinfo *ci = (struct rb_callinfo *)OPERAND_AT(iobj, 0);
+        int argc = vm_ci_argc(ci) + 1;
+        ci = ci_argc_set(iseq, ci, argc);
+        OPERAND_AT(iobj, 0) = (VALUE)ci;
+        RB_OBJ_WRITTEN(iseq, Qundef, ci);
+        dupidx = INT2FIX(argc);
 
 	INSERT_BEFORE_INSN1(iobj, line, topn, dupidx);
-	if (ci->flag & VM_CALL_ARGS_SPLAT) {
-	    --ci->orig_argc;
-	    INSERT_BEFORE_INSN1(iobj, line, newarray, INT2FIX(1));
+	if (vm_ci_flag(ci) & VM_CALL_ARGS_SPLAT) {
+            int argc = vm_ci_argc(ci);
+            ci = ci_argc_set(iseq, ci, argc - 1);
+            OPERAND_AT(iobj, 0) = (VALUE)ci;
+            RB_OBJ_WRITTEN(iseq, Qundef, iobj);
+            INSERT_BEFORE_INSN1(iobj, line, newarray, INT2FIX(1));
 	    INSERT_BEFORE_INSN(iobj, line, concatarray);
 	}
 	ADD_INSN(ret, line, pop);	/* result */
@@ -3143,16 +4613,16 @@ compile_massign_lhs(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node)
       case NODE_MASGN: {
 	DECL_ANCHOR(anchor);
 	INIT_ANCHOR(anchor);
-	COMPILE_POPED(anchor, "nest masgn lhs", node);
-	REMOVE_ELEM(FIRST_ELEMENT(anchor));
+	CHECK(COMPILE_POPPED(anchor, "nest masgn lhs", node));
+	ELEM_REMOVE(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));
+	CHECK(COMPILE_POPPED(anchor, "masgn lhs", node));
+	ELEM_REMOVE(FIRST_ELEMENT(anchor));
 	ADD_SEQ(ret, anchor);
       }
     }
@@ -3160,25 +4630,26 @@ compile_massign_lhs(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node)
     return COMPILE_OK;
 }
 
-static void
-compile_massign_opt_lhs(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *lhsn)
+static int
+compile_massign_opt_lhs(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *lhsn)
 {
     if (lhsn) {
-	compile_massign_opt_lhs(iseq, ret, lhsn->nd_next);
-	compile_massign_lhs(iseq, ret, lhsn->nd_head);
+	CHECK(compile_massign_opt_lhs(iseq, ret, lhsn->nd_next));
+	CHECK(compile_massign_lhs(iseq, ret, lhsn->nd_head));
     }
+    return COMPILE_OK;
 }
 
 static int
-compile_massign_opt(rb_iseq_t *iseq, LINK_ANCHOR *ret,
-		    NODE *rhsn, NODE *orig_lhsn)
+compile_massign_opt(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
+		    const NODE *rhsn, const NODE *orig_lhsn)
 {
     VALUE mem[64];
     const int memsize = numberof(mem);
     int memindex = 0;
     int llen = 0, rlen = 0;
     int i;
-    NODE *lhsn = orig_lhsn;
+    const NODE *lhsn = orig_lhsn;
 
 #define MEMORY(v) { \
     int i; \
@@ -3189,12 +4660,12 @@ compile_massign_opt(rb_iseq_t *iseq, LINK_ANCHOR *ret,
     mem[memindex++] = (v); \
 }
 
-    if (rhsn == 0 || nd_type(rhsn) != NODE_ARRAY) {
+    if (rhsn == 0 || nd_type(rhsn) != NODE_LIST) {
 	return 0;
     }
 
     while (lhsn) {
-	NODE *ln = lhsn->nd_head;
+	const NODE *ln = lhsn->nd_head;
 	switch (nd_type(ln)) {
 	  case NODE_LASGN:
 	    MEMORY(ln->nd_vid);
@@ -3202,7 +4673,6 @@ compile_massign_opt(rb_iseq_t *iseq, LINK_ANCHOR *ret,
 	  case NODE_DASGN:
 	  case NODE_DASGN_CURR:
 	  case NODE_IASGN:
-	  case NODE_IASGN2:
 	  case NODE_CVASGN:
 	    MEMORY(ln->nd_vid);
 	    break;
@@ -3215,10 +4685,10 @@ compile_massign_opt(rb_iseq_t *iseq, LINK_ANCHOR *ret,
 
     while (rhsn) {
 	if (llen <= rlen) {
-	    COMPILE_POPED(ret, "masgn val (popped)", rhsn->nd_head);
+            NO_CHECK(COMPILE_POPPED(ret, "masgn val (popped)", rhsn->nd_head));
 	}
 	else {
-	    COMPILE(ret, "masgn val", rhsn->nd_head);
+            NO_CHECK(COMPILE(ret, "masgn val", rhsn->nd_head));
 	}
 	rhsn = rhsn->nd_next;
 	rlen++;
@@ -3235,7 +4705,7 @@ compile_massign_opt(rb_iseq_t *iseq, LINK_ANCHOR *ret,
 }
 
 static void
-adjust_stack(rb_iseq_t *iseq, LINK_ANCHOR *ret, int line, int rlen, int llen)
+adjust_stack(rb_iseq_t *iseq, LINK_ANCHOR *const ret, int line, int rlen, int llen)
 {
     if (rlen < llen) {
 	do {ADD_INSN(ret, line, putnil);} while (++rlen < llen);
@@ -3246,14 +4716,14 @@ adjust_stack(rb_iseq_t *iseq, LINK_ANCHOR *ret, int line, int rlen, int llen)
 }
 
 static int
-compile_massign(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node, int poped)
+compile_massign(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped)
 {
-    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;
+    const NODE *rhsn = node->nd_value;
+    const NODE *splatn = node->nd_args;
+    const NODE *lhsn = node->nd_head;
+    int lhs_splat = (splatn && NODE_NAMED_REST_P(splatn)) ? 1 : 0;
 
-    if (!poped || splatn || !compile_massign_opt(iseq, ret, rhsn, lhsn)) {
+    if (!popped || splatn || !compile_massign_opt(iseq, ret, rhsn, lhsn)) {
 	int llen = 0;
 	int expand = 1;
 	DECL_ANCHOR(lhsseq);
@@ -3261,14 +4731,14 @@ compile_massign(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node, int poped)
 	INIT_ANCHOR(lhsseq);
 
 	while (lhsn) {
-	    compile_massign_lhs(iseq, lhsseq, lhsn->nd_head);
+	    CHECK(compile_massign_lhs(iseq, lhsseq, lhsn->nd_head));
 	    llen += 1;
 	    lhsn = lhsn->nd_next;
 	}
 
-	COMPILE(ret, "normal masgn rhs", rhsn);
+        NO_CHECK(COMPILE(ret, "normal masgn rhs", rhsn));
 
-	if (!poped) {
+	if (!popped) {
 	    ADD_INSN(ret, nd_line(node), dup);
 	}
 	else if (!lhs_splat) {
@@ -3305,25 +4775,25 @@ compile_massign(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node, int poped)
 	if (lhs_splat) {
 	    if (nd_type(splatn) == NODE_POSTARG) {
 		/*a, b, *r, p1, p2 */
-		NODE *postn = splatn->nd_2nd;
-		NODE *restn = splatn->nd_1st;
+		const NODE *postn = splatn->nd_2nd;
+		const NODE *restn = splatn->nd_1st;
 		int num = (int)postn->nd_alen;
-		int flag = 0x02 | (((VALUE)restn == (VALUE)-1) ? 0x00 : 0x01);
+		int flag = 0x02 | (NODE_NAMED_REST_P(restn) ? 0x01 : 0x00);
 
 		ADD_INSN2(ret, nd_line(splatn), expandarray,
 			  INT2FIX(num), INT2FIX(flag));
 
-		if ((VALUE)restn != (VALUE)-1) {
-		    compile_massign_lhs(iseq, ret, restn);
+		if (NODE_NAMED_REST_P(restn)) {
+		    CHECK(compile_massign_lhs(iseq, ret, restn));
 		}
 		while (postn) {
-		    compile_massign_lhs(iseq, ret, postn->nd_head);
+		    CHECK(compile_massign_lhs(iseq, ret, postn->nd_head));
 		    postn = postn->nd_next;
 		}
 	    }
 	    else {
 		/* a, b, *r */
-		compile_massign_lhs(iseq, ret, splatn);
+		CHECK(compile_massign_lhs(iseq, ret, splatn));
 	    }
 	}
     }
@@ -3331,62 +4801,77 @@ compile_massign(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node, int poped)
 }
 
 static int
-compile_colon2(rb_iseq_t *iseq, NODE * node,
-	       LINK_ANCHOR *pref, LINK_ANCHOR *body)
+compile_const_prefix(rb_iseq_t *iseq, const NODE *const node,
+		     LINK_ANCHOR *const pref, LINK_ANCHOR *const 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));
+	debugi("compile_const_prefix - colon", node->nd_vid);
+        ADD_INSN1(body, nd_line(node), putobject, Qtrue);
+        ADD_INSN1(body, nd_line(node), getconstant, ID2SYM(node->nd_vid));
 	break;
       case NODE_COLON3:
-	debugi("compile_colon2 - colon3", node->nd_mid);
+	debugi("compile_const_prefix - 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));
+        ADD_INSN1(body, nd_line(node), putobject, Qtrue);
+        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));
+	CHECK(compile_const_prefix(iseq, node->nd_head, pref, body));
+	debugi("compile_const_prefix - colon2", node->nd_mid);
+        ADD_INSN1(body, nd_line(node), putobject, Qfalse);
+        ADD_INSN1(body, nd_line(node), getconstant, ID2SYM(node->nd_mid));
 	break;
       default:
-	COMPILE(pref, "const colon2 prefix", node);
+	CHECK(COMPILE(pref, "const colon2 prefix", node));
 	break;
     }
     return COMPILE_OK;
 }
 
-static VALUE
-compile_cpath(LINK_ANCHOR *ret, rb_iseq_t *iseq, NODE *cpath)
+static int
+compile_cpath(LINK_ANCHOR *const ret, rb_iseq_t *iseq, const NODE *cpath)
 {
     if (nd_type(cpath) == NODE_COLON3) {
 	/* toplevel class ::Foo */
 	ADD_INSN1(ret, nd_line(cpath), putobject, rb_cObject);
-	return Qfalse;
+	return VM_DEFINECLASS_FLAG_SCOPED;
     }
     else if (cpath->nd_head) {
 	/* Bar::Foo */
-	COMPILE(ret, "nd_else->nd_head", cpath->nd_head);
-	return Qfalse;
+        NO_CHECK(COMPILE(ret, "nd_else->nd_head", cpath->nd_head));
+	return VM_DEFINECLASS_FLAG_SCOPED;
     }
     else {
 	/* class at cbase Foo */
 	ADD_INSN1(ret, nd_line(cpath), putspecialobject,
 		  INT2FIX(VM_SPECIAL_OBJECT_CONST_BASE));
-	return Qtrue;
+	return 0;
+    }
+}
+
+static inline int
+private_recv_p(const NODE *node)
+{
+    if (nd_type(node->nd_recv) == NODE_SELF) {
+        NODE *self = node->nd_recv;
+        return self->nd_state != 0;
     }
+    return 0;
 }
 
-#define private_recv_p(node) (nd_type((node)->nd_recv) == NODE_SELF)
+static void
+defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
+	     const NODE *const node, LABEL **lfinish, VALUE needstr);
 
-#define defined_expr defined_expr0
-static int
-defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *ret,
-	     NODE *node, LABEL **lfinish, VALUE needstr)
+static void
+defined_expr0(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
+	      const NODE *const node, LABEL **lfinish, VALUE needstr)
 {
-    enum defined_type expr_type = 0;
+    enum defined_type expr_type = DEFINED_NOT_DEFINED;
     enum node_type type;
+    const int line = nd_line(node);
 
     switch (type = nd_type(node)) {
 
@@ -3404,21 +4889,22 @@ defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *ret,
 	expr_type = DEFINED_FALSE;
 	break;
 
-      case NODE_ARRAY:{
-	NODE *vals = node;
+      case NODE_LIST:{
+	const NODE *vals = node;
 
 	do {
-	    defined_expr(iseq, ret, vals->nd_head, lfinish, Qfalse);
+	    defined_expr0(iseq, ret, vals->nd_head, lfinish, Qfalse);
 
 	    if (!lfinish[1]) {
-		lfinish[1] = NEW_LABEL(nd_line(node));
+                lfinish[1] = NEW_LABEL(line);
 	    }
-	    ADD_INSNL(ret, nd_line(node), branchunless, lfinish[1]);
+            ADD_INSNL(ret, line, branchunless, lfinish[1]);
 	} while ((vals = vals->nd_next) != NULL);
       }
+        /* fall through */
       case NODE_STR:
       case NODE_LIT:
-      case NODE_ZARRAY:
+      case NODE_ZLIST:
       case NODE_AND:
       case NODE_OR:
       default:
@@ -3432,103 +4918,99 @@ defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *ret,
 	break;
 
       case NODE_IVAR:
-	ADD_INSN(ret, nd_line(node), putnil);
-	ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_IVAR),
+        ADD_INSN(ret, line, putnil);
+        ADD_INSN3(ret, line, defined, INT2FIX(DEFINED_IVAR),
 		  ID2SYM(node->nd_vid), needstr);
-	return 1;
+        return;
 
       case NODE_GVAR:
-	ADD_INSN(ret, nd_line(node), putnil);
-	ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_GVAR),
-		  ID2SYM(node->nd_entry->id), needstr);
-	return 1;
+        ADD_INSN(ret, line, putnil);
+        ADD_INSN3(ret, line, defined, INT2FIX(DEFINED_GVAR),
+		  ID2SYM(node->nd_entry), needstr);
+        return;
 
       case NODE_CVAR:
-	ADD_INSN(ret, nd_line(node), putnil);
-	ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_CVAR),
+        ADD_INSN(ret, line, putnil);
+        ADD_INSN3(ret, line, defined, INT2FIX(DEFINED_CVAR),
 		  ID2SYM(node->nd_vid), needstr);
-	return 1;
+        return;
 
       case NODE_CONST:
-	ADD_INSN(ret, nd_line(node), putnil);
-	ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_CONST),
+        ADD_INSN(ret, line, putnil);
+        ADD_INSN3(ret, line, defined, INT2FIX(DEFINED_CONST),
 		  ID2SYM(node->nd_vid), needstr);
-	return 1;
+        return;
       case NODE_COLON2:
 	if (!lfinish[1]) {
-	    lfinish[1] = NEW_LABEL(nd_line(node));
+            lfinish[1] = NEW_LABEL(line);
 	}
-	defined_expr(iseq, ret, node->nd_head, lfinish, Qfalse);
-	ADD_INSNL(ret, nd_line(node), branchunless, lfinish[1]);
+	defined_expr0(iseq, ret, node->nd_head, lfinish, Qfalse);
+        ADD_INSNL(ret, line, branchunless, lfinish[1]);
+        NO_CHECK(COMPILE(ret, "defined/colon2#nd_head", node->nd_head));
 
-	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;
+        ADD_INSN3(ret, line, defined,
+		  (rb_is_const_id(node->nd_mid) ?
+		   INT2FIX(DEFINED_CONST_FROM) : INT2FIX(DEFINED_METHOD)),
+		  ID2SYM(node->nd_mid), needstr);
+        return;
       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;
+        ADD_INSN1(ret, line, putobject, rb_cObject);
+        ADD_INSN3(ret, line, defined,
+		  INT2FIX(DEFINED_CONST_FROM), ID2SYM(node->nd_mid), needstr);
+        return;
 
 	/* method dispatch */
       case NODE_CALL:
+      case NODE_OPCALL:
       case NODE_VCALL:
       case NODE_FCALL:
       case NODE_ATTRASGN:{
 	const int explicit_receiver =
-	    (type == NODE_CALL ||
+	    (type == NODE_CALL || type == NODE_OPCALL ||
 	     (type == NODE_ATTRASGN && !private_recv_p(node)));
 
-	if (!lfinish[1]) {
-	    lfinish[1] = NEW_LABEL(nd_line(node));
+	if (!lfinish[1] && (node->nd_args || explicit_receiver)) {
+            lfinish[1] = NEW_LABEL(line);
 	}
 	if (node->nd_args) {
-	    defined_expr(iseq, ret, node->nd_args, lfinish, Qfalse);
-	    ADD_INSNL(ret, nd_line(node), branchunless, lfinish[1]);
+	    defined_expr0(iseq, ret, node->nd_args, lfinish, Qfalse);
+            ADD_INSNL(ret, line, branchunless, lfinish[1]);
 	}
 	if (explicit_receiver) {
-	    defined_expr(iseq, ret, node->nd_recv, lfinish, Qfalse);
-	    ADD_INSNL(ret, nd_line(node), branchunless, lfinish[1]);
-	    COMPILE(ret, "defined/recv", node->nd_recv);
-	    ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_METHOD),
+	    defined_expr0(iseq, ret, node->nd_recv, lfinish, Qfalse);
+            ADD_INSNL(ret, line, branchunless, lfinish[1]);
+            NO_CHECK(COMPILE(ret, "defined/recv", node->nd_recv));
+            ADD_INSN3(ret, line, 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),
+            ADD_INSN(ret, line, putself);
+            ADD_INSN3(ret, line, defined, INT2FIX(DEFINED_FUNC),
 		      ID2SYM(node->nd_mid), needstr);
 	}
-	return 1;
+        return;
       }
 
       case NODE_YIELD:
-	ADD_INSN(ret, nd_line(node), putnil);
-	ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_YIELD), 0,
+        ADD_INSN(ret, line, putnil);
+        ADD_INSN3(ret, line, defined, INT2FIX(DEFINED_YIELD), 0,
 		  needstr);
-	return 1;
+        return;
 
       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),
+        ADD_INSN(ret, line, putnil);
+        ADD_INSN3(ret, line, defined, INT2FIX(DEFINED_REF),
 		  INT2FIX((node->nd_nth << 1) | (type == NODE_BACK_REF)),
 		  needstr);
-	return 1;
+        return;
 
       case NODE_SUPER:
       case NODE_ZSUPER:
-	ADD_INSN(ret, nd_line(node), putnil);
-	ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_ZSUPER), 0,
+        ADD_INSN(ret, line, putnil);
+        ADD_INSN3(ret, line, defined, INT2FIX(DEFINED_ZSUPER), 0,
 		  needstr);
-	return 1;
+        return;
 
       case NODE_OP_ASGN1:
       case NODE_OP_ASGN2:
@@ -3541,48 +5023,77 @@ defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *ret,
       case NODE_GASGN:
       case NODE_IASGN:
       case NODE_CDECL:
-      case NODE_CVDECL:
       case NODE_CVASGN:
 	expr_type = DEFINED_ASGN;
 	break;
     }
 
-    if (expr_type) {
-	if (needstr != Qfalse) {
-	    VALUE str = rb_iseq_defined_string(expr_type);
-	    ADD_INSN1(ret, nd_line(node), putobject, str);
-	}
-	else {
-	    ADD_INSN1(ret, nd_line(node), putobject, Qtrue);
-	}
-	return 1;
+    assert(expr_type != DEFINED_NOT_DEFINED);
+
+    if (needstr != Qfalse) {
+        VALUE str = rb_iseq_defined_string(expr_type);
+        ADD_INSN1(ret, line, putobject, str);
+    }
+    else {
+        ADD_INSN1(ret, line, putobject, Qtrue);
     }
-    return 0;
 }
-#undef defined_expr
 
-static int
-defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *ret,
-	     NODE *node, LABEL **lfinish, VALUE needstr)
+static void
+build_defined_rescue_iseq(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const void *unused)
+{
+    ADD_INSN(ret, 0, putnil);
+    iseq_set_exception_local_table(iseq);
+}
+
+static void
+defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
+	     const NODE *const node, LABEL **lfinish, VALUE needstr)
 {
     LINK_ELEMENT *lcur = ret->last;
-    int done = defined_expr0(iseq, ret, node, lfinish, needstr);
+    defined_expr0(iseq, ret, node, lfinish, needstr);
     if (lfinish[1]) {
 	int line = nd_line(node);
 	LABEL *lstart = NEW_LABEL(line);
 	LABEL *lend = NEW_LABEL(line);
-	const rb_iseq_t *rescue = NEW_CHILD_ISEQ(NEW_NIL(),
-						 rb_str_concat(rb_str_new2
-							       ("defined guard in "),
-							       iseq->body->location.label),
-						 ISEQ_TYPE_DEFINED_GUARD, 0);
+	const rb_iseq_t *rescue;
+        struct rb_iseq_new_with_callback_callback_func *ifunc =
+            rb_iseq_new_with_callback_new_callback(build_defined_rescue_iseq, NULL);
+        rescue = new_child_iseq_with_callback(iseq, ifunc,
+				      rb_str_concat(rb_str_new2("defined guard in "),
+						    iseq->body->location.label),
+				      iseq, ISEQ_TYPE_RESCUE, 0);
 	lstart->rescued = LABEL_RESCUE_BEG;
 	lend->rescued = LABEL_RESCUE_END;
 	APPEND_LABEL(ret, lcur, lstart);
 	ADD_LABEL(ret, lend);
 	ADD_CATCH_ENTRY(CATCH_TYPE_RESCUE, lstart, lend, rescue, lfinish[1]);
     }
-    return done;
+}
+
+static int
+compile_defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, VALUE needstr)
+{
+    const int line = nd_line(node);
+    if (!node->nd_head) {
+	VALUE str = rb_iseq_defined_string(DEFINED_NIL);
+	ADD_INSN1(ret, line, putobject, str);
+    }
+    else {
+	LABEL *lfinish[2];
+	LINK_ELEMENT *last = ret->last;
+	lfinish[0] = NEW_LABEL(line);
+	lfinish[1] = 0;
+	defined_expr(iseq, ret, node->nd_head, lfinish, needstr);
+	if (lfinish[1]) {
+	    ELEM_INSERT_NEXT(last, &new_insn_body(iseq, line, BIN(putnil), 0)->link);
+	    ADD_INSN(ret, line, swap);
+	    ADD_INSN(ret, line, pop);
+	    ADD_LABEL(ret, lfinish[1]);
+	}
+	ADD_LABEL(ret, lfinish[0]);
+    }
+    return COMPILE_OK;
 }
 
 static VALUE
@@ -3611,7 +5122,7 @@ make_name_for_block(const rb_iseq_t *orig_iseq)
 static void
 push_ensure_entry(rb_iseq_t *iseq,
 		  struct iseq_compile_data_ensure_node_stack *enl,
-		  struct ensure_range *er, NODE *node)
+		  struct ensure_range *er, const NODE *const node)
 {
     enl->ensure_node = node;
     enl->prev = ISEQ_COMPILE_DATA(iseq)->ensure_node_stack;	/* prev */
@@ -3638,7 +5149,7 @@ add_ensure_range(rb_iseq_t *iseq, struct ensure_range *erange,
 }
 
 static void
-add_ensure_iseq(LINK_ANCHOR *ret, rb_iseq_t *iseq, int is_return)
+add_ensure_iseq(LINK_ANCHOR *const ret, rb_iseq_t *iseq, int is_return)
 {
     struct iseq_compile_data_ensure_node_stack *enlp =
 	ISEQ_COMPILE_DATA(iseq)->ensure_node_stack;
@@ -3647,7 +5158,7 @@ add_ensure_iseq(LINK_ANCHOR *ret, rb_iseq_t *iseq, int is_return)
 
     INIT_ANCHOR(ensure);
     while (enlp) {
-	if (enlp->erange != 0) {
+	if (enlp->erange != NULL) {
 	    DECL_ANCHOR(ensure_part);
 	    LABEL *lstart = NEW_LABEL(0);
 	    LABEL *lend = NEW_LABEL(0);
@@ -3657,7 +5168,7 @@ add_ensure_iseq(LINK_ANCHOR *ret, rb_iseq_t *iseq, int is_return)
 
 	    ISEQ_COMPILE_DATA(iseq)->ensure_node_stack = enlp->prev;
 	    ADD_LABEL(ensure_part, lstart);
-	    COMPILE_POPED(ensure_part, "ensure part", enlp->ensure_node);
+            NO_CHECK(COMPILE_POPPED(ensure_part, "ensure part", enlp->ensure_node));
 	    ADD_LABEL(ensure_part, lend);
 	    ADD_SEQ(ensure, ensure_part);
 	}
@@ -3672,110 +5183,137 @@ add_ensure_iseq(LINK_ANCHOR *ret, rb_iseq_t *iseq, int is_return)
     ADD_SEQ(ret, ensure);
 }
 
-static VALUE
-setup_args(rb_iseq_t *iseq, LINK_ANCHOR *args, NODE *argn, unsigned int *flag, struct rb_call_info_kw_arg **keywords)
+static int
+check_keyword(const NODE *node)
 {
-    VALUE argc = INT2FIX(0);
-    int nsplat = 0;
-    DECL_ANCHOR(arg_block);
-    DECL_ANCHOR(args_splat);
+    /* This check is essentially a code clone of compile_keyword_arg. */
 
-    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;
-	argn = argn->nd_head;
+    if (nd_type(node) == NODE_LIST) {
+        while (node->nd_next) {
+            node = node->nd_next;
+        }
+        node = node->nd_head;
     }
 
-  setup_argn:
-    if (argn) {
-	switch (nd_type(argn)) {
-	  case NODE_SPLAT: {
-	    COMPILE(args, "args (splat)", argn->nd_head);
-	    ADD_INSN1(args, nd_line(argn), splatarray, Qfalse);
-	    argc = INT2FIX(1);
-	    nsplat++;
-	    *flag |= VM_CALL_ARGS_SPLAT;
-	    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 (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;
-
-	    if (next_is_array) {
-		argc = INT2FIX(compile_array(iseq, args, argn->nd_head, COMPILE_ARRAY_TYPE_ARGS) + 1);
-	    }
-	    else {
-		argn = argn->nd_head;
-		goto setup_argn;
-	    }
-	    break;
-	  }
-	  case NODE_ARRAY:
-	    {
-		argc = INT2FIX(compile_array_(iseq, args, argn, COMPILE_ARRAY_TYPE_ARGS, keywords, FALSE));
-		break;
-	    }
-	  default: {
-	    UNKNOWN_NODE("setup_arg", argn);
-	  }
-	}
-    }
+    return keyword_node_p(node);
+}
 
-    if (nsplat > 1) {
-	int i;
-	for (i=1; i<nsplat; i++) {
-	    ADD_INSN(args_splat, nd_line(args), concatarray);
-	}
-    }
+static VALUE
+setup_args_core(rb_iseq_t *iseq, LINK_ANCHOR *const args, const NODE *argn,
+                int dup_rest, unsigned int *flag, struct rb_callinfo_kwarg **keywords)
+{
+    if (argn) {
+        switch (nd_type(argn)) {
+          case NODE_SPLAT: {
+            NO_CHECK(COMPILE(args, "args (splat)", argn->nd_head));
+            ADD_INSN1(args, nd_line(argn), splatarray, dup_rest ? Qtrue : Qfalse);
+            if (flag) *flag |= VM_CALL_ARGS_SPLAT;
+            return INT2FIX(1);
+          }
+          case NODE_ARGSCAT:
+          case NODE_ARGSPUSH: {
+            int next_is_list = (nd_type(argn->nd_head) == NODE_LIST);
+            VALUE argc = setup_args_core(iseq, args, argn->nd_head, 1, NULL, NULL);
+            if (nd_type(argn->nd_body) == NODE_LIST) {
+                /* This branch is needed to avoid "newarraykwsplat" [Bug #16442] */
+                int rest_len = compile_args(iseq, args, argn->nd_body, NULL, NULL);
+                ADD_INSN1(args, nd_line(argn), newarray, INT2FIX(rest_len));
+            }
+            else {
+                NO_CHECK(COMPILE(args, "args (cat: splat)", argn->nd_body));
+            }
+            if (flag) {
+                *flag |= VM_CALL_ARGS_SPLAT;
+                /* This is a dirty hack.  It traverses the AST twice.
+                 * In a long term, it should be fixed by a redesign of keyword arguments */
+                if (check_keyword(argn->nd_body))
+                    *flag |= VM_CALL_KW_SPLAT;
+            }
+            if (nd_type(argn) == NODE_ARGSCAT) {
+                if (next_is_list) {
+                    ADD_INSN1(args, nd_line(argn), splatarray, Qtrue);
+                    return INT2FIX(FIX2INT(argc) + 1);
+                }
+                else {
+                    ADD_INSN1(args, nd_line(argn), splatarray, Qfalse);
+                    ADD_INSN(args, nd_line(argn), concatarray);
+                    return argc;
+                }
+            }
+            else {
+                ADD_INSN1(args, nd_line(argn), newarray, INT2FIX(1));
+                ADD_INSN(args, nd_line(argn), concatarray);
+                return argc;
+            }
+          }
+          case NODE_LIST: {
+            int len = compile_args(iseq, args, argn, keywords, flag);
+            return INT2FIX(len);
+          }
+          default: {
+            UNKNOWN_NODE("setup_arg", argn, Qnil);
+          }
+        }
+    }
+    return INT2FIX(0);
+}
 
-    if (!LIST_SIZE_ZERO(args_splat)) {
-	ADD_SEQ(args, args_splat);
+static VALUE
+setup_args(rb_iseq_t *iseq, LINK_ANCHOR *const args, const NODE *argn,
+	   unsigned int *flag, struct rb_callinfo_kwarg **keywords)
+{
+    VALUE ret;
+    if (argn && nd_type(argn) == NODE_BLOCK_PASS) {
+        unsigned int dup_rest = 1;
+        DECL_ANCHOR(arg_block);
+        INIT_ANCHOR(arg_block);
+        NO_CHECK(COMPILE(arg_block, "block", argn->nd_body));
+
+        *flag |= VM_CALL_ARGS_BLOCKARG;
+
+        if (LIST_INSN_SIZE_ONE(arg_block)) {
+            LINK_ELEMENT *elem = FIRST_ELEMENT(arg_block);
+            if (elem->type == ISEQ_ELEMENT_INSN) {
+                INSN *iobj = (INSN *)elem;
+                if (iobj->insn_id == BIN(getblockparam)) {
+                    iobj->insn_id = BIN(getblockparamproxy);
+                }
+                dup_rest = 0;
+            }
+        }
+        ret = setup_args_core(iseq, args, argn->nd_head, dup_rest, flag, keywords);
+        ADD_SEQ(args, arg_block);
     }
-
-    if (*flag & VM_CALL_ARGS_BLOCKARG) {
-	ADD_SEQ(args, arg_block);
+    else {
+        ret = setup_args_core(iseq, args, argn, 0, flag, keywords);
     }
-    return argc;
+    return ret;
 }
 
-static VALUE
-build_postexe_iseq(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *body)
+static void
+build_postexe_iseq(rb_iseq_t *iseq, LINK_ANCHOR *ret, const void *ptr)
 {
+    const NODE *body = ptr;
     int line = nd_line(body);
     VALUE argc = INT2FIX(0);
     const rb_iseq_t *block = NEW_CHILD_ISEQ(body, make_name_for_block(iseq->body->parent_iseq), ISEQ_TYPE_BLOCK, line);
 
     ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
     ADD_CALL_WITH_BLOCK(ret, line, id_core_set_postexe, argc, block);
+    RB_OBJ_WRITTEN(iseq, Qundef, (VALUE)block);
     iseq_set_local_table(iseq, 0);
-    return Qnil;
 }
 
 static void
-compile_named_capture_assign(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node)
+compile_named_capture_assign(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node)
 {
-    NODE *vars;
+    const NODE *vars;
     LINK_ELEMENT *last;
     int line = nd_line(node);
     LABEL *fail_label = NEW_LABEL(line), *end_label = NEW_LABEL(line);
 
 #if !(defined(NAMED_CAPTURE_BY_SVAR) && NAMED_CAPTURE_BY_SVAR-0)
-    ADD_INSN1(ret, line, getglobal, ((VALUE)rb_global_entry(idBACKREF) | 1));
+    ADD_INSN1(ret, line, getglobal, ID2SYM(idBACKREF));
 #else
     ADD_INSN2(ret, line, getspecial, INT2FIX(1) /* '~' */, INT2FIX(0));
 #endif
@@ -3788,11 +5326,11 @@ compile_named_capture_assign(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node)
 	    ADD_INSN(ret, line, dup);
 	}
 	last = ret->last;
-	COMPILE_POPED(ret, "capture", vars->nd_head);
+        NO_CHECK(COMPILE_POPPED(ret, "capture", vars->nd_head));
 	last = last->next; /* putobject :var */
 	cap = new_insn_send(iseq, line, idAREF, INT2FIX(1),
 			    NULL, INT2FIX(0), NULL);
-	INSERT_ELEM_PREV(last->next, (LINK_ELEMENT *)cap);
+	ELEM_INSERT_PREV(last->next, (LINK_ELEMENT *)cap);
 #if !defined(NAMED_CAPTURE_SINGLE_OPT) || NAMED_CAPTURE_SINGLE_OPT-0
 	if (!vars->nd_next && vars == node) {
 	    /* only one name */
@@ -3817,7 +5355,7 @@ compile_named_capture_assign(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node)
     ADD_INSN(ret, line, pop);
     for (vars = node; vars; vars = vars->nd_next) {
 	last = ret->last;
-	COMPILE_POPED(ret, "capture", vars->nd_head);
+        NO_CHECK(COMPILE_POPPED(ret, "capture", vars->nd_head));
 	last = last->next; /* putobject :var */
 	((INSN*)last)->insn_id = BIN(putnil);
 	((INSN*)last)->operand_size = 0;
@@ -3825,734 +5363,2270 @@ compile_named_capture_assign(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node)
     ADD_LABEL(ret, end_label);
 }
 
-/**
-  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)
+optimizable_range_item_p(const NODE *n)
 {
-    enum node_type type;
-    LINK_ELEMENT *saved_last_element = 0;
-    int line;
-
-    if (node == 0) {
-	if (!poped) {
-	    debugs("node: NODE_NIL(implicit)\n");
-	    ADD_INSN(ret, ISEQ_COMPILE_DATA(iseq)->last_line, putnil);
-	}
-	return COMPILE_OK;
+    if (!n) return FALSE;
+    switch (nd_type(n)) {
+      case NODE_LIT:
+        return RB_INTEGER_TYPE_P(n->nd_lit);
+      case NODE_NIL:
+        return TRUE;
+      default:
+        return FALSE;
     }
+}
 
-    line = (int)nd_line(node);
-
-    if (ISEQ_COMPILE_DATA(iseq)->last_line == line) {
-	/* ignore */
+static int
+compile_if(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped, const enum node_type type)
+{
+    struct rb_iseq_constant_body *const body = iseq->body;
+    const NODE *const node_body = type == NODE_IF ? node->nd_body : node->nd_else;
+    const NODE *const node_else = type == NODE_IF ? node->nd_else : node->nd_body;
+
+    const int line = nd_line(node);
+    DECL_ANCHOR(cond_seq);
+    DECL_ANCHOR(then_seq);
+    DECL_ANCHOR(else_seq);
+    LABEL *then_label, *else_label, *end_label;
+    VALUE branches = Qfalse;
+    int ci_size;
+    VALUE catch_table = ISEQ_COMPILE_DATA(iseq)->catch_table_ary;
+    long catch_table_size = NIL_P(catch_table) ? 0 : RARRAY_LEN(catch_table);
+
+    INIT_ANCHOR(cond_seq);
+    INIT_ANCHOR(then_seq);
+    INIT_ANCHOR(else_seq);
+    then_label = NEW_LABEL(line);
+    else_label = NEW_LABEL(line);
+    end_label = 0;
+
+    compile_branch_condition(iseq, cond_seq, node->nd_cond,
+			     then_label, else_label);
+
+    ci_size = body->ci_size;
+    CHECK(COMPILE_(then_seq, "then", node_body, popped));
+    catch_table = ISEQ_COMPILE_DATA(iseq)->catch_table_ary;
+    if (!then_label->refcnt) {
+        body->ci_size = ci_size;
+        if (!NIL_P(catch_table)) rb_ary_set_len(catch_table, catch_table_size);
     }
     else {
-	if (node->flags & NODE_FL_NEWLINE) {
-	    ISEQ_COMPILE_DATA(iseq)->last_line = line;
-	    ADD_TRACE(ret, line, RUBY_EVENT_LINE);
-	    saved_last_element = ret->last;
-	}
+        if (!NIL_P(catch_table)) catch_table_size = RARRAY_LEN(catch_table);
     }
 
-    debug_node_start(node);
+    ci_size = body->ci_size;
+    CHECK(COMPILE_(else_seq, "else", node_else, popped));
+    catch_table = ISEQ_COMPILE_DATA(iseq)->catch_table_ary;
+    if (!else_label->refcnt) {
+        body->ci_size = ci_size;
+        if (!NIL_P(catch_table)) rb_ary_set_len(catch_table, catch_table_size);
+    }
+    else {
+        if (!NIL_P(catch_table)) catch_table_size = RARRAY_LEN(catch_table);
+    }
 
-    type = nd_type(node);
+    ADD_SEQ(ret, cond_seq);
 
-    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(line);
-	else_label = NEW_LABEL(line);
-	end_label = NEW_LABEL(line);
-
-	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);
+    if (then_label->refcnt && else_label->refcnt) {
+	branches = decl_branch_base(iseq, node, type == NODE_IF ? "if" : "unless");
+    }
 
+    if (then_label->refcnt) {
 	ADD_LABEL(ret, then_label);
+	if (else_label->refcnt) {
+	    add_trace_branch_coverage(
+                iseq,
+		ret,
+                node_body ? node_body : node,
+                0,
+		type == NODE_IF ? "then" : "else",
+		branches);
+	    end_label = NEW_LABEL(line);
+	    ADD_INSNL(then_seq, line, jump, end_label);
+            if (!popped) {
+                ADD_INSN(then_seq, line, pop);
+            }
+	}
 	ADD_SEQ(ret, then_seq);
-	ADD_INSNL(ret, line, jump, end_label);
+    }
 
+    if (else_label->refcnt) {
 	ADD_LABEL(ret, else_label);
+	if (then_label->refcnt) {
+	    add_trace_branch_coverage(
+                iseq,
+		ret,
+                node_else ? node_else : node,
+                1,
+		type == NODE_IF ? "else" : "then",
+		branches);
+	}
 	ADD_SEQ(ret, else_seq);
+    }
 
+    if (end_label) {
 	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);
-	int only_special_literals = 1;
-	VALUE literals = rb_hash_new();
-
-	INIT_ANCHOR(head);
-	INIT_ANCHOR(body_seq);
-	INIT_ANCHOR(cond_seq);
-
-	rb_hash_tbl_raw(literals)->type = &cdhash_type;
-
-	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);
-	line = nd_line(node);
-
-	if (type != NODE_WHEN) {
-	    COMPILE_ERROR(ERROR_ARGS "NODE_CASE: unexpected node. must be NODE_WHEN, but %s", ruby_node_name(type));
-	    debug_node_end();
-	    return COMPILE_NG;
-	}
+    return COMPILE_OK;
+}
 
-	endlabel = NEW_LABEL(line);
-	elselabel = NEW_LABEL(line);
+static int
+compile_case(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_node, int popped)
+{
+    const NODE *vals;
+    const NODE *node = orig_node;
+    LABEL *endlabel, *elselabel;
+    DECL_ANCHOR(head);
+    DECL_ANCHOR(body_seq);
+    DECL_ANCHOR(cond_seq);
+    int only_special_literals = 1;
+    VALUE literals = rb_hash_new();
+    int line;
+    enum node_type type;
+    VALUE branches = Qfalse;
+    int branch_id = 0;
 
-	ADD_SEQ(ret, head);	/* case VAL */
+    INIT_ANCHOR(head);
+    INIT_ANCHOR(body_seq);
+    INIT_ANCHOR(cond_seq);
 
-	while (type == NODE_WHEN) {
-	    LABEL *l1;
+    RHASH_TBL_RAW(literals)->type = &cdhash_type;
 
-	    l1 = NEW_LABEL(line);
-	    ADD_LABEL(body_seq, l1);
-	    ADD_INSN(body_seq, line, pop);
-	    COMPILE_(body_seq, "when body", node->nd_body, poped);
-	    ADD_INSNL(body_seq, line, jump, endlabel);
+    CHECK(COMPILE(head, "case base", node->nd_head));
 
-	    vals = node->nd_head;
-	    if (vals) {
-		switch (nd_type(vals)) {
-		  case NODE_ARRAY:
-		    only_special_literals = when_vals(iseq, cond_seq, vals, l1, only_special_literals, literals);
-		    break;
-		  case NODE_SPLAT:
-		  case NODE_ARGSCAT:
-		  case NODE_ARGSPUSH:
-		    only_special_literals = 0;
-		    ADD_INSN (cond_seq, nd_line(vals), dup);
-		    COMPILE(cond_seq, "when/cond splat", vals);
-		    ADD_INSN1(cond_seq, nd_line(vals), checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_CASE | VM_CHECKMATCH_ARRAY));
-		    ADD_INSNL(cond_seq, nd_line(vals), branchif, l1);
-		    break;
-		  default:
-		    UNKNOWN_NODE("NODE_CASE", vals);
-		}
-	    }
-	    else {
-		EXPECT_NODE_NONULL("NODE_CASE", node, NODE_ARRAY);
-	    }
+    branches = decl_branch_base(iseq, node, "case");
 
-	    node = node->nd_next;
-	    if (!node) {
+    node = node->nd_body;
+    EXPECT_NODE("NODE_CASE", node, NODE_WHEN, COMPILE_NG);
+    type = nd_type(node);
+    line = nd_line(node);
+
+    endlabel = NEW_LABEL(line);
+    elselabel = NEW_LABEL(line);
+
+    ADD_SEQ(ret, head);	/* case VAL */
+
+    while (type == NODE_WHEN) {
+	LABEL *l1;
+
+	l1 = NEW_LABEL(line);
+	ADD_LABEL(body_seq, l1);
+	ADD_INSN(body_seq, line, pop);
+	add_trace_branch_coverage(
+                iseq,
+		body_seq,
+                node->nd_body ? node->nd_body : node,
+                branch_id++,
+		"when",
+		branches);
+	CHECK(COMPILE_(body_seq, "when body", node->nd_body, popped));
+	ADD_INSNL(body_seq, line, jump, endlabel);
+
+	vals = node->nd_head;
+	if (vals) {
+	    switch (nd_type(vals)) {
+	      case NODE_LIST:
+		only_special_literals = when_vals(iseq, cond_seq, vals, l1, only_special_literals, literals);
+		if (only_special_literals < 0) return COMPILE_NG;
 		break;
+	      case NODE_SPLAT:
+	      case NODE_ARGSCAT:
+	      case NODE_ARGSPUSH:
+		only_special_literals = 0;
+		CHECK(when_splat_vals(iseq, cond_seq, vals, l1, only_special_literals, literals));
+		break;
+	      default:
+		UNKNOWN_NODE("NODE_CASE", vals, COMPILE_NG);
 	    }
-	    type = nd_type(node);
-	    line = nd_line(node);
-	}
-	/* else */
-	if (node) {
-	    ADD_LABEL(cond_seq, elselabel);
-	    ADD_INSN(cond_seq, line, pop);
-	    COMPILE_(cond_seq, "else", node, poped);
-	    ADD_INSNL(cond_seq, line, 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);
+	    EXPECT_NODE_NONULL("NODE_CASE", node, NODE_LIST, COMPILE_NG);
 	}
 
-	if (only_special_literals) {
-	    iseq_add_mark_object(iseq, literals);
-
-	    ADD_INSN(ret, nd_line(tempnode), dup);
-	    ADD_INSN2(ret, nd_line(tempnode), opt_case_dispatch, literals, elselabel);
-	    LABEL_REF(elselabel);
+	node = node->nd_next;
+	if (!node) {
+	    break;
+	}
+	type = nd_type(node);
+	line = nd_line(node);
+    }
+    /* else */
+    if (node) {
+	ADD_LABEL(cond_seq, elselabel);
+	ADD_INSN(cond_seq, line, pop);
+	add_trace_branch_coverage(iseq, cond_seq, node, branch_id, "else", branches);
+	CHECK(COMPILE_(cond_seq, "else", node, popped));
+	ADD_INSNL(cond_seq, line, jump, endlabel);
+    }
+    else {
+	debugs("== else (implicit)\n");
+	ADD_LABEL(cond_seq, elselabel);
+	ADD_INSN(cond_seq, nd_line(orig_node), pop);
+	add_trace_branch_coverage(iseq, cond_seq, orig_node, branch_id, "else", branches);
+	if (!popped) {
+	    ADD_INSN(cond_seq, nd_line(orig_node), putnil);
 	}
+	ADD_INSNL(cond_seq, nd_line(orig_node), jump, endlabel);
+    }
 
-	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(line);
-
-	while (node && nd_type(node) == NODE_WHEN) {
-	    LABEL *l1 = NEW_LABEL(line = nd_line(node));
-	    ADD_LABEL(body_seq, l1);
-	    COMPILE_(body_seq, "when", node->nd_body, poped);
-	    ADD_INSNL(body_seq, line, jump, endlabel);
-
-	    vals = node->nd_head;
-	    if (!vals) {
-		compile_bug(ERROR_ARGS "NODE_WHEN: must be NODE_ARRAY, but 0");
-	    }
-	    switch (nd_type(vals)) {
-	      case NODE_ARRAY:
-		while (vals) {
-		    val = vals->nd_head;
-		    COMPILE(ret, "when2", val);
-		    ADD_INSNL(ret, nd_line(val), branchif, l1);
-		    vals = vals->nd_next;
-		}
-		break;
-	      case NODE_SPLAT:
-	      case NODE_ARGSCAT:
-	      case NODE_ARGSPUSH:
-		ADD_INSN(ret, nd_line(vals), putnil);
-		COMPILE(ret, "when2/cond splat", vals);
-		ADD_INSN1(ret, nd_line(vals), checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_WHEN | VM_CHECKMATCH_ARRAY));
-		ADD_INSNL(ret, nd_line(vals), branchif, l1);
-		break;
-	      default:
-		UNKNOWN_NODE("NODE_WHEN", vals);
+    if (only_special_literals && ISEQ_COMPILE_DATA(iseq)->option->specialized_instruction) {
+	ADD_INSN(ret, nd_line(orig_node), dup);
+	ADD_INSN2(ret, nd_line(orig_node), opt_case_dispatch, literals, elselabel);
+        RB_OBJ_WRITTEN(iseq, Qundef, literals);
+	LABEL_REF(elselabel);
+    }
+
+    ADD_SEQ(ret, cond_seq);
+    ADD_SEQ(ret, body_seq);
+    ADD_LABEL(ret, endlabel);
+    return COMPILE_OK;
+}
+
+static int
+compile_case2(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_node, int popped)
+{
+    const NODE *vals;
+    const NODE *val;
+    const NODE *node = orig_node->nd_body;
+    LABEL *endlabel;
+    DECL_ANCHOR(body_seq);
+    VALUE branches = Qfalse;
+    int branch_id = 0;
+
+    branches = decl_branch_base(iseq, orig_node, "case");
+
+    INIT_ANCHOR(body_seq);
+    endlabel = NEW_LABEL(nd_line(node));
+
+    while (node && nd_type(node) == NODE_WHEN) {
+	const int line = nd_line(node);
+	LABEL *l1 = NEW_LABEL(line);
+	ADD_LABEL(body_seq, l1);
+	add_trace_branch_coverage(
+                iseq,
+		body_seq,
+		node->nd_body ? node->nd_body : node,
+                branch_id++,
+		"when",
+		branches);
+	CHECK(COMPILE_(body_seq, "when", node->nd_body, popped));
+	ADD_INSNL(body_seq, line, jump, endlabel);
+
+	vals = node->nd_head;
+	if (!vals) {
+            EXPECT_NODE_NONULL("NODE_WHEN", node, NODE_LIST, COMPILE_NG);
+	}
+	switch (nd_type(vals)) {
+	  case NODE_LIST:
+	    while (vals) {
+		LABEL *lnext;
+		val = vals->nd_head;
+		lnext = NEW_LABEL(nd_line(val));
+		debug_compile("== when2\n", (void)0);
+		CHECK(compile_branch_condition(iseq, ret, val, l1, lnext));
+		ADD_LABEL(ret, lnext);
+		vals = vals->nd_next;
 	    }
-	    node = node->nd_next;
+	    break;
+	  case NODE_SPLAT:
+	  case NODE_ARGSCAT:
+	  case NODE_ARGSPUSH:
+	    ADD_INSN(ret, nd_line(vals), putnil);
+	    CHECK(COMPILE(ret, "when2/cond splat", vals));
+	    ADD_INSN1(ret, nd_line(vals), checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_WHEN | VM_CHECKMATCH_ARRAY));
+	    ADD_INSNL(ret, nd_line(vals), branchif, l1);
+	    break;
+	  default:
+	    UNKNOWN_NODE("NODE_WHEN", vals, COMPILE_NG);
 	}
-	/* else */
-	COMPILE_(ret, "else", node, poped);
-	ADD_INSNL(ret, nd_line(orig_node), jump, endlabel);
+	node = node->nd_next;
+    }
+    /* else */
+    add_trace_branch_coverage(
+        iseq,
+	ret,
+        node ? node : orig_node,
+        branch_id,
+	"else",
+	branches);
+    CHECK(COMPILE_(ret, "else", node, popped));
+    ADD_INSNL(ret, nd_line(orig_node), jump, endlabel);
+
+    ADD_SEQ(ret, body_seq);
+    ADD_LABEL(ret, endlabel);
+    return COMPILE_OK;
+}
 
-	ADD_SEQ(ret, body_seq);
-	ADD_LABEL(ret, endlabel);
+static int iseq_compile_pattern_match(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, LABEL *unmatched, int in_alt_pattern, int deconstructed_pos);
 
-	break;
+static int iseq_compile_array_deconstruct(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, LABEL *deconstruct, LABEL *deconstructed, LABEL *match_failed, LABEL *type_error, int deconstructed_pos);
+
+static int
+iseq_compile_pattern_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, LABEL *matched, LABEL *unmatched, int in_alt_pattern, int deconstructed_pos)
+{
+    const int line = nd_line(node);
+
+    switch (nd_type(node)) {
+      case NODE_ARYPTN: {
+        /*
+         *   if pattern.use_rest_num?
+         *     rest_num = 0
+         *   end
+         *   if pattern.has_constant_node?
+         *     unless pattern.constant === obj
+         *       goto match_failed
+         *     end
+         *   end
+         *   unless obj.respond_to?(:deconstruct)
+         *     goto match_failed
+         *   end
+         *   d = obj.deconstruct
+         *   unless Array === d
+         *     goto type_error
+         *   end
+         *   min_argc = pattern.pre_args_num + pattern.post_args_num
+         *   if pattern.has_rest_arg?
+         *     unless d.length >= min_argc
+         *       goto match_failed
+         *     end
+         *   else
+         *     unless d.length == min_argc
+         *       goto match_failed
+         *     end
+         *   end
+         *   pattern.pre_args_num.each do |i|
+         *     unless pattern.pre_args[i].match?(d[i])
+         *       goto match_failed
+         *     end
+         *   end
+         *   if pattern.use_rest_num?
+         *     rest_num = d.length - min_argc
+         *     if pattern.has_rest_arg? && pattern.has_rest_arg_id # not `*`, but `*rest`
+         *       unless pattern.rest_arg.match?(d[pattern.pre_args_num, rest_num])
+         *         goto match_failed
+         *       end
+         *     end
+         *   end
+         *   pattern.post_args_num.each do |i|
+         *     j = pattern.pre_args_num + i
+         *     j += rest_num
+         *     unless pattern.post_args[i].match?(d[j])
+         *       goto match_failed
+         *     end
+         *   end
+         *   goto matched
+         * type_error:
+         *   FrozenCore.raise TypeError
+         * match_failed:
+         *   goto unmatched
+         */
+        struct rb_ary_pattern_info *apinfo = node->nd_apinfo;
+        const NODE *args = apinfo->pre_args;
+        const int pre_args_num = apinfo->pre_args ? rb_long2int(apinfo->pre_args->nd_alen) : 0;
+        const int post_args_num = apinfo->post_args ? rb_long2int(apinfo->post_args->nd_alen) : 0;
+
+        const int min_argc = pre_args_num + post_args_num;
+        const int use_rest_num = apinfo->rest_arg && (NODE_NAMED_REST_P(apinfo->rest_arg) ||
+                                                      (!NODE_NAMED_REST_P(apinfo->rest_arg) && post_args_num > 0));
+
+        LABEL *match_failed, *type_error, *deconstruct, *deconstructed;
+        int i;
+        match_failed = NEW_LABEL(line);
+        type_error = NEW_LABEL(line);
+        deconstruct = NEW_LABEL(line);
+        deconstructed = NEW_LABEL(line);
+
+        if (use_rest_num) {
+            ADD_INSN1(ret, line, putobject, INT2FIX(0)); /* allocate stack for rest_num */
+            ADD_INSN(ret, line, swap);
+            if (deconstructed_pos) {
+                deconstructed_pos++;
+            }
+        }
+
+        if (node->nd_pconst) {
+            ADD_INSN(ret, line, dup);
+            CHECK(COMPILE(ret, "constant", node->nd_pconst));
+            ADD_INSN1(ret, line, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_CASE));
+            ADD_INSNL(ret, line, branchunless, match_failed);
+        }
+
+        CHECK(iseq_compile_array_deconstruct(iseq, ret, node, deconstruct, deconstructed, match_failed, type_error, deconstructed_pos));
+
+        ADD_INSN(ret, line, dup);
+        ADD_SEND(ret, line, idLength, INT2FIX(0));
+        ADD_INSN1(ret, line, putobject, INT2FIX(min_argc));
+        ADD_SEND(ret, line, apinfo->rest_arg ? idGE : idEq, INT2FIX(1));
+        ADD_INSNL(ret, line, branchunless, match_failed);
+
+        for (i = 0; i < pre_args_num; i++) {
+            ADD_INSN(ret, line, dup);
+            ADD_INSN1(ret, line, putobject, INT2FIX(i));
+            ADD_SEND(ret, line, idAREF, INT2FIX(1));
+            CHECK(iseq_compile_pattern_match(iseq, ret, args->nd_head, match_failed, in_alt_pattern, FALSE));
+            args = args->nd_next;
+        }
+
+        if (apinfo->rest_arg) {
+            if (NODE_NAMED_REST_P(apinfo->rest_arg)) {
+                ADD_INSN(ret, line, dup);
+                ADD_INSN1(ret, line, putobject, INT2FIX(pre_args_num));
+                ADD_INSN1(ret, line, topn, INT2FIX(1));
+                ADD_SEND(ret, line, idLength, INT2FIX(0));
+                ADD_INSN1(ret, line, putobject, INT2FIX(min_argc));
+                ADD_SEND(ret, line, idMINUS, INT2FIX(1));
+                ADD_INSN1(ret, line, setn, INT2FIX(4));
+                ADD_SEND(ret, line, idAREF, INT2FIX(2));
+
+                CHECK(iseq_compile_pattern_match(iseq, ret, apinfo->rest_arg, match_failed, in_alt_pattern, FALSE));
+            }
+            else {
+                if (post_args_num > 0) {
+                    ADD_INSN(ret, line, dup);
+                    ADD_SEND(ret, line, idLength, INT2FIX(0));
+                    ADD_INSN1(ret, line, putobject, INT2FIX(min_argc));
+                    ADD_SEND(ret, line, idMINUS, INT2FIX(1));
+                    ADD_INSN1(ret, line, setn, INT2FIX(2));
+                    ADD_INSN(ret, line, pop);
+                }
+            }
+        }
+
+        args = apinfo->post_args;
+        for (i = 0; i < post_args_num; i++) {
+            ADD_INSN(ret, line, dup);
+
+            ADD_INSN1(ret, line, putobject, INT2FIX(pre_args_num + i));
+            ADD_INSN1(ret, line, topn, INT2FIX(3));
+            ADD_SEND(ret, line, idPLUS, INT2FIX(1));
+
+            ADD_SEND(ret, line, idAREF, INT2FIX(1));
+            CHECK(iseq_compile_pattern_match(iseq, ret, args->nd_head, match_failed, in_alt_pattern, FALSE));
+            args = args->nd_next;
+        }
+
+        ADD_INSN(ret, line, pop);
+        if (use_rest_num) {
+            ADD_INSN(ret, line, pop);
+        }
+        ADD_INSNL(ret, line, jump, matched);
+        ADD_INSN(ret, line, putnil);
+        if (use_rest_num) {
+            ADD_INSN(ret, line, putnil);
+        }
+
+        ADD_LABEL(ret, type_error);
+        ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+        ADD_INSN1(ret, line, putobject, rb_eTypeError);
+        ADD_INSN1(ret, line, putobject, rb_fstring_lit("deconstruct must return Array"));
+        ADD_SEND(ret, line, id_core_raise, INT2FIX(2));
+        ADD_INSN(ret, line, pop);
+
+        ADD_LABEL(ret, match_failed);
+        ADD_INSN(ret, line, pop);
+        if (use_rest_num) {
+            ADD_INSN(ret, line, pop);
+        }
+        ADD_INSNL(ret, line, jump, unmatched);
+
+        break;
       }
-      case NODE_OPT_N:
-      case NODE_WHILE:
-      case NODE_UNTIL:{
-	LABEL *prev_start_label = ISEQ_COMPILE_DATA(iseq)->start_label;
-	LABEL *prev_end_label = ISEQ_COMPILE_DATA(iseq)->end_label;
-	LABEL *prev_redo_label = ISEQ_COMPILE_DATA(iseq)->redo_label;
-	int prev_loopval_popped = ISEQ_COMPILE_DATA(iseq)->loopval_popped;
+      case NODE_FNDPTN: {
+        /*
+         *   if pattern.has_constant_node?
+         *     unless pattern.constant === obj
+         *       goto match_failed
+         *     end
+         *   end
+         *   unless obj.respond_to?(:deconstruct)
+         *     goto match_failed
+         *   end
+         *   d = obj.deconstruct
+         *   unless Array === d
+         *     goto type_error
+         *   end
+         *   unless d.length >= pattern.args_num
+         *     goto match_failed
+         *   end
+         *
+         *   begin
+         *     len = d.length
+         *     limit = d.length - pattern.args_num
+         *     i = 0
+         *     while i <= limit
+         *       if pattern.args_num.times.all? {|j| pattern.args[j].match?(d[i+j]) }
+         *         if pattern.has_pre_rest_arg_id
+         *           unless pattern.pre_rest_arg.match?(d[0, i])
+         *             goto find_failed
+         *           end
+         *         end
+         *         if pattern.has_post_rest_arg_id
+         *           unless pattern.post_rest_arg.match?(d[i+pattern.args_num, len])
+         *             goto find_failed
+         *           end
+         *         end
+         *         goto find_succeeded
+         *       end
+         *       i+=1
+         *     end
+         *   find_failed:
+         *     goto match_failed
+         *   find_succeeded:
+         *   end
+         *
+         *   goto matched
+         * type_error:
+         *   FrozenCore.raise TypeError
+         * match_failed:
+         *   goto unmatched
+         */
+        struct rb_fnd_pattern_info *fpinfo = node->nd_fpinfo;
+        const NODE *args = fpinfo->args;
+        const int args_num = fpinfo->args ? rb_long2int(fpinfo->args->nd_alen) : 0;
+
+        LABEL *match_failed, *type_error, *deconstruct, *deconstructed;
+        match_failed = NEW_LABEL(line);
+        type_error = NEW_LABEL(line);
+        deconstruct = NEW_LABEL(line);
+        deconstructed = NEW_LABEL(line);
+
+        if (node->nd_pconst) {
+            ADD_INSN(ret, line, dup);
+            CHECK(COMPILE(ret, "constant", node->nd_pconst));
+            ADD_INSN1(ret, line, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_CASE));
+            ADD_INSNL(ret, line, branchunless, match_failed);
+        }
+
+        CHECK(iseq_compile_array_deconstruct(iseq, ret, node, deconstruct, deconstructed, match_failed, type_error, deconstructed_pos));
+
+        ADD_INSN(ret, line, dup);
+        ADD_SEND(ret, line, idLength, INT2FIX(0));
+        ADD_INSN1(ret, line, putobject, INT2FIX(args_num));
+        ADD_SEND(ret, line, idGE, INT2FIX(1));
+        ADD_INSNL(ret, line, branchunless, match_failed);
+
+        {
+            LABEL *while_begin = NEW_LABEL(nd_line(node));
+            LABEL *next_loop = NEW_LABEL(nd_line(node));
+            LABEL *find_succeeded = NEW_LABEL(line);
+            LABEL *find_failed = NEW_LABEL(nd_line(node));
+            int j;
+
+            ADD_INSN(ret, line, dup); /* allocate stack for len */
+            ADD_SEND(ret, line, idLength, INT2FIX(0));
+
+            ADD_INSN(ret, line, dup); /* allocate stack for limit */
+            ADD_INSN1(ret, line, putobject, INT2FIX(args_num));
+            ADD_SEND(ret, line, idMINUS, INT2FIX(1));
+
+            ADD_INSN1(ret, line, putobject, INT2FIX(0)); /* allocate stack for i */
+
+            ADD_LABEL(ret, while_begin);
+
+            ADD_INSN(ret, line, dup);
+            ADD_INSN1(ret, line, topn, INT2FIX(2));
+            ADD_SEND(ret, line, idLE, INT2FIX(1));
+            ADD_INSNL(ret, line, branchunless, find_failed);
+
+            for (j = 0; j < args_num; j++) {
+                ADD_INSN1(ret, line, topn, INT2FIX(3));
+                ADD_INSN1(ret, line, topn, INT2FIX(1));
+                if (j != 0) {
+                    ADD_INSN1(ret, line, putobject, INT2FIX(j));
+                    ADD_SEND(ret, line, idPLUS, INT2FIX(1));
+                }
+                ADD_SEND(ret, line, idAREF, INT2FIX(1));
+
+                CHECK(iseq_compile_pattern_match(iseq, ret, args->nd_head, next_loop, in_alt_pattern, FALSE));
+                args = args->nd_next;
+            }
+
+            if (NODE_NAMED_REST_P(fpinfo->pre_rest_arg)) {
+                ADD_INSN1(ret, line, topn, INT2FIX(3));
+                ADD_INSN1(ret, line, putobject, INT2FIX(0));
+                ADD_INSN1(ret, line, topn, INT2FIX(2));
+                ADD_SEND(ret, line, idAREF, INT2FIX(2));
+                CHECK(iseq_compile_pattern_match(iseq, ret, fpinfo->pre_rest_arg, find_failed, in_alt_pattern, FALSE));
+            }
+            if (NODE_NAMED_REST_P(fpinfo->post_rest_arg)) {
+                ADD_INSN1(ret, line, topn, INT2FIX(3));
+                ADD_INSN1(ret, line, topn, INT2FIX(1));
+                ADD_INSN1(ret, line, putobject, INT2FIX(args_num));
+                ADD_SEND(ret, line, idPLUS, INT2FIX(1));
+                ADD_INSN1(ret, line, topn, INT2FIX(3));
+                ADD_SEND(ret, line, idAREF, INT2FIX(2));
+                CHECK(iseq_compile_pattern_match(iseq, ret, fpinfo->post_rest_arg, find_failed, in_alt_pattern, FALSE));
+            }
+            ADD_INSNL(ret, line, jump, find_succeeded);
+
+            ADD_LABEL(ret, next_loop);
+            ADD_INSN1(ret, line, putobject, INT2FIX(1));
+            ADD_SEND(ret, line, idPLUS, INT2FIX(1));
+            ADD_INSNL(ret, line, jump, while_begin);
+
+            ADD_LABEL(ret, find_failed);
+            ADD_INSN(ret, line, pop);
+            ADD_INSN(ret, line, pop);
+            ADD_INSN(ret, line, pop);
+            ADD_INSNL(ret, line, jump, match_failed);
+            ADD_INSN1(ret, line, dupn, INT2FIX(3));
+
+            ADD_LABEL(ret, find_succeeded);
+            ADD_INSN(ret, line, pop);
+            ADD_INSN(ret, line, pop);
+            ADD_INSN(ret, line, pop);
+        }
+
+        ADD_INSN(ret, line, pop);
+        ADD_INSNL(ret, line, jump, matched);
+        ADD_INSN(ret, line, putnil);
+
+        ADD_LABEL(ret, type_error);
+        ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+        ADD_INSN1(ret, line, putobject, rb_eTypeError);
+        ADD_INSN1(ret, line, putobject, rb_fstring_lit("deconstruct must return Array"));
+        ADD_SEND(ret, line, id_core_raise, INT2FIX(2));
+        ADD_INSN(ret, line, pop);
+
+        ADD_LABEL(ret, match_failed);
+        ADD_INSN(ret, line, pop);
+        ADD_INSNL(ret, line, jump, unmatched);
+
+        break;
+      }
+      case NODE_HSHPTN: {
+        /*
+         *   keys = nil
+         *   if pattern.has_kw_args_node? && !pattern.has_kw_rest_arg_node?
+         *     keys = pattern.kw_args_node.keys
+         *   end
+         *   if pattern.has_constant_node?
+         *     unless pattern.constant === obj
+         *       goto match_failed
+         *     end
+         *   end
+         *   unless obj.respond_to?(:deconstruct_keys)
+         *     goto match_failed
+         *   end
+         *   d = obj.deconstruct_keys(keys)
+         *   unless Hash === d
+         *     goto type_error
+         *   end
+         *   if pattern.has_kw_rest_arg_node?
+         *     d = d.dup
+         *   end
+         *   if pattern.has_kw_args_node?
+         *     pattern.kw_args_node.each |k,|
+         *       unless d.key?(k)
+         *         goto match_failed
+         *       end
+         *     end
+         *     pattern.kw_args_node.each |k, pat|
+         *       if pattern.has_kw_rest_arg_node?
+         *         unless pat.match?(d.delete(k))
+         *           goto match_failed
+         *         end
+         *       else
+         *         unless pat.match?(d[k])
+         *           goto match_failed
+         *         end
+         *       end
+         *     end
+         *   else
+         *     unless d.empty?
+         *       goto match_failed
+         *     end
+         *   end
+         *   if pattern.has_kw_rest_arg_node?
+         *     if pattern.no_rest_keyword?
+         *       unless d.empty?
+         *         goto match_failed
+         *       end
+         *     else
+         *       unless pattern.kw_rest_arg_node.match?(d)
+         *         goto match_failed
+         *       end
+         *     end
+         *   end
+         *   goto matched
+         * type_error:
+         *   FrozenCore.raise TypeError
+         * match_failed:
+         *   goto unmatched
+         */
+        LABEL *match_failed, *type_error;
+        VALUE keys = Qnil;
+
+        match_failed = NEW_LABEL(line);
+        type_error = NEW_LABEL(line);
+
+        if (node->nd_pkwargs && !node->nd_pkwrestarg) {
+            const NODE *kw_args = node->nd_pkwargs->nd_head;
+            keys = rb_ary_new_capa(kw_args ? kw_args->nd_alen/2 : 0);
+            while (kw_args) {
+                rb_ary_push(keys, kw_args->nd_head->nd_lit);
+                kw_args = kw_args->nd_next->nd_next;
+            }
+        }
+
+        if (node->nd_pconst) {
+            ADD_INSN(ret, line, dup);
+            CHECK(COMPILE(ret, "constant", node->nd_pconst));
+            ADD_INSN1(ret, line, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_CASE));
+            ADD_INSNL(ret, line, branchunless, match_failed);
+        }
+
+        ADD_INSN(ret, line, dup);
+        ADD_INSN1(ret, line, putobject, ID2SYM(rb_intern("deconstruct_keys")));
+        ADD_SEND(ret, line, idRespond_to, INT2FIX(1));
+        ADD_INSNL(ret, line, branchunless, match_failed);
+
+        if (NIL_P(keys)) {
+            ADD_INSN(ret, line, putnil);
+        }
+        else {
+            ADD_INSN1(ret, line, duparray, keys);
+            RB_OBJ_WRITTEN(iseq, Qundef, rb_obj_hide(keys));
+        }
+        ADD_SEND(ret, line, rb_intern("deconstruct_keys"), INT2FIX(1));
+
+        ADD_INSN(ret, line, dup);
+        ADD_INSN1(ret, line, checktype, INT2FIX(T_HASH));
+        ADD_INSNL(ret, line, branchunless, type_error);
+
+        if (node->nd_pkwrestarg) {
+            ADD_SEND(ret, line, rb_intern("dup"), INT2FIX(0));
+        }
+
+        if (node->nd_pkwargs) {
+            int i;
+            int keys_num;
+            const NODE *args;
+            args = node->nd_pkwargs->nd_head;
+            if (args) {
+                DECL_ANCHOR(match_values);
+                INIT_ANCHOR(match_values);
+                keys_num = rb_long2int(args->nd_alen) / 2;
+                for (i = 0; i < keys_num; i++) {
+                    NODE *key_node = args->nd_head;
+                    NODE *value_node = args->nd_next->nd_head;
+                    VALUE key;
+
+                    if (nd_type(key_node) != NODE_LIT) {
+                        UNKNOWN_NODE("NODE_IN", key_node, COMPILE_NG);
+                    }
+                    key = key_node->nd_lit;
+
+                    ADD_INSN(ret, line, dup);
+                    ADD_INSN1(ret, line, putobject, key);
+                    ADD_SEND(ret, line, rb_intern("key?"), INT2FIX(1));
+                    ADD_INSNL(ret, line, branchunless, match_failed);
+
+                    ADD_INSN(match_values, line, dup);
+                    ADD_INSN1(match_values, line, putobject, key);
+                    ADD_SEND(match_values, line, node->nd_pkwrestarg ? rb_intern("delete") : idAREF, INT2FIX(1));
+                    CHECK(iseq_compile_pattern_match(iseq, match_values, value_node, match_failed, in_alt_pattern, FALSE));
+                    args = args->nd_next->nd_next;
+                }
+                ADD_SEQ(ret, match_values);
+            }
+        }
+        else {
+            ADD_INSN(ret, line, dup);
+            ADD_SEND(ret, line, idEmptyP, INT2FIX(0));
+            ADD_INSNL(ret, line, branchunless, match_failed);
+        }
+
+        if (node->nd_pkwrestarg) {
+            if (node->nd_pkwrestarg == NODE_SPECIAL_NO_REST_KEYWORD) {
+                ADD_INSN(ret, line, dup);
+                ADD_SEND(ret, line, idEmptyP, INT2FIX(0));
+                ADD_INSNL(ret, line, branchunless, match_failed);
+            }
+            else {
+                ADD_INSN(ret, line, dup);
+                CHECK(iseq_compile_pattern_match(iseq, ret, node->nd_pkwrestarg, match_failed, in_alt_pattern, FALSE));
+            }
+        }
+
+        ADD_INSN(ret, line, pop);
+        ADD_INSNL(ret, line, jump, matched);
+        ADD_INSN(ret, line, putnil);
+
+        ADD_LABEL(ret, type_error);
+        ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+        ADD_INSN1(ret, line, putobject, rb_eTypeError);
+        ADD_INSN1(ret, line, putobject, rb_fstring_lit("deconstruct_keys must return Hash"));
+        ADD_SEND(ret, line, id_core_raise, INT2FIX(2));
+        ADD_INSN(ret, line, pop);
+
+        ADD_LABEL(ret, match_failed);
+        ADD_INSN(ret, line, pop);
+        ADD_INSNL(ret, line, jump, unmatched);
+        break;
+      }
+      case NODE_LIT:
+      case NODE_STR:
+      case NODE_XSTR:
+      case NODE_DSTR:
+      case NODE_DSYM:
+      case NODE_DREGX:
+      case NODE_LIST:
+      case NODE_ZLIST:
+      case NODE_LAMBDA:
+      case NODE_DOT2:
+      case NODE_DOT3:
+      case NODE_CONST:
+      case NODE_LVAR:
+      case NODE_DVAR:
+      case NODE_TRUE:
+      case NODE_FALSE:
+      case NODE_SELF:
+      case NODE_NIL:
+      case NODE_COLON2:
+      case NODE_COLON3:
+        CHECK(COMPILE(ret, "case in literal", node));
+        ADD_INSN1(ret, line, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_CASE));
+        ADD_INSNL(ret, line, branchif, matched);
+        ADD_INSNL(ret, line, jump, unmatched);
+        break;
+      case NODE_LASGN: {
+        struct rb_iseq_constant_body *const body = iseq->body;
+        ID id = node->nd_vid;
+        int idx = body->local_iseq->body->local_table_size - get_local_var_idx(iseq, id);
+
+        if (in_alt_pattern) {
+            const char *name = rb_id2name(id);
+            if (name && strlen(name) > 0 && name[0] != '_') {
+                COMPILE_ERROR(ERROR_ARGS "illegal variable in alternative pattern (%"PRIsVALUE")",
+                              rb_id2str(id));
+                return COMPILE_NG;
+            }
+        }
+
+        ADD_SETLOCAL(ret, line, idx, get_lvar_level(iseq));
+        ADD_INSNL(ret, line, jump, matched);
+        break;
+      }
+      case NODE_DASGN:
+      case NODE_DASGN_CURR: {
+        int idx, lv, ls;
+        ID id = node->nd_vid;
+
+        idx = get_dyna_var_idx(iseq, id, &lv, &ls);
+
+        if (in_alt_pattern) {
+            const char *name = rb_id2name(id);
+            if (name && strlen(name) > 0 && name[0] != '_') {
+                COMPILE_ERROR(ERROR_ARGS "illegal variable in alternative pattern (%"PRIsVALUE")",
+                              rb_id2str(id));
+                return COMPILE_NG;
+            }
+        }
+
+        if (idx < 0) {
+            COMPILE_ERROR(ERROR_ARGS "NODE_DASGN(_CURR): unknown id (%"PRIsVALUE")",
+                          rb_id2str(id));
+            return COMPILE_NG;
+        }
+        ADD_SETLOCAL(ret, line, ls - idx, lv);
+        ADD_INSNL(ret, line, jump, matched);
+        break;
+      }
+      case NODE_IF:
+      case NODE_UNLESS: {
+        LABEL *match_failed;
+        match_failed = unmatched;
+        CHECK(iseq_compile_pattern_match(iseq, ret, node->nd_body, unmatched, in_alt_pattern, deconstructed_pos));
+        CHECK(COMPILE(ret, "case in if", node->nd_cond));
+        if (nd_type(node) == NODE_IF) {
+            ADD_INSNL(ret, line, branchunless, match_failed);
+        }
+        else {
+            ADD_INSNL(ret, line, branchif, match_failed);
+        }
+        ADD_INSNL(ret, line, jump, matched);
+        break;
+      }
+      case NODE_HASH: {
+        NODE *n;
+        LABEL *match_failed;
+        match_failed = NEW_LABEL(line);
+
+        n = node->nd_head;
+        if (! (nd_type(n) == NODE_LIST && n->nd_alen == 2)) {
+            COMPILE_ERROR(ERROR_ARGS "unexpected node");
+            return COMPILE_NG;
+        }
+
+        ADD_INSN(ret, line, dup);
+        CHECK(iseq_compile_pattern_match(iseq, ret, n->nd_head, match_failed, in_alt_pattern, deconstructed_pos ? deconstructed_pos + 1 : FALSE));
+        CHECK(iseq_compile_pattern_each(iseq, ret, n->nd_next->nd_head, matched, match_failed, in_alt_pattern, FALSE));
+        ADD_INSN(ret, line, putnil);
+
+        ADD_LABEL(ret, match_failed);
+        ADD_INSN(ret, line, pop);
+        ADD_INSNL(ret, line, jump, unmatched);
+        break;
+      }
+      case NODE_OR: {
+        LABEL *match_succeeded, *fin;
+        match_succeeded = NEW_LABEL(line);
+        fin = NEW_LABEL(line);
+
+        ADD_INSN(ret, line, dup);
+        CHECK(iseq_compile_pattern_each(iseq, ret, node->nd_1st, match_succeeded, fin, TRUE, deconstructed_pos ? deconstructed_pos + 1 : FALSE));
+        ADD_LABEL(ret, match_succeeded);
+        ADD_INSN(ret, line, pop);
+        ADD_INSNL(ret, line, jump, matched);
+        ADD_INSN(ret, line, putnil);
+        ADD_LABEL(ret, fin);
+        CHECK(iseq_compile_pattern_each(iseq, ret, node->nd_2nd, matched, unmatched, TRUE, deconstructed_pos));
+        break;
+      }
+      default:
+        UNKNOWN_NODE("NODE_IN", node, COMPILE_NG);
+    }
+    return COMPILE_OK;
+}
 
-	struct iseq_compile_data_ensure_node_stack enl;
+static int
+iseq_compile_pattern_match(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, LABEL *unmatched, int in_alt_pattern, int deconstructed_pos)
+{
+    LABEL *fin = NEW_LABEL(nd_line(node));
+    CHECK(iseq_compile_pattern_each(iseq, ret, node, fin, unmatched, in_alt_pattern, deconstructed_pos));
+    ADD_LABEL(ret, fin);
+    return COMPILE_OK;
+}
 
-	LABEL *next_label = ISEQ_COMPILE_DATA(iseq)->start_label = NEW_LABEL(line);	/* next  */
-	LABEL *redo_label = ISEQ_COMPILE_DATA(iseq)->redo_label = NEW_LABEL(line);	/* redo  */
-	LABEL *break_label = ISEQ_COMPILE_DATA(iseq)->end_label = NEW_LABEL(line);	/* break */
-	LABEL *end_label = NEW_LABEL(line);
-	LABEL *adjust_label = NEW_LABEL(line);
+static int
+iseq_compile_array_deconstruct(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, LABEL *deconstruct, LABEL *deconstructed, LABEL *match_failed, LABEL *type_error, int deconstructed_pos)
+{
+    const int line = nd_line(node);
 
-	LABEL *next_catch_label = NEW_LABEL(line);
-	LABEL *tmp_label = NULL;
+    // NOTE: this optimization allows us to re-use the #deconstruct value
+    // (or its absence).
+    // `deconstructed_pos` contains the distance to the stack relative location
+    // where the value is stored.
+    if (deconstructed_pos) {
+        // If value is nil then we haven't tried to deconstruct
+        ADD_INSN1(ret, line, topn, INT2FIX(deconstructed_pos));
+        ADD_INSNL(ret, line, branchnil, deconstruct);
 
-	ISEQ_COMPILE_DATA(iseq)->loopval_popped = 0;
-	push_ensure_entry(iseq, &enl, 0, 0);
+        // If false then the value is not deconstructable
+        ADD_INSN1(ret, line, topn, INT2FIX(deconstructed_pos));
+        ADD_INSNL(ret, line, branchunless, match_failed);
 
-	if (type == NODE_OPT_N || node->nd_state == 1) {
-	    ADD_INSNL(ret, line, jump, next_label);
-	}
-	else {
-	    tmp_label = NEW_LABEL(line);
-	    ADD_INSNL(ret, line, jump, tmp_label);
-	}
-	ADD_LABEL(ret, adjust_label);
-	ADD_INSN(ret, line, putnil);
-	ADD_LABEL(ret, next_catch_label);
-	ADD_INSN(ret, line, pop);
-	ADD_INSNL(ret, line, jump, next_label);
-	if (tmp_label) ADD_LABEL(ret, tmp_label);
+        // Drop value, add deconstructed to the stack and jump
+        ADD_INSN(ret, line, pop);
+        ADD_INSN1(ret, line, topn, INT2FIX(deconstructed_pos - 1));
+        ADD_INSNL(ret, line, jump, deconstructed);
+    }
+    else {
+        ADD_INSNL(ret, line, jump, deconstruct);
+    }
 
-	ADD_LABEL(ret, redo_label);
-	COMPILE_POPED(ret, "while body", node->nd_body);
-	ADD_LABEL(ret, next_label);	/* next */
+    ADD_LABEL(ret, deconstruct);
+    ADD_INSN(ret, line, dup);
+    ADD_INSN1(ret, line, putobject, ID2SYM(rb_intern("deconstruct")));
+    ADD_SEND(ret, line, idRespond_to, INT2FIX(1));
 
-	if (type == NODE_WHILE) {
-	    compile_branch_condition(iseq, ret, node->nd_cond,
-				     redo_label, end_label);
-	}
-	else if (type == NODE_UNTIL) {
-	    /* until */
-	    compile_branch_condition(iseq, ret, node->nd_cond,
-				     end_label, redo_label);
-	}
-	else {
-	    ADD_CALL_RECEIVER(ret, line);
-	    ADD_CALL(ret, line, idGets, INT2FIX(0));
-	    ADD_INSNL(ret, line, branchif, redo_label);
-	    /* opt_n */
-	}
+    // Cache the result of respond_to? (in case it's false is stays there, if true - it's overwritten after #deconstruct)
+    if (deconstructed_pos) {
+        ADD_INSN1(ret, line, setn, INT2FIX(deconstructed_pos + 1));
+    }
 
-	ADD_LABEL(ret, end_label);
-	ADD_ADJUST_RESTORE(ret, adjust_label);
+    ADD_INSNL(ret, line, branchunless, match_failed);
 
-	if (node->nd_state == Qundef) {
-	    /* ADD_INSN(ret, line, putundef); */
-	    compile_bug(ERROR_ARGS "unsupported: putundef");
-	}
-	else {
-	    ADD_INSN(ret, line, putnil);
-	}
+    ADD_SEND(ret, line, rb_intern("deconstruct"), INT2FIX(0));
 
-	ADD_LABEL(ret, break_label);	/* break */
+    // Cache the result (if it's cacheable - currently, only top-level array patterns)
+    if (deconstructed_pos) {
+        ADD_INSN1(ret, line, setn, INT2FIX(deconstructed_pos));
+    }
 
-	if (poped) {
-	    ADD_INSN(ret, line, pop);
-	}
+    ADD_INSN(ret, line, dup);
+    ADD_INSN1(ret, line, checktype, INT2FIX(T_ARRAY));
+    ADD_INSNL(ret, line, branchunless, type_error);
+    ADD_INSNL(ret, line, jump, deconstructed);
 
-	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(iseq)->redo_label);
+    ADD_LABEL(ret, deconstructed);
 
-	ISEQ_COMPILE_DATA(iseq)->start_label = prev_start_label;
-	ISEQ_COMPILE_DATA(iseq)->end_label = prev_end_label;
-	ISEQ_COMPILE_DATA(iseq)->redo_label = prev_redo_label;
-	ISEQ_COMPILE_DATA(iseq)->loopval_popped = prev_loopval_popped;
-	ISEQ_COMPILE_DATA(iseq)->ensure_node_stack = ISEQ_COMPILE_DATA(iseq)->ensure_node_stack->prev;
-	break;
-      }
-      case NODE_FOR:
-	if (node->nd_var) {
-	    /* massign to var in "for"
-	     * args.length == 1 && Array === (tmp = args[0]) ? tmp : args
-	     */
-	    NODE *var = node->nd_var;
-	    LABEL *not_single = NEW_LABEL(nd_line(var));
-	    LABEL *not_ary = NEW_LABEL(nd_line(var));
-	    COMPILE(ret, "for var", var);
-	    ADD_INSN(ret, line, dup);
-	    ADD_CALL(ret, line, idLength, INT2FIX(0));
-	    ADD_INSN1(ret, line, putobject, INT2FIX(1));
-	    ADD_CALL(ret, line, idEq, INT2FIX(1));
-	    ADD_INSNL(ret, line, branchunless, not_single);
-	    ADD_INSN(ret, line, dup);
-	    ADD_INSN1(ret, line, putobject, INT2FIX(0));
-	    ADD_CALL(ret, line, idAREF, INT2FIX(1));
-	    ADD_INSN1(ret, line, putobject, rb_cArray);
-	    ADD_INSN1(ret, line, topn, INT2FIX(1));
-	    ADD_CALL(ret, line, idEqq, INT2FIX(1));
-	    ADD_INSNL(ret, line, branchunless, not_ary);
-	    ADD_INSN(ret, line, swap);
-	    ADD_LABEL(ret, not_ary);
-	    ADD_INSN(ret, line, pop);
-	    ADD_LABEL(ret, not_single);
-	    break;
-	}
-      case NODE_ITER:{
-	const rb_iseq_t *prevblock = ISEQ_COMPILE_DATA(iseq)->current_block;
-	LABEL *retry_label = NEW_LABEL(line);
-	LABEL *retry_end_l = NEW_LABEL(line);
+    return COMPILE_OK;
+}
 
-	ADD_LABEL(ret, retry_label);
-	if (nd_type(node) == NODE_FOR) {
-	    COMPILE(ret, "iter caller (for)", node->nd_iter);
+static int
+compile_case3(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const orig_node, int popped)
+{
+    const NODE *pattern;
+    const NODE *node = orig_node;
+    LABEL *endlabel, *elselabel;
+    DECL_ANCHOR(head);
+    DECL_ANCHOR(body_seq);
+    DECL_ANCHOR(cond_seq);
+    int line;
+    enum node_type type;
+    VALUE branches = 0;
+    int branch_id = 0;
 
-	    ISEQ_COMPILE_DATA(iseq)->current_block = NEW_CHILD_ISEQ(node->nd_body, make_name_for_block(iseq),
-							       ISEQ_TYPE_BLOCK, line);
-	    ADD_SEND_WITH_BLOCK(ret, line, idEach, INT2FIX(0), ISEQ_COMPILE_DATA(iseq)->current_block);
-	}
-	else {
-	    ISEQ_COMPILE_DATA(iseq)->current_block = NEW_CHILD_ISEQ(node->nd_body, make_name_for_block(iseq),
-							       ISEQ_TYPE_BLOCK, line);
-	    COMPILE(ret, "iter caller", node->nd_iter);
-	}
-	ADD_LABEL(ret, retry_end_l);
+    INIT_ANCHOR(head);
+    INIT_ANCHOR(body_seq);
+    INIT_ANCHOR(cond_seq);
 
-	if (poped) {
-	    ADD_INSN(ret, line, pop);
-	}
+    branches = decl_branch_base(iseq, node, "case");
 
-	ISEQ_COMPILE_DATA(iseq)->current_block = prevblock;
+    node = node->nd_body;
+    EXPECT_NODE("NODE_CASE3", node, NODE_IN, COMPILE_NG);
+    type = nd_type(node);
+    line = nd_line(node);
+
+    endlabel = NEW_LABEL(line);
+    elselabel = NEW_LABEL(line);
+
+    ADD_INSN(head, line, putnil); /* allocate stack for cached #deconstruct value */
+
+    CHECK(COMPILE(head, "case base", orig_node->nd_head));
+
+    ADD_SEQ(ret, head);	/* case VAL */
+
+    while (type == NODE_IN) {
+        LABEL *l1;
+
+        if (branch_id) {
+            ADD_INSN(body_seq, line, putnil);
+        }
+        l1 = NEW_LABEL(line);
+        ADD_LABEL(body_seq, l1);
+        ADD_INSN(body_seq, line, pop);
+        ADD_INSN(body_seq, line, pop); /* discard cached #deconstruct value */
+        add_trace_branch_coverage(
+            iseq,
+            body_seq,
+            node->nd_body ? node->nd_body : node,
+            branch_id++,
+            "in",
+            branches);
+        CHECK(COMPILE_(body_seq, "in body", node->nd_body, popped));
+        ADD_INSNL(body_seq, line, jump, endlabel);
+
+        pattern = node->nd_head;
+        if (pattern) {
+            int pat_line = nd_line(pattern);
+            LABEL *next_pat = NEW_LABEL(pat_line);
+            ADD_INSN (cond_seq, pat_line, dup);
+            // NOTE: set deconstructed_pos to the current cached value location
+            // (it's "under" the matchee value, so it's position is 2)
+            CHECK(iseq_compile_pattern_each(iseq, cond_seq, pattern, l1, next_pat, FALSE, 2));
+            ADD_LABEL(cond_seq, next_pat);
+            LABEL_UNREMOVABLE(next_pat);
+        }
+        else {
+            COMPILE_ERROR(ERROR_ARGS "unexpected node");
+            return COMPILE_NG;
+        }
+
+        node = node->nd_next;
+        if (!node) {
+            break;
+        }
+        type = nd_type(node);
+        line = nd_line(node);
+    }
+    /* else */
+    if (node) {
+        ADD_LABEL(cond_seq, elselabel);
+        ADD_INSN(cond_seq, line, pop);
+        ADD_INSN(cond_seq, line, pop); /* discard cached #deconstruct value */
+        add_trace_branch_coverage(iseq, cond_seq, node, branch_id, "else", branches);
+        CHECK(COMPILE_(cond_seq, "else", node, popped));
+        ADD_INSNL(cond_seq, line, jump, endlabel);
+        ADD_INSN(cond_seq, line, putnil);
+        if (popped) {
+            ADD_INSN(cond_seq, line, putnil);
+        }
+    }
+    else {
+        debugs("== else (implicit)\n");
+        ADD_LABEL(cond_seq, elselabel);
+        add_trace_branch_coverage(iseq, cond_seq, orig_node, branch_id, "else", branches);
+        ADD_INSN1(cond_seq, nd_line(orig_node), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+        ADD_INSN1(cond_seq, nd_line(orig_node), putobject, rb_eNoMatchingPatternError);
+        ADD_INSN1(cond_seq, nd_line(orig_node), topn, INT2FIX(2));
+        ADD_SEND(cond_seq, nd_line(orig_node), id_core_raise, INT2FIX(2));
+        ADD_INSN(cond_seq, nd_line(orig_node), pop);
+        ADD_INSN(cond_seq, nd_line(orig_node), pop);
+        ADD_INSN(cond_seq, nd_line(orig_node), pop); /* discard cached #deconstruct value */
+        if (!popped) {
+            ADD_INSN(cond_seq, nd_line(orig_node), putnil);
+        }
+        ADD_INSNL(cond_seq, nd_line(orig_node), jump, endlabel);
+        ADD_INSN(cond_seq, line, putnil);
+        if (popped) {
+            ADD_INSN(cond_seq, line, putnil);
+        }
+    }
+
+    ADD_SEQ(ret, cond_seq);
+    ADD_SEQ(ret, body_seq);
+    ADD_LABEL(ret, endlabel);
+    return COMPILE_OK;
+}
 
-	ADD_CATCH_ENTRY(CATCH_TYPE_BREAK, retry_label, retry_end_l, 0, retry_end_l);
+static int
+compile_loop(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped, const enum node_type type)
+{
+    const int line = (int)nd_line(node);
 
-	break;
-      }
-      case NODE_BREAK:{
-	unsigned long level = 0;
+    LABEL *prev_start_label = ISEQ_COMPILE_DATA(iseq)->start_label;
+    LABEL *prev_end_label = ISEQ_COMPILE_DATA(iseq)->end_label;
+    LABEL *prev_redo_label = ISEQ_COMPILE_DATA(iseq)->redo_label;
+    int prev_loopval_popped = ISEQ_COMPILE_DATA(iseq)->loopval_popped;
+    VALUE branches = Qfalse;
 
-	if (ISEQ_COMPILE_DATA(iseq)->redo_label != 0) {
-	    /* while/until */
-	    LABEL *splabel = NEW_LABEL(0);
-	    ADD_LABEL(ret, splabel);
-	    ADD_ADJUST(ret, line, ISEQ_COMPILE_DATA(iseq)->redo_label);
-	    COMPILE_(ret, "break val (while/until)", node->nd_stts, ISEQ_COMPILE_DATA(iseq)->loopval_popped);
-	    add_ensure_iseq(ret, iseq, 0);
-	    ADD_INSNL(ret, line, jump, ISEQ_COMPILE_DATA(iseq)->end_label);
-	    ADD_ADJUST_RESTORE(ret, splabel);
+    struct iseq_compile_data_ensure_node_stack enl;
 
-	    if (!poped) {
-		ADD_INSN(ret, line, putnil);
-	    }
-	}
-	else if (iseq->body->type == ISEQ_TYPE_BLOCK) {
-	  break_by_insn:
-	    /* escape from block */
-	    COMPILE(ret, "break val (block)", node->nd_stts);
-	    ADD_INSN1(ret, line, throw, INT2FIX(level | TAG_BREAK));
-	    if (poped) {
-		ADD_INSN(ret, line, pop);
-	    }
-	}
-	else if (iseq->body->type == ISEQ_TYPE_EVAL) {
-	  break_in_eval:
-	    COMPILE_ERROR(ERROR_ARGS "Can't escape from eval with break");
-	    debug_node_end();
-	    return COMPILE_NG;
-	}
-	else {
-	    const rb_iseq_t *ip = iseq->body->parent_iseq;
+    LABEL *next_label = ISEQ_COMPILE_DATA(iseq)->start_label = NEW_LABEL(line);	/* next  */
+    LABEL *redo_label = ISEQ_COMPILE_DATA(iseq)->redo_label = NEW_LABEL(line);	/* redo  */
+    LABEL *break_label = ISEQ_COMPILE_DATA(iseq)->end_label = NEW_LABEL(line);	/* break */
+    LABEL *end_label = NEW_LABEL(line);
+    LABEL *adjust_label = NEW_LABEL(line);
 
-	    while (ip) {
-		if (!ISEQ_COMPILE_DATA(ip)) {
-		    ip = 0;
-		    break;
-		}
+    LABEL *next_catch_label = NEW_LABEL(line);
+    LABEL *tmp_label = NULL;
 
-		level++;
-		if (ISEQ_COMPILE_DATA(ip)->redo_label != 0) {
-		    level = VM_THROW_NO_ESCAPE_FLAG;
-		    goto break_by_insn;
-		}
-		else if (ip->body->type == ISEQ_TYPE_BLOCK) {
-		    level <<= VM_THROW_LEVEL_SHIFT;
-		    goto break_by_insn;
-		}
-		else if (ip->body->type == ISEQ_TYPE_EVAL) {
-		    goto break_in_eval;
-		}
+    ISEQ_COMPILE_DATA(iseq)->loopval_popped = 0;
+    push_ensure_entry(iseq, &enl, NULL, NULL);
 
-		ip = ip->body->parent_iseq;
-	    }
-	    COMPILE_ERROR(ERROR_ARGS "Invalid break");
-	    debug_node_end();
-	    return COMPILE_NG;
+    if (node->nd_state == 1) {
+	ADD_INSNL(ret, line, jump, next_label);
+    }
+    else {
+	tmp_label = NEW_LABEL(line);
+	ADD_INSNL(ret, line, jump, tmp_label);
+    }
+    ADD_LABEL(ret, adjust_label);
+    ADD_INSN(ret, line, putnil);
+    ADD_LABEL(ret, next_catch_label);
+    ADD_INSN(ret, line, pop);
+    ADD_INSNL(ret, line, jump, next_label);
+    if (tmp_label) ADD_LABEL(ret, tmp_label);
+
+    ADD_LABEL(ret, redo_label);
+    branches = decl_branch_base(iseq, node, type == NODE_WHILE ? "while" : "until");
+    add_trace_branch_coverage(
+        iseq,
+	ret,
+        node->nd_body ? node->nd_body : node,
+        0,
+	"body",
+	branches);
+    CHECK(COMPILE_POPPED(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 {
+	/* until */
+	compile_branch_condition(iseq, ret, node->nd_cond,
+				 end_label, redo_label);
+    }
+
+    ADD_LABEL(ret, end_label);
+    ADD_ADJUST_RESTORE(ret, adjust_label);
+
+    if (node->nd_state == Qundef) {
+	/* ADD_INSN(ret, line, putundef); */
+	COMPILE_ERROR(ERROR_ARGS "unsupported: putundef");
+	return COMPILE_NG;
+    }
+    else {
+	ADD_INSN(ret, line, putnil);
+    }
+
+    ADD_LABEL(ret, break_label);	/* break */
+
+    if (popped) {
+	ADD_INSN(ret, line, pop);
+    }
+
+    ADD_CATCH_ENTRY(CATCH_TYPE_BREAK, redo_label, break_label, NULL,
+		    break_label);
+    ADD_CATCH_ENTRY(CATCH_TYPE_NEXT, redo_label, break_label, NULL,
+		    next_catch_label);
+    ADD_CATCH_ENTRY(CATCH_TYPE_REDO, redo_label, break_label, NULL,
+		    ISEQ_COMPILE_DATA(iseq)->redo_label);
+
+    ISEQ_COMPILE_DATA(iseq)->start_label = prev_start_label;
+    ISEQ_COMPILE_DATA(iseq)->end_label = prev_end_label;
+    ISEQ_COMPILE_DATA(iseq)->redo_label = prev_redo_label;
+    ISEQ_COMPILE_DATA(iseq)->loopval_popped = prev_loopval_popped;
+    ISEQ_COMPILE_DATA(iseq)->ensure_node_stack = ISEQ_COMPILE_DATA(iseq)->ensure_node_stack->prev;
+    return COMPILE_OK;
+}
+
+static int
+compile_iter(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped)
+{
+    const int line = nd_line(node);
+    const rb_iseq_t *prevblock = ISEQ_COMPILE_DATA(iseq)->current_block;
+    LABEL *retry_label = NEW_LABEL(line);
+    LABEL *retry_end_l = NEW_LABEL(line);
+    const rb_iseq_t *child_iseq;
+
+    ADD_LABEL(ret, retry_label);
+    if (nd_type(node) == NODE_FOR) {
+	CHECK(COMPILE(ret, "iter caller (for)", node->nd_iter));
+
+	ISEQ_COMPILE_DATA(iseq)->current_block = child_iseq =
+	    NEW_CHILD_ISEQ(node->nd_body, make_name_for_block(iseq),
+			   ISEQ_TYPE_BLOCK, line);
+	ADD_SEND_WITH_BLOCK(ret, line, idEach, INT2FIX(0), child_iseq);
+    }
+    else {
+	ISEQ_COMPILE_DATA(iseq)->current_block = child_iseq =
+	    NEW_CHILD_ISEQ(node->nd_body, make_name_for_block(iseq),
+			   ISEQ_TYPE_BLOCK, line);
+	CHECK(COMPILE(ret, "iter caller", node->nd_iter));
+    }
+    ADD_LABEL(ret, retry_end_l);
+
+    if (popped) {
+	ADD_INSN(ret, line, pop);
+    }
+
+    ISEQ_COMPILE_DATA(iseq)->current_block = prevblock;
+
+    ADD_CATCH_ENTRY(CATCH_TYPE_BREAK, retry_label, retry_end_l, child_iseq, retry_end_l);
+    return COMPILE_OK;
+}
+
+static int
+compile_for_masgn(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped)
+{
+    /* massign to var in "for"
+     * (args.length == 1 && Array.try_convert(args[0])) || args
+     */
+    const int line = nd_line(node);
+    const NODE *var = node->nd_var;
+    LABEL *not_single = NEW_LABEL(nd_line(var));
+    LABEL *not_ary = NEW_LABEL(nd_line(var));
+    CHECK(COMPILE(ret, "for var", var));
+    ADD_INSN(ret, line, dup);
+    ADD_CALL(ret, line, idLength, INT2FIX(0));
+    ADD_INSN1(ret, line, putobject, INT2FIX(1));
+    ADD_CALL(ret, line, idEq, INT2FIX(1));
+    ADD_INSNL(ret, line, branchunless, not_single);
+    ADD_INSN(ret, line, dup);
+    ADD_INSN1(ret, line, putobject, INT2FIX(0));
+    ADD_CALL(ret, line, idAREF, INT2FIX(1));
+    ADD_INSN1(ret, line, putobject, rb_cArray);
+    ADD_INSN(ret, line, swap);
+    ADD_CALL(ret, line, rb_intern("try_convert"), INT2FIX(1));
+    ADD_INSN(ret, line, dup);
+    ADD_INSNL(ret, line, branchunless, not_ary);
+    ADD_INSN(ret, line, swap);
+    ADD_LABEL(ret, not_ary);
+    ADD_INSN(ret, line, pop);
+    ADD_LABEL(ret, not_single);
+    return COMPILE_OK;
+}
+
+static int
+compile_break(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped)
+{
+    const int line = nd_line(node);
+    unsigned long throw_flag = 0;
+
+    if (ISEQ_COMPILE_DATA(iseq)->redo_label != 0) {
+	/* while/until */
+	LABEL *splabel = NEW_LABEL(0);
+	ADD_LABEL(ret, splabel);
+	ADD_ADJUST(ret, line, ISEQ_COMPILE_DATA(iseq)->redo_label);
+	CHECK(COMPILE_(ret, "break val (while/until)", node->nd_stts,
+		       ISEQ_COMPILE_DATA(iseq)->loopval_popped));
+	add_ensure_iseq(ret, iseq, 0);
+	ADD_INSNL(ret, line, jump, ISEQ_COMPILE_DATA(iseq)->end_label);
+	ADD_ADJUST_RESTORE(ret, splabel);
+
+	if (!popped) {
+	    ADD_INSN(ret, line, putnil);
 	}
-	break;
-      }
-      case NODE_NEXT:{
-	unsigned long level = 0;
+    }
+    else {
+        const rb_iseq_t *ip = iseq;
 
-	if (ISEQ_COMPILE_DATA(iseq)->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, 0);
-	    ADD_ADJUST(ret, line, ISEQ_COMPILE_DATA(iseq)->redo_label);
-	    ADD_INSNL(ret, line, jump, ISEQ_COMPILE_DATA(iseq)->start_label);
-	    ADD_ADJUST_RESTORE(ret, splabel);
-	    if (!poped) {
-		ADD_INSN(ret, line, putnil);
+	while (ip) {
+	    if (!ISEQ_COMPILE_DATA(ip)) {
+		ip = 0;
+		break;
 	    }
-	}
-	else if (ISEQ_COMPILE_DATA(iseq)->end_label) {
-	    LABEL *splabel = NEW_LABEL(0);
-	    debugs("next in block\n");
-	    ADD_LABEL(ret, splabel);
-	    ADD_ADJUST(ret, line, ISEQ_COMPILE_DATA(iseq)->start_label);
-	    COMPILE(ret, "next val", node->nd_stts);
-	    add_ensure_iseq(ret, iseq, 0);
-	    ADD_INSNL(ret, line, jump, ISEQ_COMPILE_DATA(iseq)->end_label);
-	    ADD_ADJUST_RESTORE(ret, splabel);
 
-	    if (!poped) {
-		ADD_INSN(ret, line, putnil);
+	    if (ISEQ_COMPILE_DATA(ip)->redo_label != 0) {
+                throw_flag = VM_THROW_NO_ESCAPE_FLAG;
 	    }
+	    else if (ip->body->type == ISEQ_TYPE_BLOCK) {
+                throw_flag = 0;
+	    }
+	    else if (ip->body->type == ISEQ_TYPE_EVAL) {
+                COMPILE_ERROR(ERROR_ARGS "Can't escape from eval with break");
+                return COMPILE_NG;
+	    }
+            else {
+                ip = ip->body->parent_iseq;
+                continue;
+            }
+
+            /* escape from block */
+            CHECK(COMPILE(ret, "break val (block)", node->nd_stts));
+            ADD_INSN1(ret, line, throw, INT2FIX(throw_flag | TAG_BREAK));
+            if (popped) {
+                ADD_INSN(ret, line, pop);
+            }
+            return COMPILE_OK;
 	}
-	else if (iseq->body->type == ISEQ_TYPE_EVAL) {
-	  next_in_eval:
-	    COMPILE_ERROR(ERROR_ARGS "Can't escape from eval with next");
-	}
-	else {
-	    const rb_iseq_t *ip = iseq;
+	COMPILE_ERROR(ERROR_ARGS "Invalid break");
+	return COMPILE_NG;
+    }
+    return COMPILE_OK;
+}
 
-	    while (ip) {
-		if (!ISEQ_COMPILE_DATA(ip)) {
-		    ip = 0;
-		    break;
-		}
+static int
+compile_next(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped)
+{
+    const int line = nd_line(node);
+    unsigned long throw_flag = 0;
+
+    if (ISEQ_COMPILE_DATA(iseq)->redo_label != 0) {
+	LABEL *splabel = NEW_LABEL(0);
+	debugs("next in while loop\n");
+	ADD_LABEL(ret, splabel);
+	CHECK(COMPILE(ret, "next val/valid syntax?", node->nd_stts));
+	add_ensure_iseq(ret, iseq, 0);
+	ADD_ADJUST(ret, line, ISEQ_COMPILE_DATA(iseq)->redo_label);
+	ADD_INSNL(ret, line, jump, ISEQ_COMPILE_DATA(iseq)->start_label);
+	ADD_ADJUST_RESTORE(ret, splabel);
+	if (!popped) {
+	    ADD_INSN(ret, line, putnil);
+	}
+    }
+    else if (ISEQ_COMPILE_DATA(iseq)->end_label) {
+	LABEL *splabel = NEW_LABEL(0);
+	debugs("next in block\n");
+	ADD_LABEL(ret, splabel);
+	ADD_ADJUST(ret, line, ISEQ_COMPILE_DATA(iseq)->start_label);
+	CHECK(COMPILE(ret, "next val", node->nd_stts));
+	add_ensure_iseq(ret, iseq, 0);
+	ADD_INSNL(ret, line, jump, ISEQ_COMPILE_DATA(iseq)->end_label);
+	ADD_ADJUST_RESTORE(ret, splabel);
+	splabel->unremovable = FALSE;
 
-		level = VM_THROW_NO_ESCAPE_FLAG;
-		if (ISEQ_COMPILE_DATA(ip)->redo_label != 0) {
-		    /* while loop */
-		    break;
-		}
-		else if (ip->body->type == ISEQ_TYPE_BLOCK) {
-		    break;
-		}
-		else if (ip->body->type == ISEQ_TYPE_EVAL) {
-		    goto next_in_eval;
-		}
+	if (!popped) {
+	    ADD_INSN(ret, line, putnil);
+	}
+    }
+    else {
+	const rb_iseq_t *ip = iseq;
 
-		ip = ip->body->parent_iseq;
+	while (ip) {
+	    if (!ISEQ_COMPILE_DATA(ip)) {
+		ip = 0;
+		break;
 	    }
-	    if (ip != 0) {
-		COMPILE(ret, "next val", node->nd_stts);
-		ADD_INSN1(ret, line, throw, INT2FIX(level | TAG_NEXT));
 
-		if (poped) {
-		    ADD_INSN(ret, line, pop);
-		}
+            throw_flag = VM_THROW_NO_ESCAPE_FLAG;
+	    if (ISEQ_COMPILE_DATA(ip)->redo_label != 0) {
+		/* while loop */
+		break;
 	    }
-	    else {
-		COMPILE_ERROR(ERROR_ARGS "Invalid next");
+	    else if (ip->body->type == ISEQ_TYPE_BLOCK) {
+		break;
 	    }
-	}
-	break;
-      }
-      case NODE_REDO:{
-	if (ISEQ_COMPILE_DATA(iseq)->redo_label) {
-	    LABEL *splabel = NEW_LABEL(0);
-	    debugs("redo in while");
-	    ADD_LABEL(ret, splabel);
-	    ADD_ADJUST(ret, line, ISEQ_COMPILE_DATA(iseq)->redo_label);
-	    add_ensure_iseq(ret, iseq, 0);
-	    ADD_INSNL(ret, line, jump, ISEQ_COMPILE_DATA(iseq)->redo_label);
-	    ADD_ADJUST_RESTORE(ret, splabel);
-	    if (!poped) {
-		ADD_INSN(ret, line, putnil);
+	    else if (ip->body->type == ISEQ_TYPE_EVAL) {
+                COMPILE_ERROR(ERROR_ARGS "Can't escape from eval with next");
+                return COMPILE_NG;
 	    }
-	}
-	else if (iseq->body->type == ISEQ_TYPE_EVAL) {
-	  redo_in_eval:
-	    COMPILE_ERROR(ERROR_ARGS "Can't escape from eval with redo");
-	}
-	else if (ISEQ_COMPILE_DATA(iseq)->start_label) {
-	    LABEL *splabel = NEW_LABEL(0);
 
-	    debugs("redo in block");
-	    ADD_LABEL(ret, splabel);
-	    add_ensure_iseq(ret, iseq, 0);
-	    ADD_ADJUST(ret, line, ISEQ_COMPILE_DATA(iseq)->start_label);
-	    ADD_INSNL(ret, line, jump, ISEQ_COMPILE_DATA(iseq)->start_label);
-	    ADD_ADJUST_RESTORE(ret, splabel);
+	    ip = ip->body->parent_iseq;
+	}
+	if (ip != 0) {
+	    CHECK(COMPILE(ret, "next val", node->nd_stts));
+            ADD_INSN1(ret, line, throw, INT2FIX(throw_flag | TAG_NEXT));
 
-	    if (!poped) {
-		ADD_INSN(ret, line, putnil);
+	    if (popped) {
+		ADD_INSN(ret, line, pop);
 	    }
 	}
 	else {
-	    const rb_iseq_t *ip = iseq;
-	    const unsigned long level = VM_THROW_NO_ESCAPE_FLAG;
+	    COMPILE_ERROR(ERROR_ARGS "Invalid next");
+	    return COMPILE_NG;
+	}
+    }
+    return COMPILE_OK;
+}
 
-	    while (ip) {
-		if (!ISEQ_COMPILE_DATA(ip)) {
-		    ip = 0;
-		    break;
-		}
+static int
+compile_redo(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped)
+{
+    const int line = nd_line(node);
+
+    if (ISEQ_COMPILE_DATA(iseq)->redo_label) {
+	LABEL *splabel = NEW_LABEL(0);
+	debugs("redo in while");
+	ADD_LABEL(ret, splabel);
+	ADD_ADJUST(ret, line, ISEQ_COMPILE_DATA(iseq)->redo_label);
+	add_ensure_iseq(ret, iseq, 0);
+	ADD_INSNL(ret, line, jump, ISEQ_COMPILE_DATA(iseq)->redo_label);
+	ADD_ADJUST_RESTORE(ret, splabel);
+	if (!popped) {
+	    ADD_INSN(ret, line, putnil);
+	}
+    }
+    else if (iseq->body->type != ISEQ_TYPE_EVAL && ISEQ_COMPILE_DATA(iseq)->start_label) {
+	LABEL *splabel = NEW_LABEL(0);
 
-		if (ISEQ_COMPILE_DATA(ip)->redo_label != 0) {
-		    break;
-		}
-		else if (ip->body->type == ISEQ_TYPE_BLOCK) {
-		    break;
-		}
-		else if (ip->body->type == ISEQ_TYPE_EVAL) {
-		    goto redo_in_eval;
-		}
+	debugs("redo in block");
+	ADD_LABEL(ret, splabel);
+	add_ensure_iseq(ret, iseq, 0);
+	ADD_ADJUST(ret, line, ISEQ_COMPILE_DATA(iseq)->start_label);
+	ADD_INSNL(ret, line, jump, ISEQ_COMPILE_DATA(iseq)->start_label);
+	ADD_ADJUST_RESTORE(ret, splabel);
 
-		ip = ip->body->parent_iseq;
+	if (!popped) {
+	    ADD_INSN(ret, line, putnil);
+	}
+    }
+    else {
+	const rb_iseq_t *ip = iseq;
+
+	while (ip) {
+	    if (!ISEQ_COMPILE_DATA(ip)) {
+		ip = 0;
+		break;
 	    }
-	    if (ip != 0) {
-		ADD_INSN(ret, line, putnil);
-		ADD_INSN1(ret, line, throw, INT2FIX(level | TAG_REDO));
 
-		if (poped) {
-		    ADD_INSN(ret, line, pop);
-		}
+	    if (ISEQ_COMPILE_DATA(ip)->redo_label != 0) {
+		break;
 	    }
-	    else {
-		COMPILE_ERROR(ERROR_ARGS "Invalid redo");
+	    else if (ip->body->type == ISEQ_TYPE_BLOCK) {
+		break;
+	    }
+	    else if (ip->body->type == ISEQ_TYPE_EVAL) {
+                COMPILE_ERROR(ERROR_ARGS "Can't escape from eval with redo");
+                return COMPILE_NG;
 	    }
+
+	    ip = ip->body->parent_iseq;
 	}
-	break;
-      }
-      case NODE_RETRY:{
-	if (iseq->body->type == ISEQ_TYPE_RESCUE) {
+	if (ip != 0) {
 	    ADD_INSN(ret, line, putnil);
-	    ADD_INSN1(ret, line, throw, INT2FIX(TAG_RETRY));
+            ADD_INSN1(ret, line, throw, INT2FIX(VM_THROW_NO_ESCAPE_FLAG | TAG_REDO));
 
-	    if (poped) {
+	    if (popped) {
 		ADD_INSN(ret, line, pop);
 	    }
 	}
 	else {
-	    COMPILE_ERROR(ERROR_ARGS "Invalid retry");
+	    COMPILE_ERROR(ERROR_ARGS "Invalid redo");
+	    return COMPILE_NG;
 	}
-	break;
-      }
-      case NODE_BEGIN:{
-	COMPILE_(ret, "NODE_BEGIN", node->nd_body, poped);
-	break;
-      }
-      case NODE_RESCUE:{
-	LABEL *lstart = NEW_LABEL(line);
-	LABEL *lend = NEW_LABEL(line);
-	LABEL *lcont = NEW_LABEL(line);
-	const rb_iseq_t *rescue = NEW_CHILD_ISEQ(node->nd_resq,
-						 rb_str_concat(rb_str_new2("rescue in "), iseq->body->location.label),
-						 ISEQ_TYPE_RESCUE, line);
+    }
+    return COMPILE_OK;
+}
 
-	lstart->rescued = LABEL_RESCUE_BEG;
-	lend->rescued = LABEL_RESCUE_END;
-	ADD_LABEL(ret, lstart);
-	COMPILE(ret, "rescue head", node->nd_head);
-	ADD_LABEL(ret, lend);
-	if (node->nd_else) {
-	    ADD_INSN(ret, line, pop);
-	    COMPILE(ret, "rescue else", node->nd_else);
-	}
-	ADD_INSN(ret, line, nop);
-	ADD_LABEL(ret, lcont);
+static int
+compile_retry(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped)
+{
+    const int line = nd_line(node);
+
+    if (iseq->body->type == ISEQ_TYPE_RESCUE) {
+	ADD_INSN(ret, line, putnil);
+	ADD_INSN1(ret, line, throw, INT2FIX(TAG_RETRY));
 
-	if (poped) {
+	if (popped) {
 	    ADD_INSN(ret, line, pop);
 	}
+    }
+    else {
+	COMPILE_ERROR(ERROR_ARGS "Invalid retry");
+	return COMPILE_NG;
+    }
+    return COMPILE_OK;
+}
 
-	/* register 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(line);
-	    label_hit = NEW_LABEL(line);
-
-	    narg = resq->nd_args;
-	    if (narg) {
-		switch (nd_type(narg)) {
-		  case NODE_ARRAY:
-		    while (narg) {
-			ADD_INSN2(ret, line, getlocal, INT2FIX(2), INT2FIX(0));
-			COMPILE(ret, "rescue arg", narg->nd_head);
-			ADD_INSN1(ret, line, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_RESCUE));
-			ADD_INSNL(ret, line, branchif, label_hit);
-			narg = narg->nd_next;
-		    }
-		    break;
-		  case NODE_SPLAT:
-		  case NODE_ARGSCAT:
-		  case NODE_ARGSPUSH:
-		    ADD_INSN2(ret, line, getlocal, INT2FIX(2), INT2FIX(0));
-		    COMPILE(ret, "rescue/cond splat", narg);
-		    ADD_INSN1(ret, line, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_RESCUE | VM_CHECKMATCH_ARRAY));
+static int
+compile_rescue(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped)
+{
+    const int line = nd_line(node);
+    LABEL *lstart = NEW_LABEL(line);
+    LABEL *lend = NEW_LABEL(line);
+    LABEL *lcont = NEW_LABEL(line);
+    const rb_iseq_t *rescue = NEW_CHILD_ISEQ(node->nd_resq,
+					     rb_str_concat(rb_str_new2("rescue in "), iseq->body->location.label),
+					     ISEQ_TYPE_RESCUE, line);
+
+    lstart->rescued = LABEL_RESCUE_BEG;
+    lend->rescued = LABEL_RESCUE_END;
+    ADD_LABEL(ret, lstart);
+    CHECK(COMPILE(ret, "rescue head", node->nd_head));
+    ADD_LABEL(ret, lend);
+    if (node->nd_else) {
+	ADD_INSN(ret, line, pop);
+	CHECK(COMPILE(ret, "rescue else", node->nd_else));
+    }
+    ADD_INSN(ret, line, nop);
+    ADD_LABEL(ret, lcont);
+
+    if (popped) {
+	ADD_INSN(ret, line, pop);
+    }
+
+    /* register catch entry */
+    ADD_CATCH_ENTRY(CATCH_TYPE_RESCUE, lstart, lend, rescue, lcont);
+    ADD_CATCH_ENTRY(CATCH_TYPE_RETRY, lend, lcont, NULL, lstart);
+    return COMPILE_OK;
+}
+
+static int
+compile_resbody(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped)
+{
+    const int line = nd_line(node);
+    const NODE *resq = node;
+    const NODE *narg;
+    LABEL *label_miss, *label_hit;
+
+    while (resq) {
+	label_miss = NEW_LABEL(line);
+	label_hit = NEW_LABEL(line);
+
+	narg = resq->nd_args;
+	if (narg) {
+	    switch (nd_type(narg)) {
+	      case NODE_LIST:
+		while (narg) {
+		    ADD_GETLOCAL(ret, line, LVAR_ERRINFO, 0);
+		    CHECK(COMPILE(ret, "rescue arg", narg->nd_head));
+		    ADD_INSN1(ret, line, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_RESCUE));
 		    ADD_INSNL(ret, line, branchif, label_hit);
-		    break;
-		  default:
-		    UNKNOWN_NODE("NODE_RESBODY", narg);
+		    narg = narg->nd_next;
 		}
-	    }
-	    else {
-		ADD_INSN2(ret, line, getlocal, INT2FIX(2), INT2FIX(0));
-		ADD_INSN1(ret, line, putobject, rb_eStandardError);
-		ADD_INSN1(ret, line, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_RESCUE));
+		break;
+	      case NODE_SPLAT:
+	      case NODE_ARGSCAT:
+	      case NODE_ARGSPUSH:
+		ADD_GETLOCAL(ret, line, LVAR_ERRINFO, 0);
+		CHECK(COMPILE(ret, "rescue/cond splat", narg));
+		ADD_INSN1(ret, line, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_RESCUE | VM_CHECKMATCH_ARRAY));
 		ADD_INSNL(ret, line, branchif, label_hit);
+		break;
+	      default:
+		UNKNOWN_NODE("NODE_RESBODY", narg, COMPILE_NG);
 	    }
-	    ADD_INSNL(ret, line, jump, label_miss);
-	    ADD_LABEL(ret, label_hit);
-	    COMPILE(ret, "resbody body", resq->nd_body);
-	    if (ISEQ_COMPILE_DATA(iseq)->option->tailcall_optimization) {
-		ADD_INSN(ret, line, nop);
+	}
+	else {
+	    ADD_GETLOCAL(ret, line, LVAR_ERRINFO, 0);
+	    ADD_INSN1(ret, line, putobject, rb_eStandardError);
+	    ADD_INSN1(ret, line, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_RESCUE));
+	    ADD_INSNL(ret, line, branchif, label_hit);
+	}
+	ADD_INSNL(ret, line, jump, label_miss);
+	ADD_LABEL(ret, label_hit);
+	CHECK(COMPILE(ret, "resbody body", resq->nd_body));
+	if (ISEQ_COMPILE_DATA(iseq)->option->tailcall_optimization) {
+	    ADD_INSN(ret, line, nop);
+	}
+	ADD_INSN(ret, line, leave);
+	ADD_LABEL(ret, label_miss);
+	resq = resq->nd_head;
+    }
+    return COMPILE_OK;
+}
+
+static int
+compile_ensure(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped)
+{
+    const int line = nd_line(node);
+    DECL_ANCHOR(ensr);
+    const rb_iseq_t *ensure = NEW_CHILD_ISEQ(node->nd_ensr,
+					     rb_str_concat(rb_str_new2 ("ensure in "), iseq->body->location.label),
+					     ISEQ_TYPE_ENSURE, line);
+    LABEL *lstart = NEW_LABEL(line);
+    LABEL *lend = NEW_LABEL(line);
+    LABEL *lcont = NEW_LABEL(line);
+    LINK_ELEMENT *last;
+    int last_leave = 0;
+    struct ensure_range er;
+    struct iseq_compile_data_ensure_node_stack enl;
+    struct ensure_range *erange;
+
+    INIT_ANCHOR(ensr);
+    CHECK(COMPILE_POPPED(ensr, "ensure ensr", node->nd_ensr));
+    last = ensr->last;
+    last_leave = last && IS_INSN(last) && IS_INSN_ID(last, leave);
+
+    er.begin = lstart;
+    er.end = lend;
+    er.next = 0;
+    push_ensure_entry(iseq, &enl, &er, node->nd_ensr);
+
+    ADD_LABEL(ret, lstart);
+    CHECK(COMPILE_(ret, "ensure head", node->nd_head, (popped | last_leave)));
+    ADD_LABEL(ret, lend);
+    ADD_SEQ(ret, ensr);
+    if (!popped && last_leave) ADD_INSN(ret, line, putnil);
+    ADD_LABEL(ret, lcont);
+    if (last_leave) ADD_INSN(ret, line, pop);
+
+    erange = ISEQ_COMPILE_DATA(iseq)->ensure_node_stack->erange;
+    if (lstart->link.next != &lend->link) {
+	while (erange) {
+	    ADD_CATCH_ENTRY(CATCH_TYPE_ENSURE, erange->begin, erange->end,
+			    ensure, lcont);
+	    erange = erange->next;
+	}
+    }
+
+    ISEQ_COMPILE_DATA(iseq)->ensure_node_stack = enl.prev;
+    return COMPILE_OK;
+}
+
+static int
+compile_return(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped)
+{
+    const int line = nd_line(node);
+
+    if (iseq) {
+	enum iseq_type type = iseq->body->type;
+	const rb_iseq_t *is = iseq;
+	enum iseq_type t = type;
+	const NODE *retval = node->nd_stts;
+	LABEL *splabel = 0;
+
+	while (t == ISEQ_TYPE_RESCUE || t == ISEQ_TYPE_ENSURE) {
+	    if (!(is = is->body->parent_iseq)) break;
+	    t = is->body->type;
+	}
+	switch (t) {
+	  case ISEQ_TYPE_TOP:
+	  case ISEQ_TYPE_MAIN:
+            if (retval) {
+                rb_warn("argument of top-level return is ignored");
+            }
+	    if (is == iseq) {
+		/* plain top-level, leave directly */
+		type = ISEQ_TYPE_METHOD;
 	    }
-	    ADD_INSN(ret, line, leave);
-	    ADD_LABEL(ret, label_miss);
-	    resq = resq->nd_head;
+	    break;
+	  default:
+	    break;
 	}
-	break;
-      }
-      case NODE_ENSURE:{
-	DECL_ANCHOR(ensr);
-	const rb_iseq_t *ensure = NEW_CHILD_ISEQ(node->nd_ensr,
-						 rb_str_concat(rb_str_new2 ("ensure in "), iseq->body->location.label),
-						 ISEQ_TYPE_ENSURE, line);
-	LABEL *lstart = NEW_LABEL(line);
-	LABEL *lend = NEW_LABEL(line);
-	LABEL *lcont = NEW_LABEL(line);
-	struct ensure_range er;
-	struct iseq_compile_data_ensure_node_stack enl;
-	struct ensure_range *erange;
 
-	INIT_ANCHOR(ensr);
-	COMPILE_POPED(ensr, "ensure ensr", node->nd_ensr);
+	if (type == ISEQ_TYPE_METHOD) {
+	    splabel = NEW_LABEL(0);
+	    ADD_LABEL(ret, splabel);
+	    ADD_ADJUST(ret, line, 0);
+	}
 
-	er.begin = lstart;
-	er.end = lend;
-	er.next = 0;
-	push_ensure_entry(iseq, &enl, &er, node->nd_ensr);
+	CHECK(COMPILE(ret, "return nd_stts (return val)", retval));
 
-	ADD_LABEL(ret, lstart);
-	COMPILE_(ret, "ensure head", node->nd_head, poped);
-	ADD_LABEL(ret, lend);
-	if (ensr->anchor.next == 0) {
-	    ADD_INSN(ret, line, nop);
+	if (type == ISEQ_TYPE_METHOD) {
+	    add_ensure_iseq(ret, iseq, 1);
+	    ADD_TRACE(ret, RUBY_EVENT_RETURN);
+	    ADD_INSN(ret, line, leave);
+	    ADD_ADJUST_RESTORE(ret, splabel);
+
+	    if (!popped) {
+		ADD_INSN(ret, line, putnil);
+	    }
 	}
 	else {
-	    ADD_SEQ(ret, ensr);
+	    ADD_INSN1(ret, line, throw, INT2FIX(TAG_RETURN));
+	    if (popped) {
+		ADD_INSN(ret, line, pop);
+	    }
 	}
-	ADD_LABEL(ret, lcont);
+    }
+    return COMPILE_OK;
+}
 
-	erange = ISEQ_COMPILE_DATA(iseq)->ensure_node_stack->erange;
-	while (erange) {
-	    ADD_CATCH_ENTRY(CATCH_TYPE_ENSURE, erange->begin, erange->end,
-			    ensure, lcont);
-	    erange = erange->next;
+static int
+compile_evstr(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped)
+{
+    CHECK(COMPILE_(ret, "nd_body", node, popped));
+
+    if (!popped && !all_string_result_p(node)) {
+	const int line = nd_line(node);
+	const unsigned int flag = VM_CALL_FCALL;
+	LABEL *isstr = NEW_LABEL(line);
+	ADD_INSN(ret, line, dup);
+	ADD_INSN1(ret, line, checktype, INT2FIX(T_STRING));
+	ADD_INSNL(ret, line, branchif, isstr);
+	ADD_INSN(ret, line, dup);
+	ADD_SEND_R(ret, line, idTo_s, INT2FIX(0), NULL, INT2FIX(flag), NULL);
+	ADD_INSN(ret, line, tostring);
+	ADD_LABEL(ret, isstr);
+    }
+    return COMPILE_OK;
+}
+
+static LABEL *
+qcall_branch_start(rb_iseq_t *iseq, LINK_ANCHOR *const recv, VALUE *branches, const NODE *node, int line)
+{
+    LABEL *else_label = NEW_LABEL(line);
+    VALUE br = 0;
+
+    br = decl_branch_base(iseq, node, "&.");
+    *branches = br;
+    ADD_INSN(recv, line, dup);
+    ADD_INSNL(recv, line, branchnil, else_label);
+    add_trace_branch_coverage(iseq, recv, node, 0, "then", br);
+    return else_label;
+}
+
+static void
+qcall_branch_end(rb_iseq_t *iseq, LINK_ANCHOR *const ret, LABEL *else_label, VALUE branches, const NODE *node, int line)
+{
+    LABEL *end_label;
+    if (!else_label) return;
+    end_label = NEW_LABEL(line);
+    ADD_INSNL(ret, line, jump, end_label);
+    ADD_LABEL(ret, else_label);
+    add_trace_branch_coverage(iseq, ret, node, 1, "else", branches);
+    ADD_LABEL(ret, end_label);
+}
+
+static int
+compile_call_precheck_freeze(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int line, int popped)
+{
+    /* optimization shortcut
+     *   "literal".freeze -> opt_str_freeze("literal")
+     */
+    if (node->nd_recv && nd_type(node->nd_recv) == NODE_STR &&
+        (node->nd_mid == idFreeze || node->nd_mid == idUMinus) &&
+        node->nd_args == NULL &&
+        ISEQ_COMPILE_DATA(iseq)->current_block == NULL &&
+        ISEQ_COMPILE_DATA(iseq)->option->specialized_instruction) {
+        VALUE str = rb_fstring(node->nd_recv->nd_lit);
+        if (node->nd_mid == idUMinus) {
+            ADD_INSN2(ret, line, opt_str_uminus, str,
+                      new_callinfo(iseq, idUMinus, 0, 0, NULL, FALSE));
+        }
+        else {
+            ADD_INSN2(ret, line, opt_str_freeze, str,
+                      new_callinfo(iseq, idFreeze, 0, 0, NULL, FALSE));
+        }
+        RB_OBJ_WRITTEN(iseq, Qundef, str);
+        if (popped) {
+            ADD_INSN(ret, line, pop);
+        }
+        return TRUE;
+    }
+    /* optimization shortcut
+     *   obj["literal"] -> opt_aref_with(obj, "literal")
+     */
+    if (node->nd_mid == idAREF && !private_recv_p(node) && node->nd_args &&
+        nd_type(node->nd_args) == NODE_LIST && node->nd_args->nd_alen == 1 &&
+        nd_type(node->nd_args->nd_head) == NODE_STR &&
+        ISEQ_COMPILE_DATA(iseq)->current_block == NULL &&
+        !ISEQ_COMPILE_DATA(iseq)->option->frozen_string_literal &&
+        ISEQ_COMPILE_DATA(iseq)->option->specialized_instruction) {
+        VALUE str = rb_fstring(node->nd_args->nd_head->nd_lit);
+        CHECK(COMPILE(ret, "recv", node->nd_recv));
+        ADD_INSN2(ret, line, opt_aref_with, str,
+                  new_callinfo(iseq, idAREF, 1, 0, NULL, FALSE));
+        RB_OBJ_WRITTEN(iseq, Qundef, str);
+        if (popped) {
+            ADD_INSN(ret, line, pop);
+        }
+        return TRUE;
+    }
+    return FALSE;
+}
+
+static int
+iseq_has_builtin_function_table(const rb_iseq_t *iseq)
+{
+    return ISEQ_COMPILE_DATA(iseq)->builtin_function_table != NULL;
+}
+
+static const struct rb_builtin_function *
+iseq_builtin_function_lookup(const rb_iseq_t *iseq, const char *name)
+{
+    int i;
+    const struct rb_builtin_function *table = ISEQ_COMPILE_DATA(iseq)->builtin_function_table;
+    for (i=0; table[i].index != -1; i++) {
+        if (strcmp(table[i].name, name) == 0) {
+            return &table[i];
+        }
+    }
+    return NULL;
+}
+
+static const char *
+iseq_builtin_function_name(const enum node_type type, const NODE *recv, ID mid)
+{
+    const char *name = rb_id2name(mid);
+    static const char prefix[] = "__builtin_";
+    const size_t prefix_len = sizeof(prefix) - 1;
+
+    switch (type) {
+      case NODE_CALL:
+        if (recv) {
+            switch (nd_type(recv)) {
+              case NODE_VCALL:
+                if (recv->nd_mid == rb_intern("__builtin")) {
+                    return name;
+                }
+                break;
+              case NODE_CONST:
+                if (recv->nd_vid == rb_intern("Primitive")) {
+                    return name;
+                }
+                break;
+              default: break;
+            }
+        }
+        break;
+      case NODE_VCALL:
+      case NODE_FCALL:
+        if (UNLIKELY(strncmp(prefix, name, prefix_len) == 0)) {
+            return &name[prefix_len];
+        }
+        break;
+      default: break;
+    }
+    return NULL;
+}
+
+static int
+delegate_call_p(const rb_iseq_t *iseq, unsigned int argc, const LINK_ANCHOR *args, unsigned int *pstart_index)
+{
+
+    if (argc == 0) {
+        *pstart_index = 0;
+        return TRUE;
+    }
+    else if (argc <= iseq->body->local_table_size) {
+        unsigned int start=0;
+
+        // local_table: [p1, p2, p3, l1, l2, l3]
+        // arguments:           [p3, l1, l2]     -> 2
+        for (start = 0;
+             argc + start <= iseq->body->local_table_size;
+             start++) {
+            const LINK_ELEMENT *elem = FIRST_ELEMENT(args);
+
+            for (unsigned int i=start; i-start<argc; i++) {
+                if (elem->type == ISEQ_ELEMENT_INSN &&
+                    INSN_OF(elem) == BIN(getlocal)) {
+                    int local_index = FIX2INT(OPERAND_AT(elem, 0));
+                    int local_level = FIX2INT(OPERAND_AT(elem, 1));
+
+                    if (local_level == 0) {
+                        unsigned int index = iseq->body->local_table_size - (local_index - VM_ENV_DATA_SIZE + 1);
+                        if (0) { // for debug
+                            fprintf(stderr, "lvar:%s (%d), id:%s (%d) local_index:%d, local_size:%d\n",
+                                    rb_id2name(iseq->body->local_table[i]),     i,
+                                    rb_id2name(iseq->body->local_table[index]), index,
+                                    local_index, (int)iseq->body->local_table_size);
+                        }
+                        if (i == index) {
+                            elem = elem->next;
+                            continue; /* for */
+                        }
+                        else {
+                            goto next;
+                        }
+                    }
+                    else {
+                        goto fail; // level != 0 is unsupported
+                    }
+                }
+                else {
+                    goto fail; // insn is not a getlocal
+                }
+            }
+            goto success;
+          next:;
+        }
+      fail:
+        return FALSE;
+      success:
+        *pstart_index = start;
+        return TRUE;
+    }
+    else {
+        return FALSE;
+    }
+}
+
+static int
+compile_builtin_function_call(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int line, int popped,
+                              const rb_iseq_t *parent_block, LINK_ANCHOR *args, const char *builtin_func)
+{
+    NODE *args_node = node->nd_args;
+
+    if (parent_block != NULL) {
+        COMPILE_ERROR(iseq, line, "should not call builtins here.");
+        return COMPILE_NG;
+    }
+    else {
+# define BUILTIN_INLINE_PREFIX "_bi"
+        char inline_func[DECIMAL_SIZE_OF_BITS(sizeof(int) * CHAR_BIT) + sizeof(BUILTIN_INLINE_PREFIX)];
+        bool cconst = false;
+      retry:;
+        const struct rb_builtin_function *bf = iseq_builtin_function_lookup(iseq, builtin_func);
+
+        if (bf == NULL) {
+            if (strcmp("cstmt!", builtin_func) == 0 ||
+                strcmp("cexpr!", builtin_func) == 0) {
+                // ok
+            }
+            else if (strcmp("cconst!", builtin_func) == 0) {
+                cconst = true;
+            }
+            else if (strcmp("cinit!", builtin_func) == 0) {
+                // ignore
+                GET_VM()->builtin_inline_index++;
+                return COMPILE_OK;
+            }
+            else if (strcmp("attr!", builtin_func) == 0) {
+                // There's only "inline" attribute for now
+                iseq->body->builtin_inline_p = true;
+                return COMPILE_OK;
+            }
+            else if (1) {
+                rb_bug("can't find builtin function:%s", builtin_func);
+            }
+            else {
+                COMPILE_ERROR(ERROR_ARGS "can't find builtin function:%s", builtin_func);
+                return COMPILE_NG;
+            }
+
+            if (GET_VM()->builtin_inline_index == INT_MAX) {
+                rb_bug("builtin inline function index overflow:%s", builtin_func);
+            }
+            int inline_index = GET_VM()->builtin_inline_index++;
+            snprintf(inline_func, sizeof(inline_func), BUILTIN_INLINE_PREFIX "%d", inline_index);
+            builtin_func = inline_func;
+            args_node = NULL;
+            goto retry;
+        }
+
+        if (cconst) {
+            typedef VALUE(*builtin_func0)(void *, VALUE);
+            VALUE const_val = (*(builtin_func0)bf->func_ptr)(NULL, Qnil);
+            ADD_INSN1(ret, line, putobject, const_val);
+            return COMPILE_OK;
+        }
+
+        // fprintf(stderr, "func_name:%s -> %p\n", builtin_func, bf->func_ptr);
+
+        unsigned int flag = 0;
+        struct rb_callinfo_kwarg *keywords = NULL;
+        VALUE argc = setup_args(iseq, args, args_node, &flag, &keywords);
+
+        if (FIX2INT(argc) != bf->argc) {
+            COMPILE_ERROR(ERROR_ARGS "argc is not match for builtin function:%s (expect %d but %d)",
+                          builtin_func, bf->argc, FIX2INT(argc));
+            return COMPILE_NG;
+        }
+
+        unsigned int start_index;
+        if (delegate_call_p(iseq, FIX2INT(argc), args, &start_index)) {
+            ADD_INSN2(ret, line, opt_invokebuiltin_delegate, bf, INT2FIX(start_index));
+        }
+        else {
+            ADD_SEQ(ret, args);
+            ADD_INSN1(ret,line, invokebuiltin, bf);
+        }
+
+        if (popped) ADD_INSN(ret, line, pop);
+        return COMPILE_OK;
+    }
+}
+
+static int
+compile_call(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, const enum node_type type, int line, int popped)
+{
+    /* call:  obj.method(...)
+     * fcall: func(...)
+     * vcall: func
+     */
+    DECL_ANCHOR(recv);
+    DECL_ANCHOR(args);
+    ID mid = node->nd_mid;
+    VALUE argc;
+    unsigned int flag = 0;
+    struct rb_callinfo_kwarg *keywords = NULL;
+    const rb_iseq_t *parent_block = ISEQ_COMPILE_DATA(iseq)->current_block;
+    LABEL *else_label = NULL;
+    VALUE branches = Qfalse;
+
+    ISEQ_COMPILE_DATA(iseq)->current_block = NULL;
+
+    INIT_ANCHOR(recv);
+    INIT_ANCHOR(args);
+#if OPT_SUPPORT_JOKE
+    if (nd_type(node) == NODE_VCALL) {
+        ID id_bitblt;
+        ID id_answer;
+
+        CONST_ID(id_bitblt, "bitblt");
+        CONST_ID(id_answer, "the_answer_to_life_the_universe_and_everything");
+
+        if (mid == id_bitblt) {
+            ADD_INSN(ret, line, bitblt);
+            return COMPILE_OK;
+        }
+        else if (mid == id_answer) {
+            ADD_INSN(ret, line, answer);
+            return COMPILE_OK;
+        }
+    }
+    /* only joke */
+    {
+        ID goto_id;
+        ID label_id;
+
+        CONST_ID(goto_id, "__goto__");
+        CONST_ID(label_id, "__label__");
+
+        if (nd_type(node) == NODE_FCALL &&
+            (mid == goto_id || mid == label_id)) {
+            LABEL *label;
+            st_data_t data;
+            st_table *labels_table = ISEQ_COMPILE_DATA(iseq)->labels_table;
+            VALUE label_name;
+
+            if (!labels_table) {
+                labels_table = st_init_numtable();
+                ISEQ_COMPILE_DATA(iseq)->labels_table = labels_table;
+            }
+            if (nd_type(node->nd_args->nd_head) == NODE_LIT &&
+                SYMBOL_P(node->nd_args->nd_head->nd_lit)) {
+
+                label_name = node->nd_args->nd_head->nd_lit;
+                if (!st_lookup(labels_table, (st_data_t)label_name, &data)) {
+                    label = NEW_LABEL(line);
+                    label->position = line;
+                    st_insert(labels_table, (st_data_t)label_name, (st_data_t)label);
+                }
+                else {
+                    label = (LABEL *)data;
+                }
+            }
+            else {
+                COMPILE_ERROR(ERROR_ARGS "invalid goto/label format");
+                return COMPILE_NG;
+            }
+
+            if (mid == goto_id) {
+                ADD_INSNL(ret, line, jump, label);
+            }
+            else {
+                ADD_LABEL(ret, label);
+            }
+            return COMPILE_OK;
+        }
+    }
+#endif
+
+    const char *builtin_func;
+    if (UNLIKELY(iseq_has_builtin_function_table(iseq)) &&
+        (builtin_func = iseq_builtin_function_name(type, node->nd_recv, mid)) != NULL) {
+        return compile_builtin_function_call(iseq, ret, node, line, popped, parent_block, args, builtin_func);
+    }
+
+    /* receiver */
+    if (type == NODE_CALL || type == NODE_OPCALL || type == NODE_QCALL) {
+        int idx, level;
+
+        if (mid == idCall &&
+            nd_type(node->nd_recv) == NODE_LVAR &&
+            iseq_block_param_id_p(iseq, node->nd_recv->nd_vid, &idx, &level)) {
+            ADD_INSN2(recv, nd_line(node->nd_recv), getblockparamproxy, INT2FIX(idx + VM_ENV_DATA_SIZE - 1), INT2FIX(level));
+        }
+        else if (private_recv_p(node)) {
+            ADD_INSN(recv, nd_line(node), putself);
+            flag |= VM_CALL_FCALL;
+        }
+        else {
+            CHECK(COMPILE(recv, "recv", node->nd_recv));
+        }
+
+        if (type == NODE_QCALL) {
+            else_label = qcall_branch_start(iseq, recv, &branches, node, line);
+        }
+    }
+    else if (type == NODE_FCALL || type == NODE_VCALL) {
+        ADD_CALL_RECEIVER(recv, line);
+    }
+
+    /* args */
+    if (type != NODE_VCALL) {
+        argc = setup_args(iseq, args, node->nd_args, &flag, &keywords);
+        CHECK(!NIL_P(argc));
+    }
+    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 ((int)type) {
+      case NODE_VCALL:
+        flag |= VM_CALL_VCALL;
+        /* VCALL is funcall, so fall through */
+      case NODE_FCALL:
+        flag |= VM_CALL_FCALL;
+    }
+
+    ADD_SEND_R(ret, line, mid, argc, parent_block, INT2FIX(flag), keywords);
+
+    qcall_branch_end(iseq, ret, else_label, branches, node, line);
+    if (popped) {
+        ADD_INSN(ret, line, pop);
+    }
+    return COMPILE_OK;
+}
+
+
+static int iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int popped);
+/**
+  compile each node
+
+  self:  InstructionSequence
+  node:  Ruby compiled node
+  popped: This node will be popped
+ */
+static int
+iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, const NODE *node, int popped)
+{
+    if (node == 0) {
+        if (!popped) {
+            int lineno = ISEQ_COMPILE_DATA(iseq)->last_line;
+            if (lineno == 0) lineno = FIX2INT(rb_iseq_first_lineno(iseq));
+            debugs("node: NODE_NIL(implicit)\n");
+            ADD_INSN(ret, lineno, putnil);
+        }
+        return COMPILE_OK;
+    }
+    return iseq_compile_each0(iseq, ret, node, popped);
+}
+
+static int
+check_yield_place(const rb_iseq_t *iseq)
+{
+    switch (iseq->body->local_iseq->body->type) {
+      case ISEQ_TYPE_TOP:
+      case ISEQ_TYPE_MAIN:
+      case ISEQ_TYPE_CLASS:
+        return FALSE;
+      default:
+        return TRUE;
+    }
+}
+
+static int
+iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int popped)
+{
+    const int line = (int)nd_line(node);
+    const enum node_type type = nd_type(node);
+    struct rb_iseq_constant_body *const body = iseq->body;
+
+    if (ISEQ_COMPILE_DATA(iseq)->last_line == line) {
+	/* ignore */
+    }
+    else {
+	if (node->flags & NODE_FL_NEWLINE) {
+	    int event = RUBY_EVENT_LINE;
+	    ISEQ_COMPILE_DATA(iseq)->last_line = line;
+	    if (ISEQ_COVERAGE(iseq) && ISEQ_LINE_COVERAGE(iseq)) {
+		event |= RUBY_EVENT_COVERAGE_LINE;
+	    }
+	    ADD_TRACE(ret, event);
 	}
+    }
+
+    debug_node_start(node);
+#undef BEFORE_RETURN
+#define BEFORE_RETURN debug_node_end()
 
-	ISEQ_COMPILE_DATA(iseq)->ensure_node_stack = enl.prev;
+    switch (type) {
+      case NODE_BLOCK:{
+	while (node && nd_type(node) == NODE_BLOCK) {
+	    CHECK(COMPILE_(ret, "BLOCK body", node->nd_head,
+			   (node->nd_next ? 1 : popped)));
+	    node = node->nd_next;
+	}
+	if (node) {
+	    CHECK(COMPILE_(ret, "BLOCK next", node->nd_next, popped));
+	}
 	break;
       }
+      case NODE_IF:
+      case NODE_UNLESS:
+	CHECK(compile_if(iseq, ret, node, popped, type));
+	break;
+      case NODE_CASE:
+	CHECK(compile_case(iseq, ret, node, popped));
+	break;
+      case NODE_CASE2:
+	CHECK(compile_case2(iseq, ret, node, popped));
+	break;
+      case NODE_CASE3:
+        CHECK(compile_case3(iseq, ret, node, popped));
+        break;
+      case NODE_WHILE:
+      case NODE_UNTIL:
+	CHECK(compile_loop(iseq, ret, node, popped, type));
+	break;
+      case NODE_FOR:
+      case NODE_ITER:
+	CHECK(compile_iter(iseq, ret, node, popped));
+	break;
+      case NODE_FOR_MASGN:
+	CHECK(compile_for_masgn(iseq, ret, node, popped));
+	break;
+      case NODE_BREAK:
+	CHECK(compile_break(iseq, ret, node, popped));
+	break;
+      case NODE_NEXT:
+	CHECK(compile_next(iseq, ret, node, popped));
+	break;
+      case NODE_REDO:
+	CHECK(compile_redo(iseq, ret, node, popped));
+	break;
+      case NODE_RETRY:
+	CHECK(compile_retry(iseq, ret, node, popped));
+	break;
+      case NODE_BEGIN:{
+	CHECK(COMPILE_(ret, "NODE_BEGIN", node->nd_body, popped));
+	break;
+      }
+      case NODE_RESCUE:
+	CHECK(compile_rescue(iseq, ret, node, popped));
+	break;
+      case NODE_RESBODY:
+	CHECK(compile_resbody(iseq, ret, node, popped));
+	break;
+      case NODE_ENSURE:
+	CHECK(compile_ensure(iseq, ret, node, popped));
+	break;
 
       case NODE_AND:
       case NODE_OR:{
 	LABEL *end_label = NEW_LABEL(line);
-	COMPILE(ret, "nd_1st", node->nd_1st);
-	if (!poped) {
+	CHECK(COMPILE(ret, "nd_1st", node->nd_1st));
+	if (!popped) {
 	    ADD_INSN(ret, line, dup);
 	}
 	if (type == NODE_AND) {
@@ -4561,67 +7635,65 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	else {
 	    ADD_INSNL(ret, line, branchif, end_label);
 	}
-	if (!poped) {
+	if (!popped) {
 	    ADD_INSN(ret, line, pop);
 	}
-	COMPILE_(ret, "nd_2nd", node->nd_2nd, poped);
+	CHECK(COMPILE_(ret, "nd_2nd", node->nd_2nd, popped));
 	ADD_LABEL(ret, end_label);
 	break;
       }
 
       case NODE_MASGN:{
-	compile_massign(iseq, ret, node, poped);
+	compile_massign(iseq, ret, node, popped);
 	break;
       }
 
       case NODE_LASGN:{
 	ID id = node->nd_vid;
-	int idx = iseq->body->local_iseq->body->local_size - get_local_var_idx(iseq, id);
+	int idx = body->local_iseq->body->local_table_size - get_local_var_idx(iseq, id);
 
-	debugs("lvar: %"PRIsVALUE" idx: %d\n", rb_id2str(id), idx);
-	COMPILE(ret, "rvalue", node->nd_value);
+	debugs("lvar: %s idx: %d\n", rb_id2name(id), idx);
+	CHECK(COMPILE(ret, "rvalue", node->nd_value));
 
-	if (!poped) {
+	if (!popped) {
 	    ADD_INSN(ret, line, dup);
 	}
-	ADD_INSN2(ret, line, setlocal, INT2FIX(idx), INT2FIX(get_lvar_level(iseq)));
-
+	ADD_SETLOCAL(ret, line, idx, get_lvar_level(iseq));
 	break;
       }
       case NODE_DASGN:
       case NODE_DASGN_CURR:{
 	int idx, lv, ls;
-	COMPILE(ret, "dvalue", node->nd_value);
-	debugi("dassn id", rb_id2str(node->nd_vid) ? node->nd_vid : '*');
+	ID id = node->nd_vid;
+	CHECK(COMPILE(ret, "dvalue", node->nd_value));
+	debugi("dassn id", rb_id2str(id) ? id : '*');
 
-	if (!poped) {
+	if (!popped) {
 	    ADD_INSN(ret, line, dup);
 	}
 
-	idx = get_dyna_var_idx(iseq, node->nd_vid, &lv, &ls);
+	idx = get_dyna_var_idx(iseq, id, &lv, &ls);
 
 	if (idx < 0) {
-	    compile_bug(ERROR_ARGS "NODE_DASGN(_CURR): unknown id (%"PRIsVALUE")",
-			rb_id2str(node->nd_vid));
+	    COMPILE_ERROR(ERROR_ARGS "NODE_DASGN(_CURR): unknown id (%"PRIsVALUE")",
+			  rb_id2str(id));
+	    goto ng;
 	}
-
-	ADD_INSN2(ret, line, setlocal, INT2FIX(ls - idx), INT2FIX(lv));
+	ADD_SETLOCAL(ret, line, ls - idx, lv);
 	break;
       }
       case NODE_GASGN:{
-	COMPILE(ret, "lvalue", node->nd_value);
+	CHECK(COMPILE(ret, "lvalue", node->nd_value));
 
-	if (!poped) {
+	if (!popped) {
 	    ADD_INSN(ret, line, dup);
 	}
-	ADD_INSN1(ret, line, setglobal,
-		  ((VALUE)node->nd_entry | 1));
+	ADD_INSN1(ret, line, setglobal, ID2SYM(node->nd_entry));
 	break;
       }
-      case NODE_IASGN:
-      case NODE_IASGN2:{
-	COMPILE(ret, "lvalue", node->nd_value);
-	if (!poped) {
+      case NODE_IASGN:{
+	CHECK(COMPILE(ret, "lvalue", node->nd_value));
+	if (!popped) {
 	    ADD_INSN(ret, line, dup);
 	}
 	ADD_INSN2(ret, line, setinstancevariable,
@@ -4630,26 +7702,26 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	break;
       }
       case NODE_CDECL:{
-	COMPILE(ret, "lvalue", node->nd_value);
+        CHECK(COMPILE(ret, "lvalue", node->nd_value));
 
-	if (!poped) {
-	    ADD_INSN(ret, line, dup);
-	}
+        if (!popped) {
+            ADD_INSN(ret, line, dup);
+        }
 
 	if (node->nd_vid) {
 	    ADD_INSN1(ret, line, putspecialobject,
 		      INT2FIX(VM_SPECIAL_OBJECT_CONST_BASE));
-	    ADD_INSN1(ret, line, setconstant, ID2SYM(node->nd_vid));
+            ADD_INSN1(ret, line, setconstant, ID2SYM(node->nd_vid));
 	}
 	else {
 	    compile_cpath(ret, iseq, node->nd_else);
-	    ADD_INSN1(ret, line, setconstant, ID2SYM(node->nd_else->nd_mid));
+            ADD_INSN1(ret, line, setconstant, ID2SYM(node->nd_else->nd_mid));
 	}
 	break;
       }
       case NODE_CVASGN:{
-	COMPILE(ret, "cvasgn val", node->nd_value);
-	if (!poped) {
+	CHECK(COMPILE(ret, "cvasgn val", node->nd_value));
+	if (!popped) {
 	    ADD_INSN(ret, line, dup);
 	}
 	ADD_INSN1(ret, line, setclassvariable,
@@ -4657,10 +7729,9 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	break;
       }
       case NODE_OP_ASGN1: {
-	DECL_ANCHOR(args);
 	VALUE argc;
 	unsigned int flag = 0;
-	unsigned int asgnflag = 0;
+	int asgnflag = 0;
 	ID id = node->nd_mid;
 	int boff = 0;
 
@@ -4687,28 +7758,28 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	 *              nd_mid
 	 */
 
-	if (!poped) {
+	if (!popped) {
 	    ADD_INSN(ret, line, putnil);
 	}
 	asgnflag = COMPILE_RECV(ret, "NODE_OP_ASGN1 recv", node);
+        CHECK(asgnflag != -1);
 	switch (nd_type(node->nd_args->nd_head)) {
-	  case NODE_ZARRAY:
+	  case NODE_ZLIST:
 	    argc = INT2FIX(0);
 	    break;
 	  case NODE_BLOCK_PASS:
 	    boff = 1;
+            /* fall through */
 	  default:
-	    INIT_ANCHOR(args);
-	    argc = setup_args(iseq, args, node->nd_args->nd_head, &flag, NULL);
-	    ADD_SEQ(ret, args);
+	    argc = setup_args(iseq, ret, node->nd_args->nd_head, &flag, NULL);
+	    CHECK(!NIL_P(argc));
 	}
 	ADD_INSN1(ret, line, dupn, FIXNUM_INC(argc, 1 + boff));
+        flag |= asgnflag;
 	ADD_SEND_WITH_FLAG(ret, line, idAREF, argc, INT2FIX(flag));
-	flag |= asgnflag;
 
-	if (id == 0 || id == 1) {
-	    /* 0: or, 1: and
-	       a[x] ||= y
+	if (id == idOROP || id == idANDOP) {
+	    /* a[x] ||= y  or  a[x] &&= y
 
 	       unless/if a[x]
 	       a[x]= y
@@ -4720,18 +7791,16 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	    LABEL *lfin = NEW_LABEL(line);
 
 	    ADD_INSN(ret, line, dup);
-	    if (id == 0) {
-		/* or */
+	    if (id == idOROP) {
 		ADD_INSNL(ret, line, branchif, label);
 	    }
-	    else {
-		/* and */
+	    else { /* idANDOP */
 		ADD_INSNL(ret, line, branchunless, label);
 	    }
 	    ADD_INSN(ret, line, pop);
 
-	    COMPILE(ret, "NODE_OP_ASGN1 args->body: ", node->nd_args->nd_body);
-	    if (!poped) {
+	    CHECK(COMPILE(ret, "NODE_OP_ASGN1 args->body: ", node->nd_args->nd_body));
+	    if (!popped) {
 		ADD_INSN1(ret, line, setn, FIXNUM_INC(argc, 2+boff));
 	    }
 	    if (flag & VM_CALL_ARGS_SPLAT) {
@@ -4757,16 +7826,16 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	    ADD_INSN(ret, line, pop);
 	    ADD_INSNL(ret, line, jump, lfin);
 	    ADD_LABEL(ret, label);
-	    if (!poped) {
+	    if (!popped) {
 		ADD_INSN1(ret, line, setn, FIXNUM_INC(argc, 2+boff));
 	    }
 	    ADD_INSN1(ret, line, adjuststack, FIXNUM_INC(argc, 2+boff));
 	    ADD_LABEL(ret, lfin);
 	}
 	else {
-	    COMPILE(ret, "NODE_OP_ASGN1 args->body: ", node->nd_args->nd_body);
+	    CHECK(COMPILE(ret, "NODE_OP_ASGN1 args->body: ", node->nd_args->nd_body));
 	    ADD_SEND(ret, line, id, INT2FIX(1));
-	    if (!poped) {
+	    if (!popped) {
 		ADD_INSN1(ret, line, setn, FIXNUM_INC(argc, 2+boff));
 	    }
 	    if (flag & VM_CALL_ARGS_SPLAT) {
@@ -4797,7 +7866,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
       case NODE_OP_ASGN2:{
 	ID atype = node->nd_next->nd_mid;
 	ID vid = node->nd_next->nd_vid, aid = rb_id_attrset(vid);
-	VALUE asgnflag;
+        int asgnflag;
 	LABEL *lfin = NEW_LABEL(line);
 	LABEL *lcfin = NEW_LABEL(line);
 	LABEL *lskip = 0;
@@ -4844,24 +7913,25 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	*/
 
 	asgnflag = COMPILE_RECV(ret, "NODE_OP_ASGN2#recv", node);
+        CHECK(asgnflag != -1);
 	if (node->nd_next->nd_aid) {
 	    lskip = NEW_LABEL(line);
 	    ADD_INSN(ret, line, dup);
 	    ADD_INSNL(ret, line, branchnil, lskip);
 	}
 	ADD_INSN(ret, line, dup);
-	ADD_SEND(ret, line, vid, INT2FIX(0));
+        ADD_SEND_WITH_FLAG(ret, line, vid, INT2FIX(0), INT2FIX(asgnflag));
 
-	if (atype == 0 || atype == 1) {	/* 0: OR or 1: AND */
+	if (atype == idOROP || atype == idANDOP) {
 	    ADD_INSN(ret, line, dup);
-	    if (atype == 0) {
+	    if (atype == idOROP) {
 		ADD_INSNL(ret, line, branchif, lcfin);
 	    }
-	    else {
+	    else { /* idANDOP */
 		ADD_INSNL(ret, line, branchunless, lcfin);
 	    }
 	    ADD_INSN(ret, line, pop);
-	    COMPILE(ret, "NODE_OP_ASGN2 val", node->nd_value);
+	    CHECK(COMPILE(ret, "NODE_OP_ASGN2 val", node->nd_value));
 	    ADD_INSN(ret, line, swap);
 	    ADD_INSN1(ret, line, topn, INT2FIX(1));
 	    ADD_SEND_WITH_FLAG(ret, line, aid, INT2FIX(1), INT2FIX(asgnflag));
@@ -4875,21 +7945,24 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	    if (lskip) {
 		ADD_LABEL(ret, lskip);
 	    }
-	    if (poped) {
+	    if (popped) {
 		/* we can apply more optimize */
 		ADD_INSN(ret, line, pop);
 	    }
 	}
 	else {
-	    COMPILE(ret, "NODE_OP_ASGN2 val", node->nd_value);
+	    CHECK(COMPILE(ret, "NODE_OP_ASGN2 val", node->nd_value));
 	    ADD_SEND(ret, line, atype, INT2FIX(1));
-	    if (!poped) {
+	    if (!popped) {
 		ADD_INSN(ret, line, swap);
 		ADD_INSN1(ret, line, topn, INT2FIX(1));
 	    }
 	    ADD_SEND_WITH_FLAG(ret, line, aid, INT2FIX(1), INT2FIX(asgnflag));
+	    if (lskip && popped) {
+		ADD_LABEL(ret, lskip);
+	    }
 	    ADD_INSN(ret, line, pop);
-	    if (lskip) {
+	    if (lskip && !popped) {
 		ADD_LABEL(ret, lskip);
 	    }
 	}
@@ -4905,39 +7978,39 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	    ADD_INSN1(ret, line, putobject, rb_cObject);
 	    break;
 	  case NODE_COLON2:
-	    COMPILE(ret, "NODE_OP_CDECL/colon2#nd_head", node->nd_head->nd_head);
+	    CHECK(COMPILE(ret, "NODE_OP_CDECL/colon2#nd_head", node->nd_head->nd_head));
 	    break;
 	  default:
 	    COMPILE_ERROR(ERROR_ARGS "%s: invalid node in NODE_OP_CDECL",
 			  ruby_node_name(nd_type(node->nd_head)));
-	    debug_node_end();
-	    return COMPILE_NG;
+	    goto ng;
 	}
 	mid = node->nd_head->nd_mid;
 	/* cref */
-	if (node->nd_aid == 0) {
+	if (node->nd_aid == idOROP) {
 	    lassign = NEW_LABEL(line);
 	    ADD_INSN(ret, line, dup); /* cref cref */
-	    ADD_INSN3(ret, line, defined, INT2FIX(DEFINED_CONST),
+	    ADD_INSN3(ret, line, defined, INT2FIX(DEFINED_CONST_FROM),
 		      ID2SYM(mid), Qfalse); /* cref bool */
 	    ADD_INSNL(ret, line, branchunless, lassign); /* cref */
 	}
 	ADD_INSN(ret, line, dup); /* cref cref */
-	ADD_INSN1(ret, line, getconstant, ID2SYM(mid)); /* cref obj */
+        ADD_INSN1(ret, line, putobject, Qtrue);
+        ADD_INSN1(ret, line, getconstant, ID2SYM(mid)); /* cref obj */
 
-	if (node->nd_aid == 0 || node->nd_aid == 1) {
+	if (node->nd_aid == idOROP || node->nd_aid == idANDOP) {
 	    lfin = NEW_LABEL(line);
-	    if (!poped) ADD_INSN(ret, line, dup); /* cref [obj] obj */
-	    if (node->nd_aid == 0)
+	    if (!popped) ADD_INSN(ret, line, dup); /* cref [obj] obj */
+	    if (node->nd_aid == idOROP)
 		ADD_INSNL(ret, line, branchif, lfin);
-	    else
+	    else /* idANDOP */
 		ADD_INSNL(ret, line, branchunless, lfin);
 	    /* cref [obj] */
-	    if (!poped) ADD_INSN(ret, line, pop); /* cref */
+	    if (!popped) ADD_INSN(ret, line, pop); /* cref */
 	    if (lassign) ADD_LABEL(ret, lassign);
-	    COMPILE(ret, "NODE_OP_CDECL#nd_value", node->nd_value);
+	    CHECK(COMPILE(ret, "NODE_OP_CDECL#nd_value", node->nd_value));
 	    /* cref value */
-	    if (poped)
+	    if (popped)
 		ADD_INSN1(ret, line, topn, INT2FIX(1)); /* cref value cref */
 	    else {
 		ADD_INSN1(ret, line, dupn, INT2FIX(2)); /* cref value cref value */
@@ -4945,16 +8018,16 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	    }
 	    ADD_INSN1(ret, line, setconstant, ID2SYM(mid)); /* cref [value] */
 	    ADD_LABEL(ret, lfin);			    /* cref [value] */
-	    if (!poped) ADD_INSN(ret, line, swap); /* [value] cref */
+	    if (!popped) ADD_INSN(ret, line, swap); /* [value] cref */
 	    ADD_INSN(ret, line, pop); /* [value] */
 	}
 	else {
-	    COMPILE(ret, "NODE_OP_CDECL#nd_value", node->nd_value);
+	    CHECK(COMPILE(ret, "NODE_OP_CDECL#nd_value", node->nd_value));
 	    /* cref obj value */
 	    ADD_CALL(ret, line, node->nd_aid, INT2FIX(1));
 	    /* cref value */
 	    ADD_INSN(ret, line, swap); /* value cref */
-	    if (!poped) {
+	    if (!popped) {
 		ADD_INSN1(ret, line, topn, INT2FIX(1)); /* value cref value */
 		ADD_INSN(ret, line, swap); /* value value cref */
 	    }
@@ -4967,7 +8040,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	LABEL *lfin = NEW_LABEL(line);
 	LABEL *lassign;
 
-	if (nd_type(node) == NODE_OP_ASGN_OR) {
+	if (nd_type(node) == NODE_OP_ASGN_OR && nd_type(node->nd_head) != NODE_IVAR) {
 	    LABEL *lfinish[2];
 	    lfinish[0] = lfin;
 	    lfinish[1] = 0;
@@ -4982,7 +8055,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	    lassign = NEW_LABEL(line);
 	}
 
-	COMPILE(ret, "NODE_OP_ASGN_AND/OR#nd_head", node->nd_head);
+	CHECK(COMPILE(ret, "NODE_OP_ASGN_AND/OR#nd_head", node->nd_head));
 	ADD_INSN(ret, line, dup);
 
 	if (nd_type(node) == NODE_OP_ASGN_AND) {
@@ -4994,234 +8067,88 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 
 	ADD_INSN(ret, line, pop);
 	ADD_LABEL(ret, lassign);
-	COMPILE(ret, "NODE_OP_ASGN_AND/OR#nd_value", node->nd_value);
+	CHECK(COMPILE(ret, "NODE_OP_ASGN_AND/OR#nd_value", node->nd_value));
 	ADD_LABEL(ret, lfin);
 
-	if (poped) {
+	if (popped) {
 	    /* we can apply more optimize */
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
-      case NODE_CALL:
-	/* optimization shortcut
-	 *   "literal".freeze -> opt_str_freeze("literal")
-	 */
-	if (node->nd_recv && nd_type(node->nd_recv) == NODE_STR &&
-	    node->nd_mid == idFreeze && node->nd_args == NULL &&
-	    ISEQ_COMPILE_DATA(iseq)->current_block == NULL &&
-	    ISEQ_COMPILE_DATA(iseq)->option->specialized_instruction) {
-	    VALUE str = rb_fstring(node->nd_recv->nd_lit);
-	    iseq_add_mark_object(iseq, str);
-	    ADD_INSN1(ret, line, opt_str_freeze, str);
-	    if (poped) {
-		ADD_INSN(ret, line, pop);
-	    }
-	    break;
-	}
-	/* optimization shortcut
-	 *   obj["literal"] -> opt_aref_with(obj, "literal")
-	 */
-	if (node->nd_mid == idAREF && !private_recv_p(node) && node->nd_args &&
-	    nd_type(node->nd_args) == NODE_ARRAY && node->nd_args->nd_alen == 1 &&
-	    nd_type(node->nd_args->nd_head) == NODE_STR &&
-	    ISEQ_COMPILE_DATA(iseq)->current_block == NULL &&
-	    ISEQ_COMPILE_DATA(iseq)->option->specialized_instruction) {
-	    VALUE str = rb_fstring(node->nd_args->nd_head->nd_lit);
-	    node->nd_args->nd_head->nd_lit = str;
-	    COMPILE(ret, "recv", node->nd_recv);
-	    ADD_INSN3(ret, line, opt_aref_with,
-		      new_callinfo(iseq, idAREF, 1, 0, NULL, FALSE),
-		      NULL/* CALL_CACHE */, str);
-	    if (poped) {
-		ADD_INSN(ret, line, pop);
-	    }
-	    break;
-	}
-      case NODE_QCALL:
-      case NODE_FCALL:
-      case NODE_VCALL:{		/* VCALL: variable or call */
-	/*
-	  call:  obj.method(...)
-	  fcall: func(...)
-	  vcall: func
-	*/
-	DECL_ANCHOR(recv);
-	DECL_ANCHOR(args);
-	LABEL *lskip = 0;
-	ID mid = node->nd_mid;
-	VALUE argc;
-	unsigned int flag = 0;
-	struct rb_call_info_kw_arg *keywords = NULL;
-	const rb_iseq_t *parent_block = ISEQ_COMPILE_DATA(iseq)->current_block;
-	ISEQ_COMPILE_DATA(iseq)->current_block = NULL;
-
-	INIT_ANCHOR(recv);
-	INIT_ANCHOR(args);
-#if SUPPORT_JOKE
-	if (nd_type(node) == NODE_VCALL) {
-	    ID id_bitblt;
-	    ID id_answer;
-
-	    CONST_ID(id_bitblt, "bitblt");
-	    CONST_ID(id_answer, "the_answer_to_life_the_universe_and_everything");
-
-	    if (mid == id_bitblt) {
-		ADD_INSN(ret, line, bitblt);
-		break;
-	    }
-	    else if (mid == id_answer) {
-		ADD_INSN(ret, line, answer);
-		break;
-	    }
-	}
-	/* only joke */
-	{
-	    ID goto_id;
-	    ID label_id;
-
-	    CONST_ID(goto_id, "__goto__");
-	    CONST_ID(label_id, "__label__");
-
-	    if (nd_type(node) == NODE_FCALL &&
-		(mid == goto_id || mid == label_id)) {
-		LABEL *label;
-		st_data_t data;
-		st_table *labels_table = ISEQ_COMPILE_DATA(iseq)->labels_table;
-		ID label_name;
-
-		if (!labels_table) {
-		    labels_table = st_init_numtable();
-		    ISEQ_COMPILE_DATA(iseq)->labels_table = labels_table;
-		}
-		if (nd_type(node->nd_args->nd_head) == NODE_LIT &&
-		    SYMBOL_P(node->nd_args->nd_head->nd_lit)) {
-
-		    label_name = SYM2ID(node->nd_args->nd_head->nd_lit);
-		    if (!st_lookup(labels_table, (st_data_t)label_name, &data)) {
-			label = NEW_LABEL(line);
-			label->position = line;
-			st_insert(labels_table, (st_data_t)label_name, (st_data_t)label);
-		    }
-		    else {
-			label = (LABEL *)data;
-		    }
-		}
-		else {
-		    COMPILE_ERROR(ERROR_ARGS "invalid goto/label format");
-		}
-
-
-		if (mid == goto_id) {
-		    ADD_INSNL(ret, line, jump, label);
-		}
-		else {
-		    ADD_LABEL(ret, label);
-		}
-		break;
-	    }
-	}
-#endif
-	/* receiver */
-	if (type == NODE_CALL || type == NODE_QCALL) {
-	    COMPILE(recv, "recv", node->nd_recv);
-	    if (type == NODE_QCALL) {
-		lskip = NEW_LABEL(line);
-		ADD_INSN(recv, line, dup);
-		ADD_INSNL(recv, line, branchnil, lskip);
-	    }
-	}
-	else if (type == NODE_FCALL || type == NODE_VCALL) {
-	    ADD_CALL_RECEIVER(recv, line);
-	}
-
-	/* args */
-	if (nd_type(node) != NODE_VCALL) {
-	    argc = setup_args(iseq, args, node->nd_args, &flag, &keywords);
-	}
-	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;
-	    /* VCALL is funcall, so fall through */
-	  case NODE_FCALL:
-	    flag |= VM_CALL_FCALL;
-	}
-
-	ADD_SEND_R(ret, line, mid, argc, parent_block, INT2FIX(flag), keywords);
-
-	if (lskip) {
-	    ADD_LABEL(ret, lskip);
-	}
-	if (poped) {
-	    ADD_INSN(ret, line, pop);
-	}
-	break;
-      }
+      case NODE_CALL:   /* obj.foo */
+      case NODE_OPCALL: /* foo[] */
+        if (compile_call_precheck_freeze(iseq, ret, node, line, popped) == TRUE) {
+            break;
+        }
+      case NODE_QCALL: /* obj&.foo */
+      case NODE_FCALL: /* foo() */
+      case NODE_VCALL: /* foo (variable or call) */
+        if (compile_call(iseq, ret, node, type, line, popped) == COMPILE_NG) {
+            goto ng;
+        }
+        break;
       case NODE_SUPER:
       case NODE_ZSUPER:{
 	DECL_ANCHOR(args);
 	int argc;
 	unsigned int flag = 0;
-	struct rb_call_info_kw_arg *keywords = NULL;
+	struct rb_callinfo_kwarg *keywords = NULL;
 	const rb_iseq_t *parent_block = ISEQ_COMPILE_DATA(iseq)->current_block;
 
 	INIT_ANCHOR(args);
 	ISEQ_COMPILE_DATA(iseq)->current_block = NULL;
-	if (nd_type(node) == NODE_SUPER) {
+	if (type == NODE_SUPER) {
 	    VALUE vargc = setup_args(iseq, args, node->nd_args, &flag, &keywords);
+	    CHECK(!NIL_P(vargc));
 	    argc = FIX2INT(vargc);
 	}
 	else {
 	    /* NODE_ZSUPER */
 	    int i;
-	    const rb_iseq_t *liseq = iseq->body->local_iseq;
+	    const rb_iseq_t *liseq = body->local_iseq;
+	    const struct rb_iseq_constant_body *const local_body = liseq->body;
+	    const struct rb_iseq_param_keyword *const local_kwd = local_body->param.keyword;
 	    int lvar_level = get_lvar_level(iseq);
 
-	    argc = liseq->body->param.lead_num;
+	    argc = local_body->param.lead_num;
 
 	    /* normal arguments */
-	    for (i = 0; i < liseq->body->param.lead_num; i++) {
-		int idx = liseq->body->local_size - i;
-		ADD_INSN2(args, line, getlocal, INT2FIX(idx), INT2FIX(lvar_level));
+	    for (i = 0; i < local_body->param.lead_num; i++) {
+		int idx = local_body->local_table_size - i;
+		ADD_GETLOCAL(args, line, idx, lvar_level);
 	    }
 
-	    if (liseq->body->param.flags.has_opt) {
+	    if (local_body->param.flags.has_opt) {
 		/* optional arguments */
 		int j;
-		for (j = 0; j < liseq->body->param.opt_num; j++) {
-		    int idx = liseq->body->local_size - (i + j);
-		    ADD_INSN2(args, line, getlocal, INT2FIX(idx), INT2FIX(lvar_level));
+		for (j = 0; j < local_body->param.opt_num; j++) {
+		    int idx = local_body->local_table_size - (i + j);
+		    ADD_GETLOCAL(args, line, idx, lvar_level);
 		}
 		i += j;
 		argc = i;
 	    }
-	    if (liseq->body->param.flags.has_rest) {
+	    if (local_body->param.flags.has_rest) {
 		/* rest argument */
-		int idx = liseq->body->local_size - liseq->body->param.rest_start;
-		ADD_INSN2(args, line, getlocal, INT2FIX(idx), INT2FIX(lvar_level));
-		argc = liseq->body->param.rest_start + 1;
+		int idx = local_body->local_table_size - local_body->param.rest_start;
+
+		ADD_GETLOCAL(args, line, idx, lvar_level);
+		ADD_INSN1(args, line, splatarray, Qfalse);
+
+		argc = local_body->param.rest_start + 1;
 		flag |= VM_CALL_ARGS_SPLAT;
 	    }
-	    if (liseq->body->param.flags.has_post) {
+	    if (local_body->param.flags.has_post) {
 		/* post arguments */
-		int post_len = liseq->body->param.post_num;
-		int post_start = liseq->body->param.post_start;
+		int post_len = local_body->param.post_num;
+		int post_start = local_body->param.post_start;
 
-		if (liseq->body->param.flags.has_rest) {
+		if (local_body->param.flags.has_rest) {
 		    int j;
 		    for (j=0; j<post_len; j++) {
-			int idx = liseq->body->local_size - (post_start + j);
-			ADD_INSN2(args, line, getlocal, INT2FIX(idx), INT2FIX(lvar_level));
+			int idx = local_body->local_table_size - (post_start + j);
+			ADD_GETLOCAL(args, line, idx, lvar_level);
 		    }
 		    ADD_INSN1(args, line, newarray, INT2FIX(j));
 		    ADD_INSN (args, line, concatarray);
@@ -5230,165 +8157,111 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 		else {
 		    int j;
 		    for (j=0; j<post_len; j++) {
-			int idx = liseq->body->local_size - (post_start + j);
-			ADD_INSN2(args, line, getlocal, INT2FIX(idx), INT2FIX(lvar_level));
+			int idx = local_body->local_table_size - (post_start + j);
+			ADD_GETLOCAL(args, line, idx, lvar_level);
 		    }
 		    argc = post_len + post_start;
 		}
 	    }
 
-	    if (liseq->body->param.flags.has_kw) { /* TODO: support keywords */
-		int local_size = liseq->body->local_size;
+	    if (local_body->param.flags.has_kw) { /* TODO: support keywords */
+		int local_size = local_body->local_table_size;
 		argc++;
 
 		ADD_INSN1(args, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
 
-		if (liseq->body->param.flags.has_kwrest) {
-		    ADD_INSN2(args, line, getlocal, INT2FIX(liseq->body->local_size - liseq->body->param.keyword->rest_start), INT2FIX(lvar_level));
-		    ADD_SEND (args, line, rb_intern("dup"), INT2FIX(0));
+		if (local_body->param.flags.has_kwrest) {
+		    int idx = local_body->local_table_size - local_kwd->rest_start;
+		    ADD_GETLOCAL(args, line, idx, lvar_level);
 		}
 		else {
 		    ADD_INSN1(args, line, newhash, INT2FIX(0));
+                    flag |= VM_CALL_KW_SPLAT_MUT;
 		}
-		for (i = 0; i < liseq->body->param.keyword->num; ++i) {
-		    ID id = liseq->body->param.keyword->table[i];
+		for (i = 0; i < local_kwd->num; ++i) {
+		    ID id = local_kwd->table[i];
 		    int idx = local_size - get_local_var_idx(liseq, id);
 		    ADD_INSN1(args, line, putobject, ID2SYM(id));
-		    ADD_INSN2(args, line, getlocal, INT2FIX(idx), INT2FIX(lvar_level));
+		    ADD_GETLOCAL(args, line, idx, lvar_level);
 		}
 		ADD_SEND(args, line, id_core_hash_merge_ptr, INT2FIX(i * 2 + 1));
-		if (liseq->body->param.flags.has_rest) {
+		if (local_body->param.flags.has_rest) {
 		    ADD_INSN1(args, line, newarray, INT2FIX(1));
 		    ADD_INSN (args, line, concatarray);
 		    --argc;
 		}
+		flag |= VM_CALL_KW_SPLAT;
 	    }
-	    else if (liseq->body->param.flags.has_kwrest) {
-		ADD_INSN2(args, line, getlocal, INT2FIX(liseq->body->local_size - liseq->body->param.keyword->rest_start), INT2FIX(lvar_level));
-		ADD_SEND (args, line, rb_intern("dup"), INT2FIX(0));
-		if (liseq->body->param.flags.has_rest) {
+	    else if (local_body->param.flags.has_kwrest) {
+		int idx = local_body->local_table_size - local_kwd->rest_start;
+		ADD_GETLOCAL(args, line, idx, lvar_level);
+
+		if (local_body->param.flags.has_rest) {
 		    ADD_INSN1(args, line, newarray, INT2FIX(1));
 		    ADD_INSN (args, line, concatarray);
 		}
 		else {
 		    argc++;
 		}
+		flag |= VM_CALL_KW_SPLAT;
 	    }
 	}
 
-	/* dummy receiver */
-	ADD_INSN1(ret, line, putobject, nd_type(node) == NODE_ZSUPER ? Qfalse : Qtrue);
+	ADD_INSN(ret, line, putself);
 	ADD_SEQ(ret, args);
-	ADD_INSN3(ret, line, invokesuper,
-		  new_callinfo(iseq, 0, argc, flag | VM_CALL_SUPER | VM_CALL_FCALL, keywords, parent_block != NULL),
-		  Qnil, /* CALL_CACHE */
+        ADD_INSN2(ret, line, invokesuper,
+                  new_callinfo(iseq, 0, argc, flag | VM_CALL_SUPER | (type == NODE_ZSUPER ? VM_CALL_ZSUPER : 0) | VM_CALL_FCALL, keywords, parent_block != NULL),
 		  parent_block);
 
-	if (poped) {
+	if (popped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
-      case NODE_ARRAY:{
-	compile_array_(iseq, ret, node, COMPILE_ARRAY_TYPE_ARRAY, NULL, poped);
+      case NODE_LIST:{
+        CHECK(compile_array(iseq, ret, node, popped) >= 0);
 	break;
       }
-      case NODE_ZARRAY:{
-	if (!poped) {
+      case NODE_ZLIST:{
+	if (!popped) {
 	    ADD_INSN1(ret, line, newarray, INT2FIX(0));
 	}
 	break;
       }
       case NODE_VALUES:{
-	NODE *n = node;
+	const NODE *n = node;
+	if (popped) {
+	    COMPILE_ERROR(ERROR_ARGS "NODE_VALUES: must not be popped");
+	}
 	while (n) {
-	    COMPILE(ret, "values item", n->nd_head);
+	    CHECK(COMPILE(ret, "values item", n->nd_head));
 	    n = n->nd_next;
 	}
 	ADD_INSN1(ret, line, newarray, INT2FIX(node->nd_alen));
-	if (poped) {
-	    ADD_INSN(ret, line, pop);
-	}
-	break;
-      }
-      case NODE_HASH:{
-	DECL_ANCHOR(list);
-	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, COMPILE_ARRAY_TYPE_HASH);
-	    ADD_SEQ(ret, list);
-	    break;
-
-	  case NODE_ZARRAY:
-	    ADD_INSN1(ret, line, newhash, INT2FIX(0));
-	    break;
-
-	  default:
-	    compile_bug(ERROR_ARGS_AT(node->nd_head) "can't make hash with this node: %s",
-			ruby_node_name(type));
-	}
-
-	if (poped) {
-	    ADD_INSN(ret, line, pop);
-	}
 	break;
       }
-      case NODE_RETURN:{
-	rb_iseq_t *is = iseq;
-
-	if (is) {
-	    if (is->body->type == ISEQ_TYPE_TOP) {
-		COMPILE_ERROR(ERROR_ARGS "Invalid return");
-	    }
-	    else {
-		LABEL *splabel = 0;
-
-		if (is->body->type == ISEQ_TYPE_METHOD) {
-		    splabel = NEW_LABEL(0);
-		    ADD_LABEL(ret, splabel);
-		    ADD_ADJUST(ret, line, 0);
-		}
-
-		COMPILE(ret, "return nd_stts (return val)", node->nd_stts);
-
-		if (is->body->type == ISEQ_TYPE_METHOD) {
-		    add_ensure_iseq(ret, iseq, 1);
-		    ADD_TRACE(ret, line, RUBY_EVENT_RETURN);
-		    ADD_INSN(ret, line, leave);
-		    ADD_ADJUST_RESTORE(ret, splabel);
-
-		    if (!poped) {
-			ADD_INSN(ret, line, putnil);
-		    }
-		}
-		else {
-		    ADD_INSN1(ret, line, throw, INT2FIX(TAG_RETURN));
-		    if (poped) {
-			ADD_INSN(ret, line, pop);
-		    }
-		}
-	    }
-	}
+      case NODE_HASH:
+        CHECK(compile_hash(iseq, ret, node, FALSE, popped) >= 0);
+        break;
+      case NODE_RETURN:
+	CHECK(compile_return(iseq, ret, node, popped));
 	break;
-      }
       case NODE_YIELD:{
 	DECL_ANCHOR(args);
 	VALUE argc;
 	unsigned int flag = 0;
-	struct rb_call_info_kw_arg *keywords = NULL;
+	struct rb_callinfo_kwarg *keywords = NULL;
 
 	INIT_ANCHOR(args);
-	if (iseq->body->type == ISEQ_TYPE_TOP) {
+
+        if (check_yield_place(iseq) == FALSE) {
 	    COMPILE_ERROR(ERROR_ARGS "Invalid yield");
-	    debug_node_end();
-	    return COMPILE_NG;
-	}
+            goto ng;
+        }
 
 	if (node->nd_head) {
 	    argc = setup_args(iseq, args, node->nd_head, &flag, &keywords);
+	    CHECK(!NIL_P(argc));
 	}
 	else {
 	    argc = INT2FIX(0);
@@ -5397,45 +8270,52 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	ADD_SEQ(ret, args);
 	ADD_INSN1(ret, line, invokeblock, new_callinfo(iseq, 0, FIX2INT(argc), flag, keywords, FALSE));
 
-	if (poped) {
+	if (popped) {
 	    ADD_INSN(ret, line, pop);
 	}
+
+        int level = 0;
+        const rb_iseq_t *tmp_iseq = iseq;
+        for (; tmp_iseq != iseq->body->local_iseq; level++ ) {
+            tmp_iseq = tmp_iseq->body->parent_iseq;
+        }
+        if (level > 0) access_outer_variables(iseq, level, rb_intern("yield"), true);
 	break;
       }
       case NODE_LVAR:{
-	if (!poped) {
+	if (!popped) {
 	    ID id = node->nd_vid;
-	    int idx = iseq->body->local_iseq->body->local_size - get_local_var_idx(iseq, id);
+	    int idx = body->local_iseq->body->local_table_size - get_local_var_idx(iseq, id);
 
-	    debugs("id: %"PRIsVALUE" idx: %d\n", rb_id2str(id), idx);
-	    ADD_INSN2(ret, line, getlocal, INT2FIX(idx), INT2FIX(get_lvar_level(iseq)));
+	    debugs("id: %s idx: %d\n", rb_id2name(id), idx);
+	    ADD_GETLOCAL(ret, line, idx, get_lvar_level(iseq));
 	}
 	break;
       }
       case NODE_DVAR:{
 	int lv, idx, ls;
 	debugi("nd_vid", node->nd_vid);
-	if (!poped) {
+	if (!popped) {
 	    idx = get_dyna_var_idx(iseq, node->nd_vid, &lv, &ls);
 	    if (idx < 0) {
-		compile_bug(ERROR_ARGS "unknown dvar (%"PRIsVALUE")",
-			    rb_id2str(node->nd_vid));
+		COMPILE_ERROR(ERROR_ARGS "unknown dvar (%"PRIsVALUE")",
+			      rb_id2str(node->nd_vid));
+		goto ng;
 	    }
-	    ADD_INSN2(ret, line, getlocal, INT2FIX(ls - idx), INT2FIX(lv));
+	    ADD_GETLOCAL(ret, line, ls - idx, lv);
 	}
 	break;
       }
       case NODE_GVAR:{
-	ADD_INSN1(ret, line, getglobal,
-		  ((VALUE)node->nd_entry | 1));
-	if (poped) {
+	ADD_INSN1(ret, line, getglobal, ID2SYM(node->nd_entry));
+	if (popped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_IVAR:{
 	debugi("nd_vid", node->nd_vid);
-	if (!poped) {
+	if (!popped) {
 	    ADD_INSN2(ret, line, getinstancevariable,
 		      ID2SYM(node->nd_vid),
 		      get_ivar_ic_value(iseq,node->nd_vid));
@@ -5447,32 +8327,34 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 
 	if (ISEQ_COMPILE_DATA(iseq)->option->inline_const_cache) {
 	    LABEL *lend = NEW_LABEL(line);
-	    int ic_index = iseq->body->is_size++;
+	    int ic_index = body->is_size++;
 
-	    ADD_INSN2(ret, line, getinlinecache, lend, INT2FIX(ic_index));
-	    ADD_INSN1(ret, line, getconstant, ID2SYM(node->nd_vid));
-	    ADD_INSN1(ret, line, setinlinecache, INT2FIX(ic_index));
+            ADD_INSN2(ret, line, opt_getinlinecache, lend, INT2FIX(ic_index));
+            ADD_INSN1(ret, line, putobject, Qtrue);
+            ADD_INSN1(ret, line, getconstant, ID2SYM(node->nd_vid));
+            ADD_INSN1(ret, line, opt_setinlinecache, INT2FIX(ic_index));
 	    ADD_LABEL(ret, lend);
 	}
 	else {
 	    ADD_INSN(ret, line, putnil);
-	    ADD_INSN1(ret, line, getconstant, ID2SYM(node->nd_vid));
+            ADD_INSN1(ret, line, putobject, Qtrue);
+            ADD_INSN1(ret, line, getconstant, ID2SYM(node->nd_vid));
 	}
 
-	if (poped) {
+	if (popped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_CVAR:{
-	if (!poped) {
+	if (!popped) {
 	    ADD_INSN1(ret, line, getclassvariable,
 		      ID2SYM(node->nd_vid));
 	}
 	break;
       }
       case NODE_NTH_REF:{
-        if (!poped) {
+        if (!popped) {
 	    if (!node->nd_nth) {
 		ADD_INSN(ret, line, putnil);
 		break;
@@ -5483,7 +8365,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	break;
       }
       case NODE_BACK_REF:{
-	if (!poped) {
+	if (!popped) {
 	    ADD_INSN2(ret, line, getspecial, INT2FIX(1) /* '~' */,
 		      INT2FIX(0x01 | (node->nd_nth << 1)));
 	}
@@ -5504,70 +8386,57 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 		      INT2FIX(0));
 	    break;
 	  case NODE_MATCH2:
-	    COMPILE(recv, "receiver", node->nd_recv);
-	    COMPILE(val, "value", node->nd_value);
+	    CHECK(COMPILE(recv, "receiver", node->nd_recv));
+	    CHECK(COMPILE(val, "value", node->nd_value));
 	    break;
 	  case NODE_MATCH3:
-	    COMPILE(recv, "receiver", node->nd_value);
-	    COMPILE(val, "value", node->nd_recv);
+	    CHECK(COMPILE(recv, "receiver", node->nd_value));
+	    CHECK(COMPILE(val, "value", node->nd_recv));
 	    break;
 	}
 
-	if (ISEQ_COMPILE_DATA(iseq)->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, line, opt_regexpmatch1,
-			  OPERAND_AT(recv->last, 0));
-	    }
-	    else {
-		ADD_SEQ(ret, recv);
-		ADD_SEQ(ret, val);
-		ADD_INSN2(ret, line, opt_regexpmatch2, new_callinfo(iseq, idEqTilde, 1, 0, NULL, FALSE), Qnil);
-	    }
-	}
-	else {
-	    ADD_SEQ(ret, recv);
-	    ADD_SEQ(ret, val);
-	    ADD_SEND(ret, line, idEqTilde, INT2FIX(1));
-	}
+        ADD_SEQ(ret, recv);
+        ADD_SEQ(ret, val);
+        ADD_SEND(ret, line, idEqTilde, INT2FIX(1));
 
 	if (node->nd_args) {
 	    compile_named_capture_assign(iseq, ret, node->nd_args);
 	}
 
-	if (poped) {
+	if (popped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_LIT:{
 	debugp_param("lit", node->nd_lit);
-	if (!poped) {
+	if (!popped) {
 	    ADD_INSN1(ret, line, putobject, node->nd_lit);
+            RB_OBJ_WRITTEN(iseq, Qundef, node->nd_lit);
 	}
 	break;
       }
       case NODE_STR:{
 	debugp_param("nd_lit", node->nd_lit);
-	if (!poped) {
-	    node->nd_lit = rb_fstring(node->nd_lit);
+	if (!popped) {
+	    VALUE lit = node->nd_lit;
 	    if (!ISEQ_COMPILE_DATA(iseq)->option->frozen_string_literal) {
-		ADD_INSN1(ret, line, putstring, node->nd_lit);
+		lit = rb_fstring(lit);
+		ADD_INSN1(ret, line, putstring, lit);
+                RB_OBJ_WRITTEN(iseq, Qundef, lit);
 	    }
 	    else {
 		if (ISEQ_COMPILE_DATA(iseq)->option->debug_frozen_string_literal || RTEST(ruby_debug)) {
-		    VALUE debug_info = rb_ary_new_from_args(2, iseq->body->location.path, INT2FIX(line));
-		    VALUE str = rb_str_dup(node->nd_lit);
-		    rb_ivar_set(str, id_debug_created_info, rb_obj_freeze(debug_info));
-		    ADD_INSN1(ret, line, putobject, rb_obj_freeze(str));
-		    iseq_add_mark_object_compile_time(iseq, str);
+		    VALUE debug_info = rb_ary_new_from_args(2, rb_iseq_path(iseq), INT2FIX(line));
+		    lit = rb_str_dup(lit);
+		    rb_ivar_set(lit, id_debug_created_info, rb_obj_freeze(debug_info));
+		    lit = rb_str_freeze(lit);
 		}
 		else {
-		    ADD_INSN1(ret, line, putobject, node->nd_lit);
+		    lit = rb_fstring(lit);
 		}
+		ADD_INSN1(ret, line, putobject, lit);
+                RB_OBJ_WRITTEN(iseq, Qundef, lit);
 	    }
 	}
 	break;
@@ -5575,28 +8444,19 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
       case NODE_DSTR:{
 	compile_dstr(iseq, ret, node);
 
-	if (poped) {
+	if (popped) {
 	    ADD_INSN(ret, line, pop);
 	}
-	else {
-	    if (ISEQ_COMPILE_DATA(iseq)->option->frozen_string_literal) {
-		VALUE debug_info = Qnil;
-		if (ISEQ_COMPILE_DATA(iseq)->option->debug_frozen_string_literal || RTEST(ruby_debug)) {
-		    debug_info = rb_ary_new_from_args(2, iseq->body->location.path, INT2FIX(line));
-		    iseq_add_mark_object_compile_time(iseq, rb_obj_freeze(debug_info));
-		}
-		ADD_INSN1(ret, line, freezestring, debug_info);
-	    }
-	}
 	break;
       }
       case NODE_XSTR:{
-	node->nd_lit = rb_fstring(node->nd_lit);
 	ADD_CALL_RECEIVER(ret, line);
-	ADD_INSN1(ret, line, putobject, node->nd_lit);
+        VALUE str = rb_fstring(node->nd_lit);
+	ADD_INSN1(ret, line, putobject, str);
+        RB_OBJ_WRITTEN(iseq, Qundef, str);
 	ADD_CALL(ret, line, idBackquote, INT2FIX(1));
 
-	if (poped) {
+	if (popped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
@@ -5606,138 +8466,126 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	compile_dstr(iseq, ret, node);
 	ADD_CALL(ret, line, idBackquote, INT2FIX(1));
 
-	if (poped) {
+	if (popped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
-      case NODE_EVSTR:{
-	COMPILE(ret, "nd_body", node->nd_body);
-
-	if (poped) {
-	    ADD_INSN(ret, line, pop);
-	}
-	else {
-	    ADD_INSN(ret, line, tostring);
-	}
+      case NODE_EVSTR:
+	CHECK(compile_evstr(iseq, ret, node->nd_body, popped));
 	break;
-      }
       case NODE_DREGX:{
 	compile_dregx(iseq, ret, node);
 
-	if (poped) {
+	if (popped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
-      case NODE_DREGX_ONCE:{
-	int ic_index = iseq->body->is_size++;
-	NODE *dregx_node = NEW_NODE(NODE_DREGX, node->u1.value, node->u2.value, node->u3.value);
-	NODE *block_node = NEW_NODE(NODE_SCOPE, 0, dregx_node, 0);
-	const rb_iseq_t * block_iseq = NEW_CHILD_ISEQ(block_node, make_name_for_block(iseq), ISEQ_TYPE_BLOCK, line);
+      case NODE_ONCE:{
+	int ic_index = body->is_size++;
+	const rb_iseq_t *block_iseq;
+	block_iseq = NEW_CHILD_ISEQ(node->nd_body, make_name_for_block(iseq), ISEQ_TYPE_PLAIN, line);
 
 	ADD_INSN2(ret, line, once, block_iseq, INT2FIX(ic_index));
+        RB_OBJ_WRITTEN(iseq, Qundef, (VALUE)block_iseq);
 
-	if (poped) {
+	if (popped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_ARGSCAT:{
-	if (poped) {
-	    COMPILE(ret, "argscat head", node->nd_head);
+	if (popped) {
+	    CHECK(COMPILE(ret, "argscat head", node->nd_head));
 	    ADD_INSN1(ret, line, splatarray, Qfalse);
 	    ADD_INSN(ret, line, pop);
-	    COMPILE(ret, "argscat body", node->nd_body);
+	    CHECK(COMPILE(ret, "argscat body", node->nd_body));
 	    ADD_INSN1(ret, line, splatarray, Qfalse);
 	    ADD_INSN(ret, line, pop);
 	}
 	else {
-	    COMPILE(ret, "argscat head", node->nd_head);
-	    COMPILE(ret, "argscat body", node->nd_body);
+	    CHECK(COMPILE(ret, "argscat head", node->nd_head));
+	    CHECK(COMPILE(ret, "argscat body", node->nd_body));
 	    ADD_INSN(ret, line, concatarray);
 	}
 	break;
       }
       case NODE_ARGSPUSH:{
-	if (poped) {
-	    COMPILE(ret, "arsgpush head", node->nd_head);
+	if (popped) {
+	    CHECK(COMPILE(ret, "arsgpush head", node->nd_head));
 	    ADD_INSN1(ret, line, splatarray, Qfalse);
 	    ADD_INSN(ret, line, pop);
-	    COMPILE_(ret, "argspush body", node->nd_body, poped);
+	    CHECK(COMPILE_(ret, "argspush body", node->nd_body, popped));
 	}
 	else {
-	    COMPILE(ret, "arsgpush head", node->nd_head);
-	    COMPILE_(ret, "argspush body", node->nd_body, poped);
+	    CHECK(COMPILE(ret, "arsgpush head", node->nd_head));
+	    CHECK(COMPILE_(ret, "argspush body", node->nd_body, popped));
 	    ADD_INSN1(ret, line, newarray, INT2FIX(1));
 	    ADD_INSN(ret, line, concatarray);
 	}
 	break;
       }
       case NODE_SPLAT:{
-	COMPILE(ret, "splat", node->nd_head);
+	CHECK(COMPILE(ret, "splat", node->nd_head));
 	ADD_INSN1(ret, line, splatarray, Qtrue);
 
-	if (poped) {
+	if (popped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_DEFN:{
+        ID mid = node->nd_mid;
 	const rb_iseq_t *method_iseq = NEW_ISEQ(node->nd_defn,
-						rb_id2str(node->nd_mid),
+                                                rb_id2str(mid),
 						ISEQ_TYPE_METHOD, line);
 
 	debugp_param("defn/iseq", rb_iseqw_new(method_iseq));
+        ADD_INSN2(ret, line, definemethod, ID2SYM(mid), method_iseq);
+        RB_OBJ_WRITTEN(iseq, Qundef, (VALUE)method_iseq);
 
-	ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
-	ADD_INSN1(ret, line, putobject, ID2SYM(node->nd_mid));
-	ADD_INSN1(ret, line, putiseq, method_iseq);
-	ADD_SEND (ret, line, id_core_define_method, INT2FIX(2));
-
-	if (poped) {
-	    ADD_INSN(ret, line, pop);
+        if (!popped) {
+            ADD_INSN1(ret, line, putobject, ID2SYM(mid));
 	}
 
 	break;
       }
       case NODE_DEFS:{
-	const rb_iseq_t * singleton_method = NEW_ISEQ(node->nd_defn,
-						      rb_id2str(node->nd_mid),
-						      ISEQ_TYPE_METHOD, line);
-
-	debugp_param("defs/iseq", rb_iseqw_new(singleton_method));
-
-	ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
-	COMPILE(ret, "defs: recv", node->nd_recv);
-	ADD_INSN1(ret, line, putobject, ID2SYM(node->nd_mid));
-	ADD_INSN1(ret, line, putiseq, singleton_method);
-	ADD_SEND (ret, line, id_core_define_singleton_method, INT2FIX(3));
-
-	if (poped) {
-	    ADD_INSN(ret, line, pop);
-	}
+        ID mid = node->nd_mid;
+        const rb_iseq_t * singleton_method_iseq = NEW_ISEQ(node->nd_defn,
+                                                           rb_id2str(mid),
+                                                           ISEQ_TYPE_METHOD, line);
+
+        debugp_param("defs/iseq", rb_iseqw_new(singleton_method_iseq));
+        CHECK(COMPILE(ret, "defs: recv", node->nd_recv));
+        ADD_INSN2(ret, line, definesmethod, ID2SYM(mid), singleton_method_iseq);
+        RB_OBJ_WRITTEN(iseq, Qundef, (VALUE)singleton_method_iseq);
+
+        if (!popped) {
+            ADD_INSN1(ret, line, putobject, ID2SYM(mid));
+        }
 	break;
       }
       case NODE_ALIAS:{
 	ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
 	ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CBASE));
-	COMPILE(ret, "alias arg1", node->u1.node);
-	COMPILE(ret, "alias arg2", node->u2.node);
+	CHECK(COMPILE(ret, "alias arg1", node->nd_1st));
+	CHECK(COMPILE(ret, "alias arg2", node->nd_2nd));
 	ADD_SEND(ret, line, id_core_set_method_alias, INT2FIX(3));
 
-	if (poped) {
+	if (popped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_VALIAS:{
 	ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
-	ADD_INSN1(ret, line, putobject, ID2SYM(node->u1.id));
-	ADD_INSN1(ret, line, putobject, ID2SYM(node->u2.id));
+	ADD_INSN1(ret, line, putobject, ID2SYM(node->nd_alias));
+	ADD_INSN1(ret, line, putobject, ID2SYM(node->nd_orig));
 	ADD_SEND(ret, line, id_core_set_variable_alias, INT2FIX(2));
 
-	if (poped) {
+	if (popped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
@@ -5745,10 +8593,10 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
       case NODE_UNDEF:{
 	ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
 	ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CBASE));
-	COMPILE(ret, "undef arg", node->u2.node);
+	CHECK(COMPILE(ret, "undef arg", node->nd_undef));
 	ADD_SEND(ret, line, id_core_undef_method, INT2FIX(2));
 
-	if (poped) {
+	if (popped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
@@ -5757,15 +8605,15 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	const rb_iseq_t *class_iseq = NEW_CHILD_ISEQ(node->nd_body,
 						     rb_sprintf("<class:%"PRIsVALUE">", rb_id2str(node->nd_cpath->nd_mid)),
 						     ISEQ_TYPE_CLASS, line);
-	VALUE noscope = compile_cpath(ret, iseq, node->nd_cpath);
-	int flags = VM_DEFINECLASS_TYPE_CLASS;
+	const int flags = VM_DEFINECLASS_TYPE_CLASS |
+	    (node->nd_super ? VM_DEFINECLASS_FLAG_HAS_SUPERCLASS : 0) |
+	    compile_cpath(ret, iseq, node->nd_cpath);
 
-	if (!noscope) flags |= VM_DEFINECLASS_FLAG_SCOPED;
-	if (node->nd_super) flags |= VM_DEFINECLASS_FLAG_HAS_SUPERCLASS;
-	COMPILE(ret, "super", node->nd_super);
+	CHECK(COMPILE(ret, "super", node->nd_super));
 	ADD_INSN3(ret, line, defineclass, ID2SYM(node->nd_cpath->nd_mid), class_iseq, INT2FIX(flags));
+        RB_OBJ_WRITTEN(iseq, Qundef, (VALUE)class_iseq);
 
-	if (poped) {
+	if (popped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
@@ -5774,31 +8622,32 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
         const rb_iseq_t *module_iseq = NEW_CHILD_ISEQ(node->nd_body,
 						      rb_sprintf("<module:%"PRIsVALUE">", rb_id2str(node->nd_cpath->nd_mid)),
 						      ISEQ_TYPE_CLASS, line);
-	VALUE noscope = compile_cpath(ret, iseq, node->nd_cpath);
-	int flags = VM_DEFINECLASS_TYPE_MODULE;
+	const int flags = VM_DEFINECLASS_TYPE_MODULE |
+	    compile_cpath(ret, iseq, node->nd_cpath);
 
-	if (!noscope) flags |= VM_DEFINECLASS_FLAG_SCOPED;
 	ADD_INSN (ret, line, putnil); /* dummy */
 	ADD_INSN3(ret, line, defineclass, ID2SYM(node->nd_cpath->nd_mid), module_iseq, INT2FIX(flags));
+        RB_OBJ_WRITTEN(iseq, Qundef, (VALUE)module_iseq);
 
-	if (poped) {
+	if (popped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_SCLASS:{
 	ID singletonclass;
-	const rb_iseq_t *singleton_class = NEW_ISEQ(node->nd_body, rb_str_new2("singleton class"),
+	const rb_iseq_t *singleton_class = NEW_ISEQ(node->nd_body, rb_fstring_lit("singleton class"),
 						    ISEQ_TYPE_CLASS, line);
 
-	COMPILE(ret, "sclass#recv", node->nd_recv);
+	CHECK(COMPILE(ret, "sclass#recv", node->nd_recv));
 	ADD_INSN (ret, line, putnil);
 	CONST_ID(singletonclass, "singletonclass");
 	ADD_INSN3(ret, line, defineclass,
 		  ID2SYM(singletonclass), singleton_class,
 		  INT2FIX(VM_DEFINECLASS_TYPE_SINGLETON_CLASS));
+        RB_OBJ_WRITTEN(iseq, Qundef, (VALUE)singleton_class);
 
-	if (poped) {
+	if (popped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
@@ -5807,17 +8656,17 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	if (rb_is_const_id(node->nd_mid)) {
 	    /* constant */
 	    LABEL *lend = NEW_LABEL(line);
-	    int ic_index = iseq->body->is_size++;
+	    int ic_index = body->is_size++;
 
 	    DECL_ANCHOR(pref);
 	    DECL_ANCHOR(body);
 
 	    INIT_ANCHOR(pref);
 	    INIT_ANCHOR(body);
-	    compile_colon2(iseq, node, pref, body);
-	    if (LIST_SIZE_ZERO(pref)) {
+	    CHECK(compile_const_prefix(iseq, node, pref, body));
+	    if (LIST_INSN_SIZE_ZERO(pref)) {
 		if (ISEQ_COMPILE_DATA(iseq)->option->inline_const_cache) {
-		    ADD_INSN2(ret, line, getinlinecache, lend, INT2FIX(ic_index));
+                    ADD_INSN2(ret, line, opt_getinlinecache, lend, INT2FIX(ic_index));
 		}
 		else {
 		    ADD_INSN(ret, line, putnil);
@@ -5826,7 +8675,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 		ADD_SEQ(ret, body);
 
 		if (ISEQ_COMPILE_DATA(iseq)->option->inline_const_cache) {
-		    ADD_INSN1(ret, line, setinlinecache, INT2FIX(ic_index));
+                    ADD_INSN1(ret, line, opt_setinlinecache, INT2FIX(ic_index));
 		    ADD_LABEL(ret, lend);
 		}
 	    }
@@ -5838,122 +8687,108 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	else {
 	    /* function call */
 	    ADD_CALL_RECEIVER(ret, line);
-	    COMPILE(ret, "colon2#nd_head", node->nd_head);
+	    CHECK(COMPILE(ret, "colon2#nd_head", node->nd_head));
 	    ADD_CALL(ret, line, node->nd_mid, INT2FIX(1));
 	}
-	if (poped) {
+	if (popped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_COLON3:{
 	LABEL *lend = NEW_LABEL(line);
-	int ic_index = iseq->body->is_size++;
+	int ic_index = body->is_size++;
 
 	debugi("colon3#nd_mid", node->nd_mid);
 
 	/* add cache insn */
 	if (ISEQ_COMPILE_DATA(iseq)->option->inline_const_cache) {
-	    ADD_INSN2(ret, line, getinlinecache, lend, INT2FIX(ic_index));
+            ADD_INSN2(ret, line, opt_getinlinecache, lend, INT2FIX(ic_index));
 	    ADD_INSN(ret, line, pop);
 	}
 
 	ADD_INSN1(ret, line, putobject, rb_cObject);
-	ADD_INSN1(ret, line, getconstant, ID2SYM(node->nd_mid));
+        ADD_INSN1(ret, line, putobject, Qtrue);
+        ADD_INSN1(ret, line, getconstant, ID2SYM(node->nd_mid));
 
 	if (ISEQ_COMPILE_DATA(iseq)->option->inline_const_cache) {
-	    ADD_INSN1(ret, line, setinlinecache, INT2FIX(ic_index));
+            ADD_INSN1(ret, line, opt_setinlinecache, INT2FIX(ic_index));
 	    ADD_LABEL(ret, lend);
 	}
 
-	if (poped) {
+	if (popped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_DOT2:
       case NODE_DOT3:{
-	VALUE 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, line, pop);
-	    ADD_INSN(ret, line, pop);
+	int excl = type == NODE_DOT3;
+	VALUE flag = INT2FIX(excl);
+	const NODE *b = node->nd_beg;
+	const NODE *e = node->nd_end;
+
+        if (optimizable_range_item_p(b) && optimizable_range_item_p(e)) {
+	    if (!popped) {
+                VALUE bv = nd_type(b) == NODE_LIT ? b->nd_lit : Qnil;
+                VALUE ev = nd_type(e) == NODE_LIT ? e->nd_lit : Qnil;
+                VALUE val = rb_range_new(bv, ev, excl);
+                ADD_INSN1(ret, line, putobject, val);
+                RB_OBJ_WRITTEN(iseq, Qundef, val);
+	    }
 	}
 	else {
-	    ADD_INSN1(ret, line, newrange, flag);
+	    CHECK(COMPILE_(ret, "min", b, popped));
+	    CHECK(COMPILE_(ret, "max", e, popped));
+	    if (!popped) {
+		ADD_INSN1(ret, line, newrange, flag);
+	    }
 	}
 	break;
       }
       case NODE_FLIP2:
       case NODE_FLIP3:{
 	LABEL *lend = NEW_LABEL(line);
-	LABEL *lfin = NEW_LABEL(line);
 	LABEL *ltrue = NEW_LABEL(line);
-	rb_iseq_t *local_iseq = iseq->body->local_iseq;
-	rb_num_t cnt;
-	VALUE key;
-
-	cnt = ISEQ_FLIP_CNT_INCREMENT(local_iseq) + VM_SVAR_FLIPFLOP_START;
-	key = INT2FIX(cnt);
-
-	ADD_INSN2(ret, line, getspecial, key, INT2FIX(0));
-	ADD_INSNL(ret, line, branchif, lend);
-
-	/* *flip == 0 */
-	COMPILE(ret, "flip2 beg", node->nd_beg);
-	ADD_INSN(ret, line, dup);
-	ADD_INSNL(ret, line, branchunless, lfin);
-	if (nd_type(node) == NODE_FLIP3) {
-	    ADD_INSN(ret, line, dup);
-	    ADD_INSN1(ret, line, setspecial, key);
-	    ADD_INSNL(ret, line, jump, lfin);
-	}
-	else {
-	    ADD_INSN1(ret, line, setspecial, key);
-	}
-
-	/* *flip == 1 */
-	ADD_LABEL(ret, lend);
-	COMPILE(ret, "flip2 end", node->nd_end);
-	ADD_INSNL(ret, line, branchunless, ltrue);
-	ADD_INSN1(ret, line, putobject, Qfalse);
-	ADD_INSN1(ret, line, setspecial, key);
-
+	LABEL *lfalse = NEW_LABEL(line);
+	CHECK(compile_flip_flop(iseq, ret, node, type == NODE_FLIP2,
+				ltrue, lfalse));
 	ADD_LABEL(ret, ltrue);
 	ADD_INSN1(ret, line, putobject, Qtrue);
-
-	ADD_LABEL(ret, lfin);
+	ADD_INSNL(ret, line, jump, lend);
+	ADD_LABEL(ret, lfalse);
+	ADD_INSN1(ret, line, putobject, Qfalse);
+	ADD_LABEL(ret, lend);
 	break;
       }
       case NODE_SELF:{
-	if (!poped) {
+	if (!popped) {
 	    ADD_INSN(ret, line, putself);
 	}
 	break;
       }
       case NODE_NIL:{
-	if (!poped) {
+	if (!popped) {
 	    ADD_INSN(ret, line, putnil);
 	}
 	break;
       }
       case NODE_TRUE:{
-	if (!poped) {
+	if (!popped) {
 	    ADD_INSN1(ret, line, putobject, Qtrue);
 	}
 	break;
       }
       case NODE_FALSE:{
-	if (!poped) {
+	if (!popped) {
 	    ADD_INSN1(ret, line, putobject, Qfalse);
 	}
 	break;
       }
       case NODE_ERRINFO:{
-	if (!poped) {
-	    if (iseq->body->type == ISEQ_TYPE_RESCUE) {
-		ADD_INSN2(ret, line, getlocal, INT2FIX(2), INT2FIX(0));
+	if (!popped) {
+	    if (body->type == ISEQ_TYPE_RESCUE) {
+		ADD_GETLOCAL(ret, line, LVAR_ERRINFO, 0);
 	    }
 	    else {
 		const rb_iseq_t *ip = iseq;
@@ -5966,7 +8801,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 		    level++;
 		}
 		if (ip) {
-		    ADD_INSN2(ret, line, getlocal, INT2FIX(2), INT2FIX(level));
+		    ADD_GETLOCAL(ret, line, LVAR_ERRINFO, level);
 		}
 		else {
 		    ADD_INSN(ret, line, putnil);
@@ -5975,38 +8810,26 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	}
 	break;
       }
-      case NODE_DEFINED:{
-	if (poped) break;
-	if (!node->nd_head) {
-	    VALUE str = rb_iseq_defined_string(DEFINED_NIL);
-	    ADD_INSN1(ret, nd_line(node), putobject, str);
-	}
-	else {
-	    LABEL *lfinish[2];
-	    lfinish[0] = NEW_LABEL(line);
-	    lfinish[1] = 0;
-	    ADD_INSN(ret, line, putnil);
-	    defined_expr(iseq, ret, node->nd_head, lfinish, Qtrue);
-	    ADD_INSN(ret, line, swap);
-	    ADD_INSN(ret, line, pop);
-	    if (lfinish[1]) {
-		ADD_LABEL(ret, lfinish[1]);
-	    }
-	    ADD_LABEL(ret, lfinish[0]);
+      case NODE_DEFINED:
+	if (!popped) {
+	    CHECK(compile_defined_expr(iseq, ret, node, Qtrue));
 	}
 	break;
-      }
       case NODE_POSTEXE:{
 	/* compiled to:
 	 *   ONCE{ rb_mRubyVMFrozenCore::core#set_postexe{ ... } }
 	 */
-	int is_index = iseq->body->is_size++;
-	const rb_iseq_t *once_iseq = NEW_CHILD_ISEQ((NODE *)IFUNC_NEW(build_postexe_iseq, node->nd_body, 0),
-						    make_name_for_block(iseq), ISEQ_TYPE_BLOCK, line);
+	int is_index = body->is_size++;
+        struct rb_iseq_new_with_callback_callback_func *ifunc =
+            rb_iseq_new_with_callback_new_callback(build_postexe_iseq, node->nd_body);
+	const rb_iseq_t *once_iseq =
+            new_child_iseq_with_callback(iseq, ifunc,
+				 rb_fstring(make_name_for_block(iseq)), iseq, ISEQ_TYPE_BLOCK, line);
 
 	ADD_INSN2(ret, line, once, once_iseq, INT2FIX(is_index));
+        RB_OBJ_WRITTEN(iseq, Qundef, (VALUE)once_iseq);
 
-	if (poped) {
+	if (popped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
@@ -6014,29 +8837,31 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
       case NODE_KW_ARG:
 	{
 	    LABEL *end_label = NEW_LABEL(nd_line(node));
-	    NODE *default_value = node->nd_body->nd_value;
+	    const NODE *default_value = node->nd_body->nd_value;
 
-	    if (default_value == (NODE *)-1) {
+            if (default_value == NODE_SPECIAL_REQUIRED_KEYWORD) {
 		/* required argument. do nothing */
-		compile_bug(ERROR_ARGS "unreachable");
+		COMPILE_ERROR(ERROR_ARGS "unreachable");
+		goto ng;
 	    }
 	    else if (nd_type(default_value) == NODE_LIT ||
 		     nd_type(default_value) == NODE_NIL ||
 		     nd_type(default_value) == NODE_TRUE ||
 		     nd_type(default_value) == NODE_FALSE) {
-		compile_bug(ERROR_ARGS "unreachable");
+		COMPILE_ERROR(ERROR_ARGS "unreachable");
+		goto ng;
 	    }
 	    else {
 		/* if keywordcheck(_kw_bits, nth_keyword)
 		 *   kw = default_value
 		 * end
 		 */
-		int kw_bits_idx = iseq->body->local_size - iseq->body->param.keyword->bits_start;
-		int keyword_idx = iseq->body->param.keyword->num;
+		int kw_bits_idx = body->local_table_size - body->param.keyword->bits_start;
+		int keyword_idx = body->param.keyword->num;
 
-		ADD_INSN2(ret, line, checkkeyword, INT2FIX(kw_bits_idx), INT2FIX(keyword_idx));
+		ADD_INSN2(ret, line, checkkeyword, INT2FIX(kw_bits_idx + VM_ENV_DATA_SIZE - 1), INT2FIX(keyword_idx));
 		ADD_INSNL(ret, line, branchif, end_label);
-		COMPILE_POPED(ret, "keyword default argument", node->nd_body);
+		CHECK(COMPILE_POPPED(ret, "keyword default argument", node->nd_body));
 		ADD_LABEL(ret, end_label);
 	    }
 
@@ -6044,8 +8869,8 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	}
       case NODE_DSYM:{
 	compile_dstr(iseq, ret, node);
-	if (!poped) {
-	    ADD_SEND(ret, line, idIntern, INT2FIX(0));
+	if (!popped) {
+	    ADD_INSN(ret, line, intern);
 	}
 	else {
 	    ADD_INSN(ret, line, pop);
@@ -6057,30 +8882,30 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	DECL_ANCHOR(args);
 	unsigned int flag = 0;
 	ID mid = node->nd_mid;
-	LABEL *lskip = 0;
 	VALUE argc;
+        LABEL *else_label = NULL;
+        VALUE branches = Qfalse;
 
 	/* optimization shortcut
 	 *   obj["literal"] = value -> opt_aset_with(obj, "literal", value)
 	 */
 	if (mid == idASET && !private_recv_p(node) && node->nd_args &&
-	    nd_type(node->nd_args) == NODE_ARRAY && node->nd_args->nd_alen == 2 &&
+	    nd_type(node->nd_args) == NODE_LIST && node->nd_args->nd_alen == 2 &&
 	    nd_type(node->nd_args->nd_head) == NODE_STR &&
 	    ISEQ_COMPILE_DATA(iseq)->current_block == NULL &&
+            !ISEQ_COMPILE_DATA(iseq)->option->frozen_string_literal &&
 	    ISEQ_COMPILE_DATA(iseq)->option->specialized_instruction)
 	{
 	    VALUE str = rb_fstring(node->nd_args->nd_head->nd_lit);
-	    node->nd_args->nd_head->nd_lit = str;
-	    iseq_add_mark_object(iseq, str);
-	    COMPILE(ret, "recv", node->nd_recv);
-	    COMPILE(ret, "value", node->nd_args->nd_next->nd_head);
-	    if (!poped) {
+	    CHECK(COMPILE(ret, "recv", node->nd_recv));
+	    CHECK(COMPILE(ret, "value", node->nd_args->nd_next->nd_head));
+	    if (!popped) {
 		ADD_INSN(ret, line, swap);
 		ADD_INSN1(ret, line, topn, INT2FIX(1));
 	    }
-	    ADD_INSN3(ret, line, opt_aset_with,
-		      new_callinfo(iseq, idASET, 2, 0, NULL, FALSE),
-		      NULL/* CALL_CACHE */, str);
+            ADD_INSN2(ret, line, opt_aset_with, str,
+                      new_callinfo(iseq, idASET, 2, 0, NULL, FALSE));
+            RB_OBJ_WRITTEN(iseq, Qundef, str);
 	    ADD_INSN(ret, line, pop);
 	    break;
 	}
@@ -6088,8 +8913,11 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	INIT_ANCHOR(recv);
 	INIT_ANCHOR(args);
 	argc = setup_args(iseq, args, node->nd_args, &flag, NULL);
+	CHECK(!NIL_P(argc));
 
-	flag |= COMPILE_RECV(recv, "recv", node);
+        int asgnflag = COMPILE_RECV(recv, "recv", node);
+        CHECK(asgnflag != -1);
+        flag |= (unsigned int)asgnflag;
 
 	debugp_param("argc", argc);
 	debugp_param("nd_mid", ID2SYM(mid));
@@ -6097,11 +8925,9 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	if (!rb_is_attrset_id(mid)) {
 	    /* safe nav attr */
 	    mid = rb_id_attrset(mid);
-	    ADD_INSN(recv, line, dup);
-	    lskip = NEW_LABEL(line);
-	    ADD_INSNL(recv, line, branchnil, lskip);
+            else_label = qcall_branch_start(iseq, recv, &branches, node, line);
 	}
-	if (!poped) {
+	if (!popped) {
 	    ADD_INSN(ret, line, putnil);
 	    ADD_SEQ(ret, recv);
 	    ADD_SEQ(ret, args);
@@ -6110,7 +8936,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 		ADD_INSN1(ret, line, topn, INT2FIX(1));
 		if (flag & VM_CALL_ARGS_SPLAT) {
 		    ADD_INSN1(ret, line, putobject, INT2FIX(-1));
-		    ADD_SEND(ret, line, idAREF, INT2FIX(1));
+                    ADD_SEND_WITH_FLAG(ret, line, idAREF, INT2FIX(1), INT2FIX(asgnflag));
 		}
 		ADD_INSN1(ret, line, setn, FIXNUM_INC(argc, 3));
 		ADD_INSN (ret, line, pop);
@@ -6118,7 +8944,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	    else if (flag & VM_CALL_ARGS_SPLAT) {
 		ADD_INSN(ret, line, dup);
 		ADD_INSN1(ret, line, putobject, INT2FIX(-1));
-		ADD_SEND(ret, line, idAREF, INT2FIX(1));
+                ADD_SEND_WITH_FLAG(ret, line, idAREF, INT2FIX(1), INT2FIX(asgnflag));
 		ADD_INSN1(ret, line, setn, FIXNUM_INC(argc, 2));
 		ADD_INSN (ret, line, pop);
 	    }
@@ -6131,23 +8957,11 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	    ADD_SEQ(ret, args);
 	}
 	ADD_SEND_WITH_FLAG(ret, line, mid, argc, INT2FIX(flag));
-	if (lskip) ADD_LABEL(ret, lskip);
+        qcall_branch_end(iseq, ret, else_label, branches, node, line);
 	ADD_INSN(ret, line, pop);
 
 	break;
       }
-      case NODE_PRELUDE:{
-	const rb_compile_option_t *orig_opt = ISEQ_COMPILE_DATA(iseq)->option;
-	if (node->nd_orig) {
-	    rb_compile_option_t new_opt = *orig_opt;
-	    rb_iseq_make_compile_option(&new_opt, node->nd_orig);
-	    ISEQ_COMPILE_DATA(iseq)->option = &new_opt;
-	}
-	COMPILE_POPED(ret, "prelude", node->nd_head);
-	COMPILE_(ret, "body", node->nd_body, poped);
-	ISEQ_COMPILE_DATA(iseq)->option = orig_opt;
-	break;
-      }
       case NODE_LAMBDA:{
 	/* compile same as lambda{...} */
 	const rb_iseq_t *block = NEW_CHILD_ISEQ(node->nd_body, make_name_for_block(iseq), ISEQ_TYPE_BLOCK, line);
@@ -6155,24 +8969,20 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 
 	ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
 	ADD_CALL_WITH_BLOCK(ret, line, idLambda, argc, block);
+        RB_OBJ_WRITTEN(iseq, Qundef, (VALUE)block);
 
-	if (poped) {
+	if (popped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       default:
-	UNKNOWN_NODE("iseq_compile_each", node);
+	UNKNOWN_NODE("iseq_compile_each", node, COMPILE_NG);
+      ng:
+	debug_node_end();
 	return COMPILE_NG;
     }
 
-    /* check & remove redundant trace(line) */
-    if (saved_last_element && ret /* ret can be 0 when error */ &&
-	ret->last == saved_last_element &&
-	((INSN *)saved_last_element)->insn_id == BIN(trace)) {
-	POP_ELEMENT(ret);
-    }
-
     debug_node_end();
     return COMPILE_OK;
 }
@@ -6190,21 +9000,22 @@ insn_data_length(INSN *iobj)
 static int
 calc_sp_depth(int depth, INSN *insn)
 {
-    return insn_stack_increase(depth, insn->insn_id, insn->operands);
+    return comptime_insn_stack_increase(depth, insn->insn_id, insn->operands);
 }
 
 static VALUE
 opobj_inspect(VALUE obj)
 {
-    struct RBasic *r = (struct RBasic *) obj;
-    if (!SPECIAL_CONST_P(r)  && r->klass == 0) {
-	switch (BUILTIN_TYPE(r)) {
+    if (!SPECIAL_CONST_P(obj) && !RBASIC_CLASS(obj)) {
+        switch (BUILTIN_TYPE(obj)) {
 	  case T_STRING:
 	    obj = rb_str_new_cstr(RSTRING_PTR(obj));
 	    break;
 	  case T_ARRAY:
 	    obj = rb_ary_dup(obj);
 	    break;
+          default:
+            break;
 	}
     }
     return rb_inspect(obj);
@@ -6228,7 +9039,7 @@ insn_data_to_s_detail(INSN *iobj)
 	      case TS_OFFSET:	/* label(destination position) */
 		{
 		    LABEL *lobj = (LABEL *)OPERAND_AT(iobj, j);
-		    rb_str_catf(str, "<L%03d>", lobj->label_no);
+		    rb_str_catf(str, LABEL_FORMAT, lobj->label_no);
 		    break;
 		}
 		break;
@@ -6247,33 +9058,27 @@ insn_data_to_s_detail(INSN *iobj)
 	      case TS_VALUE:	/* VALUE */
 		{
 		    VALUE v = OPERAND_AT(iobj, j);
-		    rb_str_concat(str, opobj_inspect(v));
+                    if (!CLASS_OF(v))
+                        rb_str_cat2(str, "<hidden>");
+                    else {
+                        rb_str_concat(str, opobj_inspect(v));
+                    }
 		    break;
 		}
 	      case TS_ID:	/* ID */
 		rb_str_concat(str, opobj_inspect(OPERAND_AT(iobj, j)));
 		break;
-	      case TS_GENTRY:
-		{
-		    struct rb_global_entry *entry = (struct rb_global_entry *)
-		      (OPERAND_AT(iobj, j) & (~1));
-		    rb_str_append(str, rb_id2str(entry->id));
-		    break;
-		}
 	      case TS_IC:	/* inline cache */
+	      case TS_IVC:	/* inline ivar cache */
+	      case TS_ISE:	/* inline storage entry */
 		rb_str_catf(str, "<ic:%d>", FIX2INT(OPERAND_AT(iobj, j)));
 		break;
-	      case TS_CALLINFO: /* call info */
+              case TS_CALLDATA: /* we store these as call infos at compile time */
 		{
-		    struct rb_call_info *ci = (struct rb_call_info *)OPERAND_AT(iobj, j);
-		    rb_str_cat2(str, "<callinfo:");
-		    if (ci->mid) rb_str_catf(str, "%"PRIsVALUE, rb_id2str(ci->mid));
-		    rb_str_catf(str, ", %d>", ci->orig_argc);
-		    break;
-		}
-	      case TS_CALLCACHE: /* call cache */
-		{
-		    rb_str_catf(str, "<call cache>");
+                    const struct rb_callinfo *ci = (struct rb_callinfo *)OPERAND_AT(iobj, j);
+                    rb_str_cat2(str, "<calldata:");
+                    if (vm_ci_mid(ci)) rb_str_catf(str, "%"PRIsVALUE, rb_id2str(vm_ci_mid(ci)));
+                    rb_str_catf(str, ", %d>", vm_ci_argc(ci));
 		    break;
 		}
 	      case TS_CDHASH:	/* case/when condition cache */
@@ -6281,7 +9086,7 @@ insn_data_to_s_detail(INSN *iobj)
 		break;
 	      case TS_FUNCPTR:
 		{
-		    rb_insn_func_t func = (rb_insn_func_t)OPERAND_AT(iobj, j);
+		    void *func = (void *)OPERAND_AT(iobj, j);
 #ifdef HAVE_DLADDR
 		    Dl_info info;
 		    if (dladdr(func, &info) && info.dli_sname) {
@@ -6292,6 +9097,9 @@ insn_data_to_s_detail(INSN *iobj)
 		    rb_str_catf(str, "<%p>", func);
 		}
 		break;
+              case TS_BUILTIN:
+                rb_str_cat2(str, "<TS_BUILTIN>");
+                break;
 	      default:{
 		rb_raise(rb_eSyntaxError, "unknown operand type: %c", type);
 	      }
@@ -6305,7 +9113,13 @@ insn_data_to_s_detail(INSN *iobj)
 }
 
 static void
-dump_disasm_list(struct iseq_link_element *link)
+dump_disasm_list(const LINK_ELEMENT *link)
+{
+    dump_disasm_list_with_cursor(link, NULL, NULL);
+}
+
+static void
+dump_disasm_list_with_cursor(const LINK_ELEMENT *link, const LINK_ELEMENT *curr, const LABEL *dest)
 {
     int pos = 0;
     INSN *iobj;
@@ -6315,30 +9129,33 @@ dump_disasm_list(struct iseq_link_element *link)
     printf("-- raw disasm--------\n");
 
     while (link) {
+	if (curr) printf(curr == link ? "*" : " ");
 	switch (link->type) {
 	  case ISEQ_ELEMENT_INSN:
 	    {
 		iobj = (INSN *)link;
 		str = insn_data_to_s_detail(iobj);
-		printf("%04d %-65s(%4u)\n", pos, StringValueCStr(str), iobj->line_no);
+		printf("  %04d %-65s(%4u)\n", pos, StringValueCStr(str), iobj->insn_info.line_no);
 		pos += insn_data_length(iobj);
 		break;
 	    }
 	  case ISEQ_ELEMENT_LABEL:
 	    {
 		lobj = (LABEL *)link;
-		printf("<L%03d>\n", lobj->label_no);
+		printf(LABEL_FORMAT" [sp: %d]%s\n", lobj->label_no, lobj->sp,
+		       dest == lobj ? " <---" : "");
 		break;
 	    }
-	  case ISEQ_ELEMENT_NONE:
+	  case ISEQ_ELEMENT_TRACE:
 	    {
-		printf("[none]\n");
+		TRACE *trace = (TRACE *)link;
+		printf("  trace: %0x\n", trace->event);
 		break;
 	    }
 	  case ISEQ_ELEMENT_ADJUST:
 	    {
 		ADJUST *adjust = (ADJUST *)link;
-		printf("adjust: [label: %d]\n", adjust->label ? adjust->label->label_no : -1);
+		printf("  adjust: [label: %d]\n", adjust->label ? adjust->label->label_no : -1);
 		break;
 	    }
 	  default:
@@ -6354,16 +9171,16 @@ dump_disasm_list(struct iseq_link_element *link)
 const char *
 rb_insns_name(int i)
 {
-    return insn_name_info[i];
+    return insn_name(i);
 }
 
 VALUE
 rb_insns_name_array(void)
 {
-    VALUE ary = rb_ary_new();
+    VALUE ary = rb_ary_new_capa(VM_INSTRUCTION_SIZE);
     int i;
-    for (i = 0; i < numberof(insn_name_info); i++) {
-	rb_ary_push(ary, rb_fstring(rb_str_new2(insn_name_info[i])));
+    for (i = 0; i < VM_INSTRUCTION_SIZE; i++) {
+	rb_ary_push(ary, rb_fstring_cstr(insn_name(i)));
     }
     return rb_obj_freeze(ary);
 }
@@ -6373,7 +9190,7 @@ 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");
+    obj = rb_to_symbol_type(obj);
 
     if (st_lookup(labels_table, obj, &tmp) == 0) {
 	label = NEW_LABEL(0);
@@ -6389,18 +9206,16 @@ register_label(rb_iseq_t *iseq, struct st_table *labels_table, VALUE obj)
 static VALUE
 get_exception_sym2type(VALUE sym)
 {
-#undef rb_intern
-#define rb_intern(str) rb_intern_const(str)
     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"));
+	symRescue = ID2SYM(rb_intern_const("rescue"));
+	symEnsure = ID2SYM(rb_intern_const("ensure"));
+	symRetry  = ID2SYM(rb_intern_const("retry"));
+	symBreak  = ID2SYM(rb_intern_const("break"));
+	symRedo   = ID2SYM(rb_intern_const("redo"));
+	symNext   = ID2SYM(rb_intern_const("next"));
     }
 
     if (sym == symRescue) return CATCH_TYPE_RESCUE;
@@ -6422,30 +9237,34 @@ iseq_build_from_ary_exception(rb_iseq_t *iseq, struct st_table *labels_table,
     for (i=0; i<RARRAY_LEN(exception); i++) {
 	const rb_iseq_t *eiseq;
 	VALUE v, type;
-	const VALUE *ptr;
 	LABEL *lstart, *lend, *lcont;
 	unsigned int sp;
 
-	v = rb_convert_type(RARRAY_AREF(exception, i), T_ARRAY,
-					 "Array", "to_ary");
+	v = rb_to_array_type(RARRAY_AREF(exception, i));
 	if (RARRAY_LEN(v) != 6) {
 	    rb_raise(rb_eSyntaxError, "wrong exception entry");
 	}
-	ptr  = RARRAY_CONST_PTR(v);
-	type = get_exception_sym2type(ptr[0]);
-	if (ptr[1] == Qnil) {
+        type = get_exception_sym2type(RARRAY_AREF(v, 0));
+        if (RARRAY_AREF(v, 1) == Qnil) {
 	    eiseq = NULL;
 	}
 	else {
-	    eiseq = rb_iseqw_to_iseq(rb_iseq_load(ptr[1], (VALUE)iseq, Qnil));
-	}
+            eiseq = rb_iseqw_to_iseq(rb_iseq_load(RARRAY_AREF(v, 1), (VALUE)iseq, Qnil));
+        }
+
+        lstart = register_label(iseq, labels_table, RARRAY_AREF(v, 2));
+        lend   = register_label(iseq, labels_table, RARRAY_AREF(v, 3));
+        lcont  = register_label(iseq, labels_table, RARRAY_AREF(v, 4));
+        sp     = NUM2UINT(RARRAY_AREF(v, 5));
 
-	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     = NUM2UINT(ptr[5]);
+	/* TODO: Dirty Hack!  Fix me */
+	if (type == CATCH_TYPE_RESCUE ||
+	    type == CATCH_TYPE_BREAK ||
+	    type == CATCH_TYPE_NEXT) {
+	    ++sp;
+	}
 
-	(void)sp;
+	lcont->sp = sp;
 
 	ADD_CATCH_ENTRY(type, lstart, lend, eiseq, lcont);
 
@@ -6459,10 +9278,10 @@ insn_make_insn_table(void)
 {
     struct st_table *table;
     int i;
-    table = st_init_numtable();
+    table = st_init_numtable_with_size(VM_INSTRUCTION_SIZE);
 
     for (i=0; i<VM_INSTRUCTION_SIZE; i++) {
-	st_insert(table, ID2SYM(rb_intern(insn_name(i))), i);
+	st_insert(table, ID2SYM(rb_intern_const(insn_name(i))), i);
     }
 
     return table;
@@ -6485,7 +9304,6 @@ iseq_build_load_iseq(const rb_iseq_t *iseq, VALUE op)
     }
 
     loaded_iseq = rb_iseqw_to_iseq(iseqw);
-    iseq_add_mark_object(iseq, (VALUE)loaded_iseq);
     return loaded_iseq;
 }
 
@@ -6495,13 +9313,13 @@ iseq_build_callinfo_from_hash(rb_iseq_t *iseq, VALUE op)
     ID mid = 0;
     int orig_argc = 0;
     unsigned int flag = 0;
-    struct rb_call_info_kw_arg *kw_arg = 0;
+    struct rb_callinfo_kwarg *kw_arg = 0;
 
     if (!NIL_P(op)) {
-	VALUE vmid = rb_hash_aref(op, ID2SYM(rb_intern("mid")));
-	VALUE vflag = rb_hash_aref(op, ID2SYM(rb_intern("flag")));
-	VALUE vorig_argc = rb_hash_aref(op, ID2SYM(rb_intern("orig_argc")));
-	VALUE vkw_arg = rb_hash_aref(op, ID2SYM(rb_intern("kw_arg")));
+	VALUE vmid = rb_hash_aref(op, ID2SYM(rb_intern_const("mid")));
+	VALUE vflag = rb_hash_aref(op, ID2SYM(rb_intern_const("flag")));
+	VALUE vorig_argc = rb_hash_aref(op, ID2SYM(rb_intern_const("orig_argc")));
+	VALUE vkw_arg = rb_hash_aref(op, ID2SYM(rb_intern_const("kw_arg")));
 
 	if (!NIL_P(vmid)) mid = SYM2ID(vmid);
 	if (!NIL_P(vflag)) flag = NUM2UINT(vflag);
@@ -6510,7 +9328,7 @@ iseq_build_callinfo_from_hash(rb_iseq_t *iseq, VALUE op)
 	if (!NIL_P(vkw_arg)) {
 	    int i;
 	    int len = RARRAY_LENINT(vkw_arg);
-	    size_t n = rb_call_info_kw_arg_bytes(len);
+	    size_t n = rb_callinfo_kwarg_bytes(len);
 
 	    kw_arg = xmalloc(n);
 	    kw_arg->keyword_len = len;
@@ -6522,15 +9340,31 @@ iseq_build_callinfo_from_hash(rb_iseq_t *iseq, VALUE op)
 	}
     }
 
-    return (VALUE)new_callinfo(iseq, mid, orig_argc, flag, kw_arg, (flag & VM_CALL_ARGS_SIMPLE) == 0);
+    const struct rb_callinfo *ci = new_callinfo(iseq, mid, orig_argc, flag, kw_arg, (flag & VM_CALL_ARGS_SIMPLE) == 0);
+    RB_OBJ_WRITTEN(iseq, Qundef, ci);
+    return (VALUE)ci;
+}
+
+static rb_event_flag_t
+event_name_to_flag(VALUE sym)
+{
+#define CHECK_EVENT(ev) if (sym == ID2SYM(rb_intern_const(#ev))) return ev;
+		CHECK_EVENT(RUBY_EVENT_LINE);
+		CHECK_EVENT(RUBY_EVENT_CLASS);
+		CHECK_EVENT(RUBY_EVENT_END);
+		CHECK_EVENT(RUBY_EVENT_CALL);
+		CHECK_EVENT(RUBY_EVENT_RETURN);
+		CHECK_EVENT(RUBY_EVENT_B_CALL);
+		CHECK_EVENT(RUBY_EVENT_B_RETURN);
+#undef CHECK_EVENT
+    return RUBY_EVENT_NONE;
 }
 
 static int
-iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor,
+iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *const anchor,
 			 VALUE body, VALUE labels_wrapper)
 {
     /* TODO: body should be frozen */
-    const VALUE *ptr = RARRAY_CONST_PTR(body);
     long i, len = RARRAY_LEN(body);
     struct st_table *labels_table = DATA_PTR(labels_wrapper);
     int j;
@@ -6547,11 +9381,17 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor,
     }
 
     for (i=0; i<len; i++) {
-	VALUE obj = ptr[i];
+        VALUE obj = RARRAY_AREF(body, i);
 
 	if (SYMBOL_P(obj)) {
-	    LABEL *label = register_label(iseq, labels_table, obj);
-	    ADD_LABEL(anchor, label);
+	    rb_event_flag_t event;
+	    if ((event = event_name_to_flag(obj)) != RUBY_EVENT_NONE) {
+		ADD_TRACE(anchor, event);
+	    }
+	    else {
+		LABEL *label = register_label(iseq, labels_table, obj);
+		ADD_LABEL(anchor, label);
+	    }
 	}
 	else if (FIXNUM_P(obj)) {
 	    line_no = NUM2INT(obj);
@@ -6579,7 +9419,13 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor,
 	    }
 
 	    if (argc > 0) {
-		argv = compile_data_alloc(iseq, sizeof(VALUE) * argc);
+                argv = compile_data_calloc2(iseq, sizeof(VALUE), argc);
+
+                // add element before operand setup to make GC root
+                ADD_ELEM(anchor,
+                         (LINK_ELEMENT*)new_insn_core(iseq, line_no,
+                                                      (enum ruby_vminsn_type)insn_id, argc, argv));
+
 		for (j=0; j<argc; j++) {
 		    VALUE op = rb_ary_entry(obj, j+1);
 		    switch (insn_op_type((VALUE)insn_id, j)) {
@@ -6595,45 +9441,42 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor,
 			break;
 		      case TS_VALUE:
 			argv[j] = op;
-			iseq_add_mark_object(iseq, op);
+			RB_OBJ_WRITTEN(iseq, Qundef, op);
 			break;
 		      case TS_ISEQ:
 			{
 			    if (op != Qnil) {
-				argv[j] = (VALUE)iseq_build_load_iseq(iseq, op);
+				VALUE v = (VALUE)iseq_build_load_iseq(iseq, op);
+				argv[j] = v;
+				RB_OBJ_WRITTEN(iseq, Qundef, v);
 			    }
 			    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_ISE:
 		      case TS_IC:
+                      case TS_IVC:  /* inline ivar cache */
 			argv[j] = op;
 			if (NUM2UINT(op) >= iseq->body->is_size) {
 			    iseq->body->is_size = NUM2INT(op) + 1;
 			}
+                        FL_SET((VALUE)iseq, ISEQ_MARKABLE_ISEQ);
 			break;
-		      case TS_CALLINFO:
+                      case TS_CALLDATA:
 			argv[j] = iseq_build_callinfo_from_hash(iseq, op);
 			break;
-		      case TS_CALLCACHE:
-			argv[j] = Qfalse;
-			break;
 		      case TS_ID:
-			argv[j] = rb_convert_type(op, T_SYMBOL,
-						  "Symbol", "to_sym");
+			argv[j] = rb_to_symbol_type(op);
 			break;
 		      case TS_CDHASH:
 			{
 			    int i;
-			    VALUE map = rb_hash_new();
+			    VALUE map = rb_hash_new_with_size(RARRAY_LEN(op)/2);
 
-			    rb_hash_tbl_raw(map)->type = &cdhash_type;
-			    op = rb_convert_type(op, T_ARRAY, "Array", "to_ary");
+                            RHASH_TBL_RAW(map)->type = &cdhash_type;
+			    op = rb_to_array_type(op);
 			    for (i=0; i<RARRAY_LEN(op); i+=2) {
 				VALUE key = RARRAY_AREF(op, i);
 				VALUE sym = RARRAY_AREF(op, i+1);
@@ -6643,7 +9486,7 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor,
 			    }
 			    RB_GC_GUARD(op);
 			    argv[j] = map;
-			    rb_iseq_add_mark_object(iseq, map);
+			    RB_OBJ_WRITTEN(iseq, Qundef, map);
 			}
 			break;
 		      case TS_FUNCPTR:
@@ -6661,9 +9504,11 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor,
 		    }
 		}
 	    }
-	    ADD_ELEM(anchor,
-		     (LINK_ELEMENT*)new_insn_core(iseq, line_no,
-						  (enum ruby_vminsn_type)insn_id, argc, argv));
+            else {
+                ADD_ELEM(anchor,
+                         (LINK_ELEMENT*)new_insn_core(iseq, line_no,
+                                                      (enum ruby_vminsn_type)insn_id, argc, NULL));
+            }
 	}
 	else {
 	    rb_raise(rb_eTypeError, "unexpected object for instruction");
@@ -6675,20 +9520,18 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor,
     return iseq_setup(iseq, anchor);
 }
 
-#define CHECK_ARRAY(v)   rb_convert_type((v), T_ARRAY, "Array", "to_ary")
-#define CHECK_SYMBOL(v)  rb_convert_type((v), T_SYMBOL, "Symbol", "to_sym")
+#define CHECK_ARRAY(v)   rb_to_array_type(v)
+#define CHECK_SYMBOL(v)  rb_to_symbol_type(v)
 
 static int
 int_param(int *dst, VALUE param, VALUE sym)
 {
     VALUE val = rb_hash_aref(param, sym);
-    switch (TYPE(val)) {
-      case T_NIL:
-	return FALSE;
-      case T_FIXNUM:
+    if (FIXNUM_P(val)) {
 	*dst = FIX2INT(val);
 	return TRUE;
-      default:
+    }
+    else if (!NIL_P(val)) {
 	rb_raise(rb_eTypeError, "invalid %+"PRIsVALUE" Fixnum: %+"PRIsVALUE,
 		 sym, val);
     }
@@ -6709,10 +9552,10 @@ iseq_build_kw(rb_iseq_t *iseq, VALUE params, VALUE keywords)
     iseq->body->param.flags.has_kw = TRUE;
 
     keyword->num = len;
-#define SYM(s) ID2SYM(rb_intern(#s))
+#define SYM(s) ID2SYM(rb_intern_const(#s))
     (void)int_param(&keyword->bits_start, params, SYM(kwbits));
     i = keyword->bits_start - keyword->num;
-    ids = (VALUE *)&iseq->body->local_table[i];
+    ids = (ID *)&iseq->body->local_table[i];
 #undef SYM
 
     /* required args */
@@ -6729,10 +9572,14 @@ iseq_build_kw(rb_iseq_t *iseq, VALUE params, VALUE keywords)
   default_values: /* note: we intentionally preserve `i' from previous loop */
     default_len = len - i;
     if (default_len == 0) {
+	keyword->table = ids;
 	return keyword;
     }
+    else if (default_len < 0) {
+        UNREACHABLE;
+    }
 
-    dvs = ALLOC_N(VALUE, default_len);
+    dvs = ALLOC_N(VALUE, (unsigned int)default_len);
 
     for (j = 0; i < len; i++, j++) {
 	key = RARRAY_AREF(keywords, i);
@@ -6761,24 +9608,78 @@ iseq_build_kw(rb_iseq_t *iseq, VALUE params, VALUE keywords)
 }
 
 void
+rb_iseq_mark_insn_storage(struct iseq_compile_data_storage *storage)
+{
+    INSN *iobj = 0;
+    size_t size = sizeof(INSN);
+    unsigned int pos = 0;
+
+    while (storage) {
+#ifdef STRICT_ALIGNMENT
+        size_t padding = calc_padding((void *)&storage->buff[pos], size);
+#else
+        const size_t padding = 0; /* expected to be optimized by compiler */
+#endif /* STRICT_ALIGNMENT */
+        size_t offset = pos + size + padding;
+        if (offset > storage->size || offset > storage->pos) {
+            pos = 0;
+            storage = storage->next;
+        }
+        else {
+#ifdef STRICT_ALIGNMENT
+            pos += (int)padding;
+#endif /* STRICT_ALIGNMENT */
+
+            iobj = (INSN *)&storage->buff[pos];
+
+            if (iobj->operands) {
+                int j;
+                const char *types = insn_op_types(iobj->insn_id);
+
+                for (j = 0; types[j]; j++) {
+                    char type = types[j];
+                    switch (type) {
+                      case TS_CDHASH:
+                      case TS_ISEQ:
+                      case TS_VALUE:
+                      case TS_CALLDATA: // ci is stored.
+                        {
+                            VALUE op = OPERAND_AT(iobj, j);
+
+                            if (!SPECIAL_CONST_P(op)) {
+                                rb_gc_mark(op);
+                            }
+                        }
+                        break;
+                      default:
+                        break;
+                    }
+                }
+            }
+            pos += (int)size;
+        }
+    }
+}
+
+void
 rb_iseq_build_from_ary(rb_iseq_t *iseq, VALUE misc, VALUE locals, VALUE params,
 			 VALUE exception, VALUE body)
 {
-#define SYM(s) ID2SYM(rb_intern(#s))
+#define SYM(s) ID2SYM(rb_intern_const(#s))
     int i, len;
+    unsigned int arg_size, local_size, stack_max;
     ID *tbl;
     struct st_table *labels_table = st_init_numtable();
-    VALUE labels_wrapper = Data_Wrap_Struct(0, 0, st_free_table, labels_table);
+    VALUE labels_wrapper = Data_Wrap_Struct(0, rb_mark_set, st_free_table, labels_table);
     VALUE arg_opt_labels = rb_hash_aref(params, SYM(opt));
     VALUE keywords = rb_hash_aref(params, SYM(keyword));
-    VALUE sym_arg_rest = ID2SYM(rb_intern("#arg_rest"));
+    VALUE sym_arg_rest = ID2SYM(rb_intern_const("#arg_rest"));
     DECL_ANCHOR(anchor);
     INIT_ANCHOR(anchor);
 
     len = RARRAY_LENINT(locals);
     iseq->body->local_table_size = len;
     iseq->body->local_table = tbl = len > 0 ? (ID *)ALLOC_N(ID, iseq->body->local_table_size) : NULL;
-    iseq->body->local_size = iseq->body->local_table_size + 1;
 
     for (i = 0; i < len; i++) {
 	VALUE lv = RARRAY_AREF(locals, i);
@@ -6791,11 +9692,6 @@ rb_iseq_build_from_ary(rb_iseq_t *iseq, VALUE misc, VALUE locals, VALUE params,
 	}
     }
 
-    /*
-     * we currently ignore misc params,
-     * local_size, stack_size and param.size are all calculated
-     */
-
 #define INT_PARAM(F) int_param(&iseq->body->param.F, params, SYM(F))
     if (INT_PARAM(lead_num)) {
 	iseq->body->param.flags.has_lead = TRUE;
@@ -6805,9 +9701,16 @@ rb_iseq_build_from_ary(rb_iseq_t *iseq, VALUE misc, VALUE locals, VALUE params,
     if (INT_PARAM(rest_start)) iseq->body->param.flags.has_rest = TRUE;
     if (INT_PARAM(block_start)) iseq->body->param.flags.has_block = TRUE;
 #undef INT_PARAM
+    {
+#define INT_PARAM(F) F = (int_param(&x, misc, SYM(F)) ? (unsigned int)x : 0)
+	int x;
+	INT_PARAM(arg_size);
+	INT_PARAM(local_size);
+	INT_PARAM(stack_max);
+#undef INT_PARAM
+    }
 
-    switch (TYPE(arg_opt_labels)) {
-      case T_ARRAY:
+    if (RB_TYPE_P(arg_opt_labels, T_ARRAY)) {
 	len = RARRAY_LENINT(arg_opt_labels);
 	iseq->body->param.flags.has_opt = !!(len - 1 >= 0);
 
@@ -6823,19 +9726,16 @@ rb_iseq_build_from_ary(rb_iseq_t *iseq, VALUE misc, VALUE locals, VALUE params,
 	    iseq->body->param.opt_num = len - 1;
 	    iseq->body->param.opt_table = opt_table;
 	}
-      case T_NIL:
-	break;
-      default:
+    }
+    else if (!NIL_P(arg_opt_labels)) {
 	rb_raise(rb_eTypeError, ":opt param is not an array: %+"PRIsVALUE,
 		 arg_opt_labels);
     }
 
-    switch (TYPE(keywords)) {
-      case T_ARRAY:
+    if (RB_TYPE_P(keywords, T_ARRAY)) {
 	iseq->body->param.keyword = iseq_build_kw(iseq, params, keywords);
-      case T_NIL:
-	break;
-      default:
+    }
+    else if (!NIL_P(keywords)) {
 	rb_raise(rb_eTypeError, ":keywords param is not an array: %+"PRIsVALUE,
 		 keywords);
     }
@@ -6860,46 +9760,48 @@ rb_iseq_build_from_ary(rb_iseq_t *iseq, VALUE misc, VALUE locals, VALUE params,
 
     /* body */
     iseq_build_from_ary_body(iseq, anchor, body, labels_wrapper);
+
+    iseq->body->param.size = arg_size;
+    iseq->body->local_table_size = local_size;
+    iseq->body->stack_max = stack_max;
 }
 
 /* for parser */
 
 int
-rb_dvar_defined(ID id, const rb_block_t *base_block)
-{
-    const rb_iseq_t *iseq;
-
-    if (base_block && (iseq = base_block->iseq)) {
-	while (iseq->body->type == ISEQ_TYPE_BLOCK ||
-	       iseq->body->type == ISEQ_TYPE_RESCUE ||
-	       iseq->body->type == ISEQ_TYPE_ENSURE ||
-	       iseq->body->type == ISEQ_TYPE_EVAL ||
-	       iseq->body->type == ISEQ_TYPE_MAIN
+rb_dvar_defined(ID id, const rb_iseq_t *iseq)
+{
+    if (iseq) {
+	const struct rb_iseq_constant_body *body = iseq->body;
+	while (body->type == ISEQ_TYPE_BLOCK ||
+	       body->type == ISEQ_TYPE_RESCUE ||
+	       body->type == ISEQ_TYPE_ENSURE ||
+	       body->type == ISEQ_TYPE_EVAL ||
+	       body->type == ISEQ_TYPE_MAIN
 	       ) {
 	    unsigned int i;
 
-	    for (i = 0; i < iseq->body->local_table_size; i++) {
-		if (iseq->body->local_table[i] == id) {
+	    for (i = 0; i < body->local_table_size; i++) {
+		if (body->local_table[i] == id) {
 		    return 1;
 		}
 	    }
-	    iseq = iseq->body->parent_iseq;
+	    iseq = body->parent_iseq;
+	    body = iseq->body;
 	}
     }
     return 0;
 }
 
 int
-rb_local_defined(ID id, const rb_block_t *base_block)
+rb_local_defined(ID id, const rb_iseq_t *iseq)
 {
-    const rb_iseq_t *iseq;
-
-    if (base_block && base_block->iseq) {
+    if (iseq) {
 	unsigned int i;
-	iseq = base_block->iseq->body->local_iseq;
+	const struct rb_iseq_constant_body *const body = iseq->body->local_iseq->body;
 
-	for (i=0; i<iseq->body->local_table_size; i++) {
-	    if (iseq->body->local_table[i] == id) {
+	for (i=0; i<body->local_table_size; i++) {
+	    if (body->local_table[i] == id) {
 		return 1;
 	    }
 	}
@@ -6908,102 +9810,119 @@ rb_local_defined(ID id, const rb_block_t *base_block)
 }
 
 static int
-caller_location(VALUE *path, VALUE *absolute_path)
+caller_location(VALUE *path, VALUE *realpath)
 {
-    const rb_thread_t *const th = GET_THREAD();
+    const rb_execution_context_t *ec = GET_EC();
     const rb_control_frame_t *const cfp =
-	rb_vm_get_ruby_level_next_cfp(th, th->cfp);
+        rb_vm_get_ruby_level_next_cfp(ec, ec->cfp);
 
     if (cfp) {
 	int line = rb_vm_get_sourceline(cfp);
-	*path = cfp->iseq->body->location.path;
-	*absolute_path = cfp->iseq->body->location.absolute_path;
+	*path = rb_iseq_path(cfp->iseq);
+	*realpath = rb_iseq_realpath(cfp->iseq);
 	return line;
     }
     else {
-	*path = rb_fstring_cstr("<compiled>");
-	*absolute_path = *path;
+	*path = rb_fstring_lit("<compiled>");
+	*realpath = *path;
 	return 1;
     }
 }
 
 typedef struct {
     VALUE arg;
-    rb_insn_func_t func;
+    VALUE func;
     int line;
 } accessor_args;
 
 static const rb_iseq_t *
-method_for_self(VALUE name, VALUE arg, rb_insn_func_t func,
-		VALUE (*build)(rb_iseq_t *, LINK_ANCHOR *, VALUE))
+method_for_self(VALUE name, VALUE arg, const struct rb_builtin_function *func,
+                void (*build)(rb_iseq_t *, LINK_ANCHOR *, const void *))
 {
-    VALUE path, absolute_path;
+    VALUE path, realpath;
     accessor_args acc;
 
     acc.arg = arg;
-    acc.func = func;
-    acc.line = caller_location(&path, &absolute_path);
-    return rb_iseq_new_with_opt((NODE *)IFUNC_NEW(build, (VALUE)&acc, 0),
-				rb_sym2str(name), path, absolute_path,
-				INT2FIX(acc.line), 0, ISEQ_TYPE_METHOD, 0);
+    acc.func = (VALUE)func;
+    acc.line = caller_location(&path, &realpath);
+    struct rb_iseq_new_with_callback_callback_func *ifunc =
+        rb_iseq_new_with_callback_new_callback(build, &acc);
+    return rb_iseq_new_with_callback(ifunc,
+			     rb_sym2str(name), path, realpath,
+			     INT2FIX(acc.line), 0, ISEQ_TYPE_METHOD, 0);
 }
 
-static VALUE
-for_self_aref(rb_iseq_t *iseq, LINK_ANCHOR *ret, VALUE a)
+static void
+for_self_aref(rb_iseq_t *iseq, LINK_ANCHOR *ret, const void *a)
 {
     const accessor_args *const args = (void *)a;
     const int line = args->line;
+    struct rb_iseq_constant_body *const body = iseq->body;
 
     iseq_set_local_table(iseq, 0);
-    iseq->body->param.lead_num = 0;
-    iseq->body->param.size = 0;
+    body->param.lead_num = 0;
+    body->param.size = 0;
 
     ADD_INSN1(ret, line, putobject, args->arg);
-    ADD_INSN1(ret, line, opt_call_c_function, (VALUE)args->func);
-    return Qnil;
+    ADD_INSN1(ret, line, invokebuiltin, args->func);
 }
 
-static VALUE
-for_self_aset(rb_iseq_t *iseq, LINK_ANCHOR *ret, VALUE a)
+static void
+for_self_aset(rb_iseq_t *iseq, LINK_ANCHOR *ret, const void *a)
 {
     const accessor_args *const args = (void *)a;
     const int line = args->line;
+    struct rb_iseq_constant_body *const body = iseq->body;
     static const ID vars[] = {1, idUScore};
 
     iseq_set_local_table(iseq, vars);
-    iseq->body->param.lead_num = 1;
-    iseq->body->param.size = 1;
+    body->param.lead_num = 1;
+    body->param.size = 1;
 
-    ADD_INSN2(ret, line, getlocal, INT2FIX(numberof(vars)-0), INT2FIX(0));
+    ADD_GETLOCAL(ret, line, numberof(vars)-1, 0);
     ADD_INSN1(ret, line, putobject, args->arg);
-    ADD_INSN1(ret, line, opt_call_c_function, (VALUE)args->func);
-    ADD_INSN(ret, line, pop);
-    return Qnil;
+    ADD_INSN1(ret, line, invokebuiltin, args->func);
 }
 
 /*
  * func (index) -> (value)
  */
 const rb_iseq_t *
-rb_method_for_self_aref(VALUE name, VALUE arg, rb_insn_func_t func)
+rb_method_for_self_aref(VALUE name, VALUE arg, const struct rb_builtin_function *func)
 {
     return method_for_self(name, arg, func, for_self_aref);
 }
 
 /*
- * func (index, value) -> (index, value)
+ * func (index, value) -> (value)
  */
 const rb_iseq_t *
-rb_method_for_self_aset(VALUE name, VALUE arg, rb_insn_func_t func)
+rb_method_for_self_aset(VALUE name, VALUE arg, const struct rb_builtin_function *func)
 {
     return method_for_self(name, arg, func, for_self_aset);
 }
 
 /* ISeq binary format */
 
+#ifndef IBF_ISEQ_DEBUG
+#define IBF_ISEQ_DEBUG 0
+#endif
+
+#ifndef IBF_ISEQ_ENABLE_LOCAL_BUFFER
+#define IBF_ISEQ_ENABLE_LOCAL_BUFFER 0
+#endif
+
 typedef unsigned int ibf_offset_t;
 #define IBF_OFFSET(ptr) ((ibf_offset_t)(VALUE)(ptr))
 
+#define IBF_MAJOR_VERSION ISEQ_MAJOR_VERSION
+#if RUBY_DEVEL
+#define IBF_DEVEL_VERSION 3
+#define IBF_MINOR_VERSION (ISEQ_MINOR_VERSION * 10000 + IBF_DEVEL_VERSION)
+#else
+#define IBF_MINOR_VERSION ISEQ_MINOR_VERSION
+#endif
+
 struct ibf_header {
     char magic[4]; /* YARB */
     unsigned int major_version;
@@ -7012,81 +9931,202 @@ struct ibf_header {
     unsigned int extra_size;
 
     unsigned int iseq_list_size;
-    unsigned int id_list_size;
-    unsigned int object_list_size;
-
+    unsigned int global_object_list_size;
     ibf_offset_t iseq_list_offset;
-    ibf_offset_t id_list_offset;
-    ibf_offset_t object_list_offset;
+    ibf_offset_t global_object_list_offset;
 };
 
-struct ibf_id_entry {
-    enum {
-	ibf_id_enc_ascii,
-	ibf_id_enc_utf8,
-	ibf_id_enc_other
-    } enc : 2;
-    char body[1];
+struct ibf_dump_buffer {
+    VALUE str;
+    st_table *obj_table; /* obj -> obj number */
 };
 
 struct ibf_dump {
-    VALUE str;
-    VALUE iseq_list;      /* [iseq0 offset, ...] */
-    VALUE obj_list;       /* [objs] */
     st_table *iseq_table; /* iseq -> iseq number */
-    st_table *id_table;   /* id -> id number */
+    struct ibf_dump_buffer global_buffer;
+    struct ibf_dump_buffer *current_buffer;
 };
 
 rb_iseq_t * iseq_alloc(void);
 
-struct ibf_load {
+struct ibf_load_buffer {
     const char *buff;
+    ibf_offset_t size;
+
+    VALUE obj_list; /* [obj0, ...] */
+    unsigned int obj_list_size;
+    ibf_offset_t obj_list_offset;
+};
+
+struct ibf_load {
     const struct ibf_header *header;
-    ID *id_list;     /* [id0, ...] */
-    VALUE iseq_list; /* [iseq0, ...] */
-    VALUE obj_list;  /* [obj0, ...] */
+    VALUE iseq_list;       /* [iseq0, ...] */
+    struct ibf_load_buffer global_buffer;
     VALUE loader_obj;
-    VALUE str;
     rb_iseq_t *iseq;
+    VALUE str;
+    struct ibf_load_buffer *current_buffer;
+};
+
+struct pinned_list {
+    long size;
+    VALUE * buffer;
+};
+
+static void
+pinned_list_mark(void *ptr)
+{
+    long i;
+    struct pinned_list *list = (struct pinned_list *)ptr;
+    for (i = 0; i < list->size; i++) {
+        if (list->buffer[i]) {
+            rb_gc_mark(list->buffer[i]);
+        }
+    }
+}
+
+static void
+pinned_list_free(void *ptr)
+{
+    struct pinned_list *list = (struct pinned_list *)ptr;
+    xfree(list->buffer);
+    xfree(ptr);
+}
+
+static size_t
+pinned_list_memsize(const void *ptr)
+{
+    struct pinned_list *list = (struct pinned_list *)ptr;
+    return sizeof(struct pinned_list) + (list->size * sizeof(VALUE *));
+}
+
+static const rb_data_type_t pinned_list_type = {
+    "pinned_list",
+    {pinned_list_mark, pinned_list_free, pinned_list_memsize,},
+    0, 0, RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FREE_IMMEDIATELY
 };
 
+static VALUE
+pinned_list_fetch(VALUE list, long offset)
+{
+    struct pinned_list * ptr;
+
+    TypedData_Get_Struct(list, struct pinned_list, &pinned_list_type, ptr);
+
+    if (offset >= ptr->size) {
+        rb_raise(rb_eIndexError, "object index out of range: %ld", offset);
+    }
+
+    return ptr->buffer[offset];
+}
+
+static void
+pinned_list_store(VALUE list, long offset, VALUE object)
+{
+    struct pinned_list * ptr;
+
+    TypedData_Get_Struct(list, struct pinned_list, &pinned_list_type, ptr);
+
+    if (offset >= ptr->size) {
+        rb_raise(rb_eIndexError, "object index out of range: %ld", offset);
+    }
+
+    RB_OBJ_WRITE(list, &ptr->buffer[offset], object);
+}
+
+static VALUE
+pinned_list_new(long size)
+{
+    struct pinned_list * ptr;
+    VALUE obj_list =
+        TypedData_Make_Struct(0, struct pinned_list, &pinned_list_type, ptr);
+
+    ptr->buffer = xcalloc(size, sizeof(VALUE));
+    ptr->size = size;
+
+    return obj_list;
+}
+
 static ibf_offset_t
 ibf_dump_pos(struct ibf_dump *dump)
 {
-    return (unsigned int)rb_str_strlen(dump->str);
+    long pos = RSTRING_LEN(dump->current_buffer->str);
+#if SIZEOF_LONG > SIZEOF_INT
+    if (pos >= UINT_MAX) {
+        rb_raise(rb_eRuntimeError, "dump size exceeds");
+    }
+#endif
+    return (unsigned int)pos;
+}
+
+static void
+ibf_dump_align(struct ibf_dump *dump, size_t align)
+{
+    ibf_offset_t pos = ibf_dump_pos(dump);
+    if (pos % align) {
+        static const char padding[sizeof(VALUE)];
+        size_t size = align - ((size_t)pos % align);
+#if SIZEOF_LONG > SIZEOF_INT
+        if (pos + size >= UINT_MAX) {
+            rb_raise(rb_eRuntimeError, "dump size exceeds");
+        }
+#endif
+        for (; size > sizeof(padding); size -= sizeof(padding)) {
+            rb_str_cat(dump->current_buffer->str, padding, sizeof(padding));
+        }
+        rb_str_cat(dump->current_buffer->str, padding, size);
+    }
 }
 
 static ibf_offset_t
 ibf_dump_write(struct ibf_dump *dump, const void *buff, unsigned long size)
 {
     ibf_offset_t pos = ibf_dump_pos(dump);
-    rb_str_cat(dump->str, (const char *)buff, size);
+    rb_str_cat(dump->current_buffer->str, (const char *)buff, size);
     /* TODO: overflow check */
     return pos;
 }
 
+static ibf_offset_t
+ibf_dump_write_byte(struct ibf_dump *dump, unsigned char byte)
+{
+    return ibf_dump_write(dump, &byte, sizeof(unsigned char));
+}
+
 static void
 ibf_dump_overwrite(struct ibf_dump *dump, void *buff, unsigned int size, long offset)
 {
-    VALUE str = dump->str;
+    VALUE str = dump->current_buffer->str;
     char *ptr = RSTRING_PTR(str);
     if ((unsigned long)(size + offset) > (unsigned long)RSTRING_LEN(str))
-	rb_bug("ibf_dump_overwrite: overflow");
+        rb_bug("ibf_dump_overwrite: overflow");
     memcpy(ptr + offset, buff, size);
 }
 
+static const void *
+ibf_load_ptr(const struct ibf_load *load, ibf_offset_t *offset, int size)
+{
+    ibf_offset_t beg = *offset;
+    *offset += size;
+    return load->current_buffer->buff + beg;
+}
+
 static void *
-ibf_load_alloc(const struct ibf_load *load, ibf_offset_t offset, int size)
+ibf_load_alloc(const struct ibf_load *load, ibf_offset_t offset, size_t x, size_t y)
 {
-    void *buff = ruby_xmalloc(size);
-    memcpy(buff, load->buff + offset, size);
+    void *buff = ruby_xmalloc2(x, y);
+    size_t size = x * y;
+    memcpy(buff, load->current_buffer->buff + offset, size);
     return buff;
 }
 
-#define IBF_W(b, type, n) (type *)(VALUE)ibf_dump_write(dump, (b), sizeof(type) * (n))
+#define IBF_W_ALIGN(type) (RUBY_ALIGNOF(type) > 1 ? ibf_dump_align(dump, RUBY_ALIGNOF(type)) : (void)0)
+
+#define IBF_W(b, type, n) (IBF_W_ALIGN(type), (type *)(VALUE)IBF_WP(b, type, n))
 #define IBF_WV(variable)   ibf_dump_write(dump, &(variable), sizeof(variable))
 #define IBF_WP(b, type, n) ibf_dump_write(dump, (b), sizeof(type) * (n))
-#define IBF_R(val, type, n) (type *)ibf_load_alloc(load, IBF_OFFSET(val), sizeof(type) * (n))
+#define IBF_R(val, type, n) (type *)ibf_load_alloc(load, IBF_OFFSET(val), sizeof(type), (n))
+#define IBF_ZERO(variable) memset(&(variable), 0, sizeof(variable))
 
 static int
 ibf_table_lookup(struct st_table *table, st_data_t key)
@@ -7094,21 +10134,21 @@ ibf_table_lookup(struct st_table *table, st_data_t key)
     st_data_t val;
 
     if (st_lookup(table, key, &val)) {
-	return (int)val;
+        return (int)val;
     }
     else {
-	return -1;
+        return -1;
     }
 }
 
 static int
-ibf_table_index(struct st_table *table, st_data_t key)
+ibf_table_find_or_insert(struct st_table *table, st_data_t key)
 {
     int index = ibf_table_lookup(table, key);
 
     if (index < 0) { /* not found */
-	index = (int)table->num_entries;
-	st_insert(table, key, (st_data_t)index);
+        index = (int)table->num_entries;
+        st_insert(table, key, (st_data_t)index);
     }
 
     return index;
@@ -7116,464 +10156,826 @@ ibf_table_index(struct st_table *table, st_data_t key)
 
 /* dump/load generic */
 
+static void ibf_dump_object_list(struct ibf_dump *dump, ibf_offset_t *obj_list_offset, unsigned int *obj_list_size);
+
 static VALUE ibf_load_object(const struct ibf_load *load, VALUE object_index);
 static rb_iseq_t *ibf_load_iseq(const struct ibf_load *load, const rb_iseq_t *index_iseq);
 
+static st_table *
+ibf_dump_object_table_new(void)
+{
+    st_table *obj_table = st_init_numtable(); /* need free */
+    st_insert(obj_table, (st_data_t)Qnil, (st_data_t)0); /* 0th is nil */
+
+    return obj_table;
+}
+
 static VALUE
 ibf_dump_object(struct ibf_dump *dump, VALUE obj)
 {
-    long index = RARRAY_LEN(dump->obj_list);
-    long i;
-    for (i=0; i<index; i++) {
-	if (RARRAY_AREF(dump->obj_list, i) == obj) return (VALUE)i; /* dedup */
-    }
-    rb_ary_push(dump->obj_list, obj);
-    return (VALUE)index;
+    return ibf_table_find_or_insert(dump->current_buffer->obj_table, (st_data_t)obj);
 }
 
 static VALUE
 ibf_dump_id(struct ibf_dump *dump, ID id)
 {
-    return (VALUE)ibf_table_index(dump->id_table, (st_data_t)id);
+    if (id == 0 || rb_id2name(id) == NULL) {
+        return 0;
+    }
+    return ibf_dump_object(dump, rb_id2sym(id));
 }
 
 static ID
 ibf_load_id(const struct ibf_load *load, const ID id_index)
 {
-    ID id;
-
     if (id_index == 0) {
-	id = 0;
+        return 0;
     }
-    else {
-	id = load->id_list[(long)id_index];
-
-	if (id == 0) {
-	    long *indices = (long *)(load->buff + load->header->id_list_offset);
-	    VALUE str = ibf_load_object(load, indices[id_index]);
-	    id = NIL_P(str) ? 0 : rb_intern_str(str); /* str == nil -> internal junk id */
-	    load->id_list[(long)id_index] = id;
-	}
-    }
-
-    return id;
+    VALUE sym = ibf_load_object(load, id_index);
+    return rb_sym2id(sym);
 }
 
 /* dump/load: code */
 
-static VALUE
-ibf_dump_callinfo(struct ibf_dump *dump, const struct rb_call_info *ci)
-{
-    return (ci->flag & VM_CALL_KWARG) ? Qtrue : Qfalse;
-}
-
 static ibf_offset_t ibf_dump_iseq_each(struct ibf_dump *dump, const rb_iseq_t *iseq);
 
-static rb_iseq_t *
+static int
 ibf_dump_iseq(struct ibf_dump *dump, const rb_iseq_t *iseq)
 {
     if (iseq == NULL) {
-	return (rb_iseq_t *)-1;
+        return -1;
     }
     else {
-	int iseq_index = ibf_table_lookup(dump->iseq_table, (st_data_t)iseq);
-	if (iseq_index < 0) {
-	    iseq_index = ibf_table_index(dump->iseq_table, (st_data_t)iseq);
-	    rb_ary_store(dump->iseq_list, iseq_index, LONG2NUM(ibf_dump_iseq_each(dump, rb_iseq_check(iseq))));
-	}
-	return (rb_iseq_t *)(VALUE)iseq_index;
+        return ibf_table_find_or_insert(dump->iseq_table, (st_data_t)iseq);
     }
 }
 
-static VALUE
-ibf_dump_gentry(struct ibf_dump *dump, const struct rb_global_entry *entry)
+static unsigned char
+ibf_load_byte(const struct ibf_load *load, ibf_offset_t *offset)
 {
-    return (VALUE)ibf_dump_id(dump, entry->id);
+    if (*offset >= load->current_buffer->size) { rb_raise(rb_eRuntimeError, "invalid bytecode"); }
+    return (unsigned char)load->current_buffer->buff[(*offset)++];
+}
+
+/*
+ * Small uint serialization
+ * 0x00000000_00000000 - 0x00000000_0000007f: 1byte | XXXX XXX1 |
+ * 0x00000000_00000080 - 0x00000000_00003fff: 2byte | XXXX XX10 | XXXX XXXX |
+ * 0x00000000_00004000 - 0x00000000_001fffff: 3byte | XXXX X100 | XXXX XXXX | XXXX XXXX |
+ * 0x00000000_00020000 - 0x00000000_0fffffff: 4byte | XXXX 1000 | XXXX XXXX | XXXX XXXX | XXXX XXXX |
+ * ...
+ * 0x00010000_00000000 - 0x00ffffff_ffffffff: 8byte | 1000 0000 | XXXX XXXX | XXXX XXXX | XXXX XXXX | XXXX XXXX | XXXX XXXX | XXXX XXXX | XXXX XXXX |
+ * 0x01000000_00000000 - 0xffffffff_ffffffff: 9byte | 0000 0000 | XXXX XXXX | XXXX XXXX | XXXX XXXX | XXXX XXXX | XXXX XXXX | XXXX XXXX | XXXX XXXX | XXXX XXXX |
+ */
+static void
+ibf_dump_write_small_value(struct ibf_dump *dump, VALUE x)
+{
+    if (sizeof(VALUE) > 8 || CHAR_BIT != 8) {
+        ibf_dump_write(dump, &x, sizeof(VALUE));
+        return;
+    }
+
+    enum { max_byte_length = sizeof(VALUE) + 1 };
+
+    unsigned char bytes[max_byte_length];
+    ibf_offset_t n;
+
+    for (n = 0; n < sizeof(VALUE) && (x >> (7 - n)); n++, x >>= 8) {
+        bytes[max_byte_length - 1 - n] = (unsigned char)x;
+    }
+
+    x <<= 1;
+    x |= 1;
+    x <<= n;
+    bytes[max_byte_length - 1 - n] = (unsigned char)x;
+    n++;
+
+    ibf_dump_write(dump, bytes + max_byte_length - n, n);
 }
 
 static VALUE
-ibf_load_gentry(const struct ibf_load *load, const struct rb_global_entry *entry)
+ibf_load_small_value(const struct ibf_load *load, ibf_offset_t *offset)
+{
+    if (sizeof(VALUE) > 8 || CHAR_BIT != 8) {
+        union { char s[sizeof(VALUE)]; VALUE v; } x;
+
+        memcpy(x.s, load->current_buffer->buff + *offset, sizeof(VALUE));
+        *offset += sizeof(VALUE);
+
+        return x.v;
+    }
+
+    enum { max_byte_length = sizeof(VALUE) + 1 };
+
+    const unsigned char *buffer = (const unsigned char *)load->current_buffer->buff;
+    const unsigned char c = buffer[*offset];
+
+    ibf_offset_t n =
+        c & 1 ? 1 :
+        c == 0 ? 9 : ntz_int32(c) + 1;
+    VALUE x = (VALUE)c >> n;
+
+    if (*offset + n > load->current_buffer->size) {
+        rb_raise(rb_eRuntimeError, "invalid byte sequence");
+    }
+
+    ibf_offset_t i;
+    for (i = 1; i < n; i++) {
+        x <<= 8;
+        x |= (VALUE)buffer[*offset + i];
+    }
+
+    *offset += n;
+    return x;
+}
+
+static void
+ibf_dump_builtin(struct ibf_dump *dump, const struct rb_builtin_function *bf)
 {
-    ID gid = ibf_load_id(load, (ID)(VALUE)entry);
-    return (VALUE)rb_global_entry(gid);
+    // short: index
+    // short: name.length
+    // bytes: name
+    // // omit argc (only verify with name)
+    ibf_dump_write_small_value(dump, (VALUE)bf->index);
+
+    size_t len = strlen(bf->name);
+    ibf_dump_write_small_value(dump, (VALUE)len);
+    ibf_dump_write(dump, bf->name, len);
 }
 
-static VALUE *
-ibf_dump_code(struct ibf_dump *dump, const rb_iseq_t *iseq)
+static const struct rb_builtin_function *
+ibf_load_builtin(const struct ibf_load *load, ibf_offset_t *offset)
 {
-    const int iseq_size = iseq->body->iseq_size;
-    int code_index;
-    VALUE *code;
-    const VALUE *orig_code = rb_iseq_original_iseq(iseq);
+    int i = (int)ibf_load_small_value(load, offset);
+    int len = (int)ibf_load_small_value(load, offset);
+    const char *name = (char *)ibf_load_ptr(load, offset, len);
 
-    code = ALLOCA_N(VALUE, iseq_size);
+    if (0) {
+        fprintf(stderr, "%.*s!!\n", len, name);
+    }
 
-    for (code_index=0; code_index<iseq_size;) {
-	const VALUE insn = orig_code[code_index];
-	const char *types = insn_op_types(insn);
-	int op_index;
-
-	code[code_index++] = (VALUE)insn;
-
-	for (op_index=0; types[op_index]; op_index++, code_index++) {
-	    VALUE op = orig_code[code_index];
-	    switch (types[op_index]) {
-	      case TS_CDHASH:
-	      case TS_VALUE:
-		code[code_index] = ibf_dump_object(dump, op);
-		break;
-	      case TS_ISEQ:
-		code[code_index] = (VALUE)ibf_dump_iseq(dump, (const rb_iseq_t *)op);
-		break;
-	      case TS_IC:
-		{
-		    unsigned int i;
-		    for (i=0; i<iseq->body->is_size; i++) {
-			if (op == (VALUE)&iseq->body->is_entries[i]) {
-			    break;
-			}
-		    }
-		    code[code_index] = i;
-		}
-		break;
-	      case TS_CALLINFO:
-		code[code_index] = ibf_dump_callinfo(dump, (const struct rb_call_info *)op);
-		break;
-	      case TS_CALLCACHE:
-		code[code_index] = 0;
-		break;
-	      case TS_ID:
-		code[code_index] = ibf_dump_id(dump, (ID)op);
-		break;
-	      case TS_GENTRY:
-		code[code_index] = ibf_dump_gentry(dump, (const struct rb_global_entry *)op);
-		break;
-	      case TS_FUNCPTR:
-		rb_raise(rb_eRuntimeError, "TS_FUNCPTR is not supported");
-		break;
-	      default:
-		code[code_index] = op;
-		break;
-	    }
-	}
-	assert(insn_len(insn) == op_index+1);
+    const struct rb_builtin_function *table = GET_VM()->builtin_function_table;
+    if (table == NULL) rb_raise(rb_eArgError, "builtin function table is not provided");
+    if (strncmp(table[i].name, name, len) != 0) {
+        rb_raise(rb_eArgError, "builtin function index (%d) mismatch (expect %s but %s)", i, name, table[i].name);
     }
+    // fprintf(stderr, "load-builtin: name:%s(%d)\n", table[i].name, table[i].argc);
 
-    return IBF_W(code, VALUE, iseq_size);
+    return &table[i];
 }
 
-static VALUE *
-ibf_load_code(const struct ibf_load *load, const rb_iseq_t *iseq, const struct rb_iseq_constant_body *body)
+static ibf_offset_t
+ibf_dump_code(struct ibf_dump *dump, const rb_iseq_t *iseq)
 {
+    const struct rb_iseq_constant_body *const body = iseq->body;
     const int iseq_size = body->iseq_size;
     int code_index;
-    VALUE *code = IBF_R(body->iseq_encoded, VALUE, iseq_size);
+    const VALUE *orig_code = rb_iseq_original_iseq(iseq);
 
-    struct rb_call_info *ci_entries = iseq->body->ci_entries;
-    struct rb_call_info_with_kwarg *ci_kw_entries = (struct rb_call_info_with_kwarg *)&iseq->body->ci_entries[iseq->body->ci_size];
-    struct rb_call_cache *cc_entries = iseq->body->cc_entries;
-    union iseq_inline_storage_entry *is_entries = iseq->body->is_entries;
+    ibf_offset_t offset = ibf_dump_pos(dump);
 
     for (code_index=0; code_index<iseq_size;) {
-	const VALUE insn = code[code_index++];
-	const char *types = insn_op_types(insn);
-	int op_index;
-
-	for (op_index=0; types[op_index]; op_index++, code_index++) {
-	    VALUE op = code[code_index];
+        const VALUE insn = orig_code[code_index++];
+        const char *types = insn_op_types(insn);
+        int op_index;
+
+        /* opcode */
+        if (insn >= 0x100) { rb_raise(rb_eRuntimeError, "invalid instruction"); }
+        ibf_dump_write_small_value(dump, insn);
+
+        /* operands */
+        for (op_index=0; types[op_index]; op_index++, code_index++) {
+            VALUE op = orig_code[code_index];
+            VALUE wv;
+
+            switch (types[op_index]) {
+              case TS_CDHASH:
+              case TS_VALUE:
+                wv = ibf_dump_object(dump, op);
+                break;
+              case TS_ISEQ:
+                wv = (VALUE)ibf_dump_iseq(dump, (const rb_iseq_t *)op);
+                break;
+              case TS_IC:
+              case TS_IVC:
+              case TS_ISE:
+                {
+                    unsigned int i;
+                    for (i=0; i<body->is_size; i++) {
+                        if (op == (VALUE)&body->is_entries[i]) {
+                            break;
+                        }
+                    }
+                    wv = (VALUE)i;
+                }
+                break;
+              case TS_CALLDATA:
+                {
+                    goto skip_wv;
+                }
+              case TS_ID:
+                wv = ibf_dump_id(dump, (ID)op);
+                break;
+              case TS_FUNCPTR:
+                rb_raise(rb_eRuntimeError, "TS_FUNCPTR is not supported");
+                goto skip_wv;
+              case TS_BUILTIN:
+                ibf_dump_builtin(dump, (const struct rb_builtin_function *)op);
+                goto skip_wv;
+              default:
+                wv = op;
+                break;
+            }
+            ibf_dump_write_small_value(dump, wv);
+          skip_wv:;
+        }
+        assert(insn_len(insn) == op_index+1);
+    }
+
+    return offset;
+}
 
-	    switch (types[op_index]) {
-	      case TS_CDHASH:
-	      case TS_VALUE:
-		code[code_index] = ibf_load_object(load, op);
-		break;
-	      case TS_ISEQ:
-		code[code_index] = (VALUE)ibf_load_iseq(load, (const rb_iseq_t *)op);
-		break;
-	      case TS_IC:
-		code[code_index] = (VALUE)&is_entries[(int)op];
-		break;
-	      case TS_CALLINFO:
-		code[code_index] = op ? (VALUE)ci_kw_entries++ : (VALUE)ci_entries++; /* op is Qtrue (kw) or Qfalse (!kw) */
-		break;
-	      case TS_CALLCACHE:
-		code[code_index] = (VALUE)cc_entries++;
-		break;
-	      case TS_ID:
-		code[code_index] = ibf_load_id(load, (ID)op);
-		break;
-	      case TS_GENTRY:
-		code[code_index] = ibf_load_gentry(load, (const struct rb_global_entry *)op);
-		break;
-	      case TS_FUNCPTR:
-		rb_raise(rb_eRuntimeError, "TS_FUNCPTR is not supported");
-		break;
-	      default:
-		/* code[code_index] = op; */
-		break;
-	    }
-	}
-	assert(insn_len(insn) == op_index+1);
-    };
+static VALUE *
+ibf_load_code(const struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t bytecode_offset, ibf_offset_t bytecode_size, unsigned int iseq_size)
+{
+    VALUE iseqv = (VALUE)iseq;
+    unsigned int code_index;
+    ibf_offset_t reading_pos = bytecode_offset;
+    VALUE *code = ALLOC_N(VALUE, iseq_size);
 
+    struct rb_iseq_constant_body *load_body = iseq->body;
+    struct rb_call_data *cd_entries = load_body->call_data;
+    union iseq_inline_storage_entry *is_entries = load_body->is_entries;
 
+    for (code_index=0; code_index<iseq_size;) {
+        /* opcode */
+        const VALUE insn = code[code_index++] = ibf_load_small_value(load, &reading_pos);
+        const char *types = insn_op_types(insn);
+        int op_index;
+
+        /* operands */
+        for (op_index=0; types[op_index]; op_index++, code_index++) {
+            switch (types[op_index]) {
+              case TS_CDHASH:
+              case TS_VALUE:
+                {
+                    VALUE op = ibf_load_small_value(load, &reading_pos);
+                    VALUE v = ibf_load_object(load, op);
+                    code[code_index] = v;
+                    if (!SPECIAL_CONST_P(v)) {
+                        RB_OBJ_WRITTEN(iseqv, Qundef, v);
+                        FL_SET(iseqv, ISEQ_MARKABLE_ISEQ);
+                    }
+                    break;
+                }
+              case TS_ISEQ:
+                {
+                    VALUE op = (VALUE)ibf_load_small_value(load, &reading_pos);
+                    VALUE v = (VALUE)ibf_load_iseq(load, (const rb_iseq_t *)op);
+                    code[code_index] = v;
+                    if (!SPECIAL_CONST_P(v)) {
+                        RB_OBJ_WRITTEN(iseqv, Qundef, v);
+                        FL_SET(iseqv, ISEQ_MARKABLE_ISEQ);
+                    }
+                    break;
+                }
+              case TS_ISE:
+              case TS_IC:
+              case TS_IVC:
+                {
+                    VALUE op = ibf_load_small_value(load, &reading_pos);
+                    code[code_index] = (VALUE)&is_entries[op];
+                }
+                FL_SET(iseqv, ISEQ_MARKABLE_ISEQ);
+                break;
+              case TS_CALLDATA:
+                {
+                    code[code_index] = (VALUE)cd_entries++;
+                }
+                break;
+              case TS_ID:
+                {
+                    VALUE op = ibf_load_small_value(load, &reading_pos);
+                    code[code_index] = ibf_load_id(load, (ID)(VALUE)op);
+                }
+                break;
+              case TS_FUNCPTR:
+                rb_raise(rb_eRuntimeError, "TS_FUNCPTR is not supported");
+                break;
+              case TS_BUILTIN:
+                code[code_index] = (VALUE)ibf_load_builtin(load, &reading_pos);
+                break;
+              default:
+                code[code_index] = ibf_load_small_value(load, &reading_pos);
+                continue;
+            }
+        }
+        if (insn_len(insn) != op_index+1) {
+            rb_raise(rb_eRuntimeError, "operand size mismatch");
+        }
+    }
+    load_body->iseq_encoded = code;
+    load_body->iseq_size = code_index;
+
+    assert(code_index == iseq_size);
+    assert(reading_pos == bytecode_offset + bytecode_size);
     return code;
 }
 
-static VALUE *
+static ibf_offset_t
 ibf_dump_param_opt_table(struct ibf_dump *dump, const rb_iseq_t *iseq)
 {
     int opt_num = iseq->body->param.opt_num;
 
     if (opt_num > 0) {
-	return IBF_W(iseq->body->param.opt_table, VALUE, opt_num + 1);
+        IBF_W_ALIGN(VALUE);
+        return ibf_dump_write(dump, iseq->body->param.opt_table, sizeof(VALUE) * (opt_num + 1));
     }
     else {
-	return NULL;
+        return ibf_dump_pos(dump);
     }
 }
 
 static VALUE *
-ibf_load_param_opt_table(const struct ibf_load *load, const struct rb_iseq_constant_body *body)
+ibf_load_param_opt_table(const struct ibf_load *load, ibf_offset_t opt_table_offset, int opt_num)
 {
-    int opt_num = body->param.opt_num;
-
     if (opt_num > 0) {
-	ibf_offset_t offset = IBF_OFFSET(body->param.opt_table);
-	VALUE *table = ALLOC_N(VALUE, opt_num+1);
-	MEMCPY(table, load->buff + offset, VALUE, opt_num+1);
-	return table;
+        VALUE *table = ALLOC_N(VALUE, opt_num+1);
+        MEMCPY(table, load->current_buffer->buff + opt_table_offset, VALUE, opt_num+1);
+        return table;
     }
     else {
-	return NULL;
+        return NULL;
     }
 }
 
-static struct rb_iseq_param_keyword *
+static ibf_offset_t
 ibf_dump_param_keyword(struct ibf_dump *dump, const rb_iseq_t *iseq)
 {
     const struct rb_iseq_param_keyword *kw = iseq->body->param.keyword;
 
     if (kw) {
-	struct rb_iseq_param_keyword dump_kw = *kw;
-	int dv_num = kw->num - kw->required_num;
-	ID *ids = kw->num > 0 ? ALLOCA_N(ID, kw->num) : NULL;
-	VALUE *dvs = dv_num > 0 ? ALLOCA_N(VALUE, dv_num) : NULL;
-	int i;
+        struct rb_iseq_param_keyword dump_kw = *kw;
+        int dv_num = kw->num - kw->required_num;
+        ID *ids = kw->num > 0 ? ALLOCA_N(ID, kw->num) : NULL;
+        VALUE *dvs = dv_num > 0 ? ALLOCA_N(VALUE, dv_num) : NULL;
+        int i;
 
-	for (i=0; i<kw->num; i++) ids[i] = (ID)ibf_dump_id(dump, kw->table[i]);
-	for (i=0; i<dv_num; i++) dvs[i] = (VALUE)ibf_dump_object(dump, kw->default_values[i]);
+        for (i=0; i<kw->num; i++) ids[i] = (ID)ibf_dump_id(dump, kw->table[i]);
+        for (i=0; i<dv_num; i++) dvs[i] = (VALUE)ibf_dump_object(dump, kw->default_values[i]);
 
-	dump_kw.table = IBF_W(ids, ID, kw->num);
-	dump_kw.default_values = IBF_W(dvs, VALUE, dv_num);
-	return IBF_W(&dump_kw, struct rb_iseq_param_keyword, 1);
+        dump_kw.table = IBF_W(ids, ID, kw->num);
+        dump_kw.default_values = IBF_W(dvs, VALUE, dv_num);
+        IBF_W_ALIGN(struct rb_iseq_param_keyword);
+        return ibf_dump_write(dump, &dump_kw, sizeof(struct rb_iseq_param_keyword) * 1);
     }
     else {
-	return NULL;
+        return 0;
     }
 }
 
 static const struct rb_iseq_param_keyword *
-ibf_load_param_keyword(const struct ibf_load *load, const struct rb_iseq_constant_body *body)
-{
-    if (body->param.keyword) {
-	struct rb_iseq_param_keyword *kw = IBF_R(body->param.keyword, struct rb_iseq_param_keyword, 1);
-	ID *ids = IBF_R(kw->table, ID, kw->num);
-	int dv_num = kw->num - kw->required_num;
-	VALUE *dvs = IBF_R(kw->default_values, VALUE, dv_num);
-	int i;
+ibf_load_param_keyword(const struct ibf_load *load, ibf_offset_t param_keyword_offset)
+{
+    if (param_keyword_offset) {
+        struct rb_iseq_param_keyword *kw = IBF_R(param_keyword_offset, struct rb_iseq_param_keyword, 1);
+        ID *ids = IBF_R(kw->table, ID, kw->num);
+        int dv_num = kw->num - kw->required_num;
+        VALUE *dvs = IBF_R(kw->default_values, VALUE, dv_num);
+        int i;
+
+        for (i=0; i<kw->num; i++) {
+            ids[i] = ibf_load_id(load, ids[i]);
+        }
+        for (i=0; i<dv_num; i++) {
+            dvs[i] = ibf_load_object(load, dvs[i]);
+        }
+
+        kw->table = ids;
+        kw->default_values = dvs;
+        return kw;
+    }
+    else {
+        return NULL;
+    }
+}
 
-	for (i=0; i<kw->num; i++) {
-	    ids[i] = ibf_load_id(load, ids[i]);
-	}
-	for (i=0; i<dv_num; i++) {
-	    dvs[i] = ibf_load_object(load, dvs[i]);
-	}
+static ibf_offset_t
+ibf_dump_insns_info_body(struct ibf_dump *dump, const rb_iseq_t *iseq)
+{
+    ibf_offset_t offset = ibf_dump_pos(dump);
+    const struct iseq_insn_info_entry *entries = iseq->body->insns_info.body;
 
-	kw->table = ids;
-	kw->default_values = dvs;
-	return kw;
+    unsigned int i;
+    for (i = 0; i < iseq->body->insns_info.size; i++) {
+        ibf_dump_write_small_value(dump, entries[i].line_no);
+        ibf_dump_write_small_value(dump, entries[i].events);
     }
-    else {
-	return NULL;
+
+    return offset;
+}
+
+static struct iseq_insn_info_entry *
+ibf_load_insns_info_body(const struct ibf_load *load, ibf_offset_t body_offset, unsigned int size)
+{
+    ibf_offset_t reading_pos = body_offset;
+    struct iseq_insn_info_entry *entries = ALLOC_N(struct iseq_insn_info_entry, size);
+
+    unsigned int i;
+    for (i = 0; i < size; i++) {
+        entries[i].line_no = (int)ibf_load_small_value(load, &reading_pos);
+        entries[i].events = (rb_event_flag_t)ibf_load_small_value(load, &reading_pos);
     }
+
+    return entries;
 }
 
-static struct iseq_line_info_entry *
-ibf_dump_line_info_table(struct ibf_dump *dump, const rb_iseq_t *iseq)
+static ibf_offset_t
+ibf_dump_insns_info_positions(struct ibf_dump *dump, const unsigned int *positions, unsigned int size)
 {
-    return IBF_W(iseq->body->line_info_table, struct iseq_line_info_entry, iseq->body->line_info_size);
+    ibf_offset_t offset = ibf_dump_pos(dump);
+
+    unsigned int last = 0;
+    unsigned int i;
+    for (i = 0; i < size; i++) {
+        ibf_dump_write_small_value(dump, positions[i] - last);
+        last = positions[i];
+    }
+
+    return offset;
 }
 
-static struct iseq_line_info_entry *
-ibf_load_line_info_table(const struct ibf_load *load, const struct rb_iseq_constant_body *body)
+static unsigned int *
+ibf_load_insns_info_positions(const struct ibf_load *load, ibf_offset_t positions_offset, unsigned int size)
 {
-    return IBF_R(body->line_info_table, struct iseq_line_info_entry, body->line_info_size);
+    ibf_offset_t reading_pos = positions_offset;
+    unsigned int *positions = ALLOC_N(unsigned int, size);
+
+    unsigned int last = 0;
+    unsigned int i;
+    for (i = 0; i < size; i++) {
+        positions[i] = last + (unsigned int)ibf_load_small_value(load, &reading_pos);
+        last = positions[i];
+    }
+
+    return positions;
 }
 
-static ID *
+static ibf_offset_t
 ibf_dump_local_table(struct ibf_dump *dump, const rb_iseq_t *iseq)
 {
-    const int size = iseq->body->local_size - 1;
+    const struct rb_iseq_constant_body *const body = iseq->body;
+    const int size = body->local_table_size;
     ID *table = ALLOCA_N(ID, size);
     int i;
 
     for (i=0; i<size; i++) {
-	table[i] = ibf_dump_id(dump, iseq->body->local_table[i]);
+        table[i] = ibf_dump_id(dump, body->local_table[i]);
     }
 
-    return IBF_W(table, ID, size);
+    IBF_W_ALIGN(ID);
+    return ibf_dump_write(dump, table, sizeof(ID) * size);
 }
 
 static ID *
-ibf_load_local_table(const struct ibf_load *load, const struct rb_iseq_constant_body *body)
+ibf_load_local_table(const struct ibf_load *load, ibf_offset_t local_table_offset, int size)
 {
-    const int size = body->local_size - 1;
-
     if (size > 0) {
-	ID *table = IBF_R(body->local_table, ID, size);
-	int i;
+        ID *table = IBF_R(local_table_offset, ID, size);
+        int i;
 
-	for (i=0; i<size; i++) {
-	    table[i] = ibf_load_id(load, table[i]);
-	}
-	return table;
+        for (i=0; i<size; i++) {
+            table[i] = ibf_load_id(load, table[i]);
+        }
+        return table;
     }
     else {
-	return NULL;
+        return NULL;
     }
 }
 
-static struct iseq_catch_table *
+static ibf_offset_t
 ibf_dump_catch_table(struct ibf_dump *dump, const rb_iseq_t *iseq)
 {
     const struct iseq_catch_table *table = iseq->body->catch_table;
 
     if (table) {
-	int byte_size = iseq_catch_table_bytes(iseq->body->catch_table->size);
-	struct iseq_catch_table *dump_table = (struct iseq_catch_table *)ALLOCA_N(char, byte_size);
-	unsigned int i;
-	dump_table->size = table->size;
-	for (i=0; i<table->size; i++) {
-	    dump_table->entries[i] = table->entries[i];
-	    dump_table->entries[i].iseq = ibf_dump_iseq(dump, table->entries[i].iseq);
-	}
-	return (struct iseq_catch_table *)(VALUE)ibf_dump_write(dump, dump_table, byte_size);
+        int *iseq_indices = ALLOCA_N(int, table->size);
+        unsigned int i;
+
+        for (i=0; i<table->size; i++) {
+            iseq_indices[i] = ibf_dump_iseq(dump, table->entries[i].iseq);
+        }
+
+        const ibf_offset_t offset = ibf_dump_pos(dump);
+
+        for (i=0; i<table->size; i++) {
+            ibf_dump_write_small_value(dump, iseq_indices[i]);
+            ibf_dump_write_small_value(dump, table->entries[i].type);
+            ibf_dump_write_small_value(dump, table->entries[i].start);
+            ibf_dump_write_small_value(dump, table->entries[i].end);
+            ibf_dump_write_small_value(dump, table->entries[i].cont);
+            ibf_dump_write_small_value(dump, table->entries[i].sp);
+        }
+        return offset;
     }
     else {
-	return NULL;
+        return ibf_dump_pos(dump);
     }
 }
 
 static struct iseq_catch_table *
-ibf_load_catch_table(const struct ibf_load *load, const struct rb_iseq_constant_body *body)
+ibf_load_catch_table(const struct ibf_load *load, ibf_offset_t catch_table_offset, unsigned int size)
 {
-    if (body->catch_table) {
-	struct iseq_catch_table *table;
-	unsigned int i;
-	unsigned int size;
-	size = *(unsigned int *)(load->buff + IBF_OFFSET(body->catch_table));
-	table = ibf_load_alloc(load, IBF_OFFSET(body->catch_table), iseq_catch_table_bytes(size));
-	for (i=0; i<size; i++) {
-	    table->entries[i].iseq = ibf_load_iseq(load, table->entries[i].iseq);
-	}
-	return table;
+    if (size) {
+        struct iseq_catch_table *table = ruby_xmalloc(iseq_catch_table_bytes(size));
+        table->size = size;
+
+        ibf_offset_t reading_pos = catch_table_offset;
+
+        unsigned int i;
+        for (i=0; i<table->size; i++) {
+            int iseq_index = (int)ibf_load_small_value(load, &reading_pos);
+            table->entries[i].type = (enum catch_type)ibf_load_small_value(load, &reading_pos);
+            table->entries[i].start = (unsigned int)ibf_load_small_value(load, &reading_pos);
+            table->entries[i].end = (unsigned int)ibf_load_small_value(load, &reading_pos);
+            table->entries[i].cont = (unsigned int)ibf_load_small_value(load, &reading_pos);
+            table->entries[i].sp = (unsigned int)ibf_load_small_value(load, &reading_pos);
+
+            table->entries[i].iseq = ibf_load_iseq(load, (const rb_iseq_t *)(VALUE)iseq_index);
+        }
+        return table;
     }
     else {
-	return NULL;
+        return NULL;
     }
 }
 
-static struct rb_call_info *
+static ibf_offset_t
 ibf_dump_ci_entries(struct ibf_dump *dump, const rb_iseq_t *iseq)
 {
-    const unsigned int ci_size = iseq->body->ci_size;
-    const unsigned int ci_kw_size = iseq->body->ci_kw_size;
-    const struct rb_call_info *ci_entries = iseq->body->ci_entries;
-    struct rb_call_info *dump_ci_entries;
-    struct rb_call_info_with_kwarg *dump_ci_kw_entries;
-    int byte_size = ci_size * sizeof(struct rb_call_info) +
-                    ci_kw_size * sizeof(struct rb_call_info_with_kwarg);
+    const struct rb_iseq_constant_body *const body = iseq->body;
+    const unsigned int ci_size = body->ci_size;
+    const struct rb_call_data *cds = body->call_data;
+
+    ibf_offset_t offset = ibf_dump_pos(dump);
+
     unsigned int i;
 
-    dump_ci_entries = (struct rb_call_info *)ALLOCA_N(char, byte_size);
-    dump_ci_kw_entries = (struct rb_call_info_with_kwarg *)&dump_ci_entries[ci_size];
-    memcpy(dump_ci_entries, ci_entries, byte_size);
+    for (i = 0; i < ci_size; i++) {
+        const struct rb_callinfo *ci = cds[i].ci;
+        if (ci != NULL) {
+            ibf_dump_write_small_value(dump, ibf_dump_id(dump, vm_ci_mid(ci)));
+            ibf_dump_write_small_value(dump, vm_ci_flag(ci));
+            ibf_dump_write_small_value(dump, vm_ci_argc(ci));
 
-    for (i=0; i<ci_size; i++) { /* conver ID for each ci */
-	dump_ci_entries[i].mid = ibf_dump_id(dump, dump_ci_entries[i].mid);
+            const struct rb_callinfo_kwarg *kwarg = vm_ci_kwarg(ci);
+            if (kwarg) {
+                int len = kwarg->keyword_len;
+                ibf_dump_write_small_value(dump, len);
+                for (int j=0; j<len; j++) {
+                    VALUE keyword = ibf_dump_object(dump, kwarg->keywords[j]);
+                    ibf_dump_write_small_value(dump, keyword);
+                }
+            }
+            else {
+                ibf_dump_write_small_value(dump, 0);
+            }
+        }
+        else {
+            // TODO: truncate NULL ci from call_data.
+            ibf_dump_write_small_value(dump, (VALUE)-1);
+        }
     }
-    for (i=0; i<ci_kw_size; i++) {
-	const struct rb_call_info_kw_arg *kw_arg = dump_ci_kw_entries[i].kw_arg;
-	int j;
-	VALUE *keywords = ALLOCA_N(VALUE, kw_arg->keyword_len);
-	for (j=0; j<kw_arg->keyword_len; j++) {
-	    keywords[j] = (VALUE)ibf_dump_object(dump, kw_arg->keywords[j]); /* kw_arg->keywords[n] is Symbol */
-	}
-	dump_ci_kw_entries[i].kw_arg = (struct rb_call_info_kw_arg *)(VALUE)ibf_dump_write(dump, &kw_arg->keyword_len, sizeof(int));
-	ibf_dump_write(dump, keywords, sizeof(VALUE) * kw_arg->keyword_len);
 
-	dump_ci_kw_entries[i].ci.mid = ibf_dump_id(dump, dump_ci_kw_entries[i].ci.mid);
+    return offset;
+}
+
+static enum rb_id_table_iterator_result
+dump_outer_variable(ID id, VALUE val, void *dump)
+{
+    ibf_dump_write_small_value(dump, ibf_dump_id(dump, id));
+    ibf_dump_write_small_value(dump, val);
+
+    return ID_TABLE_CONTINUE;
+}
+
+static ibf_offset_t
+ibf_dump_outer_variables(struct ibf_dump *dump, const rb_iseq_t *iseq)
+{
+    struct rb_id_table * ovs = iseq->body->outer_variables;
+
+    ibf_offset_t offset = ibf_dump_pos(dump);
+
+    if (ovs) {
+        ibf_dump_write_small_value(dump, (VALUE)rb_id_table_size(ovs));
+        rb_id_table_foreach(ovs, dump_outer_variable, (void *)dump);
     }
-    return (struct rb_call_info *)(VALUE)ibf_dump_write(dump, dump_ci_entries, byte_size);
+    else {
+        ibf_dump_write_small_value(dump, (VALUE)0);
+    }
+
+    return offset;
 }
 
-static struct rb_call_info *
-ibf_load_ci_entries(const struct ibf_load *load, const struct rb_iseq_constant_body *body)
+/* note that we dump out rb_call_info but load back rb_call_data */
+static void
+ibf_load_ci_entries(const struct ibf_load *load,
+                    ibf_offset_t ci_entries_offset,
+                    unsigned int ci_size,
+                    struct rb_call_data **cd_ptr)
 {
+    ibf_offset_t reading_pos = ci_entries_offset;
+
     unsigned int i;
-    const unsigned int ci_size = body->ci_size;
-    const unsigned int ci_kw_size = body->ci_kw_size;
-    struct rb_call_info *ci_entries = ibf_load_alloc(load, IBF_OFFSET(body->ci_entries),
-						     sizeof(struct rb_call_info) * body->ci_size +
-						     sizeof(struct rb_call_info_with_kwarg) * body->ci_kw_size);
-    struct rb_call_info_with_kwarg *ci_kw_entries = (struct rb_call_info_with_kwarg *)&ci_entries[ci_size];
 
-    for (i=0; i<ci_size; i++) {
-	ci_entries[i].mid = ibf_load_id(load, ci_entries[i].mid);
+    struct rb_call_data *cds = ZALLOC_N(struct rb_call_data, ci_size);
+    *cd_ptr = cds;
+
+    for (i = 0; i < ci_size; i++) {
+        VALUE mid_index = ibf_load_small_value(load, &reading_pos);
+        if (mid_index != (VALUE)-1) {
+            ID mid = ibf_load_id(load, mid_index);
+            unsigned int flag = (unsigned int)ibf_load_small_value(load, &reading_pos);
+            unsigned int argc = (unsigned int)ibf_load_small_value(load, &reading_pos);
+
+            struct rb_callinfo_kwarg *kwarg = NULL;
+            int kwlen = (int)ibf_load_small_value(load, &reading_pos);
+            if (kwlen > 0) {
+                kwarg = rb_xmalloc_mul_add(kwlen, sizeof(VALUE), sizeof(struct rb_callinfo_kwarg));
+                kwarg->keyword_len = kwlen;
+                for (int j=0; j<kwlen; j++) {
+                    VALUE keyword = ibf_load_small_value(load, &reading_pos);
+                    kwarg->keywords[j] = ibf_load_object(load, keyword);
+                }
+            }
+
+            cds[i].ci = vm_ci_new(mid, flag, argc, kwarg);
+            RB_OBJ_WRITTEN(load->iseq, Qundef, cds[i].ci);
+            cds[i].cc = vm_cc_empty();
+        }
+        else {
+            // NULL ci
+            cds[i].ci = NULL;
+            cds[i].cc = NULL;
+        }
     }
-    for (i=0; i<ci_kw_size; i++) {
-	int j;
-	ibf_offset_t kw_arg_offset = IBF_OFFSET(ci_kw_entries[i].kw_arg);
-	const int keyword_len = *(int *)(load->buff + kw_arg_offset);
-	const VALUE *keywords = (VALUE *)(load->buff + kw_arg_offset + sizeof(int));
-	struct rb_call_info_kw_arg *kw_arg = ruby_xmalloc(sizeof(struct rb_call_info_kw_arg) + sizeof(VALUE) * (keyword_len - 1));
-	kw_arg->keyword_len = keyword_len;
-	for (j=0; j<kw_arg->keyword_len; j++) {
-	    kw_arg->keywords[j] = (VALUE)ibf_load_object(load, keywords[j]);
-	}
-	ci_kw_entries[i].kw_arg = kw_arg;
-	ci_kw_entries[i].ci.mid = ibf_load_id(load, ci_kw_entries[i].ci.mid);
+}
+
+static struct rb_id_table *
+ibf_load_outer_variables(const struct ibf_load * load, ibf_offset_t outer_variables_offset)
+{
+    ibf_offset_t reading_pos = outer_variables_offset;
+
+    struct rb_id_table *tbl = NULL;
+
+    size_t table_size = (size_t)ibf_load_small_value(load, &reading_pos);
+
+    if (table_size > 0) {
+        tbl = rb_id_table_create(table_size);
     }
 
-    return ci_entries;
+    for (size_t i = 0; i < table_size; i++) {
+        ID key = ibf_load_id(load, (ID)ibf_load_small_value(load, &reading_pos));
+        VALUE value = ibf_load_small_value(load, &reading_pos);
+        rb_id_table_insert(tbl, key, value);
+    }
+
+    return tbl;
 }
 
 static ibf_offset_t
 ibf_dump_iseq_each(struct ibf_dump *dump, const rb_iseq_t *iseq)
 {
-    struct rb_iseq_constant_body dump_body;
-    dump_body = *iseq->body;
+    assert(dump->current_buffer == &dump->global_buffer);
+
+    unsigned int *positions;
 
-    dump_body.location.path = ibf_dump_object(dump, dump_body.location.path);
-    dump_body.location.absolute_path = ibf_dump_object(dump, dump_body.location.absolute_path);
-    dump_body.location.base_label = ibf_dump_object(dump, dump_body.location.base_label);
-    dump_body.location.label = ibf_dump_object(dump, dump_body.location.label);
+    const struct rb_iseq_constant_body *body = iseq->body;
 
-    dump_body.iseq_encoded =    ibf_dump_code(dump, iseq);
-    dump_body.param.opt_table = ibf_dump_param_opt_table(dump, iseq);
-    dump_body.param.keyword =   ibf_dump_param_keyword(dump, iseq);
-    dump_body.line_info_table = ibf_dump_line_info_table(dump, iseq);
-    dump_body.local_table =     ibf_dump_local_table(dump, iseq);
-    dump_body.catch_table =     ibf_dump_catch_table(dump, iseq);
-    dump_body.parent_iseq =     ibf_dump_iseq(dump, iseq->body->parent_iseq);
-    dump_body.local_iseq =      ibf_dump_iseq(dump, iseq->body->local_iseq);
-    dump_body.is_entries =      NULL;
-    dump_body.ci_entries =      ibf_dump_ci_entries(dump, iseq);
-    dump_body.cc_entries =      NULL;
-    dump_body.mark_ary =        ISEQ_FLIP_CNT(iseq);
+    const VALUE location_pathobj_index = ibf_dump_object(dump, body->location.pathobj); /* TODO: freeze */
+    const VALUE location_base_label_index = ibf_dump_object(dump, body->location.base_label);
+    const VALUE location_label_index = ibf_dump_object(dump, body->location.label);
 
-    return ibf_dump_write(dump, &dump_body, sizeof(dump_body));
+#if IBF_ISEQ_ENABLE_LOCAL_BUFFER
+    ibf_offset_t iseq_start = ibf_dump_pos(dump);
+
+    struct ibf_dump_buffer *saved_buffer = dump->current_buffer;
+    struct ibf_dump_buffer buffer;
+    buffer.str = rb_str_new(0, 0);
+    buffer.obj_table = ibf_dump_object_table_new();
+    dump->current_buffer = &buffer;
+#endif
+
+    const ibf_offset_t bytecode_offset =        ibf_dump_code(dump, iseq);
+    const ibf_offset_t bytecode_size =          ibf_dump_pos(dump) - bytecode_offset;
+    const ibf_offset_t param_opt_table_offset = ibf_dump_param_opt_table(dump, iseq);
+    const ibf_offset_t param_keyword_offset =   ibf_dump_param_keyword(dump, iseq);
+    const ibf_offset_t insns_info_body_offset = ibf_dump_insns_info_body(dump, iseq);
+
+    positions = rb_iseq_insns_info_decode_positions(iseq->body);
+    const ibf_offset_t insns_info_positions_offset = ibf_dump_insns_info_positions(dump, positions, body->insns_info.size);
+    ruby_xfree(positions);
+
+    const ibf_offset_t local_table_offset = ibf_dump_local_table(dump, iseq);
+    const unsigned int catch_table_size =   body->catch_table ? body->catch_table->size : 0;
+    const ibf_offset_t catch_table_offset = ibf_dump_catch_table(dump, iseq);
+    const int parent_iseq_index =           ibf_dump_iseq(dump, iseq->body->parent_iseq);
+    const int local_iseq_index =            ibf_dump_iseq(dump, iseq->body->local_iseq);
+    const ibf_offset_t ci_entries_offset =  ibf_dump_ci_entries(dump, iseq);
+    const ibf_offset_t outer_variables_offset = ibf_dump_outer_variables(dump, iseq);
+
+#if IBF_ISEQ_ENABLE_LOCAL_BUFFER
+    ibf_offset_t local_obj_list_offset;
+    unsigned int local_obj_list_size;
+
+    ibf_dump_object_list(dump, &local_obj_list_offset, &local_obj_list_size);
+#endif
+
+    ibf_offset_t body_offset = ibf_dump_pos(dump);
+
+    /* dump the constant body */
+    unsigned int param_flags =
+        (body->param.flags.has_lead         << 0) |
+        (body->param.flags.has_opt          << 1) |
+        (body->param.flags.has_rest         << 2) |
+        (body->param.flags.has_post         << 3) |
+        (body->param.flags.has_kw           << 4) |
+        (body->param.flags.has_kwrest       << 5) |
+        (body->param.flags.has_block        << 6) |
+        (body->param.flags.ambiguous_param0 << 7) |
+        (body->param.flags.accepts_no_kwarg << 8) |
+        (body->param.flags.ruby2_keywords   << 9);
+
+#if IBF_ISEQ_ENABLE_LOCAL_BUFFER
+#  define IBF_BODY_OFFSET(x) (x)
+#else
+#  define IBF_BODY_OFFSET(x) (body_offset - (x))
+#endif
+
+    ibf_dump_write_small_value(dump, body->type);
+    ibf_dump_write_small_value(dump, body->iseq_size);
+    ibf_dump_write_small_value(dump, IBF_BODY_OFFSET(bytecode_offset));
+    ibf_dump_write_small_value(dump, bytecode_size);
+    ibf_dump_write_small_value(dump, param_flags);
+    ibf_dump_write_small_value(dump, body->param.size);
+    ibf_dump_write_small_value(dump, body->param.lead_num);
+    ibf_dump_write_small_value(dump, body->param.opt_num);
+    ibf_dump_write_small_value(dump, body->param.rest_start);
+    ibf_dump_write_small_value(dump, body->param.post_start);
+    ibf_dump_write_small_value(dump, body->param.post_num);
+    ibf_dump_write_small_value(dump, body->param.block_start);
+    ibf_dump_write_small_value(dump, IBF_BODY_OFFSET(param_opt_table_offset));
+    ibf_dump_write_small_value(dump, param_keyword_offset);
+    ibf_dump_write_small_value(dump, location_pathobj_index);
+    ibf_dump_write_small_value(dump, location_base_label_index);
+    ibf_dump_write_small_value(dump, location_label_index);
+    ibf_dump_write_small_value(dump, body->location.first_lineno);
+    ibf_dump_write_small_value(dump, body->location.node_id);
+    ibf_dump_write_small_value(dump, body->location.code_location.beg_pos.lineno);
+    ibf_dump_write_small_value(dump, body->location.code_location.beg_pos.column);
+    ibf_dump_write_small_value(dump, body->location.code_location.end_pos.lineno);
+    ibf_dump_write_small_value(dump, body->location.code_location.end_pos.column);
+    ibf_dump_write_small_value(dump, IBF_BODY_OFFSET(insns_info_body_offset));
+    ibf_dump_write_small_value(dump, IBF_BODY_OFFSET(insns_info_positions_offset));
+    ibf_dump_write_small_value(dump, body->insns_info.size);
+    ibf_dump_write_small_value(dump, IBF_BODY_OFFSET(local_table_offset));
+    ibf_dump_write_small_value(dump, catch_table_size);
+    ibf_dump_write_small_value(dump, IBF_BODY_OFFSET(catch_table_offset));
+    ibf_dump_write_small_value(dump, parent_iseq_index);
+    ibf_dump_write_small_value(dump, local_iseq_index);
+    ibf_dump_write_small_value(dump, IBF_BODY_OFFSET(ci_entries_offset));
+    ibf_dump_write_small_value(dump, IBF_BODY_OFFSET(outer_variables_offset));
+    ibf_dump_write_small_value(dump, body->variable.flip_count);
+    ibf_dump_write_small_value(dump, body->local_table_size);
+    ibf_dump_write_small_value(dump, body->is_size);
+    ibf_dump_write_small_value(dump, body->ci_size);
+    ibf_dump_write_small_value(dump, body->stack_max);
+    ibf_dump_write_small_value(dump, body->catch_except_p);
+    ibf_dump_write_small_value(dump, body->builtin_inline_p);
+
+#undef IBF_BODY_OFFSET
+
+#if IBF_ISEQ_ENABLE_LOCAL_BUFFER
+    ibf_offset_t iseq_length_bytes = ibf_dump_pos(dump);
+
+    dump->current_buffer = saved_buffer;
+    ibf_dump_write(dump, RSTRING_PTR(buffer.str), iseq_length_bytes);
+
+    ibf_offset_t offset = ibf_dump_pos(dump);
+    ibf_dump_write_small_value(dump, iseq_start);
+    ibf_dump_write_small_value(dump, iseq_length_bytes);
+    ibf_dump_write_small_value(dump, body_offset);
+
+    ibf_dump_write_small_value(dump, local_obj_list_offset);
+    ibf_dump_write_small_value(dump, local_obj_list_size);
+
+    st_free_table(buffer.obj_table); // TODO: this leaks in case of exception
+
+    return offset;
+#else
+    return body_offset;
+#endif
 }
 
 static VALUE
@@ -7581,107 +10983,223 @@ ibf_load_location_str(const struct ibf_load *load, VALUE str_index)
 {
     VALUE str = ibf_load_object(load, str_index);
     if (str != Qnil) {
-	str = rb_fstring(str);
+        str = rb_fstring(str);
     }
     return str;
 }
 
 static void
-ibf_load_iseq_each(const struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t offset)
-{
-    struct rb_iseq_constant_body *load_body = iseq->body = ZALLOC(struct rb_iseq_constant_body);
-    const struct rb_iseq_constant_body *body = (struct rb_iseq_constant_body *)(load->buff + offset);
-
-    /* memcpy(load_body, load->buff + offset, sizeof(*load_body)); */
-    load_body->type = body->type;
-    load_body->stack_max = body->stack_max;
-    load_body->local_size = body->local_size;
-    load_body->iseq_size = body->iseq_size;
-    load_body->param = body->param;
-    load_body->local_table_size = body->local_table_size;
-    load_body->is_size = body->is_size;
-    load_body->ci_size = body->ci_size;
-    load_body->ci_kw_size = body->ci_kw_size;
-    load_body->line_info_size = body->line_info_size;
-
-    RB_OBJ_WRITE(iseq, &load_body->mark_ary, iseq_mark_ary_create((int)body->mark_ary));
-
-    RB_OBJ_WRITE(iseq, &load_body->location.path,          ibf_load_location_str(load, body->location.path));
-    RB_OBJ_WRITE(iseq, &load_body->location.absolute_path, ibf_load_location_str(load, body->location.absolute_path));
-    RB_OBJ_WRITE(iseq, &load_body->location.base_label,    ibf_load_location_str(load, body->location.base_label));
-    RB_OBJ_WRITE(iseq, &load_body->location.label,         ibf_load_location_str(load, body->location.label));
-    load_body->location.first_lineno = body->location.first_lineno;
-
-    load_body->is_entries      = ZALLOC_N(union iseq_inline_storage_entry, body->is_size);
-    load_body->ci_entries      = ibf_load_ci_entries(load, body);
-    load_body->cc_entries      = ZALLOC_N(struct rb_call_cache, body->ci_size + body->ci_kw_size);
-    load_body->param.opt_table = ibf_load_param_opt_table(load, body);
-    load_body->param.keyword   = ibf_load_param_keyword(load, body);
-    load_body->line_info_table = ibf_load_line_info_table(load, body);
-    load_body->local_table     = ibf_load_local_table(load, body);
-    load_body->catch_table     = ibf_load_catch_table(load, body);
-    load_body->parent_iseq     = ibf_load_iseq(load, body->parent_iseq);
-    load_body->local_iseq      = ibf_load_iseq(load, body->local_iseq);
-
-    load_body->iseq_encoded    = ibf_load_code(load, iseq, body);
+ibf_load_iseq_each(struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t offset)
+{
+    struct rb_iseq_constant_body *load_body = iseq->body = rb_iseq_constant_body_alloc();
 
-    rb_iseq_translate_threaded_code(iseq);
-}
+    ibf_offset_t reading_pos = offset;
 
+#if IBF_ISEQ_ENABLE_LOCAL_BUFFER
+    struct ibf_load_buffer *saved_buffer = load->current_buffer;
+    load->current_buffer = &load->global_buffer;
 
-static void
-ibf_dump_iseq_list(struct ibf_dump *dump, struct ibf_header *header)
-{
-    const long size = RARRAY_LEN(dump->iseq_list);
-    ibf_offset_t *list = ALLOCA_N(ibf_offset_t, size);
-    long i;
+    const ibf_offset_t iseq_start = (ibf_offset_t)ibf_load_small_value(load, &reading_pos);
+    const ibf_offset_t iseq_length_bytes = (ibf_offset_t)ibf_load_small_value(load, &reading_pos);
+    const ibf_offset_t body_offset = (ibf_offset_t)ibf_load_small_value(load, &reading_pos);
 
-    for (i=0; i<size; i++) {
-	list[i] = (ibf_offset_t)NUM2LONG(rb_ary_entry(dump->iseq_list, i));
-    }
+    struct ibf_load_buffer buffer;
+    buffer.buff = load->global_buffer.buff + iseq_start;
+    buffer.size = iseq_length_bytes;
+    buffer.obj_list_offset = (ibf_offset_t)ibf_load_small_value(load, &reading_pos);
+    buffer.obj_list_size = (ibf_offset_t)ibf_load_small_value(load, &reading_pos);
+    buffer.obj_list = pinned_list_new(buffer.obj_list_size);
 
-    header->iseq_list_offset = ibf_dump_write(dump, list, sizeof(ibf_offset_t) * size);
-    header->iseq_list_size = (unsigned int)size;
+    load->current_buffer = &buffer;
+    reading_pos = body_offset;
+#endif
+
+#if IBF_ISEQ_ENABLE_LOCAL_BUFFER
+#  define IBF_BODY_OFFSET(x) (x)
+#else
+#  define IBF_BODY_OFFSET(x) (offset - (x))
+#endif
+
+    const unsigned int type = (unsigned int)ibf_load_small_value(load, &reading_pos);
+    const unsigned int iseq_size = (unsigned int)ibf_load_small_value(load, &reading_pos);
+    const ibf_offset_t bytecode_offset = (ibf_offset_t)IBF_BODY_OFFSET(ibf_load_small_value(load, &reading_pos));
+    const ibf_offset_t bytecode_size = (ibf_offset_t)ibf_load_small_value(load, &reading_pos);
+    const unsigned int param_flags = (unsigned int)ibf_load_small_value(load, &reading_pos);
+    const unsigned int param_size = (unsigned int)ibf_load_small_value(load, &reading_pos);
+    const int param_lead_num = (int)ibf_load_small_value(load, &reading_pos);
+    const int param_opt_num = (int)ibf_load_small_value(load, &reading_pos);
+    const int param_rest_start = (int)ibf_load_small_value(load, &reading_pos);
+    const int param_post_start = (int)ibf_load_small_value(load, &reading_pos);
+    const int param_post_num = (int)ibf_load_small_value(load, &reading_pos);
+    const int param_block_start = (int)ibf_load_small_value(load, &reading_pos);
+    const ibf_offset_t param_opt_table_offset = (ibf_offset_t)IBF_BODY_OFFSET(ibf_load_small_value(load, &reading_pos));
+    const ibf_offset_t param_keyword_offset = (ibf_offset_t)ibf_load_small_value(load, &reading_pos);
+    const VALUE location_pathobj_index = ibf_load_small_value(load, &reading_pos);
+    const VALUE location_base_label_index = ibf_load_small_value(load, &reading_pos);
+    const VALUE location_label_index = ibf_load_small_value(load, &reading_pos);
+    const VALUE location_first_lineno = ibf_load_small_value(load, &reading_pos);
+    const int location_node_id = (int)ibf_load_small_value(load, &reading_pos);
+    const int location_code_location_beg_pos_lineno = (int)ibf_load_small_value(load, &reading_pos);
+    const int location_code_location_beg_pos_column = (int)ibf_load_small_value(load, &reading_pos);
+    const int location_code_location_end_pos_lineno = (int)ibf_load_small_value(load, &reading_pos);
+    const int location_code_location_end_pos_column = (int)ibf_load_small_value(load, &reading_pos);
+    const ibf_offset_t insns_info_body_offset = (ibf_offset_t)IBF_BODY_OFFSET(ibf_load_small_value(load, &reading_pos));
+    const ibf_offset_t insns_info_positions_offset = (ibf_offset_t)IBF_BODY_OFFSET(ibf_load_small_value(load, &reading_pos));
+    const unsigned int insns_info_size = (unsigned int)ibf_load_small_value(load, &reading_pos);
+    const ibf_offset_t local_table_offset = (ibf_offset_t)IBF_BODY_OFFSET(ibf_load_small_value(load, &reading_pos));
+    const unsigned int catch_table_size = (unsigned int)ibf_load_small_value(load, &reading_pos);
+    const ibf_offset_t catch_table_offset = (ibf_offset_t)IBF_BODY_OFFSET(ibf_load_small_value(load, &reading_pos));
+    const int parent_iseq_index = (int)ibf_load_small_value(load, &reading_pos);
+    const int local_iseq_index = (int)ibf_load_small_value(load, &reading_pos);
+    const ibf_offset_t ci_entries_offset = (ibf_offset_t)IBF_BODY_OFFSET(ibf_load_small_value(load, &reading_pos));
+    const ibf_offset_t outer_variables_offset = (ibf_offset_t)IBF_BODY_OFFSET(ibf_load_small_value(load, &reading_pos));
+    const rb_snum_t variable_flip_count = (rb_snum_t)ibf_load_small_value(load, &reading_pos);
+    const unsigned int local_table_size = (unsigned int)ibf_load_small_value(load, &reading_pos);
+    const unsigned int is_size = (unsigned int)ibf_load_small_value(load, &reading_pos);
+    const unsigned int ci_size = (unsigned int)ibf_load_small_value(load, &reading_pos);
+    const unsigned int stack_max = (unsigned int)ibf_load_small_value(load, &reading_pos);
+    const char catch_except_p = (char)ibf_load_small_value(load, &reading_pos);
+    const bool builtin_inline_p = (bool)ibf_load_small_value(load, &reading_pos);
+
+#undef IBF_BODY_OFFSET
+
+    load_body->type = type;
+    load_body->stack_max = stack_max;
+    load_body->param.flags.has_lead = (param_flags >> 0) & 1;
+    load_body->param.flags.has_opt = (param_flags >> 1) & 1;
+    load_body->param.flags.has_rest = (param_flags >> 2) & 1;
+    load_body->param.flags.has_post = (param_flags >> 3) & 1;
+    load_body->param.flags.has_kw = FALSE;
+    load_body->param.flags.has_kwrest = (param_flags >> 5) & 1;
+    load_body->param.flags.has_block = (param_flags >> 6) & 1;
+    load_body->param.flags.ambiguous_param0 = (param_flags >> 7) & 1;
+    load_body->param.flags.accepts_no_kwarg = (param_flags >> 8) & 1;
+    load_body->param.flags.ruby2_keywords = (param_flags >> 9) & 1;
+    load_body->param.size = param_size;
+    load_body->param.lead_num = param_lead_num;
+    load_body->param.opt_num = param_opt_num;
+    load_body->param.rest_start = param_rest_start;
+    load_body->param.post_start = param_post_start;
+    load_body->param.post_num = param_post_num;
+    load_body->param.block_start = param_block_start;
+    load_body->local_table_size = local_table_size;
+    load_body->is_size = is_size;
+    load_body->ci_size = ci_size;
+    load_body->insns_info.size = insns_info_size;
+
+    ISEQ_COVERAGE_SET(iseq, Qnil);
+    ISEQ_ORIGINAL_ISEQ_CLEAR(iseq);
+    iseq->body->variable.flip_count = variable_flip_count;
+
+    load_body->location.first_lineno = location_first_lineno;
+    load_body->location.node_id = location_node_id;
+    load_body->location.code_location.beg_pos.lineno = location_code_location_beg_pos_lineno;
+    load_body->location.code_location.beg_pos.column = location_code_location_beg_pos_column;
+    load_body->location.code_location.end_pos.lineno = location_code_location_end_pos_lineno;
+    load_body->location.code_location.end_pos.column = location_code_location_end_pos_column;
+    load_body->catch_except_p = catch_except_p;
+    load_body->builtin_inline_p = builtin_inline_p;
+
+    load_body->is_entries           = ZALLOC_N(union iseq_inline_storage_entry, is_size);
+                                      ibf_load_ci_entries(load, ci_entries_offset, ci_size, &load_body->call_data);
+    load_body->outer_variables      = ibf_load_outer_variables(load, outer_variables_offset);
+    load_body->param.opt_table      = ibf_load_param_opt_table(load, param_opt_table_offset, param_opt_num);
+    load_body->param.keyword        = ibf_load_param_keyword(load, param_keyword_offset);
+    load_body->param.flags.has_kw   = (param_flags >> 4) & 1;
+    load_body->insns_info.body      = ibf_load_insns_info_body(load, insns_info_body_offset, insns_info_size);
+    load_body->insns_info.positions = ibf_load_insns_info_positions(load, insns_info_positions_offset, insns_info_size);
+    load_body->local_table          = ibf_load_local_table(load, local_table_offset, local_table_size);
+    load_body->catch_table          = ibf_load_catch_table(load, catch_table_offset, catch_table_size);
+    load_body->parent_iseq          = ibf_load_iseq(load, (const rb_iseq_t *)(VALUE)parent_iseq_index);
+    load_body->local_iseq           = ibf_load_iseq(load, (const rb_iseq_t *)(VALUE)local_iseq_index);
+
+    ibf_load_code(load, iseq, bytecode_offset, bytecode_size, iseq_size);
+#if VM_INSN_INFO_TABLE_IMPL == 2
+    rb_iseq_insns_info_encode_positions(iseq);
+#endif
+
+    rb_iseq_translate_threaded_code(iseq);
+
+#if IBF_ISEQ_ENABLE_LOCAL_BUFFER
+    load->current_buffer = &load->global_buffer;
+#endif
+
+    {
+        VALUE realpath = Qnil, path = ibf_load_object(load, location_pathobj_index);
+        if (RB_TYPE_P(path, T_STRING)) {
+            realpath = path = rb_fstring(path);
+        }
+        else if (RB_TYPE_P(path, T_ARRAY)) {
+            VALUE pathobj = path;
+            if (RARRAY_LEN(pathobj) != 2) {
+                rb_raise(rb_eRuntimeError, "path object size mismatch");
+            }
+            path = rb_fstring(RARRAY_AREF(pathobj, 0));
+            realpath = RARRAY_AREF(pathobj, 1);
+            if (!NIL_P(realpath)) {
+                if (!RB_TYPE_P(realpath, T_STRING)) {
+                    rb_raise(rb_eArgError, "unexpected realpath %"PRIxVALUE
+                             "(%x), path=%+"PRIsVALUE,
+                             realpath, TYPE(realpath), path);
+                }
+                realpath = rb_fstring(realpath);
+            }
+        }
+        else {
+            rb_raise(rb_eRuntimeError, "unexpected path object");
+        }
+        rb_iseq_pathobj_set(iseq, path, realpath);
+    }
+
+    RB_OBJ_WRITE(iseq, &load_body->location.base_label,    ibf_load_location_str(load, location_base_label_index));
+    RB_OBJ_WRITE(iseq, &load_body->location.label,         ibf_load_location_str(load, location_label_index));
+
+#if IBF_ISEQ_ENABLE_LOCAL_BUFFER
+    load->current_buffer = saved_buffer;
+#endif
+    verify_call_cache(iseq);
 }
 
-struct ibf_dump_id_list_i_arg {
+struct ibf_dump_iseq_list_arg
+{
     struct ibf_dump *dump;
-    long *list;
-    int current_i;
+    VALUE offset_list;
 };
 
 static int
-ibf_dump_id_list_i(st_data_t key, st_data_t val, st_data_t ptr)
+ibf_dump_iseq_list_i(st_data_t key, st_data_t val, st_data_t ptr)
 {
-    struct ibf_dump_id_list_i_arg *arg = (struct ibf_dump_id_list_i_arg *)ptr;
-    int i = (int)val;
-    ID id = (ID)key;
-    assert(arg->current_i == i);
-    arg->current_i++;
+    const rb_iseq_t *iseq = (const rb_iseq_t *)key;
+    struct ibf_dump_iseq_list_arg *args = (struct ibf_dump_iseq_list_arg *)ptr;
 
-    if (rb_id2name(id)) {
-	arg->list[i] = (long)ibf_dump_object(arg->dump, rb_id2str(id));
-    }
-    else {
-	arg->list[i] = 0;
-    }
+    ibf_offset_t offset = ibf_dump_iseq_each(args->dump, iseq);
+    rb_ary_push(args->offset_list, UINT2NUM(offset));
 
     return ST_CONTINUE;
 }
 
 static void
-ibf_dump_id_list(struct ibf_dump *dump, struct ibf_header *header)
+ibf_dump_iseq_list(struct ibf_dump *dump, struct ibf_header *header)
 {
-    const long size = dump->id_table->num_entries;
-    struct ibf_dump_id_list_i_arg arg;
-    arg.list = ALLOCA_N(long, size);
-    arg.dump = dump;
-    arg.current_i = 0;
+    VALUE offset_list = rb_ary_tmp_new(dump->iseq_table->num_entries);
+
+    struct ibf_dump_iseq_list_arg args;
+    args.dump = dump;
+    args.offset_list = offset_list;
+
+    st_foreach(dump->iseq_table, ibf_dump_iseq_list_i, (st_data_t)&args);
+
+    st_index_t i;
+    st_index_t size = dump->iseq_table->num_entries;
+    ibf_offset_t *offsets = ALLOCA_N(ibf_offset_t, size);
 
-    st_foreach(dump->id_table, ibf_dump_id_list_i, (st_data_t)&arg);
+    for (i = 0; i < size; i++) {
+        offsets[i] = NUM2UINT(RARRAY_AREF(offset_list, i));
+    }
 
-    header->id_list_offset = ibf_dump_write(dump, arg.list, sizeof(long) * size);
-    header->id_list_size = (unsigned int)size;
+    ibf_dump_align(dump, sizeof(ibf_offset_t));
+    header->iseq_list_offset = ibf_dump_write(dump, offsets, sizeof(ibf_offset_t) * size);
+    header->iseq_list_size = (unsigned int)size;
 }
 
 #define IBF_OBJECT_INTERNAL FL_PROMOTED0
@@ -7702,13 +11220,9 @@ struct ibf_object_header {
 enum ibf_object_class_index {
     IBF_OBJECT_CLASS_OBJECT,
     IBF_OBJECT_CLASS_ARRAY,
-    IBF_OBJECT_CLASS_STANDARD_ERROR
-};
-
-struct ibf_object_string {
-    long encindex;
-    long len;
-    char ptr[1];
+    IBF_OBJECT_CLASS_STANDARD_ERROR,
+    IBF_OBJECT_CLASS_NO_MATCHING_PATTERN_ERROR,
+    IBF_OBJECT_CLASS_TYPE_ERROR,
 };
 
 struct ibf_object_regexp {
@@ -7716,14 +11230,9 @@ struct ibf_object_regexp {
     char option;
 };
 
-struct ibf_object_array {
-    long len;
-    long ary[1];
-};
-
 struct ibf_object_hash {
     long len;
-    long keyval[1];
+    long keyval[FLEX_ARY_LEN];
 };
 
 struct ibf_object_struct_range {
@@ -7736,11 +11245,11 @@ struct ibf_object_struct_range {
 
 struct ibf_object_bignum {
     ssize_t slen;
-    BDIGIT digits[1];
+    BDIGIT digits[FLEX_ARY_LEN];
 };
 
 enum ibf_object_data_type {
-    IBF_OBJECT_DATA_ENCODING
+    IBF_OBJECT_DATA_ENCODING,
 };
 
 struct ibf_object_complex_rational {
@@ -7751,21 +11260,37 @@ struct ibf_object_symbol {
     long str;
 };
 
-#define IBF_OBJHEADER(offset)     (struct ibf_object_header *)(load->buff + (offset))
-#define IBF_OBJBODY(type, offset) (type *)(load->buff + sizeof(struct ibf_object_header) + (offset))
+#define IBF_ALIGNED_OFFSET(align, offset) /* offset > 0 */ \
+    ((((offset) - 1) / (align) + 1) * (align))
+#define IBF_OBJBODY(type, offset) (const type *)\
+    ibf_load_check_offset(load, IBF_ALIGNED_OFFSET(RUBY_ALIGNOF(type), offset))
+
+static const void *
+ibf_load_check_offset(const struct ibf_load *load, size_t offset)
+{
+    if (offset >= load->current_buffer->size) {
+	rb_raise(rb_eIndexError, "object offset out of range: %"PRIdSIZE, offset);
+    }
+    return load->current_buffer->buff + offset;
+}
+
+NORETURN(static void ibf_dump_object_unsupported(struct ibf_dump *dump, VALUE obj));
 
 static void
 ibf_dump_object_unsupported(struct ibf_dump *dump, VALUE obj)
 {
-    rb_obj_info_dump(obj);
-    rb_bug("ibf_dump_object_unsupported: unsupported");
+    char buff[0x100];
+    rb_raw_obj_info(buff, sizeof(buff), obj);
+    rb_raise(rb_eNotImpError, "ibf_dump_object_unsupported: %s", buff);
 }
 
+NORETURN(static VALUE ibf_load_object_unsupported(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset));
+
 static VALUE
 ibf_load_object_unsupported(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset)
 {
-    rb_bug("unsupported");
-    return Qnil;
+    rb_raise(rb_eArgError, "unsupported");
+    UNREACHABLE_RETURN(Qnil);
 }
 
 static void
@@ -7773,27 +11298,32 @@ ibf_dump_object_class(struct ibf_dump *dump, VALUE obj)
 {
     enum ibf_object_class_index cindex;
     if (obj == rb_cObject) {
-	cindex = IBF_OBJECT_CLASS_OBJECT;
+        cindex = IBF_OBJECT_CLASS_OBJECT;
     }
     else if (obj == rb_cArray) {
-	cindex = IBF_OBJECT_CLASS_ARRAY;
+        cindex = IBF_OBJECT_CLASS_ARRAY;
     }
     else if (obj == rb_eStandardError) {
-	cindex = IBF_OBJECT_CLASS_STANDARD_ERROR;
+        cindex = IBF_OBJECT_CLASS_STANDARD_ERROR;
+    }
+    else if (obj == rb_eNoMatchingPatternError) {
+        cindex = IBF_OBJECT_CLASS_NO_MATCHING_PATTERN_ERROR;
+    }
+    else if (obj == rb_eTypeError) {
+        cindex = IBF_OBJECT_CLASS_TYPE_ERROR;
     }
     else {
-	rb_obj_info_dump(obj);
-	rb_p(obj);
-	rb_bug("unsupported class");
+        rb_obj_info_dump(obj);
+        rb_p(obj);
+        rb_bug("unsupported class");
     }
-    ibf_dump_write(dump, &cindex, sizeof(cindex));
+    ibf_dump_write_small_value(dump, (VALUE)cindex);
 }
 
 static VALUE
 ibf_load_object_class(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset)
 {
-    enum ibf_object_class_index *cindexp = IBF_OBJBODY(enum ibf_object_class_index, offset);
-    enum ibf_object_class_index cindex = *cindexp;
+    enum ibf_object_class_index cindex = (enum ibf_object_class_index)ibf_load_small_value(load, &offset);
 
     switch (cindex) {
       case IBF_OBJECT_CLASS_OBJECT:
@@ -7802,9 +11332,13 @@ ibf_load_object_class(const struct ibf_load *load, const struct ibf_object_heade
 	return rb_cArray;
       case IBF_OBJECT_CLASS_STANDARD_ERROR:
 	return rb_eStandardError;
+      case IBF_OBJECT_CLASS_NO_MATCHING_PATTERN_ERROR:
+        return rb_eNoMatchingPatternError;
+      case IBF_OBJECT_CLASS_TYPE_ERROR:
+        return rb_eTypeError;
     }
 
-    rb_bug("ibf_load_object_class: unknown class (%d)", (int)cindex);
+    rb_raise(rb_eArgError, "ibf_load_object_class: unknown class (%d)", (int)cindex);
 }
 
 
@@ -7812,13 +11346,13 @@ static void
 ibf_dump_object_float(struct ibf_dump *dump, VALUE obj)
 {
     double dbl = RFLOAT_VALUE(obj);
-    ibf_dump_write(dump, &dbl, sizeof(dbl));
+    (void)IBF_W(&dbl, double, 1);
 }
 
 static VALUE
 ibf_load_object_float(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset)
 {
-    double *dblp = IBF_OBJBODY(double, offset);
+    const double *dblp = IBF_OBJBODY(double, offset);
     return DBL2NUM(*dblp);
 }
 
@@ -7830,26 +11364,30 @@ ibf_dump_object_string(struct ibf_dump *dump, VALUE obj)
     const char *ptr = RSTRING_PTR(obj);
 
     if (encindex > RUBY_ENCINDEX_BUILTIN_MAX) {
-	rb_encoding *enc = rb_enc_from_index((int)encindex);
-	const char *enc_name = rb_enc_name(enc);
-	encindex = RUBY_ENCINDEX_BUILTIN_MAX + ibf_dump_object(dump, rb_str_new2(enc_name));
+        rb_encoding *enc = rb_enc_from_index((int)encindex);
+        const char *enc_name = rb_enc_name(enc);
+        encindex = RUBY_ENCINDEX_BUILTIN_MAX + ibf_dump_object(dump, rb_str_new2(enc_name));
     }
 
-    IBF_WV(encindex);
-    IBF_WV(len);
+    ibf_dump_write_small_value(dump, encindex);
+    ibf_dump_write_small_value(dump, len);
     IBF_WP(ptr, char, len);
 }
 
 static VALUE
 ibf_load_object_string(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset)
 {
-    const struct ibf_object_string *string = IBF_OBJBODY(struct ibf_object_string, offset);
-    VALUE str = rb_str_new(string->ptr, string->len);
-    int encindex = (int)string->encindex;
+    ibf_offset_t reading_pos = offset;
+
+    int encindex = (int)ibf_load_small_value(load, &reading_pos);
+    const long len = (long)ibf_load_small_value(load, &reading_pos);
+    const char *ptr = load->current_buffer->buff + reading_pos;
+
+    VALUE str = rb_str_new(ptr, len);
 
     if (encindex > RUBY_ENCINDEX_BUILTIN_MAX) {
-	VALUE enc_name_str = ibf_load_object(load, encindex - RUBY_ENCINDEX_BUILTIN_MAX);
-	encindex = rb_enc_find_index(RSTRING_PTR(enc_name_str));
+        VALUE enc_name_str = ibf_load_object(load, encindex - RUBY_ENCINDEX_BUILTIN_MAX);
+        encindex = rb_enc_find_index(RSTRING_PTR(enc_name_str));
     }
     rb_enc_associate_index(str, encindex);
 
@@ -7862,19 +11400,24 @@ ibf_load_object_string(const struct ibf_load *load, const struct ibf_object_head
 static void
 ibf_dump_object_regexp(struct ibf_dump *dump, VALUE obj)
 {
+    VALUE srcstr = RREGEXP_SRC(obj);
     struct ibf_object_regexp regexp;
-    regexp.srcstr = RREGEXP_SRC(obj);
     regexp.option = (char)rb_reg_options(obj);
-    regexp.srcstr = (long)ibf_dump_object(dump, regexp.srcstr);
-    IBF_WV(regexp);
+    regexp.srcstr = (long)ibf_dump_object(dump, srcstr);
+
+    ibf_dump_write_byte(dump, (unsigned char)regexp.option);
+    ibf_dump_write_small_value(dump, regexp.srcstr);
 }
 
 static VALUE
 ibf_load_object_regexp(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset)
 {
-    const struct ibf_object_regexp *regexp = IBF_OBJBODY(struct ibf_object_regexp, offset);
-    VALUE srcstr = ibf_load_object(load, regexp->srcstr);
-    VALUE reg = rb_reg_compile(srcstr, (int)regexp->option, NULL, 0);
+    struct ibf_object_regexp regexp;
+    regexp.option = ibf_load_byte(load, &offset);
+    regexp.srcstr = ibf_load_small_value(load, &offset);
+
+    VALUE srcstr = ibf_load_object(load, regexp.srcstr);
+    VALUE reg = rb_reg_compile(srcstr, (int)regexp.option, NULL, 0);
 
     if (header->internal) rb_obj_hide(reg);
     if (header->frozen)   rb_obj_freeze(reg);
@@ -7885,23 +11428,27 @@ ibf_load_object_regexp(const struct ibf_load *load, const struct ibf_object_head
 static void
 ibf_dump_object_array(struct ibf_dump *dump, VALUE obj)
 {
-    long i, len = (int)RARRAY_LEN(obj);
-    IBF_WV(len);
+    long i, len = RARRAY_LEN(obj);
+    ibf_dump_write_small_value(dump, len);
     for (i=0; i<len; i++) {
-	long index = (long)ibf_dump_object(dump, RARRAY_AREF(obj, i));
-	IBF_WV(index);
+        long index = (long)ibf_dump_object(dump, RARRAY_AREF(obj, i));
+        ibf_dump_write_small_value(dump, index);
     }
 }
 
 static VALUE
 ibf_load_object_array(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset)
 {
-    const struct ibf_object_array *array = IBF_OBJBODY(struct ibf_object_array, offset);
-    VALUE ary = rb_ary_new_capa(array->len);
+    ibf_offset_t reading_pos = offset;
+
+    const long len = (long)ibf_load_small_value(load, &reading_pos);
+
+    VALUE ary = rb_ary_new_capa(len);
     int i;
 
-    for (i=0; i<array->len; i++) {
-	rb_ary_push(ary, ibf_load_object(load, array->ary[i]));
+    for (i=0; i<len; i++) {
+        const VALUE index = ibf_load_small_value(load, &reading_pos);
+        rb_ary_push(ary, ibf_load_object(load, index));
     }
 
     if (header->internal) rb_obj_hide(ary);
@@ -7914,10 +11461,12 @@ static int
 ibf_dump_object_hash_i(st_data_t key, st_data_t val, st_data_t ptr)
 {
     struct ibf_dump *dump = (struct ibf_dump *)ptr;
-    long key_index = (long)ibf_dump_object(dump, (VALUE)key);
-    long val_index = (long)ibf_dump_object(dump, (VALUE)val);
-    IBF_WV(key_index);
-    IBF_WV(val_index);
+
+    VALUE key_index = ibf_dump_object(dump, (VALUE)key);
+    VALUE val_index = ibf_dump_object(dump, (VALUE)val);
+
+    ibf_dump_write_small_value(dump, key_index);
+    ibf_dump_write_small_value(dump, val_index);
     return ST_CONTINUE;
 }
 
@@ -7925,21 +11474,25 @@ static void
 ibf_dump_object_hash(struct ibf_dump *dump, VALUE obj)
 {
     long len = RHASH_SIZE(obj);
-    IBF_WV(len);
-    if (len > 0) st_foreach(RHASH(obj)->ntbl, ibf_dump_object_hash_i, (st_data_t)dump);
+    ibf_dump_write_small_value(dump, (VALUE)len);
+
+    if (len > 0) rb_hash_foreach(obj, ibf_dump_object_hash_i, (VALUE)dump);
 }
 
 static VALUE
 ibf_load_object_hash(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset)
 {
-    const struct ibf_object_hash *hash = IBF_OBJBODY(struct ibf_object_hash, offset);
-    VALUE obj = rb_hash_new();
+    long len = (long)ibf_load_small_value(load, &offset);
+    VALUE obj = rb_hash_new_with_size(len);
     int i;
 
-    for (i=0; i<hash->len; i++) {
-	VALUE key = ibf_load_object(load, hash->keyval[i*2  ]);
-	VALUE val = ibf_load_object(load, hash->keyval[i*2+1]);
-	rb_hash_aset(obj, key, val);
+    for (i = 0; i < len; i++) {
+        VALUE key_index = ibf_load_small_value(load, &offset);
+        VALUE val_index = ibf_load_small_value(load, &offset);
+
+        VALUE key = ibf_load_object(load, key_index);
+        VALUE val = ibf_load_object(load, val_index);
+        rb_hash_aset(obj, key, val);
     }
     rb_hash_rehash(obj);
 
@@ -7953,19 +11506,22 @@ static void
 ibf_dump_object_struct(struct ibf_dump *dump, VALUE obj)
 {
     if (rb_obj_is_kind_of(obj, rb_cRange)) {
-	struct ibf_object_struct_range range;
-	VALUE beg, end;
-	range.len = 3;
-	range.class_index = 0;
+        struct ibf_object_struct_range range;
+        VALUE beg, end;
+        IBF_ZERO(range);
+        range.len = 3;
+        range.class_index = 0;
 
-	rb_range_values(obj, &beg, &end, &range.excl);
-	range.beg = (long)ibf_dump_object(dump, beg);
-	range.end = (long)ibf_dump_object(dump, end);
+        rb_range_values(obj, &beg, &end, &range.excl);
+        range.beg = (long)ibf_dump_object(dump, beg);
+        range.end = (long)ibf_dump_object(dump, end);
 
-	IBF_WV(range);
+        IBF_W_ALIGN(struct ibf_object_struct_range);
+        IBF_WV(range);
     }
     else {
-	rb_bug("ibf_dump_object_struct: unsupported class");
+        rb_raise(rb_eNotImpError, "ibf_dump_object_struct: unsupported class %"PRIsVALUE,
+                 rb_class_name(CLASS_OF(obj)));
     }
 }
 
@@ -7988,7 +11544,7 @@ ibf_dump_object_bignum(struct ibf_dump *dump, VALUE obj)
     ssize_t slen = BIGNUM_SIGN(obj) > 0 ? len : len * -1;
     BDIGIT *d = BIGNUM_DIGITS(obj);
 
-    IBF_WV(slen);
+    (void)IBF_W(&slen, ssize_t, 1);
     IBF_WP(d, BDIGIT, len);
 }
 
@@ -8009,32 +11565,34 @@ static void
 ibf_dump_object_data(struct ibf_dump *dump, VALUE obj)
 {
     if (rb_data_is_encoding(obj)) {
-	rb_encoding *enc = rb_to_encoding(obj);
-	const char *name = rb_enc_name(enc);
-	enum ibf_object_data_type type = IBF_OBJECT_DATA_ENCODING;
-	long len = strlen(name) + 1;
-	IBF_WV(type);
-	IBF_WV(len);
-	IBF_WP(name, char, strlen(name) + 1);
+        rb_encoding *enc = rb_to_encoding(obj);
+        const char *name = rb_enc_name(enc);
+        long len = strlen(name) + 1;
+        long data[2];
+        data[0] = IBF_OBJECT_DATA_ENCODING;
+        data[1] = len;
+        (void)IBF_W(data, long, 2);
+        IBF_WP(name, char, len);
     }
     else {
-	ibf_dump_object_unsupported(dump, obj);
+        ibf_dump_object_unsupported(dump, obj);
     }
 }
 
 static VALUE
 ibf_load_object_data(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset)
 {
-    const enum ibf_object_data_type *typep = IBF_OBJBODY(enum ibf_object_data_type, offset);
-    /* const long *lenp = IBF_OBJBODY(long, offset + sizeof(enum ibf_object_data_type)); */
-    const char *data = IBF_OBJBODY(char, offset + sizeof(enum ibf_object_data_type) + sizeof(long));
+    const long *body = IBF_OBJBODY(long, offset);
+    const enum ibf_object_data_type type = (enum ibf_object_data_type)body[0];
+    /* const long len = body[1]; */
+    const char *data = (const char *)&body[2];
 
-    switch (*typep) {
+    switch (type) {
       case IBF_OBJECT_DATA_ENCODING:
-	{
-	    VALUE encobj = rb_enc_from_encoding(rb_enc_find(data));
-	    return encobj;
-	}
+        {
+            VALUE encobj = rb_enc_from_encoding(rb_enc_find(data));
+            return encobj;
+        }
     }
 
     return ibf_load_object_unsupported(load, header, offset);
@@ -8043,11 +11601,11 @@ ibf_load_object_data(const struct ibf_load *load, const struct ibf_object_header
 static void
 ibf_dump_object_complex_rational(struct ibf_dump *dump, VALUE obj)
 {
-    long real = (long)ibf_dump_object(dump, RCOMPLEX(obj)->real);
-    long imag = (long)ibf_dump_object(dump, RCOMPLEX(obj)->imag);
+    long data[2];
+    data[0] = (long)ibf_dump_object(dump, RCOMPLEX(obj)->real);
+    data[1] = (long)ibf_dump_object(dump, RCOMPLEX(obj)->imag);
 
-    IBF_WV(real);
-    IBF_WV(imag);
+    (void)IBF_W(data, long, 2);
 }
 
 static VALUE
@@ -8068,16 +11626,16 @@ static void
 ibf_dump_object_symbol(struct ibf_dump *dump, VALUE obj)
 {
     VALUE str = rb_sym2str(obj);
-    long str_index = (long)ibf_dump_object(dump, str);
-    IBF_WV(str_index);
+    VALUE str_index = ibf_dump_object(dump, str);
+
+    ibf_dump_write_small_value(dump, str_index);
 }
 
 static VALUE
 ibf_load_object_symbol(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset)
 {
-    /* const struct ibf_object_header *header = IBF_OBJHEADER(offset); */
-    const struct ibf_object_symbol *symbol = IBF_OBJBODY(struct ibf_object_symbol, offset);
-    VALUE str = ibf_load_object(load, symbol->str);
+    VALUE str_index = ibf_load_small_value(load, &offset);
+    VALUE str = ibf_load_object(load, str_index);
     ID id = rb_intern_str(str);
     return ID2SYM(id);
 }
@@ -8115,41 +11673,67 @@ static ibf_dump_object_function dump_object_functions[RUBY_T_MASK+1] = {
     ibf_dump_object_unsupported, /* T_ICLASS 0x1c */
     ibf_dump_object_unsupported, /* T_ZOMBIE 0x1d */
     ibf_dump_object_unsupported, /* 0x1e */
-    ibf_dump_object_unsupported  /* 0x1f */
+    ibf_dump_object_unsupported, /* 0x1f */
 };
 
+static void
+ibf_dump_object_object_header(struct ibf_dump *dump, const struct ibf_object_header header)
+{
+    unsigned char byte =
+        (header.type          << 0) |
+        (header.special_const << 5) |
+        (header.frozen        << 6) |
+        (header.internal      << 7);
+
+    IBF_WV(byte);
+}
+
+static struct ibf_object_header
+ibf_load_object_object_header(const struct ibf_load *load, ibf_offset_t *offset)
+{
+    unsigned char byte = ibf_load_byte(load, offset);
+
+    struct ibf_object_header header;
+    header.type          = (byte >> 0) & 0x1f;
+    header.special_const = (byte >> 5) & 0x01;
+    header.frozen        = (byte >> 6) & 0x01;
+    header.internal      = (byte >> 7) & 0x01;
+
+    return header;
+}
+
 static ibf_offset_t
-lbf_dump_object_object(struct ibf_dump *dump, VALUE obj)
+ibf_dump_object_object(struct ibf_dump *dump, VALUE obj)
 {
     struct ibf_object_header obj_header;
-    ibf_offset_t current_offset = ibf_dump_pos(dump);
+    ibf_offset_t current_offset;
+    IBF_ZERO(obj_header);
     obj_header.type = TYPE(obj);
 
-    if (SPECIAL_CONST_P(obj)) {
-	if (RB_TYPE_P(obj, T_SYMBOL) ||
-	    RB_TYPE_P(obj, T_FLOAT)) {
-	    obj_header.internal = FALSE;
-	    goto dump_object;
-	}
-	obj_header.special_const = TRUE;
-	obj_header.frozen = TRUE;
-	obj_header.internal = TRUE;
-	IBF_WV(obj_header);
-	IBF_WV(obj);
+    IBF_W_ALIGN(ibf_offset_t);
+    current_offset = ibf_dump_pos(dump);
+
+    if (SPECIAL_CONST_P(obj) &&
+        ! (RB_TYPE_P(obj, T_SYMBOL) ||
+           RB_TYPE_P(obj, T_FLOAT))) {
+        obj_header.special_const = TRUE;
+        obj_header.frozen = TRUE;
+        obj_header.internal = TRUE;
+        ibf_dump_object_object_header(dump, obj_header);
+        ibf_dump_write_small_value(dump, obj);
     }
     else {
-	obj_header.internal = (RBASIC_CLASS(obj) == 0) ? TRUE : FALSE;
-      dump_object:
-	obj_header.special_const = FALSE;
-	obj_header.frozen = FL_TEST(obj, FL_FREEZE) ? TRUE : FALSE;
-	IBF_WV(obj_header);
-	(*dump_object_functions[obj_header.type])(dump, obj);
+        obj_header.internal = SPECIAL_CONST_P(obj) ? FALSE : (RBASIC_CLASS(obj) == 0) ? TRUE : FALSE;
+        obj_header.special_const = FALSE;
+        obj_header.frozen = FL_TEST(obj, FL_FREEZE) ? TRUE : FALSE;
+        ibf_dump_object_object_header(dump, obj_header);
+        (*dump_object_functions[obj_header.type])(dump, obj);
     }
 
     return current_offset;
 }
 
-typedef VALUE (*ibf_load_object_function)(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t);
+typedef VALUE (*ibf_load_object_function)(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset);
 static ibf_load_object_function load_object_functions[RUBY_T_MASK+1] = {
     ibf_load_object_unsupported, /* T_NONE */
     ibf_load_object_unsupported, /* T_OBJECT */
@@ -8182,82 +11766,116 @@ static ibf_load_object_function load_object_functions[RUBY_T_MASK+1] = {
     ibf_load_object_unsupported, /* T_ICLASS 0x1c */
     ibf_load_object_unsupported, /* T_ZOMBIE 0x1d */
     ibf_load_object_unsupported, /* 0x1e */
-    ibf_load_object_unsupported  /* 0x1f */
+    ibf_load_object_unsupported, /* 0x1f */
 };
 
 static VALUE
 ibf_load_object(const struct ibf_load *load, VALUE object_index)
 {
     if (object_index == 0) {
-	return Qnil;
-    }
-    else if (object_index >= load->header->object_list_size) {
-	rb_raise(rb_eIndexError, "object index out of range: %"PRIdVALUE, object_index);
+        return Qnil;
     }
     else {
-	VALUE obj = rb_ary_entry(load->obj_list, (long)object_index);
-	if (obj == Qnil) { /* TODO: avoid multiple Qnil load */
-	    ibf_offset_t *offsets = (ibf_offset_t *)(load->header->object_list_offset + load->buff);
-	    ibf_offset_t offset = offsets[object_index];
-	    const struct ibf_object_header *header = IBF_OBJHEADER(offset);
+        VALUE obj = pinned_list_fetch(load->current_buffer->obj_list, (long)object_index);
+        if (!obj) {
+            ibf_offset_t *offsets = (ibf_offset_t *)(load->current_buffer->obj_list_offset + load->current_buffer->buff);
+            ibf_offset_t offset = offsets[object_index];
+            const struct ibf_object_header header = ibf_load_object_object_header(load, &offset);
+
+#if IBF_ISEQ_DEBUG
+            fprintf(stderr, "ibf_load_object: list=%#x offsets=%p offset=%#x\n",
+                    load->current_buffer->obj_list_offset, (void *)offsets, offset);
+            fprintf(stderr, "ibf_load_object: type=%#x special=%d frozen=%d internal=%d\n",
+                    header.type, header.special_const, header.frozen, header.internal);
+#endif
+            if (offset >= load->current_buffer->size) {
+                rb_raise(rb_eIndexError, "object offset out of range: %u", offset);
+            }
+
+            if (header.special_const) {
+                ibf_offset_t reading_pos = offset;
+
+                obj = ibf_load_small_value(load, &reading_pos);
+            }
+            else {
+                obj = (*load_object_functions[header.type])(load, &header, offset);
+            }
+
+            pinned_list_store(load->current_buffer->obj_list, (long)object_index, obj);
+        }
+#if IBF_ISEQ_DEBUG
+        fprintf(stderr, "ibf_load_object: index=%#"PRIxVALUE" obj=%#"PRIxVALUE"\n",
+                object_index, obj);
+#endif
+        return obj;
+    }
+}
 
-	    if (header->special_const) {
-		VALUE *vp = IBF_OBJBODY(VALUE, offset);
-		obj = *vp;
-	    }
-	    else {
-		obj = (*load_object_functions[header->type])(load, header, offset);
-	    }
+struct ibf_dump_object_list_arg
+{
+    struct ibf_dump *dump;
+    VALUE offset_list;
+};
 
-	    rb_ary_store(load->obj_list, (long)object_index, obj);
-	}
-	iseq_add_mark_object(load->iseq, obj);
-	return obj;
-    }
+static int
+ibf_dump_object_list_i(st_data_t key, st_data_t val, st_data_t ptr)
+{
+    VALUE obj = (VALUE)key;
+    struct ibf_dump_object_list_arg *args = (struct ibf_dump_object_list_arg *)ptr;
+
+    ibf_offset_t offset = ibf_dump_object_object(args->dump, obj);
+    rb_ary_push(args->offset_list, UINT2NUM(offset));
+
+    return ST_CONTINUE;
 }
 
 static void
-ibf_dump_object_list(struct ibf_dump *dump, struct ibf_header *header)
+ibf_dump_object_list(struct ibf_dump *dump, ibf_offset_t *obj_list_offset, unsigned int *obj_list_size)
 {
-    VALUE list = rb_ary_tmp_new(RARRAY_LEN(dump->obj_list));
-    int i, size;
+    st_table *obj_table = dump->current_buffer->obj_table;
+    VALUE offset_list = rb_ary_tmp_new(obj_table->num_entries);
 
-    for (i=0; i<RARRAY_LEN(dump->obj_list); i++) {
-	VALUE obj = RARRAY_AREF(dump->obj_list, i);
-	ibf_offset_t offset = lbf_dump_object_object(dump, obj);
-	rb_ary_push(list, UINT2NUM(offset));
-    }
-    size = i;
-    header->object_list_offset = ibf_dump_pos(dump);
+    struct ibf_dump_object_list_arg args;
+    args.dump = dump;
+    args.offset_list = offset_list;
+
+    st_foreach(obj_table, ibf_dump_object_list_i, (st_data_t)&args);
+
+    IBF_W_ALIGN(ibf_offset_t);
+    *obj_list_offset = ibf_dump_pos(dump);
+
+    st_index_t size = obj_table->num_entries;
+    st_index_t i;
 
     for (i=0; i<size; i++) {
-	ibf_offset_t offset = NUM2UINT(RARRAY_AREF(list, i));
-	IBF_WV(offset);
+        ibf_offset_t offset = NUM2UINT(RARRAY_AREF(offset_list, i));
+        IBF_WV(offset);
     }
 
-    header->object_list_size = size;
+    *obj_list_size = (unsigned int)size;
 }
 
 static void
 ibf_dump_mark(void *ptr)
 {
     struct ibf_dump *dump = (struct ibf_dump *)ptr;
-    rb_gc_mark(dump->str);
-    rb_gc_mark(dump->iseq_list);
-    rb_gc_mark(dump->obj_list);
+    rb_gc_mark(dump->global_buffer.str);
+
+    rb_mark_set(dump->global_buffer.obj_table);
+    rb_mark_set(dump->iseq_table);
 }
 
 static void
 ibf_dump_free(void *ptr)
 {
     struct ibf_dump *dump = (struct ibf_dump *)ptr;
-    if (dump->iseq_table) {
-	st_free_table(dump->iseq_table);
-	dump->iseq_table = 0;
+    if (dump->global_buffer.obj_table) {
+        st_free_table(dump->global_buffer.obj_table);
+        dump->global_buffer.obj_table = 0;
     }
-    if (dump->id_table) {
-	st_free_table(dump->id_table);
-	dump->id_table = 0;
+    if (dump->iseq_table) {
+        st_free_table(dump->iseq_table);
+        dump->iseq_table = 0;
     }
     ruby_xfree(dump);
 }
@@ -8268,7 +11886,7 @@ ibf_dump_memsize(const void *ptr)
     struct ibf_dump *dump = (struct ibf_dump *)ptr;
     size_t size = sizeof(*dump);
     if (dump->iseq_table) size += st_memsize(dump->iseq_table);
-    if (dump->id_table) size += st_memsize(dump->id_table);
+    if (dump->global_buffer.obj_table) size += st_memsize(dump->global_buffer.obj_table);
     return size;
 }
 
@@ -8281,18 +11899,18 @@ static const rb_data_type_t ibf_dump_type = {
 static void
 ibf_dump_setup(struct ibf_dump *dump, VALUE dumper_obj)
 {
-    RB_OBJ_WRITE(dumper_obj, &dump->str, rb_str_new(0, 0));
-    RB_OBJ_WRITE(dumper_obj, &dump->iseq_list, rb_ary_tmp_new(0));
-    RB_OBJ_WRITE(dumper_obj, &dump->obj_list, rb_ary_tmp_new(1));
-    rb_ary_push(dump->obj_list, Qnil); /* 0th is nil */
+    dump->global_buffer.obj_table = NULL; // GC may run before a value is assigned
+    dump->iseq_table = NULL;
+
+    RB_OBJ_WRITE(dumper_obj, &dump->global_buffer.str, rb_str_new(0, 0));
+    dump->global_buffer.obj_table = ibf_dump_object_table_new();
     dump->iseq_table = st_init_numtable(); /* need free */
-    dump->id_table = st_init_numtable();   /* need free */
 
-    ibf_table_index(dump->id_table, 0); /* id_index:0 is 0 */
+    dump->current_buffer = &dump->global_buffer;
 }
 
 VALUE
-iseq_ibf_dump(const rb_iseq_t *iseq, VALUE opt)
+rb_iseq_ibf_dump(const rb_iseq_t *iseq, VALUE opt)
 {
     struct ibf_dump *dump;
     struct ibf_header header = {{0}};
@@ -8300,11 +11918,11 @@ iseq_ibf_dump(const rb_iseq_t *iseq, VALUE opt)
     VALUE str;
 
     if (iseq->body->parent_iseq != NULL ||
-	iseq->body->local_iseq != iseq) {
-	rb_raise(rb_eRuntimeError, "should be top of iseq");
+        iseq->body->local_iseq != iseq) {
+        rb_raise(rb_eRuntimeError, "should be top of iseq");
     }
     if (RTEST(ISEQ_COVERAGE(iseq))) {
-	rb_raise(rb_eRuntimeError, "should not compile with coverage");
+        rb_raise(rb_eRuntimeError, "should not compile with coverage");
     }
 
     dump_obj = TypedData_Make_Struct(0, struct ibf_dump, &ibf_dump_type, dump);
@@ -8318,26 +11936,25 @@ iseq_ibf_dump(const rb_iseq_t *iseq, VALUE opt)
     header.magic[1] = 'A';
     header.magic[2] = 'R';
     header.magic[3] = 'B';
-    header.major_version = ISEQ_MAJOR_VERSION;
-    header.minor_version = ISEQ_MINOR_VERSION;
+    header.major_version = IBF_MAJOR_VERSION;
+    header.minor_version = IBF_MINOR_VERSION;
     ibf_dump_iseq_list(dump, &header);
-    ibf_dump_id_list(dump, &header);
-    ibf_dump_object_list(dump, &header);
+    ibf_dump_object_list(dump, &header.global_object_list_offset, &header.global_object_list_size);
     header.size = ibf_dump_pos(dump);
 
     if (RTEST(opt)) {
-	VALUE opt_str = opt;
-	const char *ptr = StringValuePtr(opt_str);
-	header.extra_size = RSTRING_LENINT(opt_str);
-	ibf_dump_write(dump, ptr, header.extra_size);
+        VALUE opt_str = opt;
+        const char *ptr = StringValuePtr(opt_str);
+        header.extra_size = RSTRING_LENINT(opt_str);
+        ibf_dump_write(dump, ptr, header.extra_size);
     }
     else {
-	header.extra_size = 0;
+        header.extra_size = 0;
     }
 
     ibf_dump_overwrite(dump, &header, sizeof(header), 0);
 
-    str = dump->str;
+    str = dump->global_buffer.str;
     ibf_dump_free(dump);
     DATA_PTR(dump_obj) = NULL;
     RB_GC_GUARD(dump_obj);
@@ -8347,26 +11964,33 @@ iseq_ibf_dump(const rb_iseq_t *iseq, VALUE opt)
 static const ibf_offset_t *
 ibf_iseq_list(const struct ibf_load *load)
 {
-    return (ibf_offset_t *)(load->buff + load->header->iseq_list_offset);
+    return (const ibf_offset_t *)(load->global_buffer.buff + load->header->iseq_list_offset);
 }
 
 void
-ibf_load_iseq_complete(rb_iseq_t *iseq)
+rb_ibf_load_iseq_complete(rb_iseq_t *iseq)
 {
     struct ibf_load *load = RTYPEDDATA_DATA(iseq->aux.loader.obj);
     rb_iseq_t *prev_src_iseq = load->iseq;
+    ibf_offset_t offset = ibf_iseq_list(load)[iseq->aux.loader.index];
     load->iseq = iseq;
-    ibf_load_iseq_each(load, iseq, ibf_iseq_list(load)[iseq->aux.loader.index]);
-    ISEQ_COMPILE_DATA(iseq) = NULL;
-    FL_UNSET(iseq, ISEQ_NOT_LOADED_YET);
+#if IBF_ISEQ_DEBUG
+    fprintf(stderr, "rb_ibf_load_iseq_complete: index=%#x offset=%#x size=%#x\n",
+	    iseq->aux.loader.index, offset,
+	    load->header->size);
+#endif
+    ibf_load_iseq_each(load, iseq, offset);
+    ISEQ_COMPILE_DATA_CLEAR(iseq);
+    FL_UNSET((VALUE)iseq, ISEQ_NOT_LOADED_YET);
+    rb_iseq_init_trace(iseq);
     load->iseq = prev_src_iseq;
 }
 
 #if USE_LAZY_LOAD
-const rb_iseq_t *
+MJIT_FUNC_EXPORTED const rb_iseq_t *
 rb_iseq_complete(const rb_iseq_t *iseq)
 {
-    ibf_load_iseq_complete((rb_iseq_t *)iseq);
+    rb_ibf_load_iseq_complete((rb_iseq_t *)iseq);
     return iseq;
 }
 #endif
@@ -8376,93 +12000,130 @@ ibf_load_iseq(const struct ibf_load *load, const rb_iseq_t *index_iseq)
 {
     int iseq_index = (int)(VALUE)index_iseq;
 
+#if IBF_ISEQ_DEBUG
+    fprintf(stderr, "ibf_load_iseq: index_iseq=%p iseq_list=%p\n",
+	    (void *)index_iseq, (void *)load->iseq_list);
+#endif
     if (iseq_index == -1) {
 	return NULL;
     }
     else {
-	VALUE iseqv = rb_ary_entry(load->iseq_list, iseq_index);
+	VALUE iseqv = pinned_list_fetch(load->iseq_list, iseq_index);
 
-	if (iseqv != Qnil) {
+#if IBF_ISEQ_DEBUG
+	fprintf(stderr, "ibf_load_iseq: iseqv=%p\n", (void *)iseqv);
+#endif
+	if (iseqv) {
 	    return (rb_iseq_t *)iseqv;
 	}
 	else {
 	    rb_iseq_t *iseq = iseq_imemo_alloc();
-	    FL_SET(iseq, ISEQ_NOT_LOADED_YET);
+#if IBF_ISEQ_DEBUG
+	    fprintf(stderr, "ibf_load_iseq: new iseq=%p\n", (void *)iseq);
+#endif
+	    FL_SET((VALUE)iseq, ISEQ_NOT_LOADED_YET);
 	    iseq->aux.loader.obj = load->loader_obj;
 	    iseq->aux.loader.index = iseq_index;
-	    rb_ary_store(load->iseq_list, iseq_index, (VALUE)iseq);
+#if IBF_ISEQ_DEBUG
+	    fprintf(stderr, "ibf_load_iseq: iseq=%p loader_obj=%p index=%d\n",
+		    (void *)iseq, (void *)load->loader_obj, iseq_index);
+#endif
+	    pinned_list_store(load->iseq_list, iseq_index, (VALUE)iseq);
 
 #if !USE_LAZY_LOAD
-	    ibf_load_iseq_complete(iseq);
+#if IBF_ISEQ_DEBUG
+	    fprintf(stderr, "ibf_load_iseq: loading iseq=%p\n", (void *)iseq);
+#endif
+            rb_ibf_load_iseq_complete(iseq);
+#else
+            if (GET_VM()->builtin_function_table) {
+                rb_ibf_load_iseq_complete(iseq);
+            }
 #endif /* !USE_LAZY_LOAD */
 
-	    if (load->iseq) {
-		iseq_add_mark_object(load->iseq, (VALUE)iseq);
-	    }
+#if IBF_ISEQ_DEBUG
+	    fprintf(stderr, "ibf_load_iseq: iseq=%p loaded %p\n",
+		    (void *)iseq, (void *)load->iseq);
+#endif
 	    return iseq;
 	}
     }
 }
 
 static void
-ibf_load_setup(struct ibf_load *load, VALUE loader_obj, VALUE str)
+ibf_load_setup_bytes(struct ibf_load *load, VALUE loader_obj, const char *bytes, size_t size)
 {
-    rb_check_safe_obj(str);
-
-    if (RSTRING_LENINT(str) < (int)sizeof(struct ibf_header)) {
-	rb_raise(rb_eRuntimeError, "broken binary format");
-    }
-    RB_OBJ_WRITE(loader_obj, &load->str, str);
     load->loader_obj = loader_obj;
-    load->buff = StringValuePtr(str);
-    load->header = (struct ibf_header *)load->buff;
-    RB_OBJ_WRITE(loader_obj, &load->iseq_list, rb_ary_tmp_new(0));
-    RB_OBJ_WRITE(loader_obj, &load->obj_list, rb_ary_tmp_new(0));
-    load->id_list = ZALLOC_N(ID, load->header->id_list_size);
+    load->global_buffer.buff = bytes;
+    load->header = (struct ibf_header *)load->global_buffer.buff;
+    load->global_buffer.size = load->header->size;
+    load->global_buffer.obj_list_offset = load->header->global_object_list_offset;
+    load->global_buffer.obj_list_size = load->header->global_object_list_size;
+    RB_OBJ_WRITE(loader_obj, &load->iseq_list, pinned_list_new(load->header->iseq_list_size));
+    RB_OBJ_WRITE(loader_obj, &load->global_buffer.obj_list, pinned_list_new(load->global_buffer.obj_list_size));
     load->iseq = NULL;
 
-    if (RSTRING_LENINT(str) < (int)load->header->size) {
+    load->current_buffer = &load->global_buffer;
+
+    if (size < load->header->size) {
 	rb_raise(rb_eRuntimeError, "broken binary format");
     }
     if (strncmp(load->header->magic, "YARB", 4) != 0) {
 	rb_raise(rb_eRuntimeError, "unknown binary format");
     }
-    if (load->header->major_version != ISEQ_MAJOR_VERSION ||
-	load->header->minor_version != ISEQ_MINOR_VERSION) {
+    if (load->header->major_version != IBF_MAJOR_VERSION ||
+	load->header->minor_version != IBF_MINOR_VERSION) {
 	rb_raise(rb_eRuntimeError, "unmatched version file (%u.%u for %u.%u)",
-		 load->header->major_version, load->header->minor_version, ISEQ_MAJOR_VERSION, ISEQ_MINOR_VERSION);
+		 load->header->major_version, load->header->minor_version, IBF_MAJOR_VERSION, IBF_MINOR_VERSION);
     }
-    if (strcmp(load->buff + sizeof(struct ibf_header), RUBY_PLATFORM) != 0) {
+    if (strcmp(load->global_buffer.buff + sizeof(struct ibf_header), RUBY_PLATFORM) != 0) {
 	rb_raise(rb_eRuntimeError, "unmatched platform");
     }
+    if (load->header->iseq_list_offset % RUBY_ALIGNOF(ibf_offset_t)) {
+        rb_raise(rb_eArgError, "unaligned iseq list offset: %u",
+                 load->header->iseq_list_offset);
+    }
+    if (load->global_buffer.obj_list_offset % RUBY_ALIGNOF(ibf_offset_t)) {
+        rb_raise(rb_eArgError, "unaligned object list offset: %u",
+                 load->global_buffer.obj_list_offset);
+    }
 }
 
 static void
-ibf_loader_mark(void *ptr)
+ibf_load_setup(struct ibf_load *load, VALUE loader_obj, VALUE str)
 {
-    if (ptr) {
-	struct ibf_load *load = (struct ibf_load *)ptr;
-	rb_gc_mark(load->str);
-	rb_gc_mark(load->iseq_list);
-	rb_gc_mark(load->obj_list);
+    if (RSTRING_LENINT(str) < (int)sizeof(struct ibf_header)) {
+        rb_raise(rb_eRuntimeError, "broken binary format");
     }
+
+#if USE_LAZY_LOAD
+    str = rb_str_new(RSTRING_PTR(str), RSTRING_LEN(str));
+#endif
+
+    ibf_load_setup_bytes(load, loader_obj, StringValuePtr(str), RSTRING_LEN(str));
+    RB_OBJ_WRITE(loader_obj, &load->str, str);
+}
+
+static void
+ibf_loader_mark(void *ptr)
+{
+    struct ibf_load *load = (struct ibf_load *)ptr;
+    rb_gc_mark(load->str);
+    rb_gc_mark(load->iseq_list);
+    rb_gc_mark(load->global_buffer.obj_list);
 }
 
 static void
 ibf_loader_free(void *ptr)
 {
-    if (ptr) {
-	struct ibf_load *load = (struct ibf_load *)ptr;
-	ruby_xfree(load->id_list);
-	ruby_xfree(load);
-    }
+    struct ibf_load *load = (struct ibf_load *)ptr;
+    ruby_xfree(load);
 }
 
 static size_t
 ibf_loader_memsize(const void *ptr)
 {
-    struct ibf_load *load = (struct ibf_load *)ptr;
-    return sizeof(struct ibf_load) + load->header->id_list_size * sizeof(ID);
+    return sizeof(struct ibf_load);
 }
 
 static const rb_data_type_t ibf_load_type = {
@@ -8472,10 +12133,10 @@ static const rb_data_type_t ibf_load_type = {
 };
 
 const rb_iseq_t *
-iseq_ibf_load(VALUE str)
+rb_iseq_ibf_load(VALUE str)
 {
     struct ibf_load *load;
-    const rb_iseq_t *iseq;
+    rb_iseq_t *iseq;
     VALUE loader_obj = TypedData_Make_Struct(0, struct ibf_load, &ibf_load_type, load);
 
     ibf_load_setup(load, loader_obj, str);
@@ -8485,15 +12146,29 @@ iseq_ibf_load(VALUE str)
     return iseq;
 }
 
+const rb_iseq_t *
+rb_iseq_ibf_load_bytes(const char *bytes, size_t size)
+{
+    struct ibf_load *load;
+    rb_iseq_t *iseq;
+    VALUE loader_obj = TypedData_Make_Struct(0, struct ibf_load, &ibf_load_type, load);
+
+    ibf_load_setup_bytes(load, loader_obj, bytes, size);
+    iseq = ibf_load_iseq(load, 0);
+
+    RB_GC_GUARD(loader_obj);
+    return iseq;
+}
+
 VALUE
-iseq_ibf_load_extra_data(VALUE str)
+rb_iseq_ibf_load_extra_data(VALUE str)
 {
     struct ibf_load *load;
     VALUE loader_obj = TypedData_Make_Struct(0, struct ibf_load, &ibf_load_type, load);
     VALUE extra_str;
 
     ibf_load_setup(load, loader_obj, str);
-    extra_str = rb_str_new(load->buff + load->header->size, load->header->extra_size);
+    extra_str = rb_str_new(load->global_buffer.buff + load->header->size, load->header->extra_size);
     RB_GC_GUARD(loader_obj);
     return extra_str;
 }
diff --git a/complex.c b/complex.c
index 181448d8d8..27c1f131e3 100644
--- a/complex.c
+++ b/complex.c
@@ -5,21 +5,37 @@
   which is written in ruby.
 */
 
-#include "ruby/config.h"
+#include "ruby/internal/config.h"
+
 #if defined _MSC_VER
 /* Microsoft Visual C does not define M_PI and others by default */
 # define _USE_MATH_DEFINES 1
 #endif
+
+#include <ctype.h>
 #include <math.h>
-#include "internal.h"
 
+#undef NDEBUG
 #define NDEBUG
+#include "id.h"
+#include "internal.h"
+#include "internal/array.h"
+#include "internal/class.h"
+#include "internal/complex.h"
+#include "internal/math.h"
+#include "internal/numeric.h"
+#include "internal/object.h"
+#include "internal/rational.h"
 #include "ruby_assert.h"
 
 #define ZERO INT2FIX(0)
 #define ONE INT2FIX(1)
 #define TWO INT2FIX(2)
+#if USE_FLONUM
 #define RFLOAT_0 DBL2NUM(0)
+#else
+static VALUE RFLOAT_0;
+#endif
 #if defined(HAVE_SIGNBIT) && defined(__GNUC__) && defined(__sun) && \
     !defined(signbit)
 extern int signbit(double);
@@ -27,24 +43,21 @@ extern int signbit(double);
 
 VALUE rb_cComplex;
 
-static VALUE nucomp_abs(VALUE self);
-static VALUE nucomp_arg(VALUE self);
-
-static ID id_abs, id_arg, id_convert,
-    id_denominator, id_eqeq_p, id_expt, id_fdiv,
-    id_negate, id_numerator, id_quo,
-    id_real_p, id_to_f, id_to_i, id_to_r,
-    id_i_real, id_i_imag;
+static ID id_abs, id_arg,
+    id_denominator, id_numerator,
+    id_real_p, id_i_real, id_i_imag,
+    id_finite_p, id_infinite_p, id_rationalize,
+    id_PI;
+#define id_to_i idTo_i
+#define id_to_r idTo_r
+#define id_negate idUMinus
+#define id_expt idPow
+#define id_to_f idTo_f
+#define id_quo idQuo
+#define id_fdiv idFdiv
 
 #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)\
@@ -59,31 +72,32 @@ 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);\
-}
-
 #define PRESERVE_SIGNEDZERO
 
 inline static VALUE
 f_add(VALUE x, VALUE y)
 {
-#ifndef PRESERVE_SIGNEDZERO
-    if (FIXNUM_P(y) && FIX2LONG(y) == 0)
-	return x;
-    else if (FIXNUM_P(x) && FIX2LONG(x) == 0)
-	return y;
-#endif
+    if (RB_INTEGER_TYPE_P(x) &&
+        LIKELY(rb_method_basic_definition_p(rb_cInteger, idPLUS))) {
+        if (FIXNUM_ZERO_P(x))
+            return y;
+        if (FIXNUM_ZERO_P(y))
+            return x;
+        return rb_int_plus(x, y);
+    }
+    else if (RB_FLOAT_TYPE_P(x) &&
+             LIKELY(rb_method_basic_definition_p(rb_cFloat, idPLUS))) {
+        if (FIXNUM_ZERO_P(y))
+            return x;
+        return rb_float_plus(x, y);
+    }
+    else if (RB_TYPE_P(x, T_RATIONAL) &&
+             LIKELY(rb_method_basic_definition_p(rb_cRational, idPLUS))) {
+        if (FIXNUM_ZERO_P(y))
+            return x;
+        return rb_rational_plus(x, y);
+    }
+
     return rb_funcall(x, '+', 1, y);
 }
 
@@ -95,56 +109,162 @@ f_div(VALUE x, VALUE y)
     return rb_funcall(x, '/', 1, y);
 }
 
-inline static VALUE
+inline static int
 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);
+    if (RB_INTEGER_TYPE_P(x)) {
+        if (FIXNUM_P(x) && FIXNUM_P(y))
+            return (SIGNED_VALUE)x > (SIGNED_VALUE)y;
+        return RTEST(rb_int_gt(x, y));
+    }
+    else if (RB_FLOAT_TYPE_P(x))
+        return RTEST(rb_float_gt(x, y));
+    else if (RB_TYPE_P(x, T_RATIONAL)) {
+        int const cmp = rb_cmpint(rb_rational_cmp(x, y), x, y);
+        return cmp > 0;
+    }
+    return RTEST(rb_funcall(x, '>', 1, y));
 }
 
 inline static VALUE
 f_mul(VALUE x, VALUE y)
 {
-#ifndef PRESERVE_SIGNEDZERO
-    if (FIXNUM_P(y)) {
-	long iy = FIX2LONG(y);
-	if (iy == 0) {
-	    if (RB_INTEGER_TYPE_P(x))
-		return ZERO;
-	}
-	else if (iy == 1)
-	    return x;
-    }
-    else if (FIXNUM_P(x)) {
-	long ix = FIX2LONG(x);
-	if (ix == 0) {
-	    if (RB_INTEGER_TYPE_P(y))
-		return ZERO;
-	}
-	else if (ix == 1)
-	    return y;
+    if (RB_INTEGER_TYPE_P(x) &&
+        LIKELY(rb_method_basic_definition_p(rb_cInteger, idMULT))) {
+        if (FIXNUM_ZERO_P(y))
+            return ZERO;
+        if (FIXNUM_ZERO_P(x) && RB_INTEGER_TYPE_P(y))
+            return ZERO;
+        if (x == ONE) return y;
+        if (y == ONE) return x;
+        return rb_int_mul(x, y);
+    }
+    else if (RB_FLOAT_TYPE_P(x) &&
+             LIKELY(rb_method_basic_definition_p(rb_cFloat, idMULT))) {
+        if (y == ONE) return x;
+        return rb_float_mul(x, y);
+    }
+    else if (RB_TYPE_P(x, T_RATIONAL) &&
+             LIKELY(rb_method_basic_definition_p(rb_cRational, idMULT))) {
+        if (y == ONE) return x;
+        return rb_rational_mul(x, y);
+    }
+    else if (LIKELY(rb_method_basic_definition_p(CLASS_OF(x), idMULT))) {
+        if (y == ONE) return x;
     }
-#endif
     return rb_funcall(x, '*', 1, y);
 }
 
 inline static VALUE
 f_sub(VALUE x, VALUE y)
 {
-#ifndef PRESERVE_SIGNEDZERO
-    if (FIXNUM_P(y) && FIX2LONG(y) == 0)
+    if (FIXNUM_ZERO_P(y) &&
+        LIKELY(rb_method_basic_definition_p(CLASS_OF(x), idMINUS))) {
 	return x;
-#endif
+    }
     return rb_funcall(x, '-', 1, y);
 }
 
-fun1(abs)
-fun1(arg)
-fun1(denominator)
-fun1(negate)
-fun1(numerator)
-fun1(real_p)
+inline static VALUE
+f_abs(VALUE x)
+{
+    if (RB_INTEGER_TYPE_P(x)) {
+        return rb_int_abs(x);
+    }
+    else if (RB_FLOAT_TYPE_P(x)) {
+        return rb_float_abs(x);
+    }
+    else if (RB_TYPE_P(x, T_RATIONAL)) {
+        return rb_rational_abs(x);
+    }
+    else if (RB_TYPE_P(x, T_COMPLEX)) {
+        return rb_complex_abs(x);
+    }
+    return rb_funcall(x, id_abs, 0);
+}
+
+static VALUE numeric_arg(VALUE self);
+static VALUE float_arg(VALUE self);
+
+inline static VALUE
+f_arg(VALUE x)
+{
+    if (RB_INTEGER_TYPE_P(x)) {
+        return numeric_arg(x);
+    }
+    else if (RB_FLOAT_TYPE_P(x)) {
+        return float_arg(x);
+    }
+    else if (RB_TYPE_P(x, T_RATIONAL)) {
+        return numeric_arg(x);
+    }
+    else if (RB_TYPE_P(x, T_COMPLEX)) {
+        return rb_complex_arg(x);
+    }
+    return rb_funcall(x, id_arg, 0);
+}
+
+inline static VALUE
+f_numerator(VALUE x)
+{
+    if (RB_TYPE_P(x, T_RATIONAL)) {
+        return RRATIONAL(x)->num;
+    }
+    if (RB_FLOAT_TYPE_P(x)) {
+        return rb_float_numerator(x);
+    }
+    return x;
+}
+
+inline static VALUE
+f_denominator(VALUE x)
+{
+    if (RB_TYPE_P(x, T_RATIONAL)) {
+        return RRATIONAL(x)->den;
+    }
+    if (RB_FLOAT_TYPE_P(x)) {
+        return rb_float_denominator(x);
+    }
+    return INT2FIX(1);
+}
+
+inline static VALUE
+f_negate(VALUE x)
+{
+    if (RB_INTEGER_TYPE_P(x)) {
+        return rb_int_uminus(x);
+    }
+    else if (RB_FLOAT_TYPE_P(x)) {
+        return rb_float_uminus(x);
+    }
+    else if (RB_TYPE_P(x, T_RATIONAL)) {
+        return rb_rational_uminus(x);
+    }
+    else if (RB_TYPE_P(x, T_COMPLEX)) {
+        return rb_complex_uminus(x);
+    }
+    return rb_funcall(x, id_negate, 0);
+}
+
+static bool nucomp_real_p(VALUE self);
+
+static inline bool
+f_real_p(VALUE x)
+{
+    if (RB_INTEGER_TYPE_P(x)) {
+        return true;
+    }
+    else if (RB_FLOAT_TYPE_P(x)) {
+        return true;
+    }
+    else if (RB_TYPE_P(x, T_RATIONAL)) {
+        return true;
+    }
+    else if (RB_TYPE_P(x, T_COMPLEX)) {
+        return nucomp_real_p(x);
+    }
+    return rb_funcall(x, id_real_p, 0);
+}
 
 inline static VALUE
 f_to_i(VALUE x)
@@ -153,6 +273,7 @@ f_to_i(VALUE x)
 	return rb_str_to_inum(x, 10, 0);
     return rb_funcall(x, id_to_i, 0);
 }
+
 inline static VALUE
 f_to_f(VALUE x)
 {
@@ -163,109 +284,109 @@ f_to_f(VALUE x)
 
 fun1(to_r)
 
-inline static VALUE
+inline static int
 f_eqeq_p(VALUE x, VALUE y)
 {
     if (FIXNUM_P(x) && FIXNUM_P(y))
-	return f_boolcast(FIX2LONG(x) == FIX2LONG(y));
-    return rb_funcall(x, id_eqeq_p, 1, y);
+	return x == y;
+    else if (RB_FLOAT_TYPE_P(x) || RB_FLOAT_TYPE_P(y))
+	return NUM2DBL(x) == NUM2DBL(y);
+    return (int)rb_equal(x, y);
 }
 
 fun2(expt)
 fun2(fdiv)
-fun2(quo)
 
-inline static VALUE
+static VALUE
+f_quo(VALUE x, VALUE y)
+{
+    if (RB_INTEGER_TYPE_P(x))
+        return rb_numeric_quo(x, y);
+    if (RB_FLOAT_TYPE_P(x))
+        return rb_float_div(x, y);
+    if (RB_TYPE_P(x, T_RATIONAL))
+        return rb_numeric_quo(x, y);
+
+    return rb_funcallv(x, id_quo, 1, &y);
+}
+
+inline static int
 f_negative_p(VALUE x)
 {
-    if (FIXNUM_P(x))
-	return f_boolcast(FIX2LONG(x) < 0);
-    return rb_funcall(x, '<', 1, ZERO);
+    if (RB_INTEGER_TYPE_P(x))
+        return INT_NEGATIVE_P(x);
+    else if (RB_FLOAT_TYPE_P(x))
+        return RFLOAT_VALUE(x) < 0.0;
+    else if (RB_TYPE_P(x, T_RATIONAL))
+        return INT_NEGATIVE_P(RRATIONAL(x)->num);
+    return rb_num_negative_p(x);
 }
 
 #define f_positive_p(x) (!f_negative_p(x))
 
-inline static VALUE
+inline static int
 f_zero_p(VALUE x)
 {
-    if (RB_TYPE_P(x, T_FIXNUM)) {
-	return f_boolcast(FIX2LONG(x) == 0);
+    if (RB_FLOAT_TYPE_P(x)) {
+        return FLOAT_ZERO_P(x);
     }
-    else if (RB_TYPE_P(x, T_BIGNUM)) {
-	return Qfalse;
+    else if (RB_INTEGER_TYPE_P(x)) {
+        return FIXNUM_ZERO_P(x);
     }
     else if (RB_TYPE_P(x, T_RATIONAL)) {
-	VALUE num = RRATIONAL(x)->num;
-
-	return f_boolcast(FIXNUM_P(num) && FIX2LONG(num) == 0);
+        const VALUE num = RRATIONAL(x)->num;
+        return FIXNUM_ZERO_P(num);
     }
-    return rb_funcall(x, id_eqeq_p, 1, ZERO);
+    return (int)rb_equal(x, ZERO);
 }
 
 #define f_nonzero_p(x) (!f_zero_p(x))
 
-inline static VALUE
-f_one_p(VALUE x)
+VALUE rb_flo_is_finite_p(VALUE num);
+inline static int
+f_finite_p(VALUE x)
 {
-    if (RB_TYPE_P(x, T_FIXNUM)) {
-	return f_boolcast(FIX2LONG(x) == 1);
+    if (RB_INTEGER_TYPE_P(x)) {
+        return TRUE;
     }
-    else if (RB_TYPE_P(x, T_BIGNUM)) {
-	return Qfalse;
+    else if (RB_FLOAT_TYPE_P(x)) {
+	return (int)rb_flo_is_finite_p(x);
     }
     else if (RB_TYPE_P(x, T_RATIONAL)) {
-	VALUE num = RRATIONAL(x)->num;
-	VALUE den = RRATIONAL(x)->den;
-
-	return f_boolcast(FIXNUM_P(num) && FIX2LONG(num) == 1 &&
-			  FIXNUM_P(den) && FIX2LONG(den) == 1);
+	return TRUE;
     }
-    return rb_funcall(x, id_eqeq_p, 1, ONE);
+    return RTEST(rb_funcallv(x, id_finite_p, 0, 0));
 }
 
+VALUE rb_flo_is_infinite_p(VALUE num);
 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)
+f_infinite_p(VALUE x)
 {
-    return f_kind_of_p(x, rb_cNumeric);
-}
-
-inline static VALUE
-k_fixnum_p(VALUE x)
-{
-    return FIXNUM_P(x);
-}
-
-inline static VALUE
-k_bignum_p(VALUE x)
-{
-    return RB_TYPE_P(x, T_BIGNUM);
-}
-
-inline static VALUE
-k_float_p(VALUE x)
-{
-    return f_kind_of_p(x, rb_cFloat);
+    if (RB_INTEGER_TYPE_P(x)) {
+        return Qnil;
+    }
+    else if (RB_FLOAT_TYPE_P(x)) {
+	return rb_flo_is_infinite_p(x);
+    }
+    else if (RB_TYPE_P(x, T_RATIONAL)) {
+        return Qnil;
+    }
+    return rb_funcallv(x, id_infinite_p, 0, 0);
 }
 
-inline static VALUE
-k_rational_p(VALUE x)
+inline static int
+f_kind_of_p(VALUE x, VALUE c)
 {
-    return f_kind_of_p(x, rb_cRational);
+    return (int)rb_obj_is_kind_of(x, c);
 }
 
-inline static VALUE
-k_complex_p(VALUE x)
+inline static int
+k_numeric_p(VALUE x)
 {
-    return f_kind_of_p(x, rb_cComplex);
+    return f_kind_of_p(x, rb_cNumeric);
 }
 
-#define k_exact_p(x) (!k_float_p(x))
+#define k_exact_p(x) (!RB_FLOAT_TYPE_P(x))
 
 #define k_exact_zero_p(x) (k_exact_p(x) && f_zero_p(x))
 
@@ -282,6 +403,7 @@ nucomp_s_new_internal(VALUE klass, VALUE real, VALUE imag)
 
     RCOMPLEX_SET_REAL(obj, real);
     RCOMPLEX_SET_IMAG(obj, imag);
+    OBJ_FREEZE_RAW((VALUE)obj);
 
     return (VALUE)obj;
 }
@@ -292,67 +414,26 @@ nucomp_s_alloc(VALUE klass)
     return nucomp_s_new_internal(klass, ZERO, ZERO);
 }
 
-#if 0
-static VALUE
-nucomp_s_new_bang(int argc, VALUE *argv, VALUE klass)
-{
-    VALUE real, imag;
-
-    switch (rb_scan_args(argc, argv, "11", &real, &imag)) {
-      case 1:
-	if (!k_numeric_p(real))
-	    real = f_to_i(real);
-	imag = ZERO;
-	break;
-      default:
-	if (!k_numeric_p(real))
-	    real = f_to_i(real);
-	if (!k_numeric_p(imag))
-	    imag = f_to_i(imag);
-	break;
-    }
-
-    return nucomp_s_new_internal(klass, real, imag);
-}
-#endif
-
 inline static VALUE
 f_complex_new_bang1(VALUE klass, VALUE x)
 {
-    assert(!k_complex_p(x));
+    assert(!RB_TYPE_P(x, T_COMPLEX));
     return nucomp_s_new_internal(klass, x, ZERO);
 }
 
 inline static VALUE
 f_complex_new_bang2(VALUE klass, VALUE x, VALUE y)
 {
-    assert(!k_complex_p(x));
-    assert(!k_complex_p(y));
+    assert(!RB_TYPE_P(x, T_COMPLEX));
+    assert(!RB_TYPE_P(y, T_COMPLEX));
     return nucomp_s_new_internal(klass, x, y);
 }
 
-#ifdef CANONICALIZATION_FOR_MATHN
-#define CANON
-#endif
-
-#ifdef CANON
-static int canonicalization = 0;
-
-RUBY_FUNC_EXPORTED void
-nucomp_canonicalization(int f)
-{
-    canonicalization = f;
-}
-#else
-#define canonicalization 0
-#endif
-
 inline static void
 nucomp_real_check(VALUE num)
 {
-    if (!RB_TYPE_P(num, T_FIXNUM) &&
-	!RB_TYPE_P(num, T_BIGNUM) &&
-	!RB_TYPE_P(num, T_FLOAT) &&
+    if (!RB_INTEGER_TYPE_P(num) &&
+	!RB_FLOAT_TYPE_P(num) &&
 	!RB_TYPE_P(num, T_RATIONAL)) {
 	if (!k_numeric_p(num) || !f_real_p(num))
 	    rb_raise(rb_eTypeError, "not a real");
@@ -362,26 +443,20 @@ nucomp_real_check(VALUE num)
 inline static VALUE
 nucomp_s_canonicalize_internal(VALUE klass, VALUE real, VALUE imag)
 {
-#ifdef CANON
-#define CL_CANON
-#ifdef CL_CANON
-    if (k_exact_zero_p(imag) && canonicalization)
-	return real;
-#else
-    if (f_zero_p(imag) && canonicalization)
-	return real;
-#endif
-#endif
-    if (f_real_p(real) && f_real_p(imag))
+    int complex_r, complex_i;
+    complex_r = RB_TYPE_P(real, T_COMPLEX);
+    complex_i = RB_TYPE_P(imag, T_COMPLEX);
+    if (!complex_r && !complex_i) {
 	return nucomp_s_new_internal(klass, real, imag);
-    else if (f_real_p(real)) {
+    }
+    else if (!complex_r) {
 	get_dat1(imag);
 
 	return nucomp_s_new_internal(klass,
 				     f_sub(real, dat->imag),
 				     f_add(ZERO, dat->real));
     }
-    else if (f_real_p(imag)) {
+    else if (!complex_i) {
 	get_dat1(real);
 
 	return nucomp_s_new_internal(klass,
@@ -428,13 +503,16 @@ nucomp_s_new(int argc, VALUE *argv, VALUE klass)
 inline static VALUE
 f_complex_new2(VALUE klass, VALUE x, VALUE y)
 {
-    assert(!k_complex_p(x));
+    assert(!RB_TYPE_P(x, T_COMPLEX));
     return nucomp_s_canonicalize_internal(klass, x, y);
 }
 
+static VALUE nucomp_convert(VALUE klass, VALUE a1, VALUE a2, int raise);
+static VALUE nucomp_s_convert(int argc, VALUE *argv, VALUE klass);
+
 /*
  * call-seq:
- *    Complex(x[, y])  ->  numeric
+ *    Complex(x[, y], exception: true)  ->  numeric or nil
  *
  * Returns x+i*y;
  *
@@ -443,6 +521,9 @@ f_complex_new2(VALUE klass, VALUE x, VALUE y)
  *    Complex(nil)     #=> TypeError
  *    Complex(1, nil)  #=> TypeError
  *
+ *    Complex(1, nil, exception: false)  #=> nil
+ *    Complex('1+2', exception: false)   #=> nil
+ *
  * Syntax of string form:
  *
  *   string form = extra spaces , complex , extra spaces ;
@@ -468,7 +549,19 @@ f_complex_new2(VALUE klass, VALUE x, VALUE y)
 static VALUE
 nucomp_f_complex(int argc, VALUE *argv, VALUE klass)
 {
-    return rb_funcall2(rb_cComplex, id_convert, argc, argv);
+    VALUE a1, a2, opts = Qnil;
+    int raise = TRUE;
+
+    if (rb_scan_args(argc, argv, "11:", &a1, &a2, &opts) == 1) {
+        a2 = Qundef;
+    }
+    if (!NIL_P(opts)) {
+        raise = rb_opts_exception_p(opts, raise);
+    }
+    if (argc > 0 && CLASS_OF(a1) == rb_cComplex && a2 == Qundef) {
+        return a1;
+    }
+    return nucomp_convert(rb_cComplex, a1, a2, raise);
 }
 
 #define imp1(n) \
@@ -478,20 +571,9 @@ m_##n##_bang(VALUE x)\
     return rb_math_##n(x);\
 }
 
-#define imp2(n) \
-inline static VALUE \
-m_##n##_bang(VALUE x, VALUE y)\
-{\
-    return rb_math_##n(x, y);\
-}
-
-imp2(atan2)
 imp1(cos)
 imp1(cosh)
 imp1(exp)
-imp2(hypot)
-
-#define m_hypot(x,y) m_hypot_bang((x),(y))
 
 static VALUE
 m_log_bang(VALUE x)
@@ -505,7 +587,7 @@ imp1(sinh)
 static VALUE
 m_cos(VALUE x)
 {
-    if (f_real_p(x))
+    if (!RB_TYPE_P(x, T_COMPLEX))
 	return m_cos_bang(x);
     {
 	get_dat1(x);
@@ -520,7 +602,7 @@ m_cos(VALUE x)
 static VALUE
 m_sin(VALUE x)
 {
-    if (f_real_p(x))
+    if (!RB_TYPE_P(x, T_COMPLEX))
 	return m_sin_bang(x);
     {
 	get_dat1(x);
@@ -532,46 +614,18 @@ m_sin(VALUE x)
     }
 }
 
-#if 0
-imp1(sqrt)
-
-static VALUE
-m_sqrt(VALUE x)
-{
-    if (f_real_p(x)) {
-	if (f_positive_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->imag))
-	    return f_conj(m_sqrt(f_conj(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)));
-	}
-    }
-}
-#endif
-
 static VALUE
 f_complex_polar(VALUE klass, VALUE x, VALUE y)
 {
-    assert(!k_complex_p(x));
-    assert(!k_complex_p(y));
+    assert(!RB_TYPE_P(x, T_COMPLEX));
+    assert(!RB_TYPE_P(y, T_COMPLEX));
     if (f_zero_p(x) || f_zero_p(y)) {
-	if (canonicalization) return x;
 	return nucomp_s_new_internal(klass, x, RFLOAT_0);
     }
     if (RB_FLOAT_TYPE_P(y)) {
 	const double arg = RFLOAT_VALUE(y);
 	if (arg == M_PI) {
 	    x = f_negate(x);
-	    if (canonicalization) return x;
 	    y = RFLOAT_0;
 	}
 	else if (arg == M_PI_2) {
@@ -586,13 +640,12 @@ f_complex_polar(VALUE klass, VALUE x, VALUE y)
 	    const double abs = RFLOAT_VALUE(x);
 	    const double real = abs * cos(arg), imag = abs * sin(arg);
 	    x = DBL2NUM(real);
-	    if (canonicalization && imag == 0.0) return x;
 	    y = DBL2NUM(imag);
 	}
 	else {
-	    y = f_mul(x, DBL2NUM(sin(arg)));
-	    x = f_mul(x, DBL2NUM(cos(arg)));
-	    if (canonicalization && f_zero_p(y)) return x;
+            const double ax = sin(arg), ay = cos(arg);
+            y = f_mul(x, DBL2NUM(ax));
+            x = f_mul(x, DBL2NUM(ay));
 	}
 	return nucomp_s_new_internal(klass, x, y);
     }
@@ -601,6 +654,38 @@ f_complex_polar(VALUE klass, VALUE x, VALUE y)
 					  f_mul(x, m_sin(y)));
 }
 
+#ifdef HAVE___COSPI
+# define cospi(x) __cospi(x)
+#else
+# define cospi(x) cos((x) * M_PI)
+#endif
+#ifdef HAVE___SINPI
+# define sinpi(x) __sinpi(x)
+#else
+# define sinpi(x) sin((x) * M_PI)
+#endif
+/* returns a Complex or Float of ang*PI-rotated abs */
+VALUE
+rb_dbl_complex_new_polar_pi(double abs, double ang)
+{
+    double fi;
+    const double fr = modf(ang, &fi);
+    int pos = fr == +0.5;
+
+    if (pos || fr == -0.5) {
+	if ((modf(fi / 2.0, &fi) != fr) ^ pos) abs = -abs;
+	return rb_complex_new(RFLOAT_0, DBL2NUM(abs));
+    }
+    else if (fr == 0.0) {
+	if (modf(fi / 2.0, &fi) != 0.0) abs = -abs;
+	return DBL2NUM(abs);
+    }
+    else {
+        const double real = abs * cospi(ang), imag = abs * sinpi(ang);
+        return rb_complex_new(DBL2NUM(real), DBL2NUM(imag));
+    }
+}
+
 /*
  * call-seq:
  *    Complex.polar(abs[, arg])  ->  complex
@@ -620,13 +705,20 @@ nucomp_s_polar(int argc, VALUE *argv, VALUE klass)
     switch (rb_scan_args(argc, argv, "11", &abs, &arg)) {
       case 1:
 	nucomp_real_check(abs);
-	if (canonicalization) return abs;
 	return nucomp_s_new_internal(klass, abs, ZERO);
       default:
 	nucomp_real_check(abs);
 	nucomp_real_check(arg);
 	break;
     }
+    if (RB_TYPE_P(abs, T_COMPLEX)) {
+        get_dat1(abs);
+        abs = dat->real;
+    }
+    if (RB_TYPE_P(arg, T_COMPLEX)) {
+        get_dat1(arg);
+        arg = dat->real;
+    }
     return f_complex_polar(klass, abs, arg);
 }
 
@@ -639,8 +731,8 @@ nucomp_s_polar(int argc, VALUE *argv, VALUE klass)
  *    Complex(7).real      #=> 7
  *    Complex(9, -4).real  #=> 9
  */
-static VALUE
-nucomp_real(VALUE self)
+VALUE
+rb_complex_real(VALUE self)
 {
     get_dat1(self);
     return dat->real;
@@ -656,8 +748,8 @@ nucomp_real(VALUE self)
  *    Complex(7).imaginary      #=> 0
  *    Complex(9, -4).imaginary  #=> -4
  */
-static VALUE
-nucomp_imag(VALUE self)
+VALUE
+rb_complex_imag(VALUE self)
 {
     get_dat1(self);
     return dat->imag;
@@ -671,35 +763,12 @@ nucomp_imag(VALUE self)
  *
  *    -Complex(1, 2)  #=> (-1-2i)
  */
-static VALUE
-nucomp_negate(VALUE self)
-{
-  get_dat1(self);
-  return f_complex_new2(CLASS_OF(self),
-			f_negate(dat->real), f_negate(dat->imag));
-}
-
-inline static VALUE
-f_addsub(VALUE self, VALUE other,
-	 VALUE (*func)(VALUE, VALUE), ID id)
+VALUE
+rb_complex_uminus(VALUE self)
 {
-    if (k_complex_p(other)) {
-	VALUE real, imag;
-
-	get_dat2(self, other);
-
-	real = (*func)(adat->real, bdat->real);
-	imag = (*func)(adat->imag, bdat->imag);
-
-	return f_complex_new2(CLASS_OF(self), real, imag);
-    }
-    if (k_numeric_p(other) && f_real_p(other)) {
-	get_dat1(self);
-
-	return f_complex_new2(CLASS_OF(self),
-			      (*func)(dat->real, other), dat->imag);
-    }
-    return rb_num_coerce_bin(self, other, id);
+    get_dat1(self);
+    return f_complex_new2(CLASS_OF(self),
+			  f_negate(dat->real), f_negate(dat->imag));
 }
 
 /*
@@ -715,11 +784,26 @@ f_addsub(VALUE self, VALUE other,
  *    Complex(20, 9) + 9.8             #=> (29.8+9i)
  */
 VALUE
-rb_nucomp_add(VALUE self, VALUE other)
+rb_complex_plus(VALUE self, VALUE other)
 {
-    return f_addsub(self, other, f_add, '+');
+    if (RB_TYPE_P(other, T_COMPLEX)) {
+	VALUE real, imag;
+
+	get_dat2(self, other);
+
+	real = f_add(adat->real, bdat->real);
+	imag = f_add(adat->imag, bdat->imag);
+
+	return f_complex_new2(CLASS_OF(self), real, imag);
+    }
+    if (k_numeric_p(other) && f_real_p(other)) {
+	get_dat1(self);
+
+	return f_complex_new2(CLASS_OF(self),
+			      f_add(dat->real, other), dat->imag);
+    }
+    return rb_num_coerce_bin(self, other, '+');
 }
-#define nucomp_add rb_nucomp_add
 
 /*
  * call-seq:
@@ -733,10 +817,26 @@ rb_nucomp_add(VALUE self, VALUE other)
  *    Complex(9, 8)  - 4               #=> (5+8i)
  *    Complex(20, 9) - 9.8             #=> (10.2+9i)
  */
-static VALUE
-nucomp_sub(VALUE self, VALUE other)
+VALUE
+rb_complex_minus(VALUE self, VALUE other)
 {
-    return f_addsub(self, other, f_sub, '-');
+    if (RB_TYPE_P(other, T_COMPLEX)) {
+	VALUE real, imag;
+
+	get_dat2(self, other);
+
+	real = f_sub(adat->real, bdat->real);
+	imag = f_sub(adat->imag, bdat->imag);
+
+	return f_complex_new2(CLASS_OF(self), real, imag);
+    }
+    if (k_numeric_p(other) && f_real_p(other)) {
+	get_dat1(self);
+
+	return f_complex_new2(CLASS_OF(self),
+			      f_sub(dat->real, other), dat->imag);
+    }
+    return rb_num_coerce_bin(self, other, '-');
 }
 
 static VALUE
@@ -752,6 +852,19 @@ safe_mul(VALUE a, VALUE b, int az, int bz)
     return f_mul(a, b);
 }
 
+static void
+comp_mul(VALUE areal, VALUE aimag, VALUE breal, VALUE bimag, VALUE *real, VALUE *imag)
+{
+    int arzero = f_zero_p(areal);
+    int aizero = f_zero_p(aimag);
+    int brzero = f_zero_p(breal);
+    int bizero = f_zero_p(bimag);
+    *real = f_sub(safe_mul(areal, breal, arzero, brzero),
+                  safe_mul(aimag, bimag, aizero, bizero));
+    *imag = f_add(safe_mul(areal, bimag, arzero, bizero),
+                  safe_mul(aimag, breal, aizero, brzero));
+}
+
 /*
  * call-seq:
  *    cmp * numeric  ->  complex
@@ -765,23 +878,13 @@ safe_mul(VALUE a, VALUE b, int az, int bz)
  *    Complex(20, 9) * 9.8             #=> (196.0+88.2i)
  */
 VALUE
-rb_nucomp_mul(VALUE self, VALUE other)
+rb_complex_mul(VALUE self, VALUE other)
 {
-    if (k_complex_p(other)) {
+    if (RB_TYPE_P(other, T_COMPLEX)) {
 	VALUE real, imag;
-	VALUE areal, aimag, breal, bimag;
-	int arzero, aizero, brzero, bizero;
-
 	get_dat2(self, other);
 
-	arzero = !!f_zero_p(areal = adat->real);
-	aizero = !!f_zero_p(aimag = adat->imag);
-	brzero = !!f_zero_p(breal = bdat->real);
-	bizero = !!f_zero_p(bimag = bdat->imag);
-	real = f_sub(safe_mul(areal, breal, arzero, brzero),
-		     safe_mul(aimag, bimag, aizero, bizero));
-	imag = f_add(safe_mul(areal, bimag, arzero, bizero),
-		     safe_mul(aimag, breal, aizero, brzero));
+        comp_mul(adat->real, adat->imag, bdat->real, bdat->imag, &real, &imag);
 
 	return f_complex_new2(CLASS_OF(self), real, imag);
     }
@@ -794,56 +897,43 @@ rb_nucomp_mul(VALUE self, VALUE other)
     }
     return rb_num_coerce_bin(self, other, '*');
 }
-#define nucomp_mul rb_nucomp_mul
 
 inline static VALUE
 f_divide(VALUE self, VALUE other,
 	 VALUE (*func)(VALUE, VALUE), ID id)
 {
-    if (k_complex_p(other)) {
+    if (RB_TYPE_P(other, T_COMPLEX)) {
+        VALUE r, n, x, y;
 	int flo;
 	get_dat2(self, other);
 
-	flo = (k_float_p(adat->real) || k_float_p(adat->imag) ||
-	       k_float_p(bdat->real) || k_float_p(bdat->imag));
+	flo = (RB_FLOAT_TYPE_P(adat->real) || RB_FLOAT_TYPE_P(adat->imag) ||
+	       RB_FLOAT_TYPE_P(bdat->real) || RB_FLOAT_TYPE_P(bdat->imag));
 
 	if (f_gt_p(f_abs(bdat->real), f_abs(bdat->imag))) {
-	    VALUE r, n;
-
 	    r = (*func)(bdat->imag, bdat->real);
 	    n = f_mul(bdat->real, f_add(ONE, f_mul(r, r)));
-	    if (flo)
-		return f_complex_new2(CLASS_OF(self),
-				      (*func)(self, n),
-				      (*func)(f_negate(f_mul(self, r)), n));
-	    return f_complex_new2(CLASS_OF(self),
-				  (*func)(f_add(adat->real,
-						f_mul(adat->imag, r)), n),
-				  (*func)(f_sub(adat->imag,
-						f_mul(adat->real, r)), n));
+            x = (*func)(f_add(adat->real, f_mul(adat->imag, r)), n);
+            y = (*func)(f_sub(adat->imag, f_mul(adat->real, r)), n);
 	}
 	else {
-	    VALUE r, n;
-
 	    r = (*func)(bdat->real, bdat->imag);
 	    n = f_mul(bdat->imag, f_add(ONE, f_mul(r, r)));
-	    if (flo)
-		return f_complex_new2(CLASS_OF(self),
-				      (*func)(f_mul(self, r), n),
-				      (*func)(f_negate(self), n));
-	    return f_complex_new2(CLASS_OF(self),
-				  (*func)(f_add(f_mul(adat->real, r),
-						adat->imag), n),
-				  (*func)(f_sub(f_mul(adat->imag, r),
-						adat->real), n));
+            x = (*func)(f_add(f_mul(adat->real, r), adat->imag), n);
+            y = (*func)(f_sub(f_mul(adat->imag, r), adat->real), n);
 	}
+        if (!flo) {
+            x = rb_rational_canonicalize(x);
+            y = rb_rational_canonicalize(y);
+        }
+        return f_complex_new2(CLASS_OF(self), x, y);
     }
     if (k_numeric_p(other) && f_real_p(other)) {
+        VALUE x, y;
 	get_dat1(self);
-
-	return f_complex_new2(CLASS_OF(self),
-			      (*func)(dat->real, other),
-			      (*func)(dat->imag, other));
+        x = rb_rational_canonicalize((*func)(dat->real, other));
+        y = rb_rational_canonicalize((*func)(dat->imag, other));
+        return f_complex_new2(CLASS_OF(self), x, y);
     }
     return rb_num_coerce_bin(self, other, id);
 }
@@ -863,13 +953,13 @@ f_divide(VALUE self, VALUE other,
  *    Complex(9, 8)  / 4               #=> ((9/4)+(2/1)*i)
  *    Complex(20, 9) / 9.8             #=> (2.0408163265306123+0.9183673469387754i)
  */
-static VALUE
-nucomp_div(VALUE self, VALUE other)
+VALUE
+rb_complex_div(VALUE self, VALUE other)
 {
     return f_divide(self, other, f_quo, id_quo);
 }
 
-#define nucomp_quo nucomp_div
+#define nucomp_quo rb_complex_div
 
 /*
  * call-seq:
@@ -900,23 +990,23 @@ f_reciprocal(VALUE x)
  *    Complex('i') ** 2              #=> (-1+0i)
  *    Complex(-8) ** Rational(1, 3)  #=> (1.0000000000000002+1.7320508075688772i)
  */
-static VALUE
-nucomp_expt(VALUE self, VALUE other)
+VALUE
+rb_complex_pow(VALUE self, VALUE other)
 {
     if (k_numeric_p(other) && k_exact_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); /* c14n */
+    if (RB_TYPE_P(other, T_RATIONAL) && RRATIONAL(other)->den == LONG2FIX(1))
+	other = RRATIONAL(other)->num; /* c14n */
 
-    if (k_complex_p(other)) {
+    if (RB_TYPE_P(other, T_COMPLEX)) {
 	get_dat1(other);
 
 	if (k_exact_zero_p(dat->imag))
 	    other = dat->real; /* c14n */
     }
 
-    if (k_complex_p(other)) {
+    if (RB_TYPE_P(other, T_COMPLEX)) {
 	VALUE r, theta, nr, ntheta;
 
 	get_dat1(other);
@@ -930,44 +1020,51 @@ nucomp_expt(VALUE self, VALUE other)
 		       f_mul(dat->imag, m_log_bang(r)));
 	return f_complex_polar(CLASS_OF(self), nr, ntheta);
     }
-    if (k_fixnum_p(other)) {
-	if (f_gt_p(other, ZERO)) {
-	    VALUE x, z;
-	    long n;
-
-	    x = self;
-	    z = x;
-	    n = FIX2LONG(other) - 1;
-
-	    while (n) {
-		long q, r;
-
-		while (1) {
-		    get_dat1(x);
-
-		    q = n / 2;
-		    r = n % 2;
-
-		    if (r)
-			break;
-
-		    x = nucomp_s_new_internal(CLASS_OF(self),
-				       f_sub(f_mul(dat->real, dat->real),
-					     f_mul(dat->imag, dat->imag)),
-				       f_mul(f_mul(TWO, dat->real), dat->imag));
-		    n = q;
-		}
-		z = f_mul(z, x);
-		n--;
-	    }
-	    return z;
+    if (FIXNUM_P(other)) {
+        long n = FIX2LONG(other);
+        if (n == 0) {
+            return nucomp_s_new_internal(CLASS_OF(self), ONE, ZERO);
+        }
+        if (n < 0) {
+            self = f_reciprocal(self);
+            other = rb_int_uminus(other);
+            n = -n;
+        }
+        {
+            get_dat1(self);
+            VALUE xr = dat->real, xi = dat->imag, zr = xr, zi = xi;
+
+            if (f_zero_p(xi)) {
+                zr = rb_num_pow(zr, other);
+            }
+            else if (f_zero_p(xr)) {
+                zi = rb_num_pow(zi, other);
+                if (n & 2) zi = f_negate(zi);
+                if (!(n & 1)) {
+                    VALUE tmp = zr;
+                    zr = zi;
+                    zi = tmp;
+                }
+            }
+            else {
+                while (--n) {
+                    long q, r;
+
+                    for (; q = n / 2, r = n % 2, r == 0; n = q) {
+                        VALUE tmp = f_sub(f_mul(xr, xr), f_mul(xi, xi));
+                        xi = f_mul(f_mul(TWO, xr), xi);
+                        xr = tmp;
+                    }
+                    comp_mul(zr, zi, xr, xi, &zr, &zi);
+                }
+            }
+            return nucomp_s_new_internal(CLASS_OF(self), zr, zi);
 	}
-	return f_expt(f_reciprocal(self), f_negate(other));
     }
     if (k_numeric_p(other) && f_real_p(other)) {
 	VALUE r, theta;
 
-	if (k_bignum_p(other))
+	if (RB_TYPE_P(other, T_BIGNUM))
 	    rb_warn("in a**b, b may be too big");
 
 	r = f_abs(self);
@@ -994,7 +1091,7 @@ nucomp_expt(VALUE self, VALUE other)
 static VALUE
 nucomp_eqeq_p(VALUE self, VALUE other)
 {
-    if (k_complex_p(other)) {
+    if (RB_TYPE_P(other, T_COMPLEX)) {
 	get_dat2(self, other);
 
 	return f_boolcast(f_eqeq_p(adat->real, bdat->real) &&
@@ -1005,17 +1102,54 @@ nucomp_eqeq_p(VALUE self, VALUE other)
 
 	return f_boolcast(f_eqeq_p(dat->real, other) && f_zero_p(dat->imag));
     }
-    return f_eqeq_p(other, self);
+    return f_boolcast(f_eqeq_p(other, self));
+}
+
+static bool
+nucomp_real_p(VALUE self)
+{
+    get_dat1(self);
+    return(f_zero_p(dat->imag) ? true : false);
+}
+
+/*
+ * call-seq:
+ *    cmp <=> object  ->  0, 1, -1, or nil
+ *
+ * If +cmp+'s imaginary part is zero, and +object+ is also a
+ * real number (or a Complex number where the imaginary part is zero),
+ * compare the real part of +cmp+ to object.  Otherwise, return nil.
+ *
+ *    Complex(2, 3)  <=> Complex(2, 3)   #=> nil
+ *    Complex(2, 3)  <=> 1               #=> nil
+ *    Complex(2)     <=> 1               #=> 1
+ *    Complex(2)     <=> 2               #=> 0
+ *    Complex(2)     <=> 3               #=> -1
+ */
+static VALUE
+nucomp_cmp(VALUE self, VALUE other)
+{
+    if (nucomp_real_p(self) && k_numeric_p(other)) {
+        if (RB_TYPE_P(other, T_COMPLEX) && nucomp_real_p(other)) {
+            get_dat2(self, other);
+            return rb_funcall(adat->real, idCmp, 1, bdat->real);
+        }
+        else if (f_real_p(other)) {
+            get_dat1(self);
+            return rb_funcall(dat->real, idCmp, 1, other);
+        }
+    }
+    return Qnil;
 }
 
 /* :nodoc: */
 static VALUE
 nucomp_coerce(VALUE self, VALUE other)
 {
-    if (k_numeric_p(other) && f_real_p(other))
-	return rb_assoc_new(f_complex_new_bang1(CLASS_OF(self), other), self);
     if (RB_TYPE_P(other, T_COMPLEX))
 	return rb_assoc_new(other, self);
+    if (k_numeric_p(other) && f_real_p(other))
+        return rb_assoc_new(f_complex_new_bang1(CLASS_OF(self), other), self);
 
     rb_raise(rb_eTypeError, "%"PRIsVALUE" can't be coerced into %"PRIsVALUE,
 	     rb_obj_class(other), rb_obj_class(self));
@@ -1032,24 +1166,24 @@ nucomp_coerce(VALUE self, VALUE other)
  *    Complex(-1).abs         #=> 1
  *    Complex(3.0, -4.0).abs  #=> 5.0
  */
-static VALUE
-nucomp_abs(VALUE self)
+VALUE
+rb_complex_abs(VALUE self)
 {
     get_dat1(self);
 
     if (f_zero_p(dat->real)) {
 	VALUE a = f_abs(dat->imag);
-	if (k_float_p(dat->real) && !k_float_p(dat->imag))
+	if (RB_FLOAT_TYPE_P(dat->real) && !RB_FLOAT_TYPE_P(dat->imag))
 	    a = f_to_f(a);
 	return a;
     }
     if (f_zero_p(dat->imag)) {
 	VALUE a = f_abs(dat->real);
-	if (!k_float_p(dat->real) && k_float_p(dat->imag))
+	if (!RB_FLOAT_TYPE_P(dat->real) && RB_FLOAT_TYPE_P(dat->imag))
 	    a = f_to_f(a);
 	return a;
     }
-    return m_hypot(dat->real, dat->imag);
+    return rb_math_hypot(dat->real, dat->imag);
 }
 
 /*
@@ -1079,11 +1213,11 @@ nucomp_abs2(VALUE self)
  *
  *    Complex.polar(3, Math::PI/2).arg  #=> 1.5707963267948966
  */
-static VALUE
-nucomp_arg(VALUE self)
+VALUE
+rb_complex_arg(VALUE self)
 {
     get_dat1(self);
-    return m_atan2_bang(dat->imag, dat->real);
+    return rb_math_atan2(dat->imag, dat->real);
 }
 
 /*
@@ -1125,27 +1259,19 @@ nucomp_polar(VALUE self)
  *
  *    Complex(1, 2).conjugate  #=> (1-2i)
  */
-static VALUE
-nucomp_conj(VALUE self)
+VALUE
+rb_complex_conjugate(VALUE self)
 {
     get_dat1(self);
     return f_complex_new2(CLASS_OF(self), dat->real, f_negate(dat->imag));
 }
 
-#if 0
-/* :nodoc: */
-static VALUE
-nucomp_true(VALUE self)
-{
-    return Qtrue;
-}
-#endif
-
 /*
  * call-seq:
- *    cmp.real?  ->  false
+ *    Complex(1).real?     ->  false
+ *    Complex(1, 2).real?  ->  false
  *
- * Returns false.
+ * Returns false, even if the complex number has no imaginary part.
  */
 static VALUE
 nucomp_false(VALUE self)
@@ -1153,23 +1279,6 @@ nucomp_false(VALUE self)
     return Qfalse;
 }
 
-#if 0
-/* :nodoc: */
-static VALUE
-nucomp_exact_p(VALUE self)
-{
-    get_dat1(self);
-    return f_boolcast(k_exact_p(dat->real) && k_exact_p(dat->imag));
-}
-
-/* :nodoc: */
-static VALUE
-nucomp_inexact_p(VALUE self)
-{
-    return f_boolcast(!nucomp_exact_p(self));
-}
-#endif
-
 /*
  * call-seq:
  *    cmp.denominator  ->  integer
@@ -1210,7 +1319,7 @@ nucomp_numerator(VALUE self)
 
     get_dat1(self);
 
-    cd = f_denominator(self);
+    cd = nucomp_denominator(self);
     return f_complex_new2(CLASS_OF(self),
 			  f_mul(f_numerator(dat->real),
 				f_div(cd, f_denominator(dat->real))),
@@ -1219,8 +1328,8 @@ nucomp_numerator(VALUE self)
 }
 
 /* :nodoc: */
-static VALUE
-nucomp_hash(VALUE self)
+st_index_t
+rb_complex_hash(VALUE self)
 {
     st_index_t v, h[2];
     VALUE n;
@@ -1231,14 +1340,20 @@ nucomp_hash(VALUE self)
     n = rb_hash(dat->imag);
     h[1] = NUM2LONG(n);
     v = rb_memhash(h, sizeof(h));
-    return LONG2FIX(v);
+    return v;
+}
+
+static VALUE
+nucomp_hash(VALUE self)
+{
+    return ST2FIX(rb_complex_hash(self));
 }
 
 /* :nodoc: */
 static VALUE
 nucomp_eql_p(VALUE self, VALUE other)
 {
-    if (k_complex_p(other)) {
+    if (RB_TYPE_P(other, T_COMPLEX)) {
 	get_dat2(self, other);
 
 	return f_boolcast((CLASS_OF(adat->real) == CLASS_OF(bdat->real)) &&
@@ -1249,26 +1364,27 @@ nucomp_eql_p(VALUE self, VALUE other)
     return Qfalse;
 }
 
-inline static VALUE
+inline static int
 f_signbit(VALUE x)
 {
-    if (RB_TYPE_P(x, T_FLOAT)) {
+    if (RB_FLOAT_TYPE_P(x)) {
 	double f = RFLOAT_VALUE(x);
-	return f_boolcast(!isnan(f) && signbit(f));
+	return !isnan(f) && signbit(f);
     }
     return f_negative_p(x);
 }
 
-inline static VALUE
+inline static int
 f_tpositive_p(VALUE x)
 {
-    return f_boolcast(!f_signbit(x));
+    return !f_signbit(x);
 }
 
 static VALUE
 f_format(VALUE self, VALUE (*func)(VALUE))
 {
-    VALUE s, impos;
+    VALUE s;
+    int impos;
 
     get_dat1(self);
 
@@ -1327,6 +1443,49 @@ nucomp_inspect(VALUE self)
     return s;
 }
 
+#define FINITE_TYPE_P(v) (RB_INTEGER_TYPE_P(v) || RB_TYPE_P(v, T_RATIONAL))
+
+/*
+ * call-seq:
+ *    cmp.finite?  ->  true or false
+ *
+ * Returns +true+ if +cmp+'s real and imaginary parts are both finite numbers,
+ * otherwise returns +false+.
+ */
+static VALUE
+rb_complex_finite_p(VALUE self)
+{
+    get_dat1(self);
+
+    if (f_finite_p(dat->real) && f_finite_p(dat->imag)) {
+	return Qtrue;
+    }
+    return Qfalse;
+}
+
+/*
+ * call-seq:
+ *    cmp.infinite?  ->  nil or 1
+ *
+ * Returns +1+ if +cmp+'s real or imaginary part is an infinite number,
+ * otherwise returns +nil+.
+ *
+ *  For example:
+ *
+ *     (1+1i).infinite?                   #=> nil
+ *     (Float::INFINITY + 1i).infinite?   #=> 1
+ */
+static VALUE
+rb_complex_infinite_p(VALUE self)
+{
+    get_dat1(self);
+
+    if (NIL_P(f_infinite_p(dat->real)) && NIL_P(f_infinite_p(dat->imag))) {
+	return Qnil;
+    }
+    return ONE;
+}
+
 /* :nodoc: */
 static VALUE
 nucomp_dumper(VALUE self)
@@ -1342,6 +1501,7 @@ nucomp_loader(VALUE self, VALUE a)
 
     RCOMPLEX_SET_REAL(dat, rb_ivar_get(a, id_i_real));
     RCOMPLEX_SET_IMAG(dat, rb_ivar_get(a, id_i_imag));
+    OBJ_FREEZE_RAW(self);
 
     return self;
 }
@@ -1385,12 +1545,16 @@ rb_complex_new(VALUE x, VALUE y)
 }
 
 VALUE
-rb_complex_polar(VALUE x, VALUE y)
+rb_complex_new_polar(VALUE x, VALUE y)
 {
     return f_complex_polar(rb_cComplex, x, y);
 }
 
-static VALUE nucomp_s_convert(int argc, VALUE *argv, VALUE klass);
+VALUE
+rb_complex_polar(VALUE x, VALUE y)
+{
+    return rb_complex_new_polar(x, y);
+}
 
 VALUE
 rb_Complex(VALUE x, VALUE y)
@@ -1401,18 +1565,17 @@ rb_Complex(VALUE x, VALUE y)
     return nucomp_s_convert(2, a, rb_cComplex);
 }
 
+/*!
+ * Creates a Complex object.
+ *
+ * \param real    real part value
+ * \param imag    imaginary part value
+ * \return        a new Complex object
+ */
 VALUE
-rb_complex_set_real(VALUE cmp, VALUE r)
-{
-    RCOMPLEX_SET_REAL(cmp, r);
-    return cmp;
-}
-
-VALUE
-rb_complex_set_imag(VALUE cmp, VALUE i)
+rb_dbl_complex_new(double real, double imag)
 {
-    RCOMPLEX_SET_IMAG(cmp, i);
-    return cmp;
+    return rb_complex_raw(DBL2NUM(real), DBL2NUM(imag));
 }
 
 /*
@@ -1504,13 +1667,13 @@ nucomp_rationalize(int argc, VALUE *argv, VALUE self)
 {
     get_dat1(self);
 
-    rb_scan_args(argc, argv, "01", NULL);
+    rb_check_arity(argc, 0, 1);
 
     if (!k_exact_zero_p(dat->imag)) {
        rb_raise(rb_eRangeError, "can't convert %"PRIsVALUE" into Rational",
                 self);
     }
-    return rb_funcall2(dat->real, rb_intern("rationalize"), argc, argv);
+    return rb_funcallv(dat->real, id_rationalize, argc, argv);
 }
 
 /*
@@ -1552,8 +1715,6 @@ numeric_to_c(VALUE self)
     return rb_complex_new1(self);
 }
 
-#include <ctype.h>
-
 inline static int
 issign(int c)
 {
@@ -1750,7 +1911,7 @@ read_comp(const char **s, int strict,
 	    return 0; /* e.g. "1@-" */
 	}
 	num2 = str2num(bb);
-	*ret = rb_complex_polar(num, num2);
+	*ret = rb_complex_new_polar(num, num2);
 	if (!st)
 	    return 0; /* e.g. "1@2." */
 	else
@@ -1793,8 +1954,7 @@ skip_ws(const char **s)
 }
 
 static int
-parse_comp(const char *s, int strict,
-	   VALUE *num)
+parse_comp(const char *s, int strict, VALUE *num)
 {
     char *buf, *b;
     VALUE tmp;
@@ -1805,14 +1965,14 @@ parse_comp(const char *s, int strict,
 
     skip_ws(&s);
     if (!read_comp(&s, strict, num, &b)) {
-	ret = 0;
+        ret = 0;
     }
     else {
-	skip_ws(&s);
+        skip_ws(&s);
 
-	if (strict)
-	    if (*s != '\0')
-		ret = 0;
+        if (strict)
+            if (*s != '\0')
+                ret = 0;
     }
     ALLOCV_END(tmp);
 
@@ -1820,7 +1980,7 @@ parse_comp(const char *s, int strict,
 }
 
 static VALUE
-string_to_c_strict(VALUE self)
+string_to_c_strict(VALUE self, int raise)
 {
     char *s;
     VALUE num;
@@ -1829,8 +1989,10 @@ string_to_c_strict(VALUE self)
 
     s = RSTRING_PTR(self);
 
-    if (!s || memchr(s, '\0', RSTRING_LEN(self)))
+    if (!s || memchr(s, '\0', RSTRING_LEN(self))) {
+        if (!raise) return Qnil;
 	rb_raise(rb_eArgError, "string contains null byte");
+    }
 
     if (s && s[RSTRING_LEN(self)]) {
 	rb_str_modify(self);
@@ -1842,6 +2004,7 @@ string_to_c_strict(VALUE self)
 	s = (char *)"";
 
     if (!parse_comp(s, 1, &num)) {
+        if (!raise) return Qnil;
 	rb_raise(rb_eArgError, "invalid value for convert(): %+"PRIsVALUE,
 		 self);
     }
@@ -1897,28 +2060,29 @@ string_to_c(VALUE self)
 }
 
 static VALUE
-nucomp_s_convert(int argc, VALUE *argv, VALUE klass)
+to_complex(VALUE val)
 {
-    VALUE a1, a2, backref;
-
-    rb_scan_args(argc, argv, "11", &a1, &a2);
+    return rb_convert_type(val, T_COMPLEX, "Complex", "to_c");
+}
 
-    if (NIL_P(a1) || (argc == 2 && NIL_P(a2)))
+static VALUE
+nucomp_convert(VALUE klass, VALUE a1, VALUE a2, int raise)
+{
+    if (NIL_P(a1) || NIL_P(a2)) {
+        if (!raise) return Qnil;
 	rb_raise(rb_eTypeError, "can't convert nil into Complex");
-
-    backref = rb_backref_get();
-    rb_match_busy(backref);
+    }
 
     if (RB_TYPE_P(a1, T_STRING)) {
-	a1 = string_to_c_strict(a1);
+	a1 = string_to_c_strict(a1, raise);
+        if (NIL_P(a1)) return Qnil;
     }
 
     if (RB_TYPE_P(a2, T_STRING)) {
-	a2 = string_to_c_strict(a2);
+	a2 = string_to_c_strict(a2, raise);
+        if (NIL_P(a2)) return Qnil;
     }
 
-    rb_backref_set(backref);
-
     if (RB_TYPE_P(a1, T_COMPLEX)) {
 	{
 	    get_dat1(a1);
@@ -1938,16 +2102,19 @@ nucomp_s_convert(int argc, VALUE *argv, VALUE klass)
     }
 
     if (RB_TYPE_P(a1, T_COMPLEX)) {
-	if (argc == 1 || (k_exact_zero_p(a2)))
+	if (a2 == Qundef || (k_exact_zero_p(a2)))
 	    return a1;
     }
 
-    if (argc == 1) {
+    if (a2 == Qundef) {
 	if (k_numeric_p(a1) && !f_real_p(a1))
 	    return a1;
 	/* should raise exception for consistency */
-	if (!k_numeric_p(a1))
-	    return rb_convert_type(a1, T_COMPLEX, "Complex", "to_c");
+	if (!k_numeric_p(a1)) {
+            if (!raise)
+                return rb_protect(to_complex, a1, NULL);
+	    return to_complex(a1);
+        }
     }
     else {
 	if ((k_numeric_p(a1) && k_numeric_p(a2)) &&
@@ -1958,13 +2125,35 @@ nucomp_s_convert(int argc, VALUE *argv, VALUE klass)
     }
 
     {
+        int argc;
 	VALUE argv2[2];
 	argv2[0] = a1;
-	argv2[1] = a2;
+        if (a2 == Qundef) {
+            argv2[1] = Qnil;
+            argc = 1;
+        }
+        else {
+            if (!raise && !RB_INTEGER_TYPE_P(a2) && !RB_FLOAT_TYPE_P(a2) && !RB_TYPE_P(a2, T_RATIONAL))
+                return Qnil;
+            argv2[1] = a2;
+            argc = 2;
+        }
 	return nucomp_s_new(argc, argv2, klass);
     }
 }
 
+static VALUE
+nucomp_s_convert(int argc, VALUE *argv, VALUE klass)
+{
+    VALUE a1, a2;
+
+    if (rb_scan_args(argc, argv, "11", &a1, &a2) == 1) {
+        a2 = Qundef;
+    }
+
+    return nucomp_convert(klass, a1, a2, TRUE);
+}
+
 /* --- */
 
 /*
@@ -2004,8 +2193,6 @@ numeric_abs2(VALUE self)
     return f_mul(self, self);
 }
 
-#define id_PI rb_intern("PI")
-
 /*
  * call-seq:
  *    num.arg    ->  0 or float
@@ -2018,8 +2205,8 @@ static VALUE
 numeric_arg(VALUE self)
 {
     if (f_positive_p(self))
-	return INT2FIX(0);
-    return rb_const_get(rb_mMath, id_PI);
+        return INT2FIX(0);
+    return DBL2NUM(M_PI);
 }
 
 /*
@@ -2035,6 +2222,8 @@ numeric_rect(VALUE self)
     return rb_assoc_new(self, INT2FIX(0));
 }
 
+static VALUE float_arg(VALUE self);
+
 /*
  * call-seq:
  *    num.polar  ->  array
@@ -2044,7 +2233,25 @@ numeric_rect(VALUE self)
 static VALUE
 numeric_polar(VALUE self)
 {
-    return rb_assoc_new(f_abs(self), f_arg(self));
+    VALUE abs, arg;
+
+    if (RB_INTEGER_TYPE_P(self)) {
+        abs = rb_int_abs(self);
+        arg = numeric_arg(self);
+    }
+    else if (RB_FLOAT_TYPE_P(self)) {
+        abs = rb_float_abs(self);
+        arg = float_arg(self);
+    }
+    else if (RB_TYPE_P(self, T_RATIONAL)) {
+        abs = rb_rational_abs(self);
+        arg = numeric_arg(self);
+    }
+    else {
+        abs = f_abs(self);
+        arg = f_arg(self);
+    }
+    return rb_assoc_new(abs, arg);
 }
 
 /*
@@ -2115,39 +2322,24 @@ void
 Init_Complex(void)
 {
     VALUE compat;
-#undef rb_intern
-#define rb_intern(str) rb_intern_const(str)
-
-    assert(fprintf(stderr, "assert() is now active\n"));
-
-    id_abs = rb_intern("abs");
-    id_arg = rb_intern("arg");
-    id_convert = rb_intern("convert");
-    id_denominator = rb_intern("denominator");
-    id_eqeq_p = rb_intern("==");
-    id_expt = rb_intern("**");
-    id_fdiv = rb_intern("fdiv");
-    id_negate = rb_intern("-@");
-    id_numerator = rb_intern("numerator");
-    id_quo = rb_intern("quo");
-    id_real_p = rb_intern("real?");
-    id_to_f = rb_intern("to_f");
-    id_to_i = rb_intern("to_i");
-    id_to_r = rb_intern("to_r");
-    id_i_real = rb_intern("@real");
-    id_i_imag = rb_intern("@image"); /* @image, not @imag */
+    id_abs = rb_intern_const("abs");
+    id_arg = rb_intern_const("arg");
+    id_denominator = rb_intern_const("denominator");
+    id_numerator = rb_intern_const("numerator");
+    id_real_p = rb_intern_const("real?");
+    id_i_real = rb_intern_const("@real");
+    id_i_imag = rb_intern_const("@image"); /* @image, not @imag */
+    id_finite_p = rb_intern_const("finite?");
+    id_infinite_p = rb_intern_const("infinite?");
+    id_rationalize = rb_intern_const("rationalize");
+    id_PI = rb_intern_const("PI");
 
     rb_cComplex = rb_define_class("Complex", rb_cNumeric);
 
     rb_define_alloc_func(rb_cComplex, nucomp_s_alloc);
     rb_undef_method(CLASS_OF(rb_cComplex), "allocate");
 
-#if 0
-    rb_define_private_method(CLASS_OF(rb_cComplex), "new!", nucomp_s_new_bang, -1);
-    rb_define_private_method(CLASS_OF(rb_cComplex), "new", nucomp_s_new, -1);
-#else
     rb_undef_method(CLASS_OF(rb_cComplex), "new");
-#endif
 
     rb_define_singleton_method(rb_cComplex, "rectangular", nucomp_s_new, -1);
     rb_define_singleton_method(rb_cComplex, "rect", nucomp_s_new, -1);
@@ -2155,13 +2347,8 @@ Init_Complex(void)
 
     rb_define_global_function("Complex", nucomp_f_complex, -1);
 
+    rb_undef_methods_from(rb_cComplex, RCLASS_ORIGIN(rb_mComparable));
     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, ">=");
-    rb_undef_method(rb_cComplex, "between?");
     rb_undef_method(rb_cComplex, "div");
     rb_undef_method(rb_cComplex, "divmod");
     rb_undef_method(rb_cComplex, "floor");
@@ -2173,43 +2360,36 @@ Init_Complex(void)
     rb_undef_method(rb_cComplex, "truncate");
     rb_undef_method(rb_cComplex, "i");
 
-    rb_define_method(rb_cComplex, "real", nucomp_real, 0);
-    rb_define_method(rb_cComplex, "imaginary", nucomp_imag, 0);
-    rb_define_method(rb_cComplex, "imag", nucomp_imag, 0);
+    rb_define_method(rb_cComplex, "real", rb_complex_real, 0);
+    rb_define_method(rb_cComplex, "imaginary", rb_complex_imag, 0);
+    rb_define_method(rb_cComplex, "imag", rb_complex_imag, 0);
 
-    rb_define_method(rb_cComplex, "-@", nucomp_negate, 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, "-@", rb_complex_uminus, 0);
+    rb_define_method(rb_cComplex, "+", rb_complex_plus, 1);
+    rb_define_method(rb_cComplex, "-", rb_complex_minus, 1);
+    rb_define_method(rb_cComplex, "*", rb_complex_mul, 1);
+    rb_define_method(rb_cComplex, "/", rb_complex_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, "**", rb_complex_pow, 1);
 
     rb_define_method(rb_cComplex, "==", nucomp_eqeq_p, 1);
+    rb_define_method(rb_cComplex, "<=>", nucomp_cmp, 1);
     rb_define_method(rb_cComplex, "coerce", nucomp_coerce, 1);
 
-    rb_define_method(rb_cComplex, "abs", nucomp_abs, 0);
-    rb_define_method(rb_cComplex, "magnitude", nucomp_abs, 0);
+    rb_define_method(rb_cComplex, "abs", rb_complex_abs, 0);
+    rb_define_method(rb_cComplex, "magnitude", rb_complex_abs, 0);
     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, "phase", nucomp_arg, 0);
+    rb_define_method(rb_cComplex, "arg", rb_complex_arg, 0);
+    rb_define_method(rb_cComplex, "angle", rb_complex_arg, 0);
+    rb_define_method(rb_cComplex, "phase", rb_complex_arg, 0);
     rb_define_method(rb_cComplex, "rectangular", nucomp_rect, 0);
     rb_define_method(rb_cComplex, "rect", nucomp_rect, 0);
     rb_define_method(rb_cComplex, "polar", nucomp_polar, 0);
-    rb_define_method(rb_cComplex, "conjugate", nucomp_conj, 0);
-    rb_define_method(rb_cComplex, "conj", nucomp_conj, 0);
-#if 0
-    rb_define_method(rb_cComplex, "~", nucomp_conj, 0); /* gcc */
-#endif
+    rb_define_method(rb_cComplex, "conjugate", rb_complex_conjugate, 0);
+    rb_define_method(rb_cComplex, "conj", rb_complex_conjugate, 0);
 
     rb_define_method(rb_cComplex, "real?", nucomp_false, 0);
-#if 0
-    rb_define_method(rb_cComplex, "complex?", nucomp_true, 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);
@@ -2223,8 +2403,12 @@ Init_Complex(void)
     rb_undef_method(rb_cComplex, "positive?");
     rb_undef_method(rb_cComplex, "negative?");
 
+    rb_define_method(rb_cComplex, "finite?", rb_complex_finite_p, 0);
+    rb_define_method(rb_cComplex, "infinite?", rb_complex_infinite_p, 0);
+
     rb_define_private_method(rb_cComplex, "marshal_dump", nucomp_marshal_dump, 0);
-    compat = rb_define_class_under(rb_cComplex, "compatible", rb_cObject); /* :nodoc: */
+    /* :nodoc: */
+    compat = rb_define_class_under(rb_cComplex, "compatible", rb_cObject);
     rb_define_private_method(compat, "marshal_load", nucomp_marshal_load, 1);
     rb_marshal_define_compat(rb_cComplex, compat, nucomp_dumper, nucomp_loader);
 
@@ -2267,11 +2451,9 @@ Init_Complex(void)
     rb_define_const(rb_cComplex, "I",
 		    f_complex_new_bang2(rb_cComplex, ZERO, ONE));
 
+#if !USE_FLONUM
+    rb_gc_register_mark_object(RFLOAT_0 = DBL2NUM(0.0));
+#endif
+
     rb_provide("complex.so");	/* for backward compatibility */
 }
-
-/*
-Local variables:
-c-file-style: "ruby"
-End:
-*/
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000000..28fdfefbbc
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,4262 @@
+dnl Process this file with autoconf to produce a configure script.
+AC_INIT
+{
+AC_CONFIG_AUX_DIR(tool)
+
+AC_PREREQ(2.67)
+
+tooldir="$srcdir/tool"
+
+AC_DISABLE_OPTION_CHECKING
+
+m4_include([tool/m4/_colorize_result_prepare.m4])
+m4_include([tool/m4/ac_msg_result.m4])
+m4_include([tool/m4/colorize_result.m4])
+m4_include([tool/m4/ruby_append_option.m4])
+m4_include([tool/m4/ruby_append_options.m4])
+m4_include([tool/m4/ruby_check_builtin_func.m4])
+m4_include([tool/m4/ruby_check_builtin_setjmp.m4])
+m4_include([tool/m4/ruby_check_printf_prefix.m4])
+m4_include([tool/m4/ruby_check_setjmp.m4])
+m4_include([tool/m4/ruby_check_signedness.m4])
+m4_include([tool/m4/ruby_check_sizeof.m4])
+m4_include([tool/m4/ruby_check_sysconf.m4])
+m4_include([tool/m4/ruby_cppoutfile.m4])
+m4_include([tool/m4/ruby_decl_attribute.m4])
+m4_include([tool/m4/ruby_default_arch.m4])
+m4_include([tool/m4/ruby_define_if.m4])
+m4_include([tool/m4/ruby_defint.m4])
+m4_include([tool/m4/ruby_dtrace_available.m4])
+m4_include([tool/m4/ruby_dtrace_postprocess.m4])
+m4_include([tool/m4/ruby_func_attribute.m4])
+m4_include([tool/m4/ruby_mingw32.m4])
+m4_include([tool/m4/ruby_prepend_option.m4])
+m4_include([tool/m4/ruby_prog_gnu_ld.m4])
+m4_include([tool/m4/ruby_replace_funcs.m4])
+m4_include([tool/m4/ruby_replace_type.m4])
+m4_include([tool/m4/ruby_rm_recursive.m4])
+m4_include([tool/m4/ruby_setjmp_type.m4])
+m4_include([tool/m4/ruby_stack_grow_direction.m4])
+m4_include([tool/m4/ruby_try_cflags.m4])
+m4_include([tool/m4/ruby_try_cxxflags.m4])
+m4_include([tool/m4/ruby_try_ldflags.m4])
+m4_include([tool/m4/ruby_universal_arch.m4])
+m4_include([tool/m4/ruby_werror_flag.m4])
+
+AC_ARG_VAR([cflags], [additional CFLAGS (ignored when CFLAGS is given)])
+AC_ARG_VAR([cppflags], [additional CPPFLAGS (ignored when CPPFLAGS is given)])
+AC_ARG_VAR([cxxflags], [additional CXXFLAGS (ignored when CXXFLAGS is given)])
+
+: "environment section" && {
+HAVE_BASERUBY=yes
+BASERUBY_VERSION=
+AC_ARG_WITH(baseruby,
+	AS_HELP_STRING([--with-baseruby=RUBY], [use RUBY as baseruby; RUBY is the pathname of ruby]),
+	[AS_CASE(["$withval"],
+	    [*ruby*],[BASERUBY=$withval],
+	    [no],[HAVE_BASERUBY=no],
+	    [AC_MSG_ERROR(need ruby)])
+	],
+	[
+		AC_PATH_PROG([BASERUBY], [ruby], [false])
+	])
+AS_IF([test "$HAVE_BASERUBY" != no -a "`RUBYOPT=- $BASERUBY --disable=gems -e 'print 42 if RUBY_VERSION > "2.2"' 2>/dev/null`" = 42], [
+    BASERUBY="$BASERUBY --disable=gems"
+    BASERUBY_VERSION=`$BASERUBY -v`
+    $BASERUBY -C "$srcdir" tool/downloader.rb -d tool -e gnu config.guess config.sub >&AS_MESSAGE_FD
+], [
+    BASERUBY="echo executable host ruby is required.  use --with-baseruby option.; false"
+    HAVE_BASERUBY=no
+])
+AC_SUBST(BASERUBY)
+AC_SUBST(HAVE_BASERUBY)
+
+: ${GIT=git}
+HAVE_GIT=yes
+AC_ARG_WITH(git,
+	AS_HELP_STRING([--without-git], [never use git]),
+	[AS_CASE([$withval],
+	    [no],  [GIT=never-use HAVE_GIT=no],
+	    [yes], [],
+	    [GIT=$withval])])
+AS_IF([test x"$HAVE_GIT" = xyes], [command -v "$GIT" > /dev/null || HAVE_GIT=no])
+AC_SUBST(GIT)
+AC_SUBST(HAVE_GIT)
+
+eval `sed -n -e ['s/^@%:@define RUBY_[A-Z_]*VERSION_\([A-Z][A-Z][A-Z_0-9]*\) \([0-9][0-9]*\)$/\1=\2/p'] \
+      -e ['s/^@%:@define \(RUBY_PATCHLEVEL\) \(.*\)/\1=\2/p'] \
+     $srcdir/include/ruby/version.h $srcdir/version.h`
+for v in MAJOR MINOR TEENY; do
+    AS_IF([eval "test \"\$$v\" = ''"], [
+	AC_MSG_ERROR(could not determine $v number from version.h)
+    ])
+done
+AC_SUBST(MAJOR)
+AC_SUBST(MINOR)
+AC_SUBST(TEENY)
+AC_SUBST(RUBY_API_VERSION, '$(MAJOR).$(MINOR)')
+AC_SUBST(RUBY_PROGRAM_VERSION, '$(MAJOR).$(MINOR).$(TEENY)')
+
+AS_IF([test "$program_prefix" = NONE], [
+  program_prefix=
+])
+AS_IF([test "$prefix" -ef .], [
+  AC_MSG_ERROR(--prefix cannot be the current working directory.)
+])
+RUBY_BASE_NAME=`echo ruby | sed "$program_transform_name"`
+RUBYW_BASE_NAME=`echo rubyw | sed "$program_transform_name"`
+AC_SUBST(RUBY_BASE_NAME)
+AC_SUBST(RUBYW_BASE_NAME)
+AC_SUBST(RUBY_VERSION_NAME, '${RUBY_BASE_NAME}-${ruby_version}')
+
+dnl checks for alternative programs
+AC_CANONICAL_BUILD
+AC_CANONICAL_HOST
+AC_CANONICAL_TARGET
+AC_ARG_PROGRAM
+RUBY_RM_RECURSIVE
+AC_ARG_WITH(gcc,
+	AS_HELP_STRING([--without-gcc], [never use gcc]),
+	[
+	AS_CASE([$withval],
+	    [no],  [: ${CC=cc}],
+	    [yes], [: ${CC=gcc}],
+	           [CC=$withval])])
+dnl If the user switches compilers, we can't believe the cache
+AS_IF([test ! -z "$ac_cv_prog_CC" -a ! -z "$CC" -a "$CC" != "$ac_cv_prog_CC"], [
+  AC_MSG_ERROR(cached CC is different -- throw away $cache_file
+(it is also a good idea to do 'make clean' before compiling))
+])
+AS_CASE(["${build_os}"], [linux*|cygwin*], [
+    AC_CHECK_TOOLS([CC], [gcc clang cc])
+], [
+    # OpenBSD wants to prefer cc over gcc.
+    # See https://github.com/ruby/ruby/pull/2443
+    AC_CHECK_TOOLS([CC], [cl.exe clang cc gcc c99 /usr/ucb/cc])
+])
+
+AC_ARG_VAR([AR],       [Archiver command])
+AC_ARG_VAR([AS],       [Assembler command])
+AC_ARG_VAR([CC],       [C compiler command])
+AC_ARG_VAR([CXX],      [C++ compiler command])
+AC_ARG_VAR([LD],       [Linker command])
+AC_ARG_VAR([NM],       [Symbol list command])
+AC_ARG_VAR([OBJCOPY],  [Objcopy command])
+AC_ARG_VAR([OBJDUMP],  [Objdump command])
+AC_ARG_VAR([RANLIB],   [Ranlib command])
+AC_ARG_VAR([STRIP],    [Strip command])
+
+# We don't want to bother things like `ccache gcc`, `clang -shared-libgcc`, ...
+set rb_dummy ${CC}
+rb_CC=$2
+AS_CASE(["/${rb_CC} "],
+[*@<:@\ /@:>@"cc "*], [
+    # Don't try g++/clang++ when CC=cc
+    AC_CHECK_TOOLS([CXX],    [cl.exe CC c++])
+],
+[*icc*],              [
+    # Intel C++ has interprocedural optimizations.  It tends to come with its
+    # own linker etc.
+    AC_CHECK_TOOL([AR],      [`echo "${rb_CC}" | sed s/icc/xiar/`])
+    AC_CHECK_TOOL([CXX],     [`echo "${rb_CC}" | sed s/icc/icpc/`])
+    AC_CHECK_TOOL([LD],      [`echo "${rb_CC}" | sed s/icc/xild/`])
+],
+[*gcc*],              [
+    # Dito for GCC.
+    AC_CHECK_TOOL([LD],      [`echo "${rb_CC}" | sed s/gcc/ld/`])
+    AC_CHECK_TOOL([AR],      [`echo "${rb_CC}" | sed s/gcc/gcc-ar/`])
+    AC_CHECK_TOOL([CXX],     [`echo "${rb_CC}" | sed s/gcc/g++/`])
+    AC_CHECK_TOOL([NM],      [`echo "${rb_CC}" | sed s/gcc/gcc-nm/`])
+    AC_CHECK_TOOL([RANLIB],  [`echo "${rb_CC}" | sed s/gcc/gcc-ranlib/`])
+],
+[*clang*],            [
+    # Dito for LLVM.  Note however that llvm-as is a LLVM-IR to LLVM bitcode
+    # assembler that does not target your machine native binary.
+    : ${LD:="${CC}"}         # ... try -fuse-ld=lld ?
+    AC_CHECK_TOOL([AR],      [`echo "${rb_CC}" | sed s/clang/llvm-ar/`])
+#   AC_CHECK_TOOL([AS],      [`echo "${rb_CC}" | sed s/clang/llvm-as/`])
+    AC_CHECK_TOOL([CXX],     [`echo "${rb_CC}" | sed s/clang/clang++/`])
+    AC_CHECK_TOOL([NM],      [`echo "${rb_CC}" | sed s/clang/llvm-nm/`])
+    AC_CHECK_TOOL([OBJCOPY], [`echo "${rb_CC}" | sed s/clang/llvm-objcopy/`])
+    AC_CHECK_TOOL([OBJDUMP], [`echo "${rb_CC}" | sed s/clang/llvm-objdump/`])
+    AC_CHECK_TOOL([RANLIB],  [`echo "${rb_CC}" | sed s/clang/llvm-ranlib/`])
+    AC_CHECK_TOOL([STRIP],   [`echo "${rb_CC}" | sed s/clang/llvm-strip/`])
+])
+AS_UNSET(rb_CC)
+AS_UNSET(rb_dummy)
+
+AS_CASE(["${build_os}"],
+[solaris*], [
+    AC_PATH_TOOL([LD], [ld], [/usr/ccs/bin/ld], [/usr/ccs/bin:$PATH])
+],
+[aix*], [
+    AC_PATH_TOOL([NM], [nm], [/usr/ccs/bin/nm], [/usr/ccs/bin:$PATH])
+])
+AS_CASE(["${target_os}"],
+[cygwin*|mingw*], [
+    ac_cv_prog_ac_ct_OBJCOPY=":"
+])
+
+rb_test_CFLAGS=${CFLAGS+yes}
+rb_test_CXXFLAGS=${CXXFLAGS+yes}
+
+# BSD's ports and MacPorts prefix GNU binutils with 'g'
+
+dnl Seems necessarily in order to add -std=gnu99 option for gcc 4.9.
+m4_version_prereq([2.70], [], [AC_PROG_CC_C99])
+
+AC_PROG_CXX
+AC_PROG_CPP
+AC_PROG_RANLIB
+AC_CHECK_TOOLS([AR],      [gar ar])
+AC_CHECK_TOOLS([AS],      [gas as])
+AC_CHECK_TOOLS([LD],      [gld ld]) # ... try gold ?
+AC_CHECK_TOOLS([NM],      [gnm nm])
+AC_CHECK_TOOLS([OBJCOPY], [gobjcopy objcopy])
+AC_CHECK_TOOLS([OBJDUMP], [gobjdump objdump])
+AC_CHECK_TOOLS([STRIP],   [gstrip strip], [:])
+
+AS_IF([test ! $rb_test_CFLAGS], [AS_UNSET(CFLAGS)]); AS_UNSET(rb_test_CFLAGS)
+AS_IF([test ! $rb_test_CXXFLAGS], [AS_UNSET(CXXFLAGS)]); AS_UNSET(rb_save_CXXFLAGS)
+
+AS_IF([test "${CXX}" = "g++" -a -z "${GXX}"], [
+    # AC_PROG_CXX sets $CXX to "g++" when it purposefully finds that there is
+    # _no_ g++.  This brain-damaged design must be worked around.  Thankfully,
+    # similar thing doesn't happen for AC_PROG_CC.
+    rb_there_is_in_fact_no_gplusplus_but_autoconf_is_cheating_us=true
+])
+
+test x"$target_alias" = x &&
+target_os=`echo $target_os | sed 's/linux-gnu$/linux/;s/linux-gnu/linux-/'`
+ac_install_sh='' # unusable for extension libraries.
+
+AC_ARG_WITH(os-version-style,
+	AS_HELP_STRING([--with-os-version-style=TYPE],
+		       [OS version number for target and target_os [[full]]]
+		       [(full|teeny|minor+0|minor|major+0|major|none)]),
+	[os_version_style=$withval],
+	[os_version_style=full
+	    AS_CASE($target_os, [[*[0-9].*]],
+		[AS_CASE([`/usr/bin/ruby -e 'puts RUBY_PLATFORM' 2>/dev/null`],
+		    [[*-*[0-9].*.0]], [os_version_style=minor+0],
+		    [[*-*[0-9].*.*]], [os_version_style=full],
+		    [[*-*[0-9].0]  ], [os_version_style=major+0],
+		    [[*-*[0-9].*]  ], [os_version_style=minor],
+		    [[*-*[0-9]]    ], [os_version_style=major],
+		)])
+	])
+os_version_style_transform=
+AS_CASE("${os_version_style}",
+	[full|teeny], [],
+	[minor+0], [os_version_style_transform=['s/\([0-9]\.[0-9][0-9]*\)\.[0-9][.0-9]*$/\1.0/']],
+	[minor],   [os_version_style_transform=['s/\([0-9]\.[0-9][0-9]*\)\.[0-9][.0-9]*$/\1/']],
+	[major+0], [os_version_style_transform=['s/\([0-9]\)\.[0-9][.0-9]*$/\1.0/']],
+	[major],   [os_version_style_transform=['s/\([0-9]\)\.[0-9][.0-9]*$/\1/']],
+	[none],    [os_version_style_transform=['s/[0-9]*\.[0-9][.0-9]*$//']],
+	[AC_MSG_ERROR(unknown --with-os-version-style: $withval)])
+AS_IF([test -z "$target_alias" -a -n "$os_version_style_transform"],
+	[
+	target=`echo ${target} | sed "$os_version_style_transform"`
+	target_os=`echo ${target_os} | sed "$os_version_style_transform"`
+	])
+
+AC_ARG_WITH(arch,
+	AS_HELP_STRING([--with-arch=ARCHS],
+		       [build an Apple/NeXT Multi Architecture Binary (MAB);
+                          ARCHS is a comma-delimited list of architectures for
+                          which to build; if this option is disabled or omitted
+			  entirely, then the package will be built only for the
+			  target platform]),
+       [target_archs="$withval"], [unset target_archs])
+
+AC_ARG_ENABLE(load-relative,
+       AS_HELP_STRING([--enable-load-relative], [resolve load paths at run time]),
+       [load_relative=$enableval])
+
+# checks for UNIX variants that set C preprocessor variables
+AC_USE_SYSTEM_EXTENSIONS
+
+dnl Checks for programs.
+
+cflagspat=
+test -z "$optflags" ||
+    cflagspat="$cflagspat;s|"`eval echo '"'"${optflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^ */ /;s/ *$/ /'`'| |g'
+test -z "$debugflags" ||
+    cflagspat="$cflagspat;s|"`eval echo '"'"${debugflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^ */ /;s/ *$/ /'`'| |g'
+test -z "$warnflags" ||
+    cflagspat="$cflagspat;s|"`eval echo '"'"${warnflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^ */ /;s/ *$/ /'`'| |g'
+AS_IF([test -z "${CFLAGS+set}"], [
+    cflags=`echo " $cflags " | sed "$cflagspat;s/^ *//;s/ *$//"`
+    orig_cflags="$cflags"
+    cflags="$cflags "'${optflags} ${debugflags} ${warnflags}'
+])
+dnl AS_IF([test -z "${CXXFLAGS+set}"], [
+dnl     cxxflags=`echo " $cxxflags " | sed "$cflagspat;s/^ *//;s/ *$//"`
+dnl     orig_cxxflags="$cxxflags"
+dnl     cxxflags="$cxxflags "'${optflags} ${debugflags} ${warnflags}'
+dnl ])
+
+AS_CASE(["$host_os:$build_os"],
+[darwin*:darwin*], [
+    # Following Apple deployed clang are broken
+    # clang version 1.0 (http://llvm.org/svn/llvm-project/cfe/tags/Apple/clang-23 exported)
+    # Apple clang version 2.0 (tags/Apple/clang-137) (based on LLVM 2.9svn)
+    # Apple clang version 2.1 (tags/Apple/clang-163.7.1) (based on LLVM 3.0svn)
+    AC_PREPROC_IFELSE(
+	[AC_LANG_PROGRAM([
+	    @%:@if defined __APPLE_CC__ && defined __clang_major__ && __clang_major__ < 3
+	    @%:@error premature clang
+	    @%:@endif
+	])],
+	[],
+	[AC_MSG_ERROR([clang version 3.0 or later is required])])
+])
+
+AS_CASE(["$target_os"],
+[darwin*], [
+    AC_MSG_CHECKING(if minimum required OS X version is supported)
+    AC_PREPROC_IFELSE([AC_LANG_SOURCE([[@%:@include <AvailabilityMacros.h>
+	@%:@if MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_5
+	@%:@error pre OS X 10.5
+	[!<===== pre OS X 10.5 =====>]
+	@%:@endif
+	]])],
+	[macosx_min_required=yes],
+	[AC_MSG_RESULT(no)
+	AC_MSG_ERROR([Unsupported OS X version is required])])
+    AC_MSG_RESULT(${macosx_min_required})
+])
+
+RUBY_MINGW32
+AC_SUBST(GCC)
+AC_SUBST(LD)
+AS_IF([test "$GCC" = yes], [
+    linker_flag=-Wl,
+    : ${optflags=-O3}
+    gcc_major=`echo =__GNUC__ | $CC -E -xc - | sed '/^=/!d;s///'`
+    gcc_minor=`echo =__GNUC_MINOR__ | $CC -E -xc - | sed '/^=/!d;s///'`
+    test -n "$gcc_major" || gcc_major=0
+    test -n "$gcc_minor" || gcc_minor=0
+    icc_version=`echo =__ICC | $CC -E -xc - | sed '/^=/!d;s///;/^__ICC/d'`
+    test -n "$icc_version" || icc_version=0
+    # RUBY_APPEND_OPTIONS(XCFLAGS, ["-include ruby/config.h" "-include ruby/missing.h"])
+], [
+    linker_flag=
+])
+
+AS_IF([test "$GCC" = yes -a "$gcc_major" -lt 3 ], [
+    AC_MSG_ERROR([too old GCC])
+])
+
+
+AC_CACHE_CHECK([if thread-local storage is supported], [rb_cv_tls_supported],
+    [AC_LINK_IFELSE([AC_LANG_PROGRAM([[int __thread conftest;]])],
+        [rb_cv_tls_supported=yes],
+        [rb_cv_tls_supported=no])])
+AS_IF([test x"$rb_cv_tls_supported" != xyes],
+    [AC_DEFINE(RB_THREAD_LOCAL_SPECIFIER_IS_UNSUPPORTED)])
+
+RUBY_PROG_GNU_LD
+RUBY_CPPOUTFILE
+
+: ${OUTFLAG='-o '}
+: ${COUTFLAG=${OUTFLAG}}
+: ${CSRCFLAG=''}
+AC_SUBST(OUTFLAG)
+AC_SUBST(COUTFLAG)
+AC_SUBST(CSRCFLAG)
+
+: ${MJIT_CC=$CC}
+AS_IF([test "x$cross_compiling" = xno], [
+    AC_PATH_PROG([MJIT_CC], ${MJIT_CC})
+
+    # if $CC is in /usr/lib/ccache/$CC, search original $CC (disable ccache)
+    AS_IF([echo $RUBY_DEBUG | grep ci > /dev/null &&
+           echo $MJIT_CC | grep ^/usr/lib/ccache > /dev/null], [
+           PATH=`echo $PATH | sed "s/\/usr\/lib\/ccache://"` MJIT_CC=`which $CC`])
+
+    AS_CASE([$target_os],
+	[*mingw*], [command -v cygpath > /dev/null && MJIT_CC=`cygpath -ma $MJIT_CC`])
+    shift 2
+    MJIT_CC="$MJIT_CC${1+ }$*"
+])
+
+AS_CASE(["$build_os"],
+  [darwin1*.*], [
+    # Xcode linker warns for deprecated architecture and wrongly
+    # installed TBD files.
+    CC_WRAPPER=""
+    echo 'int main(void) {return 0;}' > conftest.c
+    AS_IF([$CC -framework Foundation -o conftest conftest.c 2>&1 |
+	   grep '^ld: warning: text-based stub file' >/dev/null], [
+	CC_WRAPPER=`cd -P "${tooldir}" && pwd`/darwin-cc
+	CC="$CC_WRAPPER $CC"
+    ])
+    rm -fr conftest*
+  ])
+
+cc_version=
+for option in --version -v -V -qversion; do
+    cc_version_message=`$CC $option 2>&1`
+    cc_version_status=$?
+    AS_CASE($cc_version_status, [0], [:], [continue])
+    AS_CASE($cc_version_message, [*Warning*], [continue])
+    cc_version='$(CC) '$option
+    break
+done
+AC_SUBST(CC_VERSION, $cc_version)
+AC_SUBST(CC_VERSION_MESSAGE, $cc_version_message)
+
+: ${DLDFLAGS="$LDFLAGS"}
+
+RUBY_UNIVERSAL_ARCH
+AS_IF([test "$target_cpu" != "$host_cpu" -a "$GCC" = yes -a "$cross_compiling" = no -a "${universal_binary:-no}" = no], [
+    RUBY_DEFAULT_ARCH("$target_cpu")
+])
+host_os=$target_os
+host_vendor=$target_vendor
+host_cpu=$target_cpu
+host=$target
+host_alias=$target_alias
+
+AC_CACHE_CHECK([for $AR flags], [rb_cv_arflags], [
+    AS_IF([$AR rcD conftest.a > /dev/null 2>&1 && rm conftest.a],
+	[rb_cv_arflags=rcD], [rb_cv_arflags=rcu])
+])
+AC_SUBST(ARFLAGS, ["$rb_cv_arflags "])
+AC_SUBST(ASFLAGS)
+
+AS_CASE(["$target_os"],
+[cygwin*|mingw*], [
+    AC_CHECK_TOOL(WINDRES, windres)
+    AC_CHECK_TOOL(DLLWRAP, dllwrap)
+    target=`echo $target | sed "s/^$target_cpu-/-/"`
+    target_alias=`echo $target_alias | sed "s/^$target_cpu-/-/"`
+    target_cpu=`echo $target_cpu | sed s/i.86/i386/`
+    AS_CASE(["$target"], [-*], [ target="$target_cpu${target}"])
+    AS_CASE(["$target_alias"], [-*], [ target_alias="$target_cpu${target_alias}"])
+    AS_CASE(["$target_os"],
+    [mingw*], [
+	test "$rb_cv_msvcrt" = "" && unset rb_cv_msvcrt
+	AC_CACHE_CHECK(for mingw32 runtime DLL, rb_cv_msvcrt, [
+	AC_LINK_IFELSE([AC_LANG_PROGRAM([[@%:@include <stdio.h>]],
+		    [[FILE* volatile f = stdin; return 0;]])],
+		    [rb_cv_msvcrt=`$OBJDUMP -p conftest$ac_exeext |
+				   tr A-Z a-z |
+				   sed -n '/^[[ 	]]*dll name: \(msvc.*\)\.dll$/{s//\1/p;q;}'`],
+		    [rb_cv_msvcrt=msvcrt])
+	test "$rb_cv_msvcrt" = "" && rb_cv_msvcrt=msvcrt])
+	RT_VER=`echo "$rb_cv_msvcrt" | tr -cd [0-9]`
+	test "$RT_VER" = "" && RT_VER=60
+	AC_DEFINE_UNQUOTED(RUBY_MSVCRT_VERSION, $RT_VER)
+	sysconfdir=
+    ])
+    : ${enable_shared=yes}
+    ],
+[hiuxmpp*], [AC_DEFINE(__HIUX_MPP__)])    # by TOYODA Eizi <toyoda@npd.kishou.go.jp>
+
+AC_PROG_LN_S
+AC_PROG_MAKE_SET
+AC_PROG_INSTALL
+AC_PROG_MKDIR_P
+AS_IF([test "x$MKDIR_P" = "x -d"], [
+  AS_IF([test x"$as_mkdir_p" != xfalse], [
+    MKDIR_P='mkdir -p'
+    echo "use 'mkdir -p' as MKDIR_P"
+  ], [
+    AC_MSG_ERROR([mkdir -p is required])
+  ])
+])
+MAKEDIRS="$MKDIR_P"
+AC_SUBST(MAKEDIRS)
+
+AC_CHECK_PROG([DTRACE], [${ac_tool_prefix}dtrace], [${ac_tool_prefix}dtrace])
+AS_IF([test "$cross_compiling:$ac_cv_prog_DTRACE" = no: -a -n "$ac_tool_prefix"], [
+    AC_CHECK_PROG([DTRACE], [dtrace], [dtrace])
+])
+
+AC_CHECK_PROGS(DOT, dot)
+AC_CHECK_PROGS(DOXYGEN, doxygen)
+
+for prog in ${ac_tool_prefix:+${ac_tool_prefix}pkg-config} pkg-config; do
+    AC_CHECK_PROG(PKG_CONFIG, $prog, [$prog], [], [],
+        [`"$as_dir/$ac_word$ac_exec_ext" --print-errors --version > /dev/null 2>&1 || echo "$as_dir/$ac_word$ac_exec_ext"`])
+    test -z "${PKG_CONFIG}" || break
+done
+
+AC_MSG_CHECKING([whether it is Android])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+	@%:@ifdef __ANDROID__
+	@%:@error android
+	@%:@endif
+]], [[]])],
+[AC_MSG_RESULT(no)],
+[
+	AC_MSG_RESULT(yes)
+	target_os=${target_os}-android
+	AC_MSG_CHECKING([for Android API version])
+        # hacky workaround: https://github.com/termux/termux-packages/issues/6176
+        rb_android_api=`getprop ro.build.version.sdk`
+        AC_MSG_RESULT($rb_android_api)
+        RUBY_APPEND_OPTIONS(CPPFLAGS, -D__ANDROID_API__=$rb_android_api -Wno-macro-redefined)
+])
+
+AC_SUBST(RM, ['rm -f'])
+AC_SUBST(CP, ['cp'])
+RMDIRS='$(top_srcdir)/tool/rmdirs'
+RMDIR=rmdir
+mkdir "rmdirs_$$_test" "rmdirs_$$_test/a"
+rmdir --ignore-fail-on-non-empty "rmdirs_$$_test" 2>/dev/null &&
+RMDIR='rmdir --ignore-fail-on-non-empty'
+$RMDIR -p "rmdirs_$$_test/a" 2>/dev/null &&
+{ test -d "rmdirs_$$_test" || RMDIRS="$RMDIR -p"; }
+rmdir "rmdirs_$$_test/a" "rmdirs_$$_test" 2>/dev/null
+AC_SUBST(RMDIR)
+AC_SUBST(RMDIRS)
+AC_SUBST(RMALL, ['rm -fr'])
+
+AC_MSG_CHECKING([for cd using physical directory])
+rm -fr conf$$.dir
+mkdir conf$$.dir &&
+(cd conf$$.dir && mkdir src build && cd src &&
+$as_ln_s ../build . > /dev/null 2>&1 && cd build &&
+for chdir in 'cd -P' 'PWD= cd'; do
+    /bin/sh -c "$chdir ../src && echo '$chdir' > cdcmd" 2> /dev/null && break
+done)
+AS_IF([test -f conf$$.dir/src/cdcmd], [
+    read CHDIR < conf$$.dir/src/cdcmd 2> /dev/null
+], [
+    CHDIR=cd
+])
+rm -fr conf$$.dir
+AC_MSG_RESULT([$CHDIR])
+AC_SUBST(CHDIR)
+}
+
+: "compiler section" && {
+RUBY_WERROR_FLAG([
+    AC_MSG_CHECKING([whether CFLAGS is valid])
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+	[AC_MSG_RESULT(yes)],
+	[
+	AC_MSG_RESULT(no)
+	AC_MSG_ERROR([something wrong with CFLAGS="$CFLAGS"])
+	]
+    )
+
+    AC_MSG_CHECKING([whether LDFLAGS is valid])
+    {
+	mkdir tmp.$$.try_link &&
+	cd tmp.$$.try_link &&
+	cp ../confdefs.h . &&
+	echo '<?xml?><plist><dict><key>CFBundleIdentifier</key><string></string></dict></plist>' > Info.plist &&
+	:
+    } || AC_MSG_ERROR([failed to make temporary directory])
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+	[AC_MSG_RESULT(yes)],
+	[
+	cd .. && rm -fr tmp.$$.try_link
+	AC_MSG_RESULT(no)
+	AC_MSG_ERROR([something wrong with LDFLAGS="$LDFLAGS"])
+	]
+    )
+    cd .. && rm -fr tmp.$$.try_link
+])
+
+: ${RPATHFLAG=''}
+rpathflag=''
+AS_IF([test x"${RPATHFLAG}" = x], [
+    AS_CASE(["$target_os"],
+	[hpux*], [AS_IF([test "$rb_cv_prog_gnu_ld" = no], [rpathflag='+b '])],
+	[aix*], [rpathflag='-blibpath:'],
+	[for rpathflag in -R "-rpath "; do
+	    AS_CASE("$rpathflag",
+		    [*" "], [AS_CASE(["${linker_flag}"],
+				     [*,], [rpathflag=`echo "$rpathflag" | tr ' ' ,`])])
+	    rpathflag="${linker_flag}${rpathflag}"
+	    RUBY_TRY_LDFLAGS([${rpathflag}.], [], [rpathflag=])
+	    AS_IF([test "x${rpathflag}" != x], [])
+        done])
+], [
+    rpathflag=`echo "$RPATHFLAG" | sed 's/%.*//'`
+])
+
+RUBY_TRY_CFLAGS(-fdeclspec, [
+  RUBY_APPEND_OPTIONS(CC, -fdeclspec)
+  RUBY_APPEND_OPTIONS(MJIT_CC, -fdeclspec)
+])
+RUBY_TRY_CXXFLAGS(-fdeclspec, [RUBY_APPEND_OPTIONS(CXX, -fdeclspec)])
+
+AS_CASE([$RUBY_PATCHLEVEL], [-*],
+	[RUBY_DEVEL=yes], [RUBY_DEVEL=no])
+particular_werror_flags=$RUBY_DEVEL
+AC_ARG_ENABLE(werror,
+	AS_HELP_STRING([--disable-werror],
+		       [don't make warnings into errors
+		       even if a compiler support -Werror feature
+		       [[disabled by default unless development version]]]),
+	[particular_werror_flags=$enableval])
+
+rb_cv_warnflags="$warnflags"
+AS_CASE(["$GCC:${warnflags+set}:${extra_warnflags:+set}:"],
+[yes::*|yes:*:set:], [# GCC && (!warnflags || extra_warnflags)
+    AS_IF([test $gcc_major -ge 4], [
+	extra_warnflags="$extra_warnflags -Werror=extra-tokens"
+    ])
+    AS_IF([test $gcc_major -ge 5 -a $gcc_major -le 6], [
+	extra_warnflags="$extra_warnflags -Wno-maybe-uninitialized"
+    ])
+    # ICC doesn't support -Werror=
+    AS_IF([test $icc_version -gt 0], [
+	particular_werror_flags=no
+    ])
+    for wflag in \
+		 -Werror=deprecated-declarations \
+		 -Werror=division-by-zero \
+		 -Werror=duplicated-cond \
+		 -Werror=implicit-function-declaration \
+		 -Werror=implicit-int \
+		 -Werror=misleading-indentation \
+		 -Werror=pointer-arith \
+		 -Werror=shorten-64-to-32 \
+		 -Werror=write-strings \
+		 -Wimplicit-fallthrough=0 \
+		 -Wmissing-noreturn \
+		 -Wno-cast-function-type \
+		 -Wno-constant-logical-operand \
+		 -Wno-long-long \
+		 -Wno-missing-field-initializers \
+		 -Wno-overlength-strings \
+		 -Wno-packed-bitfield-compat \
+		 -Wno-parentheses-equality \
+		 -Wno-self-assign \
+		 -Wno-tautological-compare \
+		 -Wno-unused-parameter \
+		 -Wno-unused-value \
+		 -Wsuggest-attribute=format \
+		 -Wsuggest-attribute=noreturn \
+		 -Wunused-variable \
+		 -diag-disable=175,188,1684,2259,2312 \
+		 $extra_warnflags \
+		 ; do
+	AS_IF([test "$particular_werror_flags" != yes], [
+	    wflag=`echo x$wflag | sed 's/^x-Werror=/-W/;s/^x//'`
+	])
+	ok=no
+	RUBY_TRY_CFLAGS($wflag, [
+	    RUBY_APPEND_OPTIONS(warnflags, $wflag)
+	    ok=yes
+	])
+	AS_CASE([$ok:$wflag], [no:-Werror=*], [
+	    wflag=`echo x$wflag | sed 's/^x-Werror=/-W/'`
+	    RUBY_TRY_CFLAGS($wflag, [
+		RUBY_APPEND_OPTIONS(warnflags, $wflag)
+		particular_werror_flags=no
+	    ])
+	])
+    done
+    AS_CASE([" $warnflags "],[*" -Wno-missing-field-initializers "*], [wflag="-Wall -Wextra"],
+                             [wflag=-Wall])
+    RUBY_TRY_CFLAGS($wflag, [warnflags="$wflag${warnflags+ $warnflags}"])
+    # Disable warnflags while conftest. -Werror=* flags might make bad OS capability guess.
+    rb_cv_warnflags="$warnflags"
+    warnflags=
+])
+RUBY_TRY_CFLAGS(-Qunused-arguments, [RUBY_APPEND_OPTIONS(rb_cv_wsuppress_flags, -Qunused-arguments)])
+AC_COMPILE_IFELSE([
+    AC_LANG_PROGRAM([
+@%:@if !(defined(__SUNPRO_C)||defined(__SUNPRO_CC))
+@%:@error not sunpro
+@%:@endif],[])], [
+    for e in \
+        E_STATEMENT_NOT_REACHED \
+        E_INIT_SIGN_EXTEND \
+        E_INIT_DOES_NOT_FIT \
+        E_INITIALIZATION_TYPE_MISMATCH
+    do
+        RUBY_TRY_CFLAGS([-erroff=${e}], [
+            RUBY_APPEND_OPTIONS(rb_cv_warnflags, [-erroff=${e}])
+        ])
+    done
+])
+
+AC_ARG_WITH(compress-debug-sections,
+	AS_HELP_STRING([--with-compress-debug-sections=type],
+	    [enable debug section compression]),
+	[compress_debug_sections=$withval], [compress_debug_sections=])
+
+AS_IF([test "$GCC" = yes], [
+    # -D_FORTIFY_SOURCE
+    # When defined _FORTIFY_SOURCE, glibc enables some additional sanity
+    # argument check. The performance drop is very little and Ubuntu enables
+    # _FORTIFY_SOURCE=2 by default. So, let's support it for protecting us from
+    # a mistake of silly C extensions.
+
+    # TODO: check if link succeeds with _FORTIFY_SOURCE=2.
+    AS_CASE(["$target_os"],
+    [mingw*], [
+	fortify_source=no
+    ])
+    AC_ARG_ENABLE(fortify_source,
+		  AS_HELP_STRING([--disable-fortify-source],
+				 [disable -D_FORTIFY_SOURCE=2 option, which causes link error on mingw]),
+		  [fortify_source=$enableval])
+    AS_IF([test "x$fortify_source" != xno], [
+        RUBY_TRY_CFLAGS([$optflags -D_FORTIFY_SOURCE=2], [RUBY_APPEND_OPTION(XCFLAGS, -D_FORTIFY_SOURCE=2)], [],
+                        [@%:@include <stdio.h>])
+    ])
+
+    : ${MJIT_HEADER_FLAGS='-P -dD'}
+
+    # -fstack-protector
+    AS_CASE(["$target_os"],
+    [mingw*|haiku*], [
+	stack_protector=no
+    ])
+    AS_IF([test -z "${stack_protector+set}"], [
+	AS_FOR(option, opt, [-fstack-protector-strong -fstack-protector], [
+	    RUBY_TRY_CFLAGS(option, [stack_protector=yes])
+	    AS_IF([test "x$stack_protector" = xyes], [
+		RUBY_TRY_LDFLAGS(option, [], [stack_protector=])
+	    ])
+	    AS_IF([test "x$stack_protector" = xyes], [stack_protector=option; break])
+	])
+    ])
+    AS_CASE(["$stack_protector"], [-*], [
+	RUBY_APPEND_OPTION(XCFLAGS, $stack_protector)
+	RUBY_APPEND_OPTION(XLDFLAGS, $stack_protector)
+	RUBY_APPEND_OPTION(LDFLAGS, $stack_protector)
+    ])
+
+    AS_CASE("${compress_debug_sections:-zlib}",
+    [none|no], [], [
+    RUBY_TRY_LDFLAGS(${linker_flag}--compress-debug-sections=${compress_debug_sections:-zlib},
+		     [compress_debug_sections=${compress_debug_sections:-zlib}],
+		     [compress_debug_sections=no])
+    ])
+    AS_IF([test "x$compress_debug_sections" != xno], [
+	RUBY_APPEND_OPTION(DLDFLAGS, ${linker_flag}--compress-debug-sections=$compress_debug_sections)
+    ])
+
+    AS_CASE(["$target_os"],[mingw*], [
+      # On  Windows  platforms,   system  provided  headers  are  VC++
+      # optimized.  That  is, C++  habits are often  contaminated into
+      # various  headers.  Most frequent  situation is  the use  of //
+      # comments.   We  bypass  ANSI   C  mode  for  them.   Otherwise
+      # extension libs cannot include those headers.
+
+      # Since math.h in some mingw64 wrongly declares frexp and modf
+      # to be pure, the variables pointed by the second arguments are
+      # considered uninitialized unexpectedly.
+      AC_CACHE_CHECK([whether frexp and modf are broken],
+	rb_cv_mingw64_broken_frexp_modf,
+	[
+	  save_CFLAGS="$CFLAGS"
+	  AS_IF([test "$particular_werror_flags" = "yes"], [
+	    CFLAGS="$CFLAGS -Werror=uninitialized"
+	  ], [
+	    CFLAGS="$CFLAGS -Werror -Wuninitialized"
+	  ])
+	  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <math.h>
+	    int foo(double x)
+	    {
+	      int exp;
+	      frexp(x, &exp);
+	      return exp;
+	    }]], [[if (foo(0.0)) return 1;]])],
+	    [rb_cv_mingw64_broken_frexp_modf=no],
+	    [rb_cv_mingw64_broken_frexp_modf=yes])
+	  CFLAGS="$save_CFLAGS"
+	])
+      AS_IF([test "$rb_cv_mingw64_broken_frexp_modf" = yes], [
+	AC_DEFINE(RUBY_MINGW64_BROKEN_FREXP_MODF)
+      ])
+    ],
+    [cygwin*|darwin*|netbsd*], [
+      # need lgamma_r(), finite()
+    ])
+
+    # ANSI (no XCFLAGS because this is C only)
+    AS_CASE(["$target_os"],
+    [solaris*], [
+      # Because "-std=gnu99" affects existence of functions on Solaris,
+      # "-std=gnu99" will be appended to CPPFLAGS.
+	for ansi_options in -std=gnu99; do
+	    RUBY_TRY_CFLAGS(${ansi_options}, [
+		RUBY_APPEND_OPTIONS(CPPFLAGS, ${ansi_options})
+	    ], [ansi_options=])
+	    test "x${ansi_options}" = x || break
+	done
+    ],
+    [
+      # ANSI (no XCFLAGS because this is C only)
+      rb_tmp_std_check=`echo $CC $CFLAGS $optflags $warnflags $debugflags | fgrep std= | tr -d  '\015'`
+      AS_IF([test "x$rb_tmp_std_check" = "x"],
+      [
+	for ansi_options in -std=gnu99; do
+	    RUBY_TRY_CFLAGS(${ansi_options}, [
+		RUBY_APPEND_OPTIONS(warnflags, ${ansi_options})
+		RUBY_APPEND_OPTIONS(strict_warnflags, ${ansi_options})
+	    ], [ansi_options=])
+	    test "x${ansi_options}" = x || break
+	done
+      ])
+    ])
+
+    # suppress annoying -Wstrict-overflow warnings
+    RUBY_TRY_CFLAGS(-fno-strict-overflow, [RUBY_APPEND_OPTION(XCFLAGS, -fno-strict-overflow)])
+
+    test "${debugflags+set}" || {RUBY_TRY_CFLAGS(-ggdb3, [debugflags=-ggdb3])}
+    test "${debugflags+set}" || {RUBY_TRY_CFLAGS(-ggdb, [debugflags=-ggdb])}
+    test "${debugflags+set}" || {RUBY_TRY_CFLAGS(-g3, [debugflags=-g3])}
+])
+test $ac_cv_prog_cc_g = yes && : ${debugflags=-g}
+AS_IF([test "x$RUBY_DEVEL" = xyes], [RUBY_APPEND_OPTION(XCFLAGS, -DRUBY_DEVEL=1)])
+
+AS_IF([test "$GCC" = ""], [
+    AS_CASE(["$target_os"],[aix*],[warnflags="$warnflags -qinfo=por" rb_cv_warnflags="$rb_cv_warnflags -qinfo=por"])
+])
+AS_IF([test "$GCC" = yes], [
+    AS_IF([test "$gcc_major" -ge 4], [
+	RUBY_TRY_CFLAGS(-fvisibility=hidden, [visibility_option=yes], [visibility_option=no])
+    ])
+    AC_SUBST(WERRORFLAG, "-Werror")
+    AS_IF([test "$visibility_option" = yes], [
+	RUBY_APPEND_OPTION(XCFLAGS, -fvisibility=hidden)
+	AC_DEFINE(RUBY_SYMBOL_EXPORT_BEGIN, [_Pragma("GCC visibility push(default)")])
+	AC_DEFINE(RUBY_SYMBOL_EXPORT_END,   [_Pragma("GCC visibility pop")])
+    ], [
+	RUBY_TRY_LDFLAGS([-Wl,-unexported_symbol,_Init_*], [visibility_option=ld], [visibility_option=no])
+    ])
+    test "$visibility_option" = no || OBJCOPY=:
+])
+
+AS_IF([test "$GCC" = yes], [
+    # optflags
+
+    AS_CASE(["$target_os"], [mingw*], [
+	RUBY_TRY_CFLAGS(-fno-omit-frame-pointer, [optflags="${optflags+$optflags }-fno-omit-frame-pointer"])
+	RUBY_TRY_CFLAGS(-static-libgcc, [static_libgcc=yes], [static_libgcc=no])
+	AS_IF([test "$static_libgcc" = yes], [
+	    RUBY_APPEND_OPTION(EXTLDFLAGS, -static-libgcc)
+	])
+    ])
+
+    # disable fast-math
+    for oflag in -fno-fast-math; do
+	RUBY_TRY_CFLAGS($oflag, [RUBY_APPEND_OPTION(CFLAGS, $oflag)])
+    done
+    for oflag in -fexcess-precision=standard -fp-model\ precise; do
+	RUBY_TRY_CFLAGS($oflag, [RUBY_APPEND_OPTION(XCFLAGS, $oflag)])
+    done
+])
+
+AS_CASE(["$target_cpu"], [[i[3-6]86*]], [
+    AC_CACHE_CHECK([for __sync_val_compare_and_swap], [rb_cv_gcc_compiler_cas], [
+	AC_LINK_IFELSE([AC_LANG_PROGRAM([[unsigned long atomic_var;]],
+	    [[__sync_val_compare_and_swap(&atomic_var, 0, 1);]])],
+	    [rb_cv_gcc_compiler_cas=yes],
+	    [
+	    save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -march=i486"
+	    AC_LINK_IFELSE([AC_LANG_PROGRAM([[unsigned long atomic_var;]],
+		[[__sync_val_compare_and_swap(&atomic_var, 0, 1);]])],
+		[rb_cv_gcc_compiler_cas=i486],
+		[rb_cv_gcc_compiler_cas=no])
+	    CFLAGS="$save_CFLAGS"
+	    ])
+    ])
+    AS_IF([test "$rb_cv_gcc_compiler_cas" = i486], [ARCH_FLAG="-march=i486"])
+])
+
+AC_ARG_WITH(opt-dir,
+	AS_HELP_STRING([--with-opt-dir=DIR-LIST],
+		       [add optional headers and libraries directories separated by $PATH_SEPARATOR]),
+	[
+		val=`echo "$PATH_SEPARATOR$withval" | sed "s|$PATH_SEPARATOR\([[^$PATH_SEPARATOR]*]\)| -I\1/include|g;s/^ //"`
+		CPPFLAGS="$CPPFLAGS $val"
+		val=`echo "$PATH_SEPARATOR$withval" | sed "s|$PATH_SEPARATOR\([[^$PATH_SEPARATOR]*]\)| -L\1/lib${rpathflag:+ $rpathflag\\\\1/lib}|g;s/^ //"`
+		LDFLAGS="$LDFLAGS $val"
+		LDFLAGS_OPTDIR="$val"
+		OPT_DIR="$withval"
+	], [OPT_DIR=])
+
+test -z "${ac_env_CFLAGS_set}" -a -n "${cflags+set}" && eval CFLAGS="\"$cflags $ARCH_FLAG\""
+test -z "${ac_env_CXXFLAGS_set}" -a -n "${cxxflags+set}" && eval CXXFLAGS="\"$cxxflags $ARCH_FLAG\""
+}
+
+AC_CACHE_CHECK([whether compiler has statement and declarations in expressions],
+  rb_cv_have_stmt_and_decl_in_expr,
+  [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],[[ __extension__ ({ int a = 0; a; }); ]])],
+  [rb_cv_have_stmt_and_decl_in_expr=yes],
+  [rb_cv_have_stmt_and_decl_in_expr=no])])
+AS_IF([test "$rb_cv_have_stmt_and_decl_in_expr" = yes], [
+  AC_DEFINE(HAVE_STMT_AND_DECL_IN_EXPR)
+])
+
+: "header and library section" && {
+AC_ARG_WITH(winnt-ver,
+  AS_HELP_STRING([--with-winnt-ver=0xXXXX], [target Windows NT version (default to 0x0600)]),
+  [with_winnt_ver="$withval"], [with_winnt_ver="0x0600"])
+AS_CASE(["$target_os"],
+[mingw*], [
+  RUBY_APPEND_OPTION(CPPFLAGS, -D_WIN32_WINNT=$with_winnt_ver)
+  RUBY_APPEND_OPTION(CPPFLAGS, -D__MINGW_USE_VC2005_COMPAT)
+])
+
+AS_CASE(["$target_os"],
+[freebsd*], [
+  AC_CACHE_CHECK([whether pthread should be enabled by default],
+    rb_cv_enable_pthread_default,
+    [AC_PREPROC_IFELSE([AC_LANG_SOURCE([[
+#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=$rb_cv_enable_pthread_default
+  ],
+[mingw*], [
+  enable_pthread=no
+  ],
+[
+  enable_pthread=yes
+  ])
+
+dnl Checks for libraries.
+AS_CASE(["$target_os"],[*bsd*|dragonfly*],[],[ac_cv_func_daemon=no])
+
+AS_UNSET(ORIG_LIBS)
+POSTLINK=:
+AC_SUBST(POSTLINK)
+AS_CASE(["$target_os"],
+[nextstep*], [	],
+[openstep*], [	],
+[rhapsody*], [	],
+[darwin*], [
+		ORIG_LIBS="$LIBS"
+		RUBY_PREPEND_OPTION(LIBS, -lobjc)
+		RUBY_APPEND_OPTIONS(CPPFLAGS, -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT)
+		AC_CACHE_CHECK([whether syscall(2) is deprecated], rb_cv_syscall_deprecated,
+		    [RUBY_WERROR_FLAG([
+			AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <unistd.h>]],
+							   [[if (syscall(0)) return 1;]])],
+			    [rb_cv_syscall_deprecated=no],
+			    [rb_cv_syscall_deprecated=yes])])])
+		AS_IF([test $rb_cv_syscall_deprecated = yes], [
+		    ac_cv_func___syscall=no
+		    ac_cv_func_syscall=no
+		    ac_cv_header_sys_syscall_h=no
+		    ac_cv_header_syscall_h=no
+		])
+		ac_cv_func_getcontext=no
+		ac_cv_func_setcontext=no
+		incs=`$CC -v -E -xc - < /dev/null 2>&1 | sed ['1,/^@%:@include </d;s/^ *//;s|[^./][^/]*/\.\./||g;/\/include$/!d;s||/lib|;/\/usr\/lib/d']`
+		for d in `$CC -print-search-dirs | sed -e '/^libraries: */!d;s///' | tr : '\012' | fgrep -v /../ | sed -n 's|^\(/.*/lib\)/$|\1|p'`; do
+		    incs=`echo "$incs" | fgrep -v "$d"`
+		done
+		for d in $incs; do
+		    test -d "$d" && RUBY_APPEND_OPTIONS(LDFLAGS, "-L$d")
+		done
+		ac_cv_type_getgroups=gid_t # getgroups() on Rosetta fills garbage
+		ac_cv_lib_crypt_crypt=no
+		ac_cv_func_fdatasync=no # Mac OS X wrongly reports it has fdatasync()
+		ac_cv_func_vfork=no
+		AS_IF([test $gcc_major -lt 4 -o \( $gcc_major -eq 4 -a $gcc_minor -lt 3 \)], [
+		    ac_cv_func___builtin_setjmp=no
+		])
+		with_setjmp_type=sigsetjmp # to hijack SIGCHLD handler
+		AC_CACHE_CHECK(for broken crypt with 8bit chars, rb_cv_broken_crypt,
+		    [AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+
+void
+broken_crypt(const char *salt, const char *buf1, const char *buf2)
+{
+#if 0
+    printf("%.2x%.2x: %s -> %s\n", (unsigned char)salt[0], (unsigned char)salt[1],
+	   buf1+2, buf2+2);
+#endif
+}
+
+int
+main()
+{
+    int i;
+    char salt[2], buf[256], *s;
+    for (i = 0; i < 128*128; i++) {
+	salt[0] = 0x80 | (i & 0x7f);
+	salt[1] = 0x80 | (i >> 7);
+	strcpy(buf, crypt("", salt));
+	if (strcmp(buf, s = crypt("", salt))) {
+	    broken_crypt(salt, buf, s);
+	    return 1;
+	}
+    }
+    salt[0] = salt[1] = ' ';
+    strcpy(buf, crypt("", salt));
+    salt[0] = salt[1] = 0x80 | ' ';
+    if (strcmp(buf, s = crypt("", salt))) {
+	broken_crypt(salt, buf, s);
+	return 1;
+    }
+    return 0;
+}
+]])],
+		    rb_cv_broken_crypt=no,
+		    rb_cv_broken_crypt=yes,
+		    rb_cv_broken_crypt=yes)])
+		AS_IF([test "$rb_cv_broken_crypt" = yes], [
+		   AC_DEFINE(BROKEN_CRYPT, 1)
+		])
+		POSTLINK=""
+		AC_CHECK_PROGS(codesign, codesign)
+		AC_CHECK_PROGS(dsymutil, dsymutil)
+		AS_IF([test -n "$codesign"], [
+		    POSTLINK="{ test -z '\$(RUBY_CODESIGN)' || $codesign -s '\$(RUBY_CODESIGN)' -f \$@; }${POSTLINK:+; $POSTLINK}"
+		])
+		AS_IF([test -n "$dsymutil"], [
+		    POSTLINK="$dsymutil \$@${POSTLINK:+; $POSTLINK}"
+		])
+		AS_IF([test -n "${POSTLINK}"], [
+		    LINK_SO="$LINK_SO
+\$(POSTLINK)"
+		])
+		AC_CHECK_HEADERS(crt_externs.h, [], [], [
+		    #include <crt_externs.h>
+		])
+		],
+[hpux*], [	LIBS="-lm $LIBS"
+		ac_cv_c_inline=no],
+[solaris*], [	LIBS="-lm $LIBS"
+		ac_cv_func_vfork=no
+		AC_MSG_CHECKING(whether _XOPEN_SOURCE is already given)
+		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>
+			#ifndef _XOPEN_SOURCE
+			#error _XOPEN_SOURCE is not defined
+			#endif
+			]], [[]])],
+		        [given_xopen_source=yes], [given_xopen_source=no])
+		AC_MSG_RESULT($given_xopen_source)
+		AS_IF([test $given_xopen_source = no], [
+		  AC_MSG_CHECKING(appropriate _XOPEN_SOURCE value to define)
+		  define_xopen_source=""
+		  for tmp_xpg in 7 6 5; do
+		    AS_IF([test x"$define_xopen_source" != x], [
+		      break
+		    ])
+		    RUBY_WERROR_FLAG([AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+			#define _XOPEN_SOURCE ${tmp_xpg}00
+			#include <unistd.h>
+			#ifndef _XPG${tmp_xpg}
+			#error _XPG${tmp_xpg} should be defined by _XOPEN_SOURCE=${tmp_xpg}00
+			#endif
+			]], [[]])],
+			[define_xopen_source=${tmp_xpg}00], [])
+			])
+		  done
+		  AS_IF([test x"$define_xopen_source" = x], [
+		    define_xopen_source=no
+		  ])
+		  AC_MSG_RESULT($define_xopen_source)
+		  AS_IF([test x"$define_xopen_source" != xno], [
+		    RUBY_APPEND_OPTIONS(CPPFLAGS, -D_XOPEN_SOURCE=$define_xopen_source)
+		    # _XOPEN_SOURCE should not be defined for C++ on Solaris.
+		    RUBY_APPEND_OPTIONS(CXXFLAGS, -U_XOPEN_SOURCE)
+		  ])
+		])
+		],
+[haiku*], [
+		LIBS="$LIBS" # m lib is include in root
+		],
+[cygwin*], [	ac_cv_header_langinfo_h=yes
+		RUBY_APPEND_OPTIONS(CPPFLAGS, -D_XOPEN_SOURCE -D_GNU_SOURCE)
+		AC_CHECK_FUNCS(cygwin_conv_path)
+		AC_LIBOBJ([langinfo])
+		],
+[mingw*], [	LIBS="-lshell32 -lws2_32 -liphlpapi -limagehlp -lshlwapi $LIBS"
+		ac_cv_header_a_out_h=no
+		ac_cv_header_pwd_h=no
+		ac_cv_header_utime_h=no
+		ac_cv_header_sys_ioctl_h=no
+		ac_cv_header_sys_param_h=no
+		ac_cv_header_sys_resource_h=no
+		ac_cv_header_sys_select_h=no
+		ac_cv_header_sys_time_h=no
+		ac_cv_header_sys_times_h=no
+		ac_cv_header_sys_socket_h=no
+		ac_cv_func_lstat=yes
+		ac_cv_func_times=yes
+		ac_cv_func_waitpid=yes
+		ac_cv_func_fsync=yes
+		ac_cv_func_seekdir=yes
+		ac_cv_func_telldir=yes
+		ac_cv_func_lchown=yes
+		ac_cv_func_link=yes
+		ac_cv_func_readlink=yes
+		ac_cv_func_symlink=yes
+		ac_cv_lib_crypt_crypt=no
+		ac_cv_func_getpgrp_void=no
+		ac_cv_func_memcmp_working=yes
+		ac_cv_lib_dl_dlopen=no
+		rb_cv_binary_elf=no
+		rb_cv_negative_time_t=no
+		ac_cv_func_fcntl=yes
+		ac_cv_func_flock=yes
+		ac_cv_func_gmtime_r=yes
+		rb_cv_large_fd_select=yes
+		ac_cv_type_struct_timeval=yes
+                ac_cv_func_clock_gettime=yes
+                ac_cv_func_clock_getres=yes
+		ac_cv_func_malloc_usable_size=no
+		ac_cv_type_off_t=yes
+		ac_cv_sizeof_off_t=8
+		AS_IF([test "$target_cpu" = x64], [
+		    ac_cv_func___builtin_setjmp=yes
+		    ac_cv_func_round=no
+		    rb_cv_coroutine=yes
+		])
+		ac_cv_func_tgamma=no
+		rb_cv_negative_time_t=yes
+		AC_CHECK_TYPE([NET_LUID], [], [],
+			      [@%:@include <winsock2.h>
+			      @%:@include <iphlpapi.h>])
+		AS_IF([test x"$ac_cv_type_NET_LUID" = xyes], [
+		    AC_DEFINE(HAVE_TYPE_NET_LUID, 1)
+		])
+		AC_CHECK_FUNCS(_gmtime64_s)
+		AC_CHECK_FUNCS(_wfreopen_s)
+		AC_LIBOBJ([langinfo])
+		],
+[bsdi*], [	LIBS="-lm $LIBS"
+		AC_DEFINE(BROKEN_SETREUID, 1)
+		AC_DEFINE(BROKEN_SETREGID, 1)
+                ac_cv_sizeof_rlim_t=8],
+[freebsd*], [	LIBS="-lm $LIBS"
+		ac_cv_func_getpeername=no
+		ac_cv_func_getsockname=no
+		ac_cv_func_shutdown=no
+		ac_cv_func_close=no
+		],
+[netbsd*], [	LIBS="-lm $LIBS"
+		],
+[dragonfly*], [	LIBS="-lm $LIBS"
+		],
+[aix*],[	LIBS="-lm $LIBS"
+		ac_cv_func_round=no
+		ac_cv_func___builtin_setjmp=no
+		],
+[linux*],[	LIBS="-lm $LIBS"
+		# __builtin_longjmp in ppc64* Linux does not restore
+		# the TOC register (r2), which is problematic
+		# when a global exit happens from JITted .so code.
+		AS_CASE(["$target_cpu"], [powerpc64*], [
+			ac_cv_func___builtin_setjmp=no
+		])
+		# With gcc-8's -fcf-protection, MJIT's __builtin_longjmp fails.
+		AS_CASE(["$CC $CFLAGS "], [*" -fcf-protection "*], [cf_protection=yes], [cf_protection=no])
+		AS_IF([test "$cf_protection" = yes], [
+			ac_cv_func___builtin_setjmp=no
+		])
+		],
+[	LIBS="-lm $LIBS"])
+: ${ORIG_LIBS=$LIBS}
+
+AS_IF([test -n "${rb_there_is_in_fact_no_gplusplus_but_autoconf_is_cheating_us}"], [
+    AC_MSG_NOTICE([Test skipped due to lack of a C++ compiler.])
+],
+[test -n "${CXX}"], [
+    RUBY_WERROR_FLAG([
+        AC_MSG_CHECKING([whether CXXFLAGS is valid])
+        AC_LANG_PUSH(C++)
+        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <cstdio>]], [[]])],
+	    [AC_MSG_RESULT(yes)],[
+            AC_MSG_RESULT(no)
+            # The message mentions CXXFLAGS, but CPPFLAGS might also affects.
+            AC_MSG_WARN([something wrong with CXXFLAGS="$CXXFLAGS"])
+            CXX=false
+        ])
+        AC_LANG_POP(C++)
+    ])
+])
+
+AC_CHECK_LIB(crypt, crypt)      # glibc (GNU/Linux, GNU/Hurd, GNU/kFreeBSD)
+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, shutdown)  # SunOS/Solaris
+
+dnl Checks for header files.
+AC_HEADER_DIRENT
+dnl AC_HEADER_STDC has been checked in AC_USE_SYSTEM_EXTENSIONS
+AC_HEADER_STDBOOL
+AC_HEADER_SYS_WAIT
+
+AC_CHECK_HEADERS(a.out.h)
+AC_CHECK_HEADERS(atomic.h)
+AC_CHECK_HEADERS(copyfile.h)
+AC_CHECK_HEADERS(direct.h)
+AC_CHECK_HEADERS(grp.h)
+AC_CHECK_HEADERS(fcntl.h)
+AC_CHECK_HEADERS(float.h)
+AC_CHECK_HEADERS(ieeefp.h)
+AC_CHECK_HEADERS(intrinsics.h)
+AC_CHECK_HEADERS(langinfo.h)
+AC_CHECK_HEADERS(limits.h)
+AC_CHECK_HEADERS(locale.h)
+AC_CHECK_HEADERS(malloc.h)
+AC_CHECK_HEADERS(malloc/malloc.h)
+AC_CHECK_HEADERS(malloc_np.h)
+AC_CHECK_HEADERS(net/socket.h)
+AC_CHECK_HEADERS(process.h)
+AC_CHECK_HEADERS(pwd.h)
+AC_CHECK_HEADERS(sanitizer/asan_interface.h)
+AC_CHECK_HEADERS(sanitizer/msan_interface.h)
+AC_CHECK_HEADERS(setjmpex.h)
+AC_CHECK_HEADERS(stdalign.h)
+AC_CHECK_HEADERS(sys/attr.h)
+AC_CHECK_HEADERS(sys/eventfd.h)
+AC_CHECK_HEADERS(sys/fcntl.h)
+AC_CHECK_HEADERS(sys/file.h)
+AC_CHECK_HEADERS(sys/id.h)
+AC_CHECK_HEADERS(sys/ioctl.h)
+AC_CHECK_HEADERS(sys/mkdev.h)
+AC_CHECK_HEADERS(sys/param.h)
+AC_CHECK_HEADERS(sys/prctl.h)
+AC_CHECK_HEADERS(sys/resource.h)
+AC_CHECK_HEADERS(sys/select.h)
+AC_CHECK_HEADERS(sys/sendfile.h)
+AC_CHECK_HEADERS(sys/socket.h)
+AC_CHECK_HEADERS(sys/syscall.h)
+AC_CHECK_HEADERS(sys/sysmacros.h)
+AC_CHECK_HEADERS(sys/time.h)
+AC_CHECK_HEADERS(sys/times.h)
+AC_CHECK_HEADERS(sys/uio.h)
+AC_CHECK_HEADERS(sys/utime.h)
+AC_CHECK_HEADERS(syscall.h)
+AC_CHECK_HEADERS(time.h)
+AC_CHECK_HEADERS(ucontext.h)
+AC_CHECK_HEADERS(utime.h)
+AS_CASE("$target_cpu", [x64|x86_64|i[3-6]86*], [
+  AC_CHECK_HEADERS(x86intrin.h)
+])
+
+AC_ARG_WITH([gmp],
+  [AS_HELP_STRING([--without-gmp],
+    [disable GNU GMP to accelerate Bignum operations])],
+  [],
+  [with_gmp=yes])
+AS_IF([test "x$with_gmp" != xno],
+  [AC_CHECK_HEADERS(gmp.h)
+   AS_IF([test "x$ac_cv_header_gmp_h" != xno],
+     AC_SEARCH_LIBS([__gmpz_init], [gmp],
+       [AC_DEFINE(HAVE_LIBGMP, 1)]))])
+
+AC_ARG_WITH([jemalloc],
+  [AS_HELP_STRING([--with-jemalloc],[use jemalloc allocator])],
+  [with_jemalloc=$withval], [with_jemalloc=no])
+AS_IF([test "x$with_jemalloc" != xno],[
+  AC_SEARCH_LIBS([malloc_conf], [jemalloc],
+    [
+      AC_DEFINE(HAVE_LIBJEMALLOC, 1)
+      with_jemalloc=yes
+    ],
+    [test x$with_jemalloc = xyes && with_jemalloc=no])
+  AC_CHECK_HEADER(jemalloc/jemalloc.h, [
+    AC_DEFINE(RUBY_ALTERNATIVE_MALLOC_HEADER, [<jemalloc/jemalloc.h>])
+  ],
+  [test x$with_jemalloc = xyes && with_jemalloc=no])
+  AS_IF([test "x$with_jemalloc" != xyes], [
+    AC_CACHE_CHECK([for jemalloc with JEMALLOC_MANGLE], rb_cv_jemalloc_demangle,
+      [AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@define JEMALLOC_MANGLE 1
+      @%:@ifdef RUBY_ALTERNATIVE_MALLOC_HEADER
+      @%:@include RUBY_ALTERNATIVE_MALLOC_HEADER
+      @%:@else
+      @%:@include <jemalloc.h>
+      @%:@endif], [return !&malloc_conf])],
+      [rb_cv_jemalloc_demangle=yes],
+      [rb_cv_jemalloc_demangle=no])
+    ])
+  ])
+  AS_IF([test "x$rb_cv_jemalloc_demangle" = xyes], [
+    AC_DEFINE(JEMALLOC_MANGLE)
+    with_jemalloc=yes
+  ])
+  AS_CASE(["$with_jemalloc"],
+    [yes],
+    [
+      AC_DEFINE(HAVE_MALLOC_CONF)
+      ac_cv_func_malloc_usable_size=yes
+    ],
+    [no],
+    [AC_MSG_ERROR([jemalloc requested but not found])
+  ])
+])
+
+dnl check for large file stuff
+mv confdefs.h confdefs1.h
+: > confdefs.h
+AC_SYS_LARGEFILE
+# On 32-bit Solaris, it is safe to define _LARGEFILE_SOURCE
+# which is not added by AC_SYS_LARGEFILE.
+AS_IF([test x"$enable_largefile" != xno], [
+  AS_CASE(["$target_os"], [solaris*], [
+    AC_MSG_CHECKING([wheather _LARGEFILE_SOURCE should be defined])
+    AS_CASE(["${ac_cv_sys_file_offset_bits}:${ac_cv_sys_large_files}"],
+      ["64:"|"64:no"|"64:unknown"], [
+	# insert _LARGEFILE_SOURCE before _FILE_OFFSET_BITS line
+	# that is the same order as "getconf LFS_CFLAGS" output
+	mv confdefs.h largefile0.h
+	: > confdefs.h
+	AC_DEFINE(_LARGEFILE_SOURCE)
+	cat largefile0.h >> confdefs.h
+	rm largefile0.h
+	AC_MSG_RESULT([yes])
+      ], [AC_MSG_RESULT([no])])
+  ])
+])
+mv confdefs.h largefile.h
+mv confdefs1.h confdefs.h
+cat largefile.h >> confdefs.h
+
+AS_CASE(["$target_os"],
+    [aix*], [
+    AS_CASE(["$target_cpu:$ac_cv_sys_large_files"],
+	[ppc64:*|powerpc64:*], [],
+	[*:no|*:unknown], [],
+	[
+	    # AIX currently does not support a 32-bit call to posix_fadvise()
+	    # if _LARGE_FILES is defined.
+	    ac_cv_func_posix_fadvise=no
+	])
+    ])
+
+AC_C_BIGENDIAN
+AC_C_CONST
+AC_C_CHAR_UNSIGNED
+AC_C_INLINE
+AC_C_VOLATILE
+AC_C_TYPEOF
+AC_C_RESTRICT
+
+AS_CASE(":$ac_cv_c_const:$ac_cv_c_volatile:",
+    [*:no:*], [AC_MSG_ERROR(ANSI C-conforming const and volatile are mandatory)])
+
+AC_CHECK_TYPES([long long, off_t])
+
+AC_CACHE_CHECK([char bit], [rb_cv_char_bit],
+    [test "$universal_binary" = yes && cross_compiling=yes
+    AC_COMPUTE_INT([rb_cv_char_bit], [CHAR_BIT],
+	[AC_INCLUDES_DEFAULT([@%:@include <limits.h>])], [rb_cv_char_bit=8])
+    test "$universal_binary" = yes && cross_compiling=$real_cross_compiling])
+
+RUBY_CHECK_SIZEOF(int, [], [ILP])
+RUBY_CHECK_SIZEOF(short)
+RUBY_CHECK_SIZEOF(long, [int], [ILP LP])
+RUBY_CHECK_SIZEOF(long long)
+RUBY_CHECK_SIZEOF(__int64, [8], [ILP LP])
+RUBY_CHECK_SIZEOF(__int128, [16], [ILP LP])
+RUBY_CHECK_SIZEOF(off_t)
+RUBY_CHECK_SIZEOF(void*, [int long "long long"], [ILP LP LLP])
+RUBY_CHECK_SIZEOF(float)
+RUBY_CHECK_SIZEOF(double)
+RUBY_CHECK_SIZEOF(time_t, [long "long long"], [], [@%:@include <time.h>])
+RUBY_CHECK_SIZEOF(clock_t, [], [], [@%:@include <time.h>])
+
+AC_CACHE_CHECK(packed struct attribute, rb_cv_packed_struct,
+    [rb_cv_packed_struct=no
+    for mac in \
+	"__pragma(pack(push, 1)) x __pragma(pack(pop))" \
+	"x __attribute__((packed))" \
+	; do
+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@define PACKED_STRUCT(x) $mac
+			PACKED_STRUCT(struct { int a; });]], [[]])],
+		[rb_cv_packed_struct=$mac; break])
+    done])
+AS_IF([test "$rb_cv_packed_struct" != no], [
+    AC_DEFINE_UNQUOTED([PACKED_STRUCT(x)], [$rb_cv_packed_struct])
+    RUBY_TRY_CFLAGS(-Wno-address-of-packed-member, [AC_DEFINE(USE_UNALIGNED_MEMBER_ACCESS)])
+], [
+    AC_DEFINE_UNQUOTED([PACKED_STRUCT(x)], x)
+])
+
+AS_IF([test "x$ac_cv_type_long_long" = xyes], [
+    RUBY_CHECK_PRINTF_PREFIX(long long, ll I64, LL)
+], [test "x$ac_cv_type___int64" = xyes], [
+    RUBY_CHECK_PRINTF_PREFIX(__int64, ll I64, LL)
+])
+
+RUBY_REPLACE_TYPE(pid_t, int, PIDT)
+RUBY_REPLACE_TYPE(uid_t, int, UIDT)
+RUBY_REPLACE_TYPE(gid_t, int, GIDT)
+RUBY_REPLACE_TYPE(time_t, [], TIMET, [@%:@include <time.h>])
+RUBY_REPLACE_TYPE(dev_t, [int long "long long"], DEVT)
+RUBY_REPLACE_TYPE(mode_t, ["unsigned short" "unsigned int" long], MODET, [@%:@include <sys/stat.h>])
+RUBY_REPLACE_TYPE(rlim_t, [int long "long long"], RLIM, [
+@%:@ifdef HAVE_SYS_TYPES_H
+@%:@include <sys/types.h>
+@%:@endif
+@%:@ifdef HAVE_SYS_TYPES_H
+@%:@include <sys/time.h>
+@%:@endif
+@%:@include <sys/resource.h>
+])
+RUBY_REPLACE_TYPE(off_t, [], OFFT)
+RUBY_REPLACE_TYPE(clockid_t, [], CLOCKID, [@%:@ifdef HAVE_TIME_H
+@%:@ include <time.h>
+@%:@endif
+@%:@ifdef HAVE_SYS_TIME_H
+@%:@ include <sys/time.h>
+@%:@endif])
+
+# __VA_ARGS__ is also tested in AC_PROG_CC_C99 since autoconf 2.60a (around
+# 2006). The check below is redundant and should always success.  Remain not
+# deleted for backward compat.
+AC_CACHE_CHECK(for variable length macro, rb_cv_va_args_macro,
+  [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+int foo(const char*);
+@%:@define FOO(...) foo(@%:@__VA_ARGS__)
+]], [[FOO(1);FOO(1,2);FOO(1,2,3);]])],
+  rb_cv_va_args_macro=yes,
+  rb_cv_va_args_macro=no)])
+AS_IF([test "$rb_cv_va_args_macro" = yes], [
+  AC_DEFINE(HAVE_VA_ARGS_MACRO)
+])
+
+# We want C11's  `_Alignof`.  GCC (and alike) have  `__alignof__`, which behave
+# slightly differently  than the  C11's.  We cannot  use `__alignof__`  for our
+# purpose.   The problem  is, however,  that  old gcc  and old  clang had  both
+# implemented `_Alignof` as  a synonym of `__alignof__`.  They are  not what we
+# want.  We have to check sanity.
+#
+# See also: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023
+# See also: https://bugs.llvm.org/show_bug.cgi?id=26547
+AC_CACHE_CHECK([if _Alignof() works], rb_cv_have__alignof,[
+    rb_cv_have__alignof=no
+    RUBY_WERROR_FLAG([
+        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+            @%:@ifdef HAVE_STDALIGN_H
+            @%:@include <stdalign.h>
+            @%:@endif
+            @%:@ifdef STDC_HEADERS
+            @%:@include <stddef.h>
+            @%:@endif
+            @%:@ifndef __GNUC__
+            @%:@define __extension__
+            @%:@endif
+        ]], [[
+            typedef struct conftest_tag {
+                char _;
+                double d;
+            } T;
+            static int conftest_ary@<:@
+                offsetof(T, d) == __extension__ _Alignof(double)
+                ? 1 : -1
+            @:>@;
+            return conftest_ary@<:@0@:>@;
+        ]])],[
+            rb_cv_have__alignof=yes
+        ],[])
+    ])
+])
+AS_IF([test "$rb_cv_have__alignof" != no], [
+    AC_DEFINE(HAVE__ALIGNOF)
+])
+
+RUBY_FUNC_ATTRIBUTE(__const__, CONSTFUNC)
+RUBY_FUNC_ATTRIBUTE(__pure__, PUREFUNC)
+RUBY_FUNC_ATTRIBUTE(__noreturn__, NORETURN)
+RUBY_FUNC_ATTRIBUTE(__deprecated__, DEPRECATED)
+RUBY_FUNC_ATTRIBUTE(__deprecated__("by "@%:@n), DEPRECATED_BY(n,x), rb_cv_func_deprecated_by)
+RUBY_FUNC_ATTRIBUTE(__noinline__, NOINLINE)
+RUBY_FUNC_ATTRIBUTE(__always_inline__, ALWAYS_INLINE)
+RUBY_FUNC_ATTRIBUTE(__no_sanitize__(san), NO_SANITIZE(san, x), rb_cv_func_no_sanitize)
+RUBY_FUNC_ATTRIBUTE(__no_sanitize_address__, NO_SANITIZE_ADDRESS)
+RUBY_FUNC_ATTRIBUTE(__no_address_safety_analysis__, NO_ADDRESS_SAFETY_ANALYSIS)
+RUBY_FUNC_ATTRIBUTE(__warn_unused_result__, WARN_UNUSED_RESULT)
+RUBY_FUNC_ATTRIBUTE(__unused__, MAYBE_UNUSED)
+RUBY_FUNC_ATTRIBUTE(__error__ mesg, ERRORFUNC(mesg,x), rb_cv_func___error__)
+RUBY_FUNC_ATTRIBUTE(__warning__ mesg, WARNINGFUNC(mesg,x), rb_cv_func___warning__)
+RUBY_FUNC_ATTRIBUTE(__weak__, WEAK, rb_cv_func_weak)
+AS_IF([test "$rb_cv_func_weak" != x], [
+   AC_DEFINE(HAVE_FUNC_WEAK)
+])
+
+AC_CACHE_CHECK([for __attribute__((__depreacted__(msg))) in C++],
+  rb_cv_CentOS6_CXX_workaround,
+  RUBY_WERROR_FLAG([
+    AC_LANG_PUSH([C++])
+    AC_COMPILE_IFELSE(
+      [AC_LANG_PROGRAM(
+        [],
+        [__attribute__((__deprecated__("message"))) int conftest(...);])],
+      [rb_cv_CentOS6_CXX_workaround=yes],
+      [rb_cv_CentOS6_CXX_workaround=no])
+    AC_LANG_POP()]))
+AS_IF([test "$rb_cv_CentOS6_CXX_workaround" != no],[
+  AC_DEFINE([RUBY_CXX_DEPRECATED(msg)],
+    [__attribute__((__deprecated__(msg)))])])
+
+AC_CACHE_CHECK([for std::nullptr_t], rb_cv_CXX_nullptr, [
+  AC_LANG_PUSH([C++])
+  AC_COMPILE_IFELSE(
+    [AC_LANG_PROGRAM(
+      [@%:@include <cstddef>],
+      [static std::nullptr_t const *const conftest = nullptr;])],
+    [rb_cv_CXX_nullptr=yes],
+    [rb_cv_CXX_nullptr=no])
+  AC_LANG_POP()])
+AS_IF([test "$rb_cv_CXX_nullptr" != no],[AC_DEFINE(HAVE_NULLPTR)])
+
+if_i386=${universal_binary+[defined __i386__]}
+RUBY_FUNC_ATTRIBUTE(__stdcall__,  FUNC_STDCALL,  rb_cv_func_stdcall,  ${if_i386})
+RUBY_FUNC_ATTRIBUTE(__cdecl__,    FUNC_CDECL,    rb_cv_func_cdecl,    ${if_i386})
+RUBY_FUNC_ATTRIBUTE(__fastcall__, FUNC_FASTCALL, rb_cv_func_fastcall, ${if_i386})
+RUBY_FUNC_ATTRIBUTE(__optimize__("O0"), FUNC_UNOPTIMIZED, rb_cv_func_unoptimized)
+RUBY_FUNC_ATTRIBUTE(__optimize__("-Os","-fomit-frame-pointer"), FUNC_MINIMIZED, rb_cv_func_minimized)
+
+AS_IF([test "$GCC" = yes], [
+    AC_CACHE_CHECK([for function alias], [rb_cv_gcc_function_alias],
+	[rb_cv_gcc_function_alias=no
+	for a in alias weak,alias; do
+	    AC_LINK_IFELSE([AC_LANG_PROGRAM([[void foo(void) {}
+		void bar(void) __attribute__(($a("foo")));]], [[bar()]])],
+		[rb_cv_gcc_function_alias=$a; break])
+	done])
+    AS_IF([test "$rb_cv_gcc_function_alias" != no], [
+	AC_DEFINE(HAVE_ATTRIBUTE_FUNCTION_ALIAS)
+	AC_DEFINE_UNQUOTED([RUBY_ALIAS_FUNCTION_TYPE(type, prot, name, args)],
+			   [type prot __attribute__(($rb_cv_gcc_function_alias(@%:@name)));])
+	AC_DEFINE_UNQUOTED([RUBY_ALIAS_FUNCTION_VOID(prot, name, args)],
+			   [RUBY_ALIAS_FUNCTION_TYPE(void, prot, name, args)])
+    ])
+
+    AC_CACHE_CHECK([for __atomic builtins], [rb_cv_gcc_atomic_builtins], [
+	AC_LINK_IFELSE([AC_LANG_PROGRAM([[unsigned int atomic_var;]],
+		    [[
+			__atomic_exchange_n(&atomic_var, 0, __ATOMIC_SEQ_CST);
+			__atomic_exchange_n(&atomic_var, 1, __ATOMIC_SEQ_CST);
+			__atomic_fetch_add(&atomic_var, 1, __ATOMIC_SEQ_CST);
+			__atomic_fetch_sub(&atomic_var, 1, __ATOMIC_SEQ_CST);
+			__atomic_or_fetch(&atomic_var, 1, __ATOMIC_SEQ_CST);
+		    ]])],
+		    [rb_cv_gcc_atomic_builtins=yes],
+		    [rb_cv_gcc_atomic_builtins=no])])
+    AS_IF([test "$rb_cv_gcc_atomic_builtins" = yes], [
+	AC_DEFINE(HAVE_GCC_ATOMIC_BUILTINS)
+    ])
+
+    AC_CACHE_CHECK([for __sync builtins], [rb_cv_gcc_sync_builtins], [
+	AC_LINK_IFELSE([AC_LANG_PROGRAM([[unsigned int atomic_var;]],
+		    [[
+			__sync_lock_test_and_set(&atomic_var, 0);
+			__sync_lock_test_and_set(&atomic_var, 1);
+			__sync_fetch_and_add(&atomic_var, 1);
+			__sync_fetch_and_sub(&atomic_var, 1);
+			__sync_or_and_fetch(&atomic_var, 1);
+			__sync_val_compare_and_swap(&atomic_var, 0, 1);
+		    ]])],
+		    [rb_cv_gcc_sync_builtins=yes],
+		    [rb_cv_gcc_sync_builtins=no])])
+    AS_IF([test "$rb_cv_gcc_sync_builtins" = yes], [
+	AC_DEFINE(HAVE_GCC_SYNC_BUILTINS)
+    ])
+])
+
+    AC_CACHE_CHECK(for __builtin_unreachable, rb_cv_func___builtin_unreachable,
+    [RUBY_WERROR_FLAG(
+    [AC_LINK_IFELSE([AC_LANG_PROGRAM([[volatile int zero;]],
+	[[if (zero) __builtin_unreachable();]])],
+	[rb_cv_func___builtin_unreachable=yes],
+	[rb_cv_func___builtin_unreachable=no])
+    ])
+    ])
+    AS_IF([test "$rb_cv_func___builtin_unreachable" = yes], [
+	AC_DEFINE_UNQUOTED(UNREACHABLE, [__builtin_unreachable()])
+    ])
+
+AC_CACHE_CHECK(for exported function attribute, rb_cv_func_exported, [
+rb_cv_func_exported=no
+RUBY_WERROR_FLAG([
+for mac in '__attribute__ ((__visibility__("default")))' '__declspec(dllexport)'; do
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@define RUBY_FUNC_EXPORTED $mac extern
+    RUBY_FUNC_EXPORTED void conftest_attribute_check(void);]], [[]])],
+    [rb_cv_func_exported="$mac"; break])
+done
+])])
+AS_IF([test "$rb_cv_func_exported" != no], [
+    AC_DEFINE_UNQUOTED(RUBY_FUNC_EXPORTED, [$rb_cv_func_exported extern])
+])
+RUBY_DECL_ATTRIBUTE([__nonnull__(n)], [RUBY_FUNC_NONNULL(n,x)], [rb_cv_func_nonnull],
+                    [], [function], [
+@%:@define x int conftest_attribute_check(void *p)
+@%:@define n 1
+])
+
+RUBY_APPEND_OPTION(XCFLAGS, -DRUBY_EXPORT)
+
+AC_ARG_ENABLE(mathn,
+    AS_HELP_STRING([--enable-mathn], [enable canonicalization for mathn]),
+    [AC_MSG_ERROR([mathn support has been dropped])])
+
+AC_CACHE_CHECK(for function name string predefined identifier,
+    rb_cv_function_name_string,
+    [AS_CASE(["$target_os"],[openbsd*],[
+      rb_cv_function_name_string=__func__
+     ],[
+     rb_cv_function_name_string=no
+      RUBY_WERROR_FLAG([
+        for func in __func__ __FUNCTION__; do
+            AC_LINK_IFELSE([AC_LANG_PROGRAM([[@%:@include <stdio.h>]],
+			 		    [[puts($func);]])],
+            [rb_cv_function_name_string=$func
+            break])
+        done
+      ])])]
+)
+AS_IF([test "$rb_cv_function_name_string" != no], [
+    AC_DEFINE_UNQUOTED(RUBY_FUNCTION_NAME_STRING, [$rb_cv_function_name_string])
+])
+
+AC_CACHE_CHECK(if enum over int is allowed, rb_cv_enum_over_int, [
+    rb_cv_enum_over_int=no
+    AS_IF([test "x$ac_cv_type_long_long" = xyes], [
+	type="unsigned long long" max="ULLONG_MAX"
+    ], [
+	type="unsigned long" max="ULONG_MAX"
+    ])
+    RUBY_WERROR_FLAG([
+        AC_COMPILE_IFELSE([
+            AC_LANG_BOOL_COMPILE_TRY([
+                    @%:@include <limits.h>
+                    enum {conftest_max = $max};
+                ], [
+                    (conftest_max == $max) &&
+                    (sizeof(conftest_max) == sizeof($type))
+                ]
+	    )],
+	    [rb_cv_enum_over_int=yes],
+	    [rb_cv_enum_over_int=no]
+	)
+    ])
+])
+AS_IF([test $rb_cv_enum_over_int = yes], [
+    AC_DEFINE(ENUM_OVER_INT, 1)
+])
+
+dnl Check whether we need to define sys_nerr locally
+AC_CHECK_DECLS([sys_nerr], [], [], [$ac_includes_default
+@%:@include <errno.h>])
+
+AC_CHECK_DECLS([getenv])
+
+AS_CASE(["$target_cpu"],
+[alpha*|sh4|sh4el|sh4eb], [AS_CASE(["$target_os"::"$GCC"],
+		[*::yes],  # gcc
+			[CFLAGS="-mieee $CFLAGS"],
+		[osf*],    # ccc
+			[CFLAGS="-ieee $CFLAGS"],
+		)],
+[sparc*], [AC_LIBOBJ([sparc])])
+
+ac_cv_header_net_socket_h=${ac_cv_header_net_socket_h=no}
+AS_IF([test "$ac_cv_header_net_socket_h" = yes], [
+    ac_cv_header_sys_socket_h=${ac_cv_header_sys_socket_h=no}
+], [
+    ac_cv_header_sys_socket_h=${ac_cv_header_sys_socket_h=yes}
+])
+
+
+AC_TYPE_SIZE_T
+RUBY_CHECK_SIGNEDNESS(size_t, [AC_MSG_ERROR(size_t is signed)], [],
+		      [@%:@include <sys/types.h>])
+RUBY_CHECK_SIZEOF(size_t, [int long void*], [], [@%:@include <sys/types.h>])
+RUBY_CHECK_SIZEOF(ptrdiff_t, size_t, [], [@%:@include <stddef.h>])
+RUBY_CHECK_PRINTF_PREFIX(size_t, z)
+RUBY_CHECK_PRINTF_PREFIX(ptrdiff_t, t)
+AC_CHECK_MEMBERS([struct stat.st_blksize])
+AC_CHECK_MEMBERS([struct stat.st_blocks])
+AC_CHECK_MEMBERS([struct stat.st_rdev])
+RUBY_CHECK_SIZEOF([struct stat.st_size], [off_t int long "long long"], [], [@%:@include <sys/stat.h>])
+AS_IF([test "$ac_cv_member_struct_stat_st_blocks" = yes], [
+    RUBY_CHECK_SIZEOF([struct stat.st_blocks], [off_t int long "long long"], [], [@%:@include <sys/stat.h>])
+])
+RUBY_CHECK_SIZEOF([struct stat.st_ino], [long "long long"], [], [@%:@include <sys/stat.h>])
+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_MEMBERS([struct stat.st_birthtimespec])
+AS_IF([test "x$ac_cv_member_struct_stat_st_birthtimespec" != xyes],
+    [AC_CHECK_MEMBERS([struct statx.stx_btime])])
+
+AC_CHECK_TYPES([struct timeval], [], [], [@%:@ifdef HAVE_TIME_H
+@%:@include <time.h>
+@%:@endif
+@%:@ifdef HAVE_SYS_TIME_H
+@%:@include <sys/time.h>
+@%:@endif])
+
+AS_IF([test "${ac_cv_type_struct_timeval}" = yes], [
+    RUBY_CHECK_SIZEOF([struct timeval.tv_sec], [time_t long "long long"], [],
+		      [@%:@ifdef HAVE_TIME_H
+@%:@include <time.h>
+@%:@endif
+@%:@ifdef HAVE_SYS_TIME_H
+@%:@include <sys/time.h>
+@%:@endif])
+    AS_CASE(${ac_cv_sizeof_struct_timeval_tv_sec},
+	    [SIZEOF_INT], [t=int],
+	    [SIZEOF_LONG], [t=long],
+	    [SIZEOF_LONG_LONG], [t=LONG_LONG],
+	    [t=])
+    AS_IF([test "${t}" != ""], [
+	AC_DEFINE_UNQUOTED(TYPEOF_TIMEVAL_TV_SEC, [$t])
+    ])
+])
+
+AC_CHECK_TYPES([struct timespec], [], [], [@%:@ifdef HAVE_TIME_H
+@%:@include <time.h>
+@%:@endif
+@%:@ifdef HAVE_SYS_TIME_H
+@%:@include <sys/time.h>
+@%:@endif])
+
+AC_CHECK_TYPES([struct timezone], [], [], [@%:@ifdef HAVE_TIME_H
+@%:@ include <time.h>
+@%:@endif
+@%:@ifdef HAVE_SYS_TIME_H
+@%:@ include <sys/time.h>
+@%:@endif])
+
+AC_CACHE_VAL([rb_cv_large_fd_select],
+    [AC_CHECK_TYPE(fd_mask, [rb_cv_large_fd_select=yes], [rb_cv_large_fd_select=no], [AC_INCLUDES_DEFAULT([])
+@%:@ifdef HAVE_SYS_SELECT_H
+@%:@ include <sys/select.h>
+@%:@endif])])
+AS_IF([test "$rb_cv_large_fd_select" = yes], [
+    AC_DEFINE(HAVE_RB_FD_INIT, 1)
+])
+
+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)
+AS_IF([test "x$rb_cv_type_intptr_t" != xno], [
+    RUBY_CHECK_PRINTF_PREFIX(intptr_t, '' ll I64 l, PTR)
+])
+RUBY_DEFINT(ssize_t, size_t, [], [@%:@include <sys/types.h>])	dnl may differ from int, so not use AC_TYPE_SSIZE_T.
+AS_IF([test "x$rb_cv_type_int64_t" != xno], [
+    RUBY_CHECK_PRINTF_PREFIX(int64_t, ll I64 l, 64)
+])
+
+AC_CACHE_CHECK(for stack end address, rb_cv_stack_end_address,
+[rb_cv_stack_end_address=no
+  AC_LINK_IFELSE([AC_LANG_PROGRAM(
+      [[extern void *__libc_stack_end;]],
+      [[if (!__libc_stack_end) return 1;]])],
+    [rb_cv_stack_end_address="__libc_stack_end"])
+])
+AS_IF([test $rb_cv_stack_end_address != no], [
+  AC_DEFINE_UNQUOTED(STACK_END_ADDRESS, $rb_cv_stack_end_address)
+])
+
+dnl Checks for library functions.
+AC_TYPE_GETGROUPS
+AS_CASE(["${target_cpu}-${target_os}:${target_archs}"],
+[powerpc-darwin*], [
+  AC_LIBSOURCES(alloca.c)
+  AC_SUBST([ALLOCA], [\${LIBOBJDIR}alloca.${ac_objext}])
+  AC_DEFINE(C_ALLOCA)
+  AC_DEFINE_UNQUOTED(alloca, alloca)
+  ],
+[universal-darwin*:*ppc*], [
+  AC_LIBSOURCES(alloca.c)
+  AC_SUBST([ALLOCA], [\${LIBOBJDIR}alloca.${ac_objext}])
+  RUBY_DEFINE_IF([defined __powerpc__], C_ALLOCA, 1)
+  RUBY_DEFINE_IF([defined __powerpc__], alloca, alloca)
+  ],
+[
+  AC_FUNC_ALLOCA
+  ])
+AS_IF([test "x$ALLOCA" = "x"], [
+    AC_CACHE_CHECK([for dynamic size alloca], rb_cv_dynamic_alloca, [
+    for chk in ok __chkstk; do
+	AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+	    @%:@ifdef HAVE_ALLOCA_H
+	    @%:@include <alloca.h>
+	    @%:@endif
+	    void $chk() {}
+	    int dynamic_alloca_test;
+	    int dynamic_alloca_result;]],
+	    [[dynamic_alloca_result = alloca(dynamic_alloca_test) != 0;]])],
+	    [rb_cv_dynamic_alloca=$chk; break])
+    done])
+    AS_IF([test "x$rb_cv_dynamic_alloca" = "x__chkstk"], [
+	AC_DEFINE_UNQUOTED(RUBY_ALLOCA_CHKSTK, _$rb_cv_dynamic_alloca)
+	AS_CASE("$target_cpu",
+	[x64|x86_64], [
+	    AC_SUBST([ALLOCA], [\${LIBOBJDIR}x86_64-chkstk.${ac_objext}])
+	],)
+    ])
+])
+AC_FUNC_MEMCMP
+
+AS_CASE(["$target_os"],[freebsd*],[
+	 AC_DEFINE(BROKEN_CLOSE)
+	 AC_REPLACE_FUNCS(close)
+	 ])
+
+AC_REPLACE_FUNCS(acosh)
+AC_REPLACE_FUNCS(cbrt)
+AC_REPLACE_FUNCS(crypt)
+AC_REPLACE_FUNCS(dup2)
+AC_REPLACE_FUNCS(erf)
+AC_REPLACE_FUNCS(explicit_bzero)
+AC_REPLACE_FUNCS(ffs)
+AC_REPLACE_FUNCS(flock)
+AC_REPLACE_FUNCS(hypot)
+AC_REPLACE_FUNCS(lgamma_r)
+AC_REPLACE_FUNCS(memmove)
+AC_REPLACE_FUNCS(nan)
+AC_REPLACE_FUNCS(nextafter)
+AC_REPLACE_FUNCS(setproctitle)
+AC_REPLACE_FUNCS(strchr)
+AC_REPLACE_FUNCS(strerror)
+AC_REPLACE_FUNCS(strlcat)
+AC_REPLACE_FUNCS(strlcpy)
+AC_REPLACE_FUNCS(strstr)
+AC_REPLACE_FUNCS(tgamma)
+
+RUBY_REPLACE_FUNC([finite], [@%:@include <math.h>])
+RUBY_REPLACE_FUNC([isinf], [@%:@include <math.h>])
+RUBY_REPLACE_FUNC([isnan], [@%:@include <math.h>])
+
+# for missing/setproctitle.c
+AS_CASE(["$target_os"],
+[aix* | k*bsd*-gnu | kopensolaris*-gnu | linux* | darwin*], [AC_DEFINE(SPT_TYPE,SPT_REUSEARGV)],
+[hpux*], [AC_DEFINE(SPT_TYPE,SPT_PSTAT) ],
+[])
+AC_CHECK_HEADERS(sys/pstat.h)
+
+
+AC_CACHE_CHECK(for signbit, rb_cv_have_signbit,
+  [AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+#include <math.h>
+]], [[int v = signbit(-0.0);]])],
+	rb_cv_have_signbit=yes,
+	rb_cv_have_signbit=no)])
+AS_IF([test "$rb_cv_have_signbit" = yes], [
+  AC_DEFINE(HAVE_SIGNBIT)
+], [
+  AC_LIBOBJ([signbit])
+])
+
+AC_FUNC_FORK
+
+AC_CHECK_FUNCS(__syscall)
+AC_CHECK_FUNCS(_longjmp)		# used for AC_ARG_WITH(setjmp-type)
+# we don't use _setjmp if _longjmp doesn't exist.
+test x$ac_cv_func__longjmp = xno && ac_cv_func__setjmp=no
+AC_CHECK_FUNCS(arc4random_buf)
+AC_CHECK_FUNCS(atan2l atan2f)
+AC_CHECK_FUNCS(chroot)
+AC_CHECK_FUNCS(chsize)
+AC_CHECK_FUNCS(clock_gettime)
+AC_CHECK_FUNCS(copy_file_range)
+AC_CHECK_FUNCS(cosh)
+AC_CHECK_FUNCS(crypt_r)
+AC_CHECK_FUNCS(daemon)
+AC_CHECK_FUNCS(dirfd)
+AC_CHECK_FUNCS(dl_iterate_phdr)
+AC_CHECK_FUNCS(dlopen)
+AC_CHECK_FUNCS(dladdr)
+AC_CHECK_FUNCS(dup)
+AC_CHECK_FUNCS(dup3)
+AC_CHECK_FUNCS(eaccess)
+AC_CHECK_FUNCS(endgrent)
+AC_CHECK_FUNCS(eventfd)
+AC_CHECK_FUNCS(explicit_memset)
+AC_CHECK_FUNCS(fcopyfile)
+AC_CHECK_FUNCS(fchmod)
+AC_CHECK_FUNCS(fchown)
+AC_CHECK_FUNCS(fcntl)
+AC_CHECK_FUNCS(fdatasync)
+AC_CHECK_FUNCS(fdopendir)
+AC_CHECK_FUNCS(fgetattrlist)
+AC_CHECK_FUNCS(fmod)
+AC_CHECK_FUNCS(fstatat)
+AC_CHECK_FUNCS(fsync)
+AC_CHECK_FUNCS(ftruncate)
+AC_CHECK_FUNCS(ftruncate64)		# used for Win32 platform
+AC_CHECK_FUNCS(getattrlist)
+AC_CHECK_FUNCS(getcwd)
+AC_CHECK_FUNCS(getgidx)
+AC_CHECK_FUNCS(getgrnam)
+AC_CHECK_FUNCS(getgrnam_r)
+AC_CHECK_FUNCS(getgroups)
+AC_CHECK_FUNCS(getlogin)
+AC_CHECK_FUNCS(getlogin_r)
+AC_CHECK_FUNCS(getpgid)
+AC_CHECK_FUNCS(getpgrp)
+AC_CHECK_FUNCS(getpriority)
+AC_CHECK_FUNCS(getpwnam)
+AC_CHECK_FUNCS(getpwnam_r)
+AC_CHECK_FUNCS(getpwuid)
+AC_CHECK_FUNCS(getpwuid_r)
+AC_CHECK_FUNCS(getrandom)
+AC_CHECK_FUNCS(getresgid)
+AC_CHECK_FUNCS(getresuid)
+AC_CHECK_FUNCS(getrlimit)
+AC_CHECK_FUNCS(getsid)
+AC_CHECK_FUNCS(gettimeofday)		# for making ac_cv_func_gettimeofday
+AC_CHECK_FUNCS(getuidx)
+AC_CHECK_FUNCS(gmtime_r)
+AC_CHECK_FUNCS(grantpt)
+AC_CHECK_FUNCS(initgroups)
+AC_CHECK_FUNCS(ioctl)
+AC_CHECK_FUNCS(isfinite)
+AC_CHECK_FUNCS(issetugid)
+AC_CHECK_FUNCS(killpg)
+AC_CHECK_FUNCS(lchmod)
+AC_CHECK_FUNCS(lchown)
+AC_CHECK_FUNCS(link)
+AC_CHECK_FUNCS(llabs)
+AC_CHECK_FUNCS(lockf)
+AC_CHECK_FUNCS(log2)
+AC_CHECK_FUNCS(lstat)
+AC_CHECK_FUNCS(lutimes)
+AC_CHECK_FUNCS(malloc_usable_size)
+AC_CHECK_FUNCS(malloc_size)
+AC_CHECK_FUNCS(mblen)
+AC_CHECK_FUNCS(memalign)
+AC_CHECK_FUNCS(memset_s)
+AC_CHECK_FUNCS(writev)
+AC_CHECK_FUNCS(memrchr)
+AC_CHECK_FUNCS(memmem)
+AC_CHECK_FUNCS(mkfifo)
+AC_CHECK_FUNCS(mknod)
+AC_CHECK_FUNCS(mktime)
+AC_CHECK_FUNCS(openat)
+AC_CHECK_FUNCS(pipe2)
+AC_CHECK_FUNCS(poll)
+AC_CHECK_FUNCS(posix_fadvise)
+AC_CHECK_FUNCS(posix_memalign)
+AC_CHECK_FUNCS(ppoll)
+AC_CHECK_FUNCS(pread)
+AC_CHECK_FUNCS(pwrite)
+AC_CHECK_FUNCS(qsort_r)
+AC_CHECK_FUNCS(qsort_s)
+AC_CHECK_FUNCS(readlink)
+AC_CHECK_FUNCS(realpath)
+AC_CHECK_FUNCS(round)
+AC_CHECK_FUNCS(sched_getaffinity)
+AC_CHECK_FUNCS(seekdir)
+AC_CHECK_FUNCS(select_large_fdset)
+AC_CHECK_FUNCS(sendfile)
+AC_CHECK_FUNCS(setegid)
+AC_CHECK_FUNCS(setenv)
+AC_CHECK_FUNCS(seteuid)
+AC_CHECK_FUNCS(setgid)
+AC_CHECK_FUNCS(setgroups)
+AC_CHECK_FUNCS(setpgid)
+AC_CHECK_FUNCS(setpgrp)
+AC_CHECK_FUNCS(setregid)
+AC_CHECK_FUNCS(setresgid)
+AC_CHECK_FUNCS(setresuid)
+AC_CHECK_FUNCS(setreuid)
+AC_CHECK_FUNCS(setrgid)
+AC_CHECK_FUNCS(setrlimit)
+AC_CHECK_FUNCS(setruid)
+AC_CHECK_FUNCS(setsid)
+AC_CHECK_FUNCS(setuid)
+AC_CHECK_FUNCS(shutdown)
+AC_CHECK_FUNCS(sigaction)
+AC_CHECK_FUNCS(sigaltstack)
+AC_CHECK_FUNCS(sigprocmask)
+AC_CHECK_FUNCS(sinh)
+AC_CHECK_FUNCS(spawnv)
+AC_CHECK_FUNCS(symlink)
+AC_CHECK_FUNCS(syscall)
+AC_CHECK_FUNCS(sysconf)
+AC_CHECK_FUNCS(tanh)
+AC_CHECK_FUNCS(telldir)
+AC_CHECK_FUNCS(timegm)
+AC_CHECK_FUNCS(times)
+AC_CHECK_FUNCS(truncate)
+AC_CHECK_FUNCS(truncate64)		# used for Win32
+AC_CHECK_FUNCS(unsetenv)
+AC_CHECK_FUNCS(utimensat)
+AC_CHECK_FUNCS(utimes)
+AC_CHECK_FUNCS(wait4)
+AC_CHECK_FUNCS(waitpid)
+AC_CHECK_FUNCS(__cospi)
+AC_CHECK_FUNCS(__sinpi)
+
+AS_IF([test "x$ac_cv_member_struct_statx_stx_btime" = xyes],
+    [AC_CHECK_FUNCS(statx)])
+
+AS_CASE(["$ac_cv_func_memset_s:$ac_cv_func_qsort_s"], [*yes*],
+    [RUBY_DEFINE_IF([!defined __STDC_WANT_LIB_EXT1__], [__STDC_WANT_LIB_EXT1__], 1)])
+
+AS_IF([test "$ac_cv_func_getcwd" = yes], [
+    AC_CACHE_CHECK(if getcwd allocates buffer if NULL is given, [rb_cv_getcwd_malloc],
+	[AC_RUN_IFELSE([AC_LANG_SOURCE([[
+@%:@include <stddef.h>
+@%:@include <stdio.h>
+@%:@ifdef HAVE_UNISTD_H
+@%:@include <unistd.h>
+@%:@endif
+@%:@ifndef EXIT_SUCCESS
+@%:@define EXIT_SUCCESS 0
+@%:@endif
+@%:@ifndef EXIT_FAILURE
+@%:@define EXIT_FAILURE 1
+@%:@endif
+
+int
+main(int argc, char **argv)
+{
+    if (!getcwd(NULL, 0)) return EXIT_FAILURE;
+    return EXIT_SUCCESS;
+}
+]])],
+	    rb_cv_getcwd_malloc=yes,
+	    rb_cv_getcwd_malloc=no,
+	    AS_CASE($target_os,
+		[linux*|darwin*|*bsd|cygwin*|mingw*|mswin*],
+		[rb_cv_getcwd_malloc=yes],
+		[rb_cv_getcwd_malloc=no]))])
+    AS_IF([test "$rb_cv_getcwd_malloc" = no], [AC_DEFINE(NO_GETCWD_MALLOC, 1)])
+])
+
+AS_IF([test "$ac_cv_func_crypt_r" = yes],
+    [AC_CHECK_HEADERS(crypt.h)])
+AS_IF([test "$ac_cv_func_crypt_r:$ac_cv_header_crypt_h" = yes:yes],
+    [AC_CHECK_MEMBERS([struct crypt_data.initialized], [], [],
+		      [AC_INCLUDES_DEFAULT([@%:@include <crypt.h>])])])
+
+RUBY_CHECK_BUILTIN_FUNC(__builtin_alloca_with_align, [__builtin_alloca_with_align(1, 4096)])
+RUBY_CHECK_BUILTIN_FUNC(__builtin_assume_aligned, [__builtin_assume_aligned((void*)32, 32)])
+RUBY_CHECK_BUILTIN_FUNC(__builtin_bswap16, [__builtin_bswap16(0)])
+RUBY_CHECK_BUILTIN_FUNC(__builtin_bswap32, [__builtin_bswap32(0)])
+RUBY_CHECK_BUILTIN_FUNC(__builtin_bswap64, [__builtin_bswap64(0)])
+RUBY_CHECK_BUILTIN_FUNC(__builtin_popcount, [__builtin_popcount(0)])
+RUBY_CHECK_BUILTIN_FUNC(__builtin_popcountll, [__builtin_popcountll(0)])
+RUBY_CHECK_BUILTIN_FUNC(__builtin_clz, [__builtin_clz(0)])
+RUBY_CHECK_BUILTIN_FUNC(__builtin_clzl, [__builtin_clzl(0)])
+RUBY_CHECK_BUILTIN_FUNC(__builtin_clzll, [__builtin_clzll(0)])
+RUBY_CHECK_BUILTIN_FUNC(__builtin_ctz, [__builtin_ctz(0)])
+RUBY_CHECK_BUILTIN_FUNC(__builtin_ctzll, [__builtin_ctzll(0)])
+RUBY_CHECK_BUILTIN_FUNC(__builtin_add_overflow, [int x;__builtin_add_overflow(0,0,&x)])
+RUBY_CHECK_BUILTIN_FUNC(__builtin_sub_overflow, [int x;__builtin_sub_overflow(0,0,&x)])
+RUBY_CHECK_BUILTIN_FUNC(__builtin_mul_overflow, [int x;__builtin_mul_overflow(0,0,&x)])
+RUBY_CHECK_BUILTIN_FUNC(__builtin_mul_overflow_p, [__builtin_mul_overflow_p(0,0,(int)0)])
+RUBY_CHECK_BUILTIN_FUNC(__builtin_constant_p, [__builtin_constant_p(0)])
+RUBY_CHECK_BUILTIN_FUNC(__builtin_choose_expr, [
+    [int x[__extension__(__builtin_choose_expr(1, 1, -1))]];
+    [int y[__extension__(__builtin_choose_expr(0, -1, 1))]];
+    ])
+AS_IF([test x$rb_cv_builtin___builtin_choose_expr = xyes], [
+    RUBY_CHECK_BUILTIN_FUNC(__builtin_choose_expr_constant_p, [
+    [int x[__extension__(__builtin_choose_expr(__builtin_constant_p(1), 1, -1))]];
+    [int y[__extension__(__builtin_choose_expr(__builtin_constant_p(foo), -1, 1))]];
+    ])
+])
+RUBY_CHECK_BUILTIN_FUNC(__builtin_types_compatible_p, [__builtin_types_compatible_p(int, int)])
+RUBY_CHECK_BUILTIN_FUNC(__builtin_trap, [__builtin_trap()])
+
+AS_IF([test "$ac_cv_func_qsort_r" != no], [
+  AC_CACHE_CHECK(whether qsort_r is GNU version, rb_cv_gnu_qsort_r,
+    [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+@%:@include <stdlib.h>
+void (qsort_r)(void *base, size_t nmemb, size_t size,
+	    int (*compar)(const void *, const void *, void *),
+	    void *arg);
+]], [[ ]])],
+      [rb_cv_gnu_qsort_r=yes],
+      [rb_cv_gnu_qsort_r=no])
+  ])
+  AC_CACHE_CHECK(whether qsort_r is BSD version, rb_cv_bsd_qsort_r,
+    [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+@%:@include <stdlib.h>
+void (qsort_r)(void *base, size_t nmemb, size_t size,
+	     void *arg, int (*compar)(void *, const void *, const void *));
+]], [[ ]])],
+      [rb_cv_bsd_qsort_r=yes],
+      [rb_cv_bsd_qsort_r=no])
+  ])
+  AS_CASE("$rb_cv_gnu_qsort_r:$rb_cv_bsd_qsort_r",
+  [yes:no], [
+    AC_DEFINE(HAVE_GNU_QSORT_R, 1)
+  ],
+  [no:yes], [
+    AC_DEFINE(HAVE_BSD_QSORT_R, 1)
+  ])
+])
+
+AC_CACHE_CHECK(whether atan2 handles Inf as C99, rb_cv_atan2_inf_c99, [
+    AS_IF([test $ac_cv_func_atan2f:$ac_cv_func_atan2l = yes:yes], [
+	AC_RUN_IFELSE([AC_LANG_SOURCE([[
+@%:@include <math.h>
+@%:@ifdef HAVE_UNISTD_H
+@%:@include <unistd.h>
+@%:@endif
+@%:@ifndef EXIT_SUCCESS
+@%:@define EXIT_SUCCESS 0
+@%:@endif
+@%:@ifndef EXIT_FAILURE
+@%:@define EXIT_FAILURE 1
+@%:@endif
+
+int
+main(int argc, char **argv)
+{
+    if (fabs(atan2(INFINITY, INFINITY) - M_PI_4) <= 0.01) return EXIT_SUCCESS;
+    return EXIT_FAILURE;
+}
+]])],
+	[rb_cv_atan2_inf_c99=yes],
+	[rb_cv_atan2_inf_c99=no],
+	[AS_CASE($target_os, [mingw*|mswin*], [rb_cv_atan2_inf_c99=no], [rb_cv_atan2_inf_c99=yes])]
+	)
+    ], [rb_cv_atan2_inf_c99=no])
+])
+AS_IF([test "x$rb_cv_atan2_inf_c99" = xyes], [AC_DEFINE(ATAN2_INF_C99)])
+
+# Some platform need -lrt for clock_gettime, but the other don't.
+AS_IF([test x"$ac_cv_func_clock_gettime" != xyes], [
+    # glibc 2.17 moves clock_* functions from librt to the main C library.
+    # http://sourceware.org/ml/libc-announce/2012/msg00001.html
+    AC_CHECK_LIB(rt, clock_gettime)
+    AS_IF([test x"$ac_cv_lib_rt_clock_gettime" = xyes], [
+	AC_DEFINE(HAVE_CLOCK_GETTIME, 1)
+    ])
+])
+AC_CHECK_FUNCS(clock_getres) # clock_getres should be tested after clock_gettime test including librt test.
+AC_CHECK_LIB([rt], [timer_create])
+AC_CHECK_LIB([rt], [timer_settime])
+AS_IF([test x"$ac_cv_lib_rt_timer_create" = xyes], [
+    AC_DEFINE(HAVE_TIMER_CREATE, 1)
+])
+AS_IF([test x"$ac_cv_lib_rt_timer_settime" = xyes], [
+    AC_DEFINE(HAVE_TIMER_SETTIME, 1)
+])
+
+AC_CACHE_CHECK(for unsetenv returns a value, rb_cv_unsetenv_return_value,
+  [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#include <stdlib.h>
+]], [[int v = unsetenv("foo");]])],
+	rb_cv_unsetenv_return_value=yes,
+	rb_cv_unsetenv_return_value=no)])
+AS_IF([test "$rb_cv_unsetenv_return_value" = no], [
+  AC_DEFINE(VOID_UNSETENV)
+])
+
+# End of setjmp check.
+
+AC_ARG_ENABLE(setreuid,
+       AS_HELP_STRING([--enable-setreuid], [use setreuid()/setregid() according to need even if obsolete]),
+       [use_setreuid=$enableval])
+AS_IF([test "$use_setreuid" = yes], [
+    AC_DEFINE(USE_SETREUID)
+    AC_DEFINE(USE_SETREGID)
+])
+AC_STRUCT_TIMEZONE
+AC_CACHE_CHECK(for struct tm.tm_gmtoff, rb_cv_member_struct_tm_tm_gmtoff,
+  [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+@%:@define _BSD_SOURCE
+@%:@define _DEFAULT_SOURCE
+@%:@include <time.h>
+    ]],
+    [[struct tm t; t.tm_gmtoff = 3600;]])],
+  [rb_cv_member_struct_tm_tm_gmtoff=yes],
+  [rb_cv_member_struct_tm_tm_gmtoff=no])])
+AS_IF([test "$rb_cv_member_struct_tm_tm_gmtoff" = yes], [
+  AC_DEFINE(HAVE_STRUCT_TM_TM_GMTOFF)
+])
+AC_CACHE_CHECK(for external int daylight, rb_cv_have_daylight,
+  [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <time.h>
+  int i;]],
+	[[i = daylight;]])],
+	rb_cv_have_daylight=yes,
+	rb_cv_have_daylight=no)])
+AS_IF([test "$rb_cv_have_daylight" = yes], [
+  AC_DEFINE(HAVE_DAYLIGHT)
+])
+
+AC_CACHE_CHECK(for negative time_t for gmtime(3), rb_cv_negative_time_t,
+  [AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <stdlib.h>
+#include <time.h>
+
+void
+check(tm, y, m, d, h, s)
+    struct tm *tm;
+    int y, m, d, h, s;
+{
+    if (!tm ||
+	tm->tm_year != y ||
+	tm->tm_mon  != m-1 ||
+	tm->tm_mday != d ||
+	tm->tm_hour != h ||
+	tm->tm_sec  != s) {
+	exit(1);
+    }
+}
+
+int
+main()
+{
+   time_t t = -1;
+   struct tm *tm;
+
+   check(gmtime(&t), 69, 12, 31, 23, 59);
+   t = ~(time_t)0 << 31;
+   check(gmtime(&t), 1, 12, 13, 20, 52);
+   return 0;
+}
+]])],
+	rb_cv_negative_time_t=yes,
+	rb_cv_negative_time_t=no,
+	rb_cv_negative_time_t=yes)])
+AS_IF([test "$rb_cv_negative_time_t" = yes], [
+  AC_DEFINE(NEGATIVE_TIME_T)
+])
+
+# [ruby-dev:40910] overflow of time on FreeBSD
+# http://www.freebsd.org/cgi/query-pr.cgi?pr=145341
+AC_CACHE_CHECK(for localtime(3) overflow correctly, rb_cv_localtime_overflow,
+  [AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <stdlib.h>
+#include <time.h>
+
+void
+check(time_t t1)
+{
+    struct tm *tm;
+    time_t t2;
+    tm = localtime(&t1);
+    if (!tm)
+	return; /* overflow detected.  ok. */
+    t2 = mktime(tm);
+    if (t1 == t2)
+        return; /* round-trip.  ok. */
+    exit(1);
+}
+
+int
+main()
+{
+    time_t t;
+    if (~(time_t)0 <= 0) {
+        t = (((time_t)1) << (sizeof(time_t) * 8 - 2));
+        t |= t - 1;
+    }
+    else {
+        t = ~(time_t)0;
+    }
+    check(t);
+    return 0;
+}
+]])],
+	rb_cv_localtime_overflow=yes,
+	rb_cv_localtime_overflow=no,
+	rb_cv_localtime_overflow=no)])
+AS_IF([test "$rb_cv_localtime_overflow" = no], [
+  AC_DEFINE(LOCALTIME_OVERFLOW_PROBLEM)
+])
+
+AS_IF([test "$ac_cv_func_sigprocmask" = yes && test "$ac_cv_func_sigaction" = yes], [
+   AC_DEFINE(POSIX_SIGNAL)
+], [
+  AC_CHECK_FUNCS(sigsetmask)
+  AC_CACHE_CHECK(for BSD signal semantics, rb_cv_bsd_signal,
+    [AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <stdio.h>
+#include <signal.h>
+
+void
+sig_handler(dummy)
+     int dummy;
+{
+}
+
+int
+main()
+{
+  signal(SIGINT, sig_handler);
+  kill(getpid(), SIGINT);
+  kill(getpid(), SIGINT);
+  return 0;
+}
+]])],
+	rb_cv_bsd_signal=yes,
+	rb_cv_bsd_signal=no,
+	rb_cv_bsd_signal=$ac_cv_func_sigsetmask)])
+  AS_IF([test "$rb_cv_bsd_signal" = yes], [
+    AC_DEFINE(BSD_SIGNAL)
+  ])
+])
+
+AC_CHECK_TYPES([sig_t],[],[],[@%:@include <signal.h>])
+
+AS_IF([test "$ac_cv_func_getpgid" = no], [
+  # AC_FUNC_GETPGRP fails when cross-compiling with old autoconf.
+  # autoconf is changed between 2.52d and 2.52f?
+  # http://lists.gnu.org/archive/html/bug-gnu-utils/2001-09/msg00181.html
+  # "autoconf cleanup for AC_FUNC_GETPGRP and GETPGRP_VOID"
+AC_FUNC_GETPGRP
+])
+AS_IF([test "$ac_cv_func_setpgid:$ac_cv_func_setpgrp" = no:yes], [
+  # AC_FUNC_SETPGRP fails when cross-compiling.  (until autoconf 2.69?)
+  # https://lists.gnu.org/archive/html/bug-autoconf/2013-02/msg00002.html
+  # "AC_FUNC_SETPGRP fails to work properly when cross-compiling"
+AC_FUNC_SETPGRP
+])
+
+AS_IF([test x"$ac_cv_func_dirfd" = xno], [
+  AS_CASE(["$target_os"],[solaris*],
+          [AC_CHECK_MEMBERS([DIR.d_fd, DIR.dd_fd],,,[
+#include <sys/types.h>
+#include <dirent.h>
+])])
+])
+
+AC_CACHE_CHECK(whether right shift preserve sign bit, rb_cv_rshift_sign,
+    [AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([], [(-1==(-1>>1))])],
+	rb_cv_rshift_sign=yes,
+	rb_cv_rshift_sign=no)])
+AS_IF([test "$rb_cv_rshift_sign" = yes], [
+  AC_DEFINE(RSHIFT(x,y), ((x)>>(int)(y)))
+], [
+  AC_DEFINE(RSHIFT(x,y), (((x)<0) ? ~((~(x))>>(int)(y)) : (x)>>(int)(y)))
+])
+
+AS_IF([test "$ac_cv_func_copy_file_range" = no], [
+  AC_CACHE_CHECK([for copy_file_range],
+    rb_cv_use_copy_file_range,
+    [AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/syscall.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+#ifndef O_TMPFILE
+  #define O_TMPFILE __O_TMPFILE
+#endif
+
+int
+main()
+{
+#ifdef __NR_copy_file_range
+   int ret, fd_in, fd_out;
+   fd_in = open("/tmp", O_TMPFILE|O_RDWR, S_IRUSR);
+   fd_out = open("/tmp", O_TMPFILE|O_WRONLY, S_IWUSR);
+   ret = syscall(__NR_copy_file_range, fd_in, NULL, fd_out, NULL, 0, 0);
+   close(fd_in);
+   close(fd_out);
+   if (ret == -1) { return 1; }
+   return 0;
+#else
+   return 1;
+#endif
+}
+  ]])],
+    [rb_cv_use_copy_file_range=yes],
+    [rb_cv_use_copy_file_range=no],
+    [rb_cv_use_copy_file_range=no])])
+])
+AS_CASE(["$ac_cv_func_copy_file_range:$rb_cv_use_copy_file_range"], [*yes*], [
+  AC_DEFINE(USE_COPY_FILE_RANGE)
+])
+
+AS_CASE(["$ac_cv_func_gettimeofday:$ac_cv_func_clock_gettime"],
+[*yes*], [],
+[
+    AC_MSG_ERROR(clock_gettime() or gettimeofday() must exist)
+])
+
+AS_IF([test "$ac_cv_func_sysconf" = yes], [
+  RUBY_CHECK_SYSCONF(CLK_TCK)
+])
+
+AS_IF([test "${universal_binary-no}" = yes ], [
+    archflagpat=`eval echo '"'"${ARCH_FLAG}"'"' | sed 's/[[][|.*]]/\\&/g'`
+    save_CFLAGS="$CFLAGS" new_cflags=`echo "$CFLAGS" | sed "s|$archflagpat"'||'`
+    save_LDFLAGS="$LDFLAGS" new_ldflags=`echo "$LDFLAGS" | sed "s|$archflagpat"'||'`
+    stack_dir=
+    for archs in ${universal_archnames}; do
+	archs=`echo $archs | sed 's/=.*//'`
+	CFLAGS="$new_cflags -arch $archs"
+	LDFLAGS="$new_ldflags -arch $archs"
+	RUBY_STACK_GROW_DIRECTION($archs, dir)
+	AS_IF([test x$stack_dir = x], [
+	    stack_dir=$dir
+	], [test x$stack_dir != x$dir], [
+	    stack_dir=no
+	])
+    done
+    CFLAGS="$save_CFLAGS" LDFLAGS="$save_LDFLAGS"
+    AS_IF([test x$stack_dir = xno], [
+	for archs in ${universal_archnames}; do
+	    archs=`echo $archs | sed 's/=.*//'`
+	    eval dir=\$[rb_cv_stack_grow_dir_]AS_TR_SH([$archs])
+	    RUBY_DEFINE_IF([defined __${archs}__], STACK_GROW_DIRECTION, $dir)
+	done
+    ], [
+	AC_DEFINE_UNQUOTED(STACK_GROW_DIRECTION, $stack_dir)
+    ])
+], [
+    RUBY_STACK_GROW_DIRECTION($target_cpu, dir)
+    AC_DEFINE_UNQUOTED(STACK_GROW_DIRECTION, $dir)
+])
+
+AC_ARG_WITH(coroutine,
+    AS_HELP_STRING([--with-coroutine=IMPLEMENTATION], [specify the coroutine implementation to use]),
+    [rb_cv_coroutine=$withval])
+AS_CASE([$rb_cv_coroutine], [yes|''], [
+    AC_MSG_CHECKING(native coroutine implementation for ${target_cpu}-${target_os})
+    rb_cv_coroutine=
+    AS_CASE(["$target_cpu-$target_os"],
+        [x*64-darwin*], [
+            rb_cv_coroutine=amd64
+        ],
+        [arm64-darwin*], [
+            rb_cv_coroutine=arm64
+        ],
+        [x*64-linux*], [
+            AS_CASE(["$ac_cv_sizeof_voidp"],
+                [8], [ rb_cv_coroutine=amd64 ],
+                [4], [ rb_cv_coroutine=x86 ],
+                dnl unknown pointer size, bail out as no Context.h soon.
+            )
+        ],
+        [*86-linux*], [
+            rb_cv_coroutine=x86
+        ],
+        [x64-mingw32], [
+            rb_cv_coroutine=win64
+        ],
+        [*86-mingw32], [
+            rb_cv_coroutine=win32
+        ],
+        [arm*-linux*], [
+            rb_cv_coroutine=arm32
+        ],
+        [aarch64-linux*], [
+            rb_cv_coroutine=arm64
+        ],
+        [powerpc64le-linux*], [
+            rb_cv_coroutine=ppc64le
+        ],
+        [x86_64-openbsd*], [
+            rb_cv_coroutine=amd64
+        ],
+        [i386-openbsd*], [
+            rb_cv_coroutine=x86
+        ],
+        [*-openbsd*], [
+            rb_cv_coroutine=copy
+        ],
+        [*-haiku*], [
+            rb_cv_coroutine=copy
+        ],
+        [
+            rb_cv_coroutine=ucontext
+        ]
+    )
+    AC_MSG_RESULT(${rb_cv_coroutine})
+])
+COROUTINE_H=coroutine/$rb_cv_coroutine/Context.h
+AS_IF([test ! -f "$srcdir/$COROUTINE_H"],
+      [AC_MSG_ERROR('$rb_cv_coroutine' is not supported as coroutine)])
+AS_CASE([$rb_cv_coroutine],
+    [copy|ucontext], [
+        COROUTINE_SRC=coroutine/$rb_cv_coroutine/Context.c
+    ],
+    [
+        COROUTINE_SRC=coroutine/$rb_cv_coroutine/Context.'$(ASMEXT)'
+    ]
+)
+AC_DEFINE_UNQUOTED(COROUTINE_H, ["$COROUTINE_H"])
+AC_SUBST(X_COROUTINE_H, [$COROUTINE_H])
+AC_SUBST(X_COROUTINE_SRC, [$COROUTINE_SRC])
+
+AS_IF([test x"$enable_pthread" = xyes], [
+    for pthread_lib in thr pthread pthreads c c_r root; do
+	AC_CHECK_LIB($pthread_lib, pthread_create,
+		     rb_with_pthread=yes, rb_with_pthread=no)
+	AS_IF([test "$rb_with_pthread" = "yes"], [break])
+    done
+    AS_IF([test x"$rb_with_pthread" = xyes], [
+	AC_DEFINE(_REENTRANT)
+	AC_DEFINE(_THREAD_SAFE)
+	AC_DEFINE(HAVE_LIBPTHREAD)
+	AC_CHECK_HEADERS(pthread_np.h, [], [], [@%:@include <pthread.h>])
+	AS_CASE(["$pthread_lib:$target_os"],
+		[c:*], [],
+		[root:*], [],
+		[c_r:*|*:openbsd*|*:mirbsd*],  [LIBS="-pthread $LIBS"],
+		[LIBS="-l$pthread_lib $LIBS"])
+    ], [
+	AC_MSG_WARN("Don't know how to find pthread library on your system -- thread support disabled")
+    ])
+    AC_CACHE_CHECK([whether pthread_t is scalar type], [rb_cv_scalar_pthread_t], [
+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+	    @%:@include <pthread.h>
+	    ]], [[
+	    pthread_t thread_id;
+	    thread_id = 0;
+	    if (!thread_id) return 0;
+	    ]])],[rb_cv_scalar_pthread_t=yes],[rb_cv_scalar_pthread_t=no])
+    ])
+    AS_IF([test x"$rb_cv_scalar_pthread_t" = xyes], [
+	: # RUBY_CHECK_SIZEOF(pthread_t, [void* int long], [], [@%:@include <pthread.h>])
+    ], [
+	AC_DEFINE(NON_SCALAR_THREAD_ID)
+    ])
+    AC_CHECK_FUNCS(sched_yield pthread_attr_setinheritsched \
+	pthread_attr_get_np pthread_attr_getstack pthread_attr_getguardsize \
+	pthread_get_stackaddr_np pthread_get_stacksize_np \
+	thr_stksegment pthread_stackseg_np pthread_getthrds_np \
+	pthread_condattr_setclock \
+	pthread_sigmask pthread_setname_np pthread_set_name_np)
+    AS_CASE(["$target_os"],[aix*],[ac_cv_func_pthread_getattr_np=no],[AC_CHECK_FUNCS(pthread_getattr_np)])
+    set_current_thread_name=
+    AS_IF([test "$ac_cv_func_pthread_setname_np" = yes], [
+	AC_CACHE_CHECK([arguments of pthread_setname_np], [rb_cv_func_pthread_setname_np_arguments],
+	    [rb_cv_func_pthread_setname_np_arguments=
+	    # Linux,AIX,  (pthread_self(), name)
+	    # NetBSD (pthread_self(), \"%s\", name)
+	    # Darwin (name)
+	    for mac in \
+		"(pthread_self(), name)" \
+		"(pthread_self(), \"%s\", name)" \
+		"(name)" \
+		; do
+		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+		    @%:@include <pthread.h>
+		    @%:@ifdef HAVE_PTHREAD_NP_H
+		    @%:@include <pthread_np.h>
+		    @%:@endif
+		    @%:@define SET_THREAD_NAME(name) pthread_setname_np${mac}
+		    ]],
+		    [[if (SET_THREAD_NAME("conftest")) return 1;]])],
+		    [rb_cv_func_pthread_setname_np_arguments="${mac}"
+		    break])
+	    done
+	    ]
+	)
+	AS_IF([test -n "${rb_cv_func_pthread_setname_np_arguments}"], [
+	    set_current_thread_name="pthread_setname_np${rb_cv_func_pthread_setname_np_arguments}"
+	])
+    ], [test "$ac_cv_func_pthread_set_name_np" = yes], [
+	set_current_thread_name="pthread_set_name_np(pthread_self(), name)"
+    ])
+    AS_IF([test -n "$set_current_thread_name"], [
+	AC_DEFINE_UNQUOTED(SET_CURRENT_THREAD_NAME(name), $set_current_thread_name)
+	AS_CASE([$set_current_thread_name],
+	    [*'pthread_self()'*], [
+		set_another_thread_name=`echo "$set_current_thread_name" | sed 's/pthread_self()/thid/'`
+		AC_DEFINE_UNQUOTED(SET_ANOTHER_THREAD_NAME(thid,name), $set_another_thread_name)
+	    ])
+    ])
+])
+
+AS_IF([test x"$ac_cv_header_ucontext_h" = xno], [
+    AC_CACHE_CHECK([if signal.h defines ucontext_t], [rb_cv_ucontext_in_signal_h],
+	[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <signal.h>]],
+					    [[size_t size = sizeof(ucontext_t);]])],
+	[rb_cv_ucontext_in_signal_h=yes], [rb_cv_ucontext_in_signal_h=no])])
+    AS_IF([test x"$rb_cv_ucontext_in_signal_h" = xyes], [
+	    AC_DEFINE_UNQUOTED(UCONTEXT_IN_SIGNAL_H, 1)
+    ])
+])
+AS_IF([test x"$ac_cv_header_ucontext_h" = xyes -o x"$rb_cv_ucontext_in_signal_h" = xyes], [
+    AC_CACHE_CHECK([if mcontext_t is a pointer], [rb_cv_mcontext_t_ptr],
+	[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+	    @%:@include <signal.h>
+	    @%:@ifdef HAVE_UCONTEXT_H
+	    @%:@include <ucontext.h>
+	    @%:@endif
+        mcontext_t test(mcontext_t mc) {return mc+1;}
+	  ]],
+	  [[test(0);]])],
+	[rb_cv_mcontext_t_ptr=yes], [rb_cv_mcontext_t_ptr=no])])
+    AS_IF([test x"$rb_cv_mcontext_t_ptr" = xyes], [
+	AC_DEFINE_UNQUOTED(DEFINE_MCONTEXT_PTR(mc, uc), mcontext_t mc = (uc)->uc_mcontext)
+    ], [
+	AC_DEFINE_UNQUOTED(DEFINE_MCONTEXT_PTR(mc, uc), mcontext_t *mc = &(uc)->uc_mcontext)
+    ])
+    AS_IF([test x"$rb_with_pthread" = xyes], [
+	AC_CHECK_FUNCS(getcontext setcontext)
+    ])
+])
+
+AS_IF([test "$ac_cv_func_fork_works" = "yes" -a "$rb_with_pthread" = "yes"], [
+    AC_CACHE_CHECK([if fork works with pthread], rb_cv_fork_with_pthread,
+	[AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#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;
+	}
+        if (!WIFEXITED(loc) || WEXITSTATUS(loc) != EXIT_SUCCESS)
+           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)
+])
+}
+
+: "runtime section" && {
+dnl wheather use dln_a_out or not
+AC_ARG_WITH(dln-a-out,
+	AS_HELP_STRING([--with-dln-a-out], [use dln_a_out if possible]),
+	[
+	AS_CASE([$withval],
+	[yes], [
+	    AS_IF([test "$enable_shared" = yes], [
+		AC_MSG_ERROR(dln_a_out can not make shared library)
+	    ])
+	    with_dln_a_out=yes],
+	[
+	    with_dln_a_out=no])], [with_dln_a_out=no])
+
+AC_CACHE_CHECK(whether ELF binaries are produced, rb_cv_binary_elf,
+[AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[
+AS_CASE(["`head -1 conftest$EXEEXT | tr -dc '\177ELF' | tr '\177' .`"],
+[.ELF*], [rb_cv_binary_elf=yes], [rb_cv_binary_elf=no])],
+rb_cv_binary_elf=no)])
+
+AS_IF([test "$rb_cv_binary_elf" = yes], [
+  AC_DEFINE(USE_ELF)
+  AS_IF([test "$with_dln_a_out" = yes], [
+    AC_MSG_ERROR(dln_a_out does not work with ELF)
+  ])
+  AC_CHECK_HEADERS([elf.h elf_abi.h])
+  AS_IF([test $ac_cv_header_elf_h = yes -o $ac_cv_header_elf_abi_h = yes], [
+    AC_LIBOBJ([addr2line])
+    AC_CHECK_LIB([z], [uncompress])
+  ])
+])
+
+AC_CHECK_HEADERS([mach-o/loader.h])
+AS_IF([test "$ac_cv_header_mach_o_loader_h" = yes], [
+  AC_LIBOBJ([addr2line])
+])
+
+AS_CASE(["$target_os"],
+[linux* | gnu* | k*bsd*-gnu | bsdi* | kopensolaris*-gnu], [
+    AS_IF([test "$rb_cv_binary_elf" = no], [
+	with_dln_a_out=yes
+    ], [
+	LDFLAGS="$LDFLAGS -rdynamic"
+    ])])
+LIBEXT=a
+
+AC_ARG_WITH(mjit-tabs,
+    AS_HELP_STRING([--without-mjit-tabs], [expand tabs in mjit header]),
+    [AS_IF([test $withval = no], [MJIT_TABS=false])])
+AC_SUBST(MJIT_TABS)dnl
+AC_SUBST(DLDFLAGS)dnl
+AC_SUBST(ARCH_FLAG)dnl
+AC_SUBST(MJIT_HEADER_FLAGS)dnl
+AC_SUBST(MJIT_HEADER_INSTALL_DIR)dnl
+AC_SUBST(MJIT_CC)dnl
+AS_IF([test "$GCC" = "yes"], [
+    AS_CASE(["$target_os"],[aix*],[mjit_std_cflag="-std=gnu99"])
+])
+AC_SUBST(MJIT_CFLAGS, [${MJIT_CFLAGS-"-w ${mjit_std_cflag} ${orig_cflags}"}])dnl
+AC_SUBST(MJIT_OPTFLAGS, [${MJIT_OPTFLAGS-'$(optflags)'}])dnl
+AC_SUBST(MJIT_DEBUGFLAGS, [${MJIT_DEBUGFLAGS-'$(debugflags)'}])dnl
+AC_SUBST(MJIT_LDSHARED)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
+AC_SUBST(ASMEXT, S)dnl
+
+STATIC=
+
+AS_IF([test "$with_dln_a_out" != yes], [
+  rb_cv_dlopen=unknown
+  AC_MSG_CHECKING(whether OS depend dynamic link works)
+  AS_IF([test "$GCC" = yes], [
+    AS_CASE(["$target_os"],
+    [darwin*], [
+      # The -fno-common is needed if we wish to embed the Ruby interpreter
+      # into a plugin module of some project (as opposed to embedding it
+      # within the project's application).  The -I/usr/local/include is
+      # needed because CPP as discovered by configure (cc -E -traditional)
+      # fails to consult /usr/local/include by default.  This causes
+      # mkmf.rb's have_header() to fail if the desired resource happens to be
+      # installed in the /usr/local tree.
+      RUBY_APPEND_OPTION(CCDLFLAGS, -fno-common)],
+    [bsdi*|cygwin*|mingw*|aix*|interix*], [ ],
+    [
+      RUBY_APPEND_OPTION(CCDLFLAGS, -fPIC)])
+  ], [
+    AS_CASE(["$target_os"],
+	[hpux*],          [CCDLFLAGS="$CCDLFLAGS +Z"],
+	[solaris*|irix*], [CCDLFLAGS="$CCDLFLAGS -KPIC"],
+	[sunos*],         [CCDLFLAGS="$CCDLFLAGS -PIC"],
+	[esix*|uxpds*],   [CCDLFLAGS="$CCDLFLAGS -KPIC"],
+	                  [: ${CCDLFLAGS=""}])
+  ])
+
+
+  AC_ARG_ENABLE(rpath,
+       AS_HELP_STRING([--enable-rpath], [embed run path into extension libraries.
+       enabled by default on ELF platforms]),
+       [enable_rpath=$enableval], [enable_rpath="$rb_cv_binary_elf"])
+
+  AS_CASE(["$target_os"],
+	[hpux*], [	DLDFLAGS="$DLDFLAGS -E"
+			: ${LDSHARED='$(LD) -b'}
+			XLDFLAGS="$XLDFLAGS -Wl,-E"
+			: ${LIBPATHENV=SHLIB_PATH}
+			rb_cv_dlopen=yes],
+	[solaris*], [	AS_IF([test "$GCC" = yes], [
+			    : ${LDSHARED='$(CC) -shared'}
+			    AS_IF([test "$rb_cv_prog_gnu_ld" = yes], [
+				LDFLAGS="$LDFLAGS -Wl,-E"
+			    ])
+			], [
+			    : ${LDSHARED='$(CC) -G'}
+			])
+			AS_IF([test "$ac_cv_sizeof_voidp" = 8], [
+			    : ${LIBPATHENV=LD_LIBRARY_PATH_64}
+			    : ${PRELOADENV=LD_PRELOAD_64}
+			], [
+			    : ${LIBPATHENV=LD_LIBRARY_PATH_32}
+			    : ${PRELOADENV=LD_PRELOAD_32}
+			])
+			rb_cv_dlopen=yes],
+	[sunos*], [	: ${LDSHARED='$(LD) -assert nodefinitions'}
+			rb_cv_dlopen=yes],
+	[irix*], [	: ${LDSHARED='$(LD) -shared'}
+			rb_cv_dlopen=yes],
+	[sysv4*], [	: ${LDSHARED='$(LD) -G'}
+			rb_cv_dlopen=yes],
+	[nto-qnx*], [	: ${LDSHARED='$(CC) -shared'}
+			rb_cv_dlopen=yes],
+	[esix*|uxpds*], [ : ${LDSHARED='$(LD) -G'}
+			rb_cv_dlopen=yes],
+	[osf*], [	: ${LDSHARED='$(LD) -shared -expect_unresolved "*"'}
+			rb_cv_dlopen=yes],
+	[bsdi3*], [	AS_CASE(["$CC"],
+			[*shlicc*], [	: ${LDSHARED='$(CC) -r'}
+					rb_cv_dlopen=yes])],
+	[linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | kopensolaris*-gnu | haiku*], [
+			: ${LDSHARED='$(CC) -shared'}
+			AS_IF([test "$rb_cv_binary_elf" = yes], [
+			    LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
+			])
+			rb_cv_dlopen=yes],
+	[interix*], [	: ${LDSHARED='$(CC) -shared'}
+			XLDFLAGS="$XLDFLAGS -Wl,-E"
+			LIBPATHFLAG=" -L%1\$-s"
+			rb_cv_dlopen=yes],
+	[freebsd*|dragonfly*], [
+			: ${LDSHARED='$(CC) -shared'}
+			AS_IF([test "$rb_cv_binary_elf" = yes], [
+			    LDFLAGS="$LDFLAGS -rdynamic"
+			    DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$@'
+			], [
+			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable'
+			])
+			rb_cv_dlopen=yes],
+	[openbsd*|mirbsd*], [	: ${LDSHARED='$(CC) -shared ${CCDLFLAGS}'}
+			AS_IF([test "$rb_cv_binary_elf" = yes], [
+			    LDFLAGS="$LDFLAGS -Wl,-E"
+			])
+			rb_cv_dlopen=yes],
+	[darwin*], [	: ${LDSHARED='$(CC) -dynamic -bundle'}
+			: ${DLDSHARED='$(CC) -dynamiclib'}
+			: ${LDFLAGS=""}
+			: ${LIBPATHENV=DYLD_FALLBACK_LIBRARY_PATH}
+			: ${PRELOADENV=DYLD_INSERT_LIBRARIES}
+                        AS_IF([test x"$enable_shared" = xyes], [
+                            # Resolve symbols from libruby.dylib when --enable-shared
+                            EXTDLDFLAGS='$(LIBRUBYARG_SHARED)'
+                        ], [test "x$EXTSTATIC" = x], [
+                            # When building exts as bundles, a mach-o bundle needs to know its loader
+                            # program to bind symbols from the ruby executable
+                            EXTDLDFLAGS="-bundle_loader '\$(BUILTRUBY)'"
+			])
+			rb_cv_dlopen=yes],
+        [aix*], [	: ${LDSHARED='$(CC)'}
+			AS_IF([test "$GCC" = yes], [
+			    LDSHARED="$LDSHARED ${linker_flag}-G -shared"
+			], [
+			    LDSHARED="$LDSHARED ${linker_flag}-G"
+			])
+			EXTDLDFLAGS='-e$(TARGET_ENTRY)'
+			XLDFLAGS="${linker_flag}"'-bE:$(ARCHFILE)'" ${linker_flag}-brtl"
+			XLDFLAGS="$XLDFLAGS ${linker_flag}-blibpath:${prefix}/lib:${LIBPATH:-/usr/lib:/lib}"
+			: ${ARCHFILE="ruby.imp"}
+                        TRY_LINK='$(CC) -oconftest $(INCFLAGS) -I$(hdrdir) $(CPPFLAGS)'
+                        TRY_LINK="$TRY_LINK"' $(CFLAGS) $(src) $(LIBPATH) $(LDFLAGS) $(LOCAL_LIBS) $(LIBS)'
+			: ${LIBPATHENV=LIBPATH}
+			: ${PRELOADENV=LDR_PRELOAD}
+			rb_cv_dlopen=yes],
+	[nto-qnx*], [	DLDFLAGS="$DLDFLAGS -L/lib -L/usr/lib -L/usr/local/lib"
+			: ${LDSHARED='$(LD) -Bshareable -x'}
+			LDFLAGS="$LDFLAGS -L/lib -L/usr/lib -L/usr/local/lib"
+			rb_cv_dlopen=yes],
+	[cygwin*|mingw*], [
+			: ${LDSHARED='$(CC) -shared'}
+			XLDFLAGS="$XLDFLAGS -Wl,--stack,0x00200000,--enable-auto-import"
+			DLDFLAGS="${DLDFLAGS} -Wl,--enable-auto-image-base,--enable-auto-import"
+			: ${LIBPATHENV=PATH}
+			: ${PRELOADENV=""}
+			rb_cv_dlopen=yes],
+	[hiuxmpp], [	: ${LDSHARED='$(LD) -r'}],
+	[atheos*], [	: ${LDSHARED='$(CC) -shared'}
+			rb_cv_dlopen=yes],
+	[	: ${LDSHARED='$(LD)'}])
+  AC_MSG_RESULT($rb_cv_dlopen)
+
+  AS_IF([test "$rb_cv_dlopen" = yes], [
+    AS_CASE(["$target_os"],
+      [darwin*], [
+        AC_SUBST(ADDITIONAL_DLDFLAGS, "")
+	for flag in \
+	  "-multiply_defined suppress" \
+	  "-undefined dynamic_lookup" \
+	  ; do
+      test "x${linker_flag}" = x || flag="${linker_flag}`echo ${flag} | tr ' ' ,`"
+      RUBY_TRY_LDFLAGS([$flag], [], [flag=])
+      AS_IF([test x"$flag" = x], [continue])
+
+      AC_MSG_CHECKING([whether $flag is accepted for bundle])
+      : > conftest.c
+      AS_IF([${LDSHARED/'$(CC)'/$CC} -o conftest.bundle $flag conftest.c >/dev/null 2>conftest.err &&
+          test ! -s conftest.err], [
+          AC_MSG_RESULT([yes])
+          RUBY_APPEND_OPTIONS(DLDFLAGS, [$flag])
+      ], [
+          AC_MSG_RESULT([no])
+          RUBY_APPEND_OPTIONS(ADDITIONAL_DLDFLAGS, [$flag])
+      ])
+      rm -fr conftest.*
+	done
+      ])
+  ])
+
+  AS_IF([test "$enable_rpath:${RPATHFLAG}" = yes:], [
+      AS_IF([test "x$rpathflag" != x], [
+	  RPATHFLAG=" ${rpathflag}%1\$-s"
+      ])
+  ])
+])
+AS_IF([test "${LDSHAREDXX}" = ""], [
+    AS_CASE(["${LDSHARED}"],
+	[*'$(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" "*], [
+	    ])
+])
+AS_CASE([${RPATHFLAG}],[*'%1$'*],[: ${LIBPATHFLAG=' -L%1$-s'}],[: ${LIBPATHFLAG=' -L%s'}])
+
+AC_SUBST(LINK_SO)
+AC_SUBST(LIBPATHFLAG)
+AC_SUBST(RPATHFLAG)
+AC_SUBST(LIBPATHENV, "${LIBPATHENV-LD_LIBRARY_PATH}")
+AC_SUBST(PRELOADENV, "${PRELOADENV-LD_PRELOAD}")
+AC_SUBST(TRY_LINK)
+
+AS_IF([test "x$OPT_DIR" != x], [
+    pat=`echo "${LDFLAGS_OPTDIR}" | sed ['s/[][\\.*|]/\\\\&/']`
+    LDFLAGS=`echo "${LDFLAGS}" | sed "s| ${pat}||"`
+    val=`IFS="$PATH_SEPARATOR"
+        for dir in $OPT_DIR; do
+            echo x ${LIBPATHFLAG} ${RPATHFLAG} |
+            sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${dir}/lib${IFS}g;s${IFS}%s${IFS}${dir}/lib${IFS}g"
+        done | tr '\012' ' ' | sed 's/ *$//'`
+    AS_IF([test x"$val" != x], [
+	test x"${LDFLAGS}" = x || LDFLAGS="$LDFLAGS "
+	LDFLAGS="$LDFLAGS$val"
+	test x"${DLDFLAGS}" = x || DLDFLAGS="$DLDFLAGS "
+	DLDFLAGS="$DLDFLAGS$val"
+    ])
+    LDFLAGS_OPTDIR="$val"
+])
+
+AS_CASE(["$target_os"],
+[freebsd*], [
+    AC_CHECK_LIB([procstat], [procstat_open_sysctl])
+    AS_IF([test "x$ac_cv_lib_procstat_procstat_open_sysctl" = xyes], [
+	AC_CHECK_FUNCS(procstat_getvmmap)
+    ])
+    ])
+AS_CASE(["$target_cpu-$target_os"],
+[*-darwin*], [
+    AC_CHECK_HEADERS([libproc.h])
+    AC_CHECK_HEADERS([execinfo.h])
+    AS_IF([test "x$ac_cv_header_execinfo_h" = xyes], [
+	AC_CHECK_LIB([execinfo], [backtrace])
+	AC_CHECK_HEADERS([libunwind.h])
+    ])],
+[*-freebsd*|x86_64-netbsd*], [
+    AC_CHECK_HEADERS([execinfo.h])
+    AS_IF([test "x$ac_cv_header_execinfo_h" = xyes], [
+	AC_CHECK_LIB([execinfo], [backtrace])
+	AC_CHECK_LIB([unwind], [unw_backtrace])
+    ])])
+AC_CHECK_FUNCS(backtrace)
+
+AS_IF([test "x$ac_cv_func_backtrace" = xyes], [
+  AC_CACHE_CHECK(for broken backtrace, rb_cv_broken_backtrace,
+    [AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <signal.h>
+#include <execinfo.h>
+
+]`grep '^@%:@ *define  *RUBY_SIGALTSTACK_SIZE' ${srcdir}/signal.c`[
+#define TRACE_SIZE 256
+
+void sigsegv(int signum, siginfo_t *info, void *ctx){
+    void *trace[TRACE_SIZE];
+    int n = backtrace(trace, TRACE_SIZE);
+    if (n > 0) {
+	/*fprintf(stdout, "backtrace:%d\n",n);*/
+    } else {
+	_exit(EXIT_FAILURE);
+    }
+    _exit(EXIT_SUCCESS);
+}
+int
+main(void)
+{
+    volatile int *a = NULL;
+    stack_t ss;
+    struct sigaction sa;
+
+    ss.ss_sp = malloc(RUBY_SIGALTSTACK_SIZE);
+    if (ss.ss_sp == NULL) {
+	fprintf(stderr, "cannot allocate memory for sigaltstack\n");
+	return EXIT_FAILURE;
+    }
+    ss.ss_size = RUBY_SIGALTSTACK_SIZE;
+    ss.ss_flags = 0;
+    if (sigaltstack(&ss, NULL) == -1) {
+	fprintf(stderr, "sigaltstack failed\n");
+	return EXIT_FAILURE;
+    }
+    memset(&sa, 0, sizeof(struct sigaction));
+    sigemptyset(&sa.sa_mask);
+    sa.sa_sigaction = sigsegv;
+    sa.sa_flags |= SA_SIGINFO;
+    sa.sa_flags |= SA_ONSTACK;
+    sigaction(SIGSEGV, &sa, NULL);
+    a[0] = 1;
+    return EXIT_SUCCESS;
+}
+]])],
+	rb_cv_broken_backtrace=no,
+	rb_cv_broken_backtrace=yes,
+	rb_cv_broken_backtrace=no)])
+  AS_IF([test "$rb_cv_broken_backtrace" = yes], [
+    AC_DEFINE(BROKEN_BACKTRACE, 1)
+  ])
+])
+
+AC_ARG_WITH(valgrind,
+        AS_HELP_STRING([--without-valgrind],[disable valgrind memcheck support]),
+        [], with_valgrind=yes)
+AS_IF([test x$with_valgrind != xno],
+        [AC_CHECK_HEADERS(valgrind/memcheck.h)])
+
+dln_a_out_works=no
+AS_IF([test "$ac_cv_header_a_out_h" = yes], [
+  AS_IF([test "$with_dln_a_out" = yes || test "$rb_cv_dlopen" = unknown], [
+    cat confdefs.h > config.h
+    AC_CACHE_CHECK(whether matz's dln works, rb_cv_dln_a_out,
+    [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#define USE_DLN_A_OUT
+#include "dln.c"
+]], [[]])],
+	rb_cv_dln_a_out=yes,
+	rb_cv_dln_a_out=no)])
+    AS_IF([test "$rb_cv_dln_a_out" = yes], [
+      dln_a_out_works=yes
+      AC_DEFINE(USE_DLN_A_OUT)
+    ])
+  ])
+])
+
+AS_IF([test "$dln_a_out_works" = yes], [
+  AS_IF([test "$GCC" = yes], [
+    STATIC=-static
+  ], [
+    STATIC=-Bstatic
+  ])
+  DLEXT=so
+  CCDLFLAGS=
+], [
+  AS_CASE(["$target_os"],
+    [hpux*], [
+	DLEXT=sl],
+    [darwin*], [
+	SOEXT=dylib
+	DLEXT=bundle],
+    [cygwin*|mingw*|*djgpp*], [
+	LOAD_RELATIVE=1
+	SOEXT=dll
+	DLEXT=so],
+    [
+	DLEXT=so])
+])
+: ${SOEXT="${DLEXT}"}
+AC_SUBST(SOEXT)
+AS_IF([test "$rb_cv_dlopen:$load_relative" = yes:yes], [
+    AS_IF([test "$ac_cv_func_dladdr" = yes], [
+	LOAD_RELATIVE=1
+    ])
+])
+AS_IF([test x"$LOAD_RELATIVE" = x1], [
+    load_relative=yes
+], [
+    unset load_relative
+])
+
+len=2 # .rb
+n=`expr "$DLEXT"  : '.*'`; test "$n" -gt "$len" && len=$n
+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)
+
+AS_IF([test "$with_dln_a_out" = yes], [
+  STRIP=true
+], [
+    AC_MSG_CHECKING([for $STRIP flags])
+    AC_LINK_IFELSE([AC_LANG_PROGRAM], [AS_IF(
+        ["${STRIP}" -A -n conftest$ac_exeext 2>/dev/null], [
+            AC_MSG_RESULT([-A -n])
+            STRIP="${STRIP} -A -n"
+        ],
+        ["${STRIP}" -S -x conftest$ac_exeext 2>/dev/null], [
+            AC_MSG_RESULT([-S -x])
+            STRIP="${STRIP} -S -x"
+        ], [
+            AC_MSG_RESULT([none needed])
+        ])
+    ])
+])
+
+
+AC_ARG_WITH(ext,
+            AS_HELP_STRING([--with-ext=EXTS],
+                           [pass to --with-ext option of extmk.rb]))
+AC_ARG_WITH(out-ext,
+            AS_HELP_STRING([--with-out-ext=EXTS],
+                           [pass to --without-ext option of extmk.rb]))
+EXTSTATIC=
+AC_SUBST(EXTSTATIC)dnl
+AC_ARG_WITH(static-linked-ext,
+	    AS_HELP_STRING([--with-static-linked-ext], [link external modules statically]),
+            [AS_CASE([$withval],[yes],[STATIC=;EXTSTATIC=static],[no],[],[EXTSTATIC="$withval"])])
+AS_CASE([",$EXTSTATIC,"], [,static,|*,enc,*], [
+  ENCOBJS='enc/encinit.$(OBJEXT) enc/libenc.$(LIBEXT) enc/libtrans.$(LIBEXT)'
+  EXTOBJS='ext/extinit.$(OBJEXT)'
+  AC_DEFINE_UNQUOTED(EXTSTATIC, 1)
+  AC_SUBST(ENCSTATIC, static)
+], [
+  ENCOBJS='dmyenc.$(OBJEXT)'
+  EXTOBJS='dmyext.$(OBJEXT)'
+])
+AC_SUBST(ENCOBJS)
+AC_SUBST(EXTOBJS)
+
+AC_ARG_WITH(setup,
+	    AS_HELP_STRING([--with-setup=SETUP], [use extension libraries setup]),
+	    [setup=$withval])
+AS_IF([test -n "$setup"], [
+    AS_IF([! test -f "ext/$setup" -o -f "$srcdir/ext/$setup"], [
+	AC_MSG_ERROR(Setup file $setup not found under ext or $srcdir/ext)
+    ])
+], [test -f "$srcdir/ext/Setup.$target_os"], [
+    setup="Setup.$target_os"
+], [
+    setup=
+    for file in "$srcdir"/ext/Setup.*; do
+	AS_CASE(["$file"], [*~|*.bak|*.orig|*.rej|*.tmp], [continue])
+	setup=`basename "$file"`
+	AS_CASE(["$target_os"], [`expr "$setup" : 'Setup.\(.*\)'`*], [break])
+	platform=`sed '/^option  *platform  */!d;s///;s/|/*|/g;q' "$file"`
+	AS_IF([test "x$platform" != x], [
+	    eval "AS_CASE([\"\$target_os\"], [$platform*], [break])"
+	])
+	setup=
+    done
+    : ${setup:=Setup}
+])
+AC_SUBST(setup)
+
+rubylibprefix='${libdir}/${RUBY_BASE_NAME}'
+AC_ARG_WITH(rubylibprefix,
+	    AS_HELP_STRING([--with-rubylibprefix=DIR], [prefix for ruby libraries [[LIBDIR/RUBY_BASE_NAME]]]),
+	    [AS_IF([test "x$withval" = xno], [
+		AC_MSG_ERROR([No ruby, No libprefix])
+	    ])
+	    rubylibprefix="$withval"])
+AC_SUBST(rubylibprefix)
+
+AS_IF([test x"${exec_prefix}" != xNONE], [
+    RUBY_EXEC_PREFIX="$exec_prefix"
+], [test x"$prefix" != xNONE], [
+    RUBY_EXEC_PREFIX="$prefix"
+], [
+    RUBY_EXEC_PREFIX=$ac_default_prefix
+])
+pat=`echo "${RUBY_EXEC_PREFIX}" | tr -c '\012' .`'\(.*\)'
+for var in bindir libdir rubylibprefix; do
+    eval val='"$'$var'"'
+    AS_CASE(["$val"], ["${RUBY_EXEC_PREFIX}"*], [val='${exec_prefix}'"`expr \"$val\" : \"$pat\"`"])
+    eval $var='"$val"'
+done
+
+BTESTRUBY='$(MINIRUBY)'
+BOOTSTRAPRUBY='$(BASERUBY)'
+AS_IF([test x"$cross_compiling" = xyes], [
+  test x"$MINIRUBY" = x && MINIRUBY="${RUBY-$BASERUBY} -I`$CHDIR .; pwd` "-r'$(arch)-fake'
+  XRUBY_LIBDIR=`${RUBY-$BASERUBY} -rrbconfig -e ['puts RbConfig::CONFIG["libdir"]']`
+  XRUBY_RUBYLIBDIR=`${RUBY-$BASERUBY} -rrbconfig -e ['puts RbConfig::CONFIG["rubylibdir"]']`
+  XRUBY_RUBYHDRDIR=`${RUBY-$BASERUBY} -rrbconfig -e ['puts RbConfig::CONFIG["rubyhdrdir"]']`
+  AC_SUBST(XRUBY_LIBDIR)
+  AC_SUBST(XRUBY_RUBYLIBDIR)
+  AC_SUBST(XRUBY_RUBYHDRDIR)
+  PREP='$(arch)-fake.rb'
+  RUNRUBY_COMMAND='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`'
+  RUNRUBY='$(RUNRUBY_COMMAND)'
+  XRUBY='$(MINIRUBY)'
+  TEST_RUNNABLE=no
+  CROSS_COMPILING=yes
+  AC_DEFINE(CROSS_COMPILING, 1)
+], [
+  MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib -I.'
+  MINIRUBY="$MINIRUBY"' -I$(EXTOUT)/common'
+  PREP='miniruby$(EXEEXT)'
+  RUNRUBY_COMMAND='$(MINIRUBY) $(tooldir)/runruby.rb --extout=$(EXTOUT) $(RUNRUBYOPT)'
+  RUNRUBY='$(RUNRUBY_COMMAND) --'
+  XRUBY='$(RUNRUBY)'
+  AS_CASE(["$HAVE_BASERUBY:$build_os"], [no:*|*:mingw*], [BOOTSTRAPRUBY='$(MINIRUBY)'])
+  TEST_RUNNABLE=yes
+  CROSS_COMPILING=no
+])
+AC_SUBST(TEST_RUNNABLE)
+AC_SUBST(CROSS_COMPILING)
+AC_SUBST(MINIRUBY)
+AC_SUBST(BTESTRUBY)
+AC_SUBST(PREP)
+AC_SUBST(RUNRUBY_COMMAND)
+AC_SUBST(RUNRUBY)
+AC_SUBST(XRUBY)
+AC_SUBST(BOOTSTRAPRUBY)
+AC_SUBST(EXTOUT, [${EXTOUT=.ext}])
+
+FIRSTMAKEFILE=""
+LIBRUBY_A='lib$(RUBY_SO_NAME)-static.a'
+LIBRUBY='$(LIBRUBY_A)'
+LIBRUBYARG_STATIC='-l$(RUBY_SO_NAME)-static'
+LIBRUBYARG='$(LIBRUBYARG_STATIC)'
+SOLIBS='$(MAINLIBS)'
+
+AS_CASE(["$target_os"],
+  [cygwin*|mingw*|haiku*|darwin*], [
+    : ${DLDLIBS=""}
+    ],
+  [
+    DLDLIBS="$DLDLIBS -lc"
+    ])
+
+AC_ARG_ENABLE(multiarch,
+	      AS_HELP_STRING([--enable-multiarch], [enable multiarch compatible directories]),
+	      [multiarch=], [unset multiarch])
+AS_IF([test ${multiarch+set}], [
+   AC_DEFINE(ENABLE_MULTIARCH)
+   MJIT_HEADER_INSTALL_DIR=include/'${arch}/${RUBY_VERSION_NAME}'
+], [
+   MJIT_HEADER_INSTALL_DIR=include/'${RUBY_VERSION_NAME}/${arch}'
+])
+
+archlibdir='${libdir}/${arch}'
+sitearchlibdir='${libdir}/${sitearch}'
+archincludedir='${includedir}/${arch}'
+sitearchincludedir='${includedir}/${sitearch}'
+
+AC_ARG_WITH(soname,
+	AS_HELP_STRING([--with-soname=SONAME], [base name of shared library]),
+	[RUBY_SO_NAME=$withval],
+	[
+	    AS_CASE(["$target_os"],
+	    [darwin*], [
+	        RUBY_SO_NAME='$(RUBY_BASE_NAME).$(RUBY_API_VERSION)'
+	    ],
+	    [cygwin*], [
+	        RUBY_SO_NAME='$(RUBY_BASE_NAME)$(MAJOR)$(MINOR)0'
+	    ],
+	    [mingw*], [
+		RUBY_SO_NAME="${rb_cv_msvcrt}"'-$(RUBY_BASE_NAME)$(MAJOR)$(MINOR)0'
+		AS_IF([test x"${target_cpu}" != xi386], [
+		    RUBY_SO_NAME="${target_cpu}-${RUBY_SO_NAME}"
+		])
+	    ],
+	    [RUBY_SO_NAME='$(RUBY_BASE_NAME)'])
+	])
+
+LIBRUBY_LDSHARED=${DLDSHARED=${LDSHARED}}
+LIBRUBY_DLDFLAGS=$DLDFLAGS
+LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(RUBY_PROGRAM_VERSION)'
+LIBRUBY_SONAME='lib$(RUBY_SO_NAME).$(SOEXT).$(RUBY_API_VERSION)'
+LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).$(SOEXT)'
+ENABLE_SHARED=no
+
+AC_ARG_ENABLE(shared,
+       AS_HELP_STRING([--enable-shared], [build a shared library for Ruby]),
+       [enable_shared=$enableval])
+libprefix=${multiarch+'$(archlibdir)'}${multiarch-'$(libdir)'}
+LIBRUBY_RELATIVE=${load_relative-no}
+AS_CASE("$enable_shared", [yes], [
+  LIBRUBY='$(LIBRUBY_SO)'
+  LIBRUBYARG_SHARED='-l$(RUBY_SO_NAME)'
+  LIBRUBYARG='$(LIBRUBYARG_SHARED)'
+  LIBRUBY_RELATIVE=no
+  test -z "$CCDLFLAGS" || CFLAGS="$CFLAGS $CCDLFLAGS"
+  ENABLE_SHARED=yes
+
+  # libdir can be overridden in config.site file (on OpenSUSE at least).
+  libdir_basename=lib
+  AS_IF([test "$bindir" = '${exec_prefix}/bin'], [
+    AS_CASE(["$libdir"], ['${exec_prefix}/'*], [libdir_basename=`basename "$libdir"`])
+  ])
+  AC_DEFINE_UNQUOTED(LIBDIR_BASENAME, ["${libdir_basename}"])
+  libdir_basename="${libdir_basename}"${multiarch+'/${arch}'}
+
+  RUBY_TRY_LDFLAGS([${linker_flag}--no-as-needed], [no_as_needed=yes], [no_as_needed=no])
+  AS_IF([test "$no_as_needed" = yes], [
+      RUBY_APPEND_OPTIONS(LDFLAGS, [${linker_flag}--no-as-needed])
+  ])
+
+  AS_CASE(["$target_os"],
+    [freebsd*|dragonfly*], [],
+    [
+     AS_IF([test "$GCC" = yes], [
+       RUBY_TRY_LDFLAGS([${linker_flag}--no-undefined], [no_undefined=yes], [no_undefined=no])
+       AS_IF([test "no_undefined" = yes], [
+	  RUBY_APPEND_OPTION(EXTLDFLAGS, [${linker_flag}--no-undefined])
+       ])
+     ])
+    ])
+
+  AS_CASE(["$target_os"],
+    [sunos4*], [
+	LIBRUBY_ALIASES='$(LIBRUBY_SONAME) lib$(RUBY_SO_NAME).$(SOEXT)'
+	],
+    [linux* | gnu* | k*bsd*-gnu | atheos* | kopensolaris*-gnu | haiku*], [
+	RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ['-Wl,-soname,$(LIBRUBY_SONAME)' "$LDFLAGS_OPTDIR"])
+	LIBRUBY_ALIASES='$(LIBRUBY_SONAME) lib$(RUBY_SO_NAME).$(SOEXT)'
+	AS_IF([test "$load_relative" = yes], [
+	    libprefix="'\$\${ORIGIN}/../${libdir_basename}'"
+	    LIBRUBY_RPATHFLAGS="-Wl,-rpath,${libprefix}"
+	    LIBRUBY_RELATIVE=yes
+	])
+	],
+    [freebsd*|dragonfly*], [
+	LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)'
+	LIBRUBY_SONAME='$(LIBRUBY_SO)'
+	AS_IF([test "$rb_cv_binary_elf" != "yes" ], [
+	    LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
+	    LIBRUBY_ALIASES=''
+	])
+	],
+    [netbsd*], [
+	LIBRUBY_SONAME='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)'
+	LIBRUBY_SO="${LIBRUBY_SONAME}"'.$(TEENY)'
+	RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ['-Wl,-soname,$(LIBRUBY_SONAME)' "$LDFLAGS_OPTDIR"])
+	AS_IF([test "$rb_cv_binary_elf" = yes], [ # ELF platforms
+	   LIBRUBY_ALIASES='$(LIBRUBY_SONAME) lib$(RUBY_SO_NAME).$(SOEXT)'
+	], [	# a.out platforms
+	   LIBRUBY_ALIASES=""
+	])
+	],
+    [openbsd*|mirbsd*], [
+	LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
+	],
+    [solaris*], [
+	LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)'
+	LIBRUBY_SONAME='lib$(RUBY_SO_NAME).$(SOEXT).$(RUBY_PROGRAM_VERSION)'
+	LIBRUBY_ALIASES='$(LIBRUBY_SONAME) lib$(RUBY_SO_NAME).$(SOEXT)'
+	RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ["${linker_flag}-h${linker_flag:+,}"'$(@F)'])
+	XLDFLAGS="$XLDFLAGS "'-R${libdir}'
+	],
+    [hpux*], [
+	XLDFLAGS="$XLDFLAGS "'-Wl,+s,+b,$(libdir)'
+	LIBRUBY_ALIASES='$(LIBRUBY_SONAME) lib$(RUBY_SO_NAME).$(SOEXT)'
+	],
+    [aix*], [
+	RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ["${linker_flag}-bnoentry" "$XLDFLAGS" "$LDFLAGS_OPTDIR"])
+	LIBRUBYARG_SHARED='-L${libdir} -l${RUBY_SO_NAME}'
+	LIBS="$LIBS -lm -lc"
+	],
+    [darwin*], [
+	LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT)'
+	LIBRUBY_SONAME='$(LIBRUBY_SO)'
+	LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).$(SOEXT)'
+	AS_IF([test "$load_relative" = yes], [
+	    libprefix="@executable_path/../${libdir_basename}"
+	    LIBRUBY_RELATIVE=yes
+	])
+	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS -install_name ${libprefix}"'/$(LIBRUBY_SONAME)'
+	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-compatibility_version $(RUBY_API_VERSION)'
+	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-current_version $(RUBY_PROGRAM_VERSION)'
+	AS_IF([test "$visibility_option" = ld], [
+	    LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-Wl,-unexported_symbol,_Init_*'
+	    LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-Wl,-unexported_symbol,_ruby_static_id_*'
+	    LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-Wl,-unexported_symbol,*_threadptr_*'
+	])
+	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "' $(XLDFLAGS)'
+	],
+    [interix*], [
+	LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
+	],
+    [mingw*|cygwin*|mswin*], [
+	LIBRUBY_RELATIVE=yes
+	])
+], [
+  LIBRUBYARG_SHARED=
+
+  # enable PIE if possible
+  AC_ARG_ENABLE(pie,
+          AS_HELP_STRING([--disable-pie], [disable PIE feature]),
+          [pie=$enableval], [pie=])
+  AS_IF([test "$GCC" = yes -a -z "$EXTSTATIC" -a "x$pie" != xno], [
+    RUBY_TRY_CFLAGS(-fPIE, [pie=yes], [pie=no])
+    AS_IF([test "$pie" = yes], [
+      # Use -fPIE when testing -pie.  RUBY_TRY_LDFLAGS sets
+      # $save_CFLAGS internally, so set other name here.
+      save_CFLAGS_before_pie="$CFLAGS"
+      CFLAGS="$CFLAGS -fPIE"
+
+      # gcc need -pie but clang need -Wl,-pie.
+      for pie in -pie -Wl,-pie; do
+	RUBY_TRY_LDFLAGS([$pie], [], [pie=])
+	AS_IF([test "x$pie" != x], [
+	  RUBY_APPEND_OPTION(XCFLAGS, -fPIE)
+	  RUBY_APPEND_OPTION(XLDFLAGS, $pie)
+	  break
+	])
+      done
+      CFLAGS="$save_CFLAGS_before_pie"
+    ])
+  ])
+])
+AS_IF([test "$enable_rpath" = yes], [
+    test -z "$LIBRUBY_RPATHFLAGS" || LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS "
+    rpathflag="${RPATHFLAG}"
+    AS_CASE(["${cross_compiling}${load_relative}"], [*yes*], [], [rpathflag="$RPATHFLAG$LIBPATHFLAG"])
+    rpathflag=`IFS="$PATH_SEPARATOR"
+        echo x "$rpathflag" |
+        sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${libprefix}${IFS}g"
+    `
+    LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}"
+    LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
+    LIBRUBYARG_STATIC="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_STATIC"
+])
+AC_SUBST(LIBRUBY_RELATIVE)
+
+LDFLAGS="-L. $LDFLAGS"
+AC_SUBST(ARCHFILE)
+
+AS_IF([test "$EXEEXT" = .exe], [
+    EXECUTABLE_EXTS='".exe",".com",".cmd",".bat"'
+    AC_DEFINE_UNQUOTED(EXECUTABLE_EXTS, $EXECUTABLE_EXTS)
+    EXECUTABLE_EXTS=`echo $EXECUTABLE_EXTS | tr -d '"' | tr , ' '`
+    AC_SUBST(EXECUTABLE_EXTS)
+])
+
+AS_CASE("$cross_compiling:${LIBPATHENV}", [yes:* | no:], [], [
+    AC_MSG_CHECKING(whether wrapper for $LIBPATHENV is needed)
+    AS_IF([env ${LIBPATHENV}=/lib /bin/sh -c ': ${'${LIBPATHENV}'?}' 2>/dev/null],
+	[AC_MSG_RESULT(no)],
+	[PREP="$PREP"' exe/$(PROGRAM)'
+	AC_MSG_RESULT(yes)]
+    )
+])
+
+AC_ARG_ENABLE(dtrace,
+        AS_HELP_STRING([--enable-dtrace],
+        [enable DTrace for tracing inside ruby. enabled by default on systems having dtrace]),
+        [enable_dtrace=$enableval], [enable_dtrace=auto])
+
+LIBRUBY_A_OBJS='$(OBJS)'
+DTRACE_REBUILD=
+AS_CASE(["${enable_dtrace}"],
+[yes|auto], [
+    RUBY_DTRACE_AVAILABLE()
+], [
+    rb_cv_dtrace_available=no
+])
+AS_CASE(["$target_os"],[freebsd*],[
+         rb_cv_dtrace_available=no
+	 ])
+AS_IF([test "${enable_dtrace}" = yes], [dnl
+    AS_IF([test -z "$DTRACE"], [dnl
+	AC_MSG_ERROR([dtrace(1) is missing])
+    ], [test "$cross_compiling" = yes], [dnl
+	AC_MSG_ERROR([--enable-dtrace, however, cross compiling])
+    ], [test "${rb_cv_dtrace_available}" = "no"], [dnl
+       AC_MSG_ERROR([--enable-dtrace, however, USDT is not available])
+    ])
+])
+AS_CASE([$rb_cv_dtrace_available],
+[yes*], [dnl
+    RUBY_DTRACE_POSTPROCESS()
+    AS_IF([test "$rb_cv_prog_dtrace_g" != no], [dnl
+	DTRACE_OBJ='probes.$(OBJEXT)'
+    ])
+    AS_IF([test "$rb_cv_prog_dtrace_g" = rebuild], [dnl
+	DTRACE_REBUILD=yes
+	LIBRUBY_A_OBJS='$(DTRACE_GLOMMED_OBJ)'
+    ])
+    AS_CASE("${target_os}", [freebsd*], [dnl
+        # FreeBSD's dtrace requires libelf
+        LIBS="-lelf $LIBS"
+    ])
+    DTRACE_EXT=d
+], [dnl
+    enable_dtrace=no
+    DTRACE_EXT=dmyh
+])
+AC_SUBST(DTRACE_EXT)
+AC_SUBST(DTRACE_OBJ)
+AC_SUBST(DTRACE_REBUILD)
+AC_SUBST(DTRACE_OPT)
+AC_SUBST(LIBRUBY_A_OBJS)
+
+AC_ARG_ENABLE(gcov,
+       AS_HELP_STRING([--enable-gcov], [enable coverage measurement by gcov]),
+       [gcov=yes])
+AS_IF([test x"$gcov" = xyes], [
+    CFLAGS="$CFLAGS -coverage"
+    LDFLAGS="$LDFLAGS -coverage"
+])
+
+RUBY_SETJMP_TYPE
+}
+
+: "build section" && {
+dnl build rdoc index if requested
+RDOCTARGET=""
+CAPITARGET=""
+AC_ARG_ENABLE(install-doc,
+       AS_HELP_STRING([--disable-install-doc], [do not install either rdoc indexes or C API documents during install]),
+       [install_doc=$enableval], [install_doc=yes])
+AC_ARG_WITH(rdoc,
+      AS_HELP_STRING([--with-rdoc=ri,html], [comma/space separated list of RDoc formats to install]),
+      [install_rdoc=`echo ,$withval, | sed 'y/,/ /;s/ ri / rdoc /;s/^ *//;s/ *$//'`], [
+AC_ARG_ENABLE(install-rdoc,
+      AS_HELP_STRING([--disable-install-rdoc], [do not install rdoc indexes during install]),
+      [install_rdoc=$enableval], [install_rdoc=yes])
+])
+AC_ARG_ENABLE(install-capi,
+      AS_HELP_STRING([--disable-install-capi], [do not install C API documents during install]),
+      [install_capi=$enableval], [install_capi=no])
+
+AS_IF([test "$install_doc" != no], [
+    AS_CASE(["$install_rdoc"],
+    [yes], [
+	RDOCTARGET="rdoc"
+    ],
+    [all], [
+	RDOCTARGET="rdoc html"
+    ],
+    [no|''], [
+	RDOCTARGET="nodoc"
+    ],
+    [
+	RDOCTARGET="$install_rdoc"
+    ])
+    AS_IF([test "$install_capi" != no -a -n "$DOXYGEN"], [
+	CAPITARGET="capi"
+    ], [
+	CAPITARGET="nodoc"
+    ])
+], [
+    RDOCTARGET="nodoc"
+    CAPITARGET="nodoc"
+])
+
+AC_SUBST(RDOCTARGET)
+AC_SUBST(CAPITARGET)
+
+AS_CASE(["$RDOCTARGET:$CAPITARGET"],[nodoc:nodoc],[INSTALLDOC=nodoc],[INSTALLDOC=all])
+AC_SUBST(INSTALLDOC)
+
+AC_ARG_ENABLE(jit-support,
+        AS_HELP_STRING([--disable-jit-support], [disable JIT features]),
+        [MJIT_SUPPORT=$enableval
+         AS_IF([test x"$enable_jit_support" = "xyes"],
+                 [AC_DEFINE(USE_MJIT, 1)],
+                 [AC_DEFINE(USE_MJIT, 0)])],
+        [MJIT_SUPPORT=yes
+         AC_DEFINE(USE_MJIT, 1)])
+
+AC_SUBST(MJIT_SUPPORT)
+
+AC_ARG_ENABLE(install-static-library,
+	AS_HELP_STRING([--disable-install-static-library], [do not install static ruby library]),
+	[INSTALL_STATIC_LIBRARY=$enableval],
+	AS_IF([test x"$enable_shared" = xyes],
+	    [INSTALL_STATIC_LIBRARY=no],
+	    [INSTALL_STATIC_LIBRARY=yes]))
+AC_SUBST(INSTALL_STATIC_LIBRARY)
+
+AS_IF([test "$rb_with_pthread" = "yes"], [
+    THREAD_MODEL=pthread
+])
+AC_CACHE_CHECK([for prefix of external symbols], rb_cv_symbol_prefix, [
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[extern void conftest_external(void) {}]], [[]])],[
+	rb_cv_symbol_prefix=`$NM conftest.$ac_objext |
+			     sed -n ['/.*T[ 	]\([^ 	]*\)conftest_external.*/!d;s//\1/p;q']`
+	],
+	[rb_cv_symbol_prefix=''])
+    test -n "$rb_cv_symbol_prefix" || rb_cv_symbol_prefix=NONE
+])
+SYMBOL_PREFIX="$rb_cv_symbol_prefix"
+test "x$SYMBOL_PREFIX" = xNONE && SYMBOL_PREFIX=''
+DLNOBJ=dln.o
+AC_ARG_ENABLE(dln,
+	      AS_HELP_STRING([--disable-dln], [disable dynamic link feature]),
+	      [test "$enableval" = yes || DLNOBJ=dmydln.o])
+AC_SUBST(DLNOBJ)
+MINIDLNOBJ=dmydln.o
+
+AS_CASE(["$target_os"],
+    [linux*], [
+	],
+    [netbsd*], [
+	RUBY_APPEND_OPTION(CFLAGS, -pipe)
+	],
+    [darwin*], [
+	RUBY_APPEND_OPTION(CFLAGS, -pipe)
+	AC_COMPILE_IFELSE([
+	    AC_LANG_BOOL_COMPILE_TRY([@%:@include <AvailabilityMacros.h>],
+		[MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7])],
+	    [dnl
+		RUBY_APPEND_OPTION(XLDFLAGS, [-framework Security])
+		RUBY_APPEND_OPTION(LIBRUBYARG_STATIC, [-framework Security])
+	    ]dnl
+	)
+	RUBY_APPEND_OPTION(XLDFLAGS, [-framework Foundation])
+	RUBY_APPEND_OPTION(LIBRUBYARG_STATIC, [-framework Foundation])
+	],
+    [osf*], [
+	AS_IF([test "$GCC" != "yes" ], [
+	  # compile something small: taint.c is fine for this.
+	  # the main point is the '-v' flag of 'cc'.
+	  AS_CASE(["`cc -v -I. -c main.c -o /tmp/main.o 2>&1`"],
+	  [*/gemc_cc*], [   # we have the new DEC GEM CC
+                        CFLAGS="$CFLAGS -oldc"
+                        ],
+          [            # we have the old MIPS CC
+                        ])
+	  # cleanup
+	  rm -f /tmp/main.o
+	  CFLAGS="$CFLAGS -std"
+	])
+	],
+    [cygwin*|mingw*], [
+	LIBRUBY_DLDFLAGS="${LIBRUBY_DLDFLAGS}"' -Wl,--out-implib=$(LIBRUBY)'
+	AS_CASE(["$target_os"],
+	[cygwin*], [
+	    AS_IF([test x"$enable_shared" = xyes], [
+		LIBRUBY_SO='cyg$(RUBY_SO_NAME)'.dll
+		LIBRUBY_DLDFLAGS="${LIBRUBY_DLDFLAGS}"' $(RUBYDEF)'
+	    ])
+	    ],
+	[mingw*], [
+	    AS_IF([test x"$enable_shared" = xyes], [
+		LIBRUBY_SO='$(RUBY_SO_NAME)'.dll
+		LIBRUBY_DLDFLAGS="${LIBRUBY_DLDFLAGS}"' $(RUBYDEF)'
+	    ])
+	    EXPORT_PREFIX=' '
+	    DLDFLAGS="${DLDFLAGS}"' $(DEFFILE)'
+	    AC_LIBOBJ([win32/win32])
+	    AC_LIBOBJ([win32/file])
+	    COMMON_LIBS=m
+#	    COMMON_MACROS="WIN32_LEAN_AND_MEAN="
+	    COMMON_HEADERS="winsock2.h windows.h"
+	    THREAD_MODEL=win32
+	    PLATFORM_DIR=win32
+	    ])
+	LIBRUBY_ALIASES=''
+	FIRSTMAKEFILE=GNUmakefile:cygwin/GNUmakefile.in
+	AS_IF([test x"$enable_shared" = xyes], [
+	    LIBRUBY='lib$(RUBY_SO_NAME).dll.a'
+	], [
+	    LIBRUBY_SO=dummy
+	    LIBRUBY='lib$(RUBY_SO_NAME).a'
+	    LIBRUBYARG='-l$(RUBY_SO_NAME)'
+	])
+	],
+    [hpux*], [
+	AS_CASE(["$YACC"],[*yacc*], [
+	    XCFLAGS="$XCFLAGS -DYYMAXDEPTH=300"
+	    YACC="$YACC -Nl40000 -Nm40000"
+	])
+])
+
+MINIOBJS="$MINIDLNOBJ"
+
+AS_CASE(["$THREAD_MODEL"],
+[pthread], [AC_CHECK_HEADERS(pthread.h)],
+[win32],   [],
+[""],      [AC_MSG_ERROR(thread model is missing)],
+           [AC_MSG_ERROR(unknown thread model $THREAD_MODEL)])
+
+AC_ARG_ENABLE(debug-env,
+       AS_HELP_STRING([--enable-debug-env], [enable RUBY_DEBUG environment variable]),
+       [AC_SUBST(ENABLE_DEBUG_ENV, yes)])
+
+AS_CASE(["$FIRSTMAKEFILE"], [*GNUmakefile:*], [gnumake=yes], [
+    AC_MSG_CHECKING([if ${MAKE-make} is GNU make])
+    mkdir conftest.dir
+    echo "all:; @echo yes" > conftest.dir/GNUmakefile
+    echo "all:; @echo no" > conftest.dir/Makefile
+    gnumake=`(cd conftest.dir; ${MAKE-make})`
+    rm -fr conftest.dir
+    AS_CASE(["$gnumake"],
+    [*yes*], [
+	FIRSTMAKEFILE=GNUmakefile:template/GNUmakefile.in
+	gnumake=yes],
+    [
+	gnumake=no])
+    AC_MSG_RESULT($gnumake)
+])
+AS_IF([test "$gnumake" = yes], [ NULLCMD=: ], [
+    AC_MSG_CHECKING([for safe null command for ${MAKE-make}])
+    mkdir conftest.dir
+    NULLCMD=
+    for cmd in : true; do
+	echo 'A=1' > conftest.dir/Makefile
+	echo 'B=$(A:1=@'$cmd')' >> conftest.dir/Makefile
+	echo 'all:; $B 1 2 3 4 5 6 7 8 9' >> conftest.dir/Makefile
+	AS_IF([(cd conftest.dir; ${MAKE-make} >/dev/null 2>/dev/null)], [
+	    NULLCMD=$cmd
+	    break
+	])
+    done
+    rm -fr conftest.dir
+    AS_IF([test -z "$NULLCMD"], [
+	AC_MSG_ERROR(no candidate for safe null command)
+    ])
+    AC_MSG_RESULT($NULLCMD)
+])
+AC_SUBST(NULLCMD)
+
+AS_IF([test "${universal_binary-no}" = yes ], [
+    AC_CACHE_CHECK([for architecture macros], rb_cv_architecture_macros, [
+    mv confdefs.h confdefs1.h
+    : > confdefs.h
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@if defined __`echo ${universal_archnames} |
+    sed 's/=[^ ]*//g;s/ /__ || defined __/g'`__
+@%:@else
+@%:@error
+>>>>>><<<<<<
+@%:@endif]], [[]])],[
+    rb_cv_architecture_macros=yes
+    mv -f confdefs1.h confdefs.h
+], [
+    rb_cv_architecture_macros=no
+    archflagpat=`eval echo '"'"${ARCH_FLAG}"'"' | sed 's/[[][|.*]]/\\&/g'`
+    new_cflags=`echo "$CFLAGS" | sed "s|$archflagpat"'||'`
+    for archs in ${universal_archnames}; do
+	cpu=${archs@%:@*=}
+	archs=${archs%=*}
+	CFLAGS="$new_cflags -arch $archs"
+	archs="__${archs}__"
+	AC_MSG_CHECKING([for macro ${archs} on ${cpu}])
+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@ifndef ${archs}
+@%:@error
+@%:@endif]], [[]])],
+	[AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
+    done
+    mv -f confdefs1.h confdefs.h
+    AC_MSG_ERROR([failed])
+    ])])
+    AC_CACHE_CHECK(whether __ARCHITECTURE__ is available, rb_cv_architecture_available,
+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <stdio.h>
+		const char arch[[]] = __ARCHITECTURE__;]], [[puts(arch);]])],
+		[rb_cv_architecture_available=yes], [rb_cv_architecture_available=no]))
+])
+
+: ${MJIT_LDSHARED=`echo "$LDSHARED" | sed ['s|\$(LD)|'"${LD}"'|g;s|\$(CC)|$(MJIT_CC)|g']`}
+
+MAINLIBS="$LIBS"
+LIBS=$ORIG_LIBS
+AS_IF([test -n "${LIBS}"], [
+    libspat=`echo "${LIBS}" | sed 's/[[][|.*$^]]/\\&/g;s/^  */ /;s/^  *$/ /'`
+    MAINFLAGS=`echo " $MAINLIBS " | sed "s|$libspat"'||;s/^ *//;s/ *$//'`
+])
+LIBRUBYARG_STATIC="${LIBRUBYARG_STATIC} \$(MAINLIBS)"
+CPPFLAGS="$CPPFLAGS "'$(DEFS)'
+test -z "$CPPFLAGS" || CPPFLAGS="$CPPFLAGS "; CPPFLAGS="$CPPFLAGS"'${cppflags}'
+AS_IF([test -n "${cflags+set}"], [
+    cflagspat=`eval echo '"'"${cflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^  */ /;s/^  *$/ /'`
+    CFLAGS=`echo " $CFLAGS " | sed "s|$cflagspat"'|${cflags}|;s/^ *//;s/ *$//'`
+])
+AS_IF([test -n "${cxxflags+set}"], [
+    cxxflagspat=`eval echo '"'"${cxxflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^  */ /;s/^  *$/ /'`
+    CXXFLAGS=`echo " $CXXFLAGS " | sed "s|$cxxflagspat"'|${cxxflags}|;s/^ *//;s/ *$//'`
+])
+AS_IF([test "${ARCH_FLAG}"], [
+    archflagpat=`eval echo '"'"${ARCH_FLAG}"'"' | sed 's/[[][|.*]]/\\&/g'`
+    CFLAGS=`echo "$CFLAGS" | sed "s| *$archflagpat"'||'`
+    CXXFLAGS=`echo "$CXXFLAGS" | sed "s| *$archflagpat"'||'`
+    LDFLAGS=`echo "$LDFLAGS" | sed "s| *$archflagpat"'||'`
+])
+rb_cv_warnflags=`echo "$rb_cv_warnflags" | sed 's/^ *//;s/ *$//'`
+warnflags="$rb_cv_warnflags"
+AC_SUBST(cppflags)dnl
+AC_SUBST(cflags, ["${orig_cflags:+$orig_cflags }"'${optflags} ${debugflags} ${warnflags}'])dnl
+AC_SUBST(cxxflags)dnl
+AC_SUBST(optflags)dnl
+AC_SUBST(debugflags)dnl
+AC_SUBST(warnflags)dnl
+AC_SUBST(strict_warnflags)dnl
+AC_SUBST(XCFLAGS)dnl
+AC_SUBST(XLDFLAGS)dnl
+AC_SUBST(EXTLDFLAGS)dnl
+AC_SUBST(EXTDLDFLAGS)dnl
+AC_SUBST(LIBRUBY_LDSHARED)
+AC_SUBST(LIBRUBY_DLDFLAGS)
+AC_SUBST(RUBY_INSTALL_NAME)
+AC_SUBST(rubyw_install_name)
+AC_SUBST(RUBYW_INSTALL_NAME)
+AC_SUBST(RUBY_SO_NAME)
+AC_SUBST(LIBRUBY_A)
+AC_SUBST(LIBRUBY_SO)
+AC_SUBST(LIBRUBY_SONAME)
+AC_SUBST(LIBRUBY_ALIASES)
+AC_SUBST(LIBRUBY)
+AC_SUBST(LIBRUBYARG)
+AC_SUBST(LIBRUBYARG_STATIC)
+AC_SUBST(LIBRUBYARG_SHARED)
+AC_SUBST(SOLIBS)
+AC_SUBST(DLDLIBS)
+AC_SUBST(DLDSHARED)
+AC_SUBST(ENABLE_SHARED)
+AC_SUBST(MAINLIBS)
+AC_SUBST(COMMON_LIBS)
+AC_SUBST(COMMON_MACROS)
+AC_SUBST(COMMON_HEADERS)
+AC_SUBST(EXPORT_PREFIX)
+AC_SUBST(SYMBOL_PREFIX)
+AC_SUBST(MINIOBJS)
+AC_SUBST(THREAD_MODEL)
+AC_SUBST(PLATFORM_DIR)
+
+firstmf=`echo $FIRSTMAKEFILE | sed 's/:.*//'`
+firsttmpl=`echo $FIRSTMAKEFILE | sed 's/.*://'`
+MAKEFILES="Makefile $firstmf"
+MAKEFILES="`echo $MAKEFILES`"
+AC_SUBST(MAKEFILES)
+
+ri_prefix=
+test "$program_prefix" != NONE &&
+  ri_prefix=$program_prefix
+
+ri_suffix=
+test "$program_suffix" != NONE &&
+  ri_suffix=$program_suffix
+
+RUBY_INSTALL_NAME="${ri_prefix}"'$(RUBY_BASE_NAME)'"${ri_suffix}"
+AS_CASE(["$target_os"],
+  [cygwin*|mingw*], [
+    RUBYW_INSTALL_NAME="${ri_prefix}"'$(RUBYW_BASE_NAME)'"${ri_suffix}"
+    rubyw_install_name='$(RUBYW_INSTALL_NAME)'
+    ])
+
+rubylibdir='${rubylibprefix}/${ruby_version}'
+rubyarchdir=${multiarch+'${rubyarchprefix}/${ruby_version}'}${multiarch-'${rubylibdir}/${arch}'}
+
+rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'}
+AC_ARG_WITH(rubyarchprefix,
+	    AS_HELP_STRING([--with-rubyarchprefix=DIR],
+			   [prefix for architecture dependent ruby libraries [[RUBYLIBPREFIX/ARCH]]]),
+	    [rubyarchprefix="$withval"])
+AC_SUBST(rubyarchprefix)
+
+rubysitearchprefix=${multiarch+'${sitearchlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${sitearch}'}
+AC_ARG_WITH(rubysitearchprefix,
+	    AS_HELP_STRING([--with-rubysitearchprefix=DIR],
+			   [prefix for architecture dependent site libraries [[RUBYLIBPREFIX/SITEARCH]]]),
+	    [rubysitearchprefix="$withval"])
+AC_SUBST(rubysitearchprefix)
+
+RI_BASE_NAME=`echo ${RUBY_BASE_NAME} | sed 's/ruby/ri/'`
+ridir='${datarootdir}/${RI_BASE_NAME}'
+AC_ARG_WITH(ridir,
+	    AS_HELP_STRING([--with-ridir=DIR], [ri documentation [[DATAROOTDIR/ri]]]),
+	    [ridir=$withval])
+AC_SUBST(ridir)
+AC_SUBST(RI_BASE_NAME)
+
+AC_ARG_WITH(ruby-version,
+	    AS_HELP_STRING([--with-ruby-version=STR], [ruby version string for version specific directories [[full]] (full|minor|STR)]),
+            [ruby_version=$withval],
+            [ruby_version=full])
+unset RUBY_LIB_VERSION
+unset RUBY_LIB_VERSION_STYLE
+AS_CASE(["$ruby_version"],
+  [full],  [RUBY_LIB_VERSION_STYLE='3	/* full */'],
+  [minor], [RUBY_LIB_VERSION_STYLE='2	/* minor */'])
+AS_IF([test ${RUBY_LIB_VERSION_STYLE+set}], [
+    {
+    echo "#define RUBY_LIB_VERSION_STYLE $RUBY_LIB_VERSION_STYLE"
+    echo '#define STRINGIZE(x) x'
+    test -f revision.h -o -f "${srcdir}/revision.h" || echo '#define RUBY_REVISION 0'
+    echo '#include "version.h"'
+    echo 'ruby_version=RUBY_LIB_VERSION'
+    } > conftest.c
+    ruby_version="`$CPP -I. -I"${srcdir}" -I"${srcdir}/include" conftest.c | sed '/^ruby_version=/!d;s/ //g'`"
+    eval $ruby_version
+], [test -z "${ruby_version}"], [
+    AC_MSG_ERROR([No ruby version, No place for bundled libraries])
+], [
+    RUBY_LIB_VERSION="${ruby_version}"
+])
+AC_SUBST(RUBY_LIB_VERSION_STYLE)
+AC_SUBST(RUBY_LIB_VERSION)
+
+AC_ARG_WITH(sitedir,
+	    AS_HELP_STRING([--with-sitedir=DIR], [site libraries in DIR [[RUBY_LIB_PREFIX/site_ruby]], "no" to disable site directory]),
+            [sitedir=$withval],
+            [sitedir='${rubylibprefix}/site_ruby'])
+sitelibdir='${sitedir}/${ruby_version}'
+
+AC_ARG_WITH(sitearchdir,
+	    AS_HELP_STRING([--with-sitearchdir=DIR],
+			   [architecture dependent site libraries in DIR [[SITEDIR/SITEARCH]], "no" to disable site directory]),
+            [sitearchdir=$withval],
+            [sitearchdir=${multiarch+'${rubysitearchprefix}/site_ruby/${ruby_version}'}${multiarch-'${sitelibdir}/${sitearch}'}])
+
+AC_ARG_WITH(vendordir,
+	    AS_HELP_STRING([--with-vendordir=DIR], [vendor libraries in DIR [[RUBY_LIB_PREFIX/vendor_ruby]], "no" to disable vendor directory]),
+            [vendordir=$withval],
+            [vendordir='${rubylibprefix}/vendor_ruby'])
+vendorlibdir='${vendordir}/${ruby_version}'
+
+AC_ARG_WITH(vendorarchdir,
+	    AS_HELP_STRING([--with-vendorarchdir=DIR],
+			   [architecture dependent vendor libraries in DIR [[VENDORDIR/SITEARCH]], "no" to disable vendor directory]),
+            [vendorarchdir=$withval],
+            [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby/${ruby_version}'}${multiarch-'${vendorlibdir}/${sitearch}'}])
+
+AS_IF([test "${LOAD_RELATIVE+set}"], [
+    AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
+    RUBY_EXEC_PREFIX=''
+])
+
+AC_SUBST(RUBY_EXEC_PREFIX)
+
+AC_SUBST(libdirname, ${multiarch+arch}libdir)
+AC_SUBST(archlibdir)dnl
+AC_SUBST(sitearchlibdir)dnl
+AC_SUBST(archincludedir)dnl
+AC_SUBST(sitearchincludedir)dnl
+AC_SUBST(arch)dnl
+AC_SUBST(sitearch)dnl
+AC_SUBST(ruby_version)dnl
+AC_SUBST(rubylibdir)dnl
+AC_SUBST(rubyarchdir)dnl
+AC_SUBST(sitedir)dnl
+AC_SUBST(sitelibdir)dnl
+AC_SUBST(sitearchdir)dnl
+AC_SUBST(vendordir)dnl
+AC_SUBST(vendorlibdir)dnl
+AC_SUBST(vendorarchdir)dnl
+
+AC_SUBST(CONFIGURE, "`echo $0 | sed 's|.*/||'`")dnl
+AC_SUBST(configure_args, "`echo "${ac_configure_args}" | sed 's/\\$/$$/g'`")dnl
+
+AS_IF([test "${universal_binary-no}" = yes ], [
+    arch="universal-${target_os}"
+    AS_IF([test "${rb_cv_architecture_available}" = yes], [
+	AC_DEFINE_UNQUOTED(RUBY_PLATFORM_CPU, __ARCHITECTURE__)
+    ], [
+	for archs in ${universal_archnames}; do
+	    cpu=`echo $archs | sed 's/.*=//'`
+	    archs=`echo $archs | sed 's/=.*//'`
+	    RUBY_DEFINE_IF([defined __${archs}__ &&! defined RUBY_PLATFORM_CPU], RUBY_PLATFORM_CPU, ["${cpu}"])
+	done
+    ])
+    ints='long int short'
+    test "$ac_cv_type_long_long" = yes && ints="'long long' $ints"
+    AC_SUBST(UNIVERSAL_ARCHNAMES, "${universal_archnames}")
+    AC_SUBST(UNIVERSAL_INTS, "${ints}")
+    AC_DEFINE_UNQUOTED(RUBY_PLATFORM_OS, "${target_os}")
+    AC_DEFINE_UNQUOTED(RUBY_ARCH, "universal-" RUBY_PLATFORM_OS)
+    AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "universal." RUBY_PLATFORM_CPU "-" RUBY_PLATFORM_OS)
+], [
+    arch="${target_cpu}-${target_os}"
+    AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "$arch")
+])
+
+unset sitearch
+AS_CASE(["$target_os"],[mingw*],[sitearch="$target_cpu-$rb_cv_msvcrt"])
+: ${sitearch='${arch}'}
+
+AC_ARG_WITH(search-path,
+		AS_HELP_STRING([--with-search-path=DIR], [specify the additional search path]),
+		[search_path=$withval])
+AS_IF([test "$search_path" != ""], [
+    AC_SUBST(RUBY_SEARCH_PATH, $search_path)
+])
+
+AC_ARG_WITH(rubyhdrdir,
+	    AS_HELP_STRING([--with-rubyhdrdir=DIR], [core headers in DIR [[INCLUDEDIR/RUBY_BASE_NAME-RUBY_VERSION]]]),
+	    [rubyhdrdir=$withval],
+	    [rubyhdrdir='${includedir}/${RUBY_VERSION_NAME}'])
+
+AC_ARG_WITH(rubyarchhdrdir,
+	    AS_HELP_STRING([--with-rubyarchhdrdir=DIR],
+			   [architecture dependent core headers in DIR [[$(rubyhdrdir)/$(arch)]]]),
+	    [rubyarchhdrdir=$withval],
+	    [rubyarchhdrdir=${multiarch+'${archincludedir}/${RUBY_VERSION_NAME}'}${multiarch-'${rubyhdrdir}/${arch}'}])
+
+AC_ARG_WITH(sitehdrdir,
+	    AS_HELP_STRING([--with-sitehdrdir=DIR], [core site headers in DIR [[RUBYHDRDIR/site_ruby]]]),
+	    [sitehdrdir=$withval],
+	    [sitehdrdir='${rubyhdrdir}/site_ruby'])
+
+AC_ARG_WITH(sitearchhdrdir,
+	    AS_HELP_STRING([--with-sitearchhdrdir=DIR],
+			   [architecture dependent core site headers in DIR [[RUBYHDRDIR/site_ruby]]]),
+	    [sitearchhdrdir=$withval],
+	    [sitearchhdrdir=${multiarch+'${sitearchincludedir}/${RUBY_VERSION_NAME}/site_ruby'}${multiarch-'${sitehdrdir}/${sitearch}'}])
+
+AC_ARG_WITH(vendorhdrdir,
+	    AS_HELP_STRING([--with-vendorhdrdir=DIR], [core vendor headers in DIR [[RUBYHDRDIR/vendor_ruby]]]),
+	    [vendorhdrdir=$withval],
+	    [vendorhdrdir='${rubyhdrdir}/vendor_ruby'])
+
+AC_ARG_WITH(vendorarchhdrdir,
+	    AS_HELP_STRING([--with-vendorarchhdrdir=DIR],
+			   [architecture dependent core vendor headers in DIR [[RUBYHDRDIR/vendor_ruby]]]),
+	    [vendorarchhdrdir=$withval],
+	    [vendorarchhdrdir=${multiarch+'${sitearchincludedir}/${RUBY_VERSION_NAME}/vendor_ruby'}${multiarch-'${vendorhdrdir}/${sitearch}'}])
+
+AC_SUBST(rubyhdrdir)dnl
+AC_SUBST(sitehdrdir)dnl
+AC_SUBST(vendorhdrdir)dnl
+AC_SUBST(rubyarchhdrdir)dnl
+AC_SUBST(sitearchhdrdir)dnl
+AC_SUBST(vendorarchhdrdir)dnl
+
+AC_ARG_WITH(mantype,
+	AS_HELP_STRING([--with-mantype=TYPE], [specify man page type; TYPE is one of man and doc]),
+		[
+			AS_CASE(["$withval"],
+			[man|man.gz|man.bz2|doc|doc.gz|doc.bz2], [MANTYPE=$withval],
+			[AC_MSG_ERROR(invalid man type: $withval)])
+		])
+AS_IF([test -z "$MANTYPE"], [
+	dnl Looks for nroff with -mdoc support.
+	AC_CACHE_VAL([ac_cv_path_NROFF], [
+		AC_PATH_PROGS_FEATURE_CHECK([NROFF],
+			[nroff awf mandoc],
+			[$ac_path_NROFF -mdoc ${srcdir}/man/ruby.1 \
+				>/dev/null 2>&1 &&
+				ac_cv_path_NROFF=$ac_path_NROFF \
+				ac_path_NROFF_found=:],
+			[], ["/usr/bin:/usr/ucb"]
+		)
+	])
+	AS_IF([test -n "$ac_cv_path_NROFF"], [
+		MANTYPE=doc
+	], [
+		MANTYPE=man
+	])
+])
+AC_SUBST(MANTYPE)
+
+AC_ARG_ENABLE(rubygems,
+	AS_HELP_STRING([--disable-rubygems], [disable rubygems by default]),
+	[enable_rubygems="$enableval"], [enable_rubygems=yes])
+AS_IF([test x"$enable_rubygems" = xno], [
+    USE_RUBYGEMS=no
+], [
+    USE_RUBYGEMS=yes
+])
+AC_SUBST(USE_RUBYGEMS)
+
+arch_hdrdir="${EXTOUT}/include/${arch}/ruby"
+AS_MKDIR_P("${arch_hdrdir}")
+config_h="${arch_hdrdir}/config.h"
+guard=INCLUDE_RUBY_CONFIG_H
+{
+  echo "#ifndef $guard"
+  echo "#define $guard 1"
+  grep -v "^#define PACKAGE_" confdefs.h
+  echo "#endif /* $guard */"
+} | tr -d '\015' |
+(
+  AS_IF([test "x$CONFIGURE_TTY" = xyes], [color=--color], [color=])
+  exec ${tooldir}/ifchange $color "${config_h}" -
+) >&AS_MESSAGE_FD || AC_MSG_ERROR([failed to create ${config_h}])
+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 "`echo $e | sed 's/\.c$/.$(OBJEXT)/'`; done
+AC_SUBST(BUILTIN_ENCOBJS)
+
+BUILTIN_TRANSES=["`sed -n -e '/^BUILTIN_TRANSES[ 	]*=/{' \
+	-e s/// -e :l -e '/\\\\$/N' -e 's/\\\\\\n/ /' -e 't l' -e p \
+	-e '}' "${srcdir}/enc/Makefile.in"`"]
+BUILTIN_TRANSSRCS=
+BUILTIN_TRANSOBJS=
+for e in $BUILTIN_TRANSES; do
+  BUILTIN_TRANSSRCS="$BUILTIN_TRANSSRCS "`echo $e | sed 's/\.trans$/.c/'`
+  BUILTIN_TRANSOBJS="$BUILTIN_TRANSOBJS "`echo $e | sed 's/\.trans$/.$(OBJEXT)/'`
+done
+AC_SUBST(BUILTIN_TRANSSRCS)
+AC_SUBST(BUILTIN_TRANSOBJS)
+
+PACKAGE=$RUBY_BASE_NAME
+AC_SUBST(PACKAGE)
+AS_MESSAGE([$PACKAGE library version = $ruby_version])
+
+AS_IF([test x"$CC_WRAPPER" != x], [
+    CC='$(CC_WRAPPER) '"${CC@%:@$CC_WRAPPER }"
+    CPP='$(CC_WRAPPER) '"${CPP@%:@$CC_WRAPPER }"
+    CC_WRAPPER='$(rubyarchdir)/darwin-cc'
+    XCC_WRAPPER='$(top_srcdir)/tool/darwin-cc'
+])
+AC_SUBST(CC_WRAPPER, '')
+AC_SUBST(XCC_WRAPPER)
+
+AS_CASE([" $CPP "], [*" $CC "*], [CPP=`echo " $CPP " | sed "s| $CC |"' $(CC) |;s/^ *//;s/  *$//'`])
+
+AS_IF([test x"$firstmf" != x], [
+    AC_CONFIG_FILES($firstmf:$firsttmpl, [], [firstmf="$firstmf" firsttmpl="$firsttmpl"])
+])
+AC_CONFIG_FILES(Makefile:template/Makefile.in, [
+    tmpmk=confmk$$.tmp
+    {
+	AS_IF([test ${VCS+set}], [
+	    :
+	], [git_dir=`$GIT --work-tree="$srcdir" --git-dir="$srcdir/.git" rev-parse --git-dir 2>/dev/null`], [
+	    VCS='$(GIT)'
+	], [
+	    VCS='echo cannot'
+	])
+	AS_CASE("$VCS",
+		['$(GIT)'|git], [VCSUP='$(VCS) pull --rebase $(GITPULLOPTIONS)'],
+		[VCSUP='$(VCS)'])
+	sed -n \
+	    -e '[/^@%:@define \(RUBY_RELEASE_[A-Z]*\) \([0-9][0-9]*\)/]{' \
+	    -e   's//\1 = \2/' \
+	    -e   '[s/ \([0-9]\)$/ 0\1/]' \
+	    -e   p \
+	    -e '}' "$srcdir/version.h"
+	sed '/^MISSING/s/\$U\././g;/^VCS *=/s#@VCS@#'"$VCS"'#;/^VCSUP *=/s#@VCSUP@#'"$VCSUP"'#' Makefile
+	echo; test x"$EXEEXT" = x || echo 'miniruby: miniruby$(EXEEXT)'
+	AS_IF([test "$gnumake" != yes], [
+	    echo ['$(MKFILES): $(srcdir)/common.mk']
+	    sed ['s/{\$([^(){}]*)[^{}]*}//g'] ${srcdir}/common.mk
+	], [
+	    echo 'distclean-local::; @$(RM) GNUmakefile uncommon.mk'
+	])
+    } > $tmpmk && AS_IF([! grep '^ruby:' $tmpmk > /dev/null], [
+	AS_IF([test "${gnumake}" = yes], [
+	    tmpgmk=confgmk$$.tmp
+	    {
+		echo "include $tmpmk"
+		echo "-include uncommon.mk"
+	    } > $tmpgmk
+	], [
+	    tmpgmk=$tmpmk
+	]) &&
+	test -z "`${MAKE-make} -f $tmpgmk info-program | grep '^PROGRAM=ruby$'`" &&
+	echo 'ruby: $(PROGRAM);' >> $tmpmk
+	test "$tmpmk" = "$tmpgmk" || rm -f "$tmpgmk"
+    ]) && mv -f $tmpmk Makefile],
+[EXEEXT='$EXEEXT' MAKE='${MAKE-make}' gnumake='$gnumake' GIT='$GIT'])
+
+AC_ARG_WITH([ruby-pc],
+	    AS_HELP_STRING([--with-ruby-pc=FILENAME], [pc file basename]),
+	    [ruby_pc="$withval"],
+	    [ruby_pc="${RUBY_BASE_NAME}-${MAJOR}.${MINOR}.pc"])
+AC_SUBST(ruby_pc)
+AC_SUBST(exec, [exec])
+
+AC_ARG_WITH(destdir,
+	    AS_HELP_STRING([--with-destdir=DESTDIR], [specify default directory to install]),
+	    [DESTDIR="$withval"])
+AC_SUBST(DESTDIR)
+
+AC_CONFIG_FILES($ruby_pc:template/ruby.pc.in,
+    [
+    AS_IF([sed ['s/\$(\([A-Za-z_][A-Za-z0-9_]*\))/${\1}/g;s/@[A-Za-z_][A-Za-z0-9_]*@//'] $ruby_pc > ruby.tmp.pc &&
+	{
+	    test -z "$PKG_CONFIG" ||
+	    PKG_CONFIG_PATH=. $PKG_CONFIG --print-errors ruby.tmp
+	}],
+    [
+	mv -f ruby.tmp.pc $ruby_pc
+    ], [
+	exit 1
+    ])
+    ],
+    [ruby_pc='$ruby_pc' PKG_CONFIG='$PKG_CONFIG'])
+
+AC_OUTPUT
+}
+}
+
+AS_IF([test "$silent" = yes], [], [
+AS_IF([${FOLD+:} false], [], [
+AS_IF([test "`echo abcdefg hijklmno | fold -s -w10 | sed 1d`" = hijklmno], [FOLD="fold"], [FOLD=])
+])
+fold_width=`expr $COLUMNS - 30 2>/dev/null` || fold_width=50
+AS_REQUIRE_SHELL_FN([config_summary],
+    [AS_FUNCTION_DESCRIBE([config_summary], [NAME, VAL], [configuration summary])],
+    [AS_IF([test -z "$2"], [], [
+	AS_ECHO_N(["   * $1:                     "]) | dd bs=1 count=26 2>/dev/null
+	AS_IF([test "$FOLD"], [
+	    echo "$2" | fold -s -w$fold_width |
+	    sed '1!s/^/                          /;$!s/$/\\/'
+	], [echo "$2"])
+    ])]
+)
+
+AS_IF([test $install_doc = yes],
+    [DOCTARGETS=`echo " $RDOCTARGET $CAPITARGET " | sed 's/ nodoc //g;s/^ *//;s/ *$//'`],
+    [DOCTARGETS=no])
+echo "---"
+echo "Configuration summary for $RUBY_BASE_NAME version $MAJOR.$MINOR.$TEENY"
+echo ""
+config_summary "Installation prefix" "$prefix"
+config_summary "exec prefix"         "$exec_prefix"
+config_summary "arch"                "$arch"
+config_summary "site arch"           "$sitearch"
+config_summary "RUBY_BASE_NAME"      "$RUBY_BASE_NAME"
+config_summary "enable shared"       "$enable_shared"
+config_summary "ruby lib prefix"     "$rubylibprefix"
+config_summary "site libraries path" "$rubysitearchprefix"
+config_summary "vendor path"         "$vendordir"
+config_summary "target OS"           "$target_os"
+config_summary "compiler"            "$CC"
+config_summary "with pthread"        "$enable_pthread"
+config_summary "with coroutine"      "$rb_cv_coroutine"
+config_summary "enable shared libs"  "$ENABLE_SHARED"
+config_summary "dynamic library ext" "$DLEXT"
+config_summary "CFLAGS"              "$cflags"
+config_summary "CPPFLAGS"            "$cppflags"
+config_summary "LDFLAGS"             "$LDFLAGS"
+config_summary "DLDFLAGS"            "$DLDFLAGS"
+config_summary "optflags"            "$optflags"
+config_summary "debugflags"          "$debugflags"
+config_summary "warnflags"           "$warnflags"
+config_summary "strip command"       "$STRIP"
+config_summary "install doc"         "$DOCTARGETS"
+config_summary "JIT support"         "$MJIT_SUPPORT"
+config_summary "man page type"       "$MANTYPE"
+config_summary "search path"         "$search_path"
+config_summary "static-linked-ext"   ${EXTSTATIC:+"yes"}
+config_summary "BASERUBY -v"         "$BASERUBY_VERSION"
+echo ""
+echo "---"
+])
diff --git a/configure.in b/configure.in
deleted file mode 100644
index 063d839478..0000000000
--- a/configure.in
+++ /dev/null
@@ -1,4679 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT()
-{
-AC_CONFIG_AUX_DIR(tool)
-
-AC_PREREQ(2.67)
-
-AC_DEFUN([RUBY_PREREQ_AC],
-	[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]), [$1]), [-1],
-		AC_MSG_ERROR([Autoconf version ]$1[ or higher is required]$2))])
-
-AC_DISABLE_OPTION_CHECKING
-
-AC_ARG_VAR([cflags], [additional CFLAGS])
-AC_ARG_VAR([cppflags], [additional CPPFLAGS])
-AC_ARG_VAR([cxxflags], [additional CXXFLAGS])
-
-AC_DEFUN([RUBY_RM_RECURSIVE], [
-m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]), [2.70]), [-1], [
-# suppress error messages, rm: cannot remove 'conftest.dSYM', from
-# AC_EGREP_CPP with CFLAGS=-g on Darwin.
-#
-# TODO: remove this hack when AC_PREREQ() becomes 2.70 or later.
-AS_CASE([$build_os], [darwin*], [
-rm() {
-    rm_recursive=''
-    for arg do
-	AS_CASE("$arg",
-		[--*], [],
-		[-*r*], [break],
-		[conftest.*], [if test -d "$arg"; then rm_recursive=-r; break; fi],
-		[])
-    done
-    command rm $rm_recursive "[$]@"
-}
-])])])
-
-{ # environment section
-
-AC_ARG_WITH(baseruby,
-	AS_HELP_STRING([--with-baseruby=RUBY], [use RUBY as baseruby; RUBY is the pathname of ruby]),
-	[
-		AS_CASE(["$withval"],[*ruby*],[BASERUBY=$withval],[AC_MSG_ERROR(need ruby)])
-	],
-	[
-		AC_PATH_PROG([BASERUBY], [ruby], [false])
-	])
-if test "`RUBYOPT=- $BASERUBY -e 'print 42' 2>/dev/null`" = 42; then
-    if test "`RUBYOPT=- $BASERUBY --disable=gems -e 'print 42' 2>/dev/null`" = 42; then
-	BASERUBY="$BASERUBY --disable=gems"
-    fi
-    $BASERUBY -C "$srcdir/tool" downloader.rb -e gnu config.guess config.sub
-    HAVE_BASERUBY=yes
-else
-    BASERUBY="echo executable host ruby is required.  use --with-baseruby option.; false"
-    HAVE_BASERUBY=no
-fi
-AC_SUBST(BASERUBY)
-AC_SUBST(HAVE_BASERUBY)
-
-AC_DEFUN([RUBY_MINGW32],
-[AS_CASE(["$host_os"],
-[cygwin*], [
-AC_CACHE_CHECK(for mingw32 environment, rb_cv_mingw32,
-[AC_TRY_CPP([
-#ifndef __MINGW32__
-# error
-#endif
-], rb_cv_mingw32=yes,rb_cv_mingw32=no)
-rm -f conftest*])
-if test "$rb_cv_mingw32" = yes; then
-    target_os="mingw32"
-    : ${ac_tool_prefix:="`expr "$CC" : ['\(.*-\)g\?cc[^/]*$']`"}
-fi
-])
-AS_CASE(["$target_os"], [mingw*msvc], [
-target_os="`echo ${target_os} | sed 's/msvc$//'`"
-])
-AS_CASE(["$target_cpu-$target_os"], [x86_64-mingw*], [
-target_cpu=x64
-])
-])
-
-AC_DEFUN([RUBY_NACL],
-[
- AS_CASE(["${host_os}"],
-[nacl], [
-  ac_cv_exeext=.nexe
-  host_vendor=chromium
-  ac_cv_host=chromium
-  AC_MSG_CHECKING([wheather \$NACL_SDK_ROOT is set])
-  if test x"${NACL_SDK_ROOT}" = x; then
-    AC_MSG_RESULT([no])
-    AC_MSG_ERROR([You need to set \$NACL_SDK_ROOT environment variable to build for NativeClient])
-  fi
-  AC_MSG_RESULT([yes])
-
-  nacl_cv_build_variant=glibc
-  AC_ARG_WITH(newlib,
-              AS_HELP_STRING([--with-newlib], [uses newlib version of NativeClient SDK]),
-              [AS_CASE([$withval],
-                       [no], [nacl_cv_build_variant=glibc],
-                       [yes], [nacl_cv_build_variant=newlib])])
-
-  AS_CASE(["$target_cpu"],
-          [x86_64], [nacl_cv_cpu_nick=x86
-                     nacl_cv_cpu_nick2=x86_64],
-          [i?86], [nacl_cv_cpu_nick=x86
-                   nacl_cv_cpu_nick2=x86_32],
-          [le32], [nacl_cv_cpu_nick=pnacl
-                   nacl_cv_cpu_nick2=pnacl
-                   ac_cv_exeext=.pexe],
-          [nacl_cv_cpu_nick=$target_cpu])
-  AS_CASE(["$build_os"],
-          [linux*], [nacl_cv_os_nick=linux],
-          [darwin*], [nacl_cv_os_nick=mac],
-          [cygwin*|mingw*], [nacl_cv_os_nick=win],
-          [nacl_cv_os_nick=$build_os])
-
-  host="$host_cpu-chromium-$host_os-"
-  ac_tool_prefix="$host_cpu-nacl-"
-
-  AC_MSG_CHECKING([NativeClient toolchain])
-  if test x"$nacl_cv_cpu_nick" = xpnacl; then
-    NACL_TOOLCHAIN="${nacl_cv_os_nick}_pnacl"
-    ac_tool_prefix=pnacl-
-  elif test -d \
-    "${NACL_SDK_ROOT}/toolchain/${nacl_cv_os_nick}_${nacl_cv_cpu_nick}_${nacl_cv_build_variant}"; then
-    NACL_TOOLCHAIN="${nacl_cv_os_nick}_${nacl_cv_cpu_nick}_${nacl_cv_build_variant}"
-  elif test -d \
-    "${NACL_SDK_ROOT}/toolchain/${nacl_cv_os_nick}_x86_${nacl_cv_cpu_nick}/${nacl_cv_build_variant}"; then
-    NACL_TOOLCHAIN="${nacl_cv_os_nick}_x86_${nacl_cv_cpu_nick}/${nacl_cv_build_variant}"
-  else
-    AS_CASE(
-      ["${nacl_cv_build_variant}"],
-      [glibc], [if test \
-        -d "${NACL_SDK_ROOT}/toolchain/${nacl_cv_os_nick}_${nacl_cv_cpu_nick}_newlib" \
-        -a -d "${NACL_SDK_ROOT}/toolchain/${nacl_cv_os_nick}_${nacl_cv_cpu_nick}"; then
-        NACL_TOOLCHAIN="${nacl_cv_os_nick}_${nacl_cv_cpu_nick}"
-      fi],
-      [newlib], [ NACL_TOOLCHAIN="${nacl_cv_os_nick}_${nacl_cv_cpu_nick}" ])
-  fi
-  if test ! -e "${NACL_SDK_ROOT}/toolchain/${NACL_TOOLCHAIN}/${ac_tool_prefix}gcc"; then
-    if test "${build_cpu}" = i686 -a -e "${NACL_SDK_ROOT}/toolchain/${NACL_TOOLCHAIN}/nacl-gcc"; then
-      ac_tool_prefix=nacl-
-    fi
-    if test "${build_cpu}" = x86_64 -a -e "${NACL_SDK_ROOT}/toolchain/${NACL_TOOLCHAIN}/nacl-gcc"; then
-      ac_tool_prefix=nacl64-
-    fi
-  fi
-  if test -z "${NACL_TOOLCHAIN}"; then
-    AC_MSG_ERROR([Unrecognized --host and --build combination or NaCl SDK is not installed])
-  fi
-  AC_MSG_RESULT(${NACL_TOOLCHAIN})
-
-  AC_MSG_CHECKING([path to SDK])
-  if ! echo -- "${PATH}" | grep -F "${NACL_SDK_ROOT}/toolchain/${NACL_TOOLCHAIN}/bin" > /dev/null; then
-    PATH="${PATH}:${NACL_SDK_ROOT}/toolchain/${NACL_TOOLCHAIN}/bin"
-  fi
-  AC_MSG_RESULT(${NACL_SDK_ROOT}/toolchain/${NACL_TOOLCHAIN}/bin)
-
-  RUBY_APPEND_OPTIONS(XCFLAGS, '-I$(NACL_SDK_ROOT)/include')
-  if test x"${nacl_cv_cpu_nick}" = xpnacl; then
-    RUBY_APPEND_OPTIONS(XCFLAGS, '-isystem $(NACL_SDK_ROOT)/include/pnacl')
-  elif test x"${nacl_cv_build_variant}" = xnewlib; then
-    RUBY_APPEND_OPTIONS(XCFLAGS, '-isystem $(NACL_SDK_ROOT)/include/newlib')
-  fi
-
-  AC_MSG_CHECKING([nacl library path])
-  if test -d "${NACL_SDK_ROOT}/lib/${nacl_cv_build_variant}_${nacl_cv_cpu_nick2}/Release"; then
-    nacl_cv_libpath="${nacl_cv_build_variant}_${nacl_cv_cpu_nick2}"
-  elif test -d "${NACL_SDK_ROOT}/lib/${nacl_cv_cpu_nick2}/Release"; then
-    nacl_cv_libpath="${nacl_cv_cpu_nick2}"
-  else
-    AC_MSG_ERROR([not found])
-  fi
-  AC_MSG_RESULT([${nacl_cv_libpath}])
-  RUBY_APPEND_OPTIONS(XLDFLAGS, '-L$(NACL_SDK_ROOT)/'"lib/${nacl_cv_libpath}/Release")
-
-  AC_SUBST(NACL_TOOLCHAIN)
-  AC_SUBST(NACL_SDK_ROOT)
-  AC_SUBST(NACL_SDK_VARIANT, "${nacl_cv_build_variant}")
-  AC_SUBST(NACL_LIB_PATH, "${nacl_cv_libpath}")
-  AC_CHECK_TOOLS(CC, [clang gcc])
-  AC_CHECK_TOOLS(CXX, [clang++ g++])
-])])
-
-AC_DEFUN([RUBY_NACL_CHECK_PEPPER_TYPES],
-[AS_CASE(["${host_os}"],
-[nacl], [
- AC_CHECK_TYPES([struct PPB_Core, struct PPB_Messaging, struct PPB_Var,
-              struct PPB_URLLoader, struct PPB_URLRequestInfo,
-              struct PPB_URLResponseInfo, struct PPB_FileRef,
-              struct PPP_Instance])
-])
-])
-
-AC_DEFUN([RUBY_CPPOUTFILE],
-[AC_CACHE_CHECK(whether ${CPP} accepts -o, rb_cv_cppoutfile,
-[save_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS='-o conftest-1.i'
-rb_cv_cppoutfile=no
-AC_TRY_CPP([test-for-cppout],
-	   [grep test-for-cppout conftest-1.i > /dev/null && rb_cv_cppoutfile=yes])
-CPPFLAGS="$save_CPPFLAGS"
-rm -f conftest*])
-if test "$rb_cv_cppoutfile" = yes; then
-  CPPOUTFILE='-o conftest.i'
-elif test "$rb_cv_cppoutfile" = no; then
-  CPPOUTFILE='> conftest.i'
-elif test -n "$rb_cv_cppoutfile"; then
-  CPPOUTFILE="$rb_cv_cppoutfile"
-fi
-AC_SUBST(CPPOUTFILE)])
-
-AC_DEFUN([RUBY_PROG_GNU_LD],
-[AC_CACHE_CHECK(whether the linker is GNU ld, rb_cv_prog_gnu_ld,
-[if `$CC $CFLAGS $CPPFLAGS $LDFLAGS --print-prog-name=ld 2>&1` -v 2>&1 | grep "GNU ld" > /dev/null; then
-  rb_cv_prog_gnu_ld=yes
-else
-  rb_cv_prog_gnu_ld=no
-fi
-])
-GNU_LD=$rb_cv_prog_gnu_ld
-AC_SUBST(GNU_LD)])
-
-eval `sed -n ['s/^@%:@define RUBY_API_VERSION_\([A-Z][A-Z_0-9]*\) \([0-9][0-9]*\)/API_\1=\2/p'] $srcdir/include/ruby/version.h`
-RUBY_PROGRAM_VERSION=`sed -n 's/^@%:@define RUBY_VERSION "\(.*\)"/\1/p' $srcdir/version.h`
-MAJOR=`echo $RUBY_PROGRAM_VERSION | cut -d. -f1`
-MINOR=`echo $RUBY_PROGRAM_VERSION | cut -d. -f2`
-TEENY=`echo $RUBY_PROGRAM_VERSION | cut -d. -f3`
-for v in MAJOR MINOR TEENY; do
-    if eval "test \"\$$v\" = ''"; then
-	AC_MSG_ERROR(could not determine $v number from version.h)
-    fi
-done
-AS_IF([test "$MAJOR.$MINOR" != "$API_MAJOR.$API_MINOR"], [
-    AC_MSG_ERROR([API version $API_MAJOR.$API_MINOR differs from program version $MAJOR.$MINOR])
-])
-AC_SUBST(MAJOR)
-AC_SUBST(MINOR)
-AC_SUBST(TEENY)
-AC_SUBST(RUBY_PROGRAM_VERSION)
-RUBY_PATCHLEVEL=`sed -n 's/^#define RUBY_PATCHLEVEL //p' $srcdir/version.h`
-AC_DEFINE(CANONICALIZATION_FOR_MATHN)
-dnl checks for alternative programs
-AC_CANONICAL_BUILD
-RUBY_RM_RECURSIVE
-AC_ARG_WITH(gcc,
-	AS_HELP_STRING([--without-gcc], [never use gcc]),
-	[
-	AS_CASE([$withval],
-	    [no],  [: ${CC=cc}],
-	    [yes], [: ${CC=gcc}],
-	           [CC=$withval])])
-dnl If the user switches compilers, we can't believe the cache
-if test ! -z "$ac_cv_prog_CC" -a ! -z "$CC" -a "$CC" != "$ac_cv_prog_CC"
-then
-  AC_MSG_ERROR(cached CC is different -- throw away $cache_file
-(it is also a good idea to do 'make clean' before compiling))
-fi
-test -z "$CC" || ac_cv_prog_CC="$CC"
-
-if test "$program_prefix" = NONE; then
-  program_prefix=
-fi
-if test "$prefix" -ef .; then
-  AC_MSG_ERROR(--prefix cannot be the current working directory.)
-fi
-RUBY_BASE_NAME=`echo ruby | sed "$program_transform_name"`
-RUBYW_BASE_NAME=`echo rubyw | sed "$program_transform_name"`
-AC_SUBST(RUBY_BASE_NAME)
-AC_SUBST(RUBYW_BASE_NAME)
-AC_SUBST(RUBY_VERSION_NAME, '${RUBY_BASE_NAME}-${ruby_version}')
-
-AC_CANONICAL_TARGET
-test x"$target_alias" = x &&
-target_os=`echo $target_os | sed 's/linux-gnu$/linux/;s/linux-gnu/linux-/'`
-ac_install_sh='' # unusable for extension libraries.
-
-AC_ARG_WITH(os-version-style,
-	AS_HELP_STRING([--with-os-version-style=TYPE],
-		       [OS version number for target and target_os [[full]]]
-		       [(full|teeny|minor+0|minor|major+0|major|none)]),
-	[os_version_style=$withval],
-	[os_version_style=full
-	    AS_CASE($target_os, [[*[0-9].*]],
-		[AS_CASE([`/usr/bin/ruby -e 'puts RUBY_PLATFORM' 2>/dev/null`],
-		    [[*-*[0-9].*.0]], [os_version_style=minor+0],
-		    [[*-*[0-9].*.*]], [os_version_style=full],
-		    [[*-*[0-9].0]  ], [os_version_style=major+0],
-		    [[*-*[0-9].*]  ], [os_version_style=minor],
-		    [[*-*[0-9]]    ], [os_version_style=major],
-		)])
-	])
-os_version_style_transform=
-AS_CASE("${os_version_style}",
-	[full|teeny], [],
-	[minor+0], [os_version_style_transform=['s/\([0-9]\.[0-9][0-9]*\)\.[0-9][.0-9]*$/\1.0/']],
-	[minor],   [os_version_style_transform=['s/\([0-9]\.[0-9][0-9]*\)\.[0-9][.0-9]*$/\1/']],
-	[major+0], [os_version_style_transform=['s/\([0-9]\)\.[0-9][.0-9]*$/\1.0/']],
-	[major],   [os_version_style_transform=['s/\([0-9]\)\.[0-9][.0-9]*$/\1/']],
-	[none],    [os_version_style_transform=['s/[0-9]\.[0-9][.0-9]*$//']],
-	[AC_MSG_ERROR(unknown --with-os-version-style: $withval)])
-AS_IF([test -z "$target_alias" -a -n "$os_version_style_transform"],
-	[
-	target=`echo ${target} | sed "$os_version_style_transform"`
-	target_os=`echo ${target_os} | sed "$os_version_style_transform"`
-	])
-
-AC_DEFUN([RUBY_APPEND_OPTION],
-	[# RUBY_APPEND_OPTION($1)
-	AS_CASE([" [$]{$1-} "],
-	[*' $2 '*], [], ['  '], [ $1="$2"], [ $1="[$]$1 $2"])])
-AC_DEFUN([RUBY_APPEND_OPTIONS],
-	[# RUBY_APPEND_OPTIONS($1)
-	for rb_opt in $2; do
-	AS_CASE([" [$]{$1-} "],
-	[*" [$]{rb_opt} "*], [], ['  '], [ $1="[$]{rb_opt}"], [ $1="[$]$1 [$]{rb_opt}"])
-	done])
-AC_DEFUN([RUBY_PREPEND_OPTION],
-	[# RUBY_PREPEND_OPTION($1)
-	AS_CASE([" [$]{$1-} "],
-	[*' $2 '*], [], ['  '], [ $1="$2"], [ $1="$2 [$]$1"])])
-AC_DEFUN([RUBY_PREPEND_OPTIONS],
-	[# RUBY_PREPEND_OPTIONS($1)
-	unset rb_opts; for rb_opt in $2; do
-	AS_CASE([" [$]{rb_opts} [$]{$1-} "],
-	[*" [$]{rb_opt} "*], [], ['  '], [ $1="[$]{rb_opt}"], [ rb_opts="[$]{rb_opts}[$]{rb_opt} "])
-	done
-	$1="[$]{rb_opts}[$]$1"])
-
-AC_ARG_WITH(arch,
-	AS_HELP_STRING([--with-arch=ARCHS],
-		       [build an Apple/NeXT Multi Architecture Binary (MAB);
-                          ARCHS is a comma-delimited list of architectures for
-                          which to build; if this option is disabled or omitted
-			  entirely, then the package will be built only for the
-			  target platform]),
-       [target_archs="$withval"], [unset target_archs])
-
-AC_DEFUN([RUBY_DEFAULT_ARCH], [
-AC_MSG_CHECKING([arch option])
-AS_CASE([$1],
-	[*64],        [ARCH_FLAG=-m64],
-	[[i[3-6]86]], [ARCH_FLAG=-m32],
-	[AC_MSG_ERROR(unknown target architecture: $target_archs)]
-	)
-AC_MSG_RESULT([$ARCH_FLAG])
-])
-
-AC_DEFUN([RUBY_UNIVERSAL_ARCH], [
-# RUBY_UNIVERSAL_ARCH begin
-ARCH_FLAG=`expr " $CXXFLAGS " : ['.* \(-m[0-9][0-9]*\) ']`
-test ${CXXFLAGS+set} && CXXFLAGS=`echo "$CXXFLAGS" | sed [-e 's/ *-arch  *[^ ]*//g' -e 's/ *-m32//g' -e 's/ *-m64//g']`
-ARCH_FLAG=`expr " $CFLAGS " : ['.* \(-m[0-9][0-9]*\) ']`
-test ${CFLAGS+set} && CFLAGS=`echo "$CFLAGS" | sed [-e 's/ *-arch  *[^ ]*//g' -e 's/ *-m32//g' -e 's/ *-m64//g']`
-test ${LDFLAGS+set} && LDFLAGS=`echo "$LDFLAGS" | sed [-e 's/ *-arch  *[^ ]*//g' -e 's/ *-m32//g' -e 's/ *-m64//g']`
-unset universal_binary universal_archnames
-if test ${target_archs+set}; then
-    AC_MSG_CHECKING([target architectures])
-    target_archs=`echo $target_archs | tr , ' '`
-    # /usr/lib/arch_tool -archify_list $TARGET_ARCHS
-    for archs in $target_archs
-    do
-	AS_CASE([",$universal_binary,"],[*",$archs,"*], [],[
-	    cpu=`$SHELL "$ac_aux_dir/config.sub" "${archs}-${target_os}" 2>&1` || {
-	        AC_MSG_RESULT([failed])
-		AC_MSG_ERROR([$cpu])
-	    }
-	    cpu=`echo $cpu | sed 's/-.*-.*//'`
-	    universal_binary="${universal_binary+$universal_binary,}$cpu"
-	    universal_archnames="${universal_archnames} ${archs}=${cpu}"
-	    ARCH_FLAG="${ARCH_FLAG+$ARCH_FLAG }-arch $archs"
-	    ])
-    done
-    target_archs="$universal_binary"
-    unset universal_binary
-    AS_CASE(["$target_archs"],
-      [*,*], [universal_binary=yes],
-             [unset universal_archnames])
-    AC_MSG_RESULT([$target_archs])
-
-    target=`echo $target | sed "s/^$target_cpu-/-/"`
-    target_alias=`echo $target_alias | sed "s/^$target_cpu-/-/"`
-    if test "${universal_binary-no}" = yes; then
-	AC_SUBST(try_header,try_compile)
-	target_cpu=universal
-	real_cross_compiling=$cross_compiling
-    else
-	if test x"$target_cpu" != x"${target_archs}"; then
-	    echo 'int main(){return 0;}' > conftest.c
-	    if $CC $CFLAGS $ARCH_FLAG -o conftest conftest.c > /dev/null 2>&1; then
-		rm -fr conftest.*
-	    else
-		RUBY_DEFAULT_ARCH("$target_archs")
-	    fi
-	fi
-	target_cpu=${target_archs}
-    fi
-    AS_CASE(["$target"], [-*], [ target="$target_cpu${target}"])
-    AS_CASE(["$target_alias"], [-*], [ target_alias="$target_cpu${target_alias}"])
-else
-    if test x"$target_alias" = x; then
-	AS_CASE(["$target_os"],
-	  [darwin*], [
-	    AC_MSG_CHECKING([for real target cpu])
-	    target=`echo $target | sed "s/^$target_cpu-/-/"`
-	    target_cpu=`$CC -E - 2>/dev/null <<EOF |
-#ifdef __x86_64__
-"processor-name=x86_64"
-#endif
-#ifdef __i386__
-"processor-name=i386"
-#endif
-#ifdef __ppc__
-"processor-name=powerpc"
-#endif
-#ifdef __ppc64__
-"processor-name=powerpc64"
-#endif
-EOF
-	    sed -n 's/^"processor-name=\(.*\)"/\1/p'`
-	    target="$target_cpu${target}"
-	    AC_MSG_RESULT([$target_cpu])
-	    ])
-    fi
-    target_archs="$target_cpu"
-fi
-if test "${target_archs}" != "${rb_cv_target_archs-${target_archs}}"; then
-    AC_MSG_ERROR([target arch(s) has changed from ${rb_cv_target_archs-nothing} to ${target_archs}])
-else
-    rb_cv_target_archs=${target_archs}
-fi
-if test "x${ARCH_FLAG}" != x; then
-    CFLAGS="${CFLAGS:+$CFLAGS }${ARCH_FLAG}"
-    LDFLAGS="${LDFLAGS:+$LDFLAGS }${ARCH_FLAG}"
-fi
-# RUBY_UNIVERSAL_ARCH end
-])
-
-AC_ARG_ENABLE(load-relative,
-       AS_HELP_STRING([--enable-load-relative], [resolve load paths at run time]),
-       [load_relative=$enableval])
-
-AC_ARG_PROGRAM
-
-dnl Checks for programs.
-
-cflagspat=
-test -z "$optflags" ||
-    cflagspat="$cflagspat;s|"`eval echo '"'"${optflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^ */ /;s/ *$/ /'`'| |g'
-test -z "$debugflags" ||
-    cflagspat="$cflagspat;s|"`eval echo '"'"${debugflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^ */ /;s/ *$/ /'`'| |g'
-test -z "warnflags" ||
-    cflagspat="$cflagspat;s|"`eval echo '"'"${warnflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^ */ /;s/ *$/ /'`'| |g'
-if test -z "${CFLAGS+set}"; then
-    cflags=`echo " $cflags " | sed "$cflagspat;s/^ *//;s/ *$//"`
-    orig_cflags="$cflags"
-    cflags="$cflags "'${optflags} ${debugflags} ${warnflags}'
-fi
-if test -z "${CXXFLAGS+set}"; then
-    cxxflags=`echo " $cxxflags " | sed "$cflagspat;s/^ *//;s/ *$//"`
-    orig_cxxflags="$cxxflags"
-    cxxflags="$cxxflags "'${optflags} ${debugflags} ${warnflags}'
-fi
-
-RUBY_NACL
-AS_CASE(["$host_os:$build_os"],
-[darwin*:darwin*], [
-    AC_CHECK_TOOLS(CC, [clang gcc cc])
-    # Following Apple deployed clang are broken
-    # clang version 1.0 (http://llvm.org/svn/llvm-project/cfe/tags/Apple/clang-23 exported)
-    # Apple clang version 2.0 (tags/Apple/clang-137) (based on LLVM 2.9svn)
-    # Apple clang version 2.1 (tags/Apple/clang-163.7.1) (based on LLVM 3.0svn)
-    if ! $CC -E -xc - <<SRC >/dev/null; then
-	@%:@if defined __APPLE_CC__ && defined __clang_major__ && __clang_major__ < 3
-	@%:@error premature clang
-	@%:@endif
-SRC
-	AC_MSG_ERROR([clang version 3.0 or later is required])
-    fi
-])
-if test x"${build}" != x"${host}"; then
-  AC_CHECK_TOOL(CC, gcc)
-fi
-
-AC_PROG_CC
-
-dnl Select the appropriate C++ compiler in OS X
-AS_CASE(["$build_os"],
-  [darwin1*.*], [
-    AS_CASE(["x$CC"],
-      [xgcc-4.2|x/usr/bin/gcc-4.2], [: ${CXX=g++-4.2}],
-      [xgcc|x/usr/bin/gcc],         [: ${CXX=g++}],
-      [xcc|x/usr/bin/cc],           [: ${CXX=c++}],
-      [xicc],                       [: ${CXX=icpc}],
-      [xclang|x/usr/bin/clang],     [: ${CXX=clang++}])
-  ])
-test -z "$CXX" || ac_cv_prog_CXX="$CXX"
-
-AC_PROG_CXX
-RUBY_MINGW32
-AC_PROG_GCC_TRADITIONAL
-AC_SUBST(GCC)
-AS_CASE(["$target_os"],
-[solaris*], [AC_PATH_TOOL([LD], [ld], [/usr/ccs/bin/ld], [/usr/ccs/bin:$PATH])],
-[AC_CHECK_TOOL([LD], [ld], [ld])])
-AC_SUBST(LD)
-if test "$GCC" = yes; then
-    linker_flag=-Wl,
-    : ${optflags=-O3}
-    gcc_major=`echo =__GNUC__ | $CC -E -xc - | sed '/^=/!d;s///'`
-    gcc_minor=`echo =__GNUC_MINOR__ | $CC -E -xc - | sed '/^=/!d;s///'`
-    test -n "$gcc_major" || gcc_major=0
-    test -n "$gcc_minor" || gcc_minor=0
-    # RUBY_APPEND_OPTIONS(XCFLAGS, ["-include ruby/config.h" "-include ruby/missing.h"])
-else
-    linker_flag=
-fi
-
-RUBY_PROG_GNU_LD
-RUBY_CPPOUTFILE
-
-: ${OUTFLAG='-o '}
-: ${COUTFLAG=${OUTFLAG}}
-AC_SUBST(OUTFLAG)
-AC_SUBST(COUTFLAG)
-
-cc_version=
-for option in --version -v -V -qversion; do
-    cc_version_message=`$CC $option 2>&1`
-    cc_version_status=$?
-    AS_CASE($cc_version_status, [0], [:], [continue])
-    AS_CASE($cc_version_message, [*Warning*], [continue])
-    cc_version='$(CC) '$option
-done
-AC_SUBST(CC_VERSION, $cc_version)
-
-RUBY_UNIVERSAL_ARCH
-if test "$target_cpu" != "$host_cpu" -a "$GCC" = yes -a "$cross_compiling" = no -a "$universal_binary" = no; then
-    RUBY_DEFAULT_ARCH("$target_cpu")
-fi
-
-AS_CASE(["$target_cpu-$target_os"], [[i[3-6]86*]], [
-	 AC_CACHE_CHECK([for __sync_val_compare_and_swap], [rb_cv_gcc_compiler_cas], [
-			 AC_TRY_LINK([unsigned long atomic_var;],
-				     [
-				      __sync_val_compare_and_swap(&atomic_var, 0, 1);
-				      ],
-				      [rb_cv_gcc_compiler_cas=yes],
-				      [rb_cv_gcc_compiler_cas=no])])
-	 if test "$rb_cv_gcc_compiler_cas" = no; then
-		 unset rb_cv_gcc_compiler_cas
-		 save_CFLAGS="$CFLAGS"
-		 CFLAGS="$CFLAGS -march=i486"
-		 AC_CACHE_CHECK([for __sync_val_compare_and_swap with -march=i486], [rb_cv_gcc_compiler_cas], [
-				 AC_TRY_LINK([unsigned long atomic_var;],
-					     [
-					      __sync_val_compare_and_swap(&atomic_var, 0, 1);
-					      ],
-					      [rb_cv_gcc_compiler_cas=yes
-					       ARCH_FLAG="-march=i486"],
-					      [rb_cv_gcc_compiler_cas=no])])
-		 CFLAGS="$save_CFLAGS"
-	 fi])
-
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(AR, ar)
-if test -z "$AR"; then
-  AC_CHECK_PROGS(AR, aal, ar)
-fi
-AC_CACHE_CHECK([for $AR D option], [rb_cv_ar_D_option], [
-    AS_IF([$AR rcD conftest.a > /dev/null 2>&1 && rm conftest.a],
-	[rb_cv_ar_D_option=yes], [rb_cv_ar_D_option=no])
-])
-AS_IF([test "$rb_cv_ar_D_option" = yes], [ARFLAGS='rcD '], [ARFLAGS='rcu '])
-AC_SUBST(ARFLAGS)
-
-AC_CHECK_TOOL(AS, as)
-ASFLAGS=$ASFLAGS
-AC_SUBST(ASFLAGS)
-
-AS_CASE(["$target_os"],[cygwin*|mingw*], [ac_cv_prog_ac_ct_OBJCOPY=":"])
-
-# BSD's ports and MacPorts prefix GNU binutils with 'g'
-AC_CHECK_TOOLS(OBJDUMP, [objdump gobjdump])
-AC_CHECK_TOOLS(OBJCOPY, [objcopy gobjcopy])
-
-AS_CASE(["$target_os"],
-[cygwin*|mingw*], [
-    AC_CHECK_TOOL(WINDRES, windres)
-    AC_CHECK_TOOL(DLLWRAP, dllwrap)
-    target=`echo $target | sed "s/^$target_cpu-/-/"`
-    target_alias=`echo $target_alias | sed "s/^$target_cpu-/-/"`
-    target_cpu=`echo $target_cpu | sed s/i.86/i386/`
-    AS_CASE(["$target"], [-*], [ target="$target_cpu${target}"])
-    AS_CASE(["$target_alias"], [-*], [ target_alias="$target_cpu${target_alias}"])
-    AS_CASE(["$target_os"],
-    [mingw*], [
-	test "$rb_cv_msvcrt" = "" && unset rb_cv_msvcrt
-	AC_CACHE_CHECK(for mingw32 runtime DLL, rb_cv_msvcrt, [
-	AC_TRY_LINK([@%:@include <stdio.h>],
-		    [FILE* volatile f = stdin; return 0;],
-		    [rb_cv_msvcrt=`$OBJDUMP -p conftest$ac_exeext |
-				   tr A-Z a-z |
-				   sed -n '/^[[ 	]]*dll name: \(msvc.*\)\.dll$/{s//\1/p;q;}'`],
-		    [rb_cv_msvcrt=msvcrt])
-	test "$rb_cv_msvcrt" = "" && rb_cv_msvcrt=msvcrt])
-	RT_VER=`echo "$rb_cv_msvcrt" | tr -cd [0-9]`
-	test "$RT_VER" = "" && RT_VER=60
-	AC_DEFINE_UNQUOTED(RUBY_MSVCRT_VERSION, $RT_VER)
-    ])
-    : ${enable_shared=yes}
-    ],
-[aix*],     [AC_CHECK_TOOL(NM, nm, /usr/ccs/bin/nm, /usr/ccs/bin:$PATH)],
-[hiuxmpp*], [AC_DEFINE(__HIUX_MPP__)])    # by TOYODA Eizi <toyoda@npd.kishou.go.jp>
-AC_CHECK_TOOL(NM, nm)
-
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
-AC_PROG_INSTALL
-AC_PROG_MKDIR_P
-if test "x$MKDIR_P" = "x -d"; then
-  if test x"$as_mkdir_p" != xfalse; then
-    MKDIR_P='mkdir -p'
-    echo "use 'mkdir -p' as MKDIR_P"
-  else
-    AC_MSG_ERROR([mkdir -p is required])
-  fi
-fi
-MAKEDIRS="$MKDIR_P"
-AC_SUBST(MAKEDIRS)
-
-AC_DEFUN([RUBY_DTRACE_AVAILABLE],
-[AC_CACHE_CHECK(whether dtrace USDT is available, rb_cv_dtrace_available,
-[
-    echo "provider conftest{ probe fire(); };" > conftest_provider.d
-    if $DTRACE -h -o conftest_provider.h -s conftest_provider.d >/dev/null 2>/dev/null; then
-      AC_TRY_COMPILE([@%:@include "conftest_provider.h"], [CONFTEST_FIRE();], [
-	# DTrace is available on the system
-	rb_cv_dtrace_available=yes
-      ], [rb_cv_dtrace_available=no])
-    else
-      # DTrace is not available while dtrace command exists
-      # for example FreeBSD 8 or FreeBSD 9 without DTrace build option
-      rb_cv_dtrace_available=no
-    fi
-    rm -f conftest.[co] conftest_provider.[dho]
-])
-])
-
-AC_DEFUN([RUBY_DTRACE_POSTPROCESS],
-[AC_CACHE_CHECK(whether $DTRACE needs post processing, rb_cv_prog_dtrace_g,
-[
-  rb_cv_prog_dtrace_g=no
-  if {
-    cat >conftest_provider.d <<_PROBES &&
-    provider conftest {
-      probe fire();
-    };
-_PROBES
-    $DTRACE -h -o conftest_provider.h -s conftest_provider.d >/dev/null 2>/dev/null &&
-    :
-  }; then
-    AC_TRY_COMPILE([@%:@include "conftest_provider.h"], [CONFTEST_FIRE();], [
-	if {
-	    cp -p conftest.${ac_objext} conftest.${ac_objext}.save &&
-	    $DTRACE -G -s conftest_provider.d conftest.${ac_objext} 2>/dev/null &&
-	    :
-	}; then
-	    if cmp -s conftest.o conftest.${ac_objext}.save; then
-		rb_cv_prog_dtrace_g=yes
-	    else
-		rb_cv_prog_dtrace_g=rebuild
-	    fi
-	fi])
-  fi
-  rm -f conftest.[co] conftest_provider.[dho]
-])
-])
-
-AC_CHECK_PROG([DTRACE], [${ac_tool_prefix}dtrace], [${ac_tool_prefix}dtrace])
-if test "$cross_compiling:$ac_cv_prog_DTRACE" = no: -a -n "$ac_tool_prefix"; then
-    AC_CHECK_PROG([DTRACE], [dtrace], [dtrace])
-fi
-
-AC_CHECK_PROGS(DOT, dot)
-AC_CHECK_PROGS(DOXYGEN, doxygen)
-AS_CASE(["${host_os}"], [nacl], [AC_PATH_PROG(PYTHON, python)])
-
-AC_CHECK_PROG(PKG_CONFIG, pkg-config, [pkg-config], [], [],
-    [`"$as_dir/$ac_word$ac_exec_ext" --print-errors --version > /dev/null 2>&1 || echo "$as_dir/$ac_word$ac_exec_ext"`])
-
-# checks for UNIX variants that set C preprocessor variables
-AC_USE_SYSTEM_EXTENSIONS
-
-AC_SUBST(RM, ['rm -f'])
-AC_SUBST(CP, ['cp'])
-RMDIRS='$(top_srcdir)/tool/rmdirs'
-RMDIR=rmdir
-mkdir "rmdirs_$$_test" "rmdirs_$$_test/a"
-rmdir --ignore-fail-on-non-empty "rmdirs_$$_test" 2>/dev/null &&
-RMDIR='rmdir --ignore-fail-on-non-empty'
-$RMDIR -p "rmdirs_$$_test/a" 2>/dev/null &&
-{ test -d "rmdirs_$$_test" || RMDIRS="$RMDIR -p"; }
-rmdir "rmdirs_$$_test/a" "rmdirs_$$_test" 2>/dev/null
-AC_SUBST(RMDIR)
-AC_SUBST(RMDIRS)
-AC_SUBST(RMALL, ['rm -fr'])
-
-AC_MSG_CHECKING([for cd using physical directory])
-rm -fr conf$$.dir
-mkdir conf$$.dir &&
-(cd conf$$.dir && mkdir src build && cd src &&
-$as_ln_s ../build . > /dev/null 2>&1 && cd build &&
-for chdir in 'cd -P' 'PWD= cd'; do
-    /bin/sh -c "$chdir ../src && echo '$chdir' > cdcmd" 2> /dev/null && break
-done)
-if test -f conf$$.dir/src/cdcmd; then
-    read CHDIR < conf$$.dir/src/cdcmd 2> /dev/null
-else
-    CHDIR=cd
-fi
-rm -fr conf$$.dir
-AC_MSG_RESULT([$CHDIR])
-AC_SUBST(CHDIR)
-
-}
-{ # compiler section
-
-AC_DEFUN([RUBY_WERROR_FLAG], [dnl
-save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $rb_cv_warnflags"
-if test "${ac_c_werror_flag+set}"; then
-  rb_c_werror_flag="$ac_c_werror_flag"
-else
-  unset rb_c_werror_flag
-fi
-ac_c_werror_flag=yes
-$1
-CFLAGS="$save_CFLAGS"
-save_CFLAGS=
-if test "${rb_c_werror_flag+set}"; then
-  ac_c_werror_flag="$rb_c_werror_flag"
-else
-  unset ac_c_werror_flag
-fi])
-
-RUBY_WERROR_FLAG([
-    AC_MSG_CHECKING([whether CFLAGS is valid])
-    AC_TRY_COMPILE([], [],
-	[AC_MSG_RESULT(yes)],
-	[
-	AC_MSG_RESULT(no)
-	AC_MSG_ERROR([something wrong with CFLAGS="$CFLAGS"])
-	]
-    )
-    AC_MSG_CHECKING([whether LDFLAGS is valid])
-    {
-	mkdir tmp.$$.try_link &&
-	cd tmp.$$.try_link &&
-	cp ../confdefs.h . &&
-	echo '<?xml?><plist><dict><key>CFBundleIdentifier</key><string></string></dict></plist>' > Info.plist &&
-	:
-    } || AC_MSG_ERROR([failed to make temporary directory])
-    AC_TRY_LINK([], [],
-	[AC_MSG_RESULT(yes)],
-	[
-	cd .. && rm -fr tmp.$$.try_link
-	AC_MSG_RESULT(no)
-	AC_MSG_ERROR([something wrong with LDFLAGS="$LDFLAGS"])
-	]
-    )
-    cd .. && rm -fr tmp.$$.try_link
-])
-
-AC_DEFUN([RUBY_TRY_CFLAGS], [
-    AC_MSG_CHECKING([whether ]$1[ is accepted as CFLAGS])
-    RUBY_WERROR_FLAG([
-    CFLAGS="[$]CFLAGS $1"
-    AC_TRY_COMPILE([$4], [$5],
-	[$2
-	AC_MSG_RESULT(yes)],
-	[$3
-	AC_MSG_RESULT(no)])
-    ])
-])
-
-AC_DEFUN([RUBY_TRY_LDFLAGS], [
-    save_LDFLAGS="$LDFLAGS"
-    LDFLAGS="[$]LDFLAGS $1"
-    AC_MSG_CHECKING([whether $1 is accepted as LDFLAGS])
-    RUBY_WERROR_FLAG([
-    AC_TRY_LINK([$4], [$5],
-	[$2
-	AC_MSG_RESULT(yes)],
-	[$3
-	AC_MSG_RESULT(no)])
-    ])
-    LDFLAGS="$save_LDFLAGS"
-    save_LDFLAGS=
-])
-
-AS_CASE([$RUBY_PATCHLEVEL], [-*],
-	[particular_werror_flags=yes], [particular_werror_flags=no])
-AC_ARG_ENABLE(werror,
-	AS_HELP_STRING([--disable-werror],
-		       [don't make warnings into errors
-		       even if a compiler support -Werror feature
-		       [[disabled by default unless development version]]]),
-	[particular_werror_flags=$enableval])
-
-rb_cv_warnflags="$warnflags"
-if test "$GCC:${warnflags+set}:no" = yes::no; then
-    if test $gcc_major -ge 4; then
-	extra_warning=-Werror=extra-tokens
-    else
-	extra_warning=
-    fi
-    if test $gcc_major -eq 5; then
-	extra_warning="$extra_warning -Wno-maybe-uninitialized"
-    fi
-    for wflag in -Wno-unused-parameter -Wno-parentheses -Wno-long-long \
-                 -diag-disable=2259 \
-		 -Wno-missing-field-initializers \
-		 -Wno-tautological-compare \
-		 -Wno-parentheses-equality \
-		 -Wno-constant-logical-operand \
-		 -Wno-self-assign \
-		 -Wunused-variable \
-		 -Werror=implicit-int \
-		 -Werror=pointer-arith \
-		 -Werror=write-strings \
-		 -Werror=declaration-after-statement \
-		 -Werror=shorten-64-to-32 \
-		 -Werror=implicit-function-declaration \
-		 -Werror=division-by-zero \
-		 -Werror=deprecated-declarations \
-		 -Wno-packed-bitfield-compat \
-		 -Wsuggest-attribute=noreturn \
-		 -Wsuggest-attribute=format \
-		 $extra_warning \
-		 ; do
-	if test "$particular_werror_flags" != yes; then
-	    wflag=`echo x$wflag | sed 's/^x-Werror=/-W/;s/^x//'`
-	fi
-	ok=no
-	RUBY_TRY_CFLAGS($wflag, [
-	    RUBY_APPEND_OPTIONS(warnflags, $wflag)
-	    ok=yes
-	])
-	AS_CASE([$ok:$wflag], [no:-Werror=*], [
-	    wflag=`echo x$wflag | sed 's/^x-Werror=/-W/'`
-	    RUBY_TRY_CFLAGS($wflag, [
-		RUBY_APPEND_OPTIONS(warnflags, $wflag)
-		particular_werror_flags=no
-	    ])
-	])
-    done
-    AS_CASE([" $warnflags "],[*" -Wno-missing-field-initializers "*], [wflag="-Wall -Wextra"],
-                             [wflag=-Wall])
-    RUBY_TRY_CFLAGS($wflag, [warnflags="$wflag${warnflags+ $warnflags}"])
-    # Disable warnflags while conftest. -Werror=* flags might make bad OS capability guess.
-    rb_cv_warnflags="$warnflags"
-    warnflags=
-fi
-RUBY_TRY_CFLAGS(-Qunused-arguments, [RUBY_APPEND_OPTIONS(rb_cv_wsuppress_flags, -Qunused-arguments)])
-
-for n in infinity nan; do
-    m=AS_TR_CPP($n)
-    AC_CACHE_CHECK([whether $m is available without C99 option], rb_cv_$n,
-	[AC_COMPILE_IFELSE(
-	    [AC_LANG_BOOL_COMPILE_TRY(AC_INCLUDES_DEFAULT([@%:@include <math.h>
-@%:@ifndef $m
-@%:@error no $m
-@%:@endif
-]), [1])], [eval rb_cv_$n=yes], [eval rb_cv_$n=no])])
-    if eval test '"$rb_cv_'$n'"' = yes; then
-	AC_DEFINE_UNQUOTED([HAVE_]$m)
-    fi
-done
-
-if test "$GCC" = yes; then
-    # NaCl's glibc build generates undefined references to __memset_chk.
-    # TODO(sbc): Remove this once NaCl's glibc is fixed.
-    AS_CASE(["$target_os"], [nacl], [], [
-      # -D_FORTIFY_SOURCE
-      # When defined _FORTIFY_SOURCE, glibc enables some additional sanity
-      # argument check. The performance drop is very little and Ubuntu enables
-      # _FORTIFY_SOURCE=2 by default. So, let's support it for protecting us from
-      # a mistake of silly C extensions.
-      RUBY_TRY_CFLAGS(-D_FORTIFY_SOURCE=2, [RUBY_APPEND_OPTION(XCFLAGS, -D_FORTIFY_SOURCE=2)])
-   ])
-
-    # -fstack-protector
-    AS_CASE(["$target_os"],
-    [mingw*|nacl], [
-	stack_protector=no
-    ])
-    if test -z "${stack_protector+set}"; then
-	RUBY_TRY_CFLAGS(-fstack-protector, [stack_protector=yes], [stack_protector=no])
-	if test "x$stack_protector" = xyes; then
-	    RUBY_TRY_LDFLAGS(-fstack-protector, [], [stack_protector=broken])
-	fi
-    fi
-    if test "x$stack_protector" = xyes; then
-	RUBY_APPEND_OPTION(XCFLAGS, -fstack-protector)
-	RUBY_APPEND_OPTION(XLDFLAGS, -fstack-protector)
-	RUBY_APPEND_OPTION(LDFLAGS, -fstack-protector)
-    fi
-
-    AS_CASE(["$target_os"],[mingw*], [
-      # On  Windows  platforms,   system  provided  headers  are  VC++
-      # optimized.  That  is, C++  habits are often  contaminated into
-      # various  headers.  Most frequent  situation is  the use  of //
-      # comments.   We  bypass  ANSI   C  mode  for  them.   Otherwise
-      # extension libs cannot include those headers.
-    ],
-    [cygwin*|darwin*|netbsd*|nacl], [
-      # need lgamma_r(), finite()
-    ],
-    [
-      # ANSI (no XCFLAGS because this is C only)
-	for ansi_options in -std=gnu99; do
-	    RUBY_TRY_CFLAGS(${ansi_options}, [
-		RUBY_APPEND_OPTIONS(warnflags, ${ansi_options})
-		RUBY_APPEND_OPTIONS(strict_warnflags, ${ansi_options})
-	    ], [ansi_options=])
-	    test "x${ansi_options}" = x || break
-	done
-    ])
-
-    # suppress annoying -Wstrict-overflow warnings
-    RUBY_TRY_CFLAGS(-fno-strict-overflow, [RUBY_APPEND_OPTION(XCFLAGS, -fno-strict-overflow)])
-
-    test "${debugflags+set}" || {RUBY_TRY_CFLAGS(-ggdb3, [debugflags=-ggdb3])}
-    test "${debugflags+set}" || {RUBY_TRY_CFLAGS(-ggdb, [debugflags=-ggdb])}
-    test "${debugflags+set}" || {RUBY_TRY_CFLAGS(-g3, [debugflags=-g3])}
-fi
-test $ac_cv_prog_cc_g = yes && : ${debugflags=-g}
-
-if test "$GCC" = ""; then
-    AS_CASE(["$target_os"],[aix*],[warnflags="$warnflags -qinfo=por" rb_cv_warnflags="$rb_cv_warnflags -qinfo=por"])
-fi
-if test "$GCC" = yes; then
-    if test "$gcc_major" -ge 4; then
-	RUBY_TRY_CFLAGS(-fvisibility=hidden, [visibility_option=yes], [visibility_option=no])
-    fi
-    AC_SUBST(WERRORFLAG, "-Werror")
-    if test "$visibility_option" = yes; then
-	RUBY_APPEND_OPTION(XCFLAGS, -fvisibility=hidden)
-	AC_DEFINE(RUBY_SYMBOL_EXPORT_BEGIN, [_Pragma("GCC visibility push(default)")])
-	AC_DEFINE(RUBY_SYMBOL_EXPORT_END,   [_Pragma("GCC visibility pop")])
-    else
-	RUBY_TRY_LDFLAGS([-Wl,-unexported_symbol,_Init_*], [visibility_option=ld], [visibility_option=no])
-    fi
-    test "$visibility_option" = no -o "$host_os" = nacl || OBJCOPY=:
-fi
-
-if test "$GCC" = yes; then
-    # optflags
-
-    AS_CASE(["$target_os"], [mingw*], [
-	RUBY_TRY_CFLAGS(-fno-omit-frame-pointer, [optflags="${optflags+$optflags }-fno-omit-frame-pointer"])
-	RUBY_TRY_CFLAGS(-static-libgcc, [static_libgcc=yes], [static_libgcc=no])
-	if test "$static_libgcc" = yes; then
-	    RUBY_APPEND_OPTION(EXTLDFLAGS, -static-libgcc)
-	fi
-    ])
-
-    # disable fast-math
-    for oflag in -fno-fast-math; do
-	RUBY_TRY_CFLAGS($oflag, [RUBY_APPEND_OPTION(optflags, $oflag)])
-    done
-    for oflag in -fexcess-precision=standard -fp-model\ precise; do
-	RUBY_TRY_CFLAGS($oflag, [RUBY_APPEND_OPTION(XCFLAGS, $oflag)])
-    done
-fi
-
-AC_ARG_WITH(opt-dir,
-	AS_HELP_STRING([--with-opt-dir=DIR-LIST],
-		       [add optional headers and libraries directories separated by $PATH_SEPARATOR]),
-	[
-		val=`echo "$PATH_SEPARATOR$withval" | sed "s|$PATH_SEPARATOR\([[^$PATH_SEPARATOR]*]\)| -I\1/include|g;s/^ //"`
-		CPPFLAGS="$CPPFLAGS $val"
-		val=`echo "$PATH_SEPARATOR$withval" | sed "s|$PATH_SEPARATOR\([[^$PATH_SEPARATOR]*]\)| -L\1/lib|g;s/^ //"`
-		LDFLAGS="$LDFLAGS $val"
-		LDFLAGS_OPTDIR="$val"
-		OPT_DIR="$withval"
-	], [OPT_DIR=])
-
-test -z "${ac_env_CFLAGS_set}" -a -n "${cflags+set}" && eval CFLAGS="\"$cflags $ARCH_FLAG\""
-test -z "${ac_env_CXXFLAGS_set}" -a -n "${cxxflags+set}" && eval CXXFLAGS="\"$cxxflags $ARCH_FLAG\""
-
-}
-{ # header and library section
-
-AC_ARG_WITH(winnt-ver,
-  AS_HELP_STRING([--with-winnt-ver=0xXXXX], [target Windows NT version (default to 0x0501)]),
-  [with_winnt_ver="$withval"], [with_winnt_ver="0x0501"])
-AS_CASE(["$target_os"],
-[mingw*], [
-  RUBY_APPEND_OPTION(CPPFLAGS, -D_WIN32_WINNT=$with_winnt_ver)
-  RUBY_APPEND_OPTION(CPPFLAGS, -D__MINGW_USE_VC2005_COMPAT)
-])
-
-AS_CASE(["$target_os"],
-[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=$rb_cv_enable_pthread_default
-  ],
-[mingw*], [
-  enable_pthread=no
-  ],
-[
-  enable_pthread=yes
-  ])
-
-AC_ARG_ENABLE(pthread,
-       AS_HELP_STRING([--enable-pthread], [obsolete, and ignored]))
-
-dnl Checks for libraries.
-AS_CASE(["$target_os"],[*bsd*|dragonfly*],[],[ac_cv_func_daemon=no])
-
-POSTLINK=:
-AC_SUBST(POSTLINK)
-AS_CASE(["$target_os"],
-[nextstep*], [	],
-[openstep*], [	],
-[rhapsody*], [	],
-[darwin*], [	RUBY_PREPEND_OPTION(LIBS, -lobjc)
-		RUBY_APPEND_OPTIONS(CPPFLAGS, -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT)
-		AC_MSG_CHECKING(whether Mac OS X 10.5 or later)
-		AC_TRY_CPP([#include <AvailabilityMacros.h>
-		    #if MAC_OS_X_VERSION_MAX_ALLOWED <= 1040
-		    #error pre OS X 10.4
-		    [!<===== pre OS X 10.4 =====>]
-		    #endif
-		    ],
-		    [macosx_10_5=yes], [macosx_10_5=no])
-		AC_MSG_RESULT($macosx_10_5)
-		if test $macosx_10_5 = yes; then
-		    ac_cv_func_getcontext=no
-		    ac_cv_func_setcontext=no
-		else
-		    AC_DEFINE(BROKEN_SETREUID, 1)
-		    AC_DEFINE(BROKEN_SETREGID, 1)
-		fi
-		incs=`$CC -v -E -xc - < /dev/null 2>&1 | sed ['1,/^@%:@include </d;s/^ *//;s|[^./][^/]*/\.\./||g;/\/include$/!d;s||/lib|;/\/usr\/lib/d']`
-		for d in `$CC -print-search-dirs | sed -e '/^libraries: */!d;s///' | tr : '\012' | fgrep -v /../ | sed -n 's|^\(/.*/lib\)/$|\1|p'`; do
-		    incs=`echo "$incs" | fgrep -v "$d"`
-		done
-		for d in $incs; do
-		    test -d "$d" && RUBY_APPEND_OPTIONS(LDFLAGS, "-L$d")
-		done
-		ac_cv_type_getgroups=gid_t # getgroups() on Rosetta fills garbage
-		ac_cv_lib_crypt_crypt=no
-		ac_cv_func_fdatasync=no # Mac OS X wrongly reports it has fdatasync()
-		ac_cv_func_vfork=no
-		if test $gcc_major -lt 4 -o \( $gcc_major -eq 4 -a $gcc_minor -lt 3 \); then
-		    ac_cv_func___builtin_setjmp=no
-		fi
-		AC_CACHE_CHECK(for broken crypt with 8bit chars, rb_cv_broken_crypt,
-		    [AC_TRY_RUN([
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-
-void
-broken_crypt(const char *salt, const char *buf1, const char *buf2)
-{
-#if 0
-    printf("%.2x%.2x: %s -> %s\n", (unsigned char)salt[0], (unsigned char)salt[1],
-	   buf1+2, buf2+2);
-#endif
-}
-
-int
-main()
-{
-    int i;
-    char salt[2], buf[256], *s;
-    for (i = 0; i < 128*128; i++) {
-	salt[0] = 0x80 | (i & 0x7f);
-	salt[1] = 0x80 | (i >> 7);
-	strcpy(buf, crypt("", salt));
-	if (strcmp(buf, s = crypt("", salt))) {
-	    broken_crypt(salt, buf, s);
-	    return 1;
-	}
-    }
-    salt[0] = salt[1] = ' ';
-    strcpy(buf, crypt("", salt));
-    salt[0] = salt[1] = 0x80 | ' ';
-    if (strcmp(buf, s = crypt("", salt))) {
-	broken_crypt(salt, buf, s);
-	return 1;
-    }
-    return 0;
-}
-],
-		    rb_cv_broken_crypt=no,
-		    rb_cv_broken_crypt=yes,
-		    rb_cv_broken_crypt=yes)])
-		if test "$rb_cv_broken_crypt" = yes; then
-		   AC_DEFINE(BROKEN_CRYPT, 1)
-		fi
-		AC_CHECK_PROGS(codesign, codesign)
-		if test -n "$codesign"; then
-		    POSTLINK="test -z '\$(RUBY_CODESIGN)' || $codesign -s '\$(RUBY_CODESIGN)' -f \$@"
-		    LINK_SO="$LINK_SO
-\$(POSTLINK)"
-		fi
-		AC_CHECK_HEADERS(crt_externs.h, [], [], [
-		    #include <crt_externs.h>
-		])
-		],
-[hpux*], [	LIBS="-lm $LIBS"
-		ac_cv_c_inline=no],
-[solaris*], [	LIBS="-lm $LIBS"
-		ac_cv_func_vfork=no
-		AC_MSG_CHECKING(whether _XOPEN_SOURCE is already given)
-		AC_TRY_COMPILE([#include <unistd.h>
-		    #ifndef _XOPEN_SOURCE
-		    #error _XOPEN_SOURCE is not defined
-		    #endif
-		    ], [],
-		    [given_xopen_source=yes], [given_xopen_source=no])
-		AC_MSG_RESULT($given_xopen_source)
-		if test $given_xopen_source = no; then
-		  # On Solaris, with gcc, -std=iso9899:1999 in $ansi_options
-		  # is often also needed in CPPFLAGS, because some feature
-		  # definitions vary depending on such standards options.
-		  AS_CASE(["${ansi_options}"],
-		  [*-std=iso9899:1999*], [
-		    RUBY_APPEND_OPTIONS(CPPFLAGS, ${ansi_options})
-		  ])
-		  AC_MSG_CHECKING(appropriate _XOPEN_SOURCE value to define)
-		  define_xopen_source=""
-		  for tmp_xpg in 7 6 5; do
-		    if test x"$define_xopen_source" != x; then
-		        break
-		    fi
-		    # Both AC_TRY_CPP and AC_TRY_COMPILE should pass
-		    # because some options may not be set to CPPFLAGS.
-		    AC_TRY_CPP([
-			#define _XOPEN_SOURCE ${tmp_xpg}00
-			#include <unistd.h>
-			#ifndef _XPG${tmp_xpg}
-			#error _XPG${tmp_xpg} should be defined by _XOPEN_SOURCE=${tmp_xpg}00
-			#endif
-			], [
-			AC_TRY_COMPILE([
-			#define _XOPEN_SOURCE ${tmp_xpg}00
-			#include <unistd.h>
-			#ifndef _XPG${tmp_xpg}
-			#error _XPG${tmp_xpg} should be defined by _XOPEN_SOURCE=${tmp_xpg}00
-			#endif
-			], [],
-			[define_xopen_source=${tmp_xpg}00], [])
-			], [])
-		  done
-		  if test x"$define_xopen_source" = x; then
-		    define_xopen_source=no
-		  fi
-		  AC_MSG_RESULT($define_xopen_source)
-		  if test x"$define_xopen_source" != xno; then
-		    RUBY_APPEND_OPTIONS(CPPFLAGS, -D_XOPEN_SOURCE=$define_xopen_source)
-		  fi
-		fi
-		],
-[haiku*], [
-		LIBS="$LIBS" # m lib is include in root
-		],
-[cygwin*], [	ac_cv_header_langinfo_h=yes
-		RUBY_APPEND_OPTIONS(CPPFLAGS, -D_XOPEN_SOURCE -D_GNU_SOURCE)
-		AC_CHECK_FUNCS(cygwin_conv_path)
-		AC_LIBOBJ([langinfo])
-		],
-[mingw*], [	LIBS="-lshell32 -lws2_32 -liphlpapi -limagehlp -lshlwapi $LIBS"
-		ac_cv_header_a_out_h=no
-		ac_cv_header_pwd_h=no
-		ac_cv_header_utime_h=no
-		ac_cv_header_sys_ioctl_h=no
-		ac_cv_header_sys_param_h=no
-		ac_cv_header_sys_resource_h=no
-		ac_cv_header_sys_select_h=no
-		ac_cv_header_sys_time_h=no
-		ac_cv_header_sys_times_h=no
-		ac_cv_header_sys_socket_h=no
-		ac_cv_func_lstat=yes
-		ac_cv_func_times=yes
-		ac_cv_func_waitpid=yes
-		ac_cv_func_fsync=yes
-		ac_cv_func_seekdir=yes
-		ac_cv_func_telldir=yes
-		ac_cv_func_isinf=yes
-		ac_cv_func_isnan=yes
-		ac_cv_func_finite=yes
-		ac_cv_func_lchown=yes
-		ac_cv_func_link=yes
-		ac_cv_func_readlink=yes
-		ac_cv_func_symlink=yes
-		ac_cv_lib_crypt_crypt=no
-		ac_cv_func_getpgrp_void=no
-		ac_cv_func_memcmp_working=yes
-		ac_cv_lib_dl_dlopen=no
-		rb_cv_binary_elf=no
-		rb_cv_negative_time_t=no
-		ac_cv_func_fcntl=yes
-		ac_cv_func_flock=yes
-		ac_cv_func_gmtime_r=yes
-		rb_cv_large_fd_select=yes
-		ac_cv_type_struct_timeval=yes
-                ac_cv_func_clock_gettime=yes
-                ac_cv_func_clock_getres=yes
-		ac_cv_func_malloc_usable_size=no
-		{ test "$target_cpu" = x64 && ac_cv_func___builtin_setjmp=no; }
-		AC_CHECK_TYPE([NET_LUID], [], [],
-			      [@%:@include <winsock2.h>
-			      @%:@include <iphlpapi.h>])
-		if test x"$ac_cv_type_NET_LUID" = xyes; then
-		    AC_DEFINE(HAVE_TYPE_NET_LUID, 1)
-		fi
-		AC_CHECK_FUNCS(_gmtime64_s)
-		AC_CHECK_FUNCS(_wfreopen_s)
-		AC_LIBOBJ([langinfo])
-		],
-[bsdi*], [	LIBS="-lm $LIBS"
-		AC_DEFINE(BROKEN_SETREUID, 1)
-		AC_DEFINE(BROKEN_SETREGID, 1)
-                ac_cv_sizeof_rlim_t=8],
-[freebsd*], [	LIBS="-lm $LIBS"
-		ac_cv_func_getpeername=no
-		ac_cv_func_getsockname=no
-		ac_cv_func_shutdown=no
-		ac_cv_func_close=no
-		],
-[netbsd*], [	LIBS="-lm $LIBS"
-		],
-[dragonfly*], [	LIBS="-lm $LIBS"
-		# isinf() and isnan() are macros on DragonFly.
-		ac_cv_func_isinf=yes
-		ac_cv_func_isnan=yes
-		],
-[aix*],[	LIBS="-lm $LIBS"
-		ac_cv_func_round=no
-		],
-[nacl], [
-  LIBS="-lm $LIBS"
-  if test "${nacl_cv_build_variant}" = "newlib"; then
-    RUBY_APPEND_OPTION(CPPFLAGS, -DNACL_NEWLIB)
-  else
-    RUBY_APPEND_OPTION(XCFLAGS, -fPIC)
-  fi
-  ],
-[	LIBS="-lm $LIBS"])
-
-AC_CHECK_LIB(crypt, crypt)      # glibc (GNU/Linux, GNU/Hurd, GNU/kFreeBSD)
-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, shutdown)  # SunOS/Solaris
-
-dnl Checks for header files.
-AC_HEADER_DIRENT
-dnl AC_HEADER_STDC has been checked in AC_USE_SYSTEM_EXTENSIONS
-AC_HEADER_STDBOOL
-AC_HEADER_SYS_WAIT
-
-AC_CHECK_HEADERS(a.out.h)
-AC_CHECK_HEADERS(atomic.h)
-AC_CHECK_HEADERS(direct.h)
-AC_CHECK_HEADERS(grp.h)
-AC_CHECK_HEADERS(fcntl.h)
-AC_CHECK_HEADERS(float.h)
-AC_CHECK_HEADERS(ieeefp.h)
-AC_CHECK_HEADERS(intrinsics.h)
-AC_CHECK_HEADERS(langinfo.h)
-AC_CHECK_HEADERS(limits.h)
-AC_CHECK_HEADERS(locale.h)
-AC_CHECK_HEADERS(malloc.h)
-AC_CHECK_HEADERS(malloc/malloc.h)
-AC_CHECK_HEADERS(malloc_np.h)
-AC_CHECK_HEADERS(net/socket.h)
-AC_CHECK_HEADERS(process.h)
-AC_CHECK_HEADERS(pwd.h)
-AC_CHECK_HEADERS(setjmpex.h)
-AC_CHECK_HEADERS(sys/attr.h)
-AC_CHECK_HEADERS(sys/fcntl.h)
-AC_CHECK_HEADERS(sys/file.h)
-AC_CHECK_HEADERS(sys/id.h)
-AC_CHECK_HEADERS(sys/ioctl.h)
-AC_CHECK_HEADERS(sys/mkdev.h)
-AC_CHECK_HEADERS(sys/param.h)
-AC_CHECK_HEADERS(sys/prctl.h)
-AC_CHECK_HEADERS(sys/resource.h)
-AC_CHECK_HEADERS(sys/select.h)
-AC_CHECK_HEADERS(sys/sendfile.h)
-AC_CHECK_HEADERS(sys/socket.h)
-AC_CHECK_HEADERS(sys/syscall.h)
-AC_CHECK_HEADERS(sys/time.h)
-AC_CHECK_HEADERS(sys/times.h)
-AC_CHECK_HEADERS(sys/uio.h)
-AC_CHECK_HEADERS(sys/utime.h)
-AC_CHECK_HEADERS(syscall.h)
-AC_CHECK_HEADERS(time.h)
-AC_CHECK_HEADERS(ucontext.h)
-AC_CHECK_HEADERS(utime.h)
-
-AC_ARG_WITH([gmp],
-  [AS_HELP_STRING([--without-gmp],
-    [disable GNU GMP to accelerate Bignum operations])],
-  [],
-  [with_gmp=yes])
-AS_IF([test "x$with_gmp" != xno],
-  [AC_CHECK_HEADERS(gmp.h)
-   AS_IF([test "x$ac_cv_header_gmp_h" != xno],
-     AC_CHECK_LIB([gmp], [__gmpz_init]))
-   with_gmp="$ac_cv_lib_gmp___gmpz_init"
-   AS_IF([test -z "$with_gmp"], [with_gmp=no])])
-
-AC_ARG_WITH([jemalloc],
-  [AS_HELP_STRING([--with-jemalloc],[use jemalloc allocator])],
-  [with_jemalloc=$withval], [with_jemalloc=no])
-AS_IF([test "x$with_jemalloc" = xyes],[
-  AC_CHECK_LIB([jemalloc], [malloc_conf], [], [with_jemalloc=no])
-  AC_CHECK_HEADER(jemalloc/jemalloc.h, [
-    AC_DEFINE(RUBY_ALTERNATIVE_MALLOC_HEADER, [<jemalloc/jemalloc.h>])
-  ])
-  AS_IF([test "x$with_jemalloc" = xno], [
-    AC_CACHE_CHECK([for jemalloc with JEMALLOC_MANGLE], rb_cv_jemalloc_demangle,
-      [AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@define JEMALLOC_MANGLE 1
-      @%:@ifdef RUBY_ALTERNATIVE_MALLOC_HEADER
-      @%:@include RUBY_ALTERNATIVE_MALLOC_HEADER
-      @%:@else
-      @%:@include <jemalloc.h>
-      @%:@endif], [return !&malloc_conf])],
-      [rb_cv_jemalloc_demangle=yes],
-      [rb_cv_jemalloc_demangle=no])
-    ])
-  ])
-  AS_IF([test "x$rb_cv_jemalloc_demangle" = xyes], [
-    AC_DEFINE(JEMALLOC_MANGLE)
-    with_jemalloc=yes
-  ])
-  AS_IF([test "x$with_jemalloc" = xyes],
-    [
-      ac_cv_func_malloc_usable_size=yes
-    ],
-    [AC_MSG_ERROR([jemalloc requested but not found])
-  ])
-])
-
-dnl check for large file stuff
-mv confdefs.h confdefs1.h
-: > confdefs.h
-AC_SYS_LARGEFILE
-# On 32-bit Solaris, it is safe to define _LARGEFILE_SOURCE
-# which is not added by AC_SYS_LARGEFILE.
-if test x"$enable_largefile" != xno; then
-  AS_CASE(["$target_os"], [solaris*], [
-    AC_MSG_CHECKING([wheather _LARGEFILE_SOURCE should be defined])
-    AS_CASE(["${ac_cv_sys_file_offset_bits}:${ac_cv_sys_large_files}"],
-      ["64:"|"64:no"|"64:unknown"], [
-	# insert _LARGEFILE_SOURCE before _FILE_OFFSET_BITS line
-	# that is the same order as "getconf LFS_CFLAGS" output
-	mv confdefs.h largefile0.h
-	: > confdefs.h
-	AC_DEFINE(_LARGEFILE_SOURCE)
-	cat largefile0.h >> confdefs.h
-	rm largefile0.h
-	AC_MSG_RESULT([yes])
-      ], [AC_MSG_RESULT([no])])
-  ])
-fi
-mv confdefs.h largefile.h
-mv confdefs1.h confdefs.h
-cat largefile.h >> confdefs.h
-
-AS_CASE(["$target_os"],
-    [mingw*], [ac_cv_type_off_t=yes;ac_cv_sizeof_off_t=8],
-    [aix*], [
-    AS_CASE(["$target_cpu:$ac_cv_sys_large_files"],
-	[ppc64:*|powerpc64:*], [],
-	[*:no|*:unknown], [],
-	[
-	    # AIX currently does not support a 32-bit call to posix_fadvise()
-	    # if _LARGE_FILES is defined.
-	    ac_cv_func_posix_fadvise=no
-	])
-    ])
-
-AC_C_BIGENDIAN
-AC_C_CONST
-AC_C_CHAR_UNSIGNED
-AC_C_INLINE
-AC_C_VOLATILE
-AC_C_TYPEOF
-
-AS_CASE(":$ac_cv_c_const:$ac_cv_c_volatile:",
-    [*:no:*], [AC_MSG_ERROR(ANSI C-conforming const and volatile are mandatory)])
-
-AC_CHECK_TYPES([long long, off_t])
-
-AC_CACHE_CHECK([char bit], [rb_cv_char_bit],
-    [test "$universal_binary" = yes && cross_compiling=yes
-    AC_COMPUTE_INT([rb_cv_char_bit], [CHAR_BIT],
-	[AC_INCLUDES_DEFAULT([@%:@include <limits.h>])], [rb_cv_char_bit=8])
-    test "$universal_binary" = yes && cross_compiling=$real_cross_compiling])
-
-dnl RUBY_CHECK_SIZEOF [typename], [maybe same size types], [macros], [include]
-AC_DEFUN([RUBY_CHECK_SIZEOF],
-[dnl
-AS_VAR_PUSHDEF([rbcv_var], [rbcv_sizeof_var])dnl
-AS_VAR_PUSHDEF([cond], [rbcv_sizeof_cond])dnl
-AS_VAR_PUSHDEF([t], [rbcv_sizeof_type])dnl
-AS_VAR_PUSHDEF([s], [rbcv_sizeof_size])dnl
-]
-[m4_bmatch([$1], [\.], [], [if test "$universal_binary" = yes; then])
-AC_CACHE_CHECK([size of $1], [AS_TR_SH([ac_cv_sizeof_$1])], [
-    unset AS_TR_SH(ac_cv_sizeof_$1)
-    rbcv_var="
-typedef m4_bpatsubst([$1], [\..*]) ac__type_sizeof_;
-static ac__type_sizeof_ *rbcv_ptr;
-@%:@define AS_TR_CPP(SIZEOF_$1) sizeof((*rbcv_ptr)[]m4_bmatch([$1], [\.], .m4_bpatsubst([$1], [^[^.]*\.])))
-"
-    m4_ifval([$2], [test -z "${AS_TR_SH(ac_cv_sizeof_$1)+set}" && {
-    for t in $2; do
-	AC_COMPILE_IFELSE(
-	    [AC_LANG_BOOL_COMPILE_TRY(AC_INCLUDES_DEFAULT([$4]
-		[$rbcv_var]),
-		[AS_TR_CPP(SIZEOF_$1) == sizeof($t)])], [
-		AS_TR_SH(ac_cv_sizeof_$1)=AS_TR_CPP([SIZEOF_]$t)
-		break])
-    done
-    }], [
-	AC_COMPUTE_INT([AS_TR_SH(ac_cv_sizeof_$1)], [AS_TR_CPP(SIZEOF_$1)],
-	    [AC_INCLUDES_DEFAULT([$4])
-$rbcv_var],
-	    [AS_TR_SH(ac_cv_sizeof_$1)=])
-    ])
-    unset cond
-    m4_ifval([$3], [test -z "${AS_TR_SH(ac_cv_sizeof_$1)+set}" && {
-    for s in 32 64 128; do
-	for t in $3; do
-	    cond="${cond}
-@%:@${cond+el}if defined(__${t}${s}__) || defined(__${t}${s}) || defined(_${t}${s}) || defined(${t}${s})"
-	    hdr="AC_INCLUDES_DEFAULT([$4
-@%:@if defined(__${t}${s}__) || defined(__${t}${s}) || defined(_${t}${s}) || defined(${t}${s})
-@%:@ define AS_TR_CPP(HAVE_$1) 1
-@%:@else
-@%:@ define AS_TR_CPP(HAVE_$1) 0
-@%:@endif])"
-	    AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([$hdr], [!AS_TR_CPP(HAVE_$1)])], [continue])
-	    AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([$hdr]
-				[$rbcv_var],
-				[AS_TR_CPP(HAVE_$1) == (AS_TR_CPP(SIZEOF_$1) == ($s / $rb_cv_char_bit))])],
-		[AS_TR_SH(ac_cv_sizeof_$1)="${AS_TR_SH(ac_cv_sizeof_$1)+${AS_TR_SH(ac_cv_sizeof_$1)-} }${t}${s}"; continue])
-	    AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([$hdr]
-[
-@%:@if AS_TR_CPP(HAVE_$1)
-$rbcv_var
-@%:@else
-@%:@define AS_TR_CPP(SIZEOF_$1) 0
-@%:@endif
-],
-		    [AS_TR_CPP(HAVE_$1) == (AS_TR_CPP(SIZEOF_$1) == (m4_bmatch([$2], [^[0-9][0-9]*$], [$2], [($s / $rb_cv_char_bit)])))])],
-		[AS_TR_SH(ac_cv_sizeof_$1)="${AS_TR_SH(ac_cv_sizeof_$1)+${AS_TR_SH(ac_cv_sizeof_$1)-} }${t}${s}m4_bmatch([$2], [^[0-9][0-9]*$], [:$2])"])
-	done
-    done
-    }])
-    test "${AS_TR_SH(ac_cv_sizeof_$1)@%:@@<:@1-9@:>@}" = "${AS_TR_SH(ac_cv_sizeof_$1)}" &&
-    m4_ifval([$2][$3],
-	[test "${AS_TR_SH(ac_cv_sizeof_$1)@%:@SIZEOF_}" = "${AS_TR_SH(ac_cv_sizeof_$1)}" && ]){
-    test "$universal_binary" = yes && cross_compiling=yes
-    AC_COMPUTE_INT([t], AS_TR_CPP(SIZEOF_$1), [AC_INCLUDES_DEFAULT([$4])]
-[${cond+$cond
-@%:@else}
-$rbcv_var
-${cond+@%:@endif}
-@%:@ifndef AS_TR_CPP(SIZEOF_$1)
-@%:@define AS_TR_CPP(SIZEOF_$1) 0
-@%:@endif], [t=0])
-    test "$universal_binary" = yes && cross_compiling=$real_cross_compiling
-    if test ${t-0} != 0; then
-	AS_TR_SH(ac_cv_sizeof_$1)="${AS_TR_SH(ac_cv_sizeof_$1)+${AS_TR_SH(ac_cv_sizeof_$1)-} }${t}"
-    fi
-    }
-    : ${AS_TR_SH(ac_cv_sizeof_$1)=0}
-])
-{
-    unset cond
-    for t in ${AS_TR_SH(ac_cv_sizeof_$1)-}; do
-	AS_CASE(["$t"],
-	[[[0-9]*|SIZEOF_*]], [
-	    ${cond+echo "@%:@else"}
-	    echo "[@%:@define ]AS_TR_CPP(SIZEOF_$1) $t"
-	    break
-	    ],
-	[
-	    s=`expr $t : ['.*[^0-9]\([0-9][0-9]*\)$']`
-	    AS_CASE([$t], [*:*], [t="${t%:*}"], [s=`expr $s / $rb_cv_char_bit`])
-	    echo "@%:@${cond+el}if defined(__${t}__) || defined(__${t}) || defined(_${t}) || defined($t)"
-	    echo "@%:@define AS_TR_CPP(SIZEOF_$1) $s"
-	    cond=1
-	    ])
-    done
-    ${cond+echo "@%:@endif"}
-} >> confdefs.h
-m4_bmatch([$1], [\.], [], [else
-AC_CHECK_SIZEOF([$1], 0, [$4])
-fi])
-AS_VAR_POPDEF([rbcv_var])dnl
-AS_VAR_POPDEF([cond])dnl
-AS_VAR_POPDEF([t])dnl
-AS_VAR_POPDEF([s])dnl
-])
-
-RUBY_CHECK_SIZEOF(int, [], [ILP])
-RUBY_CHECK_SIZEOF(short)
-RUBY_CHECK_SIZEOF(long, [int], [ILP LP])
-RUBY_CHECK_SIZEOF(long long)
-RUBY_CHECK_SIZEOF(__int64, [8], [ILP LP])
-RUBY_CHECK_SIZEOF(__int128, [16], [ILP LP])
-RUBY_CHECK_SIZEOF(off_t)
-RUBY_CHECK_SIZEOF(void*, [int long "long long"], [ILP LP LLP])
-RUBY_CHECK_SIZEOF(float)
-RUBY_CHECK_SIZEOF(double)
-RUBY_CHECK_SIZEOF(time_t, [long "long long"], [], [@%:@include <time.h>])
-RUBY_CHECK_SIZEOF(clock_t, [], [], [@%:@include <time.h>])
-
-AC_CACHE_CHECK(packed struct attribute, rb_cv_packed_struct,
-    [rb_cv_packed_struct=no
-    for mac in \
-	"__pragma(pack(push, 1)) x __pragma(pack(pop))" \
-	"x __attribute__((packed))" \
-	; do
-	AC_TRY_COMPILE([@%:@define PACKED_STRUCT(x) $mac
-			PACKED_STRUCT(struct { int a; });], [],
-		[rb_cv_packed_struct=$mac; break])
-    done])
-packed_struct_unaligned=x
-if test "$rb_cv_packed_struct" != no; then
-    AC_DEFINE_UNQUOTED([PACKED_STRUCT(x)], [$rb_cv_packed_struct])
-else
-    AC_DEFINE_UNQUOTED([PACKED_STRUCT(x)], x)
-fi
-AC_DEFINE_UNQUOTED(PACKED_STRUCT_UNALIGNED(x), $packed_struct_unaligned)
-
-AC_DEFUN([RUBY_CHECK_PRINTF_PREFIX], [
-AC_CACHE_CHECK([for printf prefix for $1], [rb_cv_pri_prefix_]AS_TR_SH($1),[
-    [rb_cv_pri_prefix_]AS_TR_SH($1)=[NONE]
-    RUBY_WERROR_FLAG(RUBY_APPEND_OPTIONS(CFLAGS, $rb_cv_wsuppress_flags)
-    for pri in $2; do
-        AC_TRY_COMPILE(
-            [@%:@include <stdio.h>
-	    @%:@include <stddef.h>
-            @%:@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
-	    PRINTF_ARGS(void test_sprintf(const char*, ...), 1, 2);],
-            [printf("%]${pri}[d", (]$1[)42);
-            test_sprintf("%]${pri}[d", (]$1[)42);],
-            [rb_cv_pri_prefix_]AS_TR_SH($1)[=[$pri]; break])
-    done)])
-if test "[$rb_cv_pri_prefix_]AS_TR_SH($1)" != NONE; then
-    AC_DEFINE_UNQUOTED([PRI_]m4_ifval($3,$3,AS_TR_CPP(m4_bpatsubst([$1],[_t$])))[_PREFIX],
-        "[$rb_cv_pri_prefix_]AS_TR_SH($1)")
-fi
-])
-
-if test "x$ac_cv_type_long_long" = xyes; then
-    RUBY_CHECK_PRINTF_PREFIX(long long, ll I64, LL)
-elif test "x$ac_cv_type___int64" = xyes; then
-    RUBY_CHECK_PRINTF_PREFIX(__int64, ll I64, LL)
-fi
-
-dnl RUBY_CHECK_SIGNEDNESS [typename] [if-signed] [if-unsigned] [included]
-AC_DEFUN([RUBY_CHECK_SIGNEDNESS], [dnl
-    AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([AC_INCLUDES_DEFAULT([$4])], [($1)-1 > 0])],
-		      [$3], [$2])])
-
-dnl RUBY_REPLACE_TYPE [typename] [default type] [macro type] [included]
-AC_DEFUN([RUBY_REPLACE_TYPE], [dnl
-    AC_CHECK_TYPE([$1],
-		  [n="patsubst([$1],["],[\\"])"],
-		  [n="patsubst([$2],["],[\\"])"],
-		  [$4])
-    AC_CACHE_CHECK([for convertible type of [$1]], rb_cv_[$1]_convertible, [
-	u= t=
-	AS_CASE(["$n "],
-	  [*" signed "*], [ ],
-	  [*" unsigned "*], [
-	    u=U],
-	  [RUBY_CHECK_SIGNEDNESS($n, [], [u=U], [$4])])
-	if test x"$t" = x; then
-	    for t in "long long" long int short; do
-		test -n "$u" && t="unsigned $t"
-		AC_COMPILE_IFELSE(
-		    [AC_LANG_BOOL_COMPILE_TRY([AC_INCLUDES_DEFAULT([$4])]
-			[typedef $n rbcv_conftest_target_type;
-			typedef $t rbcv_conftest_replace_type;
-			extern rbcv_conftest_target_type rbcv_conftest_var;
-			extern rbcv_conftest_replace_type rbcv_conftest_var;
-			extern rbcv_conftest_target_type rbcv_conftest_func(void);
-			extern rbcv_conftest_replace_type rbcv_conftest_func(void);
-			], [sizeof(rbcv_conftest_target_type) == sizeof(rbcv_conftest_replace_type)])],
-		    [n="$t"; break])
-	    done
-	fi
-	AS_CASE([" $n "],
-	  [*" long long "*], [
-	    t=LL],
-	  [*" long "*], [
-	    t=LONG],
-	  [
-	    t=INT])
-	rb_cv_[$1]_convertible=${u}${t}])
-    if test "${AS_TR_SH(ac_cv_type_[$1])}" = "yes"; then
-	n="$1"
-    else
-	AS_CASE(["${rb_cv_[$1]_convertible}"],
-		[*LL], [n="long long"],
-		[*LONG], [n="long"],
-		[n="int"])
-	AS_CASE(["${rb_cv_[$1]_convertible}"],
-		[U*], [n="unsigned $n"])
-    fi
-    AS_CASE("${rb_cv_[$1]_convertible}", [U*], [u=+1], [u=-1])
-    AC_DEFINE_UNQUOTED(rb_[$1], $n)
-    AC_DEFINE_UNQUOTED([SIGNEDNESS_OF_]AS_TR_CPP($1), $u)
-    AC_DEFINE_UNQUOTED([$3]2NUM[(v)], [${rb_cv_[$1]_convertible}2NUM(v)])
-    AC_DEFINE_UNQUOTED(NUM2[$3][(v)], [NUM2${rb_cv_[$1]_convertible}(v)])
-    AC_DEFINE_UNQUOTED(PRI_[$3]_PREFIX,
-	[PRI_`echo ${rb_cv_[$1]_convertible} | sed ['s/^U//']`_PREFIX])
-])
-RUBY_REPLACE_TYPE(pid_t, int, PIDT)
-RUBY_REPLACE_TYPE(uid_t, int, UIDT)
-RUBY_REPLACE_TYPE(gid_t, int, GIDT)
-RUBY_REPLACE_TYPE(time_t, [], TIMET, [@%:@include <time.h>])
-RUBY_REPLACE_TYPE(dev_t, [int long "long long"], DEVT)
-RUBY_REPLACE_TYPE(mode_t, ["unsigned int" long], MODET, [@%:@include <sys/stat.h>])
-RUBY_REPLACE_TYPE(rlim_t, [int long "long long"], RLIM, [
-@%:@ifdef HAVE_SYS_TYPES_H
-@%:@include <sys/types.h>
-@%:@endif
-@%:@ifdef HAVE_SYS_TYPES_H
-@%:@include <sys/time.h>
-@%:@endif
-@%:@include <sys/resource.h>
-])
-RUBY_REPLACE_TYPE(off_t, [], OFFT)
-RUBY_REPLACE_TYPE(clockid_t, [], CLOCKID)
-
-AC_CACHE_CHECK(for prototypes, rb_cv_have_prototypes,
-  [AC_TRY_COMPILE([int foo(int x) { return 0; }], [return foo(10);],
-	rb_cv_have_prototypes=yes,
-	rb_cv_have_prototypes=no)])
-if test "$rb_cv_have_prototypes" = yes; then
-  AC_DEFINE(HAVE_PROTOTYPES)
-fi
-
-AC_CACHE_CHECK(token paste string, rb_cv_tokenpaste,
-  [AC_TRY_COMPILE([@%:@define paste(a,b) a@%:@@%:@b],
-		  [int xy = 1; return paste(x,y);],
-		  rb_cv_tokenpaste=ansi,
-		  rb_cv_tokenpaste=knr)])
-if test "$rb_cv_tokenpaste" = ansi; then
-  AC_DEFINE(TOKEN_PASTE(x,y),[x@%:@@%:@y])
-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>
-int foo(int x, ...) {
-	va_list va;
-	va_start(va, x);
-	va_arg(va, int);
-	va_arg(va, char *);
-	va_arg(va, double);
-	return 0;
-}
-], [return foo(10, "", 3.14);],
-	rb_cv_stdarg=yes,
-	rb_cv_stdarg=no)])
-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([
-int foo(int x, ...);
-@%:@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_DEFINE_IF], [dnl
-    m4_ifval([$1], [AS_LITERAL_IF([$1], [], [test "X$1" = X || ])cat <<EOH >> confdefs.h
-@%:@if $1
-EOH
-])dnl
-AC_DEFINE_UNQUOTED($2, $3)dnl
-    m4_ifval([$1], [AS_LITERAL_IF([$1], [], [test "X$1" = X || ])cat <<EOH >> confdefs.h
-@%:@endif /* $1 */
-EOH
-])dnl
-])dnl
-
-dnl RUBY_DECL_ATTRIBUTE(attrib, macroname, cachevar, condition, type, code)
-AC_DEFUN([RUBY_DECL_ATTRIBUTE], [dnl
-m4_ifval([$2], dnl
-  [AS_VAR_PUSHDEF([attrib], m4_bpatsubst([$2], [(.*)], []))], dnl
-  [AS_VAR_PUSHDEF([attrib], m4_toupper(m4_format(%.4s, [$5]))[_]AS_TR_CPP($1))] dnl
-)dnl
-m4_ifval([$3], dnl
-  [AS_VAR_PUSHDEF([rbcv],[$3])], dnl
-  [AS_VAR_PUSHDEF([rbcv],[rb_cv_]m4_format(%.4s, [$5])[_][$1])]dnl
-)dnl
-m4_pushdef([attrib_code],[m4_bpatsubst([$1],["],[\\"])])dnl
-m4_pushdef([attrib_params],[m4_bpatsubst([$2(x)],[^[^()]*(\([^()]*\)).*],[\1])])dnl
-m4_ifval([$4], [rbcv_cond=["$4"]; test "$rbcv_cond" || unset rbcv_cond])
-AC_CACHE_CHECK(for m4_ifval([$2],[m4_bpatsubst([$2], [(.*)], [])],[$1]) [$5] attribute, rbcv, dnl
-[rbcv=x
-RUBY_WERROR_FLAG([
-for mac in \
-    "__attribute__ ((attrib_code)) x" \
-    "x __attribute__ ((attrib_code))" \
-    "__declspec(attrib_code) x" \
-    x; do
-  m4_ifval([$4],mac="$mac"${rbcv_cond+" /* only if $rbcv_cond */"})
-  AC_TRY_COMPILE(
-    m4_ifval([$4],${rbcv_cond+[@%:@if ]$rbcv_cond})
-[@%:@define ]attrib[](attrib_params)[ $mac]
-m4_ifval([$4],${rbcv_cond+[@%:@else]}
-${rbcv_cond+[@%:@define ]attrib[](attrib_params)[ x]}
-${rbcv_cond+[@%:@endif]})
-$6
-@%:@define mesg ("")
-    attrib[](attrib_params)[;], [],
-    [rbcv="$mac"; break])
-done
-])])
-if test "$rbcv" != x; then
-    RUBY_DEFINE_IF(m4_ifval([$4],[${rbcv_cond}]), attrib[](attrib_params)[], $rbcv)
-fi
-m4_ifval([$4], [unset rbcv_cond]) dnl
-m4_popdef([attrib_params])dnl
-m4_popdef([attrib_code])dnl
-AS_VAR_POPDEF([attrib])dnl
-AS_VAR_POPDEF([rbcv])dnl
-])
-
-dnl RUBY_FUNC_ATTRIBUTE(attrib, macroname, cachevar, condition)
-AC_DEFUN([RUBY_FUNC_ATTRIBUTE], [dnl
-    RUBY_DECL_ATTRIBUTE([$1], [$2], [$3], [$4],
-	[function], [@%:@define x void conftest_attribute_check(void)]
-    )
-])
-
-dnl RUBY_TYPE_ATTRIBUTE(attrib, macroname, cachevar, condition)
-AC_DEFUN([RUBY_TYPE_ATTRIBUTE], [dnl
-    RUBY_DECL_ATTRIBUTE([$1], [$2], [$3], [$4],
-	[type], [
-@%:@define x struct conftest_attribute_check {int i;}
-])
-])
-
-RUBY_FUNC_ATTRIBUTE(__const__, CONSTFUNC)
-RUBY_FUNC_ATTRIBUTE(__pure__, PUREFUNC)
-RUBY_FUNC_ATTRIBUTE(__noreturn__, NORETURN)
-RUBY_FUNC_ATTRIBUTE(__deprecated__, DEPRECATED)
-RUBY_FUNC_ATTRIBUTE(__deprecated__("by "@%:@n), DEPRECATED_BY(n,x), rb_cv_func_deprecated_by)
-RUBY_TYPE_ATTRIBUTE(__deprecated__ mesg, DEPRECATED_TYPE(mesg,x), rb_cv_type_deprecated)
-RUBY_FUNC_ATTRIBUTE(__noinline__, NOINLINE)
-RUBY_FUNC_ATTRIBUTE(__always_inline__, ALWAYS_INLINE)
-RUBY_FUNC_ATTRIBUTE(__error__ mesg, ERRORFUNC(mesg,x), rb_cv_func___error__)
-RUBY_FUNC_ATTRIBUTE(__warning__ mesg, WARNINGFUNC(mesg,x), rb_cv_func___warning__)
-RUBY_FUNC_ATTRIBUTE(__weak__, WEAK, rb_cv_func_weak)
-if test "$rb_cv_func_weak" != x; then
-   AC_DEFINE(HAVE_FUNC_WEAK)
-fi
-
-if_i386=${universal_binary+[defined __i386__]}
-RUBY_FUNC_ATTRIBUTE(__stdcall__,  FUNC_STDCALL,  rb_cv_func_stdcall,  ${if_i386})
-RUBY_FUNC_ATTRIBUTE(__cdecl__,    FUNC_CDECL,    rb_cv_func_cdecl,    ${if_i386})
-RUBY_FUNC_ATTRIBUTE(__fastcall__, FUNC_FASTCALL, rb_cv_func_fastcall, ${if_i386})
-RUBY_FUNC_ATTRIBUTE(__optimize__("O0"), FUNC_UNOPTIMIZED, rb_cv_func_unoptimized)
-RUBY_FUNC_ATTRIBUTE(__optimize__("-Os","-fomit-frame-pointer"), FUNC_MINIMIZED, rb_cv_func_minimized)
-
-if test "$GCC" = yes; then
-    AC_CACHE_CHECK([for function alias], [rb_cv_gcc_function_alias],
-	[rb_cv_gcc_function_alias=no
-	for a in alias weak,alias; do
-	    AC_TRY_LINK([void foo(void) {}
-		void bar(void) __attribute__(($a("foo")));], [bar()],
-		[rb_cv_gcc_function_alias=$a; break])
-	done])
-    if test "$rb_cv_gcc_function_alias" != no; then
-	AC_DEFINE(HAVE_ATTRIBUTE_FUNCTION_ALIAS)
-	AC_DEFINE_UNQUOTED([RUBY_ALIAS_FUNCTION_TYPE(type, prot, name, args)],
-			   [type prot __attribute__(($rb_cv_gcc_function_alias(@%:@name)));])
-	AC_DEFINE_UNQUOTED([RUBY_ALIAS_FUNCTION_VOID(prot, name, args)],
-			   [RUBY_ALIAS_FUNCTION_TYPE(void, prot, name, args)])
-    fi
-
-    AC_CACHE_CHECK([for __atomic builtins], [rb_cv_gcc_atomic_builtins], [
-	AC_TRY_LINK([unsigned char atomic_var;],
-		    [
-			__atomic_exchange_n(&atomic_var, 0, __ATOMIC_SEQ_CST);
-			__atomic_exchange_n(&atomic_var, 1, __ATOMIC_SEQ_CST);
-			__atomic_fetch_add(&atomic_var, 1, __ATOMIC_SEQ_CST);
-			__atomic_fetch_sub(&atomic_var, 1, __ATOMIC_SEQ_CST);
-			__atomic_or_fetch(&atomic_var, 1, __ATOMIC_SEQ_CST);
-		    ],
-		    [rb_cv_gcc_atomic_builtins=yes],
-		    [rb_cv_gcc_atomic_builtins=no])])
-    if test "$rb_cv_gcc_atomic_builtins" = yes; then
-	AC_DEFINE(HAVE_GCC_ATOMIC_BUILTINS)
-    fi
-
-    AC_CACHE_CHECK([for __sync builtins], [rb_cv_gcc_sync_builtins], [
-	AC_TRY_LINK([unsigned char atomic_var;],
-		    [
-			__sync_lock_test_and_set(&atomic_var, 0);
-			__sync_lock_test_and_set(&atomic_var, 1);
-			__sync_fetch_and_add(&atomic_var, 1);
-			__sync_fetch_and_sub(&atomic_var, 1);
-			__sync_or_and_fetch(&atomic_var, 1);
-			__sync_val_compare_and_swap(&atomic_var, 0, 1);
-		    ],
-		    [rb_cv_gcc_sync_builtins=yes],
-		    [rb_cv_gcc_sync_builtins=no])])
-    if test "$rb_cv_gcc_sync_builtins" = yes; then
-	AC_DEFINE(HAVE_GCC_SYNC_BUILTINS)
-    fi
-
-    AC_CACHE_CHECK(for __builtin_unreachable, rb_cv_func___builtin_unreachable,
-    [RUBY_WERROR_FLAG(
-    [AC_TRY_LINK([volatile int zero;],
-	[if (zero) __builtin_unreachable();],
-	[rb_cv_func___builtin_unreachable=yes],
-	[rb_cv_func___builtin_unreachable=no])
-    ])
-    ])
-    if test "$rb_cv_func___builtin_unreachable" = yes; then
-	AC_DEFINE_UNQUOTED(UNREACHABLE, [__builtin_unreachable()])
-    fi
-fi
-
-AC_CACHE_CHECK(for exported function attribute, rb_cv_func_exported, [
-rb_cv_func_exported=no
-RUBY_WERROR_FLAG([
-for mac in '__attribute__ ((__visibility__("default")))' '__declspec(dllexport)'; do
-  AC_TRY_COMPILE([@%:@define RUBY_FUNC_EXPORTED $mac extern
-    RUBY_FUNC_EXPORTED void conftest_attribute_check(void);], [],
-    [rb_cv_func_exported="$mac"; break])
-done
-])])
-if test "$rb_cv_func_exported" != no; then
-    AC_DEFINE_UNQUOTED(RUBY_FUNC_EXPORTED, [$rb_cv_func_exported extern])
-fi
-
-RUBY_APPEND_OPTION(XCFLAGS, -DRUBY_EXPORT)
-
-AC_CACHE_CHECK(for function name string predefined identifier,
-    rb_cv_function_name_string,
-    [rb_cv_function_name_string=no
-    RUBY_WERROR_FLAG([
-	for func in __func__ __FUNCTION__; do
-	    AC_TRY_LINK([@%:@include <stdio.h>],
-			[puts($func);],
-			[rb_cv_function_name_string=$func
-			break])
-	done
-    ])]
-)
-if test "$rb_cv_function_name_string" != no; then
-    AC_DEFINE_UNQUOTED(RUBY_FUNCTION_NAME_STRING, [$rb_cv_function_name_string])
-fi
-
-AC_CACHE_CHECK(if enum over int is allowed, rb_cv_enum_over_int, [
-    rb_cv_enum_over_int=no
-    if test "x$ac_cv_type_long_long" = xyes; then
-	type="unsigned long long" max="ULLONG_MAX"
-    else
-	type="unsigned long" max="ULONG_MAX"
-    fi
-    RUBY_WERROR_FLAG([
-        AC_COMPILE_IFELSE([
-            AC_LANG_BOOL_COMPILE_TRY([
-                    @%:@include <limits.h>
-                    enum {conftest_max = $max};
-                ], [
-                    (conftest_max == $max) &&
-                    (sizeof(conftest_max) == sizeof($type))
-                ]
-	    )],
-	    [rb_cv_enum_over_int=yes],
-	    [rb_cv_enum_over_int=no]
-	)
-    ])
-])
-if test $rb_cv_enum_over_int = yes; then
-    AC_DEFINE(ENUM_OVER_INT, 1)
-fi
-
-dnl Check whether we need to define sys_nerr locally
-AC_CHECK_DECLS([sys_nerr], [], [], [$ac_includes_default
-@%:@include <errno.h>])
-
-AC_CHECK_DECLS([getenv])
-
-AS_CASE(["$target_cpu"],
-[alpha*|sh4|sh4el|sh4eb], [AS_CASE(["$target_os"::"$GCC"],
-		[*::yes],  # gcc
-			[CFLAGS="-mieee $CFLAGS"],
-		[osf*],    # ccc
-			[CFLAGS="-ieee $CFLAGS"],
-		)],
-[sparc*], [AC_LIBOBJ([sparc])])
-
-ac_cv_header_net_socket_h=${ac_cv_header_net_socket_h=no}
-if test "$ac_cv_header_net_socket_h" = yes; then
-    ac_cv_header_sys_socket_h=${ac_cv_header_sys_socket_h=no}
-else
-    ac_cv_header_sys_socket_h=${ac_cv_header_sys_socket_h=yes}
-fi
-
-
-AC_TYPE_SIZE_T
-RUBY_CHECK_SIGNEDNESS(size_t, [AC_MSG_ERROR(size_t is signed)], [],
-		      [@%:@include <sys/types.h>])
-RUBY_CHECK_SIZEOF(size_t, [int long void*], [], [@%:@include <sys/types.h>])
-RUBY_CHECK_SIZEOF(ptrdiff_t, size_t, [], [@%:@include <stddef.h>])
-RUBY_CHECK_PRINTF_PREFIX(size_t, z)
-RUBY_CHECK_PRINTF_PREFIX(ptrdiff_t, t)
-AC_STRUCT_ST_BLKSIZE
-AC_STRUCT_ST_BLOCKS
-AC_STRUCT_ST_RDEV
-RUBY_CHECK_SIZEOF([struct stat.st_size], [off_t int long "long long"], [], [@%:@include <sys/stat.h>])
-if test "$ac_cv_member_struct_stat_st_blocks" = yes; then
-    RUBY_CHECK_SIZEOF([struct stat.st_blocks], [off_t int long "long long"], [], [@%:@include <sys/stat.h>])
-fi
-RUBY_CHECK_SIZEOF([struct stat.st_ino], [long "long long"], [], [@%:@include <sys/stat.h>])
-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_MEMBERS([struct stat.st_birthtimespec])
-
-AC_CHECK_TYPES([struct timeval], [], [], [@%:@ifdef HAVE_TIME_H
-@%:@include <time.h>
-@%:@endif
-@%:@ifdef HAVE_SYS_TIME_H
-@%:@include <sys/time.h>
-@%:@endif])
-
-if test "${ac_cv_type_struct_timeval}" = yes; then
-    RUBY_CHECK_SIZEOF([struct timeval.tv_sec], [time_t long "long long"], [],
-		      [@%:@ifdef HAVE_TIME_H
-@%:@include <time.h>
-@%:@endif
-@%:@ifdef HAVE_SYS_TIME_H
-@%:@include <sys/time.h>
-@%:@endif])
-    AS_CASE(${ac_cv_sizeof_struct_timeval_tv_sec},
-	    [SIZEOF_INT], [t=int],
-	    [SIZEOF_LONG], [t=long],
-	    [SIZEOF_LONG_LONG], [t=LONG_LONG],
-	    [t=])
-    if test "${t}" != ""; then
-	AC_DEFINE_UNQUOTED(TYPEOF_TIMEVAL_TV_SEC, [$t])
-    fi
-fi
-
-AC_CHECK_TYPES([struct timespec], [], [], [@%:@ifdef HAVE_TIME_H
-@%:@include <time.h>
-@%:@endif
-@%:@ifdef HAVE_SYS_TIME_H
-@%:@include <sys/time.h>
-@%:@endif])
-
-AC_CHECK_TYPES([struct timezone], [], [], [@%:@ifdef HAVE_TIME_H
-@%:@ include <time.h>
-@%:@endif
-@%:@ifdef HAVE_SYS_TIME_H
-@%:@ include <sys/time.h>
-@%:@endif])
-
-AC_CHECK_TYPES([clockid_t], [], [], [@%:@ifdef HAVE_TIME_H
-@%:@ include <time.h>
-@%:@endif
-@%:@ifdef HAVE_SYS_TIME_H
-@%:@ include <sys/time.h>
-@%:@endif])
-
-AC_CACHE_VAL([rb_cv_large_fd_select],
-    [AC_CHECK_TYPE(fd_mask, [rb_cv_large_fd_select=yes], [rb_cv_large_fd_select=no])])
-if test "$rb_cv_large_fd_select" = yes; then
-    AC_DEFINE(HAVE_RB_FD_INIT, 1)
-fi
-
-dnl RUBY_DEFINT TYPENAME, SIZE, [UNSIGNED], [INCLUDES = DEFAULT-INCLUDES]
-AC_DEFUN([RUBY_DEFINT], [dnl
-AS_VAR_PUSHDEF([cond], [rb_defint_cond])dnl
-AS_VAR_PUSHDEF([type], [rb_defint_type])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],
-   [AS_CASE([m4_bmatch([$2], [^[1-9][0-9]*$], $2, [$ac_cv_sizeof_]AS_TR_SH($2))],
-    ["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"],
-    ["${ac_cv_sizeof___int128@%:@*:}"], [ rb_cv_type_$1="m4_if([$3], [], [], [$3 ])__int128"],
-    [ rb_cv_type_$1=no])])])
-if test "${rb_cv_type_$1}" != no; then
-    type="${rb_cv_type_$1@%:@@%:@unsigned }"
-    AS_IF([test "$type" != yes && eval 'test -n "${ac_cv_sizeof_'$type'+set}"'], [
-	eval cond='"${ac_cv_sizeof_'$type'}"'
-	AS_CASE([$cond], [*:*], [
-	    cond=AS_TR_CPP($type)
-	    echo "@%:@if defined SIZEOF_"$cond" && SIZEOF_"$cond" > 0" >> confdefs.h
-	], [cond=])
-    ], [cond=])
-    AC_DEFINE([HAVE_]AS_TR_CPP($1), 1)
-    if test "${rb_cv_type_$1}" = yes; then
-	m4_bmatch([$2], [^[1-9][0-9]*$], [AC_CHECK_SIZEOF([$1], 0, [AC_INCLUDES_DEFAULT([$4])])],
-			[RUBY_CHECK_SIZEOF([$1], [$2], [], [AC_INCLUDES_DEFAULT([$4])])])
-    else
-	AC_DEFINE_UNQUOTED($1, [$rb_cv_type_$1])
-	AC_DEFINE_UNQUOTED([SIZEOF_]AS_TR_CPP($1), [SIZEOF_]AS_TR_CPP([$type]))
-    fi
-    test -n "$cond" && echo "@%:@endif /* $cond */" >> confdefs.h
-fi
-AS_VAR_POPDEF([cond])dnl
-AS_VAR_POPDEF([type])dnl
-])
-
-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, [], [@%:@include <sys/types.h>])	dnl may differ from int, so not use AC_TYPE_SSIZE_T.
-
-RUBY_NACL_CHECK_PEPPER_TYPES
-
-AC_CACHE_CHECK(for stack end address, rb_cv_stack_end_address,
-[rb_cv_stack_end_address=no
-  AC_TRY_LINK(
-    [extern void *__libc_stack_end;],
-    [if (!__libc_stack_end) return 1;],
-    [rb_cv_stack_end_address="__libc_stack_end"])
-])
-if test $rb_cv_stack_end_address != no; then
-  AC_DEFINE_UNQUOTED(STACK_END_ADDRESS, $rb_cv_stack_end_address)
-fi
-
-# posix_memalign(memptr, alignment, size) implemented for OpenBSD 4.8 doesn't work if alignment > MALLOC_PAGESIZE.
-# [ruby-core:42158] https://bugs.ruby-lang.org/issues/5901
-# OpenBSD 5.2 fixed the problem. (src/lib/libc/stdlib/malloc.c:1.142)
-# MirOS #10semel has the problem but fixed in the repository.  (src/lib/libc/stdlib/malloc.c:1.9)
-AS_CASE(["$target_os"],
-[openbsd*|mirbsd*], [
-  AC_CACHE_CHECK(for heap align log on openbsd, rb_cv_page_size_log,
-    [rb_cv_page_size_log=no
-     for page_log in 12 13; do
-       AC_TRY_RUN([
-#include <math.h>
-#include <unistd.h>
-
-int
-main() {
-  if ((int)log2((double)sysconf(_SC_PAGESIZE)) != $page_log) return 1;
-  return 0;
-}
-       ],
-       rb_cv_page_size_log="$page_log"; break)
-     done])
-  if test $rb_cv_page_size_log != no; then
-    AC_DEFINE_UNQUOTED(HEAP_ALIGN_LOG, $rb_cv_page_size_log)
-  else
-    AC_DEFINE_UNQUOTED(HEAP_ALIGN_LOG, 12)
-  fi
-])
-
-dnl Checks for library functions.
-AC_TYPE_GETGROUPS
-AC_TYPE_SIGNAL
-AS_CASE(["${target_cpu}-${target_os}:${target_archs}"],
-[powerpc-darwin*], [
-  AC_LIBSOURCES(alloca.c)
-  AC_SUBST([ALLOCA], [\${LIBOBJDIR}alloca.${ac_objext}])
-  AC_DEFINE(C_ALLOCA)
-  AC_DEFINE_UNQUOTED(alloca, alloca)
-  ],
-[universal-darwin*:*ppc*], [
-  AC_LIBSOURCES(alloca.c)
-  AC_SUBST([ALLOCA], [\${LIBOBJDIR}alloca.${ac_objext}])
-  RUBY_DEFINE_IF([defined __powerpc__], C_ALLOCA, 1)
-  RUBY_DEFINE_IF([defined __powerpc__], alloca, alloca)
-  ],
-[
-  AC_FUNC_ALLOCA
-  ])
-if test "x$ALLOCA" = "x"; then
-    AC_CACHE_CHECK([for dynamic size alloca], rb_cv_dynamic_alloca, [
-    for chk in ok __chkstk; do
-	AC_TRY_LINK([
-	    @%:@ifdef HAVE_ALLOCA_H
-	    @%:@include <alloca.h>
-	    @%:@endif
-	    void $chk() {}
-	    int dynamic_alloca_test;
-	    int dynamic_alloca_result;],
-	    [dynamic_alloca_result = alloca(dynamic_alloca_test) != 0;],
-	    [rb_cv_dynamic_alloca=$chk; break])
-    done])
-    if test "x$rb_cv_dynamic_alloca" = "x__chkstk"; then
-	AC_DEFINE_UNQUOTED(RUBY_ALLOCA_CHKSTK, _$rb_cv_dynamic_alloca)
-	AS_CASE("$target_cpu",
-	[x64|x86_64], [
-	    AC_SUBST([ALLOCA], [\${LIBOBJDIR}x86_64-chkstk.${ac_objext}])
-	],)
-    fi
-fi
-AC_FUNC_MEMCMP
-
-# 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_cv_broken_glibc_ia64_erfc,
-  [AC_TRY_RUN([
-#include <math.h>
-int
-main()
-{
-   erfc(10000.0);
-   return 0;
-}
-],
-	rb_cv_broken_glibc_ia64_erfc=no,
-	rb_cv_broken_glibc_ia64_erfc=yes,
-	rb_cv_broken_glibc_ia64_erfc=no)])
-AS_CASE([$rb_cv_broken_glibc_ia64_erfc],[yes],[ac_cv_func_erf=no])
-
-AS_CASE(["$target_os"],[freebsd*],[
-	 AC_DEFINE(BROKEN_CLOSE)
-	 AC_REPLACE_FUNCS(close)
-	 ])
-
-AC_REPLACE_FUNCS(acosh)
-AC_REPLACE_FUNCS(cbrt)
-AC_REPLACE_FUNCS(crypt)
-AC_REPLACE_FUNCS(dup2)
-AC_REPLACE_FUNCS(erf)
-AC_REPLACE_FUNCS(explicit_bzero)
-AC_REPLACE_FUNCS(ffs)
-AC_REPLACE_FUNCS(finite)
-AC_REPLACE_FUNCS(flock)
-AC_REPLACE_FUNCS(hypot)
-AC_REPLACE_FUNCS(isinf)
-AC_REPLACE_FUNCS(isnan)
-AC_REPLACE_FUNCS(lgamma_r)
-AC_REPLACE_FUNCS(memmove)
-AC_REPLACE_FUNCS(nextafter)
-AC_REPLACE_FUNCS(setproctitle)
-AC_REPLACE_FUNCS(strchr)
-AC_REPLACE_FUNCS(strerror)
-AC_REPLACE_FUNCS(strlcat)
-AC_REPLACE_FUNCS(strlcpy)
-AC_REPLACE_FUNCS(strstr)
-AC_REPLACE_FUNCS(tgamma)
-
-# for missing/setproctitle.c
-AS_CASE(["$target_os"],
-[aix* | k*bsd*-gnu | kopensolaris*-gnu | linux* | darwin*], [AC_DEFINE(SPT_TYPE,SPT_REUSEARGV)],
-[hpux*], [AC_DEFINE(SPT_TYPE,SPT_PSTAT) ],
-[])
-AC_CHECK_HEADERS(sys/pstat.h)
-
-
-AC_CACHE_CHECK(for signbit, rb_cv_have_signbit,
-  [AC_TRY_LINK([
-#include <math.h>
-], [int v = signbit(-0.0);],
-	rb_cv_have_signbit=yes,
-	rb_cv_have_signbit=no)])
-if test "$rb_cv_have_signbit" = yes; then
-  AC_DEFINE(HAVE_SIGNBIT)
-else
-  AC_LIBOBJ([signbit])
-fi
-
-AC_CACHE_CHECK(for broken memmem, rb_cv_broken_memmem, [
-    AC_TRY_RUN([
-@%:@include <string.h>
-
-int
-main(int argc, char **argv)
-{
-    const char *str = "hogefugafoobar";
-    const char *rs = "foo";
-    const char *empty = "";
-    char *p;
-
-    p = memmem(str, strlen(str), rs, strlen(rs));
-    if (p == str+8) {
-	p = memmem(str, strlen(str), empty, strlen(empty));
-	if (p == str)
-	    return 0;
-    }
-    return 1;
-}
-    ],
-    rb_cv_broken_memmem=no,
-    rb_cv_broken_memmem=yes,
-    rb_cv_broken_memmem=yes)
-])
-test x"$rb_cv_broken_memmem" = xyes && ac_cv_func_memmem=no
-
-AC_FUNC_FORK
-
-AC_CHECK_FUNCS(__syscall)
-AC_CHECK_FUNCS(_longjmp)		# used for AC_ARG_WITH(setjmp-type)
-# we don't use _setjmp if _longjmp doesn't exist.
-test x$ac_cv_func__longjmp = xno && ac_cv_func__setjmp=no
-AC_CHECK_FUNCS(arc4random_buf)
-AC_CHECK_FUNCS(atan2l atan2f)
-AC_CHECK_FUNCS(chroot)
-AC_CHECK_FUNCS(chsize)
-AC_CHECK_FUNCS(clock_gettime)
-AC_CHECK_FUNCS(cosh)
-AC_CHECK_FUNCS(crypt_r)
-AC_CHECK_FUNCS(daemon)
-AC_CHECK_FUNCS(dirfd)
-AC_CHECK_FUNCS(dl_iterate_phdr)
-AC_CHECK_FUNCS(dlopen)
-AC_CHECK_FUNCS(dladdr)
-AC_CHECK_FUNCS(dup)
-AC_CHECK_FUNCS(dup3)
-AC_CHECK_FUNCS(eaccess)
-AC_CHECK_FUNCS(endgrent)
-AC_CHECK_FUNCS(fchmod)
-AC_CHECK_FUNCS(fchown)
-AC_CHECK_FUNCS(fcntl)
-AC_CHECK_FUNCS(fdatasync)
-AC_CHECK_FUNCS(fgetattrlist)
-AC_CHECK_FUNCS(fmod)
-AC_CHECK_FUNCS(fsync)
-AC_CHECK_FUNCS(ftruncate)
-AC_CHECK_FUNCS(ftruncate64)		# used for Win32 platform
-AC_CHECK_FUNCS(getattrlist)
-AC_CHECK_FUNCS(getcwd)
-AC_CHECK_FUNCS(getgidx)
-AC_CHECK_FUNCS(getgrnam)
-AC_CHECK_FUNCS(getgrnam_r)
-AC_CHECK_FUNCS(getgroups)
-AC_CHECK_FUNCS(getpgid)
-AC_CHECK_FUNCS(getpgrp)
-AC_CHECK_FUNCS(getpriority)
-AC_CHECK_FUNCS(getpwnam_r)
-AC_CHECK_FUNCS(getresgid)
-AC_CHECK_FUNCS(getresuid)
-AC_CHECK_FUNCS(getrlimit)
-AC_CHECK_FUNCS(getsid)
-AC_CHECK_FUNCS(gettimeofday)		# for making ac_cv_func_gettimeofday
-AC_CHECK_FUNCS(getuidx)
-AC_CHECK_FUNCS(gmtime_r)
-AC_CHECK_FUNCS(initgroups)
-AC_CHECK_FUNCS(ioctl)
-AC_CHECK_FUNCS(isfinite)
-AC_CHECK_FUNCS(issetugid)
-AC_CHECK_FUNCS(killpg)
-AC_CHECK_FUNCS(lchmod)
-AC_CHECK_FUNCS(lchown)
-AC_CHECK_FUNCS(link)
-AC_CHECK_FUNCS(llabs)
-AC_CHECK_FUNCS(lockf)
-AC_CHECK_FUNCS(log2)
-AC_CHECK_FUNCS(lstat)
-AC_CHECK_FUNCS(malloc_usable_size)
-AC_CHECK_FUNCS(malloc_size)
-AC_CHECK_FUNCS(mblen)
-AC_CHECK_FUNCS(memalign)
-AC_CHECK_FUNCS(memset_s)
-AC_CHECK_FUNCS(writev)
-AC_CHECK_FUNCS(memrchr)
-AC_CHECK_FUNCS(memmem)
-AC_CHECK_FUNCS(mkfifo)
-AC_CHECK_FUNCS(mknod)
-AC_CHECK_FUNCS(mktime)
-AC_CHECK_FUNCS(pipe2)
-AC_CHECK_FUNCS(poll)
-AC_CHECK_FUNCS(posix_fadvise)
-AC_CHECK_FUNCS(posix_memalign)
-AC_CHECK_FUNCS(ppoll)
-AC_CHECK_FUNCS(pread)
-AC_CHECK_FUNCS(qsort_r)
-AC_CHECK_FUNCS(qsort_s)
-AC_CHECK_FUNCS(readlink)
-AC_CHECK_FUNCS(round)
-AC_CHECK_FUNCS(sched_getaffinity)
-AC_CHECK_FUNCS(seekdir)
-AC_CHECK_FUNCS(select_large_fdset)
-AC_CHECK_FUNCS(sendfile)
-AC_CHECK_FUNCS(setegid)
-AC_CHECK_FUNCS(setenv)
-AC_CHECK_FUNCS(seteuid)
-AC_CHECK_FUNCS(setgid)
-AC_CHECK_FUNCS(setgroups)
-AC_CHECK_FUNCS(setpgid)
-AC_CHECK_FUNCS(setpgrp)
-AC_CHECK_FUNCS(setregid)
-AC_CHECK_FUNCS(setresgid)
-AC_CHECK_FUNCS(setresuid)
-AC_CHECK_FUNCS(setreuid)
-AC_CHECK_FUNCS(setrgid)
-AC_CHECK_FUNCS(setrlimit)
-AC_CHECK_FUNCS(setruid)
-AC_CHECK_FUNCS(setsid)
-AC_CHECK_FUNCS(setuid)
-AC_CHECK_FUNCS(shutdown)
-AC_CHECK_FUNCS(sigaction)
-AC_CHECK_FUNCS(sigaltstack)
-AC_CHECK_FUNCS(sigprocmask)
-AC_CHECK_FUNCS(sinh)
-AC_CHECK_FUNCS(spawnv)
-AC_CHECK_FUNCS(symlink)
-AC_CHECK_FUNCS(syscall)
-AC_CHECK_FUNCS(sysconf)
-AC_CHECK_FUNCS(tanh)
-AC_CHECK_FUNCS(telldir)
-AC_CHECK_FUNCS(timegm)
-AC_CHECK_FUNCS(times)
-AC_CHECK_FUNCS(truncate)
-AC_CHECK_FUNCS(truncate64)		# used for Win32
-AC_CHECK_FUNCS(unsetenv)
-AC_CHECK_FUNCS(utimensat)
-AC_CHECK_FUNCS(utimes)
-AC_CHECK_FUNCS(wait4)
-AC_CHECK_FUNCS(waitpid)
-
-AS_IF([test "$ac_cv_func_memset_s" = yes],
-    [RUBY_DEFINE_IF([!defined __STDC_WANT_LIB_EXT1__], [__STDC_WANT_LIB_EXT1__], 1)])
-
-AS_IF([test "$ac_cv_func_getcwd" = yes], [
-    AC_CACHE_CHECK(if getcwd allocates buffer if NULL is given, [rb_cv_getcwd_malloc],
-	[AC_TRY_RUN([
-@%:@include <stddef.h>
-@%:@include <stdio.h>
-@%:@ifdef HAVE_UNISTD_H
-@%:@include <unistd.h>
-@%:@endif
-@%:@ifndef EXIT_SUCCESS
-@%:@define EXIT_SUCCESS 0
-@%:@endif
-@%:@ifndef EXIT_FAILURE
-@%:@define EXIT_FAILURE 1
-@%:@endif
-
-int
-main(int argc, char **argv)
-{
-    if (!getcwd(NULL, 0)) return EXIT_FAILURE;
-    return EXIT_SUCCESS;
-}
-],
-	    rb_cv_getcwd_malloc=yes,
-	    rb_cv_getcwd_malloc=no,
-	    AS_CASE($target_os,
-		[linux*|darwin*|*bsd|cygwin*|mingw*|mswin*],
-		[rb_cv_getcwd_malloc=yes],
-		[rb_cv_getcwd_malloc=no]))])
-    AS_IF([test "$rb_cv_getcwd_malloc" = no], [AC_DEFINE(NO_GETCWD_MALLOC, 1)])
-])
-
-AS_IF([test "$ac_cv_func_crypt_r" = yes],
-    [AC_CHECK_MEMBERS([struct crypt_data.initialized], [], [],
-		      [AC_INCLUDES_DEFAULT([@%:@include <crypt.h>])])])
-
-AC_DEFUN([RUBY_CHECK_BUILTIN_FUNC], [dnl
-AC_CACHE_CHECK([for $1], AS_TR_SH(rb_cv_builtin_$1),
-  [AC_LINK_IFELSE(
-    [AC_LANG_PROGRAM([int foo;], [$2;])],
-    [AS_TR_SH(rb_cv_builtin_$1)=yes],
-    [AS_TR_SH(rb_cv_builtin_$1)=no])])
-if test "${AS_TR_SH(rb_cv_builtin_$1)}" != no; then
-  AC_DEFINE(AS_TR_CPP(HAVE_BUILTIN_$1))
-fi])
-RUBY_CHECK_BUILTIN_FUNC(__builtin_bswap16, [__builtin_bswap16(0)])
-RUBY_CHECK_BUILTIN_FUNC(__builtin_bswap32, [__builtin_bswap32(0)])
-RUBY_CHECK_BUILTIN_FUNC(__builtin_bswap64, [__builtin_bswap64(0)])
-RUBY_CHECK_BUILTIN_FUNC(__builtin_popcount, [__builtin_popcount(0)])
-RUBY_CHECK_BUILTIN_FUNC(__builtin_popcountll, [__builtin_popcountll(0)])
-RUBY_CHECK_BUILTIN_FUNC(__builtin_clz, [__builtin_clz(0)])
-RUBY_CHECK_BUILTIN_FUNC(__builtin_clzl, [__builtin_clzl(0)])
-RUBY_CHECK_BUILTIN_FUNC(__builtin_clzll, [__builtin_clzll(0)])
-RUBY_CHECK_BUILTIN_FUNC(__builtin_ctz, [__builtin_ctz(0)])
-RUBY_CHECK_BUILTIN_FUNC(__builtin_ctzll, [__builtin_ctzll(0)])
-RUBY_CHECK_BUILTIN_FUNC(__builtin_constant_p, [__builtin_constant_p(0)])
-RUBY_CHECK_BUILTIN_FUNC(__builtin_choose_expr, [
-    [int x[__extension__(__builtin_choose_expr(1, 1, -1))]];
-    [int y[__extension__(__builtin_choose_expr(0, -1, 1))]];
-    ])
-if test x$rb_cv_builtin___builtin_choose_expr = xyes; then
-    RUBY_CHECK_BUILTIN_FUNC(__builtin_choose_expr_constant_p, [
-    [int x[__extension__(__builtin_choose_expr(__builtin_constant_p(1), 1, -1))]];
-    [int y[__extension__(__builtin_choose_expr(__builtin_constant_p(foo), -1, 1))]];
-    ])
-fi
-RUBY_CHECK_BUILTIN_FUNC(__builtin_types_compatible_p, [__builtin_types_compatible_p(int, int)])
-
-if test "$ac_cv_func_qsort_r" != no; then
-  AC_CACHE_CHECK(whether qsort_r is GNU version, rb_cv_gnu_qsort_r,
-    [AC_TRY_COMPILE([
-@%:@include <stdlib.h>
-void qsort_r(void *base, size_t nmemb, size_t size,
-	    int (*compar)(const void *, const void *, void *),
-	    void *arg);
-],[ ],
-      [rb_cv_gnu_qsort_r=yes],
-      [rb_cv_gnu_qsort_r=no])
-  ])
-  AC_CACHE_CHECK(whether qsort_r is BSD version, rb_cv_bsd_qsort_r,
-    [AC_TRY_COMPILE([
-@%:@include <stdlib.h>
-void qsort_r(void *base, size_t nmemb, size_t size,
-	     void *arg, int (*compar)(void *, const void *, const void *));
-],[ ],
-      [rb_cv_bsd_qsort_r=yes],
-      [rb_cv_bsd_qsort_r=no])
-  ])
-  AS_CASE("$rb_cv_gnu_qsort_r:$rb_cv_bsd_qsort_r",
-  [yes:no], [
-    AC_DEFINE(HAVE_GNU_QSORT_R, 1)
-  ],
-  [no:yes], [
-    AC_DEFINE(HAVE_BSD_QSORT_R, 1)
-  ])
-fi
-
-AC_CACHE_CHECK(whether atan2 handles Inf as C99, rb_cv_atan2_inf_c99, [
-    AS_IF([test $ac_cv_func_atan2f:$ac_cv_func_atan2l = yes:yes], [
-	AC_TRY_RUN([
-@%:@include <math.h>
-@%:@ifdef HAVE_UNISTD_H
-@%:@include <unistd.h>
-@%:@endif
-@%:@ifndef EXIT_SUCCESS
-@%:@define EXIT_SUCCESS 0
-@%:@endif
-@%:@ifndef EXIT_FAILURE
-@%:@define EXIT_FAILURE 1
-@%:@endif
-
-int
-main(int argc, char **argv)
-{
-    if (fabs(atan2(INFINITY, INFINITY) - M_PI_4) <= 0.01) return EXIT_SUCCESS;
-    return EXIT_FAILURE;
-}
-],
-	[rb_cv_atan2_inf_c99=yes],
-	[rb_cv_atan2_inf_c99=no],
-	[AS_CASE($target_os, [mingw*|mswin*], [rb_cv_atan2_inf_c99=no], [rb_cv_atan2_inf_c99=yes])]
-	)
-    ], [rb_cv_atan2_inf_c99=no])
-])
-AS_IF([test "x$rb_cv_atan2_inf_c99" = xyes], [AC_DEFINE(ATAN2_INF_C99)])
-
-AS_IF([test "x$ac_cv_func_lgamma_r" = xyes], [
-    AC_CACHE_CHECK(whether lgamma_r handles +0.0 and -0.0, rb_cv_lgamma_r_pm0, [
-	AC_TRY_RUN([
-@%:@include <math.h>
-@%:@ifdef HAVE_UNISTD_H
-@%:@include <unistd.h>
-@%:@endif
-@%:@ifndef EXIT_SUCCESS
-@%:@define EXIT_SUCCESS 0
-@%:@endif
-@%:@ifndef EXIT_FAILURE
-@%:@define EXIT_FAILURE 1
-@%:@endif
-
-int
-main(int argc, char **argv)
-{
-    int sign = 0;
-    double x = lgamma_r(-0.0, &sign);
-
-    /* should be [+inf, -1] */
-    if (x <= 0) return EXIT_FAILURE;
-    if (!isinf(x)) return EXIT_FAILURE;
-    if (sign != -1) return EXIT_FAILURE;
-
-    /* should be [+inf, 1] */
-    x = lgamma_r(+0.0, &sign);
-    if (x <= 0) return EXIT_FAILURE;
-    if (!isinf(x)) return EXIT_FAILURE;
-    if (sign != 1) return EXIT_FAILURE;
-    return EXIT_SUCCESS;
-}
-],
-	[rb_cv_lgamma_r_pm0=yes],
-	[rb_cv_lgamma_r_pm0=no],
-	[rb_cv_lgamma_r_pm0=yes]
-	)
-    ])
-    AS_IF([test "x$rb_cv_lgamma_r_pm0" = xno], [AC_DEFINE(LGAMMA_R_PM0_FIX)])
-])
-
-# Some platform need -lrt for clock_gettime, but the other don't.
-if test x"$ac_cv_func_clock_gettime" != xyes; then
-    # glibc 2.17 moves clock_* functions from librt to the main C library.
-    # http://sourceware.org/ml/libc-announce/2012/msg00001.html
-    AC_CHECK_LIB(rt, clock_gettime)
-    if test x"$ac_cv_lib_rt_clock_gettime" = xyes; then
-	AC_DEFINE(HAVE_CLOCK_GETTIME, 1)
-    fi
-fi
-AC_CHECK_FUNCS(clock_getres) # clock_getres should be tested after clock_gettime test including librt test.
-
-AC_CACHE_CHECK(for unsetenv returns a value, rb_cv_unsetenv_return_value,
-  [AC_TRY_COMPILE([
-#include <stdlib.h>
-], [int v = unsetenv("foo");],
-	rb_cv_unsetenv_return_value=yes,
-	rb_cv_unsetenv_return_value=no)])
-if test "$rb_cv_unsetenv_return_value" = no; then
-  AC_DEFINE(VOID_UNSETENV)
-fi
-
-# used for AC_ARG_WITH(setjmp-type)
-AC_DEFUN([RUBY_CHECK_SETJMP], [
-AC_CACHE_CHECK([for ]$1[ as a macro or function], ac_cv_func_$1,
-  [AC_TRY_COMPILE([
-@%:@include <setjmp.h>
-]AC_INCLUDES_DEFAULT([$3])[
-@%:@define JMPARGS_1 env
-@%:@define JMPARGS_2 env,1
-@%:@define JMPARGS JMPARGS_]m4_ifval($2,2,1)[
-],
-    m4_ifval($2,$2,jmp_buf)[ env; $1(JMPARGS);],
-    ac_cv_func_$1=yes,
-    ac_cv_func_$1=no)]
-)
-AS_IF([test "$ac_cv_func_]$1[" = yes], [AC_DEFINE([HAVE_]AS_TR_CPP($1), 1)])
-])
-
-AC_DEFUN([RUBY_CHECK_BUILTIN_SETJMP], [
-if test x"${ac_cv_func___builtin_setjmp}" = xyes; then
-   unset ac_cv_func___builtin_setjmp
-fi
-AC_CACHE_CHECK(for __builtin_setjmp, ac_cv_func___builtin_setjmp,
-    [
-    ac_cv_func___builtin_setjmp=no
-    for cast in "" "(void **)"; do
-	RUBY_WERROR_FLAG(
-	[AC_TRY_LINK([@%:@include <setjmp.h>
-	    @%:@include <stdio.h>
-	    jmp_buf jb;
-	    @%:@ifdef NORETURN
-	    NORETURN(void t(void));
-	    @%:@endif
-	    void t(void) {__builtin_longjmp($cast jb, 1);}
-	    int jump(void) {(void)(__builtin_setjmp($cast jb) ? 1 : 0); return 0;}],
-	    [
-	    void (*volatile f)(void) = t;
-	    if (!jump()) printf("%d\n", f != 0);
-	    ],
-	    [ac_cv_func___builtin_setjmp="yes with cast ($cast)"])
-	])
-	test "$ac_cv_func___builtin_setjmp" = no || break
-    done])
-])
-
-AC_DEFUN([RUBY_SETJMP_TYPE], [
-RUBY_CHECK_BUILTIN_SETJMP
-RUBY_CHECK_SETJMP(_setjmpex, [], [@%:@include <setjmpex.h>])
-RUBY_CHECK_SETJMP(_setjmp)
-RUBY_CHECK_SETJMP(sigsetjmp, [sigjmp_buf])
-AC_MSG_CHECKING(for setjmp type)
-setjmp_suffix=
-AC_ARG_WITH(setjmp-type,
-	AS_HELP_STRING([--with-setjmp-type], [select setjmp type]),
-	[
-	AS_CASE([$withval],
-	[__builtin_setjmp], [setjmp=__builtin_setjmp],
-	[_setjmp], [ setjmp_prefix=_],
-	[sigsetjmp], [ setjmp_prefix=sig],
-	[setjmp], [ setjmp_prefix=],
-	[setjmpex], [ setjmp_prefix= setjmp_suffix=ex],
-	[''], [ unset setjmp_prefix],
-	[   AC_MSG_ERROR(invalid setjmp type: $withval)])], [unset setjmp_prefix])
-setjmp_cast=
-if test ${setjmp_prefix+set}; then
-    if test "${setjmp_prefix}" && eval test '$ac_cv_func_'${setjmp_prefix}setjmp${setjmp_suffix} = no; then
-	AC_MSG_ERROR(${setjmp_prefix}setjmp${setjmp_suffix} is not available)
-    fi
-elif { AS_CASE("$ac_cv_func___builtin_setjmp", [yes*], [true], [false]) }; then
-    setjmp_cast=`expr "$ac_cv_func___builtin_setjmp" : "yes with cast (\(.*\))"`
-    setjmp_prefix=__builtin_
-    setjmp_suffix=
-elif test "$ac_cv_header_setjmpex_h:$ac_cv_func__setjmpex" = yes:yes; then
-    setjmp_prefix=
-    setjmp_suffix=ex
-elif test "$ac_cv_func__setjmp" = yes; then
-    setjmp_prefix=_
-    setjmp_suffix=
-elif test "$ac_cv_func_sigsetjmp" = yes; then
-    AS_CASE([$target_os],[solaris*|cygwin*],[setjmp_prefix=],[setjmp_prefix=sig])
-    setjmp_suffix=
-else
-    setjmp_prefix=
-    setjmp_suffix=
-fi
-if test x$setjmp_prefix = xsig; then
-    setjmp_sigmask=yes
-else
-    unset setjmp_sigmask
-fi
-AC_MSG_RESULT(${setjmp_prefix}setjmp${setjmp_suffix}${setjmp_cast:+\($setjmp_cast\)})
-AC_DEFINE_UNQUOTED([RUBY_SETJMP(env)], [${setjmp_prefix}setjmp${setjmp_suffix}($setjmp_cast(env)${setjmp_sigmask+,0})])
-AC_DEFINE_UNQUOTED([RUBY_LONGJMP(env,val)], [${setjmp_prefix}longjmp($setjmp_cast(env),val)])
-AC_DEFINE_UNQUOTED(RUBY_JMP_BUF, ${setjmp_sigmask+${setjmp_prefix}}jmp_buf)
-])
-# End of setjmp check.
-
-AC_ARG_ENABLE(setreuid,
-       AS_HELP_STRING([--enable-setreuid], [use setreuid()/setregid() according to need even if obsolete]),
-       [use_setreuid=$enableval])
-if test "$use_setreuid" = yes; then
-    AC_DEFINE(USE_SETREUID)
-    AC_DEFINE(USE_SETREGID)
-fi
-AC_STRUCT_TIMEZONE
-AC_CACHE_CHECK(for struct tm.tm_gmtoff, rb_cv_member_struct_tm_tm_gmtoff,
-  [AC_TRY_COMPILE([
-@%:@define _BSD_SOURCE
-@%:@define _DEFAULT_SOURCE
-@%:@include <time.h>
-   ],
-    [struct tm t; t.tm_gmtoff = 3600;],
-  [rb_cv_member_struct_tm_tm_gmtoff=yes],
-  [rb_cv_member_struct_tm_tm_gmtoff=no])])
-if test "$rb_cv_member_struct_tm_tm_gmtoff" = yes; then
-  AC_DEFINE(HAVE_STRUCT_TM_TM_GMTOFF)
-fi
-AC_CACHE_CHECK(for external int daylight, rb_cv_have_daylight,
-  [AC_TRY_LINK([#include <time.h>
-  int i;],
-	[i = daylight;],
-	rb_cv_have_daylight=yes,
-	rb_cv_have_daylight=no)])
-if test "$rb_cv_have_daylight" = yes; then
-  AC_DEFINE(HAVE_DAYLIGHT)
-fi
-AC_DEFUN([RUBY_CHECK_VARTYPE], [dnl
-AC_CACHE_CHECK([for external $1], AS_TR_SH(rb_cv_var_$1),
-  [AS_TR_SH(rb_cv_var_$1)=no
-  AC_TRY_COMPILE([
-#ifndef _XOPEN_SOURCE
-#define _XOPEN_SOURCE 1
-#endif
-$2
-;
-const volatile void *volatile t;],
-    [t = &(&$1)[0];],
-    [for t in $3; do
-      AC_TRY_COMPILE([
-#ifndef _XOPEN_SOURCE
-#define _XOPEN_SOURCE 1
-#endif
-$2
-;
-extern $t $1;
-const volatile void *volatile t;],
-        [t = &(&$1)[0];],
-        [AS_TR_SH(rb_cv_var_$1)=$t; break])
-    done])])
-if test "${AS_TR_SH(rb_cv_var_$1)}" != no; then
-  AC_DEFINE(AS_TR_CPP(HAVE_VAR_$1))
-  AC_DEFINE_UNQUOTED(AS_TR_CPP(TYPEOF_VAR_$1), ${AS_TR_SH(rb_cv_var_$1)})
-fi])
-RUBY_CHECK_VARTYPE(timezone, [@%:@include <time.h>], [long int])
-RUBY_CHECK_VARTYPE(altzone, [@%:@include <time.h>], [long int])
-AC_CHECK_FUNCS(timezone)
-if test "$ac_cv_func_timezone" = yes; then
-  AC_CACHE_CHECK([whether timezone requires zero arguments], rb_cv_func_timezone_void,
-    [AC_TRY_COMPILE([@%:@include <time.h>],
-      [(void)timezone(0, 0);],
-      [rb_cv_func_timezone_void=no],
-      [rb_cv_func_timezone_void=yes])]
-  )
-  if test $rb_cv_func_timezone_void = yes; then
-    AC_DEFINE(TIMEZONE_VOID)
-  fi
-fi
-
-AC_CACHE_CHECK(for negative time_t for gmtime(3), rb_cv_negative_time_t,
-  [AC_TRY_RUN([
-#include <stdlib.h>
-#include <time.h>
-
-void
-check(tm, y, m, d, h, s)
-    struct tm *tm;
-    int y, m, d, h, s;
-{
-    if (!tm ||
-	tm->tm_year != y ||
-	tm->tm_mon  != m-1 ||
-	tm->tm_mday != d ||
-	tm->tm_hour != h ||
-	tm->tm_sec  != s) {
-	exit(1);
-    }
-}
-
-int
-main()
-{
-   time_t t = -1;
-   struct tm *tm;
-
-   check(gmtime(&t), 69, 12, 31, 23, 59);
-   t = ~(time_t)0 << 31;
-   check(gmtime(&t), 1, 12, 13, 20, 52);
-   return 0;
-}
-],
-	rb_cv_negative_time_t=yes,
-	rb_cv_negative_time_t=no,
-	rb_cv_negative_time_t=yes)])
-if test "$rb_cv_negative_time_t" = yes; then
-  AC_DEFINE(NEGATIVE_TIME_T)
-fi
-
-# [ruby-dev:40910] overflow of time on FreeBSD
-# http://www.freebsd.org/cgi/query-pr.cgi?pr=145341
-AC_CACHE_CHECK(for localtime(3) overflow correctly, rb_cv_localtime_overflow,
-  [AC_TRY_RUN([
-#include <stdlib.h>
-#include <time.h>
-
-void
-check(time_t t1)
-{
-    struct tm *tm;
-    time_t t2;
-    tm = localtime(&t1);
-    if (!tm)
-	return; /* overflow detected.  ok. */
-    t2 = mktime(tm);
-    if (t1 == t2)
-        return; /* round-trip.  ok. */
-    exit(1);
-}
-
-int
-main()
-{
-    time_t t;
-    if (~(time_t)0 <= 0) {
-        t = (((time_t)1) << (sizeof(time_t) * 8 - 2));
-        t |= t - 1;
-    }
-    else {
-        t = ~(time_t)0;
-    }
-    check(t);
-    return 0;
-}
-],
-	rb_cv_localtime_overflow=yes,
-	rb_cv_localtime_overflow=no,
-	rb_cv_localtime_overflow=no)])
-if test "$rb_cv_localtime_overflow" = no; then
-  AC_DEFINE(LOCALTIME_OVERFLOW_PROBLEM)
-fi
-
-if test "$ac_cv_func_sigprocmask" = yes && test "$ac_cv_func_sigaction" = yes; then
-   AC_DEFINE(POSIX_SIGNAL)
-else
-  AC_CHECK_FUNCS(sigsetmask)
-  AC_CACHE_CHECK(for BSD signal semantics, rb_cv_bsd_signal,
-    [AC_TRY_RUN([
-#include <stdio.h>
-#include <signal.h>
-
-void
-sig_handler(dummy)
-     int dummy;
-{
-}
-
-int
-main()
-{
-  signal(SIGINT, sig_handler);
-  kill(getpid(), SIGINT);
-  kill(getpid(), SIGINT);
-  return 0;
-}
-],
-	rb_cv_bsd_signal=yes,
-	rb_cv_bsd_signal=no,
-	rb_cv_bsd_signal=$ac_cv_func_sigsetmask)])
-  if test "$rb_cv_bsd_signal" = yes; then
-    AC_DEFINE(BSD_SIGNAL)
-  fi
-fi
-
-if test "$ac_cv_func_getpgid" = no; then
-  # AC_FUNC_GETPGRP fails when cross-compiling with old autoconf.
-  # autoconf is changed between 2.52d and 2.52f?
-  # http://lists.gnu.org/archive/html/bug-gnu-utils/2001-09/msg00181.html
-  # "autoconf cleanup for AC_FUNC_GETPGRP and GETPGRP_VOID"
-AC_FUNC_GETPGRP
-fi
-if test "$ac_cv_func_setpgid:$ac_cv_func_setpgrp" = no:yes; then
-  # AC_FUNC_SETPGRP fails when cross-compiling.  (until autoconf 2.69?)
-  # https://lists.gnu.org/archive/html/bug-autoconf/2013-02/msg00002.html
-  # "AC_FUNC_SETPGRP fails to work properly when cross-compiling"
-AC_FUNC_SETPGRP
-fi
-
-if test x"$ac_cv_func_dirfd" = xno; then
-  AS_CASE(["$target_os"],[solaris*],
-          [AC_CHECK_MEMBERS([DIR.d_fd, DIR.dd_fd],,,[
-#include <sys/types.h>
-#include <dirent.h>
-])])
-fi
-
-if test x"$target_cpu" = xia64; then
-    AC_LIBOBJ([ia64])
-    AC_CACHE_CHECK(for __libc_ia64_register_backing_store_base,
-                   rb_cv___libc_ia64_register_backing_store_base,
-    [rb_cv___libc_ia64_register_backing_store_base=no
-    AC_TRY_LINK(
-      [extern unsigned long __libc_ia64_register_backing_store_base;],
-      [unsigned long p = __libc_ia64_register_backing_store_base;
-       printf("%ld\n", p);],
-      [rb_cv___libc_ia64_register_backing_store_base=yes])])
-    if test $rb_cv___libc_ia64_register_backing_store_base = yes; then
-      AC_DEFINE(HAVE___LIBC_IA64_REGISTER_BACKING_STORE_BASE)
-    fi
-fi
-
-AC_CACHE_CHECK(whether right shift preserve sign bit, rb_cv_rshift_sign,
-    [AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([], [(-1==(-1>>1))])],
-	rb_cv_rshift_sign=yes,
-	rb_cv_rshift_sign=no)])
-if test "$rb_cv_rshift_sign" = yes; then
-  AC_DEFINE(RSHIFT(x,y), ((x)>>(int)(y)))
-else
-  AC_DEFINE(RSHIFT(x,y), (((x)<0) ? ~((~(x))>>(int)(y)) : (x)>>(int)(y)))
-fi
-
-if test x"$ac_cv_func_gettimeofday" != xyes; then
-    AC_MSG_ERROR(gettimeofday() must exist)
-fi
-
-if test "$ac_cv_func_sysconf" = yes; then
-  AC_DEFUN([RUBY_CHECK_SYSCONF], [dnl
-  AC_CACHE_CHECK([whether _SC_$1 is supported], rb_cv_have_sc_[]m4_tolower($1),
-    [AC_TRY_COMPILE([#include <unistd.h>
-      ],
-      [_SC_$1 >= 0],
-      rb_cv_have_sc_[]m4_tolower($1)=yes,
-      rb_cv_have_sc_[]m4_tolower($1)=no)
-    ])
-  if test "$rb_cv_have_sc_[]m4_tolower($1)" = yes; then
-    AC_DEFINE(HAVE__SC_$1)
-  fi
-  ])
-  RUBY_CHECK_SYSCONF(CLK_TCK)
-fi
-
-AC_DEFUN([RUBY_STACK_GROW_DIRECTION], [
-    AS_VAR_PUSHDEF([stack_grow_dir], [rb_cv_stack_grow_dir_$1])
-    AC_CACHE_CHECK(stack growing direction on $1, stack_grow_dir, [
-AS_CASE(["$1"],
-[m68*|x86*|x64|i?86|ia64|ppc*|sparc*|alpha*], [ $2=-1],
-[hppa*], [ $2=+1],
-[
-  AC_TRY_RUN([
-/* recurse to get rid of inlining */
-static int
-stack_growup_p(addr, n)
-    volatile int *addr, n;
-{
-    volatile int end;
-    if (n > 0)
-	return *addr = stack_growup_p(addr, n - 1);
-    else
-	return (&end > addr);
-}
-int main()
-{
-    int x;
-    return stack_growup_p(&x, 10);
-}
-], $2=-1, $2=+1, $2=0)
-  ])
-eval stack_grow_dir=\$$2])
-eval $2=\$stack_grow_dir
-AS_VAR_POPDEF([stack_grow_dir])])
-if test "${universal_binary-no}" = yes ; then
-    archflagpat=`eval echo '"'"${ARCH_FLAG}"'"' | sed 's/[[][|.*]]/\\&/g'`
-    save_CFLAGS="$CFLAGS" new_cflags=`echo "$CFLAGS" | sed "s|$archflagpat"'||'`
-    save_LDFLAGS="$LDFLAGS" new_ldflags=`echo "$LDFLAGS" | sed "s|$archflagpat"'||'`
-    stack_dir=
-    for archs in ${universal_archnames}; do
-	archs=`echo $archs | sed 's/=.*//'`
-	CFLAGS="$new_cflags -arch $archs"
-	LDFLAGS="$new_ldflags -arch $archs"
-	RUBY_STACK_GROW_DIRECTION($archs, dir)
-	if test x$stack_dir = x; then
-	    stack_dir=$dir
-	elif test x$stack_dir != x$dir; then
-	    stack_dir=no
-	fi
-    done
-    CFLAGS="$save_CFLAGS" LDFLAGS="$save_LDFLAGS"
-    if test x$stack_dir = xno; then
-	for archs in ${universal_archnames}; do
-	    archs=`echo $archs | sed 's/=.*//'`
-	    eval dir=\$[rb_cv_stack_grow_dir_]AS_TR_SH([$archs])
-	    RUBY_DEFINE_IF([defined __${archs}__], STACK_GROW_DIRECTION, $dir)
-	done
-    else
-	AC_DEFINE_UNQUOTED(STACK_GROW_DIRECTION, $stack_dir)
-    fi
-else
-    RUBY_STACK_GROW_DIRECTION($target_cpu, dir)
-    AC_DEFINE_UNQUOTED(STACK_GROW_DIRECTION, $dir)
-fi
-
-if test x"$enable_pthread" = xyes; then
-    for pthread_lib in thr pthread pthreads c c_r root; do
-	AC_CHECK_LIB($pthread_lib, pthread_kill,
-		     rb_with_pthread=yes, rb_with_pthread=no)
-	if test "$rb_with_pthread" = "yes"; then break; fi
-    done
-    if test x"$rb_with_pthread" = xyes; then
-	AC_DEFINE(_REENTRANT)
-	AC_DEFINE(_THREAD_SAFE)
-	AC_DEFINE(HAVE_LIBPTHREAD)
-	AC_CHECK_HEADERS(pthread_np.h, [], [], [@%:@include <pthread.h>])
-	AS_CASE([$pthread_lib],
-	[c],    [],
-	[root], [],
-	[c_r],  [MAINLIBS="-pthread $MAINLIBS"],
-	        [AS_CASE(["$target_os"],
-		    [openbsd*|mirbsd*], [LIBS="-pthread $LIBS"],
-		    [LIBS="-l$pthread_lib $LIBS"])])
-    else
-	AC_MSG_WARN("Don't know how to find pthread library on your system -- thread support disabled")
-    fi
-    AC_CACHE_CHECK([whether pthread_t is scalar type], [rb_cv_scalar_pthread_t], [
-	AC_TRY_COMPILE([
-	    @%:@include <pthread.h>
-	    ], [
-	    pthread_t thread_id;
-	    thread_id = 0;
-	    if (!thread_id) return 0;
-	    ], [rb_cv_scalar_pthread_t=yes], [rb_cv_scalar_pthread_t=no])
-    ])
-    if test x"$rb_cv_scalar_pthread_t" = xyes; then
-	: # RUBY_CHECK_SIZEOF(pthread_t, [void* int long], [], [@%:@include <pthread.h>])
-    else
-	AC_DEFINE(NON_SCALAR_THREAD_ID)
-    fi
-    AC_CHECK_FUNCS(sched_yield pthread_attr_setinheritsched \
-	pthread_attr_get_np pthread_attr_getstack\
-	pthread_get_stackaddr_np pthread_get_stacksize_np \
-	thr_stksegment pthread_stackseg_np pthread_getthrds_np \
-	pthread_cond_init pthread_condattr_setclock pthread_condattr_init \
-	pthread_sigmask pthread_setname_np pthread_set_name_np)
-    AS_CASE(["$target_os"],[aix*],[ac_cv_func_pthread_getattr_np=no],[AC_CHECK_FUNCS(pthread_getattr_np)])
-    if test "${host_os}" = "nacl"; then
-      ac_cv_func_pthread_attr_init=no
-    else
-      AC_CHECK_FUNCS(pthread_attr_init)
-    fi
-    set_current_thread_name=
-    if test "$ac_cv_func_pthread_setname_np" = yes; then
-	AC_CACHE_CHECK([arguments of pthread_setname_np], [rb_cv_func_pthread_setname_np_arguments],
-	    [rb_cv_func_pthread_setname_np_arguments=
-	    # Linux,AIX,  (pthread_self(), name)
-	    # NetBSD (pthread_self(), name, \"%s\")
-	    # Darwin (name)
-	    for mac in \
-		"(pthread_self(), name)" \
-		"(pthread_self(), name, \"%s\")" \
-		"(name)" \
-		; do
-		AC_TRY_COMPILE([
-		    @%:@include <pthread.h>
-		    @%:@ifdef HAVE_PTHREAD_NP_H
-		    @%:@include <pthread_np.h>
-		    @%:@endif
-		    @%:@define SET_THREAD_NAME(name) pthread_setname_np${mac}
-		    ],
-		    [if (SET_THREAD_NAME("conftest")) return 1;],
-		    [rb_cv_func_pthread_setname_np_arguments="${mac}"
-		    break])
-	    done
-	    ]
-	)
-	if test -n "${rb_cv_func_pthread_setname_np_arguments}"; then
-	    set_current_thread_name="pthread_setname_np${rb_cv_func_pthread_setname_np_arguments}"
-	fi
-    elif test "$ac_cv_func_pthread_set_name_np" = yes; then
-	set_current_thread_name="pthread_set_name_np(pthread_self(), name)"
-    fi
-    AS_IF([test -n "$set_current_thread_name"], [
-	AC_DEFINE_UNQUOTED(SET_CURRENT_THREAD_NAME(name), $set_current_thread_name)
-	AS_CASE([$set_current_thread_name],
-	    [*'pthread_self()'*], [
-		set_another_thread_name=`echo "$set_current_thread_name" | sed 's/pthread_self()/thid/'`
-		AC_DEFINE_UNQUOTED(SET_ANOTHER_THREAD_NAME(thid,name), $set_another_thread_name)
-	    ])
-    ])
-fi
-
-if test x"$ac_cv_header_ucontext_h" = xno; then
-    AC_CACHE_CHECK([if signal.h defines ucontext_t], [rb_cv_ucontext_in_signal_h],
-	[AC_TRY_COMPILE([@%:@include <signal.h>],
-	[size_t size = sizeof(ucontext_t);],
-	[rb_cv_ucontext_in_signal_h=yes], [rb_cv_ucontext_in_signal_h=no])])
-    if test x"$rb_cv_ucontext_in_signal_h" = xyes; then
-	    AC_DEFINE_UNQUOTED(UCONTEXT_IN_SIGNAL_H, 1)
-    fi
-fi
-if test x"$ac_cv_header_ucontext_h" = xyes -o x"$rb_cv_ucontext_in_signal_h" = xyes; then
-    AC_CACHE_CHECK([if mcontext_t is a pointer], [rb_cv_mcontext_t_ptr],
-	[AC_TRY_COMPILE([
-	    @%:@include <signal.h>
-	    @%:@ifdef HAVE_UCONTEXT_H
-	    @%:@include <ucontext.h>
-	    @%:@endif
-        mcontext_t test(mcontext_t mc) {return mc+1;}
-	],
-	[test(0);],
-	[rb_cv_mcontext_t_ptr=yes], [rb_cv_mcontext_t_ptr=no])])
-    if test x"$rb_cv_mcontext_t_ptr" = xyes; then
-	AC_DEFINE_UNQUOTED(DEFINE_MCONTEXT_PTR(mc, uc), mcontext_t mc = (uc)->uc_mcontext)
-    else
-	AC_DEFINE_UNQUOTED(DEFINE_MCONTEXT_PTR(mc, uc), mcontext_t *mc = &(uc)->uc_mcontext)
-    fi
-    if test x"$rb_with_pthread" = xyes; then
-	AC_CHECK_FUNCS(getcontext setcontext)
-    fi
-fi
-
-if test "$ac_cv_func_fork_works" = "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;
-	}
-        if (!WIFEXITED(loc) || WEXITSTATUS(loc) != EXIT_SUCCESS)
-           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
-
-
-}
-{ # runtime section
-
-dnl wheather use dln_a_out or not
-AC_ARG_WITH(dln-a-out,
-	AS_HELP_STRING([--with-dln-a-out], [use dln_a_out if possible]),
-	[
-	AS_CASE([$withval],
-	[yes], [
-	    if test "$enable_shared" = yes; then
-		AC_MSG_ERROR(dln_a_out can not make shared library)
-	    fi
-	    with_dln_a_out=yes],
-	[
-	    with_dln_a_out=no])], [with_dln_a_out=no])
-
-AC_CACHE_CHECK(whether ELF binaries are produced, rb_cv_binary_elf,
-[AC_TRY_LINK([],[], [
-AS_CASE(["`head -1 conftest$EXEEXT | tr -dc '\177ELF' | tr '\177' .`"],
-[.ELF*], [rb_cv_binary_elf=yes], [rb_cv_binary_elf=no])],
-rb_cv_binary_elf=no)])
-
-if test "$rb_cv_binary_elf" = yes; then
-  AC_DEFINE(USE_ELF)
-  if test "$with_dln_a_out" = yes; then
-    AC_MSG_ERROR(dln_a_out does not work with ELF)
-  fi
-  AC_CHECK_HEADERS([elf.h elf_abi.h])
-  if test $ac_cv_header_elf_h = yes -o $ac_cv_header_elf_abi_h = yes; then
-    AC_LIBOBJ([addr2line])
-  fi
-fi
-
-AS_CASE(["$target_os"],
-[linux* | gnu* | k*bsd*-gnu | bsdi* | kopensolaris*-gnu | nacl], [
-    if test "$rb_cv_binary_elf" = no; then
-	with_dln_a_out=yes
-    else
-	LDFLAGS="$LDFLAGS -rdynamic"
-    fi])
-LIBEXT=a
-
-AC_SUBST(DLDFLAGS)dnl
-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
-AC_SUBST(ASMEXT, S)dnl
-
-STATIC=
-: ${PATHFLAG=''}
-
-if test "$with_dln_a_out" != yes; then
-  rb_cv_dlopen=unknown
-  AC_MSG_CHECKING(whether OS depend dynamic link works)
-  if test "$GCC" = yes; then
-    AS_CASE(["$target_os"],
-    [darwin*], [
-      # The -fno-common is needed if we wish to embed the Ruby interpreter
-      # into a plugin module of some project (as opposed to embedding it
-      # within the project's application).  The -I/usr/local/include is
-      # needed because CPP as discovered by configure (cc -E -traditional)
-      # fails to consult /usr/local/include by default.  This causes
-      # mkmf.rb's have_header() to fail if the desired resource happens to be
-      # installed in the /usr/local tree.
-      RUBY_APPEND_OPTION(CCDLFLAGS, -fno-common)],
-    [bsdi*|cygwin*|mingw*|aix*|interix*], [ ],
-    [
-      RUBY_APPEND_OPTION(CCDLFLAGS, -fPIC)])
-  else
-    AS_CASE(["$target_os"],
-	[hpux*],          [CCDLFLAGS="$CCDLFLAGS +Z"],
-	[solaris*|irix*], [CCDLFLAGS="$CCDLFLAGS -KPIC"],
-	[sunos*],         [CCDLFLAGS="$CCDLFLAGS -PIC"],
-	[esix*|uxpds*],   [CCDLFLAGS="$CCDLFLAGS -KPIC"],
-	                  [: ${CCDLFLAGS=""}])
-  fi
-
-
-  AC_ARG_ENABLE(rpath,
-       AS_HELP_STRING([--enable-rpath], [embed run path into extension libraries.
-       enabled by default on ELF platforms]),
-       [enable_rpath=$enableval], [enable_rpath="$rb_cv_binary_elf"])
-
-  AS_CASE(["$target_os"],
-	[hpux*], [	DLDFLAGS="$DLDFLAGS -E"
-			: ${LDSHARED='$(LD) -b'}
-			XLDFLAGS="$XLDFLAGS -Wl,-E"
-			: ${LIBPATHENV=SHLIB_PATH}
-			if test "$rb_cv_prog_gnu_ld" = no; then
-			    RPATHFLAG=' +b %1$-s'
-			fi
-			rb_cv_dlopen=yes],
-	[solaris*], [	if test "$GCC" = yes; then
-			    : ${LDSHARED='$(CC) -shared'}
-			    if test "$rb_cv_prog_gnu_ld" = yes; then
-				LDFLAGS="$LDFLAGS -Wl,-E"
-			    fi
-			else
-			    : ${LDSHARED='$(CC) -G'}
-			fi
-			if test "$ac_cv_sizeof_voidp" = 8; then
-			    : ${LIBPATHENV=LD_LIBRARY_PATH_64}
-			    : ${PRELOADENV=LD_PRELOAD_64}
-			else
-			    : ${LIBPATHENV=LD_LIBRARY_PATH_32}
-			    : ${PRELOADENV=LD_PRELOAD_32}
-			fi
-			rb_cv_dlopen=yes],
-	[sunos*], [	: ${LDSHARED='$(LD) -assert nodefinitions'}
-			rb_cv_dlopen=yes],
-	[irix*], [	: ${LDSHARED='$(LD) -shared'}
-			rb_cv_dlopen=yes],
-	[sysv4*], [	: ${LDSHARED='$(LD) -G'}
-			rb_cv_dlopen=yes],
-	[nto-qnx*], [	: ${LDSHARED='$(CC) -shared'}
-			rb_cv_dlopen=yes],
-	[esix*|uxpds*], [ : ${LDSHARED='$(LD) -G'}
-			rb_cv_dlopen=yes],
-	[osf*], [	: ${LDSHARED='$(LD) -shared -expect_unresolved "*"'}
-			rb_cv_dlopen=yes],
-	[bsdi3*], [	AS_CASE(["$CC"],
-			[*shlicc*], [	: ${LDSHARED='$(CC) -r'}
-					rb_cv_dlopen=yes])],
-	[linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | kopensolaris*-gnu | haiku*], [
-			: ${LDSHARED='$(CC) -shared'}
-			if test "$rb_cv_binary_elf" = yes; then
-			    LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
-			fi
-			rb_cv_dlopen=yes],
-	[interix*], [	: ${LDSHARED='$(CC) -shared'}
-			XLDFLAGS="$XLDFLAGS -Wl,-E"
-			LIBPATHFLAG=" -L%1\$-s"
-			rb_cv_dlopen=yes],
-	[freebsd*|dragonfly*], [
-			: ${LDSHARED='$(CC) -shared'}
-			if test "$rb_cv_binary_elf" = yes; then
-			    LDFLAGS="$LDFLAGS -rdynamic"
-			    DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$@'
-			else
-			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable'
-			fi
-			rb_cv_dlopen=yes],
-	[openbsd*|mirbsd*], [	: ${LDSHARED='$(CC) -shared ${CCDLFLAGS}'}
-			if test "$rb_cv_binary_elf" = yes; then
-			    LDFLAGS="$LDFLAGS -Wl,-E"
-			fi
-			rb_cv_dlopen=yes],
-	[darwin*], [	: ${LDSHARED='$(CC) -dynamic -bundle'}
-			: ${LDFLAGS=""}
-			: ${LIBPATHENV=DYLD_LIBRARY_PATH}
-			: ${PRELOADENV=DYLD_INSERT_LIBRARIES}
-			rb_cv_dlopen=yes],
-        [aix*], [	: ${LDSHARED='$(CC)'}
-			LDSHARED="$LDSHARED ${linker_flag}-G"
-			EXTDLDFLAGS='-e$(TARGET_ENTRY)'
-			XLDFLAGS="${linker_flag}"'-bE:$(ARCHFILE)'" ${linker_flag}-brtl"
-			XLDFLAGS="$XLDFLAGS ${linker_flag}-blibpath:${prefix}/lib:${LIBPATH:-/usr/lib:/lib}"
-			: ${ARCHFILE="ruby.imp"}
-                        TRY_LINK='$(CC) $(LDFLAGS) -oconftest $(INCFLAGS) -I$(hdrdir) $(CPPFLAGS)'
-                        TRY_LINK="$TRY_LINK"' $(CFLAGS) $(src) $(LIBPATH) $(LOCAL_LIBS) $(LIBS)'
-			: ${LIBPATHENV=LIBPATH}
-			RPATHFLAG=" ${linker_flag}-blibpath:%1\$-s:${prefix}/lib:${LIBPATH:-/usr/lib:/lib}"
-			rb_cv_dlopen=yes],
-	[nto-qnx*], [	DLDFLAGS="$DLDFLAGS -L/lib -L/usr/lib -L/usr/local/lib"
-			: ${LDSHARED='$(LD) -Bshareable -x'}
-			LDFLAGS="$LDFLAGS -L/lib -L/usr/lib -L/usr/local/lib"
-			rb_cv_dlopen=yes],
-	[cygwin*|mingw*], [
-			: ${LDSHARED='$(CC) -shared $(if $(filter-out -g -g0,$(debugflags)),,-s)'}
-			XLDFLAGS="$XLDFLAGS -Wl,--stack,0x00200000,--enable-auto-import"
-			DLDFLAGS="${DLDFLAGS} -Wl,--enable-auto-image-base,--enable-auto-import"
-			: ${LIBPATHENV=""}
-			: ${PRELOADENV=""}
-			rb_cv_dlopen=yes],
-	[hiuxmpp], [	: ${LDSHARED='$(LD) -r'}],
-	[atheos*], [	: ${LDSHARED='$(CC) -shared'}
-			rb_cv_dlopen=yes],
-        [nacl], [ LDSHARED='$(CC) -shared' ],
-	[	: ${LDSHARED='$(LD)'}])
-  AC_MSG_RESULT($rb_cv_dlopen)
-
-  if test "$rb_cv_dlopen" = yes; then
-    AS_CASE(["$target_os"],
-      [darwin*], [
-	for flag in \
-	  "-undefined dynamic_lookup" \
-	  "-multiply_defined suppress" \
-	  ; do
-	  test "x${linker_flag}" = x || flag="${linker_flag}`echo ${flag} | tr ' ' ,`"
-	  RUBY_TRY_LDFLAGS([$flag], [], [flag=])
-	  if test "x$flag" != x; then
-	    RUBY_APPEND_OPTIONS(DLDFLAGS, [$flag])
-	  fi
-	done
-      ])
-  fi
-
-  if test "$enable_rpath" = yes; then
-    if test x"${RPATHFLAG}" = x; then
-      for rpathflag in -R "-rpath "; do
-	AS_CASE("$rpathflag",
-		[*" "], [AS_CASE(["${linker_flag}"],
-				 [*,], [rpathflag=`echo "$rpathflag" | tr ' ' ,`])])
-	rpathflag="${linker_flag}${rpathflag}"
-	RUBY_TRY_LDFLAGS([${rpathflag}.], [], [rpathflag=])
-	if test "x${rpathflag}" != x; then
-	  RPATHFLAG=" ${rpathflag}%1\$-s"
-	  break
-	fi
-      done
-    fi
-  fi
-fi
-if test "${LDSHAREDXX}" = ""; then
-    AS_CASE(["${LDSHARED}"],
-	[*'$(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" "*], [
-	    ])
-fi
-AS_CASE([${RPATHFLAG}],[*'%1$'*],[: ${LIBPATHFLAG=' -L%1$-s'}],[: ${LIBPATHFLAG=' -L%s'}])
-
-AC_SUBST(LINK_SO)
-AC_SUBST(LIBPATHFLAG)
-AC_SUBST(RPATHFLAG)
-AC_SUBST(LIBPATHENV, "${LIBPATHENV-LD_LIBRARY_PATH}")
-AC_SUBST(PRELOADENV, "${PRELOADENV-LD_PRELOAD}")
-AC_SUBST(TRY_LINK)
-
-if test "x$OPT_DIR" != x; then
-    pat=`echo "${LDFLAGS_OPTDIR}" | sed ['s/[][\\.*|]/\\\\&/']`
-    LDFLAGS=`echo "${LDFLAGS}" | sed "s| ${pat}||"`
-    val=`IFS="$PATH_SEPARATOR"
-        for dir in $OPT_DIR; do
-            echo x ${LIBPATHFLAG} ${RPATHFLAG} |
-            sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${dir}/lib${IFS}g;s${IFS}%s${IFS}${dir}/lib${IFS}g"
-        done | tr '\012' ' ' | sed 's/ *$//'`
-    if test x"$val" != x; then
-	test x"${LDFLAGS}" = x || LDFLAGS="$LDFLAGS "
-	LDFLAGS="$LDFLAGS$val"
-	test x"${DLDFLAGS}" = x || DLDFLAGS="$DLDFLAGS "
-	DLDFLAGS="$DLDFLAGS$val"
-    fi
-    LDFLAGS_OPTDIR="$val"
-fi
-
-AS_CASE(["$target_os"],
-[freebsd*], [
-    AC_CHECK_LIB([procstat], [procstat_open_sysctl])
-    if test "x$ac_cv_lib_procstat_procstat_open_sysctl" = xyes; then
-	AC_CHECK_FUNCS(procstat_getvmmap)
-    fi
-    ])
-AS_CASE(["$target_cpu-$target_os"],
-[*-darwin*], [
-    AC_CHECK_HEADERS([execinfo.h])
-    if test "x$ac_cv_header_execinfo_h" = xyes; then
-	AC_CHECK_LIB([execinfo], [backtrace])
-	AC_CHECK_HEADERS([libunwind.h])
-    fi],
-[*-freebsd*|x86_64-netbsd*], [
-    AC_CHECK_HEADERS([execinfo.h])
-    if test "x$ac_cv_header_execinfo_h" = xyes; then
-	AC_CHECK_LIB([execinfo], [backtrace])
-	AC_CHECK_LIB([unwind], [unw_backtrace])
-    fi])
-AC_CHECK_FUNCS(backtrace)
-
-if test "x$ac_cv_func_backtrace" = xyes; then
-  AC_CACHE_CHECK(for broken backtrace, rb_cv_broken_backtrace,
-    [AC_TRY_RUN([
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-#include <signal.h>
-#include <execinfo.h>
-
-#define TRACE_SIZE 256
-
-void sigsegv(int signum, siginfo_t *info, void *ctx){
-    void *trace[TRACE_SIZE];
-    int n = backtrace(trace, TRACE_SIZE);
-    if (n > 0) {
-	/*fprintf(stdout, "backtrace:%d\n",n);*/
-    } else {
-	_exit(EXIT_FAILURE);
-    }
-    _exit(EXIT_SUCCESS);
-}
-int
-main(void)
-{
-    volatile int *a = NULL;
-    stack_t ss;
-    ss.ss_sp = malloc(SIGSTKSZ);
-    if (ss.ss_sp == NULL) {
-	fprintf(stderr, "cannot allocate memory for sigaltstack\n");
-	return EXIT_FAILURE;
-    }
-    ss.ss_size = SIGSTKSZ;
-    ss.ss_flags = 0;
-    if (sigaltstack(&ss, NULL) == -1) {
-	fprintf(stderr, "sigaltstack failed\n");
-	return EXIT_FAILURE;
-    }
-    struct sigaction sa;
-    memset(&sa, 0, sizeof(struct sigaction));
-    sigemptyset(&sa.sa_mask);
-    sa.sa_sigaction = sigsegv;
-    sa.sa_flags |= SA_SIGINFO;
-    sa.sa_flags |= SA_ONSTACK;
-    sigaction(SIGSEGV, &sa, NULL);
-    a[0] = 1;
-    return EXIT_SUCCESS;
-}
-],
-	rb_cv_broken_backtrace=no,
-	rb_cv_broken_backtrace=yes,
-	rb_cv_broken_backtrace=no)])
-  if test "$rb_cv_broken_backtrace" = yes; then
-    AC_DEFINE(BROKEN_BACKTRACE, 1)
-  fi
-fi
-
-AC_ARG_WITH(valgrind,
-        AS_HELP_STRING([--without-valgrind],[disable valgrind memcheck support]),
-        [], with_valgrind=yes)
-AS_IF([test x$with_valgrind != xno],
-        [AC_CHECK_HEADERS(valgrind/memcheck.h)])
-
-dln_a_out_works=no
-if test "$ac_cv_header_a_out_h" = yes; then
-  if test "$with_dln_a_out" = yes || test "$rb_cv_dlopen" = unknown; then
-    cat confdefs.h > config.h
-    AC_CACHE_CHECK(whether matz's dln works, rb_cv_dln_a_out,
-    [AC_TRY_COMPILE([
-#define USE_DLN_A_OUT
-#include "dln.c"
-],
-	[],
-	rb_cv_dln_a_out=yes,
-	rb_cv_dln_a_out=no)])
-    if test "$rb_cv_dln_a_out" = yes; then
-      dln_a_out_works=yes
-      AC_DEFINE(USE_DLN_A_OUT)
-    fi
-  fi
-fi
-
-if test "$dln_a_out_works" = yes; then
-  if test "$GCC" = yes; then
-    STATIC=-static
-  else
-    STATIC=-Bstatic
-  fi
-  DLEXT=so
-  CCDLFLAGS=
-else
-  AS_CASE(["$target_os"],
-    [hpux*], [
-	DLEXT=sl],
-    [darwin*], [
-	RUBY_APPEND_OPTION(XLDFLAGS, [-Wl,-u,_objc_msgSend])
-	DLEXT=bundle],
-    [cygwin*|mingw*|*djgpp*], [
-	LOAD_RELATIVE=1
-	DLEXT=so],
-    [
-	DLEXT=so])
-fi
-if test "$rb_cv_dlopen:$load_relative" = yes:yes; then
-    if test "$ac_cv_func_dladdr" = yes; then
-	LOAD_RELATIVE=1
-    fi
-fi
-if test x"$LOAD_RELATIVE" = x1; then
-    load_relative=yes
-else
-    unset load_relative
-fi
-
-len=2 # .rb
-n=`expr "$DLEXT"  : '.*'`; test "$n" -gt "$len" && len=$n
-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)
-
-if test "$with_dln_a_out" = yes; then
-  STRIP=true
-else
-  AC_CHECK_TOOL(STRIP, strip, :)dnl
-fi
-
-AS_CASE(["$target_os"],
-  [linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu], [
-	STRIP="$STRIP -S -x"],
-  [darwin*], [
-	STRIP="$STRIP -A -n"])
-
-AC_ARG_WITH(ext,
-            AC_HELP_STRING([--with-ext=EXTS],
-                           [pass to --with-ext option of extmk.rb]))
-AC_ARG_WITH(out-ext,
-            AC_HELP_STRING([--with-out-ext=EXTS],
-                           [pass to --without-ext option of extmk.rb]))
-EXTSTATIC=
-AC_SUBST(EXTSTATIC)dnl
-AC_ARG_WITH(static-linked-ext,
-	    AS_HELP_STRING([--with-static-linked-ext], [link external modules statically]),
-            [AS_CASE([$withval],[yes],[STATIC=;EXTSTATIC=static],[no],[],[EXTSTATIC="$withval"])])
-AS_CASE([",$EXTSTATIC,"], [,static,|*,enc,*], [
-  ENCOBJS='enc/encinit.$(OBJEXT) enc/libenc.$(LIBEXT) enc/libtrans.$(LIBEXT)'
-  EXTOBJS='ext/extinit.$(OBJEXT)'
-  AC_DEFINE_UNQUOTED(EXTSTATIC, 1)
-  AC_SUBST(ENCSTATIC, static)
-], [
-  ENCOBJS='dmyenc.$(OBJEXT)'
-  EXTOBJS='dmyext.$(OBJEXT)'
-])
-AC_SUBST(ENCOBJS)
-AC_SUBST(EXTOBJS)
-
-AC_ARG_WITH(setup,
-	    AS_HELP_STRING([--with-setup=SETUP], [use extension libraries setup]),
-	    [setup=$withval])
-if test -n "$setup"; then
-    if ! test -f "ext/$setup" -o -f "$srcdir/ext/$setup"; then
-	AC_MSG_ERROR(Setup file $setup not found under ext or $srcdir/ext)
-    fi
-elif test -f "$srcdir/ext/Setup.$target_os"; then
-    setup="Setup.$target_os"
-else
-    setup=
-    for file in "$srcdir"/ext/Setup.*; do
-	AS_CASE(["$file"], [*~|*.bak|*.orig|*.rej|*.tmp], [continue])
-	setup=`basename "$file"`
-	AS_CASE(["$target_os"], [`expr "$setup" : 'Setup.\(.*\)'`*], [break])
-	platform=`sed '/^option  *platform  */!d;s///;s/|/*|/g;q' "$file"`
-	if test "x$platform" != x; then
-	    eval "AS_CASE([\"\$target_os\"], [$platform*], [break])"
-	fi
-	setup=
-    done
-    : ${setup:=Setup}
-fi
-AC_SUBST(setup)
-
-rubylibprefix='${libdir}/${RUBY_BASE_NAME}'
-AC_ARG_WITH(rubylibprefix,
-	    AS_HELP_STRING([--with-rubylibprefix=DIR], [prefix for ruby libraries [[LIBDIR/RUBY_BASE_NAME]]]),
-	    [if test "x$withval" = xno; then
-		AC_MSG_ERROR([No ruby, No libprefix])
-	    fi
-	    rubylibprefix="$withval"])
-AC_SUBST(rubylibprefix)
-
-if test x"${exec_prefix}" != xNONE; then
-    RUBY_EXEC_PREFIX="$exec_prefix"
-elif test x"$prefix" != xNONE; then
-    RUBY_EXEC_PREFIX="$prefix"
-else
-    RUBY_EXEC_PREFIX=$ac_default_prefix
-fi
-pat=`echo "${RUBY_EXEC_PREFIX}" | tr -c '\012' .`'\(.*\)'
-for var in bindir libdir rubylibprefix; do
-    eval val='"$'$var'"'
-    AS_CASE(["$val"], ["${RUBY_EXEC_PREFIX}"*], [val='${exec_prefix}'"`expr \"$val\" : \"$pat\"`"])
-    eval $var='"$val"'
-done
-
-BTESTRUBY='$(MINIRUBY)'
-if test x"$cross_compiling" = xyes; then
-  test x"$MINIRUBY" = x && MINIRUBY="${RUBY-$BASERUBY} -I`$CHDIR .; pwd` "-r'$(arch)-fake'
-  XRUBY_LIBDIR=`${RUBY-$BASERUBY} -rrbconfig -e ['puts RbConfig::CONFIG["libdir"]']`
-  XRUBY_RUBYLIBDIR=`${RUBY-$BASERUBY} -rrbconfig -e ['puts RbConfig::CONFIG["rubylibdir"]']`
-  XRUBY_RUBYHDRDIR=`${RUBY-$BASERUBY} -rrbconfig -e ['puts RbConfig::CONFIG["rubyhdrdir"]']`
-  AC_SUBST(XRUBY_LIBDIR)
-  AC_SUBST(XRUBY_RUBYLIBDIR)
-  AC_SUBST(XRUBY_RUBYHDRDIR)
-  PREP='$(arch)-fake.rb'
-  RUNRUBY_COMMAND='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`'
-  RUNRUBY='$(RUNRUBY_COMMAND)'
-  XRUBY='$(MINIRUBY)'
-  BOOTSTRAPRUBY='$(BASERUBY)'
-  TEST_RUNNABLE=no
-  CROSS_COMPILING=yes
-
-  if test "$host_os" = "nacl"; then
-      if test "$build_cpu" = "$host_cpu" || test "${nacl_cv_cpu_nick}" = "x86" -a "$host_cpu" = "i686"; then
-          nacl_cv_sel_ldr='`$(MINIRUBY) $(srcdir)/nacl/nacl-config.rb sel_ldr`'
-          nacl_cv_irt_core='`$(MINIRUBY) $(srcdir)/nacl/nacl-config.rb irt_core`'
-          nacl_cv_runnable_ld='`$(MINIRUBY) $(srcdir)/nacl/nacl-config.rb runnable_ld`'
-          nacl_cv_host_lib='`$(MINIRUBY) $(srcdir)/nacl/nacl-config.rb host_lib`'
-          TEST_RUNNABLE=yes
-          BTESTRUBY="${nacl_cv_sel_ldr} -a -B ${nacl_cv_irt_core} -w 1:3 -w 2:4"
-          BTESTRUBY="$BTESTRUBY -- ${nacl_cv_runnable_ld} --library-path ${nacl_cv_host_lib}"
-          BTESTRUBY="$BTESTRUBY `pwd`/"'miniruby$(EXEEXT) -I`cd $(srcdir)/lib; pwd` -I.'
-          BTESTRUBY="$BTESTRUBY"' -I$(EXTOUT)/common 3>&1 4>&2 1>/dev/null 2>/dev/null '
-      fi
-  fi
-else
-  MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib -I.'
-  MINIRUBY="$MINIRUBY"' -I$(EXTOUT)/common'
-  PREP='miniruby$(EXEEXT)'
-  RUNRUBY_COMMAND='$(MINIRUBY) $(srcdir)/tool/runruby.rb --extout=$(EXTOUT) $(RUNRUBYOPT)'
-  RUNRUBY='$(RUNRUBY_COMMAND) --'
-  XRUBY='$(RUNRUBY)'
-  BOOTSTRAPRUBY='$(MINIRUBY)'
-  TEST_RUNNABLE=yes
-  CROSS_COMPILING=no
-fi
-AC_SUBST(TEST_RUNNABLE)
-AC_SUBST(CROSS_COMPILING)
-AC_SUBST(MINIRUBY)
-AC_SUBST(BTESTRUBY)
-AC_SUBST(PREP)
-AC_SUBST(RUNRUBY_COMMAND)
-AC_SUBST(RUNRUBY)
-AC_SUBST(XRUBY)
-AC_SUBST(BOOTSTRAPRUBY)
-AC_SUBST(EXTOUT, [${EXTOUT=.ext}])
-
-FIRSTMAKEFILE=""
-LIBRUBY_A='lib$(RUBY_SO_NAME)-static.a'
-LIBRUBY='$(LIBRUBY_A)'
-LIBRUBYARG_STATIC='-l$(RUBY_SO_NAME)-static'
-LIBRUBYARG='$(LIBRUBYARG_STATIC)'
-SOLIBS=
-
-AS_CASE(["$target_os"],
-  [cygwin*|mingw*|haiku*|darwin*], [
-    : ${DLDLIBS=""}
-    ],
-  [
-    DLDLIBS="$DLDLIBS -lc"
-    ])
-
-AC_ARG_ENABLE(multiarch,
-	      AS_HELP_STRING([--enable-multiarch], [enable multiarch compatible directories]),
-	      [multiarch=], [unset multiarch])
-if test ${multiarch+set}; then
-   AC_DEFINE(ENABLE_MULTIARCH)
-fi
-
-archlibdir='${libdir}/${arch}'
-sitearchlibdir='${libdir}/${sitearch}'
-archincludedir='${includedir}/${arch}'
-sitearchincludedir='${includedir}/${sitearch}'
-
-AC_ARG_WITH(soname,
-	AS_HELP_STRING([--with-soname=SONAME], [base name of shared library]),
-	[RUBY_SO_NAME=$withval], [RUBY_SO_NAME='$(RUBY_BASE_NAME)'])
-
-LIBRUBY_LDSHARED=$LDSHARED
-LIBRUBY_DLDFLAGS=$DLDFLAGS
-LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(RUBY_PROGRAM_VERSION)'
-LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so'
-ENABLE_SHARED=no
-
-AC_ARG_ENABLE(shared,
-       AS_HELP_STRING([--enable-shared], [build a shared library for Ruby]),
-       [enable_shared=$enableval])
-libprefix=${multiarch+'$(archlibdir)'}${multiarch-'$(libdir)'}
-LIBRUBY_RELATIVE=${load_relative-no}
-AS_CASE("$enable_shared", [yes], [
-  LIBRUBY='$(LIBRUBY_SO)'
-  LIBRUBYARG_SHARED='-l$(RUBY_SO_NAME)'
-  LIBRUBYARG='$(LIBRUBYARG_SHARED)'
-  LIBRUBY_RELATIVE=no
-  test -z "$CCDLFLAGS" || CFLAGS="$CFLAGS $CCDLFLAGS"
-  ENABLE_SHARED=yes
-  if test "$rb_cv_binary_elf" = yes; then
-    SOLIBS='$(LIBS)'
-  fi
-
-  # libdir can be overridden in config.site file (on OpenSUSE at least).
-  libdir_basename=lib
-  if test "$bindir" = '${exec_prefix}/bin'; then
-    AS_CASE(["$libdir"], ['${exec_prefix}/'*], [libdir_basename=`basename "$libdir"`])
-  fi
-  AC_DEFINE_UNQUOTED(LIBDIR_BASENAME, ["${libdir_basename}"])
-  libdir_basename="${libdir_basename}"${multiarch+'/${arch}'}
-
-  AS_CASE(["$target_os"],
-    [freebsd*|dragonfly*], [],
-    [
-     if test "$GCC" = yes; then
-       RUBY_TRY_LDFLAGS([${linker_flag}--no-undefined], [no_undefined=yes], [no_undefined=no])
-       if test "no_undefined" = yes; then
-	  RUBY_APPEND_OPTION(EXTLDFLAGS, [${linker_flag}--no-undefined])
-       fi
-     fi
-    ])
-
-  AS_CASE(["$target_os"],
-    [sunos4*], [
-	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
-	],
-    [linux* | gnu* | k*bsd*-gnu | atheos* | kopensolaris*-gnu | haiku*], [
-	LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'" $LDFLAGS_OPTDIR"
-	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
-	if test "$load_relative" = yes; then
-	    libprefix="'\$\${ORIGIN}/../${libdir_basename}'"
-	    LIBRUBY_RPATHFLAGS="-Wl,-rpath,${libprefix}"
-	    LIBRUBY_RELATIVE=yes
-	fi
-	],
-    [freebsd*|dragonfly*], [
-	SOLIBS='$(LIBS)'
-	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'
-	if test "$rb_cv_binary_elf" != "yes" ; then
-	    LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
-	    LIBRUBY_ALIASES=''
-	fi
-	],
-    [netbsd*], [
-	SOLIBS='$(LIBS)'
-	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
-	LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'" $LDFLAGS_OPTDIR"
-	if test "$rb_cv_binary_elf" = yes; then # ELF platforms
-	   LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so'
-	else	# a.out platforms
-	   LIBRUBY_ALIASES=""
-	fi
-	],
-    [openbsd*|mirbsd*], [
-	SOLIBS='$(LIBS)'
-	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
-	],
-    [solaris*], [
-	SOLIBS='$(LIBS)'
-	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)'
-	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(RUBY_PROGRAM_VERSION) lib$(RUBY_SO_NAME).so'
-	if test "$GCC" = yes; then
-	    LIBRUBY_DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(@F)'
-	else
-	    LIBRUBY_DLDFLAGS="$DLDFLAGS "'-h $(@F)'
-	fi
-	XLDFLAGS="$XLDFLAGS "'-R${libdir}'
-	],
-    [hpux*], [
-	XLDFLAGS="$XLDFLAGS "'-Wl,+s,+b,$(libdir)'
-	LIBRUBY_SO='lib$(RUBY_SO_NAME).sl.$(RUBY_PROGRAM_VERSION)'
-	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).sl.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).sl'
-	],
-    [aix*], [
-	LIBRUBY_DLDFLAGS="${linker_flag}-bnoentry $XLDFLAGS $LDFLAGS_OPTDIR"
-	LIBRUBYARG_SHARED='-L${libdir} -l${RUBY_SO_NAME}'
-	SOLIBS='-lm -lc'
-	],
-    [darwin*], [
-	RUBY_SO_NAME="$RUBY_SO_NAME"'.$(RUBY_PROGRAM_VERSION)'
-	LIBRUBY_LDSHARED='$(CC) -dynamiclib'
-	if test "$load_relative" = yes; then
-	    libprefix="@executable_path/../${libdir_basename}"
-	    LIBRUBY_RELATIVE=yes
-	fi
-	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-install_name '${libprefix}'/$(LIBRUBY_SO)'
-	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-current_version $(MAJOR).$(MINOR)'
-	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-compatibility_version $(RUBY_PROGRAM_VERSION)'
-	if test "$visibility_option" = ld; then
-	    LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-Wl,-unexported_symbol,_Init_*'
-	    LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-Wl,-unexported_symbol,_ruby_static_id_*'
-	    LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-Wl,-unexported_symbol,*_threadptr_*'
-	fi
-	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "' $(XLDFLAGS)'
-	LIBRUBY_SO='lib$(RUBY_SO_NAME).dylib'
-	LIBRUBY_ALIASES='lib$(RUBY_BASE_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_INSTALL_NAME).dylib'
-	SOLIBS='$(LIBS)'
-	],
-    [interix*], [
-	LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
-	],
-    [mingw*|cygwin*|mswin*], [
-	LIBRUBY_RELATIVE=yes
-	])
-], [
-  LIBRUBYARG_SHARED=
-
-  # enable PIE if possible
-  AC_ARG_ENABLE(pie,
-          AS_HELP_STRING([--disable-pie], [disable PIE feature]),
-          [pie=$enableval], [pie=])
-  AS_CASE(["$target_os"],
-  [nacl], [
-    # -pie implies -shared for NaCl.
-    pie=no
-  ])
-  if test "$GCC" = yes -a -z "$EXTSTATIC" -a "x$pie" != xno; then
-    RUBY_TRY_CFLAGS(-fPIE, [pie=yes], [pie=no])
-    if test "$pie" = yes; then
-      # Use -fPIE when testing -pie.  RUBY_TRY_LDFLAGS sets
-      # $save_CFLAGS internally, so set other name here.
-      save_CFLAGS_before_pie="$CFLAGS"
-      CFLAGS="$CFLAGS -fPIE"
-
-      # gcc need -pie but clang need -Wl,-pie.
-      for pie in -pie -Wl,-pie; do
-	RUBY_TRY_LDFLAGS([$pie], [], [pie=])
-	if test "x$pie" != x; then
-	  RUBY_APPEND_OPTION(XCFLAGS, -fPIE)
-	  RUBY_APPEND_OPTION(XLDFLAGS, $pie)
-	  break
-	fi
-      done
-      CFLAGS="$save_CFLAGS_before_pie"
-    fi
-  fi
-])
-if test "$enable_rpath" = yes; then
-    test -z "$LIBRUBY_RPATHFLAGS" || LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS "
-    rpathflag="${RPATHFLAG}"
-    AS_CASE(["${cross_compiling}${load_relative}"], [*yes*], [], [rpathflag="$RPATHFLAG$LIBPATHFLAG"])
-    rpathflag=`IFS="$PATH_SEPARATOR"
-        echo x "$rpathflag" |
-        sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${libprefix}${IFS}g"
-    `
-    LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}"
-    LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
-    LIBRUBYARG_STATIC="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_STATIC"
-fi
-AC_SUBST(LIBRUBY_RELATIVE)
-
-LDFLAGS="-L. $LDFLAGS"
-AC_SUBST(ARCHFILE)
-
-if test "$EXEEXT" = .exe; then
-    EXECUTABLE_EXTS='".exe",".com",".cmd",".bat"'
-    AC_DEFINE_UNQUOTED(EXECUTABLE_EXTS, $EXECUTABLE_EXTS)
-    EXECUTABLE_EXTS=`echo $EXECUTABLE_EXTS | tr -d '"' | tr , ' '`
-    AC_SUBST(EXECUTABLE_EXTS)
-fi
-
-AS_CASE("$cross_compiling:${LIBPATHENV}", [yes:* | no:], [], [
-    AC_MSG_CHECKING(whether wrapper for $LIBPATHENV is needed)
-    AS_IF([env ${LIBPATHENV}=/lib /bin/sh -c ': ${'${LIBPATHENV}'?}' 2>/dev/null],
-	[AC_MSG_RESULT(no)],
-	[PREP="$PREP"' ruby-runner$(EXEEXT)'
-	AC_MSG_RESULT(yes)]
-    )
-])
-
-AC_ARG_ENABLE(dtrace,
-        AS_HELP_STRING([--enable-dtrace],
-        [enable DTrace for tracing inside ruby. enabled by default on systems having dtrace]),
-        [enable_dtrace=$enableval], [enable_dtrace=auto])
-
-if test "${enable_dtrace}" = "auto"; then
-    if test x"$DTRACE" != x -a x"$cross_compiling" != xyes; then
-        RUBY_DTRACE_AVAILABLE()
-        enable_dtrace=$rb_cv_dtrace_available
-    else
-        enable_dtrace=no
-    fi
-fi
-
-LIBRUBY_A_OBJS='$(OBJS)'
-DTRACE_REBUILD=
-if test "${enable_dtrace}" = "yes"; then
-    if test -z "$DTRACE"; then
-        AC_MSG_ERROR([dtrace(1) is missing])
-    elif test "$cross_compiling" = yes; then
-        AC_MSG_ERROR([--enable-dtrace, however, cross compiling])
-    else
-        RUBY_DTRACE_AVAILABLE()
-        enable_dtrace=$rb_cv_dtrace_available
-        if test "${enable_dtrace}" = "no"; then
-            AC_MSG_ERROR([--enable-dtrace, however, USDT is not available])
-        fi
-        RUBY_DTRACE_POSTPROCESS()
-        if test "$rb_cv_prog_dtrace_g" != 'no'; then
-            DTRACE_OBJ='probes.$(OBJEXT)'
-        fi
-        if test "$rb_cv_prog_dtrace_g" = 'rebuild'; then
-            DTRACE_REBUILD=yes
-            LIBRUBY_A_OBJS='$(DTRACE_GLOMMED_OBJ)'
-        fi
-        AS_CASE("${target_os}", [freebsd*], [
-            # FreeBSD's dtrace requires libelf
-            LIBS="-lelf $LIBS"
-        ])
-    fi
-    DTRACE_EXT=d
-else
-    DTRACE_EXT=dmyh
-fi
-AC_SUBST(DTRACE_EXT)
-AC_SUBST(DTRACE_OBJ)
-AC_SUBST(DTRACE_REBUILD)
-AC_SUBST(LIBRUBY_A_OBJS)
-
-RUBY_SETJMP_TYPE
-}
-{ # build section
-
-dnl build rdoc index if requested
-RDOCTARGET=""
-CAPITARGET=""
-AC_ARG_ENABLE(install-doc,
-       AS_HELP_STRING([--disable-install-doc], [do not install either rdoc indexes or C API documents during install]),
-       [install_doc=$enableval], [install_doc=yes])
-AC_ARG_ENABLE(install-rdoc,
-      AS_HELP_STRING([--disable-install-rdoc], [do not install rdoc indexes during install]),
-      [install_rdoc=$enableval], [install_rdoc=yes])
-AC_ARG_ENABLE(install-capi,
-      AS_HELP_STRING([--disable-install-capi], [do not install C API documents during install]),
-      [install_capi=$enableval], [install_capi=no])
-
-if test "$install_doc" != no; then
-    if test "$install_rdoc" != no; then
-	RDOCTARGET="rdoc"
-    else
-	RDOCTARGET="nodoc"
-    fi
-    if test "$install_capi" != no -a -n "$DOXYGEN"; then
-	CAPITARGET="capi"
-    else
-	CAPITARGET="nodoc"
-    fi
-else
-    RDOCTARGET="nodoc"
-    CAPITARGET="nodoc"
-fi
-
-AC_SUBST(RDOCTARGET)
-AC_SUBST(CAPITARGET)
-
-AS_CASE(["$RDOCTARGET:$CAPITARGET"],[nodoc:nodoc],[INSTALLDOC=nodoc],[INSTALLDOC=all])
-AC_SUBST(INSTALLDOC)
-
-if test "$rb_with_pthread" = "yes"; then
-    THREAD_MODEL=pthread
-fi
-AC_CACHE_CHECK([for prefix of external symbols], rb_cv_symbol_prefix, [
-    AC_TRY_COMPILE([extern void conftest_external(void) {}], [], [
-	rb_cv_symbol_prefix=`$NM conftest.$ac_objext |
-			     sed -n ['/.*T[ 	]\([^ 	]*\)conftest_external.*/!d;s//\1/p;q']`
-	],
-	[rb_cv_symbol_prefix=''])
-    test -n "$rb_cv_symbol_prefix" || rb_cv_symbol_prefix=NONE
-])
-SYMBOL_PREFIX="$rb_cv_symbol_prefix"
-test "x$SYMBOL_PREFIX" = xNONE && SYMBOL_PREFIX=''
-DLNOBJ=dln.o
-AC_ARG_ENABLE(dln,
-	      AC_HELP_STRING([--disable-dln], [disable dynamic link feature]),
-	      [test "$enableval" = yes || DLNOBJ=dmydln.o])
-AC_SUBST(DLNOBJ)
-MINIDLNOBJ=dmydln.o
-
-AS_CASE(["$target_os"],
-    [linux*], [
-	],
-    [netbsd*], [
-	RUBY_APPEND_OPTION(CFLAGS, -pipe)
-	],
-    [darwin*], [
-	RUBY_APPEND_OPTION(CFLAGS, -pipe)
-	RUBY_APPEND_OPTION(XLDFLAGS, [-framework CoreFoundation])
-	RUBY_APPEND_OPTION(LIBRUBYARG_STATIC, [-framework CoreFoundation])
-	],
-    [osf*], [
-	if test "$GCC" != "yes" ; then
-	  # compile something small: taint.c is fine for this.
-	  # the main point is the '-v' flag of 'cc'.
-	  AS_CASE(["`cc -v -I. -c main.c -o /tmp/main.o 2>&1`"],
-	  [*/gemc_cc*], [   # we have the new DEC GEM CC
-                        CFLAGS="$CFLAGS -oldc"
-                        ],
-          [            # we have the old MIPS CC
-                        ])
-	  # cleanup
-	  rm -f /tmp/main.o
-	  CFLAGS="$CFLAGS -std"
-	fi
-	],
-    [cygwin*|mingw*], [
-	RUBY_SO_NAME="${RUBY_SO_NAME}"'$(MAJOR)$(MINOR)0'
-	LIBRUBY_DLDFLAGS="${DLDFLAGS}"' -Wl,--out-implib=$(LIBRUBY)'
-	AS_CASE(["$target_os"],
-	[cygwin*], [
-	    if test x"$enable_shared" = xyes; then
-		LIBRUBY_SO='cyg$(RUBY_SO_NAME)'.dll
-		LIBRUBY_DLDFLAGS="${LIBRUBY_DLDFLAGS}"' $(RUBYDEF)'
-	    fi
-	    ],
-	[mingw*], [
-	    RUBY_SO_NAME="${rb_cv_msvcrt}-${RUBY_SO_NAME}"
-	    if test x"${target_cpu}" != xi386; then
-		RUBY_SO_NAME="${target_cpu}-${RUBY_SO_NAME}"
-	    fi
-	    if test x"$enable_shared" = xyes; then
-		LIBRUBY_SO='$(RUBY_SO_NAME)'.dll
-		LIBRUBY_DLDFLAGS="${LIBRUBY_DLDFLAGS}"' $(RUBYDEF)'
-	    fi
-	    EXPORT_PREFIX=' '
-	    DLDFLAGS="${DLDFLAGS}"' $(DEFFILE)'
-	    AC_LIBOBJ([win32/win32])
-	    AC_LIBOBJ([win32/file])
-	    COMMON_LIBS=m
-#	    COMMON_MACROS="WIN32_LEAN_AND_MEAN="
-	    COMMON_HEADERS="winsock2.h windows.h"
-	    THREAD_MODEL=win32
-	    PLATFORM_DIR=win32
-	    ])
-	LIBRUBY_ALIASES=''
-	FIRSTMAKEFILE=GNUmakefile:cygwin/GNUmakefile.in
-	SOLIBS='$(LIBS)'
-	if test x"$enable_shared" = xyes; then
-	    LIBRUBY='lib$(RUBY_SO_NAME).dll.a'
-	else
-	    LIBRUBY_SO=dummy
-	    LIBRUBY='lib$(RUBY_SO_NAME).a'
-	    LIBRUBYARG='-l$(RUBY_SO_NAME)'
-	fi
-	],
-    [hpux*], [
-	AS_CASE(["$YACC"],[*yacc*], [
-	    XCFLAGS="$XCFLAGS -DYYMAXDEPTH=300"
-	    YACC="$YACC -Nl40000 -Nm40000"
-	])],
-    [nacl], [
-	FIRSTMAKEFILE=GNUmakefile:nacl/GNUmakefile.in
-	])
-
-AS_CASE(["$with_gmp: $SOLIBS "], [no:* | *' -lgmp '*|*' $(LIBS) '*], [],
-	[SOLIBS="-lgmp $SOLIBS"])
-
-AS_CASE(["$with_jemalloc: $LIBS "], [no:* | *' -ljemalloc '*], [],
-	[LIBS="-ljemalloc $LIBS"])
-
-MINIOBJS="$MINIDLNOBJ"
-
-AS_CASE(["$THREAD_MODEL"],
-[pthread], [AC_CHECK_HEADERS(pthread.h)],
-[win32],   [],
-[""],      [AC_MSG_ERROR(thread model is missing)],
-           [AC_MSG_ERROR(unknown thread model $THREAD_MODEL)])
-
-AC_ARG_ENABLE(debug-env,
-       AS_HELP_STRING([--enable-debug-env], [enable RUBY_DEBUG environment variable]),
-       [AC_DEFINE(RUBY_DEBUG_ENV)])
-
-AS_CASE(["$FIRSTMAKEFILE"], [*GNUmakefile:*], [gnumake=yes], [
-    AC_MSG_CHECKING([if ${MAKE-make} is GNU make])
-    mkdir conftest.dir
-    echo "all:; @echo yes" > conftest.dir/GNUmakefile
-    echo "all:; @echo no" > conftest.dir/Makefile
-    gnumake=`(cd conftest.dir; ${MAKE-make})`
-    rm -fr conftest.dir
-    AS_CASE(["$gnumake"],
-    [*yes*], [
-	FIRSTMAKEFILE=GNUmakefile:template/GNUmakefile.in
-	gnumake=yes],
-    [
-	gnumake=no])
-    AC_MSG_RESULT($gnumake)
-])
-AS_IF([test "$gnumake" = yes], [ NULLCMD=: ], [
-    AC_MSG_CHECKING([for safe null command for ${MAKE-make}])
-    mkdir conftest.dir
-    NULLCMD=
-    for cmd in : true; do
-	echo 'A=1' > conftest.dir/Makefile
-	echo 'B=$(A:1=@'$cmd')' >> conftest.dir/Makefile
-	echo 'all:; $B 1 2 3 4 5 6 7 8 9' >> conftest.dir/Makefile
-	if (cd conftest.dir; ${MAKE-make} >/dev/null 2>/dev/null); then
-	    NULLCMD=$cmd
-	    break
-	fi
-    done
-    rm -fr conftest.dir
-    if test -z "$NULLCMD"; then
-	AC_MSG_ERROR(no candidate for safe null command)
-    fi
-    AC_MSG_RESULT($NULLCMD)
-])
-AC_SUBST(NULLCMD)
-
-if test "${universal_binary-no}" = yes ; then
-    AC_CACHE_CHECK([for architecture macros], rb_cv_architecture_macros, [
-    mv confdefs.h confdefs1.h
-    : > confdefs.h
-    AC_TRY_COMPILE([@%:@if defined __`echo ${universal_archnames} |
-    sed 's/=[^ ]*//g;s/ /__ || defined __/g'`__
-@%:@else
-@%:@error
->>>>>><<<<<<
-@%:@endif], [],
-[
-    rb_cv_architecture_macros=yes
-    mv -f confdefs1.h confdefs.h
-], [
-    rb_cv_architecture_macros=no
-    archflagpat=`eval echo '"'"${ARCH_FLAG}"'"' | sed 's/[[][|.*]]/\\&/g'`
-    new_cflags=`echo "$CFLAGS" | sed "s|$archflagpat"'||'`
-    for archs in ${universal_archnames}; do
-	cpu=${archs@%:@*=}
-	archs=${archs%=*}
-	CFLAGS="$new_cflags -arch $archs"
-	archs="__${archs}__"
-	AC_MSG_CHECKING([for macro ${archs} on ${cpu}])
-	AC_TRY_COMPILE([@%:@ifndef ${archs}
-@%:@error
-@%:@endif], [], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
-    done
-    mv -f confdefs1.h confdefs.h
-    AC_MSG_ERROR([failed])
-    ])])
-    AC_CACHE_CHECK(whether __ARCHITECTURE__ is available, rb_cv_architecture_available,
-	AC_TRY_COMPILE([@%:@include <stdio.h>
-		const char arch[[]] = __ARCHITECTURE__;], [puts(arch);],
-		[rb_cv_architecture_available=yes], [rb_cv_architecture_available=no]))
-fi
-
-CPPFLAGS="$CPPFLAGS "'$(DEFS)'
-test -z "$CPPFLAGS" || CPPFLAGS="$CPPFLAGS "; CPPFLAGS="$CPPFLAGS"'${cppflags}'
-if test -n "${cflags+set}"; then
-    cflagspat=`eval echo '"'"${cflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^  */ /;s/^  *$/ /'`
-    CFLAGS=`echo " $CFLAGS " | sed "s|$cflagspat"'|${cflags}|;s/^ *//;s/ *$//'`
-fi
-if test -n "${cxxflags+set}"; then
-    cxxflagspat=`eval echo '"'"${cxxflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^  */ /;s/^  *$/ /'`
-    CXXFLAGS=`echo " $CXXFLAGS " | sed "s|$cxxflagspat"'|${cxxflags}|;s/^ *//;s/ *$//'`
-fi
-if test "${ARCH_FLAG}"; then
-    archflagpat=`eval echo '"'"${ARCH_FLAG}"'"' | sed 's/[[][|.*]]/\\&/g'`
-    CFLAGS=`echo "$CFLAGS" | sed "s| *$archflagpat"'||'`
-    CXXFLAGS=`echo "$CXXFLAGS" | sed "s| *$archflagpat"'||'`
-    LDFLAGS=`echo "$LDFLAGS" | sed "s| *$archflagpat"'||'`
-fi
-warnflags="$rb_cv_warnflags"
-AC_SUBST(cppflags)dnl
-AC_SUBST(cflags, ["${orig_cflags:+$orig_cflags }"'${optflags} ${debugflags} ${warnflags}'])dnl
-AC_SUBST(cxxflags, ["${orig_cxxflags:+$orig_cxxflags }"'${optflags} ${debugflags} ${warnflags}'])dnl
-AC_SUBST(optflags)dnl
-AC_SUBST(debugflags)dnl
-AC_SUBST(warnflags)dnl
-AC_SUBST(strict_warnflags)dnl
-AC_SUBST(XCFLAGS)dnl
-AC_SUBST(XLDFLAGS)dnl
-AC_SUBST(EXTLDFLAGS)dnl
-AC_SUBST(EXTDLDFLAGS)dnl
-AC_SUBST(LIBRUBY_LDSHARED)
-AC_SUBST(LIBRUBY_DLDFLAGS)
-AC_SUBST(RUBY_INSTALL_NAME)
-AC_SUBST(rubyw_install_name)
-AC_SUBST(RUBYW_INSTALL_NAME)
-AC_SUBST(RUBY_SO_NAME)
-AC_SUBST(LIBRUBY_A)
-AC_SUBST(LIBRUBY_SO)
-AC_SUBST(LIBRUBY_ALIASES)
-AC_SUBST(LIBRUBY)
-AC_SUBST(LIBRUBYARG)
-AC_SUBST(LIBRUBYARG_STATIC)
-AC_SUBST(LIBRUBYARG_SHARED)
-AC_SUBST(SOLIBS)
-AC_SUBST(DLDLIBS)
-AC_SUBST(ENABLE_SHARED)
-AC_SUBST(MAINLIBS)
-AC_SUBST(COMMON_LIBS)
-AC_SUBST(COMMON_MACROS)
-AC_SUBST(COMMON_HEADERS)
-AC_SUBST(EXPORT_PREFIX)
-AC_SUBST(SYMBOL_PREFIX)
-AC_SUBST(MINIOBJS)
-AC_SUBST(THREAD_MODEL)
-AC_SUBST(PLATFORM_DIR)
-
-firstmf=`echo $FIRSTMAKEFILE | sed 's/:.*//'`
-firsttmpl=`echo $FIRSTMAKEFILE | sed 's/.*://'`
-MAKEFILES="Makefile $firstmf"
-MAKEFILES="`echo $MAKEFILES`"
-AC_SUBST(MAKEFILES)
-
-ri_prefix=
-test "$program_prefix" != NONE &&
-  ri_prefix=$program_prefix
-
-ri_suffix=
-test "$program_suffix" != NONE &&
-  ri_suffix=$program_suffix
-
-RUBY_INSTALL_NAME="${ri_prefix}"'$(RUBY_BASE_NAME)'"${ri_suffix}"
-AS_CASE(["$target_os"],
-  [cygwin*|mingw*], [
-    RUBYW_INSTALL_NAME="${ri_prefix}"'$(RUBYW_BASE_NAME)'"${ri_suffix}"
-    rubyw_install_name='$(RUBYW_INSTALL_NAME)'
-    ])
-
-rubylibdir='${rubylibprefix}/${ruby_version}'
-rubyarchdir=${multiarch+'${rubyarchprefix}/${ruby_version}'}${multiarch-'${rubylibdir}/${arch}'}
-
-rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'}
-AC_ARG_WITH(rubyarchprefix,
-	    AS_HELP_STRING([--with-rubyarchprefix=DIR],
-			   [prefix for architecture dependent ruby libraries [[RUBYLIBPREFIX/ARCH]]]),
-	    [rubyarchprefix="$withval"])
-AC_SUBST(rubyarchprefix)
-
-rubysitearchprefix=${multiarch+'${sitearchlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${sitearch}'}
-AC_ARG_WITH(rubysitearchprefix,
-	    AS_HELP_STRING([--with-rubysitearchprefix=DIR],
-			   [prefix for architecture dependent site libraries [[RUBYLIBPREFIX/SITEARCH]]]),
-	    [rubysitearchprefix="$withval"])
-AC_SUBST(rubysitearchprefix)
-
-RI_BASE_NAME=`echo ${RUBY_BASE_NAME} | sed 's/ruby/ri/'`
-ridir='${datarootdir}/${RI_BASE_NAME}'
-AC_ARG_WITH(ridir,
-	    AS_HELP_STRING([--with-ridir=DIR], [ri documentation [[DATAROOTDIR/ri]]]),
-	    [ridir=$withval])
-AC_SUBST(ridir)
-AC_SUBST(RI_BASE_NAME)
-
-AC_ARG_WITH(ruby-version,
-	    AS_HELP_STRING([--with-ruby-version=STR], [ruby version string for version specific directories [[full]] (full|minor|STR)]),
-            [ruby_version=$withval],
-            [ruby_version=full])
-unset RUBY_LIB_VERSION
-unset RUBY_LIB_VERSION_STYLE
-AS_CASE(["$ruby_version"],
-  [full],  [RUBY_LIB_VERSION_STYLE='3	/* full */'],
-  [minor], [RUBY_LIB_VERSION_STYLE='2	/* minor */'])
-if test ${RUBY_LIB_VERSION_STYLE+set}; then
-    {
-    echo "#define RUBY_LIB_VERSION_STYLE $RUBY_LIB_VERSION_STYLE"
-    echo '#define STRINGIZE(x) x'
-    test -f revision.h -o -f "${srcdir}/revision.h" || echo '#define RUBY_REVISION 0'
-    echo '#include "version.h"'
-    echo 'ruby_version=RUBY_LIB_VERSION'
-    } > conftest.c
-    ruby_version="`$CPP -I. -I"${srcdir}" -I"${srcdir}/include" conftest.c | sed '/^ruby_version=/!d;s/ //g'`"
-    eval $ruby_version
-elif test -z "${ruby_version}"; then
-    AC_MSG_ERROR([No ruby version, No place for bundled libraries])
-else
-    RUBY_LIB_VERSION="${ruby_version}"
-fi
-AC_SUBST(RUBY_LIB_VERSION_STYLE)
-AC_SUBST(RUBY_LIB_VERSION)
-
-AC_ARG_WITH(sitedir,
-	    AS_HELP_STRING([--with-sitedir=DIR], [site libraries in DIR [[RUBY_LIB_PREFIX/site_ruby]], "no" to disable site directory]),
-            [sitedir=$withval],
-            [sitedir='${rubylibprefix}/site_ruby'])
-sitelibdir='${sitedir}/${ruby_version}'
-
-AC_ARG_WITH(sitearchdir,
-	    AS_HELP_STRING([--with-sitearchdir=DIR],
-			   [architecture dependent site libraries in DIR [[SITEDIR/SITEARCH]], "no" to disable site directory]),
-            [sitearchdir=$withval],
-            [sitearchdir=${multiarch+'${rubysitearchprefix}/site_ruby/${ruby_version}'}${multiarch-'${sitelibdir}/${sitearch}'}])
-
-AC_ARG_WITH(vendordir,
-	    AS_HELP_STRING([--with-vendordir=DIR], [vendor libraries in DIR [[RUBY_LIB_PREFIX/vendor_ruby]], "no" to disable vendor directory]),
-            [vendordir=$withval],
-            [vendordir='${rubylibprefix}/vendor_ruby'])
-vendorlibdir='${vendordir}/${ruby_version}'
-
-AC_ARG_WITH(vendorarchdir,
-	    AS_HELP_STRING([--with-vendorarchdir=DIR],
-			   [architecture dependent vendor libraries in DIR [[VENDORDIR/SITEARCH]], "no" to disable vendor directory]),
-            [vendorarchdir=$withval],
-            [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby/${ruby_version}'}${multiarch-'${vendorlibdir}/${sitearch}'}])
-
-if test "${LOAD_RELATIVE+set}"; then
-    AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
-    RUBY_EXEC_PREFIX=''
-fi
-
-AC_SUBST(RUBY_EXEC_PREFIX)
-
-AC_SUBST(libdirname, ${multiarch+arch}libdir)
-AC_SUBST(archlibdir)dnl
-AC_SUBST(sitearchlibdir)dnl
-AC_SUBST(archincludedir)dnl
-AC_SUBST(sitearchincludedir)dnl
-AC_SUBST(arch)dnl
-AC_SUBST(sitearch)dnl
-AC_SUBST(ruby_version)dnl
-AC_SUBST(rubylibdir)dnl
-AC_SUBST(rubyarchdir)dnl
-AC_SUBST(sitedir)dnl
-AC_SUBST(sitelibdir)dnl
-AC_SUBST(sitearchdir)dnl
-AC_SUBST(vendordir)dnl
-AC_SUBST(vendorlibdir)dnl
-AC_SUBST(vendorarchdir)dnl
-
-AC_SUBST(CONFIGURE, "`echo $0 | sed 's|.*/||'`")dnl
-AC_SUBST(configure_args, "`echo "${ac_configure_args}" | sed 's/\\$/$$/g'`")dnl
-
-if test "${universal_binary-no}" = yes ; then
-    arch="universal-${target_os}"
-    if test "${rb_cv_architecture_available}" = yes; then
-	AC_DEFINE_UNQUOTED(RUBY_PLATFORM_CPU, __ARCHITECTURE__)
-    else
-	for archs in ${universal_archnames}; do
-	    cpu=`echo $archs | sed 's/.*=//'`
-	    archs=`echo $archs | sed 's/=.*//'`
-	    RUBY_DEFINE_IF([defined __${archs}__], RUBY_PLATFORM_CPU, ["${cpu}"])
-	done
-    fi
-    ints='long int short'
-    test "$ac_cv_type_long_long" = yes && ints="'long long' $ints"
-    AC_SUBST(UNIVERSAL_ARCHNAMES, "${universal_archnames}")
-    AC_SUBST(UNIVERSAL_INTS, "${ints}")
-    AC_DEFINE_UNQUOTED(RUBY_PLATFORM_OS, "${target_os}")
-    AC_DEFINE_UNQUOTED(RUBY_ARCH, "universal-"RUBY_PLATFORM_OS)
-    AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "universal."RUBY_PLATFORM_CPU"-"RUBY_PLATFORM_OS)
-else
-    arch="${target_cpu}-${target_os}"
-    AS_CASE(["$arch"], [le32-nacl], [arch="pnacl"])
-    AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "$arch")
-fi
-
-unset sitearch
-AS_CASE(["$target_os"],[mingw*],[sitearch="$target_cpu-$rb_cv_msvcrt"])
-: ${sitearch='${arch}'}
-
-AC_ARG_WITH(search-path,
-		AS_HELP_STRING([--with-search-path=DIR], [specify the additional search path]),
-		[search_path=$withval])
-if test "$search_path" != ""; then
-    AC_SUBST(RUBY_SEARCH_PATH, $search_path)
-fi
-
-AC_ARG_WITH(rubyhdrdir,
-	    AS_HELP_STRING([--with-rubyhdrdir=DIR], [core headers in DIR [[INCLUDEDIR/RUBY_BASE_NAME-RUBY_VERSION]]]),
-	    [rubyhdrdir=$withval],
-	    [rubyhdrdir='${includedir}/${RUBY_VERSION_NAME}'])
-
-AC_ARG_WITH(rubyarchhdrdir,
-	    AS_HELP_STRING([--with-rubyarchhdrdir=DIR],
-			   [architecture dependent core headers in DIR [[$(rubyhdrdir)/$(arch)]]]),
-	    [rubyarchhdrdir=$withval],
-	    [rubyarchhdrdir=${multiarch+'${archincludedir}/${RUBY_VERSION_NAME}'}${multiarch-'${rubyhdrdir}/${arch}'}])
-
-AC_ARG_WITH(sitehdrdir,
-	    AS_HELP_STRING([--with-sitehdrdir=DIR], [core site headers in DIR [[RUBYHDRDIR/site_ruby]]]),
-	    [sitehdrdir=$withval],
-	    [sitehdrdir='${rubyhdrdir}/site_ruby'])
-
-AC_ARG_WITH(sitearchhdrdir,
-	    AS_HELP_STRING([--with-sitearchhdrdir=DIR],
-			   [architecture dependent core site headers in DIR [[RUBYHDRDIR/site_ruby]]]),
-	    [sitearchhdrdir=$withval],
-	    [sitearchhdrdir=${multiarch+'${sitearchincludedir}/${RUBY_VERSION_NAME}/site_ruby'}${multiarch-'${sitehdrdir}/${sitearch}'}])
-
-AC_ARG_WITH(vendorhdrdir,
-	    AS_HELP_STRING([--with-vendorhdrdir=DIR], [core vendor headers in DIR [[RUBYHDRDIR/vendor_ruby]]]),
-	    [vendorhdrdir=$withval],
-	    [vendorhdrdir='${rubyhdrdir}/vendor_ruby'])
-
-AC_ARG_WITH(vendorarchhdrdir,
-	    AS_HELP_STRING([--with-vendorarchhdrdir=DIR],
-			   [architecture dependent core vendor headers in DIR [[RUBYHDRDIR/vendor_ruby]]]),
-	    [vendorarchhdrdir=$withval],
-	    [vendorarchhdrdir=${multiarch+'${sitearchincludedir}/${RUBY_VERSION_NAME}/vendor_ruby'}${multiarch-'${vendorhdrdir}/${sitearch}'}])
-
-AC_SUBST(rubyhdrdir)dnl
-AC_SUBST(sitehdrdir)dnl
-AC_SUBST(vendorhdrdir)dnl
-AC_SUBST(rubyarchhdrdir)dnl
-AC_SUBST(sitearchhdrdir)dnl
-AC_SUBST(vendorarchhdrdir)dnl
-
-AC_ARG_WITH(mantype,
-	AS_HELP_STRING([--with-mantype=TYPE], [specify man page type; TYPE is one of man and doc]),
-		[
-			AS_CASE(["$withval"],
-			[man|man.gz|man.bz2|doc|doc.gz|doc.bz2], [MANTYPE=$withval],
-			[AC_MSG_ERROR(invalid man type: $withval)])
-		])
-if test -z "$MANTYPE"; then
-	AC_PATH_PROGS(NROFF, nroff awf, /bin/false, "/usr/bin:/usr/ucb")
-	if ${NROFF} -mdoc ${srcdir}/man/ruby.1 >/dev/null 2>&1; then
-		MANTYPE=doc
-	else
-		MANTYPE=man
-	fi
-fi
-AC_SUBST(MANTYPE)
-
-AC_ARG_ENABLE(rubygems,
-	AS_HELP_STRING([--disable-rubygems], [disable rubygems by default]),
-	[enable_rubygems="$enableval"], [enable_rubygems=yes])
-if test x"$enable_rubygems" = xno; then
-    AC_DEFINE(DISABLE_RUBYGEMS, 1)
-    USE_RUBYGEMS=NO
-else
-    USE_RUBYGEMS=YES
-fi
-AC_SUBST(USE_RUBYGEMS)
-
-arch_hdrdir="${EXTOUT}/include/${arch}/ruby"
-AS_MKDIR_P("${arch_hdrdir}")
-config_h="${arch_hdrdir}/config.h"
-guard=INCLUDE_RUBY_CONFIG_H
-{
-  echo "#ifndef $guard"
-  echo "#define $guard 1"
-  grep -v "^#define PACKAGE_" confdefs.h
-  echo "#endif /* $guard */"
-} | tr -d '\015' |
-(
-  if test "x$CONFIGURE_TTY" = xyes; then color=--color; else color=; fi
-  exec ${srcdir}/tool/ifchange $color "${config_h}" -
-) || AC_MSG_ERROR([failed to create ${config_h}])
-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 "`echo $e | sed 's/\.c$/.$(OBJEXT)/'`; done
-AC_SUBST(BUILTIN_ENCOBJS)
-
-BUILTIN_TRANSES=["`sed -n -e '/^BUILTIN_TRANSES[ 	]*=/{' \
-	-e s/// -e :l -e '/\\\\$/N' -e 's/\\\\\\n/ /' -e 't l' -e p \
-	-e '}' "${srcdir}/enc/Makefile.in"`"]
-BUILTIN_TRANSSRCS=
-BUILTIN_TRANSOBJS=
-for e in $BUILTIN_TRANSES; do
-  BUILTIN_TRANSSRCS="$BUILTIN_TRANSSRCS "`echo $e | sed 's/\.trans$/.c/'`
-  BUILTIN_TRANSOBJS="$BUILTIN_TRANSOBJS "`echo $e | sed 's/\.trans$/.$(OBJEXT)/'`
-done
-AC_SUBST(BUILTIN_TRANSSRCS)
-AC_SUBST(BUILTIN_TRANSOBJS)
-
-PACKAGE=$RUBY_BASE_NAME
-AC_SUBST(PACKAGE)
-AS_MESSAGE([$PACKAGE library version = $ruby_version])
-
-AS_CASE([" $CPP "], [*" $CC "*], [CPP=`echo " $CPP " | sed "s| $CC |"' $(CC) |;s/^ *//;s/  *$//'`])
-
-if test x"$firstmf" != x; then
-    AC_CONFIG_FILES($firstmf:$firsttmpl, [], [firstmf="$firstmf" firsttmpl="$firsttmpl"])
-fi
-AC_CONFIG_FILES(Makefile, [
-    tmpmk=confmk$$.tmp
-    {
-	if test ${VCS+set}; then
-	    :
-	elif svn info "$srcdir" > /dev/null 2>&1; then
-	    VCS='svn'
-	elif git_dir=`git --work-tree="$srcdir" --git-dir="$srcdir/.git" rev-parse --git-dir 2>/dev/null`; then
-	    if test -d "$git_dir/svn"; then
-		VCS='git svn'
-	    else
-		VCS='git'
-	    fi
-	else
-	    VCS='echo cannot'
-	fi
-	AS_CASE("$VCS",
-		[svn],       [VCSUP='$(VCS) up $(SVNUPOPTIONS)'],
-		["git svn"], [VCSUP='$(VCS) rebase $(GITSVNREBASEOPTIONS)'],
-		[git],       [VCSUP='$(VCS) pull $(GITPULLOPTIONS)'],
-		[VCSUP='$(VCS)'])
-	sed -n \
-	    -e '[/^@%:@define \(RUBY_RELEASE_[A-Z]*\) \([0-9][0-9]*\)/]{' \
-	    -e   's//\1 = \2/' \
-	    -e   '[s/ \([0-9]\)$/ 0\1/]' \
-	    -e   p \
-	    -e '}' "$srcdir/version.h"
-	sed '/^MISSING/s/\$U\././g;/^VCS *=/s#@VCS@#'"$VCS"'#;/^VCSUP *=/s#@VCSUP@#'"$VCSUP"'#' Makefile
-	echo; test x"$EXEEXT" = x || echo 'miniruby: miniruby$(EXEEXT)'
-	if test "$gnumake" != yes; then
-	    echo ['$(MKFILES): $(srcdir)/common.mk']
-	    sed ['s/{\$([^(){}]*)[^{}]*}//g'] ${srcdir}/common.mk
-	else
-	    echo 'distclean-local::; @$(RM) GNUmakefile uncommon.mk'
-	fi
-    } > $tmpmk && if ! grep '^ruby:' $tmpmk > /dev/null; then
-	if test "${gnumake}" = yes; then
-	    tmpgmk=confgmk$$.tmp
-	    {
-		echo "include $tmpmk"
-		echo "-include uncommon.mk"
-	    } > $tmpgmk
-	else
-	    tmpgmk=$tmpmk
-	fi &&
-	test -z "`${MAKE-make} -f $tmpgmk info-program | grep '^PROGRAM=ruby$'`" &&
-	echo 'ruby: $(PROGRAM);' >> $tmpmk
-	test "$tmpmk" = "$tmpgmk" || rm -f "$tmpgmk"
-    fi && mv -f $tmpmk Makefile],
-[EXEEXT='$EXEEXT' gnumake='$gnumake'])
-
-AC_ARG_WITH([ruby-pc],
-	    AC_HELP_STRING([--with-ruby-pc=FILENAME], [pc file basename]),
-	    [ruby_pc="$withval"],
-	    [ruby_pc="${RUBY_BASE_NAME}-${MAJOR}.${MINOR}.pc"])
-AC_SUBST(ruby_pc)
-AC_SUBST(exec, [exec])
-
-AC_ARG_WITH(destdir,
-	    AS_HELP_STRING([--with-destdir=DESTDIR], [specify default directory to install]),
-	    [DESTDIR="$withval"])
-AC_SUBST(DESTDIR)
-
-AC_CONFIG_FILES($ruby_pc:template/ruby.pc.in,
-    [
-    if sed ['s/\$(\([A-Za-z_][A-Za-z0-9_]*\))/${\1}/g;s/@[A-Za-z_][A-Za-z0-9_]*@//'] $ruby_pc > ruby.tmp.pc &&
-	{
-	    test -z "$PKG_CONFIG" ||
-	    PKG_CONFIG_PATH=. $PKG_CONFIG --print-errors ruby.tmp
-	}
-    then
-	mv -f ruby.tmp.pc $ruby_pc
-    else
-	exit 1
-    fi
-    ],
-    [ruby_pc='$ruby_pc' PKG_CONFIG='$PKG_CONFIG'])
-
-AC_OUTPUT
-}
-}
-
-AS_IF([${FOLD+:} false], [], [
-AS_IF([test "`echo abcdefg hijklmno | fold -s -w10 | sed 1d`" = hijklmno], [FOLD="fold"], [FOLD=])
-])
-AS_REQUIRE_SHELL_FN([config_summary],
-    [AS_FUNCTION_DESCRIBE([config_summary], [NAME, VAL], [configuration summary])],
-    [AS_IF([test -z "$2"], [], [
-	AS_ECHO_N(["   * $1:                     "]) | head -c26
-	AS_IF([test "$FOLD"], [
-	    echo "$2" | fold -s -w50 |
-	    sed '1!s/^/                          /;$!s/$/\\/'
-	], [echo "$2"])
-    ])]
-)
-
-echo "---"
-echo "Configuration summary for $RUBY_BASE_NAME version $RUBY_PROGRAM_VERSION"
-echo ""
-config_summary "Installation prefix" "$prefix"
-config_summary "exec prefix"         "$exec_prefix"
-config_summary "arch"                "$arch"
-config_summary "site arch"           "$sitearch"
-config_summary "RUBY_BASE_NAME"      "$RUBY_BASE_NAME"
-config_summary "enable shared"       "$enable_shared"
-config_summary "ruby lib prefix"     "$rubylibprefix"
-config_summary "site libraries path" "$rubysitearchprefix"
-config_summary "vendor path"         "$vendordir"
-config_summary "target OS"           "$target_os"
-config_summary "compiler"            "$CC"
-config_summary "with pthread"        "$enable_pthread"
-config_summary "enable shared libs"  "$ENABLE_SHARED"
-config_summary "dynamic library ext" "$DLEXT"
-config_summary "CFLAGS"              "$cflags"
-config_summary "CPPFLAGS"            "$cppflags"
-config_summary "LDFLAGS"             "$LDFLAGS"
-config_summary "optflags"            "$optflags"
-config_summary "debugflags"          "$debugflags"
-config_summary "warnflags"           "$warnflags"
-config_summary "strip command"       "$STRIP"
-config_summary "install doc"         "$install_doc"
-config_summary "man page type"       "$MANTYPE"
-config_summary "search path"         "$search_path"
-config_summary "static-linked-ext"   ${EXTSTATIC:+"yes"}
-echo ""
-echo "---"
diff --git a/constant.h b/constant.h
index 76b59fa047..e0d36909e1 100644
--- a/constant.h
+++ b/constant.h
@@ -1,3 +1,5 @@
+#ifndef CONSTANT_H
+#define CONSTANT_H
 /**********************************************************************
 
   constant.h -
@@ -8,8 +10,8 @@
   Copyright (C) 2009 Yusuke Endoh
 
 **********************************************************************/
-#ifndef CONSTANT_H
-#define CONSTANT_H
+#include "ruby/ruby.h"
+#include "id_table.h"
 
 typedef enum {
     CONST_DEPRECATED = 0x100,
@@ -31,20 +33,23 @@ typedef enum {
 typedef struct rb_const_entry_struct {
     rb_const_flag_t flag;
     int line;
-    const VALUE value;            /* should be mark */
-    const VALUE file;             /* should be mark */
+    VALUE value;            /* should be mark */
+    VALUE file;             /* should be mark */
 } rb_const_entry_t;
 
 VALUE rb_mod_private_constant(int argc, const VALUE *argv, VALUE obj);
 VALUE rb_mod_public_constant(int argc, const VALUE *argv, VALUE obj);
 VALUE rb_mod_deprecate_constant(int argc, const VALUE *argv, VALUE obj);
 void rb_free_const_table(struct rb_id_table *tbl);
-VALUE rb_public_const_get(VALUE klass, ID id);
+VALUE rb_const_source_location(VALUE, ID);
+
+MJIT_SYMBOL_EXPORT_BEGIN
+int rb_autoloading_value(VALUE mod, ID id, VALUE *value, rb_const_flag_t *flag);
+rb_const_entry_t *rb_const_lookup(VALUE klass, ID id);
 VALUE rb_public_const_get_at(VALUE klass, ID id);
 VALUE rb_public_const_get_from(VALUE klass, ID id);
-int rb_public_const_defined(VALUE klass, ID id);
-int rb_public_const_defined_at(VALUE klass, ID id);
 int rb_public_const_defined_from(VALUE klass, ID id);
-rb_const_entry_t *rb_const_lookup(VALUE klass, ID id);
+VALUE rb_const_source_location_at(VALUE, ID);
+MJIT_SYMBOL_EXPORT_END
 
 #endif /* CONSTANT_H */
diff --git a/cont.c b/cont.c
index 10bf3417fd..a7103a087e 100644
--- a/cont.c
+++ b/cont.c
@@ -9,263 +9,947 @@
 
 **********************************************************************/
 
-#include "internal.h"
-#include "vm_core.h"
-#include "gc.h"
-#include "eval_intern.h"
-
-/* FIBER_USE_NATIVE enables Fiber performance improvement using system
- * dependent method such as make/setcontext on POSIX system or
- * CreateFiber() API on Windows.
- * This hack make Fiber context switch faster (x2 or more).
- * However, it decrease maximum number of Fiber.  For example, on the
- * 32bit POSIX OS, ten or twenty thousands Fiber can be created.
- *
- * Details is reported in the paper "A Fast Fiber Implementation for Ruby 1.9"
- * in Proc. of 51th Programming Symposium, pp.21--28 (2010) (in Japanese).
- */
-
-#if !defined(FIBER_USE_NATIVE)
-# if defined(HAVE_GETCONTEXT) && defined(HAVE_SETCONTEXT)
-#   if 0
-#   elif defined(__NetBSD__)
-/* On our experience, NetBSD doesn't support using setcontext() and pthread
- * simultaneously.  This is because pthread_self(), TLS and other information
- * are represented by stack pointer (higher bits of stack pointer).
- * TODO: check such constraint on configure.
- */
-#     define FIBER_USE_NATIVE 0
-#   elif defined(__sun)
-/* On Solaris because resuming any Fiber caused SEGV, for some reason.
- */
-#     define FIBER_USE_NATIVE 0
-#   elif defined(__ia64)
-/* At least, Linux/ia64's getcontext(3) doesn't save register window.
- */
-#     define FIBER_USE_NATIVE 0
-#   elif defined(__GNU__)
-/* GNU/Hurd doesn't fully support getcontext, setcontext, makecontext
- * and swapcontext functions. Disabling their usage till support is
- * implemented. More info at
- * http://darnassus.sceen.net/~hurd-web/open_issues/glibc/#getcontext
- */
-#     define FIBER_USE_NATIVE 0
-#   else
-#     define FIBER_USE_NATIVE 1
-#   endif
-# elif defined(_WIN32)
-#  define FIBER_USE_NATIVE 1
-# endif
-#endif
-#if !defined(FIBER_USE_NATIVE)
-#define FIBER_USE_NATIVE 0
-#endif
+#include "ruby/internal/config.h"
 
-#if FIBER_USE_NATIVE
 #ifndef _WIN32
 #include <unistd.h>
 #include <sys/mman.h>
-#include <ucontext.h>
 #endif
+
+#include COROUTINE_H
+
+#include "eval_intern.h"
+#include "gc.h"
+#include "internal.h"
+#include "internal/cont.h"
+#include "internal/proc.h"
+#include "internal/warnings.h"
+#include "internal/scheduler.h"
+#include "mjit.h"
+#include "vm_core.h"
+#include "id_table.h"
+#include "ractor_core.h"
+
+static const int DEBUG = 0;
+
 #define RB_PAGE_SIZE (pagesize)
 #define RB_PAGE_MASK (~(RB_PAGE_SIZE - 1))
 static long pagesize;
-#endif /*FIBER_USE_NATIVE*/
+
+static const rb_data_type_t cont_data_type, fiber_data_type;
+static VALUE rb_cContinuation;
+static VALUE rb_cFiber;
+static VALUE rb_eFiberError;
+#ifdef RB_EXPERIMENTAL_FIBER_POOL
+static VALUE rb_cFiberPool;
+#endif
 
 #define CAPTURE_JUST_VALID_VM_STACK 1
 
+// Defined in `coroutine/$arch/Context.h`:
+#ifdef COROUTINE_LIMITED_ADDRESS_SPACE
+#define FIBER_POOL_ALLOCATION_FREE
+#define FIBER_POOL_INITIAL_SIZE 8
+#define FIBER_POOL_ALLOCATION_MAXIMUM_SIZE 32
+#else
+#define FIBER_POOL_INITIAL_SIZE 32
+#define FIBER_POOL_ALLOCATION_MAXIMUM_SIZE 1024
+#endif
+
 enum context_type {
     CONTINUATION_CONTEXT = 0,
-    FIBER_CONTEXT = 1,
-    ROOT_FIBER_CONTEXT = 2
+    FIBER_CONTEXT = 1
+};
+
+struct cont_saved_vm_stack {
+    VALUE *ptr;
+#ifdef CAPTURE_JUST_VALID_VM_STACK
+    size_t slen;  /* length of stack (head of ec->vm_stack) */
+    size_t clen;  /* length of control frames (tail of ec->vm_stack) */
+#endif
+};
+
+struct fiber_pool;
+
+// Represents a single stack.
+struct fiber_pool_stack {
+    // A pointer to the memory allocation (lowest address) for the stack.
+    void * base;
+
+    // The current stack pointer, taking into account the direction of the stack.
+    void * current;
+
+    // The size of the stack excluding any guard pages.
+    size_t size;
+
+    // The available stack capacity w.r.t. the current stack offset.
+    size_t available;
+
+    // The pool this stack should be allocated from.
+    struct fiber_pool * pool;
+
+    // If the stack is allocated, the allocation it came from.
+    struct fiber_pool_allocation * allocation;
+};
+
+// A linked list of vacant (unused) stacks.
+// This structure is stored in the first page of a stack if it is not in use.
+// @sa fiber_pool_vacancy_pointer
+struct fiber_pool_vacancy {
+    // Details about the vacant stack:
+    struct fiber_pool_stack stack;
+
+    // The vacancy linked list.
+#ifdef FIBER_POOL_ALLOCATION_FREE
+    struct fiber_pool_vacancy * previous;
+#endif
+    struct fiber_pool_vacancy * next;
+};
+
+// Manages singly linked list of mapped regions of memory which contains 1 more more stack:
+//
+// base = +-------------------------------+-----------------------+  +
+//        |VM Stack       |VM Stack       |                       |  |
+//        |               |               |                       |  |
+//        |               |               |                       |  |
+//        +-------------------------------+                       |  |
+//        |Machine Stack  |Machine Stack  |                       |  |
+//        |               |               |                       |  |
+//        |               |               |                       |  |
+//        |               |               | .  .  .  .            |  |  size
+//        |               |               |                       |  |
+//        |               |               |                       |  |
+//        |               |               |                       |  |
+//        |               |               |                       |  |
+//        |               |               |                       |  |
+//        +-------------------------------+                       |  |
+//        |Guard Page     |Guard Page     |                       |  |
+//        +-------------------------------+-----------------------+  v
+//
+//        +------------------------------------------------------->
+//
+//                                  count
+//
+struct fiber_pool_allocation {
+    // A pointer to the memory mapped region.
+    void * base;
+
+    // The size of the individual stacks.
+    size_t size;
+
+    // The stride of individual stacks (including any guard pages or other accounting details).
+    size_t stride;
+
+    // The number of stacks that were allocated.
+    size_t count;
+
+#ifdef FIBER_POOL_ALLOCATION_FREE
+    // The number of stacks used in this allocation.
+    size_t used;
+#endif
+
+    struct fiber_pool * pool;
+
+    // The allocation linked list.
+#ifdef FIBER_POOL_ALLOCATION_FREE
+    struct fiber_pool_allocation * previous;
+#endif
+    struct fiber_pool_allocation * next;
+};
+
+// A fiber pool manages vacant stacks to reduce the overhead of creating fibers.
+struct fiber_pool {
+    // A singly-linked list of allocations which contain 1 or more stacks each.
+    struct fiber_pool_allocation * allocations;
+
+    // Provides O(1) stack "allocation":
+    struct fiber_pool_vacancy * vacancies;
+
+    // The size of the stack allocations (excluding any guard page).
+    size_t size;
+
+    // The total number of stacks that have been allocated in this pool.
+    size_t count;
+
+    // The initial number of stacks to allocate.
+    size_t initial_count;
+
+    // Whether to madvise(free) the stack or not:
+    int free_stacks;
+
+    // The number of stacks that have been used in this pool.
+    size_t used;
+
+    // The amount to allocate for the vm_stack:
+    size_t vm_stack_size;
 };
 
 typedef struct rb_context_struct {
     enum context_type type;
     int argc;
+    int kw_splat;
     VALUE self;
     VALUE value;
-    VALUE *vm_stack;
-#ifdef CAPTURE_JUST_VALID_VM_STACK
-    size_t vm_stack_slen;  /* length of stack (head of th->stack) */
-    size_t vm_stack_clen;  /* length of control frames (tail of th->stack) */
-#endif
+
+    struct cont_saved_vm_stack saved_vm_stack;
+
     struct {
-	VALUE *stack;
-	VALUE *stack_src;
-	size_t stack_size;
-#ifdef __ia64
-	VALUE *register_stack;
-	VALUE *register_stack_src;
-	int register_stack_size;
-#endif
+        VALUE *stack;
+        VALUE *stack_src;
+        size_t stack_size;
     } machine;
-    rb_thread_t saved_thread; /* selected properties of GET_THREAD() (see cont_save_thread) */
+    rb_execution_context_t saved_ec;
     rb_jmpbuf_t jmpbuf;
     rb_ensure_entry_t *ensure_array;
-    rb_ensure_list_t *ensure_list;
+    /* Pointer to MJIT info about the continuation.  */
+    struct mjit_cont *mjit_cont;
 } rb_context_t;
 
+
+/*
+ * Fiber status:
+ *    [Fiber.new] ------> FIBER_CREATED
+ *                        | [Fiber#resume]
+ *                        v
+ *                   +--> FIBER_RESUMED ----+
+ *    [Fiber#resume] |    | [Fiber.yield]   |
+ *                   |    v                 |
+ *                   +-- FIBER_SUSPENDED    | [Terminate]
+ *                                          |
+ *                       FIBER_TERMINATED <-+
+ */
 enum fiber_status {
-    CREATED,
-    RUNNING,
-    TERMINATED
+    FIBER_CREATED,
+    FIBER_RESUMED,
+    FIBER_SUSPENDED,
+    FIBER_TERMINATED
 };
 
-#if FIBER_USE_NATIVE && !defined(_WIN32)
-#define MAX_MACHINE_STACK_CACHE  10
-static int machine_stack_cache_index = 0;
-typedef struct machine_stack_cache_struct {
-    void *ptr;
-    size_t size;
-} machine_stack_cache_t;
-static machine_stack_cache_t machine_stack_cache[MAX_MACHINE_STACK_CACHE];
-static machine_stack_cache_t terminated_machine_stack;
-#endif
+#define FIBER_CREATED_P(fiber)    ((fiber)->status == FIBER_CREATED)
+#define FIBER_RESUMED_P(fiber)    ((fiber)->status == FIBER_RESUMED)
+#define FIBER_SUSPENDED_P(fiber)  ((fiber)->status == FIBER_SUSPENDED)
+#define FIBER_TERMINATED_P(fiber) ((fiber)->status == FIBER_TERMINATED)
+#define FIBER_RUNNABLE_P(fiber)   (FIBER_CREATED_P(fiber) || FIBER_SUSPENDED_P(fiber))
 
 struct rb_fiber_struct {
     rb_context_t cont;
+    VALUE first_proc;
     struct rb_fiber_struct *prev;
-    enum fiber_status status;
-    /* If a fiber invokes "transfer",
-     * then this fiber can't "resume" any more after that.
-     * You shouldn't mix "transfer" and "resume".
-     */
-    int transferred;
+    VALUE resuming_fiber;
+
+    BITFIELD(enum fiber_status, status, 2);
+    /* Whether the fiber is allowed to implicitly yield. */
+    unsigned int yielding : 1;
+    unsigned int blocking : 1;
+
+    struct coroutine_context context;
+    struct fiber_pool_stack stack;
+};
+
+static struct fiber_pool shared_fiber_pool = {NULL, NULL, 0, 0, 0, 0};
+
+static ID fiber_initialize_keywords[2] = {0};
+
+/*
+ * FreeBSD require a first (i.e. addr) argument of mmap(2) is not NULL
+ * if MAP_STACK is passed.
+ * http://www.FreeBSD.org/cgi/query-pr.cgi?pr=158755
+ */
+#if defined(MAP_STACK) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
+#define FIBER_STACK_FLAGS (MAP_PRIVATE | MAP_ANON | MAP_STACK)
+#else
+#define FIBER_STACK_FLAGS (MAP_PRIVATE | MAP_ANON)
+#endif
+
+#define ERRNOMSG strerror(errno)
+
+// Locates the stack vacancy details for the given stack.
+// Requires that fiber_pool_vacancy fits within one page.
+inline static struct fiber_pool_vacancy *
+fiber_pool_vacancy_pointer(void * base, size_t size)
+{
+    STACK_GROW_DIR_DETECTION;
+
+    return (struct fiber_pool_vacancy *)(
+        (char*)base + STACK_DIR_UPPER(0, size - RB_PAGE_SIZE)
+    );
+}
+
+// Reset the current stack pointer and available size of the given stack.
+inline static void
+fiber_pool_stack_reset(struct fiber_pool_stack * stack)
+{
+    STACK_GROW_DIR_DETECTION;
+
+    stack->current = (char*)stack->base + STACK_DIR_UPPER(0, stack->size);
+    stack->available = stack->size;
+}
+
+// A pointer to the base of the current unused portion of the stack.
+inline static void *
+fiber_pool_stack_base(struct fiber_pool_stack * stack)
+{
+    STACK_GROW_DIR_DETECTION;
+
+    VM_ASSERT(stack->current);
+
+    return STACK_DIR_UPPER(stack->current, (char*)stack->current - stack->available);
+}
+
+// Allocate some memory from the stack. Used to allocate vm_stack inline with machine stack.
+// @sa fiber_initialize_coroutine
+inline static void *
+fiber_pool_stack_alloca(struct fiber_pool_stack * stack, size_t offset)
+{
+    STACK_GROW_DIR_DETECTION;
+
+    if (DEBUG) fprintf(stderr, "fiber_pool_stack_alloca(%p): %"PRIuSIZE"/%"PRIuSIZE"\n", (void*)stack, offset, stack->available);
+    VM_ASSERT(stack->available >= offset);
+
+    // The pointer to the memory being allocated:
+    void * pointer = STACK_DIR_UPPER(stack->current, (char*)stack->current - offset);
+
+    // Move the stack pointer:
+    stack->current = STACK_DIR_UPPER((char*)stack->current + offset, (char*)stack->current - offset);
+    stack->available -= offset;
+
+    return pointer;
+}
+
+// Reset the current stack pointer and available size of the given stack.
+inline static void
+fiber_pool_vacancy_reset(struct fiber_pool_vacancy * vacancy)
+{
+    fiber_pool_stack_reset(&vacancy->stack);
+
+    // Consume one page of the stack because it's used for the vacancy list:
+    fiber_pool_stack_alloca(&vacancy->stack, RB_PAGE_SIZE);
+}
+
+inline static struct fiber_pool_vacancy *
+fiber_pool_vacancy_push(struct fiber_pool_vacancy * vacancy, struct fiber_pool_vacancy * head)
+{
+    vacancy->next = head;
+
+#ifdef FIBER_POOL_ALLOCATION_FREE
+    if (head) {
+        head->previous = vacancy;
+        vacancy->previous = NULL;
+    }
+#endif
+
+    return vacancy;
+}
+
+#ifdef FIBER_POOL_ALLOCATION_FREE
+static void
+fiber_pool_vacancy_remove(struct fiber_pool_vacancy * vacancy)
+{
+    if (vacancy->next) {
+        vacancy->next->previous = vacancy->previous;
+    }
+
+    if (vacancy->previous) {
+        vacancy->previous->next = vacancy->next;
+    }
+    else {
+        // It's the head of the list:
+        vacancy->stack.pool->vacancies = vacancy->next;
+    }
+}
+
+inline static struct fiber_pool_vacancy *
+fiber_pool_vacancy_pop(struct fiber_pool * pool)
+{
+    struct fiber_pool_vacancy * vacancy = pool->vacancies;
+
+    if (vacancy) {
+        fiber_pool_vacancy_remove(vacancy);
+    }
+
+    return vacancy;
+}
+#else
+inline static struct fiber_pool_vacancy *
+fiber_pool_vacancy_pop(struct fiber_pool * pool)
+{
+    struct fiber_pool_vacancy * vacancy = pool->vacancies;
+
+    if (vacancy) {
+        pool->vacancies = vacancy->next;
+    }
+
+    return vacancy;
+}
+#endif
+
+// Initialize the vacant stack. The [base, size] allocation should not include the guard page.
+// @param base The pointer to the lowest address of the allocated memory.
+// @param size The size of the allocated memory.
+inline static struct fiber_pool_vacancy *
+fiber_pool_vacancy_initialize(struct fiber_pool * fiber_pool, struct fiber_pool_vacancy * vacancies, void * base, size_t size)
+{
+    struct fiber_pool_vacancy * vacancy = fiber_pool_vacancy_pointer(base, size);
+
+    vacancy->stack.base = base;
+    vacancy->stack.size = size;
+
+    fiber_pool_vacancy_reset(vacancy);
+
+    vacancy->stack.pool = fiber_pool;
+
+    return fiber_pool_vacancy_push(vacancy, vacancies);
+}
+
+// Allocate a maximum of count stacks, size given by stride.
+// @param count the number of stacks to allocate / were allocated.
+// @param stride the size of the individual stacks.
+// @return [void *] the allocated memory or NULL if allocation failed.
+inline static void *
+fiber_pool_allocate_memory(size_t * count, size_t stride)
+{
+    // We use a divide-by-2 strategy to try and allocate memory. We are trying
+    // to allocate `count` stacks. In normal situation, this won't fail. But
+    // if we ran out of address space, or we are allocating more memory than
+    // the system would allow (e.g. overcommit * physical memory + swap), we
+    // divide count by two and try again. This condition should only be
+    // encountered in edge cases, but we handle it here gracefully.
+    while (*count > 1) {
+#if defined(_WIN32)
+        void * base = VirtualAlloc(0, (*count)*stride, MEM_COMMIT, PAGE_READWRITE);
+
+        if (!base) {
+            *count = (*count) >> 1;
+        }
+        else {
+            return base;
+        }
+#else
+        errno = 0;
+        void * base = mmap(NULL, (*count)*stride, PROT_READ | PROT_WRITE, FIBER_STACK_FLAGS, -1, 0);
+
+        if (base == MAP_FAILED) {
+            // If the allocation fails, count = count / 2, and try again.
+            *count = (*count) >> 1;
+        }
+        else {
+            return base;
+        }
+#endif
+    }
+
+    return NULL;
+}
+
+// Given an existing fiber pool, expand it by the specified number of stacks.
+// @param count the maximum number of stacks to allocate.
+// @return the allocated fiber pool.
+// @sa fiber_pool_allocation_free
+static struct fiber_pool_allocation *
+fiber_pool_expand(struct fiber_pool * fiber_pool, size_t count)
+{
+    STACK_GROW_DIR_DETECTION;
+
+    size_t size = fiber_pool->size;
+    size_t stride = size + RB_PAGE_SIZE;
+
+    // Allocate the memory required for the stacks:
+    void * base = fiber_pool_allocate_memory(&count, stride);
+
+    if (base == NULL) {
+        rb_raise(rb_eFiberError, "can't alloc machine stack to fiber (%"PRIuSIZE" x %"PRIuSIZE" bytes): %s", count, size, ERRNOMSG);
+    }
+
+    struct fiber_pool_vacancy * vacancies = fiber_pool->vacancies;
+    struct fiber_pool_allocation * allocation = RB_ALLOC(struct fiber_pool_allocation);
+
+    // Initialize fiber pool allocation:
+    allocation->base = base;
+    allocation->size = size;
+    allocation->stride = stride;
+    allocation->count = count;
+#ifdef FIBER_POOL_ALLOCATION_FREE
+    allocation->used = 0;
+#endif
+    allocation->pool = fiber_pool;
+
+    if (DEBUG) {
+        fprintf(stderr, "fiber_pool_expand(%"PRIuSIZE"): %p, %"PRIuSIZE"/%"PRIuSIZE" x [%"PRIuSIZE":%"PRIuSIZE"]\n",
+                count, (void*)fiber_pool, fiber_pool->used, fiber_pool->count, size, fiber_pool->vm_stack_size);
+    }
+
+    // Iterate over all stacks, initializing the vacancy list:
+    for (size_t i = 0; i < count; i += 1) {
+        void * base = (char*)allocation->base + (stride * i);
+        void * page = (char*)base + STACK_DIR_UPPER(size, 0);
+
+#if defined(_WIN32)
+        DWORD old_protect;
+
+        if (!VirtualProtect(page, RB_PAGE_SIZE, PAGE_READWRITE | PAGE_GUARD, &old_protect)) {
+            VirtualFree(allocation->base, 0, MEM_RELEASE);
+            rb_raise(rb_eFiberError, "can't set a guard page: %s", ERRNOMSG);
+        }
+#else
+        if (mprotect(page, RB_PAGE_SIZE, PROT_NONE) < 0) {
+            munmap(allocation->base, count*stride);
+            rb_raise(rb_eFiberError, "can't set a guard page: %s", ERRNOMSG);
+        }
+#endif
+
+        vacancies = fiber_pool_vacancy_initialize(
+            fiber_pool, vacancies,
+            (char*)base + STACK_DIR_UPPER(0, RB_PAGE_SIZE),
+            size
+        );
+
+#ifdef FIBER_POOL_ALLOCATION_FREE
+        vacancies->stack.allocation = allocation;
+#endif
+    }
+
+    // Insert the allocation into the head of the pool:
+    allocation->next = fiber_pool->allocations;
+
+#ifdef FIBER_POOL_ALLOCATION_FREE
+    if (allocation->next) {
+        allocation->next->previous = allocation;
+    }
+
+    allocation->previous = NULL;
+#endif
+
+    fiber_pool->allocations = allocation;
+    fiber_pool->vacancies = vacancies;
+    fiber_pool->count += count;
+
+    return allocation;
+}
+
+// Initialize the specified fiber pool with the given number of stacks.
+// @param vm_stack_size The size of the vm stack to allocate.
+static void
+fiber_pool_initialize(struct fiber_pool * fiber_pool, size_t size, size_t count, size_t vm_stack_size)
+{
+    VM_ASSERT(vm_stack_size < size);
+
+    fiber_pool->allocations = NULL;
+    fiber_pool->vacancies = NULL;
+    fiber_pool->size = ((size / RB_PAGE_SIZE) + 1) * RB_PAGE_SIZE;
+    fiber_pool->count = 0;
+    fiber_pool->initial_count = count;
+    fiber_pool->free_stacks = 1;
+    fiber_pool->used = 0;
+
+    fiber_pool->vm_stack_size = vm_stack_size;
+
+    fiber_pool_expand(fiber_pool, count);
+}
+
+#ifdef FIBER_POOL_ALLOCATION_FREE
+// Free the list of fiber pool allocations.
+static void
+fiber_pool_allocation_free(struct fiber_pool_allocation * allocation)
+{
+    STACK_GROW_DIR_DETECTION;
+
+    VM_ASSERT(allocation->used == 0);
+
+    if (DEBUG) fprintf(stderr, "fiber_pool_allocation_free: %p base=%p count=%"PRIuSIZE"\n", allocation, allocation->base, allocation->count);
+
+    size_t i;
+    for (i = 0; i < allocation->count; i += 1) {
+        void * base = (char*)allocation->base + (allocation->stride * i) + STACK_DIR_UPPER(0, RB_PAGE_SIZE);
+
+        struct fiber_pool_vacancy * vacancy = fiber_pool_vacancy_pointer(base, allocation->size);
+
+        // Pop the vacant stack off the free list:
+        fiber_pool_vacancy_remove(vacancy);
+    }
 
-#if FIBER_USE_NATIVE
 #ifdef _WIN32
-    void *fib_handle;
+    VirtualFree(allocation->base, 0, MEM_RELEASE);
 #else
-    ucontext_t context;
-    /* Because context.uc_stack.ss_sp and context.uc_stack.ss_size
-     * are not necessarily valid after makecontext() or swapcontext(),
-     * they are saved in these variables for later use.
-     */
-    void *ss_sp;
-    size_t ss_size;
+    munmap(allocation->base, allocation->stride * allocation->count);
 #endif
+
+    if (allocation->previous) {
+        allocation->previous->next = allocation->next;
+    }
+    else {
+        // We are the head of the list, so update the pool:
+        allocation->pool->allocations = allocation->next;
+    }
+
+    if (allocation->next) {
+        allocation->next->previous = allocation->previous;
+    }
+
+    allocation->pool->count -= allocation->count;
+
+    ruby_xfree(allocation);
+}
 #endif
-};
 
-static const rb_data_type_t cont_data_type, fiber_data_type;
-static VALUE rb_cContinuation;
-static VALUE rb_cFiber;
-static VALUE rb_eFiberError;
+// Acquire a stack from the given fiber pool. If none are available, allocate more.
+static struct fiber_pool_stack
+fiber_pool_stack_acquire(struct fiber_pool * fiber_pool) {
+    struct fiber_pool_vacancy * vacancy = fiber_pool_vacancy_pop(fiber_pool);
+
+    if (DEBUG) fprintf(stderr, "fiber_pool_stack_acquire: %p used=%"PRIuSIZE"\n", (void*)fiber_pool->vacancies, fiber_pool->used);
+
+    if (!vacancy) {
+        const size_t maximum = FIBER_POOL_ALLOCATION_MAXIMUM_SIZE;
+        const size_t minimum = fiber_pool->initial_count;
+
+        size_t count = fiber_pool->count;
+        if (count > maximum) count = maximum;
+        if (count < minimum) count = minimum;
+
+        fiber_pool_expand(fiber_pool, count);
+
+        // The free list should now contain some stacks:
+        VM_ASSERT(fiber_pool->vacancies);
+
+        vacancy = fiber_pool_vacancy_pop(fiber_pool);
+    }
+
+    VM_ASSERT(vacancy);
+    VM_ASSERT(vacancy->stack.base);
+
+    // Take the top item from the free list:
+    fiber_pool->used += 1;
+
+#ifdef FIBER_POOL_ALLOCATION_FREE
+    vacancy->stack.allocation->used += 1;
+#endif
+
+    fiber_pool_stack_reset(&vacancy->stack);
+
+    return vacancy->stack;
+}
+
+// We advise the operating system that the stack memory pages are no longer being used.
+// This introduce some performance overhead but allows system to relaim memory when there is pressure.
+static inline void
+fiber_pool_stack_free(struct fiber_pool_stack * stack)
+{
+    void * base = fiber_pool_stack_base(stack);
+    size_t size = stack->available;
+
+    // If this is not true, the vacancy information will almost certainly be destroyed:
+    VM_ASSERT(size <= (stack->size - RB_PAGE_SIZE));
+
+    if (DEBUG) fprintf(stderr, "fiber_pool_stack_free: %p+%"PRIuSIZE" [base=%p, size=%"PRIuSIZE"]\n", base, size, stack->base, stack->size);
+
+#if VM_CHECK_MODE > 0 && defined(MADV_DONTNEED)
+    // This immediately discards the pages and the memory is reset to zero.
+    madvise(base, size, MADV_DONTNEED);
+#elif defined(MADV_FREE_REUSABLE)
+    madvise(base, size, MADV_FREE_REUSABLE);
+#elif defined(MADV_FREE)
+    madvise(base, size, MADV_FREE);
+#elif defined(MADV_DONTNEED)
+    madvise(base, size, MADV_DONTNEED);
+#elif defined(_WIN32)
+    VirtualAlloc(base, size, MEM_RESET, PAGE_READWRITE);
+    // Not available in all versions of Windows.
+    //DiscardVirtualMemory(base, size);
+#endif
+}
+
+// Release and return a stack to the vacancy list.
+static void
+fiber_pool_stack_release(struct fiber_pool_stack * stack)
+{
+    struct fiber_pool * pool = stack->pool;
+    struct fiber_pool_vacancy * vacancy = fiber_pool_vacancy_pointer(stack->base, stack->size);
+
+    if (DEBUG) fprintf(stderr, "fiber_pool_stack_release: %p used=%"PRIuSIZE"\n", stack->base, stack->pool->used);
+
+    // Copy the stack details into the vacancy area:
+    vacancy->stack = *stack;
+    // After this point, be careful about updating/using state in stack, since it's copied to the vacancy area.
+
+    // Reset the stack pointers and reserve space for the vacancy data:
+    fiber_pool_vacancy_reset(vacancy);
+
+    // Push the vacancy into the vancancies list:
+    pool->vacancies = fiber_pool_vacancy_push(vacancy, stack->pool->vacancies);
+    pool->used -= 1;
+
+#ifdef FIBER_POOL_ALLOCATION_FREE
+    struct fiber_pool_allocation * allocation = stack->allocation;
+
+    allocation->used -= 1;
+
+    // Release address space and/or dirty memory:
+    if (allocation->used == 0) {
+        fiber_pool_allocation_free(allocation);
+    }
+    else if (stack->pool->free_stacks) {
+        fiber_pool_stack_free(&vacancy->stack);
+    }
+#else
+    // This is entirely optional, but clears the dirty flag from the stack memory, so it won't get swapped to disk when there is memory pressure:
+    if (stack->pool->free_stacks) {
+        fiber_pool_stack_free(&vacancy->stack);
+    }
+#endif
+}
+
+static COROUTINE
+fiber_entry(struct coroutine_context * from, struct coroutine_context * to)
+{
+    rb_fiber_start();
+}
+
+// Initialize a fiber's coroutine's machine stack and vm stack.
+static VALUE *
+fiber_initialize_coroutine(rb_fiber_t *fiber, size_t * vm_stack_size)
+{
+    struct fiber_pool * fiber_pool = fiber->stack.pool;
+    rb_execution_context_t *sec = &fiber->cont.saved_ec;
+    void * vm_stack = NULL;
+
+    VM_ASSERT(fiber_pool != NULL);
+
+    fiber->stack = fiber_pool_stack_acquire(fiber_pool);
+    vm_stack = fiber_pool_stack_alloca(&fiber->stack, fiber_pool->vm_stack_size);
+    *vm_stack_size = fiber_pool->vm_stack_size;
+
+#ifdef COROUTINE_PRIVATE_STACK
+    coroutine_initialize(&fiber->context, fiber_entry, fiber_pool_stack_base(&fiber->stack), fiber->stack.available, sec->machine.stack_start);
+    // The stack for this execution context is still the main machine stack, so don't adjust it.
+    // If this is not managed correctly, you will fail in `rb_ec_stack_check`.
+
+    // We limit the machine stack usage to the fiber stack size.
+    if (sec->machine.stack_maxsize > fiber->stack.available) {
+        sec->machine.stack_maxsize = fiber->stack.available;
+    }
+#else
+    coroutine_initialize(&fiber->context, fiber_entry, fiber_pool_stack_base(&fiber->stack), fiber->stack.available);
+
+    // The stack for this execution context is the one we allocated:
+    sec->machine.stack_start = fiber->stack.current;
+    sec->machine.stack_maxsize = fiber->stack.available;
+#endif
+
+    return vm_stack;
+}
+
+// Release the stack from the fiber, it's execution context, and return it to the fiber pool.
+static void
+fiber_stack_release(rb_fiber_t * fiber)
+{
+    rb_execution_context_t *ec = &fiber->cont.saved_ec;
+
+    if (DEBUG) fprintf(stderr, "fiber_stack_release: %p, stack.base=%p\n", (void*)fiber, fiber->stack.base);
+
+    // Return the stack back to the fiber pool if it wasn't already:
+    if (fiber->stack.base) {
+        fiber_pool_stack_release(&fiber->stack);
+        fiber->stack.base = NULL;
+    }
 
-#define GetContPtr(obj, ptr)  \
-    TypedData_Get_Struct((obj), rb_context_t, &cont_data_type, (ptr))
+    // The stack is no longer associated with this execution context:
+    rb_ec_clear_vm_stack(ec);
+}
+
+static const char *
+fiber_status_name(enum fiber_status s)
+{
+    switch (s) {
+      case FIBER_CREATED: return "created";
+      case FIBER_RESUMED: return "resumed";
+      case FIBER_SUSPENDED: return "suspended";
+      case FIBER_TERMINATED: return "terminated";
+    }
+    VM_UNREACHABLE(fiber_status_name);
+    return NULL;
+}
+
+static void
+fiber_verify(const rb_fiber_t *fiber)
+{
+#if VM_CHECK_MODE > 0
+    VM_ASSERT(fiber->cont.saved_ec.fiber_ptr == fiber);
+
+    switch (fiber->status) {
+      case FIBER_RESUMED:
+        VM_ASSERT(fiber->cont.saved_ec.vm_stack != NULL);
+        break;
+      case FIBER_SUSPENDED:
+        VM_ASSERT(fiber->cont.saved_ec.vm_stack != NULL);
+        break;
+      case FIBER_CREATED:
+      case FIBER_TERMINATED:
+        /* TODO */
+        break;
+      default:
+        VM_UNREACHABLE(fiber_verify);
+    }
+#endif
+}
 
-#define GetFiberPtr(obj, ptr)  do {\
-    TypedData_Get_Struct((obj), rb_fiber_t, &fiber_data_type, (ptr)); \
-    if (!(ptr)) rb_raise(rb_eFiberError, "uninitialized fiber"); \
-} while (0)
+inline static void
+fiber_status_set(rb_fiber_t *fiber, enum fiber_status s)
+{
+    // if (DEBUG) fprintf(stderr, "fiber: %p, status: %s -> %s\n", (void *)fiber, fiber_status_name(fiber->status), fiber_status_name(s));
+    VM_ASSERT(!FIBER_TERMINATED_P(fiber));
+    VM_ASSERT(fiber->status != s);
+    fiber_verify(fiber);
+    fiber->status = s;
+}
+
+static inline void
+ec_switch(rb_thread_t *th, rb_fiber_t *fiber)
+{
+    rb_execution_context_t *ec = &fiber->cont.saved_ec;
+    rb_ractor_set_current_ec(th->ractor, th->ec = ec);
+    // ruby_current_execution_context_ptr = th->ec = ec;
+
+    /*
+     * timer-thread may set trap interrupt on previous th->ec at any time;
+     * ensure we do not delay (or lose) the trap interrupt handling.
+     */
+    if (th->vm->ractor.main_thread == th &&
+        rb_signal_buff_size() > 0) {
+        RUBY_VM_SET_TRAP_INTERRUPT(ec);
+    }
+
+    VM_ASSERT(ec->fiber_ptr->cont.self == 0 || ec->vm_stack != NULL);
+}
+
+static rb_context_t *
+cont_ptr(VALUE obj)
+{
+    rb_context_t *cont;
 
-NOINLINE(static VALUE cont_capture(volatile int *stat));
+    TypedData_Get_Struct(obj, rb_context_t, &cont_data_type, cont);
+
+    return cont;
+}
+
+static rb_fiber_t *
+fiber_ptr(VALUE obj)
+{
+    rb_fiber_t *fiber;
+
+    TypedData_Get_Struct(obj, rb_fiber_t, &fiber_data_type, fiber);
+    if (!fiber) rb_raise(rb_eFiberError, "uninitialized fiber");
+
+    return fiber;
+}
+
+NOINLINE(static VALUE cont_capture(volatile int *volatile stat));
 
 #define THREAD_MUST_BE_RUNNING(th) do { \
-	if (!(th)->tag) rb_raise(rb_eThreadError, "not running thread");	\
+        if (!(th)->ec->tag) rb_raise(rb_eThreadError, "not running thread"); \
     } while (0)
 
+rb_thread_t*
+rb_fiber_threadptr(const rb_fiber_t *fiber)
+{
+    return fiber->cont.saved_ec.thread_ptr;
+}
+
+static VALUE
+cont_thread_value(const rb_context_t *cont)
+{
+    return cont->saved_ec.thread_ptr->self;
+}
+
+static void
+cont_compact(void *ptr)
+{
+    rb_context_t *cont = ptr;
+
+    if (cont->self) {
+        cont->self = rb_gc_location(cont->self);
+    }
+    cont->value = rb_gc_location(cont->value);
+    rb_execution_context_update(&cont->saved_ec);
+}
+
 static void
 cont_mark(void *ptr)
 {
+    rb_context_t *cont = ptr;
+
     RUBY_MARK_ENTER("cont");
-    if (ptr) {
-	rb_context_t *cont = ptr;
-	rb_gc_mark(cont->value);
-	rb_thread_mark(&cont->saved_thread);
-	rb_gc_mark(cont->saved_thread.self);
+    if (cont->self) {
+        rb_gc_mark_movable(cont->self);
+    }
+    rb_gc_mark_movable(cont->value);
 
-	if (cont->vm_stack) {
+    rb_execution_context_mark(&cont->saved_ec);
+    rb_gc_mark(cont_thread_value(cont));
+
+    if (cont->saved_vm_stack.ptr) {
 #ifdef CAPTURE_JUST_VALID_VM_STACK
-	    rb_gc_mark_locations(cont->vm_stack,
-				 cont->vm_stack + cont->vm_stack_slen + cont->vm_stack_clen);
+        rb_gc_mark_locations(cont->saved_vm_stack.ptr,
+                             cont->saved_vm_stack.ptr + cont->saved_vm_stack.slen + cont->saved_vm_stack.clen);
 #else
-	    rb_gc_mark_locations(cont->vm_stack,
-				 cont->vm_stack, cont->saved_thread.stack_size);
+        rb_gc_mark_locations(cont->saved_vm_stack.ptr,
+                             cont->saved_vm_stack.ptr, cont->saved_ec.stack_size);
 #endif
-	}
+    }
 
-	if (cont->machine.stack) {
-	    if (cont->type == CONTINUATION_CONTEXT) {
-		/* cont */
-		rb_gc_mark_locations(cont->machine.stack,
-				     cont->machine.stack + cont->machine.stack_size);
+    if (cont->machine.stack) {
+        if (cont->type == CONTINUATION_CONTEXT) {
+            /* cont */
+            rb_gc_mark_locations(cont->machine.stack,
+                                 cont->machine.stack + cont->machine.stack_size);
+        }
+        else {
+            /* fiber */
+            const rb_fiber_t *fiber = (rb_fiber_t*)cont;
+
+            if (!FIBER_TERMINATED_P(fiber)) {
+                rb_gc_mark_locations(cont->machine.stack,
+                                     cont->machine.stack + cont->machine.stack_size);
             }
-            else {
-		/* fiber */
-		rb_thread_t *th;
-                rb_fiber_t *fib = (rb_fiber_t*)cont;
-		GetThreadPtr(cont->saved_thread.self, th);
-		if ((th->fiber != fib) && fib->status == RUNNING) {
-		    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");
 }
 
+#if 0
+static int
+fiber_is_root_p(const rb_fiber_t *fiber)
+{
+    return fiber == fiber->cont.saved_ec.thread_ptr->root_fiber;
+}
+#endif
+
 static void
 cont_free(void *ptr)
 {
+    rb_context_t *cont = ptr;
+
     RUBY_FREE_ENTER("cont");
-    if (ptr) {
-	rb_context_t *cont = ptr;
-	RUBY_FREE_UNLESS_NULL(cont->saved_thread.stack);
-#if FIBER_USE_NATIVE
-	if (cont->type == CONTINUATION_CONTEXT) {
-	    /* cont */
-	    ruby_xfree(cont->ensure_array);
-	    RUBY_FREE_UNLESS_NULL(cont->machine.stack);
-	}
-	else {
-	    /* fiber */
-	    rb_fiber_t *fib = (rb_fiber_t*)cont;
-	    const rb_thread_t *const th = GET_THREAD();
-#ifdef _WIN32
-	    if (th && th->fiber != fib && cont->type != ROOT_FIBER_CONTEXT) {
-		/* don't delete root fiber handle */
-		if (fib->fib_handle) {
-		    DeleteFiber(fib->fib_handle);
-		}
-	    }
-#else /* not WIN32 */
-	    if (th && th->fiber != fib) {
-                if (fib->ss_sp) {
-                    if (cont->type == ROOT_FIBER_CONTEXT) {
-			rb_bug("Illegal root fiber parameter");
-                    }
-		    munmap((void*)fib->ss_sp, fib->ss_size);
-		}
-	    }
-            else {
-		/* It may reached here when finalize */
-		/* TODO examine whether it is a bug */
-                /* rb_bug("cont_free: release self"); */
-            }
-#endif
-	}
-#else /* not FIBER_USE_NATIVE */
-	ruby_xfree(cont->ensure_array);
-	RUBY_FREE_UNLESS_NULL(cont->machine.stack);
-#endif
-#ifdef __ia64
-	RUBY_FREE_UNLESS_NULL(cont->machine.register_stack);
-#endif
-	RUBY_FREE_UNLESS_NULL(cont->vm_stack);
 
-	/* free rb_cont_t or rb_fiber_t */
-	ruby_xfree(ptr);
+    if (cont->type == CONTINUATION_CONTEXT) {
+        ruby_xfree(cont->saved_ec.vm_stack);
+        ruby_xfree(cont->ensure_array);
+        RUBY_FREE_UNLESS_NULL(cont->machine.stack);
     }
+    else {
+        rb_fiber_t *fiber = (rb_fiber_t*)cont;
+        coroutine_destroy(&fiber->context);
+        fiber_stack_release(fiber);
+    }
+
+    RUBY_FREE_UNLESS_NULL(cont->saved_vm_stack.ptr);
+
+    if (mjit_enabled) {
+        VM_ASSERT(cont->mjit_cont != NULL);
+        mjit_cont_free(cont->mjit_cont);
+    }
+    /* free rb_cont_t or rb_fiber_t */
+    ruby_xfree(ptr);
     RUBY_FREE_LEAVE("cont");
 }
 
@@ -276,73 +960,99 @@ cont_memsize(const void *ptr)
     size_t size = 0;
 
     size = sizeof(*cont);
-    if (cont->vm_stack) {
+    if (cont->saved_vm_stack.ptr) {
 #ifdef CAPTURE_JUST_VALID_VM_STACK
-	size_t n = (cont->vm_stack_slen + cont->vm_stack_clen);
+        size_t n = (cont->saved_vm_stack.slen + cont->saved_vm_stack.clen);
 #else
-	size_t n = cont->saved_thread.stack_size;
+        size_t n = cont->saved_ec.vm_stack_size;
 #endif
-	size += n * sizeof(*cont->vm_stack);
+        size += n * sizeof(*cont->saved_vm_stack.ptr);
     }
 
     if (cont->machine.stack) {
-	size += cont->machine.stack_size * sizeof(*cont->machine.stack);
-    }
-#ifdef __ia64
-    if (cont->machine.register_stack) {
-	size += cont->machine.register_stack_size * sizeof(*cont->machine.register_stack);
+        size += cont->machine.stack_size * sizeof(*cont->machine.stack);
     }
-#endif
+
     return size;
 }
 
 void
-rb_fiber_mark_self(rb_fiber_t *fib)
+rb_fiber_update_self(rb_fiber_t *fiber)
 {
-    if (fib)
-	rb_gc_mark(fib->cont.self);
+    if (fiber->cont.self) {
+        fiber->cont.self = rb_gc_location(fiber->cont.self);
+    }
+    else {
+        rb_execution_context_update(&fiber->cont.saved_ec);
+    }
+}
+
+void
+rb_fiber_mark_self(const rb_fiber_t *fiber)
+{
+    if (fiber->cont.self) {
+        rb_gc_mark_movable(fiber->cont.self);
+    }
+    else {
+        rb_execution_context_mark(&fiber->cont.saved_ec);
+    }
+}
+
+static void
+fiber_compact(void *ptr)
+{
+    rb_fiber_t *fiber = ptr;
+    fiber->first_proc = rb_gc_location(fiber->first_proc);
+
+    if (fiber->prev) rb_fiber_update_self(fiber->prev);
+
+    cont_compact(&fiber->cont);
+    fiber_verify(fiber);
 }
 
 static void
 fiber_mark(void *ptr)
 {
+    rb_fiber_t *fiber = ptr;
     RUBY_MARK_ENTER("cont");
-    if (ptr) {
-	rb_fiber_t *fib = ptr;
-	rb_fiber_mark_self(fib->prev);
-	cont_mark(&fib->cont);
-    }
+    fiber_verify(fiber);
+    rb_gc_mark_movable(fiber->first_proc);
+    if (fiber->prev) rb_fiber_mark_self(fiber->prev);
+    cont_mark(&fiber->cont);
     RUBY_MARK_LEAVE("cont");
 }
 
 static void
 fiber_free(void *ptr)
 {
+    rb_fiber_t *fiber = ptr;
     RUBY_FREE_ENTER("fiber");
-    if (ptr) {
-	rb_fiber_t *fib = ptr;
-	if (fib->cont.type != ROOT_FIBER_CONTEXT &&
-	    fib->cont.saved_thread.local_storage) {
-	    st_free_table(fib->cont.saved_thread.local_storage);
-	}
 
-	cont_free(&fib->cont);
+    //if (DEBUG) fprintf(stderr, "fiber_free: %p[%p]\n", fiber, fiber->stack.base);
+
+    if (fiber->cont.saved_ec.local_storage) {
+        rb_id_table_free(fiber->cont.saved_ec.local_storage);
     }
+
+    cont_free(&fiber->cont);
     RUBY_FREE_LEAVE("fiber");
 }
 
 static size_t
 fiber_memsize(const void *ptr)
 {
-    const rb_fiber_t *fib = ptr;
-    size_t size = 0;
+    const rb_fiber_t *fiber = ptr;
+    size_t size = sizeof(*fiber);
+    const rb_execution_context_t *saved_ec = &fiber->cont.saved_ec;
+    const rb_thread_t *th = rb_ec_thread_ptr(saved_ec);
 
-    size = sizeof(*fib);
-    if (fib->cont.type != ROOT_FIBER_CONTEXT &&
-	fib->cont.saved_thread.local_storage != NULL) {
-	size += st_memsize(fib->cont.saved_thread.local_storage);
+    /*
+     * vm.c::thread_memsize already counts th->ec->local_storage
+     */
+    if (saved_ec->local_storage && fiber != th->root_fiber) {
+        size += rb_id_table_memsize(saved_ec->local_storage);
     }
-    size += cont_memsize(&fib->cont);
+    size += cont_memsize(&fiber->cont);
     return size;
 }
 
@@ -350,10 +1060,10 @@ VALUE
 rb_obj_is_fiber(VALUE obj)
 {
     if (rb_typeddata_is_kind_of(obj, &fiber_data_type)) {
-	return Qtrue;
+        return Qtrue;
     }
     else {
-	return Qfalse;
+        return Qfalse;
     }
 }
 
@@ -362,83 +1072,56 @@ cont_save_machine_stack(rb_thread_t *th, rb_context_t *cont)
 {
     size_t size;
 
-    SET_MACHINE_STACK_END(&th->machine.stack_end);
-#ifdef __ia64
-    th->machine.register_stack_end = rb_ia64_bsp();
-#endif
+    SET_MACHINE_STACK_END(&th->ec->machine.stack_end);
 
-    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;
+    if (th->ec->machine.stack_start > th->ec->machine.stack_end) {
+        size = cont->machine.stack_size = th->ec->machine.stack_start - th->ec->machine.stack_end;
+        cont->machine.stack_src = th->ec->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;
+        size = cont->machine.stack_size = th->ec->machine.stack_end - th->ec->machine.stack_start;
+        cont->machine.stack_src = th->ec->machine.stack_start;
     }
 
     if (cont->machine.stack) {
-	REALLOC_N(cont->machine.stack, VALUE, size);
+        REALLOC_N(cont->machine.stack, VALUE, size);
     }
     else {
-	cont->machine.stack = ALLOC_N(VALUE, size);
+        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
 }
 
 static const rb_data_type_t cont_data_type = {
     "continuation",
-    {cont_mark, cont_free, cont_memsize,},
+    {cont_mark, cont_free, cont_memsize, cont_compact},
     0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static inline void
 cont_save_thread(rb_context_t *cont, rb_thread_t *th)
 {
-    rb_thread_t *sth = &cont->saved_thread;
+    rb_execution_context_t *sec = &cont->saved_ec;
+
+    VM_ASSERT(th->status == THREAD_RUNNABLE);
 
     /* save thread context */
-    sth->stack = th->stack;
-    sth->stack_size = th->stack_size;
-    sth->local_storage = th->local_storage;
-    sth->cfp = th->cfp;
-    sth->safe_level = th->safe_level;
-    sth->raised_flag = th->raised_flag;
-    sth->state = th->state;
-    sth->status = th->status;
-    sth->tag = th->tag;
-    sth->protect_tag = th->protect_tag;
-    sth->errinfo = th->errinfo;
-    sth->first_proc = th->first_proc;
-    sth->root_lep = th->root_lep;
-    sth->root_svar = th->root_svar;
-    sth->ensure_list = th->ensure_list;
-
-    sth->trace_arg = th->trace_arg;
-
-    /* saved_thread->machine.stack_(start|end) should be NULL */
+    *sec = *th->ec;
+
+    /* saved_ec->machine.stack_end should be NULL */
     /* because it may happen GC afterward */
-    sth->machine.stack_start = 0;
-    sth->machine.stack_end = 0;
-#ifdef __ia64
-    sth->machine.register_stack_start = 0;
-    sth->machine.register_stack_end = 0;
-#endif
+    sec->machine.stack_end = NULL;
+}
+
+static void
+cont_init_mjit_cont(rb_context_t *cont)
+{
+    VM_ASSERT(cont->mjit_cont == NULL);
+    if (mjit_enabled) {
+        cont->mjit_cont = mjit_cont_new(&(cont->saved_ec));
+    }
 }
 
 static void
@@ -446,12 +1129,11 @@ cont_init(rb_context_t *cont, rb_thread_t *th)
 {
     /* save thread context */
     cont_save_thread(cont, th);
-    cont->saved_thread.self = th->self;
-    cont->saved_thread.machine.stack_maxsize = th->machine.stack_maxsize;
-    cont->saved_thread.fiber = th->fiber;
-    cont->saved_thread.local_storage = 0;
-    cont->saved_thread.local_storage_recursive_hash = Qnil;
-    cont->saved_thread.local_storage_recursive_hash_for_trace = Qnil;
+    cont->saved_ec.thread_ptr = th;
+    cont->saved_ec.local_storage = NULL;
+    cont->saved_ec.local_storage_recursive_hash = Qnil;
+    cont->saved_ec.local_storage_recursive_hash_for_trace = Qnil;
+    cont_init_mjit_cont(cont);
 }
 
 static rb_context_t *
@@ -468,274 +1150,221 @@ cont_new(VALUE klass)
     return cont;
 }
 
+VALUE rb_fiberptr_self(struct rb_fiber_struct *fiber)
+{
+    return fiber->cont.self;
+}
+
+unsigned int rb_fiberptr_blocking(struct rb_fiber_struct *fiber)
+{
+    return fiber->blocking;
+}
+
+// This is used for root_fiber because other fibers call cont_init_mjit_cont through cont_new.
+void
+rb_fiber_init_mjit_cont(struct rb_fiber_struct *fiber)
+{
+    cont_init_mjit_cont(&fiber->cont);
+}
+
+#if 0
+void
+show_vm_stack(const rb_execution_context_t *ec)
+{
+    VALUE *p = ec->vm_stack;
+    while (p < ec->cfp->sp) {
+        fprintf(stderr, "%3d ", (int)(p - ec->vm_stack));
+        rb_obj_info_dump(*p);
+        p++;
+    }
+}
+
+void
+show_vm_pcs(const rb_control_frame_t *cfp,
+            const rb_control_frame_t *end_of_cfp)
+{
+    int i=0;
+    while (cfp != end_of_cfp) {
+        int pc = 0;
+        if (cfp->iseq) {
+            pc = cfp->pc - cfp->iseq->body->iseq_encoded;
+        }
+        fprintf(stderr, "%2d pc: %d\n", i++, pc);
+        cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
+    }
+}
+#endif
+COMPILER_WARNING_PUSH
+#ifdef __clang__
+COMPILER_WARNING_IGNORED(-Wduplicate-decl-specifier)
+#endif
 static VALUE
-cont_capture(volatile int *stat)
+cont_capture(volatile int *volatile stat)
 {
-    rb_context_t *cont;
+    rb_context_t *volatile cont;
     rb_thread_t *th = GET_THREAD();
     volatile VALUE contval;
+    const rb_execution_context_t *ec = th->ec;
 
     THREAD_MUST_BE_RUNNING(th);
-    rb_vm_stack_to_heap(th);
+    rb_vm_stack_to_heap(th->ec);
     cont = cont_new(rb_cContinuation);
     contval = cont->self;
 
 #ifdef CAPTURE_JUST_VALID_VM_STACK
-    cont->vm_stack_slen = th->cfp->sp - th->stack;
-    cont->vm_stack_clen = th->stack + th->stack_size - (VALUE*)th->cfp;
-    cont->vm_stack = ALLOC_N(VALUE, cont->vm_stack_slen + cont->vm_stack_clen);
-    MEMCPY(cont->vm_stack, th->stack, VALUE, cont->vm_stack_slen);
-    MEMCPY(cont->vm_stack + cont->vm_stack_slen, (VALUE*)th->cfp, VALUE, cont->vm_stack_clen);
+    cont->saved_vm_stack.slen = ec->cfp->sp - ec->vm_stack;
+    cont->saved_vm_stack.clen = ec->vm_stack + ec->vm_stack_size - (VALUE*)ec->cfp;
+    cont->saved_vm_stack.ptr = ALLOC_N(VALUE, cont->saved_vm_stack.slen + cont->saved_vm_stack.clen);
+    MEMCPY(cont->saved_vm_stack.ptr,
+           ec->vm_stack,
+           VALUE, cont->saved_vm_stack.slen);
+    MEMCPY(cont->saved_vm_stack.ptr + cont->saved_vm_stack.slen,
+           (VALUE*)ec->cfp,
+           VALUE,
+           cont->saved_vm_stack.clen);
 #else
-    cont->vm_stack = ALLOC_N(VALUE, th->stack_size);
-    MEMCPY(cont->vm_stack, th->stack, VALUE, th->stack_size);
+    cont->saved_vm_stack.ptr = ALLOC_N(VALUE, ec->vm_stack_size);
+    MEMCPY(cont->saved_vm_stack.ptr, ec->vm_stack, VALUE, ec->vm_stack_size);
 #endif
-    cont->saved_thread.stack = 0;
-
+    // At this point, `cfp` is valid but `vm_stack` should be cleared:
+    rb_ec_set_vm_stack(&cont->saved_ec, NULL, 0);
+    VM_ASSERT(cont->saved_ec.cfp != NULL);
     cont_save_machine_stack(th, cont);
 
     /* backup ensure_list to array for search in another context */
     {
-	rb_ensure_list_t *p;
-	int size = 0;
-	rb_ensure_entry_t *entry;
-	for (p=th->ensure_list; p; p=p->next)
-	    size++;
-	entry = cont->ensure_array = ALLOC_N(rb_ensure_entry_t,size+1);
-	for (p=th->ensure_list; p; p=p->next) {
-	    if (!p->entry.marker)
-		p->entry.marker = rb_ary_tmp_new(0); /* dummy object */
-	    *entry++ = p->entry;
-	}
-	entry->marker = 0;
+        rb_ensure_list_t *p;
+        int size = 0;
+        rb_ensure_entry_t *entry;
+        for (p=th->ec->ensure_list; p; p=p->next)
+            size++;
+        entry = cont->ensure_array = ALLOC_N(rb_ensure_entry_t,size+1);
+        for (p=th->ec->ensure_list; p; p=p->next) {
+            if (!p->entry.marker)
+                p->entry.marker = rb_ary_tmp_new(0); /* dummy object */
+            *entry++ = p->entry;
+        }
+        entry->marker = 0;
     }
 
     if (ruby_setjmp(cont->jmpbuf)) {
-	VALUE value;
+        VALUE value;
 
-	VAR_INITIALIZED(cont);
-	value = cont->value;
-	if (cont->argc == -1) rb_exc_raise(value);
-	cont->value = Qnil;
-	*stat = 1;
-	return value;
+        VAR_INITIALIZED(cont);
+        value = cont->value;
+        if (cont->argc == -1) rb_exc_raise(value);
+        cont->value = Qnil;
+        *stat = 1;
+        return value;
     }
     else {
-	*stat = 0;
-	return contval;
+        *stat = 0;
+        return contval;
     }
 }
+COMPILER_WARNING_POP
+
+static inline void
+fiber_restore_thread(rb_thread_t *th, rb_fiber_t *fiber)
+{
+    ec_switch(th, fiber);
+    VM_ASSERT(th->ec->fiber_ptr == fiber);
+}
 
 static inline void
 cont_restore_thread(rb_context_t *cont)
 {
-    rb_thread_t *th = GET_THREAD(), *sth = &cont->saved_thread;
+    rb_thread_t *th = GET_THREAD();
 
     /* restore thread context */
     if (cont->type == CONTINUATION_CONTEXT) {
-	/* continuation */
-	rb_fiber_t *fib;
-
-	th->fiber = sth->fiber;
-	fib = th->fiber ? th->fiber : th->root_fiber;
-
-	if (fib) {
-	    th->stack_size = fib->cont.saved_thread.stack_size;
-	    th->stack = fib->cont.saved_thread.stack;
-	}
+        /* continuation */
+        rb_execution_context_t *sec = &cont->saved_ec;
+        rb_fiber_t *fiber = NULL;
+
+        if (sec->fiber_ptr != NULL) {
+            fiber = sec->fiber_ptr;
+        }
+        else if (th->root_fiber) {
+            fiber = th->root_fiber;
+        }
+
+        if (fiber && th->ec != &fiber->cont.saved_ec) {
+            ec_switch(th, fiber);
+        }
+
+        if (th->ec->trace_arg != sec->trace_arg) {
+            rb_raise(rb_eRuntimeError, "can't call across trace_func");
+        }
+
+        /* copy vm stack */
 #ifdef CAPTURE_JUST_VALID_VM_STACK
-	MEMCPY(th->stack, cont->vm_stack, VALUE, cont->vm_stack_slen);
-	MEMCPY(th->stack + sth->stack_size - cont->vm_stack_clen,
-	       cont->vm_stack + cont->vm_stack_slen, VALUE, cont->vm_stack_clen);
+        MEMCPY(th->ec->vm_stack,
+               cont->saved_vm_stack.ptr,
+               VALUE, cont->saved_vm_stack.slen);
+        MEMCPY(th->ec->vm_stack + th->ec->vm_stack_size - cont->saved_vm_stack.clen,
+               cont->saved_vm_stack.ptr + cont->saved_vm_stack.slen,
+               VALUE, cont->saved_vm_stack.clen);
 #else
-	MEMCPY(th->stack, cont->vm_stack, VALUE, sth->stack_size);
+        MEMCPY(th->ec->vm_stack, cont->saved_vm_stack.ptr, VALUE, sec->vm_stack_size);
 #endif
-    }
-    else {
-	/* fiber */
-	th->stack = sth->stack;
-	th->stack_size = sth->stack_size;
-	th->local_storage = sth->local_storage;
-	th->local_storage_recursive_hash = sth->local_storage_recursive_hash;
-	th->local_storage_recursive_hash_for_trace = sth->local_storage_recursive_hash_for_trace;
-	th->fiber = (rb_fiber_t*)cont;
-    }
-
-    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->protect_tag = sth->protect_tag;
-    th->errinfo = sth->errinfo;
-    th->first_proc = sth->first_proc;
-    th->root_lep = sth->root_lep;
-    th->root_svar = sth->root_svar;
-    th->ensure_list = sth->ensure_list;
-
-}
-
-#if FIBER_USE_NATIVE
-#ifdef _WIN32
-static void
-fiber_set_stack_location(void)
-{
-    rb_thread_t *th = GET_THREAD();
-    VALUE *ptr;
-
-    SET_MACHINE_STACK_END(&ptr);
-    th->machine.stack_start = (void*)(((VALUE)ptr & RB_PAGE_MASK) + STACK_UPPER((void *)&ptr, 0, RB_PAGE_SIZE));
-}
+        /* other members of ec */
 
-static VOID CALLBACK
-fiber_entry(void *arg)
-{
-    fiber_set_stack_location();
-    rb_fiber_start();
-}
-#else /* _WIN32 */
-
-/*
- * FreeBSD require a first (i.e. addr) argument of mmap(2) is not NULL
- * if MAP_STACK is passed.
- * http://www.FreeBSD.org/cgi/query-pr.cgi?pr=158755
- */
-#if defined(MAP_STACK) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
-#define FIBER_STACK_FLAGS (MAP_PRIVATE | MAP_ANON | MAP_STACK)
-#else
-#define FIBER_STACK_FLAGS (MAP_PRIVATE | MAP_ANON)
-#endif
+        th->ec->cfp = sec->cfp;
+        th->ec->raised_flag = sec->raised_flag;
+        th->ec->tag = sec->tag;
+        th->ec->protect_tag = sec->protect_tag;
+        th->ec->root_lep = sec->root_lep;
+        th->ec->root_svar = sec->root_svar;
+        th->ec->ensure_list = sec->ensure_list;
+        th->ec->errinfo = sec->errinfo;
 
-static char*
-fiber_machine_stack_alloc(size_t size)
-{
-    char *ptr;
-
-    if (machine_stack_cache_index > 0) {
-	if (machine_stack_cache[machine_stack_cache_index - 1].size == (size / sizeof(VALUE))) {
-	    ptr = machine_stack_cache[machine_stack_cache_index - 1].ptr;
-	    machine_stack_cache_index--;
-	    machine_stack_cache[machine_stack_cache_index].ptr = NULL;
-	    machine_stack_cache[machine_stack_cache_index].size = 0;
-	}
-	else{
-            /* TODO handle multiple machine stack size */
-	    rb_bug("machine_stack_cache size is not canonicalized");
-	}
+        VM_ASSERT(th->ec->vm_stack != NULL);
     }
     else {
-	void *page;
-	STACK_GROW_DIR_DETECTION;
-
-	errno = 0;
-	ptr = mmap(NULL, size, PROT_READ | PROT_WRITE, FIBER_STACK_FLAGS, -1, 0);
-	if (ptr == MAP_FAILED) {
-	    rb_raise(rb_eFiberError, "can't alloc machine stack to fiber: %s", strerror(errno));
-	}
-
-	/* guard page setup */
-	page = ptr + STACK_DIR_UPPER(size - RB_PAGE_SIZE, 0);
-	if (mprotect(page, RB_PAGE_SIZE, PROT_NONE) < 0) {
-	    rb_raise(rb_eFiberError, "mprotect failed");
-	}
+        /* fiber */
+        fiber_restore_thread(th, (rb_fiber_t*)cont);
     }
-
-    return ptr;
 }
-#endif
 
-static void
-fiber_initialize_machine_stack_context(rb_fiber_t *fib, size_t size)
-{
-    rb_thread_t *sth = &fib->cont.saved_thread;
-
-#ifdef _WIN32
-# if defined(_MSC_VER) && _MSC_VER <= 1200
-#   define CreateFiberEx(cs, stacksize, flags, entry, param) \
-    CreateFiber((stacksize), (entry), (param))
-# endif
-    fib->fib_handle = CreateFiberEx(size - 1, size, 0, fiber_entry, NULL);
-    if (!fib->fib_handle) {
-	/* try to release unnecessary fibers & retry to create */
-	rb_gc();
-	fib->fib_handle = CreateFiberEx(size - 1, size, 0, fiber_entry, NULL);
-	if (!fib->fib_handle) {
-	    rb_raise(rb_eFiberError, "can't create fiber");
-	}
-    }
-    sth->machine.stack_maxsize = size;
-#else /* not WIN32 */
-    ucontext_t *context = &fib->context;
-    char *ptr;
-    STACK_GROW_DIR_DETECTION;
-
-    getcontext(context);
-    ptr = fiber_machine_stack_alloc(size);
-    context->uc_link = NULL;
-    context->uc_stack.ss_sp = ptr;
-    context->uc_stack.ss_size = size;
-    fib->ss_sp = ptr;
-    fib->ss_size = size;
-    makecontext(context, rb_fiber_start, 0);
-    sth->machine.stack_start = (VALUE*)(ptr + STACK_DIR_UPPER(0, size));
-    sth->machine.stack_maxsize = size - RB_PAGE_SIZE;
-#endif
-#ifdef __ia64
-    sth->machine.register_stack_maxsize = sth->machine.stack_maxsize;
-#endif
-}
-
-NOINLINE(static void fiber_setcontext(rb_fiber_t *newfib, rb_fiber_t *oldfib));
+NOINLINE(static void fiber_setcontext(rb_fiber_t *new_fiber, rb_fiber_t *old_fiber));
 
 static void
-fiber_setcontext(rb_fiber_t *newfib, rb_fiber_t *oldfib)
+fiber_setcontext(rb_fiber_t *new_fiber, rb_fiber_t *old_fiber)
 {
-    rb_thread_t *th = GET_THREAD(), *sth = &newfib->cont.saved_thread;
+    rb_thread_t *th = GET_THREAD();
 
-    if (newfib->status != RUNNING) {
-	fiber_initialize_machine_stack_context(newfib, th->vm->default_params.fiber_machine_stack_size);
+    /* save old_fiber's machine stack - to ensure efficient garbage collection */
+    if (!FIBER_TERMINATED_P(old_fiber)) {
+        STACK_GROW_DIR_DETECTION;
+        SET_MACHINE_STACK_END(&th->ec->machine.stack_end);
+        if (STACK_DIR_UPPER(0, 1)) {
+            old_fiber->cont.machine.stack_size = th->ec->machine.stack_start - th->ec->machine.stack_end;
+            old_fiber->cont.machine.stack = th->ec->machine.stack_end;
+        }
+        else {
+            old_fiber->cont.machine.stack_size = th->ec->machine.stack_end - th->ec->machine.stack_start;
+            old_fiber->cont.machine.stack = th->ec->machine.stack_start;
+        }
     }
 
+    /* exchange machine_stack_start between old_fiber and new_fiber */
+    old_fiber->cont.saved_ec.machine.stack_start = th->ec->machine.stack_start;
+
+    /* old_fiber->machine.stack_end should be NULL */
+    old_fiber->cont.saved_ec.machine.stack_end = NULL;
+
     /* restore thread context */
-    cont_restore_thread(&newfib->cont);
-    th->machine.stack_maxsize = sth->machine.stack_maxsize;
-    if (sth->machine.stack_end && (newfib != oldfib)) {
-	rb_bug("fiber_setcontext: sth->machine.stack_end has non zero value");
-    }
-
-    /* save  oldfib's machine stack */
-    if (oldfib->status != TERMINATED) {
-	STACK_GROW_DIR_DETECTION;
-	SET_MACHINE_STACK_END(&th->machine.stack_end);
-	if (STACK_DIR_UPPER(0, 1)) {
-	    oldfib->cont.machine.stack_size = th->machine.stack_start - th->machine.stack_end;
-	    oldfib->cont.machine.stack = th->machine.stack_end;
-	}
-	else {
-	    oldfib->cont.machine.stack_size = th->machine.stack_end - th->machine.stack_start;
-	    oldfib->cont.machine.stack = th->machine.stack_start;
-	}
-    }
-    /* exchange machine_stack_start between oldfib and newfib */
-    oldfib->cont.saved_thread.machine.stack_start = th->machine.stack_start;
-    th->machine.stack_start = sth->machine.stack_start;
-    /* oldfib->machine.stack_end should be NULL */
-    oldfib->cont.saved_thread.machine.stack_end = 0;
-#ifndef _WIN32
-    if (!newfib->context.uc_stack.ss_sp && th->root_fiber != newfib) {
-	rb_bug("non_root_fiber->context.uc_stac.ss_sp should not be NULL");
-    }
-#endif
+    fiber_restore_thread(th, new_fiber);
+
+    // if (DEBUG) fprintf(stderr, "fiber_setcontext: %p[%p] -> %p[%p]\n", old_fiber, old_fiber->stack.base, new_fiber, new_fiber->stack.base);
 
     /* swap machine context */
-#ifdef _WIN32
-    SwitchToFiber(newfib->fib_handle);
-#else
-    swapcontext(&oldfib->context, &newfib->context);
-#endif
+    coroutine_transfer(&old_fiber->context, &new_fiber->context);
+
+    // It's possible to get here, and new_fiber is already freed.
+    // if (DEBUG) fprintf(stderr, "fiber_setcontext: %p[%p] <- %p[%p]\n", old_fiber, old_fiber->stack.base, new_fiber, new_fiber->stack.base);
 }
-#endif
 
 NOINLINE(NORETURN(static void cont_restore_1(rb_context_t *)));
 
@@ -747,66 +1376,24 @@ cont_restore_1(rb_context_t *cont)
     /* restore machine stack */
 #ifdef _M_AMD64
     {
-	/* workaround for x64 SEH */
-	jmp_buf buf;
-	setjmp(buf);
-	((_JUMP_BUFFER*)(&cont->jmpbuf))->Frame =
-	    ((_JUMP_BUFFER*)(&buf))->Frame;
+        /* workaround for x64 SEH */
+        jmp_buf buf;
+        setjmp(buf);
+        _JUMP_BUFFER *bp = (void*)&cont->jmpbuf;
+        bp->Frame = ((_JUMP_BUFFER*)((void*)&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);
+        FLUSH_REGISTER_WINDOWS;
+        MEMCPY(cont->machine.stack_src, cont->machine.stack,
+               VALUE, cont->machine.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);
-#if 0
-{/* the above lines make cc-mode.el confused so much */}
-#endif
-int rb_dummy_false = 0;
-NORETURN(NOINLINE(static void register_stack_extend(rb_context_t *, VALUE *, VALUE *)));
-static void
-register_stack_extend(rb_context_t *cont, VALUE *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 < cont->machine.register_stack_src+cont->machine.register_stack_size) {
-        register_stack_extend(cont, vp, (VALUE*)rb_ia64_bsp());
-    }
-    cont_restore_0(cont, vp);
-}
-#undef C
-#undef E
-#endif
-
 static void
 cont_restore_0(rb_context_t *cont, VALUE *addr_in_prev_frame)
 {
@@ -816,48 +1403,45 @@ cont_restore_0(rb_context_t *cont, VALUE *addr_in_prev_frame)
 #else
 #define STACK_PAD_SIZE 1024
 #endif
-	VALUE space[STACK_PAD_SIZE];
+        VALUE space[STACK_PAD_SIZE];
 
 #if !STACK_GROW_DIRECTION
-	if (addr_in_prev_frame > &space[0]) {
-	    /* Stack grows downward */
+        if (addr_in_prev_frame > &space[0]) {
+            /* Stack grows downward */
 #endif
 #if STACK_GROW_DIRECTION <= 0
-	    volatile VALUE *const end = cont->machine.stack_src;
-	    if (&space[0] > end) {
+            volatile VALUE *const end = cont->machine.stack_src;
+            if (&space[0] > end) {
 # ifdef HAVE_ALLOCA
-		volatile VALUE *sp = ALLOCA_N(VALUE, &space[0] - end);
-		space[0] = *sp;
+                volatile VALUE *sp = ALLOCA_N(VALUE, &space[0] - end);
+                space[0] = *sp;
 # else
-		cont_restore_0(cont, &space[0]);
+                cont_restore_0(cont, &space[0]);
 # endif
-	    }
+            }
 #endif
 #if !STACK_GROW_DIRECTION
-	}
-	else {
-	    /* Stack grows upward */
+        }
+        else {
+            /* Stack grows upward */
 #endif
 #if STACK_GROW_DIRECTION >= 0
-	    volatile VALUE *const end = cont->machine.stack_src + cont->machine.stack_size;
-	    if (&space[STACK_PAD_SIZE] < end) {
+            volatile VALUE *const end = cont->machine.stack_src + cont->machine.stack_size;
+            if (&space[STACK_PAD_SIZE] < end) {
 # ifdef HAVE_ALLOCA
-		volatile VALUE *sp = ALLOCA_N(VALUE, end - &space[STACK_PAD_SIZE]);
-		space[0] = *sp;
+                volatile VALUE *sp = ALLOCA_N(VALUE, end - &space[STACK_PAD_SIZE]);
+                space[0] = *sp;
 # else
-		cont_restore_0(cont, &space[STACK_PAD_SIZE-1]);
+                cont_restore_0(cont, &space[STACK_PAD_SIZE-1]);
 # endif
-	    }
+            }
 #endif
 #if !STACK_GROW_DIRECTION
-	}
+        }
 #endif
     }
     cont_restore_1(cont);
 }
-#ifdef __ia64
-#define cont_restore_0(cont, vp) register_stack_extend((cont), (vp), (VALUE*)rb_ia64_bsp())
-#endif
 
 /*
  *  Document-class: Continuation
@@ -865,7 +1449,7 @@ cont_restore_0(rb_context_t *cont, VALUE *addr_in_prev_frame)
  *  Continuation objects are generated by Kernel#callcc,
  *  after having +require+d <i>continuation</i>. 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
+ *  to the end of the #callcc 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).
@@ -909,7 +1493,7 @@ cont_restore_0(rb_context_t *cont, VALUE *addr_in_prev_frame)
  *     require "continuation"
  *     callcc {|cont|
  *       for i in 0..4
- *         print "\n#{i}: "
+ *         print "#{i}: "
  *         for j in i*5...(i+1)*5
  *           cont.call() if j == 17
  *           printf "%3d", j
@@ -949,10 +1533,10 @@ rb_callcc(VALUE self)
     volatile VALUE val = cont_capture(&called);
 
     if (called) {
-	return val;
+        return val;
     }
     else {
-	return rb_yield(val);
+        return rb_yield(val);
     }
 }
 
@@ -960,35 +1544,39 @@ static VALUE
 make_passing_arg(int argc, const VALUE *argv)
 {
     switch (argc) {
+      case -1:
+        return argv[0];
       case 0:
-	return Qnil;
+        return Qnil;
       case 1:
-	return argv[0];
+        return argv[0];
       default:
-	return rb_ary_new4(argc, argv);
+        return rb_ary_new4(argc, argv);
     }
 }
 
+typedef VALUE e_proc(VALUE);
+
 /* CAUTION!! : Currently, error in rollback_func is not supported  */
 /* same as rb_protect if set rollback_func to NULL */
 void
-ruby_register_rollback_func_for_ensure(VALUE (*ensure_func)(ANYARGS), VALUE (*rollback_func)(ANYARGS))
+ruby_register_rollback_func_for_ensure(e_proc *ensure_func, e_proc *rollback_func)
 {
     st_table **table_p = &GET_VM()->ensure_rollback_table;
     if (UNLIKELY(*table_p == NULL)) {
-	*table_p = st_init_numtable();
+        *table_p = st_init_numtable();
     }
     st_insert(*table_p, (st_data_t)ensure_func, (st_data_t)rollback_func);
 }
 
-static inline VALUE
-lookup_rollback_func(VALUE (*ensure_func)(ANYARGS))
+static inline e_proc *
+lookup_rollback_func(e_proc *ensure_func)
 {
     st_table *table = GET_VM()->ensure_rollback_table;
     st_data_t val;
     if (table && st_lookup(table, (st_data_t)ensure_func, &val))
-	return (VALUE) val;
-    return Qundef;
+        return (e_proc *) val;
+    return (e_proc *) Qundef;
 }
 
 
@@ -997,62 +1585,63 @@ rollback_ensure_stack(VALUE self,rb_ensure_list_t *current,rb_ensure_entry_t *ta
 {
     rb_ensure_list_t *p;
     rb_ensure_entry_t *entry;
-    size_t i;
+    size_t i, j;
     size_t cur_size;
     size_t target_size;
     size_t base_point;
-    VALUE (*func)(ANYARGS);
+    e_proc *func;
 
     cur_size = 0;
     for (p=current; p; p=p->next)
-	cur_size++;
+        cur_size++;
     target_size = 0;
     for (entry=target; entry->marker; entry++)
-	target_size++;
+        target_size++;
 
     /* search common stack point */
     p = current;
     base_point = cur_size;
     while (base_point) {
-	if (target_size >= base_point &&
-	    p->entry.marker == target[target_size - base_point].marker)
-	    break;
-	base_point --;
-	p = p->next;
+        if (target_size >= base_point &&
+            p->entry.marker == target[target_size - base_point].marker)
+            break;
+        base_point --;
+        p = p->next;
     }
 
     /* rollback function check */
     for (i=0; i < target_size - base_point; i++) {
-	if (!lookup_rollback_func(target[i].e_proc)) {
-	    rb_raise(rb_eRuntimeError, "continuation called from out of critical rb_ensure scope");
-	}
+        if (!lookup_rollback_func(target[i].e_proc)) {
+            rb_raise(rb_eRuntimeError, "continuation called from out of critical rb_ensure scope");
+        }
     }
     /* pop ensure stack */
     while (cur_size > base_point) {
-	/* escape from ensure block */
-	(*current->entry.e_proc)(current->entry.data2);
-	current = current->next;
-	cur_size--;
+        /* escape from ensure block */
+        (*current->entry.e_proc)(current->entry.data2);
+        current = current->next;
+        cur_size--;
     }
     /* push ensure stack */
-    while (i--) {
-	func = (VALUE (*)(ANYARGS)) lookup_rollback_func(target[i].e_proc);
-	if ((VALUE)func != Qundef) {
-	    (*func)(target[i].data2);
-	}
+    for (j = 0; j < i; j++) {
+        func = lookup_rollback_func(target[i - j - 1].e_proc);
+        if ((VALUE)func != Qundef) {
+            (*func)(target[i - j - 1].data2);
+        }
     }
 }
 
+NORETURN(static VALUE rb_cont_call(int argc, VALUE *argv, VALUE contval));
+
 /*
  *  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.
+ *  Invokes the continuation. The program continues from the end of
+ *  the #callcc block. If no arguments are given, the original #callcc
+ *  returns +nil+. If one argument is given, #callcc returns
+ *  it. Otherwise, an array containing <i>args</i> is returned.
  *
  *     callcc {|cont|  cont.call }           #=> nil
  *     callcc {|cont|  cont.call 1 }         #=> 1
@@ -1062,31 +1651,27 @@ rollback_ensure_stack(VALUE self,rb_ensure_list_t *current,rb_ensure_entry_t *ta
 static VALUE
 rb_cont_call(int argc, VALUE *argv, VALUE contval)
 {
-    rb_context_t *cont;
+    rb_context_t *cont = cont_ptr(contval);
     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_thread_value(cont) != th->self) {
+        rb_raise(rb_eRuntimeError, "continuation called across threads");
     }
-    if (cont->saved_thread.protect_tag != th->protect_tag) {
-	rb_raise(rb_eRuntimeError, "continuation called across stack rewinding barrier");
+    if (cont->saved_ec.protect_tag != th->ec->protect_tag) {
+        rb_raise(rb_eRuntimeError, "continuation called across stack rewinding barrier");
     }
-    if (cont->saved_thread.fiber) {
-	if (th->fiber != cont->saved_thread.fiber) {
-	    rb_raise(rb_eRuntimeError, "continuation called across fiber");
-	}
+    if (cont->saved_ec.fiber_ptr) {
+        if (th->ec->fiber_ptr != cont->saved_ec.fiber_ptr) {
+            rb_raise(rb_eRuntimeError, "continuation called across fiber");
+        }
     }
-    rollback_ensure_stack(contval, th->ensure_list, cont->ensure_array);
+    rollback_ensure_stack(contval, th->ec->ensure_list, cont->ensure_array);
 
     cont->argc = argc;
     cont->value = make_passing_arg(argc, argv);
 
-    /* restore `tracing' context. see [Feature #4347] */
-    th->trace_arg = cont->saved_thread.trace_arg;
-
     cont_restore_0(cont, &contval);
-    return Qnil; /* unreachable */
+    UNREACHABLE_RETURN(Qnil);
 }
 
 /*********/
@@ -1103,14 +1688,15 @@ rb_cont_call(int argc, VALUE *argv, VALUE contval)
  *  the programmer and not the VM.
  *
  *  As opposed to other stackless light weight concurrency models, each fiber
- *  comes with a small 4KB stack. This enables the fiber to be paused from deeply
- *  nested function calls within the fiber block.
+ *  comes with a stack.  This enables the fiber to be paused from deeply
+ *  nested function calls within the fiber block.  See the ruby(1)
+ *  manpage to configure the size of the fiber stack(s).
  *
  *  When a fiber is created it will not run automatically. Rather it must
- *  be explicitly asked to run using the <code>Fiber#resume</code> method.
+ *  be explicitly asked to run using the Fiber#resume method.
  *  The code running inside the fiber can give up control by calling
- *  <code>Fiber.yield</code> in which case it yields control back to caller
- *  (the caller of the <code>Fiber#resume</code>).
+ *  Fiber.yield in which case it yields control back to caller (the
+ *  caller of the Fiber#resume).
  *
  *  Upon yielding or termination the Fiber returns the value of the last
  *  executed expression
@@ -1132,10 +1718,10 @@ rb_cont_call(int argc, VALUE *argv, VALUE contval)
  *    2
  *    FiberError: dead fiber called
  *
- *  The <code>Fiber#resume</code> method accepts an arbitrary number of
- *  parameters, if it is the first call to <code>resume</code> then they
- *  will be passed as block arguments. Otherwise they will be the return
- *  value of the call to <code>Fiber.yield</code>
+ *  The Fiber#resume method accepts an arbitrary number of parameters,
+ *  if it is the first call to #resume then they will be passed as
+ *  block arguments. Otherwise they will be the return value of the
+ *  call to Fiber.yield
  *
  *  Example:
  *
@@ -1144,20 +1730,42 @@ rb_cont_call(int argc, VALUE *argv, VALUE contval)
  *    end
  *
  *    puts fiber.resume 10
- *    puts fiber.resume 14
- *    puts fiber.resume 18
+ *    puts fiber.resume 1_000_000
+ *    puts fiber.resume "The fiber will be dead before I can cause trouble"
  *
  *  <em>produces</em>
  *
  *    12
- *    14
+ *    1000000
  *    FiberError: dead fiber called
  *
+ *  == Non-blocking Fibers
+ *
+ *  Since Ruby 3.0, the concept of <em>non-blocking fiber</em> was introduced.
+ *  Non-blocking fiber, when reaching any potentially blocking operation (like
+ *  sleep, wait for another process, wait for I/O data to be ready), instead
+ *  of just freezing itself and all execution in the thread, yields control
+ *  to other fibers, and allows the <em>scheduler</em> to handle waiting and waking
+ *  (resuming) the fiber when it can proceed.
+ *
+ *  For Fiber to behave as non-blocking, it should be created in Fiber.new with
+ *  <tt>blocking: false</tt> (which is the default now), and Fiber.scheduler
+ *  should be set with Fiber.set_scheduler. If Fiber.scheduler is not set in
+ *  the current thread, blocking and non-blocking fiber's behavior is identical.
+ *
+ *  Ruby doesn't provide a scheduler class: it is expected to be implemented by
+ *  the user and correspond to Fiber::SchedulerInterface.
+ *
+ *  There is also Fiber.schedule method, which is expected to immediately perform
+ *  passed block in a non-blocking manner (but its actual implementation is up to
+ *  the scheduler).
+ *
+ *
  */
 
 static const rb_data_type_t fiber_data_type = {
     "fiber",
-    {fiber_mark, fiber_free, fiber_memsize,},
+    {fiber_mark, fiber_free, fiber_memsize, fiber_compact,},
     0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
@@ -1168,177 +1776,405 @@ fiber_alloc(VALUE klass)
 }
 
 static rb_fiber_t*
-fiber_t_alloc(VALUE fibval)
+fiber_t_alloc(VALUE fiber_value, unsigned int blocking)
 {
-    rb_fiber_t *fib;
+    rb_fiber_t *fiber;
     rb_thread_t *th = GET_THREAD();
 
-    if (DATA_PTR(fibval) != 0) {
-	rb_raise(rb_eRuntimeError, "cannot initialize twice");
+    if (DATA_PTR(fiber_value) != 0) {
+        rb_raise(rb_eRuntimeError, "cannot initialize twice");
     }
 
     THREAD_MUST_BE_RUNNING(th);
-    fib = ZALLOC(rb_fiber_t);
-    fib->cont.self = fibval;
-    fib->cont.type = FIBER_CONTEXT;
-    cont_init(&fib->cont, th);
-    fib->prev = NULL;
-    fib->status = CREATED;
+    fiber = ZALLOC(rb_fiber_t);
+    fiber->cont.self = fiber_value;
+    fiber->cont.type = FIBER_CONTEXT;
+    fiber->blocking = blocking;
+    cont_init(&fiber->cont, th);
+
+    fiber->cont.saved_ec.fiber_ptr = fiber;
+    rb_ec_clear_vm_stack(&fiber->cont.saved_ec);
 
-    DATA_PTR(fibval) = fib;
+    fiber->prev = NULL;
 
-    return fib;
+    /* fiber->status == 0 == CREATED
+     * So that we don't need to set status: fiber_status_set(fiber, FIBER_CREATED); */
+    VM_ASSERT(FIBER_CREATED_P(fiber));
+
+    DATA_PTR(fiber_value) = fiber;
+
+    return fiber;
 }
 
 static VALUE
-fiber_init(VALUE fibval, VALUE proc)
+fiber_initialize(VALUE self, VALUE proc, struct fiber_pool * fiber_pool, unsigned int blocking)
 {
-    rb_fiber_t *fib = fiber_t_alloc(fibval);
-    rb_context_t *cont = &fib->cont;
-    rb_thread_t *th = &cont->saved_thread;
-    rb_thread_t *cth = GET_THREAD();
+    rb_fiber_t *fiber = fiber_t_alloc(self, blocking);
 
-    /* initialize cont */
-    cont->vm_stack = 0;
+    fiber->first_proc = proc;
+    fiber->stack.base = NULL;
+    fiber->stack.pool = fiber_pool;
 
-    th->stack = 0;
-    th->stack_size = 0;
+    return self;
+}
 
-    th->stack_size = cth->vm->default_params.fiber_vm_stack_size / sizeof(VALUE);
-    th->stack = ALLOC_N(VALUE, th->stack_size);
+static void
+fiber_prepare_stack(rb_fiber_t *fiber)
+{
+    rb_context_t *cont = &fiber->cont;
+    rb_execution_context_t *sec = &cont->saved_ec;
 
-    th->cfp = (void *)(th->stack + th->stack_size);
-    th->cfp--;
-    th->cfp->pc = 0;
-    th->cfp->sp = th->stack + 2;
-#if VM_DEBUG_BP_CHECK
-    th->cfp->bp_check = 0;
-#endif
-    th->cfp->ep = th->stack + 1;
-    th->cfp->ep[ 0] = VM_ENVVAL_BLOCK_PTR(0);
-    th->cfp->ep[-1] = 0;
-    th->cfp->self = Qnil;
-    th->cfp->flag = VM_FRAME_MAGIC_DUMMY | VM_FRAME_FLAG_FINISH;
-    th->cfp->iseq = 0;
-    th->cfp->proc = 0;
-    th->cfp->block_iseq = 0;
-    th->tag = 0;
-    th->local_storage = st_init_numtable();
-    th->local_storage_recursive_hash = Qnil;
-    th->local_storage_recursive_hash_for_trace = Qnil;
-
-    th->first_proc = proc;
-
-#if !FIBER_USE_NATIVE
-    MEMCPY(&cont->jmpbuf, &cth->root_jmpbuf, rb_jmpbuf_t, 1);
-#endif
+    size_t vm_stack_size = 0;
+    VALUE *vm_stack = fiber_initialize_coroutine(fiber, &vm_stack_size);
+
+    /* initialize cont */
+    cont->saved_vm_stack.ptr = NULL;
+    rb_ec_initialize_vm_stack(sec, vm_stack, vm_stack_size / sizeof(VALUE));
 
-    return fibval;
+    sec->tag = NULL;
+    sec->local_storage = NULL;
+    sec->local_storage_recursive_hash = Qnil;
+    sec->local_storage_recursive_hash_for_trace = Qnil;
+}
+
+static struct fiber_pool *
+rb_fiber_pool_default(VALUE pool)
+{
+    return &shared_fiber_pool;
 }
 
 /* :nodoc: */
 static VALUE
-rb_fiber_init(VALUE fibval)
+rb_fiber_initialize_kw(int argc, VALUE* argv, VALUE self, int kw_splat)
 {
-    return fiber_init(fibval, rb_block_proc());
+    VALUE pool = Qnil;
+    VALUE blocking = Qfalse;
+
+    if (kw_splat != RB_NO_KEYWORDS) {
+        VALUE options = Qnil;
+        VALUE arguments[2] = {Qundef};
+
+        argc = rb_scan_args_kw(kw_splat, argc, argv, ":", &options);
+        rb_get_kwargs(options, fiber_initialize_keywords, 0, 2, arguments);
+
+        if (arguments[0] != Qundef) {
+            blocking = arguments[0];
+        }
+
+        if (arguments[1] != Qundef) {
+            pool = arguments[1];
+        }
+    }
+
+    return fiber_initialize(self, rb_block_proc(), rb_fiber_pool_default(pool), RTEST(blocking));
+}
+
+/*
+ *  call-seq:
+ *     Fiber.new(blocking: false) { |*args| ... } -> fiber
+ *
+ *  Creates new Fiber. Initially, fiber is not running, but can be resumed with
+ *  #resume. Arguments to the first #resume call would be passed to the block:
+ *
+ *      f = Fiber.new do |initial|
+ *         current = initial
+ *         loop do
+ *           puts "current: #{current.inspect}"
+ *           current = Fiber.yield
+ *         end
+ *      end
+ *      f.resume(100)     # prints: current: 100
+ *      f.resume(1, 2, 3) # prints: current: [1, 2, 3]
+ *      f.resume          # prints: current: nil
+ *      # ... and so on ...
+ *
+ *  if <tt>blocking: false</tt> is passed to the <tt>Fiber.new</tt>, _and_ current thread
+ *  has Fiber.scheduler defined, the Fiber becomes non-blocking (see "Non-blocking
+ *  fibers" section in class docs).
+ */
+static VALUE
+rb_fiber_initialize(int argc, VALUE* argv, VALUE self)
+{
+    return rb_fiber_initialize_kw(argc, argv, self, rb_keyword_given_p());
 }
 
 VALUE
-rb_fiber_new(VALUE (*func)(ANYARGS), VALUE obj)
+rb_fiber_new(rb_block_call_func_t func, VALUE obj)
 {
-    return fiber_init(fiber_alloc(rb_cFiber), rb_proc_new(func, obj));
+    return fiber_initialize(fiber_alloc(rb_cFiber), rb_proc_new(func, obj), rb_fiber_pool_default(Qnil), 1);
 }
 
-static void rb_fiber_terminate(rb_fiber_t *fib);
+static VALUE
+rb_f_fiber_kw(int argc, VALUE* argv, int kw_splat)
+{
+    rb_thread_t * th = GET_THREAD();
+    VALUE scheduler = th->scheduler;
+    VALUE fiber = Qnil;
+
+    if (scheduler != Qnil) {
+        fiber = rb_funcall_passing_block_kw(scheduler, rb_intern("fiber"), argc, argv, kw_splat);
+    } else {
+        rb_raise(rb_eRuntimeError, "No scheduler is available!");
+    }
+
+    return fiber;
+}
+
+/*
+ *  call-seq:
+ *     Fiber.schedule { |*args| ... } -> fiber
+ *
+ *  The method is <em>expected</em> to immediately run the provided block of code in a
+ *  separate non-blocking fiber.
+ *
+ *     puts "Go to sleep!"
+ *
+ *     Fiber.set_scheduler(MyScheduler.new)
+ *
+ *     Fiber.schedule do
+ *       puts "Going to sleep"
+ *       sleep(1)
+ *       puts "I slept well"
+ *     end
+ *
+ *     puts "Wakey-wakey, sleepyhead"
+ *
+ *  Assuming MyScheduler is properly implemented, this program will produce:
+ *
+ *     Go to sleep!
+ *     Going to sleep
+ *     Wakey-wakey, sleepyhead
+ *     ...1 sec pause here...
+ *     I slept well
+ *
+ *  ...e.g. on the first blocking operation inside the Fiber (<tt>sleep(1)</tt>),
+ *  the control is yielded at the outside code (main fiber), and <em>at the end
+ *  of the execution</em>, the scheduler takes care of properly resuming all the
+ *  blocked fibers.
+ *
+ *  Note that the behavior described above is how the method is <em>expected</em>
+ *  to behave, actual behavior is up to the current scheduler's implementation of
+ *  Fiber::SchedulerInterface#fiber method. Ruby doesn't enforce this method to
+ *  behave in any particular way.
+ *
+ *  If the scheduler is not set, the method raises
+ *  <tt>RuntimeError (No scheduler is available!)</tt>.
+ *
+ */
+static VALUE
+rb_f_fiber(int argc, VALUE *argv, VALUE obj)
+{
+    return rb_f_fiber_kw(argc, argv, rb_keyword_given_p());
+}
+
+/*
+ *  call-seq:
+ *     Fiber.scheduler -> obj or nil
+ *
+ *  Fiber scheduler, set in the current thread with Fiber.set_scheduler. If the scheduler
+ *  is +nil+ (which is the default), non-blocking fibers behavior is the same as blocking.
+ *  (see "Non-blocking fibers" section in class docs for details about the scheduler concept).
+ *
+ */
+static VALUE
+rb_fiber_scheduler(VALUE klass)
+{
+    return rb_scheduler_get();
+}
+
+/*
+ *  call-seq:
+ *     Fiber.set_scheduler(scheduler) -> scheduler
+ *
+ *  Sets Fiber scheduler for the current thread. If the scheduler is set, non-blocking
+ *  fibers (created by Fiber.new with <tt>blocking: false</tt>, or by Fiber.schedule)
+ *  call that scheduler's hook methods on potentially blocking operations, and the current
+ *  thread will call scheduler's +close+ method on finalization (allowing the scheduler to
+ *  properly manage all non-finished fibers).
+ *
+ *  +scheduler+ can be an object of any class corresponding to Fiber::SchedulerInterface. Its
+ *  implementation is up to the user.
+ *
+ *  See also the "Non-blocking fibers" section in class docs.
+ *
+ */
+static VALUE
+rb_fiber_set_scheduler(VALUE klass, VALUE scheduler)
+{
+    // if (rb_scheduler_get() != Qnil) {
+    //     rb_raise(rb_eFiberError, "Scheduler is already defined!");
+    // }
+
+    return rb_scheduler_set(scheduler);
+}
+
+NORETURN(static void rb_fiber_terminate(rb_fiber_t *fiber, int need_interrupt));
 
 void
 rb_fiber_start(void)
 {
-    rb_thread_t *th = GET_THREAD();
-    rb_fiber_t *fib = th->fiber;
+    rb_thread_t * volatile th = GET_THREAD();
+    rb_fiber_t *fiber = th->ec->fiber_ptr;
     rb_proc_t *proc;
-    int state;
-
-    TH_PUSH_TAG(th);
-    if ((state = EXEC_TAG()) == 0) {
-	rb_context_t *cont = &VAR_FROM_MEMORY(fib)->cont;
-	int argc;
-	const VALUE *argv, args = cont->value;
-	GetProcPtr(cont->saved_thread.first_proc, proc);
-	argv = (argc = cont->argc) > 1 ? RARRAY_CONST_PTR(args) : &args;
-	cont->value = Qnil;
-	th->errinfo = Qnil;
-	th->root_lep = rb_vm_ep_local_ep(proc->block.ep);
-	th->root_svar = Qfalse;
-	fib->status = RUNNING;
-
-	EXEC_EVENT_HOOK(th, RUBY_EVENT_FIBER_SWITCH, th->self, 0, 0, Qnil);
-	cont->value = rb_vm_invoke_proc(th, proc, argc, argv, 0);
-    }
-    TH_POP_TAG();
+    enum ruby_tag_type state;
+    int need_interrupt = TRUE;
+
+    VM_ASSERT(th->ec == GET_EC());
+    VM_ASSERT(FIBER_RESUMED_P(fiber));
+
+    if (fiber->blocking) {
+        th->blocking += 1;
+    }
+
+    EC_PUSH_TAG(th->ec);
+    if ((state = EC_EXEC_TAG()) == TAG_NONE) {
+        rb_context_t *cont = &VAR_FROM_MEMORY(fiber)->cont;
+        int argc;
+        const VALUE *argv, args = cont->value;
+        GetProcPtr(fiber->first_proc, proc);
+        argv = (argc = cont->argc) > 1 ? RARRAY_CONST_PTR(args) : &args;
+        cont->value = Qnil;
+        th->ec->errinfo = Qnil;
+        th->ec->root_lep = rb_vm_proc_local_ep(fiber->first_proc);
+        th->ec->root_svar = Qfalse;
+
+        EXEC_EVENT_HOOK(th->ec, RUBY_EVENT_FIBER_SWITCH, th->self, 0, 0, 0, Qnil);
+        cont->value = rb_vm_invoke_proc(th->ec, proc, argc, argv, cont->kw_splat, VM_BLOCK_HANDLER_NONE);
+    }
+    EC_POP_TAG();
 
     if (state) {
-	if (state == TAG_RAISE || state == TAG_FATAL) {
-	    rb_threadptr_pending_interrupt_enque(th, th->errinfo);
-	}
-	else {
-	    VALUE err = rb_vm_make_jump_tag_but_local_jump(state, th->errinfo);
-	    if (!NIL_P(err))
-		rb_threadptr_pending_interrupt_enque(th, err);
-	}
-	RUBY_VM_SET_INTERRUPT(th);
+        VALUE err = th->ec->errinfo;
+        VM_ASSERT(FIBER_RESUMED_P(fiber));
+
+        if (state == TAG_RAISE || state == TAG_FATAL) {
+            rb_threadptr_pending_interrupt_enque(th, err);
+        }
+        else {
+            err = rb_vm_make_jump_tag_but_local_jump(state, err);
+            if (!NIL_P(err)) {
+                rb_threadptr_pending_interrupt_enque(th, err);
+            }
+        }
+        need_interrupt = TRUE;
     }
 
-    rb_fiber_terminate(fib);
-    rb_bug("rb_fiber_start: unreachable");
+    rb_fiber_terminate(fiber, need_interrupt);
+    VM_UNREACHABLE(rb_fiber_start);
 }
 
 static rb_fiber_t *
 root_fiber_alloc(rb_thread_t *th)
 {
-    rb_fiber_t *fib;
-    /* no need to allocate vm stack */
-    fib = fiber_t_alloc(fiber_alloc(rb_cFiber));
-    fib->cont.type = ROOT_FIBER_CONTEXT;
-#if FIBER_USE_NATIVE
-#ifdef _WIN32
-    fib->fib_handle = ConvertThreadToFiber(0);
-#endif
+    VALUE fiber_value = fiber_alloc(rb_cFiber);
+    rb_fiber_t *fiber = th->ec->fiber_ptr;
+
+    VM_ASSERT(DATA_PTR(fiber_value) == NULL);
+    VM_ASSERT(fiber->cont.type == FIBER_CONTEXT);
+    VM_ASSERT(fiber->status == FIBER_RESUMED);
+
+    th->root_fiber = fiber;
+    DATA_PTR(fiber_value) = fiber;
+    fiber->cont.self = fiber_value;
+
+#ifdef COROUTINE_PRIVATE_STACK
+    fiber->stack = fiber_pool_stack_acquire(&shared_fiber_pool);
+    coroutine_initialize_main(&fiber->context, fiber_pool_stack_base(&fiber->stack), fiber->stack.available, th->ec->machine.stack_start);
+#else
+    coroutine_initialize_main(&fiber->context);
 #endif
-    fib->status = RUNNING;
 
-    return fib;
+    return fiber;
+}
+
+void
+rb_threadptr_root_fiber_setup(rb_thread_t *th)
+{
+    rb_fiber_t *fiber = ruby_mimmalloc(sizeof(rb_fiber_t));
+    if (!fiber) {
+        rb_bug("%s", strerror(errno)); /* ... is it possible to call rb_bug here? */
+    }
+    MEMZERO(fiber, rb_fiber_t, 1);
+    fiber->cont.type = FIBER_CONTEXT;
+    fiber->cont.saved_ec.fiber_ptr = fiber;
+    fiber->cont.saved_ec.thread_ptr = th;
+    fiber->blocking = 1;
+    fiber_status_set(fiber, FIBER_RESUMED); /* skip CREATED */
+    th->ec = &fiber->cont.saved_ec;
+    // This skips mjit_cont_new for the initial thread because mjit_enabled is always false
+    // at this point. mjit_init calls rb_fiber_init_mjit_cont again for this root_fiber.
+    rb_fiber_init_mjit_cont(fiber);
+}
+
+void
+rb_threadptr_root_fiber_release(rb_thread_t *th)
+{
+    if (th->root_fiber) {
+        /* ignore. A root fiber object will free th->ec */
+    }
+    else {
+        rb_execution_context_t *ec = GET_EC();
+
+        VM_ASSERT(th->ec->fiber_ptr->cont.type == FIBER_CONTEXT);
+        VM_ASSERT(th->ec->fiber_ptr->cont.self == 0);
+
+        if (th->ec == ec) {
+            rb_ractor_set_current_ec(th->ractor, NULL);
+        }
+        fiber_free(th->ec->fiber_ptr);
+        th->ec = NULL;
+    }
+}
+
+void
+rb_threadptr_root_fiber_terminate(rb_thread_t *th)
+{
+    rb_fiber_t *fiber = th->ec->fiber_ptr;
+
+    fiber->status = FIBER_TERMINATED;
+
+    // The vm_stack is `alloca`ed on the thread stack, so it's gone too:
+    rb_ec_clear_vm_stack(th->ec);
 }
 
 static inline rb_fiber_t*
 fiber_current(void)
 {
-    rb_thread_t *th = GET_THREAD();
-    if (th->fiber == 0) {
-	/* save root */
-	rb_fiber_t *fib = root_fiber_alloc(th);
-	th->root_fiber = th->fiber = fib;
+    rb_execution_context_t *ec = GET_EC();
+    if (ec->fiber_ptr->cont.self == 0) {
+        root_fiber_alloc(rb_ec_thread_ptr(ec));
     }
-    return th->fiber;
+    return ec->fiber_ptr;
 }
 
 static inline rb_fiber_t*
-return_fiber(void)
+return_fiber(bool terminate)
 {
-    rb_fiber_t *fib = fiber_current();
-    rb_fiber_t *prev = fib->prev;
-
-    if (!prev) {
-	rb_fiber_t *root_fiber = GET_THREAD()->root_fiber;
+    rb_fiber_t *fiber = fiber_current();
+    rb_fiber_t *prev = fiber->prev;
 
-	if (root_fiber == fib) {
-	    rb_raise(rb_eFiberError, "can't yield from root fiber");
-	}
-	return root_fiber;
+    if (prev) {
+        fiber->prev = NULL;
+        prev->resuming_fiber = Qnil;
+        return prev;
     }
     else {
-	fib->prev = NULL;
-	return prev;
+        if (!terminate) {
+            rb_raise(rb_eFiberError, "attempt to yield on a not resumed fiber");
+        }
+
+        rb_thread_t *th = GET_THREAD();
+        rb_fiber_t *root_fiber = th->root_fiber;
+
+        VM_ASSERT(root_fiber != NULL);
+
+        // search resuming fiber
+        for (fiber = root_fiber;
+             RTEST(fiber->resuming_fiber);
+             fiber = fiber_ptr(fiber->resuming_fiber)) {
+        }
+
+        return fiber;
     }
 }
 
@@ -1348,180 +2184,261 @@ rb_fiber_current(void)
     return fiber_current()->cont.self;
 }
 
+// Prepare to execute next_fiber on the given thread.
 static inline VALUE
-fiber_store(rb_fiber_t *next_fib, rb_thread_t *th)
+fiber_store(rb_fiber_t *next_fiber, rb_thread_t *th)
 {
-    rb_fiber_t *fib;
+    rb_fiber_t *fiber;
 
-    if (th->fiber) {
-	fib = th->fiber;
-	cont_save_thread(&fib->cont, th);
+    if (th->ec->fiber_ptr != NULL) {
+        fiber = th->ec->fiber_ptr;
     }
     else {
-	/* create current fiber */
-	fib = root_fiber_alloc(th);
-	th->root_fiber = th->fiber = fib;
+        /* create root fiber */
+        fiber = root_fiber_alloc(th);
     }
 
-#if FIBER_USE_NATIVE
-    fiber_setcontext(next_fib, fib);
-    /* restored */
-#ifndef _WIN32
-    if (terminated_machine_stack.ptr) {
-	if (machine_stack_cache_index < MAX_MACHINE_STACK_CACHE) {
-	    machine_stack_cache[machine_stack_cache_index].ptr = terminated_machine_stack.ptr;
-	    machine_stack_cache[machine_stack_cache_index].size = terminated_machine_stack.size;
-	    machine_stack_cache_index++;
-	}
-	else {
-	    if (terminated_machine_stack.ptr != fib->cont.machine.stack) {
-		munmap((void*)terminated_machine_stack.ptr, terminated_machine_stack.size * sizeof(VALUE));
-	    }
-	    else {
-		rb_bug("terminated fiber resumed");
-	    }
-	}
-	terminated_machine_stack.ptr = NULL;
-	terminated_machine_stack.size = 0;
-    }
-#endif /* not _WIN32 */
-    fib = th->fiber;
-    if (fib->cont.argc == -1) rb_exc_raise(fib->cont.value);
-    return fib->cont.value;
-
-#else /* FIBER_USE_NATIVE */
-    cont_save_machine_stack(th, &fib->cont);
-    if (ruby_setjmp(fib->cont.jmpbuf)) {
-	/* restored */
-	fib = th->fiber;
-	if (fib->cont.argc == -1) rb_exc_raise(fib->cont.value);
-	if (next_fib->cont.value == Qundef) {
-	    cont_restore_0(&next_fib->cont, &next_fib->cont.value);
-	    rb_bug("rb_fiber_resume: unreachable");
-	}
-	return fib->cont.value;
+    if (FIBER_CREATED_P(next_fiber)) {
+        fiber_prepare_stack(next_fiber);
     }
-    else {
-	VALUE undef = Qundef;
-	cont_restore_0(&next_fib->cont, &undef);
-	rb_bug("rb_fiber_resume: unreachable");
-    }
-#endif /* FIBER_USE_NATIVE */
+
+    VM_ASSERT(FIBER_RESUMED_P(fiber) || FIBER_TERMINATED_P(fiber));
+    VM_ASSERT(FIBER_RUNNABLE_P(next_fiber));
+
+    if (FIBER_RESUMED_P(fiber)) fiber_status_set(fiber, FIBER_SUSPENDED);
+
+    fiber_status_set(next_fiber, FIBER_RESUMED);
+    fiber_setcontext(next_fiber, fiber);
+
+    fiber = th->ec->fiber_ptr;
+
+    /* Raise an exception if that was the result of executing the fiber */
+    if (fiber->cont.argc == -1) rb_exc_raise(fiber->cont.value);
+
+    return fiber->cont.value;
 }
 
 static inline VALUE
-fiber_switch(rb_fiber_t *fib, int argc, const VALUE *argv, int is_resume)
+fiber_switch(rb_fiber_t *fiber, int argc, const VALUE *argv, int kw_splat, VALUE resuming_fiber, bool yielding)
 {
     VALUE value;
-    rb_context_t *cont = &fib->cont;
+    rb_context_t *cont = &fiber->cont;
     rb_thread_t *th = GET_THREAD();
 
-    if (th->fiber == fib) {
-	/* ignore fiber context switch
+    /* make sure the root_fiber object is available */
+    if (th->root_fiber == NULL) root_fiber_alloc(th);
+
+    if (th->ec->fiber_ptr == fiber) {
+        /* ignore fiber context switch
          * because destination fiber is same as current fiber
-	 */
-	return make_passing_arg(argc, argv);
+         */
+        return make_passing_arg(argc, argv);
     }
 
-    if (cont->saved_thread.self != th->self) {
-	rb_raise(rb_eFiberError, "fiber called across threads");
+    if (cont_thread_value(cont) != th->self) {
+        rb_raise(rb_eFiberError, "fiber called across threads");
     }
-    else if (cont->saved_thread.protect_tag != th->protect_tag) {
-	rb_raise(rb_eFiberError, "fiber called across stack rewinding barrier");
+    else if (cont->saved_ec.protect_tag != th->ec->protect_tag) {
+        rb_raise(rb_eFiberError, "fiber called across stack rewinding barrier");
     }
-    else if (fib->status == TERMINATED) {
-	value = rb_exc_new2(rb_eFiberError, "dead fiber called");
+    else if (FIBER_TERMINATED_P(fiber)) {
+        value = rb_exc_new2(rb_eFiberError, "dead fiber called");
 
-	if (th->fiber->status != TERMINATED) rb_exc_raise(value);
+        if (!FIBER_TERMINATED_P(th->ec->fiber_ptr)) {
+            rb_exc_raise(value);
+            VM_UNREACHABLE(fiber_switch);
+        }
+        else {
+            /* th->ec->fiber_ptr is also dead => switch to root fiber */
+            /* (this means we're being called from rb_fiber_terminate, */
+            /* and the terminated fiber's return_fiber() is already dead) */
+            VM_ASSERT(FIBER_SUSPENDED_P(th->root_fiber));
 
-	/* th->fiber is also dead => switch to root fiber */
-	/* (this means we're being called from rb_fiber_terminate, */
-	/* and the terminated fiber's return_fiber() is already dead) */
-	cont = &th->root_fiber->cont;
-	cont->argc = -1;
-	cont->value = value;
-#if FIBER_USE_NATIVE
-	fiber_setcontext(th->root_fiber, th->fiber);
-#else
-	cont_restore_0(cont, &value);
-#endif
-	/* unreachable */
+            cont = &th->root_fiber->cont;
+            cont->argc = -1;
+            cont->value = value;
+
+            fiber_setcontext(th->root_fiber, th->ec->fiber_ptr);
+
+            VM_UNREACHABLE(fiber_switch);
+        }
+    }
+
+    VM_ASSERT(FIBER_RUNNABLE_P(fiber));
+
+    rb_fiber_t *current_fiber = fiber_current();
+
+    VM_ASSERT(!RTEST(current_fiber->resuming_fiber));
+    if (RTEST(resuming_fiber)) {
+        current_fiber->resuming_fiber = resuming_fiber;
+        fiber->prev = fiber_current();
+        fiber->yielding = 0;
     }
 
-    if (is_resume) {
-	fib->prev = fiber_current();
+    VM_ASSERT(!current_fiber->yielding);
+    if (yielding) {
+        current_fiber->yielding = 1;
     }
-    else {
-	/* restore `tracing' context. see [Feature #4347] */
-	th->trace_arg = cont->saved_thread.trace_arg;
+
+    if (current_fiber->blocking) {
+        th->blocking -= 1;
     }
 
     cont->argc = argc;
+    cont->kw_splat = kw_splat;
     cont->value = make_passing_arg(argc, argv);
 
-    value = fiber_store(fib, th);
-    RUBY_VM_CHECK_INTS(th);
+    value = fiber_store(fiber, th);
+
+    if (RTEST(resuming_fiber) && FIBER_TERMINATED_P(fiber)) {
+        fiber_stack_release(fiber);
+    }
+
+    if (fiber_current()->blocking) {
+        th->blocking += 1;
+    }
+
+    RUBY_VM_CHECK_INTS(th->ec);
 
-    EXEC_EVENT_HOOK(th, RUBY_EVENT_FIBER_SWITCH, th->self, 0, 0, Qnil);
+    EXEC_EVENT_HOOK(th->ec, RUBY_EVENT_FIBER_SWITCH, th->self, 0, 0, 0, Qnil);
 
     return value;
 }
 
 VALUE
-rb_fiber_transfer(VALUE fibval, int argc, const VALUE *argv)
+rb_fiber_transfer(VALUE fiber_value, int argc, const VALUE *argv)
+{
+    return fiber_switch(fiber_ptr(fiber_value), argc, argv, RB_NO_KEYWORDS, Qfalse, false);
+}
+
+/*
+ *  call-seq:
+ *     fiber.blocking? -> true or false
+ *
+ *  Returns +true+ if +fiber+ is blocking and +false+ otherwise.
+ *  Fiber is non-blocking if it was created via passing <tt>blocking: false</tt>
+ *  to Fiber.new, or via Fiber.schedule.
+ *
+ *  Note, that even if the method returns +false+, Fiber behaves differently
+ *  only if Fiber.scheduler is set in the current thread.
+ *
+ *  See the "Non-blocking fibers" section in class docs for details.
+ *
+ */
+VALUE
+rb_fiber_blocking_p(VALUE fiber)
+{
+    return (fiber_ptr(fiber)->blocking == 0) ? Qfalse : Qtrue;
+}
+
+/*
+ *  call-seq:
+ *     Fiber.blocking? -> false or number
+ *
+ *  Returns +false+ if the current fiber is non-blocking.
+ *  Fiber is non-blocking if it was created via passing <tt>blocking: false</tt>
+ *  to Fiber.new, or via Fiber.schedule.
+ *
+ *  If the current Fiber is blocking, the method, unlike usual
+ *  predicate methods, returns a *number* of blocking fibers currently
+ *  running (TBD: always 1?).
+ *
+ *  Note, that even if the method returns +false+, Fiber behaves differently
+ *  only if Fiber.scheduler is set in the current thread.
+ *
+ *  See the "Non-blocking fibers" section in class docs for details.
+ *
+ */
+static VALUE
+rb_f_fiber_blocking_p(VALUE klass)
+{
+    rb_thread_t *thread = GET_THREAD();
+    unsigned blocking = thread->blocking;
+
+    if (blocking == 0)
+        return Qfalse;
+
+    return INT2NUM(blocking);
+}
+
+void
+rb_fiber_close(rb_fiber_t *fiber)
 {
-    rb_fiber_t *fib;
-    GetFiberPtr(fibval, fib);
-    return fiber_switch(fib, argc, argv, 0);
+    fiber_status_set(fiber, FIBER_TERMINATED);
 }
 
 static void
-rb_fiber_terminate(rb_fiber_t *fib)
-{
-    VALUE value = fib->cont.value;
-    fib->status = TERMINATED;
-#if FIBER_USE_NATIVE && !defined(_WIN32)
-    /* Ruby must not switch to other thread until storing terminated_machine_stack */
-    terminated_machine_stack.ptr = fib->ss_sp;
-    terminated_machine_stack.size = fib->ss_size / sizeof(VALUE);
-    fib->ss_sp = NULL;
-    fib->context.uc_stack.ss_sp = NULL;
-    fib->cont.machine.stack = NULL;
-    fib->cont.machine.stack_size = 0;
-#endif
-    fiber_switch(return_fiber(), 1, &value, 0);
+rb_fiber_terminate(rb_fiber_t *fiber, int need_interrupt)
+{
+    VALUE value = fiber->cont.value;
+    rb_fiber_t *next_fiber;
+
+    VM_ASSERT(FIBER_RESUMED_P(fiber));
+    rb_fiber_close(fiber);
+
+    coroutine_destroy(&fiber->context);
+
+    fiber->cont.machine.stack = NULL;
+    fiber->cont.machine.stack_size = 0;
+
+    next_fiber = return_fiber(true);
+    if (need_interrupt) RUBY_VM_SET_INTERRUPT(&next_fiber->cont.saved_ec);
+    fiber_switch(next_fiber, 1, &value, RB_NO_KEYWORDS, Qfalse, false);
+    ruby_stop(0);
 }
 
 VALUE
-rb_fiber_resume(VALUE fibval, int argc, const VALUE *argv)
+rb_fiber_resume_kw(VALUE fiber_value, int argc, const VALUE *argv, int kw_splat)
 {
-    rb_fiber_t *fib;
-    GetFiberPtr(fibval, fib);
+    rb_fiber_t *fiber = fiber_ptr(fiber_value);
+    rb_fiber_t *current_fiber = fiber_current();
 
-    if (fib->prev != 0 || fib->cont.type == ROOT_FIBER_CONTEXT) {
-	rb_raise(rb_eFiberError, "double resume");
+    if (argc == -1 && FIBER_CREATED_P(fiber)) {
+        rb_raise(rb_eFiberError, "cannot raise exception on unborn fiber");
+    }
+    else if (FIBER_TERMINATED_P(fiber)) {
+        rb_raise(rb_eFiberError, "attempt to resume a terminated fiber");
     }
-    if (fib->transferred != 0) {
-	rb_raise(rb_eFiberError, "cannot resume transferred Fiber");
+    else if (fiber == current_fiber) {
+        rb_raise(rb_eFiberError, "attempt to resume the current fiber");
+    }
+    else if (fiber->prev != NULL) {
+        rb_raise(rb_eFiberError, "attempt to resume a resumed fiber (double resume)");
+    }
+    else if (RTEST(fiber->resuming_fiber)) {
+        rb_raise(rb_eFiberError, "attempt to resume a resuming fiber");
+    }
+    else if (fiber->prev == NULL &&
+             (!fiber->yielding && fiber->status != FIBER_CREATED)) {
+        rb_raise(rb_eFiberError, "attempt to resume a transferring fiber");
     }
 
-    return fiber_switch(fib, argc, argv, 1);
+    return fiber_switch(fiber, argc, argv, kw_splat, fiber_value, false);
+}
+
+VALUE
+rb_fiber_resume(VALUE fiber_value, int argc, const VALUE *argv)
+{
+    return rb_fiber_resume_kw(fiber_value, argc, argv, RB_NO_KEYWORDS);
+}
+
+VALUE
+rb_fiber_yield_kw(int argc, const VALUE *argv, int kw_splat)
+{
+    return fiber_switch(return_fiber(false), argc, argv, kw_splat, Qfalse, true);
 }
 
 VALUE
 rb_fiber_yield(int argc, const VALUE *argv)
 {
-    return fiber_switch(return_fiber(), argc, argv, 0);
+    return fiber_switch(return_fiber(false), argc, argv, RB_NO_KEYWORDS, Qfalse, true);
 }
 
 void
-rb_fiber_reset_root_local_storage(VALUE thval)
+rb_fiber_reset_root_local_storage(rb_thread_t *th)
 {
-    rb_thread_t *th;
-
-    GetThreadPtr(thval, th);
-    if (th->root_fiber && th->root_fiber != th->fiber) {
-	th->local_storage = th->root_fiber->cont.saved_thread.local_storage;
+    if (th->root_fiber && th->root_fiber != th->ec->fiber_ptr) {
+        th->ec->local_storage = th->root_fiber->cont.saved_ec.local_storage;
     }
 }
 
@@ -1535,32 +2452,146 @@ rb_fiber_reset_root_local_storage(VALUE thval)
  *  before using this method.
  */
 VALUE
-rb_fiber_alive_p(VALUE fibval)
+rb_fiber_alive_p(VALUE fiber_value)
 {
-    rb_fiber_t *fib;
-    GetFiberPtr(fibval, fib);
-    return fib->status != TERMINATED ? Qtrue : Qfalse;
+    return FIBER_TERMINATED_P(fiber_ptr(fiber_value)) ? Qfalse : Qtrue;
 }
 
 /*
  *  call-seq:
  *     fiber.resume(args, ...) -> obj
  *
- *  Resumes the fiber from the point at which the last <code>Fiber.yield</code>
- *  was called, or starts running it if it is the first call to
- *  <code>resume</code>. Arguments passed to resume will be the value of
- *  the <code>Fiber.yield</code> expression or will be passed as block
- *  parameters to the fiber's block if this is the first <code>resume</code>.
+ *  Resumes the fiber from the point at which the last Fiber.yield was
+ *  called, or starts running it if it is the first call to
+ *  #resume. Arguments passed to resume will be the value of the
+ *  Fiber.yield expression or will be passed as block parameters to
+ *  the fiber's block if this is the first #resume.
  *
  *  Alternatively, when resume is called it evaluates to the arguments passed
- *  to the next <code>Fiber.yield</code> statement inside the fiber's block
+ *  to the next Fiber.yield statement inside the fiber's block
  *  or to the block value if it runs to completion without any
- *  <code>Fiber.yield</code>
+ *  Fiber.yield
  */
 static VALUE
-rb_fiber_m_resume(int argc, VALUE *argv, VALUE fib)
+rb_fiber_m_resume(int argc, VALUE *argv, VALUE fiber)
 {
-    return rb_fiber_resume(fib, argc, argv);
+    return rb_fiber_resume_kw(fiber, argc, argv, rb_keyword_given_p());
+}
+
+static VALUE rb_fiber_transfer_kw(VALUE fiber_value, int argc, VALUE *argv, int kw_splat);
+
+/*
+ *  call-seq:
+ *     fiber.raise                                 -> obj
+ *     fiber.raise(string)                         -> obj
+ *     fiber.raise(exception [, string [, array]]) -> obj
+ *
+ *  Raises an exception in the fiber at the point at which the last
+ *  +Fiber.yield+ was called. If the fiber has not been started or has
+ *  already run to completion, raises +FiberError+. If the fiber is
+ *  yielding, it is resumed. If it is transferring, it is transferred into.
+ *  But if it is resuming, raises +FiberError+.
+ *
+ *  With no arguments, raises a +RuntimeError+. With a single +String+
+ *  argument, raises a +RuntimeError+ with the string as a message.  Otherwise,
+ *  the first parameter should be the name of an +Exception+ class (or an
+ *  object that returns an +Exception+ object when sent an +exception+
+ *  message). The optional second parameter sets the message associated with
+ *  the exception, and the third parameter is an array of callback information.
+ *  Exceptions are caught by the +rescue+ clause of <code>begin...end</code>
+ *  blocks.
+ */
+static VALUE
+rb_fiber_raise(int argc, VALUE *argv, VALUE fiber_value)
+{
+    rb_fiber_t *fiber = fiber_ptr(fiber_value);
+    VALUE exc = rb_make_exception(argc, argv);
+    if (RTEST(fiber->resuming_fiber)) {
+        rb_raise(rb_eFiberError, "attempt to raise a resuming fiber");
+    }
+    else if (FIBER_SUSPENDED_P(fiber) && !fiber->yielding) {
+        return rb_fiber_transfer_kw(fiber_value, -1, &exc, RB_NO_KEYWORDS);
+    }
+    else {
+        return rb_fiber_resume_kw(fiber_value, -1, &exc, RB_NO_KEYWORDS);
+    }
+}
+
+/*
+ *  call-seq:
+ *     fiber.backtrace -> array
+ *     fiber.backtrace(start) -> array
+ *     fiber.backtrace(start, count) -> array
+ *     fiber.backtrace(start..end) -> array
+ *
+ *  Returns the current execution stack of the fiber. +start+, +count+ and +end+ allow
+ *  to select only parts of the backtrace.
+ *
+ *     def level3
+ *       Fiber.yield
+ *     end
+ *
+ *     def level2
+ *       level3
+ *     end
+ *
+ *     def level1
+ *       level2
+ *     end
+ *
+ *     f = Fiber.new { level1 }
+ *
+ *     # It is empty before the fiber started
+ *     f.backtrace
+ *     #=> []
+ *
+ *     f.resume
+ *
+ *     f.backtrace
+ *     #=> ["test.rb:2:in `yield'", "test.rb:2:in `level3'", "test.rb:6:in `level2'", "test.rb:10:in `level1'", "test.rb:13:in `block in <main>'"]
+ *     p f.backtrace(1) # start from the item 1
+ *     #=> ["test.rb:2:in `level3'", "test.rb:6:in `level2'", "test.rb:10:in `level1'", "test.rb:13:in `block in <main>'"]
+ *     p f.backtrace(2, 2) # start from item 2, take 2
+ *     #=> ["test.rb:6:in `level2'", "test.rb:10:in `level1'"]
+ *     p f.backtrace(1..3) # take items from 1 to 3
+ *     #=> ["test.rb:2:in `level3'", "test.rb:6:in `level2'", "test.rb:10:in `level1'"]
+ *
+ *     f.resume
+ *
+ *     # It is nil after the fiber is finished
+ *     f.backtrace
+ *     #=> nil
+ *
+ */
+static VALUE
+rb_fiber_backtrace(int argc, VALUE *argv, VALUE fiber)
+{
+    return rb_vm_backtrace(argc, argv, &fiber_ptr(fiber)->cont.saved_ec);
+}
+
+/*
+ *  call-seq:
+ *     fiber.backtrace_locations -> array
+ *     fiber.backtrace_locations(start) -> array
+ *     fiber.backtrace_locations(start, count) -> array
+ *     fiber.backtrace_locations(start..end) -> array
+ *
+ *  Like #backtrace, but returns each line of the execution stack as a
+ *  Thread::Backtrace::Location. Accepts the same arguments as #backtrace.
+ *
+ *    f = Fiber.new { Fiber.yield }
+ *    f.resume
+ *    loc = f.backtrace_locations.first
+ *    loc.label  #=> "yield"
+ *    loc.path   #=> "test.rb"
+ *    loc.lineno #=> 1
+ *
+ *
+ */
+static VALUE
+rb_fiber_backtrace_locations(int argc, VALUE *argv, VALUE fiber)
+{
+    return rb_vm_backtrace_locations(argc, argv, &fiber_ptr(fiber)->cont.saved_ec);
 }
 
 /*
@@ -1570,51 +2601,101 @@ rb_fiber_m_resume(int argc, VALUE *argv, VALUE fib)
  *  Transfer control to another fiber, resuming it from where it last
  *  stopped or starting it if it was not resumed before. The calling
  *  fiber will be suspended much like in a call to
- *  <code>Fiber.yield</code>. You need to <code>require 'fiber'</code>
+ *  Fiber.yield. You need to <code>require 'fiber'</code>
  *  before using this method.
  *
  *  The fiber which receives the transfer call is treats it much like
  *  a resume call. Arguments passed to transfer are treated like those
  *  passed to resume.
  *
- *  You cannot resume a fiber that transferred control to another one.
- *  This will cause a double resume error. You need to transfer control
- *  back to this fiber before it can yield and resume.
+ *  The two style of control passing to and from fiber (one is #resume and
+ *  Fiber::yield, another is #transfer to and from fiber) can't be freely
+ *  mixed.
+ *
+ *  * If the Fiber's lifecycle had started with transfer, it will never
+ *    be able to yield or be resumed control passing, only
+ *    finish or transfer back. (It still can resume other fibers that
+ *    are allowed to be resumed.)
+ *  * If the Fiber's lifecycle had started with resume, it can yield
+ *    or transfer to another Fiber, but can receive control back only
+ *    the way compatible with the way it was given away: if it had
+ *    transferred, it only can be transferred back, and if it had
+ *    yielded, it only can be resumed back. After that, it again can
+ *    transfer or yield.
+ *
+ *  If those rules are broken FiberError is raised.
+ *
+ *  For an individual Fiber design, yield/resume is more easy to use
+ *  style (the Fiber just gives away control, it doesn't need to think
+ *  about who the control is given to), while transfer is more flexible
+ *  for complex cases, allowing to build arbitrary graphs of Fibers
+ *  dependent on each other.
+ *
  *
  *  Example:
  *
- *    fiber1 = Fiber.new do
- *      puts "In Fiber 1"
- *      Fiber.yield
- *    end
+ *     require 'fiber'
  *
- *    fiber2 = Fiber.new do
- *      puts "In Fiber 2"
- *      fiber1.transfer
- *      puts "Never see this message"
- *    end
+ *     manager = nil # For local var to be visible inside worker block
  *
- *    fiber3 = Fiber.new do
- *      puts "In Fiber 3"
- *    end
+ *     # This fiber would be started with transfer
+ *     # It can't yield, and can't be resumed
+ *     worker = Fiber.new { |work|
+ *       puts "Worker: starts"
+ *       puts "Worker: Performed #{work.inspect}, transferring back"
+ *       # Fiber.yield     # this would raise FiberError: attempt to yield on a not resumed fiber
+ *       # manager.resume  # this would raise FiberError: attempt to resume a resumed fiber (double resume)
+ *       manager.transfer(work.capitalize)
+ *     }
+ *
+ *     # This fiber would be started with resume
+ *     # It can yield or transfer, and can be transferred
+ *     # back or resumed
+ *     manager = Fiber.new {
+ *       puts "Manager: starts"
+ *       puts "Manager: transferring 'something' to worker"
+ *       result = worker.transfer('something')
+ *       puts "Manager: worker returned #{result.inspect}"
+ *       # worker.resume    # this would raise FiberError: attempt to resume a transferring fiber
+ *       Fiber.yield        # this is OK, the fiber transferred from and to, now it can yield
+ *       puts "Manager: finished"
+ *     }
  *
- *    fiber2.resume
- *    fiber3.resume
+ *     puts "Starting the manager"
+ *     manager.resume
+ *     puts "Resuming the manager"
+ *     # manager.transfer  # this would raise FiberError: attempt to transfer to a yielding fiber
+ *     manager.resume
  *
  *  <em>produces</em>
  *
- *    In fiber 2
- *    In fiber 1
- *    In fiber 3
+ *     Starting the manager
+ *     Manager: starts
+ *     Manager: transferring 'something' to worker
+ *     Worker: starts
+ *     Worker: Performed "something", transferring back
+ *     Manager: worker returned "Something"
+ *     Resuming the manager
+ *     Manager: finished
  *
  */
 static VALUE
-rb_fiber_m_transfer(int argc, VALUE *argv, VALUE fibval)
+rb_fiber_m_transfer(int argc, VALUE *argv, VALUE fiber_value)
 {
-    rb_fiber_t *fib;
-    GetFiberPtr(fibval, fib);
-    fib->transferred = 1;
-    return fiber_switch(fib, argc, argv, 0);
+    return rb_fiber_transfer_kw(fiber_value, argc, argv, rb_keyword_given_p());
+}
+
+static VALUE
+rb_fiber_transfer_kw(VALUE fiber_value, int argc, VALUE *argv, int kw_splat)
+{
+    rb_fiber_t *fiber = fiber_ptr(fiber_value);
+    if (RTEST(fiber->resuming_fiber)) {
+        rb_raise(rb_eFiberError, "attempt to transfer to a resuming fiber");
+    }
+    if (fiber->yielding) {
+        rb_raise(rb_eFiberError, "attempt to transfer to a yielding fiber");
+    }
+    return fiber_switch(fiber, argc, argv, kw_splat, Qfalse, false);
 }
 
 /*
@@ -1623,14 +2704,14 @@ rb_fiber_m_transfer(int argc, VALUE *argv, VALUE fibval)
  *
  *  Yields control back to the context that resumed the fiber, passing
  *  along any arguments that were passed to it. The fiber will resume
- *  processing at this point when <code>resume</code> is called next.
- *  Any arguments passed to the next <code>resume</code> will be the
- *  value that this <code>Fiber.yield</code> expression evaluates to.
+ *  processing at this point when #resume is called next.
+ *  Any arguments passed to the next #resume will be the value that
+ *  this Fiber.yield expression evaluates to.
  */
 static VALUE
 rb_fiber_s_yield(int argc, VALUE *argv, VALUE klass)
 {
-    return rb_fiber_yield(argc, argv);
+    return rb_fiber_yield_kw(argc, argv, rb_keyword_given_p());
 }
 
 /*
@@ -1647,7 +2728,119 @@ rb_fiber_s_current(VALUE klass)
     return rb_fiber_current();
 }
 
+/*
+ * call-seq:
+ *   fiber.to_s   -> string
+ *
+ * Returns fiber information string.
+ *
+ */
+
+static VALUE
+fiber_to_s(VALUE fiber_value)
+{
+    const rb_fiber_t *fiber = fiber_ptr(fiber_value);
+    const rb_proc_t *proc;
+    char status_info[0x20];
+
+    if (RTEST(fiber->resuming_fiber)) {
+        snprintf(status_info, 0x20, " (%s by resuming)", fiber_status_name(fiber->status));
+    }
+    else {
+        snprintf(status_info, 0x20, " (%s)", fiber_status_name(fiber->status));
+    }
+
+    if (!rb_obj_is_proc(fiber->first_proc)) {
+        VALUE str = rb_any_to_s(fiber_value);
+        strlcat(status_info, ">", sizeof(status_info));
+        rb_str_set_len(str, RSTRING_LEN(str)-1);
+        rb_str_cat_cstr(str, status_info);
+        return str;
+    }
+    GetProcPtr(fiber->first_proc, proc);
+    return rb_block_to_s(fiber_value, &proc->block, status_info);
+}
+
+#ifdef HAVE_WORKING_FORK
+void
+rb_fiber_atfork(rb_thread_t *th)
+{
+    if (th->root_fiber) {
+        if (&th->root_fiber->cont.saved_ec != th->ec) {
+            th->root_fiber = th->ec->fiber_ptr;
+        }
+        th->root_fiber->prev = 0;
+    }
+}
+#endif
+
+#ifdef RB_EXPERIMENTAL_FIBER_POOL
+static void
+fiber_pool_free(void *ptr)
+{
+    struct fiber_pool * fiber_pool = ptr;
+    RUBY_FREE_ENTER("fiber_pool");
+
+    fiber_pool_free_allocations(fiber_pool->allocations);
+    ruby_xfree(fiber_pool);
+
+    RUBY_FREE_LEAVE("fiber_pool");
+}
+
+static size_t
+fiber_pool_memsize(const void *ptr)
+{
+    const struct fiber_pool * fiber_pool = ptr;
+    size_t size = sizeof(*fiber_pool);
+
+    size += fiber_pool->count * fiber_pool->size;
+
+    return size;
+}
+
+static const rb_data_type_t FiberPoolDataType = {
+    "fiber_pool",
+    {NULL, fiber_pool_free, fiber_pool_memsize,},
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+static VALUE
+fiber_pool_alloc(VALUE klass)
+{
+    struct fiber_pool * fiber_pool = RB_ALLOC(struct fiber_pool);
+
+    return TypedData_Wrap_Struct(klass, &FiberPoolDataType, fiber_pool);
+}
+
+static VALUE
+rb_fiber_pool_initialize(int argc, VALUE* argv, VALUE self)
+{
+    rb_thread_t *th = GET_THREAD();
+    VALUE size = Qnil, count = Qnil, vm_stack_size = Qnil;
+    struct fiber_pool * fiber_pool = NULL;
 
+    // Maybe these should be keyword arguments.
+    rb_scan_args(argc, argv, "03", &size, &count, &vm_stack_size);
+
+    if (NIL_P(size)) {
+        size = INT2NUM(th->vm->default_params.fiber_machine_stack_size);
+    }
+
+    if (NIL_P(count)) {
+        count = INT2NUM(128);
+    }
+
+    if (NIL_P(vm_stack_size)) {
+        vm_stack_size = INT2NUM(th->vm->default_params.fiber_vm_stack_size);
+    }
+
+    TypedData_Get_Struct(self, struct fiber_pool, &FiberPoolDataType, fiber_pool);
+
+    fiber_pool_initialize(fiber_pool, NUM2SIZET(size), NUM2SIZET(count), NUM2SIZET(vm_stack_size));
+
+    return self;
+}
+#endif
 
 /*
  *  Document-class: FiberError
@@ -1662,11 +2855,198 @@ rb_fiber_s_current(VALUE klass)
  *     fiber.resume #=> FiberError: dead fiber called
  */
 
+/*
+ *  Document-class: Fiber::SchedulerInterface
+ *
+ *  This is not an existing class, but documentation of the interface that Scheduler
+ *  object should comply in order to be used as Fiber.scheduler and handle non-blocking
+ *  fibers. See also the "Non-blocking fibers" section in Fiber class docs for explanations
+ *  of some concepts.
+ *
+ *  Scheduler's behavior and usage are expected to be as follows:
+ *
+ *  * When the execution in the non-blocking Fiber reaches some blocking operation (like
+ *    sleep, wait for a process, or a non-ready I/O), it calls some of the scheduler's
+ *    hook methods, listed below.
+ *  * Scheduler somehow registers what the current fiber is waited for, and yields control
+ *    to other fibers with Fiber.yield (so the fiber would be suspended while expecting its
+ *    wait to end, and other fibers in the same thread can perform)
+ *  * At the end of the current thread execution, the scheduler's method #close is called
+ *  * The scheduler runs into a wait loop, checking all the blocked fibers (which it has
+ *    registered on hook calls) and resuming them when the awaited resource is ready (I/O
+ *    ready, sleep time passed).
+ *
+ *  A typical implementation would probably rely for this closing loop on a gem like
+ *  EventMachine[https://github.com/eventmachine/eventmachine] or
+ *  Async[https://github.com/socketry/async].
+ *
+ *  This way concurrent execution will be achieved in a way that is transparent for every
+ *  individual Fiber's code.
+ *
+ *  Hook methods are:
+ *
+ *  * #io_wait
+ *  * #process_wait
+ *  * #kernel_sleep
+ *  * #block and #unblock
+ *  * (the list is expanded as Ruby developers make more methods having non-blocking calls)
+ *
+ *  When not specified otherwise, the hook implementations are mandatory: if they are not
+ *  implemented, the methods trying to call hook will fail. To provide backward compatibility,
+ *  in the future hooks will be optional (if they are not implemented, due to the scheduler
+ *  being created for the older Ruby version, the code which needs this hook will not fail,
+ *  and will just behave in a blocking fashion).
+ *
+ *  It is also strongly suggested that the scheduler implement the #fiber method, which is
+ *  delegated to by Fiber.schedule.
+ *
+ *  Sample _toy_ implementation of the scheduler can be found in Ruby's code, in
+ *  <tt>test/fiber/scheduler.rb</tt>
+ *
+ */
+
+#if 0 /* for RDoc */
+/*
+ *
+ *  Document-method: Fiber::SchedulerInterface#close
+ *
+ *  Called when the current thread exits. The scheduler is expected to implement this
+ *  method in order to allow all waiting fibers to finalize their execution.
+ *
+ *  The suggested pattern is to implement the main event loop in the #close method.
+ *
+ */
+static VALUE
+rb_fiber_scheduler_interface_close(VALUE self)
+{
+}
+
+/*
+ *  Document-method: SchedulerInterface#process_wait
+ *  call-seq: process_wait(pid, flags)
+ *
+ *  Invoked by Process::Status.wait in order to wait for a specified process.
+ *  See that method description for arguments description.
+ *
+ *  Suggested minimal implementation:
+ *
+ *      Thread.new do
+ *        Process::Status.wait(pid, flags)
+ *      end.value
+ *
+ *  This hook is optional: if it is not present in the current scheduler,
+ *  Process::Status.wait will behave as a blocking method.
+ *
+ *  Expected to returns a Process::Status instance.
+ */
+static VALUE
+rb_fiber_scheduler_interface_process_wait(VALUE self)
+{
+}
+
+/*
+ *  Document-method: SchedulerInterface#io_wait
+ *  call-seq: io_wait(io, events, timeout)
+ *
+ *  Invoked by IO#wait, IO#wait_readable, IO#wait_writable to ask whether the
+ *  specified descriptor is ready for specified events within
+ *  the specified +timeout+.
+ *
+ *  +events+ is a bit mask of <tt>IO::READABLE</tt>, <tt>IO::WRITABLE</tt>, and
+ *  <tt>IO::PRIORITY</tt>.
+ *
+ *  Suggested implementation should register which Fiber is waiting for which
+ *  resources and immediately calling Fiber.yield to pass control to other
+ *  fibers. Then, in the #close method, the scheduler might dispatch all the
+ *  I/O resources to fibers waiting for it.
+ *
+ *  Expected to return the subset of events that are ready immediately.
+ *
+ */
+static VALUE
+rb_fiber_scheduler_interface_io_wait(VALUE self)
+{
+}
+
+/*
+ *  Document-method: SchedulerInterface#kernel_sleep
+ *  call-seq: kernel_sleep(duration = nil)
+ *
+ *  Invoked by Kernel#sleep and Mutex#sleep and is expected to provide
+ *  an implementation of sleeping in a non-blocking way. Implementation might
+ *  register the current fiber in some list of "what fiber waits till what
+ *  moment", call Fiber.yield to pass control, and then in #close resume
+ *  the fibers whose wait period have ended.
+ *
+ */
+static VALUE
+rb_fiber_scheduler_interface_kernel_sleep(VALUE self)
+{
+}
+
+/*
+ *  Document-method: SchedulerInterface#block
+ *  call-seq: block(blocker, timeout = nil)
+ *
+ *  Invoked by methods like Thread.join, and by Mutex, to signify that current
+ *  Fiber is blocked till further notice (e.g. #unblock) or till +timeout+ will
+ *  pass.
+ *
+ *  +blocker+ is what we are waiting on, informational only (for debugging and
+ *  logging). There are no guarantees about its value.
+ *
+ *  Expected to return boolean, specifying whether the blocking operation was
+ *  successful or not.
+ */
+static VALUE
+rb_fiber_scheduler_interface_block(VALUE self)
+{
+}
+
+/*
+ *  Document-method: SchedulerInterface#unblock
+ *  call-seq: unblock(blocker, fiber)
+ *
+ *  Invoked to wake up Fiber previously blocked with #block (for example, Mutex#lock
+ *  calls #block and Mutex#unlock calls #unblock). The scheduler should use
+ *  the +fiber+ parameter to understand which fiber is unblocked.
+ *
+ *  +blocker+ is what was awaited for, but it is informational only (for debugging
+ *  and logging), and it is not guaranteed to be the same value as the +blocker+ for
+ *  #block.
+ *
+ */
+static VALUE
+rb_fiber_scheduler_interface_unblock(VALUE self)
+{
+}
+
+/*
+ *  Document-method: SchedulerInterface#fiber
+ *  call-seq: fiber(&block)
+ *
+ *  Implementation of the Fiber.schedule. The method is <em>expected</em> to immediately
+ *  run passed block of code in a separate non-blocking fiber, and to return that Fiber.
+ *
+ *  Minimal suggested implementation is:
+ *
+ *     def fiber(&block)
+ *       Fiber.new(blocking: false, &block).tap(&:resume)
+ *     end
+ */
+static VALUE
+rb_fiber_scheduler_interface_fiber(VALUE self)
+{
+}
+#endif
+
 void
 Init_Cont(void)
 {
-#if FIBER_USE_NATIVE
     rb_thread_t *th = GET_THREAD();
+    size_t vm_stack_size = th->vm->default_params.fiber_vm_stack_size;
+    size_t machine_stack_size = th->vm->default_params.fiber_machine_stack_size;
+    size_t stack_size = machine_stack_size + vm_stack_size;
 
 #ifdef _WIN32
     SYSTEM_INFO info;
@@ -1675,15 +3055,54 @@ Init_Cont(void)
 #else /* not WIN32 */
     pagesize = sysconf(_SC_PAGESIZE);
 #endif
-    SET_MACHINE_STACK_END(&th->machine.stack_end);
-#endif
+    SET_MACHINE_STACK_END(&th->ec->machine.stack_end);
+
+    fiber_pool_initialize(&shared_fiber_pool, stack_size, FIBER_POOL_INITIAL_SIZE, vm_stack_size);
+
+    fiber_initialize_keywords[0] = rb_intern_const("blocking");
+    fiber_initialize_keywords[1] = rb_intern_const("pool");
+
+    char * fiber_shared_fiber_pool_free_stacks = getenv("RUBY_SHARED_FIBER_POOL_FREE_STACKS");
+    if (fiber_shared_fiber_pool_free_stacks) {
+        shared_fiber_pool.free_stacks = atoi(fiber_shared_fiber_pool_free_stacks);
+    }
 
     rb_cFiber = rb_define_class("Fiber", rb_cObject);
     rb_define_alloc_func(rb_cFiber, fiber_alloc);
     rb_eFiberError = rb_define_class("FiberError", rb_eStandardError);
     rb_define_singleton_method(rb_cFiber, "yield", rb_fiber_s_yield, -1);
-    rb_define_method(rb_cFiber, "initialize", rb_fiber_init, 0);
+    rb_define_method(rb_cFiber, "initialize", rb_fiber_initialize, -1);
+    rb_define_method(rb_cFiber, "blocking?", rb_fiber_blocking_p, 0);
     rb_define_method(rb_cFiber, "resume", rb_fiber_m_resume, -1);
+    rb_define_method(rb_cFiber, "raise", rb_fiber_raise, -1);
+    rb_define_method(rb_cFiber, "backtrace", rb_fiber_backtrace, -1);
+    rb_define_method(rb_cFiber, "backtrace_locations", rb_fiber_backtrace_locations, -1);
+    rb_define_method(rb_cFiber, "to_s", fiber_to_s, 0);
+    rb_define_alias(rb_cFiber, "inspect", "to_s");
+
+    rb_define_singleton_method(rb_cFiber, "blocking?", rb_f_fiber_blocking_p, 0);
+    rb_define_singleton_method(rb_cFiber, "scheduler", rb_fiber_scheduler, 0);
+    rb_define_singleton_method(rb_cFiber, "set_scheduler", rb_fiber_set_scheduler, 1);
+
+    rb_define_singleton_method(rb_cFiber, "schedule", rb_f_fiber, -1);
+    //rb_define_global_function("Fiber", rb_f_fiber, -1);
+
+#if 0 /* for RDoc */
+    rb_cFiberScheduler = rb_define_class_under(rb_cFiber, "SchedulerInterface", rb_cObject);
+    rb_define_method(rb_cFiberScheduler, "close", rb_fiber_scheduler_interface_close, 0);
+    rb_define_method(rb_cFiberScheduler, "process_wait", rb_fiber_scheduler_interface_process_wait, 0);
+    rb_define_method(rb_cFiberScheduler, "io_wait", rb_fiber_scheduler_interface_io_wait, 0);
+    rb_define_method(rb_cFiberScheduler, "kernel_sleep", rb_fiber_scheduler_interface_kernel_sleep, 0);
+    rb_define_method(rb_cFiberScheduler, "block", rb_fiber_scheduler_interface_block, 0);
+    rb_define_method(rb_cFiberScheduler, "unblock", rb_fiber_scheduler_interface_unblock, 0);
+    rb_define_method(rb_cFiberScheduler, "fiber", rb_fiber_scheduler_interface_fiber, 0);
+#endif
+
+#ifdef RB_EXPERIMENTAL_FIBER_POOL
+    rb_cFiberPool = rb_define_class("Pool", rb_cFiber);
+    rb_define_alloc_func(rb_cFiberPool, fiber_pool_alloc);
+    rb_define_method(rb_cFiberPool, "initialize", rb_fiber_pool_initialize, -1);
+#endif
 }
 
 RUBY_SYMBOL_EXPORT_BEGIN
@@ -1702,6 +3121,9 @@ ruby_Init_Continuation_body(void)
 void
 ruby_Init_Fiber_as_Coroutine(void)
 {
+#ifdef HAVE_RB_EXT_RACTOR_SAFE
+    rb_ext_ractor_safe(true);
+#endif
     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/coroutine/Stack.h b/coroutine/Stack.h
new file mode 100644
index 0000000000..f0fc703622
--- /dev/null
+++ b/coroutine/Stack.h
@@ -0,0 +1,16 @@
+/*
+ *  This file is part of the "Coroutine" project and released under the MIT License.
+ *
+ *  Created by Samuel Williams on 10/11/2020.
+ *  Copyright, 2020, by Samuel Williams.
+*/
+
+#include COROUTINE_H
+
+#ifdef COROUTINE_PRIVATE_STACK
+#define COROUTINE_STACK_LOCAL(type, name) type *name = ruby_xmalloc(sizeof(type))
+#define COROUTINE_STACK_FREE(name) ruby_xfree(name)
+#else
+#define COROUTINE_STACK_LOCAL(type, name) type name##_local; type * name = &name##_local
+#define COROUTINE_STACK_FREE(name)
+#endif
diff --git a/coroutine/amd64/Context.S b/coroutine/amd64/Context.S
new file mode 100644
index 0000000000..051db1c5e8
--- /dev/null
+++ b/coroutine/amd64/Context.S
@@ -0,0 +1,46 @@
+##
+##  This file is part of the "Coroutine" project and released under the MIT License.
+##
+##  Created by Samuel Williams on 10/5/2018.
+##  Copyright, 2018, by Samuel Williams.
+##
+
+#define TOKEN_PASTE(x,y) x##y
+#define PREFIXED_SYMBOL(prefix,name) TOKEN_PASTE(prefix,name)
+
+.text
+
+.globl PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer)
+PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer):
+
+	# Save caller state
+	pushq %rbp
+	pushq %rbx
+	pushq %r12
+	pushq %r13
+	pushq %r14
+	pushq %r15
+
+	# Save caller stack pointer
+	movq %rsp, (%rdi)
+
+	# Restore callee stack pointer
+	movq (%rsi), %rsp
+
+	# Restore callee state
+	popq %r15
+	popq %r14
+	popq %r13
+	popq %r12
+	popq %rbx
+	popq %rbp
+
+	# Put the first argument into the return value
+	movq %rdi, %rax
+
+	# We pop the return address and jump to it
+	ret
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
diff --git a/coroutine/amd64/Context.h b/coroutine/amd64/Context.h
new file mode 100644
index 0000000000..581525b67e
--- /dev/null
+++ b/coroutine/amd64/Context.h
@@ -0,0 +1,54 @@
+/*
+ *  This file is part of the "Coroutine" project and released under the MIT License.
+ *
+ *  Created by Samuel Williams on 10/5/2018.
+ *  Copyright, 2018, by Samuel Williams.
+*/
+
+#pragma once
+
+#include <assert.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
+
+#define COROUTINE __attribute__((noreturn)) void
+
+enum {COROUTINE_REGISTERS = 6};
+
+struct coroutine_context
+{
+    void **stack_pointer;
+};
+
+typedef COROUTINE(* coroutine_start)(struct coroutine_context *from, struct coroutine_context *self);
+
+static inline void coroutine_initialize_main(struct coroutine_context * context) {
+    context->stack_pointer = NULL;
+}
+
+static inline void coroutine_initialize(
+    struct coroutine_context *context,
+    coroutine_start start,
+    void *stack,
+    size_t size
+) {
+    assert(start && stack && size >= 1024);
+
+    // Stack grows down. Force 16-byte alignment.
+    char * top = (char*)stack + size;
+    context->stack_pointer = (void**)((uintptr_t)top & ~0xF);
+
+    *--context->stack_pointer = NULL;
+    *--context->stack_pointer = (void*)start;
+
+    context->stack_pointer -= COROUTINE_REGISTERS;
+    memset(context->stack_pointer, 0, sizeof(void*) * COROUTINE_REGISTERS);
+}
+
+struct coroutine_context * coroutine_transfer(struct coroutine_context * current, struct coroutine_context * target);
+
+static inline void coroutine_destroy(struct coroutine_context * context)
+{
+    context->stack_pointer = NULL;
+}
diff --git a/coroutine/arm32/Context.S b/coroutine/arm32/Context.S
new file mode 100644
index 0000000000..1850c4c408
--- /dev/null
+++ b/coroutine/arm32/Context.S
@@ -0,0 +1,33 @@
+##
+##  This file is part of the "Coroutine" project and released under the MIT License.
+##
+##  Created by Samuel Williams on 10/5/2018.
+##  Copyright, 2018, by Samuel Williams.
+##
+
+#define TOKEN_PASTE(x,y) x##y
+#define PREFIXED_SYMBOL(prefix,name) TOKEN_PASTE(prefix,name)
+
+.file "Context.S"
+.text
+.globl PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer)
+.align 2
+.type PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer),%function
+.syntax unified
+
+PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer):
+	# Save caller state (8 registers + return address)
+	push {r4-r11,lr}
+
+	# Save caller stack pointer
+	str sp, [r0]
+
+	# Restore callee stack pointer
+	ldr sp, [r1]
+
+	# Restore callee state (8 registers program counter)
+	pop {r4-r11,pc}
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
diff --git a/coroutine/arm32/Context.h b/coroutine/arm32/Context.h
new file mode 100644
index 0000000000..e69f4b2eeb
--- /dev/null
+++ b/coroutine/arm32/Context.h
@@ -0,0 +1,53 @@
+/*
+ *  This file is part of the "Coroutine" project and released under the MIT License.
+ *
+ *  Created by Samuel Williams on 10/5/2018.
+ *  Copyright, 2018, by Samuel Williams.
+*/
+
+#pragma once
+
+#include <assert.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
+
+#define COROUTINE __attribute__((noreturn)) void
+#define COROUTINE_LIMITED_ADDRESS_SPACE
+
+enum {COROUTINE_REGISTERS = 8};
+
+struct coroutine_context
+{
+    void **stack_pointer;
+};
+
+typedef COROUTINE(* coroutine_start)(struct coroutine_context *from, struct coroutine_context *self);
+
+static inline void coroutine_initialize_main(struct coroutine_context * context) {
+    context->stack_pointer = NULL;
+}
+
+static inline void coroutine_initialize(
+    struct coroutine_context *context,
+    coroutine_start start,
+    void *stack,
+    size_t size
+) {
+    assert(start && stack && size >= 1024);
+
+    // Stack grows down. Force 16-byte alignment.
+    char * top = (char*)stack + size;
+    context->stack_pointer = (void**)((uintptr_t)top & ~0xF);
+
+    *--context->stack_pointer = (void*)start;
+
+    context->stack_pointer -= COROUTINE_REGISTERS;
+    memset(context->stack_pointer, 0, sizeof(void*) * COROUTINE_REGISTERS);
+}
+
+struct coroutine_context * coroutine_transfer(struct coroutine_context * current, struct coroutine_context * target);
+
+static inline void coroutine_destroy(struct coroutine_context * context)
+{
+}
diff --git a/coroutine/arm64/Context.S b/coroutine/arm64/Context.S
new file mode 100644
index 0000000000..04e3f6d1ef
--- /dev/null
+++ b/coroutine/arm64/Context.S
@@ -0,0 +1,62 @@
+##
+##  This file is part of the "Coroutine" project and released under the MIT License.
+##
+##  Created by Samuel Williams on 10/5/2018.
+##  Copyright, 2018, by Samuel Williams.
+##
+
+#define TOKEN_PASTE(x,y) x##y
+#define PREFIXED_SYMBOL(prefix,name) TOKEN_PASTE(prefix,name)
+
+.text
+.align 2
+
+.global PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer)
+PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer):
+
+	# Make space on the stack for caller registers
+	sub sp, sp, 0xb0
+
+	# Save caller registers
+	stp d8, d9, [sp, 0x00]
+	stp d10, d11, [sp, 0x10]
+	stp d12, d13, [sp, 0x20]
+	stp d14, d15, [sp, 0x30]
+	stp x19, x20, [sp, 0x40]
+	stp x21, x22, [sp, 0x50]
+	stp x23, x24, [sp, 0x60]
+	stp x25, x26, [sp, 0x70]
+	stp x27, x28, [sp, 0x80]
+	stp x29, x30, [sp, 0x90]
+
+	# Save return address
+	str x30, [sp, 0xa0]
+
+	# Save stack pointer to x0 (first argument)
+	mov x2, sp
+	str x2, [x0, 0]
+
+	# Load stack pointer from x1 (second argument)
+	ldr x3, [x1, 0]
+	mov sp, x3
+
+	# Restore caller registers
+	ldp d8, d9, [sp, 0x00]
+	ldp d10, d11, [sp, 0x10]
+	ldp d12, d13, [sp, 0x20]
+	ldp d14, d15, [sp, 0x30]
+	ldp x19, x20, [sp, 0x40]
+	ldp x21, x22, [sp, 0x50]
+	ldp x23, x24, [sp, 0x60]
+	ldp x25, x26, [sp, 0x70]
+	ldp x27, x28, [sp, 0x80]
+	ldp x29, x30, [sp, 0x90]
+
+	# Load return address into x4
+	ldr x4, [sp, 0xa0]
+
+	# Pop stack frame
+	add sp, sp, 0xb0
+
+	# Jump to return address (in x4)
+	ret x4
diff --git a/coroutine/arm64/Context.h b/coroutine/arm64/Context.h
new file mode 100644
index 0000000000..34be995a4f
--- /dev/null
+++ b/coroutine/arm64/Context.h
@@ -0,0 +1,52 @@
+/*
+ *  This file is part of the "Coroutine" project and released under the MIT License.
+ *
+ *  Created by Samuel Williams on 10/5/2018.
+ *  Copyright, 2018, by Samuel Williams.
+*/
+
+#pragma once
+
+#include <assert.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
+
+#define COROUTINE __attribute__((noreturn)) void
+
+enum {COROUTINE_REGISTERS = 0xb0 / 8};
+
+struct coroutine_context
+{
+    void **stack_pointer;
+};
+
+typedef COROUTINE(* coroutine_start)(struct coroutine_context *from, struct coroutine_context *self);
+
+static inline void coroutine_initialize_main(struct coroutine_context * context) {
+    context->stack_pointer = NULL;
+}
+
+static inline void coroutine_initialize(
+    struct coroutine_context *context,
+    coroutine_start start,
+    void *stack,
+    size_t size
+) {
+    assert(start && stack && size >= 1024);
+
+    // Stack grows down. Force 16-byte alignment.
+    char * top = (char*)stack + size;
+    context->stack_pointer = (void**)((uintptr_t)top & ~0xF);
+
+    context->stack_pointer -= COROUTINE_REGISTERS;
+    memset(context->stack_pointer, 0, sizeof(void*) * COROUTINE_REGISTERS);
+
+    context->stack_pointer[0xa0 / 8] = (void*)start;
+}
+
+struct coroutine_context * coroutine_transfer(struct coroutine_context * current, struct coroutine_context * target);
+
+static inline void coroutine_destroy(struct coroutine_context * context)
+{
+}
diff --git a/coroutine/copy/Context.c b/coroutine/copy/Context.c
new file mode 100644
index 0000000000..aa8bb2ff05
--- /dev/null
+++ b/coroutine/copy/Context.c
@@ -0,0 +1,162 @@
+/*
+ *  This file is part of the "Coroutine" project and released under the MIT License.
+ *
+ *  Created by Samuel Williams on 24/6/2019.
+ *  Copyright, 2019, by Samuel Williams.
+*/
+
+#include "Context.h"
+
+#include <stdint.h>
+
+// http://gcc.gnu.org/onlinedocs/gcc/Alternate-Keywords.html
+#ifndef __GNUC__
+#define __asm__ asm
+#endif
+
+#if defined(__sparc)
+__attribute__((noinline))
+// https://marc.info/?l=linux-sparc&m=131914569320660&w=2
+static void coroutine_flush_register_windows(void) {
+    __asm__
+#ifdef __GNUC__
+    __volatile__
+#endif
+#if defined(__sparcv9) || defined(__sparc_v9__) || defined(__arch64__)
+#ifdef __GNUC__
+    ("flushw" : : : "%o7")
+#else
+    ("flushw")
+#endif
+#else
+    ("ta 0x03")
+#endif
+    ;
+}
+#else
+static void coroutine_flush_register_windows(void) {}
+#endif
+
+__attribute__((noinline))
+void *coroutine_stack_pointer(void) {
+    return (void*)(
+        (char*)__builtin_frame_address(0)
+    );
+}
+
+// Save the current stack to a private area. It is likely that when restoring the stack, this stack frame will be incomplete. But that is acceptable since the previous stack frame which called `setjmp` should be correctly restored.
+__attribute__((noinline))
+int coroutine_save_stack_1(struct coroutine_context * context) {
+    assert(context->stack);
+    assert(context->base);
+
+    void *stack_pointer = coroutine_stack_pointer();
+
+    // At this point, you may need to ensure on architectures that use register windows, that all registers are flushed to the stack, otherwise the copy of the stack will not contain the valid registers:
+    coroutine_flush_register_windows();
+
+    // Save stack to private area:
+    if (stack_pointer < context->base) {
+        size_t size = (char*)context->base - (char*)stack_pointer;
+        assert(size <= context->size);
+
+        memcpy(context->stack, stack_pointer, size);
+        context->used = size;
+    } else {
+        size_t size = (char*)stack_pointer - (char*)context->base;
+        assert(size <= context->size);
+
+        memcpy(context->stack, context->base, size);
+        context->used = size;
+    }
+
+    // Initialized:
+    return 0;
+}
+
+// Copy the current stack to a private memory buffer.
+int coroutine_save_stack(struct coroutine_context * context) {
+    if (_setjmp(context->state)) {
+        // Restored.
+        return 1;
+    }
+
+    // We need to invoke the memory copy from one stack frame deeper than the one that calls setjmp. That is because if you don't do this, the setjmp might be restored into an invalid stack frame (truncated, etc):
+    return coroutine_save_stack_1(context);
+}
+
+__attribute__((noreturn, noinline))
+void coroutine_restore_stack_padded(struct coroutine_context *context, void * buffer) {
+    void *stack_pointer = coroutine_stack_pointer();
+
+    assert(context->base);
+
+    // At this point, you may need to ensure on architectures that use register windows, that all registers are flushed to the stack, otherwise when we copy in the new stack, the registers would not be updated:
+    coroutine_flush_register_windows();
+
+    // Restore stack from private area:
+    if (stack_pointer < context->base) {
+        void * bottom = (char*)context->base - context->used;
+        assert(bottom > stack_pointer);
+
+        memcpy(bottom, context->stack, context->used);
+    } else {
+        void * top = (char*)context->base + context->used;
+        assert(top < stack_pointer);
+
+        memcpy(context->base, context->stack, context->used);
+    }
+
+    // Restore registers. The `buffer` is to force the compiler NOT to elide he buffer and `alloca`:
+    _longjmp(context->state, (int)(1 | (intptr_t)buffer));
+}
+
+// In order to swap between coroutines, we need to swap the stack and registers.
+// `setjmp` and `longjmp` are able to swap registers, but what about swapping stacks? You can use `memcpy` to copy the current stack to a private area and `memcpy` to copy the private stack of the next coroutine to the main stack.
+// But if the stack yop are copying in to the main stack is bigger than the currently executing stack, the `memcpy` will clobber the current stack frame (including the context argument). So we use `alloca` to push the current stack frame *beyond* the stack we are about to copy in. This ensures the current stack frame in `coroutine_restore_stack_padded` remains valid for calling `longjmp`.
+__attribute__((noreturn))
+void coroutine_restore_stack(struct coroutine_context *context) {
+    void *stack_pointer = coroutine_stack_pointer();
+    void *buffer = NULL;
+
+    // We must ensure that the next stack frame is BEYOND the stack we are restoring:
+    if (stack_pointer < context->base) {
+        intptr_t offset = (intptr_t)stack_pointer - ((intptr_t)context->base - context->used);
+        if (offset > 0) buffer = alloca(offset);
+    } else {
+        intptr_t offset = ((intptr_t)context->base + context->used) - (intptr_t)stack_pointer;
+        if (offset > 0) buffer = alloca(offset);
+    }
+
+    assert(context->used > 0);
+
+    coroutine_restore_stack_padded(context, buffer);
+}
+
+struct coroutine_context *coroutine_transfer(struct coroutine_context *current, struct coroutine_context *target)
+{
+    struct coroutine_context *previous = target->from;
+
+    // In theory, either this condition holds true, or we should assign the base address to target:
+    assert(current->base == target->base);
+    // If you are trying to copy the coroutine to a different thread
+    // target->base = current->base
+
+    target->from = current;
+
+    assert(current != target);
+
+    // It's possible to come here, even thought the current fiber has been terminated. We are never going to return so we don't bother saving the stack.
+
+    if (current->stack) {
+        if (coroutine_save_stack(current) == 0) {
+            coroutine_restore_stack(target);
+        }
+    } else {
+        coroutine_restore_stack(target);
+    }
+
+    target->from = previous;
+
+    return target;
+}
diff --git a/coroutine/copy/Context.h b/coroutine/copy/Context.h
new file mode 100644
index 0000000000..6038f00cf6
--- /dev/null
+++ b/coroutine/copy/Context.h
@@ -0,0 +1,90 @@
+/*
+ *  This file is part of the "Coroutine" project and released under the MIT License.
+ *
+ *  Created by Samuel Williams on 27/6/2019.
+ *  Copyright, 2019, by Samuel Williams.
+*/
+
+#pragma once
+
+#include <assert.h>
+#include <stddef.h>
+#include <setjmp.h>
+#include <string.h>
+#include <stdlib.h>
+
+/* OpenBSD supports alloca, but does not include alloca.h */
+#ifndef __OpenBSD__
+#include <alloca.h>
+#endif
+
+#define COROUTINE __attribute__((noreturn)) void
+
+#if INTPTR_MAX <= INT32_MAX
+#define COROUTINE_LIMITED_ADDRESS_SPACE
+#endif
+
+// This stack copying implementation which uses a private stack for each coroutine, including the main one.
+#define COROUTINE_PRIVATE_STACK
+
+struct coroutine_context
+{
+    // Private stack:
+    void *stack;
+    size_t size, used;
+
+    // The top (or bottom) of the currently executing stack:
+    void *base;
+
+    jmp_buf state;
+
+    struct coroutine_context *from;
+};
+
+typedef COROUTINE(*coroutine_start)(struct coroutine_context *from, struct coroutine_context *self);
+
+int coroutine_save_stack(struct coroutine_context * context);
+COROUTINE coroutine_restore_stack(struct coroutine_context *context);
+
+// @param stack The private stack area memory allocation (pointer to lowest address).
+// @param size The size of the private stack area.
+// @param base A stack pointer to the base of the main stack. On x86 hardware, this is the upper extent of the region that will be copied to the private stack.
+static inline void coroutine_initialize_main(struct coroutine_context *context, void *stack, size_t size, void *base) {
+    assert(stack);
+    assert(size >= 1024);
+
+    context->stack = stack;
+    context->size = size;
+    context->used = 0;
+
+    assert(base);
+    context->base = base;
+
+    context->from = NULL;
+}
+
+// @param start The start function to invoke.
+static inline void coroutine_initialize(
+    struct coroutine_context *context,
+    coroutine_start start,
+    void *stack,
+    size_t size,
+    void *base
+) {
+    assert(start);
+
+    coroutine_initialize_main(context, stack, size, base);
+
+    if (coroutine_save_stack(context)) {
+        start(context->from, context);
+    }
+}
+
+struct coroutine_context *coroutine_transfer(struct coroutine_context *current, register struct coroutine_context *target);
+
+static inline void coroutine_destroy(struct coroutine_context *context)
+{
+    context->stack = NULL;
+    context->size = 0;
+    context->from = NULL;
+}
diff --git a/coroutine/ppc64le/Context.S b/coroutine/ppc64le/Context.S
new file mode 100644
index 0000000000..61be9efcf0
--- /dev/null
+++ b/coroutine/ppc64le/Context.S
@@ -0,0 +1,75 @@
+#define TOKEN_PASTE(x,y) x##y
+#define PREFIXED_SYMBOL(prefix,name) TOKEN_PASTE(prefix,name)
+
+.text
+.align 2
+
+.globl PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer)
+.type   PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer), @function
+PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer):
+	# Make space on the stack for caller registers
+	addi 1,1,-152
+
+	# Save caller registers
+	std 14,0(1)
+	std 15,8(1)
+	std 16,16(1)
+	std 17,24(1)
+	std 18,32(1)
+	std 19,40(1)
+	std 20,48(1)
+	std 21,56(1)
+	std 22,64(1)
+	std 23,72(1)
+	std 24,80(1)
+	std 25,88(1)
+	std 26,96(1)
+	std 27,104(1)
+	std 28,112(1)
+	std 29,120(1)
+	std 30,128(1)
+	std 31,136(1)
+
+	# Save return address
+	mflr 0
+	std 0,144(1)
+
+	# Save stack pointer to first argument
+	std 1,0(3)
+
+	# Load stack pointer from second argument
+	ld 1,0(4)
+
+	# Restore caller registers
+	ld 14,0(1)
+	ld 15,8(1)
+	ld 16,16(1)
+	ld 17,24(1)
+	ld 18,32(1)
+	ld 19,40(1)
+	ld 20,48(1)
+	ld 21,56(1)
+	ld 22,64(1)
+	ld 23,72(1)
+	ld 24,80(1)
+	ld 25,88(1)
+	ld 26,96(1)
+	ld 27,104(1)
+	ld 28,112(1)
+	ld 29,120(1)
+	ld 30,128(1)
+	ld 31,136(1)
+
+	# Load return address
+	ld 0,144(1)
+	mtlr 0
+
+	# Pop stack frame
+	addi 1,1,152
+
+	# Jump to return address
+	blr
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
diff --git a/coroutine/ppc64le/Context.h b/coroutine/ppc64le/Context.h
new file mode 100644
index 0000000000..e36f9c3583
--- /dev/null
+++ b/coroutine/ppc64le/Context.h
@@ -0,0 +1,51 @@
+#pragma once
+
+#include <assert.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
+
+#define COROUTINE __attribute__((noreturn)) void
+
+enum {
+  COROUTINE_REGISTERS =
+  19  /* 18 general purpose registers (r14-r31) and 1 return address */
+  + 4  /* space for fiber_entry() to store the link register */
+};
+
+struct coroutine_context
+{
+    void **stack_pointer;
+};
+
+typedef COROUTINE(* coroutine_start)(struct coroutine_context *from, struct coroutine_context *self);
+
+static inline void coroutine_initialize_main(struct coroutine_context * context) {
+    context->stack_pointer = NULL;
+}
+
+static inline void coroutine_initialize(
+    struct coroutine_context *context,
+    coroutine_start start,
+    void *stack,
+    size_t size
+) {
+    assert(start && stack && size >= 1024);
+
+    // Stack grows down. Force 16-byte alignment.
+    char * top = (char*)stack + size;
+    context->stack_pointer = (void**)((uintptr_t)top & ~0xF);
+
+    context->stack_pointer -= COROUTINE_REGISTERS;
+    memset(context->stack_pointer, 0, sizeof(void*) * COROUTINE_REGISTERS);
+
+    /* Skip a global prologue that sets the TOC register */
+    context->stack_pointer[18] = ((char*)start) + 8;
+}
+
+struct coroutine_context * coroutine_transfer(struct coroutine_context * current, struct coroutine_context * target);
+
+static inline void coroutine_destroy(struct coroutine_context * context)
+{
+    context->stack_pointer = NULL;
+}
diff --git a/coroutine/ucontext/Context.c b/coroutine/ucontext/Context.c
new file mode 100644
index 0000000000..9ba76ee628
--- /dev/null
+++ b/coroutine/ucontext/Context.c
@@ -0,0 +1,22 @@
+/*
+ *  This file is part of the "Coroutine" project and released under the MIT License.
+ *
+ *  Created by Samuel Williams on 24/6/2019.
+ *  Copyright, 2019, by Samuel Williams.
+*/
+
+/* According to Solaris' ucontext.h, makecontext, etc. are removed in SUSv4.
+ * To enable the prototype declarations, we need to define __EXTENSIONS__.
+ */
+#if defined(__sun) && !defined(__EXTENSIONS__)
+#define __EXTENSIONS__
+#endif
+#include "Context.h"
+
+void coroutine_trampoline(void * _start, void * _context)
+{
+    coroutine_start start = (coroutine_start)_start;
+    struct coroutine_context * context = _context;
+
+    start(context->from, context);
+}
diff --git a/coroutine/ucontext/Context.h b/coroutine/ucontext/Context.h
new file mode 100644
index 0000000000..2b2a593793
--- /dev/null
+++ b/coroutine/ucontext/Context.h
@@ -0,0 +1,70 @@
+/*
+ *  This file is part of the "Coroutine" project and released under the MIT License.
+ *
+ *  Created by Samuel Williams on 24/6/2019.
+ *  Copyright, 2019, by Samuel Williams.
+*/
+
+#pragma once
+
+#include <assert.h>
+#include <stddef.h>
+#include <ucontext.h>
+
+#define COROUTINE __attribute__((noreturn)) void
+
+#if INTPTR_MAX <= INT32_MAX
+#define COROUTINE_LIMITED_ADDRESS_SPACE
+#endif
+
+struct coroutine_context
+{
+    ucontext_t state;
+    struct coroutine_context * from;
+};
+
+typedef COROUTINE(* coroutine_start)(struct coroutine_context *from, struct coroutine_context *self);
+
+COROUTINE coroutine_trampoline(void * _start, void * _context);
+
+static inline void coroutine_initialize_main(struct coroutine_context * context) {
+    context->from = NULL;
+    getcontext(&context->state);
+}
+
+static inline void coroutine_initialize(
+    struct coroutine_context *context,
+    coroutine_start start,
+    void *stack,
+    size_t size
+) {
+    assert(start && stack && size >= 1024);
+
+    coroutine_initialize_main(context);
+
+    context->state.uc_stack.ss_size = size;
+    // Despite what it's called, this is not actually a stack pointer. It points to the address of the stack allocation (the lowest address).
+    context->state.uc_stack.ss_sp = (char*)stack;
+    context->state.uc_stack.ss_flags = 0;
+    context->state.uc_link = NULL;
+
+    makecontext(&context->state, (void(*)(void))coroutine_trampoline, 2, (void*)start, (void*)context);
+}
+
+static inline struct coroutine_context * coroutine_transfer(struct coroutine_context * current, struct coroutine_context * target)
+{
+    struct coroutine_context * previous = target->from;
+
+    target->from = current;
+    swapcontext(&current->state, &target->state);
+    target->from = previous;
+
+    return target;
+}
+
+static inline void coroutine_destroy(struct coroutine_context * context)
+{
+    context->state.uc_stack.ss_sp = NULL;
+    context->state.uc_stack.ss_size = 0;
+    context->from = NULL;
+}
diff --git a/coroutine/win32/Context.S b/coroutine/win32/Context.S
new file mode 100644
index 0000000000..d14bf435e8
--- /dev/null
+++ b/coroutine/win32/Context.S
@@ -0,0 +1,47 @@
+##
+##  This file is part of the "Coroutine" project and released under the MIT License.
+##
+##  Created by Lars Kanis on 06/06/2019.
+##
+
+.text
+
+# Using fastcall is a big win (and it's the same as how x64 works).
+# In coroutine transfer, the arguments are passed in ecx and edx. We don't need
+# to touch these in order to pass them to the destination coroutine.
+
+.globl @coroutine_transfer@8
+@coroutine_transfer@8:
+	# Save the thread information block:
+	pushl %fs:0
+	pushl %fs:4
+	pushl %fs:8
+
+	# Save caller registers:
+	pushl %ebp
+	pushl %ebx
+	pushl %edi
+	pushl %esi
+
+	# Save caller stack pointer:
+	movl %esp, (%ecx)
+
+	# Restore callee stack pointer:
+	movl (%edx), %esp
+
+	# Restore callee stack:
+	popl %esi
+	popl %edi
+	popl %ebx
+	popl %ebp
+
+	# Restore the thread information block:
+	popl %fs:8
+	popl %fs:4
+	popl %fs:0
+
+	# Save the first argument as the return value:
+	movl %ecx, %eax
+
+	# Jump to the address on the stack:
+	ret
diff --git a/coroutine/win32/Context.asm b/coroutine/win32/Context.asm
new file mode 100644
index 0000000000..f8f431239b
--- /dev/null
+++ b/coroutine/win32/Context.asm
@@ -0,0 +1,55 @@
+;;
+;;  This file is part of the "Coroutine" project and released under the MIT License.
+;;
+;;  Created by Samuel Williams on 10/5/2018.
+;;  Copyright, 2018, by Samuel Williams.
+;;
+
+.386
+.model flat
+
+.code
+
+assume fs:nothing
+
+; Using fastcall is a big win (and it's the same has how x64 works).
+; In coroutine transfer, the arguments are passed in ecx and edx. We don't need
+; to touch these in order to pass them to the destination coroutine.
+
+@coroutine_transfer@8 proc
+	; Save the thread information block:
+	push fs:[0]
+	push fs:[4]
+	push fs:[8]
+
+	; Save caller registers:
+	push ebp
+	push ebx
+	push edi
+	push esi
+
+	; Save caller stack pointer:
+	mov dword ptr [ecx], esp
+
+	; Restore callee stack pointer:
+	mov esp, dword ptr [edx]
+
+	; Restore callee stack:
+	pop esi
+	pop edi
+	pop ebx
+	pop ebp
+
+	; Restore the thread information block:
+	pop fs:[8]
+	pop fs:[4]
+	pop fs:[0]
+
+	; Save the first argument as the return value:
+	mov eax, dword ptr ecx
+
+	; Jump to the address on the stack:
+	ret
+@coroutine_transfer@8 endp
+
+end
diff --git a/coroutine/win32/Context.h b/coroutine/win32/Context.h
new file mode 100644
index 0000000000..e20342a98d
--- /dev/null
+++ b/coroutine/win32/Context.h
@@ -0,0 +1,59 @@
+/*
+ *  This file is part of the "Coroutine" project and released under the MIT License.
+ *
+ *  Created by Samuel Williams on 10/5/2018.
+ *  Copyright, 2018, by Samuel Williams.
+*/
+
+#pragma once
+
+#include <assert.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
+
+#define COROUTINE __declspec(noreturn) void __fastcall
+#define COROUTINE_LIMITED_ADDRESS_SPACE
+
+/* This doesn't include thread information block */
+enum {COROUTINE_REGISTERS = 4};
+
+struct coroutine_context
+{
+    void **stack_pointer;
+};
+
+typedef void(__fastcall * coroutine_start)(struct coroutine_context *from, struct coroutine_context *self);
+
+static inline void coroutine_initialize_main(struct coroutine_context * context) {
+    context->stack_pointer = NULL;
+}
+
+static inline void coroutine_initialize(
+    struct coroutine_context *context,
+    coroutine_start start,
+    void *stack,
+    size_t size
+) {
+    assert(start && stack && size >= 1024);
+
+    // Stack grows down. Force 16-byte alignment.
+    char * top = (char*)stack + size;
+    context->stack_pointer = (void**)((uintptr_t)top & ~0xF);
+
+    *--context->stack_pointer = (void*)start;
+
+    /* Windows Thread Information Block */
+    *--context->stack_pointer = (void*)0xFFFFFFFF; /* fs:[0] */
+    *--context->stack_pointer = (void*)top; /* fs:[4] */
+    *--context->stack_pointer = (void*)stack;  /* fs:[8] */
+
+    context->stack_pointer -= COROUTINE_REGISTERS;
+    memset(context->stack_pointer, 0, sizeof(void*) * COROUTINE_REGISTERS);
+}
+
+struct coroutine_context * __fastcall coroutine_transfer(struct coroutine_context * current, struct coroutine_context * target);
+
+static inline void coroutine_destroy(struct coroutine_context * context)
+{
+}
diff --git a/coroutine/win64/Context.S b/coroutine/win64/Context.S
new file mode 100644
index 0000000000..e0ee38e006
--- /dev/null
+++ b/coroutine/win64/Context.S
@@ -0,0 +1,77 @@
+##
+##  This file is part of the "Coroutine" project and released under the MIT License.
+##
+##  Created by Samuel Williams on 4/11/2018.
+##  Copyright, 2018, by Samuel Williams.
+##
+
+.text
+
+.globl coroutine_transfer
+coroutine_transfer:
+	# Save the thread information block:
+	pushq %gs:8
+	pushq %gs:16
+
+	# Save caller registers:
+	pushq %rbp
+	pushq %rbx
+	pushq %rdi
+	pushq %rsi
+	pushq %r12
+	pushq %r13
+	pushq %r14
+	pushq %r15
+
+	movaps %xmm15, -168(%rsp)
+	movaps %xmm14, -152(%rsp)
+	movaps %xmm13, -136(%rsp)
+	movaps %xmm12, -120(%rsp)
+	movaps %xmm11, -104(%rsp)
+	movaps %xmm10, -88(%rsp)
+	movaps %xmm9, -72(%rsp)
+	movaps %xmm8, -56(%rsp)
+	movaps %xmm7, -40(%rsp)
+	movaps %xmm6, -24(%rsp)
+
+	# Save caller stack pointer:
+	mov %rsp, (%rcx)
+
+	# Restore callee stack pointer:
+	mov (%rdx), %rsp
+
+	movaps -24(%rsp), %xmm6
+	movaps -40(%rsp), %xmm7
+	movaps -56(%rsp), %xmm8
+	movaps -72(%rsp), %xmm9
+	movaps -88(%rsp), %xmm10
+	movaps -104(%rsp), %xmm11
+	movaps -120(%rsp), %xmm12
+	movaps -136(%rsp), %xmm13
+	movaps -152(%rsp), %xmm14
+	movaps -168(%rsp), %xmm15
+
+	# Restore callee stack:
+	popq %r15
+	popq %r14
+	popq %r13
+	popq %r12
+	popq %rsi
+	popq %rdi
+	popq %rbx
+	popq %rbp
+
+	# Restore the thread information block:
+	popq %gs:16
+	popq %gs:8
+
+	# Put the first argument into the return value:
+	mov %rcx, %rax
+
+	# We pop the return address and jump to it:
+	ret
+
+.globl coroutine_trampoline
+coroutine_trampoline:
+	# Do not remove this. This forces 16-byte alignment when entering the coroutine.
+	ret
diff --git a/coroutine/win64/Context.asm b/coroutine/win64/Context.asm
new file mode 100644
index 0000000000..8c4dea1c93
--- /dev/null
+++ b/coroutine/win64/Context.asm
@@ -0,0 +1,79 @@
+;;
+;;  This file is part of the "Coroutine" project and released under the MIT License.
+;;
+;;  Created by Samuel Williams on 10/5/2018.
+;;  Copyright, 2018, by Samuel Williams.
+;;
+
+.code
+
+coroutine_transfer proc
+	; Save the thread information block:
+	push qword ptr gs:[8]
+	push qword ptr gs:[16]
+
+	; Save caller registers:
+	push rbp
+	push rbx
+	push rdi
+	push rsi
+	push r12
+	push r13
+	push r14
+	push r15
+
+	movaps [rsp - 24], xmm6
+	movaps [rsp - 40], xmm7
+	movaps [rsp - 56], xmm8
+	movaps [rsp - 72], xmm9
+	movaps [rsp - 88], xmm10
+	movaps [rsp - 104], xmm11
+	movaps [rsp - 120], xmm12
+	movaps [rsp - 136], xmm13
+	movaps [rsp - 152], xmm14
+	movaps [rsp - 168], xmm15
+
+	; Save caller stack pointer:
+	mov [rcx], rsp
+
+	; Restore callee stack pointer:
+	mov rsp, [rdx]
+
+	movaps xmm15, [rsp - 168]
+	movaps xmm14, [rsp - 152]
+	movaps xmm13, [rsp - 136]
+	movaps xmm12, [rsp - 120]
+	movaps xmm11, [rsp - 104]
+	movaps xmm10, [rsp - 88]
+	movaps xmm9, [rsp - 72]
+	movaps xmm8, [rsp - 56]
+	movaps xmm7, [rsp - 40]
+	movaps xmm6, [rsp - 24]
+
+	; Restore callee stack:
+	pop r15
+	pop r14
+	pop r13
+	pop r12
+	pop rsi
+	pop rdi
+	pop rbx
+	pop rbp
+
+	; Restore the thread information block:
+	pop qword ptr gs:[16]
+	pop qword ptr gs:[8]
+
+	; Put the first argument into the return value:
+	mov rax, rcx
+
+	; We pop the return address and jump to it:
+	ret
+coroutine_transfer endp
+
+coroutine_trampoline proc
+	; Do not remove this. This forces 16-byte alignment when entering the coroutine.
+	ret
+coroutine_trampoline endp
+
+end
diff --git a/coroutine/win64/Context.h b/coroutine/win64/Context.h
new file mode 100644
index 0000000000..e28e6a6ff0
--- /dev/null
+++ b/coroutine/win64/Context.h
@@ -0,0 +1,69 @@
+/*
+ *  This file is part of the "Coroutine" project and released under the MIT License.
+ *
+ *  Created by Samuel Williams on 10/5/2018.
+ *  Copyright, 2018, by Samuel Williams.
+*/
+
+#pragma once
+
+#include <assert.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
+
+#define COROUTINE __declspec(noreturn) void
+
+enum {
+    COROUTINE_REGISTERS = 8,
+    COROUTINE_XMM_REGISTERS = 1+10*2,
+};
+
+struct coroutine_context
+{
+    void **stack_pointer;
+};
+
+typedef void(* coroutine_start)(struct coroutine_context *from, struct coroutine_context *self);
+
+void coroutine_trampoline();
+
+static inline void coroutine_initialize_main(struct coroutine_context * context) {
+    context->stack_pointer = NULL;
+}
+
+static inline void coroutine_initialize(
+    struct coroutine_context *context,
+    coroutine_start start,
+    void *stack,
+    size_t size
+) {
+    assert(start && stack && size >= 1024);
+
+    // Stack grows down. Force 16-byte alignment.
+    char * top = (char*)stack + size;
+    context->stack_pointer = (void**)((uintptr_t)top & ~0xF);
+
+    /* Win64 ABI requires space for arguments */
+    context->stack_pointer -= 4;
+
+    /* Return address */
+    *--context->stack_pointer = 0;
+    *--context->stack_pointer = (void*)start;
+    *--context->stack_pointer = (void*)coroutine_trampoline;
+
+    /* Windows Thread Information Block */
+    /* *--context->stack_pointer = 0; */ /* gs:[0x00] is not used */
+    *--context->stack_pointer = (void*)top; /* gs:[0x08] */
+    *--context->stack_pointer = (void*)stack;  /* gs:[0x10] */
+
+    context->stack_pointer -= COROUTINE_REGISTERS;
+    memset(context->stack_pointer, 0, sizeof(void*) * COROUTINE_REGISTERS);
+    memset(context->stack_pointer - COROUTINE_XMM_REGISTERS, 0, sizeof(void*) * COROUTINE_XMM_REGISTERS);
+}
+
+struct coroutine_context * coroutine_transfer(struct coroutine_context * current, struct coroutine_context * target);
+
+static inline void coroutine_destroy(struct coroutine_context * context)
+{
+}
diff --git a/coroutine/x86/Context.S b/coroutine/x86/Context.S
new file mode 100644
index 0000000000..6983f21c3b
--- /dev/null
+++ b/coroutine/x86/Context.S
@@ -0,0 +1,42 @@
+##
+##  This file is part of the "Coroutine" project and released under the MIT License.
+##
+##  Created by Samuel Williams on 3/11/2018.
+##  Copyright, 2018, by Samuel Williams.
+##
+
+#define TOKEN_PASTE(x,y) x##y
+#define PREFIXED_SYMBOL(prefix,name) TOKEN_PASTE(prefix,name)
+
+.text
+
+.globl PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer)
+PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer):
+
+	# Save caller registers
+	pushl %ebp
+	pushl %ebx
+	pushl %edi
+	pushl %esi
+
+	# Save caller stack pointer
+	movl %esp, (%ecx)
+
+	# Restore callee stack pointer
+	movl (%edx), %esp
+
+	# Restore callee stack
+	popl %esi
+	popl %edi
+	popl %ebx
+	popl %ebp
+
+	# Save the first argument as the return value
+	movl %ecx, %eax
+
+	# Jump to the address on the stack
+	ret
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
diff --git a/coroutine/x86/Context.h b/coroutine/x86/Context.h
new file mode 100644
index 0000000000..dfdde24f5d
--- /dev/null
+++ b/coroutine/x86/Context.h
@@ -0,0 +1,55 @@
+/*
+ *  This file is part of the "Coroutine" project and released under the MIT License.
+ *
+ *  Created by Samuel Williams on 3/11/2018.
+ *  Copyright, 2018, by Samuel Williams.
+*/
+
+#pragma once
+
+#include <assert.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
+
+#define COROUTINE __attribute__((noreturn, fastcall)) void
+#define COROUTINE_LIMITED_ADDRESS_SPACE
+
+enum {COROUTINE_REGISTERS = 4};
+
+struct coroutine_context
+{
+    void **stack_pointer;
+};
+
+typedef COROUTINE(* coroutine_start)(struct coroutine_context *from, struct coroutine_context *self) __attribute__((fastcall));
+
+static inline void coroutine_initialize_main(struct coroutine_context * context) {
+    context->stack_pointer = NULL;
+}
+
+static inline void coroutine_initialize(
+    struct coroutine_context *context,
+    coroutine_start start,
+    void *stack,
+    size_t size
+) {
+    assert(start && stack && size >= 1024);
+
+    // Stack grows down. Force 16-byte alignment.
+    char * top = (char*)stack + size;
+    context->stack_pointer = (void**)((uintptr_t)top & ~0xF);
+
+    *--context->stack_pointer = NULL;
+    *--context->stack_pointer = (void*)start;
+
+    context->stack_pointer -= COROUTINE_REGISTERS;
+    memset(context->stack_pointer, 0, sizeof(void*) * COROUTINE_REGISTERS);
+}
+
+struct coroutine_context * coroutine_transfer(struct coroutine_context * current, struct coroutine_context * target) __attribute__((fastcall));
+
+static inline void coroutine_destroy(struct coroutine_context * context)
+{
+    context->stack_pointer = NULL;
+}
diff --git a/coverage/README b/coverage/README
index 7e4ff59e2a..78a01826aa 100644
--- a/coverage/README
+++ b/coverage/README
@@ -4,7 +4,7 @@ The make task `update-coverage' retrieves simplecov for coverage report.
 
 COVERAGE=1 make test-all TESTS=test/cgi
 
-it generate test coverage to coverage directory.
+it generates test coverage to coverage directory.
 
 Limitation
 
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in
index ebcc483f7e..86098814a1 100644
--- a/cygwin/GNUmakefile.in
+++ b/cygwin/GNUmakefile.in
@@ -1,8 +1,14 @@
+gnumake = yes
+
 include Makefile
 
 ENABLE_SHARED=@ENABLE_SHARED@
 DLLWRAP = @DLLWRAP@ --target=@target_os@ --driver-name="$(CC)"
-WINDRES = @WINDRES@ --preprocessor="$(CPP) -xc" -DRC_INVOKED
+windres-cpp := $(CPP) -xc
+windres-cpp := --preprocessor=$(firstword $(windres-cpp)) \
+	$(addprefix --preprocessor-arg=,$(wordlist 2,$(words $(windres-cpp)),$(windres-cpp)))
+WINDRES = @WINDRES@ $(windres-cpp) -DRC_INVOKED
+STRIP = @STRIP@
 
 ifeq (@target_os@,cygwin)
   DLL_BASE_NAME := $(LIBRUBY_SO:.dll=)
@@ -10,9 +16,6 @@ else
   DLL_BASE_NAME := $(RUBY_SO_NAME)
   DLLWRAP += -mno-cygwin
   VPATH := $(VPATH):$(srcdir)/win32
-  STUBPROGRAM = rubystub$(EXEEXT)
-  IGNOREDPATTERNS = %~ .% %.orig %.rej \#%\#
-  SCRIPTPROGRAMS = $(addsuffix $(EXEEXT),$(filter-out $(IGNOREDPATTERNS),$(notdir $(wildcard $(srcdir)/bin/*))))
 endif
 
 ifneq ($(ENABLE_SHARED),yes)
@@ -32,6 +35,8 @@ WPROGRAM = $(RUBYW_INSTALL_NAME)$(EXEEXT)
 
 -include uncommon.mk
 
+include $(srcdir)/defs/gmake.mk
+
 SOLIBS := $(DLL_BASE_NAME).res.@OBJEXT@ $(SOLIBS)
 override EXTOBJS += $(if $(filter-out $(RUBYW_INSTALL_NAME),$(@:$(EXEEXT)=)),$(RUBY_INSTALL_NAME),$(@:$(EXEEXT)=)).res.$(OBJEXT)
 RCFILES = $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(DLL_BASE_NAME).rc
@@ -39,13 +44,6 @@ RUBYDEF = $(DLL_BASE_NAME).def
 
 ruby: $(PROGRAM)
 rubyw: $(WPROGRAM)
-stub: $(STUBPROGRAM)
-scriptbin: $(SCRIPTPROGRAMS)
-
-%$(EXEEXT): bin/% $(STUBPROGRAM)
-	$(ECHO) generating $@
-	$(Q) { cat $(STUBPROGRAM); echo; sed -e '1{' -e '/^#!.*ruby/!i\' -e '#!/bin/ruby' -e '}' $<; } > $@
-	$(Q) chmod +x $@
 
 $(LIBRUBY): $(RUBY_EXP) $(LIBRUBY_SO)
 $(RUBY_EXP) $(LIBRUBY_SO): $(DLL_BASE_NAME).res.@OBJEXT@
@@ -67,11 +65,7 @@ $(WPROGRAM): $(RUBYW_INSTALL_NAME).res.@OBJEXT@
 	$(ECHO) linking $@
 	$(Q) $(PURIFY) $(CC) -mwindows -e $(SYMBOL_PREFIX)mainCRTStartup $(LDFLAGS) $(XLDFLAGS) \
 	  $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@
-$(STUBPROGRAM): $(RUBY_INSTALL_NAME).res.@OBJEXT@ win32/stub.@OBJEXT@
-	@rm -f $@
-	$(ECHO) linking $@
-	$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) \
-	  win32/stub.@OBJEXT@ $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@
+$(STUBPROGRAM): $(RUBY_INSTALL_NAME).res.@OBJEXT@
 
 $(RUBY_EXP): $(LIBRUBY_A)
 	$(ECHO) creating $@
@@ -105,13 +99,5 @@ $(RUBYDEF): $(LIBRUBY_A) $(PREP) $(RBCONFIG)
 
 clean-local::
 	@$(RM) $(RUBYDEF)
-
-ifeq (@target_os@,cygwin)
-cygwin-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)0.dll: $(LIBRUBY_A) $(RUBYDEF)
-	$(ECHO) generating $@
-	$(Q) @DLLWRAP@ -s --def=$(RUBYDEF) -o $@
-endif
-
-clean-local::
 	@$(RM) $(RUBY_EXP) $(RCFILES:.rc=.res.@OBJEXT@)
 	@$(RM) $(RCFILES)
diff --git a/debug.c b/debug.c
index a600259818..75d4cc6569 100644
--- a/debug.c
+++ b/debug.c
@@ -9,13 +9,33 @@
 
 **********************************************************************/
 
-#include "ruby/ruby.h"
+#include "ruby/internal/config.h"
+
+#include <stdio.h>
+
+#include "eval_intern.h"
+#include "id.h"
+#include "internal/signal.h"
+#include "internal/util.h"
 #include "ruby/encoding.h"
+#include "ruby/io.h"
+#include "ruby/ruby.h"
 #include "ruby/util.h"
-#include "vm_debug.h"
-#include "eval_intern.h"
+#include "symbol.h"
 #include "vm_core.h"
-#include "id.h"
+#include "vm_debug.h"
+#include "vm_callinfo.h"
+#include "ruby/thread_native.h"
+#include "ractor_core.h"
+
+/* This is the only place struct RIMemo is actually used */
+struct RIMemo {
+    VALUE flags;
+    VALUE v0;
+    VALUE v1;
+    VALUE v2;
+    VALUE v3;
+};
 
 /* for gdb */
 const union {
@@ -26,15 +46,49 @@ const union {
     enum ruby_method_ids        method_ids;
     enum ruby_id_types          id_types;
     enum ruby_fl_type           fl_types;
+    enum ruby_fl_ushift         fl_ushift;
     enum ruby_encoding_consts   encoding_consts;
     enum ruby_coderange_type    enc_coderange_types;
     enum ruby_econv_flag_type   econv_flag_types;
+    rb_econv_result_t           econv_result;
+    enum ruby_robject_flags     robject_flags;
+    enum ruby_robject_consts    robject_consts;
+    enum ruby_rmodule_flags     rmodule_flags;
+    enum ruby_rstring_flags     rstring_flags;
+    enum ruby_rstring_consts    rstring_consts;
+    enum ruby_rarray_flags      rarray_flags;
+    enum ruby_rarray_consts     rarray_consts;
     enum {
+	RUBY_FMODE_READABLE		= FMODE_READABLE,
+	RUBY_FMODE_WRITABLE		= FMODE_WRITABLE,
+	RUBY_FMODE_READWRITE		= FMODE_READWRITE,
+	RUBY_FMODE_BINMODE		= FMODE_BINMODE,
+	RUBY_FMODE_SYNC 		= FMODE_SYNC,
+	RUBY_FMODE_TTY			= FMODE_TTY,
+	RUBY_FMODE_DUPLEX		= FMODE_DUPLEX,
+	RUBY_FMODE_APPEND		= FMODE_APPEND,
+	RUBY_FMODE_CREATE		= FMODE_CREATE,
+	RUBY_FMODE_NOREVLOOKUP		= 0x00000100,
+	RUBY_FMODE_TRUNC		= FMODE_TRUNC,
+	RUBY_FMODE_TEXTMODE		= FMODE_TEXTMODE,
+	RUBY_FMODE_PREP 		= 0x00010000,
+	RUBY_FMODE_SETENC_BY_BOM	= FMODE_SETENC_BY_BOM,
+	RUBY_FMODE_UNIX 		= 0x00200000,
+	RUBY_FMODE_INET 		= 0x00400000,
+	RUBY_FMODE_INET6		= 0x00800000,
+
         RUBY_NODE_TYPESHIFT = NODE_TYPESHIFT,
         RUBY_NODE_TYPEMASK  = NODE_TYPEMASK,
         RUBY_NODE_LSHIFT    = NODE_LSHIFT,
         RUBY_NODE_FL_NEWLINE   = NODE_FL_NEWLINE
     } various;
+    union {
+	enum imemo_type                     types;
+	enum {RUBY_IMEMO_MASK = IMEMO_MASK} mask;
+	struct RIMemo                      *ptr;
+    } imemo;
+    struct RSymbol *symbol_ptr;
+    enum vm_call_flag_bits vm_call_flags;
 } ruby_dummy_gdb_enums;
 
 const SIGNED_VALUE RUBY_NODE_LMASK = NODE_LMASK;
@@ -59,14 +113,16 @@ ruby_debug_printf(const char *format, ...)
     va_end(ap);
 }
 
+#include "gc.h"
+
 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 == (VALUE)(SIGNED_VALUE)-1 ? "" : StringValueCStr(str));
+	char buff[0x100];
+	rb_raw_obj_info(buff, 0x100, obj);
+
+	fprintf(stderr, "DBG> %s: %s\n", header, buff);
 	fflush(stderr);
     }
     return obj;
@@ -104,29 +160,352 @@ ruby_debug_breakpoint(void)
     /* */
 }
 
-static void
-set_debug_option(const char *str, int len, void *arg)
-{
-#if defined _WIN32 && RUBY_MSVCRT_VERSION >= 80
-    extern int ruby_w32_rtc_error;
+#if defined _WIN32
+# if RUBY_MSVCRT_VERSION >= 80
+extern int ruby_w32_rtc_error;
+# endif
 #endif
+#if defined _WIN32 || defined __CYGWIN__
+#include <windows.h>
+UINT ruby_w32_codepage[2];
+#endif
+extern int ruby_rgengc_debug;
+extern int ruby_on_ci;
+
+int
+ruby_env_debug_option(const char *str, int len, void *arg)
+{
+    int ov;
+    size_t retlen;
+    unsigned long n;
 #define SET_WHEN(name, var, val) do {	    \
 	if (len == sizeof(name) - 1 &&	    \
 	    strncmp(str, (name), len) == 0) { \
 	    (var) = (val);		    \
-	    return;			    \
+	    return 1;			    \
 	}				    \
     } while (0)
+#define NAME_MATCH_VALUE(name)				\
+    ((size_t)len >= sizeof(name)-1 &&			\
+     strncmp(str, (name), sizeof(name)-1) == 0 &&	\
+     ((len == sizeof(name)-1 && !(len = 0)) ||		\
+      (str[sizeof(name)-1] == '=' &&			\
+       (str += sizeof(name), len -= sizeof(name), 1))))
+#define SET_UINT(val) do { \
+	n = ruby_scan_digits(str, len, 10, &retlen, &ov); \
+	if (!ov && retlen) { \
+	    val = (unsigned int)n; \
+	} \
+	str += retlen; \
+	len -= retlen; \
+    } while (0)
+#define SET_UINT_LIST(name, vals, num) do { \
+	int i; \
+	for (i = 0; i < (num); ++i) { \
+	    SET_UINT((vals)[i]); \
+	    if (!len || *str != ':') break; \
+	    ++str; \
+	    --len; \
+	} \
+	if (len > 0) { \
+	    fprintf(stderr, "ignored "name" option: `%.*s'\n", len, str); \
+	} \
+    } while (0)
+#define SET_WHEN_UINT(name, vals, num, req) \
+    if (NAME_MATCH_VALUE(name)) SET_UINT_LIST(name, vals, num);
+
     SET_WHEN("gc_stress", *ruby_initial_gc_stress_ptr, Qtrue);
     SET_WHEN("core", ruby_enable_coredump, 1);
-#if defined _WIN32 && RUBY_MSVCRT_VERSION >= 80
+    SET_WHEN("ci", ruby_on_ci, 1);
+    if (NAME_MATCH_VALUE("rgengc")) {
+	if (!len) ruby_rgengc_debug = 1;
+	else SET_UINT_LIST("rgengc", &ruby_rgengc_debug, 1);
+	return 1;
+    }
+#if defined _WIN32
+# if RUBY_MSVCRT_VERSION >= 80
     SET_WHEN("rtc_error", ruby_w32_rtc_error, 1);
+# endif
 #endif
-    fprintf(stderr, "unexpected debug option: %.*s\n", len, str);
+#if defined _WIN32 || defined __CYGWIN__
+    if (NAME_MATCH_VALUE("codepage")) {
+	if (!len) fprintf(stderr, "missing codepage argument");
+	else SET_UINT_LIST("codepage", ruby_w32_codepage, numberof(ruby_w32_codepage));
+	return 1;
+    }
+#endif
+    return 0;
+}
+
+static void
+set_debug_option(const char *str, int len, void *arg)
+{
+    if (!ruby_env_debug_option(str, len, arg)) {
+	fprintf(stderr, "unexpected debug option: %.*s\n", len, str);
+    }
 }
 
+#ifdef USE_RUBY_DEBUG_LOG
+STATIC_ASSERT(USE_RUBY_DEBUG_LOG, USE_RUBY_DEBUG_LOG ? RUBY_DEVEL : 1);
+#endif
+
+#if RUBY_DEVEL
+static void setup_debug_log(void);
+#else
+#define setup_debug_log()
+#endif
+
 void
 ruby_set_debug_option(const char *str)
 {
     ruby_each_words(str, set_debug_option, 0);
+    setup_debug_log();
+}
+
+#if RUBY_DEVEL
+
+// RUBY_DEBUG_LOG features
+// See vm_debug.h comments for details.
+
+#define MAX_DEBUG_LOG             0x1000
+#define MAX_DEBUG_LOG_MESSAGE_LEN 0x0200
+#define MAX_DEBUG_LOG_FILTER      0x0010
+
+enum ruby_debug_log_mode ruby_debug_log_mode;
+
+static struct {
+    char *mem;
+    unsigned int cnt;
+    char filters[MAX_DEBUG_LOG_FILTER][MAX_DEBUG_LOG_FILTER];
+    unsigned int filters_num;
+    rb_nativethread_lock_t lock;
+    FILE *output;
+} debug_log;
+
+static char *
+RUBY_DEBUG_LOG_MEM_ENTRY(unsigned int index)
+{
+    return &debug_log.mem[MAX_DEBUG_LOG_MESSAGE_LEN * index];
+}
+
+static void
+setup_debug_log(void)
+{
+    // check RUBY_DEBUG_LOG
+    const char *log_config = getenv("RUBY_DEBUG_LOG");
+    if (log_config) {
+        fprintf(stderr, "RUBY_DEBUG_LOG=%s\n", log_config);
+
+        if  (strcmp(log_config, "mem") == 0) {
+            debug_log.mem = (char *)malloc(MAX_DEBUG_LOG * MAX_DEBUG_LOG_MESSAGE_LEN);
+            if (debug_log.mem == NULL) {
+                fprintf(stderr, "setup_debug_log failed (can't allocate memory)\n");
+                exit(1);
+            }
+            ruby_debug_log_mode |= ruby_debug_log_memory;
+        }
+        else if (strcmp(log_config, "stderr") == 0) {
+            ruby_debug_log_mode |= ruby_debug_log_stderr;
+        }
+        else {
+            ruby_debug_log_mode |= ruby_debug_log_file;
+            if ((debug_log.output = fopen(log_config, "w")) == NULL) {
+                fprintf(stderr, "can not open %s for RUBY_DEBUG_LOG\n", log_config);
+                exit(1);
+            }
+            setvbuf(debug_log.output, NULL, _IONBF, 0);
+        }
+
+        rb_nativethread_lock_initialize(&debug_log.lock);
+    }
+
+    // check RUBY_DEBUG_LOG_FILTER
+    const char *filter_config = getenv("RUBY_DEBUG_LOG_FILTER");
+    if (filter_config && strlen(filter_config) > 0) {
+        unsigned int i;
+        for (i=0; i<MAX_DEBUG_LOG_FILTER; i++) {
+            const char *p;
+            if ((p = strchr(filter_config, ',')) == NULL) {
+                if (strlen(filter_config) >= MAX_DEBUG_LOG_FILTER) {
+                    fprintf(stderr, "too long: %s (max:%d)\n", filter_config, MAX_DEBUG_LOG_FILTER);
+                    exit(1);
+                }
+                strncpy(debug_log.filters[i], filter_config, MAX_DEBUG_LOG_FILTER - 1);
+                i++;
+                break;
+            }
+            else {
+                size_t n = p - filter_config;
+                if (n >= MAX_DEBUG_LOG_FILTER) {
+                    fprintf(stderr, "too long: %s (max:%d)\n", filter_config, MAX_DEBUG_LOG_FILTER);
+                    exit(1);
+                }
+                strncpy(debug_log.filters[i], filter_config, n);
+                filter_config = p+1;
+            }
+        }
+        debug_log.filters_num = i;
+        for (i=0; i<debug_log.filters_num; i++) {
+            fprintf(stderr, "RUBY_DEBUG_LOG_FILTER[%d]=%s\n", i, debug_log.filters[i]);
+        }
+    }
+}
+
+bool
+ruby_debug_log_filter(const char *func_name)
+{
+    if (debug_log.filters_num > 0) {
+        for (unsigned int i = 0; i<debug_log.filters_num; i++) {
+            if (strstr(func_name, debug_log.filters[i]) != NULL) {
+                return true;
+            }
+        }
+        return false;
+    }
+    else {
+        return true;
+    }
+}
+
+static const char *
+pretty_filename(const char *path)
+{
+    // basename is one idea.
+    const char *s;
+    while ((s = strchr(path, '/')) != NULL) {
+        path = s+1;
+    }
+    return path;
+}
+
+void
+ruby_debug_log(const char *file, int line, const char *func_name, const char *fmt, ...)
+{
+    char buff[MAX_DEBUG_LOG_MESSAGE_LEN] = {0};
+    int len = 0;
+    int r = 0;
+
+    // message title
+    if (func_name && len < MAX_DEBUG_LOG_MESSAGE_LEN) {
+        r = snprintf(buff + len, MAX_DEBUG_LOG_MESSAGE_LEN, "%s\t", func_name);
+        if (r < 0) rb_bug("ruby_debug_log returns %d\n", r);
+        len += r;
+    }
+
+    // message
+    if (fmt && len < MAX_DEBUG_LOG_MESSAGE_LEN) {
+        va_list args;
+        va_start(args, fmt);
+        r = vsnprintf(buff + len, MAX_DEBUG_LOG_MESSAGE_LEN - len, fmt, args);
+        va_end(args);
+        if (r < 0) rb_bug("ruby_debug_log vsnprintf() returns %d", r);
+        len += r;
+    }
+
+    // optional information
+
+    // C location
+    if (file && len < MAX_DEBUG_LOG_MESSAGE_LEN) {
+        r = snprintf(buff + len, MAX_DEBUG_LOG_MESSAGE_LEN, "\t%s:%d", pretty_filename(file), line);
+        if (r < 0) rb_bug("ruby_debug_log returns %d\n", r);
+        len += r;
+    }
+
+    // Ruby location
+    int ruby_line;
+    const char *ruby_file = rb_source_location_cstr(&ruby_line);
+    if (len < MAX_DEBUG_LOG_MESSAGE_LEN) {
+        if (ruby_file) {
+            r = snprintf(buff + len, MAX_DEBUG_LOG_MESSAGE_LEN - len, "\t%s:%d", pretty_filename(ruby_file), ruby_line);
+        }
+        else {
+            r = snprintf(buff + len, MAX_DEBUG_LOG_MESSAGE_LEN - len, "\t");
+        }
+        if (r < 0) rb_bug("ruby_debug_log returns %d\n", r);
+        len += r;
+    }
+
+    // ractor information
+    if (ruby_single_main_ractor == NULL) {
+        rb_ractor_t *cr = GET_RACTOR();
+        if (r && len < MAX_DEBUG_LOG_MESSAGE_LEN) {
+            r = snprintf(buff + len, MAX_DEBUG_LOG_MESSAGE_LEN - len, "\tr:#%u/%u",
+                         (unsigned int)rb_ractor_id(cr), GET_VM()->ractor.cnt);
+            if (r < 0) rb_bug("ruby_debug_log returns %d\n", r);
+            len += r;
+        }
+    }
+
+    // thread information
+    if (!rb_thread_alone()) {
+        const rb_thread_t *th = GET_THREAD();
+        if (r && len < MAX_DEBUG_LOG_MESSAGE_LEN) {
+            r = snprintf(buff + len, MAX_DEBUG_LOG_MESSAGE_LEN - len, "\tth:%p", (void *)th);
+            if (r < 0) rb_bug("ruby_debug_log returns %d\n", r);
+            len += r;
+        }
+    }
+
+    rb_nativethread_lock_lock(&debug_log.lock);
+    {
+        unsigned int cnt = debug_log.cnt++;
+
+        if (ruby_debug_log_mode & ruby_debug_log_memory) {
+            unsigned int index = cnt % MAX_DEBUG_LOG;
+            char *dst = RUBY_DEBUG_LOG_MEM_ENTRY(index);
+            strncpy(dst, buff, MAX_DEBUG_LOG_MESSAGE_LEN);
+        }
+        if (ruby_debug_log_mode & ruby_debug_log_stderr) {
+            fprintf(stderr, "%4u: %s\n", cnt, buff);
+        }
+        if (ruby_debug_log_mode & ruby_debug_log_file) {
+            fprintf(debug_log.output, "%u\t%s\n", cnt, buff);
+        }
+    }
+    rb_nativethread_lock_unlock(&debug_log.lock);
+}
+
+// for debugger
+static void
+debug_log_dump(FILE *out, unsigned int n)
+{
+    if (ruby_debug_log_mode & ruby_debug_log_memory) {
+        unsigned int size = debug_log.cnt > MAX_DEBUG_LOG ? MAX_DEBUG_LOG : debug_log.cnt;
+        unsigned int current_index = debug_log.cnt % MAX_DEBUG_LOG;
+        if (n == 0) n = size;
+        if (n > size) n = size;
+
+        for (unsigned int i=0; i<n; i++) {
+            int index = current_index - size + i;
+            if (index < 0) index += MAX_DEBUG_LOG;
+            VM_ASSERT(index <= MAX_DEBUG_LOG);
+            const char *mesg = RUBY_DEBUG_LOG_MEM_ENTRY(index);;
+            fprintf(out, "%4u: %s\n", debug_log.cnt - size + i, mesg);
+        }
+    }
+    else {
+        fprintf(stderr, "RUBY_DEBUG_LOG=mem is not specified.");
+    }
+}
+
+// for debuggers
+
+void
+ruby_debug_log_print(unsigned int n)
+{
+    debug_log_dump(stderr, n);
+}
+
+void
+ruby_debug_log_dump(const char *fname, unsigned int n)
+{
+    FILE *fp = fopen(fname, "w");
+    if (fp == NULL) {
+        fprintf(stderr, "can't open %s. give up.\n", fname);
+    }
+    else {
+        debug_log_dump(fp, n);
+        fclose(fp);
+    }
 }
+#endif // #if RUBY_DEVEL
diff --git a/debug_counter.c b/debug_counter.c
new file mode 100644
index 0000000000..e7b0bb0acd
--- /dev/null
+++ b/debug_counter.c
@@ -0,0 +1,160 @@
+/**********************************************************************
+
+  debug_counter.c -
+
+  created at: Tue Feb 21 16:51:18 2017
+
+  Copyright (C) 2017 Koichi Sasada
+
+**********************************************************************/
+
+#include "debug_counter.h"
+#include "internal.h"
+#include <stdio.h>
+#include <locale.h>
+#include "ruby/thread_native.h"
+
+#if USE_DEBUG_COUNTER
+
+static const char *const debug_counter_names[] = {
+    ""
+#define RB_DEBUG_COUNTER(name) #name,
+#include "debug_counter.h"
+#undef RB_DEBUG_COUNTER
+};
+
+MJIT_SYMBOL_EXPORT_BEGIN
+size_t rb_debug_counter[numberof(debug_counter_names)];
+void rb_debug_counter_add_atomic(enum rb_debug_counter_type type, int add);
+MJIT_SYMBOL_EXPORT_END
+
+rb_nativethread_lock_t debug_counter_lock;
+
+__attribute__((constructor))
+static void
+debug_counter_setup(void)
+{
+    rb_nativethread_lock_initialize(&debug_counter_lock);
+}
+
+void
+rb_debug_counter_add_atomic(enum rb_debug_counter_type type, int add)
+{
+    rb_nativethread_lock_lock(&debug_counter_lock);
+    {
+        rb_debug_counter[(int)type] += add;
+    }
+    rb_nativethread_lock_unlock(&debug_counter_lock);
+}
+
+int debug_counter_disable_show_at_exit = 0;
+
+// note that this operation is not atomic.
+void
+ruby_debug_counter_reset(void)
+{
+    for (int i = 0; i < RB_DEBUG_COUNTER_MAX; i++) {
+        switch (i) {
+          case RB_DEBUG_COUNTER_mjit_length_unit_queue:
+          case RB_DEBUG_COUNTER_mjit_length_active_units:
+          case RB_DEBUG_COUNTER_mjit_length_compact_units:
+          case RB_DEBUG_COUNTER_mjit_length_stale_units:
+            // These counters may be decreased and should not be reset.
+            break;
+          default:
+            rb_debug_counter[i] = 0;
+            break;
+        }
+    }
+}
+
+// note that this operation is not atomic.
+size_t
+ruby_debug_counter_get(const char **names_ptr, size_t *counters_ptr)
+{
+    int i;
+    if (names_ptr != NULL) {
+        for (i=0; i<RB_DEBUG_COUNTER_MAX; i++) {
+            names_ptr[i] = debug_counter_names[i];
+        }
+    }
+    if (counters_ptr != NULL) {
+        for (i=0; i<RB_DEBUG_COUNTER_MAX; i++) {
+            counters_ptr[i] = rb_debug_counter[i];
+        }
+    }
+
+    return RB_DEBUG_COUNTER_MAX;
+}
+
+void
+ruby_debug_counter_show_at_exit(int enable)
+{
+    debug_counter_disable_show_at_exit = !enable;
+}
+
+void
+rb_debug_counter_show_results(const char *msg)
+{
+    const char *env = getenv("RUBY_DEBUG_COUNTER_DISABLE");
+
+    setlocale(LC_NUMERIC, "");
+
+    if (env == NULL || strcmp("1", env) != 0) {
+	int i;
+        fprintf(stderr, "[RUBY_DEBUG_COUNTER]\t%d %s\n", getpid(), msg);
+	for (i=0; i<RB_DEBUG_COUNTER_MAX; i++) {
+            fprintf(stderr, "[RUBY_DEBUG_COUNTER]\t%-30s\t%'14"PRIuSIZE"\n",
+		    debug_counter_names[i],
+		    rb_debug_counter[i]);
+	}
+    }
+}
+
+VALUE
+rb_debug_counter_show(RB_UNUSED_VAR(VALUE klass))
+{
+    rb_debug_counter_show_results("show_debug_counters");
+    ruby_debug_counter_show_at_exit(FALSE);
+    return Qnil;
+}
+
+VALUE
+rb_debug_counter_reset(RB_UNUSED_VAR(VALUE klass))
+{
+    ruby_debug_counter_reset();
+    return Qnil;
+}
+
+__attribute__((destructor))
+static void
+debug_counter_show_results_at_exit(void)
+{
+    if (debug_counter_disable_show_at_exit == 0) {
+        rb_debug_counter_show_results("normal exit.");
+    }
+}
+
+#else
+
+void
+rb_debug_counter_show_results(const char *msg)
+{
+}
+
+size_t
+ruby_debug_counter_get(const char **names_ptr, size_t *counters_ptr)
+{
+    return 0;
+}
+void
+ruby_debug_counter_reset(void)
+{
+}
+
+void
+ruby_debug_counter_show_at_exit(int enable)
+{
+}
+
+#endif /* USE_DEBUG_COUNTER */
diff --git a/debug_counter.h b/debug_counter.h
new file mode 100644
index 0000000000..3c20821db6
--- /dev/null
+++ b/debug_counter.h
@@ -0,0 +1,461 @@
+/**********************************************************************
+
+  debug_counter.h -
+
+  created at: Tue Feb 21 16:51:18 2017
+
+  Copyright (C) 2017 Koichi Sasada
+
+**********************************************************************/
+
+#ifndef USE_DEBUG_COUNTER
+#define USE_DEBUG_COUNTER 0
+#endif
+
+#ifdef RB_DEBUG_COUNTER
+
+// method cache (IMC: inline method cache)
+RB_DEBUG_COUNTER(mc_inline_hit)              // IMC hit
+RB_DEBUG_COUNTER(mc_inline_miss_klass)       // IMC miss by different class
+RB_DEBUG_COUNTER(mc_inline_miss_invalidated) // IMC miss by invalidated ME
+RB_DEBUG_COUNTER(mc_inline_miss_empty)       // IMC miss because prev is empty slot
+RB_DEBUG_COUNTER(mc_inline_miss_same_cc)     // IMC miss, but same CC
+RB_DEBUG_COUNTER(mc_inline_miss_same_cme)    // IMC miss, but same CME
+RB_DEBUG_COUNTER(mc_inline_miss_same_def)    // IMC miss, but same definition
+RB_DEBUG_COUNTER(mc_inline_miss_diff)        // IMC miss, different methods
+
+RB_DEBUG_COUNTER(mc_cme_complement)          // number of acquiring complement CME
+RB_DEBUG_COUNTER(mc_cme_complement_hit)      // number of cache hit for complemented CME
+
+RB_DEBUG_COUNTER(mc_search)                  // count for method lookup in class tree
+RB_DEBUG_COUNTER(mc_search_notfound)         //           method lookup, but not found
+RB_DEBUG_COUNTER(mc_search_super)            // total traversed classes
+
+// callinfo
+RB_DEBUG_COUNTER(ci_packed)  // number of packed CI
+RB_DEBUG_COUNTER(ci_kw)      //           non-packed CI w/ keywords
+RB_DEBUG_COUNTER(ci_nokw)    //           non-packed CI w/o keywords
+RB_DEBUG_COUNTER(ci_runtime) //           creating temporary CI
+
+// callcache
+RB_DEBUG_COUNTER(cc_new)        // number of CC
+RB_DEBUG_COUNTER(cc_temp)       //           dummy CC (stack-allocated)
+RB_DEBUG_COUNTER(cc_found_in_ccs)      // count for CC lookup success in CCS
+RB_DEBUG_COUNTER(cc_not_found_in_ccs)  // count for CC lookup success in CCS
+
+RB_DEBUG_COUNTER(cc_ent_invalidate) // count for invalidating cc (cc->klass = 0)
+RB_DEBUG_COUNTER(cc_cme_invalidate) // count for invalidating CME
+
+RB_DEBUG_COUNTER(cc_invalidate_leaf)          // count for invalidating klass if klass has no-sublcasses
+RB_DEBUG_COUNTER(cc_invalidate_leaf_ccs)      //                        corresponding CCS
+RB_DEBUG_COUNTER(cc_invalidate_leaf_callable) //                        complimented cache (no-subclasses)
+RB_DEBUG_COUNTER(cc_invalidate_tree)          // count for invalidating klass if klass has sublcasses
+RB_DEBUG_COUNTER(cc_invalidate_tree_cme)      //                        cme if cme is found in this class or superclasses
+RB_DEBUG_COUNTER(cc_invalidate_tree_callable) //                        complimented cache (subclasses)
+RB_DEBUG_COUNTER(cc_invalidate_negative)      // count for invalidating negative cache
+
+RB_DEBUG_COUNTER(ccs_free)   // count for free'ing ccs
+RB_DEBUG_COUNTER(ccs_maxlen) // maximum length of ccs
+RB_DEBUG_COUNTER(ccs_found)      // count for finding corresponding ccs on method lookup
+RB_DEBUG_COUNTER(ccs_not_found)  // count for not found corresponding ccs on method lookup
+
+// vm_eval.c
+RB_DEBUG_COUNTER(call0_public)
+RB_DEBUG_COUNTER(call0_other)
+RB_DEBUG_COUNTER(gccct_hit)
+RB_DEBUG_COUNTER(gccct_miss)
+RB_DEBUG_COUNTER(gccct_null)
+
+// iseq
+RB_DEBUG_COUNTER(iseq_num)    // number of total created iseq
+RB_DEBUG_COUNTER(iseq_cd_num) // number of total created cd (call_data)
+
+/*
+ * call cache fastpath usage
+ */
+RB_DEBUG_COUNTER(ccf_general)
+RB_DEBUG_COUNTER(ccf_iseq_setup)
+RB_DEBUG_COUNTER(ccf_iseq_setup_0start)
+RB_DEBUG_COUNTER(ccf_iseq_setup_tailcall_0start)
+RB_DEBUG_COUNTER(ccf_iseq_fix) /* several functions created with tool/mk_call_iseq_optimized.rb */
+RB_DEBUG_COUNTER(ccf_iseq_opt) /* has_opt == TRUE (has optional parameters), but other flags are FALSE */
+RB_DEBUG_COUNTER(ccf_iseq_kw1) /* vm_call_iseq_setup_kwparm_kwarg() */
+RB_DEBUG_COUNTER(ccf_iseq_kw2) /* vm_call_iseq_setup_kwparm_nokwarg() */
+RB_DEBUG_COUNTER(ccf_cfunc)
+RB_DEBUG_COUNTER(ccf_cfunc_with_frame)
+RB_DEBUG_COUNTER(ccf_ivar) /* attr_reader */
+RB_DEBUG_COUNTER(ccf_attrset) /* attr_writer */
+RB_DEBUG_COUNTER(ccf_method_missing)
+RB_DEBUG_COUNTER(ccf_zsuper)
+RB_DEBUG_COUNTER(ccf_bmethod)
+RB_DEBUG_COUNTER(ccf_opt_send)
+RB_DEBUG_COUNTER(ccf_opt_call)
+RB_DEBUG_COUNTER(ccf_opt_block_call)
+RB_DEBUG_COUNTER(ccf_super_method)
+
+/*
+ * control frame push counts.
+ *
+ * * frame_push: frame push counts.
+ * * frame_push_*: frame push counts per each type.
+ * * frame_R2R: Ruby frame to Ruby frame
+ * * frame_R2C: Ruby frame to C frame
+ * * frame_C2C: C frame to C frame
+ * * frame_C2R: C frame to Ruby frame
+ */
+RB_DEBUG_COUNTER(frame_push)
+RB_DEBUG_COUNTER(frame_push_method)
+RB_DEBUG_COUNTER(frame_push_block)
+RB_DEBUG_COUNTER(frame_push_class)
+RB_DEBUG_COUNTER(frame_push_top)
+RB_DEBUG_COUNTER(frame_push_cfunc)
+RB_DEBUG_COUNTER(frame_push_ifunc)
+RB_DEBUG_COUNTER(frame_push_eval)
+RB_DEBUG_COUNTER(frame_push_rescue)
+RB_DEBUG_COUNTER(frame_push_dummy)
+
+RB_DEBUG_COUNTER(frame_R2R)
+RB_DEBUG_COUNTER(frame_R2C)
+RB_DEBUG_COUNTER(frame_C2C)
+RB_DEBUG_COUNTER(frame_C2R)
+
+/* instance variable counts
+ *
+ * * ivar_get_ic_hit/miss: ivar_get inline cache (ic) hit/miss counts (VM insn)
+ * * ivar_get_ic_miss_serial: ivar_get ic miss reason by serial (VM insn)
+ * * ivar_get_ic_miss_unset:                      ... by unset (VM insn)
+ * * ivar_get_ic_miss_noobject:                   ... by "not T_OBJECT" (VM insn)
+ * * ivar_set_...: same counts with ivar_set (VM insn)
+ * * ivar_get/set_base: call counts of "rb_ivar_get/set()".
+ *                      because of (1) ic miss.
+ *                                 (2) direct call by C extensions.
+ */
+RB_DEBUG_COUNTER(ivar_get_ic_hit)
+RB_DEBUG_COUNTER(ivar_get_ic_miss)
+RB_DEBUG_COUNTER(ivar_get_ic_miss_serial)
+RB_DEBUG_COUNTER(ivar_get_ic_miss_unset)
+RB_DEBUG_COUNTER(ivar_get_ic_miss_noobject)
+RB_DEBUG_COUNTER(ivar_set_ic_hit)
+RB_DEBUG_COUNTER(ivar_set_ic_miss)
+RB_DEBUG_COUNTER(ivar_set_ic_miss_serial)
+RB_DEBUG_COUNTER(ivar_set_ic_miss_unset)
+RB_DEBUG_COUNTER(ivar_set_ic_miss_iv_hit)
+RB_DEBUG_COUNTER(ivar_set_ic_miss_noobject)
+RB_DEBUG_COUNTER(ivar_get_base)
+RB_DEBUG_COUNTER(ivar_set_base)
+
+/* local variable counts
+ *
+ * * lvar_get: total lvar get counts (VM insn)
+ * * lvar_get_dynamic: lvar get counts if accessing upper env (VM insn)
+ * * lvar_set*: same as "get"
+ * * lvar_set_slowpath: counts using vm_env_write_slowpath()
+ */
+RB_DEBUG_COUNTER(lvar_get)
+RB_DEBUG_COUNTER(lvar_get_dynamic)
+RB_DEBUG_COUNTER(lvar_set)
+RB_DEBUG_COUNTER(lvar_set_dynamic)
+RB_DEBUG_COUNTER(lvar_set_slowpath)
+
+/* GC counts:
+ *
+ * * count: simple count
+ * * _minor: minor gc
+ * * _major: major gc
+ * * other suffix is corresponding to last_gc_info or
+ *   gc_profile_record_flag in gc.c.
+ */
+RB_DEBUG_COUNTER(gc_count)
+RB_DEBUG_COUNTER(gc_minor_newobj)
+RB_DEBUG_COUNTER(gc_minor_malloc)
+RB_DEBUG_COUNTER(gc_minor_method)
+RB_DEBUG_COUNTER(gc_minor_capi)
+RB_DEBUG_COUNTER(gc_minor_stress)
+RB_DEBUG_COUNTER(gc_major_nofree)
+RB_DEBUG_COUNTER(gc_major_oldgen)
+RB_DEBUG_COUNTER(gc_major_shady)
+RB_DEBUG_COUNTER(gc_major_force)
+RB_DEBUG_COUNTER(gc_major_oldmalloc)
+
+RB_DEBUG_COUNTER(gc_enter_start)
+RB_DEBUG_COUNTER(gc_enter_mark_continue)
+RB_DEBUG_COUNTER(gc_enter_sweep_continue)
+RB_DEBUG_COUNTER(gc_enter_rest)
+RB_DEBUG_COUNTER(gc_enter_finalizer)
+
+RB_DEBUG_COUNTER(gc_isptr_trial)
+RB_DEBUG_COUNTER(gc_isptr_range)
+RB_DEBUG_COUNTER(gc_isptr_align)
+RB_DEBUG_COUNTER(gc_isptr_maybe)
+
+/* object allocation counts:
+ *
+ * * obj_newobj: newobj counts
+ * * obj_newobj_slowpath: newobj with slowpath counts
+ * * obj_newobj_wb_unprotected: newobj for wb_unprotected.
+ * * obj_free: obj_free() counts
+ * * obj_promote: promoted counts (oldgen)
+ * * obj_wb_unprotect: wb unprotect counts
+ *
+ * * obj_[type]_[attr]: *free'ed counts* for each type.
+ *                      Note that it is not a allocated counts.
+ * * [type]
+ *   * _obj: T_OBJECT
+ *   * _str: T_STRING
+ *   * _ary: T_ARRAY
+ *   * _xxx: T_XXX (hash, struct, ...)
+ *
+ * * [attr]
+ *   * _ptr: R?? is not embed.
+ *   * _embed: R?? is embed.
+ *   * _transient: R?? uses transient heap.
+ * * type specific attr.
+ *   * str_shared: str is shared.
+ *   * str_nofree:        nofree
+ *   * str_fstr:          fstr
+ *   * hash_empty: hash is empty
+ *   * hash_1_4:       has 1 to 4 entries
+ *   * hash_5_8:       has 5 to 8 entries
+ *   * hash_g8:        has n entries (n>8)
+ *   * match_under4:    has under 4 oniguruma regions allocated
+ *   * match_ge4:       has n regions allocated (4<=n<8)
+ *   * match_ge8:       has n regions allocated (8<=n)
+ *   * data_empty: T_DATA but no memory free.
+ *   * data_xfree:        free'ed by xfree().
+ *   * data_imm_free:     free'ed immediately.
+ *   * data_zombie:       free'ed with zombie.
+ *   * imemo_*: T_IMEMO with each type.
+ */
+RB_DEBUG_COUNTER(obj_newobj)
+RB_DEBUG_COUNTER(obj_newobj_slowpath)
+RB_DEBUG_COUNTER(obj_newobj_wb_unprotected)
+RB_DEBUG_COUNTER(obj_free)
+RB_DEBUG_COUNTER(obj_promote)
+RB_DEBUG_COUNTER(obj_wb_unprotect)
+
+RB_DEBUG_COUNTER(obj_obj_embed)
+RB_DEBUG_COUNTER(obj_obj_transient)
+RB_DEBUG_COUNTER(obj_obj_ptr)
+
+RB_DEBUG_COUNTER(obj_str_ptr)
+RB_DEBUG_COUNTER(obj_str_embed)
+RB_DEBUG_COUNTER(obj_str_shared)
+RB_DEBUG_COUNTER(obj_str_nofree)
+RB_DEBUG_COUNTER(obj_str_fstr)
+
+RB_DEBUG_COUNTER(obj_ary_embed)
+RB_DEBUG_COUNTER(obj_ary_transient)
+RB_DEBUG_COUNTER(obj_ary_ptr)
+RB_DEBUG_COUNTER(obj_ary_extracapa)
+/*
+  ary_shared_create: shared ary by Array#dup and so on.
+  ary_shared: finished in shard.
+  ary_shared_root_occupied: shared_root but has only 1 refcnt.
+    The number (ary_shared - ary_shared_root_occupied) is meaningful.
+ */
+RB_DEBUG_COUNTER(obj_ary_shared_create)
+RB_DEBUG_COUNTER(obj_ary_shared)
+RB_DEBUG_COUNTER(obj_ary_shared_root_occupied)
+
+RB_DEBUG_COUNTER(obj_hash_empty)
+RB_DEBUG_COUNTER(obj_hash_1)
+RB_DEBUG_COUNTER(obj_hash_2)
+RB_DEBUG_COUNTER(obj_hash_3)
+RB_DEBUG_COUNTER(obj_hash_4)
+RB_DEBUG_COUNTER(obj_hash_5_8)
+RB_DEBUG_COUNTER(obj_hash_g8)
+
+RB_DEBUG_COUNTER(obj_hash_null)
+RB_DEBUG_COUNTER(obj_hash_ar)
+RB_DEBUG_COUNTER(obj_hash_st)
+RB_DEBUG_COUNTER(obj_hash_transient)
+RB_DEBUG_COUNTER(obj_hash_force_convert)
+
+RB_DEBUG_COUNTER(obj_struct_embed)
+RB_DEBUG_COUNTER(obj_struct_transient)
+RB_DEBUG_COUNTER(obj_struct_ptr)
+
+RB_DEBUG_COUNTER(obj_data_empty)
+RB_DEBUG_COUNTER(obj_data_xfree)
+RB_DEBUG_COUNTER(obj_data_imm_free)
+RB_DEBUG_COUNTER(obj_data_zombie)
+
+RB_DEBUG_COUNTER(obj_match_under4)
+RB_DEBUG_COUNTER(obj_match_ge4)
+RB_DEBUG_COUNTER(obj_match_ge8)
+RB_DEBUG_COUNTER(obj_match_ptr)
+
+RB_DEBUG_COUNTER(obj_iclass_ptr)
+RB_DEBUG_COUNTER(obj_class_ptr)
+RB_DEBUG_COUNTER(obj_module_ptr)
+
+RB_DEBUG_COUNTER(obj_bignum_ptr)
+RB_DEBUG_COUNTER(obj_bignum_embed)
+RB_DEBUG_COUNTER(obj_float)
+RB_DEBUG_COUNTER(obj_complex)
+RB_DEBUG_COUNTER(obj_rational)
+
+RB_DEBUG_COUNTER(obj_regexp_ptr)
+RB_DEBUG_COUNTER(obj_file_ptr)
+RB_DEBUG_COUNTER(obj_symbol)
+
+RB_DEBUG_COUNTER(obj_imemo_ment)
+RB_DEBUG_COUNTER(obj_imemo_iseq)
+RB_DEBUG_COUNTER(obj_imemo_env)
+RB_DEBUG_COUNTER(obj_imemo_tmpbuf)
+RB_DEBUG_COUNTER(obj_imemo_ast)
+RB_DEBUG_COUNTER(obj_imemo_cref)
+RB_DEBUG_COUNTER(obj_imemo_svar)
+RB_DEBUG_COUNTER(obj_imemo_throw_data)
+RB_DEBUG_COUNTER(obj_imemo_ifunc)
+RB_DEBUG_COUNTER(obj_imemo_memo)
+RB_DEBUG_COUNTER(obj_imemo_parser_strterm)
+RB_DEBUG_COUNTER(obj_imemo_callinfo)
+RB_DEBUG_COUNTER(obj_imemo_callcache)
+RB_DEBUG_COUNTER(obj_imemo_constcache)
+
+/* ar_table */
+RB_DEBUG_COUNTER(artable_hint_hit)
+RB_DEBUG_COUNTER(artable_hint_miss)
+RB_DEBUG_COUNTER(artable_hint_notfound)
+
+/* heap function counts
+ *
+ * * heap_xmalloc/realloc/xfree: call counts
+ */
+RB_DEBUG_COUNTER(heap_xmalloc)
+RB_DEBUG_COUNTER(heap_xrealloc)
+RB_DEBUG_COUNTER(heap_xfree)
+
+/* transient_heap */
+RB_DEBUG_COUNTER(theap_alloc)
+RB_DEBUG_COUNTER(theap_alloc_fail)
+RB_DEBUG_COUNTER(theap_evacuate)
+
+// VM sync
+RB_DEBUG_COUNTER(vm_sync_lock)
+RB_DEBUG_COUNTER(vm_sync_lock_enter)
+RB_DEBUG_COUNTER(vm_sync_lock_enter_nb)
+RB_DEBUG_COUNTER(vm_sync_lock_enter_cr)
+RB_DEBUG_COUNTER(vm_sync_barrier)
+
+/* mjit_exec() counts */
+RB_DEBUG_COUNTER(mjit_exec)
+RB_DEBUG_COUNTER(mjit_exec_not_added)
+RB_DEBUG_COUNTER(mjit_exec_not_ready)
+RB_DEBUG_COUNTER(mjit_exec_not_compiled)
+RB_DEBUG_COUNTER(mjit_exec_call_func)
+
+/* MJIT enqueue / unload */
+RB_DEBUG_COUNTER(mjit_add_iseq_to_process)
+RB_DEBUG_COUNTER(mjit_unload_units)
+
+/* MJIT <-> VM frame push counts */
+RB_DEBUG_COUNTER(mjit_frame_VM2VM)
+RB_DEBUG_COUNTER(mjit_frame_VM2JT)
+RB_DEBUG_COUNTER(mjit_frame_JT2JT)
+RB_DEBUG_COUNTER(mjit_frame_JT2VM)
+
+/* MJIT cancel counters */
+RB_DEBUG_COUNTER(mjit_cancel)
+RB_DEBUG_COUNTER(mjit_cancel_ivar_inline)
+RB_DEBUG_COUNTER(mjit_cancel_exivar_inline)
+RB_DEBUG_COUNTER(mjit_cancel_send_inline)
+RB_DEBUG_COUNTER(mjit_cancel_opt_insn) /* CALL_SIMPLE_METHOD */
+RB_DEBUG_COUNTER(mjit_cancel_invalidate_all)
+RB_DEBUG_COUNTER(mjit_cancel_leave)
+
+/* rb_mjit_unit_list length */
+RB_DEBUG_COUNTER(mjit_length_unit_queue)
+RB_DEBUG_COUNTER(mjit_length_active_units)
+RB_DEBUG_COUNTER(mjit_length_compact_units)
+RB_DEBUG_COUNTER(mjit_length_stale_units)
+
+/* Other MJIT counters */
+RB_DEBUG_COUNTER(mjit_compile_failures)
+
+/* load (not implemented yet) */
+/*
+RB_DEBUG_COUNTER(load_files)
+RB_DEBUG_COUNTER(load_path_is_not_realpath)
+*/
+#endif
+
+#ifndef RUBY_DEBUG_COUNTER_H
+#define RUBY_DEBUG_COUNTER_H 1
+
+#include "ruby/internal/config.h"
+#include <stddef.h>             /* for size_t */
+#include "ruby/ruby.h"          /* for VALUE */
+
+#if !defined(__GNUC__) && USE_DEBUG_COUNTER
+#error "USE_DEBUG_COUNTER is not supported by other than __GNUC__"
+#endif
+
+enum rb_debug_counter_type {
+#define RB_DEBUG_COUNTER(name) RB_DEBUG_COUNTER_##name,
+#include __FILE__
+    RB_DEBUG_COUNTER_MAX
+#undef RB_DEBUG_COUNTER
+};
+
+#if USE_DEBUG_COUNTER
+extern size_t rb_debug_counter[];
+RUBY_EXTERN struct rb_ractor_struct *ruby_single_main_ractor;
+RUBY_EXTERN void rb_debug_counter_add_atomic(enum rb_debug_counter_type type, int add);
+
+inline static int
+rb_debug_counter_add(enum rb_debug_counter_type type, int add, int cond)
+{
+    if (cond) {
+        if (ruby_single_main_ractor != NULL) {
+            rb_debug_counter[(int)type] += add;
+        }
+        else {
+            rb_debug_counter_add_atomic(type, add);
+        }
+    }
+    return cond;
+}
+
+inline static int
+rb_debug_counter_max(enum rb_debug_counter_type type, unsigned int num)
+{
+    // TODO: sync
+    if (rb_debug_counter[(int)type] < num) {
+        rb_debug_counter[(int)type] = num;
+        return 1;
+    }
+    else {
+        return 0;
+    }
+}
+
+VALUE rb_debug_counter_reset(VALUE klass);
+VALUE rb_debug_counter_show(VALUE klass);
+
+#define RB_DEBUG_COUNTER_INC(type)                rb_debug_counter_add(RB_DEBUG_COUNTER_##type, 1, 1)
+#define RB_DEBUG_COUNTER_INC_UNLESS(type, cond) (!rb_debug_counter_add(RB_DEBUG_COUNTER_##type, 1, !(cond)))
+#define RB_DEBUG_COUNTER_INC_IF(type, cond)       rb_debug_counter_add(RB_DEBUG_COUNTER_##type, 1, !!(cond))
+#define RB_DEBUG_COUNTER_ADD(type, num)           rb_debug_counter_add(RB_DEBUG_COUNTER_##type, (num), 1)
+#define RB_DEBUG_COUNTER_SETMAX(type, num)        rb_debug_counter_max(RB_DEBUG_COUNTER_##type, (unsigned int)(num))
+
+#else
+#define RB_DEBUG_COUNTER_INC(type)              ((void)0)
+#define RB_DEBUG_COUNTER_INC_UNLESS(type, cond) (!!(cond))
+#define RB_DEBUG_COUNTER_INC_IF(type, cond)     (!!(cond))
+#define RB_DEBUG_COUNTER_ADD(type, num)         ((void)0)
+#define RB_DEBUG_COUNTER_SETMAX(type, num)      0
+#endif
+
+void rb_debug_counter_show_results(const char *msg);
+
+RUBY_SYMBOL_EXPORT_BEGIN
+
+size_t ruby_debug_counter_get(const char **names_ptr, size_t *counters_ptr);
+void ruby_debug_counter_reset(void);
+void ruby_debug_counter_show_at_exit(int enable);
+
+RUBY_SYMBOL_EXPORT_END
+
+#endif /* RUBY_DEBUG_COUNTER_H */
diff --git a/defs/gmake.mk b/defs/gmake.mk
index ddc4276342..f093fd4e26 100644
--- a/defs/gmake.mk
+++ b/defs/gmake.mk
@@ -1,13 +1,32 @@
-# -*- makefile-gmake -*-
-gnumake = yes
+# -*- mode: makefile-gmake; indent-tabs-mode: t -*-
 
-CHECK_TARGETS := exam love check%
-TEST_TARGETS := $(filter check test check% test% btest%,$(MAKECMDGOALS))
-TEST_TARGETS += $(subst check,test-all,$(patsubst check-%,test-%,$(TEST_TARGETS)))
-TEST_TARGETS := $(patsubst test-%,yes-test-%,$(patsubst btest-%,yes-btest-%,$(TEST_TARGETS)))
-TEST_DEPENDS := $(if $(TEST_TARGETS),$(filter all main exts,$(MAKECMDGOALS)))
-TEST_DEPENDS += $(if $(filter $(CHECK_TARGETS),$(MAKECMDGOALS)),main)
-TEST_DEPENDS += $(if $(filter main,$(TEST_DEPENDS)),$(if $(filter all,$(INSTALLDOC)),docs))
+reconfig config.status: export MAKE:=$(MAKE)
+override gnumake_recursive := $(if $(findstring n,$(firstword $(MFLAGS))),,+)
+override mflags := $(filter-out -j%,$(MFLAGS))
+MSPECOPT += $(if $(filter -j%,$(MFLAGS)),-j)
+nproc = $(subst -j,,$(filter -j%,$(MFLAGS)))
+
+CHECK_TARGETS := great exam love check test check% test% btest%
+# expand test targets, and those dependents
+TEST_TARGETS := $(filter $(CHECK_TARGETS),$(MAKECMDGOALS))
+TEST_DEPENDS := $(filter-out commit $(TEST_TARGETS),$(MAKECMDGOALS))
+TEST_TARGETS := $(patsubst great,exam,$(TEST_TARGETS))
+TEST_DEPENDS := $(filter-out great $(TEST_TARGETS),$(TEST_DEPENDS))
+TEST_TARGETS := $(patsubst exam,check,$(TEST_TARGETS))
+TEST_TARGETS := $(patsubst check,test-spec test-all test-tool test-short,$(TEST_TARGETS))
+TEST_TARGETS := $(patsubst test-rubyspec,test-spec,$(TEST_TARGETS))
+TEST_DEPENDS := $(filter-out exam check test-spec $(TEST_TARGETS),$(TEST_DEPENDS))
+TEST_TARGETS := $(patsubst love,check,$(TEST_TARGETS))
+TEST_DEPENDS := $(filter-out love $(TEST_TARGETS),$(TEST_DEPENDS))
+TEST_TARGETS := $(patsubst test-almost,test-all,$(patsubst check-%,test test-%,$(TEST_TARGETS)))
+TEST_DEPENDS := $(filter-out test-all $(TEST_TARGETS),$(TEST_DEPENDS))
+TEST_TARGETS := $(patsubst test,test-short,$(TEST_TARGETS))
+TEST_DEPENDS := $(filter-out test $(TEST_TARGETS),$(TEST_DEPENDS))
+TEST_TARGETS := $(patsubst test-short,btest-ruby test-knownbug test-basic,$(TEST_TARGETS))
+TEST_DEPENDS := $(filter-out test-short $(TEST_TARGETS),$(TEST_DEPENDS))
+TEST_DEPENDS += $(if $(filter great exam love check,$(MAKECMDGOALS)),all exts)
+
+in-srcdir := $(if $(filter-out .,$(srcdir)),$(CHDIR) $(srcdir) &&)
 
 ifneq ($(filter -O0 -Od,$(optflags)),)
 override XCFLAGS := $(filter-out -D_FORTIFY_SOURCE=%,$(XCFLAGS))
@@ -36,25 +55,25 @@ define archcmd
 %.i: %.$(1).i
 endef
 
-$(foreach arch,$(filter -arch=%,$(subst -arch ,-arch=,$(ARCH_FLAG))),\
+$(foreach arch,$(arch_flags),\
 	$(eval $(call archcmd,$(patsubst -arch=%,%,$(value arch)),$(patsubst -arch=%,-arch %,$(value arch)))))
 endif
 
-ifneq ($(filter $(CHECK_TARGETS) test,$(MAKECMDGOALS)),)
-yes-test-basic: $(TEST_DEPENDS) yes-test-knownbug
-yes-test-knownbug: $(TEST_DEPENDS) yes-btest-ruby
-yes-btest-ruby: $(TEST_DEPENDS)
-endif
-ifneq ($(filter $(CHECK_TARGETS),$(MAKECMDGOALS)) $(filter yes-test-all,$(TEST_TARGETS)),)
-yes-test-testframework yes-test-almost yes-test-ruby: $(filter-out %test-all %test-ruby check%,$(TEST_TARGETS)) \
-	yes-test-basic
-endif
-ifneq ($(filter $(CHECK_TARGETS),$(MAKECMDGOALS))$(if $(filter test-all,$(MAKECMDGOALS)),$(filter test-knownbug,$(MAKECMDGOALS))),)
-yes-test-testframework yes-test-almost yes-test-ruby: yes-test-knownbug
-yes-test-almost: yes-test-testframework
+.PHONY: $(addprefix yes-,$(TEST_TARGETS))
+
+ifneq ($(filter-out btest%,$(TEST_TARGETS)),)
+$(addprefix yes-,$(TEST_TARGETS)): $(TEST_DEPENDS)
 endif
 
-$(TEST_TARGETS): $(TEST_DEPENDS)
+ORDERED_TEST_TARGETS := $(filter $(TEST_TARGETS), \
+	btest-ruby test-knownbug test-basic \
+	test-testframework test-tool test-ruby test-all \
+	test-spec test-bundler-prepare test-bundler test-bundler-parallel \
+	)
+prev_test := $(if $(filter test-spec,$(ORDERED_TEST_TARGETS)),test-spec-precheck)
+$(foreach test,$(ORDERED_TEST_TARGETS), \
+	$(eval yes-$(value test) no-$(value test): $(value prev_test)); \
+	$(eval prev_test := $(value test)))
 
 ifneq ($(if $(filter install,$(MAKECMDGOALS)),$(filter uninstall,$(MAKECMDGOALS))),)
 install-targets := $(filter install uninstall,$(MAKECMDGOALS))
@@ -66,24 +85,23 @@ install-prereq: uninstall
 uninstall sudo-precheck: all $(if $(filter all,$(INSTALLDOC)),docs)
 endif
 
-ifneq ($(filter exam,$(MAKECMDGOALS)),)
-test-rubyspec: check
-yes-test-all no-test-all: test
-endif
-
 ifneq ($(filter love,$(MAKECMDGOALS)),)
 showflags: up
-sudo-precheck: test
+sudo-precheck: test yes-test-testframework no-test-testframework
 install-prereq: sudo-precheck
 yes-test-all no-test-all: install
 endif
+yes-test-bundler-parallel: PARALLELRSPECOPTS += $(if $(nproc),-n$(shell expr $(nproc) + $(nproc) / 2))
+
+# Cross reference needs to parse all files at once
+love install reinstall: RDOCFLAGS = --force-update
 
 $(srcdir)/missing/des_tables.c: $(srcdir)/missing/crypt.c
 ifeq ($(if $(filter yes,$(CROSS_COMPILING)),,$(CC)),)
 	touch $@
 else
 	@$(ECHO) building make_des_table
-	$(CC) $(CPPFLAGS) -DDUMP $(LDFLAGS) $(XLDFLAGS) $(LIBS) -omake_des_table $(srcdir)/missing/crypt.c
+	$(CC) $(INCFLAGS) $(CPPFLAGS) -DDUMP $(LDFLAGS) $(XLDFLAGS) $(LIBS) -omake_des_table $(srcdir)/missing/crypt.c
 	@[ -x ./make_des_table ]
 	@$(ECHO) generating $@
 	$(Q) $(MAKEDIRS) $(@D)
@@ -91,3 +109,288 @@ else
 	$(Q) mv $@.new $@
 	$(Q) $(RMALL) make_des_table*
 endif
+
+config.status: $(wildcard config.cache)
+
+STUBPROGRAM = rubystub$(EXEEXT)
+IGNOREDPATTERNS = %~ .% %.orig %.rej \#%\#
+SCRIPTBINDIR := $(if $(EXEEXT),,exec/)
+SCRIPTPROGRAMS = $(addprefix $(SCRIPTBINDIR),$(addsuffix $(EXEEXT),$(filter-out $(IGNOREDPATTERNS),$(notdir $(wildcard $(srcdir)/libexec/*)))))
+
+stub: $(STUBPROGRAM)
+scriptbin: $(SCRIPTPROGRAMS)
+ifneq ($(STUBPROGRAM),rubystub)
+rubystub: $(STUBPROGRAM)
+endif
+
+$(SCRIPTPROGRAMS): $(STUBPROGRAM)
+
+$(STUBPROGRAM): rubystub.$(OBJEXT) $(LIBRUBY) $(MAINOBJ) $(OBJS) $(EXTOBJS) $(SETUP) $(PREP)
+
+rubystub$(EXEEXT):
+	@rm -f $@
+	$(ECHO) linking $@
+	$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) rubystub.$(OBJEXT) $(EXTOBJS) $(LIBRUBYARG) $(MAINLIBS) $(LIBS) $(EXTLIBS) $(OUTFLAG)$@
+	$(Q) $(POSTLINK)
+	$(if $(STRIP),$(Q) $(STRIP) $@)
+
+$(SCRIPTBINDIR)%$(EXEEXT): bin/% $(STUBPROGRAM) \
+			   $(if $(SCRIPTBINDIR),$(TIMESTAMPDIR)/.exec.time)
+	$(ECHO) generating $@
+	$(Q) { cat $(STUBPROGRAM); echo; sed -e '1{' -e '/^#!.*ruby/!i\' -e '#!/bin/ruby' -e '}' $<; } > $@
+	$(Q) chmod +x $@
+	$(Q) $(POSTLINK)
+
+$(TIMESTAMPDIR)/.exec.time:
+	$(Q) mkdir exec
+	$(Q) exit > $@
+
+.PHONY: commit
+commit: $(if $(filter commit,$(MAKECMDGOALS)),$(filter-out commit,$(MAKECMDGOALS))) up
+	@$(BASERUBY) -C "$(srcdir)" -I./tool/lib -rvcs -e 'VCS.detect(".").commit'
+	+$(Q) \
+	{ \
+	  $(in-srcdir) \
+	  exec sed -f tool/prereq.status defs/gmake.mk template/Makefile.in common.mk; \
+	} | \
+	$(MAKE) $(mflags) Q=$(Q) ECHO=$(ECHO) srcdir="$(srcdir)" srcs_vpath="" CHDIR="$(CHDIR)" \
+		BOOTSTRAPRUBY="$(BOOTSTRAPRUBY)" MINIRUBY="$(BASERUBY)" BASERUBY="$(BASERUBY)" \
+		VCSUP="" ENC_MK=.top-enc.mk REVISION_FORCE=PHONY CONFIGURE="$(CONFIGURE)" -f - \
+		update-src srcs all-incs
+
+GITHUB_RUBY_URL = https://github.com/ruby/ruby
+PR =
+
+COMMIT_GPG_SIGN = $(shell git -C "$(srcdir)" config commit.gpgsign)
+REMOTE_GITHUB_URL = $(shell git -C "$(srcdir)" config remote.github.url)
+COMMITS_NOTES = commits
+
+.PHONY: fetch-github
+fetch-github:
+	$(call fetch-github,$(PR))
+
+define fetch-github
+	$(if $(1),,\
+	  echo "usage:"; echo "  make $@ PR=1234"; \
+	  exit 1; \
+	)
+	$(eval REMOTE_GITHUB_URL := $(REMOTE_GITHUB_URL))
+	$(if $(REMOTE_GITHUB_URL),, \
+	  echo adding $(GITHUB_RUBY_URL) as remote github; \
+	  git -C "$(srcdir)" remote add github $(GITHUB_RUBY_URL); \
+	  git -C "$(srcdir)" config --add remote.github.fetch +refs/notes/$(COMMITS_NOTES):refs/notes/$(COMMITS_NOTES)
+	  $(eval REMOTE_GITHUB_URL := $(GITHUB_RUBY_URL)) \
+	)
+	$(if $(git -C "$(srcdir)" rev-parse "github/pull/$(1)/head" -- 2> /dev/null), \
+	    git -C "$(srcdir)" branch -f "gh-$(1)" "github/pull/$(1)/head", \
+	    git -C "$(srcdir)" fetch -f github "pull/$(1)/head:gh-$(1)" \
+	)
+endef
+
+.PHONY: checkout-github
+checkout-github: fetch-github
+	git -C "$(srcdir)" checkout "gh-$(PR)"
+
+.PHONY: update-github
+update-github: fetch-github
+	$(eval PULL_REQUEST_API := https://api.github.com/repos/ruby/ruby/pulls/$(PR))
+	$(eval PULL_REQUEST_FORK_BRANCH := $(shell \
+	  curl -s $(if $(GITHUB_TOKEN),-H "Authorization: bearer $(GITHUB_TOKEN)") $(PULL_REQUEST_API) | \
+	  $(BASERUBY) -rjson -e 'JSON.parse(STDIN.read)["head"].tap { |h| print "#{h["repo"]["full_name"]} #{h["ref"]}" }' \
+	))
+	$(eval FORK_REPO := $(word 1,$(PULL_REQUEST_FORK_BRANCH)))
+	$(eval PR_BRANCH := $(word 2,$(PULL_REQUEST_FORK_BRANCH)))
+
+	$(eval GITHUB_UPDATE_WORKTREE := $(shell mktemp -d "$(srcdir)/gh-$(PR)-XXXXXX"))
+	git -C "$(srcdir)" worktree add $(notdir $(GITHUB_UPDATE_WORKTREE)) "gh-$(PR)"
+	git -C "$(GITHUB_UPDATE_WORKTREE)" merge master --no-edit
+	@$(BASERUBY) -e 'print "Are you sure to push this to PR=$(PR)? [Y/n]: "; exit(gets.chomp != "n")'
+	git -C "$(srcdir)" remote add fork-$(PR) git@github.com:$(FORK_REPO).git
+	git -C "$(GITHUB_UPDATE_WORKTREE)" push fork-$(PR) gh-$(PR):$(PR_BRANCH)
+	git -C "$(srcdir)" remote rm fork-$(PR)
+	git -C "$(srcdir)" worktree remove $(notdir $(GITHUB_UPDATE_WORKTREE))
+	git -C "$(srcdir)" branch -D gh-$(PR)
+
+.PHONY: pull-github
+pull-github: fetch-github
+	$(call pull-github,$(PR))
+
+define pull-github
+	$(eval GITHUB_MERGE_BASE := $(shell git -C "$(srcdir)" log -1 --format=format:%H))
+	$(eval GITHUB_MERGE_BRANCH := $(shell git -C "$(srcdir)" symbolic-ref --short HEAD))
+	$(eval GITHUB_MERGE_WORKTREE := $(shell mktemp -d "$(srcdir)/gh-$(1)-XXXXXX"))
+	git -C "$(srcdir)" worktree add $(notdir $(GITHUB_MERGE_WORKTREE)) "gh-$(1)"
+	git -C "$(GITHUB_MERGE_WORKTREE)" rebase $(GITHUB_MERGE_BRANCH)
+	$(eval COMMIT_GPG_SIGN := $(COMMIT_GPG_SIGN))
+	$(if $(filter true,$(COMMIT_GPG_SIGN)), \
+	  git -C "$(GITHUB_MERGE_WORKTREE)" rebase --exec "git commit --amend --no-edit -S" "$(GITHUB_MERGE_BASE)"; \
+	)
+	git -C "$(GITHUB_MERGE_WORKTREE)" rebase --exec "git notes add --message 'Merged: $(GITHUB_RUBY_URL)/pull/$(1)'" "$(GITHUB_MERGE_BASE)"
+endef
+
+.PHONY: fetch-github-%
+fetch-github-%:
+	$(call fetch-github,$*)
+
+.PHONY: checkout-github-%
+checkout-github-%: fetch-github-%
+	git -C "$(srcdir)" checkout "gh-$*"
+
+.PHONY: pr-% pull-github-%
+pr-% pull-github-%: fetch-github-%
+	$(call pull-github,$*)
+
+HELP_EXTRA_TASKS = \
+	"  checkout-github:     checkout GitHub Pull Request [PR=1234]" \
+	"  pull-github:         rebase GitHub Pull Request to new worktree [PR=1234]" \
+	"  update-github:       merge master branch and push it to Pull Request [PR=1234]" \
+	""
+
+extract-gems: $(HAVE_BASERUBY:yes=update-gems)
+
+bundled-gems := $(shell sed '/^[ 	]*\#/d;/^[ 	]*$$/d;s/[ 	][ 	]*/-/;s/[ 	].*//' $(srcdir)/gems/bundled_gems)
+
+update-gems: | $(patsubst %,gems/%.gem,$(bundled-gems))
+
+test-bundler-precheck: | $(srcdir)/.bundle/cache
+
+$(srcdir)/.bundle/cache:
+	$(MAKEDIRS) $(@D) $(CACHE_DIR)
+	$(LN_S) ../.downloaded-cache $@
+
+gems/%.gem:
+	$(ECHO) Downloading bundled gem $*...
+	$(Q) $(BASERUBY) -C "$(srcdir)" \
+	    -I./tool -rdownloader \
+	    -e 'gem = "$(@F)"' \
+	    -e 'old = Dir.glob("gems/"+gem.sub(/-[^-]*$$/, "-*.gem"))' \
+	    -e 'Downloader::RubyGems.download(gem, "gems", nil) and' \
+	    -e '(old.delete("gems/#{gem}"); !old.empty?) and' \
+	    -e 'File.unlink(*old) and' \
+	    -e 'FileUtils.rm_rf(old.map{'"|n|"'n.chomp(".gem")})'
+
+extract-gems: | $(patsubst %,.bundle/gems/%,$(bundled-gems))
+
+.bundle/gems/%: gems/%.gem | .bundle/gems
+	$(ECHO) Extracting bundle gem $*...
+	$(Q) $(BASERUBY) -C "$(srcdir)" \
+	    -Itool -rgem-unpack \
+	    -e 'Gem.unpack("gems/$(@F).gem", ".bundle/gems")'
+
+$(srcdir)/.bundle/gems:
+	$(MAKEDIRS) $@
+
+ifneq ($(filter update-bundled_gems refresh-gems,$(MAKECMDGOALS)),)
+update-gems: update-bundled_gems
+endif
+
+ifeq ($(filter 0 1,$(words $(arch_flags))),)
+$(foreach x,$(patsubst -arch=%,%,$(arch_flags)), \
+	  $(eval $$(MJIT_HEADER:.h=)-$(value x).h \
+		 $$(MJIT_MIN_HEADER:.h=)-$(value x).h \
+		 $$(TIMESTAMPDIR)/$$(MJIT_HEADER:.h=)-$(value x).time \
+		 : ARCH_FLAG := -arch $(value x)))
+
+$(foreach x,$(patsubst -arch=%,%,$(arch_flags)), \
+	$(eval $$(MJIT_HEADER:.h=)-$(value x).h: \
+		$$(TIMESTAMPDIR)/$$(MJIT_HEADER:.h=)-$(value x).time))
+
+mjit_min_headers := $(patsubst -arch=%,$(MJIT_MIN_HEADER:.h=-%.h),$(arch_flags))
+$(MJIT_MIN_HEADER): $(mjit_min_headers) $(PREP)
+	@ set -e; set $(patsubst -arch=%,%,$(arch_flags)); \
+	cd $(@D); h=$(@F:.h=); \
+	exec > $(@F).new; \
+	echo '#if 0'; \
+	for arch; do\
+	  echo "#elif defined __$${arch}__"; \
+	  echo "# include \"$$h-$$arch.h\""; \
+	done; \
+	echo "#else"; echo "# error unsupported platform"; echo "#endif"
+	$(IFCHANGE) $@ $@.new
+	$(Q) $(MAKEDIRS) $(MJIT_HEADER_INSTALL_DIR)
+	$(Q) $(MAKE_LINK) $@ $(MJIT_HEADER_INSTALL_DIR)/$(@F)
+
+endif
+
+ifeq ($(if $(wildcard $(filter-out .,$(UNICODE_FILES) $(UNICODE_PROPERTY_FILES))),,\
+	   $(wildcard $(srcdir)/lib/unicode_normalize/tables.rb)),)
+# Needs the dependency when any Unicode data file exists, or
+# normalization tables script doesn't.  Otherwise, when the target
+# only exists, use it as-is.
+.PHONY: $(UNICODE_SRC_DATA_DIR)/.unicode-tables.time
+UNICODE_TABLES_TIMESTAMP =
+$(UNICODE_SRC_DATA_DIR)/.unicode-tables.time: \
+	$(UNICODE_FILES) $(UNICODE_PROPERTY_FILES)
+endif
+
+REVISION_IN_HEADER := $(shell sed -n 's/^\#define RUBY_FULL_REVISION "\(.*\)"/\1/p' $(srcdir)/revision.h 2>/dev/null)
+REVISION_LATEST := $(shell $(CHDIR) $(srcdir) && git log -1 --format=%H 2>/dev/null)
+ifneq ($(REVISION_IN_HEADER),$(REVISION_LATEST))
+# GNU make treat the target as unmodified when its dependents get
+# updated but it is not updated, while others may not.
+$(srcdir)/revision.h: $(REVISION_H)
+endif
+
+# Query on the generated rdoc
+#
+#   $ make rdoc:Integer#+
+rdoc\:%: PHONY
+	$(Q)$(RUNRUBY) $(srcdir)/libexec/ri --no-standard-docs --doc-dir=$(RDOCOUT) $(patsubst rdoc:%,%,$@)
+
+test_%.rb test/%: programs PHONY
+	$(Q)$(exec) $(RUNRUBY) "$(TESTSDIR)/runner.rb" --ruby="$(RUNRUBY)" $(TEST_EXCLUDES) $(TESTOPTS) -- $(patsubst test/%,%,$@)
+
+spec/bundler/%: PHONY
+	$(Q)$(exec) $(XRUBY) -C $(srcdir) -Ispec/bundler .bundle/bin/rspec --require spec_helper $(RSPECOPTS) $@
+
+spec/bundler: test-bundler-parallel
+	$(Q)$(NULLCMD)
+
+spec/%: programs exts PHONY
+	$(RUNRUBY) -r./$(arch)-fake $(srcdir)/spec/mspec/bin/mspec-run -B $(srcdir)/spec/default.mspec $(SPECOPTS) $(patsubst %,$(srcdir)/%,$@)
+
+benchmark/%: miniruby$(EXEEXT) update-benchmark-driver PHONY
+	$(Q)$(BASERUBY) -rrubygems -I$(srcdir)/benchmark/lib $(srcdir)/benchmark/benchmark-driver/exe/benchmark-driver \
+	            --executables="compare-ruby::$(COMPARE_RUBY) -I$(EXTOUT)/common --disable-gem" \
+	            --executables="built-ruby::$(BENCH_RUBY) --disable-gem" \
+	            $(srcdir)/$@ $(BENCH_OPTS) $(OPTS)
+
+clean-srcs-ext::
+	$(Q)$(RM) $(patsubst $(srcdir)/%,%,$(EXT_SRCS))
+
+clean-srcs-extra::
+	$(Q)$(RM) $(patsubst $(srcdir)/%,%,$(EXTRA_SRCS))
+
+ifneq ($(filter $(VCS),git),)
+update-src::
+	@$(BASERUBY) $(tooldir)/lib/colorize.rb pass "Latest commit hash = $(shell $(filter-out svn,$(VCS)) -C $(srcdir) rev-parse --short=10 HEAD)"
+endif
+
+# Update dependencies and commit the updates to the current branch.
+update-deps:
+	$(eval update_deps := $(shell date +update-deps-%Y%m%d))
+	$(eval deps_dir := $(shell mktemp -d)/$(update_deps))
+	$(eval GIT_DIR := $(shell git -C $(srcdir) rev-parse --absolute-git-dir))
+	git --git-dir=$(GIT_DIR) worktree add $(deps_dir)
+	cp $(tooldir)/config.guess $(tooldir)/config.sub $(deps_dir)/tool
+	[ -f config.status ] && cp config.status $(deps_dir)
+	cd $(deps_dir) && autoconf && \
+	exec ./configure -q -C --enable-load-relative --disable-install-doc --disable-rubygems 'optflags=-O0' 'debugflags=-save-temps=obj -g'
+	$(RUNRUBY) -C $(deps_dir) tool/update-deps --fix
+	git -C $(deps_dir) diff --no-ext-diff --ignore-submodules --exit-code || \
+	    git -C $(deps_dir) commit --all --message='Update dependencies'
+	git --git-dir=$(GIT_DIR) worktree remove $(deps_dir)
+	$(RMDIR) $(dir $(deps_dir))
+	git --git-dir=$(GIT_DIR) merge --no-edit --ff-only $(update_deps)
+	git --git-dir=$(GIT_DIR) branch --delete $(update_deps)
+
+# order-only-prerequisites doesn't work for $(RUBYSPEC_CAPIEXT)
+# because the same named directory exists in the source tree.
+$(RUBYSPEC_CAPIEXT)/%.$(DLEXT): $(srcdir)/$(RUBYSPEC_CAPIEXT)/%.c $(srcdir)/$(RUBYSPEC_CAPIEXT)/rubyspec.h $(RUBY_H_INCLUDES) $(LIBRUBY_SO)
+	$(ECHO) building $@
+	$(Q) $(MAKEDIRS) $(@D)
+	$(Q) $(DLDSHARED) $(XDLDFLAGS) $(XLDFLAGS) $(ARCH_FLAG) $(ARCH_FLAG) $(CFLAGS) $(INCFLAGS) $(CPPFLAGS) $(OUTFLAG)$@ $< $(LIBRUBY_SO)
+	$(Q) $(RMALL) $@.*
+
+rubyspec-capiext: $(patsubst %.c,$(RUBYSPEC_CAPIEXT)/%.$(DLEXT),$(notdir $(wildcard $(srcdir)/$(RUBYSPEC_CAPIEXT)/*.c)))
+	@ $(NULLCMD)
diff --git a/defs/id.def b/defs/id.def
index 4fe9d3ccd8..fc7a04ffbc 100644
--- a/defs/id.def
+++ b/defs/id.def
@@ -3,6 +3,7 @@ firstline, predefined = __LINE__+1, %[\
   max
   min
   freeze
+  nil?
   inspect
   intern
   object_id
@@ -38,13 +39,37 @@ firstline, predefined = __LINE__+1, %[\
   to_a
   to_s
   to_i
+  to_f
+  to_r
   bt
   bt_locations
   call
   mesg
   exception
+  locals
+  not                                                   NOT
+  and                                                   AND
+  or                                                    OR
+  div
+  divmod
+  fdiv
+  quo
+  name
+  nil
 
   _                                                     UScore
+
+  # MUST be successive
+  _1  NUMPARAM_1
+  _2  NUMPARAM_2
+  _3  NUMPARAM_3
+  _4  NUMPARAM_4
+  _5  NUMPARAM_5
+  _6  NUMPARAM_6
+  _7  NUMPARAM_7
+  _8  NUMPARAM_8
+  _9  NUMPARAM_9
+
   "/*NULL*/"                                            NULL
   empty?
   eql?
@@ -58,25 +83,26 @@ firstline, predefined = __LINE__+1, %[\
   core#define_method
   core#define_singleton_method
   core#set_postexe
-  core#hash_from_ary
-  core#hash_merge_ary
   core#hash_merge_ptr
   core#hash_merge_kwd
+  core#raise
 
   -                                                     debug#created_info
 
   $_                                                    LASTLINE
   $~                                                    BACKREF
+  $!                                                    ERROR_INFO
 ]
 
 # VM ID         OP      Parser Token
 token_ops = %[\
   Dot2          ..      DOT2
   Dot3          ...     DOT3
+  BDot2         ..      BDOT2
+  BDot3         ...     BDOT3
   UPlus         +@      UPLUS
   UMinus        -@      UMINUS
   Pow           **      POW
-  DSTAR         **
   Cmp           <=>     CMP
   PLUS          +
   MINUS         -
@@ -93,13 +119,14 @@ token_ops = %[\
   Eqq           ===     EQQ
   Neq           !=      NEQ
   Not           !
+  And           &
+  Or            |
   Backquote     `
   EqTilde       =~      MATCH
   NeqTilde      !~      NMATCH
   AREF          []
   ASET          []=
   COLON2        ::
-  COLON3        ::
   ANDOP         &&
   OROP          ||
   ANDDOT        &.
diff --git a/defs/keywords b/defs/keywords
index e0d931cd1f..fc30ec2d15 100644
--- a/defs/keywords
+++ b/defs/keywords
@@ -1,8 +1,8 @@
 %{
-struct kwtable {int name, id[2], state;};
+struct kwtable {short name, id[2], state;};
 const struct kwtable *rb_reserved_word(const char *, unsigned int);
 #ifndef RIPPER
-static const struct kwtable *reserved_word(const char *, unsigned int);
+static const struct kwtable *reserved_word(/*!ANSI{*/const char *, unsigned int/*}!ANSI*/);
 #define rb_reserved_word(str, len) reserved_word(str, len)
 %}
 
diff --git a/defs/known_errors.def b/defs/known_errors.def
index b9c490d3a2..e9694cfbda 100644
--- a/defs/known_errors.def
+++ b/defs/known_errors.def
@@ -1,148 +1,157 @@
-EPERM
-ENOENT
-ESRCH
-EINTR
-EIO
-ENXIO
 E2BIG
-ENOEXEC
-EBADF
-ECHILD
-EAGAIN
-ENOMEM
 EACCES
-EFAULT
-ENOTBLK
-EBUSY
-EEXIST
-EXDEV
-ENODEV
-ENOTDIR
-EISDIR
-EINVAL
-ENFILE
-EMFILE
-ENOTTY
-ETXTBSY
-EFBIG
-ENOSPC
-ESPIPE
-EROFS
-EMLINK
-EPIPE
-EDOM
-ERANGE
-EDEADLK
-ENAMETOOLONG
-ENOLCK
-ENOSYS
-ENOTEMPTY
-ELOOP
-EWOULDBLOCK
-ENOMSG
-EIDRM
-ECHRNG
-EL2NSYNC
-EL3HLT
-EL3RST
-ELNRNG
-EUNATCH
-ENOCSI
-EL2HLT
+EADDRINUSE
+EADDRNOTAVAIL
+EADV
+EAFNOSUPPORT
+EAGAIN
+EALREADY
+EAUTH
+EBADARCH
 EBADE
+EBADEXEC
+EBADF
+EBADFD
+EBADMACHO
+EBADMSG
 EBADR
-EXFULL
-ENOANO
+EBADRPC
 EBADRQC
 EBADSLT
-EDEADLOCK
 EBFONT
-ENOSTR
-ENODATA
-ETIME
-ENOSR
-ENONET
-ENOPKG
-EREMOTE
-ENOLINK
-EADV
-ESRMNT
+EBUSY
+ECANCELED
+ECAPMODE
+ECHILD
+ECHRNG
 ECOMM
-EPROTO
-EMULTIHOP
-EDOTDOT
-EBADMSG
-EOVERFLOW
-ENOTUNIQ
-EBADFD
-EREMCHG
-ELIBACC
-ELIBBAD
-ELIBSCN
-ELIBMAX
-ELIBEXEC
-EILSEQ
-ERESTART
-ESTRPIPE
-EUSERS
-ENOTSOCK
-EDESTADDRREQ
-EMSGSIZE
-EPROTOTYPE
-ENOPROTOOPT
-EPROTONOSUPPORT
-ESOCKTNOSUPPORT
-EOPNOTSUPP
-EPFNOSUPPORT
-EAFNOSUPPORT
-EADDRINUSE
-EADDRNOTAVAIL
-ENETDOWN
-ENETUNREACH
-ENETRESET
 ECONNABORTED
-ECONNRESET
-ENOBUFS
-EISCONN
-ENOTCONN
-ESHUTDOWN
-ETOOMANYREFS
-ETIMEDOUT
 ECONNREFUSED
+ECONNRESET
+EDEADLK
+EDEADLOCK
+EDESTADDRREQ
+EDEVERR
+EDOM
+EDOOFUS
+EDOTDOT
+EDQUOT
+EEXIST
+EFAULT
+EFBIG
+EFTYPE
 EHOSTDOWN
 EHOSTUNREACH
-EALREADY
+EHWPOISON
+EIDRM
+EILSEQ
 EINPROGRESS
-ESTALE
-EUCLEAN
-ENOTNAM
-ENAVAIL
+EINTR
+EINVAL
+EIO
+EIPSEC
+EISCONN
+EISDIR
 EISNAM
-EREMOTEIO
-EDQUOT
-ECANCELED
 EKEYEXPIRED
 EKEYREJECTED
 EKEYREVOKED
+EL2HLT
+EL2NSYNC
+EL3HLT
+EL3RST
+ELAST
+ELIBACC
+ELIBBAD
+ELIBEXEC
+ELIBMAX
+ELIBSCN
+ELNRNG
+ELOOP
 EMEDIUMTYPE
+EMFILE
+EMLINK
+EMSGSIZE
+EMULTIHOP
+ENAMETOOLONG
+ENAVAIL
+ENEEDAUTH
+ENETDOWN
+ENETRESET
+ENETUNREACH
+ENFILE
+ENOANO
+ENOATTR
+ENOBUFS
+ENOCSI
+ENODATA
+ENODEV
+ENOENT
+ENOEXEC
 ENOKEY
+ENOLCK
+ENOLINK
 ENOMEDIUM
+ENOMEM
+ENOMSG
+ENONET
+ENOPKG
+ENOPOLICY
+ENOPROTOOPT
+ENOSPC
+ENOSR
+ENOSTR
+ENOSYS
+ENOTBLK
+ENOTCAPABLE
+ENOTCONN
+ENOTDIR
+ENOTEMPTY
+ENOTNAM
 ENOTRECOVERABLE
-EOWNERDEAD
-ERFKILL
-EAUTH
-EBADRPC
-EDOOFUS
-EFTYPE
-ENEEDAUTH
-ENOATTR
+ENOTSOCK
 ENOTSUP
+ENOTTY
+ENOTUNIQ
+ENXIO
+EOPNOTSUPP
+EOVERFLOW
+EOWNERDEAD
+EPERM
+EPFNOSUPPORT
+EPIPE
 EPROCLIM
 EPROCUNAVAIL
 EPROGMISMATCH
 EPROGUNAVAIL
+EPROTO
+EPROTONOSUPPORT
+EPROTOTYPE
+EPWROFF
+EQFULL
+ERANGE
+EREMCHG
+EREMOTE
+EREMOTEIO
+ERESTART
+ERFKILL
+EROFS
 ERPCMISMATCH
-EIPSEC
-EHWPOISON
-ECAPMODE
-ENOTCAPABLE
+ESHLIBVERS
+ESHUTDOWN
+ESOCKTNOSUPPORT
+ESPIPE
+ESRCH
+ESRMNT
+ESTALE
+ESTRPIPE
+ETIME
+ETIMEDOUT
+ETOOMANYREFS
+ETXTBSY
+EUCLEAN
+EUNATCH
+EUSERS
+EWOULDBLOCK
+EXDEV
+EXFULL
diff --git a/defs/lex.c.src b/defs/lex.c.src
index e0d931cd1f..fc30ec2d15 100644
--- a/defs/lex.c.src
+++ b/defs/lex.c.src
@@ -1,8 +1,8 @@
 %{
-struct kwtable {int name, id[2], state;};
+struct kwtable {short name, id[2], state;};
 const struct kwtable *rb_reserved_word(const char *, unsigned int);
 #ifndef RIPPER
-static const struct kwtable *reserved_word(const char *, unsigned int);
+static const struct kwtable *reserved_word(/*!ANSI{*/const char *, unsigned int/*}!ANSI*/);
 #define rb_reserved_word(str, len) reserved_word(str, len)
 %}
 
diff --git a/defs/separated_version.mk b/defs/separated_version.mk
new file mode 100644
index 0000000000..72ee093da7
--- /dev/null
+++ b/defs/separated_version.mk
@@ -0,0 +1,38 @@
+# ******** FOR DEVELEPERS ONLY ********
+# Separate version.o into a shared library which varies every
+# revisions, in order to make the rest shareable.
+
+include $(firstword $(wildcard GNUmakefile Makefile))
+
+ifneq ($(filter @executable_path/%,$(DLDFLAGS)),)
+RUBY_VERSION_SO = $(subst ruby,ruby_version,$(LIBRUBY_SO))
+RUBY_VERSION_DLDFLAGS := $(patsubst @executable_path/%/$(LIBRUBY_SO),@loader_path/$(RUBY_VERSION_SO),$(DLDFLAGS)) -exported_symbol=Init_version
+else ifneq ($(findstring -soname,$(DLDFLAGS)),)
+RUBY_VERSION_SO = $(subst ruby,ruby_version,$(LIBRUBY_SO))
+RUBY_VERSION_DLDFLAGS := $(subst ruby,ruby_version,$(DLDFLAGS)) -Wl,-rpath-link,'$${ORIGIN}'
+else
+ERROR
+endif
+
+ifneq ($(RUBY_VERSION_SO),)
+
+version.$(OBJEXT): XCFLAGS := $(subst -fvisibility=hidden,,$(XCFLAGS))
+
+MINIOBJS += version.$(OBJEXT)
+DLDOBJS += $(RUBY_VERSION_SO)
+LIBRUBYARG_SHARED := -lruby_version $(LIBRUBYARG_SHARED)
+$(LIBRUBY_SO): COMMONOBJS := $(filter-out version.$(OBJEXT),$(COMMONOBJS))
+$(LIBRUBY_A): COMMONOBJS := $(sort version.$(OBJEXT) $(COMMONOBJS))
+
+$(LIBRUBY_SO): $(RUBY_VERSION_SO)
+
+$(RUBY_VERSION_SO): version.$(OBJEXT)
+	$(ECHO) linking shared-library $@
+	$(LDSHARED) $(RUBY_VERSION_DLDFLAGS) version.$(OBJEXT) $(OUTFLAG)$@
+	-$(Q) $(MINIRUBY) -e 'ARGV.each{|link|' \
+		-e   'File.delete link rescue nil' \
+		-e   'File.symlink "$(RUBY_VERSION_SO)", link' \
+		-e '}' \
+		$(subst ruby,ruby_version,$(LIBRUBY_ALIASES)) || true
+
+endif
diff --git a/defs/universal.mk b/defs/universal.mk
new file mode 100644
index 0000000000..c34a31b356
--- /dev/null
+++ b/defs/universal.mk
@@ -0,0 +1,5 @@
+arch_flags := $(filter -arch=%,$(subst -arch ,-arch=,$(ARCH_FLAG)))
+ifeq ($(filter 0 1,$(words $(arch_flags))),)
+override MJIT_HEADER_SUFFIX = -%
+override MJIT_HEADER_ARCH = -$(word 2,$(ARCH_FLAG))
+endif
diff --git a/dir.c b/dir.c
index eb89d23894..c19ef637a1 100644
--- a/dir.c
+++ b/dir.c
@@ -11,9 +11,10 @@
 
 **********************************************************************/
 
-#include "internal.h"
-#include "encindex.h"
+#include "ruby/internal/config.h"
 
+#include <ctype.h>
+#include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
@@ -21,6 +22,23 @@
 #include <unistd.h>
 #endif
 
+#ifndef O_CLOEXEC
+#  define O_CLOEXEC 0
+#endif
+
+#ifndef USE_OPENDIR_AT
+# if defined(HAVE_FDOPENDIR) && defined(HAVE_DIRFD) && \
+    defined(HAVE_OPENAT) && defined(HAVE_FSTATAT)
+#   define USE_OPENDIR_AT 1
+# else
+#   define USE_OPENDIR_AT 0
+# endif
+#endif
+
+#if USE_OPENDIR_AT
+# include <fcntl.h>
+#endif
+
 #undef HAVE_DIRENT_NAMLEN
 #if defined HAVE_DIRENT_H && !defined _WIN32
 # include <dirent.h>
@@ -45,12 +63,6 @@
 #  include "win32/dir.h"
 # endif
 #endif
-#if defined(__native_client__) && defined(NACL_NEWLIB)
-# include "nacl/dirent.h"
-# include "nacl/stat.h"
-#endif
-
-#include <errno.h>
 
 #ifndef HAVE_STDLIB_H
 char *getenv();
@@ -60,52 +72,76 @@ char *getenv();
 char *strchr(char*,char);
 #endif
 
-#include <ctype.h>
-
-#include "ruby/util.h"
-
-/* define system APIs */
-#ifdef _WIN32
-#undef chdir
-#define chdir(p) rb_w32_uchdir(p)
-#undef mkdir
-#define mkdir(p, m) rb_w32_umkdir((p), (m))
-#undef rmdir
-#define rmdir(p) rb_w32_urmdir(p)
-#undef opendir
-#define opendir(p) rb_w32_uopendir(p)
-#define IS_WIN32 1
-#else
-#define IS_WIN32 0
-#endif
-
 #ifdef HAVE_SYS_ATTR_H
 #include <sys/attr.h>
 #endif
 
+#define USE_NAME_ON_FS_REAL_BASENAME 1	/* platform dependent APIs to
+					 * get real basenames */
+#define USE_NAME_ON_FS_BY_FNMATCH 2	/* select the matching
+					 * basename by fnmatch */
+
 #ifdef HAVE_GETATTRLIST
-# define USE_NAME_ON_FS 1
+# define USE_NAME_ON_FS USE_NAME_ON_FS_REAL_BASENAME
 # define RUP32(size) ((size)+3/4)
 # define SIZEUP32(type) RUP32(sizeof(type))
 #elif defined _WIN32
-# define USE_NAME_ON_FS 1
+# define USE_NAME_ON_FS USE_NAME_ON_FS_REAL_BASENAME
 #elif defined DOSISH
-# define USE_NAME_ON_FS 2	/* by fnmatch */
+# define USE_NAME_ON_FS USE_NAME_ON_FS_BY_FNMATCH
 #else
 # define USE_NAME_ON_FS 0
 #endif
 
 #ifdef __APPLE__
 # define NORMALIZE_UTF8PATH 1
+# include <sys/param.h>
+# include <sys/mount.h>
+# include <sys/vnode.h>
 #else
 # define NORMALIZE_UTF8PATH 0
 #endif
 
-#if NORMALIZE_UTF8PATH
-#include <sys/param.h>
-#include <sys/mount.h>
-#include <sys/vnode.h>
+#include "encindex.h"
+#include "id.h"
+#include "internal.h"
+#include "internal/array.h"
+#include "internal/dir.h"
+#include "internal/encoding.h"
+#include "internal/error.h"
+#include "internal/file.h"
+#include "internal/gc.h"
+#include "internal/io.h"
+#include "internal/vm.h"
+#include "ruby/encoding.h"
+#include "ruby/ruby.h"
+#include "ruby/thread.h"
+#include "ruby/util.h"
+#include "builtin.h"
+
+#ifndef AT_FDCWD
+# define AT_FDCWD -1
+#endif
+
+#define vm_initialized rb_cThread
+
+/* define system APIs */
+#ifdef _WIN32
+# undef chdir
+# define chdir(p) rb_w32_uchdir(p)
+# undef mkdir
+# define mkdir(p, m) rb_w32_umkdir((p), (m))
+# undef rmdir
+# define rmdir(p) rb_w32_urmdir(p)
+# undef opendir
+# define opendir(p) rb_w32_uopendir(p)
+# define ruby_getcwd() rb_w32_ugetcwd(NULL, 0)
+# define IS_WIN32 1
+#else
+# define IS_WIN32 0
+#endif
 
+#if NORMALIZE_UTF8PATH
 # if defined HAVE_FGETATTRLIST || !defined HAVE_GETATTRLIST
 #   define need_normalization(dirp, path) need_normalization(dirp)
 # else
@@ -151,7 +187,7 @@ has_nonascii(const char *ptr, size_t len)
 #endif
 
 #ifndef IFTODT
-# define IFTODT(m)	(((m) & S_IFMT) / ((~S_IFMT & S_IFMT-1) + 1))
+# define IFTODT(m)	(((m) & S_IFMT) / ((~S_IFMT & (S_IFMT-1)) + 1))
 #endif
 
 typedef enum {
@@ -185,6 +221,7 @@ typedef enum {
 #else
 #define FNM_SHORTNAME	0
 #endif
+#define FNM_GLOB_NOSORT 0x40
 
 #define FNM_NOMATCH	1
 #define FNM_ERROR	2
@@ -416,7 +453,7 @@ VALUE rb_cDir;
 
 struct dir_data {
     DIR *dir;
-    VALUE path;
+    const VALUE path;
     rb_encoding *enc;
 };
 
@@ -431,9 +468,8 @@ static void
 dir_free(void *ptr)
 {
     struct dir_data *dir = ptr;
-    if (dir) {
-	if (dir->dir) closedir(dir->dir);
-    }
+
+    if (dir->dir) closedir(dir->dir);
     xfree(dir);
 }
 
@@ -446,20 +482,11 @@ dir_memsize(const void *ptr)
 static const rb_data_type_t dir_data_type = {
     "dir",
     {dir_mark, dir_free, dir_memsize,},
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static VALUE dir_close(VALUE);
 
-#define GlobPathValue(str, safe) \
-    /* can contain null bytes as separators */	\
-    (!RB_TYPE_P((str), T_STRING) ?		\
-     (void)FilePathValue(str) :			\
-     (void)(check_safe_glob((str), (safe)),		\
-      check_glob_encoding(str), (str)))
-#define check_safe_glob(str, safe) ((safe) ? rb_check_safe_obj(str) : (void)0)
-#define check_glob_encoding(str) rb_enc_check((str), rb_enc_from_encoding(rb_usascii_encoding()))
-
 static VALUE
 dir_s_alloc(VALUE klass)
 {
@@ -467,48 +494,43 @@ dir_s_alloc(VALUE klass)
     VALUE obj = TypedData_Make_Struct(klass, struct dir_data, &dir_data_type, dirp);
 
     dirp->dir = NULL;
-    dirp->path = Qnil;
+    RB_OBJ_WRITE(obj, &dirp->path, Qnil);
     dirp->enc = NULL;
 
     return obj;
 }
 
-/*
- *  call-seq:
- *     Dir.new( string ) -> aDir
- *     Dir.new( string, encoding: enc ) -> aDir
- *
- *  Returns a new directory object for the named directory.
- *
- *  The optional <i>enc</i> argument specifies the encoding of the directory.
- *  If not specified, the filesystem encoding is used.
- */
-static VALUE
-dir_initialize(int argc, VALUE *argv, VALUE dir)
+static void *
+nogvl_opendir(void *ptr)
 {
-    struct dir_data *dp;
-    rb_encoding  *fsenc;
-    VALUE dirname, opt, orig;
-    static ID keyword_ids[1];
-    const char *path;
+    const char *path = ptr;
 
-    if (!keyword_ids[0]) {
-	keyword_ids[0] = rb_id_encoding();
-    }
+    return (void *)opendir(path);
+}
 
-    fsenc = rb_filesystem_encoding();
+static DIR *
+opendir_without_gvl(const char *path)
+{
+    if (vm_initialized) {
+	union { const void *in; void *out; } u;
 
-    rb_scan_args(argc, argv, "1:", &dirname, &opt);
+	u.in = path;
 
-    if (!NIL_P(opt)) {
-	VALUE enc;
-	rb_get_kwargs(opt, keyword_ids, 0, 1, &enc);
-	if (enc != Qundef && !NIL_P(enc)) {
-	    fsenc = rb_to_encoding(enc);
-	}
+	return rb_thread_call_without_gvl(nogvl_opendir, u.out, RUBY_UBF_IO, 0);
     }
+    else
+	return opendir(path);
+}
 
-    GlobPathValue(dirname, FALSE);
+static VALUE
+dir_initialize(rb_execution_context_t *ec, VALUE dir, VALUE dirname, VALUE enc)
+{
+    struct dir_data *dp;
+    VALUE orig;
+    const char *path;
+    rb_encoding *fsenc = NIL_P(enc) ? rb_filesystem_encoding() : rb_to_encoding(enc);
+
+    FilePathValue(dirname);
     orig = rb_str_dup_frozen(dirname);
     dirname = rb_str_encode_ospath(dirname);
     dirname = rb_str_dup_frozen(dirname);
@@ -516,63 +538,53 @@ dir_initialize(int argc, VALUE *argv, VALUE dir)
     TypedData_Get_Struct(dir, struct dir_data, &dir_data_type, dp);
     if (dp->dir) closedir(dp->dir);
     dp->dir = NULL;
-    dp->path = Qnil;
+    RB_OBJ_WRITE(dir, &dp->path, Qnil);
     dp->enc = fsenc;
     path = RSTRING_PTR(dirname);
-    dp->dir = opendir(path);
+    dp->dir = opendir_without_gvl(path);
     if (dp->dir == NULL) {
-	if (rb_gc_for_fd(errno)) {
-	    dp->dir = opendir(path);
+	int e = errno;
+	if (rb_gc_for_fd(e)) {
+	    dp->dir = opendir_without_gvl(path);
 	}
 #ifdef HAVE_GETATTRLIST
-	else if (errno == EIO) {
+	else if (e == EIO) {
 	    u_int32_t attrbuf[1];
 	    struct attrlist al = {ATTR_BIT_MAP_COUNT, 0};
 	    if (getattrlist(path, &al, attrbuf, sizeof(attrbuf), FSOPT_NOFOLLOW) == 0) {
-		dp->dir = opendir(path);
+		dp->dir = opendir_without_gvl(path);
 	    }
 	}
 #endif
 	if (dp->dir == NULL) {
 	    RB_GC_GUARD(dirname);
-	    rb_sys_fail_path(orig);
+	    rb_syserr_fail_path(e, orig);
 	}
     }
-    dp->path = orig;
+    RB_OBJ_WRITE(dir, &dp->path, orig);
 
     return dir;
 }
 
-/*
- *  call-seq:
- *     Dir.open( string ) -> aDir
- *     Dir.open( string, encoding: enc ) -> aDir
- *     Dir.open( string ) {| aDir | block } -> anObject
- *     Dir.open( string, encoding: enc ) {| aDir | block } -> anObject
- *
- *  The optional <i>enc</i> argument specifies the encoding of the directory.
- *  If not specified, the filesystem encoding is used.
- *
- *  With no block, <code>open</code> is a synonym for
- *  <code>Dir::new</code>. If a block is present, it is passed
- *  <i>aDir</i> as a parameter. The directory is closed at the end of
- *  the block, and <code>Dir::open</code> returns the value of the
- *  block.
- */
 static VALUE
-dir_s_open(int argc, VALUE *argv, VALUE klass)
+dir_s_open(rb_execution_context_t *ec, VALUE klass, VALUE dirname, VALUE enc)
 {
     struct dir_data *dp;
     VALUE dir = TypedData_Make_Struct(klass, struct dir_data, &dir_data_type, dp);
 
-    dir_initialize(argc, argv, dir);
-    if (rb_block_given_p()) {
-	return rb_ensure(rb_yield, dir, dir_close, dir);
-    }
+    dir_initialize(ec, dir, dirname, enc);
 
     return dir;
 }
 
+static VALUE
+dir_s_close(rb_execution_context_t *ec, VALUE klass, VALUE dir)
+{
+    return dir_close(dir);
+}
+
+NORETURN(static void dir_closed(void));
+
 static void
 dir_closed(void)
 {
@@ -617,7 +629,7 @@ dir_inspect(VALUE dir)
 	rb_str_cat2(str, ">");
 	return str;
     }
-    return rb_funcallv(dir, rb_intern("to_s"), 0, 0);
+    return rb_funcallv(dir, idTo_s, 0, 0);
 }
 
 /* Workaround for Solaris 10 that does not have dirfd.
@@ -701,6 +713,8 @@ fundamental_encoding_p(rb_encoding *enc)
 #else
 # define READDIR(dir, enc) readdir((dir))
 #endif
+
+/* safe to use without GVL */
 static int
 to_be_skipped(const struct dirent *dp)
 {
@@ -747,11 +761,20 @@ dir_read(VALUE dir)
 	return rb_external_str_new_with_enc(dp->d_name, NAMLEN(dp), dirp->enc);
     }
     else {
-	if (errno != 0) rb_sys_fail(0);
+	int e = errno;
+	if (e != 0) rb_syserr_fail(e, 0);
 	return Qnil;		/* end of stream */
     }
 }
 
+static VALUE dir_each_entry(VALUE, VALUE (*)(VALUE, VALUE), VALUE, int);
+
+static VALUE
+dir_yield(VALUE arg, VALUE path)
+{
+    return rb_yield(path);
+}
+
 /*
  *  call-seq:
  *     dir.each { |filename| block }  -> dir
@@ -775,11 +798,17 @@ dir_read(VALUE dir)
 static VALUE
 dir_each(VALUE dir)
 {
+    RETURN_ENUMERATOR(dir, 0, 0);
+    return dir_each_entry(dir, dir_yield, Qnil, FALSE);
+}
+
+static VALUE
+dir_each_entry(VALUE dir, VALUE (*each)(VALUE, VALUE), VALUE arg, int children_only)
+{
     struct dir_data *dirp;
     struct dirent *dp;
     IF_NORMALIZE_UTF8PATH(int norm_p);
 
-    RETURN_ENUMERATOR(dir, 0, 0);
     GetDIR(dir, dirp);
     rewinddir(dirp->dir);
     IF_NORMALIZE_UTF8PATH(norm_p = need_normalization(dirp->dir, RSTRING_PTR(dirp->path)));
@@ -787,6 +816,11 @@ dir_each(VALUE dir)
 	const char *name = dp->d_name;
 	size_t namlen = NAMLEN(dp);
 	VALUE path;
+
+	if (children_only && name[0] == '.') {
+	    if (namlen == 1) continue; /* current directory */
+	    if (namlen == 2 && name[1] == '.') continue; /* parent directory */
+	}
 #if NORMALIZE_UTF8PATH
 	if (norm_p && has_nonascii(name, namlen) &&
 	    !NIL_P(path = rb_str_normalize_ospath(name, namlen))) {
@@ -795,8 +829,7 @@ dir_each(VALUE dir)
 	else
 #endif
 	path = rb_external_str_new_with_enc(name, namlen, dirp->enc);
-	rb_yield(path);
-	if (dirp->dir == NULL) dir_closed();
+	(*each)(arg, path);
     }
     return dir;
 }
@@ -807,8 +840,7 @@ dir_each(VALUE dir)
  *     dir.pos -> integer
  *     dir.tell -> integer
  *
- *  Returns the current position in <em>dir</em>. See also
- *  <code>Dir#seek</code>.
+ *  Returns the current position in <em>dir</em>. See also Dir#seek.
  *
  *     d = Dir.new("testdir")
  *     d.tell   #=> 0
@@ -835,7 +867,7 @@ dir_tell(VALUE dir)
  *     dir.seek( integer ) -> dir
  *
  *  Seeks to a particular location in <em>dir</em>. <i>integer</i>
- *  must be a value returned by <code>Dir#tell</code>.
+ *  must be a value returned by Dir#tell.
  *
  *     d = Dir.new("testdir")   #=> #<Dir:0x401b3c40>
  *     d.read                   #=> "."
@@ -863,8 +895,7 @@ dir_seek(VALUE dir, VALUE pos)
  *  call-seq:
  *     dir.pos = integer  -> integer
  *
- *  Synonym for <code>Dir#seek</code>, but returns the position
- *  parameter.
+ *  Synonym for Dir#seek, but returns the position parameter.
  *
  *     d = Dir.new("testdir")   #=> #<Dir:0x401b3c40>
  *     d.read                   #=> "."
@@ -927,6 +958,14 @@ dir_close(VALUE dir)
     return Qnil;
 }
 
+static void *
+nogvl_chdir(void *ptr)
+{
+    const char *path = ptr;
+
+    return (void *)(VALUE)chdir(path);
+}
+
 static void
 dir_chdir(VALUE path)
 {
@@ -943,8 +982,9 @@ struct chdir_data {
 };
 
 static VALUE
-chdir_yield(struct chdir_data *args)
+chdir_yield(VALUE v)
 {
+    struct chdir_data *args = (void *)v;
     dir_chdir(args->new_path);
     args->done = TRUE;
     chdir_blocking++;
@@ -954,8 +994,9 @@ chdir_yield(struct chdir_data *args)
 }
 
 static VALUE
-chdir_restore(struct chdir_data *args)
+chdir_restore(VALUE v)
 {
+    struct chdir_data *args = (void *)v;
     if (args->done) {
 	chdir_blocking--;
 	if (chdir_blocking == 0)
@@ -973,8 +1014,8 @@ chdir_restore(struct chdir_data *args)
  *  Changes the current working directory of the process to the given
  *  string. When called without an argument, changes the directory to
  *  the value of the environment variable <code>HOME</code>, or
- *  <code>LOGDIR</code>. <code>SystemCallError</code> (probably
- *  <code>Errno::ENOENT</code>) if the target directory does not exist.
+ *  <code>LOGDIR</code>. SystemCallError (probably Errno::ENOENT) if
+ *  the target directory does not exist.
  *
  *  If a block is given, it is passed the name of the new current
  *  directory, and the block is executed with that as the current
@@ -983,7 +1024,8 @@ chdir_restore(struct chdir_data *args)
  *  block. <code>chdir</code> blocks can be nested, but in a
  *  multi-threaded program an error will be raised if a thread attempts
  *  to open a <code>chdir</code> block while another thread has one
- *  open.
+ *  open or a call to <code>chdir</code> without a block occurs inside
+ *  a block passed to <code>chdir</code> (even in the same thread).
  *
  *     Dir.chdir("/var/spool/mail")
  *     puts Dir.pwd
@@ -1009,9 +1051,8 @@ dir_s_chdir(int argc, VALUE *argv, VALUE obj)
 {
     VALUE path = Qnil;
 
-    if (rb_scan_args(argc, argv, "01", &path) == 1) {
-	FilePathValue(path);
-	path = rb_str_encode_ospath(path);
+    if (rb_check_arity(argc, 0, 1) == 1) {
+        path = rb_str_encode_ospath(rb_get_path(argv[0]));
     }
     else {
 	const char *dist = getenv("HOME");
@@ -1023,8 +1064,10 @@ dir_s_chdir(int argc, VALUE *argv, VALUE obj)
     }
 
     if (chdir_blocking > 0) {
-	if (!rb_block_given_p() || rb_thread_current() != chdir_thread)
-	    rb_warn("conflicting chdir during another chdir block");
+	if (rb_thread_current() != chdir_thread)
+            rb_raise(rb_eRuntimeError, "conflicting chdir during another chdir block");
+        if (!rb_block_given_p())
+            rb_warn("conflicting chdir during another chdir block");
     }
 
     if (rb_block_given_p()) {
@@ -1035,31 +1078,61 @@ dir_s_chdir(int argc, VALUE *argv, VALUE obj)
 	args.done = FALSE;
 	return rb_ensure(chdir_yield, (VALUE)&args, chdir_restore, (VALUE)&args);
     }
-    dir_chdir(path);
+    else {
+	char *p = RSTRING_PTR(path);
+	int r = (int)(VALUE)rb_thread_call_without_gvl(nogvl_chdir, p,
+							RUBY_UBF_IO, 0);
+	if (r < 0)
+	    rb_sys_fail_path(path);
+    }
 
     return INT2FIX(0);
 }
 
+#ifndef _WIN32
 VALUE
-rb_dir_getwd(void)
+rb_dir_getwd_ospath(void)
 {
     char *path;
     VALUE cwd;
-    int fsenc = rb_enc_to_index(rb_filesystem_encoding());
+    VALUE path_guard;
 
-    if (fsenc == ENCINDEX_US_ASCII) fsenc = ENCINDEX_ASCII;
-    path = my_getcwd();
+#undef RUBY_UNTYPED_DATA_WARNING
+#define RUBY_UNTYPED_DATA_WARNING 0
+    path_guard = Data_Wrap_Struct((VALUE)0, NULL, RUBY_DEFAULT_FREE, NULL);
+    path = ruby_getcwd();
+    DATA_PTR(path_guard) = path;
 #ifdef __APPLE__
     cwd = rb_str_normalize_ospath(path, strlen(path));
-    OBJ_TAINT(cwd);
 #else
-    cwd = rb_tainted_str_new2(path);
+    cwd = rb_str_new2(path);
 #endif
-    rb_enc_associate_index(cwd, fsenc);
+    DATA_PTR(path_guard) = 0;
 
     xfree(path);
     return cwd;
 }
+#endif
+
+VALUE
+rb_dir_getwd(void)
+{
+    rb_encoding *fs = rb_filesystem_encoding();
+    int fsenc = rb_enc_to_index(fs);
+    VALUE cwd = rb_dir_getwd_ospath();
+
+    switch (fsenc) {
+      case ENCINDEX_US_ASCII:
+	fsenc = ENCINDEX_ASCII;
+      case ENCINDEX_ASCII:
+	break;
+#if defined _WIN32 || defined __APPLE__
+      default:
+	return rb_str_conv_enc(cwd, NULL, fs);
+#endif
+    }
+    return rb_enc_associate_index(cwd, fsenc);
+}
 
 /*
  *  call-seq:
@@ -1122,17 +1195,29 @@ dir_s_chroot(VALUE dir, VALUE path)
 #define dir_s_chroot rb_f_notimplement
 #endif
 
+struct mkdir_arg {
+    const char *path;
+    mode_t mode;
+};
+
+static void *
+nogvl_mkdir(void *ptr)
+{
+    struct mkdir_arg *m = ptr;
+
+    return (void *)(VALUE)mkdir(m->path, m->mode);
+}
+
 /*
  *  call-seq:
  *     Dir.mkdir( string [, integer] ) -> 0
  *
  *  Makes a new directory named by <i>string</i>, with permissions
  *  specified by the optional parameter <i>anInteger</i>. The
- *  permissions may be modified by the value of
- *  <code>File::umask</code>, and are ignored on NT. Raises a
- *  <code>SystemCallError</code> if the directory cannot be created. See
- *  also the discussion of permissions in the class documentation for
- *  <code>File</code>.
+ *  permissions may be modified by the value of File::umask, and are
+ *  ignored on NT. Raises a SystemCallError if the directory cannot be
+ *  created. See also the discussion of permissions in the class
+ *  documentation for File.
  *
  *    Dir.mkdir(File.join(Dir.home, ".foo"), 0700) #=> 0
  *
@@ -1140,37 +1225,53 @@ dir_s_chroot(VALUE dir, VALUE path)
 static VALUE
 dir_s_mkdir(int argc, VALUE *argv, VALUE obj)
 {
+    struct mkdir_arg m;
     VALUE path, vmode;
-    int mode;
+    int r;
 
     if (rb_scan_args(argc, argv, "11", &path, &vmode) == 2) {
-	mode = NUM2INT(vmode);
+	m.mode = NUM2MODET(vmode);
     }
     else {
-	mode = 0777;
+	m.mode = 0777;
     }
 
     path = check_dirname(path);
-    if (mkdir(RSTRING_PTR(path), mode) == -1)
+    m.path = RSTRING_PTR(path);
+    r = (int)(VALUE)rb_thread_call_without_gvl(nogvl_mkdir, &m, RUBY_UBF_IO, 0);
+    if (r < 0)
 	rb_sys_fail_path(path);
 
     return INT2FIX(0);
 }
 
+static void *
+nogvl_rmdir(void *ptr)
+{
+    const char *path = ptr;
+
+    return (void *)(VALUE)rmdir(path);
+}
+
 /*
  *  call-seq:
  *     Dir.delete( string ) -> 0
  *     Dir.rmdir( string ) -> 0
  *     Dir.unlink( string ) -> 0
  *
- *  Deletes the named directory. Raises a subclass of
- *  <code>SystemCallError</code> if the directory isn't empty.
+ *  Deletes the named directory. Raises a subclass of SystemCallError
+ *  if the directory isn't empty.
  */
 static VALUE
 dir_s_rmdir(VALUE obj, VALUE dir)
 {
+    const char *p;
+    int r;
+
     dir = check_dirname(dir);
-    if (rmdir(RSTRING_PTR(dir)) < 0)
+    p = RSTRING_PTR(dir);
+    r = (int)(VALUE)rb_thread_call_without_gvl(nogvl_rmdir, (void *)p, RUBY_UBF_IO, 0);
+    if (r < 0)
 	rb_sys_fail_path(dir);
 
     return INT2FIX(0);
@@ -1216,9 +1317,34 @@ sys_enc_warning_in(const char *func, const char *mesg, rb_encoding *enc)
 #define sys_warning(val, enc) \
     ((flags & GLOB_VERBOSE) ? sys_enc_warning_in(RUBY_FUNCTION_NAME_STRING, (val), (enc)) :(void)0)
 
+static inline size_t
+glob_alloc_size(size_t x, size_t y)
+{
+    size_t z;
+    if (rb_mul_size_overflow(x, y, SSIZE_MAX, &z)) {
+        rb_memerror();          /* or...? */
+    }
+    else {
+        return z;
+    }
+}
+
+static inline void *
+glob_alloc_n(size_t x, size_t y)
+{
+    return malloc(glob_alloc_size(x, y));
+}
+
+static inline void *
+glob_realloc_n(void *p, size_t x, size_t y)
+{
+    return realloc(p, glob_alloc_size(x, y));
+}
+
 #define GLOB_ALLOC(type) ((type *)malloc(sizeof(type)))
-#define GLOB_ALLOC_N(type, n) ((type *)malloc(sizeof(type) * (n)))
+#define GLOB_ALLOC_N(type, n) ((type *)glob_alloc_n(sizeof(type), n))
 #define GLOB_REALLOC(ptr, size) realloc((ptr), (size))
+#define GLOB_REALLOC_N(ptr, n) glob_realloc_n(ptr, sizeof(*(ptr)), n)
 #define GLOB_FREE(ptr) free(ptr)
 #define GLOB_JUMP_TAG(status) (((status) == -1) ? rb_memerror() : rb_jump_tag(status))
 
@@ -1226,32 +1352,63 @@ sys_enc_warning_in(const char *func, const char *mesg, rb_encoding *enc)
  * ENOTDIR can be returned by stat(2) if a non-leaf element of the path
  * is not a directory.
  */
-#define to_be_ignored(e) ((e) == ENOENT || (e) == ENOTDIR)
+ALWAYS_INLINE(static int to_be_ignored(int e));
+static inline int
+to_be_ignored(int e)
+{
+    return e == ENOENT || e == ENOTDIR;
+}
 
 #ifdef _WIN32
-#define STAT(p, s)	rb_w32_ustati64((p), (s))
+#define STAT(p, s)	rb_w32_ustati128((p), (s))
 #undef lstat
-#define lstat(p, s)	rb_w32_ulstati64((p), (s))
+#define lstat(p, s)	rb_w32_ulstati128((p), (s))
 #else
 #define STAT(p, s)	stat((p), (s))
 #endif
 
+typedef int ruby_glob_errfunc(const char*, VALUE, const void*, int);
+typedef struct {
+    ruby_glob_func *match;
+    ruby_glob_errfunc *error;
+} ruby_glob_funcs_t;
+
+static const char *
+at_subpath(int fd, size_t baselen, const char *path)
+{
+#if USE_OPENDIR_AT
+    if (fd != (int)AT_FDCWD && baselen > 0) {
+	path += baselen;
+	if (*path == '/') ++path;
+    }
+#endif
+    return *path ? path : ".";
+}
+
 /* System call with warning */
 static int
-do_stat(const char *path, struct stat *pst, int flags, rb_encoding *enc)
+do_stat(int fd, size_t baselen, const char *path, struct stat *pst, int flags, rb_encoding *enc)
 {
+#if USE_OPENDIR_AT
+    int ret = fstatat(fd, at_subpath(fd, baselen, path), pst, 0);
+#else
     int ret = STAT(path, pst);
+#endif
     if (ret < 0 && !to_be_ignored(errno))
 	sys_warning(path, enc);
 
     return ret;
 }
 
-#if defined HAVE_LSTAT || defined lstat
+#if defined HAVE_LSTAT || defined lstat || USE_OPENDIR_AT
 static int
-do_lstat(const char *path, struct stat *pst, int flags, rb_encoding *enc)
+do_lstat(int fd, size_t baselen, const char *path, struct stat *pst, int flags, rb_encoding *enc)
 {
+#if USE_OPENDIR_AT
+    int ret = fstatat(fd, at_subpath(fd, baselen, path), pst, AT_SYMLINK_NOFOLLOW);
+#else
     int ret = lstat(path, pst);
+#endif
     if (ret < 0 && !to_be_ignored(errno))
 	sys_warning(path, enc);
 
@@ -1261,8 +1418,85 @@ do_lstat(const char *path, struct stat *pst, int flags, rb_encoding *enc)
 #define do_lstat do_stat
 #endif
 
+struct opendir_at_arg {
+    int basefd;
+    const char *path;
+};
+
+static void *
+with_gvl_gc_for_fd(void *ptr)
+{
+    int *e = ptr;
+
+    return (void *)(rb_gc_for_fd(*e) ? Qtrue : Qfalse);
+}
+
+static int
+gc_for_fd_with_gvl(int e)
+{
+    if (vm_initialized)
+	return (int)(VALUE)rb_thread_call_with_gvl(with_gvl_gc_for_fd, &e);
+    else
+	return rb_gc_for_fd(e) ? Qtrue : Qfalse;
+}
+
+static void *
+nogvl_opendir_at(void *ptr)
+{
+    const struct opendir_at_arg *oaa = ptr;
+    DIR *dirp;
+
+#if USE_OPENDIR_AT
+    const int opendir_flags = (O_RDONLY|O_CLOEXEC|
+#  ifdef O_DIRECTORY
+			       O_DIRECTORY|
+#  endif /* O_DIRECTORY */
+			       0);
+    int fd = openat(oaa->basefd, oaa->path, opendir_flags);
+
+    dirp = fd >= 0 ? fdopendir(fd) : 0;
+    if (!dirp) {
+	int e = errno;
+
+	switch (gc_for_fd_with_gvl(e)) {
+	  default:
+	    if (fd < 0) fd = openat(oaa->basefd, oaa->path, opendir_flags);
+	    if (fd >= 0) dirp = fdopendir(fd);
+	    if (dirp) return dirp;
+
+	    e = errno;
+	    /* fallthrough*/
+	  case 0:
+	    if (fd >= 0) close(fd);
+	    errno = e;
+	}
+    }
+#else  /* !USE_OPENDIR_AT */
+    dirp = opendir(oaa->path);
+    if (!dirp && gc_for_fd_with_gvl(errno))
+	dirp = opendir(oaa->path);
+#endif /* !USE_OPENDIR_AT */
+
+    return dirp;
+}
+
+static DIR *
+opendir_at(int basefd, const char *path)
+{
+    struct opendir_at_arg oaa;
+
+    oaa.basefd = basefd;
+    oaa.path = path;
+
+    if (vm_initialized)
+	return rb_thread_call_without_gvl(nogvl_opendir_at, &oaa, RUBY_UBF_IO, 0);
+    else
+	return nogvl_opendir_at(&oaa);
+}
+
 static DIR *
-do_opendir(const char *path, int flags, rb_encoding *enc)
+do_opendir(const int basefd, size_t baselen, const char *path, int flags, rb_encoding *enc,
+	   ruby_glob_errfunc *errfunc, VALUE arg, int *status)
 {
     DIR *dirp;
 #ifdef _WIN32
@@ -1273,9 +1507,20 @@ do_opendir(const char *path, int flags, rb_encoding *enc)
 	path = RSTRING_PTR(tmp);
     }
 #endif
-    dirp = opendir(path);
-    if (dirp == NULL && !to_be_ignored(errno))
-	sys_warning(path, enc);
+    dirp = opendir_at(basefd, at_subpath(basefd, baselen, path));
+    if (!dirp) {
+	int e = errno;
+
+	*status = 0;
+	if (!to_be_ignored(e)) {
+	    if (errfunc) {
+		*status = (*errfunc)(path, arg, enc, e);
+	    }
+	    else {
+		sys_warning(path, enc);
+	    }
+	}
+    }
 #ifdef _WIN32
     if (tmp) rb_str_resize(tmp, 0); /* GC guard */
 #endif
@@ -1284,7 +1529,7 @@ do_opendir(const char *path, int flags, rb_encoding *enc)
 }
 
 /* Globing pattern */
-enum glob_pattern_type { PLAIN, ALPHA, MAGICAL, RECURSIVE, MATCH_ALL, MATCH_DIR };
+enum glob_pattern_type { PLAIN, ALPHA, BRACE, MAGICAL, RECURSIVE, MATCH_ALL, MATCH_DIR };
 
 /* Return nonzero if S has any special globbing chars in it.  */
 static enum glob_pattern_type
@@ -1292,15 +1537,20 @@ has_magic(const char *p, const char *pend, int flags, rb_encoding *enc)
 {
     const int escape = !(flags & FNM_NOESCAPE);
     int hasalpha = 0;
+    int hasmagical = 0;
 
     register char c;
 
     while (p < pend && (c = *p++) != 0) {
 	switch (c) {
+	  case '{':
+	    return BRACE;
+
 	  case '*':
 	  case '?':
 	  case '[':
-	    return MAGICAL;
+	    hasmagical = 1;
+	    break;
 
 	  case '\\':
 	    if (escape && p++ >= pend)
@@ -1325,7 +1575,7 @@ has_magic(const char *p, const char *pend, int flags, rb_encoding *enc)
 	p = Next(p-1, pend, enc);
     }
 
-    return hasalpha ? ALPHA : PLAIN;
+    return hasmagical ? MAGICAL : hasalpha ? ALPHA : PLAIN;
 }
 
 /* Find separator in globbing pattern. */
@@ -1346,6 +1596,13 @@ find_dirsep(const char *p, const char *pend, int flags, rb_encoding *enc)
 	    open = 0;
 	    continue;
 
+	  case '{':
+	    open = 1;
+	    continue;
+	  case '}':
+	    open = 0;
+	    continue;
+
 	  case '/':
 	    if (!open)
 		return (char *)p-1;
@@ -1452,10 +1709,7 @@ glob_make_pattern(const char *p, const char *e, int flags, rb_encoding *enc)
 
     tmp = GLOB_ALLOC(struct glob_pattern);
     if (!tmp) {
-      error:
-	*tail = 0;
-	glob_free_pattern(list);
-	return 0;
+        goto error;
     }
     tmp->type = dirsep ? MATCH_DIR : MATCH_ALL;
     tmp->str = 0;
@@ -1463,6 +1717,11 @@ glob_make_pattern(const char *p, const char *e, int flags, rb_encoding *enc)
     tmp->next = 0;
 
     return list;
+
+  error:
+    *tail = 0;
+    glob_free_pattern(list);
+    return 0;
 }
 
 static void
@@ -1478,7 +1737,7 @@ glob_free_pattern(struct glob_pattern *list)
 }
 
 static char *
-join_path(const char *path, long len, int dirsep, const char *name, size_t namlen)
+join_path(const char *path, size_t len, int dirsep, const char *name, size_t namlen)
 {
     char *buf = GLOB_ALLOC_N(char, len+namlen+(dirsep?1:0)+1);
 
@@ -1493,8 +1752,13 @@ join_path(const char *path, long len, int dirsep, const char *name, size_t namle
 }
 
 #ifdef HAVE_GETATTRLIST
+# if defined HAVE_FGETATTRLIST
+#   define is_case_sensitive(dirp, path) is_case_sensitive(dirp)
+# else
+#   define is_case_sensitive(dirp, path) is_case_sensitive(path)
+# endif
 static int
-is_case_sensitive(DIR *dirp)
+is_case_sensitive(DIR *dirp, const char *path)
 {
     struct {
 	u_int32_t length;
@@ -1505,8 +1769,13 @@ is_case_sensitive(DIR *dirp)
     const int idx = VOL_CAPABILITIES_FORMAT;
     const uint32_t mask = VOL_CAP_FMT_CASE_SENSITIVE;
 
+#   if defined HAVE_FGETATTRLIST
     if (fgetattrlist(dirfd(dirp), &al, attrbuf, sizeof(attrbuf), FSOPT_NOFOLLOW))
 	return -1;
+#   else
+    if (getattrlist(path, &al, attrbuf, sizeof(attrbuf), FSOPT_NOFOLLOW))
+	return -1;
+#   endif
     if (!(cap->valid[idx] & mask))
 	return -1;
     return (cap->capabilities[idx] & mask) != 0;
@@ -1638,7 +1907,7 @@ replace_real_basename(char *path, long base, rb_encoding *enc, int norm_p, int f
     }
     return path;
 }
-#elif USE_NAME_ON_FS == 1
+#elif USE_NAME_ON_FS == USE_NAME_ON_FS_REAL_BASENAME
 # error not implemented
 #endif
 
@@ -1657,6 +1926,8 @@ replace_real_basename(char *path, long base, rb_encoding *enc, int norm_p, int f
 struct glob_args {
     void (*func)(const char *, VALUE, void *);
     const char *path;
+    const char *base;
+    size_t baselen;
     VALUE value;
     rb_encoding *enc;
 };
@@ -1672,8 +1943,74 @@ glob_func_caller(VALUE val)
     return Qnil;
 }
 
+struct glob_error_args {
+    const char *path;
+    rb_encoding *enc;
+    int error;
+};
+
+static VALUE
+glob_func_warning(VALUE val)
+{
+    struct glob_error_args *arg = (struct glob_error_args *)val;
+    rb_syserr_enc_warning(arg->error, arg->enc, "%s", arg->path);
+    return Qnil;
+}
+
+#if 0
+static int
+rb_glob_warning(const char *path, VALUE a, const void *enc, int error)
+{
+    int status;
+    struct glob_error_args args;
+
+    args.path = path;
+    args.enc = enc;
+    args.error = error;
+    rb_protect(glob_func_warning, (VALUE)&args, &status);
+    return status;
+}
+#endif
+
+NORETURN(static VALUE glob_func_error(VALUE val));
+
+static VALUE
+glob_func_error(VALUE val)
+{
+    struct glob_error_args *arg = (struct glob_error_args *)val;
+    VALUE path = rb_enc_str_new_cstr(arg->path, arg->enc);
+    rb_syserr_fail_str(arg->error, path);
+    UNREACHABLE_RETURN(Qnil);
+}
+
+static int
+rb_glob_error(const char *path, VALUE a, const void *enc, int error)
+{
+    int status;
+    struct glob_error_args args;
+    VALUE (*errfunc)(VALUE) = glob_func_error;
+
+    if (error == EACCES) {
+	errfunc = glob_func_warning;
+    }
+    args.path = path;
+    args.enc = enc;
+    args.error = error;
+    rb_protect(errfunc, (VALUE)&args, &status);
+    return status;
+}
+
+typedef struct rb_dirent {
+    long d_namlen;
+    const char *d_name;
+#ifdef _WIN32
+    const char *d_altname;
+#endif
+    uint8_t d_type;
+} rb_dirent_t;
+
 static inline int
-dirent_match(const char *pat, rb_encoding *enc, const char *name, const struct dirent *dp, int flags)
+dirent_match(const char *pat, rb_encoding *enc, const char *name, const rb_dirent_t *dp, int flags)
 {
     if (fnmatch(pat, enc, name, flags) == 0) return 1;
 #ifdef _WIN32
@@ -1684,24 +2021,259 @@ dirent_match(const char *pat, rb_encoding *enc, const char *name, const struct d
     return 0;
 }
 
+struct push_glob_args {
+    int fd;
+    const char *path;
+    size_t baselen;
+    size_t namelen;
+    int dirsep; /* '/' should be placed before appending child entry's name to 'path'. */
+    rb_pathtype_t pathtype; /* type of 'path' */
+    int flags;
+    const ruby_glob_funcs_t *funcs;
+    VALUE arg;
+};
+
+struct dirent_brace_args {
+    const char *name;
+    const rb_dirent_t *dp;
+    int flags;
+};
+
+static int
+dirent_match_brace(const char *pattern, VALUE val, void *enc)
+{
+    struct dirent_brace_args *arg = (struct dirent_brace_args *)val;
+
+    return dirent_match(pattern, enc, arg->name, arg->dp, arg->flags);
+}
+
+/* join paths from pattern list of glob_make_pattern() */
+static char*
+join_path_from_pattern(struct glob_pattern **beg)
+{
+    struct glob_pattern *p;
+    char *path = NULL;
+    size_t path_len = 0;
+
+    for (p = *beg; p; p = p->next) {
+	const char *str;
+	switch (p->type) {
+	  case RECURSIVE:
+	    str = "**";
+	    break;
+	  case MATCH_DIR:
+	    /* append last slash */
+	    str = "";
+	    break;
+	  default:
+	    str = p->str;
+	    if (!str) continue;
+	}
+	if (!path) {
+	    path_len = strlen(str);
+	    path = GLOB_ALLOC_N(char, path_len + 1);
+            if (path) {
+                memcpy(path, str, path_len);
+                path[path_len] = '\0';
+            }
+        }
+        else {
+	    size_t len = strlen(str);
+	    char *tmp;
+	    tmp = GLOB_REALLOC(path, path_len + len + 2);
+	    if (tmp) {
+		path = tmp;
+		path[path_len++] = '/';
+		memcpy(path + path_len, str, len);
+		path_len += len;
+		path[path_len] = '\0';
+	    }
+	}
+    }
+    return path;
+}
+
+static int push_caller(const char *path, VALUE val, void *enc);
+
+static int ruby_brace_expand(const char *str, int flags, ruby_glob_func *func, VALUE arg,
+			     rb_encoding *enc, VALUE var);
+
+static const size_t rb_dirent_name_offset =
+    offsetof(rb_dirent_t, d_type) + sizeof(uint8_t);
+
+static rb_dirent_t *
+dirent_copy(const struct dirent *dp, rb_dirent_t *rdp)
+{
+    if (!dp) return NULL;
+    size_t namlen = NAMLEN(dp);
+    const size_t altlen =
+#ifdef _WIN32
+        dp->d_altlen ? dp->d_altlen + 1 :
+#endif
+        0;
+    rb_dirent_t *newrdp = rdp;
+    if (!rdp && !(newrdp = malloc(rb_dirent_name_offset + namlen + 1 + altlen)))
+        return NULL;
+    newrdp->d_namlen = namlen;
+    if (!rdp) {
+        char *name = (char *)newrdp + rb_dirent_name_offset;
+        memcpy(name, dp->d_name, namlen);
+        name[namlen] = '\0';
+#ifdef _WIN32
+        newrdp->d_altname = NULL;
+        if (altlen) {
+            char *const altname = name + namlen + 1;
+            memcpy(altname, dp->d_altname, altlen - 1);
+            altname[altlen - 1] = '\0';
+            newrdp->d_altname = altname;
+        }
+#endif
+        newrdp->d_name = name;
+    }
+    else {
+        newrdp->d_name = dp->d_name;
+#ifdef _WIN32
+        newrdp->d_altname = dp->d_altname;
+#endif
+    }
+#ifdef DT_UNKNOWN
+    newrdp->d_type = dp->d_type;
+#else
+    newrdp->d_type = 0;
+#endif
+    return newrdp;
+}
+
+typedef union {
+    struct {
+        DIR *dirp;
+        rb_dirent_t ent;
+    } nosort;
+    struct {
+        size_t count, idx;
+        rb_dirent_t **entries;
+    } sort;
+} ruby_glob_entries_t;
+
+static int
+glob_sort_cmp(const void *a, const void *b, void *e)
+{
+    const rb_dirent_t *ent1 = *(void **)a;
+    const rb_dirent_t *ent2 = *(void **)b;
+    return strcmp(ent1->d_name, ent2->d_name);
+}
+
+static void
+glob_dir_finish(ruby_glob_entries_t *ent, int flags)
+{
+    if (flags & FNM_GLOB_NOSORT) {
+        closedir(ent->nosort.dirp);
+        ent->nosort.dirp = NULL;
+    }
+    else if (ent->sort.entries) {
+        for (size_t i = 0, count = ent->sort.count; i < count;) {
+            GLOB_FREE(ent->sort.entries[i++]);
+        }
+        GLOB_FREE(ent->sort.entries);
+        ent->sort.entries = NULL;
+        ent->sort.count = ent->sort.idx = 0;
+    }
+}
+
+static ruby_glob_entries_t *
+glob_opendir(ruby_glob_entries_t *ent, DIR *dirp, int flags, rb_encoding *enc)
+{
+    MEMZERO(ent, ruby_glob_entries_t, 1);
+    if (flags & FNM_GLOB_NOSORT) {
+        ent->nosort.dirp = dirp;
+        return ent;
+    }
+    else {
+        void *newp;
+        struct dirent *dp;
+        size_t count = 0, capacity = 0;
+        ent->sort.count = 0;
+        ent->sort.idx = 0;
+        ent->sort.entries = 0;
+#ifdef _WIN32
+        if ((capacity = dirp->nfiles) > 0) {
+            if (!(newp = GLOB_ALLOC_N(rb_dirent_t, capacity))) {
+                closedir(dirp);
+                return NULL;
+            }
+            ent->sort.entries = newp;
+        }
+#endif
+	while ((dp = READDIR(dirp, enc)) != NULL) {
+            rb_dirent_t *rdp = dirent_copy(dp, NULL);
+            if (!rdp) {
+                goto nomem;
+            }
+            if (count >= capacity) {
+                capacity += 256;
+                if (!(newp = GLOB_REALLOC_N(ent->sort.entries, capacity)))
+                    goto nomem;
+                ent->sort.entries = newp;
+            }
+            ent->sort.entries[count++] = rdp;
+            ent->sort.count = count;
+        }
+        closedir(dirp);
+        if (count < capacity) {
+            if (!(newp = GLOB_REALLOC_N(ent->sort.entries, count))) {
+                glob_dir_finish(ent, 0);
+                return NULL;
+            }
+            ent->sort.entries = newp;
+        }
+        ruby_qsort(ent->sort.entries, ent->sort.count, sizeof(ent->sort.entries[0]),
+                   glob_sort_cmp, NULL);
+        return ent;
+    }
+
+  nomem:
+    glob_dir_finish(ent, 0);
+    closedir(dirp);
+    return NULL;
+}
+
+static rb_dirent_t *
+glob_getent(ruby_glob_entries_t *ent, int flags, rb_encoding *enc)
+{
+    if (flags & FNM_GLOB_NOSORT) {
+        return dirent_copy(READDIR(ent->nosort.dirp, enc), &ent->nosort.ent);
+    }
+    else if (ent->sort.idx < ent->sort.count) {
+        return ent->sort.entries[ent->sort.idx++];
+    }
+    else {
+        return NULL;
+    }
+}
+
 static int
 glob_helper(
+    int fd,
     const char *path,
-    long pathlen,
+    size_t baselen,
+    size_t namelen,
     int dirsep, /* '/' should be placed before appending child entry's name to 'path'. */
     rb_pathtype_t pathtype, /* type of 'path' */
     struct glob_pattern **beg,
     struct glob_pattern **end,
     int flags,
-    ruby_glob_func *func,
+    const ruby_glob_funcs_t *funcs,
     VALUE arg,
     rb_encoding *enc)
 {
     struct stat st;
     int status = 0;
     struct glob_pattern **cur, **new_beg, **new_end;
-    int plain = 0, magical = 0, recursive = 0, match_all = 0, match_dir = 0;
+    int plain = 0, brace = 0, magical = 0, recursive = 0, match_all = 0, match_dir = 0;
     int escape = !(flags & FNM_NOESCAPE);
+    size_t pathlen = baselen + namelen;
+
+    rb_check_stack_overflow();
 
     for (cur = beg; cur < end; ++cur) {
 	struct glob_pattern *p = *cur;
@@ -1714,12 +2286,17 @@ glob_helper(
 	    plain = 1;
 	    break;
 	  case ALPHA:
-#if USE_NAME_ON_FS == 1
+#if USE_NAME_ON_FS == USE_NAME_ON_FS_REAL_BASENAME
 	    plain = 1;
 #else
 	    magical = 1;
 #endif
 	    break;
+	  case BRACE:
+	    if (!recursive) {
+		brace = 1;
+	    }
+	    break;
 	  case MAGICAL:
 	    magical = 2;
 	    break;
@@ -1734,17 +2311,35 @@ glob_helper(
 	}
     }
 
+    if (brace) {
+	struct push_glob_args args;
+	char* brace_path = join_path_from_pattern(beg);
+	if (!brace_path) return -1;
+	args.fd = fd;
+	args.path = path;
+	args.baselen = baselen;
+	args.namelen = namelen;
+	args.dirsep = dirsep;
+	args.pathtype = pathtype;
+	args.flags = flags;
+	args.funcs = funcs;
+	args.arg = arg;
+	status = ruby_brace_expand(brace_path, flags, push_caller, (VALUE)&args, enc, Qfalse);
+	GLOB_FREE(brace_path);
+	return status;
+    }
+
     if (*path) {
 	if (match_all && pathtype == path_unknown) {
-	    if (do_lstat(path, &st, flags, enc) == 0) {
+	    if (do_lstat(fd, baselen, path, &st, flags, enc) == 0) {
 		pathtype = IFTODT(st.st_mode);
 	    }
 	    else {
 		pathtype = path_noent;
 	    }
 	}
-	if (match_dir && pathtype == path_unknown) {
-	    if (do_stat(path, &st, flags, enc) == 0) {
+	if (match_dir && (pathtype == path_unknown || pathtype == path_symlink)) {
+	    if (do_stat(fd, baselen, path, &st, flags, enc) == 0) {
 		pathtype = IFTODT(st.st_mode);
 	    }
 	    else {
@@ -1752,13 +2347,16 @@ glob_helper(
 	    }
 	}
 	if (match_all && pathtype > path_noent) {
-	    status = glob_call_func(func, path, arg, enc);
+	    const char *subpath = path + baselen + (baselen && path[baselen] == '/');
+	    status = glob_call_func(funcs->match, subpath, arg, enc);
 	    if (status) return status;
 	}
 	if (match_dir && pathtype == path_directory) {
-	    char *tmp = join_path(path, pathlen, dirsep, "", 0);
+	    int seplen = (baselen && path[baselen] == '/');
+	    const char *subpath = path + baselen + seplen;
+	    char *tmp = join_path(subpath, namelen - seplen, dirsep, "", 0);
 	    if (!tmp) return -1;
-	    status = glob_call_func(func, tmp, arg, enc);
+	    status = glob_call_func(funcs->match, tmp, arg, enc);
 	    GLOB_FREE(tmp);
 	    if (status) return status;
 	}
@@ -1767,22 +2365,24 @@ glob_helper(
     if (pathtype == path_noent) return 0;
 
     if (magical || recursive) {
-	struct dirent *dp;
+	rb_dirent_t *dp;
 	DIR *dirp;
-# if USE_NAME_ON_FS == 2
+# if USE_NAME_ON_FS == USE_NAME_ON_FS_BY_FNMATCH
 	char *plainname = 0;
 # endif
 	IF_NORMALIZE_UTF8PATH(int norm_p);
-# if USE_NAME_ON_FS == 2
+# if USE_NAME_ON_FS == USE_NAME_ON_FS_BY_FNMATCH
 	if (cur + 1 == end && (*cur)->type <= ALPHA) {
 	    plainname = join_path(path, pathlen, dirsep, (*cur)->str, strlen((*cur)->str));
 	    if (!plainname) return -1;
-	    dirp = do_opendir(plainname, flags, enc);
+	    dirp = do_opendir(fd, basename, plainname, flags, enc, funcs->error, arg, &status);
 	    GLOB_FREE(plainname);
 	}
 	else
+# else
+	    ;
 # endif
-	dirp = do_opendir(*path ? path : ".", flags, enc);
+	dirp = do_opendir(fd, baselen, path, flags, enc, funcs->error, arg, &status);
 	if (dirp == NULL) {
 # if FNM_SYSCASE || NORMALIZE_UTF8PATH
 	    if ((magical < 2) && !recursive && (errno == EACCES)) {
@@ -1790,7 +2390,7 @@ glob_helper(
 		goto literally;
 	    }
 # endif
-	    return 0;
+	    return status;
 	}
 	IF_NORMALIZE_UTF8PATH(norm_p = need_normalization(dirp, *path ? path : "."));
 
@@ -1801,10 +2401,21 @@ glob_helper(
 	}
 # endif
 # ifdef HAVE_GETATTRLIST
-	if (is_case_sensitive(dirp) == 0)
+	if (is_case_sensitive(dirp, path) == 0)
 	    flags |= FNM_CASEFOLD;
 # endif
-	while ((dp = READDIR(dirp, enc)) != NULL) {
+        ruby_glob_entries_t globent;
+        if (!glob_opendir(&globent, dirp, flags, enc)) {
+            status = 0;
+            if (funcs->error) {
+                status = (*funcs->error)(path, arg, enc, ENOMEM);
+            }
+            else {
+                sys_warning(path, enc);
+            }
+            return status;
+        }
+	while ((dp = glob_getent(&globent, flags, enc)) != NULL) {
 	    char *buf;
 	    rb_pathtype_t new_pathtype = path_unknown;
 	    const char *name;
@@ -1812,21 +2423,22 @@ glob_helper(
 	    int dotfile = 0;
 	    IF_NORMALIZE_UTF8PATH(VALUE utf8str = Qnil);
 
-	    if (recursive && dp->d_name[0] == '.') {
+	    name = dp->d_name;
+	    namlen = dp->d_namlen;
+	    if (recursive && name[0] == '.') {
 		++dotfile;
-		if (!dp->d_name[1]) {
+		if (namlen == 1) {
 		    /* unless DOTMATCH, skip current directories not to recurse infinitely */
 		    if (!(flags & FNM_DOTMATCH)) continue;
 		    ++dotfile;
+		    new_pathtype = path_directory; /* force to skip stat/lstat */
 		}
-		else if (dp->d_name[1] == '.' && !dp->d_name[2]) {
+		else if (namlen == 2 && name[1] == '.') {
 		    /* always skip parent directories not to recurse infinitely */
 		    continue;
 		}
 	    }
 
-	    name = dp->d_name;
-	    namlen = NAMLEN(dp);
 # if NORMALIZE_UTF8PATH
 	    if (norm_p && has_nonascii(name, namlen)) {
 		if (!NIL_P(utf8str = rb_str_normalize_ospath(name, namlen))) {
@@ -1841,16 +2453,16 @@ glob_helper(
 		break;
 	    }
 	    name = buf + pathlen + (dirsep != 0);
-	    if (recursive && dotfile < ((flags & FNM_DOTMATCH) ? 2 : 1)) {
 #ifdef DT_UNKNOWN
-		if ((new_pathtype = dp->d_type) != (rb_pathtype_t)DT_UNKNOWN)
-		    /* Got it. We need nothing more. */
-		    ;
-		else
-		    /* fall back to call lstat(2) */
+	    if (dp->d_type != DT_UNKNOWN) {
+		/* Got it. We need no more lstat. */
+		new_pathtype = dp->d_type;
+	    }
 #endif
+	    if (recursive && dotfile < ((flags & FNM_DOTMATCH) ? 2 : 1) &&
+		new_pathtype == path_unknown) {
 		/* RECURSIVE never match dot files unless FNM_DOTMATCH is set */
-		if (do_lstat(buf, &st, flags, enc) == 0)
+		if (do_lstat(fd, baselen, buf, &st, flags, enc) == 0)
 		    new_pathtype = IFTODT(st.st_mode);
 		else
 		    new_pathtype = path_noent;
@@ -1865,15 +2477,26 @@ glob_helper(
 
 	    for (cur = beg; cur < end; ++cur) {
 		struct glob_pattern *p = *cur;
+		struct dirent_brace_args args;
 		if (p->type == RECURSIVE) {
 		    if (new_pathtype == path_directory || /* not symlink but real directory */
-			new_pathtype == path_exist)
-			*new_end++ = p; /* append recursive pattern */
+			new_pathtype == path_exist) {
+			if (dotfile < ((flags & FNM_DOTMATCH) ? 2 : 1))
+			    *new_end++ = p; /* append recursive pattern */
+		    }
 		    p = p->next; /* 0 times recursion */
 		}
 		switch (p->type) {
+		  case BRACE:
+		    args.name = name;
+		    args.dp = dp;
+		    args.flags = flags;
+		    if (ruby_brace_expand(p->str, flags, dirent_match_brace,
+					  (VALUE)&args, enc, Qfalse) > 0)
+			*new_end++ = p->next;
+		    break;
 		  case ALPHA:
-# if USE_NAME_ON_FS == 2
+# if USE_NAME_ON_FS == USE_NAME_ON_FS_BY_FNMATCH
 		    if (plainname) {
 			*new_end++ = p->next;
 			break;
@@ -1888,15 +2511,15 @@ glob_helper(
 		}
 	    }
 
-	    status = glob_helper(buf, name - buf + namlen, 1,
+	    status = glob_helper(fd, buf, baselen, name - buf - baselen + namlen, 1,
 				 new_pathtype, new_beg, new_end,
-				 flags, func, arg, enc);
+				 flags, funcs, arg, enc);
 	    GLOB_FREE(buf);
 	    GLOB_FREE(new_beg);
 	    if (status) break;
 	}
 
-	closedir(dirp);
+        glob_dir_finish(&globent, flags);
     }
     else if (plain) {
 	struct glob_pattern **copy_beg, **copy_end, **cur2;
@@ -1945,16 +2568,18 @@ glob_helper(
 		    status = -1;
 		    break;
 		}
-#if USE_NAME_ON_FS == 1
+#if USE_NAME_ON_FS == USE_NAME_ON_FS_REAL_BASENAME
 		if ((*cur)->type == ALPHA) {
-		    long base = pathlen + (dirsep != 0);
-		    buf = replace_real_basename(buf, base, enc, IF_NORMALIZE_UTF8PATH(1)+0,
+		    buf = replace_real_basename(buf, pathlen + (dirsep != 0), enc,
+						IF_NORMALIZE_UTF8PATH(1)+0,
 						flags, &new_pathtype);
+		    if (!buf) break;
 		}
 #endif
-		status = glob_helper(buf, pathlen + strlen(buf + pathlen), 1,
+		status = glob_helper(fd, buf, baselen,
+				     namelen + strlen(buf + pathlen), 1,
 				     new_pathtype, new_beg, new_end,
-				     flags, func, arg, enc);
+				     flags, funcs, arg, enc);
 		GLOB_FREE(buf);
 		GLOB_FREE(new_beg);
 		if (status) break;
@@ -1968,15 +2593,64 @@ glob_helper(
 }
 
 static int
-ruby_glob0(const char *path, int flags, ruby_glob_func *func, VALUE arg, rb_encoding *enc)
+push_caller(const char *path, VALUE val, void *enc)
+{
+    struct push_glob_args *arg = (struct push_glob_args *)val;
+    struct glob_pattern *list;
+    int status;
+
+    list = glob_make_pattern(path, path + strlen(path), arg->flags, enc);
+    if (!list) {
+	return -1;
+    }
+    status = glob_helper(arg->fd, arg->path, arg->baselen, arg->namelen, arg->dirsep,
+			 arg->pathtype, &list, &list + 1, arg->flags, arg->funcs,
+			 arg->arg, enc);
+    glob_free_pattern(list);
+    return status;
+}
+
+static int ruby_glob0(const char *path, int fd, const char *base, int flags,
+                      const ruby_glob_funcs_t *funcs, VALUE arg, rb_encoding *enc);
+
+struct push_glob0_args {
+    int fd;
+    const char *base;
+    int flags;
+    const ruby_glob_funcs_t *funcs;
+    VALUE arg;
+};
+
+static int
+push_glob0_caller(const char *path, VALUE val, void *enc)
+{
+    struct push_glob0_args *arg = (struct push_glob0_args *)val;
+    return ruby_glob0(path, arg->fd, arg->base, arg->flags, arg->funcs, arg->arg, enc);
+}
+
+static int
+ruby_glob0(const char *path, int fd, const char *base, int flags,
+	   const ruby_glob_funcs_t *funcs, VALUE arg,
+	   rb_encoding *enc)
 {
     struct glob_pattern *list;
     const char *root, *start;
     char *buf;
-    size_t n;
-    int status;
+    size_t n, baselen = 0;
+    int status, dirsep = FALSE;
 
     start = root = path;
+
+    if (*root == '{') {
+        struct push_glob0_args args;
+        args.fd = fd;
+        args.base = base;
+        args.flags = flags;
+        args.funcs = funcs;
+        args.arg = arg;
+        return ruby_brace_expand(path, flags, push_glob0_caller, (VALUE)&args, enc, Qfalse);
+    }
+
     flags |= FNM_SYSCASE;
 #if defined DOSISH
     root = rb_enc_path_skip_prefix(root, root + strlen(root), enc);
@@ -1985,6 +2659,12 @@ ruby_glob0(const char *path, int flags, ruby_glob_func *func, VALUE arg, rb_enco
     if (*root == '/') root++;
 
     n = root - start;
+    if (!n && base) {
+	n = strlen(base);
+	baselen = n;
+	start = base;
+	dirsep = TRUE;
+    }
     buf = GLOB_ALLOC_N(char, n + 1);
     if (!buf) return -1;
     MEMCPY(buf, start, char, n);
@@ -1995,8 +2675,9 @@ ruby_glob0(const char *path, int flags, ruby_glob_func *func, VALUE arg, rb_enco
 	GLOB_FREE(buf);
 	return -1;
     }
-    status = glob_helper(buf, n, 0, path_unknown, &list, &list + 1,
-			 flags, func, arg, enc);
+    status = glob_helper(fd, buf, baselen, n-baselen, dirsep,
+			 path_unknown, &list, &list + 1,
+			 flags, funcs, arg, enc);
     glob_free_pattern(list);
     GLOB_FREE(buf);
 
@@ -2006,8 +2687,11 @@ ruby_glob0(const char *path, int flags, ruby_glob_func *func, VALUE arg, rb_enco
 int
 ruby_glob(const char *path, int flags, ruby_glob_func *func, VALUE arg)
 {
-    return ruby_glob0(path, flags & ~GLOB_VERBOSE, func, arg,
-		      rb_ascii8bit_encoding());
+    ruby_glob_funcs_t funcs;
+    funcs.match = func;
+    funcs.error = 0;
+    return ruby_glob0(path, AT_FDCWD, 0, flags & ~GLOB_VERBOSE,
+		      &funcs, arg, rb_ascii8bit_encoding());
 }
 
 static int
@@ -2021,29 +2705,22 @@ rb_glob_caller(const char *path, VALUE a, void *enc)
     return status;
 }
 
-static int
-rb_glob2(const char *path, int flags,
-	 void (*func)(const char *, VALUE, void *), VALUE arg,
-	 rb_encoding* enc)
+static const ruby_glob_funcs_t rb_glob_funcs = {
+    rb_glob_caller, rb_glob_error,
+};
+
+void
+rb_glob(const char *path, void (*func)(const char *, VALUE, void *), VALUE arg)
 {
     struct glob_args args;
+    int status;
 
     args.func = func;
     args.value = arg;
-    args.enc = enc;
-
-    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);
-}
+    args.enc = rb_ascii8bit_encoding();
 
-void
-rb_glob(const char *path, void (*func)(const char *, VALUE, void *), VALUE arg)
-{
-    int status = rb_glob2(path, 0, func, arg, rb_ascii8bit_encoding());
+    status = ruby_glob0(path, AT_FDCWD, 0, GLOB_VERBOSE, &rb_glob_funcs,
+			(VALUE)&args, args.enc);
     if (status) GLOB_JUMP_TAG(status);
 }
 
@@ -2053,7 +2730,6 @@ push_pattern(const char *path, VALUE ary, void *enc)
 #if defined _WIN32 || defined __APPLE__
     VALUE name = rb_utf8_str_new_cstr(path);
     rb_encoding *eenc = rb_default_internal_encoding();
-    OBJ_TAINT(name);
     name = rb_str_conv_enc(name, NULL, eenc ? eenc : enc);
 #else
     VALUE name = rb_external_str_new_with_enc(path, strlen(path), enc);
@@ -2063,7 +2739,7 @@ push_pattern(const char *path, VALUE ary, void *enc)
 
 static int
 ruby_brace_expand(const char *str, int flags, ruby_glob_func *func, VALUE arg,
-		  rb_encoding *enc)
+		  rb_encoding *enc, VALUE var)
 {
     const int escape = !(flags & FNM_NOESCAPE);
     const char *p = str;
@@ -2108,7 +2784,7 @@ ruby_brace_expand(const char *str, int flags, ruby_glob_func *func, VALUE arg,
 	    }
 	    memcpy(buf+shift, t, p-t);
 	    strlcpy(buf+shift+(p-t), rbrace+1, len-(shift+(p-t)));
-	    status = ruby_brace_expand(buf, flags, func, arg, enc);
+	    status = ruby_brace_expand(buf, flags, func, arg, enc, var);
 	    if (status) break;
 	}
 	GLOB_FREE(buf);
@@ -2117,11 +2793,12 @@ ruby_brace_expand(const char *str, int flags, ruby_glob_func *func, VALUE arg,
 	status = glob_call_func(func, s, arg, enc);
     }
 
+    RB_GC_GUARD(var);
     return status;
 }
 
 struct brace_args {
-    ruby_glob_func *func;
+    ruby_glob_funcs_t funcs;
     VALUE value;
     int flags;
 };
@@ -2131,7 +2808,7 @@ glob_brace(const char *path, VALUE val, void *enc)
 {
     struct brace_args *arg = (struct brace_args *)val;
 
-    return ruby_glob0(path, arg->flags, arg->func, arg->value, enc);
+    return ruby_glob0(path, AT_FDCWD, 0, arg->flags, &arg->funcs, arg->value, enc);
 }
 
 int
@@ -2140,10 +2817,11 @@ ruby_brace_glob_with_enc(const char *str, int flags, ruby_glob_func *func, VALUE
     struct brace_args args;
 
     flags &= ~GLOB_VERBOSE;
-    args.func = func;
+    args.funcs.match = func;
+    args.funcs.error = 0;
     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, enc, Qfalse);
 }
 
 int
@@ -2152,23 +2830,11 @@ ruby_brace_glob(const char *str, int flags, ruby_glob_func *func, VALUE arg)
     return ruby_brace_glob_with_enc(str, flags, func, arg, rb_ascii8bit_encoding());
 }
 
-struct push_glob_args {
-    struct glob_args glob;
-    int flags;
-};
-
-static int
-push_caller(const char *path, VALUE val, void *enc)
-{
-    struct push_glob_args *arg = (struct push_glob_args *)val;
-
-    return ruby_glob0(path, arg->flags, rb_glob_caller, (VALUE)&arg->glob, enc);
-}
-
 static int
-push_glob(VALUE ary, VALUE str, int flags)
+push_glob(VALUE ary, VALUE str, VALUE base, int flags)
 {
-    struct push_glob_args args;
+    struct glob_args args;
+    int fd;
     rb_encoding *enc = rb_enc_get(str);
 
 #if defined _WIN32 || defined __APPLE__
@@ -2179,174 +2845,117 @@ push_glob(VALUE ary, VALUE str, int flags)
     if (rb_enc_to_index(enc) == ENCINDEX_US_ASCII)
 	enc = rb_ascii8bit_encoding();
     flags |= GLOB_VERBOSE;
-    args.glob.func = push_pattern;
-    args.glob.value = ary;
-    args.glob.enc = enc;
-    args.flags = flags;
+    args.func = push_pattern;
+    args.value = ary;
+    args.enc = enc;
+    args.base = 0;
+    fd = AT_FDCWD;
+    if (!NIL_P(base)) {
+	if (!RB_TYPE_P(base, T_STRING) || !rb_enc_check(str, base)) {
+	    struct dir_data *dirp = DATA_PTR(base);
+	    if (!dirp->dir) dir_closed();
+#ifdef HAVE_DIRFD
+	    if ((fd = dirfd(dirp->dir)) == -1)
+		rb_sys_fail_path(dir_inspect(base));
+#endif
+	    base = dirp->path;
+	}
+	args.base = RSTRING_PTR(base);
+    }
 #if defined _WIN32 || defined __APPLE__
     enc = rb_utf8_encoding();
 #endif
 
-    RB_GC_GUARD(str);
-    return ruby_brace_expand(RSTRING_PTR(str), flags,
-			     push_caller, (VALUE)&args, enc);
+    return ruby_glob0(RSTRING_PTR(str), fd, args.base, flags, &rb_glob_funcs,
+		      (VALUE)&args, enc);
 }
 
 static VALUE
-rb_push_glob(VALUE str, int flags) /* '\0' is delimiter */
+rb_push_glob(VALUE str, VALUE base, int flags) /* '\0' is delimiter */
 {
-    long offset = 0;
     VALUE ary;
+    int status;
 
-    GlobPathValue(str, TRUE);
+    /* can contain null bytes as separators */
+    if (!RB_TYPE_P(str, T_STRING)) {
+	FilePathValue(str);
+    }
+    else if (!rb_str_to_cstr(str)) {
+        rb_raise(rb_eArgError, "nul-separated glob pattern is deprecated");
+    }
+    else {
+	rb_enc_check(str, rb_enc_from_encoding(rb_usascii_encoding()));
+    }
     ary = rb_ary_new();
 
-    while (offset < RSTRING_LEN(str)) {
-	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 += strlen(p) + 1;
-	pend = RSTRING_PTR(str) + RSTRING_LEN(str);
-	while (p < pend && !*p)
-	    p++;
-	offset = p - RSTRING_PTR(str);
-    }
+    status = push_glob(ary, str, base, flags);
+    if (status) GLOB_JUMP_TAG(status);
 
     return ary;
 }
 
 static VALUE
-dir_globs(long argc, const VALUE *argv, int flags)
+dir_globs(VALUE args, VALUE base, int flags)
 {
     VALUE ary = rb_ary_new();
     long i;
 
-    for (i = 0; i < argc; ++i) {
+    for (i = 0; i < RARRAY_LEN(args); ++i) {
 	int status;
-	VALUE str = argv[i];
-	GlobPathValue(str, TRUE);
-	status = push_glob(ary, str, flags);
+	VALUE str = RARRAY_AREF(args, i);
+	FilePathValue(str);
+	status = push_glob(ary, str, base, flags);
 	if (status) GLOB_JUMP_TAG(status);
     }
+    RB_GC_GUARD(args);
 
     return ary;
 }
 
-/*
- *  call-seq:
- *     Dir[ string [, string ...] ] -> array
- *
- *  Equivalent to calling
- *  <code>Dir.glob([</code><i>string,...</i><code>],0)</code>.
- *
- */
 static VALUE
-dir_s_aref(int argc, VALUE *argv, VALUE obj)
+dir_glob_option_base(VALUE base)
 {
-    if (argc == 1) {
-	return rb_push_glob(argv[0], 0);
+    if (base == Qundef || NIL_P(base)) {
+	return Qnil;
+    }
+#if USE_OPENDIR_AT
+    if (rb_typeddata_is_kind_of(base, &dir_data_type)) {
+	return base;
     }
-    return dir_globs(argc, argv, 0);
+#endif
+    FilePathValue(base);
+    if (!RSTRING_LEN(base)) return Qnil;
+    return base;
 }
 
-/*
- *  call-seq:
- *     Dir.glob( pattern, [flags] ) -> matches
- *     Dir.glob( pattern, [flags] ) { |filename| block }  -> nil
- *
- *  Expands +pattern+, which is an Array of patterns or a pattern String, and
- *  returns the results as +matches+ or as arguments given to the block.
- *
- *  Note that this pattern is not a regexp, it's closer to a shell glob.  See
- *  File::fnmatch for the meaning of the +flags+ parameter.  Note that case
- *  sensitivity depends on your system (so File::FNM_CASEFOLD is ignored), as
- *  does the order in which the results are returned.
- *
- *  <code>*</code>::
- *    Matches any file. Can be restricted by other values in the glob.
- *    Equivalent to <code>/ .* /x</code> in regexp.
- *
- *    <code>*</code>::     Matches all files
- *    <code>c*</code>::    Matches all files beginning with <code>c</code>
- *    <code>*c</code>::    Matches all files ending with <code>c</code>
- *    <code>\*c\*</code>:: Match all files that have <code>c</code> in them
- *                         (including at the beginning or end).
- *
- *    Note, this will not match Unix-like hidden files (dotfiles).  In order
- *    to include those in the match results, you must use the
- *    File::FNM_DOTMATCH flag or something like <code>"{*,.*}"</code>.
- *
- *  <code>**</code>::
- *    Matches directories recursively.
- *
- *  <code>?</code>::
- *    Matches any one character. Equivalent to <code>/.{1}/</code> in regexp.
- *
- *  <code>[set]</code>::
- *    Matches any one character in +set+.  Behaves exactly like character sets
- *    in Regexp, including set negation (<code>[^a-z]</code>).
- *
- *  <code>{p,q}</code>::
- *    Matches either literal <code>p</code> or literal <code>q</code>.
- *    Equivalent to pattern alternation in regexp.
- *
- *    Matching literals may be more than one character in length.  More than
- *    two literals may be specified.
- *
- *  <code> \\ </code>::
- *    Escapes the next metacharacter.
- *
- *    Note that this means you cannot use backslash on windows as part of a
- *    glob, i.e.  <code>Dir["c:\\foo*"]</code> will not work, use
- *    <code>Dir["c:/foo*"]</code> instead.
- *
- *  Examples:
- *
- *     Dir["config.?"]                     #=> ["config.h"]
- *     Dir.glob("config.?")                #=> ["config.h"]
- *     Dir.glob("*.[a-z][a-z]")            #=> ["main.rb"]
- *     Dir.glob("*.[^r]*")                 #=> ["config.h"]
- *     Dir.glob("*.{rb,h}")                #=> ["main.rb", "config.h"]
- *     Dir.glob("*")                       #=> ["config.h", "main.rb"]
- *     Dir.glob("*", File::FNM_DOTMATCH)   #=> [".", "..", "config.h", "main.rb"]
- *
- *     rbfiles = File.join("**", "*.rb")
- *     Dir.glob(rbfiles)                   #=> ["main.rb",
- *                                         #    "lib/song.rb",
- *                                         #    "lib/song/karaoke.rb"]
- *     libdirs = File.join("**", "lib")
- *     Dir.glob(libdirs)                   #=> ["lib"]
- *
- *     librbfiles = File.join("**", "lib", "**", "*.rb")
- *     Dir.glob(librbfiles)                #=> ["lib/song.rb",
- *                                         #    "lib/song/karaoke.rb"]
- *
- *     librbfiles = File.join("**", "lib", "*.rb")
- *     Dir.glob(librbfiles)                #=> ["lib/song.rb"]
- */
-static VALUE
-dir_s_glob(int argc, VALUE *argv, VALUE obj)
+static int
+dir_glob_option_sort(VALUE sort)
 {
-    VALUE str, rflags, ary;
-    int flags;
+    return (sort ? 0 : FNM_GLOB_NOSORT);
+}
 
-    if (rb_scan_args(argc, argv, "11", &str, &rflags) == 2)
-	flags = NUM2INT(rflags);
-    else
-	flags = 0;
+static VALUE
+dir_s_aref(rb_execution_context_t *ec, VALUE obj, VALUE args, VALUE base, VALUE sort)
+{
+    const int flags = dir_glob_option_sort(sort);
+    base = dir_glob_option_base(base);
+    if (RARRAY_LEN(args) == 1) {
+	return rb_push_glob(RARRAY_AREF(args, 0), base, flags);
+    }
+    return dir_globs(args, base, flags);
+}
 
-    ary = rb_check_array_type(str);
+static VALUE
+dir_s_glob(rb_execution_context_t *ec, VALUE obj, VALUE str, VALUE rflags, VALUE base, VALUE sort)
+{
+    VALUE ary = rb_check_array_type(str);
+    const int flags = NUM2INT(rflags) | dir_glob_option_sort(sort);
+    base = dir_glob_option_base(base);
     if (NIL_P(ary)) {
-	ary = rb_push_glob(str, flags);
+	ary = rb_push_glob(str, base, flags);
     }
     else {
-	VALUE v = ary;
-	ary = dir_globs(RARRAY_LEN(v), RARRAY_CONST_PTR(v), flags);
-	RB_GC_GUARD(v);
+        ary = dir_globs(ary, base, flags);
     }
 
     if (rb_block_given_p()) {
@@ -2359,7 +2968,7 @@ dir_s_glob(int argc, VALUE *argv, VALUE obj)
 static VALUE
 dir_open_dir(int argc, VALUE *argv)
 {
-    VALUE dir = rb_funcall2(rb_cDir, rb_intern("open"), argc, argv);
+    VALUE dir = rb_funcallv_kw(rb_cDir, rb_intern("open"), argc, argv, RB_PASS_CALLED_KEYWORDS);
 
     rb_check_typeddata(dir, &dir_data_type);
     return dir;
@@ -2399,17 +3008,25 @@ dir_foreach(int argc, VALUE *argv, VALUE io)
     return Qnil;
 }
 
+static VALUE
+dir_collect(VALUE dir)
+{
+    VALUE ary = rb_ary_new();
+    dir_each_entry(dir, rb_ary_push, ary, FALSE);
+    return ary;
+}
+
 /*
  *  call-seq:
  *     Dir.entries( dirname )                -> array
  *     Dir.entries( dirname, encoding: enc ) -> array
  *
  *  Returns an array containing all of the filenames in the given
- *  directory. Will raise a <code>SystemCallError</code> if the named
- *  directory doesn't exist.
+ *  directory. Will raise a SystemCallError if the named directory
+ *  doesn't exist.
  *
- *  The optional <i>enc</i> argument specifies the encoding of the directory.
- *  If not specified, the filesystem encoding is used.
+ *  The optional <i>encoding</i> keyword argument specifies the encoding of the
+ *  directory. If not specified, the filesystem encoding is used.
  *
  *     Dir.entries("testdir")   #=> [".", "..", "config.h", "main.rb"]
  *
@@ -2420,7 +3037,115 @@ dir_entries(int argc, VALUE *argv, VALUE io)
     VALUE dir;
 
     dir = dir_open_dir(argc, argv);
-    return rb_ensure(rb_Array, dir, dir_close, dir);
+    return rb_ensure(dir_collect, dir, dir_close, dir);
+}
+
+static VALUE
+dir_each_child(VALUE dir)
+{
+    return dir_each_entry(dir, dir_yield, Qnil, TRUE);
+}
+
+/*
+ *  call-seq:
+ *     Dir.each_child( dirname ) {| filename | block }                 -> nil
+ *     Dir.each_child( dirname, encoding: enc ) {| filename | block }  -> nil
+ *     Dir.each_child( dirname )                                       -> an_enumerator
+ *     Dir.each_child( dirname, encoding: enc )                        -> an_enumerator
+ *
+ *  Calls the block once for each entry except for "." and ".." in the
+ *  named directory, passing the filename of each entry as a parameter
+ *  to the block.
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
+ *     Dir.each_child("testdir") {|x| puts "Got #{x}" }
+ *
+ *  <em>produces:</em>
+ *
+ *     Got config.h
+ *     Got main.rb
+ *
+ */
+static VALUE
+dir_s_each_child(int argc, VALUE *argv, VALUE io)
+{
+    VALUE dir;
+
+    RETURN_ENUMERATOR(io, argc, argv);
+    dir = dir_open_dir(argc, argv);
+    rb_ensure(dir_each_child, dir, dir_close, dir);
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     dir.each_child {| filename | block }  -> dir
+ *     dir.each_child                        -> an_enumerator
+ *
+ *  Calls the block once for each entry except for "." and ".." in
+ *  this directory, passing the filename of each entry as a parameter
+ *  to the block.
+ *
+ *  If no block is given, an enumerator is returned instead.
+ *
+ *     d = Dir.new("testdir")
+ *     d.each_child  {|x| puts "Got #{x}" }
+ *
+ *  <em>produces:</em>
+ *
+ *     Got config.h
+ *     Got main.rb
+ *
+ */
+static VALUE
+dir_each_child_m(VALUE dir)
+{
+    RETURN_ENUMERATOR(dir, 0, 0);
+    return dir_each_entry(dir, dir_yield, Qnil, TRUE);
+}
+
+/*
+ *  call-seq:
+ *     dir.children  -> array
+ *
+ *  Returns an array containing all of the filenames except for "."
+ *  and ".." in this directory.
+ *
+ *     d = Dir.new("testdir")
+ *     d.children   #=> ["config.h", "main.rb"]
+ *
+ */
+static VALUE
+dir_collect_children(VALUE dir)
+{
+    VALUE ary = rb_ary_new();
+    dir_each_entry(dir, rb_ary_push, ary, TRUE);
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     Dir.children( dirname )                -> array
+ *     Dir.children( dirname, encoding: enc ) -> array
+ *
+ *  Returns an array containing all of the filenames except for "."
+ *  and ".." in the given directory. Will raise a SystemCallError if
+ *  the named directory doesn't exist.
+ *
+ *  The optional <i>encoding</i> keyword argument specifies the encoding of the
+ *  directory. If not specified, the filesystem encoding is used.
+ *
+ *     Dir.children("testdir")   #=> ["config.h", "main.rb"]
+ *
+ */
+static VALUE
+dir_s_children(int argc, VALUE *argv, VALUE io)
+{
+    VALUE dir;
+
+    dir = dir_open_dir(argc, argv);
+    return rb_ensure(dir_collect_children, dir, dir_close, dir);
 }
 
 static int
@@ -2508,6 +3233,7 @@ fnmatch_brace(const char *pattern, VALUE val, void *enc)
  *
  *     File.fnmatch('cat', 'CAT')                     #=> false # case sensitive
  *     File.fnmatch('cat', 'CAT', File::FNM_CASEFOLD) #=> true  # case insensitive
+ *     File.fnmatch('cat', 'CAT', File::FNM_SYSCASE)  #=> true or false # depends on the system default
  *
  *     File.fnmatch('?',   '/', File::FNM_PATHNAME)  #=> false # wildcard doesn't match '/' on FNM_PATHNAME
  *     File.fnmatch('*',   '/', File::FNM_PATHNAME)  #=> false # ditto
@@ -2554,7 +3280,7 @@ file_s_fnmatch(int argc, VALUE *argv, VALUE obj)
     else
 	flags = 0;
 
-    StringValue(pattern);
+    StringValueCStr(pattern);
     FilePathStringValue(path);
 
     if (flags & FNM_EXTGLOB) {
@@ -2563,7 +3289,7 @@ file_s_fnmatch(int argc, VALUE *argv, VALUE obj)
 	args.value = path;
 	args.flags = flags;
 	if (ruby_brace_expand(RSTRING_PTR(pattern), flags, fnmatch_brace,
-			      (VALUE)&args, rb_enc_get(pattern)) > 0)
+			      (VALUE)&args, rb_enc_get(pattern), pattern) > 0)
 	    return Qtrue;
     }
     else {
@@ -2620,19 +3346,46 @@ rb_file_directory_p(void)
 }
 #endif
 
-/*
- * call-seq:
- *   Dir.exists?(file_name)  ->  true or false
- *
- * Deprecated method. Don't use.
- */
+/* :nodoc: */
 static VALUE
 rb_dir_exists_p(VALUE obj, VALUE fname)
 {
-    rb_warning("Dir.exists? is a deprecated name, use Dir.exist? instead");
+    rb_warn_deprecated("Dir.exists?", "Dir.exist?");
     return rb_file_directory_p(obj, fname);
 }
 
+static void *
+nogvl_dir_empty_p(void *ptr)
+{
+    const char *path = ptr;
+    DIR *dir = opendir(path);
+    struct dirent *dp;
+    VALUE result = Qtrue;
+
+    if (!dir) {
+	int e = errno;
+	switch (gc_for_fd_with_gvl(e)) {
+	  default:
+	    dir = opendir(path);
+	    if (dir) break;
+	    e = errno;
+	    /* fall through */
+	  case 0:
+	    if (e == ENOTDIR) return (void *)Qfalse;
+	    errno = e; /* for rb_sys_fail_path */
+	    return (void *)Qundef;
+	}
+    }
+    while ((dp = READDIR(dir, NULL)) != NULL) {
+	if (!to_be_skipped(dp)) {
+	    result = Qfalse;
+	    break;
+	}
+    }
+    closedir(dir);
+    return (void *)result;
+}
+
 /*
  * call-seq:
  *   Dir.empty?(path_name)  ->  true or false
@@ -2643,13 +3396,11 @@ rb_dir_exists_p(VALUE obj, VALUE fname)
 static VALUE
 rb_dir_s_empty_p(VALUE obj, VALUE dirname)
 {
-    DIR *dir;
-    struct dirent *dp;
-    VALUE result = Qtrue, orig;
+    VALUE result, orig;
     const char *path;
     enum {false_on_notdir = 1};
 
-    GlobPathValue(dirname, FALSE);
+    FilePathValue(dirname);
     orig = rb_str_dup_frozen(dirname);
     dirname = rb_str_encode_ospath(dirname);
     dirname = rb_str_dup_frozen(dirname);
@@ -2674,37 +3425,18 @@ rb_dir_s_empty_p(VALUE obj, VALUE dirname)
     }
 #endif
 
-    dir = opendir(path);
-    if (!dir) {
-	int e = errno;
-	switch (e) {
-	  case EMFILE: case ENFILE:
-	    rb_gc();
-	    dir = opendir(path);
-	    if (dir) break;
-	    e = errno;
-	    /* fall through */
-	  default:
-	    if (false_on_notdir && e == ENOTDIR) return Qfalse;
-	    rb_syserr_fail_path(e, orig);
-	}
+    result = (VALUE)rb_thread_call_without_gvl(nogvl_dir_empty_p, (void *)path,
+					    RUBY_UBF_IO, 0);
+    if (result == Qundef) {
+	rb_sys_fail_path(orig);
     }
-    errno = 0;
-    while ((dp = READDIR(dir, NULL)) != NULL) {
-	if (!to_be_skipped(dp)) {
-	    result = Qfalse;
-	    break;
-	}
-    }
-    closedir(dir);
     return result;
 }
 
 /*
- *  Objects of class <code>Dir</code> are directory streams representing
- *  directories in the underlying file system. They provide a variety of
- *  ways to list directories and their contents. See also
- *  <code>File</code>.
+ *  Objects of class Dir are directory streams representing
+ *  directories in the underlying file system. They provide a variety
+ *  of ways to list directories and their contents. See also File.
  *
  *  The directory used in these examples contains the two regular files
  *  (<code>config.h</code> and <code>main.rb</code>), the parent
@@ -2719,17 +3451,19 @@ Init_Dir(void)
     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, "each_child", dir_s_each_child, -1);
+    rb_define_singleton_method(rb_cDir, "children", dir_s_children, -1);
 
-    rb_define_method(rb_cDir,"initialize", dir_initialize, -1);
     rb_define_method(rb_cDir,"fileno", dir_fileno, 0);
     rb_define_method(rb_cDir,"path", dir_path, 0);
     rb_define_method(rb_cDir,"to_path", dir_path, 0);
     rb_define_method(rb_cDir,"inspect", dir_inspect, 0);
     rb_define_method(rb_cDir,"read", dir_read, 0);
     rb_define_method(rb_cDir,"each", dir_each, 0);
+    rb_define_method(rb_cDir,"each_child", dir_each_child_m, 0);
+    rb_define_method(rb_cDir,"children", dir_collect_children, 0);
     rb_define_method(rb_cDir,"rewind", dir_rewind, 0);
     rb_define_method(rb_cDir,"tell", dir_tell, 0);
     rb_define_method(rb_cDir,"seek", dir_seek, 1);
@@ -2747,8 +3481,6 @@ Init_Dir(void)
     rb_define_singleton_method(rb_cDir,"unlink", dir_s_rmdir, 1);
     rb_define_singleton_method(rb_cDir,"home", dir_s_home, -1);
 
-    rb_define_singleton_method(rb_cDir,"glob", dir_s_glob, -1);
-    rb_define_singleton_method(rb_cDir,"[]", dir_s_aref, -1);
     rb_define_singleton_method(rb_cDir,"exist?", rb_file_directory_p, 1);
     rb_define_singleton_method(rb_cDir,"exists?", rb_dir_exists_p, 1);
     rb_define_singleton_method(rb_cDir,"empty?", rb_dir_s_empty_p, 1);
@@ -2803,3 +3535,5 @@ Init_Dir(void)
      */
     rb_file_const("FNM_SHORTNAME", INT2FIX(FNM_SHORTNAME));
 }
+
+#include "dir.rbinc"
diff --git a/dir.rb b/dir.rb
new file mode 100644
index 0000000000..eb46305013
--- /dev/null
+++ b/dir.rb
@@ -0,0 +1,136 @@
+class Dir
+  #    Dir.open( string ) -> aDir
+  #    Dir.open( string, encoding: enc ) -> aDir
+  #    Dir.open( string ) {| aDir | block } -> anObject
+  #    Dir.open( string, encoding: enc ) {| aDir | block } -> anObject
+  #
+  # The optional <i>encoding</i> keyword argument specifies the encoding of the directory.
+  # If not specified, the filesystem encoding is used.
+  #
+  # With no block, <code>open</code> is a synonym for Dir::new. If a
+  # block is present, it is passed <i>aDir</i> as a parameter. The
+  # directory is closed at the end of the block, and Dir::open returns
+  # the value of the block.
+  def self.open(name, encoding: nil, &block)
+    dir = Primitive.dir_s_open(name, encoding)
+    if block
+      begin
+        yield dir
+      ensure
+        Primitive.dir_s_close(dir)
+      end
+    else
+      dir
+    end
+  end
+
+  #    Dir.new( string ) -> aDir
+  #    Dir.new( string, encoding: enc ) -> aDir
+  #
+  # Returns a new directory object for the named directory.
+  #
+  # The optional <i>encoding</i> keyword argument specifies the encoding of the directory.
+  # If not specified, the filesystem encoding is used.
+  def initialize(name, encoding: nil)
+    Primitive.dir_initialize(name, encoding)
+  end
+
+  #    Dir[ string [, string ...] [, base: path] [, sort: true] ] -> array
+  #
+  # Equivalent to calling
+  # <code>Dir.glob([</code><i>string,...</i><code>], 0)</code>.
+  def self.[](*args, base: nil, sort: true)
+    Primitive.dir_s_aref(args, base, sort)
+  end
+
+  #    Dir.glob( pattern, [flags], [base: path] [, sort: true] )                       -> array
+  #    Dir.glob( pattern, [flags], [base: path] [, sort: true] ) { |filename| block }  -> nil
+  #
+  # Expands +pattern+, which is a pattern string or an Array of pattern
+  # strings, and returns an array containing the matching filenames.
+  # If a block is given, calls the block once for each matching filename,
+  # passing the filename as a parameter to the block.
+  #
+  # The optional +base+ keyword argument specifies the base directory for
+  # interpreting relative pathnames instead of the current working directory.
+  # As the results are not prefixed with the base directory name in this
+  # case, you will need to prepend the base directory name if you want real
+  # paths.
+  #
+  # The results which matched single wildcard or character set are sorted in
+  # binary ascending order, unless false is given as the optional +sort+
+  # keyword argument.  The order of an Array of pattern strings and braces
+  # are preserved.
+  #
+  # Note that the pattern is not a regexp, it's closer to a shell glob.
+  # See File::fnmatch for the meaning of the +flags+ parameter.
+  # Case sensitivity depends on your system (File::FNM_CASEFOLD is ignored).
+  #
+  # <code>*</code>::
+  #   Matches any file. Can be restricted by other values in the glob.
+  #   Equivalent to <code>/ .* /mx</code> in regexp.
+  #
+  #   <code>*</code>::     Matches all files
+  #   <code>c*</code>::    Matches all files beginning with <code>c</code>
+  #   <code>*c</code>::    Matches all files ending with <code>c</code>
+  #   <code>\*c\*</code>:: Match all files that have <code>c</code> in them
+  #                        (including at the beginning or end).
+  #
+  #   Note, this will not match Unix-like hidden files (dotfiles).  In order
+  #   to include those in the match results, you must use the
+  #   File::FNM_DOTMATCH flag or something like <code>"{*,.*}"</code>.
+  #
+  # <code>**</code>::
+  #   Matches directories recursively if followed by <code>/</code>.  If
+  #   this path segment contains any other characters, it is the same as the
+  #   usual <code>*</code>.
+  #
+  # <code>?</code>::
+  #   Matches any one character. Equivalent to <code>/.{1}/</code> in regexp.
+  #
+  # <code>[set]</code>::
+  #   Matches any one character in +set+.  Behaves exactly like character sets
+  #   in Regexp, including set negation (<code>[^a-z]</code>).
+  #
+  # <code>{p,q}</code>::
+  #   Matches either literal <code>p</code> or literal <code>q</code>.
+  #   Equivalent to pattern alternation in regexp.
+  #
+  #   Matching literals may be more than one character in length.  More than
+  #   two literals may be specified.
+  #
+  # <code> \\ </code>::
+  #   Escapes the next metacharacter.
+  #
+  #   Note that this means you cannot use backslash on windows as part of a
+  #   glob, i.e.  <code>Dir["c:\\foo*"]</code> will not work, use
+  #   <code>Dir["c:/foo*"]</code> instead.
+  #
+  # Examples:
+  #
+  #    Dir["config.?"]                     #=> ["config.h"]
+  #    Dir.glob("config.?")                #=> ["config.h"]
+  #    Dir.glob("*.[a-z][a-z]")            #=> ["main.rb"]
+  #    Dir.glob("*.[^r]*")                 #=> ["config.h"]
+  #    Dir.glob("*.{rb,h}")                #=> ["main.rb", "config.h"]
+  #    Dir.glob("*")                       #=> ["config.h", "main.rb"]
+  #    Dir.glob("*", File::FNM_DOTMATCH)   #=> [".", "..", "config.h", "main.rb"]
+  #    Dir.glob(["*.rb", "*.h"])           #=> ["main.rb", "config.h"]
+  #
+  #    Dir.glob("**/*.rb")                 #=> ["main.rb",
+  #                                        #    "lib/song.rb",
+  #                                        #    "lib/song/karaoke.rb"]
+  #
+  #    Dir.glob("**/*.rb", base: "lib")    #=> ["song.rb",
+  #                                        #    "song/karaoke.rb"]
+  #
+  #    Dir.glob("**/lib")                  #=> ["lib"]
+  #
+  #    Dir.glob("**/lib/**/*.rb")          #=> ["lib/song.rb",
+  #                                        #    "lib/song/karaoke.rb"]
+  #
+  #    Dir.glob("**/lib/*.rb")             #=> ["lib/song.rb"]
+  def self.glob(pattern, _flags = 0, flags: _flags, base: nil, sort: true)
+    Primitive.dir_s_glob(pattern, flags, base, sort)
+  end
+end
diff --git a/dln.c b/dln.c
index 5af9a57802..caaa685a6e 100644
--- a/dln.c
+++ b/dln.c
@@ -22,6 +22,7 @@
 static void dln_loaderror(const char *format, ...);
 #endif
 #include "dln.h"
+#include "internal.h"
 
 #ifdef HAVE_STDLIB_H
 # include <stdlib.h>
@@ -231,13 +232,13 @@ load_header(int fd, struct exec *hdrp, long disp)
 #  define R_RIGHTSHIFT(r)	(reloc_r_rightshift[(r)->r_type])
 #  define R_BITSIZE(r) 		(reloc_r_bitsize[(r)->r_type])
 #  define R_LENGTH(r)		(reloc_r_length[(r)->r_type])
-static int reloc_r_rightshift[] = {
+static const int reloc_r_rightshift[] = {
   0, 0, 0, 0, 0, 0, 2, 2, 10, 0, 0, 0, 0, 0, 0,
 };
-static int reloc_r_bitsize[] = {
+static const int reloc_r_bitsize[] = {
   8, 16, 32, 8, 16, 32, 30, 22, 22, 22, 13, 10, 32, 32, 16,
 };
-static int reloc_r_length[] = {
+static const int reloc_r_length[] = {
   0, 1, 2, 0, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
 };
 #  define R_PCREL(r) \
@@ -1170,7 +1171,7 @@ dln_strerror(void)
 }
 #endif
 
-#if defined(_AIX) && ! defined(_IA64)
+#if defined(_AIX)
 static void
 aix_loaderror(const char *pathname)
 {
@@ -1242,6 +1243,23 @@ rb_w32_check_imported(HMODULE ext, HMODULE mine)
 #define translit_separator(str) (void)(str)
 #endif
 
+#ifdef USE_DLN_DLOPEN
+# include "ruby/internal/stdbool.h"
+# include "internal/warnings.h"
+COMPILER_WARNING_PUSH
+#if defined(__clang__) || GCC_VERSION_SINCE(4, 2, 0)
+COMPILER_WARNING_IGNORED(-Wpedantic)
+#endif
+static bool
+dln_incompatible_library_p(void *handle)
+{
+    void *ex = dlsym(handle, EXTERNAL_PREFIX"ruby_xmalloc");
+    void *const fp = (void *)ruby_xmalloc;
+    return ex && ex != fp;
+}
+COMPILER_WARNING_POP
+#endif
+
 void*
 dln_load(const char *file)
 {
@@ -1250,7 +1268,6 @@ dln_load(const char *file)
 #endif
 #if !defined(_AIX) && !defined(NeXT)
     const char *error = 0;
-#define DLN_ERROR() (error = dln_strerror(), strcpy(ALLOCA_N(char, strlen(error) + 1), error))
 #endif
 
 #if defined _WIN32
@@ -1330,10 +1347,11 @@ dln_load(const char *file)
 	}
 # if defined RUBY_EXPORT
 	{
-	    void *ex = dlsym(handle, EXTERNAL_PREFIX"ruby_xmalloc");
-	    if (ex && ex != ruby_xmalloc) {
+	    if (dln_incompatible_library_p(handle)) {
 
-#   if defined __APPLE__
+#   if defined __APPLE__ && \
+    defined(MAC_OS_X_VERSION_MIN_REQUIRED) && \
+    (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_11)
 		/* dlclose() segfaults */
 		rb_fatal("%s - %s", incompatible, file);
 #   else
@@ -1347,7 +1365,8 @@ dln_load(const char *file)
 
 	init_fct = (void(*)())(VALUE)dlsym(handle, buf);
 	if (init_fct == NULL) {
-	    error = DLN_ERROR();
+	    const size_t errlen = strlen(error = dln_strerror()) + 1;
+	    error = memcpy(ALLOCA_N(char, errlen), error, errlen);
 	    dlclose(handle);
 	    goto failed;
 	}
@@ -1384,7 +1403,7 @@ dln_load(const char *file)
     }
 #endif /* hpux */
 
-#if defined(_AIX) && ! defined(_IA64)
+#if defined(_AIX)
 #define DLN_DEFINED
     {
 	void (*init_fct)();
diff --git a/dln.h b/dln.h
index d98b2607e2..99106fd22b 100644
--- a/dln.h
+++ b/dln.h
@@ -1,3 +1,5 @@
+#ifndef DLN_H
+#define DLN_H
 /**********************************************************************
 
   dln.h -
@@ -9,24 +11,7 @@
 
 **********************************************************************/
 
-#ifndef DLN_H
-#define DLN_H
-
-#ifdef __cplusplus
-# ifndef  HAVE_PROTOTYPES
-#  define HAVE_PROTOTYPES 1
-# endif
-# ifndef  HAVE_STDARG_PROTOTYPES
-#  define HAVE_STDARG_PROTOTYPES 1
-# endif
-#endif
-
-#undef _
-#ifdef HAVE_PROTOTYPES
-# define _(args) args
-#else
-# define _(args) ()
-#endif
+#include "ruby/defines.h"       /* for RUBY_SYMBOL_EXPORT_BEGIN */
 
 RUBY_SYMBOL_EXPORT_BEGIN
 
diff --git a/dln_find.c b/dln_find.c
index b08612764e..ca62441631 100644
--- a/dln_find.c
+++ b/dln_find.c
@@ -248,26 +248,14 @@ dln_find_1(const char *fname, const char *path, char *fbuf, size_t size,
 	/* now append the file name */
 	i = fnlen;
 	if (fspace < i) {
-	  toolong:
-	    PATHNAME_TOO_LONG();
-	    goto next;
+            goto toolong;
 	}
 	fspace -= i;
 	memcpy(bp, fname, i + 1);
 
 #if defined(DOSISH)
 	if (exe_flag && !ext) {
-	  needs_extension:
-	    for (j = 0; j < sizeof(extension) / sizeof(extension[0]); j++) {
-		if (fspace < strlen(extension[j])) {
-		    PATHNAME_TOO_LONG();
-		    continue;
-		}
-		strlcpy(bp + i, extension[j], fspace);
-		if (stat(fbuf, &st) == 0)
-		    return fbuf;
-	    }
-	    goto next;
+            goto needs_extension;
 	}
 #endif
 
@@ -284,7 +272,25 @@ dln_find_1(const char *fname, const char *path, char *fbuf, size_t size,
 	if (*ep == '\0') {
 	    return NULL;
 	}
+        continue;
+
+      toolong:
+        PATHNAME_TOO_LONG();
+        goto next;
 
+#if defined(DOSISH)
+      needs_extension:
+        for (j = 0; j < sizeof(extension) / sizeof(extension[0]); j++) {
+            if (fspace < strlen(extension[j])) {
+                PATHNAME_TOO_LONG();
+                continue;
+            }
+            strlcpy(bp + i, extension[j], fspace);
+            if (stat(fbuf, &st) == 0)
+                return fbuf;
+        }
+        goto next;
+#endif
 	/* otherwise try the next component in the search path */
     }
 }
diff --git a/dmydln.c b/dmydln.c
index 0fc0a5325e..d05cda0b8e 100644
--- a/dmydln.c
+++ b/dmydln.c
@@ -6,5 +6,5 @@ dln_load(const char *file)
 {
     rb_loaderror("this executable file can't load extension libraries");
 
-    UNREACHABLE;
+    UNREACHABLE_RETURN(NULL);
 }
diff --git a/doc/.document b/doc/.document
index b48c0387a7..ad17aada6d 100644
--- a/doc/.document
+++ b/doc/.document
@@ -1,4 +1,4 @@
+*.md
 *.rdoc
-ChangeLog*
 NEWS-*
 syntax
diff --git a/doc/ChangeLog-0.60_to_1.1 b/doc/ChangeLog-0.60_to_1.1
index 33b0326892..bd5f140dc3 100644
--- a/doc/ChangeLog-0.60_to_1.1
+++ b/doc/ChangeLog-0.60_to_1.1
@@ -3166,7 +3166,7 @@ Fri Aug 11 14:37:03 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
 
 	* io.c: マクロREAD_DATA_PENDINGの定義を変更(Linux対応)
 
-	* io.c (io_fptr_finalize): fptrの開放時の処理を指定できるように．
+	* io.c (io_fptr_finalize): fptrの解放時の処理を指定できるように．
 
 Wed Aug  9 16:52:41 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
 
@@ -3448,7 +3448,7 @@ Thu May 18 12:27:23 1995  Yukihiro Matsumoto  <matz@ix-02>
 	  無くなった(と思う)．
 
 	* gc.c (gc): the_scopeをマークしていなかったので，ローカル変数の指
-	  しているオブジェクトが間違って開放される場合があった．
+	  しているオブジェクトが間違って解放される場合があった．
 
 	* gc.c (mark_locations_array): 若干の高速化．
 
diff --git a/doc/ChangeLog-1.8.0 b/doc/ChangeLog-1.8.0
index 0d00266735..6d9453d011 100644
--- a/doc/ChangeLog-1.8.0
+++ b/doc/ChangeLog-1.8.0
@@ -13020,7 +13020,7 @@ Tue Jun 12 00:41:18 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 Mon Jun 11 14:29:41 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* confgure.in: add RUBY_CANONICAL_BUILD.
+	* configure.in: add RUBY_CANONICAL_BUILD.
 
 Sun Jun 10 17:31:47 2001  Guy Decoux  <decoux@moulon.inra.fr>
 
@@ -21236,7 +21236,7 @@ Sun Jan  3 01:37:58 1999  Takao KAWAMURA  <kawamura@ike.tottori-u.ac.jp>
 Sat Jan  2 17:09:06 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
 	* eval.c (rb_jump_tag): new api to invoke JUMP_TAG.  tag values
-	  can obtained from rb_eval_string_protect()/rb_load_protect().
+	  can be obtained from rb_eval_string_protect()/rb_load_protect().
 
 	* eval.c (rb_rescue): now catches all exceptions but SystemExit.
 
diff --git a/doc/ChangeLog-1.9.3 b/doc/ChangeLog-1.9.3
index b3deb551b0..d6aaea7f19 100644
--- a/doc/ChangeLog-1.9.3
+++ b/doc/ChangeLog-1.9.3
@@ -3325,7 +3325,7 @@ Thu May 19 06:30:38 2011  Eric Hodel  <drbrain@segment7.net>
 Thu May 19 06:16:41 2011  Eric Hodel  <drbrain@segment7.net>
 
 	* lib:  Convert tabs to spaces for ruby files per
-	  http://bugs.ruby-lang.org/projects/ruby/wiki/DeveloperHowto#coding-style
+	  https://bugs.ruby-lang.org/projects/ruby/wiki/DeveloperHowto#coding-style
 	  Patch by Steve Klabnik [Ruby 1.9 - Bug #4730]
 	  Patch by Jason Dew [Ruby 1.9 - Feature #4718]
 
@@ -12814,7 +12814,7 @@ Thu Aug  5 22:09:30 2010  Tanaka Akira  <akr@fsij.org>
 Thu Aug  5 21:20:31 2010  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* compile.c (NODE_ARGSCAT, NODE_ARGSPUSH): drop unused ARGSCAT
-	  results when poped is true.  [ruby-dev:41933], [Bug #3658]
+	  results when popped is true.  [ruby-dev:41933], [Bug #3658]
 	  This is retry of r28870 and r28873 which were reverted.
 
 Thu Aug  5 20:13:49 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
@@ -77162,7 +77162,7 @@ Sun May 22 21:54:06 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 Sun May 22 19:11:35 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
-	* ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLServer#intialize):
+	* ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLServer#initialize):
 	  should initialize session id context. [ruby-core:4663]
 
 	* ext/openssl/ossl_ssl.c (ossl_sslctx_setup): add session id support.
@@ -82601,7 +82601,7 @@ Sat Sep 18 14:10:23 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* dir.c (dir_s_chdir): avoid memory leak and unnecessary chdir to
 	  the original directory when exception has caused in changing
-	  direcotry or within block.  thanks to Johan Holmberg
+	  directory 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>
@@ -92076,7 +92076,7 @@ Mon Sep  1 16:59:10 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (rb_thread_start_0): should not error_print() within
 	  terminated thread, because $stderr used by it might be
-	  overriden now.  [ruby-dev:21280]
+	  overridden now.  [ruby-dev:21280]
 
 Sun Aug 31 22:46:55 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
 
diff --git a/doc/ChangeLog-2.0.0 b/doc/ChangeLog-2.0.0
index a1a79b8dca..b51d742203 100644
--- a/doc/ChangeLog-2.0.0
+++ b/doc/ChangeLog-2.0.0
@@ -9758,7 +9758,7 @@ Thu Aug 23 16:20:04 2012  Koichi Sasada  <ko1@atdot.net>
 	  are b10.
 	  If flonum is activated, then USE_FLONUM macro is 1.
 	  I'll write detailed in this technique on
-	  https://bugs.ruby-lang.org/projects/ruby-trunk/wiki/Flonum_tech
+	  https://bugs.ruby-lang.org/projects/ruby-master/wiki/Flonum_tech
 
 	* benchmark/bmx_temp.rb: add an benchmark for simple
 	  Float calculation.
@@ -13008,7 +13008,7 @@ Thu Jun  7 15:53:03 2012  Koichi Sasada  <ko1@atdot.net>
 
 	* .gdbinit: add function `trace_machine_instructions' to trace
 	  in native machine assemble.
-	  See https://bugs.ruby-lang.org/projects/ruby-trunk/wiki/MachineInstructionsTraceWithGDB
+	  See https://bugs.ruby-lang.org/projects/ruby-master/wiki/MachineInstructionsTraceWithGDB
 	  for more details.
 
 Wed Jun  6 21:31:21 2012  Tanaka Akira  <akr@fsij.org>
@@ -14711,7 +14711,7 @@ Fri Apr 27 01:45:05 2012  NARUSE, Yui  <naruse@ruby-lang.org>
 	  (22) main thread waits at gvl_yield:112 (native_cond_wait)
 	  As described above, the main thread can't escape from
 	  rb_threadptr_execute_interrupts_common.
-	  See extended memo: http://bugs.ruby-lang.org/projects/ruby-trunk/wiki/R35480_ExtendedMemo
+	  See extended memo: http://bugs.ruby-lang.org/projects/ruby-master/wiki/R35480_ExtendedMemo
 
 Fri Apr 27 07:15:07 2012  Tanaka Akira  <akr@fsij.org>
 
diff --git a/doc/ChangeLog-2.1.0 b/doc/ChangeLog-2.1.0
index f80b2d6bd1..5b670b31c9 100644
--- a/doc/ChangeLog-2.1.0
+++ b/doc/ChangeLog-2.1.0
@@ -2948,7 +2948,7 @@ Tue Nov  5 03:31:23 2013  Koichi Sasada  <ko1@atdot.net>
 	  Young objects will be promoted to old objects after one GC.
 	  Old objects are not collect until major (full) GC.
 
-	  The issue of this approach is some objects can promoted as old
+	  The issue of this approach is some objects can promote as old
 	  objects accidentally and not freed until major GC.
 	  Major GC is not frequently so short-lived but accidentally becoming
 	  old objects are not freed.
@@ -3596,7 +3596,7 @@ Tue Oct 22 19:19:05 2013  Koichi Sasada  <ko1@atdot.net>
 	    maintains all pages.
 	    For example, pages are allocated from the heap_pages.
 
-	  See https://bugs.ruby-lang.org/projects/ruby-trunk/wiki/GC_design
+	  See https://bugs.ruby-lang.org/projects/ruby-master/wiki/GC_design
 	  and https://bugs.ruby-lang.org/attachments/4015/data-heap_structure_with_multiple_heaps.png
 	  for more details.
 
@@ -8612,7 +8612,7 @@ Wed Jul 17 14:31:13 2013  Koichi Sasada  <ko1@atdot.net>
 	  (4) heap::sorted is an array of "slots", sorted by an address of
 	      slot::body.
 
-	  See https://bugs.ruby-lang.org/projects/ruby-trunk/wiki/GC_design
+	  See https://bugs.ruby-lang.org/projects/ruby-master/wiki/GC_design
 	  for more details (figure).
 
 	* gc.c: Avoid "heaps" terminology. It is ambiguous.
diff --git a/doc/ChangeLog-2.4.0 b/doc/ChangeLog-2.4.0
new file mode 100644
index 0000000000..96b5ecb077
--- /dev/null
+++ b/doc/ChangeLog-2.4.0
@@ -0,0 +1,9492 @@
+Mon Nov  7 00:32:45 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_optimization.rb (test_tailcall_interrupted_by_sigint):
+	  ignore on Windows because we cannot handle signaled status of child
+	  ruby process on this platform.
+
+Sun Nov  6 23:36:07 2016  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* test/ruby/test_optimization.rb (test_tailcall_interrupted_by_sigint):
+	  send SIGKILL if the child process doesn't die within 1 second.
+
+Sun Nov  6 21:54:28 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/vcs.rb (export_changelog): generate ChangeLog file from
+	  vcs's log. [Feature #12283]
+
+	* tool/make-snapshot (package): overwrite ChangeLog by generated
+	  ChangeLog.
+
+Sun Nov  6 21:36:33 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* NEWS: Added entry for RDoc 5.
+
+Sun Nov  6 21:35:37 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* NEWS: ordered entries and adjust styles.
+
+Sun Nov  6 18:23:31 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* NEWS: Added entry for [Feature #12160][ruby-core:74239]
+
+Sun Nov  6 18:18:25 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* NEWS: Added entry for r56624.
+
+Sun Nov  6 15:53:03 2016  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* configure.in (-Wno-maybe-uninitialized): gcc 6 also shows the same
+	  warnings as described in r49410.
+
+Sun Nov  6 14:42:50 2016  takkanm  <takkanm@gmail.com>
+
+	* eval.c (rb_mod_include, rb_mod_prepend): check if arguments are
+	  given, as well as Kernel#extend.  [ruby-dev:49854] [Bug #12887]
+	  [Fix GH-1470]
+
+Sun Nov  6 11:59:05 2016  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* test/rinda/test_rinda.rb (test_make_socket_ipv6_multicast,
+	  test_make_socket_ipv6_multicast_hops): skip if IPv6 multicast
+	  address is not available.
+
+Sun Nov  6 11:53:23 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/irb.rb (Binding#irb): new method like Binding#pry.
+
+Sun Nov  6 11:48:55 2016  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* test/net/smtp/test_smtp.rb (test_tls_connect, test_tls_connect):
+	  use Socket.tcp_server_sockets in case localhost is resolved to ::1.
+
+Sun Nov  6 11:49:47 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/irb.rb (IRB::Irb#run): split from IRB.start.
+
+Sun Nov  6 11:45:11 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/e2mmap.rb (E2MM.def_exception): remove old definition if
+	  exists so that works multiple times.
+
+Sun Nov  6 10:03:00 2016  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* test/ruby/test_optimization.rb (test_tailcall_interrupted_by_sigint):
+	  don't use sleep to run faster.
+
+Sun Nov  6 09:58:47 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (rb_exec_fillarg): honor the given path environment
+	  variable.  [ruby-core:53103] [Bug #8004]
+
+Sun Nov  6 01:52:31 2016  Akira Matsuda  <ronnie@dio.jp>
+
+	* lib/erb.rb: Alias regist_scanner to register_scanner
+
+Sun Nov  6 01:39:36 2016  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* compile.c (tailcallable_p): disable tail call optimization for
+	  toplevel, eval, and load to avoid SEGV when interrupted by SIGINT.
+	  [ruby-core:76327] [Bug #12576]
+
+Sun Nov  6 01:28:41 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.h: rename REG_(CFP|PC|SP|EP) to VM_REG_....
+	  [Bug #12527]
+
+	* vm_exec.c: ditto.
+
+Sun Nov  6 00:25:11 2016  Sho Hashimoto  <sho.hsmt@gmail.com>
+
+	* enumerator.c (InitVM_Enumerator): Enumerator::Lazy#chunk_while
+	  defined.  [Fix GH-1186]
+	  https://github.com/ruby/ruby/pull/1186
+
+Sun Nov  6 00:22:51 2016  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* vm_eval.c (vm_call0_cfunc_with_frame): pass method id to
+	  dtrace hook. follow up r56592.
+
+Sun Nov  6 00:06:38 2016  Tanaka Akira  <akr@fsij.org>
+
+	* lib/resolv.rb (Resolv::LOC::Coord.create): fixed.
+	  [ruby-core:72567] [Bug #11912] fixed by Eric Wong and Kazuhiro
+	  NISHIYAMA.
+
+Sun Nov  6 00:03:09 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in (-Wimplicit-fallthrough): gcc7 introduces case
+	  fall through warnings but it is too noisy.
+	  https://gcc.gnu.org/bugzilla/show_bug.cgi?id=7652
+
+Sat Nov  5 23:58:32 2016  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* numeric.c (rb_int_round): cast to SIGNED_VALUE to suppress
+	  warnings by -Wsign-compare.
+
+Sat Nov  5 23:48:27 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* file.c (rb_home_dir_of): convert given username into filesystem
+	  encoding. [ruby-core:76682] [Bug #12652]
+	  patched by Davis Mosans
+
+Sat Nov  5 23:46:03 2016  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (vtm_add_offset): Fix yday on last day of year.
+	  [ruby-core:72878] [Bug #11994] Fixed by Andrew White.
+
+Sat Nov  5 23:30:41 2016  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/http.rb (Net::HTTP.post): new convenience method to send
+	  a POST request.  [ruby-core:75484] [Feature #12375]
+
+Sat Nov  5 23:03:54 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http.rb (transport_request): other than HTTPContinue
+	  in 1xx (HTTPInformation) also needs to continue. [Bug #12890]
+
+Sat Nov  5 22:51:06 2016  Tanaka Akira  <akr@fsij.org>
+
+	* lib/time.rb (make_time): "now" argument as nil works again.
+	  This is broken since Ruby 2.2.
+	  Mathieu Jobin pointed a problem.
+	  https://github.com/ruby/ruby/commit/e4b05d91eb0d48fd172abf015c493bb42d755d07#commitcomment-17421387
+
+Sat Nov  5 22:50:13 2016  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/ipaddr.rb (IPAddr#==): If coercion fails, return false
+	  instead of passing through the exception. [ruby-core:77451]
+	  [Bug #12799]
+
+	* lib/ipaddr.rb (IPAddr#<=>): If coercion fails, return nil
+	  instead of passing through the exception. [ruby-core:77451]
+	  [Bug #12799]
+
+Sat Nov  5 22:11:33 2016  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* vm_trace.c (tracepoint_attr_callee_id, rb_tracearg_callee_id):
+	  add TracePoint#callee_id. [ruby-core:77241] [Feature #12747]
+
+	* cont.c, eval.c, gc.c, include/ruby/intern.h, insns.def, thread.c,
+	  vm.c, vm_backtrace.c, vm_core.h, vm_eval.c, vm_insnhelper.c, vm_trace.c: ditto.
+
+	* test/ruby/test_settracefunc.rb: tests for above.
+
+Sat Nov  5 22:09:48 2016  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* eval.c, method.h, proc.c, vm.c, vm_eval.c, vm_insnhelper.c, vm_method.c:
+	  TracePoint#method_id should return method_id, not callee_id.
+	  [ruby-core:77241] [Feature #12747]
+
+	* test/ruby/test_settracefunc.rb: change accordingly.
+
+Sat Nov  5 18:49:37 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (flo_round, int_round): support round-to-nearest-even
+	  semantics of IEEE 754 to match sprintf behavior, and add `half:`
+	  optional keyword argument for the old behavior.
+	  [ruby-core:76273] [Bug #12548]
+
+Sat Nov  5 18:17:54 2016  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/set.rb (Set#compare_by_identity, Set#compare_by_identity?):
+	  New methods. [Feature #12210]
+
+Sat Nov  5 18:17:08 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* lib/rdoc/*, test/rdoc/*: Update rdoc-5.0.0
+	  Release note: https://github.com/rdoc/rdoc/blob/b825775647f62c5b525e9780a28ff2fbb1d5bf6f/History.rdoc#500--2016-11-05
+
+Sat Nov  5 17:29:06 2016  Tanaka Akira  <akr@fsij.org>
+
+	* lib/resolv.rb (Resolv::DNS#extract_resources): Use each_resource
+	  instead of each_answer.
+	  [ruby-core:75461] [Bug #12372] reported by Rafael Fernandez Lopez.
+
+Sat Nov  5 17:18:24 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/-test-/file/fs.c (get_atime_p): Updating of file access times
+	  is enabled or not.
+
+Sat Nov  5 16:28:07 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (extract_getline_opts): extract chomp option.
+	  [Feature #12553]
+
+Sat Nov  5 15:58:24 2016  Sho Hashimoto  <sho-h@netlab.jp>
+
+	* tool/mkconfig.rb: [DOC] add rbconfig documentation.
+
+Sat Nov  5 15:42:52 2016  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/smtp.rb (tlsconnect): support timeout for TLS handshake.
+	  [ruby-core:76893] [Bug #12678]
+
+	* lib/net/protocol.rb (ssl_socket_connect): new method to implement
+	  timeout for TLS handshake.
+
+	* lib/net/http.rb (connect): use Net::Protocol#ssl_socket_connect.
+
+Sat Nov  5 14:17:20 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (brace_body, do_body): since cmdarg_stack is saved in
+	  VALUE val, should restore from the same member.  on big-endian
+	  platforms where VALUE is larger than int, it restored 0 in the
+	  upper word.  [ruby-core:77920] [Bug #12900]
+
+Sat Nov  5 13:52:52 2016  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/shellwords.rb (Shellwords#shellsplit): Fix the handling of
+	  the backslash in double quotes to conform to the standard.
+	  [ruby-core:63807] [Bug #10055]
+
+Sat Nov  5 12:14:31 2016  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (Pathname#empty?): New method.
+	  [ruby-core:76404] [Feature #12596] Proposed by John Backus.
+
+Sat Nov  5 11:53:02 2016  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* test/ruby/test_refinement.rb (test_refine_alias_in_subclass):
+	  add a test to check that alias in subclasses can be refined.
+	  [ruby-core:69374] [Bug #11186]
+
+Sat Nov  5 11:20:57 2016  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* cont.c (cont_new): disable optimization if clang's version is
+	  3.8.0.  [ruby-core:77894] [Bug #12893]
+
+Sat Nov  5 10:07:18 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_file.rb (TestFile#test_stat): fix noatime case.
+	  [ruby-core:77943] [Bug #12903]
+
+Fri Nov  4 17:52:44 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (heap_page_resurrect): do not return tomb_pages when
+	  page->freelist == NULL.
+	  [Bug #12670]
+
+Fri Nov  4 16:31:45 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* util.c (ruby_dtoa): round to even, instead of rounding to
+	  nearest.  [ruby-core:77864] [Bug #12889]
+
+Fri Nov  4 15:31:00 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: Add compiler version message into rbconfig
+	  as RbConfig::CONFIG['CC_VERSION_MESSAGE']. [Feature #12896]
+
+Fri Nov  4 13:03:00 2016  Kenta Murata  <mrkn@mrkn.jp>
+
+	* numeric.c (rb_int_digits): Fix exception message
+	  [ruby-core:77502] [Bug #12815]
+
+Fri Nov  4 10:51:16 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/pathname/pathname.c (path_hash): fix unnormalized Fixnum
+	  value bug on mingw/mswin.
+
+Fri Nov  4 10:35:47 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/fileutils.rb (FileUtils::Entry_#copy): ensure that the
+	  source entry exists first, to fix error for non-existent entry.
+	  [ruby-core:77885] [Bug #12892]
+
+Thu Nov  3 21:45:00 2016  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c: Import changes from ruby/bigdecimal
+	  repository.
+
+Thu Nov  3 15:01:29 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c: include sys/sysmacros.h for ArchLinux which deprecated
+	  use of major() and minor() in sys/types.h.
+
+Wed Nov  2 08:45:49 2016  Dmitry Gritsay  <unseductable@gmail.com>
+
+	* doc/extension.rdoc: set ANYARGS as arguments for func1 and func2.
+
+	* doc/extension.rdoc: mention the exception object which is passed
+	  to func2 as the second argument.  [Fix GH-1471]
+
+Wed Nov  2 07:34:27 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (rb_num_coerce_bit): enable bit operations with
+	  coercing by non-integer object.  [ruby-core:77783] [Bug #12875]
+
+Tue Nov  1 01:31:09 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (ac_cv_func_round): round(3) in x86_64-w64-mingw32
+	  is not accurate in an edge case.  [ruby-core:77794] [Bug #12878]
+
+Mon Oct 31 17:36:04 2016  Code Ahss  <aycabta@gmail.com>
+
+	* test/test_forwardable.rb (TestForwardable#test_on_private_method):
+	  add test for [Bug #12782] [Bug #12840]
+
+Mon Oct 31 11:08:51 2016  Samuel Williams  <samuel.williams@oriontransfer.co.nz>
+
+	* lib/uri/generic.rb (URI::Generic#merge): merge merge0.
+	  [GH-1469]
+
+Sun Oct 30 15:32:43 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update
+	  rubygems to 2.6.8.
+	  Release note of 2.6.8: https://github.com/rubygems/rubygems/commit/9fb8880976f5ab998912898b091d88aa10eb1d4a
+
+Sun Oct 30 06:39:37 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/windows_1254.c: Fix typo. Reported by k-takata at
+	  https://github.com/k-takata/Onigmo/commit/ceb59cc. Thanks!
+
+Sat Oct 29 19:59:37 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (cond0): !-operator is a method call, no warning for
+	  literal in condition.  [ruby-core:77801] [Bug #12881]
+
+Sat Oct 29 10:09:38 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_compile_each): turn flip-flop in a not-operator
+	  into a boolean value.  fix up r56315
+
+Sat Oct 29 09:39:14 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (vm_call0_body): follow the original class, not to
+	  loop the prepended module.  [ruby-core:77784] [Bug #12876]
+
+Sat Oct 29 00:14:30 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/trans/windows-1255-tbl.rb: update mapping from 0xCA to
+	  U+05BA.  [Feature #12877]
+
+Fri Oct 28 23:22:32 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/depend: extract transcode_tblgen method calls for libraries
+	  loaded by dynamically generated names, in single_byte.trans.
+
+Fri Oct 28 16:05:03 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* insns.def (opt_case_dispatch): extract float value only if the
+	  Float method is not redefined.
+
+Fri Oct 28 15:58:16 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* internal.h (RB_OBJ_BUILTIN_TYPE): special-const safe
+	  BUILTIN_TYPE.
+
+Fri Oct 28 15:20:18 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* complex.c (id_finite_p, id_infinite_p, id_rationalize, id_PI):
+	  initialize static IDs.
+
+	* complex.c (FINITE_TYPE_P): extract predicate.
+
+	* complex.c (rb_complex_finite_p, rb_complex_infinite_p): use
+	  dedicated predicates instead of switch by TYPE.
+
+Thu Oct 27 23:28:12 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (rb_integer_type_p): turn into macro to help
+	  clang based on old gcc to eliminate CSE.
+
+Thu Oct 27 16:33:47 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* tool/redmine-backporter.rb (rel): check the exception and show right
+	  message.
+
+Thu Oct 27 14:57:33 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/socket/lib/socket.rb (UDPSocket#recvfrom_nonblock): [DOC] Remove
+	  a false statement "If _maxlen_ is omitted, its default value is
+	  65536." maxlen, the first parameter, cannot be omitted as the method
+	  signature indicates. This hasn't changed ever since it was first
+	  implemented.
+
+Thu Oct 27 09:42:09 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (rb_convert_to_integer): convert a fixable float to a
+	  fixnum directly without the conversion method, as well as bignum
+	  case.
+
+	* object.c (rb_convert_to_integer): should not drop the converted
+	  string.
+
+Wed Oct 26 17:09:59 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (rb_intern): use prefixed version macro
+	  RUBY_CONST_ID_CACHE.
+
+Wed Oct 26 11:28:25 2016  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* NEWS: added several entries which (if I remember correctly) are
+	  added in a year.
+
+Tue Oct 25 12:54:07 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (mnew_internal): follow the original class, not to loop
+	  the prepended module.  [ruby-core:77591] [Bug #12832]
+
+Mon Oct 24 10:52:17 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/lib/test/unit.rb (Test::Unit::Parallel#deal): update the
+	  job status after a task finished, to show idling workers.
+
+Mon Oct 24 10:51:09 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* complex.c (Init_Complex): undefine methods inherited from
+	  Comparable, because Complex does not have <=> method.
+	  [Bug #12866]
+
+	* class.c (rb_undef_methods_from): undefine methods defined in
+	  super from klass.
+
+Mon Oct 24 10:19:44 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* complex.c (Init_Complex): undefine Complex#clamp, which does not
+	  work like other Comparable methods, because Complex does not
+	  have <=> method.  patched by Tim Peters <zomg.tim AT gmail.com>
+	  in [ruby-core:77720].  [Bug #12866]
+
+Sun Oct 23 11:41:41 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/encoding.h: include "ruby/ruby.h" explicitly for
+	  enum ruby_fl_type and VALUE.
+
+Sat Oct 22 23:33:55 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (reg_compile_gen): always append error message to the
+	  error buffer.
+
+Sat Oct 22 22:33:32 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (num_funcall1): check recursion by inverse pair, to
+	  fix fake infinite recursion.  [ruby-core:77713] [Bug #12864]
+
+Sat Oct 22 18:52:32 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (rb_hash_compact_bang): should return nil if no elements
+	  is deleted.  [ruby-core:77709] [Bug #12863]
+
+Sat Oct 22 10:28:28 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (DLDFLAGS): fallback to LDFLAGS.
+	  [ruby-core:72444] [Bug #11863]
+
+	* configure.in (LIBRUBY_DLDFLAGS): fallback to DLDFLAGS.
+
+	* configure.in (RUBY_APPEND_OPTION, RUBY_PREPEND_OPTION): expand
+	  the option to be appended/prepended when matching, as well as
+	  RUBY_APPEND_OPTIONS and  RUBY_PREPEND_OPTIONS.
+
+Sat Oct 22 09:52:57 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (setup_args): duplicate splatting array if more
+	  arguments present to obey left-to-right execution order.
+	  [ruby-core:77701] [Bug# 12860]
+
+Fri Oct 21 16:44:44 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (do_opendir): retry after GC when the limit for open file
+	  descriptors reached.
+
+Fri Oct 21 16:06:25 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (open_load_file): retry after GC when the limit for open
+	  file descriptors reached.
+
+Fri Oct 21 11:34:17 2016  Pascal Schmid  <Lechindianer@users.noreply.github.com>
+
+	* string.c (rb_str_sub, rb_str_gsub): [DOC] 'backlash' should read
+	  'backslash'.  [Fix GH-1461]
+
+Thu Oct 20 17:02:56 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* lib/uri/common.rb: added documentation for deprecated method.
+	  [Misc #11960][ruby-core:72733][ci skip]
+
+Thu Oct 20 16:57:23 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* ext/digest/digest.c: Add documentation for Digest.
+	  [Feature #10452][ruby-core:66001][ci skip]
+	  * remove HMAC from list of digest algorithms,
+	  * add MD5 in list of digest algorithms,
+	  * add information about writing a C digest implementation using Digest::Base,
+	  * add documentation for Digest::Base public methods.
+	* ext/digest/md5/md5init.c: add examples for MD5.
+	* ext/digest/rmd160/rmd160init.c: add examples for Digest::RMD160.
+	* ext/digest/sha1/sha1init.c: add examples for Digest::SHA1.
+
+Thu Oct 20 16:19:51 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* lib/open-uri.rb: Improved documentation grammar for
+	  open-uri#open option. [Misc #11329][ruby-core:69868][ci skip]
+
+Wed Oct 19 21:48:40 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* NEWS: mention refinements with Kernel#send and
+	  BasicObject#__send__.  [Feature #11476]
+
+Wed Oct 19 17:02:15 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_call_opt_send): enable refinements with
+	  Kernel#send and BasicObject#__send__.  [Feature #11476]
+
+Wed Oct 19 14:22:49 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* basictest/runner.rb: do not clobber the option by --run-opt with
+	  RUBYOPT.  reported by Allen Hewes <rallenh AT hotmail.com>.
+
+Wed Oct 19 00:09:06 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* addr2line.c (parse_debug_line_cu): boundary checks for
+	  compressed debug sections.  [ruby-dev:49840] [Bug #12850]
+
+Tue Oct 18 16:36:40 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (DLDFLAGS): append --compress-debug-sections=zlib
+	  if available, which reduces the size of LIBRUBY_SO by half or
+	  more.
+
+Mon Oct 17 16:20:37 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/configure.bat: add option to enable/disable to install
+	  static ruby library.  defaulted to "no".  [Feature #12845]
+
+	* configure.in (install-static-library): add option to enable/
+	  disable to install static ruby library.  defaulted to "no" if
+	  enable-shared.  [Feature #12845]
+
+	* tool/rbinstall.rb (local-arch-lib): respect the option.
+
+Sun Oct 16 15:09:06 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/windows_1254.c, test/ruby/enc/test_case_comprehensive.rb:
+	  Implement non-ASCII case conversion for Windows-1254.
+
+Sat Oct 15 14:17:05 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_args.c (refine_sym_proc_call): search and call method with
+	  refinements.
+
+	* vm_args.c (vm_caller_setup_arg_block): enable refinements when
+	  enabled in the caller.  [Feature #9451]
+
+Sat Oct 15 00:54:01 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (proc_exec_cmd): use UTF-8 version aspawn.
+	  [ruby-dev:49838] [Bug #12841]
+
+Fri Oct 14 22:26:10 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse/kwargs.rb (OptionParser#define_by_keywords):
+	  [EXPERIMENTAL] extract command line option definitions from the
+	  information of keyword arguments.
+
+Fri Oct 14 18:27:18 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* object.c: Improve documentation for Float conversion.
+	  [ruby-core:71661][Bug #11736][ci skip]
+
+Fri Oct 14 18:00:20 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* lib/logger.rb: Improve Logger.new option documentation.
+	  [Feature #12803][ruby-core:77467]
+
+Fri Oct 14 17:20:24 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (make_switch, parse_in_order): unify underscores
+	  to hyphens.
+
+Fri Oct 14 10:48:37 2016  Eric Wong  <e@80x24.org>
+
+	* lib/webrick/utils.rb (TimeoutHandler): use monotonic clock
+	  (watch): ditto
+
+Thu Oct 13 19:41:32 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (copy_stream_body): use IO to write to copy to duplex IO.
+	  http://twitter.com/knu/status/786505317974585344
+
+Thu Oct 13 17:05:57 2016  Dwain Faithfull  <dwfaithfull@gmail.com>
+
+	* hash.c (rb_hash_compact, rb_hash_compact_bang): Removes nil
+	  values from the original hash, to port Active Support behavior.
+	  [Feature #11818]
+
+Thu Oct 13 11:35:33 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_sort_bang, rb_ary_sort, rb_ary_sort_by_bang):
+	  [DOC] describe that sort may not be stable.
+
+	* enum.c (enum_sort, enum_sort_by): ditto.
+
+Thu Oct 13 11:31:40 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/rexml/xpath/test_text.rb (test_ancestors): Array#sort may
+	  not be stable.  [ruby-core:76088] [Bug #12509]
+
+	* test/rss/test_maker_{0.9,1.0,2.0}.rb (test_items): ditto.
+
+Thu Oct 13 10:37:31 2016  Eric Wong  <e@80x24.org>
+
+	* doc/extension.rdoc: wording fix
+
+Thu Oct 13 00:39:08 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_array.rb (test_sort_bang_with_freeze): make a
+	  clone to copy a <=> singleton method, instead of dup.  which
+	  element will be called is not predictable.
+	  [ruby-core:76088] [Bug #12509]
+
+Thu Oct 13 00:21:27 2016  Simon Soriano  <simon0191@gmail.com>
+
+	* doc/extension.rdoc: Replace "You can defined hooked variables"
+	  with "You can define hooked variables". [Fix GH-1460]
+
+Wed Oct 12 21:05:50 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ruby.c (open_load_file): revert r56385.  it introduced incompatibility
+	  about `DATA.binmode?`.
+
+Wed Oct 12 15:24:53 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* tool/downloader.rb: Removed verification of gem certification.
+	  Because signed gem is not working on rubygems ecosystem.
+	* tool/gem-unpack.rb: ditto.
+
+Tue Oct 11 22:08:24 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (prep_io): fix typo of struct member name.
+	  [ruby-core:77550] [Bug #12829]
+
+Tue Oct 11 16:45:24 2016  Tanaka Akira  <akr@fsij.org>
+
+	* lib/uri/generic.rb (URI.find_proxy): Add an optional argument, env.
+
+Tue Oct 11 16:38:32 2016  Tanaka Akira  <akr@fsij.org>
+
+	* lib/pp.rb (String#pretty_print): Defined to print a string as
+	  multiple lines.
+	  [ruby-core:76800] [Feature#12664] proposed by Petr Chalupa.
+
+Mon Oct 10 15:22:27 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (open_load_file): bind the open fd to an IO instance
+	  before waiting FIFO, not to leak the fd if interrupted.
+
+Mon Oct 10 12:40:54 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (open_load_file): compare with EXEEXT instead of hard
+	  coded name, and do not match with mere EXEEXT.
+
+	* ruby.c (open_load_file): open in binary mode if available, as
+	  parser deals with EOLs.
+
+	* io.c (prep_io): reduce isatty call (and its system call) on
+	  Cygwin.
+
+Sun Oct  9 23:05:53 2016  Prathamesh Sonpatki  <csonpatki@gmail.com>
+
+	* array.c, class.c: Fixed documentation where Fixnum was referred
+	  directly to use Integer, as Fixnum and Bignum are now unified
+	  into Integer and direct usage is deprecated.  [Fix GH-1459]
+
+Sun Oct  9 11:37:19 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_core.h (VM_ASSERT): stringify expr here before expansion in
+	  RUBY_ASSERT_WHEN.
+
+Sat Oct  8 10:54:22 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/-test-/memory_status/memory_status.c (read_status): use
+	  Win32 GetProcessMemoryInfo API.
+
+	* ext/-test-/memory_status/memory_status.c: get memory sizes by
+	  mach task_info system call.
+
+Sat Oct  8 09:06:55 2016  Aurelien Jacobs  <aurel@gnuage.org>
+
+	* lib/logger.rb (Logger::Period#next_rotate_time): fix monthly log
+	  rotate when DST is applied during a month of 31 days.
+	  [Fix GH-1458]
+
+Fri Oct  7 20:21:39 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (gc_prof_setup_new_record): fix the condition to get
+	  rusage.
+
+	* gc.c (gc_profile_dump_major_reason): remove undefined flags.
+
+Fri Oct  7 19:18:33 2016  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/*.c, ext/win32ole/win32ole.h: use RB_INT2FIX instead of
+	  INT2FIX, and so on.
+
+Fri Oct  7 14:18:40 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* basictest/test.rb: Adjust spaces in class declarations
+	  with inheritance. [fix GH-1227] Patch by @adrfer
+	* lib/irb/*: ditto.
+	* lib/prime.rb: ditto.
+	* lib/shell/builtin-command.rb: ditto.
+	* object.c: ditto.
+	* sample/*.rb: ditto.
+	* test/-ext-/method/test_arity.rb: ditto.
+
+Thu Oct  6 17:29:44 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* load.c (rb_require_safe): SyntaxError created by the parser just
+	  has the message and needs to set up the backtrace.
+	  [ruby-core:77491] [Bug #12811]
+
+	* load.c (rb_load_internal0): load/require is not the main
+	  script.
+
+Thu Oct  6 13:35:15 2016  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* enum.c: [DOC] Improve doc [ci-skip]
+
+Thu Oct  6 11:38:14 2016  Chris Jones  <chris@christopherjones.us>
+
+	* ext/readline/extconf.rb: Update error message with correct words.
+	  [fix GH-1453][ci skip] Patch by @magikid
+
+Thu Oct  6 11:01:49 2016  Tieg Zaharia  <tieg.zaharia@gmail.com>
+
+	* lib/uri/common.rb (WEB_ENCODINGS_): Update URI::WEB_ENCODINGS_
+	  hash, and fix documented command to grab it.  [Fix GH-1430]
+
+Thu Oct  6 10:37:13 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* enum.c: Add reduce/inject alias note.
+	  [fix GH-1400][ci skip] Patch by @getaaron
+
+Thu Oct  6 10:30:27 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (update_coverage): check coverage values, and ignore
+	  non-fixnum values.
+
+Thu Oct  6 09:19:21 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (fptr_finalize): use dedicated macro RB_INTEGER_TYPE_P.
+
+Wed Oct  5 18:02:44 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* lib/net/http/response.rb: Improve document readability.
+	  [fix GH-1411][ci skip] Patch by @stz-seongheon
+
+Wed Oct  5 15:43:32 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* node.c (dump_node): flatten statements in NODE_BLOCK.
+
+Wed Oct  5 14:27:36 2016  Byron Bowerman  <me@bm5k.com>
+
+	* range.c: Add docs for max/min behavior with exclusive range.
+	  [fix GH-1433][ci skip] Patch by @BM5k
+
+Wed Oct  5 12:57:21 2016  Richard Schneeman  <richard.schneeman+foo@gmail.com>
+
+	* ext/socket/*.c: Add proper require for example to work.
+	  [fix GH-1378][ci skip] Patch by @schneems
+
+Wed Oct  5 11:47:19 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* io.c: Fixed equivalent ruby code with core implemention.
+	  [fix GH-1429][ci skip] Patch by @sos4nt
+
+Wed Oct  5 11:36:21 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* lib/delegate.rb: Added missing spaces and Removed needless spaces.
+	  [fix GH-1454][ci skip] Patch by @bogdanvlviv
+
+Wed Oct  5 03:24:55 2016  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* enum.c: Make Enumerable#chunk with no block return
+	  an Enumerator [#2172]
+
+Wed Oct  5 01:19:45 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* internal.h (ST2FIX): new macro to convert st_index_t to Fixnum.
+	  a hash value of Object might be Bignum, but it causes many troubles
+	  especially the Object is used as a key of a hash.  so I've gave up
+	  to do so.
+
+	* array.c (rb_ary_hash): use above macro.
+
+	* bignum.c (rb_big_hash): ditto.
+
+	* hash.c (rb_obj_hash, rb_hash_hash): ditto.
+
+	* numeric.c (rb_dbl_hash): ditto.
+
+	* proc.c (proc_hash): ditto.
+
+	* re.c (rb_reg_hash, match_hash): ditto.
+
+	* string.c (rb_str_hash_m): ditto.
+
+Tue Oct  4 12:59:44 2016  Koichi ITO  <koic.ito@gmail.com>
+
+	* array.c (rb_ary_dig): [DOC] update an example of error message
+	  by Array#dig, because of Integer Unification.  [Fix GH-1455]
+
+Tue Oct  4 09:55:12 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_div2): need more room
+	  for precision to round.  [ruby-core:77475] [Bug #12805]
+
+Tue Oct  4 06:05:46 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regcomp.c (onig_print_compiled_byte_code): make the shown address
+	  look relative.
+
+Tue Oct  4 05:53:11 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regexec.c (OPCODE_EXEC_HOOK): op is p-1 because p is already
+	  incremented.
+
+	* regexec.c (OPCODE_EXEC_HOOK): use the exact end address.
+
+	* regexec.c (match_at): don't call OPCODE_EXEC_HOOK in CASE()
+	  when it comes from goto fail.
+
+Mon Oct  3 21:24:41 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* NEWS: mention Readline.quoting_detection_proc{,=}.
+
+Mon Oct  3 21:19:46 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* lib/logger.rb: [DOC] Fix default value of shift_age.
+
+Mon Oct  3 17:20:05 2016  George Brocklehurst  <ruby@georgebrock.com>
+
+	* ext/readline/readline.c (readline_s_set_quoting_detection_proc):
+	  support rl_char_is_quoted_p.  [Feature #12659]
+
+	* ext/readline/readline.c (readline_s_get_quoting_detection_proc):
+	  ditto.
+
+Sun Oct  2 08:22:28 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (RB_INT2FIX, RB_LONG2FIX): prefix RB to
+	  global symbols to get rid of name conflicts with other headers.
+
+Sun Oct  2 07:51:20 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_hash_m): hash values may be negative.
+
+Sun Oct  2 02:04:12 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* string.c (rb_str_hash_m): st_index_t is not guaranteed as the same
+	  size with int, and of course also not guaranteed the value can be
+	  Fixnum.
+
+Sun Oct  2 02:03:06 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* numeric.c (rb_fix2str): detect unnormalized Fixnum value.
+
+Sat Oct  1 23:08:47 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/date/date_parse.c (date_zone_to_diff): it's nonsence and really
+	  harm that to use unary minus operator with unsigned value.
+	  get rid of test failures introduced at r56312.
+
+Sat Oct  1 22:17:49 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_compile_each): move numeric literal range
+	  optimization from fixup_nodes() in parse.y.
+
+Sat Oct  1 19:19:34 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (compile_flip_flop): simplify generated code.
+
+	* compile.c (compile_branch_condition): flip-flop can appear only
+	  in conditional expressions.
+
+Sat Oct  1 02:02:02 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (poll_child_status): rb_w32_wait_events_blocking() sets
+	  errno internally, then should not set it here.
+
+Fri Sep 30 19:06:21 2016  Anton Davydov  <mail@davydovanton.com>
+
+	* lib/uri/http.rb: Documentation and code style improvements.
+	* test/uri/test_http.rb: Added test for coverage.
+	  [fix GH-1427][ruby-core:77255][Misc #12756]
+
+Fri Sep 30 18:43:20 2016  Jason Yeo  <jason@jasonyeo.me>
+
+	* doc/syntax/control_expressions.rdoc: Add missing 'as'
+	  [ci skip][fix GH-1448] Patch by @jsyeo
+
+Thu Sep 29 23:38:04 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* lib/yaml/store.rb (YAML::Store#dump): use table argument instead
+	  of @table directly.
+
+Thu Sep 29 22:22:22 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* lib/yaml/store.rb (YAML::Store#initialize): Fix arguments.
+	  [ruby-dev:49821] [Bug #12800]
+
+	* test/yaml/test_store.rb: Add tests from test/test_pstore.rb.
+
+	* test/yaml/test_store.rb (YAMLStoreTest#test_with_options): Add options test.
+
+	* lib/yaml/store.rb (YAML::Store#dump): Revert to to_yaml.
+
+	* lib/yaml/store.rb (YAML::Store#empty_marshal_data): Use to_yaml with options.
+
+	* lib/yaml/store.rb (YAML::Store#empty_marshal_checksum): Use CHECKSUM_ALGO.
+
+Thu Sep 29 19:34:23 2016  Pete Higgins  <pete@peterhiggins.org>
+
+	* thread_sync.c (rb_queue_pop, rb_szqueue_push, rb_szqueue_pop):
+	  Document exception types, ThreadError, raised by Queue and
+	  SizedQueue.  [Fix GH-1451]
+
+Thu Sep 29 19:21:02 2016  Pete Higgins  <pete@peterhiggins.org>
+
+	* thread_sync.c (Init_thread_sync): Remove confusing doc comments,
+	  which are picked up by rdoc unexpectedly, from Queue and
+	  SizedQueue.  [Fix GH-1450]
+
+Wed Sep 28 23:14:19 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/pstore.rb (PStore::CHECKSUM_ALGO): find available hashing
+	  algorithm for checksum.  MD5 is not available in FIPS mode.
+	  [Feature #6943]
+
+Wed Sep 28 13:00:25 2016  ksss  <co000ri@gmail.com>
+
+	* signal.c (sig_signame): [DOC] Add documentation in the case of
+	  return nil.  [Fix GH-1449]
+
+Wed Sep 28 10:43:27 2016  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* .travis.yml: delete comments. They were outdated.
+
+Wed Sep 28 09:57:48 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update
+	  rubygems to 2.6.7.
+	  Release note of 2.6.7: https://github.com/rubygems/rubygems/commit/60f35bd1d2359fc30301d2d4cd72bc6833e8d12a
+
+Wed Sep 28 00:21:00 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (rb_warning_s_warn): the argument must be an
+	  ASCII-compatible string.  [ruby-core:77430] [Bug #12793]
+
+Tue Sep 27 23:22:31 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (symbol, dsym, parser_set_number_literal): set state to
+	  ENDARG, so that `do` after a literal should be `do_block` and
+	  bound to the outer method.  [ruby-core:72482] [Bug #11873]
+
+	* parse.y (parse_ident): revert r56198.
+
+	* parse.y (warn_balanced): the state of symbol and numeric
+	  literals is now EXPR_ENDARG, do not exclude it.
+
+Tue Sep 27 22:59:42 2016  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* NEWS: news about Warning.warn.
+
+Tue Sep 27 18:10:18 2016  Jeremy Evans <code@jeremyevans.net>
+
+	* error.c: This makes all warnings raised call Warning.warn, which
+	  by default does the same thing it does currently
+	  (rb_write_error_str).  You can override Warning.warn to change
+	  the behavior. [ruby-core:75016] [Feature #12299]
+
+Tue Sep 27 17:35:28 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* iseq.c (iseqw_s_compile_file): deal with syntax error as well as
+	  compile, and should not abort when rescued.
+
+Tue Sep 27 12:07:17 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/cgi/cookie.rb (parse): don't allow , as a separator. [Bug #12791]
+
+	* lib/webrick/cookie.rb (parse): ditto.
+
+Mon Sep 26 21:37:21 2016  Akinori MUSHA  <knu@iDaemons.org>
+
+	* man/erb.1, man/irb.1, man/ri.1, man/ruby.1: Remove Ns before
+	  punctuation.
+
+Mon Sep 26 16:23:49 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/stringio/stringio.c (strio_seek): Avoid signed integer overflow.
+	  It's not harmful in practice here, but is still undefined behavior.
+
+	* ext/stringio/stringio.c (strio_extend): Check that the new length does
+	  not exceed LONG_MAX. This fixes the invalid write on the overflow.
+
+	* test/stringio/test_stringio.rb (test_write_integer_overflow): Add a
+	  test case for the above fix in strio_extend().
+
+Mon Sep 26 15:43:34 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* eval_intern.h (TH_PUSH_TAG): Initialize struct rb_vm_tag::tag with
+	  Qundef rather than 0 which is equal to Qfalse. Since Kernel#throw(obj)
+	  searches a tag with rb_vm_tag::tag == obj, throw(false) can
+	  accidentally find an unrelated tag which is not created by
+	  Kernel#catch.  [ruby-core:77229] [Bug #12743]
+
+	* test/ruby/test_exception.rb (test_throw_false): Add a test case for
+	  this.
+
+Mon Sep 26 14:36:12 2016  Naotoshi Seo  <sonots@gmail.com>
+
+	* lib/tempfile.rb: provide default basename parameter for
+	  Tempfile.create. [Feature #11965] Patch by Yuki Kurihara
+	* test/test_tempfile.rb: ditto.
+
+Mon Sep 26 14:10:54 2016  Ary Borenszweig  <ary@esperanto.org.ar>
+
+	* string.c (lstrip_offset): add a fast path in the case of single
+	  byte optimizable strings, as well as rstrip_offset.
+	  [ruby-core:77392] [Feature #12788]
+
+Mon Sep 26 12:00:12 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gems/bundled_gems: update to minitest-5.9.1.
+
+Mon Sep 26 11:50:03 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* tool/rbinstall.rb (gem): Don't install gemspec if no files will be
+	  installed for the gem. This happens when the extension library is not
+	  compiled.
+
+Mon Sep 26 11:06:47 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* string.c (enc_strlen, rb_enc_strlen_cr): Avoid signed integer
+	  overflow. The result type of a pointer subtraction may have the same
+	  size as long. This fixes String#size returning an negative value on
+	  i686-linux environment:
+
+	    str = "\x00" * ((1<<31)-2))
+	    str.slice!(-3, 3)
+	    str.force_encoding("UTF-32BE")
+	    str << 1234
+	    p str.size
+
+Sun Sep 25 22:48:06 2016  namusyaka  <namusyaka@gmail.com>
+
+	* lib/erb.rb (ERB::Compiler::TrimScanner#stag): The :stag accessor
+	  has already been available because it is defined in parent
+	  Scanner class.  [Fix GH-1445]
+
+Sun Sep 25 19:21:26 2016  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* node.c (dump_array): remove duplicate header of NODE_ARRAY/
+	  NODE_VALUES.
+
+Sat Sep 24 22:26:20 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb (extract_makefile, extmake, configuration): store
+	  extra libraries to be installed.
+
+	* tool/rbinstall.rb (ext-arch): install extra libraries.
+
+	* ext/zlib/extconf.rb: install zlib if built.
+
+Sat Sep 24 14:24:55 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* spec/README: update URL.
+
+Sat Sep 24 11:28:22 2016  Koichi ITO  <koic.ito@gmail.com>
+
+	* fix typos, "a" before "Integer" to "an".  [Fix GH-1438]
+
+Sat Sep 24 10:19:41 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/misc/test_ruby_mode.rb (assert_indent): since write-region
+	  in Emacs 25.1 no longer displays the "Wrote file" message, shows
+	  the explicit message to check if successfully finished.
+	  [ruby-core:77355] [Bug #12785]
+
+	* test/misc/test_ruby_mode.rb (EXPR_SAVE): use a numeric prefix
+	  argument of 0, not to make the previous version into a backup
+	  file, instead of backup-inhibited.
+
+	* test/misc/test_ruby_mode.rb (run_emacs): always save the buffer
+	  if modified.
+
+Fri Sep 23 23:57:40 2016  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_method.c (make_method_entry_refined): fix wrong use of ||.
+
+Fri Sep 23 21:38:58 2016  Akinori MUSHA  <knu@iDaemons.org>
+
+	* tool/mdoc2man.rb (Mdoc2Man#parse_macro): Add support for the
+	  `Lk` macro.
+
+	* tool/mdoc2man.rb (Mdoc2Man#shift_arg): A new function to extract
+	  a possibly quoted argument.
+
+Fri Sep 23 20:36:05 2016  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* eval.c (rb_mod_refine): refine modules as well.
+	  [ruby-core:76199] [Feature #12534]
+
+Fri Sep 23 20:19:09 2016  Akinori MUSHA  <knu@iDaemons.org>
+
+	* man/ruby.1: Update the paragraphs in "Rich Libraries" which
+	  included a dead link.
+
+Fri Sep 23 20:05:27 2016  Akinori MUSHA  <knu@iDaemons.org>
+
+	* man/ruby.1, man/erb.1, man/irb.1, man/ri.1: Use the `Lk` macro
+	  for hyperlinks, which has been available since mdocml 1.5.1
+	  (released more than seven years ago).
+
+Fri Sep 23 15:47:04 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/forwardable.rb (_delegator_method): allow private methods to
+	  be delegated, with warnings.  [ruby-core:77341] [Bug #12782]
+
+Fri Sep 23 12:15:29 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_peephole_optimize): enable tail call
+	  optimization inside a conditional block.
+
+Thu Sep 22 13:00:04 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* gc.c (gc_start_internal): [DOC] methods without arguments
+	  like r56194. [Bug #12777]
+
+Wed Sep 21 17:43:53 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* process.c (InitVM_process): Support CLOCK_MONOTONIC_RAW_APPROX,
+	  CLOCK_UPTIME_RAW, and CLOCK_UPTIME_RAW_APPROX which are introduced
+	  by macOS 10.12.
+
+Wed Sep 21 13:47:33 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (brace_body, do_body): preserve cmdarg_stack so that
+	  `do` after cmdarg in a block should be `do_block` and bound to
+	  the outer method.  [ruby-core:72482] [Bug #11873]
+
+	* parse.y: `do` after cmdarg in parentheses should be `do_block`
+	  and bound to the outer method.  [ruby-core:72482] [Bug #11873]
+
+	* parse.y (brace_body, do_body): extract block bodies.
+
+Tue Sep 20 23:02:50 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (gc_start_internal): [DOC] add ObjectSpace.garbage_collect
+	  and fix GC#garbage_collect.  [Bug #12777]
+
+Tue Sep 20 21:24:01 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* doc/extension.ja.rdoc: translate r56189 (rb_gc_adjust_memory_usage).
+
+Tue Sep 20 17:52:28 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* gems/bundled_gems: Update rake-11.3.0
+
+Tue Sep 20 16:52:23 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (rb_gc_adjust_memory_usage): notify memory usage to the GC
+	  engine by extension libraries, to trigger GC.  [Feature #12690]
+
+Mon Sep 19 17:05:22 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (Init_Numeric), bignum.c (Init_Bignum): deprecate
+	  Fixnum and Bignum.  this may be reverted after previews.
+	  [Feature #12739]
+
+Mon Sep 19 10:36:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enumerator.c (lazy_init_yielder): directly call stored functions.
+	  [Feature #6183]
+
+	* enumerator.c (lazy_add_method): create lazy enumerator which
+	  uses lazy_init_yielder().
+
+Sun Sep 18 22:48:54 2016  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/rss.rb (RSS::BaseModel): Remove needless codes.
+	  [Bug #12773][ruby-dev:49813]
+	  Reported by Kazuhiro NISHIYAMA. Thanks!!!
+
+Sun Sep 18 19:23:47 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* lib/sync.rb: Fix NameError when error.
+
+Sat Sep 17 22:46:02 2016  Koichi ITO  <koic.ito@gmail.com>
+
+	* vm_insnhelper.c (vm_throw_start): Remove too much ";"
+	  [fix GH-1432]
+
+Sat Sep 17 19:19:06 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* test/openssl/test_ssl.rb (test_ctx_options): Fix test failure on
+	  Ubuntu 16.04. The fix in r56147 was incomplete. This is a cherry-pick
+	  of the commit b039f3e268c2 at ruby/openssl.
+
+Sat Sep 17 10:49:35 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* doc/extension.ja.rdoc: translate r56130 (rb_check_arity).
+
+Sat Sep 17 02:40:52 2016  Aaron Patterson <tenderlove@ruby-lang.org>
+
+	* ext/objspace/objspace_dump.c: Fix stream processing support for heap
+	  dumps. Full heap dumps should use JSON lines (http://jsonlines.org)
+	  so that we can process very large heaps without loading the entire
+	  heap dump in to memory at once.
+
+Fri Sep 16 22:10:31 2016  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* ext/openssl/ossl_ssl.c (ssl_npn_select_cb_common): Fix compile error
+	  with old version of fcc (Fujitsu C Compiler) on Solaris 10.
+	  [Bug #12769] [ruby-dev:49809]
+
+Fri Sep 16 21:28:25 2016  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* internal.h (MAYBE_UNUSED): The fallback definition is needed.
+	  Fix compile error with some non-GCC compilers such as
+	  Oracle Solaris Studio 12.3 on Solaris 10.
+	  [Bug #12767] [ruby-dev:49807]
+
+	* internal.h (WARN_UNUSED_RESULT): ditto.
+
+Fri Sep 16 21:19:51 2016  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* hash.c (each_pair_i_fast): Fix compile error with old version of
+	  fcc on Solaris 10. [Bug #12768] [ruby-dev:49808]
+
+Fri Sep 16 19:46:05 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (config.h): fixed compile error with VC introduced
+	  by previous commit.
+
+Fri Sep 16 14:54:34 2016  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* internal.h (WARN_UNUSED_RESULT): moved to configure.in, to
+	  actually check its availability rather to check GCC's version.
+
+	* configure.in (WARN_UNUSED_RESULT): moved to here.
+
+	* configure.in (RUBY_FUNC_ATTRIBUTE): change function declaration
+	  to return int rather than void, because it makes no sense for a
+	  warn_unused_result attributed function to return void.
+
+	  Funny thing however is that it also makes no sense for noreturn
+	  attributed function to return int.  So there is a fundamental
+	  conflict between them.  While I tested this, I confirmed both
+	  GCC 6 and Clang 3.8 prefers int over void to correctly detect
+	  necessary attributes under this setup.  Maybe subject to change
+	  in future.
+
+	* internal.h (UNINITIALIZED_VAR): renamed to MAYBE_UNUSED, then
+	  moved to configure.in for the same reason we move
+	  WARN_UNUSED_RESULT.
+
+	* configure.in (MAYBE_UNUSED): moved to here.
+
+	* internal.h (__has_attribute): deleted, because it has no use now.
+
+	* string.c (rb_str_enumerate_lines): refactor macro rename.
+
+	* string.c (rb_str_enumerate_bytes): ditto.
+
+	* string.c (rb_str_enumerate_chars): ditto.
+
+	* string.c (rb_str_enumerate_codepoints): ditto.
+
+	* thread.c (do_select): ditto.
+
+	* vm_backtrace.c (rb_debug_inspector_open): ditto.
+
+	* vsnprintf.c (BSD_vfprintf): ditto.
+
+Fri Sep 16 14:35:55 2016  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* ChangeLog (add-log-time-format): Not exactly sure when but
+	  recently (25.x maybe), emacs changed its API to take optional
+	  two arguments.  We have to follow that.
+
+Fri Sep 16 06:43:25 2016  Aaron Patterson <tenderlove@ruby-lang.org>
+
+	* lib/uri/generic.rb (def check_password): don't include bad password
+	  in URI exception output
+
+	* test/uri/test_generic.rb (def test_set_component): test for behavior
+
+Thu Sep 15 21:40:03 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* doc/extension.ja.rdoc: Fix file name.
+
+Thu Sep 15 00:59:30 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* benchmark/: add vnmakarov's benchmarks around hash [ruby-core:75265]
+
+Wed Sep 14 07:02:31 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* hash.c (each_pair_i_fast): use rb_yield_values2 to avoid var args.
+
+Tue Sep 13 21:32:54 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* string.c (STR_HEAP_SIZE, RESIZE_CAPA_TERM, str_new0, rb_str_buf_new,
+	  str_shared_replace, rb_str_init, str_make_independent_expand,
+	  rb_str_resize): Avoid overflow by casting the length to size_t. size_t
+	  should be able to represent LONG_MAX+termlen.
+
+	* string.c (rb_str_modify_expand): Check that the new length is in the
+	  range of long before resizing. Also refactor to use RESIZE_CAPA_TERM
+	  macro.
+
+	* string.c (str_buf_cat): Fix so that it does not create a negative
+	  length String. Also fix the condition for 'string sizes too big', the
+	  total length can be up to LONG_MAX.
+
+	* string.c (rb_str_plus): Check the resulting String length does not
+	  exceed LONG_MAX.
+
+	* string.c (rb_str_dump): Fix integer overflow. The dump result will be
+	  longer then the original String.
+
+Tue Sep 13 21:30:53 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* gc.c (heap_extend_pages, get_envparam_size, ruby_malloc_size_overflow,
+	  gc_profile_dump_on): Use PRIuSIZE instead of PRIdSIZE as the passed
+	  value is size_t, not ssize_t.
+
+	* iseq.c (get_line_info, rb_iseq_disasm_insn): Ditto.
+
+	* sprintf.c (rb_str_format): Ditto.
+
+	* thread_win32.c (native_thread_create): Ditto.
+
+	* vm.c (get_param): Ditto.
+
+	* ext/objspace/objspace_dump.c (dump_append_string_content,
+	  dump_object): Ditto.
+
+	* ext/socket/raddrinfo.c (host_str, port_str): Ditto.
+
+Tue Sep 13 21:27:35 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* string.c (STR_EMBEDDABLE_P): Renamed from STR_EMBEDABLE_P(). And use
+	  it in more places.
+
+Tue Sep 13 21:23:51 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* README.md: Drop support for BeOS now that Haiku is stable since
+	  2.3.0.
+
+	* README.ja.md: ditto.
+
+Tue Sep 13 21:11:56 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (STR_EMBEDABLE_P): extract the predicate macro to tell
+	  if the given length is capable in an embedded string, and fix
+	  possible integer overflow.
+
+Tue Sep 13 18:37:08 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_exception.rb: fix thread issues.
+	  * use Queue instead of a local variable for synchronization.
+	  * join created thread to solve leaking threads warning.
+
+Tue Sep 13 16:07:26 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* string.c (rb_str_set_len): The buffer overflow check is wrong. The
+	  space for termlen is allocated outside the capacity returned by
+	  rb_str_capacity(). This fixes r41920 ("string.c: multi-byte
+	  terminator", 2013-07-11).  [ruby-core:77257] [Bug #12757]
+
+	* test/-ext-/string/test_set_len.rb (test_capacity_equals_to_new_size):
+	  Test for this change. Applying only the test will trigger [BUG].
+
+Tue Sep 13 06:03:34 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* common.mk (benchmark): fix lib path.
+
+Tue Sep 13 00:39:47 2016  Aaron Patterson <tenderlove@ruby-lang.org>
+
+	* class.c (singleton_class_of): Copy superclass serial number to
+	  singleton class.  This improves singleton class IMC hit rates.
+	  [Feature #12364] [ruby-core:75425]
+
+Mon Sep 12 13:46:23 2016  Anton Davydov  <mail@davydovanton.com>
+
+	* lib/uri/mailto.rb: Removed needless `return` and use `.` instead of `::`
+	  with class method.
+	* test/uri/test_mailto.rb: Added tests for coverage.
+	  [fix GH-1426][Misc #12750][ruby-core:77242]
+
+Sun Sep 11 21:30:26 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* NEWS: News about Module.used_modules.
+
+Sun Sep 11 19:06:49 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_write_console): should set written length as the
+	  return value.  [Bug #12748] [ruby-dev:49786]
+
+Fri Sep  9 22:43:29 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* gems/bundled_gems: sort lines.
+
+Fri Sep  9 17:59:46 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (rb_threadptr_raise): set cause from the called thread,
+	  but not from the thread to be interrupted.
+	  [ruby-core:77222] [Bug #12741]
+
+Fri Sep  9 13:50:05 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* doc/extension.rdoc, doc/extension.ja.rdoc: fix file name.
+	  pointed out by @takkanm in the RubyKaigi talk.
+
+Fri Sep  9 13:14:53 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* News: Announcing update to Unicode version 9.0.0 [ci skip]
+
+Fri Sep  9 10:10:00 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* variable.c (rb_const_search): warn with the actual class/module
+	  name which defines the deprecated constant.
+
+	* variable.c (rb_const_search): raise with the actual class/module
+	  name which defines the private constant.
+
+Thu Sep  8 17:47:18 2016  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* array.c (flatten): use rb_obj_class instead of rb_class_of
+	  because rb_class_of may return a singleton class.
+	  [ruby-dev:49781] [Bug #12738]
+
+Thu Sep  8 17:40:15 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/rbinstall.rb (gem): use the bindir of each gemspec instead
+	  of hardcoded 'bin', since rdoc 5.0.0 overrides it.
+
+Thu Sep  8 16:47:03 2016  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* eval.c (rb_mod_s_used_modules): rename Module.used_refinements to
+	  Module.used_modules.  [Feature #7418] [ruby-core:49805]
+
+Thu Sep  8 14:21:48 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* ext/psych/psych.gemspec, lib/rdoc/rdoc.gemspec: Use file list instead of
+	  git output. It shows warning message when invoke `make install`
+	  [Bug #12736][ruby-dev:49778]
+
+Thu Sep  8 13:41:46 2016  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* insns.def (setclassvariable, setconstant): warn when self is a
+	  refinement.  [Bug #10103] [ruby-core:64143]
+
+Thu Sep  8 11:29:00 2016  Kenta Murata  <mrkn@mrkn.jp>
+
+	* hash.c (rb_hash_transform_values, rb_hash_transform_values_bang):
+	  Rename map_v to transform_values.
+	  [Feature #12512] [ruby-core:76095]
+
+	* test/ruby/test_hash.rb: ditto.
+
+Thu Sep  8 10:08:35 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* {ext,test}/openssl: Import Ruby/OpenSSL 2.0.0.beta.2. The full commit
+	  history since v2.0.0.beta.1 can be found at:
+	  https://github.com/ruby/openssl/compare/v2.0.0.beta.1...v2.0.0.beta.2
+
+Thu Sep  8 07:23:34 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* lib/rdoc/*, test/rdoc/*: Update rdoc-5.0.0.beta2
+	  Fixed ri parse defect with left-hand matched classes.
+	  https://github.com/rdoc/rdoc/pull/420
+
+Thu Sep  8 01:12:47 2016  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* eval.c (rb_mod_s_used_refinements): new method
+	  Module.used_refinements.  based on the patch by Charlie
+	  Somerville.  [Feature #7418] [ruby-core:49805]
+
+Wed Sep  7 17:50:38 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/util.h (setenv): remove POSIX-noncompliant
+	  definition with 2 arguments.
+
+Wed Sep  7 17:35:37 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* unicode/8.0.0/casefold.h, name2ctype.h, unicode/data/8.0.0:
+	  removing directories/files related to Unicode version 8.0.0
+
+Wed Sep  7 17:21:55 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/timeout.rb (Timeout#timeout): add custom error message
+	  argument.  [Feature #11650]
+
+Wed Sep  7 17:13:05 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* common.mk: Updated Unicode version to 9.0.0 [Feature #12513]
+
+	* unicode/9.0.0/casefold.h, name2ctype.h, unicode/data/9.0.0:
+	  new directories/files for Unicode version 9.0.0
+
+Wed Sep  7 16:00:45 2016  Tanaka Akira  <akr@fsij.org>
+
+	* lib/open-uri.rb: Allow http to https redirection.
+	  Note that https to http is still forbidden.
+	  [ruby-core:20485] [Feature #859] by Roman Shterenzon.
+
+Wed Sep  7 14:56:59 2016  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* lib/csv.rb (CSV::{Row,Table}#{each,delete_if}): returns an enumerator
+	  if no block is given. [ruby-core:75346] [Feature #12347]
+
+	* test/csv/test_row.rb: add test for above.
+
+	* test/csv/test_table.rb: ditto.
+
+Wed Sep  7 14:50:01 2016  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* gems/bundled_gems: update to power_assert 0.3.1.
+
+Wed Sep  7 12:16:09 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* ext/psych/*, test/psych/*: Update psych-2.1.1
+	  This version fixed following pull requests.
+	  https://github.com/tenderlove/psych/pull/284
+	  https://github.com/tenderlove/psych/pull/276
+
+Wed Sep  7 11:51:06 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* lib/rdoc/*, test/rdoc/*: Update rdoc-5.0.0.beta1
+	  This version is mostly same as r56072. It contains to remove code
+	  for Ruby 1.8
+
+Tue Sep  6 09:23:06 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* lib/rdoc/rdoc.gemspec: partly reverted for default gem installer.
+	  upstream configuration is not working on ruby core repository.
+
+Mon Sep  5 19:35:22 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* lib/rdoc/*, test/rdoc/*: Update rdoc/rdoc master(f191513)
+	  https://github.com/rdoc/rdoc/blob/master/History.rdoc#423--2016--
+	  https://github.com/rdoc/rdoc/blob/master/History.rdoc#422--2016-02-09
+
+Sun Sep  4 00:17:55 2016  Sho Hashimoto  <sho-h@ruby-lang.org>
+
+	* proc.c: [DOC] fix Object#define_singleton_method and
+	  main.define_method return value. [ci skip]
+
+Sat Sep  3 11:28:29 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread_pthread.c (ruby_init_stack): check stack bounds even if
+	  get_main_stack succeeded, on the "co-routine" case.
+	  https://github.com/ruby/ruby/commit/53953ee#commitcomment-18887413
+
+Fri Sep  2 16:06:59 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* internal.h (MEMO_V1_SET, MEMO_V2_SET): fix typos.  use the macro
+	  parameter, not the local variable.
+
+Fri Sep  2 00:55:11 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb (timestamp_file): move extmk.rb specific tricks
+	  from lib/mkmf.rb.  keep RUBYCOMMONDIR prefix not to conflict
+	  with a timestamp file in the toplevel.
+
+Thu Sep  1 14:24:16 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb (gems): move dirty hacks for bundled gems from
+	  mkmf.rb.
+
+	* lib/mkmf.rb (create_makefile): yield all configuration strings.
+
+Wed Aug 31 17:39:19 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb (create_makefile): make gem.build_complete file
+	  under TARGET_SO_DIR and install it only when the gem build
+	  succeeded.  [ruby-core:77057] [Bug #12681]
+
+Wed Aug 31 15:36:10 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb: move TARGET_SO_DIR stuffs to mkmf.rb.
+
+	* lib/mkmf.rb (create_makefile): create target shared object files
+	  under $(TARGET_SO_DIR) which is $sodir if it is defined with
+	  $extout.  [ruby-core:77058] [Bug #12681]
+
+Wed Aug 31 01:56:55 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
+
+	* doc/extension.ja.rdoc: [DOC] Fix a typo. [ci skip]
+
+Wed Aug 31 00:52:23 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb: make the gems target directory under the expanded
+	  name.  [ruby-core:77102] [Bug #12714]
+
+Tue Aug 30 15:27:27 2016  Kouhei Yanagita  <yanagi@shakenbu.org>
+
+	* ext/json/lib/json/add/ostruct.rb (OpenStruct.json_create):
+	  Correct documentation, fix the name of values.  [Fix GH-1421]
+
+Tue Aug 30 14:53:34 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (nogvl_fsync, nogvl_fdatasync): on Windows, just ignore if the
+	  fd is associated to non-disk device.  if call fsync and/or fdatasync
+	  with such fds, it causes Errno::EBADF exception and the behavior is
+	  incompatible with ruby 2.1 and earlier unintentionally introduced.
+
+Tue Aug 30 03:38:35 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vm_dump.c (backtrace): use rip in the saved context for the case
+	  the SIGSEGV is received when the process is in userland.
+	  Note that ip in the stack should be used if the signal is received
+	  when it is in kernel (when it is calling syscall) [Bug #12711]
+
+Sat Aug 27 10:26:14 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_concat_multi): take multiple arguments.  based
+	  on the patch by Satoru Horie.  [Feature #12333]
+
+	* string.c (rb_str_concat_multi, rb_str_prepend_multi): ditto.
+
+Thu Aug 25 00:42:31 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/file.c (append_wstr): remove a codepage argument, and use
+	  INVALID_CODE_PAGE for conversion by econv.
+
+	* win32/file.c (append_wstr): exclude the terminator from the
+	  result length when input len == -1.
+
+Wed Aug 24 22:41:30 2016  Kouhei Sutou  <kou@cozmixng.org>
+
+	* gc.c (gc_reset_malloc_info): Remove too much ";".
+
+Wed Aug 24 20:07:57 2016  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* include/ruby/defines.h (ALWAYS_INLINE): Add alternative definition.
+	  Fix compile error with compilers that do not have force inline
+	  attribute, including old version of fcc on Solaris 10.
+	  [ruby-dev:49773] [Bug #12701]
+
+Wed Aug 24 16:56:26 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* .gdbinit: follow r55766's VM change.
+
+Wed Aug 24 12:57:56 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (rb_mod_initialize, rb_class_initialize): [DOC] these
+	  methods do not invoke module_eval/class_eval, just eval the
+	  given block under the new module/class but sharing the context
+	  with the surrounding scope like those methods.
+	  [ruby-core:77023] [Bug #12696]
+
+Tue Aug 23 10:34:40 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/psych/test_psych.rb (test_load_file_with_fallback): fix
+	  Tempfile leak.  https://github.com/tenderlove/psych/pull/288
+
+Tue Aug 23 10:15:01 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_fs_setter): check and convert $; value at
+	  assignment.
+
+Tue Aug 23 02:09:57 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_split_m): show $; name in error message when it
+	  is a wrong object.
+
+Mon Aug 22 16:29:52 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/csv.rb (CSV#shift): store partial quoted strings in an array
+	  and join at last, to improve performance with very long quoted
+	  lines.  [ruby-core:76987] [Bug #12691]
+
+Mon Aug 22 14:35:57 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* man/irb.1: remove useless -width option.
+	  [ruby-dev:49767] [Bug #12692]
+
+Mon Aug 22 09:02:56 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* iseq.c (Init_ISeq): undefine allocator of InstructionSequence,
+	  to get rid of segfaults at method call on uninitialized object.
+
+Sat Aug 21 05:47:00 2016  Kenta Murata  <mrkn@mrkn.jp>
+
+	* enum.c (enum_sort): prevent wasteful array duplication.
+
+Sat Aug 20 11:20:32 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* rubystub.c: generalize win32/stub.c.
+
+Fri Aug 19 11:39:06 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (primary): allow parenthesised statement as a method
+	  argument.  [Feature #12686]
+
+Fri Aug 19 09:12:45 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (vm_set_main_stack): TOPLEVEL_BINDING must be built.
+	  http://www.viva64.com/en/b/0414/#ID0EQ1CI  [ruby-core:76973]
+
+Fri Aug 19 01:00:53 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
+
+	* proc.c (mnew_missing): Remove an unused argument.
+	  After r51126 rid is not used.
+
+Thu Aug 18 09:26:52 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* gems/bundled_gems: bump to test-unit-3.2.1
+
+Thu Aug 18 02:36:26 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/rbinstall.rb: skip gems which failed to build extensions.
+	  [ruby-dev:49764] [Bug #12683]
+
+Wed Aug 17 23:35:12 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gems/bundled_gems (tk): bump up to 0.1.1.
+
+Wed Aug 17 23:14:42 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb: build gem extensions into separate directories
+
+	* tool/rbinstall.rb: install pre-built gem extension files gem
+	  extension directories.  [ruby-core:76931] [Bug #12681]
+
+Tue Aug 16 21:04:30 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (UNICODE_HDR_DIR): separate unicode header files from
+	  unicode data files.  [ruby-core:76879] [Bug #12677]
+
+Tue Aug 16 11:17:51 2016  Koichi ITO  <koic.ito@gmail.com>
+
+	* lib/net/http/header.rb: Fix typo. [ci skip][fix GH-1407]
+	* transcode.c: ditto.
+
+Tue Aug 16 11:02:31 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/make-snapshot (package): save generated header files from
+	  unicode data.  [ruby-core:76879] [Bug #12677]
+
+Mon Aug 15 20:31:34 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* node.c (dump_array): show nd_alen field in NODE_ARRAY only in
+	  the first node.  it is nd_end in the rest nodes.
+
+Mon Aug 15 16:41:32 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* appveyor.yml: Update libressl version to 2.3.7.
+
+Mon Aug 15 11:46:50 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb (extmake): extension libraries in gems cannot link
+	  statically.
+
+Sun Aug 14 22:35:40 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* id_table.c (hash_table_extend): should not shrink the table than
+	  the previous capacity.  [ruby-core:76534] [Bug #12614]
+
+Sun Aug 14 18:51:24 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gems/bundled_gems: add gemified tk 0.1.0.
+	  this needs `extract-gems` to build.
+
+Sun Aug 14 14:54:14 2016  Kouhei Sutou  <kou@cozmixng.org>
+
+	* object.c (InitVM_Object): Update referenced document path.
+
+Sat Aug 13 23:08:01 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (num_funcall0, num_funcall1): get rid of infinite
+	  recursion in fallback methods of Numeric.
+
+Sat Aug 13 11:10:08 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (command_asgn, arg): fix syntax errors with chained
+	  assignment with op assign.  [Bug #12669]
+
+Sat Aug 13 10:52:19 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (stmt, arg): rescue modifier in command op assignment
+	  should be limited to rhs only.  [ruby-core:75621] [Bug #12402]
+
+Sat Aug 13 07:51:40 2016  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_val2variant): fix integer conversion in
+	  cygwin64.
+
+Fri Aug 12 21:05:19 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/webrick/config.rb (WEBrick::Config::General):
+	  disable reverse lookup by default. [ruby-core:45514] [Feature #6559]
+	  Socket.do_not_reverse_lookup is true by default but WEBrick
+	  overwrote it.
+	  patch by Eric Hodel [ruby-core:45527]
+
+Fri Aug 12 12:50:31 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (rb_syntax_error_append): fix newline in syntax error
+	  message to the beginning, not after file name and line number.
+	  [Feature #11951]
+
+Thu Aug 11 16:24:23 2016  Ferdinand Niedermann  <nerdinand@nerdinand.com>
+
+	* compar.c (cmp_clamp): Introduce Comparable#clamp.  [Feature #10594]
+
+Thu Aug 11 03:16:59 2016  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/prime.rb: Optimize prime?
+	  Adapted from patch by Jabari Zakiya [#12665]
+
+	* test/test_prime.rb: Improve test
+
+Wed Aug 10 22:37:01 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (command_rhs, arg_rhs): introduce new rules to reduce
+	  repeated rules with rescue modifier.
+
+Wed Aug 10 17:26:43 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (command_asgn): rescue modifier in command assignment
+	  should be limited to rhs only.  [ruby-core:75621] [Bug #12402]
+
+Wed Aug 10 15:35:03 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/win32/resolv/resolv.c: needs windows.h for iphlpapi.h on
+	  cygwin.  [ruby-core:76791] [Bug #12663]
+
+	* ext/win32/resolv/resolv.c (w32error_make_error): use
+	  Win32::Resolv::Error, an alias of Win32::Registry::Error.
+
+Tue Aug  9 17:50:00 2016  Kenta Murata  <mrkn@mrkn.jp>
+
+	* hash.c (rb_hash_map_v, rb_hash_map_v_bang): implement Hash#map_v and
+	  Hash#map_v! [Feature #12512] [ruby-core:76095]
+
+	* test/ruby/test_hash.rb: add tests for above change.
+
+Tue Aug  9 16:09:03 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_getivar): use always_inline because
+	  gcc7 doesn't inline this without always_inline.
+
+Tue Aug  9 15:41:24 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/tk: Tk is removed from stdlib.  [Feature #8539]
+	  https://github.com/ruby/tk is the new upstream.
+
+Tue Aug  9 00:12:31 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* doc/maintainers.rdoc: Remove moved file section.
+
+Mon Aug  8 20:56:46 2016  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/sample/excel1.rb, ext/win32ole/sample/excel2.rb,
+	  ext/win32ole/sample/excel3.rb, ext/win32ole/sample/ie.rb,
+	  ext/win32ole/sample/ienavi.rb, ext/win32ole/sample/ienavi2.rb: use
+	  true instead of deprecated TRUE. [ci skip]
+
+Mon Aug  8 12:51:12 2016  Zarko Todorovski <zarko@ca.ibm.com>
+
+	* internal.h (RBASIC_CLEAR_CLASS): Reroute ANSI C's strict
+	  aliasing rule.
+	  [ruby-core:74427][Bug #12191][ruby-core:76747][Bug #12657]
+
+Sun Aug  7 18:08:27 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (InitVM_Object): deprecate toplevel constants TRUE,
+	  FALSE, and NIL.  [Feature #12574]
+
+Sun Aug  7 06:48:21 2016  Eric Wong  <e@80x24.org>
+
+	* ext/openssl/ossl_ssl.c (ossl_ssl_write_internal):
+	  avoid undefined behavior
+	* test/openssl/test_pair.rb (test_write_zero): new test
+	  [ruby-core:76751] [Bug #12660]
+
+Sat Aug  6 09:35:30 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* id_table.h (rb_id_table_iterator_result): add dummy sentinel
+	  member because C standard prohibits a trailing comma.
+
+Sat Aug  6 00:39:44 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (env_enc_str_new): make string for an environment
+	  variable name or value.
+
+	* hash.c (env_name_new): make environment value string with the
+	  encoding for its name.
+
+Fri Aug  5 23:18:35 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* hash.c (env_str_new): taint the string.  get rid of a test failure
+	  introduced at r55811.
+
+Fri Aug  5 17:04:02 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (w32_getenv): call rb_w32_getenv and rb_w32_ugetenv via
+	  this pointer without further comparisons.
+
+Thu Aug  4 11:54:30 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (env_assoc): the encoding of the value should be the
+	  locale, as well as other methods, [], fetch, values, etc.
+
+Wed Aug  3 21:31:23 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (reg_fragment_enc_error): compile_error is different
+	  between parser and ripper.  [ruby-core:76397] [Bug #12651]
+
+Wed Aug  3 17:15:06 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (rb_obj_clone2): restrict freeze option to true other
+	  than false which only has the effect.  [Feature #12300]
+
+Wed Aug  3 10:47:07 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_core.h: introduce VM_FRAME_RUBYFRAME_P()
+	  and VM_FRAME_CFRAME_P().
+	  Most of case, RUBY_VM_NORMAL_ISEQ_P() is no
+	  longer needed.
+
+	* vm_core.h: introduce rb_obj_is_iseq().
+
+	* cont.c, vm.c: VM_FRAME_MAGIC_DUMMY with
+	  VM_FRAME_FLAG_CFRAME.
+
+Wed Aug  3 09:25:16 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_core.h: rename macros and make them inline functions.
+
+	  * rename VM_FRAME_TYPE_FINISH_P() to VM_FRAME_FINISHED_P().
+	  * rename VM_FRAME_TYPE_BMETHOD_P() to VM_FRAME_BMETHOD_P().
+
+Wed Aug 03 09:15:02 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_core.h: introduce VM_FRAME_FLAG_CFRAME to represent cfp->iseq
+	  type.
+
+Tue Aug  2 21:42:40 2016  Chia-sheng Chen  <qitar888@gmail.com>
+
+	* math.c (tanh): make faster by the extract form if three
+	  hyperbolic functions are unavailable.  [Feature #12647]
+
+Tue Aug  2 12:37:00 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/option.c, ext/socket/rubysocket.h (inet_ntop): share
+	  the fallback definition.  [ruby-core:76646] [Bug #12645]
+
+Tue Aug  2 04:07:29 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (set_pioinfo_extra): use more reliable way to search
+	  the position of pioinfo of VC14, and also support debug library of it.
+	  patched by davispuh AT gmail.com
+	  [ruby-core:76644] [Bug #12644]
+	  this fixes also [Bug #12631]
+
+Mon Aug  1 21:39:52 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb: [EXPERIMENTAL] build extension libraries in
+	  extracted gems.
+
+Mon Aug  1 16:07:18 2016  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* include/ruby/ruby.h (struct RStruct): no longer.
+
+	* internal.h (struct RStruct): moved here.
+
+	* struct.c (rb_struct_ptr): a compensation function for the lack
+	  of RSTRUCT_PTR.  But now that we have RSTRUCT_GET/SET, that must
+	  not be used anyway.  I mark this deprecated.  Dont use it.
+
+Mon Aug  1 14:50:06 2016  Jeremy Evans <code@jeremyevans.net>
+
+	* object.c (rb_obj_clone2): Allow Object#clone to take freeze:
+	  false keyword argument to not freeze the clone.
+	  [ruby-core:75017][Feature #12300]
+
+	* test/ruby/test_object.rb (TestObject): test for it.
+
+Mon Aug  1 12:16:19 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* ext/json/*, test/json/json_parser_test.rb: Update json-2.0.2.
+
+Sun Jul 31 16:17:23 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/win32/resolv/resolv.c (get_dns_server_list): [Win32] get DNS
+	  servers only for connected network devices by GetNetworkParams
+	  API.  [Bug #12604]
+
+Sat Jul 30 12:13:26 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* string.c (String#downcase), NEWS: Mentioned that case mapping for all
+	  of ISO-8859-1~16 is now supported. [ci skip]
+
+Sat Jul 30 12:00:01 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/iso_8859_2.c, test/ruby/enc/test_case_comprehensive.rb:
+	  Implement non-ASCII case conversion for ISO-8859-2, by Yushiro Ishii.
+
+Fri Jul 29 20:57:12 2016  chuanshuo  <lilijreey@126.com>
+
+	* *.c: rename rb_funcall2 to rb_funcallv, except for extensions
+	  which are/will be/may be gems.  [Fix GH-1406]
+
+Fri Jul 29 10:51:34 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* proc.c (env_write): remove unused function.
+
+Fri Jul 29 10:49:52 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_core.h (VM_LOCAL_P): should return an integer value.
+	  reported at
+	  http://d.hatena.ne.jp/nagachika/20160728/ruby_trunk_changes_55764_55770
+
+Fri Jul 29 04:23:08 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_core.h (VM_ENV_LOCAL_P): return truthy (0 or not) value.
+
+	* vm.c (rb_vm_make_proc_lambda): use VM_ENV_ESCAPED_P() macro.
+
+Fri Jul 29 03:49:04 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c, internal.h: remove RubyVM::Env class and all of env objects
+	  are imemo objects (imemo_env).
+
+	* NEWS: describe this change. I believe nobody touch these objects
+	  because there are no method defined.
+
+	* vm_core.h: remove the following definitions.
+	  * rb_cEnv decl.
+	  * GetEnvPtr() because Env is no longer T_DATA object.
+
+	* vm_core.h (rb_env_t): fix layout for imemo values.
+
+	* vm_core.h (vm_assert_env): added.
+
+	* vm_core.h (vm_env_new): added.
+
+Thu Jul 28 19:53:21 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_core.h: revisit the structure of frame, block and env.
+	  [Bug #12628]
+
+	  This patch introduce many changes.
+
+	  * Introduce concept of "Block Handler (BH)" to represent
+	    passed blocks.
+
+	  * move rb_control_frame_t::flag to ep[0] (as a special local
+	    variable). This flags represents not only frame type, but also
+	    env flags such as escaped.
+
+	  * rename `rb_block_t` to `struct rb_block`.
+
+	  * Make Proc, Binding and RubyVM::Env objects wb-protected.
+
+	  Check [Bug #12628] for more details.
+
+Thu Jul 28 15:05:12 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (ruby_fl_type): use __extension__ to get rid
+	  of pedantic warning against RUBY_FL_USER19.
+	  https://github.com/skylightio/skylight-ruby/issues/64
+
+	* include/ruby/ruby.h (rb_mul_size_overflow): ditto for use of
+	  int128.
+
+Wed Jul 27 10:32:59 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/windows_1253.c: Remove dead code found by Coverity Scan.
+
+Tue Jul 26 22:43:36 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (run_finalizer): make saved running finalizer state
+	  volatile to ensure not to be clobbered by longjmp.
+
+Tue Jul 26 19:26:00 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c: introduce rb_vm_pop_frame() and use it
+	  instead of setting rb_thread_t::cfp directly.
+
+	* vm_insnhelper.c (vm_pop_frame): return the result of
+	  finish frame or not.
+
+Tue Jul 26 19:06:39 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rb_raw_obj_info): support to show Proc obj.
+
+Tue Jul 26 18:55:55 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_mark): add `inline' explicitly.
+	  I expected to inline this function implicitly at the loop
+	  (ex: marking T_ARRAY objects) but sometimes it remains as
+	  normal call.
+
+Tue Jul 26 16:33:16 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/windows_1257.c, test/ruby/enc/test_case_comprehensive.rb:
+	  Implement non-ASCII case conversion for Windows-1257, by Sho Koike.
+
+Tue Jul 26 16:19:41 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/windows_1250.c, test/ruby/enc/test_case_comprehensive.rb:
+	  Implement non-ASCII case conversion for Windows-1250, by Sho Koike.
+
+	* ChangeLog: Fixed order of previous two entries.
+
+Tue Jul 26 15:54:17 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/windows_1253.c, test/ruby/enc/test_case_comprehensive.rb:
+	  Implement non-ASCII case conversion for Windows-1253, by Takumi Koyama.
+
+Tue Jul 26 15:30:37 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/windows_1251.c, test/ruby/enc/test_case_comprehensive.rb:
+	  Implement non-ASCII case conversion for Windows-1251, by Shunsuke Sato.
+
+Tue Jul 26 13:04:59 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* test/ruby/enc/test_case_comprehensive.rb: Add explicit skip test for
+	  availability of Unicode data files.
+
+Mon Jul 25 21:33:13 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* range.c (check_step_domain): check step argument domain by <=>
+	  method, instead of < and >.
+
+Mon Jul 25 21:11:32 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* doc/maintainers.rdoc: fix filenames.
+
+Mon Jul 25 16:59:00 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* debug.c (ruby_debug_printf): use rb_raw_obj_info()
+	  instead of rb_inspect() because it is more robust way
+	  to see object internal.
+
+Sun Jul 24 16:33:13 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* regenc.h/c, include/ruby/oniguruma.h, enc/ascii.c, big5.c, cp949.c,
+	  emacs_mule.c, euc_jp.c, euc_kr.c, euc_tw.c, gb18030.c, gbk.c,
+	  iso_8859_1|2|3|4|5|6|7|8|9|10|11|13|14|15|16.c, koi8_r.c, koi8_u.c,
+	  shift_jis.c, unicode.c, us_ascii.c, utf_16|32be|le.c, utf_8.c,
+	  windows_1250|51|52|53|54|57.c, windows_31j.c, unicode.c:
+	  Remove conditional compilation macro ONIG_CASE_MAPPING. [Feature #12386].
+
+Sun Jul 24 12:53:42 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* doc/maintainers.rdoc: xmlrpc is bundled gem from Ruby 2.4.
+
+Sun Jul 24 12:07:39 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* doc/maintainers.rdoc: Update OpenSSL maintainer.
+
+Sat Jul 23 22:43:41 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* internal.h (Check_Type): inline check for the object type.
+
+Sat Jul 23 04:06:04 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (RTEST, NIL_P): use RUBY prefixed name in
+	  macros.
+
+Sat Jul 23 01:41:29 2016  Eric Wong  <e@80x24.org>
+
+	* lib/webrick/httpservlet/cgihandler.rb (do_GET): delete HTTP_PROXY
+	* test/webrick/test_cgi.rb (test_cgi_env): new test
+	* test/webrick/webrick.cgi (do_GET): new endpoint to dump env
+	  [ruby-core:76511] [Bug #12610]
+
+Fri Jul 22 19:55:20 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (vm_set_main_stack): remove unnecessary check.  toplevel
+	  binding must be initialized.  [Bug #12611] (N1)
+
+	* win32/win32.c (w32_symlink): fix return type.  [Bug #12611] (N3)
+
+	* string.c (rb_str_split_m): simplify the condition.
+	  [Bug #12611](N4)
+
+Fri Jul 22 17:13:37 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* string.c (String#dump): Change escaping of non-ASCII characters in
+	  UTF-8 to use upper-case four-digit hexadecimal escapes without braces
+	  where possible [Feature #12419].
+
+	* test/ruby/test_string.rb (test_dump): Add tests for above.
+
+Fri Jul 22 10:35:35 2016  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/attribute.rb (REXML::Attribute#to_string): Fix wrong
+	  entry reference name of double quote.
+	  [Bug #12609][ruby-core:76509]
+	  Patch by Joseph Marrero. Thanks!!!
+
+Fri Jul 22 10:32:13 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* template/unicode_norm_gen.tmpl: Remove
+	  UnicodeNormalize::UNICODE_VERSION at origin [Feature #12546].
+
+Fri Jul 22 09:23:51 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* LEGAL: Added entries for files under the USD license.
+	  [Bug #12598][ruby-core:76428][ci skip]
+
+Fri Jul 22 09:19:57 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* LEGAL: Added entry for `lib/rdoc/generator/template/darkfish/css/fonts.css`
+	  [Misc #12550][ruby-core:76255][ci skip]
+
+Fri Jul 22 06:28:32 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (run_finalizer): push and exec tag just once, instead of
+	  protecting for each finalizer.
+
+	* gc.c (gc_start_internal, rb_gc_start): set finalizing flag
+	  whenever calling deferred finalizers not to recurse.
+
+Thu Jul 21 22:26:40 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* missing/strl{cat,cpy}.c: Update latest upstream files.
+	  [Misc #12205][ruby-core:74487]
+	* LEGAL: Update license for missing/strl{cat,cpy}.c.
+
+Thu Jul 21 21:53:30 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* LEGAL: added file list with Public domain license.
+	  [ruby-core:76254][Bug #12549]
+
+Wed Jul 20 17:44:07 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enumerator.c (lazy_uniq): new method Enumerator::Lazy#uniq.
+	  [Feature #11090]
+
+	* enum.c (enum_uniq): new method Enumerable#uniq.
+	  [Feature #11090]
+
+Wed Jul 20 17:35:23 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (rb_hash_add_new_element): add new element or do nothing
+	  if it is contained already.
+
+	* array.c (ary_add_hash, ary_add_hash_by): use
+	  rb_hash_add_new_element.
+
+Tue Jul 19 18:21:17 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* lib/unicode_normalize/tables.rb: Remove
+	  UnicodeNormalize::UNICODE_VERSION (#12546).
+
+Tue Jul 19 15:38:59 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* variable.c (rb_local_constants_i): exclude private constants
+	  when excluding inherited constants too.  [Bug #12345]
+
+Sun Jul 17 23:42:00 2016  Kenta Murata  <mrkn@mrkn.jp>
+
+	* numeric.c (num_finite_p, num_infinite_p): Add Numeric#finite? and
+	  Numeric#infinite?  [Feature #12039] [ruby-core:73618]
+
+	* complex.c (rb_complex_finite_p): Add Complex#finite?
+
+	* complex.c (rb_complex_infinite_p): Add Complex#infinite?
+
+	* test/ruby/test_bignum.rb: Add test for Integer#finite? and
+	  Integer#infinite?
+
+	* test/ruby/test_fixnum.rb: ditto.
+
+	* test/ruby/test_rational.rb: Add test for Rational#finite? and
+	  Rational#infinite?
+
+	* test/ruby/test_complex.rb: Add test for Complex#finite? and
+	  Complex#infinite?
+
+Sun Jul 17 20:59:24 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk, enc/depend (casefold.h, name2ctype.h): move to
+	  unicode data directory per version.
+
+Sat Jul 16 06:26:00 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk, enc/Makefile.in: moved timestamp files for
+	  directories under the specific directory, to get rid of match
+	  with files under the source directory.
+
+Fri Jul 15 22:05:13 2016  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* string.c (str_buf_cat): Fix potential integer overflow of capa.
+	  In addition, termlen is used instead of +1.
+
+Fri Jul 15 21:30:38 2016  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* string.c (str_buf_cat): Fix capa size for embed string.
+	  Fix bug in r55547. [Bug #12536]
+
+Fri Jul 15 18:13:15 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* gems/bundled_gems: update latest gems.
+
+Fri Jul 15 17:08:57 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* util.c (ruby_strtod): do not underflow only by preceding zeros,
+	  which may be canceled out by the exponent.
+	  http://twitter.com/kazuho/status/753829998767714305
+
+Fri Jul 15 09:53:48 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/unicode/case-folding.rb, tool/enc-unicode.rb: check if
+	  Unicode versions are consistent with each other.
+
+Fri Jul 15 08:25:15 2016  Jeremy Evans <code@jeremyevans.net>
+
+	* string.c (STR_BUF_MIN_SIZE): reduce from 128 to 127
+	  [ruby-core:76371] [Feature #12025]
+	* string.c (rb_str_buf_new): adjust for above reduction
+
+Thu Jul 14 17:26:00 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in (enc/unicode/name2ctype.h): remove stale recipe,
+	  which did not support Unicode age properties.
+
+	* common.mk (enc/unicode/name2ctype.h): update by --header option
+	  of tool/enc-unicode.rb.  enc/unicode/name2ctype.kwd file has not
+	  been used.
+
+	* common.mk (enc/unicode/name2ctype.kwd): rule to create from
+	  Unicode data files, used only when the target does not exist.
+
+Thu Jul 14 13:10:54 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/json/lib/json/ext: remove stale directory.  bundled
+	  extension libraries are placed under the directory for each
+	  architectures, but not mixed with plain text script libraries.
+
+Thu Jul 14 12:48:47 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* ext/json/**/*.rb: merge original files from upstream repository.
+	  It only fixes styles of frozen string literal.
+
+Wed Jul 13 22:23:03 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* test/json/json_common_interface_test.rb: use assert_raise instead of
+	  assert_raises.
+
+Wed Jul 13 22:14:23 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* test/lib/test/unit.rb: added test files with `_test` suffix for json
+	  upstream.
+	* test/json: merge original test files from json upstream.
+
+Wed Jul 13 18:09:42 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/iso_8859_9.c, test/ruby/enc/test_case_comprehensive.rb:
+	  Implement non-ASCII case conversion for ISO-8859-9, by Kazuki Iijima.
+
+	* enc/iso_8859_9.c: Exclude dotless i/I with dot from case-insensitive
+	  matching because they are not a case pair.
+
+	* test/ruby/enc/test_iso_8859.rb: Make test coverage for ISO-8859-9
+	  a bit more complete.
+
+Wed Jul 13 17:21:24 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/windows_1252.c, test/ruby/enc/test_case_comprehensive.rb:
+	  Implement non-ASCII case conversion for Windows-1252, by Serina Tai.
+
+	* test/ruby/enc/test_case_comprehensive.rb: Fix order of encodings.
+
+Wed Jul 13 16:19:14 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/iso_8859_7.c, test/ruby/enc/test_case_comprehensive.rb:
+	  Implement non-ASCII case conversion for ISO-8859-7, by Kosuke Kurihara.
+
+	* test/ruby/enc/test_case_comprehensive.rb: Fix order of encodings.
+
+Wed Jul 13 16:08:08 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_mark_roots): should mark the VM object itself to mark
+	  singleton class of the VM object.
+	  Before this patch, we only set mark bit for the VM object and
+	  invoke mark function separately.
+	  [Bug #12583]
+
+	* test/ruby/test_gc.rb: add a test.
+
+Wed Jul 13 15:59:59 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* math.c (_USE_MATH_DEFINES): it must be set before including internal.h
+	  because internal.h includes ruby.h, ruby.h includes win32.h, and
+	  win32.h includes system's math.h.
+	  this change is to get rid of a compiler warning (redefinition of
+	  a macro) introduced at r55641.
+
+Wed Jul 13 15:19:03 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/iso_8859_1.c, enc/iso_8859_4.c: Avoid setting modification flag if
+	  there is no modification.
+
+Wed Jul 13 14:40:04 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/iso_8859_5.c, test/ruby/enc/test_case_comprehensive.rb:
+	  Implement non-ASCII case conversion for ISO-8859-5, by Masaru Onodera.
+
+	* test/ruby/enc/test_case_comprehensive.rb: Fix order of encodings.
+
+Wed Jul 13 14:28:33 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* math.c (rb_math_sqrt): r55646 must use f_signbit.
+
+Wed Jul 13 14:22:50 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* iseq.c (Init_ISeq): undef ISeq.translate and ISeq.load_iseq
+	  to prevent calling super classes' methods.
+
+	  Without this patch, you can write workaround like:
+
+	    class << RubyVM::InstructionSequence
+	      def translate; end
+	      undef translate
+	    end
+
+	* test/ruby/test_iseq.rb: add a test.
+
+Wed Jul 13 14:16:03 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_method.c (method_entry_get_without_cache): check
+	  undefined method even if ruby_running is FALSE.
+
+	  We haven't call "undef"ed methods before ruby_running.
+	  So that this issue does not make troubles.
+
+Wed Jul 13 14:15:22 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/windows_1254.c: Adjust variable/macro names.
+
+Wed Jul 13 13:19:12 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/iso_8859_9.c, enc/windows_1254.c: Split Windows-1254 from
+	  ISO-8859-9 to be able to implement different case conversions.
+
+Wed Jul 13 13:08:30 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/iso_8859_7.c, enc/windows_1253.c: Split Windows-1253 from
+	  ISO-8859-7 to be able to implement different case conversions.
+
+Wed Jul 13 10:50:12 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/iso_8859_13.c, test/ruby/enc/test_case_comprehensive.rb:
+	  Implement non-ASCII case conversion for ISO-8859-13, by Kanon Shindo.
+
+Wed Jul 13 10:31:39 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/iso_8859_13.c, enc/windows_1257.c: Split Windows-1257 from
+	  ISO-8859-13 to be able to implement different case conversions.
+
+Wed Jul 13 09:02:30 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/iso_8859_3.c, test/ruby/enc/test_case_comprehensive.rb:
+	  Implement non-ASCII case conversion for ISO-8859-3, by Takuya Miyamoto.
+
+	* test/ruby/enc/test_case_comprehensive.rb: Extend special treatment
+	  for Turkic.
+
+	* enc/iso_8859_3.c: Exclude dotless i/I with dot from case-insensitive
+	  matching because they are not a case pair.
+
+Wed Jul 13 08:40:21 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* test/ruby/enc/test_iso_8859.rb: Exclude dotless i/I with dot from
+	  case-insensitive matching because they are not a case pair.
+
+Tue Jul 12 23:13:43 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* math.c (rb_math_sqrt): [EXPERIMENTAL] move Complex sqrt support
+	  from mathn.rb.
+
+Tue Jul 12 01:25:09 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* configure.in, lib/mkmf.rb, win32/Makefile.sub (CSRCFLAG): make the
+	  compiler option replacable in Makefile.
+
+	* win32/Makefile.sub (OUTFLAG, COUTFLAG): ditto.
+
+	* win32/Makeile.sub, win32/setup.mak (CC): should not append `-nologo`
+	  option forcely.
+
+Mon Jul 11 18:05:40 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/iso_8859_1.c: Moved test for lowercase characters without
+	  uppercase equivalent.
+
+Mon Jul 11 17:49:25 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/iso_8859_4.c, enc/iso_8859_10.c, enc/iso_8859_14.c,
+	  enc/iso_8859_15.c, enc/iso_8859_16.c: Replace case-by-case code with
+	  lookup in ENC_ISO_8859_xx_TO_LOWER_CASE table.
+
+Mon Jul 11 16:00:56 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_each, strio_readlines): convert
+	  arguments just once before reading, instead of conversions for
+	  each lines, as r55603.
+
+Sun Jul 10 19:53:41 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/iso_8859_10.c, test/ruby/enc/test_case_comprehensive.rb:
+	  Implement non-ASCII case conversion for ISO-8859-10, by Toya Hosokawa.
+
+Sun Jul 10 19:33:47 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* test/ruby/enc/test_case_comprehensive.rb: Changed testing logic to
+	  catch unintended modifications of characters that do not have a case
+	  equivalent in the respective encoding.
+	* enc/iso_8859_1.c, enc/iso_8859_15.c: Fixed unintended modifications of
+	  micro sign and y with diaeresis.
+
+Sun Jul 10 17:05:36 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/iso_8859_4.c, test/ruby/enc/test_case_comprehensive.rb:
+	  Implement non-ASCII case conversion for ISO-8859-4, by Kotaro Yoshida.
+
+Sun Jul 10 16:17:47 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* test/ruby/enc/test_case_comprehensive.rb: Fixed a comment
+	  (message belongs to last commit). [ci skip]
+
+Sun Jul 10 14:27:25 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* util.c (ruby_dtoa): [EXPERIMENTAL] adjust the case that the
+	  Float value is close to the exact but unrepresentable middle
+	  value of two values in the given precision, as r55604.
+
+Sun Jul 10 08:57:20 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* thread.c: Fixed implicit conversion error with Apple clang-800.0.31
+
+Sat Jul  9 12:43:09 2016  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/getoptlong.rb: use false instead of FALSE.
+
+Fri Jul  8 21:49:28 2016  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* thread.c (rb_wait_for_single_fd): Clean up fds.revents every time
+	  before calling ppoll(2). [Bug #12575] [ruby-dev:49725]
+
+Fri Jul  8 14:16:48 2016  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_args.c (vm_caller_setup_arg_block): call rb_sym_to_proc()
+	  directly to reduce method dispatch overhead.
+
+Fri Jul  8 08:43:31 2016  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* io.c (rb_io_s_read): add description of pipes to the documentation
+	  of IO.read.
+
+Fri Jul  8 03:54:22 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vm_args.c (setup_parameters_complex): don't raise ArgumentError
+	  if an array is given for instance_exec with optional argument.
+	  [ruby-core:76300] [Bug #12568]
+	  https://github.com/rails/rails/pull/25699
+
+Fri Jul  8 00:47:36 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vm_eval.c (yield_under): change prototype to get argc/argv.
+
+	* vm_eval.c (specific_eval): change for above.
+
+	* vm_eval.c (rb_obj_instance_exec): avoid object allocation.
+
+	* vm_eval.c (rb_mod_module_exec): ditto.
+
+Thu Jul  7 20:08:37 2016  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_args.c (vm_caller_setup_arg_block): disable symbol block
+	  argument optimization when tail call optimization is enabled,
+	  in order to avoid SEGV.  [ruby-core:76288] [Bug #12565]
+
+Thu Jul  7 16:37:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (flo_round): [EXPERIMENTAL] adjust the case that the
+	  receiver is close to the exact but unrepresentable middle value
+	  of two values in the given precision.
+	  http://d.hatena.ne.jp/hnw/20160702
+
+Thu Jul  7 16:31:07 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_s_foreach, rb_io_s_readlines): convert arguments
+	  just once before reading, instead of conversions for each lines.
+
+Wed Jul  6 19:54:17 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/iso_8859_14.c, test/ruby/enc/test_case_comprehensive.rb:
+	  Implement non-ASCII case conversion for ISO-8859-14, by Yutaro Tada.
+
+Wed Jul  6 19:24:48 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/iso_8859_1.c, enc/iso_8859_15.c, enc/iso_8859_16.c:
+	  Align indenting to onigmo convention.
+
+Wed Jul  6 18:59:13 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/iso_8859_15.c, test/ruby/enc/test_case_comprehensive.rb:
+	  Implement non-ASCII case conversion for ISO-8859-15, by Maho Harada.
+
+Wed Jul  6 18:34:21 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/iso_8859_16.c, test/ruby/enc/test_case_comprehensive.rb:
+	  Implement non-ASCII case conversion for ISO-8859-16, by Satoshi Kayama.
+
+Wed Jul  6 14:44:56 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (create_makefile): store $headers in LOCAL_HDRS for
+	  depend files.
+
+	* ext/digest/digest_conf.rb (digest_conf): add implementation
+	  specific headers to $header.
+
+	* ext/digest/{md5,rmd160,sha1,sha2}/depend: add LOCAL_HDRS to the
+	  dependencies.
+
+Wed Jul  6 08:59:35 2016  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/http/generic_request.rb (write_header): A Request-Line must
+	  not contain CR or LF.
+
+Wed Jul  6 07:11:27 2016  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/ftp.rb (putline): raise an ArgumentError when
+	  CR or LF is included in a line.
+
+Tue Jul  5 20:49:30 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* ext/json/*, test/json/*: Update json-2.0.1.
+	  Changes of 2.0.0: https://github.com/flori/json/blob/f679ebd0c69a94e3e70a897ac9a229f5779c2ee1/CHANGES.md#2015-09-11-200
+	  Changes of 2.0.1: https://github.com/flori/json/blob/f679ebd0c69a94e3e70a897ac9a229f5779c2ee1/CHANGES.md#2016-07-01-201
+	  [Feature #12542][ruby-dev:49706][fix GH-1395]
+
+Tue Jul  5 19:39:49 2016  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* string.c (rb_str_change_terminator_length): New function to change
+	  termlen and resize heap for the terminator. This is split from
+	  rb_str_fill_terminator (str_fill_term) because filling terminator
+	  and changing terminator length are different things. [Bug #12536]
+
+	* internal.h: declaration for rb_str_change_terminator_length.
+
+	* string.c (str_fill_term): Simplify only to zero-fill the terminator.
+	  For non-shared strings, it assumes that (capa + termlen) bytes of
+	  heap is allocated. This partially reverts r55557.
+
+	* encoding.c (rb_enc_associate_index): rb_str_change_terminator_length
+	  is used, and it should be called whenever the termlen is changed.
+
+	* string.c (str_capacity): New static function to return capacity
+	  of a string with the given termlen, because the termlen may
+	  sometimes be different from TERM_LEN(str) especially during
+	  changing termlen or filling terminator with specific termlen.
+
+	* string.c (rb_str_capacity): Use str_capacity.
+
+Tue Jul  5 11:07:14 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* pack.c (pack_pack): use union instead of bare variable to ease
+	  optimizations and avoid assigning x87 floating point number.
+	  [ruby-core:74496] [Bug #12209]
+
+	* pack.c (pack_unpack): ditto.
+
+Mon Jul  4 13:56:34 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* process.c: define sig_t if not exist.
+	  at least Solaris 10 and 11 doesn't have sig_t.
+
+Mon Jul  4 13:08:48 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* random.c (random_ulong_limited): avoid left shift count >= width of
+	  type on 32bit environment.
+
+Sun Jul  3 18:51:42 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* test/ruby/enc/test_case_comprehensive.rb, test_regex_casefold.rb,
+	  test/test_unicode_normalize.rb: Replace UNICODE_VERSION from
+	  UnicodeNormalize with RbConfig::CONFIG['UNICODE_VERSION'] from
+	  feature 12460.
+
+Sun Jul  3 06:04:09 2016  Eric Wong  <e@80x24.org>
+
+	* process.c (disable_child_handler_fork_child): simplify
+	  [ruby-core:75781] [Misc #12439]
+
+Sun Jul  3 05:25:46 2016  Eric Wong  <e@80x24.org>
+
+	* tool/asm_parse.rb: add description
+	* tool/change_maker.rb: ditto
+	* tool/downloader.rb: ditto
+	* tool/eval.rb: ditto
+	* tool/expand-config.rb: ditto
+	* tool/extlibs.rb: ditto
+	* tool/fake.rb: ditto
+	* tool/file2lastrev.rb: ditto
+	* tool/gem-unpack.rb: ditto
+	* tool/gen_dummy_probes.rb: ditto
+	* tool/gen_ruby_tapset.rb: ditto
+	* tool/generic_erb.rb: ditto
+	* tool/id2token.rb: ditto
+	* tool/ifchange: ditto
+	* tool/insns2vm.rb: ditto
+	* tool/instruction.rb: ditto
+	* tool/jisx0208.rb: ditto
+	* tool/merger.rb: ditto
+	* tool/mkrunnable.rb: ditto
+	* tool/node_name.rb: ditto
+	* tool/parse.rb: ditto
+	* tool/rbinstall.rb: ditto
+	* tool/rbuninstall.rb: ditto
+	* tool/rmdirs: ditto
+	* tool/runruby.rb: ditto
+	* tool/strip-rdoc.rb: ditto
+	* tool/vcs.rb: ditto
+	* tool/vtlh.rb: ditto
+	* tool/ytab.sed: ditto
+	* tool/enc-unicode.rb: fix typo
+	* tool/mk_call_iseq_optimized.rb: ditto
+	* tool/update-deps: ditto
+	  [ruby-core:76215] [Bug #12539]
+	  by Noah Gibbs <the.codefolio.guy@gmail.com>
+
+Sat Jul  2 18:04:24 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/mailto.rb (initialize): RFC3986_Parser#split sets opaque
+	  only if the URI has path-rootless, not path-empty.
+	  [ruby-core:76055] [Bug #12498]
+	  patched by Chris Heisterkamp <cheister@squareup.com>
+
+Sat Jul  2 04:26:14 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regcomp.c (noname_disable_map): don't optimize out group 0
+	  Ruby's Regexp doesn't allow normal numbered groups if the regexp
+	  has named groups. On such case it optimizes out related NT_ENCLOSE.
+	  But even on the case it can use \g<0>.
+	  This fix not to remove NT_ENCLOSE whose regnum is 0.
+	  [ruby-core:75828] [Bug #12454]
+
+Sat Jul  2 03:09:27 2016  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* string.c: Partially reverts r55547 and r55555.
+	  ChangeLog about the reverted changes are also deleted in this file.
+	  [Bug #12536] [ruby-dev:49699] [ruby-dev:49702]
+
+Sat Jul  2 02:22:22 2016  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* string.c (str_fill_term): When termlen increases, re-allocation
+	  of memory for termlen should always be needed.
+	  In this fix, if possible, decrease capa instead of realloc.
+	  [Bug #12536] [ruby-dev:49699]
+
+Fri Jul  1 20:20:20 2016  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* string.c: Specify termlen as far as possible.
+	  Additional fix for [Bug #12536] [ruby-dev:49699].
+
+	* string.c (str_new_static): Specify termlen from the given encoding
+	  when creating a new String object is needed.
+
+	* string.c (rb_tainted_str_new_with_enc): New function to create a
+	  tainted String object with the given encoding. This means that
+	  the termlen is correctly specified. Currently static function.
+	  The function name might be renamed to rb_tainted_enc_str_new
+	  or rb_enc_tainted_str_new.
+
+	* string.c (rb_external_str_new_with_enc): Use encoding by using the
+	  above rb_tainted_str_new_with_enc().
+
+Fri Jul  1 19:38:57 2016  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* test/fiddle/test_pointer.rb (test_to_str, test_to_s, test_aref_aset):
+	  Attempt to use independent strings for destructive tests that
+	  directly modify values on memory by using Fiddle::Pointer.
+	  [Bug #12537] [ruby-dev:49700]
+
+Fri Jul  1 18:20:00 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* .gdbinit (rb_ps_thread): show the detail of cfunc in ruby level
+	  backtrace.
+
+Fri Jul  1 13:26:39 2016  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* string.c (rb_str_subseq, str_substr): When RSTRING_EMBED_LEN_MAX
+	  is used, TERM_LEN(str) should be considered with it because
+	  embedded strings are also processed by TERM_FILL.
+	  Additional fix for [Bug #12536] [ruby-dev:49699].
+
+Fri Jul  1 12:11:01 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* .gdbinit (rb_count_objects): added gdb version of count_objects().
+
+Fri Jul  1 04:32:52 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* .gdbinit (rb_ps_thread): show ruby level backtrace.
+	  Usually you can call `rb_ps` to show ruby level backtraces
+	  for all living threads.
+	  Note that it can call with core file like `gcore <pid>`
+	  and `gdb ruby core.<pid>`.
+
+Thu Jun 30 19:15:13 2016  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* string.c: Fix memory corruptions when using UTF-16/32 strings.
+	  [Bug #12536] [ruby-dev:49699]
+
+	* string.c (rb_str_new_with_class): Use TERM_LEN of the "obj".
+
+	* string.c (rb_str_plus, rb_str_justify): Use str_new0 which is aware
+	  of termlen.
+
+	* string.c (str_shared_replace): Copy +termlen bytes instead of +1.
+
+	* string.c (rb_str_times): termlen should not be included in capa.
+
+	* string.c (RESIZE_CAPA_TERM): When using RSTRING_EMBED_LEN_MAX,
+	  termlen should be counted with it because embedded strings are
+	  also processed by TERM_FILL.
+
+	* string.c (rb_str_capacity, str_shared_replace, str_buf_cat): ditto.
+
+	* string.c (rb_str_drop_bytes, rb_str_setbyte, str_byte_substr): ditto.
+
+Wed Jun 29 22:24:37 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* ext/psych/lib/psych_jars.rb: removed needless file required to JRuby.
+
+Wed Jun 29 22:21:38 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/ossl_ocsp.c: The "reuse" behavior of d2i_ functions does
+	  not work well with OpenSSL 1.0.0t. So avoid it.
+
+Wed Jun 29 15:18:28 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* insns.def (opt_succ): optimize like r55515. (but this argument is
+	  constant)
+
+Wed Jun 29 12:41:58 2016  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* test/ruby/test_refinement.rb: skip
+	  test_prepend_after_refine_wb_miss on ARM or MIPS.
+	  [ruby-core:76031] [Bug #12491]
+
+Wed Jun 29 08:45:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (passed_block): convert passed block symbol to proc.
+	  based on the patch by Daisuke Sato in [ruby-dev:49695].
+	  [Bug #12531]
+
+Wed Jun 29 03:34:41 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* bignum.c (rb_big2ulong): the old logic seems to try to avoid
+	  calculating `-(long)(num-1)-1` if `num` is not LONG_MIN. (Note that
+	  `-LONG_MIN` may be larger than LONG_MAX) But C compilers can
+	  optimize it into single NEG instruction.
+	  Therefore those two conditions can be single if-body.
+
+	* bignum.c (rb_big2long): ditto.
+
+	* bignum.c (rb_big2ull): ditto.
+
+	* bignum.c (rb_big2ll): ditto.
+
+Tue Jun 28 22:55:00 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/pstore.rb (PStore::CHECKSUM_ALGO): extract the algorithm for
+	  checksum, instead of qualified names for each times.
+
+Tue Jun 28 22:29:36 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bootstraptest/runner.rb: do not use safe navigation operator.
+	  this runner may run on older ruby.  partially revert r53110
+	  (GH-1142 patched by @mlarraz).
+
+Tue Jun 28 22:09:09 2016  Akio Tajima <artonx@yahoo.co.jp>
+
+	* lib/fileutils.rb: rescue Errno:EACCES for chown.
+	  [Bug #12520]
+
+Tue Jun 28 18:38:09 2016  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* ext/digest/md5/md5ossl.h: Remove excess semicolons.
+	  Suppress warning on Solaris with Oracle Solaris Studio 12.
+	  [ruby-dev:49692] [Bug #12524]
+
+	* ext/digest/md5/md5cc.h: ditto.
+	* ext/digest/sha1/sha1cc.h: ditto.
+	* ext/digest/sha1/sha1ossl.h: ditto.
+	* ext/digest/sha2/sha2cc.h: ditto.
+	* ext/digest/sha2/sha2ossl.h: ditto.
+	* ext/openssl/ossl_pkey_rsa.c: ditto.
+
+Tue Jun 28 15:56:48 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/enc/test_case_comprehensive.rb: noting to test if
+	  Unicode data files are available.
+	  [ruby-core:76160] [Bug #12433]
+
+	* test/test_unicode_normalize.rb: ditto.
+
+Tue Jun 28 15:20:18 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/net/http.rb (Net::HTTP#proxy_uri): cache the case no proxy
+	  is used.
+
+Tue Jun 28 09:56:29 2016  Stefan Schussler  <mail@stefanschuessler.de>
+
+	* object.c (rb_mod_eqq): [DOC] Fix typo in RDoc.  [Fix GH-1393]
+
+Tue Jun 28 02:41:32 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* insns.def (opt_plus): use `- 1` instead of `& (~1)` to allow
+	  compilers to use x86 LEA instruction (3 operand).
+	  Even if 3 operand LEA's latency is 3 cycle after SandyBridge,
+	  it reduces code size and can be faster because of super scalar.
+
+	* insns.def (opt_plus): calculate and use rb_int2big.
+	  On positive Fixnum overflow, `recv - 1 + obj` doesn't carry
+	  because recv's msb and obj's msb are 0, and resulted msb is 1.
+	  Therefore simply rshift and cast as signed long works fine.
+	  On negative Fixnum overflow, it will carry because both arguments'
+	  msb are 1, and resulted msb is also 1.
+	  In this case it needs to restore carried sign bit after rshift.
+
+Mon Jun 27 16:58:32 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/fileutils.rb (FileUtils#install): accecpt symbolic mode, as
+	  well as chmod.
+
+	* lib/fileutils.rb (FileUtils#install): add owner and group
+	  options.
+
+Mon Jun 27 08:56:55 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (ADD_TRACE): ignore trace instruction on non-positive
+	  line.
+
+	* parse.y (coverage): get rid of ArgumentError when the starting
+	  line number is not positive.  [ruby-core:76141] [Bug #12517]
+
+Sun Jun 26 10:20:25 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/win32/lib/Win32API.rb (Win32API#initialize): Cygwin
+	  2.5.2-1 (perhaps) seems to no longer append ".dll" suffix
+	  implicitly.
+
+	* ext/win32/lib/win32/resolv.rb (Win32::Resolv): ditto.  Fix the
+	  error reported by yamataka AT u08.itscom.net in
+	  [ruby-list:50339], and pointed out and patched by cerberus AT
+	  m3.kcn.ne.jp in [ruby-list:50341].
+
+Sat Jun 25 10:07:52 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* test/openssl/test_ocsp.rb: Ignore errors caused by bugs that exist in
+	  LibreSSL >= 2.3.1.
+
+Sat Jun 25 02:33:33 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_method.c (vm_respond_to): try method_missing if respond_to?
+	  is undefined, as if it is the default definition.
+	  [ruby-core:75377] [Bug #12353]
+
+Fri Jun 24 17:04:21 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* ext/psych/*, test/psych/*: Update psych 2.1.0
+	  This version fixed [Bug #11988][ruby-core:72850]
+
+Fri Jun 24 13:12:41 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* lib/rubygems.rb, lib/rubygems/*, test/rubygems/*:
+	  Update rubygems 2.6.5 and 2.6.6.
+	  Release note of 2.6.5: https://github.com/rubygems/rubygems/commit/656f5d94dc888d78d0d00f3598a4fa37391aac80
+	  Release note of 2.6.6: https://github.com/rubygems/rubygems/commit/ccb9c3300c063f5b5656669972d24a10ef8afbf5
+
+Fri Jun 24 09:17:15 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (lib/unicode_normalize/tables.rb): should not depend
+	  on Unicode data files unless ALWAYS_UPDATE_UNICODE=yes, to get
+	  rid of downloading Unicode data unnecessary.  [ruby-dev:49681]
+
+	* common.mk (enc/unicode/casefold.h): update Unicode files in a
+	  sub-make, not to let the header depend on the files always.
+
+	* enc/unicode/case-folding.rb: if gperf is not usable, assume the
+	  existing file is OK.
+
+Tue Jun 21 19:44:54 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* test/ruby/enc/test_regex_casefold.rb: Add Windows-1251, KOI8-R, and
+	  KOI8-U to encodings; definitely removed EUC-JP.
+
+Tue Jun 21 19:32:23 2016  Mark St.Godard  <markstgodard@gmail.com>
+
+	* lib/webrick/httprequest.rb (setup_forwarded_info): Use the first
+	  value in X-Forwarded-Proto, if header contains multiple comma
+	  separated values.  Some middlewares may add these values to the
+	  list, not replacing.  [Fix GH-1386]
+
+Tue Jun 21 17:17:42 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* test/ruby/test_io.rb: Skip test_readpartial_with_not_empty_buffer,
+	  test_read_buffer_error, test_read_unlocktmp_ensure,
+	  test_readpartial_unlocktmp_ensure, and
+	  test_sysread_unlocktmp_ensure on cygwin,
+	  because these tests repeatedly hang. This makes test_io.rb
+	  complete in finite time on cygwin.
+
+	* ChangeLog: Fix test_in.rb -> test_io.rb (two instances).
+
+Tue Jun 21 16:38:14 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_casemap): do not put code with side effects
+	  inside RSTRING_PTR() macro which evaluates the argument multiple
+	  times.
+
+Tue Jun 21 16:13:45 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_casemap): fix memory leak.
+
+Tue Jun 21 16:12:21 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_casemap): int is too small for string size.
+
+Tue Jun 21 15:42:22 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* test/ruby/test_io.rb: Skip test_read_buffer_error on cygwin,
+	  because this test repeatedly hangs.
+
+Tue Jun 21 15:35:14 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* LEGAL: Added filenames and copyrights for some files in
+	  enc/trans/JIS.
+
+Tue Jun 21 00:56:47 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (get_special_folder): fix calling convention of
+	  SHGetPathFromIDListEx, which should be WINAPI.  pointed out by
+	  @arton at http://twitter.com/arton/status/744884064277016576
+
+Tue Jun 21 00:22:02 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in, include/ruby/defines.h (RUBY_USE_SETJMPEX):
+	  include setjmpex.h only when using setjmpex() for RUBY_SETJMP.
+	  the header of mingw32 overrides setjmp() by setjmpex().
+
+Mon Jun 20 18:39:16 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* test/ruby/test_io.rb: Skip test_open_fifo_does_not_block_other_threads
+	  on cygwin. Fifos seem to work okay in cygwin, but this test repeatedly
+	  hangs.
+
+Mon Jun 20 13:35:06 2016  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm.c (invoke_bmethod, invoke_block_from_c_0): revert r52104
+	  partially to avoid "self has wrong type to call super in this
+	  context" errors.
+	  [ruby-core:72724] [Bug #11954]
+
+Mon Jun 20 12:53:38 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* test/rubygems/test_gem_remote_fetcher.rb: OpenSSL::PKey::DH#priv_key=
+	  is not defined when ext/openssl is built with OpenSSL 1.1.0.
+	  https://github.com/rubygems/rubygems/pull/1648
+	  [ruby-core:75225] [Feature #12324]
+
+Sun Jun 19 21:25:43 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/ossl_ocsp.c: Add OCSP::SingleResponse that represents an
+	  OCSP SingleResponse structure. Also add two new methods #responses
+	  and #find_response to OCSP::BasicResponse. A BasicResponse has one or
+	  more SingleResponse. We have OCSP::BasicResponse#status that returns
+	  them as an array of arrays, each containing the content of a
+	  SingleResponse, but this is not useful. When validating an OCSP
+	  response, we need to look into the each SingleResponse and check their
+	  validity but it is not simple. For example, when validating for a
+	  certificate 'cert', the code would be like:
+
+	    # certid_target is an OpenSSL::OCSP::CertificateId for cert
+	    basic = res.basic
+	    result = basic.status.any? do |ary|
+	      ary[0].cmp(certid_target) &&
+	        ary[4] <= Time.now && (!ary[5] || Time.now <= ary[5])
+	    end
+
+	  Adding OCSP::SingleResponse at the same time allows exposing
+	  OCSP_check_validity(). With this, the code above can be rewritten as:
+
+	    basic = res.basic
+	    single = basic.find_response(certid_target)
+	    result = single.check_validity
+
+	* test/openssl/test_ocsp.rb: Test this.
+
+Sun Jun 19 18:40:19 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/ossl_ocsp.c (ossl_ocspbres_add_status): Allow specifying
+	  the times (thisUpdate, nextUpdate and revocationTime) with Time
+	  objects. Currently they accepts only relative seconds from the current
+	  time. This is inconvenience, especially for revocationTime. When
+	  Integer is passed, they are still treated as relative times. Since the
+	  type check is currently done with rb_Integer(), this is a slightly
+	  incompatible change. Hope no one passes a relative time as String or
+	  Time object...
+	  Also, allow passing nil as nextUpdate. It is optional.
+
+	* ext/openssl/ruby_missing.h: Define RB_INTEGER_TYPE_P() if not defined.
+	  openssl gem will be released before Ruby 2.4.0.
+
+Sun Jun 19 18:39:38 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/ossl_ocsp.c: Implement OCSP::{CertificateId,Request,
+	  BasicResponse,Response}#initialize_copy.
+	  [ruby-core:75504] [Bug #12381]
+
+	* test/openssl/test_ocsp.rb: Test them.
+
+Sun Jun 19 18:29:50 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/ossl_pkey_dh.c, ext/openssl/ossl_pkey_dsa.c,
+	  ext/openssl/ossl_pkey_ec.c, ext/openssl/ossl_pkey_rsa.c: Implement
+	  initialize_copy method for OpenSSL::PKey::*.
+	  [ruby-core:75504] [Bug #12381]
+
+	* test/openssl/test_pkey_dh.rb, test/openssl/test_pkey_dsa.rb,
+	  test/openssl/test_pkey_ec.rb, test/openssl/test_pkey_rsa.rb: Test they
+	  actually copy the OpenSSL objects, and modifications to cloned object
+	  don't affect the original object.
+
+Sun Jun 19 16:55:16 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* test/ruby/test_dir_m17n.rb: Skip tests with non-UTF-8 encodings
+	  on cygwin. Cygwin can use the Unicode PUA (private use area) to store
+	  bytes from non-UTF-8 filenames (see
+	  https://cygwin.com/cygwin-ug-net/using-specialnames.html#pathnames-specialchars),
+	  but we are not supporting this. [Bug #12443]
+
+Sun Jun 19 15:01:18 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* localeinit.c: Fix filesystem encoding for cygwin to UTF-8 (see
+	  https://cygwin.com/cygwin-ug-net/using-specialnames.html#pathnames-unusual)
+
+Sun Jun 19 14:31:07 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/ossl_pkey.h, ext/openssl/ossl_pkey_dh.c,
+	  ext/openssl/ossl_pkey_dsa.c, ext/openssl/ossl_pkey_rsa.c: A few days
+	  ago, OpenSSL changed {DH,DSA,RSA}_get0_*() to take const BIGNUM **.
+	  https://git.openssl.org/gitweb/?p=openssl.git;a=commit;h=fd809cfdbd6e32b6b67b68c59f6d55fbed7a9327
+	  [ruby-core:75225] [Feature #12324]
+
+Sun Jun 19 11:19:43 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* variable.c (rb_path_to_class): consider the string length
+	  instead of a terminator.
+
+	* variable.c (rb_path_to_class): search the constant at once
+	  instead of checking if defined and then getting it.
+
+Sat Jun 18 14:01:40 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* test/rubygems/test_gem_installer.rb: Fixed broken test with extension
+	  build. https://github.com/rubygems/rubygems/pull/1645
+
+Sat Jun 18 13:59:54 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update rubygems
+	  HEAD(2c6d256). It contains to update vendored Molinillo to 0.5.0.
+	  https://github.com/rubygems/rubygems/pull/1638
+
+Sat Jun 18 10:13:37 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (build-ext), ext/extmk.rb: use variable EXTENCS
+	  different than ENCOBJS, to get rid of circular dependency.
+	  build libencs when linking encodings statically.
+	  [ruby-core:75618] [Bug #12401]
+
+Sat Jun 18 08:52:46 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_getline): fix pointer index
+	  overflow.  reported by Guido Vranken <guido AT guidovranken.nl>.
+
+Thu Jun 16 16:35:35 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* class.c (Init_class_hierarchy): prevent rb_cObject which is the
+	  class tree root, from GC.  [ruby-dev:49666] [Bug #12492]
+
+Thu Jun 16 12:17:52 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (tr_trans): adjust buffer size by processed and rest
+	  lengths, instead of doubling repeatedly.
+
+Thu Jun 16 11:15:25 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (tr_trans): consider terminator length and fix heap
+	  overflow.  reported by Guido Vranken <guido AT guidovranken.nl>.
+
+Thu Jun 16 00:02:32 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/ossl_ocsp.c (ossl_ocspreq_verify, ossl_ocspbres_verify):
+	  Use ossl_clear_error() so that they don't print warnings to stderr and
+	  leak errors in the OpenSSL error queue. Also, check the return value
+	  of OCSP_*_verify() correctly. They can return -1 on verification
+	  failure.
+
+Wed Jun 15 19:52:23 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/ossl_ocsp.c (ossl_ocspreq_sign, ossl_ocspbres_sign): Allow
+	  specifying hash algorithm used in signing. They are hard coded to use
+	  SHA-1.
+	  Based on a patch provided by Tim Shirley <tidoublemy@gmail.com>.
+	  [ruby-core:70915] [Feature #11552] [GH ruby/openssl#28]
+
+	* test/openssl/test_ocsp.rb: Test sign-verify works.
+
+Wed Jun 15 01:46:16 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c: [DOC] fix rdoc directive, and an example of negative
+	  value.  [ruby-core:76025] [Bug #12487]
+
+Wed Jun 15 01:44:42 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/mkconfig.rb: provide Unicode Version information as
+	  RbConfig::CONFIG['UNICODE_VERSION'].
+	  [ruby-core:75845] [Feature #12460]
+
+Wed Jun 15 00:01:18 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/ruby/enc/test_case_comprehensive.rb
+	  (TestComprehensiveCaseFold::read_data): use \A and \z instead of
+	  ^ and $ in regexp.
+
+Tue Jun 14 23:43:00 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/backward.h (rb_cFixnum, rb_cBignum): remove the
+	  backward compatibility macros, to fail incompatible extension
+	  libraries early.  [Bug #12427]
+
+Tue Jun 14 22:22:07 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* strftime.c (rb_strftime_with_timespec): limit the result string
+	  size by the format length, to get rid of unlimited memory use.
+
+Tue Jun 14 22:11:11 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/ossl_ocsp.c (ossl_ocspcid_get_issuer_name_hash,
+	  ossl_ocspcid_get_issuer_key_hash, ossl_ocspcid_get_hash_algorithm):
+	  Add accessor methods OCSP::CertificateId#issuer_name_hash,
+	  #issuer_key_hash, #hash_algorithm.
+	  Based on a patch provided by Paul Kehrer <paul.l.kehrer@gmail.com>.
+	  [ruby-core:48062] [Feature #7181]
+
+	* test/openssl/test_ocsp.rb: Test these new methods.
+
+Tue Jun 14 22:07:25 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/date/date_strftime.c (date_strftime_with_tmx): reject too
+	  large precision to get rid of buffer overflow.
+	  reported by Guido Vranken <guido AT guidovranken.nl>.
+
+Tue Jun 14 21:40:42 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/ossl_ocsp.c (ossl_ocspbres_to_der, ossl_ocspcid_to_der):
+	  Implement #to_der methods for OCSP::BasicResponse and
+	  OCSP::CertificateId.
+
+	  (ossl_ocspreq_initialize, ossl_ocspres_initialize): Use GetOCSP*()
+	  instead of raw DATA_PTR().
+
+	  (ossl_ocspbres_initialize, ossl_ocspcid_initialize): Allow
+	  initializing from DER string.
+
+	  (Init_ossl_ocsp): Define new #to_der methods.
+
+	* test/openssl/test_ocsp.rb: Test these changes. Also add missing tests
+	  for OCSP::{Response,Request}#to_der.
+
+Tue Jun 14 21:35:00 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/openssl_missing.h (DH_set0_pqg, RSA_set0_key):
+	  DH_set0_pqg() allows 'q' to be NULL. Fix a typo in RSA_set0_key().
+	  Fixes r55285.  [ruby-core:75225] [Feature #12324]
+
+Mon Jun 14 10:19:00 2016  Kenta Murata  <mrkn@mrkn.jp>
+
+	* NEWS: describe Integer#digits.
+
+Mon Jun 13 21:09:40 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* thread.c (debug_deadlock_check): show thread lock dependency and
+	  backtrace [Feature #8214] [ruby-dev:47217]
+
+	* thread.c (thread_status_name): show "sleep_forever" instead of
+	  "sleep" if called from inspect.
+
+Mon Jun 13 20:50:07 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (reg_named_capture_assign_iter): remove named capture
+	  conflict warnings.  it is just annoying rather than useful.
+	  [ruby-core:75416] [Bug #12359]
+
+Mon Jun 13 20:04:00 2016  Kenta Murata  <mrkn@mrkn.jp>
+
+	* numeric.c (rb_int_digits, rb_fix_digits, rb_int_digits_bigbase):
+	  Add Integer#digits to extract columns in place-value notation
+	  [Feature #12447] [ruby-core:75799]
+
+	* test/ruby/test_integer.rb: Add tests for the above change.
+
+	* test/ruby/test_bignum.rb: ditto.
+
+Mon Jun 13 20:34:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (RUBY_INTEGER_UNIFICATION): macro to tell if
+	  Integer is integrated.  [ruby-core:75718][Bug #12427]
+
+	* include/ruby/backward.h, internal.h (rb_cFixnum, rb_cBignum):
+	  fallback to rb_cInteger.
+
+	* bignum.c, numeric.c, ext/json/generator/generator.{c,h}: use the
+	  macro.
+
+Mon Jun 13 16:58:53 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* test/ruby/enc/test_case_comprehensive.rb: Add tests for full Unicode
+	  swapcase.
+
+Sun Jun 12 14:48:00 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* test/ruby/enc/test_case_comprehensive.rb: Add tests for ASCII-only
+	  swapcase; store calculated values in hashes.
+
+Sun Jun 12 14:05:45 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/ossl_cipher.c (ossl_cipher_get_auth_tag,
+	  ossl_cipher_set_auth_tag): Check if the cipher flags retrieved by
+	  EVP_CIPHER_CTX_flags() includes EVP_CIPH_FLAG_AEAD_CIPHER to see if
+	  the cipher supports AEAD. AES-GCM was the only supported in OpenSSL
+	  1.0.1.
+
+	  (Init_ossl_cipher): Fix doc; OpenSSL::Cipher::AES.new(128, :GCM) can't
+	  work.
+
+	* ext/openssl/openssl_missing.h: Define EVP_CTRL_AEAD_{GET,SET}_TAG if
+	  missing. They are added in OpenSSL 1.1.0, and have the same value as
+	  EVP_CTRL_GCM_{GET,SET}_TAG and EVP_CTRL_CCM_{GET,SET}_TAG.
+
+Sun Jun 12 13:47:42 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* test/openssl/test_engine.rb (test_openssl_engine_builtin,
+	  test_openssl_engine_by_id_string): Skip test if 'openssl' engine is
+	  already loaded. And test the number increased by Engine.load{_by_id,},
+	  not the total count of loaded engines. Previously, we called
+	  OpenSSL::Engine.cleanup every time running a test case, but we no
+	  longer can do it.
+	  [ruby-core:75225] [Feature #12324]
+
+Sun Jun 12 09:24:34 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (append_fspath): normalize directory name to be appended
+	  on OS X.  [ruby-core:75957] [Ruby trunk Bug#12483]
+	  https://github.com/rails/rails/issues/25303#issuecomment-224834804
+
+Sat Jun 11 23:07:32 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/forwardable.rb (_delegator_method): get rid of a warning which
+	  causes test failures introduced at r55376.
+
+Sat Jun 11 18:37:58 2016  Marcus Stollsteimer  <sto.mar@web.de>
+
+	* ext/json/lib/*.rb: Removed some comments. Because these are unnecessary
+	  class description. [ci skip][Bug #12255][ruby-core:74835]
+
+Sat Jun 11 15:19:38 2016  takiy33  <takiy33@users.noreply.github.com>
+
+	* lib/net/smtp.rb: [DOC] Remove dead link on documentation for
+	  Japanese of SMTP.  [Fix GH-1380]
+
+Sat Jun 11 15:02:45 2016  Grant Hutchins  <github@nertzy.com>
+
+	* string.c (rb_str_oct): [DOC] fix typo, hornored -> honored.
+	  [Fix GH-1379]
+
+Sat Jun 11 14:04:19 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/objspace/objspace_dump.c: generate valid JSON for dump_all.
+
+Sat Jun 11 13:52:33 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/forwardable.rb (_delegator_method): remove __send__ call if
+	  possible, so that more optimizations will be enabled.
+
+Sat Jun 11 11:24:36 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/iso_8859.h (SHARP_s): name frequently used codepoint.
+
+Sat Jun 11 09:58:45 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/iso_8859_1.c: Revert to older version of code.
+
+Sat Jun 11 09:46:17 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/iso_8859_1.c: Implement non-ASCII case mapping.
+
+	* test/ruby/enc/test_case_comprehensive.rb: Tests for above.
+
+	* string.c: Add iso-8859-1 to supported encodings.
+
+Sat Jun 11 09:31:28 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/forwardable.rb (_delegator_method): leave the backtrace
+	  untouched during accessor.  forwardable.rb does not appear in
+	  the backtrace during delegated method because of tail-call
+	  optimization.
+
+Sat Jun 11 01:38:31 2016  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* include/ruby/defines.h (GCC_VERSION_SINCE): Fix logic error by
+	  adding parentheses. Fix failures of TestMkmf::TestConvertible
+	  with GCC 3.4.3 on Solaris 10. [Bug #12479] [ruby-dev:49660]
+
+Fri Jun 10 21:54:24 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/forwardable.rb (Forwardable._delegator_method): extract
+	  method generator and deal with non-module objects.
+	  [ruby-dev:49656] [Bug #12478]
+
+Fri Jun 10 17:35:11 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* string.c: Special-case :ascii option in rb_str_capitalize_bang and
+	  rb_str_swapcase_bang.
+
+Fri Jun 10 17:12:24 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* string.c: Special-case :ascii option in rb_str_upcase_bang (retry).
+
+Fri Jun 10 14:48:36 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (get_env_cstr): ensure NUL-terminated.
+	  [ruby-dev:49655] [Bug #12475]
+
+	* string.c (rb_str_fill_terminator): return the pointer to the
+	  NUL-terminated content.
+
+Thu Jun  9 21:42:00 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/ossl_asn1.c (asn1integer_to_num): Use
+	  ASN1_ENUMERATED_to_BN() to convert an ASN1_ENUMERATED to a BN.
+	  Starting from OpenSSL 1.1.0, ASN1_INTEGER_to_BN() rejects
+	  non-ASN1_INTEGER objects. The format of INTEGER and ENUMERATED are
+	  almost identical so they behaved in the same way in OpenSSL <= 1.0.2.
+	  [ruby-core:75225] [Feature #12324]
+
+	* test/openssl/test_asn1.rb (test_decode_enumerated): Test that it
+	  works.
+
+Thu Jun  9 21:10:04 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* tool/ifchange: fix timestamp error when target without
+	  directory.
+
+Thu Jun  9 19:46:22 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/ossl_ssl.c: Add define guards for OPENSSL_NO_EC.
+	  SSL_CTX_set_ecdh_auto() is defined even when ECDH is disabled in
+	  OpenSSL's configuration. This fixes r55214.
+
+	* test/openssl/test_pair.rb (test_ecdh_curves): Skip if the OpenSSL does
+	  not support ECDH.
+
+	* test/openssl/utils.rb (start_server): Ignore error in
+	  SSLContext#ecdh_curves=.
+
+Thu Jun  9 18:12:42 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in (un-runnable): fail with proper error message.
+	  [ruby-core:75905] [Bug #12472]
+
+Thu Jun  9 15:32:17 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (RBCONFIG): use ifchange tool to see if the content is
+	  changed and update the timestamp file.
+
+	* tool/mkconfig.rb: remove ifchange features.
+
+	* tool/ifchange: make target directory if it does not exist with
+	  its parent directories.
+
+	* win32/ifchange.bat: drop support for command.com used on old
+	  systems.
+
+Thu Jun  9 15:03:35 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/extconf.rb: Check for CRYPTO_malloc() and SSL_new().
+	  OpenSSL_add_all_digests() and SSL_library_init() are deprecated and
+	  converted to macros in OpenSSL 1.1.0.
+	  [ruby-core:75225] [Feature #12324]
+
+Wed Jun  8 23:09:51 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* string.c (rb_str_ascii_casemap): fix compile error.
+
+Wed Jun  8 22:22:24 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* string.c: Revert previous commit (possibility of endless loop).
+
+Wed Jun  8 21:57:41 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* string.c: Special-case :ascii option in rb_str_upcase_bang.
+
+Wed Jun  8 21:28:36 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* string.c: New static function rb_str_ascii_casemap; special-casing
+	  :ascii option in rb_str_upcase_bang and rb_str_downcase_bang.
+
+	* regenc.c: Fix a bug (wrong use of unnecessary slack at end of string).
+
+	* regenc.h -> include/ruby/oniguruma.h: Move declaration of
+	  onigenc_ascii_only_case_map so that it is visible in string.c.
+
+Wed Jun  8 20:33:44 2016  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* include/ruby/intern.h: Remove excess semicolons in PUREFUNC().
+	  Fix failure of TestMkmf::TestConvertible on Solaris with
+	  Oracle Solaris Studio 12. [ruby-dev:49651] [Bug #12470]
+	* internal.h: ditto.
+
+Wed Jun  8 16:03:09 2016  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/smtp.rb (getok, get_response): raise an ArgumentError when
+	  CR or LF is included in a line, because they are not allowed in
+	  RFC5321.  Thanks, Jeremy Daer.
+
+Tue Jun  7 21:27:25 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* test/rubygems/*_{cert,cert_32}.pem: Regenerate test certificates for
+	  OpenSSL 1.1.0. This is already in upstream.
+	  https://github.com/rubygems/rubygems/commit/9be5c53939440a61c4bba73cfffbeb5cfadf72be
+	  [ruby-core:75225] [Feature #12324]
+
+Tue Jun  7 21:27:17 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* test/open-uri/test_ssl.rb: Regenerate test certificates. The test CA
+	  certificate was incorrectly generated. A CA certificate must have the
+	  basic constraints extension with cA bit set to TRUE. OpenSSL <= 1.0.2
+	  allowed the error when the certificate is in the trusted store but
+	  OpenSSL 1.1.0 no longer does.
+	  [ruby-core:75225] [Feature #12324]
+
+Tue Jun  7 21:20:38 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* test/openssl/test_x509name.rb: Don't register OID for 'emailAddress'
+	  and 'serialNumber'. A recent change in OpenSSL made OBJ_create()
+	  reject an already existing OID. They were needed to run tests with
+	  OpenSSL 0.9.6 which is now unsupported.
+	  https://git.openssl.org/gitweb/?p=openssl.git;a=commit;h=52832e470f5fe8c222249ae5b539aeb3c74cdb25
+	  [ruby-core:75225] [Feature #12324]
+
+	* test/openssl/test_ssl_session.rb (test_server_session): Duplicate
+	  SSL::Session before re-adding to the session store. OpenSSL 1.1.0
+	  starts rejecting SSL_SESSION once removed by SSL_CTX_remove_session().
+	  https://git.openssl.org/gitweb/?p=openssl.git;a=commit;h=7c2d4fee2547650102cd16d23f8125b76112ae75
+
+	* test/openssl/test_pkey_ec.rb (setup): Remove X25519 from @keys. X25519
+	  is new in OpenSSL 1.1.0 but this is for key agreement and not for
+	  signing.
+
+	* test/openssl/test_pair.rb, test/openssl/test_ssl.rb,
+	  test/openssl/utils.rb: Set security level to 0 when using aNULL cipher
+	  suites.
+
+	* test/openssl/utils.rb: Use 1024 bits DSA key for client certificates.
+
+	* test/openssl/test_engine.rb: Run each test in separate process.
+	  We can no longer cleanup engines explicitly as ENGINE_cleanup() was
+	  removed.
+	  https://git.openssl.org/gitweb/?p=openssl.git;a=commit;h=6d4fb1d59e61aacefa25edc4fe5acfe1ac93f743
+
+	* ext/openssl/ossl_engine.c (ossl_engine_s_cleanup): Add a note to the
+	  RDoc for Engine.cleanup.
+
+	* ext/openssl/lib/openssl/digest.rb: Don't define constants for DSS,
+	  DSS1 and SHA(-0) when using with OpenSSL 1.1.0. They are removed.
+
+	* test/openssl/test_digest.rb, test/openssl/test_pkey_dsa.rb,
+	  test/openssl/test_pkey_dsa.rb, test/openssl/test_ssl.rb,
+	  test/openssl/test_x509cert.rb, test/openssl/test_x509req.rb: Don't
+	  test unsupported hash functions.
+
+Tue Jun  7 17:49:52 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* test/ruby/enc/test_case_comprehensive: Change test for encodings
+	  without any non-ASCII case conversions from ASCII-only test
+	  to full test.
+
+Tue Jun  7 17:18:39 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* string.c (rb_str_upcase_bang, rb_str_capitalize_bang,
+	  rb_str_swapcase_bang): Switch to use primitive.
+
+Tue Jun  7 16:44:16 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* string.c (rb_str_downcase_bang): Switch to use primitive except if
+	  conversion can be done ASCII-only.
+
+Tue Jun  7 16:13:36 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* test/ruby/enc/test_case_comprehensive: Add regression tests for
+	  current ASCII-only case conversion.
+
+Tue Jun  7 15:28:38 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* test/ruby/enc/test_case_comprehensive: Fix method name
+	  (generate_casefold_tests -> generate_case_mapping_tests).
+
+Tue Jun  7 15:05:13 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* regenc.h/c: Rename onigenc_not_support_case_map to
+	  onigenc_ascii_only_case_map.
+
+	* regenc.h: Add definition of onigenc_single_byte_ascii_only_case_map.
+
+	* enc/iso_8859_X.c, windows_125X.c, ascii.c, us-ascii.c, koi8_x.c:
+	  Replace onigenc_not_support_case_map by
+	  onigenc_single_byte_ascii_only_case_map.
+
+	* enc/big5.c, cp949.c, emacs_mule.c, euc_X.c, gbX.c, shift_jis.c,
+	  windows_31j.c: Replace onigenc_not_support_case_map by
+	  onigenc_ascii_only_case_map.
+
+Tue Jun  7 14:57:09 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/extconf.rb: Check for SSL_CTX_set_min_proto_version()
+	  macro added in OpenSSL 1.1.0. Version-specific methods, such as
+	  TLSv1_method(), are deprecated in OpenSSL 1.1.0. We need to use
+	  version-flexible methods (TLS_*method() or SSLv23_*method()) and
+	  disable other protocol versions as necessary.
+	  [ruby-core:75225] [Feature #12324]
+
+	* ext/openssl/ossl_ssl.c: Use SSL_CTX_set_{min,max}_proto_version() to
+	  fix the protocol version.
+
+Tue Jun  7 12:55:34 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* regenc.c (onigenc_not_support_case_map): Move to end of file;
+	  (onigenc_single_byte_ascii_only_case_map): Add new function.
+
+Tue Jun  7 09:26:37 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* regenc.c (onigenc_not_support_case_map): Rewrite to work correctly
+	  in ASCII range.
+
+Mon Jun  6 23:00:00 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* appveyor.yml: Update libressl version to 2.3.5.
+
+Mon Jun  6 18:37:57 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_throw_start): check if the iseq is symbol
+	  proc, class definition should not be a symbol proc.
+	  [ruby-core:75856] [Bug #12462]
+
+Mon Jun  6 18:36:34 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* string.c: Added UTF-16BE/LE and UTF-32BE/LE to supported encodings
+	  for Unicode case mapping.
+
+	* test/ruby/enc/test_case_comprehensive.rb: Tests for above
+	  functionality; fixed an encoding issue in assertion error message.
+
+Mon Jun  6 17:29:35 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* test/ruby/enc/test_case_comprehensive.rb: Speed up testing for small
+	  encodings by preselecting codepoints.
+
+Mon Jun  6 17:10:50 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/ossl_cipher.c (ossl_cipher_free): Use EVP_CIPHER_CTX_free()
+	  to free EVP_CIPHER_CTX allocated by EVP_CIPHER_CTX_new().
+	  [ruby-core:75225] [Feature #12324]
+
+Mon Jun  6 13:37:08 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* string.c Change rb_str_casemap to use encoding primitive
+	  case_map instead of directly calling onigenc_unicode_case_map.
+
+Mon Jun  6 13:16:46 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* test/ruby/enc/test_case_mapping.rb:
+	  Remove :lithuanian guard for Unicode case mapping.
+
+Mon Jun  6 10:39:56 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/openssl_missing.h: Include ruby/config.h. r55285 added
+	  some inline functions but VC does not recognize 'inline' keyword.
+
+Mon Jun  6 09:25:34 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (thread_start_func_2): report raised exception if
+	  report_on_exception flag is set.  [Feature #6647]
+
+Mon Jun  6 01:36:24 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/extconf.rb: Check existence of SSL_is_server(). This
+	  function was introduced in OpenSSL 1.0.2.
+	  [ruby-core:75225] [Feature #12324]
+
+	* ext/openssl/openssl_missing.h: Implement SSL_is_server() if missing.
+
+	* ext/openssl/ossl_ssl.c (ssl_info_cb): Use SSL_is_server() to see if
+	  the SSL is server. The state machine in OpenSSL was rewritten and
+	  SSL_get_state() no longer returns SSL_ST_ACCEPT.
+
+	  (ossl_ssl_cipher_to_ary, ossl_sslctx_session_get_cb): Add some
+	  `const`s to suppress warning.
+
+Mon Jun  6 01:18:10 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/ossl_asn1.c (decode_bool): Do the same thing as
+	  d2i_ASN1_BOOLEAN() does by ourselves. This function is removed in
+	  OpenSSL 1.1.0.
+	  [ruby-core:75225] [Feature #12324]
+
+Mon Jun  6 00:34:16 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/extconf.rb: Check existence of accessor functions that
+	  don't exist in OpenSSL 0.9.8. OpenSSL 1.1.0 made most of its
+	  structures opaque and requires use of these accessor functions.
+	  [ruby-core:75225] [Feature #12324]
+
+	* ext/openssl/openssl_missing.[ch]: Implement them if missing.
+
+	* ext/openssl/ossl*.c: Use these accessor functions.
+
+	* test/openssl/test_hmac.rb: Add missing test for HMAC#reset.
+
+Mon Jun  6 00:00:13 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/openssl_missing.[ch]: Implement EVP_PKEY_get0_*() and
+	  {RSA,DSA,EC_KEY,DH}_get0_*() functions.
+	  OpenSSL 1.1.0 makes EVP_PKEY/RSA/DSA/DH opaque. We used to provide
+	  setter methods for each parameter of each PKey type, for example
+	  PKey::RSA#e=, but this is no longer possible because the new API
+	  RSA_set0_key() requires the 'n' at the same time. This commit adds
+	  deprecation warning to them and adds PKey::*#set_* methods as direct
+	  wrapper for those new APIs. For example, 'rsa.e = 3' now needs to be
+	  rewritten as 'rsa.set_key(rsa.n, 3, rsa.d)'.
+	  [ruby-core:75225] [Feature #12324]
+
+	* ext/openssl/ossl_pkey*.[ch]: Use the new accessor functions. Implement
+	  RSA#set_{key,factors,crt_params}, DSA#set_{key,pqg}, DH#set_{key,pqg}.
+	  Emit a warning with rb_warning() when old setter methods are used.
+
+	* test/drb/ut_array_drbssl.rb, test/drb/ut_drb_drbssl.rb,
+	  test/rubygems/test_gem_remote_fetcher.rb: Don't set a priv_key for DH
+	  object that are used in tmp_dh_callback. Generating a new key pair
+	  every time should be fine - actually the private exponent is ignored
+	  in OpenSSL >= 1.0.2f/1.0.1r even if we explicitly set.
+	  https://www.openssl.org/news/secadv/20160128.txt
+
+Sun Jun  5 22:06:00 2016  Kenta Murata  <mrkn@mrkn.jp>
+
+	* configure.in: Fix the timing to detect the appropriate C++ compiler
+	  in OS X.
+
+Sun Jun  5 21:42:24 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/extconf.rb: Check absence of CRYPTO_lock() to see if the
+	  OpenSSL has the new threading API. In OpenSSL <= 1.0.2, an application
+	  had to set locking callbacks to use OpenSSL in a multi-threaded
+	  environment. OpenSSL 1.1.0 now finds pthreads or Windows threads so we
+	  don't need to do something special.
+	  [ruby-core:75225] [Feature #12324]
+
+	  Also check existence of *_up_ref(). Some structures in OpenSSL have
+	  a reference counter. We used to increment it with CRYPTO_add() which
+	  is a part of the old API.
+
+	* ext/openssl/openssl_missing.h: Implement *_up_ref() if missing.
+
+	* ext/openssl/ossl.c: Don't set locking callbacks if unneeded.
+
+	* ext/openssl/ossl_pkey.c, ext/openssl/ossl_ssl.c,
+	  ext/openssl/ossl_x509cert.c, ext/openssl/ossl_x509crl.c,
+	  ext/openssl/ossl_x509store.c: Use *_up_ref() instead of CRYPTO_add().
+
+Sun Jun  5 21:38:13 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/extconf.rb: Check if RAND_pseudo_bytes() is usable. It is
+	  marked as deprecated in OpenSSL 1.1.0.
+	  [ruby-core:75225] [Feature #12324]
+
+	* ext/openssl/ossl_rand.c: Disable Random.pseudo_bytes if
+	  RAND_pseudo_bytes() is unavailable.
+
+	* test/openssl/test_random.rb: Don't test Random.pseudo_bytes if not
+	  defined.
+
+Sun Jun  5 19:06:40 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* NEWS: Add news about Unicode-wide case mapping for
+	  String/Symbol#upcase/downcase/swapcase/capitalize(!).
+
+Sun Jun  5 15:24:33 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* test/ruby/enc/test_case_comprehensive.rb:
+	  Remove :lithuanian guard for Unicode case mapping.
+
+Sun Jun  5 14:46:34 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* string.c: Remove :lithuanian guard for Unicode case mapping.
+
+Sat Jun  4 10:54:52 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* missing/crypt.h (struct crypt_data): remove unnecessary member
+	  "initialized".
+
+	* missing/crypt.c (des_setkey_r): nothing to be initialized in
+	  crypt_data.
+
+	* configure.in (struct crypt_data): check for "initialized" in
+	  struct crypt_data, which may be only in glibc, and isn't on AIX
+	  at least.
+
+Sat Jun  4 10:38:39 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c: unify MAX_PATH, _MAX_PATH, and MAXPATHLEN to
+	  PATH_MAX, except for MAX_PATH in get_special_folder for an API
+	  limit.
+
+Fri Jun  3 21:27:22 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (process_options): rb_str_conv_enc() never set encoding
+	  of the source string, but returns the string itself if the
+	  conversion failed.  then the instance variable does not need to
+	  be set again.
+
+Fri Jun  3 18:04:37 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ruby.c (process_options): need to duplicate path before passing it to
+	  rb_str_conv_enc() because the function might call rb_enc_associate()
+	  internally.  this fixes test failures on Windows introduced at r55260.
+
+Fri Jun  3 17:44:25 2016  Reiner Herrmann  <reiner@reiner-h.de>
+
+	* lib/mkmf.rb (create_makefile): sort lists of source and object
+	  files in generated Makefile, unless given by extconf.rb.
+	  [Fix GH-1367]
+
+Thu Jun  2 21:18:10 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (get_special_folder): use SHGetPathFromIDListEx if
+	  available instead of old SHGetPathFromIDListW, to check the
+	  buffer size.
+
+Thu Jun  2 17:05:19 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (ruby_init_loadpath_safe): remove MAXPATHLEN restriction
+	  for Windows 10.
+
+Thu Jun  2 16:51:35 2016  Koichi ITO  <koic.ito@gmail.com>
+
+	* misc/ruby-mode.el (ruby-here-doc-beg-re),
+	  (ruby-here-doc-beg-match, ruby-parse-partial): Support for
+	  `squiggly heredoc' syntax in ruby-mode.  [Fix GH-1372]
+
+Thu Jun  2 10:24:48 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* string.c: Raise ArgumentError when invalid string is detected in
+	  case mapping methods.
+
+	* enc/unicode.c: Check for invalid string and signal with negative
+	  length value.
+
+	* test/ruby/enc/test_case_mapping.rb: Add tests for above.
+
+	* test/ruby/test_m17n_comb.rb: Add a message to clarify test failure.
+
+Wed Jun  1 21:41:05 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/extconf.rb: Check existence of ASN1_TIME_adj(). The old
+	  ASN1_TIME_set() is not Year 2038 ready on sizeof(time_t) == 4
+	  environment. This function was added in OpenSSL 1.0.0.
+	  [ruby-core:45552] [Bug #6571]
+
+	* ext/openssl/ossl_asn1.c (ossl_time_split): Added. Split the argument
+	  (Time) into the number of days elapsed since the epoch and the
+	  remainder seconds to conform to ASN1_TIME_adj().
+	  (obj_to_asn1utime, obj_to_asn1gtime): Use ossl_time_split() and
+	  ASN1_*TIME_adj().
+
+	* ext/openssl/ossl_asn1.h: Add the function prototype for
+	  ossl_time_split().
+
+	* ext/openssl/ossl_x509.[ch]: Add ossl_x509_time_adjust(). Similarly to
+	  obj_to_asn1*time(), use X509_time_adj_ex() instead of X509_time_adj().
+
+	* ext/openssl/ossl_x509cert.c, ext/openssl/ossl_x509crl.c,
+	  ext/openssl/ossl_x509revoked.c: Use ossl_x509_time_adjust().
+
+Wed Jun  1 15:58:20 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: revert r55237.  replace crypt, not crypt_r, and
+	  check if crypt is broken more.
+
+	* missing/crypt.c: move crypt_r.c
+
+	* string.c (rb_str_crypt): use crypt_r if provided by the system.
+
+Wed Jun  1 14:07:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* missing/crypt_r.c (a64toi): initialize statically and fix out of
+	  bounds access when salt is not 7bit clean.
+
+Wed Jun  1 11:34:59 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (MISSING): fixed build error introduced at r55237.
+
+Wed Jun  1 09:48:06 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_crypt): use reentrant crypt_r.
+
+Wed Jun  1 09:37:26 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* missing/crypt.c (des_setkey): void function never returns any value.
+
+Wed Jun  1 09:16:22 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* crypt.h: separate header file from missing/crypt.c.
+
+	* missing/crypt.c (crypt_r, setkey_r, encrypt_r): add reentrant
+	  versions.
+
+Wed Jun  1 02:25:38 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* missing/crypt.c: fix size macros to use configured values
+	  for platforms long is larger than 32bit.
+	  [ruby-core:75792] [Bug #12446]
+
+Tue May 31 17:28:46 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (OptionParser::Completion.candidate): get rid of
+	  nil as key names.  [ruby-core:75773] [Bug #12438]
+
+	* lib/optparse.rb (OptionParser#make_switch): char class option
+	  cannot be NoArgument, default to RequiredArgument.
+
+Tue May 31 00:30:11 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/raddrinfo.c (host_str, port_str): Use StringValueCStr
+	  instead of (Safe)StringValue, to detect NUL byte in the string.
+
+Mon May 30 22:02:01 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/ossl_asn1.c (time_to_time_t): Use NUM2TIMET() instead of
+	  NUM2LONG(). time_t may be larger than long.
+	  [ruby-core:45552] [Bug #6571]
+
+Mon May 30 21:15:37 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* string.c: Document current behavior for other case mapping methods
+	  on String. [ci skip]
+
+Mon May 30 20:00:25 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* string.c: Document current situation for String#downcase. [ci skip]
+
+Mon May 30 18:29:28 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/ossl_ssl.c (ossl_sslctx_s_alloc): Enable the automatic
+	  curve selection for ECDH by calling SSL_CTX_set_ecdh_auto(). With
+	  this a TLS server automatically selects a curve which both the client
+	  and the server support to use in ECDH. This changes the default
+	  behavior but users can still disable ECDH by excluding 'ECDH' cipher
+	  suites from the cipher list (with SSLContext#ciphers=). This commit
+	  also deprecate #tmp_ecdh_callback=. It was added in Ruby 2.3.0. It
+	  wraps SSL_CTX_set_tmp_ecdh_callback() which will be removed in OpenSSL
+	  1.1.0. Its callback receives two values 'is_export' and 'keylength'
+	  but both are completely useless for determining a curve to use in
+	  ECDH. The automatic curve selection was introduced to replace this.
+
+	  (ossl_sslctx_setup): Deprecate SSLContext#tmp_ecdh_callback=. Emit a
+	  warning if this is in use.
+
+	  (ossl_sslctx_set_ecdh_curves): Add SSLContext#ecdh_curves=. Wrap
+	  SSL_CTX_set1_curves_list(). If it is not available, this falls back
+	  to SSL_CTX_set_tmp_ecdh().
+
+	  (Init_ossl_ssl): Define SSLContext#ecdh_curves=.
+
+	* ext/openssl/extconf.rb: Check the existence of EC_curve_nist2nid(),
+	  SSL_CTX_set1_curves_list(), SSL_CTX_set_ecdh_auto() and
+	  SSL_CTX_set_tmp_ecdh_callback().
+
+	* ext/openssl/openssl_missing.[ch]: Implement EC_curve_nist2nid() if
+	  missing.
+
+	* test/openssl/test_pair.rb (test_ecdh_callback): Use
+	  EnvUtil.suppress_warning to suppress deprecated warning.
+
+	  (test_ecdh_curves): Test that SSLContext#ecdh_curves= works.
+
+	* test/openssl/utils.rb (start_server): Use SSLContext#ecdh_curves=.
+
+Mon May 30 16:28:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/raddrinfo.c (host_str, port_str): use RSTRING_LEN
+	  instead of strlen, since RSTRING_PTR StringValueCStr may not be
+	  NUL-terminated when SHARABLE_MIDDLE_SUBSTRING=1.  reported by
+	  @tmtms, http://twitter.com/tmtms/status/736910516229005312
+
+Mon May 30 16:20:26 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (str_fill_term): return new pointer reallocated by
+	  filling terminator.
+
+Mon May 30 14:54:58 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (enc_subseq): share the return value and
+	  the buffer as possible.
+
+Mon May 30 14:50:25 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (str_substr, rb_str_aref): refactor not to create
+	  unnecessary empty string.
+
+	* string.c (str_byte_substr, str_byte_aref): ditto.
+
+Mon May 30 00:09:37 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/-test-/auto_ext.rb: fixed a heedless bug introduced at r55198.
+	  this change will make RubyCI green.
+
+Sun May 29 22:58:19 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regexec.c (ONIGENC_IS_MBC_ASCII_WORD): redefine optimized one.
+	  WORD of Ruby's ascii compatible encoding is always [a-zA-Z0-9_].
+
+Sun May 29 22:44:19 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regexec.c (match_at): make compilers optimize harder.
+
+Sun May 29 12:08:42 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/-test-/auto_ext.rb (auto_ext): utility method to create
+	  extension libraries for tests.
+
+Sat May 28 20:40:57 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-additional.el (ruby-insert-heredoc-code-block): insert
+	  here document code block for assert_separately mainly.
+
+Sat May 28 20:34:19 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* test/test_unicode_normalize.rb: Add test to check for availability of
+	  Unicode data file; refactoring; fix an error with tests for destructive
+	  method (unicode_normalize!).
+
+Sat May 28 19:08:36 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* test/ruby/enc/test_case_comprehensive.rb: Add error messages to tests
+	  for data file availability; refactoring.
+
+Sat May 28 14:00:10 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/lib/openssl/ssl.rb (SSLSocket): Move the implementation of
+	  SSLSocket#initialize to C. Initialize the SSL (OpenSSL object) in it.
+	  Currently this is delayed until ossl_ssl_setup(), which is called from
+	  SSLSocket#accept or #connect. Say we call SSLSocket#hostname= with an
+	  illegal value. We expect an exception to be raised in #hostname= but
+	  actually we get it in the later SSLSocket#connect. Because the SSL is
+	  not ready at #hostname=, the actual call of SSL_set_tlsext_host_name()
+	  is also delayed.
+	  This also fixes: [ruby-dev:49376] [Bug #11724]
+
+	* ext/openssl/ossl_ssl.c (ossl_ssl_initialize): Added. Almost the same
+	  as the Ruby version but this instantiate the SSL object at the same
+	  time.
+
+	  (ossl_ssl_setup): Adjust to the changes. Just set the underlying IO to
+	  the SSL.
+
+	  (ssl_started): Added. Make use of SSL_get_fd(). This returns -1 if not
+	  yet set by SSL_set_fd().
+
+	  (ossl_ssl_data_get_struct): Removed. Now GetSSL() checks that the SSL
+	  exists.
+
+	  (ossl_ssl_set_session): Don't call ossl_ssl_setup() here as now the
+	  SSL is already instantiated in #initialize.
+
+	  (ossl_ssl_shutdown, ossl_start_ssl, ossl_ssl_read_internal,
+	   ossl_ssl_write_internal, ossl_ssl_stop, ossl_ssl_get_cert,
+	   ossl_ssl_get_peer_cert, ossl_ssl_get_peer_cert_chain,
+	   ossl_ssl_get_version, ossl_ssl_get_cipher, ossl_ssl_get_state,
+	   ossl_ssl_pending, ossl_ssl_session_reused,
+	   ossl_ssl_get_verify_result, ossl_ssl_get_client_ca_list,
+	   ossl_ssl_npn_protocol, ossl_ssl_alpn_protocol, ossl_ssl_tmp_key): Use
+	  GetSSL() instead of ossl_ssl_data_get_struct(). Use ssl_started().
+
+	  (Init_ossl_ssl): Add method declarations of SSLSocket#{initialize,
+	  hostname=}.
+
+	* ext/openssl/ossl_ssl.h (GetSSL): Check that the SSL is not NULL. It
+	  should not be NULL because we now set it in #initialize.
+
+	* ext/openssl/ossl_ssl_session.c (ossl_ssl_session_initialize): No need
+	  to check if the SSL is NULL.
+
+Sat May 28 10:47:40 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* gems/bundled_gems: Update latest releases, power_assert-0.3.0,
+	  test-unit 3.1.9, minitest 5.9.0, did_you_mean 1.0.1
+
+Sat May 28 10:45:40 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* addr2line.c: drop support for ATARI ST platform. It was
+	  discontinued more than two decades ago. [fix GH-1350] Patch by
+	  @cremno
+	* include/ruby/ruby.h: ditto.
+	* io.c: ditto.
+
+Sat May 28 10:39:47 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* test/ruby/enc/test_case_comprehensive.rb: Converted exception for
+	  unavailable Unicode data files to failed assertion.
+
+Sat May 28 10:26:18 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* lib/cgi/util.rb: added missing quote.
+	  [fix GH-1363][ci skip] Patch by @dwaller
+
+Fri May 27 17:38:49 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* variable.c (rb_local_constants_i): exclude hidden constants.
+	  [ruby-core:75575] [Bug #12389]
+
+Fri May 27 17:09:44 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* transcode.c (str_transcode0): scrub in the given encoding when
+	  the source encoding is given, not in the encoding of the
+	  receiver.  [ruby-core:75732] [Bug #12431]
+
+Fri May 27 15:07:32 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (rb_scan_args): remove nul padding which
+	  caused syntax error if fmt is not a string literal.
+
+	* include/ruby/ruby.h (rb_scan_args_verify): suppress array-bounds
+	  warnings by old clang.
+
+	* include/ruby/ruby.h (rb_scan_args0): make extractor macros
+	  inline functions, which do not validate the format and are
+	  unnecessary to be expanded.
+
+Fri May 27 01:00:36 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* symbol.c (is_identchar): use ISDIGIT instead of rb_enc_isalnum.
+	  Though rb_enc_isalnum is encoding aware function, its argument here
+	  is *m, which is a single byte. Therefore ISDIGIT is faster.
+
+	* symbol.c (is_special_global_name): ditto.
+
+	* symbol.c (rb_enc_symname_type): ditto.
+
+Fri May 27 00:39:40 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (rb_scan_args): add nul padding here to
+	  apply to all references.
+
+	* include/ruby/ruby.h (rb_scan_args_verify): move length mismatch
+	  check outside conditional operators.
+
+Thu May 26 14:21:10 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/ossl_pkey_dh.c (ossl_dh_compute_key): Check that the DH
+	  has 'p' (the prime) before calling DH_size(). We can create a DH with
+	  no parameter but DH_size() does not check and dereferences NULL.
+	  [ruby-core:75720] [Bug #12428]
+
+	* ext/openssl/ossl_pkey_dsa.c (ossl_dsa_sign): Ditto. DSA_size() does
+	  not check dsa->q.
+
+	* ext/openssl/ossl_pkey_rsa.c (ossl_rsa_public_encrypt,
+	  ossl_rsa_public_decrypt, ossl_rsa_private_encrypt,
+	  ossl_rsa_private_decrypt): Ditto. RSA_size() does not check rsa->n.
+
+Thu May 26 14:13:52 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (rb_scan_args_count): verify length with
+	  counting variables together.
+
+Thu May 26 09:45:41 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* test/ruby/enc/test_case_comprehensive.rb: Add set of comprehensive
+	  (across most Unicode characters; later across most character encodings)
+	  tests for case mapping.
+
+Thu May 26 05:00:13 2016  Benoit Daloze  <eregontp@gmail.com>
+
+	* class.c (rb_define_class): Fix documentation.
+
+Wed May 25 20:50:12 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* re.c (unescape_nonascii): scan hex up to only 3 characters.
+	  [Bug #12420] [Bug #12423]
+
+Wed May 25 19:07:19 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/unicode.c: Handle DOTLESS_i by hand because it isn't involved in folding.
+
+Wed May 25 18:30:53 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regparse.c (fetch_token_in_cc): raise error if given octal escaped
+	  character is too big. [Bug #12420] [Bug #12423]
+
+Wed May 25 17:45:15 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl, test/openssl: Drop OpenSSL < 0.9.8 support.
+
+Wed May 25 17:43:30 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/openssl_missing.h, ext/openssl/ossl.h: Remove
+	  unnecessary 'extern "C"' blocks. We don't use C++ and these headers
+	  are local to ext/openssl, so there is no need to enclose with it.
+
+Wed May 25 17:42:58 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/extconf.rb: Remove check of OPENSSL_FIPS macro. This is
+	  unneeded because we can check the macro directly in source code,
+	  just as we already do for OPENSSL_NO_* macros.
+
+	* ext/openssl/ossl.c: Replace occurrences of HAVE_OPENSSL_FIPS with
+	  OPENSSL_FIPS.
+
+Wed May 25 17:13:35 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* class.c (rb_scan_args): merge code for n_trail.
+
+Wed May 25 17:11:34 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (rb_scan_args_validate): move failed
+	  condition to the terminal.  [ruby-core:75714] [Bug #12426]
+
+Wed May 25 13:13:37 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regcomp.c: remove condition for debug output because prelude
+	  doesn't use regexp now.
+
+Wed May 25 13:10:30 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regcomp.c (compile_length_tree): return error code immediately
+	  if compile_length_tree raised error [Bug #12418]
+
+Wed May 25 08:01:39 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/unicode.c: Fix flag error for switch from titlecase to lowercase.
+
+	* test/ruby/enc/test_case_mapping.rb: Tests for above error.
+
+Wed May 25 01:13:55 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/ossl_pkey_ec.c (ec_key_new_from_group): Create a new
+	  EC_KEY on given EC group. Extracted from ossl_ec_key_initialize().
+	  (ossl_ec_key_s_generate): Added. Create a new EC instance and
+	  generate a random private and public key.
+	  (ossl_ec_key_initialize): Use ec_key_new_from_group().
+	  (Init_ossl_ec): Define the new method EC.generate. This change is
+	  for consistency with other PKey types.  [ruby-core:45541] [Bug #6567]
+
+	* test/openssl/test_pkey_ec.rb: Test that EC.generate works.
+
+Wed May 25 00:37:16 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/ossl_pkey_ec.c (ossl_ec_key_generate_key): Fix up RDoc.
+	  (Init_ossl_ec): Rename EC#generate_key to EC#generate_key!. Make the
+	  old name an alias of #generate_key!. This change is for consistency
+	  with other PKey types.  [ruby-core:45541] [Bug #6567]
+
+	* test/openssl/test_pkey_ec.rb: Use EC#generate_key! instead of
+	  EC#generate_key.
+
+Wed May 25 00:23:05 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (rb_scan_args_set): check the arity after
+	  adjusting argc for an option hash, for optimization in simpler
+	  cases.
+
+Wed May 25 00:21:52 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (XCFLAGS): merge flags only for ruby itself from
+	  ruby_cflags.
+
+Tue May 24 22:04:15 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/ossl_cipher.c (ossl_cipher_set_key, ossl_cipher_set_iv):
+	  Reject too long values as well as too short ones. Currently they
+	  just truncate the input but this would hide bugs and lead to
+	  unexpected encryption/decryption results.
+
+	* test/openssl/test_cipher.rb: Test that Cipher#key= and #iv= reject
+	  Strings with invalid length.
+
+Tue May 24 21:32:21 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/ossl_x509ext.c (ossl_x509ext_set_value): Use
+	  ASN1_OCTET_STRING_set() instead of M_ASN1_OCTET_STRING_set(). Macros
+	  prefixed by "M_" are discouraged to be used from outside OpenSSL
+	  library[1].
+	  (ossl_x509ext_get_value): Likewise, use ASN1_STRING_print() instead
+	  of M_ASN1_OCTET_STRING_print().
+	  [1] https://git.openssl.org/gitweb/?p=openssl.git;a=blob;f=CHANGES;h=bf61913d7b01212b4d8b2f3c13d71d645914f67c;hb=b6079a7835f61daa9fb2cbf9addfa86049523933#l878
+
+	* ext/openssl/ossl.h: Include openssl/asn1.h instead of
+	  openssl/asn1_mac.h. It just includes openssl/asn1.h and defines some
+	  additional "M_" macros.
+
+Tue May 24 18:52:11 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (rb_scan_args_verify): verify the format to
+	  scan if no invalid chars and variable argument length matching,
+	  at the compile time if possible.
+
+Tue May 24 17:18:46 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/defines.h (ERRORFUNC, WARNINGFUNC): add fallback
+	  definitions.
+
+Tue May 24 16:37:43 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in (ruby_cflags): separate from optflags [Bug #12409]
+	  -fexcess-precision=standard and -fp-model precise are set to this now.
+
+	* configure.in (cflags): use ruby_cflags.
+
+Tue May 24 16:20:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (ERRORFUNC, WARNINGFUNC): __error__ and __warning__
+	  attributes take a parenthesized string literal.
+
+Tue May 24 12:35:56 2016  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* common.mk: sort lines, and add missing dependencies suggested
+	  by tool/update-deps
+
+Mon May 23 21:33:36 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/missing.h (isfinite): move from numeric.c.
+
+Mon May 23 21:09:06 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/ossl.c (Init_openssl): Avoid reference to unset global
+	  variable. ossl_raise() may be called before dOSSL is set. Since
+	  global variables default to 0 and the default value of dOSSL set in
+	  Init_openssl() is also Qfalse, there is no real issue but confusing.
+	  Patch by Bertram Scharpf <software@bertram-scharpf.de>
+	  [ruby-core:58264] [Bug #9101]
+
+Mon May 23 20:32:16 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/ossl_asn1.c, ext/openssl/ossl_bn.c,
+	  ext/openssl/ossl_cipher.c, ext/openssl/ossl_digest.c
+	  ext/openssl/ossl_engine.c, ext/openssl/ossl_ns_spki.c
+	  ext/openssl/ossl_pkcs12.c, ext/openssl/ossl_pkcs7.c
+	  ext/openssl/ossl_pkey.c, ext/openssl/ossl_pkey_ec.c
+	  ext/openssl/ossl_rand.c, ext/openssl/ossl_ssl.c
+	  ext/openssl/ossl_x509attr.c, ext/openssl/ossl_x509cert.c
+	  ext/openssl/ossl_x509ext.c, ext/openssl/ossl_x509store.c: Use
+	  StringValueCStr() where NUL-terminated string is expected.
+
+Mon May 23 20:20:12 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (isfinite): get rid of a warning on
+	  cygwin. [Bug #12417][ruby-core:75691]
+
+Mon May 23 19:41:27 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/ossl_rand.c (ossl_rand_egd, ossl_rand_egd_bytes):
+	  RAND_egd{_bytes,}() return -1 on failure, not 0.
+	  Patch by cremno phobia <cremno@mail.ru>
+	  [ruby-core:63795] [Bug #10053]
+	  (ossl_pseudo_bytes): Similar, RAND_pseudo_bytes() may return 0 or
+	  -1 on failure.
+
+Mon May 23 15:52:07 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (isfinite): isfinite does not always
+	  exist.  fixed build error on Windows introduced at r55123.
+
+Mon May 23 13:19:41 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (rb_scan_args0): make compile error if the
+	  format is wrong or does not match with the variable argument
+	  length if possible.
+
+Mon May 23 12:47:09 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (rb_scan_args0): raise fatal error if
+	  variable argument length does not match, it is a bug in the code
+	  which uses rb_scan_args, not a runtime error.
+
+Mon May 23 12:30:29 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (GetVpValueWithPrec): consider
+	  non-finite float values not to raise FloatDomainError.
+	  [ruby-core:75682] [Bug #12414]
+
+Mon May 23 12:21:18 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* array.c (rb_ary_fill): suppress warnings: 'item' may be used
+	  uninitialized in this function
+
+Mon May 23 07:41:49 2016  Eric Wong  <e@80x24.org>
+
+	* dir.c (dir_close): update RDoc for 2.3 #close change
+	  [ruby-core:75679] [Bug #12413]
+
+Sun May 22 20:01:21 2016  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/timeridconv.rb: use finalizer trick instead of thread.
+
+	* test/drb/ut_timerholder.rb: ditto.
+
+Sun May 22 17:25:18 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* test/ruby/enc/test_case_options.rb: adjust test class name
+	  to match file name
+
+Sun May 22 17:24:07 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* rename test/ruby/enc/test_casing_options.rb to test_case_options.rb
+	  for consistency
+
+Sun May 22 17:06:55 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* transcode.c (enc_arg, str_transcode_enc_args, econv_args):
+	  remove volatile, and add GC guards in callers.
+	  [ruby-core:75664] [Bug #12411]
+
+Sun May 22 16:27:00 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/-test-/integer/core_ext.c: move testutil/integer.c.
+
+	* test/lib/-test-/integer.rb: extract implementation details from
+	  test/unit/assertions.rb.  [Bug #12408]
+
+Sun May 22 14:57:43 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* include/ruby/oniguruma.h: Extend OnigEncodingTypeDefine to define a
+	  new encoding primitive 'case_map' for case mapping
+
+	* enc/utf-8.c, utf_16be/le.c, utf_32be/le.c:
+	  add onigenc_unicode_case_map as case_map primitive
+
+	* enc/ascii.c, big5.c, cp949.c, emacs_mule.c, euc_jp/kr/tw.c, gb18030.c,
+	  gbk.c, iso_8859_1/2/3/4/5/6/7/8/9/10/11/13/14/15/16.c, koi8_r/u.c,
+	  shift_jis.c, us_ascii.c, windows_1250/1251/1252.c:
+	  add onigenc_not_support_case_map as case_map primitive
+
+Sun May 22 14:45:45 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* regenc.h/c: Define new function onigenc_not_support_case_map
+
+Sun May 22 12:14:06 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* include/ruby/ruby.h (rb_scan_args): use original rb_scan_args
+	  when fmt is dynamic.
+
+Sun May 22 11:41:12 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* class.c (rb_scan_args): moved to bottom of the file to make the
+	  effect of `#undef rb_scan_args` the minimum.
+
+	* include/ruby/ruby.h (rb_scan_args): overwrite only if GCC and
+	  optimized. Visual C++ 14 or later can compile it but make it
+	  conservative.
+
+Sat May 21 22:45:50 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/ruby.h (rb_scan_args): don't use ALWAYS_INLINE with
+	  `inline`.  if gcc needs this duplication, do in ALWAYS_INLINE macro.
+
+Sat May 21 21:11:56 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* include/ruby/ruby.h (rb_scan_args): use __VA_ARGS__ instead of
+	  va_arg to allow compilers optimize more aggressive.
+	  https://gustedt.wordpress.com/2011/07/10/avoid-writing-va_arg-functions/
+	  rb_scan_args is now expected to be statically resolved.
+
+Sun May 22 02:41:52 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/zlib/zlib.c: remove hacky macro introduced at r30437.
+
+	* ext/zlib/zlib.c (gzfile_make_header): cast as long (instead of int).
+
+	* ext/zlib/zlib.c (gzfile_make_footer): ditto.
+
+Sat May 21 21:07:18 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in (ALWAYS_INLINE): force compilers the function inlined.
+
+Sat May 21 16:16:03 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/ossl_ssl.c (ossl_ssl_stop): Don't free the SSL struct
+	  here. Since some methods such as SSLSocket#connect releases GVL,
+	  there is a chance of use after free if we free the SSL from another
+	  thread. SSLSocket#stop was documented as "prepares it for another
+	  connection" so this is a slightly incompatible change. However when
+	  this sentence was added (r30090, Add toplevel documentation for
+	  OpenSSL, 2010-12-06), it didn't actually. The current behavior is
+	  from r40304 (Correct shutdown behavior w.r.t GC., 2013-04-15).
+	  [ruby-core:74978] [Bug #12292]
+
+	* ext/openssl/lib/openssl/ssl.rb (sysclose): Update doc.
+
+	* test/openssl/test_ssl.rb: Test this.
+
+Sat May 21 14:41:14 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/ossl.c: [DOC] Fix SSL client example. The variable name
+	  was wrong. Patch by Andreas Tiefenthaler <at@an-ti.eu> (@pxlpnk).
+	  [GH ruby/openssl#32]
+
+Sat May 21 14:25:38 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/ossl_pkey_ec.c: rename PKey::EC#private_key? and
+	  #public_key? to #private? and #public? for consistency with other
+	  PKey types. Old names remain as alias.  [ruby-core:45541] [Bug #6567]
+
+	* test/openssl/test_pkey_ec.rb (test_check_key): check private? and
+	  public? works correctly.
+
+Sat May 21 12:40:36 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/lib/openssl/buffering.rb (read_nonblock, readpartial):
+	  Remove impossible EOFError raise. Patch by Zach Anker
+	  <zanker@squareup.com>.  [GH ruby/openssl#23]
+
+Sat May 21 11:18:42 2016  Evgeni Golov  <evgeni@golov.de>
+
+	* lib/ipaddr.rb: [DOC] fix documentation of IN6MASK to mention
+	  IPv6.  [Fix GH-1349]
+
+Sat May 21 11:12:53 2016  Dan Martinez  <dfm@razorwind.org>
+
+	* io.c (Init_IO): [DOC] define dummy ARGF instead of ARGF.class to
+	  re-enable the generation of ARGF documentation.  [Fix GH-1358]
+
+Sat May 21 11:07:29 2016  0x01f7  <souk.0x01f7@gmail.com>
+
+	* doc/syntax/methods.rdoc (Method Names): add proper closing tag.
+	  [Fix GH-1356]
+
+Sat May 21 09:26:28 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_CHECK_SETJMP): fix missing macro definition
+	  for the configured result.  fix up r55021.
+
+Sat May 21 00:36:32 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (rb_execarg_commandline): build command line string
+	  from argument vector in rb_execarg.
+	  [ruby-core:75611] [Bug #12398]
+
+Fri May 20 23:25:42 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/ossl.c (ossl_pem_passwd_value): Added. Convert the
+	  argument to String with StringValue() and validate the length is in
+	  4..PEM_BUFSIZE. PEM_BUFSIZE is a macro defined in OpenSSL headers.
+	  (ossl_pem_passwd_cb): When reading/writing encrypted PEM format, we
+	  used to pass the password to PEM_def_callback() directly but it was
+	  problematic. It is not NUL character safe. And surprisingly, it
+	  silently truncates the password to 1024 bytes.  [GH ruby/openssl#51]
+
+	* ext/openssl/ossl.h: Add function prototype declaration of newly
+	  added ossl_pem_passwd_value().
+
+	* ext/openssl/ossl_pkey.c (ossl_pkey_new_from_data): Use
+	  ossl_pem_passwd_value() to validate the password String.
+
+	* ext/openssl/ossl_pkey_dsa.c (ossl_dsa_initialize, ossl_dsa_export):
+	  ditto.
+
+	* ext/openssl/ossl_pkey_ec.c (ossl_ec_key_initialize,
+	  ossl_ec_key_to_string): ditto.
+
+	* ext/openssl/ossl_pkey_rsa.c (ossl_rsa_initialize, ossl_rsa_export):
+	  ditto.
+
+	* test/openssl/test_pkey_{dsa,ec,rsa}.rb: test this.
+
+Fri May 20 23:45:53 2016  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* id_table.c (list_id_table_init): When unaligned word access is
+	  prohibited and sizeof(VALUE) is 8 (64-bit machines),
+	  capa should always be even number for 8-byte word alignment
+	  of the values of a table. This code assumes that sizeof(ID) is 4,
+	  sizeof(VALUE) is 8, and xmalloc() returns 8-byte aligned memory.
+	  This fixes bus error on 64-bit SPARC Solaris 10.
+	  [Bug #12406][ruby-dev:49631]
+
+Fri May 20 22:30:09 2016  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* symbol.h (rb_id2sym): Use HAVE_BUILTIN___BUILTIN_CONSTANT_P
+
+Fri May 20 22:19:00 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* ext/date/date_core.c: [DOC] fix typos.
+	  [fix GH-1360] patched by @soundasleep
+
+Fri May 20 21:26:58 2016  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* include/ruby/defines.h (RB_GNUC_EXTENSION, RB_GNUC_EXTENSION_BLOCK):
+	  macros for skipping __extension__ on non-GCC compilers.
+	* eval_error.c (warn_print): use RB_GNUC_EXTENSION_BLOCK instead of
+	  __extension__ because __extension__ is a GNU extension.
+	  Fix compile error on Solaris 10 with Oracle Solaris Studio 12.x.
+	  [Bug #12397] [ruby-dev:49629].
+	* internal.h (rb_fstring_cstr, rb_fstring_enc_cstr): ditto
+	* include/ruby/encoding.h (rb_enc_str_new, rb_enc_str_new_cstr): ditto
+	* include/ruby/intern.h (rb_str_new, rb_str_new_cstr,
+	  rb_usascii_str_new, rb_utf8_str_new, rb_tainted_str_new_cstr,
+	  rb_usascii_str_new_cstr, rb_utf8_str_new_cstr,
+	  rb_external_str_new_cstr, rb_locale_str_new_cstr,
+	  rb_str_buf_new_cstr, rb_str_cat_cstr, rb_exc_new_cstr): ditto
+
+Fri May 20 21:17:13 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/win32ole/win32ole.c (fole_missing): make substring or dup to
+	  share the content if possible.
+
+Fri May 20 19:48:48 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* internal.h (NEW_PARTIAL_MEMO_FOR): shrink buffer array not to
+	  mark non-VALUE fields.  fix check_rvalue_consistency abort with
+	  RGENGC_CHECK_MODE=2.
+
+	* internal.h (NEW_CMP_OPT_MEMO): exclude struct cmp_opt_data from
+	  the valid array range.
+
+	* enum.c (slicewhen_i): exclude inverted too.
+
+Thu May 19 21:21:57 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* re.c (rb_reg_match_m_p): [DOC] fix return value in rdoc.
+
+	* test/ruby/test_regexp.rb (TestRegexp#test_match_p): add some
+	  tests from document.
+
+Thu May 19 13:22:44 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/ossl.c (Init_openssl): register an ex_data index for
+	  X509_STORE and X509_STORE_CTX respectively. Since they don't share
+	  the ex_data index registry, we can't use the same index.
+	  (ossl_verify_cb): use the correct index.
+
+	* ext/openssl/ossl_ssl.c (ossl_ssl_verify_callback): ditto.
+
+	* ext/openssl/ossl_x509store.c (ossl_x509store_set_vfy_cb): ditto.
+	  (ossl_x509stctx_verify): ditto.
+
+	* ext/openssl/ossl.h (void ossl_clear_error): add extern declarations
+	  of ossl_store_{ctx_,}ex_verify_cb_idx.
+
+	* ext/openssl/openssl_missing.c: remove X509_STORE_set_ex_data and
+	  X509_STORE_get_ex_data.
+
+	* ext/openssl/openssl_missing.h: implement X509_STORE_get_ex_data,
+	  X509_STORE_set_ex_data and X509_STORE_get_ex_new_index as macros.
+
+Thu May 19 13:11:35 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/ossl_x509attr.c (ossl_x509attr_set_value): check that the
+	  argument is an OpenSSL::ASN1::Data before converting to ASN1_TYPE.
+	  This fixes SEGV on OpenSSL::X509::Attribute#value=(non-asn1-value).
+
+	* test/openssl/test_x509attr.rb: add tests for OpenSSL::X509::Attribute.
+
+Thu May 19 12:10:10 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* re.c (rb_reg_match_m_p): fix match against empty string.
+	  rb_str_offset returns the end when the position exceeds the
+	  length.  fix the range parameter of onig_search.
+	  [ruby-core:75604] [Bug #12394]
+
+Thu May 19 11:37:36 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* re.c (rb_reg_match_m_p): should return false if no match, as the
+	  document says.  [Feature #8110]
+
+Thu May 19 00:17:01 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* re.c (reg_names_iter): specify capacify
+
+Wed May 18 21:29:59 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* thread.c (recursive_list_access): a object id may be a Bignum.  so,
+	  the list must be a objhash, instead of a identhash.
+	  this fixes many test errors on mswin64 CI.
+
+Wed May 18 19:33:54 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* re.c (rb_reg_match_m_p): Introduce Regexp#match?, which returns
+	  bool and doesn't save backref.
+
+Wed May 18 16:52:03 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/ossl_pkcs12.c (ossl_pkcs12_initialize): pop errors
+	  leaked by PKCS12_parse(). This is a bug in OpenSSL, which exists
+	  in the versions before the version 1.0.0t, 1.0.1p, 1.0.2d.
+
+Wed May 18 16:04:54 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/downloader.rb (Downloader::RubyGems.download): verify gems
+	  only if RubyGems is 2.4 or later.  old RubyGems fails to verify
+	  almost all of bundled gems.
+
+Wed May 18 14:52:38 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_modify_expand): check integer overflow.
+	  [ruby-core:75592] [Bug #12390]
+
+Wed May 18 13:11:44 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* re.c (match_ary_subseq): get subseq of match array without creating
+	  temporary array.
+
+	* re.c (match_ary_aref): get element(s) of match array without creating
+	  temporary array.
+
+	* re.c (match_aref): Use match_ary_subseq with handling irregulars.
+
+	* re.c (match_values_at): Use match_ary_aref.
+
+Wed May 18 13:03:07 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/ossl_x509cert.c (ossl_x509_verify): X509_verify()
+	  family may put errors on 0 return (0 means verification failure).
+	  Clear OpenSSL error queue before return to Ruby. Since the queue is
+	  thread global, remaining errors in the queue can cause an unexpected
+	  error in the next OpenSSL operation.  [ruby-core:48284] [Bug #7215]
+
+	* ext/openssl/ossl_x509crl.c (ossl_x509crl_verify): ditto.
+
+	* ext/openssl/ossl_x509req.c (ossl_x509req_verify): ditto.
+
+	* ext/openssl/ossl_x509store.c (ossl_x509stctx_verify): ditto.
+
+	* ext/openssl/ossl_pkey_dh.c (dh_generate): clear the OpenSSL error
+	  queue before re-raising exception.
+
+	* ext/openssl/ossl_pkey_dsa.c (dsa_generate): ditto.
+
+	* ext/openssl/ossl_pkey_rsa.c (rsa_generate): ditto.
+
+	* ext/openssl/ossl_ssl.c (ossl_start_ssl): ditto.
+
+	* test/openssl: check that OpenSSL.errors is empty every time after
+	  running a test case.
+
+Wed May 18 12:07:42 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/ossl.c (ossl_clear_error): Extracted from
+	  ossl_make_error(). This prints errors in the OpenSSL error queue if
+	  OpenSSL.debug is true, and clears the queue.
+	  (ossl_make_error): use ossl_clear_error().
+
+	* ext/openssl/ossl.h: add prototype declaration of ossl_make_error().
+	  (OSSL_BIO_reset) use ossl_clear_error() to clear the queue. Clearing
+	  silently makes debugging difficult.
+
+	* ext/openssl/ossl_engine.c (ossl_engine_s_by_id): ditto.
+
+	* ext/openssl/ossl_ns_spki.c (ossl_spki_initialize): ditto.
+
+	* ext/openssl/ossl_pkcs7.c (ossl_pkcs7_verify): ditto.
+
+	* ext/openssl/ossl_pkey_dsa.c (ossl_dsa_initialize): ditto.
+
+	* ext/openssl/ossl_pkey_ec.c (ossl_ec_key_initialize): ditto.
+	  (ossl_ec_group_initialize): ditto.
+
+	* ext/openssl/ossl_ssl.c (ossl_ssl_shutdown): ditto.
+
+Wed May 18 11:53:49 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/ossl_pkey_ec.c (ossl_ec_point_mul): Validate the
+	  arguments before passing to EC_POINT(s)_mul(). Add description of this
+	  method.  [ruby-core:65152] [Bug #10268]
+
+	* test/openssl/test_pkey_ec.rb (test_ec_point_mul): Test that
+	  OpenSSL::PKey::EC::Point#mul works.
+
+Wed May 18 11:19:59 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/ossl_bn.c (try_convert_to_bnptr): Extracted from
+	  GetBNPtr(). This doesn't raise exception but returns NULL on error.
+	  (GetBNPtr): Raise TypeError if conversion fails.
+	  (ossl_bn_eq): Implement BN#==.
+	  (ossl_bn_eql): #eql? should not raise TypeError even if the argument
+	  is not compatible with BN.
+	  (ossl_bn_hash): Implement BN#hash.
+
+	* ext/openssl/ossl_bn.c (Init_ossl_bn): Define #== and #hash.
+
+	* test/openssl/test_bn.rb: Test BN#eql?, #== and #hash
+
+Wed May 18 10:17:41 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (RB_INTEGER_TYPE_P): new macro and
+	  underlying inline function to check if the object is an
+	  Integer (Fixnum or Bignum).
+
+Wed May 18 09:52:00 2016  Kenta Murata  <mrkn@mrkn.jp>
+
+	* enum.c (enum_sum, hash_sum, hash_sum_i, enum_sum_i, sum_iter):
+	  Optimize for hashes when each method isn't redefined.
+
+Wed May 18 09:14:00 2016  Kenta Murata  <mrkn@mrkn.jp>
+
+	* enum.c (enum_sum, int_range_sum): Extract int_range_sum from
+	  enum_sum.
+
+Wed May 18 03:16:06 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* re.c (match_values_at): fix regression at r55036.
+	  MatchData#values_at accepts Range.
+
+Wed May 18 02:02:58 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* re.c (match_aref): remove useless condition and call rb_fix2int.
+	  rb_reg_nth_match handles negative index.
+
+Wed May 18 01:57:43 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* re.c (match_values_at): MatchData#values_at supports named captures
+	  [Feature #9179]
+
+	* re.c (namev_to_backref_number): separated.
+
+Wed May 18 00:05:00 2016  Kenta Murata  <mrkn@mrkn.jp>
+
+	* enum.c (enum_sum): Optimize for a range from int to int.
+
+	* test/ruby/test_enum.rb (test_range_sum): Move from test_range.rb,
+	  and add assertions for some conditions.
+
+	* test/ruby/test_enum.rb (test_hash_sum): Move from test_hash.rb.
+
+	* test/ruby/test_hash.rb, test/ruby/test_range.rb: Remove test_sum.
+
+Tue May 17 23:08:00 2016  Kenta Murata  <mrkn@mrkn.jp>
+
+	* enum.c (enum_sum): [DOC] Write documentation.
+
+Tue May 17 22:53:00 2016  Kenta Murata  <mrkn@mrkn.jp>
+
+	* enum.c (enum_sum): Implement Enumerable#sum.
+
+	* test/ruby/test_enum.rb (test_sum): Test sum for Enumerable.
+
+	* test/ruby/test_hash.rb (test_sum): Test sum for Hash.
+
+	* test/ruby/test_range.rb (test_sum): Test sum for Range.
+
+Tue May 17 22:11:41 2016  Tanaka Akira  <akr@fsij.org>
+
+	* object.c, numeric.c, enum.c, ext/-test-/bignum/mul.c,
+	  lib/rexml/quickpath.rb, lib/rexml/text.rb, lib/rexml/xpath_parser.rb,
+	  lib/rubygems/specification.rb, lib/uri/generic.rb,
+	  bootstraptest/test_eval.rb, basictest/test.rb,
+	  test/-ext-/bignum/test_big2str.rb, test/-ext-/bignum/test_div.rb,
+	  test/-ext-/bignum/test_mul.rb, test/-ext-/bignum/test_str2big.rb,
+	  test/csv/test_data_converters.rb, test/date/test_date.rb,
+	  test/json/test_json_generate.rb, test/minitest/test_minitest_mock.rb,
+	  test/openssl/test_cipher.rb, test/rexml/test_jaxen.rb,
+	  test/ruby/test_array.rb, test/ruby/test_basicinstructions.rb,
+	  test/ruby/test_bignum.rb, test/ruby/test_case.rb,
+	  test/ruby/test_class.rb, test/ruby/test_complex.rb,
+	  test/ruby/test_enum.rb, test/ruby/test_eval.rb,
+	  test/ruby/test_iseq.rb, test/ruby/test_literal.rb,
+	  test/ruby/test_math.rb, test/ruby/test_module.rb,
+	  test/ruby/test_numeric.rb, test/ruby/test_range.rb,
+	  test/ruby/test_rational.rb, test/ruby/test_refinement.rb,
+	  test/ruby/test_rubyvm.rb, test/ruby/test_struct.rb,
+	  test/ruby/test_variable.rb, test/rubygems/test_gem_specification.rb,
+	  test/thread/test_queue.rb: Use Integer instead of Fixnum and Bignum.
+
+Tue May 17 15:26:10 2016  Tanaka Akira  <akr@fsij.org>
+
+	* [Feature #12005] Unify Fixnum and Bignum into Integer
+
+	* include/ruby/ruby.h (rb_class_of): Return rb_cInteger for fixnums.
+
+	* insns.def (INTEGER_REDEFINED_OP_FLAG): Unified from
+	  FIXNUM_REDEFINED_OP_FLAG and BIGNUM_REDEFINED_OP_FLAG.
+
+	* vm_core.h: Ditto.
+
+	* vm_insnhelper.c (opt_eq_func): Use INTEGER_REDEFINED_OP_FLAG instead
+	  of FIXNUM_REDEFINED_OP_FLAG.
+
+	* vm.c (vm_redefinition_check_flag): Use rb_cInteger instead of
+	  rb_cFixnum and rb_cBignum.
+	  (C): Use Integer instead of Fixnum and Bignum.
+
+	* numeric.c (fix_succ): Removed.
+	  (Init_Numeric): Define Fixnum as Integer.
+
+	* bignum.c (bignew): Use rb_cInteger instead of rb_cBignum.
+	  (rb_int_coerce): replaced from rb_big_coerce and return fixnums
+	  as-is.
+	  (Init_Bignum): Define Bignum as Integer.
+	  Don't define ===.
+
+	* error.c (builtin_class_name): Return "Integer" for fixnums.
+
+	* sprintf.c (ruby__sfvextra): Use rb_cInteger instead of rb_cFixnum.
+
+	* ext/-test-/testutil: New directory to test.
+	  Currently it provides utilities for fixnum and bignum.
+
+	* ext/json/generator/generator.c: Define mInteger_to_json.
+
+	* lib/mathn.rb (Fixnum#/): Redefinition removed.
+
+Tue May 17 11:58:58 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_CHECK_BUILTIN_SETJMP): declare t as NORETURN
+	  to suppress warnings by -Wsuggest-attribute=noreturn.
+	  [ruby-core:75510] [Bug #12383]
+
+Tue May 17 10:40:18 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_CHECK_SETJMP): needs the header and proper
+	  arguments for builtin setjmp functions.
+
+Mon May 16 20:00:30 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/unicode.h: Additional uses of ONIG_CASE_MAPPING compilation switch
+
+Mon May 16 19:46:33 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* include/ruby/oniguruma.h: Introducing ONIG_CASE_MAPPING compilation
+	  switch
+
+	* include/ruby/oniguruma.h, enc/unicode.h: Using ONIG_CASE_MAPPING
+	  compilation switch
+
+Mon May 16 19:29:31 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* gems/bundled_gems: Update xmlrpc-0.1.1. xmlrpc-0.1.0 didn't allow
+	  to install on 2.4.0dev.
+
+Mon May 16 13:28:59 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (FUNC_STDCALL, FUNC_CDECL, FUNC_FASTCALL): set
+	  macro names explicitly to the old names, which are accidentally
+	  changed at r54985, for backward compatibilities.
+	  fiddle also depends on these names to fallback to ANSI names.
+	  [ruby-core:75494] [Bug #12377]
+
+Mon May 16 11:39:02 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* lib/xmlrpc.rb, lib/xmlrpc/*, test/xmlrpc: XMLRPC is bundled gem
+	  on Ruby 2.4. It is extracted to https://github.com/ruby/xmlrpc
+	  [Feature #12160][ruby-core:74239]
+	* gems/bundled_gems: ditto.
+
+Mon May 16 06:06:21 2016  Eric Wong  <e@80x24.org>
+
+	* proc.c: fix RDoc of Proc#===/call/yield/[]
+	  [Bug #12332]
+
+Sun May 15 20:55:31 2016  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/timeridconv.rb: don't use keeper thread. [Bug #12342]
+
+	* test/drb/ut_timerholder.rb: ditto.
+
+Sun May 15 16:15:25 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* array.c (rb_ary_entry): extract rb_ary_elt to organize if-conditions
+	  and check whether is embedded at once.
+
+Sun May 15 10:57:26 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_get_ev_const): warn deprecated constant even
+	  in the class context.  [ruby-core:75505] [Bug #12382]
+
+Sun May 15 03:13:01 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* iseq.h (struct iseq_compile_data): use struct rb_id_table
+	  instead of st_table.
+
+	* iseq.c (prepare_iseq_build): don't allocate ivar_cache_table
+	  until it has at least one element.
+
+	* iseq.c (compile_data_free): free ivar_cache_table only if it
+	  is allocated.
+
+	* compile.c (get_ivar_ic_value): allocate if the table is not
+	  allocated yet.
+
+Sat May 14 09:04:34 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (pkg_config): use xsystem consistently to set up
+	  library path environment variable as well as latter pkg-config
+	  calls.  [ruby-dev:49619] [Bug #12379]
+
+Sat May 14 00:16:54 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* random.c (make_seed_value): append leading-zero-guard and get
+	  rid of making a local copy of the seed.
+
+Fri May 13 08:46:42 2016  cremno  <cremno@mail.ru>
+
+	* NEWS: drop FreeBSD < 4 support.  [Fix GH-1339]
+	  The most recent version affected by this is 3.5 and was released
+	  in 2000.
+	  https://www.freebsd.org/releases/3.5R/announce.html
+	  https://en.wikipedia.org/wiki/History_of_FreeBSD#Version_history
+
+Fri May 13 03:12:09 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* include/ruby/defines.h (GCC_VERSION_SINCE): moved from internal.h.
+
+Fri May 13 03:11:20 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in (__builtin_constant_p): check.
+
+	* internal.h: Use HAVE_BUILTIN___BUILTIN_CONSTANT_P
+
+Fri May 13 03:10:39 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: use alternative keyword
+	  to avoid macros conflicts with them.
+
+Thu May 12 01:54:08 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (try_func): get rid of conflict of declarations of
+	  main().  checking local symbol reference does not make sense.
+
+Thu May 12 00:18:19 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (HAVE_QSORT_S): use qsort_s only for Visual Studio
+	  2012 or later, because VS2010 seems to causes a SEGV in
+	  test/ruby/test_enum.rb.
+
+Wed May 11 23:59:47 2016  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_getivar): describe fast-path explicit
+	  (compiler friendly). [Bug #12274].
+
+Wed May 11 21:30:07 2016  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* compile.c (iseq_compile_each): share InlineCache during same
+	  instance variable accesses. Reducing memory consumption,
+	  rising cache hit rate and rising branch prediction hit rate
+	  are expected. A part of [Bug #12274].
+
+	* iseq.h (struct iseq_compile_data): introduce instance
+	  variable IC table for sharing.
+
+	* iseq.c (prepare_iseq_build, compile_data_free):
+	  construct/destruct above table.
+
+Wed May 11 17:18:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* util.c (ruby_qsort): use qsort_s if available, for Microsoft
+	  Visual Studio 2005 (msvcr80.dll) and mingw.
+
+Wed May 11 10:33:26 2016  Marcus Stollsteimer  <sto.mar@web.de>
+
+	* COPYING: Remove trailing-whitespaces.
+	  [ci skip][fix GH-1348]
+
+Tue May 10 21:05:45 2016  Benoit Daloze  <eregontp@gmail.com>
+
+	* insns.def (defineclass): Also raise an error when redeclaring the
+	  superclass of a class as Object and it has another superclass.
+	  [Bug #12367] [ruby-core:75446]
+
+	* test/ruby/test_class.rb: test for above.
+
+Tue May 10 14:57:09 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* random.c (obj_random_bytes): base on bytes method instead of
+	  rand method, not to call toplevel rand method.
+
+Tue May 10 13:07:28 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in (-fexcess-precision=standard): before r54895 -std=c99
+	  is specified and it implied -fexcess-precision=standard.
+	  Now with -std=gnu99, it should be explicitly specified.
+	  https://gcc.gnu.org/onlinedocs/gcc/Optimize-Options.html
+
+Mon May  9 10:51:59 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (rb_thread_atfork_internal): move th to an argument.
+
+	* thread.c (rb_thread_atfork): do not repeat GET_THREAD().
+
+Mon May  9 10:46:36 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (rb_thread_atfork, rb_thread_atfork_before_exec): do
+	  nothing unless working fork is available.
+
+	* thread_sync.c (rb_mutex_abandon_all): define only if working
+	  fork is available.
+
+	* thread_sync.c (rb_mutex_abandon_keeping_mutexes): ditto.
+
+	* thread_sync.c (rb_mutex_abandon_locking_mutex): ditto.
+
+	* thread_win32.c (gvl_init): never used.
+
+Mon May  9 07:18:06 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/{defines,ruby}.h: need to define function attributes
+	  alternatives in defines.h instead of ruby.h, because they are used
+	  in oniguruma.h and the header used without including ruby.h at
+	  encoding library sources.
+
+Mon May  9 06:30:12 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/ruby.h (CONSTFUNC, PUREFUNC): fixed build errors on
+	  non-gcc build environments introduced at r54952.
+
+Mon May  9 02:51:51 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* gc.c (rb_gc_unprotect_logging): throw rb_memerror when it cannot
+	  allocate memory. This is pointed out by Facebook's Infer.
+
+	* gc.c (gc_prof_setup_new_record): ditto.
+
+	* regparse.c (parse_regexp): ditto.
+
+	* util.c (MALLOC): use xmalloc and xfree like above.
+
+Mon May  9 02:39:16 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: check function attribute const and pure,
+	  and define CONSTFUNC and PUREFUNC if available.
+	  Note that I don't add those options as default because
+	  it still shows many false-positive (it seems not to consider
+	  longjmp).
+
+	* vm_eval.c (stack_check): get rb_thread_t* as an argument
+	  to avoid duplicate call of GET_THREAD().
+
+Sun May  8 21:01:14 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/openssl/extconf.rb: assume it doesn't have SSLv2 related
+	  functions when OPENSSL_NO_SSL2 is defined.
+	  Usually openssl's header and the library (libssl) have the same
+	  set of functions, but on some environment the library has functions
+	  whose headers doesn't declare. (openssl/opensslconf.h and libssl.so
+	  aren't be synchronized)
+	  To detect such case explicitly check feature macro and remove
+	  related functions.
+
+Sun May  8 18:51:33 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_home_dir_of): return the default home path if the
+	  user name is the current user name, on platforms where struct
+	  pwd is not supported.  a temporary measure against
+	  [Bug #12226].
+
+Sun May  8 08:51:38 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: add -Wsuggest-attribute=format and suppress warnings.
+
+Sun May  8 08:31:03 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: add -Wsuggest-attribute=noreturn and suppress warnings.
+
+Sun May  8 08:19:16 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: add -Werror=implicit-int to avoid missing type of
+	  function declaration.
+
+Sat May  7 22:22:37 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* lib/webrick/ssl.rb: Accept string value for SSLCertName. It is used
+	  to invoke ssl server with command line.
+	  [fix GH-1329] Patch by @kerlin
+	* test/webrick/test_ssl_server.rb: Added test for GH-1329
+
+Sat May  7 21:55:12 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* test/webrick/test_ssl_server.rb: Added basic test for `webrick/ssl`
+
+Sat May  7 16:22:13 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* random.c (int_pair_to_real_inclusive): optimize to multiply
+	  without Bignum.
+
+Sat May  7 07:58:02 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (rb_exec_getargs): honor the expected argument types
+	  over the conversion method.  the basic language functionality
+	  should be robust.  [ruby-core:75388] [Bug #12355]
+
+Fri May  6 08:16:26 2016  David Silva  <david.silva@digital.cabinet-office.gov.uk>
+
+	* enum.c (enum_find): [DOC] add more examples to the documentation
+	  of Enumerable#detect, to show that it equals to Enumerable#find.
+	  [Fix GH-1340]
+
+Thu May  5 18:08:31 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
+
+	* test/ruby/test_complexrational.rb: Remove duplicated raise.
+
+Thu May  5 14:41:05 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
+
+	* string.c (rb_str_sub): Fix a special match variable name.
+	  [ci skip]
+
+Thu May  5 12:22:17 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (rb_eval_cmd, rb_catch_obj): use TH_JUMP_TAG with the
+	  same rb_thread_t used for TH_PUSH_TAG, instead of JUMP_TAG with
+	  the current thread global variable.
+
+Thu May  5 10:49:33 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* random.c (fill_random_bytes_syscall): use arc4random_buf if
+	  available.
+
+Wed May  4 23:13:58 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
+
+	* numeric.c (fix_plus): Remove rb_nucomp_add prototype
+	  declaration.
+
+	* numeric.c (fix_mul): Remove rb_nucomp_mul prototype
+	  declaration.
+
+	* internal.h (rb_nucomp_add, rb_nucomp_mul): add prototype
+	  declarations.
+
+Wed May  4 18:38:00 2016  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* lib/net/http/header.rb (Net::HTTPHeader#{each_header,each_name,
+	  each_capitalized_name,each_value,each_capitalized}): Return
+	  sized enumerators.
+
+	* test/net/http/test_httpheader.rb: add test for above.
+
+Wed May  4 17:53:15 2016  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* lib/set.rb (Set#{delete_if,keep_if,collect!,reject!,select!,classify,divide},
+	  SortedSet#{delete_if,keep_if}): Return sized enumerators.
+
+	* test/test_set.rb: add test for above.
+
+Tue May  3 23:25:48 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* numeric.c: [DOC] Update result of 123456789 ** -2.
+	  [ruby-dev:49606] [Bug #12339]
+
+Tue May  3 23:13:16 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
+
+	* internal.h (RCOMPLEX_SET_IMAG): undef RCOMPLEX_SET_IMAG
+	  instead of duplicated undef RCOMPLEX_SET_REAL.
+
+Tue May  3 22:55:07 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
+
+	* complex.c (rb_complex_set_imag): Fix to properly set imag
+	  of complex.
+
+Tue May  3 22:19:55 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in (warnflags): use -std=gnu99 instead of
+	  -std=iso9899:1999. [Feature #12336]
+
+Tue May  3 22:10:09 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (count_utf8_lead_bytes_with_word): Use __builtin_popcount
+	  only if it can use SSE 4.2 POPCNT whose latency is 3 cycle.
+
+	* internal.h (rb_popcount64): use __builtin_popcountll because now
+	  it is in fast path.
+
+Tue May  3 14:19:18 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (new_if_gen): set newline flag to NODE_IF to trace all
+	  if/elsif statements.  [ruby-core:67720] [Bug #10763]
+
+Tue May  3 05:35:54 2016  Eric Wong  <e@80x24.org>
+
+	* process.c (disable_child_handler_fork_child):
+	  initialize handler for SIGPIPE for !POSIX_SIGNAL
+
+Mon May  2 23:03:42 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c, include/ruby/win32.h (rb_w32_utruncate): implements new
+	  truncate alternative which accepts UTF-8 path.
+
+	* file.c (truncate): use above function.
+	  [Bug #12340]
+
+Mon May  2 20:59:21 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* re.c (str_coderange): to avoid function call when the string already
+	  has coderange information.
+
+	* re.c (rb_reg_prepare_enc): add shortcut path when the regexp has
+	  the same encoding of given string.
+
+	* re.c (rb_reg_prepare_re): avoid duplicated allocation of
+	  onig_errmsg_buffer.
+
+
+Mon May  2 12:34:52 2016  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_refinement.rb (test_inspect): Use Integer instead of
+	  Fixnum.
+
+Mon May  2 06:58:38 2016  Tanaka Akira  <akr@fsij.org>
+
+	* complex.c: Don't refer rb_cFixnum and rb_cBignum.
+	  (k_fixnum_p): Use FIXNUM_P.
+	  (k_bignum_p): Use RB_TYPE_P.
+
+Mon May  2 01:27:59 2016  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_numeric.rb (test_step): Use Integer::FIXNUM_MAX.
+
+Mon May  2 01:15:01 2016  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_module.rb (test_name): Use Integer instead of Fixnum.
+
+Mon May  2 01:00:04 2016  Tanaka Akira  <akr@fsij.org>
+
+	* test/lib/test/unit/assertions.rb (assert_fixnum): Defined.
+	  (assert_bignum): Defined.
+
+	* test/ruby/test_bignum.rb: Use assert_bignum.
+
+	* test/ruby/test_integer_comb.rb: Use assert_fixnum and assert_bignum.
+
+	* test/ruby/test_optimization.rb: Ditto.
+
+Mon May  2 00:41:53 2016  Tanaka Akira  <akr@fsij.org>
+
+	* vm_trace.c (recalc_remove_ruby_vm_event_flags): Add a cast to
+	  avoid signed integer overflow.
+
+Mon May  2 00:06:04 2016  Tanaka Akira  <akr@fsij.org>
+
+	* test/lib/envutil.rb: Define Integer::{FIXNUM_MIN,FIXNUM_MAX}.
+
+	* test/ruby/test_bignum.rb: Use Integer::{FIXNUM_MIN,FIXNUM_MAX}.
+
+	* test/ruby/test_bignum.rb: Ditto.
+
+	* test/ruby/test_integer_comb.rb: Ditto.
+
+	* test/ruby/test_marshal.rb: Ditto.
+
+	* test/ruby/test_optimization.rb: Ditto.
+
+Sun May  1 23:59:59 2016  Kenta Murata  <mrkn@mrkn.jp>
+
+	* array.c (rb_ary_sum): fix for mathn
+
+	* test/ruby/test_array.rb (test_sum): ditto.
+
+Sun May  1 23:51:54 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/lib/test/unit.rb (Options#non_options): fixed wrong regexp.
+	  if both positives and negatives were specified, positives had to
+	  be specified from the beginning.
+
+Sun May  1 21:00:07 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c: drop Win2K support.
+
+Sun May  1 20:39:47 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* cont.c, hash.c, random.c, win32/win32.c: cleanup some Win9x/ME/NT4
+	  support leftovers.
+	  [fix GH-1328] patched by @cremno
+
+Sun May  1 07:30:44 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (search_nonascii): use nlz on big endian environments.
+
+	* internal.h (nlz_intptr): defined.
+
+Sun May  1 00:03:30 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in (__builtin_ctz): check.
+
+	* configure.in (__builtin_ctzll): check.
+
+	* internal.h (rb_popcount32): defined for ntz_int32.
+	  it can use __builtin_popcount but this function is not used on
+	  GCC environment because it uses __builtin_ctz.
+	  When another function uses this, using __builtin_popcount
+	  should be re-considered.
+
+	* internal.h (rb_popcount64): ditto.
+
+	* internal.h (ntz_int32): defined for ntz_intptr.
+
+	* internal.h (ntz_int64): defined for ntz_intptr.
+
+	* internal.h (ntz_intptr): defined as ntz for uintptr_t.
+
+	* string.c (search_nonascii): unroll and use ntz.
+
+Sat Apr 30 21:54:13 2016  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (Init_Numeric): Gather Fixnum method definitions.
+
+Sat Apr 30 21:28:14 2016  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (rb_int_div): Define Integer#/.
+
+	* bignum.c (rb_big_div): Don't define Bignum#/.
+
+	* lib/mathn.rb (Integer#/): Replace Integer#/ instead of Bignum#/.
+
+Sat Apr 30 21:11:08 2016  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (rb_int_plus): Define Integer#+.
+
+	* bignum.c (rb_big_plus): Don't define Bignum#+.
+
+Sat Apr 30 21:01:20 2016  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (rb_int_minus): Define Integer#-.
+
+	* bignum.c (rb_big_minus): Don't define Bignum#-.
+
+Sat Apr 30 20:53:33 2016  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (rb_int_mul): Define Integer#*.
+
+	* bignum.c (rb_big_mul): Don't define Bignum#*.
+
+Sat Apr 30 20:30:44 2016  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (rb_int_modulo): Define Integer#%.
+
+	* bignum.c (rb_big_modulo): Don't define Bignum#%.
+
+Sat Apr 30 20:17:08 2016  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (int_equal): Define Integer#==.
+
+	* bignum.c (rb_big_eq): Don't define Bignum#==.
+
+Sat Apr 30 19:41:15 2016  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (int_gt): Define Integer#>.
+
+	* bignum.c (rb_big_gt): Don't define Bignum#>.
+	  Renamed from big_gt.
+
+	* internal.h (rb_big_gt): Declared.
+
+Sat Apr 30 19:24:40 2016  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (int_ge): Define Integer#>=.
+
+	* bignum.c (rb_big_ge): Don't define Bignum#>=.
+	  Renamed from big_ge.
+
+	* internal.h (rb_big_ge): Declared.
+
+Sat Apr 30 19:20:40 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* doc/standard_library.rdoc: Remove obsoleted classes and modules.
+
+Sat Apr 30 19:09:23 2016  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (int_lt): Define Integer#<.
+
+	* bignum.c (rb_big_lt): Don't define Bignum#<.
+	  Renamed from big_lt.
+
+	* internal.h (rb_big_lt): Declared.
+
+Sat Apr 30 18:44:05 2016  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (int_le): Define Integer#<=.
+
+	* bignum.c (rb_big_le): Don't define Bignum#<=.
+	  Renamed from big_le.
+
+	* internal.h (rb_big_le): Declared.
+
+Sat Apr 30 18:11:44 2016  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (Init_Bignum): Define Integer::GMP_VERSION.
+
+Sat Apr 30 16:58:18 2016  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (int_remainder): Define Integer#remainder.
+
+	* bignum.c (rb_big_remainder): Don't define Bignum#remainder.
+
+	* internal.h (rb_big_remainder): Declared.
+
+Sat Apr 30 15:29:24 2016  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (rb_int_uminus): {Fixnum,Bignum}#-@ is unified into
+	  Integer.
+
+	* bignum.c (rb_big_uminus): Don't define Bignum#-@.
+
+Sat Apr 30 14:42:20 2016  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (rb_int_idiv): {Fixnum,Bignum}#div is unified into
+	  Integer.
+
+	* bignum.c (rb_big_idiv): Don't define Bignum#div.
+
+Sat Apr 30 14:25:55 2016  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (rb_int_modulo): {Fixnum,Bignum}#modulo is unified into
+	  Integer.
+
+	* bignum.c (rb_big_modulo): Don't define Bignum#modulo.
+
+Sat Apr 30 14:04:30 2016  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (int_divmod): {Fixnum,Bignum}#divmod is unified into
+	  Integer.
+
+	* bignum.c (rb_big_divmod): Don't define Bignum#divmod.
+
+Sat Apr 30 13:20:00 2016  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (int_fdiv): {Fixnum,Bignum}#fdiv is unified into
+	  Integer.
+
+	* bignum.c (rb_big_fdiv): Don't define Bignum#fdiv.
+
+Sat Apr 30 12:25:43 2016  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (rb_int_pow): {Fixnum,Bignum}#** is unified into
+	  Integer.
+
+	* bignum.c (rb_big_pow): Don't define Bignum#**.
+
+Sat Apr 30 12:28:59 2016  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_big_comp): Renamed from rb_big_neg.
+
+	* numeric.c (fix_comp): Renamed from fix_rev.
+
+Sat Apr 30 12:25:43 2016  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (int_comp): {Fixnum,Bignum}#~ is unified into
+	  Integer.
+
+	* bignum.c (rb_big_neg): Don't define Bignum#~.
+
+	* internal.h (rb_big_neg): Declared.
+
+Sat Apr 30 12:07:42 2016  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (int_and): {Fixnum,Bignum}#& is unified into
+	  Integer.
+
+	* bignum.c (rb_big_and): Don't define Bignum#&.
+
+Sat Apr 30 11:56:15 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/thread: removed dummy extension library.  thread_sync.c
+	  provides "thread.rb" already.
+
+Sat Apr 30 11:53:48 2016  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (int_or): {Fixnum,Bignum}#| is unified into
+	  Integer.
+
+	* bignum.c (rb_big_or): Don't define Bignum#|.
+
+Sat Apr 30 11:18:47 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
+
+	* vm_trace.c: Fix typos. [ci skip]
+
+Sat Apr 30 10:09:04 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/pty/pty.c (establishShell): honor USER environment variable
+	  and login name over uid, one uid can be shared by some login
+	  names.
+
+Fri Apr 29 22:40:28 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* doc/maintainers.rdoc (ext/io/nonblock): still maintained, as
+	  well as ext/io/wait, which is the origin.
+
+Fri Apr 29 21:18:12 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* doc/maintainers.rdoc (ext/win32): of course, it's still maintained.
+
+Fri Apr 29 21:03:10 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* gems/bundled_gems: Update latest gems, test-unit-3.1.8 and rake-11.1.2.
+
+Fri Apr 29 20:43:02 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* doc/maintainers.rdoc: Update latest maintainers list on Ruby 2.4
+
+Fri Apr 29 19:52:45 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* doc/maintainers.rdoc: Removed deprecated entries. These are already deleted.
+
+Fri Apr 29 19:48:45 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* doc/maintainers.rdoc: Removed Ruby 1.8 entries. It's not necessary to
+	  Ruby 2.4 or later.
+
+Thu Apr 28 17:03:17 2016  Nicholas Maccharoli  <nmaccharoli@gmail.com>
+
+	* hash.c (rb_hash_update_{block,func}_callback): dry up hash
+	  update callback code.  [Fix GH-1338]
+
+Thu Apr 28 16:52:05 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* re.c (rb_reg_prepare_enc): use rb_enc_asciicompat(enc) instead of
+	  rb_enc_str_asciicompat_p(str) to avoid useless rb_enc_get(str) call.
+
+Thu Apr 28 16:33:41 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb: [DOC] fix example code.  base on the code by
+	  Semyon Gaivoronskiy in [ruby-core:75224].  [Bug #12323]
+
+Thu Apr 28 09:33:03 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update rubygems-2.6.4.
+	  Please see entries of 2.6.4 on
+	  https://github.com/rubygems/rubygems/blob/master/History.txt
+
+Thu Apr 28 04:49:07 2016  Rei Odaira  <Rei.Odaira@gmail.com>
+
+	* configure.in (rb_cv_lgamma_r_pm0): check if lgamma_r(+0.0)
+	  returns positive infinity, in addition to lgamma_r(-0.0).
+	  AIX returns an incorrect result of negative infinity.
+
+	* math.c (ruby_lgamma_r): handle +0.0, in addition to -0.0.
+
+Thu Apr 28 01:11:14 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* time.c: define _DEFAULT_SOURCE because glibc 2.20 deprecates
+	  _BSD_SOURCE.
+	  https://sourceware.org/glibc/wiki/Release/2.20
+
+Thu Apr 28 00:27:55 2016  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (int_xor): {Fixnum,Bignum}#^ is unified into
+	  Integer.
+
+	* bignum.c (rb_big_xor): Don't define Bignum#^.
+
+Wed Apr 27 20:53:59 2016  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (int_aref): {Fixnum,Bignum}#[] is unified into
+	  Integer.
+
+	* bignum.c (rb_big_aref): Don't define Bignum#<<.
+
+	* internal.h (rb_big_aref): Declared.
+
+Wed Apr 27 16:10:35 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/instruction.rb: fix to follow current implementation.
+
+Wed Apr 27 15:47:54 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_s_new): warn if a block is given,
+	  as well as IO.new.
+
+Wed Apr 27 14:29:47 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (ruby_only_for_internal_use): raise fatal error when
+	  deprecated function only for internal use is called, not just a
+	  warning.
+
+Tue Apr 26 23:42:30 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* tool/redmine-backporter.rb (rel): should not raise exceptions even if
+	  the user input is wrong.  only reports the error and continue process.
+
+Tue Apr 26 23:35:23 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (process_options): convert -e script to the encoding
+	  given by a command line option on Windows.  assume it is the
+	  expected encoding.  [ruby-dev:49461] [Bug #11900]
+
+Tue Apr 26 21:11:02 2016  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (rb_int_lshift): {Fixnum,Bignum}#<< is unified into
+	  Integer.
+
+	* bignum.c (rb_big_lshift): Don't define Bignum#<<.
+
+Tue Apr 26 20:59:40 2016  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (rb_int_rshift): {Fixnum,Bignum}#>> is unified into
+	  Integer.
+
+	* bignum.c (rb_big_rshift): Don't define Bignum#>>.
+
+Tue Apr 26 20:46:16 2016  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (int_size): {Fixnum,Bignum}#size is unified into Integer.
+
+	* bignum.c (rb_big_size_m): Don't define Bignum#size.
+
+	* internal.h (rb_big_size_m): Declared.
+
+Tue Apr 26 20:09:08 2016  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (rb_int_bit_length): {Fixnum,Bignum}#bit_length is
+	  unified into Integer.
+
+	* bignum.c (rb_big_bit_length): Don't define Bignum#bit_length.
+
+	* internal.h (rb_big_bit_length): Declared.
+
+Tue Apr 26 19:56:16 2016  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (int_abs): Integer#{abs,magnitude} moved from
+	  Fixnum and Bignum.
+
+	* bignum.c (rb_big_abs): Don't define Bignum#{abs,magnitude}.
+
+	* internal.h (rb_big_abs): Declared.
+
+Mon Apr 25 14:39:11 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/rbconfig/sizeof/extconf.rb: just check the existence of each
+	  types, to reduce configuration time, especially cross-compiling.
+
+	* template/sizes.c.tmpl: calculate sizes of checked types at
+	  compilation time.
+
+Mon Apr 25 11:27:27 2016  Marcus Stollsteimer  <sto.mar@web.de>
+
+	* doc/extension.rdoc: Improvements to english grammars.
+	  [Bug #12246][ruby-core:74792][ci skip]
+
+Mon Apr 25 11:17:50 2016  Marcus Stollsteimer  <sto.mar@web.de>
+
+	* encoding.c: Fix return value of `Encoding::ISO8859_1.name`
+	  [Bug #12313][ruby-core:75147][ci skip]
+	* ext/bigdecimal/bigdecimal.c: Fix code sample of `BigDecimal.new`
+
+Sun Apr 24 23:29:16 2016  Rei Odaira  <Rei.Odaira@gmail.com>
+
+	* configure.in: add missing -lm for AIX.
+
+Sun Apr 24 18:33:58 2016  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* vm_insnhelper.c (INLINE): disable r54738 if __NO_INLINE__ is defined.
+	  It caused "undefined reference to `vm_getivar'".
+
+Sun Apr 24 09:32:12 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
+
+	* test/ruby/test_array.rb: Add test cases for Array#sum with
+	  non-numeric objects.
+
+Sun Apr 24 04:21:27 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vm_insnhelper.c (INLINE): define as `inline` when it is optimized.
+	  define as `static inline` when it is not optimized to keep
+	  the symbol generated.
+
+	* vm_insnhelper.c (vm_getivar): use `INLINE` to force inline
+	  so that a compiler inlines it into vm_getinstancevariable
+	  and optimizes out is_attr and related branches.
+
+	* vm_insnhelper.c (vm_getivar): use `inline` to recommend inline.
+	  Without this vm1_ivar_set is degraded.
+
+	  benchmark results:
+	  minimum results in each 5 measurements.
+	  Execution time (sec)
+	  name    ruby 2.4.0dev (2016-04-23 trunk 54727) [x86_64-linux]   ruby 2.4.0dev (2016-04-23 trunk 54733) [x86_64-linux]       built-ruby
+	  loop_whileloop 0.641                                                   0.642 0.646
+	  vm1_ivar* 1.002                                                   0.999 0.831
+	  vm1_ivar_set* 0.369                                                   1.106 0.362
+
+	  Speedup ratio: compare with the result of `ruby 2.4.0dev (2016-04-23
+	  trunk 54727) [x86_64-linux]' (greater is better)
+	  name    ruby 2.4.0dev (2016-04-23 trunk 54733) [x86_64-linux]
+	  built-ruby
+	  loop_whileloop
+	  0.998        0.991
+	  vm1_ivar*
+	  1.003        1.205
+	  vm1_ivar_set*
+	  0.334        1.018
+
+Sat Apr 23 18:01:21 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_getivar): specify inline instead of static inline.
+	  vm_getivar is called by vm_call_ivar and vm_getinstancevariable.
+	  At least with GCC 4.8 and 5.3 on Linux, they are inlining it into
+	  vm_call_ivar but not vm_getinstancevariable.
+	  By `inline`, they correctly inline it and gains performance.
+
+	  Speedup ratio: compare with the result of `ruby 2.4.0dev (2016-04-23
+	  trunk 54727) [x86_64-linux]' (greater is better)
+	  name    built-ruby
+	  loop_whileloop       1.001
+	  vm1_ivar*            1.189
+	  vm1_ivar_set*        1.024
+
+	  Note the `inline`'s meaning is different between old GCC
+	  and C99. Old GCC's inline means C99's extern inline.
+	  https://gcc.gnu.org/onlinedocs/gcc/Inline.html
+	  Since Ruby specify -std=iso9899:1999, it works like C99.
+
+Sat Apr 23 16:11:39 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* include/ruby/ruby.h (rb_mul_size_overflow): use UNLIKELY
+	  by user side to improve generality.
+
+Sat Apr 23 16:10:02 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* include/ruby/ruby.h (RB_LIKELY): use prefix in ruby.h.
+
+	* intern.h (LIKELY): define with RB_LIKELY.
+
+Sat Apr 23 13:27:25 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
+
+	* NEWS: Add descriptions for Time#to_time updates.
+	  [Bug #12271]
+
+Sat Apr 23 13:21:24 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
+
+	* NEWS: Add descriptions for DateTime#to_time updates.
+	  [Bug #12189]
+
+Sat Apr 23 11:21:27 2016  Marcus Stollsteimer  <sto.mar@web.de>
+
+	* ext/date/date_core.c (Init_date_core): [DOC] Convert DateTime
+	  documentation to RDoc from Markdown.
+	  [ruby-core:75136] [Bug #12311]
+
+Sat Apr 23 09:03:35 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c: cygwin does not use w32_cmdvector, command line can be
+	  other than UTF-8.  [ruby-dev:49519] [Bug #12184]
+
+Sat Apr 23 01:00:03 2016  Rei Odaira  <Rei.Odaira@gmail.com>
+
+	* configure.in: don't use the system-provided round(3) on AIX.
+	  In AIX, round(0.49999999999999994) returns 1.0.
+	  Use round() in numeric.c instead.
+
+Fri Apr 22 21:00:44 2016  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_time_tz.rb: Tests depends on Europe/Moscow removed
+	  to avoid test failures due to the tzdata change.
+	  https://github.com/eggert/tz/commit/8ee11a301cf173afb0c76e0315b9f9ec8ebb9d95
+	  Found by naruse.
+
+Fri Apr 22 20:18:40 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* include/ruby/ruby.h (rb_mul_size_overflow): added to handle
+	  mul overflow efficiently.
+
+	* include/ruby/ruby.h (rb_alloc_tmp_buffer2): use rb_mul_size_overflow
+	  and avoid division where it can define DSIZE_T.
+
+	* gc.c (xmalloc2_size): moved from ruby.h and use rb_mul_size_overflow.
+
+Fri Apr 22 20:34:04 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* time.c (time_asctime): [DOC] add ctime example, not only
+	  asctime.  [ruby-core:75126] [Bug #12310]
+
+Fri Apr 22 18:44:32 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* variable.c: use uint32_t instead of long to avoid confusion about
+	  the type of ivtbl->numiv.
+
+Fri Apr 22 15:09:27 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval_jump.c (exec_end_procs_chain): restore previous error info
+	  for each end procs.  [ruby-core:75038] [Bug #12302]
+
+Fri Apr 22 15:04:56 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* tool/redmine-backporter.rb: the fullpath of merger.rb is too long to
+	  copy&paste on Windows.  show shorter name instead on the platform.
+	  I'm sure that the user of this command on Windows is only me.
+
+Fri Apr 22 14:52:04 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* tool/merger.rb: remove temporary file.
+
+Fri Apr 22 11:27:03 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* lib/net/http.rb: Improve documentation for SSL requests via GET method.
+	  [fix GH-1325][ci skip] Patch by @jsyeo
+
+Fri Apr 22 10:51:13 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* lib/webrick/ssl.rb: Support to add SSLCiphers option.
+	  [fix GH-1321] Patch by @rhadoo
+
+Fri Apr 22 10:43:19 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* file.c, win32/file.c: Removed obsoleted safe level checks.
+	  [fix GH-1327] Patch by @cremno
+
+Fri Apr 22 10:01:48 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* benchmark/bm_so_meteor_contest.rb: fix a typo.
+	  [fix GH-1330][ci skip] Patch by @sachin21
+
+Fri Apr 22 04:57:01 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* gc.c (rb_alloc_tmp_buffer_with_count): added like xmalloc2 to
+	  avoid duplicated check of size.
+
+	* gc.c (ruby_xmalloc2): added to keep separate layers.
+
+	* include/ruby/ruby.h (rb_alloc_tmp_buffer2): added to check
+	  the size more statically.
+
+Fri Apr 22 04:54:40 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* include/ruby/ruby.h (LIKELY): moved from internal.h.
+
+	* include/ruby/ruby.h (UNLIKELY): ditto.
+
+Thu Apr 21 01:44:19 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* gc.c (objspace_malloc_prepare): remove size check because it is
+	  used by objspace_xmalloc and objspace_xcalloc.
+	  objspace_xmalloc introduces its own check in this commit.
+	  objspace_xcalloc checks with xmalloc2_size (ruby_xmalloc2_size).
+
+	* gc.c (objspace_xmalloc0): common xmalloc function.
+
+	* gc.c (objspace_xmalloc): introduce its own size check.
+
+	* gc.c (objspace_xmalloc2): separated from ruby_xmalloc2 to clarify
+	  the layer who has the responsibility to check the size.
+
+	* gc.c (objspace_xrealloc): remove duplicated size check.
+
+	* gc.c (ruby_xmalloc2): use objspace_xmalloc2.
+
+	* include/ruby/ruby.h (ruby_xmalloc2_size): follow the size limit
+	  as SSIZE_MAX. Note that ISO C says size_t is unsigned integer.
+
+Thu Apr 21 12:14:04 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: check if succeeded in creating config.h.
+
+	* tool/ifchange: ignore failures when TEST_COLORS unmatched. just
+	  use the default value if expected name is not contained in it.
+	  [ruby-core:75046] [Bug #12303]
+
+Wed Apr 20 17:33:31 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/cgi/escape/escape.c (cgiesc_unescape): define unescape
+	  method instead of _unescape, and should pass the optional
+	  argument to the super method.
+
+	* lib/cgi/util.rb (CGI::Util#_unescape): remove intermediate
+	  method.
+
+Wed Apr 20 15:52:28 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (syntax_error_initialize): move the default message,
+	  "compile error", from parse.y.  the default parameter should
+	  belong to the class definition.
+
+	* parse.y (yycompile0): use the default parameter.
+
+Wed Apr 20 10:25:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (append_compile_error): use rb_syntax_error_append.
+
+	* error.c (rb_syntax_error_append): append messages into a
+	  SyntaxError exception instance.
+
+	* parse.y (yycompile0): make new SyntaxError instance in main
+	  mode, otherwise error_buffer should be a SyntaxError if error
+	  has occurred.
+
+Tue Apr 19 17:42:47 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (err_vcatf): rename, and separate appending message from
+	  creating a string buffer.
+
+	* error.c (rb_syntax_error_append): merge rb_error_vsprintf and
+	  rb_compile_err_append.
+
+	* parse.y (parser_compile_error): use rb_syntax_error_append.
+
+Tue Apr 19 13:46:19 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (append_compile_error, compile_bug): pass iseq and get
+	  error info and file from it, not by the thread error info.
+
+	* error.c (rb_report_bug_valist): take va_list instead of variadic
+	  arguments, and just report the bug but not abort.
+
+Tue Apr 19 13:18:12 2016  Naotoshi Seo  <sonots@gmail.com>
+
+	* lib/time.rb: revert r54167 because it would break
+	  backward compatibilities, and it is documented that
+	  Time.parse does not take into account time zone
+	  abbreations other than ones described in RFC 822
+
+Tue Apr 19 13:12:03 2016  Naotoshi Seo  <sonots@gmail.com>
+
+	* ChangeLog: Fix dates of previous commits
+
+Tue Apr 19 12:45:03 2016  Naotoshi Seo  <sonots@gmail.com>
+
+	* ChangeLog: Add descriptions for logger updates
+	* NEWS: Add descriptions for logger updates
+
+Tue Apr 19 12:45:02 2016  Naotoshi Seo  <sonots@gmail.com>
+
+	* lib/logger.rb: Add shift_period_suffix option
+
+Tue Apr 19 12:45:01 2016  Naotoshi Seo  <sonots@gmail.com>
+
+	* lib/logger.rb: Allow specifying logger parameters in constructor
+	  such as level, progname, datetime_format, formatter.
+
+Mon Apr 18 16:07:01 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_peephole_optimize): should not replace the
+	  current target INSN, not to follow the replaced dangling link in
+	  the caller.  [ruby-core:74993] [Bug #11816]
+
+Mon Apr 18 12:56:31 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (flo_truncate): add an optional parameter, digits, as
+	  well as Float#round.  [Feature #12245]
+
+	* numeric.c (int_truncate): add an optional parameter, digits, as
+	  well as Integer#round.  [Feature #12245]
+
+Sun Apr 17 04:18:56 2016  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* tool/redmine-backporter.rb: revisions are strings.
+
+Sat Apr 16 14:26:49 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
+
+	* ext/date/date_core.c : remove not used f_getlocal macro.
+	  After r54553 f_getlocal macro is not used.
+
+Sat Apr 16 14:15:24 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
+
+	* ext/date/date_core.c : remove not used f_utc6 macro.
+	  After r54169 f_utc6 macro is not used.
+
+Sat Apr 16 10:00:11 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* struct.c (struct_make_members_list, rb_struct_s_def): member
+	  names should be unique. [ruby-core:74971] [Bug #12291]
+
+	* struct.c (struct_make_members_list): extract making member name
+	  list from char* va_list, with creating symbols without
+	  intermediate IDs.
+
+Sat Apr 16 01:33:27 2016  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* tool/redmine-backporter.rb: sort revisions.
+
+Sat Apr 16 01:16:02 2016  Tanaka Akira  <akr@fsij.org>
+
+	* array.c (rb_ary_sum): Don't yield same element twice.
+	  Found by nagachika.
+
+Sat Apr 16 01:03:32 2016  Tanaka Akira  <akr@fsij.org>
+
+	* array.c (rb_ary_sum): Fix SEGV by [1/2r, 1].sum.
+
+Fri Apr 15 23:52:00 2016  Kenta Murata  <mrkn@mrkn.jp>
+
+	* rational.c (rb_rational_plus): rename from rb_rational_add
+	  to be aligned with rb_fix_plus.
+
+	* array.c (rb_ary_sum): ditto.
+
+	* internal.h: ditto.
+
+Fri Apr 15 23:42:00 2016  Kenta Murata  <mrkn@mrkn.jp>
+
+	* rational.c (rb_rational_add): rename from nurat_add.
+
+	* array.c (rb_ary_sum): use rb_rational_add directly.
+
+	* test/ruby/test_array.rb (test_sum): add assertions for an array of
+	  Rational values.
+
+Fri Apr 15 22:31:00 2016  Kenta Murata  <mrkn@mrkn.jp>
+
+	* array.c (rb_ary_sum): apply the precision compensated algorithm
+	  for an array in which Rational and Float values are mixed.
+
+	* test/ruby/test_array.rb (test_sum): add assertions for the above
+	  change.
+
+Fri Apr 15 22:30:01 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (rb_thread_setname): defer setting native thread name
+	  set in initialize until the native thread is created.
+	  [ruby-core:74963] [Bug #12290]
+
+Fri Apr 15 20:27:16 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* lib/irb/ext/save-history.rb: Fix NoMethodError when method is not defined.
+
+Fri Apr 15 15:38:58 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* common.mk (benchmark): order options for built-ruby and compare-ruby.
+
+Fri Apr 15 14:14:00 2016  Kenta Murata  <mrkn@mrkn.jp>
+
+	* test/ruby/test_array.rb (test_sum): add assertions for Rational and
+	  Complex numbers.
+
+Fri Apr 15 10:07:11 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/io/console/console.c (console_key_pressed_p): raise the same
+	  exception, "unknown virtual key code", for names with nul chars.
+	  though console_win32_vk() considers the length and can deal with
+	  nul chars, rb_sprintf() raised at PRIsVALUE previously, so quote
+	  it if it is unprintable.
+
+Fri Apr 15 09:02:58 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/io/console/console.c (rb_sym2str): fallback definition for
+	  older ruby.  [ruby-core:74953] [Bug #12284]
+
+Thu Apr 14 21:46:36 2016  Tanaka Akira  <akr@fsij.org>
+
+	* array.c (rb_ary_sum): Support the optional argument, init, and
+	  block.
+
+Thu Apr 14 19:02:41 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/irb/ext/save-history.rb: suppress warning: method redefined;
+	  discarding old save_history=.
+
+Thu Apr 14 14:58:14 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/tk/tkutil/tkutil.c (tk_hash_kv): the third argument can be
+	  nil not only an Array.  reported by @windwiny at
+	  https://github.com/ruby/ruby/commit/cdaa94e#commitcomment-17096618
+
+Thu Apr 14 14:28:55 2016  cremno phobia  <cremno@mail.ru>
+
+	* cont.c (fiber_initialize_machine_stack_context): fix wrong
+	  _MSC_VER check, should be decimal but not hexadecimal.
+	  [ruby-core:74936] [Bug #12279]
+
+Wed Apr 13 22:51:38 2016  Tanaka Akira  <akr@fsij.org>
+
+	* array.c (rb_ary_sum): Array#sum is implemented.
+	  Kahan's compensated summation algorithm for precise sum of float
+	  numbers is moved from ary_inject_op in enum.c.
+
+	* enum.c (ary_inject_op): Don't specialize for float numbers.
+
+	  [ruby-core:74569] [Feature #12217] proposed by mrkn.
+
+Wed Apr 13 15:56:35 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (flo_ceil): add an optional parameter, digits, as
+	  well as Float#round.  [Feature #12245]
+
+	* numeric.c (flo_floor): add an optional parameter, digits, as
+	  well as Float#round.  [Feature #12245]
+
+	* numeric.c (int_ceil): add an optional parameter, digits, as
+	  well as Integer#round.  [Feature #12245]
+
+	* numeric.c (int_floor): add an optional parameter, digits, as
+	  well as Integer#round.  [Feature #12245]
+
+Wed Apr 13 14:47:47 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (Init_File): add alias File.empty? to File.zero?.
+	  [Feature #9969]
+
+Wed Apr 13 14:36:24 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (assign_in_cond): allow multiple assignment in
+	  conditional expression.  [Feature #10617]
+
+Wed Apr 13 14:11:59 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bignum.c (rb_big_size): add wrapper function of BIGSIZE and
+	  rename the method function with _m suffix.
+
+	* numeric.c (int_round_zero_p): extracted from rb_int_round.
+	  optimize for Bignum, and convert VALUE returned by Numeric#size
+	  to long.
+
+Wed Apr 13 12:00:08 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_basicinstructions.rb: add a test to check access
+	  instance variables on special const objects.
+
+	  All of such objects are frozen, so that we can not set instance
+	  variables for them. But we can read instance variables and return
+	  default value (nil).
+
+Tue Apr 12 20:40:35 2016  Kaneko Yuichiro  <spiketeika@gmail.com>
+
+	* ext/date/date_core.c (time_to_time): should preserve timezone
+	  info.  [ruby-core:74889] [Bug #12271]
+
+Tue Apr 12 11:51:18 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (new_label_body): initialize bit fields, since
+	  compile_data_alloc does not clear the memory.  [Bug #12082]
+
+Mon Apr 11 20:18:43 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_backtrace.c (frame2klass): filter only for imemo_ment.
+	  T_IMEMO/imemo_iseq can be passed here.
+
+Mon Apr 11 17:43:04 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_optimize): disable tail call optimization in
+	  rescued, rescue, and ensure blocks.
+	  [ruby-core:73871] [Bug #12082]
+
+Mon Apr 11 06:54:39 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (apply2files): apply to a VALUE vector instead of a
+	  temporary array.
+
+Sun Apr 10 20:54:16 2016  Joe Swatosh  <joe.swatosh@gmail.com>
+
+	* ext/win32/lib/win32/registry.rb (DeleteValue, DeleteKey): fix
+	  API names.  [ruby-core:74863] [Bug #12264]
+
+Sun Apr 10 17:47:42 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_realpath_internal): no argument conversions since
+	  this internal function does not need to_path and encoding
+	  conversions, not to be affected by the default internal
+	  encoding.
+
+Sat Apr  9 10:03:12 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* load.c (rb_f_load): raise with the original path name before
+	  encoding conversion.
+
+Sat Apr  9 02:05:10 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bignum.c (rb_cstr_parse_inum): [EXPERIMENTAL] new function to
+	  parse integer in C-string with length.  the name and the
+	  arguments may be changed in the future.
+
+	* bignum.c (rb_str_to_inum): preserve encoding of the argument in
+	  error messages, and no longer needs to copy non-terminated
+	  strings.
+
+	* bignum.c (rb_str2big_{poweroftwo,normal,karatsuba,gmp}): ditto.
+
+Thu Apr  7 19:04:03 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* doc/regexp.rdoc (comments): [DOC] terminators cannot appear in
+	  comments.  [ruby-core:74838] [Bug #12256]
+
+Thu Apr  7 11:24:14 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/tk/tkutil/tkutil.c (cbsubst_initialize): fix out-of-bound
+	  access when no arguments given.  `p Tk::Event.new` crashed.
+
+Fri Apr  1 01:26:00 2016  Benoit Daloze  <eregontp@gmail.com>
+
+	* ext/coverage/coverage.c: Fully reset coverage to not persist global state.
+	  It was returning old file coverages as empty arrays to the user.
+	  [ruby-core:74596] [Bug #12220]
+
+	* ext/coverage/coverage.c (rb_coverages): remove unused static state.
+
+	* thread.c: Moved and renamed coverage_clear_result_i to reset_coverage_i.
+
+	* test/coverage/test_coverage.rb: improve precision of tests.
+
+Wed Apr  6 22:41:31 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (rb_cv_lgamma_r_m0): fix the condition for
+	  lgamma_r(-0.0).  [Bug #12249]
+
+Wed Apr  6 17:38:42 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* tool/downloader.rb (RubyGems.download): follow the change of the
+	  rubygems ssl_certs directory tree introduced by previous commit.
+
+Wed Apr  6 15:00:27 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update rubygems-2.6.3.
+	  Please see entries of 2.6.3 on
+	  https://github.com/rubygems/rubygems/blob/master/History.txt
+
+Wed Apr  6 14:13:28 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (rb_cv_lgamma_r_m0): check if lgamma_r(-0.0)
+	  returns negative infinity.  [Bug #12249]
+
+	* math.c (ruby_lgamma_r): define by the configured result.
+
+Wed Apr  6 10:56:15 2016  Anton Davydov  <antondavydov.o@gmail.com>
+
+	* lib/logger.rb (Logger#level=): remove unnecessary local
+	  variable.
+
+	* lib/logger.rb (Logger#initialize, Logger#reopen): [DOC] mention
+	  the default values.  cherrypicked from [GH-1319].
+
+Wed Apr  6 10:17:53 2016  cremno phobia  <cremno@mail.ru>
+
+	* math.c (ruby_lgamma_r): missing/lgamma_r.c is used on Windows,
+	  since msvcrt does not provide it.
+
+	* missing/lgamma_r.c (lgamma_r): fix lgamma(-0.0).
+	  [ruby-core:74823] [Bug #12249]
+
+Wed Apr  6 01:22:55 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* math.c (ruby_lgamma_r): mswin's lgamma_r also seems to be wrong.
+	  cf. [Bug #12249]
+
+Wed Apr  6 00:53:31 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* math.c (ruby_lgamma_r): fix lgamma(-0.0) on mingw and OSX.
+
+	* math.c (ruby_tgamma): fix tgamma(-0.0) on mingw.
+	  [ruby-core:74817] [Bug #12249]
+
+Tue Apr  5 14:50:28 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c (mime_putc): fix typo.
+	  [Bug #12202] [ruby-core:74802]
+
+Tue Apr  5 00:06:44 2016  Aeris  <aeris@imirhil.fr>
+
+	* ext/openssl/ossl_ssl.c (ossl_ssl_tmp_key): Access to ephemeral
+	  TLS session key in case of forward secrecy cipher.  Only
+	  available since OpenSSL 1.0.2.  [Fix GH-1318]
+
+	* ext/openssl/extconf.rb: Check for SSL_get_server_tmp_key.
+
+Mon Apr  4 23:37:05 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_core.h (rb_vm_struct): make at_exit a single linked list but
+	  not RArray, not to mark the registered functions by the write
+	  barrier.  based on the patches by Evan Phoenix.
+	  [ruby-core:73908] [Bug #12095]
+
+Mon Apr  4 17:43:45 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: change default value of
+	  RUBY_GC_HEAP_FREE_SLOTS_MIN_RATIO 0.3 -> 0.2
+	  RUBY_GC_HEAP_FREE_SLOTS_MAX_RATIO 0.8 -> 0.65
+
+	  These values are same as Ruby 2.0.0.
+
+	  This change cause GC counts.
+	  However, generational GC reduced each (minor) GC time and
+	  increase memory locality. So that not so big impact on my
+	  benchmarking results.
+	  (surprisingly, this fix speed up programs on some cases)
+
+	  You can change these values by environment variables
+	  if you feel wrong.
+
+Mon Apr  4 17:36:52 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (get_envparam_double): take an upper_bound.
+
+	  And also take an accept_zero flag which allow to accept zero
+	  even if lower_bound is set.
+
+	* gc.c (ruby_gc_set_params): fix parameters.
+
+	  RUBY_GC_HEAP_FREE_SLOTS_MAX_RATIO set 0.9 as *lower_bound*, so that
+	  it should be upper_bound.
+	  Set RUBY_GC_HEAP_FREE_SLOTS_MIN_RATIO as lower bound.
+
+	  Also set lower/upper bound of RUBY_GC_HEAP_FREE_SLOTS_GOAL_RATIO to
+	  RUBY_GC_HEAP_FREE_SLOTS_MIN/MAX_RATIO.
+
+Mon Apr  4 16:41:32 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (Init_VM): should pass tokens.
+
+Sun Apr  3 09:34:29 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (flodivmod): round division if it is a finite number
+	  and module is required.
+
+	* numeric.c (dbl2ival): do not round here.
+
+	* numeric.c (flo_ceil): use dbl2ival.
+
+	* numeric.c (flo_round): round explicitly.
+
+Sat Apr  2 15:24:18 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/intern.h (rb_check_arity): returns argc.
+
+Fri Apr  1 20:58:33 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/unicode/case-folding.rb, casefold.h: Data generation to implement
+	  swapcase functionality for titlecase characters. Swapcase isn't defined
+	  by Unicode, because the purpose/usage of swapcase is unclear anyway.
+	  The implementation follows a proposal from Nobu, swapping the case of
+	  each component of a titlecase character individually.
+	  This means that the titlecase characters have to be decomposed.
+
+	* enc/unicode.c: Code using the above data.
+
+	* test/ruby/enc/test_case_mapping.rb: Tests for the above.
+
+Fri Apr  1 14:55:28 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* configure.in (AC_CONFIG_FILES): $srcdir/.git can be a file pointing
+	  the real git_dir, such as when the git working tree is a "linked
+	  working tree" (a working tree created by git-worktree). So use
+	  git-rev-parse --git-dir to check if $srcdir is the top-level of a git
+	  repository, not just checking if the $srcdir/.git directory does exist
+	  or not.  [ruby-core:74759] [Bug #12239]
+
+	* tool/change_maker.rb: use tool/vcs.rb to detect VCS. This used to have
+	  its own VCS detection code, while we have tool/vcs.rb.
+
+	* tool/vcs.rb (detect): remove code duplication
+
+Fri Apr  1 04:50:44 2016  Eric Wong  <e@80x24.org>
+
+	* ext/openssl/ossl_ssl.c (ossl_sslctx_s_alloc):
+	  enable SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER by default
+	  [Bug #12126]
+
+Fri Apr  1 01:13:55 2016  Benoit Daloze  <eregontp@gmail.com>
+
+	* thread.c (update_coverage): Do not track coverage in loaded files
+	  after Coverage.result. Avoids out-of-bounds access. [Bug #12237]
+
+	* ext/coverage/coverage.c (coverage_clear_result_i): document.
+
+Thu Mar 31 19:16:16 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: need to set initial value of GC_HEAP_FREE_SLOTS_GOAL_RATIO.
+
+Thu Mar 31 17:50:27 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: change additional allocation policy.
+
+	  Introduce new environment variable
+	  RUBY_GC_HEAP_FREE_SLOTS_GOAL_RATIO (goal_ratio) to calculate the
+	  ratio of additional memory.
+
+	  Before this change, we add pages with the following formula
+	  (when free_slots < total_pages * RUBY_GC_HEAP_FREE_SLOTS_MIN_RATIO):
+	    next_pages = total_pages * RUBY_GC_HEAP_GROWTH_FACTOR
+
+	  This addition can allocate too much.
+
+	  With this change, we increase pages to satisfy the following formula:
+	    next_free_slots = next_total_slots * goal_ratio
+	  where
+	    next_free_slots = free_slots + adding_slots
+	    next_total_slots = total_slots + adding_slots.
+
+	  If you want to prepare many free slots, increase this ratio.
+
+	  If this variable is 0, then simply multiply
+	  RUBY_GC_HEAP_GROWTH_FACTOR.
+
+	* gc.c (get_envparam_double): enable to accept 0.
+
+Thu Mar 31 17:48:25 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_marks_finish): fix syntax error.
+
+Thu Mar 31 16:49:36 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: simplify allocate/free detecting logic at the end of marking.
+
+	  Before this change, heap_pages_min_slots are calculated at the
+	  beginning sweeping phase. And this value is used at the end of
+	  *next* marking phase.
+
+	  To simplify it, we use this value at the end of this marking phase.
+	  It means that we don't need to store this value as global state.
+
+	  Also heap_pages_max_slots is calculated at the begging of sweeping
+	  phase and used at the end of sweeping phase.
+	  To simplify this logic, we introduced new global value
+	  heap_pages_freeable_pages it means extra pages count we can free.
+	  gc_sweep_step() checks this value and moves empty pages to tomb_heap
+	  not more than this value.
+
+	  Because of this fix, heap_pages_swept_slots is no longer needed.
+
+	* gc.c (rb_objspace_t::heap_pages): restruct the objspace global
+	  status.
+
+	  remove the following fields
+	    * swept_slots (and heap_pages_swept_slots)
+	    * min_free_slots (and heap_pages_min_free_slots)
+	    * max_free_slots (and heap_pages_max_free_slots)
+	  And add the following filed.
+	    * freeable_pages (and heap_pages_freeable_pages)
+
+	* gc.c (heap_pages_free_unused_pages): unlink tomb heap pages
+	  because tomb heap should have only freeable pages.
+
+	* gc.c (heap_extend_pages): add parameters for future extension.
+
+Thu Mar 31 16:43:02 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: add GC parameters to configure the following values:
+	  * RUBY_GC_HEAP_FREE_SLOTS_MIN_RATIO:
+	    allocate additional pages when free slots is lower than
+	    the value (total_slots * (this ratio)).
+	  * RUBY_GC_HEAP_FREE_SLOTS_MAX_RATIO:
+	    allow to free pages when free slots is greater than
+	    the value (total_slots * (this ratio)).
+
+	  Before this change, these values are hard coded.
+
+	* gc.c (ruby_gc_params_t): ditto.
+
+	* gc.c (ruby_gc_set_params): ditto.
+
+Thu Mar 31 15:59:17 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_verify_heap_page): check the number of zombies.
+
+	* gc.c (gc_verify_heap_pages): check also tomb heap.
+
+Thu Mar 31 15:48:18 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_page_sweep): return free slots count.
+
+	* gc.c (gc_sweep_step): use returned free slots count.
+
+	* gc.c (gc_sweep_step): change variable name `next'
+	  to `next_sweep_page'.
+
+Thu Mar 31 11:33:49 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/date/date_core.c (d_lite_strftime, dt_lite_strftime): [DOC]
+	  fix indent not to be a big sole verbatim.
+
+Thu Mar 31 11:18:19 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/date/date_core.c (Init_date_core): [DOC] fix misplaced doc
+	  of DateTime.  [ruby-core:74729] [Bug #12233]
+
+Thu Mar 31 03:41:02 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c: Merge upstream 69f7e74dde.
+	  fix indent.
+
+Wed Mar 30 16:33:19 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* extension.rdoc, extension.ja.rdoc: [DOC] Fix some errors.
+	  Renamed files, wrong method names or argument types; the example
+	  GetDBM macro is now updated to the current version of the actual
+	  code.  patch by Marcus Stollsteimer in [ruby-core:74690].
+	  [Bug #12228]
+
+Wed Mar 30 09:46:01 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* lib/open-uri.rb: Use `userinfo` for authenticated proxy.
+	  [fix GH-1148] Patch by @SokichiFujita
+	* test/open-uri/test_open-uri.rb: ditto.
+	  [fix GH-1309] Patch by @jdamick
+
+Wed Mar 30 01:56:06 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c: Merge upstream 4f3edf80a0.
+	  patched by Anton Sivakov [Bug #12201] [Bug #12202]
+
+Wed Mar 30 01:54:30 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/redmine-backporter.rb: add given revision to current changesets
+	  on associating the revision to the related ticket.
+
+Wed Mar 30 01:53:17 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/merger.rb: update revision.h before merge.
+
+Tue Mar 29 19:33:54 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c: define toupper for its use. fix r54391.
+
+Tue Mar 29 19:23:46 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* include/ruby/ruby.h (rb_isupper, rb_islower, rb_isalpha, rb_isdigit,
+	  rb_isalnum, rb_isxdigit, rb_isblank, rb_isspace, rb_isblank,
+	  rb_iscntrl, rb_isprint, rb_ispunct, rb_isgraph,
+	  rb_tolower, rb_toupper): use inline function to avoid function call.
+
+	* include/ruby/ruby.h (rb_isascii): use inline function to clarify
+	  the logic.
+
+Tue Mar 29 18:56:55 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/redmine-backporter.rb (backport): show merger.rb's path.
+
+	* tool/redmine-backporter.rb (show): show current issue again if no
+	  ticket number is given.
+
+	* tool/redmine-backporter.rb (rel): show error message if current
+	  bugs.ruby-lang.org doesn't support the API.
+
+Tue Mar 29 18:54:34 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/merger.rb: support to backport header as backport identifier.
+	  Now you can specify by 'merge revision(s) 49254: [Backport #10738]'.
+
+Tue Mar 29 16:53:44 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/unicode/case-folding.rb, casefold.h: Tweaked handling of 6
+	  special cases in CaseUnfold_11_Table.
+
+	* enc/unicode.c: Adjustments for above.
+
+	* test/ruby/enc/test_case_mapping.rb: Tests for the above: Some tests in
+	  test_titlecase activated; test_greek added. A test in test_cherokee fixed.
+
+Tue Mar 29 13:31:00 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/unicode.c: Cleaned up some comments.
+
+Tue Mar 29 13:24:56 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/unicode/case-folding.rb, casefold.h: Removing data for idempotent
+	  titlecasing.
+
+	* enc/unicode.c: Adjust code to data removal.
+
+Tue Mar 29 12:45:18 2016  Laurent Arnoud  <laurent@spkdev.net>
+
+	* lib/webrick/httpresponse.rb: Move error_body to method. It allow to
+	  override the body more easily. [fix GH-1307]
+	* test/webrick/test_httpresponse.rb: ditto.
+
+Tue Mar 29 06:40:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (rb_compile_err_append): rb_thread_t::base_block is no
+	  longer used.
+
+	* iseq.c (rb_iseq_compile_with_option): ditto, no protection is
+	  needed.
+
+Tue Mar 29 06:39:22 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (struct parser_params): move parse_in_eval flag from
+	  rb_thread_t.
+
+	* parse.y (rb_parser_set_context): set parsing context, not only
+	  mild error flag.
+
+	* iseq.c (rb_iseq_compile_with_option): the parser now refers no
+	  thread local states to be restored.
+
+	* vm_eval.c (eval_string_with_cref): ditto.
+
+Mon Mar 28 21:24:02 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* numeric.c (int_pos_p): fix typos.
+
+Mon Mar 28 14:54:49 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/unicode.c: Refactoring in preparation for data reduction for
+	  titlecase.
+
+Mon Mar 28 14:36:36 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/unicode.c: Minor refactoring for I WITH DOT ABOVE.
+
+Mon Mar 28 14:26:24 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/unicode.c: Removed code now covered by data from table.
+
+Mon Mar 28 11:49:21 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/unicode.c: Adding comments. [ci skip]
+
+Mon Mar 28 11:30:23 2016  Shinichi Maeshima  <netwillnet@gmail.com>
+
+	* lib/rubygems.rb: Fix `Gem.find_spec_for_exe` picks oldest gem.
+	  https://github.com/travis-ci/travis-ci/issues/5798
+	  https://github.com/rubygems/rubygems/pull/1566
+	* test/rubygems/test_gem.rb: ditto.
+
+Mon Mar 28 11:26:31 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update rubygems-2.6.2.
+	  Please see entries of 2.6.2 on
+	  https://github.com/rubygems/rubygems/blob/master/History.txt
+
+Mon Mar 28 11:02:31 2016  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* lib/rubygems/test_case.rb: Fix test on Windows for inconsistent temp path.
+	  https://github.com/rubygems/rubygems/pull/1554
+	  [Bug #12193][ruby-core:74431]
+
+Mon Mar 28 08:19:49 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c (rb_str_format): refactor floating point format of
+	  Rational by using generic Integer functions.
+
+	* sprintf.c (rb_str_format): fix buffer overflow, length must be
+	  greater than precision.  reported by William Bowling <will AT
+	  wbowling.info>.
+
+Sun Mar 27 12:13:37 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c (rb_str_format): convert Rational to floating point
+	  format by using generic Integer functions, not by methods which
+	  can be overwritten.
+
+Sat Mar 26 10:55:12 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (rb_int2str): conversion function to String for
+	  generic Integer.
+
+	* numeric.c (rb_int_round): rounding function for generic
+	  Integers.
+
+	* numeric.c (rb_int_{uminus,plus,minus,mul,idiv,modulo}): basic
+	  arithmetic functions for generic Integers.
+
+	* numeric.c (FIXNUM_{POSITIVE,NEGATIVE,ZERO}_P): predict macros
+	  only for Fixnum.
+
+Sat Mar 26 06:34:24 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* localeinit.c (rb_locale_charmap_index): fix prototype.
+	  patched by Andreas Schwab [Bug #12218]
+
+Fri Mar 25 16:40:48 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* test/ruby/enc/test_case_mapping.rb: Additional tests title case;
+	  some not yet activated.
+
+Fri Mar 25 13:38:11 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/extconf.rb: check SSL_CTX_set_next_proto_select_cb
+	  function rather than OPENSSL_NPN_NEGOTIATED macro. it exists
+	  even if it is disabled by OpenSSL configuration.
+	  [ruby-core:74384] [Bug #12182]
+
+	* ext/openssl/ossl_ssl.c: update #ifdef(s) as above.
+
+	* test/openssl/test_ssl.rb: skip NPN tests if NPN is disabled.
+
+Fri Mar 25 11:08:37 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/uri/http.rb (URI::HTTP#initialize): [DOC] fix example,
+	  missing mandatory arguments.  [ruby-core:74540] [Bug #12215]
+
+Fri Mar 25 01:50:58 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* thread_pthread.c (reserve_stack): fix reserving position where
+	  the stack growing bottom to top. [Bug #12118]
+
+Fri Mar 25 01:10:42 2016  Sebastian Schuberth  <sschuberth@gmail.com>
+
+	* lib/mkmf.rb (find_executable0): On Windows, it is actually valid
+	  to surround individual PATH directory entries with double
+	  quotes. Remove these before joining the path as otherwise the
+	  literal quotes would become part of the path, resulting in the
+	  executable not to be found.  [Fix GH-1305]
+
+Thu Mar 24 22:38:18 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* strftime.c (FMT, FMTV): remove recursive-assignments to get rid
+	  of undefined behavior.  [ruby-core:74532] [Bug #12213]
+
+Thu Mar 24 17:44:02 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* strftime.c (FMT_PADDING): extract format for padding.
+
+	* strftime.c (FMT_PRECISION): extract precision formula.
+
+	* strftime.c (FMTV): append formatted string to expand the result.
+
+Thu Mar 24 14:20:21 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* strftime.c (STRFTIME): deal with case conversion flags for
+	  recursive formats.
+
+Thu Mar 24 12:43:26 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/date/date_core.c (dt_lite_iso8601): strftimev() always
+	  returns a String, so append them directly.
+
+	* ext/date/date_core.c (d_lite_jisx0301, iso8601_timediv),
+	  (dt_lite_jisx0301): format by the format string in local buffer
+	  to prevent intermediate strings from GC.
+
+	* ext/date/date_core.c (mk_inspect_raw, mk_inspect): inspect by
+	  "%+"PRIsVALUE, to prevent intermediate strings from GC.
+
+Thu Mar 24 11:43:32 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* strftime.c (rb_strftime_with_timespec): remove unnecessary
+	  check, as `s` equals to `endp` when recursed STRFTIME resized
+	  the capacity same as the size.
+
+Wed Mar 23 21:48:00 2016  Kenta Murata  <mrkn@mrkn.jp>
+
+	* enum.c (ary_inject_op): put subtract operation out of if-clause.
+
+Wed Mar 23 21:38:00 2016  Kenta Murata  <mrkn@mrkn.jp>
+
+	* enum.c (ary_inject_op): Use Kahan's compensated summation algorithm
+	  for summing up float values.
+
+Wed Mar 23 20:56:59 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* strftime.c (rb_strftime_with_timespec): append formatted results
+	  to the given string with expanding, and also deal with NUL chars.
+
+	* strftime.c (rb_strftime, rb_strftime_timespec): return formatted
+	  string, not the length put in the given buffer.
+
+	* time.c (rb_strftime_alloc): no longer needs to retry with
+	  reallocating buffers.
+
+	* time.c (time_strftime): no longer needs to split by NUL chars.
+
+Wed Mar 23 14:23:54 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/rdoc/ri/driver.rb (interactive): rescue NotFoundError raised in
+	  expand_name. (display_name rescues NotFoundError by itself,
+	  the original logic looks buggy...)
+
+Wed Mar 23 11:44:53 2016  cremno  <cremno@mail.ru>
+
+	* marshal.c (r_long): cast to `signed char`, which is used
+	  already, instead of SIGN_EXTEND_CHAR.
+
+	* parse.y: SIGN_EXTEND_CHAR is no longer used.  [Fix GH-1302]
+
+Wed Mar 23 11:38:47 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* cygwin/GNUmakefile.in (MSYS2_ARG_CONV_EXCL_PARAM):
+	  * add missing parentheses and remove double quotes.
+	  * rename to get rid of recursive references.
+	  * as --excludes-dir option is for a path name, its argument
+	    should be converted.
+	  [ruby-dev:49526] [Bug #12199]
+
+Wed Mar 23 10:39:38 2016  Koichi ITO  <koic.ito@gmail.com>
+
+	* variable.c: Added documentation about order of `Module#constants`
+	  [ci skip][Bug #12121][ruby-dev:49505][fix GH-1301]
+
+Tue Mar 22 21:08:30 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* include/ruby/oniguruma.h: Additional flag for characters that are titlecase.
+
+	* enc/unicode/case-folding.rb, casefold.h: Using above flag in data.
+
+	* enc/unicode.c: Marking capitalized character as unmodified if it is
+	  already titlecase.
+
+	* test/ruby/enc/test_case_mapping.rb: Tests for above functionality.
+
+Tue Mar 22 14:18:59 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (lambda_body, parser_yylex): warn mismatched indentation
+	  of lambda block.
+
+Tue Mar 22 11:36:49 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* time.c (wmul): wrong condition.
+	  fixed many test failures on 32bit and LLP64 platforms.
+
+Tue Mar 22 10:31:34 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* time.c (wdiv, wmod): wdivmod0() assumes the 3rd and the 4th arguments
+	  are valid pointers.
+	  maybe checking them in wdivmod0() is better manner, but I guess that
+	  passing real dummy pointers may be faster than checking and branching
+	  in wdivmod0().
+	  this commit fixes SEGV on 32bit and LLP64 platforms.
+
+Tue Mar 22 10:24:04 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* time.c (divmodv): void function never returns any value.
+
+Tue Mar 22 10:11:01 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/lib/test/unit.rb (Test::Unit::StatusLine#failed): print
+	  failed messages only if replacing mode, otherwise defer them
+	  until the end, to get rid of interleaving failures with progress
+	  messages.  refix r54195.
+
+Tue Mar 22 03:45:03 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* time.c (MUL_OVERFLOW_FIXWV_P): defined for FIXWV.
+
+	* time.c (wmul): use MUL_OVERFLOW_FIXWV_P and only switch.
+
+	* time.c (wmul): use mul which has Fixnum optimization.
+
+	* time.c (rb_time_magnify): If WIDEVALUE_IS_WIDER, wmul() has the same
+	  optimized logic, else mul() has also the similar logic for Fixnum.
+
+	* time.c (rb_time_unmagnify): almost ditto.
+
+Tue Mar 22 03:10:09 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* time.c (divmodv): add the case both arguments are Fixnum.
+
+	* time.c (wquo): use quo which has Fixnum optimization.
+
+	* time.c (wdivmod0): added for WIDEVALUE_IS_WIDER.
+
+	* time.c (wdivmod): use wdivmod0 and divmodv.
+	  divmodv has Fixnum optimization.
+
+	* time.c (wdiv): use wdivmod0 and div to avoid the use of divmodv which
+	  calls id_quo whose return value is array.
+
+	* time.c (wmod): use wdivmod0 and mod to avoid the use of divmodv which
+	  calls id_quo whose return value is array.
+
+Mon Mar 21 22:32:50 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* internal.h (rb_fix_divmod_fix): like r54213, use FIX2NUM only if
+	  x == FIXNUM_MIN && y == -1. This must be a rare case and it is
+	  expected compiler to handle well.
+
+Mon Mar 21 22:15:11 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* time.c (mod): Add Fixnum case.
+
+	* time.c (quo): c can be Fixnum except a == FIXNUM_MIN && b == -1.
+	  Such case can be optimized out because quo()'s argument is constant.
+
+Mon Mar 21 22:09:24 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* internal.h (rb_fix_mul_fix): multiply converted values, not
+	  object VALUEs.
+
+Mon Mar 21 20:18:29 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (TEST_EXCLUDES, EXCLUDE_TESTFRAMEWORK): use full spell
+	  long option.
+
+	* cygwin/GNUmakefile.in (MSYS2_ARG_CONV_EXCL): suppress path name
+	  conversions by msys2.  [ruby-dev:49525] [Bug #12199]
+
+Mon Mar 21 19:09:31 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (enc_succ_alnum_char): try to skip an invalid character
+	  gap between GREEK CAPITAL RHO and SIGMA.
+	  [ruby-core:74478] [Bug #12204]
+
+Mon Mar 21 18:55:49 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* node.c (rb_gc_mark_node): NODE_MATCH2 can have nd_args, u3,
+	  since r54100.
+
+Sun Mar 20 21:17:13 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* internal.h (rb_int128t2big): declare only when HAVE_INT128_T.
+	  fixed a compile error with VC++ introduced at r54203.
+
+Sun Mar 20 20:10:14 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* internal.h (DLONG): defined if long is 32bit (and LONG_LONG is 64bit;
+	  but LONG_LONG is always defined as 64bit), or there's int128_t.
+
+	* internal.h (DL2NUM): defined if DLONG is defined.
+
+	* internal.h (rb_fix_mul_fix): defined for `Fixnum * Fixnum`.
+
+	* insns.def (opt_mul): use rb_fix_mul_fix().
+
+	* numeric.c (fix_mul): ditto.
+
+	* time.c (mul): ditto.
+
+Sun Mar 20 18:53:49 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (fix_gt, fix_ge, fix_lt, fix_le): optimize comparisons
+	  Fixnum against Bignum by rb_big_cmp in inversed order without
+	  new Bignum instance.
+
+Sun Mar 20 18:44:52 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* time.c (add): remove FIXABLE() which is in LONG2NUM().
+
+	* time.c (sub): ditto.
+
+	* time.c (mul): ditto.
+
+Sun Mar 20 04:46:02 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* bignum.c (rb_big_cmp): reduce the code.
+
+	* bignum.c (rb_big_eq): If normalized bignum is still bignum,
+	  it must be larger than fixnum.
+
+Sat Mar 20 00:58:00 2016  Kenta Murata  <mrkn@mrkn.jp>
+
+	* include/ruby/intern.h (rb_big_odd_p, rb_big_even_p): move to
+	  internal.h so that they are exported only for ruby itself.
+
+	* internal.h (rb_big_odd_p, rb_big_even_p): ditto.
+
+Sat Mar 19 21:56:23 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/lib/test/unit.rb (Test::Unit::StatusLine#failed): defer
+	  failed messages until the end in verbose mode, to get rid of
+	  interleaving failures with progress messages.
+
+Sat Mar 19 21:53:35 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (fix_cmp): invert the result as the comparison is
+	  inverted.
+
+Sat Mar 19 18:32:00 2016  Kenta Murata  <mrkn@mrkn.jp>
+
+	* numeric.c (int_to_f): raise NotImplementedError when a receiver
+	  class is unknown.
+
+	* test/-ext-/integer/test_my_integer.rb (test_my_integer_to_f): modify
+	  a test for the above change.
+
+Sat Mar 19 18:21:00 2016  Kenta Murata  <mrkn@mrkn.jp>
+
+	* bignum.c (Bignum#<=>): remove it because they are unified with
+	  Integer#<=>.
+
+	* numeric.c (Integer#<=>, Fixnum#<=>): move <=> method from Fixnum to
+	  Integer.
+
+	* numeric.c (int_cmp): add this method for Integer#<=>.
+
+	* test/-ext-/integer/test_my_integer.rb (test_my_integer_cmp): add a
+	  test to examine Integer#<=> for unknown subclasses.
+
+Sat Mar 19 14:46:18 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* iseq.c (rb_iseq_compile_with_option): make the parser in mild
+	  error.
+
+	* load.c (rb_load_internal0): ditto.
+
+	* parse.y (yycompile0): return the error message within the error
+	  to be raised.  [Feature #11951]
+
+	* parse.y (parser_compile_error): accumulate error messages in the
+	  error_buffer.
+
+Sat Mar 19 03:57:13 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* time.c (LOCALTIME): organize #ifdefs.
+
+	* time.c (GMTIME): define only ifndef HAVE_STRUCT_TM_TM_GMTOFF.
+
+Sat Mar 19 03:53:31 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in (rb_cv_member_struct_tm_tm_gmtoff): For Linux (glibc)
+	  define _BSD_SOURCE for time.h to define struct tm.tm_gmtoff.
+
+	* time.c: define _BSD_SOURCE at the top.
+
+Sat Mar 19 03:00:50 2016  Rei Odaira  <Rei.Odaira@gmail.com>
+
+	* test/-ext-/time/test_new.rb (test_timespec_new): change a gmtoff
+	  test to a better one that does not depend on whether the current
+	  time is in summer time or not.
+
+Fri Mar 19 00:00:00 2016  Kenta Murata  <mrkn@mrkn.jp>
+
+	* bignum.c (rb_big_to_f, Bignum#to_f): removed them because they are
+	  unified with int_to_f and Integer#to_f.
+
+	* numeric.c (int_to_f): treat Bignum values directly.
+
+Fri Mar 18 23:41:00 2016  Kenta Murata  <mrkn@mrkn.jp>
+
+	* numeric.c (int_to_f, fix_to_f): rename fix_to_f to int_to_f, and add
+	  treatment for subclasses which don't have definitions of to_f method.
+
+	* numeric.c (Integer#to_f, Fixnum#to_f): move to_f method from Fixnum
+	  to Integer.
+
+	* ext/-test-/integer/my_integer.c: define helper class for testing
+	  to_f method for a subclass of Integer.
+
+	* ext/-test-/integer/extconf.rb: ditto.
+
+	* ext/-test-/integer/init.c: ditto.
+
+	* test/-ext-/integer/test_my_integer.rb: examine to_f method for a
+	  subclass of Integer.
+
+Fri Mar 18 22:32:00 2016  Kenta Murata  <mrkn@mrkn.jp>
+
+	* include/ruby/intern.h (rb_big_hash): Move to internal.h.
+
+	* internal.h: ditto.
+
+Fri Mar 18 22:10:00 2016  Kenta Murata  <mrkn@mrkn.jp>
+
+	* bignum.c (Bignum#eql?): remove its definition because it is unified
+	  with Numeric#eql?.
+
+	* numeric.c (num_eql): treat Bignum values directly.
+
+Fri Mar 18 21:57:00 2016  Kenta Murata  <mrkn@mrkn.jp>
+
+	* bignum.c (rb_big_to_s, Bignum#to_s): remove its definition because
+	  it is unified with Integer#to_s.
+
+	* numeric.c (int_to_s): treat Bignum values directly.
+
+Fri Mar 18 21:30:00 2016  Kenta Murata  <mrkn@mrkn.jp>
+
+	* numeric.c (int_to_s): Move from fix_to_s.
+
+	* numeric.c (Integer#to_s): Move from Fixnum#to_s.
+
+Fri Mar 18 16:22:24 2016  Victor Nawothnig  <Victor.Nawothnig@gmail.com>
+
+	* parse.y (parse_numvar): NTH_REF must be less than a half of
+	  INT_MAX, as it is left-shifted to be ORed with back-ref flag.
+	  [ruby-core:74444] [Bug#12192] [Fix GH-1296]
+
+Fri Mar 18 12:25:30 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (tick): fix missing close parenthesis.  [Fix GH-1291]
+
+Fri Mar 18 10:24:12 2016  Naotoshi Seo  <sonots@gmail.com>
+
+	* ext/date/date_core.c (datetime_to_time): preserve timezone info
+	  [Bug #12189] [Fix GH-1295]
+
+Fri Mar 18 10:17:00 2016  Kenta Murata  <mrkn@mrkn.jp>
+
+	* bignum.c (rb_big_hash): make it public function to be available in
+	  other source files, and remove documentation comment for Bignum#hash.
+
+	* bignum.c (Bignum#hash): remove its definition because it is unified
+	  with Object#hash.
+
+	* include/ruby/intern.h (rb_big_hash): add a prototype declaration.
+
+	* hash.c (any_hash): treat Bignum values directly.
+
+Fri Mar 18 02:35:12 2016  Naotoshi Seo  <sonots@gmail.com>
+
+	* lib/time.rb (parse, strptime): Fix Time.parse/strptime does not
+	  have compatibility with DateTime.parse/strptime in terms of parsing
+	  timezone [Bug #12190] [Fix GH-1297]
+
+Fri Mar 18 02:17:00 2016  Kenta Murata  <mrkn@mrkn.jp>
+
+	* numeric.c (fix_zero_p, fix_even_p, fix_odd_p): remove needless
+	  functions.
+
+Fri Mar 18 02:15:00 2016  Kenta Murata  <mrkn@mrkn.jp>
+
+	* numeric.c (int_even_p): treat Fixnum and Bignum values directly.
+
+Fri Mar 18 02:07:00 2016  Kenta Murata  <mrkn@mrkn.jp>
+
+	* bignum.c (Bignum#even?, Bignum#odd?): remove definitions
+	  because they are unified with Integer#even? and Integer#odd?.
+
+	* numeric.c (Fixnum#zero?, Fixnum#even?, Fixnum#odd?): remove
+	  definitions because they are unified with Numeric#zero?,
+	  Integer#even?, and Integer#odd?.
+
+	* numeric.c (num_zero_p, int_odd_p): treat Fixnum and
+	  Bignum values directly.
+
+	* test/ruby/test_integer.rb (test_odd_p_even_p): remove meaningless
+	  test case.
+
+Fri Mar 18 01:51:00 2016  Kenta Murata  <mrkn@mrkn.jp>
+
+	* bignum.c (rb_big_even_p, rb_big_odd_p): make them public functions
+	  to be available in other source files.
+
+	* include/ruby/intern.h (rb_big_even_p, rb_big_odd_p): add prototype
+	  declarations.
+
+Fri Mar 18 00:25:56 2016  Tanaka Akira  <akr@fsij.org>
+
+	* enum.c (ary_inject_op): Implement the specialized code for sum of
+	  float numbers.
+
+Fri Mar 18 00:15:05 2016  Yusuke Endoh  <mame@ruby-lang.org>
+
+	* numeric.c (num_step): use rb_equal for zero check. rb_num_coerce_cmp
+	  created an object which caused extra overhead.
+
+Thu Mar 17 22:21:34 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (RB_GC_GUARD_PTR): remove intermediate
+	  macro, and expand for each RB_GC_GUARD.  [Fix GH-1293]
+
+Thu Mar 17 22:08:33 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_specialized_instruction): move specialization
+	  for opt_newarray_max/min from translation phase.
+
+Thu Mar 17 21:52:09 2016  Yusuke Endoh  <mame@ruby-lang.org>
+
+	* array.c, enum.c: make rdoc format consistent.
+
+Thu Mar 17 21:47:57 2016  Yusuke Endoh  <mame@ruby-lang.org>
+
+	* NEWS: add Array#max, #min, and the optimization.  [Feature #12172]
+
+Thu Mar 17 21:45:02 2016  Yusuke Endoh  <mame@ruby-lang.org>
+
+	* compile.c (NODE_CALL): add optimization shortcut for Array#max/min.
+	  Now `[x, y].max` is optimized so that a temporal array object is not
+	  created in some condition.  [Feature #12172]
+
+	* insns.def (opt_newarray_max, opt_newarray_min): added.
+
+Thu Mar 17 21:35:52 2016  Yusuke Endoh  <mame@ruby-lang.org>
+
+	* array.c (rb_ary_max, rb_ary_min): implement Array#max and min with
+	  arguments.  replace super call with rb_nmin_run.
+
+	* enum.c (nmin_run): exported (as rb_nmin_run).
+
+	* internal.h: added a prototype for rb_nmin_run.
+
+Thu Mar 17 21:24:52 2016  Yusuke Endoh  <mame@ruby-lang.org>
+
+	* array.c (rb_ary_max, rb_ary_min): implement a block by itself instead
+	  of delegating Enumerable#max/min.
+
+Thu Mar 17 21:09:34 2016  Yusuke Endoh  <mame@ruby-lang.org>
+
+	* array.c (rb_ary_max, rb_ary_min): Array#max and Array#min added.
+	  [Feature #12172]
+
+	* internal.h (OPTIMIZED_CMP): moved from enum.c so that array.c can
+	  use it.
+
+	* test/ruby/test_array.rb (test_max, test_min): tests for Array#max
+	  and Array#min.
+
+	* test/ruby/test_enum.rb (test_max, test_min): revised a bit to test
+	  Enumerable#max and #min explicitly.
+
+Thu Mar 17 21:02:42 2016  Yusuke Endoh  <mame@ruby-lang.org>
+
+	* internal.c: struct cmp_opt_data added for refactoring out a data
+	  structure for CMP_OPTIMIZABLE
+
+	* array.c (struct ary_sort_data): use struct cmp_opt_data.
+
+	* enum.c (struct min_t, max_t, min_max_t): use struct cmp_opt_data.
+
+Thu Mar 17 20:55:21 2016  Tanaka Akira  <akr@fsij.org>
+
+	* enum.c (ary_inject_op): Extracted from enum_inject.
+
+Thu Mar 17 18:39:04 2016  Tanaka Akira  <akr@fsij.org>
+
+	* enum.c (enum_inject): Implement the specialized code for sum of
+	  integers including Bignums.
+
+	* internal.h (rb_fix_plus): Declared to be usable from enum_inject.
+
+	* numeric.c (rb_fix_plus): Defined.
+
+Thu Mar 17 17:20:28 2016  Anton Davydov  <antondavydov.o@gmail.com>
+
+	* thread_sync.c: [DOC] Update documentation for Queue class
+	  description.  [Fix GH-1292]
+
+Thu Mar 17 17:14:51 2016  Dinar Valeev  <dvaleev@suse.com>
+
+	* gc.c (tick): Use __builtin_ppc_get_timebase for POWER arch.
+	  [Fix GH-1291]
+
+Thu Mar 17 11:51:48 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/securerandom.rb (gen_random): to avoid blocking on Windows.
+	  On Windows OpenSSL RAND_bytes (underlying implementation is
+	  RAND_poll in crypto/rand/rand_win.c) may be blocked at
+	  NetStatisticsGet.
+	  https://wiki.openssl.org/index.php/Random_Numbers#Windows_Issues
+	  Instead of this, use Random.raw_seed directly (whose implementation
+	  CryptGenRandom is one of the source of
+	  entropy of RAND_poll on Windows).
+	  https://wiki.openssl.org/index.php/Random_Numbers
+	  Note: CryptGenRandom function is PRNG and doesn't check its entropy,
+	  so it won't block. [Bug #12139]
+	  https://msdn.microsoft.com/ja-jp/library/windows/desktop/aa379942.aspx
+	  https://tools.ietf.org/html/rfc4086#section-7.1.3
+	  https://eprint.iacr.org/2007/419.pdf
+	  http://www.cs.huji.ac.il/~dolev/pubs/thesis/msc-thesis-leo.pdf
+
+Thu Mar 17 12:09:00 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/unicode.c: Fixed two macro definitions.
+	* test/ruby/enc/test_case_mapping.rb: Test cases that detected
+	  the above bugs.
+
+Thu Mar 17 11:36:27 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/option.c (inspect_tcpi_msec): more accurate condition
+	  for TCPI msec member inspection function.
+	  [ruby-core:74388] [Bug #12185]
+
+Thu Mar 17 08:13:43 2016  Rei Odaira  <Rei.Odaira@gmail.com>
+
+	* test/-ext-/time/test_new.rb (test_timespec_new): Time#gmtoff values
+	  are the same only when both or neither of the Time objects are in
+	  summer time (daylight-saving time).
+
+Thu Mar 17 07:17:36 2016  Eric Hodel  <drbrain@segment7.net>
+
+	* marshal.c (r_object0):  raise ArgumentError when linking to undefined
+	  object.
+
+Thu Mar 17 00:45:00 2016  Kenta Murata  <mrkn@mrkn.jp>
+
+	* test/ruby/test_bignum.rb: Make sure to use Bignum values in the tests.
+
+Wed Mar 16 23:10:25 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* defs/keywords (alias, undef): symbol literals are allowed.
+
+	* parse.y (parse_percent): should parse symbol literals for alias
+	  and undef.  [ruby-dev:47681] [Bug #8851]
+
+Wed Mar 16 21:39:39 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/trans/JIS: update Unicode's notice. [Bug #11844]
+
+Wed Mar 16 20:03:35 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (proc_binding): proc from symbol can not make a binding.
+	  [ruby-core:74100] [Bug #12137]
+
+Wed Mar 16 18:42:45 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* test/ruby/enc/test_case_mapping.rb: Fixed and activated a test for Cherokee.
+
+Wed Mar 16 17:58:56 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* test/ruby/enc/test_case_mapping.rb: Fixed a logical error.
+
+Wed Mar 16 17:57:34 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* test/ruby/enc/test_case_mapping.rb: Adding tests for Cherokee.
+	  One test not yet working.
+	  (with Kimihito Matsui)
+
+Wed Mar 16 15:44:05 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* test/ruby/enc/test_case_mapping.rb: Adding tests for actual Unicode
+	  case mapping. Fixing some aliasing issues.
+	  (with Kimihito Matsui)
+
+Tue Mar 15 21:38:28 2016  Tanaka Akira  <akr@fsij.org>
+
+	* enum.c (enum_inject): Consider redefinition of Fixnum#+.
+	  [ruby-dev:49510] [Bug#12178] Reported by usa.
+
+Tue Mar 15 20:32:57 2016  Tanaka Akira  <akr@fsij.org>
+
+	* enum.c (enum_inject): Implement the specialized code for :+ operator
+	  for Fixnums.
+
+Tue Mar 15 20:21:01 2016  Tanaka Akira  <akr@fsij.org>
+
+	* enum.c (enum_inject): Implement the specialized code for self is an
+	  array and a symbol operator is given.
+
+Tue Mar 15 16:29:51 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/unicode.c: Eliminating common code.
+	  (with Kimihito Matsui)
+
+Tue Mar 15 16:17:09 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/unicode.c: Expansion of some code repetition in preparation for
+	  elimination of common code pieces.
+	  (with Kimihito Matsui)
+
+Tue Mar 15 13:49:23 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/unicode.c: Additional macros and code to use mapping data in
+	  CaseMappingSpecials array.
+	  (with Kimihito Matsui)
+
+Tue Mar 15 13:41:22 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* internal.h (rb_gc_mark_global_tbl): should be private,
+	  but was accidentally exported.
+
+Tue Mar 15 12:51:06 2016  Marcus Stollsteimer  <sto.mar@web.de>
+
+	* doc/extension.ja.rdoc: Fix RDoc markup in doc/extension*.rdoc.
+	  [ci skip][Bug #12143][ruby-core:74143]
+	* doc/extension.rdoc: ditto.
+
+Tue Mar 15 09:56:41 2016  Ian Lunderskov  <ian.lunderskov@gmail.com>
+
+	* time.c: Minor typo in Time#dst? documentation.
+	  [ci skip][fix GH-1290]
+
+Tue Mar 15 04:36:41 2016  Charles Oliver Nutter  <headius@headius.com>
+
+	* test/ruby/test_rubyoptions.rb (test_disable): add tests for
+	  --disable-gems and --disable-did_you_mean.
+
+Tue Mar 15 03:35:04 2016  Eric Hodel  <drbrain@segment7.net>
+
+	* marshal.c (r_object0): Fix Marshal crash for corrupt extended object.
+
+Tue Mar 15 01:22:27 2016  Charles Oliver Nutter  <headius@headius.com>
+
+	* test/ruby/test_rubyoptions.rb: make version matching support
+	  JRuby's version output.
+
+Mon Mar 14 19:05:39 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* bignum.c (big2str_2bdigits): reduce div instruction.
+
+Mon Mar 14 18:39:53 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* include/ruby/oniguruma.h, enc/unicode.c: Adjusting flag assignments
+	  and macros to work with unified CaseMappingSpecials array.
+	  (with Kimihito Matsui)
+
+Mon Mar 14 16:53:37 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (compile_named_capture_assign): optimize named capture
+	  assignments, by replacing repeating global variable accesses
+	  with `dup`, and by returning the matched result instead of
+	  re-getting it from the MatchData.
+
+	* parse.y (reg_named_capture_assign_gen): build just assignment
+	  nodes for the optimization.
+
+Mon Mar 14 16:02:59 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (ruby_is_fd_loadable): now return -1 if loadable but
+	  may block.
+
+	* ruby.c (open_load_file): wait to read by the result of
+	  ruby_is_fd_loadable, without fstat.
+
+Mon Mar 14 13:38:38 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* numeric.c (fix2str): improve r54092 like rb_int2big().
+
+Mon Mar 14 10:02:23 2016  Eric Wong  <e@80x24.org>
+
+	* ext/openssl/ossl_ssl.c (ossl_sslctx_setup): document as MT-unsafe
+	  [ruby-core:73803] [Bug #12069]
+
+Sun Mar 13 09:43:23 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/win32.h (O_SHARE_DELETE): change to fit Fixnum
+	  limit.  [ruby-core:74285] [Bug #12171]
+
+Sun Mar 13 09:15:45 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (rb_fix2str): fix edge case, accidentally generated
+	  wrong Fixnum from LONG_MIN.
+
+Sat Mar 12 09:50:27 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (rb_f_catch): [DOC] fix malformed RDoc syntax, "+...+"
+	  cannot enclose non-identifier characters.
+	  a patch by Sebastian S in [ruby-core:74278].  [Bug#12170]
+
+Sat Mar 12 02:44:48 2016  Tanaka Akira  <akr@fsij.org>
+
+	* test/lib/test/unit.rb: describe !/REGEXP/ in the help message.
+
+Fri Mar 11 17:03:09 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/lib/test/unit.rb (Options#non_options): make regexp name
+	  options prefixed with "!" negative filters.
+
+	* common.mk (TEST_EXCLUDES): use negative filter to exclude memory
+	  leak tests.  -x option excludes test files, not test methods.
+
+Fri Mar 11 16:11:27 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/unicode/case-folding.rb, casefold.h: Streamlining approach to
+	  case mapping data not available from case folding by unifying all
+	  three cases (special title, special upper, special lower).
+	* enc/unicode.c: Adjust macro names for above (macros are currently inactive).
+	  (with Kimihito Matsui)
+
+Thu Mar 10 17:34:16 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* iseq.c (prepare_iseq_build): enable coverage by coverage_enabled
+	  option, not by parse_in_eval flag in the thread context.
+
+	* iseq.h (rb_compile_option_struct): add coverage_enabled flag.
+
+	* parse.y (yycompile0): set coverage_enabled flag if coverage
+	  array is made.
+
+Thu Mar 10 15:19:54 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* node.c (dump_option): nd_compile_option is a hidden hash object,
+	  cannot call inspect on it.
+
+Thu Mar 10 09:49:54 2016  Rei Odaira  <Rei.Odaira@gmail.com>
+
+	* test/socket/test_socket.rb (test_udp_recvmsg_truncation):
+	  AIX does not set the MSG_TRUNC flag for a message partially read
+	  by recvmsg(2) with the MSG_PEEK flag set.
+
+Wed Mar  9 16:48:45 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/driver.rb: fix my last commit (syntax error).
+
+Wed Mar  9 16:41:44 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/driver.rb: fix output messages.
+
+	* benchmark/memory_wrapper.rb: use respond_to? because
+	  member? does not work well.
+
+Wed Mar  9 16:20:25 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/driver.rb: support memory usage benchmark.
+	  use `--measure-target=[target]'.
+	  Now, we can use the following targets:
+	    * real (default): real time which returns process time in sec.
+	    * peak: peak memory usage (physical memory) in bytes.
+	    * size: last memory usage (physical memory) in bytes.
+
+	* benchmark/memory_wrapper.rb: ditto.
+
+Wed Mar  9 15:04:22 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/bm_vm3_gc_old_full.rb: add GC.start benchmark.
+
+	* benchmark/bm_vm3_gc_old_immediate.rb: ditto.
+
+	* benchmark/bm_vm3_gc_old_lazy.rb: ditto.
+
+Wed Mar  9 14:59:11 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/driver.rb: exit benchmarking if a benchmark process
+	  receives signals.
+
+Wed Mar  9 13:22:49 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/lib/memory_status.rb: make Memory::Status independent of
+	  MiniTest::Skip.
+
+	* test/lib/test/unit/assertions.rb (assert_no_memory_leak): skip
+	  if Memory::Status is not available.
+
+Wed Mar  9 09:19:55 2016  Rei Odaira  <Rei.Odaira@gmail.com>
+
+	* test/io/wait/test_io_wait.rb (test_wait_readwrite_timeout):
+	  select(2) in AIX returns "readable" for the write-side fd
+	  of a pipe, so it is not possible to use a pipe to test
+	  the read-write timeout of IO#wait on AIX.
+
+Wed Mar  9 03:35:22 2016  Charles Oliver Nutter  <headius@headius.com>
+
+	* test/ruby/test_require.rb (test_require_with_loaded_features_pop):
+	  Only remove PATH so threads don't accidentally double-pop.
+
+Wed Mar  9 00:29:46 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_method.c (rb_alias): the original name should be properly
+	  available method_added method, set the name before calling the
+	  hook.
+
+Wed Mar  9 00:07:03 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/logger.rb (Logger::LogDevice#initialize): define using
+	  keyword arguments.
+
+Tue Mar  8 23:37:07 2016  Charles Oliver Nutter  <headius@headius.com>
+
+	* test/ruby/test_array.rb: split out the test for no stack error
+	  on large input for test_permutation, test_repeated_permutation,
+	  and test_repeated_combination, and make them all timeout:30.
+
+Tue Mar  8 17:20:21 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* intern.h (rb_divmod): assume compilers `/` and `%` comply C99
+	  and reduce branching. If a compiler doesn't comply, add #ifdefs.
+
+	* intern.h (rb_div): added for Ruby's behavior.
+
+	* intern.h (rb_mod): added for Ruby's behavior.
+
+	* insns.def (opt_div): use rb_div.
+
+	* insns.def (opt_mod): use rb_mod.
+
+	* numeric.c (fixdivmod): removed.
+
+	* numeric.c (fix_divide): use rb_div.
+
+	* numeric.c (fix_mod): use rb_mod.
+
+	* numeric.c (fix_divmod): use rb_divmod.
+
+Tue Mar  8 17:53:09 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* insns.def (opt_mod): show its method name on ZeroDivisionError.
+	  [Bug #12158]
+
+Tue Mar  8 17:33:38 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_write_console): now no need to check
+	  ERROR_CALL_NOT_IMPLEMENTED because it is for old Win9X.
+
+Tue Mar  8 16:54:29 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_write_console): stop the VT100 emulation if the
+	  console supports it natively.
+
+Tue Mar  8 08:13:01 2016  Rei Odaira  <Rei.Odaira@gmail.com>
+
+	* test/net/imap/test_imap.rb (test_idle_timeout): Because of the
+	  timeout specified in "imap.idle(0.2)", there is no guarantee that
+	  the server thread has done all the work before the client thread
+	  performs the assertions. It depends on the thread scheduling.
+	  Add checks to avoid false positives (on AIX, particularly).
+
+Tue Mar  8 00:42:22 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ruby.c (warn_cr_in_shebang): meaningless check on DOSISH platforms.
+	  fixed a test failure introduced at r53998.
+
+Tue Mar  8 00:27:53 2016  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* ext/tk/lib/tkextlib/tcllib/tablelist_tile.rb: fix method name typo.
+	  [ruby-core:72513] [Bug #11893] The patch provided by Akira Matsuda.
+
+
+Tue Mar  8 00:25:08 2016  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* ext/tk/lib/tkextlib/tcllib/toolbar.rb: fix method name typo.
+	  [ruby-core:72511] [Bug #11891] The patch provided by Akira Matsuda.
+
+
+Tue Mar  8 00:21:58 2016  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* ext/tk/lib/tkextlib/blt/tree.rb: fix method name typo.
+	  [ruby-core:72510] [Bug #11890] The patch provided by Akira Matsuda.
+
+
+Tue Mar  8 00:11:47 2016  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* ext/tk/lib/tk/menubar.rb: fix a typo in font name. [ruby-core:72505]
+	  [Bug #11886] The patch provided by Akira Matsuda.
+
+	* ext/tk/sample/*.rb: ditto.
+
+Mon Mar  7 13:32:58 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* class.c (rb_define_class, rb_define_class_id_under): raise
+	  ArgumentError if super is 0, deprecated behavior which has been
+	  warned long time.
+
+Mon Mar  7 13:28:30 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* internal.h: move function declarations for class internals from
+	  include/ruby/intern.h.
+
+Mon Mar  7 10:58:07 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/win32ole/win32ole_event.c (rescue_callback): use
+	  rb_write_error_str instead of rb_write_error, to respect
+	  the encoding and prevent the message from GC.
+
+	* internal.h (rb_write_error_str): export.
+
+Mon Mar  7 01:38:41 2016  Rei Odaira  <Rei.Odaira@gmail.com>
+
+	* test/ruby/test_process.rb (test_execopts_gid): Skip a test
+	  that is known to fail on AIX. AIX allows setgid to
+	  a supplementary group, but Ruby does not allow the "-e"
+	  option when setgid'ed, so the test does not work as intended.
+
+Sun Mar  6 22:43:41 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_obj_display): [DOC] fix output of Array, as Array#to_s
+	  is same as Array#inspect since 1.9.
+
+Sat Mar  5 09:50:58 2016  Rei Odaira  <Rei.Odaira@gmail.com>
+
+	* test/socket/test_addrinfo.rb (test_ipv6_address_predicates):
+	  IN6_IS_ADDR_V4COMPAT and IN6_IS_ADDR_V4MAPPED are broken
+	  on AIX, so skip related tests.
+
+Sat Mar  5 09:17:54 2016  Rei Odaira  <Rei.Odaira@gmail.com>
+
+	* test/rinda/test_rinda.rb (test_make_socket_ipv4_multicast):
+	  The fifth argument to getsockopt(2) should be modified to
+	  indicate the actual size of the value on return,
+	  but not in AIX. This is a know bug. Skip related tests.
+	* test/rinda/test_rinda.rb (test_ring_server_ipv4_multicast):
+	  ditto.
+	* test/rinda/test_rinda.rb (test_make_socket_unicast): ditto.
+	* test/socket/test_basicsocket.rb (test_getsockopt): ditto.
+	* test/socket/test_sockopt.rb (test_bool): ditto.
+
+Sat Mar  5 07:36:27 2016  Rei Odaira  <Rei.Odaira@gmail.com>
+
+	* test/-ext-/float/test_nextafter.rb: In AIX,
+	  nextafter(+0.0,-0.0)=+0.0, and nextafter(-0.0,+0.0)=-0.0,
+	  but they should return -0.0 and +0.0, respectively. This is
+	  a known bug in nextafter(3) on AIX, so skip related tests.
+
+Sat Mar  5 07:14:10 2016  Rei Odaira  <Rei.Odaira@gmail.com>
+
+	* test/zlib/test_zlib.rb (test_adler32_combine, test_crc32_combine):
+	  Skip two tests on AIX because zconf.h in zlib does not correctly
+	  recognize _LARGE_FILES in AIX. The problem was already reported
+	  to zlib, and skip these tests until it is fixed.
+
+Sat Mar  5 03:07:40 2016  Rei Odaira  <Rei.Odaira@gmail.com>
+
+	* thread_pthread.c (getstack): __pi_stacksize returned by
+	  pthread_getthrds_np() is wrong on AIX. Use
+	  __pi_stackend - __pi_stackaddr instead.
+
+Fri Mar  4 19:19:42 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: use 2 bits with unsigned int for rb_objspace::flags::mode
+	  because it always returns 0 to 2 (non-negative value).
+
+Fri Mar  4 18:42:08 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: rename "enum gc_stat" to "enum gc_mode"
+	  because there is a same name (no related) function gc_stat().
+
+	  Also gc_stat_* are renamed to gc_mode_*,
+	  gc_stat_transition() to gc_mode_transition(),
+	  rb_objspace::flags::stat is renamed to rb_objspace::flags::mode.
+
+	  Change rb_objspace::flags::mode from 2 bits to 3 bits because VC++
+	  returns negative enum value with 2 bits.
+
+	* gc.c (gc_mode): add a macro to access rb_objspace::flags::mode
+	  with verification code (verification is enabled only on
+	  RGENGC_CHECK_MODE > 0).
+
+	* gc.c (gc_mode_set): same macro for setter.
+
+Fri Mar  4 09:28:18 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update rubygems-2.6.1.
+	  Please see entries of 2.6.0 and 2.6.1 on
+	  https://github.com/rubygems/rubygems/blob/master/History.txt
+	  [fix GH-1270] Patch by @segiddins
+
+Thu Mar  3 14:09:00 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/ostruct.rb (modifiable?, new_ostruct_member!, table!):
+	  rename methods for internal use with suffixes and make private,
+	  [ruby-core:71069] [Bug #11587]
+
+Wed Mar  2 16:28:48 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (method_missing): call by found method entry and get
+	  rid of searching the same method entry twice.
+
+	* vm_eval.c (vm_call0_body): calling method_missing method is
+	  method_missing().
+
+Wed Mar  2 15:13:33 2016  herwinw  <herwin@quarantainenet.nl>
+
+	* lib/xmlrpc.rb: Removed broken parser named XMLScanStreamParser.
+	  It's not works with current Ruby version.
+	  [fix GH-1271][ruby-core:59588][Bug #9369]
+	* lib/xmlrpc/config.rb: ditto.
+	* lib/xmlrpc/parser.rb: ditto.
+
+Wed Mar  2 15:08:33 2016  herwinw  <herwin@quarantainenet.nl>
+
+	* lib/xmlrpc.rb: Removed broken parser named XMLTreeParser.
+	  Required gem of its parser didn't compile on newer Ruby versions.
+	  [fix GH-1271][ruby-core:59590][Bug #9370]
+	* lib/xmlrpc/config.rb: ditto.
+	* lib/xmlrpc/parser.rb: ditto.
+
+Tue Mar  1 11:25:48 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/fileutils.rb: use keyword arguments instead of option
+	  hashes.
+
+Mon Feb 29 16:50:20 2016  hanachin  <hanachin@gmail.com>
+
+	* array.c (rb_ary_push_m): [DOC] Remove trailing comma from
+	  Array#push example, as other Array examples doesn't put trailing
+	  comma.  [Fix GH-1279]
+
+Mon Feb 29 16:31:01 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk, tool/mkconfig.rb: set cross_compiling option from
+	  Makefile, but not from rbconfig.rb, which is just going to be
+	  created by this command.
+
+Sun Feb 28 23:13:49 2016  C.J. Collier  <cjcollier@linuxfoundation.org>
+
+	* configure.in: Add summary to end of configure output.
+	  [Fix GH-1275]
+
+Sun Feb 28 20:23:36 2016  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/drb.rb (error_print): Add verbose failure messages and
+	  avoid infamous DRb::DRbConnError. [Feature #12101]
+
+Sun Feb 28 13:40:46 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (nometh_err_initialize): add private_call? parameter.
+
+	* error.c (nometh_err_private_call_p): add private_call? method,
+	  to tell if the exception raised in private form FCALL or VCALL.
+	  [Feature #12043]
+
+	* vm_eval.c (make_no_method_exception): append private_call?
+	  argument.
+
+	* vm_insnhelper.c (ci_missing_reason): copy FCALL flag.
+
+Sun Feb 28 10:19:47 2016  Ryan T. Hosford  <tad.hosford@gmail.com>
+
+	* array.c (rb_ary_and): clarify that set intersection returns the
+	  unique elements common to both arrays.
+
+	* array.c (rb_ary_or): clarify that union preserves the order from
+	  the given arrays.
+
+Sat Feb 27 17:05:29 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/unicode/case-folding.rb, casefold.h: Reducing size of TitleCase
+	  table by eliminating duplicates.
+	  (with Kimihito Matsui)
+
+Fri Feb 26 14:40:48 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (num_step_scan_args): comparison String with Numeric
+	  should raise TypeError. it is an invalid type, but not a
+	  mismatch the number of arguments.  [ruby-core:62430] [Bug #9810]
+
+Fri Feb 26 14:39:39 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* doc/extension.rdoc, doc/extension.ja.rdoc: add editor local
+	  variables, with commenting out by :enddoc: directives which are
+	  just ignored unless code object mode.  [Bug #12111]
+
+Fri Feb 26 12:25:56 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* doc/extension.ja.rdoc: removed rendering error caused by editor specific
+	  configuration on http://docs.ruby-lang.org/en/trunk/extension_rdoc.html .
+	  [Bug #12111][ruby-core:73990]
+
+Fri Feb 26 11:21:41 2016  herwinw  <herwin@quarantainenet.nl>
+
+	* lib/xmlrpc.rb: Removed references to NQXML. It's obsoleted parser.
+	  [fix GH-1245][ruby-core:59593][Feature #9371]
+	* lib/xmlrpc/config.rb: ditto.
+	* lib/xmlrpc/parser.rb: ditto.
+
+Fri Feb 26 11:10:19 2016  Rick Salevsky  <rsalevsky@suse.com>
+
+	* lib/tmpdir.rb: Unify to coding-style for method definition.
+	  [fix GH-1252]
+
+Fri Feb 26 11:02:04 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* README.md: update markdown syntax for anchor tag.
+	  [fix GH-1265] Patch by @lukBarros
+
+Fri Feb 26 10:52:29 2016  Alex Boyd  <alex@opengroove.org>
+
+	* lib/irb.rb: avoid to needless truncation when using back_trace_limit option.
+	  [fix GH-1205][ruby-core:72773][Bug #11969]
+
+Fri Feb 26 08:11:58 2016  Aaron Patterson <tenderlove@ruby-lang.org>
+
+	* gem_prelude.rb: Reduce system calls by activating the `did_you_mean`
+	  gem before requiring the gem.  Activating the gem puts the gem on
+	  the load path, where simply requiring the file will search every gem
+	  that's installed until it can find a gem that contains the
+	  `did_you_mean` file.
+
+Thu Feb 25 19:04:13 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/unicode/case-folding.rb: Adding possibility for debugging output
+	  for TitleCase table in casefold.h.
+	  (with Kimihito Matsui)
+
+Wed Feb 24 22:31:13 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* include/ruby/oniguruma.h: Rearranging flag assignments and making
+	  space for titlecase indices; adding additional macros to add or
+	  extract titlecase index; adding comments for better documentation.
+	* enc/unicode.c: Moving some macros to include/ruby/oniguruma.h;
+	  activating use of titlecase indices.
+	  (with Kimihito Matsui)
+
+Wed Feb 24 21:03:04 2016  Tanaka Akira  <akr@fsij.org>
+
+	* random.c (limited_rand): Add a specialized path for when the limit fits
+	  in 32 bit.
+
+Tue Feb 23 21:52:24 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/unicode/case-folding.rb, casefold.h: Outputting actual titlecase
+	  data (new table, with indices from other tables).
+	* enc/unicode.c: Ignoring titlecase data indices for the moment.
+	  (with Kimihito Matsui)
+
+Tue Feb 23 15:21:14 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/unicode/case-folding.rb, casefold.h: Reading casing data from
+	  SpecialCasing.txt.
+	  (with Kimihito Matsui)
+
+Mon Feb 22 18:33:55 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/unicode/case-folding.rb, casefold.h: Adding flag for title-case,
+	  not yet operational.
+	  (with Kimihito Matsui)
+
+Mon Feb 22 18:17:03 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/unicode/case-folding.rb, casefold.h: Fixed bug that avoided inclusion
+	  of compatibility characters in upper-/lower-case mappings.
+	  (with Kimihito Matsui)
+
+Sun Feb 21 13:57:18 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* cgi/escape/escape.c: Optimize CGI.unescape performance by C ext
+	  for ASCII-compatible encodings.  [Fix GH-1250]
+
+Sun Feb 21 13:56:57 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* cgi/escape/escape.c: Optimize CGI.unescapeHTML performance by C
+	  ext for ASCII-compatible encodings.  [Fix GH-1242]
+
+Sat Feb 20 15:38:16 2016  Eric Wong  <e@80x24.org>
+
+	* doc/extension.rdoc: update paths for defs/ directory
+
+Sat Feb 20 14:44:15 2016  Lucas Buchala  <lucasbuchala@gmail.com>
+
+	* vm_eval.c (rb_mod_module_eval): [DOC] Fix documentation
+	  signature for Module#module_eval.  [Fix GH-1258]
+
+Sat Feb 20 14:40:44 2016  Adam O'Connor  <northband@gmail.com>
+
+	* README.md: a few grammatical changes to the main Ruby README.md.
+	  [Fix GH-1259]
+
+Sat Feb 20 13:04:22 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (push_pattern, push_glob): deal with read paths as UTF-8
+	  to stat later, on Windows as well as OS X.
+	  [ruby-core:73868] [Bug #12081]
+
+Sat Feb 20 01:53:33 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (rb_mod_const_get): make error message at uninterned
+	  string consistent with symbols.  [ruby-dev:49498] [Bug #12089]
+
+Fri Feb 19 23:37:52 2016  Masahiro Tomita  <tommy@tmtm.org>
+
+	* lib/find.rb (Find#find): raise with the given path name if it
+	  does not exist.  [ruby-dev:49497] [Bug #12087]
+
+Fri Feb 19 12:44:57 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/unicode.c: Activated use of case mapping data in CaseUnfold_11 array.
+	  (with Kimihito Matsui)
+
+Fri Feb 19 11:08:32 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb: add cygwin case, nothing excluded.
+	  [ruby-core:73806] [Bug#12071]
+
+Thu Feb 18 21:32:15 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* man/irb.1: fix output in EXAMPLES.
+
+Thu Feb 18 21:05:47 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (sym_match_m): delegate to String#match but not
+	  String#=~.  [ruby-core:72864] [Bug #11991]
+
+Thu Feb 18 14:15:38 2016  Shota Fukumori  <her@sorah.jp>
+
+	* re.c: Add MatchData#named_captures
+	  [Feature #11999] [ruby-core:72897]
+
+	* test/ruby/test_regexp.rb(test_match_data_named_captures): Test for above.
+
+	* NEWS: News about MatchData#named_captures.
+
+Wed Feb 17 21:41:29 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* defs/id.def (predefined): add idLASTLINE and idBACKREF for $_
+	  and $~ respectively.
+
+	* parse.y: use idLASTLINE and idBACKREF instead of rb_intern.
+
+Wed Feb 17 20:23:38 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_init): fix segfault and memory leak, consider
+	  wide char encoding terminator.
+
+Wed Feb 17 12:14:59 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_init): introduce String.new(capacity: size)
+	  [Feature #12024]
+
+Tue Feb 16 19:10:08 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/unicode/case-folding.rb, casefold.h: Used only first element
+	  (rather than all) of target in CaseUnfold_11 array.
+	  (with Kimihito Matsui)
+
+Tue Feb 16 18:24:38 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (compare_with_zero): fix variable name, rb_cmperr
+	  requires VALUEs but not an ID.
+
+Tue Feb 16 17:34:18 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (rb_dir_s_empty_p): add Dir.empty? method, which tells the
+	  argument is the name of an empty directory.  [Feature #10121]
+
+Tue Feb 16 09:51:20 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/rbinstall.rb (without_destdir): just strip a drive letter
+	  which is prepended by with_destdir.
+	  pointed out by @DavidEGrayson.
+	  https://github.com/ruby/ruby/commit/0e5f9ae#commitcomment-16101763
+
+Tue Feb 16 04:42:13 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* insns.def (opt_plus): simply use LONG2NUM() instead of wrongly
+	  complex overflow case.
+
+	* insns.def (opt_sub): ditto.
+
+Tue Feb 16 02:49:41 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/rbinstall.rb (without_destdir): compare with the destdir
+	  after stripping a drive letter, on dosish platforms.
+	  pointed out by @DavidEGrayson.
+	  https://github.com/ruby/ruby/commit/d0cf23b#commitcomment-16100407
+
+Mon Feb 15 15:44:09 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parse_ident): allow keyword arguments just after a
+	  method where the same name local variable is defined.
+	  [ruby-core:73816] [Bug#12073]
+
+Mon Feb 15 14:43:28 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/unicode/case-folding.rb: Added debugging option
+	  (with Kimihito Matsui)
+
+Sun Feb 14 17:31:50 2016  Lars Kanis  <lars@greiz-reinsdorf.de>
+
+	* lib/mkmf.rb (with_{cpp,c,ld}flags): copy caller strings not to
+	  be modified, in append_{cpp,c,ld}flags respectively.
+	  [Fix GH-1246]
+
+Sun Feb 14 16:18:57 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (setup_exception): set the cause only if it is explicitly
+	  given or not set yet.  [Bug #12068]
+
+Sat Feb 13 21:44:58 2016  Tanaka Akira  <akr@fsij.org>
+
+	* hash.c (rb_hash_invert): [DOC] more examples.
+
+Sat Feb 13 17:30:49 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/uri/generic.rb (URI::Generic#find_proxy): support CIDR in
+	  no_proxy.  [ruby-core:73769] [Feature#12062]
+
+Sat Feb 13 17:11:58 2016  Fabian Wiesel  <fabian.wiesel@sap.com>
+
+	* lib/uri/generic.rb (find_proxy): exclude white-spaces and allow
+	  for a leading dot in the domain name in no_proxy.
+	  [ruby-core:54542] [Feature #8317]
+
+Fri Feb 12 12:20:56 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (name_err_initialize, nometh_err_initialize): [DOC] fix
+	  argument positions.  optional parameters except for the message
+	  are placed at the last.
+
+Fri Feb 12 11:49:49 2016  Anthony Dmitriyev  <antstorm@gmail.com>
+
+	* net/ftp.rb: add NullSocket#closed? to fix closing not opened
+	  connection.  [Fix GH-1232]
+
+Fri Feb 12 11:17:38 2016  Bogdan  <bogdanvlviv@gmail.com>
+
+	* re.c (rb_reg_initialize_m): [DOC] fix missing right bracket.
+	  [Fix GH-1243]
+
+Thu Feb 11 14:57:58 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_CHECK_SIZEOF, RUBY_DEFINT): fix for types
+	  which are conditionally available depending on architectures
+	  when universal binary, e.g., __int128.
+
+Thu Feb 11 06:26:18 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in (RUBY_DEFINT): use Parameter Expansion.
+
+Thu Feb 11 05:33:24 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in (int128_t): don't check HAVE_XXX (for example
+	  HAVE___INT128) because RUBY_CHECK_SIZEOF() don't define it for
+	  config.h and use of $ac_cv_sizeof___int128 alternates the check.
+	  (and don't need to define because users shouldn't know that)
+
+Wed Feb 10 12:03:41 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (ARFLAGS): check if deterministic mode flag is
+	  effective, which is on by default on Ubuntu.
+
+Tue Feb  9 16:36:23 2016  Naotoshi Seo  <sonots@gmail.com>
+
+	* lib/logger.rb: Remove block from Logger.add as it's not needed
+	  patch provided by Daniel Lobato Garcia [fix GH-1240] [Bug #12054]
+
+Tue Feb  9 14:32:23 2016  Zachary Scott  <zzak@ruby-lang.org>
+
+	* ext/zlib/zlib.c: Document mtime header behavior with patch by @schneems
+	  Fixes [GH-1129]: https://github.com/ruby/ruby/pull/1129
+
+Tue Feb  9 13:52:49 2016  Zachary Scott  <zzak@ruby-lang.org>
+
+	* re.c: Remove deprecated kcode argument from Regexp.new and compile
+	  patch provided by Dylan Pulliam [Bug #11495]
+
+Mon Feb  8 21:26:19 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/unicode/case-folding.rb, enc/unicode/casefold.h: Flags for
+	  upper/lower conversion added (titlecase and SpecialCasing still missing)
+	  (with Kimihito Matsui)
+
+Mon Feb  8 20:43:57 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* string.c, enc/unicode.c: Disassociating ONIGENC_CASE_FOLD flag from
+	  ONIGENC_CASE_DOWNCASE.
+	  (with Kimihito Matsui)
+
+Mon Feb  8 13:00:17 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/unicode.c: Shortened macros for enc/unicode/casefold.h to
+	  single-letter; use flags in casefold.h for logic.
+
+	* enc/unicode/case-folding.rb: Added flag for case folding.
+	  Changed parameter passing.
+
+	* enc/unicode/casefold.h: New flags added.
+	  (with Kimihito Matsui)
+
+Mon Feb  8 10:30:10 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (feature_option): raise a runtime error if ambiguous
+	  feature name is given, in the future.  [Bug #12050]
+
+Mon Feb  8 09:43:57 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* common.mk: Removed enc/unicode/casefold.h from automatic build because
+	  some CI systems don't have gperf. Creation of enc/unicode/casefold.h
+	  is now possible with make unicode-up. This is intended as a temporary measure.
+
+Sun Feb  7 22:10:08 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* common.mk: Added two more precondition files for enc/unicode/casefold.h
+
+	* enc/unicode.c: Added shortening macros for enc/unicode/casefold.h
+
+	* enc/unicode/case-folding.rb: Fixed file encoding for CaseFolding.txt
+	  to ASCII-8BIT (should fix some ci errors). Clarified usage. Created
+	  class MapItem. Partially implemented class CaseMapping.
+	  (with Kimihito Matsui)
+
+Sun Feb  7 14:12:32 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/unicode/case-folding.rb: Fixing parameter passing.
+	  (with Kimihito Matsui)
+
+Sun Feb  7 11:44:03 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/unicode/case-folding.rb: New classes CaseMapping/CaseMappingDummy
+	  to pass as parameters; not yet implemented or used.
+	  (with Kimihito Matsui)
+
+Sun Feb  7 11:16:00 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* common.mk: using new option in recipe for enc/unicode/casefold.h
+
+	* enc/unicode/case-folding.rb: Correctly specify argument to new option.
+	  (with Kimihito Matsui)
+
+Sun Feb  7 10:43:27 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	(this commit message applies to the previous commit)
+	* common.mk: explicit recipe for enc/unicode/casefold.h
+
+	* enc/unicode/case-folding.rb: Adding -m option to prepare for using
+	  multiple data files.
+	  (with Kimihito Matsui)
+
+Sat Feb  6 22:30:57 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/cgi/util.rb (escapeHTML, unescapeHTML): consider
+	  ASCII-incompatible encodings.  [Fix GH-1239]
+
+Sat Feb  6 15:18:28 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* test/ruby/enc/test_regex_casefold.rb: Added data-based testing for
+	  String#downcase :fold.
+
+	* enc/unicode.c: Fixed a range error (lowest non-ASCII character affected
+	  by case operations is U+00B5, MICRO SIGN)
+
+	* test/ruby/enc/test_case_mapping.rb: Explicit test for case folding of
+	  MICRO SIGN to Greek mu.
+	  (with Kimihito Matsui)
+
+Sat Feb  6 14:51:23 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* test/ruby/enc/test_regex_casefold.rb: Tests for three case folding
+	  primitives (mbc_case_fold, get_case_fold_codes_by_str,
+	  apply_all_case_fold) in the various encodings. Currently only known
+	  good encodings are tested to avoid test failures. For bug hunting,
+	  start by adding more encodings with
+	  generate_test_casefold encoding
+	  (with Kimihito Matsui)
+
+Sat Feb  6 14:37:16 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/unicode.c, test/ruby/enc/test_case_mapping.rb: Implemented :fold
+	  option for String#downcase by using case folding data from
+	  regular expression engine, and added a few simple tests.
+	  (with Kimihito Matsui)
+
+Fri Feb  5 20:08:59 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* test/ruby/enc/test_case_mapping.rb: added tests for :ascii option.
+	  (with Kimihito Matsui)
+
+Fri Feb  5 12:22:20 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* insns.def (opt_mult): Use int128_t for overflow detection.
+
+	* bignum.c (rb_uint128t2big): added for opt_mult.
+
+	* bignum.c (rb_uint128t2big): added for rb_uint128t2big..
+
+	* configure.in: define int128_t, uint128_t and related MACROs.
+	  Initially introduced by r41379 but reverted by r50749.
+
+Thu Feb  4 21:05:17 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/unicode.c: Activated :ascii flag for ASCII-only case conversion
+	  (with Kimihito Matsui)
+
+Thu Feb  4 17:38:01 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* re.c (reg_set_source): make source string frozen without
+	  copying.
+
+	* re.c (rb_reg_initialize_m): refactor initialization with
+	  encoding.
+
+Thu Feb  4 15:35:29 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_fstring_enc_new, rb_fstring_enc_cstr): functions to
+	  make fstring with encoding.
+
+Thu Feb  4 14:42:29 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* common.mk: Added Unicode data file SpecialCasing.txt to be additionally
+	  downloaded (with Kimihito Matsui)
+
+Thu Feb  4 12:39:08 2016  joker1007  <kakyoin.hierophant@gmail.com>
+
+	* cgi/escape/escape.c: Optimize CGI.escape performance by C ext
+	  for ASCII-compatible encodings.  [Fix GH-1238]
+
+Thu Feb  4 11:53:56 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* common.mk: Introduce two variables (UNICODE_DATA_DIR and
+	  UNICODE_SRC_DATA_DIR) to eliminate repetitions.
+
+Wed Feb  3 12:13:20 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (str_new_frozen): if the given string is embeddedable
+	  but not embedded, embed a new copied string. [Bug #11946]
+
+Wed Feb  3 08:25:38 2016  boshan  <boshan@subsplash.com>
+
+	* ext/openssl/ossl_pkey.c (Init_ossl_pkey): [DOC] Fix typo
+	  "encrypted" to "decrypted".  [Fix GH-1235]
+
+Wed Feb  3 08:21:32 2016  Seiei Miyagi  <hanachin@gmail.com>
+
+	* ext/ripper/lib/ripper/lexer.rb (on_heredoc_dedent): Fix
+	  Ripper.lex error in dedenting squiggly heredoc.  heredoc tree is
+	  also an array of Elem in the outer tree.  [Fix GH-1234]
+
+Wed Feb  3 02:33:39 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* re.c (rb_reg_prepare_enc): use already compiled US-ASCII regexp
+	  if given string is ASCII only.
+	  121.2s to 113.9s on my x86_64-freebsd10.2 Intel Core i5 661
+
+Tue Feb  2 13:02:03 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* re.c: Introduce RREGEXP_PTR.
+	  patch by dbussink.
+	  partially merge https://github.com/ruby/ruby/pull/497
+
+	* include/ruby/ruby.h: ditto.
+
+	* gc.c: ditto.
+
+	* ext/strscan/strscan.c: ditto.
+
+	* parse.y: ditto.
+
+	* string.c: ditto.
+
+Tue Feb  2 09:08:27 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* lib/rubygems/specification.rb: `coding` is effective only first
+	  line except shebang.
+
+	* lib/rubygems/package.rb, lib/rubygems/package/*: ditto.
+
+Mon Feb  1 21:41:58 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update rubygems-2.5.2.
+	  It supports to enable frozen string literal and add `--norc` option for
+	  disable to `.gemrc` configuration.
+	  See 2.5.2 release notes for other fixes and enhancements.
+	  https://github.com/rubygems/rubygems/blob/a8aa3bac723f045c52471c7b9328310a048561e0/History.txt#L3
+
+Sun Jan 31 12:33:13 2016  Dan Kreiger  <dan@dankreiger.com>
+
+	* test/drb/ut_large.rb (multiply, avg, median): add additional
+	  math operations to DRbLarge.  [Fix GH-1086]
+
+Sun Jan 31 12:19:15 2016  Kuniaki IGARASHI  <igaiga@gmail.com>
+
+	* test/ruby/test_file_exhaustive.rb (test_lstat): Add lacking test
+	  for File#lstat.  [Fix GH-1231]
+
+Sun Jan 31 12:15:33 2016  Prayag Verma  <prayag.verma@gmail.com>
+
+	* doc/standard_library.rdoc: fix typo  [Fix GH-1230]
+	  Spelling mistakes -
+	  outputing > outputting
+	  publich > publish
+
+Sat Jan 30 15:18:07 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (rb_check_funcall_with_hook): also should call the
+	  given hook before returning Qundef when overridden respond_to?
+	  method returned false.  [ruby-core:73556] [Bug #12030]
+
+Fri Jan 29 17:40:07 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/file.c (rb_readlink): drop garbage after the substitute
+	  name, as rb_w32_read_reparse_point returns the expected buffer
+	  size but "\??\" prefix is dropped from the result.
+
+	* win32/win32.c (w32_readlink): ditto, including NUL-terminator.
+
+Fri Jan 29 17:07:27 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (fileattr_to_unixmode, rb_w32_reparse_symlink_p): volume
+	  mount point should be treated as directory, not symlink.
+	  [ruby-core:72483] [Bug #11874]
+
+	* win32/win32.c (rb_w32_read_reparse_point): check the reparse point is
+	  a volume mount point or not.
+
+	* win32/file.c (rb_readlink): follow above change (but this pass won't
+	  be used).
+
+Fri Jan 29 16:17:07 2016  Lucas Buchala  <lucasbuchala@gmail.com>
+
+	* enum.c (enum_take_while, enum_drop_while): rename block
+	  parameter to obj, since they are generic objects.  [Fix GH-1226]
+
+Fri Jan 29 14:15:26 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/erb.rb (ERB::Compiler#detect_magic_comment): allow
+	  frozen-string-literal in comment as well as encoding.
+
+	* lib/erb.rb (ERB#def_method): insert def line just before the
+	  first non-comment and non-empty line, not to leave duplicated
+	  and stale magic comments.
+
+Fri Jan 29 11:13:33 2016  Jeremy Evans  <code@jeremyevans.net>
+
+	* lib/erb.rb (ERB#set_eoutvar): explicitly make mutable string as
+	  a buffer to make ERB work with --enable-frozen-string-literal.
+	  [ruby-core:73561] [Bug #12031]
+
+Fri Jan 29 10:44:56 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* lib/net/http/header.rb: Warn nil variable on HTTP Header.
+	  It caused to NoMethodError. [fix GH-952][fix GH-641] Patch by @teosz
+	* test/net/http/test_httpheader.rb: Added test for nil HTTP Header.
+
+Thu Jan 28 17:31:43 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/socket.c (sock_gethostname): support unlimited size
+	  hostname.
+
+Wed Jan 27 21:03:45 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* test/-ext-/string/test_capacity.rb: Added missing library.
+
+Wed Jan 27 18:53:40 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/unicode.c: Fixed bit mask in macro OnigCodePointCount
+
+Wed Jan 27 17:54:42 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/unicode.c: Protect code point count by macro, in order to
+	  be able to use the remaining bits for flags.
+	  (with Kimihito Matsui)
+
+Wed Jan 27 16:34:35 2016  boshan  <boshan@subsplash.com>
+
+	* lib/tempfile.rb (Tempfile#initialize): [DOC] the first parameter
+	  `basename` is optional and defaulted to an empty string since
+	  [GH-523].  [Fix GH-1225]
+
+Wed Jan 27 16:25:54 2016  Koichi ITO  <koic.ito@gmail.com>
+
+	* array.c (rb_ary_dig): [DOC] fix the exception class to be raised
+	  when intermediate object does not have dig method.  TypeError
+	  will be raised now.  [Fix GH-1224]
+
+Tue Jan 26 19:36:15 2016  Aggelos Avgerinos  <evaggelos.avgerinos@gmail.com>
+
+	* array.c (permute0, rpermute0): [DOC] Substitute indexes ->
+	  indices in documentation for consistency.  [Fix GH-1222]
+
+Tue Jan 26 15:21:37 2016  Eric Wong  <e@80x24.org>
+
+	* compile.c (caller_location): use rb_fstring_cstr for "<compiled>"
+	  (it is converted to fstring anyways inside rb_iseq_new_with_opt)
+	* iseq.c (iseqw_s_compile): ditto
+	* iseq.c (rb_iseq_new_main): use rb_fstring_cstr for "<main>"
+	* vm.c (Init_VM): ditto, share with with above
+	* iseq.c (iseqw_s_compile_file): rb_fstring before rb_io_t->pathv
+	  share "<main>" with above
+	* vm.c (rb_binding_add_dynavars): fstring "<temp>" immediately
+
+Tue Jan 26 15:14:01 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* compile.c (iseq_peephole_optimize): don't apply tailcall
+	  optimization to send/invokesuper instructions with blockiseq.
+	  This is a follow-up to the changes in r51903; blockiseq is now
+	  the third operand of send/invokesuper instructions.
+	  [ruby-core:73413] [Bug #12018]
+
+Tue Jan 26 14:26:46 2016  Eric Wong  <e@80x24.org>
+
+	* signal.c (sig_list): use fstring for hash key
+	* test/ruby/test_signal.rb (test_signal_list_dedupe_keys): added
+
+Tue Jan 26 13:08:34 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* signal.c (rb_f_kill): should immediately deliver reserved
+	  signals SIGILL and SIGFPE, not only SIGSEGV and SIGBUS.
+
+Tue Jan 26 07:57:28 2016  Joseph Tibbertsma  <josephtibbertsma@gmail.com>
+
+	* gc.c (RVALUE_PAGE_WB_UNPROTECTED): fix a typo of argument name.
+	  [Fix GH-1221]
+
+Mon Jan 25 17:26:54 2016  Eric Wong  <e@80x24.org>
+
+	* ruby_assert.h (RUBY_ASSERT_WHEN): fix reference to macro name
+	* vm_core.h: include ruby_assert.h before using
+	  [ruby-core:73371]
+
+Mon Jan 25 15:55:30 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* symbol.c (sym_check_asciionly): more informative error message
+	  with the encoding name and the inspected content.
+	  [ruby-core:73398] [Feature #12016]
+
+Mon Jan 25 09:38:26 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* test/ruby/test_string.rb: added testcase for next!, succ and succ!
+	  [fix GH-1213] Patch by @K0mAtoru
+
+Mon Jan 25 09:32:25 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* lib/webrick/httpservlet/filehandler.rb: fix documentation for namespace.
+	  [fix GH-1219][ci skip] Patch by @leafac
+
+Sun Jan 24 19:34:23 2016  Eric Wong  <e@80x24.org>
+
+	* vm_insnhelper.c (vm_check_if_namespace): tiny size reduction
+
+Sun Jan 24 18:12:36 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* common.mk: Simplifying Unicode data file download logic to make
+	  it more reliable (including additional fix not in r53633) [Bug #12007]
+
+Sun Jan 24 16:54:11 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/io/wait/wait.c (io_wait_readwrite): [EXPERIMENTAL] allow to
+	  wait for multiple modes, readable and writable, at once.  the
+	  arguments may change in the future.  [Feature #12013]
+
+Sat Jan 23 22:30:59 2016  K0mA  <mctj1218@gmail.com>
+
+	* test/ruby/test_array.rb (test_keep_if): Add test for
+	  Array#keep_if separate from Array#select!  [Fix GH-1218]
+
+Sat Jan 23 20:54:26 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* common.mk: revert r53633. It broke rubyci and travis.
+	  https://travis-ci.org/ruby/ruby/builds/104259623
+
+Sat Jan 23 20:10:29 2016  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* range.c (range_eqq): revert r51585 because rb_call_super() is
+	  called in range_include() and thus r51585 doesn't work when the
+	  receiver Range object consists of non linear objects such as Date
+	  objects.
+	  [ruby-core:72908] [Bug #12003]
+
+Sat Jan 23 18:37:37 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* ChangeLog: Fixing wrong time on previous commit, and adding
+	  previous commit message to svn [ci skip]
+
+Sat Jan 23 18:30:30 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* common.mk: Simplifying Unicode data file download logic to make
+	  it more reliable [Bug #12007]
+
+Sat Jan 23 16:29:42 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* tool/downloader.rb: Fixed a logical error, improved documentation
+
+Sat Jan 23 11:42:43 2016  Peter Suschlik  <ps@neopoly.de>
+
+	* README.md: Use SVG Travis badge over PNG for better quality and
+	  device support.  [Fix GH-1214] [Fix GH-1216]
+
+Sat Jan 23 11:29:16 2016  Pascal Betz  <pascal.betz@simplificator.com>
+
+	* lib/csv.rb: Update documentation of CSV header converter for
+	  r45498, [GH-575].  [Fix GH-1215]
+
+Fri Jan 22 17:36:46 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_core.h (VM_ASSERT): use RUBY_ASSERT instead of rb_bug.
+
+	* error.c (rb_assert_failure): assertion with stack dump.
+
+	* ruby_assert.h (RUBY_ASSERT): new header for the assertion.
+
+Fri Jan 22 00:25:57 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regparse.c (fetch_name_with_level): allow non word characters
+	  at the first character.  [Feature #11949]
+
+	* regparse.c (fetch_name): ditto.
+
+Thu Jan 21 17:34:01 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* marshal.c (r_object0): honor Marshal.load post proc
+	  value for TYPE_LINK.  by Hiroshi Nakamura <nahi@ruby-lang.org>
+	  https://github.com/ruby/ruby/pull/1204 fix GH-1204
+
+Thu Jan 21 16:37:50 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* Makefile.in (update-rubyspec): fix r53208 like r53451.
+
+Wed Jan 20 20:58:25 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* common.mk, Makefile.in: update-config_files is only for Unix
+	  platforms.
+
+Wed Jan 20 17:13:39 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/extlibs.rb: add --cache option to change cache directory.
+
+Tue Jan 19 17:03:40 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* common.mk: Added Unicode data file CaseFolding.txt to be additionally
+	  downloaded (with Kimihito Matsui)
+
+Tue Jan 19 10:09:58 2016  Sho Hashimoto  <sho-h@ruby-lang.org>
+
+	* lib/shell.rb (Shell.debug_output_exclusive_unlock): remove
+	  because Mutex#exclusive_unlock was already deleted. [fix GH-1185]
+
+Tue Jan 19 09:38:27 2016  Nick Cox  <nick@nickcox.me>
+
+	* vm_method.c: fix grammar in respond_to? warning.
+	  [fix GH-1047]
+
+Mon Jan 18 14:37:07 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_here_document): an escaped newline is not an
+	  actual newline, and the rest part should not be dedented.
+	  [ruby-core:72855] [Bug #11989]
+
+Mon Jan 18 12:04:34 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* test/ruby/test_string.rb: Added extra testcase for test_rstrip_bang
+	  and test_lstrip_bang. [fix GH-1178] Patch by @Matrixbirds
+
+Mon Jan 18 11:47:27 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* string.c: fix a typo. [fix GH-1202][ci skip] Patch by @sunboshan
+
+Sun Jan 17 21:15:30 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: improve ICC (Intel C Compiler) support.
+
+	* configure.in (CXX): The name of icc's c++ compiler is `icpc`.
+
+	* configure.in (warnings): Add `-diag-disable=2259` to suppress
+	  noisy warnings: "non-pointer conversion from "..." to "..." may
+	  lose significant bits".
+
+	* configure.in (optflags): Add `-fp-model precise` like -fno-fast-math.
+
+	* lib/mkmf.rb: icc supports -Werror=division-by-zero
+	  and -Werror=deprecated-declarations, but doesn't support
+	  -Wdivision-by-zero and -Wdeprecated-declarations.
+
+Sun Jan 17 20:40:10 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* string.c: Any kind of option is now taking the new code path for
+	  upcase/downcase/capitalize/swapcase. :lithuanian can be used for
+	  testing if no specific option is desired.
+	* test/ruby/enc/test_case_mapping.rb: Adjusted to above.
+	  (with Kimihito Matsui)
+
+Sun Jan 17 20:10:10 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/unicode.c: Fixed a logical error and some comments.
+	* test/ruby/enc/test_case_mapping.rb: Made tests more general.
+	  (with Kimihito Matsui)
+
+Sun Jan 17 17:41:41 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/unicode.c: Removed artificial expansion for Turkic,
+	  added hand-coded support for Turkic, fixed logic for swapcase.
+	* string.c: Made use of new case mapping code possible from upcase,
+	  capitalize, and swapcase (with :lithuanian as a guard).
+	* test/ruby/enc/test_case_mapping.rb: Adjusted for above.
+	  (with Kimihito Matsui)
+
+Sun Jan 17 15:30:57 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/option.c (sockopt_bool): relax boolean size to be one
+	  too not only sizeof(int).  Winsock getsockopt() returns a single
+	  byte as a boolean socket option.  [ruby-core:72730] [Bug #11958]
+
+Sun Jan 17 14:43:01 2016  Kuniaki IGARASHI  <igaiga@gmail.com>
+
+	* test/ruby/test_env.rb: [Fix GH-1201]
+	  * Extract test code for ENV#keep_if from ENV#select_bang
+	  * Add a test case for ENV#select_bang,keep_if
+
+Sun Jan 17 14:42:25 2016  Kuniaki IGARASHI  <igaiga@gmail.com>
+
+	* test/ruby/test_env.rb: [Fix GH-1201]
+	  * Extract test code for ENV#delete_if from ENV#reject_bang
+	  * Add a test case for ENV#reject_bang,delete_if
+
+Sun Jan 17 14:40:22 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/option.c (check_size): extract a macro to check
+	  binary data size, with a consistent message.
+
+	* ext/socket/option.c (sockopt_byte): fix error message,
+	  sizeof(int) differs from sizeof(unsigned char) in general.
+
+Sat Jan 16 21:16:21 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (xstring): reset heredoc indent after dedenting,
+	  so that following string literal would not be dedented.
+	  [ruby-core:72857] [Bug #11990]
+
+Sat Jan 16 17:24:24 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/unicode.c: Artificial mapping to test buffer expansion code.
+	* string.c: Fixed buffer expansion logic.
+	* test/ruby/enc/test_case_mapping.rb: Tests for above.
+	  (with Kimihito Matsui)
+
+Sat Jan 16 16:47:14 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* ext/openssl/lib/openssl/pkey.rb: Added 2048 bit DH parameter.
+	* test/openssl/test_pkey_dh.rb: ditto.
+
+Sat Jan 16 10:51:19 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* enc/unicode.c: fix implicit conversion error with clang. fixup r53548.
+	* string.c: ditto.
+
+Sat Jan 16 10:31:00 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* common.mk: test-sample was changed to test-basic.
+	  [Feature #11982][ruby-core:72823]
+	* basictest/runner.rb: ditto. rename from tool/rubytest.rb.
+	* basictest/test.rb: ditto. rename from sample/test.rb.
+	* defs/gmake.mk: picked from r53540
+	* sample/test.rb: backward compatibility for chkbuild.
+
+Sat Jan 16 10:23:23 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* string.c, enc/unicode.c: New code path as a preparation for Unicode-wide
+	  case mapping. The code path is currently guarded by the :lithuanian
+	  option to avoid accidental problems in daily use.
+	* test/ruby/enc/test_case_mapping.rb: Test for above.
+	* string.c: function 'check_case_options': fixed logical errors
+	  (with Kimihito Matsui)
+
+Fri Jan 15 20:20:20 2016  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* regint.h (PLATFORM_UNALIGNED_WORD_ACCESS): The value of
+	  UNALIGNED_WORD_ACCESS should be used to determine whether
+	  unaligned word access is allowed or not. After this commit,
+	  ./configure CPPFLAGS="-DUNALIGNED_WORD_ACCESS=0" disables
+	  unaligned word access even on platforms that support the feature.
+
+Fri Jan 15 16:12:10 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (string1): reset heredoc indent for each string literal
+	  so that concatenated string would not be dedented.
+	  [ruby-core:72857] [Bug #11990]
+
+Thu Jan 14 20:01:00 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/generic.rb (URI::Generic#to_s): change encoding to
+	  UTF-8 as Ruby 2.2/ by Koichi ITO <koic.ito@gmail.com>
+	  https://github.com/ruby/ruby/pull/1188 fix GH-1188
+
+Thu Jan 14 17:36:16 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* variable.c (rb_f_global_variables): add matched back references
+	  only, as well as defined? operator.
+
+Thu Jan 14 16:12:09 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c (rb_str_format): format exact number more exactly.
+
+Thu Jan 14 15:08:43 2016  Tony Arcieri  <bascule@gmail.com>
+
+	* Remove 512-bit DH group. It's affected by LogJam Attack.
+	  https://weakdh.org/
+	  [fix GH-1196][Bug #11968][ruby-core:72766]
+
+Thu Jan 14 11:44:29 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* variable.c (rb_f_global_variables): add $1..$9 only if $~ is
+	  set.  fix the condition removed at r14014.
+
+Wed Jan 13 17:21:45 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* .travis.yml: removed commented-out code.
+
+Wed Jan 13 17:14:54 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* .travis.yml: removed osx code. follow up with r53517
+
+Wed Jan 13 16:56:19 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* iseq.c (rb_iseq_mark): mark parent iseq to prevent dynamically
+	  generated iseq by eval from GC.  [ruby-core:72620] [Bug #11928]
+
+Wed Jan 13 03:42:58 2016  Eric Wong  <e@80x24.org>
+
+	* class.c (Init_class_hierarchy): resolve name for rb_cObject ASAP
+	* object.c (rb_mod_const_set): move name resolution to rb_const_set
+	* variable.c (rb_const_set): do class resolution here
+	  [ruby-core:72807] [Bug #11977]
+
+Wed Jan 13 00:37:12 2016  Satoshi Ohmori  <sachin21dev@gmail.com>
+
+	* man/ruby.1: fix double word typo.  [Fix GH-1194]
+
+Tue Jan 12 21:01:09 2016  Benoit Daloze  <eregontp@gmail.com>
+
+	* common.mk: update URL and name for the Ruby spec suite.
+
+Tue Jan 12 19:52:19 2016  sorah (Shota Fukumori)  <her@sorah.jp>
+
+	* lib/forwardable.rb: Convert given accessors to String.
+
+	  r53381 changed to accept only Symbol or String for accessors, but
+	  there are several rubygems that pass classes (e.g. Array,
+	  Hash, ...) as accessors. Prior r53381, it was accepted because Class#to_s
+	  returns its class name. After r53381 given accessors are checked
+	  with define_method, but it accepts only Symbol or String, otherwise
+	  raises TypeError.
+
+	      def_delegator Foo, :some_method
+
+	  This change is to revert unexpected incompatibility. But this behavior
+	  may change in the future.
+
+Mon Jan 12 18:41:41 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* string.c: made a variable name more grammatically correct
+
+Mon Jan 12 18:34:34 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* string.c: minor grammar fix [ci skip]
+
+Mon Jan 12 16:09:09 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* test/ruby/enc/test_casing_options.rb: Tests for option
+	  parsing/checking for upcase/downcase/capitalize/swapcase
+	  (see r53503; with Kimihito Matsui)
+
+Mon Jan 12 16:03:03 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* string.c: Added option parsing/checking for upcase/downcase/
+	  capitalize/swapcase (with Kimihito Matsui)
+
+Mon Jan 11 21:28:28 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* include/ruby/oniguruma.h: Added flags needed for upcase/downcase
+	  Unicode addition (with Kimihito Matsui)
+
+Mon Jan 11 09:50:24 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: check if the API version number is consistent with
+	  the program version number.
+
+Sun Jan 10 20:57:25 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (compile_massign_lhs): when index ends with splat,
+	  append rhs value to it like POSTARG, since VM_CALL_ARGS_SPLAT
+	  splats the last argument only.  [ruby-core:72777] [Bug #11970]
+
+Sun Jan 10 15:45:10 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/missing.h (explicit_bzero_by_memset_s): remove
+	  inline implementation by memset_s, which needs a macro before
+	  including headers and can cause problems in extension libraries
+	  by the order of the macro and headers.
+
+Sun Jan 10 13:41:36 2016  Eric Wong  <e@80x24.org>
+
+	* io.c (rb_deferr): remove long obsolete global
+
+Sun Jan 10 09:14:42 2016  Eric Wong  <e@80x24.org>
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb (visit_String):
+	  eliminate chomp
+	* lib/net/http.rb (connect): eliminate delete
+	* lib/net/http/header.rb (basic_encode): ditto
+	* lib/net/imap.rb (authenticate): eliminate gsub
+	  (self.encode_utf7): shorten delete arg
+	* lib/net/smtp.rb (base64_encode): eliminate gsub
+	* lib/open-uri.rb (OpenURI.open_http): eliminate delete
+	* lib/rss/rss.rb: ditto
+	* lib/securerandom.rb (base64): ditto
+	  (urlsafe_base64): eliminate delete!
+	* lib/webrick/httpauth/digestauth.rb (split_param_value):
+	  eliminate chop
+	* lib/webrick/httpproxy.rb (do_CONNECT): eliminate delete
+	  (setup_upstream_proxy_authentication): ditto
+	  [ruby-core:72666] [Feature #11938]
+
+Sat Jan  9 23:19:14 2016  Kuniaki IGARASHI  <igaiga@gmail.com>
+
+	* test/ruby/test_hash.rb (test_try_convert): Add test for
+	  Hash.try_convert.  [Fix GH-1190]
+
+Sat Jan  9 23:15:25 2016  Jon Moss  <maclover7@users.noreply.github.com>
+
+	* ext/openssl/ossl.c: Add missing variables to documentation
+	  examples.  [Fix GH-1189]
+
+Sat Jan  9 18:25:57 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* symbol.h (is_attrset_id): ASET is an attrset ID.  fix
+	  unexpected safe call instead of an ordinary ASET.
+
+Sat Jan  9 10:44:33 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in, win32/setup.mak: extract RUBY_PROGRAM_VERSION from
+	  RUBY_VERSION in version.h instead of RUBY_API_VERSION numbers in
+	  include/ruby/version.h, and cut it into version numbers.
+
+Sat Jan  9 07:13:33 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: rename PAGE_* to HEAP_PAGE_* because PAGE_SIZE is used
+	  in Mac OS X.
+
+	* test/ruby/test_gc.rb: catch up this fix.
+
+Sat Jan  9 05:45:40 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: PAGE_BITMAP_PLANES (the number of bitmap) is 4, not 3.
+
+Sat Jan  9 05:42:57 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: rename constant names HEAP_* to PAGE_*.
+
+	  Keys of GC::INTERNAL_CONSTANTS are also renamed.
+
+	* test/ruby/test_gc.rb: catch up this fix.
+
+Fri Jan  8 22:30:06 2016  Akinori MUSHA  <knu@iDaemons.org>
+
+	* doc/regexp.rdoc: [DOC] Elaborate on the \G anchor. [ci skip]
+
+Fri Jan  8 19:49:27 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: remove heap_page::body. Instead of this field,
+	  heap_page::start field works well.
+
+Fri Jan  8 19:31:52 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: rename rb_heap_t::page_length to rb_heap_t::total_pages.
+
+	  `page_length' is not clear (we may understand with length of
+	  a page).
+
+Fri Jan  8 17:07:14 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: remove heap_page::heap. This field is only used to recognize
+	  whether a page is in a tomb or not. Instead of this field,
+	  heap_page::flags::in_tomb (1 bit field) is added.
+
+	  Also type of heap_page::(total|free|final)_slots are changed from
+	  int to short. 2B is enough for them.
+
+Fri Jan  8 09:33:59 2016  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* iseq.c (rb_iseq_compile_with_option): move variable initialization
+	  code to avoid maybe-uninitialized warnings by gcc 4.8.
+
+Fri Jan  8 00:03:22 2016  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* enum.c (enum_min, enum_max): do the same optimization as r53454.
+
+Thu Jan  7 22:32:21 2016  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ruby.h: undef HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P
+	  and HAVE_BUILTIN___BUILTIN_TYPES_COMPATIBLE_P on C++.
+	  [ruby-core:72736] [Bug #11962]
+
+Thu Jan  7 22:02:21 2016  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* enum.c (enum_minmax): optimize object comparison in
+	  Enumerable#minmax.
+
+Thu Jan  7 14:49:12 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (rb_thread_pending_interrupt_p): no pending interrupt
+	  before initialization.
+
+	* thread.c (thread_raise_m, rb_thread_kill): uninitialized thread
+	  cannot interrupt.  [ruby-core:72732] [Bug #11959]
+
+Thu Jan  7 11:34:14 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/backward.h (ruby_show_copyright_to_die): for source
+	  code backward compatibility.
+
+	* ruby.c (process_options): return Qtrue to exit the process
+	  successfully.
+
+	* version.c (ruby_show_copyright): no longer exit.
+
+Wed Jan  6 17:22:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (OptionParser#order!): add `into` optional
+	  keyword argument to store the results.  [Feature #11191]
+
+Tue Jan  5 21:44:37 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* ChangeLog: fix wrong class name.
+
+Tue Jan  5 21:43:50 2016  Kuniaki IGARASHI  <igaiga@gmail.com>
+
+	* test/ruby/test_string.rb(test_chr): added test for String#chr
+	  [fix GH-1179]
+
+Tue Jan  5 21:32:26 2016  Kuniaki IGARASHI  <igaiga@gmail.com>
+
+	* test/ruby/test_numeric.rb (test_nonzero_p): added test for Numeric#nonzero?
+	  [fix GH-1187]
+
+Tue Jan  5 11:47:23 2016  Damir Gaynetdinov  <damir.gaynetdinov@gmail.com>
+
+	* doc/marshal.rdoc: Clarify object references example, that the
+	  reference is same object.  [Fix GH-1156]
+
+Tue Jan  5 05:06:51 2016  Eric Wong  <e@80x24.org>
+
+	* ext/stringio/stringio.c (strio_binmode): implement to set encoding
+	* test/stringio/test_stringio.rb (test_binmode): new test
+	  [ruby-core:72699] [Bug #11945]
+
+Mon Jan  4 15:44:37 2016  Sho Hashimoto  <sho-h@ruby-lang.org>
+
+	* variable.c (rb_mod_deprecate_constant): [DOC] added
+	  documentation for Module#deprecate_constant. [ci skip]
+
+Mon Jan  4 15:36:38 2016  Sho Hashimoto  <sho-h@ruby-lang.org>
+
+	* thread_sync.c: [DOC] remove SizedQueue#close argument.
+	  [ci skip]
+
+Mon Jan  4 10:14:24 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* test/coverage/test_coverage.rb: ignored test when enabled to coverage.
+	  It lead to crash with `make test-all`.
+
+Mon Jan  4 08:10:44 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
+
+	* insns.def (opt_case_dispatch): Move a comment to the
+	  appropriate position.
+	  [ci skip]
+
+Sun Jan  3 23:55:13 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rubygems/security.rb (DIGEST_ALGORITHM, KEY_ALGORITHM):
+	  should check same name as the used constants.
+	  [ruby-core:72674] [Bug #11940]
+
+Sun Jan  3 19:22:01 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* aclocal.m4: add fallback file for non-aclocal environments.
+	  [ruby-core:72683] [Bug #11942]
+
+Sun Jan  3 13:56:49 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
+
+	* eval_error.c (rb_print_undef): Use `rb_method_visibility_t`
+	  instead of `int`.
+	* eval_intern.h (rb_print_undef): ditto
+	* proc.c (mnew_internal): ditto
+	* vm_method.c (rb_export_method): ditto
+	  [Misc #11649] [ruby-core:71311] [fix GH-1078]
+
+Sun Jan  3 12:12:09 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* acinclude.m4: rename aclocal.m4, which should be generated by
+	  aclocal.  [ruby-core:72675] [Bug #11941]
+
+Sat Jan  2 21:07:55 2016  Eric Wong  <e@80x24.org>
+
+	* thread_sync.c (queue_do_pop): avoid cast with Qfalse
+	  (rb_szqueue_push): ditto, use queue_sleep wrapper
+
+Sat Jan  2 16:16:14 2016  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/erb.rb: Allow ERB subclass to add token easily.
+	  [Feature #11936]
+
+	* test/erb/test_erb.rb: ditto.
+
+Sat Jan  2 14:44:31 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (regexp): set_yylval_num sets u1, should use nd_tag
+	  instead of nd_state.  [ruby-core:72638] [Bug #11932]
+
+Sat Jan  2 02:27:22 2016  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/ostruct.rb: Fix case of frozen object with initializer.
+	  Bug revealed by RubySpec [ruby-core:72639]
+
+Fri Jan  1 22:01:52 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* NEWS: mention CSV's liberal_parsing option.
+
+Fri Jan  1 19:38:23 2016  okkez  <okkez000@gmail.com>
+
+	* doc/NEWS-2.3.0: fix double words typo.
+	  [ci skip][fix GH-1183]
+
+Fri Jan  1 15:28:56 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (remove_unreachable_chunk): decrease count of
+	  call_info in removed instructions.  fix up r53402.
+
+Fri Jan  1 12:05:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (remove_unreachable_chunk): remove unreferred label
+	  to optimize away unreachable chunk.
+
+Fri Jan  1 11:42:57 2016  James Edward Gray II  <james@graysoftinc.com>
+
+	* lib/csv.rb (CSV): Add a liberal_parsing option.
+	  Patch by Braden Anderson. [#11839]
+	* test/csv/test_features.rb:  test liberal_parsing
+
+Fri Jan  1 10:27:28 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/mkconfig.rb (RbConfig): prefix SDKROOT to oldincludedir
+	  not includedir, the latter is outside the ruby installation.
+	  [ruby-core:72496] [Bug #11881]
+
+Fri Jan  1 08:53:02 2016  Yuki Kurihara  <co000ri@gmail.com>
+
+	* test/ruby/test_lazy_enumerator.rb (test_take_bad_arg): Add test
+	  code in case of Enumerator::Lazy#take called with negative number.
+	  [ruby-dev:49467] [Bug #11933]
+
+Fri Jan  1 05:06:20 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_here_document): update indent for each line in
+	  indented here document with single-quotes.
+	  [ruby-core:72479] [Bug #11871]
+
+Fri Jan  1 03:26:44 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/ostruct.rb (freeze): define deferred accessors before
+	  freezing to get rid of an error when just reading frozen
+	  OpenStruct.
+
+Thu Dec 31 14:36:45 2015  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/ostruct.rb: Fix new_ostruct_member to correctly avoid
+	  redefinition [#11901]
+
+Thu Dec 31 02:45:12 2015  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/ruby/test_module.rb (test_classpath): r53376 may change
+	  the order of m.constants.
+	  `make TESTS='-v ruby/test_class.rb ruby/test_module.rb' test-all`
+	  may fail after that.
+	  http://rubyci.s3.amazonaws.com/tk2-243-31075/ruby-trunk/log/20151230T164202Z.log.html.gz
+
+Thu Dec 31 02:20:00 2015  Benoit Daloze  <eregontp@gmail.com>
+
+	* common.mk (help): Fix typo.
+
+Wed Dec 30 20:53:09 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* lib/net/http/responses.rb: Added new response class for 451 status code.
+	* lib/net/http.rb: documentation for HTTPUnavailableForLegalReasons
+
+Wed Dec 30 20:45:45 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* lib/webrick/httpstatus.rb: Added HTTP 451 Status Code.
+	  [fix GH-1167] Patch by @MuhammetDilmac
+	  https://tools.ietf.org/html/draft-tbray-http-legally-restricted-status-00
+
+Wed Dec 30 20:25:52 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* doc/syntax/calling_methods.rdoc: fix old operator for safe navigation
+	  operator. [ci skip][fix GH-1182] Patch by @dougo
+
+Wed Dec 30 16:43:23 2015  Kuniaki IGARASHI  <igaiga@gmail.com>
+
+	* test/ruby/test_string.rb (test_ord): Add test for String#ord.
+	  [Fix GH-1181]
+
+Wed Dec 30 11:28:57 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/forwardable.rb (def_instance_delegator): adjust backtrace of
+	  method body by tail call optimization.  adjusting the delegated
+	  target is still done by deleting backtrace.
+
+	* lib/forwardable.rb (def_single_delegator): ditto.
+
+Wed Dec 30 11:18:42 2015  Elliot Winkler  <elliot.winkler@gmail.com>
+
+	* lib/forwardable.rb (def_instance_delegator) fix delegating to
+	  'args' and 'block', clashing with local variables in generated
+	  methods.  [ruby-core:72579] [Bug #11916]
+
+	* lib/forwardable.rb (def_single_delegator): ditto.
+
+Wed Dec 30 09:58:56 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (rb_class_inherited_p): search the corresponding
+	  ancestor to prepended module from prepending class itself.
+	  [ruby-core:72493] [Bug #11878]
+
+Wed Dec 30 09:20:00 2015  Yuki Kurihara  <co000ri@gmail.com>
+
+	* test/stringio/test_io.rb (test_flag): add assertion for error when
+	  text and binary mode are mixed.
+	  [ruby-dev:49465] [Feature #11921]
+
+Wed Dec 30 08:43:59 2015  Yuki Kurihara  <co000ri@gmail.com>
+
+	* test/stringio/test_stringio.rb (test_initialize): add test for
+	  StringIO#initialize.  [ruby-core:72585] [Feature #11920]
+
+Wed Dec 30 05:19:24 2015  Eric Wong  <e@80x24.org>
+
+	* class.c (struct clone_const_arg): adjust for id_table
+	  (clone_const): ditto
+	  (clone_const_i): ditto
+	  (rb_mod_init_copy): ditto
+	  (rb_singleton_class_clone_and_attach): ditto
+	  (rb_include_class_new): ditto
+	  (include_modules_at): ditto
+	* constant.h (rb_free_const_table): ditto
+	* gc.c (free_const_entry_i): ditto
+	  (rb_free_const_table): ditto
+	  (obj_memsize_of): ditto
+	  (mark_const_entry_i): ditto
+	  (mark_const_tbl): ditto
+	* internal.h (struct rb_classext_struct): ditto
+	* object.c (rb_mod_const_set): resolve class name on assignment
+	* variable.c (const_update): replace with const_tbl_update
+	  (const_tbl_update): new function
+	  (fc_i): adjust for id_table
+	  (find_class_path): ditto
+	  (autoload_const_set): st_update => const_tbl_update
+	  (rb_const_remove): adjust for id_table
+	  (sv_i): ditto
+	  (rb_local_constants_i): ditto
+	  (rb_local_constants): ditto
+	  (rb_mod_const_at): ditto
+	  (rb_mod_const_set): ditto
+	  (rb_const_lookup): ditto
+	  [ruby-core:72112] [Feature #11614]
+
+Wed Dec 30 04:10:13 2015  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* thread_pthread.c (rb_thread_create_timer_thread): destroy attr even
+	  if pthread_create() failed.
+
+Wed Dec 30 02:55:09 2015  Eric Wong  <e@80x24.org>
+
+	* thread_pthread.c (setup_communication_pipe): delay setting owner
+	  (rb_thread_create_timer_thread): until thread creation succeeds
+	  [ruby-core:72590] [Bug #11922]
+
+Tue Dec 29 19:12:46 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (proc_options): -W command line option should be able to
+	  override -w in RUBYOPT environment variable.
+
+Tue Dec 29 17:54:16 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (ignored_block): warn if a block is given to `using`,
+	  which is probably for `Module.new`.
+
+Tue Dec 29 12:48:34 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/ostruct.rb (OpenStruct): make respond_to? working on
+	  just-allocated objects for workaround of Psych.
+	  [ruby-core:72501] [Bug #11884]
+
+Tue Dec 29 10:35:00 2015  Kenta Murata  <mrkn@mrkn.jp>
+
+	* test/mkmf/test_have_func.rb (test_have_func):
+	  Add assertion to examine the existence of HAVE_RUBY_INIT.
+
+	* test/mkmf/test_have_func.rb (test_not_have_func):
+	  Add assertion to examine the absence of HAVE_RUBY_INIT.
+
+Tue Dec 29 06:50:42 2015  Eric Wong  <e@80x24.org>
+
+	* thread_sync.c: static classes
+
+Tue Dec 29 05:30:30 2015  Eric Wong  <e@80x24.org>
+
+	* lib/resolv.rb (Resolv::IPv6.create): avoid modifying frozen
+	* test/resolv/test_dns.rb (test_ipv6_create): test for above
+	  [Bug #11910] [ruby-core:72559]
+
+Mon Dec 28 14:55:57 2015  Kuniaki IGARASHI  <igaiga@gmail.com>
+
+	* test/ruby/test_string.rb (TestString#test_rstrip_bang): Add test
+	  for String#rstrip!.  [Fix GH-1176]
+
+Mon Dec 28 09:18:53 2015  Kuniaki IGARASHI  <igaiga@gmail.com>
+
+	* test/ruby/test_string.rb (TestString#test_lstrip_bang): Add test
+	  for String#lstrip!.  [Fix GH-1176]
+
+Sun Dec 27 23:32:26 2015  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_variant2val): refactoring.
+
+Sun Dec 27 21:14:42 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* process.c (rb_execarg_parent_start1): need to convert the encoding to
+	  ospath's one.
+
+Sun Dec 27 20:54:22 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* process.c: use rb_w32_uchdir() instead of plain chdir() on Windows.
+	  reported by naruse via twitter.
+
+	* process.c (rb_execarg_addopt): need to convert the encoding to
+	  ospath's one.
+
+Sun Dec 27 20:00:31 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* enc/x_emoji.h: fix dead-link.
+
+Sun Dec 27 19:55:55 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* doc/NEWS-2.3.0: fix a typo.
+
+Sun Dec 27 18:08:15 2015  Kuniaki IGARASHI  <igaiga@gmail.com>
+
+	* string.c (rb_str_lstrip_bang, rb_str_rstrip_bang): [DOC] Fix
+	  ruby-doc comments for String#rstrip! and lstrip!.  It looks like
+	  dropped bang.  [Fix GH-1175]
+
+Sun Dec 27 15:14:20 2015  Eric Wong  <e@80x24.org>
+
+	* io.c (io_getpartial): remove unused kwarg from template
+	* test/ruby/test_io.rb (test_readpartial_bad_args): new
+	  [Bug #11885]
+
+Sun Dec 27 11:50:53 2015  Kuniaki IGARASHI  <igaiga@gmail.com>
+
+	* test/ruby/test_string.rb (test_rstrip, test_lstrip): Add tests
+	  for String#lstrip and rstrip.  The test cases are used from
+	  string.c ruby-doc comments.  [Fix GH-1174]
+
+Sun Dec 27 11:47:46 2015  Kuniaki IGARASHI  <igaiga@gmail.com>
+
+	* test/ruby/test_string.rb (test_insert): Add test for
+	  String#insert.  The test cases are written in string.c
+	  comments as a reference.  [Fix GH-1173]
+
+Sun Dec 27 11:03:33 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (show_bitstack): trace stack_type value if yydebug.
+
+Sun Dec 27 10:03:14 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/depend (enc, trans): fix version dependency, shared object
+	  files depend on the RUBY_SO_NAME value for runtime link.
+
+Sun Dec 27 09:47:20 2015  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_vstr2wc, ole_variant2val): fix blank
+	  string conversion.
+	  [Bug #11880]
+	  Thanks Akio Tajima for the patch!
+
+Sun Dec 27 09:34:53 2015  craft4coder  <yooobuntu@163.com>
+
+	* doc/extension.rdoc: [DOC] `nul` should be uppercase.
+	  change 'nul' => 'NUL'.  [Fix GH-1172]
+
+Sat Dec 26 18:29:01 2015  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/xmlrpc/client.rb: Support SSL options in async methods of
+	  XMLRPC::Client.
+	  [Bug #11489]
+	  Reported by Aleksandar Kostadinov. Thanks!!!
+
+Sat Dec 26 11:26:38 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* miniinit.c (Init_enc): add some common aliases of built-in
+	  encodings.  [ruby-core:72481] [Bug #11872]
+
+Fri Dec 25 22:43:26 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: extract RUBY_RELEASE_DAY at generating Makefile.
+
+	* version.h (RUBY_RELEASE_DATE): construct from RUBY_RELEASE_YEAR,
+	  RUBY_RELEASE_MONTH, and RUBY_RELEASE_DAY.
+
+Fri Dec 25 21:33:06 2015  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* version.h (RUBY_VERSION): 2.4.0 development has started.
+
+Fri Dec 25 14:12:12 2015  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* doc/ChangeLog-2.3.0, ext/tk/lib/tkextlib/SUPPORT_STATUS,
+	  include/ruby/version.h: minor grammar fixes [ci skip]
+
+Fri Dec 25 08:23:22 2015  Tadashi Saito  <tad.a.digger@gmail.com>
+
+	* compile.c, cont.c, doc, man: fix common misspelling.
+	  [ruby-core:72466] [Bug #11870]
+
+
+For the changes before 2.3.0, see doc/ChangeLog-2.3.0
+For the changes before 2.2.0, see doc/ChangeLog-2.2.0
+For the changes before 2.1.0, see doc/ChangeLog-2.1.0
+For the changes before 2.0.0, see doc/ChangeLog-2.0.0
+For the changes before 1.9.3, see doc/ChangeLog-1.9.3
+For the changes before 1.8.0, see doc/ChangeLog-1.8.0
+
+Local variables:
+coding: us-ascii
+add-log-time-format: (lambda (&optional x y)
+  (let* ((time (or x (current-time)))
+	 (system-time-locale "C")
+	 (diff (+ (cadr time) 32400))
+	 (lo (% diff 65536))
+	 (hi (+ (car time) (/ diff 65536))))
+  (format-time-string "%a %b %e %H:%M:%S %Y" (list hi lo) t)))
+indent-tabs-mode: t
+tab-width: 8
+change-log-indent-text: 2
+end:
+vim: tabstop=8 shiftwidth=2
diff --git a/doc/ChangeLog-YARV b/doc/ChangeLog-YARV
index 6a6cfbd0c9..a8b999dff2 100644
--- a/doc/ChangeLog-YARV
+++ b/doc/ChangeLog-YARV
@@ -530,7 +530,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 
 2006-08-17(Thu) 12:23:52 +0900  Koichi Sasada  <ko1@atdot.net>
 
-	* eval.c : change initilize routine order ([yarv-dev:1067])
+	* eval.c : change initialize routine order ([yarv-dev:1067])
 
 	* yarvcore.c (Init_yarv) : init th->machine_stack_start
 
@@ -2115,7 +2115,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 
 2006-02-14(Tue) 18:15:03 +0900  Koichi Sasada  <ko1@atdot.net>
 
-	* configure.in : enable pthread by deafult
+	* configure.in : enable pthread by default
 
 	* ascii.c : import ruby 1.9 HEAD
 
@@ -3650,10 +3650,10 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 	* thread.c (yarv_thread_execute_interrupts) : added
 
 	* thread_pthread.h (thread_timer) : set interrupt_flag of
-	current runnning threads
+	current running threads
 
 	* vm.c (th_invoke_proc) : jump with JUMP_TAG() if some exception
-	occurres
+	occurs
 
 	* yarv.h : add yarv_set_current_running_thread_raw() for bootstrap
 
@@ -5617,7 +5617,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 
 	* rb/insns2vm.rb : fix category (comment)
 
-	* depend : remove space betweeen target name and colon
+	* depend : remove space between target name and colon
 
 
 2005-03-04(Fri) 15:55:51 +0900  Koichi Sasada  <ko1@atdot.net>
@@ -5783,7 +5783,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 
 	* disasm.c : fix ID to String method
 
-	* compile.c : NODE_SUPER, NODE_ZSUPER check 'poped'
+	* compile.c : NODE_SUPER, NODE_ZSUPER check 'popped'
 	and NODE_RETURN check outer type
 	and NODE_DREGX_ONCE supported (temporarily)
 
diff --git a/doc/NEWS-1.8.7 b/doc/NEWS-1.8.7
index 38571fe103..5da39ff265 100644
--- a/doc/NEWS-1.8.7
+++ b/doc/NEWS-1.8.7
@@ -417,7 +417,7 @@ with all sufficient information, see the ChangeLog file.
     * 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::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')
@@ -518,7 +518,7 @@ with all sufficient information, see the ChangeLog file.
     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/
+    https://www.ruby-lang.org/en/news/2008/08/23/dos-vulnerability-in-rexml/
 
 * stringio
 
diff --git a/doc/NEWS-1.9.2 b/doc/NEWS-1.9.2
index 9cf58c9aff..430c6cc4f5 100644
--- a/doc/NEWS-1.9.2
+++ b/doc/NEWS-1.9.2
@@ -240,7 +240,7 @@ with all sufficient information, see the ChangeLog file.
     * new alias of item.guid.isPermaLink=
 
 * DL
-  * Now uses libffi as a backend if avaiable.
+  * Now uses libffi as a backend if available.
     It means DL works fine on more platforms.
 
 * Fiddle
@@ -263,7 +263,7 @@ with all sufficient information, see the ChangeLog file.
     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/
+    https://www.ruby-lang.org/en/news/2008/08/23/dos-vulnerability-in-rexml/
 
 * RDoc
 
diff --git a/doc/NEWS-2.0.0 b/doc/NEWS-2.0.0
index 9ad7254317..712d3a693b 100644
--- a/doc/NEWS-2.0.0
+++ b/doc/NEWS-2.0.0
@@ -94,7 +94,7 @@ with all sufficient information, see the ChangeLog file.
       required caller size.
     * Kernel#to_enum and enum_for accept a block for lazy size evaluation.
   * incompatible changes:
-    * system() and exec() closes non-standard file descriptors
+    * system() and exec() close non-standard file descriptors
       (The default of :close_others option is changed to true by default.)
     * respond_to? against a protected method now returns false unless
       the second argument is true.
@@ -116,8 +116,7 @@ with all sufficient information, see the ChangeLog file.
       corresponding method in the prepending module.
     * added Module.prepended and Module.prepend_features, similar
       to included and append_features.
-    * added Module#refine, which extends a class or module locally.
-      [experimental]
+    * added Module#refine, which extends a class or module locally. [experimental]
   * extended method:
     * Module#define_method accepts a UnboundMethod from a Module.
     * Module#const_get accepts a qualified constant string, e.g.
@@ -497,7 +496,7 @@ with all sufficient information, see the ChangeLog file.
     * Dir.mktmpdir uses FileUtils.remove_entry instead of
       FileUtils.remove_entry_secure.  This means that applications should not
       change the permission of the created temporary directory to make
-      accessible from other users.
+      writable from other users.
 
 * yaml
   * Syck has been removed.  YAML now completely depends on libyaml being
@@ -528,4 +527,3 @@ with all sufficient information, see the ChangeLog file.
 * NUM2SHORT() and NUM2USHORT() added. They are similar to NUM2INT, but short.
 
 * rb_newobj_of() and NEWOBJ_OF() added. They create a new object of a given class.
-
diff --git a/doc/NEWS-2.2.0 b/doc/NEWS-2.2.0
index 70ccddf32d..98e252ec77 100644
--- a/doc/NEWS-2.2.0
+++ b/doc/NEWS-2.2.0
@@ -63,7 +63,7 @@ with all sufficient information, see the ChangeLog file.
 
 * IO
   * Improvements
-    * IO#nonblock_read and IO#nonblock_write for pipes on Windows are supported.
+    * IO#read_nonblock and IO#write_nonblock for pipes on Windows are supported.
 
 * Kernel
   * New methods:
@@ -90,7 +90,7 @@ with all sufficient information, see the ChangeLog file.
 
 * Method
   * New methods:
-    * Method#curry([arity]) returns a curried Proc.
+    * Method#curry([ arity ]) returns a curried Proc.
     * Method#super_method returns a Method of superclass, which would be called
       when super is used.
 
@@ -250,8 +250,7 @@ with all sufficient information, see the ChangeLog file.
   * Logger::Application is extracted to logger-application gem. It's unmaintain code.
 
 * ObjectSpace (after requiring "objspace")
-  * ObjectSpace.memsize_of(obj) returns a size includes sizeof(RVALUE).
-    [Bug #8984]
+  * ObjectSpace.memsize_of(obj) returns a size includes sizeof(RVALUE). [Bug #8984]
 
 * Prime
   * incompatible changes:
@@ -353,8 +352,7 @@ with all sufficient information, see the ChangeLog file.
 * VM
     * Use frozen string literals for Hash#[] and Hash#[]=
     * Fast keyword arguments passing [Feature #10440]
-    * Allow to receive huge splatted array by a rest argument
-      [Feature #10440]
+    * Allow to receive huge splatted array by a rest argument [Feature #10440]
 
 * Process
     * Process creation methods, such as spawn(), uses vfork() system call.
diff --git a/doc/NEWS-2.3.0 b/doc/NEWS-2.3.0
index 489aba4a89..065515257e 100644
--- a/doc/NEWS-2.3.0
+++ b/doc/NEWS-2.3.0
@@ -16,20 +16,19 @@ with all sufficient information, see the ChangeLog file or Redmine
 
 * frozen-string-literal pragma:
 
-  * new pragma, frozen-string-literal has been experimentally introduced.
-    [Feature #8976]
+  * new pragma, frozen-string-literal has been experimentally introduced. [Feature #8976]
   * besides, --enable/--disable=frozen-string-literal options also have
     been introduced. [Feature #8976]
   * command line options --debug or --debug=frozen-string-literal enable
     additional debugging mode which shows created location with at frozen
-    object error (RuntimeError).
-    [Feature #11725]
+    object error (RuntimeError). [Feature #11725]
 
 * safe navigation operator:
 
   * new method call syntax, `object&.foo', method #foo is called on
-    `object' if it is not nil.
-    this is similar to `try!' in Active Support, except:
+    `object' if it is not nil. [Feature #11537]
+
+    This is similar to `try!' in Active Support, except:
     * method name is syntactically required
           obj.try! {} # valid
           obj&. {}    # syntax error
@@ -38,7 +37,6 @@ with all sufficient information, see the ChangeLog file or Redmine
           obj&.foo(bar())        # bar() is conditionally evaluated
     * attribute assignment is valid
           obj&.attr += 1
-    [Feature #11537]
 
 * the did_you_mean gem:
 
@@ -53,15 +51,13 @@ with all sufficient information, see the ChangeLog file or Redmine
 * indented here document:
 
   * new string literal, here document starts with `<<~`.
-    refer doc/syntax/literals.rdoc for more details.
-    [Feature #9098]
+    refer doc/syntax/literals.rdoc for more details. [Feature #9098]
 
 === Core classes updates (outstanding ones only)
 
 * ARGF
 
-  * ARGF.read_nonblock supports `exception: false' like IO#read_nonblock.
-    [Feature #11358]
+  * ARGF.read_nonblock supports `exception: false' like IO#read_nonblock. [Feature #11358]
 
 * Array
 
@@ -78,8 +74,7 @@ with all sufficient information, see the ChangeLog file or Redmine
 
 * Enumerable
 
-  * Enumerable#grep_v is added as inverse version of Enumerable#grep.
-    [Feature #11049]
+  * Enumerable#grep_v is added as inverse version of Enumerable#grep. [Feature #11049]
   * Enumerable#chunk_while [Feature #10769]
 
 * Enumerator::Lazy
@@ -105,8 +100,7 @@ with all sufficient information, see the ChangeLog file or Redmine
     this affect only files opened as binary.  [Feature #11218]
 
   * new option parameter `flags' is added.
-    this parameter is bitwise-ORed to oflags generated by normal mode argument.
-    [Feature #11253]
+    this parameter is bitwise-ORed to oflags generated by normal mode argument. [Feature #11253]
 
   * IO#advise no longer raises Errno::ENOSYS in cases where it was
     detected at build time but not available at runtime.  [Feature #11806]
@@ -125,8 +119,7 @@ with all sufficient information, see the ChangeLog file or Redmine
 * Numeric
 
   * Numeric#positive? and Numeric#negative? are added, which return
-    true when the receiver is positive and negative respectively.
-    [Feature #11151]
+    true when the receiver is positive and negative respectively. [Feature #11151]
 
 * Proc
 
@@ -152,11 +145,9 @@ with all sufficient information, see the ChangeLog file or Redmine
 
 * String
 
-  * String#+@ and String#-@ are added to get mutable/frozen strings.
-    [Feature #11782]
+  * String#+@ and String#-@ are added to get mutable/frozen strings. [Feature #11782]
 
-  * String.new now accepts new option parameter `encoding'.
-    [Feature #11785]
+  * String.new now accepts new option parameter `encoding'. [Feature #11785]
 
 * Struct
   * Struct#dig [Feature #11688]
@@ -233,12 +224,10 @@ with all sufficient information, see the ChangeLog file or Redmine
 
 * OpenSSL
   * OpenSSL::SSL::SSLSocket#accept_nonblock and
-    OpenSSL::SSL::SSLSocket#connect_nonblock supports `exception: false`.
-    [Feature #10532]
+    OpenSSL::SSL::SSLSocket#connect_nonblock supports `exception: false`. [Feature #10532]
 
 * Pathname
-  * Pathname#descend and Pathname#ascend supported blockless form.
-    [Feature #11052]
+  * Pathname#descend and Pathname#ascend supported blockless form. [Feature #11052]
 
 * Socket
   * Socket#connect_nonblock, Socket#accept_nonblock,
@@ -246,8 +235,7 @@ with all sufficient information, see the ChangeLog file or Redmine
     BasicSocket#recv_nonblock, BasicSocket#recvmsg_nonblock,
     BasicSocket#sendmsg_nonblock all support `exception: false` to return
     :wait_readable or :wait_writable symbols instead of raising
-    IO::WaitReadable or IO::WaitWritable exceptions
-    [Feature #10532] [Feature #11229]
+    IO::WaitReadable or IO::WaitWritable exceptions [Feature #10532] [Feature #11229]
   * BasicSocket#recv and BasicSocket#recv_nonblock allow an output
     String buffer argument like IO#read and IO#read_nonblock to reduce
     GC overhead [Feature #11242]
@@ -255,8 +243,7 @@ with all sufficient information, see the ChangeLog file or Redmine
 * StringIO
   * In read-only mode, StringIO#set_encoding no longer sets the encoding
     of its buffer string.  Setting the encoding of the string directly
-    without StringIO#set_encoding may cause unpredictable behavior now.
-    [Bug #11827]
+    without StringIO#set_encoding may cause unpredictable behavior now. [Bug #11827]
 
 * timeout
   * Object#timeout is now warned as deprecated when called.
@@ -297,8 +284,7 @@ with all sufficient information, see the ChangeLog file or Redmine
   * default value of Net::HTTP#open_timeout is now 60 (was nil).
 
 * Net::Telnet
-  * Net::Telnet is extracted to net-telnet gem. It's unmaintain code.
-    [Feature #11083]
+  * Net::Telnet is extracted to net-telnet gem. It's unmaintain code. [Feature #11083]
 
 * Psych
   * Updated to Psych 2.0.17
@@ -330,8 +316,7 @@ with all sufficient information, see the ChangeLog file or Redmine
   class is already defined but its superclass does not match the given
   superclass, as well as definitions in ruby level.
 
-* rb_timespec_now() is added to fetch current datetime as struct timespec.
-  [Feature #11558]
+* rb_timespec_now() is added to fetch current datetime as struct timespec. [Feature #11558]
 
 * rb_time_timespec_new() is added to create a time object with epoch,
   nanosecond, and UTC/localtime/time offset arguments.  [Feature #11558]
@@ -354,11 +339,9 @@ with all sufficient information, see the ChangeLog file or Redmine
 
 === Implementation improvements
 
-* Optimize Proc#call to eliminate method frame construction.
-  [Feature #11569]
+* Optimize Proc#call to eliminate method frame construction. [Feature #11569]
 
-* Reconsidering method entry data structure.
-  [Bug #11278]
+* Reconsidering method entry data structure. [Bug #11278]
 
 * Introducing new table data structure for ID keys tables used by
   method table and so on. New table structure is simple and fast
@@ -367,13 +350,11 @@ with all sufficient information, see the ChangeLog file or Redmine
 * Machine code level tuning for object allocation and method calling
   code. r52099, r52254
 
-* RubyVM::InstructionSequence is extended for future improvement.
-  [Feature #11788]
+* RubyVM::InstructionSequence is extended for future improvement. [Feature #11788]
 
 * Case dispatch is now optimized for all special constant literals
   including nil, true, and false.  Previously, only literal strings,
-  symbols, integers and floats compiled to optimized case dispatch.
-  [Feature #11769]
+  symbols, integers and floats compiled to optimized case dispatch. [Feature #11769]
 
 * Instance variables on non-pure Ruby classes (T_DATA, T_FILE,
   etc..) is less expensive to store than before. [Feature #11170]
@@ -382,8 +363,7 @@ with all sufficient information, see the ChangeLog file or Redmine
   constant-time.  Previously, Struct elements beyond the first 10
   elements used a linear scan. [Feature #10585]
 
-* The Set class got several speed up.
-  [Misc #10754], [r52591]
+* The Set class got several speed up. [Misc #10754], [r52591]
 
 * Socket and I/O-related improvements
 
@@ -397,8 +377,8 @@ with all sufficient information, see the ChangeLog file or Redmine
     addition to reducing expensive exceptions. [Feature #11044]
 
   * (Linux-only) waiting on a single FD anywhere in the stdlib no longer
-    uses select(2), making it immune to slowdowns with high-numbered FDs.
-    [Feature #11081] [Feature #11377]
+    uses select(2), making it immune to slowdowns with high-numbered
+    FDs. [Feature #11081] [Feature #11377]
 
 * CGI.escapeHTML is optimized with C extension.
   https://github.com/ruby/ruby/pull/1164
diff --git a/doc/NEWS-2.4.0 b/doc/NEWS-2.4.0
new file mode 100644
index 0000000000..8a02f03809
--- /dev/null
+++ b/doc/NEWS-2.4.0
@@ -0,0 +1,399 @@
+# -*- rdoc -*-
+
+= NEWS for Ruby 2.4.0
+
+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 or Redmine
+(e.g. <tt>https://bugs.ruby-lang.org/issues/$FEATURE_OR_BUG_NUMBER</tt>)
+
+== Changes since the 2.3.0 release
+
+=== Language changes
+
+* Multiple assignment in conditional expression is now allowed.  [Feature #10617]
+
+* Refinements is enabled at method by Symbol#to_proc.  [Feature #9451]
+
+* Refinements is enabled with Kernel#send and BasicObject#__send__.  [Feature #11476]
+
+* Rescue modifier now applicable to method arguments.  [Feature #12686]
+
+* Toplevel return is now allowed.  [Feature #4840]
+
+=== Core classes updates (outstanding ones only)
+
+* Array
+
+  * Array#concat [Feature #12333]
+
+    Now takes multiple arguments.
+
+  * Array#max and Array#min.  [Feature #12172]
+
+    This may cause a tiny incompatibility: if you redefine
+    Enumerable#max and call max to an Array, your redefinition will be
+    now ignored.  You should also redefine Array#max.
+
+  * Array#pack [Feature #12754]
+
+    Now takes optional argument `buffer:' to reuse already allocated buffer.
+
+  * Array#sum  [Feature #12217]
+
+    This is different from Enumerable#sum in that Array#sum doesn't depend on
+    the definition of each method.
+
+* Comparable
+
+  * Comparable#clamp.  [Feature #10594]
+
+* Dir
+
+  * Dir.empty?.  [Feature #10121]
+
+* Enumerable
+
+  * Enumerable#chunk called without a block now return an Enumerator  [Feature #2172]
+  * Enumerable#sum  [Feature #12217]
+  * Enumerable#uniq  [Feature #11090]
+
+* Enumerator::Lazy
+
+  * Enumerator::Lazy#chunk_while  [GH-1186]
+  * Enumerator::Lazy#uniq  [Feature #11090]
+
+* File
+
+  * File.empty?.  [Feature #9969]
+
+* Float
+
+  * Float#ceil, Float#floor, and Float#truncate now take an optional
+    digits, as well as Float#round.  [Feature #12245]
+
+  * Float#round now takes an optional keyword argument, half option, and
+    the default behavior is round-up.  [Bug #12548] [Bug #12958]
+    half option can be one of :even, :up, and :down.  [Feature #12953]
+
+* Hash
+
+  * Hash#compact and Hash#compact!  [Feature #11818]
+  * Hash#transform_values and Hash#transform_values!  [Feature #12512]
+
+* Integer
+
+  * Fixnum and Bignum are unified into Integer  [Feature #12005]
+
+  * Integer#ceil, Integer#floor, and Integer#truncate now take an optional
+    digits, as well as Integer#round.  [Feature #12245]
+
+  * Integer#digits for extracting columns of place-value notation [Feature #12447]
+
+  * Integer#round now takes an optional keyword argument, half option, and the
+    default behavior is round-up now.  [Bug #12548] [Bug #12958]
+
+    half option can be one of :even, :up, and :down.  [Feature #12953]
+
+* IO
+
+  * IO#gets, IO#readline, IO#each_line, IO#readlines, IO.foreach now takes
+    an optional keyword argument, chomp flag.  [Feature #12553]
+
+* Kernel
+
+  * Kernel#clone now takes an optional keyword argument, freeze flag.  [Feature #12300]
+
+* MatchData
+
+  * MatchData#named_captures [Feature #11999]
+  * MatchData#values_at supports named captures [Feature #9179]
+
+* Module
+
+  * Module#refine accepts a module as the argument now. [Feature #12534]
+  * Module.used_modules [Feature #7418]
+
+* Numeric
+
+  * Numeric#finite?, Numeric#infinite? [Feature #12039]
+
+* Process
+
+  * Support CLOCK_MONOTONIC_RAW_APPROX, CLOCK_UPTIME_RAW, and
+    CLOCK_UPTIME_RAW_APPROX which are introduced by macOS 10.12.
+
+* Rational
+
+  * Rational#round now takes an optional keyword argument, half option, and
+    the default behavior is round-up now.  [Bug #12548] [Bug #12958]
+    half option can be one of :even, :up, and :down.  [Feature #12953]
+
+* Regexp
+
+  * meta character \X matches Unicode 9.0 characters with some workarounds
+    for UTR #51 Unicode Emoji, Version 4.0 emoji zwj sequences.
+
+  * Regexp#match? [Feature #8110]
+
+    This returns bool and doesn't save backref.
+
+  * Update to Onigmo 6.0.0.
+
+* Regexp/String: Update Unicode version from 8.0.0 to 9.0.0 [Feature #12513]
+
+* RubyVM::Env
+
+  * RubyVM::Env was removed.
+
+* String
+
+  * String#casecmp? [Feature #12786]
+
+  * String#concat, String#prepend [Feature #12333]
+
+    Now takes multiple arguments.
+
+  * String#each_line, String#lines now takes an optional keyword argument,
+    chomp flag.  [Feature #12553]
+
+  * String#match? [Feature #12898]
+
+  * String#unpack1 [Feature #12752]
+
+  * String#upcase, String#downcase, String#capitalize, String#swapcase and
+    their bang variants work for all of Unicode, and are no longer limited
+    to ASCII. Supported encodings are UTF-8, UTF-16BE/LE, UTF-32BE/LE, and
+    ISO-8859-1~16. Variations are available with options. See the documentation
+    of String#downcase for details. [Feature #10085]
+
+  * String.new(capacity: size) [Feature #12024]
+
+* StringIO
+
+  * StringIO#gets, StringIO#readline, StringIO#each_line, StringIO#readlines now takes
+    an optional keyword argument, chomp flag.  [Feature #12553]
+
+* Symbol
+
+  * Symbol#casecmp? [Feature #12786]
+
+  * Symbol#match now returns MatchData.  [Bug #11991]
+
+  * Symbol#match? [Feature #12898]
+
+  * Symbol#upcase, Symbol#downcase, Symbol#capitalize, and Symbol#swapcase now
+    work for all of Unicode. See the documentation of String#downcase
+    for details. [Feature #10085]
+
+* Thread
+
+  * Thread#report_on_exception and Thread.report_on_exception [Feature #6647]
+
+* TracePoint
+
+  * TracePoint#callee_id [Feature #12747]
+
+* Warning
+
+  * New module named Warning is introduced.  By default it has only
+    one singleton method, named warn.  This makes it possible for
+    3rd-party libraries to control the way warnings are handled. [Feature #12299]
+
+=== Stdlib updates (outstanding ones only)
+
+* CGI
+
+  * Don't allow , as a separator [Bug #12791]
+
+* CSV
+
+  * Add a liberal_parsing option. [Feature #11839]
+
+* IPAddr
+
+  * IPAddr#== and IPAddr#<=> no longer raise an exception if coercion fails. [Bug #12799]
+
+* IRB
+
+  * Binding#irb: Start a REPL session like `binding.pry` at r56624.
+
+* Logger
+
+  * Allow specifying logger parameters in constructor such
+    as level, progname, datetime_format, formatter. [Feature #12224]
+  * Add shift_period_suffix option. [Feature #10772]
+
+* Net::HTTP
+
+  * New method: Net::HTTP.post [Feature #12375]
+
+* Net::FTP
+
+  * Support TLS (RFC 4217).
+  * Support hash style options for Net::FTP.new.
+  * Add a new optional argument pathname to Net::FTP#status.
+    Contributed by soleboxy. [GH-1478] [Feature #12965]
+
+* OpenSSL
+
+  * Includes Ruby/OpenSSL 2.0. OpenSSL has been extracted as a Gem and is
+    maintained at a separate repository now: https://github.com/ruby/openssl.
+    It still remains as a 'default gem'.  [Feature #9612]
+    Refer to ext/openssl/History.md for the full release note.
+
+* optparse
+
+  * Add an into option. [Feature #11191]
+
+* pathname
+
+  * New method: Pathname#empty? [Feature #12596]
+
+* Readline
+
+  * Readline.quoting_detection_proc and Readline.quoting_detection_proc= [Feature #12659]
+
+* REXML
+
+  * REXML::Element#[]: If String or Symbol is specified, attribute
+    value is returned. Otherwise, Nth child is returned. This is
+    backward compatible change.
+
+* set
+
+  * New methods: Set#compare_by_identity and Set#compare_by_identity?. [Feature #12210]
+
+* WEBrick
+
+  * Don't allow , as a separator [Bug #12791]
+
+=== Compatibility issues (excluding feature bug fixes)
+
+* Array#sum and Enumerable#sum are implemented.  [Feature #12217]
+
+  Ruby itself has no compatibility problem because Ruby didn't have sum method
+  for arrays before Ruby 2.4.
+  However many third party gems, activesupport, facets, simple_stats, etc,
+  defines sum method.  These implementations are mostly compatible but
+  there are subtle differences.
+  Ruby's sum method should be mostly compatible but it is impossible to
+  be perfectly compatible with all of them.
+
+* Fixnum and Bignum are unified into Integer  [Feature #12005]
+
+  Fixnum class and Bignum class is removed.
+  Integer class is changed from abstract class to concrete class.
+  For example, 0 is an instance of Integer: 0.class returns Integer.
+  The constants Fixnum and Bignum is bound to Integer.
+  So obj.kind_of?(Fixnum) works as obj.kind_of?(Integer).
+  At C-level, Fixnum object and Bignum object should be distinguished by
+  FIXNUM_P(obj) and RB_TYPE_P(obj, T_BIGNUM).
+  RUBY_INTEGER_UNIFICATION can be used to detect this feature at C-level.
+  0.class == Integer can be used to detect this feature at Ruby-level.
+  The C-level constants, rb_cFixnum and rb_cBignum, are removed.
+  They can cause compilation failure.
+
+* String/Symbol#upcase/downcase/swapcase/capitalize(!) now work for all of
+  Unicode, not only for ASCII. [Feature #10085]
+
+  No change is needed if the data is in ASCII anyway or if the limitation
+  to ASCII was only tolerated while waiting for a more extensive implementation.
+  A change (using the :ascii option) is needed in cases where Unicode data
+  is processed, but the operation has to be limited to ASCII only.
+  A good example of this are internationalized domain names.
+
+* TRUE / FALSE / NIL
+
+  These constants are now obsoleted. [Feature #12574]
+  Use true / false / nil resp. instead.
+
+=== Stdlib compatibility issues (excluding feature bug fixes)
+
+* DateTime
+
+  * DateTime#to_time now preserves timezone.  [Bug #12189]
+
+* Psych
+
+  * Update to Psych 2.2.2
+
+* RDoc
+
+  * Update to RDoc 5.0.0
+
+* RubyGems
+
+  * Update to RubyGems 2.6.8
+
+* shellwords
+
+  * Shellwords.shellwords (shellsplit) treats the backslash as escape
+    character only when followed by one of the following characters:
+    $ ` " \ <newline> [Bug #10055]
+
+* Time
+
+  * Time#to_time now preserves timezone.  [Bug #12271]
+
+* thread
+
+  * the extension library is removed.  Till 2.0 it was a pure ruby script
+    "thread.rb", which has precedence over "thread.so", and has been provided
+    in $LOADED_FEATURES since 2.1.
+
+* Tk
+
+  * Tk is removed from stdlib.  [Feature #8539]
+
+    https://github.com/ruby/tk is the new upstream.
+
+* XMLRPC
+
+  * XMLRPC is removed from stdlib, and bundled as gem. [Feature #12160][ruby-core:74239]
+
+    https://github.com/ruby/xmlrpc is the new upstream.
+
+* Zlib
+
+  * Zlib.gzip and Zlib.gunzip [Feature #13020]
+
+=== C API updates
+
+* ruby_show_version() will no longer exits the process, if
+  RUBY_SHOW_COPYRIGHT_TO_DIE is set to 0.  This will be the default in
+  the future.
+
+* rb_gc_adjust_memory_usage() [Feature #12690]
+
+=== Supported platform changes
+
+* FreeBSD < 4 is no longer supported
+
+=== Implementation improvements
+
+* In some condition, `[x, y].max` and `[x, y].min` are optimized
+  so that a temporal array is not created.  The concrete condition is
+  an implementation detail: currently, the array literal must have no
+  splat, must have at least one expression but literal, the length must
+  be <= 0x100, and Array#max and min must not be redefined.  It will work
+  in most casual and real-life use case where it is written with intent
+  to `Math.max(x, y)`.
+
+* Thread deadlock detection now shows their backtrace and dependency. [Feature #8214]
+
+* st_table (st.c) internal data structure is improved. [Feature #12142]
+
+* Rational is extensively optimized. [Feature #12484]
+
+=== Miscellaneous changes
+
+* ChangeLog is removed from the repository.
+
+  It is generated from commit messages in Subversion by `make dist`.
+  Also note that now people should follow Git style commit message.
+  The template is written at {Short (50 chars or less) summary of
+  changes}[https://git-scm.com/book/ch5-2.html].  [Feature #12283]
diff --git a/doc/NEWS-2.5.0 b/doc/NEWS-2.5.0
new file mode 100644
index 0000000000..c891317b61
--- /dev/null
+++ b/doc/NEWS-2.5.0
@@ -0,0 +1,565 @@
+# -*- rdoc -*-
+
+= NEWS for Ruby 2.5.0
+
+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 or Redmine
+(e.g. <tt>https://bugs.ruby-lang.org/issues/$FEATURE_OR_BUG_NUMBER</tt>)
+
+== Changes since the 2.4.0 release
+
+=== Language changes
+
+* Top-level constant look-up is removed.  [Feature #11547]
+
+* rescue/else/ensure are allowed inside do/end blocks.  [Feature #12906]
+
+* refinements take place in string interpolations.  [Feature #13812]
+
+=== Core classes updates (outstanding ones only)
+
+* Array
+
+  * New methods:
+
+    * Array#append  [Feature #12746]
+    * Array#prepend  [Feature #12746]
+
+* Data
+
+  * Is deprecated. It was a base class for C extensions, and it's not
+    necessary to expose in Ruby level. [Feature #3072]
+
+* Exception
+
+  * New methods:
+
+    * Exception#full_message to retrieve a String expression of an exception,
+      formatted in the same way in which Ruby prints out an uncaught
+      exception.  [Feature #14141] [experimental]
+
+* Dir
+
+  * Dir.glob provides new optional keyword argument, +:base+ .  [Feature #13056]
+  * Dir.chdir (without block arg), Dir.open, Dir.new, Dir.mkdir, Dir.rmdir,
+    Dir.empty? releases GVL
+
+  * New methods:
+
+    * Dir.children  [Feature #11302]
+    * Dir.each_child  [Feature #11302]
+
+* Enumerable
+
+  * Enumerable#any?, Enumerable#all?, Enumerable#none? and Enumerable#one?
+    accept a pattern argument. [Feature #11286]
+
+* File
+
+  * File.open accepts +:newline+ option to imply text mode. [Bug #13350]
+  * File#path raises an IOError for files opened with
+    File::Constants::TMPFILE option. [Feature #13568]
+  * File.stat, File.exist? and other <code>rb_stat()</code>-using methods
+    release GVL. [Bug #13941]
+  * File.rename releases GVL. [Feature #13951]
+  * File::Stat#atime, File::Stat#mtime and File::Stat#ctime support fractional
+    second timestamps on Windows 8 and later.  [Feature #13726]
+  * File::Stat#ino and File.identical? support ReFS 128bit ino on Windows 8.1
+    and later.  [Feature #13731]
+  * File.readable?, File.readable_real?, File.writable?, File.writable_real?,
+    File.executable?, File.executable_real?, File.mkfifo, File.readlink,
+    File.truncate, File#truncate, File.chmod, File.lchmod, File.chown,
+    File.lchown, File.unlink, File.utime, File.lstat release GVL
+
+  * New method:
+
+    * File.lutime  [Feature #4052]
+
+* Hash
+
+  * New methods:
+
+    * Hash#transform_keys  [Feature #13583]
+    * Hash#transform_keys!  [Feature #13583]
+    * Hash#slice  [Feature #8499]
+
+* IO
+
+  * IO.copy_stream tries copy offload with copy_file_range(2) [Feature #13867]
+
+  * New methods:
+
+    * IO#pread  [Feature #4532]
+    * IO#pwrite  [Feature #4532]
+    * IO#write accepts multiple arguments  [Feature #9323]
+
+* IOError
+
+  * IO#close might raise an error with message "stream closed",
+    but it is refined to "stream closed in another thread". The new message
+    is more clear for user. [Bug #13405]
+
+* Integer
+
+  * Integer#round, Integer#floor, Integer#ceil and Integer#truncate always
+    return an Integer. [Bug #13420]
+  * Integer#pow accepts modulo argument for calculating modular
+    exponentiation.  [Feature #12508] [Feature #11003]
+
+  * New methods:
+
+    * Integer#allbits?, Integer#anybits?, Integer#nobits? [Feature #12753]
+    * Integer.sqrt  [Feature #13219]
+
+* Kernel
+
+  * Kernel#yield_self   [Feature #6721]
+  * Kernel#pp  [Feature #14123]
+  * Kernel#warn(..., uplevel:n)  [Feature #12882]
+
+* Method
+
+  * New methods:
+
+    * Method#=== that invokes Method#call, as same as Proc#=== [Feature #14142]
+
+* Module
+
+  * Module#attr, Module#attr_accessor, Module#attr_reader and Module#attr_writer
+    become public. [Feature #14132]
+  * Module#define_method, Module#alias_method, Module#undef_method and
+    Module#remove_method become public. [Feature #14133]
+
+* Numeric
+
+  * Numeric#step no longer hides errors from coerce method when
+    given a step value which cannot be compared with #> to 0. [Feature #7688]
+  * Numerical comparison operators (<,<=,>=,>) no longer hide exceptions
+    from #coerce method internally. Return nil in #coerce if the coercion is
+    impossible.  [Feature #7688]
+
+* Process
+
+  * Precision of Process.times is improved if getrusage(2) exists. [Feature #11952]
+
+  * New method:
+
+    * Process.last_status as an alias of $? [Feature #14043]
+
+* Range
+  * Range#initialize no longer hides exceptions when comparing begin and
+    end with #<=> and raise a "bad value for range" ArgumentError
+    but instead lets the exception from the #<=> call go through. [Feature #7688]
+
+* Regexp
+
+  * Update to Onigmo 6.1.3-669ac9997619954c298da971fcfacccf36909d05.
+
+    * Support absence operator https://github.com/k-takata/Onigmo/issues/82
+
+  * Support new 5 emoji-related Unicode character properties
+
+* RubyVM::InstructionSequence
+
+  * New method:
+
+    * RubyVM::InstructionSequence#each_child
+    * RubyVM::InstructionSequence#trace_points
+
+* String
+
+  * <code>String#-@</code> deduplicates unfrozen strings.  Already-frozen
+    strings remain unchanged for compatibility.  [Feature #13077]
+  * <code>-"literal"</code> (<code>String#-@</code>) optimized to return the same object
+    (same as <code>"literal".freeze</code> in Ruby 2.1+) [Feature #13295]
+  * String#casecmp and String#casecmp? return nil for non-string arguments
+    instead of raising a TypeError. [Bug #13312]
+  * String#start_with? accepts a regexp [Feature #13712]
+
+  * New methods:
+
+    * String#delete_prefix, String#delete_prefix! [Feature #12694]
+    * String#delete_suffix, String#delete_suffix! [Feature #13665]
+    * String#each_grapheme_cluster and String#grapheme_clusters to
+      enumerate grapheme clusters [Feature #13780]
+    * String#undump to unescape String#dump'ed string [Feature #12275]
+
+* Struct
+
+  * Struct.new takes `keyword_init: true` option to initialize members
+    with keyword arguments. [Feature #11925]
+
+* Regexp/String: Update Unicode version from 9.0.0 to 10.0.0 [Feature #13685]
+
+* Thread
+
+  * Description set by Thread#name= is now visible on Windows 10.
+
+  * New method:
+    * Thread#fetch  [Feature #13009]
+
+  * The default of Thread.report_on_exception is now true,
+    showing unhandled exceptions terminating threads on $stderr. [Feature #14143]
+
+* Time
+
+  * Time.at receives 3rd argument which specifies the unit of 2nd argument. [Feature #13919]
+
+* KeyError
+
+  * New methods:
+
+    * KeyError#receiver [Feature #12063]
+    * KeyError#key      [Feature #12063]
+
+* FrozenError
+
+  * New exception class. [Feature #13224]
+
+=== Stdlib updates (outstanding ones only)
+
+* BigDecimal
+
+  * Update to BigDecimal 1.3.4
+
+  * The following features are added:
+
+    * BigDecimal::VERSION
+
+  * The following features have been deprecated,
+    and are planned to be removed in the version 1.4.0:
+
+    * BigDecimal.new
+
+    * BigDecimal.ver
+
+  * BigDecimal#clone and #dup now do not make a new instance,
+    but returns the receiver itself.
+
+* Coverage
+
+  * Support branch coverage and method coverage measurement. [Feature #13901]
+    Branch coverage tells you which branches are executed, and which not.
+    Method coverage tells you which methods are invoked, and which not.
+    By running a test suite with this new feature, you can know which branches
+    and methods are executed by a test, and evaluate total coverage of a test
+    suite more strictly.
+
+    You can specify the measuring target by an option to `Coverage.start`:
+
+        Coverage.start(lines: true, branches: true, methods: true)
+
+    After some Ruby files are loaded, you can use `Coverage.result` to get
+    the coverage result:
+
+        Coverage.result
+        #=> { "/path/to/file.rb"=>
+        #     { :lines => [1, 2, 0, nil, ...],
+        #       :branches =>
+        #         { [:if, 0, 2, 1, 6, 4] =>
+        #             { [:then, 1, 3, 2, 3, 8] => 0,
+        #               [:else, 2, 5, 2, 5, 8] => 2
+        #             }
+        #         },
+        #       :methods => {
+        #          [Object, :foo, 1, 0, 7, 3] => 2
+        #       }
+        #     }
+        #   }
+
+    The result type of line coverage is not changed; it is just an array that
+    contains numbers, which means the count that each line was executed,
+    or `nil`s, which means that the line is not relevant.
+
+    The result type of branch coverage is:
+
+        { (jump base) => { (jump target) => (counter) } }
+
+    where jump base and targets have the format
+
+        [type, unique-id, start lineno, start column, end lineno, end column]
+
+    For example, `[:if, 0, 2, 1, 6, 4]` reads an `if` statement that ranges from
+    line 2 and column 1, to line 6 and column 4.  `[:then, 1, 3, 2, 3, 8]` reads
+    a `then` clause that ranges from line 3 and column 2, to line 3 and column 8.
+    Note that lineno starts from 1, and that columnno starts from 0.  So, the
+    above example shows a branch from the `if` to the `then` was never executed,
+    and a branch from the `if` to the `else` was executed twice.
+
+    The result type of method coverage is:
+
+        { (method key) => (counter) }
+
+    where method key has the format
+
+        [class, method-name, start lineno, start column, end lineno, end column]
+
+    For example, `[Object, :foo, 1, 0, 7, 3]` reads `Object#foo` that ranges from
+    line 1 and column 0, to line 7 and column 3.  The above example shows this
+    `Object#foo` was invoked twice.
+
+    Note: To keep compatibility, passing no option to `Coverage.start` will measure
+    only line coverage, and `Coverage.result` will return the old format:
+
+        Coverage.result
+        #=> { "/path/to/file.rb"=> [1, 2, 0, nil, ...] }
+
+* DRb
+
+  * ACL::ACLEntry.new no longer suppresses IPAddr::InvalidPrefixError.
+
+* ERB
+
+  * Add ERB#result_with_hash to render a template with local variables passed
+    with a Hash object. [Feature #8631]
+
+  * Default template file encoding is changed from ASCII-8BIT to UTF-8 in erb
+    command. [Bug #14095]
+
+  * Carriage returns are changed to be trimmed properly if trim_mode is specified
+    and used. Duplicated newlines will be removed on Windows. [Bug #5339] [Bug #11464]
+
+* IPAddr
+
+  * IPAddr no longer accepts invalid address mask. [Bug #13399]
+  * IPAddr#ipv4_compat and IPAddr#ipv4_compat? are marked for deprecation. [Bug #13769]
+
+  * New methods:
+
+    * IPAddr#prefix
+    * IPAddr#loopback?
+    * IPAddr#private? [Feature #11666]
+    * IPAddr#link_local? [Feature #10912]
+
+* IRB
+
+  * Print backtrace and error message in reverse order [Feature #8661] [experimental]
+  * `binding.irb` automatically requires irb and runs [Bug #13099] [experimental]
+  * `binding.irb` on its start shows source around the line where it was called [Feature #14124]
+
+* Matrix
+
+  * New methods:
+
+    * Matrix.combine and Matrix#combine [Feature #10903]
+    * Matrix#hadamard_product and Matrix#entrywise_product
+
+* Net::HTTP
+
+  * Net::HTTP.new supports no_proxy parameter [Feature #11195]
+  * Net::HTTP#min_version and Net::HTTP#max_version [Feature #9450]
+  * Add more HTTP status classes
+  * Net::HTTP::STATUS_CODES is added as HTTP Status Code Repository [Misc #12935]
+  * Net::HTTP#proxy_user and Net::HTTP#proxy_pass reflect http_proxy environment
+    variable if the system's environment variable is multiuser safe. [Bug #12921]
+
+* open-uri
+  * URI.open method defined as an alias to open-uri's Kernel.open.
+    open-uri's Kernel.open will be deprecated in future.
+
+* OpenSSL
+
+  * Updated Ruby/OpenSSL from version 2.0 to 2.1. Changes are noted in
+    "Version 2.1.0" section in ext/openssl/History.md.
+
+* Pathname
+
+  * New method:
+
+    * Pathname#glob [Feature #7360]
+
+* Psych
+
+  * Update to Psych 3.0.2.
+
+    * Convert fallback option to a keyword argument
+      https://github.com/ruby/psych/pull/342
+    * Add :symbolize_names option to Psych.load, Psych.safe_load like JSON.parse
+      https://github.com/ruby/psych/pull/333, https://github.com/ruby/psych/pull/337
+    * Add Psych::Handler#event_location
+      https://github.com/ruby/psych/pull/326
+    * Make frozen string literal = true
+      https://github.com/ruby/psych/pull/320
+    * Preserve time zone offset when deserializing times
+      https://github.com/ruby/psych/pull/316
+    * Remove deprecated method aliases for syck gem
+      https://github.com/ruby/psych/pull/312
+
+* RbConfig
+
+  * RbConfig::LIMITS is added to provide the limits of C types.
+    This is available when rbconfig/sizeof is loaded.
+
+* Ripper
+
+  * Ripper::EXPR_BEG and so on for Ripper#state.
+
+  * New method:
+
+    * Ripper#state to tell the state of scanner. [Feature #13686]
+
+* RDoc
+
+  * Update to RDoc 6.0.1.
+
+    * Replace IRB based lexer with Ripper.
+      * https://github.com/ruby/rdoc/pull/512
+      * This much improves the speed of generating documents.
+      * It also facilitates supporting new syntax in the future.
+    * Support many new syntaxes of Ruby from the past few years.
+    * Use "frozen_string_literal: true".
+      Performance survey: https://gist.github.com/aycabta/abdfaa75ea8a6877eeb734e942e73800
+    * Support did_you_mean.
+
+* Rubygems
+
+  * Update to Rubygems 2.7.3.
+    * http://blog.rubygems.org/2017/11/28/2.7.3-released.html
+    * http://blog.rubygems.org/2017/11/08/2.7.2-released.html
+    * http://blog.rubygems.org/2017/11/03/2.7.1-released.html
+    * http://blog.rubygems.org/2017/11/01/2.7.0-released.html
+    * http://blog.rubygems.org/2017/10/09/2.6.14-released.html
+    * http://blog.rubygems.org/2017/08/27/2.6.13-released.html
+
+* SecureRandom
+
+  * New method:
+
+    * SecureRandom.alphanumeric
+
+* Set
+
+  * New methods:
+
+    * Set#to_s as alias to #inspect [Feature #13676]
+    * Set#=== as alias to #include? [Feature #13801]
+    * Set#reset [Feature #6589]
+
+* StringIO
+
+  * StringIO#write accepts multiple arguments
+
+* StringScanner
+
+  * New methods:
+
+    * StringScanner#size, StringScanner#captures, StringScanner#values_at  [Feature #836]
+
+* URI
+
+  * Relative path operations no longer collapse consecutive slashes to a single slash. [Bug #8352]
+
+* WEBrick
+
+  * Add Server Name Indication (SNI) support [Feature #13729]
+  * support Proc objects as body responses [Feature #855]
+  * released as a RubyGem [Feature #13173]
+  * avoid unintended behavior from Kernel#open [Misc #14216]
+
+* Zlib
+
+  * Zlib::GzipWriter#write accepts multiple arguments
+
+=== Compatibility issues (excluding feature bug fixes)
+
+* Socket
+
+  * BasicSocket#read_nonblock and BasicSocket#write_nonblock no
+    longer set the O_NONBLOCK file description flag as side effect
+    (on Linux only) [Feature #13362]
+
+* Random
+
+  * Random.raw_seed renamed to become Random.urandom.  It is now
+    applicable to non-seeding purposes due to [Bug #9569].
+
+* Socket
+
+  * Socket::Ifaddr#vhid is added [Feature #13803]
+
+* ConditionVariable, Queue and SizedQueue reimplemented for speed.
+  They no longer subclass Struct. [Feature #13552]
+
+=== Stdlib compatibility issues (excluding feature bug fixes)
+
+* Gemification
+
+  * Promote following standard libraries to default gems.
+    * cmath
+    * csv
+    * date
+    * dbm
+    * etc
+    * fcntl
+    * fiddle
+    * fileutils
+    * gdbm
+    * ipaddr
+    * scanf
+    * sdbm
+    * stringio
+    * strscan
+    * webrick
+    * zlib
+
+* Logger
+
+  * Logger.new("| command") had been working to open a command
+    unintentionally. It was prohibited, and now Logger#initialize
+    treats a String argument only as a filename, as its specification. [Bug #14212]
+
+* Net::HTTP
+
+  * Net::HTTP#start now passes :ENV to p_addr by default. [Bug #13351]
+    To avoid this, pass nil explicitly.
+
+* mathn.rb
+
+  * Removed from stdlib. [Feature #10169]
+
+* Rubygems
+
+  * Removed "ubygems.rb" file from stdlib. It's needless since Ruby 1.9.
+
+=== Supported platform changes
+
+* Drop support of NaCl platform
+
+  * https://bugs.chromium.org/p/chromium/issues/detail?id=239656#c160
+
+=== Implementation improvements
+
+* (This might not be a "user visible feature change" but) Hash class's
+  hash function is now SipHash13. [Feature #13017]
+
+* SecureRandom now prefers OS-provided sources than OpenSSL. [Bug #9569]
+
+* Mutex rewritten to be smaller and faster [Feature #13517]
+
+* Performance of block passing using block parameters is improved by
+  lazy Proc allocation [Feature #14045]
+
+* Dynamic instrumentation for TracePoint hooks instead of using "trace"
+  instruction to avoid overhead [Feature #14104]
+
+* ERB now generates code from a template twice as fast as Ruby 2.4
+
+=== Miscellaneous changes
+
+* Print backtrace and error message in reverse order if $stderr is unchanged
+  and a tty. [Feature #8661] [experimental]
+
+* Print error message in bold/underlined text if $stderr is unchanged and a
+  tty. [Feature #14140] [experimental]
+
+* configure option --with-ext now mandates its arguments.  So for
+  instance if you run ./configure --with-ext=openssl,+ then the
+  openssl library is guaranteed compiled, otherwise the build fails
+  abnormally.
+
+  Note however to always add the ",+" at the end of the argument.
+  Otherwise nothing but openssl are built.  [Feature #13302]
diff --git a/doc/NEWS-2.6.0 b/doc/NEWS-2.6.0
new file mode 100644
index 0000000000..6e70696de2
--- /dev/null
+++ b/doc/NEWS-2.6.0
@@ -0,0 +1,662 @@
+# -*- rdoc -*-
+
+= NEWS for Ruby 2.6.0
+
+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 or Redmine
+(e.g. <tt>https://bugs.ruby-lang.org/issues/$FEATURE_OR_BUG_NUMBER</tt>)
+
+== Changes since the 2.5.0 release
+
+=== Language changes
+
+* <code>$SAFE</code> now is a process global state and can be set to 0 again. [Feature #14250]
+
+* Refinements take place at block passing.  [Feature #14223]
+
+* Refinements take place at Kernel#public_send.  [Feature #15326]
+
+* Refinements take place at Kernel#respond_to?.  [Feature #15327]
+
+* +else+ without +rescue+ now causes a syntax error.  [EXPERIMENTAL] [Feature #14606]
+
+* Constant names may start with a non-ASCII capital letter. [Feature #13770]
+
+* Endless ranges are introduced.  You can use a Range that has no end,
+  like <code>(0..)</code> (or similarly <code>(0...)</code>).  [Feature #12912]
+
+  The following shows typical use cases:
+
+    ary[1..]                              # identical to ary[1..-1]
+    (1...).each {|index| block }          # infinite loop from index 1
+    ary.zip(1..) {|elem, index| block }   # ary.each.with_index(1) { }
+
+* Non-Symbol keys in a keyword arguments hash cause an exception.
+
+* The "shadowing outer local variable" warning is removed.  [Feature #12490]
+
+  You can now write the following without warning:
+
+    user = users.find {|user| cond(user) }
+
+* Print +cause+ of the exception if the exception is not caught and printed
+  its backtraces and error message. [Feature #8257]
+
+* The flip-flop syntax is deprecated. [Feature #5400]
+
+=== Core classes updates (outstanding ones only)
+
+[Array]
+
+  [New methods]
+
+    * Added Array#union and Array#difference instance methods.  [Feature #14097]
+
+  [Modified method]
+
+    * Array#to_h now accepts a block that maps elements to new key/value pairs.  [Feature #15143]
+
+  [Aliased methods]
+
+    * Array#filter is a new alias for Array#select. [Feature #13784]
+    * Array#filter! is a new alias for Array#select!. [Feature #13784]
+
+[Binding]
+
+  [New method]
+
+    * Added Binding#source_location.  [Feature #14230]
+
+      This method returns the source location of the binding, a 2-element
+      array of <code>__FILE__</code> and <code>__LINE__</code>.
+      Traditionally, the same information could be retrieved by
+      <code>eval("[__FILE__, __LINE__]", binding)</code>, but we are
+      planning to change this behavior so that Kernel#eval ignores
+      binding's source location [Bug #4352].  So, users should use this
+      newly-introduced method instead of Kernel#eval.
+
+[Dir]
+
+  [New methods]
+
+    * Added Dir#each_child and Dir#children instance methods. [Feature #13969]
+
+[Enumerable]
+
+  [New method]
+
+    * Enumerable#chain returns an enumerator object that iterates over the
+      elements of the receiver and then those of each argument
+      in sequence.  [Feature #15144]
+
+  [Modified method]
+
+    * Enumerable#to_h now accepts a block that maps elements to new key/value pairs.  [Feature #15143]
+
+  [Aliased method]
+
+    * Enumerable#filter is a new alias for Enumerable#select. [Feature #13784]
+
+[Enumerator::ArithmeticSequence]
+
+  * This is a new class to represent a generator of an arithmetic sequence,
+    that is a number sequence defined by a common difference. It can be used
+    for representing what is similar to Python's slice. You can get an
+    instance of this class from Numeric#step and Range#step.
+
+[Enumerator::Chain]
+
+  * This is a new class to represent a chain of enumerables that works as a
+    single enumerator, generated by such methods as Enumerable#chain and
+    Enumerator#+.
+
+[Enumerator::Lazy]
+
+  [Aliased method]
+
+    * Enumerator::Lazy#filter is a new alias for
+      Enumerator::Lazy#select.  [Feature #13784]
+
+[Enumerator]
+
+  [New methods]
+
+    * Enumerator#+ returns an enumerator object that iterates over the
+      elements of the receiver and then those of the other operand.  [Feature #15144]
+
+[ENV]
+
+  [Modified method]
+
+    * ENV.to_h now accepts a block that maps names and values to new keys and values.  [Feature #15143]
+
+[Exception]
+
+  [New options]
+
+    * Exception#full_message takes +:highlight+ and +:order+
+      options. [Bug #14324]
+
+[Hash]
+
+  [Modified methods]
+
+    * Hash#merge, Hash#merge!, and Hash#update now accept multiple
+      arguments.  [Feature #15111]
+
+    * Hash#to_h now accepts a block that maps keys and values to new keys and values.  [Feature #15143]
+
+  [Aliased methods]
+
+    * Hash#filter is a new alias for Hash#select.  [Feature #13784]
+
+    * Hash#filter! is a new alias for Hash#select!. [Feature #13784]
+
+[IO]
+
+  [New option]
+
+    * Added new mode character <code>'x'</code> to open files for exclusive
+      access. [Feature #11258]
+
+[Kernel]
+
+  [Aliased method]
+
+    * Kernel#then is a new alias for Kernel#yield_self. [Feature #14594]
+
+  [New options]
+
+    * Kernel#Complex, Kernel#Float, Kernel#Integer, and
+      Kernel#Rational take an +:exception+ option to specify the way of
+      error handling.  [Feature #12732]
+
+    * Kernel#system takes an +:exception+ option to raise an exception
+      on failure.  [Feature #14386]
+
+  [Incompatible changes]
+
+    * Kernel#system and Kernel#exec do not close non-standard file descriptors
+      (the default of the +:close_others+ option is changed to +false+,
+      but we still set the +FD_CLOEXEC+ flag on descriptors we
+      create).  [Misc #14907]
+
+[KeyError]
+
+  [New options]
+
+    * KeyError.new accepts +:receiver+ and +:key+ options to set receiver and
+      key in Ruby code.  [Feature #14313]
+
+[Method]
+
+  [New methods]
+
+    * Added Method#<< and Method#>> for Proc composition.  [Feature #6284]
+
+[Module]
+
+  [Modified methods]
+
+    * Module#method_defined?, Module#private_method_defined?, and
+      Module#protected_method_defined? now accept the second
+      parameter as optional. If it is +true+ (the default value), it checks
+      ancestor modules/classes, or checks only the class itself. [Feature #14944]
+
+[NameError]
+
+  [New option]
+
+    * NameError.new accepts a +:receiver+ option to set receiver in Ruby
+      code.  [Feature #14313]
+
+[NilClass]
+
+  [New method]
+
+    * NilClass#=~ is added for compatibility.  [Feature #15231]
+
+[NoMethodError]
+
+  [New option]
+
+    * NoMethodError.new accepts a +:receiver+ option to set receiver in Ruby
+      code.  [Feature #14313]
+
+[Numeric]
+
+  [Incompatible changes]
+
+    * Numeric#step now returns an instance of the Enumerator::ArithmeticSequence
+      class rather than one of the Enumerator class.
+
+[OpenStruct]
+
+  [Modified method]
+
+    * OpenStruct#to_h now accepts a block that maps keys and values to new keys and values.  [Feature #15143]
+
+[Proc]
+
+  [New methods]
+
+    * Added Proc#<< and Proc#>> for Proc composition.  [Feature #6284]
+
+  [Incompatible changes]
+
+    * Proc#call doesn't change <code>$SAFE</code> any more.  [Feature #14250]
+
+[Random]
+
+  [New method]
+
+    * Added Random.bytes.  [Feature #4938]
+
+[Range]
+
+  [New method]
+
+    * Added Range#% instance method.  [Feature #14697]
+
+  [Incompatible changes]
+
+    * Range#=== now uses the +#cover?+ instead of the +#include?+ method. [Feature #14575]
+    * Range#cover? now accepts a Range object. [Feature #14473]
+    * Range#step now returns an instance of the Enumerator::ArithmeticSequence
+      class rather than one of the Enumerator class.
+
+[Regexp/String]
+
+    * Update Unicode version from 10.0.0 to 11.0.0. [Feature #14802]
+
+      This includes a rewrite of the grapheme cluster (/\X/) algorithm
+      and special-casing for Georgian MTAVRULI on String#downcase.
+
+    * Update Emoji version from 5.0 to 11.0.0 [Feature #14802]
+
+[RubyVM::AbstractSyntaxTree]
+
+  [New methods]
+
+    * RubyVM::AbstractSyntaxTree.parse parses a given string and returns AST
+      nodes. [experimental]
+
+    * RubyVM::AbstractSyntaxTree.parse_file parses a given file and returns AST
+      nodes.  [experimental]
+
+    * RubyVM::AbstractSyntaxTree.of returns AST nodes of the given proc or
+      method.  [experimental]
+
+[RubyVM]
+
+  [New method]
+
+    * RubyVM.resolve_feature_path identifies the file that will be loaded by
+      "require(feature)". [experimental] [Feature #15230]
+
+[String]
+
+  * String#crypt is now deprecated. [Feature #14915]
+
+  [New features]
+
+    * String#split yields each substring to the block if given. [Feature #4780]
+
+[Struct]
+
+  [Modified method]
+
+    * Struct#to_h now accepts a block that maps keys and values to new keys and values.  [Feature #15143]
+
+  [Aliased method]
+
+    * Struct#filter is a new alias for Struct#select. [Feature #13784]
+
+[Time]
+
+  [New features]
+
+    * Time.new and Time#getlocal accept a timezone object as well as
+      a UTC offset string. Time#+, Time#-, and Time#succ also preserve
+      the timezone.  [Feature #14850]
+
+[TracePoint]
+
+  [New features]
+
+    * "script_compiled" event is supported. [Feature #15287]
+
+  [New methods]
+
+    * TracePoint#parameters [Feature #14694]
+
+    * TracePoint#instruction_sequence [Feature #15287]
+
+    * TracePoint#eval_script [Feature #15287]
+
+  [Modified method]
+
+    * TracePoint#enable accepts new keywords "target:" and
+      "target_line:".  [Feature #15289]
+
+=== Stdlib updates (outstanding ones only)
+
+[BigDecimal]
+
+  Update to version 1.4.0.  This version includes several compatibility
+  issues, see Compatibility issues section below for details.
+
+  [Modified method]
+
+    * BigDecimal() accepts the new keyword "exception:" similar to Float().
+
+  [Note for the differences among recent versions]
+
+    You should want to know the differences among recent versions of bigdecimal.
+    Please select the suitable version of bigdecimal according to the following
+    information.
+
+    * 1.3.5 has BigDecimal.new without "exception:" keyword.  You can see the
+      deprecation warning of BigDecimal.new when you specify "-w" option.
+      BigDecimal(), BigDecimal.new, and Object#to_d methods are the same.
+
+    * 1.4.0 has BigDecimal.new with "exception:" keyword.  You always see the
+      deprecation warning of BigDecimal.new.  Object#to_d method is different
+      from BigDecimal() and BigDecimal.new.
+
+    * 2.0.0 will be released soon after releasing Ruby 2.6.0.  This version
+      will not have the BigDecimal.new method.
+
+[Bundler]
+
+  * Add Bundler to Standard Library. [Feature #12733]
+
+  * Use 1.17.2, the latest stable version.
+
+[Coverage]
+
+  A oneshot_lines mode is added.  [Feature #15022]
+
+  This mode checks "whether each line was executed at least once or not",
+  instead of "how many times each line was executed".
+  A hook for each line is fired at most once, and after it is fired
+  the hook flag is removed, i.e., it runs with zero overhead.
+
+  [New options]
+
+    * Add +:oneshot_lines+ keyword argument to Coverage.start.
+
+    * Add +:stop+ and +:clear+ keyword arguments to Coverage.result.
+      If +clear+ is true, it clears the counters to zero.
+      If +stop+ is true, it disables coverage measurement.
+
+  [New methods]
+
+    * Coverage.line_stub, which is a simple helper function that
+      creates the "stub" of line coverage from a given source code.
+
+[CSV]
+
+  * Upgrade to 3.0.2. This includes performance improvements especially
+    for writing. Writing is about 2 times faster.
+    See https://github.com/ruby/csv/blob/master/NEWS.md.
+
+[ERB]
+
+  [New options]
+
+    * Add +:trim_mode+ and +:eoutvar+ keyword arguments to ERB.new.
+      Now non-keyword arguments other than the first one are softly deprecated
+      and will be removed when Ruby 2.5 becomes EOL. [Feature #14256]
+
+    * erb command's <tt>-S</tt> option is deprecated, and will be removed
+      in the next version.
+
+[FileUtils]
+
+  [New methods]
+
+    * FileUtils#cp_lr.  [Feature #4189]
+
+[Matrix]
+
+  [New methods]
+
+    * Matrix#antisymmetric?, Matrix#skew_symmetric?
+
+    * Matrix#map!, Matrix#collect! [Feature #14151]
+
+    * Matrix#[]=
+
+    * Vector#map!, Vector#collect!
+
+    * Vector#[]=
+
+[Net]
+
+  [New options]
+
+    * Add +:write_timeout+ keyword argument to Net::HTTP.new. [Feature #13396]
+
+  [New methods]
+
+    * Add Net::HTTP#write_timeout and Net::HTTP#write_timeout=.  [Feature #13396]
+
+  [New constant]
+
+    * Add Net::HTTPClientException to deprecate Net::HTTPServerException,
+      whose name is misleading.  [Bug #14688]
+
+[NKF]
+
+  * Upgrade to nkf v2.1.5
+
+[Psych]
+
+  * Upgrade to Psych 3.1.0
+
+[RDoc]
+
+  * Become about 2 times faster.
+
+  * Use SOURCE_DATE_EPOCH to generate files.
+
+  * Fix method line number that slipped off.
+
+  * Enable <code>--width</code>, <code>--exclude</code>,
+    and <code>--line-numbers</code> that were ignored.
+
+  * Add support for blockquote by ">>>" in default markup notation.
+
+  * Add support for "Raises" lines in TomDoc notation.
+
+  * Fix syntax error output.
+
+  * Fix many parsing bugs.
+
+[REXML]
+
+  * Upgrade to REXML 3.1.9.
+    See https://github.com/ruby/rexml/blob/master/NEWS.md.
+
+  [Improved some XPath implementations]
+
+    * <code>concat()</code> function: Stringify all arguments before concatenating.
+
+    * <code>string()</code> function: Support context node.
+
+    * <code>string()</code> function: Support processing instruction node.
+
+    * Support <code>"*:#{ELEMENT_NAME}"</code> syntax in XPath 2.0.
+
+  [Fixed some XPath implementations]
+
+    * <code>"//#{ELEMENT_NAME}[#{POSITION}]"</code> case
+
+    * <code>string()</code> function: Fix <code>function(document)</code>
+      returns nodes that are out of root elements.
+
+    * <code>"/ #{ELEMENT_NAME} "</code> case
+
+    * <code>"/ #{ELEMENT_NAME} [ #{PREDICATE} ]"</code> case
+
+    * <code>"/ #{AXIS}::#{ELEMENT_NAME}"</code> case
+
+    * <code>"#{N}-#{M}"</code> case: One or more white spaces were required
+      before <code>"-"</code>
+
+    * <code>"/child::node()"</code> case
+
+    * <code>"#{FUNCTION}()/#{PATH}"</code> case
+
+    * <code>"@#{ATTRIBUTE}/parent::"</code> case
+
+    * <code>"name(#{NODE_SET})"</code> case
+
+[RSS]
+
+  [New options]
+
+    * RSS::Parser.parse now accepts options as Hash. +:validate+ ,
+      +:ignore_unknown_element+ , +:parser_class+ options are available.
+
+[RubyGems]
+
+  * Upgrade to RubyGems 3.0.1
+
+  * https://blog.rubygems.org/2018/12/19/3.0.0-released.html
+
+  * https://blog.rubygems.org/2018/12/23/3.0.1-released.html
+
+[Set]
+
+  [Aliased method]
+
+    * Set#filter! is a new alias for Set#select!.  [Feature #13784]
+
+[URI]
+
+  [New constant]
+
+    * Add URI::File to handle the file URI scheme.  [Feature #14035]
+
+=== Compatibility issues (excluding feature bug fixes)
+
+[Dir]
+
+  * Dir.glob with <code>'\0'</code>-separated pattern list will be deprecated,
+    and is now warned.  [Feature #14643]
+
+[File]
+
+  * File.read, File.binread, File.write, File.binwrite, File.foreach, and
+    File.readlines do not invoke external commands even if the path starts
+    with the pipe character <code>'|'</code>. [Feature #14245]
+
+[Object]
+
+  * Object#=~ is deprecated.  [Feature #15231]
+
+=== Stdlib compatibility issues (excluding feature bug fixes)
+
+* These standard libraries have been promoted to default gems.
+
+  * e2mmap
+  * forwardable
+  * irb
+  * logger
+  * matrix
+  * mutex_m
+  * ostruct
+  * prime
+  * rexml
+  * rss
+  * shell
+  * sync
+  * thwait
+  * tracer
+
+[BigDecimal]
+
+  * The following methods are removed.
+
+    * BigDecimal.allocate
+    * BigDecimal.ver
+
+  * Every BigDecimal object is frozen. [Feature #13984]
+
+  * BigDecimal() parses the given string similar to Float().
+
+  * String#to_d parses the receiver string similar to String#to_f.
+
+  * BigDecimal.new will be removed in version 2.0.
+
+[Pathname]
+
+  * Pathname#read, Pathname#binread, Pathname#write, Pathname#binwrite,
+    Pathname#each_line and Pathname#readlines do not invoke external
+    commands even if the path starts with the pipe character <code>'|'</code>.
+    This follows [Feature #14245].
+
+=== Implementation improvements
+
+* Speedup Proc#call because we don't need to care about <code>$SAFE</code>
+  any more. [Feature #14318]
+
+  With +lc_fizzbuzz+ benchmark which uses Proc#call many times we can
+  measure x1.4 improvements.  [Bug #10212]
+
+* Speedup block.call where +block+ is passed block parameter. [Feature #14330]
+
+  Ruby 2.5 improves block passing performance. [Feature #14045]
+
+  Additionally, Ruby 2.6 improves the performance of passed block calling.
+
+* Introduce an initial implementation of a JIT (Just-in-time) compiler. [Feature #14235] [experimental]
+
+  * <tt>--jit</tt> command line option is added to enable JIT. <tt>--jit-verbose=1</tt>
+    is good for inspection.  See <tt>ruby --help</tt> for others.
+  * To generate machine code, this JIT compiler uses the C compiler used for building
+    the interpreter. Currently GCC, Clang, and Microsoft Visual C++ are supported for it.
+  * <tt>--disable-mjit-support</tt> option is added to configure. This is added for JIT debugging,
+    but if you get an error on building a header file for JIT, you can use this option to skip
+    building it as a workaround.
+  * rb_waitpid reimplemented on Unix-like platforms to maintain
+    compatibility with processes created for JIT [Bug #14867]
+
+* VM generator script renewal; makes the generated VM more optimized. [GH-1779]
+
+* Thread cache enabled for pthreads platforms (for Thread.new and
+  Thread.start).  [Feature #14757]
+
+* timer thread is eliminated for platforms with POSIX timers. [Misc #14937]
+
+* Transient Heap (theap) is supported. [Bug #14858] [Feature #14989]
+
+  theap is a managed heap for short-living memory objects. For example,
+  making a small and short-living Hash object is x2 faster. With rdoc benchmark,
+  we measured 6-7% performance improvement.
+
+* Native implementations (arm32, arm64, ppc64le, win32, win64, x86, amd64) of
+  coroutines to improve performance of Fiber significantly. [Feature #14739]
+
+=== Miscellaneous changes
+
+* On macOS, shared libraries no longer include a full version number of Ruby
+  in their names.  This eliminates the burden of each teeny upgrade on the
+  platform that users need to rebuild every extension library.
+
+  [Before]
+    * libruby.2.6.0.dylib
+    * libruby.2.6.dylib -> libruby.2.6.0.dylib
+    * libruby.dylib -> libruby.2.6.0.dylib
+
+  [After]
+    * libruby.2.6.dylib
+    * libruby.dylib -> libruby.2.6.dylib
+
+* Extracted misc/*.el files to https://github.com/ruby/elisp
diff --git a/doc/NEWS-2.7.0 b/doc/NEWS-2.7.0
new file mode 100644
index 0000000000..3e6b98c1fd
--- /dev/null
+++ b/doc/NEWS-2.7.0
@@ -0,0 +1,826 @@
+# -*- rdoc -*-
+
+= NEWS for Ruby 2.7.0
+
+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 or Redmine
+(e.g. <tt>https://bugs.ruby-lang.org/issues/$FEATURE_OR_BUG_NUMBER</tt>).
+
+== Changes since the 2.6.0 release
+
+=== Language changes
+
+==== Pattern matching
+
+* Pattern matching is introduced as an experimental feature. [Feature #14912]
+
+    case [0, [1, 2, 3]]
+    in [a, [b, *c]]
+      p a #=> 0
+      p b #=> 1
+      p c #=> [2, 3]
+    end
+
+    case {a: 0, b: 1}
+    in {a: 0, x: 1}
+      :unreachable
+    in {a: 0, b: var}
+      p var #=> 1
+    end
+
+    case -1
+    in 0 then :unreachable
+    in 1 then :unreachable
+    end #=> NoMatchingPatternError
+
+    json = <<END
+    {
+      "name": "Alice",
+      "age": 30,
+      "children": [{ "name": "Bob", "age": 2 }]
+    }
+    END
+
+    JSON.parse(json, symbolize_names: true) in {name: "Alice", children: [{name: name, age: age}]}
+
+    p name #=> "Bob"
+    p age  #=> 2
+
+    JSON.parse(json, symbolize_names: true) in {name: "Alice", children: [{name: "Charlie", age: age}]}
+    #=> NoMatchingPatternError
+
+* See the following slides for more details:
+  * https://speakerdeck.com/k_tsj/pattern-matching-new-feature-in-ruby-2-dot-7
+  * Note that the slides are slightly obsolete.
+
+* The warning against pattern matching can be suppressed with
+  {-W:no-experimental option}[#label-Warning+option].
+
+==== The spec of keyword arguments is changed towards 3.0
+
+* Automatic conversion of keyword arguments and positional arguments is
+  deprecated, and conversion will be removed in Ruby 3.  [Feature #14183]
+
+  * When a method call passes a Hash at the last argument, and when it
+    passes no keywords, and when the called method accepts keywords,
+    a warning is emitted.  To continue treating the hash as keywords,
+    add a double splat operator to avoid the warning and ensure
+    correct behavior in Ruby 3.
+
+      def foo(key: 42); end; foo({key: 42})   # warned
+      def foo(**kw);    end; foo({key: 42})   # warned
+      def foo(key: 42); end; foo(**{key: 42}) # OK
+      def foo(**kw);    end; foo(**{key: 42}) # OK
+
+  * When a method call passes keywords to a method that accepts keywords,
+    but it does not pass enough required positional arguments, the
+    keywords are treated as a final required positional argument, and a
+    warning is emitted.  Pass the argument as a hash instead of keywords
+    to avoid the warning and ensure correct behavior in Ruby 3.
+
+      def foo(h, **kw); end; foo(key: 42)      # warned
+      def foo(h, key: 42); end; foo(key: 42)   # warned
+      def foo(h, **kw); end; foo({key: 42})    # OK
+      def foo(h, key: 42); end; foo({key: 42}) # OK
+
+  * When a method accepts specific keywords but not a keyword splat, and
+    a hash or keywords splat is passed to the method that includes both
+    Symbol and non-Symbol keys, the hash will continue to be split, and
+    a warning will be emitted.  You will need to update the calling code
+    to pass separate hashes to ensure correct behavior in Ruby 3.
+
+      def foo(h={}, key: 42); end; foo("key" => 43, key: 42)   # warned
+      def foo(h={}, key: 42); end; foo({"key" => 43, key: 42}) # warned
+      def foo(h={}, key: 42); end; foo({"key" => 43}, key: 42) # OK
+
+  * If a method does not accept keywords, and is called with keywords,
+    the keywords are still treated as a positional hash, with no warning.
+    This behavior will continue to work in Ruby 3.
+
+      def foo(opt={});  end; foo( key: 42 )   # OK
+
+* Non-symbols are allowed as keyword argument keys if the method accepts
+  arbitrary keywords. [Feature #14183]
+
+  * Non-Symbol keys in a keyword arguments hash were prohibited in 2.6.0,
+    but are now allowed again.  [Bug #15658]
+
+      def foo(**kw); p kw; end; foo("str" => 1) #=> {"str"=>1}
+
+* <code>**nil</code> is allowed in method definitions to explicitly mark
+  that the method accepts no keywords. Calling such a method with keywords
+  will result in an ArgumentError. [Feature #14183]
+
+    def foo(h, **nil); end; foo(key: 1)       # ArgumentError
+    def foo(h, **nil); end; foo(**{key: 1})   # ArgumentError
+    def foo(h, **nil); end; foo("str" => 1)   # ArgumentError
+    def foo(h, **nil); end; foo({key: 1})     # OK
+    def foo(h, **nil); end; foo({"str" => 1}) # OK
+
+* Passing an empty keyword splat to a method that does not accept keywords
+  no longer passes an empty hash, unless the empty hash is necessary for
+  a required parameter, in which case a warning will be emitted.  Remove
+  the double splat to continue passing a positional hash.  [Feature #14183]
+
+    h = {}; def foo(*a) a end; foo(**h) # []
+    h = {}; def foo(a) a end; foo(**h)  # {} and warning
+    h = {}; def foo(*a) a end; foo(h)   # [{}]
+    h = {}; def foo(a) a end; foo(h)    # {}
+
+* Above warnings can be suppressed also with {-W:no-deprecated option}[#label-Warning+option].
+
+==== Numbered parameters
+
+* Numbered parameters as default block parameters are introduced. [Feature #4475]
+
+    [1, 2, 10].map { _1.to_s(16) }    #=> ["1", "2", "a"]
+    [[1, 2], [3, 4]].map { _1 + _2 }  #=> [3, 7]
+
+  You can still define a local variable named +_1+ and so on,
+  and that is honored when present, but renders a warning.
+
+    _1 = 0            #=> warning: `_1' is reserved for numbered parameter; consider another name
+    [1].each { p _1 } # prints 0 instead of 1
+
+==== proc/lambda without block is deprecated
+
+* Proc.new and Kernel#proc with no block in a method called with a block will
+  now display a warning.
+
+    def foo
+      proc
+    end
+    foo { puts "Hello" } #=> warning: Capturing the given block using Kernel#proc is deprecated; use `&block` instead
+
+  This warning can be suppressed with {-W:no-deprecated option}[#label-Warning+option].
+
+* Kernel#lambda with no block in a method called with a block raises an exception.
+
+    def bar
+      lambda
+    end
+    bar { puts "Hello" } #=> tried to create Proc object without a block (ArgumentError)
+
+==== Other miscellaneous changes
+
+* A beginless range is experimentally introduced.  It might be useful
+  in +case+, new call-sequence of the <code>Comparable#clamp</code>,
+  constants and DSLs.  [Feature #14799]
+
+     ary[..3]  # identical to ary[0..3]
+
+     case RUBY_VERSION
+     when ..."2.4" then puts "EOL"
+     # ...
+     end
+
+     age.clamp(..100)
+
+     where(sales: ..100)
+
+* Setting <code>$;</code> to a non-nil value will now display a warning. [Feature #14240]
+  This includes the usage in String#split.
+  This warning can be suppressed with {-W:no-deprecated option}[#label-Warning+option].
+
+* Setting <code>$,</code> to a non-nil value will now display a warning. [Feature #14240]
+  This includes the usage in Array#join.
+  This warning can be suppressed with {-W:no-deprecated option}[#label-Warning+option].
+
+* Quoted here-document identifiers must end within the same line.
+
+     <<"EOS
+     " # This had been warned since 2.4; Now it raises a SyntaxError
+     EOS
+
+* The flip-flop syntax deprecation is reverted. [Feature #5400]
+
+* Comment lines can be placed between fluent dot now.
+
+    foo
+      # .bar
+      .baz # => foo.baz
+
+* Calling a private method with a literal +self+ as the receiver
+  is now allowed. [Feature #11297] [Feature #16123]
+
+* Modifier rescue now operates the same for multiple assignment as single
+  assignment. [Bug #8279]
+
+    a, b = raise rescue [1, 2]
+    # Previously parsed as: (a, b = raise) rescue [1, 2]
+    # Now parsed as:         a, b = (raise rescue [1, 2])
+
+* +yield+ in singleton class syntax will now display a warning. This behavior
+  will soon be deprecated. [Feature #15575].
+
+   def foo
+     class << Object.new
+       yield #=> warning: `yield' in class syntax will not be supported from Ruby 3.0. [Feature #15575]
+     end
+   end
+   foo { p :ok }
+
+  This warning can be suppressed with {-W:no-deprecated option}[#label-Warning+option].
+
+* Argument forwarding by <code>(...)</code> is introduced. [Feature #16253]
+
+    def foo(...)
+      bar(...)
+    end
+
+  All arguments to +foo+ are forwarded to +bar+, including keyword and
+  block arguments.
+  Note that the parentheses are mandatory.  <code>bar ...</code> is parsed
+  as an endless range.
+
+* Access and setting of <code>$SAFE</code> will now always display a warning.
+  <code>$SAFE</code> will become a normal global variable in Ruby 3.0.  [Feature #16131]
+
+* <code>Object#{taint,untaint,trust,untrust}</code> and related functions in the C-API
+  no longer have an effect (all objects are always considered untainted), and will now
+  display a warning in verbose mode. This warning will be disabled even in non-verbose mode in
+  Ruby 3.0, and the methods and C functions will be removed in Ruby 3.2. [Feature #16131]
+
+* Refinements take place at Object#method and Module#instance_method. [Feature #15373]
+
+=== Command line options
+
+==== Warning option
+
+The +-W+ option has been extended with a following +:+, to manage categorized
+warnings.  [Feature #16345] [Feature #16420]
+
+* To suppress deprecation warnings:
+
+    $ ruby -e '$; = ""'
+    -e:1: warning: `$;' is deprecated
+
+    $ ruby -W:no-deprecated -e '$; = //'
+
+* It works with the +RUBYOPT+ environment variable:
+
+    $ RUBYOPT=-W:no-deprecated ruby -e '$; = //'
+
+* To suppress experimental feature warnings:
+
+    $ ruby -e '0 in a'
+    -e:1: warning: Pattern matching is experimental, and the behavior may change in future versions of Ruby!
+
+    $ ruby -W:no-experimental -e '0 in a'
+
+* To suppress both by using +RUBYOPT+, set space separated values:
+
+    $ RUBYOPT='-W:no-deprecated -W:no-experimental' ruby -e '($; = "") in a'
+
+See also Warning in {Core classes updates}[#label-Core+classes+updates+-28outstanding+ones+only-29].
+
+=== Core classes updates (outstanding ones only)
+
+[Array]
+
+  [New methods]
+
+    * Added Array#intersection. [Feature #16155]
+
+    * Added Array#minmax, with a faster implementation than Enumerable#minmax. [Bug #15929]
+
+[Comparable]
+
+  [Modified method]
+
+    * Comparable#clamp now accepts a Range argument. [Feature #14784]
+
+        -1.clamp(0..2) #=> 0
+         1.clamp(0..2) #=> 1
+         3.clamp(0..2) #=> 2
+        # With beginless and endless ranges:
+        -1.clamp(0..)  #=> 0
+         3.clamp(..2)  #=> 2
+
+
+[Complex]
+
+  [New method]
+
+    * Added Complex#<=>.
+      So <code>0 <=> 0i</code> will not raise NoMethodError. [Bug #15857]
+
+[Dir]
+
+  [Modified methods]
+
+    * Dir.glob and Dir.[] no longer allow NUL-separated glob pattern.
+      Use Array instead.  [Feature #14643]
+
+[Encoding]
+
+  [New encoding]
+
+    * Added new encoding CESU-8. [Feature #15931]
+
+[Enumerable]
+
+  [New methods]
+
+    * Added Enumerable#filter_map.  [Feature #15323]
+
+        [1, 2, 3].filter_map {|x| x.odd? ? x.to_s : nil } #=> ["1", "3"]
+
+    * Added Enumerable#tally.  [Feature #11076]
+
+        ["A", "B", "C", "B", "A"].tally #=> {"A"=>2, "B"=>2, "C"=>1}
+
+[Enumerator]
+
+  [New methods]
+
+    * Added Enumerator.produce to generate an Enumerator from any custom
+      data transformation.  [Feature #14781]
+
+        require "date"
+        dates = Enumerator.produce(Date.today, &:succ) #=> infinite sequence of dates
+        dates.detect(&:tuesday?) #=> next Tuesday
+
+    * Added Enumerator::Lazy#eager that generates a non-lazy enumerator
+      from a lazy enumerator.  [Feature #15901]
+
+        a = %w(foo bar baz)
+        e = a.lazy.map {|x| x.upcase }.map {|x| x + "!" }.eager
+        p e.class               #=> Enumerator
+        p e.map {|x| x + "?" }  #=> ["FOO!?", "BAR!?", "BAZ!?"]
+
+    * Added Enumerator::Yielder#to_proc so that a Yielder object
+      can be directly passed to another method as a block
+      argument.  [Feature #15618]
+
+[Fiber]
+
+  [New method]
+
+    * Added Fiber#raise that behaves like Fiber#resume but raises an
+      exception on the resumed fiber.  [Feature #10344]
+
+[File]
+
+  [Modified method]
+
+    * File.extname now returns a dot string for names ending with a dot on
+      non-Windows platforms.  [Bug #15267]
+
+          File.extname("foo.") #=> "."
+
+[FrozenError]
+
+  [New method]
+
+    * Added FrozenError#receiver to return the frozen object on which
+      modification was attempted.  To set this object when raising
+      FrozenError in Ruby code, FrozenError.new accepts a +:receiver+
+      option.  [Feature #15751]
+
+[GC]
+
+  [New method]
+
+    * Added GC.compact method for compacting the heap.
+      This function compacts live objects in the heap so that fewer pages may
+      be used, and the heap may be more CoW (copy-on-write) friendly. [Feature #15626]
+
+      Details on the algorithm and caveats can be found here:
+      https://bugs.ruby-lang.org/issues/15626
+
+[IO]
+
+  [New method]
+
+    * Added IO#set_encoding_by_bom to check the BOM and set the external
+      encoding.  [Bug #15210]
+
+[Integer]
+
+  [Modified method]
+
+    * Integer#[] now supports range operations.  [Feature #8842]
+
+         0b01001101[2, 4]  #=> 0b0011
+         0b01001100[2..5]  #=> 0b0011
+         0b01001100[2...6] #=> 0b0011
+         #   ^^^^
+
+[Method]
+
+  [Modified method]
+
+    * Method#inspect shows more information. [Feature #14145]
+
+[Module]
+
+  [New methods]
+
+    * Added Module#const_source_location to retrieve the location where a
+      constant is defined.  [Feature #10771]
+
+    * Added Module#ruby2_keywords for marking a method as passing keyword
+      arguments through a regular argument splat, useful when delegating
+      all arguments to another method in a way that can be backwards
+      compatible with older Ruby versions.  [Bug #16154]
+
+  [Modified methods]
+
+    * Module#autoload? now takes an +inherit+ optional argument, like
+      Module#const_defined?.  [Feature #15777]
+
+    * Module#name now always returns a frozen String. The returned String is
+      always the same for a given Module. This change is
+      experimental. [Feature #16150]
+
+[NilClass / TrueClass / FalseClass]
+
+  [Modified methods]
+
+    * NilClass#to_s, TrueClass#to_s, and FalseClass#to_s now always return a
+      frozen String. The returned String is always the same for each of these
+      values. This change is experimental. [Feature #16150]
+
+[ObjectSpace::WeakMap]
+
+  [Modified method]
+
+    * ObjectSpace::WeakMap#[]= now accepts special objects as either key or
+      values.  [Feature #16035]
+
+[Proc]
+
+  [New method]
+
+    * Added Proc#ruby2_keywords for marking the proc as passing keyword
+      arguments through a regular argument splat, useful when delegating
+      all arguments to another method or proc in a way that can be backwards
+      compatible with older Ruby versions.  [Feature #16404]
+
+[Range]
+
+  [New method]
+
+    * Added Range#minmax, with a faster implementation than Enumerable#minmax.
+      It returns a maximum that now corresponds to Range#max. [Bug #15807]
+
+  [Modified method]
+
+    * Range#=== now uses Range#cover? for String arguments, too (in Ruby 2.6, it was
+      changed from Range#include? for all types except strings). [Bug #15449]
+
+
+[RubyVM]
+
+  [Removed method]
+
+    * +RubyVM.resolve_feature_path+ moved to
+      <code>$LOAD_PATH.resolve_feature_path</code>.  [Feature #15903] [Feature #15230]
+
+[String]
+
+  [Unicode]
+
+    * Update Unicode version and Emoji version from 11.0.0 to
+      12.0.0.  [Feature #15321]
+
+    * Update Unicode version to 12.1.0, adding support for
+      U+32FF SQUARE ERA NAME REIWA.  [Feature #15195]
+
+    * Update Unicode Emoji version to 12.1. [Feature #16272]
+
+[Symbol]
+
+  [New methods]
+
+    * Added Symbol#start_with? and Symbol#end_with? methods.  [Feature #16348]
+
+[Time]
+
+  [New methods]
+
+    * Added Time#ceil method.  [Feature #15772]
+
+    * Added Time#floor method.  [Feature #15653]
+
+  [Modified method]
+
+    * Time#inspect is separated from Time#to_s and it shows
+      the time's sub second.  [Feature #15958]
+
+[UnboundMethod]
+
+  [New method]
+
+    * Added UnboundMethod#bind_call method.  [Feature #15955]
+
+      <code>umethod.bind_call(obj, ...)</code> is semantically equivalent
+      to <code>umethod.bind(obj).call(...)</code>.  This idiom is used in
+      some libraries to call a method that is overridden.  The added
+      method does the same without allocation of an intermediate Method
+      object.
+
+          class Foo
+            def add_1(x)
+              x + 1
+            end
+          end
+          class Bar < Foo
+            def add_1(x) # override
+              x + 2
+            end
+          end
+
+          obj = Bar.new
+          p obj.add_1(1) #=> 3
+          p Foo.instance_method(:add_1).bind(obj).call(1) #=> 2
+          p Foo.instance_method(:add_1).bind_call(obj, 1) #=> 2
+
+[Warning]
+
+  [New methods]
+
+    * Added Warning.[] and Warning.[]= to manage emitting/suppressing
+      some categories of warnings.  [Feature #16345] [Feature #16420]
+
+[$LOAD_PATH]
+
+  [New method]
+
+    * Added <code>$LOAD_PATH.resolve_feature_path</code>.  [Feature #15903] [Feature #15230]
+
+=== Stdlib updates (outstanding ones only)
+
+[Bundler]
+
+  * Upgrade to Bundler 2.1.2.
+    See https://github.com/bundler/bundler/releases/tag/v2.1.2
+
+[CGI]
+
+  * CGI.escapeHTML becomes 2~5x faster when there is at least one escaped character.
+    See https://github.com/ruby/ruby/pull/2226
+
+[CSV]
+
+  * Upgrade to 3.1.2.
+    See https://github.com/ruby/csv/blob/master/NEWS.md.
+
+[Date]
+
+  * Date.jisx0301, Date#jisx0301, and Date.parse support the new Japanese
+    era.  [Feature #15742]
+
+[Delegator]
+
+  * Object#DelegateClass accepts a block and module_evals it in the context
+    of the returned class, similar to Class.new and Struct.new.
+
+[ERB]
+
+  * Prohibit marshaling ERB instance.
+
+[IRB]
+
+  * Introduce syntax highlighting inspired by the Pry gem to Binding#irb
+    source lines, REPL input, and inspect output of some core-class objects.
+
+  * Introduce multiline editing mode provided by Reline.
+
+  * Show documentation when completion.
+
+  * Enable auto indent and save/load history by default.
+
+[JSON]
+
+  * Upgrade to 2.3.0.
+
+[Net::FTP]
+
+  * Add Net::FTP#features to check available features, and Net::FTP#option to
+    enable/disable each of them.  [Feature #15964]
+
+[Net::HTTP]
+
+  * Add +ipaddr+ optional parameter to Net::HTTP#start to replace the address for
+    the TCP/IP connection. [Feature #5180]
+
+[Net::IMAP]
+
+  * Add Server Name Indication (SNI) support.  [Feature #15594]
+
+[open-uri]
+
+  * Warn open-uri's "open" method at Kernel.
+    Use URI.open instead.  [Misc #15893]
+
+  * The default charset of "text/*" media type is UTF-8 instead of
+    ISO-8859-1.  [Bug #15933]
+
+[OptionParser]
+
+  * Now show "Did you mean?" for unknown options.  [Feature #16256]
+
+    test.rb:
+
+      require "optparse"
+      OptionParser.new do |opts|
+        opts.on("-f", "--foo", "foo") {|v| }
+        opts.on("-b", "--bar", "bar") {|v| }
+        opts.on("-c", "--baz", "baz") {|v| }
+      end.parse!
+
+    example:
+
+      $ ruby test.rb --baa
+      Traceback (most recent call last):
+      test.rb:7:in `<main>': invalid option: --baa (OptionParser::InvalidOption)
+      Did you mean?  baz
+                     bar
+
+[Pathname]
+
+  * Pathname.glob now delegates 3 arguments to Dir.glob
+    to accept +base+ keyword. [Feature #14405]
+
+[Racc]
+
+  * Merge 1.4.15 from upstream repository and added cli of racc.
+
+[Reline]
+
+  * New stdlib that is compatible with the readline stdlib but is
+    implemented in pure Ruby. It also provides a multiline editing mode.
+
+[REXML]
+
+  * Upgrade to 3.2.3.
+    See https://github.com/ruby/rexml/blob/master/NEWS.md.
+
+[RSS]
+
+  * Upgrade to RSS 0.2.8.
+    See https://github.com/ruby/rss/blob/master/NEWS.md.
+
+[RubyGems]
+
+  * Upgrade to RubyGems 3.1.2.
+    * https://github.com/rubygems/rubygems/releases/tag/v3.1.0
+    * https://github.com/rubygems/rubygems/releases/tag/v3.1.1
+    * https://github.com/rubygems/rubygems/releases/tag/v3.1.2
+
+[StringScanner]
+
+  * Upgrade to 1.0.3.
+    See https://github.com/ruby/strscan/blob/master/NEWS.md.
+
+=== Compatibility issues (excluding feature bug fixes)
+
+* The following libraries are no longer bundled gems.
+  Install corresponding gems to use these features.
+  * CMath (cmath gem)
+  * Scanf (scanf gem)
+  * Shell (shell gem)
+  * Synchronizer (sync gem)
+  * ThreadsWait (thwait gem)
+  * E2MM (e2mmap gem)
+
+[Proc]
+  * The Proc#to_s format was changed. [Feature #16101]
+
+[Range]
+  * Range#minmax used to iterate on the range to determine the maximum.
+    It now uses the same algorithm as Range#max. In rare cases (e.g.
+    ranges of Floats or Strings), this may yield different results. [Bug #15807]
+
+=== Stdlib compatibility issues (excluding feature bug fixes)
+
+* Promote stdlib to default gems
+  * The following default gems were published on rubygems.org
+    * benchmark
+    * cgi
+    * delegate
+    * getoptlong
+    * net-pop
+    * net-smtp
+    * open3
+    * pstore
+    * readline
+    * readline-ext
+    * singleton
+  * The following default gems were only promoted at ruby-core,
+    but not yet published on rubygems.org.
+    * monitor
+    * observer
+    * timeout
+    * tracer
+    * uri
+    * yaml
+* The <tt>did_you_mean</tt> gem has been promoted up to a default gem from a bundled gem
+
+[pathname]
+
+  * Kernel#Pathname when called with a Pathname argument now returns
+    the argument instead of creating a new Pathname. This is more
+    similar to other Kernel methods, but can break code that modifies
+    the return value and expects the argument not to be modified.
+
+[profile.rb, Profiler__]
+
+  * Removed from standard library. It was unmaintained since Ruby 2.0.0.
+
+=== C API updates
+
+* Many <code>*_kw</code> functions have been added for setting whether
+  the final argument being passed should be treated as keywords. You
+  may need to switch to these functions to avoid keyword argument
+  separation warnings, and to ensure correct behavior in Ruby 3.
+
+* The <code>:</code> character in rb_scan_args format string is now
+  treated as keyword arguments. Passing a positional hash instead of
+  keyword arguments will emit a deprecation warning.
+
+* C API declarations with +ANYARGS+ are changed not to use +ANYARGS+.
+  See https://github.com/ruby/ruby/pull/2404
+
+=== Implementation improvements
+
+[Fiber]
+
+  * Allow selecting different coroutine implementations by using
+    +--with-coroutine=+, e.g.
+
+         $ ./configure --with-coroutine=ucontext
+         $ ./configure --with-coroutine=copy
+
+  * Replace previous stack cache with fiber pool cache. The fiber pool
+    allocates many stacks in a single memory region. Stack allocation
+    becomes O(log N) and fiber creation is amortized O(1). Around 10x
+    performance improvement was measured in micro-benchmarks.
+    https://github.com/ruby/ruby/pull/2224
+
+[File]
+  * File.realpath now uses realpath(3) on many platforms, which can
+    significantly improve performance. [Feature #15797]
+
+[Hash]
+  * Change data structure of small Hash objects. [Feature #15602]
+
+[Monitor]
+  * Monitor class is written in C-extension. [Feature #16255]
+
+[Thread]
+
+  * VM stack memory allocation is now combined with native thread stack,
+    improving thread allocation performance and reducing allocation related
+    failures. Around 10x performance improvement was measured in micro-benchmarks.
+
+[JIT]
+
+  * JIT-ed code is recompiled to less-optimized code when an optimization assumption is invalidated.
+
+  * Method inlining is performed when a method is considered as pure.
+    This optimization is still experimental and many methods are NOT considered as pure yet.
+
+  * The default value of +--jit-max-cache+ is changed from 1,000 to 100.
+
+  * The default value of +--jit-min-calls+ is changed from 5 to 10,000.
+
+[RubyVM]
+
+  * Per-call-site method cache, which has been there since around 1.9, was
+    improved: cache hit rate raised from 89% to 94%.
+    See https://github.com/ruby/ruby/pull/2583
+
+[RubyVM::InstructionSequence]
+
+  * RubyVM::InstructionSequence#to_binary method generates compiled binary.
+    The binary size is reduced. [Feature #16163]
+
+=== Miscellaneous changes
+
+* Support for IA64 architecture has been removed. Hardware for testing was
+  difficult to find, native fiber code is difficult to implement, and it added
+  non-trivial complexity to the interpreter. [Feature #15894]
+
+* Require compilers to support C99. [Misc #15347]
+
+  * Details of our dialect: https://bugs.ruby-lang.org/projects/ruby-master/wiki/C99
+
+* Ruby's upstream repository is changed from Subversion to Git.
+
+  * https://git.ruby-lang.org/ruby.git
+
+  * RUBY_REVISION class is changed from Integer to String.
+
+  * RUBY_DESCRIPTION includes Git revision instead of Subversion's one.
+
+* Support built-in methods in Ruby with the <code>_\_builtin_</code> syntax. [Feature #16254]
+
+  Some methods are defined in *.rb (such as trace_point.rb).
+  For example, it is easy to define a method which accepts keyword arguments.
diff --git a/doc/bug_triaging.rdoc b/doc/bug_triaging.rdoc
new file mode 100644
index 0000000000..83fe88cabe
--- /dev/null
+++ b/doc/bug_triaging.rdoc
@@ -0,0 +1,79 @@
+= Bug Triaging Guide
+
+This guide discusses recommendations for triaging bugs in Ruby's bug tracker.
+
+== Bugs with Reproducible Examples
+
+These are the best bug reports.  First, consider whether the bug reported is
+actually an issue or if it is expected Ruby behavior.  If it is expected Ruby
+behavior, update the issue with why the behavior is expected, and set the
+status to Rejected.
+
+If the bug reported appears to be an actual bug, try reproducing the bug with
+the master branch.  If you are not able to reproduce the issue on the master
+branch, try reproducing it on the latest version for the branch the bug was
+reported on.  If you cannot reproduce the issue in either case, update
+the issue stating you cannot reproduce the issue, ask the reporter if they
+can reproduce the issue with either the master branch or a later release,
+and set the status to Feedback.
+
+If you can reproduce the example with the master branch, try to figure out
+what is causing the issue.  If you feel comfortable, try working on a
+patch for the issue, update the issue, and attach the patch.  Try to figure
+out which committer should be assigned to the issue, and set them as the
+assignee, and set the status to Assigned.
+
+If you cannot reproduce the example with the master branch, but can reproduce
+the issue on the latest version for the branch, then it is likely the bug has
+already been fixed, but it has not been backported yet.  Try to determine
+which commit fixed it, and update the issue noting that the issue has been
+fixed but not yet backported.  If the Ruby version is in the security
+maintenance phase or no longer supported, change the status to Closed. This
+change can be made without adding a note to avoid spamming the mailing list.
+
+For issues that may require backwards incompatible changes or may benefit from
+general committer attention or discussion, consider adding them as agenda
+items for the next committer meeting (https://bugs.ruby-lang.org/issues/14770).
+
+== Crash Bugs Without Reproducers
+
+Many bugs reported have little more than a crash report, often with no way to
+reproduce the issue.  These bugs are difficult to triage as they often do not
+contain enough information.
+
+For these bugs, if the Ruby version is the master branch or is the latest
+release for the branch and the branch is in normal maintenance phase, look at
+the backtrace and see if you can determine what could be causing the issue.
+If you can guess what could be causing the issue, see if you can put together
+a reproducible example (this is in general quite difficult).  If you cannot
+guess what could be causing the issue, or cannot put together a reproducible
+example yourself, please ask the reporter to provide a reproducible example,
+and change the status to Feedback.
+
+If the Ruby version is no longer current (e.g. 2.5.0 when the latest version
+on the Ruby 2.5 branch is 2.5.5), add a note to the issue asking the reporter
+to try the latest Ruby version for the branch and report back, and change the
+status to Feedback.  If the Ruby version is in the security maintenance phase
+or no longer supported, change the status to Closed. This change can be made
+without adding a note.
+
+== Crash Bugs With 3rd Party C Extensions
+
+If the crash happens inside a 3rd party C extension, try to figure out inside
+which C extension it happens, and add a note to the issue to report the
+issue to that C extension, and set the status to Third Party's Issue.
+
+== Non-Bug reports
+
+Any issues in the bug tracker that are not reports of problems should have
+the tracker changed from Bug to either Feature (new features or performance
+improvements) or Misc. This change can be made without adding a note.
+
+== Stale Issues
+
+There are many issues that are stale, with no updates in months or even years.
+For stale issues in Feedback state, where the feedback has not been received,
+you can change the status to Closed without adding a note.  For stale issues
+in Assigned state, you can reach out to the assignee and see if they can update
+the issue.  If the assignee is no longer an active committer, remove them
+as the assignee and change the status to Open.
diff --git a/doc/contributing.rdoc b/doc/contributing.rdoc
index 75d00e6f9f..d7395627ca 100644
--- a/doc/contributing.rdoc
+++ b/doc/contributing.rdoc
@@ -11,7 +11,7 @@ trying out beta releases with your applications.
 == How To Report
 
 If you've encountered a bug in Ruby please report it to the redmine issue
-tracker available at {bugs.ruby-lang.org}[http://bugs.ruby-lang.org/].  Do not
+tracker available at {bugs.ruby-lang.org}[https://bugs.ruby-lang.org/].  Do not
 report security vulnerabilities here, there is a {separate
 channel}[rdoc-label:label-Reporting+Security+Issues] for them.
 
@@ -25,12 +25,12 @@ on your ticket.
 
   If you aren't already using the latest version, try installing a newer
   stable release. See
-  {Downloading Ruby}[http://www.ruby-lang.org/en/downloads/].
+  {Downloading Ruby}[https://www.ruby-lang.org/en/downloads/].
 * Look to see if anyone already reported your issue, try
-  {searching on redmine}[https://bugs.ruby-lang.org/projects/ruby-trunk/issues]
+  {searching on redmine}[https://bugs.ruby-lang.org/projects/ruby-master/issues]
   for your problem.
 * If you can't find a ticket addressing your issue,
-  {create a new one}[https://bugs.ruby-lang.org/projects/ruby-trunk/issues/new].
+  {create a new one}[https://bugs.ruby-lang.org/projects/ruby-master/issues/new].
 * Choose the target version, usually current. Bugs will be first fixed in the
   current release and then {backported}[rdoc-label:label-Backport+Requests].
 * Fill in the Ruby version you're using when experiencing this issue
@@ -53,10 +53,10 @@ on your ticket.
 
 You can report downstream issues for the following distributions via their bug tracker:
 
-* {debian}[http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=ruby-defaults]
+* {debian}[https://bugs.debian.org/cgi-bin/pkgreport.cgi?src=ruby-defaults]
 * {freebsd}[http://www.freebsd.org/cgi/query-pr-summary.cgi?text=ruby]
 * {redhat}[https://bugzilla.redhat.com/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=MODIFIED]
-* {macports}[http://trac.macports.org/query?status=assigned&status=new&status=reopened&port=~ruby]
+* {macports}[https://trac.macports.org/query?status=assigned&status=new&status=reopened&port=~ruby]
 * etc (add your distribution bug tracker here)
 
 === Platform Maintainers
@@ -66,14 +66,10 @@ maintainer for a specific platform.
 
 The current active platform maintainers are as follows:
 
-[mswin32, mswin64 (Microsoft Windows)]
+[mswin64 (Microsoft Windows)]
   NAKAMURA Usaku (usa)
 [mingw32 (Minimalist GNU for Windows)]
   Nobuyoshi Nakada (nobu)
-[IA-64 (Debian GNU/Linux)]
-  TAKANO Mitsuhiro (takano32)
-[Symbian OS]
-  Alexander Zavorine (azov)
 [AIX]
   Yutaka Kanemoto (kanemoto)
 [FreeBSD]
@@ -81,10 +77,12 @@ The current active platform maintainers are as follows:
 [Solaris]
   Naohisa Goto (ngoto)
 [RHEL, CentOS]
-  KOSAKI Motohiro kosaki
-[Mac OS X]
+  KOSAKI Motohiro (kosaki)
+[macOS]
   Kenta Murata (mrkn)
-[cygwin, bcc32, djgpp, wince, ...]
+[OpenBSD]
+  Jeremy Evans (jeremyevans0)
+[cygwin, ...]
   none. (Maintainer WANTED)
 
 == Reporting Security Issues
@@ -94,7 +92,7 @@ affect many users. There is a private mailing list that all security issues
 should be reported to and will be handled discretely. Email the
 mailto:security@ruby-lang.org list and the problem will be published after
 fixes have been released. You can also encrypt the issue using {the PGP public
-key}[http://www.ruby-lang.org/security.asc] for the list.
+key}[https://www.ruby-lang.org/security.asc] for the list.
 
 == Reporting Other Issues
 
@@ -118,7 +116,7 @@ these? Quite a bit, actually:
 
 When a bug report goes for a while without any feedback, it goes to the bug
 graveyard which is unfortunate. If you check the {issues
-list}[https://bugs.ruby-lang.org/projects/ruby-trunk/issues] you will find lots
+list}[https://bugs.ruby-lang.org/projects/ruby-master/issues] you will find lots
 of delinquent bugs that require attention.
 
 You can help by verifying the existing tickets, try to reproduce the reported
@@ -133,7 +131,7 @@ redmine, if gone without notice. In this case the +patch+ command is your
 friend, see <code>man patch</code> for more information. Basically this would
 go something like this:
 
-  cd path/to/ruby/trunk
+  cd path/to/ruby
   patch -p0 < path/to/patch
 
 You will then be prompted to apply the patch with the associated files. After
@@ -158,8 +156,8 @@ If there's a new feature that you want to see added to Ruby, you will need to
 write a convincing proposal and patch to implement the feature.
 
 For new features in CRuby, use the {'Feature'
-tracker}[https://bugs.ruby-lang.org/projects/ruby-trunk/issues?set_filter=1&tracker_id=2]
-on ruby-trunk. For non-CRuby dependent features, features that would apply to
+tracker}[https://bugs.ruby-lang.org/projects/ruby-master/issues?set_filter=1&tracker_id=2]
+on ruby-master. For non-CRuby dependent features, features that would apply to
 alternate Ruby implementations such as JRuby and Rubinius, use the {CommonRuby
 tracker}[https://bugs.ruby-lang.org/projects/common-ruby].
 
@@ -197,29 +195,10 @@ A good template for a feature proposal should look something like this:
 [See also]
   Links to the other related resources
 
-=== Slideshow
-
-At the Ruby Developer Meeting in Japan, committers discuss Feature Proposals together in Tokyo. We will judge proposals and then accept, reject, or give feedback for them.
-If you have a stalled proposal, making a slide to submit is good way to get feedback.
-
-Slides should be:
-
-* One-page slide
-* Include a corresponding ticket number
-* MUST include a figure and/or short example code
-* SHOULD have less sentence in natural language (try to write less than 140 characters)
-* It is RECOMMENDED to itemize: motivation/use case, proposal, pros/cons, corner case
-* PDF or Image (Web browsers can show it)
-
-Please note:
-
-* Even if the proposal is generally acceptable, it won't be accepted without writing corner cases in the ticket
-* Slide's example: DevelopersMeeting20130727Japan
-
 == Backport Requests
 
 When a new version of Ruby is released, it starts at patch level 0 (p0), and
-bugs will be fixed first on the trunk branch. If it's determined that a bug
+bugs will be fixed first on the master branch. If it's determined that a bug
 exists in a previous version of Ruby that is still in the bug fix stage of
 maintenance, then a patch will be backported. After the maintenance stage of a
 particular Ruby version ends, it goes into "security fix only" mode which
@@ -249,34 +228,28 @@ Status and maintainers of branches are listed on the
 In order to help resolve existing issues and contributing patches to Ruby you
 need to be able to run the test suite.
 
-CRuby uses subversion for source control, you can find installation
-instructions and lots of great info to learn subversion on the
-{svnbook.red-bean.com}[http://svnbook.red-bean.com/]. For other resources see
-the {ruby-core documentation on
-ruby-lang.org}[http://www.ruby-lang.org/en/community/ruby-core/].
-
-This guide will use git for contributing.  The {git
-homepage}[http://git-scm.com/] has installation instructions with links to
-documentation for learning more about git. There is a mirror of the subversion
-repository on {github}[https://github.com/ruby/ruby].
+CRuby uses git for source control, the {git homepage}[https://git-scm.com/]
+has installation instructions with links to documentation for learning more
+about git. There is a mirror of the repository on {github}[https://github.com/ruby/ruby].
+For other resources see the {ruby-core documentation on
+ruby-lang.org}[https://www.ruby-lang.org/en/community/ruby-core/].
 
 Install the prerequisite dependencies for building the CRuby interpreter to
 run tests.
 
 * C compiler
-* autoconf
-* bison
-* gperf
-* ruby - Ruby itself is prerequisite in order to build Ruby from source. It
-  can be 1.8.
+* autoconf - 2.67 or later, preferably 2.69.
+* bison - 2.0 or later, preferably 3.4.
+* gperf - 3.0.3 or later, preferably 3.1.
+* ruby - Ruby itself is prerequisite in order to build Ruby from source.
+  You should use [a maintained version of Ruby](https://www.ruby-lang.org/en/downloads/).
 
 You should also have access to development headers for the following
 libraries, but these are not required:
 
-* Tcl/Tk
 * NDBM/QDBM
 * GDBM
-* OpenSSL
+* OpenSSL/LibreSSL
 * readline/editline(libedit)
 * zlib
 * libffi
@@ -287,15 +260,15 @@ Now let's build CRuby:
 
 * Checkout the CRuby source code:
 
-    git clone git://github.com/ruby/ruby.git ruby-trunk
+    git clone https://github.com/ruby/ruby.git ruby-master
 
 * Generate the configuration files and build:
 
-    cd ruby-trunk
+    cd ruby-master
     autoconf
     mkdir build && cd build # its good practice to build outside of source dir
-    mkdir ~/.rubies # we will install to .rubies/ruby-trunk in our home dir
-    ../configure --prefix="${HOME}/.rubies/ruby-trunk"
+    mkdir ~/.rubies # we will install to .rubies/ruby-master in our home dir
+    ../configure --prefix="${HOME}/.rubies/ruby-master"
     make up && make install
 
 After adding Ruby to your PATH, you should be ready to run the test suite:
@@ -319,7 +292,7 @@ For older versions of Ruby you will need to run the build setup again after
 checking out the associated branch in git, for example if you wanted to
 checkout 1.9.3:
 
-    git clone git://github.com/ruby/ruby.git --branch ruby_1_9_3
+    git clone https://github.com/ruby/ruby.git --branch ruby_1_9_3
 
 Once you checked out the source code, you can update the local copy by:
 
@@ -332,11 +305,11 @@ Or, update, build, install and check, by just:
 == Contributing Documentation
 
 If you're interested in contributing documentation directly to CRuby there is
-a wealth of information available at
-{documenting-ruby.org}[http://documenting-ruby.org/].
+some information available at
+{Contributing}[https://github.com/ruby/ruby#contributing].
 
 There is also the {Ruby Reference
-Manual}[https://bugs.ruby-lang.org/projects/rurema] in Japanese.
+Manual}[https://github.com/rurema/doctree/wiki] in Japanese.
 
 == Contributing A Patch
 
@@ -352,7 +325,7 @@ Before you submit a patch, there are a few things you should know:
 
 To improve the chance your patch will be accepted please follow these simple rules:
 
-* Bug fixes should be committed on trunk first
+* Bug fixes should be committed on master first
 * Format of the patch file must be a unified diff (ie: diff -pu, svn diff, or git diff)
 * Don't introduce cosmetic changes
 * Follow the original coding style of the code
@@ -360,23 +333,24 @@ To improve the chance your patch will be accepted please follow these simple rul
 
 First thing you should do is check out the code if you haven't already:
 
-  git clone git://github.com/ruby/ruby.git ruby-trunk
+  git clone https://github.com/ruby/ruby.git ruby-master
 
 Now create a dedicated branch:
 
-  cd ruby-trunk
+  cd ruby-master
   git checkout -b my_new_branch
 
 The name of your branch doesn't really matter because it will only exist on
 your local computer and won't be part of the official Ruby repository. It will
 be used to create patches based on the differences between your branch and
-trunk, or edge Ruby.
+master, or edge Ruby.
 
 === Coding style
 
 Here are some general rules to follow when writing Ruby and C code for CRuby:
 
-* Indent 4 spaces for C with tabs for eight-space indentation (emacs default)
+* Indent 4 spaces for C without tabs (old codes might use tabs for eight-space indentation,
+  but newer codes recommend to use spaces only)
 * Indent 2 space tabs for Ruby
 * Do not use TABs in ruby codes
 * ANSI C style for 1.9+ for function declarations
@@ -387,48 +361,25 @@ Here are some general rules to follow when writing Ruby and C code for CRuby:
 * ABBRs should be all upper case.
 * Do as others do
 
-=== ChangeLog
-
-Although not required, if you wish to add a ChangeLog entry for your change
-please note:
-
-You can use the following template for the ChangeLog entry on your commit:
-
-  Thu Jan  1 00:00:00 2004  Your Name  <yourmail@example.com>
-
-  	* filename (function): short description of this commit.
-  	  This should include your intention of this change.
-  	  [bug:#number] [mailinglist:number]
-
-  	* filename2 (function2): additional description for this file/function.
+=== Commit messages
 
-This follows {GNU Coding Standards for Change
-Logs}[http://www.gnu.org/prep/standards/html_node/Change-Logs.html#Change-Logs],
-some other requirements and tips:
+When you're ready to commit:
 
-* Timestamps must be in JST (+09:00) in the style as above.
-* Two spaces between the timestamp and your name. Two spaces between
-  your name and your mail address.
-* One blank line between the timestamp and the description.
-* Indent the description with TAB. 2nd line should begin with TAB+2SP.
-* Write a entry (*) for each change.
-* Refer to redmine issue or discussion on the mailing list.
-* For GitHub issues, use [GH-#] (such as [Fixes GH-234]
-* One blank line between entries.
-* Do as other committers do.
+   git commit path/to/files
 
-You can generate the ChangeLog entry by running <code>make change</code>
+This will open your editor in which you write your commit message.
+Use the following style for commit messages:
 
-When you're ready to commit, copy your ChangeLog entry into the commit message,
-keeping the same formatting and select your files:
+* Use a succinct subject line.
+* Include reasoning behind the change in the commit message, focusing on why
+  the change is being made.
+* Refer to redmine issue (such as Fixes [Bug #1234] or Implements
+  [Feature #3456]), or discussion on the mailing list
+  (such as [ruby-core:12345]).
+* For GitHub issues, use [GH-#] (such as [Fixes GH-234]).
+* Follow the style used by other committers.
 
-    git commit ChangeLog path/to/files
-
-In the likely event that your branch becomes outdated, you will have to update
-your working branch:
-
-    git fetch origin
-    git rebase remotes/origin/master
+=== Contributing your code
 
 Now that you've got some code you want to contribute, let's get set up to
 generate a patch. Start by forking the github mirror, check the {github docs on
@@ -445,7 +396,7 @@ Next copy the writable url for your fork and add it as a git remote, replace
 
 In order to generate a patch that you can upload to the bug tracker, we can use
 the github interface to review our changes just visit
-https://github.com/my_username/ruby/compare/trunk...my_new_branch
+https://github.com/my_username/ruby/compare/master...my_new_branch
 
 Next, you can simply add '.patch' to the end of this URL and it will generate
 the patch for you, save the file to your computer and upload it to the bug
@@ -456,7 +407,22 @@ Since git is a distributed system, you are welcome to host your git repository
 on any {publicly accessible hosting
 site}[https://git.wiki.kernel.org/index.php/GitHosting], including {hosting your
 own}[https://www.kernel.org/pub/software/scm/git/docs/user-manual.html#public-repositories]
-You may use the {'git format-patch'}[http://git-scm.com/docs/git-format-patch]
+You may use the {'git format-patch'}[https://git-scm.com/docs/git-format-patch]
 command to generate patch files to upload to redmine.  You may also use
-the {'git request-pull'}[http://git-scm.com/docs/git-request-pull] command for
+the {'git request-pull'}[https://git-scm.com/docs/git-request-pull] command for
 formatting pull request messages to redmine.
+
+=== Updating the official repository
+
+If you are a committer, you can push changes directly into the official
+repository:
+
+    git push origin your-branch-name:master
+
+However, it is likely will have become outdated, and you will have to
+update it.  In that case, run:
+
+    git fetch origin
+    git rebase remotes/origin/master
+
+and then try pushing your changes again.
diff --git a/doc/contributors.rdoc b/doc/contributors.rdoc
deleted file mode 100644
index ced4eb1cd0..0000000000
--- a/doc/contributors.rdoc
+++ /dev/null
@@ -1,778 +0,0 @@
-= Contributors to Ruby
-
-The following list might be incomplete. Feel free to add your name if your
-patch was accepted into Ruby.
-
-== A
-
-Ayumu AIZAWA (ayumin)
-* committer
-
-AKIYOSHI, Masamichi (akiyoshi)
-* committer
-* He had maintained the VMS support on 2003-2004.
-
-Muhammad Ali
-* wrote rdoc for Fiber
-
-Minero Aoki (aamine)
-* committer
-* He is the maintainer of:
-  * fileutils
-  * net/http, net/https
-  * net/pop
-  * net/smtp
-  * racc
-  * ripper
-  * strscan
-
-Wakou Aoyama (wakou)
-* committer
-* He was the maintainer of some standard libraries.
-
-Koji Arai
-* committer
-
-arton
-* He is the distributor of ActiveScriptRuby and experimental 1.9.0-x installers for win32.
-* Wrote patches for win32ole, gc.c, tmpdir.rb
-
-== B
-
-Daniel Berger
-* a patch for irb
-* documentation
-* He wrote forwardable.rb
-
-David Black (dblack)
-* committer
-* He is the maintainer of scanf
-
-Ken Bloom
-* a patch for REXML.
-
-Oliver M. Bolzer
-* a patch for soap
-
-Alexey Borzenkov
-* a patch for mkmf.rb
-
-Richard Brown
-* a patch for configure.in
-
-Dirkjan Bussink
-* a patch for date.rb
-
-Daniel Bovensiepen
-* documentation
-* a patch for irb
-
-== C
-
-Brian Candler
-* a patch for configure.in, net/telnet
-
-keith cascio
-* a patch for optparse.rb
-
-Frederick Cheung
-* a patch for test/ruby/test_symbol.rb
-
-Christoph
-* patches for set.rb
-
-Sean Chittenden
-* pathces for net/http, cgi
-
-William D. Clinger
-* ruby_strtod is based on his paper.
-
-== D
-
-Ryan Davis (ryan)
-* committer
-* He wrote and is the maintainer of miniunit
-
-Guy Decoux (ts)
-* committer
-
-Zach Dennis
-
-Martin Duerst (duerst)
-* committer
-* M17N
-
-Paul Duncan
-* pathces for rdoc
-
-Alexander Dymo
-* a patch for lib/benchmark.rb
-
-== E
-
-Yusuke Endoh (mame)
-* committer
-* He wrote and is the maintainer of base64 library (1.9)
-* did much upon YARV compiler.
-
-erlercw
-* wrote Integer::gcd2
-
-== F
-
-Frank S.Fejes
-* a patch for net/pop
-
-Fundakowski Feldman
-* a patch for process.c
-
-Mauricio Fernandez
-* patches for parse.y
-
-David Flanagan (davidflanagan)
-* committer
-* M17N
-
-Takeyuki Fujioka (xibbar)
-* committer
-* He is the maintainer of cgi/*
-
-FUKUMOTO, Atsushi
-* a patch for tracer.rb
-
-Shota Fukumori (sorah)
-* committer
-* #4415 parallel unit/test
-
-Tadayoshi Funaba (tadf)
-* committer
-* He wrote and is the maintainer of
-  * date
-  * parsedate (1.8)
-* He ported rational.rb and complex.rb, which 1.8 contains, into rational.c and complex.c of 1.9.
-
-== G
-
-David M. Gay
-* ruby_strtod
-
-Florian Gilcher
-* documentation
-
-GOTOU, Kentaro (gotoken)
-* committer
-* He wrote benchmark.rb
-* He is the maintainer of:
-  * benchmark.rb
-  * open3
-
-GOTOU, Yuuzou (gotoyuzo)
-* committer
-
-James Edward Gray II (jeg2)
-* committer
-* He wrote the faster implementation of CSV and is the maintainer of csv.
-* Wrote documentation for rdoc
-
-== H
-
-Phil Hagelberg
-* patch for ruby-mode.el's documentation.
-
-Kirk Haines (wyhaines)
-* committer
-* the maintainer of ruby_1_8_6 branch
-
-Shinichiro Hamaji
-* fixed memory leaks (marshal.c, string.c)
-
-Shin-ichiro HARA
-* the developer and the sysop of ruby-{dev,list,core,talk} archive.
-* a patch for numeric.c
-
-Chris Heath (traumdeutung)
-* a patch for proc.c
-
-HIROKAWA Hisashi
-* fixed socket/socket.c
-
-Daniel Hob
-* He wrote:
-  * SMTP-TLS support for net/smtp.
-  * POP3S support
-
-Eric Hodel (drbrain)
-* committer
-* He is the maintainer of:
-  * rdoc
-  * ri
-  * rubygems
-
-Erik Hollensbe
-* a patch for delegate.rb
-
-Johan Holmberg
-* a patch for dir.c
-* documentation
-
-Erik Huelsmann
-
-Dae San Hwang
-* built a continuous integration environment on OpenSolaris.
-
-== I
-
-Nobuhiro IMAI
-* a patch for logger.rb
-
-"incorporate"
-* a patch for sprintf.c
-
-Keiju Ishitsuka (keiju)
-* committer
-* He wrote and is the maintainer of:
-  * cmath.rb (1.9)
-  * complex.rb (1.8)
-  * e2mmap.rb
-  * forwardable.rb
-  * irb
-  * mathn
-  * matrix.rb
-  * mutex_m.rb
-  * rational.rb (1.8)
-  * sync.rb
-  * shell/*
-  * thwait.rb
-  * tracer.rb
-
-== J
-
-Curtis Jackson
-* missing/dup2.c
-
-Alan Johnson
-* a patch for net/ftp
-
-Lyle Johnson
-* patches for nkf, bigdecimal, numeric.c
-
-== K
-
-Yoshihiro Kambayashi
-* a patch for enc/trans/single_byte.trans.
-* He wrote supports for some encodings.
-
-Yutaka Kanemoto
-* patches for common.mk, AIX AF_INET6 support
-
-Motoyuki Kasahara
-* He wrote getoptlong.rb
-
-Masahiro Kawato
-* a patch for shellwords.rb
-
-Wataru Kimura
-* a patch for configure.in
-
-Michael Klishin
-* patch for make help.
-
-Noritada Kobayashi
-* a patch for optparse.rb
-
-Shigeo Kobayashi (shigek)
-* committer
-* He is the maintainer of bigdecimal
-
-KONISHI, Hiromasa (H_Konishi)
-* committer
-* He had maintained the bcc32 support in 2004.
-
-Kornelius "murphy" Kalnbach
-* documentation
-
-K.Kosako (kosako)
-* committer
-* He wrote Oniguruma.
-
-Takehiro Kubo
-* patches for dl 64bit support.
-
-== L
-
-Marc-Andre Lafortune (marcandre)
-* committer
-* patches for hash.c, array.c, thread.c, enumc, string.c, range.c and rdoc documentation.
-
-Hongli Lai
-* improved pstore.rb
-* patch for tool/file2lastrev.rb.
-
-raspberry lemon
-* a patch for webrick/httpproxy.rb.
-
-Christian Loew
-* a patch for fileutils.rb
-
-== M
-
-Shugo Maeda (shugo)
-* committer
-* A system administrator of ruby-lang.org servers.
-* He wrote and is the maintainer of:
-  * monitor.rb
-  * net/ftp
-  * net/imap
-
-Stephan Maka (mathew)
-* documentation
-
-Yukihiro Matsumoto (matz)
-* Matz -- the founder, language designer of Ruby.
-* committer
-* Ruby itself, most of Ruby.
-* He is the maintainer of:
-  * singleton
-  * timeout
-  * gdbm
-  * sdbm
-
-Konrad Meyer
-* documentation
-
-Mib Software
-* missing/vsnprintf.c
-
-Todd C. Miller
-* missing/strlcat.c
-* missing/strlcpy.c
-
-MIYASAKA, Masaru
-* a patch for cgi.rb
-
-Stefan Monnier
-* regex.c was fixed with based on his Emacs21 patch.
-
-Marcel Moolenaar
-* patches for eval.c and gc.c.
-
-moonwolf
-* a patch for REXML, xmlrpc
-
-Hiroshi Moriyama
-* a patch for yaml.
-
-Kyosuke Morohashi
-* a patch for gem_prelude.rb
-
-Kenta Murata
-* patches for json, bignum.c
-
-Akinori MUSHA (knu)
-* committer
-* He wrote and is the maintainer of:
-  * abbrev.rb
-  * generator (1.8)
-  * enumerator (1.8)
-  * set
-  * ipaddr.rb
-  * digest/*
-  * syslog
-* He is the branch maintainer of ruby_1_8, the release manager of 1.8 series.
-
-== N
-
-Hidetoshi NAGAI (nagai)
-* committer
-* He is the maintainer of tk/*
-
-Nobuyoshi Nakada (nobu)
-* committer
-* a.k.a. the "patch monster"
-* He wrote and is the maintainer of:
-  * optparse
-  * stringio
-  * io/wait
-  * iconv
-
-Satoshi Nakagawa
-* patches for util.c
-
-Narihiro Nakamura (nari)
-* committer
-* a.k.a. authorNari
-* working at GC
-
-NAKAMURA, Hiroshi (nahi)
-* committer
-* He is the maintainer of:
-  * csv.rb (1.8)
-  * logger.rb
-  * soap/* (1.8)
-  * wsdl/* (1.8)
-  * xsd/* (1.8)
-
-NAKAMURA, Usaku (usa)
-* committer
-* a.k.a. unak
-* He is the maintainer of mswin32 and mswin64 support.
-
-NARUSE, Yui (naruse)
-* committer
-* a.k.a. "nurse"
-* Did much upon m17n.
-* He is the maintainer of:
-  * json
-  * nkf
-
-Christian Neukirchen
-* a patch for webrick/httputils
-
-Michael Neumann (mneumann)
-* committer
-* He is the maintainer of
-  * xmlrpc (1.8)
-  * gserver (1.8)
-
-NISHIO Hirokazu
-* wrote a patch for CVE-2010-0541
-
-Kazuhiro NISHIYAMA (kazu)
-* committer
-* a.k.a. znz
-
-Go Noguchi
-
-Martin Nordholts
-* misc/rdebug.el
-
-nmu
-* a patch for socket
-
-== O
-
-okkez
-* He is a sysop of the Ruby Reference Manual Renewal Project.
-* fixed ipaddr.rb, ext/etc
-
-Haruhiko Okumura
-* some of missing/* is based on his book:
-  * missing/erf.c
-  * missing/lgamma_r.c
-  * missing/tgamma.c
-
-OMAE, jun
-* a patch for debug.rb
-
-Eugene Ossintsev
-* documentation
-
-== P
-
-Heesob Park
-* a patch for win32/win32.c.
-
-pegacorn
-* a patch for instruby.rb
-
-== Q
-
-== R
-
-Gaston Ramos
-* documentation
-
-The Regents of the University of California
-* missing/crypt.c
-* missing/vsnprintf.c
-
-Sam Roberts
-* patch for socket
-* documentation
-
-Michal Rokos (michal)
-* committer
-* He was the maintainer of DJGPP support.
-
-rubikitch
-* a patch for io.c
-
-Marcus Rueckert
-* a patch for mkconfig.rb.
-
-Run Paint Run Run
-* patch for enc/unicode.c
-* documentation
-
-Sean Russell (ser)
-* committer
-* He wrote and is the maintainer of REXML.
-
-== S
-
-Kazuo Saito (ksaito)
-* committer
-* M17N
-
-Tadashi Saito
-* patches for test/ruby/test_math.rb, thread_*.c, bignum.c
-* working upon BigDecimal.
-* did much upon documentation
-
-Masahiro Sakai
-* a patch for io.c
-
-Laurent Sansonetti
-* a patch for tool/ytab.sed
-
-Jeff Saracco
-* documentation
-
-Koichi Sasada (ko1)
-* committer
-* He wrote YARV.
-
-Hugh Sasse
-* a patch for net/http
-* documentation
-
-Charlie Savage
-* a patch for win32/Makefile.sub
-
-Michael Scholz
-* a patch for ruby-mode.el
-
-Arthur Schreiber
-* patch for net/http and rdoc.
-
-Masatoshi SEKI (seki)
-* committer
-* He wrote and is the maintainer of:
-  * drb/*
-  * erb
-  * rinda
-
-Roman Shterenzon
-* a patch for open-uri.
-
-Kent Sibilev
-
-Gavin Sinclair (gsinclair)
-* committer
-
-John W. Small
-* He wrote gserver.rb
-
-Yuki Sonoda (yugui)
-* committer
-* She is the maintainer of man/* manual pages and is the release manager of 1.9 series.
-* She wrote prime.rb.
-* A developer and a sysop of redmine.ruby-lang.org.
-
-SOUMA, Yutaka
-* a patch for pack.c.
-
-Tatsuki Sugiura
-* WebDAV support for net/http
-
-Masaki Suketa (suke)
-* committer
-* He is the maintainer of win32ole
-
-sheepman
-* patches for ruby.c, thread.c, stringio, enum.c, webrick, net/http
-
-Siena. (siena)
-* committer
-
-Kirill A. Shutemov
-* a patch for parse.y
-
-Darren Smith
-* a patch for golf_prelude.rb
-
-Richard M. Stallman
-* missing/alloca.c
-
-Robin Stocker
-* documentation
-
-Adam Strzelecki
-* a patch for compile.c
-
-Masashi Sumi
-* improved net/pop.rb
-
-Eric Sunshine
-* NeXT OpenStep, Rhapsody support
-
-Kouhei Sutou (kou)
-* committer
-* He wrote and is the maintainer of rss/*
-
-David Symonds
-* documentation
-
-== T
-
-TAKANO Mitsuhiro (takano32)
-* committer
-* He is the maintainer of IA-64 support.
-* BigDecimal
-
-TAKAO, Kouji (kouji)
-* committer
-* He is the maintainer of readline.
-
-Nathaniel Talbott (ntalbott)
-* committer
-* He was the maintainer of test/unit, runit, rubyunit.
-
-TANAKA, Akira (akr)
-* committer
-* Did much upon m17n.
-* And he is the maintainer of:
-  * open-uri
-  * pathname
-  * pp
-  * resolv-replace
-  * resolv
-  * time
-  * tsort
-
-Takaaki Tateishi (ttate)
-* committer
-* He was the maintainer of dl
-
-Technorama Ltd. (technoroma)
-* committer
-* openssl
-
-Andrew Thompson
-* a patch for socket.c IRIX support.
-
-Dave Thomas (dave)
-* committer
-* a.k.a. the Pragmatic Programmer.
-* He wrote rdoc.
-
-Tietew
-* patches for win32 support
-
-Masahiro Tomita
-* a patch for cgi.rb
-
-Jakub Travnik
-* a patch for eval.c
-
-Tom Truscott
-* missing/crypt.c
-
-== U
-
-UEDA, Satoshi
-* a patch for uri
-
-Takaaki Uematsu (uema2)
-* committer
-* He was the maintainer of WinCE support.
-
-UENO, Katsuhiro (katsu)
-* committer
-* He is the maintainer of zlib
-
-Hajimu UMEMOTO
-* He wrote ipaddr.rb
-
-URABE, Shyouhei (shyouhei)
-* committer
-* a.k.a. mput.
-* He is the branch maintainer of ruby_1_8_6 and ruby_1_8_7
-* and is the release manager of 1.8.x-pXXX.
-
-== V
-
-Joel VanderWerf
-* a patch for numeric.c
-
-Peter Vanbroekhoven
-
-Corinna Vinschen
-
-== W
-
-wanabe (wanabe)
-* committer
-* fixed YARV and Oniguruma.
-
-Chun Wang
-* a patch for time.rb
-
-WATANABE, Hirofumi (eban)
-* committer
-* He is the maintainer of
-  * ftools (1.8)
-  * tmpdir
-  * un
-  * Win32API
-
-WATANABE, Tetsuya
-* a patch for ruby.c
-
-William Webber (wew)
-* committer
-
-Jim Weirich (jim)
-* committer
-* He wrote Rake.
-
-Nathan Weizenbaum
-* fixed misc/ruby-mode.el.
-
-why the lukky stiff (why)
-* committer
-* He is the maintainer of syck
-
-Caley Woods
-* documentation
-
-Gary Wright
-* documentation
-
-== X
-
-== Y
-
-Akira Yamada (akira)
-* committer
-* He is the maintainer of ruby related packages at Debian project.
-
-Keita Yamaguchi
-* patches for enum.c, parse.y
-* documentation
-
-Hirokazu Yamamoto (ocean)
-* committer
-
-Hirotaka Yoshioka
-* a patch for improving SEGV handling
-
-== Z
-
-Aristarkh A Zagorodnikov
-* a patch for io.c
-
-Alexander Zavorine
-* committer
-* He is the maintainer for Symbian OS.
-
-Chiyuan Zhang
-* a patch for misc/ruby-mode.el.
-
-Dee Zsombor (zunda)
-* a patch for thread_pthread.c
-
-Dan Zwell
-* a patch for net/pop
-
-
diff --git a/doc/csv/arguments/io.rdoc b/doc/csv/arguments/io.rdoc
new file mode 100644
index 0000000000..f5fe1d1975
--- /dev/null
+++ b/doc/csv/arguments/io.rdoc
@@ -0,0 +1,5 @@
+* Argument +io+ should be an IO object that is:
+  * Open for reading; on return, the IO object will be closed.
+  * Positioned at the beginning.
+    To position at the end, for appending, use method CSV.generate.
+    For any other positioning, pass a preset \StringIO object instead.
diff --git a/doc/csv/options/common/col_sep.rdoc b/doc/csv/options/common/col_sep.rdoc
new file mode 100644
index 0000000000..05769b5773
--- /dev/null
+++ b/doc/csv/options/common/col_sep.rdoc
@@ -0,0 +1,63 @@
+====== Option +col_sep+
+
+Specifies the \String field separator to be used
+for both parsing and generating.
+The \String will be transcoded into the data's \Encoding before use.
+
+Default value:
+  CSV::DEFAULT_OPTIONS.fetch(:col_sep) # => "," (comma)
+
+Using the default (comma):
+  str = CSV.generate do |csv|
+    csv << [:foo, 0]
+    csv << [:bar, 1]
+    csv << [:baz, 2]
+  end
+  str # => "foo,0\nbar,1\nbaz,2\n"
+  ary = CSV.parse(str)
+  ary # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
+
+Using +:+ (colon):
+  col_sep = ':'
+  str = CSV.generate(col_sep: col_sep) do |csv|
+    csv << [:foo, 0]
+    csv << [:bar, 1]
+    csv << [:baz, 2]
+  end
+  str # => "foo:0\nbar:1\nbaz:2\n"
+  ary = CSV.parse(str, col_sep: col_sep)
+  ary # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
+
+Using +::+ (two colons):
+  col_sep = '::'
+  str = CSV.generate(col_sep: col_sep) do |csv|
+    csv << [:foo, 0]
+    csv << [:bar, 1]
+    csv << [:baz, 2]
+  end
+  str # => "foo::0\nbar::1\nbaz::2\n"
+  ary = CSV.parse(str, col_sep: col_sep)
+  ary # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
+
+Using <tt>''</tt> (empty string):
+  col_sep = ''
+  str = CSV.generate(col_sep: col_sep) do |csv|
+    csv << [:foo, 0]
+    csv << [:bar, 1]
+    csv << [:baz, 2]
+  end
+  str # => "foo0\nbar1\nbaz2\n"
+
+---
+
+Raises an exception if parsing with the empty \String:
+  col_sep = ''
+  # Raises ArgumentError (:col_sep must be 1 or more characters: "")
+  CSV.parse("foo0\nbar1\nbaz2\n", col_sep: col_sep)
+
+Raises an exception if the given value is not String-convertible:
+  col_sep = BasicObject.new
+  # Raises NoMethodError (undefined method `to_s' for #<BasicObject:>)
+  CSV.generate(line, col_sep: col_sep)
+  # Raises NoMethodError (undefined method `to_s' for #<BasicObject:>)
+  CSV.parse(str, col_sep: col_sep)
diff --git a/doc/csv/options/common/quote_char.rdoc b/doc/csv/options/common/quote_char.rdoc
new file mode 100644
index 0000000000..67fd3af68b
--- /dev/null
+++ b/doc/csv/options/common/quote_char.rdoc
@@ -0,0 +1,42 @@
+====== Option +quote_char+
+
+Specifies the character (\String of length 1) used used to quote fields
+in both parsing and generating.
+This String will be transcoded into the data's \Encoding before use.
+
+Default value:
+  CSV::DEFAULT_OPTIONS.fetch(:quote_char) # => "\"" (double quote)
+
+This is useful for an application that incorrectly uses <tt>'</tt> (single-quote)
+to quote fields, instead of the correct <tt>"</tt> (double-quote).
+
+Using the default (double quote):
+  str = CSV.generate do |csv|
+    csv << ['foo', 0]
+    csv << ["'bar'", 1]
+    csv << ['"baz"', 2]
+  end
+  str # => "foo,0\n'bar',1\n\"\"\"baz\"\"\",2\n"
+  ary = CSV.parse(str)
+  ary # => [["foo", "0"], ["'bar'", "1"], ["\"baz\"", "2"]]
+
+Using <tt>'</tt> (single-quote):
+  quote_char = "'"
+  str = CSV.generate(quote_char: quote_char) do |csv|
+    csv << ['foo', 0]
+    csv << ["'bar'", 1]
+    csv << ['"baz"', 2]
+  end
+  str # => "foo,0\n'''bar''',1\n\"baz\",2\n"
+  ary = CSV.parse(str, quote_char: quote_char)
+  ary # => [["foo", "0"], ["'bar'", "1"], ["\"baz\"", "2"]]
+
+---
+
+Raises an exception if the \String length is greater than 1:
+  # Raises ArgumentError (:quote_char has to be nil or a single character String)
+  CSV.new('', quote_char: 'xx')
+
+Raises an exception if the value is not a \String:
+  # Raises ArgumentError (:quote_char has to be nil or a single character String)
+  CSV.new('', quote_char: :foo)
diff --git a/doc/csv/options/common/row_sep.rdoc b/doc/csv/options/common/row_sep.rdoc
new file mode 100644
index 0000000000..872d9d1f3f
--- /dev/null
+++ b/doc/csv/options/common/row_sep.rdoc
@@ -0,0 +1,100 @@
+====== Option +row_sep+
+
+Specifies the row separator, a \String or the \Symbol <tt>:auto</tt> (see below),
+to be used for both parsing and generating.
+
+Default value:
+  CSV::DEFAULT_OPTIONS.fetch(:row_sep) # => :auto
+
+---
+
+When +row_sep+ is a \String, that \String becomes the row separator.
+The String will be transcoded into the data's Encoding before use.
+
+Using <tt>"\n"</tt>:
+  row_sep = "\n"
+  str = CSV.generate(row_sep: row_sep) do |csv|
+    csv << [:foo, 0]
+    csv << [:bar, 1]
+    csv << [:baz, 2]
+  end
+  str # => "foo,0\nbar,1\nbaz,2\n"
+  ary = CSV.parse(str)
+  ary # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
+
+Using <tt>|</tt> (pipe):
+  row_sep = '|'
+  str = CSV.generate(row_sep: row_sep) do |csv|
+    csv << [:foo, 0]
+    csv << [:bar, 1]
+    csv << [:baz, 2]
+  end
+  str # => "foo,0|bar,1|baz,2|"
+  ary = CSV.parse(str, row_sep: row_sep)
+  ary # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
+
+Using <tt>--</tt> (two hyphens):
+  row_sep = '--'
+  str = CSV.generate(row_sep: row_sep) do |csv|
+    csv << [:foo, 0]
+    csv << [:bar, 1]
+    csv << [:baz, 2]
+  end
+  str # => "foo,0--bar,1--baz,2--"
+  ary = CSV.parse(str, row_sep: row_sep)
+  ary # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
+
+Using <tt>''</tt> (empty string):
+  row_sep = ''
+  str = CSV.generate(row_sep: row_sep) do |csv|
+    csv << [:foo, 0]
+    csv << [:bar, 1]
+    csv << [:baz, 2]
+  end
+  str # => "foo,0bar,1baz,2"
+  ary = CSV.parse(str, row_sep: row_sep)
+  ary # => [["foo", "0bar", "1baz", "2"]]
+
+---
+
+When +row_sep+ is the \Symbol +:auto+ (the default),
+generating uses <tt>"\n"</tt> as the row separator:
+  str = CSV.generate do |csv|
+    csv << [:foo, 0]
+    csv << [:bar, 1]
+    csv << [:baz, 2]
+  end
+  str # => "foo,0\nbar,1\nbaz,2\n"
+
+Parsing, on the other hand, invokes auto-discovery of the row separator.
+
+Auto-discovery reads ahead in the data looking for the next <tt>\r\n</tt>, +\n+, or +\r+ sequence.
+The sequence will be selected even if it occurs in a quoted field,
+assuming that you would have the same line endings there.
+
+Example:
+  str = CSV.generate do |csv|
+    csv << [:foo, 0]
+    csv << [:bar, 1]
+    csv << [:baz, 2]
+  end
+  str # => "foo,0\nbar,1\nbaz,2\n"
+  ary = CSV.parse(str)
+  ary # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
+
+The default <tt>$INPUT_RECORD_SEPARATOR</tt> (<tt>$/</tt>) is used
+if any of the following is true:
+* None of those sequences is found.
+* Data is +ARGF+, +STDIN+, +STDOUT+, or +STDERR+.
+* The stream is only available for output.
+
+Obviously, discovery takes a little time. Set manually if speed is important. Also note that IO objects should be opened in binary mode on Windows if this feature will be used as the line-ending translation can cause problems with resetting the document position to where it was before the read ahead.
+
+---
+
+Raises an exception if the given value is not String-convertible:
+  row_sep = BasicObject.new
+  # Raises NoMethodError (undefined method `to_s' for #<BasicObject:>)
+  CSV.generate(ary, row_sep: row_sep)
+  # Raises NoMethodError (undefined method `to_s' for #<BasicObject:>)
+  CSV.parse(str, row_sep: row_sep)
diff --git a/doc/csv/options/generating/force_quotes.rdoc b/doc/csv/options/generating/force_quotes.rdoc
new file mode 100644
index 0000000000..11afd1a16c
--- /dev/null
+++ b/doc/csv/options/generating/force_quotes.rdoc
@@ -0,0 +1,17 @@
+====== Option +force_quotes+
+
+Specifies the boolean that determines whether each output field is to be double-quoted.
+
+Default value:
+  CSV::DEFAULT_OPTIONS.fetch(:force_quotes) # => false
+
+For examples in this section:
+  ary = ['foo', 0, nil]
+
+Using the default, +false+:
+  str = CSV.generate_line(ary)
+  str # => "foo,0,\n"
+
+Using +true+:
+  str = CSV.generate_line(ary, force_quotes: true)
+  str # => "\"foo\",\"0\",\"\"\n"
diff --git a/doc/csv/options/generating/quote_empty.rdoc b/doc/csv/options/generating/quote_empty.rdoc
new file mode 100644
index 0000000000..4c5645c662
--- /dev/null
+++ b/doc/csv/options/generating/quote_empty.rdoc
@@ -0,0 +1,12 @@
+====== Option +quote_empty+
+
+Specifies the boolean that determines whether an empty value is to be double-quoted.
+
+Default value:
+  CSV::DEFAULT_OPTIONS.fetch(:quote_empty) # => true
+
+With the default +true+:
+  CSV.generate_line(['"', ""]) # => "\"\"\"\",\"\"\n"
+
+With +false+:
+    CSV.generate_line(['"', ""], quote_empty: false) # => "\"\"\"\",\n"
diff --git a/doc/csv/options/generating/write_converters.rdoc b/doc/csv/options/generating/write_converters.rdoc
new file mode 100644
index 0000000000..6e5fae5fda
--- /dev/null
+++ b/doc/csv/options/generating/write_converters.rdoc
@@ -0,0 +1,33 @@
+====== Option +write_converters+
+
+Specifies converters to be used in generating fields.
+See {Write Converters}[#class-CSV-label-Write+Converters]
+
+Default value:
+  CSV::DEFAULT_OPTIONS.fetch(:write_converters) # => nil
+
+With no write converter:
+  str = CSV.generate_line(["\na\n", "\tb\t", " c "])
+  str # => "\"\na\n\",\tb\t, c \n"
+
+With a write converter:
+  strip_converter = proc {|field| field.strip }
+  str = CSV.generate_line(["\na\n", "\tb\t", " c "], write_converters: strip_converter)
+  str # => "a,b,c\n"
+
+With two write converters (called in order):
+  upcase_converter = proc {|field| field.upcase }
+  downcase_converter = proc {|field| field.downcase }
+  write_converters = [upcase_converter, downcase_converter]
+  str = CSV.generate_line(['a', 'b', 'c'], write_converters: write_converters)
+  str # => "a,b,c\n"
+
+See also {Write Converters}[#class-CSV-label-Write+Converters]
+
+---
+
+Raises an exception if the converter returns a value that is neither +nil+
+nor \String-convertible:
+  bad_converter = proc {|field| BasicObject.new }
+  # Raises NoMethodError (undefined method `is_a?' for #<BasicObject:>)
+  CSV.generate_line(['a', 'b', 'c'], write_converters: bad_converter)
\ No newline at end of file
diff --git a/doc/csv/options/generating/write_empty_value.rdoc b/doc/csv/options/generating/write_empty_value.rdoc
new file mode 100644
index 0000000000..67be5662cb
--- /dev/null
+++ b/doc/csv/options/generating/write_empty_value.rdoc
@@ -0,0 +1,15 @@
+====== Option +write_empty_value+
+
+Specifies the object that is to be substituted for each field
+that has an empty \String.
+
+Default value:
+  CSV::DEFAULT_OPTIONS.fetch(:write_empty_value) # => ""
+
+Without the option:
+  str = CSV.generate_line(['a', '', 'c', ''])
+  str # => "a,\"\",c,\"\"\n"
+
+With the option:
+  str = CSV.generate_line(['a', '', 'c', ''], write_empty_value: "x")
+  str # => "a,x,c,x\n"
diff --git a/doc/csv/options/generating/write_headers.rdoc b/doc/csv/options/generating/write_headers.rdoc
new file mode 100644
index 0000000000..f9faa9d438
--- /dev/null
+++ b/doc/csv/options/generating/write_headers.rdoc
@@ -0,0 +1,29 @@
+====== Option +write_headers+
+
+Specifies the boolean that determines whether a header row is included in the output;
+ignored if there are no headers.
+
+Default value:
+  CSV::DEFAULT_OPTIONS.fetch(:write_headers) # => nil
+
+Without +write_headers+:
+  file_path = 't.csv'
+  CSV.open(file_path,'w',
+      :headers => ['Name','Value']
+    ) do |csv|
+      csv << ['foo', '0']
+  end
+  CSV.open(file_path) do |csv|
+    csv.shift
+  end # => ["foo", "0"]
+
+With +write_headers+":
+  CSV.open(file_path,'w',
+      :write_headers=> true,
+      :headers => ['Name','Value']
+    ) do |csv|
+      csv << ['foo', '0']
+  end
+  CSV.open(file_path) do |csv|
+    csv.shift
+  end # => ["Name", "Value"]
diff --git a/doc/csv/options/generating/write_nil_value.rdoc b/doc/csv/options/generating/write_nil_value.rdoc
new file mode 100644
index 0000000000..65d33ff54e
--- /dev/null
+++ b/doc/csv/options/generating/write_nil_value.rdoc
@@ -0,0 +1,14 @@
+====== Option +write_nil_value+
+
+Specifies the object that is to be substituted for each +nil+-valued field.
+
+Default value:
+  CSV::DEFAULT_OPTIONS.fetch(:write_nil_value) # => nil
+
+Without the option:
+  str = CSV.generate_line(['a', nil, 'c', nil])
+  str # => "a,,c,\n"
+
+With the option:
+  str = CSV.generate_line(['a', nil, 'c', nil], write_nil_value: "x")
+  str # => "a,x,c,x\n"
diff --git a/doc/csv/options/parsing/converters.rdoc b/doc/csv/options/parsing/converters.rdoc
new file mode 100644
index 0000000000..211fa48de6
--- /dev/null
+++ b/doc/csv/options/parsing/converters.rdoc
@@ -0,0 +1,46 @@
+====== Option +converters+
+
+Specifies converters to be used in parsing fields.
+See {Field Converters}[#class-CSV-label-Field+Converters]
+
+Default value:
+  CSV::DEFAULT_OPTIONS.fetch(:converters) # => nil
+
+The value may be a field converter name
+(see {Stored Converters}[#class-CSV-label-Stored+Converters]):
+  str = '1,2,3'
+  # Without a converter
+  array = CSV.parse_line(str)
+  array # => ["1", "2", "3"]
+  # With built-in converter :integer
+  array = CSV.parse_line(str, converters: :integer)
+  array # => [1, 2, 3]
+
+The value may be a converter list
+(see {Converter Lists}[#class-CSV-label-Converter+Lists]):
+  str = '1,3.14159'
+  # Without converters
+  array = CSV.parse_line(str)
+  array # => ["1", "3.14159"]
+  # With built-in converters
+  array = CSV.parse_line(str, converters: [:integer, :float])
+  array # => [1, 3.14159]
+
+The value may be a \Proc custom converter:
+(see {Custom Field Converters}[#class-CSV-label-Custom+Field+Converters]):
+  str = ' foo  ,  bar  ,  baz  '
+  # Without a converter
+  array = CSV.parse_line(str)
+  array # => [" foo  ", "  bar  ", "  baz  "]
+  # With a custom converter
+  array = CSV.parse_line(str, converters: proc {|field| field.strip })
+  array # => ["foo", "bar", "baz"]
+
+See also {Custom Field Converters}[#class-CSV-label-Custom+Field+Converters]
+
+---
+
+Raises an exception if the converter is not a converter name or a \Proc:
+  str = 'foo,0'
+  # Raises NoMethodError (undefined method `arity' for nil:NilClass)
+  CSV.parse(str, converters: :foo)
diff --git a/doc/csv/options/parsing/empty_value.rdoc b/doc/csv/options/parsing/empty_value.rdoc
new file mode 100644
index 0000000000..7d3bcc078c
--- /dev/null
+++ b/doc/csv/options/parsing/empty_value.rdoc
@@ -0,0 +1,13 @@
+====== Option +empty_value+
+
+Specifies the object that is to be substituted
+for each field that has an empty \String.
+
+Default value:
+  CSV::DEFAULT_OPTIONS.fetch(:empty_value) # => "" (empty string)
+
+With the default, <tt>""</tt>:
+  CSV.parse_line('a,"",b,"",c') # => ["a", "", "b", "", "c"]
+
+With a different object:
+  CSV.parse_line('a,"",b,"",c', empty_value: 'x') # => ["a", "x", "b", "x", "c"]
diff --git a/doc/csv/options/parsing/field_size_limit.rdoc b/doc/csv/options/parsing/field_size_limit.rdoc
new file mode 100644
index 0000000000..797c5776fc
--- /dev/null
+++ b/doc/csv/options/parsing/field_size_limit.rdoc
@@ -0,0 +1,39 @@
+====== Option +field_size_limit+
+
+Specifies the \Integer field size limit.
+
+Default value:
+  CSV::DEFAULT_OPTIONS.fetch(:field_size_limit) # => nil
+
+This is a maximum size CSV will read ahead looking for the closing quote for a field.
+(In truth, it reads to the first line ending beyond this size.)
+If a quote cannot be found within the limit CSV will raise a MalformedCSVError,
+assuming the data is faulty.
+You can use this limit to prevent what are effectively DoS attacks on the parser.
+However, this limit can cause a legitimate parse to fail;
+therefore the default value is +nil+ (no limit).
+
+For the examples in this section:
+  str = <<~EOT
+    "a","b"
+    "
+    2345
+    ",""
+  EOT
+  str # => "\"a\",\"b\"\n\"\n2345\n\",\"\"\n"
+
+Using the default +nil+:
+  ary = CSV.parse(str)
+  ary # => [["a", "b"], ["\n2345\n", ""]]
+
+Using <tt>50</tt>:
+  field_size_limit = 50
+  ary = CSV.parse(str, field_size_limit: field_size_limit)
+  ary # => [["a", "b"], ["\n2345\n", ""]]
+
+---
+
+Raises an exception if a field is too long:
+  big_str = "123456789\n" * 1024
+  # Raises CSV::MalformedCSVError (Field size exceeded in line 1.)
+  CSV.parse('valid,fields,"' + big_str + '"', field_size_limit: 2048)
diff --git a/doc/csv/options/parsing/header_converters.rdoc b/doc/csv/options/parsing/header_converters.rdoc
new file mode 100644
index 0000000000..309180805f
--- /dev/null
+++ b/doc/csv/options/parsing/header_converters.rdoc
@@ -0,0 +1,43 @@
+====== Option +header_converters+
+
+Specifies converters to be used in parsing headers.
+See {Header Converters}[#class-CSV-label-Header+Converters]
+
+Default value:
+  CSV::DEFAULT_OPTIONS.fetch(:header_converters) # => nil
+
+Identical in functionality to option {converters}[#class-CSV-label-Option+converters]
+except that:
+- The converters apply only to the header row.
+- The built-in header converters are +:downcase+ and +:symbol+.
+
+This section assumes prior execution of:
+  str = <<-EOT
+  Name,Value
+  foo,0
+  bar,1
+  baz,2
+  EOT
+  # With no header converter
+  table = CSV.parse(str, headers: true)
+  table.headers # => ["Name", "Value"]
+
+The value may be a header converter name
+(see {Stored Converters}[#class-CSV-label-Stored+Converters]):
+  table = CSV.parse(str, headers: true, header_converters: :downcase)
+  table.headers # => ["name", "value"]
+
+The value may be a converter list
+(see {Converter Lists}[#class-CSV-label-Converter+Lists]):
+  header_converters = [:downcase, :symbol]
+  table = CSV.parse(str, headers: true, header_converters: header_converters)
+  table.headers # => [:name, :value]
+
+The value may be a \Proc custom converter
+(see {Custom Header Converters}[#class-CSV-label-Custom+Header+Converters]):
+  upcase_converter = proc {|field| field.upcase }
+  table = CSV.parse(str, headers: true, header_converters: upcase_converter)
+  table.headers # => ["NAME", "VALUE"]
+
+See also {Custom Header Converters}[#class-CSV-label-Custom+Header+Converters]
+
diff --git a/doc/csv/options/parsing/headers.rdoc b/doc/csv/options/parsing/headers.rdoc
new file mode 100644
index 0000000000..0ea151f24b
--- /dev/null
+++ b/doc/csv/options/parsing/headers.rdoc
@@ -0,0 +1,63 @@
+====== Option +headers+
+
+Specifies a boolean, \Symbol, \Array, or \String to be used
+to define column headers.
+
+Default value:
+  CSV::DEFAULT_OPTIONS.fetch(:headers) # => false
+
+---
+
+Without +headers+:
+  str = <<-EOT
+  Name,Count
+  foo,0
+  bar,1
+  bax,2
+  EOT
+  csv = CSV.new(str)
+  csv # => #<CSV io_type:StringIO encoding:UTF-8 lineno:0 col_sep:"," row_sep:"\n" quote_char:"\"">
+  csv.headers # => nil
+  csv.shift # => ["Name", "Count"]
+
+---
+
+If set to +true+ or the \Symbol +:first_row+,
+the first row of the data is treated as a row of headers:
+  str = <<-EOT
+  Name,Count
+  foo,0
+  bar,1
+  bax,2
+  EOT
+  csv = CSV.new(str, headers: true)
+  csv # => #<CSV io_type:StringIO encoding:UTF-8 lineno:2 col_sep:"," row_sep:"\n" quote_char:"\"" headers:["Name", "Count"]>
+  csv.headers # => ["Name", "Count"]
+  csv.shift # => #<CSV::Row "Name":"bar" "Count":"1">
+
+---
+
+If set to an \Array, the \Array elements are treated as headers:
+  str = <<-EOT
+  foo,0
+  bar,1
+  bax,2
+  EOT
+  csv = CSV.new(str, headers: ['Name', 'Count'])
+  csv
+  csv.headers # => ["Name", "Count"]
+  csv.shift # => #<CSV::Row "Name":"bar" "Count":"1">
+
+---
+
+If set to a \String +str+, method <tt>CSV::parse_line(str, options)</tt> is called
+with the current +options+, and the returned \Array is treated as headers:
+  str = <<-EOT
+  foo,0
+  bar,1
+  bax,2
+  EOT
+  csv = CSV.new(str, headers: 'Name,Count')
+  csv
+  csv.headers # => ["Name", "Count"]
+  csv.shift # => #<CSV::Row "Name":"bar" "Count":"1">
diff --git a/doc/csv/options/parsing/liberal_parsing.rdoc b/doc/csv/options/parsing/liberal_parsing.rdoc
new file mode 100644
index 0000000000..b8b9b00c98
--- /dev/null
+++ b/doc/csv/options/parsing/liberal_parsing.rdoc
@@ -0,0 +1,19 @@
+====== Option +liberal_parsing+
+
+Specifies the boolean value that determines whether
+CSV will attempt to parse input not conformant with RFC 4180,
+such as double quotes in unquoted fields.
+
+Default value:
+  CSV::DEFAULT_OPTIONS.fetch(:liberal_parsing) # => false
+
+For examples in this section:
+  str = 'is,this "three, or four",fields'
+
+Without +liberal_parsing+:
+  # Raises CSV::MalformedCSVError (Illegal quoting in str 1.)
+  CSV.parse_line(str)
+
+With +liberal_parsing+:
+  ary = CSV.parse_line(str, liberal_parsing: true)
+  ary # => ["is", "this \"three", " or four\"", "fields"]
diff --git a/doc/csv/options/parsing/nil_value.rdoc b/doc/csv/options/parsing/nil_value.rdoc
new file mode 100644
index 0000000000..412e8795e8
--- /dev/null
+++ b/doc/csv/options/parsing/nil_value.rdoc
@@ -0,0 +1,12 @@
+====== Option +nil_value+
+
+Specifies the object that is to be substituted for each null (no-text) field.
+
+Default value:
+  CSV::DEFAULT_OPTIONS.fetch(:nil_value) # => nil
+
+With the default, +nil+:
+  CSV.parse_line('a,,b,,c') # => ["a", nil, "b", nil, "c"]
+
+With a different object:
+  CSV.parse_line('a,,b,,c', nil_value: 0) # => ["a", 0, "b", 0, "c"]
diff --git a/doc/csv/options/parsing/return_headers.rdoc b/doc/csv/options/parsing/return_headers.rdoc
new file mode 100644
index 0000000000..45d2e3f3de
--- /dev/null
+++ b/doc/csv/options/parsing/return_headers.rdoc
@@ -0,0 +1,22 @@
+====== Option +return_headers+
+
+Specifies the boolean that determines whether method #shift
+returns or ignores the header row.
+
+Default value:
+  CSV::DEFAULT_OPTIONS.fetch(:return_headers) # => false
+
+Examples:
+  str = <<-EOT
+  Name,Count
+  foo,0
+  bar,1
+  bax,2
+  EOT
+  # Without return_headers first row is str.
+  csv = CSV.new(str, headers: true)
+  csv.shift # => #<CSV::Row "Name":"foo" "Count":"0">
+  # With return_headers first row is headers.
+  csv = CSV.new(str, headers: true, return_headers: true)
+  csv.shift # => #<CSV::Row "Name":"Name" "Count":"Count">
+
diff --git a/doc/csv/options/parsing/skip_blanks.rdoc b/doc/csv/options/parsing/skip_blanks.rdoc
new file mode 100644
index 0000000000..2c8f7b7bb8
--- /dev/null
+++ b/doc/csv/options/parsing/skip_blanks.rdoc
@@ -0,0 +1,31 @@
+====== Option +skip_blanks+
+
+Specifies a boolean that determines whether blank lines in the input will be ignored;
+a line that contains a column separator is not considered to be blank.
+
+Default value:
+  CSV::DEFAULT_OPTIONS.fetch(:skip_blanks) # => false
+
+See also option {skiplines}[#class-CSV-label-Option+skip_lines].
+
+For examples in this section:
+  str = <<-EOT
+  foo,0
+
+  bar,1
+  baz,2
+
+  ,
+  EOT
+
+Using the default, +false+:
+  ary = CSV.parse(str)
+  ary # => [["foo", "0"], [], ["bar", "1"], ["baz", "2"], [], [nil, nil]]
+
+Using +true+:
+  ary = CSV.parse(str, skip_blanks: true)
+  ary # => [["foo", "0"], ["bar", "1"], ["baz", "2"], [nil, nil]]
+
+Using a truthy value:
+  ary = CSV.parse(str, skip_blanks: :foo)
+  ary # => [["foo", "0"], ["bar", "1"], ["baz", "2"], [nil, nil]]
diff --git a/doc/csv/options/parsing/skip_lines.rdoc b/doc/csv/options/parsing/skip_lines.rdoc
new file mode 100644
index 0000000000..1481c40a5f
--- /dev/null
+++ b/doc/csv/options/parsing/skip_lines.rdoc
@@ -0,0 +1,37 @@
+====== Option +skip_lines+
+
+Specifies an object to use in identifying comment lines in the input that are to be ignored:
+* If a \Regexp, ignores lines that match it.
+* If a \String, converts it to a \Regexp, ignores lines that match it.
+* If +nil+, no lines are considered to be comments.
+
+Default value:
+  CSV::DEFAULT_OPTIONS.fetch(:skip_lines) # => nil
+
+For examples in this section:
+  str = <<-EOT
+  # Comment
+  foo,0
+  bar,1
+  baz,2
+  # Another comment
+  EOT
+  str # => "# Comment\nfoo,0\nbar,1\nbaz,2\n# Another comment\n"
+
+Using the default, +nil+:
+  ary = CSV.parse(str)
+  ary # => [["# Comment"], ["foo", "0"], ["bar", "1"], ["baz", "2"], ["# Another comment"]]
+
+Using a \Regexp:
+  ary = CSV.parse(str, skip_lines: /^#/)
+  ary # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
+
+Using a \String:
+  ary = CSV.parse(str, skip_lines: '#')
+  ary # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
+
+---
+
+Raises an exception if given an object that is not a \Regexp, a \String, or +nil+:
+  # Raises ArgumentError (:skip_lines has to respond to #match: 0)
+  CSV.parse(str, skip_lines: 0)
diff --git a/doc/csv/options/parsing/strip.rdoc b/doc/csv/options/parsing/strip.rdoc
new file mode 100644
index 0000000000..56ae4310c3
--- /dev/null
+++ b/doc/csv/options/parsing/strip.rdoc
@@ -0,0 +1,15 @@
+====== Option +strip+
+
+Specifies the boolean value that determines whether
+whitespace is stripped from each input field.
+
+Default value:
+  CSV::DEFAULT_OPTIONS.fetch(:strip) # => false
+
+With default value +false+:
+  ary = CSV.parse_line(' a , b ')
+  ary # => [" a ", " b "]
+
+With value +true+:
+  ary = CSV.parse_line(' a , b ', strip: true)
+  ary # => ["a", "b"]
diff --git a/doc/csv/options/parsing/unconverted_fields.rdoc b/doc/csv/options/parsing/unconverted_fields.rdoc
new file mode 100644
index 0000000000..3e7f839d49
--- /dev/null
+++ b/doc/csv/options/parsing/unconverted_fields.rdoc
@@ -0,0 +1,27 @@
+====== Option +unconverted_fields+
+
+Specifies the boolean that determines whether unconverted field values are to be available.
+
+Default value:
+  CSV::DEFAULT_OPTIONS.fetch(:unconverted_fields) # => nil
+
+The unconverted field values are those found in the source data,
+prior to any conversions performed via option +converters+.
+
+When option +unconverted_fields+ is +true+,
+each returned row (\Array or \CSV::Row) has an added method,
++unconverted_fields+, that returns the unconverted field values:
+  str = <<-EOT
+  foo,0
+  bar,1
+  baz,2
+  EOT
+  # Without unconverted_fields
+  csv = CSV.parse(str, converters: :integer)
+  csv # => [["foo", 0], ["bar", 1], ["baz", 2]]
+  csv.first.respond_to?(:unconverted_fields) # => false
+  # With unconverted_fields
+  csv = CSV.parse(str, converters: :integer, unconverted_fields: true)
+  csv # => [["foo", 0], ["bar", 1], ["baz", 2]]
+  csv.first.respond_to?(:unconverted_fields) # => true
+  csv.first.unconverted_fields # => ["foo", "0"]
diff --git a/doc/csv/recipes/filtering.rdoc b/doc/csv/recipes/filtering.rdoc
new file mode 100644
index 0000000000..470649d09a
--- /dev/null
+++ b/doc/csv/recipes/filtering.rdoc
@@ -0,0 +1,156 @@
+== Recipes for Filtering \CSV
+
+For other recipes, see {Recipes for CSV}[./recipes_rdoc.html].
+
+All code snippets on this page assume that the following has been executed:
+  require 'csv'
+
+=== Contents
+
+- {Source and Output Formats}[#label-Source+and+Output+Formats]
+  - {Filtering String to String}[#label-Filtering+String+to+String]
+    - {Recipe: Filter String to String with Headers}[#label-Recipe-3A+Filter+String+to+String+with+Headers]
+    - {Recipe: Filter String to String Without Headers}[#label-Recipe-3A+Filter+String+to+String+Without+Headers]
+  - {Filtering String to IO Stream}[#label-Filtering+String+to+IO+Stream]
+    - {Recipe: Filter String to IO Stream with Headers}[#label-Recipe-3A+Filter+String+to+IO+Stream+with+Headers]
+    - {Recipe: Filter String to IO Stream Without Headers}[#label-Recipe-3A+Filter+String+to+IO+Stream+Without+Headers]
+  - {Filtering IO Stream to String}[#label-Filtering+IO+Stream+to+String]
+    - {Recipe: Filter IO Stream to String with Headers}[#label-Recipe-3A+Filter+IO+Stream+to+String+with+Headers]
+    - {Recipe: Filter IO Stream to String Without Headers}[#label-Recipe-3A+Filter+IO+Stream+to+String+Without+Headers]
+  - {Filtering IO Stream to IO Stream}[#label-Filtering+IO+Stream+to+IO+Stream]
+    - {Recipe: Filter IO Stream to IO Stream with Headers}[#label-Recipe-3A+Filter+IO+Stream+to+IO+Stream+with+Headers]
+    - {Recipe: Filter IO Stream to IO Stream Without Headers}[#label-Recipe-3A+Filter+IO+Stream+to+IO+Stream+Without+Headers]
+
+=== Source and Output Formats
+
+You can use a Unix-style "filter" for \CSV data.
+The filter reads source \CSV data and writes output \CSV data as modified by the filter.
+The input and output \CSV data may be any mixture of \Strings and \IO streams.
+
+==== Filtering \String to \String
+
+You can filter one \String to another, with or without headers.
+
+===== Recipe: Filter \String to \String with Headers
+
+Use class method CSV.filter with option +headers+ to filter a \String to another \String:
+  in_string = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
+  out_string = ''
+  CSV.filter(in_string, out_string, headers: true) do |row|
+    row[0] = row[0].upcase
+    row[1] *= 4
+  end
+  out_string # => "Name,Value\nFOO,0000\nBAR,1111\nBAZ,2222\n"
+
+===== Recipe: Filter \String to \String Without Headers
+
+Use class method CSV.filter without option +headers+ to filter a \String to another \String:
+  in_string = "foo,0\nbar,1\nbaz,2\n"
+  out_string = ''
+  CSV.filter(in_string, out_string) do |row|
+    row[0] = row[0].upcase
+    row[1] *= 4
+  end
+  out_string # => "FOO,0000\nBAR,1111\nBAZ,2222\n"
+
+==== Filtering \String to \IO Stream
+
+You can filter a \String to an \IO stream, with or without headers.
+
+===== Recipe: Filter \String to \IO Stream with Headers
+
+Use class method CSV.filter with option +headers+ to filter a \String to an \IO stream:
+  in_string = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
+  path = 't.csv'
+  File.open(path, 'w') do |out_io|
+    CSV.filter(in_string, out_io, headers: true) do |row|
+      row[0] = row[0].upcase
+      row[1] *= 4
+    end
+  end
+  p File.read(path) # => "Name,Value\nFOO,0000\nBAR,1111\nBAZ,2222\n"
+
+===== Recipe: Filter \String to \IO Stream Without Headers
+
+Use class method CSV.filter without option +headers+ to filter a \String to an \IO stream:
+  in_string = "foo,0\nbar,1\nbaz,2\n"
+  path = 't.csv'
+  File.open(path, 'w') do |out_io|
+    CSV.filter(in_string, out_io) do |row|
+      row[0] = row[0].upcase
+      row[1] *= 4
+    end
+  end
+  p File.read(path) # => "FOO,0000\nBAR,1111\nBAZ,2222\n"
+
+==== Filtering \IO Stream to \String
+
+You can filter an \IO stream to a \String, with or without headers.
+
+===== Recipe: Filter \IO Stream to \String with Headers
+
+Use class method CSV.filter with option +headers+ to filter an \IO stream to a \String:
+  in_string = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
+  path = 't.csv'
+  File.write(path, in_string)
+  out_string = ''
+  File.open(path, headers: true) do |in_io|
+    CSV.filter(in_io, out_string, headers: true) do |row|
+      row[0] = row[0].upcase
+      row[1] *= 4
+    end
+  end
+  out_string # => "Name,Value\nFOO,0000\nBAR,1111\nBAZ,2222\n"
+
+===== Recipe: Filter \IO Stream to \String Without Headers
+
+Use class method CSV.filter without option +headers+ to filter an \IO stream to a \String:
+  in_string = "foo,0\nbar,1\nbaz,2\n"
+  path = 't.csv'
+  File.write(path, in_string)
+  out_string = ''
+  File.open(path) do |in_io|
+    CSV.filter(in_io, out_string) do |row|
+      row[0] = row[0].upcase
+      row[1] *= 4
+    end
+  end
+  out_string # => "FOO,0000\nBAR,1111\nBAZ,2222\n"
+
+==== Filtering \IO Stream to \IO Stream
+
+You can filter an \IO stream to another \IO stream, with or without headers.
+
+===== Recipe: Filter \IO Stream to \IO Stream with Headers
+
+Use class method CSV.filter with option +headers+ to filter an \IO stream to another \IO stream:
+  in_path = 't.csv'
+  in_string = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
+  File.write(in_path, in_string)
+  out_path = 'u.csv'
+  File.open(in_path) do |in_io|
+    File.open(out_path, 'w') do |out_io|
+      CSV.filter(in_io, out_io, headers: true) do |row|
+        row[0] = row[0].upcase
+        row[1] *= 4
+      end
+    end
+  end
+  p File.read(out_path) # => "Name,Value\nFOO,0000\nBAR,1111\nBAZ,2222\n"
+
+===== Recipe: Filter \IO Stream to \IO Stream Without Headers
+
+Use class method CSV.filter without option +headers+ to filter an \IO stream to another \IO stream:
+  in_path = 't.csv'
+  in_string = "foo,0\nbar,1\nbaz,2\n"
+  File.write(in_path, in_string)
+  out_path = 'u.csv'
+  File.open(in_path) do |in_io|
+    File.open(out_path, 'w') do |out_io|
+      CSV.filter(in_io, out_io) do |row|
+        row[0] = row[0].upcase
+        row[1] *= 4
+      end
+    end
+  end
+  p File.read(out_path) # => "FOO,0000\nBAR,1111\nBAZ,2222\n"
diff --git a/doc/csv/recipes/generating.rdoc b/doc/csv/recipes/generating.rdoc
new file mode 100644
index 0000000000..3ef6df99b4
--- /dev/null
+++ b/doc/csv/recipes/generating.rdoc
@@ -0,0 +1,244 @@
+== Recipes for Generating \CSV
+
+For other recipes, see {Recipes for CSV}[./recipes_rdoc.html].
+
+All code snippets on this page assume that the following has been executed:
+  require 'csv'
+
+=== Contents
+
+- {Output Formats}[#label-Output+Formats]
+  - {Generating to a String}[#label-Generating+to+a+String]
+    - {Recipe: Generate to String with Headers}[#label-Recipe-3A+Generate+to+String+with+Headers]
+    - {Recipe: Generate to String Without Headers}[#label-Recipe-3A+Generate+to+String+Without+Headers]
+  - {Generating to a File}[#label-Generating+to+a+File]
+    - {Recipe: Generate to File with Headers}[#label-Recipe-3A+Generate+to+File+with+Headers]
+    - {Recipe: Generate to File Without Headers}[#label-Recipe-3A+Generate+to+File+Without+Headers]
+  - {Generating to IO an Stream}[#label-Generating+to+an+IO+Stream]
+    - {Recipe: Generate to IO Stream with Headers}[#label-Recipe-3A+Generate+to+IO+Stream+with+Headers]
+    - {Recipe: Generate to IO Stream Without Headers}[#label-Recipe-3A+Generate+to+IO+Stream+Without+Headers]
+- {Converting Fields}[#label-Converting+Fields]
+  - {Recipe: Filter Generated Field Strings}[#label-Recipe-3A+Filter+Generated+Field+Strings]
+  - {Recipe: Specify Multiple Write Converters}[#label-Recipe-3A+Specify+Multiple+Write+Converters]
+- {RFC 4180 Compliance}[#label-RFC+4180+Compliance]
+  - {Row Separator}[#label-Row+Separator]
+    - {Recipe: Generate Compliant Row Separator}[#label-Recipe-3A+Generate+Compliant+Row+Separator]
+    - {Recipe: Generate Non-Compliant Row Separator}[#label-Recipe-3A+Generate+Non-Compliant+Row+Separator]
+  - {Column Separator}[#label-Column+Separator]
+    - {Recipe: Generate Compliant Column Separator}[#label-Recipe-3A+Generate+Compliant+Column+Separator]
+    - {Recipe: Generate Non-Compliant Column Separator}[#label-Recipe-3A+Generate+Non-Compliant+Column+Separator]
+  - {Quote Character}[#label-Quote+Character]
+    - {Recipe: Generate Compliant Quote Character}[#label-Recipe-3A+Generate+Compliant+Quote+Character]
+    - {Recipe: Generate Non-Compliant Quote Character}[#label-Recipe-3A+Generate+Non-Compliant+Quote+Character]
+
+=== Output Formats
+
+You can generate \CSV output to a \String, to a \File (via its path), or to an \IO stream.
+
+==== Generating to a \String
+
+You can generate \CSV output to a \String, with or without headers.
+
+===== Recipe: Generate to \String with Headers
+
+Use class method CSV.generate with option +headers+ to generate to a \String.
+
+This example uses method CSV#<< to append the rows
+that are to be generated:
+  output_string = CSV.generate('', headers: ['Name', 'Value'], write_headers: true) do |csv|
+    csv << ['Foo', 0]
+    csv << ['Bar', 1]
+    csv << ['Baz', 2]
+  end
+  output_string # => "Name,Value\nFoo,0\nBar,1\nBaz,2\n"
+
+===== Recipe: Generate to \String Without Headers
+
+Use class method CSV.generate without option +headers+ to generate to a \String.
+
+This example uses method CSV#<< to append the rows
+that are to be generated:
+  output_string = CSV.generate do |csv|
+    csv << ['Foo', 0]
+    csv << ['Bar', 1]
+    csv << ['Baz', 2]
+  end
+  output_string # => "Foo,0\nBar,1\nBaz,2\n"
+
+==== Generating to a \File
+
+You can generate /CSV data to a \File, with or without headers.
+
+===== Recipe: Generate to \File with Headers
+
+Use class method CSV.open with option +headers+ generate to a \File.
+
+This example uses method CSV#<< to append the rows
+that are to be generated:
+  path = 't.csv'
+  CSV.open(path, 'w', headers: ['Name', 'Value'], write_headers: true) do |csv|
+    csv << ['Foo', 0]
+    csv << ['Bar', 1]
+    csv << ['Baz', 2]
+  end
+  p File.read(path) # => "Name,Value\nFoo,0\nBar,1\nBaz,2\n"
+
+===== Recipe: Generate to \File Without Headers
+
+Use class method CSV.open without option +headers+ to generate to a \File.
+
+This example uses method CSV#<< to append the rows
+that are to be generated:
+  path = 't.csv'
+  CSV.open(path, 'w') do |csv|
+    csv << ['Foo', 0]
+    csv << ['Bar', 1]
+    csv << ['Baz', 2]
+  end
+  p File.read(path) # => "Foo,0\nBar,1\nBaz,2\n"
+
+==== Generating to an \IO Stream
+
+You can generate \CSV data to an \IO stream, with or without headers.
+
+==== Recipe: Generate to \IO Stream with Headers
+
+Use class method CSV.new with option +headers+ to generate \CSV data to an \IO stream:
+  path = 't.csv'
+  File.open(path, 'w') do |file|
+    csv = CSV.new(file, headers: ['Name', 'Value'], write_headers: true)
+    csv << ['Foo', 0]
+    csv << ['Bar', 1]
+    csv << ['Baz', 2]
+  end
+  p File.read(path) # => "Name,Value\nFoo,0\nBar,1\nBaz,2\n"
+
+===== Recipe: Generate to \IO Stream Without Headers
+
+Use class method CSV.new without option +headers+ to generate \CSV data to an \IO stream:
+  path = 't.csv'
+  File.open(path, 'w') do |file|
+    csv = CSV.new(file)
+    csv << ['Foo', 0]
+    csv << ['Bar', 1]
+    csv << ['Baz', 2]
+  end
+  p File.read(path) # => "Foo,0\nBar,1\nBaz,2\n"
+
+=== Converting Fields
+
+You can use _write_ _converters_ to convert fields when generating \CSV.
+
+==== Recipe: Filter Generated Field Strings
+
+Use option <tt>:write_converters</tt> and a custom converter to convert field values when generating \CSV.
+
+This example defines and uses a custom write converter to strip whitespace from generated fields:
+  strip_converter = proc {|field| field.respond_to?(:strip) ? field.strip : field }
+  output_string = CSV.generate(write_converters: strip_converter) do |csv|
+    csv << [' foo ', 0]
+    csv << [' bar ', 1]
+    csv << [' baz ', 2]
+  end
+  output_string # => "foo,0\nbar,1\nbaz,2\n"
+
+==== Recipe: Specify Multiple Write Converters
+
+Use option <tt>:write_converters</tt> and multiple custom coverters
+to convert field values when generating \CSV.
+
+This example defines and uses two custom write converters to strip and upcase generated fields:
+  strip_converter = proc {|field| field.respond_to?(:strip) ? field.strip : field }
+  upcase_converter = proc {|field| field.respond_to?(:upcase) ? field.upcase : field }
+  converters = [strip_converter, upcase_converter]
+  output_string = CSV.generate(write_converters: converters) do |csv|
+    csv << [' foo ', 0]
+    csv << [' bar ', 1]
+    csv << [' baz ', 2]
+  end
+  output_string # => "FOO,0\nBAR,1\nBAZ,2\n"
+
+=== RFC 4180 Compliance
+
+By default, \CSV generates data that is compliant with
+{RFC 4180}[https://tools.ietf.org/html/rfc4180]
+with respect to:
+- Column separator.
+- Quote character.
+
+==== Row Separator
+
+RFC 4180 specifies the row separator CRLF (Ruby <tt>"\r\n"</tt>).
+
+===== Recipe: Generate Compliant Row Separator
+
+For strict compliance, use option +:row_sep+ to specify row separator <tt>"\r\n"</tt>:
+  output_string = CSV.generate('', row_sep: "\r\n") do |csv|
+    csv << ['Foo', 0]
+    csv << ['Bar', 1]
+    csv << ['Baz', 2]
+  end
+  output_string # => "Foo,0\r\nBar,1\r\nBaz,2\r\n"
+
+===== Recipe: Generate Non-Compliant Row Separator
+
+For data with non-compliant row separators, use option +:row_sep+ with a different value:
+This example source uses semicolon (<tt>";'</tt>) as its row separator:
+  output_string = CSV.generate('', row_sep: ";") do |csv|
+    csv << ['Foo', 0]
+    csv << ['Bar', 1]
+    csv << ['Baz', 2]
+  end
+  output_string # => "Foo,0;Bar,1;Baz,2;"
+
+==== Column Separator
+
+RFC 4180 specifies column separator COMMA (Ruby <tt>","</tt>).
+
+===== Recipe: Generate Compliant Column Separator
+
+Because the \CSV default comma separator is <tt>","</tt>,
+you need not specify option +:col_sep+ for compliant data:
+  output_string = CSV.generate('') do |csv|
+    csv << ['Foo', 0]
+    csv << ['Bar', 1]
+    csv << ['Baz', 2]
+  end
+  output_string # => "Foo,0\nBar,1\nBaz,2\n"
+
+===== Recipe: Generate Non-Compliant Column Separator
+
+For data with non-compliant column separators, use option +:col_sep+.
+This example source uses TAB (<tt>"\t"</tt>) as its column separator:
+  output_string = CSV.generate('', col_sep: "\t") do |csv|
+    csv << ['Foo', 0]
+    csv << ['Bar', 1]
+    csv << ['Baz', 2]
+  end
+  output_string # => "Foo\t0\nBar\t1\nBaz\t2\n"
+
+==== Quote Character
+
+RFC 4180 specifies quote character DQUOTE (Ruby <tt>"\""</tt>).
+
+===== Recipe: Generate Compliant Quote Character
+
+Because the \CSV default quote character is <tt>"\""</tt>,
+you need not specify option +:quote_char+ for compliant data:
+  output_string = CSV.generate('', force_quotes: true) do |csv|
+    csv << ['Foo', 0]
+    csv << ['Bar', 1]
+    csv << ['Baz', 2]
+  end
+  output_string # => "\"Foo\",\"0\"\n\"Bar\",\"1\"\n\"Baz\",\"2\"\n"
+
+===== Recipe: Generate Non-Compliant Quote Character
+
+For data with non-compliant quote characters, use option +:quote_char+.
+This example source uses SQUOTE (<tt>"'"</tt>) as its quote character:
+  output_string = CSV.generate('', quote_char: "'", force_quotes: true) do |csv|
+    csv << ['Foo', 0]
+    csv << ['Bar', 1]
+    csv << ['Baz', 2]
+  end
+  output_string # => "'Foo','0'\n'Bar','1'\n'Baz','2'\n"
diff --git a/doc/csv/recipes/parsing.rdoc b/doc/csv/recipes/parsing.rdoc
new file mode 100644
index 0000000000..6312cea5c4
--- /dev/null
+++ b/doc/csv/recipes/parsing.rdoc
@@ -0,0 +1,543 @@
+== Recipes for Parsing \CSV
+
+For other recipes, see {Recipes for CSV}[./recipes_rdoc.html].
+
+All code snippets on this page assume that the following has been executed:
+  require 'csv'
+
+=== Contents
+
+- {Source Formats}[#label-Source+Formats]
+  - {Parsing from a String}[#label-Parsing+from+a+String]
+    - {Recipe: Parse from String with Headers}[#label-Recipe-3A+Parse+from+String+with+Headers]
+    - {Recipe: Parse from String Without Headers}[#label-Recipe-3A+Parse+from+String+Without+Headers]
+  - {Parsing from a File}[#label-Parsing+from+a+File]
+    - {Recipe: Parse from File with Headers}[#label-Recipe-3A+Parse+from+File+with+Headers]
+    - {Recipe: Parse from File Without Headers}[#label-Recipe-3A+Parse+from+File+Without+Headers]
+  - {Parsing from an IO Stream}[#label-Parsing+from+an+IO+Stream]
+    - {Recipe: Parse from IO Stream with Headers}[#label-Recipe-3A+Parse+from+IO+Stream+with+Headers]
+    - {Recipe: Parse from IO Stream Without Headers}[#label-Recipe-3A+Parse+from+IO+Stream+Without+Headers]
+- {RFC 4180 Compliance}[#label-RFC+4180+Compliance]
+  - {Row Separator}[#label-Row+Separator]
+    - {Recipe: Handle Compliant Row Separator}[#label-Recipe-3A+Handle+Compliant+Row+Separator]
+    - {Recipe: Handle Non-Compliant Row Separator}[#label-Recipe-3A+Handle+Non-Compliant+Row+Separator]
+  - {Column Separator}[#label-Column+Separator]
+    - {Recipe: Handle Compliant Column Separator}[#label-Recipe-3A+Handle+Compliant+Column+Separator]
+    - {Recipe: Handle Non-Compliant Column Separator}[#label-Recipe-3A+Handle+Non-Compliant+Column+Separator]
+  - {Quote Character}[#label-Quote+Character]
+    - {Recipe: Handle Compliant Quote Character}[#label-Recipe-3A+Handle+Compliant+Quote+Character]
+    - {Recipe: Handle Non-Compliant Quote Character}[#label-Recipe-3A+Handle+Non-Compliant+Quote+Character]
+  - {Recipe: Allow Liberal Parsing}[#label-Recipe-3A+Allow+Liberal+Parsing]
+- {Special Handling}[#label-Special+Handling]
+  - {Special Line Handling}[#label-Special+Line+Handling]
+    - {Recipe: Ignore Blank Lines}[#label-Recipe-3A+Ignore+Blank+Lines]
+    - {Recipe: Ignore Selected Lines}[#label-Recipe-3A+Ignore+Selected+Lines]
+  - {Special Field Handling}[#label-Special+Field+Handling]
+    - {Recipe: Strip Fields}[#label-Recipe-3A+Strip+Fields]
+    - {Recipe: Handle Null Fields}[#label-Recipe-3A+Handle+Null+Fields]
+    - {Recipe: Handle Empty Fields}[#label-Recipe-3A+Handle+Empty+Fields]
+- {Converting Fields}[#label-Converting+Fields]
+  - {Converting Fields to Objects}[#label-Converting+Fields+to+Objects]
+    - {Recipe: Convert Fields to Integers}[#label-Recipe-3A+Convert+Fields+to+Integers]
+    - {Recipe: Convert Fields to Floats}[#label-Recipe-3A+Convert+Fields+to+Floats]
+    - {Recipe: Convert Fields to Numerics}[#label-Recipe-3A+Convert+Fields+to+Numerics]
+    - {Recipe: Convert Fields to Dates}[#label-Recipe-3A+Convert+Fields+to+Dates]
+    - {Recipe: Convert Fields to DateTimes}[#label-Recipe-3A+Convert+Fields+to+DateTimes]
+    - {Recipe: Convert Assorted Fields to Objects}[#label-Recipe-3A+Convert+Assorted+Fields+to+Objects]
+    - {Recipe: Convert Fields to Other Objects}[#label-Recipe-3A+Convert+Fields+to+Other+Objects]
+  - {Recipe: Filter Field Strings}[#label-Recipe-3A+Filter+Field+Strings]
+  - {Recipe: Register Field Converters}[#label-Recipe-3A+Register+Field+Converters]
+  - {Using Multiple Field Converters}[#label-Using+Multiple+Field+Converters]
+    - {Recipe: Specify Multiple Field Converters in Option :converters}[#label-Recipe-3A+Specify+Multiple+Field+Converters+in+Option+-3Aconverters]
+    - {Recipe: Specify Multiple Field Converters in a Custom Converter List}[#label-Recipe-3A+Specify+Multiple+Field+Converters+in+a+Custom+Converter+List]
+- {Converting Headers}[#label-Converting+Headers]
+  - {Recipe: Convert Headers to Lowercase}[#label-Recipe-3A+Convert+Headers+to+Lowercase]
+  - {Recipe: Convert Headers to Symbols}[#label-Recipe-3A+Convert+Headers+to+Symbols]
+  - {Recipe: Filter Header Strings}[#label-Recipe-3A+Filter+Header+Strings]
+  - {Recipe: Register Header Converters}[#label-Recipe-3A+Register+Header+Converters]
+  - {Using Multiple Header Converters}[#label-Using+Multiple+Header+Converters]
+    - {Recipe: Specify Multiple Header Converters in Option :header_converters}[#label-Recipe-3A+Specify+Multiple+Header+Converters+in+Option+-3Aheader_converters]
+    - {Recipe: Specify Multiple Header Converters in a Custom Header Converter List}[#label-Recipe-3A+Specify+Multiple+Header+Converters+in+a+Custom+Header+Converter+List]
+- {Diagnostics}[#label-Diagnostics]
+  - {Recipe: Capture Unconverted Fields}[#label-Recipe-3A+Capture+Unconverted+Fields]
+  - {Recipe: Capture Field Info}[#label-Recipe-3A+Capture+Field+Info]
+
+=== Source Formats
+
+You can parse \CSV data from a \String, from a \File (via its path), or from an \IO stream.
+
+==== Parsing from a \String
+
+You can parse \CSV data from a \String, with or without headers.
+
+===== Recipe: Parse from \String with Headers
+
+Use class method CSV.parse with option +headers+ to read a source \String all at once
+(may have memory resource implications):
+  string = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
+  CSV.parse(string, headers: true) # => #<CSV::Table mode:col_or_row row_count:4>
+
+Use instance method CSV#each with option +headers+ to read a source \String one row at a time:
+  CSV.new(string, headers: true).each do |row|
+    p row
+  end
+Output:
+  #<CSV::Row "Name":"foo" "Value":"0">
+  #<CSV::Row "Name":"bar" "Value":"1">
+  #<CSV::Row "Name":"baz" "Value":"2">
+
+===== Recipe: Parse from \String Without Headers
+
+Use class method CSV.parse without option +headers+ to read a source \String all at once
+(may have memory resource implications):
+  string = "foo,0\nbar,1\nbaz,2\n"
+  CSV.parse(string) # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
+
+Use instance method CSV#each without option +headers+ to read a source \String one row at a time:
+  CSV.new(string).each do |row|
+    p row
+  end
+Output:
+  ["foo", "0"]
+  ["bar", "1"]
+  ["baz", "2"]
+
+==== Parsing from a \File
+
+You can parse \CSV data from a \File, with or without headers.
+
+===== Recipe: Parse from \File with Headers
+
+Use instance method CSV#read with option +headers+ to read a file all at once:
+  string = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
+  path = 't.csv'
+  File.write(path, string)
+  CSV.read(path, headers: true) # => #<CSV::Table mode:col_or_row row_count:4>
+
+Use class method CSV.foreach with option +headers+ to read one row at a time:
+  CSV.foreach(path, headers: true) do |row|
+    p row
+  end
+Output:
+  #<CSV::Row "Name":"foo" "Value":"0">
+  #<CSV::Row "Name":"bar" "Value":"1">
+  #<CSV::Row "Name":"baz" "Value":"2">
+
+===== Recipe: Parse from \File Without Headers
+
+Use class method CSV.read without option +headers+ to read a file all at once:
+  string = "foo,0\nbar,1\nbaz,2\n"
+  path = 't.csv'
+  File.write(path, string)
+  CSV.read(path) # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
+
+Use class method CSV.foreach without option +headers+ to read one row at a time:
+  CSV.foreach(path) do |row|
+    p row
+  end
+Output:
+  ["foo", "0"]
+  ["bar", "1"]
+  ["baz", "2"]
+
+==== Parsing from an \IO Stream
+
+You can parse \CSV data from an \IO stream, with or without headers.
+
+===== Recipe: Parse from \IO Stream with Headers
+
+Use class method CSV.parse with option +headers+ to read an \IO stream all at once:
+  string = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
+  path = 't.csv'
+  File.write(path, string)
+  File.open(path) do |file|
+    CSV.parse(file, headers: true)
+  end # => #<CSV::Table mode:col_or_row row_count:4>
+
+Use class method CSV.foreach with option +headers+ to read one row at a time:
+  File.open(path) do |file|
+    CSV.foreach(file, headers: true) do |row|
+      p row
+    end
+  end
+Output:
+  #<CSV::Row "Name":"foo" "Value":"0">
+  #<CSV::Row "Name":"bar" "Value":"1">
+  #<CSV::Row "Name":"baz" "Value":"2">
+
+===== Recipe: Parse from \IO Stream Without Headers
+
+Use class method CSV.parse without option +headers+ to read an \IO stream all at once:
+  string = "foo,0\nbar,1\nbaz,2\n"
+  path = 't.csv'
+  File.write(path, string)
+  File.open(path) do |file|
+    CSV.parse(file)
+  end # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
+
+Use class method CSV.foreach without option +headers+ to read one row at a time:
+  File.open(path) do |file|
+    CSV.foreach(file) do |row|
+      p row
+    end
+  end
+Output:
+  ["foo", "0"]
+  ["bar", "1"]
+  ["baz", "2"]
+
+=== RFC 4180 Compliance
+
+By default, \CSV parses data that is compliant with
+{RFC 4180}[https://tools.ietf.org/html/rfc4180]
+with respect to:
+- Row separator.
+- Column separator.
+- Quote character.
+
+==== Row Separator
+
+RFC 4180 specifies the row separator CRLF (Ruby <tt>"\r\n"</tt>).
+
+Although the \CSV default row separator is <tt>"\n"</tt>,
+the parser also by default handles row separator <tt>"\r"</tt> and the RFC-compliant <tt>"\r\n"</tt>.
+
+===== Recipe: Handle Compliant Row Separator
+
+For strict compliance, use option +:row_sep+ to specify row separator <tt>"\r\n"</tt>,
+which allows the compliant row separator:
+  source = "foo,1\r\nbar,1\r\nbaz,2\r\n"
+  CSV.parse(source, row_sep: "\r\n") # => [["foo", "1"], ["bar", "1"], ["baz", "2"]]
+But rejects other row separators:
+  source = "foo,1\nbar,1\nbaz,2\n"
+  CSV.parse(source, row_sep: "\r\n") # Raised MalformedCSVError
+  source = "foo,1\rbar,1\rbaz,2\r"
+  CSV.parse(source, row_sep: "\r\n") # Raised MalformedCSVError
+  source = "foo,1\n\rbar,1\n\rbaz,2\n\r"
+  CSV.parse(source, row_sep: "\r\n") # Raised MalformedCSVError
+
+===== Recipe: Handle Non-Compliant Row Separator
+
+For data with non-compliant row separators, use option +:row_sep+.
+This example source uses semicolon (<tt>";"</tt>) as its row separator:
+  source = "foo,1;bar,1;baz,2;"
+  CSV.parse(source, row_sep: ';') # => [["foo", "1"], ["bar", "1"], ["baz", "2"]]
+
+==== Column Separator
+
+RFC 4180 specifies column separator COMMA (Ruby <tt>","</tt>).
+
+===== Recipe: Handle Compliant Column Separator
+
+Because the \CSV default comma separator is ',',
+you need not specify option +:col_sep+ for compliant data:
+  source = "foo,1\nbar,1\nbaz,2\n"
+  CSV.parse(source) # => [["foo", "1"], ["bar", "1"], ["baz", "2"]]
+
+===== Recipe: Handle Non-Compliant Column Separator
+
+For data with non-compliant column separators, use option +:col_sep+.
+This example source uses TAB (<tt>"\t"</tt>) as its column separator:
+  source = "foo,1\tbar,1\tbaz,2"
+  CSV.parse(source, col_sep: "\t") # => [["foo", "1"], ["bar", "1"], ["baz", "2"]]
+
+==== Quote Character
+
+RFC 4180 specifies quote character DQUOTE (Ruby <tt>"\""</tt>).
+
+===== Recipe: Handle Compliant Quote Character
+
+Because the \CSV default quote character is <tt>"\""</tt>,
+you need not specify option +:quote_char+ for compliant data:
+  source = "\"foo\",\"1\"\n\"bar\",\"1\"\n\"baz\",\"2\"\n"
+  CSV.parse(source) # => [["foo", "1"], ["bar", "1"], ["baz", "2"]]
+
+===== Recipe: Handle Non-Compliant Quote Character
+
+For data with non-compliant quote characters, use option +:quote_char+.
+This example source uses SQUOTE (<tt>"'"</tt>) as its quote character:
+  source = "'foo','1'\n'bar','1'\n'baz','2'\n"
+  CSV.parse(source, quote_char: "'") # => [["foo", "1"], ["bar", "1"], ["baz", "2"]]
+
+==== Recipe: Allow Liberal Parsing
+
+Use option +:liberal_parsing+ to specify that \CSV should
+attempt to parse input not conformant with RFC 4180, such as double quotes in unquoted fields:
+  source = 'is,this "three, or four",fields'
+  CSV.parse(source) # Raises MalformedCSVError
+  CSV.parse(source, liberal_parsing: true) # => [["is", "this \"three", " or four\"", "fields"]]
+
+=== Special Handling
+
+You can use parsing options to specify special handling for certain lines and fields.
+
+==== Special Line Handling
+
+Use parsing options to specify special handling for blank lines, or for other selected lines.
+
+===== Recipe: Ignore Blank Lines
+
+Use option +:skip_blanks+ to ignore blank lines:
+  source = <<-EOT
+  foo,0
+
+  bar,1
+  baz,2
+
+  ,
+  EOT
+  parsed = CSV.parse(source, skip_blanks: true)
+  parsed # => [["foo", "0"], ["bar", "1"], ["baz", "2"], [nil, nil]]
+
+===== Recipe: Ignore Selected Lines
+
+Use option +:skip_lines+ to ignore selected lines.
+  source = <<-EOT
+  # Comment
+  foo,0
+  bar,1
+  baz,2
+  # Another comment
+  EOT
+  parsed = CSV.parse(source, skip_lines: /^#/)
+  parsed # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
+
+==== Special Field Handling
+
+Use parsing options to specify special handling for certain field values.
+
+===== Recipe: Strip Fields
+
+Use option +:strip+ to strip parsed field values:
+  CSV.parse_line(' a , b ', strip: true) # => ["a", "b"]
+
+===== Recipe: Handle Null Fields
+
+Use option +:nil_value+ to specify a value that will replace each field
+that is null (no text):
+  CSV.parse_line('a,,b,,c', nil_value: 0) # => ["a", 0, "b", 0, "c"]
+
+===== Recipe: Handle Empty Fields
+
+Use option +:empty_value+ to specify a value that will replace each field
+that is empty (\String of length 0);
+  CSV.parse_line('a,"",b,"",c', empty_value: 'x') # => ["a", "x", "b", "x", "c"]
+
+=== Converting Fields
+
+You can use field converters to change parsed \String fields into other objects,
+or to otherwise modify the \String fields.
+
+==== Converting Fields to Objects
+
+Use field converters to change parsed \String objects into other, more specific, objects.
+
+There are built-in field converters for converting to objects of certain classes:
+- \Float
+- \Integer
+- \Date
+- \DateTime
+
+Other built-in field converters include:
+- +:numeric+: converts to \Integer and \Float.
+- +:all+: converts to \DateTime, \Integer, \Float.
+
+You can also define field converters to convert to objects of other classes.
+
+===== Recipe: Convert Fields to Integers
+
+Convert fields to \Integer objects using built-in converter +:integer+:
+  source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
+  parsed = CSV.parse(source, headers: true, converters: :integer)
+  parsed.map {|row| row['Value'].class} # => [Integer, Integer, Integer]
+
+===== Recipe: Convert Fields to Floats
+
+Convert fields to \Float objects using built-in converter +:float+:
+  source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
+  parsed = CSV.parse(source, headers: true, converters: :float)
+  parsed.map {|row| row['Value'].class} # => [Float, Float, Float]
+
+===== Recipe: Convert Fields to Numerics
+
+Convert fields to \Integer and \Float objects using built-in converter +:numeric+:
+  source = "Name,Value\nfoo,0\nbar,1.1\nbaz,2.2\n"
+  parsed = CSV.parse(source, headers: true, converters: :numeric)
+  parsed.map {|row| row['Value'].class} # => [Integer, Float, Float]
+
+===== Recipe: Convert Fields to Dates
+
+Convert fields to \Date objects using built-in converter +:date+:
+  source = "Name,Date\nfoo,2001-02-03\nbar,2001-02-04\nbaz,2001-02-03\n"
+  parsed = CSV.parse(source, headers: true, converters: :date)
+  parsed.map {|row| row['Date'].class} # => [Date, Date, Date]
+
+===== Recipe: Convert Fields to DateTimes
+
+Convert fields to \DateTime objects using built-in converter +:date_time+:
+  source = "Name,DateTime\nfoo,2001-02-03\nbar,2001-02-04\nbaz,2020-05-07T14:59:00-05:00\n"
+  parsed = CSV.parse(source, headers: true, converters: :date_time)
+  parsed.map {|row| row['DateTime'].class} # => [DateTime, DateTime, DateTime]
+
+===== Recipe: Convert Assorted Fields to Objects
+
+Convert assorted fields to objects using built-in converter +:all+:
+  source = "Type,Value\nInteger,0\nFloat,1.0\nDateTime,2001-02-04\n"
+  parsed = CSV.parse(source, headers: true, converters: :all)
+  parsed.map {|row| row['Value'].class} # => [Integer, Float, DateTime]
+
+===== Recipe: Convert Fields to Other Objects
+
+Define a custom field converter to convert \String fields into other objects.
+This example defines and uses a custom field converter
+that converts each column-1 value to a \Rational object:
+  rational_converter = proc do |field, field_context|
+    field_context.index == 1 ? field.to_r : field
+  end
+  source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
+  parsed = CSV.parse(source, headers: true, converters: rational_converter)
+  parsed.map {|row| row['Value'].class} # => [Rational, Rational, Rational]
+
+==== Recipe: Filter Field Strings
+
+Define a custom field converter to modify \String fields.
+This example defines and uses a custom field converter
+that strips whitespace from each field value:
+  strip_converter = proc {|field| field.strip }
+  source = "Name,Value\n foo , 0 \n bar , 1 \n baz , 2 \n"
+  parsed = CSV.parse(source, headers: true, converters: strip_converter)
+  parsed['Name'] # => ["foo", "bar", "baz"]
+  parsed['Value'] # => ["0", "1", "2"]
+
+==== Recipe: Register Field Converters
+
+Register a custom field converter, assigning it a name;
+then refer to the converter by its name:
+  rational_converter = proc do |field, field_context|
+    field_context.index == 1 ? field.to_r : field
+  end
+  CSV::Converters[:rational] = rational_converter
+  source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
+  parsed = CSV.parse(source, headers: true, converters: :rational)
+  parsed['Value'] # => [(0/1), (1/1), (2/1)]
+
+==== Using Multiple Field Converters
+
+You can use multiple field converters in either of these ways:
+- Specify converters in option +:converters+.
+- Specify converters in a custom converter list.
+
+===== Recipe: Specify Multiple Field Converters in Option +:converters+
+
+Apply multiple field converters by specifying them in option +:conveters+:
+  source = "Name,Value\nfoo,0\nbar,1.0\nbaz,2.0\n"
+  parsed = CSV.parse(source, headers: true, converters: [:integer, :float])
+  parsed['Value'] # => [0, 1.0, 2.0]
+
+===== Recipe: Specify Multiple Field Converters in a Custom Converter List
+
+Apply multiple field converters by defining and registering a custom converter list:
+  strip_converter = proc {|field| field.strip }
+  CSV::Converters[:strip] = strip_converter
+  CSV::Converters[:my_converters] = [:integer, :float, :strip]
+  source = "Name,Value\n foo , 0 \n bar , 1.0 \n baz , 2.0 \n"
+  parsed = CSV.parse(source, headers: true, converters: :my_converters)
+  parsed['Name'] # => ["foo", "bar", "baz"]
+  parsed['Value'] # => [0, 1.0, 2.0]
+
+=== Converting Headers
+
+You can use header converters to modify parsed \String headers.
+
+Built-in header converters include:
+- +:symbol+: converts \String header to \Symbol.
+- +:downcase+: converts \String header to lowercase.
+
+You can also define header converters to otherwise modify header \Strings.
+
+==== Recipe: Convert Headers to Lowercase
+
+Convert headers to lowercase using built-in converter +:downcase+:
+  source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
+  parsed = CSV.parse(source, headers: true, header_converters: :downcase)
+  parsed.headers # => ["name", "value"]
+
+==== Recipe: Convert Headers to Symbols
+
+Convert headers to downcased Symbols using built-in converter +:symbol+:
+  source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
+  parsed = CSV.parse(source, headers: true, header_converters: :symbol)
+  parsed.headers # => [:name, :value]
+  parsed.headers.map {|header| header.class} # => [Symbol, Symbol]
+
+==== Recipe: Filter Header Strings
+
+Define a custom header converter to modify \String fields.
+This example defines and uses a custom header converter
+that capitalizes each header \String:
+  capitalize_converter = proc {|header| header.capitalize }
+  source = "NAME,VALUE\nfoo,0\nbar,1\nbaz,2\n"
+  parsed = CSV.parse(source, headers: true, header_converters: capitalize_converter)
+  parsed.headers # => ["Name", "Value"]
+
+==== Recipe: Register Header Converters
+
+Register a custom header converter, assigning it a name;
+then refer to the converter by its name:
+  capitalize_converter = proc {|header| header.capitalize }
+  CSV::HeaderConverters[:capitalize] = capitalize_converter
+  source = "NAME,VALUE\nfoo,0\nbar,1\nbaz,2\n"
+  parsed = CSV.parse(source, headers: true, header_converters: :capitalize)
+  parsed.headers # => ["Name", "Value"]
+
+==== Using Multiple Header Converters
+
+You can use multiple header converters in either of these ways:
+- Specify header converters in option +:header_converters+.
+- Specify header converters in a custom header converter list.
+
+===== Recipe: Specify Multiple Header Converters in Option :header_converters
+
+Apply multiple header converters by specifying them in option +:header_conveters+:
+  source = "Name,Value\nfoo,0\nbar,1.0\nbaz,2.0\n"
+  parsed = CSV.parse(source, headers: true, header_converters: [:downcase, :symbol])
+  parsed.headers # => [:name, :value]
+
+===== Recipe: Specify Multiple Header Converters in a Custom Header Converter List
+
+Apply multiple header converters by defining and registering a custom header converter list:
+  CSV::HeaderConverters[:my_header_converters] = [:symbol, :downcase]
+  source = "NAME,VALUE\nfoo,0\nbar,1.0\nbaz,2.0\n"
+  parsed = CSV.parse(source, headers: true, header_converters: :my_header_converters)
+  parsed.headers # => [:name, :value]
+
+=== Diagnostics
+
+==== Recipe: Capture Unconverted Fields
+
+To capture unconverted field values, use option +:unconverted_fields+:
+  source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
+  parsed = CSV.parse(source, converters: :integer, unconverted_fields: true)
+  parsed # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
+  parsed.each {|row| p row.unconverted_fields }
+Output:
+  ["Name", "Value"]
+  ["foo", "0"]
+  ["bar", "1"]
+  ["baz", "2"]
+
+==== Recipe: Capture Field Info
+
+To capture field info in a custom converter, accept two block arguments.
+The first is the field value; the second is a +CSV::FieldInfo+ object:
+  strip_converter = proc {|field, field_info| p field_info; field.strip }
+  source = " foo , 0 \n bar , 1 \n baz , 2 \n"
+  parsed = CSV.parse(source, converters: strip_converter)
+  parsed # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
+Output:
+  #<struct CSV::FieldInfo index=0, line=1, header=nil>
+  #<struct CSV::FieldInfo index=1, line=1, header=nil>
+  #<struct CSV::FieldInfo index=0, line=2, header=nil>
+  #<struct CSV::FieldInfo index=1, line=2, header=nil>
+  #<struct CSV::FieldInfo index=0, line=3, header=nil>
+  #<struct CSV::FieldInfo index=1, line=3, header=nil>
diff --git a/doc/csv/recipes/recipes.rdoc b/doc/csv/recipes/recipes.rdoc
new file mode 100644
index 0000000000..9e4eaa1da4
--- /dev/null
+++ b/doc/csv/recipes/recipes.rdoc
@@ -0,0 +1,6 @@
+== Recipes for \CSV
+
+See:
+- {Recipes for Parsing CSV}[./parsing_rdoc.html]
+- {Recipes for Generating CSV}[./generating_rdoc.html]
+- {Recipes for Filtering CSV}[./filtering_rdoc.html]
diff --git a/doc/dig_methods.rdoc b/doc/dig_methods.rdoc
new file mode 100644
index 0000000000..366275d451
--- /dev/null
+++ b/doc/dig_methods.rdoc
@@ -0,0 +1,82 @@
+= Dig Methods
+
+Ruby's +dig+ methods are useful for accessing nested data structures.
+
+Consider this data:
+    item = {
+      id: "0001",
+      type: "donut",
+      name: "Cake",
+      ppu: 0.55,
+      batters: {
+        batter: [
+          {id: "1001", type: "Regular"},
+          {id: "1002", type: "Chocolate"},
+          {id: "1003", type: "Blueberry"},
+          {id: "1004", type: "Devil's Food"}
+        ]
+      },
+      topping: [
+        {id: "5001", type: "None"},
+        {id: "5002", type: "Glazed"},
+        {id: "5005", type: "Sugar"},
+        {id: "5007", type: "Powdered Sugar"},
+        {id: "5006", type: "Chocolate with Sprinkles"},
+        {id: "5003", type: "Chocolate"},
+        {id: "5004", type: "Maple"}
+      ]
+    }
+
+Without a +dig+ method, you can write:
+    item[:batters][:batter][1][:type] # => "Chocolate"
+
+With a +dig+ method, you can write:
+    item.dig(:batters, :batter, 1, :type) # => "Chocolate"
+
+Without a +dig+ method, you can write, erroneously
+(raises <tt>NoMethodError (undefined method `[]' for nil:NilClass)</tt>):
+    item[:batters][:BATTER][1][:type]
+
+With a +dig+ method, you can write (still erroneously, but avoiding the exception):
+    item.dig(:batters, :BATTER, 1, :type) # => nil
+
+== Why Is +dig+ Better?
+
+- It has fewer syntactical elements (to get wrong).
+- It reads better.
+- It does not raise an exception if an item is not found.
+
+== How Does +dig+ Work?
+
+The call sequence is:
+  obj.dig(*identifiers)
+
+The +identifiers+ define a "path" into the nested data structures:
+- For each identifier in +identifiers+, calls method \#dig on a receiver
+  with that identifier.
+- The first receiver is +self+.
+- Each successive receiver is the value returned by the previous call to +dig+.
+- The value finally returned is the value returned by the last call to +dig+.
+
+A +dig+ method raises an exception if any receiver does not respond to \#dig:
+  h = { foo: 1 }
+  # Raises TypeError (Integer does not have #dig method):
+  h.dig(:foo, :bar)
+
+== What Else?
+
+The structure above has \Hash objects and \Array objects,
+both of which have instance method +dig+.
+
+Altogether there are six built-in Ruby classes that have method +dig+,
+three in the core classes and three in the standard library.
+
+In the core:
+- Array#dig: the first argument is an \Integer index.
+- Hash#dig: the first argument is a key.
+- Struct#dig: the first argument is a key.
+
+In the standard library:
+- OpenStruct#dig: the first argument is a \String name.
+- CSV::Table#dig: the first argument is an \Integer index or a \String header.
+- CSV::Row#dig: the first argument is an \Integer index or a \String header.
diff --git a/doc/dtrace_probes.rdoc b/doc/dtrace_probes.rdoc
index d2cdd56902..1b20597ab4 100644
--- a/doc/dtrace_probes.rdoc
+++ b/doc/dtrace_probes.rdoc
@@ -52,15 +52,21 @@ with when they are fired and the arguments they take:
 [ruby:::method-entry(classname, methodname, filename, lineno);]
   This probe is fired just before a method is entered.
 
-    classname name of the class (a string)
-    methodname name of the method about to be executed (a string)
-    filename the file name where the method is _being called_ (a string)
-    lineno the line number where the method is _being called_ (an int)
+  classname::    name of the class (a string)
+  methodname::   name of the method about to be executed (a string)
+  filename::     the file name where the method is _being called_ (a string)
+  lineno::       the line number where the method is _being called_ (an int)
+
+  *NOTE*: will only be fired if tracing is enabled, e.g. with: <code>TracePoint.new{}.enable</code>.
+  See Feature#14104[https://bugs.ruby-lang.org/issues/14104] for more details.
 
 [ruby:::method-return(classname, methodname, filename, lineno);]
   This probe is fired just after a method has returned. The arguments are the
   same as "ruby:::method-entry".
 
+  *NOTE*: will only be fired if tracing is enabled, e.g. with: <code>TracePoint.new{}.enable</code>.
+  See Feature#14104[https://bugs.ruby-lang.org/issues/14104] for more details.
+
 [ruby:::cmethod-entry(classname, methodname, filename, lineno);]
   This probe is fired just before a C method is entered. The arguments are the
   same as "ruby:::method-entry".
@@ -72,9 +78,9 @@ with when they are fired and the arguments they take:
 [ruby:::require-entry(requiredfile, filename, lineno);]
   This probe is fired on calls to rb_require_safe (when a file is required).
 
-    requiredfile is the name of the file to be required (string).
-    filename is the file that called "require" (string).
-    lineno is the line number where the call to require was made (int).
+  requiredfile:: the name of the file to be required (string).
+  filename::     the file that called "+require+" (string).
+  lineno::       the line number where the call to require was made (int).
 
 [ruby:::require-return(requiredfile, filename, lineno);]
   This probe is fired just before rb_require_safe (when a file is required)
@@ -84,11 +90,11 @@ with when they are fired and the arguments they take:
 [ruby:::find-require-entry(requiredfile, filename, lineno);]
   This probe is fired right before search_required is called. search_required
   determines whether the file has already been required by searching loaded
-  features ($"), and if not, figures out which file must be loaded.
+  features (<code>$"</code>), and if not, figures out which file must be loaded.
 
-    requiredfile is the file to be required (string).
-    filename is the file that called "require" (string).
-    lineno is the line number where the call to require was made (int).
+  requiredfile:: the file to be required (string).
+  filename::     the file that called "require" (string).
+  lineno::       the line number where the call to require was made (int).
 
 [ruby:::find-require-return(requiredfile, filename, lineno);]
   This probe is fired right after search_required returns. See the
@@ -106,56 +112,56 @@ with when they are fired and the arguments they take:
 [ruby:::raise(classname, filename, lineno);]
   This probe is fired when an exception is raised.
 
-    classname is the class name of the raised exception (string)
-    filename the name of the file where the exception was raised (string)
-    lineno the line number in the file where the exception was raised (int)
+  classname::    the class name of the raised exception (string)
+  filename::     the name of the file where the exception was raised (string)
+  lineno::       the line number in the file where the exception was raised (int)
 
 [ruby:::object-create(classname, filename, lineno);]
   This probe is fired when an object is about to be allocated.
 
-    classname the class of the allocated object (string)
-    filename the name of the file where the object is allocated (string)
-    lineno the line number in the file where the object is allocated (int)
+  classname::    the class of the allocated object (string)
+  filename::     the name of the file where the object is allocated (string)
+  lineno::       the line number in the file where the object is allocated (int)
 
 [ruby:::array-create(length, filename, lineno);]
   This probe is fired when an Array is about to be allocated.
 
-    length the size of the array (long)
-    filename the name of the file where the array is allocated (string)
-    lineno the line number in the file where the array is allocated (int)
+  length::       the size of the array (long)
+  filename::     the name of the file where the array is allocated (string)
+  lineno::       the line number in the file where the array is allocated (int)
 
 [ruby:::hash-create(length, filename, lineno);]
   This probe is fired when a Hash is about to be allocated.
 
-    length the size of the hash (long)
-    filename the name of the file where the hash is allocated (string)
-    lineno the line number in the file where the hash is allocated (int)
+  length::       the size of the hash (long)
+  filename::     the name of the file where the hash is allocated (string)
+  lineno::       the line number in the file where the hash is allocated (int)
 
 [ruby:::string-create(length, filename, lineno);]
   This probe is fired when a String is about to be allocated.
 
-    length the size of the string (long)
-    filename the name of the file where the string is allocated (string)
-    lineno the line number in the file where the string is allocated (int)
+  length::       the size of the string (long)
+  filename::     the name of the file where the string is allocated (string)
+  lineno::       the line number in the file where the string is allocated (int)
 
 [ruby:::symbol-create(str, filename, lineno);]
   This probe is fired when a Symbol is about to be allocated.
 
-    str the contents of the symbol (string)
-    filename the name of the file where the string is allocated (string)
-    lineno the line number in the file where the string is allocated (int)
+  str::          the contents of the symbol (string)
+  filename::     the name of the file where the string is allocated (string)
+  lineno::       the line number in the file where the string is allocated (int)
 
 [ruby:::parse-begin(sourcefile, lineno);]
   Fired just before parsing and compiling a source file.
 
-    sourcefile the file being parsed (string)
-    lineno the line number where the source starts (int)
+  sourcefile::   the file being parsed (string)
+  lineno::       the line number where the source starts (int)
 
 [ruby:::parse-end(sourcefile, lineno);]
   Fired just after parsing and compiling a source file.
 
-    sourcefile the file being parsed (string)
-    lineno the line number where the source ended (int)
+  sourcefile::   the file being parsed (string)
+  lineno::       the line number where the source ended (int)
 
 [ruby:::gc-mark-begin();]
   Fired at the beginning of a mark phase.
@@ -172,7 +178,7 @@ with when they are fired and the arguments they take:
 [ruby:::method-cache-clear(class, sourcefile, lineno);]
   Fired when the method cache is cleared.
 
-    class is the classname being cleared, or "global" (string)
-    sourcefile the file being parsed (string)
-    lineno the line number where the source ended (int)
+  class::        the classname being cleared, or "global" (string)
+  sourcefile::   the file being parsed (string)
+  lineno::       the line number where the source ended (int)
 
diff --git a/doc/etc.rd.ja b/doc/etc.rd.ja
deleted file mode 100644
index b4ff6ed04e..0000000000
--- a/doc/etc.rd.ja
+++ /dev/null
@@ -1,75 +0,0 @@
-# etc.rd.ja -  -*- mode: rd; coding: utf-8; -*- created at: Fri Jul 14 00:47:15 JST 1995
-=begin
-
-= Etc(モジュール)
-
-実行しているOSからの情報を得るためのモジュール．クラスにインクルード
-して使うこともできる．
-
-== Module Function
-
---- getlogin
-
-	自分のlogin名を返す．これが失敗した場合はgetpwuid()を用いると
-	良い．
-
---- getpwnam(name)
-
-	/etc/passwdファイル(あるいはDBMファイルやNISデータベース)を検
-	索し，nameの名前を持つpasswdエントリを返す．戻り値はpasswd構造
-	体で以下のメンバを持つ．
-
-	  struct passwd
-	    name 	# ユーザ名(文字列)
-	    passwd	# パスワード(文字列)
-	    uid		# ユーザID(整数)
-	    gid		# グループID(整数)
-	    gecos	# gecosフィールド(文字列)
-	    dir		# ホームディレクトリ(文字列)
-	    shell	# ログインシェル(文字列)
-	    # 以降のメンバはシステムによっては提供されない．
-	    change	# パスワード変更時間(整数)
-	    quota	# クォータ(整数)
-	    age		# エージ(整数)
-	    class	# ユーザアクセスクラス(文字列)
-	    comment	# コメント(文字列)
-	    expire	# アカウント有効期限(整数)
-	  end
-
-	詳細はgetpwnam(3)を参照のこと．
-
---- getpwuid([uid])
-
-	uidをユーザIDとするpasswdエントリを返す．戻り値はgetpwnam()と
-	同様である．引数を省略した場合にはgetuid()の値を用いる．詳細は
-	getpwuid(3)を参照のこと．
-
---- getgrgid(gid)
-
-	/etc/groupファイル(あるいは…getpwnam参照)を検索し，gidをグルー
-	プIDとするグループエントリを返す．戻り値はgroup構造体で以下の
-	メンバを持つ．
-
-	  struct group
-	    name 	# グループ名(文字列)
-	    passwd	# グループのパスワード(文字列)
-	    gid		# グループID(整数)
-	    mem		# グループメンバ名の配列
-	  end
-
-	詳細はgetgrgid(3)を参照のこと．
-
---- getgrnam(name)
-
-	nameという名前のグループエントリを返す．戻り値はgetgrgid()と同
-	様である．詳細はgetgrnam(3)を参照．
-
---- group
-
-	全てのグループエントリを順にアクセスするためのイテレータ．
-
---- passwd
-
-	全てのpasswdエントリを順にアクセスするためのイテレータ．
-
-=end
diff --git a/doc/extension.ja.rdoc b/doc/extension.ja.rdoc
index 6b3876e9c8..fe483e50d3 100644
--- a/doc/extension.ja.rdoc
+++ b/doc/extension.ja.rdoc
@@ -1,8 +1,10 @@
-# README.EXT.ja -  -*- RDoc -*- created at: Mon Aug  7 16:45:54 JST 1995
+# extension.ja.rdoc -  -*- RDoc -*- created at: Mon Aug  7 16:45:54 JST 1995
+
+= Rubyの拡張ライブラリの作り方
 
 Rubyの拡張ライブラリの作り方を説明します．
 
-= 基礎知識
+== 基礎知識
 
 Cの変数には型があり，データには型がありません．ですから，た
 とえばポインタをintの変数に代入すると，その値は整数として取
@@ -23,7 +25,7 @@ VALUEからCにとって意味のあるデータを取り出すためには
 の両方が必要です．(1)を忘れると間違ったデータの変換が行われ
 て，最悪プログラムがcore dumpします．
 
-== データタイプ
+=== データタイプ
 
 Rubyにはユーザが使う可能性のある以下のタイプがあります．
 
@@ -57,7 +59,7 @@ T_SYMBOL   :: シンボル
 
 ほとんどのタイプはCの構造体で実装されています．
 
-== VALUEのデータタイプをチェックする
+=== VALUEのデータタイプをチェックする
 
 ruby.hではTYPE()というマクロが定義されていて，VALUEのデータ
 タイプを知ることが出来ます．TYPE()マクロは上で紹介したT_XXXX
@@ -94,7 +96,7 @@ FIXNUMとNILに関してはより高速な判別マクロが用意されてい�
   FIXNUM_P(obj)
   NIL_P(obj)
 
-== VALUEをCのデータに変換する
+=== VALUEをCのデータに変換する
 
 データタイプがT_NIL，T_FALSE，T_TRUEである時，データはそれぞ
 れnil，false，trueです．このデータタイプのオブジェクトはひと
@@ -155,7 +157,7 @@ Rubyの構造体を直接アクセスする時に気をつけなければなら�
 ないことです．直接変更した場合，オブジェクトの内容の整合性が
 とれなくなって，思わぬバグの原因になります．
 
-== CのデータをVALUEに変換する
+=== CのデータをVALUEに変換する
 
 VALUEの実際の構造は
 
@@ -182,13 +184,13 @@ FIXNUMに関しては変換マクロを経由する必要があります．Cの�
 て使い分けてください．
 
 INT2FIX() :: もとの整数が31bitまたは63bit以内に収まる自信
-      	     がある時
+             がある時
 INT2NUM() :: 任意の整数からVALUEへ
 
 INT2NUM()は整数がFIXNUMの範囲に収まらない場合，Bignumに変換
 してくれます(が，少し遅い)．
 
-== Rubyのデータを操作する
+=== Rubyのデータを操作する
 
 先程も述べた通り，Rubyの構造体をアクセスする時に内容の更新を
 行うことは勧められません．で，Rubyのデータを操作する時には
@@ -197,7 +199,7 @@ Rubyが用意している関数を用いてください．
 ここではもっとも使われるであろう文字列と配列の生成/操作を行
 う関数をあげます(全部ではないです)．
 
-=== 文字列に対する関数
+==== 文字列に対する関数
 
 rb_str_new(const char *ptr, long len) ::
 
@@ -213,16 +215,9 @@ rb_str_new_literal(const char *ptr) ::
 
   Cのリテラル文字列からRubyの文字列を生成する．
 
-rb_tainted_str_new(const char *ptr, long len) ::
-
-  汚染マークが付加された新しいRubyの文字列を生成する．外部
-  からのデータに基づく文字列には汚染マークが付加されるべき
-  である．
-
-rb_tainted_str_new2(const char *ptr) ::
-rb_tainted_str_new_cstr(const char *ptr) ::
+rb_str_append(VALUE str1, VALUE str2) ::
 
-  Cの文字列から汚染マークが付加されたRubyの文字列を生成する．
+  Rubyの文字列str1にRubyの文字列str2を追加する．
 
 rb_sprintf(const char *format, ...) ::
 rb_vsprintf(const char *format, va_list ap) ::
@@ -249,15 +244,15 @@ 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_str_append(str, rb_sprintf(format, ...)) や
+  rb_str_append(str, rb_vsprintf(format, ap)) と同等である．
 
 rb_enc_str_new(const char *ptr, long len, rb_encoding *enc) ::
 rb_enc_str_new_cstr(const char *ptr, rb_encoding *enc) ::
 
   指定されたエンコーディングでRubyの文字列を生成する.
 
-rb_enc_str_new_literal(const char *ptr) ::
+rb_enc_str_new_literal(const char *ptr, rb_encoding *enc) ::
 
   Cのリテラル文字列から指定されたエンコーディングでRubyの文字列を生成する．
 
@@ -295,7 +290,15 @@ rb_str_set_len(VALUE str, long len) ::
   lenバイトまでの内容は保存される．lenはstrの容量を越えてい
   てはならない．
 
-=== 配列に対する関数
+rb_str_modify(VALUE str) ::
+
+  Rubyの文字列の変更する準備をする．strが変更可能でなければ例
+  外が発生する．strのバッファが共有されている場合は，新しいバッ
+  ファを割り当てて共有されていない状態にする．RSTRING_PTRを使っ
+  て中身を変更したり，rb_str_set_lenを呼んだりする前には，
+  必ずこの関数を呼ばなけれならない．
+
+==== 配列に対する関数
 
 rb_ary_new() ::
 
@@ -326,7 +329,7 @@ rb_ary_to_ary(VALUE obj) ::
 引数aryに配列を渡さなければならない. さもないと
 コアを吐く.
 
-rb_ary_aref(argc, VALUE *argv, VALUE ary) ::
+rb_ary_aref(int argc, const VALUE *argv, VALUE ary) ::
 
   Array#[]と同等.
 
@@ -353,14 +356,14 @@ rb_ary_cat(VALUE ary, const VALUE *ptr, long len) ::
 
   配列aryにptrからlen個のオブジェクトを追加する．
 
-= Rubyの機能を使う
+== Rubyの機能を使う
 
 原理的にRubyで書けることはCでも書けます．RubyそのものがCで記
 述されているんですから，当然といえば当然なんですけど．ここで
 はRubyの拡張に使うことが多いだろうと予測される機能を中心に紹
 介します．
 
-== Rubyに機能を追加する
+=== Rubyに機能を追加する
 
 Rubyで提供されている関数を使えばRubyインタプリタに新しい機能
 を追加することができます．Rubyでは以下の機能を追加する関数が
@@ -372,7 +375,7 @@ Rubyで提供されている関数を使えばRubyインタプリタに新しい
 
 では順に紹介します．
 
-=== クラス/モジュール定義
+==== クラス/モジュール定義
 
 クラスやモジュールを定義するためには，以下の関数を使います．
 
@@ -389,15 +392,15 @@ Rubyで提供されている関数を使えばRubyインタプリタに新しい
   VALUE rb_define_class_under(VALUE outer, const char *name, VALUE super)
   VALUE rb_define_module_under(VALUE outer, const char *name)
 
-=== メソッド/特異メソッド定義
+==== メソッド/特異メソッド定義
 
 メソッドや特異メソッドを定義するには以下の関数を使います．
 
   void rb_define_method(VALUE klass, const char *name,
-                        VALUE (*func)(), int argc)
+                        VALUE (*func)(ANYARGS), int argc)
 
   void rb_define_singleton_method(VALUE object, const char *name,
-                                  VALUE (*func)(), int argc)
+                                  VALUE (*func)(ANYARGS), int argc)
 
 念のため説明すると「特異メソッド」とは，その特定のオブジェク
 トに対してだけ有効なメソッドです．RubyではよくSmalltalkにお
@@ -423,9 +426,9 @@ argcが-1の時は引数を配列に入れて渡されます．argcが-2の時�
 private/protectedなメソッドを定義するふたつの関数があります.
 
   void rb_define_private_method(VALUE klass, const char *name,
-				VALUE (*func)(), int argc)
+                                VALUE (*func)(ANYARGS), int argc)
   void rb_define_protected_method(VALUE klass, const char *name,
-			          VALUE (*func)(), int argc)
+                                  VALUE (*func)(ANYARGS), int argc)
 
 privateメソッドとは関数形式でしか呼び出すことの出来ないメソッ
 ドです．
@@ -446,12 +449,12 @@ privateメソッドでもあるものです．例をあげるとMathモジュー
 通りです．
 
   void rb_define_module_function(VALUE module, const char *name,
-		                 VALUE (*func)(), int argc)
+                                 VALUE (*func)(ANYARGS), int argc)
 
 関数的メソッド(Kernelモジュールのprivate method)を定義するた
 めの関数は以下の通りです．
 
-  void rb_define_global_function(const char *name, VALUE (*func)(), int argc)
+  void rb_define_global_function(const char *name, VALUE (*func)(ANYARGS), int argc)
 
 メソッドの別名を定義するための関数は以下の通りです．
 
@@ -483,7 +486,7 @@ funcはクラスを引数として受け取って，新しく割り当てられ�
 
   VALUE rb_current_receiver(void)
 
-=== 定数定義
+==== 定数定義
 
 拡張ライブラリが必要な定数はあらかじめ定義しておいた方が良い
 でしょう．定数を定義する関数は二つあります．
@@ -494,7 +497,7 @@ funcはクラスを引数として受け取って，新しく割り当てられ�
 前者は特定のクラス/モジュールに属する定数を定義するもの，後
 者はグローバルな定数を定義するものです．
 
-== Rubyの機能をCから呼び出す
+=== Rubyの機能をCから呼び出す
 
 既に『1.5 Rubyのデータを操作する』で一部紹介したような関数を
 使えば，Rubyの機能を実現している関数を直接呼び出すことが出来
@@ -505,7 +508,7 @@ funcはクラスを引数として受け取って，新しく割り当てられ�
 
 それ以外にもRubyの機能を呼び出す方法はいくつかあります．
 
-=== Rubyのプログラムをevalする
+==== Rubyのプログラムをevalする
 
 CからRubyの機能を呼び出すもっとも簡単な方法として，文字列で
 与えられたRubyのプログラムを評価する以下の関数があります．
@@ -523,7 +526,7 @@ CからRubyの機能を呼び出すもっとも簡単な方法として，文字
 この関数はエラーが発生するとnilを返します．そして，成功時には
 *stateはゼロに，さもなくば非ゼロになります．
 
-=== IDまたはシンボル
+==== IDまたはシンボル
 
 Cから文字列を経由せずにRubyのメソッドを呼び出すこともできま
 す．その前に，Rubyインタプリタ内でメソッドや変数名を指定する
@@ -566,7 +569,7 @@ Rubyから引数として与えられたシンボル(または文字列)をシ�
 これらの関数は，IDの代わりにシンボルを返すことを除けば上記の
 関数と同じです．
 
-=== CからRubyのメソッドを呼び出す
+==== CからRubyのメソッドを呼び出す
 
 Cから文字列を経由せずにRubyのメソッドを呼び出すためには以下
 の関数を使います．
@@ -582,7 +585,7 @@ Cから文字列を経由せずにRubyのメソッドを呼び出すためには
 
 applyには引数としてRubyの配列を与えます．
 
-=== 変数/定数を参照/更新する
+==== 変数/定数を参照/更新する
 
 Cから関数を使って参照・更新できるのは，定数，インスタンス変
 数です．大域変数は一部のものはCの大域変数としてアクセスでき
@@ -603,11 +606,11 @@ idはrb_intern()で得られるものを使ってください．
 定数を新しく定義するためには『2.1.3 定数定義』で紹介さ
 れている関数を使ってください．
 
-= RubyとCとの情報共有
+== RubyとCとの情報共有
 
 C言語とRubyの間で情報を共有する方法について解説します．
 
-== Cから参照できるRubyの定数
+=== Cから参照できるRubyの定数
 
 以下のRubyの定数はCのレベルから参照できます．
 
@@ -620,7 +623,7 @@ Qnil ::
 
   C言語から見た「nil」．
 
-== CとRubyで共有される大域変数
+=== CとRubyで共有される大域変数
 
 CとRubyで大域変数を使って情報を共有できます．共有できる大域
 変数にはいくつかの種類があります．そのなかでもっとも良く使わ
@@ -642,7 +645,7 @@ CとRubyで大域変数を使って情報を共有できます．共有できる
 値の参照や設定はhookで行う必要があります．
 
   void rb_define_hooked_variable(const char *name, VALUE *var,
-				 VALUE (*getter)(), void (*setter)())
+                                 VALUE (*getter)(), void (*setter)())
 
 この関数はCの関数によってhookのつけられた大域変数を定義しま
 す．変数が参照された時には関数getterが，変数に値がセットされ
@@ -662,7 +665,7 @@ getterとsetterの仕様は次の通りです．
 されます.
 
   void rb_define_virtual_variable(const char *name,
-				  VALUE (*getter)(), void (*setter)())
+                                  VALUE (*getter)(), void (*setter)())
 
 この関数によって定義されたRubyの大域変数が参照された時には
 getterが，変数に値がセットされた時にはsetterが呼ばれます．
@@ -672,7 +675,7 @@ getterとsetterの仕様は以下の通りです．
   (*getter)(ID id);
   (*setter)(VALUE val, ID id);
 
-== CのデータをRubyオブジェクトにする
+=== CのデータをRubyオブジェクトにする
 
 Cの世界で定義されたデータ(構造体)をRubyのオブジェクトとして
 取り扱いたい場合がありえます．このような場合はTypedData_XXX
@@ -685,7 +688,7 @@ Cの世界で定義されたデータ(構造体)をRubyのオブジェクトと�
 があります．
 ++
 
-=== 構造体からオブジェクトへ
+==== 構造体からオブジェクトへ
 
 構造体へのポインタsvalをRubyオブジェクトに変換するには次のマ
 クロを使います。
@@ -705,6 +708,8 @@ Dataから派生しない場合には, 必ずrb_undef_alloc_func(klass)
 
 rb_data_type_tは次のように定義されています．
 
+  typedef struct rb_data_type_struct rb_data_type_t;
+
   struct rb_data_type_struct {
           const char *wrap_struct_name;
           struct {
@@ -775,8 +780,8 @@ RUBY_TYPED_WB_PROTECTED ::
   メソッドの実装に適切にライトバリアを挿入する責任があります．
   さもなくばRubyは実行時にクラッシュする可能性があります．
 
-  ライトバリアについてはdoc/extension.rdocのAppendix D
-  "Generational GC"も参照してください．
+  ライトバリアについてはdoc/extension.ja.rdocのAppendix D
+  "世代別GC"も参照してください．
 
 
 Cの構造体の割当と対応するオブジェクトの生成を同時に行うマク
@@ -793,7 +798,7 @@ klass, data_typeはData_Wrap_Structと同じ働きをします．type
 は割り当てるC構造体の型です．割り当てられた構造体は変数sval
 に代入されます．この変数の型は (type*) である必要があります．
 
-=== オブジェクトから構造体へ
+==== オブジェクトから構造体へ
 
 TypedData_Wrap_StructやTypedData_Make_Structで生成したオブジェ
 クトから構造体へのポインタを復元するには以下のマクロを用いま
@@ -806,7 +811,9 @@ Cの構造体へのポインタは変数svalに代入されます．
 これらのマクロの使い方はちょっと分かりにくいので，後で説明す
 る例題を参照してください．
 
-== ディレクトリを作る
+== 例: dbmの拡張ライブラリの作成
+
+=== ディレクトリを作る
 
   % mkdir ext/dbm
 
@@ -816,14 +823,14 @@ Ruby 1.1からは任意のディレクトリでダイナミックライブラリ
 ライブラリ用のディレクトリを作る必要があります．名前は適当に
 選んで構いません．
 
-== 設計する
+=== 設計する
 
 まあ，当然なんですけど，どういう機能を実現するかどうかまず設
 計する必要があります．どんなクラスをつくるか，そのクラスには
 どんなメソッドがあるか，クラスが提供する定数などについて設計
 します．
 
-== Cコードを書く
+=== Cコードを書く
 
 拡張ライブラリ本体となるC言語のソースを書きます．C言語のソー
 スがひとつの時には「ライブラリ名.c」を選ぶと良いでしょう．C
@@ -865,7 +872,7 @@ Rubyは拡張ライブラリをロードする時に「Init_ライブラリ名�
 DBMライブラリはdbmのデータと対応するオブジェクトになるはずで
 すから，Cの世界のdbmをRubyの世界に取り込む必要があります．
 
-dbm.cではData_Make_Structを以下のように使っています．
+dbm.cではTypedData_Make_Structを以下のように使っています．
 
   struct dbmdata {
       int  di_size;
@@ -923,7 +930,7 @@ fdbm_delete()はこのようになっています．
       /* ... */
 
       if (rb_scan_args(argc, argv, "11", &file, &vmode) == 1) {
-  	mode = 0666;		/* default value */
+          mode = 0666;          /* default value */
       }
 
       /* ... */
@@ -935,9 +942,12 @@ fdbm_delete()はこのようになっています．
 
 この配列で与えられた引数を解析するための関数がopen()でも使わ
 れているrb_scan_args()です．第3引数に指定したフォーマットに従
-い，第4変数以降に指定したVALUEへの参照に値を代入してくれま
+い，第4引数以降に指定したVALUEへの参照に値を代入してくれま
 す．
 
+引数の数をチェックするだけならrb_check_arity()が使えます．
+これは引数をリストとして扱いたいときに便利です．
+
 引数をRubyの配列として受け取るメソッドの例には
 Thread#initializeがあります．実装はこうです．
 
@@ -957,7 +967,7 @@ Cの大域変数は以下の関数を使ってRubyインタプリタに変数の
 
   void rb_global_variable(VALUE *var)
 
-== extconf.rbを用意する
+=== extconf.rbを用意する
 
 Makefileを作る場合の雛型になるextconf.rbというファイルを作り
 ます．extconf.rbはライブラリのコンパイルに必要な条件のチェッ
@@ -988,7 +998,7 @@ Makefileを作る場合の雛型になるextconf.rbというファイルを作�
 パイルしない時にはcreate_makefileを呼ばなければMakefileは生
 成されず，コンパイルも行われません．
 
-== dependを用意する
+=== dependを用意する
 
 もし，ディレクトリにdependというファイルが存在すれば，
 Makefileが依存関係をチェックしてくれます．
@@ -997,7 +1007,7 @@ Makefileが依存関係をチェックしてくれます．
 
 などで作ることが出来ます．あって損は無いでしょう．
 
-== Makefileを生成する
+=== Makefileを生成する
 
 Makefileを実際に生成するためには
 
@@ -1019,7 +1029,7 @@ vendor_ruby ディレクトリにインストールする場合には
 ディレクトリをext以下に用意した場合にはRuby全体のmakeの時に
 自動的にMakefileが生成されますので，このステップは不要です．
 
-== makeする
+=== makeする
 
 動的リンクライブラリを生成する場合にはその場でmakeしてくださ
 い．必要であれば make install でインストールされます．
@@ -1037,26 +1047,26 @@ extconf.rbを書き換えるなどしてMakefileの再生成が必要な時は�
 を作り，そこに 拡張子 .rb のファイルを置いておけば同時にイン
 ストールされます．
 
-== デバッグ
+=== デバッグ
 
 まあ，デバッグしないと動かないでしょうね．ext/Setupにディレ
 クトリ名を書くと静的にリンクするのでデバッガが使えるようにな
 ります．その分コンパイルが遅くなりますけど．
 
-== できあがり
+=== できあがり
 
 後はこっそり使うなり，広く公開するなり，売るなり，ご自由にお
 使いください．Rubyの作者は拡張ライブラリに関して一切の権利を
 主張しません．
 
-= Appendix A. Rubyのソースコードの分類
+== Appendix A. Rubyのソースコードの分類
 
 Rubyのソースはいくつかに分類することが出来ます．このうちクラ
 スライブラリの部分は基本的に拡張ライブラリと同じ作り方になっ
 ています．これらのソースは今までの説明でほとんど理解できると
 思います．
 
-== Ruby言語のコア
+=== Ruby言語のコア
 
 class.c    :: クラスとモジュール
 error.c    :: 例外クラスと例外機構
@@ -1065,14 +1075,14 @@ load.c     :: ライブラリのロード
 object.c   :: オブジェクト
 variable.c :: 変数と定数
 
-== Rubyの構文解析器
+=== Rubyの構文解析器
 
 parse.y       :: 字句解析器と構文定義
 parse.c       :: 自動生成
 defs/keywords :: 予約語
 lex.c         :: 自動生成
 
-== Rubyの評価器 (通称YARV)
+=== Rubyの評価器 (通称YARV)
 
   compile.c
   eval.c
@@ -1098,7 +1108,7 @@ lex.c         :: 自動生成
     -> opt*.inc            : 自動生成
     -> vm.inc              : 自動生成
 
-== 正規表現エンジン (鬼車)
+=== 正規表現エンジン (鬼車)
 
   regex.c
   regcomp.c
@@ -1108,7 +1118,7 @@ lex.c         :: 自動生成
   regparse.c
   regsyntax.c
 
-== ユーティリティ関数
+=== ユーティリティ関数
 
 debug.c    :: Cデバッガ用のデバッグシンボル
 dln.c      :: 動的ローディング
@@ -1116,7 +1126,7 @@ st.c       :: 汎用ハッシュ表
 strftime.c :: 時刻整形
 util.c     :: その他のユーティリティ
 
-== Rubyコマンドの実装
+=== Rubyコマンドの実装
 
   dmyext.c
   dmydln.c
@@ -1130,7 +1140,7 @@ util.c     :: その他のユーティリティ
   gem_prelude.rb
   prelude.rb
 
-== クラスライブラリ
+=== クラスライブラリ
 
 array.c      :: Array
 bignum.c     :: Bignum
@@ -1162,24 +1172,24 @@ time.c       :: Time
 defs/known_errors.def :: 例外クラス Errno::*
 -> known_errors.inc   :: 自動生成
 
-== 多言語化
+=== 多言語化
 
 encoding.c  :: Encoding
 transcode.c :: Encoding::Converter
 enc/*.c     :: エンコーディングクラス群
 enc/trans/* :: コードポイント対応表
 
-== gorubyコマンドの実装
+=== gorubyコマンドの実装
 
   goruby.c
   golf_prelude.rb      : goruby固有のライブラリ
     -> golf_prelude.c  : 自動生成
 
-= Appendix B. 拡張用関数リファレンス
+== Appendix B. 拡張用関数リファレンス
 
 C言語からRubyの機能を利用するAPIは以下の通りである．
 
-== 型
+=== 型
 
 VALUE ::
 
@@ -1188,7 +1198,7 @@ VALUE ::
   体である．VALUE型をこれらにキャストするためにRで始まる構造体
   名を全て大文字にした名前のマクロが用意されている．
 
-== 変数・定数
+=== 変数・定数
 
 Qnil ::
 
@@ -1202,7 +1212,7 @@ Qfalse ::
 
   定数: falseオブジェクト
 
-== Cデータのカプセル化
+=== Cデータのカプセル化
 
 Data_Wrap_Struct(VALUE klass, void (*mark)(), void (*free)(), void *sval) ::
 
@@ -1221,7 +1231,7 @@ Data_Get_Struct(data, type, sval) ::
 
   dataからtype型のポインタを取り出し変数svalに代入するマクロ．
 
-== 型チェック
+=== 型チェック
 
   RB_TYPE_P(value, type)
   TYPE(value)
@@ -1230,9 +1240,8 @@ Data_Get_Struct(data, type, sval) ::
   RB_INTEGER_TYPE_P(value)
   RB_FLOAT_TYPE_P(value)
   void Check_Type(VALUE value, int type)
-  SafeStringValue(value)
 
-== 型変換
+=== 型変換
 
   FIX2INT(value), INT2FIX(i)
   FIX2LONG(value), LONG2FIX(l)
@@ -1255,7 +1264,7 @@ Data_Get_Struct(data, type, sval) ::
   StringValueCStr(value)
   rb_str_new2(s)
 
-== クラス/モジュール定義
+=== クラス/モジュール定義
 
 VALUE rb_define_class(const char *name, VALUE super) ::
 
@@ -1283,7 +1292,7 @@ void rb_extend_object(VALUE object, VALUE module) ::
 
   オブジェクトをモジュール(で定義されているメソッド)で拡張する．
 
-== 大域変数定義
+=== 大域変数定義
 
 void rb_define_variable(const char *name, VALUE *var) ::
 
@@ -1312,10 +1321,15 @@ void rb_define_hooked_variable(const char *name, VALUE *var, VALUE (*getter)(),
 
 void rb_global_variable(VALUE *var) ::
 
-  GCのため，Rubyプログラムからはアクセスされないが, Rubyオブ
-  ジェクトを含む大域変数をマークする．
+  マークする必要のあるRubyオブジェクトを含む大域変数を，GC
+  によって解放されないように保護する．
+
+void rb_gc_register_mark_object(VALUE object) ::
 
-== 定数
+  マークする必要のあるRubyオブジェクトを，GCによって解放さ
+  れないように登録する．
+
+=== 定数
 
 void rb_define_const(VALUE klass, const char *name, VALUE val) ::
 
@@ -1329,9 +1343,9 @@ void rb_define_global_const(const char *name, VALUE val) ::
 
   と同じ意味．
 
-== メソッド定義
+=== メソッド定義
 
-rb_define_method(VALUE klass, const char *name, VALUE (*func)(), int argc) ::
+rb_define_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc) ::
 
   メソッドを定義する．argcはselfを除く引数の数．argcが-1の時,
   関数には引数の数(selfを含まない)を第1引数, 引数の配列を第2
@@ -1339,14 +1353,20 @@ rb_define_method(VALUE klass, const char *name, VALUE (*func)(), int argc) ::
   第1引数がself, 第2引数がargs(argsは引数を含むRubyの配列)と
   いう形式で与えられる．
 
-rb_define_private_method(VALUE klass, const char *name, VALUE (*func)(), int argc) ::
+rb_define_private_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc) ::
 
   privateメソッドを定義する．引数はrb_define_method()と同じ．
 
-rb_define_singleton_method(VALUE klass, const char *name, VALUE (*func)(), int argc) ::
+rb_define_singleton_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc) ::
 
   特異メソッドを定義する．引数はrb_define_method()と同じ．
 
+rb_check_arity(int argc, int min, int max) ::
+
+  引数の数であるargcがmin..maxの範囲に入っているかをチェックします．
+  もしmaxがUNLIMITED_ARGUMENTSなら，上限はチェックしません．
+  もしargcが範囲外ならArgumentErrorが発生します．
+
 rb_scan_args(int argc, VALUE *argv, const char *fmt, ...) ::
 
   argc, argv形式で与えられた指定されたフォーマットに従って引
@@ -1400,10 +1420,10 @@ int rb_get_kwargs(VALUE keyword_hash, const ID *table, int required, int optiona
   optional (optionalが負の場合は-optional-1) 個のIDは省略可能
   キーワードです．必須キーワードがkeyword_hash中にない場合，
   "missing keyword"ArgumentErrorが発生します．省略可能キーワー
-  ドがない場合は，values中の対応する要素は変更されません．
-  keyword_hashに使用されない要素がある場合は，optionalが負なら
-  新しいHashとして省略可能引数の次に保存されますが，そうでなけ
-  れば"unknown keyword"ArgumentErrorが発生します．
+  ドがない場合は，values中の対応する要素にはQundefがセットされ
+  ます．keyword_hashに使用されない要素がある場合は，optionalが
+  負なら無視されますが，そうでなければ"unknown keyword"
+  ArgumentErrorが発生します．
 
 VALUE rb_extract_keywords(VALUE *original_hash) ::
 
@@ -1412,7 +1432,7 @@ VALUE rb_extract_keywords(VALUE *original_hash) ::
   先には，元のHashがSymbol以外のキーを含んでいた場合はそれらが
   コピーされた別の新しいHash，そうでなければ0が保存されます．
 
-== Rubyメソッド呼び出し
+=== Rubyメソッド呼び出し
 
 VALUE rb_funcall(VALUE recv, ID mid, int narg, ...) ::
 
@@ -1452,7 +1472,7 @@ int rb_respond_to(VALUE obj, ID id) ::
 
   objがidで示されるメソッドを持つかどうかを返す．
 
-== インスタンス変数
+=== インスタンス変数
 
 VALUE rb_iv_get(VALUE obj, const char *name) ::
 
@@ -1465,7 +1485,7 @@ VALUE rb_iv_set(VALUE obj, const char *name, VALUE val) ::
 
   objのインスタンス変数をvalにセットする．
 
-== 制御構造
+=== 制御構造
 
 VALUE rb_block_call(VALUE obj, ID mid, int argc, VALUE * argv, VALUE (*func) (ANYARGS), VALUE data2) ::
 
@@ -1490,14 +1510,14 @@ VALUE rb_yield(VALUE val) ::
 
   valを値としてイテレータブロックを呼び出す．
 
-VALUE rb_rescue(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2) ::
+VALUE rb_rescue(VALUE (*func1)(ANYARGS), VALUE arg1, VALUE (*func2)(ANYARGS), VALUE arg2) ::
 
   関数func1をarg1を引数に呼び出す．func1の実行中に例外が発生
-  した時には func2をarg2を引数として呼ぶ．戻り値は例外が発生
-  しなかった時はfunc1の戻り値, 例外が発生した時にはfunc2の戻
-  り値である．
+  した時には func2をarg2を第一引数, 発生した例外オブジェクト
+  を第二引数として呼ぶ．戻り値は例外が発生しなかった時はfunc1
+  の戻り値, 例外が発生した時にはfunc2の戻り値である．
 
-VALUE rb_ensure(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2) ::
+VALUE rb_ensure(VALUE (*func1)(ANYARGS), VALUE arg1, VALUE (*func2)(ANYARGS), VALUE arg2) ::
 
   関数func1をarg1を引数として実行し, 実行終了後(たとえ例外が
   発生しても) func2をarg2を引数として実行する．戻り値はfunc1
@@ -1527,7 +1547,7 @@ void rb_iter_break_value(VALUE value) ::
   現在の最も内側のブロックをvalueで終了する．ブロックは引数で
   与えられたvalueを返す．この関数は直接の呼び出し元に戻らない．
 
-== 例外・エラー
+=== 例外・エラー
 
 void rb_warning(const char *fmt, ...) ::
 
@@ -1559,7 +1579,7 @@ void rb_bug(const char *fmt, ...) ::
 きはObject#inspect)を使ったVALUEの出力に利用できる．これは
 "%i"と衝突するため，整数には"%d"を使用すること．
 
-== Rubyの初期化・実行
+=== Rubyの初期化・実行
 
 Rubyをアプリケーションに埋め込む場合には以下のインタフェース
 を使う．通常の拡張ライブラリには必要ない．
@@ -1583,7 +1603,7 @@ void ruby_script(char *name) ::
 
   Rubyのスクリプト名($0)を設定する．
 
-== インタプリタのイベントのフック
+=== インタプリタのイベントのフック
 
 void rb_add_event_hook(rb_event_hook_func_t func, rb_event_flag_t events, VALUE data) ::
 
@@ -1613,7 +1633,19 @@ int rb_remove_event_hook(rb_event_hook_func_t func) ::
 
   指定されたフック関数を削除します．
 
-== 互換性のためのマクロ
+=== メモリ使用量
+
+void rb_gc_adjust_memory_usage(ssize_t diff) ::
+
+  登録された外部のメモリ使用量を調整します．この関数で外部のライブラリが
+  どのくらいメモリを使っているのかをGCに伝えることができます．正のdiffで
+  この関数を呼び出すとメモリ使用量の増加を意味します．新しいメモリブロッ
+  クが確保されたり，ブロックがより大きなサイズで再割り当てされたりした場
+  合などです．負のdiffでこの関数を呼び出すとメモリ使用量の減少を意味しま
+  す．メモリブロックが解放されたり，メモリブロックがより小さいサイズで再
+  確保されたりした場合などです．この関数はGCを引き起こすかもしれません．
+
+=== 互換性のためのマクロ
 
 APIの互換性をチェックするために以下のマクロがデフォルトで定義されています．
 
@@ -1655,7 +1687,7 @@ RB_EVENT_HOOKS_HAVE_CALLBACK_DATA ::
   rb_add_event_hook() がフック関数に渡す data を第3引数として
   受け取ることを意味する．
 
-= Appendix C. extconf.rbで使える関数たち
+== Appendix C. extconf.rbで使える関数たち
 
 extconf.rbの中では利用可能なコンパイル条件チェックの関数は以
 下の通りである．
@@ -1781,7 +1813,7 @@ pkg_config(pkg, option=nil) ::
   optionが指定された場合は，上記の配列の代わりにそのオプションを
   指定して得られた出力をstripしたものを返す．
 
-= Appendix D. 世代別GC
+== Appendix D. 世代別GC
 
 Ruby 2.1から世代別GCに対応しました．我々はこれをRGenGCと呼んでいます．
 RGenGCは，過去の拡張ライブラリに（ほぼ）互換性を保つように開発されている
@@ -1794,9 +1826,20 @@ RGenGCは，過去の拡張ライブラリに（ほぼ）互換性を保つよ�
 スするようなコードは書かないようにして下さい．代わりに，rb_ary_aref(),
 rb_ary_store() などの，適切な API 関数を利用するようにして下さい．
 
-そのほか，対応についての詳細は README.EXT の「Appendix D. Generational
+そのほか，対応についての詳細は extension.rdoc の「Appendix D. Generational
 GC」を参照して下さい．
 
+== Appendix E. Ractor サポート
+
+Ruby 3.0 から、Ruby プログラムを並列に実行するための仕組みである Ractor
+が導入されました。適切に並列に実行するためには、Ractor サポートが必要に
+なります。サポートしていないライブラリは、メイン Ractor 以外で実行すると
+エラーになります（Ractor::UnsafeError）。
+
+Ractor をサポートするための詳細は、extension.rdoc の「Appendix F. Ractor
+support」を参照してください。
+
+
 :enddoc: Local variables:
 :enddoc: fill-column: 60
 :enddoc: end:
diff --git a/doc/extension.rdoc b/doc/extension.rdoc
index 1e157f824a..71a03cbf52 100644
--- a/doc/extension.rdoc
+++ b/doc/extension.rdoc
@@ -1,8 +1,10 @@
-# README.EXT -  -*- RDoc -*- created at: Mon Aug  7 16:45:54 JST 1995
+# extension.rdoc -  -*- RDoc -*- created at: Mon Aug  7 16:45:54 JST 1995
+
+= Creating Extension Libraries for Ruby
 
 This document explains how to make extension libraries for Ruby.
 
-= Basic Knowledge
+== Basic Knowledge
 
 In C, variables have types and data do not have types.  In contrast,
 Ruby variables do not have a static type, and data themselves have
@@ -18,7 +20,7 @@ To retrieve C data from a VALUE, you need to:
 
 Converting to the wrong data type may cause serious problems.
 
-== Data Types
+=== Data Types
 
 The Ruby interpreter has the following data types:
 
@@ -52,7 +54,7 @@ T_ZOMBIE    :: object awaiting finalization
 
 Most of the types are represented by C structures.
 
-== Check Data Type of the VALUE
+=== Check Data Type of the VALUE
 
 The macro TYPE() defined in ruby.h shows the data type of the VALUE.
 TYPE() returns the constant number T_XXXX described above.  To handle
@@ -86,7 +88,7 @@ There are also faster check macros for fixnums and nil.
   FIXNUM_P(obj)
   NIL_P(obj)
 
-== Convert VALUE into C Data
+=== Convert VALUE into C Data
 
 The data for type T_NIL, T_FALSE, T_TRUE are nil, false, true
 respectively.  They are singletons for the data type.
@@ -139,7 +141,7 @@ 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.
 
-== Convert C Data into VALUE
+=== Convert C Data into VALUE
 
 To convert C data to Ruby values:
 
@@ -165,14 +167,14 @@ INT2NUM() :: for arbitrary sized integers.
 INT2NUM() converts an integer into a Bignum if it is out of the FIXNUM
 range, but is a bit slower.
 
-== Manipulating Ruby Data
+=== 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:
 
-=== String Functions
+==== String Functions
 
 rb_str_new(const char *ptr, long len) ::
 
@@ -188,16 +190,6 @@ rb_str_new_literal(const char *ptr) ::
 
   Creates a new Ruby string from a C string literal.
 
-rb_tainted_str_new(const char *ptr, long len) ::
-
-  Creates a new tainted Ruby string.  Strings from external data
-  sources should be tainted.
-
-rb_tainted_str_new2(const char *ptr) ::
-rb_tainted_str_new_cstr(const char *ptr) ::
-
-  Creates a new tainted Ruby string from a C string.
-
 rb_sprintf(const char *format, ...) ::
 rb_vsprintf(const char *format, va_list ap) ::
 
@@ -208,6 +200,10 @@ rb_vsprintf(const char *format, va_list ap) ::
   must be a VALUE).  Since it conflicts with "%i", for integers in
   format strings, use "%d".
 
+rb_str_append(VALUE str1, VALUE str2) ::
+
+  Appends Ruby string str2 to Ruby string str1.
+
 rb_str_cat(VALUE str, const char *ptr, long len) ::
 
   Appends len bytes of data from ptr to the Ruby string.
@@ -223,15 +219,15 @@ 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.
+  equivalent to rb_str_append(str, rb_sprintf(format, ...)) and
+  rb_str_append(str, rb_vsprintf(format, ap)), respectively.
 
 rb_enc_str_new(const char *ptr, long len, rb_encoding *enc) ::
 rb_enc_str_new_cstr(const char *ptr, rb_encoding *enc) ::
 
   Creates a new Ruby string with the specified encoding.
 
-rb_enc_str_new_literal(const char *ptr) ::
+rb_enc_str_new_literal(const char *ptr, rb_encoding *enc) ::
 
   Creates a new Ruby string from a C string literal with the specified
   encoding.
@@ -273,7 +269,15 @@ rb_str_set_len(VALUE str, long len) ::
   up to len bytes, regardless RSTRING_LEN(str).  len must not exceed
   the capacity of str.
 
-=== Array Functions
+rb_str_modify(VALUE str) ::
+
+  Prepares a Ruby string to modify.  If str is not modifiable, this
+  function raises an exception, or if the buffer of str is shared,
+  this function allocates new buffer to make it unshared.  Always
+  you MUST call this function before modifying the contents using
+  RSTRING_PTR and/or rb_str_set_len.
+
+==== Array Functions
 
 rb_ary_new() ::
 
@@ -303,7 +307,7 @@ rb_ary_to_ary(VALUE obj) ::
 There are many functions to operate an array.  They may dump core if other
 types are given.
 
-rb_ary_aref(argc, VALUE *argv, VALUE ary) ::
+rb_ary_aref(int argc, const VALUE *argv, VALUE ary) ::
 
   Equivalent to Array#[].
 
@@ -330,9 +334,9 @@ rb_ary_cat(VALUE ary, const VALUE *ptr, long len) ::
 
   Appends len elements of objects from ptr to the array.
 
-= Extending Ruby with C
+== Extending Ruby with C
 
-== Adding New Features to Ruby
+=== Adding New Features to Ruby
 
 You can add new features (classes, methods, etc.) to the Ruby
 interpreter.  Ruby provides APIs for defining the following things:
@@ -341,7 +345,7 @@ interpreter.  Ruby provides APIs for defining the following things:
 - Methods, Singleton Methods
 - Constants
 
-=== Class and Module Definition
+==== Class and Module Definition
 
 To define a class or module, use the functions below:
 
@@ -356,15 +360,15 @@ To define nested classes or modules, use the functions below:
   VALUE rb_define_class_under(VALUE outer, const char *name, VALUE super)
   VALUE rb_define_module_under(VALUE outer, const char *name)
 
-=== Method and Singleton Method Definition
+==== Method and Singleton Method Definition
 
 To define methods or singleton methods, use these functions:
 
   void rb_define_method(VALUE klass, const char *name,
-		        VALUE (*func)(), int argc)
+                        VALUE (*func)(ANYARGS), int argc)
 
   void rb_define_singleton_method(VALUE object, const char *name,
-			          VALUE (*func)(), int argc)
+                                  VALUE (*func)(ANYARGS), int argc)
 
 The `argc' represents the number of the arguments to the C function,
 which must be less than 17.  But I doubt you'll need that many.
@@ -396,9 +400,9 @@ as the name of method to be defined. See also ID or Symbol below.
 There are two functions to define private/protected methods:
 
   void rb_define_private_method(VALUE klass, const char *name,
-			        VALUE (*func)(), int argc)
+                                VALUE (*func)(ANYARGS), int argc)
   void rb_define_protected_method(VALUE klass, const char *name,
-			          VALUE (*func)(), int argc)
+                                  VALUE (*func)(ANYARGS), int argc)
 
 At last, rb_define_module_function defines a module function,
 which are private AND singleton methods of the module.
@@ -415,12 +419,12 @@ or
 To define module functions, use:
 
   void rb_define_module_function(VALUE module, const char *name,
-				 VALUE (*func)(), int argc)
+                                 VALUE (*func)(ANYARGS), int argc)
 
 In addition, function-like methods, which are private methods defined
 in the Kernel module, can be defined using:
 
-  void rb_define_global_function(const char *name, VALUE (*func)(), int argc)
+  void rb_define_global_function(const char *name, VALUE (*func)(ANYARGS), int argc)
 
 To define an alias for the method,
 
@@ -444,12 +448,24 @@ you may rely on:
 
   VALUE rb_call_super(int argc, const VALUE *argv)
 
+To specify whether keyword arguments are passed when calling super:
+
+  VALUE rb_call_super(int argc, const VALUE *argv, int kw_splat)
+
++kw_splat+ can have these possible values (used by all methods that accept
++kw_splat+ argument):
+
+RB_NO_KEYWORDS :: Do not pass keywords
+RB_PASS_KEYWORDS :: Pass keywords, final argument should be a hash of keywords
+RB_PASS_CALLED_KEYWORDS :: Pass keywords if current method was called with
+                           keywords, useful for argument delegation
+
 To achieve the receiver of the current scope (if no other way is
 available), you can use:
 
   VALUE rb_current_receiver(void)
 
-=== Constant Definition
+==== Constant Definition
 
 We have 2 functions to define constants:
 
@@ -459,11 +475,11 @@ We have 2 functions to define constants:
 The former is to define a constant under specified class/module.  The
 latter is to define a global constant.
 
-== Use Ruby Features from C
+=== Use Ruby Features from C
 
 There are several ways to invoke Ruby's features from C code.
 
-=== Evaluate Ruby Programs in a String
+==== Evaluate Ruby Programs in a String
 
 The easiest way to use Ruby's functionality from a C program is to
 evaluate the string as Ruby program.  This function will do the job:
@@ -481,7 +497,7 @@ function:
 It returns nil when an error occurred. Moreover, *state is zero if str was
 successfully evaluated, or nonzero otherwise.
 
-=== ID or Symbol
+==== 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
@@ -532,7 +548,7 @@ and to convert Ruby Symbol object to ID, use
 
   ID SYM2ID(VALUE symbol)
 
-=== Invoke Ruby Method from C
+==== Invoke Ruby Method from C
 
 To invoke methods directly, you can use the function below
 
@@ -541,7 +557,7 @@ To invoke methods directly, you can use the function below
 This function invokes a method on the recv, with the method name
 specified by the symbol mid.
 
-=== Accessing the Variables and Constants
+==== Accessing the Variables and Constants
 
 You can access class variables and instance variables using access
 functions.  Also, global variables can be shared between both
@@ -560,7 +576,7 @@ To access the constants of the class/module:
 
 See also Constant Definition above.
 
-= Information Sharing Between Ruby and C
+== Information Sharing Between Ruby and C
 
 === Ruby Constants That Can Be Accessed From C
 
@@ -576,7 +592,7 @@ Qnil ::
 
   Ruby nil in C scope.
 
-== Global Variables Shared Between C and Ruby
+=== Global Variables Shared Between C and Ruby
 
 Information can be shared between the two environments using shared global
 variables.  To define them, you can use functions listed below:
@@ -592,11 +608,11 @@ function below.
 
   void rb_define_readonly_variable(const char *name, VALUE *var)
 
-You can defined hooked variables.  The accessor functions (getter and
+You can define hooked variables.  The accessor functions (getter and
 setter) are called on access to the hooked variables.
 
   void rb_define_hooked_variable(const char *name, VALUE *var,
-				 VALUE (*getter)(), void (*setter)())
+                                 VALUE (*getter)(), void (*setter)())
 
 If you need to supply either setter or getter, just supply 0 for the
 hook you don't need.  If both hooks are 0, rb_define_hooked_variable()
@@ -611,14 +627,14 @@ Also you can define a Ruby global variable without a corresponding C
 variable.  The value of the variable will be set/get only by hooks.
 
   void rb_define_virtual_variable(const char *name,
-				  VALUE (*getter)(), void (*setter)())
+                                  VALUE (*getter)(), void (*setter)())
 
 The prototypes of the getter and setter functions are as follows:
 
   VALUE (*getter)(ID id);
   void (*setter)(VALUE val, ID id);
 
-== Encapsulate C Data into a Ruby Object
+=== Encapsulate C Data into a Ruby Object
 
 Sometimes you need to expose your struct in the C world as a Ruby
 object.
@@ -632,7 +648,7 @@ In the future version of Ruby, it is possible old macros will not
 work.
 ++
 
-=== C struct to Ruby object
+==== C struct to Ruby object
 
 You can convert sval, a pointer to your struct, into a Ruby object
 with the next macro.
@@ -652,13 +668,16 @@ If it doesn't, you have to call rb_undef_alloc_func(klass).
 rb_data_type_t is defined like this.  Let's take a look at each
 member of the struct.
 
+  typedef struct rb_data_type_struct rb_data_type_t;
+
   struct rb_data_type_struct {
           const char *wrap_struct_name;
           struct {
                   void (*dmark)(void*);
                   void (*dfree)(void*);
                   size_t (*dsize)(const void *);
-                  void *reserved[2];
+                  void (*dcompact)(void*);
+                  void *reserved[1];
           } function;
           const rb_data_type_t *parent;
           void *data;
@@ -690,7 +709,15 @@ Its parameter is a pointer to your struct.
 You can pass 0 as dsize if it is hard to implement such a function.
 But it is still recommended to avoid 0.
 
-You have to fill reserved and parent with 0.
+dcompact is invoked when memory compaction took place.
+Referred Ruby objects that were marked by rb_gc_mark_movable()
+can here be updated per rb_gc_location().
+
+You have to fill reserved with 0.
+
+parent can point to another C type definition that the Ruby object
+is inherited from. Then TypedData_Get_Struct() does also accept
+derived objects.
 
 You can fill "data" with an arbitrary value for your use.
 Ruby does nothing with the member.
@@ -706,7 +733,7 @@ RUBY_TYPED_FREE_IMMEDIATELY ::
   You can specify this flag if the dfree never unlocks Ruby's
   internal lock (GVL).
 
-  If this flag is not set, Ruby defers invokation of dfree()
+  If this flag is not set, Ruby defers invocation of dfree()
   and invokes dfree() at the same time as finalizers.
 
 RUBY_TYPED_WB_PROTECTED ::
@@ -722,6 +749,14 @@ RUBY_TYPED_WB_PROTECTED ::
   More about write barriers can be found in "Generational GC" in
   Appendix D.
 
+RUBY_TYPED_FROZEN_SHAREABLE ::
+
+  This flag indicates that the object is shareable object
+  if the object is frozen. See Appendix F more details.
+
+  If this flag is not set, the object can not become a shareable
+  object by Ractor.make_shareable() method.
+
 You can allocate and wrap the structure in one step.
 
   TypedData_Make_Struct(klass, type, data_type, sval)
@@ -735,10 +770,10 @@ Arguments klass and data_type work like their counterparts in
 TypedData_Wrap_Struct().  A pointer to the allocated structure will
 be assigned to sval, which should be a pointer of the type specified.
 
-=== Ruby object to C struct
+==== Ruby object to C struct
 
 To retrieve the C pointer from the Data object, use the macro
-Data_Get_Struct().
+TypedData_Get_Struct().
 
   TypedData_Get_Struct(obj, type, &data_type, sval)
 
@@ -746,23 +781,23 @@ A pointer to the structure will be assigned to the variable sval.
 
 See the example below for details.
 
-= Example - Creating the dbm Extension
+== Example - Creating the dbm Extension
 
 OK, here's the example of making an extension library.  This is the
 extension to access DBMs.  The full source is included in the ext/
 directory in the Ruby's source tree.
 
-== Make the Directory
+=== Make the Directory
 
   % mkdir ext/dbm
 
 Make a directory for the extension library under ext directory.
 
-== Design the Library
+=== Design the Library
 
 You need to design the library features, before making it.
 
-== Write the C Code
+=== Write the C Code
 
 You need to write C code for your extension library.  If your library
 has only one source file, choosing ``LIBRARY.c'' as a file name is
@@ -802,7 +837,7 @@ Here's the example of an initializing function.
   }
 
 The dbm extension wraps the dbm struct in the C environment using
-Data_Make_Struct.
+TypedData_Make_Struct.
 
   struct dbmdata {
       int  di_size;
@@ -853,7 +888,7 @@ arguments like this:
   {
       /* ... */
       if (rb_scan_args(argc, argv, "11", &file, &vmode) == 1) {
-          mode = 0666;		/* default value */
+          mode = 0666;          /* default value */
       }
       /* ... */
   }
@@ -867,6 +902,9 @@ arguments.  The third argument is a string that specifies how to
 capture method arguments and assign them to the following VALUE
 references.
 
+You can just check the argument number with rb_check_arity(), this is
+handy in the case you want to treat the arguments as a list.
+
 The following is an example of a method that takes arguments by Ruby's
 array:
 
@@ -884,7 +922,11 @@ but are not exported to the Ruby world.  You need to protect them by
 
   void rb_global_variable(VALUE *var)
 
-== Prepare extconf.rb
+or the objects themselves by
+
+  void rb_gc_register_mark_object(VALUE object)
+
+=== Prepare extconf.rb
 
 If the file named extconf.rb exists, it will be executed to generate
 Makefile.
@@ -933,7 +975,7 @@ If a compilation condition is not fulfilled, you should not call
 ``create_makefile''.  The Makefile will not be generated, compilation will
 not be done.
 
-== Prepare Depend (Optional)
+=== Prepare Depend (Optional)
 
 If the file named depend exists, Makefile will include that file to
 check dependencies.  You can make this file by invoking
@@ -942,7 +984,7 @@ check dependencies.  You can make this file by invoking
 
 It's harmless.  Prepare it.
 
-== Generate Makefile
+=== Generate Makefile
 
 Try generating the Makefile by:
 
@@ -957,7 +999,7 @@ You don't need this step if you put the extension library under the ext
 directory of the ruby source tree.  In that case, compilation of the
 interpreter will do this step for you.
 
-== Run make
+=== Run make
 
 Type
 
@@ -966,21 +1008,21 @@ Type
 to compile your extension.  You don't need this step either if you have
 put the extension library under the ext directory of the ruby source tree.
 
-== Debug
+=== Debug
 
 You may need to rb_debug the extension.  Extensions can be linked
 statically by adding the directory name in the ext/Setup file so that
 you can inspect the extension with the debugger.
 
-== Done! Now You Have the Extension Library
+=== Done! Now You Have the Extension Library
 
 You can do anything you want with your library.  The author of Ruby
 will not claim any restrictions on your code depending on the Ruby API.
 Feel free to use, modify, distribute or sell your program.
 
-= Appendix A. Ruby Source Files Overview
+== Appendix A. Ruby Source Files Overview
 
-== Ruby Language Core
+=== Ruby Language Core
 
 class.c    :: classes and modules
 error.c    :: exception classes and exception mechanism
@@ -989,14 +1031,14 @@ load.c     :: library loading
 object.c   :: objects
 variable.c :: variables and constants
 
-== Ruby Syntax Parser
+=== Ruby Syntax Parser
 
 parse.y       :: grammar definition
 parse.c       :: automatically generated from parse.y
 defs/keywords :: reserved keywords
 lex.c         :: automatically generated from keywords
 
-== Ruby Evaluator (a.k.a. YARV)
+=== Ruby Evaluator (a.k.a. YARV)
 
   compile.c
   eval.c
@@ -1022,7 +1064,7 @@ lex.c         :: automatically generated from keywords
     -> opt*.inc            : automatically generated
     -> vm.inc              : automatically generated
 
-== Regular Expression Engine (Oniguruma)
+=== Regular Expression Engine (Oniguruma)
 
   regex.c
   regcomp.c
@@ -1032,7 +1074,7 @@ lex.c         :: automatically generated from keywords
   regparse.c
   regsyntax.c
 
-== Utility Functions
+=== Utility Functions
 
 debug.c    :: debug symbols for C debugger
 dln.c      :: dynamic loading
@@ -1040,7 +1082,7 @@ st.c       :: general purpose hash table
 strftime.c :: formatting times
 util.c     :: misc utilities
 
-== Ruby Interpreter Implementation
+=== Ruby Interpreter Implementation
 
   dmyext.c
   dmydln.c
@@ -1054,7 +1096,7 @@ util.c     :: misc utilities
   gem_prelude.rb
   prelude.rb
 
-== Class Library
+=== Class Library
 
 array.c      :: Array
 bignum.c     :: Bignum
@@ -1086,22 +1128,22 @@ time.c       :: Time
 defs/known_errors.def :: Errno::* exception classes
 -> known_errors.inc   :: automatically generated
 
-== Multilingualization
+=== Multilingualization
 
 encoding.c  :: Encoding
 transcode.c :: Encoding::Converter
 enc/*.c     :: encoding classes
 enc/trans/* :: codepoint mapping tables
 
-== goruby Interpreter Implementation
+=== goruby Interpreter Implementation
 
   goruby.c
   golf_prelude.rb     : goruby specific libraries.
     -> golf_prelude.c : automatically generated
 
-= Appendix B. Ruby Extension API Reference
+== Appendix B. Ruby Extension API Reference
 
-== Types
+=== Types
 
 VALUE ::
 
@@ -1109,7 +1151,7 @@ VALUE ::
   such as struct RString, etc.  To refer the values in structures, use
   casting macros like RSTRING(obj).
 
-== Variables and Constants
+=== Variables and Constants
 
 Qnil ::
 
@@ -1123,7 +1165,7 @@ Qfalse ::
 
   false object
 
-== C Pointer Wrapping
+=== C Pointer Wrapping
 
 Data_Wrap_Struct(VALUE klass, void (*mark)(), void (*free)(), void *sval) ::
 
@@ -1143,7 +1185,7 @@ Data_Get_Struct(data, type, sval) ::
   This macro retrieves the pointer value from DATA, and assigns it to
   the variable sval.
 
-== Checking Data Types
+=== Checking Data Types
 
 RB_TYPE_P(value, type) ::
 
@@ -1173,11 +1215,7 @@ void Check_Type(VALUE value, int type) ::
 
   Ensures +value+ is of the given internal +type+ or raises a TypeError
 
-SaveStringValue(value) ::
-
-  Checks that +value+ is a String and is not tainted
-
-== Data Type Conversion
+=== Data Type Conversion
 
 FIX2INT(value), INT2FIX(i) ::
 
@@ -1261,7 +1299,7 @@ rb_str_new2(s) ::
 
   char * -> String
 
-== Defining Classes and Modules
+=== Defining Classes and Modules
 
 VALUE rb_define_class(const char *name, VALUE super) ::
 
@@ -1288,7 +1326,7 @@ void rb_extend_object(VALUE object, VALUE module) ::
 
   Extend the object with the module's attributes.
 
-== Defining Global Variables
+=== Defining Global Variables
 
 void rb_define_variable(const char *name, VALUE *var) ::
 
@@ -1326,10 +1364,13 @@ void rb_define_hooked_variable(const char *name, VALUE *var, VALUE (*getter)(),
 
 void rb_global_variable(VALUE *var) ::
 
-  GC requires C global variables which hold Ruby values to be marked.
-  rb_global_variable tells GC to protect these variables.
+  Tells GC to protect C global variable, which holds Ruby value to be marked.
 
-== Constant Definition
+void rb_gc_register_mark_object(VALUE object) ::
+
+  Tells GC to protect the +object+, which may not be referenced anywhere.
+
+=== Constant Definition
 
 void rb_define_const(VALUE klass, const char *name, VALUE val) ::
 
@@ -1341,9 +1382,9 @@ void rb_define_global_const(const char *name, VALUE val) ::
 
     rb_define_const(rb_cObject, name, val)
 
-== Method Definition
+=== Method Definition
 
-rb_define_method(VALUE klass, const char *name, VALUE (*func)(), int argc) ::
+rb_define_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc) ::
 
   Defines a method for the class.  func is the function pointer.  argc
   is the number of arguments.  if argc is -1, the function will receive
@@ -1351,22 +1392,28 @@ rb_define_method(VALUE klass, const char *name, VALUE (*func)(), int argc) ::
   receive 2 arguments, self and args, where args is a Ruby array of
   the method arguments.
 
-rb_define_private_method(VALUE klass, const char *name, VALUE (*func)(), int argc) ::
+rb_define_private_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc) ::
 
   Defines a private method for the class.  Arguments are same as
   rb_define_method().
 
-rb_define_singleton_method(VALUE klass, const char *name, VALUE (*func)(), int argc) ::
+rb_define_singleton_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc) ::
 
   Defines a singleton method.  Arguments are same as rb_define_method().
 
+rb_check_arity(int argc, int min, int max) ::
+
+  Check the number of arguments, argc is in the range of min..max.  If
+  max is UNLIMITED_ARGUMENTS, upper bound is not checked.  If argc is
+  out of bounds, an ArgumentError will be raised.
+
 rb_scan_args(int argc, VALUE *argv, const char *fmt, ...) ::
 
   Retrieve argument from argc and argv to given VALUE references
   according to the format string.  The format can be described in ABNF
   as follows:
 
-    scan-arg-spec  := param-arg-spec [option-hash-arg-spec] [block-arg-spec]
+    scan-arg-spec  := param-arg-spec [keyword-arg-spec] [block-arg-spec]
 
     param-arg-spec := pre-arg-spec [post-arg-spec] / post-arg-spec /
                       pre-opt-post-arg-spec
@@ -1375,7 +1422,7 @@ rb_scan_args(int argc, VALUE *argv, const char *fmt, ...) ::
                       [num-of-trailing-mandatory-args]
     pre-opt-post-arg-spec := num-of-leading-mandatory-args num-of-optional-args
                              num-of-trailing-mandatory-args
-    option-hash-arg-spec := sym-for-option-hash-arg
+    keyword-arg-spec := sym-for-keyword-arg
     block-arg-spec := sym-for-block-arg
 
     num-of-leading-mandatory-args  := DIGIT ; The number of leading
@@ -1387,18 +1434,10 @@ rb_scan_args(int argc, VALUE *argv, const char *fmt, ...) ::
                                             ; captured as a ruby array
     num-of-trailing-mandatory-args := DIGIT ; The number of trailing
                                             ; mandatory arguments
-    sym-for-option-hash-arg        := ":"   ; Indicates that an option
-                                            ; hash is captured if the last
-                                            ; argument is a hash or can be
-                                            ; converted to a hash with
-                                            ; #to_hash.  When the last
-                                            ; argument is nil, it is
-                                            ; captured if it is not
-                                            ; ambiguous to take it as
-                                            ; empty option hash; i.e. '*'
-                                            ; is not specified and
-                                            ; arguments are given more
-                                            ; than sufficient.
+    sym-for-keyword-arg            := ":"   ; Indicates that keyword
+                                            ; argument captured as a hash.
+                                            ; If keyword arguments are not
+                                            ; provided, returns nil.
     sym-for-block-arg              := "&"   ; Indicates that an iterator
                                             ; block should be captured if
                                             ; given
@@ -1413,6 +1452,19 @@ rb_scan_args(int argc, VALUE *argv, const char *fmt, ...) ::
   The number of given arguments, excluding an option hash or iterator
   block, is returned.
 
+rb_scan_args_kw(int kw_splat, int argc, VALUE *argv, const char *fmt, ...) ::
+
+  The same as +rb_scan_args+, except the +kw_splat+ argument specifies whether
+  keyword arguments are provided (instead of being determined by the call
+  from Ruby to the C function). +kw_splat+ should be one of the following
+  values:
+
+  RB_SCAN_ARGS_PASS_CALLED_KEYWORDS :: Same behavior as +rb_scan_args+.
+  RB_SCAN_ARGS_KEYWORDS :: The final argument should be a hash treated as
+                           keywords.
+  RB_SCAN_ARGS_LAST_HASH_KEYWORDS :: Treat a final argument as keywords if it
+                                     is a hash, and not as keywords otherwise.
+
 int rb_get_kwargs(VALUE keyword_hash, const ID *table, int required, int optional, VALUE *values) ::
 
   Retrieves argument VALUEs bound to keywords, which directed by +table+
@@ -1422,10 +1474,9 @@ int rb_get_kwargs(VALUE keyword_hash, const ID *table, int required, int optiona
   +optional+ is negative) number of IDs are optional.  If a
   mandatory key is not contained in +keyword_hash+, raises "missing
   keyword" +ArgumentError+.  If an optional key is not present in
-  +keyword_hash+, the corresponding element in +values+ is not changed.
-  If +optional+ is negative, rest of +keyword_hash+ are stored in the
-  next to optional +values+ as a new Hash, otherwise raises "unknown
-  keyword" +ArgumentError+.
+  +keyword_hash+, the corresponding element in +values+ is set to +Qundef+.
+  If +optional+ is negative, rest of +keyword_hash+ are ignored, otherwise
+  raises "unknown keyword" +ArgumentError+.
 
   Be warned, handling keyword arguments in the C API is less efficient
   than handling them in Ruby.  Consider using a Ruby wrapper method
@@ -1439,7 +1490,7 @@ VALUE rb_extract_keywords(VALUE *original_hash) ::
   non-symbol keys, then they are copied to another hash and the new hash
   is stored through +original_hash+, else 0 is stored.
 
-== Invoking Ruby method
+=== Invoking Ruby method
 
 VALUE rb_funcall(VALUE recv, ID mid, int narg, ...) ::
 
@@ -1452,11 +1503,41 @@ VALUE rb_funcallv(VALUE recv, ID mid, int argc, VALUE *argv) ::
   Invokes a method, passing arguments as an array of values.
   Able to call even private/protected methods.
 
+VALUE rb_funcallv_kw(VALUE recv, ID mid, int argc, VALUE *argv, int kw_splat) ::
+
+  Same as rb_funcallv, using +kw_splat+ to determine whether keyword
+  arguments are passed.
+
 VALUE rb_funcallv_public(VALUE recv, ID mid, int argc, VALUE *argv) ::
 
   Invokes a method, passing arguments as an array of values.
   Able to call only public methods.
 
+VALUE rb_funcallv_public_kw(VALUE recv, ID mid, int argc, VALUE *argv, int kw_splat) ::
+
+  Same as rb_funcallv_public, using +kw_splat+ to determine whether keyword
+  arguments are passed.
+
+VALUE rb_funcall_passing_block(VALUE recv, ID mid, int argc, const VALUE* argv) ::
+
+  Same as rb_funcallv_public, except is passes the currently active block as
+  the block when calling the method.
+
+VALUE rb_funcall_passing_block_kw(VALUE recv, ID mid, int argc, const VALUE* argv, int kw_splat) ::
+
+  Same as rb_funcall_passing_block, using +kw_splat+ to determine whether
+  keyword arguments are passed.
+
+VALUE rb_funcall_with_block(VALUE recv, ID mid, int argc, const VALUE *argv, VALUE passed_procval) ::
+
+  Same as rb_funcallv_public, except +passed_procval+ specifies the block to
+  pass to the method.
+
+VALUE rb_funcall_with_block_kw(VALUE recv, ID mid, int argc, const VALUE *argv, VALUE passed_procval, int kw_splat) ::
+
+  Same as rb_funcall_with_block, using +kw_splat+ to determine whether
+  keyword arguments are passed.
+
 VALUE rb_eval_string(const char *str) ::
 
   Compiles and executes the string as a Ruby program.
@@ -1477,7 +1558,7 @@ int rb_respond_to(VALUE obj, ID id) ::
 
   Returns true if the object responds to the message specified by id.
 
-== Instance Variables
+=== Instance Variables
 
 VALUE rb_iv_get(VALUE obj, const char *name) ::
 
@@ -1488,7 +1569,7 @@ VALUE rb_iv_set(VALUE obj, const char *name, VALUE val) ::
 
   Sets the value of the instance variable.
 
-== Control Structure
+=== Control Structure
 
 VALUE rb_block_call(VALUE recv, ID mid, int argc, VALUE * argv, VALUE (*func) (ANYARGS), VALUE data2) ::
 
@@ -1501,6 +1582,11 @@ VALUE rb_block_call(VALUE recv, ID mid, int argc, VALUE * argv, VALUE (*func) (A
   whereas yielded values can be gotten via argc/argv of the third/fourth
   arguments.
 
+VALUE rb_block_call_kw(VALUE recv, ID mid, int argc, VALUE * argv, VALUE (*func) (ANYARGS), VALUE data2, int kw_splat) ::
+
+  Same as rb_funcall_with_block, using +kw_splat+ to determine whether
+  keyword arguments are passed.
+
 \[OBSOLETE] VALUE rb_iterate(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2) ::
 
   Calls the function func1, supplying func2 as the block.  func1 will be
@@ -1512,16 +1598,42 @@ VALUE rb_block_call(VALUE recv, ID mid, int argc, VALUE * argv, VALUE (*func) (A
 
 VALUE rb_yield(VALUE val) ::
 
-  Evaluates the block with value val.
+  Yields val as a single argument to the block.
+
+VALUE rb_yield_values(int n, ...) ::
+
+  Yields +n+ number of arguments to the block, using one C argument per Ruby
+  argument.
+
+VALUE rb_yield_values2(int n, VALUE *argv) ::
+
+  Yields +n+ number of arguments to the block, with all Ruby arguments in the
+  C argv array.
+
+VALUE rb_yield_values_kw(int n, VALUE *argv, int kw_splat) ::
 
-VALUE rb_rescue(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2) ::
+  Same as rb_yield_values2, using +kw_splat+ to determine whether
+  keyword arguments are passed.
+
+VALUE rb_yield_splat(VALUE args) ::
+
+  Same as rb_yield_values2, except arguments are specified by the Ruby
+  array +args+.
+
+VALUE rb_yield_splat_kw(VALUE args, int kw_splat) ::
+
+  Same as rb_yield_splat, using +kw_splat+ to determine whether
+  keyword arguments are passed.
+
+VALUE rb_rescue(VALUE (*func1)(ANYARGS), VALUE arg1, VALUE (*func2)(ANYARGS), VALUE arg2) ::
 
   Calls the function func1, with arg1 as the argument.  If an exception
-  occurs during func1, it calls func2 with arg2 as the argument.  The
-  return value of rb_rescue() is the return value from func1 if no
-  exception occurs, from func2 otherwise.
+  occurs during func1, it calls func2 with arg2 as the first argument
+  and the exception object as the second argument.  The return value
+  of rb_rescue() is the return value from func1 if no exception occurs,
+  from func2 otherwise.
 
-VALUE rb_ensure(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2) ::
+VALUE rb_ensure(VALUE (*func1)(ANYARGS), VALUE arg1, VALUE (*func2)(ANYARGS), VALUE arg2) ::
 
   Calls the function func1 with arg1 as the argument, then calls func2
   with arg2 if execution terminated.  The return value from
@@ -1553,7 +1665,7 @@ void rb_iter_break_value(VALUE value) ::
   return the given argument value.  This function never return to the
   caller.
 
-== Exceptions and Errors
+=== Exceptions and Errors
 
 void rb_warn(const char *fmt, ...) ::
 
@@ -1588,7 +1700,97 @@ Note: In the format string, "%"PRIsVALUE can be used for Object#to_s
 must be a VALUE).  Since it conflicts with "%i", for integers in
 format strings, use "%d".
 
-== Initialize and Start the Interpreter
+=== Threading
+
+As of Ruby 1.9, Ruby supports native 1:1 threading with one kernel
+thread per Ruby Thread object.  Currently, there is a GVL (Global VM Lock)
+which prevents simultaneous execution of Ruby code which may be released
+by the rb_thread_call_without_gvl and rb_thread_call_without_gvl2 functions.
+These functions are tricky-to-use and documented in thread.c; do not
+use them before reading comments in thread.c.
+
+void rb_thread_schedule(void) ::
+
+  Give the scheduler a hint to pass execution to another thread.
+
+=== Input/Output (IO) on a single file descriptor
+
+int rb_io_wait_readable(int fd) ::
+
+  Wait indefinitely for the given FD to become readable, allowing other
+  threads to be scheduled.  Returns a true value if a read may be
+  performed, false if there is an unrecoverable error.
+
+int rb_io_wait_writable(int fd) ::
+
+  Like rb_io_wait_readable, but for writability.
+
+int rb_wait_for_single_fd(int fd, int events, struct timeval *timeout) ::
+
+  Allows waiting on a single FD for one or multiple events with a
+  specified timeout.
+
+  +events+ is a mask of any combination of the following values:
+
+  * RB_WAITFD_IN - wait for readability of normal data
+  * RB_WAITFD_OUT - wait for writability
+  * RB_WAITFD_PRI - wait for readability of urgent data
+
+  Use a NULL +timeout+ to wait indefinitely.
+
+=== I/O Multiplexing
+
+Ruby supports I/O multiplexing based on the select(2) system call.
+The Linux select_tut(2) manpage
+<http://man7.org/linux/man-pages/man2/select_tut.2.html>
+provides a good overview on how to use select(2), and the Ruby API has
+analogous functions and data structures to the well-known select API.
+Understanding of select(2) is required to understand this section.
+
+typedef struct rb_fdset_t ::
+
+  The data structure which wraps the fd_set bitmap used by select(2).
+  This allows Ruby to use FD sets larger than that allowed by
+  historic limitations on modern platforms.
+
+void rb_fd_init(rb_fdset_t *) ::
+
+  Initializes the rb_fdset_t, it must be initialized before other rb_fd_*
+  operations.  Analogous to calling malloc(3) to allocate an fd_set.
+
+void rb_fd_term(rb_fdset_t *) ::
+
+  Destroys the rb_fdset_t, releasing any memory and resources it used.
+  It must be reinitialized using rb_fd_init before future use.
+  Analogous to calling free(3) to release memory for an fd_set.
+
+void rb_fd_zero(rb_fdset_t *) ::
+
+  Clears all FDs from the rb_fdset_t, analogous to FD_ZERO(3).
+
+void rb_fd_set(int fd, rb_fdset_t *) ::
+
+  Adds a given FD in the rb_fdset_t, analogous to FD_SET(3).
+
+void rb_fd_clr(int fd, rb_fdset_t *) ::
+
+  Removes a given FD from the rb_fdset_t, analogous to FD_CLR(3).
+
+int rb_fd_isset(int fd, const rb_fdset_t *) ::
+
+  Returns true if a given FD is set in the rb_fdset_t, false if not.
+  Analogous to FD_ISSET(3).
+
+int rb_thread_fd_select(int nfds, rb_fdset_t *readfds, rb_fdset_t *writefds, rb_fdset_t *exceptfds, struct timeval *timeout) ::
+
+  Analogous to the select(2) system call, but allows other Ruby
+  threads to be scheduled while waiting.
+
+  When only waiting on a single FD, favor rb_io_wait_readable,
+  rb_io_wait_writable, or rb_wait_for_single_fd functions since
+  they can be optimized for specific platforms (currently, only Linux).
+
+=== Initialize and Start the Interpreter
 
 The embedding API functions are below (not needed for extension libraries):
 
@@ -1613,7 +1815,7 @@ void ruby_script(char *name) ::
 
   Specifies the name of the script ($0).
 
-== Hooks for the Interpreter Events
+=== Hooks for the Interpreter Events
 
 void rb_add_event_hook(rb_event_hook_func_t func, rb_event_flag_t events, VALUE data) ::
 
@@ -1643,7 +1845,19 @@ int rb_remove_event_hook(rb_event_hook_func_t func) ::
 
   Removes the specified hook function.
 
-== Macros for Compatibility
+=== Memory usage
+
+void rb_gc_adjust_memory_usage(ssize_t diff) ::
+
+  Adjusts the amount of registered external memory.  You can tell GC how
+  much memory is used by an external library by this function.  Calling
+  this function with positive diff means the memory usage is increased;
+  new memory block is allocated or a block is reallocated as larger
+  size.  Calling this function with negative diff means the memory usage
+  is decreased; a memory block is freed or a block is reallocated as
+  smaller size.  This function may trigger the GC.
+
+=== Macros for Compatibility
 
 Some macros to check API compatibilities are available by default.
 
@@ -1683,25 +1897,68 @@ RB_EVENT_HOOKS_HAVE_CALLBACK_DATA ::
   Means that rb_add_event_hook() takes the third argument `data', to be
   passed to the given event hook function.
 
-= Appendix C. Functions available for use in extconf.rb
+=== Defining backward compatible macros for keyword argument functions
+
+Most ruby C extensions are designed to support multiple Ruby versions.
+In order to correctly support Ruby 2.7+ in regards to keyword
+argument separation, C extensions need to use <code>*_kw</code>
+functions.  However, these functions do not exist in Ruby 2.6 and
+below, so in those cases macros should be defined to allow you to use
+the same code on multiple Ruby versions.  Here are example macros
+you can use in extensions that support Ruby 2.6 (or below) when using
+the <code>*_kw</code> functions introduced in Ruby 2.7.
+
+  #ifndef RB_PASS_KEYWORDS
+  /* Only define macros on Ruby <2.7 */
+  #define rb_funcallv_kw(o, m, c, v, kw) rb_funcallv(o, m, c, v)
+  #define rb_funcallv_public_kw(o, m, c, v, kw) rb_funcallv_public(o, m, c, v)
+  #define rb_funcall_passing_block_kw(o, m, c, v, kw) rb_funcall_passing_block(o, m, c, v)
+  #define rb_funcall_with_block_kw(o, m, c, v, b, kw) rb_funcall_with_block(o, m, c, v, b)
+  #define rb_scan_args_kw(kw, c, v, s, ...) rb_scan_args(c, v, s, __VA_ARGS__)
+  #define rb_call_super_kw(c, v, kw) rb_call_super(c, v)
+  #define rb_yield_values_kw(c, v, kw) rb_yield_values2(c, v)
+  #define rb_yield_splat_kw(a, kw) rb_yield_splat(a)
+  #define rb_block_call_kw(o, m, c, v, f, p, kw) rb_block_call(o, m, c, v, f, p)
+  #define rb_fiber_resume_kw(o, c, v, kw) rb_fiber_resume(o, c, v)
+  #define rb_fiber_yield_kw(c, v, kw) rb_fiber_yield(c, v)
+  #define rb_enumeratorize_with_size_kw(o, m, c, v, f, kw) rb_enumeratorize_with_size(o, m, c, v, f)
+  #define SIZED_ENUMERATOR_KW(obj, argc, argv, size_fn, kw_splat) \
+      rb_enumeratorize_with_size((obj), ID2SYM(rb_frame_this_func()), \
+                                 (argc), (argv), (size_fn))
+  #define RETURN_SIZED_ENUMERATOR_KW(obj, argc, argv, size_fn, kw_splat) do { \
+          if (!rb_block_given_p())                                            \
+              return SIZED_ENUMERATOR(obj, argc, argv, size_fn);              \
+      } while (0)
+  #define RETURN_ENUMERATOR_KW(obj, argc, argv, kw_splat) RETURN_SIZED_ENUMERATOR(obj, argc, argv, 0)
+  #define rb_check_funcall_kw(o, m, c, v, kw) rb_check_funcall(o, m, c, v)
+  #define rb_obj_call_init_kw(o, c, v, kw) rb_obj_call_init(o, c, v)
+  #define rb_class_new_instance_kw(c, v, k, kw) rb_class_new_instance(c, v, k)
+  #define rb_proc_call_kw(p, a, kw) rb_proc_call(p, a)
+  #define rb_proc_call_with_block_kw(p, c, v, b, kw) rb_proc_call_with_block(p, c, v, b)
+  #define rb_method_call_kw(c, v, m, kw) rb_method_call(c, v, m)
+  #define rb_method_call_with_block_kw(c, v, m, b, kw) rb_method_call_with_block(c, v, m, b)
+  #define rb_eval_cmd_kwd(c, a, kw) rb_eval_cmd(c, a, 0)
+  #endif
+
+== Appendix C. Functions available for use in extconf.rb
 
 See documentation for {mkmf}[rdoc-ref:MakeMakefile].
 
-= Appendix D. Generational GC
+== Appendix D. Generational GC
 
 Ruby 2.1 introduced a generational garbage collector (called RGenGC).
 RGenGC (mostly) keeps compatibility.
 
 Generally, the use of the technique called write barriers is required in
 extension libraries for generational GC
-(http://en.wikipedia.org/wiki/Garbage_collection_%28computer_science%29).
+(https://en.wikipedia.org/wiki/Garbage_collection_%28computer_science%29).
 RGenGC works fine without write barriers in extension libraries.
 
 If your library adheres to the following tips, performance can
 be further improved. Especially, the "Don't touch pointers directly" section is
 important.
 
-== Incompatibility
+=== Incompatibility
 
 You can't write RBASIC(obj)->klass field directly because it is const
 value now.
@@ -1720,13 +1977,13 @@ VALUE rb_obj_reveal(VALUE obj, VALUE klass) ::
   Reset RBasic::klass to be klass.
   We expect the `klass' is hidden class by rb_obj_hide().
 
-== Write barriers
+=== Write barriers
 
 RGenGC doesn't require write barriers to support generational GC.
 However, caring about write barrier can improve the performance of
 RGenGC. Please check the following tips.
 
-=== Don't touch pointers directly
+==== Don't touch pointers directly
 
 In MRI (include/ruby/ruby.h), some macros to acquire pointers to the
 internal data structures are supported such as RARRAY_PTR(),
@@ -1735,7 +1992,7 @@ RSTRUCT_PTR() and so on.
 DO NOT USE THESE MACROS and instead use the corresponding C-APIs such as
 rb_ary_aref(), rb_ary_store() and so on.
 
-=== Consider whether to insert write barriers
+==== Consider whether to insert write barriers
 
 You don't need to care about write barriers if you only use built-in
 types.
@@ -1757,7 +2014,7 @@ introduce critical bugs. And inserting write barriers has several areas
 of overhead. Basically we don't recommend you insert write barriers.
 Please carefully consider the risks.
 
-=== Combine with built-in types
+==== Combine with built-in types
 
 Please consider utilizing built-in types. Most built-in types support
 write barrier, so you can use them to avoid manually inserting write
@@ -1772,7 +2029,7 @@ references.
 With use of such techniques, you don't need to insert write barriers
 anymore.
 
-=== Insert write barriers
+==== Insert write barriers
 
 \[AGAIN] Inserting write barriers is a very difficult hack, and it is
 easy to introduce critical bugs. And inserting write barriers has
@@ -1784,9 +2041,9 @@ Before inserting write barriers, you need to know about RGenGC algorithm
 available in include/ruby/ruby.h. An example is available in iseq.c.
 
 For a complete guide for RGenGC and write barriers, please refer to
-<https://bugs.ruby-lang.org/projects/ruby-trunk/wiki/RGenGC>.
+<https://bugs.ruby-lang.org/projects/ruby-master/wiki/RGenGC>.
 
-= Appendix E. RB_GC_GUARD to protect from premature GC
+== Appendix E. RB_GC_GUARD to protect from premature GC
 
 C Ruby currently uses conservative garbage collection, thus VALUE
 variables must remain visible on the stack or registers to ensure any
@@ -1833,8 +2090,90 @@ keyword in C.  RB_GC_GUARD has the following advantages:
 
 3. "volatile" implementations may be buggy/inconsistent in some
    compilers and architectures. RB_GC_GUARD is customizable for broken
-   systems/compilers without those without negatively affecting other
-   systems.
+   systems/compilers without negatively affecting other systems.
+
+== Appendix F. Ractor support
+
+Ractor is parallel execution mechanism introduced from Ruby 3.0. All
+ractrors can run in parallel by different OS thread (underlying system
+provided thread), so the C extension should be thread-safe. Now we call
+the property that C extension can run in multiple ractors "Ractor-safe".
+
+By default, all C extensions are recognized as Ractor-unsafe. If C
+extension becomes Ractor-safe, the extension should call
+rb_ext_ractor_safe(true) at the Init_ function and all defined method
+marked as Ractor-safe. Ractor-unsafe C-methods only been called from
+main-ractor. If non-main ractor calls it, then Ractor::UnsafeError is
+raised.
+
+BTW non-"Ractor-safe" extensions raises an error on non-main ractors, so
+that it is "safe" because unsafe operations are not allowed.
+"Ractor-safe" property means "multi-Ractor-ready" or "safe on
+multi-ractors execution". "Ractor-safe" term comes from "Thread-safe".
+
+To make "Ractor-safe" C extension, we need to check the following points:
+
+(1) Do not share unshareable objects between ractors
+
+For example, C's global variable can lead sharing an unshareable objects
+betwee ractors.
+
+  VALUE g_var;
+  VALUE set(VALUE self, VALUE v){ return g_var = v; }
+  VALUE get(VALUE self){ return g_var; }
+
+set() and get() pair can share an unshareable objects using g_var, and
+it is Ractor-unsafe.
+
+Not only using global variables directly, some indirect data structure
+such as global st_table can share the objects, so please take care.
+
+Note that class and module objects are shareable objects, so you can
+keep the code "cFoo = rb_define_class(...)" with C's global variables.
+
+(2) Check the thread-safety of the extension
+
+An extension should be thread-safe. For example, the following code is
+not thread-safe:
+
+  bool g_called = false;
+  VALUE call(VALUE self) {
+    if (g_called) rb_raise("recursive call is not allowed.");
+    g_called = true;
+    VALUE ret = do_something();
+    g_called = false;
+    return ret;
+  }
+
+because g_called global variable should be synchronized by other
+ractor's threads. To avoid such data-race, some synchronization should
+be used. Check include/ruby/thread_native.h and include/ruby/atomic.h.
+
+On the Ractor mechanism, most of objects given by the method parameters
+or the receiver are isolated by Ractor's boundary, it is easy to make
+thread-safe code than usual thread-programming in general. For example,
+we don't need to lock an array object to access the element of it.
+
+(3) Check the thread-safety of using library
+
+If an extension relies on the external library libfoo and the function
+foo(), the function foo() should be thread safe.
+
+(4) Make an object shareable
+
+This is not required to make an extension Ractor-safe.
+
+If an extension provides special objects defined by rb_data_type_t,
+consider these objects can become shareable or not.
+
+RUBY_TYPED_FROZEN_SHAREABLE flag indicates that these objects can be
+shareable objects if the object is frozen. This means that if the object
+is frozen, the mutation of wrapped data is not allowed.
+
+(5) Others
+
+Maybe there are more points which should be considered to make
+Ractor-safe extension, so this document will be extended.
 
 :enddoc: Local variables:
 :enddoc: fill-column: 70
diff --git a/doc/fiber.md b/doc/fiber.md
new file mode 100644
index 0000000000..5abd848677
--- /dev/null
+++ b/doc/fiber.md
@@ -0,0 +1,191 @@
+# Fiber
+
+Fibers provide a mechanism for cooperative concurrency.
+
+## Context Switching
+
+Fibers execute a user-provided block. During the execution, the block may call `Fiber.yield` or `Fiber.transfer` to switch to another fiber. `Fiber#resume` is used to continue execution from the point where `Fiber.yield` was called.
+
+``` ruby
+#!/usr/bin/env ruby
+
+puts "1: Start program."
+
+f = Fiber.new do
+  puts "3: Entered fiber."
+  Fiber.yield
+  puts "5: Resumed fiber."
+end
+
+puts "2: Resume fiber first time."
+f.resume
+
+puts "4: Resume fiber second time."
+f.resume
+
+puts "6: Finished."
+```
+
+This program demonstrates the flow control of fibers.
+
+## Scheduler
+
+The scheduler interface is used to intercept blocking operations. A typical
+implementation would be a wrapper for a gem like `EventMachine` or `Async`. This
+design provides separation of concerns between the event loop implementation
+and application code. It also allows for layered schedulers which can perform
+instrumentation.
+
+To set the scheduler for the current thread:
+
+``` ruby
+Fiber.set_scheduler(MyScheduler.new)
+```
+
+When the thread exits, there is an implicit call to `set_scheduler`:
+
+``` ruby
+Fiber.set_scheduler(nil)
+```
+
+### Interface
+
+This is the interface you need to implement.
+
+``` ruby
+class Scheduler
+  # Wait for the specified process ID to exit.
+  # This hook is optional.
+  # @parameter pid [Integer] The process ID to wait for.
+  # @parameter flags [Integer] A bit-mask of flags suitable for `Process::Status.wait`.
+  # @returns [Process::Status] A process status instance.
+  def process_wait(pid, flags)
+    Thread.new do
+      Process::Status.wait(pid, flags)
+    end.value
+  end
+
+  # Wait for the given file descriptor to match the specified events within
+  # the specified timeout.
+  # @parameter event [Integer] A bit mask of `IO::READABLE`,
+  #   `IO::WRITABLE` and `IO::PRIORITY`.
+  # @parameter timeout [Numeric] The amount of time to wait for the event in seconds.
+  # @returns [Integer] The subset of events that are ready.
+  def io_wait(io, events, timeout)
+  end
+
+  # Sleep the current task for the specified duration, or forever if not
+  # specified.
+  # @param duration [Numeric] The amount of time to sleep in seconds.
+  def kernel_sleep(duration = nil)
+  end
+
+  # Block the calling fiber.
+  # @parameter blocker [Object] What we are waiting on, informational only.
+  # @parameter timeout [Numeric | Nil] The amount of time to wait for in seconds.
+  # @returns [Boolean] Whether the blocking operation was successful or not.
+  def block(blocker, timeout = nil)
+  end
+
+  # Unblock the specified fiber.
+  # @parameter blocker [Object] What we are waiting on, informational only.
+  # @parameter fiber [Fiber] The fiber to unblock.
+  # @reentrant Thread safe.
+  def unblock(blocker, fiber)
+  end
+
+  # Intercept the creation of a non-blocking fiber.
+  # @returns [Fiber]
+  def fiber(&block)
+    Fiber.new(blocking: false, &block)
+  end
+
+  # Invoked when the thread exits.
+  def close
+    self.run
+  end
+
+  def run
+    # Implement event loop here.
+  end
+end
+```
+
+Additional hooks may be introduced in the future, we will use feature detection
+in order to enable these hooks.
+
+### Non-blocking Execution
+
+The scheduler hooks will only be used in special non-blocking execution
+contexts. Non-blocking execution contexts introduce non-determinism because the
+execution of scheduler hooks may introduce context switching points into your
+program.
+
+#### Fibers
+
+Fibers can be used to create non-blocking execution contexts.
+
+``` ruby
+Fiber.new do
+  puts Fiber.current.blocking? # false
+
+  # May invoke `Fiber.scheduler&.io_wait`.
+  io.read(...)
+
+  # May invoke `Fiber.scheduler&.io_wait`.
+  io.write(...)
+
+  # Will invoke `Fiber.scheduler&.kernel_sleep`.
+  sleep(n)
+end.resume
+```
+
+We also introduce a new method which simplifies the creation of these
+non-blocking fibers:
+
+``` ruby
+Fiber.schedule do
+  puts Fiber.current.blocking? # false
+end
+```
+
+The purpose of this method is to allow the scheduler to internally decide the
+policy for when to start the fiber, and whether to use symmetric or asymmetric
+fibers.
+
+You can also create blocking execution contexts:
+
+``` ruby
+Fiber.new(blocking: true) do
+  # Won't use the scheduler:
+  sleep(n)
+end
+```
+
+However you should generally avoid this unless you are implementing a scheduler.
+
+#### IO
+
+By default, I/O is non-blocking. Not all operating systems support non-blocking
+I/O. Windows is a notable example where socket I/O can be non-blocking but pipe
+I/O is blocking. Provided that there *is* a scheduler and the current thread *is
+non-blocking*, the operation will invoke the scheduler.
+
+#### Mutex
+
+The `Mutex` class can be used in a non-blocking context and is fiber specific.
+
+#### ConditionVariable
+
+The `ConditionVariable` class can be used in a non-blocking context and is
+fiber-specific.
+
+#### Queue / SizedQueue
+
+The `Queue` and `SizedQueue` classes can be used in a non-blocking context and
+are fiber-specific.
+
+#### Thread
+
+The `Thread#join` operation can be used in a non-blocking context and is
+fiber-specific.
diff --git a/doc/globals.rdoc b/doc/globals.rdoc
index 3bc7e05623..1d7cda69f9 100644
--- a/doc/globals.rdoc
+++ b/doc/globals.rdoc
@@ -1,70 +1,69 @@
 # -*- mode: rdoc; coding: utf-8; fill-column: 74; -*-
 
-== Pre-defined variables
+== Pre-defined global variables
 
-$!::   The exception information message set by 'raise'.
-$@::   Array of backtrace of the last exception thrown.
+$!::   The Exception object set by Kernel#raise.
+$@::   The same as <code>$!.backtrace</code>.
+$~::   The information about the last match in the current scope (thread-local and frame-local).
 $&::   The string matched by the last successful match.
 $`::   The string to the left  of the last successful match.
 $'::   The string to the right of the last successful match.
 $+::   The highest group matched by the last successful match.
 $1::   The Nth group of the last successful match. May be > 1.
-$~::   The information about the last match in the current scope.
-$=::   The flag for case insensitive, nil by default.
-$/::   The input record separator, newline by default.
-$\::   The output record separator for the print and IO#write. Default is nil.
-$,::   The output field separator for the print and Array#join.
-$;::   The default separator for String#split.
+$=::   This variable is no longer effective. Deprecated.
+$/::   The input record separator, newline by default. Aliased to $-0.
+$\::   The output record separator for Kernel#print and IO#write. Default is +nil+.
+$,::   The output field separator for Kernel#print and Array#join. Non-nil $, will be deprecated.
+$;::   The default separator for String#split. Non-nil $; will be deprecated. Aliased to $-F.
 $.::   The current input line number of the last file that was read.
-$<::   The virtual concatenation file of the files given on command line (or from $stdin if no files were given).
-$>::   The default output for print, printf. $stdout by default.
+$<::   The same as ARGF.
+$>::   The default output stream for Kernel#print and Kernel#printf. $stdout by default.
 $_::   The last input line of string by gets or readline.
 $0::   Contains the name of the script being executed. May be assignable.
-$*::   Command line arguments given for the script sans args.
-$$::   The process number of the Ruby running this script.
-$?::   The status of the last executed child process.  This value is
-       thread-local.
-$:::   Load path for scripts and binary modules by load or require.
-$"::   The array contains the module names loaded by require.
-$DEBUG::     The debug flag, which is set by the -d switch.  Enabling debug
+$*::   The same as ARGV.
+$$::   The process number of the Ruby running this script. Same as Process.pid.
+$?::   The status of the last executed child process (thread-local).
+$LOAD_PATH::   Load path for searching Ruby scripts and extension libraries used
+               by Kernel#load and Kernel#require. Aliased to $: and $-I.
+               Has a singleton method <code>$LOAD_PATH.resolve_feature_path(feature)</code>
+               that returns [+:rb+ or +:so+, path], which resolves the feature to
+               the path the original Kernel#require method would load.
+$LOADED_FEATURES::   The array contains the module names loaded by require.
+                     Aliased to $".
+$DEBUG::     The debug flag, which is set by the <tt>-d</tt> switch.  Enabling debug
              output prints each exception raised to $stderr (but not its
              backtrace).  Setting this to a true value enables debug output as
-             if -d were given on the command line.  Setting this to a false
-             value disables debug output.
-$LOADED_FEATURES:: The alias to the $".
-$FILENAME::  Current input file from $<. Same as $<.filename.
-$LOAD_PATH:: The alias to the $:.
+             if <tt>-d</tt> were given on the command line.  Setting this to a false
+             value disables debug output. Aliased to $-d.
+$FILENAME::  Current input filename from ARGF. Same as ARGF.filename.
 $stderr::    The current standard error output.
 $stdin::     The current standard input.
 $stdout::    The current standard output.
-$VERBOSE::   The verbose flag, which is set by the -w or -v switch.  Setting
-             this to a true value enables warnings as if -w or -v were given
-             on the command line.  Setting this to nil disables warnings,
-             including from Kernel#warn.
-$-0::  The alias to $/.
-$-a::  True if option -a is set. Read-only variable.
-$-d::  The alias of $DEBUG.  See $DEBUG above for further discussion.
-$-F::  The alias to $;.
-$-i::  In in-place-edit mode, this variable holds the extension, otherwise nil.
-$-I::  The alias to $:.
-$-l::  True if option -l is set. Read-only variable.
-$-p::  True if option -p is set. Read-only variable.
-$-v::  An alias of $VERBOSE.  See $VERBOSE above for further discussion.
-$-w::  An alias of $VERBOSE.  See $VERBOSE above for further discussion.
+$VERBOSE::   The verbose flag, which is set by the <tt>-w</tt> or <tt>-v</tt> switch.
+             Setting this to a true value enables warnings as if <tt>-w</tt> or <tt>-v</tt> were given
+             on the command line.  Setting this to +nil+ disables warnings,
+             including from Kernel#warn. Aliased to $-v and $-w.
+$-a::  True if option <tt>-a</tt> is set. Read-only variable.
+$-i::  In in-place-edit mode, this variable holds the extension, otherwise +nil+.
+$-l::  True if option <tt>-l</tt> is set. Read-only variable.
+$-p::  True if option <tt>-p</tt> is set. Read-only variable.
 
 == Pre-defined global constants
 
-TRUE::              The typical true value.
-FALSE::             The false itself.
-NIL::               The nil itself.
 STDIN::             The standard input. The default value for $stdin.
 STDOUT::            The standard output. The default value for $stdout.
 STDERR::            The standard error output. The default value for $stderr.
 ENV::               The hash contains current environment variables.
-ARGF::              The alias to the $<.
-ARGV::              The alias to the $*.
-DATA::              The file object of the script, pointing just after __END__.
-RUBY_VERSION::      The ruby version string (VERSION was deprecated).
+ARGF::              The virtual concatenation of the files given on command line (or from $stdin if no files were given).
+ARGV::              An Array of command line arguments given for the script.
+DATA::              The file object of the script, pointing just after <code>__END__</code>.
+TOPLEVEL_BINDING::  The Binding of the top level scope.
+RUBY_VERSION::      The Ruby language version.
 RUBY_RELEASE_DATE:: The release date string.
 RUBY_PLATFORM::     The platform identifier.
-
+RUBY_PATCHLEVEL::   The patchlevel for this Ruby.  If this is a development build of Ruby the patchlevel will be -1.
+RUBY_REVISION::     The GIT commit hash for this Ruby.
+RUBY_COPYRIGHT::    The copyright string for Ruby.
+RUBY_ENGINE::       The name of the Ruby implementation.
+RUBY_ENGINE_VERSION:: The version of the Ruby implementation.
+RUBY_DESCRIPTION::  The same as <tt>ruby --version</tt>, a String describing various aspects of the Ruby implementation.
diff --git a/doc/implicit_conversion.rdoc b/doc/implicit_conversion.rdoc
new file mode 100644
index 0000000000..0c2a1d4971
--- /dev/null
+++ b/doc/implicit_conversion.rdoc
@@ -0,0 +1,198 @@
+== Implicit Conversions
+
+Some Ruby methods accept one or more objects
+that can be either:
+* <i>Of a given class</i>, and so accepted as is.
+* <i>Implicitly convertible to that class</i>, in which case
+  the called method converts the object.
+
+For each of the relevant classes, the conversion is done by calling
+a specific conversion method:
+
+* Array: +to_ary+
+* Hash: +to_hash+
+* Integer: +to_int+
+* String: +to_str+
+
+=== Array-Convertible Objects
+
+An <i>Array-convertible object</i> is an object that:
+* Has instance method +to_ary+.
+* The method accepts no arguments.
+* The method returns an object +obj+ for which <tt>obj.kind_of?(Array)</tt> returns +true+.
+
+The examples in this section use method <tt>Array#replace</tt>,
+which accepts an Array-convertible argument.
+
+This class is Array-convertible:
+
+    class ArrayConvertible
+      def to_ary
+        [:foo, 'bar', 2]
+      end
+    end
+    a = []
+    a.replace(ArrayConvertible.new) # => [:foo, "bar", 2]
+
+This class is not Array-convertible (no +to_ary+ method):
+
+    class NotArrayConvertible; end
+    a = []
+    # Raises TypeError (no implicit conversion of NotArrayConvertible into Array)
+    a.replace(NotArrayConvertible.new)
+
+This class is not Array-convertible (method +to_ary+ takes arguments):
+
+    class NotArrayConvertible
+      def to_ary(x)
+        [:foo, 'bar', 2]
+      end
+    end
+    a = []
+    # Raises ArgumentError (wrong number of arguments (given 0, expected 1))
+    a.replace(NotArrayConvertible.new)
+
+This class is not Array-convertible (method +to_ary+ returns non-Array):
+
+    class NotArrayConvertible
+      def to_ary
+        :foo
+      end
+    end
+    a = []
+    # Raises TypeError (can't convert NotArrayConvertible to Array (NotArrayConvertible#to_ary gives Symbol))
+    a.replace(NotArrayConvertible.new)
+
+=== Hash-Convertible Objects
+
+A <i>Hash-convertible object</i> is an object that:
+* Has instance method +to_hash+.
+* The method accepts no arguments.
+* The method returns an object +obj+ for which <tt>obj.kind_of?(Hash)</tt> returns +true+.
+
+The examples in this section use method <tt>Hash#merge</tt>,
+which accepts a Hash-convertible argument.
+
+This class is Hash-convertible:
+
+    class HashConvertible
+      def to_hash
+        {foo: 0, bar: 1, baz: 2}
+      end
+    end
+    h = {}
+    h.merge(HashConvertible.new) # => {:foo=>0, :bar=>1, :baz=>2}
+
+This class is not Hash-convertible (no +to_hash+ method):
+
+    class NotHashConvertible; end
+    h = {}
+    # Raises TypeError (no implicit conversion of NotHashConvertible into Hash)
+    h.merge(NotHashConvertible.new)
+
+This class is not Hash-convertible (method +to_hash+ takes arguments):
+
+    class NotHashConvertible
+      def to_hash(x)
+        {foo: 0, bar: 1, baz: 2}
+      end
+    end
+    h = {}
+    # Raises ArgumentError (wrong number of arguments (given 0, expected 1))
+    h.merge(NotHashConvertible.new)
+
+This class is not Hash-convertible (method +to_hash+ returns non-Hash):
+
+    class NotHashConvertible
+      def to_hash
+        :foo
+      end
+    end
+    h = {}
+    # Raises TypeError (can't convert NotHashConvertible to Hash (ToHashReturnsNonHash#to_hash gives Symbol))
+    h.merge(NotHashConvertible.new)
+
+=== Integer-Convertible Objects
+
+An <i>Integer-convertible object</i> is an object that:
+* Has instance method +to_int+.
+* The method accepts no arguments.
+* The method returns an object +obj+ for which <tt>obj.kind_of?(Integer)</tt> returns +true+.
+
+The examples in this section use method <tt>Array.new</tt>,
+which accepts an Integer-convertible argument.
+
+This user-defined class is Integer-convertible:
+
+    class IntegerConvertible
+      def to_int
+        3
+      end
+    end
+    a = Array.new(IntegerConvertible.new).size
+    a # => 3
+
+This class is not Integer-convertible (method +to_int+ takes arguments):
+
+    class NotIntegerConvertible
+      def to_int(x)
+        3
+      end
+    end
+    # Raises ArgumentError (wrong number of arguments (given 0, expected 1))
+    Array.new(NotIntegerConvertible.new)
+
+This class is not Integer-convertible (method +to_int+ returns non-Integer):
+
+    class NotIntegerConvertible
+      def to_int
+        :foo
+      end
+    end
+    # Raises TypeError (can't convert NotIntegerConvertible to Integer (NotIntegerConvertible#to_int gives Symbol))
+    Array.new(NotIntegerConvertible.new)
+
+=== String-Convertible Objects
+
+A <i>String-convertible object</i> is an object that:
+* Has instance method +to_str+.
+* The method accepts no arguments.
+* The method returns an object +obj+ for which <tt>obj.kind_of?(String)</tt> returns +true+.
+
+The examples in this section use method <tt>String::new</tt>,
+which accepts a String-convertible argument.
+
+This class is String-convertible:
+
+    class StringConvertible
+      def to_str
+        'foo'
+      end
+    end
+    String.new(StringConvertible.new) # => "foo"
+
+This class is not String-convertible (no +to_str+ method):
+
+    class NotStringConvertible; end
+    # Raises TypeError (no implicit conversion of NotStringConvertible into String)
+    String.new(NotStringConvertible.new)
+
+This class is not String-convertible (method +to_str+ takes arguments):
+
+    class NotStringConvertible
+      def to_str(x)
+        'foo'
+      end
+    end
+    # Raises ArgumentError (wrong number of arguments (given 0, expected 1))
+    String.new(NotStringConvertible.new)
+
+This class is not String-convertible (method +to_str+ returns non-String):
+
+    class NotStringConvertible
+      def to_str
+        :foo
+      end
+    end
+    # Raises TypeError (can't convert NotStringConvertible to String (NotStringConvertible#to_str gives Symbol))
+    String.new(NotStringConvertible.new)
diff --git a/doc/irb/irb.rd.ja b/doc/irb/irb.rd.ja
index 416dec3906..81247ce4b0 100644
--- a/doc/irb/irb.rd.ja
+++ b/doc/irb/irb.rd.ja
@@ -40,39 +40,46 @@ irbの使い方は, Rubyさえ知っていればいたって簡単です. 基本
   irb.rb [options] file_name opts
   options:
   -f		    ~/.irbrc を読み込まない.
-  -m		    bcモード(分数, 行列の計算ができる)
   -d                $DEBUG をtrueにする(ruby -d と同じ)
-  -Kc		    ruby -Kcと同じ
   -r load-module    ruby -r と同じ.
-  --verbose	    これから実行する行を表示する(デフォルト)
-  --noverbose	    これから実行する行を表示しない
-  --echo	    実行結果を表示する(デフォルト)
-  --noecho	    実行結果を表示しない
-  --inspect	    結果出力にinspectを用いる(bcモード以外はデフォルト).
+  -I path           $LOAD_PATH に path を追加する.
+  -U                ruby -U と同じ.
+  -E enc            ruby -E と同じ.
+  -w                ruby -w と同じ.
+  -W[level=2]       ruby -W と同じ.
+  --context-mode n  新しいワークスペースを作成した時に関連する Binding
+		    オブジェクトの作成方法を 0 から 3 のいずれかに設定する.
+  --echo	    実行結果を表示する(デフォルト).
+  --noecho	    実行結果を表示しない.
+  --inspect	    結果出力にinspectを用いる.
   --noinspect	    結果出力にinspectを用いない.
-  --readline	    readlineライブラリを利用する.
-  --noreadline	    readlineライブラリを利用しない. デフォルトの動作は,
-		    inf-ruby-mode以外でreadlineライブラリを利用しよう
-		    とする.
-  --prompt prompt-mode
-  --prompt-mode prompt-mode
+  --singleline      シングルラインエディタを利用する.
+  --nosingleline    シングルラインエディタを利用しない. デフォルトの動
+                    作は, inf-ruby-mode以外でシングルラインエディタを利
+                    用しようとする.
+  --colorize	    色付けを利用する.
+  --nocolorize	    色付けを利用しない.
+  --prompt prompt-mode/--prompt-mode prompt-mode
 		    プロンプトモードを切替えます. 現在定義されているプ
 		    ロンプトモードは, default, simple, xmp, inf-rubyが
-		    用意されています. デフォルトはdefaultプロンプトモー
-		    ドになっています.
-
+		    用意されています.
   --inf-ruby-mode   emacsのinf-ruby-mode用のプロンプト表示を行なう. 特
-		    に指定がない限り, readlineライブラリは使わなくなる.
+		    に指定がない限り, ラインエディタは使わなくなる.
   --simple-prompt
 		    非常にシンプルなプロンプトを用いるモードです.
   --noprompt	    プロンプト表示を行なわない.
+  --single-irb	    irb 中で self を実行して得られるオブジェクトをサ
+		    ブ irb と共有する.
   --tracer	    コマンド実行時にトレースを行なう.
   --back-trace-limit n
 		    バックトレース表示をバックトレースの頭から n, 後ろ
 		    からnだけ行なう. デフォルトは16
-  --irb_debug n	    irbのデバッグデバッグレベルをnに設定する(利用しな
-		    い方が無難でしょう).
-  -v, --version	    irbのバージョンを表示する
+
+  --verbose	    詳細なメッセージを出力する.
+  --noverbose	    詳細なメッセージを出力しない(デフォルト).
+  -v, --version	    irbのバージョンを表示する.
+  -h, --help	    irb のヘルプを表示する.
+  --		    以降のコマンドライン引数をオプションとして扱わない.
 
 = コンフィギュレーション
 
@@ -83,7 +90,6 @@ irb起動時に``~/.irbrc''を読み込みます. もし存在しない場合は
 できます.
 
   IRB.conf[:IRB_NAME]="irb"
-  IRB.conf[:MATH_MODE]=false
   IRB.conf[:USE_TRACER]=false
   IRB.conf[:USE_LOADER]=false
   IRB.conf[:IGNORE_SIGINT]=true
@@ -92,13 +98,12 @@ irb起動時に``~/.irbrc''を読み込みます. もし存在しない場合は
   IRB.conf[:IRB_RC] = nil
   IRB.conf[:BACK_TRACE_LIMIT]=16
   IRB.conf[:USE_LOADER] = false
-  IRB.conf[:USE_READLINE] = nil
+  IRB.conf[:USE_SINGLELINE] = nil
   IRB.conf[:USE_TRACER] = false
   IRB.conf[:IGNORE_SIGINT] = true
   IRB.conf[:IGNORE_EOF] = false
   IRB.conf[:PROMPT_MODE] = :DEFAULT
   IRB.conf[:PROMPT] = {...}
-  IRB.conf[:DEBUG_LEVEL]=0
   IRB.conf[:VERBOSE]=true
 
 == プロンプトの設定
@@ -184,9 +189,6 @@ irb拡張コマンドは, 簡単な名前と頭に`irb_'をつけた名前と両
     バックトレース表示をバックトレースの頭からn, 後ろからnだけ行なう.
     デフォルトは16
 
---- conf.debug_level = N
-    irb用のデバッグレベルの設定
-
 --- conf.ignore_eof = true/false
     ^Dが入力された時の動作を設定する. trueの時は^Dを無視する, falseの
     時はirbを終了する.
@@ -198,7 +200,8 @@ irb拡張コマンドは, 簡単な名前と頭に`irb_'をつけた名前と両
       実行中: 実行を中止する.
 
 --- conf.inf_ruby_mode = true/false
-    inf-ruby-mode用のプロンプト表示を行なう. デフォルトはfalse.
+    inf-ruby-mode用のプロンプト表示を行なう. デフォルトはfalse. 特に指定
+    がない限り, ラインエディタは使わなくなる.
 
 --- conf.inspect_mode = true/false/nil
     インスペクトモードを設定する.
@@ -207,9 +210,6 @@ irb拡張コマンドは, 簡単な名前と頭に`irb_'をつけた名前と両
     nil: 通常モードであれば, inspect modeとなり, mathモードの時は, non
 	 inspect modeとなる.
 
---- conf.math_mode
-    参照のみ. bcモード(分数, 行列の計算ができます)かどうか?
-
 --- conf.use_loader = true/false
     load/require時にirbのfile読み込み機能を用いるモードのスイッチ(デフォ
     ルトは用いない). このモードはIRB全体に反映される.
@@ -229,12 +229,19 @@ irb拡張コマンドは, 簡単な名前と頭に`irb_'をつけた名前と両
 --- conf.use_prompt = true/false
     プロンプト表示するかどうか? デフォルトではプロンプトを表示する.
 
---- conf.use_readline = true/false/nil
-    readlineを使うかどうか?
-    true: readlineを使う.
-    false: readlineを使わない.
-    nil: (デフォルト)inf-ruby-mode以外でreadlineライブラリを利用しよ
-         うとする.
+--- conf.use_multiline = true/false/nil
+    マルチラインエディタを使うかどうか?
+    true: マルチラインエディタを使う.
+    false: マルチラインエディタを使わない.
+    nil: (デフォルト)inf-ruby-mode以外でマルチラインエディタを利用しよう
+    とする.
+
+--- conf.use_singleline = true/false/nil
+    シングルラインエディタを使うかどうか?
+    true: シングルラインエディタを使う.
+    false: シングルラインエディタを使わない.
+    nil: (デフォルト)inf-ruby-modeとマルチラインエディタ以外でシングルラ
+         インエディタを利用しようとする.
 #
 #--- conf.verbose=T/F
 #    irbからいろいろなメッセージを出力するか?
@@ -409,4 +416,3 @@ rubyでは, 以下のプログラムはエラーになります.
 % comment-end: "\n"
 % End:
 %
-
diff --git a/doc/keywords.rdoc b/doc/keywords.rdoc
index 98bbd5e864..cb1cff33f0 100644
--- a/doc/keywords.rdoc
+++ b/doc/keywords.rdoc
@@ -76,12 +76,14 @@ for::
   expressions}[rdoc-ref:syntax/control_expressions.rdoc]
 
 if::
-  Used for +if+ and modifier +if+ expressions.  See {control
+  Used for +if+ and modifier +if+ statements.  See {control
   expressions}[rdoc-ref:syntax/control_expressions.rdoc]
 
 in::
   Used to separate the iterable object and iterator variable in a +for+ loop.
   See {control expressions}[rdoc-ref:syntax/control_expressions.rdoc]
+  It also serves as a pattern in a +case+ expression.
+  See {pattern matching}[rdoc-ref:syntax/pattern_matching.rdoc]
 
 module::
   Creates or opens a module.  See {modules and classes
@@ -115,7 +117,9 @@ retry::
   handling}[rdoc-ref:syntax/exceptions.rdoc]
 
 return::
-  Exits a method.  See {methods}[rdoc-ref:syntax/methods.rdoc]
+  Exits a method.  See {methods}[rdoc-ref:syntax/methods.rdoc].
+  If met in top-level scope, immediately stops interpretation of
+  the current file.
 
 self::
   The object the current method is attached to.  See
@@ -137,7 +141,7 @@ undef::
   See {modules and classes}[rdoc-ref:syntax/modules_and_classes.rdoc]
 
 unless::
-  Used for +unless+ and modifier +unless+ expressions.  See {control
+  Used for +unless+ and modifier +unless+ statements.  See {control
   expressions}[rdoc-ref:syntax/control_expressions.rdoc]
 
 until::
diff --git a/doc/maintainers.rdoc b/doc/maintainers.rdoc
index 7d4831f585..64510b2559 100644
--- a/doc/maintainers.rdoc
+++ b/doc/maintainers.rdoc
@@ -13,7 +13,7 @@ A module maintainer is responsible for a certain part of Ruby.
 * They have "developer" role on the Redmine to modify issues.
 * They have authority to decide the feature of their part. But they should always respect discussions on ruby-core/ruby-dev.
 
-A submaintainer of a module is like a maintainer. But The submaintainer does
+A submaintainer of a module is like a maintainer. But the submaintainer does
 not have authority to change/add a feature on his/her part. They need consensus
 on ruby-core/ruby-dev before changing/adding. Some of submaintainers have
 commit right, others don't.
@@ -30,229 +30,388 @@ Koichi Sasada (ko1)
 
 Yukihiro Matsumoto (matz)
 
-=== Documentation
+== Standard Library Maintainers
 
-Zachary Scott (zzak)
+=== Libraries
 
-== Library Maintainers
+[lib/mkmf.rb]
+  _unmaintained_
+[lib/rubygems.rb, lib/rubygems/*]
+  Eric Hodel (drbrain), Hiroshi SHIBATA (hsbt)
+  https://github.com/rubygems/rubygems
+[lib/unicode_normalize.rb, lib/unicode_normalize/*]
+  Martin J. Dürst
 
-[lib/English.rb]
+=== Extensions
+
+[ext/continuation]
+  Koichi Sasada (ko1)
+[ext/coverage]
+  Yusuke Endoh (mame)
+[ext/fiber]
+  Koichi Sasada (ko1)
+[ext/monitor]
+  Koichi Sasada (ko1)
+[ext/objspace]
+  _unmaintained_
+[ext/pty]
   _unmaintained_
+[ext/ripper]
+  _unmaintained_
+[ext/socket]
+  * Tanaka Akira (akr)
+  * API change needs matz's approval
+[ext/win32]
+  NAKAMURA Usaku (usa)
+
+== Default gems Maintainers
+
+=== Libraries
+
 [lib/abbrev.rb]
   Akinori MUSHA (knu)
+  https://github.com/ruby/abbrev
+  https://rubygems.org/gems/abbrev
 [lib/base64.rb]
   Yusuke Endoh (mame)
+  https://github.com/ruby/base64
+  https://rubygems.org/gems/base64
 [lib/benchmark.rb]
   _unmaintained_
+  https://github.com/ruby/benchmark
+  https://rubygems.org/gems/benchmark
+[lib/bundler.rb, lib/bundler/*]
+  Hiroshi SHIBATA (hsbt)
+  https://github.com/rubygems/rubygems
+  https://rubygems.org/gems/bundler
 [lib/cgi.rb, lib/cgi/*]
   Takeyuki Fujioka (xibbar)
-[lib/cmath.rb]
-  _unmaintained_
+  https://github.com/ruby/cgi
+  https://rubygems.org/gems/cgi
 [lib/csv.rb]
-  James Edward Gray II (jeg2)
-[lib/date.rb, lib/date/*]
-  Tadayoshi Funaba (tadf)
-[lib/drb.rb, lib/drb/*]
-  Masatoshi SEKI (seki)
+  Kenta Murata (mrkn), Kouhei Sutou (kou)
+  https://github.com/ruby/csv
+  https://rubygems.org/gems/csv
+[lib/English.rb]
+  _unmaintained_
+  https://github.com/ruby/English
+  https://rubygems.org/gems/English
 [lib/debug.rb]
   _unmaintained_
+  https://github.com/ruby/debug
 [lib/delegate.rb]
   _unmaintained_
-[lib/e2mmap.rb]
-  Keiju ISHITSUKA (keiju)
-[lib/erb.rb]
+  https://github.com/ruby/delegate
+  https://rubygems.org/gems/delegate
+[lib/did_you_mean.rb]
+  Yuki Nishijima (yuki24)
+  https://github.com/ruby/did_you_mean
+  https://rubygems.org/gems/did_you_mean
+[ext/digest, ext/digest/*]
+  Akinori MUSHA (knu)
+  https://github.com/ruby/digest
+  https://rubygems.org/gems/digest
+[lib/drb.rb, lib/drb/*]
   Masatoshi SEKI (seki)
+  https://github.com/ruby/drb
+  https://rubygems.org/gems/drb
+[lib/erb.rb]
+  Masatoshi SEKI (seki), Takashi Kokubun (k0kubun)
+  https://github.com/ruby/erb
+  https://rubygems.org/gems/erb
 [lib/fileutils.rb]
   _unmaintained_
+  https://github.com/ruby/fileutils
+  https://rubygems.org/gems/fileutils
 [lib/find.rb]
   Kazuki Tsujimoto (ktsj)
+  https://github.com/ruby/find
+  https://rubygems.org/gems/find
 [lib/forwardable.rb]
   Keiju ISHITSUKA (keiju)
+  https://github.com/ruby/forwardable
+  https://rubygems.org/gems/forwardable
 [lib/getoptlong.rb]
   _unmaintained_
+  https://github.com/ruby/getoptlong
+  https://rubygems.org/gems/getoptlong
 [lib/ipaddr.rb]
   Akinori MUSHA (knu)
+  https://github.com/ruby/ipaddr
+  https://rubygems.org/gems/ipaddr
 [lib/irb.rb, lib/irb/*]
-  Keiju ISHITSUKA (keiju)
+  aycabta
+  https://github.com/ruby/irb
+  https://rubygems.org/gems/irb
+[lib/optparse.rb, lib/optparse/*]
+  Nobuyuki Nakada (nobu)
+  https://github.com/ruby/optparse
 [lib/logger.rb]
   Naotoshi Seo (sonots)
-[lib/mathn.rb]
-  Keiju ISHITSUKA (keiju)
+  https://github.com/ruby/logger
+  https://rubygems.org/gems/logger
 [lib/matrix.rb]
-  Marc-Andre Lafortune (marcandre)
-[lib/mkmf.rb]
-  _unmaintained_
-[lib/monitor.rb]
-  Shugo Maeda (shugo)
+  Marc-André Lafortune (marcandre)
+  https://github.com/ruby/matrix
+  https://rubygems.org/gems/matrix
 [lib/mutex_m.rb]
   Keiju ISHITSUKA (keiju)
+  https://github.com/ruby/mutex_m
+  https://rubygems.org/gems/mutex_m
 [lib/net/ftp.rb]
   Shugo Maeda (shugo)
+  https://github.com/ruby/net-ftp
+  https://rubygems.org/gems/net-ftp
+[lib/net/http.rb, lib/net/https.rb]
+  NARUSE, Yui (naruse)
+  https://github.com/ruby/net-http
+  https://rubygems.org/gems/net-http
 [lib/net/imap.rb]
   Shugo Maeda (shugo)
-[lib/net/http.rb, lib/net/https]
-  NARUSE, Yui (naruse)
+  https://github.com/ruby/net-imap
+  https://rubygems.org/gems/net-imap
 [lib/net/pop.rb]
   _unmaintained_
-[lib/net/protocol.rb]
-  _unmaintained_
+  https://github.com/ruby/net-pop
+  https://rubygems.org/gems/net-pop
 [lib/net/smtp.rb]
   _unmaintained_
+  https://github.com/ruby/net-smtp
+  https://rubygems.org/gems/net-smtp
+[lib/net/protocol.rb]
+  _unmaintained_
+  https://github.com/ruby/net-protocol
+  https://rubygems.org/gems/net-protocol
 [lib/observer.rb]
   _unmaintained_
-[lib/open-uri.rb]
-  Tanaka Akira (akr)
+  https://github.com/ruby/observer
+  https://rubygems.org/gems/observer
 [lib/open3.rb]
   _unmaintained_
-[lib/optparse.rb, lib/optparse/*]
-  Nobuyuki Nakada (nobu)
+  https://github.com/ruby/open3
+  https://rubygems.org/gems/open3
+[lib/open-uri.rb]
+  Tanaka Akira (akr)
+  https://github.com/ruby/open-uri
 [lib/ostruct.rb]
-  Marc-Andre Lafortune (marcandre)
+  Marc-André Lafortune (marcandre)
+  https://github.com/ruby/ostruct
+  https://rubygems.org/gems/ostruct
 [lib/pp.rb]
   Tanaka Akira (akr)
+  https://github.com/ruby/pp
+  https://rubygems.org/gems/pp
 [lib/prettyprint.rb]
   Tanaka Akira (akr)
+  https://github.com/ruby/prettyprint
+  https://rubygems.org/gems/prettyprint
 [lib/prime.rb]
-  Yuki Sonoda (yugui)
-[lib/profile.rb]
-  _unmaintained_
-[lib/profiler.rb]
-  _unmaintained_
+  Marc-André Lafortune (marcandre)
+  https://github.com/ruby/prime
+  https://rubygems.org/gems/prime
 [lib/pstore.rb]
   _unmaintained_
-[lib/racc/*]
-  Aaron Patterson (tenderlove)
-[lib/rbconfig/*]
-  _unmaintained_
-[lib/rdoc.rb, lib/rdoc/*]
-  Eric Hodel (drbrain)
-[lib/resolv-replace.rb]
-  Tanaka Akira (akr)
+  https://github.com/ruby/pstore
+  https://rubygems.org/gems/pstore
+[lib/racc.rb, lib/racc/*]
+  Aaron Patterson (tenderlove), Hiroshi SHIBATA (hsbt)
+  https://github.com/ruby/racc
+  https://rubygems.org/gems/racc
+[lib/readline.rb]
+  aycabta
+  https://github.com/ruby/readline
+  https://rubygems.org/gems/readline
 [lib/resolv.rb]
   Tanaka Akira (akr)
-[lib/rexml/*]
-  Kouhei Sutou (kou)
+  https://github.com/ruby/resolv
+  https://rubygems.org/gems/resolv
+[lib/resolv-replace.rb]
+  Tanaka Akira (akr)
+  https://github.com/ruby/resolv-replace
+  https://rubygems.org/gems/resolv-replace
+[lib/rdoc.rb, lib/rdoc/*]
+  Eric Hodel (drbrain), Hiroshi SHIBATA (hsbt)
+  https://github.com/ruby/rdoc
+  https://rubygems.org/gems/rdoc
+[lib/reline.rb, lib/reline/*]
+  aycabta
+  https://github.com/ruby/reline
+  https://rubygems.org/gems/reline
 [lib/rinda/*]
   Masatoshi SEKI (seki)
-[lib/rss.rb, lib/rss/*]
-  Kouhei Sutou (kou)
-[lib/rubygems.rb, lib/ubygems.rb, lib/rubygems/*]
-  Eric Hodel (drbrain)
-[lib/scanf.rb]
-  David A. Black (dblack)
-[lib/set.rb]
-  Akinori MUSHA (knu)
+  https://github.com/ruby/rinda
+  https://rubygems.org/gems/rinda
 [lib/securerandom.rb]
   Tanaka Akira (akr)
-[lib/shell.rb, lib/shell/*]
-  Keiju ISHITSUKA (keiju)
+  https://github.com/ruby/securerandom
+  https://rubygems.org/gems/securerandom
+[lib/set.rb]
+  Akinori MUSHA (knu)
+  https://github.com/ruby/set
+  https://rubygems.org/gems/set
 [lib/shellwords.rb]
   Akinori MUSHA (knu)
+  https://github.com/ruby/shellwords
+  https://rubygems.org/gems/shellwords
 [lib/singleton.rb]
   Yukihiro Matsumoto (matz)
-[lib/sync.rb]
-  Keiju ISHITSUKA (keiju)
+  https://github.com/ruby/singleton
+  https://rubygems.org/gems/singleton
 [lib/tempfile.rb]
   _unmaintained_
-[lib/tmpdir.rb]
-  _unmaintained_
-[lib/thwait.rb]
-  Keiju ISHITSUKA (keiju)
+  https://github.com/ruby/tempfile
+  https://rubygems.org/gems/tempfile
 [lib/time.rb]
   Tanaka Akira (akr)
+  https://github.com/ruby/time
+  https://rubygems.org/gems/time
 [lib/timeout.rb]
   Yukihiro Matsumoto (matz)
+  https://github.com/ruby/timeout
+  https://rubygems.org/gems/timeout
+[lib/thwait.rb]
+  Keiju ISHITSUKA (keiju)
+  https://github.com/ruby/thwait
+  https://rubygems.org/gems/thwait
+[lib/tmpdir.rb]
+  _unmaintained_
+  https://github.com/ruby/tmpdir
+  https://rubygems.org/gems/tmpdir
 [lib/tracer.rb]
   Keiju ISHITSUKA (keiju)
+  https://github.com/ruby/tracer
+  https://rubygems.org/gems/tracer
 [lib/tsort.rb]
   Tanaka Akira (akr)
+  https://github.com/ruby/tsort
+  https://rubygems.org/gems/tsort
 [lib/un.rb]
   WATANABE Hirofumi (eban)
-[lib/unicord_normalize.rb, lib/unicord_normalize/*]
-  Martin J. Dürst
+  https://github.com/ruby/un
+  https://rubygems.org/gems/un
 [lib/uri.rb, lib/uri/*]
   YAMADA, Akira (akira)
+  https://github.com/ruby/uri
+  https://rubygems.org/gems/uri
+[lib/yaml.rb, lib/yaml/*]
+  Aaron Patterson (tenderlove), Hiroshi SHIBATA (hsbt)
+  https://github.com/ruby/yaml
+  https://rubygems.org/gems/yaml
 [lib/weakref.rb]
   _unmaintained_
-[lib/webrick.rb, lib/webrick/*]
-  Hiroshi Nakamura (nahi)
-[lib/xmlrpc.rb, lib/xmlrpc/*]
-  Kouhei Sutou (kou)
-[lib/yaml.rb, lib/yaml/*]
-  Aaron Patterson (tenderlove)
+  https://github.com/ruby/weakref
+  https://rubygems.org/gems/weakref
 
-== Extension Maintainers
+=== Extensions
 
 [ext/bigdecimal]
   Kenta Murata (mrkn)
+  https://github.com/ruby/bigdecimal
+  https://rubygems.org/gems/bigdecimal
 [ext/cgi]
   Nobuyoshi Nakada (nobu)
-[ext/continuation]
-  Koichi Sasada (ko1)
-[ext/coverage]
-  Yusuke Endoh (mame)
+  https://github.com/ruby/cgi
+  https://rubygems.org/gems/cgi
 [ext/date]
   _unmaintained_
+  https://github.com/ruby/date
+  https://rubygems.org/gems/date
 [ext/dbm]
   _unmaintained_
-[ext/digest, ext/digest/*]
-  Akinori MUSHA (knu)
+  https://github.com/ruby/dbm
+  https://rubygems.org/gems/dbm
 [ext/etc]
-  _unmaintained_
+  Ruby core team
+  https://github.com/ruby/etc
+  https://rubygems.org/gems/etc
 [ext/fcntl]
-  _unmaintained_
-[ext/fiber]
-  Koichi Sasada (ko1)
+  Ruby core team
+  https://github.com/ruby/fcntl
+  https://rubygems.org/gems/fcntl
 [ext/fiddle]
   Aaron Patterson (tenderlove)
+  https://github.com/ruby/fiddle
+  https://rubygems.org/gems/fiddle
 [ext/gdbm]
   Yukihiro Matsumoto (matz)
+  https://github.com/ruby/gdbm
+  https://rubygems.org/gems/gdbm
 [ext/io/console]
   Nobuyuki Nakada (nobu)
+  https://github.com/ruby/io-console
+  https://rubygems.org/gems/io-console
 [ext/io/nonblock]
   Nobuyuki Nakada (nobu)
+  https://github.com/ruby/io-nonblock
+  https://rubygems.org/gems/io-nonblock
 [ext/io/wait]
   Nobuyuki Nakada (nobu)
+  https://github.com/ruby/io-wait
+  https://rubygems.org/gems/io-wait
 [ext/json]
-  NARUSE, Yui (naruse)
-[ext/mathn/complex]
-  Keiju ISHITSUKA (keiju)
-[ext/mathn/rational]
-  Keiju ISHITSUKA (keiju)
+  NARUSE, Yui (naruse), Hiroshi SHIBATA (hsbt)
+  https://github.com/flori/json
+  https://rubygems.org/gems/json
 [ext/nkf]
-  NARUSE, Yui (narse)
-[ext/objspace]
-  _unmaintained_
+  NARUSE, Yui (naruse)
+  https://github.com/ruby/nkf
+  https://rubygems.org/gems/nkf
 [ext/openssl]
-  Martin Boßlet (emboss)
+  Kazuki Yamaguchi (rhe)
+  https://github.com/ruby/openssl
+  https://rubygems.org/gems/openssl
 [ext/pathname]
   Tanaka Akira (akr)
+  https://github.com/ruby/pathname
+  https://rubygems.org/gems/pathname
 [ext/psych]
-  Aaron Patterson (tenderlove)
-[ext/pty]
-  _unmaintained_
+  Aaron Patterson (tenderlove), Hiroshi SHIBATA (hsbt)
+  https://github.com/ruby/psych
+  https://rubygems.org/gems/psych
 [ext/racc]
-  Aaron Patterson (tenderlove)
+  Aaron Patterson (tenderlove), Hiroshi SHIBATA (hsbt)
+  https://github.com/ruby/racc
+  https://rubygems.org/gems/racc
 [ext/readline]
   TAKAO Kouji (kouji)
-[ext/ripper]
-  _unmaintained_
-[ext/sdbm]
-  Yukihiro Matsumoto (matz)
-[ext/socket]
-  * Tanaka Akira (akr)
-  * API change needs matz's approval
+  https://github.com/ruby/readline-ext
+  https://rubygems.org/gems/readline-ext
 [ext/stringio]
   Nobuyuki Nakada (nobu)
+  https://github.com/ruby/stringio
+  https://rubygems.org/gems/stringio
 [ext/strscan]
-  _unmaintained_
+  Kouhei Sutou (kou)
+  https://github.com/ruby/strscan
+  https://rubygems.org/gems/strscan
 [ext/syslog]
   Akinori MUSHA (knu)
-[ext/tk]
-  Hidetoshi NAGAI (nagai)
-[ext/win32]
-  NAKAMURA Usaku (usa)
+  https://github.com/ruby/syslog
+  https://rubygems.org/gems/syslog
 [ext/win32ole]
   Masaki Suketa (suke)
+  https://github.com/ruby/win32ole
+  https://rubygems.org/gems/win32ole
 [ext/zlib]
-  _unmaintained_
+  NARUSE, Yui (naruse)
+  https://github.com/ruby/zlib
+  https://rubygems.org/gems/zlib
+
+== Bundled gems upstream repositories
+
+[minitest]
+  https://github.com/seattlerb/minitest
+[power_assert]
+  https://github.com/ruby/power_assert
+[rake]
+  https://github.com/ruby/rake
+[test-unit]
+  https://github.com/test-unit/test-unit
+[rexml]
+  https://github.com/ruby/rexml
+[rss]
+  https://github.com/ruby/rss
+[rbs]
+  https://github.com/ruby/rbs
+[typeprof]
+  https://github.com/ruby/typeprof
diff --git a/doc/make_cheatsheet.md b/doc/make_cheatsheet.md
new file mode 100644
index 0000000000..bf245bea03
--- /dev/null
+++ b/doc/make_cheatsheet.md
@@ -0,0 +1,124 @@
+# How to use "configure" and "make" commands for Ruby
+
+This is for developers of Ruby.
+If you are a user of Ruby, please see README.md.
+
+## In-place build
+
+```
+$ autoconf
+$ ./configure --prefix=$PWD/local
+$ make
+$ make install
+$ ./local/bin/ruby -e 'puts "Hello"'
+Hello
+```
+
+## Out-of-place build
+
+```
+$ autoconf
+$ mkdir ../ruby-build
+$ cd ../ruby-build
+$ ../ruby-src/configure --prefix=$PWD/local
+$ make
+$ make install
+$ ./local/bin/ruby -e 'puts "Hello"'
+Hello
+```
+
+## How to run the whole test suite
+
+```
+$ make check
+```
+
+It runs (about) three test suites:
+
+* `make test` (a test suite for the interpreter core)
+* `make test-all` (for all builtin classes and libraries)
+* `make test-spec` (a conformance test suite for Ruby implementations)
+* `make test-bundler` (a test suite for the bundler examples)
+
+## How to run the test suite with log
+
+```
+$ make test OPTS=-v
+
+$ make test-all TESTS=-v
+
+$ make test-spec MSPECOPT=-Vfs
+```
+
+## How to run a part of the test suite
+
+### Runs a directory
+```
+$ make test-all TESTS=test/rubygems
+$ make test-all TESTS=rubygems
+```
+
+### Runs a file
+```
+$ make test-all TESTS=test/ruby/test_foo.rb
+$ make test-all TESTS=ruby/foo
+```
+
+### Runs a test whose name includes test_bar
+```
+$ make test-all TESTS="test/ruby/test_foo.rb -n /test_bar/"
+```
+
+### Runs a file or directory with GNU make
+```
+$ make test/ruby/test_foo.rb
+$ make test/ruby/test_foo.rb TESTOPTS="-n /test_bar/"
+```
+
+### Runs a ruby-spec directory
+```
+$ make test-spec MSPECOPT=spec/ruby/core/foo
+```
+
+### Runs a ruby-spec file
+```
+$ make test-spec MSPECOPT=spec/ruby/core/foo/bar_spec.rb
+```
+
+### Runs a ruby-spec file or directory with GNU make
+```
+$ make spec/ruby/core/foo/bar_spec.rb
+```
+
+### Runs a bundler spec file
+```
+$ make test-bundler BUNDLER_SPECS=commands/exec_spec.rb:58
+```
+
+## How to measure coverage of C and Ruby code
+
+You need to be able to use gcc (gcov) and lcov visualizer.
+
+```
+$ autoconf
+$ ./configure --enable-gcov
+$ make
+$ make update-coverage
+$ rm -f test-coverage.dat
+$ make test-all COVERAGE=true
+$ make lcov
+$ open lcov-out/index.html
+```
+
+If you need only C code coverage, you can remove `COVERAGE=true` from the above process.
+You can also use `gcov` command directly to get per-file coverage.
+
+If you need only Ruby code coverage, you can remove `--enable-gcov`.
+Note that `test-coverage.dat` accumulates all runs of `make test-all`.
+Make sure that you remove the file if you want to measure one test run.
+
+You can see the coverage result of CI: https://rubyci.org/coverage
+
+## How to benchmark
+
+see https://github.com/ruby/ruby/tree/master/benchmark#make-benchmark
diff --git a/doc/marshal.rdoc b/doc/marshal.rdoc
index a51f1bf873..78a3d29d4a 100644
--- a/doc/marshal.rdoc
+++ b/doc/marshal.rdoc
@@ -73,7 +73,7 @@ The first byte has the following special values:
   a positive little-endian integer.
 
 "\xfd"::
-  The total size of the integer is two bytes.  The following three bytes are a
+  The total size of the integer is four bytes.  The following three bytes are a
   negative little-endian integer.
 
 "\x04"::
diff --git a/doc/memory_view.md b/doc/memory_view.md
new file mode 100644
index 0000000000..646a35423a
--- /dev/null
+++ b/doc/memory_view.md
@@ -0,0 +1,167 @@
+# MemoryView
+
+MemoryView provides the features to share multidimensional homogeneous arrays of
+fixed-size element on memory among extension libraries.
+
+## Disclaimer
+
+* This feature is still experimental.  The specification described here can be changed in the future.
+
+* This document is under construction.  Please refer the master branch of ruby for the latest version of this document.
+
+## Overview
+
+We sometimes deal with certain kinds of objects that have arrays of the same typed fixed-size elements on a contiguous memory area as its internal representation.
+Numo::NArray in numo-narray and Magick::Image in rmagick are typical examples of such objects.
+MemoryView plays the role of the hub to share the internal data of such objects without copy among such libraries.
+
+Copy-less sharing of data is very important in some field such as data analysis, machine learning, and image processing.  In these field, people need to handle large amount of on-memory data with several libraries.  If we are forced to copy to exchange large data among libraries, a large amount of the data processing time must be occupied by copying data.  You can avoid such wasting time by using MemoryView.
+
+MemoryView has two categories of APIs:
+
+1. Producer API
+
+    Classes can register own MemoryView entry which allows objects of that classes to expose their MemoryView
+
+2. Consumer API
+
+    Consumer API allows us to obtain and manage the MemoryView of an object
+
+## MemoryView structure
+
+A MemoryView structure, `rb_memory_view_t`, is used for exporting objects' MemoryView.
+This structure contains the reference of the object, which is the owner of the MemoryView, the pointer to the head of exported memory, and the metadata that describes the structure of the memory.  The metadata can describe multidimensional arrays with strides.
+
+### The member of MemoryView structure
+
+The MemoryView structure consists of the following members.
+
+- `VALUE obj`
+
+    The reference to the original object that has the memory exported via the MemoryView.
+
+    RubyVM manages the reference count of the MemoryView-exported objects to guard them from the garbage collection.  The consumers do not have to struggle to guard this object from GC.
+
+- `void *data`
+
+    The pointer to the head of the exported memory.
+
+- `ssize_t byte_size`
+
+    The numbero f bytes in the memory pointed by `data`.
+
+- `bool readonly`
+
+    `true` for readonly memory, `false` for writable memory.
+
+- `const char *format`
+
+    A string to describeth e format of an element, or NULL for unsigned byte.
+
+- `ssize_t item_size`
+
+    The number of bytes in each element.
+
+- `const rb_memory_view_item_component_t *item_desc.components`
+
+    The array of the metadata of the component in an element.
+
+- `size_t item_desc.length`
+
+    The number of items in `item_desc.components`.
+
+- `ssize_t ndim`
+
+    The number of dimensions.
+
+- `const ssize_t *shape`
+
+    A `ndim` size array indicating the number of elements in each dimension.
+    This can be `NULL` when `ndim` is 1.
+
+- `const ssize_t *strides`
+
+    A `ndim` size array indicating the number of bytes to skip to go to the next element in each dimension.
+    This can be `NULL` when `ndim` is 1.
+
+- `const ssize_t *sub_offsets`
+
+    A `ndim` size array consisting of the offsets in each dimension when the MemoryView exposes a nested array.
+    This can be `NULL` when the MemoryView exposes a flat array.
+
+- `void *const private`
+
+    The private data that MemoryView provider uses internally.
+    This can be `NULL` when any private data is unnecessary.
+
+## MemoryView APIs
+
+### For consumers
+
+- `bool rb_memory_view_available_p(VALUE obj)`
+
+    Return `true` if `obj` supports to export a MemoryView.  Return `false` otherwise.
+
+    If this function returns `true`, it doesn't mean the function `rb_memory_view_get` will succeed.
+
+- `bool rb_memory_view_get(VALUE obj, rb_memory_view_t *view, int flags)`
+
+    If the given `obj` supports to export a MemoryView that conforms the given `flags`, this function fills `view` by the information of the MemoryView and returns `true`.  In this case, the reference count of `obj` is increased.
+
+    If the given combination of `obj` and `flags` cannot export a MemoryView, this function returns `false`. The content of `view` is not touched in this case.
+
+    The exported MemoryView must be released by `rb_memory_view_release` when the MemoryView is no longer needed.
+
+- `bool rb_memory_view_release(rb_memory_view_t *view)`
+
+    Release the given MemoryView `view` and decrement the reference count of `view->obj`.
+
+    Consumers must call this function when the MemoryView is no longer needed.  Missing to call this function leads memory leak.
+
+- `ssize_t rb_memory_view_item_size_from_format(const char *format, const char **err)`
+
+    Calculate the number of bytes occupied by an element.
+
+    When the calculation fails, the failed location in `format` is stored into `err`, and returns `-1`.
+
+- `void *rb_memory_view_get_item_pointer(rb_memory_view_t *view, const ssize_t *indices)`
+
+    Calculate the location of the item indicated by the given `indices`.
+    The length of `indices` must equal to `view->ndim`.
+    This function initializes `view->item_desc` if needed.
+
+- `VALUE rb_memory_view_get_item(rb_memory_view_t *view, const ssize_t *indices)`
+
+    Return the Ruby object representation of the item indicated by the given `indices`.
+    The length of `indices` must equal to `view->ndim`.
+    This function uses `rb_memory_view_get_item_pointer`.
+
+- `rb_memory_view_init_as_byte_array(rb_memory_view_t *view, VALUE obj, void *data, const ssize_t len, const bool readonly)`
+
+  Fill the members of `view` as an 1-dimensional byte array.
+
+- `void rb_memory_view_fill_contiguous_strides(const ssize_t ndim, const ssize_t item_size, const ssize_t *const shape, const bool row_major_p, ssize_t *const strides)`
+
+  Fill the `strides` array with byte-Strides of a contiguous array of the given shape with the given element size.
+
+- `void rb_memory_view_prepare_item_desc(rb_memory_view_t *view)`
+
+  Fill the `item_desc` member of `view`.
+
+- `bool rb_memory_view_is_contiguous(const rb_memory_view_t *view)`
+
+  Return `true` if the data in the MemoryView `view` is row-major or column-major contiguous.
+
+  Return `false` otherwise.
+
+- `bool rb_memory_view_is_row_major_contiguous(const rb_memory_view_t *view)`
+
+  Return `true` if the data in the MemoryView `view` is row-major contiguous.
+
+  Return `false` otherwise.
+
+- `bool rb_memory_view_is_column_major_contiguous(const rb_memory_view_t *view)`
+
+  Return `true` if the data in the MemoryView `view` is column-major contiguous.
+
+  Return `false` otherwise.
diff --git a/doc/method_documentation.rdoc b/doc/method_documentation.rdoc
new file mode 100644
index 0000000000..0432216868
--- /dev/null
+++ b/doc/method_documentation.rdoc
@@ -0,0 +1,183 @@
+= Method Documentation Guide
+
+This guide discusses recommendations for documenting methods for Ruby core
+classes and classes in the standard library.
+
+== Goal
+
+The goal when documenting a method is to impart the most important
+information about the method in the least amount of time.  A reader
+of the method documentation should be able to quickly understand
+the purpose of the method and how to use it.  Providing too little
+information about the method is not good, but providing unimportant
+information or unnecessary examples is not good either.  Use your
+judgment about what the user of the method needs to know to use the
+method correctly.
+
+== General Structure
+
+The general structure of the method documentation should be:
+
+* call-seq (for methods written in C)
+* Synopsis (Short Description)
+* Details and Examples
+* Argument Description (if necessary)
+* Corner Cases and Exceptions
+* Aliases
+* Related Methods (optional)
+
+== call-seq (for methods written in C)
+
+For methods written in C, RDoc cannot determine what arguments
+the method accepts, so those need to be documented using a
+<tt>call-seq</tt>.  Here's an example <tt>call-seq</tt>:
+
+  *  call-seq:
+  *    array.count -> integer
+  *    array.count(obj) -> integer
+  *    array.count {|element| ... } -> integer
+
+When creating the <tt>call-seq</tt>, use the form
+
+  receiver_type.method_name(arguments) {|block_arguments|} -> return_type
+
+Omit the parentheses for cases where the method does not accept arguments,
+and omit the block for cases where a block is not accepted.
+
+In the cases where method can return multiple different types, separate the
+types with "or".  If the method can return any type, use "object".  If the
+method returns the receiver, use "self".
+
+In cases where the method accepts optional arguments, use a <tt>call-seq</tt>
+with an optional argument if the method has the same behavior when an argument
+is omitted as when the argument is passed with the default value.  For example,
+use:
+
+  *     obj.respond_to?(symbol, include_all=false) -> true or false
+
+Instead of:
+
+  *     obj.respond_to?(symbol) -> true or false
+  *     obj.respond_to?(symbol, include_all) -> true or false
+
+However, as shown above for <tt>Array#count</tt>, use separate lines if the
+behavior is different if the argument is omitted.
+
+Omit aliases from the call-seq.
+
+== Synopsis
+
+The synopsis comes next, and is a short description of what the
+method does and why you would want to use it.  Ideally, this
+is a single sentence, but for more complex methods it may require
+an entire paragraph.
+
+For <tt>Array#count</tt>, the synopsis is:
+
+  Returns a count of specified elements.
+
+This is great as it is short and descriptive.  Avoid documenting
+too much in the synopsis, stick to the most important information
+for the benefit of the reader.
+
+== Details and Examples
+
+Most non-trivial methods benefit from examples, as well as details
+beyond what is given in the synopsis.  In the details and examples
+section, you can document how the method handles different types
+of arguments, and provides examples on proper usage.  In this
+section, focus on how to use the method properly, not on how the
+method handles improper arguments or corner cases.
+
+Not every behavior of a method requires an example.  If the method
+is documented to return +self+, you don't need to provide an example
+showing the return value is the same as the receiver.  If the method
+is documented to return +nil+, you don't need to provide an example
+showing that it returns +nil+.  If the details mention that for a
+certain argument type, an empty array is returned, you don't need
+to provide an example for that.
+
+Only add an example if it provides the user additional information,
+do not add an example if it provides the same information given
+in the synopsis or details.  The purpose of examples is not to prove
+what the details are stating.
+
+== Argument Description (if necessary)
+
+For methods that require arguments, if not obvious and not explicitly
+mentioned in the details or implicitly shown in the examples, you can
+provide details about the types of arguments supported.  When discussing
+the types of arguments, use simple language even if less-precise, such
+as "level must be an integer", not "level must be an Integer-convertible
+object".  The vast majority of use will be with the expected type, not an
+argument that is explicitly convertible to the expected type, and
+documenting the difference is not important.
+
+For methods that take blocks, it can be useful to document the type of
+argument passed if it is not obvious, not explicitly mentioned in the
+details, and not implicitly shown in the examples.
+
+If there is more than one argument or block argument, use an RDoc
+definition list:
+
+argument_name1 :: type and description
+argument_name2 :: type and description
+
+== Corner Cases and Exceptions
+
+For corner cases of methods, such as atypical usage, briefly mention
+the behavior, but do not provide any examples.
+
+Only document exceptions raised if they are not obvious.  For example,
+if you have stated earlier than an argument type must be an integer,
+you do not need to document that a TypeError is raised if a non-integer
+is passed.  Do not provide examples of exceptions being raised unless
+that is a common case, such as Hash#fetch raising KeyError.
+
+== Aliases
+
+Mention aliases in the form "Array#find_index is an alias for Array#index."
+
+== Related Methods (optional)
+
+In some cases, it is useful to document which methods are related to
+the current method.  For example, documentation for Hash#[] might
+mention Hash#fetch as a related method, and Hash#merge might mention
+#merge! as a related method.  Consider which methods may be related
+to the current method, and if you think the reader would benefit it,
+at the end of the method documentation, add a line starting with
+"Related: " (e.g. "Related: #fetch").  Don't list more than three
+related methods. If you think more than three methods are related,
+pick the three you think are most important and list those three.
+
+== Methods Accepting Multiple Argument Types
+
+For methods that accept multiple argument types, in some cases it can
+be useful to document the different argument types separately.  It's
+best to use a separate paragraph for each case you are discussing.
+
+== Use of English
+
+Readers of this documentation may not be native speakers of English.
+Documentation should be written with this in mind.
+
+Use short sentences and group them into paragraphs that cover a single
+topic.  Avoid complex verb tenses, excessive comma-separated phrases,
+and idioms.
+
+When writing documentation, define unusual or critical concepts in
+simple language.  Provide links to authoritative sources, or add a
+general description to the top-level documentation for the class or
+module.
+
+== Formatting
+
+Extraneous formatting such as headings and horizontal lines should be
+avoided in general.  It is best to keep the formatting as simple as
+possible.  Only use headings and other formatting for the most complex
+cases where the method documentation is very long due to the complexity
+of the method.
+
+Methods are documented using RDoc syntax.  See the
+{RDoc Markup Reference}[https://docs.ruby-lang.org/en/master/RDoc/Markup.html#class-RDoc::Markup-label-RDoc+Markup+Reference]
+for more information on formatting with RDoc syntax.
diff --git a/doc/ractor.md b/doc/ractor.md
new file mode 100644
index 0000000000..0ca36326ab
--- /dev/null
+++ b/doc/ractor.md
@@ -0,0 +1,931 @@
+# Ractor - Ruby's Actor-like concurrent abstraction
+
+Ractor is designed to provide a parallel execution feature of Ruby without thread-safety concerns.
+
+## Summary
+
+### Multiple Ractors in an interpreter process
+
+You can make multiple Ractors and they run in parallel.
+
+* `Ractor.new{ expr }` creates a new Ractor and `expr` is run in parallel on a parallel computer.
+* Interpreter invokes with the first Ractor (called *main Ractor*).
+* If main Ractor terminated, all Ractors receive terminate request like Threads (if main thread (first invoked Thread), Ruby interpreter sends all running threads to terminate execution).
+* Each Ractor has 1 or more Threads.
+  * Threads in a Ractor shares a Ractor-wide global lock like GIL (GVL in MRI terminology), so they can't run in parallel (without releasing GVL explicitly in C-level). Threads in different ractors run in parallel.
+  * The overhead of creating a Ractor is similar to overhead of one Thread creation.
+
+### Limited sharing between multiple ractors
+
+Ractors don't share everything, unlike threads.
+
+* Most objects are *Unshareable objects*, so you don't need to care about thread-safety problem which is caused by sharing.
+* Some objects are *Shareable objects*.
+  * Immutable objects: frozen objects which don't refer to unshareable-objects.
+    * `i = 123`: `i` is an immutable object.
+    * `s = "str".freeze`: `s` is an immutable object.
+    * `a = [1, [2], 3].freeze`: `a` is not an immutable object because `a` refers unshareable-object `[2]` (which is not frozen).
+    * `h = {c: Object}.freeze`: `h` is an immutable object because `h` refers Symbol `:c` and shareable `Object` class object which is not frozen.
+  * Class/Module objects
+  * Special shareable objects
+    * Ractor object itself.
+    * And more...
+
+### Two-types communication between Ractors
+
+Ractors communicate with each other and synchronize the execution by message exchanging between Ractors. There are two message exchange protocols: push type (message passing) and pull type.
+
+* Push type message passing: `Ractor#send(obj)` and `Ractor.receive()` pair.
+  * Sender ractor passes the `obj` to the ractor `r` by `r.send(obj)` and receiver ractor receives the message with `Ractor.receive`.
+  * Sender knows the destination Ractor `r` and the receiver does not know the sender (accept all message from any ractors).
+  * Receiver has infinite queue and sender enqueues the message. Sender doesn't block to put message into this queue.
+  * This type message exchangin is employed by many other Actor-based language.
+  * `Ractor.receive_if{ filter_expr }` is a variant of `Ractor.receive` to select a message.
+* Pull type communication: `Ractor.yield(obj)` and `Ractor#take()` pair.
+  * Sender ractor declare to yield the `obj` by `Ractor.yield(obj)` and receiver Ractor take it with `r.take`.
+  * Sender doesn't know a destination Ractor and receiver knows the sender Ractor `r`.
+  * Sender or receiver will block if there is no other side.
+
+### Copy & Move semantics to send messages
+
+To send unshareable objects as messages, objects are copied or moved.
+
+* Copy: use deep-copy.
+* Move: move membership.
+  * Sender can not access the moved object after moving the object.
+  * Guarantee that at least only 1 Ractor can access the object.
+
+### Thread-safety
+
+Ractor helps to write a thread-safe concurrent program, but we can make thread-unsafe programs with Ractors.
+
+* GOOD: Sharing limitation
+  * Most objects are unshareable, so we can't make data-racy and race-conditional programs.
+  * Shareable objects are protected by an interpreter or locking mechanism.
+* BAD: Class/Module can violate this assumption
+  * To make it compatible with old behavior, classes and modules can introduce data-race and so on.
+  * Ruby programmers should take care if they modify class/module objects on multi Ractor programs.
+* BAD: Ractor can't solve all thread-safety problems
+  * There are several blocking operations (waiting send, waiting yield and waiting take) so you can make a program which has dead-lock and live-lock issues.
+  * Some kind of shareable objects can introduce transactions (STM, for example). However, misusing transactions will generate inconsistent state.
+
+Without Ractor, we need to trace all of state-mutations to debug thread-safety issues.
+With Ractor, you can concentrate to suspicious code which are shared with Ractors.
+
+## Creation and termination
+
+### `Ractor.new`
+
+* `Ractor.new{ expr }` generates another Ractor.
+
+```ruby
+# Ractor.new with a block creates new Ractor
+r = Ractor.new do
+  # This block will be run in parallel with other ractors
+end
+
+# You can name a Ractor with `name:` argument.
+r = Ractor.new name: 'test-name' do
+end
+
+# and Ractor#name returns its name.
+r.name #=> 'test-name'
+```
+
+### Given block isolation
+
+The Ractor execute given `expr` in a given block.
+Given block will be isolated from outer scope by `Proc#isolate`. To prevent sharing unshareable objects between ractors, block outer-variables, `self` and other information are isolated.
+
+Given block will be isolated by `Proc#isolate` method (not exposed yet for Ruby users). `Proc#isolate` is called at Ractor creation timing (`Ractor.new` is called). If given Proc object is not enable to isolate because of outer variables and so on, an error will be raised.
+
+```ruby
+begin
+  a = true
+  r = Ractor.new do
+    a #=> ArgumentError because this block accesses `a`.
+  end
+  r.take # see later
+rescue ArgumentError
+end
+```
+
+* The `self` of the given block is `Ractor` object itself.
+
+```ruby
+r = Ractor.new do
+  p self.class #=> Ractor
+  self.object_id
+end
+r.take == self.object_id #=> false
+```
+
+Passed arguments to `Ractor.new()` becomes block parameters for the given block. However, an interpreter does not pass the parameter object references, but send them as messages (see below for details).
+
+```ruby
+r = Ractor.new 'ok' do |msg|
+  msg #=> 'ok'
+end
+r.take #=> 'ok'
+```
+
+```ruby
+# almost similar to the last example
+r = Ractor.new do
+  msg = Ractor.receive
+  msg
+end
+r.send 'ok'
+r.take #=> 'ok'
+```
+
+### An execution result of given block
+
+Return value of the given block becomes an outgoing message (see below for details).
+
+```ruby
+r = Ractor.new do
+  'ok'
+end
+r.take #=> `ok`
+```
+
+```ruby
+# almost similar to the last example
+r = Ractor.new do
+  Ractor.yield 'ok'
+end
+r.take #=> 'ok'
+```
+
+Error in the given block will be propagated to the receiver of an outgoing message.
+
+```ruby
+r = Ractor.new do
+  raise 'ok' # exception will be transferred to the receiver
+end
+
+begin
+  r.take
+rescue Ractor::RemoteError => e
+  e.cause.class   #=> RuntimeError
+  e.cause.message #=> 'ok'
+  e.ractor        #=> r
+end
+```
+
+## Communication between Ractors
+
+Communication between Ractors is achieved by sending and receiving messages. There is two way to communicate each other.
+
+* (1) Message sending/receiving
+  * (1-1) push type send/receive (sender knows receiver). similar to the Actor model.
+  * (1-2) pull type yield/take (receiver knows sender).
+* (2) Using shareable container objects
+  * Ractor::TVar gem ([ko1/ractor-tvar](https://github.com/ko1/ractor-tvar))
+  * more?
+
+Users can control program execution timing with (1), but should not control with (2) (only manage as critical section).
+
+For message sending and receiving, there are two types APIs: push type and pull type.
+
+* (1-1) send/receive (push type)
+  * `Ractor#send(obj)` (`Ractor#<<(obj)` is an aliases) send a message to the Ractor's incoming port. Incoming port is connected to the infinite size incoming queue so `Ractor#send` will never block.
+  * `Ractor.receive` dequeue a message from its own incoming queue. If the incoming queue is empty, `Ractor.receive` calling will block.
+  * `Ractor.receive_if{|msg| filter_expr }` is variant of `Ractor.receive`. `receive_if` only receives a message which `filter_expr` is true (So `Ractor.receive` is same as `Ractor.receive_if{ true }`.
+* (1-2) yield/take (pull type)
+  * `Ractor.yield(obj)` send an message to a Ractor which are calling `Ractor#take` via outgoing port . If no Ractors are waiting for it, the `Ractor.yield(obj)` will block. If multiple Ractors are waiting for `Ractor.yield(obj)`, only one Ractor can receive the message.
+  * `Ractor#take` receives a message which is waiting by `Ractor.yield(obj)` method from the specified Ractor. If the Ractor does not call `Ractor.yield` yet, the `Ractor#take` call will block.
+* `Ractor.select()` can wait for the success of `take`, `yield` and `receive`.
+* You can close the incoming port or outgoing port.
+  * You can close then with `Ractor#close_incoming` and `Ractor#close_outgoing`.
+  * If the incoming port is closed for a Ractor, you can't `send` to the Ractor. If `Ractor.receive` is blocked for the closed incoming port, then it will raise an exception.
+  * If the outgoing port is closed for a Ractor, you can't call `Ractor#take` and `Ractor.yield` on the Ractor. If ractors are blocking by `Ractor#take` or `Ractor.yield`, closing outgoing port will raise an exception on these blocking ractors.
+  * When a Ractor is terminated, the Ractor's ports are closed.
+* There are 3 way to send an object as a message
+  * (1) Send a reference: Sending a shareable object, send only a reference to the object (fast)
+  * (2) Copy an object: Sending an unshareable object by copying an object deeply (slow). Note that you can not send an object which is not support deep copy. Some `T_DATA` objects are not supported.
+  * (3) Move an object: Sending an unshareable object reference with a membership. Sender Ractor can not access moved objects anymore (raise an exception) after moving it. Current implementation makes new object as a moved object for receiver Ractor and copy references of sending object to moved object.
+  * You can choose "Copy" and "Move" by the `move:` keyword, `Ractor#send(obj, move: true/false)` and `Ractor.yield(obj, move: true/false)` (default is `false` (COPY)).
+
+### Sending/Receiving ports
+
+Each Ractor has _incoming-port_ and _outgoing-port_. Incoming-port is connected to the infinite sized incoming queue.
+
+```
+                  Ractor r
+                 +-------------------------------------------+
+                 | incoming                         outgoing |
+                 | port                                 port |
+   r.send(obj) ->*->[incoming queue]     Ractor.yield(obj) ->*-> r.take
+                 |                |                          |
+                 |                v                          |
+                 |           Ractor.receive                  |
+                 +-------------------------------------------+
+
+
+Connection example: r2.send obj on r1、Ractor.receive on r2
+  +----+     +----+
+  * r1 |---->* r2 *
+  +----+     +----+
+
+
+Connection example: Ractor.yield(obj) on r1, r1.take on r2
+  +----+     +----+
+  * r1 *---->- r2 *
+  +----+     +----+
+
+Connection example: Ractor.yield(obj) on r1 and r2,
+                    and waiting for both simultaneously by Ractor.select(r1, r2)
+
+  +----+
+  * r1 *------+
+  +----+      |
+              +----> Ractor.select(r1, r2)
+  +----+      |
+  * r2 *------|
+  +----+
+```
+
+```ruby
+  r = Ractor.new do
+    msg = Ractor.receive # Receive from r's incoming queue
+    msg # send back msg as block return value
+  end
+  r.send 'ok' # Send 'ok' to r's incoming port -> incoming queue
+  r.take      # Receive from r's outgoing port
+```
+
+The last example shows the following ractor network.
+
+```
+       
+  +------+        +---+
+  * main |------> * r *---+
+  +-----+         +---+   |
+      ^                   |
+      +-------------------+
+```
+
+And this code can be rewrite more simple way by using an argument for `Ractor.new`.
+
+```ruby
+  # Actual argument 'ok' for `Ractor.new()` will be send to created Ractor.
+  r = Ractor.new 'ok' do |msg|
+    # Values for formal parameters will be received from incoming queue.
+    # Similar to: msg = Ractor.receive
+
+    msg # Return value of the given block will be sent via outgoing port
+  end
+
+  # receive from the r's outgoing port.
+  r.take #=> `ok`
+```
+
+### Return value of a block for `Ractor.new`
+
+As already explained, the return value of `Ractor.new` (an evaluated value of `expr` in `Ractor.new{ expr }`) can be taken by `Ractor#take`.
+
+```ruby
+Ractor.new{ 42 }.take #=> 42
+```
+
+When the block return value is available, the Ractor is dead so that no ractors except taken Ractor can touch the return value, so any values can be sent with this communication path without any modification.
+
+```ruby
+r = Ractor.new do
+  a = "hello"
+  binding
+end
+
+r.take.eval("p a") #=> "hello" (other communication path can not send a Binding object directly)
+```
+
+### Wait for multiple Ractors with `Ractor.select`
+
+You can wait multiple Ractor's `yield` with `Ractor.select(*ractors)`.
+The return value of `Ractor.select()` is `[r, msg]` where `r` is yielding Ractor and `msg` is yielded message.
+
+Wait for a single ractor (same as `Ractor.take`):
+
+```ruby
+r1 = Ractor.new{'r1'}
+
+r, obj = Ractor.select(r1)
+r == r1 and obj == 'r1' #=> true
+```
+
+Wait for two ractors:
+
+```ruby
+r1 = Ractor.new{'r1'}
+r2 = Ractor.new{'r2'}
+rs = [r1, r2]
+as = []
+
+# Wait for r1 or r2's Ractor.yield
+r, obj = Ractor.select(*rs)
+rs.delete(r)
+as << obj
+
+# Second try (rs only contain not-closed ractors)
+r, obj = Ractor.select(*rs)
+rs.delete(r)
+as << obj
+as.sort == ['r1', 'r2'] #=> true
+```
+
+Complex example:
+
+```ruby
+  pipe = Ractor.new do
+    loop do
+      Ractor.yield Ractor.receive
+    end
+  end
+
+  RN = 10
+  rs = RN.times.map{|i|
+    Ractor.new pipe, i do |pipe, i|
+      msg = pipe.take
+      msg # ping-pong
+    end
+  }
+  RN.times{|i|
+    pipe << i
+  }
+  RN.times.map{
+    r, n = Ractor.select(*rs)
+    rs.delete r
+    n
+  }.sort #=> [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+```
+
+Multiple Ractors can send to one Ractor.
+
+```ruby
+# Create 10 ractors and they send objects to pipe ractor.
+# pipe ractor yield received objects
+
+  pipe = Ractor.new do
+    loop do
+      Ractor.yield Ractor.receive
+    end
+  end
+
+  RN = 10
+  rs = RN.times.map{|i|
+    Ractor.new pipe, i do |pipe, i|
+      pipe << i
+    end
+  }
+
+  RN.times.map{
+    pipe.take
+  }.sort #=> [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+```
+
+TODO: Current `Ractor.select()` has the same issue of `select(2)`, so this interface should be refined.
+
+TODO: `select` syntax of go-language uses round-robin technique to make fair scheduling. Now `Ractor.select()` doesn't use it.
+
+### Closing Ractor's ports
+
+* `Ractor#close_incoming/outgoing` close incoming/outgoing ports (similar to `Queue#close`).
+* `Ractor#close_incoming`
+  * `r.send(obj) ` where `r`'s incoming port is closed, will raise an exception.
+  * When the incoming queue is empty and incoming port is closed, `Ractor.receive` raise an exception. If the incoming queue is not empty, it dequeues an object without exceptions.
+* `Ractor#close_outgoing`
+  * `Ractor.yield` on a Ractor which closed the outgoing port, it will raise an exception.
+  * `Ractor#take` for a Ractor which closed the outgoing port, it will raise an exception. If `Ractor#take` is blocking, it will raise an exception.
+* When a Ractor terminates, the ports are closed automatically.
+  * Return value of the Ractor's block will be yielded as `Ractor.yield(ret_val)`, even if the implementation terminates the based native thread.
+
+Example (try to take from closed Ractor):
+
+```ruby
+  r = Ractor.new do
+    'finish'
+  end
+  r.take # success (will return 'finish')
+  begin
+    o = r.take # try to take from closed Ractor
+  rescue Ractor::ClosedError
+    'ok'
+  else
+    "ng: #{o}"
+  end
+```
+
+Example (try to send to closed (terminated) Ractor):
+
+```ruby
+  r = Ractor.new do
+  end
+
+  r.take # wait terminate
+
+  begin
+    r.send(1)
+  rescue Ractor::ClosedError
+    'ok'
+  else
+    'ng'
+  end
+```
+
+When multiple Ractors waiting for `Ractor.yield()`, `Ractor#close_outgoing` will cancel all blocking by raise an exception (`ClosedError`).
+
+### Send a message by copying
+
+`Ractor#send(obj)` or `Ractor.yield(obj)` copy `obj` deeply if `obj` is an unshareable object.
+
+```ruby
+obj = 'str'.dup
+r = Ractor.new obj do |msg|
+  # return received msg's object_id
+  msg.object_id
+end
+
+obj.object_id == r.take #=> false
+```
+
+Some objects are not supported to copy the value, and raise an exception.
+
+```ruby
+obj = Thread.new{}
+begin
+  Ractor.new obj do |msg|
+    msg
+  end
+rescue TypeError => e
+  e.message #=> #<TypeError: allocator undefined for Thread>
+else
+  'ng' # unreachable here
+end
+```
+
+### Send a message by moving
+
+`Ractor#send(obj, move: true)` or `Ractor.yield(obj, move: true)` move `obj` to the destination Ractor.
+If the source Ractor touches the moved object (for example, call the method like `obj.foo()`), it will be an error.
+
+```ruby
+# move with Ractor#send
+r = Ractor.new do
+  obj = Ractor.receive
+  obj << ' world'
+end
+
+str = 'hello'
+r.send str, move: true
+modified = r.take #=> 'hello world'
+
+# str is moved, and accessing str from this Ractor is prohibited
+
+begin
+  # Error because it touches moved str.
+  str << ' exception' # raise Ractor::MovedError
+rescue Ractor::MovedError
+  modified #=> 'hello world'
+else
+  raise 'unreachable'
+end
+```
+
+```ruby
+  # move with Ractor.yield
+  r = Ractor.new do
+    obj = 'hello'
+    Ractor.yield obj, move: true
+    obj << 'world'  # raise Ractor::MovedError
+  end
+
+  str = r.take
+  begin
+    r.take
+  rescue Ractor::RemoteError
+    p str #=> "hello"
+  end
+```
+
+Some objects are not supported to move, and an exception will be raise.
+
+```ruby
+r = Ractor.new do
+  Ractor.receive
+end
+
+r.send(Thread.new{}, move: true) #=> allocator undefined for Thread (TypeError)
+```
+
+To achieve the access prohibition for moved objects, _class replacement_ technique is used to implement it.
+
+### Shareable objects
+
+The following objects are shareable.
+
+* Immutable objects
+  * Small integers, some symbols, `true`, `false`, `nil` (a.k.a. `SPECIAL_CONST_P()` objects in internal)
+  * Frozen native objects
+    * Numeric objects: `Float`, `Complex`, `Rational`, big integers (`T_BIGNUM` in internal)
+    * All Symbols.
+  * Frozen `String` and `Regexp` objects (their instance variables should refer only sharble objects)
+* Class, Module objects (`T_CLASS`, `T_MODULE` and `T_ICLASS` in internal)
+* `Ractor` and other special objects which care about synchronization.
+
+Implementation: Now shareable objects (`RVALUE`) have `FL_SHAREABLE` flag. This flag can be added lazily.
+
+To make sharable objects, `Ractor.make_shareable(obj)` method is provided. In this case, try to make sharaeble by freezing `obj` and recursively travasible objects. This method accepts `copy:` keyword (default value is false).`Ractor.make_sharable(obj, copy: true)` tries to make a deep copy of `obj` and make the copied object sharable.
+
+## Language changes to isolate unshareable objects between Ractors
+
+To isolate unshareable objects between Ractors, we introduced additional language semantics on multi-Ractor Ruby programs.
+
+Note that without using Ractors, these additional semantics is not needed (100% compatible with Ruby 2).
+
+### Global variables
+
+Only the main Ractor (a Ractor created at starting of interpreter) can access global variables.
+
+```ruby
+  $gv = 1
+  r = Ractor.new do
+    $gv
+  end
+
+  begin
+    r.take
+  rescue Ractor::RemoteError => e
+    e.cause.message #=> 'can not access global variables from non-main Ractors'
+  end
+```
+
+Note that some special global variables are ractor-local, like `$stdin`, `$stdout`, `$stderr`. See [[Bug #17268]](https://bugs.ruby-lang.org/issues/17268) for more details.
+
+### Instance variables of shareable objects
+
+Only the main Ractor can access instance variables of shareable objects.
+
+```ruby
+  class C
+    @iv = 'str'
+  end
+
+  r = Ractor.new do
+    class C
+      p @iv
+    end
+  end
+
+
+  begin
+    r.take
+  rescue => e
+    e.class #=> Ractor::IsolationError
+  end
+```
+
+```ruby
+  shared = Ractor.new{}
+  shared.instance_variable_set(:@iv, 'str')
+
+  r = Ractor.new shared do |shared|
+    p shared.instance_variable_get(:@iv)
+  end
+
+  begin
+    r.take
+  rescue Ractor::RemoteError => e
+    e.cause.message #=> can not access instance variables of shareable objects from non-main Ractors (Ractor::IsolationError)
+  end
+```
+
+Note that instance variables for class/module objects are also prohibited on Ractors.
+
+### Class variables
+
+Only the main Ractor can access class variables.
+
+```ruby
+  class C
+    @@cv = 'str'
+  end
+
+  r = Ractor.new do
+    class C
+      p @@cv
+    end
+  end
+
+
+  begin
+    r.take
+  rescue => e
+    e.class #=> Ractor::IsolationError
+  end
+```
+
+### Constants
+
+Only the main Ractor can read constants which refer to the unshareable object.
+
+```ruby
+  class C
+    CONST = 'str'
+  end
+  r = Ractor.new do
+    C::CONST
+  end
+  begin
+    r.take
+  rescue => e
+    e.class #=> Ractor::IsolationError
+  end
+```
+
+Only the main Ractor can define constants which refer to the unshareable object.
+
+```ruby
+  class C
+  end
+  r = Ractor.new do
+    C::CONST = 'str'
+  end
+  begin
+    r.take
+  rescue => e
+    e.class #=> Ractor::IsolationError
+  end
+```
+
+To make multi-ractor supported library, the constants should only refer sharable objects.
+
+```ruby
+TABLE = {a: 'ko1', b: 'ko2', c: 'ko3'}
+```
+
+In this case, `TABLE` reference an unsharable Hash object. So that other ractors can not refer `TABLE` constant. To make it shareable, we can use `Ractor.make_sharable()` like that.
+
+```ruby
+TABLE = Ractor.make_sharable( {a: 'ko1', b: 'ko2', c: 'ko3'} )
+```
+
+To make it easy, Ruby 3.0 introduced new `shareable_constant_value` Directive.
+
+```ruby
+shareable_constant_value: literal
+
+TABLE = {a: 'ko1', b: 'ko2', c: 'ko3'}
+#=> Same as: TABLE = Ractor.make_sharable( {a: 'ko1', b: 'ko2', c: 'ko3'} )
+```
+
+`shareable_constant_value` directive accepts the following modes (descriptions use the example: `CONST = expr`):
+
+* none: Do nothing. Same as: `CONST = expr`
+* literal:
+  * if `expr` is consites of literals, replaced to `CONST = Ractor.make_sharable(expr)`.
+  * otherwise: replaced to `CONST = expr.tap{|o| raise unless Ractor.shareable?}`.
+* experimental_everything: replaced to `CONST = Ractor.make_sharable(expr)`.
+* experimental_copy: replaced to `CONST = Ractor.make_sharable(expr, copy: true)`.
+
+Except the `none` mode (default), it is guaranteed that the assigned constants refer to only sharable objects.
+
+See [doc/syntax/comment.rdoc](syntax/comment.rdoc) for more details.
+
+## Implementation note
+
+* Each Ractor has its own thread, it means each Ractor has at least 1 native thread.
+* Each Ractor has its own ID (`rb_ractor_t::pub::id`).
+  * On debug mode, all unshareable objects are labeled with current Ractor's id, and it is checked to detect unshareable object leak (access an object from different Ractor) in VM.
+
+## Examples
+
+### Traditional Ring example in Actor-model
+
+```ruby
+RN = 1_000
+CR = Ractor.current
+
+r = Ractor.new do
+  p Ractor.receive
+  CR << :fin
+end
+
+RN.times{
+  r = Ractor.new r do |next_r|
+    next_r << Ractor.receive
+  end
+}
+
+p :setup_ok
+r << 1
+p Ractor.receive
+```
+
+### Fork-join
+
+```ruby
+def fib n
+  if n < 2
+    1
+  else
+    fib(n-2) + fib(n-1)
+  end
+end
+
+RN = 10
+rs = (1..RN).map do |i|
+  Ractor.new i do |i|
+    [i, fib(i)]
+  end
+end
+
+until rs.empty?
+  r, v = Ractor.select(*rs)
+  rs.delete r
+  p answer: v
+end
+```
+
+### Worker pool
+
+```ruby
+require 'prime'
+
+pipe = Ractor.new do
+  loop do
+    Ractor.yield Ractor.receive
+  end
+end
+
+N = 1000
+RN = 10
+workers = (1..RN).map do
+  Ractor.new pipe do |pipe|
+    while n = pipe.take
+      Ractor.yield [n, n.prime?]
+    end
+  end
+end
+
+(1..N).each{|i|
+  pipe << i
+}
+
+pp (1..N).map{
+  _r, (n, b) = Ractor.select(*workers)
+  [n, b]
+}.sort_by{|(n, b)| n}
+```
+
+### Pipeline
+
+```ruby
+# pipeline with yield/take
+r1 = Ractor.new do
+  'r1'
+end
+
+r2 = Ractor.new r1 do |r1|
+  r1.take + 'r2'
+end
+
+r3 = Ractor.new r2 do |r2|
+  r2.take + 'r3'
+end
+
+p r3.take #=> 'r1r2r3'
+```
+
+```ruby
+# pipeline with send/receive
+
+r3 = Ractor.new Ractor.current do |cr|
+  cr.send Ractor.receive + 'r3'
+end
+
+r2 = Ractor.new r3 do |r3|
+  r3.send Ractor.receive + 'r2'
+end
+
+r1 = Ractor.new r2 do |r2|
+  r2.send Ractor.receive + 'r1'
+end
+
+r1 << 'r0'
+p Ractor.receive #=> "r0r1r2r3"
+```
+
+### Supervise
+
+```ruby
+# ring example again
+
+r = Ractor.current
+(1..10).map{|i|
+  r = Ractor.new r, i do |r, i|
+    r.send Ractor.receive + "r#{i}"
+  end
+}
+
+r.send "r0"
+p Ractor.receive #=> "r0r10r9r8r7r6r5r4r3r2r1"
+```
+
+```ruby
+# ring example with an error
+
+r = Ractor.current
+rs = (1..10).map{|i|
+  r = Ractor.new r, i do |r, i|
+    loop do
+      msg = Ractor.receive
+      raise if /e/ =~ msg
+      r.send msg + "r#{i}"
+    end
+  end
+}
+
+r.send "r0"
+p Ractor.receive #=> "r0r10r9r8r7r6r5r4r3r2r1"
+r.send "r0"
+p Ractor.select(*rs, Ractor.current) #=> [:receive, "r0r10r9r8r7r6r5r4r3r2r1"]
+r.send "e0"
+p Ractor.select(*rs, Ractor.current)
+#=>
+#<Thread:0x000056262de28bd8 run> terminated with exception (report_on_exception is true):
+Traceback (most recent call last):
+        2: from /home/ko1/src/ruby/trunk/test.rb:7:in `block (2 levels) in <main>'
+        1: from /home/ko1/src/ruby/trunk/test.rb:7:in `loop'
+/home/ko1/src/ruby/trunk/test.rb:9:in `block (3 levels) in <main>': unhandled exception
+Traceback (most recent call last):
+        2: from /home/ko1/src/ruby/trunk/test.rb:7:in `block (2 levels) in <main>'
+        1: from /home/ko1/src/ruby/trunk/test.rb:7:in `loop'
+/home/ko1/src/ruby/trunk/test.rb:9:in `block (3 levels) in <main>': unhandled exception
+        1: from /home/ko1/src/ruby/trunk/test.rb:21:in `<main>'
+<internal:ractor>:69:in `select': thrown by remote Ractor. (Ractor::RemoteError)
+```
+
+```ruby
+# resend non-error message
+
+r = Ractor.current
+rs = (1..10).map{|i|
+  r = Ractor.new r, i do |r, i|
+    loop do
+      msg = Ractor.receive
+      raise if /e/ =~ msg
+      r.send msg + "r#{i}"
+    end
+  end
+}
+
+r.send "r0"
+p Ractor.receive #=> "r0r10r9r8r7r6r5r4r3r2r1"
+r.send "r0"
+p Ractor.select(*rs, Ractor.current)
+[:receive, "r0r10r9r8r7r6r5r4r3r2r1"]
+msg = 'e0'
+begin
+  r.send msg
+  p Ractor.select(*rs, Ractor.current)
+rescue Ractor::RemoteError
+  msg = 'r0'
+  retry
+end
+
+#=> <internal:ractor>:100:in `send': The incoming-port is already closed (Ractor::ClosedError)
+# because r == r[-1] is terminated.
+```
+
+```ruby
+# ring example with supervisor and re-start
+
+def make_ractor r, i
+  Ractor.new r, i do |r, i|
+    loop do
+      msg = Ractor.receive
+      raise if /e/ =~ msg
+      r.send msg + "r#{i}"
+    end
+  end
+end
+
+r = Ractor.current
+rs = (1..10).map{|i|
+  r = make_ractor(r, i)
+}
+
+msg = 'e0' # error causing message
+begin
+  r.send msg
+  p Ractor.select(*rs, Ractor.current)
+rescue Ractor::RemoteError
+  r = rs[-1] = make_ractor(rs[-2], rs.size-1)
+  msg = 'x0'
+  retry
+end
+
+#=> [:receive, "x0r9r9r8r7r6r5r4r3r2r1"]
+```
diff --git a/doc/regexp.rdoc b/doc/regexp.rdoc
index 49fce51a8d..d84cae1771 100644
--- a/doc/regexp.rdoc
+++ b/doc/regexp.rdoc
@@ -63,12 +63,14 @@ The following are <i>metacharacters</i> <tt>(</tt>, <tt>)</tt>,
 <tt>[</tt>, <tt>]</tt>, <tt>{</tt>, <tt>}</tt>, <tt>.</tt>, <tt>?</tt>,
 <tt>+</tt>, <tt>*</tt>. They have a specific meaning when appearing in a
 pattern. To match them literally they must be backslash-escaped. To match
-a backslash literally backslash-escape that: <tt>\\\\\\</tt>.
+a backslash literally, backslash-escape it: <tt>\\\\</tt>.
 
     /1 \+ 2 = 3\?/.match('Does 1 + 2 = 3?') #=> #<MatchData "1 + 2 = 3?">
+    /a\\\\b/.match('a\\\\b')                    #=> #<MatchData "a\\b">
 
-Patterns behave like double-quoted strings so can contain the same
-backslash escapes.
+Patterns behave like double-quoted strings and can contain the same
+backslash escapes (the meaning of <tt>\s</tt> is different, however,
+see below[#label-Character+Classes]).
 
     /\s\u{6771 4eac 90fd}/.match("Go to 東京都")
         #=> #<MatchData " 東京都">
@@ -130,6 +132,9 @@ The following metacharacters also behave like character classes:
 * <tt>/\H/</tt> - A non-hexdigit character (<tt>[^0-9a-fA-F]</tt>)
 * <tt>/\s/</tt> - A whitespace character: <tt>/[ \t\r\n\f\v]/</tt>
 * <tt>/\S/</tt> - A non-whitespace character: <tt>/[^ \t\r\n\f\v]/</tt>
+* <tt>/\R/</tt> - A linebreak: <tt>\n</tt>, <tt>\v</tt>, <tt>\f</tt>, <tt>\r</tt>
+  <tt>\u0085</tt> (NEXT LINE), <tt>\u2028</tt> (LINE SEPARATOR), <tt>\u2029</tt> (PARAGRAPH SEPARATOR)
+  or <tt>\r\n</tt>.
 
 POSIX <i>bracket expressions</i> are also similar to character classes.
 They provide a portable alternative to the above, with the added benefit
@@ -188,8 +193,11 @@ At least one uppercase character ('H'), at least one lowercase character
 Repetition is <i>greedy</i> by default: as many occurrences as possible
 are matched while still allowing the overall match to succeed. By
 contrast, <i>lazy</i> matching makes the minimal amount of matches
-necessary for overall success. A greedy metacharacter can be made lazy by
-following it with <tt>?</tt>.
+necessary for overall success. Most greedy metacharacters can be made lazy
+by following them with <tt>?</tt>. For the <tt>{n}</tt> pattern, because
+it specifies an exact number of characters to match and not a variable
+number of characters, the <tt>?</tt> metacharacter instead makes the
+repeated pattern optional.
 
 Both patterns below match the string. The first uses a greedy quantifier so
 '.+' matches '<a><b>'; the second uses a lazy quantifier so '.+?' matches
@@ -227,7 +235,7 @@ Capture groups can be referred to by name when defined with the
 constructs.
 
     /\$(?<dollars>\d+)\.(?<cents>\d+)/.match("$3.67")
-        => #<MatchData "$3.67" dollars:"3" cents:"67">
+        #=> #<MatchData "$3.67" dollars:"3" cents:"67">
     /\$(?<dollars>\d+)\.(?<cents>\d+)/.match("$3.67")[:dollars] #=> "3"
 
 Named groups can be backreferenced with <tt>\k<</tt><i>name</i><tt>></tt>,
@@ -237,7 +245,15 @@ where _name_ is the group name.
         #=> #<MatchData "ototo" vowel:"o">
 
 *Note*: A regexp can't use named backreferences and numbered
-backreferences simultaneously.
+backreferences simultaneously. Also, if a named capture is used in a
+regexp, then parentheses used for grouping which would otherwise result
+in a unnamed capture are treated as non-capturing.
+
+    /(\w)(\w)/.match("ab").captures # => ["a", "b"]
+    /(\w)(\w)/.match("ab").named_captures # => {}
+
+    /(?<c>\w)(\w)/.match("ab").captures # => ["a"]
+    /(?<c>\w)(\w)/.match("ab").named_captures # => {"c"=>"a"}
 
 When named capture groups are used with a literal regexp on the left-hand
 side of an expression and the <tt>=~</tt> operator, the captured text is
@@ -540,10 +556,15 @@ options which control how the pattern can match.
 subexpression level with the
 <tt>(?</tt><i>on</i><tt>-</tt><i>off</i><tt>)</tt> construct, which
 enables options <i>on</i>, and disables options <i>off</i> for the
-expression enclosed by the parentheses.
+expression enclosed by the parentheses:
+
+    /a(?i:b)c/.match('aBc')   #=> #<MatchData "aBc">
+    /a(?-i:b)c/i.match('ABC') #=> nil
+
+Additionally, these options can also be toggled for the remainder of the
+pattern:
 
-    /a(?i:b)c/.match('aBc') #=> #<MatchData "aBc">
-    /a(?i:b)c/.match('abc') #=> #<MatchData "abc">
+    /a(?i)bc/.match('abC') #=> #<MatchData "abC">
 
 Options may also be used with <tt>Regexp.new</tt>:
 
@@ -607,9 +628,9 @@ regexp's encoding can be explicitly fixed by supplying
 <tt>Regexp.new</tt>:
 
     r = Regexp.new("a".force_encoding("iso-8859-1"),Regexp::FIXEDENCODING)
-    r =~"a\u3042"
-       #=> Encoding::CompatibilityError: incompatible encoding regexp match
-            (ISO-8859-1 regexp with UTF-8 string)
+    r =~ "a\u3042"
+       # raises Encoding::CompatibilityError: incompatible encoding regexp match
+       #         (ISO-8859-1 regexp with UTF-8 string)
 
 == Special global variables
 
diff --git a/doc/security.rdoc b/doc/security.rdoc
index 378699fb15..ae20ed30fa 100644
--- a/doc/security.rdoc
+++ b/doc/security.rdoc
@@ -7,27 +7,14 @@ This document aims to discuss many of these pitfalls and provide more secure
 alternatives where applicable.
 
 Please check the full list of publicly known CVEs and how to correctly report a
-security vulnerability, at: http://www.ruby-lang.org/en/security/
-Japanese version is here: http://www.ruby-lang.org/ja/security/
+security vulnerability, at: https://www.ruby-lang.org/en/security/
+Japanese version is here: https://www.ruby-lang.org/ja/security/
 
 Security vulnerabilities should be reported via an email to
 mailto:security@ruby-lang.org ({the PGP public
-key}[http://www.ruby-lang.org/security.asc]), which is a private mailing list.
+key}[https://www.ruby-lang.org/security.asc]), which is a private mailing list.
 Reported problems will be published after fixes.
 
-== <code>$SAFE</code>
-
-Ruby provides a mechanism to restrict what operations can be performed by Ruby
-code in the form of the <code>$SAFE</code> variable.
-
-However, <code>$SAFE</code> does not provide a secure environment for executing
-untrusted code.
-
-If you need to execute untrusted code, you should use an operating system level
-sandboxing mechanism. On Linux, ptrace or LXC can be used to sandbox
-potentially malicious code. Other similar mechanisms exist on every major
-operating system.
-
 == +Marshal.load+
 
 Ruby's +Marshal+ module provides methods for serializing and deserializing Ruby
diff --git a/doc/shell.rd.ja b/doc/shell.rd.ja
deleted file mode 100644
index a9507fe92a..0000000000
--- a/doc/shell.rd.ja
+++ /dev/null
@@ -1,335 +0,0 @@
- -- shell.rb
-				$Release Version: 0.6.0 $
-			   	$Revision$
-			   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
-
-=begin
-
-= 目的
-
-ruby上でsh/cshのようにコマンドの実行及びフィルタリングを手軽に行う.
-sh/cshの制御文はrubyの機能を用いて実現する.
-
-= 主なクラス一覧
-
-== Shell
-
-Shellオブジェクトはカレントディレクトリを持ち, コマンド実行はそこからの
-相対パスになります.
-
---- Shell#cwd
---- Shell#dir
---- Shell#getwd
---- Shell#pwd
-
-      カレントディレクトリを返す。
-
---- Shell#system_path
-
-      コマンドサーチパスの配列を返す。
-
---- Shell#umask
-
-      umaskを返す。
-
-== Filter
-
-コマンドの実行結果はすべてFilterとしてかえります. Enumerableをincludeし
-ています.
-
-= 主なメソッド一覧
-
-== コマンド定義
-
-OS上のコマンドを実行するにはまず, Shellのメソッドとして定義します.
-
-注) コマンドを定義しなくとも直接実行できるShell#systemコマンドもあります.
-
---- Shell.def_system_command(command, path = command)
-
-      Shellのメソッドとしてcommandを登録します.
-
-      例)
-      Shell.def_system_command "ls"
-        ls を定義
-
-      Shell.def_system_command "sys_sort", "sort"
-        sortコマンドをsys_sortとして定義
-
---- Shell.undef_system_command(command)
-
-      commandを削除します.
-
---- Shell.alias_command(ali, command, *opts) {...}
-
-      commandのaliasをします.
-
-      例)
-        Shell.alias_command "lsC", "ls", "-CBF", "--show-control-chars"
-        Shell.alias_command("lsC", "ls"){|*opts| ["-CBF", "--show-control-chars", *opts]}
-
---- Shell.unalias_command(ali)
-
-      commandのaliasを削除します.
-
---- Shell.install_system_commands(pre = "sys_")
-
-      system_path上にある全ての実行可能ファイルをShellに定義する. メソッ
-      ド名は元のファイル名の頭にpreをつけたものとなる.
-
-== 生成
-
---- Shell.new
-
-      プロセスのカレントディレクトリをカレントディレクトリとするShellオ
-      ブジェクトを生成します.
-
---- Shell.cd(path)
-
-      pathをカレントディレクトリとするShellオブジェクトを生成します.
-
-== プロセス管理
-
---- Shell#jobs
-
-      スケジューリングされているjobの一覧を返す.
-
---- Shell#kill sig, job
-
-      jobにシグナルsigを送る
-
-== カレントディレクトリ操作
-
---- Shell#cd(path, &block)
---- Shell#chdir
-
-      カレントディレクトリをpathにする. イテレータとして呼ばれたときには
-      ブロック実行中のみカレントディレクトリを変更する.
-
---- Shell#pushd(path = nil, &block)
---- Shell#pushdir
-
-      カレントディレクトリをディレクトリスタックにつみ, カレントディレク
-      トリをpathにする. pathが省略されたときには, カレントディレクトリと
-      ディレクトリスタックのトップを交換する. イテレータとして呼ばれたと
-      きには, ブロック実行中のみpushdする.
-
---- Shell#popd
---- Shell#popdir
-
-      ディレクトリスタックからポップし, それをカレントディレクトリにする.
-
-== ファイル/ディレクトリ操作
-
---- Shell#foreach(path = nil, &block)
-
-      pathがファイルなら, File#foreach
-      pathがディレクトリなら, Dir#foreach
-
---- Shell#open(path, mode)
-
-      pathがファイルなら, File#open
-      pathがディレクトリなら, Dir#open
-
---- Shell#unlink(path)
-
-      pathがファイルなら, File#unlink
-      pathがディレクトリなら, Dir#unlink
-
---- Shell#test(command, file1, file2)
---- Shell#[command, file1, file2]
-
-      ファイルテスト関数testと同じ.
-      例)
-          sh[?e, "foo"]
-          sh[:e, "foo"]
-          sh["e", "foo"]
-          sh[:exists?, "foo"]
-          sh["exists?", "foo"]
-
---- Shell#mkdir(*path)
-
-      Dir.mkdirと同じ(複数可)
-
---- Shell#rmdir(*path)
-
-      Dir.rmdirと同じ(複数可)
-
-== コマンド実行
-
---- System#system(command, *opts)
-
-      commandを実行する.
-      例)
-        print sh.system("ls", "-l")
-        sh.system("ls", "-l") | sh.head > STDOUT
-
---- System#rehash
-
-      リハッシュする
-
---- Shell#transact &block
-
-      ブロック中ではshellをselfとして実行する.
-      例)
-        sh.transact{system("ls", "-l") | head > STDOUT}
-
---- Shell#out(dev = STDOUT, &block)
-
-      transactを呼び出しその結果をdevに出力する.
-
-== 内部コマンド
-
---- Shell#echo(*strings)
---- Shell#cat(*files)
---- Shell#glob(patten)
---- Shell#tee(file)
-
-      これらは実行すると, それらを内容とするFilterオブジェクトを返します.
-
---- Filter#each &block
-
-      フィルタの一行ずつをblockに渡す.
-
---- Filter#<(src)
-
-      srcをフィルタの入力とする. srcが, 文字列ならばファイルを, IOであれ
-      ばそれをそのまま入力とする.
-
---- Filter#>(to)
-
-      srcをフィルタの出力とする. toが, 文字列ならばファイルに, IOであれ
-      ばそれをそのまま出力とする.
-
---- Filter#>>(to)
-
-      srcをフィルタに追加する. toが, 文字列ならばファイルに, IOであれば
-      それをそのまま出力とする.
-
---- Filter#|(filter)
-
-      パイプ結合
-
---- Filter#+(filter)
-
-      filter1 + filter2 は filter1の出力の後, filter2の出力を行う.
-
---- Filter#to_a
---- Filter#to_s
-
-== 組込みコマンド
-
---- Shell#atime(file)
---- Shell#basename(file, *opt)
---- Shell#chmod(mode, *files)
---- Shell#chown(owner, group, *file)
---- Shell#ctime(file)
---- Shell#delete(*file)
---- Shell#dirname(file)
---- Shell#ftype(file)
---- Shell#join(*file)
---- Shell#link(file_from, file_to)
---- Shell#lstat(file)
---- Shell#mtime(file)
---- Shell#readlink(file)
---- Shell#rename(file_from, file_to)
---- Shell#split(file)
---- Shell#stat(file)
---- Shell#symlink(file_from, file_to)
---- Shell#truncate(file, length)
---- Shell#utime(atime, mtime, *file)
-
-      これらはFileクラスにある同名のクラスメソッドと同じです.
-
---- Shell#blockdev?(file)
---- Shell#chardev?(file)
---- Shell#directory?(file)
---- Shell#executable?(file)
---- Shell#executable_real?(file)
---- Shell#exist?(file)/Shell#exists?(file)
---- Shell#file?(file)
---- Shell#grpowned?(file)
---- Shell#owned?(file)
---- Shell#pipe?(file)
---- Shell#readable?(file)
---- Shell#readable_real?(file)
---- Shell#setgid?(file)
---- Shell#setuid?(file)
---- Shell#size(file)/Shell#size?(file)
---- Shell#socket?(file)
---- Shell#sticky?(file)
---- Shell#symlink?(file)
---- Shell#writable?(file)
---- Shell#writable_real?(file)
---- Shell#zero?(file)
-
-      これらはFileTestクラスにある同名のクラスメソッドと同じです.
-
---- Shell#syscopy(filename_from, filename_to)
---- Shell#copy(filename_from, filename_to)
---- Shell#move(filename_from, filename_to)
---- Shell#compare(filename_from, filename_to)
---- Shell#safe_unlink(*filenames)
---- Shell#makedirs(*filenames)
---- Shell#install(filename_from, filename_to, mode)
-
-      これらはFileToolsクラスにある同名のクラスメソッドと同じです.
-
-      その他, 以下のものがエイリアスされています.
-
---- Shell#cmp	<- Shell#compare
---- Shell#mv	<- Shell#move
---- Shell#cp	<- Shell#copy
---- Shell#rm_f	<- Shell#safe_unlink
---- Shell#mkpath	<- Shell#makedirs
-
-= サンプル
-
-== ex1
-
-  sh = Shell.cd("/tmp")
-  sh.mkdir "shell-test-1" unless sh.exists?("shell-test-1")
-  sh.cd("shell-test-1")
-  for dir in ["dir1", "dir3", "dir5"]
-    if !sh.exists?(dir)
-      sh.mkdir dir
-      sh.cd(dir) do
-	f = sh.open("tmpFile", "w")
-	f.print "TEST\n"
-	f.close
-      end
-      print sh.pwd
-    end
-  end
-
-== ex2
-
-  sh = Shell.cd("/tmp")
-  sh.transact do
-    mkdir "shell-test-1" unless exists?("shell-test-1")
-    cd("shell-test-1")
-    for dir in ["dir1", "dir3", "dir5"]
-      if !exists?(dir)
-	mkdir dir
-	cd(dir) do
-	  f = open("tmpFile", "w")
-	  f.print "TEST\n"
-	  f.close
-	end
-	print pwd
-      end
-    end
-  end
-
-== ex3
-
-  sh.cat("/etc/printcap") | sh.tee("tee1") > "tee2"
-  (sh.cat < "/etc/printcap") | sh.tee("tee11") > "tee12"
-  sh.cat("/etc/printcap") | sh.tee("tee1") >> "tee2"
-  (sh.cat < "/etc/printcap") | sh.tee("tee11") >> "tee12"
-
-== ex4
-
-  print sh.cat("/etc/passwd").head.collect{|l| l =~ /keiju/}
-
-=end
diff --git a/doc/signals.rdoc b/doc/signals.rdoc
new file mode 100644
index 0000000000..403eb66549
--- /dev/null
+++ b/doc/signals.rdoc
@@ -0,0 +1,106 @@
+= Caveats for implementing Signal.trap callbacks
+
+As with implementing signal handlers in C or most other languages,
+all code passed to Signal.trap must be reentrant.  If you are not
+familiar with reentrancy, you need to read up on it at
+{Wikipedia}[https://en.wikipedia.org/wiki/Reentrancy_(computing)] or
+elsewhere before reading the rest of this document.
+
+Most importantly, "thread-safety" does not guarantee reentrancy;
+and methods such as Mutex#lock and Mutex#synchronize which are
+commonly used for thread-safety even prevent reentrancy.
+
+== An implementation detail of the Ruby VM
+
+The Ruby VM defers Signal.trap callbacks from running until it is safe
+for its internal data structures, but it does not know when it is safe
+for data structures in YOUR code.  Ruby implements deferred signal
+handling by registering short C functions with only
+{async-signal-safe functions}[http://man7.org/linux/man-pages/man7/signal-safety.7.html] as
+signal handlers.  These short C functions only do enough tell the VM to
+run callbacks registered via Signal.trap later in the main Ruby Thread.
+
+== Unsafe methods to call in Signal.trap blocks
+
+When in doubt, consider anything not listed as safe below as being
+unsafe.
+
+* Mutex#lock, Mutex#synchronize and any code using them are explicitly
+  unsafe.  This includes Monitor in the standard library which uses
+  Mutex to provide reentrancy.
+
+* Dir.chdir with block
+
+* any IO write operations when IO#sync is false;
+  including IO#write, IO#write_nonblock, IO#puts.
+  Pipes and sockets default to `IO#sync = true', so it is safe to
+  write to them unless IO#sync was disabled.
+
+* File#flock, as the underlying flock(2) call is not specified by POSIX
+
+== Commonly safe operations inside Signal.trap blocks
+
+* Assignment and retrieval of local, instance, and class variables
+
+* Most object allocations and initializations of common types
+  including Array, Hash, String, Struct, Time.
+
+* Common Array, Hash, String, Struct operations which do not execute a block
+  are generally safe; but beware if iteration is occurring elsewhere.
+
+* Hash#[], Hash#[]= (unless Hash.new was given an unsafe block)
+
+* Thread::Queue#push and Thread::SizedQueue#push (since Ruby 2.1)
+
+* Creating a new Thread via Thread.new/Thread.start can used to get
+  around the unusability of Mutexes inside a signal handler
+
+* Signal.trap is safe to use inside blocks passed to Signal.trap
+
+* arithmetic on Integer and Float (`+', `-', '%', '*', '/')
+
+  Additionally, signal handlers do not run between two successive
+  local variable accesses, so shortcuts such as `+=' and `-=' will
+  not trigger a data race when used on Integer and Float classes in
+  signal handlers.
+
+== System call wrapper methods which are safe inside Signal.trap
+
+Since Ruby has wrappers around many
+{async-signal-safe C functions}[http://man7.org/linux/man-pages/man7/signal-safety.7.html]
+the corresponding wrappers for many IO, File, Dir, and Socket methods
+are safe.
+
+(Incomplete list)
+
+* Dir.chdir (without block arg)
+* Dir.mkdir
+* Dir.open
+* File#truncate
+* File.link
+* File.open
+* File.readlink
+* File.rename
+* File.stat
+* File.symlink
+* File.truncate
+* File.unlink
+* File.utime
+* IO#close
+* IO#dup
+* IO#fsync
+* IO#read
+* IO#read_nonblock
+* IO#stat
+* IO#sysread
+* IO#syswrite
+* IO.select
+* IO.pipe
+* Process.clock_gettime
+* Process.exit!
+* Process.fork
+* Process.kill
+* Process.pid
+* Process.ppid
+* Process.waitpid
+...
diff --git a/doc/standard_library.rdoc b/doc/standard_library.rdoc
index 3cd124bac2..e4418aea81 100644
--- a/doc/standard_library.rdoc
+++ b/doc/standard_library.rdoc
@@ -8,18 +8,34 @@ description.
 
 == Libraries
 
+MakeMakefile:: Module used to generate a Makefile for C extensions
+RbConfig:: Information of your configure and build of Ruby
+Gem:: Package management framework for Ruby
+
+== Extensions
+
+Coverage:: Provides coverage measurement for Ruby
+Monitor:: Provides an object or module to use safely by more than one thread
+objspace:: Extends ObjectSpace module to add methods for internal statistics
+PTY:: Creates and manages pseudo terminals
+Ripper:: Provides an interface for parsing Ruby programs into S-expressions
+Socket:: Access underlying OS socket implementations
+
+= Default gems
+
+== Libraries
+
 Abbrev:: Calculates a set of unique abbreviations for a given set of strings
 Base64:: Support for encoding and decoding binary data using a Base64 representation
 Benchmark:: Provides methods to measure and report the time used to execute code
+Bundler:: Manage your Ruby application's gem dependencies
 CGI:: Support for the Common Gateway Interface protocol
-CMath:: Provides Trigonometric and Transcendental functions for complex numbers
-ConditionVariable:: Augments the Mutex class, provided by thread.rb
 CSV:: Provides an interface to read and write CSV files and data
 DEBUGGER__:: Debugging functionality for Ruby
 Delegator:: Provides three abilities to delegate method calls to an object
+DidYouMean:: "Did you mean?" experience in Ruby
 DRb:: Distributed object system for Ruby
-E2MM:: Module for defining custom exceptions with specific messages
-English.rb:: Require 'English.rb' to reference global variables with less cryptic names
+English:: Provides references to special global variables with less cryptic names
 ERB:: An easy to use but powerful templating system for Ruby
 FileUtils:: Several file utility methods for copying, moving, removing, etc
 Find:: This module supports top-down traversal of a set of file paths
@@ -27,11 +43,9 @@ Forwardable:: Provides delegation of specified methods to a designated object
 GetoptLong:: Parse command line options similar to the GNU C getopt_long()
 IPAddr:: Provides methods to manipulate IPv4 and IPv6 IP addresses
 IRB:: Interactive Ruby command-line tool for REPL (Read Eval Print Loop)
+OptionParser:: Ruby-oriented class for command-line option analysis
 Logger:: Provides a simple logging utility for outputting messages
-mathn.rb:: Deprecated library that extends math operations
-MakeMakefile:: Module used to generate a Makefile for C extensions
 Matrix:: Represents a mathematical matrix.
-Monitor:: Provides an object or module to use safely by more than one thread
 Mutex_m:: Mixin to extend objects to be handled like a Mutex
 Net::FTP:: Support for the File Transfer Protocol
 Net::HTTP:: HTTP client api for Ruby
@@ -39,35 +53,22 @@ Net::IMAP:: Ruby client api for Internet Message Access Protocol
 Net::POP3:: Ruby client library for POP3
 Net::SMTP:: Simple Mail Transfer Protocol client library for Ruby
 Observable:: Provides a mechanism for publish/subscribe pattern in Ruby
-OpenURI:: An easy-to-use wrapper for Net::HTTP, Net::HTTPS and Net::FTP
 Open3:: Provides access to stdin, stdout and stderr when running other programs
-OptionParser:: Ruby-oriented class for command-line option analysis
 OpenStruct:: Class to build custom data structures, similar to a Hash
+OpenURI:: An easy-to-use wrapper for Net::HTTP, Net::HTTPS and Net::FTP
 PP:: Provides a PrettyPrinter for Ruby objects
 PrettyPrinter:: Implements a pretty printing algorithm for readable structure
 Prime:: Prime numbers and factorization library
-profile.rb:: Runs the Ruby Profiler__
-Profiler__:: Provides a way to profile your Ruby application
 PStore:: Implements a file based persistence mechanism based on a Hash
-Queue:: Synchronized communication between threads, provided by thread.rb
-Racc:: A LALR(1) parser generator written in Ruby.
-RbConfig:: Information of your configure and build of Ruby
-RDoc:: Produces HTML and command-line documentation for Ruby
-resolv-replace.rb:: Replace Socket DNS with Resolv
 Resolv::  Thread-aware DNS resolver library in Ruby
-REXML:: An XML toolkit for Ruby
+resolv-replace.rb:: Replace Socket DNS with Resolv
+RDoc:: Produces HTML and command-line documentation for Ruby
 Rinda:: The Linda distributed computing paradigm in Ruby
-RSS:: Family of libraries that support various formats of XML "feeds"
-Gem:: Package management framework for Ruby
-Scanf:: A Ruby implementation of the C function scanf(3)
 SecureRandom:: Interface for secure random number generator
 Set:: Provides a class to deal with collections of unordered, unique values
-Shell:: An idiomatic Ruby interface for common UNIX shell commands
 Shellwords:: Manipulates strings with word parsing rules of UNIX Bourne shell
 Singleton:: Implementation of the Singleton pattern for Ruby
-Synchronizer:: A module that provides a two-phase lock with a counter
 Tempfile:: A utility class for managing temporary files
-ThreadsWait:: Watches for termination of multiple threads
 Time:: Extends the Time class with methods for parsing and conversion
 Timeout:: Auto-terminate potentially long-running operations in Ruby
 tmpdir.rb:: Extends the Dir class to manage the OS temporary file path
@@ -75,15 +76,12 @@ Tracer:: Outputs a source level execution trace of a Ruby program
 TSort:: Topological sorting using Tarjan's algorithm
 un.rb:: Utilities to replace common UNIX commands
 URI:: A Ruby module providing support for Uniform Resource Identifiers
-WeakRef:: Allows a referenced object to be garbage-collected
-WEBrick:: An HTTP server toolkit for Ruby
-XMLRPC:: Remote Procedure Call over HTTP support for Ruby
 YAML:: Ruby client library for the Psych YAML implementation
+WeakRef:: Allows a referenced object to be garbage-collected
 
 == Extensions
 
 BigDecimal:: Provides arbitrary-precision floating point decimal arithmetic
-Coverage:: Provides coverage measurement for Ruby
 Date:: A subclass of Object includes Comparable module for handling dates
 DateTime:: Subclass of Date to handling dates, hours, minutes, seconds, offsets
 DBM:: Provides a wrapper for the UNIX-style Database Manager Library
@@ -92,21 +90,29 @@ Etc:: Provides access to information typically stored in UNIX /etc directory
 Fcntl:: Loads constants defined in the OS fcntl.h C header file
 Fiddle:: A libffi wrapper for Ruby
 GDBM:: Ruby extension for the GNU dbm (gdbm) library
-IO:: Extensions for Ruby IO class, including #wait and ::console
+IO:: Extensions for Ruby IO class, including #wait, #nonblock and ::console
 JSON:: Implements Javascript Object Notation for Ruby
 NKF:: Ruby extension for Network Kanji Filter
-objspace:: Extends ObjectSpace module to add methods for internal statistics
 OpenSSL:: Provides SSL, TLS and general purpose cryptography for Ruby
 Pathname:: Representation of the name of a file or directory on the filesystem
 Psych:: A YAML parser and emitter for Ruby
-PTY:: Creates and manages pseudo terminals
+Racc:: A LALR(1) parser generator written in Ruby.
 Readline:: Provides an interface for GNU Readline and Edit Line (libedit)
-Ripper:: Provides an interface for parsing Ruby programs into S-expressions
-SBDM:: Provides a simple file-based key-value store with String keys and values
-Socket:: Access underlying OS socket implementations
 StringIO:: Pseudo I/O on String objects
 StringScanner:: Provides lexical scanning operations on a String
 Syslog:: Ruby interface for the POSIX system logging facility
-Tk:: Provides a framework for building a Graphical User Interface (GUI)
 WIN32OLE:: Provides an interface for OLE Automation in Ruby
 Zlib:: Ruby interface for the zlib compression/decompression library
+
+= Bundled gems
+
+== Libraries
+
+MiniTest:: A test suite with TDD, BDD, mocking and benchmarking
+PowerAssert:: Power Assert for Ruby.
+Rake:: Ruby build program with capabilities similar to make
+Test::Unit:: A compatibility layer for MiniTest
+REXML:: An XML toolkit for Ruby
+RSS:: Family of libraries that support various formats of XML "feeds"
+RBS:: RBS is a language to describe the structure of Ruby programs
+TypeProf:: A type analysis tool for Ruby code based on abstract interpretation
diff --git a/doc/syntax.rdoc b/doc/syntax.rdoc
index fe0f98ce4c..5895673f36 100644
--- a/doc/syntax.rdoc
+++ b/doc/syntax.rdoc
@@ -11,6 +11,9 @@ Assignment[rdoc-ref:syntax/assignment.rdoc] ::
 {Control Expressions}[rdoc-ref:syntax/control_expressions.rdoc] ::
   +if+, +unless+, +while+, +until+, +for+, +break+, +next+, +redo+
 
+{Pattern matching}[rdoc-ref:syntax/pattern_matching.rdoc] ::
+  Experimental structural pattern matching and variable binding syntax
+
 Methods[rdoc-ref:syntax/methods.rdoc] ::
   Method and method argument syntax
 
@@ -27,8 +30,10 @@ Precedence[rdoc-ref:syntax/precedence.rdoc] ::
   Precedence of ruby operators
 
 Refinements[rdoc-ref:syntax/refinements.rdoc] ::
-  Use and behavior of the experimental refinements feature
+  Use and behavior of the refinements feature
 
 Miscellaneous[rdoc-ref:syntax/miscellaneous.rdoc] ::
   +alias+, +undef+, +BEGIN+, +END+
 
+Comments[rdoc-ref:syntax/comments.rdoc] ::
+  Line and block code comments
diff --git a/doc/syntax/assignment.rdoc b/doc/syntax/assignment.rdoc
index 83300cbece..a1806e4c48 100644
--- a/doc/syntax/assignment.rdoc
+++ b/doc/syntax/assignment.rdoc
@@ -92,8 +92,9 @@ Now any reference to +big_calculation+ is considered a local variable and will
 be cached.  To call the method, use <code>self.big_calculation</code>.
 
 You can force a method call by using empty argument parentheses as shown above
-or by using an explicit receiver like <code>self.</code>.  Using an explicit
-receiver may raise a NameError if the method's visibility is not public.
+or by using an explicit receiver like <code>self</code>.  Using an explicit
+receiver may raise a NameError if the method's visibility is not public or the
+receiver is the literal <code>self</code>.
 
 Another commonly confusing case is when using a modifier +if+:
 
@@ -109,6 +110,28 @@ The confusion comes from the out-of-order execution of the expression.  First
 the local variable is assigned-to then you attempt to call a nonexistent
 method.
 
+== Local Variables and eval
+
+Using +eval+ to evaluate Ruby code will allow access to local variables defined
+in the same scope, even if the local variables are not defined until after the
+call to +eval+.  However, local variables defined inside the call to +eval+
+will not be reflected in the surrounding scope.  Inside the call to +eval+,
+local variables defined in the surrounding scope and local variables defined
+inside the call to +eval+ will be accessible.  However, you will not be able
+to access local variables defined in previous or subsequent calls to +eval+ in
+the same scope. Consider each +eval+ call a separate nested scope. Example:
+
+  def m
+    eval "bar = 1"
+    lvs = eval "baz = 2; ary = [local_variables, foo, baz]; x = 2; ary"
+    eval "quux = 3"
+    foo = 1
+    lvs << local_variables
+  end
+
+  m
+  # => [[:baz, :ary, :x, :lvs, :foo], nil, 2, [:lvs, :foo]]
+
 == Instance Variables
 
 Instance variables are shared across all methods for the same object.
diff --git a/doc/syntax/calling_methods.rdoc b/doc/syntax/calling_methods.rdoc
index ec86ef05ee..fc806d5c31 100644
--- a/doc/syntax/calling_methods.rdoc
+++ b/doc/syntax/calling_methods.rdoc
@@ -27,13 +27,66 @@ This sends the +my_method+ message to +my_object+.  Any object can be a
 receiver but depending on the method's visibility sending a message may raise a
 NoMethodError.
 
-You may use <code>&.</code> to designate a receiver, then +my_method+ is not
-invoked and the result is +nil+ when the receiver is +nil+.  In that case, the
-arguments of +my_method+ are not evaluated.
-
 You may also use <code>::</code> to designate a receiver, but this is rarely
 used due to the potential for confusion with <code>::</code> for namespaces.
 
+=== Chaining \Method Calls
+
+You can "chain" method calls by immediately following one method call with another.
+
+This example chains methods Array#append and Array#compact:
+
+  a = [:foo, 'bar', 2]
+  a1 = [:baz, nil, :bam, nil]
+  a2 = a.append(*a1).compact
+  a2 # => [:foo, "bar", 2, :baz, :bam]
+
+Details:
+
+- First method <tt>merge</tt> creates a copy of <tt>a</tt>,
+  appends (separately) each element of <tt>a1</tt> to the copy, and returns
+    [:foo, "bar", 2, :baz, nil, :bam, nil]
+- Chained method <tt>compact</tt> creates a copy of that return value,
+  removes its <tt>nil</tt>-valued entries, and returns
+     [:foo, "bar", 2, :baz, :bam]
+
+You can chain methods that are in different classes.
+This example chains methods Hash#to_a and Array#reverse:
+
+  h = {foo: 0, bar: 1, baz: 2}
+  h.to_a.reverse # => [[:baz, 2], [:bar, 1], [:foo, 0]]
+
+Details:
+
+- First method Hash#to_a converts <tt>a</tt> to an \Array, and returns
+    [[:foo, 0], [:bar, 1], [:baz, 2]]
+- Chained method Array#reverse creates copy of that return value,
+  reverses it, and  returns
+    [[:baz, 2], [:bar, 1], [:foo, 0]]
+
+=== Safe Navigation Operator
+
+<code>&.</code>, called "safe navigation operator", allows to skip method call
+when receiver is +nil+. It returns +nil+ and doesn't evaluate method's arguments
+if the call is skipped.
+
+  REGEX = /(ruby) is (\w+)/i
+  "Ruby is awesome!".match(REGEX).values_at(1, 2)
+  # => ["Ruby", "awesome"]
+  "Python is fascinating!".match(REGEX).values_at(1, 2)
+  # NoMethodError: undefined method `values_at' for nil:NilClass
+  "Python is fascinating!".match(REGEX)&.values_at(1, 2)
+  # => nil
+
+This allows to easily chain methods which could return empty value. Note that
+<code>&.</code> skips only one next call, so for a longer chain it is necessary
+to add operator on each level:
+
+  "Python is fascinating!".match(REGEX)&.values_at(1, 2).join(' - ')
+  # NoMethodError: undefined method `join' for nil:NilClass
+  "Python is fascinating!".match(REGEX)&.values_at(1, 2)&.join(' - ')
+  # => nil
+
 == Arguments
 
 There are three types of arguments when sending a message, the positional
@@ -79,7 +132,7 @@ to:
 If the method definition has a <code>*argument</code> extra positional
 arguments will be assigned to +argument+ in the method as an Array.
 
-If the method definition doesn't include keyword arguments the keyword or
+If the method definition doesn't include keyword arguments, the keyword or
 hash-type arguments are assigned as a single hash to the last argument:
 
   def my_method(options)
@@ -153,7 +206,8 @@ like positional arguments:
   my_method(positional1, keyword1: value1, keyword2: value2)
 
 Any keyword arguments not given will use the default value from the method
-definition.  If a keyword argument is given that the method did not list an
+definition.  If a keyword argument is given that the method did not list,
+and the method definition does not accept arbitrary keyword arguments, an
 ArgumentError will be raised.
 
 === Block Argument
@@ -259,6 +313,9 @@ hash at the end of the array into keyword arguments:
   arguments = [1, 2, { c: 4 }]
   my_method(*arguments)
 
+Note that this behavior is currently deprecated and will emit a warning.
+This behavior will be removed in Ruby 3.0.
+
 You may also use the <code>**</code> (described next) to convert a Hash into
 keyword arguments.
 
@@ -266,7 +323,10 @@ If the number of objects in the Array do not match the number of arguments for
 the method, an ArgumentError will be raised.
 
 If the splat operator comes first in the call, parentheses must be used to
-avoid a warning.
+avoid a warning:
+
+  my_method *arguments  # warning
+  my_method(*arguments) # no warning
 
 === Hash to Keyword Arguments Conversion
 
@@ -275,7 +335,8 @@ Given the following method:
   def my_method(first: 1, second: 2, third: 3)
   end
 
-You can turn a Hash into keyword arguments with the <code>**</code> operator:
+You can turn a Hash into keyword arguments with the <code>**</code>
+(keyword splat) operator:
 
   arguments = { first: 3, second: 4, third: 5 }
   my_method(**arguments)
@@ -289,8 +350,9 @@ Both are equivalent to:
 
   my_method(first: 3, second: 4, third: 5)
 
-If the method definition uses <code>**</code> to gather arbitrary keyword
-arguments, they will not be gathered by <code>*</code>:
+If the method definition uses the keyword splat operator to
+gather arbitrary keyword arguments, they will not be gathered
+by <code>*</code>:
 
   def my_method(*a, **kw)
     p arguments: a, keywords: kw
@@ -300,10 +362,7 @@ arguments, they will not be gathered by <code>*</code>:
 
 Prints:
 
-  {:arguments=>[1, 2, {"3"=>4}], :keywords=>{:five=>6}}
-
-Unlike the splat operator described above, the <code>**</code> operator has no
-commonly recognized name.
+  {:arguments=>[1, 2], :keywords=>{'3'=>4, :five=>6}}
 
 === Proc to Block Conversion
 
@@ -314,17 +373,17 @@ Given a method that use a block:
   end
 
 You can convert a proc or lambda to a block argument with the <code>&</code>
-operator:
+(block conversion) operator:
 
   argument = proc { |a| puts "#{a.inspect} was yielded" }
 
   my_method(&argument)
 
-If the splat operator comes first in the call, parenthesis must be used to
-avoid a warning.
+If the block conversion operator comes first in the call, parenthesis must be
+used to avoid a warning:
 
-Unlike the splat operator described above, the <code>&</code> operator has no
-commonly recognized name.
+  my_method &argument  # warning
+  my_method(&argument) # no warning
 
 == Method Lookup
 
diff --git a/doc/syntax/comments.rdoc b/doc/syntax/comments.rdoc
new file mode 100644
index 0000000000..650d13c2dc
--- /dev/null
+++ b/doc/syntax/comments.rdoc
@@ -0,0 +1,253 @@
+= Code Comments
+
+Ruby has two types of comments: inline and block.
+
+Inline comments start with the <code>#</code> character and continue until the
+end of the line:
+
+  # On a separate line
+  class Foo # or at the end of the line
+    # can be indented
+    def bar
+    end
+  end
+
+Block comments start with <code>=begin</code> and end with <code>=end</code>.
+Each should start on a separate line.
+
+  =begin
+  This is
+  commented out
+  =end
+
+  class Foo
+  end
+
+  =begin some_tag
+  this works, too
+  =end
+
+<code>=begin</code> and <code>=end</code> can not be indented, so this is a
+syntax error:
+
+  class Foo
+    =begin
+    Will not work
+    =end
+  end
+
+== Magic Comments
+
+While comments are typically ignored by Ruby, special "magic comments" contain
+directives that affect how the code is interpreted.
+
+Top-level magic comments must start on the first line, or on the second line if
+the first line looks like <tt>#! shebang line</tt>.
+
+NOTE: Magic comments affect only the file in which they appear;
+other files are unaffected.
+
+  # frozen_string_literal: true
+
+  var = 'hello'
+  var.frozen? # => true
+
+=== Alternative syntax
+
+Magic comments may consist of a single directive (as in the example above).
+Alternatively, multiple directives may appear on the same line if separated by ";"
+and wrapped between "-*-" (see Emacs' {file variables}[https://www.gnu.org/software/emacs/manual/html_node/emacs/Specifying-File-Variables.html]).
+
+  # emacs-compatible; -*- coding: big5; mode: ruby -*-
+
+  p 'hello'.frozen? # => true
+  p 'hello'.encoding # => #<Encoding:Big5>
+
+=== +encoding+ Directive
+
+Indicates which string encoding should be used for string literals,
+regexp literals and <code>__ENCODING__</code>:
+
+  # encoding: big5
+
+  ''.encoding # => #<Encoding:Big5>
+
+Default encoding is UTF-8.
+
+It must appear in the first comment section of a file.
+
+The word "coding" may be used instead of "encoding".
+
+=== +frozen_string_literal+ Directive
+
+Indicates that string literals should be allocated once at parse time and frozen.
+
+  # frozen_string_literal: true
+
+  3.times do
+    p 'hello'.object_id # => prints same number
+  end
+  p 'world'.frozen? # => true
+
+The default is false; this can be changed with <code>--enable=frozen-string-literal</code>.
+Without the directive, or with <code># frozen_string_literal: false</code>,
+the example above would print 3 different numbers and "false".
+
+Starting in Ruby 3.0, string literals that are dynamic are not frozen nor reused:
+
+  # frozen_string_literal: true
+
+  p "Addition: #{2 + 2}".frozen? # => false
+
+It must appear in the first comment section of a file.
+
+=== +warn_indent+ Directive
+
+This directive can turn on detection of bad indentation for statements that follow it:
+
+  def foo
+    end # => no warning
+
+  # warn_indent: true
+  def bar
+    end # => warning: mismatched indentations at 'end' with 'def' at 6
+
+Another way to get these warnings to show is by running Ruby with warnings (<code>ruby -w</code>). Using a directive to set this false will prevent these warnings to show.
+
+=== +shareable_constant_value+ Directive
+
+Note: This directive is experimental in Ruby 3.0 and may change in future releases.
+
+This special directive helps to create constants that hold only immutable objects, or {Ractor-shareable}[rdoc-ref:Ractor@Shareable+and+unshareable+objects] constants.
+
+The directive can specify special treatment for values assigned to constants:
+
+* +none+: (default)
+* +literal+: literals are implicitly frozen, others must be Ractor-shareable
+* +experimental_everything+: all made shareable
+* +experimental_copy+: copy deeply and make it shareable
+
+==== Mode +none+ (default)
+
+No special treatment in this mode (as in Ruby 2.x): no automatic freezing and no checks.
+
+It has always been a good idea to deep-freeze constants; Ractor makes this
+an even better idea as only the main ractor can access non-shareable constants:
+
+  # shareable_constant_value: none
+  A = {foo: []}
+  A.frozen? # => false
+  Ractor.new { puts A } # => can not access non-shareable objects by non-main Ractor.
+
+==== Mode +literal+
+
+In "literal" mode, constants assigned to literals will be deeply-frozen:
+
+  # shareable_constant_value: literal
+  X = [{foo: []}] # => same as [{foo: [].freeze}.freeze].freeze
+
+Other values must be shareable:
+
+  # shareable_constant_value: literal
+  X = Object.new # => cannot assign unshareable object to X
+
+Note that only literals directly assigned to constants, or recursively held in such literals will be frozen:
+
+  # shareable_constant_value: literal
+  var = [{foo: []}]
+  var.frozen? # => false (assignment was made to local variable)
+  X = var # => cannot assign unshareable object to X
+
+  X = Set[1, 2, {foo: []}].freeze # => cannot assign unshareable object to X
+                                  # (`Set[...]` is not a literal and
+                                  # `{foo: []}` is an argument to `Set.[]`)
+
+The method Module#const_set is not affected.
+
+==== Mode +experimental_everything+
+
+In this mode, all values assigned to constants are made shareable.
+
+  # shareable_constant_value: experimental_everything
+  FOO = Set[1, 2, {foo: []}]
+  # same as FOO = Ractor.make_sharable(...)
+  # OR same as `FOO = Set[1, 2, {foo: [].freeze}.freeze].freeze`
+
+  var = [{foo: []}]
+  var.frozen? # => false (assignment was made to local variable)
+  X = var # => calls `Ractor.make_shareable(var)`
+  var.frozen? # => true
+
+This mode is "experimental", because it might be error prone, for
+example by deep-freezing the constants of an external resource which
+could cause errors:
+
+  # shareable_constant_value: experimental_everything
+  FOO = SomeGem::Something::FOO
+  # => deep freezes the gem's constant!
+
+This will be revisited before Ruby 3.1 to either allow `everything`
+or to instead remove this mode.
+
+The method Module#const_set is not affected.
+
+==== Mode +experimental_copy+
+
+In this mode, all values assigned to constants are deeply copied and
+made shareable. It is safer mode than +experimental_everything+.
+
+  # shareable_constant_value: experimental_everything
+  var = [{foo: []}]
+  var.frozen? # => false (assignment was made to local variable)
+  X = var # => calls `Ractor.make_shareable(var, copy: true)`
+  var.frozen? # => false
+  Ractor.shareable?(X) #=> true
+  var.object_id == X.object_id #=> false
+
+This mode is "experimental" and has not been discussed thoroughly.
+This will be revisited before Ruby 3.1 to either allow `copy`
+or to instead remove this mode.
+
+The method Module#const_set is not affected.
+
+==== Scope
+
+This directive can be used multiple times in the same file:
+
+  # shareable_constant_value: none
+  A = {foo: []}
+  A.frozen? # => false
+  Ractor.new { puts A } # => can not access non-shareable objects by non-main Ractor.
+
+  # shareable_constant_value: literal
+  B = {foo: []}
+  B.frozen? # => true
+  B[:foo].frozen? # => true
+
+  C = [Object.new] # => cannot assign unshareable object to C (Ractor::IsolationError)
+
+  D = [Object.new.freeze]
+  D.frozen? # => true
+
+  # shareable_constant_value: experimental_everything
+  E = Set[1, 2, Object.new]
+  E.frozen? # => true
+  E.all(&:frozen?) # => true
+
+The directive affects only subsequent constants and only for the current scope:
+
+  module Mod
+    # shareable_constant_value: literal
+    A = [1, 2, 3]
+    module Sub
+      B = [4, 5]
+    end
+  end
+
+  C = [4, 5]
+
+  module Mod
+    D = [6]
+  end
+  p Mod::A.frozen?, Mod::Sub::B.frozen? # => true, true
+  p C.frozen?, Mod::D.frozen? # => false, false
diff --git a/doc/syntax/control_expressions.rdoc b/doc/syntax/control_expressions.rdoc
index 123b48b6b9..e91b03e72d 100644
--- a/doc/syntax/control_expressions.rdoc
+++ b/doc/syntax/control_expressions.rdoc
@@ -144,7 +144,7 @@ expression.
 == Modifier +if+ and +unless+
 
 +if+ and +unless+ can also be used to modify an expression.  When used as a
-modifier the left-hand side is the "then" expression and the right-hand side
+modifier the left-hand side is the "then" statement and the right-hand side
 is the "test" expression:
 
   a = 0
@@ -164,7 +164,7 @@ This will print 1.
 This will print 0.
 
 While the modifier and standard versions have both a "test" expression and a
-"then" expression, they are not exact transformations of each other due to
+"then" statement, they are not exact transformations of each other due to
 parse order.  Here is an example that shows the difference:
 
   p a if a = 0.zero?
@@ -232,7 +232,7 @@ You may use +then+ after the +when+ condition.  This is most frequently used
 to place the body of the +when+ on a single line.
 
   case a
-  when 1, 2 then puts "a is one or two
+  when 1, 2 then puts "a is one or two"
   when 3    then puts "a is three"
   else           puts "I don't know what a is"
   end
@@ -255,6 +255,20 @@ Again, the +then+ and +else+ are optional.
 The result value of a +case+ expression is the last value executed in the
 expression.
 
+Since Ruby 2.7, +case+ expressions also provide a more powerful experimental
+pattern matching feature via the +in+ keyword:
+
+  case {a: 1, b: 2, c: 3}
+  in a: Integer => m
+    "matched: #{m}"
+  else
+    "not matched"
+  end
+  # => "matched: 1"
+
+The pattern matching syntax is described on
+{its own page}[rdoc-ref:syntax/pattern_matching.rdoc].
+
 == +while+ Loop
 
 The +while+ loop executes while a condition is true:
@@ -405,8 +419,8 @@ Use +next+ to skip the rest of the current iteration:
 
   p result # prints [2, nil, 6]
 
-+next+ accepts an argument that can be used the result of the current block
-iteration:
++next+ accepts an argument that can be used as the result of the current
+block iteration:
 
   result = [1, 2, 3].map do |value|
     next value if value.even?
@@ -439,6 +453,64 @@ longer true, now you will receive a SyntaxError when you use +retry+ outside
 of a +rescue+ block.  See {Exceptions}[rdoc-ref:syntax/exceptions.rdoc]
 for proper usage of +retry+.
 
+== Modifier Statements
+
+Ruby's grammar differentiates between statements and expressions.  All
+expressions are statements (an expression is a type of statement), but
+not all statements are expressions.  Some parts of the grammar accept
+expressions and not other types of statements, which causes code that
+looks similar to be parsed differently.
+
+For example, when not used as a modifier, +if+, +else+, +while+, +until+,
+and +begin+ are expressions (and also statements).  However, when
+used as a modifier, +if+, +else+, +while+, +until+ and +rescue+
+are statements but not expressions.
+
+  if true; 1 end # expression (and therefore statement)
+  1 if true      # statement (not expression)
+
+Statements that are not expressions cannot be used in contexts where an
+expression is expected, such as method arguments.
+
+  puts( 1 if true )      #=> SyntaxError
+
+You can wrap a statement in parentheses to create an expression.
+
+  puts((1 if true))      #=> 1
+
+If you put a space between the method name and opening parenthesis, you
+do not need two sets of parentheses.
+
+  puts (1 if true)       #=> 1, because of optional parentheses for method
+
+This is because this is parsed similar to a method call without
+parentheses.  It is equivalent to the following code, without the creation
+of a local variable:
+
+  x = (1 if true)
+  p x
+
+In a modifier statement, the left-hand side must be a statement and the
+right-hand side must be an expression.
+
+So in <code>a if b rescue c</code>, because <code>b rescue c</code> is a
+statement that is not an expression, and therefore is not allowed as the
+right-hand side of the +if+ modifier statement, the code is necessarily
+parsed as <code>(a if b) rescue c</code>.
+
+This interacts with operator precedence in such a way that:
+
+  stmt if v = expr rescue x
+  stmt if v = expr unless x
+
+are parsed as:
+
+  stmt if v = (expr rescue x)
+  (stmt if v = expr) unless x
+
+This is because modifier +rescue+ has higher precedence than <code>=</code>,
+and modifier +if+ has lower precedence than <code>=</code>.
+
 == Flip-Flop
 
 The flip-flop is a rarely seen conditional expression.  It's primary use is
diff --git a/doc/syntax/exceptions.rdoc b/doc/syntax/exceptions.rdoc
index a2e75616fb..31e2f0175c 100644
--- a/doc/syntax/exceptions.rdoc
+++ b/doc/syntax/exceptions.rdoc
@@ -17,7 +17,14 @@ wish to limit the scope of rescued exceptions:
     # ...
   end
 
-The same is true for a +class+ or +module+.
+The same is true for a +class+, +module+, and +block+:
+
+  [0, 1, 2].map do |i|
+    10 / i
+  rescue ZeroDivisionError
+    nil
+  end
+  #=> [nil, 10, 5]
 
 You can assign the exception to a local variable by using <tt>=>
 variable_name</tt> at the end of the +rescue+ line:
diff --git a/doc/syntax/literals.rdoc b/doc/syntax/literals.rdoc
index f5b9738868..d6d677806e 100644
--- a/doc/syntax/literals.rdoc
+++ b/doc/syntax/literals.rdoc
@@ -20,9 +20,6 @@ Literals create objects you can use in your program.  Literals include:
 +true+ is a true value.  All objects except +nil+ and +false+ evaluate to a
 true value in conditional expressions.
 
-(There are also the constants +TRUE+, +FALSE+ and +NIL+, but the lowercase
-literal forms are preferred.)
-
 == Numbers
 
 You can write integers of any size as follows:
@@ -71,6 +68,33 @@ Examples:
 All these numbers have the same decimal value, 170.  Like integers and floats
 you may use an underscore for readability.
 
+=== Rational numbers
+
+Numbers suffixed by +r+ are Rational numbers.
+
+  12r         #=> (12/1)
+  12.3r       #=> (123/10)
+
+Rational numbers are exact, whereas Float numbers are inexact.
+
+  0.1r + 0.2r #=> (3/10)
+  0.1 + 0.2   #=> 0.30000000000000004
+
+=== Complex numbers
+
+Numbers suffixed by +i+ are Complex (or imaginary) numbers.
+
+  1i          #=> (0+1i)
+  1i * 1i     #=> (-1+0i)
+
+Also Rational numbers may be imaginary numbers.
+
+  12.3ri      #=> (0+(123/10)*i)
+
++i+ must be placed after +r+, the opposite is not allowed.
+
+  12.3ir      #=> syntax error
+
 == Strings
 
 The most common way of writing strings is using <tt>"</tt>:
@@ -108,7 +132,7 @@ sequences are as follows:
   \c\M-x         same as above
   \c? or \C-?    delete, ASCII 7Fh (DEL)
 
-Any other character followed by a backslash is interpreted as the
+Any other character following a backslash is interpreted as the
 character itself.
 
 Double-quote strings allow interpolation of other values using
@@ -119,6 +143,10 @@ Double-quote strings allow interpolation of other values using
 Any expression may be placed inside the interpolated section, but it's best to
 keep the expression small for readability.
 
+You can also use <tt>#@foo</tt>, <tt>#@@foo</tt> and <tt>#$foo</tt> as a
+shorthand for, respectively, <tt>#{ @foo }</tt>, <tt>#{ @@foo }</tt> and
+<tt>#{ $foo }</tt>.
+
 Interpolation may be disabled by escaping the "#" character or using
 single-quote strings:
 
@@ -166,7 +194,7 @@ a single codepoint in the script encoding:
   ?\C-\M-a #=> "\x81", same as above
   ?あ      #=> "あ"
 
-=== Here Documents
+=== Here Documents (heredocs)
 
 If you are writing a large block of text you may use a "here document" or
 "heredoc":
@@ -228,6 +256,9 @@ behaves like Kernel#`:
   cat #{__FILE__}
   HEREDOC
 
+When surrounding with quotes, any character but that quote and newline
+(CR and/or LF) can be used as the identifier.
+
 To call a method on a heredoc place it after the opening identifier:
 
   expected_result = <<-EXPECTED.chomp
@@ -306,6 +337,8 @@ its ending value.
 
   (1..2)  # includes its ending value
   (1...2) # excludes its ending value
+  (1..)   # endless range, representing infinite sequence from 1 to Infinity
+  (..1)   # beginless range, representing infinite sequence from -Infinity to 1
 
 You may create a range of any object.  See the Range documentation for details
 on the methods you need to implement.
@@ -330,7 +363,7 @@ See Regexp for a description of the syntax of regular expressions.
 
 == Procs
 
-A proc can be created with <tt>-></tt>:
+A lambda proc can be created with <tt>-></tt>:
 
   -> { 1 + 1 }
 
diff --git a/doc/syntax/methods.rdoc b/doc/syntax/methods.rdoc
index d41c6fcba5..c11bd449bc 100644
--- a/doc/syntax/methods.rdoc
+++ b/doc/syntax/methods.rdoc
@@ -17,8 +17,8 @@ on calling methods}[rdoc-ref:syntax/calling_methods.rdoc].
 == Method Names
 
 Method names may be one of the operators or must start a letter or a character
-with the eight bit set. It may contain letters, numbers, an <code>_</code>
-(underscore or low line) or a character with the eight bit set. The convention
+with the eighth bit set. It may contain letters, numbers, an <code>_</code>
+(underscore or low line) or a character with the eighth bit set. The convention
 is to use underscores to separate words in a multiword method name:
 
   def method_name
@@ -26,12 +26,12 @@ is to use underscores to separate words in a multiword method name:
   end
 
 Ruby programs must be written in a US-ASCII-compatible character set such as
-UTF-8, ISO-8859-1 etc. In such character sets if the eight bit is set it
+UTF-8, ISO-8859-1 etc. In such character sets if the eighth bit is set it
 indicates an extended character. Ruby allows method names and other identifiers
 to contain such characters. Ruby programs cannot contain some characters like
 ASCII NUL (<code>\x00</code>).
 
-The following are the examples of valid ruby methods:
+The following are examples of valid Ruby methods:
 
   def hello
     "hello"
@@ -45,29 +45,27 @@ Typically method names are US-ASCII compatible since the keys to type them
 exist on all keyboards.
 
 Method names may end with a <code>!</code> (bang or exclamation mark), a
-<code>?</code> (question mark) or <code>=</code> equals sign.
+<code>?</code> (question mark), or <code>=</code> (equals sign).
 
-The bang methods (<code>!</code> at the end of method name) are called and
+The bang methods (<code>!</code> at the end of the method name) are called and
 executed just like any other method. However, by convention, a method with an
-exclamation point or bang is considered dangerous. In ruby core library the
+exclamation point or bang is considered dangerous. In Ruby's core library the
 dangerous method implies that when a method ends with a bang (<code>!</code>),
 it indicates that unlike its non-bang equivalent, permanently modifies its
-receiver. Almost always, ruby core library will have a non-bang
+receiver. Almost always, the Ruby core library will have a non-bang
 counterpart (method name which does NOT end with <code>!</code>) of every bang
 method (method name which does end with <code>!</code>) that does not modify
-the receiver. This convention is typically true for ruby core library but
-may or may not hold true for other ruby libraries.
+the receiver. This convention is typically true for the Ruby core library but
+may or may not hold true for other Ruby libraries.
 
 Methods that end with a question mark by convention return boolean, but they
 may not always return just +true+ or +false+.  Often, they will return an
 object to indicate a true value (or "truthy" value).
 
-Methods that end with an equals sign indicate an assignment method.  For
-assignment methods, the return value is ignored and the arguments are returned
-instead.
+Methods that end with an equals sign indicate an assignment method.
 
-These are method names for the various ruby operators.  Each of these
-operators accept only one argument.  Following the operator is the typical
+These are method names for the various Ruby operators.  Each of these
+operators accepts only one argument.  Following the operator is the typical
 use or name of the operator.  Creating an alternate meaning for the operator
 may lead to confusion as the user expects plus to add things, minus to
 subtract things, etc.  Additionally, you cannot alter the precedence of the
@@ -94,8 +92,8 @@ operators.
 <code>></code>   :: greater-than
 <code>>=</code>  :: greater-than or equal
 
-To define unary methods minus, plus, tilde and not (<code>!</code>) follow the
-operator with an <code>@</code> as in <code>+@</code> or <code>!@</code>:
+To define unary methods minus and plus, follow the operator with an
+<code>@</code> as in <code>+@</code>:
 
   class C
     def -@
@@ -107,6 +105,13 @@ operator with an <code>@</code> as in <code>+@</code> or <code>!@</code>:
 
   -obj # prints "you inverted this object"
 
+The <code>@</code> is needed to differentiate unary minus and plus
+operators from binary minus and plus operators.
+
+You can also follow tilde and not (<code>!</code>) unary methods with
+<code>@</code>, but it is not required as there are no binary tilde
+and not operators.
+
 Unary methods accept zero arguments.
 
 Additionally, methods for element reference and assignment may be defined:
@@ -147,14 +152,18 @@ evaluated.
     1 + 1  # this expression is never evaluated
   end
 
-Note that for assignment methods the return value will always be ignored.
-Instead, the argument will be returned:
+Note that for assignment methods the return value will be ignored when using
+the assignment syntax.  Instead, the argument will be returned:
 
   def a=(value)
     return 1 + value
   end
 
-  p(a = 5) # prints 5
+  p(self.a = 5) # prints 5
+
+The actual return value will be returned when invoking the method directly:
+
+  p send(:a=, 5) # prints 6
 
 == Scope
 
@@ -279,6 +288,25 @@ This will raise a SyntaxError:
     a + b + c
   end
 
+Default argument values can refer to arguments that have already been
+evaluated as local variables, and argument values are always evaluated
+left to right. So this is allowed:
+
+  def add_values(a = 1, b = a)
+    a + b
+  end
+  add_values
+  # => 2
+
+But this will raise a +NameError+ (unless there is a method named
++b+ defined):
+
+  def add_values(a = b, b = 1)
+    a + b
+  end
+  add_values
+  # NameError (undefined local variable or method `b' for main:Object)
+
 === Array Decomposition
 
 You can decompose (unpack or extract values from) an Array using extra
@@ -351,12 +379,23 @@ converted to an Array:
 
   gather_arguments 1, 2, 3 # prints [1, 2, 3]
 
-The array argument must be the last positional argument, it must appear before
-any keyword arguments.
+The array argument must appear before any keyword arguments.
+
+It is possible to gather arguments at the beginning or in the middle:
+
+  def gather_arguments(first_arg, *middle_arguments, last_arg)
+    p middle_arguments
+  end
+
+  gather_arguments 1, 2, 3, 4 # prints [2, 3]
 
 The array argument will capture a Hash as the last entry if a hash was sent by
 the caller after all positional arguments.
 
+  def gather_arguments(*arguments)
+    p arguments
+  end
+
   gather_arguments 1, a: 2 # prints [1, {:a=>2}]
 
 However, this only occurs if the method does not declare any keyword arguments.
@@ -391,12 +430,116 @@ Arbitrary keyword arguments will be accepted with <code>**</code>:
   # prints 1 then {:second=>2, :third=>3}
 
 When calling a method with keyword arguments the arguments may appear in any
-order.  If an unknown keyword argument is sent by the caller an ArgumentError
-is raised.
+order.  If an unknown keyword argument is sent by the caller, and the method
+does not accept arbitrary keyword arguments, an ArgumentError is raised.
+
+To require a specific keyword argument, do not include a default value
+for the keyword argument:
+
+  def add_values(first:, second:)
+    first + second
+  end
+  add_values
+  # ArgumentError (missing keywords: first, second)
+  add_values(first: 1, second: 2)
+  # => 3
 
 When mixing keyword arguments and positional arguments, all positional
 arguments must appear before any keyword arguments.
 
+Also, note that <code>**</code> can be used to ignore keyword arguments:
+
+  def ignore_keywords(**)
+  end
+
+To mark a method as accepting keywords, but not actually accepting
+keywords, you can use the <code>**nil</code>:
+
+  def no_keywords(**nil)
+  end
+
+Calling such a method with keywords or a non-empty keyword splat will
+result in an ArgumentError. This syntax is supported so that keywords
+can be added to the method later without affected backwards compatibility.
+
+=== Keyword and Positional Argument Separation
+
+Between Ruby 2.0 and 2.6, keyword and positional arguments were not
+separated, and a keyword argument could be used as a positional argument
+and vice-versa.  In Ruby 3.0, keyword and positional arguments will
+be separated if the method definition includes keyword arguments.
+In Ruby 3.0, if the method definition does not include keyword arguments,
+keyword arguments provided when calling the method will continue to be
+treated as a final positional hash argument.
+
+Currently, the keyword and positional arguments are not separated,
+but cases where behavior will change in Ruby 3.0 will result in a
+warning being emitted.
+
+There are a few different types of keyword argument separation issues.
+
+==== Conversion of Hash to Keywords
+
+If a method is called with the hash, the hash could be treated as
+keywords:
+
+  def my_method(**keywords)
+    keywords
+  end
+  my_method({a: 1}) # {:a => 1}
+
+This occurs even if the hash could be an optional positional argument
+or an element of a rest argument:
+
+  def my_method(hash=nil, **keywords)
+    [hash, keywords]
+  end
+  my_method({a: 1}) # [nil, {:a => 1}]
+
+  def my_method(*args, **keywords)
+    [args, keywords]
+  end
+  my_method({a: 1}) # [[], {:a => 1}]
+
+However, if the hash is needed for a mandatory positional argument,
+it would not be treated as keywords:
+
+  def my_method(hash, **keywords)
+    [hash, keywords]
+  end
+  my_method({a: 1}) # [{:a => 1}, {}]
+
+==== Conversion of Keywords to Positional Arguments
+
+If a method is called with keywords, but it is missing one
+mandatory positional argument, the keywords are converted to
+a hash and the hash used as the mandatory positional argument:
+
+  def my_method(hash, **keywords)
+    [hash, keywords]
+  end
+  my_method(a: 1) # [{:a => 1}, {}]
+
+This is also true for empty keyword splats:
+
+  kw = {}
+  my_method(**kw) # [{}, {}]
+
+==== Splitting of Positional Hashes or Keywords
+
+If a method definition accepts specific keywords and not arbitrary keywords,
+keywords or a positional hash may be split if the hash includes both Symbol
+keys and non-Symbol keys and the keywords or positional hash are not needed
+as a mandatory positional argument.  In this case, the non-Symbol keys are
+separated into a positional argument hash, and the Symbol keys are used
+as the keyword arguments:
+
+  def my_method(hash=3, a: 4)
+    [hash, a]
+  end
+  my_method(a: 1, 'a' => 2)   # [{"a"=>2}, 1]
+  my_method({a: 1, 'a' => 2}) # [{"a"=>2}, 1]
+
 == Block Argument
 
 The block argument is indicated by <code>&</code> and must come last:
@@ -420,15 +563,6 @@ in this section:
     yield self
   end
 
-There is also a performance benefit to using yield over a calling a block
-parameter.  When a block argument is assigned to a variable a Proc object is
-created which holds the block.  When using yield this Proc object is not
-created.
-
-If you only need to use the block sometimes you can use Proc.new to create a
-proc from the block that was passed to your method.  See Proc.new for further
-details.
-
 == Exception Handling
 
 Methods have an implied exception handling block so you do not need to use
@@ -450,6 +584,28 @@ May be written as:
     # handle exception
   end
 
+Similarly, if you wish to always run code even if an exception is raised,
+you can use +ensure+ without +begin+ and +end+:
+
+  def my_method
+    # code that may raise an exception
+  ensure
+    # code that runs even if previous code raised an exception
+  end
+
+You can also combine +rescue+ with +ensure+ and/or +else+, without
++begin+ and +end+:
+
+  def my_method
+    # code that may raise an exception
+  rescue
+    # handle exception
+  else
+    # only run if no exception raised above
+  ensure
+    # code that runs even if previous code raised an exception
+  end
+
 If you wish to rescue an exception for only part of your method, use +begin+ and
 +end+.  For more details see the page on {exception
 handling}[rdoc-ref:syntax/exceptions.rdoc].
diff --git a/doc/syntax/miscellaneous.rdoc b/doc/syntax/miscellaneous.rdoc
index d5691f8d60..d5cfd3e474 100644
--- a/doc/syntax/miscellaneous.rdoc
+++ b/doc/syntax/miscellaneous.rdoc
@@ -13,7 +13,7 @@ most frequently used with <code>ruby -e</code>.
 Ruby does not require any indentation.  Typically, ruby programs are indented
 two spaces.
 
-If you run ruby with warnings enabled and have an indentation mis-match, you
+If you run ruby with warnings enabled and have an indentation mismatch, you
 will receive a warning.
 
 == +alias+
@@ -83,6 +83,36 @@ Using the specific reflection methods such as instance_variable_defined? for
 instance variables or const_defined? for constants is less error prone than
 using +defined?+.
 
++defined?+ handles some regexp global variables specially based on whether
+there is an active regexp match and how many capture groups there are:
+
+  /b/ =~ 'a'
+  defined?($~) # => "global-variable"
+  defined?($&) # => nil
+  defined?($`) # => nil
+  defined?($') # => nil
+  defined?($+) # => nil
+  defined?($1) # => nil
+  defined?($2) # => nil
+
+  /./ =~ 'a'
+  defined?($~) # => "global-variable"
+  defined?($&) # => "global-variable"
+  defined?($`) # => "global-variable"
+  defined?($') # => "global-variable"
+  defined?($+) # => nil
+  defined?($1) # => nil
+  defined?($2) # => nil
+
+  /(.)/ =~ 'a'
+  defined?($~) # => "global-variable"
+  defined?($&) # => "global-variable"
+  defined?($`) # => "global-variable"
+  defined?($') # => "global-variable"
+  defined?($+) # => "global-variable"
+  defined?($1) # => "global-variable"
+  defined?($2) # => nil
+
 == +BEGIN+ and +END+
 
 +BEGIN+ defines a block that is run before any other code in the current file.
diff --git a/doc/syntax/modules_and_classes.rdoc b/doc/syntax/modules_and_classes.rdoc
index dd70d4ac21..6122f6e08e 100644
--- a/doc/syntax/modules_and_classes.rdoc
+++ b/doc/syntax/modules_and_classes.rdoc
@@ -190,9 +190,41 @@ Here is an example:
   b.n b #=> 1 -- m called on defining class
   a.n b # raises NoMethodError A is not a subclass of B
 
-The third visibility is +private+.  A private method may not be called with a
-receiver, not even +self+.  If a private method is called with a receiver a
-NoMethodError will be raised.
+The third visibility is +private+.  A private method may only be called from
+inside the owner class without a receiver, or with a literal +self+
+as a receiver.  If a private method is called with a
+receiver other than a literal +self+, a NoMethodError will be raised.
+
+  class A
+    def without
+      m
+    end
+
+    def with_self
+      self.m
+    end
+
+    def with_other
+      A.new.m
+    end
+
+    def with_renamed
+      copy = self
+      copy.m
+    end
+
+    def m
+      1
+    end
+
+    private :m
+  end
+
+  a = A.new
+  a.without      #=> 1
+  a.with_self    #=> 1
+  a.with_other   # NoMethodError (private method `m' called for #<A:0x0000559c287f27d0>)
+  a.with_renamed # NoMethodError (private method `m' called for #<A:0x0000559c285f8330>)
 
 === +alias+ and +undef+
 
diff --git a/doc/syntax/pattern_matching.rdoc b/doc/syntax/pattern_matching.rdoc
new file mode 100644
index 0000000000..9f6954f1cb
--- /dev/null
+++ b/doc/syntax/pattern_matching.rdoc
@@ -0,0 +1,503 @@
+= Pattern matching
+
+Pattern matching is a feature allowing deep matching of structured values: checking the structure and binding the matched parts to local variables.
+
+Pattern matching in Ruby is implemented with the +case+/+in+ expression:
+
+    case <expression>
+    in <pattern1>
+      ...
+    in <pattern2>
+      ...
+    in <pattern3>
+      ...
+    else
+      ...
+    end
+
+(Note that +in+ and +when+ branches can NOT be mixed in one +case+ expression.)
+
+Or with the <code>=></code> operator and the +in+ operator, which can be used in a standalone expression:
+
+    <expression> => <pattern>
+
+    <expression> in <pattern>
+
+The +case+/+in+ expression is _exhaustive_: if the value of the expression does not match any branch of the +case+ expression (and the +else+ branch is absent), +NoMatchingPatternError+ is raised.
+
+Therefore, the +case+ expression might be used for conditional matching and unpacking:
+
+  config = {db: {user: 'admin', password: 'abc123'}}
+
+  case config
+  in db: {user:} # matches subhash and puts matched value in variable user
+    puts "Connect with user '#{user}'"
+  in connection: {username: }
+    puts "Connect with user '#{username}'"
+  else
+    puts "Unrecognized structure of config"
+  end
+  # Prints: "Connect with user 'admin'"
+
+whilst the <code>=></code> operator is most useful when the expected data structure is known beforehand, to just unpack parts of it:
+
+  config = {db: {user: 'admin', password: 'abc123'}}
+
+  config => {db: {user:}} # will raise if the config's structure is unexpected
+
+  puts "Connect with user '#{user}'"
+  # Prints: "Connect with user 'admin'"
+
+<code><expression> in <pattern></code> is the same as <code>case <expression>; in <pattern>; true; else false; end</code>.
+You can use it when you only want to know if a pattern has been matched or not:
+
+  users = [{name: "Alice", age: 12}, {name: "Bob", age: 23}]
+  users.any? {|user| user in {name: /B/, age: 20..} } #=> true
+
+See below for more examples and explanations of the syntax.
+
+== Patterns
+
+Patterns can be:
+
+* any Ruby object (matched by the <code>===</code> operator, like in +when+); (<em>Value pattern</em>)
+* array pattern: <code>[<subpattern>, <subpattern>, <subpattern>, ...]</code>; (<em>Array pattern</em>)
+* find pattern: <code>[*variable, <subpattern>, <subpattern>, <subpattern>, ..., *variable]</code>; (<em>Find pattern</em>)
+* hash pattern: <code>{key: <subpattern>, key: <subpattern>, ...}</code>; (<em>Hash pattern</em>)
+* combination of patterns with <code>|</code>; (<em>Alternative pattern</em>)
+* variable capture: <code><pattern> => variable</code> or <code>variable</code>; (<em>As pattern</em>, <em>Variable pattern</em>)
+
+Any pattern can be nested inside array/find/hash patterns where <code><subpattern></code> is specified.
+
+Array patterns and find patterns match arrays, or objects that respond to +deconstruct+ (see below about the latter).
+Hash patterns match hashes, or objects that respond to +deconstruct_keys+ (see below about the latter). Note that only symbol keys are supported for hash patterns.
+
+An important difference between array and hash pattern behavior is that arrays match only a _whole_ array:
+
+  case [1, 2, 3]
+  in [Integer, Integer]
+    "matched"
+  else
+    "not matched"
+  end
+  #=> "not matched"
+
+while the hash matches even if there are other keys besides the specified part:
+
+  case {a: 1, b: 2, c: 3}
+  in {a: Integer}
+    "matched"
+  else
+    "not matched"
+  end
+  #=> "matched"
+
+<code>{}</code> is the only exclusion from this rule. It matches only if an empty hash is given:
+
+  case {a: 1, b: 2, c: 3}
+  in {}
+    "matched"
+  else
+    "not matched"
+  end
+  #=> "not matched"
+
+  case {}
+  in {}
+    "matched"
+  else
+    "not matched"
+  end
+  #=> "matched"
+
+There is also a way to specify there should be no other keys in the matched hash except those explicitly specified by the pattern, with <code>**nil</code>:
+
+  case {a: 1, b: 2}
+  in {a: Integer, **nil} # this will not match the pattern having keys other than a:
+    "matched a part"
+  in {a: Integer, b: Integer, **nil}
+    "matched a whole"
+  else
+    "not matched"
+  end
+  #=> "matched a whole"
+
+Both array and hash patterns support "rest" specification:
+
+  case [1, 2, 3]
+  in [Integer, *]
+    "matched"
+  else
+    "not matched"
+  end
+  #=> "matched"
+
+  case {a: 1, b: 2, c: 3}
+  in {a: Integer, **}
+    "matched"
+  else
+    "not matched"
+  end
+  #=> "matched"
+
+In +case+ (but not in <code>=></code> and +in+) expressions, parentheses around both kinds of patterns could be omitted:
+
+  case [1, 2]
+  in Integer, Integer
+    "matched"
+  else
+    "not matched"
+  end
+  #=> "matched"
+
+  case {a: 1, b: 2, c: 3}
+  in a: Integer
+    "matched"
+  else
+    "not matched"
+  end
+  #=> "matched"
+
+Find pattern is similar to array pattern but it can be used to check if the given object has any elements that match the pattern:
+
+  case ["a", 1, "b", "c", 2]
+  in [*, String, String, *]
+    "matched"
+  else
+    "not matched"
+  end
+
+== Variable binding
+
+Besides deep structural checks, one of the very important features of the pattern matching is the binding of the matched parts to local variables. The basic form of binding is just specifying <code>=> variable_name</code> after the matched (sub)pattern (one might find this similar to storing exceptions in local variables in a <code>rescue ExceptionClass => var</code> clause):
+
+  case [1, 2]
+  in Integer => a, Integer
+    "matched: #{a}"
+  else
+    "not matched"
+  end
+  #=> "matched: 1"
+
+  case {a: 1, b: 2, c: 3}
+  in a: Integer => m
+    "matched: #{m}"
+  else
+    "not matched"
+  end
+  #=> "matched: 1"
+
+If no additional check is required, for only binding some part of the data to a variable, a simpler form could be used:
+
+  case [1, 2]
+  in a, Integer
+    "matched: #{a}"
+  else
+    "not matched"
+  end
+  #=> "matched: 1"
+
+  case {a: 1, b: 2, c: 3}
+  in a: m
+    "matched: #{m}"
+  else
+    "not matched"
+  end
+  #=> "matched: 1"
+
+For hash patterns, even a simpler form exists: key-only specification (without any sub-pattern) binds the local variable with the key's name, too:
+
+  case {a: 1, b: 2, c: 3}
+  in a:
+    "matched: #{a}"
+  else
+    "not matched"
+  end
+  #=> "matched: 1"
+
+Binding works for nested patterns as well:
+
+  case {name: 'John', friends: [{name: 'Jane'}, {name: 'Rajesh'}]}
+  in name:, friends: [{name: first_friend}, *]
+    "matched: #{first_friend}"
+  else
+    "not matched"
+  end
+  #=> "matched: Jane"
+
+The "rest" part of a pattern also can be bound to a variable:
+
+  case [1, 2, 3]
+  in a, *rest
+    "matched: #{a}, #{rest}"
+  else
+    "not matched"
+  end
+  #=> "matched: 1, [2, 3]"
+
+  case {a: 1, b: 2, c: 3}
+  in a:, **rest
+    "matched: #{a}, #{rest}"
+  else
+    "not matched"
+  end
+  #=> "matched: 1, {:b=>2, :c=>3}"
+
+Binding to variables currently does NOT work for alternative patterns joined with <code>|</code>:
+
+  case {a: 1, b: 2}
+  in {a: } | Array
+    "matched: #{a}"
+  else
+    "not matched"
+  end
+  # SyntaxError (illegal variable in alternative pattern (a))
+
+Variables that start with <code>_</code> are the only exclusions from this rule:
+
+  case {a: 1, b: 2}
+  in {a: _, b: _foo} | Array
+    "matched: #{_}, #{_foo}"
+  else
+    "not matched"
+  end
+  # => "matched: 1, 2"
+
+It is, though, not advised to reuse the bound value, as this pattern's goal is to signify a discarded value.
+
+== Variable pinning
+
+Due to the variable binding feature, existing local variable can not be straightforwardly used as a sub-pattern:
+
+  expectation = 18
+
+  case [1, 2]
+  in expectation, *rest
+    "matched. expectation was: #{expectation}"
+  else
+    "not matched. expectation was: #{expectation}"
+  end
+  # expected: "not matched. expectation was: 18"
+  # real: "matched. expectation was: 1" -- local variable just rewritten
+
+For this case, the pin operator <code>^</code> can be used, to tell Ruby "just use this value as part of the pattern":
+
+  expectation = 18
+  case [1, 2]
+  in ^expectation, *rest
+    "matched. expectation was: #{expectation}"
+  else
+    "not matched. expectation was: #{expectation}"
+  end
+  #=> "not matched. expectation was: 18"
+
+One important usage of variable pinning is specifying that the same value should occur in the pattern several times:
+
+  jane = {school: 'high', schools: [{id: 1, level: 'middle'}, {id: 2, level: 'high'}]}
+  john = {school: 'high', schools: [{id: 1, level: 'middle'}]}
+
+  case jane
+  in school:, schools: [*, {id:, level: ^school}] # select the last school, level should match
+    "matched. school: #{id}"
+  else
+    "not matched"
+  end
+  #=> "matched. school: 2"
+
+  case john # the specified school level is "high", but last school does not match
+  in school:, schools: [*, {id:, level: ^school}]
+    "matched. school: #{id}"
+  else
+    "not matched"
+  end
+  #=> "not matched"
+
+== Matching non-primitive objects: +deconstruct+ and +deconstruct_keys+
+
+As already mentioned above, array, find, and hash patterns besides literal arrays and hashes will try to match any object implementing +deconstruct+ (for array/find patterns) or +deconstruct_keys+ (for hash patterns).
+
+  class Point
+    def initialize(x, y)
+      @x, @y = x, y
+    end
+
+    def deconstruct
+      puts "deconstruct called"
+      [@x, @y]
+    end
+
+    def deconstruct_keys(keys)
+      puts "deconstruct_keys called with #{keys.inspect}"
+      {x: @x, y: @y}
+    end
+  end
+
+  case Point.new(1, -2)
+  in px, Integer  # sub-patterns and variable binding works
+    "matched: #{px}"
+  else
+    "not matched"
+  end
+  # prints "deconstruct called"
+  "matched: 1"
+
+  case Point.new(1, -2)
+  in x: 0.. => px
+    "matched: #{px}"
+  else
+    "not matched"
+  end
+  # prints: deconstruct_keys called with [:x]
+  #=> "matched: 1"
+
++keys+ are passed to +deconstruct_keys+ to provide a room for optimization in the matched class: if calculating a full hash representation is expensive, one may calculate only the necessary subhash. When the <code>**rest</code> pattern is used, +nil+ is passed as a +keys+ value:
+
+  case Point.new(1, -2)
+  in x: 0.. => px, **rest
+    "matched: #{px}"
+  else
+    "not matched"
+  end
+  # prints: deconstruct_keys called with nil
+  #=> "matched: 1"
+
+Additionally, when matching custom classes, the expected class can be specified as part of the pattern and is checked with <code>===</code>
+
+  class SuperPoint < Point
+  end
+
+  case Point.new(1, -2)
+  in SuperPoint(x: 0.. => px)
+    "matched: #{px}"
+  else
+    "not matched"
+  end
+  #=> "not matched"
+
+  case SuperPoint.new(1, -2)
+  in SuperPoint[x: 0.. => px] # [] or () parentheses are allowed
+    "matched: #{px}"
+  else
+    "not matched"
+  end
+  #=> "matched: 1"
+
+== Guard clauses
+
++if+ can be used to attach an additional condition (guard clause) when the pattern matches. This condition may use bound variables:
+
+  case [1, 2]
+  in a, b if b == a*2
+    "matched"
+  else
+    "not matched"
+  end
+  #=> "matched"
+
+  case [1, 1]
+  in a, b if b == a*2
+    "matched"
+  else
+    "not matched"
+  end
+  #=> "not matched"
+
++unless+ works, too:
+
+  case [1, 1]
+  in a, b unless b == a*2
+    "matched"
+  else
+    "not matched"
+  end
+  #=> "matched"
+
+== Current feature status
+
+As of Ruby 3.0, one-line pattern matching and find patterns are considered _experimental_: its syntax can change in the future. Every time you use these features in code, a warning will be printed:
+
+  [0] => [*, 0, *]
+  # warning: Find pattern is experimental, and the behavior may change in future versions of Ruby!
+  # warning: One-line pattern matching is experimental, and the behavior may change in future versions of Ruby!
+
+To suppress this warning, one may use the Warning::[]= method:
+
+  Warning[:experimental] = false
+  eval('[0] => [*, 0, *]')
+  # ...no warning printed...
+
+Note that pattern-matching warnings are raised at compile time, so this will not suppress the warning:
+
+  Warning[:experimental] = false # At the time this line is evaluated, the parsing happened and warning emitted
+  [0] => [*, 0, *]
+
+So, only subsequently loaded files or `eval`-ed code is affected by switching the flag.
+
+Alternatively, the command line option <code>-W:no-experimental</code> can be used to turn off "experimental" feature warnings.
+
+== Appendix A. Pattern syntax
+
+Approximate syntax is:
+
+  pattern: value_pattern
+         | variable_pattern
+         | alternative_pattern
+         | as_pattern
+         | array_pattern
+         | find_pattern
+         | hash_pattern
+
+  value_pattern: literal
+               | Constant
+               | ^variable
+
+  variable_pattern: variable
+
+  alternative_pattern: pattern | pattern | ...
+
+  as_pattern: pattern => variable
+
+  array_pattern: [pattern, ..., *variable]
+               | Constant(pattern, ..., *variable)
+               | Constant[pattern, ..., *variable]
+
+  find_pattern: [*variable, pattern, ..., *variable]
+              | Constant(*variable, pattern, ..., *variable)
+              | Constant[*variable, pattern, ..., *variable]
+
+  hash_pattern: {key: pattern, key:, ..., **variable}
+              | Constant(key: pattern, key:, ..., **variable)
+              | Constant[key: pattern, key:, ..., **variable]
+
+== Appendix B. Some undefined behavior examples
+
+To leave room for optimization in the future, the specification contains some undefined behavior.
+
+Use of a variable in an unmatched pattern:
+
+  case [0, 1]
+  in [a, 2]
+    "not matched"
+  in b
+    "matched"
+  in c
+    "not matched"
+  end
+  a #=> undefined
+  c #=> undefined
+
+Number of +deconstruct+, +deconstruct_keys+ method calls:
+
+  $i = 0
+  ary = [0]
+  def ary.deconstruct
+    $i += 1
+    self
+  end
+  case ary
+  in [0, 1]
+    "not matched"
+  in [0]
+    "matched"
+  end
+  $i #=> undefined
diff --git a/doc/syntax/precedence.rdoc b/doc/syntax/precedence.rdoc
index 515626c74f..f64691ab1f 100644
--- a/doc/syntax/precedence.rdoc
+++ b/doc/syntax/precedence.rdoc
@@ -49,10 +49,14 @@ Unary <code>+</code> and unary <code>-</code> are for <code>+1</code>,
 <code>-1</code> or <code>-(a + b)</code>.
 
 Modifier-if, modifier-unless, etc. are for the modifier versions of those
-keywords.  For example, this is a modifier-unless expression:
+keywords.  For example, this is a modifier-unless statement:
 
   a += 1 unless a.zero?
 
+Note that <code>(a if b rescue c)</code> is parsed as <code>((a if b) rescue
+c)</code> due to reasons not related to precedence. See {modifier
+statements}[control_expressions_rdoc.html#label-Modifier+Statements].
+
 <code>{ ... }</code> blocks have priority below all listed operations, but
 <code>do ... end</code> blocks have lower priority.
 
diff --git a/doc/syntax/refinements.rdoc b/doc/syntax/refinements.rdoc
index 4cba61d396..c900ab1bdc 100644
--- a/doc/syntax/refinements.rdoc
+++ b/doc/syntax/refinements.rdoc
@@ -7,7 +7,7 @@ changes.  This can cause unintended side-effects or breakage of programs.
 
 Refinements are designed to reduce the impact of monkey patching on other
 users of the monkey-patched class.  Refinements provide a way to extend a
-class locally.
+class locally.  Refinements can modify both classes and modules.
 
 Here is a basic refinement:
 
@@ -26,8 +26,7 @@ Here is a basic refinement:
   end
 
 First, a class +C+ is defined.  Next a refinement for +C+ is created using
-Module#refine.  Refinements only modify classes, not modules so the argument
-must be a class.
+Module#refine.
 
 Module#refine creates an anonymous module that contains the changes or
 refinements to the class (+C+ in the example).  +self+ in the refine block is
@@ -49,13 +48,13 @@ until the end of the current class or module definition, or until the end of
 the current file if used at the top-level.
 
 You may activate refinements in a string passed to Kernel#eval. Refinements
-are active the end of the eval string.
+are active until the end of the eval string.
 
 Refinements are lexical in scope.  Refinements are only active within a scope
-after the call to using. Any code before the using statement will not have the
+after the call to +using+. Any code before the +using+ statement will not have the
 refinement activated.
 
-When control is transferred outside the scope the refinement is deactivated.
+When control is transferred outside the scope, the refinement is deactivated.
 This means that if you require or load a file or call a method that is defined
 outside the current scope the refinement will be deactivated:
 
@@ -80,7 +79,7 @@ outside the current scope the refinement will be deactivated:
   x.foo       # prints "C#foo in M"
   call_foo(x) #=> raises NoMethodError
 
-If a method is defined in a scope where a refinement is active the refinement
+If a method is defined in a scope where a refinement is active, the refinement
 will be active when the method is called.  This example spans multiple files:
 
 c.rb:
@@ -159,8 +158,8 @@ In a class:
   end
   # not activated here
 
-Note that the refinements in M are not activated automatically if the class
-Foo is reopened later.
+Note that the refinements in +M+ are *not* activated automatically if the class
++Foo+ is reopened later.
 
 In eval:
 
@@ -180,9 +179,9 @@ When not evaluated:
   end
   # not activated here
 
-When defining multiple refinements in the same module, inside a refine block
-all refinements from the same module are active when a refined method is
-called:
+When defining multiple refinements in the same module inside multiple +refine+ blocks,
+all refinements from the same module are active when a refined method
+(any of the +to_json+ methods from the example below) is called:
 
   module ToJSON
     refine Integer do
@@ -225,12 +224,13 @@ If no method was found at any point this repeats with the superclass of +C+.
 
 Note that methods in a subclass have priority over refinements in a
 superclass.  For example, if the method <code>/</code> is defined in a
-refinement for Integer <code>1 / 2</code> invokes the original Fixnum#/
-because Fixnum is a subclass of Integer and is searched before the refinements
-for the superclass Integer.
+refinement for Numeric <code>1 / 2</code> invokes the original Integer#/
+because Integer is a subclass of Numeric and is searched before the refinements
+for the superclass Numeric. Since the method <code>/</code> is also present
+in child +Integer+, the method lookup does not move up to the superclass.
 
-If a method +foo+ is defined on Integer in a refinement, <code>1.foo</code>
-invokes that method since +foo+ does not exist on Fixnum.
+However, if a method +foo+ is defined on Numeric in a refinement, <code>1.foo</code>
+invokes that method since +foo+ does not exist on Integer.
 
 == +super+
 
@@ -245,18 +245,40 @@ When +super+ is invoked method lookup checks:
 
 Note that +super+ in a method of a refinement invokes the method in the
 refined class even if there is another refinement which has been activated in
-the same context.
+the same context. This is only true for +super+ in a method of a refinement, it
+does not apply to +super+ in a method in a module that is included in a refinement.
 
-== Indirect Method Calls
+== Methods Introspection
 
-When using indirect method access such as Kernel#send, Kernel#method or
-Kernel#respond_to? refinements are not honored for the caller context during
-method lookup.
+When using introspection methods such as Kernel#method or Kernel#methods refinements are not honored.
 
 This behavior may be changed in the future.
 
+== Refinement inheritance by Module#include
+
+When a module X is included into a module Y, Y inherits refinements from X.
+
+For example, C inherits refinements from A and B in the following code:
+
+  module A
+    refine X do ... end
+    refine Y do ... end
+  end
+  module B
+    refine Z do ... end
+  end
+  module C
+    include A
+    include B
+  end
+
+  using C
+  # Refinements in A and B are activated here.
+
+Refinements in descendants have higher precedence than those of ancestors.
+
 == Further Reading
 
-See http://bugs.ruby-lang.org/projects/ruby-trunk/wiki/RefinementsSpec for the
+See https://bugs.ruby-lang.org/projects/ruby-master/wiki/RefinementsSpec for the
 current specification for implementing refinements.  The specification also
 contains more details.
diff --git a/template/yarvarch.en b/doc/yarvarch.en
index 7a76e25b7e..7a76e25b7e 100644
--- a/template/yarvarch.en
+++ b/doc/yarvarch.en
diff --git a/template/yarvarch.ja b/doc/yarvarch.ja
index 2739ec6b14..2739ec6b14 100644
--- a/template/yarvarch.ja
+++ b/doc/yarvarch.ja
diff --git a/enc/Makefile.in b/enc/Makefile.in
index 73b1e70941..3854f66de6 100644
--- a/enc/Makefile.in
+++ b/enc/Makefile.in
@@ -11,6 +11,7 @@ exec_prefix = @exec_prefix@
 libdir = @libdir@
 top_srcdir = $(encsrcdir:/enc=)
 srcdir = $(top_srcdir)
+tooldir = $(top_srcdir)/tool
 arch = @arch@
 EXTOUT = @EXTOUT@
 hdrdir = $(srcdir)/include
@@ -20,8 +21,10 @@ TRANSSODIR = $(ENCSODIR)/trans
 DLEXT = @DLEXT@
 OBJEXT = @OBJEXT@
 LIBEXT = @LIBEXT@
-ENC_TRANS_D   = ./enc/trans/.time
-ENC_TRANS_SO_D = ./enc/trans/.so.time
+EXEEXT = @EXEEXT@
+TIMESTAMPDIR  = $(EXTOUT)/.timestamp
+ENC_TRANS_D   = $(TIMESTAMPDIR)/.enc-trans.time
+ENC_TRANS_SO_D = $(TIMESTAMPDIR)/.enc-trans.so.time
 
 BUILTIN_ENCS	= enc/ascii.c enc/us_ascii.c\
 		  enc/unicode.c enc/utf_8.c
@@ -32,6 +35,7 @@ RUBY_SO_NAME = @RUBY_SO_NAME@
 LIBRUBY = @LIBRUBY@
 LIBRUBYARG_SHARED = @LIBRUBYARG_SHARED@
 LIBRUBYARG_STATIC = $(LIBRUBYARG_SHARED)
+BUILTRUBY = $(topdir)/miniruby$(EXEEXT)
 
 empty =
 AR = @AR@
diff --git a/enc/ascii.c b/enc/ascii.c
index 18e69234dd..a2fef2f879 100644
--- a/enc/ascii.c
+++ b/enc/ascii.c
@@ -29,9 +29,12 @@
  */
 
 #include "regenc.h"
-#include "encindex.h"
+#ifdef RUBY
+# include "encindex.h"
+#endif
+
 #ifndef ENCINDEX_ASCII
-#define ENCINDEX_ASCII 0
+# define ENCINDEX_ASCII 0
 #endif
 
 OnigEncodingDefine(ascii, ASCII) = {
@@ -51,15 +54,15 @@ OnigEncodingDefine(ascii, ASCII) = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
+  onigenc_single_byte_ascii_only_case_map,
   ENCINDEX_ASCII,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
-  onigenc_single_byte_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 ENC_ALIAS("BINARY", "ASCII-8BIT")
 ENC_REPLICATE("IBM437", "ASCII-8BIT")
 ENC_ALIAS("CP437", "IBM437")
+ENC_REPLICATE("IBM720", "ASCII-8BIT")
+ENC_ALIAS("CP720", "IBM720")
 ENC_REPLICATE("IBM737", "ASCII-8BIT")
 ENC_ALIAS("CP737", "IBM737")
 ENC_REPLICATE("IBM775", "ASCII-8BIT")
diff --git a/enc/big5.c b/enc/big5.c
index 16e97db02a..ab4fb69819 100644
--- a/enc/big5.c
+++ b/enc/big5.c
@@ -300,11 +300,9 @@ OnigEncodingDefine(big5, BIG5) = {
   onigenc_not_support_get_ctype_code_range,
   big5_left_adjust_char_head,
   big5_is_allowed_reverse_match,
+  onigenc_ascii_only_case_map,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
-  onigenc_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 
 /*
@@ -337,11 +335,9 @@ OnigEncodingDefine(big5_hkscs, BIG5_HKSCS) = {
   onigenc_not_support_get_ctype_code_range,
   big5_left_adjust_char_head,
   big5_is_allowed_reverse_match,
+  onigenc_ascii_only_case_map,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
-  onigenc_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 ENC_ALIAS("Big5-HKSCS:2008", "Big5-HKSCS")
 
@@ -374,9 +370,7 @@ OnigEncodingDefine(big5_uao, BIG5_UAO) = {
   onigenc_not_support_get_ctype_code_range,
   big5_left_adjust_char_head,
   big5_is_allowed_reverse_match,
+  onigenc_ascii_only_case_map,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
-  onigenc_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
diff --git a/enc/cesu_8.c b/enc/cesu_8.c
new file mode 100644
index 0000000000..decbb928f4
--- /dev/null
+++ b/enc/cesu_8.c
@@ -0,0 +1,454 @@
+/**********************************************************************
+  cesu_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"
+#ifdef RUBY
+# include "encindex.h"
+#endif
+
+#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
+#endif
+#define VALID_CODE_LIMIT  0x0010ffff
+
+#define utf8_islead(c)     ((UChar )((c) & 0xc0) != 0x80)
+
+static const int EncLen_CESU8[] = {
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 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,
+  1, 1, 1, 1, 1, 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 */ F, F, F, F, F, 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 */ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+    /* 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 */ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+    /* 9 */ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+    /* a */ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+    /* b */ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+    /* 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 */ 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, 7, 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 */ 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 */ 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
+  },
+};
+#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_CESU8[firstbyte]-1);
+  s = trans[s][*p++];
+  if (s < 0) return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(2) :
+                                  ONIGENC_CONSTRUCT_MBCLEN_INVALID();
+
+  if (p == e) {
+      int len = EncLen_CESU8[firstbyte];
+      if (s == 4) { /* S4 is CESU-8's surrogate pair; len is 6 */
+          len = 6;
+      }
+      return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(len-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(3);
+  s = trans[s][*p++];
+  if (s < 0) return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(4) :
+                                  ONIGENC_CONSTRUCT_MBCLEN_INVALID();
+
+  if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(2);
+  s = trans[s][*p++];
+  if (s < 0) return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(5) :
+                                  ONIGENC_CONSTRUCT_MBCLEN_INVALID();
+
+  if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(1);
+  s = trans[s][*p++];
+  return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(6) :
+                       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
+    if (*p == 0x0b || *p == 0x0c || *p == 0x0d) return 1;
+    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 len;
+
+  len = mbc_enc_len(p, end, enc);
+  switch (len) {
+    case 1:
+      return *p;
+    case 2:
+      return ((p[0] & 0x1F)  << 6) | (p[1] & 0x3f);
+    case 3:
+      return ((p[0] & 0xF) << 12) | ((p[1] & 0x3f) << 6) | (p[2] & 0x3f);
+    case 6:
+      {
+          int high = ((p[0] & 0xF) << 12) | ((p[1] & 0x3f) << 6) | (p[2] & 0x3f);
+          int low  = ((p[3] & 0xF) << 12) | ((p[4] & 0x3f) << 6) | (p[5] & 0x3f);
+          return ((high & 0x03ff) << 10) + (low & 0x03ff) + 0x10000;
+      }
+  }
+#ifdef USE_INVALID_CODE_SCHEME
+  if (*p > 0xfd) {
+      return ((*p == 0xfe) ? INVALID_CODE_FE : INVALID_CODE_FF);
+  }
+#endif
+  return (OnigCodePoint )*p;
+}
+
+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 <= VALID_CODE_LIMIT) 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 <= VALID_CODE_LIMIT) {
+      unsigned int high = (code >> 10) + 0xD7C0;
+      code = (code & 0x3FF) + 0xDC00;
+      *p++ = (UChar )(((high>>12) & 0x0f) | 0xe0);
+      *p++ = UTF8_TRAILS(high, 6);
+      *p++ = UTF8_TRAIL0(high);
+      *p++ = (UChar )(((code>>12) & 0x0f) | 0xe0);
+      *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 (int )(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, const UChar* end, 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(cesu_8, CESU_8) = {
+  mbc_enc_len,
+  "CESU-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,
+  onigenc_unicode_case_map,
+  ENCINDEX_UTF_8,
+  ONIGENC_FLAG_UNICODE,
+};
diff --git a/enc/cp949.c b/enc/cp949.c
index 2f37f73ad2..1600d0cd5b 100644
--- a/enc/cp949.c
+++ b/enc/cp949.c
@@ -211,14 +211,12 @@ OnigEncodingDefine(cp949, CP949) = {
   onigenc_not_support_get_ctype_code_range,
   cp949_left_adjust_char_head,
   cp949_is_allowed_reverse_match,
+  onigenc_ascii_only_case_map,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
-  onigenc_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 /*
  * Name: CP949
  * Link: http://www.microsoft.com/globaldev/reference/dbcs/949.mspx
- * Link: http://en.wikipedia.org/wiki/EUC-KR#EUC-KR
+ * Link: https://en.wikipedia.org/wiki/EUC-KR#EUC-KR
  */
diff --git a/enc/depend b/enc/depend
index 48a7cb0128..26f8e70c15 100644
--- a/enc/depend
+++ b/enc/depend
@@ -55,6 +55,7 @@ TRANSCLEANOBJS = <%=cleanobjs.map {|clean|
   clean.gsub(/\$\*(\.\w+)?/) {"$(TRANSOBJS#{$1 ? ":.#{CONFIG["OBJEXT"]}=#{$1}" : ""})"}
 }.join(" ")%>
 LIBTRANS=enc/libtrans.$(LIBEXT)
+UNICODE_HDR_DIR = --missing-unicode-header-dir--
 
 encs: all
 % if MODULE_TYPE == :static
@@ -96,7 +97,7 @@ $(ENCSOS) $(TRANSSOS): $(ENC_TRANS_SO_D)
 
 <%=transvpath_prefix%>.trans<%=transvpath_prefix%>.c:
 	$(ECHO) generating table from $@
-	$(Q)$(MINIRUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo "$@" "$<"
+	$(Q)$(MINIRUBY) "$(tooldir)/transcode-tblgen.rb" -vo "$@" "$<"
 
 % unless ENCS.empty? or TRANS.empty?
 
@@ -107,8 +108,12 @@ enc/<%=e%>.$(OBJEXT): <%=deps.map {|n| rule_subst % n}.join(' ')%>
 %     src = "#{e}.trans"
 
 <%=transvpath % "#{e}.c"%>: <%= transvpath % "#{e}.trans"%>
-%     src = [*IO.read(File.join($srcdir, "trans", src)).scan(/^\s*require\s+[\'\"]([^\'\"]*)/).flatten.map{|c|c+".rb"}]
-<%=transvpath % "#{e}.c"%>: <%= src.map {|s| transvpath % "#{s}"}.join(" ")%> $(srcdir)/tool/transcode-tblgen.rb
+%     trans = IO.read(File.join($srcdir, "trans", src))
+%     src = trans.scan(/^\s*require\s+[\'\"]([^\'\"]*)/).flatten.map{|c|c+".rb"}
+%     if src.empty?
+%       src = trans.scan(/^\s*transcode_tblgen_\w+\s+[\'\"]([^\'\"]*)/).flatten.map{|c|c.downcase+"-tbl.rb"}
+%     end
+<%=transvpath % "#{e}.c"%>: <%= src.map {|s| transvpath % "#{s}"}.join(" ")%> $(tooldir)/transcode-tblgen.rb
 %   end
 
 % end
@@ -153,7 +158,7 @@ clean:
 % end
 % @ignore_error = $nmake ? '' : ' 2> /dev/null || true'
 % unless inplace
-	$(Q)$(RM) enc/unicode/name2ctype.h
+	$(Q)$(RM) enc/unicode/*/casefold.h enc/unicode/*/name2ctype.h
 	$(Q)$(RM) enc/jis/props.h
 	-$(Q)$(RMDIR) enc/unicode<%=@ignore_error%>
 % end
@@ -164,7 +169,7 @@ clean:
 clean-srcs:
 	$(Q)$(RM) <%=pathrep['$(TRANSCSRCS)']%>
 	-$(Q)$(RMDIR) <%=pathrep['enc/trans']%><%=@ignore_error%>
-	$(Q)$(RM) enc/unicode/name2ctype.h
+	$(Q)$(RM) enc/unicode/*/casefold.h enc/unicode/*/name2ctype.h
 	$(Q)$(RM) enc/jis/props.h
 	-$(Q)$(RMDIR) <%=pathrep['enc/unicode']%><%=@ignore_error%>
 	-$(Q)$(RMDIR) <%=pathrep['enc/props']%><%=@ignore_error%>
@@ -173,231 +178,2206 @@ clean-srcs:
 <%# vim: set ft=eruby noexpandtab ts=8 sw=2 : -%>
 
 # AUTOGENERATED DEPENDENCIES START
+enc/ascii.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 enc/ascii.$(OBJEXT): $(top_srcdir)/encindex.h
 enc/ascii.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/ascii.$(OBJEXT): internal/anyargs.h
+enc/ascii.$(OBJEXT): internal/arithmetic.h
+enc/ascii.$(OBJEXT): internal/arithmetic/char.h
+enc/ascii.$(OBJEXT): internal/arithmetic/double.h
+enc/ascii.$(OBJEXT): internal/arithmetic/fixnum.h
+enc/ascii.$(OBJEXT): internal/arithmetic/gid_t.h
+enc/ascii.$(OBJEXT): internal/arithmetic/int.h
+enc/ascii.$(OBJEXT): internal/arithmetic/intptr_t.h
+enc/ascii.$(OBJEXT): internal/arithmetic/long.h
+enc/ascii.$(OBJEXT): internal/arithmetic/long_long.h
+enc/ascii.$(OBJEXT): internal/arithmetic/mode_t.h
+enc/ascii.$(OBJEXT): internal/arithmetic/off_t.h
+enc/ascii.$(OBJEXT): internal/arithmetic/pid_t.h
+enc/ascii.$(OBJEXT): internal/arithmetic/short.h
+enc/ascii.$(OBJEXT): internal/arithmetic/size_t.h
+enc/ascii.$(OBJEXT): internal/arithmetic/st_data_t.h
+enc/ascii.$(OBJEXT): internal/arithmetic/uid_t.h
+enc/ascii.$(OBJEXT): internal/assume.h
+enc/ascii.$(OBJEXT): internal/attr/alloc_size.h
+enc/ascii.$(OBJEXT): internal/attr/artificial.h
+enc/ascii.$(OBJEXT): internal/attr/cold.h
+enc/ascii.$(OBJEXT): internal/attr/const.h
+enc/ascii.$(OBJEXT): internal/attr/constexpr.h
+enc/ascii.$(OBJEXT): internal/attr/deprecated.h
+enc/ascii.$(OBJEXT): internal/attr/diagnose_if.h
+enc/ascii.$(OBJEXT): internal/attr/enum_extensibility.h
+enc/ascii.$(OBJEXT): internal/attr/error.h
+enc/ascii.$(OBJEXT): internal/attr/flag_enum.h
+enc/ascii.$(OBJEXT): internal/attr/forceinline.h
+enc/ascii.$(OBJEXT): internal/attr/format.h
+enc/ascii.$(OBJEXT): internal/attr/maybe_unused.h
+enc/ascii.$(OBJEXT): internal/attr/noalias.h
+enc/ascii.$(OBJEXT): internal/attr/nodiscard.h
+enc/ascii.$(OBJEXT): internal/attr/noexcept.h
+enc/ascii.$(OBJEXT): internal/attr/noinline.h
+enc/ascii.$(OBJEXT): internal/attr/nonnull.h
+enc/ascii.$(OBJEXT): internal/attr/noreturn.h
+enc/ascii.$(OBJEXT): internal/attr/pure.h
+enc/ascii.$(OBJEXT): internal/attr/restrict.h
+enc/ascii.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/ascii.$(OBJEXT): internal/attr/warning.h
+enc/ascii.$(OBJEXT): internal/attr/weakref.h
+enc/ascii.$(OBJEXT): internal/cast.h
+enc/ascii.$(OBJEXT): internal/compiler_is.h
+enc/ascii.$(OBJEXT): internal/compiler_is/apple.h
+enc/ascii.$(OBJEXT): internal/compiler_is/clang.h
+enc/ascii.$(OBJEXT): internal/compiler_is/gcc.h
+enc/ascii.$(OBJEXT): internal/compiler_is/intel.h
+enc/ascii.$(OBJEXT): internal/compiler_is/msvc.h
+enc/ascii.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/ascii.$(OBJEXT): internal/compiler_since.h
+enc/ascii.$(OBJEXT): internal/config.h
+enc/ascii.$(OBJEXT): internal/constant_p.h
+enc/ascii.$(OBJEXT): internal/core.h
+enc/ascii.$(OBJEXT): internal/core/rarray.h
+enc/ascii.$(OBJEXT): internal/core/rbasic.h
+enc/ascii.$(OBJEXT): internal/core/rbignum.h
+enc/ascii.$(OBJEXT): internal/core/rclass.h
+enc/ascii.$(OBJEXT): internal/core/rdata.h
+enc/ascii.$(OBJEXT): internal/core/rfile.h
+enc/ascii.$(OBJEXT): internal/core/rhash.h
+enc/ascii.$(OBJEXT): internal/core/robject.h
+enc/ascii.$(OBJEXT): internal/core/rregexp.h
+enc/ascii.$(OBJEXT): internal/core/rstring.h
+enc/ascii.$(OBJEXT): internal/core/rstruct.h
+enc/ascii.$(OBJEXT): internal/core/rtypeddata.h
+enc/ascii.$(OBJEXT): internal/ctype.h
+enc/ascii.$(OBJEXT): internal/dllexport.h
+enc/ascii.$(OBJEXT): internal/dosish.h
+enc/ascii.$(OBJEXT): internal/error.h
+enc/ascii.$(OBJEXT): internal/eval.h
+enc/ascii.$(OBJEXT): internal/event.h
+enc/ascii.$(OBJEXT): internal/fl_type.h
+enc/ascii.$(OBJEXT): internal/gc.h
+enc/ascii.$(OBJEXT): internal/glob.h
+enc/ascii.$(OBJEXT): internal/globals.h
+enc/ascii.$(OBJEXT): internal/has/attribute.h
+enc/ascii.$(OBJEXT): internal/has/builtin.h
+enc/ascii.$(OBJEXT): internal/has/c_attribute.h
+enc/ascii.$(OBJEXT): internal/has/cpp_attribute.h
+enc/ascii.$(OBJEXT): internal/has/declspec_attribute.h
+enc/ascii.$(OBJEXT): internal/has/extension.h
+enc/ascii.$(OBJEXT): internal/has/feature.h
+enc/ascii.$(OBJEXT): internal/has/warning.h
+enc/ascii.$(OBJEXT): internal/intern/array.h
+enc/ascii.$(OBJEXT): internal/intern/bignum.h
+enc/ascii.$(OBJEXT): internal/intern/class.h
+enc/ascii.$(OBJEXT): internal/intern/compar.h
+enc/ascii.$(OBJEXT): internal/intern/complex.h
+enc/ascii.$(OBJEXT): internal/intern/cont.h
+enc/ascii.$(OBJEXT): internal/intern/dir.h
+enc/ascii.$(OBJEXT): internal/intern/enum.h
+enc/ascii.$(OBJEXT): internal/intern/enumerator.h
+enc/ascii.$(OBJEXT): internal/intern/error.h
+enc/ascii.$(OBJEXT): internal/intern/eval.h
+enc/ascii.$(OBJEXT): internal/intern/file.h
+enc/ascii.$(OBJEXT): internal/intern/gc.h
+enc/ascii.$(OBJEXT): internal/intern/hash.h
+enc/ascii.$(OBJEXT): internal/intern/io.h
+enc/ascii.$(OBJEXT): internal/intern/load.h
+enc/ascii.$(OBJEXT): internal/intern/marshal.h
+enc/ascii.$(OBJEXT): internal/intern/numeric.h
+enc/ascii.$(OBJEXT): internal/intern/object.h
+enc/ascii.$(OBJEXT): internal/intern/parse.h
+enc/ascii.$(OBJEXT): internal/intern/proc.h
+enc/ascii.$(OBJEXT): internal/intern/process.h
+enc/ascii.$(OBJEXT): internal/intern/random.h
+enc/ascii.$(OBJEXT): internal/intern/range.h
+enc/ascii.$(OBJEXT): internal/intern/rational.h
+enc/ascii.$(OBJEXT): internal/intern/re.h
+enc/ascii.$(OBJEXT): internal/intern/ruby.h
+enc/ascii.$(OBJEXT): internal/intern/select.h
+enc/ascii.$(OBJEXT): internal/intern/select/largesize.h
+enc/ascii.$(OBJEXT): internal/intern/signal.h
+enc/ascii.$(OBJEXT): internal/intern/sprintf.h
+enc/ascii.$(OBJEXT): internal/intern/string.h
+enc/ascii.$(OBJEXT): internal/intern/struct.h
+enc/ascii.$(OBJEXT): internal/intern/thread.h
+enc/ascii.$(OBJEXT): internal/intern/time.h
+enc/ascii.$(OBJEXT): internal/intern/variable.h
+enc/ascii.$(OBJEXT): internal/intern/vm.h
+enc/ascii.$(OBJEXT): internal/interpreter.h
+enc/ascii.$(OBJEXT): internal/iterator.h
+enc/ascii.$(OBJEXT): internal/memory.h
+enc/ascii.$(OBJEXT): internal/method.h
+enc/ascii.$(OBJEXT): internal/module.h
+enc/ascii.$(OBJEXT): internal/newobj.h
+enc/ascii.$(OBJEXT): internal/rgengc.h
+enc/ascii.$(OBJEXT): internal/scan_args.h
+enc/ascii.$(OBJEXT): internal/special_consts.h
+enc/ascii.$(OBJEXT): internal/static_assert.h
+enc/ascii.$(OBJEXT): internal/stdalign.h
+enc/ascii.$(OBJEXT): internal/stdbool.h
+enc/ascii.$(OBJEXT): internal/symbol.h
+enc/ascii.$(OBJEXT): internal/token_paste.h
+enc/ascii.$(OBJEXT): internal/value.h
+enc/ascii.$(OBJEXT): internal/value_type.h
+enc/ascii.$(OBJEXT): internal/variable.h
+enc/ascii.$(OBJEXT): internal/warning_push.h
+enc/ascii.$(OBJEXT): internal/xmalloc.h
+enc/ascii.$(OBJEXT): assert.h
+enc/ascii.$(OBJEXT): backward/2/assume.h
+enc/ascii.$(OBJEXT): backward/2/attributes.h
+enc/ascii.$(OBJEXT): backward/2/bool.h
+enc/ascii.$(OBJEXT): backward/2/gcc_version_since.h
+enc/ascii.$(OBJEXT): backward/2/inttypes.h
+enc/ascii.$(OBJEXT): backward/2/limits.h
+enc/ascii.$(OBJEXT): backward/2/long_long.h
+enc/ascii.$(OBJEXT): backward/2/stdalign.h
+enc/ascii.$(OBJEXT): backward/2/stdarg.h
 enc/ascii.$(OBJEXT): config.h
 enc/ascii.$(OBJEXT): defines.h
 enc/ascii.$(OBJEXT): enc/ascii.c
+enc/ascii.$(OBJEXT): encoding.h
+enc/ascii.$(OBJEXT): intern.h
 enc/ascii.$(OBJEXT): missing.h
+enc/ascii.$(OBJEXT): onigmo.h
 enc/ascii.$(OBJEXT): oniguruma.h
+enc/ascii.$(OBJEXT): st.h
+enc/ascii.$(OBJEXT): subst.h
 enc/big5.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/big5.$(OBJEXT): internal/assume.h
+enc/big5.$(OBJEXT): internal/attr/alloc_size.h
+enc/big5.$(OBJEXT): internal/attr/cold.h
+enc/big5.$(OBJEXT): internal/attr/const.h
+enc/big5.$(OBJEXT): internal/attr/deprecated.h
+enc/big5.$(OBJEXT): internal/attr/error.h
+enc/big5.$(OBJEXT): internal/attr/forceinline.h
+enc/big5.$(OBJEXT): internal/attr/format.h
+enc/big5.$(OBJEXT): internal/attr/maybe_unused.h
+enc/big5.$(OBJEXT): internal/attr/nodiscard.h
+enc/big5.$(OBJEXT): internal/attr/noexcept.h
+enc/big5.$(OBJEXT): internal/attr/noinline.h
+enc/big5.$(OBJEXT): internal/attr/nonnull.h
+enc/big5.$(OBJEXT): internal/attr/noreturn.h
+enc/big5.$(OBJEXT): internal/attr/pure.h
+enc/big5.$(OBJEXT): internal/attr/restrict.h
+enc/big5.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/big5.$(OBJEXT): internal/attr/warning.h
+enc/big5.$(OBJEXT): internal/cast.h
+enc/big5.$(OBJEXT): internal/compiler_is.h
+enc/big5.$(OBJEXT): internal/compiler_is/apple.h
+enc/big5.$(OBJEXT): internal/compiler_is/clang.h
+enc/big5.$(OBJEXT): internal/compiler_is/gcc.h
+enc/big5.$(OBJEXT): internal/compiler_is/intel.h
+enc/big5.$(OBJEXT): internal/compiler_is/msvc.h
+enc/big5.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/big5.$(OBJEXT): internal/compiler_since.h
+enc/big5.$(OBJEXT): internal/config.h
+enc/big5.$(OBJEXT): internal/dllexport.h
+enc/big5.$(OBJEXT): internal/dosish.h
+enc/big5.$(OBJEXT): internal/has/attribute.h
+enc/big5.$(OBJEXT): internal/has/builtin.h
+enc/big5.$(OBJEXT): internal/has/c_attribute.h
+enc/big5.$(OBJEXT): internal/has/cpp_attribute.h
+enc/big5.$(OBJEXT): internal/has/declspec_attribute.h
+enc/big5.$(OBJEXT): internal/has/extension.h
+enc/big5.$(OBJEXT): internal/has/feature.h
+enc/big5.$(OBJEXT): internal/has/warning.h
+enc/big5.$(OBJEXT): internal/stdalign.h
+enc/big5.$(OBJEXT): internal/stdbool.h
+enc/big5.$(OBJEXT): internal/token_paste.h
+enc/big5.$(OBJEXT): internal/warning_push.h
+enc/big5.$(OBJEXT): internal/xmalloc.h
+enc/big5.$(OBJEXT): assert.h
+enc/big5.$(OBJEXT): backward/2/assume.h
+enc/big5.$(OBJEXT): backward/2/attributes.h
+enc/big5.$(OBJEXT): backward/2/bool.h
+enc/big5.$(OBJEXT): backward/2/gcc_version_since.h
+enc/big5.$(OBJEXT): backward/2/long_long.h
+enc/big5.$(OBJEXT): backward/2/stdalign.h
+enc/big5.$(OBJEXT): backward/2/stdarg.h
 enc/big5.$(OBJEXT): config.h
 enc/big5.$(OBJEXT): defines.h
 enc/big5.$(OBJEXT): enc/big5.c
 enc/big5.$(OBJEXT): missing.h
-enc/big5.$(OBJEXT): oniguruma.h
+enc/big5.$(OBJEXT): onigmo.h
+enc/cesu_8.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+enc/cesu_8.$(OBJEXT): $(top_srcdir)/encindex.h
+enc/cesu_8.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/cesu_8.$(OBJEXT): internal/anyargs.h
+enc/cesu_8.$(OBJEXT): internal/arithmetic.h
+enc/cesu_8.$(OBJEXT): internal/arithmetic/char.h
+enc/cesu_8.$(OBJEXT): internal/arithmetic/double.h
+enc/cesu_8.$(OBJEXT): internal/arithmetic/fixnum.h
+enc/cesu_8.$(OBJEXT): internal/arithmetic/gid_t.h
+enc/cesu_8.$(OBJEXT): internal/arithmetic/int.h
+enc/cesu_8.$(OBJEXT): internal/arithmetic/intptr_t.h
+enc/cesu_8.$(OBJEXT): internal/arithmetic/long.h
+enc/cesu_8.$(OBJEXT): internal/arithmetic/long_long.h
+enc/cesu_8.$(OBJEXT): internal/arithmetic/mode_t.h
+enc/cesu_8.$(OBJEXT): internal/arithmetic/off_t.h
+enc/cesu_8.$(OBJEXT): internal/arithmetic/pid_t.h
+enc/cesu_8.$(OBJEXT): internal/arithmetic/short.h
+enc/cesu_8.$(OBJEXT): internal/arithmetic/size_t.h
+enc/cesu_8.$(OBJEXT): internal/arithmetic/st_data_t.h
+enc/cesu_8.$(OBJEXT): internal/arithmetic/uid_t.h
+enc/cesu_8.$(OBJEXT): internal/assume.h
+enc/cesu_8.$(OBJEXT): internal/attr/alloc_size.h
+enc/cesu_8.$(OBJEXT): internal/attr/artificial.h
+enc/cesu_8.$(OBJEXT): internal/attr/cold.h
+enc/cesu_8.$(OBJEXT): internal/attr/const.h
+enc/cesu_8.$(OBJEXT): internal/attr/constexpr.h
+enc/cesu_8.$(OBJEXT): internal/attr/deprecated.h
+enc/cesu_8.$(OBJEXT): internal/attr/diagnose_if.h
+enc/cesu_8.$(OBJEXT): internal/attr/enum_extensibility.h
+enc/cesu_8.$(OBJEXT): internal/attr/error.h
+enc/cesu_8.$(OBJEXT): internal/attr/flag_enum.h
+enc/cesu_8.$(OBJEXT): internal/attr/forceinline.h
+enc/cesu_8.$(OBJEXT): internal/attr/format.h
+enc/cesu_8.$(OBJEXT): internal/attr/maybe_unused.h
+enc/cesu_8.$(OBJEXT): internal/attr/noalias.h
+enc/cesu_8.$(OBJEXT): internal/attr/nodiscard.h
+enc/cesu_8.$(OBJEXT): internal/attr/noexcept.h
+enc/cesu_8.$(OBJEXT): internal/attr/noinline.h
+enc/cesu_8.$(OBJEXT): internal/attr/nonnull.h
+enc/cesu_8.$(OBJEXT): internal/attr/noreturn.h
+enc/cesu_8.$(OBJEXT): internal/attr/pure.h
+enc/cesu_8.$(OBJEXT): internal/attr/restrict.h
+enc/cesu_8.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/cesu_8.$(OBJEXT): internal/attr/warning.h
+enc/cesu_8.$(OBJEXT): internal/attr/weakref.h
+enc/cesu_8.$(OBJEXT): internal/cast.h
+enc/cesu_8.$(OBJEXT): internal/compiler_is.h
+enc/cesu_8.$(OBJEXT): internal/compiler_is/apple.h
+enc/cesu_8.$(OBJEXT): internal/compiler_is/clang.h
+enc/cesu_8.$(OBJEXT): internal/compiler_is/gcc.h
+enc/cesu_8.$(OBJEXT): internal/compiler_is/intel.h
+enc/cesu_8.$(OBJEXT): internal/compiler_is/msvc.h
+enc/cesu_8.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/cesu_8.$(OBJEXT): internal/compiler_since.h
+enc/cesu_8.$(OBJEXT): internal/config.h
+enc/cesu_8.$(OBJEXT): internal/constant_p.h
+enc/cesu_8.$(OBJEXT): internal/core.h
+enc/cesu_8.$(OBJEXT): internal/core/rarray.h
+enc/cesu_8.$(OBJEXT): internal/core/rbasic.h
+enc/cesu_8.$(OBJEXT): internal/core/rbignum.h
+enc/cesu_8.$(OBJEXT): internal/core/rclass.h
+enc/cesu_8.$(OBJEXT): internal/core/rdata.h
+enc/cesu_8.$(OBJEXT): internal/core/rfile.h
+enc/cesu_8.$(OBJEXT): internal/core/rhash.h
+enc/cesu_8.$(OBJEXT): internal/core/robject.h
+enc/cesu_8.$(OBJEXT): internal/core/rregexp.h
+enc/cesu_8.$(OBJEXT): internal/core/rstring.h
+enc/cesu_8.$(OBJEXT): internal/core/rstruct.h
+enc/cesu_8.$(OBJEXT): internal/core/rtypeddata.h
+enc/cesu_8.$(OBJEXT): internal/ctype.h
+enc/cesu_8.$(OBJEXT): internal/dllexport.h
+enc/cesu_8.$(OBJEXT): internal/dosish.h
+enc/cesu_8.$(OBJEXT): internal/error.h
+enc/cesu_8.$(OBJEXT): internal/eval.h
+enc/cesu_8.$(OBJEXT): internal/event.h
+enc/cesu_8.$(OBJEXT): internal/fl_type.h
+enc/cesu_8.$(OBJEXT): internal/gc.h
+enc/cesu_8.$(OBJEXT): internal/glob.h
+enc/cesu_8.$(OBJEXT): internal/globals.h
+enc/cesu_8.$(OBJEXT): internal/has/attribute.h
+enc/cesu_8.$(OBJEXT): internal/has/builtin.h
+enc/cesu_8.$(OBJEXT): internal/has/c_attribute.h
+enc/cesu_8.$(OBJEXT): internal/has/cpp_attribute.h
+enc/cesu_8.$(OBJEXT): internal/has/declspec_attribute.h
+enc/cesu_8.$(OBJEXT): internal/has/extension.h
+enc/cesu_8.$(OBJEXT): internal/has/feature.h
+enc/cesu_8.$(OBJEXT): internal/has/warning.h
+enc/cesu_8.$(OBJEXT): internal/intern/array.h
+enc/cesu_8.$(OBJEXT): internal/intern/bignum.h
+enc/cesu_8.$(OBJEXT): internal/intern/class.h
+enc/cesu_8.$(OBJEXT): internal/intern/compar.h
+enc/cesu_8.$(OBJEXT): internal/intern/complex.h
+enc/cesu_8.$(OBJEXT): internal/intern/cont.h
+enc/cesu_8.$(OBJEXT): internal/intern/dir.h
+enc/cesu_8.$(OBJEXT): internal/intern/enum.h
+enc/cesu_8.$(OBJEXT): internal/intern/enumerator.h
+enc/cesu_8.$(OBJEXT): internal/intern/error.h
+enc/cesu_8.$(OBJEXT): internal/intern/eval.h
+enc/cesu_8.$(OBJEXT): internal/intern/file.h
+enc/cesu_8.$(OBJEXT): internal/intern/gc.h
+enc/cesu_8.$(OBJEXT): internal/intern/hash.h
+enc/cesu_8.$(OBJEXT): internal/intern/io.h
+enc/cesu_8.$(OBJEXT): internal/intern/load.h
+enc/cesu_8.$(OBJEXT): internal/intern/marshal.h
+enc/cesu_8.$(OBJEXT): internal/intern/numeric.h
+enc/cesu_8.$(OBJEXT): internal/intern/object.h
+enc/cesu_8.$(OBJEXT): internal/intern/parse.h
+enc/cesu_8.$(OBJEXT): internal/intern/proc.h
+enc/cesu_8.$(OBJEXT): internal/intern/process.h
+enc/cesu_8.$(OBJEXT): internal/intern/random.h
+enc/cesu_8.$(OBJEXT): internal/intern/range.h
+enc/cesu_8.$(OBJEXT): internal/intern/rational.h
+enc/cesu_8.$(OBJEXT): internal/intern/re.h
+enc/cesu_8.$(OBJEXT): internal/intern/ruby.h
+enc/cesu_8.$(OBJEXT): internal/intern/select.h
+enc/cesu_8.$(OBJEXT): internal/intern/select/largesize.h
+enc/cesu_8.$(OBJEXT): internal/intern/signal.h
+enc/cesu_8.$(OBJEXT): internal/intern/sprintf.h
+enc/cesu_8.$(OBJEXT): internal/intern/string.h
+enc/cesu_8.$(OBJEXT): internal/intern/struct.h
+enc/cesu_8.$(OBJEXT): internal/intern/thread.h
+enc/cesu_8.$(OBJEXT): internal/intern/time.h
+enc/cesu_8.$(OBJEXT): internal/intern/variable.h
+enc/cesu_8.$(OBJEXT): internal/intern/vm.h
+enc/cesu_8.$(OBJEXT): internal/interpreter.h
+enc/cesu_8.$(OBJEXT): internal/iterator.h
+enc/cesu_8.$(OBJEXT): internal/memory.h
+enc/cesu_8.$(OBJEXT): internal/method.h
+enc/cesu_8.$(OBJEXT): internal/module.h
+enc/cesu_8.$(OBJEXT): internal/newobj.h
+enc/cesu_8.$(OBJEXT): internal/rgengc.h
+enc/cesu_8.$(OBJEXT): internal/scan_args.h
+enc/cesu_8.$(OBJEXT): internal/special_consts.h
+enc/cesu_8.$(OBJEXT): internal/static_assert.h
+enc/cesu_8.$(OBJEXT): internal/stdalign.h
+enc/cesu_8.$(OBJEXT): internal/stdbool.h
+enc/cesu_8.$(OBJEXT): internal/symbol.h
+enc/cesu_8.$(OBJEXT): internal/token_paste.h
+enc/cesu_8.$(OBJEXT): internal/value.h
+enc/cesu_8.$(OBJEXT): internal/value_type.h
+enc/cesu_8.$(OBJEXT): internal/variable.h
+enc/cesu_8.$(OBJEXT): internal/warning_push.h
+enc/cesu_8.$(OBJEXT): internal/xmalloc.h
+enc/cesu_8.$(OBJEXT): assert.h
+enc/cesu_8.$(OBJEXT): backward.h
+enc/cesu_8.$(OBJEXT): backward/2/assume.h
+enc/cesu_8.$(OBJEXT): backward/2/attributes.h
+enc/cesu_8.$(OBJEXT): backward/2/bool.h
+enc/cesu_8.$(OBJEXT): backward/2/gcc_version_since.h
+enc/cesu_8.$(OBJEXT): backward/2/inttypes.h
+enc/cesu_8.$(OBJEXT): backward/2/limits.h
+enc/cesu_8.$(OBJEXT): backward/2/long_long.h
+enc/cesu_8.$(OBJEXT): backward/2/stdalign.h
+enc/cesu_8.$(OBJEXT): backward/2/stdarg.h
+enc/cesu_8.$(OBJEXT): config.h
+enc/cesu_8.$(OBJEXT): defines.h
+enc/cesu_8.$(OBJEXT): enc/cesu_8.c
+enc/cesu_8.$(OBJEXT): encoding.h
+enc/cesu_8.$(OBJEXT): intern.h
+enc/cesu_8.$(OBJEXT): missing.h
+enc/cesu_8.$(OBJEXT): onigmo.h
+enc/cesu_8.$(OBJEXT): oniguruma.h
+enc/cesu_8.$(OBJEXT): st.h
+enc/cesu_8.$(OBJEXT): subst.h
 enc/cp949.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/cp949.$(OBJEXT): internal/assume.h
+enc/cp949.$(OBJEXT): internal/attr/alloc_size.h
+enc/cp949.$(OBJEXT): internal/attr/cold.h
+enc/cp949.$(OBJEXT): internal/attr/const.h
+enc/cp949.$(OBJEXT): internal/attr/deprecated.h
+enc/cp949.$(OBJEXT): internal/attr/error.h
+enc/cp949.$(OBJEXT): internal/attr/forceinline.h
+enc/cp949.$(OBJEXT): internal/attr/format.h
+enc/cp949.$(OBJEXT): internal/attr/maybe_unused.h
+enc/cp949.$(OBJEXT): internal/attr/nodiscard.h
+enc/cp949.$(OBJEXT): internal/attr/noexcept.h
+enc/cp949.$(OBJEXT): internal/attr/noinline.h
+enc/cp949.$(OBJEXT): internal/attr/nonnull.h
+enc/cp949.$(OBJEXT): internal/attr/noreturn.h
+enc/cp949.$(OBJEXT): internal/attr/pure.h
+enc/cp949.$(OBJEXT): internal/attr/restrict.h
+enc/cp949.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/cp949.$(OBJEXT): internal/attr/warning.h
+enc/cp949.$(OBJEXT): internal/cast.h
+enc/cp949.$(OBJEXT): internal/compiler_is.h
+enc/cp949.$(OBJEXT): internal/compiler_is/apple.h
+enc/cp949.$(OBJEXT): internal/compiler_is/clang.h
+enc/cp949.$(OBJEXT): internal/compiler_is/gcc.h
+enc/cp949.$(OBJEXT): internal/compiler_is/intel.h
+enc/cp949.$(OBJEXT): internal/compiler_is/msvc.h
+enc/cp949.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/cp949.$(OBJEXT): internal/compiler_since.h
+enc/cp949.$(OBJEXT): internal/config.h
+enc/cp949.$(OBJEXT): internal/dllexport.h
+enc/cp949.$(OBJEXT): internal/dosish.h
+enc/cp949.$(OBJEXT): internal/has/attribute.h
+enc/cp949.$(OBJEXT): internal/has/builtin.h
+enc/cp949.$(OBJEXT): internal/has/c_attribute.h
+enc/cp949.$(OBJEXT): internal/has/cpp_attribute.h
+enc/cp949.$(OBJEXT): internal/has/declspec_attribute.h
+enc/cp949.$(OBJEXT): internal/has/extension.h
+enc/cp949.$(OBJEXT): internal/has/feature.h
+enc/cp949.$(OBJEXT): internal/has/warning.h
+enc/cp949.$(OBJEXT): internal/stdalign.h
+enc/cp949.$(OBJEXT): internal/stdbool.h
+enc/cp949.$(OBJEXT): internal/token_paste.h
+enc/cp949.$(OBJEXT): internal/warning_push.h
+enc/cp949.$(OBJEXT): internal/xmalloc.h
+enc/cp949.$(OBJEXT): assert.h
+enc/cp949.$(OBJEXT): backward/2/assume.h
+enc/cp949.$(OBJEXT): backward/2/attributes.h
+enc/cp949.$(OBJEXT): backward/2/bool.h
+enc/cp949.$(OBJEXT): backward/2/gcc_version_since.h
+enc/cp949.$(OBJEXT): backward/2/long_long.h
+enc/cp949.$(OBJEXT): backward/2/stdalign.h
+enc/cp949.$(OBJEXT): backward/2/stdarg.h
 enc/cp949.$(OBJEXT): config.h
 enc/cp949.$(OBJEXT): defines.h
 enc/cp949.$(OBJEXT): enc/cp949.c
 enc/cp949.$(OBJEXT): missing.h
-enc/cp949.$(OBJEXT): oniguruma.h
-enc/emacs_mule.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+enc/cp949.$(OBJEXT): onigmo.h
 enc/emacs_mule.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/emacs_mule.$(OBJEXT): $(top_srcdir)/regint.h
-enc/emacs_mule.$(OBJEXT): backward.h
+enc/emacs_mule.$(OBJEXT): internal/assume.h
+enc/emacs_mule.$(OBJEXT): internal/attr/alloc_size.h
+enc/emacs_mule.$(OBJEXT): internal/attr/cold.h
+enc/emacs_mule.$(OBJEXT): internal/attr/const.h
+enc/emacs_mule.$(OBJEXT): internal/attr/deprecated.h
+enc/emacs_mule.$(OBJEXT): internal/attr/error.h
+enc/emacs_mule.$(OBJEXT): internal/attr/forceinline.h
+enc/emacs_mule.$(OBJEXT): internal/attr/format.h
+enc/emacs_mule.$(OBJEXT): internal/attr/maybe_unused.h
+enc/emacs_mule.$(OBJEXT): internal/attr/nodiscard.h
+enc/emacs_mule.$(OBJEXT): internal/attr/noexcept.h
+enc/emacs_mule.$(OBJEXT): internal/attr/noinline.h
+enc/emacs_mule.$(OBJEXT): internal/attr/nonnull.h
+enc/emacs_mule.$(OBJEXT): internal/attr/noreturn.h
+enc/emacs_mule.$(OBJEXT): internal/attr/pure.h
+enc/emacs_mule.$(OBJEXT): internal/attr/restrict.h
+enc/emacs_mule.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/emacs_mule.$(OBJEXT): internal/attr/warning.h
+enc/emacs_mule.$(OBJEXT): internal/cast.h
+enc/emacs_mule.$(OBJEXT): internal/compiler_is.h
+enc/emacs_mule.$(OBJEXT): internal/compiler_is/apple.h
+enc/emacs_mule.$(OBJEXT): internal/compiler_is/clang.h
+enc/emacs_mule.$(OBJEXT): internal/compiler_is/gcc.h
+enc/emacs_mule.$(OBJEXT): internal/compiler_is/intel.h
+enc/emacs_mule.$(OBJEXT): internal/compiler_is/msvc.h
+enc/emacs_mule.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/emacs_mule.$(OBJEXT): internal/compiler_since.h
+enc/emacs_mule.$(OBJEXT): internal/config.h
+enc/emacs_mule.$(OBJEXT): internal/dllexport.h
+enc/emacs_mule.$(OBJEXT): internal/dosish.h
+enc/emacs_mule.$(OBJEXT): internal/has/attribute.h
+enc/emacs_mule.$(OBJEXT): internal/has/builtin.h
+enc/emacs_mule.$(OBJEXT): internal/has/c_attribute.h
+enc/emacs_mule.$(OBJEXT): internal/has/cpp_attribute.h
+enc/emacs_mule.$(OBJEXT): internal/has/declspec_attribute.h
+enc/emacs_mule.$(OBJEXT): internal/has/extension.h
+enc/emacs_mule.$(OBJEXT): internal/has/feature.h
+enc/emacs_mule.$(OBJEXT): internal/has/warning.h
+enc/emacs_mule.$(OBJEXT): internal/stdalign.h
+enc/emacs_mule.$(OBJEXT): internal/stdbool.h
+enc/emacs_mule.$(OBJEXT): internal/token_paste.h
+enc/emacs_mule.$(OBJEXT): internal/warning_push.h
+enc/emacs_mule.$(OBJEXT): internal/xmalloc.h
+enc/emacs_mule.$(OBJEXT): assert.h
+enc/emacs_mule.$(OBJEXT): backward/2/assume.h
+enc/emacs_mule.$(OBJEXT): backward/2/attributes.h
+enc/emacs_mule.$(OBJEXT): backward/2/bool.h
+enc/emacs_mule.$(OBJEXT): backward/2/gcc_version_since.h
+enc/emacs_mule.$(OBJEXT): backward/2/long_long.h
+enc/emacs_mule.$(OBJEXT): backward/2/stdalign.h
+enc/emacs_mule.$(OBJEXT): backward/2/stdarg.h
 enc/emacs_mule.$(OBJEXT): config.h
 enc/emacs_mule.$(OBJEXT): defines.h
 enc/emacs_mule.$(OBJEXT): enc/emacs_mule.c
-enc/emacs_mule.$(OBJEXT): intern.h
 enc/emacs_mule.$(OBJEXT): missing.h
-enc/emacs_mule.$(OBJEXT): oniguruma.h
-enc/emacs_mule.$(OBJEXT): st.h
-enc/emacs_mule.$(OBJEXT): subst.h
+enc/emacs_mule.$(OBJEXT): onigmo.h
+enc/encdb.$(OBJEXT): $(hdrdir)/ruby.h
 enc/encdb.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-enc/encdb.$(OBJEXT): $(top_srcdir)/include/ruby.h
 enc/encdb.$(OBJEXT): $(top_srcdir)/internal.h
+enc/encdb.$(OBJEXT): $(top_srcdir)/internal/encoding.h
+enc/encdb.$(OBJEXT): internal/anyargs.h
+enc/encdb.$(OBJEXT): internal/arithmetic.h
+enc/encdb.$(OBJEXT): internal/arithmetic/char.h
+enc/encdb.$(OBJEXT): internal/arithmetic/double.h
+enc/encdb.$(OBJEXT): internal/arithmetic/fixnum.h
+enc/encdb.$(OBJEXT): internal/arithmetic/gid_t.h
+enc/encdb.$(OBJEXT): internal/arithmetic/int.h
+enc/encdb.$(OBJEXT): internal/arithmetic/intptr_t.h
+enc/encdb.$(OBJEXT): internal/arithmetic/long.h
+enc/encdb.$(OBJEXT): internal/arithmetic/long_long.h
+enc/encdb.$(OBJEXT): internal/arithmetic/mode_t.h
+enc/encdb.$(OBJEXT): internal/arithmetic/off_t.h
+enc/encdb.$(OBJEXT): internal/arithmetic/pid_t.h
+enc/encdb.$(OBJEXT): internal/arithmetic/short.h
+enc/encdb.$(OBJEXT): internal/arithmetic/size_t.h
+enc/encdb.$(OBJEXT): internal/arithmetic/st_data_t.h
+enc/encdb.$(OBJEXT): internal/arithmetic/uid_t.h
+enc/encdb.$(OBJEXT): internal/assume.h
+enc/encdb.$(OBJEXT): internal/attr/alloc_size.h
+enc/encdb.$(OBJEXT): internal/attr/artificial.h
+enc/encdb.$(OBJEXT): internal/attr/cold.h
+enc/encdb.$(OBJEXT): internal/attr/const.h
+enc/encdb.$(OBJEXT): internal/attr/constexpr.h
+enc/encdb.$(OBJEXT): internal/attr/deprecated.h
+enc/encdb.$(OBJEXT): internal/attr/diagnose_if.h
+enc/encdb.$(OBJEXT): internal/attr/enum_extensibility.h
+enc/encdb.$(OBJEXT): internal/attr/error.h
+enc/encdb.$(OBJEXT): internal/attr/flag_enum.h
+enc/encdb.$(OBJEXT): internal/attr/forceinline.h
+enc/encdb.$(OBJEXT): internal/attr/format.h
+enc/encdb.$(OBJEXT): internal/attr/maybe_unused.h
+enc/encdb.$(OBJEXT): internal/attr/noalias.h
+enc/encdb.$(OBJEXT): internal/attr/nodiscard.h
+enc/encdb.$(OBJEXT): internal/attr/noexcept.h
+enc/encdb.$(OBJEXT): internal/attr/noinline.h
+enc/encdb.$(OBJEXT): internal/attr/nonnull.h
+enc/encdb.$(OBJEXT): internal/attr/noreturn.h
+enc/encdb.$(OBJEXT): internal/attr/pure.h
+enc/encdb.$(OBJEXT): internal/attr/restrict.h
+enc/encdb.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/encdb.$(OBJEXT): internal/attr/warning.h
+enc/encdb.$(OBJEXT): internal/attr/weakref.h
+enc/encdb.$(OBJEXT): internal/cast.h
+enc/encdb.$(OBJEXT): internal/compiler_is.h
+enc/encdb.$(OBJEXT): internal/compiler_is/apple.h
+enc/encdb.$(OBJEXT): internal/compiler_is/clang.h
+enc/encdb.$(OBJEXT): internal/compiler_is/gcc.h
+enc/encdb.$(OBJEXT): internal/compiler_is/intel.h
+enc/encdb.$(OBJEXT): internal/compiler_is/msvc.h
+enc/encdb.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/encdb.$(OBJEXT): internal/compiler_since.h
+enc/encdb.$(OBJEXT): internal/config.h
+enc/encdb.$(OBJEXT): internal/constant_p.h
+enc/encdb.$(OBJEXT): internal/core.h
+enc/encdb.$(OBJEXT): internal/core/rarray.h
+enc/encdb.$(OBJEXT): internal/core/rbasic.h
+enc/encdb.$(OBJEXT): internal/core/rbignum.h
+enc/encdb.$(OBJEXT): internal/core/rclass.h
+enc/encdb.$(OBJEXT): internal/core/rdata.h
+enc/encdb.$(OBJEXT): internal/core/rfile.h
+enc/encdb.$(OBJEXT): internal/core/rhash.h
+enc/encdb.$(OBJEXT): internal/core/robject.h
+enc/encdb.$(OBJEXT): internal/core/rregexp.h
+enc/encdb.$(OBJEXT): internal/core/rstring.h
+enc/encdb.$(OBJEXT): internal/core/rstruct.h
+enc/encdb.$(OBJEXT): internal/core/rtypeddata.h
+enc/encdb.$(OBJEXT): internal/ctype.h
+enc/encdb.$(OBJEXT): internal/dllexport.h
+enc/encdb.$(OBJEXT): internal/dosish.h
+enc/encdb.$(OBJEXT): internal/error.h
+enc/encdb.$(OBJEXT): internal/eval.h
+enc/encdb.$(OBJEXT): internal/event.h
+enc/encdb.$(OBJEXT): internal/fl_type.h
+enc/encdb.$(OBJEXT): internal/gc.h
+enc/encdb.$(OBJEXT): internal/glob.h
+enc/encdb.$(OBJEXT): internal/globals.h
+enc/encdb.$(OBJEXT): internal/has/attribute.h
+enc/encdb.$(OBJEXT): internal/has/builtin.h
+enc/encdb.$(OBJEXT): internal/has/c_attribute.h
+enc/encdb.$(OBJEXT): internal/has/cpp_attribute.h
+enc/encdb.$(OBJEXT): internal/has/declspec_attribute.h
+enc/encdb.$(OBJEXT): internal/has/extension.h
+enc/encdb.$(OBJEXT): internal/has/feature.h
+enc/encdb.$(OBJEXT): internal/has/warning.h
+enc/encdb.$(OBJEXT): internal/intern/array.h
+enc/encdb.$(OBJEXT): internal/intern/bignum.h
+enc/encdb.$(OBJEXT): internal/intern/class.h
+enc/encdb.$(OBJEXT): internal/intern/compar.h
+enc/encdb.$(OBJEXT): internal/intern/complex.h
+enc/encdb.$(OBJEXT): internal/intern/cont.h
+enc/encdb.$(OBJEXT): internal/intern/dir.h
+enc/encdb.$(OBJEXT): internal/intern/enum.h
+enc/encdb.$(OBJEXT): internal/intern/enumerator.h
+enc/encdb.$(OBJEXT): internal/intern/error.h
+enc/encdb.$(OBJEXT): internal/intern/eval.h
+enc/encdb.$(OBJEXT): internal/intern/file.h
+enc/encdb.$(OBJEXT): internal/intern/gc.h
+enc/encdb.$(OBJEXT): internal/intern/hash.h
+enc/encdb.$(OBJEXT): internal/intern/io.h
+enc/encdb.$(OBJEXT): internal/intern/load.h
+enc/encdb.$(OBJEXT): internal/intern/marshal.h
+enc/encdb.$(OBJEXT): internal/intern/numeric.h
+enc/encdb.$(OBJEXT): internal/intern/object.h
+enc/encdb.$(OBJEXT): internal/intern/parse.h
+enc/encdb.$(OBJEXT): internal/intern/proc.h
+enc/encdb.$(OBJEXT): internal/intern/process.h
+enc/encdb.$(OBJEXT): internal/intern/random.h
+enc/encdb.$(OBJEXT): internal/intern/range.h
+enc/encdb.$(OBJEXT): internal/intern/rational.h
+enc/encdb.$(OBJEXT): internal/intern/re.h
+enc/encdb.$(OBJEXT): internal/intern/ruby.h
+enc/encdb.$(OBJEXT): internal/intern/select.h
+enc/encdb.$(OBJEXT): internal/intern/select/largesize.h
+enc/encdb.$(OBJEXT): internal/intern/signal.h
+enc/encdb.$(OBJEXT): internal/intern/sprintf.h
+enc/encdb.$(OBJEXT): internal/intern/string.h
+enc/encdb.$(OBJEXT): internal/intern/struct.h
+enc/encdb.$(OBJEXT): internal/intern/thread.h
+enc/encdb.$(OBJEXT): internal/intern/time.h
+enc/encdb.$(OBJEXT): internal/intern/variable.h
+enc/encdb.$(OBJEXT): internal/intern/vm.h
+enc/encdb.$(OBJEXT): internal/interpreter.h
+enc/encdb.$(OBJEXT): internal/iterator.h
+enc/encdb.$(OBJEXT): internal/memory.h
+enc/encdb.$(OBJEXT): internal/method.h
+enc/encdb.$(OBJEXT): internal/module.h
+enc/encdb.$(OBJEXT): internal/newobj.h
+enc/encdb.$(OBJEXT): internal/rgengc.h
+enc/encdb.$(OBJEXT): internal/scan_args.h
+enc/encdb.$(OBJEXT): internal/special_consts.h
+enc/encdb.$(OBJEXT): internal/static_assert.h
+enc/encdb.$(OBJEXT): internal/stdalign.h
+enc/encdb.$(OBJEXT): internal/stdbool.h
+enc/encdb.$(OBJEXT): internal/symbol.h
+enc/encdb.$(OBJEXT): internal/token_paste.h
+enc/encdb.$(OBJEXT): internal/value.h
+enc/encdb.$(OBJEXT): internal/value_type.h
+enc/encdb.$(OBJEXT): internal/variable.h
+enc/encdb.$(OBJEXT): internal/warning_push.h
+enc/encdb.$(OBJEXT): internal/xmalloc.h
+enc/encdb.$(OBJEXT): assert.h
 enc/encdb.$(OBJEXT): backward.h
+enc/encdb.$(OBJEXT): backward/2/assume.h
+enc/encdb.$(OBJEXT): backward/2/attributes.h
+enc/encdb.$(OBJEXT): backward/2/bool.h
+enc/encdb.$(OBJEXT): backward/2/gcc_version_since.h
+enc/encdb.$(OBJEXT): backward/2/inttypes.h
+enc/encdb.$(OBJEXT): backward/2/limits.h
+enc/encdb.$(OBJEXT): backward/2/long_long.h
+enc/encdb.$(OBJEXT): backward/2/stdalign.h
+enc/encdb.$(OBJEXT): backward/2/stdarg.h
 enc/encdb.$(OBJEXT): config.h
 enc/encdb.$(OBJEXT): defines.h
 enc/encdb.$(OBJEXT): enc/encdb.c
 enc/encdb.$(OBJEXT): encdb.h
 enc/encdb.$(OBJEXT): encoding.h
 enc/encdb.$(OBJEXT): intern.h
-enc/encdb.$(OBJEXT): io.h
 enc/encdb.$(OBJEXT): missing.h
+enc/encdb.$(OBJEXT): onigmo.h
 enc/encdb.$(OBJEXT): oniguruma.h
 enc/encdb.$(OBJEXT): st.h
 enc/encdb.$(OBJEXT): subst.h
-enc/euc_jp.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 enc/euc_jp.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/euc_jp.$(OBJEXT): $(top_srcdir)/regint.h
-enc/euc_jp.$(OBJEXT): backward.h
+enc/euc_jp.$(OBJEXT): internal/assume.h
+enc/euc_jp.$(OBJEXT): internal/attr/alloc_size.h
+enc/euc_jp.$(OBJEXT): internal/attr/cold.h
+enc/euc_jp.$(OBJEXT): internal/attr/const.h
+enc/euc_jp.$(OBJEXT): internal/attr/deprecated.h
+enc/euc_jp.$(OBJEXT): internal/attr/error.h
+enc/euc_jp.$(OBJEXT): internal/attr/forceinline.h
+enc/euc_jp.$(OBJEXT): internal/attr/format.h
+enc/euc_jp.$(OBJEXT): internal/attr/maybe_unused.h
+enc/euc_jp.$(OBJEXT): internal/attr/nodiscard.h
+enc/euc_jp.$(OBJEXT): internal/attr/noexcept.h
+enc/euc_jp.$(OBJEXT): internal/attr/noinline.h
+enc/euc_jp.$(OBJEXT): internal/attr/nonnull.h
+enc/euc_jp.$(OBJEXT): internal/attr/noreturn.h
+enc/euc_jp.$(OBJEXT): internal/attr/pure.h
+enc/euc_jp.$(OBJEXT): internal/attr/restrict.h
+enc/euc_jp.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/euc_jp.$(OBJEXT): internal/attr/warning.h
+enc/euc_jp.$(OBJEXT): internal/cast.h
+enc/euc_jp.$(OBJEXT): internal/compiler_is.h
+enc/euc_jp.$(OBJEXT): internal/compiler_is/apple.h
+enc/euc_jp.$(OBJEXT): internal/compiler_is/clang.h
+enc/euc_jp.$(OBJEXT): internal/compiler_is/gcc.h
+enc/euc_jp.$(OBJEXT): internal/compiler_is/intel.h
+enc/euc_jp.$(OBJEXT): internal/compiler_is/msvc.h
+enc/euc_jp.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/euc_jp.$(OBJEXT): internal/compiler_since.h
+enc/euc_jp.$(OBJEXT): internal/config.h
+enc/euc_jp.$(OBJEXT): internal/dllexport.h
+enc/euc_jp.$(OBJEXT): internal/dosish.h
+enc/euc_jp.$(OBJEXT): internal/has/attribute.h
+enc/euc_jp.$(OBJEXT): internal/has/builtin.h
+enc/euc_jp.$(OBJEXT): internal/has/c_attribute.h
+enc/euc_jp.$(OBJEXT): internal/has/cpp_attribute.h
+enc/euc_jp.$(OBJEXT): internal/has/declspec_attribute.h
+enc/euc_jp.$(OBJEXT): internal/has/extension.h
+enc/euc_jp.$(OBJEXT): internal/has/feature.h
+enc/euc_jp.$(OBJEXT): internal/has/warning.h
+enc/euc_jp.$(OBJEXT): internal/stdalign.h
+enc/euc_jp.$(OBJEXT): internal/stdbool.h
+enc/euc_jp.$(OBJEXT): internal/token_paste.h
+enc/euc_jp.$(OBJEXT): internal/warning_push.h
+enc/euc_jp.$(OBJEXT): internal/xmalloc.h
+enc/euc_jp.$(OBJEXT): assert.h
+enc/euc_jp.$(OBJEXT): backward/2/assume.h
+enc/euc_jp.$(OBJEXT): backward/2/attributes.h
+enc/euc_jp.$(OBJEXT): backward/2/bool.h
+enc/euc_jp.$(OBJEXT): backward/2/gcc_version_since.h
+enc/euc_jp.$(OBJEXT): backward/2/long_long.h
+enc/euc_jp.$(OBJEXT): backward/2/stdalign.h
+enc/euc_jp.$(OBJEXT): backward/2/stdarg.h
 enc/euc_jp.$(OBJEXT): config.h
 enc/euc_jp.$(OBJEXT): defines.h
 enc/euc_jp.$(OBJEXT): enc/euc_jp.c
 enc/euc_jp.$(OBJEXT): enc/jis/props.h
 enc/euc_jp.$(OBJEXT): enc/jis/props.kwd
-enc/euc_jp.$(OBJEXT): intern.h
 enc/euc_jp.$(OBJEXT): missing.h
-enc/euc_jp.$(OBJEXT): oniguruma.h
-enc/euc_jp.$(OBJEXT): st.h
-enc/euc_jp.$(OBJEXT): subst.h
+enc/euc_jp.$(OBJEXT): onigmo.h
 enc/euc_kr.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/euc_kr.$(OBJEXT): internal/assume.h
+enc/euc_kr.$(OBJEXT): internal/attr/alloc_size.h
+enc/euc_kr.$(OBJEXT): internal/attr/cold.h
+enc/euc_kr.$(OBJEXT): internal/attr/const.h
+enc/euc_kr.$(OBJEXT): internal/attr/deprecated.h
+enc/euc_kr.$(OBJEXT): internal/attr/error.h
+enc/euc_kr.$(OBJEXT): internal/attr/forceinline.h
+enc/euc_kr.$(OBJEXT): internal/attr/format.h
+enc/euc_kr.$(OBJEXT): internal/attr/maybe_unused.h
+enc/euc_kr.$(OBJEXT): internal/attr/nodiscard.h
+enc/euc_kr.$(OBJEXT): internal/attr/noexcept.h
+enc/euc_kr.$(OBJEXT): internal/attr/noinline.h
+enc/euc_kr.$(OBJEXT): internal/attr/nonnull.h
+enc/euc_kr.$(OBJEXT): internal/attr/noreturn.h
+enc/euc_kr.$(OBJEXT): internal/attr/pure.h
+enc/euc_kr.$(OBJEXT): internal/attr/restrict.h
+enc/euc_kr.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/euc_kr.$(OBJEXT): internal/attr/warning.h
+enc/euc_kr.$(OBJEXT): internal/cast.h
+enc/euc_kr.$(OBJEXT): internal/compiler_is.h
+enc/euc_kr.$(OBJEXT): internal/compiler_is/apple.h
+enc/euc_kr.$(OBJEXT): internal/compiler_is/clang.h
+enc/euc_kr.$(OBJEXT): internal/compiler_is/gcc.h
+enc/euc_kr.$(OBJEXT): internal/compiler_is/intel.h
+enc/euc_kr.$(OBJEXT): internal/compiler_is/msvc.h
+enc/euc_kr.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/euc_kr.$(OBJEXT): internal/compiler_since.h
+enc/euc_kr.$(OBJEXT): internal/config.h
+enc/euc_kr.$(OBJEXT): internal/dllexport.h
+enc/euc_kr.$(OBJEXT): internal/dosish.h
+enc/euc_kr.$(OBJEXT): internal/has/attribute.h
+enc/euc_kr.$(OBJEXT): internal/has/builtin.h
+enc/euc_kr.$(OBJEXT): internal/has/c_attribute.h
+enc/euc_kr.$(OBJEXT): internal/has/cpp_attribute.h
+enc/euc_kr.$(OBJEXT): internal/has/declspec_attribute.h
+enc/euc_kr.$(OBJEXT): internal/has/extension.h
+enc/euc_kr.$(OBJEXT): internal/has/feature.h
+enc/euc_kr.$(OBJEXT): internal/has/warning.h
+enc/euc_kr.$(OBJEXT): internal/stdalign.h
+enc/euc_kr.$(OBJEXT): internal/stdbool.h
+enc/euc_kr.$(OBJEXT): internal/token_paste.h
+enc/euc_kr.$(OBJEXT): internal/warning_push.h
+enc/euc_kr.$(OBJEXT): internal/xmalloc.h
+enc/euc_kr.$(OBJEXT): assert.h
+enc/euc_kr.$(OBJEXT): backward/2/assume.h
+enc/euc_kr.$(OBJEXT): backward/2/attributes.h
+enc/euc_kr.$(OBJEXT): backward/2/bool.h
+enc/euc_kr.$(OBJEXT): backward/2/gcc_version_since.h
+enc/euc_kr.$(OBJEXT): backward/2/long_long.h
+enc/euc_kr.$(OBJEXT): backward/2/stdalign.h
+enc/euc_kr.$(OBJEXT): backward/2/stdarg.h
 enc/euc_kr.$(OBJEXT): config.h
 enc/euc_kr.$(OBJEXT): defines.h
 enc/euc_kr.$(OBJEXT): enc/euc_kr.c
 enc/euc_kr.$(OBJEXT): missing.h
-enc/euc_kr.$(OBJEXT): oniguruma.h
+enc/euc_kr.$(OBJEXT): onigmo.h
 enc/euc_tw.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/euc_tw.$(OBJEXT): internal/assume.h
+enc/euc_tw.$(OBJEXT): internal/attr/alloc_size.h
+enc/euc_tw.$(OBJEXT): internal/attr/cold.h
+enc/euc_tw.$(OBJEXT): internal/attr/const.h
+enc/euc_tw.$(OBJEXT): internal/attr/deprecated.h
+enc/euc_tw.$(OBJEXT): internal/attr/error.h
+enc/euc_tw.$(OBJEXT): internal/attr/forceinline.h
+enc/euc_tw.$(OBJEXT): internal/attr/format.h
+enc/euc_tw.$(OBJEXT): internal/attr/maybe_unused.h
+enc/euc_tw.$(OBJEXT): internal/attr/nodiscard.h
+enc/euc_tw.$(OBJEXT): internal/attr/noexcept.h
+enc/euc_tw.$(OBJEXT): internal/attr/noinline.h
+enc/euc_tw.$(OBJEXT): internal/attr/nonnull.h
+enc/euc_tw.$(OBJEXT): internal/attr/noreturn.h
+enc/euc_tw.$(OBJEXT): internal/attr/pure.h
+enc/euc_tw.$(OBJEXT): internal/attr/restrict.h
+enc/euc_tw.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/euc_tw.$(OBJEXT): internal/attr/warning.h
+enc/euc_tw.$(OBJEXT): internal/cast.h
+enc/euc_tw.$(OBJEXT): internal/compiler_is.h
+enc/euc_tw.$(OBJEXT): internal/compiler_is/apple.h
+enc/euc_tw.$(OBJEXT): internal/compiler_is/clang.h
+enc/euc_tw.$(OBJEXT): internal/compiler_is/gcc.h
+enc/euc_tw.$(OBJEXT): internal/compiler_is/intel.h
+enc/euc_tw.$(OBJEXT): internal/compiler_is/msvc.h
+enc/euc_tw.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/euc_tw.$(OBJEXT): internal/compiler_since.h
+enc/euc_tw.$(OBJEXT): internal/config.h
+enc/euc_tw.$(OBJEXT): internal/dllexport.h
+enc/euc_tw.$(OBJEXT): internal/dosish.h
+enc/euc_tw.$(OBJEXT): internal/has/attribute.h
+enc/euc_tw.$(OBJEXT): internal/has/builtin.h
+enc/euc_tw.$(OBJEXT): internal/has/c_attribute.h
+enc/euc_tw.$(OBJEXT): internal/has/cpp_attribute.h
+enc/euc_tw.$(OBJEXT): internal/has/declspec_attribute.h
+enc/euc_tw.$(OBJEXT): internal/has/extension.h
+enc/euc_tw.$(OBJEXT): internal/has/feature.h
+enc/euc_tw.$(OBJEXT): internal/has/warning.h
+enc/euc_tw.$(OBJEXT): internal/stdalign.h
+enc/euc_tw.$(OBJEXT): internal/stdbool.h
+enc/euc_tw.$(OBJEXT): internal/token_paste.h
+enc/euc_tw.$(OBJEXT): internal/warning_push.h
+enc/euc_tw.$(OBJEXT): internal/xmalloc.h
+enc/euc_tw.$(OBJEXT): assert.h
+enc/euc_tw.$(OBJEXT): backward/2/assume.h
+enc/euc_tw.$(OBJEXT): backward/2/attributes.h
+enc/euc_tw.$(OBJEXT): backward/2/bool.h
+enc/euc_tw.$(OBJEXT): backward/2/gcc_version_since.h
+enc/euc_tw.$(OBJEXT): backward/2/long_long.h
+enc/euc_tw.$(OBJEXT): backward/2/stdalign.h
+enc/euc_tw.$(OBJEXT): backward/2/stdarg.h
 enc/euc_tw.$(OBJEXT): config.h
 enc/euc_tw.$(OBJEXT): defines.h
 enc/euc_tw.$(OBJEXT): enc/euc_tw.c
 enc/euc_tw.$(OBJEXT): missing.h
-enc/euc_tw.$(OBJEXT): oniguruma.h
+enc/euc_tw.$(OBJEXT): onigmo.h
 enc/gb18030.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/gb18030.$(OBJEXT): internal/assume.h
+enc/gb18030.$(OBJEXT): internal/attr/alloc_size.h
+enc/gb18030.$(OBJEXT): internal/attr/cold.h
+enc/gb18030.$(OBJEXT): internal/attr/const.h
+enc/gb18030.$(OBJEXT): internal/attr/deprecated.h
+enc/gb18030.$(OBJEXT): internal/attr/error.h
+enc/gb18030.$(OBJEXT): internal/attr/forceinline.h
+enc/gb18030.$(OBJEXT): internal/attr/format.h
+enc/gb18030.$(OBJEXT): internal/attr/maybe_unused.h
+enc/gb18030.$(OBJEXT): internal/attr/nodiscard.h
+enc/gb18030.$(OBJEXT): internal/attr/noexcept.h
+enc/gb18030.$(OBJEXT): internal/attr/noinline.h
+enc/gb18030.$(OBJEXT): internal/attr/nonnull.h
+enc/gb18030.$(OBJEXT): internal/attr/noreturn.h
+enc/gb18030.$(OBJEXT): internal/attr/pure.h
+enc/gb18030.$(OBJEXT): internal/attr/restrict.h
+enc/gb18030.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/gb18030.$(OBJEXT): internal/attr/warning.h
+enc/gb18030.$(OBJEXT): internal/cast.h
+enc/gb18030.$(OBJEXT): internal/compiler_is.h
+enc/gb18030.$(OBJEXT): internal/compiler_is/apple.h
+enc/gb18030.$(OBJEXT): internal/compiler_is/clang.h
+enc/gb18030.$(OBJEXT): internal/compiler_is/gcc.h
+enc/gb18030.$(OBJEXT): internal/compiler_is/intel.h
+enc/gb18030.$(OBJEXT): internal/compiler_is/msvc.h
+enc/gb18030.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/gb18030.$(OBJEXT): internal/compiler_since.h
+enc/gb18030.$(OBJEXT): internal/config.h
+enc/gb18030.$(OBJEXT): internal/dllexport.h
+enc/gb18030.$(OBJEXT): internal/dosish.h
+enc/gb18030.$(OBJEXT): internal/has/attribute.h
+enc/gb18030.$(OBJEXT): internal/has/builtin.h
+enc/gb18030.$(OBJEXT): internal/has/c_attribute.h
+enc/gb18030.$(OBJEXT): internal/has/cpp_attribute.h
+enc/gb18030.$(OBJEXT): internal/has/declspec_attribute.h
+enc/gb18030.$(OBJEXT): internal/has/extension.h
+enc/gb18030.$(OBJEXT): internal/has/feature.h
+enc/gb18030.$(OBJEXT): internal/has/warning.h
+enc/gb18030.$(OBJEXT): internal/stdalign.h
+enc/gb18030.$(OBJEXT): internal/stdbool.h
+enc/gb18030.$(OBJEXT): internal/token_paste.h
+enc/gb18030.$(OBJEXT): internal/warning_push.h
+enc/gb18030.$(OBJEXT): internal/xmalloc.h
+enc/gb18030.$(OBJEXT): assert.h
+enc/gb18030.$(OBJEXT): backward/2/assume.h
+enc/gb18030.$(OBJEXT): backward/2/attributes.h
+enc/gb18030.$(OBJEXT): backward/2/bool.h
+enc/gb18030.$(OBJEXT): backward/2/gcc_version_since.h
+enc/gb18030.$(OBJEXT): backward/2/long_long.h
+enc/gb18030.$(OBJEXT): backward/2/stdalign.h
+enc/gb18030.$(OBJEXT): backward/2/stdarg.h
 enc/gb18030.$(OBJEXT): config.h
 enc/gb18030.$(OBJEXT): defines.h
 enc/gb18030.$(OBJEXT): enc/gb18030.c
 enc/gb18030.$(OBJEXT): missing.h
-enc/gb18030.$(OBJEXT): oniguruma.h
-enc/gb2312.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+enc/gb18030.$(OBJEXT): onigmo.h
 enc/gb2312.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/gb2312.$(OBJEXT): backward.h
+enc/gb2312.$(OBJEXT): internal/assume.h
+enc/gb2312.$(OBJEXT): internal/attr/alloc_size.h
+enc/gb2312.$(OBJEXT): internal/attr/cold.h
+enc/gb2312.$(OBJEXT): internal/attr/const.h
+enc/gb2312.$(OBJEXT): internal/attr/deprecated.h
+enc/gb2312.$(OBJEXT): internal/attr/error.h
+enc/gb2312.$(OBJEXT): internal/attr/forceinline.h
+enc/gb2312.$(OBJEXT): internal/attr/format.h
+enc/gb2312.$(OBJEXT): internal/attr/maybe_unused.h
+enc/gb2312.$(OBJEXT): internal/attr/nodiscard.h
+enc/gb2312.$(OBJEXT): internal/attr/noexcept.h
+enc/gb2312.$(OBJEXT): internal/attr/noinline.h
+enc/gb2312.$(OBJEXT): internal/attr/nonnull.h
+enc/gb2312.$(OBJEXT): internal/attr/noreturn.h
+enc/gb2312.$(OBJEXT): internal/attr/pure.h
+enc/gb2312.$(OBJEXT): internal/attr/restrict.h
+enc/gb2312.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/gb2312.$(OBJEXT): internal/attr/warning.h
+enc/gb2312.$(OBJEXT): internal/cast.h
+enc/gb2312.$(OBJEXT): internal/compiler_is.h
+enc/gb2312.$(OBJEXT): internal/compiler_is/apple.h
+enc/gb2312.$(OBJEXT): internal/compiler_is/clang.h
+enc/gb2312.$(OBJEXT): internal/compiler_is/gcc.h
+enc/gb2312.$(OBJEXT): internal/compiler_is/intel.h
+enc/gb2312.$(OBJEXT): internal/compiler_is/msvc.h
+enc/gb2312.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/gb2312.$(OBJEXT): internal/compiler_since.h
+enc/gb2312.$(OBJEXT): internal/config.h
+enc/gb2312.$(OBJEXT): internal/dllexport.h
+enc/gb2312.$(OBJEXT): internal/dosish.h
+enc/gb2312.$(OBJEXT): internal/has/attribute.h
+enc/gb2312.$(OBJEXT): internal/has/builtin.h
+enc/gb2312.$(OBJEXT): internal/has/c_attribute.h
+enc/gb2312.$(OBJEXT): internal/has/cpp_attribute.h
+enc/gb2312.$(OBJEXT): internal/has/declspec_attribute.h
+enc/gb2312.$(OBJEXT): internal/has/extension.h
+enc/gb2312.$(OBJEXT): internal/has/feature.h
+enc/gb2312.$(OBJEXT): internal/has/warning.h
+enc/gb2312.$(OBJEXT): internal/stdalign.h
+enc/gb2312.$(OBJEXT): internal/stdbool.h
+enc/gb2312.$(OBJEXT): internal/token_paste.h
+enc/gb2312.$(OBJEXT): internal/warning_push.h
+enc/gb2312.$(OBJEXT): internal/xmalloc.h
+enc/gb2312.$(OBJEXT): assert.h
+enc/gb2312.$(OBJEXT): backward/2/assume.h
+enc/gb2312.$(OBJEXT): backward/2/attributes.h
+enc/gb2312.$(OBJEXT): backward/2/bool.h
+enc/gb2312.$(OBJEXT): backward/2/gcc_version_since.h
+enc/gb2312.$(OBJEXT): backward/2/long_long.h
+enc/gb2312.$(OBJEXT): backward/2/stdalign.h
+enc/gb2312.$(OBJEXT): backward/2/stdarg.h
 enc/gb2312.$(OBJEXT): config.h
 enc/gb2312.$(OBJEXT): defines.h
 enc/gb2312.$(OBJEXT): enc/gb2312.c
-enc/gb2312.$(OBJEXT): encoding.h
-enc/gb2312.$(OBJEXT): intern.h
 enc/gb2312.$(OBJEXT): missing.h
-enc/gb2312.$(OBJEXT): oniguruma.h
-enc/gb2312.$(OBJEXT): st.h
-enc/gb2312.$(OBJEXT): subst.h
+enc/gb2312.$(OBJEXT): onigmo.h
 enc/gbk.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/gbk.$(OBJEXT): internal/assume.h
+enc/gbk.$(OBJEXT): internal/attr/alloc_size.h
+enc/gbk.$(OBJEXT): internal/attr/cold.h
+enc/gbk.$(OBJEXT): internal/attr/const.h
+enc/gbk.$(OBJEXT): internal/attr/deprecated.h
+enc/gbk.$(OBJEXT): internal/attr/error.h
+enc/gbk.$(OBJEXT): internal/attr/forceinline.h
+enc/gbk.$(OBJEXT): internal/attr/format.h
+enc/gbk.$(OBJEXT): internal/attr/maybe_unused.h
+enc/gbk.$(OBJEXT): internal/attr/nodiscard.h
+enc/gbk.$(OBJEXT): internal/attr/noexcept.h
+enc/gbk.$(OBJEXT): internal/attr/noinline.h
+enc/gbk.$(OBJEXT): internal/attr/nonnull.h
+enc/gbk.$(OBJEXT): internal/attr/noreturn.h
+enc/gbk.$(OBJEXT): internal/attr/pure.h
+enc/gbk.$(OBJEXT): internal/attr/restrict.h
+enc/gbk.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/gbk.$(OBJEXT): internal/attr/warning.h
+enc/gbk.$(OBJEXT): internal/cast.h
+enc/gbk.$(OBJEXT): internal/compiler_is.h
+enc/gbk.$(OBJEXT): internal/compiler_is/apple.h
+enc/gbk.$(OBJEXT): internal/compiler_is/clang.h
+enc/gbk.$(OBJEXT): internal/compiler_is/gcc.h
+enc/gbk.$(OBJEXT): internal/compiler_is/intel.h
+enc/gbk.$(OBJEXT): internal/compiler_is/msvc.h
+enc/gbk.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/gbk.$(OBJEXT): internal/compiler_since.h
+enc/gbk.$(OBJEXT): internal/config.h
+enc/gbk.$(OBJEXT): internal/dllexport.h
+enc/gbk.$(OBJEXT): internal/dosish.h
+enc/gbk.$(OBJEXT): internal/has/attribute.h
+enc/gbk.$(OBJEXT): internal/has/builtin.h
+enc/gbk.$(OBJEXT): internal/has/c_attribute.h
+enc/gbk.$(OBJEXT): internal/has/cpp_attribute.h
+enc/gbk.$(OBJEXT): internal/has/declspec_attribute.h
+enc/gbk.$(OBJEXT): internal/has/extension.h
+enc/gbk.$(OBJEXT): internal/has/feature.h
+enc/gbk.$(OBJEXT): internal/has/warning.h
+enc/gbk.$(OBJEXT): internal/stdalign.h
+enc/gbk.$(OBJEXT): internal/stdbool.h
+enc/gbk.$(OBJEXT): internal/token_paste.h
+enc/gbk.$(OBJEXT): internal/warning_push.h
+enc/gbk.$(OBJEXT): internal/xmalloc.h
+enc/gbk.$(OBJEXT): assert.h
+enc/gbk.$(OBJEXT): backward/2/assume.h
+enc/gbk.$(OBJEXT): backward/2/attributes.h
+enc/gbk.$(OBJEXT): backward/2/bool.h
+enc/gbk.$(OBJEXT): backward/2/gcc_version_since.h
+enc/gbk.$(OBJEXT): backward/2/long_long.h
+enc/gbk.$(OBJEXT): backward/2/stdalign.h
+enc/gbk.$(OBJEXT): backward/2/stdarg.h
 enc/gbk.$(OBJEXT): config.h
 enc/gbk.$(OBJEXT): defines.h
 enc/gbk.$(OBJEXT): enc/gbk.c
 enc/gbk.$(OBJEXT): missing.h
-enc/gbk.$(OBJEXT): oniguruma.h
+enc/gbk.$(OBJEXT): onigmo.h
 enc/iso_8859_1.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/iso_8859_1.$(OBJEXT): internal/assume.h
+enc/iso_8859_1.$(OBJEXT): internal/attr/alloc_size.h
+enc/iso_8859_1.$(OBJEXT): internal/attr/cold.h
+enc/iso_8859_1.$(OBJEXT): internal/attr/const.h
+enc/iso_8859_1.$(OBJEXT): internal/attr/deprecated.h
+enc/iso_8859_1.$(OBJEXT): internal/attr/error.h
+enc/iso_8859_1.$(OBJEXT): internal/attr/forceinline.h
+enc/iso_8859_1.$(OBJEXT): internal/attr/format.h
+enc/iso_8859_1.$(OBJEXT): internal/attr/maybe_unused.h
+enc/iso_8859_1.$(OBJEXT): internal/attr/nodiscard.h
+enc/iso_8859_1.$(OBJEXT): internal/attr/noexcept.h
+enc/iso_8859_1.$(OBJEXT): internal/attr/noinline.h
+enc/iso_8859_1.$(OBJEXT): internal/attr/nonnull.h
+enc/iso_8859_1.$(OBJEXT): internal/attr/noreturn.h
+enc/iso_8859_1.$(OBJEXT): internal/attr/pure.h
+enc/iso_8859_1.$(OBJEXT): internal/attr/restrict.h
+enc/iso_8859_1.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/iso_8859_1.$(OBJEXT): internal/attr/warning.h
+enc/iso_8859_1.$(OBJEXT): internal/cast.h
+enc/iso_8859_1.$(OBJEXT): internal/compiler_is.h
+enc/iso_8859_1.$(OBJEXT): internal/compiler_is/apple.h
+enc/iso_8859_1.$(OBJEXT): internal/compiler_is/clang.h
+enc/iso_8859_1.$(OBJEXT): internal/compiler_is/gcc.h
+enc/iso_8859_1.$(OBJEXT): internal/compiler_is/intel.h
+enc/iso_8859_1.$(OBJEXT): internal/compiler_is/msvc.h
+enc/iso_8859_1.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/iso_8859_1.$(OBJEXT): internal/compiler_since.h
+enc/iso_8859_1.$(OBJEXT): internal/config.h
+enc/iso_8859_1.$(OBJEXT): internal/dllexport.h
+enc/iso_8859_1.$(OBJEXT): internal/dosish.h
+enc/iso_8859_1.$(OBJEXT): internal/has/attribute.h
+enc/iso_8859_1.$(OBJEXT): internal/has/builtin.h
+enc/iso_8859_1.$(OBJEXT): internal/has/c_attribute.h
+enc/iso_8859_1.$(OBJEXT): internal/has/cpp_attribute.h
+enc/iso_8859_1.$(OBJEXT): internal/has/declspec_attribute.h
+enc/iso_8859_1.$(OBJEXT): internal/has/extension.h
+enc/iso_8859_1.$(OBJEXT): internal/has/feature.h
+enc/iso_8859_1.$(OBJEXT): internal/has/warning.h
+enc/iso_8859_1.$(OBJEXT): internal/stdalign.h
+enc/iso_8859_1.$(OBJEXT): internal/stdbool.h
+enc/iso_8859_1.$(OBJEXT): internal/token_paste.h
+enc/iso_8859_1.$(OBJEXT): internal/warning_push.h
+enc/iso_8859_1.$(OBJEXT): internal/xmalloc.h
+enc/iso_8859_1.$(OBJEXT): assert.h
+enc/iso_8859_1.$(OBJEXT): backward/2/assume.h
+enc/iso_8859_1.$(OBJEXT): backward/2/attributes.h
+enc/iso_8859_1.$(OBJEXT): backward/2/bool.h
+enc/iso_8859_1.$(OBJEXT): backward/2/gcc_version_since.h
+enc/iso_8859_1.$(OBJEXT): backward/2/long_long.h
+enc/iso_8859_1.$(OBJEXT): backward/2/stdalign.h
+enc/iso_8859_1.$(OBJEXT): backward/2/stdarg.h
 enc/iso_8859_1.$(OBJEXT): config.h
 enc/iso_8859_1.$(OBJEXT): defines.h
 enc/iso_8859_1.$(OBJEXT): enc/iso_8859.h
 enc/iso_8859_1.$(OBJEXT): enc/iso_8859_1.c
 enc/iso_8859_1.$(OBJEXT): missing.h
-enc/iso_8859_1.$(OBJEXT): oniguruma.h
+enc/iso_8859_1.$(OBJEXT): onigmo.h
 enc/iso_8859_10.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/iso_8859_10.$(OBJEXT): internal/assume.h
+enc/iso_8859_10.$(OBJEXT): internal/attr/alloc_size.h
+enc/iso_8859_10.$(OBJEXT): internal/attr/cold.h
+enc/iso_8859_10.$(OBJEXT): internal/attr/const.h
+enc/iso_8859_10.$(OBJEXT): internal/attr/deprecated.h
+enc/iso_8859_10.$(OBJEXT): internal/attr/error.h
+enc/iso_8859_10.$(OBJEXT): internal/attr/forceinline.h
+enc/iso_8859_10.$(OBJEXT): internal/attr/format.h
+enc/iso_8859_10.$(OBJEXT): internal/attr/maybe_unused.h
+enc/iso_8859_10.$(OBJEXT): internal/attr/nodiscard.h
+enc/iso_8859_10.$(OBJEXT): internal/attr/noexcept.h
+enc/iso_8859_10.$(OBJEXT): internal/attr/noinline.h
+enc/iso_8859_10.$(OBJEXT): internal/attr/nonnull.h
+enc/iso_8859_10.$(OBJEXT): internal/attr/noreturn.h
+enc/iso_8859_10.$(OBJEXT): internal/attr/pure.h
+enc/iso_8859_10.$(OBJEXT): internal/attr/restrict.h
+enc/iso_8859_10.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/iso_8859_10.$(OBJEXT): internal/attr/warning.h
+enc/iso_8859_10.$(OBJEXT): internal/cast.h
+enc/iso_8859_10.$(OBJEXT): internal/compiler_is.h
+enc/iso_8859_10.$(OBJEXT): internal/compiler_is/apple.h
+enc/iso_8859_10.$(OBJEXT): internal/compiler_is/clang.h
+enc/iso_8859_10.$(OBJEXT): internal/compiler_is/gcc.h
+enc/iso_8859_10.$(OBJEXT): internal/compiler_is/intel.h
+enc/iso_8859_10.$(OBJEXT): internal/compiler_is/msvc.h
+enc/iso_8859_10.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/iso_8859_10.$(OBJEXT): internal/compiler_since.h
+enc/iso_8859_10.$(OBJEXT): internal/config.h
+enc/iso_8859_10.$(OBJEXT): internal/dllexport.h
+enc/iso_8859_10.$(OBJEXT): internal/dosish.h
+enc/iso_8859_10.$(OBJEXT): internal/has/attribute.h
+enc/iso_8859_10.$(OBJEXT): internal/has/builtin.h
+enc/iso_8859_10.$(OBJEXT): internal/has/c_attribute.h
+enc/iso_8859_10.$(OBJEXT): internal/has/cpp_attribute.h
+enc/iso_8859_10.$(OBJEXT): internal/has/declspec_attribute.h
+enc/iso_8859_10.$(OBJEXT): internal/has/extension.h
+enc/iso_8859_10.$(OBJEXT): internal/has/feature.h
+enc/iso_8859_10.$(OBJEXT): internal/has/warning.h
+enc/iso_8859_10.$(OBJEXT): internal/stdalign.h
+enc/iso_8859_10.$(OBJEXT): internal/stdbool.h
+enc/iso_8859_10.$(OBJEXT): internal/token_paste.h
+enc/iso_8859_10.$(OBJEXT): internal/warning_push.h
+enc/iso_8859_10.$(OBJEXT): internal/xmalloc.h
+enc/iso_8859_10.$(OBJEXT): assert.h
+enc/iso_8859_10.$(OBJEXT): backward/2/assume.h
+enc/iso_8859_10.$(OBJEXT): backward/2/attributes.h
+enc/iso_8859_10.$(OBJEXT): backward/2/bool.h
+enc/iso_8859_10.$(OBJEXT): backward/2/gcc_version_since.h
+enc/iso_8859_10.$(OBJEXT): backward/2/long_long.h
+enc/iso_8859_10.$(OBJEXT): backward/2/stdalign.h
+enc/iso_8859_10.$(OBJEXT): backward/2/stdarg.h
 enc/iso_8859_10.$(OBJEXT): config.h
 enc/iso_8859_10.$(OBJEXT): defines.h
 enc/iso_8859_10.$(OBJEXT): enc/iso_8859.h
 enc/iso_8859_10.$(OBJEXT): enc/iso_8859_10.c
 enc/iso_8859_10.$(OBJEXT): missing.h
-enc/iso_8859_10.$(OBJEXT): oniguruma.h
+enc/iso_8859_10.$(OBJEXT): onigmo.h
 enc/iso_8859_11.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/iso_8859_11.$(OBJEXT): internal/assume.h
+enc/iso_8859_11.$(OBJEXT): internal/attr/alloc_size.h
+enc/iso_8859_11.$(OBJEXT): internal/attr/cold.h
+enc/iso_8859_11.$(OBJEXT): internal/attr/const.h
+enc/iso_8859_11.$(OBJEXT): internal/attr/deprecated.h
+enc/iso_8859_11.$(OBJEXT): internal/attr/error.h
+enc/iso_8859_11.$(OBJEXT): internal/attr/forceinline.h
+enc/iso_8859_11.$(OBJEXT): internal/attr/format.h
+enc/iso_8859_11.$(OBJEXT): internal/attr/maybe_unused.h
+enc/iso_8859_11.$(OBJEXT): internal/attr/nodiscard.h
+enc/iso_8859_11.$(OBJEXT): internal/attr/noexcept.h
+enc/iso_8859_11.$(OBJEXT): internal/attr/noinline.h
+enc/iso_8859_11.$(OBJEXT): internal/attr/nonnull.h
+enc/iso_8859_11.$(OBJEXT): internal/attr/noreturn.h
+enc/iso_8859_11.$(OBJEXT): internal/attr/pure.h
+enc/iso_8859_11.$(OBJEXT): internal/attr/restrict.h
+enc/iso_8859_11.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/iso_8859_11.$(OBJEXT): internal/attr/warning.h
+enc/iso_8859_11.$(OBJEXT): internal/cast.h
+enc/iso_8859_11.$(OBJEXT): internal/compiler_is.h
+enc/iso_8859_11.$(OBJEXT): internal/compiler_is/apple.h
+enc/iso_8859_11.$(OBJEXT): internal/compiler_is/clang.h
+enc/iso_8859_11.$(OBJEXT): internal/compiler_is/gcc.h
+enc/iso_8859_11.$(OBJEXT): internal/compiler_is/intel.h
+enc/iso_8859_11.$(OBJEXT): internal/compiler_is/msvc.h
+enc/iso_8859_11.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/iso_8859_11.$(OBJEXT): internal/compiler_since.h
+enc/iso_8859_11.$(OBJEXT): internal/config.h
+enc/iso_8859_11.$(OBJEXT): internal/dllexport.h
+enc/iso_8859_11.$(OBJEXT): internal/dosish.h
+enc/iso_8859_11.$(OBJEXT): internal/has/attribute.h
+enc/iso_8859_11.$(OBJEXT): internal/has/builtin.h
+enc/iso_8859_11.$(OBJEXT): internal/has/c_attribute.h
+enc/iso_8859_11.$(OBJEXT): internal/has/cpp_attribute.h
+enc/iso_8859_11.$(OBJEXT): internal/has/declspec_attribute.h
+enc/iso_8859_11.$(OBJEXT): internal/has/extension.h
+enc/iso_8859_11.$(OBJEXT): internal/has/feature.h
+enc/iso_8859_11.$(OBJEXT): internal/has/warning.h
+enc/iso_8859_11.$(OBJEXT): internal/stdalign.h
+enc/iso_8859_11.$(OBJEXT): internal/stdbool.h
+enc/iso_8859_11.$(OBJEXT): internal/token_paste.h
+enc/iso_8859_11.$(OBJEXT): internal/warning_push.h
+enc/iso_8859_11.$(OBJEXT): internal/xmalloc.h
+enc/iso_8859_11.$(OBJEXT): assert.h
+enc/iso_8859_11.$(OBJEXT): backward/2/assume.h
+enc/iso_8859_11.$(OBJEXT): backward/2/attributes.h
+enc/iso_8859_11.$(OBJEXT): backward/2/bool.h
+enc/iso_8859_11.$(OBJEXT): backward/2/gcc_version_since.h
+enc/iso_8859_11.$(OBJEXT): backward/2/long_long.h
+enc/iso_8859_11.$(OBJEXT): backward/2/stdalign.h
+enc/iso_8859_11.$(OBJEXT): backward/2/stdarg.h
 enc/iso_8859_11.$(OBJEXT): config.h
 enc/iso_8859_11.$(OBJEXT): defines.h
 enc/iso_8859_11.$(OBJEXT): enc/iso_8859_11.c
 enc/iso_8859_11.$(OBJEXT): missing.h
-enc/iso_8859_11.$(OBJEXT): oniguruma.h
+enc/iso_8859_11.$(OBJEXT): onigmo.h
 enc/iso_8859_13.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/iso_8859_13.$(OBJEXT): internal/assume.h
+enc/iso_8859_13.$(OBJEXT): internal/attr/alloc_size.h
+enc/iso_8859_13.$(OBJEXT): internal/attr/cold.h
+enc/iso_8859_13.$(OBJEXT): internal/attr/const.h
+enc/iso_8859_13.$(OBJEXT): internal/attr/deprecated.h
+enc/iso_8859_13.$(OBJEXT): internal/attr/error.h
+enc/iso_8859_13.$(OBJEXT): internal/attr/forceinline.h
+enc/iso_8859_13.$(OBJEXT): internal/attr/format.h
+enc/iso_8859_13.$(OBJEXT): internal/attr/maybe_unused.h
+enc/iso_8859_13.$(OBJEXT): internal/attr/nodiscard.h
+enc/iso_8859_13.$(OBJEXT): internal/attr/noexcept.h
+enc/iso_8859_13.$(OBJEXT): internal/attr/noinline.h
+enc/iso_8859_13.$(OBJEXT): internal/attr/nonnull.h
+enc/iso_8859_13.$(OBJEXT): internal/attr/noreturn.h
+enc/iso_8859_13.$(OBJEXT): internal/attr/pure.h
+enc/iso_8859_13.$(OBJEXT): internal/attr/restrict.h
+enc/iso_8859_13.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/iso_8859_13.$(OBJEXT): internal/attr/warning.h
+enc/iso_8859_13.$(OBJEXT): internal/cast.h
+enc/iso_8859_13.$(OBJEXT): internal/compiler_is.h
+enc/iso_8859_13.$(OBJEXT): internal/compiler_is/apple.h
+enc/iso_8859_13.$(OBJEXT): internal/compiler_is/clang.h
+enc/iso_8859_13.$(OBJEXT): internal/compiler_is/gcc.h
+enc/iso_8859_13.$(OBJEXT): internal/compiler_is/intel.h
+enc/iso_8859_13.$(OBJEXT): internal/compiler_is/msvc.h
+enc/iso_8859_13.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/iso_8859_13.$(OBJEXT): internal/compiler_since.h
+enc/iso_8859_13.$(OBJEXT): internal/config.h
+enc/iso_8859_13.$(OBJEXT): internal/dllexport.h
+enc/iso_8859_13.$(OBJEXT): internal/dosish.h
+enc/iso_8859_13.$(OBJEXT): internal/has/attribute.h
+enc/iso_8859_13.$(OBJEXT): internal/has/builtin.h
+enc/iso_8859_13.$(OBJEXT): internal/has/c_attribute.h
+enc/iso_8859_13.$(OBJEXT): internal/has/cpp_attribute.h
+enc/iso_8859_13.$(OBJEXT): internal/has/declspec_attribute.h
+enc/iso_8859_13.$(OBJEXT): internal/has/extension.h
+enc/iso_8859_13.$(OBJEXT): internal/has/feature.h
+enc/iso_8859_13.$(OBJEXT): internal/has/warning.h
+enc/iso_8859_13.$(OBJEXT): internal/stdalign.h
+enc/iso_8859_13.$(OBJEXT): internal/stdbool.h
+enc/iso_8859_13.$(OBJEXT): internal/token_paste.h
+enc/iso_8859_13.$(OBJEXT): internal/warning_push.h
+enc/iso_8859_13.$(OBJEXT): internal/xmalloc.h
+enc/iso_8859_13.$(OBJEXT): assert.h
+enc/iso_8859_13.$(OBJEXT): backward/2/assume.h
+enc/iso_8859_13.$(OBJEXT): backward/2/attributes.h
+enc/iso_8859_13.$(OBJEXT): backward/2/bool.h
+enc/iso_8859_13.$(OBJEXT): backward/2/gcc_version_since.h
+enc/iso_8859_13.$(OBJEXT): backward/2/long_long.h
+enc/iso_8859_13.$(OBJEXT): backward/2/stdalign.h
+enc/iso_8859_13.$(OBJEXT): backward/2/stdarg.h
 enc/iso_8859_13.$(OBJEXT): config.h
 enc/iso_8859_13.$(OBJEXT): defines.h
 enc/iso_8859_13.$(OBJEXT): enc/iso_8859.h
 enc/iso_8859_13.$(OBJEXT): enc/iso_8859_13.c
 enc/iso_8859_13.$(OBJEXT): missing.h
-enc/iso_8859_13.$(OBJEXT): oniguruma.h
+enc/iso_8859_13.$(OBJEXT): onigmo.h
 enc/iso_8859_14.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/iso_8859_14.$(OBJEXT): internal/assume.h
+enc/iso_8859_14.$(OBJEXT): internal/attr/alloc_size.h
+enc/iso_8859_14.$(OBJEXT): internal/attr/cold.h
+enc/iso_8859_14.$(OBJEXT): internal/attr/const.h
+enc/iso_8859_14.$(OBJEXT): internal/attr/deprecated.h
+enc/iso_8859_14.$(OBJEXT): internal/attr/error.h
+enc/iso_8859_14.$(OBJEXT): internal/attr/forceinline.h
+enc/iso_8859_14.$(OBJEXT): internal/attr/format.h
+enc/iso_8859_14.$(OBJEXT): internal/attr/maybe_unused.h
+enc/iso_8859_14.$(OBJEXT): internal/attr/nodiscard.h
+enc/iso_8859_14.$(OBJEXT): internal/attr/noexcept.h
+enc/iso_8859_14.$(OBJEXT): internal/attr/noinline.h
+enc/iso_8859_14.$(OBJEXT): internal/attr/nonnull.h
+enc/iso_8859_14.$(OBJEXT): internal/attr/noreturn.h
+enc/iso_8859_14.$(OBJEXT): internal/attr/pure.h
+enc/iso_8859_14.$(OBJEXT): internal/attr/restrict.h
+enc/iso_8859_14.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/iso_8859_14.$(OBJEXT): internal/attr/warning.h
+enc/iso_8859_14.$(OBJEXT): internal/cast.h
+enc/iso_8859_14.$(OBJEXT): internal/compiler_is.h
+enc/iso_8859_14.$(OBJEXT): internal/compiler_is/apple.h
+enc/iso_8859_14.$(OBJEXT): internal/compiler_is/clang.h
+enc/iso_8859_14.$(OBJEXT): internal/compiler_is/gcc.h
+enc/iso_8859_14.$(OBJEXT): internal/compiler_is/intel.h
+enc/iso_8859_14.$(OBJEXT): internal/compiler_is/msvc.h
+enc/iso_8859_14.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/iso_8859_14.$(OBJEXT): internal/compiler_since.h
+enc/iso_8859_14.$(OBJEXT): internal/config.h
+enc/iso_8859_14.$(OBJEXT): internal/dllexport.h
+enc/iso_8859_14.$(OBJEXT): internal/dosish.h
+enc/iso_8859_14.$(OBJEXT): internal/has/attribute.h
+enc/iso_8859_14.$(OBJEXT): internal/has/builtin.h
+enc/iso_8859_14.$(OBJEXT): internal/has/c_attribute.h
+enc/iso_8859_14.$(OBJEXT): internal/has/cpp_attribute.h
+enc/iso_8859_14.$(OBJEXT): internal/has/declspec_attribute.h
+enc/iso_8859_14.$(OBJEXT): internal/has/extension.h
+enc/iso_8859_14.$(OBJEXT): internal/has/feature.h
+enc/iso_8859_14.$(OBJEXT): internal/has/warning.h
+enc/iso_8859_14.$(OBJEXT): internal/stdalign.h
+enc/iso_8859_14.$(OBJEXT): internal/stdbool.h
+enc/iso_8859_14.$(OBJEXT): internal/token_paste.h
+enc/iso_8859_14.$(OBJEXT): internal/warning_push.h
+enc/iso_8859_14.$(OBJEXT): internal/xmalloc.h
+enc/iso_8859_14.$(OBJEXT): assert.h
+enc/iso_8859_14.$(OBJEXT): backward/2/assume.h
+enc/iso_8859_14.$(OBJEXT): backward/2/attributes.h
+enc/iso_8859_14.$(OBJEXT): backward/2/bool.h
+enc/iso_8859_14.$(OBJEXT): backward/2/gcc_version_since.h
+enc/iso_8859_14.$(OBJEXT): backward/2/long_long.h
+enc/iso_8859_14.$(OBJEXT): backward/2/stdalign.h
+enc/iso_8859_14.$(OBJEXT): backward/2/stdarg.h
 enc/iso_8859_14.$(OBJEXT): config.h
 enc/iso_8859_14.$(OBJEXT): defines.h
 enc/iso_8859_14.$(OBJEXT): enc/iso_8859.h
 enc/iso_8859_14.$(OBJEXT): enc/iso_8859_14.c
 enc/iso_8859_14.$(OBJEXT): missing.h
-enc/iso_8859_14.$(OBJEXT): oniguruma.h
+enc/iso_8859_14.$(OBJEXT): onigmo.h
 enc/iso_8859_15.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/iso_8859_15.$(OBJEXT): internal/assume.h
+enc/iso_8859_15.$(OBJEXT): internal/attr/alloc_size.h
+enc/iso_8859_15.$(OBJEXT): internal/attr/cold.h
+enc/iso_8859_15.$(OBJEXT): internal/attr/const.h
+enc/iso_8859_15.$(OBJEXT): internal/attr/deprecated.h
+enc/iso_8859_15.$(OBJEXT): internal/attr/error.h
+enc/iso_8859_15.$(OBJEXT): internal/attr/forceinline.h
+enc/iso_8859_15.$(OBJEXT): internal/attr/format.h
+enc/iso_8859_15.$(OBJEXT): internal/attr/maybe_unused.h
+enc/iso_8859_15.$(OBJEXT): internal/attr/nodiscard.h
+enc/iso_8859_15.$(OBJEXT): internal/attr/noexcept.h
+enc/iso_8859_15.$(OBJEXT): internal/attr/noinline.h
+enc/iso_8859_15.$(OBJEXT): internal/attr/nonnull.h
+enc/iso_8859_15.$(OBJEXT): internal/attr/noreturn.h
+enc/iso_8859_15.$(OBJEXT): internal/attr/pure.h
+enc/iso_8859_15.$(OBJEXT): internal/attr/restrict.h
+enc/iso_8859_15.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/iso_8859_15.$(OBJEXT): internal/attr/warning.h
+enc/iso_8859_15.$(OBJEXT): internal/cast.h
+enc/iso_8859_15.$(OBJEXT): internal/compiler_is.h
+enc/iso_8859_15.$(OBJEXT): internal/compiler_is/apple.h
+enc/iso_8859_15.$(OBJEXT): internal/compiler_is/clang.h
+enc/iso_8859_15.$(OBJEXT): internal/compiler_is/gcc.h
+enc/iso_8859_15.$(OBJEXT): internal/compiler_is/intel.h
+enc/iso_8859_15.$(OBJEXT): internal/compiler_is/msvc.h
+enc/iso_8859_15.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/iso_8859_15.$(OBJEXT): internal/compiler_since.h
+enc/iso_8859_15.$(OBJEXT): internal/config.h
+enc/iso_8859_15.$(OBJEXT): internal/dllexport.h
+enc/iso_8859_15.$(OBJEXT): internal/dosish.h
+enc/iso_8859_15.$(OBJEXT): internal/has/attribute.h
+enc/iso_8859_15.$(OBJEXT): internal/has/builtin.h
+enc/iso_8859_15.$(OBJEXT): internal/has/c_attribute.h
+enc/iso_8859_15.$(OBJEXT): internal/has/cpp_attribute.h
+enc/iso_8859_15.$(OBJEXT): internal/has/declspec_attribute.h
+enc/iso_8859_15.$(OBJEXT): internal/has/extension.h
+enc/iso_8859_15.$(OBJEXT): internal/has/feature.h
+enc/iso_8859_15.$(OBJEXT): internal/has/warning.h
+enc/iso_8859_15.$(OBJEXT): internal/stdalign.h
+enc/iso_8859_15.$(OBJEXT): internal/stdbool.h
+enc/iso_8859_15.$(OBJEXT): internal/token_paste.h
+enc/iso_8859_15.$(OBJEXT): internal/warning_push.h
+enc/iso_8859_15.$(OBJEXT): internal/xmalloc.h
+enc/iso_8859_15.$(OBJEXT): assert.h
+enc/iso_8859_15.$(OBJEXT): backward/2/assume.h
+enc/iso_8859_15.$(OBJEXT): backward/2/attributes.h
+enc/iso_8859_15.$(OBJEXT): backward/2/bool.h
+enc/iso_8859_15.$(OBJEXT): backward/2/gcc_version_since.h
+enc/iso_8859_15.$(OBJEXT): backward/2/long_long.h
+enc/iso_8859_15.$(OBJEXT): backward/2/stdalign.h
+enc/iso_8859_15.$(OBJEXT): backward/2/stdarg.h
 enc/iso_8859_15.$(OBJEXT): config.h
 enc/iso_8859_15.$(OBJEXT): defines.h
 enc/iso_8859_15.$(OBJEXT): enc/iso_8859.h
 enc/iso_8859_15.$(OBJEXT): enc/iso_8859_15.c
 enc/iso_8859_15.$(OBJEXT): missing.h
-enc/iso_8859_15.$(OBJEXT): oniguruma.h
+enc/iso_8859_15.$(OBJEXT): onigmo.h
 enc/iso_8859_16.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/iso_8859_16.$(OBJEXT): internal/assume.h
+enc/iso_8859_16.$(OBJEXT): internal/attr/alloc_size.h
+enc/iso_8859_16.$(OBJEXT): internal/attr/cold.h
+enc/iso_8859_16.$(OBJEXT): internal/attr/const.h
+enc/iso_8859_16.$(OBJEXT): internal/attr/deprecated.h
+enc/iso_8859_16.$(OBJEXT): internal/attr/error.h
+enc/iso_8859_16.$(OBJEXT): internal/attr/forceinline.h
+enc/iso_8859_16.$(OBJEXT): internal/attr/format.h
+enc/iso_8859_16.$(OBJEXT): internal/attr/maybe_unused.h
+enc/iso_8859_16.$(OBJEXT): internal/attr/nodiscard.h
+enc/iso_8859_16.$(OBJEXT): internal/attr/noexcept.h
+enc/iso_8859_16.$(OBJEXT): internal/attr/noinline.h
+enc/iso_8859_16.$(OBJEXT): internal/attr/nonnull.h
+enc/iso_8859_16.$(OBJEXT): internal/attr/noreturn.h
+enc/iso_8859_16.$(OBJEXT): internal/attr/pure.h
+enc/iso_8859_16.$(OBJEXT): internal/attr/restrict.h
+enc/iso_8859_16.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/iso_8859_16.$(OBJEXT): internal/attr/warning.h
+enc/iso_8859_16.$(OBJEXT): internal/cast.h
+enc/iso_8859_16.$(OBJEXT): internal/compiler_is.h
+enc/iso_8859_16.$(OBJEXT): internal/compiler_is/apple.h
+enc/iso_8859_16.$(OBJEXT): internal/compiler_is/clang.h
+enc/iso_8859_16.$(OBJEXT): internal/compiler_is/gcc.h
+enc/iso_8859_16.$(OBJEXT): internal/compiler_is/intel.h
+enc/iso_8859_16.$(OBJEXT): internal/compiler_is/msvc.h
+enc/iso_8859_16.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/iso_8859_16.$(OBJEXT): internal/compiler_since.h
+enc/iso_8859_16.$(OBJEXT): internal/config.h
+enc/iso_8859_16.$(OBJEXT): internal/dllexport.h
+enc/iso_8859_16.$(OBJEXT): internal/dosish.h
+enc/iso_8859_16.$(OBJEXT): internal/has/attribute.h
+enc/iso_8859_16.$(OBJEXT): internal/has/builtin.h
+enc/iso_8859_16.$(OBJEXT): internal/has/c_attribute.h
+enc/iso_8859_16.$(OBJEXT): internal/has/cpp_attribute.h
+enc/iso_8859_16.$(OBJEXT): internal/has/declspec_attribute.h
+enc/iso_8859_16.$(OBJEXT): internal/has/extension.h
+enc/iso_8859_16.$(OBJEXT): internal/has/feature.h
+enc/iso_8859_16.$(OBJEXT): internal/has/warning.h
+enc/iso_8859_16.$(OBJEXT): internal/stdalign.h
+enc/iso_8859_16.$(OBJEXT): internal/stdbool.h
+enc/iso_8859_16.$(OBJEXT): internal/token_paste.h
+enc/iso_8859_16.$(OBJEXT): internal/warning_push.h
+enc/iso_8859_16.$(OBJEXT): internal/xmalloc.h
+enc/iso_8859_16.$(OBJEXT): assert.h
+enc/iso_8859_16.$(OBJEXT): backward/2/assume.h
+enc/iso_8859_16.$(OBJEXT): backward/2/attributes.h
+enc/iso_8859_16.$(OBJEXT): backward/2/bool.h
+enc/iso_8859_16.$(OBJEXT): backward/2/gcc_version_since.h
+enc/iso_8859_16.$(OBJEXT): backward/2/long_long.h
+enc/iso_8859_16.$(OBJEXT): backward/2/stdalign.h
+enc/iso_8859_16.$(OBJEXT): backward/2/stdarg.h
 enc/iso_8859_16.$(OBJEXT): config.h
 enc/iso_8859_16.$(OBJEXT): defines.h
 enc/iso_8859_16.$(OBJEXT): enc/iso_8859.h
 enc/iso_8859_16.$(OBJEXT): enc/iso_8859_16.c
 enc/iso_8859_16.$(OBJEXT): missing.h
-enc/iso_8859_16.$(OBJEXT): oniguruma.h
+enc/iso_8859_16.$(OBJEXT): onigmo.h
 enc/iso_8859_2.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/iso_8859_2.$(OBJEXT): internal/assume.h
+enc/iso_8859_2.$(OBJEXT): internal/attr/alloc_size.h
+enc/iso_8859_2.$(OBJEXT): internal/attr/cold.h
+enc/iso_8859_2.$(OBJEXT): internal/attr/const.h
+enc/iso_8859_2.$(OBJEXT): internal/attr/deprecated.h
+enc/iso_8859_2.$(OBJEXT): internal/attr/error.h
+enc/iso_8859_2.$(OBJEXT): internal/attr/forceinline.h
+enc/iso_8859_2.$(OBJEXT): internal/attr/format.h
+enc/iso_8859_2.$(OBJEXT): internal/attr/maybe_unused.h
+enc/iso_8859_2.$(OBJEXT): internal/attr/nodiscard.h
+enc/iso_8859_2.$(OBJEXT): internal/attr/noexcept.h
+enc/iso_8859_2.$(OBJEXT): internal/attr/noinline.h
+enc/iso_8859_2.$(OBJEXT): internal/attr/nonnull.h
+enc/iso_8859_2.$(OBJEXT): internal/attr/noreturn.h
+enc/iso_8859_2.$(OBJEXT): internal/attr/pure.h
+enc/iso_8859_2.$(OBJEXT): internal/attr/restrict.h
+enc/iso_8859_2.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/iso_8859_2.$(OBJEXT): internal/attr/warning.h
+enc/iso_8859_2.$(OBJEXT): internal/cast.h
+enc/iso_8859_2.$(OBJEXT): internal/compiler_is.h
+enc/iso_8859_2.$(OBJEXT): internal/compiler_is/apple.h
+enc/iso_8859_2.$(OBJEXT): internal/compiler_is/clang.h
+enc/iso_8859_2.$(OBJEXT): internal/compiler_is/gcc.h
+enc/iso_8859_2.$(OBJEXT): internal/compiler_is/intel.h
+enc/iso_8859_2.$(OBJEXT): internal/compiler_is/msvc.h
+enc/iso_8859_2.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/iso_8859_2.$(OBJEXT): internal/compiler_since.h
+enc/iso_8859_2.$(OBJEXT): internal/config.h
+enc/iso_8859_2.$(OBJEXT): internal/dllexport.h
+enc/iso_8859_2.$(OBJEXT): internal/dosish.h
+enc/iso_8859_2.$(OBJEXT): internal/has/attribute.h
+enc/iso_8859_2.$(OBJEXT): internal/has/builtin.h
+enc/iso_8859_2.$(OBJEXT): internal/has/c_attribute.h
+enc/iso_8859_2.$(OBJEXT): internal/has/cpp_attribute.h
+enc/iso_8859_2.$(OBJEXT): internal/has/declspec_attribute.h
+enc/iso_8859_2.$(OBJEXT): internal/has/extension.h
+enc/iso_8859_2.$(OBJEXT): internal/has/feature.h
+enc/iso_8859_2.$(OBJEXT): internal/has/warning.h
+enc/iso_8859_2.$(OBJEXT): internal/stdalign.h
+enc/iso_8859_2.$(OBJEXT): internal/stdbool.h
+enc/iso_8859_2.$(OBJEXT): internal/token_paste.h
+enc/iso_8859_2.$(OBJEXT): internal/warning_push.h
+enc/iso_8859_2.$(OBJEXT): internal/xmalloc.h
+enc/iso_8859_2.$(OBJEXT): assert.h
+enc/iso_8859_2.$(OBJEXT): backward/2/assume.h
+enc/iso_8859_2.$(OBJEXT): backward/2/attributes.h
+enc/iso_8859_2.$(OBJEXT): backward/2/bool.h
+enc/iso_8859_2.$(OBJEXT): backward/2/gcc_version_since.h
+enc/iso_8859_2.$(OBJEXT): backward/2/long_long.h
+enc/iso_8859_2.$(OBJEXT): backward/2/stdalign.h
+enc/iso_8859_2.$(OBJEXT): backward/2/stdarg.h
 enc/iso_8859_2.$(OBJEXT): config.h
 enc/iso_8859_2.$(OBJEXT): defines.h
 enc/iso_8859_2.$(OBJEXT): enc/iso_8859.h
 enc/iso_8859_2.$(OBJEXT): enc/iso_8859_2.c
 enc/iso_8859_2.$(OBJEXT): missing.h
-enc/iso_8859_2.$(OBJEXT): oniguruma.h
+enc/iso_8859_2.$(OBJEXT): onigmo.h
 enc/iso_8859_3.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/iso_8859_3.$(OBJEXT): internal/assume.h
+enc/iso_8859_3.$(OBJEXT): internal/attr/alloc_size.h
+enc/iso_8859_3.$(OBJEXT): internal/attr/cold.h
+enc/iso_8859_3.$(OBJEXT): internal/attr/const.h
+enc/iso_8859_3.$(OBJEXT): internal/attr/deprecated.h
+enc/iso_8859_3.$(OBJEXT): internal/attr/error.h
+enc/iso_8859_3.$(OBJEXT): internal/attr/forceinline.h
+enc/iso_8859_3.$(OBJEXT): internal/attr/format.h
+enc/iso_8859_3.$(OBJEXT): internal/attr/maybe_unused.h
+enc/iso_8859_3.$(OBJEXT): internal/attr/nodiscard.h
+enc/iso_8859_3.$(OBJEXT): internal/attr/noexcept.h
+enc/iso_8859_3.$(OBJEXT): internal/attr/noinline.h
+enc/iso_8859_3.$(OBJEXT): internal/attr/nonnull.h
+enc/iso_8859_3.$(OBJEXT): internal/attr/noreturn.h
+enc/iso_8859_3.$(OBJEXT): internal/attr/pure.h
+enc/iso_8859_3.$(OBJEXT): internal/attr/restrict.h
+enc/iso_8859_3.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/iso_8859_3.$(OBJEXT): internal/attr/warning.h
+enc/iso_8859_3.$(OBJEXT): internal/cast.h
+enc/iso_8859_3.$(OBJEXT): internal/compiler_is.h
+enc/iso_8859_3.$(OBJEXT): internal/compiler_is/apple.h
+enc/iso_8859_3.$(OBJEXT): internal/compiler_is/clang.h
+enc/iso_8859_3.$(OBJEXT): internal/compiler_is/gcc.h
+enc/iso_8859_3.$(OBJEXT): internal/compiler_is/intel.h
+enc/iso_8859_3.$(OBJEXT): internal/compiler_is/msvc.h
+enc/iso_8859_3.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/iso_8859_3.$(OBJEXT): internal/compiler_since.h
+enc/iso_8859_3.$(OBJEXT): internal/config.h
+enc/iso_8859_3.$(OBJEXT): internal/dllexport.h
+enc/iso_8859_3.$(OBJEXT): internal/dosish.h
+enc/iso_8859_3.$(OBJEXT): internal/has/attribute.h
+enc/iso_8859_3.$(OBJEXT): internal/has/builtin.h
+enc/iso_8859_3.$(OBJEXT): internal/has/c_attribute.h
+enc/iso_8859_3.$(OBJEXT): internal/has/cpp_attribute.h
+enc/iso_8859_3.$(OBJEXT): internal/has/declspec_attribute.h
+enc/iso_8859_3.$(OBJEXT): internal/has/extension.h
+enc/iso_8859_3.$(OBJEXT): internal/has/feature.h
+enc/iso_8859_3.$(OBJEXT): internal/has/warning.h
+enc/iso_8859_3.$(OBJEXT): internal/stdalign.h
+enc/iso_8859_3.$(OBJEXT): internal/stdbool.h
+enc/iso_8859_3.$(OBJEXT): internal/token_paste.h
+enc/iso_8859_3.$(OBJEXT): internal/warning_push.h
+enc/iso_8859_3.$(OBJEXT): internal/xmalloc.h
+enc/iso_8859_3.$(OBJEXT): assert.h
+enc/iso_8859_3.$(OBJEXT): backward/2/assume.h
+enc/iso_8859_3.$(OBJEXT): backward/2/attributes.h
+enc/iso_8859_3.$(OBJEXT): backward/2/bool.h
+enc/iso_8859_3.$(OBJEXT): backward/2/gcc_version_since.h
+enc/iso_8859_3.$(OBJEXT): backward/2/long_long.h
+enc/iso_8859_3.$(OBJEXT): backward/2/stdalign.h
+enc/iso_8859_3.$(OBJEXT): backward/2/stdarg.h
 enc/iso_8859_3.$(OBJEXT): config.h
 enc/iso_8859_3.$(OBJEXT): defines.h
 enc/iso_8859_3.$(OBJEXT): enc/iso_8859.h
 enc/iso_8859_3.$(OBJEXT): enc/iso_8859_3.c
 enc/iso_8859_3.$(OBJEXT): missing.h
-enc/iso_8859_3.$(OBJEXT): oniguruma.h
+enc/iso_8859_3.$(OBJEXT): onigmo.h
 enc/iso_8859_4.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/iso_8859_4.$(OBJEXT): internal/assume.h
+enc/iso_8859_4.$(OBJEXT): internal/attr/alloc_size.h
+enc/iso_8859_4.$(OBJEXT): internal/attr/cold.h
+enc/iso_8859_4.$(OBJEXT): internal/attr/const.h
+enc/iso_8859_4.$(OBJEXT): internal/attr/deprecated.h
+enc/iso_8859_4.$(OBJEXT): internal/attr/error.h
+enc/iso_8859_4.$(OBJEXT): internal/attr/forceinline.h
+enc/iso_8859_4.$(OBJEXT): internal/attr/format.h
+enc/iso_8859_4.$(OBJEXT): internal/attr/maybe_unused.h
+enc/iso_8859_4.$(OBJEXT): internal/attr/nodiscard.h
+enc/iso_8859_4.$(OBJEXT): internal/attr/noexcept.h
+enc/iso_8859_4.$(OBJEXT): internal/attr/noinline.h
+enc/iso_8859_4.$(OBJEXT): internal/attr/nonnull.h
+enc/iso_8859_4.$(OBJEXT): internal/attr/noreturn.h
+enc/iso_8859_4.$(OBJEXT): internal/attr/pure.h
+enc/iso_8859_4.$(OBJEXT): internal/attr/restrict.h
+enc/iso_8859_4.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/iso_8859_4.$(OBJEXT): internal/attr/warning.h
+enc/iso_8859_4.$(OBJEXT): internal/cast.h
+enc/iso_8859_4.$(OBJEXT): internal/compiler_is.h
+enc/iso_8859_4.$(OBJEXT): internal/compiler_is/apple.h
+enc/iso_8859_4.$(OBJEXT): internal/compiler_is/clang.h
+enc/iso_8859_4.$(OBJEXT): internal/compiler_is/gcc.h
+enc/iso_8859_4.$(OBJEXT): internal/compiler_is/intel.h
+enc/iso_8859_4.$(OBJEXT): internal/compiler_is/msvc.h
+enc/iso_8859_4.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/iso_8859_4.$(OBJEXT): internal/compiler_since.h
+enc/iso_8859_4.$(OBJEXT): internal/config.h
+enc/iso_8859_4.$(OBJEXT): internal/dllexport.h
+enc/iso_8859_4.$(OBJEXT): internal/dosish.h
+enc/iso_8859_4.$(OBJEXT): internal/has/attribute.h
+enc/iso_8859_4.$(OBJEXT): internal/has/builtin.h
+enc/iso_8859_4.$(OBJEXT): internal/has/c_attribute.h
+enc/iso_8859_4.$(OBJEXT): internal/has/cpp_attribute.h
+enc/iso_8859_4.$(OBJEXT): internal/has/declspec_attribute.h
+enc/iso_8859_4.$(OBJEXT): internal/has/extension.h
+enc/iso_8859_4.$(OBJEXT): internal/has/feature.h
+enc/iso_8859_4.$(OBJEXT): internal/has/warning.h
+enc/iso_8859_4.$(OBJEXT): internal/stdalign.h
+enc/iso_8859_4.$(OBJEXT): internal/stdbool.h
+enc/iso_8859_4.$(OBJEXT): internal/token_paste.h
+enc/iso_8859_4.$(OBJEXT): internal/warning_push.h
+enc/iso_8859_4.$(OBJEXT): internal/xmalloc.h
+enc/iso_8859_4.$(OBJEXT): assert.h
+enc/iso_8859_4.$(OBJEXT): backward/2/assume.h
+enc/iso_8859_4.$(OBJEXT): backward/2/attributes.h
+enc/iso_8859_4.$(OBJEXT): backward/2/bool.h
+enc/iso_8859_4.$(OBJEXT): backward/2/gcc_version_since.h
+enc/iso_8859_4.$(OBJEXT): backward/2/long_long.h
+enc/iso_8859_4.$(OBJEXT): backward/2/stdalign.h
+enc/iso_8859_4.$(OBJEXT): backward/2/stdarg.h
 enc/iso_8859_4.$(OBJEXT): config.h
 enc/iso_8859_4.$(OBJEXT): defines.h
 enc/iso_8859_4.$(OBJEXT): enc/iso_8859.h
 enc/iso_8859_4.$(OBJEXT): enc/iso_8859_4.c
 enc/iso_8859_4.$(OBJEXT): missing.h
-enc/iso_8859_4.$(OBJEXT): oniguruma.h
+enc/iso_8859_4.$(OBJEXT): onigmo.h
 enc/iso_8859_5.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/iso_8859_5.$(OBJEXT): internal/assume.h
+enc/iso_8859_5.$(OBJEXT): internal/attr/alloc_size.h
+enc/iso_8859_5.$(OBJEXT): internal/attr/cold.h
+enc/iso_8859_5.$(OBJEXT): internal/attr/const.h
+enc/iso_8859_5.$(OBJEXT): internal/attr/deprecated.h
+enc/iso_8859_5.$(OBJEXT): internal/attr/error.h
+enc/iso_8859_5.$(OBJEXT): internal/attr/forceinline.h
+enc/iso_8859_5.$(OBJEXT): internal/attr/format.h
+enc/iso_8859_5.$(OBJEXT): internal/attr/maybe_unused.h
+enc/iso_8859_5.$(OBJEXT): internal/attr/nodiscard.h
+enc/iso_8859_5.$(OBJEXT): internal/attr/noexcept.h
+enc/iso_8859_5.$(OBJEXT): internal/attr/noinline.h
+enc/iso_8859_5.$(OBJEXT): internal/attr/nonnull.h
+enc/iso_8859_5.$(OBJEXT): internal/attr/noreturn.h
+enc/iso_8859_5.$(OBJEXT): internal/attr/pure.h
+enc/iso_8859_5.$(OBJEXT): internal/attr/restrict.h
+enc/iso_8859_5.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/iso_8859_5.$(OBJEXT): internal/attr/warning.h
+enc/iso_8859_5.$(OBJEXT): internal/cast.h
+enc/iso_8859_5.$(OBJEXT): internal/compiler_is.h
+enc/iso_8859_5.$(OBJEXT): internal/compiler_is/apple.h
+enc/iso_8859_5.$(OBJEXT): internal/compiler_is/clang.h
+enc/iso_8859_5.$(OBJEXT): internal/compiler_is/gcc.h
+enc/iso_8859_5.$(OBJEXT): internal/compiler_is/intel.h
+enc/iso_8859_5.$(OBJEXT): internal/compiler_is/msvc.h
+enc/iso_8859_5.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/iso_8859_5.$(OBJEXT): internal/compiler_since.h
+enc/iso_8859_5.$(OBJEXT): internal/config.h
+enc/iso_8859_5.$(OBJEXT): internal/dllexport.h
+enc/iso_8859_5.$(OBJEXT): internal/dosish.h
+enc/iso_8859_5.$(OBJEXT): internal/has/attribute.h
+enc/iso_8859_5.$(OBJEXT): internal/has/builtin.h
+enc/iso_8859_5.$(OBJEXT): internal/has/c_attribute.h
+enc/iso_8859_5.$(OBJEXT): internal/has/cpp_attribute.h
+enc/iso_8859_5.$(OBJEXT): internal/has/declspec_attribute.h
+enc/iso_8859_5.$(OBJEXT): internal/has/extension.h
+enc/iso_8859_5.$(OBJEXT): internal/has/feature.h
+enc/iso_8859_5.$(OBJEXT): internal/has/warning.h
+enc/iso_8859_5.$(OBJEXT): internal/stdalign.h
+enc/iso_8859_5.$(OBJEXT): internal/stdbool.h
+enc/iso_8859_5.$(OBJEXT): internal/token_paste.h
+enc/iso_8859_5.$(OBJEXT): internal/warning_push.h
+enc/iso_8859_5.$(OBJEXT): internal/xmalloc.h
+enc/iso_8859_5.$(OBJEXT): assert.h
+enc/iso_8859_5.$(OBJEXT): backward/2/assume.h
+enc/iso_8859_5.$(OBJEXT): backward/2/attributes.h
+enc/iso_8859_5.$(OBJEXT): backward/2/bool.h
+enc/iso_8859_5.$(OBJEXT): backward/2/gcc_version_since.h
+enc/iso_8859_5.$(OBJEXT): backward/2/long_long.h
+enc/iso_8859_5.$(OBJEXT): backward/2/stdalign.h
+enc/iso_8859_5.$(OBJEXT): backward/2/stdarg.h
 enc/iso_8859_5.$(OBJEXT): config.h
 enc/iso_8859_5.$(OBJEXT): defines.h
 enc/iso_8859_5.$(OBJEXT): enc/iso_8859_5.c
 enc/iso_8859_5.$(OBJEXT): missing.h
-enc/iso_8859_5.$(OBJEXT): oniguruma.h
+enc/iso_8859_5.$(OBJEXT): onigmo.h
 enc/iso_8859_6.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/iso_8859_6.$(OBJEXT): internal/assume.h
+enc/iso_8859_6.$(OBJEXT): internal/attr/alloc_size.h
+enc/iso_8859_6.$(OBJEXT): internal/attr/cold.h
+enc/iso_8859_6.$(OBJEXT): internal/attr/const.h
+enc/iso_8859_6.$(OBJEXT): internal/attr/deprecated.h
+enc/iso_8859_6.$(OBJEXT): internal/attr/error.h
+enc/iso_8859_6.$(OBJEXT): internal/attr/forceinline.h
+enc/iso_8859_6.$(OBJEXT): internal/attr/format.h
+enc/iso_8859_6.$(OBJEXT): internal/attr/maybe_unused.h
+enc/iso_8859_6.$(OBJEXT): internal/attr/nodiscard.h
+enc/iso_8859_6.$(OBJEXT): internal/attr/noexcept.h
+enc/iso_8859_6.$(OBJEXT): internal/attr/noinline.h
+enc/iso_8859_6.$(OBJEXT): internal/attr/nonnull.h
+enc/iso_8859_6.$(OBJEXT): internal/attr/noreturn.h
+enc/iso_8859_6.$(OBJEXT): internal/attr/pure.h
+enc/iso_8859_6.$(OBJEXT): internal/attr/restrict.h
+enc/iso_8859_6.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/iso_8859_6.$(OBJEXT): internal/attr/warning.h
+enc/iso_8859_6.$(OBJEXT): internal/cast.h
+enc/iso_8859_6.$(OBJEXT): internal/compiler_is.h
+enc/iso_8859_6.$(OBJEXT): internal/compiler_is/apple.h
+enc/iso_8859_6.$(OBJEXT): internal/compiler_is/clang.h
+enc/iso_8859_6.$(OBJEXT): internal/compiler_is/gcc.h
+enc/iso_8859_6.$(OBJEXT): internal/compiler_is/intel.h
+enc/iso_8859_6.$(OBJEXT): internal/compiler_is/msvc.h
+enc/iso_8859_6.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/iso_8859_6.$(OBJEXT): internal/compiler_since.h
+enc/iso_8859_6.$(OBJEXT): internal/config.h
+enc/iso_8859_6.$(OBJEXT): internal/dllexport.h
+enc/iso_8859_6.$(OBJEXT): internal/dosish.h
+enc/iso_8859_6.$(OBJEXT): internal/has/attribute.h
+enc/iso_8859_6.$(OBJEXT): internal/has/builtin.h
+enc/iso_8859_6.$(OBJEXT): internal/has/c_attribute.h
+enc/iso_8859_6.$(OBJEXT): internal/has/cpp_attribute.h
+enc/iso_8859_6.$(OBJEXT): internal/has/declspec_attribute.h
+enc/iso_8859_6.$(OBJEXT): internal/has/extension.h
+enc/iso_8859_6.$(OBJEXT): internal/has/feature.h
+enc/iso_8859_6.$(OBJEXT): internal/has/warning.h
+enc/iso_8859_6.$(OBJEXT): internal/stdalign.h
+enc/iso_8859_6.$(OBJEXT): internal/stdbool.h
+enc/iso_8859_6.$(OBJEXT): internal/token_paste.h
+enc/iso_8859_6.$(OBJEXT): internal/warning_push.h
+enc/iso_8859_6.$(OBJEXT): internal/xmalloc.h
+enc/iso_8859_6.$(OBJEXT): assert.h
+enc/iso_8859_6.$(OBJEXT): backward/2/assume.h
+enc/iso_8859_6.$(OBJEXT): backward/2/attributes.h
+enc/iso_8859_6.$(OBJEXT): backward/2/bool.h
+enc/iso_8859_6.$(OBJEXT): backward/2/gcc_version_since.h
+enc/iso_8859_6.$(OBJEXT): backward/2/long_long.h
+enc/iso_8859_6.$(OBJEXT): backward/2/stdalign.h
+enc/iso_8859_6.$(OBJEXT): backward/2/stdarg.h
 enc/iso_8859_6.$(OBJEXT): config.h
 enc/iso_8859_6.$(OBJEXT): defines.h
 enc/iso_8859_6.$(OBJEXT): enc/iso_8859_6.c
 enc/iso_8859_6.$(OBJEXT): missing.h
-enc/iso_8859_6.$(OBJEXT): oniguruma.h
+enc/iso_8859_6.$(OBJEXT): onigmo.h
 enc/iso_8859_7.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/iso_8859_7.$(OBJEXT): internal/assume.h
+enc/iso_8859_7.$(OBJEXT): internal/attr/alloc_size.h
+enc/iso_8859_7.$(OBJEXT): internal/attr/cold.h
+enc/iso_8859_7.$(OBJEXT): internal/attr/const.h
+enc/iso_8859_7.$(OBJEXT): internal/attr/deprecated.h
+enc/iso_8859_7.$(OBJEXT): internal/attr/error.h
+enc/iso_8859_7.$(OBJEXT): internal/attr/forceinline.h
+enc/iso_8859_7.$(OBJEXT): internal/attr/format.h
+enc/iso_8859_7.$(OBJEXT): internal/attr/maybe_unused.h
+enc/iso_8859_7.$(OBJEXT): internal/attr/nodiscard.h
+enc/iso_8859_7.$(OBJEXT): internal/attr/noexcept.h
+enc/iso_8859_7.$(OBJEXT): internal/attr/noinline.h
+enc/iso_8859_7.$(OBJEXT): internal/attr/nonnull.h
+enc/iso_8859_7.$(OBJEXT): internal/attr/noreturn.h
+enc/iso_8859_7.$(OBJEXT): internal/attr/pure.h
+enc/iso_8859_7.$(OBJEXT): internal/attr/restrict.h
+enc/iso_8859_7.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/iso_8859_7.$(OBJEXT): internal/attr/warning.h
+enc/iso_8859_7.$(OBJEXT): internal/cast.h
+enc/iso_8859_7.$(OBJEXT): internal/compiler_is.h
+enc/iso_8859_7.$(OBJEXT): internal/compiler_is/apple.h
+enc/iso_8859_7.$(OBJEXT): internal/compiler_is/clang.h
+enc/iso_8859_7.$(OBJEXT): internal/compiler_is/gcc.h
+enc/iso_8859_7.$(OBJEXT): internal/compiler_is/intel.h
+enc/iso_8859_7.$(OBJEXT): internal/compiler_is/msvc.h
+enc/iso_8859_7.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/iso_8859_7.$(OBJEXT): internal/compiler_since.h
+enc/iso_8859_7.$(OBJEXT): internal/config.h
+enc/iso_8859_7.$(OBJEXT): internal/dllexport.h
+enc/iso_8859_7.$(OBJEXT): internal/dosish.h
+enc/iso_8859_7.$(OBJEXT): internal/has/attribute.h
+enc/iso_8859_7.$(OBJEXT): internal/has/builtin.h
+enc/iso_8859_7.$(OBJEXT): internal/has/c_attribute.h
+enc/iso_8859_7.$(OBJEXT): internal/has/cpp_attribute.h
+enc/iso_8859_7.$(OBJEXT): internal/has/declspec_attribute.h
+enc/iso_8859_7.$(OBJEXT): internal/has/extension.h
+enc/iso_8859_7.$(OBJEXT): internal/has/feature.h
+enc/iso_8859_7.$(OBJEXT): internal/has/warning.h
+enc/iso_8859_7.$(OBJEXT): internal/stdalign.h
+enc/iso_8859_7.$(OBJEXT): internal/stdbool.h
+enc/iso_8859_7.$(OBJEXT): internal/token_paste.h
+enc/iso_8859_7.$(OBJEXT): internal/warning_push.h
+enc/iso_8859_7.$(OBJEXT): internal/xmalloc.h
+enc/iso_8859_7.$(OBJEXT): assert.h
+enc/iso_8859_7.$(OBJEXT): backward/2/assume.h
+enc/iso_8859_7.$(OBJEXT): backward/2/attributes.h
+enc/iso_8859_7.$(OBJEXT): backward/2/bool.h
+enc/iso_8859_7.$(OBJEXT): backward/2/gcc_version_since.h
+enc/iso_8859_7.$(OBJEXT): backward/2/long_long.h
+enc/iso_8859_7.$(OBJEXT): backward/2/stdalign.h
+enc/iso_8859_7.$(OBJEXT): backward/2/stdarg.h
 enc/iso_8859_7.$(OBJEXT): config.h
 enc/iso_8859_7.$(OBJEXT): defines.h
 enc/iso_8859_7.$(OBJEXT): enc/iso_8859_7.c
 enc/iso_8859_7.$(OBJEXT): missing.h
-enc/iso_8859_7.$(OBJEXT): oniguruma.h
+enc/iso_8859_7.$(OBJEXT): onigmo.h
 enc/iso_8859_8.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/iso_8859_8.$(OBJEXT): internal/assume.h
+enc/iso_8859_8.$(OBJEXT): internal/attr/alloc_size.h
+enc/iso_8859_8.$(OBJEXT): internal/attr/cold.h
+enc/iso_8859_8.$(OBJEXT): internal/attr/const.h
+enc/iso_8859_8.$(OBJEXT): internal/attr/deprecated.h
+enc/iso_8859_8.$(OBJEXT): internal/attr/error.h
+enc/iso_8859_8.$(OBJEXT): internal/attr/forceinline.h
+enc/iso_8859_8.$(OBJEXT): internal/attr/format.h
+enc/iso_8859_8.$(OBJEXT): internal/attr/maybe_unused.h
+enc/iso_8859_8.$(OBJEXT): internal/attr/nodiscard.h
+enc/iso_8859_8.$(OBJEXT): internal/attr/noexcept.h
+enc/iso_8859_8.$(OBJEXT): internal/attr/noinline.h
+enc/iso_8859_8.$(OBJEXT): internal/attr/nonnull.h
+enc/iso_8859_8.$(OBJEXT): internal/attr/noreturn.h
+enc/iso_8859_8.$(OBJEXT): internal/attr/pure.h
+enc/iso_8859_8.$(OBJEXT): internal/attr/restrict.h
+enc/iso_8859_8.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/iso_8859_8.$(OBJEXT): internal/attr/warning.h
+enc/iso_8859_8.$(OBJEXT): internal/cast.h
+enc/iso_8859_8.$(OBJEXT): internal/compiler_is.h
+enc/iso_8859_8.$(OBJEXT): internal/compiler_is/apple.h
+enc/iso_8859_8.$(OBJEXT): internal/compiler_is/clang.h
+enc/iso_8859_8.$(OBJEXT): internal/compiler_is/gcc.h
+enc/iso_8859_8.$(OBJEXT): internal/compiler_is/intel.h
+enc/iso_8859_8.$(OBJEXT): internal/compiler_is/msvc.h
+enc/iso_8859_8.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/iso_8859_8.$(OBJEXT): internal/compiler_since.h
+enc/iso_8859_8.$(OBJEXT): internal/config.h
+enc/iso_8859_8.$(OBJEXT): internal/dllexport.h
+enc/iso_8859_8.$(OBJEXT): internal/dosish.h
+enc/iso_8859_8.$(OBJEXT): internal/has/attribute.h
+enc/iso_8859_8.$(OBJEXT): internal/has/builtin.h
+enc/iso_8859_8.$(OBJEXT): internal/has/c_attribute.h
+enc/iso_8859_8.$(OBJEXT): internal/has/cpp_attribute.h
+enc/iso_8859_8.$(OBJEXT): internal/has/declspec_attribute.h
+enc/iso_8859_8.$(OBJEXT): internal/has/extension.h
+enc/iso_8859_8.$(OBJEXT): internal/has/feature.h
+enc/iso_8859_8.$(OBJEXT): internal/has/warning.h
+enc/iso_8859_8.$(OBJEXT): internal/stdalign.h
+enc/iso_8859_8.$(OBJEXT): internal/stdbool.h
+enc/iso_8859_8.$(OBJEXT): internal/token_paste.h
+enc/iso_8859_8.$(OBJEXT): internal/warning_push.h
+enc/iso_8859_8.$(OBJEXT): internal/xmalloc.h
+enc/iso_8859_8.$(OBJEXT): assert.h
+enc/iso_8859_8.$(OBJEXT): backward/2/assume.h
+enc/iso_8859_8.$(OBJEXT): backward/2/attributes.h
+enc/iso_8859_8.$(OBJEXT): backward/2/bool.h
+enc/iso_8859_8.$(OBJEXT): backward/2/gcc_version_since.h
+enc/iso_8859_8.$(OBJEXT): backward/2/long_long.h
+enc/iso_8859_8.$(OBJEXT): backward/2/stdalign.h
+enc/iso_8859_8.$(OBJEXT): backward/2/stdarg.h
 enc/iso_8859_8.$(OBJEXT): config.h
 enc/iso_8859_8.$(OBJEXT): defines.h
 enc/iso_8859_8.$(OBJEXT): enc/iso_8859_8.c
 enc/iso_8859_8.$(OBJEXT): missing.h
-enc/iso_8859_8.$(OBJEXT): oniguruma.h
+enc/iso_8859_8.$(OBJEXT): onigmo.h
 enc/iso_8859_9.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/iso_8859_9.$(OBJEXT): internal/assume.h
+enc/iso_8859_9.$(OBJEXT): internal/attr/alloc_size.h
+enc/iso_8859_9.$(OBJEXT): internal/attr/cold.h
+enc/iso_8859_9.$(OBJEXT): internal/attr/const.h
+enc/iso_8859_9.$(OBJEXT): internal/attr/deprecated.h
+enc/iso_8859_9.$(OBJEXT): internal/attr/error.h
+enc/iso_8859_9.$(OBJEXT): internal/attr/forceinline.h
+enc/iso_8859_9.$(OBJEXT): internal/attr/format.h
+enc/iso_8859_9.$(OBJEXT): internal/attr/maybe_unused.h
+enc/iso_8859_9.$(OBJEXT): internal/attr/nodiscard.h
+enc/iso_8859_9.$(OBJEXT): internal/attr/noexcept.h
+enc/iso_8859_9.$(OBJEXT): internal/attr/noinline.h
+enc/iso_8859_9.$(OBJEXT): internal/attr/nonnull.h
+enc/iso_8859_9.$(OBJEXT): internal/attr/noreturn.h
+enc/iso_8859_9.$(OBJEXT): internal/attr/pure.h
+enc/iso_8859_9.$(OBJEXT): internal/attr/restrict.h
+enc/iso_8859_9.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/iso_8859_9.$(OBJEXT): internal/attr/warning.h
+enc/iso_8859_9.$(OBJEXT): internal/cast.h
+enc/iso_8859_9.$(OBJEXT): internal/compiler_is.h
+enc/iso_8859_9.$(OBJEXT): internal/compiler_is/apple.h
+enc/iso_8859_9.$(OBJEXT): internal/compiler_is/clang.h
+enc/iso_8859_9.$(OBJEXT): internal/compiler_is/gcc.h
+enc/iso_8859_9.$(OBJEXT): internal/compiler_is/intel.h
+enc/iso_8859_9.$(OBJEXT): internal/compiler_is/msvc.h
+enc/iso_8859_9.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/iso_8859_9.$(OBJEXT): internal/compiler_since.h
+enc/iso_8859_9.$(OBJEXT): internal/config.h
+enc/iso_8859_9.$(OBJEXT): internal/dllexport.h
+enc/iso_8859_9.$(OBJEXT): internal/dosish.h
+enc/iso_8859_9.$(OBJEXT): internal/has/attribute.h
+enc/iso_8859_9.$(OBJEXT): internal/has/builtin.h
+enc/iso_8859_9.$(OBJEXT): internal/has/c_attribute.h
+enc/iso_8859_9.$(OBJEXT): internal/has/cpp_attribute.h
+enc/iso_8859_9.$(OBJEXT): internal/has/declspec_attribute.h
+enc/iso_8859_9.$(OBJEXT): internal/has/extension.h
+enc/iso_8859_9.$(OBJEXT): internal/has/feature.h
+enc/iso_8859_9.$(OBJEXT): internal/has/warning.h
+enc/iso_8859_9.$(OBJEXT): internal/stdalign.h
+enc/iso_8859_9.$(OBJEXT): internal/stdbool.h
+enc/iso_8859_9.$(OBJEXT): internal/token_paste.h
+enc/iso_8859_9.$(OBJEXT): internal/warning_push.h
+enc/iso_8859_9.$(OBJEXT): internal/xmalloc.h
+enc/iso_8859_9.$(OBJEXT): assert.h
+enc/iso_8859_9.$(OBJEXT): backward/2/assume.h
+enc/iso_8859_9.$(OBJEXT): backward/2/attributes.h
+enc/iso_8859_9.$(OBJEXT): backward/2/bool.h
+enc/iso_8859_9.$(OBJEXT): backward/2/gcc_version_since.h
+enc/iso_8859_9.$(OBJEXT): backward/2/long_long.h
+enc/iso_8859_9.$(OBJEXT): backward/2/stdalign.h
+enc/iso_8859_9.$(OBJEXT): backward/2/stdarg.h
 enc/iso_8859_9.$(OBJEXT): config.h
 enc/iso_8859_9.$(OBJEXT): defines.h
 enc/iso_8859_9.$(OBJEXT): enc/iso_8859.h
 enc/iso_8859_9.$(OBJEXT): enc/iso_8859_9.c
 enc/iso_8859_9.$(OBJEXT): missing.h
-enc/iso_8859_9.$(OBJEXT): oniguruma.h
+enc/iso_8859_9.$(OBJEXT): onigmo.h
 enc/koi8_r.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/koi8_r.$(OBJEXT): internal/assume.h
+enc/koi8_r.$(OBJEXT): internal/attr/alloc_size.h
+enc/koi8_r.$(OBJEXT): internal/attr/cold.h
+enc/koi8_r.$(OBJEXT): internal/attr/const.h
+enc/koi8_r.$(OBJEXT): internal/attr/deprecated.h
+enc/koi8_r.$(OBJEXT): internal/attr/error.h
+enc/koi8_r.$(OBJEXT): internal/attr/forceinline.h
+enc/koi8_r.$(OBJEXT): internal/attr/format.h
+enc/koi8_r.$(OBJEXT): internal/attr/maybe_unused.h
+enc/koi8_r.$(OBJEXT): internal/attr/nodiscard.h
+enc/koi8_r.$(OBJEXT): internal/attr/noexcept.h
+enc/koi8_r.$(OBJEXT): internal/attr/noinline.h
+enc/koi8_r.$(OBJEXT): internal/attr/nonnull.h
+enc/koi8_r.$(OBJEXT): internal/attr/noreturn.h
+enc/koi8_r.$(OBJEXT): internal/attr/pure.h
+enc/koi8_r.$(OBJEXT): internal/attr/restrict.h
+enc/koi8_r.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/koi8_r.$(OBJEXT): internal/attr/warning.h
+enc/koi8_r.$(OBJEXT): internal/cast.h
+enc/koi8_r.$(OBJEXT): internal/compiler_is.h
+enc/koi8_r.$(OBJEXT): internal/compiler_is/apple.h
+enc/koi8_r.$(OBJEXT): internal/compiler_is/clang.h
+enc/koi8_r.$(OBJEXT): internal/compiler_is/gcc.h
+enc/koi8_r.$(OBJEXT): internal/compiler_is/intel.h
+enc/koi8_r.$(OBJEXT): internal/compiler_is/msvc.h
+enc/koi8_r.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/koi8_r.$(OBJEXT): internal/compiler_since.h
+enc/koi8_r.$(OBJEXT): internal/config.h
+enc/koi8_r.$(OBJEXT): internal/dllexport.h
+enc/koi8_r.$(OBJEXT): internal/dosish.h
+enc/koi8_r.$(OBJEXT): internal/has/attribute.h
+enc/koi8_r.$(OBJEXT): internal/has/builtin.h
+enc/koi8_r.$(OBJEXT): internal/has/c_attribute.h
+enc/koi8_r.$(OBJEXT): internal/has/cpp_attribute.h
+enc/koi8_r.$(OBJEXT): internal/has/declspec_attribute.h
+enc/koi8_r.$(OBJEXT): internal/has/extension.h
+enc/koi8_r.$(OBJEXT): internal/has/feature.h
+enc/koi8_r.$(OBJEXT): internal/has/warning.h
+enc/koi8_r.$(OBJEXT): internal/stdalign.h
+enc/koi8_r.$(OBJEXT): internal/stdbool.h
+enc/koi8_r.$(OBJEXT): internal/token_paste.h
+enc/koi8_r.$(OBJEXT): internal/warning_push.h
+enc/koi8_r.$(OBJEXT): internal/xmalloc.h
+enc/koi8_r.$(OBJEXT): assert.h
+enc/koi8_r.$(OBJEXT): backward/2/assume.h
+enc/koi8_r.$(OBJEXT): backward/2/attributes.h
+enc/koi8_r.$(OBJEXT): backward/2/bool.h
+enc/koi8_r.$(OBJEXT): backward/2/gcc_version_since.h
+enc/koi8_r.$(OBJEXT): backward/2/long_long.h
+enc/koi8_r.$(OBJEXT): backward/2/stdalign.h
+enc/koi8_r.$(OBJEXT): backward/2/stdarg.h
 enc/koi8_r.$(OBJEXT): config.h
 enc/koi8_r.$(OBJEXT): defines.h
 enc/koi8_r.$(OBJEXT): enc/koi8_r.c
 enc/koi8_r.$(OBJEXT): missing.h
-enc/koi8_r.$(OBJEXT): oniguruma.h
+enc/koi8_r.$(OBJEXT): onigmo.h
 enc/koi8_u.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/koi8_u.$(OBJEXT): internal/assume.h
+enc/koi8_u.$(OBJEXT): internal/attr/alloc_size.h
+enc/koi8_u.$(OBJEXT): internal/attr/cold.h
+enc/koi8_u.$(OBJEXT): internal/attr/const.h
+enc/koi8_u.$(OBJEXT): internal/attr/deprecated.h
+enc/koi8_u.$(OBJEXT): internal/attr/error.h
+enc/koi8_u.$(OBJEXT): internal/attr/forceinline.h
+enc/koi8_u.$(OBJEXT): internal/attr/format.h
+enc/koi8_u.$(OBJEXT): internal/attr/maybe_unused.h
+enc/koi8_u.$(OBJEXT): internal/attr/nodiscard.h
+enc/koi8_u.$(OBJEXT): internal/attr/noexcept.h
+enc/koi8_u.$(OBJEXT): internal/attr/noinline.h
+enc/koi8_u.$(OBJEXT): internal/attr/nonnull.h
+enc/koi8_u.$(OBJEXT): internal/attr/noreturn.h
+enc/koi8_u.$(OBJEXT): internal/attr/pure.h
+enc/koi8_u.$(OBJEXT): internal/attr/restrict.h
+enc/koi8_u.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/koi8_u.$(OBJEXT): internal/attr/warning.h
+enc/koi8_u.$(OBJEXT): internal/cast.h
+enc/koi8_u.$(OBJEXT): internal/compiler_is.h
+enc/koi8_u.$(OBJEXT): internal/compiler_is/apple.h
+enc/koi8_u.$(OBJEXT): internal/compiler_is/clang.h
+enc/koi8_u.$(OBJEXT): internal/compiler_is/gcc.h
+enc/koi8_u.$(OBJEXT): internal/compiler_is/intel.h
+enc/koi8_u.$(OBJEXT): internal/compiler_is/msvc.h
+enc/koi8_u.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/koi8_u.$(OBJEXT): internal/compiler_since.h
+enc/koi8_u.$(OBJEXT): internal/config.h
+enc/koi8_u.$(OBJEXT): internal/dllexport.h
+enc/koi8_u.$(OBJEXT): internal/dosish.h
+enc/koi8_u.$(OBJEXT): internal/has/attribute.h
+enc/koi8_u.$(OBJEXT): internal/has/builtin.h
+enc/koi8_u.$(OBJEXT): internal/has/c_attribute.h
+enc/koi8_u.$(OBJEXT): internal/has/cpp_attribute.h
+enc/koi8_u.$(OBJEXT): internal/has/declspec_attribute.h
+enc/koi8_u.$(OBJEXT): internal/has/extension.h
+enc/koi8_u.$(OBJEXT): internal/has/feature.h
+enc/koi8_u.$(OBJEXT): internal/has/warning.h
+enc/koi8_u.$(OBJEXT): internal/stdalign.h
+enc/koi8_u.$(OBJEXT): internal/stdbool.h
+enc/koi8_u.$(OBJEXT): internal/token_paste.h
+enc/koi8_u.$(OBJEXT): internal/warning_push.h
+enc/koi8_u.$(OBJEXT): internal/xmalloc.h
+enc/koi8_u.$(OBJEXT): assert.h
+enc/koi8_u.$(OBJEXT): backward/2/assume.h
+enc/koi8_u.$(OBJEXT): backward/2/attributes.h
+enc/koi8_u.$(OBJEXT): backward/2/bool.h
+enc/koi8_u.$(OBJEXT): backward/2/gcc_version_since.h
+enc/koi8_u.$(OBJEXT): backward/2/long_long.h
+enc/koi8_u.$(OBJEXT): backward/2/stdalign.h
+enc/koi8_u.$(OBJEXT): backward/2/stdarg.h
 enc/koi8_u.$(OBJEXT): config.h
 enc/koi8_u.$(OBJEXT): defines.h
 enc/koi8_u.$(OBJEXT): enc/koi8_u.c
 enc/koi8_u.$(OBJEXT): missing.h
-enc/koi8_u.$(OBJEXT): oniguruma.h
-enc/shift_jis.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+enc/koi8_u.$(OBJEXT): onigmo.h
 enc/shift_jis.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/shift_jis.$(OBJEXT): $(top_srcdir)/regint.h
-enc/shift_jis.$(OBJEXT): backward.h
+enc/shift_jis.$(OBJEXT): internal/assume.h
+enc/shift_jis.$(OBJEXT): internal/attr/alloc_size.h
+enc/shift_jis.$(OBJEXT): internal/attr/cold.h
+enc/shift_jis.$(OBJEXT): internal/attr/const.h
+enc/shift_jis.$(OBJEXT): internal/attr/deprecated.h
+enc/shift_jis.$(OBJEXT): internal/attr/error.h
+enc/shift_jis.$(OBJEXT): internal/attr/forceinline.h
+enc/shift_jis.$(OBJEXT): internal/attr/format.h
+enc/shift_jis.$(OBJEXT): internal/attr/maybe_unused.h
+enc/shift_jis.$(OBJEXT): internal/attr/nodiscard.h
+enc/shift_jis.$(OBJEXT): internal/attr/noexcept.h
+enc/shift_jis.$(OBJEXT): internal/attr/noinline.h
+enc/shift_jis.$(OBJEXT): internal/attr/nonnull.h
+enc/shift_jis.$(OBJEXT): internal/attr/noreturn.h
+enc/shift_jis.$(OBJEXT): internal/attr/pure.h
+enc/shift_jis.$(OBJEXT): internal/attr/restrict.h
+enc/shift_jis.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/shift_jis.$(OBJEXT): internal/attr/warning.h
+enc/shift_jis.$(OBJEXT): internal/cast.h
+enc/shift_jis.$(OBJEXT): internal/compiler_is.h
+enc/shift_jis.$(OBJEXT): internal/compiler_is/apple.h
+enc/shift_jis.$(OBJEXT): internal/compiler_is/clang.h
+enc/shift_jis.$(OBJEXT): internal/compiler_is/gcc.h
+enc/shift_jis.$(OBJEXT): internal/compiler_is/intel.h
+enc/shift_jis.$(OBJEXT): internal/compiler_is/msvc.h
+enc/shift_jis.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/shift_jis.$(OBJEXT): internal/compiler_since.h
+enc/shift_jis.$(OBJEXT): internal/config.h
+enc/shift_jis.$(OBJEXT): internal/dllexport.h
+enc/shift_jis.$(OBJEXT): internal/dosish.h
+enc/shift_jis.$(OBJEXT): internal/has/attribute.h
+enc/shift_jis.$(OBJEXT): internal/has/builtin.h
+enc/shift_jis.$(OBJEXT): internal/has/c_attribute.h
+enc/shift_jis.$(OBJEXT): internal/has/cpp_attribute.h
+enc/shift_jis.$(OBJEXT): internal/has/declspec_attribute.h
+enc/shift_jis.$(OBJEXT): internal/has/extension.h
+enc/shift_jis.$(OBJEXT): internal/has/feature.h
+enc/shift_jis.$(OBJEXT): internal/has/warning.h
+enc/shift_jis.$(OBJEXT): internal/stdalign.h
+enc/shift_jis.$(OBJEXT): internal/stdbool.h
+enc/shift_jis.$(OBJEXT): internal/token_paste.h
+enc/shift_jis.$(OBJEXT): internal/warning_push.h
+enc/shift_jis.$(OBJEXT): internal/xmalloc.h
+enc/shift_jis.$(OBJEXT): assert.h
+enc/shift_jis.$(OBJEXT): backward/2/assume.h
+enc/shift_jis.$(OBJEXT): backward/2/attributes.h
+enc/shift_jis.$(OBJEXT): backward/2/bool.h
+enc/shift_jis.$(OBJEXT): backward/2/gcc_version_since.h
+enc/shift_jis.$(OBJEXT): backward/2/long_long.h
+enc/shift_jis.$(OBJEXT): backward/2/stdalign.h
+enc/shift_jis.$(OBJEXT): backward/2/stdarg.h
 enc/shift_jis.$(OBJEXT): config.h
 enc/shift_jis.$(OBJEXT): defines.h
 enc/shift_jis.$(OBJEXT): enc/jis/props.h
 enc/shift_jis.$(OBJEXT): enc/jis/props.kwd
 enc/shift_jis.$(OBJEXT): enc/shift_jis.c
-enc/shift_jis.$(OBJEXT): intern.h
+enc/shift_jis.$(OBJEXT): enc/shift_jis.h
 enc/shift_jis.$(OBJEXT): missing.h
-enc/shift_jis.$(OBJEXT): oniguruma.h
-enc/shift_jis.$(OBJEXT): st.h
-enc/shift_jis.$(OBJEXT): subst.h
+enc/shift_jis.$(OBJEXT): onigmo.h
 enc/trans/big5.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 enc/trans/big5.$(OBJEXT): $(top_srcdir)/transcode_data.h
+enc/trans/big5.$(OBJEXT): internal/anyargs.h
+enc/trans/big5.$(OBJEXT): internal/arithmetic.h
+enc/trans/big5.$(OBJEXT): internal/arithmetic/char.h
+enc/trans/big5.$(OBJEXT): internal/arithmetic/double.h
+enc/trans/big5.$(OBJEXT): internal/arithmetic/fixnum.h
+enc/trans/big5.$(OBJEXT): internal/arithmetic/gid_t.h
+enc/trans/big5.$(OBJEXT): internal/arithmetic/int.h
+enc/trans/big5.$(OBJEXT): internal/arithmetic/intptr_t.h
+enc/trans/big5.$(OBJEXT): internal/arithmetic/long.h
+enc/trans/big5.$(OBJEXT): internal/arithmetic/long_long.h
+enc/trans/big5.$(OBJEXT): internal/arithmetic/mode_t.h
+enc/trans/big5.$(OBJEXT): internal/arithmetic/off_t.h
+enc/trans/big5.$(OBJEXT): internal/arithmetic/pid_t.h
+enc/trans/big5.$(OBJEXT): internal/arithmetic/short.h
+enc/trans/big5.$(OBJEXT): internal/arithmetic/size_t.h
+enc/trans/big5.$(OBJEXT): internal/arithmetic/st_data_t.h
+enc/trans/big5.$(OBJEXT): internal/arithmetic/uid_t.h
+enc/trans/big5.$(OBJEXT): internal/assume.h
+enc/trans/big5.$(OBJEXT): internal/attr/alloc_size.h
+enc/trans/big5.$(OBJEXT): internal/attr/artificial.h
+enc/trans/big5.$(OBJEXT): internal/attr/cold.h
+enc/trans/big5.$(OBJEXT): internal/attr/const.h
+enc/trans/big5.$(OBJEXT): internal/attr/constexpr.h
+enc/trans/big5.$(OBJEXT): internal/attr/deprecated.h
+enc/trans/big5.$(OBJEXT): internal/attr/diagnose_if.h
+enc/trans/big5.$(OBJEXT): internal/attr/enum_extensibility.h
+enc/trans/big5.$(OBJEXT): internal/attr/error.h
+enc/trans/big5.$(OBJEXT): internal/attr/flag_enum.h
+enc/trans/big5.$(OBJEXT): internal/attr/forceinline.h
+enc/trans/big5.$(OBJEXT): internal/attr/format.h
+enc/trans/big5.$(OBJEXT): internal/attr/maybe_unused.h
+enc/trans/big5.$(OBJEXT): internal/attr/noalias.h
+enc/trans/big5.$(OBJEXT): internal/attr/nodiscard.h
+enc/trans/big5.$(OBJEXT): internal/attr/noexcept.h
+enc/trans/big5.$(OBJEXT): internal/attr/noinline.h
+enc/trans/big5.$(OBJEXT): internal/attr/nonnull.h
+enc/trans/big5.$(OBJEXT): internal/attr/noreturn.h
+enc/trans/big5.$(OBJEXT): internal/attr/pure.h
+enc/trans/big5.$(OBJEXT): internal/attr/restrict.h
+enc/trans/big5.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/trans/big5.$(OBJEXT): internal/attr/warning.h
+enc/trans/big5.$(OBJEXT): internal/attr/weakref.h
+enc/trans/big5.$(OBJEXT): internal/cast.h
+enc/trans/big5.$(OBJEXT): internal/compiler_is.h
+enc/trans/big5.$(OBJEXT): internal/compiler_is/apple.h
+enc/trans/big5.$(OBJEXT): internal/compiler_is/clang.h
+enc/trans/big5.$(OBJEXT): internal/compiler_is/gcc.h
+enc/trans/big5.$(OBJEXT): internal/compiler_is/intel.h
+enc/trans/big5.$(OBJEXT): internal/compiler_is/msvc.h
+enc/trans/big5.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/trans/big5.$(OBJEXT): internal/compiler_since.h
+enc/trans/big5.$(OBJEXT): internal/config.h
+enc/trans/big5.$(OBJEXT): internal/constant_p.h
+enc/trans/big5.$(OBJEXT): internal/core.h
+enc/trans/big5.$(OBJEXT): internal/core/rarray.h
+enc/trans/big5.$(OBJEXT): internal/core/rbasic.h
+enc/trans/big5.$(OBJEXT): internal/core/rbignum.h
+enc/trans/big5.$(OBJEXT): internal/core/rclass.h
+enc/trans/big5.$(OBJEXT): internal/core/rdata.h
+enc/trans/big5.$(OBJEXT): internal/core/rfile.h
+enc/trans/big5.$(OBJEXT): internal/core/rhash.h
+enc/trans/big5.$(OBJEXT): internal/core/robject.h
+enc/trans/big5.$(OBJEXT): internal/core/rregexp.h
+enc/trans/big5.$(OBJEXT): internal/core/rstring.h
+enc/trans/big5.$(OBJEXT): internal/core/rstruct.h
+enc/trans/big5.$(OBJEXT): internal/core/rtypeddata.h
+enc/trans/big5.$(OBJEXT): internal/ctype.h
+enc/trans/big5.$(OBJEXT): internal/dllexport.h
+enc/trans/big5.$(OBJEXT): internal/dosish.h
+enc/trans/big5.$(OBJEXT): internal/error.h
+enc/trans/big5.$(OBJEXT): internal/eval.h
+enc/trans/big5.$(OBJEXT): internal/event.h
+enc/trans/big5.$(OBJEXT): internal/fl_type.h
+enc/trans/big5.$(OBJEXT): internal/gc.h
+enc/trans/big5.$(OBJEXT): internal/glob.h
+enc/trans/big5.$(OBJEXT): internal/globals.h
+enc/trans/big5.$(OBJEXT): internal/has/attribute.h
+enc/trans/big5.$(OBJEXT): internal/has/builtin.h
+enc/trans/big5.$(OBJEXT): internal/has/c_attribute.h
+enc/trans/big5.$(OBJEXT): internal/has/cpp_attribute.h
+enc/trans/big5.$(OBJEXT): internal/has/declspec_attribute.h
+enc/trans/big5.$(OBJEXT): internal/has/extension.h
+enc/trans/big5.$(OBJEXT): internal/has/feature.h
+enc/trans/big5.$(OBJEXT): internal/has/warning.h
+enc/trans/big5.$(OBJEXT): internal/intern/array.h
+enc/trans/big5.$(OBJEXT): internal/intern/bignum.h
+enc/trans/big5.$(OBJEXT): internal/intern/class.h
+enc/trans/big5.$(OBJEXT): internal/intern/compar.h
+enc/trans/big5.$(OBJEXT): internal/intern/complex.h
+enc/trans/big5.$(OBJEXT): internal/intern/cont.h
+enc/trans/big5.$(OBJEXT): internal/intern/dir.h
+enc/trans/big5.$(OBJEXT): internal/intern/enum.h
+enc/trans/big5.$(OBJEXT): internal/intern/enumerator.h
+enc/trans/big5.$(OBJEXT): internal/intern/error.h
+enc/trans/big5.$(OBJEXT): internal/intern/eval.h
+enc/trans/big5.$(OBJEXT): internal/intern/file.h
+enc/trans/big5.$(OBJEXT): internal/intern/gc.h
+enc/trans/big5.$(OBJEXT): internal/intern/hash.h
+enc/trans/big5.$(OBJEXT): internal/intern/io.h
+enc/trans/big5.$(OBJEXT): internal/intern/load.h
+enc/trans/big5.$(OBJEXT): internal/intern/marshal.h
+enc/trans/big5.$(OBJEXT): internal/intern/numeric.h
+enc/trans/big5.$(OBJEXT): internal/intern/object.h
+enc/trans/big5.$(OBJEXT): internal/intern/parse.h
+enc/trans/big5.$(OBJEXT): internal/intern/proc.h
+enc/trans/big5.$(OBJEXT): internal/intern/process.h
+enc/trans/big5.$(OBJEXT): internal/intern/random.h
+enc/trans/big5.$(OBJEXT): internal/intern/range.h
+enc/trans/big5.$(OBJEXT): internal/intern/rational.h
+enc/trans/big5.$(OBJEXT): internal/intern/re.h
+enc/trans/big5.$(OBJEXT): internal/intern/ruby.h
+enc/trans/big5.$(OBJEXT): internal/intern/select.h
+enc/trans/big5.$(OBJEXT): internal/intern/select/largesize.h
+enc/trans/big5.$(OBJEXT): internal/intern/signal.h
+enc/trans/big5.$(OBJEXT): internal/intern/sprintf.h
+enc/trans/big5.$(OBJEXT): internal/intern/string.h
+enc/trans/big5.$(OBJEXT): internal/intern/struct.h
+enc/trans/big5.$(OBJEXT): internal/intern/thread.h
+enc/trans/big5.$(OBJEXT): internal/intern/time.h
+enc/trans/big5.$(OBJEXT): internal/intern/variable.h
+enc/trans/big5.$(OBJEXT): internal/intern/vm.h
+enc/trans/big5.$(OBJEXT): internal/interpreter.h
+enc/trans/big5.$(OBJEXT): internal/iterator.h
+enc/trans/big5.$(OBJEXT): internal/memory.h
+enc/trans/big5.$(OBJEXT): internal/method.h
+enc/trans/big5.$(OBJEXT): internal/module.h
+enc/trans/big5.$(OBJEXT): internal/newobj.h
+enc/trans/big5.$(OBJEXT): internal/rgengc.h
+enc/trans/big5.$(OBJEXT): internal/scan_args.h
+enc/trans/big5.$(OBJEXT): internal/special_consts.h
+enc/trans/big5.$(OBJEXT): internal/static_assert.h
+enc/trans/big5.$(OBJEXT): internal/stdalign.h
+enc/trans/big5.$(OBJEXT): internal/stdbool.h
+enc/trans/big5.$(OBJEXT): internal/symbol.h
+enc/trans/big5.$(OBJEXT): internal/token_paste.h
+enc/trans/big5.$(OBJEXT): internal/value.h
+enc/trans/big5.$(OBJEXT): internal/value_type.h
+enc/trans/big5.$(OBJEXT): internal/variable.h
+enc/trans/big5.$(OBJEXT): internal/warning_push.h
+enc/trans/big5.$(OBJEXT): internal/xmalloc.h
+enc/trans/big5.$(OBJEXT): assert.h
 enc/trans/big5.$(OBJEXT): backward.h
+enc/trans/big5.$(OBJEXT): backward/2/assume.h
+enc/trans/big5.$(OBJEXT): backward/2/attributes.h
+enc/trans/big5.$(OBJEXT): backward/2/bool.h
+enc/trans/big5.$(OBJEXT): backward/2/gcc_version_since.h
+enc/trans/big5.$(OBJEXT): backward/2/inttypes.h
+enc/trans/big5.$(OBJEXT): backward/2/limits.h
+enc/trans/big5.$(OBJEXT): backward/2/long_long.h
+enc/trans/big5.$(OBJEXT): backward/2/stdalign.h
+enc/trans/big5.$(OBJEXT): backward/2/stdarg.h
 enc/trans/big5.$(OBJEXT): config.h
 enc/trans/big5.$(OBJEXT): defines.h
 enc/trans/big5.$(OBJEXT): enc/trans/big5.c
@@ -405,9 +2385,319 @@ enc/trans/big5.$(OBJEXT): intern.h
 enc/trans/big5.$(OBJEXT): missing.h
 enc/trans/big5.$(OBJEXT): st.h
 enc/trans/big5.$(OBJEXT): subst.h
+enc/trans/cesu_8.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+enc/trans/cesu_8.$(OBJEXT): $(top_srcdir)/transcode_data.h
+enc/trans/cesu_8.$(OBJEXT): internal/anyargs.h
+enc/trans/cesu_8.$(OBJEXT): internal/arithmetic.h
+enc/trans/cesu_8.$(OBJEXT): internal/arithmetic/char.h
+enc/trans/cesu_8.$(OBJEXT): internal/arithmetic/double.h
+enc/trans/cesu_8.$(OBJEXT): internal/arithmetic/fixnum.h
+enc/trans/cesu_8.$(OBJEXT): internal/arithmetic/gid_t.h
+enc/trans/cesu_8.$(OBJEXT): internal/arithmetic/int.h
+enc/trans/cesu_8.$(OBJEXT): internal/arithmetic/intptr_t.h
+enc/trans/cesu_8.$(OBJEXT): internal/arithmetic/long.h
+enc/trans/cesu_8.$(OBJEXT): internal/arithmetic/long_long.h
+enc/trans/cesu_8.$(OBJEXT): internal/arithmetic/mode_t.h
+enc/trans/cesu_8.$(OBJEXT): internal/arithmetic/off_t.h
+enc/trans/cesu_8.$(OBJEXT): internal/arithmetic/pid_t.h
+enc/trans/cesu_8.$(OBJEXT): internal/arithmetic/short.h
+enc/trans/cesu_8.$(OBJEXT): internal/arithmetic/size_t.h
+enc/trans/cesu_8.$(OBJEXT): internal/arithmetic/st_data_t.h
+enc/trans/cesu_8.$(OBJEXT): internal/arithmetic/uid_t.h
+enc/trans/cesu_8.$(OBJEXT): internal/assume.h
+enc/trans/cesu_8.$(OBJEXT): internal/attr/alloc_size.h
+enc/trans/cesu_8.$(OBJEXT): internal/attr/artificial.h
+enc/trans/cesu_8.$(OBJEXT): internal/attr/cold.h
+enc/trans/cesu_8.$(OBJEXT): internal/attr/const.h
+enc/trans/cesu_8.$(OBJEXT): internal/attr/constexpr.h
+enc/trans/cesu_8.$(OBJEXT): internal/attr/deprecated.h
+enc/trans/cesu_8.$(OBJEXT): internal/attr/diagnose_if.h
+enc/trans/cesu_8.$(OBJEXT): internal/attr/enum_extensibility.h
+enc/trans/cesu_8.$(OBJEXT): internal/attr/error.h
+enc/trans/cesu_8.$(OBJEXT): internal/attr/flag_enum.h
+enc/trans/cesu_8.$(OBJEXT): internal/attr/forceinline.h
+enc/trans/cesu_8.$(OBJEXT): internal/attr/format.h
+enc/trans/cesu_8.$(OBJEXT): internal/attr/maybe_unused.h
+enc/trans/cesu_8.$(OBJEXT): internal/attr/noalias.h
+enc/trans/cesu_8.$(OBJEXT): internal/attr/nodiscard.h
+enc/trans/cesu_8.$(OBJEXT): internal/attr/noexcept.h
+enc/trans/cesu_8.$(OBJEXT): internal/attr/noinline.h
+enc/trans/cesu_8.$(OBJEXT): internal/attr/nonnull.h
+enc/trans/cesu_8.$(OBJEXT): internal/attr/noreturn.h
+enc/trans/cesu_8.$(OBJEXT): internal/attr/pure.h
+enc/trans/cesu_8.$(OBJEXT): internal/attr/restrict.h
+enc/trans/cesu_8.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/trans/cesu_8.$(OBJEXT): internal/attr/warning.h
+enc/trans/cesu_8.$(OBJEXT): internal/attr/weakref.h
+enc/trans/cesu_8.$(OBJEXT): internal/cast.h
+enc/trans/cesu_8.$(OBJEXT): internal/compiler_is.h
+enc/trans/cesu_8.$(OBJEXT): internal/compiler_is/apple.h
+enc/trans/cesu_8.$(OBJEXT): internal/compiler_is/clang.h
+enc/trans/cesu_8.$(OBJEXT): internal/compiler_is/gcc.h
+enc/trans/cesu_8.$(OBJEXT): internal/compiler_is/intel.h
+enc/trans/cesu_8.$(OBJEXT): internal/compiler_is/msvc.h
+enc/trans/cesu_8.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/trans/cesu_8.$(OBJEXT): internal/compiler_since.h
+enc/trans/cesu_8.$(OBJEXT): internal/config.h
+enc/trans/cesu_8.$(OBJEXT): internal/constant_p.h
+enc/trans/cesu_8.$(OBJEXT): internal/core.h
+enc/trans/cesu_8.$(OBJEXT): internal/core/rarray.h
+enc/trans/cesu_8.$(OBJEXT): internal/core/rbasic.h
+enc/trans/cesu_8.$(OBJEXT): internal/core/rbignum.h
+enc/trans/cesu_8.$(OBJEXT): internal/core/rclass.h
+enc/trans/cesu_8.$(OBJEXT): internal/core/rdata.h
+enc/trans/cesu_8.$(OBJEXT): internal/core/rfile.h
+enc/trans/cesu_8.$(OBJEXT): internal/core/rhash.h
+enc/trans/cesu_8.$(OBJEXT): internal/core/robject.h
+enc/trans/cesu_8.$(OBJEXT): internal/core/rregexp.h
+enc/trans/cesu_8.$(OBJEXT): internal/core/rstring.h
+enc/trans/cesu_8.$(OBJEXT): internal/core/rstruct.h
+enc/trans/cesu_8.$(OBJEXT): internal/core/rtypeddata.h
+enc/trans/cesu_8.$(OBJEXT): internal/ctype.h
+enc/trans/cesu_8.$(OBJEXT): internal/dllexport.h
+enc/trans/cesu_8.$(OBJEXT): internal/dosish.h
+enc/trans/cesu_8.$(OBJEXT): internal/error.h
+enc/trans/cesu_8.$(OBJEXT): internal/eval.h
+enc/trans/cesu_8.$(OBJEXT): internal/event.h
+enc/trans/cesu_8.$(OBJEXT): internal/fl_type.h
+enc/trans/cesu_8.$(OBJEXT): internal/gc.h
+enc/trans/cesu_8.$(OBJEXT): internal/glob.h
+enc/trans/cesu_8.$(OBJEXT): internal/globals.h
+enc/trans/cesu_8.$(OBJEXT): internal/has/attribute.h
+enc/trans/cesu_8.$(OBJEXT): internal/has/builtin.h
+enc/trans/cesu_8.$(OBJEXT): internal/has/c_attribute.h
+enc/trans/cesu_8.$(OBJEXT): internal/has/cpp_attribute.h
+enc/trans/cesu_8.$(OBJEXT): internal/has/declspec_attribute.h
+enc/trans/cesu_8.$(OBJEXT): internal/has/extension.h
+enc/trans/cesu_8.$(OBJEXT): internal/has/feature.h
+enc/trans/cesu_8.$(OBJEXT): internal/has/warning.h
+enc/trans/cesu_8.$(OBJEXT): internal/intern/array.h
+enc/trans/cesu_8.$(OBJEXT): internal/intern/bignum.h
+enc/trans/cesu_8.$(OBJEXT): internal/intern/class.h
+enc/trans/cesu_8.$(OBJEXT): internal/intern/compar.h
+enc/trans/cesu_8.$(OBJEXT): internal/intern/complex.h
+enc/trans/cesu_8.$(OBJEXT): internal/intern/cont.h
+enc/trans/cesu_8.$(OBJEXT): internal/intern/dir.h
+enc/trans/cesu_8.$(OBJEXT): internal/intern/enum.h
+enc/trans/cesu_8.$(OBJEXT): internal/intern/enumerator.h
+enc/trans/cesu_8.$(OBJEXT): internal/intern/error.h
+enc/trans/cesu_8.$(OBJEXT): internal/intern/eval.h
+enc/trans/cesu_8.$(OBJEXT): internal/intern/file.h
+enc/trans/cesu_8.$(OBJEXT): internal/intern/gc.h
+enc/trans/cesu_8.$(OBJEXT): internal/intern/hash.h
+enc/trans/cesu_8.$(OBJEXT): internal/intern/io.h
+enc/trans/cesu_8.$(OBJEXT): internal/intern/load.h
+enc/trans/cesu_8.$(OBJEXT): internal/intern/marshal.h
+enc/trans/cesu_8.$(OBJEXT): internal/intern/numeric.h
+enc/trans/cesu_8.$(OBJEXT): internal/intern/object.h
+enc/trans/cesu_8.$(OBJEXT): internal/intern/parse.h
+enc/trans/cesu_8.$(OBJEXT): internal/intern/proc.h
+enc/trans/cesu_8.$(OBJEXT): internal/intern/process.h
+enc/trans/cesu_8.$(OBJEXT): internal/intern/random.h
+enc/trans/cesu_8.$(OBJEXT): internal/intern/range.h
+enc/trans/cesu_8.$(OBJEXT): internal/intern/rational.h
+enc/trans/cesu_8.$(OBJEXT): internal/intern/re.h
+enc/trans/cesu_8.$(OBJEXT): internal/intern/ruby.h
+enc/trans/cesu_8.$(OBJEXT): internal/intern/select.h
+enc/trans/cesu_8.$(OBJEXT): internal/intern/select/largesize.h
+enc/trans/cesu_8.$(OBJEXT): internal/intern/signal.h
+enc/trans/cesu_8.$(OBJEXT): internal/intern/sprintf.h
+enc/trans/cesu_8.$(OBJEXT): internal/intern/string.h
+enc/trans/cesu_8.$(OBJEXT): internal/intern/struct.h
+enc/trans/cesu_8.$(OBJEXT): internal/intern/thread.h
+enc/trans/cesu_8.$(OBJEXT): internal/intern/time.h
+enc/trans/cesu_8.$(OBJEXT): internal/intern/variable.h
+enc/trans/cesu_8.$(OBJEXT): internal/intern/vm.h
+enc/trans/cesu_8.$(OBJEXT): internal/interpreter.h
+enc/trans/cesu_8.$(OBJEXT): internal/iterator.h
+enc/trans/cesu_8.$(OBJEXT): internal/memory.h
+enc/trans/cesu_8.$(OBJEXT): internal/method.h
+enc/trans/cesu_8.$(OBJEXT): internal/module.h
+enc/trans/cesu_8.$(OBJEXT): internal/newobj.h
+enc/trans/cesu_8.$(OBJEXT): internal/rgengc.h
+enc/trans/cesu_8.$(OBJEXT): internal/scan_args.h
+enc/trans/cesu_8.$(OBJEXT): internal/special_consts.h
+enc/trans/cesu_8.$(OBJEXT): internal/static_assert.h
+enc/trans/cesu_8.$(OBJEXT): internal/stdalign.h
+enc/trans/cesu_8.$(OBJEXT): internal/stdbool.h
+enc/trans/cesu_8.$(OBJEXT): internal/symbol.h
+enc/trans/cesu_8.$(OBJEXT): internal/token_paste.h
+enc/trans/cesu_8.$(OBJEXT): internal/value.h
+enc/trans/cesu_8.$(OBJEXT): internal/value_type.h
+enc/trans/cesu_8.$(OBJEXT): internal/variable.h
+enc/trans/cesu_8.$(OBJEXT): internal/warning_push.h
+enc/trans/cesu_8.$(OBJEXT): internal/xmalloc.h
+enc/trans/cesu_8.$(OBJEXT): assert.h
+enc/trans/cesu_8.$(OBJEXT): backward.h
+enc/trans/cesu_8.$(OBJEXT): backward/2/assume.h
+enc/trans/cesu_8.$(OBJEXT): backward/2/attributes.h
+enc/trans/cesu_8.$(OBJEXT): backward/2/bool.h
+enc/trans/cesu_8.$(OBJEXT): backward/2/gcc_version_since.h
+enc/trans/cesu_8.$(OBJEXT): backward/2/inttypes.h
+enc/trans/cesu_8.$(OBJEXT): backward/2/limits.h
+enc/trans/cesu_8.$(OBJEXT): backward/2/long_long.h
+enc/trans/cesu_8.$(OBJEXT): backward/2/stdalign.h
+enc/trans/cesu_8.$(OBJEXT): backward/2/stdarg.h
+enc/trans/cesu_8.$(OBJEXT): config.h
+enc/trans/cesu_8.$(OBJEXT): defines.h
+enc/trans/cesu_8.$(OBJEXT): enc/trans/cesu_8.c
+enc/trans/cesu_8.$(OBJEXT): intern.h
+enc/trans/cesu_8.$(OBJEXT): missing.h
+enc/trans/cesu_8.$(OBJEXT): st.h
+enc/trans/cesu_8.$(OBJEXT): subst.h
 enc/trans/chinese.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 enc/trans/chinese.$(OBJEXT): $(top_srcdir)/transcode_data.h
+enc/trans/chinese.$(OBJEXT): internal/anyargs.h
+enc/trans/chinese.$(OBJEXT): internal/arithmetic.h
+enc/trans/chinese.$(OBJEXT): internal/arithmetic/char.h
+enc/trans/chinese.$(OBJEXT): internal/arithmetic/double.h
+enc/trans/chinese.$(OBJEXT): internal/arithmetic/fixnum.h
+enc/trans/chinese.$(OBJEXT): internal/arithmetic/gid_t.h
+enc/trans/chinese.$(OBJEXT): internal/arithmetic/int.h
+enc/trans/chinese.$(OBJEXT): internal/arithmetic/intptr_t.h
+enc/trans/chinese.$(OBJEXT): internal/arithmetic/long.h
+enc/trans/chinese.$(OBJEXT): internal/arithmetic/long_long.h
+enc/trans/chinese.$(OBJEXT): internal/arithmetic/mode_t.h
+enc/trans/chinese.$(OBJEXT): internal/arithmetic/off_t.h
+enc/trans/chinese.$(OBJEXT): internal/arithmetic/pid_t.h
+enc/trans/chinese.$(OBJEXT): internal/arithmetic/short.h
+enc/trans/chinese.$(OBJEXT): internal/arithmetic/size_t.h
+enc/trans/chinese.$(OBJEXT): internal/arithmetic/st_data_t.h
+enc/trans/chinese.$(OBJEXT): internal/arithmetic/uid_t.h
+enc/trans/chinese.$(OBJEXT): internal/assume.h
+enc/trans/chinese.$(OBJEXT): internal/attr/alloc_size.h
+enc/trans/chinese.$(OBJEXT): internal/attr/artificial.h
+enc/trans/chinese.$(OBJEXT): internal/attr/cold.h
+enc/trans/chinese.$(OBJEXT): internal/attr/const.h
+enc/trans/chinese.$(OBJEXT): internal/attr/constexpr.h
+enc/trans/chinese.$(OBJEXT): internal/attr/deprecated.h
+enc/trans/chinese.$(OBJEXT): internal/attr/diagnose_if.h
+enc/trans/chinese.$(OBJEXT): internal/attr/enum_extensibility.h
+enc/trans/chinese.$(OBJEXT): internal/attr/error.h
+enc/trans/chinese.$(OBJEXT): internal/attr/flag_enum.h
+enc/trans/chinese.$(OBJEXT): internal/attr/forceinline.h
+enc/trans/chinese.$(OBJEXT): internal/attr/format.h
+enc/trans/chinese.$(OBJEXT): internal/attr/maybe_unused.h
+enc/trans/chinese.$(OBJEXT): internal/attr/noalias.h
+enc/trans/chinese.$(OBJEXT): internal/attr/nodiscard.h
+enc/trans/chinese.$(OBJEXT): internal/attr/noexcept.h
+enc/trans/chinese.$(OBJEXT): internal/attr/noinline.h
+enc/trans/chinese.$(OBJEXT): internal/attr/nonnull.h
+enc/trans/chinese.$(OBJEXT): internal/attr/noreturn.h
+enc/trans/chinese.$(OBJEXT): internal/attr/pure.h
+enc/trans/chinese.$(OBJEXT): internal/attr/restrict.h
+enc/trans/chinese.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/trans/chinese.$(OBJEXT): internal/attr/warning.h
+enc/trans/chinese.$(OBJEXT): internal/attr/weakref.h
+enc/trans/chinese.$(OBJEXT): internal/cast.h
+enc/trans/chinese.$(OBJEXT): internal/compiler_is.h
+enc/trans/chinese.$(OBJEXT): internal/compiler_is/apple.h
+enc/trans/chinese.$(OBJEXT): internal/compiler_is/clang.h
+enc/trans/chinese.$(OBJEXT): internal/compiler_is/gcc.h
+enc/trans/chinese.$(OBJEXT): internal/compiler_is/intel.h
+enc/trans/chinese.$(OBJEXT): internal/compiler_is/msvc.h
+enc/trans/chinese.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/trans/chinese.$(OBJEXT): internal/compiler_since.h
+enc/trans/chinese.$(OBJEXT): internal/config.h
+enc/trans/chinese.$(OBJEXT): internal/constant_p.h
+enc/trans/chinese.$(OBJEXT): internal/core.h
+enc/trans/chinese.$(OBJEXT): internal/core/rarray.h
+enc/trans/chinese.$(OBJEXT): internal/core/rbasic.h
+enc/trans/chinese.$(OBJEXT): internal/core/rbignum.h
+enc/trans/chinese.$(OBJEXT): internal/core/rclass.h
+enc/trans/chinese.$(OBJEXT): internal/core/rdata.h
+enc/trans/chinese.$(OBJEXT): internal/core/rfile.h
+enc/trans/chinese.$(OBJEXT): internal/core/rhash.h
+enc/trans/chinese.$(OBJEXT): internal/core/robject.h
+enc/trans/chinese.$(OBJEXT): internal/core/rregexp.h
+enc/trans/chinese.$(OBJEXT): internal/core/rstring.h
+enc/trans/chinese.$(OBJEXT): internal/core/rstruct.h
+enc/trans/chinese.$(OBJEXT): internal/core/rtypeddata.h
+enc/trans/chinese.$(OBJEXT): internal/ctype.h
+enc/trans/chinese.$(OBJEXT): internal/dllexport.h
+enc/trans/chinese.$(OBJEXT): internal/dosish.h
+enc/trans/chinese.$(OBJEXT): internal/error.h
+enc/trans/chinese.$(OBJEXT): internal/eval.h
+enc/trans/chinese.$(OBJEXT): internal/event.h
+enc/trans/chinese.$(OBJEXT): internal/fl_type.h
+enc/trans/chinese.$(OBJEXT): internal/gc.h
+enc/trans/chinese.$(OBJEXT): internal/glob.h
+enc/trans/chinese.$(OBJEXT): internal/globals.h
+enc/trans/chinese.$(OBJEXT): internal/has/attribute.h
+enc/trans/chinese.$(OBJEXT): internal/has/builtin.h
+enc/trans/chinese.$(OBJEXT): internal/has/c_attribute.h
+enc/trans/chinese.$(OBJEXT): internal/has/cpp_attribute.h
+enc/trans/chinese.$(OBJEXT): internal/has/declspec_attribute.h
+enc/trans/chinese.$(OBJEXT): internal/has/extension.h
+enc/trans/chinese.$(OBJEXT): internal/has/feature.h
+enc/trans/chinese.$(OBJEXT): internal/has/warning.h
+enc/trans/chinese.$(OBJEXT): internal/intern/array.h
+enc/trans/chinese.$(OBJEXT): internal/intern/bignum.h
+enc/trans/chinese.$(OBJEXT): internal/intern/class.h
+enc/trans/chinese.$(OBJEXT): internal/intern/compar.h
+enc/trans/chinese.$(OBJEXT): internal/intern/complex.h
+enc/trans/chinese.$(OBJEXT): internal/intern/cont.h
+enc/trans/chinese.$(OBJEXT): internal/intern/dir.h
+enc/trans/chinese.$(OBJEXT): internal/intern/enum.h
+enc/trans/chinese.$(OBJEXT): internal/intern/enumerator.h
+enc/trans/chinese.$(OBJEXT): internal/intern/error.h
+enc/trans/chinese.$(OBJEXT): internal/intern/eval.h
+enc/trans/chinese.$(OBJEXT): internal/intern/file.h
+enc/trans/chinese.$(OBJEXT): internal/intern/gc.h
+enc/trans/chinese.$(OBJEXT): internal/intern/hash.h
+enc/trans/chinese.$(OBJEXT): internal/intern/io.h
+enc/trans/chinese.$(OBJEXT): internal/intern/load.h
+enc/trans/chinese.$(OBJEXT): internal/intern/marshal.h
+enc/trans/chinese.$(OBJEXT): internal/intern/numeric.h
+enc/trans/chinese.$(OBJEXT): internal/intern/object.h
+enc/trans/chinese.$(OBJEXT): internal/intern/parse.h
+enc/trans/chinese.$(OBJEXT): internal/intern/proc.h
+enc/trans/chinese.$(OBJEXT): internal/intern/process.h
+enc/trans/chinese.$(OBJEXT): internal/intern/random.h
+enc/trans/chinese.$(OBJEXT): internal/intern/range.h
+enc/trans/chinese.$(OBJEXT): internal/intern/rational.h
+enc/trans/chinese.$(OBJEXT): internal/intern/re.h
+enc/trans/chinese.$(OBJEXT): internal/intern/ruby.h
+enc/trans/chinese.$(OBJEXT): internal/intern/select.h
+enc/trans/chinese.$(OBJEXT): internal/intern/select/largesize.h
+enc/trans/chinese.$(OBJEXT): internal/intern/signal.h
+enc/trans/chinese.$(OBJEXT): internal/intern/sprintf.h
+enc/trans/chinese.$(OBJEXT): internal/intern/string.h
+enc/trans/chinese.$(OBJEXT): internal/intern/struct.h
+enc/trans/chinese.$(OBJEXT): internal/intern/thread.h
+enc/trans/chinese.$(OBJEXT): internal/intern/time.h
+enc/trans/chinese.$(OBJEXT): internal/intern/variable.h
+enc/trans/chinese.$(OBJEXT): internal/intern/vm.h
+enc/trans/chinese.$(OBJEXT): internal/interpreter.h
+enc/trans/chinese.$(OBJEXT): internal/iterator.h
+enc/trans/chinese.$(OBJEXT): internal/memory.h
+enc/trans/chinese.$(OBJEXT): internal/method.h
+enc/trans/chinese.$(OBJEXT): internal/module.h
+enc/trans/chinese.$(OBJEXT): internal/newobj.h
+enc/trans/chinese.$(OBJEXT): internal/rgengc.h
+enc/trans/chinese.$(OBJEXT): internal/scan_args.h
+enc/trans/chinese.$(OBJEXT): internal/special_consts.h
+enc/trans/chinese.$(OBJEXT): internal/static_assert.h
+enc/trans/chinese.$(OBJEXT): internal/stdalign.h
+enc/trans/chinese.$(OBJEXT): internal/stdbool.h
+enc/trans/chinese.$(OBJEXT): internal/symbol.h
+enc/trans/chinese.$(OBJEXT): internal/token_paste.h
+enc/trans/chinese.$(OBJEXT): internal/value.h
+enc/trans/chinese.$(OBJEXT): internal/value_type.h
+enc/trans/chinese.$(OBJEXT): internal/variable.h
+enc/trans/chinese.$(OBJEXT): internal/warning_push.h
+enc/trans/chinese.$(OBJEXT): internal/xmalloc.h
+enc/trans/chinese.$(OBJEXT): assert.h
 enc/trans/chinese.$(OBJEXT): backward.h
+enc/trans/chinese.$(OBJEXT): backward/2/assume.h
+enc/trans/chinese.$(OBJEXT): backward/2/attributes.h
+enc/trans/chinese.$(OBJEXT): backward/2/bool.h
+enc/trans/chinese.$(OBJEXT): backward/2/gcc_version_since.h
+enc/trans/chinese.$(OBJEXT): backward/2/inttypes.h
+enc/trans/chinese.$(OBJEXT): backward/2/limits.h
+enc/trans/chinese.$(OBJEXT): backward/2/long_long.h
+enc/trans/chinese.$(OBJEXT): backward/2/stdalign.h
+enc/trans/chinese.$(OBJEXT): backward/2/stdarg.h
 enc/trans/chinese.$(OBJEXT): config.h
 enc/trans/chinese.$(OBJEXT): defines.h
 enc/trans/chinese.$(OBJEXT): enc/trans/chinese.c
@@ -417,7 +2707,157 @@ enc/trans/chinese.$(OBJEXT): st.h
 enc/trans/chinese.$(OBJEXT): subst.h
 enc/trans/ebcdic.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 enc/trans/ebcdic.$(OBJEXT): $(top_srcdir)/transcode_data.h
+enc/trans/ebcdic.$(OBJEXT): internal/anyargs.h
+enc/trans/ebcdic.$(OBJEXT): internal/arithmetic.h
+enc/trans/ebcdic.$(OBJEXT): internal/arithmetic/char.h
+enc/trans/ebcdic.$(OBJEXT): internal/arithmetic/double.h
+enc/trans/ebcdic.$(OBJEXT): internal/arithmetic/fixnum.h
+enc/trans/ebcdic.$(OBJEXT): internal/arithmetic/gid_t.h
+enc/trans/ebcdic.$(OBJEXT): internal/arithmetic/int.h
+enc/trans/ebcdic.$(OBJEXT): internal/arithmetic/intptr_t.h
+enc/trans/ebcdic.$(OBJEXT): internal/arithmetic/long.h
+enc/trans/ebcdic.$(OBJEXT): internal/arithmetic/long_long.h
+enc/trans/ebcdic.$(OBJEXT): internal/arithmetic/mode_t.h
+enc/trans/ebcdic.$(OBJEXT): internal/arithmetic/off_t.h
+enc/trans/ebcdic.$(OBJEXT): internal/arithmetic/pid_t.h
+enc/trans/ebcdic.$(OBJEXT): internal/arithmetic/short.h
+enc/trans/ebcdic.$(OBJEXT): internal/arithmetic/size_t.h
+enc/trans/ebcdic.$(OBJEXT): internal/arithmetic/st_data_t.h
+enc/trans/ebcdic.$(OBJEXT): internal/arithmetic/uid_t.h
+enc/trans/ebcdic.$(OBJEXT): internal/assume.h
+enc/trans/ebcdic.$(OBJEXT): internal/attr/alloc_size.h
+enc/trans/ebcdic.$(OBJEXT): internal/attr/artificial.h
+enc/trans/ebcdic.$(OBJEXT): internal/attr/cold.h
+enc/trans/ebcdic.$(OBJEXT): internal/attr/const.h
+enc/trans/ebcdic.$(OBJEXT): internal/attr/constexpr.h
+enc/trans/ebcdic.$(OBJEXT): internal/attr/deprecated.h
+enc/trans/ebcdic.$(OBJEXT): internal/attr/diagnose_if.h
+enc/trans/ebcdic.$(OBJEXT): internal/attr/enum_extensibility.h
+enc/trans/ebcdic.$(OBJEXT): internal/attr/error.h
+enc/trans/ebcdic.$(OBJEXT): internal/attr/flag_enum.h
+enc/trans/ebcdic.$(OBJEXT): internal/attr/forceinline.h
+enc/trans/ebcdic.$(OBJEXT): internal/attr/format.h
+enc/trans/ebcdic.$(OBJEXT): internal/attr/maybe_unused.h
+enc/trans/ebcdic.$(OBJEXT): internal/attr/noalias.h
+enc/trans/ebcdic.$(OBJEXT): internal/attr/nodiscard.h
+enc/trans/ebcdic.$(OBJEXT): internal/attr/noexcept.h
+enc/trans/ebcdic.$(OBJEXT): internal/attr/noinline.h
+enc/trans/ebcdic.$(OBJEXT): internal/attr/nonnull.h
+enc/trans/ebcdic.$(OBJEXT): internal/attr/noreturn.h
+enc/trans/ebcdic.$(OBJEXT): internal/attr/pure.h
+enc/trans/ebcdic.$(OBJEXT): internal/attr/restrict.h
+enc/trans/ebcdic.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/trans/ebcdic.$(OBJEXT): internal/attr/warning.h
+enc/trans/ebcdic.$(OBJEXT): internal/attr/weakref.h
+enc/trans/ebcdic.$(OBJEXT): internal/cast.h
+enc/trans/ebcdic.$(OBJEXT): internal/compiler_is.h
+enc/trans/ebcdic.$(OBJEXT): internal/compiler_is/apple.h
+enc/trans/ebcdic.$(OBJEXT): internal/compiler_is/clang.h
+enc/trans/ebcdic.$(OBJEXT): internal/compiler_is/gcc.h
+enc/trans/ebcdic.$(OBJEXT): internal/compiler_is/intel.h
+enc/trans/ebcdic.$(OBJEXT): internal/compiler_is/msvc.h
+enc/trans/ebcdic.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/trans/ebcdic.$(OBJEXT): internal/compiler_since.h
+enc/trans/ebcdic.$(OBJEXT): internal/config.h
+enc/trans/ebcdic.$(OBJEXT): internal/constant_p.h
+enc/trans/ebcdic.$(OBJEXT): internal/core.h
+enc/trans/ebcdic.$(OBJEXT): internal/core/rarray.h
+enc/trans/ebcdic.$(OBJEXT): internal/core/rbasic.h
+enc/trans/ebcdic.$(OBJEXT): internal/core/rbignum.h
+enc/trans/ebcdic.$(OBJEXT): internal/core/rclass.h
+enc/trans/ebcdic.$(OBJEXT): internal/core/rdata.h
+enc/trans/ebcdic.$(OBJEXT): internal/core/rfile.h
+enc/trans/ebcdic.$(OBJEXT): internal/core/rhash.h
+enc/trans/ebcdic.$(OBJEXT): internal/core/robject.h
+enc/trans/ebcdic.$(OBJEXT): internal/core/rregexp.h
+enc/trans/ebcdic.$(OBJEXT): internal/core/rstring.h
+enc/trans/ebcdic.$(OBJEXT): internal/core/rstruct.h
+enc/trans/ebcdic.$(OBJEXT): internal/core/rtypeddata.h
+enc/trans/ebcdic.$(OBJEXT): internal/ctype.h
+enc/trans/ebcdic.$(OBJEXT): internal/dllexport.h
+enc/trans/ebcdic.$(OBJEXT): internal/dosish.h
+enc/trans/ebcdic.$(OBJEXT): internal/error.h
+enc/trans/ebcdic.$(OBJEXT): internal/eval.h
+enc/trans/ebcdic.$(OBJEXT): internal/event.h
+enc/trans/ebcdic.$(OBJEXT): internal/fl_type.h
+enc/trans/ebcdic.$(OBJEXT): internal/gc.h
+enc/trans/ebcdic.$(OBJEXT): internal/glob.h
+enc/trans/ebcdic.$(OBJEXT): internal/globals.h
+enc/trans/ebcdic.$(OBJEXT): internal/has/attribute.h
+enc/trans/ebcdic.$(OBJEXT): internal/has/builtin.h
+enc/trans/ebcdic.$(OBJEXT): internal/has/c_attribute.h
+enc/trans/ebcdic.$(OBJEXT): internal/has/cpp_attribute.h
+enc/trans/ebcdic.$(OBJEXT): internal/has/declspec_attribute.h
+enc/trans/ebcdic.$(OBJEXT): internal/has/extension.h
+enc/trans/ebcdic.$(OBJEXT): internal/has/feature.h
+enc/trans/ebcdic.$(OBJEXT): internal/has/warning.h
+enc/trans/ebcdic.$(OBJEXT): internal/intern/array.h
+enc/trans/ebcdic.$(OBJEXT): internal/intern/bignum.h
+enc/trans/ebcdic.$(OBJEXT): internal/intern/class.h
+enc/trans/ebcdic.$(OBJEXT): internal/intern/compar.h
+enc/trans/ebcdic.$(OBJEXT): internal/intern/complex.h
+enc/trans/ebcdic.$(OBJEXT): internal/intern/cont.h
+enc/trans/ebcdic.$(OBJEXT): internal/intern/dir.h
+enc/trans/ebcdic.$(OBJEXT): internal/intern/enum.h
+enc/trans/ebcdic.$(OBJEXT): internal/intern/enumerator.h
+enc/trans/ebcdic.$(OBJEXT): internal/intern/error.h
+enc/trans/ebcdic.$(OBJEXT): internal/intern/eval.h
+enc/trans/ebcdic.$(OBJEXT): internal/intern/file.h
+enc/trans/ebcdic.$(OBJEXT): internal/intern/gc.h
+enc/trans/ebcdic.$(OBJEXT): internal/intern/hash.h
+enc/trans/ebcdic.$(OBJEXT): internal/intern/io.h
+enc/trans/ebcdic.$(OBJEXT): internal/intern/load.h
+enc/trans/ebcdic.$(OBJEXT): internal/intern/marshal.h
+enc/trans/ebcdic.$(OBJEXT): internal/intern/numeric.h
+enc/trans/ebcdic.$(OBJEXT): internal/intern/object.h
+enc/trans/ebcdic.$(OBJEXT): internal/intern/parse.h
+enc/trans/ebcdic.$(OBJEXT): internal/intern/proc.h
+enc/trans/ebcdic.$(OBJEXT): internal/intern/process.h
+enc/trans/ebcdic.$(OBJEXT): internal/intern/random.h
+enc/trans/ebcdic.$(OBJEXT): internal/intern/range.h
+enc/trans/ebcdic.$(OBJEXT): internal/intern/rational.h
+enc/trans/ebcdic.$(OBJEXT): internal/intern/re.h
+enc/trans/ebcdic.$(OBJEXT): internal/intern/ruby.h
+enc/trans/ebcdic.$(OBJEXT): internal/intern/select.h
+enc/trans/ebcdic.$(OBJEXT): internal/intern/select/largesize.h
+enc/trans/ebcdic.$(OBJEXT): internal/intern/signal.h
+enc/trans/ebcdic.$(OBJEXT): internal/intern/sprintf.h
+enc/trans/ebcdic.$(OBJEXT): internal/intern/string.h
+enc/trans/ebcdic.$(OBJEXT): internal/intern/struct.h
+enc/trans/ebcdic.$(OBJEXT): internal/intern/thread.h
+enc/trans/ebcdic.$(OBJEXT): internal/intern/time.h
+enc/trans/ebcdic.$(OBJEXT): internal/intern/variable.h
+enc/trans/ebcdic.$(OBJEXT): internal/intern/vm.h
+enc/trans/ebcdic.$(OBJEXT): internal/interpreter.h
+enc/trans/ebcdic.$(OBJEXT): internal/iterator.h
+enc/trans/ebcdic.$(OBJEXT): internal/memory.h
+enc/trans/ebcdic.$(OBJEXT): internal/method.h
+enc/trans/ebcdic.$(OBJEXT): internal/module.h
+enc/trans/ebcdic.$(OBJEXT): internal/newobj.h
+enc/trans/ebcdic.$(OBJEXT): internal/rgengc.h
+enc/trans/ebcdic.$(OBJEXT): internal/scan_args.h
+enc/trans/ebcdic.$(OBJEXT): internal/special_consts.h
+enc/trans/ebcdic.$(OBJEXT): internal/static_assert.h
+enc/trans/ebcdic.$(OBJEXT): internal/stdalign.h
+enc/trans/ebcdic.$(OBJEXT): internal/stdbool.h
+enc/trans/ebcdic.$(OBJEXT): internal/symbol.h
+enc/trans/ebcdic.$(OBJEXT): internal/token_paste.h
+enc/trans/ebcdic.$(OBJEXT): internal/value.h
+enc/trans/ebcdic.$(OBJEXT): internal/value_type.h
+enc/trans/ebcdic.$(OBJEXT): internal/variable.h
+enc/trans/ebcdic.$(OBJEXT): internal/warning_push.h
+enc/trans/ebcdic.$(OBJEXT): internal/xmalloc.h
+enc/trans/ebcdic.$(OBJEXT): assert.h
 enc/trans/ebcdic.$(OBJEXT): backward.h
+enc/trans/ebcdic.$(OBJEXT): backward/2/assume.h
+enc/trans/ebcdic.$(OBJEXT): backward/2/attributes.h
+enc/trans/ebcdic.$(OBJEXT): backward/2/bool.h
+enc/trans/ebcdic.$(OBJEXT): backward/2/gcc_version_since.h
+enc/trans/ebcdic.$(OBJEXT): backward/2/inttypes.h
+enc/trans/ebcdic.$(OBJEXT): backward/2/limits.h
+enc/trans/ebcdic.$(OBJEXT): backward/2/long_long.h
+enc/trans/ebcdic.$(OBJEXT): backward/2/stdalign.h
+enc/trans/ebcdic.$(OBJEXT): backward/2/stdarg.h
 enc/trans/ebcdic.$(OBJEXT): config.h
 enc/trans/ebcdic.$(OBJEXT): defines.h
 enc/trans/ebcdic.$(OBJEXT): enc/trans/ebcdic.c
@@ -427,7 +2867,157 @@ enc/trans/ebcdic.$(OBJEXT): st.h
 enc/trans/ebcdic.$(OBJEXT): subst.h
 enc/trans/emoji.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 enc/trans/emoji.$(OBJEXT): $(top_srcdir)/transcode_data.h
+enc/trans/emoji.$(OBJEXT): internal/anyargs.h
+enc/trans/emoji.$(OBJEXT): internal/arithmetic.h
+enc/trans/emoji.$(OBJEXT): internal/arithmetic/char.h
+enc/trans/emoji.$(OBJEXT): internal/arithmetic/double.h
+enc/trans/emoji.$(OBJEXT): internal/arithmetic/fixnum.h
+enc/trans/emoji.$(OBJEXT): internal/arithmetic/gid_t.h
+enc/trans/emoji.$(OBJEXT): internal/arithmetic/int.h
+enc/trans/emoji.$(OBJEXT): internal/arithmetic/intptr_t.h
+enc/trans/emoji.$(OBJEXT): internal/arithmetic/long.h
+enc/trans/emoji.$(OBJEXT): internal/arithmetic/long_long.h
+enc/trans/emoji.$(OBJEXT): internal/arithmetic/mode_t.h
+enc/trans/emoji.$(OBJEXT): internal/arithmetic/off_t.h
+enc/trans/emoji.$(OBJEXT): internal/arithmetic/pid_t.h
+enc/trans/emoji.$(OBJEXT): internal/arithmetic/short.h
+enc/trans/emoji.$(OBJEXT): internal/arithmetic/size_t.h
+enc/trans/emoji.$(OBJEXT): internal/arithmetic/st_data_t.h
+enc/trans/emoji.$(OBJEXT): internal/arithmetic/uid_t.h
+enc/trans/emoji.$(OBJEXT): internal/assume.h
+enc/trans/emoji.$(OBJEXT): internal/attr/alloc_size.h
+enc/trans/emoji.$(OBJEXT): internal/attr/artificial.h
+enc/trans/emoji.$(OBJEXT): internal/attr/cold.h
+enc/trans/emoji.$(OBJEXT): internal/attr/const.h
+enc/trans/emoji.$(OBJEXT): internal/attr/constexpr.h
+enc/trans/emoji.$(OBJEXT): internal/attr/deprecated.h
+enc/trans/emoji.$(OBJEXT): internal/attr/diagnose_if.h
+enc/trans/emoji.$(OBJEXT): internal/attr/enum_extensibility.h
+enc/trans/emoji.$(OBJEXT): internal/attr/error.h
+enc/trans/emoji.$(OBJEXT): internal/attr/flag_enum.h
+enc/trans/emoji.$(OBJEXT): internal/attr/forceinline.h
+enc/trans/emoji.$(OBJEXT): internal/attr/format.h
+enc/trans/emoji.$(OBJEXT): internal/attr/maybe_unused.h
+enc/trans/emoji.$(OBJEXT): internal/attr/noalias.h
+enc/trans/emoji.$(OBJEXT): internal/attr/nodiscard.h
+enc/trans/emoji.$(OBJEXT): internal/attr/noexcept.h
+enc/trans/emoji.$(OBJEXT): internal/attr/noinline.h
+enc/trans/emoji.$(OBJEXT): internal/attr/nonnull.h
+enc/trans/emoji.$(OBJEXT): internal/attr/noreturn.h
+enc/trans/emoji.$(OBJEXT): internal/attr/pure.h
+enc/trans/emoji.$(OBJEXT): internal/attr/restrict.h
+enc/trans/emoji.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/trans/emoji.$(OBJEXT): internal/attr/warning.h
+enc/trans/emoji.$(OBJEXT): internal/attr/weakref.h
+enc/trans/emoji.$(OBJEXT): internal/cast.h
+enc/trans/emoji.$(OBJEXT): internal/compiler_is.h
+enc/trans/emoji.$(OBJEXT): internal/compiler_is/apple.h
+enc/trans/emoji.$(OBJEXT): internal/compiler_is/clang.h
+enc/trans/emoji.$(OBJEXT): internal/compiler_is/gcc.h
+enc/trans/emoji.$(OBJEXT): internal/compiler_is/intel.h
+enc/trans/emoji.$(OBJEXT): internal/compiler_is/msvc.h
+enc/trans/emoji.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/trans/emoji.$(OBJEXT): internal/compiler_since.h
+enc/trans/emoji.$(OBJEXT): internal/config.h
+enc/trans/emoji.$(OBJEXT): internal/constant_p.h
+enc/trans/emoji.$(OBJEXT): internal/core.h
+enc/trans/emoji.$(OBJEXT): internal/core/rarray.h
+enc/trans/emoji.$(OBJEXT): internal/core/rbasic.h
+enc/trans/emoji.$(OBJEXT): internal/core/rbignum.h
+enc/trans/emoji.$(OBJEXT): internal/core/rclass.h
+enc/trans/emoji.$(OBJEXT): internal/core/rdata.h
+enc/trans/emoji.$(OBJEXT): internal/core/rfile.h
+enc/trans/emoji.$(OBJEXT): internal/core/rhash.h
+enc/trans/emoji.$(OBJEXT): internal/core/robject.h
+enc/trans/emoji.$(OBJEXT): internal/core/rregexp.h
+enc/trans/emoji.$(OBJEXT): internal/core/rstring.h
+enc/trans/emoji.$(OBJEXT): internal/core/rstruct.h
+enc/trans/emoji.$(OBJEXT): internal/core/rtypeddata.h
+enc/trans/emoji.$(OBJEXT): internal/ctype.h
+enc/trans/emoji.$(OBJEXT): internal/dllexport.h
+enc/trans/emoji.$(OBJEXT): internal/dosish.h
+enc/trans/emoji.$(OBJEXT): internal/error.h
+enc/trans/emoji.$(OBJEXT): internal/eval.h
+enc/trans/emoji.$(OBJEXT): internal/event.h
+enc/trans/emoji.$(OBJEXT): internal/fl_type.h
+enc/trans/emoji.$(OBJEXT): internal/gc.h
+enc/trans/emoji.$(OBJEXT): internal/glob.h
+enc/trans/emoji.$(OBJEXT): internal/globals.h
+enc/trans/emoji.$(OBJEXT): internal/has/attribute.h
+enc/trans/emoji.$(OBJEXT): internal/has/builtin.h
+enc/trans/emoji.$(OBJEXT): internal/has/c_attribute.h
+enc/trans/emoji.$(OBJEXT): internal/has/cpp_attribute.h
+enc/trans/emoji.$(OBJEXT): internal/has/declspec_attribute.h
+enc/trans/emoji.$(OBJEXT): internal/has/extension.h
+enc/trans/emoji.$(OBJEXT): internal/has/feature.h
+enc/trans/emoji.$(OBJEXT): internal/has/warning.h
+enc/trans/emoji.$(OBJEXT): internal/intern/array.h
+enc/trans/emoji.$(OBJEXT): internal/intern/bignum.h
+enc/trans/emoji.$(OBJEXT): internal/intern/class.h
+enc/trans/emoji.$(OBJEXT): internal/intern/compar.h
+enc/trans/emoji.$(OBJEXT): internal/intern/complex.h
+enc/trans/emoji.$(OBJEXT): internal/intern/cont.h
+enc/trans/emoji.$(OBJEXT): internal/intern/dir.h
+enc/trans/emoji.$(OBJEXT): internal/intern/enum.h
+enc/trans/emoji.$(OBJEXT): internal/intern/enumerator.h
+enc/trans/emoji.$(OBJEXT): internal/intern/error.h
+enc/trans/emoji.$(OBJEXT): internal/intern/eval.h
+enc/trans/emoji.$(OBJEXT): internal/intern/file.h
+enc/trans/emoji.$(OBJEXT): internal/intern/gc.h
+enc/trans/emoji.$(OBJEXT): internal/intern/hash.h
+enc/trans/emoji.$(OBJEXT): internal/intern/io.h
+enc/trans/emoji.$(OBJEXT): internal/intern/load.h
+enc/trans/emoji.$(OBJEXT): internal/intern/marshal.h
+enc/trans/emoji.$(OBJEXT): internal/intern/numeric.h
+enc/trans/emoji.$(OBJEXT): internal/intern/object.h
+enc/trans/emoji.$(OBJEXT): internal/intern/parse.h
+enc/trans/emoji.$(OBJEXT): internal/intern/proc.h
+enc/trans/emoji.$(OBJEXT): internal/intern/process.h
+enc/trans/emoji.$(OBJEXT): internal/intern/random.h
+enc/trans/emoji.$(OBJEXT): internal/intern/range.h
+enc/trans/emoji.$(OBJEXT): internal/intern/rational.h
+enc/trans/emoji.$(OBJEXT): internal/intern/re.h
+enc/trans/emoji.$(OBJEXT): internal/intern/ruby.h
+enc/trans/emoji.$(OBJEXT): internal/intern/select.h
+enc/trans/emoji.$(OBJEXT): internal/intern/select/largesize.h
+enc/trans/emoji.$(OBJEXT): internal/intern/signal.h
+enc/trans/emoji.$(OBJEXT): internal/intern/sprintf.h
+enc/trans/emoji.$(OBJEXT): internal/intern/string.h
+enc/trans/emoji.$(OBJEXT): internal/intern/struct.h
+enc/trans/emoji.$(OBJEXT): internal/intern/thread.h
+enc/trans/emoji.$(OBJEXT): internal/intern/time.h
+enc/trans/emoji.$(OBJEXT): internal/intern/variable.h
+enc/trans/emoji.$(OBJEXT): internal/intern/vm.h
+enc/trans/emoji.$(OBJEXT): internal/interpreter.h
+enc/trans/emoji.$(OBJEXT): internal/iterator.h
+enc/trans/emoji.$(OBJEXT): internal/memory.h
+enc/trans/emoji.$(OBJEXT): internal/method.h
+enc/trans/emoji.$(OBJEXT): internal/module.h
+enc/trans/emoji.$(OBJEXT): internal/newobj.h
+enc/trans/emoji.$(OBJEXT): internal/rgengc.h
+enc/trans/emoji.$(OBJEXT): internal/scan_args.h
+enc/trans/emoji.$(OBJEXT): internal/special_consts.h
+enc/trans/emoji.$(OBJEXT): internal/static_assert.h
+enc/trans/emoji.$(OBJEXT): internal/stdalign.h
+enc/trans/emoji.$(OBJEXT): internal/stdbool.h
+enc/trans/emoji.$(OBJEXT): internal/symbol.h
+enc/trans/emoji.$(OBJEXT): internal/token_paste.h
+enc/trans/emoji.$(OBJEXT): internal/value.h
+enc/trans/emoji.$(OBJEXT): internal/value_type.h
+enc/trans/emoji.$(OBJEXT): internal/variable.h
+enc/trans/emoji.$(OBJEXT): internal/warning_push.h
+enc/trans/emoji.$(OBJEXT): internal/xmalloc.h
+enc/trans/emoji.$(OBJEXT): assert.h
 enc/trans/emoji.$(OBJEXT): backward.h
+enc/trans/emoji.$(OBJEXT): backward/2/assume.h
+enc/trans/emoji.$(OBJEXT): backward/2/attributes.h
+enc/trans/emoji.$(OBJEXT): backward/2/bool.h
+enc/trans/emoji.$(OBJEXT): backward/2/gcc_version_since.h
+enc/trans/emoji.$(OBJEXT): backward/2/inttypes.h
+enc/trans/emoji.$(OBJEXT): backward/2/limits.h
+enc/trans/emoji.$(OBJEXT): backward/2/long_long.h
+enc/trans/emoji.$(OBJEXT): backward/2/stdalign.h
+enc/trans/emoji.$(OBJEXT): backward/2/stdarg.h
 enc/trans/emoji.$(OBJEXT): config.h
 enc/trans/emoji.$(OBJEXT): defines.h
 enc/trans/emoji.$(OBJEXT): enc/trans/emoji.c
@@ -437,7 +3027,157 @@ enc/trans/emoji.$(OBJEXT): st.h
 enc/trans/emoji.$(OBJEXT): subst.h
 enc/trans/emoji_iso2022_kddi.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 enc/trans/emoji_iso2022_kddi.$(OBJEXT): $(top_srcdir)/transcode_data.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/anyargs.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/arithmetic.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/arithmetic/char.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/arithmetic/double.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/arithmetic/fixnum.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/arithmetic/gid_t.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/arithmetic/int.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/arithmetic/intptr_t.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/arithmetic/long.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/arithmetic/long_long.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/arithmetic/mode_t.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/arithmetic/off_t.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/arithmetic/pid_t.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/arithmetic/short.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/arithmetic/size_t.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/arithmetic/st_data_t.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/arithmetic/uid_t.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/assume.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/attr/alloc_size.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/attr/artificial.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/attr/cold.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/attr/const.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/attr/constexpr.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/attr/deprecated.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/attr/diagnose_if.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/attr/enum_extensibility.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/attr/error.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/attr/flag_enum.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/attr/forceinline.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/attr/format.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/attr/maybe_unused.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/attr/noalias.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/attr/nodiscard.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/attr/noexcept.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/attr/noinline.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/attr/nonnull.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/attr/noreturn.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/attr/pure.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/attr/restrict.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/attr/warning.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/attr/weakref.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/cast.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/compiler_is.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/compiler_is/apple.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/compiler_is/clang.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/compiler_is/gcc.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/compiler_is/intel.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/compiler_is/msvc.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/compiler_since.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/config.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/constant_p.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/core.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/core/rarray.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/core/rbasic.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/core/rbignum.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/core/rclass.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/core/rdata.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/core/rfile.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/core/rhash.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/core/robject.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/core/rregexp.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/core/rstring.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/core/rstruct.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/core/rtypeddata.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/ctype.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/dllexport.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/dosish.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/error.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/eval.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/event.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/fl_type.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/gc.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/glob.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/globals.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/has/attribute.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/has/builtin.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/has/c_attribute.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/has/cpp_attribute.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/has/declspec_attribute.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/has/extension.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/has/feature.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/has/warning.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/array.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/bignum.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/class.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/compar.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/complex.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/cont.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/dir.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/enum.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/enumerator.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/error.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/eval.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/file.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/gc.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/hash.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/io.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/load.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/marshal.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/numeric.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/object.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/parse.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/proc.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/process.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/random.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/range.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/rational.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/re.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/ruby.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/select.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/select/largesize.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/signal.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/sprintf.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/string.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/struct.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/thread.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/time.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/variable.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/intern/vm.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/interpreter.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/iterator.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/memory.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/method.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/module.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/newobj.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/rgengc.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/scan_args.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/special_consts.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/static_assert.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/stdalign.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/stdbool.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/symbol.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/token_paste.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/value.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/value_type.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/variable.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/warning_push.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/xmalloc.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): assert.h
 enc/trans/emoji_iso2022_kddi.$(OBJEXT): backward.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): backward/2/assume.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): backward/2/attributes.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): backward/2/bool.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): backward/2/gcc_version_since.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): backward/2/inttypes.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): backward/2/limits.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): backward/2/long_long.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): backward/2/stdalign.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): backward/2/stdarg.h
 enc/trans/emoji_iso2022_kddi.$(OBJEXT): config.h
 enc/trans/emoji_iso2022_kddi.$(OBJEXT): defines.h
 enc/trans/emoji_iso2022_kddi.$(OBJEXT): enc/trans/emoji_iso2022_kddi.c
@@ -447,7 +3187,157 @@ enc/trans/emoji_iso2022_kddi.$(OBJEXT): st.h
 enc/trans/emoji_iso2022_kddi.$(OBJEXT): subst.h
 enc/trans/emoji_sjis_docomo.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 enc/trans/emoji_sjis_docomo.$(OBJEXT): $(top_srcdir)/transcode_data.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/anyargs.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/arithmetic.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/arithmetic/char.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/arithmetic/double.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/arithmetic/fixnum.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/arithmetic/gid_t.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/arithmetic/int.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/arithmetic/intptr_t.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/arithmetic/long.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/arithmetic/long_long.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/arithmetic/mode_t.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/arithmetic/off_t.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/arithmetic/pid_t.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/arithmetic/short.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/arithmetic/size_t.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/arithmetic/st_data_t.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/arithmetic/uid_t.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/assume.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/attr/alloc_size.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/attr/artificial.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/attr/cold.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/attr/const.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/attr/constexpr.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/attr/deprecated.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/attr/diagnose_if.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/attr/enum_extensibility.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/attr/error.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/attr/flag_enum.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/attr/forceinline.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/attr/format.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/attr/maybe_unused.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/attr/noalias.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/attr/nodiscard.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/attr/noexcept.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/attr/noinline.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/attr/nonnull.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/attr/noreturn.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/attr/pure.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/attr/restrict.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/attr/warning.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/attr/weakref.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/cast.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/compiler_is.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/compiler_is/apple.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/compiler_is/clang.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/compiler_is/gcc.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/compiler_is/intel.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/compiler_is/msvc.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/compiler_since.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/config.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/constant_p.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/core.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/core/rarray.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/core/rbasic.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/core/rbignum.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/core/rclass.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/core/rdata.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/core/rfile.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/core/rhash.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/core/robject.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/core/rregexp.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/core/rstring.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/core/rstruct.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/core/rtypeddata.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/ctype.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/dllexport.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/dosish.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/error.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/eval.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/event.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/fl_type.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/gc.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/glob.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/globals.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/has/attribute.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/has/builtin.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/has/c_attribute.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/has/cpp_attribute.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/has/declspec_attribute.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/has/extension.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/has/feature.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/has/warning.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/array.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/bignum.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/class.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/compar.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/complex.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/cont.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/dir.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/enum.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/enumerator.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/error.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/eval.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/file.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/gc.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/hash.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/io.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/load.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/marshal.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/numeric.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/object.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/parse.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/proc.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/process.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/random.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/range.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/rational.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/re.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/ruby.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/select.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/select/largesize.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/signal.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/sprintf.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/string.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/struct.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/thread.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/time.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/variable.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/intern/vm.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/interpreter.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/iterator.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/memory.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/method.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/module.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/newobj.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/rgengc.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/scan_args.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/special_consts.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/static_assert.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/stdalign.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/stdbool.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/symbol.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/token_paste.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/value.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/value_type.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/variable.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/warning_push.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/xmalloc.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): assert.h
 enc/trans/emoji_sjis_docomo.$(OBJEXT): backward.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): backward/2/assume.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): backward/2/attributes.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): backward/2/bool.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): backward/2/gcc_version_since.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): backward/2/inttypes.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): backward/2/limits.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): backward/2/long_long.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): backward/2/stdalign.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): backward/2/stdarg.h
 enc/trans/emoji_sjis_docomo.$(OBJEXT): config.h
 enc/trans/emoji_sjis_docomo.$(OBJEXT): defines.h
 enc/trans/emoji_sjis_docomo.$(OBJEXT): enc/trans/emoji_sjis_docomo.c
@@ -457,7 +3347,157 @@ enc/trans/emoji_sjis_docomo.$(OBJEXT): st.h
 enc/trans/emoji_sjis_docomo.$(OBJEXT): subst.h
 enc/trans/emoji_sjis_kddi.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 enc/trans/emoji_sjis_kddi.$(OBJEXT): $(top_srcdir)/transcode_data.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/anyargs.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/arithmetic.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/arithmetic/char.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/arithmetic/double.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/arithmetic/fixnum.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/arithmetic/gid_t.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/arithmetic/int.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/arithmetic/intptr_t.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/arithmetic/long.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/arithmetic/long_long.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/arithmetic/mode_t.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/arithmetic/off_t.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/arithmetic/pid_t.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/arithmetic/short.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/arithmetic/size_t.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/arithmetic/st_data_t.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/arithmetic/uid_t.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/assume.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/attr/alloc_size.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/attr/artificial.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/attr/cold.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/attr/const.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/attr/constexpr.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/attr/deprecated.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/attr/diagnose_if.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/attr/enum_extensibility.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/attr/error.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/attr/flag_enum.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/attr/forceinline.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/attr/format.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/attr/maybe_unused.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/attr/noalias.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/attr/nodiscard.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/attr/noexcept.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/attr/noinline.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/attr/nonnull.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/attr/noreturn.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/attr/pure.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/attr/restrict.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/attr/warning.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/attr/weakref.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/cast.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/compiler_is.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/compiler_is/apple.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/compiler_is/clang.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/compiler_is/gcc.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/compiler_is/intel.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/compiler_is/msvc.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/compiler_since.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/config.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/constant_p.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/core.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/core/rarray.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/core/rbasic.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/core/rbignum.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/core/rclass.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/core/rdata.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/core/rfile.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/core/rhash.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/core/robject.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/core/rregexp.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/core/rstring.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/core/rstruct.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/core/rtypeddata.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/ctype.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/dllexport.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/dosish.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/error.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/eval.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/event.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/fl_type.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/gc.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/glob.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/globals.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/has/attribute.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/has/builtin.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/has/c_attribute.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/has/cpp_attribute.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/has/declspec_attribute.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/has/extension.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/has/feature.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/has/warning.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/array.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/bignum.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/class.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/compar.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/complex.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/cont.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/dir.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/enum.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/enumerator.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/error.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/eval.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/file.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/gc.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/hash.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/io.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/load.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/marshal.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/numeric.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/object.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/parse.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/proc.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/process.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/random.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/range.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/rational.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/re.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/ruby.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/select.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/select/largesize.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/signal.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/sprintf.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/string.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/struct.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/thread.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/time.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/variable.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/intern/vm.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/interpreter.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/iterator.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/memory.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/method.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/module.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/newobj.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/rgengc.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/scan_args.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/special_consts.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/static_assert.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/stdalign.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/stdbool.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/symbol.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/token_paste.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/value.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/value_type.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/variable.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/warning_push.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/xmalloc.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): assert.h
 enc/trans/emoji_sjis_kddi.$(OBJEXT): backward.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): backward/2/assume.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): backward/2/attributes.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): backward/2/bool.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): backward/2/gcc_version_since.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): backward/2/inttypes.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): backward/2/limits.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): backward/2/long_long.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): backward/2/stdalign.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): backward/2/stdarg.h
 enc/trans/emoji_sjis_kddi.$(OBJEXT): config.h
 enc/trans/emoji_sjis_kddi.$(OBJEXT): defines.h
 enc/trans/emoji_sjis_kddi.$(OBJEXT): enc/trans/emoji_sjis_kddi.c
@@ -467,7 +3507,157 @@ enc/trans/emoji_sjis_kddi.$(OBJEXT): st.h
 enc/trans/emoji_sjis_kddi.$(OBJEXT): subst.h
 enc/trans/emoji_sjis_softbank.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 enc/trans/emoji_sjis_softbank.$(OBJEXT): $(top_srcdir)/transcode_data.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/anyargs.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/arithmetic.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/arithmetic/char.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/arithmetic/double.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/arithmetic/fixnum.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/arithmetic/gid_t.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/arithmetic/int.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/arithmetic/intptr_t.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/arithmetic/long.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/arithmetic/long_long.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/arithmetic/mode_t.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/arithmetic/off_t.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/arithmetic/pid_t.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/arithmetic/short.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/arithmetic/size_t.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/arithmetic/st_data_t.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/arithmetic/uid_t.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/assume.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/attr/alloc_size.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/attr/artificial.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/attr/cold.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/attr/const.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/attr/constexpr.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/attr/deprecated.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/attr/diagnose_if.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/attr/enum_extensibility.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/attr/error.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/attr/flag_enum.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/attr/forceinline.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/attr/format.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/attr/maybe_unused.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/attr/noalias.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/attr/nodiscard.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/attr/noexcept.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/attr/noinline.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/attr/nonnull.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/attr/noreturn.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/attr/pure.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/attr/restrict.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/attr/warning.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/attr/weakref.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/cast.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/compiler_is.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/compiler_is/apple.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/compiler_is/clang.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/compiler_is/gcc.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/compiler_is/intel.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/compiler_is/msvc.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/compiler_since.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/config.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/constant_p.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/core.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/core/rarray.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/core/rbasic.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/core/rbignum.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/core/rclass.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/core/rdata.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/core/rfile.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/core/rhash.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/core/robject.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/core/rregexp.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/core/rstring.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/core/rstruct.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/core/rtypeddata.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/ctype.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/dllexport.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/dosish.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/error.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/eval.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/event.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/fl_type.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/gc.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/glob.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/globals.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/has/attribute.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/has/builtin.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/has/c_attribute.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/has/cpp_attribute.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/has/declspec_attribute.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/has/extension.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/has/feature.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/has/warning.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/array.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/bignum.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/class.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/compar.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/complex.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/cont.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/dir.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/enum.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/enumerator.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/error.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/eval.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/file.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/gc.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/hash.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/io.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/load.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/marshal.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/numeric.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/object.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/parse.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/proc.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/process.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/random.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/range.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/rational.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/re.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/ruby.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/select.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/select/largesize.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/signal.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/sprintf.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/string.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/struct.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/thread.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/time.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/variable.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/intern/vm.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/interpreter.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/iterator.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/memory.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/method.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/module.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/newobj.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/rgengc.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/scan_args.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/special_consts.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/static_assert.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/stdalign.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/stdbool.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/symbol.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/token_paste.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/value.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/value_type.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/variable.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/warning_push.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/xmalloc.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): assert.h
 enc/trans/emoji_sjis_softbank.$(OBJEXT): backward.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): backward/2/assume.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): backward/2/attributes.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): backward/2/bool.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): backward/2/gcc_version_since.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): backward/2/inttypes.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): backward/2/limits.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): backward/2/long_long.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): backward/2/stdalign.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): backward/2/stdarg.h
 enc/trans/emoji_sjis_softbank.$(OBJEXT): config.h
 enc/trans/emoji_sjis_softbank.$(OBJEXT): defines.h
 enc/trans/emoji_sjis_softbank.$(OBJEXT): enc/trans/emoji_sjis_softbank.c
@@ -477,7 +3667,157 @@ enc/trans/emoji_sjis_softbank.$(OBJEXT): st.h
 enc/trans/emoji_sjis_softbank.$(OBJEXT): subst.h
 enc/trans/escape.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 enc/trans/escape.$(OBJEXT): $(top_srcdir)/transcode_data.h
+enc/trans/escape.$(OBJEXT): internal/anyargs.h
+enc/trans/escape.$(OBJEXT): internal/arithmetic.h
+enc/trans/escape.$(OBJEXT): internal/arithmetic/char.h
+enc/trans/escape.$(OBJEXT): internal/arithmetic/double.h
+enc/trans/escape.$(OBJEXT): internal/arithmetic/fixnum.h
+enc/trans/escape.$(OBJEXT): internal/arithmetic/gid_t.h
+enc/trans/escape.$(OBJEXT): internal/arithmetic/int.h
+enc/trans/escape.$(OBJEXT): internal/arithmetic/intptr_t.h
+enc/trans/escape.$(OBJEXT): internal/arithmetic/long.h
+enc/trans/escape.$(OBJEXT): internal/arithmetic/long_long.h
+enc/trans/escape.$(OBJEXT): internal/arithmetic/mode_t.h
+enc/trans/escape.$(OBJEXT): internal/arithmetic/off_t.h
+enc/trans/escape.$(OBJEXT): internal/arithmetic/pid_t.h
+enc/trans/escape.$(OBJEXT): internal/arithmetic/short.h
+enc/trans/escape.$(OBJEXT): internal/arithmetic/size_t.h
+enc/trans/escape.$(OBJEXT): internal/arithmetic/st_data_t.h
+enc/trans/escape.$(OBJEXT): internal/arithmetic/uid_t.h
+enc/trans/escape.$(OBJEXT): internal/assume.h
+enc/trans/escape.$(OBJEXT): internal/attr/alloc_size.h
+enc/trans/escape.$(OBJEXT): internal/attr/artificial.h
+enc/trans/escape.$(OBJEXT): internal/attr/cold.h
+enc/trans/escape.$(OBJEXT): internal/attr/const.h
+enc/trans/escape.$(OBJEXT): internal/attr/constexpr.h
+enc/trans/escape.$(OBJEXT): internal/attr/deprecated.h
+enc/trans/escape.$(OBJEXT): internal/attr/diagnose_if.h
+enc/trans/escape.$(OBJEXT): internal/attr/enum_extensibility.h
+enc/trans/escape.$(OBJEXT): internal/attr/error.h
+enc/trans/escape.$(OBJEXT): internal/attr/flag_enum.h
+enc/trans/escape.$(OBJEXT): internal/attr/forceinline.h
+enc/trans/escape.$(OBJEXT): internal/attr/format.h
+enc/trans/escape.$(OBJEXT): internal/attr/maybe_unused.h
+enc/trans/escape.$(OBJEXT): internal/attr/noalias.h
+enc/trans/escape.$(OBJEXT): internal/attr/nodiscard.h
+enc/trans/escape.$(OBJEXT): internal/attr/noexcept.h
+enc/trans/escape.$(OBJEXT): internal/attr/noinline.h
+enc/trans/escape.$(OBJEXT): internal/attr/nonnull.h
+enc/trans/escape.$(OBJEXT): internal/attr/noreturn.h
+enc/trans/escape.$(OBJEXT): internal/attr/pure.h
+enc/trans/escape.$(OBJEXT): internal/attr/restrict.h
+enc/trans/escape.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/trans/escape.$(OBJEXT): internal/attr/warning.h
+enc/trans/escape.$(OBJEXT): internal/attr/weakref.h
+enc/trans/escape.$(OBJEXT): internal/cast.h
+enc/trans/escape.$(OBJEXT): internal/compiler_is.h
+enc/trans/escape.$(OBJEXT): internal/compiler_is/apple.h
+enc/trans/escape.$(OBJEXT): internal/compiler_is/clang.h
+enc/trans/escape.$(OBJEXT): internal/compiler_is/gcc.h
+enc/trans/escape.$(OBJEXT): internal/compiler_is/intel.h
+enc/trans/escape.$(OBJEXT): internal/compiler_is/msvc.h
+enc/trans/escape.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/trans/escape.$(OBJEXT): internal/compiler_since.h
+enc/trans/escape.$(OBJEXT): internal/config.h
+enc/trans/escape.$(OBJEXT): internal/constant_p.h
+enc/trans/escape.$(OBJEXT): internal/core.h
+enc/trans/escape.$(OBJEXT): internal/core/rarray.h
+enc/trans/escape.$(OBJEXT): internal/core/rbasic.h
+enc/trans/escape.$(OBJEXT): internal/core/rbignum.h
+enc/trans/escape.$(OBJEXT): internal/core/rclass.h
+enc/trans/escape.$(OBJEXT): internal/core/rdata.h
+enc/trans/escape.$(OBJEXT): internal/core/rfile.h
+enc/trans/escape.$(OBJEXT): internal/core/rhash.h
+enc/trans/escape.$(OBJEXT): internal/core/robject.h
+enc/trans/escape.$(OBJEXT): internal/core/rregexp.h
+enc/trans/escape.$(OBJEXT): internal/core/rstring.h
+enc/trans/escape.$(OBJEXT): internal/core/rstruct.h
+enc/trans/escape.$(OBJEXT): internal/core/rtypeddata.h
+enc/trans/escape.$(OBJEXT): internal/ctype.h
+enc/trans/escape.$(OBJEXT): internal/dllexport.h
+enc/trans/escape.$(OBJEXT): internal/dosish.h
+enc/trans/escape.$(OBJEXT): internal/error.h
+enc/trans/escape.$(OBJEXT): internal/eval.h
+enc/trans/escape.$(OBJEXT): internal/event.h
+enc/trans/escape.$(OBJEXT): internal/fl_type.h
+enc/trans/escape.$(OBJEXT): internal/gc.h
+enc/trans/escape.$(OBJEXT): internal/glob.h
+enc/trans/escape.$(OBJEXT): internal/globals.h
+enc/trans/escape.$(OBJEXT): internal/has/attribute.h
+enc/trans/escape.$(OBJEXT): internal/has/builtin.h
+enc/trans/escape.$(OBJEXT): internal/has/c_attribute.h
+enc/trans/escape.$(OBJEXT): internal/has/cpp_attribute.h
+enc/trans/escape.$(OBJEXT): internal/has/declspec_attribute.h
+enc/trans/escape.$(OBJEXT): internal/has/extension.h
+enc/trans/escape.$(OBJEXT): internal/has/feature.h
+enc/trans/escape.$(OBJEXT): internal/has/warning.h
+enc/trans/escape.$(OBJEXT): internal/intern/array.h
+enc/trans/escape.$(OBJEXT): internal/intern/bignum.h
+enc/trans/escape.$(OBJEXT): internal/intern/class.h
+enc/trans/escape.$(OBJEXT): internal/intern/compar.h
+enc/trans/escape.$(OBJEXT): internal/intern/complex.h
+enc/trans/escape.$(OBJEXT): internal/intern/cont.h
+enc/trans/escape.$(OBJEXT): internal/intern/dir.h
+enc/trans/escape.$(OBJEXT): internal/intern/enum.h
+enc/trans/escape.$(OBJEXT): internal/intern/enumerator.h
+enc/trans/escape.$(OBJEXT): internal/intern/error.h
+enc/trans/escape.$(OBJEXT): internal/intern/eval.h
+enc/trans/escape.$(OBJEXT): internal/intern/file.h
+enc/trans/escape.$(OBJEXT): internal/intern/gc.h
+enc/trans/escape.$(OBJEXT): internal/intern/hash.h
+enc/trans/escape.$(OBJEXT): internal/intern/io.h
+enc/trans/escape.$(OBJEXT): internal/intern/load.h
+enc/trans/escape.$(OBJEXT): internal/intern/marshal.h
+enc/trans/escape.$(OBJEXT): internal/intern/numeric.h
+enc/trans/escape.$(OBJEXT): internal/intern/object.h
+enc/trans/escape.$(OBJEXT): internal/intern/parse.h
+enc/trans/escape.$(OBJEXT): internal/intern/proc.h
+enc/trans/escape.$(OBJEXT): internal/intern/process.h
+enc/trans/escape.$(OBJEXT): internal/intern/random.h
+enc/trans/escape.$(OBJEXT): internal/intern/range.h
+enc/trans/escape.$(OBJEXT): internal/intern/rational.h
+enc/trans/escape.$(OBJEXT): internal/intern/re.h
+enc/trans/escape.$(OBJEXT): internal/intern/ruby.h
+enc/trans/escape.$(OBJEXT): internal/intern/select.h
+enc/trans/escape.$(OBJEXT): internal/intern/select/largesize.h
+enc/trans/escape.$(OBJEXT): internal/intern/signal.h
+enc/trans/escape.$(OBJEXT): internal/intern/sprintf.h
+enc/trans/escape.$(OBJEXT): internal/intern/string.h
+enc/trans/escape.$(OBJEXT): internal/intern/struct.h
+enc/trans/escape.$(OBJEXT): internal/intern/thread.h
+enc/trans/escape.$(OBJEXT): internal/intern/time.h
+enc/trans/escape.$(OBJEXT): internal/intern/variable.h
+enc/trans/escape.$(OBJEXT): internal/intern/vm.h
+enc/trans/escape.$(OBJEXT): internal/interpreter.h
+enc/trans/escape.$(OBJEXT): internal/iterator.h
+enc/trans/escape.$(OBJEXT): internal/memory.h
+enc/trans/escape.$(OBJEXT): internal/method.h
+enc/trans/escape.$(OBJEXT): internal/module.h
+enc/trans/escape.$(OBJEXT): internal/newobj.h
+enc/trans/escape.$(OBJEXT): internal/rgengc.h
+enc/trans/escape.$(OBJEXT): internal/scan_args.h
+enc/trans/escape.$(OBJEXT): internal/special_consts.h
+enc/trans/escape.$(OBJEXT): internal/static_assert.h
+enc/trans/escape.$(OBJEXT): internal/stdalign.h
+enc/trans/escape.$(OBJEXT): internal/stdbool.h
+enc/trans/escape.$(OBJEXT): internal/symbol.h
+enc/trans/escape.$(OBJEXT): internal/token_paste.h
+enc/trans/escape.$(OBJEXT): internal/value.h
+enc/trans/escape.$(OBJEXT): internal/value_type.h
+enc/trans/escape.$(OBJEXT): internal/variable.h
+enc/trans/escape.$(OBJEXT): internal/warning_push.h
+enc/trans/escape.$(OBJEXT): internal/xmalloc.h
+enc/trans/escape.$(OBJEXT): assert.h
 enc/trans/escape.$(OBJEXT): backward.h
+enc/trans/escape.$(OBJEXT): backward/2/assume.h
+enc/trans/escape.$(OBJEXT): backward/2/attributes.h
+enc/trans/escape.$(OBJEXT): backward/2/bool.h
+enc/trans/escape.$(OBJEXT): backward/2/gcc_version_since.h
+enc/trans/escape.$(OBJEXT): backward/2/inttypes.h
+enc/trans/escape.$(OBJEXT): backward/2/limits.h
+enc/trans/escape.$(OBJEXT): backward/2/long_long.h
+enc/trans/escape.$(OBJEXT): backward/2/stdalign.h
+enc/trans/escape.$(OBJEXT): backward/2/stdarg.h
 enc/trans/escape.$(OBJEXT): config.h
 enc/trans/escape.$(OBJEXT): defines.h
 enc/trans/escape.$(OBJEXT): enc/trans/escape.c
@@ -487,7 +3827,157 @@ enc/trans/escape.$(OBJEXT): st.h
 enc/trans/escape.$(OBJEXT): subst.h
 enc/trans/gb18030.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 enc/trans/gb18030.$(OBJEXT): $(top_srcdir)/transcode_data.h
+enc/trans/gb18030.$(OBJEXT): internal/anyargs.h
+enc/trans/gb18030.$(OBJEXT): internal/arithmetic.h
+enc/trans/gb18030.$(OBJEXT): internal/arithmetic/char.h
+enc/trans/gb18030.$(OBJEXT): internal/arithmetic/double.h
+enc/trans/gb18030.$(OBJEXT): internal/arithmetic/fixnum.h
+enc/trans/gb18030.$(OBJEXT): internal/arithmetic/gid_t.h
+enc/trans/gb18030.$(OBJEXT): internal/arithmetic/int.h
+enc/trans/gb18030.$(OBJEXT): internal/arithmetic/intptr_t.h
+enc/trans/gb18030.$(OBJEXT): internal/arithmetic/long.h
+enc/trans/gb18030.$(OBJEXT): internal/arithmetic/long_long.h
+enc/trans/gb18030.$(OBJEXT): internal/arithmetic/mode_t.h
+enc/trans/gb18030.$(OBJEXT): internal/arithmetic/off_t.h
+enc/trans/gb18030.$(OBJEXT): internal/arithmetic/pid_t.h
+enc/trans/gb18030.$(OBJEXT): internal/arithmetic/short.h
+enc/trans/gb18030.$(OBJEXT): internal/arithmetic/size_t.h
+enc/trans/gb18030.$(OBJEXT): internal/arithmetic/st_data_t.h
+enc/trans/gb18030.$(OBJEXT): internal/arithmetic/uid_t.h
+enc/trans/gb18030.$(OBJEXT): internal/assume.h
+enc/trans/gb18030.$(OBJEXT): internal/attr/alloc_size.h
+enc/trans/gb18030.$(OBJEXT): internal/attr/artificial.h
+enc/trans/gb18030.$(OBJEXT): internal/attr/cold.h
+enc/trans/gb18030.$(OBJEXT): internal/attr/const.h
+enc/trans/gb18030.$(OBJEXT): internal/attr/constexpr.h
+enc/trans/gb18030.$(OBJEXT): internal/attr/deprecated.h
+enc/trans/gb18030.$(OBJEXT): internal/attr/diagnose_if.h
+enc/trans/gb18030.$(OBJEXT): internal/attr/enum_extensibility.h
+enc/trans/gb18030.$(OBJEXT): internal/attr/error.h
+enc/trans/gb18030.$(OBJEXT): internal/attr/flag_enum.h
+enc/trans/gb18030.$(OBJEXT): internal/attr/forceinline.h
+enc/trans/gb18030.$(OBJEXT): internal/attr/format.h
+enc/trans/gb18030.$(OBJEXT): internal/attr/maybe_unused.h
+enc/trans/gb18030.$(OBJEXT): internal/attr/noalias.h
+enc/trans/gb18030.$(OBJEXT): internal/attr/nodiscard.h
+enc/trans/gb18030.$(OBJEXT): internal/attr/noexcept.h
+enc/trans/gb18030.$(OBJEXT): internal/attr/noinline.h
+enc/trans/gb18030.$(OBJEXT): internal/attr/nonnull.h
+enc/trans/gb18030.$(OBJEXT): internal/attr/noreturn.h
+enc/trans/gb18030.$(OBJEXT): internal/attr/pure.h
+enc/trans/gb18030.$(OBJEXT): internal/attr/restrict.h
+enc/trans/gb18030.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/trans/gb18030.$(OBJEXT): internal/attr/warning.h
+enc/trans/gb18030.$(OBJEXT): internal/attr/weakref.h
+enc/trans/gb18030.$(OBJEXT): internal/cast.h
+enc/trans/gb18030.$(OBJEXT): internal/compiler_is.h
+enc/trans/gb18030.$(OBJEXT): internal/compiler_is/apple.h
+enc/trans/gb18030.$(OBJEXT): internal/compiler_is/clang.h
+enc/trans/gb18030.$(OBJEXT): internal/compiler_is/gcc.h
+enc/trans/gb18030.$(OBJEXT): internal/compiler_is/intel.h
+enc/trans/gb18030.$(OBJEXT): internal/compiler_is/msvc.h
+enc/trans/gb18030.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/trans/gb18030.$(OBJEXT): internal/compiler_since.h
+enc/trans/gb18030.$(OBJEXT): internal/config.h
+enc/trans/gb18030.$(OBJEXT): internal/constant_p.h
+enc/trans/gb18030.$(OBJEXT): internal/core.h
+enc/trans/gb18030.$(OBJEXT): internal/core/rarray.h
+enc/trans/gb18030.$(OBJEXT): internal/core/rbasic.h
+enc/trans/gb18030.$(OBJEXT): internal/core/rbignum.h
+enc/trans/gb18030.$(OBJEXT): internal/core/rclass.h
+enc/trans/gb18030.$(OBJEXT): internal/core/rdata.h
+enc/trans/gb18030.$(OBJEXT): internal/core/rfile.h
+enc/trans/gb18030.$(OBJEXT): internal/core/rhash.h
+enc/trans/gb18030.$(OBJEXT): internal/core/robject.h
+enc/trans/gb18030.$(OBJEXT): internal/core/rregexp.h
+enc/trans/gb18030.$(OBJEXT): internal/core/rstring.h
+enc/trans/gb18030.$(OBJEXT): internal/core/rstruct.h
+enc/trans/gb18030.$(OBJEXT): internal/core/rtypeddata.h
+enc/trans/gb18030.$(OBJEXT): internal/ctype.h
+enc/trans/gb18030.$(OBJEXT): internal/dllexport.h
+enc/trans/gb18030.$(OBJEXT): internal/dosish.h
+enc/trans/gb18030.$(OBJEXT): internal/error.h
+enc/trans/gb18030.$(OBJEXT): internal/eval.h
+enc/trans/gb18030.$(OBJEXT): internal/event.h
+enc/trans/gb18030.$(OBJEXT): internal/fl_type.h
+enc/trans/gb18030.$(OBJEXT): internal/gc.h
+enc/trans/gb18030.$(OBJEXT): internal/glob.h
+enc/trans/gb18030.$(OBJEXT): internal/globals.h
+enc/trans/gb18030.$(OBJEXT): internal/has/attribute.h
+enc/trans/gb18030.$(OBJEXT): internal/has/builtin.h
+enc/trans/gb18030.$(OBJEXT): internal/has/c_attribute.h
+enc/trans/gb18030.$(OBJEXT): internal/has/cpp_attribute.h
+enc/trans/gb18030.$(OBJEXT): internal/has/declspec_attribute.h
+enc/trans/gb18030.$(OBJEXT): internal/has/extension.h
+enc/trans/gb18030.$(OBJEXT): internal/has/feature.h
+enc/trans/gb18030.$(OBJEXT): internal/has/warning.h
+enc/trans/gb18030.$(OBJEXT): internal/intern/array.h
+enc/trans/gb18030.$(OBJEXT): internal/intern/bignum.h
+enc/trans/gb18030.$(OBJEXT): internal/intern/class.h
+enc/trans/gb18030.$(OBJEXT): internal/intern/compar.h
+enc/trans/gb18030.$(OBJEXT): internal/intern/complex.h
+enc/trans/gb18030.$(OBJEXT): internal/intern/cont.h
+enc/trans/gb18030.$(OBJEXT): internal/intern/dir.h
+enc/trans/gb18030.$(OBJEXT): internal/intern/enum.h
+enc/trans/gb18030.$(OBJEXT): internal/intern/enumerator.h
+enc/trans/gb18030.$(OBJEXT): internal/intern/error.h
+enc/trans/gb18030.$(OBJEXT): internal/intern/eval.h
+enc/trans/gb18030.$(OBJEXT): internal/intern/file.h
+enc/trans/gb18030.$(OBJEXT): internal/intern/gc.h
+enc/trans/gb18030.$(OBJEXT): internal/intern/hash.h
+enc/trans/gb18030.$(OBJEXT): internal/intern/io.h
+enc/trans/gb18030.$(OBJEXT): internal/intern/load.h
+enc/trans/gb18030.$(OBJEXT): internal/intern/marshal.h
+enc/trans/gb18030.$(OBJEXT): internal/intern/numeric.h
+enc/trans/gb18030.$(OBJEXT): internal/intern/object.h
+enc/trans/gb18030.$(OBJEXT): internal/intern/parse.h
+enc/trans/gb18030.$(OBJEXT): internal/intern/proc.h
+enc/trans/gb18030.$(OBJEXT): internal/intern/process.h
+enc/trans/gb18030.$(OBJEXT): internal/intern/random.h
+enc/trans/gb18030.$(OBJEXT): internal/intern/range.h
+enc/trans/gb18030.$(OBJEXT): internal/intern/rational.h
+enc/trans/gb18030.$(OBJEXT): internal/intern/re.h
+enc/trans/gb18030.$(OBJEXT): internal/intern/ruby.h
+enc/trans/gb18030.$(OBJEXT): internal/intern/select.h
+enc/trans/gb18030.$(OBJEXT): internal/intern/select/largesize.h
+enc/trans/gb18030.$(OBJEXT): internal/intern/signal.h
+enc/trans/gb18030.$(OBJEXT): internal/intern/sprintf.h
+enc/trans/gb18030.$(OBJEXT): internal/intern/string.h
+enc/trans/gb18030.$(OBJEXT): internal/intern/struct.h
+enc/trans/gb18030.$(OBJEXT): internal/intern/thread.h
+enc/trans/gb18030.$(OBJEXT): internal/intern/time.h
+enc/trans/gb18030.$(OBJEXT): internal/intern/variable.h
+enc/trans/gb18030.$(OBJEXT): internal/intern/vm.h
+enc/trans/gb18030.$(OBJEXT): internal/interpreter.h
+enc/trans/gb18030.$(OBJEXT): internal/iterator.h
+enc/trans/gb18030.$(OBJEXT): internal/memory.h
+enc/trans/gb18030.$(OBJEXT): internal/method.h
+enc/trans/gb18030.$(OBJEXT): internal/module.h
+enc/trans/gb18030.$(OBJEXT): internal/newobj.h
+enc/trans/gb18030.$(OBJEXT): internal/rgengc.h
+enc/trans/gb18030.$(OBJEXT): internal/scan_args.h
+enc/trans/gb18030.$(OBJEXT): internal/special_consts.h
+enc/trans/gb18030.$(OBJEXT): internal/static_assert.h
+enc/trans/gb18030.$(OBJEXT): internal/stdalign.h
+enc/trans/gb18030.$(OBJEXT): internal/stdbool.h
+enc/trans/gb18030.$(OBJEXT): internal/symbol.h
+enc/trans/gb18030.$(OBJEXT): internal/token_paste.h
+enc/trans/gb18030.$(OBJEXT): internal/value.h
+enc/trans/gb18030.$(OBJEXT): internal/value_type.h
+enc/trans/gb18030.$(OBJEXT): internal/variable.h
+enc/trans/gb18030.$(OBJEXT): internal/warning_push.h
+enc/trans/gb18030.$(OBJEXT): internal/xmalloc.h
+enc/trans/gb18030.$(OBJEXT): assert.h
 enc/trans/gb18030.$(OBJEXT): backward.h
+enc/trans/gb18030.$(OBJEXT): backward/2/assume.h
+enc/trans/gb18030.$(OBJEXT): backward/2/attributes.h
+enc/trans/gb18030.$(OBJEXT): backward/2/bool.h
+enc/trans/gb18030.$(OBJEXT): backward/2/gcc_version_since.h
+enc/trans/gb18030.$(OBJEXT): backward/2/inttypes.h
+enc/trans/gb18030.$(OBJEXT): backward/2/limits.h
+enc/trans/gb18030.$(OBJEXT): backward/2/long_long.h
+enc/trans/gb18030.$(OBJEXT): backward/2/stdalign.h
+enc/trans/gb18030.$(OBJEXT): backward/2/stdarg.h
 enc/trans/gb18030.$(OBJEXT): config.h
 enc/trans/gb18030.$(OBJEXT): defines.h
 enc/trans/gb18030.$(OBJEXT): enc/trans/gb18030.c
@@ -497,7 +3987,157 @@ enc/trans/gb18030.$(OBJEXT): st.h
 enc/trans/gb18030.$(OBJEXT): subst.h
 enc/trans/gbk.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 enc/trans/gbk.$(OBJEXT): $(top_srcdir)/transcode_data.h
+enc/trans/gbk.$(OBJEXT): internal/anyargs.h
+enc/trans/gbk.$(OBJEXT): internal/arithmetic.h
+enc/trans/gbk.$(OBJEXT): internal/arithmetic/char.h
+enc/trans/gbk.$(OBJEXT): internal/arithmetic/double.h
+enc/trans/gbk.$(OBJEXT): internal/arithmetic/fixnum.h
+enc/trans/gbk.$(OBJEXT): internal/arithmetic/gid_t.h
+enc/trans/gbk.$(OBJEXT): internal/arithmetic/int.h
+enc/trans/gbk.$(OBJEXT): internal/arithmetic/intptr_t.h
+enc/trans/gbk.$(OBJEXT): internal/arithmetic/long.h
+enc/trans/gbk.$(OBJEXT): internal/arithmetic/long_long.h
+enc/trans/gbk.$(OBJEXT): internal/arithmetic/mode_t.h
+enc/trans/gbk.$(OBJEXT): internal/arithmetic/off_t.h
+enc/trans/gbk.$(OBJEXT): internal/arithmetic/pid_t.h
+enc/trans/gbk.$(OBJEXT): internal/arithmetic/short.h
+enc/trans/gbk.$(OBJEXT): internal/arithmetic/size_t.h
+enc/trans/gbk.$(OBJEXT): internal/arithmetic/st_data_t.h
+enc/trans/gbk.$(OBJEXT): internal/arithmetic/uid_t.h
+enc/trans/gbk.$(OBJEXT): internal/assume.h
+enc/trans/gbk.$(OBJEXT): internal/attr/alloc_size.h
+enc/trans/gbk.$(OBJEXT): internal/attr/artificial.h
+enc/trans/gbk.$(OBJEXT): internal/attr/cold.h
+enc/trans/gbk.$(OBJEXT): internal/attr/const.h
+enc/trans/gbk.$(OBJEXT): internal/attr/constexpr.h
+enc/trans/gbk.$(OBJEXT): internal/attr/deprecated.h
+enc/trans/gbk.$(OBJEXT): internal/attr/diagnose_if.h
+enc/trans/gbk.$(OBJEXT): internal/attr/enum_extensibility.h
+enc/trans/gbk.$(OBJEXT): internal/attr/error.h
+enc/trans/gbk.$(OBJEXT): internal/attr/flag_enum.h
+enc/trans/gbk.$(OBJEXT): internal/attr/forceinline.h
+enc/trans/gbk.$(OBJEXT): internal/attr/format.h
+enc/trans/gbk.$(OBJEXT): internal/attr/maybe_unused.h
+enc/trans/gbk.$(OBJEXT): internal/attr/noalias.h
+enc/trans/gbk.$(OBJEXT): internal/attr/nodiscard.h
+enc/trans/gbk.$(OBJEXT): internal/attr/noexcept.h
+enc/trans/gbk.$(OBJEXT): internal/attr/noinline.h
+enc/trans/gbk.$(OBJEXT): internal/attr/nonnull.h
+enc/trans/gbk.$(OBJEXT): internal/attr/noreturn.h
+enc/trans/gbk.$(OBJEXT): internal/attr/pure.h
+enc/trans/gbk.$(OBJEXT): internal/attr/restrict.h
+enc/trans/gbk.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/trans/gbk.$(OBJEXT): internal/attr/warning.h
+enc/trans/gbk.$(OBJEXT): internal/attr/weakref.h
+enc/trans/gbk.$(OBJEXT): internal/cast.h
+enc/trans/gbk.$(OBJEXT): internal/compiler_is.h
+enc/trans/gbk.$(OBJEXT): internal/compiler_is/apple.h
+enc/trans/gbk.$(OBJEXT): internal/compiler_is/clang.h
+enc/trans/gbk.$(OBJEXT): internal/compiler_is/gcc.h
+enc/trans/gbk.$(OBJEXT): internal/compiler_is/intel.h
+enc/trans/gbk.$(OBJEXT): internal/compiler_is/msvc.h
+enc/trans/gbk.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/trans/gbk.$(OBJEXT): internal/compiler_since.h
+enc/trans/gbk.$(OBJEXT): internal/config.h
+enc/trans/gbk.$(OBJEXT): internal/constant_p.h
+enc/trans/gbk.$(OBJEXT): internal/core.h
+enc/trans/gbk.$(OBJEXT): internal/core/rarray.h
+enc/trans/gbk.$(OBJEXT): internal/core/rbasic.h
+enc/trans/gbk.$(OBJEXT): internal/core/rbignum.h
+enc/trans/gbk.$(OBJEXT): internal/core/rclass.h
+enc/trans/gbk.$(OBJEXT): internal/core/rdata.h
+enc/trans/gbk.$(OBJEXT): internal/core/rfile.h
+enc/trans/gbk.$(OBJEXT): internal/core/rhash.h
+enc/trans/gbk.$(OBJEXT): internal/core/robject.h
+enc/trans/gbk.$(OBJEXT): internal/core/rregexp.h
+enc/trans/gbk.$(OBJEXT): internal/core/rstring.h
+enc/trans/gbk.$(OBJEXT): internal/core/rstruct.h
+enc/trans/gbk.$(OBJEXT): internal/core/rtypeddata.h
+enc/trans/gbk.$(OBJEXT): internal/ctype.h
+enc/trans/gbk.$(OBJEXT): internal/dllexport.h
+enc/trans/gbk.$(OBJEXT): internal/dosish.h
+enc/trans/gbk.$(OBJEXT): internal/error.h
+enc/trans/gbk.$(OBJEXT): internal/eval.h
+enc/trans/gbk.$(OBJEXT): internal/event.h
+enc/trans/gbk.$(OBJEXT): internal/fl_type.h
+enc/trans/gbk.$(OBJEXT): internal/gc.h
+enc/trans/gbk.$(OBJEXT): internal/glob.h
+enc/trans/gbk.$(OBJEXT): internal/globals.h
+enc/trans/gbk.$(OBJEXT): internal/has/attribute.h
+enc/trans/gbk.$(OBJEXT): internal/has/builtin.h
+enc/trans/gbk.$(OBJEXT): internal/has/c_attribute.h
+enc/trans/gbk.$(OBJEXT): internal/has/cpp_attribute.h
+enc/trans/gbk.$(OBJEXT): internal/has/declspec_attribute.h
+enc/trans/gbk.$(OBJEXT): internal/has/extension.h
+enc/trans/gbk.$(OBJEXT): internal/has/feature.h
+enc/trans/gbk.$(OBJEXT): internal/has/warning.h
+enc/trans/gbk.$(OBJEXT): internal/intern/array.h
+enc/trans/gbk.$(OBJEXT): internal/intern/bignum.h
+enc/trans/gbk.$(OBJEXT): internal/intern/class.h
+enc/trans/gbk.$(OBJEXT): internal/intern/compar.h
+enc/trans/gbk.$(OBJEXT): internal/intern/complex.h
+enc/trans/gbk.$(OBJEXT): internal/intern/cont.h
+enc/trans/gbk.$(OBJEXT): internal/intern/dir.h
+enc/trans/gbk.$(OBJEXT): internal/intern/enum.h
+enc/trans/gbk.$(OBJEXT): internal/intern/enumerator.h
+enc/trans/gbk.$(OBJEXT): internal/intern/error.h
+enc/trans/gbk.$(OBJEXT): internal/intern/eval.h
+enc/trans/gbk.$(OBJEXT): internal/intern/file.h
+enc/trans/gbk.$(OBJEXT): internal/intern/gc.h
+enc/trans/gbk.$(OBJEXT): internal/intern/hash.h
+enc/trans/gbk.$(OBJEXT): internal/intern/io.h
+enc/trans/gbk.$(OBJEXT): internal/intern/load.h
+enc/trans/gbk.$(OBJEXT): internal/intern/marshal.h
+enc/trans/gbk.$(OBJEXT): internal/intern/numeric.h
+enc/trans/gbk.$(OBJEXT): internal/intern/object.h
+enc/trans/gbk.$(OBJEXT): internal/intern/parse.h
+enc/trans/gbk.$(OBJEXT): internal/intern/proc.h
+enc/trans/gbk.$(OBJEXT): internal/intern/process.h
+enc/trans/gbk.$(OBJEXT): internal/intern/random.h
+enc/trans/gbk.$(OBJEXT): internal/intern/range.h
+enc/trans/gbk.$(OBJEXT): internal/intern/rational.h
+enc/trans/gbk.$(OBJEXT): internal/intern/re.h
+enc/trans/gbk.$(OBJEXT): internal/intern/ruby.h
+enc/trans/gbk.$(OBJEXT): internal/intern/select.h
+enc/trans/gbk.$(OBJEXT): internal/intern/select/largesize.h
+enc/trans/gbk.$(OBJEXT): internal/intern/signal.h
+enc/trans/gbk.$(OBJEXT): internal/intern/sprintf.h
+enc/trans/gbk.$(OBJEXT): internal/intern/string.h
+enc/trans/gbk.$(OBJEXT): internal/intern/struct.h
+enc/trans/gbk.$(OBJEXT): internal/intern/thread.h
+enc/trans/gbk.$(OBJEXT): internal/intern/time.h
+enc/trans/gbk.$(OBJEXT): internal/intern/variable.h
+enc/trans/gbk.$(OBJEXT): internal/intern/vm.h
+enc/trans/gbk.$(OBJEXT): internal/interpreter.h
+enc/trans/gbk.$(OBJEXT): internal/iterator.h
+enc/trans/gbk.$(OBJEXT): internal/memory.h
+enc/trans/gbk.$(OBJEXT): internal/method.h
+enc/trans/gbk.$(OBJEXT): internal/module.h
+enc/trans/gbk.$(OBJEXT): internal/newobj.h
+enc/trans/gbk.$(OBJEXT): internal/rgengc.h
+enc/trans/gbk.$(OBJEXT): internal/scan_args.h
+enc/trans/gbk.$(OBJEXT): internal/special_consts.h
+enc/trans/gbk.$(OBJEXT): internal/static_assert.h
+enc/trans/gbk.$(OBJEXT): internal/stdalign.h
+enc/trans/gbk.$(OBJEXT): internal/stdbool.h
+enc/trans/gbk.$(OBJEXT): internal/symbol.h
+enc/trans/gbk.$(OBJEXT): internal/token_paste.h
+enc/trans/gbk.$(OBJEXT): internal/value.h
+enc/trans/gbk.$(OBJEXT): internal/value_type.h
+enc/trans/gbk.$(OBJEXT): internal/variable.h
+enc/trans/gbk.$(OBJEXT): internal/warning_push.h
+enc/trans/gbk.$(OBJEXT): internal/xmalloc.h
+enc/trans/gbk.$(OBJEXT): assert.h
 enc/trans/gbk.$(OBJEXT): backward.h
+enc/trans/gbk.$(OBJEXT): backward/2/assume.h
+enc/trans/gbk.$(OBJEXT): backward/2/attributes.h
+enc/trans/gbk.$(OBJEXT): backward/2/bool.h
+enc/trans/gbk.$(OBJEXT): backward/2/gcc_version_since.h
+enc/trans/gbk.$(OBJEXT): backward/2/inttypes.h
+enc/trans/gbk.$(OBJEXT): backward/2/limits.h
+enc/trans/gbk.$(OBJEXT): backward/2/long_long.h
+enc/trans/gbk.$(OBJEXT): backward/2/stdalign.h
+enc/trans/gbk.$(OBJEXT): backward/2/stdarg.h
 enc/trans/gbk.$(OBJEXT): config.h
 enc/trans/gbk.$(OBJEXT): defines.h
 enc/trans/gbk.$(OBJEXT): enc/trans/gbk.c
@@ -507,7 +4147,157 @@ enc/trans/gbk.$(OBJEXT): st.h
 enc/trans/gbk.$(OBJEXT): subst.h
 enc/trans/iso2022.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 enc/trans/iso2022.$(OBJEXT): $(top_srcdir)/transcode_data.h
+enc/trans/iso2022.$(OBJEXT): internal/anyargs.h
+enc/trans/iso2022.$(OBJEXT): internal/arithmetic.h
+enc/trans/iso2022.$(OBJEXT): internal/arithmetic/char.h
+enc/trans/iso2022.$(OBJEXT): internal/arithmetic/double.h
+enc/trans/iso2022.$(OBJEXT): internal/arithmetic/fixnum.h
+enc/trans/iso2022.$(OBJEXT): internal/arithmetic/gid_t.h
+enc/trans/iso2022.$(OBJEXT): internal/arithmetic/int.h
+enc/trans/iso2022.$(OBJEXT): internal/arithmetic/intptr_t.h
+enc/trans/iso2022.$(OBJEXT): internal/arithmetic/long.h
+enc/trans/iso2022.$(OBJEXT): internal/arithmetic/long_long.h
+enc/trans/iso2022.$(OBJEXT): internal/arithmetic/mode_t.h
+enc/trans/iso2022.$(OBJEXT): internal/arithmetic/off_t.h
+enc/trans/iso2022.$(OBJEXT): internal/arithmetic/pid_t.h
+enc/trans/iso2022.$(OBJEXT): internal/arithmetic/short.h
+enc/trans/iso2022.$(OBJEXT): internal/arithmetic/size_t.h
+enc/trans/iso2022.$(OBJEXT): internal/arithmetic/st_data_t.h
+enc/trans/iso2022.$(OBJEXT): internal/arithmetic/uid_t.h
+enc/trans/iso2022.$(OBJEXT): internal/assume.h
+enc/trans/iso2022.$(OBJEXT): internal/attr/alloc_size.h
+enc/trans/iso2022.$(OBJEXT): internal/attr/artificial.h
+enc/trans/iso2022.$(OBJEXT): internal/attr/cold.h
+enc/trans/iso2022.$(OBJEXT): internal/attr/const.h
+enc/trans/iso2022.$(OBJEXT): internal/attr/constexpr.h
+enc/trans/iso2022.$(OBJEXT): internal/attr/deprecated.h
+enc/trans/iso2022.$(OBJEXT): internal/attr/diagnose_if.h
+enc/trans/iso2022.$(OBJEXT): internal/attr/enum_extensibility.h
+enc/trans/iso2022.$(OBJEXT): internal/attr/error.h
+enc/trans/iso2022.$(OBJEXT): internal/attr/flag_enum.h
+enc/trans/iso2022.$(OBJEXT): internal/attr/forceinline.h
+enc/trans/iso2022.$(OBJEXT): internal/attr/format.h
+enc/trans/iso2022.$(OBJEXT): internal/attr/maybe_unused.h
+enc/trans/iso2022.$(OBJEXT): internal/attr/noalias.h
+enc/trans/iso2022.$(OBJEXT): internal/attr/nodiscard.h
+enc/trans/iso2022.$(OBJEXT): internal/attr/noexcept.h
+enc/trans/iso2022.$(OBJEXT): internal/attr/noinline.h
+enc/trans/iso2022.$(OBJEXT): internal/attr/nonnull.h
+enc/trans/iso2022.$(OBJEXT): internal/attr/noreturn.h
+enc/trans/iso2022.$(OBJEXT): internal/attr/pure.h
+enc/trans/iso2022.$(OBJEXT): internal/attr/restrict.h
+enc/trans/iso2022.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/trans/iso2022.$(OBJEXT): internal/attr/warning.h
+enc/trans/iso2022.$(OBJEXT): internal/attr/weakref.h
+enc/trans/iso2022.$(OBJEXT): internal/cast.h
+enc/trans/iso2022.$(OBJEXT): internal/compiler_is.h
+enc/trans/iso2022.$(OBJEXT): internal/compiler_is/apple.h
+enc/trans/iso2022.$(OBJEXT): internal/compiler_is/clang.h
+enc/trans/iso2022.$(OBJEXT): internal/compiler_is/gcc.h
+enc/trans/iso2022.$(OBJEXT): internal/compiler_is/intel.h
+enc/trans/iso2022.$(OBJEXT): internal/compiler_is/msvc.h
+enc/trans/iso2022.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/trans/iso2022.$(OBJEXT): internal/compiler_since.h
+enc/trans/iso2022.$(OBJEXT): internal/config.h
+enc/trans/iso2022.$(OBJEXT): internal/constant_p.h
+enc/trans/iso2022.$(OBJEXT): internal/core.h
+enc/trans/iso2022.$(OBJEXT): internal/core/rarray.h
+enc/trans/iso2022.$(OBJEXT): internal/core/rbasic.h
+enc/trans/iso2022.$(OBJEXT): internal/core/rbignum.h
+enc/trans/iso2022.$(OBJEXT): internal/core/rclass.h
+enc/trans/iso2022.$(OBJEXT): internal/core/rdata.h
+enc/trans/iso2022.$(OBJEXT): internal/core/rfile.h
+enc/trans/iso2022.$(OBJEXT): internal/core/rhash.h
+enc/trans/iso2022.$(OBJEXT): internal/core/robject.h
+enc/trans/iso2022.$(OBJEXT): internal/core/rregexp.h
+enc/trans/iso2022.$(OBJEXT): internal/core/rstring.h
+enc/trans/iso2022.$(OBJEXT): internal/core/rstruct.h
+enc/trans/iso2022.$(OBJEXT): internal/core/rtypeddata.h
+enc/trans/iso2022.$(OBJEXT): internal/ctype.h
+enc/trans/iso2022.$(OBJEXT): internal/dllexport.h
+enc/trans/iso2022.$(OBJEXT): internal/dosish.h
+enc/trans/iso2022.$(OBJEXT): internal/error.h
+enc/trans/iso2022.$(OBJEXT): internal/eval.h
+enc/trans/iso2022.$(OBJEXT): internal/event.h
+enc/trans/iso2022.$(OBJEXT): internal/fl_type.h
+enc/trans/iso2022.$(OBJEXT): internal/gc.h
+enc/trans/iso2022.$(OBJEXT): internal/glob.h
+enc/trans/iso2022.$(OBJEXT): internal/globals.h
+enc/trans/iso2022.$(OBJEXT): internal/has/attribute.h
+enc/trans/iso2022.$(OBJEXT): internal/has/builtin.h
+enc/trans/iso2022.$(OBJEXT): internal/has/c_attribute.h
+enc/trans/iso2022.$(OBJEXT): internal/has/cpp_attribute.h
+enc/trans/iso2022.$(OBJEXT): internal/has/declspec_attribute.h
+enc/trans/iso2022.$(OBJEXT): internal/has/extension.h
+enc/trans/iso2022.$(OBJEXT): internal/has/feature.h
+enc/trans/iso2022.$(OBJEXT): internal/has/warning.h
+enc/trans/iso2022.$(OBJEXT): internal/intern/array.h
+enc/trans/iso2022.$(OBJEXT): internal/intern/bignum.h
+enc/trans/iso2022.$(OBJEXT): internal/intern/class.h
+enc/trans/iso2022.$(OBJEXT): internal/intern/compar.h
+enc/trans/iso2022.$(OBJEXT): internal/intern/complex.h
+enc/trans/iso2022.$(OBJEXT): internal/intern/cont.h
+enc/trans/iso2022.$(OBJEXT): internal/intern/dir.h
+enc/trans/iso2022.$(OBJEXT): internal/intern/enum.h
+enc/trans/iso2022.$(OBJEXT): internal/intern/enumerator.h
+enc/trans/iso2022.$(OBJEXT): internal/intern/error.h
+enc/trans/iso2022.$(OBJEXT): internal/intern/eval.h
+enc/trans/iso2022.$(OBJEXT): internal/intern/file.h
+enc/trans/iso2022.$(OBJEXT): internal/intern/gc.h
+enc/trans/iso2022.$(OBJEXT): internal/intern/hash.h
+enc/trans/iso2022.$(OBJEXT): internal/intern/io.h
+enc/trans/iso2022.$(OBJEXT): internal/intern/load.h
+enc/trans/iso2022.$(OBJEXT): internal/intern/marshal.h
+enc/trans/iso2022.$(OBJEXT): internal/intern/numeric.h
+enc/trans/iso2022.$(OBJEXT): internal/intern/object.h
+enc/trans/iso2022.$(OBJEXT): internal/intern/parse.h
+enc/trans/iso2022.$(OBJEXT): internal/intern/proc.h
+enc/trans/iso2022.$(OBJEXT): internal/intern/process.h
+enc/trans/iso2022.$(OBJEXT): internal/intern/random.h
+enc/trans/iso2022.$(OBJEXT): internal/intern/range.h
+enc/trans/iso2022.$(OBJEXT): internal/intern/rational.h
+enc/trans/iso2022.$(OBJEXT): internal/intern/re.h
+enc/trans/iso2022.$(OBJEXT): internal/intern/ruby.h
+enc/trans/iso2022.$(OBJEXT): internal/intern/select.h
+enc/trans/iso2022.$(OBJEXT): internal/intern/select/largesize.h
+enc/trans/iso2022.$(OBJEXT): internal/intern/signal.h
+enc/trans/iso2022.$(OBJEXT): internal/intern/sprintf.h
+enc/trans/iso2022.$(OBJEXT): internal/intern/string.h
+enc/trans/iso2022.$(OBJEXT): internal/intern/struct.h
+enc/trans/iso2022.$(OBJEXT): internal/intern/thread.h
+enc/trans/iso2022.$(OBJEXT): internal/intern/time.h
+enc/trans/iso2022.$(OBJEXT): internal/intern/variable.h
+enc/trans/iso2022.$(OBJEXT): internal/intern/vm.h
+enc/trans/iso2022.$(OBJEXT): internal/interpreter.h
+enc/trans/iso2022.$(OBJEXT): internal/iterator.h
+enc/trans/iso2022.$(OBJEXT): internal/memory.h
+enc/trans/iso2022.$(OBJEXT): internal/method.h
+enc/trans/iso2022.$(OBJEXT): internal/module.h
+enc/trans/iso2022.$(OBJEXT): internal/newobj.h
+enc/trans/iso2022.$(OBJEXT): internal/rgengc.h
+enc/trans/iso2022.$(OBJEXT): internal/scan_args.h
+enc/trans/iso2022.$(OBJEXT): internal/special_consts.h
+enc/trans/iso2022.$(OBJEXT): internal/static_assert.h
+enc/trans/iso2022.$(OBJEXT): internal/stdalign.h
+enc/trans/iso2022.$(OBJEXT): internal/stdbool.h
+enc/trans/iso2022.$(OBJEXT): internal/symbol.h
+enc/trans/iso2022.$(OBJEXT): internal/token_paste.h
+enc/trans/iso2022.$(OBJEXT): internal/value.h
+enc/trans/iso2022.$(OBJEXT): internal/value_type.h
+enc/trans/iso2022.$(OBJEXT): internal/variable.h
+enc/trans/iso2022.$(OBJEXT): internal/warning_push.h
+enc/trans/iso2022.$(OBJEXT): internal/xmalloc.h
+enc/trans/iso2022.$(OBJEXT): assert.h
 enc/trans/iso2022.$(OBJEXT): backward.h
+enc/trans/iso2022.$(OBJEXT): backward/2/assume.h
+enc/trans/iso2022.$(OBJEXT): backward/2/attributes.h
+enc/trans/iso2022.$(OBJEXT): backward/2/bool.h
+enc/trans/iso2022.$(OBJEXT): backward/2/gcc_version_since.h
+enc/trans/iso2022.$(OBJEXT): backward/2/inttypes.h
+enc/trans/iso2022.$(OBJEXT): backward/2/limits.h
+enc/trans/iso2022.$(OBJEXT): backward/2/long_long.h
+enc/trans/iso2022.$(OBJEXT): backward/2/stdalign.h
+enc/trans/iso2022.$(OBJEXT): backward/2/stdarg.h
 enc/trans/iso2022.$(OBJEXT): config.h
 enc/trans/iso2022.$(OBJEXT): defines.h
 enc/trans/iso2022.$(OBJEXT): enc/trans/iso2022.c
@@ -517,7 +4307,157 @@ enc/trans/iso2022.$(OBJEXT): st.h
 enc/trans/iso2022.$(OBJEXT): subst.h
 enc/trans/japanese.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 enc/trans/japanese.$(OBJEXT): $(top_srcdir)/transcode_data.h
+enc/trans/japanese.$(OBJEXT): internal/anyargs.h
+enc/trans/japanese.$(OBJEXT): internal/arithmetic.h
+enc/trans/japanese.$(OBJEXT): internal/arithmetic/char.h
+enc/trans/japanese.$(OBJEXT): internal/arithmetic/double.h
+enc/trans/japanese.$(OBJEXT): internal/arithmetic/fixnum.h
+enc/trans/japanese.$(OBJEXT): internal/arithmetic/gid_t.h
+enc/trans/japanese.$(OBJEXT): internal/arithmetic/int.h
+enc/trans/japanese.$(OBJEXT): internal/arithmetic/intptr_t.h
+enc/trans/japanese.$(OBJEXT): internal/arithmetic/long.h
+enc/trans/japanese.$(OBJEXT): internal/arithmetic/long_long.h
+enc/trans/japanese.$(OBJEXT): internal/arithmetic/mode_t.h
+enc/trans/japanese.$(OBJEXT): internal/arithmetic/off_t.h
+enc/trans/japanese.$(OBJEXT): internal/arithmetic/pid_t.h
+enc/trans/japanese.$(OBJEXT): internal/arithmetic/short.h
+enc/trans/japanese.$(OBJEXT): internal/arithmetic/size_t.h
+enc/trans/japanese.$(OBJEXT): internal/arithmetic/st_data_t.h
+enc/trans/japanese.$(OBJEXT): internal/arithmetic/uid_t.h
+enc/trans/japanese.$(OBJEXT): internal/assume.h
+enc/trans/japanese.$(OBJEXT): internal/attr/alloc_size.h
+enc/trans/japanese.$(OBJEXT): internal/attr/artificial.h
+enc/trans/japanese.$(OBJEXT): internal/attr/cold.h
+enc/trans/japanese.$(OBJEXT): internal/attr/const.h
+enc/trans/japanese.$(OBJEXT): internal/attr/constexpr.h
+enc/trans/japanese.$(OBJEXT): internal/attr/deprecated.h
+enc/trans/japanese.$(OBJEXT): internal/attr/diagnose_if.h
+enc/trans/japanese.$(OBJEXT): internal/attr/enum_extensibility.h
+enc/trans/japanese.$(OBJEXT): internal/attr/error.h
+enc/trans/japanese.$(OBJEXT): internal/attr/flag_enum.h
+enc/trans/japanese.$(OBJEXT): internal/attr/forceinline.h
+enc/trans/japanese.$(OBJEXT): internal/attr/format.h
+enc/trans/japanese.$(OBJEXT): internal/attr/maybe_unused.h
+enc/trans/japanese.$(OBJEXT): internal/attr/noalias.h
+enc/trans/japanese.$(OBJEXT): internal/attr/nodiscard.h
+enc/trans/japanese.$(OBJEXT): internal/attr/noexcept.h
+enc/trans/japanese.$(OBJEXT): internal/attr/noinline.h
+enc/trans/japanese.$(OBJEXT): internal/attr/nonnull.h
+enc/trans/japanese.$(OBJEXT): internal/attr/noreturn.h
+enc/trans/japanese.$(OBJEXT): internal/attr/pure.h
+enc/trans/japanese.$(OBJEXT): internal/attr/restrict.h
+enc/trans/japanese.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/trans/japanese.$(OBJEXT): internal/attr/warning.h
+enc/trans/japanese.$(OBJEXT): internal/attr/weakref.h
+enc/trans/japanese.$(OBJEXT): internal/cast.h
+enc/trans/japanese.$(OBJEXT): internal/compiler_is.h
+enc/trans/japanese.$(OBJEXT): internal/compiler_is/apple.h
+enc/trans/japanese.$(OBJEXT): internal/compiler_is/clang.h
+enc/trans/japanese.$(OBJEXT): internal/compiler_is/gcc.h
+enc/trans/japanese.$(OBJEXT): internal/compiler_is/intel.h
+enc/trans/japanese.$(OBJEXT): internal/compiler_is/msvc.h
+enc/trans/japanese.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/trans/japanese.$(OBJEXT): internal/compiler_since.h
+enc/trans/japanese.$(OBJEXT): internal/config.h
+enc/trans/japanese.$(OBJEXT): internal/constant_p.h
+enc/trans/japanese.$(OBJEXT): internal/core.h
+enc/trans/japanese.$(OBJEXT): internal/core/rarray.h
+enc/trans/japanese.$(OBJEXT): internal/core/rbasic.h
+enc/trans/japanese.$(OBJEXT): internal/core/rbignum.h
+enc/trans/japanese.$(OBJEXT): internal/core/rclass.h
+enc/trans/japanese.$(OBJEXT): internal/core/rdata.h
+enc/trans/japanese.$(OBJEXT): internal/core/rfile.h
+enc/trans/japanese.$(OBJEXT): internal/core/rhash.h
+enc/trans/japanese.$(OBJEXT): internal/core/robject.h
+enc/trans/japanese.$(OBJEXT): internal/core/rregexp.h
+enc/trans/japanese.$(OBJEXT): internal/core/rstring.h
+enc/trans/japanese.$(OBJEXT): internal/core/rstruct.h
+enc/trans/japanese.$(OBJEXT): internal/core/rtypeddata.h
+enc/trans/japanese.$(OBJEXT): internal/ctype.h
+enc/trans/japanese.$(OBJEXT): internal/dllexport.h
+enc/trans/japanese.$(OBJEXT): internal/dosish.h
+enc/trans/japanese.$(OBJEXT): internal/error.h
+enc/trans/japanese.$(OBJEXT): internal/eval.h
+enc/trans/japanese.$(OBJEXT): internal/event.h
+enc/trans/japanese.$(OBJEXT): internal/fl_type.h
+enc/trans/japanese.$(OBJEXT): internal/gc.h
+enc/trans/japanese.$(OBJEXT): internal/glob.h
+enc/trans/japanese.$(OBJEXT): internal/globals.h
+enc/trans/japanese.$(OBJEXT): internal/has/attribute.h
+enc/trans/japanese.$(OBJEXT): internal/has/builtin.h
+enc/trans/japanese.$(OBJEXT): internal/has/c_attribute.h
+enc/trans/japanese.$(OBJEXT): internal/has/cpp_attribute.h
+enc/trans/japanese.$(OBJEXT): internal/has/declspec_attribute.h
+enc/trans/japanese.$(OBJEXT): internal/has/extension.h
+enc/trans/japanese.$(OBJEXT): internal/has/feature.h
+enc/trans/japanese.$(OBJEXT): internal/has/warning.h
+enc/trans/japanese.$(OBJEXT): internal/intern/array.h
+enc/trans/japanese.$(OBJEXT): internal/intern/bignum.h
+enc/trans/japanese.$(OBJEXT): internal/intern/class.h
+enc/trans/japanese.$(OBJEXT): internal/intern/compar.h
+enc/trans/japanese.$(OBJEXT): internal/intern/complex.h
+enc/trans/japanese.$(OBJEXT): internal/intern/cont.h
+enc/trans/japanese.$(OBJEXT): internal/intern/dir.h
+enc/trans/japanese.$(OBJEXT): internal/intern/enum.h
+enc/trans/japanese.$(OBJEXT): internal/intern/enumerator.h
+enc/trans/japanese.$(OBJEXT): internal/intern/error.h
+enc/trans/japanese.$(OBJEXT): internal/intern/eval.h
+enc/trans/japanese.$(OBJEXT): internal/intern/file.h
+enc/trans/japanese.$(OBJEXT): internal/intern/gc.h
+enc/trans/japanese.$(OBJEXT): internal/intern/hash.h
+enc/trans/japanese.$(OBJEXT): internal/intern/io.h
+enc/trans/japanese.$(OBJEXT): internal/intern/load.h
+enc/trans/japanese.$(OBJEXT): internal/intern/marshal.h
+enc/trans/japanese.$(OBJEXT): internal/intern/numeric.h
+enc/trans/japanese.$(OBJEXT): internal/intern/object.h
+enc/trans/japanese.$(OBJEXT): internal/intern/parse.h
+enc/trans/japanese.$(OBJEXT): internal/intern/proc.h
+enc/trans/japanese.$(OBJEXT): internal/intern/process.h
+enc/trans/japanese.$(OBJEXT): internal/intern/random.h
+enc/trans/japanese.$(OBJEXT): internal/intern/range.h
+enc/trans/japanese.$(OBJEXT): internal/intern/rational.h
+enc/trans/japanese.$(OBJEXT): internal/intern/re.h
+enc/trans/japanese.$(OBJEXT): internal/intern/ruby.h
+enc/trans/japanese.$(OBJEXT): internal/intern/select.h
+enc/trans/japanese.$(OBJEXT): internal/intern/select/largesize.h
+enc/trans/japanese.$(OBJEXT): internal/intern/signal.h
+enc/trans/japanese.$(OBJEXT): internal/intern/sprintf.h
+enc/trans/japanese.$(OBJEXT): internal/intern/string.h
+enc/trans/japanese.$(OBJEXT): internal/intern/struct.h
+enc/trans/japanese.$(OBJEXT): internal/intern/thread.h
+enc/trans/japanese.$(OBJEXT): internal/intern/time.h
+enc/trans/japanese.$(OBJEXT): internal/intern/variable.h
+enc/trans/japanese.$(OBJEXT): internal/intern/vm.h
+enc/trans/japanese.$(OBJEXT): internal/interpreter.h
+enc/trans/japanese.$(OBJEXT): internal/iterator.h
+enc/trans/japanese.$(OBJEXT): internal/memory.h
+enc/trans/japanese.$(OBJEXT): internal/method.h
+enc/trans/japanese.$(OBJEXT): internal/module.h
+enc/trans/japanese.$(OBJEXT): internal/newobj.h
+enc/trans/japanese.$(OBJEXT): internal/rgengc.h
+enc/trans/japanese.$(OBJEXT): internal/scan_args.h
+enc/trans/japanese.$(OBJEXT): internal/special_consts.h
+enc/trans/japanese.$(OBJEXT): internal/static_assert.h
+enc/trans/japanese.$(OBJEXT): internal/stdalign.h
+enc/trans/japanese.$(OBJEXT): internal/stdbool.h
+enc/trans/japanese.$(OBJEXT): internal/symbol.h
+enc/trans/japanese.$(OBJEXT): internal/token_paste.h
+enc/trans/japanese.$(OBJEXT): internal/value.h
+enc/trans/japanese.$(OBJEXT): internal/value_type.h
+enc/trans/japanese.$(OBJEXT): internal/variable.h
+enc/trans/japanese.$(OBJEXT): internal/warning_push.h
+enc/trans/japanese.$(OBJEXT): internal/xmalloc.h
+enc/trans/japanese.$(OBJEXT): assert.h
 enc/trans/japanese.$(OBJEXT): backward.h
+enc/trans/japanese.$(OBJEXT): backward/2/assume.h
+enc/trans/japanese.$(OBJEXT): backward/2/attributes.h
+enc/trans/japanese.$(OBJEXT): backward/2/bool.h
+enc/trans/japanese.$(OBJEXT): backward/2/gcc_version_since.h
+enc/trans/japanese.$(OBJEXT): backward/2/inttypes.h
+enc/trans/japanese.$(OBJEXT): backward/2/limits.h
+enc/trans/japanese.$(OBJEXT): backward/2/long_long.h
+enc/trans/japanese.$(OBJEXT): backward/2/stdalign.h
+enc/trans/japanese.$(OBJEXT): backward/2/stdarg.h
 enc/trans/japanese.$(OBJEXT): config.h
 enc/trans/japanese.$(OBJEXT): defines.h
 enc/trans/japanese.$(OBJEXT): enc/trans/japanese.c
@@ -527,7 +4467,157 @@ enc/trans/japanese.$(OBJEXT): st.h
 enc/trans/japanese.$(OBJEXT): subst.h
 enc/trans/japanese_euc.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 enc/trans/japanese_euc.$(OBJEXT): $(top_srcdir)/transcode_data.h
+enc/trans/japanese_euc.$(OBJEXT): internal/anyargs.h
+enc/trans/japanese_euc.$(OBJEXT): internal/arithmetic.h
+enc/trans/japanese_euc.$(OBJEXT): internal/arithmetic/char.h
+enc/trans/japanese_euc.$(OBJEXT): internal/arithmetic/double.h
+enc/trans/japanese_euc.$(OBJEXT): internal/arithmetic/fixnum.h
+enc/trans/japanese_euc.$(OBJEXT): internal/arithmetic/gid_t.h
+enc/trans/japanese_euc.$(OBJEXT): internal/arithmetic/int.h
+enc/trans/japanese_euc.$(OBJEXT): internal/arithmetic/intptr_t.h
+enc/trans/japanese_euc.$(OBJEXT): internal/arithmetic/long.h
+enc/trans/japanese_euc.$(OBJEXT): internal/arithmetic/long_long.h
+enc/trans/japanese_euc.$(OBJEXT): internal/arithmetic/mode_t.h
+enc/trans/japanese_euc.$(OBJEXT): internal/arithmetic/off_t.h
+enc/trans/japanese_euc.$(OBJEXT): internal/arithmetic/pid_t.h
+enc/trans/japanese_euc.$(OBJEXT): internal/arithmetic/short.h
+enc/trans/japanese_euc.$(OBJEXT): internal/arithmetic/size_t.h
+enc/trans/japanese_euc.$(OBJEXT): internal/arithmetic/st_data_t.h
+enc/trans/japanese_euc.$(OBJEXT): internal/arithmetic/uid_t.h
+enc/trans/japanese_euc.$(OBJEXT): internal/assume.h
+enc/trans/japanese_euc.$(OBJEXT): internal/attr/alloc_size.h
+enc/trans/japanese_euc.$(OBJEXT): internal/attr/artificial.h
+enc/trans/japanese_euc.$(OBJEXT): internal/attr/cold.h
+enc/trans/japanese_euc.$(OBJEXT): internal/attr/const.h
+enc/trans/japanese_euc.$(OBJEXT): internal/attr/constexpr.h
+enc/trans/japanese_euc.$(OBJEXT): internal/attr/deprecated.h
+enc/trans/japanese_euc.$(OBJEXT): internal/attr/diagnose_if.h
+enc/trans/japanese_euc.$(OBJEXT): internal/attr/enum_extensibility.h
+enc/trans/japanese_euc.$(OBJEXT): internal/attr/error.h
+enc/trans/japanese_euc.$(OBJEXT): internal/attr/flag_enum.h
+enc/trans/japanese_euc.$(OBJEXT): internal/attr/forceinline.h
+enc/trans/japanese_euc.$(OBJEXT): internal/attr/format.h
+enc/trans/japanese_euc.$(OBJEXT): internal/attr/maybe_unused.h
+enc/trans/japanese_euc.$(OBJEXT): internal/attr/noalias.h
+enc/trans/japanese_euc.$(OBJEXT): internal/attr/nodiscard.h
+enc/trans/japanese_euc.$(OBJEXT): internal/attr/noexcept.h
+enc/trans/japanese_euc.$(OBJEXT): internal/attr/noinline.h
+enc/trans/japanese_euc.$(OBJEXT): internal/attr/nonnull.h
+enc/trans/japanese_euc.$(OBJEXT): internal/attr/noreturn.h
+enc/trans/japanese_euc.$(OBJEXT): internal/attr/pure.h
+enc/trans/japanese_euc.$(OBJEXT): internal/attr/restrict.h
+enc/trans/japanese_euc.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/trans/japanese_euc.$(OBJEXT): internal/attr/warning.h
+enc/trans/japanese_euc.$(OBJEXT): internal/attr/weakref.h
+enc/trans/japanese_euc.$(OBJEXT): internal/cast.h
+enc/trans/japanese_euc.$(OBJEXT): internal/compiler_is.h
+enc/trans/japanese_euc.$(OBJEXT): internal/compiler_is/apple.h
+enc/trans/japanese_euc.$(OBJEXT): internal/compiler_is/clang.h
+enc/trans/japanese_euc.$(OBJEXT): internal/compiler_is/gcc.h
+enc/trans/japanese_euc.$(OBJEXT): internal/compiler_is/intel.h
+enc/trans/japanese_euc.$(OBJEXT): internal/compiler_is/msvc.h
+enc/trans/japanese_euc.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/trans/japanese_euc.$(OBJEXT): internal/compiler_since.h
+enc/trans/japanese_euc.$(OBJEXT): internal/config.h
+enc/trans/japanese_euc.$(OBJEXT): internal/constant_p.h
+enc/trans/japanese_euc.$(OBJEXT): internal/core.h
+enc/trans/japanese_euc.$(OBJEXT): internal/core/rarray.h
+enc/trans/japanese_euc.$(OBJEXT): internal/core/rbasic.h
+enc/trans/japanese_euc.$(OBJEXT): internal/core/rbignum.h
+enc/trans/japanese_euc.$(OBJEXT): internal/core/rclass.h
+enc/trans/japanese_euc.$(OBJEXT): internal/core/rdata.h
+enc/trans/japanese_euc.$(OBJEXT): internal/core/rfile.h
+enc/trans/japanese_euc.$(OBJEXT): internal/core/rhash.h
+enc/trans/japanese_euc.$(OBJEXT): internal/core/robject.h
+enc/trans/japanese_euc.$(OBJEXT): internal/core/rregexp.h
+enc/trans/japanese_euc.$(OBJEXT): internal/core/rstring.h
+enc/trans/japanese_euc.$(OBJEXT): internal/core/rstruct.h
+enc/trans/japanese_euc.$(OBJEXT): internal/core/rtypeddata.h
+enc/trans/japanese_euc.$(OBJEXT): internal/ctype.h
+enc/trans/japanese_euc.$(OBJEXT): internal/dllexport.h
+enc/trans/japanese_euc.$(OBJEXT): internal/dosish.h
+enc/trans/japanese_euc.$(OBJEXT): internal/error.h
+enc/trans/japanese_euc.$(OBJEXT): internal/eval.h
+enc/trans/japanese_euc.$(OBJEXT): internal/event.h
+enc/trans/japanese_euc.$(OBJEXT): internal/fl_type.h
+enc/trans/japanese_euc.$(OBJEXT): internal/gc.h
+enc/trans/japanese_euc.$(OBJEXT): internal/glob.h
+enc/trans/japanese_euc.$(OBJEXT): internal/globals.h
+enc/trans/japanese_euc.$(OBJEXT): internal/has/attribute.h
+enc/trans/japanese_euc.$(OBJEXT): internal/has/builtin.h
+enc/trans/japanese_euc.$(OBJEXT): internal/has/c_attribute.h
+enc/trans/japanese_euc.$(OBJEXT): internal/has/cpp_attribute.h
+enc/trans/japanese_euc.$(OBJEXT): internal/has/declspec_attribute.h
+enc/trans/japanese_euc.$(OBJEXT): internal/has/extension.h
+enc/trans/japanese_euc.$(OBJEXT): internal/has/feature.h
+enc/trans/japanese_euc.$(OBJEXT): internal/has/warning.h
+enc/trans/japanese_euc.$(OBJEXT): internal/intern/array.h
+enc/trans/japanese_euc.$(OBJEXT): internal/intern/bignum.h
+enc/trans/japanese_euc.$(OBJEXT): internal/intern/class.h
+enc/trans/japanese_euc.$(OBJEXT): internal/intern/compar.h
+enc/trans/japanese_euc.$(OBJEXT): internal/intern/complex.h
+enc/trans/japanese_euc.$(OBJEXT): internal/intern/cont.h
+enc/trans/japanese_euc.$(OBJEXT): internal/intern/dir.h
+enc/trans/japanese_euc.$(OBJEXT): internal/intern/enum.h
+enc/trans/japanese_euc.$(OBJEXT): internal/intern/enumerator.h
+enc/trans/japanese_euc.$(OBJEXT): internal/intern/error.h
+enc/trans/japanese_euc.$(OBJEXT): internal/intern/eval.h
+enc/trans/japanese_euc.$(OBJEXT): internal/intern/file.h
+enc/trans/japanese_euc.$(OBJEXT): internal/intern/gc.h
+enc/trans/japanese_euc.$(OBJEXT): internal/intern/hash.h
+enc/trans/japanese_euc.$(OBJEXT): internal/intern/io.h
+enc/trans/japanese_euc.$(OBJEXT): internal/intern/load.h
+enc/trans/japanese_euc.$(OBJEXT): internal/intern/marshal.h
+enc/trans/japanese_euc.$(OBJEXT): internal/intern/numeric.h
+enc/trans/japanese_euc.$(OBJEXT): internal/intern/object.h
+enc/trans/japanese_euc.$(OBJEXT): internal/intern/parse.h
+enc/trans/japanese_euc.$(OBJEXT): internal/intern/proc.h
+enc/trans/japanese_euc.$(OBJEXT): internal/intern/process.h
+enc/trans/japanese_euc.$(OBJEXT): internal/intern/random.h
+enc/trans/japanese_euc.$(OBJEXT): internal/intern/range.h
+enc/trans/japanese_euc.$(OBJEXT): internal/intern/rational.h
+enc/trans/japanese_euc.$(OBJEXT): internal/intern/re.h
+enc/trans/japanese_euc.$(OBJEXT): internal/intern/ruby.h
+enc/trans/japanese_euc.$(OBJEXT): internal/intern/select.h
+enc/trans/japanese_euc.$(OBJEXT): internal/intern/select/largesize.h
+enc/trans/japanese_euc.$(OBJEXT): internal/intern/signal.h
+enc/trans/japanese_euc.$(OBJEXT): internal/intern/sprintf.h
+enc/trans/japanese_euc.$(OBJEXT): internal/intern/string.h
+enc/trans/japanese_euc.$(OBJEXT): internal/intern/struct.h
+enc/trans/japanese_euc.$(OBJEXT): internal/intern/thread.h
+enc/trans/japanese_euc.$(OBJEXT): internal/intern/time.h
+enc/trans/japanese_euc.$(OBJEXT): internal/intern/variable.h
+enc/trans/japanese_euc.$(OBJEXT): internal/intern/vm.h
+enc/trans/japanese_euc.$(OBJEXT): internal/interpreter.h
+enc/trans/japanese_euc.$(OBJEXT): internal/iterator.h
+enc/trans/japanese_euc.$(OBJEXT): internal/memory.h
+enc/trans/japanese_euc.$(OBJEXT): internal/method.h
+enc/trans/japanese_euc.$(OBJEXT): internal/module.h
+enc/trans/japanese_euc.$(OBJEXT): internal/newobj.h
+enc/trans/japanese_euc.$(OBJEXT): internal/rgengc.h
+enc/trans/japanese_euc.$(OBJEXT): internal/scan_args.h
+enc/trans/japanese_euc.$(OBJEXT): internal/special_consts.h
+enc/trans/japanese_euc.$(OBJEXT): internal/static_assert.h
+enc/trans/japanese_euc.$(OBJEXT): internal/stdalign.h
+enc/trans/japanese_euc.$(OBJEXT): internal/stdbool.h
+enc/trans/japanese_euc.$(OBJEXT): internal/symbol.h
+enc/trans/japanese_euc.$(OBJEXT): internal/token_paste.h
+enc/trans/japanese_euc.$(OBJEXT): internal/value.h
+enc/trans/japanese_euc.$(OBJEXT): internal/value_type.h
+enc/trans/japanese_euc.$(OBJEXT): internal/variable.h
+enc/trans/japanese_euc.$(OBJEXT): internal/warning_push.h
+enc/trans/japanese_euc.$(OBJEXT): internal/xmalloc.h
+enc/trans/japanese_euc.$(OBJEXT): assert.h
 enc/trans/japanese_euc.$(OBJEXT): backward.h
+enc/trans/japanese_euc.$(OBJEXT): backward/2/assume.h
+enc/trans/japanese_euc.$(OBJEXT): backward/2/attributes.h
+enc/trans/japanese_euc.$(OBJEXT): backward/2/bool.h
+enc/trans/japanese_euc.$(OBJEXT): backward/2/gcc_version_since.h
+enc/trans/japanese_euc.$(OBJEXT): backward/2/inttypes.h
+enc/trans/japanese_euc.$(OBJEXT): backward/2/limits.h
+enc/trans/japanese_euc.$(OBJEXT): backward/2/long_long.h
+enc/trans/japanese_euc.$(OBJEXT): backward/2/stdalign.h
+enc/trans/japanese_euc.$(OBJEXT): backward/2/stdarg.h
 enc/trans/japanese_euc.$(OBJEXT): config.h
 enc/trans/japanese_euc.$(OBJEXT): defines.h
 enc/trans/japanese_euc.$(OBJEXT): enc/trans/japanese_euc.c
@@ -537,7 +4627,157 @@ enc/trans/japanese_euc.$(OBJEXT): st.h
 enc/trans/japanese_euc.$(OBJEXT): subst.h
 enc/trans/japanese_sjis.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 enc/trans/japanese_sjis.$(OBJEXT): $(top_srcdir)/transcode_data.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/anyargs.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/arithmetic.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/arithmetic/char.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/arithmetic/double.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/arithmetic/fixnum.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/arithmetic/gid_t.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/arithmetic/int.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/arithmetic/intptr_t.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/arithmetic/long.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/arithmetic/long_long.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/arithmetic/mode_t.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/arithmetic/off_t.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/arithmetic/pid_t.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/arithmetic/short.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/arithmetic/size_t.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/arithmetic/st_data_t.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/arithmetic/uid_t.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/assume.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/attr/alloc_size.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/attr/artificial.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/attr/cold.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/attr/const.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/attr/constexpr.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/attr/deprecated.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/attr/diagnose_if.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/attr/enum_extensibility.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/attr/error.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/attr/flag_enum.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/attr/forceinline.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/attr/format.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/attr/maybe_unused.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/attr/noalias.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/attr/nodiscard.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/attr/noexcept.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/attr/noinline.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/attr/nonnull.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/attr/noreturn.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/attr/pure.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/attr/restrict.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/attr/warning.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/attr/weakref.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/cast.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/compiler_is.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/compiler_is/apple.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/compiler_is/clang.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/compiler_is/gcc.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/compiler_is/intel.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/compiler_is/msvc.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/compiler_since.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/config.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/constant_p.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/core.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/core/rarray.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/core/rbasic.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/core/rbignum.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/core/rclass.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/core/rdata.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/core/rfile.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/core/rhash.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/core/robject.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/core/rregexp.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/core/rstring.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/core/rstruct.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/core/rtypeddata.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/ctype.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/dllexport.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/dosish.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/error.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/eval.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/event.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/fl_type.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/gc.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/glob.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/globals.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/has/attribute.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/has/builtin.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/has/c_attribute.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/has/cpp_attribute.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/has/declspec_attribute.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/has/extension.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/has/feature.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/has/warning.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/intern/array.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/intern/bignum.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/intern/class.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/intern/compar.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/intern/complex.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/intern/cont.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/intern/dir.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/intern/enum.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/intern/enumerator.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/intern/error.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/intern/eval.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/intern/file.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/intern/gc.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/intern/hash.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/intern/io.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/intern/load.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/intern/marshal.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/intern/numeric.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/intern/object.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/intern/parse.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/intern/proc.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/intern/process.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/intern/random.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/intern/range.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/intern/rational.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/intern/re.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/intern/ruby.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/intern/select.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/intern/select/largesize.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/intern/signal.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/intern/sprintf.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/intern/string.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/intern/struct.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/intern/thread.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/intern/time.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/intern/variable.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/intern/vm.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/interpreter.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/iterator.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/memory.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/method.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/module.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/newobj.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/rgengc.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/scan_args.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/special_consts.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/static_assert.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/stdalign.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/stdbool.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/symbol.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/token_paste.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/value.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/value_type.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/variable.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/warning_push.h
+enc/trans/japanese_sjis.$(OBJEXT): internal/xmalloc.h
+enc/trans/japanese_sjis.$(OBJEXT): assert.h
 enc/trans/japanese_sjis.$(OBJEXT): backward.h
+enc/trans/japanese_sjis.$(OBJEXT): backward/2/assume.h
+enc/trans/japanese_sjis.$(OBJEXT): backward/2/attributes.h
+enc/trans/japanese_sjis.$(OBJEXT): backward/2/bool.h
+enc/trans/japanese_sjis.$(OBJEXT): backward/2/gcc_version_since.h
+enc/trans/japanese_sjis.$(OBJEXT): backward/2/inttypes.h
+enc/trans/japanese_sjis.$(OBJEXT): backward/2/limits.h
+enc/trans/japanese_sjis.$(OBJEXT): backward/2/long_long.h
+enc/trans/japanese_sjis.$(OBJEXT): backward/2/stdalign.h
+enc/trans/japanese_sjis.$(OBJEXT): backward/2/stdarg.h
 enc/trans/japanese_sjis.$(OBJEXT): config.h
 enc/trans/japanese_sjis.$(OBJEXT): defines.h
 enc/trans/japanese_sjis.$(OBJEXT): enc/trans/japanese_sjis.c
@@ -547,7 +4787,157 @@ enc/trans/japanese_sjis.$(OBJEXT): st.h
 enc/trans/japanese_sjis.$(OBJEXT): subst.h
 enc/trans/korean.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 enc/trans/korean.$(OBJEXT): $(top_srcdir)/transcode_data.h
+enc/trans/korean.$(OBJEXT): internal/anyargs.h
+enc/trans/korean.$(OBJEXT): internal/arithmetic.h
+enc/trans/korean.$(OBJEXT): internal/arithmetic/char.h
+enc/trans/korean.$(OBJEXT): internal/arithmetic/double.h
+enc/trans/korean.$(OBJEXT): internal/arithmetic/fixnum.h
+enc/trans/korean.$(OBJEXT): internal/arithmetic/gid_t.h
+enc/trans/korean.$(OBJEXT): internal/arithmetic/int.h
+enc/trans/korean.$(OBJEXT): internal/arithmetic/intptr_t.h
+enc/trans/korean.$(OBJEXT): internal/arithmetic/long.h
+enc/trans/korean.$(OBJEXT): internal/arithmetic/long_long.h
+enc/trans/korean.$(OBJEXT): internal/arithmetic/mode_t.h
+enc/trans/korean.$(OBJEXT): internal/arithmetic/off_t.h
+enc/trans/korean.$(OBJEXT): internal/arithmetic/pid_t.h
+enc/trans/korean.$(OBJEXT): internal/arithmetic/short.h
+enc/trans/korean.$(OBJEXT): internal/arithmetic/size_t.h
+enc/trans/korean.$(OBJEXT): internal/arithmetic/st_data_t.h
+enc/trans/korean.$(OBJEXT): internal/arithmetic/uid_t.h
+enc/trans/korean.$(OBJEXT): internal/assume.h
+enc/trans/korean.$(OBJEXT): internal/attr/alloc_size.h
+enc/trans/korean.$(OBJEXT): internal/attr/artificial.h
+enc/trans/korean.$(OBJEXT): internal/attr/cold.h
+enc/trans/korean.$(OBJEXT): internal/attr/const.h
+enc/trans/korean.$(OBJEXT): internal/attr/constexpr.h
+enc/trans/korean.$(OBJEXT): internal/attr/deprecated.h
+enc/trans/korean.$(OBJEXT): internal/attr/diagnose_if.h
+enc/trans/korean.$(OBJEXT): internal/attr/enum_extensibility.h
+enc/trans/korean.$(OBJEXT): internal/attr/error.h
+enc/trans/korean.$(OBJEXT): internal/attr/flag_enum.h
+enc/trans/korean.$(OBJEXT): internal/attr/forceinline.h
+enc/trans/korean.$(OBJEXT): internal/attr/format.h
+enc/trans/korean.$(OBJEXT): internal/attr/maybe_unused.h
+enc/trans/korean.$(OBJEXT): internal/attr/noalias.h
+enc/trans/korean.$(OBJEXT): internal/attr/nodiscard.h
+enc/trans/korean.$(OBJEXT): internal/attr/noexcept.h
+enc/trans/korean.$(OBJEXT): internal/attr/noinline.h
+enc/trans/korean.$(OBJEXT): internal/attr/nonnull.h
+enc/trans/korean.$(OBJEXT): internal/attr/noreturn.h
+enc/trans/korean.$(OBJEXT): internal/attr/pure.h
+enc/trans/korean.$(OBJEXT): internal/attr/restrict.h
+enc/trans/korean.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/trans/korean.$(OBJEXT): internal/attr/warning.h
+enc/trans/korean.$(OBJEXT): internal/attr/weakref.h
+enc/trans/korean.$(OBJEXT): internal/cast.h
+enc/trans/korean.$(OBJEXT): internal/compiler_is.h
+enc/trans/korean.$(OBJEXT): internal/compiler_is/apple.h
+enc/trans/korean.$(OBJEXT): internal/compiler_is/clang.h
+enc/trans/korean.$(OBJEXT): internal/compiler_is/gcc.h
+enc/trans/korean.$(OBJEXT): internal/compiler_is/intel.h
+enc/trans/korean.$(OBJEXT): internal/compiler_is/msvc.h
+enc/trans/korean.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/trans/korean.$(OBJEXT): internal/compiler_since.h
+enc/trans/korean.$(OBJEXT): internal/config.h
+enc/trans/korean.$(OBJEXT): internal/constant_p.h
+enc/trans/korean.$(OBJEXT): internal/core.h
+enc/trans/korean.$(OBJEXT): internal/core/rarray.h
+enc/trans/korean.$(OBJEXT): internal/core/rbasic.h
+enc/trans/korean.$(OBJEXT): internal/core/rbignum.h
+enc/trans/korean.$(OBJEXT): internal/core/rclass.h
+enc/trans/korean.$(OBJEXT): internal/core/rdata.h
+enc/trans/korean.$(OBJEXT): internal/core/rfile.h
+enc/trans/korean.$(OBJEXT): internal/core/rhash.h
+enc/trans/korean.$(OBJEXT): internal/core/robject.h
+enc/trans/korean.$(OBJEXT): internal/core/rregexp.h
+enc/trans/korean.$(OBJEXT): internal/core/rstring.h
+enc/trans/korean.$(OBJEXT): internal/core/rstruct.h
+enc/trans/korean.$(OBJEXT): internal/core/rtypeddata.h
+enc/trans/korean.$(OBJEXT): internal/ctype.h
+enc/trans/korean.$(OBJEXT): internal/dllexport.h
+enc/trans/korean.$(OBJEXT): internal/dosish.h
+enc/trans/korean.$(OBJEXT): internal/error.h
+enc/trans/korean.$(OBJEXT): internal/eval.h
+enc/trans/korean.$(OBJEXT): internal/event.h
+enc/trans/korean.$(OBJEXT): internal/fl_type.h
+enc/trans/korean.$(OBJEXT): internal/gc.h
+enc/trans/korean.$(OBJEXT): internal/glob.h
+enc/trans/korean.$(OBJEXT): internal/globals.h
+enc/trans/korean.$(OBJEXT): internal/has/attribute.h
+enc/trans/korean.$(OBJEXT): internal/has/builtin.h
+enc/trans/korean.$(OBJEXT): internal/has/c_attribute.h
+enc/trans/korean.$(OBJEXT): internal/has/cpp_attribute.h
+enc/trans/korean.$(OBJEXT): internal/has/declspec_attribute.h
+enc/trans/korean.$(OBJEXT): internal/has/extension.h
+enc/trans/korean.$(OBJEXT): internal/has/feature.h
+enc/trans/korean.$(OBJEXT): internal/has/warning.h
+enc/trans/korean.$(OBJEXT): internal/intern/array.h
+enc/trans/korean.$(OBJEXT): internal/intern/bignum.h
+enc/trans/korean.$(OBJEXT): internal/intern/class.h
+enc/trans/korean.$(OBJEXT): internal/intern/compar.h
+enc/trans/korean.$(OBJEXT): internal/intern/complex.h
+enc/trans/korean.$(OBJEXT): internal/intern/cont.h
+enc/trans/korean.$(OBJEXT): internal/intern/dir.h
+enc/trans/korean.$(OBJEXT): internal/intern/enum.h
+enc/trans/korean.$(OBJEXT): internal/intern/enumerator.h
+enc/trans/korean.$(OBJEXT): internal/intern/error.h
+enc/trans/korean.$(OBJEXT): internal/intern/eval.h
+enc/trans/korean.$(OBJEXT): internal/intern/file.h
+enc/trans/korean.$(OBJEXT): internal/intern/gc.h
+enc/trans/korean.$(OBJEXT): internal/intern/hash.h
+enc/trans/korean.$(OBJEXT): internal/intern/io.h
+enc/trans/korean.$(OBJEXT): internal/intern/load.h
+enc/trans/korean.$(OBJEXT): internal/intern/marshal.h
+enc/trans/korean.$(OBJEXT): internal/intern/numeric.h
+enc/trans/korean.$(OBJEXT): internal/intern/object.h
+enc/trans/korean.$(OBJEXT): internal/intern/parse.h
+enc/trans/korean.$(OBJEXT): internal/intern/proc.h
+enc/trans/korean.$(OBJEXT): internal/intern/process.h
+enc/trans/korean.$(OBJEXT): internal/intern/random.h
+enc/trans/korean.$(OBJEXT): internal/intern/range.h
+enc/trans/korean.$(OBJEXT): internal/intern/rational.h
+enc/trans/korean.$(OBJEXT): internal/intern/re.h
+enc/trans/korean.$(OBJEXT): internal/intern/ruby.h
+enc/trans/korean.$(OBJEXT): internal/intern/select.h
+enc/trans/korean.$(OBJEXT): internal/intern/select/largesize.h
+enc/trans/korean.$(OBJEXT): internal/intern/signal.h
+enc/trans/korean.$(OBJEXT): internal/intern/sprintf.h
+enc/trans/korean.$(OBJEXT): internal/intern/string.h
+enc/trans/korean.$(OBJEXT): internal/intern/struct.h
+enc/trans/korean.$(OBJEXT): internal/intern/thread.h
+enc/trans/korean.$(OBJEXT): internal/intern/time.h
+enc/trans/korean.$(OBJEXT): internal/intern/variable.h
+enc/trans/korean.$(OBJEXT): internal/intern/vm.h
+enc/trans/korean.$(OBJEXT): internal/interpreter.h
+enc/trans/korean.$(OBJEXT): internal/iterator.h
+enc/trans/korean.$(OBJEXT): internal/memory.h
+enc/trans/korean.$(OBJEXT): internal/method.h
+enc/trans/korean.$(OBJEXT): internal/module.h
+enc/trans/korean.$(OBJEXT): internal/newobj.h
+enc/trans/korean.$(OBJEXT): internal/rgengc.h
+enc/trans/korean.$(OBJEXT): internal/scan_args.h
+enc/trans/korean.$(OBJEXT): internal/special_consts.h
+enc/trans/korean.$(OBJEXT): internal/static_assert.h
+enc/trans/korean.$(OBJEXT): internal/stdalign.h
+enc/trans/korean.$(OBJEXT): internal/stdbool.h
+enc/trans/korean.$(OBJEXT): internal/symbol.h
+enc/trans/korean.$(OBJEXT): internal/token_paste.h
+enc/trans/korean.$(OBJEXT): internal/value.h
+enc/trans/korean.$(OBJEXT): internal/value_type.h
+enc/trans/korean.$(OBJEXT): internal/variable.h
+enc/trans/korean.$(OBJEXT): internal/warning_push.h
+enc/trans/korean.$(OBJEXT): internal/xmalloc.h
+enc/trans/korean.$(OBJEXT): assert.h
 enc/trans/korean.$(OBJEXT): backward.h
+enc/trans/korean.$(OBJEXT): backward/2/assume.h
+enc/trans/korean.$(OBJEXT): backward/2/attributes.h
+enc/trans/korean.$(OBJEXT): backward/2/bool.h
+enc/trans/korean.$(OBJEXT): backward/2/gcc_version_since.h
+enc/trans/korean.$(OBJEXT): backward/2/inttypes.h
+enc/trans/korean.$(OBJEXT): backward/2/limits.h
+enc/trans/korean.$(OBJEXT): backward/2/long_long.h
+enc/trans/korean.$(OBJEXT): backward/2/stdalign.h
+enc/trans/korean.$(OBJEXT): backward/2/stdarg.h
 enc/trans/korean.$(OBJEXT): config.h
 enc/trans/korean.$(OBJEXT): defines.h
 enc/trans/korean.$(OBJEXT): enc/trans/korean.c
@@ -557,6 +4947,156 @@ enc/trans/korean.$(OBJEXT): st.h
 enc/trans/korean.$(OBJEXT): subst.h
 enc/trans/newline.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 enc/trans/newline.$(OBJEXT): $(top_srcdir)/transcode_data.h
+enc/trans/newline.$(OBJEXT): internal/anyargs.h
+enc/trans/newline.$(OBJEXT): internal/arithmetic.h
+enc/trans/newline.$(OBJEXT): internal/arithmetic/char.h
+enc/trans/newline.$(OBJEXT): internal/arithmetic/double.h
+enc/trans/newline.$(OBJEXT): internal/arithmetic/fixnum.h
+enc/trans/newline.$(OBJEXT): internal/arithmetic/gid_t.h
+enc/trans/newline.$(OBJEXT): internal/arithmetic/int.h
+enc/trans/newline.$(OBJEXT): internal/arithmetic/intptr_t.h
+enc/trans/newline.$(OBJEXT): internal/arithmetic/long.h
+enc/trans/newline.$(OBJEXT): internal/arithmetic/long_long.h
+enc/trans/newline.$(OBJEXT): internal/arithmetic/mode_t.h
+enc/trans/newline.$(OBJEXT): internal/arithmetic/off_t.h
+enc/trans/newline.$(OBJEXT): internal/arithmetic/pid_t.h
+enc/trans/newline.$(OBJEXT): internal/arithmetic/short.h
+enc/trans/newline.$(OBJEXT): internal/arithmetic/size_t.h
+enc/trans/newline.$(OBJEXT): internal/arithmetic/st_data_t.h
+enc/trans/newline.$(OBJEXT): internal/arithmetic/uid_t.h
+enc/trans/newline.$(OBJEXT): internal/assume.h
+enc/trans/newline.$(OBJEXT): internal/attr/alloc_size.h
+enc/trans/newline.$(OBJEXT): internal/attr/artificial.h
+enc/trans/newline.$(OBJEXT): internal/attr/cold.h
+enc/trans/newline.$(OBJEXT): internal/attr/const.h
+enc/trans/newline.$(OBJEXT): internal/attr/constexpr.h
+enc/trans/newline.$(OBJEXT): internal/attr/deprecated.h
+enc/trans/newline.$(OBJEXT): internal/attr/diagnose_if.h
+enc/trans/newline.$(OBJEXT): internal/attr/enum_extensibility.h
+enc/trans/newline.$(OBJEXT): internal/attr/error.h
+enc/trans/newline.$(OBJEXT): internal/attr/flag_enum.h
+enc/trans/newline.$(OBJEXT): internal/attr/forceinline.h
+enc/trans/newline.$(OBJEXT): internal/attr/format.h
+enc/trans/newline.$(OBJEXT): internal/attr/maybe_unused.h
+enc/trans/newline.$(OBJEXT): internal/attr/noalias.h
+enc/trans/newline.$(OBJEXT): internal/attr/nodiscard.h
+enc/trans/newline.$(OBJEXT): internal/attr/noexcept.h
+enc/trans/newline.$(OBJEXT): internal/attr/noinline.h
+enc/trans/newline.$(OBJEXT): internal/attr/nonnull.h
+enc/trans/newline.$(OBJEXT): internal/attr/noreturn.h
+enc/trans/newline.$(OBJEXT): internal/attr/pure.h
+enc/trans/newline.$(OBJEXT): internal/attr/restrict.h
+enc/trans/newline.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/trans/newline.$(OBJEXT): internal/attr/warning.h
+enc/trans/newline.$(OBJEXT): internal/attr/weakref.h
+enc/trans/newline.$(OBJEXT): internal/cast.h
+enc/trans/newline.$(OBJEXT): internal/compiler_is.h
+enc/trans/newline.$(OBJEXT): internal/compiler_is/apple.h
+enc/trans/newline.$(OBJEXT): internal/compiler_is/clang.h
+enc/trans/newline.$(OBJEXT): internal/compiler_is/gcc.h
+enc/trans/newline.$(OBJEXT): internal/compiler_is/intel.h
+enc/trans/newline.$(OBJEXT): internal/compiler_is/msvc.h
+enc/trans/newline.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/trans/newline.$(OBJEXT): internal/compiler_since.h
+enc/trans/newline.$(OBJEXT): internal/config.h
+enc/trans/newline.$(OBJEXT): internal/constant_p.h
+enc/trans/newline.$(OBJEXT): internal/core.h
+enc/trans/newline.$(OBJEXT): internal/core/rarray.h
+enc/trans/newline.$(OBJEXT): internal/core/rbasic.h
+enc/trans/newline.$(OBJEXT): internal/core/rbignum.h
+enc/trans/newline.$(OBJEXT): internal/core/rclass.h
+enc/trans/newline.$(OBJEXT): internal/core/rdata.h
+enc/trans/newline.$(OBJEXT): internal/core/rfile.h
+enc/trans/newline.$(OBJEXT): internal/core/rhash.h
+enc/trans/newline.$(OBJEXT): internal/core/robject.h
+enc/trans/newline.$(OBJEXT): internal/core/rregexp.h
+enc/trans/newline.$(OBJEXT): internal/core/rstring.h
+enc/trans/newline.$(OBJEXT): internal/core/rstruct.h
+enc/trans/newline.$(OBJEXT): internal/core/rtypeddata.h
+enc/trans/newline.$(OBJEXT): internal/ctype.h
+enc/trans/newline.$(OBJEXT): internal/dllexport.h
+enc/trans/newline.$(OBJEXT): internal/dosish.h
+enc/trans/newline.$(OBJEXT): internal/error.h
+enc/trans/newline.$(OBJEXT): internal/eval.h
+enc/trans/newline.$(OBJEXT): internal/event.h
+enc/trans/newline.$(OBJEXT): internal/fl_type.h
+enc/trans/newline.$(OBJEXT): internal/gc.h
+enc/trans/newline.$(OBJEXT): internal/glob.h
+enc/trans/newline.$(OBJEXT): internal/globals.h
+enc/trans/newline.$(OBJEXT): internal/has/attribute.h
+enc/trans/newline.$(OBJEXT): internal/has/builtin.h
+enc/trans/newline.$(OBJEXT): internal/has/c_attribute.h
+enc/trans/newline.$(OBJEXT): internal/has/cpp_attribute.h
+enc/trans/newline.$(OBJEXT): internal/has/declspec_attribute.h
+enc/trans/newline.$(OBJEXT): internal/has/extension.h
+enc/trans/newline.$(OBJEXT): internal/has/feature.h
+enc/trans/newline.$(OBJEXT): internal/has/warning.h
+enc/trans/newline.$(OBJEXT): internal/intern/array.h
+enc/trans/newline.$(OBJEXT): internal/intern/bignum.h
+enc/trans/newline.$(OBJEXT): internal/intern/class.h
+enc/trans/newline.$(OBJEXT): internal/intern/compar.h
+enc/trans/newline.$(OBJEXT): internal/intern/complex.h
+enc/trans/newline.$(OBJEXT): internal/intern/cont.h
+enc/trans/newline.$(OBJEXT): internal/intern/dir.h
+enc/trans/newline.$(OBJEXT): internal/intern/enum.h
+enc/trans/newline.$(OBJEXT): internal/intern/enumerator.h
+enc/trans/newline.$(OBJEXT): internal/intern/error.h
+enc/trans/newline.$(OBJEXT): internal/intern/eval.h
+enc/trans/newline.$(OBJEXT): internal/intern/file.h
+enc/trans/newline.$(OBJEXT): internal/intern/gc.h
+enc/trans/newline.$(OBJEXT): internal/intern/hash.h
+enc/trans/newline.$(OBJEXT): internal/intern/io.h
+enc/trans/newline.$(OBJEXT): internal/intern/load.h
+enc/trans/newline.$(OBJEXT): internal/intern/marshal.h
+enc/trans/newline.$(OBJEXT): internal/intern/numeric.h
+enc/trans/newline.$(OBJEXT): internal/intern/object.h
+enc/trans/newline.$(OBJEXT): internal/intern/parse.h
+enc/trans/newline.$(OBJEXT): internal/intern/proc.h
+enc/trans/newline.$(OBJEXT): internal/intern/process.h
+enc/trans/newline.$(OBJEXT): internal/intern/random.h
+enc/trans/newline.$(OBJEXT): internal/intern/range.h
+enc/trans/newline.$(OBJEXT): internal/intern/rational.h
+enc/trans/newline.$(OBJEXT): internal/intern/re.h
+enc/trans/newline.$(OBJEXT): internal/intern/ruby.h
+enc/trans/newline.$(OBJEXT): internal/intern/select.h
+enc/trans/newline.$(OBJEXT): internal/intern/select/largesize.h
+enc/trans/newline.$(OBJEXT): internal/intern/signal.h
+enc/trans/newline.$(OBJEXT): internal/intern/sprintf.h
+enc/trans/newline.$(OBJEXT): internal/intern/string.h
+enc/trans/newline.$(OBJEXT): internal/intern/struct.h
+enc/trans/newline.$(OBJEXT): internal/intern/thread.h
+enc/trans/newline.$(OBJEXT): internal/intern/time.h
+enc/trans/newline.$(OBJEXT): internal/intern/variable.h
+enc/trans/newline.$(OBJEXT): internal/intern/vm.h
+enc/trans/newline.$(OBJEXT): internal/interpreter.h
+enc/trans/newline.$(OBJEXT): internal/iterator.h
+enc/trans/newline.$(OBJEXT): internal/memory.h
+enc/trans/newline.$(OBJEXT): internal/method.h
+enc/trans/newline.$(OBJEXT): internal/module.h
+enc/trans/newline.$(OBJEXT): internal/newobj.h
+enc/trans/newline.$(OBJEXT): internal/rgengc.h
+enc/trans/newline.$(OBJEXT): internal/scan_args.h
+enc/trans/newline.$(OBJEXT): internal/special_consts.h
+enc/trans/newline.$(OBJEXT): internal/static_assert.h
+enc/trans/newline.$(OBJEXT): internal/stdalign.h
+enc/trans/newline.$(OBJEXT): internal/stdbool.h
+enc/trans/newline.$(OBJEXT): internal/symbol.h
+enc/trans/newline.$(OBJEXT): internal/token_paste.h
+enc/trans/newline.$(OBJEXT): internal/value.h
+enc/trans/newline.$(OBJEXT): internal/value_type.h
+enc/trans/newline.$(OBJEXT): internal/variable.h
+enc/trans/newline.$(OBJEXT): internal/warning_push.h
+enc/trans/newline.$(OBJEXT): internal/xmalloc.h
+enc/trans/newline.$(OBJEXT): assert.h
+enc/trans/newline.$(OBJEXT): backward/2/assume.h
+enc/trans/newline.$(OBJEXT): backward/2/attributes.h
+enc/trans/newline.$(OBJEXT): backward/2/bool.h
+enc/trans/newline.$(OBJEXT): backward/2/gcc_version_since.h
+enc/trans/newline.$(OBJEXT): backward/2/inttypes.h
+enc/trans/newline.$(OBJEXT): backward/2/limits.h
+enc/trans/newline.$(OBJEXT): backward/2/long_long.h
+enc/trans/newline.$(OBJEXT): backward/2/stdalign.h
+enc/trans/newline.$(OBJEXT): backward/2/stdarg.h
 enc/trans/newline.$(OBJEXT): config.h
 enc/trans/newline.$(OBJEXT): defines.h
 enc/trans/newline.$(OBJEXT): enc/trans/newline.c
@@ -566,7 +5106,157 @@ enc/trans/newline.$(OBJEXT): st.h
 enc/trans/newline.$(OBJEXT): subst.h
 enc/trans/single_byte.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 enc/trans/single_byte.$(OBJEXT): $(top_srcdir)/transcode_data.h
+enc/trans/single_byte.$(OBJEXT): internal/anyargs.h
+enc/trans/single_byte.$(OBJEXT): internal/arithmetic.h
+enc/trans/single_byte.$(OBJEXT): internal/arithmetic/char.h
+enc/trans/single_byte.$(OBJEXT): internal/arithmetic/double.h
+enc/trans/single_byte.$(OBJEXT): internal/arithmetic/fixnum.h
+enc/trans/single_byte.$(OBJEXT): internal/arithmetic/gid_t.h
+enc/trans/single_byte.$(OBJEXT): internal/arithmetic/int.h
+enc/trans/single_byte.$(OBJEXT): internal/arithmetic/intptr_t.h
+enc/trans/single_byte.$(OBJEXT): internal/arithmetic/long.h
+enc/trans/single_byte.$(OBJEXT): internal/arithmetic/long_long.h
+enc/trans/single_byte.$(OBJEXT): internal/arithmetic/mode_t.h
+enc/trans/single_byte.$(OBJEXT): internal/arithmetic/off_t.h
+enc/trans/single_byte.$(OBJEXT): internal/arithmetic/pid_t.h
+enc/trans/single_byte.$(OBJEXT): internal/arithmetic/short.h
+enc/trans/single_byte.$(OBJEXT): internal/arithmetic/size_t.h
+enc/trans/single_byte.$(OBJEXT): internal/arithmetic/st_data_t.h
+enc/trans/single_byte.$(OBJEXT): internal/arithmetic/uid_t.h
+enc/trans/single_byte.$(OBJEXT): internal/assume.h
+enc/trans/single_byte.$(OBJEXT): internal/attr/alloc_size.h
+enc/trans/single_byte.$(OBJEXT): internal/attr/artificial.h
+enc/trans/single_byte.$(OBJEXT): internal/attr/cold.h
+enc/trans/single_byte.$(OBJEXT): internal/attr/const.h
+enc/trans/single_byte.$(OBJEXT): internal/attr/constexpr.h
+enc/trans/single_byte.$(OBJEXT): internal/attr/deprecated.h
+enc/trans/single_byte.$(OBJEXT): internal/attr/diagnose_if.h
+enc/trans/single_byte.$(OBJEXT): internal/attr/enum_extensibility.h
+enc/trans/single_byte.$(OBJEXT): internal/attr/error.h
+enc/trans/single_byte.$(OBJEXT): internal/attr/flag_enum.h
+enc/trans/single_byte.$(OBJEXT): internal/attr/forceinline.h
+enc/trans/single_byte.$(OBJEXT): internal/attr/format.h
+enc/trans/single_byte.$(OBJEXT): internal/attr/maybe_unused.h
+enc/trans/single_byte.$(OBJEXT): internal/attr/noalias.h
+enc/trans/single_byte.$(OBJEXT): internal/attr/nodiscard.h
+enc/trans/single_byte.$(OBJEXT): internal/attr/noexcept.h
+enc/trans/single_byte.$(OBJEXT): internal/attr/noinline.h
+enc/trans/single_byte.$(OBJEXT): internal/attr/nonnull.h
+enc/trans/single_byte.$(OBJEXT): internal/attr/noreturn.h
+enc/trans/single_byte.$(OBJEXT): internal/attr/pure.h
+enc/trans/single_byte.$(OBJEXT): internal/attr/restrict.h
+enc/trans/single_byte.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/trans/single_byte.$(OBJEXT): internal/attr/warning.h
+enc/trans/single_byte.$(OBJEXT): internal/attr/weakref.h
+enc/trans/single_byte.$(OBJEXT): internal/cast.h
+enc/trans/single_byte.$(OBJEXT): internal/compiler_is.h
+enc/trans/single_byte.$(OBJEXT): internal/compiler_is/apple.h
+enc/trans/single_byte.$(OBJEXT): internal/compiler_is/clang.h
+enc/trans/single_byte.$(OBJEXT): internal/compiler_is/gcc.h
+enc/trans/single_byte.$(OBJEXT): internal/compiler_is/intel.h
+enc/trans/single_byte.$(OBJEXT): internal/compiler_is/msvc.h
+enc/trans/single_byte.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/trans/single_byte.$(OBJEXT): internal/compiler_since.h
+enc/trans/single_byte.$(OBJEXT): internal/config.h
+enc/trans/single_byte.$(OBJEXT): internal/constant_p.h
+enc/trans/single_byte.$(OBJEXT): internal/core.h
+enc/trans/single_byte.$(OBJEXT): internal/core/rarray.h
+enc/trans/single_byte.$(OBJEXT): internal/core/rbasic.h
+enc/trans/single_byte.$(OBJEXT): internal/core/rbignum.h
+enc/trans/single_byte.$(OBJEXT): internal/core/rclass.h
+enc/trans/single_byte.$(OBJEXT): internal/core/rdata.h
+enc/trans/single_byte.$(OBJEXT): internal/core/rfile.h
+enc/trans/single_byte.$(OBJEXT): internal/core/rhash.h
+enc/trans/single_byte.$(OBJEXT): internal/core/robject.h
+enc/trans/single_byte.$(OBJEXT): internal/core/rregexp.h
+enc/trans/single_byte.$(OBJEXT): internal/core/rstring.h
+enc/trans/single_byte.$(OBJEXT): internal/core/rstruct.h
+enc/trans/single_byte.$(OBJEXT): internal/core/rtypeddata.h
+enc/trans/single_byte.$(OBJEXT): internal/ctype.h
+enc/trans/single_byte.$(OBJEXT): internal/dllexport.h
+enc/trans/single_byte.$(OBJEXT): internal/dosish.h
+enc/trans/single_byte.$(OBJEXT): internal/error.h
+enc/trans/single_byte.$(OBJEXT): internal/eval.h
+enc/trans/single_byte.$(OBJEXT): internal/event.h
+enc/trans/single_byte.$(OBJEXT): internal/fl_type.h
+enc/trans/single_byte.$(OBJEXT): internal/gc.h
+enc/trans/single_byte.$(OBJEXT): internal/glob.h
+enc/trans/single_byte.$(OBJEXT): internal/globals.h
+enc/trans/single_byte.$(OBJEXT): internal/has/attribute.h
+enc/trans/single_byte.$(OBJEXT): internal/has/builtin.h
+enc/trans/single_byte.$(OBJEXT): internal/has/c_attribute.h
+enc/trans/single_byte.$(OBJEXT): internal/has/cpp_attribute.h
+enc/trans/single_byte.$(OBJEXT): internal/has/declspec_attribute.h
+enc/trans/single_byte.$(OBJEXT): internal/has/extension.h
+enc/trans/single_byte.$(OBJEXT): internal/has/feature.h
+enc/trans/single_byte.$(OBJEXT): internal/has/warning.h
+enc/trans/single_byte.$(OBJEXT): internal/intern/array.h
+enc/trans/single_byte.$(OBJEXT): internal/intern/bignum.h
+enc/trans/single_byte.$(OBJEXT): internal/intern/class.h
+enc/trans/single_byte.$(OBJEXT): internal/intern/compar.h
+enc/trans/single_byte.$(OBJEXT): internal/intern/complex.h
+enc/trans/single_byte.$(OBJEXT): internal/intern/cont.h
+enc/trans/single_byte.$(OBJEXT): internal/intern/dir.h
+enc/trans/single_byte.$(OBJEXT): internal/intern/enum.h
+enc/trans/single_byte.$(OBJEXT): internal/intern/enumerator.h
+enc/trans/single_byte.$(OBJEXT): internal/intern/error.h
+enc/trans/single_byte.$(OBJEXT): internal/intern/eval.h
+enc/trans/single_byte.$(OBJEXT): internal/intern/file.h
+enc/trans/single_byte.$(OBJEXT): internal/intern/gc.h
+enc/trans/single_byte.$(OBJEXT): internal/intern/hash.h
+enc/trans/single_byte.$(OBJEXT): internal/intern/io.h
+enc/trans/single_byte.$(OBJEXT): internal/intern/load.h
+enc/trans/single_byte.$(OBJEXT): internal/intern/marshal.h
+enc/trans/single_byte.$(OBJEXT): internal/intern/numeric.h
+enc/trans/single_byte.$(OBJEXT): internal/intern/object.h
+enc/trans/single_byte.$(OBJEXT): internal/intern/parse.h
+enc/trans/single_byte.$(OBJEXT): internal/intern/proc.h
+enc/trans/single_byte.$(OBJEXT): internal/intern/process.h
+enc/trans/single_byte.$(OBJEXT): internal/intern/random.h
+enc/trans/single_byte.$(OBJEXT): internal/intern/range.h
+enc/trans/single_byte.$(OBJEXT): internal/intern/rational.h
+enc/trans/single_byte.$(OBJEXT): internal/intern/re.h
+enc/trans/single_byte.$(OBJEXT): internal/intern/ruby.h
+enc/trans/single_byte.$(OBJEXT): internal/intern/select.h
+enc/trans/single_byte.$(OBJEXT): internal/intern/select/largesize.h
+enc/trans/single_byte.$(OBJEXT): internal/intern/signal.h
+enc/trans/single_byte.$(OBJEXT): internal/intern/sprintf.h
+enc/trans/single_byte.$(OBJEXT): internal/intern/string.h
+enc/trans/single_byte.$(OBJEXT): internal/intern/struct.h
+enc/trans/single_byte.$(OBJEXT): internal/intern/thread.h
+enc/trans/single_byte.$(OBJEXT): internal/intern/time.h
+enc/trans/single_byte.$(OBJEXT): internal/intern/variable.h
+enc/trans/single_byte.$(OBJEXT): internal/intern/vm.h
+enc/trans/single_byte.$(OBJEXT): internal/interpreter.h
+enc/trans/single_byte.$(OBJEXT): internal/iterator.h
+enc/trans/single_byte.$(OBJEXT): internal/memory.h
+enc/trans/single_byte.$(OBJEXT): internal/method.h
+enc/trans/single_byte.$(OBJEXT): internal/module.h
+enc/trans/single_byte.$(OBJEXT): internal/newobj.h
+enc/trans/single_byte.$(OBJEXT): internal/rgengc.h
+enc/trans/single_byte.$(OBJEXT): internal/scan_args.h
+enc/trans/single_byte.$(OBJEXT): internal/special_consts.h
+enc/trans/single_byte.$(OBJEXT): internal/static_assert.h
+enc/trans/single_byte.$(OBJEXT): internal/stdalign.h
+enc/trans/single_byte.$(OBJEXT): internal/stdbool.h
+enc/trans/single_byte.$(OBJEXT): internal/symbol.h
+enc/trans/single_byte.$(OBJEXT): internal/token_paste.h
+enc/trans/single_byte.$(OBJEXT): internal/value.h
+enc/trans/single_byte.$(OBJEXT): internal/value_type.h
+enc/trans/single_byte.$(OBJEXT): internal/variable.h
+enc/trans/single_byte.$(OBJEXT): internal/warning_push.h
+enc/trans/single_byte.$(OBJEXT): internal/xmalloc.h
+enc/trans/single_byte.$(OBJEXT): assert.h
 enc/trans/single_byte.$(OBJEXT): backward.h
+enc/trans/single_byte.$(OBJEXT): backward/2/assume.h
+enc/trans/single_byte.$(OBJEXT): backward/2/attributes.h
+enc/trans/single_byte.$(OBJEXT): backward/2/bool.h
+enc/trans/single_byte.$(OBJEXT): backward/2/gcc_version_since.h
+enc/trans/single_byte.$(OBJEXT): backward/2/inttypes.h
+enc/trans/single_byte.$(OBJEXT): backward/2/limits.h
+enc/trans/single_byte.$(OBJEXT): backward/2/long_long.h
+enc/trans/single_byte.$(OBJEXT): backward/2/stdalign.h
+enc/trans/single_byte.$(OBJEXT): backward/2/stdarg.h
 enc/trans/single_byte.$(OBJEXT): config.h
 enc/trans/single_byte.$(OBJEXT): defines.h
 enc/trans/single_byte.$(OBJEXT): enc/trans/single_byte.c
@@ -578,7 +5268,157 @@ enc/trans/transdb.$(OBJEXT): enc/trans/transdb.c
 enc/trans/transdb.$(OBJEXT): transdb.h
 enc/trans/utf8_mac.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 enc/trans/utf8_mac.$(OBJEXT): $(top_srcdir)/transcode_data.h
+enc/trans/utf8_mac.$(OBJEXT): internal/anyargs.h
+enc/trans/utf8_mac.$(OBJEXT): internal/arithmetic.h
+enc/trans/utf8_mac.$(OBJEXT): internal/arithmetic/char.h
+enc/trans/utf8_mac.$(OBJEXT): internal/arithmetic/double.h
+enc/trans/utf8_mac.$(OBJEXT): internal/arithmetic/fixnum.h
+enc/trans/utf8_mac.$(OBJEXT): internal/arithmetic/gid_t.h
+enc/trans/utf8_mac.$(OBJEXT): internal/arithmetic/int.h
+enc/trans/utf8_mac.$(OBJEXT): internal/arithmetic/intptr_t.h
+enc/trans/utf8_mac.$(OBJEXT): internal/arithmetic/long.h
+enc/trans/utf8_mac.$(OBJEXT): internal/arithmetic/long_long.h
+enc/trans/utf8_mac.$(OBJEXT): internal/arithmetic/mode_t.h
+enc/trans/utf8_mac.$(OBJEXT): internal/arithmetic/off_t.h
+enc/trans/utf8_mac.$(OBJEXT): internal/arithmetic/pid_t.h
+enc/trans/utf8_mac.$(OBJEXT): internal/arithmetic/short.h
+enc/trans/utf8_mac.$(OBJEXT): internal/arithmetic/size_t.h
+enc/trans/utf8_mac.$(OBJEXT): internal/arithmetic/st_data_t.h
+enc/trans/utf8_mac.$(OBJEXT): internal/arithmetic/uid_t.h
+enc/trans/utf8_mac.$(OBJEXT): internal/assume.h
+enc/trans/utf8_mac.$(OBJEXT): internal/attr/alloc_size.h
+enc/trans/utf8_mac.$(OBJEXT): internal/attr/artificial.h
+enc/trans/utf8_mac.$(OBJEXT): internal/attr/cold.h
+enc/trans/utf8_mac.$(OBJEXT): internal/attr/const.h
+enc/trans/utf8_mac.$(OBJEXT): internal/attr/constexpr.h
+enc/trans/utf8_mac.$(OBJEXT): internal/attr/deprecated.h
+enc/trans/utf8_mac.$(OBJEXT): internal/attr/diagnose_if.h
+enc/trans/utf8_mac.$(OBJEXT): internal/attr/enum_extensibility.h
+enc/trans/utf8_mac.$(OBJEXT): internal/attr/error.h
+enc/trans/utf8_mac.$(OBJEXT): internal/attr/flag_enum.h
+enc/trans/utf8_mac.$(OBJEXT): internal/attr/forceinline.h
+enc/trans/utf8_mac.$(OBJEXT): internal/attr/format.h
+enc/trans/utf8_mac.$(OBJEXT): internal/attr/maybe_unused.h
+enc/trans/utf8_mac.$(OBJEXT): internal/attr/noalias.h
+enc/trans/utf8_mac.$(OBJEXT): internal/attr/nodiscard.h
+enc/trans/utf8_mac.$(OBJEXT): internal/attr/noexcept.h
+enc/trans/utf8_mac.$(OBJEXT): internal/attr/noinline.h
+enc/trans/utf8_mac.$(OBJEXT): internal/attr/nonnull.h
+enc/trans/utf8_mac.$(OBJEXT): internal/attr/noreturn.h
+enc/trans/utf8_mac.$(OBJEXT): internal/attr/pure.h
+enc/trans/utf8_mac.$(OBJEXT): internal/attr/restrict.h
+enc/trans/utf8_mac.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/trans/utf8_mac.$(OBJEXT): internal/attr/warning.h
+enc/trans/utf8_mac.$(OBJEXT): internal/attr/weakref.h
+enc/trans/utf8_mac.$(OBJEXT): internal/cast.h
+enc/trans/utf8_mac.$(OBJEXT): internal/compiler_is.h
+enc/trans/utf8_mac.$(OBJEXT): internal/compiler_is/apple.h
+enc/trans/utf8_mac.$(OBJEXT): internal/compiler_is/clang.h
+enc/trans/utf8_mac.$(OBJEXT): internal/compiler_is/gcc.h
+enc/trans/utf8_mac.$(OBJEXT): internal/compiler_is/intel.h
+enc/trans/utf8_mac.$(OBJEXT): internal/compiler_is/msvc.h
+enc/trans/utf8_mac.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/trans/utf8_mac.$(OBJEXT): internal/compiler_since.h
+enc/trans/utf8_mac.$(OBJEXT): internal/config.h
+enc/trans/utf8_mac.$(OBJEXT): internal/constant_p.h
+enc/trans/utf8_mac.$(OBJEXT): internal/core.h
+enc/trans/utf8_mac.$(OBJEXT): internal/core/rarray.h
+enc/trans/utf8_mac.$(OBJEXT): internal/core/rbasic.h
+enc/trans/utf8_mac.$(OBJEXT): internal/core/rbignum.h
+enc/trans/utf8_mac.$(OBJEXT): internal/core/rclass.h
+enc/trans/utf8_mac.$(OBJEXT): internal/core/rdata.h
+enc/trans/utf8_mac.$(OBJEXT): internal/core/rfile.h
+enc/trans/utf8_mac.$(OBJEXT): internal/core/rhash.h
+enc/trans/utf8_mac.$(OBJEXT): internal/core/robject.h
+enc/trans/utf8_mac.$(OBJEXT): internal/core/rregexp.h
+enc/trans/utf8_mac.$(OBJEXT): internal/core/rstring.h
+enc/trans/utf8_mac.$(OBJEXT): internal/core/rstruct.h
+enc/trans/utf8_mac.$(OBJEXT): internal/core/rtypeddata.h
+enc/trans/utf8_mac.$(OBJEXT): internal/ctype.h
+enc/trans/utf8_mac.$(OBJEXT): internal/dllexport.h
+enc/trans/utf8_mac.$(OBJEXT): internal/dosish.h
+enc/trans/utf8_mac.$(OBJEXT): internal/error.h
+enc/trans/utf8_mac.$(OBJEXT): internal/eval.h
+enc/trans/utf8_mac.$(OBJEXT): internal/event.h
+enc/trans/utf8_mac.$(OBJEXT): internal/fl_type.h
+enc/trans/utf8_mac.$(OBJEXT): internal/gc.h
+enc/trans/utf8_mac.$(OBJEXT): internal/glob.h
+enc/trans/utf8_mac.$(OBJEXT): internal/globals.h
+enc/trans/utf8_mac.$(OBJEXT): internal/has/attribute.h
+enc/trans/utf8_mac.$(OBJEXT): internal/has/builtin.h
+enc/trans/utf8_mac.$(OBJEXT): internal/has/c_attribute.h
+enc/trans/utf8_mac.$(OBJEXT): internal/has/cpp_attribute.h
+enc/trans/utf8_mac.$(OBJEXT): internal/has/declspec_attribute.h
+enc/trans/utf8_mac.$(OBJEXT): internal/has/extension.h
+enc/trans/utf8_mac.$(OBJEXT): internal/has/feature.h
+enc/trans/utf8_mac.$(OBJEXT): internal/has/warning.h
+enc/trans/utf8_mac.$(OBJEXT): internal/intern/array.h
+enc/trans/utf8_mac.$(OBJEXT): internal/intern/bignum.h
+enc/trans/utf8_mac.$(OBJEXT): internal/intern/class.h
+enc/trans/utf8_mac.$(OBJEXT): internal/intern/compar.h
+enc/trans/utf8_mac.$(OBJEXT): internal/intern/complex.h
+enc/trans/utf8_mac.$(OBJEXT): internal/intern/cont.h
+enc/trans/utf8_mac.$(OBJEXT): internal/intern/dir.h
+enc/trans/utf8_mac.$(OBJEXT): internal/intern/enum.h
+enc/trans/utf8_mac.$(OBJEXT): internal/intern/enumerator.h
+enc/trans/utf8_mac.$(OBJEXT): internal/intern/error.h
+enc/trans/utf8_mac.$(OBJEXT): internal/intern/eval.h
+enc/trans/utf8_mac.$(OBJEXT): internal/intern/file.h
+enc/trans/utf8_mac.$(OBJEXT): internal/intern/gc.h
+enc/trans/utf8_mac.$(OBJEXT): internal/intern/hash.h
+enc/trans/utf8_mac.$(OBJEXT): internal/intern/io.h
+enc/trans/utf8_mac.$(OBJEXT): internal/intern/load.h
+enc/trans/utf8_mac.$(OBJEXT): internal/intern/marshal.h
+enc/trans/utf8_mac.$(OBJEXT): internal/intern/numeric.h
+enc/trans/utf8_mac.$(OBJEXT): internal/intern/object.h
+enc/trans/utf8_mac.$(OBJEXT): internal/intern/parse.h
+enc/trans/utf8_mac.$(OBJEXT): internal/intern/proc.h
+enc/trans/utf8_mac.$(OBJEXT): internal/intern/process.h
+enc/trans/utf8_mac.$(OBJEXT): internal/intern/random.h
+enc/trans/utf8_mac.$(OBJEXT): internal/intern/range.h
+enc/trans/utf8_mac.$(OBJEXT): internal/intern/rational.h
+enc/trans/utf8_mac.$(OBJEXT): internal/intern/re.h
+enc/trans/utf8_mac.$(OBJEXT): internal/intern/ruby.h
+enc/trans/utf8_mac.$(OBJEXT): internal/intern/select.h
+enc/trans/utf8_mac.$(OBJEXT): internal/intern/select/largesize.h
+enc/trans/utf8_mac.$(OBJEXT): internal/intern/signal.h
+enc/trans/utf8_mac.$(OBJEXT): internal/intern/sprintf.h
+enc/trans/utf8_mac.$(OBJEXT): internal/intern/string.h
+enc/trans/utf8_mac.$(OBJEXT): internal/intern/struct.h
+enc/trans/utf8_mac.$(OBJEXT): internal/intern/thread.h
+enc/trans/utf8_mac.$(OBJEXT): internal/intern/time.h
+enc/trans/utf8_mac.$(OBJEXT): internal/intern/variable.h
+enc/trans/utf8_mac.$(OBJEXT): internal/intern/vm.h
+enc/trans/utf8_mac.$(OBJEXT): internal/interpreter.h
+enc/trans/utf8_mac.$(OBJEXT): internal/iterator.h
+enc/trans/utf8_mac.$(OBJEXT): internal/memory.h
+enc/trans/utf8_mac.$(OBJEXT): internal/method.h
+enc/trans/utf8_mac.$(OBJEXT): internal/module.h
+enc/trans/utf8_mac.$(OBJEXT): internal/newobj.h
+enc/trans/utf8_mac.$(OBJEXT): internal/rgengc.h
+enc/trans/utf8_mac.$(OBJEXT): internal/scan_args.h
+enc/trans/utf8_mac.$(OBJEXT): internal/special_consts.h
+enc/trans/utf8_mac.$(OBJEXT): internal/static_assert.h
+enc/trans/utf8_mac.$(OBJEXT): internal/stdalign.h
+enc/trans/utf8_mac.$(OBJEXT): internal/stdbool.h
+enc/trans/utf8_mac.$(OBJEXT): internal/symbol.h
+enc/trans/utf8_mac.$(OBJEXT): internal/token_paste.h
+enc/trans/utf8_mac.$(OBJEXT): internal/value.h
+enc/trans/utf8_mac.$(OBJEXT): internal/value_type.h
+enc/trans/utf8_mac.$(OBJEXT): internal/variable.h
+enc/trans/utf8_mac.$(OBJEXT): internal/warning_push.h
+enc/trans/utf8_mac.$(OBJEXT): internal/xmalloc.h
+enc/trans/utf8_mac.$(OBJEXT): assert.h
 enc/trans/utf8_mac.$(OBJEXT): backward.h
+enc/trans/utf8_mac.$(OBJEXT): backward/2/assume.h
+enc/trans/utf8_mac.$(OBJEXT): backward/2/attributes.h
+enc/trans/utf8_mac.$(OBJEXT): backward/2/bool.h
+enc/trans/utf8_mac.$(OBJEXT): backward/2/gcc_version_since.h
+enc/trans/utf8_mac.$(OBJEXT): backward/2/inttypes.h
+enc/trans/utf8_mac.$(OBJEXT): backward/2/limits.h
+enc/trans/utf8_mac.$(OBJEXT): backward/2/long_long.h
+enc/trans/utf8_mac.$(OBJEXT): backward/2/stdalign.h
+enc/trans/utf8_mac.$(OBJEXT): backward/2/stdarg.h
 enc/trans/utf8_mac.$(OBJEXT): config.h
 enc/trans/utf8_mac.$(OBJEXT): defines.h
 enc/trans/utf8_mac.$(OBJEXT): enc/trans/utf8_mac.c
@@ -588,7 +5428,157 @@ enc/trans/utf8_mac.$(OBJEXT): st.h
 enc/trans/utf8_mac.$(OBJEXT): subst.h
 enc/trans/utf_16_32.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 enc/trans/utf_16_32.$(OBJEXT): $(top_srcdir)/transcode_data.h
+enc/trans/utf_16_32.$(OBJEXT): internal/anyargs.h
+enc/trans/utf_16_32.$(OBJEXT): internal/arithmetic.h
+enc/trans/utf_16_32.$(OBJEXT): internal/arithmetic/char.h
+enc/trans/utf_16_32.$(OBJEXT): internal/arithmetic/double.h
+enc/trans/utf_16_32.$(OBJEXT): internal/arithmetic/fixnum.h
+enc/trans/utf_16_32.$(OBJEXT): internal/arithmetic/gid_t.h
+enc/trans/utf_16_32.$(OBJEXT): internal/arithmetic/int.h
+enc/trans/utf_16_32.$(OBJEXT): internal/arithmetic/intptr_t.h
+enc/trans/utf_16_32.$(OBJEXT): internal/arithmetic/long.h
+enc/trans/utf_16_32.$(OBJEXT): internal/arithmetic/long_long.h
+enc/trans/utf_16_32.$(OBJEXT): internal/arithmetic/mode_t.h
+enc/trans/utf_16_32.$(OBJEXT): internal/arithmetic/off_t.h
+enc/trans/utf_16_32.$(OBJEXT): internal/arithmetic/pid_t.h
+enc/trans/utf_16_32.$(OBJEXT): internal/arithmetic/short.h
+enc/trans/utf_16_32.$(OBJEXT): internal/arithmetic/size_t.h
+enc/trans/utf_16_32.$(OBJEXT): internal/arithmetic/st_data_t.h
+enc/trans/utf_16_32.$(OBJEXT): internal/arithmetic/uid_t.h
+enc/trans/utf_16_32.$(OBJEXT): internal/assume.h
+enc/trans/utf_16_32.$(OBJEXT): internal/attr/alloc_size.h
+enc/trans/utf_16_32.$(OBJEXT): internal/attr/artificial.h
+enc/trans/utf_16_32.$(OBJEXT): internal/attr/cold.h
+enc/trans/utf_16_32.$(OBJEXT): internal/attr/const.h
+enc/trans/utf_16_32.$(OBJEXT): internal/attr/constexpr.h
+enc/trans/utf_16_32.$(OBJEXT): internal/attr/deprecated.h
+enc/trans/utf_16_32.$(OBJEXT): internal/attr/diagnose_if.h
+enc/trans/utf_16_32.$(OBJEXT): internal/attr/enum_extensibility.h
+enc/trans/utf_16_32.$(OBJEXT): internal/attr/error.h
+enc/trans/utf_16_32.$(OBJEXT): internal/attr/flag_enum.h
+enc/trans/utf_16_32.$(OBJEXT): internal/attr/forceinline.h
+enc/trans/utf_16_32.$(OBJEXT): internal/attr/format.h
+enc/trans/utf_16_32.$(OBJEXT): internal/attr/maybe_unused.h
+enc/trans/utf_16_32.$(OBJEXT): internal/attr/noalias.h
+enc/trans/utf_16_32.$(OBJEXT): internal/attr/nodiscard.h
+enc/trans/utf_16_32.$(OBJEXT): internal/attr/noexcept.h
+enc/trans/utf_16_32.$(OBJEXT): internal/attr/noinline.h
+enc/trans/utf_16_32.$(OBJEXT): internal/attr/nonnull.h
+enc/trans/utf_16_32.$(OBJEXT): internal/attr/noreturn.h
+enc/trans/utf_16_32.$(OBJEXT): internal/attr/pure.h
+enc/trans/utf_16_32.$(OBJEXT): internal/attr/restrict.h
+enc/trans/utf_16_32.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/trans/utf_16_32.$(OBJEXT): internal/attr/warning.h
+enc/trans/utf_16_32.$(OBJEXT): internal/attr/weakref.h
+enc/trans/utf_16_32.$(OBJEXT): internal/cast.h
+enc/trans/utf_16_32.$(OBJEXT): internal/compiler_is.h
+enc/trans/utf_16_32.$(OBJEXT): internal/compiler_is/apple.h
+enc/trans/utf_16_32.$(OBJEXT): internal/compiler_is/clang.h
+enc/trans/utf_16_32.$(OBJEXT): internal/compiler_is/gcc.h
+enc/trans/utf_16_32.$(OBJEXT): internal/compiler_is/intel.h
+enc/trans/utf_16_32.$(OBJEXT): internal/compiler_is/msvc.h
+enc/trans/utf_16_32.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/trans/utf_16_32.$(OBJEXT): internal/compiler_since.h
+enc/trans/utf_16_32.$(OBJEXT): internal/config.h
+enc/trans/utf_16_32.$(OBJEXT): internal/constant_p.h
+enc/trans/utf_16_32.$(OBJEXT): internal/core.h
+enc/trans/utf_16_32.$(OBJEXT): internal/core/rarray.h
+enc/trans/utf_16_32.$(OBJEXT): internal/core/rbasic.h
+enc/trans/utf_16_32.$(OBJEXT): internal/core/rbignum.h
+enc/trans/utf_16_32.$(OBJEXT): internal/core/rclass.h
+enc/trans/utf_16_32.$(OBJEXT): internal/core/rdata.h
+enc/trans/utf_16_32.$(OBJEXT): internal/core/rfile.h
+enc/trans/utf_16_32.$(OBJEXT): internal/core/rhash.h
+enc/trans/utf_16_32.$(OBJEXT): internal/core/robject.h
+enc/trans/utf_16_32.$(OBJEXT): internal/core/rregexp.h
+enc/trans/utf_16_32.$(OBJEXT): internal/core/rstring.h
+enc/trans/utf_16_32.$(OBJEXT): internal/core/rstruct.h
+enc/trans/utf_16_32.$(OBJEXT): internal/core/rtypeddata.h
+enc/trans/utf_16_32.$(OBJEXT): internal/ctype.h
+enc/trans/utf_16_32.$(OBJEXT): internal/dllexport.h
+enc/trans/utf_16_32.$(OBJEXT): internal/dosish.h
+enc/trans/utf_16_32.$(OBJEXT): internal/error.h
+enc/trans/utf_16_32.$(OBJEXT): internal/eval.h
+enc/trans/utf_16_32.$(OBJEXT): internal/event.h
+enc/trans/utf_16_32.$(OBJEXT): internal/fl_type.h
+enc/trans/utf_16_32.$(OBJEXT): internal/gc.h
+enc/trans/utf_16_32.$(OBJEXT): internal/glob.h
+enc/trans/utf_16_32.$(OBJEXT): internal/globals.h
+enc/trans/utf_16_32.$(OBJEXT): internal/has/attribute.h
+enc/trans/utf_16_32.$(OBJEXT): internal/has/builtin.h
+enc/trans/utf_16_32.$(OBJEXT): internal/has/c_attribute.h
+enc/trans/utf_16_32.$(OBJEXT): internal/has/cpp_attribute.h
+enc/trans/utf_16_32.$(OBJEXT): internal/has/declspec_attribute.h
+enc/trans/utf_16_32.$(OBJEXT): internal/has/extension.h
+enc/trans/utf_16_32.$(OBJEXT): internal/has/feature.h
+enc/trans/utf_16_32.$(OBJEXT): internal/has/warning.h
+enc/trans/utf_16_32.$(OBJEXT): internal/intern/array.h
+enc/trans/utf_16_32.$(OBJEXT): internal/intern/bignum.h
+enc/trans/utf_16_32.$(OBJEXT): internal/intern/class.h
+enc/trans/utf_16_32.$(OBJEXT): internal/intern/compar.h
+enc/trans/utf_16_32.$(OBJEXT): internal/intern/complex.h
+enc/trans/utf_16_32.$(OBJEXT): internal/intern/cont.h
+enc/trans/utf_16_32.$(OBJEXT): internal/intern/dir.h
+enc/trans/utf_16_32.$(OBJEXT): internal/intern/enum.h
+enc/trans/utf_16_32.$(OBJEXT): internal/intern/enumerator.h
+enc/trans/utf_16_32.$(OBJEXT): internal/intern/error.h
+enc/trans/utf_16_32.$(OBJEXT): internal/intern/eval.h
+enc/trans/utf_16_32.$(OBJEXT): internal/intern/file.h
+enc/trans/utf_16_32.$(OBJEXT): internal/intern/gc.h
+enc/trans/utf_16_32.$(OBJEXT): internal/intern/hash.h
+enc/trans/utf_16_32.$(OBJEXT): internal/intern/io.h
+enc/trans/utf_16_32.$(OBJEXT): internal/intern/load.h
+enc/trans/utf_16_32.$(OBJEXT): internal/intern/marshal.h
+enc/trans/utf_16_32.$(OBJEXT): internal/intern/numeric.h
+enc/trans/utf_16_32.$(OBJEXT): internal/intern/object.h
+enc/trans/utf_16_32.$(OBJEXT): internal/intern/parse.h
+enc/trans/utf_16_32.$(OBJEXT): internal/intern/proc.h
+enc/trans/utf_16_32.$(OBJEXT): internal/intern/process.h
+enc/trans/utf_16_32.$(OBJEXT): internal/intern/random.h
+enc/trans/utf_16_32.$(OBJEXT): internal/intern/range.h
+enc/trans/utf_16_32.$(OBJEXT): internal/intern/rational.h
+enc/trans/utf_16_32.$(OBJEXT): internal/intern/re.h
+enc/trans/utf_16_32.$(OBJEXT): internal/intern/ruby.h
+enc/trans/utf_16_32.$(OBJEXT): internal/intern/select.h
+enc/trans/utf_16_32.$(OBJEXT): internal/intern/select/largesize.h
+enc/trans/utf_16_32.$(OBJEXT): internal/intern/signal.h
+enc/trans/utf_16_32.$(OBJEXT): internal/intern/sprintf.h
+enc/trans/utf_16_32.$(OBJEXT): internal/intern/string.h
+enc/trans/utf_16_32.$(OBJEXT): internal/intern/struct.h
+enc/trans/utf_16_32.$(OBJEXT): internal/intern/thread.h
+enc/trans/utf_16_32.$(OBJEXT): internal/intern/time.h
+enc/trans/utf_16_32.$(OBJEXT): internal/intern/variable.h
+enc/trans/utf_16_32.$(OBJEXT): internal/intern/vm.h
+enc/trans/utf_16_32.$(OBJEXT): internal/interpreter.h
+enc/trans/utf_16_32.$(OBJEXT): internal/iterator.h
+enc/trans/utf_16_32.$(OBJEXT): internal/memory.h
+enc/trans/utf_16_32.$(OBJEXT): internal/method.h
+enc/trans/utf_16_32.$(OBJEXT): internal/module.h
+enc/trans/utf_16_32.$(OBJEXT): internal/newobj.h
+enc/trans/utf_16_32.$(OBJEXT): internal/rgengc.h
+enc/trans/utf_16_32.$(OBJEXT): internal/scan_args.h
+enc/trans/utf_16_32.$(OBJEXT): internal/special_consts.h
+enc/trans/utf_16_32.$(OBJEXT): internal/static_assert.h
+enc/trans/utf_16_32.$(OBJEXT): internal/stdalign.h
+enc/trans/utf_16_32.$(OBJEXT): internal/stdbool.h
+enc/trans/utf_16_32.$(OBJEXT): internal/symbol.h
+enc/trans/utf_16_32.$(OBJEXT): internal/token_paste.h
+enc/trans/utf_16_32.$(OBJEXT): internal/value.h
+enc/trans/utf_16_32.$(OBJEXT): internal/value_type.h
+enc/trans/utf_16_32.$(OBJEXT): internal/variable.h
+enc/trans/utf_16_32.$(OBJEXT): internal/warning_push.h
+enc/trans/utf_16_32.$(OBJEXT): internal/xmalloc.h
+enc/trans/utf_16_32.$(OBJEXT): assert.h
 enc/trans/utf_16_32.$(OBJEXT): backward.h
+enc/trans/utf_16_32.$(OBJEXT): backward/2/assume.h
+enc/trans/utf_16_32.$(OBJEXT): backward/2/attributes.h
+enc/trans/utf_16_32.$(OBJEXT): backward/2/bool.h
+enc/trans/utf_16_32.$(OBJEXT): backward/2/gcc_version_since.h
+enc/trans/utf_16_32.$(OBJEXT): backward/2/inttypes.h
+enc/trans/utf_16_32.$(OBJEXT): backward/2/limits.h
+enc/trans/utf_16_32.$(OBJEXT): backward/2/long_long.h
+enc/trans/utf_16_32.$(OBJEXT): backward/2/stdalign.h
+enc/trans/utf_16_32.$(OBJEXT): backward/2/stdarg.h
 enc/trans/utf_16_32.$(OBJEXT): config.h
 enc/trans/utf_16_32.$(OBJEXT): defines.h
 enc/trans/utf_16_32.$(OBJEXT): enc/trans/utf_16_32.c
@@ -596,92 +5586,1131 @@ enc/trans/utf_16_32.$(OBJEXT): intern.h
 enc/trans/utf_16_32.$(OBJEXT): missing.h
 enc/trans/utf_16_32.$(OBJEXT): st.h
 enc/trans/utf_16_32.$(OBJEXT): subst.h
+enc/unicode.$(OBJEXT): $(UNICODE_HDR_DIR)/casefold.h
+enc/unicode.$(OBJEXT): $(UNICODE_HDR_DIR)/name2ctype.h
 enc/unicode.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 enc/unicode.$(OBJEXT): $(top_srcdir)/regenc.h
 enc/unicode.$(OBJEXT): $(top_srcdir)/regint.h
+enc/unicode.$(OBJEXT): internal/anyargs.h
+enc/unicode.$(OBJEXT): internal/arithmetic.h
+enc/unicode.$(OBJEXT): internal/arithmetic/char.h
+enc/unicode.$(OBJEXT): internal/arithmetic/double.h
+enc/unicode.$(OBJEXT): internal/arithmetic/fixnum.h
+enc/unicode.$(OBJEXT): internal/arithmetic/gid_t.h
+enc/unicode.$(OBJEXT): internal/arithmetic/int.h
+enc/unicode.$(OBJEXT): internal/arithmetic/intptr_t.h
+enc/unicode.$(OBJEXT): internal/arithmetic/long.h
+enc/unicode.$(OBJEXT): internal/arithmetic/long_long.h
+enc/unicode.$(OBJEXT): internal/arithmetic/mode_t.h
+enc/unicode.$(OBJEXT): internal/arithmetic/off_t.h
+enc/unicode.$(OBJEXT): internal/arithmetic/pid_t.h
+enc/unicode.$(OBJEXT): internal/arithmetic/short.h
+enc/unicode.$(OBJEXT): internal/arithmetic/size_t.h
+enc/unicode.$(OBJEXT): internal/arithmetic/st_data_t.h
+enc/unicode.$(OBJEXT): internal/arithmetic/uid_t.h
+enc/unicode.$(OBJEXT): internal/assume.h
+enc/unicode.$(OBJEXT): internal/attr/alloc_size.h
+enc/unicode.$(OBJEXT): internal/attr/artificial.h
+enc/unicode.$(OBJEXT): internal/attr/cold.h
+enc/unicode.$(OBJEXT): internal/attr/const.h
+enc/unicode.$(OBJEXT): internal/attr/constexpr.h
+enc/unicode.$(OBJEXT): internal/attr/deprecated.h
+enc/unicode.$(OBJEXT): internal/attr/diagnose_if.h
+enc/unicode.$(OBJEXT): internal/attr/enum_extensibility.h
+enc/unicode.$(OBJEXT): internal/attr/error.h
+enc/unicode.$(OBJEXT): internal/attr/flag_enum.h
+enc/unicode.$(OBJEXT): internal/attr/forceinline.h
+enc/unicode.$(OBJEXT): internal/attr/format.h
+enc/unicode.$(OBJEXT): internal/attr/maybe_unused.h
+enc/unicode.$(OBJEXT): internal/attr/noalias.h
+enc/unicode.$(OBJEXT): internal/attr/nodiscard.h
+enc/unicode.$(OBJEXT): internal/attr/noexcept.h
+enc/unicode.$(OBJEXT): internal/attr/noinline.h
+enc/unicode.$(OBJEXT): internal/attr/nonnull.h
+enc/unicode.$(OBJEXT): internal/attr/noreturn.h
+enc/unicode.$(OBJEXT): internal/attr/pure.h
+enc/unicode.$(OBJEXT): internal/attr/restrict.h
+enc/unicode.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/unicode.$(OBJEXT): internal/attr/warning.h
+enc/unicode.$(OBJEXT): internal/attr/weakref.h
+enc/unicode.$(OBJEXT): internal/cast.h
+enc/unicode.$(OBJEXT): internal/compiler_is.h
+enc/unicode.$(OBJEXT): internal/compiler_is/apple.h
+enc/unicode.$(OBJEXT): internal/compiler_is/clang.h
+enc/unicode.$(OBJEXT): internal/compiler_is/gcc.h
+enc/unicode.$(OBJEXT): internal/compiler_is/intel.h
+enc/unicode.$(OBJEXT): internal/compiler_is/msvc.h
+enc/unicode.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/unicode.$(OBJEXT): internal/compiler_since.h
+enc/unicode.$(OBJEXT): internal/config.h
+enc/unicode.$(OBJEXT): internal/constant_p.h
+enc/unicode.$(OBJEXT): internal/core.h
+enc/unicode.$(OBJEXT): internal/core/rarray.h
+enc/unicode.$(OBJEXT): internal/core/rbasic.h
+enc/unicode.$(OBJEXT): internal/core/rbignum.h
+enc/unicode.$(OBJEXT): internal/core/rclass.h
+enc/unicode.$(OBJEXT): internal/core/rdata.h
+enc/unicode.$(OBJEXT): internal/core/rfile.h
+enc/unicode.$(OBJEXT): internal/core/rhash.h
+enc/unicode.$(OBJEXT): internal/core/robject.h
+enc/unicode.$(OBJEXT): internal/core/rregexp.h
+enc/unicode.$(OBJEXT): internal/core/rstring.h
+enc/unicode.$(OBJEXT): internal/core/rstruct.h
+enc/unicode.$(OBJEXT): internal/core/rtypeddata.h
+enc/unicode.$(OBJEXT): internal/ctype.h
+enc/unicode.$(OBJEXT): internal/dllexport.h
+enc/unicode.$(OBJEXT): internal/dosish.h
+enc/unicode.$(OBJEXT): internal/error.h
+enc/unicode.$(OBJEXT): internal/eval.h
+enc/unicode.$(OBJEXT): internal/event.h
+enc/unicode.$(OBJEXT): internal/fl_type.h
+enc/unicode.$(OBJEXT): internal/gc.h
+enc/unicode.$(OBJEXT): internal/glob.h
+enc/unicode.$(OBJEXT): internal/globals.h
+enc/unicode.$(OBJEXT): internal/has/attribute.h
+enc/unicode.$(OBJEXT): internal/has/builtin.h
+enc/unicode.$(OBJEXT): internal/has/c_attribute.h
+enc/unicode.$(OBJEXT): internal/has/cpp_attribute.h
+enc/unicode.$(OBJEXT): internal/has/declspec_attribute.h
+enc/unicode.$(OBJEXT): internal/has/extension.h
+enc/unicode.$(OBJEXT): internal/has/feature.h
+enc/unicode.$(OBJEXT): internal/has/warning.h
+enc/unicode.$(OBJEXT): internal/intern/array.h
+enc/unicode.$(OBJEXT): internal/intern/bignum.h
+enc/unicode.$(OBJEXT): internal/intern/class.h
+enc/unicode.$(OBJEXT): internal/intern/compar.h
+enc/unicode.$(OBJEXT): internal/intern/complex.h
+enc/unicode.$(OBJEXT): internal/intern/cont.h
+enc/unicode.$(OBJEXT): internal/intern/dir.h
+enc/unicode.$(OBJEXT): internal/intern/enum.h
+enc/unicode.$(OBJEXT): internal/intern/enumerator.h
+enc/unicode.$(OBJEXT): internal/intern/error.h
+enc/unicode.$(OBJEXT): internal/intern/eval.h
+enc/unicode.$(OBJEXT): internal/intern/file.h
+enc/unicode.$(OBJEXT): internal/intern/gc.h
+enc/unicode.$(OBJEXT): internal/intern/hash.h
+enc/unicode.$(OBJEXT): internal/intern/io.h
+enc/unicode.$(OBJEXT): internal/intern/load.h
+enc/unicode.$(OBJEXT): internal/intern/marshal.h
+enc/unicode.$(OBJEXT): internal/intern/numeric.h
+enc/unicode.$(OBJEXT): internal/intern/object.h
+enc/unicode.$(OBJEXT): internal/intern/parse.h
+enc/unicode.$(OBJEXT): internal/intern/proc.h
+enc/unicode.$(OBJEXT): internal/intern/process.h
+enc/unicode.$(OBJEXT): internal/intern/random.h
+enc/unicode.$(OBJEXT): internal/intern/range.h
+enc/unicode.$(OBJEXT): internal/intern/rational.h
+enc/unicode.$(OBJEXT): internal/intern/re.h
+enc/unicode.$(OBJEXT): internal/intern/ruby.h
+enc/unicode.$(OBJEXT): internal/intern/select.h
+enc/unicode.$(OBJEXT): internal/intern/select/largesize.h
+enc/unicode.$(OBJEXT): internal/intern/signal.h
+enc/unicode.$(OBJEXT): internal/intern/sprintf.h
+enc/unicode.$(OBJEXT): internal/intern/string.h
+enc/unicode.$(OBJEXT): internal/intern/struct.h
+enc/unicode.$(OBJEXT): internal/intern/thread.h
+enc/unicode.$(OBJEXT): internal/intern/time.h
+enc/unicode.$(OBJEXT): internal/intern/variable.h
+enc/unicode.$(OBJEXT): internal/intern/vm.h
+enc/unicode.$(OBJEXT): internal/interpreter.h
+enc/unicode.$(OBJEXT): internal/iterator.h
+enc/unicode.$(OBJEXT): internal/memory.h
+enc/unicode.$(OBJEXT): internal/method.h
+enc/unicode.$(OBJEXT): internal/module.h
+enc/unicode.$(OBJEXT): internal/newobj.h
+enc/unicode.$(OBJEXT): internal/rgengc.h
+enc/unicode.$(OBJEXT): internal/scan_args.h
+enc/unicode.$(OBJEXT): internal/special_consts.h
+enc/unicode.$(OBJEXT): internal/static_assert.h
+enc/unicode.$(OBJEXT): internal/stdalign.h
+enc/unicode.$(OBJEXT): internal/stdbool.h
+enc/unicode.$(OBJEXT): internal/symbol.h
+enc/unicode.$(OBJEXT): internal/token_paste.h
+enc/unicode.$(OBJEXT): internal/value.h
+enc/unicode.$(OBJEXT): internal/value_type.h
+enc/unicode.$(OBJEXT): internal/variable.h
+enc/unicode.$(OBJEXT): internal/warning_push.h
+enc/unicode.$(OBJEXT): internal/xmalloc.h
+enc/unicode.$(OBJEXT): assert.h
+enc/unicode.$(OBJEXT): backward/2/assume.h
+enc/unicode.$(OBJEXT): backward/2/attributes.h
+enc/unicode.$(OBJEXT): backward/2/bool.h
+enc/unicode.$(OBJEXT): backward/2/gcc_version_since.h
+enc/unicode.$(OBJEXT): backward/2/inttypes.h
+enc/unicode.$(OBJEXT): backward/2/limits.h
+enc/unicode.$(OBJEXT): backward/2/long_long.h
+enc/unicode.$(OBJEXT): backward/2/stdalign.h
+enc/unicode.$(OBJEXT): backward/2/stdarg.h
 enc/unicode.$(OBJEXT): config.h
 enc/unicode.$(OBJEXT): defines.h
 enc/unicode.$(OBJEXT): enc/unicode.c
-enc/unicode.$(OBJEXT): enc/unicode/casefold.h
-enc/unicode.$(OBJEXT): enc/unicode/name2ctype.h
 enc/unicode.$(OBJEXT): intern.h
 enc/unicode.$(OBJEXT): missing.h
-enc/unicode.$(OBJEXT): oniguruma.h
+enc/unicode.$(OBJEXT): onigmo.h
 enc/unicode.$(OBJEXT): st.h
 enc/unicode.$(OBJEXT): subst.h
+enc/us_ascii.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 enc/us_ascii.$(OBJEXT): $(top_srcdir)/encindex.h
 enc/us_ascii.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/us_ascii.$(OBJEXT): internal/anyargs.h
+enc/us_ascii.$(OBJEXT): internal/arithmetic.h
+enc/us_ascii.$(OBJEXT): internal/arithmetic/char.h
+enc/us_ascii.$(OBJEXT): internal/arithmetic/double.h
+enc/us_ascii.$(OBJEXT): internal/arithmetic/fixnum.h
+enc/us_ascii.$(OBJEXT): internal/arithmetic/gid_t.h
+enc/us_ascii.$(OBJEXT): internal/arithmetic/int.h
+enc/us_ascii.$(OBJEXT): internal/arithmetic/intptr_t.h
+enc/us_ascii.$(OBJEXT): internal/arithmetic/long.h
+enc/us_ascii.$(OBJEXT): internal/arithmetic/long_long.h
+enc/us_ascii.$(OBJEXT): internal/arithmetic/mode_t.h
+enc/us_ascii.$(OBJEXT): internal/arithmetic/off_t.h
+enc/us_ascii.$(OBJEXT): internal/arithmetic/pid_t.h
+enc/us_ascii.$(OBJEXT): internal/arithmetic/short.h
+enc/us_ascii.$(OBJEXT): internal/arithmetic/size_t.h
+enc/us_ascii.$(OBJEXT): internal/arithmetic/st_data_t.h
+enc/us_ascii.$(OBJEXT): internal/arithmetic/uid_t.h
+enc/us_ascii.$(OBJEXT): internal/assume.h
+enc/us_ascii.$(OBJEXT): internal/attr/alloc_size.h
+enc/us_ascii.$(OBJEXT): internal/attr/artificial.h
+enc/us_ascii.$(OBJEXT): internal/attr/cold.h
+enc/us_ascii.$(OBJEXT): internal/attr/const.h
+enc/us_ascii.$(OBJEXT): internal/attr/constexpr.h
+enc/us_ascii.$(OBJEXT): internal/attr/deprecated.h
+enc/us_ascii.$(OBJEXT): internal/attr/diagnose_if.h
+enc/us_ascii.$(OBJEXT): internal/attr/enum_extensibility.h
+enc/us_ascii.$(OBJEXT): internal/attr/error.h
+enc/us_ascii.$(OBJEXT): internal/attr/flag_enum.h
+enc/us_ascii.$(OBJEXT): internal/attr/forceinline.h
+enc/us_ascii.$(OBJEXT): internal/attr/format.h
+enc/us_ascii.$(OBJEXT): internal/attr/maybe_unused.h
+enc/us_ascii.$(OBJEXT): internal/attr/noalias.h
+enc/us_ascii.$(OBJEXT): internal/attr/nodiscard.h
+enc/us_ascii.$(OBJEXT): internal/attr/noexcept.h
+enc/us_ascii.$(OBJEXT): internal/attr/noinline.h
+enc/us_ascii.$(OBJEXT): internal/attr/nonnull.h
+enc/us_ascii.$(OBJEXT): internal/attr/noreturn.h
+enc/us_ascii.$(OBJEXT): internal/attr/pure.h
+enc/us_ascii.$(OBJEXT): internal/attr/restrict.h
+enc/us_ascii.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/us_ascii.$(OBJEXT): internal/attr/warning.h
+enc/us_ascii.$(OBJEXT): internal/attr/weakref.h
+enc/us_ascii.$(OBJEXT): internal/cast.h
+enc/us_ascii.$(OBJEXT): internal/compiler_is.h
+enc/us_ascii.$(OBJEXT): internal/compiler_is/apple.h
+enc/us_ascii.$(OBJEXT): internal/compiler_is/clang.h
+enc/us_ascii.$(OBJEXT): internal/compiler_is/gcc.h
+enc/us_ascii.$(OBJEXT): internal/compiler_is/intel.h
+enc/us_ascii.$(OBJEXT): internal/compiler_is/msvc.h
+enc/us_ascii.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/us_ascii.$(OBJEXT): internal/compiler_since.h
+enc/us_ascii.$(OBJEXT): internal/config.h
+enc/us_ascii.$(OBJEXT): internal/constant_p.h
+enc/us_ascii.$(OBJEXT): internal/core.h
+enc/us_ascii.$(OBJEXT): internal/core/rarray.h
+enc/us_ascii.$(OBJEXT): internal/core/rbasic.h
+enc/us_ascii.$(OBJEXT): internal/core/rbignum.h
+enc/us_ascii.$(OBJEXT): internal/core/rclass.h
+enc/us_ascii.$(OBJEXT): internal/core/rdata.h
+enc/us_ascii.$(OBJEXT): internal/core/rfile.h
+enc/us_ascii.$(OBJEXT): internal/core/rhash.h
+enc/us_ascii.$(OBJEXT): internal/core/robject.h
+enc/us_ascii.$(OBJEXT): internal/core/rregexp.h
+enc/us_ascii.$(OBJEXT): internal/core/rstring.h
+enc/us_ascii.$(OBJEXT): internal/core/rstruct.h
+enc/us_ascii.$(OBJEXT): internal/core/rtypeddata.h
+enc/us_ascii.$(OBJEXT): internal/ctype.h
+enc/us_ascii.$(OBJEXT): internal/dllexport.h
+enc/us_ascii.$(OBJEXT): internal/dosish.h
+enc/us_ascii.$(OBJEXT): internal/error.h
+enc/us_ascii.$(OBJEXT): internal/eval.h
+enc/us_ascii.$(OBJEXT): internal/event.h
+enc/us_ascii.$(OBJEXT): internal/fl_type.h
+enc/us_ascii.$(OBJEXT): internal/gc.h
+enc/us_ascii.$(OBJEXT): internal/glob.h
+enc/us_ascii.$(OBJEXT): internal/globals.h
+enc/us_ascii.$(OBJEXT): internal/has/attribute.h
+enc/us_ascii.$(OBJEXT): internal/has/builtin.h
+enc/us_ascii.$(OBJEXT): internal/has/c_attribute.h
+enc/us_ascii.$(OBJEXT): internal/has/cpp_attribute.h
+enc/us_ascii.$(OBJEXT): internal/has/declspec_attribute.h
+enc/us_ascii.$(OBJEXT): internal/has/extension.h
+enc/us_ascii.$(OBJEXT): internal/has/feature.h
+enc/us_ascii.$(OBJEXT): internal/has/warning.h
+enc/us_ascii.$(OBJEXT): internal/intern/array.h
+enc/us_ascii.$(OBJEXT): internal/intern/bignum.h
+enc/us_ascii.$(OBJEXT): internal/intern/class.h
+enc/us_ascii.$(OBJEXT): internal/intern/compar.h
+enc/us_ascii.$(OBJEXT): internal/intern/complex.h
+enc/us_ascii.$(OBJEXT): internal/intern/cont.h
+enc/us_ascii.$(OBJEXT): internal/intern/dir.h
+enc/us_ascii.$(OBJEXT): internal/intern/enum.h
+enc/us_ascii.$(OBJEXT): internal/intern/enumerator.h
+enc/us_ascii.$(OBJEXT): internal/intern/error.h
+enc/us_ascii.$(OBJEXT): internal/intern/eval.h
+enc/us_ascii.$(OBJEXT): internal/intern/file.h
+enc/us_ascii.$(OBJEXT): internal/intern/gc.h
+enc/us_ascii.$(OBJEXT): internal/intern/hash.h
+enc/us_ascii.$(OBJEXT): internal/intern/io.h
+enc/us_ascii.$(OBJEXT): internal/intern/load.h
+enc/us_ascii.$(OBJEXT): internal/intern/marshal.h
+enc/us_ascii.$(OBJEXT): internal/intern/numeric.h
+enc/us_ascii.$(OBJEXT): internal/intern/object.h
+enc/us_ascii.$(OBJEXT): internal/intern/parse.h
+enc/us_ascii.$(OBJEXT): internal/intern/proc.h
+enc/us_ascii.$(OBJEXT): internal/intern/process.h
+enc/us_ascii.$(OBJEXT): internal/intern/random.h
+enc/us_ascii.$(OBJEXT): internal/intern/range.h
+enc/us_ascii.$(OBJEXT): internal/intern/rational.h
+enc/us_ascii.$(OBJEXT): internal/intern/re.h
+enc/us_ascii.$(OBJEXT): internal/intern/ruby.h
+enc/us_ascii.$(OBJEXT): internal/intern/select.h
+enc/us_ascii.$(OBJEXT): internal/intern/select/largesize.h
+enc/us_ascii.$(OBJEXT): internal/intern/signal.h
+enc/us_ascii.$(OBJEXT): internal/intern/sprintf.h
+enc/us_ascii.$(OBJEXT): internal/intern/string.h
+enc/us_ascii.$(OBJEXT): internal/intern/struct.h
+enc/us_ascii.$(OBJEXT): internal/intern/thread.h
+enc/us_ascii.$(OBJEXT): internal/intern/time.h
+enc/us_ascii.$(OBJEXT): internal/intern/variable.h
+enc/us_ascii.$(OBJEXT): internal/intern/vm.h
+enc/us_ascii.$(OBJEXT): internal/interpreter.h
+enc/us_ascii.$(OBJEXT): internal/iterator.h
+enc/us_ascii.$(OBJEXT): internal/memory.h
+enc/us_ascii.$(OBJEXT): internal/method.h
+enc/us_ascii.$(OBJEXT): internal/module.h
+enc/us_ascii.$(OBJEXT): internal/newobj.h
+enc/us_ascii.$(OBJEXT): internal/rgengc.h
+enc/us_ascii.$(OBJEXT): internal/scan_args.h
+enc/us_ascii.$(OBJEXT): internal/special_consts.h
+enc/us_ascii.$(OBJEXT): internal/static_assert.h
+enc/us_ascii.$(OBJEXT): internal/stdalign.h
+enc/us_ascii.$(OBJEXT): internal/stdbool.h
+enc/us_ascii.$(OBJEXT): internal/symbol.h
+enc/us_ascii.$(OBJEXT): internal/token_paste.h
+enc/us_ascii.$(OBJEXT): internal/value.h
+enc/us_ascii.$(OBJEXT): internal/value_type.h
+enc/us_ascii.$(OBJEXT): internal/variable.h
+enc/us_ascii.$(OBJEXT): internal/warning_push.h
+enc/us_ascii.$(OBJEXT): internal/xmalloc.h
+enc/us_ascii.$(OBJEXT): assert.h
+enc/us_ascii.$(OBJEXT): backward/2/assume.h
+enc/us_ascii.$(OBJEXT): backward/2/attributes.h
+enc/us_ascii.$(OBJEXT): backward/2/bool.h
+enc/us_ascii.$(OBJEXT): backward/2/gcc_version_since.h
+enc/us_ascii.$(OBJEXT): backward/2/inttypes.h
+enc/us_ascii.$(OBJEXT): backward/2/limits.h
+enc/us_ascii.$(OBJEXT): backward/2/long_long.h
+enc/us_ascii.$(OBJEXT): backward/2/stdalign.h
+enc/us_ascii.$(OBJEXT): backward/2/stdarg.h
 enc/us_ascii.$(OBJEXT): config.h
 enc/us_ascii.$(OBJEXT): defines.h
 enc/us_ascii.$(OBJEXT): enc/us_ascii.c
+enc/us_ascii.$(OBJEXT): encoding.h
+enc/us_ascii.$(OBJEXT): intern.h
 enc/us_ascii.$(OBJEXT): missing.h
+enc/us_ascii.$(OBJEXT): onigmo.h
 enc/us_ascii.$(OBJEXT): oniguruma.h
+enc/us_ascii.$(OBJEXT): st.h
+enc/us_ascii.$(OBJEXT): subst.h
 enc/utf_16be.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/utf_16be.$(OBJEXT): internal/assume.h
+enc/utf_16be.$(OBJEXT): internal/attr/alloc_size.h
+enc/utf_16be.$(OBJEXT): internal/attr/cold.h
+enc/utf_16be.$(OBJEXT): internal/attr/const.h
+enc/utf_16be.$(OBJEXT): internal/attr/deprecated.h
+enc/utf_16be.$(OBJEXT): internal/attr/error.h
+enc/utf_16be.$(OBJEXT): internal/attr/forceinline.h
+enc/utf_16be.$(OBJEXT): internal/attr/format.h
+enc/utf_16be.$(OBJEXT): internal/attr/maybe_unused.h
+enc/utf_16be.$(OBJEXT): internal/attr/nodiscard.h
+enc/utf_16be.$(OBJEXT): internal/attr/noexcept.h
+enc/utf_16be.$(OBJEXT): internal/attr/noinline.h
+enc/utf_16be.$(OBJEXT): internal/attr/nonnull.h
+enc/utf_16be.$(OBJEXT): internal/attr/noreturn.h
+enc/utf_16be.$(OBJEXT): internal/attr/pure.h
+enc/utf_16be.$(OBJEXT): internal/attr/restrict.h
+enc/utf_16be.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/utf_16be.$(OBJEXT): internal/attr/warning.h
+enc/utf_16be.$(OBJEXT): internal/cast.h
+enc/utf_16be.$(OBJEXT): internal/compiler_is.h
+enc/utf_16be.$(OBJEXT): internal/compiler_is/apple.h
+enc/utf_16be.$(OBJEXT): internal/compiler_is/clang.h
+enc/utf_16be.$(OBJEXT): internal/compiler_is/gcc.h
+enc/utf_16be.$(OBJEXT): internal/compiler_is/intel.h
+enc/utf_16be.$(OBJEXT): internal/compiler_is/msvc.h
+enc/utf_16be.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/utf_16be.$(OBJEXT): internal/compiler_since.h
+enc/utf_16be.$(OBJEXT): internal/config.h
+enc/utf_16be.$(OBJEXT): internal/dllexport.h
+enc/utf_16be.$(OBJEXT): internal/dosish.h
+enc/utf_16be.$(OBJEXT): internal/has/attribute.h
+enc/utf_16be.$(OBJEXT): internal/has/builtin.h
+enc/utf_16be.$(OBJEXT): internal/has/c_attribute.h
+enc/utf_16be.$(OBJEXT): internal/has/cpp_attribute.h
+enc/utf_16be.$(OBJEXT): internal/has/declspec_attribute.h
+enc/utf_16be.$(OBJEXT): internal/has/extension.h
+enc/utf_16be.$(OBJEXT): internal/has/feature.h
+enc/utf_16be.$(OBJEXT): internal/has/warning.h
+enc/utf_16be.$(OBJEXT): internal/stdalign.h
+enc/utf_16be.$(OBJEXT): internal/stdbool.h
+enc/utf_16be.$(OBJEXT): internal/token_paste.h
+enc/utf_16be.$(OBJEXT): internal/warning_push.h
+enc/utf_16be.$(OBJEXT): internal/xmalloc.h
+enc/utf_16be.$(OBJEXT): assert.h
+enc/utf_16be.$(OBJEXT): backward/2/assume.h
+enc/utf_16be.$(OBJEXT): backward/2/attributes.h
+enc/utf_16be.$(OBJEXT): backward/2/bool.h
+enc/utf_16be.$(OBJEXT): backward/2/gcc_version_since.h
+enc/utf_16be.$(OBJEXT): backward/2/long_long.h
+enc/utf_16be.$(OBJEXT): backward/2/stdalign.h
+enc/utf_16be.$(OBJEXT): backward/2/stdarg.h
 enc/utf_16be.$(OBJEXT): config.h
 enc/utf_16be.$(OBJEXT): defines.h
 enc/utf_16be.$(OBJEXT): enc/iso_8859.h
 enc/utf_16be.$(OBJEXT): enc/utf_16be.c
 enc/utf_16be.$(OBJEXT): missing.h
-enc/utf_16be.$(OBJEXT): oniguruma.h
+enc/utf_16be.$(OBJEXT): onigmo.h
 enc/utf_16le.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/utf_16le.$(OBJEXT): internal/assume.h
+enc/utf_16le.$(OBJEXT): internal/attr/alloc_size.h
+enc/utf_16le.$(OBJEXT): internal/attr/cold.h
+enc/utf_16le.$(OBJEXT): internal/attr/const.h
+enc/utf_16le.$(OBJEXT): internal/attr/deprecated.h
+enc/utf_16le.$(OBJEXT): internal/attr/error.h
+enc/utf_16le.$(OBJEXT): internal/attr/forceinline.h
+enc/utf_16le.$(OBJEXT): internal/attr/format.h
+enc/utf_16le.$(OBJEXT): internal/attr/maybe_unused.h
+enc/utf_16le.$(OBJEXT): internal/attr/nodiscard.h
+enc/utf_16le.$(OBJEXT): internal/attr/noexcept.h
+enc/utf_16le.$(OBJEXT): internal/attr/noinline.h
+enc/utf_16le.$(OBJEXT): internal/attr/nonnull.h
+enc/utf_16le.$(OBJEXT): internal/attr/noreturn.h
+enc/utf_16le.$(OBJEXT): internal/attr/pure.h
+enc/utf_16le.$(OBJEXT): internal/attr/restrict.h
+enc/utf_16le.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/utf_16le.$(OBJEXT): internal/attr/warning.h
+enc/utf_16le.$(OBJEXT): internal/cast.h
+enc/utf_16le.$(OBJEXT): internal/compiler_is.h
+enc/utf_16le.$(OBJEXT): internal/compiler_is/apple.h
+enc/utf_16le.$(OBJEXT): internal/compiler_is/clang.h
+enc/utf_16le.$(OBJEXT): internal/compiler_is/gcc.h
+enc/utf_16le.$(OBJEXT): internal/compiler_is/intel.h
+enc/utf_16le.$(OBJEXT): internal/compiler_is/msvc.h
+enc/utf_16le.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/utf_16le.$(OBJEXT): internal/compiler_since.h
+enc/utf_16le.$(OBJEXT): internal/config.h
+enc/utf_16le.$(OBJEXT): internal/dllexport.h
+enc/utf_16le.$(OBJEXT): internal/dosish.h
+enc/utf_16le.$(OBJEXT): internal/has/attribute.h
+enc/utf_16le.$(OBJEXT): internal/has/builtin.h
+enc/utf_16le.$(OBJEXT): internal/has/c_attribute.h
+enc/utf_16le.$(OBJEXT): internal/has/cpp_attribute.h
+enc/utf_16le.$(OBJEXT): internal/has/declspec_attribute.h
+enc/utf_16le.$(OBJEXT): internal/has/extension.h
+enc/utf_16le.$(OBJEXT): internal/has/feature.h
+enc/utf_16le.$(OBJEXT): internal/has/warning.h
+enc/utf_16le.$(OBJEXT): internal/stdalign.h
+enc/utf_16le.$(OBJEXT): internal/stdbool.h
+enc/utf_16le.$(OBJEXT): internal/token_paste.h
+enc/utf_16le.$(OBJEXT): internal/warning_push.h
+enc/utf_16le.$(OBJEXT): internal/xmalloc.h
+enc/utf_16le.$(OBJEXT): assert.h
+enc/utf_16le.$(OBJEXT): backward/2/assume.h
+enc/utf_16le.$(OBJEXT): backward/2/attributes.h
+enc/utf_16le.$(OBJEXT): backward/2/bool.h
+enc/utf_16le.$(OBJEXT): backward/2/gcc_version_since.h
+enc/utf_16le.$(OBJEXT): backward/2/long_long.h
+enc/utf_16le.$(OBJEXT): backward/2/stdalign.h
+enc/utf_16le.$(OBJEXT): backward/2/stdarg.h
 enc/utf_16le.$(OBJEXT): config.h
 enc/utf_16le.$(OBJEXT): defines.h
 enc/utf_16le.$(OBJEXT): enc/iso_8859.h
 enc/utf_16le.$(OBJEXT): enc/utf_16le.c
 enc/utf_16le.$(OBJEXT): missing.h
-enc/utf_16le.$(OBJEXT): oniguruma.h
+enc/utf_16le.$(OBJEXT): onigmo.h
 enc/utf_32be.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/utf_32be.$(OBJEXT): internal/assume.h
+enc/utf_32be.$(OBJEXT): internal/attr/alloc_size.h
+enc/utf_32be.$(OBJEXT): internal/attr/cold.h
+enc/utf_32be.$(OBJEXT): internal/attr/const.h
+enc/utf_32be.$(OBJEXT): internal/attr/deprecated.h
+enc/utf_32be.$(OBJEXT): internal/attr/error.h
+enc/utf_32be.$(OBJEXT): internal/attr/forceinline.h
+enc/utf_32be.$(OBJEXT): internal/attr/format.h
+enc/utf_32be.$(OBJEXT): internal/attr/maybe_unused.h
+enc/utf_32be.$(OBJEXT): internal/attr/nodiscard.h
+enc/utf_32be.$(OBJEXT): internal/attr/noexcept.h
+enc/utf_32be.$(OBJEXT): internal/attr/noinline.h
+enc/utf_32be.$(OBJEXT): internal/attr/nonnull.h
+enc/utf_32be.$(OBJEXT): internal/attr/noreturn.h
+enc/utf_32be.$(OBJEXT): internal/attr/pure.h
+enc/utf_32be.$(OBJEXT): internal/attr/restrict.h
+enc/utf_32be.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/utf_32be.$(OBJEXT): internal/attr/warning.h
+enc/utf_32be.$(OBJEXT): internal/cast.h
+enc/utf_32be.$(OBJEXT): internal/compiler_is.h
+enc/utf_32be.$(OBJEXT): internal/compiler_is/apple.h
+enc/utf_32be.$(OBJEXT): internal/compiler_is/clang.h
+enc/utf_32be.$(OBJEXT): internal/compiler_is/gcc.h
+enc/utf_32be.$(OBJEXT): internal/compiler_is/intel.h
+enc/utf_32be.$(OBJEXT): internal/compiler_is/msvc.h
+enc/utf_32be.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/utf_32be.$(OBJEXT): internal/compiler_since.h
+enc/utf_32be.$(OBJEXT): internal/config.h
+enc/utf_32be.$(OBJEXT): internal/dllexport.h
+enc/utf_32be.$(OBJEXT): internal/dosish.h
+enc/utf_32be.$(OBJEXT): internal/has/attribute.h
+enc/utf_32be.$(OBJEXT): internal/has/builtin.h
+enc/utf_32be.$(OBJEXT): internal/has/c_attribute.h
+enc/utf_32be.$(OBJEXT): internal/has/cpp_attribute.h
+enc/utf_32be.$(OBJEXT): internal/has/declspec_attribute.h
+enc/utf_32be.$(OBJEXT): internal/has/extension.h
+enc/utf_32be.$(OBJEXT): internal/has/feature.h
+enc/utf_32be.$(OBJEXT): internal/has/warning.h
+enc/utf_32be.$(OBJEXT): internal/stdalign.h
+enc/utf_32be.$(OBJEXT): internal/stdbool.h
+enc/utf_32be.$(OBJEXT): internal/token_paste.h
+enc/utf_32be.$(OBJEXT): internal/warning_push.h
+enc/utf_32be.$(OBJEXT): internal/xmalloc.h
+enc/utf_32be.$(OBJEXT): assert.h
+enc/utf_32be.$(OBJEXT): backward/2/assume.h
+enc/utf_32be.$(OBJEXT): backward/2/attributes.h
+enc/utf_32be.$(OBJEXT): backward/2/bool.h
+enc/utf_32be.$(OBJEXT): backward/2/gcc_version_since.h
+enc/utf_32be.$(OBJEXT): backward/2/long_long.h
+enc/utf_32be.$(OBJEXT): backward/2/stdalign.h
+enc/utf_32be.$(OBJEXT): backward/2/stdarg.h
 enc/utf_32be.$(OBJEXT): config.h
 enc/utf_32be.$(OBJEXT): defines.h
 enc/utf_32be.$(OBJEXT): enc/iso_8859.h
 enc/utf_32be.$(OBJEXT): enc/utf_32be.c
 enc/utf_32be.$(OBJEXT): missing.h
-enc/utf_32be.$(OBJEXT): oniguruma.h
+enc/utf_32be.$(OBJEXT): onigmo.h
 enc/utf_32le.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/utf_32le.$(OBJEXT): internal/assume.h
+enc/utf_32le.$(OBJEXT): internal/attr/alloc_size.h
+enc/utf_32le.$(OBJEXT): internal/attr/cold.h
+enc/utf_32le.$(OBJEXT): internal/attr/const.h
+enc/utf_32le.$(OBJEXT): internal/attr/deprecated.h
+enc/utf_32le.$(OBJEXT): internal/attr/error.h
+enc/utf_32le.$(OBJEXT): internal/attr/forceinline.h
+enc/utf_32le.$(OBJEXT): internal/attr/format.h
+enc/utf_32le.$(OBJEXT): internal/attr/maybe_unused.h
+enc/utf_32le.$(OBJEXT): internal/attr/nodiscard.h
+enc/utf_32le.$(OBJEXT): internal/attr/noexcept.h
+enc/utf_32le.$(OBJEXT): internal/attr/noinline.h
+enc/utf_32le.$(OBJEXT): internal/attr/nonnull.h
+enc/utf_32le.$(OBJEXT): internal/attr/noreturn.h
+enc/utf_32le.$(OBJEXT): internal/attr/pure.h
+enc/utf_32le.$(OBJEXT): internal/attr/restrict.h
+enc/utf_32le.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/utf_32le.$(OBJEXT): internal/attr/warning.h
+enc/utf_32le.$(OBJEXT): internal/cast.h
+enc/utf_32le.$(OBJEXT): internal/compiler_is.h
+enc/utf_32le.$(OBJEXT): internal/compiler_is/apple.h
+enc/utf_32le.$(OBJEXT): internal/compiler_is/clang.h
+enc/utf_32le.$(OBJEXT): internal/compiler_is/gcc.h
+enc/utf_32le.$(OBJEXT): internal/compiler_is/intel.h
+enc/utf_32le.$(OBJEXT): internal/compiler_is/msvc.h
+enc/utf_32le.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/utf_32le.$(OBJEXT): internal/compiler_since.h
+enc/utf_32le.$(OBJEXT): internal/config.h
+enc/utf_32le.$(OBJEXT): internal/dllexport.h
+enc/utf_32le.$(OBJEXT): internal/dosish.h
+enc/utf_32le.$(OBJEXT): internal/has/attribute.h
+enc/utf_32le.$(OBJEXT): internal/has/builtin.h
+enc/utf_32le.$(OBJEXT): internal/has/c_attribute.h
+enc/utf_32le.$(OBJEXT): internal/has/cpp_attribute.h
+enc/utf_32le.$(OBJEXT): internal/has/declspec_attribute.h
+enc/utf_32le.$(OBJEXT): internal/has/extension.h
+enc/utf_32le.$(OBJEXT): internal/has/feature.h
+enc/utf_32le.$(OBJEXT): internal/has/warning.h
+enc/utf_32le.$(OBJEXT): internal/stdalign.h
+enc/utf_32le.$(OBJEXT): internal/stdbool.h
+enc/utf_32le.$(OBJEXT): internal/token_paste.h
+enc/utf_32le.$(OBJEXT): internal/warning_push.h
+enc/utf_32le.$(OBJEXT): internal/xmalloc.h
+enc/utf_32le.$(OBJEXT): assert.h
+enc/utf_32le.$(OBJEXT): backward/2/assume.h
+enc/utf_32le.$(OBJEXT): backward/2/attributes.h
+enc/utf_32le.$(OBJEXT): backward/2/bool.h
+enc/utf_32le.$(OBJEXT): backward/2/gcc_version_since.h
+enc/utf_32le.$(OBJEXT): backward/2/long_long.h
+enc/utf_32le.$(OBJEXT): backward/2/stdalign.h
+enc/utf_32le.$(OBJEXT): backward/2/stdarg.h
 enc/utf_32le.$(OBJEXT): config.h
 enc/utf_32le.$(OBJEXT): defines.h
 enc/utf_32le.$(OBJEXT): enc/iso_8859.h
 enc/utf_32le.$(OBJEXT): enc/utf_32le.c
 enc/utf_32le.$(OBJEXT): missing.h
-enc/utf_32le.$(OBJEXT): oniguruma.h
+enc/utf_32le.$(OBJEXT): onigmo.h
+enc/utf_8.$(OBJEXT): $(hdrdir)/ruby/ruby.h
 enc/utf_8.$(OBJEXT): $(top_srcdir)/encindex.h
 enc/utf_8.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/utf_8.$(OBJEXT): internal/anyargs.h
+enc/utf_8.$(OBJEXT): internal/arithmetic.h
+enc/utf_8.$(OBJEXT): internal/arithmetic/char.h
+enc/utf_8.$(OBJEXT): internal/arithmetic/double.h
+enc/utf_8.$(OBJEXT): internal/arithmetic/fixnum.h
+enc/utf_8.$(OBJEXT): internal/arithmetic/gid_t.h
+enc/utf_8.$(OBJEXT): internal/arithmetic/int.h
+enc/utf_8.$(OBJEXT): internal/arithmetic/intptr_t.h
+enc/utf_8.$(OBJEXT): internal/arithmetic/long.h
+enc/utf_8.$(OBJEXT): internal/arithmetic/long_long.h
+enc/utf_8.$(OBJEXT): internal/arithmetic/mode_t.h
+enc/utf_8.$(OBJEXT): internal/arithmetic/off_t.h
+enc/utf_8.$(OBJEXT): internal/arithmetic/pid_t.h
+enc/utf_8.$(OBJEXT): internal/arithmetic/short.h
+enc/utf_8.$(OBJEXT): internal/arithmetic/size_t.h
+enc/utf_8.$(OBJEXT): internal/arithmetic/st_data_t.h
+enc/utf_8.$(OBJEXT): internal/arithmetic/uid_t.h
+enc/utf_8.$(OBJEXT): internal/assume.h
+enc/utf_8.$(OBJEXT): internal/attr/alloc_size.h
+enc/utf_8.$(OBJEXT): internal/attr/artificial.h
+enc/utf_8.$(OBJEXT): internal/attr/cold.h
+enc/utf_8.$(OBJEXT): internal/attr/const.h
+enc/utf_8.$(OBJEXT): internal/attr/constexpr.h
+enc/utf_8.$(OBJEXT): internal/attr/deprecated.h
+enc/utf_8.$(OBJEXT): internal/attr/diagnose_if.h
+enc/utf_8.$(OBJEXT): internal/attr/enum_extensibility.h
+enc/utf_8.$(OBJEXT): internal/attr/error.h
+enc/utf_8.$(OBJEXT): internal/attr/flag_enum.h
+enc/utf_8.$(OBJEXT): internal/attr/forceinline.h
+enc/utf_8.$(OBJEXT): internal/attr/format.h
+enc/utf_8.$(OBJEXT): internal/attr/maybe_unused.h
+enc/utf_8.$(OBJEXT): internal/attr/noalias.h
+enc/utf_8.$(OBJEXT): internal/attr/nodiscard.h
+enc/utf_8.$(OBJEXT): internal/attr/noexcept.h
+enc/utf_8.$(OBJEXT): internal/attr/noinline.h
+enc/utf_8.$(OBJEXT): internal/attr/nonnull.h
+enc/utf_8.$(OBJEXT): internal/attr/noreturn.h
+enc/utf_8.$(OBJEXT): internal/attr/pure.h
+enc/utf_8.$(OBJEXT): internal/attr/restrict.h
+enc/utf_8.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/utf_8.$(OBJEXT): internal/attr/warning.h
+enc/utf_8.$(OBJEXT): internal/attr/weakref.h
+enc/utf_8.$(OBJEXT): internal/cast.h
+enc/utf_8.$(OBJEXT): internal/compiler_is.h
+enc/utf_8.$(OBJEXT): internal/compiler_is/apple.h
+enc/utf_8.$(OBJEXT): internal/compiler_is/clang.h
+enc/utf_8.$(OBJEXT): internal/compiler_is/gcc.h
+enc/utf_8.$(OBJEXT): internal/compiler_is/intel.h
+enc/utf_8.$(OBJEXT): internal/compiler_is/msvc.h
+enc/utf_8.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/utf_8.$(OBJEXT): internal/compiler_since.h
+enc/utf_8.$(OBJEXT): internal/config.h
+enc/utf_8.$(OBJEXT): internal/constant_p.h
+enc/utf_8.$(OBJEXT): internal/core.h
+enc/utf_8.$(OBJEXT): internal/core/rarray.h
+enc/utf_8.$(OBJEXT): internal/core/rbasic.h
+enc/utf_8.$(OBJEXT): internal/core/rbignum.h
+enc/utf_8.$(OBJEXT): internal/core/rclass.h
+enc/utf_8.$(OBJEXT): internal/core/rdata.h
+enc/utf_8.$(OBJEXT): internal/core/rfile.h
+enc/utf_8.$(OBJEXT): internal/core/rhash.h
+enc/utf_8.$(OBJEXT): internal/core/robject.h
+enc/utf_8.$(OBJEXT): internal/core/rregexp.h
+enc/utf_8.$(OBJEXT): internal/core/rstring.h
+enc/utf_8.$(OBJEXT): internal/core/rstruct.h
+enc/utf_8.$(OBJEXT): internal/core/rtypeddata.h
+enc/utf_8.$(OBJEXT): internal/ctype.h
+enc/utf_8.$(OBJEXT): internal/dllexport.h
+enc/utf_8.$(OBJEXT): internal/dosish.h
+enc/utf_8.$(OBJEXT): internal/error.h
+enc/utf_8.$(OBJEXT): internal/eval.h
+enc/utf_8.$(OBJEXT): internal/event.h
+enc/utf_8.$(OBJEXT): internal/fl_type.h
+enc/utf_8.$(OBJEXT): internal/gc.h
+enc/utf_8.$(OBJEXT): internal/glob.h
+enc/utf_8.$(OBJEXT): internal/globals.h
+enc/utf_8.$(OBJEXT): internal/has/attribute.h
+enc/utf_8.$(OBJEXT): internal/has/builtin.h
+enc/utf_8.$(OBJEXT): internal/has/c_attribute.h
+enc/utf_8.$(OBJEXT): internal/has/cpp_attribute.h
+enc/utf_8.$(OBJEXT): internal/has/declspec_attribute.h
+enc/utf_8.$(OBJEXT): internal/has/extension.h
+enc/utf_8.$(OBJEXT): internal/has/feature.h
+enc/utf_8.$(OBJEXT): internal/has/warning.h
+enc/utf_8.$(OBJEXT): internal/intern/array.h
+enc/utf_8.$(OBJEXT): internal/intern/bignum.h
+enc/utf_8.$(OBJEXT): internal/intern/class.h
+enc/utf_8.$(OBJEXT): internal/intern/compar.h
+enc/utf_8.$(OBJEXT): internal/intern/complex.h
+enc/utf_8.$(OBJEXT): internal/intern/cont.h
+enc/utf_8.$(OBJEXT): internal/intern/dir.h
+enc/utf_8.$(OBJEXT): internal/intern/enum.h
+enc/utf_8.$(OBJEXT): internal/intern/enumerator.h
+enc/utf_8.$(OBJEXT): internal/intern/error.h
+enc/utf_8.$(OBJEXT): internal/intern/eval.h
+enc/utf_8.$(OBJEXT): internal/intern/file.h
+enc/utf_8.$(OBJEXT): internal/intern/gc.h
+enc/utf_8.$(OBJEXT): internal/intern/hash.h
+enc/utf_8.$(OBJEXT): internal/intern/io.h
+enc/utf_8.$(OBJEXT): internal/intern/load.h
+enc/utf_8.$(OBJEXT): internal/intern/marshal.h
+enc/utf_8.$(OBJEXT): internal/intern/numeric.h
+enc/utf_8.$(OBJEXT): internal/intern/object.h
+enc/utf_8.$(OBJEXT): internal/intern/parse.h
+enc/utf_8.$(OBJEXT): internal/intern/proc.h
+enc/utf_8.$(OBJEXT): internal/intern/process.h
+enc/utf_8.$(OBJEXT): internal/intern/random.h
+enc/utf_8.$(OBJEXT): internal/intern/range.h
+enc/utf_8.$(OBJEXT): internal/intern/rational.h
+enc/utf_8.$(OBJEXT): internal/intern/re.h
+enc/utf_8.$(OBJEXT): internal/intern/ruby.h
+enc/utf_8.$(OBJEXT): internal/intern/select.h
+enc/utf_8.$(OBJEXT): internal/intern/select/largesize.h
+enc/utf_8.$(OBJEXT): internal/intern/signal.h
+enc/utf_8.$(OBJEXT): internal/intern/sprintf.h
+enc/utf_8.$(OBJEXT): internal/intern/string.h
+enc/utf_8.$(OBJEXT): internal/intern/struct.h
+enc/utf_8.$(OBJEXT): internal/intern/thread.h
+enc/utf_8.$(OBJEXT): internal/intern/time.h
+enc/utf_8.$(OBJEXT): internal/intern/variable.h
+enc/utf_8.$(OBJEXT): internal/intern/vm.h
+enc/utf_8.$(OBJEXT): internal/interpreter.h
+enc/utf_8.$(OBJEXT): internal/iterator.h
+enc/utf_8.$(OBJEXT): internal/memory.h
+enc/utf_8.$(OBJEXT): internal/method.h
+enc/utf_8.$(OBJEXT): internal/module.h
+enc/utf_8.$(OBJEXT): internal/newobj.h
+enc/utf_8.$(OBJEXT): internal/rgengc.h
+enc/utf_8.$(OBJEXT): internal/scan_args.h
+enc/utf_8.$(OBJEXT): internal/special_consts.h
+enc/utf_8.$(OBJEXT): internal/static_assert.h
+enc/utf_8.$(OBJEXT): internal/stdalign.h
+enc/utf_8.$(OBJEXT): internal/stdbool.h
+enc/utf_8.$(OBJEXT): internal/symbol.h
+enc/utf_8.$(OBJEXT): internal/token_paste.h
+enc/utf_8.$(OBJEXT): internal/value.h
+enc/utf_8.$(OBJEXT): internal/value_type.h
+enc/utf_8.$(OBJEXT): internal/variable.h
+enc/utf_8.$(OBJEXT): internal/warning_push.h
+enc/utf_8.$(OBJEXT): internal/xmalloc.h
+enc/utf_8.$(OBJEXT): assert.h
+enc/utf_8.$(OBJEXT): backward/2/assume.h
+enc/utf_8.$(OBJEXT): backward/2/attributes.h
+enc/utf_8.$(OBJEXT): backward/2/bool.h
+enc/utf_8.$(OBJEXT): backward/2/gcc_version_since.h
+enc/utf_8.$(OBJEXT): backward/2/inttypes.h
+enc/utf_8.$(OBJEXT): backward/2/limits.h
+enc/utf_8.$(OBJEXT): backward/2/long_long.h
+enc/utf_8.$(OBJEXT): backward/2/stdalign.h
+enc/utf_8.$(OBJEXT): backward/2/stdarg.h
 enc/utf_8.$(OBJEXT): config.h
 enc/utf_8.$(OBJEXT): defines.h
 enc/utf_8.$(OBJEXT): enc/utf_8.c
+enc/utf_8.$(OBJEXT): encoding.h
+enc/utf_8.$(OBJEXT): intern.h
 enc/utf_8.$(OBJEXT): missing.h
+enc/utf_8.$(OBJEXT): onigmo.h
 enc/utf_8.$(OBJEXT): oniguruma.h
+enc/utf_8.$(OBJEXT): st.h
+enc/utf_8.$(OBJEXT): subst.h
 enc/windows_1250.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/windows_1250.$(OBJEXT): internal/assume.h
+enc/windows_1250.$(OBJEXT): internal/attr/alloc_size.h
+enc/windows_1250.$(OBJEXT): internal/attr/cold.h
+enc/windows_1250.$(OBJEXT): internal/attr/const.h
+enc/windows_1250.$(OBJEXT): internal/attr/deprecated.h
+enc/windows_1250.$(OBJEXT): internal/attr/error.h
+enc/windows_1250.$(OBJEXT): internal/attr/forceinline.h
+enc/windows_1250.$(OBJEXT): internal/attr/format.h
+enc/windows_1250.$(OBJEXT): internal/attr/maybe_unused.h
+enc/windows_1250.$(OBJEXT): internal/attr/nodiscard.h
+enc/windows_1250.$(OBJEXT): internal/attr/noexcept.h
+enc/windows_1250.$(OBJEXT): internal/attr/noinline.h
+enc/windows_1250.$(OBJEXT): internal/attr/nonnull.h
+enc/windows_1250.$(OBJEXT): internal/attr/noreturn.h
+enc/windows_1250.$(OBJEXT): internal/attr/pure.h
+enc/windows_1250.$(OBJEXT): internal/attr/restrict.h
+enc/windows_1250.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/windows_1250.$(OBJEXT): internal/attr/warning.h
+enc/windows_1250.$(OBJEXT): internal/cast.h
+enc/windows_1250.$(OBJEXT): internal/compiler_is.h
+enc/windows_1250.$(OBJEXT): internal/compiler_is/apple.h
+enc/windows_1250.$(OBJEXT): internal/compiler_is/clang.h
+enc/windows_1250.$(OBJEXT): internal/compiler_is/gcc.h
+enc/windows_1250.$(OBJEXT): internal/compiler_is/intel.h
+enc/windows_1250.$(OBJEXT): internal/compiler_is/msvc.h
+enc/windows_1250.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/windows_1250.$(OBJEXT): internal/compiler_since.h
+enc/windows_1250.$(OBJEXT): internal/config.h
+enc/windows_1250.$(OBJEXT): internal/dllexport.h
+enc/windows_1250.$(OBJEXT): internal/dosish.h
+enc/windows_1250.$(OBJEXT): internal/has/attribute.h
+enc/windows_1250.$(OBJEXT): internal/has/builtin.h
+enc/windows_1250.$(OBJEXT): internal/has/c_attribute.h
+enc/windows_1250.$(OBJEXT): internal/has/cpp_attribute.h
+enc/windows_1250.$(OBJEXT): internal/has/declspec_attribute.h
+enc/windows_1250.$(OBJEXT): internal/has/extension.h
+enc/windows_1250.$(OBJEXT): internal/has/feature.h
+enc/windows_1250.$(OBJEXT): internal/has/warning.h
+enc/windows_1250.$(OBJEXT): internal/stdalign.h
+enc/windows_1250.$(OBJEXT): internal/stdbool.h
+enc/windows_1250.$(OBJEXT): internal/token_paste.h
+enc/windows_1250.$(OBJEXT): internal/warning_push.h
+enc/windows_1250.$(OBJEXT): internal/xmalloc.h
+enc/windows_1250.$(OBJEXT): assert.h
+enc/windows_1250.$(OBJEXT): backward/2/assume.h
+enc/windows_1250.$(OBJEXT): backward/2/attributes.h
+enc/windows_1250.$(OBJEXT): backward/2/bool.h
+enc/windows_1250.$(OBJEXT): backward/2/gcc_version_since.h
+enc/windows_1250.$(OBJEXT): backward/2/long_long.h
+enc/windows_1250.$(OBJEXT): backward/2/stdalign.h
+enc/windows_1250.$(OBJEXT): backward/2/stdarg.h
 enc/windows_1250.$(OBJEXT): config.h
 enc/windows_1250.$(OBJEXT): defines.h
+enc/windows_1250.$(OBJEXT): enc/iso_8859.h
 enc/windows_1250.$(OBJEXT): enc/windows_1250.c
 enc/windows_1250.$(OBJEXT): missing.h
-enc/windows_1250.$(OBJEXT): oniguruma.h
+enc/windows_1250.$(OBJEXT): onigmo.h
 enc/windows_1251.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/windows_1251.$(OBJEXT): internal/assume.h
+enc/windows_1251.$(OBJEXT): internal/attr/alloc_size.h
+enc/windows_1251.$(OBJEXT): internal/attr/cold.h
+enc/windows_1251.$(OBJEXT): internal/attr/const.h
+enc/windows_1251.$(OBJEXT): internal/attr/deprecated.h
+enc/windows_1251.$(OBJEXT): internal/attr/error.h
+enc/windows_1251.$(OBJEXT): internal/attr/forceinline.h
+enc/windows_1251.$(OBJEXT): internal/attr/format.h
+enc/windows_1251.$(OBJEXT): internal/attr/maybe_unused.h
+enc/windows_1251.$(OBJEXT): internal/attr/nodiscard.h
+enc/windows_1251.$(OBJEXT): internal/attr/noexcept.h
+enc/windows_1251.$(OBJEXT): internal/attr/noinline.h
+enc/windows_1251.$(OBJEXT): internal/attr/nonnull.h
+enc/windows_1251.$(OBJEXT): internal/attr/noreturn.h
+enc/windows_1251.$(OBJEXT): internal/attr/pure.h
+enc/windows_1251.$(OBJEXT): internal/attr/restrict.h
+enc/windows_1251.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/windows_1251.$(OBJEXT): internal/attr/warning.h
+enc/windows_1251.$(OBJEXT): internal/cast.h
+enc/windows_1251.$(OBJEXT): internal/compiler_is.h
+enc/windows_1251.$(OBJEXT): internal/compiler_is/apple.h
+enc/windows_1251.$(OBJEXT): internal/compiler_is/clang.h
+enc/windows_1251.$(OBJEXT): internal/compiler_is/gcc.h
+enc/windows_1251.$(OBJEXT): internal/compiler_is/intel.h
+enc/windows_1251.$(OBJEXT): internal/compiler_is/msvc.h
+enc/windows_1251.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/windows_1251.$(OBJEXT): internal/compiler_since.h
+enc/windows_1251.$(OBJEXT): internal/config.h
+enc/windows_1251.$(OBJEXT): internal/dllexport.h
+enc/windows_1251.$(OBJEXT): internal/dosish.h
+enc/windows_1251.$(OBJEXT): internal/has/attribute.h
+enc/windows_1251.$(OBJEXT): internal/has/builtin.h
+enc/windows_1251.$(OBJEXT): internal/has/c_attribute.h
+enc/windows_1251.$(OBJEXT): internal/has/cpp_attribute.h
+enc/windows_1251.$(OBJEXT): internal/has/declspec_attribute.h
+enc/windows_1251.$(OBJEXT): internal/has/extension.h
+enc/windows_1251.$(OBJEXT): internal/has/feature.h
+enc/windows_1251.$(OBJEXT): internal/has/warning.h
+enc/windows_1251.$(OBJEXT): internal/stdalign.h
+enc/windows_1251.$(OBJEXT): internal/stdbool.h
+enc/windows_1251.$(OBJEXT): internal/token_paste.h
+enc/windows_1251.$(OBJEXT): internal/warning_push.h
+enc/windows_1251.$(OBJEXT): internal/xmalloc.h
+enc/windows_1251.$(OBJEXT): assert.h
+enc/windows_1251.$(OBJEXT): backward/2/assume.h
+enc/windows_1251.$(OBJEXT): backward/2/attributes.h
+enc/windows_1251.$(OBJEXT): backward/2/bool.h
+enc/windows_1251.$(OBJEXT): backward/2/gcc_version_since.h
+enc/windows_1251.$(OBJEXT): backward/2/long_long.h
+enc/windows_1251.$(OBJEXT): backward/2/stdalign.h
+enc/windows_1251.$(OBJEXT): backward/2/stdarg.h
 enc/windows_1251.$(OBJEXT): config.h
 enc/windows_1251.$(OBJEXT): defines.h
 enc/windows_1251.$(OBJEXT): enc/windows_1251.c
 enc/windows_1251.$(OBJEXT): missing.h
-enc/windows_1251.$(OBJEXT): oniguruma.h
+enc/windows_1251.$(OBJEXT): onigmo.h
 enc/windows_1252.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/windows_1252.$(OBJEXT): internal/assume.h
+enc/windows_1252.$(OBJEXT): internal/attr/alloc_size.h
+enc/windows_1252.$(OBJEXT): internal/attr/cold.h
+enc/windows_1252.$(OBJEXT): internal/attr/const.h
+enc/windows_1252.$(OBJEXT): internal/attr/deprecated.h
+enc/windows_1252.$(OBJEXT): internal/attr/error.h
+enc/windows_1252.$(OBJEXT): internal/attr/forceinline.h
+enc/windows_1252.$(OBJEXT): internal/attr/format.h
+enc/windows_1252.$(OBJEXT): internal/attr/maybe_unused.h
+enc/windows_1252.$(OBJEXT): internal/attr/nodiscard.h
+enc/windows_1252.$(OBJEXT): internal/attr/noexcept.h
+enc/windows_1252.$(OBJEXT): internal/attr/noinline.h
+enc/windows_1252.$(OBJEXT): internal/attr/nonnull.h
+enc/windows_1252.$(OBJEXT): internal/attr/noreturn.h
+enc/windows_1252.$(OBJEXT): internal/attr/pure.h
+enc/windows_1252.$(OBJEXT): internal/attr/restrict.h
+enc/windows_1252.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/windows_1252.$(OBJEXT): internal/attr/warning.h
+enc/windows_1252.$(OBJEXT): internal/cast.h
+enc/windows_1252.$(OBJEXT): internal/compiler_is.h
+enc/windows_1252.$(OBJEXT): internal/compiler_is/apple.h
+enc/windows_1252.$(OBJEXT): internal/compiler_is/clang.h
+enc/windows_1252.$(OBJEXT): internal/compiler_is/gcc.h
+enc/windows_1252.$(OBJEXT): internal/compiler_is/intel.h
+enc/windows_1252.$(OBJEXT): internal/compiler_is/msvc.h
+enc/windows_1252.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/windows_1252.$(OBJEXT): internal/compiler_since.h
+enc/windows_1252.$(OBJEXT): internal/config.h
+enc/windows_1252.$(OBJEXT): internal/dllexport.h
+enc/windows_1252.$(OBJEXT): internal/dosish.h
+enc/windows_1252.$(OBJEXT): internal/has/attribute.h
+enc/windows_1252.$(OBJEXT): internal/has/builtin.h
+enc/windows_1252.$(OBJEXT): internal/has/c_attribute.h
+enc/windows_1252.$(OBJEXT): internal/has/cpp_attribute.h
+enc/windows_1252.$(OBJEXT): internal/has/declspec_attribute.h
+enc/windows_1252.$(OBJEXT): internal/has/extension.h
+enc/windows_1252.$(OBJEXT): internal/has/feature.h
+enc/windows_1252.$(OBJEXT): internal/has/warning.h
+enc/windows_1252.$(OBJEXT): internal/stdalign.h
+enc/windows_1252.$(OBJEXT): internal/stdbool.h
+enc/windows_1252.$(OBJEXT): internal/token_paste.h
+enc/windows_1252.$(OBJEXT): internal/warning_push.h
+enc/windows_1252.$(OBJEXT): internal/xmalloc.h
+enc/windows_1252.$(OBJEXT): assert.h
+enc/windows_1252.$(OBJEXT): backward/2/assume.h
+enc/windows_1252.$(OBJEXT): backward/2/attributes.h
+enc/windows_1252.$(OBJEXT): backward/2/bool.h
+enc/windows_1252.$(OBJEXT): backward/2/gcc_version_since.h
+enc/windows_1252.$(OBJEXT): backward/2/long_long.h
+enc/windows_1252.$(OBJEXT): backward/2/stdalign.h
+enc/windows_1252.$(OBJEXT): backward/2/stdarg.h
 enc/windows_1252.$(OBJEXT): config.h
 enc/windows_1252.$(OBJEXT): defines.h
+enc/windows_1252.$(OBJEXT): enc/iso_8859.h
 enc/windows_1252.$(OBJEXT): enc/windows_1252.c
 enc/windows_1252.$(OBJEXT): missing.h
-enc/windows_1252.$(OBJEXT): oniguruma.h
-enc/windows_31j.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+enc/windows_1252.$(OBJEXT): onigmo.h
+enc/windows_1253.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/windows_1253.$(OBJEXT): internal/assume.h
+enc/windows_1253.$(OBJEXT): internal/attr/alloc_size.h
+enc/windows_1253.$(OBJEXT): internal/attr/cold.h
+enc/windows_1253.$(OBJEXT): internal/attr/const.h
+enc/windows_1253.$(OBJEXT): internal/attr/deprecated.h
+enc/windows_1253.$(OBJEXT): internal/attr/error.h
+enc/windows_1253.$(OBJEXT): internal/attr/forceinline.h
+enc/windows_1253.$(OBJEXT): internal/attr/format.h
+enc/windows_1253.$(OBJEXT): internal/attr/maybe_unused.h
+enc/windows_1253.$(OBJEXT): internal/attr/nodiscard.h
+enc/windows_1253.$(OBJEXT): internal/attr/noexcept.h
+enc/windows_1253.$(OBJEXT): internal/attr/noinline.h
+enc/windows_1253.$(OBJEXT): internal/attr/nonnull.h
+enc/windows_1253.$(OBJEXT): internal/attr/noreturn.h
+enc/windows_1253.$(OBJEXT): internal/attr/pure.h
+enc/windows_1253.$(OBJEXT): internal/attr/restrict.h
+enc/windows_1253.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/windows_1253.$(OBJEXT): internal/attr/warning.h
+enc/windows_1253.$(OBJEXT): internal/cast.h
+enc/windows_1253.$(OBJEXT): internal/compiler_is.h
+enc/windows_1253.$(OBJEXT): internal/compiler_is/apple.h
+enc/windows_1253.$(OBJEXT): internal/compiler_is/clang.h
+enc/windows_1253.$(OBJEXT): internal/compiler_is/gcc.h
+enc/windows_1253.$(OBJEXT): internal/compiler_is/intel.h
+enc/windows_1253.$(OBJEXT): internal/compiler_is/msvc.h
+enc/windows_1253.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/windows_1253.$(OBJEXT): internal/compiler_since.h
+enc/windows_1253.$(OBJEXT): internal/config.h
+enc/windows_1253.$(OBJEXT): internal/dllexport.h
+enc/windows_1253.$(OBJEXT): internal/dosish.h
+enc/windows_1253.$(OBJEXT): internal/has/attribute.h
+enc/windows_1253.$(OBJEXT): internal/has/builtin.h
+enc/windows_1253.$(OBJEXT): internal/has/c_attribute.h
+enc/windows_1253.$(OBJEXT): internal/has/cpp_attribute.h
+enc/windows_1253.$(OBJEXT): internal/has/declspec_attribute.h
+enc/windows_1253.$(OBJEXT): internal/has/extension.h
+enc/windows_1253.$(OBJEXT): internal/has/feature.h
+enc/windows_1253.$(OBJEXT): internal/has/warning.h
+enc/windows_1253.$(OBJEXT): internal/stdalign.h
+enc/windows_1253.$(OBJEXT): internal/stdbool.h
+enc/windows_1253.$(OBJEXT): internal/token_paste.h
+enc/windows_1253.$(OBJEXT): internal/warning_push.h
+enc/windows_1253.$(OBJEXT): internal/xmalloc.h
+enc/windows_1253.$(OBJEXT): assert.h
+enc/windows_1253.$(OBJEXT): backward/2/assume.h
+enc/windows_1253.$(OBJEXT): backward/2/attributes.h
+enc/windows_1253.$(OBJEXT): backward/2/bool.h
+enc/windows_1253.$(OBJEXT): backward/2/gcc_version_since.h
+enc/windows_1253.$(OBJEXT): backward/2/long_long.h
+enc/windows_1253.$(OBJEXT): backward/2/stdalign.h
+enc/windows_1253.$(OBJEXT): backward/2/stdarg.h
+enc/windows_1253.$(OBJEXT): config.h
+enc/windows_1253.$(OBJEXT): defines.h
+enc/windows_1253.$(OBJEXT): enc/windows_1253.c
+enc/windows_1253.$(OBJEXT): missing.h
+enc/windows_1253.$(OBJEXT): onigmo.h
+enc/windows_1254.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/windows_1254.$(OBJEXT): internal/assume.h
+enc/windows_1254.$(OBJEXT): internal/attr/alloc_size.h
+enc/windows_1254.$(OBJEXT): internal/attr/cold.h
+enc/windows_1254.$(OBJEXT): internal/attr/const.h
+enc/windows_1254.$(OBJEXT): internal/attr/deprecated.h
+enc/windows_1254.$(OBJEXT): internal/attr/error.h
+enc/windows_1254.$(OBJEXT): internal/attr/forceinline.h
+enc/windows_1254.$(OBJEXT): internal/attr/format.h
+enc/windows_1254.$(OBJEXT): internal/attr/maybe_unused.h
+enc/windows_1254.$(OBJEXT): internal/attr/nodiscard.h
+enc/windows_1254.$(OBJEXT): internal/attr/noexcept.h
+enc/windows_1254.$(OBJEXT): internal/attr/noinline.h
+enc/windows_1254.$(OBJEXT): internal/attr/nonnull.h
+enc/windows_1254.$(OBJEXT): internal/attr/noreturn.h
+enc/windows_1254.$(OBJEXT): internal/attr/pure.h
+enc/windows_1254.$(OBJEXT): internal/attr/restrict.h
+enc/windows_1254.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/windows_1254.$(OBJEXT): internal/attr/warning.h
+enc/windows_1254.$(OBJEXT): internal/cast.h
+enc/windows_1254.$(OBJEXT): internal/compiler_is.h
+enc/windows_1254.$(OBJEXT): internal/compiler_is/apple.h
+enc/windows_1254.$(OBJEXT): internal/compiler_is/clang.h
+enc/windows_1254.$(OBJEXT): internal/compiler_is/gcc.h
+enc/windows_1254.$(OBJEXT): internal/compiler_is/intel.h
+enc/windows_1254.$(OBJEXT): internal/compiler_is/msvc.h
+enc/windows_1254.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/windows_1254.$(OBJEXT): internal/compiler_since.h
+enc/windows_1254.$(OBJEXT): internal/config.h
+enc/windows_1254.$(OBJEXT): internal/dllexport.h
+enc/windows_1254.$(OBJEXT): internal/dosish.h
+enc/windows_1254.$(OBJEXT): internal/has/attribute.h
+enc/windows_1254.$(OBJEXT): internal/has/builtin.h
+enc/windows_1254.$(OBJEXT): internal/has/c_attribute.h
+enc/windows_1254.$(OBJEXT): internal/has/cpp_attribute.h
+enc/windows_1254.$(OBJEXT): internal/has/declspec_attribute.h
+enc/windows_1254.$(OBJEXT): internal/has/extension.h
+enc/windows_1254.$(OBJEXT): internal/has/feature.h
+enc/windows_1254.$(OBJEXT): internal/has/warning.h
+enc/windows_1254.$(OBJEXT): internal/stdalign.h
+enc/windows_1254.$(OBJEXT): internal/stdbool.h
+enc/windows_1254.$(OBJEXT): internal/token_paste.h
+enc/windows_1254.$(OBJEXT): internal/warning_push.h
+enc/windows_1254.$(OBJEXT): internal/xmalloc.h
+enc/windows_1254.$(OBJEXT): assert.h
+enc/windows_1254.$(OBJEXT): backward/2/assume.h
+enc/windows_1254.$(OBJEXT): backward/2/attributes.h
+enc/windows_1254.$(OBJEXT): backward/2/bool.h
+enc/windows_1254.$(OBJEXT): backward/2/gcc_version_since.h
+enc/windows_1254.$(OBJEXT): backward/2/long_long.h
+enc/windows_1254.$(OBJEXT): backward/2/stdalign.h
+enc/windows_1254.$(OBJEXT): backward/2/stdarg.h
+enc/windows_1254.$(OBJEXT): config.h
+enc/windows_1254.$(OBJEXT): defines.h
+enc/windows_1254.$(OBJEXT): enc/iso_8859.h
+enc/windows_1254.$(OBJEXT): enc/windows_1254.c
+enc/windows_1254.$(OBJEXT): missing.h
+enc/windows_1254.$(OBJEXT): onigmo.h
+enc/windows_1257.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/windows_1257.$(OBJEXT): internal/assume.h
+enc/windows_1257.$(OBJEXT): internal/attr/alloc_size.h
+enc/windows_1257.$(OBJEXT): internal/attr/cold.h
+enc/windows_1257.$(OBJEXT): internal/attr/const.h
+enc/windows_1257.$(OBJEXT): internal/attr/deprecated.h
+enc/windows_1257.$(OBJEXT): internal/attr/error.h
+enc/windows_1257.$(OBJEXT): internal/attr/forceinline.h
+enc/windows_1257.$(OBJEXT): internal/attr/format.h
+enc/windows_1257.$(OBJEXT): internal/attr/maybe_unused.h
+enc/windows_1257.$(OBJEXT): internal/attr/nodiscard.h
+enc/windows_1257.$(OBJEXT): internal/attr/noexcept.h
+enc/windows_1257.$(OBJEXT): internal/attr/noinline.h
+enc/windows_1257.$(OBJEXT): internal/attr/nonnull.h
+enc/windows_1257.$(OBJEXT): internal/attr/noreturn.h
+enc/windows_1257.$(OBJEXT): internal/attr/pure.h
+enc/windows_1257.$(OBJEXT): internal/attr/restrict.h
+enc/windows_1257.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/windows_1257.$(OBJEXT): internal/attr/warning.h
+enc/windows_1257.$(OBJEXT): internal/cast.h
+enc/windows_1257.$(OBJEXT): internal/compiler_is.h
+enc/windows_1257.$(OBJEXT): internal/compiler_is/apple.h
+enc/windows_1257.$(OBJEXT): internal/compiler_is/clang.h
+enc/windows_1257.$(OBJEXT): internal/compiler_is/gcc.h
+enc/windows_1257.$(OBJEXT): internal/compiler_is/intel.h
+enc/windows_1257.$(OBJEXT): internal/compiler_is/msvc.h
+enc/windows_1257.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/windows_1257.$(OBJEXT): internal/compiler_since.h
+enc/windows_1257.$(OBJEXT): internal/config.h
+enc/windows_1257.$(OBJEXT): internal/dllexport.h
+enc/windows_1257.$(OBJEXT): internal/dosish.h
+enc/windows_1257.$(OBJEXT): internal/has/attribute.h
+enc/windows_1257.$(OBJEXT): internal/has/builtin.h
+enc/windows_1257.$(OBJEXT): internal/has/c_attribute.h
+enc/windows_1257.$(OBJEXT): internal/has/cpp_attribute.h
+enc/windows_1257.$(OBJEXT): internal/has/declspec_attribute.h
+enc/windows_1257.$(OBJEXT): internal/has/extension.h
+enc/windows_1257.$(OBJEXT): internal/has/feature.h
+enc/windows_1257.$(OBJEXT): internal/has/warning.h
+enc/windows_1257.$(OBJEXT): internal/stdalign.h
+enc/windows_1257.$(OBJEXT): internal/stdbool.h
+enc/windows_1257.$(OBJEXT): internal/token_paste.h
+enc/windows_1257.$(OBJEXT): internal/warning_push.h
+enc/windows_1257.$(OBJEXT): internal/xmalloc.h
+enc/windows_1257.$(OBJEXT): assert.h
+enc/windows_1257.$(OBJEXT): backward/2/assume.h
+enc/windows_1257.$(OBJEXT): backward/2/attributes.h
+enc/windows_1257.$(OBJEXT): backward/2/bool.h
+enc/windows_1257.$(OBJEXT): backward/2/gcc_version_since.h
+enc/windows_1257.$(OBJEXT): backward/2/long_long.h
+enc/windows_1257.$(OBJEXT): backward/2/stdalign.h
+enc/windows_1257.$(OBJEXT): backward/2/stdarg.h
+enc/windows_1257.$(OBJEXT): config.h
+enc/windows_1257.$(OBJEXT): defines.h
+enc/windows_1257.$(OBJEXT): enc/iso_8859.h
+enc/windows_1257.$(OBJEXT): enc/windows_1257.c
+enc/windows_1257.$(OBJEXT): missing.h
+enc/windows_1257.$(OBJEXT): onigmo.h
 enc/windows_31j.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/windows_31j.$(OBJEXT): $(top_srcdir)/regint.h
-enc/windows_31j.$(OBJEXT): backward.h
+enc/windows_31j.$(OBJEXT): internal/assume.h
+enc/windows_31j.$(OBJEXT): internal/attr/alloc_size.h
+enc/windows_31j.$(OBJEXT): internal/attr/cold.h
+enc/windows_31j.$(OBJEXT): internal/attr/const.h
+enc/windows_31j.$(OBJEXT): internal/attr/deprecated.h
+enc/windows_31j.$(OBJEXT): internal/attr/error.h
+enc/windows_31j.$(OBJEXT): internal/attr/forceinline.h
+enc/windows_31j.$(OBJEXT): internal/attr/format.h
+enc/windows_31j.$(OBJEXT): internal/attr/maybe_unused.h
+enc/windows_31j.$(OBJEXT): internal/attr/nodiscard.h
+enc/windows_31j.$(OBJEXT): internal/attr/noexcept.h
+enc/windows_31j.$(OBJEXT): internal/attr/noinline.h
+enc/windows_31j.$(OBJEXT): internal/attr/nonnull.h
+enc/windows_31j.$(OBJEXT): internal/attr/noreturn.h
+enc/windows_31j.$(OBJEXT): internal/attr/pure.h
+enc/windows_31j.$(OBJEXT): internal/attr/restrict.h
+enc/windows_31j.$(OBJEXT): internal/attr/returns_nonnull.h
+enc/windows_31j.$(OBJEXT): internal/attr/warning.h
+enc/windows_31j.$(OBJEXT): internal/cast.h
+enc/windows_31j.$(OBJEXT): internal/compiler_is.h
+enc/windows_31j.$(OBJEXT): internal/compiler_is/apple.h
+enc/windows_31j.$(OBJEXT): internal/compiler_is/clang.h
+enc/windows_31j.$(OBJEXT): internal/compiler_is/gcc.h
+enc/windows_31j.$(OBJEXT): internal/compiler_is/intel.h
+enc/windows_31j.$(OBJEXT): internal/compiler_is/msvc.h
+enc/windows_31j.$(OBJEXT): internal/compiler_is/sunpro.h
+enc/windows_31j.$(OBJEXT): internal/compiler_since.h
+enc/windows_31j.$(OBJEXT): internal/config.h
+enc/windows_31j.$(OBJEXT): internal/dllexport.h
+enc/windows_31j.$(OBJEXT): internal/dosish.h
+enc/windows_31j.$(OBJEXT): internal/has/attribute.h
+enc/windows_31j.$(OBJEXT): internal/has/builtin.h
+enc/windows_31j.$(OBJEXT): internal/has/c_attribute.h
+enc/windows_31j.$(OBJEXT): internal/has/cpp_attribute.h
+enc/windows_31j.$(OBJEXT): internal/has/declspec_attribute.h
+enc/windows_31j.$(OBJEXT): internal/has/extension.h
+enc/windows_31j.$(OBJEXT): internal/has/feature.h
+enc/windows_31j.$(OBJEXT): internal/has/warning.h
+enc/windows_31j.$(OBJEXT): internal/stdalign.h
+enc/windows_31j.$(OBJEXT): internal/stdbool.h
+enc/windows_31j.$(OBJEXT): internal/token_paste.h
+enc/windows_31j.$(OBJEXT): internal/warning_push.h
+enc/windows_31j.$(OBJEXT): internal/xmalloc.h
+enc/windows_31j.$(OBJEXT): assert.h
+enc/windows_31j.$(OBJEXT): backward/2/assume.h
+enc/windows_31j.$(OBJEXT): backward/2/attributes.h
+enc/windows_31j.$(OBJEXT): backward/2/bool.h
+enc/windows_31j.$(OBJEXT): backward/2/gcc_version_since.h
+enc/windows_31j.$(OBJEXT): backward/2/long_long.h
+enc/windows_31j.$(OBJEXT): backward/2/stdalign.h
+enc/windows_31j.$(OBJEXT): backward/2/stdarg.h
 enc/windows_31j.$(OBJEXT): config.h
 enc/windows_31j.$(OBJEXT): defines.h
 enc/windows_31j.$(OBJEXT): enc/jis/props.h
 enc/windows_31j.$(OBJEXT): enc/jis/props.kwd
-enc/windows_31j.$(OBJEXT): enc/shift_jis.c
+enc/windows_31j.$(OBJEXT): enc/shift_jis.h
 enc/windows_31j.$(OBJEXT): enc/windows_31j.c
-enc/windows_31j.$(OBJEXT): intern.h
 enc/windows_31j.$(OBJEXT): missing.h
-enc/windows_31j.$(OBJEXT): oniguruma.h
-enc/windows_31j.$(OBJEXT): st.h
-enc/windows_31j.$(OBJEXT): subst.h
+enc/windows_31j.$(OBJEXT): onigmo.h
 # AUTOGENERATED DEPENDENCIES END
diff --git a/enc/emacs_mule.c b/enc/emacs_mule.c
index 7f1e20bbd6..f92eb183cf 100644
--- a/enc/emacs_mule.c
+++ b/enc/emacs_mule.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 
-#include "regint.h"
+#include "regenc.h"
 
 
 #define emacsmule_islead(c)    ((UChar )(c) < 0x9e)
@@ -334,11 +334,9 @@ OnigEncodingDefine(emacs_mule, Emacs_Mule) = {
   onigenc_not_support_get_ctype_code_range,
   left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
+  onigenc_ascii_only_case_map,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
-  onigenc_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 
 ENC_REPLICATE("stateless-ISO-2022-JP", "Emacs-Mule")
diff --git a/enc/encdb.c b/enc/encdb.c
index a41e4edc6d..a1936df804 100644
--- a/enc/encdb.c
+++ b/enc/encdb.c
@@ -9,7 +9,7 @@
 
 **********************************************************************/
 
-#include "internal.h"
+#include "internal/encoding.h"
 
 #define ENC_REPLICATE(name, orig) rb_encdb_replicate((name), (orig))
 #define ENC_ALIAS(name, orig) rb_encdb_alias((name), (orig))
diff --git a/enc/euc_jp.c b/enc/euc_jp.c
index cf9dda7af9..d283bf4ebb 100644
--- a/enc/euc_jp.c
+++ b/enc/euc_jp.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  */
 
-#include "regint.h"
+#include "regenc.h"
 
 #define eucjp_islead(c)    ((UChar )((c) - 0xa1) > 0xfe - 0xa1)
 
@@ -576,11 +576,9 @@ OnigEncodingDefine(euc_jp, EUC_JP) = {
   get_ctype_code_range,
   left_adjust_char_head,
   is_allowed_reverse_match,
+  onigenc_ascii_only_case_map,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
-  onigenc_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 /*
  * Name: EUC-JP
@@ -595,7 +593,7 @@ ENC_ALIAS("eucJP", "EUC-JP") /* UI-OSF Application Platform Profile for Japanese
  * 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
+ * Link: https://ja.wikipedia.org/wiki/EUC-JP
  */
 ENC_REPLICATE("eucJP-ms", "EUC-JP") /* TOG/JVC CDE/Motif Technical WG */
 ENC_ALIAS("euc-jp-ms", "eucJP-ms")
@@ -612,7 +610,7 @@ ENC_REPLICATE("CP51932", "EUC-JP")
 
 /*
  * Name: EUC-JIS-2004
- * Link: http://ja.wikipedia.org/wiki/EUC-JIS-2004
+ * Link: https://ja.wikipedia.org/wiki/EUC-JIS-2004
  */
 ENC_REPLICATE("EUC-JIS-2004", "EUC-JP") /* defined at JIS X 0213:2004 */
 ENC_ALIAS("EUC-JISX0213", "EUC-JIS-2004") /* defined at JIS X 0213:2000, and obsolete at JIS X 0213:2004 */
diff --git a/enc/euc_kr.c b/enc/euc_kr.c
index fbe70230bc..21d6ab4e1c 100644
--- a/enc/euc_kr.c
+++ b/enc/euc_kr.c
@@ -188,10 +188,33 @@ OnigEncodingDefine(euc_kr, EUC_KR) = {
   onigenc_not_support_get_ctype_code_range,
   euckr_left_adjust_char_head,
   euckr_is_allowed_reverse_match,
+  onigenc_ascii_only_case_map,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
-  onigenc_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 ENC_ALIAS("eucKR", "EUC-KR")
+
+#ifndef RUBY
+/* Same with OnigEncodingEUC_KR except the name */
+OnigEncodingDefine(euc_cn, EUC_CN) = {
+  euckr_mbc_enc_len,
+  "EUC-CN",   /* 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,
+  onigenc_ascii_only_case_map,
+  0,
+  ONIGENC_FLAG_NONE,
+};
+#endif /* RUBY */
diff --git a/enc/euc_tw.c b/enc/euc_tw.c
index d9a7eb2695..1c5659cb1d 100644
--- a/enc/euc_tw.c
+++ b/enc/euc_tw.c
@@ -221,10 +221,8 @@ OnigEncodingDefine(euc_tw, EUC_TW) = {
   onigenc_not_support_get_ctype_code_range,
   euctw_left_adjust_char_head,
   euctw_is_allowed_reverse_match,
+  onigenc_ascii_only_case_map,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
-  onigenc_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 ENC_ALIAS("eucTW", "EUC-TW")
diff --git a/enc/gb18030.c b/enc/gb18030.c
index ed06845ee5..63d2e633ec 100644
--- a/enc/gb18030.c
+++ b/enc/gb18030.c
@@ -597,10 +597,7 @@ OnigEncodingDefine(gb18030, GB18030) = {
   onigenc_not_support_get_ctype_code_range,
   gb18030_left_adjust_char_head,
   gb18030_is_allowed_reverse_match,
+  onigenc_ascii_only_case_map,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
-  onigenc_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
-
diff --git a/enc/gb2312.c b/enc/gb2312.c
index 6fc15735fc..20c8f5b7cc 100644
--- a/enc/gb2312.c
+++ b/enc/gb2312.c
@@ -1,13 +1,11 @@
-#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_REPLICATE("GB2312", "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
index 5f443812a9..31032553bf 100644
--- a/enc/gbk.c
+++ b/enc/gbk.c
@@ -211,11 +211,9 @@ OnigEncodingDefine(gbk, GBK) = {
   onigenc_not_support_get_ctype_code_range,
   gbk_left_adjust_char_head,
   gbk_is_allowed_reverse_match,
+  onigenc_ascii_only_case_map,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
-  onigenc_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 /*
  * Name: GBK
diff --git a/enc/iso_8859_1.c b/enc/iso_8859_1.c
index 634dd15ee3..7af0888c3e 100644
--- a/enc/iso_8859_1.c
+++ b/enc/iso_8859_1.c
@@ -255,49 +255,48 @@ is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSE
     return FALSE;
 }
 
-#ifdef ONIG_CASE_MAPPING
 static int
-case_map (OnigCaseFoldType* flagP, const OnigUChar** pp,
-					 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
-					 const struct OnigEncodingTypeST* enc)
+case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
+	 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
+	 const struct OnigEncodingTypeST* enc)
 {
   OnigCodePoint code;
   OnigUChar *to_start = to;
   OnigCaseFoldType flags = *flagP;
 
-  while (*pp<end && to<to_end) {
+  while (*pp < end && to < to_end) {
     code = *(*pp)++;
-    if (code==SHARP_s) {
-	if (flags&ONIGENC_CASE_UPCASE) {
-	    flags |= ONIGENC_CASE_MODIFIED;
-	    *to++ = 'S';
-	    code = (flags&ONIGENC_CASE_TITLECASE) ? 's' : 'S';
-	}
-	else if (flags&ONIGENC_CASE_FOLD) {
-	    flags |= ONIGENC_CASE_MODIFIED;
-	    *to++ = 's';
-	    code = 's';
-	}
+    if (code == SHARP_s) {
+      if (flags & ONIGENC_CASE_UPCASE) {
+	flags |= ONIGENC_CASE_MODIFIED;
+	*to++ = 'S';
+	code = (flags & ONIGENC_CASE_TITLECASE) ? 's' : 'S';
+      }
+      else if (flags & ONIGENC_CASE_FOLD) {
+	flags |= ONIGENC_CASE_MODIFIED;
+	*to++ = 's';
+	code = 's';
+      }
     }
-    else if (code==0xAA || code==0xBA) ;
     else if ((EncISO_8859_1_CtypeTable[code] & BIT_CTYPE_UPPER)
-	     && (flags & (ONIGENC_CASE_DOWNCASE|ONIGENC_CASE_FOLD))) {
-        flags |= ONIGENC_CASE_MODIFIED;
-	code += 0x20;
+	     && (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
+      flags |= ONIGENC_CASE_MODIFIED;
+      code += 0x20;
     }
-    else if ((EncISO_8859_1_CtypeTable[code]&BIT_CTYPE_LOWER)
-	     && (flags&ONIGENC_CASE_UPCASE)) {
-	flags |= ONIGENC_CASE_MODIFIED;
-	code -= 0x20;
+    else if (code == 0xAA || code == 0xBA || code == 0xB5 || code == 0xFF)
+      ;
+    else if ((EncISO_8859_1_CtypeTable[code] & BIT_CTYPE_LOWER)
+	     && (flags & ONIGENC_CASE_UPCASE)) {
+      flags |= ONIGENC_CASE_MODIFIED;
+      code -= 0x20;
     }
     *to++ = code;
-    if (flags&ONIGENC_CASE_TITLECASE)  /* switch from titlecase to lowercase for capitalize */
-      flags ^= (ONIGENC_CASE_UPCASE|ONIGENC_CASE_DOWNCASE|ONIGENC_CASE_TITLECASE);
+    if (flags & ONIGENC_CASE_TITLECASE)  /* switch from titlecase to lowercase for capitalize */
+      flags ^= (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_TITLECASE);
   }
   *flagP = flags;
-  return (int)(to-to_start);
+  return (int )(to - to_start);
 }
-#endif   /* ONIG_CASE_MAPPING */
 
 OnigEncodingDefine(iso_8859_1, ISO_8859_1) = {
   onigenc_single_byte_mbc_enc_len,
@@ -316,10 +315,8 @@ OnigEncodingDefine(iso_8859_1, ISO_8859_1) = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
+  case_map,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
-  case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 ENC_ALIAS("ISO8859-1", "ISO-8859-1")
diff --git a/enc/iso_8859_10.c b/enc/iso_8859_10.c
index 4bebcb5dd1..cae4be2db0 100644
--- a/enc/iso_8859_10.c
+++ b/enc/iso_8859_10.c
@@ -215,15 +215,61 @@ apply_all_case_fold(OnigCaseFoldType flag,
 
 static int
 get_case_fold_codes_by_str(OnigCaseFoldType flag,
-				       const OnigUChar* p, const OnigUChar* end,
-				       OnigCaseFoldCodeItem items[],
-				       OnigEncoding enc ARG_UNUSED)
+			   const OnigUChar* p, const OnigUChar* end,
+			   OnigCaseFoldCodeItem items[],
+			   OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_get_case_fold_codes_by_str_with_map(
 	     numberof(CaseFoldMap), CaseFoldMap, 1,
 	     flag, p, end, items);
 }
 
+static int
+case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
+	 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
+	 const struct OnigEncodingTypeST* enc)
+{
+  OnigCodePoint code;
+  OnigUChar *to_start = to;
+  OnigCaseFoldType flags = *flagP;
+
+  while (*pp < end && to < to_end) {
+    code = *(*pp)++;
+    if (code == SHARP_s) {
+      if (flags & ONIGENC_CASE_UPCASE) {
+	flags |= ONIGENC_CASE_MODIFIED;
+	*to++ = 'S';
+	code = (flags & ONIGENC_CASE_TITLECASE) ? 's' : 'S';
+      }
+      else if (flags & ONIGENC_CASE_FOLD) {
+	flags |= ONIGENC_CASE_MODIFIED;
+	*to++ = 's';
+	code = 's';
+      }
+    }
+    else if (code == 0xBD || code == 0xFF)
+      ;
+    else if ((EncISO_8859_10_CtypeTable[code] & BIT_CTYPE_UPPER)
+	     && (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
+      flags |= ONIGENC_CASE_MODIFIED;
+      code = ENC_ISO_8859_10_TO_LOWER_CASE(code);
+    }
+    else if ((EncISO_8859_10_CtypeTable[code] & BIT_CTYPE_LOWER)
+	     && (flags & ONIGENC_CASE_UPCASE)) {
+      flags |= ONIGENC_CASE_MODIFIED;
+      if (code >= 0xA0 && code <= 0xBF)
+	code -= 0x10;
+      else
+	code -= 0x20;
+    }
+    *to++ = code;
+    if (flags & ONIGENC_CASE_TITLECASE)  /* switch from titlecase to lowercase for capitalize */
+      flags ^= (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_TITLECASE);
+  }
+  *flagP = flags;
+  return (int )(to - to_start);
+}
+
 OnigEncodingDefine(iso_8859_10, ISO_8859_10) = {
   onigenc_single_byte_mbc_enc_len,
   "ISO-8859-10", /* name */
@@ -241,10 +287,8 @@ OnigEncodingDefine(iso_8859_10, ISO_8859_10) = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
+  case_map,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
-  onigenc_single_byte_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 ENC_ALIAS("ISO8859-10", "ISO-8859-10")
diff --git a/enc/iso_8859_11.c b/enc/iso_8859_11.c
index 730bed2958..b9c6119fd9 100644
--- a/enc/iso_8859_11.c
+++ b/enc/iso_8859_11.c
@@ -93,18 +93,16 @@ OnigEncodingDefine(iso_8859_11, ISO_8859_11) = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
+  onigenc_single_byte_ascii_only_case_map,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
-  onigenc_single_byte_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 ENC_ALIAS("ISO8859-11", "ISO-8859-11")
 
 /*
  * Name: TIS-620
  * MIBenum: 2259
- * Link: http://en.wikipedia.org/wiki/Thai_Industrial_Standard_620-2533
+ * Link: https://en.wikipedia.org/wiki/Thai_Industrial_Standard_620-2533
  */
 ENC_REPLICATE("TIS-620", "ISO-8859-11")
 
diff --git a/enc/iso_8859_13.c b/enc/iso_8859_13.c
index 9c7bdc6f6f..fe1ddd7065 100644
--- a/enc/iso_8859_13.c
+++ b/enc/iso_8859_13.c
@@ -208,15 +208,63 @@ apply_all_case_fold(OnigCaseFoldType flag,
 
 static int
 get_case_fold_codes_by_str(OnigCaseFoldType flag,
-				       const OnigUChar* p, const OnigUChar* end,
-				       OnigCaseFoldCodeItem items[],
-				       OnigEncoding enc ARG_UNUSED)
+			   const OnigUChar* p, const OnigUChar* end,
+			   OnigCaseFoldCodeItem items[],
+			   OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_get_case_fold_codes_by_str_with_map(
 	     numberof(CaseFoldMap), CaseFoldMap, 1,
 	     flag, p, end, items);
 }
 
+static int
+case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
+	 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
+	 const struct OnigEncodingTypeST* enc)
+{
+  OnigCodePoint code;
+  OnigUChar *to_start = to;
+  OnigCaseFoldType flags = *flagP;
+
+  while (*pp < end && to < to_end) {
+    code = *(*pp)++;
+    if (code == SHARP_s) {
+      if (flags & ONIGENC_CASE_UPCASE) {
+	flags |= ONIGENC_CASE_MODIFIED;
+	*to++ = 'S';
+	code = (flags & ONIGENC_CASE_TITLECASE) ? 's' : 'S';
+      }
+      else if (flags & ONIGENC_CASE_FOLD) {
+	flags |= ONIGENC_CASE_MODIFIED;
+	*to++ = 's';
+	code = 's';
+      }
+    }
+    else if ((EncISO_8859_13_CtypeTable[code] & BIT_CTYPE_UPPER)
+	     && (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
+      flags |= ONIGENC_CASE_MODIFIED;
+      code = ENC_ISO_8859_13_TO_LOWER_CASE(code);
+    }
+    else if (code == 0xB5)
+      ;
+    else if ((EncISO_8859_13_CtypeTable[code] & BIT_CTYPE_LOWER)
+	     && (flags & ONIGENC_CASE_UPCASE)) {
+      flags |= ONIGENC_CASE_MODIFIED;
+      if (code == 0xB8 || code == 0xBA || code == 0xBF) {
+        code -= 0x10;
+      }
+      else {
+        code -= 0x20;
+      }
+    }
+    *to++ = code;
+    if (flags & ONIGENC_CASE_TITLECASE)  /* switch from titlecase to lowercase for capitalize */
+      flags ^= (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_TITLECASE);
+  }
+  *flagP = flags;
+  return (int )(to - to_start);
+}
+
 OnigEncodingDefine(iso_8859_13, ISO_8859_13) = {
   onigenc_single_byte_mbc_enc_len,
   "ISO-8859-13",  /* name */
@@ -234,20 +282,8 @@ OnigEncodingDefine(iso_8859_13, ISO_8859_13) = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
+  case_map,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
-  onigenc_single_byte_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 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
index bfe374b608..647514a016 100644
--- a/enc/iso_8859_14.c
+++ b/enc/iso_8859_14.c
@@ -217,15 +217,70 @@ apply_all_case_fold(OnigCaseFoldType flag,
 
 static int
 get_case_fold_codes_by_str(OnigCaseFoldType flag,
-				       const OnigUChar* p, const OnigUChar* end,
-				       OnigCaseFoldCodeItem items[],
-				       OnigEncoding enc ARG_UNUSED)
+			   const OnigUChar* p, const OnigUChar* end,
+			   OnigCaseFoldCodeItem items[],
+			   OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_get_case_fold_codes_by_str_with_map(
 	     numberof(CaseFoldMap), CaseFoldMap, 1,
 	     flag, p, end, items);
 }
 
+static int
+case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
+	 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
+	 const struct OnigEncodingTypeST* enc)
+{
+  OnigCodePoint code;
+  OnigUChar *to_start = to;
+  OnigCaseFoldType flags = *flagP;
+
+  while (*pp < end && to < to_end) {
+    code = *(*pp)++;
+    if (code == SHARP_s) {
+      if (flags & ONIGENC_CASE_UPCASE) {
+	flags |= ONIGENC_CASE_MODIFIED;
+	*to++ = 'S';
+	code = (flags & ONIGENC_CASE_TITLECASE) ? 's' : 'S';
+      }
+      else if (flags & ONIGENC_CASE_FOLD) {
+	flags |= ONIGENC_CASE_MODIFIED;
+	*to++ = 's';
+	code = 's';
+      }
+    }
+    /* else if (code == 0xAA || code == 0xBA) ; */
+    else if ((EncISO_8859_14_CtypeTable[code] & BIT_CTYPE_UPPER)
+	     && (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
+      flags |= ONIGENC_CASE_MODIFIED;
+      code = ENC_ISO_8859_14_TO_LOWER_CASE(code);
+    }
+    else if ((EncISO_8859_14_CtypeTable[code] & BIT_CTYPE_LOWER)
+	     && (flags & ONIGENC_CASE_UPCASE)) {
+      flags |= ONIGENC_CASE_MODIFIED;
+      if (code == 0xA2 || code == 0xA5 || code == 0xB1 || code == 0xB3 || code == 0xB5 || code == 0xBE)
+	code -= 0x1;
+      else if (code == 0xAB)
+	code -= 0x5;
+      else if (code == 0xFF)
+	code -= 0x50;
+      else if (code == 0xB9)
+	code -= 0x2;
+      else if (code == 0xBF)
+	code -= 0x4;
+      else if (code == 0xB8 || code == 0xBA || code == 0xBC)
+	code -= 0x10;
+      else
+	code -= 0x20;
+    }
+    *to++ = code;
+    if (flags & ONIGENC_CASE_TITLECASE)  /* switch from titlecase to lowercase for capitalize */
+      flags ^= (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_TITLECASE);
+  }
+  *flagP = flags;
+  return (int )(to - to_start);
+}
+
 OnigEncodingDefine(iso_8859_14, ISO_8859_14) = {
   onigenc_single_byte_mbc_enc_len,
   "ISO-8859-14",  /* name */
@@ -243,10 +298,8 @@ OnigEncodingDefine(iso_8859_14, ISO_8859_14) = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
+  case_map,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
-  onigenc_single_byte_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 ENC_ALIAS("ISO8859-14", "ISO-8859-14")
diff --git a/enc/iso_8859_15.c b/enc/iso_8859_15.c
index 75adcafbd2..377a3afc7b 100644
--- a/enc/iso_8859_15.c
+++ b/enc/iso_8859_15.c
@@ -211,15 +211,67 @@ apply_all_case_fold(OnigCaseFoldType flag,
 
 static int
 get_case_fold_codes_by_str(OnigCaseFoldType flag,
-				       const OnigUChar* p, const OnigUChar* end,
-				       OnigCaseFoldCodeItem items[],
-				       OnigEncoding enc ARG_UNUSED)
+			   const OnigUChar* p, const OnigUChar* end,
+			   OnigCaseFoldCodeItem items[],
+			   OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_get_case_fold_codes_by_str_with_map(
 	     numberof(CaseFoldMap), CaseFoldMap, 1,
 	     flag, p, end, items);
 }
 
+static int
+case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
+	 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
+	 const struct OnigEncodingTypeST* enc)
+{
+  OnigCodePoint code;
+  OnigUChar *to_start = to;
+  OnigCaseFoldType flags = *flagP;
+
+  while (*pp < end && to < to_end) {
+    code = *(*pp)++;
+    if (code == SHARP_s) {
+      if (flags & ONIGENC_CASE_UPCASE) {
+	flags |= ONIGENC_CASE_MODIFIED;
+	*to++ = 'S';
+	code = (flags & ONIGENC_CASE_TITLECASE) ? 's' : 'S';
+      }
+      else if (flags & ONIGENC_CASE_FOLD) {
+	flags |= ONIGENC_CASE_MODIFIED;
+	*to++ = 's';
+	code = 's';
+      }
+    }
+    else if (code == 0xAA || code == 0xBA || code == 0xB5)
+      ;
+    else if ((EncISO_8859_15_CtypeTable[code] & BIT_CTYPE_UPPER)
+	     && (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
+      flags |= ONIGENC_CASE_MODIFIED;
+      code = ENC_ISO_8859_15_TO_LOWER_CASE(code);
+    }
+    else if ((EncISO_8859_15_CtypeTable[code] & BIT_CTYPE_LOWER)
+	     && (flags & ONIGENC_CASE_UPCASE)) {
+      flags |= ONIGENC_CASE_MODIFIED;
+      if (code == 0xA8)
+	code -= 2;
+      else if (code == 0xB8)
+	code -= 4;
+      else if (code == 0xBD)
+	code -= 1;
+      else if (code == 0xFF)
+	code -= 0x41;
+      else
+	code -= 0x20;
+    }
+    *to++ = code;
+    if (flags & ONIGENC_CASE_TITLECASE)  /* switch from titlecase to lowercase for capitalize */
+      flags ^= (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_TITLECASE);
+  }
+  *flagP = flags;
+  return (int )(to - to_start);
+}
+
 OnigEncodingDefine(iso_8859_15, ISO_8859_15) = {
   onigenc_single_byte_mbc_enc_len,
   "ISO-8859-15",  /* name */
@@ -237,10 +289,8 @@ OnigEncodingDefine(iso_8859_15, ISO_8859_15) = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
+  case_map,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
-  onigenc_single_byte_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 ENC_ALIAS("ISO8859-15", "ISO-8859-15")
diff --git a/enc/iso_8859_16.c b/enc/iso_8859_16.c
index 7e04403872..135630eb73 100644
--- a/enc/iso_8859_16.c
+++ b/enc/iso_8859_16.c
@@ -213,15 +213,69 @@ apply_all_case_fold(OnigCaseFoldType flag,
 
 static int
 get_case_fold_codes_by_str(OnigCaseFoldType flag,
-				       const OnigUChar* p, const OnigUChar* end,
-				       OnigCaseFoldCodeItem items[],
-				       OnigEncoding enc ARG_UNUSED)
+			   const OnigUChar* p, const OnigUChar* end,
+			   OnigCaseFoldCodeItem items[],
+			   OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_get_case_fold_codes_by_str_with_map(
 	     numberof(CaseFoldMap), CaseFoldMap, 1,
 	     flag, p, end, items);
 }
 
+static int
+case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
+	 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
+	 const struct OnigEncodingTypeST* enc)
+{
+  OnigCodePoint code;
+  OnigUChar *to_start = to;
+  OnigCaseFoldType flags = *flagP;
+
+  while (*pp < end && to < to_end) {
+    code = *(*pp)++;
+    if (code == SHARP_s) {
+      if (flags & ONIGENC_CASE_UPCASE) {
+	flags |= ONIGENC_CASE_MODIFIED;
+	*to++ = 'S';
+	code = (flags & ONIGENC_CASE_TITLECASE) ? 's' : 'S';
+      }
+      else if (flags & ONIGENC_CASE_FOLD) {
+	flags |= ONIGENC_CASE_MODIFIED;
+	*to++ = 's';
+	code = 's';
+      }
+    }
+    else if ((EncISO_8859_16_CtypeTable[code] & BIT_CTYPE_UPPER)
+	     && (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
+      flags |= ONIGENC_CASE_MODIFIED;
+      code = ENC_ISO_8859_16_TO_LOWER_CASE(code);
+    }
+    else if ((EncISO_8859_16_CtypeTable[code] & BIT_CTYPE_LOWER)
+	     && (flags&ONIGENC_CASE_UPCASE)) {
+      flags |= ONIGENC_CASE_MODIFIED;
+      if (code == 0xA2 || code == 0xBD)
+	code--;
+      else if (code == 0xB3 || code == 0xBA || code == 0xBF)
+	code -= 0x10;
+      else if (code == 0xA8 || code == 0xAE)
+	code -= 0x02;
+      else if (code == 0xB9)
+	code -= 0x07;
+      else if (code == 0xB8)
+	code -= 0x04;
+      else if (code == 0xFF)
+	code -= 0x41;
+      else
+	code -= 0x20;
+    }
+    *to++ = code;
+    if (flags & ONIGENC_CASE_TITLECASE)  /* switch from titlecase to lowercase for capitalize */
+      flags ^= (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_TITLECASE);
+  }
+  *flagP = flags;
+  return (int )(to - to_start);
+}
+
 OnigEncodingDefine(iso_8859_16, ISO_8859_16) = {
   onigenc_single_byte_mbc_enc_len,
   "ISO-8859-16",  /* name */
@@ -239,10 +293,8 @@ OnigEncodingDefine(iso_8859_16, ISO_8859_16) = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
+  case_map,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
-  onigenc_single_byte_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 ENC_ALIAS("ISO8859-16", "ISO-8859-16")
diff --git a/enc/iso_8859_2.c b/enc/iso_8859_2.c
index 4322754da2..3a05c6320d 100644
--- a/enc/iso_8859_2.c
+++ b/enc/iso_8859_2.c
@@ -220,6 +220,53 @@ is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSE
     return FALSE;
 }
 
+static int
+case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
+	 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
+	 const struct OnigEncodingTypeST* enc)
+{
+  OnigCodePoint code;
+  OnigUChar *to_start = to;
+  OnigCaseFoldType flags = *flagP;
+
+  while (*pp < end && to < to_end) {
+    code = *(*pp)++;
+    if (code == SHARP_s) {
+      if (flags & ONIGENC_CASE_UPCASE) {
+	flags |= ONIGENC_CASE_MODIFIED;
+	*to++ = 'S';
+	code = (flags & ONIGENC_CASE_TITLECASE) ? 's' : 'S';
+      }
+      else if (flags & ONIGENC_CASE_FOLD) {
+	flags |= ONIGENC_CASE_MODIFIED;
+	*to++ = 's';
+	code = 's';
+      }
+    }
+    else if ((EncISO_8859_2_CtypeTable[code] & BIT_CTYPE_UPPER)
+	     && (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
+      flags |= ONIGENC_CASE_MODIFIED;
+      code = ENC_ISO_8859_2_TO_LOWER_CASE(code);
+    }
+    else if ((EncISO_8859_2_CtypeTable[code] & BIT_CTYPE_LOWER)
+       && (flags & ONIGENC_CASE_UPCASE)) {
+      if (code >= 0xB1 && code <= 0xBF) {
+	flags |= ONIGENC_CASE_MODIFIED;
+	code -= 0x10;
+      }
+      else {
+	flags |= ONIGENC_CASE_MODIFIED;
+	code -= 0x20;
+      }
+    }
+    *to++ = code;
+    if (flags & ONIGENC_CASE_TITLECASE)  /* switch from titlecase to lowercase for capitalize */
+      flags ^= (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_TITLECASE);
+  }
+  *flagP = flags;
+  return (int )(to - to_start);
+}
+
 OnigEncodingDefine(iso_8859_2, ISO_8859_2) = {
   onigenc_single_byte_mbc_enc_len,
   "ISO-8859-2",  /* name */
@@ -237,10 +284,8 @@ OnigEncodingDefine(iso_8859_2, ISO_8859_2) = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
+  case_map,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
-  onigenc_single_byte_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 ENC_ALIAS("ISO8859-2", "ISO-8859-2")
diff --git a/enc/iso_8859_3.c b/enc/iso_8859_3.c
index e6dee1042a..2a343eac63 100644
--- a/enc/iso_8859_3.c
+++ b/enc/iso_8859_3.c
@@ -56,7 +56,7 @@ static const UChar EncISO_8859_3_ToLowerCaseTable[256] = {
   '\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',
+  '\250', '\151', '\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',
@@ -161,7 +161,7 @@ is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSE
 static const OnigPairCaseFoldCodes CaseFoldMap[] = {
  { 0xa1, 0xb1 },
  { 0xa6, 0xb6 },
- { 0xa9, 0xb9 },
+ /*{ 0xa9, 0xb9 }, exclude dotless i/I with dot; not a case pair */
  { 0xaa, 0xba },
  { 0xab, 0xbb },
  { 0xac, 0xbc },
@@ -220,6 +220,63 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
 	     flag, p, end, items);
 }
 
+#define DOTLESS_i        (0xB9)
+#define I_WITH_DOT_ABOVE (0xA9)
+static int
+case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
+	 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
+	 const struct OnigEncodingTypeST* enc)
+{
+  OnigCodePoint code;
+  OnigUChar *to_start = to;
+  OnigCaseFoldType flags = *flagP;
+
+  while (*pp < end && to < to_end) {
+    code = *(*pp)++;
+    if (code == SHARP_s) {
+      if (flags & ONIGENC_CASE_UPCASE) {
+	flags |= ONIGENC_CASE_MODIFIED;
+	*to++ = 'S';
+	code = (flags & ONIGENC_CASE_TITLECASE) ? 's' : 'S';
+      }
+      else if (flags & ONIGENC_CASE_FOLD) {
+	flags |= ONIGENC_CASE_MODIFIED;
+	*to++ = 's';
+	code = 's';
+      }
+    }
+    else if (code == 0xB5)
+      ;
+    else if ((EncISO_8859_3_CtypeTable[code] & BIT_CTYPE_UPPER)
+	     && (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
+      flags |= ONIGENC_CASE_MODIFIED;
+      if (code == 'I')
+        code = flags & ONIGENC_CASE_FOLD_TURKISH_AZERI ? DOTLESS_i : 'i';
+      else
+	code = ENC_ISO_8859_3_TO_LOWER_CASE(code);
+    }
+    else if ((EncISO_8859_3_CtypeTable[code]&BIT_CTYPE_LOWER)
+	     && (flags & ONIGENC_CASE_UPCASE)) {
+      flags |= ONIGENC_CASE_MODIFIED;
+      if (code == 'i')
+        code = flags & ONIGENC_CASE_FOLD_TURKISH_AZERI ? I_WITH_DOT_ABOVE : 'I';
+      else if (code == DOTLESS_i)
+        code = 'I';
+      else if (code >= 0xB0 && code <= 0xBF) {
+	code -= 0x10;
+      }
+      else {
+	code -= 0x20;
+      }
+    }
+    *to++ = code;
+    if (flags & ONIGENC_CASE_TITLECASE)  /* switch from titlecase to lowercase for capitalize */
+      flags ^= (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_TITLECASE);
+  }
+  *flagP = flags;
+  return (int )(to - to_start);
+}
+
 OnigEncodingDefine(iso_8859_3, ISO_8859_3) = {
   onigenc_single_byte_mbc_enc_len,
   "ISO-8859-3",  /* name */
@@ -237,10 +294,8 @@ OnigEncodingDefine(iso_8859_3, ISO_8859_3) = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
+  case_map,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
-  onigenc_single_byte_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 ENC_ALIAS("ISO8859-3", "ISO-8859-3")
diff --git a/enc/iso_8859_4.c b/enc/iso_8859_4.c
index 30041d1b62..e2134e8c0b 100644
--- a/enc/iso_8859_4.c
+++ b/enc/iso_8859_4.c
@@ -223,6 +223,56 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
 	     flag, p, end, items);
 }
 
+static int
+case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
+	 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
+	 const struct OnigEncodingTypeST* enc)
+{
+  OnigCodePoint code;
+  OnigUChar *to_start = to;
+  OnigCaseFoldType flags = *flagP;
+
+  while (*pp < end && to < to_end) {
+    code = *(*pp)++;
+    if (code == SHARP_s) {
+      if (flags & ONIGENC_CASE_UPCASE) {
+	flags |= ONIGENC_CASE_MODIFIED;
+	*to++ = 'S';
+	code = (flags & ONIGENC_CASE_TITLECASE) ? 's' : 'S';
+      }
+      else if (flags & ONIGENC_CASE_FOLD) {
+	flags |= ONIGENC_CASE_MODIFIED;
+	*to++ = 's';
+	code = 's';
+      }
+    }
+    else if ((EncISO_8859_4_CtypeTable[code] & BIT_CTYPE_UPPER)
+	     && (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
+      flags |= ONIGENC_CASE_MODIFIED;
+      code = ENC_ISO_8859_4_TO_LOWER_CASE(code);
+    }
+    else if (code == 0xA2)
+      ;
+    else if ((EncISO_8859_4_CtypeTable[code]&BIT_CTYPE_LOWER)
+	     && (flags & ONIGENC_CASE_UPCASE)) {
+      flags |= ONIGENC_CASE_MODIFIED;
+      if (code >= 0xA0 && code <= 0xBF) {
+	if (code == 0xBF)
+	  code -= 0x02;
+	else
+	  code -= 0x10;
+      }
+      else
+	code -= 0x20;
+    }
+    *to++ = code;
+    if (flags & ONIGENC_CASE_TITLECASE)  /* switch from titlecase to lowercase for capitalize */
+      flags ^= (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_TITLECASE);
+  }
+  *flagP = flags;
+  return (int )(to - to_start);
+}
+
 OnigEncodingDefine(iso_8859_4, ISO_8859_4) = {
   onigenc_single_byte_mbc_enc_len,
   "ISO-8859-4",  /* name */
@@ -240,10 +290,8 @@ OnigEncodingDefine(iso_8859_4, ISO_8859_4) = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
+  case_map,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
-  onigenc_single_byte_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 ENC_ALIAS("ISO8859-4", "ISO-8859-4")
diff --git a/enc/iso_8859_5.c b/enc/iso_8859_5.c
index c538d56e31..6fafc35823 100644
--- a/enc/iso_8859_5.c
+++ b/enc/iso_8859_5.c
@@ -209,6 +209,38 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
 	     flag, p, end, items);
 }
 
+static int
+case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
+	 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
+	 const struct OnigEncodingTypeST* enc)
+{
+  OnigCodePoint code;
+  OnigUChar *to_start = to;
+  OnigCaseFoldType flags = *flagP;
+
+  while (*pp < end && to < to_end) {
+    code = *(*pp)++;
+    if ((EncISO_8859_5_CtypeTable[code] & BIT_CTYPE_UPPER)
+	     && (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
+      flags |= ONIGENC_CASE_MODIFIED;
+      code = ENC_ISO_8859_5_TO_LOWER_CASE(code);
+    }
+    else if ((EncISO_8859_5_CtypeTable[code]&BIT_CTYPE_LOWER)
+	     && (flags & ONIGENC_CASE_UPCASE)) {
+      flags |= ONIGENC_CASE_MODIFIED;
+      if (0xF1 <= code && code <= 0xFF)
+	code -= 0x50;
+      else
+	code -= 0x20;
+    }
+    *to++ = code;
+    if (flags & ONIGENC_CASE_TITLECASE)  /* switch from titlecase to lowercase for capitalize */
+      flags ^= (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_TITLECASE);
+  }
+  *flagP = flags;
+  return (int )(to - to_start);
+}
+
 OnigEncodingDefine(iso_8859_5, ISO_8859_5) = {
   onigenc_single_byte_mbc_enc_len,
   "ISO-8859-5",  /* name */
@@ -226,10 +258,8 @@ OnigEncodingDefine(iso_8859_5, ISO_8859_5) = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
+  case_map,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
-  onigenc_single_byte_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 ENC_ALIAS("ISO8859-5", "ISO-8859-5")
diff --git a/enc/iso_8859_6.c b/enc/iso_8859_6.c
index d0f5f0ac7f..cdb74054d1 100644
--- a/enc/iso_8859_6.c
+++ b/enc/iso_8859_6.c
@@ -93,11 +93,9 @@ OnigEncodingDefine(iso_8859_6, ISO_8859_6) = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
+  onigenc_single_byte_ascii_only_case_map,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
-  onigenc_single_byte_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 ENC_ALIAS("ISO8859-6", "ISO-8859-6")
 
@@ -106,7 +104,7 @@ ENC_ALIAS("ISO8859-6", "ISO-8859-6")
  * 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
+ * Link: https://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
index 06ffd174a9..ac973f74ba 100644
--- a/enc/iso_8859_7.c
+++ b/enc/iso_8859_7.c
@@ -205,6 +205,60 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
 	     flag, p, end, items);
 }
 
+static int
+case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
+	 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
+	 const struct OnigEncodingTypeST* enc)
+{
+  OnigCodePoint code;
+  OnigUChar *to_start = to;
+  OnigCaseFoldType flags = *flagP;
+
+  while (*pp < end && to < to_end) {
+    code = *(*pp)++;
+    if (code == 0xF2) {
+      if (flags & ONIGENC_CASE_UPCASE) {
+	flags |= ONIGENC_CASE_MODIFIED;
+	code = 0xD3;
+      }
+      else if (flags & ONIGENC_CASE_FOLD) {
+	flags |= ONIGENC_CASE_MODIFIED;
+	code = 0xF3;
+      }
+    }
+    else if ((EncISO_8859_7_CtypeTable[code] & BIT_CTYPE_UPPER)
+	     && (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
+      flags |= ONIGENC_CASE_MODIFIED;
+      code = ENC_ISO_8859_7_TO_LOWER_CASE(code);
+    }
+    else if (code == 0xC0 || code == 0xE0)
+      ;
+    else if ((EncISO_8859_7_CtypeTable[code]&BIT_CTYPE_LOWER)
+	     && (flags & ONIGENC_CASE_UPCASE)) {
+      flags |= ONIGENC_CASE_MODIFIED;
+      if (code == 0xDC) {
+	code -= 0x26;
+      }
+      else if (code >= 0xDD && code <= 0xDF) {
+	code -= 0x25;
+      }
+      else if (code == 0xFC) {
+	code -= 0x40;
+      }
+      else if (code == 0xFD || code == 0xFE) {
+	code -= 0x3F;
+      }
+      else {
+	code -= 0x20;
+      }
+    }
+    *to++ = code;
+    if (flags & ONIGENC_CASE_TITLECASE)  /* switch from titlecase to lowercase for capitalize */
+      flags ^= (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_TITLECASE);
+  }
+  *flagP = flags;
+  return (int )(to - to_start);
+}
 
 OnigEncodingDefine(iso_8859_7, ISO_8859_7) = {
   onigenc_single_byte_mbc_enc_len,
@@ -223,20 +277,8 @@ OnigEncodingDefine(iso_8859_7, ISO_8859_7) = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
+  case_map,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
-  onigenc_single_byte_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 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
index 9821eec07c..e256855f21 100644
--- a/enc/iso_8859_8.c
+++ b/enc/iso_8859_8.c
@@ -93,11 +93,9 @@ OnigEncodingDefine(iso_8859_8, ISO_8859_8) = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
+  onigenc_single_byte_ascii_only_case_map,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
-  onigenc_single_byte_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 ENC_ALIAS("ISO8859-8", "ISO-8859-8")
 
@@ -106,7 +104,7 @@ ENC_ALIAS("ISO8859-8", "ISO-8859-8")
  * 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
+ * Link: https://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
index 9beb4f68e6..004eec310f 100644
--- a/enc/iso_8859_9.c
+++ b/enc/iso_8859_9.c
@@ -62,7 +62,7 @@ static const UChar EncISO_8859_9_ToLowerCaseTable[256] = {
   '\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',
+  '\370', '\371', '\372', '\373', '\374', '\151', '\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',
@@ -188,7 +188,7 @@ static const OnigPairCaseFoldCodes CaseFoldMap[] = {
   { 0xda, 0xfa },
   { 0xdb, 0xfb },
   { 0xdc, 0xfc },
-  { 0xdd, 0xfd },
+  /*{ 0xdd, 0xfd }, exclude dotless i/I with dot; not a case pair */
   { 0xde, 0xfe }
 };
 
@@ -204,15 +204,68 @@ apply_all_case_fold(OnigCaseFoldType flag,
 
 static int
 get_case_fold_codes_by_str(OnigCaseFoldType flag,
-				      const OnigUChar* p, const OnigUChar* end,
-				      OnigCaseFoldCodeItem items[],
-				      OnigEncoding enc ARG_UNUSED)
+			   const OnigUChar* p, const OnigUChar* end,
+			   OnigCaseFoldCodeItem items[],
+			   OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_get_case_fold_codes_by_str_with_map(
 	     numberof(CaseFoldMap), CaseFoldMap, 1,
 	     flag, p, end, items);
 }
 
+#define DOTLESS_i        (0xFD)
+#define I_WITH_DOT_ABOVE (0xDD)
+static int
+case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
+	 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
+	 const struct OnigEncodingTypeST* enc)
+{
+  OnigCodePoint code;
+  OnigUChar *to_start = to;
+  OnigCaseFoldType flags = *flagP;
+
+  while (*pp < end && to < to_end) {
+    code = *(*pp)++;
+    if (code == SHARP_s) {
+      if (flags & ONIGENC_CASE_UPCASE) {
+	flags |= ONIGENC_CASE_MODIFIED;
+	*to++ = 'S';
+	code = (flags & ONIGENC_CASE_TITLECASE) ? 's' : 'S';
+      }
+      else if (flags & ONIGENC_CASE_FOLD) {
+	flags |= ONIGENC_CASE_MODIFIED;
+	*to++ = 's';
+	code = 's';
+      }
+    }
+    else if (code == 0xAA || code == 0xB5 || code == 0xBA || code == 0xFF)
+      ;
+    else if ((EncISO_8859_9_CtypeTable[code] & BIT_CTYPE_UPPER)
+	     && (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
+      flags |= ONIGENC_CASE_MODIFIED;
+      if (code == 'I')
+	code = flags & ONIGENC_CASE_FOLD_TURKISH_AZERI ? DOTLESS_i : 'i';
+      else
+	code = ENC_ISO_8859_9_TO_LOWER_CASE(code);
+    }
+    else if ((EncISO_8859_9_CtypeTable[code]&BIT_CTYPE_LOWER)
+	     && (flags & ONIGENC_CASE_UPCASE)) {
+      flags |= ONIGENC_CASE_MODIFIED;
+      if (code == 'i')
+	code = flags & ONIGENC_CASE_FOLD_TURKISH_AZERI ? I_WITH_DOT_ABOVE : 'I';
+      else if (code == DOTLESS_i)
+	code = 'I';
+      else
+	code -= 0x20;
+    }
+    *to++ = code;
+    if (flags & ONIGENC_CASE_TITLECASE)  /* switch from titlecase to lowercase for capitalize */
+      flags ^= (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_TITLECASE);
+  }
+  *flagP = flags;
+  return (int )(to - to_start);
+}
+
 OnigEncodingDefine(iso_8859_9, ISO_8859_9) = {
   onigenc_single_byte_mbc_enc_len,
   "ISO-8859-9",  /* name */
@@ -230,20 +283,8 @@ OnigEncodingDefine(iso_8859_9, ISO_8859_9) = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
+  case_map,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
-  onigenc_single_byte_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 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/jis/props.h b/enc/jis/props.h
deleted file mode 100644
index 4ae2e1fd23..0000000000
--- a/enc/jis/props.h
+++ /dev/null
@@ -1,227 +0,0 @@
-/* C code produced by gperf version 3.0.4 */
-/* Command-line: gperf -k1,3 -7 -c -j1 -i1 -t -C -P -t --ignore-case -H onig_jis_property_hash -Q onig_jis_property_pool -N onig_jis_property enc/jis/props.kwd  */
-
-#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 "enc/jis/props.kwd"
-/* -*- c -*- */
-#define GPERF_DOWNCASE 1
-#define GPERF_CASE_STRNCMP 1
-
-static inline int
-gperf_case_strncmp(const char *s1, const char *s2, unsigned int n)
-{
-    const UChar *str = (const UChar *)s1;
-    const UChar *s = (const UChar *)s2;
-    return onigenc_with_ascii_strnicmp(ONIG_ENCODING_ASCII, str, str + n, s, n);
-}
-
-enum onigenc_jis_ctype {
-    onigenc_jis_min = ONIGENC_MAX_STD_CTYPE,
-    onigenc_jis_hiragana,
-    onigenc_jis_katakana,
-    onigenc_jis_han,
-    onigenc_jis_latin,
-    onigenc_jis_greek,
-    onigenc_jis_cyrillic,
-    onigenc_jis_max
-};
-
-enum {PropertyListNum = onigenc_jis_max - onigenc_jis_min - 1};
-
-static const OnigCodePoint* const PropertyList[PropertyListNum] = {
-    CR_Hiragana,
-    CR_Katakana,
-    CR_Han,
-    CR_Latin,
-    CR_Greek,
-    CR_Cyrillic,
-};
-
-struct enc_property {
-    signed char name;
-    unsigned char ctype;
-};
-
-static const struct enc_property *onig_jis_property(const char *str, unsigned int len);
-#line 43 "enc/jis/props.kwd"
-struct enc_property;
-
-#define TOTAL_KEYWORDS 6
-#define MIN_WORD_LENGTH 3
-#define MAX_WORD_LENGTH 8
-#define MIN_HASH_VALUE 5
-#define MAX_HASH_VALUE 12
-/* maximum key range = 8, duplicates = 0 */
-
-#ifndef GPERF_DOWNCASE
-#define GPERF_DOWNCASE 1
-static unsigned char gperf_downcase[256] =
-  {
-      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,  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,  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, 189, 190, 191, 192, 193, 194,
-    195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
-    210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
-    225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
-    240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
-    255
-  };
-#endif
-
-#ifndef GPERF_CASE_STRNCMP
-#define GPERF_CASE_STRNCMP 1
-static int
-gperf_case_strncmp (s1, s2, n)
-     register const char *s1;
-     register const char *s2;
-     register unsigned int n;
-{
-  for (; n > 0;)
-    {
-      unsigned char c1 = gperf_downcase[(unsigned char)*s1++];
-      unsigned char c2 = gperf_downcase[(unsigned char)*s2++];
-      if (c1 != 0 && c1 == c2)
-        {
-          n--;
-          continue;
-        }
-      return (int)c1 - (int)c2;
-    }
-  return 0;
-}
-#endif
-
-#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__cplusplus) || defined(__GNUC_STDC_INLINE__)
-inline
-#elif defined(__GNUC__)
-__inline
-#endif
-static unsigned int
-onig_jis_property_hash (str, len)
-     register const char *str;
-     register unsigned int len;
-{
-  static const unsigned char asso_values[] =
-    {
-      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, 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,  3, 13,  2,
-      13,  1,  1, 13, 13,  2,  1, 13,  1, 13,
-      13, 13,  1, 13,  1, 13, 13, 13, 13, 13,
-      13, 13, 13, 13, 13, 13, 13, 13, 13,  3,
-      13,  2, 13,  1,  1, 13, 13,  2,  1, 13,
-       1, 13, 13, 13,  1, 13,  1, 13, 13, 13,
-      13, 13, 13, 13, 13, 13, 13, 13
-    };
-  return len + asso_values[(unsigned char)str[2]] + asso_values[(unsigned char)str[0]];
-}
-
-struct onig_jis_property_pool_t
-  {
-    char onig_jis_property_pool_str5[sizeof("han")];
-    char onig_jis_property_pool_str7[sizeof("latin")];
-    char onig_jis_property_pool_str8[sizeof("greek")];
-    char onig_jis_property_pool_str10[sizeof("hiragana")];
-    char onig_jis_property_pool_str11[sizeof("katakana")];
-    char onig_jis_property_pool_str12[sizeof("cyrillic")];
-  };
-static const struct onig_jis_property_pool_t onig_jis_property_pool_contents =
-  {
-    "han",
-    "latin",
-    "greek",
-    "hiragana",
-    "katakana",
-    "cyrillic"
-  };
-#define onig_jis_property_pool ((const char *) &onig_jis_property_pool_contents)
-#ifdef __GNUC__
-__inline
-#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
-__attribute__ ((__gnu_inline__))
-#endif
-#endif
-const struct enc_property *
-onig_jis_property (str, len)
-     register const char *str;
-     register unsigned int len;
-{
-  static const struct enc_property wordlist[] =
-    {
-      {-1}, {-1}, {-1}, {-1}, {-1},
-#line 48 "enc/jis/props.kwd"
-      {(char)offsetof(struct onig_jis_property_pool_t, onig_jis_property_pool_str5),      onigenc_jis_han},
-      {-1},
-#line 49 "enc/jis/props.kwd"
-      {(char)offsetof(struct onig_jis_property_pool_t, onig_jis_property_pool_str7),    onigenc_jis_latin},
-#line 50 "enc/jis/props.kwd"
-      {(char)offsetof(struct onig_jis_property_pool_t, onig_jis_property_pool_str8),    onigenc_jis_greek},
-      {-1},
-#line 46 "enc/jis/props.kwd"
-      {(char)offsetof(struct onig_jis_property_pool_t, onig_jis_property_pool_str10), onigenc_jis_hiragana},
-#line 47 "enc/jis/props.kwd"
-      {(char)offsetof(struct onig_jis_property_pool_t, onig_jis_property_pool_str11), onigenc_jis_katakana},
-#line 51 "enc/jis/props.kwd"
-      {(char)offsetof(struct onig_jis_property_pool_t, onig_jis_property_pool_str12), onigenc_jis_cyrillic}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = onig_jis_property_hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        {
-          register int o = wordlist[key].name;
-          if (o >= 0)
-            {
-              register const char *s = o + onig_jis_property_pool;
-
-              if ((((unsigned char)*str ^ (unsigned char)*s) & ~32) == 0 && !gperf_case_strncmp (str, s, len) && s[len] == '\0')
-                return &wordlist[key];
-            }
-        }
-    }
-  return 0;
-}
-#line 52 "enc/jis/props.kwd"
-
diff --git a/enc/jis/props.h.blt b/enc/jis/props.h.blt
index 4ae2e1fd23..54aa94f8bc 100644
--- a/enc/jis/props.h.blt
+++ b/enc/jis/props.h.blt
@@ -1,4 +1,4 @@
-/* C code produced by gperf version 3.0.4 */
+/* ANSI-C code produced by gperf version 3.1 */
 /* Command-line: gperf -k1,3 -7 -c -j1 -i1 -t -C -P -t --ignore-case -H onig_jis_property_hash -Q onig_jis_property_pool -N onig_jis_property enc/jis/props.kwd  */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
@@ -25,20 +25,21 @@
       && ('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>."
+#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gperf@gnu.org>."
 #endif
 
+#define gperf_offsetof(s, n) (short)offsetof(struct s##_t, s##_str##n)
 #line 1 "enc/jis/props.kwd"
 /* -*- c -*- */
 #define GPERF_DOWNCASE 1
 #define GPERF_CASE_STRNCMP 1
 
 static inline int
-gperf_case_strncmp(const char *s1, const char *s2, unsigned int n)
+gperf_case_strncmp(const char *s1, const char *s2, size_t n)
 {
     const UChar *str = (const UChar *)s1;
     const UChar *s = (const UChar *)s2;
-    return onigenc_with_ascii_strnicmp(ONIG_ENCODING_ASCII, str, str + n, s, n);
+    return onigenc_with_ascii_strnicmp(ONIG_ENCODING_ASCII, str, str + n, s, (int)n);
 }
 
 enum onigenc_jis_ctype {
@@ -68,7 +69,7 @@ struct enc_property {
     unsigned char ctype;
 };
 
-static const struct enc_property *onig_jis_property(const char *str, unsigned int len);
+static const struct enc_property *onig_jis_property(/*const char *str, unsigned int len*/);
 #line 43 "enc/jis/props.kwd"
 struct enc_property;
 
@@ -107,10 +108,7 @@ static unsigned char gperf_downcase[256] =
 #ifndef GPERF_CASE_STRNCMP
 #define GPERF_CASE_STRNCMP 1
 static int
-gperf_case_strncmp (s1, s2, n)
-     register const char *s1;
-     register const char *s2;
-     register unsigned int n;
+gperf_case_strncmp (register const char *s1, register const char *s2, register size_t n)
 {
   for (; n > 0;)
     {
@@ -127,15 +125,15 @@ gperf_case_strncmp (s1, s2, n)
 }
 #endif
 
-#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__cplusplus) || defined(__GNUC_STDC_INLINE__)
-inline
-#elif defined(__GNUC__)
+#ifdef __GNUC__
 __inline
+#else
+#ifdef __cplusplus
+inline
+#endif
 #endif
 static unsigned int
-onig_jis_property_hash (str, len)
-     register const char *str;
-     register unsigned int len;
+onig_jis_property_hash (register const char *str, register size_t len)
 {
   static const unsigned char asso_values[] =
     {
@@ -153,7 +151,7 @@ onig_jis_property_hash (str, len)
        1, 13, 13, 13,  1, 13,  1, 13, 13, 13,
       13, 13, 13, 13, 13, 13, 13, 13
     };
-  return len + asso_values[(unsigned char)str[2]] + asso_values[(unsigned char)str[0]];
+  return (unsigned int)len + asso_values[(unsigned char)str[2]] + asso_values[(unsigned char)str[0]];
 }
 
 struct onig_jis_property_pool_t
@@ -175,41 +173,33 @@ static const struct onig_jis_property_pool_t onig_jis_property_pool_contents =
     "cyrillic"
   };
 #define onig_jis_property_pool ((const char *) &onig_jis_property_pool_contents)
-#ifdef __GNUC__
-__inline
-#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
-__attribute__ ((__gnu_inline__))
-#endif
-#endif
 const struct enc_property *
-onig_jis_property (str, len)
-     register const char *str;
-     register unsigned int len;
+onig_jis_property (register const char *str, register size_t len)
 {
   static const struct enc_property wordlist[] =
     {
       {-1}, {-1}, {-1}, {-1}, {-1},
 #line 48 "enc/jis/props.kwd"
-      {(char)offsetof(struct onig_jis_property_pool_t, onig_jis_property_pool_str5),      onigenc_jis_han},
+      {gperf_offsetof(onig_jis_property_pool, 5),      onigenc_jis_han},
       {-1},
 #line 49 "enc/jis/props.kwd"
-      {(char)offsetof(struct onig_jis_property_pool_t, onig_jis_property_pool_str7),    onigenc_jis_latin},
+      {gperf_offsetof(onig_jis_property_pool, 7),    onigenc_jis_latin},
 #line 50 "enc/jis/props.kwd"
-      {(char)offsetof(struct onig_jis_property_pool_t, onig_jis_property_pool_str8),    onigenc_jis_greek},
+      {gperf_offsetof(onig_jis_property_pool, 8),    onigenc_jis_greek},
       {-1},
 #line 46 "enc/jis/props.kwd"
-      {(char)offsetof(struct onig_jis_property_pool_t, onig_jis_property_pool_str10), onigenc_jis_hiragana},
+      {gperf_offsetof(onig_jis_property_pool, 10), onigenc_jis_hiragana},
 #line 47 "enc/jis/props.kwd"
-      {(char)offsetof(struct onig_jis_property_pool_t, onig_jis_property_pool_str11), onigenc_jis_katakana},
+      {gperf_offsetof(onig_jis_property_pool, 11), onigenc_jis_katakana},
 #line 51 "enc/jis/props.kwd"
-      {(char)offsetof(struct onig_jis_property_pool_t, onig_jis_property_pool_str12), onigenc_jis_cyrillic}
+      {gperf_offsetof(onig_jis_property_pool, 12), onigenc_jis_cyrillic}
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
     {
-      register int key = onig_jis_property_hash (str, len);
+      register unsigned int key = onig_jis_property_hash (str, len);
 
-      if (key <= MAX_HASH_VALUE && key >= 0)
+      if (key <= MAX_HASH_VALUE)
         {
           register int o = wordlist[key].name;
           if (o >= 0)
diff --git a/enc/jis/props.kwd b/enc/jis/props.kwd
index f3235c0100..659cf0aff4 100644
--- a/enc/jis/props.kwd
+++ b/enc/jis/props.kwd
@@ -3,11 +3,11 @@
 #define GPERF_CASE_STRNCMP 1
 
 static inline int
-gperf_case_strncmp(const char *s1, const char *s2, unsigned int n)
+gperf_case_strncmp(const char *s1, const char *s2, size_t n)
 {
     const UChar *str = (const UChar *)s1;
     const UChar *s = (const UChar *)s2;
-    return onigenc_with_ascii_strnicmp(ONIG_ENCODING_ASCII, str, str + n, s, n);
+    return onigenc_with_ascii_strnicmp(ONIG_ENCODING_ASCII, str, str + n, s, (int)n);
 }
 
 enum onigenc_jis_ctype {
@@ -37,7 +37,7 @@ struct enc_property {
     unsigned char ctype;
 };
 
-static const struct enc_property *onig_jis_property(const char *str, unsigned int len);
+static const struct enc_property *onig_jis_property(/*!ANSI{*/const char *str, unsigned int len/*}!ANSI*/);
 %}
 
 struct enc_property;
diff --git a/enc/jis/props.src b/enc/jis/props.src
index f3235c0100..659cf0aff4 100644
--- a/enc/jis/props.src
+++ b/enc/jis/props.src
@@ -3,11 +3,11 @@
 #define GPERF_CASE_STRNCMP 1
 
 static inline int
-gperf_case_strncmp(const char *s1, const char *s2, unsigned int n)
+gperf_case_strncmp(const char *s1, const char *s2, size_t n)
 {
     const UChar *str = (const UChar *)s1;
     const UChar *s = (const UChar *)s2;
-    return onigenc_with_ascii_strnicmp(ONIG_ENCODING_ASCII, str, str + n, s, n);
+    return onigenc_with_ascii_strnicmp(ONIG_ENCODING_ASCII, str, str + n, s, (int)n);
 }
 
 enum onigenc_jis_ctype {
@@ -37,7 +37,7 @@ struct enc_property {
     unsigned char ctype;
 };
 
-static const struct enc_property *onig_jis_property(const char *str, unsigned int len);
+static const struct enc_property *onig_jis_property(/*!ANSI{*/const char *str, unsigned int len/*}!ANSI*/);
 %}
 
 struct enc_property;
diff --git a/enc/koi8_r.c b/enc/koi8_r.c
index 68813b4781..a520975774 100644
--- a/enc/koi8_r.c
+++ b/enc/koi8_r.c
@@ -214,11 +214,8 @@ OnigEncodingDefine(koi8_r, KOI8_R) = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
+  onigenc_single_byte_ascii_only_case_map,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
-  onigenc_single_byte_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 ENC_ALIAS("CP878", "KOI8-R")
-
diff --git a/enc/koi8_u.c b/enc/koi8_u.c
index 8f5b132958..50bb78bd04 100644
--- a/enc/koi8_u.c
+++ b/enc/koi8_u.c
@@ -218,9 +218,7 @@ OnigEncodingDefine(koi8_u, KOI8_U) = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
+  onigenc_single_byte_ascii_only_case_map,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
-  onigenc_single_byte_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
diff --git a/enc/make_encmake.rb b/enc/make_encmake.rb
index 4ab85f36e3..bc0597e3f4 100755
--- a/enc/make_encmake.rb
+++ b/enc/make_encmake.rb
@@ -121,7 +121,11 @@ ENCS, ENC_DEPS = target_encodings
 ATRANS, TRANS = target_transcoders
 
 if File.exist?(depend = File.join($srcdir, "depend"))
-  erb = ERB.new(File.read(depend), nil, '%')
+  if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+
+    erb = ERB.new(File.read(depend), trim_mode: '%')
+  else
+    erb = ERB.new(File.read(depend), nil, '%')
+  end
   erb.filename = depend
   tmp = erb.result(binding)
   dep = "\n#### depend ####\n\n" << depend_rules(tmp).join
@@ -135,7 +139,11 @@ open(ARGV[0], 'wb') {|f|
 }
 if MODULE_TYPE == :static
   filename = "encinit.c.erb"
-  erb = ERB.new(File.read(File.join($srcdir, filename)), nil, '%-')
+  if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+
+    erb = ERB.new(File.read(File.join($srcdir, filename)), trim_mode: '%-')
+  else
+    erb = ERB.new(File.read(File.join($srcdir, filename)), nil, '%-')
+  end
   erb.filename = "enc/#{filename}"
   tmp = erb.result(binding)
   begin
diff --git a/enc/mktable.c b/enc/mktable.c
index 49acf628d0..4edd5a0ff7 100644
--- a/enc/mktable.c
+++ b/enc/mktable.c
@@ -2,7 +2,7 @@
   mktable.c
 **********************************************************************/
 /*-
- * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * Copyright (c) 2002-2016  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -31,7 +31,10 @@
 #include <stdio.h>
 #include <locale.h>
 
+#ifndef __USE_ISOC99
 #define __USE_ISOC99
+#endif
+
 #include <ctype.h>
 
 #include "regenc.h"
@@ -1108,11 +1111,13 @@ static int exec(FILE* fp, ENC_INFO* einfo)
 #define NCOL  8
 
   int c, val, enc;
+  int r;
 
   enc = einfo->num;
 
-  fprintf(fp, "static const unsigned short Enc%s_CtypeTable[256] = {\n",
-	  einfo->name);
+  r = fprintf(fp, "static const unsigned short Enc%s_CtypeTable[256] = {\n",
+              einfo->name);
+  if (r < 0) return -1;
 
   for (c = 0; c < 256; c++) {
     val = 0;
@@ -1131,20 +1136,33 @@ static int exec(FILE* fp, ENC_INFO* einfo)
     if (IsWord  (enc, c))   val |= BIT_CTYPE_WORD;
     if (IsAscii (enc, c))   val |= BIT_CTYPE_ASCII;
 
-    if (c % NCOL == 0) fputs("  ", fp);
-    fprintf(fp, "0x%04x", val);
-    if (c != 255) fputs(",", fp);
+    if (c % NCOL == 0) {
+      r = fputs("  ", fp);
+      if (r < 0) return -1;
+    }
+    r = fprintf(fp, "0x%04x", val);
+    if (r < 0) return -1;
+
+    if (c != 255) {
+      r = fputs(",", fp);
+      if (r < 0) return -1;
+    }
     if (c != 0 && c % NCOL == (NCOL-1))
-      fputs("\n", fp);
+      r = fputs("\n", fp);
     else
-      fputs(" ", fp);
+      r = fputs(" ", fp);
+
+    if (r < 0) return -1;
   }
-  fprintf(fp, "};\n");
+  r = fprintf(fp, "};\n");
+  if (r < 0) return -1;
+
   return 0;
 }
 
 extern int main(int argc ARG_UNUSED, char* argv[] ARG_UNUSED)
 {
+  int r;
   int i;
   FILE* fp = stdout;
 
@@ -1155,7 +1173,11 @@ extern int main(int argc ARG_UNUSED, char* argv[] ARG_UNUSED)
   /* setlocale(LC_ALL, "fr_FR.iso88591"); */
 
   for (i = 0; i < (int )(sizeof(Info)/sizeof(ENC_INFO)); i++) {
-    exec(fp, &Info[i]);
+    r = exec(fp, &Info[i]);
+    if (r < 0) {
+      fprintf(stderr, "FAIL exec(): %d\n", r);
+      return -1;
+    }
   }
 
   return 0;
diff --git a/enc/prelude.rb b/enc/prelude.rb
deleted file mode 100644
index be7c0c9445..0000000000
--- a/enc/prelude.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-begin
-  require 'unicode_normalize'
-rescue LoadError
-end
diff --git a/enc/shift_jis.c b/enc/shift_jis.c
index ab180d5f10..f1355d2d95 100644
--- a/enc/shift_jis.c
+++ b/enc/shift_jis.c
@@ -1,9 +1,9 @@
 /**********************************************************************
-  sjis.c -  Onigmo (Oniguruma-mod) (regular expression library)
+  shift_jis.c -  Onigmo (Oniguruma-mod) (regular expression library)
 **********************************************************************/
 /*-
- * Copyright (c) 2002-2008  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * Copyright (c) 2011       K.Takata  <kentkt AT csc DOT jp>
+ * Copyright (c) 2002-2009  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * Copyright (c) 2011-2017  K.Takata  <kentkt AT csc DOT jp>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28,524 +28,8 @@
  * SUCH DAMAGE.
  */
 
-#include "regint.h"
+#include "shift_jis.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
-};
-
-static const OnigPairCaseFoldCodes CaseFoldMap[] = {
-  /* Fullwidth Alphabet */
-  { 0x8260, 0x8281 },
-  { 0x8261, 0x8282 },
-  { 0x8262, 0x8283 },
-  { 0x8263, 0x8284 },
-  { 0x8264, 0x8285 },
-  { 0x8265, 0x8286 },
-  { 0x8266, 0x8287 },
-  { 0x8267, 0x8288 },
-  { 0x8268, 0x8289 },
-  { 0x8269, 0x828a },
-  { 0x826a, 0x828b },
-  { 0x826b, 0x828c },
-  { 0x826c, 0x828d },
-  { 0x826d, 0x828e },
-  { 0x826e, 0x828f },
-  { 0x826f, 0x8290 },
-  { 0x8270, 0x8291 },
-  { 0x8271, 0x8292 },
-  { 0x8272, 0x8293 },
-  { 0x8273, 0x8294 },
-  { 0x8274, 0x8295 },
-  { 0x8275, 0x8296 },
-  { 0x8276, 0x8297 },
-  { 0x8277, 0x8298 },
-  { 0x8278, 0x8299 },
-  { 0x8279, 0x829a },
-
-  /* Greek */
-  { 0x839f, 0x83bf },
-  { 0x83a0, 0x83c0 },
-  { 0x83a1, 0x83c1 },
-  { 0x83a2, 0x83c2 },
-  { 0x83a3, 0x83c3 },
-  { 0x83a4, 0x83c4 },
-  { 0x83a5, 0x83c5 },
-  { 0x83a6, 0x83c6 },
-  { 0x83a7, 0x83c7 },
-  { 0x83a8, 0x83c8 },
-  { 0x83a9, 0x83c9 },
-  { 0x83aa, 0x83ca },
-  { 0x83ab, 0x83cb },
-  { 0x83ac, 0x83cc },
-  { 0x83ad, 0x83cd },
-  { 0x83ae, 0x83ce },
-  { 0x83af, 0x83cf },
-  { 0x83b0, 0x83d0 },
-  { 0x83b1, 0x83d1 },
-  { 0x83b2, 0x83d2 },
-  { 0x83b3, 0x83d3 },
-  { 0x83b4, 0x83d4 },
-  { 0x83b5, 0x83d5 },
-  { 0x83b6, 0x83d6 },
-
-  /* Cyrillic */
-  { 0x8440, 0x8470 },
-  { 0x8441, 0x8471 },
-  { 0x8442, 0x8472 },
-  { 0x8443, 0x8473 },
-  { 0x8444, 0x8474 },
-  { 0x8445, 0x8475 },
-  { 0x8446, 0x8476 },
-  { 0x8447, 0x8477 },
-  { 0x8448, 0x8478 },
-  { 0x8449, 0x8479 },
-  { 0x844a, 0x847a },
-  { 0x844b, 0x847b },
-  { 0x844c, 0x847c },
-  { 0x844d, 0x847d },
-  { 0x844e, 0x847e },
-  { 0x844f, 0x8480 },
-  { 0x8450, 0x8481 },
-  { 0x8451, 0x8482 },
-  { 0x8452, 0x8483 },
-  { 0x8453, 0x8484 },
-  { 0x8454, 0x8485 },
-  { 0x8455, 0x8486 },
-  { 0x8456, 0x8487 },
-  { 0x8457, 0x8488 },
-  { 0x8458, 0x8489 },
-  { 0x8459, 0x848a },
-  { 0x845a, 0x848b },
-  { 0x845b, 0x848c },
-  { 0x845c, 0x848d },
-  { 0x845d, 0x848e },
-  { 0x845e, 0x848f },
-  { 0x845f, 0x8490 },
-  { 0x8460, 0x8491 },
-};
-
-#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 ONIGERR_INVALID_CODE_POINT_VALUE;
-  }
-  else if (code <= 0xffff) {
-    int low = code & 0xff;
-    if (! SJIS_ISMB_TRAIL(low))
-      return ONIGERR_INVALID_CODE_POINT_VALUE;
-    return 2;
-  }
-  else
-    return ONIGERR_TOO_BIG_WIDE_CHAR_VALUE;
-}
-
-static OnigCodePoint
-mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc)
-{
-  int c, i, len;
-  OnigCodePoint n;
-
-  len = mbc_enc_len(p, end, enc);
-  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 (mbc_enc_len(buf, p, enc) != (p - buf))
-    return REGERR_INVALID_CODE_POINT_VALUE;
-#endif
-  return (int )(p - buf);
-}
-
-static int
-apply_all_case_fold(OnigCaseFoldType flag,
-		    OnigApplyAllCaseFoldFunc f, void* arg, OnigEncoding enc)
-{
-  return onigenc_apply_all_case_fold_with_map(
-            numberof(CaseFoldMap), CaseFoldMap, 0,
-            flag, f, arg);
-}
-
-static OnigCodePoint
-get_lower_case(OnigCodePoint code)
-{
-  if (ONIGENC_IS_IN_RANGE(code, 0x8260, 0x8279)) {
-    /* Fullwidth Alphabet */
-    return (OnigCodePoint )(code + 0x0021);
-  }
-  else if (ONIGENC_IS_IN_RANGE(code, 0x839f, 0x83b6)) {
-    /* Greek */
-    return (OnigCodePoint )(code + 0x0020);
-  }
-  else if (ONIGENC_IS_IN_RANGE(code, 0x8440, 0x8460)) {
-    /* Cyrillic */
-    int d = (code >= 0x844f) ? 1 : 0;
-    return (OnigCodePoint )(code + (0x0030 + d));
-  }
-  return code;
-}
-
-static OnigCodePoint
-get_upper_case(OnigCodePoint code)
-{
-  if (ONIGENC_IS_IN_RANGE(code, 0x8281, 0x829a)) {
-    /* Fullwidth Alphabet */
-    return (OnigCodePoint )(code - 0x0021);
-  }
-  else if (ONIGENC_IS_IN_RANGE(code, 0x83bf, 0x83d6)) {
-    /* Greek */
-    return (OnigCodePoint )(code - 0x0020);
-  }
-  else if (ONIGENC_IS_IN_RANGE(code, 0x8470, 0x847e) ||
-	   ONIGENC_IS_IN_RANGE(code, 0x8480, 0x8491)) {
-    /* Cyrillic */
-    int d = (code >= 0x8480) ? 1 : 0;
-    return (OnigCodePoint )(code - (0x0030 - d));
-  }
-  return code;
-}
-
-static int
-get_case_fold_codes_by_str(OnigCaseFoldType flag,
-			   const OnigUChar* p, const OnigUChar* end,
-			   OnigCaseFoldCodeItem items[], OnigEncoding enc)
-{
-  int len;
-  OnigCodePoint code, code_lo, code_up;
-
-  code = mbc_to_code(p, end, enc);
-  if (ONIGENC_IS_ASCII_CODE(code))
-    return onigenc_ascii_get_case_fold_codes_by_str(flag, p, end, items, enc);
-
-  len = mbc_enc_len(p, end, enc);
-  code_lo = get_lower_case(code);
-  code_up = get_upper_case(code);
-
-  if (code != code_lo) {
-    items[0].byte_len = len;
-    items[0].code_len = 1;
-    items[0].code[0] = code_lo;
-    return 1;
-  }
-  else if (code != code_up) {
-    items[0].byte_len = len;
-    items[0].code_len = 1;
-    items[0].code[0] = code_up;
-    return 1;
-  }
-
-  return 0;
-}
-
-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 {
-    OnigCodePoint code;
-    int len;
-
-    code = get_lower_case(mbc_to_code(p, end, enc));
-    len = code_to_mbc(code, lower, enc);
-    (*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, const UChar* end, 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 = mbc_enc_len(p, end, enc);
-  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 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 */
-
-#ifdef ENC_CP932
-static const OnigCodePoint CR_Han[] = {
-  6,
-  0x8157, 0x8157,
-  0x889f, 0x9872,	/* Kanji level 1 */
-  0x989f, 0x9ffc,	/* Kanji level 2 */
-  0xe040, 0xeaa4,	/* Kanji level 2 */
-  0xed40, 0xeeec,	/* NEC-selected IBM extended characters (without symbols) */
-  0xfa5c, 0xfc4b,	/* IBM extended characters (without symbols) */
-}; /* CR_Han */
-#else
-static const OnigCodePoint CR_Han[] = {
-  4,
-  0x8157, 0x8157,
-  0x889f, 0x9872,	/* Kanji level 1 */
-  0x989f, 0x9ffc,	/* Kanji level 2 */
-  0xe040, 0xeaa4,	/* Kanji level 2 */
-}; /* CR_Han */
-#endif
-
-static const OnigCodePoint CR_Latin[] = {
-  4,
-  0x0041, 0x005a,
-  0x0061, 0x007a,
-  0x8260, 0x8279,
-  0x8281, 0x829a,
-}; /* CR_Latin */
-
-static const OnigCodePoint CR_Greek[] = {
-  2,
-  0x839f, 0x83b6,
-  0x83bf, 0x83d6,
-}; /* CR_Greek */
-
-static const OnigCodePoint CR_Cyrillic[] = {
-  3,
-  0x8440, 0x8460,
-  0x8470, 0x847f,
-  0x8480, 0x8491,
-}; /* CR_Cyrillic */
-
-#include "enc/jis/props.h"
-
-static int
-property_name_to_ctype(OnigEncoding enc, const UChar* p, const UChar* end)
-{
-  const UChar *s = p, *e = end;
-  const struct enc_property *prop =
-    onig_jis_property((const char* )s, (unsigned int )(e - s));
-
-  if (!prop) {
-    return onigenc_minimum_property_name_to_ctype(enc, s, e);
-  }
-
-  return (int )prop->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 {
-    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;
-
-    ctype -= (ONIGENC_MAX_STD_CTYPE + 1);
-    if (ctype >= (OnigCtype )PropertyListNum)
-      return ONIGERR_TYPE_BUG;
-
-    *ranges = PropertyList[ctype];
-    return 0;
-  }
-}
-
-#ifndef ENC_CP932
 OnigEncodingDefine(shift_jis, Shift_JIS) = {
   mbc_enc_len,
   "Shift_JIS",   /* name */
@@ -563,24 +47,21 @@ OnigEncodingDefine(shift_jis, Shift_JIS) = {
   get_ctype_code_range,
   left_adjust_char_head,
   is_allowed_reverse_match,
+  onigenc_ascii_only_case_map,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
-  onigenc_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 /*
  * Name: Shift_JIS
  * MIBenum: 17
  * Link: http://www.iana.org/assignments/character-sets
- * Link: http://ja.wikipedia.org/wiki/Shift_JIS
+ * Link: https://ja.wikipedia.org/wiki/Shift_JIS
  */
 
 /*
  * Name: MacJapanese
  * Link: http://unicode.org/Public/MAPPINGS/VENDORS/APPLE/JAPANESE.TXT
- * Link: http://ja.wikipedia.org/wiki/MacJapanese
+ * Link: https://ja.wikipedia.org/wiki/MacJapanese
  */
 ENC_REPLICATE("MacJapanese", "Shift_JIS")
 ENC_ALIAS("MacJapan", "MacJapanese")
-#endif
diff --git a/enc/shift_jis.h b/enc/shift_jis.h
new file mode 100644
index 0000000000..d552401595
--- /dev/null
+++ b/enc/shift_jis.h
@@ -0,0 +1,546 @@
+/**********************************************************************
+  shift_jis.h -  Onigmo (Oniguruma-mod) (regular expression library)
+**********************************************************************/
+/*-
+ * Copyright (c) 2002-2008  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * Copyright (c) 2011       K.Takata  <kentkt AT csc 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_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
+};
+
+static const OnigPairCaseFoldCodes CaseFoldMap[] = {
+  /* Fullwidth Alphabet */
+  { 0x8260, 0x8281 },
+  { 0x8261, 0x8282 },
+  { 0x8262, 0x8283 },
+  { 0x8263, 0x8284 },
+  { 0x8264, 0x8285 },
+  { 0x8265, 0x8286 },
+  { 0x8266, 0x8287 },
+  { 0x8267, 0x8288 },
+  { 0x8268, 0x8289 },
+  { 0x8269, 0x828a },
+  { 0x826a, 0x828b },
+  { 0x826b, 0x828c },
+  { 0x826c, 0x828d },
+  { 0x826d, 0x828e },
+  { 0x826e, 0x828f },
+  { 0x826f, 0x8290 },
+  { 0x8270, 0x8291 },
+  { 0x8271, 0x8292 },
+  { 0x8272, 0x8293 },
+  { 0x8273, 0x8294 },
+  { 0x8274, 0x8295 },
+  { 0x8275, 0x8296 },
+  { 0x8276, 0x8297 },
+  { 0x8277, 0x8298 },
+  { 0x8278, 0x8299 },
+  { 0x8279, 0x829a },
+
+  /* Greek */
+  { 0x839f, 0x83bf },
+  { 0x83a0, 0x83c0 },
+  { 0x83a1, 0x83c1 },
+  { 0x83a2, 0x83c2 },
+  { 0x83a3, 0x83c3 },
+  { 0x83a4, 0x83c4 },
+  { 0x83a5, 0x83c5 },
+  { 0x83a6, 0x83c6 },
+  { 0x83a7, 0x83c7 },
+  { 0x83a8, 0x83c8 },
+  { 0x83a9, 0x83c9 },
+  { 0x83aa, 0x83ca },
+  { 0x83ab, 0x83cb },
+  { 0x83ac, 0x83cc },
+  { 0x83ad, 0x83cd },
+  { 0x83ae, 0x83ce },
+  { 0x83af, 0x83cf },
+  { 0x83b0, 0x83d0 },
+  { 0x83b1, 0x83d1 },
+  { 0x83b2, 0x83d2 },
+  { 0x83b3, 0x83d3 },
+  { 0x83b4, 0x83d4 },
+  { 0x83b5, 0x83d5 },
+  { 0x83b6, 0x83d6 },
+
+  /* Cyrillic */
+  { 0x8440, 0x8470 },
+  { 0x8441, 0x8471 },
+  { 0x8442, 0x8472 },
+  { 0x8443, 0x8473 },
+  { 0x8444, 0x8474 },
+  { 0x8445, 0x8475 },
+  { 0x8446, 0x8476 },
+  { 0x8447, 0x8477 },
+  { 0x8448, 0x8478 },
+  { 0x8449, 0x8479 },
+  { 0x844a, 0x847a },
+  { 0x844b, 0x847b },
+  { 0x844c, 0x847c },
+  { 0x844d, 0x847d },
+  { 0x844e, 0x847e },
+  { 0x844f, 0x8480 },
+  { 0x8450, 0x8481 },
+  { 0x8451, 0x8482 },
+  { 0x8452, 0x8483 },
+  { 0x8453, 0x8484 },
+  { 0x8454, 0x8485 },
+  { 0x8455, 0x8486 },
+  { 0x8456, 0x8487 },
+  { 0x8457, 0x8488 },
+  { 0x8458, 0x8489 },
+  { 0x8459, 0x848a },
+  { 0x845a, 0x848b },
+  { 0x845b, 0x848c },
+  { 0x845c, 0x848d },
+  { 0x845d, 0x848e },
+  { 0x845e, 0x848f },
+  { 0x845f, 0x8490 },
+  { 0x8460, 0x8491 },
+};
+
+#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 ONIGERR_INVALID_CODE_POINT_VALUE;
+  }
+  else if (code <= 0xffff) {
+    int low = code & 0xff;
+    if (! SJIS_ISMB_TRAIL(low))
+      return ONIGERR_INVALID_CODE_POINT_VALUE;
+    return 2;
+  }
+  else
+    return ONIGERR_TOO_BIG_WIDE_CHAR_VALUE;
+}
+
+static OnigCodePoint
+mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc)
+{
+  int c, i, len;
+  OnigCodePoint n;
+
+  len = mbc_enc_len(p, end, enc);
+  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 (mbc_enc_len(buf, p, enc) != (p - buf))
+    return REGERR_INVALID_CODE_POINT_VALUE;
+#endif
+  return (int )(p - buf);
+}
+
+static int
+apply_all_case_fold(OnigCaseFoldType flag,
+		    OnigApplyAllCaseFoldFunc f, void* arg, OnigEncoding enc)
+{
+  return onigenc_apply_all_case_fold_with_map(
+            numberof(CaseFoldMap), CaseFoldMap, 0,
+            flag, f, arg);
+}
+
+static OnigCodePoint
+get_lower_case(OnigCodePoint code)
+{
+  if (ONIGENC_IS_IN_RANGE(code, 0x8260, 0x8279)) {
+    /* Fullwidth Alphabet */
+    return (OnigCodePoint )(code + 0x0021);
+  }
+  else if (ONIGENC_IS_IN_RANGE(code, 0x839f, 0x83b6)) {
+    /* Greek */
+    return (OnigCodePoint )(code + 0x0020);
+  }
+  else if (ONIGENC_IS_IN_RANGE(code, 0x8440, 0x8460)) {
+    /* Cyrillic */
+    int d = (code >= 0x844f) ? 1 : 0;
+    return (OnigCodePoint )(code + (0x0030 + d));
+  }
+  return code;
+}
+
+static OnigCodePoint
+get_upper_case(OnigCodePoint code)
+{
+  if (ONIGENC_IS_IN_RANGE(code, 0x8281, 0x829a)) {
+    /* Fullwidth Alphabet */
+    return (OnigCodePoint )(code - 0x0021);
+  }
+  else if (ONIGENC_IS_IN_RANGE(code, 0x83bf, 0x83d6)) {
+    /* Greek */
+    return (OnigCodePoint )(code - 0x0020);
+  }
+  else if (ONIGENC_IS_IN_RANGE(code, 0x8470, 0x847e) ||
+	   ONIGENC_IS_IN_RANGE(code, 0x8480, 0x8491)) {
+    /* Cyrillic */
+    int d = (code >= 0x8480) ? 1 : 0;
+    return (OnigCodePoint )(code - (0x0030 - d));
+  }
+  return code;
+}
+
+static int
+get_case_fold_codes_by_str(OnigCaseFoldType flag,
+			   const OnigUChar* p, const OnigUChar* end,
+			   OnigCaseFoldCodeItem items[], OnigEncoding enc)
+{
+  int len;
+  OnigCodePoint code, code_lo, code_up;
+
+  code = mbc_to_code(p, end, enc);
+  if (ONIGENC_IS_ASCII_CODE(code))
+    return onigenc_ascii_get_case_fold_codes_by_str(flag, p, end, items, enc);
+
+  len = mbc_enc_len(p, end, enc);
+  code_lo = get_lower_case(code);
+  code_up = get_upper_case(code);
+
+  if (code != code_lo) {
+    items[0].byte_len = len;
+    items[0].code_len = 1;
+    items[0].code[0] = code_lo;
+    return 1;
+  }
+  else if (code != code_up) {
+    items[0].byte_len = len;
+    items[0].code_len = 1;
+    items[0].code[0] = code_up;
+    return 1;
+  }
+
+  return 0;
+}
+
+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 {
+    OnigCodePoint code;
+    int len;
+
+    code = get_lower_case(mbc_to_code(p, end, enc));
+    len = code_to_mbc(code, lower, enc);
+    (*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, const UChar* end, 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 = mbc_enc_len(p, end, enc);
+  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 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 */
+
+#ifdef ENC_CP932
+static const OnigCodePoint CR_Han[] = {
+  6,
+  0x8157, 0x8157,
+  0x889f, 0x9872,	/* Kanji level 1 */
+  0x989f, 0x9ffc,	/* Kanji level 2 */
+  0xe040, 0xeaa4,	/* Kanji level 2 */
+  0xed40, 0xeeec,	/* NEC-selected IBM extended characters (without symbols) */
+  0xfa5c, 0xfc4b,	/* IBM extended characters (without symbols) */
+}; /* CR_Han */
+#else
+static const OnigCodePoint CR_Han[] = {
+  4,
+  0x8157, 0x8157,
+  0x889f, 0x9872,	/* Kanji level 1 */
+  0x989f, 0x9ffc,	/* Kanji level 2 */
+  0xe040, 0xeaa4,	/* Kanji level 2 */
+}; /* CR_Han */
+#endif
+
+static const OnigCodePoint CR_Latin[] = {
+  4,
+  0x0041, 0x005a,
+  0x0061, 0x007a,
+  0x8260, 0x8279,
+  0x8281, 0x829a,
+}; /* CR_Latin */
+
+static const OnigCodePoint CR_Greek[] = {
+  2,
+  0x839f, 0x83b6,
+  0x83bf, 0x83d6,
+}; /* CR_Greek */
+
+static const OnigCodePoint CR_Cyrillic[] = {
+  3,
+  0x8440, 0x8460,
+  0x8470, 0x847f,
+  0x8480, 0x8491,
+}; /* CR_Cyrillic */
+
+#include "enc/jis/props.h"
+
+static int
+property_name_to_ctype(OnigEncoding enc, const UChar* p, const UChar* end)
+{
+  const UChar *s = p, *e = end;
+  const struct enc_property *prop =
+    onig_jis_property((const char* )s, (unsigned int )(e - s));
+
+  if (!prop) {
+    return onigenc_minimum_property_name_to_ctype(enc, s, e);
+  }
+
+  return (int )prop->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 {
+    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;
+
+    ctype -= (ONIGENC_MAX_STD_CTYPE + 1);
+    if (ctype >= (OnigCtype )PropertyListNum)
+      return ONIGERR_TYPE_BUG;
+
+    *ranges = PropertyList[ctype];
+    return 0;
+  }
+}
diff --git a/enc/trans/GB/GB12345%UCS.src b/enc/trans/GB/GB12345%UCS.src
index 0b4115bed9..9f1daad751 100644
--- a/enc/trans/GB/GB12345%UCS.src
+++ b/enc/trans/GB/GB12345%UCS.src
@@ -9,62 +9,11 @@ DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
-# This mapping data is made from the mapping data provided by Unicode, Inc.
-# Original notice:
-#
-#	Name:             GB12345-80 to Unicode table (complete, hex format)
-#	Unicode version:  1.1
-#	Table version:    0.0d1
-#	Table format:     Format A
-#	Date:             6 December 1993
-#	Author:           Glenn Adams <glenn@metis.com>
-#                     John H. Jenkins <John_Jenkins@taligent.com>
-#
-#	Copyright (c) 1991-1994 Unicode, Inc.  All Rights reserved.
-#
-#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-#	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 provided on magnetic media by Unicode, Inc., the sole
-#	remedy for any claim will be exchange of defective media within 90
-#	days of receipt.
-#
-#	Recipient is granted the right to make copies in any form for
-#	internal distribution and to freely use the information supplied
-#	in the creation of products supporting Unicode.  Unicode, Inc.
-#	specifically excludes the right to re-distribute this file directly
-#	to third parties or other organizations whether for profit or not.
-#
-#	General notes:
-#
-#	This table contains the data Metis and Taligent currently have on how
-#       GB12345-90 characters map into Unicode.
-#
-#	Format:  Three tab-separated columns
-#		 Column #1 is the GB12345 code (in hex as 0xXXXX)
-#		 Column #2 is the Unicode (in hex as 0xXXXX)
-#		 Column #3 the Unicode name (follows a comment sign, '#')
-#					The official names for Unicode characters U+4E00
-#					to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
-#					where XXXX is the code point.  Including all these
-#					names in this file increases its size substantially
-#					and needlessly.  The token "<CJK>" is used for the
-#					name of these characters.  If necessary, it can be
-#					expanded algorithmically by a parser or editor.
-#
-#	The entries are in GB12345 order
-#
-#	The following algorithms can be used to change the hex form
-#		of GB12345 to other standard forms:
-#
-#		To change hex to EUC form, add 0x8080
-#		To change hex to kuten form, first subtract 0x2020.  Then
-#			the high and low bytes correspond to the ku and ten of
-#			the kuten form.  For example, 0x2121 -> 0x0101 -> 0101;
-#			0x777E -> 0x575E -> 8794
-#
-#	Any comments or problems, contact <John_Jenkins@taligent.com>
+# The mapping data below was created from a file provided by Unicode, Inc.
+# (The Unicode Consortium). The file was used to create a product supporting
+# Unicode, as explicitly permitted in the file's copyright notice. Please note
+# that Unicode, Inc. never made any claims as to fitness of that file for any
+# particular purpose, and has ceased to publish the file many years ago.
 #
 #
 0x2121 = 0x3000
diff --git a/enc/trans/GB/GB2312%UCS.src b/enc/trans/GB/GB2312%UCS.src
index d196bab535..dc222203fd 100644
--- a/enc/trans/GB/GB2312%UCS.src
+++ b/enc/trans/GB/GB2312%UCS.src
@@ -9,76 +9,11 @@ DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
-# This mapping data is made from the mapping data provided by Unicode, Inc.
-# Original notice:
-#
-#	Name:             GB2312-80 to Unicode table (complete, hex format)
-#	Unicode version:  3.0
-#	Table version:    1.0
-#	Table format:     Format A
-#	Date:             1999 October 8
-#
-#	Copyright (c) 1991-1999 Unicode, Inc.  All Rights reserved.
-#
-#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-#	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 provided on optical media by Unicode, Inc., the sole
-#	remedy for any claim will be exchange of defective media within 90
-#	days of receipt.
-#
-#	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.
-#
-#	General notes:
-#
-#
-# This table contains one set of mappings from GB2312-80 into Unicode.
-# Note that these data are *possible* mappings only and may not be the
-# same as those used by actual products, nor may they be the best suited
-# for all uses.  For more information on the mappings between various code
-# pages incorporating the repertoire of GB2312-80 and Unicode, consult the
-# VENDORS mapping data.  Normative information on the mapping between
-# GB2312-80 and Unicode may be found in the Unihan.txt file in the
-# latest Unicode Character Database.
-#
-# If you have carefully considered the fact that the mappings in
-# this table are only one possible set of mappings between GB2312-80 and
-# Unicode and have no normative status, but still feel that you
-# have located an error in the table that requires fixing, you may
-# report any such error to errata@unicode.org.
-#
-#
-#	Format:  Three tab-separated columns
-#		 Column #1 is the GB2312 code (in hex as 0xXXXX)
-#		 Column #2 is the Unicode (in hex as 0xXXXX)
-#		 Column #3 the Unicode name (follows a comment sign, '#')
-#			The official names for Unicode characters U+4E00
-#			to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
-#			where XXXX is the code point.  Including all these
-#			names in this file increases its size substantially
-#			and needlessly.  The token "<CJK>" is used for the
-#			name of these characters.  If necessary, it can be
-#			expanded algorithmically by a parser or editor.
-#
-#	The entries are in GB2312 order
-#
-#	The following algorithms can be used to change the hex form
-#		of GB2312 to other standard forms:
-#
-#		To change hex to EUC form, add 0x8080
-#		To change hex to kuten form, first subtract 0x2020.  Then
-#			the high and low bytes correspond to the ku and ten of
-#			the kuten form.  For example, 0x2121 -> 0x0101 -> 0101;
-#			0x777E -> 0x575E -> 8794
-#
-#	Version history
-#	1.0 version updates 0.0d2 version by correcting mapping for 0x212C
-#             from U+2225 to U+2016.
+# The mapping data below was created from a file provided by Unicode, Inc.
+# (The Unicode Consortium). The file was used to create a product supporting
+# Unicode, as explicitly permitted in the file's copyright notice. Please note
+# that Unicode, Inc. never made any claims as to fitness of that file for any
+# particular purpose, and has ceased to publish the file many years ago.
 #
 #
 
diff --git a/enc/trans/GB/UCS%GB12345.src b/enc/trans/GB/UCS%GB12345.src
index 8ec8318438..a876bdaca8 100644
--- a/enc/trans/GB/UCS%GB12345.src
+++ b/enc/trans/GB/UCS%GB12345.src
@@ -9,62 +9,11 @@ DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
-# This mapping data is made from the mapping data provided by Unicode, Inc.
-# Original notice:
-#
-#	Name:             GB12345-80 to Unicode table (complete, hex format)
-#	Unicode version:  1.1
-#	Table version:    0.0d1
-#	Table format:     Format A
-#	Date:             6 December 1993
-#	Author:           Glenn Adams <glenn@metis.com>
-#                     John H. Jenkins <John_Jenkins@taligent.com>
-#
-#	Copyright (c) 1991-1994 Unicode, Inc.  All Rights reserved.
-#
-#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-#	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 provided on magnetic media by Unicode, Inc., the sole
-#	remedy for any claim will be exchange of defective media within 90
-#	days of receipt.
-#
-#	Recipient is granted the right to make copies in any form for
-#	internal distribution and to freely use the information supplied
-#	in the creation of products supporting Unicode.  Unicode, Inc.
-#	specifically excludes the right to re-distribute this file directly
-#	to third parties or other organizations whether for profit or not.
-#
-#	General notes:
-#
-#	This table contains the data Metis and Taligent currently have on how
-#       GB12345-90 characters map into Unicode.
-#
-#	Format:  Three tab-separated columns
-#		 Column #1 is the GB12345 code (in hex as 0xXXXX)
-#		 Column #2 is the Unicode (in hex as 0xXXXX)
-#		 Column #3 the Unicode name (follows a comment sign, '#')
-#					The official names for Unicode characters U+4E00
-#					to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
-#					where XXXX is the code point.  Including all these
-#					names in this file increases its size substantially
-#					and needlessly.  The token "<CJK>" is used for the
-#					name of these characters.  If necessary, it can be
-#					expanded algorithmically by a parser or editor.
-#
-#	The entries are in GB12345 order
-#
-#	The following algorithms can be used to change the hex form
-#		of GB12345 to other standard forms:
-#
-#		To change hex to EUC form, add 0x8080
-#		To change hex to kuten form, first subtract 0x2020.  Then
-#			the high and low bytes correspond to the ku and ten of
-#			the kuten form.  For example, 0x2121 -> 0x0101 -> 0101;
-#			0x777E -> 0x575E -> 8794
-#
-#	Any comments or problems, contact <John_Jenkins@taligent.com>
+# The mapping data below was created from a file provided by Unicode, Inc.
+# (The Unicode Consortium). The file was used to create a product supporting
+# Unicode, as explicitly permitted in the file's copyright notice. Please note
+# that Unicode, Inc. never made any claims as to fitness of that file for any
+# particular purpose, and has ceased to publish the file many years ago.
 #
 #
 0x00A4 = 0x2168
diff --git a/enc/trans/GB/UCS%GB2312.src b/enc/trans/GB/UCS%GB2312.src
index 3293fea604..4f4d52a54a 100644
--- a/enc/trans/GB/UCS%GB2312.src
+++ b/enc/trans/GB/UCS%GB2312.src
@@ -9,76 +9,11 @@ DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
-# This mapping data is made from the mapping data provided by Unicode, Inc.
-# Original notice:
-#
-#	Name:             GB2312-80 to Unicode table (complete, hex format)
-#	Unicode version:  3.0
-#	Table version:    1.0
-#	Table format:     Format A
-#	Date:             1999 October 8
-#
-#	Copyright (c) 1991-1999 Unicode, Inc.  All Rights reserved.
-#
-#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-#	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 provided on optical media by Unicode, Inc., the sole
-#	remedy for any claim will be exchange of defective media within 90
-#	days of receipt.
-#
-#	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.
-#
-#	General notes:
-#
-#
-# This table contains one set of mappings from GB2312-80 into Unicode.
-# Note that these data are *possible* mappings only and may not be the
-# same as those used by actual products, nor may they be the best suited
-# for all uses.  For more information on the mappings between various code
-# pages incorporating the repertoire of GB2312-80 and Unicode, consult the
-# VENDORS mapping data.  Normative information on the mapping between
-# GB2312-80 and Unicode may be found in the Unihan.txt file in the
-# latest Unicode Character Database.
-#
-# If you have carefully considered the fact that the mappings in
-# this table are only one possible set of mappings between GB2312-80 and
-# Unicode and have no normative status, but still feel that you
-# have located an error in the table that requires fixing, you may
-# report any such error to errata@unicode.org.
-#
-#
-#	Format:  Three tab-separated columns
-#		 Column #1 is the GB2312 code (in hex as 0xXXXX)
-#		 Column #2 is the Unicode (in hex as 0xXXXX)
-#		 Column #3 the Unicode name (follows a comment sign, '#')
-#			The official names for Unicode characters U+4E00
-#			to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
-#			where XXXX is the code point.  Including all these
-#			names in this file increases its size substantially
-#			and needlessly.  The token "<CJK>" is used for the
-#			name of these characters.  If necessary, it can be
-#			expanded algorithmically by a parser or editor.
-#
-#	The entries are in GB2312 order
-#
-#	The following algorithms can be used to change the hex form
-#		of GB2312 to other standard forms:
-#
-#		To change hex to EUC form, add 0x8080
-#		To change hex to kuten form, first subtract 0x2020.  Then
-#			the high and low bytes correspond to the ku and ten of
-#			the kuten form.  For example, 0x2121 -> 0x0101 -> 0101;
-#			0x777E -> 0x575E -> 8794
-#
-#	Version history
-#	1.0 version updates 0.0d2 version by correcting mapping for 0x212C
-#             from U+2225 to U+2016.
+# The mapping data below was created from a file provided by Unicode, Inc.
+# (The Unicode Consortium). The file was used to create a product supporting
+# Unicode, as explicitly permitted in the file's copyright notice. Please note
+# that Unicode, Inc. never made any claims as to fitness of that file for any
+# particular purpose, and has ceased to publish the file many years ago.
 #
 #
 0x00A4 = 0x2168
diff --git a/enc/trans/JIS/JISX0212%UCS.src b/enc/trans/JIS/JISX0212%UCS.src
index aa51257b99..0e1ab4c9b9 100644
--- a/enc/trans/JIS/JISX0212%UCS.src
+++ b/enc/trans/JIS/JISX0212%UCS.src
@@ -67,7 +67,7 @@ BEGIN_MAP
 #
 #	   However, JIS X 0212 maintains the distinction between
 #	   the lowercase forms of these two elements at 0x2942 and 0x2943.
-#	   Given the structre of these JIS encodings, it is clear that
+#	   Given the structure of these JIS encodings, it is clear that
 #	   0x2922 and 0x2942 are intended to be a capital/small pair.
 #	   Consequently, in the Unicode mapping, 0x2922 is treated as
 #	   LATIN CAPITAL LETTER D WITH STROKE.
diff --git a/enc/trans/JIS/UCS%JISX0212.src b/enc/trans/JIS/UCS%JISX0212.src
index 65383a1c9f..c7711c8ac0 100644
--- a/enc/trans/JIS/UCS%JISX0212.src
+++ b/enc/trans/JIS/UCS%JISX0212.src
@@ -67,7 +67,7 @@ BEGIN_MAP
 #
 #	   However, JIS X 0212 maintains the distinction between
 #	   the lowercase forms of these two elements at 0x2942 and 0x2943.
-#	   Given the structre of these JIS encodings, it is clear that
+#	   Given the structure of these JIS encodings, it is clear that
 #	   0x2922 and 0x2942 are intended to be a capital/small pair.
 #	   Consequently, in the Unicode mapping, 0x2922 is treated as
 #	   LATIN CAPITAL LETTER D WITH STROKE.
diff --git a/enc/trans/cesu_8.trans b/enc/trans/cesu_8.trans
new file mode 100644
index 0000000000..4e17b1ddbb
--- /dev/null
+++ b/enc/trans/cesu_8.trans
@@ -0,0 +1,85 @@
+#include "transcode_data.h"
+
+<%
+  map = {}
+  map["{00-7f}"] = :nomap
+  map["{c2-df}{80-bf}"] = :nomap
+  map["e0{a0-bf}{80-bf}"] = :nomap
+  map["{e1-ec}{80-bf}{80-bf}"] = :nomap
+  map["ed{80-9f}{80-bf}"] = :nomap
+  map["{ee-ef}{80-bf}{80-bf}"] = :nomap
+  map["ed{a0-af}{80-bf}ed{b0-bf}{80-bf}"] = :func_so # surrogate pairs
+  transcode_generate_node(ActionMap.parse(map), "from_CESU_8")
+
+  map = {}
+  map["{00-7f}"] = :nomap
+  map["{c2-df}{80-bf}"] = :nomap
+  map["e0{a0-bf}{80-bf}"] = :nomap
+  map["{e1-ec}{80-bf}{80-bf}"] = :nomap
+  map["ed{80-9f}{80-bf}"] = :nomap
+  map["{ee-ef}{80-bf}{80-bf}"] = :nomap
+  map["f0{90-bf}{80-bf}{80-bf}"] = :func_so      # planes 1-3
+  map["{f1-f3}{80-bf}{80-bf}{80-bf}"] = :func_so # planes 4-15
+  map["f4{80-8f}{80-bf}{80-bf}"] = :func_so      # plane 16
+  transcode_generate_node(ActionMap.parse(map), "to_CESU_8")
+%>
+
+<%= transcode_generated_code %>
+
+static ssize_t
+fun_so_from_cesu_8(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
+{
+    unsigned int scalar = ( ((s[1]&0x0F)<<16) | ((s[2]&0x3F)<<10)
+                          | ((s[4]&0x0F)<< 6) |  (s[5]&0x3F)
+                          ) + 0x10000;
+    o[0] = 0xF0 |  (scalar>>18);
+    o[1] = 0x80 | ((scalar>>12)&0x3F);
+    o[2] = 0x80 | ((scalar>> 6)&0x3F);
+    o[3] = 0x80 | ( scalar     &0x3F);
+    return 4;
+}
+
+static ssize_t
+fun_so_to_cesu_8(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
+{
+    unsigned int scalar = ((s[0]&0x07)<<18) | ((s[1]&0x3F)<<12)
+                        | ((s[2]&0x3F)<< 6) |  (s[3]&0x3F);
+    scalar -= 0x10000;
+    o[0] = 0xED;
+    o[1] = 0xA0 |  (scalar>>16);
+    o[2] = 0x80 | ((scalar>>10)&0x3F);
+    o[3] = 0xED;
+    o[4] = 0xB0 | ((scalar>> 6)&0x0F);
+    o[5] = 0x80 | (scalar      &0x3F);
+    return 6;
+}
+
+static const rb_transcoder
+rb_from_CESU_8 = {
+    "CESU-8", "UTF-8", from_CESU_8,
+    TRANSCODE_TABLE_INFO,
+    1, /* input_unit_length */
+    6, /* max_input */
+    4, /* max_output */
+    asciicompat_decoder, /* asciicompat_type */
+    0, NULL, NULL, /* state_size, state_init, state_fini */
+    NULL, NULL, NULL, fun_so_from_cesu_8
+};
+
+static const rb_transcoder
+rb_to_CESU_8 = {
+    "UTF-8", "CESU-8", to_CESU_8,
+    TRANSCODE_TABLE_INFO,
+    1, /* input_unit_length */
+    4, /* max_input */
+    6, /* max_output */
+    asciicompat_encoder, /* asciicompat_type */
+    0, NULL, NULL, /* state_size, state_init, state_fini */
+    NULL, NULL, NULL, fun_so_to_cesu_8
+};
+
+TRANS_INIT(cesu_8)
+{
+    rb_register_transcoder(&rb_from_CESU_8);
+    rb_register_transcoder(&rb_to_CESU_8);
+}
diff --git a/enc/trans/escape.trans b/enc/trans/escape.trans
index c76ffa0e06..36d9dd0f13 100644
--- a/enc/trans/escape.trans
+++ b/enc/trans/escape.trans
@@ -18,9 +18,10 @@
   ], nil)
 
   transcode_tblgen("", "xml_attr_content_escape", [
-    ["{00-21,23-25,27-3B,3D,3F-FF}", :nomap],
+    ["{00-21,23-25,28-3B,3D,3F-FF}", :nomap],
     ["22", hexstr("&quot;")],
     ["26", hexstr("&amp;")],
+    ["27", hexstr("&apos;")],
     ["3C", hexstr("&lt;")],
     ["3E", hexstr("&gt;")]
   ], nil)
diff --git a/enc/trans/ibm720-tbl.rb b/enc/trans/ibm720-tbl.rb
new file mode 100644
index 0000000000..558684d649
--- /dev/null
+++ b/enc/trans/ibm720-tbl.rb
@@ -0,0 +1,122 @@
+IBM720_TO_UCS_TBL = [
+  ["FF",0xA0],
+  ["9C",0xA3],
+  ["94",0xA4],
+  ["AE",0xAB],
+  ["F8",0xB0],
+  ["FD",0xB2],
+  ["E6",0xB5],
+  ["FA",0xB7],
+  ["AF",0xBB],
+  ["85",0xE0],
+  ["83",0xE2],
+  ["87",0xE7],
+  ["8A",0xE8],
+  ["82",0xE9],
+  ["88",0xEA],
+  ["89",0xEB],
+  ["8C",0xEE],
+  ["8B",0xEF],
+  ["93",0xF4],
+  ["97",0xF9],
+  ["96",0xFB],
+  ["98",0x621],
+  ["99",0x622],
+  ["9A",0x623],
+  ["9B",0x624],
+  ["9D",0x625],
+  ["9E",0x626],
+  ["9F",0x627],
+  ["A0",0x628],
+  ["A1",0x629],
+  ["A2",0x62A],
+  ["A3",0x62B],
+  ["A4",0x62C],
+  ["A5",0x62D],
+  ["A6",0x62E],
+  ["A7",0x62F],
+  ["A8",0x630],
+  ["A9",0x631],
+  ["AA",0x632],
+  ["AB",0x633],
+  ["AC",0x634],
+  ["AD",0x635],
+  ["E0",0x636],
+  ["E1",0x637],
+  ["E2",0x638],
+  ["E3",0x639],
+  ["E4",0x63A],
+  ["95",0x640],
+  ["E5",0x641],
+  ["E7",0x642],
+  ["E8",0x643],
+  ["E9",0x644],
+  ["EA",0x645],
+  ["EB",0x646],
+  ["EC",0x647],
+  ["ED",0x648],
+  ["EE",0x649],
+  ["EF",0x64A],
+  ["F1",0x64B],
+  ["F2",0x64C],
+  ["F3",0x64D],
+  ["F4",0x64E],
+  ["F5",0x64F],
+  ["F6",0x650],
+  ["91",0x651],
+  ["92",0x652],
+  ["FC",0x207F],
+  ["F9",0x2219],
+  ["FB",0x221A],
+  ["F7",0x2248],
+  ["F0",0x2261],
+  ["C4",0x2500],
+  ["B3",0x2502],
+  ["DA",0x250C],
+  ["BF",0x2510],
+  ["C0",0x2514],
+  ["D9",0x2518],
+  ["C3",0x251C],
+  ["B4",0x2524],
+  ["C2",0x252C],
+  ["C1",0x2534],
+  ["C5",0x253C],
+  ["CD",0x2550],
+  ["BA",0x2551],
+  ["D5",0x2552],
+  ["D6",0x2553],
+  ["C9",0x2554],
+  ["B8",0x2555],
+  ["B7",0x2556],
+  ["BB",0x2557],
+  ["D4",0x2558],
+  ["D3",0x2559],
+  ["C8",0x255A],
+  ["BE",0x255B],
+  ["BD",0x255C],
+  ["BC",0x255D],
+  ["C6",0x255E],
+  ["C7",0x255F],
+  ["CC",0x2560],
+  ["B5",0x2561],
+  ["B6",0x2562],
+  ["B9",0x2563],
+  ["D1",0x2564],
+  ["D2",0x2565],
+  ["CB",0x2566],
+  ["CF",0x2567],
+  ["D0",0x2568],
+  ["CA",0x2569],
+  ["D8",0x256A],
+  ["D7",0x256B],
+  ["CE",0x256C],
+  ["DF",0x2580],
+  ["DC",0x2584],
+  ["DB",0x2588],
+  ["DD",0x258C],
+  ["DE",0x2590],
+  ["B0",0x2591],
+  ["B1",0x2592],
+  ["B2",0x2593],
+  ["FE",0x25A0],
+]
diff --git a/enc/trans/newline.trans b/enc/trans/newline.trans
index a200ec00a7..9e763407f9 100644
--- a/enc/trans/newline.trans
+++ b/enc/trans/newline.trans
@@ -98,7 +98,7 @@ rb_universal_newline = {
     2, /* max_output */
     asciicompat_converter, /* asciicompat_type */
     2, universal_newline_init, universal_newline_init, /* state_size, state_init, state_fini */
-    NULL, NULL, NULL, fun_so_universal_newline,
+    0, 0, 0, fun_so_universal_newline,
     universal_newline_finish
 };
 
@@ -110,8 +110,8 @@ rb_crlf_newline = {
     1, /* max_input */
     2, /* max_output */
     asciicompat_converter, /* asciicompat_type */
-    0, NULL, NULL, /* state_size, state_init, state_fini */
-    NULL, NULL, NULL, NULL
+    0, 0, 0, /* state_size, state_init, state_fini */
+    0, 0, 0, 0
 };
 
 static const rb_transcoder
@@ -122,8 +122,8 @@ rb_cr_newline = {
     1, /* max_input */
     1, /* max_output */
     asciicompat_converter, /* asciicompat_type */
-    0, NULL, NULL, /* state_size, state_init, state_fini */
-    NULL, NULL, NULL, NULL
+    0, 0, 0, /* state_size, state_init, state_fini */
+    0, 0, 0, 0
 };
 
 void
diff --git a/enc/trans/single_byte.trans b/enc/trans/single_byte.trans
index 50f568cb94..0d5407b918 100644
--- a/enc/trans/single_byte.trans
+++ b/enc/trans/single_byte.trans
@@ -18,15 +18,12 @@
   #   file name: lower case, hyphens, -tbl.rb suffix (e.g. iso-8859-3-tbl.rb)
   #   variable name: UPPER case, underscores, _TO_UCS_TBL suffix (e.g. ISO_8859_3_TO_UCS_TBL)
   # If the name starts with "ISO-8859", the C1 control code area is added automatically.
-  def transcode_tblgen_singlebyte (name)
+  def transcode_tblgen_singlebyte(name)
     require(name.downcase + "-tbl")
     control1_if_needed = (name =~ /^ISO-8859/) ? CONTROL1_TO_UCS_TBL : []
     tbl_to_ucs = control1_if_needed + eval(name.gsub(/-/, '_') + "_TO_UCS_TBL")
-    code = ''
-    code << transcode_tblgen(name, "UTF-8", [["{00-7f}", :nomap], *tbl_to_ucs.reject {|a, b| a.length != 2 }], '{00-ff}')
-    code << "\n"
-    code << transcode_tblgen("UTF-8", name, [["{00-7f}", :nomap], *tbl_to_ucs.map {|a,b| [b,a] }])
-    code
+    transcode_tblgen(name, "UTF-8", [["{00-7f}", :nomap], *tbl_to_ucs.reject {|a, b| a.length != 2 }], '{00-ff}')
+    transcode_tblgen("UTF-8", name, [["{00-7f}", :nomap], *tbl_to_ucs.map {|a,b| [b,a] }])
   end
 
   transcode_tblgen_singlebyte "ISO-8859-1"
@@ -54,8 +51,9 @@
   transcode_tblgen_singlebyte "WINDOWS-1256"
   transcode_tblgen_singlebyte "WINDOWS-1257"
   transcode_tblgen_singlebyte "IBM437"
-  transcode_tblgen_singlebyte "IBM775"
+  transcode_tblgen_singlebyte "IBM720"
   transcode_tblgen_singlebyte "IBM737"
+  transcode_tblgen_singlebyte "IBM775"
   transcode_tblgen_singlebyte "IBM852"
   transcode_tblgen_singlebyte "IBM855"
   transcode_tblgen_singlebyte "IBM857"
diff --git a/enc/trans/windows-1255-tbl.rb b/enc/trans/windows-1255-tbl.rb
index 9084a56a10..4d4cafe0d8 100644
--- a/enc/trans/windows-1255-tbl.rb
+++ b/enc/trans/windows-1255-tbl.rb
@@ -43,6 +43,7 @@ WINDOWS_1255_TO_UCS_TBL = [
   ["C7",0x5B7],
   ["C8",0x5B8],
   ["C9",0x5B9],
+  ["CA",0x5BA],
   ["CB",0x5BB],
   ["CC",0x5BC],
   ["CD",0x5BD],
@@ -138,4 +139,4 @@ WINDOWS_1255_TO_UCS_TBL = [
   ["E1CF",0xFB4C],
   ["EBCF",0xFB4D],
   ["F4CF",0xFB4E],
-]
\ No newline at end of file
+]
diff --git a/enc/unicode.c b/enc/unicode.c
index 39d1e7a31f..18fba02476 100644
--- a/enc/unicode.c
+++ b/enc/unicode.c
@@ -137,20 +137,19 @@ code3_equal(const OnigCodePoint *x, const OnigCodePoint *y)
   return 1;
 }
 
-#ifdef ONIG_CASE_MAPPING
 /* macros related to ONIGENC_CASE flags */
 /* defined here because not used in other files */
-#define ONIGENC_CASE_SPECIALS       (ONIGENC_CASE_TITLECASE|ONIGENC_CASE_IS_TITLECASE|ONIGENC_CASE_UP_SPECIAL|ONIGENC_CASE_DOWN_SPECIAL)
+#define ONIGENC_CASE_SPECIALS       (ONIGENC_CASE_TITLECASE | ONIGENC_CASE_IS_TITLECASE | ONIGENC_CASE_UP_SPECIAL | ONIGENC_CASE_DOWN_SPECIAL)
 
 /* macros for length in CaseMappingSpecials array in enc/unicode/casefold.h */
 #define SpecialsLengthOffset 25  /* needs to be higher than the 22 bits used for Unicode codepoints */
-#define SpecialsLengthExtract(n)    ((n)>>SpecialsLengthOffset)
-#define SpecialsCodepointExtract(n) ((n)&((1<<SpecialsLengthOffset)-1))
-#define SpecialsLengthEncode(n)     ((n)<<SpecialsLengthOffset)
+#define SpecialsLengthExtract(n)    ((n) >> SpecialsLengthOffset)
+#define SpecialsCodepointExtract(n) ((n) & ((1 << SpecialsLengthOffset) - 1))
+#define SpecialsLengthEncode(n)     ((n) << SpecialsLengthOffset)
 
-#define OnigSpecialIndexMask        (((1<<OnigSpecialIndexWidth)-1)<<OnigSpecialIndexShift)
-#define OnigSpecialIndexEncode(n)   ((n)<<OnigSpecialIndexShift)
-#define OnigSpecialIndexDecode(n)   (((n)&OnigSpecialIndexMask)>>OnigSpecialIndexShift)
+#define OnigSpecialIndexMask        (((1 << OnigSpecialIndexWidth) - 1) << OnigSpecialIndexShift)
+#define OnigSpecialIndexEncode(n)   ((n) << OnigSpecialIndexShift)
+#define OnigSpecialIndexDecode(n)   (((n) & OnigSpecialIndexMask) >> OnigSpecialIndexShift)
 
 /* macros to shorten "enc/unicode/casefold.h", undefined immediately after including the file */
 #define U ONIGENC_CASE_UPCASE
@@ -162,11 +161,9 @@ code3_equal(const OnigCodePoint *x, const OnigCodePoint *y)
 #define IT ONIGENC_CASE_IS_TITLECASE
 #define I(n) OnigSpecialIndexEncode(n)
 #define L(n) SpecialsLengthEncode(n)
-#endif   /* ONIG_CASE_MAPPING */
 
-#include "enc/unicode/casefold.h"
+#include "casefold.h"
 
-#ifdef ONIG_CASE_MAPPING
 #undef U
 #undef D
 #undef F
@@ -176,9 +173,8 @@ code3_equal(const OnigCodePoint *x, const OnigCodePoint *y)
 #undef IT
 #undef I
 #undef L
-#endif   /* ONIG_CASE_MAPPING */
 
-#include "enc/unicode/name2ctype.h"
+#include "name2ctype.h"
 
 #define CODE_RANGES_NUM numberof(CodeRanges)
 
@@ -497,6 +493,10 @@ onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
 #endif
 
   if ((to = onigenc_unicode_fold_lookup(code)) != 0) {
+    if (OnigCodePointCount(to->n) == 0) {
+      /* any codepoint should not be empty */
+      UNREACHABLE_RETURN(0);
+    }
     if (OnigCodePointCount(to->n) == 1) {
       OnigCodePoint orig_code = code;
 
@@ -655,8 +655,6 @@ onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
   return n;
 }
 
-#ifdef ONIG_CASE_MAPPING
-
 /* length in bytes for three characters in UTF-32; e.g. needed for ffi (U+FB03) */
 #define CASE_MAPPING_SLACK 12
 #define MODIFIED (flags |= ONIGENC_CASE_MODIFIED)
@@ -666,137 +664,157 @@ onigenc_unicode_case_map(OnigCaseFoldType* flagP,
     OnigUChar* to, OnigUChar* to_end,
     const struct OnigEncodingTypeST* enc)
 {
-    OnigCodePoint code;
-    OnigUChar *to_start = to;
-    OnigCaseFoldType flags = *flagP;
-    int codepoint_length;
-
-    to_end -= CASE_MAPPING_SLACK;
-    /* copy flags ONIGENC_CASE_UPCASE     and ONIGENC_CASE_DOWNCASE over to
-     *            ONIGENC_CASE_UP_SPECIAL and ONIGENC_CASE_DOWN_SPECIAL */
-    flags |= (flags&(ONIGENC_CASE_UPCASE|ONIGENC_CASE_DOWNCASE))<<ONIGENC_CASE_SPECIAL_OFFSET;
-
-    while (*pp<end && to<=to_end) {
-	codepoint_length = ONIGENC_PRECISE_MBC_ENC_LEN(enc, *pp, end);
-	if (codepoint_length < 0)
-	    return codepoint_length; /* encoding invalid */
-	code = ONIGENC_MBC_TO_CODE(enc, *pp, end);
-	*pp += codepoint_length;
-
-	if (code<='z') { /* ASCII comes first */
-	    if (code>='a' && code<='z') {
-	        if (flags&ONIGENC_CASE_UPCASE) {
-		    MODIFIED;
-		    if (flags&ONIGENC_CASE_FOLD_TURKISH_AZERI && code=='i')
-			code = I_WITH_DOT_ABOVE;
-		    else
-			code += 'A'-'a';
-		}
-	    }
-	    else if (code>='A' && code<='Z') {
-		if (flags&(ONIGENC_CASE_DOWNCASE|ONIGENC_CASE_FOLD)) {
-		    MODIFIED;
-		    if (flags&ONIGENC_CASE_FOLD_TURKISH_AZERI && code=='I')
-			code = DOTLESS_i;
-		    else
-			code += 'a'-'A';
-		}
-	    }
+  OnigCodePoint code;
+  OnigUChar *to_start = to;
+  OnigCaseFoldType flags = *flagP;
+  int codepoint_length;
+
+  to_end -= CASE_MAPPING_SLACK;
+  /* copy flags ONIGENC_CASE_UPCASE     and ONIGENC_CASE_DOWNCASE over to
+   *            ONIGENC_CASE_UP_SPECIAL and ONIGENC_CASE_DOWN_SPECIAL */
+  flags |= (flags & (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE)) << ONIGENC_CASE_SPECIAL_OFFSET;
+
+  while (*pp < end && to <= to_end) {
+    codepoint_length = ONIGENC_PRECISE_MBC_ENC_LEN(enc, *pp, end);
+    if (codepoint_length < 0)
+      return codepoint_length; /* encoding invalid */
+    code = ONIGENC_MBC_TO_CODE(enc, *pp, end);
+    *pp += codepoint_length;
+
+    if (code <= 'z') { /* ASCII comes first */
+      if (code >= 'a' && code <= 'z') {
+	if (flags & ONIGENC_CASE_UPCASE) {
+	  MODIFIED;
+	  if (flags & ONIGENC_CASE_FOLD_TURKISH_AZERI && code == 'i')
+	    code = I_WITH_DOT_ABOVE;
+          else {
+            code -= 'a';
+            code += 'A';
+          }
 	}
-	else if (!(flags&ONIGENC_CASE_ASCII_ONLY) && code>=0x00B5) { /* deal with non-ASCII; micron sign (U+00B5) is lowest affected */
-	    const CodePointList3 *folded;
-
-	    if (code==I_WITH_DOT_ABOVE) {
-		if (flags&(ONIGENC_CASE_DOWNCASE|ONIGENC_CASE_FOLD)) {
-		    MODIFIED;
-		    code = 'i';
-		    if (!(flags&ONIGENC_CASE_FOLD_TURKISH_AZERI)) { /* make dot above explicit */
-			to += ONIGENC_CODE_TO_MBC(enc, code, to);
-			code = DOT_ABOVE;
-		    }
-		}
-	    }
-	    else if (code==DOTLESS_i) { /* handle this manually, because it isn't involved in folding */
-		if (flags&ONIGENC_CASE_UPCASE)
-		    MODIFIED, code = 'I';
+      }
+      else if (code >= 'A' && code <= 'Z') {
+	if (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD)) {
+	  MODIFIED;
+	  if (flags & ONIGENC_CASE_FOLD_TURKISH_AZERI && code == 'I')
+	    code = DOTLESS_i;
+	  else
+	    code += 'a' - 'A';
+	}
+      }
+    }
+    else if (!(flags & ONIGENC_CASE_ASCII_ONLY) && code >= 0x00B5) { /* deal with non-ASCII; micron sign (U+00B5) is lowest affected */
+      const CodePointList3 *folded;
+
+      if (code == I_WITH_DOT_ABOVE) {
+	if (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD)) {
+	  MODIFIED;
+	  code = 'i';
+	  if (!(flags & ONIGENC_CASE_FOLD_TURKISH_AZERI)) { /* make dot above explicit */
+	    to += ONIGENC_CODE_TO_MBC(enc, code, to);
+	    code = DOT_ABOVE;
+	  }
+	}
+      }
+      else if (code == DOTLESS_i) { /* handle this manually, because it isn't involved in folding */
+	if (flags & ONIGENC_CASE_UPCASE) {
+	  MODIFIED;
+	  code = 'I';
+	}
+      }
+      else if ((folded = onigenc_unicode_fold_lookup(code)) != 0) { /* data about character found in CaseFold_11_Table */
+	if ((flags & ONIGENC_CASE_TITLECASE) && code>=0x1C90 && code<=0x1CBF) { /* Georgian MTAVRULI */
+          MODIFIED;
+	  code += 0x10D0 - 0x1C90;
+        }
+        else if ((flags & ONIGENC_CASE_TITLECASE)                            /* Titlecase needed, */
+	    && (OnigCaseFoldFlags(folded->n) & ONIGENC_CASE_IS_TITLECASE)) { /* but already Titlecase  */
+	  /* already Titlecase, no changes needed */
+	}
+	else if (flags & OnigCaseFoldFlags(folded->n)) { /* needs and data availability match */
+	  const OnigCodePoint *next;
+	  int count;
+
+	  MODIFIED;
+	  if (flags & OnigCaseFoldFlags(folded->n) & ONIGENC_CASE_SPECIALS) { /* special */
+	    const OnigCodePoint *SpecialsStart = CaseMappingSpecials + OnigSpecialIndexDecode(folded->n);
+
+	    if (OnigCaseFoldFlags(folded->n) & ONIGENC_CASE_IS_TITLECASE) { /* swapCASE available */
+	      if ((flags & (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE))
+		  == (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE)) /* swapCASE needed */
+		goto SpecialsCopy;
+	      else /* swapCASE not needed */
+		SpecialsStart += SpecialsLengthExtract(*SpecialsStart);
 	    }
-	    else if ((folded = onigenc_unicode_fold_lookup(code)) != 0) { /* data about character found in CaseFold_11_Table */
-		if ((flags&ONIGENC_CASE_TITLECASE)                                 /* Titlecase needed, */
-		    && (OnigCaseFoldFlags(folded->n)&ONIGENC_CASE_IS_TITLECASE)) { /* but already Titlecase  */
-		    /* already Titlecase, no changes needed */
-		}
-		else if (flags&OnigCaseFoldFlags(folded->n)) { /* needs and data availability match */
-		    const OnigCodePoint *next;
-		    int count;
-
-		    MODIFIED;
-		    if (flags&OnigCaseFoldFlags(folded->n)&ONIGENC_CASE_SPECIALS) { /* special */
-			OnigCodePoint *SpecialsStart = CaseMappingSpecials + OnigSpecialIndexDecode(folded->n);
-
-			if (OnigCaseFoldFlags(folded->n)&ONIGENC_CASE_IS_TITLECASE) { /* swapCASE available */
-			    if ((flags&(ONIGENC_CASE_UPCASE|ONIGENC_CASE_DOWNCASE))
-				    == (ONIGENC_CASE_UPCASE|ONIGENC_CASE_DOWNCASE)) /* swapCASE needed */
-			        goto SpecialsCopy;
-			    else /* swapCASE not needed */
-			        SpecialsStart += SpecialsLengthExtract(*SpecialsStart);
-			}
-			if (OnigCaseFoldFlags(folded->n)&ONIGENC_CASE_TITLECASE) { /* Titlecase available */
-			    if (flags&ONIGENC_CASE_TITLECASE) /* Titlecase needed, but not yet Titlecase */
-				goto SpecialsCopy;
-			    else /* Titlecase not needed */
-				SpecialsStart += SpecialsLengthExtract(*SpecialsStart);
-			}
-			if (OnigCaseFoldFlags(folded->n)&ONIGENC_CASE_DOWN_SPECIAL) {
-			    if (!(flags&ONIGENC_CASE_DOWN_SPECIAL))
-				SpecialsStart += SpecialsLengthExtract(*SpecialsStart);
-			}
-			/* here, we know we use ONIGENC_CASE_UP_SPECIAL, and the position is right */
-		      SpecialsCopy:
-		        count = SpecialsLengthExtract(*SpecialsStart);
-			next = SpecialsStart;
-			code = SpecialsCodepointExtract(*next++);
-		    }
-		    else { /* no specials */
-			count = OnigCodePointCount(folded->n);
-			next = folded->code;
-			code = *next++;
-		    }
-		    if (count==1)
-			;
-		    else if (count==2) {
-			to += ONIGENC_CODE_TO_MBC(enc, code, to);
-			code = *next;
-		    }
-		    else { /* count == 3 */
-			to += ONIGENC_CODE_TO_MBC(enc, code, to);
-			to += ONIGENC_CODE_TO_MBC(enc, *next++, to);
-			code = *next;
-		    }
-		}
+	    if (OnigCaseFoldFlags(folded->n) & ONIGENC_CASE_TITLECASE) { /* Titlecase available */
+	      if (flags & ONIGENC_CASE_TITLECASE) /* Titlecase needed, but not yet Titlecase */
+		goto SpecialsCopy;
+	      else /* Titlecase not needed */
+		SpecialsStart += SpecialsLengthExtract(*SpecialsStart);
 	    }
-	    else if ((folded = onigenc_unicode_unfold1_lookup(code)) != 0) {  /* data about character found in CaseUnfold_11_Table */
-		if (flags&OnigCaseFoldFlags(folded->n)) { /* needs and data availability match */
-		    MODIFIED;
-		    if (flags&OnigCaseFoldFlags(folded->n)&ONIGENC_CASE_TITLECASE)
-		        code = folded->code[1];
-		    else
-			code = folded->code[0];
-		}
-		else if ((flags&(ONIGENC_CASE_UPCASE))
-			 && (code==0x03B9||code==0x03BC)) { /* GREEK SMALL LETTERs IOTA/MU */
-		    MODIFIED;
-		    code = folded->code[1];
-		}
+	    if (OnigCaseFoldFlags(folded->n) & ONIGENC_CASE_DOWN_SPECIAL) {
+	      if (!(flags & ONIGENC_CASE_DOWN_SPECIAL))
+		SpecialsStart += SpecialsLengthExtract(*SpecialsStart);
 	    }
+	    /* here, we know we use ONIGENC_CASE_UP_SPECIAL, and the position is right */
+SpecialsCopy:
+	    count = SpecialsLengthExtract(*SpecialsStart);
+	    next = SpecialsStart;
+	    code = SpecialsCodepointExtract(*next++);
+	  }
+	  else { /* no specials */
+	    count = OnigCodePointCount(folded->n);
+	    next = folded->code;
+	    code = *next++;
+	  }
+	  if (count == 1)
+	    ;
+	  else if (count == 2) {
+	    to += ONIGENC_CODE_TO_MBC(enc, code, to);
+	    code = *next;
+	  }
+	  else { /* count == 3 */
+	    to += ONIGENC_CODE_TO_MBC(enc, code, to);
+	    to += ONIGENC_CODE_TO_MBC(enc, *next++, to);
+	    code = *next;
+	  }
 	}
-	to += ONIGENC_CODE_TO_MBC(enc, code, to);
-	/* switch from titlecase to lowercase for capitalize */
-	if (flags & ONIGENC_CASE_TITLECASE)
-	    flags ^= (ONIGENC_CASE_UPCASE    |ONIGENC_CASE_DOWNCASE|ONIGENC_CASE_TITLECASE|
-		      ONIGENC_CASE_UP_SPECIAL|ONIGENC_CASE_DOWN_SPECIAL);
+      }
+      else if ((folded = onigenc_unicode_unfold1_lookup(code)) != 0) { /* data about character found in CaseUnfold_11_Table */
+	if ((flags & ONIGENC_CASE_TITLECASE)                                 /* Titlecase needed, */
+	    && (OnigCaseFoldFlags(folded->n) & ONIGENC_CASE_IS_TITLECASE)) { /* but already Titlecase */
+	  /* already Titlecase, no changes needed */
+	}
+	else if (flags & OnigCaseFoldFlags(folded->n)) { /* needs and data availability match */
+	  MODIFIED;
+	  code = folded->code[(flags & OnigCaseFoldFlags(folded->n) & ONIGENC_CASE_TITLECASE) ? 1 : 0];
+	}
+      }
     }
-    *flagP = flags;
-    return (int)(to-to_start);
+    to += ONIGENC_CODE_TO_MBC(enc, code, to);
+    /* switch from titlecase to lowercase for capitalize */
+    if (flags & ONIGENC_CASE_TITLECASE)
+      flags ^= (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_TITLECASE |
+	  ONIGENC_CASE_UP_SPECIAL | ONIGENC_CASE_DOWN_SPECIAL);
+  }
+  *flagP = flags;
+  return (int )(to - to_start);
 }
 
-#endif   /* ONIG_CASE_MAPPING */
+#if 0
+const char onigenc_unicode_version_string[] =
+#ifdef ONIG_UNICODE_VERSION_STRING
+    ONIG_UNICODE_VERSION_STRING
+#endif
+    "";
+
+const int onigenc_unicode_version_number[3] = {
+#ifdef ONIG_UNICODE_VERSION_MAJOR
+    ONIG_UNICODE_VERSION_MAJOR,
+    ONIG_UNICODE_VERSION_MINOR,
+    ONIG_UNICODE_VERSION_TEENY,
+#else
+    0
+#endif
+};
+#endif
diff --git a/enc/unicode/12.1.0/casefold.h b/enc/unicode/12.1.0/casefold.h
new file mode 100644
index 0000000000..4c62f0faee
--- /dev/null
+++ b/enc/unicode/12.1.0/casefold.h
@@ -0,0 +1,7428 @@
+/* DO NOT EDIT THIS FILE. */
+/* Generated by enc/unicode/case-folding.rb */
+
+#if defined ONIG_UNICODE_VERSION_STRING && !( \
+      ONIG_UNICODE_VERSION_MAJOR == 12 && \
+      ONIG_UNICODE_VERSION_MINOR == 1 && \
+      ONIG_UNICODE_VERSION_TEENY == 0 && \
+      1)
+# error ONIG_UNICODE_VERSION_STRING mismatch
+#endif
+#define ONIG_UNICODE_VERSION_STRING "12.1.0"
+#define ONIG_UNICODE_VERSION_MAJOR 12
+#define ONIG_UNICODE_VERSION_MINOR 1
+#define ONIG_UNICODE_VERSION_TEENY 0
+
+static const CaseFold_11_Type CaseFold_11_Table[] = {
+#define CaseFold (*(CaseFold_11_Type (*)[1485])(CaseFold_11_Table+0))
+  {0x0041, {1|F|D, {0x0061}}},
+  {0x0042, {1|F|D, {0x0062}}},
+  {0x0043, {1|F|D, {0x0063}}},
+  {0x0044, {1|F|D, {0x0064}}},
+  {0x0045, {1|F|D, {0x0065}}},
+  {0x0046, {1|F|D, {0x0066}}},
+  {0x0047, {1|F|D, {0x0067}}},
+  {0x0048, {1|F|D, {0x0068}}},
+  {0x004a, {1|F|D, {0x006a}}},
+  {0x004b, {1|F|D, {0x006b}}},
+  {0x004c, {1|F|D, {0x006c}}},
+  {0x004d, {1|F|D, {0x006d}}},
+  {0x004e, {1|F|D, {0x006e}}},
+  {0x004f, {1|F|D, {0x006f}}},
+  {0x0050, {1|F|D, {0x0070}}},
+  {0x0051, {1|F|D, {0x0071}}},
+  {0x0052, {1|F|D, {0x0072}}},
+  {0x0053, {1|F|D, {0x0073}}},
+  {0x0054, {1|F|D, {0x0074}}},
+  {0x0055, {1|F|D, {0x0075}}},
+  {0x0056, {1|F|D, {0x0076}}},
+  {0x0057, {1|F|D, {0x0077}}},
+  {0x0058, {1|F|D, {0x0078}}},
+  {0x0059, {1|F|D, {0x0079}}},
+  {0x005a, {1|F|D, {0x007a}}},
+  {0x00b5, {1|F|SU|I(0), {0x03bc}}},
+  {0x00c0, {1|F|D, {0x00e0}}},
+  {0x00c1, {1|F|D, {0x00e1}}},
+  {0x00c2, {1|F|D, {0x00e2}}},
+  {0x00c3, {1|F|D, {0x00e3}}},
+  {0x00c4, {1|F|D, {0x00e4}}},
+  {0x00c5, {1|F|D, {0x00e5}}},
+  {0x00c6, {1|F|D, {0x00e6}}},
+  {0x00c7, {1|F|D, {0x00e7}}},
+  {0x00c8, {1|F|D, {0x00e8}}},
+  {0x00c9, {1|F|D, {0x00e9}}},
+  {0x00ca, {1|F|D, {0x00ea}}},
+  {0x00cb, {1|F|D, {0x00eb}}},
+  {0x00cc, {1|F|D, {0x00ec}}},
+  {0x00cd, {1|F|D, {0x00ed}}},
+  {0x00ce, {1|F|D, {0x00ee}}},
+  {0x00cf, {1|F|D, {0x00ef}}},
+  {0x00d0, {1|F|D, {0x00f0}}},
+  {0x00d1, {1|F|D, {0x00f1}}},
+  {0x00d2, {1|F|D, {0x00f2}}},
+  {0x00d3, {1|F|D, {0x00f3}}},
+  {0x00d4, {1|F|D, {0x00f4}}},
+  {0x00d5, {1|F|D, {0x00f5}}},
+  {0x00d6, {1|F|D, {0x00f6}}},
+  {0x00d8, {1|F|D, {0x00f8}}},
+  {0x00d9, {1|F|D, {0x00f9}}},
+  {0x00da, {1|F|D, {0x00fa}}},
+  {0x00db, {1|F|D, {0x00fb}}},
+  {0x00dc, {1|F|D, {0x00fc}}},
+  {0x00dd, {1|F|D, {0x00fd}}},
+  {0x00de, {1|F|D, {0x00fe}}},
+  {0x00df, {2|F|ST|SU|I(1), {0x0073, 0x0073}}},
+  {0x0100, {1|F|D, {0x0101}}},
+  {0x0102, {1|F|D, {0x0103}}},
+  {0x0104, {1|F|D, {0x0105}}},
+  {0x0106, {1|F|D, {0x0107}}},
+  {0x0108, {1|F|D, {0x0109}}},
+  {0x010a, {1|F|D, {0x010b}}},
+  {0x010c, {1|F|D, {0x010d}}},
+  {0x010e, {1|F|D, {0x010f}}},
+  {0x0110, {1|F|D, {0x0111}}},
+  {0x0112, {1|F|D, {0x0113}}},
+  {0x0114, {1|F|D, {0x0115}}},
+  {0x0116, {1|F|D, {0x0117}}},
+  {0x0118, {1|F|D, {0x0119}}},
+  {0x011a, {1|F|D, {0x011b}}},
+  {0x011c, {1|F|D, {0x011d}}},
+  {0x011e, {1|F|D, {0x011f}}},
+  {0x0120, {1|F|D, {0x0121}}},
+  {0x0122, {1|F|D, {0x0123}}},
+  {0x0124, {1|F|D, {0x0125}}},
+  {0x0126, {1|F|D, {0x0127}}},
+  {0x0128, {1|F|D, {0x0129}}},
+  {0x012a, {1|F|D, {0x012b}}},
+  {0x012c, {1|F|D, {0x012d}}},
+  {0x012e, {1|F|D, {0x012f}}},
+  {0x0132, {1|F|D, {0x0133}}},
+  {0x0134, {1|F|D, {0x0135}}},
+  {0x0136, {1|F|D, {0x0137}}},
+  {0x0139, {1|F|D, {0x013a}}},
+  {0x013b, {1|F|D, {0x013c}}},
+  {0x013d, {1|F|D, {0x013e}}},
+  {0x013f, {1|F|D, {0x0140}}},
+  {0x0141, {1|F|D, {0x0142}}},
+  {0x0143, {1|F|D, {0x0144}}},
+  {0x0145, {1|F|D, {0x0146}}},
+  {0x0147, {1|F|D, {0x0148}}},
+  {0x0149, {2|F|SU|I(5), {0x02bc, 0x006e}}},
+  {0x014a, {1|F|D, {0x014b}}},
+  {0x014c, {1|F|D, {0x014d}}},
+  {0x014e, {1|F|D, {0x014f}}},
+  {0x0150, {1|F|D, {0x0151}}},
+  {0x0152, {1|F|D, {0x0153}}},
+  {0x0154, {1|F|D, {0x0155}}},
+  {0x0156, {1|F|D, {0x0157}}},
+  {0x0158, {1|F|D, {0x0159}}},
+  {0x015a, {1|F|D, {0x015b}}},
+  {0x015c, {1|F|D, {0x015d}}},
+  {0x015e, {1|F|D, {0x015f}}},
+  {0x0160, {1|F|D, {0x0161}}},
+  {0x0162, {1|F|D, {0x0163}}},
+  {0x0164, {1|F|D, {0x0165}}},
+  {0x0166, {1|F|D, {0x0167}}},
+  {0x0168, {1|F|D, {0x0169}}},
+  {0x016a, {1|F|D, {0x016b}}},
+  {0x016c, {1|F|D, {0x016d}}},
+  {0x016e, {1|F|D, {0x016f}}},
+  {0x0170, {1|F|D, {0x0171}}},
+  {0x0172, {1|F|D, {0x0173}}},
+  {0x0174, {1|F|D, {0x0175}}},
+  {0x0176, {1|F|D, {0x0177}}},
+  {0x0178, {1|F|D, {0x00ff}}},
+  {0x0179, {1|F|D, {0x017a}}},
+  {0x017b, {1|F|D, {0x017c}}},
+  {0x017d, {1|F|D, {0x017e}}},
+  {0x017f, {1|F|SU|I(7), {0x0073}}},
+  {0x0181, {1|F|D, {0x0253}}},
+  {0x0182, {1|F|D, {0x0183}}},
+  {0x0184, {1|F|D, {0x0185}}},
+  {0x0186, {1|F|D, {0x0254}}},
+  {0x0187, {1|F|D, {0x0188}}},
+  {0x0189, {1|F|D, {0x0256}}},
+  {0x018a, {1|F|D, {0x0257}}},
+  {0x018b, {1|F|D, {0x018c}}},
+  {0x018e, {1|F|D, {0x01dd}}},
+  {0x018f, {1|F|D, {0x0259}}},
+  {0x0190, {1|F|D, {0x025b}}},
+  {0x0191, {1|F|D, {0x0192}}},
+  {0x0193, {1|F|D, {0x0260}}},
+  {0x0194, {1|F|D, {0x0263}}},
+  {0x0196, {1|F|D, {0x0269}}},
+  {0x0197, {1|F|D, {0x0268}}},
+  {0x0198, {1|F|D, {0x0199}}},
+  {0x019c, {1|F|D, {0x026f}}},
+  {0x019d, {1|F|D, {0x0272}}},
+  {0x019f, {1|F|D, {0x0275}}},
+  {0x01a0, {1|F|D, {0x01a1}}},
+  {0x01a2, {1|F|D, {0x01a3}}},
+  {0x01a4, {1|F|D, {0x01a5}}},
+  {0x01a6, {1|F|D, {0x0280}}},
+  {0x01a7, {1|F|D, {0x01a8}}},
+  {0x01a9, {1|F|D, {0x0283}}},
+  {0x01ac, {1|F|D, {0x01ad}}},
+  {0x01ae, {1|F|D, {0x0288}}},
+  {0x01af, {1|F|D, {0x01b0}}},
+  {0x01b1, {1|F|D, {0x028a}}},
+  {0x01b2, {1|F|D, {0x028b}}},
+  {0x01b3, {1|F|D, {0x01b4}}},
+  {0x01b5, {1|F|D, {0x01b6}}},
+  {0x01b7, {1|F|D, {0x0292}}},
+  {0x01b8, {1|F|D, {0x01b9}}},
+  {0x01bc, {1|F|D, {0x01bd}}},
+  {0x01c4, {1|F|D|ST|I(8), {0x01c6}}},
+  {0x01c5, {1|F|D|IT|SU|I(9), {0x01c6}}},
+  {0x01c7, {1|F|D|ST|I(12), {0x01c9}}},
+  {0x01c8, {1|F|D|IT|SU|I(13), {0x01c9}}},
+  {0x01ca, {1|F|D|ST|I(16), {0x01cc}}},
+  {0x01cb, {1|F|D|IT|SU|I(17), {0x01cc}}},
+  {0x01cd, {1|F|D, {0x01ce}}},
+  {0x01cf, {1|F|D, {0x01d0}}},
+  {0x01d1, {1|F|D, {0x01d2}}},
+  {0x01d3, {1|F|D, {0x01d4}}},
+  {0x01d5, {1|F|D, {0x01d6}}},
+  {0x01d7, {1|F|D, {0x01d8}}},
+  {0x01d9, {1|F|D, {0x01da}}},
+  {0x01db, {1|F|D, {0x01dc}}},
+  {0x01de, {1|F|D, {0x01df}}},
+  {0x01e0, {1|F|D, {0x01e1}}},
+  {0x01e2, {1|F|D, {0x01e3}}},
+  {0x01e4, {1|F|D, {0x01e5}}},
+  {0x01e6, {1|F|D, {0x01e7}}},
+  {0x01e8, {1|F|D, {0x01e9}}},
+  {0x01ea, {1|F|D, {0x01eb}}},
+  {0x01ec, {1|F|D, {0x01ed}}},
+  {0x01ee, {1|F|D, {0x01ef}}},
+  {0x01f0, {2|F|SU|I(20), {0x006a, 0x030c}}},
+  {0x01f1, {1|F|D|ST|I(22), {0x01f3}}},
+  {0x01f2, {1|F|D|IT|SU|I(23), {0x01f3}}},
+  {0x01f4, {1|F|D, {0x01f5}}},
+  {0x01f6, {1|F|D, {0x0195}}},
+  {0x01f7, {1|F|D, {0x01bf}}},
+  {0x01f8, {1|F|D, {0x01f9}}},
+  {0x01fa, {1|F|D, {0x01fb}}},
+  {0x01fc, {1|F|D, {0x01fd}}},
+  {0x01fe, {1|F|D, {0x01ff}}},
+  {0x0200, {1|F|D, {0x0201}}},
+  {0x0202, {1|F|D, {0x0203}}},
+  {0x0204, {1|F|D, {0x0205}}},
+  {0x0206, {1|F|D, {0x0207}}},
+  {0x0208, {1|F|D, {0x0209}}},
+  {0x020a, {1|F|D, {0x020b}}},
+  {0x020c, {1|F|D, {0x020d}}},
+  {0x020e, {1|F|D, {0x020f}}},
+  {0x0210, {1|F|D, {0x0211}}},
+  {0x0212, {1|F|D, {0x0213}}},
+  {0x0214, {1|F|D, {0x0215}}},
+  {0x0216, {1|F|D, {0x0217}}},
+  {0x0218, {1|F|D, {0x0219}}},
+  {0x021a, {1|F|D, {0x021b}}},
+  {0x021c, {1|F|D, {0x021d}}},
+  {0x021e, {1|F|D, {0x021f}}},
+  {0x0220, {1|F|D, {0x019e}}},
+  {0x0222, {1|F|D, {0x0223}}},
+  {0x0224, {1|F|D, {0x0225}}},
+  {0x0226, {1|F|D, {0x0227}}},
+  {0x0228, {1|F|D, {0x0229}}},
+  {0x022a, {1|F|D, {0x022b}}},
+  {0x022c, {1|F|D, {0x022d}}},
+  {0x022e, {1|F|D, {0x022f}}},
+  {0x0230, {1|F|D, {0x0231}}},
+  {0x0232, {1|F|D, {0x0233}}},
+  {0x023a, {1|F|D, {0x2c65}}},
+  {0x023b, {1|F|D, {0x023c}}},
+  {0x023d, {1|F|D, {0x019a}}},
+  {0x023e, {1|F|D, {0x2c66}}},
+  {0x0241, {1|F|D, {0x0242}}},
+  {0x0243, {1|F|D, {0x0180}}},
+  {0x0244, {1|F|D, {0x0289}}},
+  {0x0245, {1|F|D, {0x028c}}},
+  {0x0246, {1|F|D, {0x0247}}},
+  {0x0248, {1|F|D, {0x0249}}},
+  {0x024a, {1|F|D, {0x024b}}},
+  {0x024c, {1|F|D, {0x024d}}},
+  {0x024e, {1|F|D, {0x024f}}},
+  {0x0345, {1|F|SU|I(26), {0x03b9}}},
+  {0x0370, {1|F|D, {0x0371}}},
+  {0x0372, {1|F|D, {0x0373}}},
+  {0x0376, {1|F|D, {0x0377}}},
+  {0x037f, {1|F|D, {0x03f3}}},
+  {0x0386, {1|F|D, {0x03ac}}},
+  {0x0388, {1|F|D, {0x03ad}}},
+  {0x0389, {1|F|D, {0x03ae}}},
+  {0x038a, {1|F|D, {0x03af}}},
+  {0x038c, {1|F|D, {0x03cc}}},
+  {0x038e, {1|F|D, {0x03cd}}},
+  {0x038f, {1|F|D, {0x03ce}}},
+  {0x0390, {3|F|SU|I(27), {0x03b9, 0x0308, 0x0301}}},
+  {0x0391, {1|F|D, {0x03b1}}},
+  {0x0392, {1|F|D, {0x03b2}}},
+  {0x0393, {1|F|D, {0x03b3}}},
+  {0x0394, {1|F|D, {0x03b4}}},
+  {0x0395, {1|F|D, {0x03b5}}},
+  {0x0396, {1|F|D, {0x03b6}}},
+  {0x0397, {1|F|D, {0x03b7}}},
+  {0x0398, {1|F|D, {0x03b8}}},
+  {0x0399, {1|F|D, {0x03b9}}},
+  {0x039a, {1|F|D, {0x03ba}}},
+  {0x039b, {1|F|D, {0x03bb}}},
+  {0x039c, {1|F|D, {0x03bc}}},
+  {0x039d, {1|F|D, {0x03bd}}},
+  {0x039e, {1|F|D, {0x03be}}},
+  {0x039f, {1|F|D, {0x03bf}}},
+  {0x03a0, {1|F|D, {0x03c0}}},
+  {0x03a1, {1|F|D, {0x03c1}}},
+  {0x03a3, {1|F|D, {0x03c3}}},
+  {0x03a4, {1|F|D, {0x03c4}}},
+  {0x03a5, {1|F|D, {0x03c5}}},
+  {0x03a6, {1|F|D, {0x03c6}}},
+  {0x03a7, {1|F|D, {0x03c7}}},
+  {0x03a8, {1|F|D, {0x03c8}}},
+  {0x03a9, {1|F|D, {0x03c9}}},
+  {0x03aa, {1|F|D, {0x03ca}}},
+  {0x03ab, {1|F|D, {0x03cb}}},
+  {0x03b0, {3|F|SU|I(30), {0x03c5, 0x0308, 0x0301}}},
+  {0x03c2, {1|F|SU|I(33), {0x03c3}}},
+  {0x03cf, {1|F|D, {0x03d7}}},
+  {0x03d0, {1|F|SU|I(34), {0x03b2}}},
+  {0x03d1, {1|F|SU|I(35), {0x03b8}}},
+  {0x03d5, {1|F|SU|I(36), {0x03c6}}},
+  {0x03d6, {1|F|SU|I(37), {0x03c0}}},
+  {0x03d8, {1|F|D, {0x03d9}}},
+  {0x03da, {1|F|D, {0x03db}}},
+  {0x03dc, {1|F|D, {0x03dd}}},
+  {0x03de, {1|F|D, {0x03df}}},
+  {0x03e0, {1|F|D, {0x03e1}}},
+  {0x03e2, {1|F|D, {0x03e3}}},
+  {0x03e4, {1|F|D, {0x03e5}}},
+  {0x03e6, {1|F|D, {0x03e7}}},
+  {0x03e8, {1|F|D, {0x03e9}}},
+  {0x03ea, {1|F|D, {0x03eb}}},
+  {0x03ec, {1|F|D, {0x03ed}}},
+  {0x03ee, {1|F|D, {0x03ef}}},
+  {0x03f0, {1|F|SU|I(38), {0x03ba}}},
+  {0x03f1, {1|F|SU|I(39), {0x03c1}}},
+  {0x03f4, {1|F|D, {0x03b8}}},
+  {0x03f5, {1|F|SU|I(40), {0x03b5}}},
+  {0x03f7, {1|F|D, {0x03f8}}},
+  {0x03f9, {1|F|D, {0x03f2}}},
+  {0x03fa, {1|F|D, {0x03fb}}},
+  {0x03fd, {1|F|D, {0x037b}}},
+  {0x03fe, {1|F|D, {0x037c}}},
+  {0x03ff, {1|F|D, {0x037d}}},
+  {0x0400, {1|F|D, {0x0450}}},
+  {0x0401, {1|F|D, {0x0451}}},
+  {0x0402, {1|F|D, {0x0452}}},
+  {0x0403, {1|F|D, {0x0453}}},
+  {0x0404, {1|F|D, {0x0454}}},
+  {0x0405, {1|F|D, {0x0455}}},
+  {0x0406, {1|F|D, {0x0456}}},
+  {0x0407, {1|F|D, {0x0457}}},
+  {0x0408, {1|F|D, {0x0458}}},
+  {0x0409, {1|F|D, {0x0459}}},
+  {0x040a, {1|F|D, {0x045a}}},
+  {0x040b, {1|F|D, {0x045b}}},
+  {0x040c, {1|F|D, {0x045c}}},
+  {0x040d, {1|F|D, {0x045d}}},
+  {0x040e, {1|F|D, {0x045e}}},
+  {0x040f, {1|F|D, {0x045f}}},
+  {0x0410, {1|F|D, {0x0430}}},
+  {0x0411, {1|F|D, {0x0431}}},
+  {0x0412, {1|F|D, {0x0432}}},
+  {0x0413, {1|F|D, {0x0433}}},
+  {0x0414, {1|F|D, {0x0434}}},
+  {0x0415, {1|F|D, {0x0435}}},
+  {0x0416, {1|F|D, {0x0436}}},
+  {0x0417, {1|F|D, {0x0437}}},
+  {0x0418, {1|F|D, {0x0438}}},
+  {0x0419, {1|F|D, {0x0439}}},
+  {0x041a, {1|F|D, {0x043a}}},
+  {0x041b, {1|F|D, {0x043b}}},
+  {0x041c, {1|F|D, {0x043c}}},
+  {0x041d, {1|F|D, {0x043d}}},
+  {0x041e, {1|F|D, {0x043e}}},
+  {0x041f, {1|F|D, {0x043f}}},
+  {0x0420, {1|F|D, {0x0440}}},
+  {0x0421, {1|F|D, {0x0441}}},
+  {0x0422, {1|F|D, {0x0442}}},
+  {0x0423, {1|F|D, {0x0443}}},
+  {0x0424, {1|F|D, {0x0444}}},
+  {0x0425, {1|F|D, {0x0445}}},
+  {0x0426, {1|F|D, {0x0446}}},
+  {0x0427, {1|F|D, {0x0447}}},
+  {0x0428, {1|F|D, {0x0448}}},
+  {0x0429, {1|F|D, {0x0449}}},
+  {0x042a, {1|F|D, {0x044a}}},
+  {0x042b, {1|F|D, {0x044b}}},
+  {0x042c, {1|F|D, {0x044c}}},
+  {0x042d, {1|F|D, {0x044d}}},
+  {0x042e, {1|F|D, {0x044e}}},
+  {0x042f, {1|F|D, {0x044f}}},
+  {0x0460, {1|F|D, {0x0461}}},
+  {0x0462, {1|F|D, {0x0463}}},
+  {0x0464, {1|F|D, {0x0465}}},
+  {0x0466, {1|F|D, {0x0467}}},
+  {0x0468, {1|F|D, {0x0469}}},
+  {0x046a, {1|F|D, {0x046b}}},
+  {0x046c, {1|F|D, {0x046d}}},
+  {0x046e, {1|F|D, {0x046f}}},
+  {0x0470, {1|F|D, {0x0471}}},
+  {0x0472, {1|F|D, {0x0473}}},
+  {0x0474, {1|F|D, {0x0475}}},
+  {0x0476, {1|F|D, {0x0477}}},
+  {0x0478, {1|F|D, {0x0479}}},
+  {0x047a, {1|F|D, {0x047b}}},
+  {0x047c, {1|F|D, {0x047d}}},
+  {0x047e, {1|F|D, {0x047f}}},
+  {0x0480, {1|F|D, {0x0481}}},
+  {0x048a, {1|F|D, {0x048b}}},
+  {0x048c, {1|F|D, {0x048d}}},
+  {0x048e, {1|F|D, {0x048f}}},
+  {0x0490, {1|F|D, {0x0491}}},
+  {0x0492, {1|F|D, {0x0493}}},
+  {0x0494, {1|F|D, {0x0495}}},
+  {0x0496, {1|F|D, {0x0497}}},
+  {0x0498, {1|F|D, {0x0499}}},
+  {0x049a, {1|F|D, {0x049b}}},
+  {0x049c, {1|F|D, {0x049d}}},
+  {0x049e, {1|F|D, {0x049f}}},
+  {0x04a0, {1|F|D, {0x04a1}}},
+  {0x04a2, {1|F|D, {0x04a3}}},
+  {0x04a4, {1|F|D, {0x04a5}}},
+  {0x04a6, {1|F|D, {0x04a7}}},
+  {0x04a8, {1|F|D, {0x04a9}}},
+  {0x04aa, {1|F|D, {0x04ab}}},
+  {0x04ac, {1|F|D, {0x04ad}}},
+  {0x04ae, {1|F|D, {0x04af}}},
+  {0x04b0, {1|F|D, {0x04b1}}},
+  {0x04b2, {1|F|D, {0x04b3}}},
+  {0x04b4, {1|F|D, {0x04b5}}},
+  {0x04b6, {1|F|D, {0x04b7}}},
+  {0x04b8, {1|F|D, {0x04b9}}},
+  {0x04ba, {1|F|D, {0x04bb}}},
+  {0x04bc, {1|F|D, {0x04bd}}},
+  {0x04be, {1|F|D, {0x04bf}}},
+  {0x04c0, {1|F|D, {0x04cf}}},
+  {0x04c1, {1|F|D, {0x04c2}}},
+  {0x04c3, {1|F|D, {0x04c4}}},
+  {0x04c5, {1|F|D, {0x04c6}}},
+  {0x04c7, {1|F|D, {0x04c8}}},
+  {0x04c9, {1|F|D, {0x04ca}}},
+  {0x04cb, {1|F|D, {0x04cc}}},
+  {0x04cd, {1|F|D, {0x04ce}}},
+  {0x04d0, {1|F|D, {0x04d1}}},
+  {0x04d2, {1|F|D, {0x04d3}}},
+  {0x04d4, {1|F|D, {0x04d5}}},
+  {0x04d6, {1|F|D, {0x04d7}}},
+  {0x04d8, {1|F|D, {0x04d9}}},
+  {0x04da, {1|F|D, {0x04db}}},
+  {0x04dc, {1|F|D, {0x04dd}}},
+  {0x04de, {1|F|D, {0x04df}}},
+  {0x04e0, {1|F|D, {0x04e1}}},
+  {0x04e2, {1|F|D, {0x04e3}}},
+  {0x04e4, {1|F|D, {0x04e5}}},
+  {0x04e6, {1|F|D, {0x04e7}}},
+  {0x04e8, {1|F|D, {0x04e9}}},
+  {0x04ea, {1|F|D, {0x04eb}}},
+  {0x04ec, {1|F|D, {0x04ed}}},
+  {0x04ee, {1|F|D, {0x04ef}}},
+  {0x04f0, {1|F|D, {0x04f1}}},
+  {0x04f2, {1|F|D, {0x04f3}}},
+  {0x04f4, {1|F|D, {0x04f5}}},
+  {0x04f6, {1|F|D, {0x04f7}}},
+  {0x04f8, {1|F|D, {0x04f9}}},
+  {0x04fa, {1|F|D, {0x04fb}}},
+  {0x04fc, {1|F|D, {0x04fd}}},
+  {0x04fe, {1|F|D, {0x04ff}}},
+  {0x0500, {1|F|D, {0x0501}}},
+  {0x0502, {1|F|D, {0x0503}}},
+  {0x0504, {1|F|D, {0x0505}}},
+  {0x0506, {1|F|D, {0x0507}}},
+  {0x0508, {1|F|D, {0x0509}}},
+  {0x050a, {1|F|D, {0x050b}}},
+  {0x050c, {1|F|D, {0x050d}}},
+  {0x050e, {1|F|D, {0x050f}}},
+  {0x0510, {1|F|D, {0x0511}}},
+  {0x0512, {1|F|D, {0x0513}}},
+  {0x0514, {1|F|D, {0x0515}}},
+  {0x0516, {1|F|D, {0x0517}}},
+  {0x0518, {1|F|D, {0x0519}}},
+  {0x051a, {1|F|D, {0x051b}}},
+  {0x051c, {1|F|D, {0x051d}}},
+  {0x051e, {1|F|D, {0x051f}}},
+  {0x0520, {1|F|D, {0x0521}}},
+  {0x0522, {1|F|D, {0x0523}}},
+  {0x0524, {1|F|D, {0x0525}}},
+  {0x0526, {1|F|D, {0x0527}}},
+  {0x0528, {1|F|D, {0x0529}}},
+  {0x052a, {1|F|D, {0x052b}}},
+  {0x052c, {1|F|D, {0x052d}}},
+  {0x052e, {1|F|D, {0x052f}}},
+  {0x0531, {1|F|D, {0x0561}}},
+  {0x0532, {1|F|D, {0x0562}}},
+  {0x0533, {1|F|D, {0x0563}}},
+  {0x0534, {1|F|D, {0x0564}}},
+  {0x0535, {1|F|D, {0x0565}}},
+  {0x0536, {1|F|D, {0x0566}}},
+  {0x0537, {1|F|D, {0x0567}}},
+  {0x0538, {1|F|D, {0x0568}}},
+  {0x0539, {1|F|D, {0x0569}}},
+  {0x053a, {1|F|D, {0x056a}}},
+  {0x053b, {1|F|D, {0x056b}}},
+  {0x053c, {1|F|D, {0x056c}}},
+  {0x053d, {1|F|D, {0x056d}}},
+  {0x053e, {1|F|D, {0x056e}}},
+  {0x053f, {1|F|D, {0x056f}}},
+  {0x0540, {1|F|D, {0x0570}}},
+  {0x0541, {1|F|D, {0x0571}}},
+  {0x0542, {1|F|D, {0x0572}}},
+  {0x0543, {1|F|D, {0x0573}}},
+  {0x0544, {1|F|D, {0x0574}}},
+  {0x0545, {1|F|D, {0x0575}}},
+  {0x0546, {1|F|D, {0x0576}}},
+  {0x0547, {1|F|D, {0x0577}}},
+  {0x0548, {1|F|D, {0x0578}}},
+  {0x0549, {1|F|D, {0x0579}}},
+  {0x054a, {1|F|D, {0x057a}}},
+  {0x054b, {1|F|D, {0x057b}}},
+  {0x054c, {1|F|D, {0x057c}}},
+  {0x054d, {1|F|D, {0x057d}}},
+  {0x054e, {1|F|D, {0x057e}}},
+  {0x054f, {1|F|D, {0x057f}}},
+  {0x0550, {1|F|D, {0x0580}}},
+  {0x0551, {1|F|D, {0x0581}}},
+  {0x0552, {1|F|D, {0x0582}}},
+  {0x0553, {1|F|D, {0x0583}}},
+  {0x0554, {1|F|D, {0x0584}}},
+  {0x0555, {1|F|D, {0x0585}}},
+  {0x0556, {1|F|D, {0x0586}}},
+  {0x0587, {2|F|ST|SU|I(41), {0x0565, 0x0582}}},
+  {0x10a0, {1|F|D, {0x2d00}}},
+  {0x10a1, {1|F|D, {0x2d01}}},
+  {0x10a2, {1|F|D, {0x2d02}}},
+  {0x10a3, {1|F|D, {0x2d03}}},
+  {0x10a4, {1|F|D, {0x2d04}}},
+  {0x10a5, {1|F|D, {0x2d05}}},
+  {0x10a6, {1|F|D, {0x2d06}}},
+  {0x10a7, {1|F|D, {0x2d07}}},
+  {0x10a8, {1|F|D, {0x2d08}}},
+  {0x10a9, {1|F|D, {0x2d09}}},
+  {0x10aa, {1|F|D, {0x2d0a}}},
+  {0x10ab, {1|F|D, {0x2d0b}}},
+  {0x10ac, {1|F|D, {0x2d0c}}},
+  {0x10ad, {1|F|D, {0x2d0d}}},
+  {0x10ae, {1|F|D, {0x2d0e}}},
+  {0x10af, {1|F|D, {0x2d0f}}},
+  {0x10b0, {1|F|D, {0x2d10}}},
+  {0x10b1, {1|F|D, {0x2d11}}},
+  {0x10b2, {1|F|D, {0x2d12}}},
+  {0x10b3, {1|F|D, {0x2d13}}},
+  {0x10b4, {1|F|D, {0x2d14}}},
+  {0x10b5, {1|F|D, {0x2d15}}},
+  {0x10b6, {1|F|D, {0x2d16}}},
+  {0x10b7, {1|F|D, {0x2d17}}},
+  {0x10b8, {1|F|D, {0x2d18}}},
+  {0x10b9, {1|F|D, {0x2d19}}},
+  {0x10ba, {1|F|D, {0x2d1a}}},
+  {0x10bb, {1|F|D, {0x2d1b}}},
+  {0x10bc, {1|F|D, {0x2d1c}}},
+  {0x10bd, {1|F|D, {0x2d1d}}},
+  {0x10be, {1|F|D, {0x2d1e}}},
+  {0x10bf, {1|F|D, {0x2d1f}}},
+  {0x10c0, {1|F|D, {0x2d20}}},
+  {0x10c1, {1|F|D, {0x2d21}}},
+  {0x10c2, {1|F|D, {0x2d22}}},
+  {0x10c3, {1|F|D, {0x2d23}}},
+  {0x10c4, {1|F|D, {0x2d24}}},
+  {0x10c5, {1|F|D, {0x2d25}}},
+  {0x10c7, {1|F|D, {0x2d27}}},
+  {0x10cd, {1|F|D, {0x2d2d}}},
+  {0x13f8, {1|F|U, {0x13f0}}},
+  {0x13f9, {1|F|U, {0x13f1}}},
+  {0x13fa, {1|F|U, {0x13f2}}},
+  {0x13fb, {1|F|U, {0x13f3}}},
+  {0x13fc, {1|F|U, {0x13f4}}},
+  {0x13fd, {1|F|U, {0x13f5}}},
+  {0x1c80, {1|F|SU|I(45), {0x0432}}},
+  {0x1c81, {1|F|SU|I(46), {0x0434}}},
+  {0x1c82, {1|F|SU|I(47), {0x043e}}},
+  {0x1c83, {1|F|SU|I(48), {0x0441}}},
+  {0x1c84, {1|F|SU|I(49), {0x0442}}},
+  {0x1c85, {1|F|SU|I(50), {0x0442}}},
+  {0x1c86, {1|F|SU|I(51), {0x044a}}},
+  {0x1c87, {1|F|SU|I(52), {0x0463}}},
+  {0x1c88, {1|F|SU|I(53), {0xa64b}}},
+  {0x1c90, {1|F|D, {0x10d0}}},
+  {0x1c91, {1|F|D, {0x10d1}}},
+  {0x1c92, {1|F|D, {0x10d2}}},
+  {0x1c93, {1|F|D, {0x10d3}}},
+  {0x1c94, {1|F|D, {0x10d4}}},
+  {0x1c95, {1|F|D, {0x10d5}}},
+  {0x1c96, {1|F|D, {0x10d6}}},
+  {0x1c97, {1|F|D, {0x10d7}}},
+  {0x1c98, {1|F|D, {0x10d8}}},
+  {0x1c99, {1|F|D, {0x10d9}}},
+  {0x1c9a, {1|F|D, {0x10da}}},
+  {0x1c9b, {1|F|D, {0x10db}}},
+  {0x1c9c, {1|F|D, {0x10dc}}},
+  {0x1c9d, {1|F|D, {0x10dd}}},
+  {0x1c9e, {1|F|D, {0x10de}}},
+  {0x1c9f, {1|F|D, {0x10df}}},
+  {0x1ca0, {1|F|D, {0x10e0}}},
+  {0x1ca1, {1|F|D, {0x10e1}}},
+  {0x1ca2, {1|F|D, {0x10e2}}},
+  {0x1ca3, {1|F|D, {0x10e3}}},
+  {0x1ca4, {1|F|D, {0x10e4}}},
+  {0x1ca5, {1|F|D, {0x10e5}}},
+  {0x1ca6, {1|F|D, {0x10e6}}},
+  {0x1ca7, {1|F|D, {0x10e7}}},
+  {0x1ca8, {1|F|D, {0x10e8}}},
+  {0x1ca9, {1|F|D, {0x10e9}}},
+  {0x1caa, {1|F|D, {0x10ea}}},
+  {0x1cab, {1|F|D, {0x10eb}}},
+  {0x1cac, {1|F|D, {0x10ec}}},
+  {0x1cad, {1|F|D, {0x10ed}}},
+  {0x1cae, {1|F|D, {0x10ee}}},
+  {0x1caf, {1|F|D, {0x10ef}}},
+  {0x1cb0, {1|F|D, {0x10f0}}},
+  {0x1cb1, {1|F|D, {0x10f1}}},
+  {0x1cb2, {1|F|D, {0x10f2}}},
+  {0x1cb3, {1|F|D, {0x10f3}}},
+  {0x1cb4, {1|F|D, {0x10f4}}},
+  {0x1cb5, {1|F|D, {0x10f5}}},
+  {0x1cb6, {1|F|D, {0x10f6}}},
+  {0x1cb7, {1|F|D, {0x10f7}}},
+  {0x1cb8, {1|F|D, {0x10f8}}},
+  {0x1cb9, {1|F|D, {0x10f9}}},
+  {0x1cba, {1|F|D, {0x10fa}}},
+  {0x1cbd, {1|F|D, {0x10fd}}},
+  {0x1cbe, {1|F|D, {0x10fe}}},
+  {0x1cbf, {1|F|D, {0x10ff}}},
+  {0x1e00, {1|F|D, {0x1e01}}},
+  {0x1e02, {1|F|D, {0x1e03}}},
+  {0x1e04, {1|F|D, {0x1e05}}},
+  {0x1e06, {1|F|D, {0x1e07}}},
+  {0x1e08, {1|F|D, {0x1e09}}},
+  {0x1e0a, {1|F|D, {0x1e0b}}},
+  {0x1e0c, {1|F|D, {0x1e0d}}},
+  {0x1e0e, {1|F|D, {0x1e0f}}},
+  {0x1e10, {1|F|D, {0x1e11}}},
+  {0x1e12, {1|F|D, {0x1e13}}},
+  {0x1e14, {1|F|D, {0x1e15}}},
+  {0x1e16, {1|F|D, {0x1e17}}},
+  {0x1e18, {1|F|D, {0x1e19}}},
+  {0x1e1a, {1|F|D, {0x1e1b}}},
+  {0x1e1c, {1|F|D, {0x1e1d}}},
+  {0x1e1e, {1|F|D, {0x1e1f}}},
+  {0x1e20, {1|F|D, {0x1e21}}},
+  {0x1e22, {1|F|D, {0x1e23}}},
+  {0x1e24, {1|F|D, {0x1e25}}},
+  {0x1e26, {1|F|D, {0x1e27}}},
+  {0x1e28, {1|F|D, {0x1e29}}},
+  {0x1e2a, {1|F|D, {0x1e2b}}},
+  {0x1e2c, {1|F|D, {0x1e2d}}},
+  {0x1e2e, {1|F|D, {0x1e2f}}},
+  {0x1e30, {1|F|D, {0x1e31}}},
+  {0x1e32, {1|F|D, {0x1e33}}},
+  {0x1e34, {1|F|D, {0x1e35}}},
+  {0x1e36, {1|F|D, {0x1e37}}},
+  {0x1e38, {1|F|D, {0x1e39}}},
+  {0x1e3a, {1|F|D, {0x1e3b}}},
+  {0x1e3c, {1|F|D, {0x1e3d}}},
+  {0x1e3e, {1|F|D, {0x1e3f}}},
+  {0x1e40, {1|F|D, {0x1e41}}},
+  {0x1e42, {1|F|D, {0x1e43}}},
+  {0x1e44, {1|F|D, {0x1e45}}},
+  {0x1e46, {1|F|D, {0x1e47}}},
+  {0x1e48, {1|F|D, {0x1e49}}},
+  {0x1e4a, {1|F|D, {0x1e4b}}},
+  {0x1e4c, {1|F|D, {0x1e4d}}},
+  {0x1e4e, {1|F|D, {0x1e4f}}},
+  {0x1e50, {1|F|D, {0x1e51}}},
+  {0x1e52, {1|F|D, {0x1e53}}},
+  {0x1e54, {1|F|D, {0x1e55}}},
+  {0x1e56, {1|F|D, {0x1e57}}},
+  {0x1e58, {1|F|D, {0x1e59}}},
+  {0x1e5a, {1|F|D, {0x1e5b}}},
+  {0x1e5c, {1|F|D, {0x1e5d}}},
+  {0x1e5e, {1|F|D, {0x1e5f}}},
+  {0x1e60, {1|F|D, {0x1e61}}},
+  {0x1e62, {1|F|D, {0x1e63}}},
+  {0x1e64, {1|F|D, {0x1e65}}},
+  {0x1e66, {1|F|D, {0x1e67}}},
+  {0x1e68, {1|F|D, {0x1e69}}},
+  {0x1e6a, {1|F|D, {0x1e6b}}},
+  {0x1e6c, {1|F|D, {0x1e6d}}},
+  {0x1e6e, {1|F|D, {0x1e6f}}},
+  {0x1e70, {1|F|D, {0x1e71}}},
+  {0x1e72, {1|F|D, {0x1e73}}},
+  {0x1e74, {1|F|D, {0x1e75}}},
+  {0x1e76, {1|F|D, {0x1e77}}},
+  {0x1e78, {1|F|D, {0x1e79}}},
+  {0x1e7a, {1|F|D, {0x1e7b}}},
+  {0x1e7c, {1|F|D, {0x1e7d}}},
+  {0x1e7e, {1|F|D, {0x1e7f}}},
+  {0x1e80, {1|F|D, {0x1e81}}},
+  {0x1e82, {1|F|D, {0x1e83}}},
+  {0x1e84, {1|F|D, {0x1e85}}},
+  {0x1e86, {1|F|D, {0x1e87}}},
+  {0x1e88, {1|F|D, {0x1e89}}},
+  {0x1e8a, {1|F|D, {0x1e8b}}},
+  {0x1e8c, {1|F|D, {0x1e8d}}},
+  {0x1e8e, {1|F|D, {0x1e8f}}},
+  {0x1e90, {1|F|D, {0x1e91}}},
+  {0x1e92, {1|F|D, {0x1e93}}},
+  {0x1e94, {1|F|D, {0x1e95}}},
+  {0x1e96, {2|F|SU|I(54), {0x0068, 0x0331}}},
+  {0x1e97, {2|F|SU|I(56), {0x0074, 0x0308}}},
+  {0x1e98, {2|F|SU|I(58), {0x0077, 0x030a}}},
+  {0x1e99, {2|F|SU|I(60), {0x0079, 0x030a}}},
+  {0x1e9a, {2|F|SU|I(62), {0x0061, 0x02be}}},
+  {0x1e9b, {1|F|SU|I(64), {0x1e61}}},
+  {0x1e9e, {2|F|SL|I(65), {0x0073, 0x0073}}},
+  {0x1ea0, {1|F|D, {0x1ea1}}},
+  {0x1ea2, {1|F|D, {0x1ea3}}},
+  {0x1ea4, {1|F|D, {0x1ea5}}},
+  {0x1ea6, {1|F|D, {0x1ea7}}},
+  {0x1ea8, {1|F|D, {0x1ea9}}},
+  {0x1eaa, {1|F|D, {0x1eab}}},
+  {0x1eac, {1|F|D, {0x1ead}}},
+  {0x1eae, {1|F|D, {0x1eaf}}},
+  {0x1eb0, {1|F|D, {0x1eb1}}},
+  {0x1eb2, {1|F|D, {0x1eb3}}},
+  {0x1eb4, {1|F|D, {0x1eb5}}},
+  {0x1eb6, {1|F|D, {0x1eb7}}},
+  {0x1eb8, {1|F|D, {0x1eb9}}},
+  {0x1eba, {1|F|D, {0x1ebb}}},
+  {0x1ebc, {1|F|D, {0x1ebd}}},
+  {0x1ebe, {1|F|D, {0x1ebf}}},
+  {0x1ec0, {1|F|D, {0x1ec1}}},
+  {0x1ec2, {1|F|D, {0x1ec3}}},
+  {0x1ec4, {1|F|D, {0x1ec5}}},
+  {0x1ec6, {1|F|D, {0x1ec7}}},
+  {0x1ec8, {1|F|D, {0x1ec9}}},
+  {0x1eca, {1|F|D, {0x1ecb}}},
+  {0x1ecc, {1|F|D, {0x1ecd}}},
+  {0x1ece, {1|F|D, {0x1ecf}}},
+  {0x1ed0, {1|F|D, {0x1ed1}}},
+  {0x1ed2, {1|F|D, {0x1ed3}}},
+  {0x1ed4, {1|F|D, {0x1ed5}}},
+  {0x1ed6, {1|F|D, {0x1ed7}}},
+  {0x1ed8, {1|F|D, {0x1ed9}}},
+  {0x1eda, {1|F|D, {0x1edb}}},
+  {0x1edc, {1|F|D, {0x1edd}}},
+  {0x1ede, {1|F|D, {0x1edf}}},
+  {0x1ee0, {1|F|D, {0x1ee1}}},
+  {0x1ee2, {1|F|D, {0x1ee3}}},
+  {0x1ee4, {1|F|D, {0x1ee5}}},
+  {0x1ee6, {1|F|D, {0x1ee7}}},
+  {0x1ee8, {1|F|D, {0x1ee9}}},
+  {0x1eea, {1|F|D, {0x1eeb}}},
+  {0x1eec, {1|F|D, {0x1eed}}},
+  {0x1eee, {1|F|D, {0x1eef}}},
+  {0x1ef0, {1|F|D, {0x1ef1}}},
+  {0x1ef2, {1|F|D, {0x1ef3}}},
+  {0x1ef4, {1|F|D, {0x1ef5}}},
+  {0x1ef6, {1|F|D, {0x1ef7}}},
+  {0x1ef8, {1|F|D, {0x1ef9}}},
+  {0x1efa, {1|F|D, {0x1efb}}},
+  {0x1efc, {1|F|D, {0x1efd}}},
+  {0x1efe, {1|F|D, {0x1eff}}},
+  {0x1f08, {1|F|D, {0x1f00}}},
+  {0x1f09, {1|F|D, {0x1f01}}},
+  {0x1f0a, {1|F|D, {0x1f02}}},
+  {0x1f0b, {1|F|D, {0x1f03}}},
+  {0x1f0c, {1|F|D, {0x1f04}}},
+  {0x1f0d, {1|F|D, {0x1f05}}},
+  {0x1f0e, {1|F|D, {0x1f06}}},
+  {0x1f0f, {1|F|D, {0x1f07}}},
+  {0x1f18, {1|F|D, {0x1f10}}},
+  {0x1f19, {1|F|D, {0x1f11}}},
+  {0x1f1a, {1|F|D, {0x1f12}}},
+  {0x1f1b, {1|F|D, {0x1f13}}},
+  {0x1f1c, {1|F|D, {0x1f14}}},
+  {0x1f1d, {1|F|D, {0x1f15}}},
+  {0x1f28, {1|F|D, {0x1f20}}},
+  {0x1f29, {1|F|D, {0x1f21}}},
+  {0x1f2a, {1|F|D, {0x1f22}}},
+  {0x1f2b, {1|F|D, {0x1f23}}},
+  {0x1f2c, {1|F|D, {0x1f24}}},
+  {0x1f2d, {1|F|D, {0x1f25}}},
+  {0x1f2e, {1|F|D, {0x1f26}}},
+  {0x1f2f, {1|F|D, {0x1f27}}},
+  {0x1f38, {1|F|D, {0x1f30}}},
+  {0x1f39, {1|F|D, {0x1f31}}},
+  {0x1f3a, {1|F|D, {0x1f32}}},
+  {0x1f3b, {1|F|D, {0x1f33}}},
+  {0x1f3c, {1|F|D, {0x1f34}}},
+  {0x1f3d, {1|F|D, {0x1f35}}},
+  {0x1f3e, {1|F|D, {0x1f36}}},
+  {0x1f3f, {1|F|D, {0x1f37}}},
+  {0x1f48, {1|F|D, {0x1f40}}},
+  {0x1f49, {1|F|D, {0x1f41}}},
+  {0x1f4a, {1|F|D, {0x1f42}}},
+  {0x1f4b, {1|F|D, {0x1f43}}},
+  {0x1f4c, {1|F|D, {0x1f44}}},
+  {0x1f4d, {1|F|D, {0x1f45}}},
+  {0x1f50, {2|F|SU|I(66), {0x03c5, 0x0313}}},
+  {0x1f52, {3|F|SU|I(68), {0x03c5, 0x0313, 0x0300}}},
+  {0x1f54, {3|F|SU|I(71), {0x03c5, 0x0313, 0x0301}}},
+  {0x1f56, {3|F|SU|I(74), {0x03c5, 0x0313, 0x0342}}},
+  {0x1f59, {1|F|D, {0x1f51}}},
+  {0x1f5b, {1|F|D, {0x1f53}}},
+  {0x1f5d, {1|F|D, {0x1f55}}},
+  {0x1f5f, {1|F|D, {0x1f57}}},
+  {0x1f68, {1|F|D, {0x1f60}}},
+  {0x1f69, {1|F|D, {0x1f61}}},
+  {0x1f6a, {1|F|D, {0x1f62}}},
+  {0x1f6b, {1|F|D, {0x1f63}}},
+  {0x1f6c, {1|F|D, {0x1f64}}},
+  {0x1f6d, {1|F|D, {0x1f65}}},
+  {0x1f6e, {1|F|D, {0x1f66}}},
+  {0x1f6f, {1|F|D, {0x1f67}}},
+  {0x1f80, {2|F|ST|SU|I(77), {0x1f00, 0x03b9}}},
+  {0x1f81, {2|F|ST|SU|I(80), {0x1f01, 0x03b9}}},
+  {0x1f82, {2|F|ST|SU|I(83), {0x1f02, 0x03b9}}},
+  {0x1f83, {2|F|ST|SU|I(86), {0x1f03, 0x03b9}}},
+  {0x1f84, {2|F|ST|SU|I(89), {0x1f04, 0x03b9}}},
+  {0x1f85, {2|F|ST|SU|I(92), {0x1f05, 0x03b9}}},
+  {0x1f86, {2|F|ST|SU|I(95), {0x1f06, 0x03b9}}},
+  {0x1f87, {2|F|ST|SU|I(98), {0x1f07, 0x03b9}}},
+  {0x1f88, {2|F|IT|SL|SU|I(101), {0x1f00, 0x03b9}}},
+  {0x1f89, {2|F|IT|SL|SU|I(106), {0x1f01, 0x03b9}}},
+  {0x1f8a, {2|F|IT|SL|SU|I(111), {0x1f02, 0x03b9}}},
+  {0x1f8b, {2|F|IT|SL|SU|I(116), {0x1f03, 0x03b9}}},
+  {0x1f8c, {2|F|IT|SL|SU|I(121), {0x1f04, 0x03b9}}},
+  {0x1f8d, {2|F|IT|SL|SU|I(126), {0x1f05, 0x03b9}}},
+  {0x1f8e, {2|F|IT|SL|SU|I(131), {0x1f06, 0x03b9}}},
+  {0x1f8f, {2|F|IT|SL|SU|I(136), {0x1f07, 0x03b9}}},
+  {0x1f90, {2|F|ST|SU|I(141), {0x1f20, 0x03b9}}},
+  {0x1f91, {2|F|ST|SU|I(144), {0x1f21, 0x03b9}}},
+  {0x1f92, {2|F|ST|SU|I(147), {0x1f22, 0x03b9}}},
+  {0x1f93, {2|F|ST|SU|I(150), {0x1f23, 0x03b9}}},
+  {0x1f94, {2|F|ST|SU|I(153), {0x1f24, 0x03b9}}},
+  {0x1f95, {2|F|ST|SU|I(156), {0x1f25, 0x03b9}}},
+  {0x1f96, {2|F|ST|SU|I(159), {0x1f26, 0x03b9}}},
+  {0x1f97, {2|F|ST|SU|I(162), {0x1f27, 0x03b9}}},
+  {0x1f98, {2|F|IT|SL|SU|I(165), {0x1f20, 0x03b9}}},
+  {0x1f99, {2|F|IT|SL|SU|I(170), {0x1f21, 0x03b9}}},
+  {0x1f9a, {2|F|IT|SL|SU|I(175), {0x1f22, 0x03b9}}},
+  {0x1f9b, {2|F|IT|SL|SU|I(180), {0x1f23, 0x03b9}}},
+  {0x1f9c, {2|F|IT|SL|SU|I(185), {0x1f24, 0x03b9}}},
+  {0x1f9d, {2|F|IT|SL|SU|I(190), {0x1f25, 0x03b9}}},
+  {0x1f9e, {2|F|IT|SL|SU|I(195), {0x1f26, 0x03b9}}},
+  {0x1f9f, {2|F|IT|SL|SU|I(200), {0x1f27, 0x03b9}}},
+  {0x1fa0, {2|F|ST|SU|I(205), {0x1f60, 0x03b9}}},
+  {0x1fa1, {2|F|ST|SU|I(208), {0x1f61, 0x03b9}}},
+  {0x1fa2, {2|F|ST|SU|I(211), {0x1f62, 0x03b9}}},
+  {0x1fa3, {2|F|ST|SU|I(214), {0x1f63, 0x03b9}}},
+  {0x1fa4, {2|F|ST|SU|I(217), {0x1f64, 0x03b9}}},
+  {0x1fa5, {2|F|ST|SU|I(220), {0x1f65, 0x03b9}}},
+  {0x1fa6, {2|F|ST|SU|I(223), {0x1f66, 0x03b9}}},
+  {0x1fa7, {2|F|ST|SU|I(226), {0x1f67, 0x03b9}}},
+  {0x1fa8, {2|F|IT|SL|SU|I(229), {0x1f60, 0x03b9}}},
+  {0x1fa9, {2|F|IT|SL|SU|I(234), {0x1f61, 0x03b9}}},
+  {0x1faa, {2|F|IT|SL|SU|I(239), {0x1f62, 0x03b9}}},
+  {0x1fab, {2|F|IT|SL|SU|I(244), {0x1f63, 0x03b9}}},
+  {0x1fac, {2|F|IT|SL|SU|I(249), {0x1f64, 0x03b9}}},
+  {0x1fad, {2|F|IT|SL|SU|I(254), {0x1f65, 0x03b9}}},
+  {0x1fae, {2|F|IT|SL|SU|I(259), {0x1f66, 0x03b9}}},
+  {0x1faf, {2|F|IT|SL|SU|I(264), {0x1f67, 0x03b9}}},
+  {0x1fb2, {2|F|ST|SU|I(269), {0x1f70, 0x03b9}}},
+  {0x1fb3, {2|F|ST|SU|I(273), {0x03b1, 0x03b9}}},
+  {0x1fb4, {2|F|ST|SU|I(276), {0x03ac, 0x03b9}}},
+  {0x1fb6, {2|F|SU|I(280), {0x03b1, 0x0342}}},
+  {0x1fb7, {3|F|ST|SU|I(282), {0x03b1, 0x0342, 0x03b9}}},
+  {0x1fb8, {1|F|D, {0x1fb0}}},
+  {0x1fb9, {1|F|D, {0x1fb1}}},
+  {0x1fba, {1|F|D, {0x1f70}}},
+  {0x1fbb, {1|F|D, {0x1f71}}},
+  {0x1fbc, {2|F|IT|SL|SU|I(288), {0x03b1, 0x03b9}}},
+  {0x1fbe, {1|F|SU|I(293), {0x03b9}}},
+  {0x1fc2, {2|F|ST|SU|I(294), {0x1f74, 0x03b9}}},
+  {0x1fc3, {2|F|ST|SU|I(298), {0x03b7, 0x03b9}}},
+  {0x1fc4, {2|F|ST|SU|I(301), {0x03ae, 0x03b9}}},
+  {0x1fc6, {2|F|SU|I(305), {0x03b7, 0x0342}}},
+  {0x1fc7, {3|F|ST|SU|I(307), {0x03b7, 0x0342, 0x03b9}}},
+  {0x1fc8, {1|F|D, {0x1f72}}},
+  {0x1fc9, {1|F|D, {0x1f73}}},
+  {0x1fca, {1|F|D, {0x1f74}}},
+  {0x1fcb, {1|F|D, {0x1f75}}},
+  {0x1fcc, {2|F|IT|SL|SU|I(313), {0x03b7, 0x03b9}}},
+  {0x1fd2, {3|F|SU|I(318), {0x03b9, 0x0308, 0x0300}}},
+  {0x1fd3, {3|F|SU|I(321), {0x03b9, 0x0308, 0x0301}}},
+  {0x1fd6, {2|F|SU|I(324), {0x03b9, 0x0342}}},
+  {0x1fd7, {3|F|SU|I(326), {0x03b9, 0x0308, 0x0342}}},
+  {0x1fd8, {1|F|D, {0x1fd0}}},
+  {0x1fd9, {1|F|D, {0x1fd1}}},
+  {0x1fda, {1|F|D, {0x1f76}}},
+  {0x1fdb, {1|F|D, {0x1f77}}},
+  {0x1fe2, {3|F|SU|I(329), {0x03c5, 0x0308, 0x0300}}},
+  {0x1fe3, {3|F|SU|I(332), {0x03c5, 0x0308, 0x0301}}},
+  {0x1fe4, {2|F|SU|I(335), {0x03c1, 0x0313}}},
+  {0x1fe6, {2|F|SU|I(337), {0x03c5, 0x0342}}},
+  {0x1fe7, {3|F|SU|I(339), {0x03c5, 0x0308, 0x0342}}},
+  {0x1fe8, {1|F|D, {0x1fe0}}},
+  {0x1fe9, {1|F|D, {0x1fe1}}},
+  {0x1fea, {1|F|D, {0x1f7a}}},
+  {0x1feb, {1|F|D, {0x1f7b}}},
+  {0x1fec, {1|F|D, {0x1fe5}}},
+  {0x1ff2, {2|F|ST|SU|I(342), {0x1f7c, 0x03b9}}},
+  {0x1ff3, {2|F|ST|SU|I(346), {0x03c9, 0x03b9}}},
+  {0x1ff4, {2|F|ST|SU|I(349), {0x03ce, 0x03b9}}},
+  {0x1ff6, {2|F|SU|I(353), {0x03c9, 0x0342}}},
+  {0x1ff7, {3|F|ST|SU|I(355), {0x03c9, 0x0342, 0x03b9}}},
+  {0x1ff8, {1|F|D, {0x1f78}}},
+  {0x1ff9, {1|F|D, {0x1f79}}},
+  {0x1ffa, {1|F|D, {0x1f7c}}},
+  {0x1ffb, {1|F|D, {0x1f7d}}},
+  {0x1ffc, {2|F|IT|SL|SU|I(361), {0x03c9, 0x03b9}}},
+  {0x2126, {1|F|D, {0x03c9}}},
+  {0x212a, {1|F|D, {0x006b}}},
+  {0x212b, {1|F|D, {0x00e5}}},
+  {0x2132, {1|F|D, {0x214e}}},
+  {0x2160, {1|F|D, {0x2170}}},
+  {0x2161, {1|F|D, {0x2171}}},
+  {0x2162, {1|F|D, {0x2172}}},
+  {0x2163, {1|F|D, {0x2173}}},
+  {0x2164, {1|F|D, {0x2174}}},
+  {0x2165, {1|F|D, {0x2175}}},
+  {0x2166, {1|F|D, {0x2176}}},
+  {0x2167, {1|F|D, {0x2177}}},
+  {0x2168, {1|F|D, {0x2178}}},
+  {0x2169, {1|F|D, {0x2179}}},
+  {0x216a, {1|F|D, {0x217a}}},
+  {0x216b, {1|F|D, {0x217b}}},
+  {0x216c, {1|F|D, {0x217c}}},
+  {0x216d, {1|F|D, {0x217d}}},
+  {0x216e, {1|F|D, {0x217e}}},
+  {0x216f, {1|F|D, {0x217f}}},
+  {0x2183, {1|F|D, {0x2184}}},
+  {0x24b6, {1|F|D, {0x24d0}}},
+  {0x24b7, {1|F|D, {0x24d1}}},
+  {0x24b8, {1|F|D, {0x24d2}}},
+  {0x24b9, {1|F|D, {0x24d3}}},
+  {0x24ba, {1|F|D, {0x24d4}}},
+  {0x24bb, {1|F|D, {0x24d5}}},
+  {0x24bc, {1|F|D, {0x24d6}}},
+  {0x24bd, {1|F|D, {0x24d7}}},
+  {0x24be, {1|F|D, {0x24d8}}},
+  {0x24bf, {1|F|D, {0x24d9}}},
+  {0x24c0, {1|F|D, {0x24da}}},
+  {0x24c1, {1|F|D, {0x24db}}},
+  {0x24c2, {1|F|D, {0x24dc}}},
+  {0x24c3, {1|F|D, {0x24dd}}},
+  {0x24c4, {1|F|D, {0x24de}}},
+  {0x24c5, {1|F|D, {0x24df}}},
+  {0x24c6, {1|F|D, {0x24e0}}},
+  {0x24c7, {1|F|D, {0x24e1}}},
+  {0x24c8, {1|F|D, {0x24e2}}},
+  {0x24c9, {1|F|D, {0x24e3}}},
+  {0x24ca, {1|F|D, {0x24e4}}},
+  {0x24cb, {1|F|D, {0x24e5}}},
+  {0x24cc, {1|F|D, {0x24e6}}},
+  {0x24cd, {1|F|D, {0x24e7}}},
+  {0x24ce, {1|F|D, {0x24e8}}},
+  {0x24cf, {1|F|D, {0x24e9}}},
+  {0x2c00, {1|F|D, {0x2c30}}},
+  {0x2c01, {1|F|D, {0x2c31}}},
+  {0x2c02, {1|F|D, {0x2c32}}},
+  {0x2c03, {1|F|D, {0x2c33}}},
+  {0x2c04, {1|F|D, {0x2c34}}},
+  {0x2c05, {1|F|D, {0x2c35}}},
+  {0x2c06, {1|F|D, {0x2c36}}},
+  {0x2c07, {1|F|D, {0x2c37}}},
+  {0x2c08, {1|F|D, {0x2c38}}},
+  {0x2c09, {1|F|D, {0x2c39}}},
+  {0x2c0a, {1|F|D, {0x2c3a}}},
+  {0x2c0b, {1|F|D, {0x2c3b}}},
+  {0x2c0c, {1|F|D, {0x2c3c}}},
+  {0x2c0d, {1|F|D, {0x2c3d}}},
+  {0x2c0e, {1|F|D, {0x2c3e}}},
+  {0x2c0f, {1|F|D, {0x2c3f}}},
+  {0x2c10, {1|F|D, {0x2c40}}},
+  {0x2c11, {1|F|D, {0x2c41}}},
+  {0x2c12, {1|F|D, {0x2c42}}},
+  {0x2c13, {1|F|D, {0x2c43}}},
+  {0x2c14, {1|F|D, {0x2c44}}},
+  {0x2c15, {1|F|D, {0x2c45}}},
+  {0x2c16, {1|F|D, {0x2c46}}},
+  {0x2c17, {1|F|D, {0x2c47}}},
+  {0x2c18, {1|F|D, {0x2c48}}},
+  {0x2c19, {1|F|D, {0x2c49}}},
+  {0x2c1a, {1|F|D, {0x2c4a}}},
+  {0x2c1b, {1|F|D, {0x2c4b}}},
+  {0x2c1c, {1|F|D, {0x2c4c}}},
+  {0x2c1d, {1|F|D, {0x2c4d}}},
+  {0x2c1e, {1|F|D, {0x2c4e}}},
+  {0x2c1f, {1|F|D, {0x2c4f}}},
+  {0x2c20, {1|F|D, {0x2c50}}},
+  {0x2c21, {1|F|D, {0x2c51}}},
+  {0x2c22, {1|F|D, {0x2c52}}},
+  {0x2c23, {1|F|D, {0x2c53}}},
+  {0x2c24, {1|F|D, {0x2c54}}},
+  {0x2c25, {1|F|D, {0x2c55}}},
+  {0x2c26, {1|F|D, {0x2c56}}},
+  {0x2c27, {1|F|D, {0x2c57}}},
+  {0x2c28, {1|F|D, {0x2c58}}},
+  {0x2c29, {1|F|D, {0x2c59}}},
+  {0x2c2a, {1|F|D, {0x2c5a}}},
+  {0x2c2b, {1|F|D, {0x2c5b}}},
+  {0x2c2c, {1|F|D, {0x2c5c}}},
+  {0x2c2d, {1|F|D, {0x2c5d}}},
+  {0x2c2e, {1|F|D, {0x2c5e}}},
+  {0x2c60, {1|F|D, {0x2c61}}},
+  {0x2c62, {1|F|D, {0x026b}}},
+  {0x2c63, {1|F|D, {0x1d7d}}},
+  {0x2c64, {1|F|D, {0x027d}}},
+  {0x2c67, {1|F|D, {0x2c68}}},
+  {0x2c69, {1|F|D, {0x2c6a}}},
+  {0x2c6b, {1|F|D, {0x2c6c}}},
+  {0x2c6d, {1|F|D, {0x0251}}},
+  {0x2c6e, {1|F|D, {0x0271}}},
+  {0x2c6f, {1|F|D, {0x0250}}},
+  {0x2c70, {1|F|D, {0x0252}}},
+  {0x2c72, {1|F|D, {0x2c73}}},
+  {0x2c75, {1|F|D, {0x2c76}}},
+  {0x2c7e, {1|F|D, {0x023f}}},
+  {0x2c7f, {1|F|D, {0x0240}}},
+  {0x2c80, {1|F|D, {0x2c81}}},
+  {0x2c82, {1|F|D, {0x2c83}}},
+  {0x2c84, {1|F|D, {0x2c85}}},
+  {0x2c86, {1|F|D, {0x2c87}}},
+  {0x2c88, {1|F|D, {0x2c89}}},
+  {0x2c8a, {1|F|D, {0x2c8b}}},
+  {0x2c8c, {1|F|D, {0x2c8d}}},
+  {0x2c8e, {1|F|D, {0x2c8f}}},
+  {0x2c90, {1|F|D, {0x2c91}}},
+  {0x2c92, {1|F|D, {0x2c93}}},
+  {0x2c94, {1|F|D, {0x2c95}}},
+  {0x2c96, {1|F|D, {0x2c97}}},
+  {0x2c98, {1|F|D, {0x2c99}}},
+  {0x2c9a, {1|F|D, {0x2c9b}}},
+  {0x2c9c, {1|F|D, {0x2c9d}}},
+  {0x2c9e, {1|F|D, {0x2c9f}}},
+  {0x2ca0, {1|F|D, {0x2ca1}}},
+  {0x2ca2, {1|F|D, {0x2ca3}}},
+  {0x2ca4, {1|F|D, {0x2ca5}}},
+  {0x2ca6, {1|F|D, {0x2ca7}}},
+  {0x2ca8, {1|F|D, {0x2ca9}}},
+  {0x2caa, {1|F|D, {0x2cab}}},
+  {0x2cac, {1|F|D, {0x2cad}}},
+  {0x2cae, {1|F|D, {0x2caf}}},
+  {0x2cb0, {1|F|D, {0x2cb1}}},
+  {0x2cb2, {1|F|D, {0x2cb3}}},
+  {0x2cb4, {1|F|D, {0x2cb5}}},
+  {0x2cb6, {1|F|D, {0x2cb7}}},
+  {0x2cb8, {1|F|D, {0x2cb9}}},
+  {0x2cba, {1|F|D, {0x2cbb}}},
+  {0x2cbc, {1|F|D, {0x2cbd}}},
+  {0x2cbe, {1|F|D, {0x2cbf}}},
+  {0x2cc0, {1|F|D, {0x2cc1}}},
+  {0x2cc2, {1|F|D, {0x2cc3}}},
+  {0x2cc4, {1|F|D, {0x2cc5}}},
+  {0x2cc6, {1|F|D, {0x2cc7}}},
+  {0x2cc8, {1|F|D, {0x2cc9}}},
+  {0x2cca, {1|F|D, {0x2ccb}}},
+  {0x2ccc, {1|F|D, {0x2ccd}}},
+  {0x2cce, {1|F|D, {0x2ccf}}},
+  {0x2cd0, {1|F|D, {0x2cd1}}},
+  {0x2cd2, {1|F|D, {0x2cd3}}},
+  {0x2cd4, {1|F|D, {0x2cd5}}},
+  {0x2cd6, {1|F|D, {0x2cd7}}},
+  {0x2cd8, {1|F|D, {0x2cd9}}},
+  {0x2cda, {1|F|D, {0x2cdb}}},
+  {0x2cdc, {1|F|D, {0x2cdd}}},
+  {0x2cde, {1|F|D, {0x2cdf}}},
+  {0x2ce0, {1|F|D, {0x2ce1}}},
+  {0x2ce2, {1|F|D, {0x2ce3}}},
+  {0x2ceb, {1|F|D, {0x2cec}}},
+  {0x2ced, {1|F|D, {0x2cee}}},
+  {0x2cf2, {1|F|D, {0x2cf3}}},
+  {0xa640, {1|F|D, {0xa641}}},
+  {0xa642, {1|F|D, {0xa643}}},
+  {0xa644, {1|F|D, {0xa645}}},
+  {0xa646, {1|F|D, {0xa647}}},
+  {0xa648, {1|F|D, {0xa649}}},
+  {0xa64a, {1|F|D, {0xa64b}}},
+  {0xa64c, {1|F|D, {0xa64d}}},
+  {0xa64e, {1|F|D, {0xa64f}}},
+  {0xa650, {1|F|D, {0xa651}}},
+  {0xa652, {1|F|D, {0xa653}}},
+  {0xa654, {1|F|D, {0xa655}}},
+  {0xa656, {1|F|D, {0xa657}}},
+  {0xa658, {1|F|D, {0xa659}}},
+  {0xa65a, {1|F|D, {0xa65b}}},
+  {0xa65c, {1|F|D, {0xa65d}}},
+  {0xa65e, {1|F|D, {0xa65f}}},
+  {0xa660, {1|F|D, {0xa661}}},
+  {0xa662, {1|F|D, {0xa663}}},
+  {0xa664, {1|F|D, {0xa665}}},
+  {0xa666, {1|F|D, {0xa667}}},
+  {0xa668, {1|F|D, {0xa669}}},
+  {0xa66a, {1|F|D, {0xa66b}}},
+  {0xa66c, {1|F|D, {0xa66d}}},
+  {0xa680, {1|F|D, {0xa681}}},
+  {0xa682, {1|F|D, {0xa683}}},
+  {0xa684, {1|F|D, {0xa685}}},
+  {0xa686, {1|F|D, {0xa687}}},
+  {0xa688, {1|F|D, {0xa689}}},
+  {0xa68a, {1|F|D, {0xa68b}}},
+  {0xa68c, {1|F|D, {0xa68d}}},
+  {0xa68e, {1|F|D, {0xa68f}}},
+  {0xa690, {1|F|D, {0xa691}}},
+  {0xa692, {1|F|D, {0xa693}}},
+  {0xa694, {1|F|D, {0xa695}}},
+  {0xa696, {1|F|D, {0xa697}}},
+  {0xa698, {1|F|D, {0xa699}}},
+  {0xa69a, {1|F|D, {0xa69b}}},
+  {0xa722, {1|F|D, {0xa723}}},
+  {0xa724, {1|F|D, {0xa725}}},
+  {0xa726, {1|F|D, {0xa727}}},
+  {0xa728, {1|F|D, {0xa729}}},
+  {0xa72a, {1|F|D, {0xa72b}}},
+  {0xa72c, {1|F|D, {0xa72d}}},
+  {0xa72e, {1|F|D, {0xa72f}}},
+  {0xa732, {1|F|D, {0xa733}}},
+  {0xa734, {1|F|D, {0xa735}}},
+  {0xa736, {1|F|D, {0xa737}}},
+  {0xa738, {1|F|D, {0xa739}}},
+  {0xa73a, {1|F|D, {0xa73b}}},
+  {0xa73c, {1|F|D, {0xa73d}}},
+  {0xa73e, {1|F|D, {0xa73f}}},
+  {0xa740, {1|F|D, {0xa741}}},
+  {0xa742, {1|F|D, {0xa743}}},
+  {0xa744, {1|F|D, {0xa745}}},
+  {0xa746, {1|F|D, {0xa747}}},
+  {0xa748, {1|F|D, {0xa749}}},
+  {0xa74a, {1|F|D, {0xa74b}}},
+  {0xa74c, {1|F|D, {0xa74d}}},
+  {0xa74e, {1|F|D, {0xa74f}}},
+  {0xa750, {1|F|D, {0xa751}}},
+  {0xa752, {1|F|D, {0xa753}}},
+  {0xa754, {1|F|D, {0xa755}}},
+  {0xa756, {1|F|D, {0xa757}}},
+  {0xa758, {1|F|D, {0xa759}}},
+  {0xa75a, {1|F|D, {0xa75b}}},
+  {0xa75c, {1|F|D, {0xa75d}}},
+  {0xa75e, {1|F|D, {0xa75f}}},
+  {0xa760, {1|F|D, {0xa761}}},
+  {0xa762, {1|F|D, {0xa763}}},
+  {0xa764, {1|F|D, {0xa765}}},
+  {0xa766, {1|F|D, {0xa767}}},
+  {0xa768, {1|F|D, {0xa769}}},
+  {0xa76a, {1|F|D, {0xa76b}}},
+  {0xa76c, {1|F|D, {0xa76d}}},
+  {0xa76e, {1|F|D, {0xa76f}}},
+  {0xa779, {1|F|D, {0xa77a}}},
+  {0xa77b, {1|F|D, {0xa77c}}},
+  {0xa77d, {1|F|D, {0x1d79}}},
+  {0xa77e, {1|F|D, {0xa77f}}},
+  {0xa780, {1|F|D, {0xa781}}},
+  {0xa782, {1|F|D, {0xa783}}},
+  {0xa784, {1|F|D, {0xa785}}},
+  {0xa786, {1|F|D, {0xa787}}},
+  {0xa78b, {1|F|D, {0xa78c}}},
+  {0xa78d, {1|F|D, {0x0265}}},
+  {0xa790, {1|F|D, {0xa791}}},
+  {0xa792, {1|F|D, {0xa793}}},
+  {0xa796, {1|F|D, {0xa797}}},
+  {0xa798, {1|F|D, {0xa799}}},
+  {0xa79a, {1|F|D, {0xa79b}}},
+  {0xa79c, {1|F|D, {0xa79d}}},
+  {0xa79e, {1|F|D, {0xa79f}}},
+  {0xa7a0, {1|F|D, {0xa7a1}}},
+  {0xa7a2, {1|F|D, {0xa7a3}}},
+  {0xa7a4, {1|F|D, {0xa7a5}}},
+  {0xa7a6, {1|F|D, {0xa7a7}}},
+  {0xa7a8, {1|F|D, {0xa7a9}}},
+  {0xa7aa, {1|F|D, {0x0266}}},
+  {0xa7ab, {1|F|D, {0x025c}}},
+  {0xa7ac, {1|F|D, {0x0261}}},
+  {0xa7ad, {1|F|D, {0x026c}}},
+  {0xa7ae, {1|F|D, {0x026a}}},
+  {0xa7b0, {1|F|D, {0x029e}}},
+  {0xa7b1, {1|F|D, {0x0287}}},
+  {0xa7b2, {1|F|D, {0x029d}}},
+  {0xa7b3, {1|F|D, {0xab53}}},
+  {0xa7b4, {1|F|D, {0xa7b5}}},
+  {0xa7b6, {1|F|D, {0xa7b7}}},
+  {0xa7b8, {1|F|D, {0xa7b9}}},
+  {0xa7ba, {1|F|D, {0xa7bb}}},
+  {0xa7bc, {1|F|D, {0xa7bd}}},
+  {0xa7be, {1|F|D, {0xa7bf}}},
+  {0xa7c2, {1|F|D, {0xa7c3}}},
+  {0xa7c4, {1|F|D, {0xa794}}},
+  {0xa7c5, {1|F|D, {0x0282}}},
+  {0xa7c6, {1|F|D, {0x1d8e}}},
+  {0xab70, {1|F|U, {0x13a0}}},
+  {0xab71, {1|F|U, {0x13a1}}},
+  {0xab72, {1|F|U, {0x13a2}}},
+  {0xab73, {1|F|U, {0x13a3}}},
+  {0xab74, {1|F|U, {0x13a4}}},
+  {0xab75, {1|F|U, {0x13a5}}},
+  {0xab76, {1|F|U, {0x13a6}}},
+  {0xab77, {1|F|U, {0x13a7}}},
+  {0xab78, {1|F|U, {0x13a8}}},
+  {0xab79, {1|F|U, {0x13a9}}},
+  {0xab7a, {1|F|U, {0x13aa}}},
+  {0xab7b, {1|F|U, {0x13ab}}},
+  {0xab7c, {1|F|U, {0x13ac}}},
+  {0xab7d, {1|F|U, {0x13ad}}},
+  {0xab7e, {1|F|U, {0x13ae}}},
+  {0xab7f, {1|F|U, {0x13af}}},
+  {0xab80, {1|F|U, {0x13b0}}},
+  {0xab81, {1|F|U, {0x13b1}}},
+  {0xab82, {1|F|U, {0x13b2}}},
+  {0xab83, {1|F|U, {0x13b3}}},
+  {0xab84, {1|F|U, {0x13b4}}},
+  {0xab85, {1|F|U, {0x13b5}}},
+  {0xab86, {1|F|U, {0x13b6}}},
+  {0xab87, {1|F|U, {0x13b7}}},
+  {0xab88, {1|F|U, {0x13b8}}},
+  {0xab89, {1|F|U, {0x13b9}}},
+  {0xab8a, {1|F|U, {0x13ba}}},
+  {0xab8b, {1|F|U, {0x13bb}}},
+  {0xab8c, {1|F|U, {0x13bc}}},
+  {0xab8d, {1|F|U, {0x13bd}}},
+  {0xab8e, {1|F|U, {0x13be}}},
+  {0xab8f, {1|F|U, {0x13bf}}},
+  {0xab90, {1|F|U, {0x13c0}}},
+  {0xab91, {1|F|U, {0x13c1}}},
+  {0xab92, {1|F|U, {0x13c2}}},
+  {0xab93, {1|F|U, {0x13c3}}},
+  {0xab94, {1|F|U, {0x13c4}}},
+  {0xab95, {1|F|U, {0x13c5}}},
+  {0xab96, {1|F|U, {0x13c6}}},
+  {0xab97, {1|F|U, {0x13c7}}},
+  {0xab98, {1|F|U, {0x13c8}}},
+  {0xab99, {1|F|U, {0x13c9}}},
+  {0xab9a, {1|F|U, {0x13ca}}},
+  {0xab9b, {1|F|U, {0x13cb}}},
+  {0xab9c, {1|F|U, {0x13cc}}},
+  {0xab9d, {1|F|U, {0x13cd}}},
+  {0xab9e, {1|F|U, {0x13ce}}},
+  {0xab9f, {1|F|U, {0x13cf}}},
+  {0xaba0, {1|F|U, {0x13d0}}},
+  {0xaba1, {1|F|U, {0x13d1}}},
+  {0xaba2, {1|F|U, {0x13d2}}},
+  {0xaba3, {1|F|U, {0x13d3}}},
+  {0xaba4, {1|F|U, {0x13d4}}},
+  {0xaba5, {1|F|U, {0x13d5}}},
+  {0xaba6, {1|F|U, {0x13d6}}},
+  {0xaba7, {1|F|U, {0x13d7}}},
+  {0xaba8, {1|F|U, {0x13d8}}},
+  {0xaba9, {1|F|U, {0x13d9}}},
+  {0xabaa, {1|F|U, {0x13da}}},
+  {0xabab, {1|F|U, {0x13db}}},
+  {0xabac, {1|F|U, {0x13dc}}},
+  {0xabad, {1|F|U, {0x13dd}}},
+  {0xabae, {1|F|U, {0x13de}}},
+  {0xabaf, {1|F|U, {0x13df}}},
+  {0xabb0, {1|F|U, {0x13e0}}},
+  {0xabb1, {1|F|U, {0x13e1}}},
+  {0xabb2, {1|F|U, {0x13e2}}},
+  {0xabb3, {1|F|U, {0x13e3}}},
+  {0xabb4, {1|F|U, {0x13e4}}},
+  {0xabb5, {1|F|U, {0x13e5}}},
+  {0xabb6, {1|F|U, {0x13e6}}},
+  {0xabb7, {1|F|U, {0x13e7}}},
+  {0xabb8, {1|F|U, {0x13e8}}},
+  {0xabb9, {1|F|U, {0x13e9}}},
+  {0xabba, {1|F|U, {0x13ea}}},
+  {0xabbb, {1|F|U, {0x13eb}}},
+  {0xabbc, {1|F|U, {0x13ec}}},
+  {0xabbd, {1|F|U, {0x13ed}}},
+  {0xabbe, {1|F|U, {0x13ee}}},
+  {0xabbf, {1|F|U, {0x13ef}}},
+  {0xfb00, {2|F|ST|SU|I(366), {0x0066, 0x0066}}},
+  {0xfb01, {2|F|ST|SU|I(370), {0x0066, 0x0069}}},
+  {0xfb02, {2|F|ST|SU|I(374), {0x0066, 0x006c}}},
+  {0xfb03, {3|F|ST|SU|I(378), {0x0066, 0x0066, 0x0069}}},
+  {0xfb04, {3|F|ST|SU|I(384), {0x0066, 0x0066, 0x006c}}},
+  {0xfb05, {2|F|ST|SU|I(390), {0x0073, 0x0074}}},
+  {0xfb06, {2|F|ST|SU|I(394), {0x0073, 0x0074}}},
+  {0xfb13, {2|F|ST|SU|I(398), {0x0574, 0x0576}}},
+  {0xfb14, {2|F|ST|SU|I(402), {0x0574, 0x0565}}},
+  {0xfb15, {2|F|ST|SU|I(406), {0x0574, 0x056b}}},
+  {0xfb16, {2|F|ST|SU|I(410), {0x057e, 0x0576}}},
+  {0xfb17, {2|F|ST|SU|I(414), {0x0574, 0x056d}}},
+  {0xff21, {1|F|D, {0xff41}}},
+  {0xff22, {1|F|D, {0xff42}}},
+  {0xff23, {1|F|D, {0xff43}}},
+  {0xff24, {1|F|D, {0xff44}}},
+  {0xff25, {1|F|D, {0xff45}}},
+  {0xff26, {1|F|D, {0xff46}}},
+  {0xff27, {1|F|D, {0xff47}}},
+  {0xff28, {1|F|D, {0xff48}}},
+  {0xff29, {1|F|D, {0xff49}}},
+  {0xff2a, {1|F|D, {0xff4a}}},
+  {0xff2b, {1|F|D, {0xff4b}}},
+  {0xff2c, {1|F|D, {0xff4c}}},
+  {0xff2d, {1|F|D, {0xff4d}}},
+  {0xff2e, {1|F|D, {0xff4e}}},
+  {0xff2f, {1|F|D, {0xff4f}}},
+  {0xff30, {1|F|D, {0xff50}}},
+  {0xff31, {1|F|D, {0xff51}}},
+  {0xff32, {1|F|D, {0xff52}}},
+  {0xff33, {1|F|D, {0xff53}}},
+  {0xff34, {1|F|D, {0xff54}}},
+  {0xff35, {1|F|D, {0xff55}}},
+  {0xff36, {1|F|D, {0xff56}}},
+  {0xff37, {1|F|D, {0xff57}}},
+  {0xff38, {1|F|D, {0xff58}}},
+  {0xff39, {1|F|D, {0xff59}}},
+  {0xff3a, {1|F|D, {0xff5a}}},
+  {0x10400, {1|F|D, {0x10428}}},
+  {0x10401, {1|F|D, {0x10429}}},
+  {0x10402, {1|F|D, {0x1042a}}},
+  {0x10403, {1|F|D, {0x1042b}}},
+  {0x10404, {1|F|D, {0x1042c}}},
+  {0x10405, {1|F|D, {0x1042d}}},
+  {0x10406, {1|F|D, {0x1042e}}},
+  {0x10407, {1|F|D, {0x1042f}}},
+  {0x10408, {1|F|D, {0x10430}}},
+  {0x10409, {1|F|D, {0x10431}}},
+  {0x1040a, {1|F|D, {0x10432}}},
+  {0x1040b, {1|F|D, {0x10433}}},
+  {0x1040c, {1|F|D, {0x10434}}},
+  {0x1040d, {1|F|D, {0x10435}}},
+  {0x1040e, {1|F|D, {0x10436}}},
+  {0x1040f, {1|F|D, {0x10437}}},
+  {0x10410, {1|F|D, {0x10438}}},
+  {0x10411, {1|F|D, {0x10439}}},
+  {0x10412, {1|F|D, {0x1043a}}},
+  {0x10413, {1|F|D, {0x1043b}}},
+  {0x10414, {1|F|D, {0x1043c}}},
+  {0x10415, {1|F|D, {0x1043d}}},
+  {0x10416, {1|F|D, {0x1043e}}},
+  {0x10417, {1|F|D, {0x1043f}}},
+  {0x10418, {1|F|D, {0x10440}}},
+  {0x10419, {1|F|D, {0x10441}}},
+  {0x1041a, {1|F|D, {0x10442}}},
+  {0x1041b, {1|F|D, {0x10443}}},
+  {0x1041c, {1|F|D, {0x10444}}},
+  {0x1041d, {1|F|D, {0x10445}}},
+  {0x1041e, {1|F|D, {0x10446}}},
+  {0x1041f, {1|F|D, {0x10447}}},
+  {0x10420, {1|F|D, {0x10448}}},
+  {0x10421, {1|F|D, {0x10449}}},
+  {0x10422, {1|F|D, {0x1044a}}},
+  {0x10423, {1|F|D, {0x1044b}}},
+  {0x10424, {1|F|D, {0x1044c}}},
+  {0x10425, {1|F|D, {0x1044d}}},
+  {0x10426, {1|F|D, {0x1044e}}},
+  {0x10427, {1|F|D, {0x1044f}}},
+  {0x104b0, {1|F|D, {0x104d8}}},
+  {0x104b1, {1|F|D, {0x104d9}}},
+  {0x104b2, {1|F|D, {0x104da}}},
+  {0x104b3, {1|F|D, {0x104db}}},
+  {0x104b4, {1|F|D, {0x104dc}}},
+  {0x104b5, {1|F|D, {0x104dd}}},
+  {0x104b6, {1|F|D, {0x104de}}},
+  {0x104b7, {1|F|D, {0x104df}}},
+  {0x104b8, {1|F|D, {0x104e0}}},
+  {0x104b9, {1|F|D, {0x104e1}}},
+  {0x104ba, {1|F|D, {0x104e2}}},
+  {0x104bb, {1|F|D, {0x104e3}}},
+  {0x104bc, {1|F|D, {0x104e4}}},
+  {0x104bd, {1|F|D, {0x104e5}}},
+  {0x104be, {1|F|D, {0x104e6}}},
+  {0x104bf, {1|F|D, {0x104e7}}},
+  {0x104c0, {1|F|D, {0x104e8}}},
+  {0x104c1, {1|F|D, {0x104e9}}},
+  {0x104c2, {1|F|D, {0x104ea}}},
+  {0x104c3, {1|F|D, {0x104eb}}},
+  {0x104c4, {1|F|D, {0x104ec}}},
+  {0x104c5, {1|F|D, {0x104ed}}},
+  {0x104c6, {1|F|D, {0x104ee}}},
+  {0x104c7, {1|F|D, {0x104ef}}},
+  {0x104c8, {1|F|D, {0x104f0}}},
+  {0x104c9, {1|F|D, {0x104f1}}},
+  {0x104ca, {1|F|D, {0x104f2}}},
+  {0x104cb, {1|F|D, {0x104f3}}},
+  {0x104cc, {1|F|D, {0x104f4}}},
+  {0x104cd, {1|F|D, {0x104f5}}},
+  {0x104ce, {1|F|D, {0x104f6}}},
+  {0x104cf, {1|F|D, {0x104f7}}},
+  {0x104d0, {1|F|D, {0x104f8}}},
+  {0x104d1, {1|F|D, {0x104f9}}},
+  {0x104d2, {1|F|D, {0x104fa}}},
+  {0x104d3, {1|F|D, {0x104fb}}},
+  {0x10c80, {1|F|D, {0x10cc0}}},
+  {0x10c81, {1|F|D, {0x10cc1}}},
+  {0x10c82, {1|F|D, {0x10cc2}}},
+  {0x10c83, {1|F|D, {0x10cc3}}},
+  {0x10c84, {1|F|D, {0x10cc4}}},
+  {0x10c85, {1|F|D, {0x10cc5}}},
+  {0x10c86, {1|F|D, {0x10cc6}}},
+  {0x10c87, {1|F|D, {0x10cc7}}},
+  {0x10c88, {1|F|D, {0x10cc8}}},
+  {0x10c89, {1|F|D, {0x10cc9}}},
+  {0x10c8a, {1|F|D, {0x10cca}}},
+  {0x10c8b, {1|F|D, {0x10ccb}}},
+  {0x10c8c, {1|F|D, {0x10ccc}}},
+  {0x10c8d, {1|F|D, {0x10ccd}}},
+  {0x10c8e, {1|F|D, {0x10cce}}},
+  {0x10c8f, {1|F|D, {0x10ccf}}},
+  {0x10c90, {1|F|D, {0x10cd0}}},
+  {0x10c91, {1|F|D, {0x10cd1}}},
+  {0x10c92, {1|F|D, {0x10cd2}}},
+  {0x10c93, {1|F|D, {0x10cd3}}},
+  {0x10c94, {1|F|D, {0x10cd4}}},
+  {0x10c95, {1|F|D, {0x10cd5}}},
+  {0x10c96, {1|F|D, {0x10cd6}}},
+  {0x10c97, {1|F|D, {0x10cd7}}},
+  {0x10c98, {1|F|D, {0x10cd8}}},
+  {0x10c99, {1|F|D, {0x10cd9}}},
+  {0x10c9a, {1|F|D, {0x10cda}}},
+  {0x10c9b, {1|F|D, {0x10cdb}}},
+  {0x10c9c, {1|F|D, {0x10cdc}}},
+  {0x10c9d, {1|F|D, {0x10cdd}}},
+  {0x10c9e, {1|F|D, {0x10cde}}},
+  {0x10c9f, {1|F|D, {0x10cdf}}},
+  {0x10ca0, {1|F|D, {0x10ce0}}},
+  {0x10ca1, {1|F|D, {0x10ce1}}},
+  {0x10ca2, {1|F|D, {0x10ce2}}},
+  {0x10ca3, {1|F|D, {0x10ce3}}},
+  {0x10ca4, {1|F|D, {0x10ce4}}},
+  {0x10ca5, {1|F|D, {0x10ce5}}},
+  {0x10ca6, {1|F|D, {0x10ce6}}},
+  {0x10ca7, {1|F|D, {0x10ce7}}},
+  {0x10ca8, {1|F|D, {0x10ce8}}},
+  {0x10ca9, {1|F|D, {0x10ce9}}},
+  {0x10caa, {1|F|D, {0x10cea}}},
+  {0x10cab, {1|F|D, {0x10ceb}}},
+  {0x10cac, {1|F|D, {0x10cec}}},
+  {0x10cad, {1|F|D, {0x10ced}}},
+  {0x10cae, {1|F|D, {0x10cee}}},
+  {0x10caf, {1|F|D, {0x10cef}}},
+  {0x10cb0, {1|F|D, {0x10cf0}}},
+  {0x10cb1, {1|F|D, {0x10cf1}}},
+  {0x10cb2, {1|F|D, {0x10cf2}}},
+  {0x118a0, {1|F|D, {0x118c0}}},
+  {0x118a1, {1|F|D, {0x118c1}}},
+  {0x118a2, {1|F|D, {0x118c2}}},
+  {0x118a3, {1|F|D, {0x118c3}}},
+  {0x118a4, {1|F|D, {0x118c4}}},
+  {0x118a5, {1|F|D, {0x118c5}}},
+  {0x118a6, {1|F|D, {0x118c6}}},
+  {0x118a7, {1|F|D, {0x118c7}}},
+  {0x118a8, {1|F|D, {0x118c8}}},
+  {0x118a9, {1|F|D, {0x118c9}}},
+  {0x118aa, {1|F|D, {0x118ca}}},
+  {0x118ab, {1|F|D, {0x118cb}}},
+  {0x118ac, {1|F|D, {0x118cc}}},
+  {0x118ad, {1|F|D, {0x118cd}}},
+  {0x118ae, {1|F|D, {0x118ce}}},
+  {0x118af, {1|F|D, {0x118cf}}},
+  {0x118b0, {1|F|D, {0x118d0}}},
+  {0x118b1, {1|F|D, {0x118d1}}},
+  {0x118b2, {1|F|D, {0x118d2}}},
+  {0x118b3, {1|F|D, {0x118d3}}},
+  {0x118b4, {1|F|D, {0x118d4}}},
+  {0x118b5, {1|F|D, {0x118d5}}},
+  {0x118b6, {1|F|D, {0x118d6}}},
+  {0x118b7, {1|F|D, {0x118d7}}},
+  {0x118b8, {1|F|D, {0x118d8}}},
+  {0x118b9, {1|F|D, {0x118d9}}},
+  {0x118ba, {1|F|D, {0x118da}}},
+  {0x118bb, {1|F|D, {0x118db}}},
+  {0x118bc, {1|F|D, {0x118dc}}},
+  {0x118bd, {1|F|D, {0x118dd}}},
+  {0x118be, {1|F|D, {0x118de}}},
+  {0x118bf, {1|F|D, {0x118df}}},
+  {0x16e40, {1|F|D, {0x16e60}}},
+  {0x16e41, {1|F|D, {0x16e61}}},
+  {0x16e42, {1|F|D, {0x16e62}}},
+  {0x16e43, {1|F|D, {0x16e63}}},
+  {0x16e44, {1|F|D, {0x16e64}}},
+  {0x16e45, {1|F|D, {0x16e65}}},
+  {0x16e46, {1|F|D, {0x16e66}}},
+  {0x16e47, {1|F|D, {0x16e67}}},
+  {0x16e48, {1|F|D, {0x16e68}}},
+  {0x16e49, {1|F|D, {0x16e69}}},
+  {0x16e4a, {1|F|D, {0x16e6a}}},
+  {0x16e4b, {1|F|D, {0x16e6b}}},
+  {0x16e4c, {1|F|D, {0x16e6c}}},
+  {0x16e4d, {1|F|D, {0x16e6d}}},
+  {0x16e4e, {1|F|D, {0x16e6e}}},
+  {0x16e4f, {1|F|D, {0x16e6f}}},
+  {0x16e50, {1|F|D, {0x16e70}}},
+  {0x16e51, {1|F|D, {0x16e71}}},
+  {0x16e52, {1|F|D, {0x16e72}}},
+  {0x16e53, {1|F|D, {0x16e73}}},
+  {0x16e54, {1|F|D, {0x16e74}}},
+  {0x16e55, {1|F|D, {0x16e75}}},
+  {0x16e56, {1|F|D, {0x16e76}}},
+  {0x16e57, {1|F|D, {0x16e77}}},
+  {0x16e58, {1|F|D, {0x16e78}}},
+  {0x16e59, {1|F|D, {0x16e79}}},
+  {0x16e5a, {1|F|D, {0x16e7a}}},
+  {0x16e5b, {1|F|D, {0x16e7b}}},
+  {0x16e5c, {1|F|D, {0x16e7c}}},
+  {0x16e5d, {1|F|D, {0x16e7d}}},
+  {0x16e5e, {1|F|D, {0x16e7e}}},
+  {0x16e5f, {1|F|D, {0x16e7f}}},
+  {0x1e900, {1|F|D, {0x1e922}}},
+  {0x1e901, {1|F|D, {0x1e923}}},
+  {0x1e902, {1|F|D, {0x1e924}}},
+  {0x1e903, {1|F|D, {0x1e925}}},
+  {0x1e904, {1|F|D, {0x1e926}}},
+  {0x1e905, {1|F|D, {0x1e927}}},
+  {0x1e906, {1|F|D, {0x1e928}}},
+  {0x1e907, {1|F|D, {0x1e929}}},
+  {0x1e908, {1|F|D, {0x1e92a}}},
+  {0x1e909, {1|F|D, {0x1e92b}}},
+  {0x1e90a, {1|F|D, {0x1e92c}}},
+  {0x1e90b, {1|F|D, {0x1e92d}}},
+  {0x1e90c, {1|F|D, {0x1e92e}}},
+  {0x1e90d, {1|F|D, {0x1e92f}}},
+  {0x1e90e, {1|F|D, {0x1e930}}},
+  {0x1e90f, {1|F|D, {0x1e931}}},
+  {0x1e910, {1|F|D, {0x1e932}}},
+  {0x1e911, {1|F|D, {0x1e933}}},
+  {0x1e912, {1|F|D, {0x1e934}}},
+  {0x1e913, {1|F|D, {0x1e935}}},
+  {0x1e914, {1|F|D, {0x1e936}}},
+  {0x1e915, {1|F|D, {0x1e937}}},
+  {0x1e916, {1|F|D, {0x1e938}}},
+  {0x1e917, {1|F|D, {0x1e939}}},
+  {0x1e918, {1|F|D, {0x1e93a}}},
+  {0x1e919, {1|F|D, {0x1e93b}}},
+  {0x1e91a, {1|F|D, {0x1e93c}}},
+  {0x1e91b, {1|F|D, {0x1e93d}}},
+  {0x1e91c, {1|F|D, {0x1e93e}}},
+  {0x1e91d, {1|F|D, {0x1e93f}}},
+  {0x1e91e, {1|F|D, {0x1e940}}},
+  {0x1e91f, {1|F|D, {0x1e941}}},
+  {0x1e920, {1|F|D, {0x1e942}}},
+  {0x1e921, {1|F|D, {0x1e943}}},
+#define CaseFold_Locale (*(CaseFold_11_Type (*)[2])(CaseFold_11_Table+1485))
+  {0x0049, {1|F|D, {0x0069}}},
+  {0x0130, {2|F|D, {0x0069, 0x0307}}},
+};
+
+/* ANSI-C code produced by gperf version 3.1 */
+/* Command-line: gperf -7 -k1,2,3 -F,-1 -c -j1 -i1 -t -T -E -C -H onigenc_unicode_CaseFold_11_hash -N onigenc_unicode_CaseFold_11_lookup -n  */
+
+/* maximum key range = 3500, duplicates = 0 */
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+/*ARGSUSED*/
+static unsigned int
+onigenc_unicode_CaseFold_11_hash(const OnigCodePoint code)
+{
+  static const unsigned short asso_values[] =
+    {
+         5,  273,    4,    8,    3,    1,   86,    9,    2,  289,
+       290,    3, 3510, 3510, 3510, 3510, 3510, 3510, 3510, 3510,
+      3510, 3510, 3510, 3510, 3510,   50, 3510, 3510, 3510, 3510,
+      3510, 3510, 3510,  225, 3510, 3510, 3510, 3510, 3510,   28,
+      3510, 3510, 3510, 3510, 3510, 3510, 3510, 3510, 3510,  394,
+      3510, 3510, 3510, 3510, 3510, 3510, 3510,   47, 3510, 3510,
+       255,   40,  286,    1, 3510, 3510,  599,    8, 3510, 3510,
+      3510, 3510, 3510,  282, 3510, 3510,  267,  667,  473,   39,
+      2019,  189,   47,  175, 2001,  107, 1626,    6,   12,   25,
+      1961,  678, 1128,  526, 1945,  148, 1923,  371, 1720,  134,
+      1857,   80, 1375,   66, 1705,  300, 1635,  445, 1611,  472,
+      1795,  216, 1303,  499, 1552,  270, 1511,  243,  121,  619,
+      1284,  540,  875,  592, 1484,  567,  412,  703, 1692,  387,
+      1782,  781, 1767,  664, 1718,  648, 1316,  608, 1647,  715,
+      1592,  771, 1544, 1029, 1563,  887, 1296,  861, 1194,  978,
+        95,  899, 1257,  835, 1335,  765, 1529,  984,  862,  938,
+      1460,  759,  329, 1079, 1159,  940,  234, 1101, 1204,  990,
+       949, 1493,   92, 1438,   77, 1391,    7, 1073,   44, 1377,
+         2, 1435,    4, 1321,  428, 1274,  332, 1206,   11, 1426,
+        46,  478,  200, 1502,   31, 1400,  153, 1663,  352, 1820,
+       229, 1733,  265, 1405,  315, 1879,  198
+    };
+  return asso_values[bits_of(code, 2)+79] + asso_values[bits_of(code, 1)] + asso_values[bits_of(code, 0)];
+}
+
+static const CodePointList3 *
+onigenc_unicode_CaseFold_11_lookup(const OnigCodePoint code)
+{
+  enum
+    {
+      MIN_CODE_VALUE = 0x41,
+      MAX_CODE_VALUE = 0x1e921,
+      TOTAL_KEYWORDS = 1487,
+      MIN_WORD_LENGTH = 3,
+      MAX_WORD_LENGTH = 3,
+      MIN_HASH_VALUE = 10,
+      MAX_HASH_VALUE = 3509
+    };
+
+  static const short wordlist[] =
+    {
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0x1fe7*/ 848,
+      /*0x10408*/ 1268,
+      /*0x1f88*/ 775,
+      /*0x0408*/ 305,
+      /*0x0208*/ 194,
+      /*0x0108*/ 61,
+      /*0xab88*/ 1166,
+      /*0x10409*/ 1269,
+      /*0x1f89*/ 776,
+      /*0x0409*/ 306,
+      /*0x0388*/ 235,
+      /*0x2c67*/ 962,
+      /*0xab89*/ 1167,
+      /*0x2c08*/ 919,
+      -1,
+      /*0x0189*/ 126,
+      /*0x0389*/ 236,
+      -1,
+      /*0x2c6d*/ 965,
+      /*0x2c09*/ 920,
+      /*0x1040a*/ 1270,
+      /*0x1f8a*/ 777,
+      /*0x040a*/ 307,
+      /*0x020a*/ 195,
+      /*0x010a*/ 62,
+      /*0xab8a*/ 1168,
+      /*0x2c88*/ 977,
+      /*0x1ff3*/ 855,
+      /*0x018a*/ 127,
+      /*0x038a*/ 237,
+      -1,
+      /*0x2ced*/ 1024,
+      /*0x2c0a*/ 921,
+      -1,
+      /*0x10400*/ 1260,
+      /*0x1f80*/ 767,
+      /*0x0400*/ 297,
+      /*0x0200*/ 190,
+      /*0x0100*/ 57,
+      /*0xab80*/ 1158,
+      /*0x1fe3*/ 845,
+      /*0x1e88*/ 653,
+      /*0x10403*/ 1263,
+      /*0x1f83*/ 770,
+      /*0x0403*/ 300,
+      /*0x2c8a*/ 978,
+      /*0x2c00*/ 911,
+      /*0xab83*/ 1161,
+      /*0x1c88*/ 538,
+      /*0x10c88*/ 1344,
+      /*0x2183*/ 884,
+      /*0x2c63*/ 960,
+      /*0x1e908*/ 1459,
+      /*0x2c6f*/ 967,
+      /*0x2c03*/ 914,
+      /*0x10c89*/ 1345,
+      -1, -1,
+      /*0x1e909*/ 1460,
+      /*0x2c80*/ 973,
+      /*0x1e8a*/ 654,
+      /*0x10418*/ 1284,
+      /*0x1f98*/ 791,
+      /*0x0418*/ 321,
+      /*0x0218*/ 202,
+      /*0x0118*/ 69,
+      /*0xab98*/ 1182,
+      -1,
+      /*0x10c8a*/ 1346,
+      /*0x0198*/ 137,
+      /*0x0398*/ 249,
+      /*0x1e90a*/ 1461,
+      /*0xa780*/ 1105,
+      /*0x2c18*/ 935,
+      /*0x1e80*/ 649,
+      /*0x10416*/ 1282,
+      /*0x1f96*/ 789,
+      /*0x0416*/ 319,
+      /*0x0216*/ 201,
+      /*0x0116*/ 68,
+      /*0xab96*/ 1180,
+      /*0x1c80*/ 530,
+      /*0x10c80*/ 1336,
+      /*0x0196*/ 135,
+      /*0x0396*/ 247,
+      /*0x1e900*/ 1451,
+      /*0x2c98*/ 985,
+      /*0x2c16*/ 933,
+      -1,
+      /*0x1c83*/ 533,
+      /*0x10c83*/ 1339,
+      /*0x1fc7*/ 830,
+      -1,
+      /*0x1e903*/ 1454,
+      /*0x0147*/ 91,
+      /*0x0047*/ 6,
+      -1, -1,
+      /*0x01c7*/ 159,
+      /*0xa798*/ 1114,
+      /*0x2c96*/ 984,
+      /*0x1e98*/ 662,
+      /*0x10406*/ 1266,
+      /*0x1f86*/ 773,
+      /*0x0406*/ 303,
+      /*0x0206*/ 193,
+      /*0x0106*/ 60,
+      /*0xab86*/ 1164,
+      /*0x1c98*/ 547,
+      /*0x10c98*/ 1360,
+      /*0x0186*/ 124,
+      /*0x0386*/ 234,
+      /*0x1e918*/ 1475,
+      /*0xa796*/ 1113,
+      /*0x2c06*/ 917,
+      /*0x1e96*/ 660,
+      /*0x10427*/ 1299,
+      /*0x1fa7*/ 806,
+      /*0x0427*/ 336,
+      -1, -1,
+      /*0xaba7*/ 1197,
+      /*0x1c96*/ 545,
+      /*0x10c96*/ 1358,
+      /*0x01a7*/ 145,
+      /*0x03a7*/ 263,
+      /*0x1e916*/ 1473,
+      /*0x2c86*/ 976,
+      /*0x2c27*/ 950,
+      /*0x10414*/ 1280,
+      /*0x1f94*/ 787,
+      /*0x0414*/ 317,
+      /*0x0214*/ 200,
+      /*0x0114*/ 67,
+      /*0xab94*/ 1178,
+      -1, -1,
+      /*0x0194*/ 134,
+      /*0x0394*/ 245,
+      -1,
+      /*0xa786*/ 1108,
+      /*0x2c14*/ 931,
+      /*0x1e86*/ 652,
+      /*0x10410*/ 1276,
+      /*0x1f90*/ 783,
+      /*0x0410*/ 313,
+      /*0x0210*/ 198,
+      /*0x0110*/ 65,
+      /*0xab90*/ 1174,
+      /*0x1c86*/ 536,
+      /*0x10c86*/ 1342,
+      /*0x0190*/ 131,
+      /*0x0390*/ 241,
+      /*0x1e906*/ 1457,
+      /*0x2c94*/ 983,
+      /*0x2c10*/ 927,
+      -1,
+      /*0x03f5*/ 290,
+      /*0xfb00*/ 1222,
+      -1,
+      /*0x2c75*/ 970,
+      -1, -1,
+      /*0x1ca7*/ 562,
+      /*0x10ca7*/ 1375,
+      -1,
+      /*0xfb03*/ 1225,
+      -1,
+      /*0x2c90*/ 981,
+      /*0x1e94*/ 659,
+      /*0x10404*/ 1264,
+      /*0x1f84*/ 771,
+      /*0x0404*/ 301,
+      /*0x0204*/ 192,
+      /*0x0104*/ 59,
+      /*0xab84*/ 1162,
+      /*0x1c94*/ 543,
+      /*0x10c94*/ 1356,
+      /*0x0184*/ 123,
+      -1,
+      /*0x1e914*/ 1471,
+      /*0xa790*/ 1111,
+      /*0x2c04*/ 915,
+      /*0x1e90*/ 657,
+      /*0x10402*/ 1262,
+      /*0x1f82*/ 769,
+      /*0x0402*/ 299,
+      /*0x0202*/ 191,
+      /*0x0102*/ 58,
+      /*0xab82*/ 1160,
+      /*0x1c90*/ 539,
+      /*0x10c90*/ 1352,
+      /*0x0182*/ 122,
+      -1,
+      /*0x1e910*/ 1467,
+      /*0x2c84*/ 975,
+      /*0x2c02*/ 913,
+      /*0x017f*/ 120,
+      -1,
+      /*0xfb16*/ 1232,
+      -1, -1,
+      /*0x03ff*/ 296,
+      /*0x01f1*/ 181,
+      /*0x03f1*/ 288,
+      /*0x2c7f*/ 972,
+      -1, -1,
+      /*0xa784*/ 1107,
+      /*0x2c82*/ 974,
+      /*0x1e84*/ 651,
+      /*0x10420*/ 1292,
+      /*0x1fa0*/ 799,
+      /*0x0420*/ 329,
+      /*0x0220*/ 206,
+      /*0x0120*/ 73,
+      /*0xaba0*/ 1190,
+      /*0x1c84*/ 534,
+      /*0x10c84*/ 1340,
+      /*0x01a0*/ 141,
+      /*0x03a0*/ 257,
+      /*0x1e904*/ 1455,
+      /*0xa782*/ 1106,
+      /*0x2c20*/ 943,
+      /*0x1e82*/ 650,
+      /*0x1ff9*/ 860,
+      /*0xfb06*/ 1228,
+      -1,
+      /*0x0179*/ 117,
+      -1,
+      /*0x1fd7*/ 839,
+      /*0x1c82*/ 532,
+      /*0x10c82*/ 1338,
+      /*0x03f9*/ 292,
+      /*0x0057*/ 21,
+      /*0x1e902*/ 1453,
+      /*0x2ca0*/ 989,
+      /*0x01d7*/ 168,
+      /*0x10426*/ 1298,
+      /*0x1fa6*/ 805,
+      /*0x0426*/ 335,
+      /*0x0226*/ 209,
+      /*0x0126*/ 76,
+      /*0xaba6*/ 1196,
+      -1, -1,
+      /*0x01a6*/ 144,
+      /*0x03a6*/ 262,
+      -1,
+      /*0xa7a0*/ 1118,
+      /*0x2c26*/ 949,
+      /*0x1ea0*/ 667,
+      /*0x13f9*/ 525,
+      /*0xfb14*/ 1230,
+      -1, -1,
+      /*0x1e08*/ 589,
+      -1,
+      /*0x1ca0*/ 555,
+      /*0x10ca0*/ 1368,
+      -1,
+      /*0x1ffb*/ 862,
+      /*0x1e920*/ 1483,
+      /*0x2ca6*/ 992,
+      /*0x017b*/ 118,
+      /*0x10424*/ 1296,
+      /*0x1fa4*/ 803,
+      /*0x0424*/ 333,
+      /*0x0224*/ 208,
+      /*0x0124*/ 75,
+      /*0xaba4*/ 1194,
+      -1, -1,
+      /*0x01a4*/ 143,
+      /*0x03a4*/ 260,
+      /*0x1e0a*/ 590,
+      /*0xa7a6*/ 1121,
+      /*0x2c24*/ 947,
+      /*0x1ea6*/ 670,
+      /*0x037f*/ 233,
+      -1, -1, -1, -1, -1,
+      /*0x1ca6*/ 561,
+      /*0x10ca6*/ 1374,
+      /*0x1f08*/ 715,
+      /*0x13fb*/ 527,
+      /*0x1e00*/ 585,
+      /*0x2ca4*/ 991,
+      /*0x0508*/ 425,
+      /*0x1f6d*/ 764,
+      /*0x1f09*/ 716,
+      /*0xfb04*/ 1226,
+      /*0x1041a*/ 1286,
+      /*0x1f9a*/ 793,
+      /*0x041a*/ 323,
+      /*0x021a*/ 203,
+      /*0x011a*/ 70,
+      /*0xab9a*/ 1184,
+      -1, -1,
+      /*0xa7a4*/ 1120,
+      /*0x039a*/ 251,
+      /*0x1ea4*/ 669,
+      /*0x1f0a*/ 717,
+      /*0x2c1a*/ 937,
+      /*0xfb02*/ 1224,
+      /*0x048a*/ 362,
+      /*0x050a*/ 426,
+      -1,
+      /*0x1ca4*/ 559,
+      /*0x10ca4*/ 1372,
+      /*0x017d*/ 119,
+      /*0x10c7*/ 522,
+      /*0x1e18*/ 597,
+      -1, -1,
+      /*0x03fd*/ 294,
+      /*0x2c9a*/ 986,
+      -1, -1,
+      /*0x0480*/ 361,
+      /*0x0500*/ 421,
+      /*0x1fd3*/ 837,
+      -1,
+      /*0x1f6f*/ 766,
+      /*0x1feb*/ 852,
+      /*0x0053*/ 17,
+      /*0x1e16*/ 596,
+      -1,
+      /*0x01d3*/ 166,
+      /*0xa79a*/ 1115,
+      -1,
+      /*0x1e9a*/ 664,
+      -1, -1,
+      /*0x13fd*/ 529,
+      /*0x2c6b*/ 964,
+      -1,
+      /*0x10a7*/ 491,
+      /*0x1c9a*/ 549,
+      /*0x10c9a*/ 1362,
+      -1,
+      /*0x00df*/ 56,
+      /*0x1e91a*/ 1477,
+      /*0x1f18*/ 723,
+      /*0x1ff7*/ 858,
+      -1,
+      /*0x0498*/ 369,
+      /*0x0518*/ 433,
+      /*0x2ceb*/ 1023,
+      -1, -1,
+      /*0x01f7*/ 185,
+      /*0x03f7*/ 291,
+      /*0x1e06*/ 588,
+      /*0x1f5f*/ 758,
+      -1,
+      /*0x00dd*/ 54,
+      -1, -1,
+      /*0x00c7*/ 33,
+      /*0x0496*/ 368,
+      /*0x0516*/ 432,
+      /*0x10412*/ 1278,
+      /*0x1f92*/ 785,
+      /*0x0412*/ 315,
+      /*0x0212*/ 199,
+      /*0x0112*/ 66,
+      /*0xab92*/ 1176,
+      /*0x24c7*/ 902,
+      /*0x1f5d*/ 757,
+      -1,
+      /*0x0392*/ 243,
+      -1,
+      /*0x104c7*/ 1323,
+      /*0x2c12*/ 929,
+      /*0x04c7*/ 393,
+      /*0x0547*/ 467,
+      -1, -1,
+      /*0x1fb2*/ 815,
+      /*0x1e14*/ 595,
+      /*0x0232*/ 215,
+      /*0x0132*/ 81,
+      /*0xabb2*/ 1208,
+      -1, -1,
+      /*0x01b2*/ 151,
+      /*0x2c92*/ 982,
+      /*0x0506*/ 424,
+      -1, -1, -1, -1, -1,
+      /*0x1e10*/ 593,
+      -1, -1, -1, -1, -1,
+      /*0xa792*/ 1112,
+      -1,
+      /*0x1e92*/ 658,
+      /*0x2cb2*/ 998,
+      /*0x1faf*/ 814,
+      /*0x042f*/ 344,
+      -1, -1,
+      /*0xabaf*/ 1205,
+      /*0x1c92*/ 541,
+      /*0x10c92*/ 1354,
+      /*0x01af*/ 149,
+      -1,
+      /*0x1e912*/ 1469,
+      /*0x0494*/ 367,
+      /*0x0514*/ 431,
+      /*0xa7b2*/ 1130,
+      -1,
+      /*0x1eb2*/ 676,
+      -1,
+      /*0x1fe9*/ 850,
+      /*0x1e04*/ 587,
+      -1, -1, -1,
+      /*0x1cb2*/ 573,
+      /*0x10cb2*/ 1386,
+      -1,
+      /*0x0490*/ 365,
+      /*0x0510*/ 429,
+      -1,
+      /*0x2c69*/ 963,
+      /*0x10a0*/ 484,
+      -1, -1,
+      /*0x1e02*/ 586,
+      /*0x1041c*/ 1288,
+      /*0x1f9c*/ 795,
+      /*0x041c*/ 325,
+      /*0x021c*/ 204,
+      /*0x011c*/ 71,
+      /*0xab9c*/ 1186,
+      -1, -1,
+      /*0x019c*/ 138,
+      /*0x039c*/ 253,
+      -1, -1,
+      /*0x2c1c*/ 939,
+      -1,
+      /*0x1caf*/ 570,
+      /*0x10caf*/ 1383,
+      -1, -1, -1, -1,
+      /*0x0504*/ 423,
+      -1, -1,
+      /*0x10a6*/ 490,
+      -1,
+      /*0x2c9c*/ 987,
+      /*0x1e20*/ 601,
+      /*0x1041e*/ 1290,
+      /*0x1f9e*/ 797,
+      /*0x041e*/ 327,
+      /*0x021e*/ 205,
+      /*0x011e*/ 72,
+      /*0xab9e*/ 1188,
+      -1,
+      /*0x0502*/ 422,
+      /*0x0470*/ 353,
+      /*0x039e*/ 255,
+      /*0x0170*/ 112,
+      /*0xa79c*/ 1116,
+      /*0x2c1e*/ 941,
+      -1,
+      /*0x01f0*/ 180,
+      /*0x03f0*/ 287,
+      -1, -1,
+      /*0x2c70*/ 968,
+      -1,
+      /*0x1c9c*/ 551,
+      /*0x10c9c*/ 1364,
+      -1,
+      /*0x10a4*/ 488,
+      /*0x1e91c*/ 1479,
+      /*0x2c9e*/ 988,
+      /*0x1e26*/ 604,
+      /*0x10422*/ 1294,
+      /*0x1fa2*/ 801,
+      /*0x0422*/ 331,
+      /*0x0222*/ 207,
+      /*0x0122*/ 74,
+      /*0xaba2*/ 1192,
+      /*0x04a0*/ 373,
+      /*0x0520*/ 437,
+      /*0x01a2*/ 142,
+      -1, -1,
+      /*0xa79e*/ 1117,
+      /*0x2c22*/ 945,
+      /*0x1e9e*/ 666,
+      /*0x118a7*/ 1394,
+      -1, -1, -1, -1,
+      /*0x1ef0*/ 707,
+      /*0x1c9e*/ 553,
+      /*0x10c9e*/ 1366,
+      -1, -1,
+      /*0x1e91e*/ 1481,
+      /*0x2ca2*/ 990,
+      /*0x1e24*/ 603,
+      /*0x1040e*/ 1274,
+      /*0x1f8e*/ 781,
+      /*0x040e*/ 311,
+      /*0x020e*/ 197,
+      /*0x010e*/ 64,
+      /*0xab8e*/ 1172,
+      /*0x04a6*/ 376,
+      /*0x0526*/ 440,
+      /*0x018e*/ 129,
+      /*0x038e*/ 239,
+      /*0xff27*/ 1240,
+      /*0xa7a2*/ 1119,
+      /*0x2c0e*/ 925,
+      /*0x1ea2*/ 668,
+      -1,
+      /*0x1faa*/ 809,
+      /*0x042a*/ 339,
+      /*0x022a*/ 211,
+      /*0x012a*/ 78,
+      /*0xabaa*/ 1200,
+      /*0x1ca2*/ 557,
+      /*0x10ca2*/ 1370,
+      -1,
+      /*0x03aa*/ 266,
+      -1,
+      /*0x2c8e*/ 980,
+      /*0x2c2a*/ 953,
+      -1, -1,
+      /*0x1e1a*/ 598,
+      -1, -1, -1,
+      /*0x04a4*/ 375,
+      /*0x0524*/ 439,
+      -1, -1, -1,
+      /*0x0370*/ 230,
+      /*0x2caa*/ 994,
+      /*0x1e8e*/ 656,
+      -1,
+      /*0x1fae*/ 813,
+      /*0x042e*/ 343,
+      /*0x022e*/ 213,
+      /*0x012e*/ 80,
+      /*0xabae*/ 1204,
+      -1,
+      /*0x10c8e*/ 1350,
+      /*0x01ae*/ 148,
+      -1,
+      /*0x1e90e*/ 1465,
+      /*0xa7aa*/ 1123,
+      /*0x2c2e*/ 957,
+      /*0x1eaa*/ 672,
+      -1, -1, -1, -1, -1,
+      /*0x1f1a*/ 725,
+      /*0x1caa*/ 565,
+      /*0x10caa*/ 1378,
+      /*0x049a*/ 370,
+      /*0x051a*/ 434,
+      -1,
+      /*0x2cae*/ 996,
+      /*0x1fac*/ 811,
+      /*0x042c*/ 341,
+      /*0x022c*/ 212,
+      /*0x012c*/ 79,
+      /*0xabac*/ 1202,
+      -1, -1,
+      /*0x01ac*/ 147,
+      /*0x2165*/ 873,
+      /*0x00d3*/ 45,
+      /*0x2167*/ 875,
+      /*0x2c2c*/ 955,
+      /*0xa7ae*/ 1127,
+      /*0x2161*/ 869,
+      /*0x1eae*/ 674,
+      /*0x118a0*/ 1387,
+      /*0x1fba*/ 822,
+      /*0x216d*/ 881,
+      /*0x023a*/ 216,
+      /*0x10b2*/ 502,
+      /*0xabba*/ 1216,
+      /*0x1cae*/ 569,
+      /*0x10cae*/ 1382,
+      /*0x104d3*/ 1335,
+      /*0x2cac*/ 995,
+      /*0x1f6b*/ 762,
+      /*0x0553*/ 479,
+      /*0x1fa8*/ 807,
+      /*0x0428*/ 337,
+      /*0x0228*/ 210,
+      /*0x0128*/ 77,
+      /*0xaba8*/ 1198,
+      -1,
+      /*0x1e12*/ 594,
+      -1,
+      /*0x03a8*/ 264,
+      -1,
+      /*0xa7ac*/ 1125,
+      /*0x2c28*/ 951,
+      /*0x1eac*/ 673,
+      /*0x2cba*/ 1002,
+      -1,
+      /*0x118a6*/ 1393,
+      -1,
+      /*0x10af*/ 499,
+      -1,
+      /*0x1cac*/ 567,
+      /*0x10cac*/ 1380,
+      -1,
+      /*0x1e32*/ 610,
+      /*0x2163*/ 871,
+      /*0x2ca8*/ 993,
+      /*0x216f*/ 883,
+      /*0xa7ba*/ 1135,
+      -1,
+      /*0x1eba*/ 680,
+      /*0x1fb8*/ 820,
+      -1, -1, -1,
+      /*0xabb8*/ 1214,
+      -1,
+      /*0x1cba*/ 581,
+      /*0x01b8*/ 155,
+      /*0xa7a8*/ 1122,
+      /*0xff26*/ 1239,
+      /*0x1ea8*/ 671,
+      /*0x0492*/ 366,
+      /*0x0512*/ 430,
+      /*0x118a4*/ 1391,
+      -1, -1,
+      /*0x1fb6*/ 818,
+      /*0x1ca8*/ 563,
+      /*0x10ca8*/ 1376,
+      /*0x0136*/ 83,
+      /*0xabb6*/ 1212,
+      -1, -1,
+      /*0xa688*/ 1053,
+      /*0x2cb8*/ 1001,
+      /*0x104b2*/ 1302,
+      -1,
+      /*0x04b2*/ 382,
+      /*0x0532*/ 446,
+      /*0x1040c*/ 1272,
+      /*0x1f8c*/ 779,
+      /*0x040c*/ 309,
+      /*0x020c*/ 196,
+      /*0x010c*/ 63,
+      /*0xab8c*/ 1170,
+      -1,
+      /*0xff24*/ 1237,
+      /*0xa7b8*/ 1134,
+      /*0x038c*/ 238,
+      /*0x1eb8*/ 679,
+      /*0x2cb6*/ 1000,
+      /*0x2c0c*/ 923,
+      /*0xa68a*/ 1054,
+      -1, -1, -1,
+      /*0x1cb8*/ 579,
+      -1, -1,
+      /*0x1f2f*/ 736,
+      -1,
+      /*0x1e1c*/ 599,
+      /*0xa779*/ 1101,
+      /*0xa7b6*/ 1133,
+      /*0x2c8c*/ 979,
+      /*0x1eb6*/ 678,
+      /*0xa680*/ 1049,
+      /*0x0230*/ 214,
+      /*0x0130*/ 1486,
+      /*0xabb0*/ 1206,
+      -1, -1,
+      /*0x1cb6*/ 577,
+      /*0x03b0*/ 268,
+      -1,
+      /*0x1f69*/ 760,
+      /*0xa726*/ 1065,
+      /*0x1fbc*/ 824,
+      -1,
+      /*0x1e8c*/ 655,
+      -1,
+      /*0xabbc*/ 1218,
+      -1, -1,
+      /*0x01bc*/ 156,
+      /*0x10a2*/ 486,
+      -1,
+      /*0x10c8c*/ 1348,
+      /*0x1e1e*/ 600,
+      /*0x2cb0*/ 997,
+      /*0x1e90c*/ 1463,
+      -1,
+      /*0x1f1c*/ 727,
+      /*0xa698*/ 1061,
+      /*0x1e70*/ 641,
+      /*0x049c*/ 371,
+      /*0x051c*/ 435,
+      -1,
+      /*0xa77b*/ 1102,
+      -1, -1,
+      /*0x2cbc*/ 1003,
+      /*0xa7b0*/ 1128,
+      /*0xa724*/ 1064,
+      /*0x1eb0*/ 675,
+      -1, -1,
+      /*0xa696*/ 1060,
+      -1, -1, -1,
+      /*0x1cb0*/ 571,
+      /*0x10cb0*/ 1384,
+      -1,
+      /*0xa7bc*/ 1136,
+      /*0x1e22*/ 602,
+      /*0x1ebc*/ 681,
+      -1, -1, -1, -1,
+      /*0x1fd2*/ 836,
+      /*0x049e*/ 372,
+      /*0x051e*/ 436,
+      /*0x0152*/ 97,
+      /*0x0052*/ 16,
+      /*0x10aa*/ 494,
+      /*0x1fcc*/ 835,
+      /*0x04f0*/ 413,
+      /*0x024c*/ 227,
+      /*0x014c*/ 94,
+      /*0x004c*/ 10,
+      -1,
+      /*0x1fbe*/ 825,
+      /*0xa686*/ 1052,
+      /*0x023e*/ 219,
+      -1,
+      /*0xabbe*/ 1220,
+      -1, -1,
+      /*0x118b2*/ 1405,
+      -1,
+      /*0x1e0e*/ 592,
+      /*0x1fb4*/ 817,
+      -1,
+      /*0x2cd2*/ 1014,
+      /*0x0134*/ 82,
+      /*0xabb4*/ 1210,
+      /*0xa77d*/ 1103,
+      /*0x04a2*/ 374,
+      /*0x0522*/ 438,
+      /*0x2ccc*/ 1011,
+      -1,
+      /*0x10ae*/ 498,
+      -1, -1,
+      /*0x1e2a*/ 606,
+      /*0x2cbe*/ 1004,
+      -1, -1,
+      /*0x1ed2*/ 692,
+      /*0xa694*/ 1059,
+      -1,
+      /*0xff32*/ 1251,
+      -1,
+      /*0x118af*/ 1402,
+      /*0x1ecc*/ 689,
+      /*0x2cb4*/ 999,
+      -1, -1,
+      /*0xa7be*/ 1137,
+      -1,
+      /*0x1ebe*/ 682,
+      /*0x1f0e*/ 721,
+      -1,
+      /*0xa690*/ 1057,
+      /*0x048e*/ 364,
+      /*0x050e*/ 428,
+      /*0x10ac*/ 496,
+      /*0x1cbe*/ 583,
+      /*0xa7b4*/ 1132,
+      -1,
+      /*0x1eb4*/ 677,
+      /*0x1e2e*/ 608,
+      -1, -1, -1,
+      /*0x1f2a*/ 731,
+      /*0xff2f*/ 1248,
+      /*0x1cb4*/ 575,
+      /*0x04aa*/ 378,
+      /*0x052a*/ 442,
+      -1, -1,
+      /*0x10ba*/ 510,
+      -1, -1,
+      /*0x1fca*/ 833,
+      -1,
+      /*0x024a*/ 226,
+      /*0x014a*/ 93,
+      /*0x004a*/ 8,
+      /*0xa684*/ 1051,
+      /*0x2126*/ 864,
+      /*0x01ca*/ 161,
+      /*0x10a8*/ 492,
+      -1, -1,
+      /*0x1e2c*/ 607,
+      -1, -1, -1, -1, -1,
+      /*0x1f2e*/ 735,
+      -1,
+      /*0xa682*/ 1050,
+      /*0x04ae*/ 380,
+      /*0x052e*/ 444,
+      -1,
+      /*0xa732*/ 1070,
+      /*0x2cca*/ 1010,
+      -1,
+      /*0x1fc4*/ 828,
+      /*0x1e3a*/ 614,
+      /*0x0244*/ 222,
+      -1,
+      /*0x0044*/ 3,
+      /*0x004f*/ 13,
+      -1,
+      /*0x01c4*/ 157,
+      /*0x01cf*/ 164,
+      /*0x03cf*/ 270,
+      -1,
+      /*0x10b8*/ 508,
+      /*0x1e28*/ 605,
+      /*0x1eca*/ 688,
+      /*0x1fab*/ 810,
+      /*0x042b*/ 340,
+      /*0x1f2c*/ 733,
+      -1,
+      /*0xabab*/ 1201,
+      /*0x04ac*/ 379,
+      /*0x052c*/ 443,
+      -1,
+      /*0x03ab*/ 267,
+      -1,
+      /*0x2cc4*/ 1007,
+      /*0x2c2b*/ 954,
+      /*0x1fc2*/ 826,
+      /*0x10b6*/ 506,
+      /*0x24ba*/ 889,
+      /*0x118a2*/ 1389,
+      /*0x0042*/ 1,
+      -1,
+      /*0x1f3a*/ 739,
+      /*0x104ba*/ 1310,
+      /*0x03c2*/ 269,
+      /*0x04ba*/ 386,
+      /*0x053a*/ 454,
+      /*0xa7c4*/ 1139,
+      /*0x1fc8*/ 831,
+      /*0x1ec4*/ 685,
+      /*0x0248*/ 225,
+      /*0x1e38*/ 613,
+      /*0x0048*/ 7,
+      /*0x1f28*/ 729,
+      -1,
+      /*0x01c8*/ 160,
+      /*0x04a8*/ 377,
+      /*0x0528*/ 441,
+      -1, -1,
+      /*0x2cc2*/ 1006,
+      /*0xa7ab*/ 1124,
+      /*0xff22*/ 1235,
+      -1, -1, -1, -1,
+      /*0x1e36*/ 612,
+      -1, -1,
+      /*0x1cab*/ 566,
+      /*0x10cab*/ 1379,
+      /*0x2cc8*/ 1009,
+      /*0xa7c2*/ 1138,
+      -1,
+      /*0x1ec2*/ 684,
+      /*0x10b0*/ 500,
+      -1,
+      /*0x24b8*/ 887,
+      /*0x216b*/ 879,
+      /*0x118aa*/ 1397,
+      /*0x1e0c*/ 591,
+      /*0x1f38*/ 737,
+      /*0x104b8*/ 1308,
+      -1,
+      /*0x04b8*/ 385,
+      /*0x0538*/ 452,
+      /*0x1ec8*/ 687,
+      /*0x10bc*/ 512,
+      /*0x1fd6*/ 838,
+      /*0x0150*/ 96,
+      /*0x0050*/ 14,
+      /*0x0156*/ 99,
+      /*0x0056*/ 20,
+      /*0x24b6*/ 885,
+      /*0x03d0*/ 271,
+      -1,
+      /*0x03d6*/ 274,
+      /*0x1fdb*/ 843,
+      /*0x104b6*/ 1306,
+      -1,
+      /*0x04b6*/ 384,
+      /*0x0536*/ 450,
+      /*0xff2a*/ 1243,
+      -1,
+      /*0x01db*/ 170,
+      /*0x1e30*/ 609,
+      /*0x118ae*/ 1401,
+      -1, -1, -1,
+      /*0x2cd0*/ 1013,
+      /*0x1f0c*/ 719,
+      /*0x2cd6*/ 1016,
+      /*0xa69a*/ 1062,
+      /*0x048c*/ 363,
+      /*0x050c*/ 427,
+      -1,
+      /*0x1e3c*/ 615,
+      /*0xa722*/ 1063,
+      -1, -1, -1, -1, -1, -1,
+      /*0x1ed0*/ 691,
+      /*0x1fc6*/ 829,
+      /*0x1ed6*/ 694,
+      /*0x0246*/ 224,
+      /*0xff2e*/ 1247,
+      /*0x0046*/ 5,
+      /*0x118ac*/ 1399,
+      -1,
+      /*0x2132*/ 867,
+      /*0x024e*/ 228,
+      /*0x014e*/ 95,
+      /*0x004e*/ 12,
+      /*0x104b0*/ 1300,
+      /*0x1fda*/ 842,
+      /*0x04b0*/ 381,
+      -1,
+      /*0x015a*/ 101,
+      /*0x005a*/ 24,
+      /*0x10be*/ 514,
+      /*0x24bc*/ 891,
+      -1,
+      /*0x03da*/ 276,
+      /*0x118ba*/ 1413,
+      /*0x1f3c*/ 741,
+      /*0x104bc*/ 1312,
+      /*0x2cc6*/ 1008,
+      /*0x04bc*/ 387,
+      /*0x053c*/ 456,
+      /*0x10b4*/ 504,
+      /*0xff2c*/ 1245,
+      -1,
+      /*0x2cce*/ 1012,
+      -1,
+      /*0x118a8*/ 1395,
+      /*0xa72a*/ 1067,
+      -1,
+      /*0x1e52*/ 626,
+      /*0x2cda*/ 1018,
+      /*0xa7c6*/ 1141,
+      -1,
+      /*0x1ec6*/ 686,
+      -1,
+      /*0x1e4c*/ 623,
+      -1, -1,
+      /*0xff3a*/ 1259,
+      /*0x1ece*/ 690,
+      /*0xa652*/ 1035,
+      /*0x1e3e*/ 616,
+      /*0x2169*/ 877,
+      -1, -1,
+      /*0x1eda*/ 696,
+      /*0xa64c*/ 1032,
+      /*0x00d2*/ 44,
+      -1,
+      /*0xff28*/ 1241,
+      -1,
+      /*0x1e34*/ 611,
+      /*0xa692*/ 1058,
+      /*0x00cc*/ 38,
+      /*0xa72e*/ 1069,
+      /*0x118b8*/ 1411,
+      -1, -1, -1, -1,
+      /*0x1f52*/ 752,
+      /*0x104d2*/ 1334,
+      /*0x24cc*/ 907,
+      /*0x04d2*/ 398,
+      /*0x0552*/ 478,
+      -1,
+      /*0x1f4c*/ 749,
+      /*0x104cc*/ 1328,
+      /*0x24be*/ 893,
+      /*0x2cc0*/ 1005,
+      /*0x054c*/ 472,
+      /*0x118b6*/ 1409,
+      /*0x1f3e*/ 743,
+      /*0x104be*/ 1314,
+      -1,
+      /*0x04be*/ 388,
+      /*0x053e*/ 458,
+      -1,
+      /*0xff38*/ 1257,
+      /*0xa72c*/ 1068,
+      -1, -1, -1,
+      /*0x104b4*/ 1304,
+      /*0x1ec0*/ 683,
+      /*0x04b4*/ 383,
+      /*0x0534*/ 448,
+      -1, -1,
+      /*0x1fe2*/ 844,
+      /*0x0462*/ 346,
+      -1,
+      /*0x0162*/ 105,
+      -1,
+      /*0xff36*/ 1255,
+      /*0xa73a*/ 1074,
+      /*0x01e2*/ 173,
+      /*0x03e2*/ 280,
+      /*0x0154*/ 98,
+      /*0x0054*/ 18,
+      /*0x2c62*/ 959,
+      /*0x10c4*/ 520,
+      -1, -1, -1,
+      /*0x1e4a*/ 622,
+      /*0xa728*/ 1066,
+      -1, -1, -1,
+      /*0x118b0*/ 1403,
+      -1, -1,
+      /*0x2ce2*/ 1022,
+      -1,
+      /*0x10ab*/ 495,
+      /*0xa64a*/ 1031,
+      /*0x1fd8*/ 840,
+      -1,
+      /*0x2cd4*/ 1015,
+      /*0x0158*/ 100,
+      /*0x0058*/ 22,
+      /*0x118bc*/ 1415,
+      /*0x00ca*/ 36,
+      -1,
+      /*0x03d8*/ 275,
+      -1,
+      /*0x10c2*/ 518,
+      /*0x1ee2*/ 700,
+      -1, -1,
+      /*0x1e44*/ 619,
+      /*0x24ca*/ 905,
+      /*0xff30*/ 1249,
+      /*0x1ed4*/ 693,
+      /*0xa738*/ 1073,
+      /*0x1f4a*/ 747,
+      /*0x104ca*/ 1326,
+      -1, -1,
+      /*0x054a*/ 470,
+      /*0x2cd8*/ 1017,
+      /*0xa644*/ 1028,
+      /*0x1040d*/ 1273,
+      /*0x1f8d*/ 780,
+      /*0x040d*/ 310,
+      -1, -1,
+      /*0xab8d*/ 1171,
+      /*0x00c4*/ 30,
+      /*0x00cf*/ 41,
+      /*0xa736*/ 1072,
+      -1, -1,
+      /*0x212a*/ 865,
+      /*0x2c0d*/ 924,
+      /*0x1ed8*/ 695,
+      /*0x1e42*/ 618,
+      /*0x24c4*/ 899,
+      /*0x24cf*/ 910,
+      -1, -1, -1,
+      /*0x104c4*/ 1320,
+      /*0x104cf*/ 1331,
+      -1,
+      /*0x0544*/ 464,
+      /*0x054f*/ 475,
+      /*0xa642*/ 1027,
+      /*0x1e48*/ 621,
+      -1, -1, -1, -1, -1,
+      /*0x00c2*/ 28,
+      /*0x1f2b*/ 732,
+      -1,
+      /*0x118be*/ 1417,
+      /*0x0055*/ 19,
+      /*0xa648*/ 1030,
+      /*0xa78d*/ 1110,
+      /*0x01d5*/ 167,
+      /*0x03d5*/ 273,
+      /*0x24c2*/ 897,
+      -1, -1,
+      /*0x00c8*/ 34,
+      /*0x118b4*/ 1407,
+      /*0x104c2*/ 1318,
+      -1,
+      /*0x10c8d*/ 1349,
+      /*0x0542*/ 462,
+      -1,
+      /*0x1e90d*/ 1464,
+      -1,
+      /*0x24c8*/ 903,
+      -1, -1, -1,
+      /*0x1f48*/ 745,
+      /*0x104c8*/ 1324,
+      /*0xa73c*/ 1075,
+      -1,
+      /*0x0548*/ 468,
+      -1, -1,
+      /*0xa68e*/ 1056,
+      /*0x1e50*/ 625,
+      -1,
+      /*0x1e56*/ 628,
+      /*0xff34*/ 1253,
+      /*0x0245*/ 223,
+      /*0x0145*/ 90,
+      /*0x0045*/ 4,
+      -1,
+      /*0x16e5f*/ 1450,
+      /*0x01c5*/ 158,
+      -1,
+      /*0xa650*/ 1034,
+      /*0x1fd9*/ 841,
+      /*0xa656*/ 1037,
+      /*0x1fec*/ 853,
+      /*0x046c*/ 351,
+      /*0x0059*/ 23,
+      /*0x016c*/ 110,
+      /*0x00d0*/ 42,
+      /*0x01d9*/ 169,
+      /*0x00d6*/ 48,
+      /*0x01ec*/ 178,
+      /*0x03ec*/ 285,
+      /*0x16e5d*/ 1448,
+      -1, -1,
+      /*0x16e47*/ 1426,
+      -1, -1,
+      /*0x00db*/ 52,
+      -1,
+      /*0x1f50*/ 751,
+      /*0x104d0*/ 1332,
+      /*0x1f56*/ 754,
+      /*0x04d0*/ 397,
+      /*0x0550*/ 476,
+      /*0x04d6*/ 400,
+      /*0x0556*/ 482,
+      /*0xa752*/ 1086,
+      /*0xa7c5*/ 1140,
+      /*0x1e46*/ 620,
+      -1,
+      /*0x1f5b*/ 756,
+      -1,
+      /*0xa74c*/ 1083,
+      -1,
+      /*0x1e4e*/ 624,
+      -1, -1, -1,
+      /*0xa73e*/ 1076,
+      /*0xa646*/ 1029,
+      /*0x1e5a*/ 630,
+      /*0x1eec*/ 705,
+      -1, -1, -1,
+      /*0xa64e*/ 1033,
+      /*0x00c6*/ 32,
+      -1,
+      /*0xa734*/ 1071,
+      /*0x10c0*/ 516,
+      -1,
+      /*0xa65a*/ 1039,
+      /*0x00ce*/ 40,
+      /*0x1fc9*/ 832,
+      -1,
+      /*0x24c6*/ 901,
+      /*0x0149*/ 92,
+      /*0x0049*/ 1485,
+      /*0x00da*/ 51,
+      -1,
+      /*0x104c6*/ 1322,
+      /*0x24ce*/ 909,
+      /*0x118ab*/ 1398,
+      /*0x0546*/ 466,
+      -1, -1,
+      /*0x104ce*/ 1330,
+      -1, -1,
+      /*0x054e*/ 474,
+      /*0x1fea*/ 851,
+      /*0x046a*/ 350,
+      -1,
+      /*0x016a*/ 109,
+      /*0x04da*/ 402,
+      /*0x0345*/ 229,
+      -1,
+      /*0x01ea*/ 177,
+      /*0x03ea*/ 284,
+      /*0x1e40*/ 617,
+      /*0x1fa9*/ 808,
+      /*0x0429*/ 338,
+      -1, -1,
+      /*0xaba9*/ 1199,
+      /*0xff2b*/ 1244,
+      -1,
+      /*0x01a9*/ 146,
+      /*0x03a9*/ 265,
+      -1,
+      /*0xa640*/ 1026,
+      /*0x2c29*/ 952,
+      /*0x1fc3*/ 827,
+      -1,
+      /*0x0243*/ 221,
+      /*0x0143*/ 89,
+      /*0x0043*/ 2,
+      /*0x00c0*/ 26,
+      /*0x10421*/ 1293,
+      /*0x1fa1*/ 800,
+      /*0x0421*/ 330,
+      -1,
+      /*0xa74a*/ 1082,
+      /*0xaba1*/ 1191,
+      -1, -1,
+      /*0x24c0*/ 895,
+      /*0x03a1*/ 258,
+      -1,
+      /*0x1eea*/ 704,
+      /*0x2c21*/ 944,
+      /*0x104c0*/ 1316,
+      /*0x1fb9*/ 821,
+      /*0x04c0*/ 389,
+      /*0x0540*/ 460,
+      /*0x0139*/ 84,
+      /*0xabb9*/ 1215,
+      /*0x1fe8*/ 849,
+      /*0x0468*/ 349,
+      -1,
+      /*0x0168*/ 108,
+      -1, -1,
+      /*0x1e62*/ 634,
+      /*0x01e8*/ 176,
+      /*0x03e8*/ 283,
+      /*0x1ca9*/ 564,
+      /*0x10ca9*/ 1377,
+      /*0xa744*/ 1079,
+      /*0x1e54*/ 627,
+      -1,
+      /*0x1fcb*/ 834,
+      -1, -1,
+      /*0xa662*/ 1043,
+      /*0x004b*/ 9,
+      -1, -1,
+      /*0x01cb*/ 162,
+      /*0xa68c*/ 1055,
+      /*0xa654*/ 1036,
+      -1, -1, -1, -1,
+      /*0x1ca1*/ 556,
+      /*0x10ca1*/ 1369,
+      /*0x00d4*/ 46,
+      -1,
+      /*0x1e921*/ 1484,
+      -1,
+      /*0x1e58*/ 629,
+      -1,
+      /*0x16e57*/ 1442,
+      /*0xa742*/ 1078,
+      -1,
+      /*0x1ee8*/ 703,
+      /*0x04e2*/ 406,
+      /*0x1cb9*/ 580,
+      -1,
+      /*0x1f54*/ 753,
+      -1,
+      /*0xa658*/ 1038,
+      /*0x04d4*/ 399,
+      /*0x0554*/ 480,
+      -1,
+      /*0xa748*/ 1081,
+      -1, -1,
+      /*0x00d8*/ 49,
+      /*0x10417*/ 1283,
+      /*0x1f97*/ 790,
+      /*0x0417*/ 320,
+      /*0x1fe4*/ 846,
+      /*0x0464*/ 347,
+      /*0xab97*/ 1181,
+      /*0x0164*/ 106,
+      -1,
+      /*0x0197*/ 136,
+      /*0x0397*/ 248,
+      /*0x01e4*/ 174,
+      /*0x03e4*/ 281,
+      /*0x2c17*/ 934,
+      -1,
+      /*0x2c64*/ 961,
+      /*0x04d8*/ 401,
+      -1, -1,
+      /*0x0460*/ 345,
+      -1,
+      /*0x0160*/ 104,
+      -1, -1, -1,
+      /*0x01e0*/ 172,
+      /*0x03e0*/ 279,
+      /*0x1ff4*/ 856,
+      /*0x0474*/ 355,
+      /*0x2c60*/ 958,
+      /*0x0174*/ 114,
+      -1,
+      /*0x1ffc*/ 863,
+      /*0x047c*/ 359,
+      /*0x01f4*/ 183,
+      /*0x03f4*/ 289,
+      /*0xa750*/ 1085,
+      -1,
+      /*0xa756*/ 1088,
+      /*0x01fc*/ 188,
+      /*0x1f0d*/ 720,
+      /*0x1e97*/ 661,
+      /*0x2ce0*/ 1021,
+      /*0x1ee4*/ 701,
+      -1,
+      /*0x10c5*/ 521,
+      -1, -1,
+      /*0x1c97*/ 546,
+      /*0x10c97*/ 1359,
+      -1, -1,
+      /*0x1e917*/ 1474,
+      -1,
+      /*0x046e*/ 352,
+      -1,
+      /*0x016e*/ 111,
+      /*0x1ee0*/ 699,
+      /*0x00d5*/ 47,
+      /*0x13fc*/ 528,
+      /*0x01ee*/ 179,
+      /*0x03ee*/ 286,
+      /*0x1fe6*/ 847,
+      /*0x0466*/ 348,
+      /*0x2c6e*/ 966,
+      /*0x0166*/ 107,
+      /*0x1ef4*/ 709,
+      -1,
+      /*0x015e*/ 103,
+      /*0x01e6*/ 175,
+      /*0x03e6*/ 282,
+      /*0x1efc*/ 713,
+      /*0x01de*/ 171,
+      /*0x03de*/ 278,
+      -1,
+      /*0x0555*/ 481,
+      /*0xa746*/ 1080,
+      -1, -1,
+      /*0x16e53*/ 1438,
+      -1, -1,
+      /*0xa74e*/ 1084,
+      -1, -1, -1, -1,
+      /*0x1e6c*/ 639,
+      /*0xa75a*/ 1090,
+      /*0x2cde*/ 1020,
+      -1,
+      /*0x0051*/ 15,
+      /*0x1eee*/ 706,
+      /*0x00c5*/ 31,
+      /*0x01d1*/ 165,
+      /*0x03d1*/ 272,
+      -1, -1,
+      /*0xa66c*/ 1048,
+      -1,
+      /*0x212b*/ 866,
+      /*0x1ee6*/ 702,
+      /*0x24c5*/ 900,
+      /*0x00d9*/ 50,
+      /*0x1ede*/ 698,
+      -1, -1,
+      /*0x104c5*/ 1321,
+      -1,
+      /*0x04c5*/ 392,
+      /*0x0545*/ 465,
+      /*0x1fad*/ 812,
+      /*0x042d*/ 342,
+      -1, -1,
+      /*0xabad*/ 1203,
+      /*0x1f59*/ 755,
+      -1,
+      /*0x1f6c*/ 763,
+      -1, -1,
+      /*0x04ec*/ 411,
+      /*0x2c2d*/ 956,
+      /*0x015c*/ 102,
+      -1,
+      /*0xfb17*/ 1233,
+      -1,
+      /*0xa740*/ 1077,
+      /*0x03dc*/ 277,
+      /*0x1ff2*/ 854,
+      /*0x0472*/ 354,
+      -1,
+      /*0x0172*/ 113,
+      -1, -1,
+      /*0x10a9*/ 493,
+      /*0x01f2*/ 182,
+      /*0x10425*/ 1297,
+      /*0x1fa5*/ 804,
+      /*0x0425*/ 334,
+      /*0x2c72*/ 969,
+      -1,
+      /*0xaba5*/ 1195,
+      -1,
+      /*0x2cdc*/ 1019,
+      -1,
+      /*0x03a5*/ 261,
+      /*0x10c3*/ 519,
+      /*0xa7ad*/ 1126,
+      /*0x2c25*/ 948,
+      -1, -1, -1,
+      /*0x2cf2*/ 1025,
+      /*0x10a1*/ 485,
+      /*0x1e6a*/ 638,
+      /*0x00c9*/ 35,
+      /*0x1cad*/ 568,
+      /*0x10cad*/ 1381,
+      /*0x1edc*/ 697,
+      /*0x004d*/ 11,
+      -1, -1,
+      /*0x01cd*/ 163,
+      -1,
+      /*0x24c9*/ 904,
+      /*0xa66a*/ 1047,
+      /*0x10b9*/ 509,
+      /*0x1ef2*/ 708,
+      /*0x1f49*/ 746,
+      /*0x104c9*/ 1325,
+      /*0xa762*/ 1094,
+      /*0x04c9*/ 394,
+      /*0x0549*/ 469,
+      /*0x013f*/ 87,
+      /*0xabbf*/ 1221,
+      -1,
+      /*0xa754*/ 1087,
+      /*0x10423*/ 1295,
+      /*0x1fa3*/ 802,
+      /*0x0423*/ 332,
+      -1, -1,
+      /*0xaba3*/ 1193,
+      /*0x1ca5*/ 560,
+      /*0x10ca5*/ 1373,
+      /*0x1f6a*/ 761,
+      /*0x03a3*/ 259,
+      -1,
+      /*0x04ea*/ 410,
+      /*0x2c23*/ 946,
+      -1,
+      /*0x0241*/ 220,
+      /*0x0141*/ 88,
+      /*0x0041*/ 0,
+      /*0x00c3*/ 29,
+      /*0x1f29*/ 730,
+      -1, -1,
+      /*0xa758*/ 1089,
+      -1, -1,
+      /*0x1e68*/ 637,
+      -1,
+      /*0x24c3*/ 898,
+      -1, -1, -1, -1,
+      /*0x104c3*/ 1319,
+      -1,
+      /*0x04c3*/ 391,
+      /*0x0543*/ 463,
+      /*0xa668*/ 1046,
+      /*0x0372*/ 231,
+      -1, -1,
+      /*0x1cbf*/ 584,
+      -1, -1, -1,
+      /*0x023d*/ 218,
+      /*0x013d*/ 86,
+      /*0xabbd*/ 1219,
+      /*0x24b9*/ 888,
+      /*0x1ca3*/ 558,
+      /*0x10ca3*/ 1371,
+      -1,
+      /*0x1f39*/ 738,
+      /*0x104b9*/ 1309,
+      -1, -1,
+      /*0x0539*/ 453,
+      /*0x1f68*/ 759,
+      /*0x00cb*/ 37,
+      -1,
+      /*0x04e8*/ 409,
+      /*0x1041d*/ 1289,
+      /*0x1f9d*/ 796,
+      /*0x041d*/ 326,
+      -1, -1,
+      /*0xab9d*/ 1187,
+      /*0x24cb*/ 906,
+      -1,
+      /*0x019d*/ 139,
+      /*0x039d*/ 254,
+      /*0x1f4b*/ 748,
+      /*0x104cb*/ 1327,
+      /*0x2c1d*/ 940,
+      /*0x04cb*/ 395,
+      /*0x054b*/ 471,
+      /*0x10407*/ 1267,
+      /*0x1f87*/ 774,
+      /*0x0407*/ 304,
+      /*0x0587*/ 483,
+      -1,
+      /*0xab87*/ 1165,
+      /*0x1e64*/ 635,
+      -1,
+      /*0x0187*/ 125,
+      /*0x1041b*/ 1287,
+      /*0x1f9b*/ 794,
+      /*0x041b*/ 324,
+      /*0x2c07*/ 918,
+      /*0x1cbd*/ 582,
+      /*0xab9b*/ 1185,
+      -1, -1,
+      /*0xa664*/ 1044,
+      /*0x039b*/ 252,
+      -1,
+      /*0x1e60*/ 633,
+      /*0x2c1b*/ 938,
+      /*0x1fbb*/ 823,
+      -1,
+      /*0x023b*/ 217,
+      /*0x013b*/ 85,
+      /*0xabbb*/ 1217,
+      -1, -1,
+      /*0x1e74*/ 643,
+      /*0xab73*/ 1145,
+      /*0xa660*/ 1042,
+      /*0x1c9d*/ 552,
+      /*0x10c9d*/ 1365,
+      /*0x1e7c*/ 647,
+      -1,
+      /*0x1e91d*/ 1480,
+      -1,
+      /*0x1ff6*/ 857,
+      /*0x0476*/ 356,
+      /*0x04e4*/ 407,
+      /*0x0176*/ 115,
+      -1, -1, -1,
+      /*0x01f6*/ 184,
+      /*0x2162*/ 870,
+      /*0x1c87*/ 537,
+      /*0x10c87*/ 1343,
+      /*0x1e9b*/ 665,
+      /*0x118a9*/ 1396,
+      /*0x1e907*/ 1458,
+      /*0xa76c*/ 1099,
+      -1,
+      /*0x04e0*/ 405,
+      /*0x1e6e*/ 640,
+      /*0x1c9b*/ 550,
+      /*0x10c9b*/ 1363,
+      -1, -1,
+      /*0x1e91b*/ 1478,
+      -1, -1,
+      /*0x04f4*/ 415,
+      /*0x1e66*/ 636,
+      -1, -1,
+      /*0x1e5e*/ 632,
+      /*0x04fc*/ 419,
+      /*0x118a1*/ 1388,
+      -1,
+      /*0xabb1*/ 1207,
+      -1,
+      /*0xff29*/ 1242,
+      /*0x01b1*/ 150,
+      /*0xa666*/ 1045,
+      -1,
+      /*0x1ef6*/ 710,
+      /*0xa65e*/ 1041,
+      /*0x10419*/ 1285,
+      /*0x1f99*/ 792,
+      /*0x0419*/ 322,
+      /*0x118b9*/ 1412,
+      /*0x10ad*/ 497,
+      /*0xab99*/ 1183,
+      /*0x00de*/ 55,
+      /*0x1f6e*/ 765,
+      -1,
+      /*0x0399*/ 250,
+      /*0x04ee*/ 412,
+      -1,
+      /*0x2c19*/ 936,
+      /*0xff21*/ 1234,
+      /*0x1fb7*/ 819,
+      /*0x10413*/ 1279,
+      /*0x1f93*/ 786,
+      /*0x0413*/ 316,
+      /*0xabb7*/ 1213,
+      /*0x04e6*/ 408,
+      /*0xab93*/ 1177,
+      /*0x01b7*/ 154,
+      /*0x04de*/ 404,
+      /*0x0193*/ 133,
+      /*0x0393*/ 244,
+      /*0xa7b1*/ 1129,
+      /*0xff39*/ 1258,
+      /*0x2c13*/ 930,
+      /*0x00d1*/ 43,
+      /*0x1ffa*/ 861,
+      /*0x047a*/ 358,
+      /*0x10a5*/ 489,
+      -1, -1,
+      /*0x1cb1*/ 572,
+      /*0x10cb1*/ 1385,
+      /*0x01fa*/ 187,
+      /*0x03fa*/ 293,
+      -1, -1,
+      /*0x1e99*/ 663,
+      /*0xa76a*/ 1098,
+      /*0x104d1*/ 1333,
+      /*0x1e5c*/ 631,
+      /*0x0376*/ 232,
+      /*0x0551*/ 477,
+      -1,
+      /*0x1c99*/ 548,
+      /*0x10c99*/ 1361,
+      /*0x10cd*/ 523,
+      -1,
+      /*0x1e919*/ 1476,
+      /*0x1e72*/ 642,
+      -1,
+      /*0xa65c*/ 1040,
+      -1,
+      /*0x13fa*/ 526,
+      -1, -1, -1,
+      /*0x1cb7*/ 578,
+      /*0x00dc*/ 53,
+      /*0x1c93*/ 542,
+      /*0x10c93*/ 1355,
+      /*0x10bf*/ 515,
+      /*0x1f2d*/ 734,
+      /*0x1e913*/ 1470,
+      /*0xabb5*/ 1211,
+      /*0x1efa*/ 712,
+      -1,
+      /*0x01b5*/ 153,
+      -1,
+      /*0x10a3*/ 487,
+      /*0xab75*/ 1147,
+      -1, -1, -1,
+      /*0x04dc*/ 403,
+      /*0x1fb3*/ 816,
+      -1, -1, -1,
+      /*0xabb3*/ 1209,
+      /*0x10c1*/ 517,
+      -1,
+      /*0x01b3*/ 152,
+      /*0x04f2*/ 414,
+      -1,
+      /*0xa768*/ 1097,
+      -1,
+      /*0x1041f*/ 1291,
+      /*0x1f9f*/ 798,
+      /*0x041f*/ 328,
+      -1, -1,
+      /*0xab9f*/ 1189,
+      -1,
+      /*0x00cd*/ 39,
+      /*0x019f*/ 140,
+      /*0x039f*/ 256,
+      /*0x216c*/ 880,
+      -1,
+      /*0x2c1f*/ 942,
+      -1, -1, -1,
+      /*0x24cd*/ 908,
+      -1, -1,
+      /*0x1cb5*/ 576,
+      /*0x1f4d*/ 750,
+      /*0x104cd*/ 1329,
+      /*0x10bd*/ 513,
+      /*0x04cd*/ 396,
+      /*0x054d*/ 473,
+      /*0xa7b3*/ 1131,
+      /*0x1ff8*/ 859,
+      /*0x0478*/ 357,
+      /*0xab7f*/ 1157,
+      /*0x0178*/ 116,
+      /*0xab71*/ 1143,
+      /*0x24bf*/ 894,
+      -1,
+      /*0x01f8*/ 186,
+      /*0x1cb3*/ 574,
+      /*0x1f3f*/ 744,
+      /*0x104bf*/ 1315,
+      -1, -1,
+      /*0x053f*/ 459,
+      -1,
+      /*0x00c1*/ 27,
+      -1, -1, -1, -1, -1,
+      /*0x1c9f*/ 554,
+      /*0x10c9f*/ 1367,
+      /*0xfb13*/ 1229,
+      /*0x24c1*/ 896,
+      /*0x1e91f*/ 1482,
+      -1,
+      /*0x13f8*/ 524,
+      /*0xa764*/ 1095,
+      /*0x104c1*/ 1317,
+      -1,
+      /*0x04c1*/ 390,
+      /*0x0541*/ 461,
+      /*0xab79*/ 1151,
+      -1, -1,
+      /*0x10415*/ 1281,
+      /*0x1f95*/ 788,
+      /*0x0415*/ 318,
+      /*0x1ef8*/ 711,
+      -1,
+      /*0xab95*/ 1179,
+      /*0xa760*/ 1093,
+      -1, -1,
+      /*0x0395*/ 246,
+      -1, -1,
+      /*0x2c15*/ 932,
+      -1, -1,
+      /*0x10bb*/ 511,
+      /*0x216a*/ 878,
+      /*0x24bd*/ 892,
+      -1,
+      /*0x118ad*/ 1400,
+      -1,
+      /*0x1f3d*/ 742,
+      /*0x104bd*/ 1313,
+      -1,
+      /*0x047e*/ 360,
+      /*0x053d*/ 457,
+      /*0x16e52*/ 1437,
+      -1, -1, -1,
+      /*0x01fe*/ 189,
+      /*0x03fe*/ 295,
+      /*0x16e4c*/ 1431,
+      /*0xab7b*/ 1153,
+      /*0x2c7e*/ 971,
+      -1, -1, -1, -1, -1,
+      /*0x1f1d*/ 728,
+      /*0xa76e*/ 1100,
+      /*0xff2d*/ 1246,
+      -1, -1, -1,
+      /*0x118a5*/ 1392,
+      /*0x1c95*/ 544,
+      /*0x10c95*/ 1357,
+      -1,
+      /*0xa766*/ 1096,
+      /*0x1e915*/ 1472,
+      -1,
+      /*0xa75e*/ 1092,
+      -1, -1, -1, -1, -1, -1,
+      /*0x10b1*/ 501,
+      /*0x1e76*/ 644,
+      /*0x1efe*/ 714,
+      /*0x2168*/ 876,
+      /*0x1f1b*/ 726,
+      -1,
+      /*0x10411*/ 1277,
+      /*0x1f91*/ 784,
+      /*0x0411*/ 314,
+      /*0xff25*/ 1238,
+      -1,
+      /*0xab91*/ 1175,
+      /*0x24bb*/ 890,
+      -1,
+      /*0x0191*/ 132,
+      /*0x0391*/ 242,
+      /*0x1f3b*/ 740,
+      /*0x104bb*/ 1311,
+      /*0x2c11*/ 928,
+      /*0x118bf*/ 1418,
+      /*0x053b*/ 455,
+      -1, -1,
+      /*0xab7d*/ 1155,
+      -1, -1,
+      /*0x10b7*/ 507,
+      /*0x118a3*/ 1390,
+      /*0x1040f*/ 1275,
+      /*0x1f8f*/ 782,
+      /*0x040f*/ 312,
+      -1, -1,
+      /*0xab8f*/ 1173,
+      -1,
+      /*0x04f6*/ 416,
+      /*0x018f*/ 130,
+      /*0x038f*/ 240,
+      -1, -1,
+      /*0x2c0f*/ 926,
+      -1,
+      /*0x16e4a*/ 1429,
+      -1,
+      /*0x1040b*/ 1271,
+      /*0x1f8b*/ 778,
+      /*0x040b*/ 308,
+      -1,
+      /*0xa75c*/ 1091,
+      /*0xab8b*/ 1169,
+      /*0xff23*/ 1236,
+      -1,
+      /*0x018b*/ 128,
+      /*0x1c91*/ 540,
+      /*0x10c91*/ 1353,
+      -1,
+      /*0x2c0b*/ 922,
+      /*0x1e911*/ 1468,
+      -1,
+      /*0x2164*/ 872,
+      /*0xab77*/ 1149,
+      -1,
+      /*0x104b1*/ 1301,
+      -1,
+      /*0xfb15*/ 1231,
+      /*0x0531*/ 445,
+      -1,
+      /*0x118bd*/ 1416,
+      /*0x16e44*/ 1423,
+      /*0x16e4f*/ 1434,
+      -1,
+      /*0x1e7a*/ 646,
+      -1,
+      /*0x2160*/ 868,
+      /*0x1f19*/ 724,
+      /*0x10b5*/ 505,
+      /*0x10c8f*/ 1351,
+      -1, -1,
+      /*0x1e90f*/ 1466,
+      -1, -1,
+      /*0xa78b*/ 1109,
+      /*0x24b7*/ 886,
+      /*0x10405*/ 1265,
+      /*0x1f85*/ 772,
+      /*0x0405*/ 302,
+      -1,
+      /*0x104b7*/ 1307,
+      /*0xab85*/ 1163,
+      /*0x10b3*/ 503,
+      /*0x0537*/ 451,
+      /*0x10c8b*/ 1347,
+      -1,
+      /*0x16e42*/ 1421,
+      /*0x1e90b*/ 1462,
+      /*0x2c05*/ 916,
+      -1, -1, -1, -1, -1,
+      /*0x10401*/ 1261,
+      /*0x1f81*/ 768,
+      /*0x0401*/ 298,
+      /*0x04fa*/ 418,
+      /*0x16e48*/ 1427,
+      /*0xab81*/ 1159,
+      /*0x216e*/ 882,
+      -1,
+      /*0x0181*/ 121,
+      -1, -1, -1,
+      /*0x2c01*/ 912,
+      -1, -1,
+      /*0x2166*/ 874,
+      -1, -1, -1, -1,
+      /*0x118bb*/ 1414,
+      /*0x00b5*/ 25,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x1c85*/ 535,
+      /*0x10c85*/ 1341,
+      -1, -1,
+      /*0x1e905*/ 1456,
+      -1,
+      /*0x104b5*/ 1305,
+      -1, -1,
+      /*0x0535*/ 449,
+      -1, -1, -1, -1,
+      /*0x16e50*/ 1435,
+      -1,
+      /*0x16e56*/ 1441,
+      -1,
+      /*0x1c81*/ 531,
+      /*0x10c81*/ 1337,
+      -1,
+      /*0x104b3*/ 1303,
+      /*0x1e901*/ 1452,
+      -1,
+      /*0x0533*/ 447,
+      /*0x16e5b*/ 1446,
+      -1,
+      /*0x1e78*/ 645,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x118b1*/ 1404,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1,
+      /*0x16e46*/ 1425,
+      /*0xab70*/ 1142,
+      -1, -1, -1,
+      /*0xff31*/ 1250,
+      /*0x16e4e*/ 1433,
+      /*0x04f8*/ 417,
+      /*0x118b7*/ 1410,
+      -1, -1, -1,
+      /*0x16e5a*/ 1445,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0xfb05*/ 1227,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0xff37*/ 1256,
+      /*0x1e7e*/ 648,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0xfb01*/ 1223,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0x16e40*/ 1419,
+      -1, -1, -1, -1, -1,
+      /*0x118b5*/ 1408,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x04fe*/ 420,
+      -1, -1, -1, -1, -1,
+      /*0x118b3*/ 1406,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0xff35*/ 1254,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0xff33*/ 1252,
+      -1, -1, -1, -1, -1,
+      /*0x16e54*/ 1439,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0x16e58*/ 1443,
+      -1, -1, -1, -1, -1,
+      /*0x1f0f*/ 722,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0x1f0b*/ 718,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1,
+      /*0x16e55*/ 1440,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0x16e45*/ 1424,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0x16e59*/ 1444,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0xa77e*/ 1104,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1,
+      /*0x16e49*/ 1428,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x16e43*/ 1422,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x16e4b*/ 1430,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      /*0x16e5e*/ 1449,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0x16e51*/ 1436,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x16e5c*/ 1447,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1,
+      /*0x16e4d*/ 1432,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0x16e41*/ 1420,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0xab74*/ 1146,
+      -1, -1, -1, -1,
+      /*0xab7c*/ 1154,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      /*0xab72*/ 1144,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0xab76*/ 1148,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0xab7a*/ 1152,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0xab78*/ 1150,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0xab7e*/ 1156
+    };
+
+  if (code <= MAX_CODE_VALUE && code >= MIN_CODE_VALUE)
+    {
+      register unsigned int key = onigenc_unicode_CaseFold_11_hash(code);
+
+      if (key <= MAX_HASH_VALUE)
+        {
+          register short s = wordlist[key];
+
+          if (s >= 0 && code1_equal(code, CaseFold_11_Table[s].from))
+            return &CaseFold_11_Table[s].to;
+        }
+    }
+  return 0;
+}
+
+static const CaseUnfold_11_Type CaseUnfold_11_Table[] = {
+#define CaseUnfold_11 (*(CaseUnfold_11_Type (*)[1352])(CaseUnfold_11_Table+0))
+  {0x0061, {1|U, {0x0041}}},
+  {0x0062, {1|U, {0x0042}}},
+  {0x0063, {1|U, {0x0043}}},
+  {0x0064, {1|U, {0x0044}}},
+  {0x0065, {1|U, {0x0045}}},
+  {0x0066, {1|U, {0x0046}}},
+  {0x0067, {1|U, {0x0047}}},
+  {0x0068, {1|U, {0x0048}}},
+  {0x006a, {1|U, {0x004a}}},
+  {0x006b, {2|U, {0x004b, 0x212a}}},
+  {0x006c, {1|U, {0x004c}}},
+  {0x006d, {1|U, {0x004d}}},
+  {0x006e, {1|U, {0x004e}}},
+  {0x006f, {1|U, {0x004f}}},
+  {0x0070, {1|U, {0x0050}}},
+  {0x0071, {1|U, {0x0051}}},
+  {0x0072, {1|U, {0x0052}}},
+  {0x0073, {2|U, {0x0053, 0x017f}}},
+  {0x0074, {1|U, {0x0054}}},
+  {0x0075, {1|U, {0x0055}}},
+  {0x0076, {1|U, {0x0056}}},
+  {0x0077, {1|U, {0x0057}}},
+  {0x0078, {1|U, {0x0058}}},
+  {0x0079, {1|U, {0x0059}}},
+  {0x007a, {1|U, {0x005a}}},
+  {0x00e0, {1|U, {0x00c0}}},
+  {0x00e1, {1|U, {0x00c1}}},
+  {0x00e2, {1|U, {0x00c2}}},
+  {0x00e3, {1|U, {0x00c3}}},
+  {0x00e4, {1|U, {0x00c4}}},
+  {0x00e5, {2|U, {0x00c5, 0x212b}}},
+  {0x00e6, {1|U, {0x00c6}}},
+  {0x00e7, {1|U, {0x00c7}}},
+  {0x00e8, {1|U, {0x00c8}}},
+  {0x00e9, {1|U, {0x00c9}}},
+  {0x00ea, {1|U, {0x00ca}}},
+  {0x00eb, {1|U, {0x00cb}}},
+  {0x00ec, {1|U, {0x00cc}}},
+  {0x00ed, {1|U, {0x00cd}}},
+  {0x00ee, {1|U, {0x00ce}}},
+  {0x00ef, {1|U, {0x00cf}}},
+  {0x00f0, {1|U, {0x00d0}}},
+  {0x00f1, {1|U, {0x00d1}}},
+  {0x00f2, {1|U, {0x00d2}}},
+  {0x00f3, {1|U, {0x00d3}}},
+  {0x00f4, {1|U, {0x00d4}}},
+  {0x00f5, {1|U, {0x00d5}}},
+  {0x00f6, {1|U, {0x00d6}}},
+  {0x00f8, {1|U, {0x00d8}}},
+  {0x00f9, {1|U, {0x00d9}}},
+  {0x00fa, {1|U, {0x00da}}},
+  {0x00fb, {1|U, {0x00db}}},
+  {0x00fc, {1|U, {0x00dc}}},
+  {0x00fd, {1|U, {0x00dd}}},
+  {0x00fe, {1|U, {0x00de}}},
+  {0x00ff, {1|U, {0x0178}}},
+  {0x0101, {1|U, {0x0100}}},
+  {0x0103, {1|U, {0x0102}}},
+  {0x0105, {1|U, {0x0104}}},
+  {0x0107, {1|U, {0x0106}}},
+  {0x0109, {1|U, {0x0108}}},
+  {0x010b, {1|U, {0x010a}}},
+  {0x010d, {1|U, {0x010c}}},
+  {0x010f, {1|U, {0x010e}}},
+  {0x0111, {1|U, {0x0110}}},
+  {0x0113, {1|U, {0x0112}}},
+  {0x0115, {1|U, {0x0114}}},
+  {0x0117, {1|U, {0x0116}}},
+  {0x0119, {1|U, {0x0118}}},
+  {0x011b, {1|U, {0x011a}}},
+  {0x011d, {1|U, {0x011c}}},
+  {0x011f, {1|U, {0x011e}}},
+  {0x0121, {1|U, {0x0120}}},
+  {0x0123, {1|U, {0x0122}}},
+  {0x0125, {1|U, {0x0124}}},
+  {0x0127, {1|U, {0x0126}}},
+  {0x0129, {1|U, {0x0128}}},
+  {0x012b, {1|U, {0x012a}}},
+  {0x012d, {1|U, {0x012c}}},
+  {0x012f, {1|U, {0x012e}}},
+  {0x0133, {1|U, {0x0132}}},
+  {0x0135, {1|U, {0x0134}}},
+  {0x0137, {1|U, {0x0136}}},
+  {0x013a, {1|U, {0x0139}}},
+  {0x013c, {1|U, {0x013b}}},
+  {0x013e, {1|U, {0x013d}}},
+  {0x0140, {1|U, {0x013f}}},
+  {0x0142, {1|U, {0x0141}}},
+  {0x0144, {1|U, {0x0143}}},
+  {0x0146, {1|U, {0x0145}}},
+  {0x0148, {1|U, {0x0147}}},
+  {0x014b, {1|U, {0x014a}}},
+  {0x014d, {1|U, {0x014c}}},
+  {0x014f, {1|U, {0x014e}}},
+  {0x0151, {1|U, {0x0150}}},
+  {0x0153, {1|U, {0x0152}}},
+  {0x0155, {1|U, {0x0154}}},
+  {0x0157, {1|U, {0x0156}}},
+  {0x0159, {1|U, {0x0158}}},
+  {0x015b, {1|U, {0x015a}}},
+  {0x015d, {1|U, {0x015c}}},
+  {0x015f, {1|U, {0x015e}}},
+  {0x0161, {1|U, {0x0160}}},
+  {0x0163, {1|U, {0x0162}}},
+  {0x0165, {1|U, {0x0164}}},
+  {0x0167, {1|U, {0x0166}}},
+  {0x0169, {1|U, {0x0168}}},
+  {0x016b, {1|U, {0x016a}}},
+  {0x016d, {1|U, {0x016c}}},
+  {0x016f, {1|U, {0x016e}}},
+  {0x0171, {1|U, {0x0170}}},
+  {0x0173, {1|U, {0x0172}}},
+  {0x0175, {1|U, {0x0174}}},
+  {0x0177, {1|U, {0x0176}}},
+  {0x017a, {1|U, {0x0179}}},
+  {0x017c, {1|U, {0x017b}}},
+  {0x017e, {1|U, {0x017d}}},
+  {0x0180, {1|U, {0x0243}}},
+  {0x0183, {1|U, {0x0182}}},
+  {0x0185, {1|U, {0x0184}}},
+  {0x0188, {1|U, {0x0187}}},
+  {0x018c, {1|U, {0x018b}}},
+  {0x0192, {1|U, {0x0191}}},
+  {0x0195, {1|U, {0x01f6}}},
+  {0x0199, {1|U, {0x0198}}},
+  {0x019a, {1|U, {0x023d}}},
+  {0x019e, {1|U, {0x0220}}},
+  {0x01a1, {1|U, {0x01a0}}},
+  {0x01a3, {1|U, {0x01a2}}},
+  {0x01a5, {1|U, {0x01a4}}},
+  {0x01a8, {1|U, {0x01a7}}},
+  {0x01ad, {1|U, {0x01ac}}},
+  {0x01b0, {1|U, {0x01af}}},
+  {0x01b4, {1|U, {0x01b3}}},
+  {0x01b6, {1|U, {0x01b5}}},
+  {0x01b9, {1|U, {0x01b8}}},
+  {0x01bd, {1|U, {0x01bc}}},
+  {0x01bf, {1|U, {0x01f7}}},
+  {0x01c6, {2|U|ST, {0x01c4, 0x01c5}}},
+  {0x01c9, {2|U|ST, {0x01c7, 0x01c8}}},
+  {0x01cc, {2|U|ST, {0x01ca, 0x01cb}}},
+  {0x01ce, {1|U, {0x01cd}}},
+  {0x01d0, {1|U, {0x01cf}}},
+  {0x01d2, {1|U, {0x01d1}}},
+  {0x01d4, {1|U, {0x01d3}}},
+  {0x01d6, {1|U, {0x01d5}}},
+  {0x01d8, {1|U, {0x01d7}}},
+  {0x01da, {1|U, {0x01d9}}},
+  {0x01dc, {1|U, {0x01db}}},
+  {0x01dd, {1|U, {0x018e}}},
+  {0x01df, {1|U, {0x01de}}},
+  {0x01e1, {1|U, {0x01e0}}},
+  {0x01e3, {1|U, {0x01e2}}},
+  {0x01e5, {1|U, {0x01e4}}},
+  {0x01e7, {1|U, {0x01e6}}},
+  {0x01e9, {1|U, {0x01e8}}},
+  {0x01eb, {1|U, {0x01ea}}},
+  {0x01ed, {1|U, {0x01ec}}},
+  {0x01ef, {1|U, {0x01ee}}},
+  {0x01f3, {2|U|ST, {0x01f1, 0x01f2}}},
+  {0x01f5, {1|U, {0x01f4}}},
+  {0x01f9, {1|U, {0x01f8}}},
+  {0x01fb, {1|U, {0x01fa}}},
+  {0x01fd, {1|U, {0x01fc}}},
+  {0x01ff, {1|U, {0x01fe}}},
+  {0x0201, {1|U, {0x0200}}},
+  {0x0203, {1|U, {0x0202}}},
+  {0x0205, {1|U, {0x0204}}},
+  {0x0207, {1|U, {0x0206}}},
+  {0x0209, {1|U, {0x0208}}},
+  {0x020b, {1|U, {0x020a}}},
+  {0x020d, {1|U, {0x020c}}},
+  {0x020f, {1|U, {0x020e}}},
+  {0x0211, {1|U, {0x0210}}},
+  {0x0213, {1|U, {0x0212}}},
+  {0x0215, {1|U, {0x0214}}},
+  {0x0217, {1|U, {0x0216}}},
+  {0x0219, {1|U, {0x0218}}},
+  {0x021b, {1|U, {0x021a}}},
+  {0x021d, {1|U, {0x021c}}},
+  {0x021f, {1|U, {0x021e}}},
+  {0x0223, {1|U, {0x0222}}},
+  {0x0225, {1|U, {0x0224}}},
+  {0x0227, {1|U, {0x0226}}},
+  {0x0229, {1|U, {0x0228}}},
+  {0x022b, {1|U, {0x022a}}},
+  {0x022d, {1|U, {0x022c}}},
+  {0x022f, {1|U, {0x022e}}},
+  {0x0231, {1|U, {0x0230}}},
+  {0x0233, {1|U, {0x0232}}},
+  {0x023c, {1|U, {0x023b}}},
+  {0x023f, {1|U, {0x2c7e}}},
+  {0x0240, {1|U, {0x2c7f}}},
+  {0x0242, {1|U, {0x0241}}},
+  {0x0247, {1|U, {0x0246}}},
+  {0x0249, {1|U, {0x0248}}},
+  {0x024b, {1|U, {0x024a}}},
+  {0x024d, {1|U, {0x024c}}},
+  {0x024f, {1|U, {0x024e}}},
+  {0x0250, {1|U, {0x2c6f}}},
+  {0x0251, {1|U, {0x2c6d}}},
+  {0x0252, {1|U, {0x2c70}}},
+  {0x0253, {1|U, {0x0181}}},
+  {0x0254, {1|U, {0x0186}}},
+  {0x0256, {1|U, {0x0189}}},
+  {0x0257, {1|U, {0x018a}}},
+  {0x0259, {1|U, {0x018f}}},
+  {0x025b, {1|U, {0x0190}}},
+  {0x025c, {1|U, {0xa7ab}}},
+  {0x0260, {1|U, {0x0193}}},
+  {0x0261, {1|U, {0xa7ac}}},
+  {0x0263, {1|U, {0x0194}}},
+  {0x0265, {1|U, {0xa78d}}},
+  {0x0266, {1|U, {0xa7aa}}},
+  {0x0268, {1|U, {0x0197}}},
+  {0x0269, {1|U, {0x0196}}},
+  {0x026a, {1|U, {0xa7ae}}},
+  {0x026b, {1|U, {0x2c62}}},
+  {0x026c, {1|U, {0xa7ad}}},
+  {0x026f, {1|U, {0x019c}}},
+  {0x0271, {1|U, {0x2c6e}}},
+  {0x0272, {1|U, {0x019d}}},
+  {0x0275, {1|U, {0x019f}}},
+  {0x027d, {1|U, {0x2c64}}},
+  {0x0280, {1|U, {0x01a6}}},
+  {0x0282, {1|U, {0xa7c5}}},
+  {0x0283, {1|U, {0x01a9}}},
+  {0x0287, {1|U, {0xa7b1}}},
+  {0x0288, {1|U, {0x01ae}}},
+  {0x0289, {1|U, {0x0244}}},
+  {0x028a, {1|U, {0x01b1}}},
+  {0x028b, {1|U, {0x01b2}}},
+  {0x028c, {1|U, {0x0245}}},
+  {0x0292, {1|U, {0x01b7}}},
+  {0x029d, {1|U, {0xa7b2}}},
+  {0x029e, {1|U, {0xa7b0}}},
+  {0x0371, {1|U, {0x0370}}},
+  {0x0373, {1|U, {0x0372}}},
+  {0x0377, {1|U, {0x0376}}},
+  {0x037b, {1|U, {0x03fd}}},
+  {0x037c, {1|U, {0x03fe}}},
+  {0x037d, {1|U, {0x03ff}}},
+  {0x03ac, {1|U, {0x0386}}},
+  {0x03ad, {1|U, {0x0388}}},
+  {0x03ae, {1|U, {0x0389}}},
+  {0x03af, {1|U, {0x038a}}},
+  {0x03b1, {1|U, {0x0391}}},
+  {0x03b2, {2|U, {0x0392, 0x03d0}}},
+  {0x03b3, {1|U, {0x0393}}},
+  {0x03b4, {1|U, {0x0394}}},
+  {0x03b5, {2|U, {0x0395, 0x03f5}}},
+  {0x03b6, {1|U, {0x0396}}},
+  {0x03b7, {1|U, {0x0397}}},
+  {0x03b8, {3|U, {0x0398, 0x03d1, 0x03f4}}},
+  {0x03b9, {3|U, {0x0399, 0x0345, 0x1fbe}}},
+  {0x03ba, {2|U, {0x039a, 0x03f0}}},
+  {0x03bb, {1|U, {0x039b}}},
+  {0x03bc, {2|U, {0x039c, 0x00b5}}},
+  {0x03bd, {1|U, {0x039d}}},
+  {0x03be, {1|U, {0x039e}}},
+  {0x03bf, {1|U, {0x039f}}},
+  {0x03c0, {2|U, {0x03a0, 0x03d6}}},
+  {0x03c1, {2|U, {0x03a1, 0x03f1}}},
+  {0x03c3, {2|U, {0x03a3, 0x03c2}}},
+  {0x03c4, {1|U, {0x03a4}}},
+  {0x03c5, {1|U, {0x03a5}}},
+  {0x03c6, {2|U, {0x03a6, 0x03d5}}},
+  {0x03c7, {1|U, {0x03a7}}},
+  {0x03c8, {1|U, {0x03a8}}},
+  {0x03c9, {2|U, {0x03a9, 0x2126}}},
+  {0x03ca, {1|U, {0x03aa}}},
+  {0x03cb, {1|U, {0x03ab}}},
+  {0x03cc, {1|U, {0x038c}}},
+  {0x03cd, {1|U, {0x038e}}},
+  {0x03ce, {1|U, {0x038f}}},
+  {0x03d7, {1|U, {0x03cf}}},
+  {0x03d9, {1|U, {0x03d8}}},
+  {0x03db, {1|U, {0x03da}}},
+  {0x03dd, {1|U, {0x03dc}}},
+  {0x03df, {1|U, {0x03de}}},
+  {0x03e1, {1|U, {0x03e0}}},
+  {0x03e3, {1|U, {0x03e2}}},
+  {0x03e5, {1|U, {0x03e4}}},
+  {0x03e7, {1|U, {0x03e6}}},
+  {0x03e9, {1|U, {0x03e8}}},
+  {0x03eb, {1|U, {0x03ea}}},
+  {0x03ed, {1|U, {0x03ec}}},
+  {0x03ef, {1|U, {0x03ee}}},
+  {0x03f2, {1|U, {0x03f9}}},
+  {0x03f3, {1|U, {0x037f}}},
+  {0x03f8, {1|U, {0x03f7}}},
+  {0x03fb, {1|U, {0x03fa}}},
+  {0x0430, {1|U, {0x0410}}},
+  {0x0431, {1|U, {0x0411}}},
+  {0x0432, {2|U, {0x0412, 0x1c80}}},
+  {0x0433, {1|U, {0x0413}}},
+  {0x0434, {2|U, {0x0414, 0x1c81}}},
+  {0x0435, {1|U, {0x0415}}},
+  {0x0436, {1|U, {0x0416}}},
+  {0x0437, {1|U, {0x0417}}},
+  {0x0438, {1|U, {0x0418}}},
+  {0x0439, {1|U, {0x0419}}},
+  {0x043a, {1|U, {0x041a}}},
+  {0x043b, {1|U, {0x041b}}},
+  {0x043c, {1|U, {0x041c}}},
+  {0x043d, {1|U, {0x041d}}},
+  {0x043e, {2|U, {0x041e, 0x1c82}}},
+  {0x043f, {1|U, {0x041f}}},
+  {0x0440, {1|U, {0x0420}}},
+  {0x0441, {2|U, {0x0421, 0x1c83}}},
+  {0x0442, {3|U, {0x0422, 0x1c84, 0x1c85}}},
+  {0x0443, {1|U, {0x0423}}},
+  {0x0444, {1|U, {0x0424}}},
+  {0x0445, {1|U, {0x0425}}},
+  {0x0446, {1|U, {0x0426}}},
+  {0x0447, {1|U, {0x0427}}},
+  {0x0448, {1|U, {0x0428}}},
+  {0x0449, {1|U, {0x0429}}},
+  {0x044a, {2|U, {0x042a, 0x1c86}}},
+  {0x044b, {1|U, {0x042b}}},
+  {0x044c, {1|U, {0x042c}}},
+  {0x044d, {1|U, {0x042d}}},
+  {0x044e, {1|U, {0x042e}}},
+  {0x044f, {1|U, {0x042f}}},
+  {0x0450, {1|U, {0x0400}}},
+  {0x0451, {1|U, {0x0401}}},
+  {0x0452, {1|U, {0x0402}}},
+  {0x0453, {1|U, {0x0403}}},
+  {0x0454, {1|U, {0x0404}}},
+  {0x0455, {1|U, {0x0405}}},
+  {0x0456, {1|U, {0x0406}}},
+  {0x0457, {1|U, {0x0407}}},
+  {0x0458, {1|U, {0x0408}}},
+  {0x0459, {1|U, {0x0409}}},
+  {0x045a, {1|U, {0x040a}}},
+  {0x045b, {1|U, {0x040b}}},
+  {0x045c, {1|U, {0x040c}}},
+  {0x045d, {1|U, {0x040d}}},
+  {0x045e, {1|U, {0x040e}}},
+  {0x045f, {1|U, {0x040f}}},
+  {0x0461, {1|U, {0x0460}}},
+  {0x0463, {2|U, {0x0462, 0x1c87}}},
+  {0x0465, {1|U, {0x0464}}},
+  {0x0467, {1|U, {0x0466}}},
+  {0x0469, {1|U, {0x0468}}},
+  {0x046b, {1|U, {0x046a}}},
+  {0x046d, {1|U, {0x046c}}},
+  {0x046f, {1|U, {0x046e}}},
+  {0x0471, {1|U, {0x0470}}},
+  {0x0473, {1|U, {0x0472}}},
+  {0x0475, {1|U, {0x0474}}},
+  {0x0477, {1|U, {0x0476}}},
+  {0x0479, {1|U, {0x0478}}},
+  {0x047b, {1|U, {0x047a}}},
+  {0x047d, {1|U, {0x047c}}},
+  {0x047f, {1|U, {0x047e}}},
+  {0x0481, {1|U, {0x0480}}},
+  {0x048b, {1|U, {0x048a}}},
+  {0x048d, {1|U, {0x048c}}},
+  {0x048f, {1|U, {0x048e}}},
+  {0x0491, {1|U, {0x0490}}},
+  {0x0493, {1|U, {0x0492}}},
+  {0x0495, {1|U, {0x0494}}},
+  {0x0497, {1|U, {0x0496}}},
+  {0x0499, {1|U, {0x0498}}},
+  {0x049b, {1|U, {0x049a}}},
+  {0x049d, {1|U, {0x049c}}},
+  {0x049f, {1|U, {0x049e}}},
+  {0x04a1, {1|U, {0x04a0}}},
+  {0x04a3, {1|U, {0x04a2}}},
+  {0x04a5, {1|U, {0x04a4}}},
+  {0x04a7, {1|U, {0x04a6}}},
+  {0x04a9, {1|U, {0x04a8}}},
+  {0x04ab, {1|U, {0x04aa}}},
+  {0x04ad, {1|U, {0x04ac}}},
+  {0x04af, {1|U, {0x04ae}}},
+  {0x04b1, {1|U, {0x04b0}}},
+  {0x04b3, {1|U, {0x04b2}}},
+  {0x04b5, {1|U, {0x04b4}}},
+  {0x04b7, {1|U, {0x04b6}}},
+  {0x04b9, {1|U, {0x04b8}}},
+  {0x04bb, {1|U, {0x04ba}}},
+  {0x04bd, {1|U, {0x04bc}}},
+  {0x04bf, {1|U, {0x04be}}},
+  {0x04c2, {1|U, {0x04c1}}},
+  {0x04c4, {1|U, {0x04c3}}},
+  {0x04c6, {1|U, {0x04c5}}},
+  {0x04c8, {1|U, {0x04c7}}},
+  {0x04ca, {1|U, {0x04c9}}},
+  {0x04cc, {1|U, {0x04cb}}},
+  {0x04ce, {1|U, {0x04cd}}},
+  {0x04cf, {1|U, {0x04c0}}},
+  {0x04d1, {1|U, {0x04d0}}},
+  {0x04d3, {1|U, {0x04d2}}},
+  {0x04d5, {1|U, {0x04d4}}},
+  {0x04d7, {1|U, {0x04d6}}},
+  {0x04d9, {1|U, {0x04d8}}},
+  {0x04db, {1|U, {0x04da}}},
+  {0x04dd, {1|U, {0x04dc}}},
+  {0x04df, {1|U, {0x04de}}},
+  {0x04e1, {1|U, {0x04e0}}},
+  {0x04e3, {1|U, {0x04e2}}},
+  {0x04e5, {1|U, {0x04e4}}},
+  {0x04e7, {1|U, {0x04e6}}},
+  {0x04e9, {1|U, {0x04e8}}},
+  {0x04eb, {1|U, {0x04ea}}},
+  {0x04ed, {1|U, {0x04ec}}},
+  {0x04ef, {1|U, {0x04ee}}},
+  {0x04f1, {1|U, {0x04f0}}},
+  {0x04f3, {1|U, {0x04f2}}},
+  {0x04f5, {1|U, {0x04f4}}},
+  {0x04f7, {1|U, {0x04f6}}},
+  {0x04f9, {1|U, {0x04f8}}},
+  {0x04fb, {1|U, {0x04fa}}},
+  {0x04fd, {1|U, {0x04fc}}},
+  {0x04ff, {1|U, {0x04fe}}},
+  {0x0501, {1|U, {0x0500}}},
+  {0x0503, {1|U, {0x0502}}},
+  {0x0505, {1|U, {0x0504}}},
+  {0x0507, {1|U, {0x0506}}},
+  {0x0509, {1|U, {0x0508}}},
+  {0x050b, {1|U, {0x050a}}},
+  {0x050d, {1|U, {0x050c}}},
+  {0x050f, {1|U, {0x050e}}},
+  {0x0511, {1|U, {0x0510}}},
+  {0x0513, {1|U, {0x0512}}},
+  {0x0515, {1|U, {0x0514}}},
+  {0x0517, {1|U, {0x0516}}},
+  {0x0519, {1|U, {0x0518}}},
+  {0x051b, {1|U, {0x051a}}},
+  {0x051d, {1|U, {0x051c}}},
+  {0x051f, {1|U, {0x051e}}},
+  {0x0521, {1|U, {0x0520}}},
+  {0x0523, {1|U, {0x0522}}},
+  {0x0525, {1|U, {0x0524}}},
+  {0x0527, {1|U, {0x0526}}},
+  {0x0529, {1|U, {0x0528}}},
+  {0x052b, {1|U, {0x052a}}},
+  {0x052d, {1|U, {0x052c}}},
+  {0x052f, {1|U, {0x052e}}},
+  {0x0561, {1|U, {0x0531}}},
+  {0x0562, {1|U, {0x0532}}},
+  {0x0563, {1|U, {0x0533}}},
+  {0x0564, {1|U, {0x0534}}},
+  {0x0565, {1|U, {0x0535}}},
+  {0x0566, {1|U, {0x0536}}},
+  {0x0567, {1|U, {0x0537}}},
+  {0x0568, {1|U, {0x0538}}},
+  {0x0569, {1|U, {0x0539}}},
+  {0x056a, {1|U, {0x053a}}},
+  {0x056b, {1|U, {0x053b}}},
+  {0x056c, {1|U, {0x053c}}},
+  {0x056d, {1|U, {0x053d}}},
+  {0x056e, {1|U, {0x053e}}},
+  {0x056f, {1|U, {0x053f}}},
+  {0x0570, {1|U, {0x0540}}},
+  {0x0571, {1|U, {0x0541}}},
+  {0x0572, {1|U, {0x0542}}},
+  {0x0573, {1|U, {0x0543}}},
+  {0x0574, {1|U, {0x0544}}},
+  {0x0575, {1|U, {0x0545}}},
+  {0x0576, {1|U, {0x0546}}},
+  {0x0577, {1|U, {0x0547}}},
+  {0x0578, {1|U, {0x0548}}},
+  {0x0579, {1|U, {0x0549}}},
+  {0x057a, {1|U, {0x054a}}},
+  {0x057b, {1|U, {0x054b}}},
+  {0x057c, {1|U, {0x054c}}},
+  {0x057d, {1|U, {0x054d}}},
+  {0x057e, {1|U, {0x054e}}},
+  {0x057f, {1|U, {0x054f}}},
+  {0x0580, {1|U, {0x0550}}},
+  {0x0581, {1|U, {0x0551}}},
+  {0x0582, {1|U, {0x0552}}},
+  {0x0583, {1|U, {0x0553}}},
+  {0x0584, {1|U, {0x0554}}},
+  {0x0585, {1|U, {0x0555}}},
+  {0x0586, {1|U, {0x0556}}},
+  {0x10d0, {1|U|IT, {0x1c90}}},
+  {0x10d1, {1|U|IT, {0x1c91}}},
+  {0x10d2, {1|U|IT, {0x1c92}}},
+  {0x10d3, {1|U|IT, {0x1c93}}},
+  {0x10d4, {1|U|IT, {0x1c94}}},
+  {0x10d5, {1|U|IT, {0x1c95}}},
+  {0x10d6, {1|U|IT, {0x1c96}}},
+  {0x10d7, {1|U|IT, {0x1c97}}},
+  {0x10d8, {1|U|IT, {0x1c98}}},
+  {0x10d9, {1|U|IT, {0x1c99}}},
+  {0x10da, {1|U|IT, {0x1c9a}}},
+  {0x10db, {1|U|IT, {0x1c9b}}},
+  {0x10dc, {1|U|IT, {0x1c9c}}},
+  {0x10dd, {1|U|IT, {0x1c9d}}},
+  {0x10de, {1|U|IT, {0x1c9e}}},
+  {0x10df, {1|U|IT, {0x1c9f}}},
+  {0x10e0, {1|U|IT, {0x1ca0}}},
+  {0x10e1, {1|U|IT, {0x1ca1}}},
+  {0x10e2, {1|U|IT, {0x1ca2}}},
+  {0x10e3, {1|U|IT, {0x1ca3}}},
+  {0x10e4, {1|U|IT, {0x1ca4}}},
+  {0x10e5, {1|U|IT, {0x1ca5}}},
+  {0x10e6, {1|U|IT, {0x1ca6}}},
+  {0x10e7, {1|U|IT, {0x1ca7}}},
+  {0x10e8, {1|U|IT, {0x1ca8}}},
+  {0x10e9, {1|U|IT, {0x1ca9}}},
+  {0x10ea, {1|U|IT, {0x1caa}}},
+  {0x10eb, {1|U|IT, {0x1cab}}},
+  {0x10ec, {1|U|IT, {0x1cac}}},
+  {0x10ed, {1|U|IT, {0x1cad}}},
+  {0x10ee, {1|U|IT, {0x1cae}}},
+  {0x10ef, {1|U|IT, {0x1caf}}},
+  {0x10f0, {1|U|IT, {0x1cb0}}},
+  {0x10f1, {1|U|IT, {0x1cb1}}},
+  {0x10f2, {1|U|IT, {0x1cb2}}},
+  {0x10f3, {1|U|IT, {0x1cb3}}},
+  {0x10f4, {1|U|IT, {0x1cb4}}},
+  {0x10f5, {1|U|IT, {0x1cb5}}},
+  {0x10f6, {1|U|IT, {0x1cb6}}},
+  {0x10f7, {1|U|IT, {0x1cb7}}},
+  {0x10f8, {1|U|IT, {0x1cb8}}},
+  {0x10f9, {1|U|IT, {0x1cb9}}},
+  {0x10fa, {1|U|IT, {0x1cba}}},
+  {0x10fd, {1|U|IT, {0x1cbd}}},
+  {0x10fe, {1|U|IT, {0x1cbe}}},
+  {0x10ff, {1|U|IT, {0x1cbf}}},
+  {0x13a0, {1|D, {0xab70}}},
+  {0x13a1, {1|D, {0xab71}}},
+  {0x13a2, {1|D, {0xab72}}},
+  {0x13a3, {1|D, {0xab73}}},
+  {0x13a4, {1|D, {0xab74}}},
+  {0x13a5, {1|D, {0xab75}}},
+  {0x13a6, {1|D, {0xab76}}},
+  {0x13a7, {1|D, {0xab77}}},
+  {0x13a8, {1|D, {0xab78}}},
+  {0x13a9, {1|D, {0xab79}}},
+  {0x13aa, {1|D, {0xab7a}}},
+  {0x13ab, {1|D, {0xab7b}}},
+  {0x13ac, {1|D, {0xab7c}}},
+  {0x13ad, {1|D, {0xab7d}}},
+  {0x13ae, {1|D, {0xab7e}}},
+  {0x13af, {1|D, {0xab7f}}},
+  {0x13b0, {1|D, {0xab80}}},
+  {0x13b1, {1|D, {0xab81}}},
+  {0x13b2, {1|D, {0xab82}}},
+  {0x13b3, {1|D, {0xab83}}},
+  {0x13b4, {1|D, {0xab84}}},
+  {0x13b5, {1|D, {0xab85}}},
+  {0x13b6, {1|D, {0xab86}}},
+  {0x13b7, {1|D, {0xab87}}},
+  {0x13b8, {1|D, {0xab88}}},
+  {0x13b9, {1|D, {0xab89}}},
+  {0x13ba, {1|D, {0xab8a}}},
+  {0x13bb, {1|D, {0xab8b}}},
+  {0x13bc, {1|D, {0xab8c}}},
+  {0x13bd, {1|D, {0xab8d}}},
+  {0x13be, {1|D, {0xab8e}}},
+  {0x13bf, {1|D, {0xab8f}}},
+  {0x13c0, {1|D, {0xab90}}},
+  {0x13c1, {1|D, {0xab91}}},
+  {0x13c2, {1|D, {0xab92}}},
+  {0x13c3, {1|D, {0xab93}}},
+  {0x13c4, {1|D, {0xab94}}},
+  {0x13c5, {1|D, {0xab95}}},
+  {0x13c6, {1|D, {0xab96}}},
+  {0x13c7, {1|D, {0xab97}}},
+  {0x13c8, {1|D, {0xab98}}},
+  {0x13c9, {1|D, {0xab99}}},
+  {0x13ca, {1|D, {0xab9a}}},
+  {0x13cb, {1|D, {0xab9b}}},
+  {0x13cc, {1|D, {0xab9c}}},
+  {0x13cd, {1|D, {0xab9d}}},
+  {0x13ce, {1|D, {0xab9e}}},
+  {0x13cf, {1|D, {0xab9f}}},
+  {0x13d0, {1|D, {0xaba0}}},
+  {0x13d1, {1|D, {0xaba1}}},
+  {0x13d2, {1|D, {0xaba2}}},
+  {0x13d3, {1|D, {0xaba3}}},
+  {0x13d4, {1|D, {0xaba4}}},
+  {0x13d5, {1|D, {0xaba5}}},
+  {0x13d6, {1|D, {0xaba6}}},
+  {0x13d7, {1|D, {0xaba7}}},
+  {0x13d8, {1|D, {0xaba8}}},
+  {0x13d9, {1|D, {0xaba9}}},
+  {0x13da, {1|D, {0xabaa}}},
+  {0x13db, {1|D, {0xabab}}},
+  {0x13dc, {1|D, {0xabac}}},
+  {0x13dd, {1|D, {0xabad}}},
+  {0x13de, {1|D, {0xabae}}},
+  {0x13df, {1|D, {0xabaf}}},
+  {0x13e0, {1|D, {0xabb0}}},
+  {0x13e1, {1|D, {0xabb1}}},
+  {0x13e2, {1|D, {0xabb2}}},
+  {0x13e3, {1|D, {0xabb3}}},
+  {0x13e4, {1|D, {0xabb4}}},
+  {0x13e5, {1|D, {0xabb5}}},
+  {0x13e6, {1|D, {0xabb6}}},
+  {0x13e7, {1|D, {0xabb7}}},
+  {0x13e8, {1|D, {0xabb8}}},
+  {0x13e9, {1|D, {0xabb9}}},
+  {0x13ea, {1|D, {0xabba}}},
+  {0x13eb, {1|D, {0xabbb}}},
+  {0x13ec, {1|D, {0xabbc}}},
+  {0x13ed, {1|D, {0xabbd}}},
+  {0x13ee, {1|D, {0xabbe}}},
+  {0x13ef, {1|D, {0xabbf}}},
+  {0x13f0, {1|D, {0x13f8}}},
+  {0x13f1, {1|D, {0x13f9}}},
+  {0x13f2, {1|D, {0x13fa}}},
+  {0x13f3, {1|D, {0x13fb}}},
+  {0x13f4, {1|D, {0x13fc}}},
+  {0x13f5, {1|D, {0x13fd}}},
+  {0x1d79, {1|U, {0xa77d}}},
+  {0x1d7d, {1|U, {0x2c63}}},
+  {0x1d8e, {1|U, {0xa7c6}}},
+  {0x1e01, {1|U, {0x1e00}}},
+  {0x1e03, {1|U, {0x1e02}}},
+  {0x1e05, {1|U, {0x1e04}}},
+  {0x1e07, {1|U, {0x1e06}}},
+  {0x1e09, {1|U, {0x1e08}}},
+  {0x1e0b, {1|U, {0x1e0a}}},
+  {0x1e0d, {1|U, {0x1e0c}}},
+  {0x1e0f, {1|U, {0x1e0e}}},
+  {0x1e11, {1|U, {0x1e10}}},
+  {0x1e13, {1|U, {0x1e12}}},
+  {0x1e15, {1|U, {0x1e14}}},
+  {0x1e17, {1|U, {0x1e16}}},
+  {0x1e19, {1|U, {0x1e18}}},
+  {0x1e1b, {1|U, {0x1e1a}}},
+  {0x1e1d, {1|U, {0x1e1c}}},
+  {0x1e1f, {1|U, {0x1e1e}}},
+  {0x1e21, {1|U, {0x1e20}}},
+  {0x1e23, {1|U, {0x1e22}}},
+  {0x1e25, {1|U, {0x1e24}}},
+  {0x1e27, {1|U, {0x1e26}}},
+  {0x1e29, {1|U, {0x1e28}}},
+  {0x1e2b, {1|U, {0x1e2a}}},
+  {0x1e2d, {1|U, {0x1e2c}}},
+  {0x1e2f, {1|U, {0x1e2e}}},
+  {0x1e31, {1|U, {0x1e30}}},
+  {0x1e33, {1|U, {0x1e32}}},
+  {0x1e35, {1|U, {0x1e34}}},
+  {0x1e37, {1|U, {0x1e36}}},
+  {0x1e39, {1|U, {0x1e38}}},
+  {0x1e3b, {1|U, {0x1e3a}}},
+  {0x1e3d, {1|U, {0x1e3c}}},
+  {0x1e3f, {1|U, {0x1e3e}}},
+  {0x1e41, {1|U, {0x1e40}}},
+  {0x1e43, {1|U, {0x1e42}}},
+  {0x1e45, {1|U, {0x1e44}}},
+  {0x1e47, {1|U, {0x1e46}}},
+  {0x1e49, {1|U, {0x1e48}}},
+  {0x1e4b, {1|U, {0x1e4a}}},
+  {0x1e4d, {1|U, {0x1e4c}}},
+  {0x1e4f, {1|U, {0x1e4e}}},
+  {0x1e51, {1|U, {0x1e50}}},
+  {0x1e53, {1|U, {0x1e52}}},
+  {0x1e55, {1|U, {0x1e54}}},
+  {0x1e57, {1|U, {0x1e56}}},
+  {0x1e59, {1|U, {0x1e58}}},
+  {0x1e5b, {1|U, {0x1e5a}}},
+  {0x1e5d, {1|U, {0x1e5c}}},
+  {0x1e5f, {1|U, {0x1e5e}}},
+  {0x1e61, {2|U, {0x1e60, 0x1e9b}}},
+  {0x1e63, {1|U, {0x1e62}}},
+  {0x1e65, {1|U, {0x1e64}}},
+  {0x1e67, {1|U, {0x1e66}}},
+  {0x1e69, {1|U, {0x1e68}}},
+  {0x1e6b, {1|U, {0x1e6a}}},
+  {0x1e6d, {1|U, {0x1e6c}}},
+  {0x1e6f, {1|U, {0x1e6e}}},
+  {0x1e71, {1|U, {0x1e70}}},
+  {0x1e73, {1|U, {0x1e72}}},
+  {0x1e75, {1|U, {0x1e74}}},
+  {0x1e77, {1|U, {0x1e76}}},
+  {0x1e79, {1|U, {0x1e78}}},
+  {0x1e7b, {1|U, {0x1e7a}}},
+  {0x1e7d, {1|U, {0x1e7c}}},
+  {0x1e7f, {1|U, {0x1e7e}}},
+  {0x1e81, {1|U, {0x1e80}}},
+  {0x1e83, {1|U, {0x1e82}}},
+  {0x1e85, {1|U, {0x1e84}}},
+  {0x1e87, {1|U, {0x1e86}}},
+  {0x1e89, {1|U, {0x1e88}}},
+  {0x1e8b, {1|U, {0x1e8a}}},
+  {0x1e8d, {1|U, {0x1e8c}}},
+  {0x1e8f, {1|U, {0x1e8e}}},
+  {0x1e91, {1|U, {0x1e90}}},
+  {0x1e93, {1|U, {0x1e92}}},
+  {0x1e95, {1|U, {0x1e94}}},
+  {0x1ea1, {1|U, {0x1ea0}}},
+  {0x1ea3, {1|U, {0x1ea2}}},
+  {0x1ea5, {1|U, {0x1ea4}}},
+  {0x1ea7, {1|U, {0x1ea6}}},
+  {0x1ea9, {1|U, {0x1ea8}}},
+  {0x1eab, {1|U, {0x1eaa}}},
+  {0x1ead, {1|U, {0x1eac}}},
+  {0x1eaf, {1|U, {0x1eae}}},
+  {0x1eb1, {1|U, {0x1eb0}}},
+  {0x1eb3, {1|U, {0x1eb2}}},
+  {0x1eb5, {1|U, {0x1eb4}}},
+  {0x1eb7, {1|U, {0x1eb6}}},
+  {0x1eb9, {1|U, {0x1eb8}}},
+  {0x1ebb, {1|U, {0x1eba}}},
+  {0x1ebd, {1|U, {0x1ebc}}},
+  {0x1ebf, {1|U, {0x1ebe}}},
+  {0x1ec1, {1|U, {0x1ec0}}},
+  {0x1ec3, {1|U, {0x1ec2}}},
+  {0x1ec5, {1|U, {0x1ec4}}},
+  {0x1ec7, {1|U, {0x1ec6}}},
+  {0x1ec9, {1|U, {0x1ec8}}},
+  {0x1ecb, {1|U, {0x1eca}}},
+  {0x1ecd, {1|U, {0x1ecc}}},
+  {0x1ecf, {1|U, {0x1ece}}},
+  {0x1ed1, {1|U, {0x1ed0}}},
+  {0x1ed3, {1|U, {0x1ed2}}},
+  {0x1ed5, {1|U, {0x1ed4}}},
+  {0x1ed7, {1|U, {0x1ed6}}},
+  {0x1ed9, {1|U, {0x1ed8}}},
+  {0x1edb, {1|U, {0x1eda}}},
+  {0x1edd, {1|U, {0x1edc}}},
+  {0x1edf, {1|U, {0x1ede}}},
+  {0x1ee1, {1|U, {0x1ee0}}},
+  {0x1ee3, {1|U, {0x1ee2}}},
+  {0x1ee5, {1|U, {0x1ee4}}},
+  {0x1ee7, {1|U, {0x1ee6}}},
+  {0x1ee9, {1|U, {0x1ee8}}},
+  {0x1eeb, {1|U, {0x1eea}}},
+  {0x1eed, {1|U, {0x1eec}}},
+  {0x1eef, {1|U, {0x1eee}}},
+  {0x1ef1, {1|U, {0x1ef0}}},
+  {0x1ef3, {1|U, {0x1ef2}}},
+  {0x1ef5, {1|U, {0x1ef4}}},
+  {0x1ef7, {1|U, {0x1ef6}}},
+  {0x1ef9, {1|U, {0x1ef8}}},
+  {0x1efb, {1|U, {0x1efa}}},
+  {0x1efd, {1|U, {0x1efc}}},
+  {0x1eff, {1|U, {0x1efe}}},
+  {0x1f00, {1|U, {0x1f08}}},
+  {0x1f01, {1|U, {0x1f09}}},
+  {0x1f02, {1|U, {0x1f0a}}},
+  {0x1f03, {1|U, {0x1f0b}}},
+  {0x1f04, {1|U, {0x1f0c}}},
+  {0x1f05, {1|U, {0x1f0d}}},
+  {0x1f06, {1|U, {0x1f0e}}},
+  {0x1f07, {1|U, {0x1f0f}}},
+  {0x1f10, {1|U, {0x1f18}}},
+  {0x1f11, {1|U, {0x1f19}}},
+  {0x1f12, {1|U, {0x1f1a}}},
+  {0x1f13, {1|U, {0x1f1b}}},
+  {0x1f14, {1|U, {0x1f1c}}},
+  {0x1f15, {1|U, {0x1f1d}}},
+  {0x1f20, {1|U, {0x1f28}}},
+  {0x1f21, {1|U, {0x1f29}}},
+  {0x1f22, {1|U, {0x1f2a}}},
+  {0x1f23, {1|U, {0x1f2b}}},
+  {0x1f24, {1|U, {0x1f2c}}},
+  {0x1f25, {1|U, {0x1f2d}}},
+  {0x1f26, {1|U, {0x1f2e}}},
+  {0x1f27, {1|U, {0x1f2f}}},
+  {0x1f30, {1|U, {0x1f38}}},
+  {0x1f31, {1|U, {0x1f39}}},
+  {0x1f32, {1|U, {0x1f3a}}},
+  {0x1f33, {1|U, {0x1f3b}}},
+  {0x1f34, {1|U, {0x1f3c}}},
+  {0x1f35, {1|U, {0x1f3d}}},
+  {0x1f36, {1|U, {0x1f3e}}},
+  {0x1f37, {1|U, {0x1f3f}}},
+  {0x1f40, {1|U, {0x1f48}}},
+  {0x1f41, {1|U, {0x1f49}}},
+  {0x1f42, {1|U, {0x1f4a}}},
+  {0x1f43, {1|U, {0x1f4b}}},
+  {0x1f44, {1|U, {0x1f4c}}},
+  {0x1f45, {1|U, {0x1f4d}}},
+  {0x1f51, {1|U, {0x1f59}}},
+  {0x1f53, {1|U, {0x1f5b}}},
+  {0x1f55, {1|U, {0x1f5d}}},
+  {0x1f57, {1|U, {0x1f5f}}},
+  {0x1f60, {1|U, {0x1f68}}},
+  {0x1f61, {1|U, {0x1f69}}},
+  {0x1f62, {1|U, {0x1f6a}}},
+  {0x1f63, {1|U, {0x1f6b}}},
+  {0x1f64, {1|U, {0x1f6c}}},
+  {0x1f65, {1|U, {0x1f6d}}},
+  {0x1f66, {1|U, {0x1f6e}}},
+  {0x1f67, {1|U, {0x1f6f}}},
+  {0x1f70, {1|U, {0x1fba}}},
+  {0x1f71, {1|U, {0x1fbb}}},
+  {0x1f72, {1|U, {0x1fc8}}},
+  {0x1f73, {1|U, {0x1fc9}}},
+  {0x1f74, {1|U, {0x1fca}}},
+  {0x1f75, {1|U, {0x1fcb}}},
+  {0x1f76, {1|U, {0x1fda}}},
+  {0x1f77, {1|U, {0x1fdb}}},
+  {0x1f78, {1|U, {0x1ff8}}},
+  {0x1f79, {1|U, {0x1ff9}}},
+  {0x1f7a, {1|U, {0x1fea}}},
+  {0x1f7b, {1|U, {0x1feb}}},
+  {0x1f7c, {1|U, {0x1ffa}}},
+  {0x1f7d, {1|U, {0x1ffb}}},
+  {0x1fb0, {1|U, {0x1fb8}}},
+  {0x1fb1, {1|U, {0x1fb9}}},
+  {0x1fd0, {1|U, {0x1fd8}}},
+  {0x1fd1, {1|U, {0x1fd9}}},
+  {0x1fe0, {1|U, {0x1fe8}}},
+  {0x1fe1, {1|U, {0x1fe9}}},
+  {0x1fe5, {1|U, {0x1fec}}},
+  {0x214e, {1|U, {0x2132}}},
+  {0x2170, {1|U, {0x2160}}},
+  {0x2171, {1|U, {0x2161}}},
+  {0x2172, {1|U, {0x2162}}},
+  {0x2173, {1|U, {0x2163}}},
+  {0x2174, {1|U, {0x2164}}},
+  {0x2175, {1|U, {0x2165}}},
+  {0x2176, {1|U, {0x2166}}},
+  {0x2177, {1|U, {0x2167}}},
+  {0x2178, {1|U, {0x2168}}},
+  {0x2179, {1|U, {0x2169}}},
+  {0x217a, {1|U, {0x216a}}},
+  {0x217b, {1|U, {0x216b}}},
+  {0x217c, {1|U, {0x216c}}},
+  {0x217d, {1|U, {0x216d}}},
+  {0x217e, {1|U, {0x216e}}},
+  {0x217f, {1|U, {0x216f}}},
+  {0x2184, {1|U, {0x2183}}},
+  {0x24d0, {1|U, {0x24b6}}},
+  {0x24d1, {1|U, {0x24b7}}},
+  {0x24d2, {1|U, {0x24b8}}},
+  {0x24d3, {1|U, {0x24b9}}},
+  {0x24d4, {1|U, {0x24ba}}},
+  {0x24d5, {1|U, {0x24bb}}},
+  {0x24d6, {1|U, {0x24bc}}},
+  {0x24d7, {1|U, {0x24bd}}},
+  {0x24d8, {1|U, {0x24be}}},
+  {0x24d9, {1|U, {0x24bf}}},
+  {0x24da, {1|U, {0x24c0}}},
+  {0x24db, {1|U, {0x24c1}}},
+  {0x24dc, {1|U, {0x24c2}}},
+  {0x24dd, {1|U, {0x24c3}}},
+  {0x24de, {1|U, {0x24c4}}},
+  {0x24df, {1|U, {0x24c5}}},
+  {0x24e0, {1|U, {0x24c6}}},
+  {0x24e1, {1|U, {0x24c7}}},
+  {0x24e2, {1|U, {0x24c8}}},
+  {0x24e3, {1|U, {0x24c9}}},
+  {0x24e4, {1|U, {0x24ca}}},
+  {0x24e5, {1|U, {0x24cb}}},
+  {0x24e6, {1|U, {0x24cc}}},
+  {0x24e7, {1|U, {0x24cd}}},
+  {0x24e8, {1|U, {0x24ce}}},
+  {0x24e9, {1|U, {0x24cf}}},
+  {0x2c30, {1|U, {0x2c00}}},
+  {0x2c31, {1|U, {0x2c01}}},
+  {0x2c32, {1|U, {0x2c02}}},
+  {0x2c33, {1|U, {0x2c03}}},
+  {0x2c34, {1|U, {0x2c04}}},
+  {0x2c35, {1|U, {0x2c05}}},
+  {0x2c36, {1|U, {0x2c06}}},
+  {0x2c37, {1|U, {0x2c07}}},
+  {0x2c38, {1|U, {0x2c08}}},
+  {0x2c39, {1|U, {0x2c09}}},
+  {0x2c3a, {1|U, {0x2c0a}}},
+  {0x2c3b, {1|U, {0x2c0b}}},
+  {0x2c3c, {1|U, {0x2c0c}}},
+  {0x2c3d, {1|U, {0x2c0d}}},
+  {0x2c3e, {1|U, {0x2c0e}}},
+  {0x2c3f, {1|U, {0x2c0f}}},
+  {0x2c40, {1|U, {0x2c10}}},
+  {0x2c41, {1|U, {0x2c11}}},
+  {0x2c42, {1|U, {0x2c12}}},
+  {0x2c43, {1|U, {0x2c13}}},
+  {0x2c44, {1|U, {0x2c14}}},
+  {0x2c45, {1|U, {0x2c15}}},
+  {0x2c46, {1|U, {0x2c16}}},
+  {0x2c47, {1|U, {0x2c17}}},
+  {0x2c48, {1|U, {0x2c18}}},
+  {0x2c49, {1|U, {0x2c19}}},
+  {0x2c4a, {1|U, {0x2c1a}}},
+  {0x2c4b, {1|U, {0x2c1b}}},
+  {0x2c4c, {1|U, {0x2c1c}}},
+  {0x2c4d, {1|U, {0x2c1d}}},
+  {0x2c4e, {1|U, {0x2c1e}}},
+  {0x2c4f, {1|U, {0x2c1f}}},
+  {0x2c50, {1|U, {0x2c20}}},
+  {0x2c51, {1|U, {0x2c21}}},
+  {0x2c52, {1|U, {0x2c22}}},
+  {0x2c53, {1|U, {0x2c23}}},
+  {0x2c54, {1|U, {0x2c24}}},
+  {0x2c55, {1|U, {0x2c25}}},
+  {0x2c56, {1|U, {0x2c26}}},
+  {0x2c57, {1|U, {0x2c27}}},
+  {0x2c58, {1|U, {0x2c28}}},
+  {0x2c59, {1|U, {0x2c29}}},
+  {0x2c5a, {1|U, {0x2c2a}}},
+  {0x2c5b, {1|U, {0x2c2b}}},
+  {0x2c5c, {1|U, {0x2c2c}}},
+  {0x2c5d, {1|U, {0x2c2d}}},
+  {0x2c5e, {1|U, {0x2c2e}}},
+  {0x2c61, {1|U, {0x2c60}}},
+  {0x2c65, {1|U, {0x023a}}},
+  {0x2c66, {1|U, {0x023e}}},
+  {0x2c68, {1|U, {0x2c67}}},
+  {0x2c6a, {1|U, {0x2c69}}},
+  {0x2c6c, {1|U, {0x2c6b}}},
+  {0x2c73, {1|U, {0x2c72}}},
+  {0x2c76, {1|U, {0x2c75}}},
+  {0x2c81, {1|U, {0x2c80}}},
+  {0x2c83, {1|U, {0x2c82}}},
+  {0x2c85, {1|U, {0x2c84}}},
+  {0x2c87, {1|U, {0x2c86}}},
+  {0x2c89, {1|U, {0x2c88}}},
+  {0x2c8b, {1|U, {0x2c8a}}},
+  {0x2c8d, {1|U, {0x2c8c}}},
+  {0x2c8f, {1|U, {0x2c8e}}},
+  {0x2c91, {1|U, {0x2c90}}},
+  {0x2c93, {1|U, {0x2c92}}},
+  {0x2c95, {1|U, {0x2c94}}},
+  {0x2c97, {1|U, {0x2c96}}},
+  {0x2c99, {1|U, {0x2c98}}},
+  {0x2c9b, {1|U, {0x2c9a}}},
+  {0x2c9d, {1|U, {0x2c9c}}},
+  {0x2c9f, {1|U, {0x2c9e}}},
+  {0x2ca1, {1|U, {0x2ca0}}},
+  {0x2ca3, {1|U, {0x2ca2}}},
+  {0x2ca5, {1|U, {0x2ca4}}},
+  {0x2ca7, {1|U, {0x2ca6}}},
+  {0x2ca9, {1|U, {0x2ca8}}},
+  {0x2cab, {1|U, {0x2caa}}},
+  {0x2cad, {1|U, {0x2cac}}},
+  {0x2caf, {1|U, {0x2cae}}},
+  {0x2cb1, {1|U, {0x2cb0}}},
+  {0x2cb3, {1|U, {0x2cb2}}},
+  {0x2cb5, {1|U, {0x2cb4}}},
+  {0x2cb7, {1|U, {0x2cb6}}},
+  {0x2cb9, {1|U, {0x2cb8}}},
+  {0x2cbb, {1|U, {0x2cba}}},
+  {0x2cbd, {1|U, {0x2cbc}}},
+  {0x2cbf, {1|U, {0x2cbe}}},
+  {0x2cc1, {1|U, {0x2cc0}}},
+  {0x2cc3, {1|U, {0x2cc2}}},
+  {0x2cc5, {1|U, {0x2cc4}}},
+  {0x2cc7, {1|U, {0x2cc6}}},
+  {0x2cc9, {1|U, {0x2cc8}}},
+  {0x2ccb, {1|U, {0x2cca}}},
+  {0x2ccd, {1|U, {0x2ccc}}},
+  {0x2ccf, {1|U, {0x2cce}}},
+  {0x2cd1, {1|U, {0x2cd0}}},
+  {0x2cd3, {1|U, {0x2cd2}}},
+  {0x2cd5, {1|U, {0x2cd4}}},
+  {0x2cd7, {1|U, {0x2cd6}}},
+  {0x2cd9, {1|U, {0x2cd8}}},
+  {0x2cdb, {1|U, {0x2cda}}},
+  {0x2cdd, {1|U, {0x2cdc}}},
+  {0x2cdf, {1|U, {0x2cde}}},
+  {0x2ce1, {1|U, {0x2ce0}}},
+  {0x2ce3, {1|U, {0x2ce2}}},
+  {0x2cec, {1|U, {0x2ceb}}},
+  {0x2cee, {1|U, {0x2ced}}},
+  {0x2cf3, {1|U, {0x2cf2}}},
+  {0x2d00, {1|U, {0x10a0}}},
+  {0x2d01, {1|U, {0x10a1}}},
+  {0x2d02, {1|U, {0x10a2}}},
+  {0x2d03, {1|U, {0x10a3}}},
+  {0x2d04, {1|U, {0x10a4}}},
+  {0x2d05, {1|U, {0x10a5}}},
+  {0x2d06, {1|U, {0x10a6}}},
+  {0x2d07, {1|U, {0x10a7}}},
+  {0x2d08, {1|U, {0x10a8}}},
+  {0x2d09, {1|U, {0x10a9}}},
+  {0x2d0a, {1|U, {0x10aa}}},
+  {0x2d0b, {1|U, {0x10ab}}},
+  {0x2d0c, {1|U, {0x10ac}}},
+  {0x2d0d, {1|U, {0x10ad}}},
+  {0x2d0e, {1|U, {0x10ae}}},
+  {0x2d0f, {1|U, {0x10af}}},
+  {0x2d10, {1|U, {0x10b0}}},
+  {0x2d11, {1|U, {0x10b1}}},
+  {0x2d12, {1|U, {0x10b2}}},
+  {0x2d13, {1|U, {0x10b3}}},
+  {0x2d14, {1|U, {0x10b4}}},
+  {0x2d15, {1|U, {0x10b5}}},
+  {0x2d16, {1|U, {0x10b6}}},
+  {0x2d17, {1|U, {0x10b7}}},
+  {0x2d18, {1|U, {0x10b8}}},
+  {0x2d19, {1|U, {0x10b9}}},
+  {0x2d1a, {1|U, {0x10ba}}},
+  {0x2d1b, {1|U, {0x10bb}}},
+  {0x2d1c, {1|U, {0x10bc}}},
+  {0x2d1d, {1|U, {0x10bd}}},
+  {0x2d1e, {1|U, {0x10be}}},
+  {0x2d1f, {1|U, {0x10bf}}},
+  {0x2d20, {1|U, {0x10c0}}},
+  {0x2d21, {1|U, {0x10c1}}},
+  {0x2d22, {1|U, {0x10c2}}},
+  {0x2d23, {1|U, {0x10c3}}},
+  {0x2d24, {1|U, {0x10c4}}},
+  {0x2d25, {1|U, {0x10c5}}},
+  {0x2d27, {1|U, {0x10c7}}},
+  {0x2d2d, {1|U, {0x10cd}}},
+  {0xa641, {1|U, {0xa640}}},
+  {0xa643, {1|U, {0xa642}}},
+  {0xa645, {1|U, {0xa644}}},
+  {0xa647, {1|U, {0xa646}}},
+  {0xa649, {1|U, {0xa648}}},
+  {0xa64b, {2|U, {0xa64a, 0x1c88}}},
+  {0xa64d, {1|U, {0xa64c}}},
+  {0xa64f, {1|U, {0xa64e}}},
+  {0xa651, {1|U, {0xa650}}},
+  {0xa653, {1|U, {0xa652}}},
+  {0xa655, {1|U, {0xa654}}},
+  {0xa657, {1|U, {0xa656}}},
+  {0xa659, {1|U, {0xa658}}},
+  {0xa65b, {1|U, {0xa65a}}},
+  {0xa65d, {1|U, {0xa65c}}},
+  {0xa65f, {1|U, {0xa65e}}},
+  {0xa661, {1|U, {0xa660}}},
+  {0xa663, {1|U, {0xa662}}},
+  {0xa665, {1|U, {0xa664}}},
+  {0xa667, {1|U, {0xa666}}},
+  {0xa669, {1|U, {0xa668}}},
+  {0xa66b, {1|U, {0xa66a}}},
+  {0xa66d, {1|U, {0xa66c}}},
+  {0xa681, {1|U, {0xa680}}},
+  {0xa683, {1|U, {0xa682}}},
+  {0xa685, {1|U, {0xa684}}},
+  {0xa687, {1|U, {0xa686}}},
+  {0xa689, {1|U, {0xa688}}},
+  {0xa68b, {1|U, {0xa68a}}},
+  {0xa68d, {1|U, {0xa68c}}},
+  {0xa68f, {1|U, {0xa68e}}},
+  {0xa691, {1|U, {0xa690}}},
+  {0xa693, {1|U, {0xa692}}},
+  {0xa695, {1|U, {0xa694}}},
+  {0xa697, {1|U, {0xa696}}},
+  {0xa699, {1|U, {0xa698}}},
+  {0xa69b, {1|U, {0xa69a}}},
+  {0xa723, {1|U, {0xa722}}},
+  {0xa725, {1|U, {0xa724}}},
+  {0xa727, {1|U, {0xa726}}},
+  {0xa729, {1|U, {0xa728}}},
+  {0xa72b, {1|U, {0xa72a}}},
+  {0xa72d, {1|U, {0xa72c}}},
+  {0xa72f, {1|U, {0xa72e}}},
+  {0xa733, {1|U, {0xa732}}},
+  {0xa735, {1|U, {0xa734}}},
+  {0xa737, {1|U, {0xa736}}},
+  {0xa739, {1|U, {0xa738}}},
+  {0xa73b, {1|U, {0xa73a}}},
+  {0xa73d, {1|U, {0xa73c}}},
+  {0xa73f, {1|U, {0xa73e}}},
+  {0xa741, {1|U, {0xa740}}},
+  {0xa743, {1|U, {0xa742}}},
+  {0xa745, {1|U, {0xa744}}},
+  {0xa747, {1|U, {0xa746}}},
+  {0xa749, {1|U, {0xa748}}},
+  {0xa74b, {1|U, {0xa74a}}},
+  {0xa74d, {1|U, {0xa74c}}},
+  {0xa74f, {1|U, {0xa74e}}},
+  {0xa751, {1|U, {0xa750}}},
+  {0xa753, {1|U, {0xa752}}},
+  {0xa755, {1|U, {0xa754}}},
+  {0xa757, {1|U, {0xa756}}},
+  {0xa759, {1|U, {0xa758}}},
+  {0xa75b, {1|U, {0xa75a}}},
+  {0xa75d, {1|U, {0xa75c}}},
+  {0xa75f, {1|U, {0xa75e}}},
+  {0xa761, {1|U, {0xa760}}},
+  {0xa763, {1|U, {0xa762}}},
+  {0xa765, {1|U, {0xa764}}},
+  {0xa767, {1|U, {0xa766}}},
+  {0xa769, {1|U, {0xa768}}},
+  {0xa76b, {1|U, {0xa76a}}},
+  {0xa76d, {1|U, {0xa76c}}},
+  {0xa76f, {1|U, {0xa76e}}},
+  {0xa77a, {1|U, {0xa779}}},
+  {0xa77c, {1|U, {0xa77b}}},
+  {0xa77f, {1|U, {0xa77e}}},
+  {0xa781, {1|U, {0xa780}}},
+  {0xa783, {1|U, {0xa782}}},
+  {0xa785, {1|U, {0xa784}}},
+  {0xa787, {1|U, {0xa786}}},
+  {0xa78c, {1|U, {0xa78b}}},
+  {0xa791, {1|U, {0xa790}}},
+  {0xa793, {1|U, {0xa792}}},
+  {0xa794, {1|U, {0xa7c4}}},
+  {0xa797, {1|U, {0xa796}}},
+  {0xa799, {1|U, {0xa798}}},
+  {0xa79b, {1|U, {0xa79a}}},
+  {0xa79d, {1|U, {0xa79c}}},
+  {0xa79f, {1|U, {0xa79e}}},
+  {0xa7a1, {1|U, {0xa7a0}}},
+  {0xa7a3, {1|U, {0xa7a2}}},
+  {0xa7a5, {1|U, {0xa7a4}}},
+  {0xa7a7, {1|U, {0xa7a6}}},
+  {0xa7a9, {1|U, {0xa7a8}}},
+  {0xa7b5, {1|U, {0xa7b4}}},
+  {0xa7b7, {1|U, {0xa7b6}}},
+  {0xa7b9, {1|U, {0xa7b8}}},
+  {0xa7bb, {1|U, {0xa7ba}}},
+  {0xa7bd, {1|U, {0xa7bc}}},
+  {0xa7bf, {1|U, {0xa7be}}},
+  {0xa7c3, {1|U, {0xa7c2}}},
+  {0xab53, {1|U, {0xa7b3}}},
+  {0xff41, {1|U, {0xff21}}},
+  {0xff42, {1|U, {0xff22}}},
+  {0xff43, {1|U, {0xff23}}},
+  {0xff44, {1|U, {0xff24}}},
+  {0xff45, {1|U, {0xff25}}},
+  {0xff46, {1|U, {0xff26}}},
+  {0xff47, {1|U, {0xff27}}},
+  {0xff48, {1|U, {0xff28}}},
+  {0xff49, {1|U, {0xff29}}},
+  {0xff4a, {1|U, {0xff2a}}},
+  {0xff4b, {1|U, {0xff2b}}},
+  {0xff4c, {1|U, {0xff2c}}},
+  {0xff4d, {1|U, {0xff2d}}},
+  {0xff4e, {1|U, {0xff2e}}},
+  {0xff4f, {1|U, {0xff2f}}},
+  {0xff50, {1|U, {0xff30}}},
+  {0xff51, {1|U, {0xff31}}},
+  {0xff52, {1|U, {0xff32}}},
+  {0xff53, {1|U, {0xff33}}},
+  {0xff54, {1|U, {0xff34}}},
+  {0xff55, {1|U, {0xff35}}},
+  {0xff56, {1|U, {0xff36}}},
+  {0xff57, {1|U, {0xff37}}},
+  {0xff58, {1|U, {0xff38}}},
+  {0xff59, {1|U, {0xff39}}},
+  {0xff5a, {1|U, {0xff3a}}},
+  {0x10428, {1|U, {0x10400}}},
+  {0x10429, {1|U, {0x10401}}},
+  {0x1042a, {1|U, {0x10402}}},
+  {0x1042b, {1|U, {0x10403}}},
+  {0x1042c, {1|U, {0x10404}}},
+  {0x1042d, {1|U, {0x10405}}},
+  {0x1042e, {1|U, {0x10406}}},
+  {0x1042f, {1|U, {0x10407}}},
+  {0x10430, {1|U, {0x10408}}},
+  {0x10431, {1|U, {0x10409}}},
+  {0x10432, {1|U, {0x1040a}}},
+  {0x10433, {1|U, {0x1040b}}},
+  {0x10434, {1|U, {0x1040c}}},
+  {0x10435, {1|U, {0x1040d}}},
+  {0x10436, {1|U, {0x1040e}}},
+  {0x10437, {1|U, {0x1040f}}},
+  {0x10438, {1|U, {0x10410}}},
+  {0x10439, {1|U, {0x10411}}},
+  {0x1043a, {1|U, {0x10412}}},
+  {0x1043b, {1|U, {0x10413}}},
+  {0x1043c, {1|U, {0x10414}}},
+  {0x1043d, {1|U, {0x10415}}},
+  {0x1043e, {1|U, {0x10416}}},
+  {0x1043f, {1|U, {0x10417}}},
+  {0x10440, {1|U, {0x10418}}},
+  {0x10441, {1|U, {0x10419}}},
+  {0x10442, {1|U, {0x1041a}}},
+  {0x10443, {1|U, {0x1041b}}},
+  {0x10444, {1|U, {0x1041c}}},
+  {0x10445, {1|U, {0x1041d}}},
+  {0x10446, {1|U, {0x1041e}}},
+  {0x10447, {1|U, {0x1041f}}},
+  {0x10448, {1|U, {0x10420}}},
+  {0x10449, {1|U, {0x10421}}},
+  {0x1044a, {1|U, {0x10422}}},
+  {0x1044b, {1|U, {0x10423}}},
+  {0x1044c, {1|U, {0x10424}}},
+  {0x1044d, {1|U, {0x10425}}},
+  {0x1044e, {1|U, {0x10426}}},
+  {0x1044f, {1|U, {0x10427}}},
+  {0x104d8, {1|U, {0x104b0}}},
+  {0x104d9, {1|U, {0x104b1}}},
+  {0x104da, {1|U, {0x104b2}}},
+  {0x104db, {1|U, {0x104b3}}},
+  {0x104dc, {1|U, {0x104b4}}},
+  {0x104dd, {1|U, {0x104b5}}},
+  {0x104de, {1|U, {0x104b6}}},
+  {0x104df, {1|U, {0x104b7}}},
+  {0x104e0, {1|U, {0x104b8}}},
+  {0x104e1, {1|U, {0x104b9}}},
+  {0x104e2, {1|U, {0x104ba}}},
+  {0x104e3, {1|U, {0x104bb}}},
+  {0x104e4, {1|U, {0x104bc}}},
+  {0x104e5, {1|U, {0x104bd}}},
+  {0x104e6, {1|U, {0x104be}}},
+  {0x104e7, {1|U, {0x104bf}}},
+  {0x104e8, {1|U, {0x104c0}}},
+  {0x104e9, {1|U, {0x104c1}}},
+  {0x104ea, {1|U, {0x104c2}}},
+  {0x104eb, {1|U, {0x104c3}}},
+  {0x104ec, {1|U, {0x104c4}}},
+  {0x104ed, {1|U, {0x104c5}}},
+  {0x104ee, {1|U, {0x104c6}}},
+  {0x104ef, {1|U, {0x104c7}}},
+  {0x104f0, {1|U, {0x104c8}}},
+  {0x104f1, {1|U, {0x104c9}}},
+  {0x104f2, {1|U, {0x104ca}}},
+  {0x104f3, {1|U, {0x104cb}}},
+  {0x104f4, {1|U, {0x104cc}}},
+  {0x104f5, {1|U, {0x104cd}}},
+  {0x104f6, {1|U, {0x104ce}}},
+  {0x104f7, {1|U, {0x104cf}}},
+  {0x104f8, {1|U, {0x104d0}}},
+  {0x104f9, {1|U, {0x104d1}}},
+  {0x104fa, {1|U, {0x104d2}}},
+  {0x104fb, {1|U, {0x104d3}}},
+  {0x10cc0, {1|U, {0x10c80}}},
+  {0x10cc1, {1|U, {0x10c81}}},
+  {0x10cc2, {1|U, {0x10c82}}},
+  {0x10cc3, {1|U, {0x10c83}}},
+  {0x10cc4, {1|U, {0x10c84}}},
+  {0x10cc5, {1|U, {0x10c85}}},
+  {0x10cc6, {1|U, {0x10c86}}},
+  {0x10cc7, {1|U, {0x10c87}}},
+  {0x10cc8, {1|U, {0x10c88}}},
+  {0x10cc9, {1|U, {0x10c89}}},
+  {0x10cca, {1|U, {0x10c8a}}},
+  {0x10ccb, {1|U, {0x10c8b}}},
+  {0x10ccc, {1|U, {0x10c8c}}},
+  {0x10ccd, {1|U, {0x10c8d}}},
+  {0x10cce, {1|U, {0x10c8e}}},
+  {0x10ccf, {1|U, {0x10c8f}}},
+  {0x10cd0, {1|U, {0x10c90}}},
+  {0x10cd1, {1|U, {0x10c91}}},
+  {0x10cd2, {1|U, {0x10c92}}},
+  {0x10cd3, {1|U, {0x10c93}}},
+  {0x10cd4, {1|U, {0x10c94}}},
+  {0x10cd5, {1|U, {0x10c95}}},
+  {0x10cd6, {1|U, {0x10c96}}},
+  {0x10cd7, {1|U, {0x10c97}}},
+  {0x10cd8, {1|U, {0x10c98}}},
+  {0x10cd9, {1|U, {0x10c99}}},
+  {0x10cda, {1|U, {0x10c9a}}},
+  {0x10cdb, {1|U, {0x10c9b}}},
+  {0x10cdc, {1|U, {0x10c9c}}},
+  {0x10cdd, {1|U, {0x10c9d}}},
+  {0x10cde, {1|U, {0x10c9e}}},
+  {0x10cdf, {1|U, {0x10c9f}}},
+  {0x10ce0, {1|U, {0x10ca0}}},
+  {0x10ce1, {1|U, {0x10ca1}}},
+  {0x10ce2, {1|U, {0x10ca2}}},
+  {0x10ce3, {1|U, {0x10ca3}}},
+  {0x10ce4, {1|U, {0x10ca4}}},
+  {0x10ce5, {1|U, {0x10ca5}}},
+  {0x10ce6, {1|U, {0x10ca6}}},
+  {0x10ce7, {1|U, {0x10ca7}}},
+  {0x10ce8, {1|U, {0x10ca8}}},
+  {0x10ce9, {1|U, {0x10ca9}}},
+  {0x10cea, {1|U, {0x10caa}}},
+  {0x10ceb, {1|U, {0x10cab}}},
+  {0x10cec, {1|U, {0x10cac}}},
+  {0x10ced, {1|U, {0x10cad}}},
+  {0x10cee, {1|U, {0x10cae}}},
+  {0x10cef, {1|U, {0x10caf}}},
+  {0x10cf0, {1|U, {0x10cb0}}},
+  {0x10cf1, {1|U, {0x10cb1}}},
+  {0x10cf2, {1|U, {0x10cb2}}},
+  {0x118c0, {1|U, {0x118a0}}},
+  {0x118c1, {1|U, {0x118a1}}},
+  {0x118c2, {1|U, {0x118a2}}},
+  {0x118c3, {1|U, {0x118a3}}},
+  {0x118c4, {1|U, {0x118a4}}},
+  {0x118c5, {1|U, {0x118a5}}},
+  {0x118c6, {1|U, {0x118a6}}},
+  {0x118c7, {1|U, {0x118a7}}},
+  {0x118c8, {1|U, {0x118a8}}},
+  {0x118c9, {1|U, {0x118a9}}},
+  {0x118ca, {1|U, {0x118aa}}},
+  {0x118cb, {1|U, {0x118ab}}},
+  {0x118cc, {1|U, {0x118ac}}},
+  {0x118cd, {1|U, {0x118ad}}},
+  {0x118ce, {1|U, {0x118ae}}},
+  {0x118cf, {1|U, {0x118af}}},
+  {0x118d0, {1|U, {0x118b0}}},
+  {0x118d1, {1|U, {0x118b1}}},
+  {0x118d2, {1|U, {0x118b2}}},
+  {0x118d3, {1|U, {0x118b3}}},
+  {0x118d4, {1|U, {0x118b4}}},
+  {0x118d5, {1|U, {0x118b5}}},
+  {0x118d6, {1|U, {0x118b6}}},
+  {0x118d7, {1|U, {0x118b7}}},
+  {0x118d8, {1|U, {0x118b8}}},
+  {0x118d9, {1|U, {0x118b9}}},
+  {0x118da, {1|U, {0x118ba}}},
+  {0x118db, {1|U, {0x118bb}}},
+  {0x118dc, {1|U, {0x118bc}}},
+  {0x118dd, {1|U, {0x118bd}}},
+  {0x118de, {1|U, {0x118be}}},
+  {0x118df, {1|U, {0x118bf}}},
+  {0x16e60, {1|U, {0x16e40}}},
+  {0x16e61, {1|U, {0x16e41}}},
+  {0x16e62, {1|U, {0x16e42}}},
+  {0x16e63, {1|U, {0x16e43}}},
+  {0x16e64, {1|U, {0x16e44}}},
+  {0x16e65, {1|U, {0x16e45}}},
+  {0x16e66, {1|U, {0x16e46}}},
+  {0x16e67, {1|U, {0x16e47}}},
+  {0x16e68, {1|U, {0x16e48}}},
+  {0x16e69, {1|U, {0x16e49}}},
+  {0x16e6a, {1|U, {0x16e4a}}},
+  {0x16e6b, {1|U, {0x16e4b}}},
+  {0x16e6c, {1|U, {0x16e4c}}},
+  {0x16e6d, {1|U, {0x16e4d}}},
+  {0x16e6e, {1|U, {0x16e4e}}},
+  {0x16e6f, {1|U, {0x16e4f}}},
+  {0x16e70, {1|U, {0x16e50}}},
+  {0x16e71, {1|U, {0x16e51}}},
+  {0x16e72, {1|U, {0x16e52}}},
+  {0x16e73, {1|U, {0x16e53}}},
+  {0x16e74, {1|U, {0x16e54}}},
+  {0x16e75, {1|U, {0x16e55}}},
+  {0x16e76, {1|U, {0x16e56}}},
+  {0x16e77, {1|U, {0x16e57}}},
+  {0x16e78, {1|U, {0x16e58}}},
+  {0x16e79, {1|U, {0x16e59}}},
+  {0x16e7a, {1|U, {0x16e5a}}},
+  {0x16e7b, {1|U, {0x16e5b}}},
+  {0x16e7c, {1|U, {0x16e5c}}},
+  {0x16e7d, {1|U, {0x16e5d}}},
+  {0x16e7e, {1|U, {0x16e5e}}},
+  {0x16e7f, {1|U, {0x16e5f}}},
+  {0x1e922, {1|U, {0x1e900}}},
+  {0x1e923, {1|U, {0x1e901}}},
+  {0x1e924, {1|U, {0x1e902}}},
+  {0x1e925, {1|U, {0x1e903}}},
+  {0x1e926, {1|U, {0x1e904}}},
+  {0x1e927, {1|U, {0x1e905}}},
+  {0x1e928, {1|U, {0x1e906}}},
+  {0x1e929, {1|U, {0x1e907}}},
+  {0x1e92a, {1|U, {0x1e908}}},
+  {0x1e92b, {1|U, {0x1e909}}},
+  {0x1e92c, {1|U, {0x1e90a}}},
+  {0x1e92d, {1|U, {0x1e90b}}},
+  {0x1e92e, {1|U, {0x1e90c}}},
+  {0x1e92f, {1|U, {0x1e90d}}},
+  {0x1e930, {1|U, {0x1e90e}}},
+  {0x1e931, {1|U, {0x1e90f}}},
+  {0x1e932, {1|U, {0x1e910}}},
+  {0x1e933, {1|U, {0x1e911}}},
+  {0x1e934, {1|U, {0x1e912}}},
+  {0x1e935, {1|U, {0x1e913}}},
+  {0x1e936, {1|U, {0x1e914}}},
+  {0x1e937, {1|U, {0x1e915}}},
+  {0x1e938, {1|U, {0x1e916}}},
+  {0x1e939, {1|U, {0x1e917}}},
+  {0x1e93a, {1|U, {0x1e918}}},
+  {0x1e93b, {1|U, {0x1e919}}},
+  {0x1e93c, {1|U, {0x1e91a}}},
+  {0x1e93d, {1|U, {0x1e91b}}},
+  {0x1e93e, {1|U, {0x1e91c}}},
+  {0x1e93f, {1|U, {0x1e91d}}},
+  {0x1e940, {1|U, {0x1e91e}}},
+  {0x1e941, {1|U, {0x1e91f}}},
+  {0x1e942, {1|U, {0x1e920}}},
+  {0x1e943, {1|U, {0x1e921}}},
+#define CaseUnfold_11_Locale (*(CaseUnfold_11_Type (*)[1])(CaseUnfold_11_Table+1352))
+  {0x0069, {1|U, {0x0049}}},
+};
+
+/* ANSI-C code produced by gperf version 3.1 */
+/* Command-line: gperf -7 -k1,2,3 -F,-1 -c -j1 -i1 -t -T -E -C -H onigenc_unicode_CaseUnfold_11_hash -N onigenc_unicode_CaseUnfold_11_lookup -n  */
+
+/* maximum key range = 2507, duplicates = 0 */
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+/*ARGSUSED*/
+static unsigned int
+onigenc_unicode_CaseUnfold_11_hash(const OnigCodePoint code)
+{
+  static const unsigned short asso_values[] =
+    {
+         1, 2510,    2,    7,    4,  582,    9,  308,  197,  674,
+       297,   20,    2,    3,  303,  351, 2510, 2510, 2510, 2510,
+      2510, 2510, 2510, 2510, 2510, 2510, 2510, 2510, 2510,  112,
+      2510, 2510, 2510, 2510, 2510, 2510, 2510,  120, 2510, 2510,
+      2510, 2510, 2510,    1, 2510, 2510, 2510, 2510, 2510, 2510,
+      2510, 2510, 2510,  278, 2510, 2510, 2510, 2510, 2510, 2510,
+      2510, 2510,   12,    1,    7,    8,  218,  878,  222, 1178,
+       480, 1102,   54, 1340,  151, 1615,    8,   15,  106, 1607,
+       225,  854,   87,  490,   44, 1351,    5, 1281,    3, 1470,
+        11, 1215,  377,   10,  441,  599,  152, 1642,  127, 1334,
+       702,  841,  594,  827,  123,  916,  146, 1118,  117, 1363,
+       254,  812,  249, 1096, 1630,  945,  437,  745, 1600,  718,
+      1593,  704,  152, 1005,  383, 1064, 1493,  975,  236,  676,
+       761,  579, 1017,  557, 1241,  628, 1195,  614, 1506,  464,
+      1576,  535, 1432,  513, 1159,  423, 1026,  276, 1460,  291,
+      1453,  392, 1263,  201, 1442,   85, 1412,   70, 1430,  100,
+      1632,  129, 1410,    1, 1386,   25, 1373,   35,  656,   55,
+      1188,   45, 1308,  160,  687,  227,  355,  175, 1201,  328,
+      1030,  367, 1483,  414, 1479, 1166, 1418,  783,  994,  937,
+      1083,  959, 1463,  967
+    };
+  return asso_values[bits_of(code, 2)+66] + asso_values[bits_of(code, 1)+4] + asso_values[bits_of(code, 0)];
+}
+
+static const CodePointList3 *
+onigenc_unicode_CaseUnfold_11_lookup(const OnigCodePoint code)
+{
+  enum
+    {
+      MIN_CODE_VALUE = 0x61,
+      MAX_CODE_VALUE = 0x1e943,
+      TOTAL_KEYWORDS = 1353,
+      MIN_WORD_LENGTH = 3,
+      MAX_WORD_LENGTH = 3,
+      MIN_HASH_VALUE = 3,
+      MAX_HASH_VALUE = 2509
+    };
+
+  static const short wordlist[] =
+    {
+      -1, -1, -1,
+      /*0x13e1*/ 589,
+      /*0x0461*/ 340,
+      /*0x04e1*/ 400,
+      /*0x0061*/ 0,
+      -1,
+      /*0x104e1*/ 1176,
+      /*0x1e61*/ 661,
+      /*0x1ee1*/ 720,
+      /*0x0161*/ 102,
+      /*0x2ce1*/ 952,
+      -1,
+      /*0x049b*/ 365,
+      -1, -1,
+      /*0x24e1*/ 840,
+      /*0x1e1b*/ 626,
+      /*0x048b*/ 357,
+      /*0x011b*/ 69,
+      /*0x2c9b*/ 917,
+      /*0x03e1*/ 280,
+      /*0x1e0b*/ 618,
+      /*0x1e8b*/ 682,
+      /*0x010b*/ 61,
+      /*0x2c8b*/ 909,
+      /*0x13e3*/ 591,
+      /*0x0463*/ 341,
+      /*0x04e3*/ 401,
+      /*0x0063*/ 2,
+      -1,
+      /*0x104e3*/ 1178,
+      /*0x1e63*/ 662,
+      /*0x1ee3*/ 721,
+      /*0x0163*/ 103,
+      /*0x2ce3*/ 953,
+      /*0x13e5*/ 593,
+      /*0x0465*/ 342,
+      /*0x04e5*/ 402,
+      /*0x0065*/ 4,
+      /*0x24e3*/ 842,
+      /*0x104e5*/ 1180,
+      /*0x1e65*/ 663,
+      /*0x1ee5*/ 722,
+      /*0x0165*/ 104,
+      /*0x03e3*/ 281,
+      /*0x13e9*/ 597,
+      /*0x0469*/ 344,
+      /*0x04e9*/ 404,
+      /*0x0069*/ 1352,
+      /*0x24e5*/ 844,
+      /*0x104e9*/ 1184,
+      /*0x1e69*/ 665,
+      /*0x1ee9*/ 724,
+      /*0x0169*/ 106,
+      /*0x03e5*/ 282,
+      /*0x13e7*/ 595,
+      /*0x0467*/ 343,
+      /*0x04e7*/ 403,
+      /*0x0067*/ 6,
+      /*0x24e9*/ 848,
+      /*0x104e7*/ 1182,
+      /*0x1e67*/ 664,
+      /*0x1ee7*/ 723,
+      /*0x0167*/ 105,
+      /*0x03e9*/ 284,
+      -1, -1, -1, -1,
+      /*0x24e7*/ 846,
+      /*0x13db*/ 583,
+      /*0x045b*/ 335,
+      /*0x04db*/ 397,
+      -1,
+      /*0x03e7*/ 283,
+      /*0x104db*/ 1170,
+      /*0x1e5b*/ 658,
+      /*0x1edb*/ 717,
+      /*0x015b*/ 99,
+      /*0x2cdb*/ 949,
+      -1, -1, -1, -1,
+      /*0x24db*/ 834,
+      /*0x13d9*/ 581,
+      /*0x0459*/ 333,
+      /*0x04d9*/ 396,
+      /*0xa761*/ 1064,
+      /*0x03db*/ 277,
+      /*0x104d9*/ 1168,
+      /*0x1e59*/ 657,
+      /*0x1ed9*/ 716,
+      /*0x0159*/ 98,
+      /*0x2cd9*/ 948,
+      -1, -1, -1, -1,
+      /*0x24d9*/ 832,
+      /*0x13dd*/ 585,
+      /*0x045d*/ 337,
+      /*0x04dd*/ 398,
+      -1,
+      /*0x03d9*/ 276,
+      /*0x104dd*/ 1172,
+      /*0x1e5d*/ 659,
+      /*0x1edd*/ 718,
+      /*0x015d*/ 100,
+      /*0x2cdd*/ 950,
+      -1, -1,
+      /*0xa763*/ 1065,
+      -1,
+      /*0x24dd*/ 836,
+      /*0x10ce1*/ 1236,
+      -1,
+      /*0x13aa*/ 534,
+      -1,
+      /*0x03dd*/ 278,
+      /*0x10e1*/ 495,
+      /*0x1042a*/ 1129,
+      /*0xa765*/ 1066,
+      /*0x13a6*/ 530,
+      -1, -1, -1,
+      /*0x13a0*/ 524,
+      -1,
+      /*0x13df*/ 587,
+      /*0x045f*/ 339,
+      /*0x04df*/ 399,
+      /*0xa769*/ 1068,
+      -1,
+      /*0x104df*/ 1174,
+      /*0x1e5f*/ 660,
+      /*0x1edf*/ 719,
+      /*0x015f*/ 101,
+      /*0x2cdf*/ 951,
+      /*0x10ce3*/ 1238,
+      -1, -1,
+      /*0xa767*/ 1067,
+      /*0x24df*/ 838,
+      /*0x10e3*/ 497,
+      -1,
+      /*0x13a8*/ 532,
+      -1,
+      /*0x03df*/ 279,
+      /*0x10ce5*/ 1240,
+      /*0x10428*/ 1127,
+      -1,
+      /*0x13b8*/ 548,
+      /*0x0438*/ 300,
+      /*0x10e5*/ 499,
+      -1,
+      /*0x10438*/ 1143,
+      /*0xa75b*/ 1061,
+      -1,
+      /*0x10ce9*/ 1244,
+      /*0x13eb*/ 599,
+      /*0x046b*/ 345,
+      /*0x04eb*/ 405,
+      /*0x006b*/ 9,
+      /*0x10e9*/ 503,
+      /*0x104eb*/ 1186,
+      /*0x1e6b*/ 666,
+      /*0x1eeb*/ 725,
+      /*0x016b*/ 107,
+      /*0x10ce7*/ 1242,
+      -1,
+      /*0x03b8*/ 253,
+      /*0xa759*/ 1060,
+      -1,
+      /*0x10e7*/ 501,
+      /*0x13ef*/ 603,
+      /*0x046f*/ 347,
+      /*0x04ef*/ 407,
+      /*0x006f*/ 13,
+      /*0x03eb*/ 285,
+      /*0x104ef*/ 1190,
+      /*0x1e6f*/ 668,
+      /*0x1eef*/ 727,
+      /*0x016f*/ 109,
+      /*0x10cdb*/ 1230,
+      -1, -1,
+      /*0xa75d*/ 1062,
+      -1,
+      /*0x10db*/ 489,
+      -1, -1, -1, -1,
+      /*0x03ef*/ 287,
+      -1, -1,
+      /*0x0261*/ 210,
+      -1,
+      /*0x10cd9*/ 1228,
+      -1,
+      /*0x13d7*/ 579,
+      /*0x0457*/ 331,
+      /*0x04d7*/ 395,
+      /*0x10d9*/ 487,
+      -1,
+      /*0x021b*/ 178,
+      /*0x1e57*/ 656,
+      /*0x1ed7*/ 715,
+      /*0x0157*/ 97,
+      /*0x2cd7*/ 947,
+      /*0x020b*/ 170,
+      -1, -1,
+      /*0x10cdd*/ 1232,
+      /*0x24d7*/ 830,
+      /*0xa75f*/ 1063,
+      -1,
+      /*0x1f61*/ 777,
+      /*0x10dd*/ 491,
+      /*0x03d7*/ 275,
+      /*0x0263*/ 211,
+      /*0x1f14*/ 748,
+      -1, -1,
+      /*0x1d8e*/ 612,
+      /*0xa661*/ 1013,
+      /*0x13ed*/ 601,
+      /*0x046d*/ 346,
+      /*0x04ed*/ 406,
+      /*0x006d*/ 11,
+      /*0x0265*/ 212,
+      /*0x104ed*/ 1188,
+      /*0x1e6d*/ 667,
+      /*0x1eed*/ 726,
+      /*0x016d*/ 108,
+      /*0x13be*/ 554,
+      /*0x043e*/ 306,
+      -1, -1,
+      /*0x1043e*/ 1149,
+      /*0x0269*/ 215,
+      /*0x1f63*/ 779,
+      /*0x10cdf*/ 1234,
+      /*0x013e*/ 85,
+      -1,
+      /*0x03ed*/ 286,
+      /*0xa76b*/ 1069,
+      /*0x10df*/ 493,
+      /*0x13ae*/ 538,
+      /*0xa663*/ 1014,
+      -1,
+      /*0x1f65*/ 781,
+      /*0x1042e*/ 1133,
+      /*0x13ac*/ 536,
+      /*0x03be*/ 259,
+      -1, -1,
+      /*0x1042c*/ 1131,
+      -1,
+      /*0xa665*/ 1015,
+      /*0x1f12*/ 746,
+      /*0xa76f*/ 1071,
+      -1, -1, -1,
+      /*0x025b*/ 207,
+      -1,
+      /*0x03ae*/ 244,
+      -1,
+      /*0xa669*/ 1017,
+      /*0x1f06*/ 742,
+      /*0x1f67*/ 783,
+      /*0x03ac*/ 242,
+      /*0x10ceb*/ 1246,
+      -1,
+      /*0x13d1*/ 573,
+      /*0x0451*/ 325,
+      /*0x04d1*/ 392,
+      /*0x10eb*/ 505,
+      /*0xa667*/ 1016,
+      /*0x0259*/ 206,
+      /*0x1e51*/ 653,
+      /*0x1ed1*/ 712,
+      /*0x0151*/ 94,
+      /*0x2cd1*/ 944,
+      -1, -1,
+      /*0xa757*/ 1059,
+      /*0x10cef*/ 1250,
+      /*0x24d1*/ 824,
+      /*0x13d3*/ 575,
+      /*0x0453*/ 327,
+      /*0x04d3*/ 393,
+      /*0x10ef*/ 509,
+      /*0xa65b*/ 1010,
+      -1,
+      /*0x1e53*/ 654,
+      /*0x1ed3*/ 713,
+      /*0x0153*/ 95,
+      /*0x2cd3*/ 945,
+      -1,
+      /*0xab53*/ 1100,
+      /*0x0561*/ 440,
+      /*0x1f10*/ 744,
+      /*0x24d3*/ 826,
+      -1, -1,
+      /*0x01e1*/ 151,
+      -1,
+      /*0xa659*/ 1009,
+      -1,
+      /*0x051b*/ 429,
+      -1,
+      /*0xa76d*/ 1070,
+      /*0x10cd7*/ 1226,
+      -1,
+      /*0x050b*/ 421,
+      -1, -1,
+      /*0x10d7*/ 485,
+      -1, -1, -1, -1,
+      /*0xa65d*/ 1011,
+      -1,
+      /*0x0563*/ 442,
+      /*0x13f1*/ 605,
+      /*0x0471*/ 348,
+      /*0x04f1*/ 408,
+      /*0x0071*/ 15,
+      /*0x01e3*/ 152,
+      /*0x104f1*/ 1192,
+      /*0x1e71*/ 669,
+      /*0x1ef1*/ 728,
+      /*0x0171*/ 110,
+      /*0x0565*/ 444,
+      -1, -1,
+      /*0x1f26*/ 756,
+      /*0x10ced*/ 1248,
+      /*0x01e5*/ 153,
+      -1,
+      /*0x1f20*/ 750,
+      -1,
+      /*0x10ed*/ 507,
+      /*0x0569*/ 448,
+      -1, -1,
+      /*0x118db*/ 1281,
+      /*0x0192*/ 122,
+      /*0x01e9*/ 155,
+      -1,
+      /*0xa65f*/ 1012,
+      /*0x13ee*/ 602,
+      /*0x026b*/ 217,
+      /*0x0567*/ 446,
+      /*0x006e*/ 12,
+      -1,
+      /*0x104ee*/ 1189,
+      -1,
+      /*0x01e7*/ 154,
+      /*0xa751*/ 1056,
+      /*0x2cee*/ 955,
+      /*0x118d9*/ 1279,
+      -1,
+      /*0x13f3*/ 607,
+      /*0x0473*/ 349,
+      /*0x04f3*/ 409,
+      /*0x0073*/ 17,
+      /*0x026f*/ 219,
+      /*0x104f3*/ 1194,
+      /*0x1e73*/ 670,
+      /*0x1ef3*/ 729,
+      /*0x0173*/ 111,
+      /*0x2cf3*/ 956,
+      /*0x2c61*/ 896,
+      /*0xa753*/ 1057,
+      -1,
+      /*0x118dd*/ 1283,
+      -1, -1,
+      /*0x13ba*/ 550,
+      /*0x043a*/ 302,
+      /*0xa66b*/ 1018,
+      /*0x03f3*/ 289,
+      /*0x1043a*/ 1145,
+      -1, -1,
+      /*0x10cd1*/ 1220,
+      /*0x013a*/ 83,
+      /*0x13d5*/ 577,
+      /*0x0455*/ 329,
+      /*0x04d5*/ 394,
+      /*0x10d1*/ 479,
+      -1,
+      /*0x0257*/ 205,
+      /*0x1e55*/ 655,
+      /*0x1ed5*/ 714,
+      /*0x0155*/ 96,
+      /*0x2cd5*/ 946,
+      /*0x03ba*/ 255,
+      -1,
+      /*0x0586*/ 477,
+      /*0x10cd3*/ 1222,
+      /*0x24d5*/ 828,
+      /*0x01dd*/ 149,
+      -1,
+      /*0x118df*/ 1285,
+      /*0x10d3*/ 481,
+      /*0x2c65*/ 897,
+      -1,
+      /*0x018c*/ 121,
+      /*0x13f5*/ 609,
+      /*0x0475*/ 350,
+      /*0x04f5*/ 410,
+      /*0x0075*/ 19,
+      /*0x1f57*/ 775,
+      /*0x104f5*/ 1196,
+      /*0x1e75*/ 671,
+      /*0x1ef5*/ 730,
+      /*0x0175*/ 112,
+      /*0x13cf*/ 571,
+      /*0x044f*/ 323,
+      /*0x04cf*/ 391,
+      /*0xa657*/ 1008,
+      /*0x1044f*/ 1166,
+      /*0x1e92a*/ 1326,
+      /*0x1e4f*/ 652,
+      /*0x1ecf*/ 711,
+      /*0x014f*/ 93,
+      /*0x2ccf*/ 943,
+      -1,
+      /*0x1e926*/ 1322,
+      /*0x1f00*/ 736,
+      /*0x01df*/ 150,
+      /*0x13b2*/ 542,
+      /*0x0432*/ 294,
+      /*0x1f02*/ 738,
+      -1,
+      /*0x10432*/ 1137,
+      /*0x10cf1*/ 1252,
+      /*0x2d16*/ 979,
+      -1,
+      /*0x2d14*/ 977,
+      /*0x2c5b*/ 892,
+      /*0x10f1*/ 511,
+      /*0x2d0a*/ 967,
+      -1,
+      /*0x2d1b*/ 984,
+      /*0x2d18*/ 981,
+      /*0xa66d*/ 1019,
+      /*0x01a8*/ 130,
+      -1,
+      /*0x2d0b*/ 968,
+      /*0x03b2*/ 247,
+      /*0x1e928*/ 1324,
+      /*0x0188*/ 120,
+      /*0x019e*/ 126,
+      -1,
+      /*0x2c59*/ 890,
+      /*0x056b*/ 450,
+      /*0x1e938*/ 1340,
+      /*0x13c9*/ 565,
+      /*0x0449*/ 317,
+      -1,
+      /*0x01eb*/ 156,
+      /*0x10449*/ 1160,
+      /*0x10cee*/ 1249,
+      /*0x1e49*/ 649,
+      /*0x1ec9*/ 708,
+      /*0x0251*/ 200,
+      /*0x2cc9*/ 940,
+      /*0x10ee*/ 508,
+      -1,
+      /*0x2c5d*/ 894,
+      /*0x056f*/ 454,
+      -1,
+      /*0xa755*/ 1058,
+      -1,
+      /*0x118d7*/ 1277,
+      /*0x01ef*/ 158,
+      /*0x03c9*/ 269,
+      /*0x2d12*/ 975,
+      -1,
+      /*0x10f3*/ 513,
+      /*0x0253*/ 202,
+      -1, -1, -1, -1,
+      /*0x0491*/ 360,
+      /*0x1f51*/ 772,
+      /*0x2d06*/ 963,
+      /*0xa794*/ 1082,
+      /*0x1e11*/ 621,
+      /*0x1e91*/ 685,
+      /*0x0111*/ 64,
+      /*0x2c91*/ 912,
+      /*0xa79b*/ 1085,
+      /*0xa651*/ 1005,
+      -1, -1, -1, -1,
+      /*0x10cd5*/ 1224,
+      -1,
+      /*0x1f53*/ 773,
+      -1,
+      /*0xa74f*/ 1055,
+      /*0x10d5*/ 483,
+      -1,
+      /*0x13cd*/ 569,
+      /*0x044d*/ 321,
+      -1,
+      /*0xa653*/ 1006,
+      /*0x1044d*/ 1164,
+      -1,
+      /*0x1e4d*/ 651,
+      /*0x1ecd*/ 710,
+      /*0x014d*/ 92,
+      /*0x2ccd*/ 942,
+      -1,
+      /*0x0271*/ 220,
+      /*0x0180*/ 117,
+      -1,
+      /*0x2d10*/ 973,
+      /*0x2c38*/ 857,
+      /*0x056d*/ 452,
+      -1, -1,
+      /*0x03cd*/ 273,
+      /*0x10f5*/ 515,
+      /*0x01ed*/ 157,
+      /*0x13cb*/ 567,
+      /*0x044b*/ 319,
+      /*0x10ccf*/ 1218,
+      -1,
+      /*0x1044b*/ 1162,
+      -1,
+      /*0x1e4b*/ 650,
+      /*0x1ecb*/ 709,
+      /*0x014b*/ 91,
+      /*0x2ccb*/ 941,
+      /*0x1f71*/ 785,
+      /*0x2d0c*/ 969,
+      /*0x1e93e*/ 1346,
+      -1, -1, -1,
+      /*0xa749*/ 1052,
+      -1, -1,
+      /*0x03cb*/ 271,
+      -1,
+      /*0x118d1*/ 1271,
+      /*0x13c3*/ 559,
+      /*0x0443*/ 311,
+      -1,
+      /*0x1e92e*/ 1330,
+      /*0x10443*/ 1154,
+      -1,
+      /*0x1e43*/ 646,
+      /*0x1ec3*/ 705,
+      /*0x1e92c*/ 1328,
+      /*0x2cc3*/ 937,
+      /*0x2d20*/ 989,
+      /*0x0580*/ 471,
+      -1, -1,
+      /*0x118d3*/ 1273,
+      /*0x0582*/ 473,
+      -1, -1, -1,
+      /*0x03c3*/ 263,
+      /*0x2c57*/ 888,
+      /*0x10cc9*/ 1212,
+      /*0x13c1*/ 557,
+      /*0x0441*/ 309,
+      -1,
+      /*0x00e1*/ 26,
+      /*0x10441*/ 1152,
+      /*0x1f73*/ 787,
+      /*0x1e41*/ 645,
+      /*0x1ec1*/ 704,
+      -1,
+      /*0x2cc1*/ 936,
+      -1, -1,
+      /*0x2d08*/ 965,
+      /*0x2d1e*/ 987,
+      -1,
+      /*0x13a4*/ 528,
+      -1,
+      /*0xa78c*/ 1079,
+      -1,
+      /*0x03c1*/ 262,
+      -1,
+      /*0xa74d*/ 1054,
+      /*0x049d*/ 366,
+      -1, -1, -1,
+      /*0x1e1d*/ 627,
+      /*0x00e3*/ 28,
+      /*0x011d*/ 70,
+      /*0x2c9d*/ 918,
+      /*0x1f55*/ 774,
+      /*0x0275*/ 222,
+      -1,
+      /*0x2c3e*/ 863,
+      -1,
+      /*0x13c7*/ 563,
+      /*0x0447*/ 315,
+      /*0x00e5*/ 30,
+      /*0xa655*/ 1007,
+      /*0x10447*/ 1158,
+      /*0x024f*/ 198,
+      /*0x1e47*/ 648,
+      /*0x1ec7*/ 707,
+      /*0xa74b*/ 1053,
+      /*0x2cc7*/ 939,
+      /*0x0371*/ 236,
+      -1,
+      /*0x00e9*/ 34,
+      /*0x10ccd*/ 1216,
+      /*0x13c5*/ 561,
+      /*0x0445*/ 313,
+      /*0x0571*/ 456,
+      /*0x1f75*/ 789,
+      /*0x10445*/ 1156,
+      /*0x03c7*/ 267,
+      /*0x1e45*/ 647,
+      /*0x1ec5*/ 706,
+      /*0x00e7*/ 32,
+      /*0x2cc5*/ 938,
+      -1, -1, -1, -1, -1, -1,
+      /*0xa743*/ 1049,
+      -1, -1,
+      /*0x03c5*/ 265,
+      /*0xa64f*/ 1004,
+      /*0x10ccb*/ 1214,
+      -1, -1,
+      /*0x2c51*/ 882,
+      -1,
+      /*0x1f32*/ 760,
+      -1,
+      /*0x13e6*/ 594,
+      /*0x056e*/ 453,
+      /*0x2d00*/ 957,
+      /*0x0066*/ 5,
+      /*0x0249*/ 195,
+      /*0x104e6*/ 1181,
+      /*0x2d02*/ 959,
+      /*0x0373*/ 237,
+      -1,
+      /*0x2d0e*/ 971,
+      /*0xa741*/ 1048,
+      /*0x2c53*/ 884,
+      -1,
+      /*0x0573*/ 458,
+      /*0x24e6*/ 845,
+      /*0x10cc3*/ 1206,
+      /*0x118d5*/ 1275,
+      -1,
+      /*0x01f3*/ 159,
+      -1,
+      /*0x13bf*/ 555,
+      /*0x043f*/ 307,
+      /*0x04bf*/ 383,
+      -1,
+      /*0x1043f*/ 1150,
+      /*0x028a*/ 230,
+      /*0x1e3f*/ 644,
+      /*0x1ebf*/ 703,
+      /*0x019a*/ 125,
+      /*0x2cbf*/ 935,
+      /*0x0211*/ 173,
+      /*0x13ec*/ 600,
+      /*0x028b*/ 231,
+      /*0xa649*/ 1001,
+      /*0x006c*/ 10,
+      -1,
+      /*0x104ec*/ 1187,
+      /*0x10cc1*/ 1204,
+      /*0x1e93a*/ 1342,
+      /*0x03bf*/ 260,
+      /*0x2cec*/ 954,
+      /*0x1f04*/ 740,
+      -1, -1, -1,
+      /*0xa747*/ 1051,
+      /*0x13a2*/ 526,
+      /*0x118cf*/ 1269,
+      /*0x13b7*/ 547,
+      /*0x0437*/ 299,
+      /*0x04b7*/ 379,
+      /*0x1f11*/ 745,
+      /*0x10437*/ 1142,
+      /*0x024d*/ 197,
+      /*0x1e37*/ 640,
+      /*0x1eb7*/ 699,
+      /*0x0137*/ 82,
+      /*0x2cb7*/ 931,
+      -1,
+      /*0xa745*/ 1050,
+      /*0x0575*/ 460,
+      /*0x0292*/ 233,
+      /*0x13b5*/ 545,
+      /*0x0435*/ 297,
+      /*0x04b5*/ 378,
+      /*0x01f5*/ 160,
+      /*0x10435*/ 1140,
+      /*0x03b7*/ 252,
+      /*0x1e35*/ 639,
+      /*0x1eb5*/ 698,
+      /*0x0135*/ 81,
+      /*0x2cb5*/ 930,
+      /*0x10cc7*/ 1210,
+      -1, -1,
+      /*0x024b*/ 196,
+      -1,
+      /*0x16e61*/ 1287,
+      -1, -1, -1,
+      /*0x03b5*/ 250,
+      /*0xa64d*/ 1003,
+      -1, -1,
+      /*0x00eb*/ 36,
+      /*0x10cc5*/ 1208,
+      /*0x2c73*/ 902,
+      /*0x118c9*/ 1263,
+      /*0x13b3*/ 543,
+      /*0x0433*/ 295,
+      /*0x04b3*/ 377,
+      /*0x1e932*/ 1334,
+      /*0x10433*/ 1138,
+      -1,
+      /*0x1e33*/ 638,
+      /*0x1eb3*/ 697,
+      /*0x0133*/ 80,
+      /*0x2cb3*/ 929,
+      -1,
+      /*0x00ef*/ 40,
+      /*0x16e63*/ 1289,
+      -1,
+      /*0x2c3a*/ 859,
+      /*0xa64b*/ 1002,
+      /*0x13c0*/ 556,
+      /*0x0440*/ 308,
+      /*0xa73f*/ 1047,
+      /*0x03b3*/ 248,
+      /*0x10440*/ 1151,
+      -1,
+      /*0x16e65*/ 1291,
+      /*0x2c55*/ 886,
+      /*0x0140*/ 86,
+      /*0x10ce6*/ 1241,
+      /*0x01c9*/ 139,
+      -1, -1,
+      /*0x1f43*/ 769,
+      /*0x10e6*/ 500,
+      -1,
+      /*0x16e69*/ 1295,
+      -1,
+      /*0x028c*/ 232,
+      /*0x03c0*/ 261,
+      -1,
+      /*0xa643*/ 998,
+      -1,
+      /*0x0479*/ 352,
+      /*0x04f9*/ 412,
+      /*0x0079*/ 23,
+      /*0x16e67*/ 1293,
+      /*0x104f9*/ 1200,
+      /*0x1e79*/ 673,
+      /*0x1ef9*/ 732,
+      /*0xa737*/ 1043,
+      /*0x0511*/ 424,
+      /*0x118cd*/ 1267,
+      /*0x1d79*/ 610,
+      /*0x021d*/ 179,
+      /*0x1f41*/ 767,
+      -1, -1,
+      /*0x2c4f*/ 880,
+      -1,
+      /*0x10cec*/ 1247,
+      -1, -1,
+      /*0xa641*/ 997,
+      /*0xa735*/ 1042,
+      /*0x10ec*/ 506,
+      /*0x2171*/ 807,
+      /*0x00ed*/ 38,
+      -1,
+      /*0x0247*/ 194,
+      /*0x1f24*/ 754,
+      /*0x13ad*/ 537,
+      /*0x2c32*/ 851,
+      /*0x04ad*/ 374,
+      /*0x118cb*/ 1265,
+      /*0x1042d*/ 1132,
+      /*0x2d1a*/ 983,
+      /*0x1e2d*/ 635,
+      /*0x1ead*/ 694,
+      /*0x012d*/ 78,
+      /*0x2cad*/ 926,
+      -1, -1,
+      /*0x0288*/ 228,
+      /*0x029e*/ 235,
+      -1,
+      /*0x13a5*/ 529,
+      -1,
+      /*0x04a5*/ 370,
+      /*0x0584*/ 475,
+      /*0x03ad*/ 243,
+      /*0xa733*/ 1041,
+      /*0x1e25*/ 631,
+      /*0x1ea5*/ 690,
+      /*0x0125*/ 74,
+      /*0x2ca5*/ 922,
+      /*0x118c3*/ 1257,
+      -1,
+      /*0xa647*/ 1000,
+      /*0x2c49*/ 874,
+      /*0x13a3*/ 527,
+      -1,
+      /*0x04a3*/ 369,
+      -1,
+      /*0x1f45*/ 771,
+      /*0x2173*/ 809,
+      /*0x1e23*/ 630,
+      /*0x1ea3*/ 689,
+      /*0x0123*/ 73,
+      /*0x2ca3*/ 921,
+      /*0xff59*/ 1125,
+      /*0x0266*/ 213,
+      /*0xa645*/ 999,
+      -1, -1,
+      /*0x048f*/ 359,
+      -1, -1,
+      /*0x118c1*/ 1255,
+      /*0x1e0f*/ 620,
+      /*0x1e8f*/ 684,
+      /*0x010f*/ 63,
+      /*0x2c8f*/ 911,
+      /*0xa69b*/ 1033,
+      -1, -1, -1,
+      /*0x1e943*/ 1351,
+      /*0xa68b*/ 1025,
+      -1, -1,
+      /*0x023f*/ 191,
+      /*0x1f66*/ 782,
+      -1,
+      /*0x10cc0*/ 1203,
+      -1, -1,
+      /*0x1fe1*/ 803,
+      -1,
+      /*0x0481*/ 356,
+      /*0x2d1c*/ 985,
+      -1,
+      /*0x026c*/ 218,
+      /*0x1e01*/ 613,
+      /*0x1e81*/ 677,
+      /*0x0101*/ 56,
+      /*0x2c81*/ 904,
+      -1,
+      /*0x2c4d*/ 878,
+      /*0x1e941*/ 1349,
+      /*0x0280*/ 224,
+      /*0x16e6b*/ 1297,
+      /*0x2175*/ 811,
+      /*0x118c7*/ 1261,
+      /*0x0282*/ 225,
+      -1, -1, -1,
+      /*0xa72d*/ 1039,
+      -1,
+      /*0x051d*/ 430,
+      /*0x10f9*/ 519,
+      -1, -1,
+      /*0x1e924*/ 1320,
+      -1,
+      /*0x16e6f*/ 1301,
+      /*0x118c5*/ 1259,
+      /*0x00f1*/ 42,
+      -1,
+      /*0x2c4b*/ 876,
+      /*0x1fe5*/ 804,
+      -1,
+      /*0xa725*/ 1035,
+      -1,
+      /*0x13a7*/ 531,
+      -1,
+      /*0x04a7*/ 371,
+      /*0x1f22*/ 752,
+      /*0x2d04*/ 961,
+      /*0x1f37*/ 765,
+      /*0x1e27*/ 632,
+      /*0x1ea7*/ 691,
+      /*0x0127*/ 75,
+      /*0x2ca7*/ 923,
+      -1, -1,
+      /*0xa723*/ 1034,
+      -1,
+      /*0x2d11*/ 974,
+      -1, -1,
+      /*0x2c43*/ 868,
+      -1,
+      /*0x1f35*/ 763,
+      /*0x00ee*/ 39,
+      -1,
+      /*0x047b*/ 353,
+      /*0x04fb*/ 413,
+      -1,
+      /*0x0233*/ 189,
+      /*0x104fb*/ 1202,
+      /*0x1e7b*/ 674,
+      /*0x1efb*/ 733,
+      /*0x13b1*/ 541,
+      /*0x0431*/ 293,
+      /*0x04b1*/ 376,
+      /*0x00f3*/ 44,
+      /*0x10431*/ 1136,
+      -1,
+      /*0x1e31*/ 637,
+      /*0x1eb1*/ 696,
+      -1,
+      /*0x2cb1*/ 928,
+      /*0x2c41*/ 866,
+      /*0x03fb*/ 291,
+      /*0x0240*/ 192,
+      /*0x0566*/ 445,
+      /*0x16e6d*/ 1299,
+      /*0x047d*/ 354,
+      /*0x04fd*/ 414,
+      /*0x1f33*/ 761,
+      -1,
+      /*0x03b1*/ 246,
+      /*0x1e7d*/ 675,
+      /*0x1efd*/ 734,
+      /*0xff57*/ 1123,
+      /*0x047f*/ 355,
+      /*0x04ff*/ 415,
+      /*0x1d7d*/ 611,
+      -1, -1,
+      /*0x1e7f*/ 676,
+      /*0x1eff*/ 735,
+      /*0x13bd*/ 553,
+      /*0x043d*/ 305,
+      /*0x04bd*/ 382,
+      /*0x1f40*/ 766,
+      /*0x1043d*/ 1148,
+      /*0xa791*/ 1080,
+      /*0x1e3d*/ 643,
+      /*0x1ebd*/ 702,
+      /*0x01bf*/ 137,
+      /*0x2cbd*/ 934,
+      -1, -1,
+      /*0x1e93f*/ 1347,
+      -1,
+      /*0x056c*/ 451,
+      /*0x2c47*/ 872,
+      -1, -1, -1,
+      /*0x03bd*/ 258,
+      /*0x00f5*/ 46,
+      -1,
+      /*0x007a*/ 24,
+      -1,
+      /*0x104fa*/ 1201,
+      /*0x1f79*/ 793,
+      -1,
+      /*0x017a*/ 114,
+      /*0xa727*/ 1036,
+      /*0x2c45*/ 870,
+      /*0x13b9*/ 549,
+      /*0x0439*/ 301,
+      /*0x04b9*/ 380,
+      /*0x022d*/ 186,
+      /*0x10439*/ 1144,
+      -1,
+      /*0x1e39*/ 641,
+      /*0x1eb9*/ 700,
+      /*0x1e922*/ 1318,
+      /*0x2cb9*/ 932,
+      /*0x1e937*/ 1339,
+      -1,
+      /*0x13c2*/ 558,
+      /*0x0442*/ 310,
+      /*0x04c2*/ 384,
+      -1,
+      /*0x10442*/ 1153,
+      -1,
+      /*0x0225*/ 182,
+      /*0x03b9*/ 254,
+      /*0x0142*/ 87,
+      /*0x13d0*/ 572,
+      /*0x0450*/ 324,
+      -1,
+      /*0x1e935*/ 1337,
+      /*0x13f2*/ 606,
+      -1,
+      /*0x2c66*/ 898,
+      /*0x0072*/ 16,
+      /*0x2d24*/ 993,
+      /*0x104f2*/ 1193,
+      -1,
+      /*0x0223*/ 181,
+      -1,
+      /*0x2d1d*/ 986,
+      /*0x24d0*/ 823,
+      /*0x118c0*/ 1254,
+      /*0xff51*/ 1117,
+      -1,
+      /*0x1f25*/ 755,
+      -1, -1,
+      /*0xa7c3*/ 1099,
+      -1,
+      /*0x03f2*/ 288,
+      /*0x020f*/ 172,
+      -1,
+      /*0x2c3f*/ 864,
+      -1,
+      /*0xa77f*/ 1074,
+      -1,
+      /*0x1e933*/ 1335,
+      /*0xff53*/ 1119,
+      /*0x1f23*/ 753,
+      -1,
+      /*0x16e71*/ 1303,
+      -1,
+      /*0xa73d*/ 1046,
+      /*0x2c6c*/ 901,
+      /*0x13bb*/ 551,
+      /*0x043b*/ 303,
+      /*0x04bb*/ 381,
+      -1,
+      /*0x1043b*/ 1146,
+      -1,
+      /*0x1e3b*/ 642,
+      /*0x1ebb*/ 701,
+      /*0x1e940*/ 1348,
+      /*0x2cbb*/ 933,
+      /*0x0201*/ 165,
+      -1, -1, -1,
+      /*0x10fd*/ 521,
+      -1,
+      /*0x2c37*/ 856,
+      /*0xa77a*/ 1072,
+      -1,
+      /*0x03bb*/ 256,
+      -1,
+      /*0x0579*/ 464,
+      /*0x10ff*/ 523,
+      /*0x16e6e*/ 1300,
+      -1,
+      /*0xa79d*/ 1086,
+      /*0x01f9*/ 161,
+      /*0x017c*/ 115,
+      /*0xa739*/ 1044,
+      -1,
+      /*0x2c35*/ 854,
+      /*0x1f01*/ 737,
+      /*0x13af*/ 539,
+      -1,
+      /*0x04af*/ 375,
+      /*0x16e73*/ 1305,
+      /*0x1042f*/ 1134,
+      -1,
+      /*0x1e2f*/ 636,
+      /*0x1eaf*/ 695,
+      /*0x012f*/ 79,
+      /*0x2caf*/ 927,
+      -1, -1,
+      /*0x1e05*/ 615,
+      /*0x1e85*/ 679,
+      /*0x0105*/ 58,
+      /*0x2c85*/ 906,
+      /*0x0227*/ 183,
+      /*0x10fa*/ 520,
+      /*0x052d*/ 438,
+      /*0x03af*/ 245,
+      -1, -1,
+      /*0x13a9*/ 533,
+      /*0x01ad*/ 131,
+      /*0x04a9*/ 372,
+      /*0x2c33*/ 852,
+      /*0x10429*/ 1128,
+      /*0x1e92d*/ 1329,
+      /*0x1e29*/ 633,
+      /*0x1ea9*/ 692,
+      /*0x0129*/ 76,
+      /*0x2ca9*/ 924,
+      -1,
+      /*0x0525*/ 434,
+      -1,
+      /*0x10cc2*/ 1205,
+      -1,
+      /*0x1f27*/ 757,
+      /*0x01a5*/ 129,
+      -1, -1,
+      /*0x2c40*/ 865,
+      /*0x1e925*/ 1321,
+      -1,
+      /*0x10cd0*/ 1219,
+      /*0x0231*/ 188,
+      /*0x2d22*/ 991,
+      /*0x0523*/ 433,
+      /*0x10cf2*/ 1253,
+      /*0x10d0*/ 478,
+      /*0x16e75*/ 1307,
+      -1,
+      /*0x01a3*/ 128,
+      /*0x10f2*/ 512,
+      -1,
+      /*0xa73b*/ 1045,
+      /*0x1e923*/ 1319,
+      /*0x1fd1*/ 801,
+      /*0x1f7b*/ 795,
+      /*0x027d*/ 223,
+      /*0x050f*/ 423,
+      -1,
+      /*0xff55*/ 1121,
+      /*0x13ce*/ 570,
+      /*0x044e*/ 322,
+      /*0x04ce*/ 390,
+      /*0x1f31*/ 759,
+      /*0x1044e*/ 1165,
+      -1, -1,
+      /*0xa7bf*/ 1098,
+      /*0x0477*/ 351,
+      /*0x04f7*/ 411,
+      /*0x0077*/ 21,
+      /*0xa77c*/ 1073,
+      /*0x104f7*/ 1198,
+      /*0x1e77*/ 672,
+      /*0x1ef7*/ 731,
+      /*0x0177*/ 113,
+      -1,
+      /*0x1f7d*/ 797,
+      -1,
+      /*0x03ce*/ 274,
+      -1,
+      /*0x0501*/ 416,
+      -1, -1,
+      /*0xa72f*/ 1040,
+      /*0x1e03*/ 614,
+      /*0x1e83*/ 678,
+      /*0x0103*/ 57,
+      /*0x2c83*/ 905,
+      /*0x13e8*/ 596,
+      /*0xff4f*/ 1115,
+      -1,
+      /*0x0068*/ 7,
+      -1,
+      /*0x104e8*/ 1183,
+      /*0xa7b7*/ 1094,
+      /*0x13c6*/ 562,
+      /*0x0446*/ 314,
+      /*0x04c6*/ 386,
+      -1,
+      /*0x10446*/ 1157,
+      -1,
+      /*0x13f0*/ 604,
+      /*0x24e8*/ 847,
+      /*0x0146*/ 89,
+      /*0x0070*/ 14,
+      /*0xa729*/ 1037,
+      /*0x104f0*/ 1191,
+      -1,
+      /*0xa7b5*/ 1093,
+      -1, -1,
+      /*0x1f7a*/ 794,
+      -1,
+      /*0x0242*/ 193,
+      /*0x03c6*/ 266,
+      -1, -1,
+      /*0x0499*/ 364,
+      /*0x0527*/ 435,
+      -1, -1,
+      /*0x1e19*/ 625,
+      /*0x0250*/ 199,
+      /*0x0119*/ 68,
+      /*0x2c99*/ 916,
+      -1,
+      /*0x0272*/ 221,
+      /*0x1e927*/ 1323,
+      /*0x0581*/ 472,
+      -1,
+      /*0xff49*/ 1109,
+      -1, -1,
+      /*0x037b*/ 239,
+      /*0x1f42*/ 768,
+      -1, -1,
+      /*0x00e6*/ 31,
+      -1,
+      /*0x057b*/ 466,
+      -1,
+      /*0x13c4*/ 560,
+      /*0x0444*/ 312,
+      /*0x04c4*/ 385,
+      /*0x01fb*/ 162,
+      /*0x10444*/ 1155,
+      -1,
+      /*0x1f72*/ 786,
+      -1,
+      /*0x0144*/ 88,
+      -1, -1,
+      /*0x2d2d*/ 996,
+      -1, -1,
+      /*0x037d*/ 241,
+      /*0x1e931*/ 1333,
+      -1, -1, -1,
+      /*0x03c4*/ 264,
+      /*0x057d*/ 468,
+      /*0x2179*/ 815,
+      /*0x13d6*/ 578,
+      /*0x0456*/ 330,
+      -1,
+      /*0x01fd*/ 163,
+      /*0x2d25*/ 994,
+      /*0x00ec*/ 37,
+      /*0x057f*/ 470,
+      -1, -1,
+      /*0x029d*/ 234,
+      /*0x10cce*/ 1217,
+      /*0x01ff*/ 164,
+      -1, -1,
+      /*0x24d6*/ 829,
+      -1,
+      /*0xff4d*/ 1113,
+      -1,
+      /*0x2d23*/ 992,
+      /*0x01bd*/ 136,
+      /*0x0495*/ 362,
+      -1,
+      /*0x10f7*/ 517,
+      /*0x1e93d*/ 1345,
+      /*0x1e15*/ 623,
+      /*0x1e95*/ 687,
+      /*0x0115*/ 66,
+      /*0x2c95*/ 914,
+      -1,
+      /*0x022f*/ 187,
+      -1,
+      /*0x2d0f*/ 972,
+      -1,
+      /*0x057a*/ 465,
+      /*0x118c2*/ 1256,
+      /*0x0205*/ 167,
+      -1,
+      /*0x1f7c*/ 796,
+      /*0xff4b*/ 1111,
+      /*0x10ce8*/ 1243,
+      -1, -1, -1,
+      /*0x118d0*/ 1270,
+      /*0x10e8*/ 502,
+      /*0x13ea*/ 598,
+      /*0x10cc6*/ 1209,
+      -1,
+      /*0x006a*/ 8,
+      /*0x01b9*/ 135,
+      /*0x104ea*/ 1185,
+      /*0x0229*/ 184,
+      /*0x10cf0*/ 1251,
+      /*0x1e939*/ 1341,
+      /*0xa7a5*/ 1090,
+      /*0x2d01*/ 958,
+      /*0x1f05*/ 741,
+      /*0x10f0*/ 510,
+      /*0x2c31*/ 850,
+      -1,
+      /*0xff43*/ 1103,
+      -1, -1, -1, -1,
+      /*0x1e942*/ 1350,
+      -1, -1,
+      /*0xa7a3*/ 1089,
+      /*0x0572*/ 457,
+      /*0x01d0*/ 142,
+      /*0x13a1*/ 525,
+      -1,
+      /*0x04a1*/ 368,
+      -1, -1, -1,
+      /*0x1e21*/ 629,
+      /*0x1ea1*/ 688,
+      /*0x0121*/ 72,
+      /*0x2ca1*/ 920,
+      /*0xa691*/ 1028,
+      /*0xff41*/ 1101,
+      /*0x1e07*/ 616,
+      /*0x1e87*/ 680,
+      /*0x0107*/ 59,
+      /*0x2c87*/ 907,
+      -1,
+      /*0x2c3d*/ 862,
+      -1,
+      /*0x0493*/ 361,
+      -1,
+      /*0x10cc4*/ 1207,
+      /*0x2d27*/ 995,
+      /*0x1e13*/ 622,
+      /*0x1e93*/ 686,
+      /*0x0113*/ 65,
+      /*0x2c93*/ 913,
+      -1, -1,
+      /*0x13ab*/ 535,
+      /*0x00f9*/ 49,
+      /*0x04ab*/ 373,
+      -1,
+      /*0x1042b*/ 1130,
+      /*0xa781*/ 1075,
+      /*0x1e2b*/ 634,
+      /*0x1eab*/ 693,
+      /*0x012b*/ 77,
+      /*0x2cab*/ 925,
+      /*0x13e4*/ 592,
+      /*0x0203*/ 166,
+      /*0x1e93b*/ 1343,
+      /*0x0064*/ 3,
+      /*0x10cd6*/ 1225,
+      /*0x104e4*/ 1179,
+      /*0x037c*/ 240,
+      /*0xff47*/ 1107,
+      /*0x2c39*/ 858,
+      /*0x10d6*/ 484,
+      /*0x1f77*/ 791,
+      /*0x0268*/ 214,
+      /*0x057c*/ 467,
+      /*0x13e2*/ 590,
+      /*0x24e4*/ 843,
+      /*0x16e66*/ 1292,
+      /*0x0062*/ 1,
+      -1,
+      /*0x104e2*/ 1177,
+      -1,
+      /*0x2c42*/ 867,
+      /*0xff45*/ 1105,
+      /*0x1f03*/ 739,
+      -1, -1,
+      /*0x052f*/ 439,
+      -1,
+      /*0x24e2*/ 841,
+      -1,
+      /*0x2c50*/ 881,
+      -1,
+      /*0x0505*/ 418,
+      -1,
+      /*0xa7a7*/ 1091,
+      /*0x1e92f*/ 1331,
+      -1,
+      /*0x0185*/ 119,
+      /*0x13e0*/ 588,
+      /*0x0219*/ 177,
+      /*0x13da*/ 582,
+      /*0x045a*/ 334,
+      -1,
+      /*0x104e0*/ 1175,
+      /*0x217b*/ 817,
+      /*0x104da*/ 1169,
+      /*0x1f70*/ 784,
+      /*0x16e6c*/ 1298,
+      /*0x0529*/ 436,
+      /*0x0078*/ 22,
+      /*0x10cea*/ 1245,
+      /*0x104f8*/ 1199,
+      /*0x24e0*/ 839,
+      -1,
+      /*0x24da*/ 833,
+      /*0x10ea*/ 504,
+      -1,
+      /*0x1e929*/ 1325,
+      /*0x13dc*/ 584,
+      /*0x045c*/ 336,
+      /*0x13cc*/ 568,
+      /*0x044c*/ 320,
+      /*0x04cc*/ 389,
+      /*0x104dc*/ 1171,
+      /*0x1044c*/ 1163,
+      /*0x03f8*/ 290,
+      /*0x217d*/ 819,
+      /*0x118ce*/ 1268,
+      /*0x2c3b*/ 860,
+      -1,
+      /*0x13d8*/ 580,
+      /*0x0458*/ 332,
+      /*0x24dc*/ 835,
+      -1,
+      /*0x217f*/ 821,
+      /*0x104d8*/ 1167,
+      -1, -1,
+      /*0xa72b*/ 1038,
+      /*0x03cc*/ 272,
+      /*0x0585*/ 476,
+      /*0x13d4*/ 576,
+      /*0x0454*/ 328,
+      -1,
+      /*0x24d8*/ 831,
+      -1,
+      /*0x1f44*/ 770,
+      /*0x0256*/ 204,
+      /*0x13d2*/ 574,
+      /*0x0452*/ 326,
+      /*0x0377*/ 238,
+      -1, -1,
+      /*0xa7bd*/ 1097,
+      /*0x01ce*/ 141,
+      /*0x24d4*/ 827,
+      /*0x0577*/ 462,
+      -1, -1,
+      /*0x017e*/ 116,
+      /*0x0497*/ 363,
+      /*0x217a*/ 816,
+      /*0x24d2*/ 825,
+      /*0x118c6*/ 1260,
+      /*0x1e17*/ 624,
+      /*0x0215*/ 175,
+      /*0x0117*/ 67,
+      /*0x2c97*/ 915,
+      /*0x0503*/ 417,
+      -1,
+      /*0x0076*/ 20,
+      /*0x13f4*/ 608,
+      /*0x104f6*/ 1197,
+      /*0x0183*/ 118,
+      /*0x0074*/ 18,
+      /*0x10ce4*/ 1239,
+      /*0x104f4*/ 1195,
+      -1,
+      /*0x0568*/ 447,
+      -1,
+      /*0x10e4*/ 498,
+      /*0x13bc*/ 552,
+      /*0x043c*/ 304,
+      /*0xa7b9*/ 1095,
+      -1,
+      /*0x1043c*/ 1147,
+      /*0x1f15*/ 749,
+      -1,
+      /*0x10ce2*/ 1237,
+      /*0x013c*/ 84,
+      /*0x01c6*/ 138,
+      /*0x0570*/ 455,
+      /*0x026a*/ 216,
+      /*0x10e2*/ 496,
+      /*0x13c8*/ 564,
+      /*0x0448*/ 316,
+      /*0x04c8*/ 387,
+      /*0x2172*/ 808,
+      /*0x10448*/ 1159,
+      -1,
+      /*0x03bc*/ 257,
+      -1,
+      /*0x0148*/ 90,
+      /*0x16e79*/ 1311,
+      -1,
+      /*0x0519*/ 428,
+      /*0x00fb*/ 51,
+      -1, -1,
+      /*0x118c4*/ 1258,
+      /*0x0199*/ 124,
+      -1,
+      /*0x10ce0*/ 1235,
+      /*0x03c8*/ 268,
+      /*0x10cda*/ 1229,
+      -1,
+      /*0x0583*/ 474,
+      /*0x10e0*/ 494,
+      -1,
+      /*0x10da*/ 488,
+      -1, -1, -1,
+      /*0x2c4e*/ 879,
+      /*0x0207*/ 168,
+      /*0x10f8*/ 518,
+      -1, -1,
+      /*0x00fd*/ 53,
+      -1,
+      /*0x2d05*/ 962,
+      /*0x118d6*/ 1276,
+      /*0x10cdc*/ 1231,
+      -1,
+      /*0x10ccc*/ 1215,
+      /*0x0213*/ 174,
+      /*0x00ff*/ 55,
+      /*0x10dc*/ 490,
+      -1,
+      /*0x1f21*/ 751,
+      -1, -1,
+      /*0xa7bb*/ 1096,
+      -1,
+      /*0x10cd8*/ 1227,
+      /*0x1f07*/ 743,
+      -1,
+      /*0x022b*/ 185,
+      -1,
+      /*0x10d8*/ 486,
+      /*0x217c*/ 818,
+      -1,
+      /*0x2c68*/ 899,
+      -1, -1,
+      /*0x10cd4*/ 1223,
+      /*0x1f13*/ 747,
+      -1,
+      /*0x01d6*/ 145,
+      /*0x2c46*/ 871,
+      /*0x10d4*/ 482,
+      -1,
+      /*0x10cd2*/ 1221,
+      /*0x00fa*/ 50,
+      /*0x13ca*/ 566,
+      /*0x044a*/ 318,
+      /*0x04ca*/ 388,
+      /*0x10d2*/ 480,
+      /*0x1044a*/ 1161,
+      /*0x2184*/ 822,
+      /*0x10fe*/ 522,
+      /*0x0515*/ 426,
+      -1, -1, -1, -1,
+      /*0x0195*/ 123,
+      -1,
+      /*0x1f64*/ 780,
+      -1,
+      /*0xa785*/ 1077,
+      /*0x13b6*/ 546,
+      /*0x0436*/ 298,
+      /*0x03ca*/ 270,
+      -1,
+      /*0x10436*/ 1141,
+      /*0x10f6*/ 516,
+      -1,
+      /*0x13b4*/ 544,
+      /*0x0434*/ 296,
+      /*0x10f4*/ 514,
+      /*0x1f62*/ 778,
+      /*0x10434*/ 1139,
+      -1,
+      /*0x0260*/ 209,
+      -1,
+      /*0xa7a9*/ 1092,
+      /*0x048d*/ 358,
+      /*0x056a*/ 449,
+      /*0x00f2*/ 43,
+      /*0x03b6*/ 251,
+      /*0x1e0d*/ 619,
+      /*0x1e8d*/ 683,
+      /*0x010d*/ 62,
+      /*0x2c8d*/ 910,
+      /*0x2c44*/ 869,
+      /*0x2d03*/ 960,
+      /*0x03b4*/ 249,
+      /*0x10cc8*/ 1211,
+      /*0x1e09*/ 617,
+      /*0x1e89*/ 681,
+      /*0x0109*/ 60,
+      /*0x2c89*/ 908,
+      -1,
+      /*0x025c*/ 208,
+      /*0x1f60*/ 776,
+      -1, -1,
+      /*0x13b0*/ 540,
+      /*0x0430*/ 292,
+      /*0x13de*/ 586,
+      /*0x045e*/ 338,
+      /*0x10430*/ 1135,
+      /*0x1f78*/ 792,
+      /*0x0521*/ 432,
+      /*0x104de*/ 1173,
+      /*0x214e*/ 805,
+      /*0x2c56*/ 887,
+      -1,
+      /*0x01a1*/ 127,
+      /*0x0507*/ 419,
+      -1,
+      /*0x049f*/ 367,
+      /*0x2177*/ 813,
+      /*0x24de*/ 837,
+      -1,
+      /*0x1e1f*/ 628,
+      /*0x0254*/ 203,
+      /*0x011f*/ 71,
+      /*0x2c9f*/ 919,
+      -1,
+      /*0x0513*/ 425,
+      -1,
+      /*0x2d19*/ 982,
+      /*0x0252*/ 201,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x00fc*/ 52,
+      /*0x052b*/ 437,
+      /*0x0217*/ 176,
+      -1,
+      /*0xa783*/ 1076,
+      /*0x16e7b*/ 1313,
+      -1, -1, -1, -1,
+      /*0x1e92b*/ 1327,
+      /*0x0564*/ 443,
+      -1, -1, -1, -1,
+      /*0x2170*/ 806,
+      -1, -1, -1,
+      /*0x2c6a*/ 900,
+      -1, -1, -1,
+      /*0x0562*/ 441,
+      /*0x023c*/ 190,
+      /*0x10cca*/ 1213,
+      /*0x16e7d*/ 1315,
+      /*0x118da*/ 1280,
+      -1, -1, -1,
+      /*0x1f76*/ 790,
+      -1, -1,
+      /*0x16e7f*/ 1317,
+      /*0x1f74*/ 788,
+      -1, -1, -1, -1,
+      /*0xa799*/ 1084,
+      -1, -1,
+      /*0xa68f*/ 1027,
+      -1,
+      /*0x118dc*/ 1282,
+      -1,
+      /*0x118cc*/ 1266,
+      -1, -1, -1, -1, -1, -1,
+      /*0x01da*/ 147,
+      /*0x0578*/ 463,
+      /*0x2d15*/ 978,
+      /*0x118d8*/ 1278,
+      -1, -1, -1,
+      /*0x16e7a*/ 1312,
+      -1, -1, -1, -1, -1,
+      /*0xa681*/ 1020,
+      /*0x118d4*/ 1274,
+      -1, -1, -1,
+      /*0x01dc*/ 148,
+      -1,
+      /*0x01cc*/ 140,
+      /*0x118d2*/ 1272,
+      -1, -1, -1, -1, -1,
+      /*0x10cde*/ 1233,
+      -1, -1,
+      /*0x01d8*/ 146,
+      -1,
+      /*0x10de*/ 492,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x01d4*/ 144,
+      -1,
+      /*0x16e72*/ 1304,
+      -1, -1,
+      /*0x057e*/ 469,
+      -1,
+      /*0x01d2*/ 143,
+      -1,
+      /*0x00e8*/ 33,
+      -1, -1,
+      /*0x0517*/ 427,
+      -1,
+      /*0x2d21*/ 990,
+      -1, -1, -1, -1, -1,
+      /*0x2d07*/ 964,
+      /*0x0576*/ 461,
+      /*0x00f0*/ 41,
+      /*0xff42*/ 1102,
+      -1,
+      /*0x0574*/ 459,
+      /*0x118c8*/ 1262,
+      -1,
+      /*0x2c5a*/ 891,
+      -1, -1,
+      /*0x2d13*/ 976,
+      /*0xff50*/ 1116,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0x020d*/ 171,
+      /*0x1e93c*/ 1344,
+      -1,
+      /*0x2c5c*/ 893,
+      -1,
+      /*0x2c4c*/ 877,
+      -1,
+      /*0x1f36*/ 764,
+      /*0x0209*/ 169,
+      -1, -1, -1,
+      /*0x16e7c*/ 1314,
+      -1,
+      /*0x1f34*/ 762,
+      /*0x2c58*/ 889,
+      -1, -1, -1,
+      /*0x1fb1*/ 799,
+      -1,
+      /*0xa7a1*/ 1088,
+      -1, -1, -1, -1,
+      /*0x2c54*/ 885,
+      /*0xa787*/ 1078,
+      -1, -1, -1, -1, -1,
+      /*0x2c52*/ 883,
+      -1,
+      /*0x021f*/ 180,
+      -1, -1,
+      /*0xa793*/ 1081,
+      -1, -1, -1, -1, -1,
+      /*0x1f30*/ 758,
+      -1, -1, -1,
+      /*0x0283*/ 226,
+      -1, -1, -1,
+      /*0x2c76*/ 903,
+      /*0x118ca*/ 1264,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      /*0x2c3c*/ 861,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      /*0x2c48*/ 873,
+      -1, -1, -1, -1, -1, -1,
+      /*0x00ea*/ 35,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x2178*/ 814,
+      /*0x16e77*/ 1309,
+      -1,
+      /*0x01b6*/ 134,
+      -1, -1,
+      /*0x1fd0*/ 800,
+      /*0x1e936*/ 1338,
+      -1, -1,
+      /*0x01b4*/ 133,
+      -1,
+      /*0x050d*/ 422,
+      /*0x2d17*/ 980,
+      /*0x1e934*/ 1336,
+      /*0x118de*/ 1284,
+      -1, -1, -1, -1,
+      /*0x0509*/ 420,
+      -1, -1,
+      /*0x16e68*/ 1294,
+      -1, -1, -1, -1,
+      /*0xff4e*/ 1114,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x16e70*/ 1302,
+      -1, -1, -1,
+      /*0x01b0*/ 132,
+      -1, -1, -1,
+      /*0x1e930*/ 1332,
+      /*0x217e*/ 820,
+      -1,
+      /*0x051f*/ 431,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x2c4a*/ 875,
+      -1,
+      /*0x00e4*/ 29,
+      -1,
+      /*0xa685*/ 1022,
+      -1,
+      /*0x2176*/ 812,
+      -1,
+      /*0xa797*/ 1083,
+      /*0xff46*/ 1106,
+      /*0x2174*/ 810,
+      -1, -1, -1, -1,
+      /*0x00e2*/ 27,
+      -1,
+      /*0x2c36*/ 855,
+      -1, -1, -1, -1, -1, -1,
+      /*0x2c34*/ 853,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x00e0*/ 25,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x00f8*/ 48,
+      -1, -1, -1, -1, -1, -1,
+      /*0x2c30*/ 849,
+      /*0xff44*/ 1104,
+      /*0x2c5e*/ 895,
+      -1, -1, -1, -1,
+      /*0x0287*/ 227,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0xff56*/ 1122,
+      -1, -1,
+      /*0xa683*/ 1021,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x16e6a*/ 1296,
+      -1, -1, -1,
+      /*0x00fe*/ 54,
+      -1, -1,
+      /*0x2d0d*/ 970,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x2d09*/ 966,
+      -1, -1, -1, -1,
+      /*0x00f6*/ 47,
+      -1, -1, -1,
+      /*0x00f4*/ 45,
+      -1, -1, -1, -1,
+      /*0xa699*/ 1032,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      /*0x2d1f*/ 988,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0x16e64*/ 1290,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      /*0x16e62*/ 1288,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0xa79f*/ 1087,
+      -1, -1,
+      /*0xa695*/ 1030,
+      -1, -1, -1, -1, -1, -1,
+      /*0x16e60*/ 1286,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x16e78*/ 1310,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0xff5a*/ 1126,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0xa687*/ 1023,
+      /*0x16e7e*/ 1316,
+      -1, -1,
+      /*0xff4c*/ 1112,
+      -1, -1, -1, -1, -1, -1,
+      /*0xa693*/ 1029,
+      -1, -1,
+      /*0xff58*/ 1124,
+      -1, -1,
+      /*0x16e76*/ 1308,
+      -1, -1, -1,
+      /*0x16e74*/ 1306,
+      -1, -1, -1,
+      /*0xff54*/ 1120,
+      -1, -1, -1, -1, -1, -1,
+      /*0xff52*/ 1118,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0xff48*/ 1108,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x1fe0*/ 802,
+      /*0x0289*/ 229,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1,
+      /*0xa697*/ 1031,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1,
+      /*0xff4a*/ 1110,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0xa68d*/ 1026,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0xa689*/ 1024,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x1fb0*/ 798
+    };
+
+  if (code <= MAX_CODE_VALUE && code >= MIN_CODE_VALUE)
+    {
+      register unsigned int key = onigenc_unicode_CaseUnfold_11_hash(code);
+
+      if (key <= MAX_HASH_VALUE)
+        {
+          register short s = wordlist[key];
+
+          if (s >= 0 && code1_equal(code, CaseUnfold_11_Table[s].from))
+            return &CaseUnfold_11_Table[s].to;
+        }
+    }
+  return 0;
+}
+
+static const CaseUnfold_12_Type CaseUnfold_12_Table[] = {
+#define CaseUnfold_12 (*(CaseUnfold_12_Type (*)[58])(CaseUnfold_12_Table+0))
+  {{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}, {2, {0x00df, 0x1e9e}}},
+  {{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, {0x1f80, 0x1f88}}},
+  {{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}}},
+#define CaseUnfold_12_Locale (*(CaseUnfold_12_Type (*)[1])(CaseUnfold_12_Table+58))
+  {{0x0069, 0x0307}, {1, {0x0130}}},
+};
+
+/* ANSI-C code produced by gperf version 3.1 */
+/* Command-line: gperf -7 -k1,2,3,4,5,6 -F,-1 -c -j1 -i1 -t -T -E -C -H onigenc_unicode_CaseUnfold_12_hash -N onigenc_unicode_CaseUnfold_12_lookup -n  */
+
+/* maximum key range = 71, duplicates = 0 */
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+/*ARGSUSED*/
+static unsigned int
+onigenc_unicode_CaseUnfold_12_hash(const OnigCodePoint *codes)
+{
+  static const unsigned char asso_values[] =
+    {
+       3, 58, 54, 57, 56, 16,  8,  2, 43, 82,
+       3,  1, 23, 82, 82, 82, 82, 82, 82,  4,
+      82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+      82, 82, 52, 51, 50, 49, 48, 47, 46, 45,
+      82, 82, 82, 82, 43, 82, 42, 82, 82, 13,
+      82, 82, 82, 82, 82, 11, 82,  1, 82, 82,
+      14, 82,  1, 82, 82, 31,  3, 82, 82, 30,
+      82, 82, 82, 10, 82, 82, 82, 82, 37, 82,
+      82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+      82, 82, 82, 82, 82, 82, 37, 15, 36, 35,
+      34, 17,  1, 33, 12,  4, 23, 23, 26, 21,
+      13, 82, 27, 82, 82,  2,  5, 82, 11, 16,
+      82, 15, 82, 82, 23, 82,  8, 82
+    };
+  return asso_values[bits_at(codes, 5)] + asso_values[bits_at(codes, 4)] + asso_values[bits_at(codes, 3)] + asso_values[bits_at(codes, 2)] + asso_values[bits_at(codes, 1)] + asso_values[bits_at(codes, 0)];
+}
+
+static const CodePointList2 *
+onigenc_unicode_CaseUnfold_12_lookup(const OnigCodePoint *codes)
+{
+  enum
+    {
+      MIN_CODE_VALUE = 0x61,
+      MAX_CODE_VALUE = 0x1f7c,
+      TOTAL_KEYWORDS = 59,
+      MIN_WORD_LENGTH = 6,
+      MAX_WORD_LENGTH = 6,
+      MIN_HASH_VALUE = 11,
+      MAX_HASH_VALUE = 81
+    };
+
+  static const short wordlist[] =
+    {
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1,
+      /*0x1f66,0x03b9*/ 53,
+      /*0x1f07,0x03b9*/ 38,
+      /*0x1f00,0x03b9*/ 31,
+      /*0x0066,0x0066*/ 1,
+      /*0x1f74,0x03b9*/ 56,
+      /*0x0073,0x0073*/ 6,
+      /*0x0066,0x0069*/ 2,
+      /*0x1f06,0x03b9*/ 37,
+      /*0x0073,0x0074*/ 7,
+      /*0x03b9,0x0342*/ 18,
+      /*0x03c9,0x03b9*/ 23,
+      /*0x03b7,0x03b9*/ 17,
+      /*0x0069,0x0307*/ 58,
+      /*0x03b1,0x03b9*/ 15,
+      /*0x1f61,0x03b9*/ 48,
+      /*0x1f05,0x03b9*/ 36,
+      /*0x1f65,0x03b9*/ 52,
+      /*0x0574,0x0576*/ 29,
+      /*0x03c9,0x0342*/ 22,
+      /*0x03b7,0x0342*/ 16,
+      /*0x057e,0x0576*/ 30,
+      /*0x03b1,0x0342*/ 14,
+      /*0x1f7c,0x03b9*/ 57,
+      /*0x0574,0x0565*/ 26,
+      /*0x0079,0x030a*/ 10,
+      /*0x0077,0x030a*/ 9,
+      /*0x1f70,0x03b9*/ 55,
+      /*0x0574,0x056d*/ 28,
+      /*0x0066,0x006c*/ 3,
+      /*0x0574,0x056b*/ 27,
+      /*0x0061,0x02be*/ 0,
+      /*0x0068,0x0331*/ 4,
+      /*0x1f67,0x03b9*/ 54,
+      /*0x1f64,0x03b9*/ 51,
+      /*0x1f63,0x03b9*/ 50,
+      /*0x1f62,0x03b9*/ 49,
+      /*0x1f60,0x03b9*/ 47,
+      /*0x03ce,0x03b9*/ 24,
+      /*0x03c5,0x0342*/ 21,
+      /*0x03c5,0x0313*/ 20,
+      /*0x03c1,0x0313*/ 19,
+      /*0x02bc,0x006e*/ 11,
+      /*0x03ae,0x03b9*/ 13,
+      /*0x03ac,0x03b9*/ 12,
+      /*0x1f27,0x03b9*/ 46,
+      /*0x1f26,0x03b9*/ 45,
+      /*0x1f25,0x03b9*/ 44,
+      /*0x1f24,0x03b9*/ 43,
+      /*0x1f23,0x03b9*/ 42,
+      /*0x1f22,0x03b9*/ 41,
+      /*0x1f21,0x03b9*/ 40,
+      /*0x1f20,0x03b9*/ 39,
+      /*0x006a,0x030c*/ 5,
+      /*0x1f02,0x03b9*/ 33,
+      /*0x0074,0x0308*/ 8,
+      /*0x1f04,0x03b9*/ 35,
+      /*0x1f03,0x03b9*/ 34,
+      /*0x1f01,0x03b9*/ 32,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      /*0x0565,0x0582*/ 25
+    };
+
+  if (codes[0] <= MAX_CODE_VALUE && codes[0] >= MIN_CODE_VALUE &&
+      codes[1] <= MAX_CODE_VALUE && codes[1] >= MIN_CODE_VALUE)
+    {
+      register unsigned int key = onigenc_unicode_CaseUnfold_12_hash(codes);
+
+      if (key <= MAX_HASH_VALUE)
+        {
+          register short s = wordlist[key];
+
+          if (s >= 0 && code2_equal(codes, CaseUnfold_12_Table[s].from))
+            return &CaseUnfold_12_Table[s].to;
+        }
+    }
+  return 0;
+}
+
+static const CaseUnfold_13_Type CaseUnfold_13_Table[] = {
+#define CaseUnfold_13 (*(CaseUnfold_13_Type (*)[14])(CaseUnfold_13_Table+0))
+  {{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}}},
+};
+
+/* ANSI-C code produced by gperf version 3.1 */
+/* Command-line: gperf -7 -k1,2,3,4,5,6,7,8,9 -F,-1 -c -j1 -i1 -t -T -E -C -H onigenc_unicode_CaseUnfold_13_hash -N onigenc_unicode_CaseUnfold_13_lookup -n  */
+
+/* maximum key range = 20, duplicates = 0 */
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+/*ARGSUSED*/
+static unsigned int
+onigenc_unicode_CaseUnfold_13_hash(const OnigCodePoint *codes)
+{
+  static const unsigned char asso_values[] =
+    {
+       7,  4, 47, 47, 47, 47,  1,  1,  2, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47,  1,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 11,
+      47, 47, 47, 47, 47, 10, 47,  2, 47, 47,
+      47, 47, 47, 47, 47, 47,  1, 47, 47,  1,
+      47, 47, 47,  9, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47,  1, 47, 47,  2, 47, 47,  1, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47
+    };
+  return asso_values[bits_at(codes, 8)] + asso_values[bits_at(codes, 7)] + asso_values[bits_at(codes, 6)] + asso_values[bits_at(codes, 5)] + asso_values[bits_at(codes, 4)] + asso_values[bits_at(codes, 3)] + asso_values[bits_at(codes, 2)] + asso_values[bits_at(codes, 1)] + asso_values[bits_at(codes, 0)];
+}
+
+static const CodePointList2 *
+onigenc_unicode_CaseUnfold_13_lookup(const OnigCodePoint *codes)
+{
+  enum
+    {
+      MIN_CODE_VALUE = 0x66,
+      MAX_CODE_VALUE = 0x3c9,
+      TOTAL_KEYWORDS = 14,
+      MIN_WORD_LENGTH = 9,
+      MAX_WORD_LENGTH = 9,
+      MIN_HASH_VALUE = 27,
+      MAX_HASH_VALUE = 46
+    };
+
+  static const short wordlist[] =
+    {
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0x03c5,0x0313,0x0342*/ 12,
+      /*0x03c5,0x0308,0x0342*/ 9,
+      /*0x03b9,0x0308,0x0342*/ 6,
+      /*0x03c5,0x0313,0x0301*/ 11,
+      /*0x03c5,0x0308,0x0301*/ 8,
+      /*0x03b9,0x0308,0x0301*/ 5,
+      /*0x03c5,0x0313,0x0300*/ 10,
+      /*0x03c5,0x0308,0x0300*/ 7,
+      /*0x03b9,0x0308,0x0300*/ 4,
+      /*0x03c9,0x0342,0x03b9*/ 13,
+      /*0x03b7,0x0342,0x03b9*/ 3,
+      /*0x03b1,0x0342,0x03b9*/ 2,
+      -1, -1, -1, -1, -1, -1,
+      /*0x0066,0x0066,0x006c*/ 1,
+      /*0x0066,0x0066,0x0069*/ 0
+    };
+
+  if (codes[0] <= MAX_CODE_VALUE && codes[0] >= MIN_CODE_VALUE &&
+      codes[1] <= MAX_CODE_VALUE && codes[1] >= MIN_CODE_VALUE &&
+      codes[2] <= MAX_CODE_VALUE && codes[2] >= MIN_CODE_VALUE)
+    {
+      register unsigned int key = onigenc_unicode_CaseUnfold_13_hash(codes);
+
+      if (key <= MAX_HASH_VALUE)
+        {
+          register short s = wordlist[key];
+
+          if (s >= 0 && code3_equal(codes, CaseUnfold_13_Table[s].from))
+            return &CaseUnfold_13_Table[s].to;
+        }
+    }
+  return 0;
+}
+
+static const OnigCodePoint CaseMappingSpecials[] = {
+    L(1)|0x039C,
+    L(2)|0x0053, 0x0073, L(2)|0x0053, 0x0053,
+    L(2)|0x02BC, 0x004E,
+    L(1)|0x0053,
+    L(1)|0x01C5,
+    L(2)|0x0064, 0x017D, L(1)|0x01C4,
+    L(1)|0x01C8,
+    L(2)|0x006C, 0x004A, L(1)|0x01C7,
+    L(1)|0x01CB,
+    L(2)|0x006E, 0x004A, L(1)|0x01CA,
+    L(2)|0x004A, 0x030C,
+    L(1)|0x01F2,
+    L(2)|0x0064, 0x005A, L(1)|0x01F1,
+    L(1)|0x0399,
+    L(3)|0x0399, 0x0308, 0x0301,
+    L(3)|0x03A5, 0x0308, 0x0301,
+    L(1)|0x03A3,
+    L(1)|0x0392,
+    L(1)|0x0398,
+    L(1)|0x03A6,
+    L(1)|0x03A0,
+    L(1)|0x039A,
+    L(1)|0x03A1,
+    L(1)|0x0395,
+    L(2)|0x0535, 0x0582, L(2)|0x0535, 0x0552,
+    L(1)|0x0412,
+    L(1)|0x0414,
+    L(1)|0x041E,
+    L(1)|0x0421,
+    L(1)|0x0422,
+    L(1)|0x0422,
+    L(1)|0x042A,
+    L(1)|0x0462,
+    L(1)|0xA64A,
+    L(2)|0x0048, 0x0331,
+    L(2)|0x0054, 0x0308,
+    L(2)|0x0057, 0x030A,
+    L(2)|0x0059, 0x030A,
+    L(2)|0x0041, 0x02BE,
+    L(1)|0x1E60,
+    L(1)|0x00DF,
+    L(2)|0x03A5, 0x0313,
+    L(3)|0x03A5, 0x0313, 0x0300,
+    L(3)|0x03A5, 0x0313, 0x0301,
+    L(3)|0x03A5, 0x0313, 0x0342,
+    L(1)|0x1F88, L(2)|0x1F08, 0x0399,
+    L(1)|0x1F89, L(2)|0x1F09, 0x0399,
+    L(1)|0x1F8A, L(2)|0x1F0A, 0x0399,
+    L(1)|0x1F8B, L(2)|0x1F0B, 0x0399,
+    L(1)|0x1F8C, L(2)|0x1F0C, 0x0399,
+    L(1)|0x1F8D, L(2)|0x1F0D, 0x0399,
+    L(1)|0x1F8E, L(2)|0x1F0E, 0x0399,
+    L(1)|0x1F8F, L(2)|0x1F0F, 0x0399,
+    L(2)|0x1F00, 0x0399, L(1)|0x1F80, L(2)|0x1F08, 0x0399,
+    L(2)|0x1F01, 0x0399, L(1)|0x1F81, L(2)|0x1F09, 0x0399,
+    L(2)|0x1F02, 0x0399, L(1)|0x1F82, L(2)|0x1F0A, 0x0399,
+    L(2)|0x1F03, 0x0399, L(1)|0x1F83, L(2)|0x1F0B, 0x0399,
+    L(2)|0x1F04, 0x0399, L(1)|0x1F84, L(2)|0x1F0C, 0x0399,
+    L(2)|0x1F05, 0x0399, L(1)|0x1F85, L(2)|0x1F0D, 0x0399,
+    L(2)|0x1F06, 0x0399, L(1)|0x1F86, L(2)|0x1F0E, 0x0399,
+    L(2)|0x1F07, 0x0399, L(1)|0x1F87, L(2)|0x1F0F, 0x0399,
+    L(1)|0x1F98, L(2)|0x1F28, 0x0399,
+    L(1)|0x1F99, L(2)|0x1F29, 0x0399,
+    L(1)|0x1F9A, L(2)|0x1F2A, 0x0399,
+    L(1)|0x1F9B, L(2)|0x1F2B, 0x0399,
+    L(1)|0x1F9C, L(2)|0x1F2C, 0x0399,
+    L(1)|0x1F9D, L(2)|0x1F2D, 0x0399,
+    L(1)|0x1F9E, L(2)|0x1F2E, 0x0399,
+    L(1)|0x1F9F, L(2)|0x1F2F, 0x0399,
+    L(2)|0x1F20, 0x0399, L(1)|0x1F90, L(2)|0x1F28, 0x0399,
+    L(2)|0x1F21, 0x0399, L(1)|0x1F91, L(2)|0x1F29, 0x0399,
+    L(2)|0x1F22, 0x0399, L(1)|0x1F92, L(2)|0x1F2A, 0x0399,
+    L(2)|0x1F23, 0x0399, L(1)|0x1F93, L(2)|0x1F2B, 0x0399,
+    L(2)|0x1F24, 0x0399, L(1)|0x1F94, L(2)|0x1F2C, 0x0399,
+    L(2)|0x1F25, 0x0399, L(1)|0x1F95, L(2)|0x1F2D, 0x0399,
+    L(2)|0x1F26, 0x0399, L(1)|0x1F96, L(2)|0x1F2E, 0x0399,
+    L(2)|0x1F27, 0x0399, L(1)|0x1F97, L(2)|0x1F2F, 0x0399,
+    L(1)|0x1FA8, L(2)|0x1F68, 0x0399,
+    L(1)|0x1FA9, L(2)|0x1F69, 0x0399,
+    L(1)|0x1FAA, L(2)|0x1F6A, 0x0399,
+    L(1)|0x1FAB, L(2)|0x1F6B, 0x0399,
+    L(1)|0x1FAC, L(2)|0x1F6C, 0x0399,
+    L(1)|0x1FAD, L(2)|0x1F6D, 0x0399,
+    L(1)|0x1FAE, L(2)|0x1F6E, 0x0399,
+    L(1)|0x1FAF, L(2)|0x1F6F, 0x0399,
+    L(2)|0x1F60, 0x0399, L(1)|0x1FA0, L(2)|0x1F68, 0x0399,
+    L(2)|0x1F61, 0x0399, L(1)|0x1FA1, L(2)|0x1F69, 0x0399,
+    L(2)|0x1F62, 0x0399, L(1)|0x1FA2, L(2)|0x1F6A, 0x0399,
+    L(2)|0x1F63, 0x0399, L(1)|0x1FA3, L(2)|0x1F6B, 0x0399,
+    L(2)|0x1F64, 0x0399, L(1)|0x1FA4, L(2)|0x1F6C, 0x0399,
+    L(2)|0x1F65, 0x0399, L(1)|0x1FA5, L(2)|0x1F6D, 0x0399,
+    L(2)|0x1F66, 0x0399, L(1)|0x1FA6, L(2)|0x1F6E, 0x0399,
+    L(2)|0x1F67, 0x0399, L(1)|0x1FA7, L(2)|0x1F6F, 0x0399,
+    L(2)|0x1FBA, 0x0345, L(2)|0x1FBA, 0x0399,
+    L(1)|0x1FBC, L(2)|0x0391, 0x0399,
+    L(2)|0x0386, 0x0345, L(2)|0x0386, 0x0399,
+    L(2)|0x0391, 0x0342,
+    L(3)|0x0391, 0x0342, 0x0345, L(3)|0x0391, 0x0342, 0x0399,
+    L(2)|0x03B1, 0x0399, L(1)|0x1FB3, L(2)|0x0391, 0x0399,
+    L(1)|0x0399,
+    L(2)|0x1FCA, 0x0345, L(2)|0x1FCA, 0x0399,
+    L(1)|0x1FCC, L(2)|0x0397, 0x0399,
+    L(2)|0x0389, 0x0345, L(2)|0x0389, 0x0399,
+    L(2)|0x0397, 0x0342,
+    L(3)|0x0397, 0x0342, 0x0345, L(3)|0x0397, 0x0342, 0x0399,
+    L(2)|0x03B7, 0x0399, L(1)|0x1FC3, L(2)|0x0397, 0x0399,
+    L(3)|0x0399, 0x0308, 0x0300,
+    L(3)|0x0399, 0x0308, 0x0301,
+    L(2)|0x0399, 0x0342,
+    L(3)|0x0399, 0x0308, 0x0342,
+    L(3)|0x03A5, 0x0308, 0x0300,
+    L(3)|0x03A5, 0x0308, 0x0301,
+    L(2)|0x03A1, 0x0313,
+    L(2)|0x03A5, 0x0342,
+    L(3)|0x03A5, 0x0308, 0x0342,
+    L(2)|0x1FFA, 0x0345, L(2)|0x1FFA, 0x0399,
+    L(1)|0x1FFC, L(2)|0x03A9, 0x0399,
+    L(2)|0x038F, 0x0345, L(2)|0x038F, 0x0399,
+    L(2)|0x03A9, 0x0342,
+    L(3)|0x03A9, 0x0342, 0x0345, L(3)|0x03A9, 0x0342, 0x0399,
+    L(2)|0x03C9, 0x0399, L(1)|0x1FF3, L(2)|0x03A9, 0x0399,
+    L(2)|0x0046, 0x0066, L(2)|0x0046, 0x0046,
+    L(2)|0x0046, 0x0069, L(2)|0x0046, 0x0049,
+    L(2)|0x0046, 0x006C, L(2)|0x0046, 0x004C,
+    L(3)|0x0046, 0x0066, 0x0069, L(3)|0x0046, 0x0046, 0x0049,
+    L(3)|0x0046, 0x0066, 0x006C, L(3)|0x0046, 0x0046, 0x004C,
+    L(2)|0x0053, 0x0074, L(2)|0x0053, 0x0054,
+    L(2)|0x0053, 0x0074, L(2)|0x0053, 0x0054,
+    L(2)|0x0544, 0x0576, L(2)|0x0544, 0x0546,
+    L(2)|0x0544, 0x0565, L(2)|0x0544, 0x0535,
+    L(2)|0x0544, 0x056B, L(2)|0x0544, 0x053B,
+    L(2)|0x054E, 0x0576, L(2)|0x054E, 0x0546,
+    L(2)|0x0544, 0x056D, L(2)|0x0544, 0x053D,
+};
diff --git a/enc/unicode/12.1.0/name2ctype.h b/enc/unicode/12.1.0/name2ctype.h
new file mode 100644
index 0000000000..b2270d5cac
--- /dev/null
+++ b/enc/unicode/12.1.0/name2ctype.h
@@ -0,0 +1,41810 @@
+/* ANSI-C code produced by gperf version 3.1 */
+/* Command-line: gperf -7 -c -j1 -i1 -t -C -P -T -H uniname2ctype_hash -Q uniname2ctype_pool -N uniname2ctype_p  */
+#ifndef USE_UNICODE_PROPERTIES
+/* Computed positions: -k'1,3' */
+#else /* USE_UNICODE_PROPERTIES */
+/* Computed positions: -k'1-3,5-6,12,16,$' */
+#endif /* USE_UNICODE_PROPERTIES */
+
+#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-gperf@gnu.org>."
+#endif
+
+
+
+/* 'NEWLINE': [[:NEWLINE:]] */
+static const OnigCodePoint CR_NEWLINE[] = {
+	1,
+	0x000a, 0x000a,
+}; /* CR_NEWLINE */
+
+/* 'Alpha': [[:Alpha:]] */
+static const OnigCodePoint CR_Alpha[] = {
+	679,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0345, 0x0345,
+	0x0370, 0x0374,
+	0x0376, 0x0377,
+	0x037a, 0x037d,
+	0x037f, 0x037f,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x048a, 0x052f,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0560, 0x0588,
+	0x05b0, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05ef, 0x05f2,
+	0x0610, 0x061a,
+	0x0620, 0x0657,
+	0x0659, 0x065f,
+	0x066e, 0x06d3,
+	0x06d5, 0x06dc,
+	0x06e1, 0x06e8,
+	0x06ed, 0x06ef,
+	0x06fa, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x073f,
+	0x074d, 0x07b1,
+	0x07ca, 0x07ea,
+	0x07f4, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x0817,
+	0x081a, 0x082c,
+	0x0840, 0x0858,
+	0x0860, 0x086a,
+	0x08a0, 0x08b4,
+	0x08b6, 0x08bd,
+	0x08d4, 0x08df,
+	0x08e3, 0x08e9,
+	0x08f0, 0x093b,
+	0x093d, 0x094c,
+	0x094e, 0x0950,
+	0x0955, 0x0963,
+	0x0971, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bd, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cc,
+	0x09ce, 0x09ce,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09f0, 0x09f1,
+	0x09fc, 0x09fc,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4c,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a70, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abd, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acc,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae3,
+	0x0af9, 0x0afc,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3d, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4c,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	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, 0x0bcc,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0c00, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4c,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c5a,
+	0x0c60, 0x0c63,
+	0x0c80, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbd, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccc,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0cf1, 0x0cf2,
+	0x0d00, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4c,
+	0x0d4e, 0x0d4e,
+	0x0d54, 0x0d57,
+	0x0d5f, 0x0d63,
+	0x0d7a, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df3,
+	0x0e01, 0x0e3a,
+	0x0e40, 0x0e46,
+	0x0e4d, 0x0e4d,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e86, 0x0e8a,
+	0x0e8c, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0eb9,
+	0x0ebb, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ecd, 0x0ecd,
+	0x0edc, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f81,
+	0x0f88, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x1000, 0x1036,
+	0x1038, 0x1038,
+	0x103b, 0x103f,
+	0x1050, 0x108f,
+	0x109a, 0x109d,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 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, 0x13f5,
+	0x13f8, 0x13fd,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x16ee, 0x16f8,
+	0x1700, 0x170c,
+	0x170e, 0x1713,
+	0x1720, 0x1733,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17b3,
+	0x17b6, 0x17c8,
+	0x17d7, 0x17d7,
+	0x17dc, 0x17dc,
+	0x1820, 0x1878,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191e,
+	0x1920, 0x192b,
+	0x1930, 0x1938,
+	0x1950, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x1a00, 0x1a1b,
+	0x1a20, 0x1a5e,
+	0x1a61, 0x1a74,
+	0x1aa7, 0x1aa7,
+	0x1b00, 0x1b33,
+	0x1b35, 0x1b43,
+	0x1b45, 0x1b4b,
+	0x1b80, 0x1ba9,
+	0x1bac, 0x1baf,
+	0x1bba, 0x1be5,
+	0x1be7, 0x1bf1,
+	0x1c00, 0x1c36,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c7d,
+	0x1c80, 0x1c88,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cbf,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf3,
+	0x1cf5, 0x1cf6,
+	0x1cfa, 0x1cfa,
+	0x1d00, 0x1dbf,
+	0x1de7, 0x1df4,
+	0x1e00, 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, 0x209c,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2119, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x212d,
+	0x212f, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x24b6, 0x24e9,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cee,
+	0x2cf2, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2dff,
+	0x2e2f, 0x2e2f,
+	0x3005, 0x3007,
+	0x3021, 0x3029,
+	0x3031, 0x3035,
+	0x3038, 0x303c,
+	0x3041, 0x3096,
+	0x309d, 0x309f,
+	0x30a1, 0x30fa,
+	0x30fc, 0x30ff,
+	0x3105, 0x312f,
+	0x3131, 0x318e,
+	0x31a0, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fef,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa640, 0xa66e,
+	0xa674, 0xa67b,
+	0xa67f, 0xa6ef,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa7bf,
+	0xa7c2, 0xa7c6,
+	0xa7f7, 0xa805,
+	0xa807, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c3,
+	0xa8c5, 0xa8c5,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa8fd, 0xa8ff,
+	0xa90a, 0xa92a,
+	0xa930, 0xa952,
+	0xa960, 0xa97c,
+	0xa980, 0xa9b2,
+	0xa9b4, 0xa9bf,
+	0xa9cf, 0xa9cf,
+	0xa9e0, 0xa9ef,
+	0xa9fa, 0xa9fe,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaabe,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadd,
+	0xaae0, 0xaaef,
+	0xaaf2, 0xaaf5,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xab30, 0xab5a,
+	0xab5c, 0xab67,
+	0xab70, 0xabea,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa6d,
+	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,
+	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,
+	0x10140, 0x10174,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031f,
+	0x1032d, 0x1034a,
+	0x10350, 0x1037a,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x103d1, 0x103d5,
+	0x10400, 0x1049d,
+	0x104b0, 0x104d3,
+	0x104d8, 0x104fb,
+	0x10500, 0x10527,
+	0x10530, 0x10563,
+	0x10600, 0x10736,
+	0x10740, 0x10755,
+	0x10760, 0x10767,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10860, 0x10876,
+	0x10880, 0x1089e,
+	0x108e0, 0x108f2,
+	0x108f4, 0x108f5,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a35,
+	0x10a60, 0x10a7c,
+	0x10a80, 0x10a9c,
+	0x10ac0, 0x10ac7,
+	0x10ac9, 0x10ae4,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10b80, 0x10b91,
+	0x10c00, 0x10c48,
+	0x10c80, 0x10cb2,
+	0x10cc0, 0x10cf2,
+	0x10d00, 0x10d27,
+	0x10f00, 0x10f1c,
+	0x10f27, 0x10f27,
+	0x10f30, 0x10f45,
+	0x10fe0, 0x10ff6,
+	0x11000, 0x11045,
+	0x11082, 0x110b8,
+	0x110d0, 0x110e8,
+	0x11100, 0x11132,
+	0x11144, 0x11146,
+	0x11150, 0x11172,
+	0x11176, 0x11176,
+	0x11180, 0x111bf,
+	0x111c1, 0x111c4,
+	0x111da, 0x111da,
+	0x111dc, 0x111dc,
+	0x11200, 0x11211,
+	0x11213, 0x11234,
+	0x11237, 0x11237,
+	0x1123e, 0x1123e,
+	0x11280, 0x11286,
+	0x11288, 0x11288,
+	0x1128a, 0x1128d,
+	0x1128f, 0x1129d,
+	0x1129f, 0x112a8,
+	0x112b0, 0x112e8,
+	0x11300, 0x11303,
+	0x11305, 0x1130c,
+	0x1130f, 0x11310,
+	0x11313, 0x11328,
+	0x1132a, 0x11330,
+	0x11332, 0x11333,
+	0x11335, 0x11339,
+	0x1133d, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134c,
+	0x11350, 0x11350,
+	0x11357, 0x11357,
+	0x1135d, 0x11363,
+	0x11400, 0x11441,
+	0x11443, 0x11445,
+	0x11447, 0x1144a,
+	0x1145f, 0x1145f,
+	0x11480, 0x114c1,
+	0x114c4, 0x114c5,
+	0x114c7, 0x114c7,
+	0x11580, 0x115b5,
+	0x115b8, 0x115be,
+	0x115d8, 0x115dd,
+	0x11600, 0x1163e,
+	0x11640, 0x11640,
+	0x11644, 0x11644,
+	0x11680, 0x116b5,
+	0x116b8, 0x116b8,
+	0x11700, 0x1171a,
+	0x1171d, 0x1172a,
+	0x11800, 0x11838,
+	0x118a0, 0x118df,
+	0x118ff, 0x118ff,
+	0x119a0, 0x119a7,
+	0x119aa, 0x119d7,
+	0x119da, 0x119df,
+	0x119e1, 0x119e1,
+	0x119e3, 0x119e4,
+	0x11a00, 0x11a32,
+	0x11a35, 0x11a3e,
+	0x11a50, 0x11a97,
+	0x11a9d, 0x11a9d,
+	0x11ac0, 0x11af8,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c36,
+	0x11c38, 0x11c3e,
+	0x11c40, 0x11c40,
+	0x11c72, 0x11c8f,
+	0x11c92, 0x11ca7,
+	0x11ca9, 0x11cb6,
+	0x11d00, 0x11d06,
+	0x11d08, 0x11d09,
+	0x11d0b, 0x11d36,
+	0x11d3a, 0x11d3a,
+	0x11d3c, 0x11d3d,
+	0x11d3f, 0x11d41,
+	0x11d43, 0x11d43,
+	0x11d46, 0x11d47,
+	0x11d60, 0x11d65,
+	0x11d67, 0x11d68,
+	0x11d6a, 0x11d8e,
+	0x11d90, 0x11d91,
+	0x11d93, 0x11d96,
+	0x11d98, 0x11d98,
+	0x11ee0, 0x11ef6,
+	0x12000, 0x12399,
+	0x12400, 0x1246e,
+	0x12480, 0x12543,
+	0x13000, 0x1342e,
+	0x14400, 0x14646,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16ad0, 0x16aed,
+	0x16b00, 0x16b2f,
+	0x16b40, 0x16b43,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16e40, 0x16e7f,
+	0x16f00, 0x16f4a,
+	0x16f4f, 0x16f87,
+	0x16f8f, 0x16f9f,
+	0x16fe0, 0x16fe1,
+	0x16fe3, 0x16fe3,
+	0x17000, 0x187f7,
+	0x18800, 0x18af2,
+	0x1b000, 0x1b11e,
+	0x1b150, 0x1b152,
+	0x1b164, 0x1b167,
+	0x1b170, 0x1b2fb,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	0x1bc9e, 0x1bc9e,
+	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, 0x1d7cb,
+	0x1e000, 0x1e006,
+	0x1e008, 0x1e018,
+	0x1e01b, 0x1e021,
+	0x1e023, 0x1e024,
+	0x1e026, 0x1e02a,
+	0x1e100, 0x1e12c,
+	0x1e137, 0x1e13d,
+	0x1e14e, 0x1e14e,
+	0x1e2c0, 0x1e2eb,
+	0x1e800, 0x1e8c4,
+	0x1e900, 0x1e943,
+	0x1e947, 0x1e947,
+	0x1e94b, 0x1e94b,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1f130, 0x1f149,
+	0x1f150, 0x1f169,
+	0x1f170, 0x1f189,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2b820, 0x2cea1,
+	0x2ceb0, 0x2ebe0,
+	0x2f800, 0x2fa1d,
+}; /* CR_Alpha */
+
+/* 'Blank': [[:Blank:]] */
+static const OnigCodePoint CR_Blank[] = {
+	8,
+	0x0009, 0x0009,
+	0x0020, 0x0020,
+	0x00a0, 0x00a0,
+	0x1680, 0x1680,
+	0x2000, 0x200a,
+	0x202f, 0x202f,
+	0x205f, 0x205f,
+	0x3000, 0x3000,
+}; /* CR_Blank */
+
+/* 'Cntrl': [[:Cntrl:]] */
+static const OnigCodePoint CR_Cntrl[] = {
+	2,
+	0x0000, 0x001f,
+	0x007f, 0x009f,
+}; /* CR_Cntrl */
+
+/* 'Digit': [[:Digit:]] */
+static const OnigCodePoint CR_Digit[] = {
+	59,
+	0x0030, 0x0039,
+	0x0660, 0x0669,
+	0x06f0, 0x06f9,
+	0x07c0, 0x07c9,
+	0x0966, 0x096f,
+	0x09e6, 0x09ef,
+	0x0a66, 0x0a6f,
+	0x0ae6, 0x0aef,
+	0x0b66, 0x0b6f,
+	0x0be6, 0x0bef,
+	0x0c66, 0x0c6f,
+	0x0ce6, 0x0cef,
+	0x0d66, 0x0d6f,
+	0x0de6, 0x0def,
+	0x0e50, 0x0e59,
+	0x0ed0, 0x0ed9,
+	0x0f20, 0x0f29,
+	0x1040, 0x1049,
+	0x1090, 0x1099,
+	0x17e0, 0x17e9,
+	0x1810, 0x1819,
+	0x1946, 0x194f,
+	0x19d0, 0x19d9,
+	0x1a80, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1b50, 0x1b59,
+	0x1bb0, 0x1bb9,
+	0x1c40, 0x1c49,
+	0x1c50, 0x1c59,
+	0xa620, 0xa629,
+	0xa8d0, 0xa8d9,
+	0xa900, 0xa909,
+	0xa9d0, 0xa9d9,
+	0xa9f0, 0xa9f9,
+	0xaa50, 0xaa59,
+	0xabf0, 0xabf9,
+	0xff10, 0xff19,
+	0x104a0, 0x104a9,
+	0x10d30, 0x10d39,
+	0x11066, 0x1106f,
+	0x110f0, 0x110f9,
+	0x11136, 0x1113f,
+	0x111d0, 0x111d9,
+	0x112f0, 0x112f9,
+	0x11450, 0x11459,
+	0x114d0, 0x114d9,
+	0x11650, 0x11659,
+	0x116c0, 0x116c9,
+	0x11730, 0x11739,
+	0x118e0, 0x118e9,
+	0x11c50, 0x11c59,
+	0x11d50, 0x11d59,
+	0x11da0, 0x11da9,
+	0x16a60, 0x16a69,
+	0x16b50, 0x16b59,
+	0x1d7ce, 0x1d7ff,
+	0x1e140, 0x1e149,
+	0x1e2f0, 0x1e2f9,
+	0x1e950, 0x1e959,
+}; /* CR_Digit */
+
+/* 'Graph': [[:Graph:]] */
+static const OnigCodePoint CR_Graph[] = {
+	671,
+	0x0021, 0x007e,
+	0x00a1, 0x0377,
+	0x037a, 0x037f,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x052f,
+	0x0531, 0x0556,
+	0x0559, 0x058a,
+	0x058d, 0x058f,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05ef, 0x05f4,
+	0x0600, 0x061c,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x07fd, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x0860, 0x086a,
+	0x08a0, 0x08b4,
+	0x08b6, 0x08bd,
+	0x08d3, 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, 0x09fe,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a76,
+	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, 0x0af1,
+	0x0af9, 0x0aff,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b77,
+	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,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bfa,
+	0x0c00, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c5a,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c77, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
+	0x0d00, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4f,
+	0x0d54, 0x0d63,
+	0x0d66, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0de6, 0x0def,
+	0x0df2, 0x0df4,
+	0x0e01, 0x0e3a,
+	0x0e3f, 0x0e5b,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e86, 0x0e8a,
+	0x0e8c, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edf,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fda,
+	0x1000, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 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,
+	0x135d, 0x137c,
+	0x1380, 0x1399,
+	0x13a0, 0x13f5,
+	0x13f8, 0x13fd,
+	0x1400, 0x167f,
+	0x1681, 0x169c,
+	0x16a0, 0x16f8,
+	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, 0x1878,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191e,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa0, 0x1aad,
+	0x1ab0, 0x1abe,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1b80, 0x1bf3,
+	0x1bfc, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c88,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cc7,
+	0x1cd0, 0x1cfa,
+	0x1d00, 0x1df9,
+	0x1dfb, 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, 0x2064,
+	0x2066, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x209c,
+	0x20a0, 0x20bf,
+	0x20d0, 0x20f0,
+	0x2100, 0x218b,
+	0x2190, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x2b73,
+	0x2b76, 0x2b95,
+	0x2b98, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf3,
+	0x2cf9, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e4f,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3001, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312f,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x4db5,
+	0x4dc0, 0x9fef,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa6f7,
+	0xa700, 0xa7bf,
+	0xa7c2, 0xa7c6,
+	0xa7f7, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c5,
+	0xa8ce, 0xa8d9,
+	0xa8e0, 0xa953,
+	0xa95f, 0xa97c,
+	0xa980, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9fe,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaac2,
+	0xaadb, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xab30, 0xab67,
+	0xab70, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xe000, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbc1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfd,
+	0xfe00, 0xfe19,
+	0xfe20, 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, 0x1018e,
+	0x10190, 0x1019b,
+	0x101a0, 0x101a0,
+	0x101d0, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x102e0, 0x102fb,
+	0x10300, 0x10323,
+	0x1032d, 0x1034a,
+	0x10350, 0x1037a,
+	0x10380, 0x1039d,
+	0x1039f, 0x103c3,
+	0x103c8, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x104b0, 0x104d3,
+	0x104d8, 0x104fb,
+	0x10500, 0x10527,
+	0x10530, 0x10563,
+	0x1056f, 0x1056f,
+	0x10600, 0x10736,
+	0x10740, 0x10755,
+	0x10760, 0x10767,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10857, 0x1089e,
+	0x108a7, 0x108af,
+	0x108e0, 0x108f2,
+	0x108f4, 0x108f5,
+	0x108fb, 0x1091b,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10980, 0x109b7,
+	0x109bc, 0x109cf,
+	0x109d2, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a35,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a48,
+	0x10a50, 0x10a58,
+	0x10a60, 0x10a9f,
+	0x10ac0, 0x10ae6,
+	0x10aeb, 0x10af6,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b55,
+	0x10b58, 0x10b72,
+	0x10b78, 0x10b91,
+	0x10b99, 0x10b9c,
+	0x10ba9, 0x10baf,
+	0x10c00, 0x10c48,
+	0x10c80, 0x10cb2,
+	0x10cc0, 0x10cf2,
+	0x10cfa, 0x10d27,
+	0x10d30, 0x10d39,
+	0x10e60, 0x10e7e,
+	0x10f00, 0x10f27,
+	0x10f30, 0x10f59,
+	0x10fe0, 0x10ff6,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x1107f, 0x110c1,
+	0x110cd, 0x110cd,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x11146,
+	0x11150, 0x11176,
+	0x11180, 0x111cd,
+	0x111d0, 0x111df,
+	0x111e1, 0x111f4,
+	0x11200, 0x11211,
+	0x11213, 0x1123e,
+	0x11280, 0x11286,
+	0x11288, 0x11288,
+	0x1128a, 0x1128d,
+	0x1128f, 0x1129d,
+	0x1129f, 0x112a9,
+	0x112b0, 0x112ea,
+	0x112f0, 0x112f9,
+	0x11300, 0x11303,
+	0x11305, 0x1130c,
+	0x1130f, 0x11310,
+	0x11313, 0x11328,
+	0x1132a, 0x11330,
+	0x11332, 0x11333,
+	0x11335, 0x11339,
+	0x1133b, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11350, 0x11350,
+	0x11357, 0x11357,
+	0x1135d, 0x11363,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11400, 0x11459,
+	0x1145b, 0x1145b,
+	0x1145d, 0x1145f,
+	0x11480, 0x114c7,
+	0x114d0, 0x114d9,
+	0x11580, 0x115b5,
+	0x115b8, 0x115dd,
+	0x11600, 0x11644,
+	0x11650, 0x11659,
+	0x11660, 0x1166c,
+	0x11680, 0x116b8,
+	0x116c0, 0x116c9,
+	0x11700, 0x1171a,
+	0x1171d, 0x1172b,
+	0x11730, 0x1173f,
+	0x11800, 0x1183b,
+	0x118a0, 0x118f2,
+	0x118ff, 0x118ff,
+	0x119a0, 0x119a7,
+	0x119aa, 0x119d7,
+	0x119da, 0x119e4,
+	0x11a00, 0x11a47,
+	0x11a50, 0x11aa2,
+	0x11ac0, 0x11af8,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c36,
+	0x11c38, 0x11c45,
+	0x11c50, 0x11c6c,
+	0x11c70, 0x11c8f,
+	0x11c92, 0x11ca7,
+	0x11ca9, 0x11cb6,
+	0x11d00, 0x11d06,
+	0x11d08, 0x11d09,
+	0x11d0b, 0x11d36,
+	0x11d3a, 0x11d3a,
+	0x11d3c, 0x11d3d,
+	0x11d3f, 0x11d47,
+	0x11d50, 0x11d59,
+	0x11d60, 0x11d65,
+	0x11d67, 0x11d68,
+	0x11d6a, 0x11d8e,
+	0x11d90, 0x11d91,
+	0x11d93, 0x11d98,
+	0x11da0, 0x11da9,
+	0x11ee0, 0x11ef8,
+	0x11fc0, 0x11ff1,
+	0x11fff, 0x12399,
+	0x12400, 0x1246e,
+	0x12470, 0x12474,
+	0x12480, 0x12543,
+	0x13000, 0x1342e,
+	0x13430, 0x13438,
+	0x14400, 0x14646,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16a60, 0x16a69,
+	0x16a6e, 0x16a6f,
+	0x16ad0, 0x16aed,
+	0x16af0, 0x16af5,
+	0x16b00, 0x16b45,
+	0x16b50, 0x16b59,
+	0x16b5b, 0x16b61,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16e40, 0x16e9a,
+	0x16f00, 0x16f4a,
+	0x16f4f, 0x16f87,
+	0x16f8f, 0x16f9f,
+	0x16fe0, 0x16fe3,
+	0x17000, 0x187f7,
+	0x18800, 0x18af2,
+	0x1b000, 0x1b11e,
+	0x1b150, 0x1b152,
+	0x1b164, 0x1b167,
+	0x1b170, 0x1b2fb,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	0x1bc9c, 0x1bca3,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d1e8,
+	0x1d200, 0x1d245,
+	0x1d2e0, 0x1d2f3,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d378,
+	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, 0x1d7cb,
+	0x1d7ce, 0x1da8b,
+	0x1da9b, 0x1da9f,
+	0x1daa1, 0x1daaf,
+	0x1e000, 0x1e006,
+	0x1e008, 0x1e018,
+	0x1e01b, 0x1e021,
+	0x1e023, 0x1e024,
+	0x1e026, 0x1e02a,
+	0x1e100, 0x1e12c,
+	0x1e130, 0x1e13d,
+	0x1e140, 0x1e149,
+	0x1e14e, 0x1e14f,
+	0x1e2c0, 0x1e2f9,
+	0x1e2ff, 0x1e2ff,
+	0x1e800, 0x1e8c4,
+	0x1e8c7, 0x1e8d6,
+	0x1e900, 0x1e94b,
+	0x1e950, 0x1e959,
+	0x1e95e, 0x1e95f,
+	0x1ec71, 0x1ecb4,
+	0x1ed01, 0x1ed3d,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0bf,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0f5,
+	0x1f100, 0x1f10c,
+	0x1f110, 0x1f16c,
+	0x1f170, 0x1f1ac,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23b,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f260, 0x1f265,
+	0x1f300, 0x1f6d5,
+	0x1f6e0, 0x1f6ec,
+	0x1f6f0, 0x1f6fa,
+	0x1f700, 0x1f773,
+	0x1f780, 0x1f7d8,
+	0x1f7e0, 0x1f7eb,
+	0x1f800, 0x1f80b,
+	0x1f810, 0x1f847,
+	0x1f850, 0x1f859,
+	0x1f860, 0x1f887,
+	0x1f890, 0x1f8ad,
+	0x1f900, 0x1f90b,
+	0x1f90d, 0x1f971,
+	0x1f973, 0x1f976,
+	0x1f97a, 0x1f9a2,
+	0x1f9a5, 0x1f9aa,
+	0x1f9ae, 0x1f9ca,
+	0x1f9cd, 0x1fa53,
+	0x1fa60, 0x1fa6d,
+	0x1fa70, 0x1fa73,
+	0x1fa78, 0x1fa7a,
+	0x1fa80, 0x1fa82,
+	0x1fa90, 0x1fa95,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2b820, 0x2cea1,
+	0x2ceb0, 0x2ebe0,
+	0x2f800, 0x2fa1d,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xf0000, 0xffffd,
+	0x100000, 0x10fffd,
+}; /* CR_Graph */
+
+/* 'Lower': [[:Lower:]] */
+static const OnigCodePoint CR_Lower[] = {
+	649,
+	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,
+	0x0242, 0x0242,
+	0x0247, 0x0247,
+	0x0249, 0x0249,
+	0x024b, 0x024b,
+	0x024d, 0x024d,
+	0x024f, 0x0293,
+	0x0295, 0x02b8,
+	0x02c0, 0x02c1,
+	0x02e0, 0x02e4,
+	0x0345, 0x0345,
+	0x0371, 0x0371,
+	0x0373, 0x0373,
+	0x0377, 0x0377,
+	0x037a, 0x037d,
+	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, 0x04cf,
+	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,
+	0x04fb, 0x04fb,
+	0x04fd, 0x04fd,
+	0x04ff, 0x04ff,
+	0x0501, 0x0501,
+	0x0503, 0x0503,
+	0x0505, 0x0505,
+	0x0507, 0x0507,
+	0x0509, 0x0509,
+	0x050b, 0x050b,
+	0x050d, 0x050d,
+	0x050f, 0x050f,
+	0x0511, 0x0511,
+	0x0513, 0x0513,
+	0x0515, 0x0515,
+	0x0517, 0x0517,
+	0x0519, 0x0519,
+	0x051b, 0x051b,
+	0x051d, 0x051d,
+	0x051f, 0x051f,
+	0x0521, 0x0521,
+	0x0523, 0x0523,
+	0x0525, 0x0525,
+	0x0527, 0x0527,
+	0x0529, 0x0529,
+	0x052b, 0x052b,
+	0x052d, 0x052d,
+	0x052f, 0x052f,
+	0x0560, 0x0588,
+	0x10d0, 0x10fa,
+	0x10fd, 0x10ff,
+	0x13f8, 0x13fd,
+	0x1c80, 0x1c88,
+	0x1d00, 0x1dbf,
+	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, 0x1e9d,
+	0x1e9f, 0x1e9f,
+	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,
+	0x1efb, 0x1efb,
+	0x1efd, 0x1efd,
+	0x1eff, 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,
+	0x2090, 0x209c,
+	0x210a, 0x210a,
+	0x210e, 0x210f,
+	0x2113, 0x2113,
+	0x212f, 0x212f,
+	0x2134, 0x2134,
+	0x2139, 0x2139,
+	0x213c, 0x213d,
+	0x2146, 0x2149,
+	0x214e, 0x214e,
+	0x2170, 0x217f,
+	0x2184, 0x2184,
+	0x24d0, 0x24e9,
+	0x2c30, 0x2c5e,
+	0x2c61, 0x2c61,
+	0x2c65, 0x2c66,
+	0x2c68, 0x2c68,
+	0x2c6a, 0x2c6a,
+	0x2c6c, 0x2c6c,
+	0x2c71, 0x2c71,
+	0x2c73, 0x2c74,
+	0x2c76, 0x2c7d,
+	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,
+	0x2cec, 0x2cec,
+	0x2cee, 0x2cee,
+	0x2cf3, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0xa641, 0xa641,
+	0xa643, 0xa643,
+	0xa645, 0xa645,
+	0xa647, 0xa647,
+	0xa649, 0xa649,
+	0xa64b, 0xa64b,
+	0xa64d, 0xa64d,
+	0xa64f, 0xa64f,
+	0xa651, 0xa651,
+	0xa653, 0xa653,
+	0xa655, 0xa655,
+	0xa657, 0xa657,
+	0xa659, 0xa659,
+	0xa65b, 0xa65b,
+	0xa65d, 0xa65d,
+	0xa65f, 0xa65f,
+	0xa661, 0xa661,
+	0xa663, 0xa663,
+	0xa665, 0xa665,
+	0xa667, 0xa667,
+	0xa669, 0xa669,
+	0xa66b, 0xa66b,
+	0xa66d, 0xa66d,
+	0xa681, 0xa681,
+	0xa683, 0xa683,
+	0xa685, 0xa685,
+	0xa687, 0xa687,
+	0xa689, 0xa689,
+	0xa68b, 0xa68b,
+	0xa68d, 0xa68d,
+	0xa68f, 0xa68f,
+	0xa691, 0xa691,
+	0xa693, 0xa693,
+	0xa695, 0xa695,
+	0xa697, 0xa697,
+	0xa699, 0xa699,
+	0xa69b, 0xa69d,
+	0xa723, 0xa723,
+	0xa725, 0xa725,
+	0xa727, 0xa727,
+	0xa729, 0xa729,
+	0xa72b, 0xa72b,
+	0xa72d, 0xa72d,
+	0xa72f, 0xa731,
+	0xa733, 0xa733,
+	0xa735, 0xa735,
+	0xa737, 0xa737,
+	0xa739, 0xa739,
+	0xa73b, 0xa73b,
+	0xa73d, 0xa73d,
+	0xa73f, 0xa73f,
+	0xa741, 0xa741,
+	0xa743, 0xa743,
+	0xa745, 0xa745,
+	0xa747, 0xa747,
+	0xa749, 0xa749,
+	0xa74b, 0xa74b,
+	0xa74d, 0xa74d,
+	0xa74f, 0xa74f,
+	0xa751, 0xa751,
+	0xa753, 0xa753,
+	0xa755, 0xa755,
+	0xa757, 0xa757,
+	0xa759, 0xa759,
+	0xa75b, 0xa75b,
+	0xa75d, 0xa75d,
+	0xa75f, 0xa75f,
+	0xa761, 0xa761,
+	0xa763, 0xa763,
+	0xa765, 0xa765,
+	0xa767, 0xa767,
+	0xa769, 0xa769,
+	0xa76b, 0xa76b,
+	0xa76d, 0xa76d,
+	0xa76f, 0xa778,
+	0xa77a, 0xa77a,
+	0xa77c, 0xa77c,
+	0xa77f, 0xa77f,
+	0xa781, 0xa781,
+	0xa783, 0xa783,
+	0xa785, 0xa785,
+	0xa787, 0xa787,
+	0xa78c, 0xa78c,
+	0xa78e, 0xa78e,
+	0xa791, 0xa791,
+	0xa793, 0xa795,
+	0xa797, 0xa797,
+	0xa799, 0xa799,
+	0xa79b, 0xa79b,
+	0xa79d, 0xa79d,
+	0xa79f, 0xa79f,
+	0xa7a1, 0xa7a1,
+	0xa7a3, 0xa7a3,
+	0xa7a5, 0xa7a5,
+	0xa7a7, 0xa7a7,
+	0xa7a9, 0xa7a9,
+	0xa7af, 0xa7af,
+	0xa7b5, 0xa7b5,
+	0xa7b7, 0xa7b7,
+	0xa7b9, 0xa7b9,
+	0xa7bb, 0xa7bb,
+	0xa7bd, 0xa7bd,
+	0xa7bf, 0xa7bf,
+	0xa7c3, 0xa7c3,
+	0xa7f8, 0xa7fa,
+	0xab30, 0xab5a,
+	0xab5c, 0xab67,
+	0xab70, 0xabbf,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff41, 0xff5a,
+	0x10428, 0x1044f,
+	0x104d8, 0x104fb,
+	0x10cc0, 0x10cf2,
+	0x118c0, 0x118df,
+	0x16e60, 0x16e7f,
+	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,
+	0x1d7cb, 0x1d7cb,
+	0x1e922, 0x1e943,
+}; /* CR_Lower */
+
+/* 'Print': [[:Print:]] */
+static const OnigCodePoint CR_Print[] = {
+	668,
+	0x0020, 0x007e,
+	0x00a0, 0x0377,
+	0x037a, 0x037f,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x052f,
+	0x0531, 0x0556,
+	0x0559, 0x058a,
+	0x058d, 0x058f,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05ef, 0x05f4,
+	0x0600, 0x061c,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x07fd, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x0860, 0x086a,
+	0x08a0, 0x08b4,
+	0x08b6, 0x08bd,
+	0x08d3, 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, 0x09fe,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a76,
+	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, 0x0af1,
+	0x0af9, 0x0aff,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b77,
+	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,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bfa,
+	0x0c00, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c5a,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c77, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
+	0x0d00, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4f,
+	0x0d54, 0x0d63,
+	0x0d66, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0de6, 0x0def,
+	0x0df2, 0x0df4,
+	0x0e01, 0x0e3a,
+	0x0e3f, 0x0e5b,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e86, 0x0e8a,
+	0x0e8c, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edf,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fda,
+	0x1000, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 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,
+	0x135d, 0x137c,
+	0x1380, 0x1399,
+	0x13a0, 0x13f5,
+	0x13f8, 0x13fd,
+	0x1400, 0x169c,
+	0x16a0, 0x16f8,
+	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, 0x1878,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191e,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa0, 0x1aad,
+	0x1ab0, 0x1abe,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1b80, 0x1bf3,
+	0x1bfc, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c88,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cc7,
+	0x1cd0, 0x1cfa,
+	0x1d00, 0x1df9,
+	0x1dfb, 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, 0x2027,
+	0x202a, 0x2064,
+	0x2066, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x209c,
+	0x20a0, 0x20bf,
+	0x20d0, 0x20f0,
+	0x2100, 0x218b,
+	0x2190, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x2b73,
+	0x2b76, 0x2b95,
+	0x2b98, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf3,
+	0x2cf9, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e4f,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312f,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x4db5,
+	0x4dc0, 0x9fef,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa6f7,
+	0xa700, 0xa7bf,
+	0xa7c2, 0xa7c6,
+	0xa7f7, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c5,
+	0xa8ce, 0xa8d9,
+	0xa8e0, 0xa953,
+	0xa95f, 0xa97c,
+	0xa980, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9fe,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaac2,
+	0xaadb, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xab30, 0xab67,
+	0xab70, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xe000, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbc1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfd,
+	0xfe00, 0xfe19,
+	0xfe20, 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, 0x1018e,
+	0x10190, 0x1019b,
+	0x101a0, 0x101a0,
+	0x101d0, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x102e0, 0x102fb,
+	0x10300, 0x10323,
+	0x1032d, 0x1034a,
+	0x10350, 0x1037a,
+	0x10380, 0x1039d,
+	0x1039f, 0x103c3,
+	0x103c8, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x104b0, 0x104d3,
+	0x104d8, 0x104fb,
+	0x10500, 0x10527,
+	0x10530, 0x10563,
+	0x1056f, 0x1056f,
+	0x10600, 0x10736,
+	0x10740, 0x10755,
+	0x10760, 0x10767,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10857, 0x1089e,
+	0x108a7, 0x108af,
+	0x108e0, 0x108f2,
+	0x108f4, 0x108f5,
+	0x108fb, 0x1091b,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10980, 0x109b7,
+	0x109bc, 0x109cf,
+	0x109d2, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a35,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a48,
+	0x10a50, 0x10a58,
+	0x10a60, 0x10a9f,
+	0x10ac0, 0x10ae6,
+	0x10aeb, 0x10af6,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b55,
+	0x10b58, 0x10b72,
+	0x10b78, 0x10b91,
+	0x10b99, 0x10b9c,
+	0x10ba9, 0x10baf,
+	0x10c00, 0x10c48,
+	0x10c80, 0x10cb2,
+	0x10cc0, 0x10cf2,
+	0x10cfa, 0x10d27,
+	0x10d30, 0x10d39,
+	0x10e60, 0x10e7e,
+	0x10f00, 0x10f27,
+	0x10f30, 0x10f59,
+	0x10fe0, 0x10ff6,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x1107f, 0x110c1,
+	0x110cd, 0x110cd,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x11146,
+	0x11150, 0x11176,
+	0x11180, 0x111cd,
+	0x111d0, 0x111df,
+	0x111e1, 0x111f4,
+	0x11200, 0x11211,
+	0x11213, 0x1123e,
+	0x11280, 0x11286,
+	0x11288, 0x11288,
+	0x1128a, 0x1128d,
+	0x1128f, 0x1129d,
+	0x1129f, 0x112a9,
+	0x112b0, 0x112ea,
+	0x112f0, 0x112f9,
+	0x11300, 0x11303,
+	0x11305, 0x1130c,
+	0x1130f, 0x11310,
+	0x11313, 0x11328,
+	0x1132a, 0x11330,
+	0x11332, 0x11333,
+	0x11335, 0x11339,
+	0x1133b, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11350, 0x11350,
+	0x11357, 0x11357,
+	0x1135d, 0x11363,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11400, 0x11459,
+	0x1145b, 0x1145b,
+	0x1145d, 0x1145f,
+	0x11480, 0x114c7,
+	0x114d0, 0x114d9,
+	0x11580, 0x115b5,
+	0x115b8, 0x115dd,
+	0x11600, 0x11644,
+	0x11650, 0x11659,
+	0x11660, 0x1166c,
+	0x11680, 0x116b8,
+	0x116c0, 0x116c9,
+	0x11700, 0x1171a,
+	0x1171d, 0x1172b,
+	0x11730, 0x1173f,
+	0x11800, 0x1183b,
+	0x118a0, 0x118f2,
+	0x118ff, 0x118ff,
+	0x119a0, 0x119a7,
+	0x119aa, 0x119d7,
+	0x119da, 0x119e4,
+	0x11a00, 0x11a47,
+	0x11a50, 0x11aa2,
+	0x11ac0, 0x11af8,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c36,
+	0x11c38, 0x11c45,
+	0x11c50, 0x11c6c,
+	0x11c70, 0x11c8f,
+	0x11c92, 0x11ca7,
+	0x11ca9, 0x11cb6,
+	0x11d00, 0x11d06,
+	0x11d08, 0x11d09,
+	0x11d0b, 0x11d36,
+	0x11d3a, 0x11d3a,
+	0x11d3c, 0x11d3d,
+	0x11d3f, 0x11d47,
+	0x11d50, 0x11d59,
+	0x11d60, 0x11d65,
+	0x11d67, 0x11d68,
+	0x11d6a, 0x11d8e,
+	0x11d90, 0x11d91,
+	0x11d93, 0x11d98,
+	0x11da0, 0x11da9,
+	0x11ee0, 0x11ef8,
+	0x11fc0, 0x11ff1,
+	0x11fff, 0x12399,
+	0x12400, 0x1246e,
+	0x12470, 0x12474,
+	0x12480, 0x12543,
+	0x13000, 0x1342e,
+	0x13430, 0x13438,
+	0x14400, 0x14646,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16a60, 0x16a69,
+	0x16a6e, 0x16a6f,
+	0x16ad0, 0x16aed,
+	0x16af0, 0x16af5,
+	0x16b00, 0x16b45,
+	0x16b50, 0x16b59,
+	0x16b5b, 0x16b61,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16e40, 0x16e9a,
+	0x16f00, 0x16f4a,
+	0x16f4f, 0x16f87,
+	0x16f8f, 0x16f9f,
+	0x16fe0, 0x16fe3,
+	0x17000, 0x187f7,
+	0x18800, 0x18af2,
+	0x1b000, 0x1b11e,
+	0x1b150, 0x1b152,
+	0x1b164, 0x1b167,
+	0x1b170, 0x1b2fb,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	0x1bc9c, 0x1bca3,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d1e8,
+	0x1d200, 0x1d245,
+	0x1d2e0, 0x1d2f3,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d378,
+	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, 0x1d7cb,
+	0x1d7ce, 0x1da8b,
+	0x1da9b, 0x1da9f,
+	0x1daa1, 0x1daaf,
+	0x1e000, 0x1e006,
+	0x1e008, 0x1e018,
+	0x1e01b, 0x1e021,
+	0x1e023, 0x1e024,
+	0x1e026, 0x1e02a,
+	0x1e100, 0x1e12c,
+	0x1e130, 0x1e13d,
+	0x1e140, 0x1e149,
+	0x1e14e, 0x1e14f,
+	0x1e2c0, 0x1e2f9,
+	0x1e2ff, 0x1e2ff,
+	0x1e800, 0x1e8c4,
+	0x1e8c7, 0x1e8d6,
+	0x1e900, 0x1e94b,
+	0x1e950, 0x1e959,
+	0x1e95e, 0x1e95f,
+	0x1ec71, 0x1ecb4,
+	0x1ed01, 0x1ed3d,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0bf,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0f5,
+	0x1f100, 0x1f10c,
+	0x1f110, 0x1f16c,
+	0x1f170, 0x1f1ac,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23b,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f260, 0x1f265,
+	0x1f300, 0x1f6d5,
+	0x1f6e0, 0x1f6ec,
+	0x1f6f0, 0x1f6fa,
+	0x1f700, 0x1f773,
+	0x1f780, 0x1f7d8,
+	0x1f7e0, 0x1f7eb,
+	0x1f800, 0x1f80b,
+	0x1f810, 0x1f847,
+	0x1f850, 0x1f859,
+	0x1f860, 0x1f887,
+	0x1f890, 0x1f8ad,
+	0x1f900, 0x1f90b,
+	0x1f90d, 0x1f971,
+	0x1f973, 0x1f976,
+	0x1f97a, 0x1f9a2,
+	0x1f9a5, 0x1f9aa,
+	0x1f9ae, 0x1f9ca,
+	0x1f9cd, 0x1fa53,
+	0x1fa60, 0x1fa6d,
+	0x1fa70, 0x1fa73,
+	0x1fa78, 0x1fa7a,
+	0x1fa80, 0x1fa82,
+	0x1fa90, 0x1fa95,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2b820, 0x2cea1,
+	0x2ceb0, 0x2ebe0,
+	0x2f800, 0x2fa1d,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xf0000, 0xffffd,
+	0x100000, 0x10fffd,
+}; /* CR_Print */
+
+/* 'XPosixPunct': [[:Punct:]] */
+static const OnigCodePoint CR_XPosixPunct[] = {
+	177,
+	0x0021, 0x002f,
+	0x003a, 0x0040,
+	0x005b, 0x0060,
+	0x007b, 0x007e,
+	0x00a1, 0x00a1,
+	0x00a7, 0x00a7,
+	0x00ab, 0x00ab,
+	0x00b6, 0x00b7,
+	0x00bb, 0x00bb,
+	0x00bf, 0x00bf,
+	0x037e, 0x037e,
+	0x0387, 0x0387,
+	0x055a, 0x055f,
+	0x0589, 0x058a,
+	0x05be, 0x05be,
+	0x05c0, 0x05c0,
+	0x05c3, 0x05c3,
+	0x05c6, 0x05c6,
+	0x05f3, 0x05f4,
+	0x0609, 0x060a,
+	0x060c, 0x060d,
+	0x061b, 0x061b,
+	0x061e, 0x061f,
+	0x066a, 0x066d,
+	0x06d4, 0x06d4,
+	0x0700, 0x070d,
+	0x07f7, 0x07f9,
+	0x0830, 0x083e,
+	0x085e, 0x085e,
+	0x0964, 0x0965,
+	0x0970, 0x0970,
+	0x09fd, 0x09fd,
+	0x0a76, 0x0a76,
+	0x0af0, 0x0af0,
+	0x0c77, 0x0c77,
+	0x0c84, 0x0c84,
+	0x0df4, 0x0df4,
+	0x0e4f, 0x0e4f,
+	0x0e5a, 0x0e5b,
+	0x0f04, 0x0f12,
+	0x0f14, 0x0f14,
+	0x0f3a, 0x0f3d,
+	0x0f85, 0x0f85,
+	0x0fd0, 0x0fd4,
+	0x0fd9, 0x0fda,
+	0x104a, 0x104f,
+	0x10fb, 0x10fb,
+	0x1360, 0x1368,
+	0x1400, 0x1400,
+	0x166e, 0x166e,
+	0x169b, 0x169c,
+	0x16eb, 0x16ed,
+	0x1735, 0x1736,
+	0x17d4, 0x17d6,
+	0x17d8, 0x17da,
+	0x1800, 0x180a,
+	0x1944, 0x1945,
+	0x1a1e, 0x1a1f,
+	0x1aa0, 0x1aa6,
+	0x1aa8, 0x1aad,
+	0x1b5a, 0x1b60,
+	0x1bfc, 0x1bff,
+	0x1c3b, 0x1c3f,
+	0x1c7e, 0x1c7f,
+	0x1cc0, 0x1cc7,
+	0x1cd3, 0x1cd3,
+	0x2010, 0x2027,
+	0x2030, 0x2043,
+	0x2045, 0x2051,
+	0x2053, 0x205e,
+	0x207d, 0x207e,
+	0x208d, 0x208e,
+	0x2308, 0x230b,
+	0x2329, 0x232a,
+	0x2768, 0x2775,
+	0x27c5, 0x27c6,
+	0x27e6, 0x27ef,
+	0x2983, 0x2998,
+	0x29d8, 0x29db,
+	0x29fc, 0x29fd,
+	0x2cf9, 0x2cfc,
+	0x2cfe, 0x2cff,
+	0x2d70, 0x2d70,
+	0x2e00, 0x2e2e,
+	0x2e30, 0x2e4f,
+	0x3001, 0x3003,
+	0x3008, 0x3011,
+	0x3014, 0x301f,
+	0x3030, 0x3030,
+	0x303d, 0x303d,
+	0x30a0, 0x30a0,
+	0x30fb, 0x30fb,
+	0xa4fe, 0xa4ff,
+	0xa60d, 0xa60f,
+	0xa673, 0xa673,
+	0xa67e, 0xa67e,
+	0xa6f2, 0xa6f7,
+	0xa874, 0xa877,
+	0xa8ce, 0xa8cf,
+	0xa8f8, 0xa8fa,
+	0xa8fc, 0xa8fc,
+	0xa92e, 0xa92f,
+	0xa95f, 0xa95f,
+	0xa9c1, 0xa9cd,
+	0xa9de, 0xa9df,
+	0xaa5c, 0xaa5f,
+	0xaade, 0xaadf,
+	0xaaf0, 0xaaf1,
+	0xabeb, 0xabeb,
+	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, 0x10102,
+	0x1039f, 0x1039f,
+	0x103d0, 0x103d0,
+	0x1056f, 0x1056f,
+	0x10857, 0x10857,
+	0x1091f, 0x1091f,
+	0x1093f, 0x1093f,
+	0x10a50, 0x10a58,
+	0x10a7f, 0x10a7f,
+	0x10af0, 0x10af6,
+	0x10b39, 0x10b3f,
+	0x10b99, 0x10b9c,
+	0x10f55, 0x10f59,
+	0x11047, 0x1104d,
+	0x110bb, 0x110bc,
+	0x110be, 0x110c1,
+	0x11140, 0x11143,
+	0x11174, 0x11175,
+	0x111c5, 0x111c8,
+	0x111cd, 0x111cd,
+	0x111db, 0x111db,
+	0x111dd, 0x111df,
+	0x11238, 0x1123d,
+	0x112a9, 0x112a9,
+	0x1144b, 0x1144f,
+	0x1145b, 0x1145b,
+	0x1145d, 0x1145d,
+	0x114c6, 0x114c6,
+	0x115c1, 0x115d7,
+	0x11641, 0x11643,
+	0x11660, 0x1166c,
+	0x1173c, 0x1173e,
+	0x1183b, 0x1183b,
+	0x119e2, 0x119e2,
+	0x11a3f, 0x11a46,
+	0x11a9a, 0x11a9c,
+	0x11a9e, 0x11aa2,
+	0x11c41, 0x11c45,
+	0x11c70, 0x11c71,
+	0x11ef7, 0x11ef8,
+	0x11fff, 0x11fff,
+	0x12470, 0x12474,
+	0x16a6e, 0x16a6f,
+	0x16af5, 0x16af5,
+	0x16b37, 0x16b3b,
+	0x16b44, 0x16b44,
+	0x16e97, 0x16e9a,
+	0x16fe2, 0x16fe2,
+	0x1bc9f, 0x1bc9f,
+	0x1da87, 0x1da8b,
+	0x1e95e, 0x1e95f,
+}; /* CR_XPosixPunct */
+
+/* 'Space': [[:Space:]] */
+static const OnigCodePoint CR_Space[] = {
+	10,
+	0x0009, 0x000d,
+	0x0020, 0x0020,
+	0x0085, 0x0085,
+	0x00a0, 0x00a0,
+	0x1680, 0x1680,
+	0x2000, 0x200a,
+	0x2028, 0x2029,
+	0x202f, 0x202f,
+	0x205f, 0x205f,
+	0x3000, 0x3000,
+}; /* CR_Space */
+
+/* 'Upper': [[:Upper:]] */
+static const OnigCodePoint CR_Upper[] = {
+	641,
+	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,
+	0x0243, 0x0246,
+	0x0248, 0x0248,
+	0x024a, 0x024a,
+	0x024c, 0x024c,
+	0x024e, 0x024e,
+	0x0370, 0x0370,
+	0x0372, 0x0372,
+	0x0376, 0x0376,
+	0x037f, 0x037f,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x038f,
+	0x0391, 0x03a1,
+	0x03a3, 0x03ab,
+	0x03cf, 0x03cf,
+	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,
+	0x04fa, 0x04fa,
+	0x04fc, 0x04fc,
+	0x04fe, 0x04fe,
+	0x0500, 0x0500,
+	0x0502, 0x0502,
+	0x0504, 0x0504,
+	0x0506, 0x0506,
+	0x0508, 0x0508,
+	0x050a, 0x050a,
+	0x050c, 0x050c,
+	0x050e, 0x050e,
+	0x0510, 0x0510,
+	0x0512, 0x0512,
+	0x0514, 0x0514,
+	0x0516, 0x0516,
+	0x0518, 0x0518,
+	0x051a, 0x051a,
+	0x051c, 0x051c,
+	0x051e, 0x051e,
+	0x0520, 0x0520,
+	0x0522, 0x0522,
+	0x0524, 0x0524,
+	0x0526, 0x0526,
+	0x0528, 0x0528,
+	0x052a, 0x052a,
+	0x052c, 0x052c,
+	0x052e, 0x052e,
+	0x0531, 0x0556,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x13a0, 0x13f5,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cbf,
+	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,
+	0x1e9e, 0x1e9e,
+	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,
+	0x1efa, 0x1efa,
+	0x1efc, 0x1efc,
+	0x1efe, 0x1efe,
+	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, 0x2133,
+	0x213e, 0x213f,
+	0x2145, 0x2145,
+	0x2160, 0x216f,
+	0x2183, 0x2183,
+	0x24b6, 0x24cf,
+	0x2c00, 0x2c2e,
+	0x2c60, 0x2c60,
+	0x2c62, 0x2c64,
+	0x2c67, 0x2c67,
+	0x2c69, 0x2c69,
+	0x2c6b, 0x2c6b,
+	0x2c6d, 0x2c70,
+	0x2c72, 0x2c72,
+	0x2c75, 0x2c75,
+	0x2c7e, 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,
+	0x2ceb, 0x2ceb,
+	0x2ced, 0x2ced,
+	0x2cf2, 0x2cf2,
+	0xa640, 0xa640,
+	0xa642, 0xa642,
+	0xa644, 0xa644,
+	0xa646, 0xa646,
+	0xa648, 0xa648,
+	0xa64a, 0xa64a,
+	0xa64c, 0xa64c,
+	0xa64e, 0xa64e,
+	0xa650, 0xa650,
+	0xa652, 0xa652,
+	0xa654, 0xa654,
+	0xa656, 0xa656,
+	0xa658, 0xa658,
+	0xa65a, 0xa65a,
+	0xa65c, 0xa65c,
+	0xa65e, 0xa65e,
+	0xa660, 0xa660,
+	0xa662, 0xa662,
+	0xa664, 0xa664,
+	0xa666, 0xa666,
+	0xa668, 0xa668,
+	0xa66a, 0xa66a,
+	0xa66c, 0xa66c,
+	0xa680, 0xa680,
+	0xa682, 0xa682,
+	0xa684, 0xa684,
+	0xa686, 0xa686,
+	0xa688, 0xa688,
+	0xa68a, 0xa68a,
+	0xa68c, 0xa68c,
+	0xa68e, 0xa68e,
+	0xa690, 0xa690,
+	0xa692, 0xa692,
+	0xa694, 0xa694,
+	0xa696, 0xa696,
+	0xa698, 0xa698,
+	0xa69a, 0xa69a,
+	0xa722, 0xa722,
+	0xa724, 0xa724,
+	0xa726, 0xa726,
+	0xa728, 0xa728,
+	0xa72a, 0xa72a,
+	0xa72c, 0xa72c,
+	0xa72e, 0xa72e,
+	0xa732, 0xa732,
+	0xa734, 0xa734,
+	0xa736, 0xa736,
+	0xa738, 0xa738,
+	0xa73a, 0xa73a,
+	0xa73c, 0xa73c,
+	0xa73e, 0xa73e,
+	0xa740, 0xa740,
+	0xa742, 0xa742,
+	0xa744, 0xa744,
+	0xa746, 0xa746,
+	0xa748, 0xa748,
+	0xa74a, 0xa74a,
+	0xa74c, 0xa74c,
+	0xa74e, 0xa74e,
+	0xa750, 0xa750,
+	0xa752, 0xa752,
+	0xa754, 0xa754,
+	0xa756, 0xa756,
+	0xa758, 0xa758,
+	0xa75a, 0xa75a,
+	0xa75c, 0xa75c,
+	0xa75e, 0xa75e,
+	0xa760, 0xa760,
+	0xa762, 0xa762,
+	0xa764, 0xa764,
+	0xa766, 0xa766,
+	0xa768, 0xa768,
+	0xa76a, 0xa76a,
+	0xa76c, 0xa76c,
+	0xa76e, 0xa76e,
+	0xa779, 0xa779,
+	0xa77b, 0xa77b,
+	0xa77d, 0xa77e,
+	0xa780, 0xa780,
+	0xa782, 0xa782,
+	0xa784, 0xa784,
+	0xa786, 0xa786,
+	0xa78b, 0xa78b,
+	0xa78d, 0xa78d,
+	0xa790, 0xa790,
+	0xa792, 0xa792,
+	0xa796, 0xa796,
+	0xa798, 0xa798,
+	0xa79a, 0xa79a,
+	0xa79c, 0xa79c,
+	0xa79e, 0xa79e,
+	0xa7a0, 0xa7a0,
+	0xa7a2, 0xa7a2,
+	0xa7a4, 0xa7a4,
+	0xa7a6, 0xa7a6,
+	0xa7a8, 0xa7a8,
+	0xa7aa, 0xa7ae,
+	0xa7b0, 0xa7b4,
+	0xa7b6, 0xa7b6,
+	0xa7b8, 0xa7b8,
+	0xa7ba, 0xa7ba,
+	0xa7bc, 0xa7bc,
+	0xa7be, 0xa7be,
+	0xa7c2, 0xa7c2,
+	0xa7c4, 0xa7c6,
+	0xff21, 0xff3a,
+	0x10400, 0x10427,
+	0x104b0, 0x104d3,
+	0x10c80, 0x10cb2,
+	0x118a0, 0x118bf,
+	0x16e40, 0x16e5f,
+	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,
+	0x1d7ca, 0x1d7ca,
+	0x1e900, 0x1e921,
+	0x1f130, 0x1f149,
+	0x1f150, 0x1f169,
+	0x1f170, 0x1f189,
+}; /* 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[] = {
+	716,
+	0x0030, 0x0039,
+	0x0041, 0x005a,
+	0x005f, 0x005f,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0300, 0x0374,
+	0x0376, 0x0377,
+	0x037a, 0x037d,
+	0x037f, 0x037f,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x0483, 0x052f,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0560, 0x0588,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05ef, 0x05f2,
+	0x0610, 0x061a,
+	0x0620, 0x0669,
+	0x066e, 0x06d3,
+	0x06d5, 0x06dc,
+	0x06df, 0x06e8,
+	0x06ea, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07f5,
+	0x07fa, 0x07fa,
+	0x07fd, 0x07fd,
+	0x0800, 0x082d,
+	0x0840, 0x085b,
+	0x0860, 0x086a,
+	0x08a0, 0x08b4,
+	0x08b6, 0x08bd,
+	0x08d3, 0x08e1,
+	0x08e3, 0x0963,
+	0x0966, 0x096f,
+	0x0971, 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,
+	0x09fc, 0x09fc,
+	0x09fe, 0x09fe,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+	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,
+	0x0af9, 0x0aff,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	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,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bef,
+	0x0c00, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c5a,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c80, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
+	0x0d00, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	0x0d54, 0x0d57,
+	0x0d5f, 0x0d63,
+	0x0d66, 0x0d6f,
+	0x0d7a, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0de6, 0x0def,
+	0x0df2, 0x0df3,
+	0x0e01, 0x0e3a,
+	0x0e40, 0x0e4e,
+	0x0e50, 0x0e59,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e86, 0x0e8a,
+	0x0e8c, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f18, 0x0f19,
+	0x0f20, 0x0f29,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f3e, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f84,
+	0x0f86, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x1000, 0x1049,
+	0x1050, 0x109d,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 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,
+	0x135d, 0x135f,
+	0x1380, 0x138f,
+	0x13a0, 0x13f5,
+	0x13f8, 0x13fd,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x16ee, 0x16f8,
+	0x1700, 0x170c,
+	0x170e, 0x1714,
+	0x1720, 0x1734,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17d3,
+	0x17d7, 0x17d7,
+	0x17dc, 0x17dd,
+	0x17e0, 0x17e9,
+	0x180b, 0x180d,
+	0x1810, 0x1819,
+	0x1820, 0x1878,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191e,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1946, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19d9,
+	0x1a00, 0x1a1b,
+	0x1a20, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa7, 0x1aa7,
+	0x1ab0, 0x1abe,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b59,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1bf3,
+	0x1c00, 0x1c37,
+	0x1c40, 0x1c49,
+	0x1c4d, 0x1c7d,
+	0x1c80, 0x1c88,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cbf,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1cfa,
+	0x1d00, 0x1df9,
+	0x1dfb, 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,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x209c,
+	0x20d0, 0x20f0,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2119, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x212d,
+	0x212f, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x24b6, 0x24e9,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d6f,
+	0x2d7f, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2dff,
+	0x2e2f, 0x2e2f,
+	0x3005, 0x3007,
+	0x3021, 0x302f,
+	0x3031, 0x3035,
+	0x3038, 0x303c,
+	0x3041, 0x3096,
+	0x3099, 0x309a,
+	0x309d, 0x309f,
+	0x30a1, 0x30fa,
+	0x30fc, 0x30ff,
+	0x3105, 0x312f,
+	0x3131, 0x318e,
+	0x31a0, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fef,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa62b,
+	0xa640, 0xa672,
+	0xa674, 0xa67d,
+	0xa67f, 0xa6f1,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa7bf,
+	0xa7c2, 0xa7c6,
+	0xa7f7, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c5,
+	0xa8d0, 0xa8d9,
+	0xa8e0, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa8fd, 0xa92d,
+	0xa930, 0xa953,
+	0xa960, 0xa97c,
+	0xa980, 0xa9c0,
+	0xa9cf, 0xa9d9,
+	0xa9e0, 0xa9fe,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaac2,
+	0xaadb, 0xaadd,
+	0xaae0, 0xaaef,
+	0xaaf2, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xab30, 0xab5a,
+	0xab5c, 0xab67,
+	0xab70, 0xabea,
+	0xabec, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa6d,
+	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, 0xfe2f,
+	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,
+	0x10140, 0x10174,
+	0x101fd, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x102e0, 0x102e0,
+	0x10300, 0x1031f,
+	0x1032d, 0x1034a,
+	0x10350, 0x1037a,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x103d1, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x104b0, 0x104d3,
+	0x104d8, 0x104fb,
+	0x10500, 0x10527,
+	0x10530, 0x10563,
+	0x10600, 0x10736,
+	0x10740, 0x10755,
+	0x10760, 0x10767,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10860, 0x10876,
+	0x10880, 0x1089e,
+	0x108e0, 0x108f2,
+	0x108f4, 0x108f5,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a35,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x10a60, 0x10a7c,
+	0x10a80, 0x10a9c,
+	0x10ac0, 0x10ac7,
+	0x10ac9, 0x10ae6,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10b80, 0x10b91,
+	0x10c00, 0x10c48,
+	0x10c80, 0x10cb2,
+	0x10cc0, 0x10cf2,
+	0x10d00, 0x10d27,
+	0x10d30, 0x10d39,
+	0x10f00, 0x10f1c,
+	0x10f27, 0x10f27,
+	0x10f30, 0x10f50,
+	0x10fe0, 0x10ff6,
+	0x11000, 0x11046,
+	0x11066, 0x1106f,
+	0x1107f, 0x110ba,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x1113f,
+	0x11144, 0x11146,
+	0x11150, 0x11173,
+	0x11176, 0x11176,
+	0x11180, 0x111c4,
+	0x111c9, 0x111cc,
+	0x111d0, 0x111da,
+	0x111dc, 0x111dc,
+	0x11200, 0x11211,
+	0x11213, 0x11237,
+	0x1123e, 0x1123e,
+	0x11280, 0x11286,
+	0x11288, 0x11288,
+	0x1128a, 0x1128d,
+	0x1128f, 0x1129d,
+	0x1129f, 0x112a8,
+	0x112b0, 0x112ea,
+	0x112f0, 0x112f9,
+	0x11300, 0x11303,
+	0x11305, 0x1130c,
+	0x1130f, 0x11310,
+	0x11313, 0x11328,
+	0x1132a, 0x11330,
+	0x11332, 0x11333,
+	0x11335, 0x11339,
+	0x1133b, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11350, 0x11350,
+	0x11357, 0x11357,
+	0x1135d, 0x11363,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11400, 0x1144a,
+	0x11450, 0x11459,
+	0x1145e, 0x1145f,
+	0x11480, 0x114c5,
+	0x114c7, 0x114c7,
+	0x114d0, 0x114d9,
+	0x11580, 0x115b5,
+	0x115b8, 0x115c0,
+	0x115d8, 0x115dd,
+	0x11600, 0x11640,
+	0x11644, 0x11644,
+	0x11650, 0x11659,
+	0x11680, 0x116b8,
+	0x116c0, 0x116c9,
+	0x11700, 0x1171a,
+	0x1171d, 0x1172b,
+	0x11730, 0x11739,
+	0x11800, 0x1183a,
+	0x118a0, 0x118e9,
+	0x118ff, 0x118ff,
+	0x119a0, 0x119a7,
+	0x119aa, 0x119d7,
+	0x119da, 0x119e1,
+	0x119e3, 0x119e4,
+	0x11a00, 0x11a3e,
+	0x11a47, 0x11a47,
+	0x11a50, 0x11a99,
+	0x11a9d, 0x11a9d,
+	0x11ac0, 0x11af8,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c36,
+	0x11c38, 0x11c40,
+	0x11c50, 0x11c59,
+	0x11c72, 0x11c8f,
+	0x11c92, 0x11ca7,
+	0x11ca9, 0x11cb6,
+	0x11d00, 0x11d06,
+	0x11d08, 0x11d09,
+	0x11d0b, 0x11d36,
+	0x11d3a, 0x11d3a,
+	0x11d3c, 0x11d3d,
+	0x11d3f, 0x11d47,
+	0x11d50, 0x11d59,
+	0x11d60, 0x11d65,
+	0x11d67, 0x11d68,
+	0x11d6a, 0x11d8e,
+	0x11d90, 0x11d91,
+	0x11d93, 0x11d98,
+	0x11da0, 0x11da9,
+	0x11ee0, 0x11ef6,
+	0x12000, 0x12399,
+	0x12400, 0x1246e,
+	0x12480, 0x12543,
+	0x13000, 0x1342e,
+	0x14400, 0x14646,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16a60, 0x16a69,
+	0x16ad0, 0x16aed,
+	0x16af0, 0x16af4,
+	0x16b00, 0x16b36,
+	0x16b40, 0x16b43,
+	0x16b50, 0x16b59,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16e40, 0x16e7f,
+	0x16f00, 0x16f4a,
+	0x16f4f, 0x16f87,
+	0x16f8f, 0x16f9f,
+	0x16fe0, 0x16fe1,
+	0x16fe3, 0x16fe3,
+	0x17000, 0x187f7,
+	0x18800, 0x18af2,
+	0x1b000, 0x1b11e,
+	0x1b150, 0x1b152,
+	0x1b164, 0x1b167,
+	0x1b170, 0x1b2fb,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	0x1bc9d, 0x1bc9e,
+	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, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x1da00, 0x1da36,
+	0x1da3b, 0x1da6c,
+	0x1da75, 0x1da75,
+	0x1da84, 0x1da84,
+	0x1da9b, 0x1da9f,
+	0x1daa1, 0x1daaf,
+	0x1e000, 0x1e006,
+	0x1e008, 0x1e018,
+	0x1e01b, 0x1e021,
+	0x1e023, 0x1e024,
+	0x1e026, 0x1e02a,
+	0x1e100, 0x1e12c,
+	0x1e130, 0x1e13d,
+	0x1e140, 0x1e149,
+	0x1e14e, 0x1e14e,
+	0x1e2c0, 0x1e2f9,
+	0x1e800, 0x1e8c4,
+	0x1e8d0, 0x1e8d6,
+	0x1e900, 0x1e94b,
+	0x1e950, 0x1e959,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1f130, 0x1f149,
+	0x1f150, 0x1f169,
+	0x1f170, 0x1f189,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2b820, 0x2cea1,
+	0x2ceb0, 0x2ebe0,
+	0x2f800, 0x2fa1d,
+	0xe0100, 0xe01ef,
+}; /* CR_Word */
+
+/* 'Alnum': [[:Alnum:]] */
+static const OnigCodePoint CR_Alnum[] = {
+	715,
+	0x0030, 0x0039,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0345, 0x0345,
+	0x0370, 0x0374,
+	0x0376, 0x0377,
+	0x037a, 0x037d,
+	0x037f, 0x037f,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x048a, 0x052f,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0560, 0x0588,
+	0x05b0, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05ef, 0x05f2,
+	0x0610, 0x061a,
+	0x0620, 0x0657,
+	0x0659, 0x0669,
+	0x066e, 0x06d3,
+	0x06d5, 0x06dc,
+	0x06e1, 0x06e8,
+	0x06ed, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x073f,
+	0x074d, 0x07b1,
+	0x07c0, 0x07ea,
+	0x07f4, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x0817,
+	0x081a, 0x082c,
+	0x0840, 0x0858,
+	0x0860, 0x086a,
+	0x08a0, 0x08b4,
+	0x08b6, 0x08bd,
+	0x08d4, 0x08df,
+	0x08e3, 0x08e9,
+	0x08f0, 0x093b,
+	0x093d, 0x094c,
+	0x094e, 0x0950,
+	0x0955, 0x0963,
+	0x0966, 0x096f,
+	0x0971, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bd, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cc,
+	0x09ce, 0x09ce,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09f1,
+	0x09fc, 0x09fc,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4c,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abd, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acc,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae3,
+	0x0ae6, 0x0aef,
+	0x0af9, 0x0afc,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3d, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4c,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	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, 0x0bcc,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bef,
+	0x0c00, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4c,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c5a,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c80, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbd, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccc,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
+	0x0d00, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4c,
+	0x0d4e, 0x0d4e,
+	0x0d54, 0x0d57,
+	0x0d5f, 0x0d63,
+	0x0d66, 0x0d6f,
+	0x0d7a, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0de6, 0x0def,
+	0x0df2, 0x0df3,
+	0x0e01, 0x0e3a,
+	0x0e40, 0x0e46,
+	0x0e4d, 0x0e4d,
+	0x0e50, 0x0e59,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e86, 0x0e8a,
+	0x0e8c, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0eb9,
+	0x0ebb, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ecd, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f20, 0x0f29,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f81,
+	0x0f88, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x1000, 0x1036,
+	0x1038, 0x1038,
+	0x103b, 0x1049,
+	0x1050, 0x109d,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 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, 0x13f5,
+	0x13f8, 0x13fd,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x16ee, 0x16f8,
+	0x1700, 0x170c,
+	0x170e, 0x1713,
+	0x1720, 0x1733,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17b3,
+	0x17b6, 0x17c8,
+	0x17d7, 0x17d7,
+	0x17dc, 0x17dc,
+	0x17e0, 0x17e9,
+	0x1810, 0x1819,
+	0x1820, 0x1878,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191e,
+	0x1920, 0x192b,
+	0x1930, 0x1938,
+	0x1946, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19d9,
+	0x1a00, 0x1a1b,
+	0x1a20, 0x1a5e,
+	0x1a61, 0x1a74,
+	0x1a80, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa7, 0x1aa7,
+	0x1b00, 0x1b33,
+	0x1b35, 0x1b43,
+	0x1b45, 0x1b4b,
+	0x1b50, 0x1b59,
+	0x1b80, 0x1ba9,
+	0x1bac, 0x1be5,
+	0x1be7, 0x1bf1,
+	0x1c00, 0x1c36,
+	0x1c40, 0x1c49,
+	0x1c4d, 0x1c7d,
+	0x1c80, 0x1c88,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cbf,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf3,
+	0x1cf5, 0x1cf6,
+	0x1cfa, 0x1cfa,
+	0x1d00, 0x1dbf,
+	0x1de7, 0x1df4,
+	0x1e00, 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, 0x209c,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2119, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x212d,
+	0x212f, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x24b6, 0x24e9,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cee,
+	0x2cf2, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2dff,
+	0x2e2f, 0x2e2f,
+	0x3005, 0x3007,
+	0x3021, 0x3029,
+	0x3031, 0x3035,
+	0x3038, 0x303c,
+	0x3041, 0x3096,
+	0x309d, 0x309f,
+	0x30a1, 0x30fa,
+	0x30fc, 0x30ff,
+	0x3105, 0x312f,
+	0x3131, 0x318e,
+	0x31a0, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fef,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa62b,
+	0xa640, 0xa66e,
+	0xa674, 0xa67b,
+	0xa67f, 0xa6ef,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa7bf,
+	0xa7c2, 0xa7c6,
+	0xa7f7, 0xa805,
+	0xa807, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c3,
+	0xa8c5, 0xa8c5,
+	0xa8d0, 0xa8d9,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa8fd, 0xa92a,
+	0xa930, 0xa952,
+	0xa960, 0xa97c,
+	0xa980, 0xa9b2,
+	0xa9b4, 0xa9bf,
+	0xa9cf, 0xa9d9,
+	0xa9e0, 0xa9fe,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaabe,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadd,
+	0xaae0, 0xaaef,
+	0xaaf2, 0xaaf5,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xab30, 0xab5a,
+	0xab5c, 0xab67,
+	0xab70, 0xabea,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa6d,
+	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,
+	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,
+	0x10140, 0x10174,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031f,
+	0x1032d, 0x1034a,
+	0x10350, 0x1037a,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x103d1, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x104b0, 0x104d3,
+	0x104d8, 0x104fb,
+	0x10500, 0x10527,
+	0x10530, 0x10563,
+	0x10600, 0x10736,
+	0x10740, 0x10755,
+	0x10760, 0x10767,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10860, 0x10876,
+	0x10880, 0x1089e,
+	0x108e0, 0x108f2,
+	0x108f4, 0x108f5,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a35,
+	0x10a60, 0x10a7c,
+	0x10a80, 0x10a9c,
+	0x10ac0, 0x10ac7,
+	0x10ac9, 0x10ae4,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10b80, 0x10b91,
+	0x10c00, 0x10c48,
+	0x10c80, 0x10cb2,
+	0x10cc0, 0x10cf2,
+	0x10d00, 0x10d27,
+	0x10d30, 0x10d39,
+	0x10f00, 0x10f1c,
+	0x10f27, 0x10f27,
+	0x10f30, 0x10f45,
+	0x10fe0, 0x10ff6,
+	0x11000, 0x11045,
+	0x11066, 0x1106f,
+	0x11082, 0x110b8,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11132,
+	0x11136, 0x1113f,
+	0x11144, 0x11146,
+	0x11150, 0x11172,
+	0x11176, 0x11176,
+	0x11180, 0x111bf,
+	0x111c1, 0x111c4,
+	0x111d0, 0x111da,
+	0x111dc, 0x111dc,
+	0x11200, 0x11211,
+	0x11213, 0x11234,
+	0x11237, 0x11237,
+	0x1123e, 0x1123e,
+	0x11280, 0x11286,
+	0x11288, 0x11288,
+	0x1128a, 0x1128d,
+	0x1128f, 0x1129d,
+	0x1129f, 0x112a8,
+	0x112b0, 0x112e8,
+	0x112f0, 0x112f9,
+	0x11300, 0x11303,
+	0x11305, 0x1130c,
+	0x1130f, 0x11310,
+	0x11313, 0x11328,
+	0x1132a, 0x11330,
+	0x11332, 0x11333,
+	0x11335, 0x11339,
+	0x1133d, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134c,
+	0x11350, 0x11350,
+	0x11357, 0x11357,
+	0x1135d, 0x11363,
+	0x11400, 0x11441,
+	0x11443, 0x11445,
+	0x11447, 0x1144a,
+	0x11450, 0x11459,
+	0x1145f, 0x1145f,
+	0x11480, 0x114c1,
+	0x114c4, 0x114c5,
+	0x114c7, 0x114c7,
+	0x114d0, 0x114d9,
+	0x11580, 0x115b5,
+	0x115b8, 0x115be,
+	0x115d8, 0x115dd,
+	0x11600, 0x1163e,
+	0x11640, 0x11640,
+	0x11644, 0x11644,
+	0x11650, 0x11659,
+	0x11680, 0x116b5,
+	0x116b8, 0x116b8,
+	0x116c0, 0x116c9,
+	0x11700, 0x1171a,
+	0x1171d, 0x1172a,
+	0x11730, 0x11739,
+	0x11800, 0x11838,
+	0x118a0, 0x118e9,
+	0x118ff, 0x118ff,
+	0x119a0, 0x119a7,
+	0x119aa, 0x119d7,
+	0x119da, 0x119df,
+	0x119e1, 0x119e1,
+	0x119e3, 0x119e4,
+	0x11a00, 0x11a32,
+	0x11a35, 0x11a3e,
+	0x11a50, 0x11a97,
+	0x11a9d, 0x11a9d,
+	0x11ac0, 0x11af8,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c36,
+	0x11c38, 0x11c3e,
+	0x11c40, 0x11c40,
+	0x11c50, 0x11c59,
+	0x11c72, 0x11c8f,
+	0x11c92, 0x11ca7,
+	0x11ca9, 0x11cb6,
+	0x11d00, 0x11d06,
+	0x11d08, 0x11d09,
+	0x11d0b, 0x11d36,
+	0x11d3a, 0x11d3a,
+	0x11d3c, 0x11d3d,
+	0x11d3f, 0x11d41,
+	0x11d43, 0x11d43,
+	0x11d46, 0x11d47,
+	0x11d50, 0x11d59,
+	0x11d60, 0x11d65,
+	0x11d67, 0x11d68,
+	0x11d6a, 0x11d8e,
+	0x11d90, 0x11d91,
+	0x11d93, 0x11d96,
+	0x11d98, 0x11d98,
+	0x11da0, 0x11da9,
+	0x11ee0, 0x11ef6,
+	0x12000, 0x12399,
+	0x12400, 0x1246e,
+	0x12480, 0x12543,
+	0x13000, 0x1342e,
+	0x14400, 0x14646,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16a60, 0x16a69,
+	0x16ad0, 0x16aed,
+	0x16b00, 0x16b2f,
+	0x16b40, 0x16b43,
+	0x16b50, 0x16b59,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16e40, 0x16e7f,
+	0x16f00, 0x16f4a,
+	0x16f4f, 0x16f87,
+	0x16f8f, 0x16f9f,
+	0x16fe0, 0x16fe1,
+	0x16fe3, 0x16fe3,
+	0x17000, 0x187f7,
+	0x18800, 0x18af2,
+	0x1b000, 0x1b11e,
+	0x1b150, 0x1b152,
+	0x1b164, 0x1b167,
+	0x1b170, 0x1b2fb,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	0x1bc9e, 0x1bc9e,
+	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, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x1e000, 0x1e006,
+	0x1e008, 0x1e018,
+	0x1e01b, 0x1e021,
+	0x1e023, 0x1e024,
+	0x1e026, 0x1e02a,
+	0x1e100, 0x1e12c,
+	0x1e137, 0x1e13d,
+	0x1e140, 0x1e149,
+	0x1e14e, 0x1e14e,
+	0x1e2c0, 0x1e2eb,
+	0x1e2f0, 0x1e2f9,
+	0x1e800, 0x1e8c4,
+	0x1e900, 0x1e943,
+	0x1e947, 0x1e947,
+	0x1e94b, 0x1e94b,
+	0x1e950, 0x1e959,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1f130, 0x1f149,
+	0x1f150, 0x1f169,
+	0x1f170, 0x1f189,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2b820, 0x2cea1,
+	0x2ceb0, 0x2ebe0,
+	0x2f800, 0x2fa1d,
+}; /* CR_Alnum */
+
+/* 'ASCII': [[:ASCII:]] */
+static const OnigCodePoint CR_ASCII[] = {
+	1,
+	0x0000, 0x007f,
+}; /* CR_ASCII */
+
+/* 'Punct' */
+static const OnigCodePoint CR_Punct[] = {
+	182,
+	0x0021, 0x0023,
+	0x0025, 0x002a,
+	0x002c, 0x002f,
+	0x003a, 0x003b,
+	0x003f, 0x0040,
+	0x005b, 0x005d,
+	0x005f, 0x005f,
+	0x007b, 0x007b,
+	0x007d, 0x007d,
+	0x00a1, 0x00a1,
+	0x00a7, 0x00a7,
+	0x00ab, 0x00ab,
+	0x00b6, 0x00b7,
+	0x00bb, 0x00bb,
+	0x00bf, 0x00bf,
+	0x037e, 0x037e,
+	0x0387, 0x0387,
+	0x055a, 0x055f,
+	0x0589, 0x058a,
+	0x05be, 0x05be,
+	0x05c0, 0x05c0,
+	0x05c3, 0x05c3,
+	0x05c6, 0x05c6,
+	0x05f3, 0x05f4,
+	0x0609, 0x060a,
+	0x060c, 0x060d,
+	0x061b, 0x061b,
+	0x061e, 0x061f,
+	0x066a, 0x066d,
+	0x06d4, 0x06d4,
+	0x0700, 0x070d,
+	0x07f7, 0x07f9,
+	0x0830, 0x083e,
+	0x085e, 0x085e,
+	0x0964, 0x0965,
+	0x0970, 0x0970,
+	0x09fd, 0x09fd,
+	0x0a76, 0x0a76,
+	0x0af0, 0x0af0,
+	0x0c77, 0x0c77,
+	0x0c84, 0x0c84,
+	0x0df4, 0x0df4,
+	0x0e4f, 0x0e4f,
+	0x0e5a, 0x0e5b,
+	0x0f04, 0x0f12,
+	0x0f14, 0x0f14,
+	0x0f3a, 0x0f3d,
+	0x0f85, 0x0f85,
+	0x0fd0, 0x0fd4,
+	0x0fd9, 0x0fda,
+	0x104a, 0x104f,
+	0x10fb, 0x10fb,
+	0x1360, 0x1368,
+	0x1400, 0x1400,
+	0x166e, 0x166e,
+	0x169b, 0x169c,
+	0x16eb, 0x16ed,
+	0x1735, 0x1736,
+	0x17d4, 0x17d6,
+	0x17d8, 0x17da,
+	0x1800, 0x180a,
+	0x1944, 0x1945,
+	0x1a1e, 0x1a1f,
+	0x1aa0, 0x1aa6,
+	0x1aa8, 0x1aad,
+	0x1b5a, 0x1b60,
+	0x1bfc, 0x1bff,
+	0x1c3b, 0x1c3f,
+	0x1c7e, 0x1c7f,
+	0x1cc0, 0x1cc7,
+	0x1cd3, 0x1cd3,
+	0x2010, 0x2027,
+	0x2030, 0x2043,
+	0x2045, 0x2051,
+	0x2053, 0x205e,
+	0x207d, 0x207e,
+	0x208d, 0x208e,
+	0x2308, 0x230b,
+	0x2329, 0x232a,
+	0x2768, 0x2775,
+	0x27c5, 0x27c6,
+	0x27e6, 0x27ef,
+	0x2983, 0x2998,
+	0x29d8, 0x29db,
+	0x29fc, 0x29fd,
+	0x2cf9, 0x2cfc,
+	0x2cfe, 0x2cff,
+	0x2d70, 0x2d70,
+	0x2e00, 0x2e2e,
+	0x2e30, 0x2e4f,
+	0x3001, 0x3003,
+	0x3008, 0x3011,
+	0x3014, 0x301f,
+	0x3030, 0x3030,
+	0x303d, 0x303d,
+	0x30a0, 0x30a0,
+	0x30fb, 0x30fb,
+	0xa4fe, 0xa4ff,
+	0xa60d, 0xa60f,
+	0xa673, 0xa673,
+	0xa67e, 0xa67e,
+	0xa6f2, 0xa6f7,
+	0xa874, 0xa877,
+	0xa8ce, 0xa8cf,
+	0xa8f8, 0xa8fa,
+	0xa8fc, 0xa8fc,
+	0xa92e, 0xa92f,
+	0xa95f, 0xa95f,
+	0xa9c1, 0xa9cd,
+	0xa9de, 0xa9df,
+	0xaa5c, 0xaa5f,
+	0xaade, 0xaadf,
+	0xaaf0, 0xaaf1,
+	0xabeb, 0xabeb,
+	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, 0x10102,
+	0x1039f, 0x1039f,
+	0x103d0, 0x103d0,
+	0x1056f, 0x1056f,
+	0x10857, 0x10857,
+	0x1091f, 0x1091f,
+	0x1093f, 0x1093f,
+	0x10a50, 0x10a58,
+	0x10a7f, 0x10a7f,
+	0x10af0, 0x10af6,
+	0x10b39, 0x10b3f,
+	0x10b99, 0x10b9c,
+	0x10f55, 0x10f59,
+	0x11047, 0x1104d,
+	0x110bb, 0x110bc,
+	0x110be, 0x110c1,
+	0x11140, 0x11143,
+	0x11174, 0x11175,
+	0x111c5, 0x111c8,
+	0x111cd, 0x111cd,
+	0x111db, 0x111db,
+	0x111dd, 0x111df,
+	0x11238, 0x1123d,
+	0x112a9, 0x112a9,
+	0x1144b, 0x1144f,
+	0x1145b, 0x1145b,
+	0x1145d, 0x1145d,
+	0x114c6, 0x114c6,
+	0x115c1, 0x115d7,
+	0x11641, 0x11643,
+	0x11660, 0x1166c,
+	0x1173c, 0x1173e,
+	0x1183b, 0x1183b,
+	0x119e2, 0x119e2,
+	0x11a3f, 0x11a46,
+	0x11a9a, 0x11a9c,
+	0x11a9e, 0x11aa2,
+	0x11c41, 0x11c45,
+	0x11c70, 0x11c71,
+	0x11ef7, 0x11ef8,
+	0x11fff, 0x11fff,
+	0x12470, 0x12474,
+	0x16a6e, 0x16a6f,
+	0x16af5, 0x16af5,
+	0x16b37, 0x16b3b,
+	0x16b44, 0x16b44,
+	0x16e97, 0x16e9a,
+	0x16fe2, 0x16fe2,
+	0x1bc9f, 0x1bc9f,
+	0x1da87, 0x1da8b,
+	0x1e95e, 0x1e95f,
+}; /* CR_Punct */
+
+#ifdef USE_UNICODE_PROPERTIES
+/* 'Any': - */
+static const OnigCodePoint CR_Any[] = {
+	1,
+	0x0000, 0x10ffff,
+}; /* CR_Any */
+
+/* 'Assigned': - */
+static const OnigCodePoint CR_Assigned[] = {
+	666,
+	0x0000, 0x0377,
+	0x037a, 0x037f,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x052f,
+	0x0531, 0x0556,
+	0x0559, 0x058a,
+	0x058d, 0x058f,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05ef, 0x05f4,
+	0x0600, 0x061c,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x07fd, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x0860, 0x086a,
+	0x08a0, 0x08b4,
+	0x08b6, 0x08bd,
+	0x08d3, 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, 0x09fe,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a76,
+	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, 0x0af1,
+	0x0af9, 0x0aff,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b77,
+	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,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bfa,
+	0x0c00, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c5a,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c77, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
+	0x0d00, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4f,
+	0x0d54, 0x0d63,
+	0x0d66, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0de6, 0x0def,
+	0x0df2, 0x0df4,
+	0x0e01, 0x0e3a,
+	0x0e3f, 0x0e5b,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e86, 0x0e8a,
+	0x0e8c, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edf,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fda,
+	0x1000, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 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,
+	0x135d, 0x137c,
+	0x1380, 0x1399,
+	0x13a0, 0x13f5,
+	0x13f8, 0x13fd,
+	0x1400, 0x169c,
+	0x16a0, 0x16f8,
+	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, 0x1878,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191e,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa0, 0x1aad,
+	0x1ab0, 0x1abe,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1b80, 0x1bf3,
+	0x1bfc, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c88,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cc7,
+	0x1cd0, 0x1cfa,
+	0x1d00, 0x1df9,
+	0x1dfb, 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, 0x2064,
+	0x2066, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x209c,
+	0x20a0, 0x20bf,
+	0x20d0, 0x20f0,
+	0x2100, 0x218b,
+	0x2190, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x2b73,
+	0x2b76, 0x2b95,
+	0x2b98, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf3,
+	0x2cf9, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e4f,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312f,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x4db5,
+	0x4dc0, 0x9fef,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa6f7,
+	0xa700, 0xa7bf,
+	0xa7c2, 0xa7c6,
+	0xa7f7, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c5,
+	0xa8ce, 0xa8d9,
+	0xa8e0, 0xa953,
+	0xa95f, 0xa97c,
+	0xa980, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9fe,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaac2,
+	0xaadb, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xab30, 0xab67,
+	0xab70, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xd800, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbc1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfd,
+	0xfe00, 0xfe19,
+	0xfe20, 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, 0x1018e,
+	0x10190, 0x1019b,
+	0x101a0, 0x101a0,
+	0x101d0, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x102e0, 0x102fb,
+	0x10300, 0x10323,
+	0x1032d, 0x1034a,
+	0x10350, 0x1037a,
+	0x10380, 0x1039d,
+	0x1039f, 0x103c3,
+	0x103c8, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x104b0, 0x104d3,
+	0x104d8, 0x104fb,
+	0x10500, 0x10527,
+	0x10530, 0x10563,
+	0x1056f, 0x1056f,
+	0x10600, 0x10736,
+	0x10740, 0x10755,
+	0x10760, 0x10767,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10857, 0x1089e,
+	0x108a7, 0x108af,
+	0x108e0, 0x108f2,
+	0x108f4, 0x108f5,
+	0x108fb, 0x1091b,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10980, 0x109b7,
+	0x109bc, 0x109cf,
+	0x109d2, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a35,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a48,
+	0x10a50, 0x10a58,
+	0x10a60, 0x10a9f,
+	0x10ac0, 0x10ae6,
+	0x10aeb, 0x10af6,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b55,
+	0x10b58, 0x10b72,
+	0x10b78, 0x10b91,
+	0x10b99, 0x10b9c,
+	0x10ba9, 0x10baf,
+	0x10c00, 0x10c48,
+	0x10c80, 0x10cb2,
+	0x10cc0, 0x10cf2,
+	0x10cfa, 0x10d27,
+	0x10d30, 0x10d39,
+	0x10e60, 0x10e7e,
+	0x10f00, 0x10f27,
+	0x10f30, 0x10f59,
+	0x10fe0, 0x10ff6,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x1107f, 0x110c1,
+	0x110cd, 0x110cd,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x11146,
+	0x11150, 0x11176,
+	0x11180, 0x111cd,
+	0x111d0, 0x111df,
+	0x111e1, 0x111f4,
+	0x11200, 0x11211,
+	0x11213, 0x1123e,
+	0x11280, 0x11286,
+	0x11288, 0x11288,
+	0x1128a, 0x1128d,
+	0x1128f, 0x1129d,
+	0x1129f, 0x112a9,
+	0x112b0, 0x112ea,
+	0x112f0, 0x112f9,
+	0x11300, 0x11303,
+	0x11305, 0x1130c,
+	0x1130f, 0x11310,
+	0x11313, 0x11328,
+	0x1132a, 0x11330,
+	0x11332, 0x11333,
+	0x11335, 0x11339,
+	0x1133b, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11350, 0x11350,
+	0x11357, 0x11357,
+	0x1135d, 0x11363,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11400, 0x11459,
+	0x1145b, 0x1145b,
+	0x1145d, 0x1145f,
+	0x11480, 0x114c7,
+	0x114d0, 0x114d9,
+	0x11580, 0x115b5,
+	0x115b8, 0x115dd,
+	0x11600, 0x11644,
+	0x11650, 0x11659,
+	0x11660, 0x1166c,
+	0x11680, 0x116b8,
+	0x116c0, 0x116c9,
+	0x11700, 0x1171a,
+	0x1171d, 0x1172b,
+	0x11730, 0x1173f,
+	0x11800, 0x1183b,
+	0x118a0, 0x118f2,
+	0x118ff, 0x118ff,
+	0x119a0, 0x119a7,
+	0x119aa, 0x119d7,
+	0x119da, 0x119e4,
+	0x11a00, 0x11a47,
+	0x11a50, 0x11aa2,
+	0x11ac0, 0x11af8,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c36,
+	0x11c38, 0x11c45,
+	0x11c50, 0x11c6c,
+	0x11c70, 0x11c8f,
+	0x11c92, 0x11ca7,
+	0x11ca9, 0x11cb6,
+	0x11d00, 0x11d06,
+	0x11d08, 0x11d09,
+	0x11d0b, 0x11d36,
+	0x11d3a, 0x11d3a,
+	0x11d3c, 0x11d3d,
+	0x11d3f, 0x11d47,
+	0x11d50, 0x11d59,
+	0x11d60, 0x11d65,
+	0x11d67, 0x11d68,
+	0x11d6a, 0x11d8e,
+	0x11d90, 0x11d91,
+	0x11d93, 0x11d98,
+	0x11da0, 0x11da9,
+	0x11ee0, 0x11ef8,
+	0x11fc0, 0x11ff1,
+	0x11fff, 0x12399,
+	0x12400, 0x1246e,
+	0x12470, 0x12474,
+	0x12480, 0x12543,
+	0x13000, 0x1342e,
+	0x13430, 0x13438,
+	0x14400, 0x14646,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16a60, 0x16a69,
+	0x16a6e, 0x16a6f,
+	0x16ad0, 0x16aed,
+	0x16af0, 0x16af5,
+	0x16b00, 0x16b45,
+	0x16b50, 0x16b59,
+	0x16b5b, 0x16b61,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16e40, 0x16e9a,
+	0x16f00, 0x16f4a,
+	0x16f4f, 0x16f87,
+	0x16f8f, 0x16f9f,
+	0x16fe0, 0x16fe3,
+	0x17000, 0x187f7,
+	0x18800, 0x18af2,
+	0x1b000, 0x1b11e,
+	0x1b150, 0x1b152,
+	0x1b164, 0x1b167,
+	0x1b170, 0x1b2fb,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	0x1bc9c, 0x1bca3,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d1e8,
+	0x1d200, 0x1d245,
+	0x1d2e0, 0x1d2f3,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d378,
+	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, 0x1d7cb,
+	0x1d7ce, 0x1da8b,
+	0x1da9b, 0x1da9f,
+	0x1daa1, 0x1daaf,
+	0x1e000, 0x1e006,
+	0x1e008, 0x1e018,
+	0x1e01b, 0x1e021,
+	0x1e023, 0x1e024,
+	0x1e026, 0x1e02a,
+	0x1e100, 0x1e12c,
+	0x1e130, 0x1e13d,
+	0x1e140, 0x1e149,
+	0x1e14e, 0x1e14f,
+	0x1e2c0, 0x1e2f9,
+	0x1e2ff, 0x1e2ff,
+	0x1e800, 0x1e8c4,
+	0x1e8c7, 0x1e8d6,
+	0x1e900, 0x1e94b,
+	0x1e950, 0x1e959,
+	0x1e95e, 0x1e95f,
+	0x1ec71, 0x1ecb4,
+	0x1ed01, 0x1ed3d,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0bf,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0f5,
+	0x1f100, 0x1f10c,
+	0x1f110, 0x1f16c,
+	0x1f170, 0x1f1ac,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23b,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f260, 0x1f265,
+	0x1f300, 0x1f6d5,
+	0x1f6e0, 0x1f6ec,
+	0x1f6f0, 0x1f6fa,
+	0x1f700, 0x1f773,
+	0x1f780, 0x1f7d8,
+	0x1f7e0, 0x1f7eb,
+	0x1f800, 0x1f80b,
+	0x1f810, 0x1f847,
+	0x1f850, 0x1f859,
+	0x1f860, 0x1f887,
+	0x1f890, 0x1f8ad,
+	0x1f900, 0x1f90b,
+	0x1f90d, 0x1f971,
+	0x1f973, 0x1f976,
+	0x1f97a, 0x1f9a2,
+	0x1f9a5, 0x1f9aa,
+	0x1f9ae, 0x1f9ca,
+	0x1f9cd, 0x1fa53,
+	0x1fa60, 0x1fa6d,
+	0x1fa70, 0x1fa73,
+	0x1fa78, 0x1fa7a,
+	0x1fa80, 0x1fa82,
+	0x1fa90, 0x1fa95,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2b820, 0x2cea1,
+	0x2ceb0, 0x2ebe0,
+	0x2f800, 0x2fa1d,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xf0000, 0xffffd,
+	0x100000, 0x10fffd,
+}; /* CR_Assigned */
+
+/* 'C': Major Category */
+static const OnigCodePoint CR_C[] = {
+	668,
+	0x0000, 0x001f,
+	0x007f, 0x009f,
+	0x00ad, 0x00ad,
+	0x0378, 0x0379,
+	0x0380, 0x0383,
+	0x038b, 0x038b,
+	0x038d, 0x038d,
+	0x03a2, 0x03a2,
+	0x0530, 0x0530,
+	0x0557, 0x0558,
+	0x058b, 0x058c,
+	0x0590, 0x0590,
+	0x05c8, 0x05cf,
+	0x05eb, 0x05ee,
+	0x05f5, 0x0605,
+	0x061c, 0x061d,
+	0x06dd, 0x06dd,
+	0x070e, 0x070f,
+	0x074b, 0x074c,
+	0x07b2, 0x07bf,
+	0x07fb, 0x07fc,
+	0x082e, 0x082f,
+	0x083f, 0x083f,
+	0x085c, 0x085d,
+	0x085f, 0x085f,
+	0x086b, 0x089f,
+	0x08b5, 0x08b5,
+	0x08be, 0x08d2,
+	0x08e2, 0x08e2,
+	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,
+	0x09ff, 0x0a00,
+	0x0a04, 0x0a04,
+	0x0a0b, 0x0a0e,
+	0x0a11, 0x0a12,
+	0x0a29, 0x0a29,
+	0x0a31, 0x0a31,
+	0x0a34, 0x0a34,
+	0x0a37, 0x0a37,
+	0x0a3a, 0x0a3b,
+	0x0a3d, 0x0a3d,
+	0x0a43, 0x0a46,
+	0x0a49, 0x0a4a,
+	0x0a4e, 0x0a50,
+	0x0a52, 0x0a58,
+	0x0a5d, 0x0a5d,
+	0x0a5f, 0x0a65,
+	0x0a77, 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,
+	0x0af2, 0x0af8,
+	0x0b00, 0x0b00,
+	0x0b04, 0x0b04,
+	0x0b0d, 0x0b0e,
+	0x0b11, 0x0b12,
+	0x0b29, 0x0b29,
+	0x0b31, 0x0b31,
+	0x0b34, 0x0b34,
+	0x0b3a, 0x0b3b,
+	0x0b45, 0x0b46,
+	0x0b49, 0x0b4a,
+	0x0b4e, 0x0b55,
+	0x0b58, 0x0b5b,
+	0x0b5e, 0x0b5e,
+	0x0b64, 0x0b65,
+	0x0b78, 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, 0x0bcf,
+	0x0bd1, 0x0bd6,
+	0x0bd8, 0x0be5,
+	0x0bfb, 0x0bff,
+	0x0c0d, 0x0c0d,
+	0x0c11, 0x0c11,
+	0x0c29, 0x0c29,
+	0x0c3a, 0x0c3c,
+	0x0c45, 0x0c45,
+	0x0c49, 0x0c49,
+	0x0c4e, 0x0c54,
+	0x0c57, 0x0c57,
+	0x0c5b, 0x0c5f,
+	0x0c64, 0x0c65,
+	0x0c70, 0x0c76,
+	0x0c8d, 0x0c8d,
+	0x0c91, 0x0c91,
+	0x0ca9, 0x0ca9,
+	0x0cb4, 0x0cb4,
+	0x0cba, 0x0cbb,
+	0x0cc5, 0x0cc5,
+	0x0cc9, 0x0cc9,
+	0x0cce, 0x0cd4,
+	0x0cd7, 0x0cdd,
+	0x0cdf, 0x0cdf,
+	0x0ce4, 0x0ce5,
+	0x0cf0, 0x0cf0,
+	0x0cf3, 0x0cff,
+	0x0d04, 0x0d04,
+	0x0d0d, 0x0d0d,
+	0x0d11, 0x0d11,
+	0x0d45, 0x0d45,
+	0x0d49, 0x0d49,
+	0x0d50, 0x0d53,
+	0x0d64, 0x0d65,
+	0x0d80, 0x0d81,
+	0x0d84, 0x0d84,
+	0x0d97, 0x0d99,
+	0x0db2, 0x0db2,
+	0x0dbc, 0x0dbc,
+	0x0dbe, 0x0dbf,
+	0x0dc7, 0x0dc9,
+	0x0dcb, 0x0dce,
+	0x0dd5, 0x0dd5,
+	0x0dd7, 0x0dd7,
+	0x0de0, 0x0de5,
+	0x0df0, 0x0df1,
+	0x0df5, 0x0e00,
+	0x0e3b, 0x0e3e,
+	0x0e5c, 0x0e80,
+	0x0e83, 0x0e83,
+	0x0e85, 0x0e85,
+	0x0e8b, 0x0e8b,
+	0x0ea4, 0x0ea4,
+	0x0ea6, 0x0ea6,
+	0x0ebe, 0x0ebf,
+	0x0ec5, 0x0ec5,
+	0x0ec7, 0x0ec7,
+	0x0ece, 0x0ecf,
+	0x0eda, 0x0edb,
+	0x0ee0, 0x0eff,
+	0x0f48, 0x0f48,
+	0x0f6d, 0x0f70,
+	0x0f98, 0x0f98,
+	0x0fbd, 0x0fbd,
+	0x0fcd, 0x0fcd,
+	0x0fdb, 0x0fff,
+	0x10c6, 0x10c6,
+	0x10c8, 0x10cc,
+	0x10ce, 0x10cf,
+	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, 0x135c,
+	0x137d, 0x137f,
+	0x139a, 0x139f,
+	0x13f6, 0x13f7,
+	0x13fe, 0x13ff,
+	0x169d, 0x169f,
+	0x16f9, 0x16ff,
+	0x170d, 0x170d,
+	0x1715, 0x171f,
+	0x1737, 0x173f,
+	0x1754, 0x175f,
+	0x176d, 0x176d,
+	0x1771, 0x1771,
+	0x1774, 0x177f,
+	0x17de, 0x17df,
+	0x17ea, 0x17ef,
+	0x17fa, 0x17ff,
+	0x180e, 0x180f,
+	0x181a, 0x181f,
+	0x1879, 0x187f,
+	0x18ab, 0x18af,
+	0x18f6, 0x18ff,
+	0x191f, 0x191f,
+	0x192c, 0x192f,
+	0x193c, 0x193f,
+	0x1941, 0x1943,
+	0x196e, 0x196f,
+	0x1975, 0x197f,
+	0x19ac, 0x19af,
+	0x19ca, 0x19cf,
+	0x19db, 0x19dd,
+	0x1a1c, 0x1a1d,
+	0x1a5f, 0x1a5f,
+	0x1a7d, 0x1a7e,
+	0x1a8a, 0x1a8f,
+	0x1a9a, 0x1a9f,
+	0x1aae, 0x1aaf,
+	0x1abf, 0x1aff,
+	0x1b4c, 0x1b4f,
+	0x1b7d, 0x1b7f,
+	0x1bf4, 0x1bfb,
+	0x1c38, 0x1c3a,
+	0x1c4a, 0x1c4c,
+	0x1c89, 0x1c8f,
+	0x1cbb, 0x1cbc,
+	0x1cc8, 0x1ccf,
+	0x1cfb, 0x1cff,
+	0x1dfa, 0x1dfa,
+	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,
+	0x209d, 0x209f,
+	0x20c0, 0x20cf,
+	0x20f1, 0x20ff,
+	0x218c, 0x218f,
+	0x2427, 0x243f,
+	0x244b, 0x245f,
+	0x2b74, 0x2b75,
+	0x2b96, 0x2b97,
+	0x2c2f, 0x2c2f,
+	0x2c5f, 0x2c5f,
+	0x2cf4, 0x2cf8,
+	0x2d26, 0x2d26,
+	0x2d28, 0x2d2c,
+	0x2d2e, 0x2d2f,
+	0x2d68, 0x2d6e,
+	0x2d71, 0x2d7e,
+	0x2d97, 0x2d9f,
+	0x2da7, 0x2da7,
+	0x2daf, 0x2daf,
+	0x2db7, 0x2db7,
+	0x2dbf, 0x2dbf,
+	0x2dc7, 0x2dc7,
+	0x2dcf, 0x2dcf,
+	0x2dd7, 0x2dd7,
+	0x2ddf, 0x2ddf,
+	0x2e50, 0x2e7f,
+	0x2e9a, 0x2e9a,
+	0x2ef4, 0x2eff,
+	0x2fd6, 0x2fef,
+	0x2ffc, 0x2fff,
+	0x3040, 0x3040,
+	0x3097, 0x3098,
+	0x3100, 0x3104,
+	0x3130, 0x3130,
+	0x318f, 0x318f,
+	0x31bb, 0x31bf,
+	0x31e4, 0x31ef,
+	0x321f, 0x321f,
+	0x4db6, 0x4dbf,
+	0x9ff0, 0x9fff,
+	0xa48d, 0xa48f,
+	0xa4c7, 0xa4cf,
+	0xa62c, 0xa63f,
+	0xa6f8, 0xa6ff,
+	0xa7c0, 0xa7c1,
+	0xa7c7, 0xa7f6,
+	0xa82c, 0xa82f,
+	0xa83a, 0xa83f,
+	0xa878, 0xa87f,
+	0xa8c6, 0xa8cd,
+	0xa8da, 0xa8df,
+	0xa954, 0xa95e,
+	0xa97d, 0xa97f,
+	0xa9ce, 0xa9ce,
+	0xa9da, 0xa9dd,
+	0xa9ff, 0xa9ff,
+	0xaa37, 0xaa3f,
+	0xaa4e, 0xaa4f,
+	0xaa5a, 0xaa5b,
+	0xaac3, 0xaada,
+	0xaaf7, 0xab00,
+	0xab07, 0xab08,
+	0xab0f, 0xab10,
+	0xab17, 0xab1f,
+	0xab27, 0xab27,
+	0xab2f, 0xab2f,
+	0xab68, 0xab6f,
+	0xabee, 0xabef,
+	0xabfa, 0xabff,
+	0xd7a4, 0xd7af,
+	0xd7c7, 0xd7ca,
+	0xd7fc, 0xf8ff,
+	0xfa6e, 0xfa6f,
+	0xfada, 0xfaff,
+	0xfb07, 0xfb12,
+	0xfb18, 0xfb1c,
+	0xfb37, 0xfb37,
+	0xfb3d, 0xfb3d,
+	0xfb3f, 0xfb3f,
+	0xfb42, 0xfb42,
+	0xfb45, 0xfb45,
+	0xfbc2, 0xfbd2,
+	0xfd40, 0xfd4f,
+	0xfd90, 0xfd91,
+	0xfdc8, 0xfdef,
+	0xfdfe, 0xfdff,
+	0xfe1a, 0xfe1f,
+	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,
+	0x1018f, 0x1018f,
+	0x1019c, 0x1019f,
+	0x101a1, 0x101cf,
+	0x101fe, 0x1027f,
+	0x1029d, 0x1029f,
+	0x102d1, 0x102df,
+	0x102fc, 0x102ff,
+	0x10324, 0x1032c,
+	0x1034b, 0x1034f,
+	0x1037b, 0x1037f,
+	0x1039e, 0x1039e,
+	0x103c4, 0x103c7,
+	0x103d6, 0x103ff,
+	0x1049e, 0x1049f,
+	0x104aa, 0x104af,
+	0x104d4, 0x104d7,
+	0x104fc, 0x104ff,
+	0x10528, 0x1052f,
+	0x10564, 0x1056e,
+	0x10570, 0x105ff,
+	0x10737, 0x1073f,
+	0x10756, 0x1075f,
+	0x10768, 0x107ff,
+	0x10806, 0x10807,
+	0x10809, 0x10809,
+	0x10836, 0x10836,
+	0x10839, 0x1083b,
+	0x1083d, 0x1083e,
+	0x10856, 0x10856,
+	0x1089f, 0x108a6,
+	0x108b0, 0x108df,
+	0x108f3, 0x108f3,
+	0x108f6, 0x108fa,
+	0x1091c, 0x1091e,
+	0x1093a, 0x1093e,
+	0x10940, 0x1097f,
+	0x109b8, 0x109bb,
+	0x109d0, 0x109d1,
+	0x10a04, 0x10a04,
+	0x10a07, 0x10a0b,
+	0x10a14, 0x10a14,
+	0x10a18, 0x10a18,
+	0x10a36, 0x10a37,
+	0x10a3b, 0x10a3e,
+	0x10a49, 0x10a4f,
+	0x10a59, 0x10a5f,
+	0x10aa0, 0x10abf,
+	0x10ae7, 0x10aea,
+	0x10af7, 0x10aff,
+	0x10b36, 0x10b38,
+	0x10b56, 0x10b57,
+	0x10b73, 0x10b77,
+	0x10b92, 0x10b98,
+	0x10b9d, 0x10ba8,
+	0x10bb0, 0x10bff,
+	0x10c49, 0x10c7f,
+	0x10cb3, 0x10cbf,
+	0x10cf3, 0x10cf9,
+	0x10d28, 0x10d2f,
+	0x10d3a, 0x10e5f,
+	0x10e7f, 0x10eff,
+	0x10f28, 0x10f2f,
+	0x10f5a, 0x10fdf,
+	0x10ff7, 0x10fff,
+	0x1104e, 0x11051,
+	0x11070, 0x1107e,
+	0x110bd, 0x110bd,
+	0x110c2, 0x110cf,
+	0x110e9, 0x110ef,
+	0x110fa, 0x110ff,
+	0x11135, 0x11135,
+	0x11147, 0x1114f,
+	0x11177, 0x1117f,
+	0x111ce, 0x111cf,
+	0x111e0, 0x111e0,
+	0x111f5, 0x111ff,
+	0x11212, 0x11212,
+	0x1123f, 0x1127f,
+	0x11287, 0x11287,
+	0x11289, 0x11289,
+	0x1128e, 0x1128e,
+	0x1129e, 0x1129e,
+	0x112aa, 0x112af,
+	0x112eb, 0x112ef,
+	0x112fa, 0x112ff,
+	0x11304, 0x11304,
+	0x1130d, 0x1130e,
+	0x11311, 0x11312,
+	0x11329, 0x11329,
+	0x11331, 0x11331,
+	0x11334, 0x11334,
+	0x1133a, 0x1133a,
+	0x11345, 0x11346,
+	0x11349, 0x1134a,
+	0x1134e, 0x1134f,
+	0x11351, 0x11356,
+	0x11358, 0x1135c,
+	0x11364, 0x11365,
+	0x1136d, 0x1136f,
+	0x11375, 0x113ff,
+	0x1145a, 0x1145a,
+	0x1145c, 0x1145c,
+	0x11460, 0x1147f,
+	0x114c8, 0x114cf,
+	0x114da, 0x1157f,
+	0x115b6, 0x115b7,
+	0x115de, 0x115ff,
+	0x11645, 0x1164f,
+	0x1165a, 0x1165f,
+	0x1166d, 0x1167f,
+	0x116b9, 0x116bf,
+	0x116ca, 0x116ff,
+	0x1171b, 0x1171c,
+	0x1172c, 0x1172f,
+	0x11740, 0x117ff,
+	0x1183c, 0x1189f,
+	0x118f3, 0x118fe,
+	0x11900, 0x1199f,
+	0x119a8, 0x119a9,
+	0x119d8, 0x119d9,
+	0x119e5, 0x119ff,
+	0x11a48, 0x11a4f,
+	0x11aa3, 0x11abf,
+	0x11af9, 0x11bff,
+	0x11c09, 0x11c09,
+	0x11c37, 0x11c37,
+	0x11c46, 0x11c4f,
+	0x11c6d, 0x11c6f,
+	0x11c90, 0x11c91,
+	0x11ca8, 0x11ca8,
+	0x11cb7, 0x11cff,
+	0x11d07, 0x11d07,
+	0x11d0a, 0x11d0a,
+	0x11d37, 0x11d39,
+	0x11d3b, 0x11d3b,
+	0x11d3e, 0x11d3e,
+	0x11d48, 0x11d4f,
+	0x11d5a, 0x11d5f,
+	0x11d66, 0x11d66,
+	0x11d69, 0x11d69,
+	0x11d8f, 0x11d8f,
+	0x11d92, 0x11d92,
+	0x11d99, 0x11d9f,
+	0x11daa, 0x11edf,
+	0x11ef9, 0x11fbf,
+	0x11ff2, 0x11ffe,
+	0x1239a, 0x123ff,
+	0x1246f, 0x1246f,
+	0x12475, 0x1247f,
+	0x12544, 0x12fff,
+	0x1342f, 0x143ff,
+	0x14647, 0x167ff,
+	0x16a39, 0x16a3f,
+	0x16a5f, 0x16a5f,
+	0x16a6a, 0x16a6d,
+	0x16a70, 0x16acf,
+	0x16aee, 0x16aef,
+	0x16af6, 0x16aff,
+	0x16b46, 0x16b4f,
+	0x16b5a, 0x16b5a,
+	0x16b62, 0x16b62,
+	0x16b78, 0x16b7c,
+	0x16b90, 0x16e3f,
+	0x16e9b, 0x16eff,
+	0x16f4b, 0x16f4e,
+	0x16f88, 0x16f8e,
+	0x16fa0, 0x16fdf,
+	0x16fe4, 0x16fff,
+	0x187f8, 0x187ff,
+	0x18af3, 0x1afff,
+	0x1b11f, 0x1b14f,
+	0x1b153, 0x1b163,
+	0x1b168, 0x1b16f,
+	0x1b2fc, 0x1bbff,
+	0x1bc6b, 0x1bc6f,
+	0x1bc7d, 0x1bc7f,
+	0x1bc89, 0x1bc8f,
+	0x1bc9a, 0x1bc9b,
+	0x1bca0, 0x1cfff,
+	0x1d0f6, 0x1d0ff,
+	0x1d127, 0x1d128,
+	0x1d173, 0x1d17a,
+	0x1d1e9, 0x1d1ff,
+	0x1d246, 0x1d2df,
+	0x1d2f4, 0x1d2ff,
+	0x1d357, 0x1d35f,
+	0x1d379, 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,
+	0x1d7cc, 0x1d7cd,
+	0x1da8c, 0x1da9a,
+	0x1daa0, 0x1daa0,
+	0x1dab0, 0x1dfff,
+	0x1e007, 0x1e007,
+	0x1e019, 0x1e01a,
+	0x1e022, 0x1e022,
+	0x1e025, 0x1e025,
+	0x1e02b, 0x1e0ff,
+	0x1e12d, 0x1e12f,
+	0x1e13e, 0x1e13f,
+	0x1e14a, 0x1e14d,
+	0x1e150, 0x1e2bf,
+	0x1e2fa, 0x1e2fe,
+	0x1e300, 0x1e7ff,
+	0x1e8c5, 0x1e8c6,
+	0x1e8d7, 0x1e8ff,
+	0x1e94c, 0x1e94f,
+	0x1e95a, 0x1e95d,
+	0x1e960, 0x1ec70,
+	0x1ecb5, 0x1ed00,
+	0x1ed3e, 0x1edff,
+	0x1ee04, 0x1ee04,
+	0x1ee20, 0x1ee20,
+	0x1ee23, 0x1ee23,
+	0x1ee25, 0x1ee26,
+	0x1ee28, 0x1ee28,
+	0x1ee33, 0x1ee33,
+	0x1ee38, 0x1ee38,
+	0x1ee3a, 0x1ee3a,
+	0x1ee3c, 0x1ee41,
+	0x1ee43, 0x1ee46,
+	0x1ee48, 0x1ee48,
+	0x1ee4a, 0x1ee4a,
+	0x1ee4c, 0x1ee4c,
+	0x1ee50, 0x1ee50,
+	0x1ee53, 0x1ee53,
+	0x1ee55, 0x1ee56,
+	0x1ee58, 0x1ee58,
+	0x1ee5a, 0x1ee5a,
+	0x1ee5c, 0x1ee5c,
+	0x1ee5e, 0x1ee5e,
+	0x1ee60, 0x1ee60,
+	0x1ee63, 0x1ee63,
+	0x1ee65, 0x1ee66,
+	0x1ee6b, 0x1ee6b,
+	0x1ee73, 0x1ee73,
+	0x1ee78, 0x1ee78,
+	0x1ee7d, 0x1ee7d,
+	0x1ee7f, 0x1ee7f,
+	0x1ee8a, 0x1ee8a,
+	0x1ee9c, 0x1eea0,
+	0x1eea4, 0x1eea4,
+	0x1eeaa, 0x1eeaa,
+	0x1eebc, 0x1eeef,
+	0x1eef2, 0x1efff,
+	0x1f02c, 0x1f02f,
+	0x1f094, 0x1f09f,
+	0x1f0af, 0x1f0b0,
+	0x1f0c0, 0x1f0c0,
+	0x1f0d0, 0x1f0d0,
+	0x1f0f6, 0x1f0ff,
+	0x1f10d, 0x1f10f,
+	0x1f16d, 0x1f16f,
+	0x1f1ad, 0x1f1e5,
+	0x1f203, 0x1f20f,
+	0x1f23c, 0x1f23f,
+	0x1f249, 0x1f24f,
+	0x1f252, 0x1f25f,
+	0x1f266, 0x1f2ff,
+	0x1f6d6, 0x1f6df,
+	0x1f6ed, 0x1f6ef,
+	0x1f6fb, 0x1f6ff,
+	0x1f774, 0x1f77f,
+	0x1f7d9, 0x1f7df,
+	0x1f7ec, 0x1f7ff,
+	0x1f80c, 0x1f80f,
+	0x1f848, 0x1f84f,
+	0x1f85a, 0x1f85f,
+	0x1f888, 0x1f88f,
+	0x1f8ae, 0x1f8ff,
+	0x1f90c, 0x1f90c,
+	0x1f972, 0x1f972,
+	0x1f977, 0x1f979,
+	0x1f9a3, 0x1f9a4,
+	0x1f9ab, 0x1f9ad,
+	0x1f9cb, 0x1f9cc,
+	0x1fa54, 0x1fa5f,
+	0x1fa6e, 0x1fa6f,
+	0x1fa74, 0x1fa77,
+	0x1fa7b, 0x1fa7f,
+	0x1fa83, 0x1fa8f,
+	0x1fa96, 0x1ffff,
+	0x2a6d7, 0x2a6ff,
+	0x2b735, 0x2b73f,
+	0x2b81e, 0x2b81f,
+	0x2cea2, 0x2ceaf,
+	0x2ebe1, 0x2f7ff,
+	0x2fa1e, 0xe00ff,
+	0xe01f0, 0x10ffff,
+}; /* CR_C */
+
+/* 'Cc': General Category */
+#define CR_Cc CR_Cntrl
+
+/* 'Cf': General Category */
+static const OnigCodePoint CR_Cf[] = {
+	20,
+	0x00ad, 0x00ad,
+	0x0600, 0x0605,
+	0x061c, 0x061c,
+	0x06dd, 0x06dd,
+	0x070f, 0x070f,
+	0x08e2, 0x08e2,
+	0x180e, 0x180e,
+	0x200b, 0x200f,
+	0x202a, 0x202e,
+	0x2060, 0x2064,
+	0x2066, 0x206f,
+	0xfeff, 0xfeff,
+	0xfff9, 0xfffb,
+	0x110bd, 0x110bd,
+	0x110cd, 0x110cd,
+	0x13430, 0x13438,
+	0x1bca0, 0x1bca3,
+	0x1d173, 0x1d17a,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+}; /* CR_Cf */
+
+/* 'Cn': General Category */
+static const OnigCodePoint CR_Cn[] = {
+	666,
+	0x0378, 0x0379,
+	0x0380, 0x0383,
+	0x038b, 0x038b,
+	0x038d, 0x038d,
+	0x03a2, 0x03a2,
+	0x0530, 0x0530,
+	0x0557, 0x0558,
+	0x058b, 0x058c,
+	0x0590, 0x0590,
+	0x05c8, 0x05cf,
+	0x05eb, 0x05ee,
+	0x05f5, 0x05ff,
+	0x061d, 0x061d,
+	0x070e, 0x070e,
+	0x074b, 0x074c,
+	0x07b2, 0x07bf,
+	0x07fb, 0x07fc,
+	0x082e, 0x082f,
+	0x083f, 0x083f,
+	0x085c, 0x085d,
+	0x085f, 0x085f,
+	0x086b, 0x089f,
+	0x08b5, 0x08b5,
+	0x08be, 0x08d2,
+	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,
+	0x09ff, 0x0a00,
+	0x0a04, 0x0a04,
+	0x0a0b, 0x0a0e,
+	0x0a11, 0x0a12,
+	0x0a29, 0x0a29,
+	0x0a31, 0x0a31,
+	0x0a34, 0x0a34,
+	0x0a37, 0x0a37,
+	0x0a3a, 0x0a3b,
+	0x0a3d, 0x0a3d,
+	0x0a43, 0x0a46,
+	0x0a49, 0x0a4a,
+	0x0a4e, 0x0a50,
+	0x0a52, 0x0a58,
+	0x0a5d, 0x0a5d,
+	0x0a5f, 0x0a65,
+	0x0a77, 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,
+	0x0af2, 0x0af8,
+	0x0b00, 0x0b00,
+	0x0b04, 0x0b04,
+	0x0b0d, 0x0b0e,
+	0x0b11, 0x0b12,
+	0x0b29, 0x0b29,
+	0x0b31, 0x0b31,
+	0x0b34, 0x0b34,
+	0x0b3a, 0x0b3b,
+	0x0b45, 0x0b46,
+	0x0b49, 0x0b4a,
+	0x0b4e, 0x0b55,
+	0x0b58, 0x0b5b,
+	0x0b5e, 0x0b5e,
+	0x0b64, 0x0b65,
+	0x0b78, 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, 0x0bcf,
+	0x0bd1, 0x0bd6,
+	0x0bd8, 0x0be5,
+	0x0bfb, 0x0bff,
+	0x0c0d, 0x0c0d,
+	0x0c11, 0x0c11,
+	0x0c29, 0x0c29,
+	0x0c3a, 0x0c3c,
+	0x0c45, 0x0c45,
+	0x0c49, 0x0c49,
+	0x0c4e, 0x0c54,
+	0x0c57, 0x0c57,
+	0x0c5b, 0x0c5f,
+	0x0c64, 0x0c65,
+	0x0c70, 0x0c76,
+	0x0c8d, 0x0c8d,
+	0x0c91, 0x0c91,
+	0x0ca9, 0x0ca9,
+	0x0cb4, 0x0cb4,
+	0x0cba, 0x0cbb,
+	0x0cc5, 0x0cc5,
+	0x0cc9, 0x0cc9,
+	0x0cce, 0x0cd4,
+	0x0cd7, 0x0cdd,
+	0x0cdf, 0x0cdf,
+	0x0ce4, 0x0ce5,
+	0x0cf0, 0x0cf0,
+	0x0cf3, 0x0cff,
+	0x0d04, 0x0d04,
+	0x0d0d, 0x0d0d,
+	0x0d11, 0x0d11,
+	0x0d45, 0x0d45,
+	0x0d49, 0x0d49,
+	0x0d50, 0x0d53,
+	0x0d64, 0x0d65,
+	0x0d80, 0x0d81,
+	0x0d84, 0x0d84,
+	0x0d97, 0x0d99,
+	0x0db2, 0x0db2,
+	0x0dbc, 0x0dbc,
+	0x0dbe, 0x0dbf,
+	0x0dc7, 0x0dc9,
+	0x0dcb, 0x0dce,
+	0x0dd5, 0x0dd5,
+	0x0dd7, 0x0dd7,
+	0x0de0, 0x0de5,
+	0x0df0, 0x0df1,
+	0x0df5, 0x0e00,
+	0x0e3b, 0x0e3e,
+	0x0e5c, 0x0e80,
+	0x0e83, 0x0e83,
+	0x0e85, 0x0e85,
+	0x0e8b, 0x0e8b,
+	0x0ea4, 0x0ea4,
+	0x0ea6, 0x0ea6,
+	0x0ebe, 0x0ebf,
+	0x0ec5, 0x0ec5,
+	0x0ec7, 0x0ec7,
+	0x0ece, 0x0ecf,
+	0x0eda, 0x0edb,
+	0x0ee0, 0x0eff,
+	0x0f48, 0x0f48,
+	0x0f6d, 0x0f70,
+	0x0f98, 0x0f98,
+	0x0fbd, 0x0fbd,
+	0x0fcd, 0x0fcd,
+	0x0fdb, 0x0fff,
+	0x10c6, 0x10c6,
+	0x10c8, 0x10cc,
+	0x10ce, 0x10cf,
+	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, 0x135c,
+	0x137d, 0x137f,
+	0x139a, 0x139f,
+	0x13f6, 0x13f7,
+	0x13fe, 0x13ff,
+	0x169d, 0x169f,
+	0x16f9, 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,
+	0x1879, 0x187f,
+	0x18ab, 0x18af,
+	0x18f6, 0x18ff,
+	0x191f, 0x191f,
+	0x192c, 0x192f,
+	0x193c, 0x193f,
+	0x1941, 0x1943,
+	0x196e, 0x196f,
+	0x1975, 0x197f,
+	0x19ac, 0x19af,
+	0x19ca, 0x19cf,
+	0x19db, 0x19dd,
+	0x1a1c, 0x1a1d,
+	0x1a5f, 0x1a5f,
+	0x1a7d, 0x1a7e,
+	0x1a8a, 0x1a8f,
+	0x1a9a, 0x1a9f,
+	0x1aae, 0x1aaf,
+	0x1abf, 0x1aff,
+	0x1b4c, 0x1b4f,
+	0x1b7d, 0x1b7f,
+	0x1bf4, 0x1bfb,
+	0x1c38, 0x1c3a,
+	0x1c4a, 0x1c4c,
+	0x1c89, 0x1c8f,
+	0x1cbb, 0x1cbc,
+	0x1cc8, 0x1ccf,
+	0x1cfb, 0x1cff,
+	0x1dfa, 0x1dfa,
+	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,
+	0x2065, 0x2065,
+	0x2072, 0x2073,
+	0x208f, 0x208f,
+	0x209d, 0x209f,
+	0x20c0, 0x20cf,
+	0x20f1, 0x20ff,
+	0x218c, 0x218f,
+	0x2427, 0x243f,
+	0x244b, 0x245f,
+	0x2b74, 0x2b75,
+	0x2b96, 0x2b97,
+	0x2c2f, 0x2c2f,
+	0x2c5f, 0x2c5f,
+	0x2cf4, 0x2cf8,
+	0x2d26, 0x2d26,
+	0x2d28, 0x2d2c,
+	0x2d2e, 0x2d2f,
+	0x2d68, 0x2d6e,
+	0x2d71, 0x2d7e,
+	0x2d97, 0x2d9f,
+	0x2da7, 0x2da7,
+	0x2daf, 0x2daf,
+	0x2db7, 0x2db7,
+	0x2dbf, 0x2dbf,
+	0x2dc7, 0x2dc7,
+	0x2dcf, 0x2dcf,
+	0x2dd7, 0x2dd7,
+	0x2ddf, 0x2ddf,
+	0x2e50, 0x2e7f,
+	0x2e9a, 0x2e9a,
+	0x2ef4, 0x2eff,
+	0x2fd6, 0x2fef,
+	0x2ffc, 0x2fff,
+	0x3040, 0x3040,
+	0x3097, 0x3098,
+	0x3100, 0x3104,
+	0x3130, 0x3130,
+	0x318f, 0x318f,
+	0x31bb, 0x31bf,
+	0x31e4, 0x31ef,
+	0x321f, 0x321f,
+	0x4db6, 0x4dbf,
+	0x9ff0, 0x9fff,
+	0xa48d, 0xa48f,
+	0xa4c7, 0xa4cf,
+	0xa62c, 0xa63f,
+	0xa6f8, 0xa6ff,
+	0xa7c0, 0xa7c1,
+	0xa7c7, 0xa7f6,
+	0xa82c, 0xa82f,
+	0xa83a, 0xa83f,
+	0xa878, 0xa87f,
+	0xa8c6, 0xa8cd,
+	0xa8da, 0xa8df,
+	0xa954, 0xa95e,
+	0xa97d, 0xa97f,
+	0xa9ce, 0xa9ce,
+	0xa9da, 0xa9dd,
+	0xa9ff, 0xa9ff,
+	0xaa37, 0xaa3f,
+	0xaa4e, 0xaa4f,
+	0xaa5a, 0xaa5b,
+	0xaac3, 0xaada,
+	0xaaf7, 0xab00,
+	0xab07, 0xab08,
+	0xab0f, 0xab10,
+	0xab17, 0xab1f,
+	0xab27, 0xab27,
+	0xab2f, 0xab2f,
+	0xab68, 0xab6f,
+	0xabee, 0xabef,
+	0xabfa, 0xabff,
+	0xd7a4, 0xd7af,
+	0xd7c7, 0xd7ca,
+	0xd7fc, 0xd7ff,
+	0xfa6e, 0xfa6f,
+	0xfada, 0xfaff,
+	0xfb07, 0xfb12,
+	0xfb18, 0xfb1c,
+	0xfb37, 0xfb37,
+	0xfb3d, 0xfb3d,
+	0xfb3f, 0xfb3f,
+	0xfb42, 0xfb42,
+	0xfb45, 0xfb45,
+	0xfbc2, 0xfbd2,
+	0xfd40, 0xfd4f,
+	0xfd90, 0xfd91,
+	0xfdc8, 0xfdef,
+	0xfdfe, 0xfdff,
+	0xfe1a, 0xfe1f,
+	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,
+	0x1018f, 0x1018f,
+	0x1019c, 0x1019f,
+	0x101a1, 0x101cf,
+	0x101fe, 0x1027f,
+	0x1029d, 0x1029f,
+	0x102d1, 0x102df,
+	0x102fc, 0x102ff,
+	0x10324, 0x1032c,
+	0x1034b, 0x1034f,
+	0x1037b, 0x1037f,
+	0x1039e, 0x1039e,
+	0x103c4, 0x103c7,
+	0x103d6, 0x103ff,
+	0x1049e, 0x1049f,
+	0x104aa, 0x104af,
+	0x104d4, 0x104d7,
+	0x104fc, 0x104ff,
+	0x10528, 0x1052f,
+	0x10564, 0x1056e,
+	0x10570, 0x105ff,
+	0x10737, 0x1073f,
+	0x10756, 0x1075f,
+	0x10768, 0x107ff,
+	0x10806, 0x10807,
+	0x10809, 0x10809,
+	0x10836, 0x10836,
+	0x10839, 0x1083b,
+	0x1083d, 0x1083e,
+	0x10856, 0x10856,
+	0x1089f, 0x108a6,
+	0x108b0, 0x108df,
+	0x108f3, 0x108f3,
+	0x108f6, 0x108fa,
+	0x1091c, 0x1091e,
+	0x1093a, 0x1093e,
+	0x10940, 0x1097f,
+	0x109b8, 0x109bb,
+	0x109d0, 0x109d1,
+	0x10a04, 0x10a04,
+	0x10a07, 0x10a0b,
+	0x10a14, 0x10a14,
+	0x10a18, 0x10a18,
+	0x10a36, 0x10a37,
+	0x10a3b, 0x10a3e,
+	0x10a49, 0x10a4f,
+	0x10a59, 0x10a5f,
+	0x10aa0, 0x10abf,
+	0x10ae7, 0x10aea,
+	0x10af7, 0x10aff,
+	0x10b36, 0x10b38,
+	0x10b56, 0x10b57,
+	0x10b73, 0x10b77,
+	0x10b92, 0x10b98,
+	0x10b9d, 0x10ba8,
+	0x10bb0, 0x10bff,
+	0x10c49, 0x10c7f,
+	0x10cb3, 0x10cbf,
+	0x10cf3, 0x10cf9,
+	0x10d28, 0x10d2f,
+	0x10d3a, 0x10e5f,
+	0x10e7f, 0x10eff,
+	0x10f28, 0x10f2f,
+	0x10f5a, 0x10fdf,
+	0x10ff7, 0x10fff,
+	0x1104e, 0x11051,
+	0x11070, 0x1107e,
+	0x110c2, 0x110cc,
+	0x110ce, 0x110cf,
+	0x110e9, 0x110ef,
+	0x110fa, 0x110ff,
+	0x11135, 0x11135,
+	0x11147, 0x1114f,
+	0x11177, 0x1117f,
+	0x111ce, 0x111cf,
+	0x111e0, 0x111e0,
+	0x111f5, 0x111ff,
+	0x11212, 0x11212,
+	0x1123f, 0x1127f,
+	0x11287, 0x11287,
+	0x11289, 0x11289,
+	0x1128e, 0x1128e,
+	0x1129e, 0x1129e,
+	0x112aa, 0x112af,
+	0x112eb, 0x112ef,
+	0x112fa, 0x112ff,
+	0x11304, 0x11304,
+	0x1130d, 0x1130e,
+	0x11311, 0x11312,
+	0x11329, 0x11329,
+	0x11331, 0x11331,
+	0x11334, 0x11334,
+	0x1133a, 0x1133a,
+	0x11345, 0x11346,
+	0x11349, 0x1134a,
+	0x1134e, 0x1134f,
+	0x11351, 0x11356,
+	0x11358, 0x1135c,
+	0x11364, 0x11365,
+	0x1136d, 0x1136f,
+	0x11375, 0x113ff,
+	0x1145a, 0x1145a,
+	0x1145c, 0x1145c,
+	0x11460, 0x1147f,
+	0x114c8, 0x114cf,
+	0x114da, 0x1157f,
+	0x115b6, 0x115b7,
+	0x115de, 0x115ff,
+	0x11645, 0x1164f,
+	0x1165a, 0x1165f,
+	0x1166d, 0x1167f,
+	0x116b9, 0x116bf,
+	0x116ca, 0x116ff,
+	0x1171b, 0x1171c,
+	0x1172c, 0x1172f,
+	0x11740, 0x117ff,
+	0x1183c, 0x1189f,
+	0x118f3, 0x118fe,
+	0x11900, 0x1199f,
+	0x119a8, 0x119a9,
+	0x119d8, 0x119d9,
+	0x119e5, 0x119ff,
+	0x11a48, 0x11a4f,
+	0x11aa3, 0x11abf,
+	0x11af9, 0x11bff,
+	0x11c09, 0x11c09,
+	0x11c37, 0x11c37,
+	0x11c46, 0x11c4f,
+	0x11c6d, 0x11c6f,
+	0x11c90, 0x11c91,
+	0x11ca8, 0x11ca8,
+	0x11cb7, 0x11cff,
+	0x11d07, 0x11d07,
+	0x11d0a, 0x11d0a,
+	0x11d37, 0x11d39,
+	0x11d3b, 0x11d3b,
+	0x11d3e, 0x11d3e,
+	0x11d48, 0x11d4f,
+	0x11d5a, 0x11d5f,
+	0x11d66, 0x11d66,
+	0x11d69, 0x11d69,
+	0x11d8f, 0x11d8f,
+	0x11d92, 0x11d92,
+	0x11d99, 0x11d9f,
+	0x11daa, 0x11edf,
+	0x11ef9, 0x11fbf,
+	0x11ff2, 0x11ffe,
+	0x1239a, 0x123ff,
+	0x1246f, 0x1246f,
+	0x12475, 0x1247f,
+	0x12544, 0x12fff,
+	0x1342f, 0x1342f,
+	0x13439, 0x143ff,
+	0x14647, 0x167ff,
+	0x16a39, 0x16a3f,
+	0x16a5f, 0x16a5f,
+	0x16a6a, 0x16a6d,
+	0x16a70, 0x16acf,
+	0x16aee, 0x16aef,
+	0x16af6, 0x16aff,
+	0x16b46, 0x16b4f,
+	0x16b5a, 0x16b5a,
+	0x16b62, 0x16b62,
+	0x16b78, 0x16b7c,
+	0x16b90, 0x16e3f,
+	0x16e9b, 0x16eff,
+	0x16f4b, 0x16f4e,
+	0x16f88, 0x16f8e,
+	0x16fa0, 0x16fdf,
+	0x16fe4, 0x16fff,
+	0x187f8, 0x187ff,
+	0x18af3, 0x1afff,
+	0x1b11f, 0x1b14f,
+	0x1b153, 0x1b163,
+	0x1b168, 0x1b16f,
+	0x1b2fc, 0x1bbff,
+	0x1bc6b, 0x1bc6f,
+	0x1bc7d, 0x1bc7f,
+	0x1bc89, 0x1bc8f,
+	0x1bc9a, 0x1bc9b,
+	0x1bca4, 0x1cfff,
+	0x1d0f6, 0x1d0ff,
+	0x1d127, 0x1d128,
+	0x1d1e9, 0x1d1ff,
+	0x1d246, 0x1d2df,
+	0x1d2f4, 0x1d2ff,
+	0x1d357, 0x1d35f,
+	0x1d379, 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,
+	0x1d7cc, 0x1d7cd,
+	0x1da8c, 0x1da9a,
+	0x1daa0, 0x1daa0,
+	0x1dab0, 0x1dfff,
+	0x1e007, 0x1e007,
+	0x1e019, 0x1e01a,
+	0x1e022, 0x1e022,
+	0x1e025, 0x1e025,
+	0x1e02b, 0x1e0ff,
+	0x1e12d, 0x1e12f,
+	0x1e13e, 0x1e13f,
+	0x1e14a, 0x1e14d,
+	0x1e150, 0x1e2bf,
+	0x1e2fa, 0x1e2fe,
+	0x1e300, 0x1e7ff,
+	0x1e8c5, 0x1e8c6,
+	0x1e8d7, 0x1e8ff,
+	0x1e94c, 0x1e94f,
+	0x1e95a, 0x1e95d,
+	0x1e960, 0x1ec70,
+	0x1ecb5, 0x1ed00,
+	0x1ed3e, 0x1edff,
+	0x1ee04, 0x1ee04,
+	0x1ee20, 0x1ee20,
+	0x1ee23, 0x1ee23,
+	0x1ee25, 0x1ee26,
+	0x1ee28, 0x1ee28,
+	0x1ee33, 0x1ee33,
+	0x1ee38, 0x1ee38,
+	0x1ee3a, 0x1ee3a,
+	0x1ee3c, 0x1ee41,
+	0x1ee43, 0x1ee46,
+	0x1ee48, 0x1ee48,
+	0x1ee4a, 0x1ee4a,
+	0x1ee4c, 0x1ee4c,
+	0x1ee50, 0x1ee50,
+	0x1ee53, 0x1ee53,
+	0x1ee55, 0x1ee56,
+	0x1ee58, 0x1ee58,
+	0x1ee5a, 0x1ee5a,
+	0x1ee5c, 0x1ee5c,
+	0x1ee5e, 0x1ee5e,
+	0x1ee60, 0x1ee60,
+	0x1ee63, 0x1ee63,
+	0x1ee65, 0x1ee66,
+	0x1ee6b, 0x1ee6b,
+	0x1ee73, 0x1ee73,
+	0x1ee78, 0x1ee78,
+	0x1ee7d, 0x1ee7d,
+	0x1ee7f, 0x1ee7f,
+	0x1ee8a, 0x1ee8a,
+	0x1ee9c, 0x1eea0,
+	0x1eea4, 0x1eea4,
+	0x1eeaa, 0x1eeaa,
+	0x1eebc, 0x1eeef,
+	0x1eef2, 0x1efff,
+	0x1f02c, 0x1f02f,
+	0x1f094, 0x1f09f,
+	0x1f0af, 0x1f0b0,
+	0x1f0c0, 0x1f0c0,
+	0x1f0d0, 0x1f0d0,
+	0x1f0f6, 0x1f0ff,
+	0x1f10d, 0x1f10f,
+	0x1f16d, 0x1f16f,
+	0x1f1ad, 0x1f1e5,
+	0x1f203, 0x1f20f,
+	0x1f23c, 0x1f23f,
+	0x1f249, 0x1f24f,
+	0x1f252, 0x1f25f,
+	0x1f266, 0x1f2ff,
+	0x1f6d6, 0x1f6df,
+	0x1f6ed, 0x1f6ef,
+	0x1f6fb, 0x1f6ff,
+	0x1f774, 0x1f77f,
+	0x1f7d9, 0x1f7df,
+	0x1f7ec, 0x1f7ff,
+	0x1f80c, 0x1f80f,
+	0x1f848, 0x1f84f,
+	0x1f85a, 0x1f85f,
+	0x1f888, 0x1f88f,
+	0x1f8ae, 0x1f8ff,
+	0x1f90c, 0x1f90c,
+	0x1f972, 0x1f972,
+	0x1f977, 0x1f979,
+	0x1f9a3, 0x1f9a4,
+	0x1f9ab, 0x1f9ad,
+	0x1f9cb, 0x1f9cc,
+	0x1fa54, 0x1fa5f,
+	0x1fa6e, 0x1fa6f,
+	0x1fa74, 0x1fa77,
+	0x1fa7b, 0x1fa7f,
+	0x1fa83, 0x1fa8f,
+	0x1fa96, 0x1ffff,
+	0x2a6d7, 0x2a6ff,
+	0x2b735, 0x2b73f,
+	0x2b81e, 0x2b81f,
+	0x2cea2, 0x2ceaf,
+	0x2ebe1, 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[] = {
+	609,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0370, 0x0374,
+	0x0376, 0x0377,
+	0x037a, 0x037d,
+	0x037f, 0x037f,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x048a, 0x052f,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0560, 0x0588,
+	0x05d0, 0x05ea,
+	0x05ef, 0x05f2,
+	0x0620, 0x064a,
+	0x066e, 0x066f,
+	0x0671, 0x06d3,
+	0x06d5, 0x06d5,
+	0x06e5, 0x06e6,
+	0x06ee, 0x06ef,
+	0x06fa, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x0710,
+	0x0712, 0x072f,
+	0x074d, 0x07a5,
+	0x07b1, 0x07b1,
+	0x07ca, 0x07ea,
+	0x07f4, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x0815,
+	0x081a, 0x081a,
+	0x0824, 0x0824,
+	0x0828, 0x0828,
+	0x0840, 0x0858,
+	0x0860, 0x086a,
+	0x08a0, 0x08b4,
+	0x08b6, 0x08bd,
+	0x0904, 0x0939,
+	0x093d, 0x093d,
+	0x0950, 0x0950,
+	0x0958, 0x0961,
+	0x0971, 0x0980,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bd, 0x09bd,
+	0x09ce, 0x09ce,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e1,
+	0x09f0, 0x09f1,
+	0x09fc, 0x09fc,
+	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,
+	0x0af9, 0x0af9,
+	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,
+	0x0bd0, 0x0bd0,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c39,
+	0x0c3d, 0x0c3d,
+	0x0c58, 0x0c5a,
+	0x0c60, 0x0c61,
+	0x0c80, 0x0c80,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbd, 0x0cbd,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0cf1, 0x0cf2,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d3d,
+	0x0d4e, 0x0d4e,
+	0x0d54, 0x0d56,
+	0x0d5f, 0x0d61,
+	0x0d7a, 0x0d7f,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0e01, 0x0e30,
+	0x0e32, 0x0e33,
+	0x0e40, 0x0e46,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e86, 0x0e8a,
+	0x0e8c, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0eb0,
+	0x0eb2, 0x0eb3,
+	0x0ebd, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0edc, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f88, 0x0f8c,
+	0x1000, 0x102a,
+	0x103f, 0x103f,
+	0x1050, 0x1055,
+	0x105a, 0x105d,
+	0x1061, 0x1061,
+	0x1065, 0x1066,
+	0x106e, 0x1070,
+	0x1075, 0x1081,
+	0x108e, 0x108e,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 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, 0x13f5,
+	0x13f8, 0x13fd,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x16f1, 0x16f8,
+	0x1700, 0x170c,
+	0x170e, 0x1711,
+	0x1720, 0x1731,
+	0x1740, 0x1751,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1780, 0x17b3,
+	0x17d7, 0x17d7,
+	0x17dc, 0x17dc,
+	0x1820, 0x1878,
+	0x1880, 0x1884,
+	0x1887, 0x18a8,
+	0x18aa, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191e,
+	0x1950, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x1a00, 0x1a16,
+	0x1a20, 0x1a54,
+	0x1aa7, 0x1aa7,
+	0x1b05, 0x1b33,
+	0x1b45, 0x1b4b,
+	0x1b83, 0x1ba0,
+	0x1bae, 0x1baf,
+	0x1bba, 0x1be5,
+	0x1c00, 0x1c23,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c7d,
+	0x1c80, 0x1c88,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cbf,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf3,
+	0x1cf5, 0x1cf6,
+	0x1cfa, 0x1cfa,
+	0x1d00, 0x1dbf,
+	0x1e00, 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, 0x209c,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2119, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x212d,
+	0x212f, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2183, 0x2184,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cee,
+	0x2cf2, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2e2f, 0x2e2f,
+	0x3005, 0x3006,
+	0x3031, 0x3035,
+	0x303b, 0x303c,
+	0x3041, 0x3096,
+	0x309d, 0x309f,
+	0x30a1, 0x30fa,
+	0x30fc, 0x30ff,
+	0x3105, 0x312f,
+	0x3131, 0x318e,
+	0x31a0, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fef,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa640, 0xa66e,
+	0xa67f, 0xa69d,
+	0xa6a0, 0xa6e5,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa7bf,
+	0xa7c2, 0xa7c6,
+	0xa7f7, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa822,
+	0xa840, 0xa873,
+	0xa882, 0xa8b3,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa8fd, 0xa8fe,
+	0xa90a, 0xa925,
+	0xa930, 0xa946,
+	0xa960, 0xa97c,
+	0xa984, 0xa9b2,
+	0xa9cf, 0xa9cf,
+	0xa9e0, 0xa9e4,
+	0xa9e6, 0xa9ef,
+	0xa9fa, 0xa9fe,
+	0xaa00, 0xaa28,
+	0xaa40, 0xaa42,
+	0xaa44, 0xaa4b,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7a,
+	0xaa7e, 0xaaaf,
+	0xaab1, 0xaab1,
+	0xaab5, 0xaab6,
+	0xaab9, 0xaabd,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadd,
+	0xaae0, 0xaaea,
+	0xaaf2, 0xaaf4,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xab30, 0xab5a,
+	0xab5c, 0xab67,
+	0xab70, 0xabe2,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa6d,
+	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,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031f,
+	0x1032d, 0x10340,
+	0x10342, 0x10349,
+	0x10350, 0x10375,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x10400, 0x1049d,
+	0x104b0, 0x104d3,
+	0x104d8, 0x104fb,
+	0x10500, 0x10527,
+	0x10530, 0x10563,
+	0x10600, 0x10736,
+	0x10740, 0x10755,
+	0x10760, 0x10767,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10860, 0x10876,
+	0x10880, 0x1089e,
+	0x108e0, 0x108f2,
+	0x108f4, 0x108f5,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a00,
+	0x10a10, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a35,
+	0x10a60, 0x10a7c,
+	0x10a80, 0x10a9c,
+	0x10ac0, 0x10ac7,
+	0x10ac9, 0x10ae4,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10b80, 0x10b91,
+	0x10c00, 0x10c48,
+	0x10c80, 0x10cb2,
+	0x10cc0, 0x10cf2,
+	0x10d00, 0x10d23,
+	0x10f00, 0x10f1c,
+	0x10f27, 0x10f27,
+	0x10f30, 0x10f45,
+	0x10fe0, 0x10ff6,
+	0x11003, 0x11037,
+	0x11083, 0x110af,
+	0x110d0, 0x110e8,
+	0x11103, 0x11126,
+	0x11144, 0x11144,
+	0x11150, 0x11172,
+	0x11176, 0x11176,
+	0x11183, 0x111b2,
+	0x111c1, 0x111c4,
+	0x111da, 0x111da,
+	0x111dc, 0x111dc,
+	0x11200, 0x11211,
+	0x11213, 0x1122b,
+	0x11280, 0x11286,
+	0x11288, 0x11288,
+	0x1128a, 0x1128d,
+	0x1128f, 0x1129d,
+	0x1129f, 0x112a8,
+	0x112b0, 0x112de,
+	0x11305, 0x1130c,
+	0x1130f, 0x11310,
+	0x11313, 0x11328,
+	0x1132a, 0x11330,
+	0x11332, 0x11333,
+	0x11335, 0x11339,
+	0x1133d, 0x1133d,
+	0x11350, 0x11350,
+	0x1135d, 0x11361,
+	0x11400, 0x11434,
+	0x11447, 0x1144a,
+	0x1145f, 0x1145f,
+	0x11480, 0x114af,
+	0x114c4, 0x114c5,
+	0x114c7, 0x114c7,
+	0x11580, 0x115ae,
+	0x115d8, 0x115db,
+	0x11600, 0x1162f,
+	0x11644, 0x11644,
+	0x11680, 0x116aa,
+	0x116b8, 0x116b8,
+	0x11700, 0x1171a,
+	0x11800, 0x1182b,
+	0x118a0, 0x118df,
+	0x118ff, 0x118ff,
+	0x119a0, 0x119a7,
+	0x119aa, 0x119d0,
+	0x119e1, 0x119e1,
+	0x119e3, 0x119e3,
+	0x11a00, 0x11a00,
+	0x11a0b, 0x11a32,
+	0x11a3a, 0x11a3a,
+	0x11a50, 0x11a50,
+	0x11a5c, 0x11a89,
+	0x11a9d, 0x11a9d,
+	0x11ac0, 0x11af8,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c2e,
+	0x11c40, 0x11c40,
+	0x11c72, 0x11c8f,
+	0x11d00, 0x11d06,
+	0x11d08, 0x11d09,
+	0x11d0b, 0x11d30,
+	0x11d46, 0x11d46,
+	0x11d60, 0x11d65,
+	0x11d67, 0x11d68,
+	0x11d6a, 0x11d89,
+	0x11d98, 0x11d98,
+	0x11ee0, 0x11ef2,
+	0x12000, 0x12399,
+	0x12480, 0x12543,
+	0x13000, 0x1342e,
+	0x14400, 0x14646,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16ad0, 0x16aed,
+	0x16b00, 0x16b2f,
+	0x16b40, 0x16b43,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16e40, 0x16e7f,
+	0x16f00, 0x16f4a,
+	0x16f50, 0x16f50,
+	0x16f93, 0x16f9f,
+	0x16fe0, 0x16fe1,
+	0x16fe3, 0x16fe3,
+	0x17000, 0x187f7,
+	0x18800, 0x18af2,
+	0x1b000, 0x1b11e,
+	0x1b150, 0x1b152,
+	0x1b164, 0x1b167,
+	0x1b170, 0x1b2fb,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	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, 0x1d7cb,
+	0x1e100, 0x1e12c,
+	0x1e137, 0x1e13d,
+	0x1e14e, 0x1e14e,
+	0x1e2c0, 0x1e2eb,
+	0x1e800, 0x1e8c4,
+	0x1e900, 0x1e943,
+	0x1e94b, 0x1e94b,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2b820, 0x2cea1,
+	0x2ceb0, 0x2ebe0,
+	0x2f800, 0x2fa1d,
+}; /* CR_L */
+
+/* 'LC': General Category */
+static const OnigCodePoint CR_LC[] = {
+	131,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00b5, 0x00b5,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x01ba,
+	0x01bc, 0x01bf,
+	0x01c4, 0x0293,
+	0x0295, 0x02af,
+	0x0370, 0x0373,
+	0x0376, 0x0377,
+	0x037b, 0x037d,
+	0x037f, 0x037f,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x048a, 0x052f,
+	0x0531, 0x0556,
+	0x0560, 0x0588,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fd, 0x10ff,
+	0x13a0, 0x13f5,
+	0x13f8, 0x13fd,
+	0x1c80, 0x1c88,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cbf,
+	0x1d00, 0x1d2b,
+	0x1d6b, 0x1d77,
+	0x1d79, 0x1d9a,
+	0x1e00, 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,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2119, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x212d,
+	0x212f, 0x2134,
+	0x2139, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2183, 0x2184,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2c7b,
+	0x2c7e, 0x2ce4,
+	0x2ceb, 0x2cee,
+	0x2cf2, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0xa640, 0xa66d,
+	0xa680, 0xa69b,
+	0xa722, 0xa76f,
+	0xa771, 0xa787,
+	0xa78b, 0xa78e,
+	0xa790, 0xa7bf,
+	0xa7c2, 0xa7c6,
+	0xa7fa, 0xa7fa,
+	0xab30, 0xab5a,
+	0xab60, 0xab67,
+	0xab70, 0xabbf,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0x10400, 0x1044f,
+	0x104b0, 0x104d3,
+	0x104d8, 0x104fb,
+	0x10c80, 0x10cb2,
+	0x10cc0, 0x10cf2,
+	0x118a0, 0x118df,
+	0x16e40, 0x16e7f,
+	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, 0x1d7cb,
+	0x1e900, 0x1e943,
+}; /* CR_LC */
+
+/* 'Ll': General Category */
+static const OnigCodePoint CR_Ll[] = {
+	642,
+	0x0061, 0x007a,
+	0x00b5, 0x00b5,
+	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,
+	0x0242, 0x0242,
+	0x0247, 0x0247,
+	0x0249, 0x0249,
+	0x024b, 0x024b,
+	0x024d, 0x024d,
+	0x024f, 0x0293,
+	0x0295, 0x02af,
+	0x0371, 0x0371,
+	0x0373, 0x0373,
+	0x0377, 0x0377,
+	0x037b, 0x037d,
+	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, 0x04cf,
+	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,
+	0x04fb, 0x04fb,
+	0x04fd, 0x04fd,
+	0x04ff, 0x04ff,
+	0x0501, 0x0501,
+	0x0503, 0x0503,
+	0x0505, 0x0505,
+	0x0507, 0x0507,
+	0x0509, 0x0509,
+	0x050b, 0x050b,
+	0x050d, 0x050d,
+	0x050f, 0x050f,
+	0x0511, 0x0511,
+	0x0513, 0x0513,
+	0x0515, 0x0515,
+	0x0517, 0x0517,
+	0x0519, 0x0519,
+	0x051b, 0x051b,
+	0x051d, 0x051d,
+	0x051f, 0x051f,
+	0x0521, 0x0521,
+	0x0523, 0x0523,
+	0x0525, 0x0525,
+	0x0527, 0x0527,
+	0x0529, 0x0529,
+	0x052b, 0x052b,
+	0x052d, 0x052d,
+	0x052f, 0x052f,
+	0x0560, 0x0588,
+	0x10d0, 0x10fa,
+	0x10fd, 0x10ff,
+	0x13f8, 0x13fd,
+	0x1c80, 0x1c88,
+	0x1d00, 0x1d2b,
+	0x1d6b, 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, 0x1e9d,
+	0x1e9f, 0x1e9f,
+	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,
+	0x1efb, 0x1efb,
+	0x1efd, 0x1efd,
+	0x1eff, 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,
+	0x210a, 0x210a,
+	0x210e, 0x210f,
+	0x2113, 0x2113,
+	0x212f, 0x212f,
+	0x2134, 0x2134,
+	0x2139, 0x2139,
+	0x213c, 0x213d,
+	0x2146, 0x2149,
+	0x214e, 0x214e,
+	0x2184, 0x2184,
+	0x2c30, 0x2c5e,
+	0x2c61, 0x2c61,
+	0x2c65, 0x2c66,
+	0x2c68, 0x2c68,
+	0x2c6a, 0x2c6a,
+	0x2c6c, 0x2c6c,
+	0x2c71, 0x2c71,
+	0x2c73, 0x2c74,
+	0x2c76, 0x2c7b,
+	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,
+	0x2cec, 0x2cec,
+	0x2cee, 0x2cee,
+	0x2cf3, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0xa641, 0xa641,
+	0xa643, 0xa643,
+	0xa645, 0xa645,
+	0xa647, 0xa647,
+	0xa649, 0xa649,
+	0xa64b, 0xa64b,
+	0xa64d, 0xa64d,
+	0xa64f, 0xa64f,
+	0xa651, 0xa651,
+	0xa653, 0xa653,
+	0xa655, 0xa655,
+	0xa657, 0xa657,
+	0xa659, 0xa659,
+	0xa65b, 0xa65b,
+	0xa65d, 0xa65d,
+	0xa65f, 0xa65f,
+	0xa661, 0xa661,
+	0xa663, 0xa663,
+	0xa665, 0xa665,
+	0xa667, 0xa667,
+	0xa669, 0xa669,
+	0xa66b, 0xa66b,
+	0xa66d, 0xa66d,
+	0xa681, 0xa681,
+	0xa683, 0xa683,
+	0xa685, 0xa685,
+	0xa687, 0xa687,
+	0xa689, 0xa689,
+	0xa68b, 0xa68b,
+	0xa68d, 0xa68d,
+	0xa68f, 0xa68f,
+	0xa691, 0xa691,
+	0xa693, 0xa693,
+	0xa695, 0xa695,
+	0xa697, 0xa697,
+	0xa699, 0xa699,
+	0xa69b, 0xa69b,
+	0xa723, 0xa723,
+	0xa725, 0xa725,
+	0xa727, 0xa727,
+	0xa729, 0xa729,
+	0xa72b, 0xa72b,
+	0xa72d, 0xa72d,
+	0xa72f, 0xa731,
+	0xa733, 0xa733,
+	0xa735, 0xa735,
+	0xa737, 0xa737,
+	0xa739, 0xa739,
+	0xa73b, 0xa73b,
+	0xa73d, 0xa73d,
+	0xa73f, 0xa73f,
+	0xa741, 0xa741,
+	0xa743, 0xa743,
+	0xa745, 0xa745,
+	0xa747, 0xa747,
+	0xa749, 0xa749,
+	0xa74b, 0xa74b,
+	0xa74d, 0xa74d,
+	0xa74f, 0xa74f,
+	0xa751, 0xa751,
+	0xa753, 0xa753,
+	0xa755, 0xa755,
+	0xa757, 0xa757,
+	0xa759, 0xa759,
+	0xa75b, 0xa75b,
+	0xa75d, 0xa75d,
+	0xa75f, 0xa75f,
+	0xa761, 0xa761,
+	0xa763, 0xa763,
+	0xa765, 0xa765,
+	0xa767, 0xa767,
+	0xa769, 0xa769,
+	0xa76b, 0xa76b,
+	0xa76d, 0xa76d,
+	0xa76f, 0xa76f,
+	0xa771, 0xa778,
+	0xa77a, 0xa77a,
+	0xa77c, 0xa77c,
+	0xa77f, 0xa77f,
+	0xa781, 0xa781,
+	0xa783, 0xa783,
+	0xa785, 0xa785,
+	0xa787, 0xa787,
+	0xa78c, 0xa78c,
+	0xa78e, 0xa78e,
+	0xa791, 0xa791,
+	0xa793, 0xa795,
+	0xa797, 0xa797,
+	0xa799, 0xa799,
+	0xa79b, 0xa79b,
+	0xa79d, 0xa79d,
+	0xa79f, 0xa79f,
+	0xa7a1, 0xa7a1,
+	0xa7a3, 0xa7a3,
+	0xa7a5, 0xa7a5,
+	0xa7a7, 0xa7a7,
+	0xa7a9, 0xa7a9,
+	0xa7af, 0xa7af,
+	0xa7b5, 0xa7b5,
+	0xa7b7, 0xa7b7,
+	0xa7b9, 0xa7b9,
+	0xa7bb, 0xa7bb,
+	0xa7bd, 0xa7bd,
+	0xa7bf, 0xa7bf,
+	0xa7c3, 0xa7c3,
+	0xa7fa, 0xa7fa,
+	0xab30, 0xab5a,
+	0xab60, 0xab67,
+	0xab70, 0xabbf,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff41, 0xff5a,
+	0x10428, 0x1044f,
+	0x104d8, 0x104fb,
+	0x10cc0, 0x10cf2,
+	0x118c0, 0x118df,
+	0x16e60, 0x16e7f,
+	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,
+	0x1d7cb, 0x1d7cb,
+	0x1e922, 0x1e943,
+}; /* CR_Ll */
+
+/* 'Lm': General Category */
+static const OnigCodePoint CR_Lm[] = {
+	60,
+	0x02b0, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0374, 0x0374,
+	0x037a, 0x037a,
+	0x0559, 0x0559,
+	0x0640, 0x0640,
+	0x06e5, 0x06e6,
+	0x07f4, 0x07f5,
+	0x07fa, 0x07fa,
+	0x081a, 0x081a,
+	0x0824, 0x0824,
+	0x0828, 0x0828,
+	0x0971, 0x0971,
+	0x0e46, 0x0e46,
+	0x0ec6, 0x0ec6,
+	0x10fc, 0x10fc,
+	0x17d7, 0x17d7,
+	0x1843, 0x1843,
+	0x1aa7, 0x1aa7,
+	0x1c78, 0x1c7d,
+	0x1d2c, 0x1d6a,
+	0x1d78, 0x1d78,
+	0x1d9b, 0x1dbf,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x209c,
+	0x2c7c, 0x2c7d,
+	0x2d6f, 0x2d6f,
+	0x2e2f, 0x2e2f,
+	0x3005, 0x3005,
+	0x3031, 0x3035,
+	0x303b, 0x303b,
+	0x309d, 0x309e,
+	0x30fc, 0x30fe,
+	0xa015, 0xa015,
+	0xa4f8, 0xa4fd,
+	0xa60c, 0xa60c,
+	0xa67f, 0xa67f,
+	0xa69c, 0xa69d,
+	0xa717, 0xa71f,
+	0xa770, 0xa770,
+	0xa788, 0xa788,
+	0xa7f8, 0xa7f9,
+	0xa9cf, 0xa9cf,
+	0xa9e6, 0xa9e6,
+	0xaa70, 0xaa70,
+	0xaadd, 0xaadd,
+	0xaaf3, 0xaaf4,
+	0xab5c, 0xab5f,
+	0xff70, 0xff70,
+	0xff9e, 0xff9f,
+	0x16b40, 0x16b43,
+	0x16f93, 0x16f9f,
+	0x16fe0, 0x16fe1,
+	0x16fe3, 0x16fe3,
+	0x1e137, 0x1e13d,
+	0x1e94b, 0x1e94b,
+}; /* CR_Lm */
+
+/* 'Lo': General Category */
+static const OnigCodePoint CR_Lo[] = {
+	476,
+	0x00aa, 0x00aa,
+	0x00ba, 0x00ba,
+	0x01bb, 0x01bb,
+	0x01c0, 0x01c3,
+	0x0294, 0x0294,
+	0x05d0, 0x05ea,
+	0x05ef, 0x05f2,
+	0x0620, 0x063f,
+	0x0641, 0x064a,
+	0x066e, 0x066f,
+	0x0671, 0x06d3,
+	0x06d5, 0x06d5,
+	0x06ee, 0x06ef,
+	0x06fa, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x0710,
+	0x0712, 0x072f,
+	0x074d, 0x07a5,
+	0x07b1, 0x07b1,
+	0x07ca, 0x07ea,
+	0x0800, 0x0815,
+	0x0840, 0x0858,
+	0x0860, 0x086a,
+	0x08a0, 0x08b4,
+	0x08b6, 0x08bd,
+	0x0904, 0x0939,
+	0x093d, 0x093d,
+	0x0950, 0x0950,
+	0x0958, 0x0961,
+	0x0972, 0x0980,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bd, 0x09bd,
+	0x09ce, 0x09ce,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e1,
+	0x09f0, 0x09f1,
+	0x09fc, 0x09fc,
+	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,
+	0x0af9, 0x0af9,
+	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,
+	0x0bd0, 0x0bd0,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c39,
+	0x0c3d, 0x0c3d,
+	0x0c58, 0x0c5a,
+	0x0c60, 0x0c61,
+	0x0c80, 0x0c80,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbd, 0x0cbd,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0cf1, 0x0cf2,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d3d,
+	0x0d4e, 0x0d4e,
+	0x0d54, 0x0d56,
+	0x0d5f, 0x0d61,
+	0x0d7a, 0x0d7f,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0e01, 0x0e30,
+	0x0e32, 0x0e33,
+	0x0e40, 0x0e45,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e86, 0x0e8a,
+	0x0e8c, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0eb0,
+	0x0eb2, 0x0eb3,
+	0x0ebd, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0edc, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f88, 0x0f8c,
+	0x1000, 0x102a,
+	0x103f, 0x103f,
+	0x1050, 0x1055,
+	0x105a, 0x105d,
+	0x1061, 0x1061,
+	0x1065, 0x1066,
+	0x106e, 0x1070,
+	0x1075, 0x1081,
+	0x108e, 0x108e,
+	0x1100, 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,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x16f1, 0x16f8,
+	0x1700, 0x170c,
+	0x170e, 0x1711,
+	0x1720, 0x1731,
+	0x1740, 0x1751,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1780, 0x17b3,
+	0x17dc, 0x17dc,
+	0x1820, 0x1842,
+	0x1844, 0x1878,
+	0x1880, 0x1884,
+	0x1887, 0x18a8,
+	0x18aa, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191e,
+	0x1950, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x1a00, 0x1a16,
+	0x1a20, 0x1a54,
+	0x1b05, 0x1b33,
+	0x1b45, 0x1b4b,
+	0x1b83, 0x1ba0,
+	0x1bae, 0x1baf,
+	0x1bba, 0x1be5,
+	0x1c00, 0x1c23,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c77,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf3,
+	0x1cf5, 0x1cf6,
+	0x1cfa, 0x1cfa,
+	0x2135, 0x2138,
+	0x2d30, 0x2d67,
+	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, 0x312f,
+	0x3131, 0x318e,
+	0x31a0, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fef,
+	0xa000, 0xa014,
+	0xa016, 0xa48c,
+	0xa4d0, 0xa4f7,
+	0xa500, 0xa60b,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa66e, 0xa66e,
+	0xa6a0, 0xa6e5,
+	0xa78f, 0xa78f,
+	0xa7f7, 0xa7f7,
+	0xa7fb, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa822,
+	0xa840, 0xa873,
+	0xa882, 0xa8b3,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa8fd, 0xa8fe,
+	0xa90a, 0xa925,
+	0xa930, 0xa946,
+	0xa960, 0xa97c,
+	0xa984, 0xa9b2,
+	0xa9e0, 0xa9e4,
+	0xa9e7, 0xa9ef,
+	0xa9fa, 0xa9fe,
+	0xaa00, 0xaa28,
+	0xaa40, 0xaa42,
+	0xaa44, 0xaa4b,
+	0xaa60, 0xaa6f,
+	0xaa71, 0xaa76,
+	0xaa7a, 0xaa7a,
+	0xaa7e, 0xaaaf,
+	0xaab1, 0xaab1,
+	0xaab5, 0xaab6,
+	0xaab9, 0xaabd,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadc,
+	0xaae0, 0xaaea,
+	0xaaf2, 0xaaf2,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabe2,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa6d,
+	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,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031f,
+	0x1032d, 0x10340,
+	0x10342, 0x10349,
+	0x10350, 0x10375,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x10450, 0x1049d,
+	0x10500, 0x10527,
+	0x10530, 0x10563,
+	0x10600, 0x10736,
+	0x10740, 0x10755,
+	0x10760, 0x10767,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10860, 0x10876,
+	0x10880, 0x1089e,
+	0x108e0, 0x108f2,
+	0x108f4, 0x108f5,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a00,
+	0x10a10, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a35,
+	0x10a60, 0x10a7c,
+	0x10a80, 0x10a9c,
+	0x10ac0, 0x10ac7,
+	0x10ac9, 0x10ae4,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10b80, 0x10b91,
+	0x10c00, 0x10c48,
+	0x10d00, 0x10d23,
+	0x10f00, 0x10f1c,
+	0x10f27, 0x10f27,
+	0x10f30, 0x10f45,
+	0x10fe0, 0x10ff6,
+	0x11003, 0x11037,
+	0x11083, 0x110af,
+	0x110d0, 0x110e8,
+	0x11103, 0x11126,
+	0x11144, 0x11144,
+	0x11150, 0x11172,
+	0x11176, 0x11176,
+	0x11183, 0x111b2,
+	0x111c1, 0x111c4,
+	0x111da, 0x111da,
+	0x111dc, 0x111dc,
+	0x11200, 0x11211,
+	0x11213, 0x1122b,
+	0x11280, 0x11286,
+	0x11288, 0x11288,
+	0x1128a, 0x1128d,
+	0x1128f, 0x1129d,
+	0x1129f, 0x112a8,
+	0x112b0, 0x112de,
+	0x11305, 0x1130c,
+	0x1130f, 0x11310,
+	0x11313, 0x11328,
+	0x1132a, 0x11330,
+	0x11332, 0x11333,
+	0x11335, 0x11339,
+	0x1133d, 0x1133d,
+	0x11350, 0x11350,
+	0x1135d, 0x11361,
+	0x11400, 0x11434,
+	0x11447, 0x1144a,
+	0x1145f, 0x1145f,
+	0x11480, 0x114af,
+	0x114c4, 0x114c5,
+	0x114c7, 0x114c7,
+	0x11580, 0x115ae,
+	0x115d8, 0x115db,
+	0x11600, 0x1162f,
+	0x11644, 0x11644,
+	0x11680, 0x116aa,
+	0x116b8, 0x116b8,
+	0x11700, 0x1171a,
+	0x11800, 0x1182b,
+	0x118ff, 0x118ff,
+	0x119a0, 0x119a7,
+	0x119aa, 0x119d0,
+	0x119e1, 0x119e1,
+	0x119e3, 0x119e3,
+	0x11a00, 0x11a00,
+	0x11a0b, 0x11a32,
+	0x11a3a, 0x11a3a,
+	0x11a50, 0x11a50,
+	0x11a5c, 0x11a89,
+	0x11a9d, 0x11a9d,
+	0x11ac0, 0x11af8,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c2e,
+	0x11c40, 0x11c40,
+	0x11c72, 0x11c8f,
+	0x11d00, 0x11d06,
+	0x11d08, 0x11d09,
+	0x11d0b, 0x11d30,
+	0x11d46, 0x11d46,
+	0x11d60, 0x11d65,
+	0x11d67, 0x11d68,
+	0x11d6a, 0x11d89,
+	0x11d98, 0x11d98,
+	0x11ee0, 0x11ef2,
+	0x12000, 0x12399,
+	0x12480, 0x12543,
+	0x13000, 0x1342e,
+	0x14400, 0x14646,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16ad0, 0x16aed,
+	0x16b00, 0x16b2f,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16f00, 0x16f4a,
+	0x16f50, 0x16f50,
+	0x17000, 0x187f7,
+	0x18800, 0x18af2,
+	0x1b000, 0x1b11e,
+	0x1b150, 0x1b152,
+	0x1b164, 0x1b167,
+	0x1b170, 0x1b2fb,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	0x1e100, 0x1e12c,
+	0x1e14e, 0x1e14e,
+	0x1e2c0, 0x1e2eb,
+	0x1e800, 0x1e8c4,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2b820, 0x2cea1,
+	0x2ceb0, 0x2ebe0,
+	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[] = {
+	636,
+	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,
+	0x0243, 0x0246,
+	0x0248, 0x0248,
+	0x024a, 0x024a,
+	0x024c, 0x024c,
+	0x024e, 0x024e,
+	0x0370, 0x0370,
+	0x0372, 0x0372,
+	0x0376, 0x0376,
+	0x037f, 0x037f,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x038f,
+	0x0391, 0x03a1,
+	0x03a3, 0x03ab,
+	0x03cf, 0x03cf,
+	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,
+	0x04fa, 0x04fa,
+	0x04fc, 0x04fc,
+	0x04fe, 0x04fe,
+	0x0500, 0x0500,
+	0x0502, 0x0502,
+	0x0504, 0x0504,
+	0x0506, 0x0506,
+	0x0508, 0x0508,
+	0x050a, 0x050a,
+	0x050c, 0x050c,
+	0x050e, 0x050e,
+	0x0510, 0x0510,
+	0x0512, 0x0512,
+	0x0514, 0x0514,
+	0x0516, 0x0516,
+	0x0518, 0x0518,
+	0x051a, 0x051a,
+	0x051c, 0x051c,
+	0x051e, 0x051e,
+	0x0520, 0x0520,
+	0x0522, 0x0522,
+	0x0524, 0x0524,
+	0x0526, 0x0526,
+	0x0528, 0x0528,
+	0x052a, 0x052a,
+	0x052c, 0x052c,
+	0x052e, 0x052e,
+	0x0531, 0x0556,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x13a0, 0x13f5,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cbf,
+	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,
+	0x1e9e, 0x1e9e,
+	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,
+	0x1efa, 0x1efa,
+	0x1efc, 0x1efc,
+	0x1efe, 0x1efe,
+	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, 0x2133,
+	0x213e, 0x213f,
+	0x2145, 0x2145,
+	0x2183, 0x2183,
+	0x2c00, 0x2c2e,
+	0x2c60, 0x2c60,
+	0x2c62, 0x2c64,
+	0x2c67, 0x2c67,
+	0x2c69, 0x2c69,
+	0x2c6b, 0x2c6b,
+	0x2c6d, 0x2c70,
+	0x2c72, 0x2c72,
+	0x2c75, 0x2c75,
+	0x2c7e, 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,
+	0x2ceb, 0x2ceb,
+	0x2ced, 0x2ced,
+	0x2cf2, 0x2cf2,
+	0xa640, 0xa640,
+	0xa642, 0xa642,
+	0xa644, 0xa644,
+	0xa646, 0xa646,
+	0xa648, 0xa648,
+	0xa64a, 0xa64a,
+	0xa64c, 0xa64c,
+	0xa64e, 0xa64e,
+	0xa650, 0xa650,
+	0xa652, 0xa652,
+	0xa654, 0xa654,
+	0xa656, 0xa656,
+	0xa658, 0xa658,
+	0xa65a, 0xa65a,
+	0xa65c, 0xa65c,
+	0xa65e, 0xa65e,
+	0xa660, 0xa660,
+	0xa662, 0xa662,
+	0xa664, 0xa664,
+	0xa666, 0xa666,
+	0xa668, 0xa668,
+	0xa66a, 0xa66a,
+	0xa66c, 0xa66c,
+	0xa680, 0xa680,
+	0xa682, 0xa682,
+	0xa684, 0xa684,
+	0xa686, 0xa686,
+	0xa688, 0xa688,
+	0xa68a, 0xa68a,
+	0xa68c, 0xa68c,
+	0xa68e, 0xa68e,
+	0xa690, 0xa690,
+	0xa692, 0xa692,
+	0xa694, 0xa694,
+	0xa696, 0xa696,
+	0xa698, 0xa698,
+	0xa69a, 0xa69a,
+	0xa722, 0xa722,
+	0xa724, 0xa724,
+	0xa726, 0xa726,
+	0xa728, 0xa728,
+	0xa72a, 0xa72a,
+	0xa72c, 0xa72c,
+	0xa72e, 0xa72e,
+	0xa732, 0xa732,
+	0xa734, 0xa734,
+	0xa736, 0xa736,
+	0xa738, 0xa738,
+	0xa73a, 0xa73a,
+	0xa73c, 0xa73c,
+	0xa73e, 0xa73e,
+	0xa740, 0xa740,
+	0xa742, 0xa742,
+	0xa744, 0xa744,
+	0xa746, 0xa746,
+	0xa748, 0xa748,
+	0xa74a, 0xa74a,
+	0xa74c, 0xa74c,
+	0xa74e, 0xa74e,
+	0xa750, 0xa750,
+	0xa752, 0xa752,
+	0xa754, 0xa754,
+	0xa756, 0xa756,
+	0xa758, 0xa758,
+	0xa75a, 0xa75a,
+	0xa75c, 0xa75c,
+	0xa75e, 0xa75e,
+	0xa760, 0xa760,
+	0xa762, 0xa762,
+	0xa764, 0xa764,
+	0xa766, 0xa766,
+	0xa768, 0xa768,
+	0xa76a, 0xa76a,
+	0xa76c, 0xa76c,
+	0xa76e, 0xa76e,
+	0xa779, 0xa779,
+	0xa77b, 0xa77b,
+	0xa77d, 0xa77e,
+	0xa780, 0xa780,
+	0xa782, 0xa782,
+	0xa784, 0xa784,
+	0xa786, 0xa786,
+	0xa78b, 0xa78b,
+	0xa78d, 0xa78d,
+	0xa790, 0xa790,
+	0xa792, 0xa792,
+	0xa796, 0xa796,
+	0xa798, 0xa798,
+	0xa79a, 0xa79a,
+	0xa79c, 0xa79c,
+	0xa79e, 0xa79e,
+	0xa7a0, 0xa7a0,
+	0xa7a2, 0xa7a2,
+	0xa7a4, 0xa7a4,
+	0xa7a6, 0xa7a6,
+	0xa7a8, 0xa7a8,
+	0xa7aa, 0xa7ae,
+	0xa7b0, 0xa7b4,
+	0xa7b6, 0xa7b6,
+	0xa7b8, 0xa7b8,
+	0xa7ba, 0xa7ba,
+	0xa7bc, 0xa7bc,
+	0xa7be, 0xa7be,
+	0xa7c2, 0xa7c2,
+	0xa7c4, 0xa7c6,
+	0xff21, 0xff3a,
+	0x10400, 0x10427,
+	0x104b0, 0x104d3,
+	0x10c80, 0x10cb2,
+	0x118a0, 0x118bf,
+	0x16e40, 0x16e5f,
+	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,
+	0x1d7ca, 0x1d7ca,
+	0x1e900, 0x1e921,
+}; /* CR_Lu */
+
+/* 'M': Major Category */
+static const OnigCodePoint CR_M[] = {
+	280,
+	0x0300, 0x036f,
+	0x0483, 0x0489,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x0610, 0x061a,
+	0x064b, 0x065f,
+	0x0670, 0x0670,
+	0x06d6, 0x06dc,
+	0x06df, 0x06e4,
+	0x06e7, 0x06e8,
+	0x06ea, 0x06ed,
+	0x0711, 0x0711,
+	0x0730, 0x074a,
+	0x07a6, 0x07b0,
+	0x07eb, 0x07f3,
+	0x07fd, 0x07fd,
+	0x0816, 0x0819,
+	0x081b, 0x0823,
+	0x0825, 0x0827,
+	0x0829, 0x082d,
+	0x0859, 0x085b,
+	0x08d3, 0x08e1,
+	0x08e3, 0x0903,
+	0x093a, 0x093c,
+	0x093e, 0x094f,
+	0x0951, 0x0957,
+	0x0962, 0x0963,
+	0x0981, 0x0983,
+	0x09bc, 0x09bc,
+	0x09be, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09e2, 0x09e3,
+	0x09fe, 0x09fe,
+	0x0a01, 0x0a03,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a70, 0x0a71,
+	0x0a75, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0abc, 0x0abc,
+	0x0abe, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ae2, 0x0ae3,
+	0x0afa, 0x0aff,
+	0x0b01, 0x0b03,
+	0x0b3c, 0x0b3c,
+	0x0b3e, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b62, 0x0b63,
+	0x0b82, 0x0b82,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0c00, 0x0c04,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c62, 0x0c63,
+	0x0c81, 0x0c83,
+	0x0cbc, 0x0cbc,
+	0x0cbe, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0ce2, 0x0ce3,
+	0x0d00, 0x0d03,
+	0x0d3b, 0x0d3c,
+	0x0d3e, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d62, 0x0d63,
+	0x0d82, 0x0d83,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df3,
+	0x0e31, 0x0e31,
+	0x0e34, 0x0e3a,
+	0x0e47, 0x0e4e,
+	0x0eb1, 0x0eb1,
+	0x0eb4, 0x0ebc,
+	0x0ec8, 0x0ecd,
+	0x0f18, 0x0f19,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f3e, 0x0f3f,
+	0x0f71, 0x0f84,
+	0x0f86, 0x0f87,
+	0x0f8d, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x102b, 0x103e,
+	0x1056, 0x1059,
+	0x105e, 0x1060,
+	0x1062, 0x1064,
+	0x1067, 0x106d,
+	0x1071, 0x1074,
+	0x1082, 0x108d,
+	0x108f, 0x108f,
+	0x109a, 0x109d,
+	0x135d, 0x135f,
+	0x1712, 0x1714,
+	0x1732, 0x1734,
+	0x1752, 0x1753,
+	0x1772, 0x1773,
+	0x17b4, 0x17d3,
+	0x17dd, 0x17dd,
+	0x180b, 0x180d,
+	0x1885, 0x1886,
+	0x18a9, 0x18a9,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1a17, 0x1a1b,
+	0x1a55, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a7f,
+	0x1ab0, 0x1abe,
+	0x1b00, 0x1b04,
+	0x1b34, 0x1b44,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1b82,
+	0x1ba1, 0x1bad,
+	0x1be6, 0x1bf3,
+	0x1c24, 0x1c37,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1cf4, 0x1cf4,
+	0x1cf7, 0x1cf9,
+	0x1dc0, 0x1df9,
+	0x1dfb, 0x1dff,
+	0x20d0, 0x20f0,
+	0x2cef, 0x2cf1,
+	0x2d7f, 0x2d7f,
+	0x2de0, 0x2dff,
+	0x302a, 0x302f,
+	0x3099, 0x309a,
+	0xa66f, 0xa672,
+	0xa674, 0xa67d,
+	0xa69e, 0xa69f,
+	0xa6f0, 0xa6f1,
+	0xa802, 0xa802,
+	0xa806, 0xa806,
+	0xa80b, 0xa80b,
+	0xa823, 0xa827,
+	0xa880, 0xa881,
+	0xa8b4, 0xa8c5,
+	0xa8e0, 0xa8f1,
+	0xa8ff, 0xa8ff,
+	0xa926, 0xa92d,
+	0xa947, 0xa953,
+	0xa980, 0xa983,
+	0xa9b3, 0xa9c0,
+	0xa9e5, 0xa9e5,
+	0xaa29, 0xaa36,
+	0xaa43, 0xaa43,
+	0xaa4c, 0xaa4d,
+	0xaa7b, 0xaa7d,
+	0xaab0, 0xaab0,
+	0xaab2, 0xaab4,
+	0xaab7, 0xaab8,
+	0xaabe, 0xaabf,
+	0xaac1, 0xaac1,
+	0xaaeb, 0xaaef,
+	0xaaf5, 0xaaf6,
+	0xabe3, 0xabea,
+	0xabec, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe2f,
+	0x101fd, 0x101fd,
+	0x102e0, 0x102e0,
+	0x10376, 0x1037a,
+	0x10a01, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a0f,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x10ae5, 0x10ae6,
+	0x10d24, 0x10d27,
+	0x10f46, 0x10f50,
+	0x11000, 0x11002,
+	0x11038, 0x11046,
+	0x1107f, 0x11082,
+	0x110b0, 0x110ba,
+	0x11100, 0x11102,
+	0x11127, 0x11134,
+	0x11145, 0x11146,
+	0x11173, 0x11173,
+	0x11180, 0x11182,
+	0x111b3, 0x111c0,
+	0x111c9, 0x111cc,
+	0x1122c, 0x11237,
+	0x1123e, 0x1123e,
+	0x112df, 0x112ea,
+	0x11300, 0x11303,
+	0x1133b, 0x1133c,
+	0x1133e, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11357, 0x11357,
+	0x11362, 0x11363,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11435, 0x11446,
+	0x1145e, 0x1145e,
+	0x114b0, 0x114c3,
+	0x115af, 0x115b5,
+	0x115b8, 0x115c0,
+	0x115dc, 0x115dd,
+	0x11630, 0x11640,
+	0x116ab, 0x116b7,
+	0x1171d, 0x1172b,
+	0x1182c, 0x1183a,
+	0x119d1, 0x119d7,
+	0x119da, 0x119e0,
+	0x119e4, 0x119e4,
+	0x11a01, 0x11a0a,
+	0x11a33, 0x11a39,
+	0x11a3b, 0x11a3e,
+	0x11a47, 0x11a47,
+	0x11a51, 0x11a5b,
+	0x11a8a, 0x11a99,
+	0x11c2f, 0x11c36,
+	0x11c38, 0x11c3f,
+	0x11c92, 0x11ca7,
+	0x11ca9, 0x11cb6,
+	0x11d31, 0x11d36,
+	0x11d3a, 0x11d3a,
+	0x11d3c, 0x11d3d,
+	0x11d3f, 0x11d45,
+	0x11d47, 0x11d47,
+	0x11d8a, 0x11d8e,
+	0x11d90, 0x11d91,
+	0x11d93, 0x11d97,
+	0x11ef3, 0x11ef6,
+	0x16af0, 0x16af4,
+	0x16b30, 0x16b36,
+	0x16f4f, 0x16f4f,
+	0x16f51, 0x16f87,
+	0x16f8f, 0x16f92,
+	0x1bc9d, 0x1bc9e,
+	0x1d165, 0x1d169,
+	0x1d16d, 0x1d172,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0x1da00, 0x1da36,
+	0x1da3b, 0x1da6c,
+	0x1da75, 0x1da75,
+	0x1da84, 0x1da84,
+	0x1da9b, 0x1da9f,
+	0x1daa1, 0x1daaf,
+	0x1e000, 0x1e006,
+	0x1e008, 0x1e018,
+	0x1e01b, 0x1e021,
+	0x1e023, 0x1e024,
+	0x1e026, 0x1e02a,
+	0x1e130, 0x1e136,
+	0x1e2ec, 0x1e2ef,
+	0x1e8d0, 0x1e8d6,
+	0x1e944, 0x1e94a,
+	0xe0100, 0xe01ef,
+}; /* CR_M */
+
+/* 'Mc': General Category */
+static const OnigCodePoint CR_Mc[] = {
+	168,
+	0x0903, 0x0903,
+	0x093b, 0x093b,
+	0x093e, 0x0940,
+	0x0949, 0x094c,
+	0x094e, 0x094f,
+	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,
+	0x102b, 0x102c,
+	0x1031, 0x1031,
+	0x1038, 0x1038,
+	0x103b, 0x103c,
+	0x1056, 0x1057,
+	0x1062, 0x1064,
+	0x1067, 0x106d,
+	0x1083, 0x1084,
+	0x1087, 0x108c,
+	0x108f, 0x108f,
+	0x109a, 0x109c,
+	0x17b6, 0x17b6,
+	0x17be, 0x17c5,
+	0x17c7, 0x17c8,
+	0x1923, 0x1926,
+	0x1929, 0x192b,
+	0x1930, 0x1931,
+	0x1933, 0x1938,
+	0x1a19, 0x1a1a,
+	0x1a55, 0x1a55,
+	0x1a57, 0x1a57,
+	0x1a61, 0x1a61,
+	0x1a63, 0x1a64,
+	0x1a6d, 0x1a72,
+	0x1b04, 0x1b04,
+	0x1b35, 0x1b35,
+	0x1b3b, 0x1b3b,
+	0x1b3d, 0x1b41,
+	0x1b43, 0x1b44,
+	0x1b82, 0x1b82,
+	0x1ba1, 0x1ba1,
+	0x1ba6, 0x1ba7,
+	0x1baa, 0x1baa,
+	0x1be7, 0x1be7,
+	0x1bea, 0x1bec,
+	0x1bee, 0x1bee,
+	0x1bf2, 0x1bf3,
+	0x1c24, 0x1c2b,
+	0x1c34, 0x1c35,
+	0x1ce1, 0x1ce1,
+	0x1cf7, 0x1cf7,
+	0x302e, 0x302f,
+	0xa823, 0xa824,
+	0xa827, 0xa827,
+	0xa880, 0xa881,
+	0xa8b4, 0xa8c3,
+	0xa952, 0xa953,
+	0xa983, 0xa983,
+	0xa9b4, 0xa9b5,
+	0xa9ba, 0xa9bb,
+	0xa9be, 0xa9c0,
+	0xaa2f, 0xaa30,
+	0xaa33, 0xaa34,
+	0xaa4d, 0xaa4d,
+	0xaa7b, 0xaa7b,
+	0xaa7d, 0xaa7d,
+	0xaaeb, 0xaaeb,
+	0xaaee, 0xaaef,
+	0xaaf5, 0xaaf5,
+	0xabe3, 0xabe4,
+	0xabe6, 0xabe7,
+	0xabe9, 0xabea,
+	0xabec, 0xabec,
+	0x11000, 0x11000,
+	0x11002, 0x11002,
+	0x11082, 0x11082,
+	0x110b0, 0x110b2,
+	0x110b7, 0x110b8,
+	0x1112c, 0x1112c,
+	0x11145, 0x11146,
+	0x11182, 0x11182,
+	0x111b3, 0x111b5,
+	0x111bf, 0x111c0,
+	0x1122c, 0x1122e,
+	0x11232, 0x11233,
+	0x11235, 0x11235,
+	0x112e0, 0x112e2,
+	0x11302, 0x11303,
+	0x1133e, 0x1133f,
+	0x11341, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11357, 0x11357,
+	0x11362, 0x11363,
+	0x11435, 0x11437,
+	0x11440, 0x11441,
+	0x11445, 0x11445,
+	0x114b0, 0x114b2,
+	0x114b9, 0x114b9,
+	0x114bb, 0x114be,
+	0x114c1, 0x114c1,
+	0x115af, 0x115b1,
+	0x115b8, 0x115bb,
+	0x115be, 0x115be,
+	0x11630, 0x11632,
+	0x1163b, 0x1163c,
+	0x1163e, 0x1163e,
+	0x116ac, 0x116ac,
+	0x116ae, 0x116af,
+	0x116b6, 0x116b6,
+	0x11720, 0x11721,
+	0x11726, 0x11726,
+	0x1182c, 0x1182e,
+	0x11838, 0x11838,
+	0x119d1, 0x119d3,
+	0x119dc, 0x119df,
+	0x119e4, 0x119e4,
+	0x11a39, 0x11a39,
+	0x11a57, 0x11a58,
+	0x11a97, 0x11a97,
+	0x11c2f, 0x11c2f,
+	0x11c3e, 0x11c3e,
+	0x11ca9, 0x11ca9,
+	0x11cb1, 0x11cb1,
+	0x11cb4, 0x11cb4,
+	0x11d8a, 0x11d8e,
+	0x11d93, 0x11d94,
+	0x11d96, 0x11d96,
+	0x11ef5, 0x11ef6,
+	0x16f51, 0x16f87,
+	0x1d165, 0x1d166,
+	0x1d16d, 0x1d172,
+}; /* CR_Mc */
+
+/* 'Me': General Category */
+static const OnigCodePoint CR_Me[] = {
+	5,
+	0x0488, 0x0489,
+	0x1abe, 0x1abe,
+	0x20dd, 0x20e0,
+	0x20e2, 0x20e4,
+	0xa670, 0xa672,
+}; /* CR_Me */
+
+/* 'Mn': General Category */
+static const OnigCodePoint CR_Mn[] = {
+	318,
+	0x0300, 0x036f,
+	0x0483, 0x0487,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x0610, 0x061a,
+	0x064b, 0x065f,
+	0x0670, 0x0670,
+	0x06d6, 0x06dc,
+	0x06df, 0x06e4,
+	0x06e7, 0x06e8,
+	0x06ea, 0x06ed,
+	0x0711, 0x0711,
+	0x0730, 0x074a,
+	0x07a6, 0x07b0,
+	0x07eb, 0x07f3,
+	0x07fd, 0x07fd,
+	0x0816, 0x0819,
+	0x081b, 0x0823,
+	0x0825, 0x0827,
+	0x0829, 0x082d,
+	0x0859, 0x085b,
+	0x08d3, 0x08e1,
+	0x08e3, 0x0902,
+	0x093a, 0x093a,
+	0x093c, 0x093c,
+	0x0941, 0x0948,
+	0x094d, 0x094d,
+	0x0951, 0x0957,
+	0x0962, 0x0963,
+	0x0981, 0x0981,
+	0x09bc, 0x09bc,
+	0x09c1, 0x09c4,
+	0x09cd, 0x09cd,
+	0x09e2, 0x09e3,
+	0x09fe, 0x09fe,
+	0x0a01, 0x0a02,
+	0x0a3c, 0x0a3c,
+	0x0a41, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a70, 0x0a71,
+	0x0a75, 0x0a75,
+	0x0a81, 0x0a82,
+	0x0abc, 0x0abc,
+	0x0ac1, 0x0ac5,
+	0x0ac7, 0x0ac8,
+	0x0acd, 0x0acd,
+	0x0ae2, 0x0ae3,
+	0x0afa, 0x0aff,
+	0x0b01, 0x0b01,
+	0x0b3c, 0x0b3c,
+	0x0b3f, 0x0b3f,
+	0x0b41, 0x0b44,
+	0x0b4d, 0x0b4d,
+	0x0b56, 0x0b56,
+	0x0b62, 0x0b63,
+	0x0b82, 0x0b82,
+	0x0bc0, 0x0bc0,
+	0x0bcd, 0x0bcd,
+	0x0c00, 0x0c00,
+	0x0c04, 0x0c04,
+	0x0c3e, 0x0c40,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c62, 0x0c63,
+	0x0c81, 0x0c81,
+	0x0cbc, 0x0cbc,
+	0x0cbf, 0x0cbf,
+	0x0cc6, 0x0cc6,
+	0x0ccc, 0x0ccd,
+	0x0ce2, 0x0ce3,
+	0x0d00, 0x0d01,
+	0x0d3b, 0x0d3c,
+	0x0d41, 0x0d44,
+	0x0d4d, 0x0d4d,
+	0x0d62, 0x0d63,
+	0x0dca, 0x0dca,
+	0x0dd2, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0e31, 0x0e31,
+	0x0e34, 0x0e3a,
+	0x0e47, 0x0e4e,
+	0x0eb1, 0x0eb1,
+	0x0eb4, 0x0ebc,
+	0x0ec8, 0x0ecd,
+	0x0f18, 0x0f19,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f71, 0x0f7e,
+	0x0f80, 0x0f84,
+	0x0f86, 0x0f87,
+	0x0f8d, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x102d, 0x1030,
+	0x1032, 0x1037,
+	0x1039, 0x103a,
+	0x103d, 0x103e,
+	0x1058, 0x1059,
+	0x105e, 0x1060,
+	0x1071, 0x1074,
+	0x1082, 0x1082,
+	0x1085, 0x1086,
+	0x108d, 0x108d,
+	0x109d, 0x109d,
+	0x135d, 0x135f,
+	0x1712, 0x1714,
+	0x1732, 0x1734,
+	0x1752, 0x1753,
+	0x1772, 0x1773,
+	0x17b4, 0x17b5,
+	0x17b7, 0x17bd,
+	0x17c6, 0x17c6,
+	0x17c9, 0x17d3,
+	0x17dd, 0x17dd,
+	0x180b, 0x180d,
+	0x1885, 0x1886,
+	0x18a9, 0x18a9,
+	0x1920, 0x1922,
+	0x1927, 0x1928,
+	0x1932, 0x1932,
+	0x1939, 0x193b,
+	0x1a17, 0x1a18,
+	0x1a1b, 0x1a1b,
+	0x1a56, 0x1a56,
+	0x1a58, 0x1a5e,
+	0x1a60, 0x1a60,
+	0x1a62, 0x1a62,
+	0x1a65, 0x1a6c,
+	0x1a73, 0x1a7c,
+	0x1a7f, 0x1a7f,
+	0x1ab0, 0x1abd,
+	0x1b00, 0x1b03,
+	0x1b34, 0x1b34,
+	0x1b36, 0x1b3a,
+	0x1b3c, 0x1b3c,
+	0x1b42, 0x1b42,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1b81,
+	0x1ba2, 0x1ba5,
+	0x1ba8, 0x1ba9,
+	0x1bab, 0x1bad,
+	0x1be6, 0x1be6,
+	0x1be8, 0x1be9,
+	0x1bed, 0x1bed,
+	0x1bef, 0x1bf1,
+	0x1c2c, 0x1c33,
+	0x1c36, 0x1c37,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce0,
+	0x1ce2, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1cf4, 0x1cf4,
+	0x1cf8, 0x1cf9,
+	0x1dc0, 0x1df9,
+	0x1dfb, 0x1dff,
+	0x20d0, 0x20dc,
+	0x20e1, 0x20e1,
+	0x20e5, 0x20f0,
+	0x2cef, 0x2cf1,
+	0x2d7f, 0x2d7f,
+	0x2de0, 0x2dff,
+	0x302a, 0x302d,
+	0x3099, 0x309a,
+	0xa66f, 0xa66f,
+	0xa674, 0xa67d,
+	0xa69e, 0xa69f,
+	0xa6f0, 0xa6f1,
+	0xa802, 0xa802,
+	0xa806, 0xa806,
+	0xa80b, 0xa80b,
+	0xa825, 0xa826,
+	0xa8c4, 0xa8c5,
+	0xa8e0, 0xa8f1,
+	0xa8ff, 0xa8ff,
+	0xa926, 0xa92d,
+	0xa947, 0xa951,
+	0xa980, 0xa982,
+	0xa9b3, 0xa9b3,
+	0xa9b6, 0xa9b9,
+	0xa9bc, 0xa9bd,
+	0xa9e5, 0xa9e5,
+	0xaa29, 0xaa2e,
+	0xaa31, 0xaa32,
+	0xaa35, 0xaa36,
+	0xaa43, 0xaa43,
+	0xaa4c, 0xaa4c,
+	0xaa7c, 0xaa7c,
+	0xaab0, 0xaab0,
+	0xaab2, 0xaab4,
+	0xaab7, 0xaab8,
+	0xaabe, 0xaabf,
+	0xaac1, 0xaac1,
+	0xaaec, 0xaaed,
+	0xaaf6, 0xaaf6,
+	0xabe5, 0xabe5,
+	0xabe8, 0xabe8,
+	0xabed, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe2f,
+	0x101fd, 0x101fd,
+	0x102e0, 0x102e0,
+	0x10376, 0x1037a,
+	0x10a01, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a0f,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x10ae5, 0x10ae6,
+	0x10d24, 0x10d27,
+	0x10f46, 0x10f50,
+	0x11001, 0x11001,
+	0x11038, 0x11046,
+	0x1107f, 0x11081,
+	0x110b3, 0x110b6,
+	0x110b9, 0x110ba,
+	0x11100, 0x11102,
+	0x11127, 0x1112b,
+	0x1112d, 0x11134,
+	0x11173, 0x11173,
+	0x11180, 0x11181,
+	0x111b6, 0x111be,
+	0x111c9, 0x111cc,
+	0x1122f, 0x11231,
+	0x11234, 0x11234,
+	0x11236, 0x11237,
+	0x1123e, 0x1123e,
+	0x112df, 0x112df,
+	0x112e3, 0x112ea,
+	0x11300, 0x11301,
+	0x1133b, 0x1133c,
+	0x11340, 0x11340,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11438, 0x1143f,
+	0x11442, 0x11444,
+	0x11446, 0x11446,
+	0x1145e, 0x1145e,
+	0x114b3, 0x114b8,
+	0x114ba, 0x114ba,
+	0x114bf, 0x114c0,
+	0x114c2, 0x114c3,
+	0x115b2, 0x115b5,
+	0x115bc, 0x115bd,
+	0x115bf, 0x115c0,
+	0x115dc, 0x115dd,
+	0x11633, 0x1163a,
+	0x1163d, 0x1163d,
+	0x1163f, 0x11640,
+	0x116ab, 0x116ab,
+	0x116ad, 0x116ad,
+	0x116b0, 0x116b5,
+	0x116b7, 0x116b7,
+	0x1171d, 0x1171f,
+	0x11722, 0x11725,
+	0x11727, 0x1172b,
+	0x1182f, 0x11837,
+	0x11839, 0x1183a,
+	0x119d4, 0x119d7,
+	0x119da, 0x119db,
+	0x119e0, 0x119e0,
+	0x11a01, 0x11a0a,
+	0x11a33, 0x11a38,
+	0x11a3b, 0x11a3e,
+	0x11a47, 0x11a47,
+	0x11a51, 0x11a56,
+	0x11a59, 0x11a5b,
+	0x11a8a, 0x11a96,
+	0x11a98, 0x11a99,
+	0x11c30, 0x11c36,
+	0x11c38, 0x11c3d,
+	0x11c3f, 0x11c3f,
+	0x11c92, 0x11ca7,
+	0x11caa, 0x11cb0,
+	0x11cb2, 0x11cb3,
+	0x11cb5, 0x11cb6,
+	0x11d31, 0x11d36,
+	0x11d3a, 0x11d3a,
+	0x11d3c, 0x11d3d,
+	0x11d3f, 0x11d45,
+	0x11d47, 0x11d47,
+	0x11d90, 0x11d91,
+	0x11d95, 0x11d95,
+	0x11d97, 0x11d97,
+	0x11ef3, 0x11ef4,
+	0x16af0, 0x16af4,
+	0x16b30, 0x16b36,
+	0x16f4f, 0x16f4f,
+	0x16f8f, 0x16f92,
+	0x1bc9d, 0x1bc9e,
+	0x1d167, 0x1d169,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0x1da00, 0x1da36,
+	0x1da3b, 0x1da6c,
+	0x1da75, 0x1da75,
+	0x1da84, 0x1da84,
+	0x1da9b, 0x1da9f,
+	0x1daa1, 0x1daaf,
+	0x1e000, 0x1e006,
+	0x1e008, 0x1e018,
+	0x1e01b, 0x1e021,
+	0x1e023, 0x1e024,
+	0x1e026, 0x1e02a,
+	0x1e130, 0x1e136,
+	0x1e2ec, 0x1e2ef,
+	0x1e8d0, 0x1e8d6,
+	0x1e944, 0x1e94a,
+	0xe0100, 0xe01ef,
+}; /* CR_Mn */
+
+/* 'N': Major Category */
+static const OnigCodePoint CR_N[] = {
+	130,
+	0x0030, 0x0039,
+	0x00b2, 0x00b3,
+	0x00b9, 0x00b9,
+	0x00bc, 0x00be,
+	0x0660, 0x0669,
+	0x06f0, 0x06f9,
+	0x07c0, 0x07c9,
+	0x0966, 0x096f,
+	0x09e6, 0x09ef,
+	0x09f4, 0x09f9,
+	0x0a66, 0x0a6f,
+	0x0ae6, 0x0aef,
+	0x0b66, 0x0b6f,
+	0x0b72, 0x0b77,
+	0x0be6, 0x0bf2,
+	0x0c66, 0x0c6f,
+	0x0c78, 0x0c7e,
+	0x0ce6, 0x0cef,
+	0x0d58, 0x0d5e,
+	0x0d66, 0x0d78,
+	0x0de6, 0x0def,
+	0x0e50, 0x0e59,
+	0x0ed0, 0x0ed9,
+	0x0f20, 0x0f33,
+	0x1040, 0x1049,
+	0x1090, 0x1099,
+	0x1369, 0x137c,
+	0x16ee, 0x16f0,
+	0x17e0, 0x17e9,
+	0x17f0, 0x17f9,
+	0x1810, 0x1819,
+	0x1946, 0x194f,
+	0x19d0, 0x19da,
+	0x1a80, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1b50, 0x1b59,
+	0x1bb0, 0x1bb9,
+	0x1c40, 0x1c49,
+	0x1c50, 0x1c59,
+	0x2070, 0x2070,
+	0x2074, 0x2079,
+	0x2080, 0x2089,
+	0x2150, 0x2182,
+	0x2185, 0x2189,
+	0x2460, 0x249b,
+	0x24ea, 0x24ff,
+	0x2776, 0x2793,
+	0x2cfd, 0x2cfd,
+	0x3007, 0x3007,
+	0x3021, 0x3029,
+	0x3038, 0x303a,
+	0x3192, 0x3195,
+	0x3220, 0x3229,
+	0x3248, 0x324f,
+	0x3251, 0x325f,
+	0x3280, 0x3289,
+	0x32b1, 0x32bf,
+	0xa620, 0xa629,
+	0xa6e6, 0xa6ef,
+	0xa830, 0xa835,
+	0xa8d0, 0xa8d9,
+	0xa900, 0xa909,
+	0xa9d0, 0xa9d9,
+	0xa9f0, 0xa9f9,
+	0xaa50, 0xaa59,
+	0xabf0, 0xabf9,
+	0xff10, 0xff19,
+	0x10107, 0x10133,
+	0x10140, 0x10178,
+	0x1018a, 0x1018b,
+	0x102e1, 0x102fb,
+	0x10320, 0x10323,
+	0x10341, 0x10341,
+	0x1034a, 0x1034a,
+	0x103d1, 0x103d5,
+	0x104a0, 0x104a9,
+	0x10858, 0x1085f,
+	0x10879, 0x1087f,
+	0x108a7, 0x108af,
+	0x108fb, 0x108ff,
+	0x10916, 0x1091b,
+	0x109bc, 0x109bd,
+	0x109c0, 0x109cf,
+	0x109d2, 0x109ff,
+	0x10a40, 0x10a48,
+	0x10a7d, 0x10a7e,
+	0x10a9d, 0x10a9f,
+	0x10aeb, 0x10aef,
+	0x10b58, 0x10b5f,
+	0x10b78, 0x10b7f,
+	0x10ba9, 0x10baf,
+	0x10cfa, 0x10cff,
+	0x10d30, 0x10d39,
+	0x10e60, 0x10e7e,
+	0x10f1d, 0x10f26,
+	0x10f51, 0x10f54,
+	0x11052, 0x1106f,
+	0x110f0, 0x110f9,
+	0x11136, 0x1113f,
+	0x111d0, 0x111d9,
+	0x111e1, 0x111f4,
+	0x112f0, 0x112f9,
+	0x11450, 0x11459,
+	0x114d0, 0x114d9,
+	0x11650, 0x11659,
+	0x116c0, 0x116c9,
+	0x11730, 0x1173b,
+	0x118e0, 0x118f2,
+	0x11c50, 0x11c6c,
+	0x11d50, 0x11d59,
+	0x11da0, 0x11da9,
+	0x11fc0, 0x11fd4,
+	0x12400, 0x1246e,
+	0x16a60, 0x16a69,
+	0x16b50, 0x16b59,
+	0x16b5b, 0x16b61,
+	0x16e80, 0x16e96,
+	0x1d2e0, 0x1d2f3,
+	0x1d360, 0x1d378,
+	0x1d7ce, 0x1d7ff,
+	0x1e140, 0x1e149,
+	0x1e2f0, 0x1e2f9,
+	0x1e8c7, 0x1e8cf,
+	0x1e950, 0x1e959,
+	0x1ec71, 0x1ecab,
+	0x1ecad, 0x1ecaf,
+	0x1ecb1, 0x1ecb4,
+	0x1ed01, 0x1ed2d,
+	0x1ed2f, 0x1ed3d,
+	0x1f100, 0x1f10c,
+}; /* CR_N */
+
+/* 'Nd': General Category */
+#define CR_Nd CR_Digit
+
+/* 'Nl': General Category */
+static const OnigCodePoint CR_Nl[] = {
+	12,
+	0x16ee, 0x16f0,
+	0x2160, 0x2182,
+	0x2185, 0x2188,
+	0x3007, 0x3007,
+	0x3021, 0x3029,
+	0x3038, 0x303a,
+	0xa6e6, 0xa6ef,
+	0x10140, 0x10174,
+	0x10341, 0x10341,
+	0x1034a, 0x1034a,
+	0x103d1, 0x103d5,
+	0x12400, 0x1246e,
+}; /* CR_Nl */
+
+/* 'No': General Category */
+static const OnigCodePoint CR_No[] = {
+	70,
+	0x00b2, 0x00b3,
+	0x00b9, 0x00b9,
+	0x00bc, 0x00be,
+	0x09f4, 0x09f9,
+	0x0b72, 0x0b77,
+	0x0bf0, 0x0bf2,
+	0x0c78, 0x0c7e,
+	0x0d58, 0x0d5e,
+	0x0d70, 0x0d78,
+	0x0f2a, 0x0f33,
+	0x1369, 0x137c,
+	0x17f0, 0x17f9,
+	0x19da, 0x19da,
+	0x2070, 0x2070,
+	0x2074, 0x2079,
+	0x2080, 0x2089,
+	0x2150, 0x215f,
+	0x2189, 0x2189,
+	0x2460, 0x249b,
+	0x24ea, 0x24ff,
+	0x2776, 0x2793,
+	0x2cfd, 0x2cfd,
+	0x3192, 0x3195,
+	0x3220, 0x3229,
+	0x3248, 0x324f,
+	0x3251, 0x325f,
+	0x3280, 0x3289,
+	0x32b1, 0x32bf,
+	0xa830, 0xa835,
+	0x10107, 0x10133,
+	0x10175, 0x10178,
+	0x1018a, 0x1018b,
+	0x102e1, 0x102fb,
+	0x10320, 0x10323,
+	0x10858, 0x1085f,
+	0x10879, 0x1087f,
+	0x108a7, 0x108af,
+	0x108fb, 0x108ff,
+	0x10916, 0x1091b,
+	0x109bc, 0x109bd,
+	0x109c0, 0x109cf,
+	0x109d2, 0x109ff,
+	0x10a40, 0x10a48,
+	0x10a7d, 0x10a7e,
+	0x10a9d, 0x10a9f,
+	0x10aeb, 0x10aef,
+	0x10b58, 0x10b5f,
+	0x10b78, 0x10b7f,
+	0x10ba9, 0x10baf,
+	0x10cfa, 0x10cff,
+	0x10e60, 0x10e7e,
+	0x10f1d, 0x10f26,
+	0x10f51, 0x10f54,
+	0x11052, 0x11065,
+	0x111e1, 0x111f4,
+	0x1173a, 0x1173b,
+	0x118ea, 0x118f2,
+	0x11c5a, 0x11c6c,
+	0x11fc0, 0x11fd4,
+	0x16b5b, 0x16b61,
+	0x16e80, 0x16e96,
+	0x1d2e0, 0x1d2f3,
+	0x1d360, 0x1d378,
+	0x1e8c7, 0x1e8cf,
+	0x1ec71, 0x1ecab,
+	0x1ecad, 0x1ecaf,
+	0x1ecb1, 0x1ecb4,
+	0x1ed01, 0x1ed2d,
+	0x1ed2f, 0x1ed3d,
+	0x1f100, 0x1f10c,
+}; /* CR_No */
+
+/* 'P': Major Category */
+#define CR_P CR_Punct
+
+/* '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[] = {
+	17,
+	0x002d, 0x002d,
+	0x058a, 0x058a,
+	0x05be, 0x05be,
+	0x1400, 0x1400,
+	0x1806, 0x1806,
+	0x2010, 0x2015,
+	0x2e17, 0x2e17,
+	0x2e1a, 0x2e1a,
+	0x2e3a, 0x2e3b,
+	0x2e40, 0x2e40,
+	0x301c, 0x301c,
+	0x3030, 0x3030,
+	0x30a0, 0x30a0,
+	0xfe31, 0xfe32,
+	0xfe58, 0xfe58,
+	0xfe63, 0xfe63,
+	0xff0d, 0xff0d,
+}; /* CR_Pd */
+
+/* 'Pe': General Category */
+static const OnigCodePoint CR_Pe[] = {
+	72,
+	0x0029, 0x0029,
+	0x005d, 0x005d,
+	0x007d, 0x007d,
+	0x0f3b, 0x0f3b,
+	0x0f3d, 0x0f3d,
+	0x169c, 0x169c,
+	0x2046, 0x2046,
+	0x207e, 0x207e,
+	0x208e, 0x208e,
+	0x2309, 0x2309,
+	0x230b, 0x230b,
+	0x232a, 0x232a,
+	0x2769, 0x2769,
+	0x276b, 0x276b,
+	0x276d, 0x276d,
+	0x276f, 0x276f,
+	0x2771, 0x2771,
+	0x2773, 0x2773,
+	0x2775, 0x2775,
+	0x27c6, 0x27c6,
+	0x27e7, 0x27e7,
+	0x27e9, 0x27e9,
+	0x27eb, 0x27eb,
+	0x27ed, 0x27ed,
+	0x27ef, 0x27ef,
+	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,
+	0x2e23, 0x2e23,
+	0x2e25, 0x2e25,
+	0x2e27, 0x2e27,
+	0x2e29, 0x2e29,
+	0x3009, 0x3009,
+	0x300b, 0x300b,
+	0x300d, 0x300d,
+	0x300f, 0x300f,
+	0x3011, 0x3011,
+	0x3015, 0x3015,
+	0x3017, 0x3017,
+	0x3019, 0x3019,
+	0x301b, 0x301b,
+	0x301e, 0x301f,
+	0xfd3e, 0xfd3e,
+	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[] = {
+	10,
+	0x00bb, 0x00bb,
+	0x2019, 0x2019,
+	0x201d, 0x201d,
+	0x203a, 0x203a,
+	0x2e03, 0x2e03,
+	0x2e05, 0x2e05,
+	0x2e0a, 0x2e0a,
+	0x2e0d, 0x2e0d,
+	0x2e1d, 0x2e1d,
+	0x2e21, 0x2e21,
+}; /* CR_Pf */
+
+/* 'Pi': General Category */
+static const OnigCodePoint CR_Pi[] = {
+	11,
+	0x00ab, 0x00ab,
+	0x2018, 0x2018,
+	0x201b, 0x201c,
+	0x201f, 0x201f,
+	0x2039, 0x2039,
+	0x2e02, 0x2e02,
+	0x2e04, 0x2e04,
+	0x2e09, 0x2e09,
+	0x2e0c, 0x2e0c,
+	0x2e1c, 0x2e1c,
+	0x2e20, 0x2e20,
+}; /* CR_Pi */
+
+/* 'Po': General Category */
+static const OnigCodePoint CR_Po[] = {
+	179,
+	0x0021, 0x0023,
+	0x0025, 0x0027,
+	0x002a, 0x002a,
+	0x002c, 0x002c,
+	0x002e, 0x002f,
+	0x003a, 0x003b,
+	0x003f, 0x0040,
+	0x005c, 0x005c,
+	0x00a1, 0x00a1,
+	0x00a7, 0x00a7,
+	0x00b6, 0x00b7,
+	0x00bf, 0x00bf,
+	0x037e, 0x037e,
+	0x0387, 0x0387,
+	0x055a, 0x055f,
+	0x0589, 0x0589,
+	0x05c0, 0x05c0,
+	0x05c3, 0x05c3,
+	0x05c6, 0x05c6,
+	0x05f3, 0x05f4,
+	0x0609, 0x060a,
+	0x060c, 0x060d,
+	0x061b, 0x061b,
+	0x061e, 0x061f,
+	0x066a, 0x066d,
+	0x06d4, 0x06d4,
+	0x0700, 0x070d,
+	0x07f7, 0x07f9,
+	0x0830, 0x083e,
+	0x085e, 0x085e,
+	0x0964, 0x0965,
+	0x0970, 0x0970,
+	0x09fd, 0x09fd,
+	0x0a76, 0x0a76,
+	0x0af0, 0x0af0,
+	0x0c77, 0x0c77,
+	0x0c84, 0x0c84,
+	0x0df4, 0x0df4,
+	0x0e4f, 0x0e4f,
+	0x0e5a, 0x0e5b,
+	0x0f04, 0x0f12,
+	0x0f14, 0x0f14,
+	0x0f85, 0x0f85,
+	0x0fd0, 0x0fd4,
+	0x0fd9, 0x0fda,
+	0x104a, 0x104f,
+	0x10fb, 0x10fb,
+	0x1360, 0x1368,
+	0x166e, 0x166e,
+	0x16eb, 0x16ed,
+	0x1735, 0x1736,
+	0x17d4, 0x17d6,
+	0x17d8, 0x17da,
+	0x1800, 0x1805,
+	0x1807, 0x180a,
+	0x1944, 0x1945,
+	0x1a1e, 0x1a1f,
+	0x1aa0, 0x1aa6,
+	0x1aa8, 0x1aad,
+	0x1b5a, 0x1b60,
+	0x1bfc, 0x1bff,
+	0x1c3b, 0x1c3f,
+	0x1c7e, 0x1c7f,
+	0x1cc0, 0x1cc7,
+	0x1cd3, 0x1cd3,
+	0x2016, 0x2017,
+	0x2020, 0x2027,
+	0x2030, 0x2038,
+	0x203b, 0x203e,
+	0x2041, 0x2043,
+	0x2047, 0x2051,
+	0x2053, 0x2053,
+	0x2055, 0x205e,
+	0x2cf9, 0x2cfc,
+	0x2cfe, 0x2cff,
+	0x2d70, 0x2d70,
+	0x2e00, 0x2e01,
+	0x2e06, 0x2e08,
+	0x2e0b, 0x2e0b,
+	0x2e0e, 0x2e16,
+	0x2e18, 0x2e19,
+	0x2e1b, 0x2e1b,
+	0x2e1e, 0x2e1f,
+	0x2e2a, 0x2e2e,
+	0x2e30, 0x2e39,
+	0x2e3c, 0x2e3f,
+	0x2e41, 0x2e41,
+	0x2e43, 0x2e4f,
+	0x3001, 0x3003,
+	0x303d, 0x303d,
+	0x30fb, 0x30fb,
+	0xa4fe, 0xa4ff,
+	0xa60d, 0xa60f,
+	0xa673, 0xa673,
+	0xa67e, 0xa67e,
+	0xa6f2, 0xa6f7,
+	0xa874, 0xa877,
+	0xa8ce, 0xa8cf,
+	0xa8f8, 0xa8fa,
+	0xa8fc, 0xa8fc,
+	0xa92e, 0xa92f,
+	0xa95f, 0xa95f,
+	0xa9c1, 0xa9cd,
+	0xa9de, 0xa9df,
+	0xaa5c, 0xaa5f,
+	0xaade, 0xaadf,
+	0xaaf0, 0xaaf1,
+	0xabeb, 0xabeb,
+	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, 0x10102,
+	0x1039f, 0x1039f,
+	0x103d0, 0x103d0,
+	0x1056f, 0x1056f,
+	0x10857, 0x10857,
+	0x1091f, 0x1091f,
+	0x1093f, 0x1093f,
+	0x10a50, 0x10a58,
+	0x10a7f, 0x10a7f,
+	0x10af0, 0x10af6,
+	0x10b39, 0x10b3f,
+	0x10b99, 0x10b9c,
+	0x10f55, 0x10f59,
+	0x11047, 0x1104d,
+	0x110bb, 0x110bc,
+	0x110be, 0x110c1,
+	0x11140, 0x11143,
+	0x11174, 0x11175,
+	0x111c5, 0x111c8,
+	0x111cd, 0x111cd,
+	0x111db, 0x111db,
+	0x111dd, 0x111df,
+	0x11238, 0x1123d,
+	0x112a9, 0x112a9,
+	0x1144b, 0x1144f,
+	0x1145b, 0x1145b,
+	0x1145d, 0x1145d,
+	0x114c6, 0x114c6,
+	0x115c1, 0x115d7,
+	0x11641, 0x11643,
+	0x11660, 0x1166c,
+	0x1173c, 0x1173e,
+	0x1183b, 0x1183b,
+	0x119e2, 0x119e2,
+	0x11a3f, 0x11a46,
+	0x11a9a, 0x11a9c,
+	0x11a9e, 0x11aa2,
+	0x11c41, 0x11c45,
+	0x11c70, 0x11c71,
+	0x11ef7, 0x11ef8,
+	0x11fff, 0x11fff,
+	0x12470, 0x12474,
+	0x16a6e, 0x16a6f,
+	0x16af5, 0x16af5,
+	0x16b37, 0x16b3b,
+	0x16b44, 0x16b44,
+	0x16e97, 0x16e9a,
+	0x16fe2, 0x16fe2,
+	0x1bc9f, 0x1bc9f,
+	0x1da87, 0x1da8b,
+	0x1e95e, 0x1e95f,
+}; /* CR_Po */
+
+/* 'Ps': General Category */
+static const OnigCodePoint CR_Ps[] = {
+	75,
+	0x0028, 0x0028,
+	0x005b, 0x005b,
+	0x007b, 0x007b,
+	0x0f3a, 0x0f3a,
+	0x0f3c, 0x0f3c,
+	0x169b, 0x169b,
+	0x201a, 0x201a,
+	0x201e, 0x201e,
+	0x2045, 0x2045,
+	0x207d, 0x207d,
+	0x208d, 0x208d,
+	0x2308, 0x2308,
+	0x230a, 0x230a,
+	0x2329, 0x2329,
+	0x2768, 0x2768,
+	0x276a, 0x276a,
+	0x276c, 0x276c,
+	0x276e, 0x276e,
+	0x2770, 0x2770,
+	0x2772, 0x2772,
+	0x2774, 0x2774,
+	0x27c5, 0x27c5,
+	0x27e6, 0x27e6,
+	0x27e8, 0x27e8,
+	0x27ea, 0x27ea,
+	0x27ec, 0x27ec,
+	0x27ee, 0x27ee,
+	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,
+	0x2e22, 0x2e22,
+	0x2e24, 0x2e24,
+	0x2e26, 0x2e26,
+	0x2e28, 0x2e28,
+	0x2e42, 0x2e42,
+	0x3008, 0x3008,
+	0x300a, 0x300a,
+	0x300c, 0x300c,
+	0x300e, 0x300e,
+	0x3010, 0x3010,
+	0x3014, 0x3014,
+	0x3016, 0x3016,
+	0x3018, 0x3018,
+	0x301a, 0x301a,
+	0x301d, 0x301d,
+	0xfd3f, 0xfd3f,
+	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[] = {
+	226,
+	0x0024, 0x0024,
+	0x002b, 0x002b,
+	0x003c, 0x003e,
+	0x005e, 0x005e,
+	0x0060, 0x0060,
+	0x007c, 0x007c,
+	0x007e, 0x007e,
+	0x00a2, 0x00a6,
+	0x00a8, 0x00a9,
+	0x00ac, 0x00ac,
+	0x00ae, 0x00b1,
+	0x00b4, 0x00b4,
+	0x00b8, 0x00b8,
+	0x00d7, 0x00d7,
+	0x00f7, 0x00f7,
+	0x02c2, 0x02c5,
+	0x02d2, 0x02df,
+	0x02e5, 0x02eb,
+	0x02ed, 0x02ed,
+	0x02ef, 0x02ff,
+	0x0375, 0x0375,
+	0x0384, 0x0385,
+	0x03f6, 0x03f6,
+	0x0482, 0x0482,
+	0x058d, 0x058f,
+	0x0606, 0x0608,
+	0x060b, 0x060b,
+	0x060e, 0x060f,
+	0x06de, 0x06de,
+	0x06e9, 0x06e9,
+	0x06fd, 0x06fe,
+	0x07f6, 0x07f6,
+	0x07fe, 0x07ff,
+	0x09f2, 0x09f3,
+	0x09fa, 0x09fb,
+	0x0af1, 0x0af1,
+	0x0b70, 0x0b70,
+	0x0bf3, 0x0bfa,
+	0x0c7f, 0x0c7f,
+	0x0d4f, 0x0d4f,
+	0x0d79, 0x0d79,
+	0x0e3f, 0x0e3f,
+	0x0f01, 0x0f03,
+	0x0f13, 0x0f13,
+	0x0f15, 0x0f17,
+	0x0f1a, 0x0f1f,
+	0x0f34, 0x0f34,
+	0x0f36, 0x0f36,
+	0x0f38, 0x0f38,
+	0x0fbe, 0x0fc5,
+	0x0fc7, 0x0fcc,
+	0x0fce, 0x0fcf,
+	0x0fd5, 0x0fd8,
+	0x109e, 0x109f,
+	0x1390, 0x1399,
+	0x166d, 0x166d,
+	0x17db, 0x17db,
+	0x1940, 0x1940,
+	0x19de, 0x19ff,
+	0x1b61, 0x1b6a,
+	0x1b74, 0x1b7c,
+	0x1fbd, 0x1fbd,
+	0x1fbf, 0x1fc1,
+	0x1fcd, 0x1fcf,
+	0x1fdd, 0x1fdf,
+	0x1fed, 0x1fef,
+	0x1ffd, 0x1ffe,
+	0x2044, 0x2044,
+	0x2052, 0x2052,
+	0x207a, 0x207c,
+	0x208a, 0x208c,
+	0x20a0, 0x20bf,
+	0x2100, 0x2101,
+	0x2103, 0x2106,
+	0x2108, 0x2109,
+	0x2114, 0x2114,
+	0x2116, 0x2118,
+	0x211e, 0x2123,
+	0x2125, 0x2125,
+	0x2127, 0x2127,
+	0x2129, 0x2129,
+	0x212e, 0x212e,
+	0x213a, 0x213b,
+	0x2140, 0x2144,
+	0x214a, 0x214d,
+	0x214f, 0x214f,
+	0x218a, 0x218b,
+	0x2190, 0x2307,
+	0x230c, 0x2328,
+	0x232b, 0x2426,
+	0x2440, 0x244a,
+	0x249c, 0x24e9,
+	0x2500, 0x2767,
+	0x2794, 0x27c4,
+	0x27c7, 0x27e5,
+	0x27f0, 0x2982,
+	0x2999, 0x29d7,
+	0x29dc, 0x29fb,
+	0x29fe, 0x2b73,
+	0x2b76, 0x2b95,
+	0x2b98, 0x2bff,
+	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, 0x31e3,
+	0x3200, 0x321e,
+	0x322a, 0x3247,
+	0x3250, 0x3250,
+	0x3260, 0x327f,
+	0x328a, 0x32b0,
+	0x32c0, 0x33ff,
+	0x4dc0, 0x4dff,
+	0xa490, 0xa4c6,
+	0xa700, 0xa716,
+	0xa720, 0xa721,
+	0xa789, 0xa78a,
+	0xa828, 0xa82b,
+	0xa836, 0xa839,
+	0xaa77, 0xaa79,
+	0xab5b, 0xab5b,
+	0xfb29, 0xfb29,
+	0xfbb2, 0xfbc1,
+	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,
+	0x10137, 0x1013f,
+	0x10179, 0x10189,
+	0x1018c, 0x1018e,
+	0x10190, 0x1019b,
+	0x101a0, 0x101a0,
+	0x101d0, 0x101fc,
+	0x10877, 0x10878,
+	0x10ac8, 0x10ac8,
+	0x1173f, 0x1173f,
+	0x11fd5, 0x11ff1,
+	0x16b3c, 0x16b3f,
+	0x16b45, 0x16b45,
+	0x1bc9c, 0x1bc9c,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d164,
+	0x1d16a, 0x1d16c,
+	0x1d183, 0x1d184,
+	0x1d18c, 0x1d1a9,
+	0x1d1ae, 0x1d1e8,
+	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,
+	0x1d800, 0x1d9ff,
+	0x1da37, 0x1da3a,
+	0x1da6d, 0x1da74,
+	0x1da76, 0x1da83,
+	0x1da85, 0x1da86,
+	0x1e14f, 0x1e14f,
+	0x1e2ff, 0x1e2ff,
+	0x1ecac, 0x1ecac,
+	0x1ecb0, 0x1ecb0,
+	0x1ed2e, 0x1ed2e,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0bf,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0f5,
+	0x1f110, 0x1f16c,
+	0x1f170, 0x1f1ac,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23b,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f260, 0x1f265,
+	0x1f300, 0x1f6d5,
+	0x1f6e0, 0x1f6ec,
+	0x1f6f0, 0x1f6fa,
+	0x1f700, 0x1f773,
+	0x1f780, 0x1f7d8,
+	0x1f7e0, 0x1f7eb,
+	0x1f800, 0x1f80b,
+	0x1f810, 0x1f847,
+	0x1f850, 0x1f859,
+	0x1f860, 0x1f887,
+	0x1f890, 0x1f8ad,
+	0x1f900, 0x1f90b,
+	0x1f90d, 0x1f971,
+	0x1f973, 0x1f976,
+	0x1f97a, 0x1f9a2,
+	0x1f9a5, 0x1f9aa,
+	0x1f9ae, 0x1f9ca,
+	0x1f9cd, 0x1fa53,
+	0x1fa60, 0x1fa6d,
+	0x1fa70, 0x1fa73,
+	0x1fa78, 0x1fa7a,
+	0x1fa80, 0x1fa82,
+	0x1fa90, 0x1fa95,
+}; /* CR_S */
+
+/* 'Sc': General Category */
+static const OnigCodePoint CR_Sc[] = {
+	21,
+	0x0024, 0x0024,
+	0x00a2, 0x00a5,
+	0x058f, 0x058f,
+	0x060b, 0x060b,
+	0x07fe, 0x07ff,
+	0x09f2, 0x09f3,
+	0x09fb, 0x09fb,
+	0x0af1, 0x0af1,
+	0x0bf9, 0x0bf9,
+	0x0e3f, 0x0e3f,
+	0x17db, 0x17db,
+	0x20a0, 0x20bf,
+	0xa838, 0xa838,
+	0xfdfc, 0xfdfc,
+	0xfe69, 0xfe69,
+	0xff04, 0xff04,
+	0xffe0, 0xffe1,
+	0xffe5, 0xffe6,
+	0x11fdd, 0x11fe0,
+	0x1e2ff, 0x1e2ff,
+	0x1ecb0, 0x1ecb0,
+}; /* CR_Sc */
+
+/* 'Sk': General Category */
+static const OnigCodePoint CR_Sk[] = {
+	29,
+	0x005e, 0x005e,
+	0x0060, 0x0060,
+	0x00a8, 0x00a8,
+	0x00af, 0x00af,
+	0x00b4, 0x00b4,
+	0x00b8, 0x00b8,
+	0x02c2, 0x02c5,
+	0x02d2, 0x02df,
+	0x02e5, 0x02eb,
+	0x02ed, 0x02ed,
+	0x02ef, 0x02ff,
+	0x0375, 0x0375,
+	0x0384, 0x0385,
+	0x1fbd, 0x1fbd,
+	0x1fbf, 0x1fc1,
+	0x1fcd, 0x1fcf,
+	0x1fdd, 0x1fdf,
+	0x1fed, 0x1fef,
+	0x1ffd, 0x1ffe,
+	0x309b, 0x309c,
+	0xa700, 0xa716,
+	0xa720, 0xa721,
+	0xa789, 0xa78a,
+	0xab5b, 0xab5b,
+	0xfbb2, 0xfbc1,
+	0xff3e, 0xff3e,
+	0xff40, 0xff40,
+	0xffe3, 0xffe3,
+	0x1f3fb, 0x1f3ff,
+}; /* CR_Sk */
+
+/* 'Sm': General Category */
+static const OnigCodePoint CR_Sm[] = {
+	64,
+	0x002b, 0x002b,
+	0x003c, 0x003e,
+	0x007c, 0x007c,
+	0x007e, 0x007e,
+	0x00ac, 0x00ac,
+	0x00b1, 0x00b1,
+	0x00d7, 0x00d7,
+	0x00f7, 0x00f7,
+	0x03f6, 0x03f6,
+	0x0606, 0x0608,
+	0x2044, 0x2044,
+	0x2052, 0x2052,
+	0x207a, 0x207c,
+	0x208a, 0x208c,
+	0x2118, 0x2118,
+	0x2140, 0x2144,
+	0x214b, 0x214b,
+	0x2190, 0x2194,
+	0x219a, 0x219b,
+	0x21a0, 0x21a0,
+	0x21a3, 0x21a3,
+	0x21a6, 0x21a6,
+	0x21ae, 0x21ae,
+	0x21ce, 0x21cf,
+	0x21d2, 0x21d2,
+	0x21d4, 0x21d4,
+	0x21f4, 0x22ff,
+	0x2320, 0x2321,
+	0x237c, 0x237c,
+	0x239b, 0x23b3,
+	0x23dc, 0x23e1,
+	0x25b7, 0x25b7,
+	0x25c1, 0x25c1,
+	0x25f8, 0x25ff,
+	0x266f, 0x266f,
+	0x27c0, 0x27c4,
+	0x27c7, 0x27e5,
+	0x27f0, 0x27ff,
+	0x2900, 0x2982,
+	0x2999, 0x29d7,
+	0x29dc, 0x29fb,
+	0x29fe, 0x2aff,
+	0x2b30, 0x2b44,
+	0x2b47, 0x2b4c,
+	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,
+	0x1eef0, 0x1eef1,
+}; /* CR_Sm */
+
+/* 'So': General Category */
+static const OnigCodePoint CR_So[] = {
+	180,
+	0x00a6, 0x00a6,
+	0x00a9, 0x00a9,
+	0x00ae, 0x00ae,
+	0x00b0, 0x00b0,
+	0x0482, 0x0482,
+	0x058d, 0x058e,
+	0x060e, 0x060f,
+	0x06de, 0x06de,
+	0x06e9, 0x06e9,
+	0x06fd, 0x06fe,
+	0x07f6, 0x07f6,
+	0x09fa, 0x09fa,
+	0x0b70, 0x0b70,
+	0x0bf3, 0x0bf8,
+	0x0bfa, 0x0bfa,
+	0x0c7f, 0x0c7f,
+	0x0d4f, 0x0d4f,
+	0x0d79, 0x0d79,
+	0x0f01, 0x0f03,
+	0x0f13, 0x0f13,
+	0x0f15, 0x0f17,
+	0x0f1a, 0x0f1f,
+	0x0f34, 0x0f34,
+	0x0f36, 0x0f36,
+	0x0f38, 0x0f38,
+	0x0fbe, 0x0fc5,
+	0x0fc7, 0x0fcc,
+	0x0fce, 0x0fcf,
+	0x0fd5, 0x0fd8,
+	0x109e, 0x109f,
+	0x1390, 0x1399,
+	0x166d, 0x166d,
+	0x1940, 0x1940,
+	0x19de, 0x19ff,
+	0x1b61, 0x1b6a,
+	0x1b74, 0x1b7c,
+	0x2100, 0x2101,
+	0x2103, 0x2106,
+	0x2108, 0x2109,
+	0x2114, 0x2114,
+	0x2116, 0x2117,
+	0x211e, 0x2123,
+	0x2125, 0x2125,
+	0x2127, 0x2127,
+	0x2129, 0x2129,
+	0x212e, 0x212e,
+	0x213a, 0x213b,
+	0x214a, 0x214a,
+	0x214c, 0x214d,
+	0x214f, 0x214f,
+	0x218a, 0x218b,
+	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,
+	0x23b4, 0x23db,
+	0x23e2, 0x2426,
+	0x2440, 0x244a,
+	0x249c, 0x24e9,
+	0x2500, 0x25b6,
+	0x25b8, 0x25c0,
+	0x25c2, 0x25f7,
+	0x2600, 0x266e,
+	0x2670, 0x2767,
+	0x2794, 0x27bf,
+	0x2800, 0x28ff,
+	0x2b00, 0x2b2f,
+	0x2b45, 0x2b46,
+	0x2b4d, 0x2b73,
+	0x2b76, 0x2b95,
+	0x2b98, 0x2bff,
+	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, 0x31e3,
+	0x3200, 0x321e,
+	0x322a, 0x3247,
+	0x3250, 0x3250,
+	0x3260, 0x327f,
+	0x328a, 0x32b0,
+	0x32c0, 0x33ff,
+	0x4dc0, 0x4dff,
+	0xa490, 0xa4c6,
+	0xa828, 0xa82b,
+	0xa836, 0xa837,
+	0xa839, 0xa839,
+	0xaa77, 0xaa79,
+	0xfdfd, 0xfdfd,
+	0xffe4, 0xffe4,
+	0xffe8, 0xffe8,
+	0xffed, 0xffee,
+	0xfffc, 0xfffd,
+	0x10137, 0x1013f,
+	0x10179, 0x10189,
+	0x1018c, 0x1018e,
+	0x10190, 0x1019b,
+	0x101a0, 0x101a0,
+	0x101d0, 0x101fc,
+	0x10877, 0x10878,
+	0x10ac8, 0x10ac8,
+	0x1173f, 0x1173f,
+	0x11fd5, 0x11fdc,
+	0x11fe1, 0x11ff1,
+	0x16b3c, 0x16b3f,
+	0x16b45, 0x16b45,
+	0x1bc9c, 0x1bc9c,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d164,
+	0x1d16a, 0x1d16c,
+	0x1d183, 0x1d184,
+	0x1d18c, 0x1d1a9,
+	0x1d1ae, 0x1d1e8,
+	0x1d200, 0x1d241,
+	0x1d245, 0x1d245,
+	0x1d300, 0x1d356,
+	0x1d800, 0x1d9ff,
+	0x1da37, 0x1da3a,
+	0x1da6d, 0x1da74,
+	0x1da76, 0x1da83,
+	0x1da85, 0x1da86,
+	0x1e14f, 0x1e14f,
+	0x1ecac, 0x1ecac,
+	0x1ed2e, 0x1ed2e,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0bf,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0f5,
+	0x1f110, 0x1f16c,
+	0x1f170, 0x1f1ac,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23b,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f260, 0x1f265,
+	0x1f300, 0x1f3fa,
+	0x1f400, 0x1f6d5,
+	0x1f6e0, 0x1f6ec,
+	0x1f6f0, 0x1f6fa,
+	0x1f700, 0x1f773,
+	0x1f780, 0x1f7d8,
+	0x1f7e0, 0x1f7eb,
+	0x1f800, 0x1f80b,
+	0x1f810, 0x1f847,
+	0x1f850, 0x1f859,
+	0x1f860, 0x1f887,
+	0x1f890, 0x1f8ad,
+	0x1f900, 0x1f90b,
+	0x1f90d, 0x1f971,
+	0x1f973, 0x1f976,
+	0x1f97a, 0x1f9a2,
+	0x1f9a5, 0x1f9aa,
+	0x1f9ae, 0x1f9ca,
+	0x1f9cd, 0x1fa53,
+	0x1fa60, 0x1fa6d,
+	0x1fa70, 0x1fa73,
+	0x1fa78, 0x1fa7a,
+	0x1fa80, 0x1fa82,
+	0x1fa90, 0x1fa95,
+}; /* CR_So */
+
+/* 'Z': Major Category */
+static const OnigCodePoint CR_Z[] = {
+	8,
+	0x0020, 0x0020,
+	0x00a0, 0x00a0,
+	0x1680, 0x1680,
+	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[] = {
+	7,
+	0x0020, 0x0020,
+	0x00a0, 0x00a0,
+	0x1680, 0x1680,
+	0x2000, 0x200a,
+	0x202f, 0x202f,
+	0x205f, 0x205f,
+	0x3000, 0x3000,
+}; /* CR_Zs */
+
+/* 'Math': Derived Property */
+static const OnigCodePoint CR_Math[] = {
+	138,
+	0x002b, 0x002b,
+	0x003c, 0x003e,
+	0x005e, 0x005e,
+	0x007c, 0x007c,
+	0x007e, 0x007e,
+	0x00ac, 0x00ac,
+	0x00b1, 0x00b1,
+	0x00d7, 0x00d7,
+	0x00f7, 0x00f7,
+	0x03d0, 0x03d2,
+	0x03d5, 0x03d5,
+	0x03f0, 0x03f1,
+	0x03f4, 0x03f6,
+	0x0606, 0x0608,
+	0x2016, 0x2016,
+	0x2032, 0x2034,
+	0x2040, 0x2040,
+	0x2044, 0x2044,
+	0x2052, 0x2052,
+	0x2061, 0x2064,
+	0x207a, 0x207e,
+	0x208a, 0x208e,
+	0x20d0, 0x20dc,
+	0x20e1, 0x20e1,
+	0x20e5, 0x20e6,
+	0x20eb, 0x20ef,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2118, 0x211d,
+	0x2124, 0x2124,
+	0x2128, 0x2129,
+	0x212c, 0x212d,
+	0x212f, 0x2131,
+	0x2133, 0x2138,
+	0x213c, 0x2149,
+	0x214b, 0x214b,
+	0x2190, 0x21a7,
+	0x21a9, 0x21ae,
+	0x21b0, 0x21b1,
+	0x21b6, 0x21b7,
+	0x21bc, 0x21db,
+	0x21dd, 0x21dd,
+	0x21e4, 0x21e5,
+	0x21f4, 0x22ff,
+	0x2308, 0x230b,
+	0x2320, 0x2321,
+	0x237c, 0x237c,
+	0x239b, 0x23b5,
+	0x23b7, 0x23b7,
+	0x23d0, 0x23d0,
+	0x23dc, 0x23e2,
+	0x25a0, 0x25a1,
+	0x25ae, 0x25b7,
+	0x25bc, 0x25c1,
+	0x25c6, 0x25c7,
+	0x25ca, 0x25cb,
+	0x25cf, 0x25d3,
+	0x25e2, 0x25e2,
+	0x25e4, 0x25e4,
+	0x25e7, 0x25ec,
+	0x25f8, 0x25ff,
+	0x2605, 0x2606,
+	0x2640, 0x2640,
+	0x2642, 0x2642,
+	0x2660, 0x2663,
+	0x266d, 0x266f,
+	0x27c0, 0x27ff,
+	0x2900, 0x2aff,
+	0x2b30, 0x2b44,
+	0x2b47, 0x2b4c,
+	0xfb29, 0xfb29,
+	0xfe61, 0xfe66,
+	0xfe68, 0xfe68,
+	0xff0b, 0xff0b,
+	0xff1c, 0xff1e,
+	0xff3c, 0xff3c,
+	0xff3e, 0xff3e,
+	0xff5c, 0xff5c,
+	0xff5e, 0xff5e,
+	0xffe2, 0xffe2,
+	0xffe9, 0xffec,
+	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, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+}; /* CR_Math */
+
+/* 'Alphabetic': Derived Property */
+#define CR_Alphabetic CR_Alpha
+
+/* 'Lowercase': Derived Property */
+#define CR_Lowercase CR_Lower
+
+/* 'Uppercase': Derived Property */
+#define CR_Uppercase CR_Upper
+
+/* 'Cased': Derived Property */
+static const OnigCodePoint CR_Cased[] = {
+	140,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x01ba,
+	0x01bc, 0x01bf,
+	0x01c4, 0x0293,
+	0x0295, 0x02b8,
+	0x02c0, 0x02c1,
+	0x02e0, 0x02e4,
+	0x0345, 0x0345,
+	0x0370, 0x0373,
+	0x0376, 0x0377,
+	0x037a, 0x037d,
+	0x037f, 0x037f,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x048a, 0x052f,
+	0x0531, 0x0556,
+	0x0560, 0x0588,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fd, 0x10ff,
+	0x13a0, 0x13f5,
+	0x13f8, 0x13fd,
+	0x1c80, 0x1c88,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cbf,
+	0x1d00, 0x1dbf,
+	0x1e00, 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, 0x209c,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2119, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x212d,
+	0x212f, 0x2134,
+	0x2139, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2160, 0x217f,
+	0x2183, 0x2184,
+	0x24b6, 0x24e9,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cee,
+	0x2cf2, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0xa640, 0xa66d,
+	0xa680, 0xa69d,
+	0xa722, 0xa787,
+	0xa78b, 0xa78e,
+	0xa790, 0xa7bf,
+	0xa7c2, 0xa7c6,
+	0xa7f8, 0xa7fa,
+	0xab30, 0xab5a,
+	0xab5c, 0xab67,
+	0xab70, 0xabbf,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0x10400, 0x1044f,
+	0x104b0, 0x104d3,
+	0x104d8, 0x104fb,
+	0x10c80, 0x10cb2,
+	0x10cc0, 0x10cf2,
+	0x118a0, 0x118df,
+	0x16e40, 0x16e7f,
+	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, 0x1d7cb,
+	0x1e900, 0x1e943,
+	0x1f130, 0x1f149,
+	0x1f150, 0x1f169,
+	0x1f170, 0x1f189,
+}; /* CR_Cased */
+
+/* 'Case_Ignorable': Derived Property */
+static const OnigCodePoint CR_Case_Ignorable[] = {
+	401,
+	0x0027, 0x0027,
+	0x002e, 0x002e,
+	0x003a, 0x003a,
+	0x005e, 0x005e,
+	0x0060, 0x0060,
+	0x00a8, 0x00a8,
+	0x00ad, 0x00ad,
+	0x00af, 0x00af,
+	0x00b4, 0x00b4,
+	0x00b7, 0x00b8,
+	0x02b0, 0x036f,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x0384, 0x0385,
+	0x0387, 0x0387,
+	0x0483, 0x0489,
+	0x0559, 0x0559,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05f4, 0x05f4,
+	0x0600, 0x0605,
+	0x0610, 0x061a,
+	0x061c, 0x061c,
+	0x0640, 0x0640,
+	0x064b, 0x065f,
+	0x0670, 0x0670,
+	0x06d6, 0x06dd,
+	0x06df, 0x06e8,
+	0x06ea, 0x06ed,
+	0x070f, 0x070f,
+	0x0711, 0x0711,
+	0x0730, 0x074a,
+	0x07a6, 0x07b0,
+	0x07eb, 0x07f5,
+	0x07fa, 0x07fa,
+	0x07fd, 0x07fd,
+	0x0816, 0x082d,
+	0x0859, 0x085b,
+	0x08d3, 0x0902,
+	0x093a, 0x093a,
+	0x093c, 0x093c,
+	0x0941, 0x0948,
+	0x094d, 0x094d,
+	0x0951, 0x0957,
+	0x0962, 0x0963,
+	0x0971, 0x0971,
+	0x0981, 0x0981,
+	0x09bc, 0x09bc,
+	0x09c1, 0x09c4,
+	0x09cd, 0x09cd,
+	0x09e2, 0x09e3,
+	0x09fe, 0x09fe,
+	0x0a01, 0x0a02,
+	0x0a3c, 0x0a3c,
+	0x0a41, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a70, 0x0a71,
+	0x0a75, 0x0a75,
+	0x0a81, 0x0a82,
+	0x0abc, 0x0abc,
+	0x0ac1, 0x0ac5,
+	0x0ac7, 0x0ac8,
+	0x0acd, 0x0acd,
+	0x0ae2, 0x0ae3,
+	0x0afa, 0x0aff,
+	0x0b01, 0x0b01,
+	0x0b3c, 0x0b3c,
+	0x0b3f, 0x0b3f,
+	0x0b41, 0x0b44,
+	0x0b4d, 0x0b4d,
+	0x0b56, 0x0b56,
+	0x0b62, 0x0b63,
+	0x0b82, 0x0b82,
+	0x0bc0, 0x0bc0,
+	0x0bcd, 0x0bcd,
+	0x0c00, 0x0c00,
+	0x0c04, 0x0c04,
+	0x0c3e, 0x0c40,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c62, 0x0c63,
+	0x0c81, 0x0c81,
+	0x0cbc, 0x0cbc,
+	0x0cbf, 0x0cbf,
+	0x0cc6, 0x0cc6,
+	0x0ccc, 0x0ccd,
+	0x0ce2, 0x0ce3,
+	0x0d00, 0x0d01,
+	0x0d3b, 0x0d3c,
+	0x0d41, 0x0d44,
+	0x0d4d, 0x0d4d,
+	0x0d62, 0x0d63,
+	0x0dca, 0x0dca,
+	0x0dd2, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0e31, 0x0e31,
+	0x0e34, 0x0e3a,
+	0x0e46, 0x0e4e,
+	0x0eb1, 0x0eb1,
+	0x0eb4, 0x0ebc,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0f18, 0x0f19,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f71, 0x0f7e,
+	0x0f80, 0x0f84,
+	0x0f86, 0x0f87,
+	0x0f8d, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x102d, 0x1030,
+	0x1032, 0x1037,
+	0x1039, 0x103a,
+	0x103d, 0x103e,
+	0x1058, 0x1059,
+	0x105e, 0x1060,
+	0x1071, 0x1074,
+	0x1082, 0x1082,
+	0x1085, 0x1086,
+	0x108d, 0x108d,
+	0x109d, 0x109d,
+	0x10fc, 0x10fc,
+	0x135d, 0x135f,
+	0x1712, 0x1714,
+	0x1732, 0x1734,
+	0x1752, 0x1753,
+	0x1772, 0x1773,
+	0x17b4, 0x17b5,
+	0x17b7, 0x17bd,
+	0x17c6, 0x17c6,
+	0x17c9, 0x17d3,
+	0x17d7, 0x17d7,
+	0x17dd, 0x17dd,
+	0x180b, 0x180e,
+	0x1843, 0x1843,
+	0x1885, 0x1886,
+	0x18a9, 0x18a9,
+	0x1920, 0x1922,
+	0x1927, 0x1928,
+	0x1932, 0x1932,
+	0x1939, 0x193b,
+	0x1a17, 0x1a18,
+	0x1a1b, 0x1a1b,
+	0x1a56, 0x1a56,
+	0x1a58, 0x1a5e,
+	0x1a60, 0x1a60,
+	0x1a62, 0x1a62,
+	0x1a65, 0x1a6c,
+	0x1a73, 0x1a7c,
+	0x1a7f, 0x1a7f,
+	0x1aa7, 0x1aa7,
+	0x1ab0, 0x1abe,
+	0x1b00, 0x1b03,
+	0x1b34, 0x1b34,
+	0x1b36, 0x1b3a,
+	0x1b3c, 0x1b3c,
+	0x1b42, 0x1b42,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1b81,
+	0x1ba2, 0x1ba5,
+	0x1ba8, 0x1ba9,
+	0x1bab, 0x1bad,
+	0x1be6, 0x1be6,
+	0x1be8, 0x1be9,
+	0x1bed, 0x1bed,
+	0x1bef, 0x1bf1,
+	0x1c2c, 0x1c33,
+	0x1c36, 0x1c37,
+	0x1c78, 0x1c7d,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce0,
+	0x1ce2, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1cf4, 0x1cf4,
+	0x1cf8, 0x1cf9,
+	0x1d2c, 0x1d6a,
+	0x1d78, 0x1d78,
+	0x1d9b, 0x1df9,
+	0x1dfb, 0x1dff,
+	0x1fbd, 0x1fbd,
+	0x1fbf, 0x1fc1,
+	0x1fcd, 0x1fcf,
+	0x1fdd, 0x1fdf,
+	0x1fed, 0x1fef,
+	0x1ffd, 0x1ffe,
+	0x200b, 0x200f,
+	0x2018, 0x2019,
+	0x2024, 0x2024,
+	0x2027, 0x2027,
+	0x202a, 0x202e,
+	0x2060, 0x2064,
+	0x2066, 0x206f,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x209c,
+	0x20d0, 0x20f0,
+	0x2c7c, 0x2c7d,
+	0x2cef, 0x2cf1,
+	0x2d6f, 0x2d6f,
+	0x2d7f, 0x2d7f,
+	0x2de0, 0x2dff,
+	0x2e2f, 0x2e2f,
+	0x3005, 0x3005,
+	0x302a, 0x302d,
+	0x3031, 0x3035,
+	0x303b, 0x303b,
+	0x3099, 0x309e,
+	0x30fc, 0x30fe,
+	0xa015, 0xa015,
+	0xa4f8, 0xa4fd,
+	0xa60c, 0xa60c,
+	0xa66f, 0xa672,
+	0xa674, 0xa67d,
+	0xa67f, 0xa67f,
+	0xa69c, 0xa69f,
+	0xa6f0, 0xa6f1,
+	0xa700, 0xa721,
+	0xa770, 0xa770,
+	0xa788, 0xa78a,
+	0xa7f8, 0xa7f9,
+	0xa802, 0xa802,
+	0xa806, 0xa806,
+	0xa80b, 0xa80b,
+	0xa825, 0xa826,
+	0xa8c4, 0xa8c5,
+	0xa8e0, 0xa8f1,
+	0xa8ff, 0xa8ff,
+	0xa926, 0xa92d,
+	0xa947, 0xa951,
+	0xa980, 0xa982,
+	0xa9b3, 0xa9b3,
+	0xa9b6, 0xa9b9,
+	0xa9bc, 0xa9bd,
+	0xa9cf, 0xa9cf,
+	0xa9e5, 0xa9e6,
+	0xaa29, 0xaa2e,
+	0xaa31, 0xaa32,
+	0xaa35, 0xaa36,
+	0xaa43, 0xaa43,
+	0xaa4c, 0xaa4c,
+	0xaa70, 0xaa70,
+	0xaa7c, 0xaa7c,
+	0xaab0, 0xaab0,
+	0xaab2, 0xaab4,
+	0xaab7, 0xaab8,
+	0xaabe, 0xaabf,
+	0xaac1, 0xaac1,
+	0xaadd, 0xaadd,
+	0xaaec, 0xaaed,
+	0xaaf3, 0xaaf4,
+	0xaaf6, 0xaaf6,
+	0xab5b, 0xab5f,
+	0xabe5, 0xabe5,
+	0xabe8, 0xabe8,
+	0xabed, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfbb2, 0xfbc1,
+	0xfe00, 0xfe0f,
+	0xfe13, 0xfe13,
+	0xfe20, 0xfe2f,
+	0xfe52, 0xfe52,
+	0xfe55, 0xfe55,
+	0xfeff, 0xfeff,
+	0xff07, 0xff07,
+	0xff0e, 0xff0e,
+	0xff1a, 0xff1a,
+	0xff3e, 0xff3e,
+	0xff40, 0xff40,
+	0xff70, 0xff70,
+	0xff9e, 0xff9f,
+	0xffe3, 0xffe3,
+	0xfff9, 0xfffb,
+	0x101fd, 0x101fd,
+	0x102e0, 0x102e0,
+	0x10376, 0x1037a,
+	0x10a01, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a0f,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x10ae5, 0x10ae6,
+	0x10d24, 0x10d27,
+	0x10f46, 0x10f50,
+	0x11001, 0x11001,
+	0x11038, 0x11046,
+	0x1107f, 0x11081,
+	0x110b3, 0x110b6,
+	0x110b9, 0x110ba,
+	0x110bd, 0x110bd,
+	0x110cd, 0x110cd,
+	0x11100, 0x11102,
+	0x11127, 0x1112b,
+	0x1112d, 0x11134,
+	0x11173, 0x11173,
+	0x11180, 0x11181,
+	0x111b6, 0x111be,
+	0x111c9, 0x111cc,
+	0x1122f, 0x11231,
+	0x11234, 0x11234,
+	0x11236, 0x11237,
+	0x1123e, 0x1123e,
+	0x112df, 0x112df,
+	0x112e3, 0x112ea,
+	0x11300, 0x11301,
+	0x1133b, 0x1133c,
+	0x11340, 0x11340,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11438, 0x1143f,
+	0x11442, 0x11444,
+	0x11446, 0x11446,
+	0x1145e, 0x1145e,
+	0x114b3, 0x114b8,
+	0x114ba, 0x114ba,
+	0x114bf, 0x114c0,
+	0x114c2, 0x114c3,
+	0x115b2, 0x115b5,
+	0x115bc, 0x115bd,
+	0x115bf, 0x115c0,
+	0x115dc, 0x115dd,
+	0x11633, 0x1163a,
+	0x1163d, 0x1163d,
+	0x1163f, 0x11640,
+	0x116ab, 0x116ab,
+	0x116ad, 0x116ad,
+	0x116b0, 0x116b5,
+	0x116b7, 0x116b7,
+	0x1171d, 0x1171f,
+	0x11722, 0x11725,
+	0x11727, 0x1172b,
+	0x1182f, 0x11837,
+	0x11839, 0x1183a,
+	0x119d4, 0x119d7,
+	0x119da, 0x119db,
+	0x119e0, 0x119e0,
+	0x11a01, 0x11a0a,
+	0x11a33, 0x11a38,
+	0x11a3b, 0x11a3e,
+	0x11a47, 0x11a47,
+	0x11a51, 0x11a56,
+	0x11a59, 0x11a5b,
+	0x11a8a, 0x11a96,
+	0x11a98, 0x11a99,
+	0x11c30, 0x11c36,
+	0x11c38, 0x11c3d,
+	0x11c3f, 0x11c3f,
+	0x11c92, 0x11ca7,
+	0x11caa, 0x11cb0,
+	0x11cb2, 0x11cb3,
+	0x11cb5, 0x11cb6,
+	0x11d31, 0x11d36,
+	0x11d3a, 0x11d3a,
+	0x11d3c, 0x11d3d,
+	0x11d3f, 0x11d45,
+	0x11d47, 0x11d47,
+	0x11d90, 0x11d91,
+	0x11d95, 0x11d95,
+	0x11d97, 0x11d97,
+	0x11ef3, 0x11ef4,
+	0x13430, 0x13438,
+	0x16af0, 0x16af4,
+	0x16b30, 0x16b36,
+	0x16b40, 0x16b43,
+	0x16f4f, 0x16f4f,
+	0x16f8f, 0x16f9f,
+	0x16fe0, 0x16fe1,
+	0x16fe3, 0x16fe3,
+	0x1bc9d, 0x1bc9e,
+	0x1bca0, 0x1bca3,
+	0x1d167, 0x1d169,
+	0x1d173, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0x1da00, 0x1da36,
+	0x1da3b, 0x1da6c,
+	0x1da75, 0x1da75,
+	0x1da84, 0x1da84,
+	0x1da9b, 0x1da9f,
+	0x1daa1, 0x1daaf,
+	0x1e000, 0x1e006,
+	0x1e008, 0x1e018,
+	0x1e01b, 0x1e021,
+	0x1e023, 0x1e024,
+	0x1e026, 0x1e02a,
+	0x1e130, 0x1e13d,
+	0x1e2ec, 0x1e2ef,
+	0x1e8d0, 0x1e8d6,
+	0x1e944, 0x1e94b,
+	0x1f3fb, 0x1f3ff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+}; /* CR_Case_Ignorable */
+
+/* 'Changes_When_Lowercased': Derived Property */
+static const OnigCodePoint CR_Changes_When_Lowercased[] = {
+	599,
+	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, 0x01c5,
+	0x01c7, 0x01c8,
+	0x01ca, 0x01cb,
+	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, 0x01f2,
+	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,
+	0x0243, 0x0246,
+	0x0248, 0x0248,
+	0x024a, 0x024a,
+	0x024c, 0x024c,
+	0x024e, 0x024e,
+	0x0370, 0x0370,
+	0x0372, 0x0372,
+	0x0376, 0x0376,
+	0x037f, 0x037f,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x038f,
+	0x0391, 0x03a1,
+	0x03a3, 0x03ab,
+	0x03cf, 0x03cf,
+	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,
+	0x04fa, 0x04fa,
+	0x04fc, 0x04fc,
+	0x04fe, 0x04fe,
+	0x0500, 0x0500,
+	0x0502, 0x0502,
+	0x0504, 0x0504,
+	0x0506, 0x0506,
+	0x0508, 0x0508,
+	0x050a, 0x050a,
+	0x050c, 0x050c,
+	0x050e, 0x050e,
+	0x0510, 0x0510,
+	0x0512, 0x0512,
+	0x0514, 0x0514,
+	0x0516, 0x0516,
+	0x0518, 0x0518,
+	0x051a, 0x051a,
+	0x051c, 0x051c,
+	0x051e, 0x051e,
+	0x0520, 0x0520,
+	0x0522, 0x0522,
+	0x0524, 0x0524,
+	0x0526, 0x0526,
+	0x0528, 0x0528,
+	0x052a, 0x052a,
+	0x052c, 0x052c,
+	0x052e, 0x052e,
+	0x0531, 0x0556,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x13a0, 0x13f5,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cbf,
+	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,
+	0x1e9e, 0x1e9e,
+	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,
+	0x1efa, 0x1efa,
+	0x1efc, 0x1efc,
+	0x1efe, 0x1efe,
+	0x1f08, 0x1f0f,
+	0x1f18, 0x1f1d,
+	0x1f28, 0x1f2f,
+	0x1f38, 0x1f3f,
+	0x1f48, 0x1f4d,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f5f,
+	0x1f68, 0x1f6f,
+	0x1f88, 0x1f8f,
+	0x1f98, 0x1f9f,
+	0x1fa8, 0x1faf,
+	0x1fb8, 0x1fbc,
+	0x1fc8, 0x1fcc,
+	0x1fd8, 0x1fdb,
+	0x1fe8, 0x1fec,
+	0x1ff8, 0x1ffc,
+	0x2126, 0x2126,
+	0x212a, 0x212b,
+	0x2132, 0x2132,
+	0x2160, 0x216f,
+	0x2183, 0x2183,
+	0x24b6, 0x24cf,
+	0x2c00, 0x2c2e,
+	0x2c60, 0x2c60,
+	0x2c62, 0x2c64,
+	0x2c67, 0x2c67,
+	0x2c69, 0x2c69,
+	0x2c6b, 0x2c6b,
+	0x2c6d, 0x2c70,
+	0x2c72, 0x2c72,
+	0x2c75, 0x2c75,
+	0x2c7e, 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,
+	0x2ceb, 0x2ceb,
+	0x2ced, 0x2ced,
+	0x2cf2, 0x2cf2,
+	0xa640, 0xa640,
+	0xa642, 0xa642,
+	0xa644, 0xa644,
+	0xa646, 0xa646,
+	0xa648, 0xa648,
+	0xa64a, 0xa64a,
+	0xa64c, 0xa64c,
+	0xa64e, 0xa64e,
+	0xa650, 0xa650,
+	0xa652, 0xa652,
+	0xa654, 0xa654,
+	0xa656, 0xa656,
+	0xa658, 0xa658,
+	0xa65a, 0xa65a,
+	0xa65c, 0xa65c,
+	0xa65e, 0xa65e,
+	0xa660, 0xa660,
+	0xa662, 0xa662,
+	0xa664, 0xa664,
+	0xa666, 0xa666,
+	0xa668, 0xa668,
+	0xa66a, 0xa66a,
+	0xa66c, 0xa66c,
+	0xa680, 0xa680,
+	0xa682, 0xa682,
+	0xa684, 0xa684,
+	0xa686, 0xa686,
+	0xa688, 0xa688,
+	0xa68a, 0xa68a,
+	0xa68c, 0xa68c,
+	0xa68e, 0xa68e,
+	0xa690, 0xa690,
+	0xa692, 0xa692,
+	0xa694, 0xa694,
+	0xa696, 0xa696,
+	0xa698, 0xa698,
+	0xa69a, 0xa69a,
+	0xa722, 0xa722,
+	0xa724, 0xa724,
+	0xa726, 0xa726,
+	0xa728, 0xa728,
+	0xa72a, 0xa72a,
+	0xa72c, 0xa72c,
+	0xa72e, 0xa72e,
+	0xa732, 0xa732,
+	0xa734, 0xa734,
+	0xa736, 0xa736,
+	0xa738, 0xa738,
+	0xa73a, 0xa73a,
+	0xa73c, 0xa73c,
+	0xa73e, 0xa73e,
+	0xa740, 0xa740,
+	0xa742, 0xa742,
+	0xa744, 0xa744,
+	0xa746, 0xa746,
+	0xa748, 0xa748,
+	0xa74a, 0xa74a,
+	0xa74c, 0xa74c,
+	0xa74e, 0xa74e,
+	0xa750, 0xa750,
+	0xa752, 0xa752,
+	0xa754, 0xa754,
+	0xa756, 0xa756,
+	0xa758, 0xa758,
+	0xa75a, 0xa75a,
+	0xa75c, 0xa75c,
+	0xa75e, 0xa75e,
+	0xa760, 0xa760,
+	0xa762, 0xa762,
+	0xa764, 0xa764,
+	0xa766, 0xa766,
+	0xa768, 0xa768,
+	0xa76a, 0xa76a,
+	0xa76c, 0xa76c,
+	0xa76e, 0xa76e,
+	0xa779, 0xa779,
+	0xa77b, 0xa77b,
+	0xa77d, 0xa77e,
+	0xa780, 0xa780,
+	0xa782, 0xa782,
+	0xa784, 0xa784,
+	0xa786, 0xa786,
+	0xa78b, 0xa78b,
+	0xa78d, 0xa78d,
+	0xa790, 0xa790,
+	0xa792, 0xa792,
+	0xa796, 0xa796,
+	0xa798, 0xa798,
+	0xa79a, 0xa79a,
+	0xa79c, 0xa79c,
+	0xa79e, 0xa79e,
+	0xa7a0, 0xa7a0,
+	0xa7a2, 0xa7a2,
+	0xa7a4, 0xa7a4,
+	0xa7a6, 0xa7a6,
+	0xa7a8, 0xa7a8,
+	0xa7aa, 0xa7ae,
+	0xa7b0, 0xa7b4,
+	0xa7b6, 0xa7b6,
+	0xa7b8, 0xa7b8,
+	0xa7ba, 0xa7ba,
+	0xa7bc, 0xa7bc,
+	0xa7be, 0xa7be,
+	0xa7c2, 0xa7c2,
+	0xa7c4, 0xa7c6,
+	0xff21, 0xff3a,
+	0x10400, 0x10427,
+	0x104b0, 0x104d3,
+	0x10c80, 0x10cb2,
+	0x118a0, 0x118bf,
+	0x16e40, 0x16e5f,
+	0x1e900, 0x1e921,
+}; /* CR_Changes_When_Lowercased */
+
+/* 'Changes_When_Uppercased': Derived Property */
+static const OnigCodePoint CR_Changes_When_Uppercased[] = {
+	616,
+	0x0061, 0x007a,
+	0x00b5, 0x00b5,
+	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, 0x0137,
+	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, 0x018c,
+	0x0192, 0x0192,
+	0x0195, 0x0195,
+	0x0199, 0x019a,
+	0x019e, 0x019e,
+	0x01a1, 0x01a1,
+	0x01a3, 0x01a3,
+	0x01a5, 0x01a5,
+	0x01a8, 0x01a8,
+	0x01ad, 0x01ad,
+	0x01b0, 0x01b0,
+	0x01b4, 0x01b4,
+	0x01b6, 0x01b6,
+	0x01b9, 0x01b9,
+	0x01bd, 0x01bd,
+	0x01bf, 0x01bf,
+	0x01c5, 0x01c6,
+	0x01c8, 0x01c9,
+	0x01cb, 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,
+	0x01f2, 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,
+	0x0223, 0x0223,
+	0x0225, 0x0225,
+	0x0227, 0x0227,
+	0x0229, 0x0229,
+	0x022b, 0x022b,
+	0x022d, 0x022d,
+	0x022f, 0x022f,
+	0x0231, 0x0231,
+	0x0233, 0x0233,
+	0x023c, 0x023c,
+	0x023f, 0x0240,
+	0x0242, 0x0242,
+	0x0247, 0x0247,
+	0x0249, 0x0249,
+	0x024b, 0x024b,
+	0x024d, 0x024d,
+	0x024f, 0x0254,
+	0x0256, 0x0257,
+	0x0259, 0x0259,
+	0x025b, 0x025c,
+	0x0260, 0x0261,
+	0x0263, 0x0263,
+	0x0265, 0x0266,
+	0x0268, 0x026c,
+	0x026f, 0x026f,
+	0x0271, 0x0272,
+	0x0275, 0x0275,
+	0x027d, 0x027d,
+	0x0280, 0x0280,
+	0x0282, 0x0283,
+	0x0287, 0x028c,
+	0x0292, 0x0292,
+	0x029d, 0x029e,
+	0x0345, 0x0345,
+	0x0371, 0x0371,
+	0x0373, 0x0373,
+	0x0377, 0x0377,
+	0x037b, 0x037d,
+	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, 0x03fb,
+	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, 0x04cf,
+	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,
+	0x04fb, 0x04fb,
+	0x04fd, 0x04fd,
+	0x04ff, 0x04ff,
+	0x0501, 0x0501,
+	0x0503, 0x0503,
+	0x0505, 0x0505,
+	0x0507, 0x0507,
+	0x0509, 0x0509,
+	0x050b, 0x050b,
+	0x050d, 0x050d,
+	0x050f, 0x050f,
+	0x0511, 0x0511,
+	0x0513, 0x0513,
+	0x0515, 0x0515,
+	0x0517, 0x0517,
+	0x0519, 0x0519,
+	0x051b, 0x051b,
+	0x051d, 0x051d,
+	0x051f, 0x051f,
+	0x0521, 0x0521,
+	0x0523, 0x0523,
+	0x0525, 0x0525,
+	0x0527, 0x0527,
+	0x0529, 0x0529,
+	0x052b, 0x052b,
+	0x052d, 0x052d,
+	0x052f, 0x052f,
+	0x0561, 0x0587,
+	0x10d0, 0x10fa,
+	0x10fd, 0x10ff,
+	0x13f8, 0x13fd,
+	0x1c80, 0x1c88,
+	0x1d79, 0x1d79,
+	0x1d7d, 0x1d7d,
+	0x1d8e, 0x1d8e,
+	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,
+	0x1efb, 0x1efb,
+	0x1efd, 0x1efd,
+	0x1eff, 0x1f07,
+	0x1f10, 0x1f15,
+	0x1f20, 0x1f27,
+	0x1f30, 0x1f37,
+	0x1f40, 0x1f45,
+	0x1f50, 0x1f57,
+	0x1f60, 0x1f67,
+	0x1f70, 0x1f7d,
+	0x1f80, 0x1fb4,
+	0x1fb6, 0x1fb7,
+	0x1fbc, 0x1fbc,
+	0x1fbe, 0x1fbe,
+	0x1fc2, 0x1fc4,
+	0x1fc6, 0x1fc7,
+	0x1fcc, 0x1fcc,
+	0x1fd0, 0x1fd3,
+	0x1fd6, 0x1fd7,
+	0x1fe0, 0x1fe7,
+	0x1ff2, 0x1ff4,
+	0x1ff6, 0x1ff7,
+	0x1ffc, 0x1ffc,
+	0x214e, 0x214e,
+	0x2170, 0x217f,
+	0x2184, 0x2184,
+	0x24d0, 0x24e9,
+	0x2c30, 0x2c5e,
+	0x2c61, 0x2c61,
+	0x2c65, 0x2c66,
+	0x2c68, 0x2c68,
+	0x2c6a, 0x2c6a,
+	0x2c6c, 0x2c6c,
+	0x2c73, 0x2c73,
+	0x2c76, 0x2c76,
+	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, 0x2ce3,
+	0x2cec, 0x2cec,
+	0x2cee, 0x2cee,
+	0x2cf3, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0xa641, 0xa641,
+	0xa643, 0xa643,
+	0xa645, 0xa645,
+	0xa647, 0xa647,
+	0xa649, 0xa649,
+	0xa64b, 0xa64b,
+	0xa64d, 0xa64d,
+	0xa64f, 0xa64f,
+	0xa651, 0xa651,
+	0xa653, 0xa653,
+	0xa655, 0xa655,
+	0xa657, 0xa657,
+	0xa659, 0xa659,
+	0xa65b, 0xa65b,
+	0xa65d, 0xa65d,
+	0xa65f, 0xa65f,
+	0xa661, 0xa661,
+	0xa663, 0xa663,
+	0xa665, 0xa665,
+	0xa667, 0xa667,
+	0xa669, 0xa669,
+	0xa66b, 0xa66b,
+	0xa66d, 0xa66d,
+	0xa681, 0xa681,
+	0xa683, 0xa683,
+	0xa685, 0xa685,
+	0xa687, 0xa687,
+	0xa689, 0xa689,
+	0xa68b, 0xa68b,
+	0xa68d, 0xa68d,
+	0xa68f, 0xa68f,
+	0xa691, 0xa691,
+	0xa693, 0xa693,
+	0xa695, 0xa695,
+	0xa697, 0xa697,
+	0xa699, 0xa699,
+	0xa69b, 0xa69b,
+	0xa723, 0xa723,
+	0xa725, 0xa725,
+	0xa727, 0xa727,
+	0xa729, 0xa729,
+	0xa72b, 0xa72b,
+	0xa72d, 0xa72d,
+	0xa72f, 0xa72f,
+	0xa733, 0xa733,
+	0xa735, 0xa735,
+	0xa737, 0xa737,
+	0xa739, 0xa739,
+	0xa73b, 0xa73b,
+	0xa73d, 0xa73d,
+	0xa73f, 0xa73f,
+	0xa741, 0xa741,
+	0xa743, 0xa743,
+	0xa745, 0xa745,
+	0xa747, 0xa747,
+	0xa749, 0xa749,
+	0xa74b, 0xa74b,
+	0xa74d, 0xa74d,
+	0xa74f, 0xa74f,
+	0xa751, 0xa751,
+	0xa753, 0xa753,
+	0xa755, 0xa755,
+	0xa757, 0xa757,
+	0xa759, 0xa759,
+	0xa75b, 0xa75b,
+	0xa75d, 0xa75d,
+	0xa75f, 0xa75f,
+	0xa761, 0xa761,
+	0xa763, 0xa763,
+	0xa765, 0xa765,
+	0xa767, 0xa767,
+	0xa769, 0xa769,
+	0xa76b, 0xa76b,
+	0xa76d, 0xa76d,
+	0xa76f, 0xa76f,
+	0xa77a, 0xa77a,
+	0xa77c, 0xa77c,
+	0xa77f, 0xa77f,
+	0xa781, 0xa781,
+	0xa783, 0xa783,
+	0xa785, 0xa785,
+	0xa787, 0xa787,
+	0xa78c, 0xa78c,
+	0xa791, 0xa791,
+	0xa793, 0xa794,
+	0xa797, 0xa797,
+	0xa799, 0xa799,
+	0xa79b, 0xa79b,
+	0xa79d, 0xa79d,
+	0xa79f, 0xa79f,
+	0xa7a1, 0xa7a1,
+	0xa7a3, 0xa7a3,
+	0xa7a5, 0xa7a5,
+	0xa7a7, 0xa7a7,
+	0xa7a9, 0xa7a9,
+	0xa7b5, 0xa7b5,
+	0xa7b7, 0xa7b7,
+	0xa7b9, 0xa7b9,
+	0xa7bb, 0xa7bb,
+	0xa7bd, 0xa7bd,
+	0xa7bf, 0xa7bf,
+	0xa7c3, 0xa7c3,
+	0xab53, 0xab53,
+	0xab70, 0xabbf,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff41, 0xff5a,
+	0x10428, 0x1044f,
+	0x104d8, 0x104fb,
+	0x10cc0, 0x10cf2,
+	0x118c0, 0x118df,
+	0x16e60, 0x16e7f,
+	0x1e922, 0x1e943,
+}; /* CR_Changes_When_Uppercased */
+
+/* 'Changes_When_Titlecased': Derived Property */
+static const OnigCodePoint CR_Changes_When_Titlecased[] = {
+	615,
+	0x0061, 0x007a,
+	0x00b5, 0x00b5,
+	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, 0x0137,
+	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, 0x018c,
+	0x0192, 0x0192,
+	0x0195, 0x0195,
+	0x0199, 0x019a,
+	0x019e, 0x019e,
+	0x01a1, 0x01a1,
+	0x01a3, 0x01a3,
+	0x01a5, 0x01a5,
+	0x01a8, 0x01a8,
+	0x01ad, 0x01ad,
+	0x01b0, 0x01b0,
+	0x01b4, 0x01b4,
+	0x01b6, 0x01b6,
+	0x01b9, 0x01b9,
+	0x01bd, 0x01bd,
+	0x01bf, 0x01bf,
+	0x01c4, 0x01c4,
+	0x01c6, 0x01c7,
+	0x01c9, 0x01ca,
+	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, 0x01f1,
+	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,
+	0x0223, 0x0223,
+	0x0225, 0x0225,
+	0x0227, 0x0227,
+	0x0229, 0x0229,
+	0x022b, 0x022b,
+	0x022d, 0x022d,
+	0x022f, 0x022f,
+	0x0231, 0x0231,
+	0x0233, 0x0233,
+	0x023c, 0x023c,
+	0x023f, 0x0240,
+	0x0242, 0x0242,
+	0x0247, 0x0247,
+	0x0249, 0x0249,
+	0x024b, 0x024b,
+	0x024d, 0x024d,
+	0x024f, 0x0254,
+	0x0256, 0x0257,
+	0x0259, 0x0259,
+	0x025b, 0x025c,
+	0x0260, 0x0261,
+	0x0263, 0x0263,
+	0x0265, 0x0266,
+	0x0268, 0x026c,
+	0x026f, 0x026f,
+	0x0271, 0x0272,
+	0x0275, 0x0275,
+	0x027d, 0x027d,
+	0x0280, 0x0280,
+	0x0282, 0x0283,
+	0x0287, 0x028c,
+	0x0292, 0x0292,
+	0x029d, 0x029e,
+	0x0345, 0x0345,
+	0x0371, 0x0371,
+	0x0373, 0x0373,
+	0x0377, 0x0377,
+	0x037b, 0x037d,
+	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, 0x03fb,
+	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, 0x04cf,
+	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,
+	0x04fb, 0x04fb,
+	0x04fd, 0x04fd,
+	0x04ff, 0x04ff,
+	0x0501, 0x0501,
+	0x0503, 0x0503,
+	0x0505, 0x0505,
+	0x0507, 0x0507,
+	0x0509, 0x0509,
+	0x050b, 0x050b,
+	0x050d, 0x050d,
+	0x050f, 0x050f,
+	0x0511, 0x0511,
+	0x0513, 0x0513,
+	0x0515, 0x0515,
+	0x0517, 0x0517,
+	0x0519, 0x0519,
+	0x051b, 0x051b,
+	0x051d, 0x051d,
+	0x051f, 0x051f,
+	0x0521, 0x0521,
+	0x0523, 0x0523,
+	0x0525, 0x0525,
+	0x0527, 0x0527,
+	0x0529, 0x0529,
+	0x052b, 0x052b,
+	0x052d, 0x052d,
+	0x052f, 0x052f,
+	0x0561, 0x0587,
+	0x13f8, 0x13fd,
+	0x1c80, 0x1c88,
+	0x1d79, 0x1d79,
+	0x1d7d, 0x1d7d,
+	0x1d8e, 0x1d8e,
+	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,
+	0x1efb, 0x1efb,
+	0x1efd, 0x1efd,
+	0x1eff, 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,
+	0x214e, 0x214e,
+	0x2170, 0x217f,
+	0x2184, 0x2184,
+	0x24d0, 0x24e9,
+	0x2c30, 0x2c5e,
+	0x2c61, 0x2c61,
+	0x2c65, 0x2c66,
+	0x2c68, 0x2c68,
+	0x2c6a, 0x2c6a,
+	0x2c6c, 0x2c6c,
+	0x2c73, 0x2c73,
+	0x2c76, 0x2c76,
+	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, 0x2ce3,
+	0x2cec, 0x2cec,
+	0x2cee, 0x2cee,
+	0x2cf3, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0xa641, 0xa641,
+	0xa643, 0xa643,
+	0xa645, 0xa645,
+	0xa647, 0xa647,
+	0xa649, 0xa649,
+	0xa64b, 0xa64b,
+	0xa64d, 0xa64d,
+	0xa64f, 0xa64f,
+	0xa651, 0xa651,
+	0xa653, 0xa653,
+	0xa655, 0xa655,
+	0xa657, 0xa657,
+	0xa659, 0xa659,
+	0xa65b, 0xa65b,
+	0xa65d, 0xa65d,
+	0xa65f, 0xa65f,
+	0xa661, 0xa661,
+	0xa663, 0xa663,
+	0xa665, 0xa665,
+	0xa667, 0xa667,
+	0xa669, 0xa669,
+	0xa66b, 0xa66b,
+	0xa66d, 0xa66d,
+	0xa681, 0xa681,
+	0xa683, 0xa683,
+	0xa685, 0xa685,
+	0xa687, 0xa687,
+	0xa689, 0xa689,
+	0xa68b, 0xa68b,
+	0xa68d, 0xa68d,
+	0xa68f, 0xa68f,
+	0xa691, 0xa691,
+	0xa693, 0xa693,
+	0xa695, 0xa695,
+	0xa697, 0xa697,
+	0xa699, 0xa699,
+	0xa69b, 0xa69b,
+	0xa723, 0xa723,
+	0xa725, 0xa725,
+	0xa727, 0xa727,
+	0xa729, 0xa729,
+	0xa72b, 0xa72b,
+	0xa72d, 0xa72d,
+	0xa72f, 0xa72f,
+	0xa733, 0xa733,
+	0xa735, 0xa735,
+	0xa737, 0xa737,
+	0xa739, 0xa739,
+	0xa73b, 0xa73b,
+	0xa73d, 0xa73d,
+	0xa73f, 0xa73f,
+	0xa741, 0xa741,
+	0xa743, 0xa743,
+	0xa745, 0xa745,
+	0xa747, 0xa747,
+	0xa749, 0xa749,
+	0xa74b, 0xa74b,
+	0xa74d, 0xa74d,
+	0xa74f, 0xa74f,
+	0xa751, 0xa751,
+	0xa753, 0xa753,
+	0xa755, 0xa755,
+	0xa757, 0xa757,
+	0xa759, 0xa759,
+	0xa75b, 0xa75b,
+	0xa75d, 0xa75d,
+	0xa75f, 0xa75f,
+	0xa761, 0xa761,
+	0xa763, 0xa763,
+	0xa765, 0xa765,
+	0xa767, 0xa767,
+	0xa769, 0xa769,
+	0xa76b, 0xa76b,
+	0xa76d, 0xa76d,
+	0xa76f, 0xa76f,
+	0xa77a, 0xa77a,
+	0xa77c, 0xa77c,
+	0xa77f, 0xa77f,
+	0xa781, 0xa781,
+	0xa783, 0xa783,
+	0xa785, 0xa785,
+	0xa787, 0xa787,
+	0xa78c, 0xa78c,
+	0xa791, 0xa791,
+	0xa793, 0xa794,
+	0xa797, 0xa797,
+	0xa799, 0xa799,
+	0xa79b, 0xa79b,
+	0xa79d, 0xa79d,
+	0xa79f, 0xa79f,
+	0xa7a1, 0xa7a1,
+	0xa7a3, 0xa7a3,
+	0xa7a5, 0xa7a5,
+	0xa7a7, 0xa7a7,
+	0xa7a9, 0xa7a9,
+	0xa7b5, 0xa7b5,
+	0xa7b7, 0xa7b7,
+	0xa7b9, 0xa7b9,
+	0xa7bb, 0xa7bb,
+	0xa7bd, 0xa7bd,
+	0xa7bf, 0xa7bf,
+	0xa7c3, 0xa7c3,
+	0xab53, 0xab53,
+	0xab70, 0xabbf,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff41, 0xff5a,
+	0x10428, 0x1044f,
+	0x104d8, 0x104fb,
+	0x10cc0, 0x10cf2,
+	0x118c0, 0x118df,
+	0x16e60, 0x16e7f,
+	0x1e922, 0x1e943,
+}; /* CR_Changes_When_Titlecased */
+
+/* 'Changes_When_Casefolded': Derived Property */
+static const OnigCodePoint CR_Changes_When_Casefolded[] = {
+	612,
+	0x0041, 0x005a,
+	0x00b5, 0x00b5,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00df,
+	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,
+	0x0149, 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,
+	0x017f, 0x017f,
+	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, 0x01c5,
+	0x01c7, 0x01c8,
+	0x01ca, 0x01cb,
+	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, 0x01f2,
+	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,
+	0x0243, 0x0246,
+	0x0248, 0x0248,
+	0x024a, 0x024a,
+	0x024c, 0x024c,
+	0x024e, 0x024e,
+	0x0345, 0x0345,
+	0x0370, 0x0370,
+	0x0372, 0x0372,
+	0x0376, 0x0376,
+	0x037f, 0x037f,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x038f,
+	0x0391, 0x03a1,
+	0x03a3, 0x03ab,
+	0x03c2, 0x03c2,
+	0x03cf, 0x03d1,
+	0x03d5, 0x03d6,
+	0x03d8, 0x03d8,
+	0x03da, 0x03da,
+	0x03dc, 0x03dc,
+	0x03de, 0x03de,
+	0x03e0, 0x03e0,
+	0x03e2, 0x03e2,
+	0x03e4, 0x03e4,
+	0x03e6, 0x03e6,
+	0x03e8, 0x03e8,
+	0x03ea, 0x03ea,
+	0x03ec, 0x03ec,
+	0x03ee, 0x03ee,
+	0x03f0, 0x03f1,
+	0x03f4, 0x03f5,
+	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,
+	0x04fa, 0x04fa,
+	0x04fc, 0x04fc,
+	0x04fe, 0x04fe,
+	0x0500, 0x0500,
+	0x0502, 0x0502,
+	0x0504, 0x0504,
+	0x0506, 0x0506,
+	0x0508, 0x0508,
+	0x050a, 0x050a,
+	0x050c, 0x050c,
+	0x050e, 0x050e,
+	0x0510, 0x0510,
+	0x0512, 0x0512,
+	0x0514, 0x0514,
+	0x0516, 0x0516,
+	0x0518, 0x0518,
+	0x051a, 0x051a,
+	0x051c, 0x051c,
+	0x051e, 0x051e,
+	0x0520, 0x0520,
+	0x0522, 0x0522,
+	0x0524, 0x0524,
+	0x0526, 0x0526,
+	0x0528, 0x0528,
+	0x052a, 0x052a,
+	0x052c, 0x052c,
+	0x052e, 0x052e,
+	0x0531, 0x0556,
+	0x0587, 0x0587,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x13f8, 0x13fd,
+	0x1c80, 0x1c88,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cbf,
+	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,
+	0x1e9a, 0x1e9b,
+	0x1e9e, 0x1e9e,
+	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,
+	0x1efa, 0x1efa,
+	0x1efc, 0x1efc,
+	0x1efe, 0x1efe,
+	0x1f08, 0x1f0f,
+	0x1f18, 0x1f1d,
+	0x1f28, 0x1f2f,
+	0x1f38, 0x1f3f,
+	0x1f48, 0x1f4d,
+	0x1f59, 0x1f59,
+	0x1f5b, 0x1f5b,
+	0x1f5d, 0x1f5d,
+	0x1f5f, 0x1f5f,
+	0x1f68, 0x1f6f,
+	0x1f80, 0x1faf,
+	0x1fb2, 0x1fb4,
+	0x1fb7, 0x1fbc,
+	0x1fc2, 0x1fc4,
+	0x1fc7, 0x1fcc,
+	0x1fd8, 0x1fdb,
+	0x1fe8, 0x1fec,
+	0x1ff2, 0x1ff4,
+	0x1ff7, 0x1ffc,
+	0x2126, 0x2126,
+	0x212a, 0x212b,
+	0x2132, 0x2132,
+	0x2160, 0x216f,
+	0x2183, 0x2183,
+	0x24b6, 0x24cf,
+	0x2c00, 0x2c2e,
+	0x2c60, 0x2c60,
+	0x2c62, 0x2c64,
+	0x2c67, 0x2c67,
+	0x2c69, 0x2c69,
+	0x2c6b, 0x2c6b,
+	0x2c6d, 0x2c70,
+	0x2c72, 0x2c72,
+	0x2c75, 0x2c75,
+	0x2c7e, 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,
+	0x2ceb, 0x2ceb,
+	0x2ced, 0x2ced,
+	0x2cf2, 0x2cf2,
+	0xa640, 0xa640,
+	0xa642, 0xa642,
+	0xa644, 0xa644,
+	0xa646, 0xa646,
+	0xa648, 0xa648,
+	0xa64a, 0xa64a,
+	0xa64c, 0xa64c,
+	0xa64e, 0xa64e,
+	0xa650, 0xa650,
+	0xa652, 0xa652,
+	0xa654, 0xa654,
+	0xa656, 0xa656,
+	0xa658, 0xa658,
+	0xa65a, 0xa65a,
+	0xa65c, 0xa65c,
+	0xa65e, 0xa65e,
+	0xa660, 0xa660,
+	0xa662, 0xa662,
+	0xa664, 0xa664,
+	0xa666, 0xa666,
+	0xa668, 0xa668,
+	0xa66a, 0xa66a,
+	0xa66c, 0xa66c,
+	0xa680, 0xa680,
+	0xa682, 0xa682,
+	0xa684, 0xa684,
+	0xa686, 0xa686,
+	0xa688, 0xa688,
+	0xa68a, 0xa68a,
+	0xa68c, 0xa68c,
+	0xa68e, 0xa68e,
+	0xa690, 0xa690,
+	0xa692, 0xa692,
+	0xa694, 0xa694,
+	0xa696, 0xa696,
+	0xa698, 0xa698,
+	0xa69a, 0xa69a,
+	0xa722, 0xa722,
+	0xa724, 0xa724,
+	0xa726, 0xa726,
+	0xa728, 0xa728,
+	0xa72a, 0xa72a,
+	0xa72c, 0xa72c,
+	0xa72e, 0xa72e,
+	0xa732, 0xa732,
+	0xa734, 0xa734,
+	0xa736, 0xa736,
+	0xa738, 0xa738,
+	0xa73a, 0xa73a,
+	0xa73c, 0xa73c,
+	0xa73e, 0xa73e,
+	0xa740, 0xa740,
+	0xa742, 0xa742,
+	0xa744, 0xa744,
+	0xa746, 0xa746,
+	0xa748, 0xa748,
+	0xa74a, 0xa74a,
+	0xa74c, 0xa74c,
+	0xa74e, 0xa74e,
+	0xa750, 0xa750,
+	0xa752, 0xa752,
+	0xa754, 0xa754,
+	0xa756, 0xa756,
+	0xa758, 0xa758,
+	0xa75a, 0xa75a,
+	0xa75c, 0xa75c,
+	0xa75e, 0xa75e,
+	0xa760, 0xa760,
+	0xa762, 0xa762,
+	0xa764, 0xa764,
+	0xa766, 0xa766,
+	0xa768, 0xa768,
+	0xa76a, 0xa76a,
+	0xa76c, 0xa76c,
+	0xa76e, 0xa76e,
+	0xa779, 0xa779,
+	0xa77b, 0xa77b,
+	0xa77d, 0xa77e,
+	0xa780, 0xa780,
+	0xa782, 0xa782,
+	0xa784, 0xa784,
+	0xa786, 0xa786,
+	0xa78b, 0xa78b,
+	0xa78d, 0xa78d,
+	0xa790, 0xa790,
+	0xa792, 0xa792,
+	0xa796, 0xa796,
+	0xa798, 0xa798,
+	0xa79a, 0xa79a,
+	0xa79c, 0xa79c,
+	0xa79e, 0xa79e,
+	0xa7a0, 0xa7a0,
+	0xa7a2, 0xa7a2,
+	0xa7a4, 0xa7a4,
+	0xa7a6, 0xa7a6,
+	0xa7a8, 0xa7a8,
+	0xa7aa, 0xa7ae,
+	0xa7b0, 0xa7b4,
+	0xa7b6, 0xa7b6,
+	0xa7b8, 0xa7b8,
+	0xa7ba, 0xa7ba,
+	0xa7bc, 0xa7bc,
+	0xa7be, 0xa7be,
+	0xa7c2, 0xa7c2,
+	0xa7c4, 0xa7c6,
+	0xab70, 0xabbf,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff21, 0xff3a,
+	0x10400, 0x10427,
+	0x104b0, 0x104d3,
+	0x10c80, 0x10cb2,
+	0x118a0, 0x118bf,
+	0x16e40, 0x16e5f,
+	0x1e900, 0x1e921,
+}; /* CR_Changes_When_Casefolded */
+
+/* 'Changes_When_Casemapped': Derived Property */
+static const OnigCodePoint CR_Changes_When_Casemapped[] = {
+	123,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00b5, 0x00b5,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x0137,
+	0x0139, 0x018c,
+	0x018e, 0x019a,
+	0x019c, 0x01a9,
+	0x01ac, 0x01b9,
+	0x01bc, 0x01bd,
+	0x01bf, 0x01bf,
+	0x01c4, 0x0220,
+	0x0222, 0x0233,
+	0x023a, 0x0254,
+	0x0256, 0x0257,
+	0x0259, 0x0259,
+	0x025b, 0x025c,
+	0x0260, 0x0261,
+	0x0263, 0x0263,
+	0x0265, 0x0266,
+	0x0268, 0x026c,
+	0x026f, 0x026f,
+	0x0271, 0x0272,
+	0x0275, 0x0275,
+	0x027d, 0x027d,
+	0x0280, 0x0280,
+	0x0282, 0x0283,
+	0x0287, 0x028c,
+	0x0292, 0x0292,
+	0x029d, 0x029e,
+	0x0345, 0x0345,
+	0x0370, 0x0373,
+	0x0376, 0x0377,
+	0x037b, 0x037d,
+	0x037f, 0x037f,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03d1,
+	0x03d5, 0x03f5,
+	0x03f7, 0x03fb,
+	0x03fd, 0x0481,
+	0x048a, 0x052f,
+	0x0531, 0x0556,
+	0x0561, 0x0587,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fd, 0x10ff,
+	0x13a0, 0x13f5,
+	0x13f8, 0x13fd,
+	0x1c80, 0x1c88,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cbf,
+	0x1d79, 0x1d79,
+	0x1d7d, 0x1d7d,
+	0x1d8e, 0x1d8e,
+	0x1e00, 0x1e9b,
+	0x1e9e, 0x1e9e,
+	0x1ea0, 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,
+	0x2126, 0x2126,
+	0x212a, 0x212b,
+	0x2132, 0x2132,
+	0x214e, 0x214e,
+	0x2160, 0x217f,
+	0x2183, 0x2184,
+	0x24b6, 0x24e9,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2c70,
+	0x2c72, 0x2c73,
+	0x2c75, 0x2c76,
+	0x2c7e, 0x2ce3,
+	0x2ceb, 0x2cee,
+	0x2cf2, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0xa640, 0xa66d,
+	0xa680, 0xa69b,
+	0xa722, 0xa72f,
+	0xa732, 0xa76f,
+	0xa779, 0xa787,
+	0xa78b, 0xa78d,
+	0xa790, 0xa794,
+	0xa796, 0xa7ae,
+	0xa7b0, 0xa7bf,
+	0xa7c2, 0xa7c6,
+	0xab53, 0xab53,
+	0xab70, 0xabbf,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0x10400, 0x1044f,
+	0x104b0, 0x104d3,
+	0x104d8, 0x104fb,
+	0x10c80, 0x10cb2,
+	0x10cc0, 0x10cf2,
+	0x118a0, 0x118df,
+	0x16e40, 0x16e7f,
+	0x1e900, 0x1e943,
+}; /* CR_Changes_When_Casemapped */
+
+/* 'ID_Start': Derived Property */
+static const OnigCodePoint CR_ID_Start[] = {
+	609,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0370, 0x0374,
+	0x0376, 0x0377,
+	0x037a, 0x037d,
+	0x037f, 0x037f,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x048a, 0x052f,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0560, 0x0588,
+	0x05d0, 0x05ea,
+	0x05ef, 0x05f2,
+	0x0620, 0x064a,
+	0x066e, 0x066f,
+	0x0671, 0x06d3,
+	0x06d5, 0x06d5,
+	0x06e5, 0x06e6,
+	0x06ee, 0x06ef,
+	0x06fa, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x0710,
+	0x0712, 0x072f,
+	0x074d, 0x07a5,
+	0x07b1, 0x07b1,
+	0x07ca, 0x07ea,
+	0x07f4, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x0815,
+	0x081a, 0x081a,
+	0x0824, 0x0824,
+	0x0828, 0x0828,
+	0x0840, 0x0858,
+	0x0860, 0x086a,
+	0x08a0, 0x08b4,
+	0x08b6, 0x08bd,
+	0x0904, 0x0939,
+	0x093d, 0x093d,
+	0x0950, 0x0950,
+	0x0958, 0x0961,
+	0x0971, 0x0980,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bd, 0x09bd,
+	0x09ce, 0x09ce,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e1,
+	0x09f0, 0x09f1,
+	0x09fc, 0x09fc,
+	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,
+	0x0af9, 0x0af9,
+	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,
+	0x0bd0, 0x0bd0,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c39,
+	0x0c3d, 0x0c3d,
+	0x0c58, 0x0c5a,
+	0x0c60, 0x0c61,
+	0x0c80, 0x0c80,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbd, 0x0cbd,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0cf1, 0x0cf2,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d3d,
+	0x0d4e, 0x0d4e,
+	0x0d54, 0x0d56,
+	0x0d5f, 0x0d61,
+	0x0d7a, 0x0d7f,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0e01, 0x0e30,
+	0x0e32, 0x0e33,
+	0x0e40, 0x0e46,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e86, 0x0e8a,
+	0x0e8c, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0eb0,
+	0x0eb2, 0x0eb3,
+	0x0ebd, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0edc, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f88, 0x0f8c,
+	0x1000, 0x102a,
+	0x103f, 0x103f,
+	0x1050, 0x1055,
+	0x105a, 0x105d,
+	0x1061, 0x1061,
+	0x1065, 0x1066,
+	0x106e, 0x1070,
+	0x1075, 0x1081,
+	0x108e, 0x108e,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 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, 0x13f5,
+	0x13f8, 0x13fd,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x16ee, 0x16f8,
+	0x1700, 0x170c,
+	0x170e, 0x1711,
+	0x1720, 0x1731,
+	0x1740, 0x1751,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1780, 0x17b3,
+	0x17d7, 0x17d7,
+	0x17dc, 0x17dc,
+	0x1820, 0x1878,
+	0x1880, 0x18a8,
+	0x18aa, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191e,
+	0x1950, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x1a00, 0x1a16,
+	0x1a20, 0x1a54,
+	0x1aa7, 0x1aa7,
+	0x1b05, 0x1b33,
+	0x1b45, 0x1b4b,
+	0x1b83, 0x1ba0,
+	0x1bae, 0x1baf,
+	0x1bba, 0x1be5,
+	0x1c00, 0x1c23,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c7d,
+	0x1c80, 0x1c88,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cbf,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf3,
+	0x1cf5, 0x1cf6,
+	0x1cfa, 0x1cfa,
+	0x1d00, 0x1dbf,
+	0x1e00, 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, 0x209c,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2118, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cee,
+	0x2cf2, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x3005, 0x3007,
+	0x3021, 0x3029,
+	0x3031, 0x3035,
+	0x3038, 0x303c,
+	0x3041, 0x3096,
+	0x309b, 0x309f,
+	0x30a1, 0x30fa,
+	0x30fc, 0x30ff,
+	0x3105, 0x312f,
+	0x3131, 0x318e,
+	0x31a0, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fef,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa640, 0xa66e,
+	0xa67f, 0xa69d,
+	0xa6a0, 0xa6ef,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa7bf,
+	0xa7c2, 0xa7c6,
+	0xa7f7, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa822,
+	0xa840, 0xa873,
+	0xa882, 0xa8b3,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa8fd, 0xa8fe,
+	0xa90a, 0xa925,
+	0xa930, 0xa946,
+	0xa960, 0xa97c,
+	0xa984, 0xa9b2,
+	0xa9cf, 0xa9cf,
+	0xa9e0, 0xa9e4,
+	0xa9e6, 0xa9ef,
+	0xa9fa, 0xa9fe,
+	0xaa00, 0xaa28,
+	0xaa40, 0xaa42,
+	0xaa44, 0xaa4b,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7a,
+	0xaa7e, 0xaaaf,
+	0xaab1, 0xaab1,
+	0xaab5, 0xaab6,
+	0xaab9, 0xaabd,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadd,
+	0xaae0, 0xaaea,
+	0xaaf2, 0xaaf4,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xab30, 0xab5a,
+	0xab5c, 0xab67,
+	0xab70, 0xabe2,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa6d,
+	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,
+	0x10140, 0x10174,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031f,
+	0x1032d, 0x1034a,
+	0x10350, 0x10375,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x103d1, 0x103d5,
+	0x10400, 0x1049d,
+	0x104b0, 0x104d3,
+	0x104d8, 0x104fb,
+	0x10500, 0x10527,
+	0x10530, 0x10563,
+	0x10600, 0x10736,
+	0x10740, 0x10755,
+	0x10760, 0x10767,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10860, 0x10876,
+	0x10880, 0x1089e,
+	0x108e0, 0x108f2,
+	0x108f4, 0x108f5,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a00,
+	0x10a10, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a35,
+	0x10a60, 0x10a7c,
+	0x10a80, 0x10a9c,
+	0x10ac0, 0x10ac7,
+	0x10ac9, 0x10ae4,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10b80, 0x10b91,
+	0x10c00, 0x10c48,
+	0x10c80, 0x10cb2,
+	0x10cc0, 0x10cf2,
+	0x10d00, 0x10d23,
+	0x10f00, 0x10f1c,
+	0x10f27, 0x10f27,
+	0x10f30, 0x10f45,
+	0x10fe0, 0x10ff6,
+	0x11003, 0x11037,
+	0x11083, 0x110af,
+	0x110d0, 0x110e8,
+	0x11103, 0x11126,
+	0x11144, 0x11144,
+	0x11150, 0x11172,
+	0x11176, 0x11176,
+	0x11183, 0x111b2,
+	0x111c1, 0x111c4,
+	0x111da, 0x111da,
+	0x111dc, 0x111dc,
+	0x11200, 0x11211,
+	0x11213, 0x1122b,
+	0x11280, 0x11286,
+	0x11288, 0x11288,
+	0x1128a, 0x1128d,
+	0x1128f, 0x1129d,
+	0x1129f, 0x112a8,
+	0x112b0, 0x112de,
+	0x11305, 0x1130c,
+	0x1130f, 0x11310,
+	0x11313, 0x11328,
+	0x1132a, 0x11330,
+	0x11332, 0x11333,
+	0x11335, 0x11339,
+	0x1133d, 0x1133d,
+	0x11350, 0x11350,
+	0x1135d, 0x11361,
+	0x11400, 0x11434,
+	0x11447, 0x1144a,
+	0x1145f, 0x1145f,
+	0x11480, 0x114af,
+	0x114c4, 0x114c5,
+	0x114c7, 0x114c7,
+	0x11580, 0x115ae,
+	0x115d8, 0x115db,
+	0x11600, 0x1162f,
+	0x11644, 0x11644,
+	0x11680, 0x116aa,
+	0x116b8, 0x116b8,
+	0x11700, 0x1171a,
+	0x11800, 0x1182b,
+	0x118a0, 0x118df,
+	0x118ff, 0x118ff,
+	0x119a0, 0x119a7,
+	0x119aa, 0x119d0,
+	0x119e1, 0x119e1,
+	0x119e3, 0x119e3,
+	0x11a00, 0x11a00,
+	0x11a0b, 0x11a32,
+	0x11a3a, 0x11a3a,
+	0x11a50, 0x11a50,
+	0x11a5c, 0x11a89,
+	0x11a9d, 0x11a9d,
+	0x11ac0, 0x11af8,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c2e,
+	0x11c40, 0x11c40,
+	0x11c72, 0x11c8f,
+	0x11d00, 0x11d06,
+	0x11d08, 0x11d09,
+	0x11d0b, 0x11d30,
+	0x11d46, 0x11d46,
+	0x11d60, 0x11d65,
+	0x11d67, 0x11d68,
+	0x11d6a, 0x11d89,
+	0x11d98, 0x11d98,
+	0x11ee0, 0x11ef2,
+	0x12000, 0x12399,
+	0x12400, 0x1246e,
+	0x12480, 0x12543,
+	0x13000, 0x1342e,
+	0x14400, 0x14646,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16ad0, 0x16aed,
+	0x16b00, 0x16b2f,
+	0x16b40, 0x16b43,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16e40, 0x16e7f,
+	0x16f00, 0x16f4a,
+	0x16f50, 0x16f50,
+	0x16f93, 0x16f9f,
+	0x16fe0, 0x16fe1,
+	0x16fe3, 0x16fe3,
+	0x17000, 0x187f7,
+	0x18800, 0x18af2,
+	0x1b000, 0x1b11e,
+	0x1b150, 0x1b152,
+	0x1b164, 0x1b167,
+	0x1b170, 0x1b2fb,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	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, 0x1d7cb,
+	0x1e100, 0x1e12c,
+	0x1e137, 0x1e13d,
+	0x1e14e, 0x1e14e,
+	0x1e2c0, 0x1e2eb,
+	0x1e800, 0x1e8c4,
+	0x1e900, 0x1e943,
+	0x1e94b, 0x1e94b,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2b820, 0x2cea1,
+	0x2ceb0, 0x2ebe0,
+	0x2f800, 0x2fa1d,
+}; /* CR_ID_Start */
+
+/* 'ID_Continue': Derived Property */
+static const OnigCodePoint CR_ID_Continue[] = {
+	713,
+	0x0030, 0x0039,
+	0x0041, 0x005a,
+	0x005f, 0x005f,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00b7, 0x00b7,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0300, 0x0374,
+	0x0376, 0x0377,
+	0x037a, 0x037d,
+	0x037f, 0x037f,
+	0x0386, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x0483, 0x0487,
+	0x048a, 0x052f,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0560, 0x0588,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05ef, 0x05f2,
+	0x0610, 0x061a,
+	0x0620, 0x0669,
+	0x066e, 0x06d3,
+	0x06d5, 0x06dc,
+	0x06df, 0x06e8,
+	0x06ea, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07f5,
+	0x07fa, 0x07fa,
+	0x07fd, 0x07fd,
+	0x0800, 0x082d,
+	0x0840, 0x085b,
+	0x0860, 0x086a,
+	0x08a0, 0x08b4,
+	0x08b6, 0x08bd,
+	0x08d3, 0x08e1,
+	0x08e3, 0x0963,
+	0x0966, 0x096f,
+	0x0971, 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,
+	0x09fc, 0x09fc,
+	0x09fe, 0x09fe,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+	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,
+	0x0af9, 0x0aff,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	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,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bef,
+	0x0c00, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c5a,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c80, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
+	0x0d00, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	0x0d54, 0x0d57,
+	0x0d5f, 0x0d63,
+	0x0d66, 0x0d6f,
+	0x0d7a, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0de6, 0x0def,
+	0x0df2, 0x0df3,
+	0x0e01, 0x0e3a,
+	0x0e40, 0x0e4e,
+	0x0e50, 0x0e59,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e86, 0x0e8a,
+	0x0e8c, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f18, 0x0f19,
+	0x0f20, 0x0f29,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f3e, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f84,
+	0x0f86, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x1000, 0x1049,
+	0x1050, 0x109d,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 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,
+	0x135d, 0x135f,
+	0x1369, 0x1371,
+	0x1380, 0x138f,
+	0x13a0, 0x13f5,
+	0x13f8, 0x13fd,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x16ee, 0x16f8,
+	0x1700, 0x170c,
+	0x170e, 0x1714,
+	0x1720, 0x1734,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17d3,
+	0x17d7, 0x17d7,
+	0x17dc, 0x17dd,
+	0x17e0, 0x17e9,
+	0x180b, 0x180d,
+	0x1810, 0x1819,
+	0x1820, 0x1878,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191e,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1946, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x1a00, 0x1a1b,
+	0x1a20, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa7, 0x1aa7,
+	0x1ab0, 0x1abd,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b59,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1bf3,
+	0x1c00, 0x1c37,
+	0x1c40, 0x1c49,
+	0x1c4d, 0x1c7d,
+	0x1c80, 0x1c88,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cbf,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1cfa,
+	0x1d00, 0x1df9,
+	0x1dfb, 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,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x209c,
+	0x20d0, 0x20dc,
+	0x20e1, 0x20e1,
+	0x20e5, 0x20f0,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2118, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d6f,
+	0x2d7f, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2dff,
+	0x3005, 0x3007,
+	0x3021, 0x302f,
+	0x3031, 0x3035,
+	0x3038, 0x303c,
+	0x3041, 0x3096,
+	0x3099, 0x309f,
+	0x30a1, 0x30fa,
+	0x30fc, 0x30ff,
+	0x3105, 0x312f,
+	0x3131, 0x318e,
+	0x31a0, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fef,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa62b,
+	0xa640, 0xa66f,
+	0xa674, 0xa67d,
+	0xa67f, 0xa6f1,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa7bf,
+	0xa7c2, 0xa7c6,
+	0xa7f7, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c5,
+	0xa8d0, 0xa8d9,
+	0xa8e0, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa8fd, 0xa92d,
+	0xa930, 0xa953,
+	0xa960, 0xa97c,
+	0xa980, 0xa9c0,
+	0xa9cf, 0xa9d9,
+	0xa9e0, 0xa9fe,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaac2,
+	0xaadb, 0xaadd,
+	0xaae0, 0xaaef,
+	0xaaf2, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xab30, 0xab5a,
+	0xab5c, 0xab67,
+	0xab70, 0xabea,
+	0xabec, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa6d,
+	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, 0xfe2f,
+	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,
+	0x10140, 0x10174,
+	0x101fd, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x102e0, 0x102e0,
+	0x10300, 0x1031f,
+	0x1032d, 0x1034a,
+	0x10350, 0x1037a,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x103d1, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x104b0, 0x104d3,
+	0x104d8, 0x104fb,
+	0x10500, 0x10527,
+	0x10530, 0x10563,
+	0x10600, 0x10736,
+	0x10740, 0x10755,
+	0x10760, 0x10767,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10860, 0x10876,
+	0x10880, 0x1089e,
+	0x108e0, 0x108f2,
+	0x108f4, 0x108f5,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a35,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x10a60, 0x10a7c,
+	0x10a80, 0x10a9c,
+	0x10ac0, 0x10ac7,
+	0x10ac9, 0x10ae6,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10b80, 0x10b91,
+	0x10c00, 0x10c48,
+	0x10c80, 0x10cb2,
+	0x10cc0, 0x10cf2,
+	0x10d00, 0x10d27,
+	0x10d30, 0x10d39,
+	0x10f00, 0x10f1c,
+	0x10f27, 0x10f27,
+	0x10f30, 0x10f50,
+	0x10fe0, 0x10ff6,
+	0x11000, 0x11046,
+	0x11066, 0x1106f,
+	0x1107f, 0x110ba,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x1113f,
+	0x11144, 0x11146,
+	0x11150, 0x11173,
+	0x11176, 0x11176,
+	0x11180, 0x111c4,
+	0x111c9, 0x111cc,
+	0x111d0, 0x111da,
+	0x111dc, 0x111dc,
+	0x11200, 0x11211,
+	0x11213, 0x11237,
+	0x1123e, 0x1123e,
+	0x11280, 0x11286,
+	0x11288, 0x11288,
+	0x1128a, 0x1128d,
+	0x1128f, 0x1129d,
+	0x1129f, 0x112a8,
+	0x112b0, 0x112ea,
+	0x112f0, 0x112f9,
+	0x11300, 0x11303,
+	0x11305, 0x1130c,
+	0x1130f, 0x11310,
+	0x11313, 0x11328,
+	0x1132a, 0x11330,
+	0x11332, 0x11333,
+	0x11335, 0x11339,
+	0x1133b, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11350, 0x11350,
+	0x11357, 0x11357,
+	0x1135d, 0x11363,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11400, 0x1144a,
+	0x11450, 0x11459,
+	0x1145e, 0x1145f,
+	0x11480, 0x114c5,
+	0x114c7, 0x114c7,
+	0x114d0, 0x114d9,
+	0x11580, 0x115b5,
+	0x115b8, 0x115c0,
+	0x115d8, 0x115dd,
+	0x11600, 0x11640,
+	0x11644, 0x11644,
+	0x11650, 0x11659,
+	0x11680, 0x116b8,
+	0x116c0, 0x116c9,
+	0x11700, 0x1171a,
+	0x1171d, 0x1172b,
+	0x11730, 0x11739,
+	0x11800, 0x1183a,
+	0x118a0, 0x118e9,
+	0x118ff, 0x118ff,
+	0x119a0, 0x119a7,
+	0x119aa, 0x119d7,
+	0x119da, 0x119e1,
+	0x119e3, 0x119e4,
+	0x11a00, 0x11a3e,
+	0x11a47, 0x11a47,
+	0x11a50, 0x11a99,
+	0x11a9d, 0x11a9d,
+	0x11ac0, 0x11af8,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c36,
+	0x11c38, 0x11c40,
+	0x11c50, 0x11c59,
+	0x11c72, 0x11c8f,
+	0x11c92, 0x11ca7,
+	0x11ca9, 0x11cb6,
+	0x11d00, 0x11d06,
+	0x11d08, 0x11d09,
+	0x11d0b, 0x11d36,
+	0x11d3a, 0x11d3a,
+	0x11d3c, 0x11d3d,
+	0x11d3f, 0x11d47,
+	0x11d50, 0x11d59,
+	0x11d60, 0x11d65,
+	0x11d67, 0x11d68,
+	0x11d6a, 0x11d8e,
+	0x11d90, 0x11d91,
+	0x11d93, 0x11d98,
+	0x11da0, 0x11da9,
+	0x11ee0, 0x11ef6,
+	0x12000, 0x12399,
+	0x12400, 0x1246e,
+	0x12480, 0x12543,
+	0x13000, 0x1342e,
+	0x14400, 0x14646,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16a60, 0x16a69,
+	0x16ad0, 0x16aed,
+	0x16af0, 0x16af4,
+	0x16b00, 0x16b36,
+	0x16b40, 0x16b43,
+	0x16b50, 0x16b59,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16e40, 0x16e7f,
+	0x16f00, 0x16f4a,
+	0x16f4f, 0x16f87,
+	0x16f8f, 0x16f9f,
+	0x16fe0, 0x16fe1,
+	0x16fe3, 0x16fe3,
+	0x17000, 0x187f7,
+	0x18800, 0x18af2,
+	0x1b000, 0x1b11e,
+	0x1b150, 0x1b152,
+	0x1b164, 0x1b167,
+	0x1b170, 0x1b2fb,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	0x1bc9d, 0x1bc9e,
+	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, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x1da00, 0x1da36,
+	0x1da3b, 0x1da6c,
+	0x1da75, 0x1da75,
+	0x1da84, 0x1da84,
+	0x1da9b, 0x1da9f,
+	0x1daa1, 0x1daaf,
+	0x1e000, 0x1e006,
+	0x1e008, 0x1e018,
+	0x1e01b, 0x1e021,
+	0x1e023, 0x1e024,
+	0x1e026, 0x1e02a,
+	0x1e100, 0x1e12c,
+	0x1e130, 0x1e13d,
+	0x1e140, 0x1e149,
+	0x1e14e, 0x1e14e,
+	0x1e2c0, 0x1e2f9,
+	0x1e800, 0x1e8c4,
+	0x1e8d0, 0x1e8d6,
+	0x1e900, 0x1e94b,
+	0x1e950, 0x1e959,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2b820, 0x2cea1,
+	0x2ceb0, 0x2ebe0,
+	0x2f800, 0x2fa1d,
+	0xe0100, 0xe01ef,
+}; /* CR_ID_Continue */
+
+/* 'XID_Start': Derived Property */
+static const OnigCodePoint CR_XID_Start[] = {
+	616,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0370, 0x0374,
+	0x0376, 0x0377,
+	0x037b, 0x037d,
+	0x037f, 0x037f,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x048a, 0x052f,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0560, 0x0588,
+	0x05d0, 0x05ea,
+	0x05ef, 0x05f2,
+	0x0620, 0x064a,
+	0x066e, 0x066f,
+	0x0671, 0x06d3,
+	0x06d5, 0x06d5,
+	0x06e5, 0x06e6,
+	0x06ee, 0x06ef,
+	0x06fa, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x0710,
+	0x0712, 0x072f,
+	0x074d, 0x07a5,
+	0x07b1, 0x07b1,
+	0x07ca, 0x07ea,
+	0x07f4, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x0815,
+	0x081a, 0x081a,
+	0x0824, 0x0824,
+	0x0828, 0x0828,
+	0x0840, 0x0858,
+	0x0860, 0x086a,
+	0x08a0, 0x08b4,
+	0x08b6, 0x08bd,
+	0x0904, 0x0939,
+	0x093d, 0x093d,
+	0x0950, 0x0950,
+	0x0958, 0x0961,
+	0x0971, 0x0980,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bd, 0x09bd,
+	0x09ce, 0x09ce,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e1,
+	0x09f0, 0x09f1,
+	0x09fc, 0x09fc,
+	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,
+	0x0af9, 0x0af9,
+	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,
+	0x0bd0, 0x0bd0,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c39,
+	0x0c3d, 0x0c3d,
+	0x0c58, 0x0c5a,
+	0x0c60, 0x0c61,
+	0x0c80, 0x0c80,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbd, 0x0cbd,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0cf1, 0x0cf2,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d3d,
+	0x0d4e, 0x0d4e,
+	0x0d54, 0x0d56,
+	0x0d5f, 0x0d61,
+	0x0d7a, 0x0d7f,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0e01, 0x0e30,
+	0x0e32, 0x0e32,
+	0x0e40, 0x0e46,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e86, 0x0e8a,
+	0x0e8c, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0eb0,
+	0x0eb2, 0x0eb2,
+	0x0ebd, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0edc, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f88, 0x0f8c,
+	0x1000, 0x102a,
+	0x103f, 0x103f,
+	0x1050, 0x1055,
+	0x105a, 0x105d,
+	0x1061, 0x1061,
+	0x1065, 0x1066,
+	0x106e, 0x1070,
+	0x1075, 0x1081,
+	0x108e, 0x108e,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 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, 0x13f5,
+	0x13f8, 0x13fd,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x16ee, 0x16f8,
+	0x1700, 0x170c,
+	0x170e, 0x1711,
+	0x1720, 0x1731,
+	0x1740, 0x1751,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1780, 0x17b3,
+	0x17d7, 0x17d7,
+	0x17dc, 0x17dc,
+	0x1820, 0x1878,
+	0x1880, 0x18a8,
+	0x18aa, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191e,
+	0x1950, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x1a00, 0x1a16,
+	0x1a20, 0x1a54,
+	0x1aa7, 0x1aa7,
+	0x1b05, 0x1b33,
+	0x1b45, 0x1b4b,
+	0x1b83, 0x1ba0,
+	0x1bae, 0x1baf,
+	0x1bba, 0x1be5,
+	0x1c00, 0x1c23,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c7d,
+	0x1c80, 0x1c88,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cbf,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf3,
+	0x1cf5, 0x1cf6,
+	0x1cfa, 0x1cfa,
+	0x1d00, 0x1dbf,
+	0x1e00, 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, 0x209c,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2118, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cee,
+	0x2cf2, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x3005, 0x3007,
+	0x3021, 0x3029,
+	0x3031, 0x3035,
+	0x3038, 0x303c,
+	0x3041, 0x3096,
+	0x309d, 0x309f,
+	0x30a1, 0x30fa,
+	0x30fc, 0x30ff,
+	0x3105, 0x312f,
+	0x3131, 0x318e,
+	0x31a0, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fef,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa640, 0xa66e,
+	0xa67f, 0xa69d,
+	0xa6a0, 0xa6ef,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa7bf,
+	0xa7c2, 0xa7c6,
+	0xa7f7, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa822,
+	0xa840, 0xa873,
+	0xa882, 0xa8b3,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa8fd, 0xa8fe,
+	0xa90a, 0xa925,
+	0xa930, 0xa946,
+	0xa960, 0xa97c,
+	0xa984, 0xa9b2,
+	0xa9cf, 0xa9cf,
+	0xa9e0, 0xa9e4,
+	0xa9e6, 0xa9ef,
+	0xa9fa, 0xa9fe,
+	0xaa00, 0xaa28,
+	0xaa40, 0xaa42,
+	0xaa44, 0xaa4b,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7a,
+	0xaa7e, 0xaaaf,
+	0xaab1, 0xaab1,
+	0xaab5, 0xaab6,
+	0xaab9, 0xaabd,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadd,
+	0xaae0, 0xaaea,
+	0xaaf2, 0xaaf4,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xab30, 0xab5a,
+	0xab5c, 0xab67,
+	0xab70, 0xabe2,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb1d,
+	0xfb1f, 0xfb28,
+	0xfb2a, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfc5d,
+	0xfc64, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdf9,
+	0xfe71, 0xfe71,
+	0xfe73, 0xfe73,
+	0xfe77, 0xfe77,
+	0xfe79, 0xfe79,
+	0xfe7b, 0xfe7b,
+	0xfe7d, 0xfe7d,
+	0xfe7f, 0xfefc,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0xff66, 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,
+	0x10140, 0x10174,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x10300, 0x1031f,
+	0x1032d, 0x1034a,
+	0x10350, 0x10375,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x103d1, 0x103d5,
+	0x10400, 0x1049d,
+	0x104b0, 0x104d3,
+	0x104d8, 0x104fb,
+	0x10500, 0x10527,
+	0x10530, 0x10563,
+	0x10600, 0x10736,
+	0x10740, 0x10755,
+	0x10760, 0x10767,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10860, 0x10876,
+	0x10880, 0x1089e,
+	0x108e0, 0x108f2,
+	0x108f4, 0x108f5,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a00,
+	0x10a10, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a35,
+	0x10a60, 0x10a7c,
+	0x10a80, 0x10a9c,
+	0x10ac0, 0x10ac7,
+	0x10ac9, 0x10ae4,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10b80, 0x10b91,
+	0x10c00, 0x10c48,
+	0x10c80, 0x10cb2,
+	0x10cc0, 0x10cf2,
+	0x10d00, 0x10d23,
+	0x10f00, 0x10f1c,
+	0x10f27, 0x10f27,
+	0x10f30, 0x10f45,
+	0x10fe0, 0x10ff6,
+	0x11003, 0x11037,
+	0x11083, 0x110af,
+	0x110d0, 0x110e8,
+	0x11103, 0x11126,
+	0x11144, 0x11144,
+	0x11150, 0x11172,
+	0x11176, 0x11176,
+	0x11183, 0x111b2,
+	0x111c1, 0x111c4,
+	0x111da, 0x111da,
+	0x111dc, 0x111dc,
+	0x11200, 0x11211,
+	0x11213, 0x1122b,
+	0x11280, 0x11286,
+	0x11288, 0x11288,
+	0x1128a, 0x1128d,
+	0x1128f, 0x1129d,
+	0x1129f, 0x112a8,
+	0x112b0, 0x112de,
+	0x11305, 0x1130c,
+	0x1130f, 0x11310,
+	0x11313, 0x11328,
+	0x1132a, 0x11330,
+	0x11332, 0x11333,
+	0x11335, 0x11339,
+	0x1133d, 0x1133d,
+	0x11350, 0x11350,
+	0x1135d, 0x11361,
+	0x11400, 0x11434,
+	0x11447, 0x1144a,
+	0x1145f, 0x1145f,
+	0x11480, 0x114af,
+	0x114c4, 0x114c5,
+	0x114c7, 0x114c7,
+	0x11580, 0x115ae,
+	0x115d8, 0x115db,
+	0x11600, 0x1162f,
+	0x11644, 0x11644,
+	0x11680, 0x116aa,
+	0x116b8, 0x116b8,
+	0x11700, 0x1171a,
+	0x11800, 0x1182b,
+	0x118a0, 0x118df,
+	0x118ff, 0x118ff,
+	0x119a0, 0x119a7,
+	0x119aa, 0x119d0,
+	0x119e1, 0x119e1,
+	0x119e3, 0x119e3,
+	0x11a00, 0x11a00,
+	0x11a0b, 0x11a32,
+	0x11a3a, 0x11a3a,
+	0x11a50, 0x11a50,
+	0x11a5c, 0x11a89,
+	0x11a9d, 0x11a9d,
+	0x11ac0, 0x11af8,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c2e,
+	0x11c40, 0x11c40,
+	0x11c72, 0x11c8f,
+	0x11d00, 0x11d06,
+	0x11d08, 0x11d09,
+	0x11d0b, 0x11d30,
+	0x11d46, 0x11d46,
+	0x11d60, 0x11d65,
+	0x11d67, 0x11d68,
+	0x11d6a, 0x11d89,
+	0x11d98, 0x11d98,
+	0x11ee0, 0x11ef2,
+	0x12000, 0x12399,
+	0x12400, 0x1246e,
+	0x12480, 0x12543,
+	0x13000, 0x1342e,
+	0x14400, 0x14646,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16ad0, 0x16aed,
+	0x16b00, 0x16b2f,
+	0x16b40, 0x16b43,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16e40, 0x16e7f,
+	0x16f00, 0x16f4a,
+	0x16f50, 0x16f50,
+	0x16f93, 0x16f9f,
+	0x16fe0, 0x16fe1,
+	0x16fe3, 0x16fe3,
+	0x17000, 0x187f7,
+	0x18800, 0x18af2,
+	0x1b000, 0x1b11e,
+	0x1b150, 0x1b152,
+	0x1b164, 0x1b167,
+	0x1b170, 0x1b2fb,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	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, 0x1d7cb,
+	0x1e100, 0x1e12c,
+	0x1e137, 0x1e13d,
+	0x1e14e, 0x1e14e,
+	0x1e2c0, 0x1e2eb,
+	0x1e800, 0x1e8c4,
+	0x1e900, 0x1e943,
+	0x1e94b, 0x1e94b,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2b820, 0x2cea1,
+	0x2ceb0, 0x2ebe0,
+	0x2f800, 0x2fa1d,
+}; /* CR_XID_Start */
+
+/* 'XID_Continue': Derived Property */
+static const OnigCodePoint CR_XID_Continue[] = {
+	720,
+	0x0030, 0x0039,
+	0x0041, 0x005a,
+	0x005f, 0x005f,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00b5, 0x00b5,
+	0x00b7, 0x00b7,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02c1,
+	0x02c6, 0x02d1,
+	0x02e0, 0x02e4,
+	0x02ec, 0x02ec,
+	0x02ee, 0x02ee,
+	0x0300, 0x0374,
+	0x0376, 0x0377,
+	0x037b, 0x037d,
+	0x037f, 0x037f,
+	0x0386, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x0483, 0x0487,
+	0x048a, 0x052f,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0560, 0x0588,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05ef, 0x05f2,
+	0x0610, 0x061a,
+	0x0620, 0x0669,
+	0x066e, 0x06d3,
+	0x06d5, 0x06dc,
+	0x06df, 0x06e8,
+	0x06ea, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07f5,
+	0x07fa, 0x07fa,
+	0x07fd, 0x07fd,
+	0x0800, 0x082d,
+	0x0840, 0x085b,
+	0x0860, 0x086a,
+	0x08a0, 0x08b4,
+	0x08b6, 0x08bd,
+	0x08d3, 0x08e1,
+	0x08e3, 0x0963,
+	0x0966, 0x096f,
+	0x0971, 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,
+	0x09fc, 0x09fc,
+	0x09fe, 0x09fe,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+	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,
+	0x0af9, 0x0aff,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	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,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bef,
+	0x0c00, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c5a,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c80, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
+	0x0d00, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	0x0d54, 0x0d57,
+	0x0d5f, 0x0d63,
+	0x0d66, 0x0d6f,
+	0x0d7a, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0de6, 0x0def,
+	0x0df2, 0x0df3,
+	0x0e01, 0x0e3a,
+	0x0e40, 0x0e4e,
+	0x0e50, 0x0e59,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e86, 0x0e8a,
+	0x0e8c, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f18, 0x0f19,
+	0x0f20, 0x0f29,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f3e, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f84,
+	0x0f86, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x1000, 0x1049,
+	0x1050, 0x109d,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 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,
+	0x135d, 0x135f,
+	0x1369, 0x1371,
+	0x1380, 0x138f,
+	0x13a0, 0x13f5,
+	0x13f8, 0x13fd,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x16ee, 0x16f8,
+	0x1700, 0x170c,
+	0x170e, 0x1714,
+	0x1720, 0x1734,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17d3,
+	0x17d7, 0x17d7,
+	0x17dc, 0x17dd,
+	0x17e0, 0x17e9,
+	0x180b, 0x180d,
+	0x1810, 0x1819,
+	0x1820, 0x1878,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191e,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1946, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x1a00, 0x1a1b,
+	0x1a20, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa7, 0x1aa7,
+	0x1ab0, 0x1abd,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b59,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1bf3,
+	0x1c00, 0x1c37,
+	0x1c40, 0x1c49,
+	0x1c4d, 0x1c7d,
+	0x1c80, 0x1c88,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cbf,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1cfa,
+	0x1d00, 0x1df9,
+	0x1dfb, 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,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x209c,
+	0x20d0, 0x20dc,
+	0x20e1, 0x20e1,
+	0x20e5, 0x20f0,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2118, 0x211d,
+	0x2124, 0x2124,
+	0x2126, 0x2126,
+	0x2128, 0x2128,
+	0x212a, 0x2139,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2ce4,
+	0x2ceb, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d6f,
+	0x2d7f, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2dff,
+	0x3005, 0x3007,
+	0x3021, 0x302f,
+	0x3031, 0x3035,
+	0x3038, 0x303c,
+	0x3041, 0x3096,
+	0x3099, 0x309a,
+	0x309d, 0x309f,
+	0x30a1, 0x30fa,
+	0x30fc, 0x30ff,
+	0x3105, 0x312f,
+	0x3131, 0x318e,
+	0x31a0, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fef,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa62b,
+	0xa640, 0xa66f,
+	0xa674, 0xa67d,
+	0xa67f, 0xa6f1,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa7bf,
+	0xa7c2, 0xa7c6,
+	0xa7f7, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c5,
+	0xa8d0, 0xa8d9,
+	0xa8e0, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa8fd, 0xa92d,
+	0xa930, 0xa953,
+	0xa960, 0xa97c,
+	0xa980, 0xa9c0,
+	0xa9cf, 0xa9d9,
+	0xa9e0, 0xa9fe,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaac2,
+	0xaadb, 0xaadd,
+	0xaae0, 0xaaef,
+	0xaaf2, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xab30, 0xab5a,
+	0xab5c, 0xab67,
+	0xab70, 0xabea,
+	0xabec, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb28,
+	0xfb2a, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfc5d,
+	0xfc64, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdf9,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe2f,
+	0xfe33, 0xfe34,
+	0xfe4d, 0xfe4f,
+	0xfe71, 0xfe71,
+	0xfe73, 0xfe73,
+	0xfe77, 0xfe77,
+	0xfe79, 0xfe79,
+	0xfe7b, 0xfe7b,
+	0xfe7d, 0xfe7d,
+	0xfe7f, 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,
+	0x10140, 0x10174,
+	0x101fd, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x102e0, 0x102e0,
+	0x10300, 0x1031f,
+	0x1032d, 0x1034a,
+	0x10350, 0x1037a,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x103d1, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x104b0, 0x104d3,
+	0x104d8, 0x104fb,
+	0x10500, 0x10527,
+	0x10530, 0x10563,
+	0x10600, 0x10736,
+	0x10740, 0x10755,
+	0x10760, 0x10767,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10860, 0x10876,
+	0x10880, 0x1089e,
+	0x108e0, 0x108f2,
+	0x108f4, 0x108f5,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a35,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x10a60, 0x10a7c,
+	0x10a80, 0x10a9c,
+	0x10ac0, 0x10ac7,
+	0x10ac9, 0x10ae6,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10b80, 0x10b91,
+	0x10c00, 0x10c48,
+	0x10c80, 0x10cb2,
+	0x10cc0, 0x10cf2,
+	0x10d00, 0x10d27,
+	0x10d30, 0x10d39,
+	0x10f00, 0x10f1c,
+	0x10f27, 0x10f27,
+	0x10f30, 0x10f50,
+	0x10fe0, 0x10ff6,
+	0x11000, 0x11046,
+	0x11066, 0x1106f,
+	0x1107f, 0x110ba,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x1113f,
+	0x11144, 0x11146,
+	0x11150, 0x11173,
+	0x11176, 0x11176,
+	0x11180, 0x111c4,
+	0x111c9, 0x111cc,
+	0x111d0, 0x111da,
+	0x111dc, 0x111dc,
+	0x11200, 0x11211,
+	0x11213, 0x11237,
+	0x1123e, 0x1123e,
+	0x11280, 0x11286,
+	0x11288, 0x11288,
+	0x1128a, 0x1128d,
+	0x1128f, 0x1129d,
+	0x1129f, 0x112a8,
+	0x112b0, 0x112ea,
+	0x112f0, 0x112f9,
+	0x11300, 0x11303,
+	0x11305, 0x1130c,
+	0x1130f, 0x11310,
+	0x11313, 0x11328,
+	0x1132a, 0x11330,
+	0x11332, 0x11333,
+	0x11335, 0x11339,
+	0x1133b, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11350, 0x11350,
+	0x11357, 0x11357,
+	0x1135d, 0x11363,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11400, 0x1144a,
+	0x11450, 0x11459,
+	0x1145e, 0x1145f,
+	0x11480, 0x114c5,
+	0x114c7, 0x114c7,
+	0x114d0, 0x114d9,
+	0x11580, 0x115b5,
+	0x115b8, 0x115c0,
+	0x115d8, 0x115dd,
+	0x11600, 0x11640,
+	0x11644, 0x11644,
+	0x11650, 0x11659,
+	0x11680, 0x116b8,
+	0x116c0, 0x116c9,
+	0x11700, 0x1171a,
+	0x1171d, 0x1172b,
+	0x11730, 0x11739,
+	0x11800, 0x1183a,
+	0x118a0, 0x118e9,
+	0x118ff, 0x118ff,
+	0x119a0, 0x119a7,
+	0x119aa, 0x119d7,
+	0x119da, 0x119e1,
+	0x119e3, 0x119e4,
+	0x11a00, 0x11a3e,
+	0x11a47, 0x11a47,
+	0x11a50, 0x11a99,
+	0x11a9d, 0x11a9d,
+	0x11ac0, 0x11af8,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c36,
+	0x11c38, 0x11c40,
+	0x11c50, 0x11c59,
+	0x11c72, 0x11c8f,
+	0x11c92, 0x11ca7,
+	0x11ca9, 0x11cb6,
+	0x11d00, 0x11d06,
+	0x11d08, 0x11d09,
+	0x11d0b, 0x11d36,
+	0x11d3a, 0x11d3a,
+	0x11d3c, 0x11d3d,
+	0x11d3f, 0x11d47,
+	0x11d50, 0x11d59,
+	0x11d60, 0x11d65,
+	0x11d67, 0x11d68,
+	0x11d6a, 0x11d8e,
+	0x11d90, 0x11d91,
+	0x11d93, 0x11d98,
+	0x11da0, 0x11da9,
+	0x11ee0, 0x11ef6,
+	0x12000, 0x12399,
+	0x12400, 0x1246e,
+	0x12480, 0x12543,
+	0x13000, 0x1342e,
+	0x14400, 0x14646,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16a60, 0x16a69,
+	0x16ad0, 0x16aed,
+	0x16af0, 0x16af4,
+	0x16b00, 0x16b36,
+	0x16b40, 0x16b43,
+	0x16b50, 0x16b59,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16e40, 0x16e7f,
+	0x16f00, 0x16f4a,
+	0x16f4f, 0x16f87,
+	0x16f8f, 0x16f9f,
+	0x16fe0, 0x16fe1,
+	0x16fe3, 0x16fe3,
+	0x17000, 0x187f7,
+	0x18800, 0x18af2,
+	0x1b000, 0x1b11e,
+	0x1b150, 0x1b152,
+	0x1b164, 0x1b167,
+	0x1b170, 0x1b2fb,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	0x1bc9d, 0x1bc9e,
+	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, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x1da00, 0x1da36,
+	0x1da3b, 0x1da6c,
+	0x1da75, 0x1da75,
+	0x1da84, 0x1da84,
+	0x1da9b, 0x1da9f,
+	0x1daa1, 0x1daaf,
+	0x1e000, 0x1e006,
+	0x1e008, 0x1e018,
+	0x1e01b, 0x1e021,
+	0x1e023, 0x1e024,
+	0x1e026, 0x1e02a,
+	0x1e100, 0x1e12c,
+	0x1e130, 0x1e13d,
+	0x1e140, 0x1e149,
+	0x1e14e, 0x1e14e,
+	0x1e2c0, 0x1e2f9,
+	0x1e800, 0x1e8c4,
+	0x1e8d0, 0x1e8d6,
+	0x1e900, 0x1e94b,
+	0x1e950, 0x1e959,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2b820, 0x2cea1,
+	0x2ceb0, 0x2ebe0,
+	0x2f800, 0x2fa1d,
+	0xe0100, 0xe01ef,
+}; /* CR_XID_Continue */
+
+/* 'Default_Ignorable_Code_Point': Derived Property */
+static const OnigCodePoint CR_Default_Ignorable_Code_Point[] = {
+	17,
+	0x00ad, 0x00ad,
+	0x034f, 0x034f,
+	0x061c, 0x061c,
+	0x115f, 0x1160,
+	0x17b4, 0x17b5,
+	0x180b, 0x180e,
+	0x200b, 0x200f,
+	0x202a, 0x202e,
+	0x2060, 0x206f,
+	0x3164, 0x3164,
+	0xfe00, 0xfe0f,
+	0xfeff, 0xfeff,
+	0xffa0, 0xffa0,
+	0xfff0, 0xfff8,
+	0x1bca0, 0x1bca3,
+	0x1d173, 0x1d17a,
+	0xe0000, 0xe0fff,
+}; /* CR_Default_Ignorable_Code_Point */
+
+/* 'Grapheme_Extend': Derived Property */
+static const OnigCodePoint CR_Grapheme_Extend[] = {
+	335,
+	0x0300, 0x036f,
+	0x0483, 0x0489,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x0610, 0x061a,
+	0x064b, 0x065f,
+	0x0670, 0x0670,
+	0x06d6, 0x06dc,
+	0x06df, 0x06e4,
+	0x06e7, 0x06e8,
+	0x06ea, 0x06ed,
+	0x0711, 0x0711,
+	0x0730, 0x074a,
+	0x07a6, 0x07b0,
+	0x07eb, 0x07f3,
+	0x07fd, 0x07fd,
+	0x0816, 0x0819,
+	0x081b, 0x0823,
+	0x0825, 0x0827,
+	0x0829, 0x082d,
+	0x0859, 0x085b,
+	0x08d3, 0x08e1,
+	0x08e3, 0x0902,
+	0x093a, 0x093a,
+	0x093c, 0x093c,
+	0x0941, 0x0948,
+	0x094d, 0x094d,
+	0x0951, 0x0957,
+	0x0962, 0x0963,
+	0x0981, 0x0981,
+	0x09bc, 0x09bc,
+	0x09be, 0x09be,
+	0x09c1, 0x09c4,
+	0x09cd, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09e2, 0x09e3,
+	0x09fe, 0x09fe,
+	0x0a01, 0x0a02,
+	0x0a3c, 0x0a3c,
+	0x0a41, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a70, 0x0a71,
+	0x0a75, 0x0a75,
+	0x0a81, 0x0a82,
+	0x0abc, 0x0abc,
+	0x0ac1, 0x0ac5,
+	0x0ac7, 0x0ac8,
+	0x0acd, 0x0acd,
+	0x0ae2, 0x0ae3,
+	0x0afa, 0x0aff,
+	0x0b01, 0x0b01,
+	0x0b3c, 0x0b3c,
+	0x0b3e, 0x0b3f,
+	0x0b41, 0x0b44,
+	0x0b4d, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b62, 0x0b63,
+	0x0b82, 0x0b82,
+	0x0bbe, 0x0bbe,
+	0x0bc0, 0x0bc0,
+	0x0bcd, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0c00, 0x0c00,
+	0x0c04, 0x0c04,
+	0x0c3e, 0x0c40,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c62, 0x0c63,
+	0x0c81, 0x0c81,
+	0x0cbc, 0x0cbc,
+	0x0cbf, 0x0cbf,
+	0x0cc2, 0x0cc2,
+	0x0cc6, 0x0cc6,
+	0x0ccc, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0ce2, 0x0ce3,
+	0x0d00, 0x0d01,
+	0x0d3b, 0x0d3c,
+	0x0d3e, 0x0d3e,
+	0x0d41, 0x0d44,
+	0x0d4d, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d62, 0x0d63,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dcf,
+	0x0dd2, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0ddf, 0x0ddf,
+	0x0e31, 0x0e31,
+	0x0e34, 0x0e3a,
+	0x0e47, 0x0e4e,
+	0x0eb1, 0x0eb1,
+	0x0eb4, 0x0ebc,
+	0x0ec8, 0x0ecd,
+	0x0f18, 0x0f19,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f71, 0x0f7e,
+	0x0f80, 0x0f84,
+	0x0f86, 0x0f87,
+	0x0f8d, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x102d, 0x1030,
+	0x1032, 0x1037,
+	0x1039, 0x103a,
+	0x103d, 0x103e,
+	0x1058, 0x1059,
+	0x105e, 0x1060,
+	0x1071, 0x1074,
+	0x1082, 0x1082,
+	0x1085, 0x1086,
+	0x108d, 0x108d,
+	0x109d, 0x109d,
+	0x135d, 0x135f,
+	0x1712, 0x1714,
+	0x1732, 0x1734,
+	0x1752, 0x1753,
+	0x1772, 0x1773,
+	0x17b4, 0x17b5,
+	0x17b7, 0x17bd,
+	0x17c6, 0x17c6,
+	0x17c9, 0x17d3,
+	0x17dd, 0x17dd,
+	0x180b, 0x180d,
+	0x1885, 0x1886,
+	0x18a9, 0x18a9,
+	0x1920, 0x1922,
+	0x1927, 0x1928,
+	0x1932, 0x1932,
+	0x1939, 0x193b,
+	0x1a17, 0x1a18,
+	0x1a1b, 0x1a1b,
+	0x1a56, 0x1a56,
+	0x1a58, 0x1a5e,
+	0x1a60, 0x1a60,
+	0x1a62, 0x1a62,
+	0x1a65, 0x1a6c,
+	0x1a73, 0x1a7c,
+	0x1a7f, 0x1a7f,
+	0x1ab0, 0x1abe,
+	0x1b00, 0x1b03,
+	0x1b34, 0x1b3a,
+	0x1b3c, 0x1b3c,
+	0x1b42, 0x1b42,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1b81,
+	0x1ba2, 0x1ba5,
+	0x1ba8, 0x1ba9,
+	0x1bab, 0x1bad,
+	0x1be6, 0x1be6,
+	0x1be8, 0x1be9,
+	0x1bed, 0x1bed,
+	0x1bef, 0x1bf1,
+	0x1c2c, 0x1c33,
+	0x1c36, 0x1c37,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce0,
+	0x1ce2, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1cf4, 0x1cf4,
+	0x1cf8, 0x1cf9,
+	0x1dc0, 0x1df9,
+	0x1dfb, 0x1dff,
+	0x200c, 0x200c,
+	0x20d0, 0x20f0,
+	0x2cef, 0x2cf1,
+	0x2d7f, 0x2d7f,
+	0x2de0, 0x2dff,
+	0x302a, 0x302f,
+	0x3099, 0x309a,
+	0xa66f, 0xa672,
+	0xa674, 0xa67d,
+	0xa69e, 0xa69f,
+	0xa6f0, 0xa6f1,
+	0xa802, 0xa802,
+	0xa806, 0xa806,
+	0xa80b, 0xa80b,
+	0xa825, 0xa826,
+	0xa8c4, 0xa8c5,
+	0xa8e0, 0xa8f1,
+	0xa8ff, 0xa8ff,
+	0xa926, 0xa92d,
+	0xa947, 0xa951,
+	0xa980, 0xa982,
+	0xa9b3, 0xa9b3,
+	0xa9b6, 0xa9b9,
+	0xa9bc, 0xa9bd,
+	0xa9e5, 0xa9e5,
+	0xaa29, 0xaa2e,
+	0xaa31, 0xaa32,
+	0xaa35, 0xaa36,
+	0xaa43, 0xaa43,
+	0xaa4c, 0xaa4c,
+	0xaa7c, 0xaa7c,
+	0xaab0, 0xaab0,
+	0xaab2, 0xaab4,
+	0xaab7, 0xaab8,
+	0xaabe, 0xaabf,
+	0xaac1, 0xaac1,
+	0xaaec, 0xaaed,
+	0xaaf6, 0xaaf6,
+	0xabe5, 0xabe5,
+	0xabe8, 0xabe8,
+	0xabed, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe2f,
+	0xff9e, 0xff9f,
+	0x101fd, 0x101fd,
+	0x102e0, 0x102e0,
+	0x10376, 0x1037a,
+	0x10a01, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a0f,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x10ae5, 0x10ae6,
+	0x10d24, 0x10d27,
+	0x10f46, 0x10f50,
+	0x11001, 0x11001,
+	0x11038, 0x11046,
+	0x1107f, 0x11081,
+	0x110b3, 0x110b6,
+	0x110b9, 0x110ba,
+	0x11100, 0x11102,
+	0x11127, 0x1112b,
+	0x1112d, 0x11134,
+	0x11173, 0x11173,
+	0x11180, 0x11181,
+	0x111b6, 0x111be,
+	0x111c9, 0x111cc,
+	0x1122f, 0x11231,
+	0x11234, 0x11234,
+	0x11236, 0x11237,
+	0x1123e, 0x1123e,
+	0x112df, 0x112df,
+	0x112e3, 0x112ea,
+	0x11300, 0x11301,
+	0x1133b, 0x1133c,
+	0x1133e, 0x1133e,
+	0x11340, 0x11340,
+	0x11357, 0x11357,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11438, 0x1143f,
+	0x11442, 0x11444,
+	0x11446, 0x11446,
+	0x1145e, 0x1145e,
+	0x114b0, 0x114b0,
+	0x114b3, 0x114b8,
+	0x114ba, 0x114ba,
+	0x114bd, 0x114bd,
+	0x114bf, 0x114c0,
+	0x114c2, 0x114c3,
+	0x115af, 0x115af,
+	0x115b2, 0x115b5,
+	0x115bc, 0x115bd,
+	0x115bf, 0x115c0,
+	0x115dc, 0x115dd,
+	0x11633, 0x1163a,
+	0x1163d, 0x1163d,
+	0x1163f, 0x11640,
+	0x116ab, 0x116ab,
+	0x116ad, 0x116ad,
+	0x116b0, 0x116b5,
+	0x116b7, 0x116b7,
+	0x1171d, 0x1171f,
+	0x11722, 0x11725,
+	0x11727, 0x1172b,
+	0x1182f, 0x11837,
+	0x11839, 0x1183a,
+	0x119d4, 0x119d7,
+	0x119da, 0x119db,
+	0x119e0, 0x119e0,
+	0x11a01, 0x11a0a,
+	0x11a33, 0x11a38,
+	0x11a3b, 0x11a3e,
+	0x11a47, 0x11a47,
+	0x11a51, 0x11a56,
+	0x11a59, 0x11a5b,
+	0x11a8a, 0x11a96,
+	0x11a98, 0x11a99,
+	0x11c30, 0x11c36,
+	0x11c38, 0x11c3d,
+	0x11c3f, 0x11c3f,
+	0x11c92, 0x11ca7,
+	0x11caa, 0x11cb0,
+	0x11cb2, 0x11cb3,
+	0x11cb5, 0x11cb6,
+	0x11d31, 0x11d36,
+	0x11d3a, 0x11d3a,
+	0x11d3c, 0x11d3d,
+	0x11d3f, 0x11d45,
+	0x11d47, 0x11d47,
+	0x11d90, 0x11d91,
+	0x11d95, 0x11d95,
+	0x11d97, 0x11d97,
+	0x11ef3, 0x11ef4,
+	0x16af0, 0x16af4,
+	0x16b30, 0x16b36,
+	0x16f4f, 0x16f4f,
+	0x16f8f, 0x16f92,
+	0x1bc9d, 0x1bc9e,
+	0x1d165, 0x1d165,
+	0x1d167, 0x1d169,
+	0x1d16e, 0x1d172,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0x1da00, 0x1da36,
+	0x1da3b, 0x1da6c,
+	0x1da75, 0x1da75,
+	0x1da84, 0x1da84,
+	0x1da9b, 0x1da9f,
+	0x1daa1, 0x1daaf,
+	0x1e000, 0x1e006,
+	0x1e008, 0x1e018,
+	0x1e01b, 0x1e021,
+	0x1e023, 0x1e024,
+	0x1e026, 0x1e02a,
+	0x1e130, 0x1e136,
+	0x1e2ec, 0x1e2ef,
+	0x1e8d0, 0x1e8d6,
+	0x1e944, 0x1e94a,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+}; /* CR_Grapheme_Extend */
+
+/* 'Grapheme_Base': Derived Property */
+static const OnigCodePoint CR_Grapheme_Base[] = {
+	819,
+	0x0020, 0x007e,
+	0x00a0, 0x00ac,
+	0x00ae, 0x02ff,
+	0x0370, 0x0377,
+	0x037a, 0x037f,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0482,
+	0x048a, 0x052f,
+	0x0531, 0x0556,
+	0x0559, 0x058a,
+	0x058d, 0x058f,
+	0x05be, 0x05be,
+	0x05c0, 0x05c0,
+	0x05c3, 0x05c3,
+	0x05c6, 0x05c6,
+	0x05d0, 0x05ea,
+	0x05ef, 0x05f4,
+	0x0606, 0x060f,
+	0x061b, 0x061b,
+	0x061e, 0x064a,
+	0x0660, 0x066f,
+	0x0671, 0x06d5,
+	0x06de, 0x06de,
+	0x06e5, 0x06e6,
+	0x06e9, 0x06e9,
+	0x06ee, 0x070d,
+	0x0710, 0x0710,
+	0x0712, 0x072f,
+	0x074d, 0x07a5,
+	0x07b1, 0x07b1,
+	0x07c0, 0x07ea,
+	0x07f4, 0x07fa,
+	0x07fe, 0x0815,
+	0x081a, 0x081a,
+	0x0824, 0x0824,
+	0x0828, 0x0828,
+	0x0830, 0x083e,
+	0x0840, 0x0858,
+	0x085e, 0x085e,
+	0x0860, 0x086a,
+	0x08a0, 0x08b4,
+	0x08b6, 0x08bd,
+	0x0903, 0x0939,
+	0x093b, 0x093b,
+	0x093d, 0x0940,
+	0x0949, 0x094c,
+	0x094e, 0x0950,
+	0x0958, 0x0961,
+	0x0964, 0x0980,
+	0x0982, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bd, 0x09bd,
+	0x09bf, 0x09c0,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cc,
+	0x09ce, 0x09ce,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e1,
+	0x09e6, 0x09fd,
+	0x0a03, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3e, 0x0a40,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a6f,
+	0x0a72, 0x0a74,
+	0x0a76, 0x0a76,
+	0x0a83, 0x0a83,
+	0x0a85, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abd, 0x0ac0,
+	0x0ac9, 0x0ac9,
+	0x0acb, 0x0acc,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae1,
+	0x0ae6, 0x0af1,
+	0x0af9, 0x0af9,
+	0x0b02, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3d, 0x0b3d,
+	0x0b40, 0x0b40,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4c,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b66, 0x0b77,
+	0x0b83, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb9,
+	0x0bbf, 0x0bbf,
+	0x0bc1, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcc,
+	0x0bd0, 0x0bd0,
+	0x0be6, 0x0bfa,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c39,
+	0x0c3d, 0x0c3d,
+	0x0c41, 0x0c44,
+	0x0c58, 0x0c5a,
+	0x0c60, 0x0c61,
+	0x0c66, 0x0c6f,
+	0x0c77, 0x0c80,
+	0x0c82, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbd, 0x0cbe,
+	0x0cc0, 0x0cc1,
+	0x0cc3, 0x0cc4,
+	0x0cc7, 0x0cc8,
+	0x0cca, 0x0ccb,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d3d,
+	0x0d3f, 0x0d40,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4c,
+	0x0d4e, 0x0d4f,
+	0x0d54, 0x0d56,
+	0x0d58, 0x0d61,
+	0x0d66, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dd0, 0x0dd1,
+	0x0dd8, 0x0dde,
+	0x0de6, 0x0def,
+	0x0df2, 0x0df4,
+	0x0e01, 0x0e30,
+	0x0e32, 0x0e33,
+	0x0e3f, 0x0e46,
+	0x0e4f, 0x0e5b,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e86, 0x0e8a,
+	0x0e8c, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0eb0,
+	0x0eb2, 0x0eb3,
+	0x0ebd, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edf,
+	0x0f00, 0x0f17,
+	0x0f1a, 0x0f34,
+	0x0f36, 0x0f36,
+	0x0f38, 0x0f38,
+	0x0f3a, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f7f, 0x0f7f,
+	0x0f85, 0x0f85,
+	0x0f88, 0x0f8c,
+	0x0fbe, 0x0fc5,
+	0x0fc7, 0x0fcc,
+	0x0fce, 0x0fda,
+	0x1000, 0x102c,
+	0x1031, 0x1031,
+	0x1038, 0x1038,
+	0x103b, 0x103c,
+	0x103f, 0x1057,
+	0x105a, 0x105d,
+	0x1061, 0x1070,
+	0x1075, 0x1081,
+	0x1083, 0x1084,
+	0x1087, 0x108c,
+	0x108e, 0x109c,
+	0x109e, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 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,
+	0x1360, 0x137c,
+	0x1380, 0x1399,
+	0x13a0, 0x13f5,
+	0x13f8, 0x13fd,
+	0x1400, 0x169c,
+	0x16a0, 0x16f8,
+	0x1700, 0x170c,
+	0x170e, 0x1711,
+	0x1720, 0x1731,
+	0x1735, 0x1736,
+	0x1740, 0x1751,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1780, 0x17b3,
+	0x17b6, 0x17b6,
+	0x17be, 0x17c5,
+	0x17c7, 0x17c8,
+	0x17d4, 0x17dc,
+	0x17e0, 0x17e9,
+	0x17f0, 0x17f9,
+	0x1800, 0x180a,
+	0x1810, 0x1819,
+	0x1820, 0x1878,
+	0x1880, 0x1884,
+	0x1887, 0x18a8,
+	0x18aa, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191e,
+	0x1923, 0x1926,
+	0x1929, 0x192b,
+	0x1930, 0x1931,
+	0x1933, 0x1938,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x19de, 0x1a16,
+	0x1a19, 0x1a1a,
+	0x1a1e, 0x1a55,
+	0x1a57, 0x1a57,
+	0x1a61, 0x1a61,
+	0x1a63, 0x1a64,
+	0x1a6d, 0x1a72,
+	0x1a80, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa0, 0x1aad,
+	0x1b04, 0x1b33,
+	0x1b3b, 0x1b3b,
+	0x1b3d, 0x1b41,
+	0x1b43, 0x1b4b,
+	0x1b50, 0x1b6a,
+	0x1b74, 0x1b7c,
+	0x1b82, 0x1ba1,
+	0x1ba6, 0x1ba7,
+	0x1baa, 0x1baa,
+	0x1bae, 0x1be5,
+	0x1be7, 0x1be7,
+	0x1bea, 0x1bec,
+	0x1bee, 0x1bee,
+	0x1bf2, 0x1bf3,
+	0x1bfc, 0x1c2b,
+	0x1c34, 0x1c35,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c88,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cc7,
+	0x1cd3, 0x1cd3,
+	0x1ce1, 0x1ce1,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf3,
+	0x1cf5, 0x1cf7,
+	0x1cfa, 0x1cfa,
+	0x1d00, 0x1dbf,
+	0x1e00, 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, 0x200a,
+	0x2010, 0x2027,
+	0x202f, 0x205f,
+	0x2070, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x209c,
+	0x20a0, 0x20bf,
+	0x2100, 0x218b,
+	0x2190, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x2b73,
+	0x2b76, 0x2b95,
+	0x2b98, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cee,
+	0x2cf2, 0x2cf3,
+	0x2cf9, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2e00, 0x2e4f,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x3029,
+	0x3030, 0x303f,
+	0x3041, 0x3096,
+	0x309b, 0x30ff,
+	0x3105, 0x312f,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x4db5,
+	0x4dc0, 0x9fef,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa66e,
+	0xa673, 0xa673,
+	0xa67e, 0xa69d,
+	0xa6a0, 0xa6ef,
+	0xa6f2, 0xa6f7,
+	0xa700, 0xa7bf,
+	0xa7c2, 0xa7c6,
+	0xa7f7, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa824,
+	0xa827, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c3,
+	0xa8ce, 0xa8d9,
+	0xa8f2, 0xa8fe,
+	0xa900, 0xa925,
+	0xa92e, 0xa946,
+	0xa952, 0xa953,
+	0xa95f, 0xa97c,
+	0xa983, 0xa9b2,
+	0xa9b4, 0xa9b5,
+	0xa9ba, 0xa9bb,
+	0xa9be, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9e4,
+	0xa9e6, 0xa9fe,
+	0xaa00, 0xaa28,
+	0xaa2f, 0xaa30,
+	0xaa33, 0xaa34,
+	0xaa40, 0xaa42,
+	0xaa44, 0xaa4b,
+	0xaa4d, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaa7b,
+	0xaa7d, 0xaaaf,
+	0xaab1, 0xaab1,
+	0xaab5, 0xaab6,
+	0xaab9, 0xaabd,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaaeb,
+	0xaaee, 0xaaf5,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xab30, 0xab67,
+	0xab70, 0xabe4,
+	0xabe6, 0xabe7,
+	0xabe9, 0xabec,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb1d,
+	0xfb1f, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbc1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfd,
+	0xfe10, 0xfe19,
+	0xfe30, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0xff01, 0xff9d,
+	0xffa0, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfffc, 0xfffd,
+	0x10000, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1018e,
+	0x10190, 0x1019b,
+	0x101a0, 0x101a0,
+	0x101d0, 0x101fc,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x102e1, 0x102fb,
+	0x10300, 0x10323,
+	0x1032d, 0x1034a,
+	0x10350, 0x10375,
+	0x10380, 0x1039d,
+	0x1039f, 0x103c3,
+	0x103c8, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x104b0, 0x104d3,
+	0x104d8, 0x104fb,
+	0x10500, 0x10527,
+	0x10530, 0x10563,
+	0x1056f, 0x1056f,
+	0x10600, 0x10736,
+	0x10740, 0x10755,
+	0x10760, 0x10767,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10857, 0x1089e,
+	0x108a7, 0x108af,
+	0x108e0, 0x108f2,
+	0x108f4, 0x108f5,
+	0x108fb, 0x1091b,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10980, 0x109b7,
+	0x109bc, 0x109cf,
+	0x109d2, 0x10a00,
+	0x10a10, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a35,
+	0x10a40, 0x10a48,
+	0x10a50, 0x10a58,
+	0x10a60, 0x10a9f,
+	0x10ac0, 0x10ae4,
+	0x10aeb, 0x10af6,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b55,
+	0x10b58, 0x10b72,
+	0x10b78, 0x10b91,
+	0x10b99, 0x10b9c,
+	0x10ba9, 0x10baf,
+	0x10c00, 0x10c48,
+	0x10c80, 0x10cb2,
+	0x10cc0, 0x10cf2,
+	0x10cfa, 0x10d23,
+	0x10d30, 0x10d39,
+	0x10e60, 0x10e7e,
+	0x10f00, 0x10f27,
+	0x10f30, 0x10f45,
+	0x10f51, 0x10f59,
+	0x10fe0, 0x10ff6,
+	0x11000, 0x11000,
+	0x11002, 0x11037,
+	0x11047, 0x1104d,
+	0x11052, 0x1106f,
+	0x11082, 0x110b2,
+	0x110b7, 0x110b8,
+	0x110bb, 0x110bc,
+	0x110be, 0x110c1,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11103, 0x11126,
+	0x1112c, 0x1112c,
+	0x11136, 0x11146,
+	0x11150, 0x11172,
+	0x11174, 0x11176,
+	0x11182, 0x111b5,
+	0x111bf, 0x111c8,
+	0x111cd, 0x111cd,
+	0x111d0, 0x111df,
+	0x111e1, 0x111f4,
+	0x11200, 0x11211,
+	0x11213, 0x1122e,
+	0x11232, 0x11233,
+	0x11235, 0x11235,
+	0x11238, 0x1123d,
+	0x11280, 0x11286,
+	0x11288, 0x11288,
+	0x1128a, 0x1128d,
+	0x1128f, 0x1129d,
+	0x1129f, 0x112a9,
+	0x112b0, 0x112de,
+	0x112e0, 0x112e2,
+	0x112f0, 0x112f9,
+	0x11302, 0x11303,
+	0x11305, 0x1130c,
+	0x1130f, 0x11310,
+	0x11313, 0x11328,
+	0x1132a, 0x11330,
+	0x11332, 0x11333,
+	0x11335, 0x11339,
+	0x1133d, 0x1133d,
+	0x1133f, 0x1133f,
+	0x11341, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11350, 0x11350,
+	0x1135d, 0x11363,
+	0x11400, 0x11437,
+	0x11440, 0x11441,
+	0x11445, 0x11445,
+	0x11447, 0x11459,
+	0x1145b, 0x1145b,
+	0x1145d, 0x1145d,
+	0x1145f, 0x1145f,
+	0x11480, 0x114af,
+	0x114b1, 0x114b2,
+	0x114b9, 0x114b9,
+	0x114bb, 0x114bc,
+	0x114be, 0x114be,
+	0x114c1, 0x114c1,
+	0x114c4, 0x114c7,
+	0x114d0, 0x114d9,
+	0x11580, 0x115ae,
+	0x115b0, 0x115b1,
+	0x115b8, 0x115bb,
+	0x115be, 0x115be,
+	0x115c1, 0x115db,
+	0x11600, 0x11632,
+	0x1163b, 0x1163c,
+	0x1163e, 0x1163e,
+	0x11641, 0x11644,
+	0x11650, 0x11659,
+	0x11660, 0x1166c,
+	0x11680, 0x116aa,
+	0x116ac, 0x116ac,
+	0x116ae, 0x116af,
+	0x116b6, 0x116b6,
+	0x116b8, 0x116b8,
+	0x116c0, 0x116c9,
+	0x11700, 0x1171a,
+	0x11720, 0x11721,
+	0x11726, 0x11726,
+	0x11730, 0x1173f,
+	0x11800, 0x1182e,
+	0x11838, 0x11838,
+	0x1183b, 0x1183b,
+	0x118a0, 0x118f2,
+	0x118ff, 0x118ff,
+	0x119a0, 0x119a7,
+	0x119aa, 0x119d3,
+	0x119dc, 0x119df,
+	0x119e1, 0x119e4,
+	0x11a00, 0x11a00,
+	0x11a0b, 0x11a32,
+	0x11a39, 0x11a3a,
+	0x11a3f, 0x11a46,
+	0x11a50, 0x11a50,
+	0x11a57, 0x11a58,
+	0x11a5c, 0x11a89,
+	0x11a97, 0x11a97,
+	0x11a9a, 0x11aa2,
+	0x11ac0, 0x11af8,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c2f,
+	0x11c3e, 0x11c3e,
+	0x11c40, 0x11c45,
+	0x11c50, 0x11c6c,
+	0x11c70, 0x11c8f,
+	0x11ca9, 0x11ca9,
+	0x11cb1, 0x11cb1,
+	0x11cb4, 0x11cb4,
+	0x11d00, 0x11d06,
+	0x11d08, 0x11d09,
+	0x11d0b, 0x11d30,
+	0x11d46, 0x11d46,
+	0x11d50, 0x11d59,
+	0x11d60, 0x11d65,
+	0x11d67, 0x11d68,
+	0x11d6a, 0x11d8e,
+	0x11d93, 0x11d94,
+	0x11d96, 0x11d96,
+	0x11d98, 0x11d98,
+	0x11da0, 0x11da9,
+	0x11ee0, 0x11ef2,
+	0x11ef5, 0x11ef8,
+	0x11fc0, 0x11ff1,
+	0x11fff, 0x12399,
+	0x12400, 0x1246e,
+	0x12470, 0x12474,
+	0x12480, 0x12543,
+	0x13000, 0x1342e,
+	0x14400, 0x14646,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16a60, 0x16a69,
+	0x16a6e, 0x16a6f,
+	0x16ad0, 0x16aed,
+	0x16af5, 0x16af5,
+	0x16b00, 0x16b2f,
+	0x16b37, 0x16b45,
+	0x16b50, 0x16b59,
+	0x16b5b, 0x16b61,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16e40, 0x16e9a,
+	0x16f00, 0x16f4a,
+	0x16f50, 0x16f87,
+	0x16f93, 0x16f9f,
+	0x16fe0, 0x16fe3,
+	0x17000, 0x187f7,
+	0x18800, 0x18af2,
+	0x1b000, 0x1b11e,
+	0x1b150, 0x1b152,
+	0x1b164, 0x1b167,
+	0x1b170, 0x1b2fb,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	0x1bc9c, 0x1bc9c,
+	0x1bc9f, 0x1bc9f,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d164,
+	0x1d166, 0x1d166,
+	0x1d16a, 0x1d16d,
+	0x1d183, 0x1d184,
+	0x1d18c, 0x1d1a9,
+	0x1d1ae, 0x1d1e8,
+	0x1d200, 0x1d241,
+	0x1d245, 0x1d245,
+	0x1d2e0, 0x1d2f3,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d378,
+	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, 0x1d7cb,
+	0x1d7ce, 0x1d9ff,
+	0x1da37, 0x1da3a,
+	0x1da6d, 0x1da74,
+	0x1da76, 0x1da83,
+	0x1da85, 0x1da8b,
+	0x1e100, 0x1e12c,
+	0x1e137, 0x1e13d,
+	0x1e140, 0x1e149,
+	0x1e14e, 0x1e14f,
+	0x1e2c0, 0x1e2eb,
+	0x1e2f0, 0x1e2f9,
+	0x1e2ff, 0x1e2ff,
+	0x1e800, 0x1e8c4,
+	0x1e8c7, 0x1e8cf,
+	0x1e900, 0x1e943,
+	0x1e94b, 0x1e94b,
+	0x1e950, 0x1e959,
+	0x1e95e, 0x1e95f,
+	0x1ec71, 0x1ecb4,
+	0x1ed01, 0x1ed3d,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0bf,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0f5,
+	0x1f100, 0x1f10c,
+	0x1f110, 0x1f16c,
+	0x1f170, 0x1f1ac,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23b,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f260, 0x1f265,
+	0x1f300, 0x1f6d5,
+	0x1f6e0, 0x1f6ec,
+	0x1f6f0, 0x1f6fa,
+	0x1f700, 0x1f773,
+	0x1f780, 0x1f7d8,
+	0x1f7e0, 0x1f7eb,
+	0x1f800, 0x1f80b,
+	0x1f810, 0x1f847,
+	0x1f850, 0x1f859,
+	0x1f860, 0x1f887,
+	0x1f890, 0x1f8ad,
+	0x1f900, 0x1f90b,
+	0x1f90d, 0x1f971,
+	0x1f973, 0x1f976,
+	0x1f97a, 0x1f9a2,
+	0x1f9a5, 0x1f9aa,
+	0x1f9ae, 0x1f9ca,
+	0x1f9cd, 0x1fa53,
+	0x1fa60, 0x1fa6d,
+	0x1fa70, 0x1fa73,
+	0x1fa78, 0x1fa7a,
+	0x1fa80, 0x1fa82,
+	0x1fa90, 0x1fa95,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2b820, 0x2cea1,
+	0x2ceb0, 0x2ebe0,
+	0x2f800, 0x2fa1d,
+}; /* CR_Grapheme_Base */
+
+/* 'Grapheme_Link': Derived Property */
+static const OnigCodePoint CR_Grapheme_Link[] = {
+	52,
+	0x094d, 0x094d,
+	0x09cd, 0x09cd,
+	0x0a4d, 0x0a4d,
+	0x0acd, 0x0acd,
+	0x0b4d, 0x0b4d,
+	0x0bcd, 0x0bcd,
+	0x0c4d, 0x0c4d,
+	0x0ccd, 0x0ccd,
+	0x0d3b, 0x0d3c,
+	0x0d4d, 0x0d4d,
+	0x0dca, 0x0dca,
+	0x0e3a, 0x0e3a,
+	0x0eba, 0x0eba,
+	0x0f84, 0x0f84,
+	0x1039, 0x103a,
+	0x1714, 0x1714,
+	0x1734, 0x1734,
+	0x17d2, 0x17d2,
+	0x1a60, 0x1a60,
+	0x1b44, 0x1b44,
+	0x1baa, 0x1bab,
+	0x1bf2, 0x1bf3,
+	0x2d7f, 0x2d7f,
+	0xa806, 0xa806,
+	0xa8c4, 0xa8c4,
+	0xa953, 0xa953,
+	0xa9c0, 0xa9c0,
+	0xaaf6, 0xaaf6,
+	0xabed, 0xabed,
+	0x10a3f, 0x10a3f,
+	0x11046, 0x11046,
+	0x1107f, 0x1107f,
+	0x110b9, 0x110b9,
+	0x11133, 0x11134,
+	0x111c0, 0x111c0,
+	0x11235, 0x11235,
+	0x112ea, 0x112ea,
+	0x1134d, 0x1134d,
+	0x11442, 0x11442,
+	0x114c2, 0x114c2,
+	0x115bf, 0x115bf,
+	0x1163f, 0x1163f,
+	0x116b6, 0x116b6,
+	0x1172b, 0x1172b,
+	0x11839, 0x11839,
+	0x119e0, 0x119e0,
+	0x11a34, 0x11a34,
+	0x11a47, 0x11a47,
+	0x11a99, 0x11a99,
+	0x11c3f, 0x11c3f,
+	0x11d44, 0x11d45,
+	0x11d97, 0x11d97,
+}; /* CR_Grapheme_Link */
+
+/* 'Common': Script */
+static const OnigCodePoint CR_Common[] = {
+	172,
+	0x0000, 0x0040,
+	0x005b, 0x0060,
+	0x007b, 0x00a9,
+	0x00ab, 0x00b9,
+	0x00bb, 0x00bf,
+	0x00d7, 0x00d7,
+	0x00f7, 0x00f7,
+	0x02b9, 0x02df,
+	0x02e5, 0x02e9,
+	0x02ec, 0x02ff,
+	0x0374, 0x0374,
+	0x037e, 0x037e,
+	0x0385, 0x0385,
+	0x0387, 0x0387,
+	0x0589, 0x0589,
+	0x0605, 0x0605,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0640, 0x0640,
+	0x06dd, 0x06dd,
+	0x08e2, 0x08e2,
+	0x0964, 0x0965,
+	0x0e3f, 0x0e3f,
+	0x0fd5, 0x0fd8,
+	0x10fb, 0x10fb,
+	0x16eb, 0x16ed,
+	0x1735, 0x1736,
+	0x1802, 0x1803,
+	0x1805, 0x1805,
+	0x1cd3, 0x1cd3,
+	0x1ce1, 0x1ce1,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf3,
+	0x1cf5, 0x1cf7,
+	0x1cfa, 0x1cfa,
+	0x2000, 0x200b,
+	0x200e, 0x2064,
+	0x2066, 0x2070,
+	0x2074, 0x207e,
+	0x2080, 0x208e,
+	0x20a0, 0x20bf,
+	0x2100, 0x2125,
+	0x2127, 0x2129,
+	0x212c, 0x2131,
+	0x2133, 0x214d,
+	0x214f, 0x215f,
+	0x2189, 0x218b,
+	0x2190, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x27ff,
+	0x2900, 0x2b73,
+	0x2b76, 0x2b95,
+	0x2b98, 0x2bff,
+	0x2e00, 0x2e4f,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x3004,
+	0x3006, 0x3006,
+	0x3008, 0x3020,
+	0x3030, 0x3037,
+	0x303c, 0x303f,
+	0x309b, 0x309c,
+	0x30a0, 0x30a0,
+	0x30fb, 0x30fc,
+	0x3190, 0x319f,
+	0x31c0, 0x31e3,
+	0x3220, 0x325f,
+	0x327f, 0x32cf,
+	0x32ff, 0x32ff,
+	0x3358, 0x33ff,
+	0x4dc0, 0x4dff,
+	0xa700, 0xa721,
+	0xa788, 0xa78a,
+	0xa830, 0xa839,
+	0xa92e, 0xa92e,
+	0xa9cf, 0xa9cf,
+	0xab5b, 0xab5b,
+	0xfd3e, 0xfd3f,
+	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,
+	0x10190, 0x1019b,
+	0x101d0, 0x101fc,
+	0x102e1, 0x102fb,
+	0x16fe2, 0x16fe3,
+	0x1bca0, 0x1bca3,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d166,
+	0x1d16a, 0x1d17a,
+	0x1d183, 0x1d184,
+	0x1d18c, 0x1d1a9,
+	0x1d1ae, 0x1d1e8,
+	0x1d2e0, 0x1d2f3,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d378,
+	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, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x1ec71, 0x1ecb4,
+	0x1ed01, 0x1ed3d,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0bf,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0f5,
+	0x1f100, 0x1f10c,
+	0x1f110, 0x1f16c,
+	0x1f170, 0x1f1ac,
+	0x1f1e6, 0x1f1ff,
+	0x1f201, 0x1f202,
+	0x1f210, 0x1f23b,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f260, 0x1f265,
+	0x1f300, 0x1f6d5,
+	0x1f6e0, 0x1f6ec,
+	0x1f6f0, 0x1f6fa,
+	0x1f700, 0x1f773,
+	0x1f780, 0x1f7d8,
+	0x1f7e0, 0x1f7eb,
+	0x1f800, 0x1f80b,
+	0x1f810, 0x1f847,
+	0x1f850, 0x1f859,
+	0x1f860, 0x1f887,
+	0x1f890, 0x1f8ad,
+	0x1f900, 0x1f90b,
+	0x1f90d, 0x1f971,
+	0x1f973, 0x1f976,
+	0x1f97a, 0x1f9a2,
+	0x1f9a5, 0x1f9aa,
+	0x1f9ae, 0x1f9ca,
+	0x1f9cd, 0x1fa53,
+	0x1fa60, 0x1fa6d,
+	0x1fa70, 0x1fa73,
+	0x1fa78, 0x1fa7a,
+	0x1fa80, 0x1fa82,
+	0x1fa90, 0x1fa95,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+}; /* CR_Common */
+
+/* 'Latin': Script */
+static const OnigCodePoint CR_Latin[] = {
+	32,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00aa, 0x00aa,
+	0x00ba, 0x00ba,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x02b8,
+	0x02e0, 0x02e4,
+	0x1d00, 0x1d25,
+	0x1d2c, 0x1d5c,
+	0x1d62, 0x1d65,
+	0x1d6b, 0x1d77,
+	0x1d79, 0x1dbe,
+	0x1e00, 0x1eff,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x209c,
+	0x212a, 0x212b,
+	0x2132, 0x2132,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x2c60, 0x2c7f,
+	0xa722, 0xa787,
+	0xa78b, 0xa7bf,
+	0xa7c2, 0xa7c6,
+	0xa7f7, 0xa7ff,
+	0xab30, 0xab5a,
+	0xab5c, 0xab64,
+	0xab66, 0xab67,
+	0xfb00, 0xfb06,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+}; /* CR_Latin */
+
+/* 'Greek': Script */
+static const OnigCodePoint CR_Greek[] = {
+	36,
+	0x0370, 0x0373,
+	0x0375, 0x0377,
+	0x037a, 0x037d,
+	0x037f, 0x037f,
+	0x0384, 0x0384,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03e1,
+	0x03f0, 0x03ff,
+	0x1d26, 0x1d2a,
+	0x1d5d, 0x1d61,
+	0x1d66, 0x1d6a,
+	0x1dbf, 0x1dbf,
+	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,
+	0xab65, 0xab65,
+	0x10140, 0x1018e,
+	0x101a0, 0x101a0,
+	0x1d200, 0x1d245,
+}; /* CR_Greek */
+
+/* 'Cyrillic': Script */
+static const OnigCodePoint CR_Cyrillic[] = {
+	8,
+	0x0400, 0x0484,
+	0x0487, 0x052f,
+	0x1c80, 0x1c88,
+	0x1d2b, 0x1d2b,
+	0x1d78, 0x1d78,
+	0x2de0, 0x2dff,
+	0xa640, 0xa69f,
+	0xfe2e, 0xfe2f,
+}; /* CR_Cyrillic */
+
+/* 'Armenian': Script */
+static const OnigCodePoint CR_Armenian[] = {
+	5,
+	0x0531, 0x0556,
+	0x0559, 0x0588,
+	0x058a, 0x058a,
+	0x058d, 0x058f,
+	0xfb13, 0xfb17,
+}; /* CR_Armenian */
+
+/* 'Hebrew': Script */
+static const OnigCodePoint CR_Hebrew[] = {
+	9,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05ef, 0x05f4,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfb4f,
+}; /* CR_Hebrew */
+
+/* 'Arabic': Script */
+static const OnigCodePoint CR_Arabic[] = {
+	57,
+	0x0600, 0x0604,
+	0x0606, 0x060b,
+	0x060d, 0x061a,
+	0x061c, 0x061c,
+	0x061e, 0x061e,
+	0x0620, 0x063f,
+	0x0641, 0x064a,
+	0x0656, 0x066f,
+	0x0671, 0x06dc,
+	0x06de, 0x06ff,
+	0x0750, 0x077f,
+	0x08a0, 0x08b4,
+	0x08b6, 0x08bd,
+	0x08d3, 0x08e1,
+	0x08e3, 0x08ff,
+	0xfb50, 0xfbc1,
+	0xfbd3, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfd,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0x10e60, 0x10e7e,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+}; /* CR_Arabic */
+
+/* 'Syriac': Script */
+static const OnigCodePoint CR_Syriac[] = {
+	4,
+	0x0700, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x074f,
+	0x0860, 0x086a,
+}; /* CR_Syriac */
+
+/* 'Thaana': Script */
+static const OnigCodePoint CR_Thaana[] = {
+	1,
+	0x0780, 0x07b1,
+}; /* CR_Thaana */
+
+/* 'Devanagari': Script */
+static const OnigCodePoint CR_Devanagari[] = {
+	4,
+	0x0900, 0x0950,
+	0x0955, 0x0963,
+	0x0966, 0x097f,
+	0xa8e0, 0xa8ff,
+}; /* CR_Devanagari */
+
+/* 'Bengali': Script */
+static const OnigCodePoint CR_Bengali[] = {
+	14,
+	0x0980, 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, 0x09fe,
+}; /* CR_Bengali */
+
+/* 'Gurmukhi': Script */
+static const OnigCodePoint CR_Gurmukhi[] = {
+	16,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a76,
+}; /* CR_Gurmukhi */
+
+/* '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, 0x0af1,
+	0x0af9, 0x0aff,
+}; /* CR_Gujarati */
+
+/* 'Oriya': Script */
+static const OnigCodePoint CR_Oriya[] = {
+	14,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b77,
+}; /* CR_Oriya */
+
+/* 'Tamil': Script */
+static const OnigCodePoint CR_Tamil[] = {
+	18,
+	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,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bfa,
+	0x11fc0, 0x11ff1,
+	0x11fff, 0x11fff,
+}; /* CR_Tamil */
+
+/* 'Telugu': Script */
+static const OnigCodePoint CR_Telugu[] = {
+	12,
+	0x0c00, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c5a,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c77, 0x0c7f,
+}; /* CR_Telugu */
+
+/* 'Kannada': Script */
+static const OnigCodePoint CR_Kannada[] = {
+	13,
+	0x0c80, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
+}; /* CR_Kannada */
+
+/* 'Malayalam': Script */
+static const OnigCodePoint CR_Malayalam[] = {
+	8,
+	0x0d00, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4f,
+	0x0d54, 0x0d63,
+	0x0d66, 0x0d7f,
+}; /* CR_Malayalam */
+
+/* 'Sinhala': Script */
+static const OnigCodePoint CR_Sinhala[] = {
+	13,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0de6, 0x0def,
+	0x0df2, 0x0df4,
+	0x111e1, 0x111f4,
+}; /* CR_Sinhala */
+
+/* 'Thai': Script */
+static const OnigCodePoint CR_Thai[] = {
+	2,
+	0x0e01, 0x0e3a,
+	0x0e40, 0x0e5b,
+}; /* CR_Thai */
+
+/* 'Lao': Script */
+static const OnigCodePoint CR_Lao[] = {
+	11,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e86, 0x0e8a,
+	0x0e8c, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edf,
+}; /* CR_Lao */
+
+/* 'Tibetan': Script */
+static const OnigCodePoint CR_Tibetan[] = {
+	7,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fd4,
+	0x0fd9, 0x0fda,
+}; /* CR_Tibetan */
+
+/* 'Myanmar': Script */
+static const OnigCodePoint CR_Myanmar[] = {
+	3,
+	0x1000, 0x109f,
+	0xa9e0, 0xa9fe,
+	0xaa60, 0xaa7f,
+}; /* CR_Myanmar */
+
+/* 'Georgian': Script */
+static const OnigCodePoint CR_Georgian[] = {
+	10,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 0x10ff,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cbf,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+}; /* CR_Georgian */
+
+/* 'Hangul': Script */
+static const OnigCodePoint CR_Hangul[] = {
+	14,
+	0x1100, 0x11ff,
+	0x302e, 0x302f,
+	0x3131, 0x318e,
+	0x3200, 0x321e,
+	0x3260, 0x327e,
+	0xa960, 0xa97c,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xffa0, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+}; /* CR_Hangul */
+
+/* 'Ethiopic': Script */
+static const OnigCodePoint CR_Ethiopic[] = {
+	32,
+	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,
+	0x135d, 0x137c,
+	0x1380, 0x1399,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+}; /* CR_Ethiopic */
+
+/* 'Cherokee': Script */
+static const OnigCodePoint CR_Cherokee[] = {
+	3,
+	0x13a0, 0x13f5,
+	0x13f8, 0x13fd,
+	0xab70, 0xabbf,
+}; /* CR_Cherokee */
+
+/* 'Canadian_Aboriginal': Script */
+static const OnigCodePoint CR_Canadian_Aboriginal[] = {
+	2,
+	0x1400, 0x167f,
+	0x18b0, 0x18f5,
+}; /* CR_Canadian_Aboriginal */
+
+/* 'Ogham': Script */
+static const OnigCodePoint CR_Ogham[] = {
+	1,
+	0x1680, 0x169c,
+}; /* CR_Ogham */
+
+/* 'Runic': Script */
+static const OnigCodePoint CR_Runic[] = {
+	2,
+	0x16a0, 0x16ea,
+	0x16ee, 0x16f8,
+}; /* CR_Runic */
+
+/* 'Khmer': Script */
+static const OnigCodePoint CR_Khmer[] = {
+	4,
+	0x1780, 0x17dd,
+	0x17e0, 0x17e9,
+	0x17f0, 0x17f9,
+	0x19e0, 0x19ff,
+}; /* CR_Khmer */
+
+/* 'Mongolian': Script */
+static const OnigCodePoint CR_Mongolian[] = {
+	7,
+	0x1800, 0x1801,
+	0x1804, 0x1804,
+	0x1806, 0x180e,
+	0x1810, 0x1819,
+	0x1820, 0x1878,
+	0x1880, 0x18aa,
+	0x11660, 0x1166c,
+}; /* CR_Mongolian */
+
+/* 'Hiragana': Script */
+static const OnigCodePoint CR_Hiragana[] = {
+	5,
+	0x3041, 0x3096,
+	0x309d, 0x309f,
+	0x1b001, 0x1b11e,
+	0x1b150, 0x1b152,
+	0x1f200, 0x1f200,
+}; /* CR_Hiragana */
+
+/* 'Katakana': Script */
+static const OnigCodePoint CR_Katakana[] = {
+	9,
+	0x30a1, 0x30fa,
+	0x30fd, 0x30ff,
+	0x31f0, 0x31ff,
+	0x32d0, 0x32fe,
+	0x3300, 0x3357,
+	0xff66, 0xff6f,
+	0xff71, 0xff9d,
+	0x1b000, 0x1b000,
+	0x1b164, 0x1b167,
+}; /* CR_Katakana */
+
+/* 'Bopomofo': Script */
+static const OnigCodePoint CR_Bopomofo[] = {
+	3,
+	0x02ea, 0x02eb,
+	0x3105, 0x312f,
+	0x31a0, 0x31ba,
+}; /* CR_Bopomofo */
+
+/* 'Han': Script */
+static const OnigCodePoint CR_Han[] = {
+	17,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x3005, 0x3005,
+	0x3007, 0x3007,
+	0x3021, 0x3029,
+	0x3038, 0x303b,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fef,
+	0xf900, 0xfa6d,
+	0xfa70, 0xfad9,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2b820, 0x2cea1,
+	0x2ceb0, 0x2ebe0,
+	0x2f800, 0x2fa1d,
+}; /* CR_Han */
+
+/* 'Yi': Script */
+static const OnigCodePoint CR_Yi[] = {
+	2,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+}; /* CR_Yi */
+
+/* 'Old_Italic': Script */
+static const OnigCodePoint CR_Old_Italic[] = {
+	2,
+	0x10300, 0x10323,
+	0x1032d, 0x1032f,
+}; /* CR_Old_Italic */
+
+/* 'Gothic': Script */
+static const OnigCodePoint CR_Gothic[] = {
+	1,
+	0x10330, 0x1034a,
+}; /* CR_Gothic */
+
+/* 'Deseret': Script */
+static const OnigCodePoint CR_Deseret[] = {
+	1,
+	0x10400, 0x1044f,
+}; /* CR_Deseret */
+
+/* 'Inherited': Script */
+static const OnigCodePoint CR_Inherited[] = {
+	28,
+	0x0300, 0x036f,
+	0x0485, 0x0486,
+	0x064b, 0x0655,
+	0x0670, 0x0670,
+	0x0951, 0x0954,
+	0x1ab0, 0x1abe,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce0,
+	0x1ce2, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1cf4, 0x1cf4,
+	0x1cf8, 0x1cf9,
+	0x1dc0, 0x1df9,
+	0x1dfb, 0x1dff,
+	0x200c, 0x200d,
+	0x20d0, 0x20f0,
+	0x302a, 0x302d,
+	0x3099, 0x309a,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe2d,
+	0x101fd, 0x101fd,
+	0x102e0, 0x102e0,
+	0x1133b, 0x1133b,
+	0x1d167, 0x1d169,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0xe0100, 0xe01ef,
+}; /* CR_Inherited */
+
+/* 'Tagalog': Script */
+static const OnigCodePoint CR_Tagalog[] = {
+	2,
+	0x1700, 0x170c,
+	0x170e, 0x1714,
+}; /* CR_Tagalog */
+
+/* 'Hanunoo': Script */
+static const OnigCodePoint CR_Hanunoo[] = {
+	1,
+	0x1720, 0x1734,
+}; /* CR_Hanunoo */
+
+/* 'Buhid': Script */
+static const OnigCodePoint CR_Buhid[] = {
+	1,
+	0x1740, 0x1753,
+}; /* CR_Buhid */
+
+/* 'Tagbanwa': Script */
+static const OnigCodePoint CR_Tagbanwa[] = {
+	3,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+}; /* CR_Tagbanwa */
+
+/* 'Limbu': Script */
+static const OnigCodePoint CR_Limbu[] = {
+	5,
+	0x1900, 0x191e,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x194f,
+}; /* CR_Limbu */
+
+/* 'Tai_Le': Script */
+static const OnigCodePoint CR_Tai_Le[] = {
+	2,
+	0x1950, 0x196d,
+	0x1970, 0x1974,
+}; /* CR_Tai_Le */
+
+/* '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 */
+
+/* 'Ugaritic': Script */
+static const OnigCodePoint CR_Ugaritic[] = {
+	2,
+	0x10380, 0x1039d,
+	0x1039f, 0x1039f,
+}; /* CR_Ugaritic */
+
+/* 'Shavian': Script */
+static const OnigCodePoint CR_Shavian[] = {
+	1,
+	0x10450, 0x1047f,
+}; /* CR_Shavian */
+
+/* 'Osmanya': Script */
+static const OnigCodePoint CR_Osmanya[] = {
+	2,
+	0x10480, 0x1049d,
+	0x104a0, 0x104a9,
+}; /* CR_Osmanya */
+
+/* 'Cypriot': Script */
+static const OnigCodePoint CR_Cypriot[] = {
+	6,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x1083f,
+}; /* CR_Cypriot */
+
+/* '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 */
+
+/* 'Coptic': Script */
+static const OnigCodePoint CR_Coptic[] = {
+	3,
+	0x03e2, 0x03ef,
+	0x2c80, 0x2cf3,
+	0x2cf9, 0x2cff,
+}; /* CR_Coptic */
+
+/* 'New_Tai_Lue': Script */
+static const OnigCodePoint CR_New_Tai_Lue[] = {
+	4,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x19de, 0x19df,
+}; /* CR_New_Tai_Lue */
+
+/* 'Glagolitic': Script */
+static const OnigCodePoint CR_Glagolitic[] = {
+	7,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x1e000, 0x1e006,
+	0x1e008, 0x1e018,
+	0x1e01b, 0x1e021,
+	0x1e023, 0x1e024,
+	0x1e026, 0x1e02a,
+}; /* CR_Glagolitic */
+
+/* 'Tifinagh': Script */
+static const OnigCodePoint CR_Tifinagh[] = {
+	3,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d7f,
+}; /* CR_Tifinagh */
+
+/* 'Syloti_Nagri': Script */
+static const OnigCodePoint CR_Syloti_Nagri[] = {
+	1,
+	0xa800, 0xa82b,
+}; /* CR_Syloti_Nagri */
+
+/* 'Old_Persian': Script */
+static const OnigCodePoint CR_Old_Persian[] = {
+	2,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103d5,
+}; /* CR_Old_Persian */
+
+/* 'Kharoshthi': Script */
+static const OnigCodePoint CR_Kharoshthi[] = {
+	8,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a35,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a48,
+	0x10a50, 0x10a58,
+}; /* CR_Kharoshthi */
+
+/* 'Balinese': Script */
+static const OnigCodePoint CR_Balinese[] = {
+	2,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+}; /* CR_Balinese */
+
+/* 'Cuneiform': Script */
+static const OnigCodePoint CR_Cuneiform[] = {
+	4,
+	0x12000, 0x12399,
+	0x12400, 0x1246e,
+	0x12470, 0x12474,
+	0x12480, 0x12543,
+}; /* CR_Cuneiform */
+
+/* 'Phoenician': Script */
+static const OnigCodePoint CR_Phoenician[] = {
+	2,
+	0x10900, 0x1091b,
+	0x1091f, 0x1091f,
+}; /* CR_Phoenician */
+
+/* 'Phags_Pa': Script */
+static const OnigCodePoint CR_Phags_Pa[] = {
+	1,
+	0xa840, 0xa877,
+}; /* CR_Phags_Pa */
+
+/* 'Nko': Script */
+static const OnigCodePoint CR_Nko[] = {
+	2,
+	0x07c0, 0x07fa,
+	0x07fd, 0x07ff,
+}; /* CR_Nko */
+
+/* 'Sundanese': Script */
+static const OnigCodePoint CR_Sundanese[] = {
+	2,
+	0x1b80, 0x1bbf,
+	0x1cc0, 0x1cc7,
+}; /* CR_Sundanese */
+
+/* 'Lepcha': Script */
+static const OnigCodePoint CR_Lepcha[] = {
+	3,
+	0x1c00, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c4f,
+}; /* CR_Lepcha */
+
+/* 'Ol_Chiki': Script */
+static const OnigCodePoint CR_Ol_Chiki[] = {
+	1,
+	0x1c50, 0x1c7f,
+}; /* CR_Ol_Chiki */
+
+/* 'Vai': Script */
+static const OnigCodePoint CR_Vai[] = {
+	1,
+	0xa500, 0xa62b,
+}; /* CR_Vai */
+
+/* 'Saurashtra': Script */
+static const OnigCodePoint CR_Saurashtra[] = {
+	2,
+	0xa880, 0xa8c5,
+	0xa8ce, 0xa8d9,
+}; /* CR_Saurashtra */
+
+/* 'Kayah_Li': Script */
+static const OnigCodePoint CR_Kayah_Li[] = {
+	2,
+	0xa900, 0xa92d,
+	0xa92f, 0xa92f,
+}; /* CR_Kayah_Li */
+
+/* 'Rejang': Script */
+static const OnigCodePoint CR_Rejang[] = {
+	2,
+	0xa930, 0xa953,
+	0xa95f, 0xa95f,
+}; /* CR_Rejang */
+
+/* 'Lycian': Script */
+static const OnigCodePoint CR_Lycian[] = {
+	1,
+	0x10280, 0x1029c,
+}; /* CR_Lycian */
+
+/* 'Carian': Script */
+static const OnigCodePoint CR_Carian[] = {
+	1,
+	0x102a0, 0x102d0,
+}; /* CR_Carian */
+
+/* 'Lydian': Script */
+static const OnigCodePoint CR_Lydian[] = {
+	2,
+	0x10920, 0x10939,
+	0x1093f, 0x1093f,
+}; /* CR_Lydian */
+
+/* 'Cham': Script */
+static const OnigCodePoint CR_Cham[] = {
+	4,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaa5f,
+}; /* CR_Cham */
+
+/* 'Tai_Tham': Script */
+static const OnigCodePoint CR_Tai_Tham[] = {
+	5,
+	0x1a20, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa0, 0x1aad,
+}; /* CR_Tai_Tham */
+
+/* 'Tai_Viet': Script */
+static const OnigCodePoint CR_Tai_Viet[] = {
+	2,
+	0xaa80, 0xaac2,
+	0xaadb, 0xaadf,
+}; /* CR_Tai_Viet */
+
+/* 'Avestan': Script */
+static const OnigCodePoint CR_Avestan[] = {
+	2,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b3f,
+}; /* CR_Avestan */
+
+/* 'Egyptian_Hieroglyphs': Script */
+static const OnigCodePoint CR_Egyptian_Hieroglyphs[] = {
+	2,
+	0x13000, 0x1342e,
+	0x13430, 0x13438,
+}; /* CR_Egyptian_Hieroglyphs */
+
+/* 'Samaritan': Script */
+static const OnigCodePoint CR_Samaritan[] = {
+	2,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+}; /* CR_Samaritan */
+
+/* 'Lisu': Script */
+static const OnigCodePoint CR_Lisu[] = {
+	1,
+	0xa4d0, 0xa4ff,
+}; /* CR_Lisu */
+
+/* 'Bamum': Script */
+static const OnigCodePoint CR_Bamum[] = {
+	2,
+	0xa6a0, 0xa6f7,
+	0x16800, 0x16a38,
+}; /* CR_Bamum */
+
+/* 'Javanese': Script */
+static const OnigCodePoint CR_Javanese[] = {
+	3,
+	0xa980, 0xa9cd,
+	0xa9d0, 0xa9d9,
+	0xa9de, 0xa9df,
+}; /* CR_Javanese */
+
+/* 'Meetei_Mayek': Script */
+static const OnigCodePoint CR_Meetei_Mayek[] = {
+	3,
+	0xaae0, 0xaaf6,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
+}; /* CR_Meetei_Mayek */
+
+/* 'Imperial_Aramaic': Script */
+static const OnigCodePoint CR_Imperial_Aramaic[] = {
+	2,
+	0x10840, 0x10855,
+	0x10857, 0x1085f,
+}; /* CR_Imperial_Aramaic */
+
+/* 'Old_South_Arabian': Script */
+static const OnigCodePoint CR_Old_South_Arabian[] = {
+	1,
+	0x10a60, 0x10a7f,
+}; /* CR_Old_South_Arabian */
+
+/* 'Inscriptional_Parthian': Script */
+static const OnigCodePoint CR_Inscriptional_Parthian[] = {
+	2,
+	0x10b40, 0x10b55,
+	0x10b58, 0x10b5f,
+}; /* CR_Inscriptional_Parthian */
+
+/* 'Inscriptional_Pahlavi': Script */
+static const OnigCodePoint CR_Inscriptional_Pahlavi[] = {
+	2,
+	0x10b60, 0x10b72,
+	0x10b78, 0x10b7f,
+}; /* CR_Inscriptional_Pahlavi */
+
+/* 'Old_Turkic': Script */
+static const OnigCodePoint CR_Old_Turkic[] = {
+	1,
+	0x10c00, 0x10c48,
+}; /* CR_Old_Turkic */
+
+/* 'Kaithi': Script */
+static const OnigCodePoint CR_Kaithi[] = {
+	2,
+	0x11080, 0x110c1,
+	0x110cd, 0x110cd,
+}; /* CR_Kaithi */
+
+/* 'Batak': Script */
+static const OnigCodePoint CR_Batak[] = {
+	2,
+	0x1bc0, 0x1bf3,
+	0x1bfc, 0x1bff,
+}; /* CR_Batak */
+
+/* 'Brahmi': Script */
+static const OnigCodePoint CR_Brahmi[] = {
+	3,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x1107f, 0x1107f,
+}; /* CR_Brahmi */
+
+/* 'Mandaic': Script */
+static const OnigCodePoint CR_Mandaic[] = {
+	2,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+}; /* CR_Mandaic */
+
+/* 'Chakma': Script */
+static const OnigCodePoint CR_Chakma[] = {
+	2,
+	0x11100, 0x11134,
+	0x11136, 0x11146,
+}; /* CR_Chakma */
+
+/* 'Meroitic_Cursive': Script */
+static const OnigCodePoint CR_Meroitic_Cursive[] = {
+	3,
+	0x109a0, 0x109b7,
+	0x109bc, 0x109cf,
+	0x109d2, 0x109ff,
+}; /* CR_Meroitic_Cursive */
+
+/* 'Meroitic_Hieroglyphs': Script */
+static const OnigCodePoint CR_Meroitic_Hieroglyphs[] = {
+	1,
+	0x10980, 0x1099f,
+}; /* CR_Meroitic_Hieroglyphs */
+
+/* 'Miao': Script */
+static const OnigCodePoint CR_Miao[] = {
+	3,
+	0x16f00, 0x16f4a,
+	0x16f4f, 0x16f87,
+	0x16f8f, 0x16f9f,
+}; /* CR_Miao */
+
+/* 'Sharada': Script */
+static const OnigCodePoint CR_Sharada[] = {
+	2,
+	0x11180, 0x111cd,
+	0x111d0, 0x111df,
+}; /* CR_Sharada */
+
+/* 'Sora_Sompeng': Script */
+static const OnigCodePoint CR_Sora_Sompeng[] = {
+	2,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+}; /* CR_Sora_Sompeng */
+
+/* 'Takri': Script */
+static const OnigCodePoint CR_Takri[] = {
+	2,
+	0x11680, 0x116b8,
+	0x116c0, 0x116c9,
+}; /* CR_Takri */
+
+/* 'Caucasian_Albanian': Script */
+static const OnigCodePoint CR_Caucasian_Albanian[] = {
+	2,
+	0x10530, 0x10563,
+	0x1056f, 0x1056f,
+}; /* CR_Caucasian_Albanian */
+
+/* 'Bassa_Vah': Script */
+static const OnigCodePoint CR_Bassa_Vah[] = {
+	2,
+	0x16ad0, 0x16aed,
+	0x16af0, 0x16af5,
+}; /* CR_Bassa_Vah */
+
+/* 'Duployan': Script */
+static const OnigCodePoint CR_Duployan[] = {
+	5,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	0x1bc9c, 0x1bc9f,
+}; /* CR_Duployan */
+
+/* 'Elbasan': Script */
+static const OnigCodePoint CR_Elbasan[] = {
+	1,
+	0x10500, 0x10527,
+}; /* CR_Elbasan */
+
+/* 'Grantha': Script */
+static const OnigCodePoint CR_Grantha[] = {
+	15,
+	0x11300, 0x11303,
+	0x11305, 0x1130c,
+	0x1130f, 0x11310,
+	0x11313, 0x11328,
+	0x1132a, 0x11330,
+	0x11332, 0x11333,
+	0x11335, 0x11339,
+	0x1133c, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11350, 0x11350,
+	0x11357, 0x11357,
+	0x1135d, 0x11363,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+}; /* CR_Grantha */
+
+/* 'Pahawh_Hmong': Script */
+static const OnigCodePoint CR_Pahawh_Hmong[] = {
+	5,
+	0x16b00, 0x16b45,
+	0x16b50, 0x16b59,
+	0x16b5b, 0x16b61,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+}; /* CR_Pahawh_Hmong */
+
+/* 'Khojki': Script */
+static const OnigCodePoint CR_Khojki[] = {
+	2,
+	0x11200, 0x11211,
+	0x11213, 0x1123e,
+}; /* CR_Khojki */
+
+/* 'Linear_A': Script */
+static const OnigCodePoint CR_Linear_A[] = {
+	3,
+	0x10600, 0x10736,
+	0x10740, 0x10755,
+	0x10760, 0x10767,
+}; /* CR_Linear_A */
+
+/* 'Mahajani': Script */
+static const OnigCodePoint CR_Mahajani[] = {
+	1,
+	0x11150, 0x11176,
+}; /* CR_Mahajani */
+
+/* 'Manichaean': Script */
+static const OnigCodePoint CR_Manichaean[] = {
+	2,
+	0x10ac0, 0x10ae6,
+	0x10aeb, 0x10af6,
+}; /* CR_Manichaean */
+
+/* 'Mende_Kikakui': Script */
+static const OnigCodePoint CR_Mende_Kikakui[] = {
+	2,
+	0x1e800, 0x1e8c4,
+	0x1e8c7, 0x1e8d6,
+}; /* CR_Mende_Kikakui */
+
+/* 'Modi': Script */
+static const OnigCodePoint CR_Modi[] = {
+	2,
+	0x11600, 0x11644,
+	0x11650, 0x11659,
+}; /* CR_Modi */
+
+/* 'Mro': Script */
+static const OnigCodePoint CR_Mro[] = {
+	3,
+	0x16a40, 0x16a5e,
+	0x16a60, 0x16a69,
+	0x16a6e, 0x16a6f,
+}; /* CR_Mro */
+
+/* 'Old_North_Arabian': Script */
+static const OnigCodePoint CR_Old_North_Arabian[] = {
+	1,
+	0x10a80, 0x10a9f,
+}; /* CR_Old_North_Arabian */
+
+/* 'Nabataean': Script */
+static const OnigCodePoint CR_Nabataean[] = {
+	2,
+	0x10880, 0x1089e,
+	0x108a7, 0x108af,
+}; /* CR_Nabataean */
+
+/* 'Palmyrene': Script */
+static const OnigCodePoint CR_Palmyrene[] = {
+	1,
+	0x10860, 0x1087f,
+}; /* CR_Palmyrene */
+
+/* 'Pau_Cin_Hau': Script */
+static const OnigCodePoint CR_Pau_Cin_Hau[] = {
+	1,
+	0x11ac0, 0x11af8,
+}; /* CR_Pau_Cin_Hau */
+
+/* 'Old_Permic': Script */
+static const OnigCodePoint CR_Old_Permic[] = {
+	1,
+	0x10350, 0x1037a,
+}; /* CR_Old_Permic */
+
+/* 'Psalter_Pahlavi': Script */
+static const OnigCodePoint CR_Psalter_Pahlavi[] = {
+	3,
+	0x10b80, 0x10b91,
+	0x10b99, 0x10b9c,
+	0x10ba9, 0x10baf,
+}; /* CR_Psalter_Pahlavi */
+
+/* 'Siddham': Script */
+static const OnigCodePoint CR_Siddham[] = {
+	2,
+	0x11580, 0x115b5,
+	0x115b8, 0x115dd,
+}; /* CR_Siddham */
+
+/* 'Khudawadi': Script */
+static const OnigCodePoint CR_Khudawadi[] = {
+	2,
+	0x112b0, 0x112ea,
+	0x112f0, 0x112f9,
+}; /* CR_Khudawadi */
+
+/* 'Tirhuta': Script */
+static const OnigCodePoint CR_Tirhuta[] = {
+	2,
+	0x11480, 0x114c7,
+	0x114d0, 0x114d9,
+}; /* CR_Tirhuta */
+
+/* 'Warang_Citi': Script */
+static const OnigCodePoint CR_Warang_Citi[] = {
+	2,
+	0x118a0, 0x118f2,
+	0x118ff, 0x118ff,
+}; /* CR_Warang_Citi */
+
+/* 'Ahom': Script */
+static const OnigCodePoint CR_Ahom[] = {
+	3,
+	0x11700, 0x1171a,
+	0x1171d, 0x1172b,
+	0x11730, 0x1173f,
+}; /* CR_Ahom */
+
+/* 'Anatolian_Hieroglyphs': Script */
+static const OnigCodePoint CR_Anatolian_Hieroglyphs[] = {
+	1,
+	0x14400, 0x14646,
+}; /* CR_Anatolian_Hieroglyphs */
+
+/* 'Hatran': Script */
+static const OnigCodePoint CR_Hatran[] = {
+	3,
+	0x108e0, 0x108f2,
+	0x108f4, 0x108f5,
+	0x108fb, 0x108ff,
+}; /* CR_Hatran */
+
+/* 'Multani': Script */
+static const OnigCodePoint CR_Multani[] = {
+	5,
+	0x11280, 0x11286,
+	0x11288, 0x11288,
+	0x1128a, 0x1128d,
+	0x1128f, 0x1129d,
+	0x1129f, 0x112a9,
+}; /* CR_Multani */
+
+/* 'Old_Hungarian': Script */
+static const OnigCodePoint CR_Old_Hungarian[] = {
+	3,
+	0x10c80, 0x10cb2,
+	0x10cc0, 0x10cf2,
+	0x10cfa, 0x10cff,
+}; /* CR_Old_Hungarian */
+
+/* 'SignWriting': Script */
+static const OnigCodePoint CR_SignWriting[] = {
+	3,
+	0x1d800, 0x1da8b,
+	0x1da9b, 0x1da9f,
+	0x1daa1, 0x1daaf,
+}; /* CR_SignWriting */
+
+/* 'Adlam': Script */
+static const OnigCodePoint CR_Adlam[] = {
+	3,
+	0x1e900, 0x1e94b,
+	0x1e950, 0x1e959,
+	0x1e95e, 0x1e95f,
+}; /* CR_Adlam */
+
+/* 'Bhaiksuki': Script */
+static const OnigCodePoint CR_Bhaiksuki[] = {
+	4,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c36,
+	0x11c38, 0x11c45,
+	0x11c50, 0x11c6c,
+}; /* CR_Bhaiksuki */
+
+/* 'Marchen': Script */
+static const OnigCodePoint CR_Marchen[] = {
+	3,
+	0x11c70, 0x11c8f,
+	0x11c92, 0x11ca7,
+	0x11ca9, 0x11cb6,
+}; /* CR_Marchen */
+
+/* 'Newa': Script */
+static const OnigCodePoint CR_Newa[] = {
+	3,
+	0x11400, 0x11459,
+	0x1145b, 0x1145b,
+	0x1145d, 0x1145f,
+}; /* CR_Newa */
+
+/* 'Osage': Script */
+static const OnigCodePoint CR_Osage[] = {
+	2,
+	0x104b0, 0x104d3,
+	0x104d8, 0x104fb,
+}; /* CR_Osage */
+
+/* 'Tangut': Script */
+static const OnigCodePoint CR_Tangut[] = {
+	3,
+	0x16fe0, 0x16fe0,
+	0x17000, 0x187f7,
+	0x18800, 0x18af2,
+}; /* CR_Tangut */
+
+/* 'Masaram_Gondi': Script */
+static const OnigCodePoint CR_Masaram_Gondi[] = {
+	7,
+	0x11d00, 0x11d06,
+	0x11d08, 0x11d09,
+	0x11d0b, 0x11d36,
+	0x11d3a, 0x11d3a,
+	0x11d3c, 0x11d3d,
+	0x11d3f, 0x11d47,
+	0x11d50, 0x11d59,
+}; /* CR_Masaram_Gondi */
+
+/* 'Nushu': Script */
+static const OnigCodePoint CR_Nushu[] = {
+	2,
+	0x16fe1, 0x16fe1,
+	0x1b170, 0x1b2fb,
+}; /* CR_Nushu */
+
+/* 'Soyombo': Script */
+static const OnigCodePoint CR_Soyombo[] = {
+	1,
+	0x11a50, 0x11aa2,
+}; /* CR_Soyombo */
+
+/* 'Zanabazar_Square': Script */
+static const OnigCodePoint CR_Zanabazar_Square[] = {
+	1,
+	0x11a00, 0x11a47,
+}; /* CR_Zanabazar_Square */
+
+/* 'Dogra': Script */
+static const OnigCodePoint CR_Dogra[] = {
+	1,
+	0x11800, 0x1183b,
+}; /* CR_Dogra */
+
+/* 'Gunjala_Gondi': Script */
+static const OnigCodePoint CR_Gunjala_Gondi[] = {
+	6,
+	0x11d60, 0x11d65,
+	0x11d67, 0x11d68,
+	0x11d6a, 0x11d8e,
+	0x11d90, 0x11d91,
+	0x11d93, 0x11d98,
+	0x11da0, 0x11da9,
+}; /* CR_Gunjala_Gondi */
+
+/* 'Makasar': Script */
+static const OnigCodePoint CR_Makasar[] = {
+	1,
+	0x11ee0, 0x11ef8,
+}; /* CR_Makasar */
+
+/* 'Medefaidrin': Script */
+static const OnigCodePoint CR_Medefaidrin[] = {
+	1,
+	0x16e40, 0x16e9a,
+}; /* CR_Medefaidrin */
+
+/* 'Hanifi_Rohingya': Script */
+static const OnigCodePoint CR_Hanifi_Rohingya[] = {
+	2,
+	0x10d00, 0x10d27,
+	0x10d30, 0x10d39,
+}; /* CR_Hanifi_Rohingya */
+
+/* 'Sogdian': Script */
+static const OnigCodePoint CR_Sogdian[] = {
+	1,
+	0x10f30, 0x10f59,
+}; /* CR_Sogdian */
+
+/* 'Old_Sogdian': Script */
+static const OnigCodePoint CR_Old_Sogdian[] = {
+	1,
+	0x10f00, 0x10f27,
+}; /* CR_Old_Sogdian */
+
+/* 'Elymaic': Script */
+static const OnigCodePoint CR_Elymaic[] = {
+	1,
+	0x10fe0, 0x10ff6,
+}; /* CR_Elymaic */
+
+/* 'Nandinagari': Script */
+static const OnigCodePoint CR_Nandinagari[] = {
+	3,
+	0x119a0, 0x119a7,
+	0x119aa, 0x119d7,
+	0x119da, 0x119e4,
+}; /* CR_Nandinagari */
+
+/* 'Nyiakeng_Puachue_Hmong': Script */
+static const OnigCodePoint CR_Nyiakeng_Puachue_Hmong[] = {
+	4,
+	0x1e100, 0x1e12c,
+	0x1e130, 0x1e13d,
+	0x1e140, 0x1e149,
+	0x1e14e, 0x1e14f,
+}; /* CR_Nyiakeng_Puachue_Hmong */
+
+/* 'Wancho': Script */
+static const OnigCodePoint CR_Wancho[] = {
+	2,
+	0x1e2c0, 0x1e2f9,
+	0x1e2ff, 0x1e2ff,
+}; /* CR_Wancho */
+
+/* 'White_Space': Binary Property */
+#define CR_White_Space CR_Space
+
+/* 'Bidi_Control': Binary Property */
+static const OnigCodePoint CR_Bidi_Control[] = {
+	4,
+	0x061c, 0x061c,
+	0x200e, 0x200f,
+	0x202a, 0x202e,
+	0x2066, 0x2069,
+}; /* CR_Bidi_Control */
+
+/* 'Join_Control': Binary Property */
+static const OnigCodePoint CR_Join_Control[] = {
+	1,
+	0x200c, 0x200d,
+}; /* CR_Join_Control */
+
+/* 'Dash': Binary Property */
+static const OnigCodePoint CR_Dash[] = {
+	21,
+	0x002d, 0x002d,
+	0x058a, 0x058a,
+	0x05be, 0x05be,
+	0x1400, 0x1400,
+	0x1806, 0x1806,
+	0x2010, 0x2015,
+	0x2053, 0x2053,
+	0x207b, 0x207b,
+	0x208b, 0x208b,
+	0x2212, 0x2212,
+	0x2e17, 0x2e17,
+	0x2e1a, 0x2e1a,
+	0x2e3a, 0x2e3b,
+	0x2e40, 0x2e40,
+	0x301c, 0x301c,
+	0x3030, 0x3030,
+	0x30a0, 0x30a0,
+	0xfe31, 0xfe32,
+	0xfe58, 0xfe58,
+	0xfe63, 0xfe63,
+	0xff0d, 0xff0d,
+}; /* CR_Dash */
+
+/* 'Hyphen': Binary Property */
+static const OnigCodePoint CR_Hyphen[] = {
+	10,
+	0x002d, 0x002d,
+	0x00ad, 0x00ad,
+	0x058a, 0x058a,
+	0x1806, 0x1806,
+	0x2010, 0x2011,
+	0x2e17, 0x2e17,
+	0x30fb, 0x30fb,
+	0xfe63, 0xfe63,
+	0xff0d, 0xff0d,
+	0xff65, 0xff65,
+}; /* CR_Hyphen */
+
+/* 'Quotation_Mark': Binary Property */
+static const OnigCodePoint CR_Quotation_Mark[] = {
+	13,
+	0x0022, 0x0022,
+	0x0027, 0x0027,
+	0x00ab, 0x00ab,
+	0x00bb, 0x00bb,
+	0x2018, 0x201f,
+	0x2039, 0x203a,
+	0x2e42, 0x2e42,
+	0x300c, 0x300f,
+	0x301d, 0x301f,
+	0xfe41, 0xfe44,
+	0xff02, 0xff02,
+	0xff07, 0xff07,
+	0xff62, 0xff63,
+}; /* CR_Quotation_Mark */
+
+/* 'Terminal_Punctuation': Binary Property */
+static const OnigCodePoint CR_Terminal_Punctuation[] = {
+	102,
+	0x0021, 0x0021,
+	0x002c, 0x002c,
+	0x002e, 0x002e,
+	0x003a, 0x003b,
+	0x003f, 0x003f,
+	0x037e, 0x037e,
+	0x0387, 0x0387,
+	0x0589, 0x0589,
+	0x05c3, 0x05c3,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061e, 0x061f,
+	0x06d4, 0x06d4,
+	0x0700, 0x070a,
+	0x070c, 0x070c,
+	0x07f8, 0x07f9,
+	0x0830, 0x083e,
+	0x085e, 0x085e,
+	0x0964, 0x0965,
+	0x0e5a, 0x0e5b,
+	0x0f08, 0x0f08,
+	0x0f0d, 0x0f12,
+	0x104a, 0x104b,
+	0x1361, 0x1368,
+	0x166e, 0x166e,
+	0x16eb, 0x16ed,
+	0x1735, 0x1736,
+	0x17d4, 0x17d6,
+	0x17da, 0x17da,
+	0x1802, 0x1805,
+	0x1808, 0x1809,
+	0x1944, 0x1945,
+	0x1aa8, 0x1aab,
+	0x1b5a, 0x1b5b,
+	0x1b5d, 0x1b5f,
+	0x1c3b, 0x1c3f,
+	0x1c7e, 0x1c7f,
+	0x203c, 0x203d,
+	0x2047, 0x2049,
+	0x2e2e, 0x2e2e,
+	0x2e3c, 0x2e3c,
+	0x2e41, 0x2e41,
+	0x2e4c, 0x2e4c,
+	0x2e4e, 0x2e4f,
+	0x3001, 0x3002,
+	0xa4fe, 0xa4ff,
+	0xa60d, 0xa60f,
+	0xa6f3, 0xa6f7,
+	0xa876, 0xa877,
+	0xa8ce, 0xa8cf,
+	0xa92f, 0xa92f,
+	0xa9c7, 0xa9c9,
+	0xaa5d, 0xaa5f,
+	0xaadf, 0xaadf,
+	0xaaf0, 0xaaf1,
+	0xabeb, 0xabeb,
+	0xfe50, 0xfe52,
+	0xfe54, 0xfe57,
+	0xff01, 0xff01,
+	0xff0c, 0xff0c,
+	0xff0e, 0xff0e,
+	0xff1a, 0xff1b,
+	0xff1f, 0xff1f,
+	0xff61, 0xff61,
+	0xff64, 0xff64,
+	0x1039f, 0x1039f,
+	0x103d0, 0x103d0,
+	0x10857, 0x10857,
+	0x1091f, 0x1091f,
+	0x10a56, 0x10a57,
+	0x10af0, 0x10af5,
+	0x10b3a, 0x10b3f,
+	0x10b99, 0x10b9c,
+	0x10f55, 0x10f59,
+	0x11047, 0x1104d,
+	0x110be, 0x110c1,
+	0x11141, 0x11143,
+	0x111c5, 0x111c6,
+	0x111cd, 0x111cd,
+	0x111de, 0x111df,
+	0x11238, 0x1123c,
+	0x112a9, 0x112a9,
+	0x1144b, 0x1144d,
+	0x1145b, 0x1145b,
+	0x115c2, 0x115c5,
+	0x115c9, 0x115d7,
+	0x11641, 0x11642,
+	0x1173c, 0x1173e,
+	0x11a42, 0x11a43,
+	0x11a9b, 0x11a9c,
+	0x11aa1, 0x11aa2,
+	0x11c41, 0x11c43,
+	0x11c71, 0x11c71,
+	0x11ef7, 0x11ef8,
+	0x12470, 0x12474,
+	0x16a6e, 0x16a6f,
+	0x16af5, 0x16af5,
+	0x16b37, 0x16b39,
+	0x16b44, 0x16b44,
+	0x16e97, 0x16e98,
+	0x1bc9f, 0x1bc9f,
+	0x1da87, 0x1da8a,
+}; /* CR_Terminal_Punctuation */
+
+/* 'Other_Math': Binary Property */
+static const OnigCodePoint CR_Other_Math[] = {
+	134,
+	0x005e, 0x005e,
+	0x03d0, 0x03d2,
+	0x03d5, 0x03d5,
+	0x03f0, 0x03f1,
+	0x03f4, 0x03f5,
+	0x2016, 0x2016,
+	0x2032, 0x2034,
+	0x2040, 0x2040,
+	0x2061, 0x2064,
+	0x207d, 0x207e,
+	0x208d, 0x208e,
+	0x20d0, 0x20dc,
+	0x20e1, 0x20e1,
+	0x20e5, 0x20e6,
+	0x20eb, 0x20ef,
+	0x2102, 0x2102,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2119, 0x211d,
+	0x2124, 0x2124,
+	0x2128, 0x2129,
+	0x212c, 0x212d,
+	0x212f, 0x2131,
+	0x2133, 0x2138,
+	0x213c, 0x213f,
+	0x2145, 0x2149,
+	0x2195, 0x2199,
+	0x219c, 0x219f,
+	0x21a1, 0x21a2,
+	0x21a4, 0x21a5,
+	0x21a7, 0x21a7,
+	0x21a9, 0x21ad,
+	0x21b0, 0x21b1,
+	0x21b6, 0x21b7,
+	0x21bc, 0x21cd,
+	0x21d0, 0x21d1,
+	0x21d3, 0x21d3,
+	0x21d5, 0x21db,
+	0x21dd, 0x21dd,
+	0x21e4, 0x21e5,
+	0x2308, 0x230b,
+	0x23b4, 0x23b5,
+	0x23b7, 0x23b7,
+	0x23d0, 0x23d0,
+	0x23e2, 0x23e2,
+	0x25a0, 0x25a1,
+	0x25ae, 0x25b6,
+	0x25bc, 0x25c0,
+	0x25c6, 0x25c7,
+	0x25ca, 0x25cb,
+	0x25cf, 0x25d3,
+	0x25e2, 0x25e2,
+	0x25e4, 0x25e4,
+	0x25e7, 0x25ec,
+	0x2605, 0x2606,
+	0x2640, 0x2640,
+	0x2642, 0x2642,
+	0x2660, 0x2663,
+	0x266d, 0x266e,
+	0x27c5, 0x27c6,
+	0x27e6, 0x27ef,
+	0x2983, 0x2998,
+	0x29d8, 0x29db,
+	0x29fc, 0x29fd,
+	0xfe61, 0xfe61,
+	0xfe63, 0xfe63,
+	0xfe68, 0xfe68,
+	0xff3c, 0xff3c,
+	0xff3e, 0xff3e,
+	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, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+}; /* CR_Other_Math */
+
+/* 'Hex_Digit': Binary Property */
+static const OnigCodePoint CR_Hex_Digit[] = {
+	6,
+	0x0030, 0x0039,
+	0x0041, 0x0046,
+	0x0061, 0x0066,
+	0xff10, 0xff19,
+	0xff21, 0xff26,
+	0xff41, 0xff46,
+}; /* CR_Hex_Digit */
+
+/* 'ASCII_Hex_Digit': Binary Property */
+#define CR_ASCII_Hex_Digit CR_XDigit
+
+/* 'Other_Alphabetic': Binary Property */
+static const OnigCodePoint CR_Other_Alphabetic[] = {
+	221,
+	0x0345, 0x0345,
+	0x05b0, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x0610, 0x061a,
+	0x064b, 0x0657,
+	0x0659, 0x065f,
+	0x0670, 0x0670,
+	0x06d6, 0x06dc,
+	0x06e1, 0x06e4,
+	0x06e7, 0x06e8,
+	0x06ed, 0x06ed,
+	0x0711, 0x0711,
+	0x0730, 0x073f,
+	0x07a6, 0x07b0,
+	0x0816, 0x0817,
+	0x081b, 0x0823,
+	0x0825, 0x0827,
+	0x0829, 0x082c,
+	0x08d4, 0x08df,
+	0x08e3, 0x08e9,
+	0x08f0, 0x0903,
+	0x093a, 0x093b,
+	0x093e, 0x094c,
+	0x094e, 0x094f,
+	0x0955, 0x0957,
+	0x0962, 0x0963,
+	0x0981, 0x0983,
+	0x09be, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cc,
+	0x09d7, 0x09d7,
+	0x09e2, 0x09e3,
+	0x0a01, 0x0a03,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4c,
+	0x0a51, 0x0a51,
+	0x0a70, 0x0a71,
+	0x0a75, 0x0a75,
+	0x0a81, 0x0a83,
+	0x0abe, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acc,
+	0x0ae2, 0x0ae3,
+	0x0afa, 0x0afc,
+	0x0b01, 0x0b03,
+	0x0b3e, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4c,
+	0x0b56, 0x0b57,
+	0x0b62, 0x0b63,
+	0x0b82, 0x0b82,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcc,
+	0x0bd7, 0x0bd7,
+	0x0c00, 0x0c03,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4c,
+	0x0c55, 0x0c56,
+	0x0c62, 0x0c63,
+	0x0c81, 0x0c83,
+	0x0cbe, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccc,
+	0x0cd5, 0x0cd6,
+	0x0ce2, 0x0ce3,
+	0x0d00, 0x0d03,
+	0x0d3e, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4c,
+	0x0d57, 0x0d57,
+	0x0d62, 0x0d63,
+	0x0d82, 0x0d83,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0df2, 0x0df3,
+	0x0e31, 0x0e31,
+	0x0e34, 0x0e3a,
+	0x0e4d, 0x0e4d,
+	0x0eb1, 0x0eb1,
+	0x0eb4, 0x0eb9,
+	0x0ebb, 0x0ebc,
+	0x0ecd, 0x0ecd,
+	0x0f71, 0x0f81,
+	0x0f8d, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x102b, 0x1036,
+	0x1038, 0x1038,
+	0x103b, 0x103e,
+	0x1056, 0x1059,
+	0x105e, 0x1060,
+	0x1062, 0x1064,
+	0x1067, 0x106d,
+	0x1071, 0x1074,
+	0x1082, 0x108d,
+	0x108f, 0x108f,
+	0x109a, 0x109d,
+	0x1712, 0x1713,
+	0x1732, 0x1733,
+	0x1752, 0x1753,
+	0x1772, 0x1773,
+	0x17b6, 0x17c8,
+	0x1885, 0x1886,
+	0x18a9, 0x18a9,
+	0x1920, 0x192b,
+	0x1930, 0x1938,
+	0x1a17, 0x1a1b,
+	0x1a55, 0x1a5e,
+	0x1a61, 0x1a74,
+	0x1b00, 0x1b04,
+	0x1b35, 0x1b43,
+	0x1b80, 0x1b82,
+	0x1ba1, 0x1ba9,
+	0x1bac, 0x1bad,
+	0x1be7, 0x1bf1,
+	0x1c24, 0x1c36,
+	0x1de7, 0x1df4,
+	0x24b6, 0x24e9,
+	0x2de0, 0x2dff,
+	0xa674, 0xa67b,
+	0xa69e, 0xa69f,
+	0xa802, 0xa802,
+	0xa80b, 0xa80b,
+	0xa823, 0xa827,
+	0xa880, 0xa881,
+	0xa8b4, 0xa8c3,
+	0xa8c5, 0xa8c5,
+	0xa8ff, 0xa8ff,
+	0xa926, 0xa92a,
+	0xa947, 0xa952,
+	0xa980, 0xa983,
+	0xa9b4, 0xa9bf,
+	0xa9e5, 0xa9e5,
+	0xaa29, 0xaa36,
+	0xaa43, 0xaa43,
+	0xaa4c, 0xaa4d,
+	0xaa7b, 0xaa7d,
+	0xaab0, 0xaab0,
+	0xaab2, 0xaab4,
+	0xaab7, 0xaab8,
+	0xaabe, 0xaabe,
+	0xaaeb, 0xaaef,
+	0xaaf5, 0xaaf5,
+	0xabe3, 0xabea,
+	0xfb1e, 0xfb1e,
+	0x10376, 0x1037a,
+	0x10a01, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a0f,
+	0x10d24, 0x10d27,
+	0x11000, 0x11002,
+	0x11038, 0x11045,
+	0x11082, 0x11082,
+	0x110b0, 0x110b8,
+	0x11100, 0x11102,
+	0x11127, 0x11132,
+	0x11145, 0x11146,
+	0x11180, 0x11182,
+	0x111b3, 0x111bf,
+	0x1122c, 0x11234,
+	0x11237, 0x11237,
+	0x1123e, 0x1123e,
+	0x112df, 0x112e8,
+	0x11300, 0x11303,
+	0x1133e, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134c,
+	0x11357, 0x11357,
+	0x11362, 0x11363,
+	0x11435, 0x11441,
+	0x11443, 0x11445,
+	0x114b0, 0x114c1,
+	0x115af, 0x115b5,
+	0x115b8, 0x115be,
+	0x115dc, 0x115dd,
+	0x11630, 0x1163e,
+	0x11640, 0x11640,
+	0x116ab, 0x116b5,
+	0x1171d, 0x1172a,
+	0x1182c, 0x11838,
+	0x119d1, 0x119d7,
+	0x119da, 0x119df,
+	0x119e4, 0x119e4,
+	0x11a01, 0x11a0a,
+	0x11a35, 0x11a39,
+	0x11a3b, 0x11a3e,
+	0x11a51, 0x11a5b,
+	0x11a8a, 0x11a97,
+	0x11c2f, 0x11c36,
+	0x11c38, 0x11c3e,
+	0x11c92, 0x11ca7,
+	0x11ca9, 0x11cb6,
+	0x11d31, 0x11d36,
+	0x11d3a, 0x11d3a,
+	0x11d3c, 0x11d3d,
+	0x11d3f, 0x11d41,
+	0x11d43, 0x11d43,
+	0x11d47, 0x11d47,
+	0x11d8a, 0x11d8e,
+	0x11d90, 0x11d91,
+	0x11d93, 0x11d96,
+	0x11ef3, 0x11ef6,
+	0x16f4f, 0x16f4f,
+	0x16f51, 0x16f87,
+	0x16f8f, 0x16f92,
+	0x1bc9e, 0x1bc9e,
+	0x1e000, 0x1e006,
+	0x1e008, 0x1e018,
+	0x1e01b, 0x1e021,
+	0x1e023, 0x1e024,
+	0x1e026, 0x1e02a,
+	0x1e947, 0x1e947,
+	0x1f130, 0x1f149,
+	0x1f150, 0x1f169,
+	0x1f170, 0x1f189,
+}; /* CR_Other_Alphabetic */
+
+/* 'Ideographic': Binary Property */
+static const OnigCodePoint CR_Ideographic[] = {
+	16,
+	0x3006, 0x3007,
+	0x3021, 0x3029,
+	0x3038, 0x303a,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fef,
+	0xf900, 0xfa6d,
+	0xfa70, 0xfad9,
+	0x17000, 0x187f7,
+	0x18800, 0x18af2,
+	0x1b170, 0x1b2fb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2b820, 0x2cea1,
+	0x2ceb0, 0x2ebe0,
+	0x2f800, 0x2fa1d,
+}; /* CR_Ideographic */
+
+/* 'Diacritic': Binary Property */
+static const OnigCodePoint CR_Diacritic[] = {
+	171,
+	0x005e, 0x005e,
+	0x0060, 0x0060,
+	0x00a8, 0x00a8,
+	0x00af, 0x00af,
+	0x00b4, 0x00b4,
+	0x00b7, 0x00b8,
+	0x02b0, 0x034e,
+	0x0350, 0x0357,
+	0x035d, 0x0362,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x0384, 0x0385,
+	0x0483, 0x0487,
+	0x0559, 0x0559,
+	0x0591, 0x05a1,
+	0x05a3, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c4,
+	0x064b, 0x0652,
+	0x0657, 0x0658,
+	0x06df, 0x06e0,
+	0x06e5, 0x06e6,
+	0x06ea, 0x06ec,
+	0x0730, 0x074a,
+	0x07a6, 0x07b0,
+	0x07eb, 0x07f5,
+	0x0818, 0x0819,
+	0x08e3, 0x08fe,
+	0x093c, 0x093c,
+	0x094d, 0x094d,
+	0x0951, 0x0954,
+	0x0971, 0x0971,
+	0x09bc, 0x09bc,
+	0x09cd, 0x09cd,
+	0x0a3c, 0x0a3c,
+	0x0a4d, 0x0a4d,
+	0x0abc, 0x0abc,
+	0x0acd, 0x0acd,
+	0x0afd, 0x0aff,
+	0x0b3c, 0x0b3c,
+	0x0b4d, 0x0b4d,
+	0x0bcd, 0x0bcd,
+	0x0c4d, 0x0c4d,
+	0x0cbc, 0x0cbc,
+	0x0ccd, 0x0ccd,
+	0x0d3b, 0x0d3c,
+	0x0d4d, 0x0d4d,
+	0x0dca, 0x0dca,
+	0x0e47, 0x0e4c,
+	0x0e4e, 0x0e4e,
+	0x0eba, 0x0eba,
+	0x0ec8, 0x0ecc,
+	0x0f18, 0x0f19,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f3e, 0x0f3f,
+	0x0f82, 0x0f84,
+	0x0f86, 0x0f87,
+	0x0fc6, 0x0fc6,
+	0x1037, 0x1037,
+	0x1039, 0x103a,
+	0x1063, 0x1064,
+	0x1069, 0x106d,
+	0x1087, 0x108d,
+	0x108f, 0x108f,
+	0x109a, 0x109b,
+	0x135d, 0x135f,
+	0x17c9, 0x17d3,
+	0x17dd, 0x17dd,
+	0x1939, 0x193b,
+	0x1a75, 0x1a7c,
+	0x1a7f, 0x1a7f,
+	0x1ab0, 0x1abd,
+	0x1b34, 0x1b34,
+	0x1b44, 0x1b44,
+	0x1b6b, 0x1b73,
+	0x1baa, 0x1bab,
+	0x1c36, 0x1c37,
+	0x1c78, 0x1c7d,
+	0x1cd0, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1cf4, 0x1cf4,
+	0x1cf7, 0x1cf9,
+	0x1d2c, 0x1d6a,
+	0x1dc4, 0x1dcf,
+	0x1df5, 0x1df9,
+	0x1dfd, 0x1dff,
+	0x1fbd, 0x1fbd,
+	0x1fbf, 0x1fc1,
+	0x1fcd, 0x1fcf,
+	0x1fdd, 0x1fdf,
+	0x1fed, 0x1fef,
+	0x1ffd, 0x1ffe,
+	0x2cef, 0x2cf1,
+	0x2e2f, 0x2e2f,
+	0x302a, 0x302f,
+	0x3099, 0x309c,
+	0x30fc, 0x30fc,
+	0xa66f, 0xa66f,
+	0xa67c, 0xa67d,
+	0xa67f, 0xa67f,
+	0xa69c, 0xa69d,
+	0xa6f0, 0xa6f1,
+	0xa700, 0xa721,
+	0xa788, 0xa78a,
+	0xa7f8, 0xa7f9,
+	0xa8c4, 0xa8c4,
+	0xa8e0, 0xa8f1,
+	0xa92b, 0xa92e,
+	0xa953, 0xa953,
+	0xa9b3, 0xa9b3,
+	0xa9c0, 0xa9c0,
+	0xa9e5, 0xa9e5,
+	0xaa7b, 0xaa7d,
+	0xaabf, 0xaac2,
+	0xaaf6, 0xaaf6,
+	0xab5b, 0xab5f,
+	0xabec, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfe20, 0xfe2f,
+	0xff3e, 0xff3e,
+	0xff40, 0xff40,
+	0xff70, 0xff70,
+	0xff9e, 0xff9f,
+	0xffe3, 0xffe3,
+	0x102e0, 0x102e0,
+	0x10ae5, 0x10ae6,
+	0x10d22, 0x10d27,
+	0x10f46, 0x10f50,
+	0x110b9, 0x110ba,
+	0x11133, 0x11134,
+	0x11173, 0x11173,
+	0x111c0, 0x111c0,
+	0x111ca, 0x111cc,
+	0x11235, 0x11236,
+	0x112e9, 0x112ea,
+	0x1133c, 0x1133c,
+	0x1134d, 0x1134d,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11442, 0x11442,
+	0x11446, 0x11446,
+	0x114c2, 0x114c3,
+	0x115bf, 0x115c0,
+	0x1163f, 0x1163f,
+	0x116b6, 0x116b7,
+	0x1172b, 0x1172b,
+	0x11839, 0x1183a,
+	0x119e0, 0x119e0,
+	0x11a34, 0x11a34,
+	0x11a47, 0x11a47,
+	0x11a99, 0x11a99,
+	0x11c3f, 0x11c3f,
+	0x11d42, 0x11d42,
+	0x11d44, 0x11d45,
+	0x11d97, 0x11d97,
+	0x16af0, 0x16af4,
+	0x16b30, 0x16b36,
+	0x16f8f, 0x16f9f,
+	0x1d167, 0x1d169,
+	0x1d16d, 0x1d172,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1e130, 0x1e136,
+	0x1e2ec, 0x1e2ef,
+	0x1e8d0, 0x1e8d6,
+	0x1e944, 0x1e946,
+	0x1e948, 0x1e94a,
+}; /* CR_Diacritic */
+
+/* 'Extender': Binary Property */
+static const OnigCodePoint CR_Extender[] = {
+	31,
+	0x00b7, 0x00b7,
+	0x02d0, 0x02d1,
+	0x0640, 0x0640,
+	0x07fa, 0x07fa,
+	0x0e46, 0x0e46,
+	0x0ec6, 0x0ec6,
+	0x180a, 0x180a,
+	0x1843, 0x1843,
+	0x1aa7, 0x1aa7,
+	0x1c36, 0x1c36,
+	0x1c7b, 0x1c7b,
+	0x3005, 0x3005,
+	0x3031, 0x3035,
+	0x309d, 0x309e,
+	0x30fc, 0x30fe,
+	0xa015, 0xa015,
+	0xa60c, 0xa60c,
+	0xa9cf, 0xa9cf,
+	0xa9e6, 0xa9e6,
+	0xaa70, 0xaa70,
+	0xaadd, 0xaadd,
+	0xaaf3, 0xaaf4,
+	0xff70, 0xff70,
+	0x1135d, 0x1135d,
+	0x115c6, 0x115c8,
+	0x11a98, 0x11a98,
+	0x16b42, 0x16b43,
+	0x16fe0, 0x16fe1,
+	0x16fe3, 0x16fe3,
+	0x1e13c, 0x1e13d,
+	0x1e944, 0x1e946,
+}; /* CR_Extender */
+
+/* 'Other_Lowercase': Binary Property */
+static const OnigCodePoint CR_Other_Lowercase[] = {
+	20,
+	0x00aa, 0x00aa,
+	0x00ba, 0x00ba,
+	0x02b0, 0x02b8,
+	0x02c0, 0x02c1,
+	0x02e0, 0x02e4,
+	0x0345, 0x0345,
+	0x037a, 0x037a,
+	0x1d2c, 0x1d6a,
+	0x1d78, 0x1d78,
+	0x1d9b, 0x1dbf,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x209c,
+	0x2170, 0x217f,
+	0x24d0, 0x24e9,
+	0x2c7c, 0x2c7d,
+	0xa69c, 0xa69d,
+	0xa770, 0xa770,
+	0xa7f8, 0xa7f9,
+	0xab5c, 0xab5f,
+}; /* CR_Other_Lowercase */
+
+/* 'Other_Uppercase': Binary Property */
+static const OnigCodePoint CR_Other_Uppercase[] = {
+	5,
+	0x2160, 0x216f,
+	0x24b6, 0x24cf,
+	0x1f130, 0x1f149,
+	0x1f150, 0x1f169,
+	0x1f170, 0x1f189,
+}; /* CR_Other_Uppercase */
+
+/* 'Noncharacter_Code_Point': Binary Property */
+static const OnigCodePoint CR_Noncharacter_Code_Point[] = {
+	18,
+	0xfdd0, 0xfdef,
+	0xfffe, 0xffff,
+	0x1fffe, 0x1ffff,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xefffe, 0xeffff,
+	0xffffe, 0xfffff,
+	0x10fffe, 0x10ffff,
+}; /* CR_Noncharacter_Code_Point */
+
+/* 'Other_Grapheme_Extend': Binary Property */
+static const OnigCodePoint CR_Other_Grapheme_Extend[] = {
+	24,
+	0x09be, 0x09be,
+	0x09d7, 0x09d7,
+	0x0b3e, 0x0b3e,
+	0x0b57, 0x0b57,
+	0x0bbe, 0x0bbe,
+	0x0bd7, 0x0bd7,
+	0x0cc2, 0x0cc2,
+	0x0cd5, 0x0cd6,
+	0x0d3e, 0x0d3e,
+	0x0d57, 0x0d57,
+	0x0dcf, 0x0dcf,
+	0x0ddf, 0x0ddf,
+	0x1b35, 0x1b35,
+	0x200c, 0x200c,
+	0x302e, 0x302f,
+	0xff9e, 0xff9f,
+	0x1133e, 0x1133e,
+	0x11357, 0x11357,
+	0x114b0, 0x114b0,
+	0x114bd, 0x114bd,
+	0x115af, 0x115af,
+	0x1d165, 0x1d165,
+	0x1d16e, 0x1d172,
+	0xe0020, 0xe007f,
+}; /* CR_Other_Grapheme_Extend */
+
+/* 'IDS_Binary_Operator': Binary Property */
+static const OnigCodePoint CR_IDS_Binary_Operator[] = {
+	2,
+	0x2ff0, 0x2ff1,
+	0x2ff4, 0x2ffb,
+}; /* CR_IDS_Binary_Operator */
+
+/* 'IDS_Trinary_Operator': Binary Property */
+static const OnigCodePoint CR_IDS_Trinary_Operator[] = {
+	1,
+	0x2ff2, 0x2ff3,
+}; /* CR_IDS_Trinary_Operator */
+
+/* 'Radical': Binary Property */
+static const OnigCodePoint CR_Radical[] = {
+	3,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+}; /* CR_Radical */
+
+/* 'Unified_Ideograph': Binary Property */
+static const OnigCodePoint CR_Unified_Ideograph[] = {
+	14,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fef,
+	0xfa0e, 0xfa0f,
+	0xfa11, 0xfa11,
+	0xfa13, 0xfa14,
+	0xfa1f, 0xfa1f,
+	0xfa21, 0xfa21,
+	0xfa23, 0xfa24,
+	0xfa27, 0xfa29,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2b820, 0x2cea1,
+	0x2ceb0, 0x2ebe0,
+}; /* CR_Unified_Ideograph */
+
+/* 'Other_Default_Ignorable_Code_Point': Binary Property */
+static const OnigCodePoint CR_Other_Default_Ignorable_Code_Point[] = {
+	11,
+	0x034f, 0x034f,
+	0x115f, 0x1160,
+	0x17b4, 0x17b5,
+	0x2065, 0x2065,
+	0x3164, 0x3164,
+	0xffa0, 0xffa0,
+	0xfff0, 0xfff8,
+	0xe0000, 0xe0000,
+	0xe0002, 0xe001f,
+	0xe0080, 0xe00ff,
+	0xe01f0, 0xe0fff,
+}; /* CR_Other_Default_Ignorable_Code_Point */
+
+/* 'Deprecated': Binary Property */
+static const OnigCodePoint CR_Deprecated[] = {
+	8,
+	0x0149, 0x0149,
+	0x0673, 0x0673,
+	0x0f77, 0x0f77,
+	0x0f79, 0x0f79,
+	0x17a3, 0x17a4,
+	0x206a, 0x206f,
+	0x2329, 0x232a,
+	0xe0001, 0xe0001,
+}; /* CR_Deprecated */
+
+/* 'Soft_Dotted': Binary Property */
+static const OnigCodePoint CR_Soft_Dotted[] = {
+	31,
+	0x0069, 0x006a,
+	0x012f, 0x012f,
+	0x0249, 0x0249,
+	0x0268, 0x0268,
+	0x029d, 0x029d,
+	0x02b2, 0x02b2,
+	0x03f3, 0x03f3,
+	0x0456, 0x0456,
+	0x0458, 0x0458,
+	0x1d62, 0x1d62,
+	0x1d96, 0x1d96,
+	0x1da4, 0x1da4,
+	0x1da8, 0x1da8,
+	0x1e2d, 0x1e2d,
+	0x1ecb, 0x1ecb,
+	0x2071, 0x2071,
+	0x2148, 0x2149,
+	0x2c7c, 0x2c7c,
+	0x1d422, 0x1d423,
+	0x1d456, 0x1d457,
+	0x1d48a, 0x1d48b,
+	0x1d4be, 0x1d4bf,
+	0x1d4f2, 0x1d4f3,
+	0x1d526, 0x1d527,
+	0x1d55a, 0x1d55b,
+	0x1d58e, 0x1d58f,
+	0x1d5c2, 0x1d5c3,
+	0x1d5f6, 0x1d5f7,
+	0x1d62a, 0x1d62b,
+	0x1d65e, 0x1d65f,
+	0x1d692, 0x1d693,
+}; /* CR_Soft_Dotted */
+
+/* 'Logical_Order_Exception': Binary Property */
+static const OnigCodePoint CR_Logical_Order_Exception[] = {
+	7,
+	0x0e40, 0x0e44,
+	0x0ec0, 0x0ec4,
+	0x19b5, 0x19b7,
+	0x19ba, 0x19ba,
+	0xaab5, 0xaab6,
+	0xaab9, 0xaab9,
+	0xaabb, 0xaabc,
+}; /* CR_Logical_Order_Exception */
+
+/* 'Other_ID_Start': Binary Property */
+static const OnigCodePoint CR_Other_ID_Start[] = {
+	4,
+	0x1885, 0x1886,
+	0x2118, 0x2118,
+	0x212e, 0x212e,
+	0x309b, 0x309c,
+}; /* CR_Other_ID_Start */
+
+/* 'Other_ID_Continue': Binary Property */
+static const OnigCodePoint CR_Other_ID_Continue[] = {
+	4,
+	0x00b7, 0x00b7,
+	0x0387, 0x0387,
+	0x1369, 0x1371,
+	0x19da, 0x19da,
+}; /* CR_Other_ID_Continue */
+
+/* 'Sentence_Terminal': Binary Property */
+static const OnigCodePoint CR_Sentence_Terminal[] = {
+	74,
+	0x0021, 0x0021,
+	0x002e, 0x002e,
+	0x003f, 0x003f,
+	0x0589, 0x0589,
+	0x061e, 0x061f,
+	0x06d4, 0x06d4,
+	0x0700, 0x0702,
+	0x07f9, 0x07f9,
+	0x0837, 0x0837,
+	0x0839, 0x0839,
+	0x083d, 0x083e,
+	0x0964, 0x0965,
+	0x104a, 0x104b,
+	0x1362, 0x1362,
+	0x1367, 0x1368,
+	0x166e, 0x166e,
+	0x1735, 0x1736,
+	0x1803, 0x1803,
+	0x1809, 0x1809,
+	0x1944, 0x1945,
+	0x1aa8, 0x1aab,
+	0x1b5a, 0x1b5b,
+	0x1b5e, 0x1b5f,
+	0x1c3b, 0x1c3c,
+	0x1c7e, 0x1c7f,
+	0x203c, 0x203d,
+	0x2047, 0x2049,
+	0x2e2e, 0x2e2e,
+	0x2e3c, 0x2e3c,
+	0x3002, 0x3002,
+	0xa4ff, 0xa4ff,
+	0xa60e, 0xa60f,
+	0xa6f3, 0xa6f3,
+	0xa6f7, 0xa6f7,
+	0xa876, 0xa877,
+	0xa8ce, 0xa8cf,
+	0xa92f, 0xa92f,
+	0xa9c8, 0xa9c9,
+	0xaa5d, 0xaa5f,
+	0xaaf0, 0xaaf1,
+	0xabeb, 0xabeb,
+	0xfe52, 0xfe52,
+	0xfe56, 0xfe57,
+	0xff01, 0xff01,
+	0xff0e, 0xff0e,
+	0xff1f, 0xff1f,
+	0xff61, 0xff61,
+	0x10a56, 0x10a57,
+	0x10f55, 0x10f59,
+	0x11047, 0x11048,
+	0x110be, 0x110c1,
+	0x11141, 0x11143,
+	0x111c5, 0x111c6,
+	0x111cd, 0x111cd,
+	0x111de, 0x111df,
+	0x11238, 0x11239,
+	0x1123b, 0x1123c,
+	0x112a9, 0x112a9,
+	0x1144b, 0x1144c,
+	0x115c2, 0x115c3,
+	0x115c9, 0x115d7,
+	0x11641, 0x11642,
+	0x1173c, 0x1173e,
+	0x11a42, 0x11a43,
+	0x11a9b, 0x11a9c,
+	0x11c41, 0x11c42,
+	0x11ef7, 0x11ef8,
+	0x16a6e, 0x16a6f,
+	0x16af5, 0x16af5,
+	0x16b37, 0x16b38,
+	0x16b44, 0x16b44,
+	0x16e98, 0x16e98,
+	0x1bc9f, 0x1bc9f,
+	0x1da88, 0x1da88,
+}; /* CR_Sentence_Terminal */
+
+/* 'Variation_Selector': Binary Property */
+static const OnigCodePoint CR_Variation_Selector[] = {
+	3,
+	0x180b, 0x180d,
+	0xfe00, 0xfe0f,
+	0xe0100, 0xe01ef,
+}; /* CR_Variation_Selector */
+
+/* 'Pattern_White_Space': Binary Property */
+static const OnigCodePoint CR_Pattern_White_Space[] = {
+	5,
+	0x0009, 0x000d,
+	0x0020, 0x0020,
+	0x0085, 0x0085,
+	0x200e, 0x200f,
+	0x2028, 0x2029,
+}; /* CR_Pattern_White_Space */
+
+/* 'Pattern_Syntax': Binary Property */
+static const OnigCodePoint CR_Pattern_Syntax[] = {
+	28,
+	0x0021, 0x002f,
+	0x003a, 0x0040,
+	0x005b, 0x005e,
+	0x0060, 0x0060,
+	0x007b, 0x007e,
+	0x00a1, 0x00a7,
+	0x00a9, 0x00a9,
+	0x00ab, 0x00ac,
+	0x00ae, 0x00ae,
+	0x00b0, 0x00b1,
+	0x00b6, 0x00b6,
+	0x00bb, 0x00bb,
+	0x00bf, 0x00bf,
+	0x00d7, 0x00d7,
+	0x00f7, 0x00f7,
+	0x2010, 0x2027,
+	0x2030, 0x203e,
+	0x2041, 0x2053,
+	0x2055, 0x205e,
+	0x2190, 0x245f,
+	0x2500, 0x2775,
+	0x2794, 0x2bff,
+	0x2e00, 0x2e7f,
+	0x3001, 0x3003,
+	0x3008, 0x3020,
+	0x3030, 0x3030,
+	0xfd3e, 0xfd3f,
+	0xfe45, 0xfe46,
+}; /* CR_Pattern_Syntax */
+
+/* 'Prepended_Concatenation_Mark': Binary Property */
+static const OnigCodePoint CR_Prepended_Concatenation_Mark[] = {
+	6,
+	0x0600, 0x0605,
+	0x06dd, 0x06dd,
+	0x070f, 0x070f,
+	0x08e2, 0x08e2,
+	0x110bd, 0x110bd,
+	0x110cd, 0x110cd,
+}; /* CR_Prepended_Concatenation_Mark */
+
+/* 'Regional_Indicator': Binary Property */
+static const OnigCodePoint CR_Regional_Indicator[] = {
+	1,
+	0x1f1e6, 0x1f1ff,
+}; /* CR_Regional_Indicator */
+
+/* 'Emoji': Emoji */
+static const OnigCodePoint CR_Emoji[] = {
+	151,
+	0x0023, 0x0023,
+	0x002a, 0x002a,
+	0x0030, 0x0039,
+	0x00a9, 0x00a9,
+	0x00ae, 0x00ae,
+	0x203c, 0x203c,
+	0x2049, 0x2049,
+	0x2122, 0x2122,
+	0x2139, 0x2139,
+	0x2194, 0x2199,
+	0x21a9, 0x21aa,
+	0x231a, 0x231b,
+	0x2328, 0x2328,
+	0x23cf, 0x23cf,
+	0x23e9, 0x23f3,
+	0x23f8, 0x23fa,
+	0x24c2, 0x24c2,
+	0x25aa, 0x25ab,
+	0x25b6, 0x25b6,
+	0x25c0, 0x25c0,
+	0x25fb, 0x25fe,
+	0x2600, 0x2604,
+	0x260e, 0x260e,
+	0x2611, 0x2611,
+	0x2614, 0x2615,
+	0x2618, 0x2618,
+	0x261d, 0x261d,
+	0x2620, 0x2620,
+	0x2622, 0x2623,
+	0x2626, 0x2626,
+	0x262a, 0x262a,
+	0x262e, 0x262f,
+	0x2638, 0x263a,
+	0x2640, 0x2640,
+	0x2642, 0x2642,
+	0x2648, 0x2653,
+	0x265f, 0x2660,
+	0x2663, 0x2663,
+	0x2665, 0x2666,
+	0x2668, 0x2668,
+	0x267b, 0x267b,
+	0x267e, 0x267f,
+	0x2692, 0x2697,
+	0x2699, 0x2699,
+	0x269b, 0x269c,
+	0x26a0, 0x26a1,
+	0x26aa, 0x26ab,
+	0x26b0, 0x26b1,
+	0x26bd, 0x26be,
+	0x26c4, 0x26c5,
+	0x26c8, 0x26c8,
+	0x26ce, 0x26cf,
+	0x26d1, 0x26d1,
+	0x26d3, 0x26d4,
+	0x26e9, 0x26ea,
+	0x26f0, 0x26f5,
+	0x26f7, 0x26fa,
+	0x26fd, 0x26fd,
+	0x2702, 0x2702,
+	0x2705, 0x2705,
+	0x2708, 0x270d,
+	0x270f, 0x270f,
+	0x2712, 0x2712,
+	0x2714, 0x2714,
+	0x2716, 0x2716,
+	0x271d, 0x271d,
+	0x2721, 0x2721,
+	0x2728, 0x2728,
+	0x2733, 0x2734,
+	0x2744, 0x2744,
+	0x2747, 0x2747,
+	0x274c, 0x274c,
+	0x274e, 0x274e,
+	0x2753, 0x2755,
+	0x2757, 0x2757,
+	0x2763, 0x2764,
+	0x2795, 0x2797,
+	0x27a1, 0x27a1,
+	0x27b0, 0x27b0,
+	0x27bf, 0x27bf,
+	0x2934, 0x2935,
+	0x2b05, 0x2b07,
+	0x2b1b, 0x2b1c,
+	0x2b50, 0x2b50,
+	0x2b55, 0x2b55,
+	0x3030, 0x3030,
+	0x303d, 0x303d,
+	0x3297, 0x3297,
+	0x3299, 0x3299,
+	0x1f004, 0x1f004,
+	0x1f0cf, 0x1f0cf,
+	0x1f170, 0x1f171,
+	0x1f17e, 0x1f17f,
+	0x1f18e, 0x1f18e,
+	0x1f191, 0x1f19a,
+	0x1f1e6, 0x1f1ff,
+	0x1f201, 0x1f202,
+	0x1f21a, 0x1f21a,
+	0x1f22f, 0x1f22f,
+	0x1f232, 0x1f23a,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f321,
+	0x1f324, 0x1f393,
+	0x1f396, 0x1f397,
+	0x1f399, 0x1f39b,
+	0x1f39e, 0x1f3f0,
+	0x1f3f3, 0x1f3f5,
+	0x1f3f7, 0x1f4fd,
+	0x1f4ff, 0x1f53d,
+	0x1f549, 0x1f54e,
+	0x1f550, 0x1f567,
+	0x1f56f, 0x1f570,
+	0x1f573, 0x1f57a,
+	0x1f587, 0x1f587,
+	0x1f58a, 0x1f58d,
+	0x1f590, 0x1f590,
+	0x1f595, 0x1f596,
+	0x1f5a4, 0x1f5a5,
+	0x1f5a8, 0x1f5a8,
+	0x1f5b1, 0x1f5b2,
+	0x1f5bc, 0x1f5bc,
+	0x1f5c2, 0x1f5c4,
+	0x1f5d1, 0x1f5d3,
+	0x1f5dc, 0x1f5de,
+	0x1f5e1, 0x1f5e1,
+	0x1f5e3, 0x1f5e3,
+	0x1f5e8, 0x1f5e8,
+	0x1f5ef, 0x1f5ef,
+	0x1f5f3, 0x1f5f3,
+	0x1f5fa, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f6cb, 0x1f6d2,
+	0x1f6d5, 0x1f6d5,
+	0x1f6e0, 0x1f6e5,
+	0x1f6e9, 0x1f6e9,
+	0x1f6eb, 0x1f6ec,
+	0x1f6f0, 0x1f6f0,
+	0x1f6f3, 0x1f6fa,
+	0x1f7e0, 0x1f7eb,
+	0x1f90d, 0x1f93a,
+	0x1f93c, 0x1f945,
+	0x1f947, 0x1f971,
+	0x1f973, 0x1f976,
+	0x1f97a, 0x1f9a2,
+	0x1f9a5, 0x1f9aa,
+	0x1f9ae, 0x1f9ca,
+	0x1f9cd, 0x1f9ff,
+	0x1fa70, 0x1fa73,
+	0x1fa78, 0x1fa7a,
+	0x1fa80, 0x1fa82,
+	0x1fa90, 0x1fa95,
+}; /* CR_Emoji */
+
+/* 'Emoji_Presentation': Emoji */
+static const OnigCodePoint CR_Emoji_Presentation[] = {
+	81,
+	0x231a, 0x231b,
+	0x23e9, 0x23ec,
+	0x23f0, 0x23f0,
+	0x23f3, 0x23f3,
+	0x25fd, 0x25fe,
+	0x2614, 0x2615,
+	0x2648, 0x2653,
+	0x267f, 0x267f,
+	0x2693, 0x2693,
+	0x26a1, 0x26a1,
+	0x26aa, 0x26ab,
+	0x26bd, 0x26be,
+	0x26c4, 0x26c5,
+	0x26ce, 0x26ce,
+	0x26d4, 0x26d4,
+	0x26ea, 0x26ea,
+	0x26f2, 0x26f3,
+	0x26f5, 0x26f5,
+	0x26fa, 0x26fa,
+	0x26fd, 0x26fd,
+	0x2705, 0x2705,
+	0x270a, 0x270b,
+	0x2728, 0x2728,
+	0x274c, 0x274c,
+	0x274e, 0x274e,
+	0x2753, 0x2755,
+	0x2757, 0x2757,
+	0x2795, 0x2797,
+	0x27b0, 0x27b0,
+	0x27bf, 0x27bf,
+	0x2b1b, 0x2b1c,
+	0x2b50, 0x2b50,
+	0x2b55, 0x2b55,
+	0x1f004, 0x1f004,
+	0x1f0cf, 0x1f0cf,
+	0x1f18e, 0x1f18e,
+	0x1f191, 0x1f19a,
+	0x1f1e6, 0x1f1ff,
+	0x1f201, 0x1f201,
+	0x1f21a, 0x1f21a,
+	0x1f22f, 0x1f22f,
+	0x1f232, 0x1f236,
+	0x1f238, 0x1f23a,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f32d, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f37e, 0x1f393,
+	0x1f3a0, 0x1f3ca,
+	0x1f3cf, 0x1f3d3,
+	0x1f3e0, 0x1f3f0,
+	0x1f3f4, 0x1f3f4,
+	0x1f3f8, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4fc,
+	0x1f4ff, 0x1f53d,
+	0x1f54b, 0x1f54e,
+	0x1f550, 0x1f567,
+	0x1f57a, 0x1f57a,
+	0x1f595, 0x1f596,
+	0x1f5a4, 0x1f5a4,
+	0x1f5fb, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f6cc, 0x1f6cc,
+	0x1f6d0, 0x1f6d2,
+	0x1f6d5, 0x1f6d5,
+	0x1f6eb, 0x1f6ec,
+	0x1f6f4, 0x1f6fa,
+	0x1f7e0, 0x1f7eb,
+	0x1f90d, 0x1f93a,
+	0x1f93c, 0x1f945,
+	0x1f947, 0x1f971,
+	0x1f973, 0x1f976,
+	0x1f97a, 0x1f9a2,
+	0x1f9a5, 0x1f9aa,
+	0x1f9ae, 0x1f9ca,
+	0x1f9cd, 0x1f9ff,
+	0x1fa70, 0x1fa73,
+	0x1fa78, 0x1fa7a,
+	0x1fa80, 0x1fa82,
+	0x1fa90, 0x1fa95,
+}; /* CR_Emoji_Presentation */
+
+/* 'Emoji_Modifier': Emoji */
+static const OnigCodePoint CR_Emoji_Modifier[] = {
+	1,
+	0x1f3fb, 0x1f3ff,
+}; /* CR_Emoji_Modifier */
+
+/* 'Emoji_Modifier_Base': Emoji */
+static const OnigCodePoint CR_Emoji_Modifier_Base[] = {
+	36,
+	0x261d, 0x261d,
+	0x26f9, 0x26f9,
+	0x270a, 0x270d,
+	0x1f385, 0x1f385,
+	0x1f3c2, 0x1f3c4,
+	0x1f3c7, 0x1f3c7,
+	0x1f3ca, 0x1f3cc,
+	0x1f442, 0x1f443,
+	0x1f446, 0x1f450,
+	0x1f466, 0x1f478,
+	0x1f47c, 0x1f47c,
+	0x1f481, 0x1f483,
+	0x1f485, 0x1f487,
+	0x1f48f, 0x1f48f,
+	0x1f491, 0x1f491,
+	0x1f4aa, 0x1f4aa,
+	0x1f574, 0x1f575,
+	0x1f57a, 0x1f57a,
+	0x1f590, 0x1f590,
+	0x1f595, 0x1f596,
+	0x1f645, 0x1f647,
+	0x1f64b, 0x1f64f,
+	0x1f6a3, 0x1f6a3,
+	0x1f6b4, 0x1f6b6,
+	0x1f6c0, 0x1f6c0,
+	0x1f6cc, 0x1f6cc,
+	0x1f90f, 0x1f90f,
+	0x1f918, 0x1f91f,
+	0x1f926, 0x1f926,
+	0x1f930, 0x1f939,
+	0x1f93c, 0x1f93e,
+	0x1f9b5, 0x1f9b6,
+	0x1f9b8, 0x1f9b9,
+	0x1f9bb, 0x1f9bb,
+	0x1f9cd, 0x1f9cf,
+	0x1f9d1, 0x1f9dd,
+}; /* CR_Emoji_Modifier_Base */
+
+/* 'Emoji_Component': Emoji */
+static const OnigCodePoint CR_Emoji_Component[] = {
+	10,
+	0x0023, 0x0023,
+	0x002a, 0x002a,
+	0x0030, 0x0039,
+	0x200d, 0x200d,
+	0x20e3, 0x20e3,
+	0xfe0f, 0xfe0f,
+	0x1f1e6, 0x1f1ff,
+	0x1f3fb, 0x1f3ff,
+	0x1f9b0, 0x1f9b3,
+	0xe0020, 0xe007f,
+}; /* CR_Emoji_Component */
+
+/* 'Extended_Pictographic': Emoji */
+static const OnigCodePoint CR_Extended_Pictographic[] = {
+	77,
+	0x00a9, 0x00a9,
+	0x00ae, 0x00ae,
+	0x203c, 0x203c,
+	0x2049, 0x2049,
+	0x2122, 0x2122,
+	0x2139, 0x2139,
+	0x2194, 0x2199,
+	0x21a9, 0x21aa,
+	0x231a, 0x231b,
+	0x2328, 0x2328,
+	0x2388, 0x2388,
+	0x23cf, 0x23cf,
+	0x23e9, 0x23f3,
+	0x23f8, 0x23fa,
+	0x24c2, 0x24c2,
+	0x25aa, 0x25ab,
+	0x25b6, 0x25b6,
+	0x25c0, 0x25c0,
+	0x25fb, 0x25fe,
+	0x2600, 0x2605,
+	0x2607, 0x2612,
+	0x2614, 0x2685,
+	0x2690, 0x2705,
+	0x2708, 0x2712,
+	0x2714, 0x2714,
+	0x2716, 0x2716,
+	0x271d, 0x271d,
+	0x2721, 0x2721,
+	0x2728, 0x2728,
+	0x2733, 0x2734,
+	0x2744, 0x2744,
+	0x2747, 0x2747,
+	0x274c, 0x274c,
+	0x274e, 0x274e,
+	0x2753, 0x2755,
+	0x2757, 0x2757,
+	0x2763, 0x2767,
+	0x2795, 0x2797,
+	0x27a1, 0x27a1,
+	0x27b0, 0x27b0,
+	0x27bf, 0x27bf,
+	0x2934, 0x2935,
+	0x2b05, 0x2b07,
+	0x2b1b, 0x2b1c,
+	0x2b50, 0x2b50,
+	0x2b55, 0x2b55,
+	0x3030, 0x3030,
+	0x303d, 0x303d,
+	0x3297, 0x3297,
+	0x3299, 0x3299,
+	0x1f000, 0x1f0ff,
+	0x1f10d, 0x1f10f,
+	0x1f12f, 0x1f12f,
+	0x1f16c, 0x1f171,
+	0x1f17e, 0x1f17f,
+	0x1f18e, 0x1f18e,
+	0x1f191, 0x1f19a,
+	0x1f1ad, 0x1f1e5,
+	0x1f201, 0x1f20f,
+	0x1f21a, 0x1f21a,
+	0x1f22f, 0x1f22f,
+	0x1f232, 0x1f23a,
+	0x1f23c, 0x1f23f,
+	0x1f249, 0x1f3fa,
+	0x1f400, 0x1f53d,
+	0x1f546, 0x1f64f,
+	0x1f680, 0x1f6ff,
+	0x1f774, 0x1f77f,
+	0x1f7d5, 0x1f7ff,
+	0x1f80c, 0x1f80f,
+	0x1f848, 0x1f84f,
+	0x1f85a, 0x1f85f,
+	0x1f888, 0x1f88f,
+	0x1f8ae, 0x1f8ff,
+	0x1f90c, 0x1f93a,
+	0x1f93c, 0x1f945,
+	0x1f947, 0x1fffd,
+}; /* CR_Extended_Pictographic */
+
+/* 'Unknown': Script */
+static const OnigCodePoint CR_Unknown[] = {
+	664,
+	0x0378, 0x0379,
+	0x0380, 0x0383,
+	0x038b, 0x038b,
+	0x038d, 0x038d,
+	0x03a2, 0x03a2,
+	0x0530, 0x0530,
+	0x0557, 0x0558,
+	0x058b, 0x058c,
+	0x0590, 0x0590,
+	0x05c8, 0x05cf,
+	0x05eb, 0x05ee,
+	0x05f5, 0x05ff,
+	0x061d, 0x061d,
+	0x070e, 0x070e,
+	0x074b, 0x074c,
+	0x07b2, 0x07bf,
+	0x07fb, 0x07fc,
+	0x082e, 0x082f,
+	0x083f, 0x083f,
+	0x085c, 0x085d,
+	0x085f, 0x085f,
+	0x086b, 0x089f,
+	0x08b5, 0x08b5,
+	0x08be, 0x08d2,
+	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,
+	0x09ff, 0x0a00,
+	0x0a04, 0x0a04,
+	0x0a0b, 0x0a0e,
+	0x0a11, 0x0a12,
+	0x0a29, 0x0a29,
+	0x0a31, 0x0a31,
+	0x0a34, 0x0a34,
+	0x0a37, 0x0a37,
+	0x0a3a, 0x0a3b,
+	0x0a3d, 0x0a3d,
+	0x0a43, 0x0a46,
+	0x0a49, 0x0a4a,
+	0x0a4e, 0x0a50,
+	0x0a52, 0x0a58,
+	0x0a5d, 0x0a5d,
+	0x0a5f, 0x0a65,
+	0x0a77, 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,
+	0x0af2, 0x0af8,
+	0x0b00, 0x0b00,
+	0x0b04, 0x0b04,
+	0x0b0d, 0x0b0e,
+	0x0b11, 0x0b12,
+	0x0b29, 0x0b29,
+	0x0b31, 0x0b31,
+	0x0b34, 0x0b34,
+	0x0b3a, 0x0b3b,
+	0x0b45, 0x0b46,
+	0x0b49, 0x0b4a,
+	0x0b4e, 0x0b55,
+	0x0b58, 0x0b5b,
+	0x0b5e, 0x0b5e,
+	0x0b64, 0x0b65,
+	0x0b78, 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, 0x0bcf,
+	0x0bd1, 0x0bd6,
+	0x0bd8, 0x0be5,
+	0x0bfb, 0x0bff,
+	0x0c0d, 0x0c0d,
+	0x0c11, 0x0c11,
+	0x0c29, 0x0c29,
+	0x0c3a, 0x0c3c,
+	0x0c45, 0x0c45,
+	0x0c49, 0x0c49,
+	0x0c4e, 0x0c54,
+	0x0c57, 0x0c57,
+	0x0c5b, 0x0c5f,
+	0x0c64, 0x0c65,
+	0x0c70, 0x0c76,
+	0x0c8d, 0x0c8d,
+	0x0c91, 0x0c91,
+	0x0ca9, 0x0ca9,
+	0x0cb4, 0x0cb4,
+	0x0cba, 0x0cbb,
+	0x0cc5, 0x0cc5,
+	0x0cc9, 0x0cc9,
+	0x0cce, 0x0cd4,
+	0x0cd7, 0x0cdd,
+	0x0cdf, 0x0cdf,
+	0x0ce4, 0x0ce5,
+	0x0cf0, 0x0cf0,
+	0x0cf3, 0x0cff,
+	0x0d04, 0x0d04,
+	0x0d0d, 0x0d0d,
+	0x0d11, 0x0d11,
+	0x0d45, 0x0d45,
+	0x0d49, 0x0d49,
+	0x0d50, 0x0d53,
+	0x0d64, 0x0d65,
+	0x0d80, 0x0d81,
+	0x0d84, 0x0d84,
+	0x0d97, 0x0d99,
+	0x0db2, 0x0db2,
+	0x0dbc, 0x0dbc,
+	0x0dbe, 0x0dbf,
+	0x0dc7, 0x0dc9,
+	0x0dcb, 0x0dce,
+	0x0dd5, 0x0dd5,
+	0x0dd7, 0x0dd7,
+	0x0de0, 0x0de5,
+	0x0df0, 0x0df1,
+	0x0df5, 0x0e00,
+	0x0e3b, 0x0e3e,
+	0x0e5c, 0x0e80,
+	0x0e83, 0x0e83,
+	0x0e85, 0x0e85,
+	0x0e8b, 0x0e8b,
+	0x0ea4, 0x0ea4,
+	0x0ea6, 0x0ea6,
+	0x0ebe, 0x0ebf,
+	0x0ec5, 0x0ec5,
+	0x0ec7, 0x0ec7,
+	0x0ece, 0x0ecf,
+	0x0eda, 0x0edb,
+	0x0ee0, 0x0eff,
+	0x0f48, 0x0f48,
+	0x0f6d, 0x0f70,
+	0x0f98, 0x0f98,
+	0x0fbd, 0x0fbd,
+	0x0fcd, 0x0fcd,
+	0x0fdb, 0x0fff,
+	0x10c6, 0x10c6,
+	0x10c8, 0x10cc,
+	0x10ce, 0x10cf,
+	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, 0x135c,
+	0x137d, 0x137f,
+	0x139a, 0x139f,
+	0x13f6, 0x13f7,
+	0x13fe, 0x13ff,
+	0x169d, 0x169f,
+	0x16f9, 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,
+	0x1879, 0x187f,
+	0x18ab, 0x18af,
+	0x18f6, 0x18ff,
+	0x191f, 0x191f,
+	0x192c, 0x192f,
+	0x193c, 0x193f,
+	0x1941, 0x1943,
+	0x196e, 0x196f,
+	0x1975, 0x197f,
+	0x19ac, 0x19af,
+	0x19ca, 0x19cf,
+	0x19db, 0x19dd,
+	0x1a1c, 0x1a1d,
+	0x1a5f, 0x1a5f,
+	0x1a7d, 0x1a7e,
+	0x1a8a, 0x1a8f,
+	0x1a9a, 0x1a9f,
+	0x1aae, 0x1aaf,
+	0x1abf, 0x1aff,
+	0x1b4c, 0x1b4f,
+	0x1b7d, 0x1b7f,
+	0x1bf4, 0x1bfb,
+	0x1c38, 0x1c3a,
+	0x1c4a, 0x1c4c,
+	0x1c89, 0x1c8f,
+	0x1cbb, 0x1cbc,
+	0x1cc8, 0x1ccf,
+	0x1cfb, 0x1cff,
+	0x1dfa, 0x1dfa,
+	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,
+	0x2065, 0x2065,
+	0x2072, 0x2073,
+	0x208f, 0x208f,
+	0x209d, 0x209f,
+	0x20c0, 0x20cf,
+	0x20f1, 0x20ff,
+	0x218c, 0x218f,
+	0x2427, 0x243f,
+	0x244b, 0x245f,
+	0x2b74, 0x2b75,
+	0x2b96, 0x2b97,
+	0x2c2f, 0x2c2f,
+	0x2c5f, 0x2c5f,
+	0x2cf4, 0x2cf8,
+	0x2d26, 0x2d26,
+	0x2d28, 0x2d2c,
+	0x2d2e, 0x2d2f,
+	0x2d68, 0x2d6e,
+	0x2d71, 0x2d7e,
+	0x2d97, 0x2d9f,
+	0x2da7, 0x2da7,
+	0x2daf, 0x2daf,
+	0x2db7, 0x2db7,
+	0x2dbf, 0x2dbf,
+	0x2dc7, 0x2dc7,
+	0x2dcf, 0x2dcf,
+	0x2dd7, 0x2dd7,
+	0x2ddf, 0x2ddf,
+	0x2e50, 0x2e7f,
+	0x2e9a, 0x2e9a,
+	0x2ef4, 0x2eff,
+	0x2fd6, 0x2fef,
+	0x2ffc, 0x2fff,
+	0x3040, 0x3040,
+	0x3097, 0x3098,
+	0x3100, 0x3104,
+	0x3130, 0x3130,
+	0x318f, 0x318f,
+	0x31bb, 0x31bf,
+	0x31e4, 0x31ef,
+	0x321f, 0x321f,
+	0x4db6, 0x4dbf,
+	0x9ff0, 0x9fff,
+	0xa48d, 0xa48f,
+	0xa4c7, 0xa4cf,
+	0xa62c, 0xa63f,
+	0xa6f8, 0xa6ff,
+	0xa7c0, 0xa7c1,
+	0xa7c7, 0xa7f6,
+	0xa82c, 0xa82f,
+	0xa83a, 0xa83f,
+	0xa878, 0xa87f,
+	0xa8c6, 0xa8cd,
+	0xa8da, 0xa8df,
+	0xa954, 0xa95e,
+	0xa97d, 0xa97f,
+	0xa9ce, 0xa9ce,
+	0xa9da, 0xa9dd,
+	0xa9ff, 0xa9ff,
+	0xaa37, 0xaa3f,
+	0xaa4e, 0xaa4f,
+	0xaa5a, 0xaa5b,
+	0xaac3, 0xaada,
+	0xaaf7, 0xab00,
+	0xab07, 0xab08,
+	0xab0f, 0xab10,
+	0xab17, 0xab1f,
+	0xab27, 0xab27,
+	0xab2f, 0xab2f,
+	0xab68, 0xab6f,
+	0xabee, 0xabef,
+	0xabfa, 0xabff,
+	0xd7a4, 0xd7af,
+	0xd7c7, 0xd7ca,
+	0xd7fc, 0xf8ff,
+	0xfa6e, 0xfa6f,
+	0xfada, 0xfaff,
+	0xfb07, 0xfb12,
+	0xfb18, 0xfb1c,
+	0xfb37, 0xfb37,
+	0xfb3d, 0xfb3d,
+	0xfb3f, 0xfb3f,
+	0xfb42, 0xfb42,
+	0xfb45, 0xfb45,
+	0xfbc2, 0xfbd2,
+	0xfd40, 0xfd4f,
+	0xfd90, 0xfd91,
+	0xfdc8, 0xfdef,
+	0xfdfe, 0xfdff,
+	0xfe1a, 0xfe1f,
+	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,
+	0x1018f, 0x1018f,
+	0x1019c, 0x1019f,
+	0x101a1, 0x101cf,
+	0x101fe, 0x1027f,
+	0x1029d, 0x1029f,
+	0x102d1, 0x102df,
+	0x102fc, 0x102ff,
+	0x10324, 0x1032c,
+	0x1034b, 0x1034f,
+	0x1037b, 0x1037f,
+	0x1039e, 0x1039e,
+	0x103c4, 0x103c7,
+	0x103d6, 0x103ff,
+	0x1049e, 0x1049f,
+	0x104aa, 0x104af,
+	0x104d4, 0x104d7,
+	0x104fc, 0x104ff,
+	0x10528, 0x1052f,
+	0x10564, 0x1056e,
+	0x10570, 0x105ff,
+	0x10737, 0x1073f,
+	0x10756, 0x1075f,
+	0x10768, 0x107ff,
+	0x10806, 0x10807,
+	0x10809, 0x10809,
+	0x10836, 0x10836,
+	0x10839, 0x1083b,
+	0x1083d, 0x1083e,
+	0x10856, 0x10856,
+	0x1089f, 0x108a6,
+	0x108b0, 0x108df,
+	0x108f3, 0x108f3,
+	0x108f6, 0x108fa,
+	0x1091c, 0x1091e,
+	0x1093a, 0x1093e,
+	0x10940, 0x1097f,
+	0x109b8, 0x109bb,
+	0x109d0, 0x109d1,
+	0x10a04, 0x10a04,
+	0x10a07, 0x10a0b,
+	0x10a14, 0x10a14,
+	0x10a18, 0x10a18,
+	0x10a36, 0x10a37,
+	0x10a3b, 0x10a3e,
+	0x10a49, 0x10a4f,
+	0x10a59, 0x10a5f,
+	0x10aa0, 0x10abf,
+	0x10ae7, 0x10aea,
+	0x10af7, 0x10aff,
+	0x10b36, 0x10b38,
+	0x10b56, 0x10b57,
+	0x10b73, 0x10b77,
+	0x10b92, 0x10b98,
+	0x10b9d, 0x10ba8,
+	0x10bb0, 0x10bff,
+	0x10c49, 0x10c7f,
+	0x10cb3, 0x10cbf,
+	0x10cf3, 0x10cf9,
+	0x10d28, 0x10d2f,
+	0x10d3a, 0x10e5f,
+	0x10e7f, 0x10eff,
+	0x10f28, 0x10f2f,
+	0x10f5a, 0x10fdf,
+	0x10ff7, 0x10fff,
+	0x1104e, 0x11051,
+	0x11070, 0x1107e,
+	0x110c2, 0x110cc,
+	0x110ce, 0x110cf,
+	0x110e9, 0x110ef,
+	0x110fa, 0x110ff,
+	0x11135, 0x11135,
+	0x11147, 0x1114f,
+	0x11177, 0x1117f,
+	0x111ce, 0x111cf,
+	0x111e0, 0x111e0,
+	0x111f5, 0x111ff,
+	0x11212, 0x11212,
+	0x1123f, 0x1127f,
+	0x11287, 0x11287,
+	0x11289, 0x11289,
+	0x1128e, 0x1128e,
+	0x1129e, 0x1129e,
+	0x112aa, 0x112af,
+	0x112eb, 0x112ef,
+	0x112fa, 0x112ff,
+	0x11304, 0x11304,
+	0x1130d, 0x1130e,
+	0x11311, 0x11312,
+	0x11329, 0x11329,
+	0x11331, 0x11331,
+	0x11334, 0x11334,
+	0x1133a, 0x1133a,
+	0x11345, 0x11346,
+	0x11349, 0x1134a,
+	0x1134e, 0x1134f,
+	0x11351, 0x11356,
+	0x11358, 0x1135c,
+	0x11364, 0x11365,
+	0x1136d, 0x1136f,
+	0x11375, 0x113ff,
+	0x1145a, 0x1145a,
+	0x1145c, 0x1145c,
+	0x11460, 0x1147f,
+	0x114c8, 0x114cf,
+	0x114da, 0x1157f,
+	0x115b6, 0x115b7,
+	0x115de, 0x115ff,
+	0x11645, 0x1164f,
+	0x1165a, 0x1165f,
+	0x1166d, 0x1167f,
+	0x116b9, 0x116bf,
+	0x116ca, 0x116ff,
+	0x1171b, 0x1171c,
+	0x1172c, 0x1172f,
+	0x11740, 0x117ff,
+	0x1183c, 0x1189f,
+	0x118f3, 0x118fe,
+	0x11900, 0x1199f,
+	0x119a8, 0x119a9,
+	0x119d8, 0x119d9,
+	0x119e5, 0x119ff,
+	0x11a48, 0x11a4f,
+	0x11aa3, 0x11abf,
+	0x11af9, 0x11bff,
+	0x11c09, 0x11c09,
+	0x11c37, 0x11c37,
+	0x11c46, 0x11c4f,
+	0x11c6d, 0x11c6f,
+	0x11c90, 0x11c91,
+	0x11ca8, 0x11ca8,
+	0x11cb7, 0x11cff,
+	0x11d07, 0x11d07,
+	0x11d0a, 0x11d0a,
+	0x11d37, 0x11d39,
+	0x11d3b, 0x11d3b,
+	0x11d3e, 0x11d3e,
+	0x11d48, 0x11d4f,
+	0x11d5a, 0x11d5f,
+	0x11d66, 0x11d66,
+	0x11d69, 0x11d69,
+	0x11d8f, 0x11d8f,
+	0x11d92, 0x11d92,
+	0x11d99, 0x11d9f,
+	0x11daa, 0x11edf,
+	0x11ef9, 0x11fbf,
+	0x11ff2, 0x11ffe,
+	0x1239a, 0x123ff,
+	0x1246f, 0x1246f,
+	0x12475, 0x1247f,
+	0x12544, 0x12fff,
+	0x1342f, 0x1342f,
+	0x13439, 0x143ff,
+	0x14647, 0x167ff,
+	0x16a39, 0x16a3f,
+	0x16a5f, 0x16a5f,
+	0x16a6a, 0x16a6d,
+	0x16a70, 0x16acf,
+	0x16aee, 0x16aef,
+	0x16af6, 0x16aff,
+	0x16b46, 0x16b4f,
+	0x16b5a, 0x16b5a,
+	0x16b62, 0x16b62,
+	0x16b78, 0x16b7c,
+	0x16b90, 0x16e3f,
+	0x16e9b, 0x16eff,
+	0x16f4b, 0x16f4e,
+	0x16f88, 0x16f8e,
+	0x16fa0, 0x16fdf,
+	0x16fe4, 0x16fff,
+	0x187f8, 0x187ff,
+	0x18af3, 0x1afff,
+	0x1b11f, 0x1b14f,
+	0x1b153, 0x1b163,
+	0x1b168, 0x1b16f,
+	0x1b2fc, 0x1bbff,
+	0x1bc6b, 0x1bc6f,
+	0x1bc7d, 0x1bc7f,
+	0x1bc89, 0x1bc8f,
+	0x1bc9a, 0x1bc9b,
+	0x1bca4, 0x1cfff,
+	0x1d0f6, 0x1d0ff,
+	0x1d127, 0x1d128,
+	0x1d1e9, 0x1d1ff,
+	0x1d246, 0x1d2df,
+	0x1d2f4, 0x1d2ff,
+	0x1d357, 0x1d35f,
+	0x1d379, 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,
+	0x1d7cc, 0x1d7cd,
+	0x1da8c, 0x1da9a,
+	0x1daa0, 0x1daa0,
+	0x1dab0, 0x1dfff,
+	0x1e007, 0x1e007,
+	0x1e019, 0x1e01a,
+	0x1e022, 0x1e022,
+	0x1e025, 0x1e025,
+	0x1e02b, 0x1e0ff,
+	0x1e12d, 0x1e12f,
+	0x1e13e, 0x1e13f,
+	0x1e14a, 0x1e14d,
+	0x1e150, 0x1e2bf,
+	0x1e2fa, 0x1e2fe,
+	0x1e300, 0x1e7ff,
+	0x1e8c5, 0x1e8c6,
+	0x1e8d7, 0x1e8ff,
+	0x1e94c, 0x1e94f,
+	0x1e95a, 0x1e95d,
+	0x1e960, 0x1ec70,
+	0x1ecb5, 0x1ed00,
+	0x1ed3e, 0x1edff,
+	0x1ee04, 0x1ee04,
+	0x1ee20, 0x1ee20,
+	0x1ee23, 0x1ee23,
+	0x1ee25, 0x1ee26,
+	0x1ee28, 0x1ee28,
+	0x1ee33, 0x1ee33,
+	0x1ee38, 0x1ee38,
+	0x1ee3a, 0x1ee3a,
+	0x1ee3c, 0x1ee41,
+	0x1ee43, 0x1ee46,
+	0x1ee48, 0x1ee48,
+	0x1ee4a, 0x1ee4a,
+	0x1ee4c, 0x1ee4c,
+	0x1ee50, 0x1ee50,
+	0x1ee53, 0x1ee53,
+	0x1ee55, 0x1ee56,
+	0x1ee58, 0x1ee58,
+	0x1ee5a, 0x1ee5a,
+	0x1ee5c, 0x1ee5c,
+	0x1ee5e, 0x1ee5e,
+	0x1ee60, 0x1ee60,
+	0x1ee63, 0x1ee63,
+	0x1ee65, 0x1ee66,
+	0x1ee6b, 0x1ee6b,
+	0x1ee73, 0x1ee73,
+	0x1ee78, 0x1ee78,
+	0x1ee7d, 0x1ee7d,
+	0x1ee7f, 0x1ee7f,
+	0x1ee8a, 0x1ee8a,
+	0x1ee9c, 0x1eea0,
+	0x1eea4, 0x1eea4,
+	0x1eeaa, 0x1eeaa,
+	0x1eebc, 0x1eeef,
+	0x1eef2, 0x1efff,
+	0x1f02c, 0x1f02f,
+	0x1f094, 0x1f09f,
+	0x1f0af, 0x1f0b0,
+	0x1f0c0, 0x1f0c0,
+	0x1f0d0, 0x1f0d0,
+	0x1f0f6, 0x1f0ff,
+	0x1f10d, 0x1f10f,
+	0x1f16d, 0x1f16f,
+	0x1f1ad, 0x1f1e5,
+	0x1f203, 0x1f20f,
+	0x1f23c, 0x1f23f,
+	0x1f249, 0x1f24f,
+	0x1f252, 0x1f25f,
+	0x1f266, 0x1f2ff,
+	0x1f6d6, 0x1f6df,
+	0x1f6ed, 0x1f6ef,
+	0x1f6fb, 0x1f6ff,
+	0x1f774, 0x1f77f,
+	0x1f7d9, 0x1f7df,
+	0x1f7ec, 0x1f7ff,
+	0x1f80c, 0x1f80f,
+	0x1f848, 0x1f84f,
+	0x1f85a, 0x1f85f,
+	0x1f888, 0x1f88f,
+	0x1f8ae, 0x1f8ff,
+	0x1f90c, 0x1f90c,
+	0x1f972, 0x1f972,
+	0x1f977, 0x1f979,
+	0x1f9a3, 0x1f9a4,
+	0x1f9ab, 0x1f9ad,
+	0x1f9cb, 0x1f9cc,
+	0x1fa54, 0x1fa5f,
+	0x1fa6e, 0x1fa6f,
+	0x1fa74, 0x1fa77,
+	0x1fa7b, 0x1fa7f,
+	0x1fa83, 0x1fa8f,
+	0x1fa96, 0x1ffff,
+	0x2a6d7, 0x2a6ff,
+	0x2b735, 0x2b73f,
+	0x2b81e, 0x2b81f,
+	0x2cea2, 0x2ceaf,
+	0x2ebe1, 0x2f7ff,
+	0x2fa1e, 0xe0000,
+	0xe0002, 0xe001f,
+	0xe0080, 0xe00ff,
+	0xe01f0, 0x10ffff,
+}; /* CR_Unknown */
+
+#ifdef USE_UNICODE_AGE_PROPERTIES
+/* 'Age_1_1': Derived Age 1.1 */
+static const OnigCodePoint CR_Age_1_1[] = {
+	288,
+	0x0000, 0x01f5,
+	0x01fa, 0x0217,
+	0x0250, 0x02a8,
+	0x02b0, 0x02de,
+	0x02e0, 0x02e9,
+	0x0300, 0x0345,
+	0x0360, 0x0361,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x037e, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x03d6,
+	0x03da, 0x03da,
+	0x03dc, 0x03dc,
+	0x03de, 0x03de,
+	0x03e0, 0x03e0,
+	0x03e2, 0x03f3,
+	0x0401, 0x040c,
+	0x040e, 0x044f,
+	0x0451, 0x045c,
+	0x045e, 0x0486,
+	0x0490, 0x04c4,
+	0x04c7, 0x04c8,
+	0x04cb, 0x04cc,
+	0x04d0, 0x04eb,
+	0x04ee, 0x04f5,
+	0x04f8, 0x04f9,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x0589,
+	0x05b0, 0x05b9,
+	0x05bb, 0x05c3,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x0652,
+	0x0660, 0x066d,
+	0x0670, 0x06b7,
+	0x06ba, 0x06be,
+	0x06c0, 0x06ce,
+	0x06d0, 0x06ed,
+	0x06f0, 0x06f9,
+	0x0901, 0x0903,
+	0x0905, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09bc,
+	0x09be, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fa,
+	0x0a02, 0x0a02,
+	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, 0x0a8b,
+	0x0a8d, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae0,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b36, 0x0b39,
+	0x0b3c, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b66, 0x0b70,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb5,
+	0x0bb7, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0be7, 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,
+	0x0cbe, 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,
+	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,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10f6,
+	0x10fb, 0x10fb,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	0x1e00, 0x1e9a,
+	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, 0x202e,
+	0x2030, 0x2046,
+	0x206a, 0x2070,
+	0x2074, 0x208e,
+	0x20a0, 0x20aa,
+	0x20d0, 0x20e1,
+	0x2100, 0x2138,
+	0x2153, 0x2182,
+	0x2190, 0x21ea,
+	0x2200, 0x22f1,
+	0x2300, 0x2300,
+	0x2302, 0x237a,
+	0x2400, 0x2424,
+	0x2440, 0x244a,
+	0x2460, 0x24ea,
+	0x2500, 0x2595,
+	0x25a0, 0x25ef,
+	0x2600, 0x2613,
+	0x261a, 0x266f,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2767,
+	0x2776, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x3000, 0x3037,
+	0x303f, 0x303f,
+	0x3041, 0x3094,
+	0x3099, 0x309e,
+	0x30a1, 0x30fe,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x319f,
+	0x3200, 0x321c,
+	0x3220, 0x3243,
+	0x3260, 0x327b,
+	0x327f, 0x32b0,
+	0x32c0, 0x32cb,
+	0x32d0, 0x32fe,
+	0x3300, 0x3376,
+	0x337b, 0x33dd,
+	0x33e0, 0x33fe,
+	0x4e00, 0x9fa5,
+	0xe000, 0xfa2d,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1e, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe20, 0xfe23,
+	0xfe30, 0xfe44,
+	0xfe49, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe72,
+	0xfe74, 0xfe74,
+	0xfe76, 0xfefc,
+	0xfeff, 0xfeff,
+	0xff01, 0xff5e,
+	0xff61, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfffd, 0xffff,
+}; /* CR_Age_1_1 */
+
+/* 'Age_2_0': Derived Age 2.0 */
+static const OnigCodePoint CR_Age_2_0[] = {
+	312,
+	0x0000, 0x01f5,
+	0x01fa, 0x0217,
+	0x0250, 0x02a8,
+	0x02b0, 0x02de,
+	0x02e0, 0x02e9,
+	0x0300, 0x0345,
+	0x0360, 0x0361,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x037e, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x03d6,
+	0x03da, 0x03da,
+	0x03dc, 0x03dc,
+	0x03de, 0x03de,
+	0x03e0, 0x03e0,
+	0x03e2, 0x03f3,
+	0x0401, 0x040c,
+	0x040e, 0x044f,
+	0x0451, 0x045c,
+	0x045e, 0x0486,
+	0x0490, 0x04c4,
+	0x04c7, 0x04c8,
+	0x04cb, 0x04cc,
+	0x04d0, 0x04eb,
+	0x04ee, 0x04f5,
+	0x04f8, 0x04f9,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x0589,
+	0x0591, 0x05a1,
+	0x05a3, 0x05b9,
+	0x05bb, 0x05c4,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x0652,
+	0x0660, 0x066d,
+	0x0670, 0x06b7,
+	0x06ba, 0x06be,
+	0x06c0, 0x06ce,
+	0x06d0, 0x06ed,
+	0x06f0, 0x06f9,
+	0x0901, 0x0903,
+	0x0905, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09bc,
+	0x09be, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fa,
+	0x0a02, 0x0a02,
+	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, 0x0a8b,
+	0x0a8d, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae0,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b36, 0x0b39,
+	0x0b3c, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b66, 0x0b70,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb5,
+	0x0bb7, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0be7, 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,
+	0x0cbe, 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,
+	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, 0x0f69,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f95,
+	0x0f97, 0x0f97,
+	0x0f99, 0x0fad,
+	0x0fb1, 0x0fb7,
+	0x0fb9, 0x0fb9,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10f6,
+	0x10fb, 0x10fb,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	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, 0x202e,
+	0x2030, 0x2046,
+	0x206a, 0x2070,
+	0x2074, 0x208e,
+	0x20a0, 0x20ab,
+	0x20d0, 0x20e1,
+	0x2100, 0x2138,
+	0x2153, 0x2182,
+	0x2190, 0x21ea,
+	0x2200, 0x22f1,
+	0x2300, 0x2300,
+	0x2302, 0x237a,
+	0x2400, 0x2424,
+	0x2440, 0x244a,
+	0x2460, 0x24ea,
+	0x2500, 0x2595,
+	0x25a0, 0x25ef,
+	0x2600, 0x2613,
+	0x261a, 0x266f,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2767,
+	0x2776, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x3000, 0x3037,
+	0x303f, 0x303f,
+	0x3041, 0x3094,
+	0x3099, 0x309e,
+	0x30a1, 0x30fe,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x319f,
+	0x3200, 0x321c,
+	0x3220, 0x3243,
+	0x3260, 0x327b,
+	0x327f, 0x32b0,
+	0x32c0, 0x32cb,
+	0x32d0, 0x32fe,
+	0x3300, 0x3376,
+	0x337b, 0x33dd,
+	0x33e0, 0x33fe,
+	0x4e00, 0x9fa5,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1e, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe20, 0xfe23,
+	0xfe30, 0xfe44,
+	0xfe49, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe72,
+	0xfe74, 0xfe74,
+	0xfe76, 0xfefc,
+	0xfeff, 0xfeff,
+	0xff01, 0xff5e,
+	0xff61, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfffd, 0xffff,
+	0x1fffe, 0x1ffff,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_2_0 */
+
+/* 'Age_2_1': Derived Age 2.1 */
+static const OnigCodePoint CR_Age_2_1[] = {
+	312,
+	0x0000, 0x01f5,
+	0x01fa, 0x0217,
+	0x0250, 0x02a8,
+	0x02b0, 0x02de,
+	0x02e0, 0x02e9,
+	0x0300, 0x0345,
+	0x0360, 0x0361,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x037e, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x03d6,
+	0x03da, 0x03da,
+	0x03dc, 0x03dc,
+	0x03de, 0x03de,
+	0x03e0, 0x03e0,
+	0x03e2, 0x03f3,
+	0x0401, 0x040c,
+	0x040e, 0x044f,
+	0x0451, 0x045c,
+	0x045e, 0x0486,
+	0x0490, 0x04c4,
+	0x04c7, 0x04c8,
+	0x04cb, 0x04cc,
+	0x04d0, 0x04eb,
+	0x04ee, 0x04f5,
+	0x04f8, 0x04f9,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x0589,
+	0x0591, 0x05a1,
+	0x05a3, 0x05b9,
+	0x05bb, 0x05c4,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x0652,
+	0x0660, 0x066d,
+	0x0670, 0x06b7,
+	0x06ba, 0x06be,
+	0x06c0, 0x06ce,
+	0x06d0, 0x06ed,
+	0x06f0, 0x06f9,
+	0x0901, 0x0903,
+	0x0905, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09bc,
+	0x09be, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fa,
+	0x0a02, 0x0a02,
+	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, 0x0a8b,
+	0x0a8d, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae0,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b36, 0x0b39,
+	0x0b3c, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b66, 0x0b70,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb5,
+	0x0bb7, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0be7, 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,
+	0x0cbe, 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,
+	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, 0x0f69,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f95,
+	0x0f97, 0x0f97,
+	0x0f99, 0x0fad,
+	0x0fb1, 0x0fb7,
+	0x0fb9, 0x0fb9,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10f6,
+	0x10fb, 0x10fb,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	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, 0x202e,
+	0x2030, 0x2046,
+	0x206a, 0x2070,
+	0x2074, 0x208e,
+	0x20a0, 0x20ac,
+	0x20d0, 0x20e1,
+	0x2100, 0x2138,
+	0x2153, 0x2182,
+	0x2190, 0x21ea,
+	0x2200, 0x22f1,
+	0x2300, 0x2300,
+	0x2302, 0x237a,
+	0x2400, 0x2424,
+	0x2440, 0x244a,
+	0x2460, 0x24ea,
+	0x2500, 0x2595,
+	0x25a0, 0x25ef,
+	0x2600, 0x2613,
+	0x261a, 0x266f,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2767,
+	0x2776, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x3000, 0x3037,
+	0x303f, 0x303f,
+	0x3041, 0x3094,
+	0x3099, 0x309e,
+	0x30a1, 0x30fe,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x319f,
+	0x3200, 0x321c,
+	0x3220, 0x3243,
+	0x3260, 0x327b,
+	0x327f, 0x32b0,
+	0x32c0, 0x32cb,
+	0x32d0, 0x32fe,
+	0x3300, 0x3376,
+	0x337b, 0x33dd,
+	0x33e0, 0x33fe,
+	0x4e00, 0x9fa5,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1e, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe20, 0xfe23,
+	0xfe30, 0xfe44,
+	0xfe49, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe72,
+	0xfe74, 0xfe74,
+	0xfe76, 0xfefc,
+	0xfeff, 0xfeff,
+	0xff01, 0xff5e,
+	0xff61, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfffc, 0xffff,
+	0x1fffe, 0x1ffff,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_2_1 */
+
+/* 'Age_3_0': Derived Age 3.0 */
+static const OnigCodePoint CR_Age_3_0[] = {
+	369,
+	0x0000, 0x021f,
+	0x0222, 0x0233,
+	0x0250, 0x02ad,
+	0x02b0, 0x02ee,
+	0x0300, 0x034e,
+	0x0360, 0x0362,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x037e, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x03d7,
+	0x03da, 0x03f3,
+	0x0400, 0x0486,
+	0x0488, 0x0489,
+	0x048c, 0x04c4,
+	0x04c7, 0x04c8,
+	0x04cb, 0x04cc,
+	0x04d0, 0x04f5,
+	0x04f8, 0x04f9,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05a1,
+	0x05a3, 0x05b9,
+	0x05bb, 0x05c4,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x0655,
+	0x0660, 0x066d,
+	0x0670, 0x06ed,
+	0x06f0, 0x06fe,
+	0x0700, 0x070d,
+	0x070f, 0x072c,
+	0x0730, 0x074a,
+	0x0780, 0x07b0,
+	0x0901, 0x0903,
+	0x0905, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09bc,
+	0x09be, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fa,
+	0x0a02, 0x0a02,
+	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, 0x0a8b,
+	0x0a8d, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae0,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b36, 0x0b39,
+	0x0b3c, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b66, 0x0b70,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb5,
+	0x0bb7, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0be7, 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,
+	0x0cbe, 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, 0x0fcf,
+	0x1000, 0x1021,
+	0x1023, 0x1027,
+	0x1029, 0x102a,
+	0x102c, 0x1032,
+	0x1036, 0x1039,
+	0x1040, 0x1059,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10f6,
+	0x10fb, 0x10fb,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	0x1200, 0x1206,
+	0x1208, 0x1246,
+	0x1248, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1286,
+	0x1288, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12ae,
+	0x12b0, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12ce,
+	0x12d0, 0x12d6,
+	0x12d8, 0x12ee,
+	0x12f0, 0x130e,
+	0x1310, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x131e,
+	0x1320, 0x1346,
+	0x1348, 0x135a,
+	0x1361, 0x137c,
+	0x13a0, 0x13f4,
+	0x1401, 0x1676,
+	0x1680, 0x169c,
+	0x16a0, 0x16f0,
+	0x1780, 0x17dc,
+	0x17e0, 0x17e9,
+	0x1800, 0x180e,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18a9,
+	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, 0x2046,
+	0x2048, 0x204d,
+	0x206a, 0x2070,
+	0x2074, 0x208e,
+	0x20a0, 0x20af,
+	0x20d0, 0x20e3,
+	0x2100, 0x213a,
+	0x2153, 0x2183,
+	0x2190, 0x21f3,
+	0x2200, 0x22f1,
+	0x2300, 0x237b,
+	0x237d, 0x239a,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x24ea,
+	0x2500, 0x2595,
+	0x25a0, 0x25f7,
+	0x2600, 0x2613,
+	0x2619, 0x2671,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2767,
+	0x2776, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x2800, 0x28ff,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303a,
+	0x303e, 0x303f,
+	0x3041, 0x3094,
+	0x3099, 0x309e,
+	0x30a1, 0x30fe,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x3200, 0x321c,
+	0x3220, 0x3243,
+	0x3260, 0x327b,
+	0x327f, 0x32b0,
+	0x32c0, 0x32cb,
+	0x32d0, 0x32fe,
+	0x3300, 0x3376,
+	0x337b, 0x33dd,
+	0x33e0, 0x33fe,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fa5,
+	0xa000, 0xa48c,
+	0xa490, 0xa4a1,
+	0xa4a4, 0xa4b3,
+	0xa4b5, 0xa4c0,
+	0xa4c2, 0xa4c4,
+	0xa4c6, 0xa4c6,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe20, 0xfe23,
+	0xfe30, 0xfe44,
+	0xfe49, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe72,
+	0xfe74, 0xfe74,
+	0xfe76, 0xfefc,
+	0xfeff, 0xfeff,
+	0xff01, 0xff5e,
+	0xff61, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfff9, 0xffff,
+	0x1fffe, 0x1ffff,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_3_0 */
+
+/* 'Age_3_1': Derived Age 3.1 */
+static const OnigCodePoint CR_Age_3_1[] = {
+	402,
+	0x0000, 0x021f,
+	0x0222, 0x0233,
+	0x0250, 0x02ad,
+	0x02b0, 0x02ee,
+	0x0300, 0x034e,
+	0x0360, 0x0362,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x037e, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x03d7,
+	0x03da, 0x03f5,
+	0x0400, 0x0486,
+	0x0488, 0x0489,
+	0x048c, 0x04c4,
+	0x04c7, 0x04c8,
+	0x04cb, 0x04cc,
+	0x04d0, 0x04f5,
+	0x04f8, 0x04f9,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05a1,
+	0x05a3, 0x05b9,
+	0x05bb, 0x05c4,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x0655,
+	0x0660, 0x066d,
+	0x0670, 0x06ed,
+	0x06f0, 0x06fe,
+	0x0700, 0x070d,
+	0x070f, 0x072c,
+	0x0730, 0x074a,
+	0x0780, 0x07b0,
+	0x0901, 0x0903,
+	0x0905, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09bc,
+	0x09be, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fa,
+	0x0a02, 0x0a02,
+	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, 0x0a8b,
+	0x0a8d, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae0,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b36, 0x0b39,
+	0x0b3c, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b66, 0x0b70,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb5,
+	0x0bb7, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0be7, 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,
+	0x0cbe, 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, 0x0fcf,
+	0x1000, 0x1021,
+	0x1023, 0x1027,
+	0x1029, 0x102a,
+	0x102c, 0x1032,
+	0x1036, 0x1039,
+	0x1040, 0x1059,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10f6,
+	0x10fb, 0x10fb,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	0x1200, 0x1206,
+	0x1208, 0x1246,
+	0x1248, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1286,
+	0x1288, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12ae,
+	0x12b0, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12ce,
+	0x12d0, 0x12d6,
+	0x12d8, 0x12ee,
+	0x12f0, 0x130e,
+	0x1310, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x131e,
+	0x1320, 0x1346,
+	0x1348, 0x135a,
+	0x1361, 0x137c,
+	0x13a0, 0x13f4,
+	0x1401, 0x1676,
+	0x1680, 0x169c,
+	0x16a0, 0x16f0,
+	0x1780, 0x17dc,
+	0x17e0, 0x17e9,
+	0x1800, 0x180e,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18a9,
+	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, 0x2046,
+	0x2048, 0x204d,
+	0x206a, 0x2070,
+	0x2074, 0x208e,
+	0x20a0, 0x20af,
+	0x20d0, 0x20e3,
+	0x2100, 0x213a,
+	0x2153, 0x2183,
+	0x2190, 0x21f3,
+	0x2200, 0x22f1,
+	0x2300, 0x237b,
+	0x237d, 0x239a,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x24ea,
+	0x2500, 0x2595,
+	0x25a0, 0x25f7,
+	0x2600, 0x2613,
+	0x2619, 0x2671,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2767,
+	0x2776, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x2800, 0x28ff,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303a,
+	0x303e, 0x303f,
+	0x3041, 0x3094,
+	0x3099, 0x309e,
+	0x30a1, 0x30fe,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x3200, 0x321c,
+	0x3220, 0x3243,
+	0x3260, 0x327b,
+	0x327f, 0x32b0,
+	0x32c0, 0x32cb,
+	0x32d0, 0x32fe,
+	0x3300, 0x3376,
+	0x337b, 0x33dd,
+	0x33e0, 0x33fe,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fa5,
+	0xa000, 0xa48c,
+	0xa490, 0xa4a1,
+	0xa4a4, 0xa4b3,
+	0xa4b5, 0xa4c0,
+	0xa4c2, 0xa4c4,
+	0xa4c6, 0xa4c6,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 0xfdfb,
+	0xfe20, 0xfe23,
+	0xfe30, 0xfe44,
+	0xfe49, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe72,
+	0xfe74, 0xfe74,
+	0xfe76, 0xfefc,
+	0xfeff, 0xfeff,
+	0xff01, 0xff5e,
+	0xff61, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfff9, 0xffff,
+	0x10300, 0x1031e,
+	0x10320, 0x10323,
+	0x10330, 0x1034a,
+	0x10400, 0x10425,
+	0x10428, 0x1044d,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d12a, 0x1d1dd,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c0,
+	0x1d4c2, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a3,
+	0x1d6a8, 0x1d7c9,
+	0x1d7ce, 0x1d7ff,
+	0x1fffe, 0x2a6d6,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_3_1 */
+
+/* 'Age_3_2': Derived Age 3.2 */
+static const OnigCodePoint CR_Age_3_2[] = {
+	397,
+	0x0000, 0x0220,
+	0x0222, 0x0233,
+	0x0250, 0x02ad,
+	0x02b0, 0x02ee,
+	0x0300, 0x034f,
+	0x0360, 0x036f,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x037e, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x03f6,
+	0x0400, 0x0486,
+	0x0488, 0x04ce,
+	0x04d0, 0x04f5,
+	0x04f8, 0x04f9,
+	0x0500, 0x050f,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05a1,
+	0x05a3, 0x05b9,
+	0x05bb, 0x05c4,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x0655,
+	0x0660, 0x06ed,
+	0x06f0, 0x06fe,
+	0x0700, 0x070d,
+	0x070f, 0x072c,
+	0x0730, 0x074a,
+	0x0780, 0x07b1,
+	0x0901, 0x0903,
+	0x0905, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09bc,
+	0x09be, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fa,
+	0x0a02, 0x0a02,
+	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, 0x0a8b,
+	0x0a8d, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae0,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b36, 0x0b39,
+	0x0b3c, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b66, 0x0b70,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb5,
+	0x0bb7, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0be7, 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,
+	0x0cbe, 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, 0x0fcf,
+	0x1000, 0x1021,
+	0x1023, 0x1027,
+	0x1029, 0x102a,
+	0x102c, 0x1032,
+	0x1036, 0x1039,
+	0x1040, 0x1059,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10f8,
+	0x10fb, 0x10fb,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	0x1200, 0x1206,
+	0x1208, 0x1246,
+	0x1248, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1286,
+	0x1288, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12ae,
+	0x12b0, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12ce,
+	0x12d0, 0x12d6,
+	0x12d8, 0x12ee,
+	0x12f0, 0x130e,
+	0x1310, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x131e,
+	0x1320, 0x1346,
+	0x1348, 0x135a,
+	0x1361, 0x137c,
+	0x13a0, 0x13f4,
+	0x1401, 0x1676,
+	0x1680, 0x169c,
+	0x16a0, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1714,
+	0x1720, 0x1736,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17dc,
+	0x17e0, 0x17e9,
+	0x1800, 0x180e,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18a9,
+	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, 0x2052,
+	0x2057, 0x2057,
+	0x205f, 0x2063,
+	0x206a, 0x2071,
+	0x2074, 0x208e,
+	0x20a0, 0x20b1,
+	0x20d0, 0x20ea,
+	0x2100, 0x213a,
+	0x213d, 0x214b,
+	0x2153, 0x2183,
+	0x2190, 0x23ce,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x24fe,
+	0x2500, 0x2613,
+	0x2616, 0x2617,
+	0x2619, 0x267d,
+	0x2680, 0x2689,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27d0, 0x27eb,
+	0x27f0, 0x2aff,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x31f0, 0x321c,
+	0x3220, 0x3243,
+	0x3251, 0x327b,
+	0x327f, 0x32cb,
+	0x32d0, 0x32fe,
+	0x3300, 0x3376,
+	0x337b, 0x33dd,
+	0x33e0, 0x33fe,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fa5,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
+	0xfa30, 0xfa6a,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 0xfdfc,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe23,
+	0xfe30, 0xfe46,
+	0xfe49, 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, 0xffff,
+	0x10300, 0x1031e,
+	0x10320, 0x10323,
+	0x10330, 0x1034a,
+	0x10400, 0x10425,
+	0x10428, 0x1044d,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d12a, 0x1d1dd,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c0,
+	0x1d4c2, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a3,
+	0x1d6a8, 0x1d7c9,
+	0x1d7ce, 0x1d7ff,
+	0x1fffe, 0x2a6d6,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_3_2 */
+
+/* 'Age_4_0': Derived Age 4.0 */
+static const OnigCodePoint CR_Age_4_0[] = {
+	412,
+	0x0000, 0x0236,
+	0x0250, 0x0357,
+	0x035d, 0x036f,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x037e, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x03fb,
+	0x0400, 0x0486,
+	0x0488, 0x04ce,
+	0x04d0, 0x04f5,
+	0x04f8, 0x04f9,
+	0x0500, 0x050f,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05a1,
+	0x05a3, 0x05b9,
+	0x05bb, 0x05c4,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0603,
+	0x060c, 0x0615,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x0658,
+	0x0660, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x074f,
+	0x0780, 0x07b1,
+	0x0901, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cd,
+	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, 0x0bb5,
+	0x0bb7, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0be7, 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, 0x0fcf,
+	0x1000, 0x1021,
+	0x1023, 0x1027,
+	0x1029, 0x102a,
+	0x102c, 0x1032,
+	0x1036, 0x1039,
+	0x1040, 0x1059,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10f8,
+	0x10fb, 0x10fb,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	0x1200, 0x1206,
+	0x1208, 0x1246,
+	0x1248, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1286,
+	0x1288, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12ae,
+	0x12b0, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12ce,
+	0x12d0, 0x12d6,
+	0x12d8, 0x12ee,
+	0x12f0, 0x130e,
+	0x1310, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x131e,
+	0x1320, 0x1346,
+	0x1348, 0x135a,
+	0x1361, 0x137c,
+	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,
+	0x19e0, 0x19ff,
+	0x1d00, 0x1d6b,
+	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, 0x2054,
+	0x2057, 0x2057,
+	0x205f, 0x2063,
+	0x206a, 0x2071,
+	0x2074, 0x208e,
+	0x20a0, 0x20b1,
+	0x20d0, 0x20ea,
+	0x2100, 0x213b,
+	0x213d, 0x214b,
+	0x2153, 0x2183,
+	0x2190, 0x23d0,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x2617,
+	0x2619, 0x267d,
+	0x2680, 0x2691,
+	0x26a0, 0x26a1,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27d0, 0x27eb,
+	0x27f0, 0x2b0d,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x31f0, 0x321e,
+	0x3220, 0x3243,
+	0x3250, 0x327d,
+	0x327f, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fa5,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
+	0xfa30, 0xfa6a,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 0xfdfd,
+	0xfe00, 0xfe0f,
+	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, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1013f,
+	0x10300, 0x1031e,
+	0x10320, 0x10323,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x1039f, 0x1039f,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x1083f,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d12a, 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, 0x1d6a3,
+	0x1d6a8, 0x1d7c9,
+	0x1d7ce, 0x1d7ff,
+	0x1fffe, 0x2a6d6,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_4_0 */
+
+/* 'Age_4_1': Derived Age 4.1 */
+static const OnigCodePoint CR_Age_4_1[] = {
+	430,
+	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,
+	0xfdd0, 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, 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,
+	0x1fffe, 0x2a6d6,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_4_1 */
+
+/* 'Age_5_0': Derived Age 5.0 */
+static const OnigCodePoint CR_Age_5_0[] = {
+	440,
+	0x0000, 0x036f,
+	0x0374, 0x0375,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x0486,
+	0x0488, 0x0513,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 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,
+	0x07c0, 0x07fa,
+	0x0901, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x097b, 0x097f,
+	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, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
+	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,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1d00, 0x1dca,
+	0x1dfe, 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, 0x20ef,
+	0x2100, 0x214e,
+	0x2153, 0x2184,
+	0x2190, 0x23e7,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x269c,
+	0x26a0, 0x26b2,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27c0, 0x27ca,
+	0x27d0, 0x27eb,
+	0x27f0, 0x2b1a,
+	0x2b20, 0x2b23,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2c6c,
+	0x2c74, 0x2c77,
+	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, 0xa71a,
+	0xa720, 0xa721,
+	0xa800, 0xa82b,
+	0xa840, 0xa877,
+	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,
+	0xfdd0, 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, 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,
+	0x10900, 0x10919,
+	0x1091f, 0x1091f,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d12a, 0x1d1dd,
+	0x1d200, 0x1d245,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d371,
+	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, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x1fffe, 0x2a6d6,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_5_0 */
+
+/* 'Age_5_1': Derived Age 5.1 */
+static const OnigCodePoint CR_Age_5_1[] = {
+	455,
+	0x0000, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0523,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0603,
+	0x0606, 0x061b,
+	0x061e, 0x061f,
+	0x0621, 0x065e,
+	0x0660, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0901, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0972,
+	0x097b, 0x097f,
+	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,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+	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, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	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,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bfa,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c78, 0x0c7f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d66, 0x0d75,
+	0x0d79, 0x0d7f,
+	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, 0x0f6c,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fd4,
+	0x1000, 0x1099,
+	0x109e, 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, 0x18aa,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19a9,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19d9,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a1f,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1b80, 0x1baa,
+	0x1bae, 0x1bb9,
+	0x1c00, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1d00, 0x1de6,
+	0x1dfe, 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, 0x2064,
+	0x206a, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x2094,
+	0x20a0, 0x20b5,
+	0x20d0, 0x20f0,
+	0x2100, 0x214f,
+	0x2153, 0x2188,
+	0x2190, 0x23e7,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x269d,
+	0x26a0, 0x26bc,
+	0x26c0, 0x26c3,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27c0, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27d0, 0x2b4c,
+	0x2b50, 0x2b54,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2c6f,
+	0x2c71, 0x2c7d,
+	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,
+	0x2de0, 0x2e30,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x3243,
+	0x3250, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fc3,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa500, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa673,
+	0xa67c, 0xa697,
+	0xa700, 0xa78c,
+	0xa7fb, 0xa82b,
+	0xa840, 0xa877,
+	0xa880, 0xa8c4,
+	0xa8ce, 0xa8d9,
+	0xa900, 0xa953,
+	0xa95f, 0xa95f,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaa5f,
+	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,
+	0xfdd0, 0xfdfd,
+	0xfe00, 0xfe19,
+	0xfe20, 0xfe26,
+	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, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1018a,
+	0x10190, 0x1019b,
+	0x101d0, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	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,
+	0x10900, 0x10919,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d1dd,
+	0x1d200, 0x1d245,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d371,
+	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, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1fffe, 0x2a6d6,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_5_1 */
+
+/* 'Age_5_2': Derived Age 5.2 */
+static const OnigCodePoint CR_Age_5_2[] = {
+	495,
+	0x0000, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0525,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0603,
+	0x0606, 0x061b,
+	0x061e, 0x061f,
+	0x0621, 0x065e,
+	0x0660, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0900, 0x0939,
+	0x093c, 0x094e,
+	0x0950, 0x0955,
+	0x0958, 0x0972,
+	0x0979, 0x097f,
+	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, 0x09fb,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+	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, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	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,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bfa,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c78, 0x0c7f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d66, 0x0d75,
+	0x0d79, 0x0d7f,
+	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, 0x0f6c,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fd8,
+	0x1000, 0x10c5,
+	0x10d0, 0x10fc,
+	0x1100, 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,
+	0x1400, 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, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa0, 0x1aad,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1b80, 0x1baa,
+	0x1bae, 0x1bb9,
+	0x1c00, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cd0, 0x1cf2,
+	0x1d00, 0x1de6,
+	0x1dfd, 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, 0x2064,
+	0x206a, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x2094,
+	0x20a0, 0x20b8,
+	0x20d0, 0x20f0,
+	0x2100, 0x2189,
+	0x2190, 0x23e8,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26cd,
+	0x26cf, 0x26e1,
+	0x26e3, 0x26e3,
+	0x26e8, 0x26ff,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27c0, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27d0, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf1,
+	0x2cf9, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d6f,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e31,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa673,
+	0xa67c, 0xa697,
+	0xa6a0, 0xa6f7,
+	0xa700, 0xa78c,
+	0xa7fb, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c4,
+	0xa8ce, 0xa8d9,
+	0xa8e0, 0xa8fb,
+	0xa900, 0xa953,
+	0xa95f, 0xa97c,
+	0xa980, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9df,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaa7b,
+	0xaa80, 0xaac2,
+	0xaadb, 0xaadf,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xd800, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 0xfdfd,
+	0xfe00, 0xfe19,
+	0xfe20, 0xfe26,
+	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, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1018a,
+	0x10190, 0x1019b,
+	0x101d0, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	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, 0x10855,
+	0x10857, 0x1085f,
+	0x10900, 0x1091b,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+	0x10a60, 0x10a7f,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b55,
+	0x10b58, 0x10b72,
+	0x10b78, 0x10b7f,
+	0x10c00, 0x10c48,
+	0x10e60, 0x10e7e,
+	0x11080, 0x110c1,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d1dd,
+	0x1d200, 0x1d245,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d371,
+	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, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f131, 0x1f131,
+	0x1f13d, 0x1f13d,
+	0x1f13f, 0x1f13f,
+	0x1f142, 0x1f142,
+	0x1f146, 0x1f146,
+	0x1f14a, 0x1f14e,
+	0x1f157, 0x1f157,
+	0x1f15f, 0x1f15f,
+	0x1f179, 0x1f179,
+	0x1f17b, 0x1f17c,
+	0x1f17f, 0x1f17f,
+	0x1f18a, 0x1f18d,
+	0x1f190, 0x1f190,
+	0x1f200, 0x1f200,
+	0x1f210, 0x1f231,
+	0x1f240, 0x1f248,
+	0x1fffe, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_5_2 */
+
+/* 'Age_6_0': Derived Age 6.0 */
+static const OnigCodePoint CR_Age_6_0[] = {
+	511,
+	0x0000, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0603,
+	0x0606, 0x061b,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x0900, 0x0977,
+	0x0979, 0x097f,
+	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, 0x09fb,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+	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, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b77,
+	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,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bfa,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c78, 0x0c7f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d66, 0x0d75,
+	0x0d79, 0x0d7f,
+	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, 0x0f6c,
+	0x0f71, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fda,
+	0x1000, 0x10c5,
+	0x10d0, 0x10fc,
+	0x1100, 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,
+	0x135d, 0x137c,
+	0x1380, 0x1399,
+	0x13a0, 0x13f4,
+	0x1400, 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, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa0, 0x1aad,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1b80, 0x1baa,
+	0x1bae, 0x1bb9,
+	0x1bc0, 0x1bf3,
+	0x1bfc, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cd0, 0x1cf2,
+	0x1d00, 0x1de6,
+	0x1dfc, 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, 0x2064,
+	0x206a, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x209c,
+	0x20a0, 0x20b9,
+	0x20d0, 0x20f0,
+	0x2100, 0x2189,
+	0x2190, 0x23f3,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26ff,
+	0x2701, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27ce, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf1,
+	0x2cf9, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e31,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa673,
+	0xa67c, 0xa697,
+	0xa6a0, 0xa6f7,
+	0xa700, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c4,
+	0xa8ce, 0xa8d9,
+	0xa8e0, 0xa8fb,
+	0xa900, 0xa953,
+	0xa95f, 0xa97c,
+	0xa980, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9df,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaa7b,
+	0xaa80, 0xaac2,
+	0xaadb, 0xaadf,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xd800, 0xfa2d,
+	0xfa30, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbc1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 0xfdfd,
+	0xfe00, 0xfe19,
+	0xfe20, 0xfe26,
+	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, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1018a,
+	0x10190, 0x1019b,
+	0x101d0, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	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, 0x10855,
+	0x10857, 0x1085f,
+	0x10900, 0x1091b,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+	0x10a60, 0x10a7f,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b55,
+	0x10b58, 0x10b72,
+	0x10b78, 0x10b7f,
+	0x10c00, 0x10c48,
+	0x10e60, 0x10e7e,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x11080, 0x110c1,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d1dd,
+	0x1d200, 0x1d245,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d371,
+	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, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f169,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f5ff,
+	0x1f601, 0x1f610,
+	0x1f612, 0x1f614,
+	0x1f616, 0x1f616,
+	0x1f618, 0x1f618,
+	0x1f61a, 0x1f61a,
+	0x1f61c, 0x1f61e,
+	0x1f620, 0x1f625,
+	0x1f628, 0x1f62b,
+	0x1f62d, 0x1f62d,
+	0x1f630, 0x1f633,
+	0x1f635, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
+	0x1fffe, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_6_0 */
+
+/* 'Age_6_1': Derived Age 6.1 */
+static const OnigCodePoint CR_Age_6_1[] = {
+	549,
+	0x0000, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x058f, 0x058f,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0604,
+	0x0606, 0x061b,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x08e4, 0x08fe,
+	0x0900, 0x0977,
+	0x0979, 0x097f,
+	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, 0x09fb,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+	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, 0x0af1,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b77,
+	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,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bfa,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c78, 0x0c7f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d66, 0x0d75,
+	0x0d79, 0x0d7f,
+	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, 0x0edf,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fda,
+	0x1000, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 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,
+	0x135d, 0x137c,
+	0x1380, 0x1399,
+	0x13a0, 0x13f4,
+	0x1400, 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, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa0, 0x1aad,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1b80, 0x1bf3,
+	0x1bfc, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cc0, 0x1cc7,
+	0x1cd0, 0x1cf6,
+	0x1d00, 0x1de6,
+	0x1dfc, 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, 0x2064,
+	0x206a, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x209c,
+	0x20a0, 0x20b9,
+	0x20d0, 0x20f0,
+	0x2100, 0x2189,
+	0x2190, 0x23f3,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26ff,
+	0x2701, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf3,
+	0x2cf9, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e3b,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa697,
+	0xa69f, 0xa6f7,
+	0xa700, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c4,
+	0xa8ce, 0xa8d9,
+	0xa8e0, 0xa8fb,
+	0xa900, 0xa953,
+	0xa95f, 0xa97c,
+	0xa980, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9df,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaa7b,
+	0xaa80, 0xaac2,
+	0xaadb, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xd800, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbc1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 0xfdfd,
+	0xfe00, 0xfe19,
+	0xfe20, 0xfe26,
+	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, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1018a,
+	0x10190, 0x1019b,
+	0x101d0, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	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, 0x10855,
+	0x10857, 0x1085f,
+	0x10900, 0x1091b,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+	0x10a60, 0x10a7f,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b55,
+	0x10b58, 0x10b72,
+	0x10b78, 0x10b7f,
+	0x10c00, 0x10c48,
+	0x10e60, 0x10e7e,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x11080, 0x110c1,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x11143,
+	0x11180, 0x111c8,
+	0x111d0, 0x111d9,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+	0x1b000, 0x1b001,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d1dd,
+	0x1d200, 0x1d245,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d371,
+	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, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f16b,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f540, 0x1f543,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
+	0x1fffe, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_6_1 */
+
+/* 'Age_6_2': Derived Age 6.2 */
+static const OnigCodePoint CR_Age_6_2[] = {
+	549,
+	0x0000, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x058f, 0x058f,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0604,
+	0x0606, 0x061b,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x08e4, 0x08fe,
+	0x0900, 0x0977,
+	0x0979, 0x097f,
+	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, 0x09fb,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+	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, 0x0af1,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b77,
+	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,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bfa,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c78, 0x0c7f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d66, 0x0d75,
+	0x0d79, 0x0d7f,
+	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, 0x0edf,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fda,
+	0x1000, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 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,
+	0x135d, 0x137c,
+	0x1380, 0x1399,
+	0x13a0, 0x13f4,
+	0x1400, 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, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa0, 0x1aad,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1b80, 0x1bf3,
+	0x1bfc, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cc0, 0x1cc7,
+	0x1cd0, 0x1cf6,
+	0x1d00, 0x1de6,
+	0x1dfc, 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, 0x2064,
+	0x206a, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x209c,
+	0x20a0, 0x20ba,
+	0x20d0, 0x20f0,
+	0x2100, 0x2189,
+	0x2190, 0x23f3,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26ff,
+	0x2701, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf3,
+	0x2cf9, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e3b,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa697,
+	0xa69f, 0xa6f7,
+	0xa700, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c4,
+	0xa8ce, 0xa8d9,
+	0xa8e0, 0xa8fb,
+	0xa900, 0xa953,
+	0xa95f, 0xa97c,
+	0xa980, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9df,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaa7b,
+	0xaa80, 0xaac2,
+	0xaadb, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xd800, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbc1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 0xfdfd,
+	0xfe00, 0xfe19,
+	0xfe20, 0xfe26,
+	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, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1018a,
+	0x10190, 0x1019b,
+	0x101d0, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	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, 0x10855,
+	0x10857, 0x1085f,
+	0x10900, 0x1091b,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+	0x10a60, 0x10a7f,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b55,
+	0x10b58, 0x10b72,
+	0x10b78, 0x10b7f,
+	0x10c00, 0x10c48,
+	0x10e60, 0x10e7e,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x11080, 0x110c1,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x11143,
+	0x11180, 0x111c8,
+	0x111d0, 0x111d9,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+	0x1b000, 0x1b001,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d1dd,
+	0x1d200, 0x1d245,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d371,
+	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, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f16b,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f540, 0x1f543,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
+	0x1fffe, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_6_2 */
+
+/* 'Age_6_3': Derived Age 6.3 */
+static const OnigCodePoint CR_Age_6_3[] = {
+	549,
+	0x0000, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x058f, 0x058f,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0604,
+	0x0606, 0x061c,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x08e4, 0x08fe,
+	0x0900, 0x0977,
+	0x0979, 0x097f,
+	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, 0x09fb,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+	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, 0x0af1,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b77,
+	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,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bfa,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c78, 0x0c7f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d66, 0x0d75,
+	0x0d79, 0x0d7f,
+	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, 0x0edf,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fda,
+	0x1000, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 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,
+	0x135d, 0x137c,
+	0x1380, 0x1399,
+	0x13a0, 0x13f4,
+	0x1400, 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, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa0, 0x1aad,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1b80, 0x1bf3,
+	0x1bfc, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cc0, 0x1cc7,
+	0x1cd0, 0x1cf6,
+	0x1d00, 0x1de6,
+	0x1dfc, 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, 0x2064,
+	0x2066, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x209c,
+	0x20a0, 0x20ba,
+	0x20d0, 0x20f0,
+	0x2100, 0x2189,
+	0x2190, 0x23f3,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26ff,
+	0x2701, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf3,
+	0x2cf9, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e3b,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa697,
+	0xa69f, 0xa6f7,
+	0xa700, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c4,
+	0xa8ce, 0xa8d9,
+	0xa8e0, 0xa8fb,
+	0xa900, 0xa953,
+	0xa95f, 0xa97c,
+	0xa980, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9df,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaa7b,
+	0xaa80, 0xaac2,
+	0xaadb, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xd800, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbc1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 0xfdfd,
+	0xfe00, 0xfe19,
+	0xfe20, 0xfe26,
+	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, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1018a,
+	0x10190, 0x1019b,
+	0x101d0, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	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, 0x10855,
+	0x10857, 0x1085f,
+	0x10900, 0x1091b,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+	0x10a60, 0x10a7f,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b55,
+	0x10b58, 0x10b72,
+	0x10b78, 0x10b7f,
+	0x10c00, 0x10c48,
+	0x10e60, 0x10e7e,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x11080, 0x110c1,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x11143,
+	0x11180, 0x111c8,
+	0x111d0, 0x111d9,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+	0x1b000, 0x1b001,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d1dd,
+	0x1d200, 0x1d245,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d371,
+	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, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f16b,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f540, 0x1f543,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
+	0x1fffe, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_6_3 */
+
+/* 'Age_7_0': Derived Age 7.0 */
+static const OnigCodePoint CR_Age_7_0[] = {
+	610,
+	0x0000, 0x0377,
+	0x037a, 0x037f,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x052f,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x058d, 0x058f,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x061c,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x08a0, 0x08b2,
+	0x08e4, 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, 0x09fb,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+	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, 0x0af1,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b77,
+	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,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bfa,
+	0x0c00, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c78, 0x0c7f,
+	0x0c81, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
+	0x0d01, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d66, 0x0d75,
+	0x0d79, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0de6, 0x0def,
+	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, 0x0edf,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fda,
+	0x1000, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 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,
+	0x135d, 0x137c,
+	0x1380, 0x1399,
+	0x13a0, 0x13f4,
+	0x1400, 0x169c,
+	0x16a0, 0x16f8,
+	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, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191e,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa0, 0x1aad,
+	0x1ab0, 0x1abe,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1b80, 0x1bf3,
+	0x1bfc, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cc0, 0x1cc7,
+	0x1cd0, 0x1cf6,
+	0x1cf8, 0x1cf9,
+	0x1d00, 0x1df5,
+	0x1dfc, 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, 0x2064,
+	0x2066, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x209c,
+	0x20a0, 0x20bd,
+	0x20d0, 0x20f0,
+	0x2100, 0x2189,
+	0x2190, 0x23fa,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x2b73,
+	0x2b76, 0x2b95,
+	0x2b98, 0x2bb9,
+	0x2bbd, 0x2bc8,
+	0x2bca, 0x2bd1,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf3,
+	0x2cf9, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e42,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa69d,
+	0xa69f, 0xa6f7,
+	0xa700, 0xa78e,
+	0xa790, 0xa7ad,
+	0xa7b0, 0xa7b1,
+	0xa7f7, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c4,
+	0xa8ce, 0xa8d9,
+	0xa8e0, 0xa8fb,
+	0xa900, 0xa953,
+	0xa95f, 0xa97c,
+	0xa980, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9fe,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaac2,
+	0xaadb, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xab30, 0xab5f,
+	0xab64, 0xab65,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xd800, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbc1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 0xfdfd,
+	0xfe00, 0xfe19,
+	0xfe20, 0xfe2d,
+	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, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1018c,
+	0x10190, 0x1019b,
+	0x101a0, 0x101a0,
+	0x101d0, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x102e0, 0x102fb,
+	0x10300, 0x10323,
+	0x10330, 0x1034a,
+	0x10350, 0x1037a,
+	0x10380, 0x1039d,
+	0x1039f, 0x103c3,
+	0x103c8, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10500, 0x10527,
+	0x10530, 0x10563,
+	0x1056f, 0x1056f,
+	0x10600, 0x10736,
+	0x10740, 0x10755,
+	0x10760, 0x10767,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10857, 0x1089e,
+	0x108a7, 0x108af,
+	0x10900, 0x1091b,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+	0x10a60, 0x10a9f,
+	0x10ac0, 0x10ae6,
+	0x10aeb, 0x10af6,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b55,
+	0x10b58, 0x10b72,
+	0x10b78, 0x10b91,
+	0x10b99, 0x10b9c,
+	0x10ba9, 0x10baf,
+	0x10c00, 0x10c48,
+	0x10e60, 0x10e7e,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x1107f, 0x110c1,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x11143,
+	0x11150, 0x11176,
+	0x11180, 0x111c8,
+	0x111cd, 0x111cd,
+	0x111d0, 0x111da,
+	0x111e1, 0x111f4,
+	0x11200, 0x11211,
+	0x11213, 0x1123d,
+	0x112b0, 0x112ea,
+	0x112f0, 0x112f9,
+	0x11301, 0x11303,
+	0x11305, 0x1130c,
+	0x1130f, 0x11310,
+	0x11313, 0x11328,
+	0x1132a, 0x11330,
+	0x11332, 0x11333,
+	0x11335, 0x11339,
+	0x1133c, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11357, 0x11357,
+	0x1135d, 0x11363,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11480, 0x114c7,
+	0x114d0, 0x114d9,
+	0x11580, 0x115b5,
+	0x115b8, 0x115c9,
+	0x11600, 0x11644,
+	0x11650, 0x11659,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+	0x118a0, 0x118f2,
+	0x118ff, 0x118ff,
+	0x11ac0, 0x11af8,
+	0x12000, 0x12398,
+	0x12400, 0x1246e,
+	0x12470, 0x12474,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16a60, 0x16a69,
+	0x16a6e, 0x16a6f,
+	0x16ad0, 0x16aed,
+	0x16af0, 0x16af5,
+	0x16b00, 0x16b45,
+	0x16b50, 0x16b59,
+	0x16b5b, 0x16b61,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+	0x1b000, 0x1b001,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	0x1bc9c, 0x1bca3,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d1dd,
+	0x1d200, 0x1d245,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d371,
+	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, 0x1d7cb,
+	0x1d7ce, 0x1d7ff,
+	0x1e800, 0x1e8c4,
+	0x1e8c7, 0x1e8d6,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0bf,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0f5,
+	0x1f100, 0x1f10c,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f16b,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f32c,
+	0x1f330, 0x1f37d,
+	0x1f380, 0x1f3ce,
+	0x1f3d4, 0x1f3f7,
+	0x1f400, 0x1f4fe,
+	0x1f500, 0x1f54a,
+	0x1f550, 0x1f579,
+	0x1f57b, 0x1f5a3,
+	0x1f5a5, 0x1f642,
+	0x1f645, 0x1f6cf,
+	0x1f6e0, 0x1f6ec,
+	0x1f6f0, 0x1f6f3,
+	0x1f700, 0x1f773,
+	0x1f780, 0x1f7d4,
+	0x1f800, 0x1f80b,
+	0x1f810, 0x1f847,
+	0x1f850, 0x1f859,
+	0x1f860, 0x1f887,
+	0x1f890, 0x1f8ad,
+	0x1fffe, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_7_0 */
+
+/* 'Age_8_0': Derived Age 8.0 */
+static const OnigCodePoint CR_Age_8_0[] = {
+	623,
+	0x0000, 0x0377,
+	0x037a, 0x037f,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x052f,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x058d, 0x058f,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x061c,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x08a0, 0x08b4,
+	0x08e3, 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, 0x09fb,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+	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, 0x0af1,
+	0x0af9, 0x0af9,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b77,
+	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,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bfa,
+	0x0c00, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c5a,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c78, 0x0c7f,
+	0x0c81, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
+	0x0d01, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	0x0d57, 0x0d57,
+	0x0d5f, 0x0d63,
+	0x0d66, 0x0d75,
+	0x0d79, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0de6, 0x0def,
+	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, 0x0edf,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fda,
+	0x1000, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 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,
+	0x135d, 0x137c,
+	0x1380, 0x1399,
+	0x13a0, 0x13f5,
+	0x13f8, 0x13fd,
+	0x1400, 0x169c,
+	0x16a0, 0x16f8,
+	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, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191e,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa0, 0x1aad,
+	0x1ab0, 0x1abe,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1b80, 0x1bf3,
+	0x1bfc, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cc0, 0x1cc7,
+	0x1cd0, 0x1cf6,
+	0x1cf8, 0x1cf9,
+	0x1d00, 0x1df5,
+	0x1dfc, 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, 0x2064,
+	0x2066, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x209c,
+	0x20a0, 0x20be,
+	0x20d0, 0x20f0,
+	0x2100, 0x218b,
+	0x2190, 0x23fa,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x2b73,
+	0x2b76, 0x2b95,
+	0x2b98, 0x2bb9,
+	0x2bbd, 0x2bc8,
+	0x2bca, 0x2bd1,
+	0x2bec, 0x2bef,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf3,
+	0x2cf9, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e42,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fd5,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa6f7,
+	0xa700, 0xa7ad,
+	0xa7b0, 0xa7b7,
+	0xa7f7, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c4,
+	0xa8ce, 0xa8d9,
+	0xa8e0, 0xa8fd,
+	0xa900, 0xa953,
+	0xa95f, 0xa97c,
+	0xa980, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9fe,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaac2,
+	0xaadb, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xab30, 0xab65,
+	0xab70, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xd800, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbc1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 0xfdfd,
+	0xfe00, 0xfe19,
+	0xfe20, 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, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1018c,
+	0x10190, 0x1019b,
+	0x101a0, 0x101a0,
+	0x101d0, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x102e0, 0x102fb,
+	0x10300, 0x10323,
+	0x10330, 0x1034a,
+	0x10350, 0x1037a,
+	0x10380, 0x1039d,
+	0x1039f, 0x103c3,
+	0x103c8, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10500, 0x10527,
+	0x10530, 0x10563,
+	0x1056f, 0x1056f,
+	0x10600, 0x10736,
+	0x10740, 0x10755,
+	0x10760, 0x10767,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10857, 0x1089e,
+	0x108a7, 0x108af,
+	0x108e0, 0x108f2,
+	0x108f4, 0x108f5,
+	0x108fb, 0x1091b,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10980, 0x109b7,
+	0x109bc, 0x109cf,
+	0x109d2, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+	0x10a60, 0x10a9f,
+	0x10ac0, 0x10ae6,
+	0x10aeb, 0x10af6,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b55,
+	0x10b58, 0x10b72,
+	0x10b78, 0x10b91,
+	0x10b99, 0x10b9c,
+	0x10ba9, 0x10baf,
+	0x10c00, 0x10c48,
+	0x10c80, 0x10cb2,
+	0x10cc0, 0x10cf2,
+	0x10cfa, 0x10cff,
+	0x10e60, 0x10e7e,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x1107f, 0x110c1,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x11143,
+	0x11150, 0x11176,
+	0x11180, 0x111cd,
+	0x111d0, 0x111df,
+	0x111e1, 0x111f4,
+	0x11200, 0x11211,
+	0x11213, 0x1123d,
+	0x11280, 0x11286,
+	0x11288, 0x11288,
+	0x1128a, 0x1128d,
+	0x1128f, 0x1129d,
+	0x1129f, 0x112a9,
+	0x112b0, 0x112ea,
+	0x112f0, 0x112f9,
+	0x11300, 0x11303,
+	0x11305, 0x1130c,
+	0x1130f, 0x11310,
+	0x11313, 0x11328,
+	0x1132a, 0x11330,
+	0x11332, 0x11333,
+	0x11335, 0x11339,
+	0x1133c, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11350, 0x11350,
+	0x11357, 0x11357,
+	0x1135d, 0x11363,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11480, 0x114c7,
+	0x114d0, 0x114d9,
+	0x11580, 0x115b5,
+	0x115b8, 0x115dd,
+	0x11600, 0x11644,
+	0x11650, 0x11659,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+	0x11700, 0x11719,
+	0x1171d, 0x1172b,
+	0x11730, 0x1173f,
+	0x118a0, 0x118f2,
+	0x118ff, 0x118ff,
+	0x11ac0, 0x11af8,
+	0x12000, 0x12399,
+	0x12400, 0x1246e,
+	0x12470, 0x12474,
+	0x12480, 0x12543,
+	0x13000, 0x1342e,
+	0x14400, 0x14646,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16a60, 0x16a69,
+	0x16a6e, 0x16a6f,
+	0x16ad0, 0x16aed,
+	0x16af0, 0x16af5,
+	0x16b00, 0x16b45,
+	0x16b50, 0x16b59,
+	0x16b5b, 0x16b61,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+	0x1b000, 0x1b001,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	0x1bc9c, 0x1bca3,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d1e8,
+	0x1d200, 0x1d245,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d371,
+	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, 0x1d7cb,
+	0x1d7ce, 0x1da8b,
+	0x1da9b, 0x1da9f,
+	0x1daa1, 0x1daaf,
+	0x1e800, 0x1e8c4,
+	0x1e8c7, 0x1e8d6,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0bf,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0f5,
+	0x1f100, 0x1f10c,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f16b,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f579,
+	0x1f57b, 0x1f5a3,
+	0x1f5a5, 0x1f6d0,
+	0x1f6e0, 0x1f6ec,
+	0x1f6f0, 0x1f6f3,
+	0x1f700, 0x1f773,
+	0x1f780, 0x1f7d4,
+	0x1f800, 0x1f80b,
+	0x1f810, 0x1f847,
+	0x1f850, 0x1f859,
+	0x1f860, 0x1f887,
+	0x1f890, 0x1f8ad,
+	0x1f910, 0x1f918,
+	0x1f980, 0x1f984,
+	0x1f9c0, 0x1f9c0,
+	0x1fffe, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2b820, 0x2cea1,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_8_0 */
+
+/* 'Age_9_0': Derived Age 9.0 */
+static const OnigCodePoint CR_Age_9_0[] = {
+	648,
+	0x0000, 0x0377,
+	0x037a, 0x037f,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x052f,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x058d, 0x058f,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x061c,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x08a0, 0x08b4,
+	0x08b6, 0x08bd,
+	0x08d4, 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, 0x09fb,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+	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, 0x0af1,
+	0x0af9, 0x0af9,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b77,
+	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,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bfa,
+	0x0c00, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c5a,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c78, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
+	0x0d01, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4f,
+	0x0d54, 0x0d63,
+	0x0d66, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0de6, 0x0def,
+	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, 0x0edf,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fda,
+	0x1000, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 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,
+	0x135d, 0x137c,
+	0x1380, 0x1399,
+	0x13a0, 0x13f5,
+	0x13f8, 0x13fd,
+	0x1400, 0x169c,
+	0x16a0, 0x16f8,
+	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, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191e,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa0, 0x1aad,
+	0x1ab0, 0x1abe,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1b80, 0x1bf3,
+	0x1bfc, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c88,
+	0x1cc0, 0x1cc7,
+	0x1cd0, 0x1cf6,
+	0x1cf8, 0x1cf9,
+	0x1d00, 0x1df5,
+	0x1dfb, 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, 0x2064,
+	0x2066, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x209c,
+	0x20a0, 0x20be,
+	0x20d0, 0x20f0,
+	0x2100, 0x218b,
+	0x2190, 0x23fe,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x2b73,
+	0x2b76, 0x2b95,
+	0x2b98, 0x2bb9,
+	0x2bbd, 0x2bc8,
+	0x2bca, 0x2bd1,
+	0x2bec, 0x2bef,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf3,
+	0x2cf9, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e44,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fd5,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa6f7,
+	0xa700, 0xa7ae,
+	0xa7b0, 0xa7b7,
+	0xa7f7, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c5,
+	0xa8ce, 0xa8d9,
+	0xa8e0, 0xa8fd,
+	0xa900, 0xa953,
+	0xa95f, 0xa97c,
+	0xa980, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9fe,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaac2,
+	0xaadb, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xab30, 0xab65,
+	0xab70, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xd800, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbc1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 0xfdfd,
+	0xfe00, 0xfe19,
+	0xfe20, 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, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1018e,
+	0x10190, 0x1019b,
+	0x101a0, 0x101a0,
+	0x101d0, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x102e0, 0x102fb,
+	0x10300, 0x10323,
+	0x10330, 0x1034a,
+	0x10350, 0x1037a,
+	0x10380, 0x1039d,
+	0x1039f, 0x103c3,
+	0x103c8, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x104b0, 0x104d3,
+	0x104d8, 0x104fb,
+	0x10500, 0x10527,
+	0x10530, 0x10563,
+	0x1056f, 0x1056f,
+	0x10600, 0x10736,
+	0x10740, 0x10755,
+	0x10760, 0x10767,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10857, 0x1089e,
+	0x108a7, 0x108af,
+	0x108e0, 0x108f2,
+	0x108f4, 0x108f5,
+	0x108fb, 0x1091b,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10980, 0x109b7,
+	0x109bc, 0x109cf,
+	0x109d2, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+	0x10a60, 0x10a9f,
+	0x10ac0, 0x10ae6,
+	0x10aeb, 0x10af6,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b55,
+	0x10b58, 0x10b72,
+	0x10b78, 0x10b91,
+	0x10b99, 0x10b9c,
+	0x10ba9, 0x10baf,
+	0x10c00, 0x10c48,
+	0x10c80, 0x10cb2,
+	0x10cc0, 0x10cf2,
+	0x10cfa, 0x10cff,
+	0x10e60, 0x10e7e,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x1107f, 0x110c1,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x11143,
+	0x11150, 0x11176,
+	0x11180, 0x111cd,
+	0x111d0, 0x111df,
+	0x111e1, 0x111f4,
+	0x11200, 0x11211,
+	0x11213, 0x1123e,
+	0x11280, 0x11286,
+	0x11288, 0x11288,
+	0x1128a, 0x1128d,
+	0x1128f, 0x1129d,
+	0x1129f, 0x112a9,
+	0x112b0, 0x112ea,
+	0x112f0, 0x112f9,
+	0x11300, 0x11303,
+	0x11305, 0x1130c,
+	0x1130f, 0x11310,
+	0x11313, 0x11328,
+	0x1132a, 0x11330,
+	0x11332, 0x11333,
+	0x11335, 0x11339,
+	0x1133c, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11350, 0x11350,
+	0x11357, 0x11357,
+	0x1135d, 0x11363,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11400, 0x11459,
+	0x1145b, 0x1145b,
+	0x1145d, 0x1145d,
+	0x11480, 0x114c7,
+	0x114d0, 0x114d9,
+	0x11580, 0x115b5,
+	0x115b8, 0x115dd,
+	0x11600, 0x11644,
+	0x11650, 0x11659,
+	0x11660, 0x1166c,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+	0x11700, 0x11719,
+	0x1171d, 0x1172b,
+	0x11730, 0x1173f,
+	0x118a0, 0x118f2,
+	0x118ff, 0x118ff,
+	0x11ac0, 0x11af8,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c36,
+	0x11c38, 0x11c45,
+	0x11c50, 0x11c6c,
+	0x11c70, 0x11c8f,
+	0x11c92, 0x11ca7,
+	0x11ca9, 0x11cb6,
+	0x12000, 0x12399,
+	0x12400, 0x1246e,
+	0x12470, 0x12474,
+	0x12480, 0x12543,
+	0x13000, 0x1342e,
+	0x14400, 0x14646,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16a60, 0x16a69,
+	0x16a6e, 0x16a6f,
+	0x16ad0, 0x16aed,
+	0x16af0, 0x16af5,
+	0x16b00, 0x16b45,
+	0x16b50, 0x16b59,
+	0x16b5b, 0x16b61,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+	0x16fe0, 0x16fe0,
+	0x17000, 0x187ec,
+	0x18800, 0x18af2,
+	0x1b000, 0x1b001,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	0x1bc9c, 0x1bca3,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d1e8,
+	0x1d200, 0x1d245,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d371,
+	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, 0x1d7cb,
+	0x1d7ce, 0x1da8b,
+	0x1da9b, 0x1da9f,
+	0x1daa1, 0x1daaf,
+	0x1e000, 0x1e006,
+	0x1e008, 0x1e018,
+	0x1e01b, 0x1e021,
+	0x1e023, 0x1e024,
+	0x1e026, 0x1e02a,
+	0x1e800, 0x1e8c4,
+	0x1e8c7, 0x1e8d6,
+	0x1e900, 0x1e94a,
+	0x1e950, 0x1e959,
+	0x1e95e, 0x1e95f,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0bf,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0f5,
+	0x1f100, 0x1f10c,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f16b,
+	0x1f170, 0x1f1ac,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23b,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f6d2,
+	0x1f6e0, 0x1f6ec,
+	0x1f6f0, 0x1f6f6,
+	0x1f700, 0x1f773,
+	0x1f780, 0x1f7d4,
+	0x1f800, 0x1f80b,
+	0x1f810, 0x1f847,
+	0x1f850, 0x1f859,
+	0x1f860, 0x1f887,
+	0x1f890, 0x1f8ad,
+	0x1f910, 0x1f91e,
+	0x1f920, 0x1f927,
+	0x1f930, 0x1f930,
+	0x1f933, 0x1f93e,
+	0x1f940, 0x1f94b,
+	0x1f950, 0x1f95e,
+	0x1f980, 0x1f991,
+	0x1f9c0, 0x1f9c0,
+	0x1fffe, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2b820, 0x2cea1,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_9_0 */
+
+/* 'Age_10_0': Derived Age 10.0 */
+static const OnigCodePoint CR_Age_10_0[] = {
+	659,
+	0x0000, 0x0377,
+	0x037a, 0x037f,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x052f,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x058d, 0x058f,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x061c,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x0860, 0x086a,
+	0x08a0, 0x08b4,
+	0x08b6, 0x08bd,
+	0x08d4, 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, 0x09fd,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a75,
+	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, 0x0af1,
+	0x0af9, 0x0aff,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b77,
+	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,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bfa,
+	0x0c00, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c5a,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c78, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
+	0x0d00, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4f,
+	0x0d54, 0x0d63,
+	0x0d66, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0de6, 0x0def,
+	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, 0x0edf,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fda,
+	0x1000, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 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,
+	0x135d, 0x137c,
+	0x1380, 0x1399,
+	0x13a0, 0x13f5,
+	0x13f8, 0x13fd,
+	0x1400, 0x169c,
+	0x16a0, 0x16f8,
+	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, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191e,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa0, 0x1aad,
+	0x1ab0, 0x1abe,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1b80, 0x1bf3,
+	0x1bfc, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c88,
+	0x1cc0, 0x1cc7,
+	0x1cd0, 0x1cf9,
+	0x1d00, 0x1df9,
+	0x1dfb, 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, 0x2064,
+	0x2066, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x209c,
+	0x20a0, 0x20bf,
+	0x20d0, 0x20f0,
+	0x2100, 0x218b,
+	0x2190, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x2b73,
+	0x2b76, 0x2b95,
+	0x2b98, 0x2bb9,
+	0x2bbd, 0x2bc8,
+	0x2bca, 0x2bd2,
+	0x2bec, 0x2bef,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf3,
+	0x2cf9, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e49,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312e,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fea,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa6f7,
+	0xa700, 0xa7ae,
+	0xa7b0, 0xa7b7,
+	0xa7f7, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c5,
+	0xa8ce, 0xa8d9,
+	0xa8e0, 0xa8fd,
+	0xa900, 0xa953,
+	0xa95f, 0xa97c,
+	0xa980, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9fe,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaac2,
+	0xaadb, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xab30, 0xab65,
+	0xab70, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xd800, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbc1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 0xfdfd,
+	0xfe00, 0xfe19,
+	0xfe20, 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, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1018e,
+	0x10190, 0x1019b,
+	0x101a0, 0x101a0,
+	0x101d0, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x102e0, 0x102fb,
+	0x10300, 0x10323,
+	0x1032d, 0x1034a,
+	0x10350, 0x1037a,
+	0x10380, 0x1039d,
+	0x1039f, 0x103c3,
+	0x103c8, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x104b0, 0x104d3,
+	0x104d8, 0x104fb,
+	0x10500, 0x10527,
+	0x10530, 0x10563,
+	0x1056f, 0x1056f,
+	0x10600, 0x10736,
+	0x10740, 0x10755,
+	0x10760, 0x10767,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10857, 0x1089e,
+	0x108a7, 0x108af,
+	0x108e0, 0x108f2,
+	0x108f4, 0x108f5,
+	0x108fb, 0x1091b,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10980, 0x109b7,
+	0x109bc, 0x109cf,
+	0x109d2, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+	0x10a60, 0x10a9f,
+	0x10ac0, 0x10ae6,
+	0x10aeb, 0x10af6,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b55,
+	0x10b58, 0x10b72,
+	0x10b78, 0x10b91,
+	0x10b99, 0x10b9c,
+	0x10ba9, 0x10baf,
+	0x10c00, 0x10c48,
+	0x10c80, 0x10cb2,
+	0x10cc0, 0x10cf2,
+	0x10cfa, 0x10cff,
+	0x10e60, 0x10e7e,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x1107f, 0x110c1,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x11143,
+	0x11150, 0x11176,
+	0x11180, 0x111cd,
+	0x111d0, 0x111df,
+	0x111e1, 0x111f4,
+	0x11200, 0x11211,
+	0x11213, 0x1123e,
+	0x11280, 0x11286,
+	0x11288, 0x11288,
+	0x1128a, 0x1128d,
+	0x1128f, 0x1129d,
+	0x1129f, 0x112a9,
+	0x112b0, 0x112ea,
+	0x112f0, 0x112f9,
+	0x11300, 0x11303,
+	0x11305, 0x1130c,
+	0x1130f, 0x11310,
+	0x11313, 0x11328,
+	0x1132a, 0x11330,
+	0x11332, 0x11333,
+	0x11335, 0x11339,
+	0x1133c, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11350, 0x11350,
+	0x11357, 0x11357,
+	0x1135d, 0x11363,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11400, 0x11459,
+	0x1145b, 0x1145b,
+	0x1145d, 0x1145d,
+	0x11480, 0x114c7,
+	0x114d0, 0x114d9,
+	0x11580, 0x115b5,
+	0x115b8, 0x115dd,
+	0x11600, 0x11644,
+	0x11650, 0x11659,
+	0x11660, 0x1166c,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+	0x11700, 0x11719,
+	0x1171d, 0x1172b,
+	0x11730, 0x1173f,
+	0x118a0, 0x118f2,
+	0x118ff, 0x118ff,
+	0x11a00, 0x11a47,
+	0x11a50, 0x11a83,
+	0x11a86, 0x11a9c,
+	0x11a9e, 0x11aa2,
+	0x11ac0, 0x11af8,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c36,
+	0x11c38, 0x11c45,
+	0x11c50, 0x11c6c,
+	0x11c70, 0x11c8f,
+	0x11c92, 0x11ca7,
+	0x11ca9, 0x11cb6,
+	0x11d00, 0x11d06,
+	0x11d08, 0x11d09,
+	0x11d0b, 0x11d36,
+	0x11d3a, 0x11d3a,
+	0x11d3c, 0x11d3d,
+	0x11d3f, 0x11d47,
+	0x11d50, 0x11d59,
+	0x12000, 0x12399,
+	0x12400, 0x1246e,
+	0x12470, 0x12474,
+	0x12480, 0x12543,
+	0x13000, 0x1342e,
+	0x14400, 0x14646,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16a60, 0x16a69,
+	0x16a6e, 0x16a6f,
+	0x16ad0, 0x16aed,
+	0x16af0, 0x16af5,
+	0x16b00, 0x16b45,
+	0x16b50, 0x16b59,
+	0x16b5b, 0x16b61,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+	0x16fe0, 0x16fe1,
+	0x17000, 0x187ec,
+	0x18800, 0x18af2,
+	0x1b000, 0x1b11e,
+	0x1b170, 0x1b2fb,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	0x1bc9c, 0x1bca3,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d1e8,
+	0x1d200, 0x1d245,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d371,
+	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, 0x1d7cb,
+	0x1d7ce, 0x1da8b,
+	0x1da9b, 0x1da9f,
+	0x1daa1, 0x1daaf,
+	0x1e000, 0x1e006,
+	0x1e008, 0x1e018,
+	0x1e01b, 0x1e021,
+	0x1e023, 0x1e024,
+	0x1e026, 0x1e02a,
+	0x1e800, 0x1e8c4,
+	0x1e8c7, 0x1e8d6,
+	0x1e900, 0x1e94a,
+	0x1e950, 0x1e959,
+	0x1e95e, 0x1e95f,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0bf,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0f5,
+	0x1f100, 0x1f10c,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f16b,
+	0x1f170, 0x1f1ac,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23b,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f260, 0x1f265,
+	0x1f300, 0x1f6d4,
+	0x1f6e0, 0x1f6ec,
+	0x1f6f0, 0x1f6f8,
+	0x1f700, 0x1f773,
+	0x1f780, 0x1f7d4,
+	0x1f800, 0x1f80b,
+	0x1f810, 0x1f847,
+	0x1f850, 0x1f859,
+	0x1f860, 0x1f887,
+	0x1f890, 0x1f8ad,
+	0x1f900, 0x1f90b,
+	0x1f910, 0x1f93e,
+	0x1f940, 0x1f94c,
+	0x1f950, 0x1f96b,
+	0x1f980, 0x1f997,
+	0x1f9c0, 0x1f9c0,
+	0x1f9d0, 0x1f9e6,
+	0x1fffe, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2b820, 0x2cea1,
+	0x2ceb0, 0x2ebe0,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_10_0 */
+
+/* 'Age_11_0': Derived Age 11.0 */
+static const OnigCodePoint CR_Age_11_0[] = {
+	668,
+	0x0000, 0x0377,
+	0x037a, 0x037f,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x052f,
+	0x0531, 0x0556,
+	0x0559, 0x058a,
+	0x058d, 0x058f,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05ef, 0x05f4,
+	0x0600, 0x061c,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x07fd, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x0860, 0x086a,
+	0x08a0, 0x08b4,
+	0x08b6, 0x08bd,
+	0x08d3, 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, 0x09fe,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a76,
+	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, 0x0af1,
+	0x0af9, 0x0aff,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b77,
+	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,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bfa,
+	0x0c00, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c5a,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c78, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
+	0x0d00, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4f,
+	0x0d54, 0x0d63,
+	0x0d66, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0de6, 0x0def,
+	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, 0x0edf,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fda,
+	0x1000, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 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,
+	0x135d, 0x137c,
+	0x1380, 0x1399,
+	0x13a0, 0x13f5,
+	0x13f8, 0x13fd,
+	0x1400, 0x169c,
+	0x16a0, 0x16f8,
+	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, 0x1878,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191e,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa0, 0x1aad,
+	0x1ab0, 0x1abe,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1b80, 0x1bf3,
+	0x1bfc, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c88,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cc7,
+	0x1cd0, 0x1cf9,
+	0x1d00, 0x1df9,
+	0x1dfb, 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, 0x2064,
+	0x2066, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x209c,
+	0x20a0, 0x20bf,
+	0x20d0, 0x20f0,
+	0x2100, 0x218b,
+	0x2190, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x2b73,
+	0x2b76, 0x2b95,
+	0x2b98, 0x2bc8,
+	0x2bca, 0x2bfe,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf3,
+	0x2cf9, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e4e,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312f,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fef,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa6f7,
+	0xa700, 0xa7b9,
+	0xa7f7, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c5,
+	0xa8ce, 0xa8d9,
+	0xa8e0, 0xa953,
+	0xa95f, 0xa97c,
+	0xa980, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9fe,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaac2,
+	0xaadb, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xab30, 0xab65,
+	0xab70, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xd800, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbc1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 0xfdfd,
+	0xfe00, 0xfe19,
+	0xfe20, 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, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1018e,
+	0x10190, 0x1019b,
+	0x101a0, 0x101a0,
+	0x101d0, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x102e0, 0x102fb,
+	0x10300, 0x10323,
+	0x1032d, 0x1034a,
+	0x10350, 0x1037a,
+	0x10380, 0x1039d,
+	0x1039f, 0x103c3,
+	0x103c8, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x104b0, 0x104d3,
+	0x104d8, 0x104fb,
+	0x10500, 0x10527,
+	0x10530, 0x10563,
+	0x1056f, 0x1056f,
+	0x10600, 0x10736,
+	0x10740, 0x10755,
+	0x10760, 0x10767,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10857, 0x1089e,
+	0x108a7, 0x108af,
+	0x108e0, 0x108f2,
+	0x108f4, 0x108f5,
+	0x108fb, 0x1091b,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10980, 0x109b7,
+	0x109bc, 0x109cf,
+	0x109d2, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a35,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a48,
+	0x10a50, 0x10a58,
+	0x10a60, 0x10a9f,
+	0x10ac0, 0x10ae6,
+	0x10aeb, 0x10af6,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b55,
+	0x10b58, 0x10b72,
+	0x10b78, 0x10b91,
+	0x10b99, 0x10b9c,
+	0x10ba9, 0x10baf,
+	0x10c00, 0x10c48,
+	0x10c80, 0x10cb2,
+	0x10cc0, 0x10cf2,
+	0x10cfa, 0x10d27,
+	0x10d30, 0x10d39,
+	0x10e60, 0x10e7e,
+	0x10f00, 0x10f27,
+	0x10f30, 0x10f59,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x1107f, 0x110c1,
+	0x110cd, 0x110cd,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x11146,
+	0x11150, 0x11176,
+	0x11180, 0x111cd,
+	0x111d0, 0x111df,
+	0x111e1, 0x111f4,
+	0x11200, 0x11211,
+	0x11213, 0x1123e,
+	0x11280, 0x11286,
+	0x11288, 0x11288,
+	0x1128a, 0x1128d,
+	0x1128f, 0x1129d,
+	0x1129f, 0x112a9,
+	0x112b0, 0x112ea,
+	0x112f0, 0x112f9,
+	0x11300, 0x11303,
+	0x11305, 0x1130c,
+	0x1130f, 0x11310,
+	0x11313, 0x11328,
+	0x1132a, 0x11330,
+	0x11332, 0x11333,
+	0x11335, 0x11339,
+	0x1133b, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11350, 0x11350,
+	0x11357, 0x11357,
+	0x1135d, 0x11363,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11400, 0x11459,
+	0x1145b, 0x1145b,
+	0x1145d, 0x1145e,
+	0x11480, 0x114c7,
+	0x114d0, 0x114d9,
+	0x11580, 0x115b5,
+	0x115b8, 0x115dd,
+	0x11600, 0x11644,
+	0x11650, 0x11659,
+	0x11660, 0x1166c,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+	0x11700, 0x1171a,
+	0x1171d, 0x1172b,
+	0x11730, 0x1173f,
+	0x11800, 0x1183b,
+	0x118a0, 0x118f2,
+	0x118ff, 0x118ff,
+	0x11a00, 0x11a47,
+	0x11a50, 0x11a83,
+	0x11a86, 0x11aa2,
+	0x11ac0, 0x11af8,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c36,
+	0x11c38, 0x11c45,
+	0x11c50, 0x11c6c,
+	0x11c70, 0x11c8f,
+	0x11c92, 0x11ca7,
+	0x11ca9, 0x11cb6,
+	0x11d00, 0x11d06,
+	0x11d08, 0x11d09,
+	0x11d0b, 0x11d36,
+	0x11d3a, 0x11d3a,
+	0x11d3c, 0x11d3d,
+	0x11d3f, 0x11d47,
+	0x11d50, 0x11d59,
+	0x11d60, 0x11d65,
+	0x11d67, 0x11d68,
+	0x11d6a, 0x11d8e,
+	0x11d90, 0x11d91,
+	0x11d93, 0x11d98,
+	0x11da0, 0x11da9,
+	0x11ee0, 0x11ef8,
+	0x12000, 0x12399,
+	0x12400, 0x1246e,
+	0x12470, 0x12474,
+	0x12480, 0x12543,
+	0x13000, 0x1342e,
+	0x14400, 0x14646,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16a60, 0x16a69,
+	0x16a6e, 0x16a6f,
+	0x16ad0, 0x16aed,
+	0x16af0, 0x16af5,
+	0x16b00, 0x16b45,
+	0x16b50, 0x16b59,
+	0x16b5b, 0x16b61,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16e40, 0x16e9a,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+	0x16fe0, 0x16fe1,
+	0x17000, 0x187f1,
+	0x18800, 0x18af2,
+	0x1b000, 0x1b11e,
+	0x1b170, 0x1b2fb,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	0x1bc9c, 0x1bca3,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d1e8,
+	0x1d200, 0x1d245,
+	0x1d2e0, 0x1d2f3,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d378,
+	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, 0x1d7cb,
+	0x1d7ce, 0x1da8b,
+	0x1da9b, 0x1da9f,
+	0x1daa1, 0x1daaf,
+	0x1e000, 0x1e006,
+	0x1e008, 0x1e018,
+	0x1e01b, 0x1e021,
+	0x1e023, 0x1e024,
+	0x1e026, 0x1e02a,
+	0x1e800, 0x1e8c4,
+	0x1e8c7, 0x1e8d6,
+	0x1e900, 0x1e94a,
+	0x1e950, 0x1e959,
+	0x1e95e, 0x1e95f,
+	0x1ec71, 0x1ecb4,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0bf,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0f5,
+	0x1f100, 0x1f10c,
+	0x1f110, 0x1f16b,
+	0x1f170, 0x1f1ac,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23b,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f260, 0x1f265,
+	0x1f300, 0x1f6d4,
+	0x1f6e0, 0x1f6ec,
+	0x1f6f0, 0x1f6f9,
+	0x1f700, 0x1f773,
+	0x1f780, 0x1f7d8,
+	0x1f800, 0x1f80b,
+	0x1f810, 0x1f847,
+	0x1f850, 0x1f859,
+	0x1f860, 0x1f887,
+	0x1f890, 0x1f8ad,
+	0x1f900, 0x1f90b,
+	0x1f910, 0x1f93e,
+	0x1f940, 0x1f970,
+	0x1f973, 0x1f976,
+	0x1f97a, 0x1f97a,
+	0x1f97c, 0x1f9a2,
+	0x1f9b0, 0x1f9b9,
+	0x1f9c0, 0x1f9c2,
+	0x1f9d0, 0x1f9ff,
+	0x1fa60, 0x1fa6d,
+	0x1fffe, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2b820, 0x2cea1,
+	0x2ceb0, 0x2ebe0,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_11_0 */
+
+/* 'Age_12_0': Derived Age 12.0 */
+static const OnigCodePoint CR_Age_12_0[] = {
+	677,
+	0x0000, 0x0377,
+	0x037a, 0x037f,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x052f,
+	0x0531, 0x0556,
+	0x0559, 0x058a,
+	0x058d, 0x058f,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05ef, 0x05f4,
+	0x0600, 0x061c,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x07fd, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x0860, 0x086a,
+	0x08a0, 0x08b4,
+	0x08b6, 0x08bd,
+	0x08d3, 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, 0x09fe,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a76,
+	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, 0x0af1,
+	0x0af9, 0x0aff,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b77,
+	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,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bfa,
+	0x0c00, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c5a,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c77, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
+	0x0d00, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4f,
+	0x0d54, 0x0d63,
+	0x0d66, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0de6, 0x0def,
+	0x0df2, 0x0df4,
+	0x0e01, 0x0e3a,
+	0x0e3f, 0x0e5b,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e86, 0x0e8a,
+	0x0e8c, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edf,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fda,
+	0x1000, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 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,
+	0x135d, 0x137c,
+	0x1380, 0x1399,
+	0x13a0, 0x13f5,
+	0x13f8, 0x13fd,
+	0x1400, 0x169c,
+	0x16a0, 0x16f8,
+	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, 0x1878,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191e,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa0, 0x1aad,
+	0x1ab0, 0x1abe,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1b80, 0x1bf3,
+	0x1bfc, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c88,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cc7,
+	0x1cd0, 0x1cfa,
+	0x1d00, 0x1df9,
+	0x1dfb, 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, 0x2064,
+	0x2066, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x209c,
+	0x20a0, 0x20bf,
+	0x20d0, 0x20f0,
+	0x2100, 0x218b,
+	0x2190, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x2b73,
+	0x2b76, 0x2b95,
+	0x2b98, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf3,
+	0x2cf9, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e4f,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312f,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fef,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa6f7,
+	0xa700, 0xa7bf,
+	0xa7c2, 0xa7c6,
+	0xa7f7, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c5,
+	0xa8ce, 0xa8d9,
+	0xa8e0, 0xa953,
+	0xa95f, 0xa97c,
+	0xa980, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9fe,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaac2,
+	0xaadb, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xab30, 0xab67,
+	0xab70, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xd800, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbc1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 0xfdfd,
+	0xfe00, 0xfe19,
+	0xfe20, 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, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1018e,
+	0x10190, 0x1019b,
+	0x101a0, 0x101a0,
+	0x101d0, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x102e0, 0x102fb,
+	0x10300, 0x10323,
+	0x1032d, 0x1034a,
+	0x10350, 0x1037a,
+	0x10380, 0x1039d,
+	0x1039f, 0x103c3,
+	0x103c8, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x104b0, 0x104d3,
+	0x104d8, 0x104fb,
+	0x10500, 0x10527,
+	0x10530, 0x10563,
+	0x1056f, 0x1056f,
+	0x10600, 0x10736,
+	0x10740, 0x10755,
+	0x10760, 0x10767,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10857, 0x1089e,
+	0x108a7, 0x108af,
+	0x108e0, 0x108f2,
+	0x108f4, 0x108f5,
+	0x108fb, 0x1091b,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10980, 0x109b7,
+	0x109bc, 0x109cf,
+	0x109d2, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a35,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a48,
+	0x10a50, 0x10a58,
+	0x10a60, 0x10a9f,
+	0x10ac0, 0x10ae6,
+	0x10aeb, 0x10af6,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b55,
+	0x10b58, 0x10b72,
+	0x10b78, 0x10b91,
+	0x10b99, 0x10b9c,
+	0x10ba9, 0x10baf,
+	0x10c00, 0x10c48,
+	0x10c80, 0x10cb2,
+	0x10cc0, 0x10cf2,
+	0x10cfa, 0x10d27,
+	0x10d30, 0x10d39,
+	0x10e60, 0x10e7e,
+	0x10f00, 0x10f27,
+	0x10f30, 0x10f59,
+	0x10fe0, 0x10ff6,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x1107f, 0x110c1,
+	0x110cd, 0x110cd,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x11146,
+	0x11150, 0x11176,
+	0x11180, 0x111cd,
+	0x111d0, 0x111df,
+	0x111e1, 0x111f4,
+	0x11200, 0x11211,
+	0x11213, 0x1123e,
+	0x11280, 0x11286,
+	0x11288, 0x11288,
+	0x1128a, 0x1128d,
+	0x1128f, 0x1129d,
+	0x1129f, 0x112a9,
+	0x112b0, 0x112ea,
+	0x112f0, 0x112f9,
+	0x11300, 0x11303,
+	0x11305, 0x1130c,
+	0x1130f, 0x11310,
+	0x11313, 0x11328,
+	0x1132a, 0x11330,
+	0x11332, 0x11333,
+	0x11335, 0x11339,
+	0x1133b, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11350, 0x11350,
+	0x11357, 0x11357,
+	0x1135d, 0x11363,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11400, 0x11459,
+	0x1145b, 0x1145b,
+	0x1145d, 0x1145f,
+	0x11480, 0x114c7,
+	0x114d0, 0x114d9,
+	0x11580, 0x115b5,
+	0x115b8, 0x115dd,
+	0x11600, 0x11644,
+	0x11650, 0x11659,
+	0x11660, 0x1166c,
+	0x11680, 0x116b8,
+	0x116c0, 0x116c9,
+	0x11700, 0x1171a,
+	0x1171d, 0x1172b,
+	0x11730, 0x1173f,
+	0x11800, 0x1183b,
+	0x118a0, 0x118f2,
+	0x118ff, 0x118ff,
+	0x119a0, 0x119a7,
+	0x119aa, 0x119d7,
+	0x119da, 0x119e4,
+	0x11a00, 0x11a47,
+	0x11a50, 0x11aa2,
+	0x11ac0, 0x11af8,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c36,
+	0x11c38, 0x11c45,
+	0x11c50, 0x11c6c,
+	0x11c70, 0x11c8f,
+	0x11c92, 0x11ca7,
+	0x11ca9, 0x11cb6,
+	0x11d00, 0x11d06,
+	0x11d08, 0x11d09,
+	0x11d0b, 0x11d36,
+	0x11d3a, 0x11d3a,
+	0x11d3c, 0x11d3d,
+	0x11d3f, 0x11d47,
+	0x11d50, 0x11d59,
+	0x11d60, 0x11d65,
+	0x11d67, 0x11d68,
+	0x11d6a, 0x11d8e,
+	0x11d90, 0x11d91,
+	0x11d93, 0x11d98,
+	0x11da0, 0x11da9,
+	0x11ee0, 0x11ef8,
+	0x11fc0, 0x11ff1,
+	0x11fff, 0x12399,
+	0x12400, 0x1246e,
+	0x12470, 0x12474,
+	0x12480, 0x12543,
+	0x13000, 0x1342e,
+	0x13430, 0x13438,
+	0x14400, 0x14646,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16a60, 0x16a69,
+	0x16a6e, 0x16a6f,
+	0x16ad0, 0x16aed,
+	0x16af0, 0x16af5,
+	0x16b00, 0x16b45,
+	0x16b50, 0x16b59,
+	0x16b5b, 0x16b61,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16e40, 0x16e9a,
+	0x16f00, 0x16f4a,
+	0x16f4f, 0x16f87,
+	0x16f8f, 0x16f9f,
+	0x16fe0, 0x16fe3,
+	0x17000, 0x187f7,
+	0x18800, 0x18af2,
+	0x1b000, 0x1b11e,
+	0x1b150, 0x1b152,
+	0x1b164, 0x1b167,
+	0x1b170, 0x1b2fb,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	0x1bc9c, 0x1bca3,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d1e8,
+	0x1d200, 0x1d245,
+	0x1d2e0, 0x1d2f3,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d378,
+	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, 0x1d7cb,
+	0x1d7ce, 0x1da8b,
+	0x1da9b, 0x1da9f,
+	0x1daa1, 0x1daaf,
+	0x1e000, 0x1e006,
+	0x1e008, 0x1e018,
+	0x1e01b, 0x1e021,
+	0x1e023, 0x1e024,
+	0x1e026, 0x1e02a,
+	0x1e100, 0x1e12c,
+	0x1e130, 0x1e13d,
+	0x1e140, 0x1e149,
+	0x1e14e, 0x1e14f,
+	0x1e2c0, 0x1e2f9,
+	0x1e2ff, 0x1e2ff,
+	0x1e800, 0x1e8c4,
+	0x1e8c7, 0x1e8d6,
+	0x1e900, 0x1e94b,
+	0x1e950, 0x1e959,
+	0x1e95e, 0x1e95f,
+	0x1ec71, 0x1ecb4,
+	0x1ed01, 0x1ed3d,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0bf,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0f5,
+	0x1f100, 0x1f10c,
+	0x1f110, 0x1f16c,
+	0x1f170, 0x1f1ac,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23b,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f260, 0x1f265,
+	0x1f300, 0x1f6d5,
+	0x1f6e0, 0x1f6ec,
+	0x1f6f0, 0x1f6fa,
+	0x1f700, 0x1f773,
+	0x1f780, 0x1f7d8,
+	0x1f7e0, 0x1f7eb,
+	0x1f800, 0x1f80b,
+	0x1f810, 0x1f847,
+	0x1f850, 0x1f859,
+	0x1f860, 0x1f887,
+	0x1f890, 0x1f8ad,
+	0x1f900, 0x1f90b,
+	0x1f90d, 0x1f971,
+	0x1f973, 0x1f976,
+	0x1f97a, 0x1f9a2,
+	0x1f9a5, 0x1f9aa,
+	0x1f9ae, 0x1f9ca,
+	0x1f9cd, 0x1fa53,
+	0x1fa60, 0x1fa6d,
+	0x1fa70, 0x1fa73,
+	0x1fa78, 0x1fa7a,
+	0x1fa80, 0x1fa82,
+	0x1fa90, 0x1fa95,
+	0x1fffe, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2b820, 0x2cea1,
+	0x2ceb0, 0x2ebe0,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_12_0 */
+
+/* 'Age_12_1': Derived Age 12.1 */
+static const OnigCodePoint CR_Age_12_1[] = {
+	676,
+	0x0000, 0x0377,
+	0x037a, 0x037f,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x052f,
+	0x0531, 0x0556,
+	0x0559, 0x058a,
+	0x058d, 0x058f,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05ef, 0x05f4,
+	0x0600, 0x061c,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x07fd, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x0860, 0x086a,
+	0x08a0, 0x08b4,
+	0x08b6, 0x08bd,
+	0x08d3, 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, 0x09fe,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a76,
+	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, 0x0af1,
+	0x0af9, 0x0aff,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b35, 0x0b39,
+	0x0b3c, 0x0b44,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b63,
+	0x0b66, 0x0b77,
+	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,
+	0x0bd0, 0x0bd0,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bfa,
+	0x0c00, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c5a,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c77, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbc, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0ce6, 0x0cef,
+	0x0cf1, 0x0cf2,
+	0x0d00, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4f,
+	0x0d54, 0x0d63,
+	0x0d66, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0de6, 0x0def,
+	0x0df2, 0x0df4,
+	0x0e01, 0x0e3a,
+	0x0e3f, 0x0e5b,
+	0x0e81, 0x0e82,
+	0x0e84, 0x0e84,
+	0x0e86, 0x0e8a,
+	0x0e8c, 0x0ea3,
+	0x0ea5, 0x0ea5,
+	0x0ea7, 0x0ebd,
+	0x0ec0, 0x0ec4,
+	0x0ec6, 0x0ec6,
+	0x0ec8, 0x0ecd,
+	0x0ed0, 0x0ed9,
+	0x0edc, 0x0edf,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fda,
+	0x1000, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 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,
+	0x135d, 0x137c,
+	0x1380, 0x1399,
+	0x13a0, 0x13f5,
+	0x13f8, 0x13fd,
+	0x1400, 0x169c,
+	0x16a0, 0x16f8,
+	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, 0x1878,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191e,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa0, 0x1aad,
+	0x1ab0, 0x1abe,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1b80, 0x1bf3,
+	0x1bfc, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c88,
+	0x1c90, 0x1cba,
+	0x1cbd, 0x1cc7,
+	0x1cd0, 0x1cfa,
+	0x1d00, 0x1df9,
+	0x1dfb, 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, 0x2064,
+	0x2066, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x209c,
+	0x20a0, 0x20bf,
+	0x20d0, 0x20f0,
+	0x2100, 0x218b,
+	0x2190, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x2b73,
+	0x2b76, 0x2b95,
+	0x2b98, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf3,
+	0x2cf9, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e4f,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312f,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x4db5,
+	0x4dc0, 0x9fef,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa6f7,
+	0xa700, 0xa7bf,
+	0xa7c2, 0xa7c6,
+	0xa7f7, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c5,
+	0xa8ce, 0xa8d9,
+	0xa8e0, 0xa953,
+	0xa95f, 0xa97c,
+	0xa980, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9fe,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaac2,
+	0xaadb, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xab30, 0xab67,
+	0xab70, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xd800, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbc1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 0xfdfd,
+	0xfe00, 0xfe19,
+	0xfe20, 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, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1018e,
+	0x10190, 0x1019b,
+	0x101a0, 0x101a0,
+	0x101d0, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x102e0, 0x102fb,
+	0x10300, 0x10323,
+	0x1032d, 0x1034a,
+	0x10350, 0x1037a,
+	0x10380, 0x1039d,
+	0x1039f, 0x103c3,
+	0x103c8, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x104b0, 0x104d3,
+	0x104d8, 0x104fb,
+	0x10500, 0x10527,
+	0x10530, 0x10563,
+	0x1056f, 0x1056f,
+	0x10600, 0x10736,
+	0x10740, 0x10755,
+	0x10760, 0x10767,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10857, 0x1089e,
+	0x108a7, 0x108af,
+	0x108e0, 0x108f2,
+	0x108f4, 0x108f5,
+	0x108fb, 0x1091b,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10980, 0x109b7,
+	0x109bc, 0x109cf,
+	0x109d2, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a35,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a48,
+	0x10a50, 0x10a58,
+	0x10a60, 0x10a9f,
+	0x10ac0, 0x10ae6,
+	0x10aeb, 0x10af6,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b55,
+	0x10b58, 0x10b72,
+	0x10b78, 0x10b91,
+	0x10b99, 0x10b9c,
+	0x10ba9, 0x10baf,
+	0x10c00, 0x10c48,
+	0x10c80, 0x10cb2,
+	0x10cc0, 0x10cf2,
+	0x10cfa, 0x10d27,
+	0x10d30, 0x10d39,
+	0x10e60, 0x10e7e,
+	0x10f00, 0x10f27,
+	0x10f30, 0x10f59,
+	0x10fe0, 0x10ff6,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x1107f, 0x110c1,
+	0x110cd, 0x110cd,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x11146,
+	0x11150, 0x11176,
+	0x11180, 0x111cd,
+	0x111d0, 0x111df,
+	0x111e1, 0x111f4,
+	0x11200, 0x11211,
+	0x11213, 0x1123e,
+	0x11280, 0x11286,
+	0x11288, 0x11288,
+	0x1128a, 0x1128d,
+	0x1128f, 0x1129d,
+	0x1129f, 0x112a9,
+	0x112b0, 0x112ea,
+	0x112f0, 0x112f9,
+	0x11300, 0x11303,
+	0x11305, 0x1130c,
+	0x1130f, 0x11310,
+	0x11313, 0x11328,
+	0x1132a, 0x11330,
+	0x11332, 0x11333,
+	0x11335, 0x11339,
+	0x1133b, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11350, 0x11350,
+	0x11357, 0x11357,
+	0x1135d, 0x11363,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11400, 0x11459,
+	0x1145b, 0x1145b,
+	0x1145d, 0x1145f,
+	0x11480, 0x114c7,
+	0x114d0, 0x114d9,
+	0x11580, 0x115b5,
+	0x115b8, 0x115dd,
+	0x11600, 0x11644,
+	0x11650, 0x11659,
+	0x11660, 0x1166c,
+	0x11680, 0x116b8,
+	0x116c0, 0x116c9,
+	0x11700, 0x1171a,
+	0x1171d, 0x1172b,
+	0x11730, 0x1173f,
+	0x11800, 0x1183b,
+	0x118a0, 0x118f2,
+	0x118ff, 0x118ff,
+	0x119a0, 0x119a7,
+	0x119aa, 0x119d7,
+	0x119da, 0x119e4,
+	0x11a00, 0x11a47,
+	0x11a50, 0x11aa2,
+	0x11ac0, 0x11af8,
+	0x11c00, 0x11c08,
+	0x11c0a, 0x11c36,
+	0x11c38, 0x11c45,
+	0x11c50, 0x11c6c,
+	0x11c70, 0x11c8f,
+	0x11c92, 0x11ca7,
+	0x11ca9, 0x11cb6,
+	0x11d00, 0x11d06,
+	0x11d08, 0x11d09,
+	0x11d0b, 0x11d36,
+	0x11d3a, 0x11d3a,
+	0x11d3c, 0x11d3d,
+	0x11d3f, 0x11d47,
+	0x11d50, 0x11d59,
+	0x11d60, 0x11d65,
+	0x11d67, 0x11d68,
+	0x11d6a, 0x11d8e,
+	0x11d90, 0x11d91,
+	0x11d93, 0x11d98,
+	0x11da0, 0x11da9,
+	0x11ee0, 0x11ef8,
+	0x11fc0, 0x11ff1,
+	0x11fff, 0x12399,
+	0x12400, 0x1246e,
+	0x12470, 0x12474,
+	0x12480, 0x12543,
+	0x13000, 0x1342e,
+	0x13430, 0x13438,
+	0x14400, 0x14646,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16a60, 0x16a69,
+	0x16a6e, 0x16a6f,
+	0x16ad0, 0x16aed,
+	0x16af0, 0x16af5,
+	0x16b00, 0x16b45,
+	0x16b50, 0x16b59,
+	0x16b5b, 0x16b61,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16e40, 0x16e9a,
+	0x16f00, 0x16f4a,
+	0x16f4f, 0x16f87,
+	0x16f8f, 0x16f9f,
+	0x16fe0, 0x16fe3,
+	0x17000, 0x187f7,
+	0x18800, 0x18af2,
+	0x1b000, 0x1b11e,
+	0x1b150, 0x1b152,
+	0x1b164, 0x1b167,
+	0x1b170, 0x1b2fb,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	0x1bc9c, 0x1bca3,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d1e8,
+	0x1d200, 0x1d245,
+	0x1d2e0, 0x1d2f3,
+	0x1d300, 0x1d356,
+	0x1d360, 0x1d378,
+	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, 0x1d7cb,
+	0x1d7ce, 0x1da8b,
+	0x1da9b, 0x1da9f,
+	0x1daa1, 0x1daaf,
+	0x1e000, 0x1e006,
+	0x1e008, 0x1e018,
+	0x1e01b, 0x1e021,
+	0x1e023, 0x1e024,
+	0x1e026, 0x1e02a,
+	0x1e100, 0x1e12c,
+	0x1e130, 0x1e13d,
+	0x1e140, 0x1e149,
+	0x1e14e, 0x1e14f,
+	0x1e2c0, 0x1e2f9,
+	0x1e2ff, 0x1e2ff,
+	0x1e800, 0x1e8c4,
+	0x1e8c7, 0x1e8d6,
+	0x1e900, 0x1e94b,
+	0x1e950, 0x1e959,
+	0x1e95e, 0x1e95f,
+	0x1ec71, 0x1ecb4,
+	0x1ed01, 0x1ed3d,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0bf,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0f5,
+	0x1f100, 0x1f10c,
+	0x1f110, 0x1f16c,
+	0x1f170, 0x1f1ac,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23b,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f260, 0x1f265,
+	0x1f300, 0x1f6d5,
+	0x1f6e0, 0x1f6ec,
+	0x1f6f0, 0x1f6fa,
+	0x1f700, 0x1f773,
+	0x1f780, 0x1f7d8,
+	0x1f7e0, 0x1f7eb,
+	0x1f800, 0x1f80b,
+	0x1f810, 0x1f847,
+	0x1f850, 0x1f859,
+	0x1f860, 0x1f887,
+	0x1f890, 0x1f8ad,
+	0x1f900, 0x1f90b,
+	0x1f90d, 0x1f971,
+	0x1f973, 0x1f976,
+	0x1f97a, 0x1f9a2,
+	0x1f9a5, 0x1f9aa,
+	0x1f9ae, 0x1f9ca,
+	0x1f9cd, 0x1fa53,
+	0x1fa60, 0x1fa6d,
+	0x1fa70, 0x1fa73,
+	0x1fa78, 0x1fa7a,
+	0x1fa80, 0x1fa82,
+	0x1fa90, 0x1fa95,
+	0x1fffe, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2b820, 0x2cea1,
+	0x2ceb0, 0x2ebe0,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_12_1 */
+
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+/* 'Grapheme_Cluster_Break_Prepend': Grapheme_Cluster_Break=Prepend */
+static const OnigCodePoint CR_Grapheme_Cluster_Break_Prepend[] = {
+	11,
+	0x0600, 0x0605,
+	0x06dd, 0x06dd,
+	0x070f, 0x070f,
+	0x08e2, 0x08e2,
+	0x0d4e, 0x0d4e,
+	0x110bd, 0x110bd,
+	0x110cd, 0x110cd,
+	0x111c2, 0x111c3,
+	0x11a3a, 0x11a3a,
+	0x11a84, 0x11a89,
+	0x11d46, 0x11d46,
+}; /* CR_Grapheme_Cluster_Break_Prepend */
+
+/* 'Grapheme_Cluster_Break_CR': Grapheme_Cluster_Break=CR */
+static const OnigCodePoint CR_Grapheme_Cluster_Break_CR[] = {
+	1,
+	0x000d, 0x000d,
+}; /* CR_Grapheme_Cluster_Break_CR */
+
+/* 'Grapheme_Cluster_Break_LF': Grapheme_Cluster_Break=LF */
+#define CR_Grapheme_Cluster_Break_LF CR_NEWLINE
+
+/* 'Grapheme_Cluster_Break_Control': Grapheme_Cluster_Break=Control */
+static const OnigCodePoint CR_Grapheme_Cluster_Break_Control[] = {
+	19,
+	0x0000, 0x0009,
+	0x000b, 0x000c,
+	0x000e, 0x001f,
+	0x007f, 0x009f,
+	0x00ad, 0x00ad,
+	0x061c, 0x061c,
+	0x180e, 0x180e,
+	0x200b, 0x200b,
+	0x200e, 0x200f,
+	0x2028, 0x202e,
+	0x2060, 0x206f,
+	0xfeff, 0xfeff,
+	0xfff0, 0xfffb,
+	0x13430, 0x13438,
+	0x1bca0, 0x1bca3,
+	0x1d173, 0x1d17a,
+	0xe0000, 0xe001f,
+	0xe0080, 0xe00ff,
+	0xe01f0, 0xe0fff,
+}; /* CR_Grapheme_Cluster_Break_Control */
+
+/* 'Grapheme_Cluster_Break_Extend': Grapheme_Cluster_Break=Extend */
+static const OnigCodePoint CR_Grapheme_Cluster_Break_Extend[] = {
+	336,
+	0x0300, 0x036f,
+	0x0483, 0x0489,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x0610, 0x061a,
+	0x064b, 0x065f,
+	0x0670, 0x0670,
+	0x06d6, 0x06dc,
+	0x06df, 0x06e4,
+	0x06e7, 0x06e8,
+	0x06ea, 0x06ed,
+	0x0711, 0x0711,
+	0x0730, 0x074a,
+	0x07a6, 0x07b0,
+	0x07eb, 0x07f3,
+	0x07fd, 0x07fd,
+	0x0816, 0x0819,
+	0x081b, 0x0823,
+	0x0825, 0x0827,
+	0x0829, 0x082d,
+	0x0859, 0x085b,
+	0x08d3, 0x08e1,
+	0x08e3, 0x0902,
+	0x093a, 0x093a,
+	0x093c, 0x093c,
+	0x0941, 0x0948,
+	0x094d, 0x094d,
+	0x0951, 0x0957,
+	0x0962, 0x0963,
+	0x0981, 0x0981,
+	0x09bc, 0x09bc,
+	0x09be, 0x09be,
+	0x09c1, 0x09c4,
+	0x09cd, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09e2, 0x09e3,
+	0x09fe, 0x09fe,
+	0x0a01, 0x0a02,
+	0x0a3c, 0x0a3c,
+	0x0a41, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a51, 0x0a51,
+	0x0a70, 0x0a71,
+	0x0a75, 0x0a75,
+	0x0a81, 0x0a82,
+	0x0abc, 0x0abc,
+	0x0ac1, 0x0ac5,
+	0x0ac7, 0x0ac8,
+	0x0acd, 0x0acd,
+	0x0ae2, 0x0ae3,
+	0x0afa, 0x0aff,
+	0x0b01, 0x0b01,
+	0x0b3c, 0x0b3c,
+	0x0b3e, 0x0b3f,
+	0x0b41, 0x0b44,
+	0x0b4d, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b62, 0x0b63,
+	0x0b82, 0x0b82,
+	0x0bbe, 0x0bbe,
+	0x0bc0, 0x0bc0,
+	0x0bcd, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0c00, 0x0c00,
+	0x0c04, 0x0c04,
+	0x0c3e, 0x0c40,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c62, 0x0c63,
+	0x0c81, 0x0c81,
+	0x0cbc, 0x0cbc,
+	0x0cbf, 0x0cbf,
+	0x0cc2, 0x0cc2,
+	0x0cc6, 0x0cc6,
+	0x0ccc, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0ce2, 0x0ce3,
+	0x0d00, 0x0d01,
+	0x0d3b, 0x0d3c,
+	0x0d3e, 0x0d3e,
+	0x0d41, 0x0d44,
+	0x0d4d, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d62, 0x0d63,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dcf,
+	0x0dd2, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0ddf, 0x0ddf,
+	0x0e31, 0x0e31,
+	0x0e34, 0x0e3a,
+	0x0e47, 0x0e4e,
+	0x0eb1, 0x0eb1,
+	0x0eb4, 0x0ebc,
+	0x0ec8, 0x0ecd,
+	0x0f18, 0x0f19,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f71, 0x0f7e,
+	0x0f80, 0x0f84,
+	0x0f86, 0x0f87,
+	0x0f8d, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x102d, 0x1030,
+	0x1032, 0x1037,
+	0x1039, 0x103a,
+	0x103d, 0x103e,
+	0x1058, 0x1059,
+	0x105e, 0x1060,
+	0x1071, 0x1074,
+	0x1082, 0x1082,
+	0x1085, 0x1086,
+	0x108d, 0x108d,
+	0x109d, 0x109d,
+	0x135d, 0x135f,
+	0x1712, 0x1714,
+	0x1732, 0x1734,
+	0x1752, 0x1753,
+	0x1772, 0x1773,
+	0x17b4, 0x17b5,
+	0x17b7, 0x17bd,
+	0x17c6, 0x17c6,
+	0x17c9, 0x17d3,
+	0x17dd, 0x17dd,
+	0x180b, 0x180d,
+	0x1885, 0x1886,
+	0x18a9, 0x18a9,
+	0x1920, 0x1922,
+	0x1927, 0x1928,
+	0x1932, 0x1932,
+	0x1939, 0x193b,
+	0x1a17, 0x1a18,
+	0x1a1b, 0x1a1b,
+	0x1a56, 0x1a56,
+	0x1a58, 0x1a5e,
+	0x1a60, 0x1a60,
+	0x1a62, 0x1a62,
+	0x1a65, 0x1a6c,
+	0x1a73, 0x1a7c,
+	0x1a7f, 0x1a7f,
+	0x1ab0, 0x1abe,
+	0x1b00, 0x1b03,
+	0x1b34, 0x1b3a,
+	0x1b3c, 0x1b3c,
+	0x1b42, 0x1b42,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1b81,
+	0x1ba2, 0x1ba5,
+	0x1ba8, 0x1ba9,
+	0x1bab, 0x1bad,
+	0x1be6, 0x1be6,
+	0x1be8, 0x1be9,
+	0x1bed, 0x1bed,
+	0x1bef, 0x1bf1,
+	0x1c2c, 0x1c33,
+	0x1c36, 0x1c37,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce0,
+	0x1ce2, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1cf4, 0x1cf4,
+	0x1cf8, 0x1cf9,
+	0x1dc0, 0x1df9,
+	0x1dfb, 0x1dff,
+	0x200c, 0x200c,
+	0x20d0, 0x20f0,
+	0x2cef, 0x2cf1,
+	0x2d7f, 0x2d7f,
+	0x2de0, 0x2dff,
+	0x302a, 0x302f,
+	0x3099, 0x309a,
+	0xa66f, 0xa672,
+	0xa674, 0xa67d,
+	0xa69e, 0xa69f,
+	0xa6f0, 0xa6f1,
+	0xa802, 0xa802,
+	0xa806, 0xa806,
+	0xa80b, 0xa80b,
+	0xa825, 0xa826,
+	0xa8c4, 0xa8c5,
+	0xa8e0, 0xa8f1,
+	0xa8ff, 0xa8ff,
+	0xa926, 0xa92d,
+	0xa947, 0xa951,
+	0xa980, 0xa982,
+	0xa9b3, 0xa9b3,
+	0xa9b6, 0xa9b9,
+	0xa9bc, 0xa9bd,
+	0xa9e5, 0xa9e5,
+	0xaa29, 0xaa2e,
+	0xaa31, 0xaa32,
+	0xaa35, 0xaa36,
+	0xaa43, 0xaa43,
+	0xaa4c, 0xaa4c,
+	0xaa7c, 0xaa7c,
+	0xaab0, 0xaab0,
+	0xaab2, 0xaab4,
+	0xaab7, 0xaab8,
+	0xaabe, 0xaabf,
+	0xaac1, 0xaac1,
+	0xaaec, 0xaaed,
+	0xaaf6, 0xaaf6,
+	0xabe5, 0xabe5,
+	0xabe8, 0xabe8,
+	0xabed, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe2f,
+	0xff9e, 0xff9f,
+	0x101fd, 0x101fd,
+	0x102e0, 0x102e0,
+	0x10376, 0x1037a,
+	0x10a01, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a0f,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x10ae5, 0x10ae6,
+	0x10d24, 0x10d27,
+	0x10f46, 0x10f50,
+	0x11001, 0x11001,
+	0x11038, 0x11046,
+	0x1107f, 0x11081,
+	0x110b3, 0x110b6,
+	0x110b9, 0x110ba,
+	0x11100, 0x11102,
+	0x11127, 0x1112b,
+	0x1112d, 0x11134,
+	0x11173, 0x11173,
+	0x11180, 0x11181,
+	0x111b6, 0x111be,
+	0x111c9, 0x111cc,
+	0x1122f, 0x11231,
+	0x11234, 0x11234,
+	0x11236, 0x11237,
+	0x1123e, 0x1123e,
+	0x112df, 0x112df,
+	0x112e3, 0x112ea,
+	0x11300, 0x11301,
+	0x1133b, 0x1133c,
+	0x1133e, 0x1133e,
+	0x11340, 0x11340,
+	0x11357, 0x11357,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11438, 0x1143f,
+	0x11442, 0x11444,
+	0x11446, 0x11446,
+	0x1145e, 0x1145e,
+	0x114b0, 0x114b0,
+	0x114b3, 0x114b8,
+	0x114ba, 0x114ba,
+	0x114bd, 0x114bd,
+	0x114bf, 0x114c0,
+	0x114c2, 0x114c3,
+	0x115af, 0x115af,
+	0x115b2, 0x115b5,
+	0x115bc, 0x115bd,
+	0x115bf, 0x115c0,
+	0x115dc, 0x115dd,
+	0x11633, 0x1163a,
+	0x1163d, 0x1163d,
+	0x1163f, 0x11640,
+	0x116ab, 0x116ab,
+	0x116ad, 0x116ad,
+	0x116b0, 0x116b5,
+	0x116b7, 0x116b7,
+	0x1171d, 0x1171f,
+	0x11722, 0x11725,
+	0x11727, 0x1172b,
+	0x1182f, 0x11837,
+	0x11839, 0x1183a,
+	0x119d4, 0x119d7,
+	0x119da, 0x119db,
+	0x119e0, 0x119e0,
+	0x11a01, 0x11a0a,
+	0x11a33, 0x11a38,
+	0x11a3b, 0x11a3e,
+	0x11a47, 0x11a47,
+	0x11a51, 0x11a56,
+	0x11a59, 0x11a5b,
+	0x11a8a, 0x11a96,
+	0x11a98, 0x11a99,
+	0x11c30, 0x11c36,
+	0x11c38, 0x11c3d,
+	0x11c3f, 0x11c3f,
+	0x11c92, 0x11ca7,
+	0x11caa, 0x11cb0,
+	0x11cb2, 0x11cb3,
+	0x11cb5, 0x11cb6,
+	0x11d31, 0x11d36,
+	0x11d3a, 0x11d3a,
+	0x11d3c, 0x11d3d,
+	0x11d3f, 0x11d45,
+	0x11d47, 0x11d47,
+	0x11d90, 0x11d91,
+	0x11d95, 0x11d95,
+	0x11d97, 0x11d97,
+	0x11ef3, 0x11ef4,
+	0x16af0, 0x16af4,
+	0x16b30, 0x16b36,
+	0x16f4f, 0x16f4f,
+	0x16f8f, 0x16f92,
+	0x1bc9d, 0x1bc9e,
+	0x1d165, 0x1d165,
+	0x1d167, 0x1d169,
+	0x1d16e, 0x1d172,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0x1da00, 0x1da36,
+	0x1da3b, 0x1da6c,
+	0x1da75, 0x1da75,
+	0x1da84, 0x1da84,
+	0x1da9b, 0x1da9f,
+	0x1daa1, 0x1daaf,
+	0x1e000, 0x1e006,
+	0x1e008, 0x1e018,
+	0x1e01b, 0x1e021,
+	0x1e023, 0x1e024,
+	0x1e026, 0x1e02a,
+	0x1e130, 0x1e136,
+	0x1e2ec, 0x1e2ef,
+	0x1e8d0, 0x1e8d6,
+	0x1e944, 0x1e94a,
+	0x1f3fb, 0x1f3ff,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+}; /* CR_Grapheme_Cluster_Break_Extend */
+
+/* 'Grapheme_Cluster_Break_Regional_Indicator': Grapheme_Cluster_Break=Regional_Indicator */
+#define CR_Grapheme_Cluster_Break_Regional_Indicator CR_Regional_Indicator
+
+/* 'Grapheme_Cluster_Break_SpacingMark': Grapheme_Cluster_Break=SpacingMark */
+static const OnigCodePoint CR_Grapheme_Cluster_Break_SpacingMark[] = {
+	152,
+	0x0903, 0x0903,
+	0x093b, 0x093b,
+	0x093e, 0x0940,
+	0x0949, 0x094c,
+	0x094e, 0x094f,
+	0x0982, 0x0983,
+	0x09bf, 0x09c0,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cc,
+	0x0a03, 0x0a03,
+	0x0a3e, 0x0a40,
+	0x0a83, 0x0a83,
+	0x0abe, 0x0ac0,
+	0x0ac9, 0x0ac9,
+	0x0acb, 0x0acc,
+	0x0b02, 0x0b03,
+	0x0b40, 0x0b40,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4c,
+	0x0bbf, 0x0bbf,
+	0x0bc1, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcc,
+	0x0c01, 0x0c03,
+	0x0c41, 0x0c44,
+	0x0c82, 0x0c83,
+	0x0cbe, 0x0cbe,
+	0x0cc0, 0x0cc1,
+	0x0cc3, 0x0cc4,
+	0x0cc7, 0x0cc8,
+	0x0cca, 0x0ccb,
+	0x0d02, 0x0d03,
+	0x0d3f, 0x0d40,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4c,
+	0x0d82, 0x0d83,
+	0x0dd0, 0x0dd1,
+	0x0dd8, 0x0dde,
+	0x0df2, 0x0df3,
+	0x0e33, 0x0e33,
+	0x0eb3, 0x0eb3,
+	0x0f3e, 0x0f3f,
+	0x0f7f, 0x0f7f,
+	0x1031, 0x1031,
+	0x103b, 0x103c,
+	0x1056, 0x1057,
+	0x1084, 0x1084,
+	0x17b6, 0x17b6,
+	0x17be, 0x17c5,
+	0x17c7, 0x17c8,
+	0x1923, 0x1926,
+	0x1929, 0x192b,
+	0x1930, 0x1931,
+	0x1933, 0x1938,
+	0x1a19, 0x1a1a,
+	0x1a55, 0x1a55,
+	0x1a57, 0x1a57,
+	0x1a6d, 0x1a72,
+	0x1b04, 0x1b04,
+	0x1b3b, 0x1b3b,
+	0x1b3d, 0x1b41,
+	0x1b43, 0x1b44,
+	0x1b82, 0x1b82,
+	0x1ba1, 0x1ba1,
+	0x1ba6, 0x1ba7,
+	0x1baa, 0x1baa,
+	0x1be7, 0x1be7,
+	0x1bea, 0x1bec,
+	0x1bee, 0x1bee,
+	0x1bf2, 0x1bf3,
+	0x1c24, 0x1c2b,
+	0x1c34, 0x1c35,
+	0x1ce1, 0x1ce1,
+	0x1cf7, 0x1cf7,
+	0xa823, 0xa824,
+	0xa827, 0xa827,
+	0xa880, 0xa881,
+	0xa8b4, 0xa8c3,
+	0xa952, 0xa953,
+	0xa983, 0xa983,
+	0xa9b4, 0xa9b5,
+	0xa9ba, 0xa9bb,
+	0xa9be, 0xa9c0,
+	0xaa2f, 0xaa30,
+	0xaa33, 0xaa34,
+	0xaa4d, 0xaa4d,
+	0xaaeb, 0xaaeb,
+	0xaaee, 0xaaef,
+	0xaaf5, 0xaaf5,
+	0xabe3, 0xabe4,
+	0xabe6, 0xabe7,
+	0xabe9, 0xabea,
+	0xabec, 0xabec,
+	0x11000, 0x11000,
+	0x11002, 0x11002,
+	0x11082, 0x11082,
+	0x110b0, 0x110b2,
+	0x110b7, 0x110b8,
+	0x1112c, 0x1112c,
+	0x11145, 0x11146,
+	0x11182, 0x11182,
+	0x111b3, 0x111b5,
+	0x111bf, 0x111c0,
+	0x1122c, 0x1122e,
+	0x11232, 0x11233,
+	0x11235, 0x11235,
+	0x112e0, 0x112e2,
+	0x11302, 0x11303,
+	0x1133f, 0x1133f,
+	0x11341, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11362, 0x11363,
+	0x11435, 0x11437,
+	0x11440, 0x11441,
+	0x11445, 0x11445,
+	0x114b1, 0x114b2,
+	0x114b9, 0x114b9,
+	0x114bb, 0x114bc,
+	0x114be, 0x114be,
+	0x114c1, 0x114c1,
+	0x115b0, 0x115b1,
+	0x115b8, 0x115bb,
+	0x115be, 0x115be,
+	0x11630, 0x11632,
+	0x1163b, 0x1163c,
+	0x1163e, 0x1163e,
+	0x116ac, 0x116ac,
+	0x116ae, 0x116af,
+	0x116b6, 0x116b6,
+	0x11720, 0x11721,
+	0x11726, 0x11726,
+	0x1182c, 0x1182e,
+	0x11838, 0x11838,
+	0x119d1, 0x119d3,
+	0x119dc, 0x119df,
+	0x119e4, 0x119e4,
+	0x11a39, 0x11a39,
+	0x11a57, 0x11a58,
+	0x11a97, 0x11a97,
+	0x11c2f, 0x11c2f,
+	0x11c3e, 0x11c3e,
+	0x11ca9, 0x11ca9,
+	0x11cb1, 0x11cb1,
+	0x11cb4, 0x11cb4,
+	0x11d8a, 0x11d8e,
+	0x11d93, 0x11d94,
+	0x11d96, 0x11d96,
+	0x11ef5, 0x11ef6,
+	0x16f51, 0x16f87,
+	0x1d166, 0x1d166,
+	0x1d16d, 0x1d16d,
+}; /* CR_Grapheme_Cluster_Break_SpacingMark */
+
+/* 'Grapheme_Cluster_Break_L': Grapheme_Cluster_Break=L */
+static const OnigCodePoint CR_Grapheme_Cluster_Break_L[] = {
+	2,
+	0x1100, 0x115f,
+	0xa960, 0xa97c,
+}; /* CR_Grapheme_Cluster_Break_L */
+
+/* 'Grapheme_Cluster_Break_V': Grapheme_Cluster_Break=V */
+static const OnigCodePoint CR_Grapheme_Cluster_Break_V[] = {
+	2,
+	0x1160, 0x11a7,
+	0xd7b0, 0xd7c6,
+}; /* CR_Grapheme_Cluster_Break_V */
+
+/* 'Grapheme_Cluster_Break_T': Grapheme_Cluster_Break=T */
+static const OnigCodePoint CR_Grapheme_Cluster_Break_T[] = {
+	2,
+	0x11a8, 0x11ff,
+	0xd7cb, 0xd7fb,
+}; /* CR_Grapheme_Cluster_Break_T */
+
+/* 'Grapheme_Cluster_Break_LV': Grapheme_Cluster_Break=LV */
+static const OnigCodePoint CR_Grapheme_Cluster_Break_LV[] = {
+	399,
+	0xac00, 0xac00,
+	0xac1c, 0xac1c,
+	0xac38, 0xac38,
+	0xac54, 0xac54,
+	0xac70, 0xac70,
+	0xac8c, 0xac8c,
+	0xaca8, 0xaca8,
+	0xacc4, 0xacc4,
+	0xace0, 0xace0,
+	0xacfc, 0xacfc,
+	0xad18, 0xad18,
+	0xad34, 0xad34,
+	0xad50, 0xad50,
+	0xad6c, 0xad6c,
+	0xad88, 0xad88,
+	0xada4, 0xada4,
+	0xadc0, 0xadc0,
+	0xaddc, 0xaddc,
+	0xadf8, 0xadf8,
+	0xae14, 0xae14,
+	0xae30, 0xae30,
+	0xae4c, 0xae4c,
+	0xae68, 0xae68,
+	0xae84, 0xae84,
+	0xaea0, 0xaea0,
+	0xaebc, 0xaebc,
+	0xaed8, 0xaed8,
+	0xaef4, 0xaef4,
+	0xaf10, 0xaf10,
+	0xaf2c, 0xaf2c,
+	0xaf48, 0xaf48,
+	0xaf64, 0xaf64,
+	0xaf80, 0xaf80,
+	0xaf9c, 0xaf9c,
+	0xafb8, 0xafb8,
+	0xafd4, 0xafd4,
+	0xaff0, 0xaff0,
+	0xb00c, 0xb00c,
+	0xb028, 0xb028,
+	0xb044, 0xb044,
+	0xb060, 0xb060,
+	0xb07c, 0xb07c,
+	0xb098, 0xb098,
+	0xb0b4, 0xb0b4,
+	0xb0d0, 0xb0d0,
+	0xb0ec, 0xb0ec,
+	0xb108, 0xb108,
+	0xb124, 0xb124,
+	0xb140, 0xb140,
+	0xb15c, 0xb15c,
+	0xb178, 0xb178,
+	0xb194, 0xb194,
+	0xb1b0, 0xb1b0,
+	0xb1cc, 0xb1cc,
+	0xb1e8, 0xb1e8,
+	0xb204, 0xb204,
+	0xb220, 0xb220,
+	0xb23c, 0xb23c,
+	0xb258, 0xb258,
+	0xb274, 0xb274,
+	0xb290, 0xb290,
+	0xb2ac, 0xb2ac,
+	0xb2c8, 0xb2c8,
+	0xb2e4, 0xb2e4,
+	0xb300, 0xb300,
+	0xb31c, 0xb31c,
+	0xb338, 0xb338,
+	0xb354, 0xb354,
+	0xb370, 0xb370,
+	0xb38c, 0xb38c,
+	0xb3a8, 0xb3a8,
+	0xb3c4, 0xb3c4,
+	0xb3e0, 0xb3e0,
+	0xb3fc, 0xb3fc,
+	0xb418, 0xb418,
+	0xb434, 0xb434,
+	0xb450, 0xb450,
+	0xb46c, 0xb46c,
+	0xb488, 0xb488,
+	0xb4a4, 0xb4a4,
+	0xb4c0, 0xb4c0,
+	0xb4dc, 0xb4dc,
+	0xb4f8, 0xb4f8,
+	0xb514, 0xb514,
+	0xb530, 0xb530,
+	0xb54c, 0xb54c,
+	0xb568, 0xb568,
+	0xb584, 0xb584,
+	0xb5a0, 0xb5a0,
+	0xb5bc, 0xb5bc,
+	0xb5d8, 0xb5d8,
+	0xb5f4, 0xb5f4,
+	0xb610, 0xb610,
+	0xb62c, 0xb62c,
+	0xb648, 0xb648,
+	0xb664, 0xb664,
+	0xb680, 0xb680,
+	0xb69c, 0xb69c,
+	0xb6b8, 0xb6b8,
+	0xb6d4, 0xb6d4,
+	0xb6f0, 0xb6f0,
+	0xb70c, 0xb70c,
+	0xb728, 0xb728,
+	0xb744, 0xb744,
+	0xb760, 0xb760,
+	0xb77c, 0xb77c,
+	0xb798, 0xb798,
+	0xb7b4, 0xb7b4,
+	0xb7d0, 0xb7d0,
+	0xb7ec, 0xb7ec,
+	0xb808, 0xb808,
+	0xb824, 0xb824,
+	0xb840, 0xb840,
+	0xb85c, 0xb85c,
+	0xb878, 0xb878,
+	0xb894, 0xb894,
+	0xb8b0, 0xb8b0,
+	0xb8cc, 0xb8cc,
+	0xb8e8, 0xb8e8,
+	0xb904, 0xb904,
+	0xb920, 0xb920,
+	0xb93c, 0xb93c,
+	0xb958, 0xb958,
+	0xb974, 0xb974,
+	0xb990, 0xb990,
+	0xb9ac, 0xb9ac,
+	0xb9c8, 0xb9c8,
+	0xb9e4, 0xb9e4,
+	0xba00, 0xba00,
+	0xba1c, 0xba1c,
+	0xba38, 0xba38,
+	0xba54, 0xba54,
+	0xba70, 0xba70,
+	0xba8c, 0xba8c,
+	0xbaa8, 0xbaa8,
+	0xbac4, 0xbac4,
+	0xbae0, 0xbae0,
+	0xbafc, 0xbafc,
+	0xbb18, 0xbb18,
+	0xbb34, 0xbb34,
+	0xbb50, 0xbb50,
+	0xbb6c, 0xbb6c,
+	0xbb88, 0xbb88,
+	0xbba4, 0xbba4,
+	0xbbc0, 0xbbc0,
+	0xbbdc, 0xbbdc,
+	0xbbf8, 0xbbf8,
+	0xbc14, 0xbc14,
+	0xbc30, 0xbc30,
+	0xbc4c, 0xbc4c,
+	0xbc68, 0xbc68,
+	0xbc84, 0xbc84,
+	0xbca0, 0xbca0,
+	0xbcbc, 0xbcbc,
+	0xbcd8, 0xbcd8,
+	0xbcf4, 0xbcf4,
+	0xbd10, 0xbd10,
+	0xbd2c, 0xbd2c,
+	0xbd48, 0xbd48,
+	0xbd64, 0xbd64,
+	0xbd80, 0xbd80,
+	0xbd9c, 0xbd9c,
+	0xbdb8, 0xbdb8,
+	0xbdd4, 0xbdd4,
+	0xbdf0, 0xbdf0,
+	0xbe0c, 0xbe0c,
+	0xbe28, 0xbe28,
+	0xbe44, 0xbe44,
+	0xbe60, 0xbe60,
+	0xbe7c, 0xbe7c,
+	0xbe98, 0xbe98,
+	0xbeb4, 0xbeb4,
+	0xbed0, 0xbed0,
+	0xbeec, 0xbeec,
+	0xbf08, 0xbf08,
+	0xbf24, 0xbf24,
+	0xbf40, 0xbf40,
+	0xbf5c, 0xbf5c,
+	0xbf78, 0xbf78,
+	0xbf94, 0xbf94,
+	0xbfb0, 0xbfb0,
+	0xbfcc, 0xbfcc,
+	0xbfe8, 0xbfe8,
+	0xc004, 0xc004,
+	0xc020, 0xc020,
+	0xc03c, 0xc03c,
+	0xc058, 0xc058,
+	0xc074, 0xc074,
+	0xc090, 0xc090,
+	0xc0ac, 0xc0ac,
+	0xc0c8, 0xc0c8,
+	0xc0e4, 0xc0e4,
+	0xc100, 0xc100,
+	0xc11c, 0xc11c,
+	0xc138, 0xc138,
+	0xc154, 0xc154,
+	0xc170, 0xc170,
+	0xc18c, 0xc18c,
+	0xc1a8, 0xc1a8,
+	0xc1c4, 0xc1c4,
+	0xc1e0, 0xc1e0,
+	0xc1fc, 0xc1fc,
+	0xc218, 0xc218,
+	0xc234, 0xc234,
+	0xc250, 0xc250,
+	0xc26c, 0xc26c,
+	0xc288, 0xc288,
+	0xc2a4, 0xc2a4,
+	0xc2c0, 0xc2c0,
+	0xc2dc, 0xc2dc,
+	0xc2f8, 0xc2f8,
+	0xc314, 0xc314,
+	0xc330, 0xc330,
+	0xc34c, 0xc34c,
+	0xc368, 0xc368,
+	0xc384, 0xc384,
+	0xc3a0, 0xc3a0,
+	0xc3bc, 0xc3bc,
+	0xc3d8, 0xc3d8,
+	0xc3f4, 0xc3f4,
+	0xc410, 0xc410,
+	0xc42c, 0xc42c,
+	0xc448, 0xc448,
+	0xc464, 0xc464,
+	0xc480, 0xc480,
+	0xc49c, 0xc49c,
+	0xc4b8, 0xc4b8,
+	0xc4d4, 0xc4d4,
+	0xc4f0, 0xc4f0,
+	0xc50c, 0xc50c,
+	0xc528, 0xc528,
+	0xc544, 0xc544,
+	0xc560, 0xc560,
+	0xc57c, 0xc57c,
+	0xc598, 0xc598,
+	0xc5b4, 0xc5b4,
+	0xc5d0, 0xc5d0,
+	0xc5ec, 0xc5ec,
+	0xc608, 0xc608,
+	0xc624, 0xc624,
+	0xc640, 0xc640,
+	0xc65c, 0xc65c,
+	0xc678, 0xc678,
+	0xc694, 0xc694,
+	0xc6b0, 0xc6b0,
+	0xc6cc, 0xc6cc,
+	0xc6e8, 0xc6e8,
+	0xc704, 0xc704,
+	0xc720, 0xc720,
+	0xc73c, 0xc73c,
+	0xc758, 0xc758,
+	0xc774, 0xc774,
+	0xc790, 0xc790,
+	0xc7ac, 0xc7ac,
+	0xc7c8, 0xc7c8,
+	0xc7e4, 0xc7e4,
+	0xc800, 0xc800,
+	0xc81c, 0xc81c,
+	0xc838, 0xc838,
+	0xc854, 0xc854,
+	0xc870, 0xc870,
+	0xc88c, 0xc88c,
+	0xc8a8, 0xc8a8,
+	0xc8c4, 0xc8c4,
+	0xc8e0, 0xc8e0,
+	0xc8fc, 0xc8fc,
+	0xc918, 0xc918,
+	0xc934, 0xc934,
+	0xc950, 0xc950,
+	0xc96c, 0xc96c,
+	0xc988, 0xc988,
+	0xc9a4, 0xc9a4,
+	0xc9c0, 0xc9c0,
+	0xc9dc, 0xc9dc,
+	0xc9f8, 0xc9f8,
+	0xca14, 0xca14,
+	0xca30, 0xca30,
+	0xca4c, 0xca4c,
+	0xca68, 0xca68,
+	0xca84, 0xca84,
+	0xcaa0, 0xcaa0,
+	0xcabc, 0xcabc,
+	0xcad8, 0xcad8,
+	0xcaf4, 0xcaf4,
+	0xcb10, 0xcb10,
+	0xcb2c, 0xcb2c,
+	0xcb48, 0xcb48,
+	0xcb64, 0xcb64,
+	0xcb80, 0xcb80,
+	0xcb9c, 0xcb9c,
+	0xcbb8, 0xcbb8,
+	0xcbd4, 0xcbd4,
+	0xcbf0, 0xcbf0,
+	0xcc0c, 0xcc0c,
+	0xcc28, 0xcc28,
+	0xcc44, 0xcc44,
+	0xcc60, 0xcc60,
+	0xcc7c, 0xcc7c,
+	0xcc98, 0xcc98,
+	0xccb4, 0xccb4,
+	0xccd0, 0xccd0,
+	0xccec, 0xccec,
+	0xcd08, 0xcd08,
+	0xcd24, 0xcd24,
+	0xcd40, 0xcd40,
+	0xcd5c, 0xcd5c,
+	0xcd78, 0xcd78,
+	0xcd94, 0xcd94,
+	0xcdb0, 0xcdb0,
+	0xcdcc, 0xcdcc,
+	0xcde8, 0xcde8,
+	0xce04, 0xce04,
+	0xce20, 0xce20,
+	0xce3c, 0xce3c,
+	0xce58, 0xce58,
+	0xce74, 0xce74,
+	0xce90, 0xce90,
+	0xceac, 0xceac,
+	0xcec8, 0xcec8,
+	0xcee4, 0xcee4,
+	0xcf00, 0xcf00,
+	0xcf1c, 0xcf1c,
+	0xcf38, 0xcf38,
+	0xcf54, 0xcf54,
+	0xcf70, 0xcf70,
+	0xcf8c, 0xcf8c,
+	0xcfa8, 0xcfa8,
+	0xcfc4, 0xcfc4,
+	0xcfe0, 0xcfe0,
+	0xcffc, 0xcffc,
+	0xd018, 0xd018,
+	0xd034, 0xd034,
+	0xd050, 0xd050,
+	0xd06c, 0xd06c,
+	0xd088, 0xd088,
+	0xd0a4, 0xd0a4,
+	0xd0c0, 0xd0c0,
+	0xd0dc, 0xd0dc,
+	0xd0f8, 0xd0f8,
+	0xd114, 0xd114,
+	0xd130, 0xd130,
+	0xd14c, 0xd14c,
+	0xd168, 0xd168,
+	0xd184, 0xd184,
+	0xd1a0, 0xd1a0,
+	0xd1bc, 0xd1bc,
+	0xd1d8, 0xd1d8,
+	0xd1f4, 0xd1f4,
+	0xd210, 0xd210,
+	0xd22c, 0xd22c,
+	0xd248, 0xd248,
+	0xd264, 0xd264,
+	0xd280, 0xd280,
+	0xd29c, 0xd29c,
+	0xd2b8, 0xd2b8,
+	0xd2d4, 0xd2d4,
+	0xd2f0, 0xd2f0,
+	0xd30c, 0xd30c,
+	0xd328, 0xd328,
+	0xd344, 0xd344,
+	0xd360, 0xd360,
+	0xd37c, 0xd37c,
+	0xd398, 0xd398,
+	0xd3b4, 0xd3b4,
+	0xd3d0, 0xd3d0,
+	0xd3ec, 0xd3ec,
+	0xd408, 0xd408,
+	0xd424, 0xd424,
+	0xd440, 0xd440,
+	0xd45c, 0xd45c,
+	0xd478, 0xd478,
+	0xd494, 0xd494,
+	0xd4b0, 0xd4b0,
+	0xd4cc, 0xd4cc,
+	0xd4e8, 0xd4e8,
+	0xd504, 0xd504,
+	0xd520, 0xd520,
+	0xd53c, 0xd53c,
+	0xd558, 0xd558,
+	0xd574, 0xd574,
+	0xd590, 0xd590,
+	0xd5ac, 0xd5ac,
+	0xd5c8, 0xd5c8,
+	0xd5e4, 0xd5e4,
+	0xd600, 0xd600,
+	0xd61c, 0xd61c,
+	0xd638, 0xd638,
+	0xd654, 0xd654,
+	0xd670, 0xd670,
+	0xd68c, 0xd68c,
+	0xd6a8, 0xd6a8,
+	0xd6c4, 0xd6c4,
+	0xd6e0, 0xd6e0,
+	0xd6fc, 0xd6fc,
+	0xd718, 0xd718,
+	0xd734, 0xd734,
+	0xd750, 0xd750,
+	0xd76c, 0xd76c,
+	0xd788, 0xd788,
+}; /* CR_Grapheme_Cluster_Break_LV */
+
+/* 'Grapheme_Cluster_Break_LVT': Grapheme_Cluster_Break=LVT */
+static const OnigCodePoint CR_Grapheme_Cluster_Break_LVT[] = {
+	399,
+	0xac01, 0xac1b,
+	0xac1d, 0xac37,
+	0xac39, 0xac53,
+	0xac55, 0xac6f,
+	0xac71, 0xac8b,
+	0xac8d, 0xaca7,
+	0xaca9, 0xacc3,
+	0xacc5, 0xacdf,
+	0xace1, 0xacfb,
+	0xacfd, 0xad17,
+	0xad19, 0xad33,
+	0xad35, 0xad4f,
+	0xad51, 0xad6b,
+	0xad6d, 0xad87,
+	0xad89, 0xada3,
+	0xada5, 0xadbf,
+	0xadc1, 0xaddb,
+	0xaddd, 0xadf7,
+	0xadf9, 0xae13,
+	0xae15, 0xae2f,
+	0xae31, 0xae4b,
+	0xae4d, 0xae67,
+	0xae69, 0xae83,
+	0xae85, 0xae9f,
+	0xaea1, 0xaebb,
+	0xaebd, 0xaed7,
+	0xaed9, 0xaef3,
+	0xaef5, 0xaf0f,
+	0xaf11, 0xaf2b,
+	0xaf2d, 0xaf47,
+	0xaf49, 0xaf63,
+	0xaf65, 0xaf7f,
+	0xaf81, 0xaf9b,
+	0xaf9d, 0xafb7,
+	0xafb9, 0xafd3,
+	0xafd5, 0xafef,
+	0xaff1, 0xb00b,
+	0xb00d, 0xb027,
+	0xb029, 0xb043,
+	0xb045, 0xb05f,
+	0xb061, 0xb07b,
+	0xb07d, 0xb097,
+	0xb099, 0xb0b3,
+	0xb0b5, 0xb0cf,
+	0xb0d1, 0xb0eb,
+	0xb0ed, 0xb107,
+	0xb109, 0xb123,
+	0xb125, 0xb13f,
+	0xb141, 0xb15b,
+	0xb15d, 0xb177,
+	0xb179, 0xb193,
+	0xb195, 0xb1af,
+	0xb1b1, 0xb1cb,
+	0xb1cd, 0xb1e7,
+	0xb1e9, 0xb203,
+	0xb205, 0xb21f,
+	0xb221, 0xb23b,
+	0xb23d, 0xb257,
+	0xb259, 0xb273,
+	0xb275, 0xb28f,
+	0xb291, 0xb2ab,
+	0xb2ad, 0xb2c7,
+	0xb2c9, 0xb2e3,
+	0xb2e5, 0xb2ff,
+	0xb301, 0xb31b,
+	0xb31d, 0xb337,
+	0xb339, 0xb353,
+	0xb355, 0xb36f,
+	0xb371, 0xb38b,
+	0xb38d, 0xb3a7,
+	0xb3a9, 0xb3c3,
+	0xb3c5, 0xb3df,
+	0xb3e1, 0xb3fb,
+	0xb3fd, 0xb417,
+	0xb419, 0xb433,
+	0xb435, 0xb44f,
+	0xb451, 0xb46b,
+	0xb46d, 0xb487,
+	0xb489, 0xb4a3,
+	0xb4a5, 0xb4bf,
+	0xb4c1, 0xb4db,
+	0xb4dd, 0xb4f7,
+	0xb4f9, 0xb513,
+	0xb515, 0xb52f,
+	0xb531, 0xb54b,
+	0xb54d, 0xb567,
+	0xb569, 0xb583,
+	0xb585, 0xb59f,
+	0xb5a1, 0xb5bb,
+	0xb5bd, 0xb5d7,
+	0xb5d9, 0xb5f3,
+	0xb5f5, 0xb60f,
+	0xb611, 0xb62b,
+	0xb62d, 0xb647,
+	0xb649, 0xb663,
+	0xb665, 0xb67f,
+	0xb681, 0xb69b,
+	0xb69d, 0xb6b7,
+	0xb6b9, 0xb6d3,
+	0xb6d5, 0xb6ef,
+	0xb6f1, 0xb70b,
+	0xb70d, 0xb727,
+	0xb729, 0xb743,
+	0xb745, 0xb75f,
+	0xb761, 0xb77b,
+	0xb77d, 0xb797,
+	0xb799, 0xb7b3,
+	0xb7b5, 0xb7cf,
+	0xb7d1, 0xb7eb,
+	0xb7ed, 0xb807,
+	0xb809, 0xb823,
+	0xb825, 0xb83f,
+	0xb841, 0xb85b,
+	0xb85d, 0xb877,
+	0xb879, 0xb893,
+	0xb895, 0xb8af,
+	0xb8b1, 0xb8cb,
+	0xb8cd, 0xb8e7,
+	0xb8e9, 0xb903,
+	0xb905, 0xb91f,
+	0xb921, 0xb93b,
+	0xb93d, 0xb957,
+	0xb959, 0xb973,
+	0xb975, 0xb98f,
+	0xb991, 0xb9ab,
+	0xb9ad, 0xb9c7,
+	0xb9c9, 0xb9e3,
+	0xb9e5, 0xb9ff,
+	0xba01, 0xba1b,
+	0xba1d, 0xba37,
+	0xba39, 0xba53,
+	0xba55, 0xba6f,
+	0xba71, 0xba8b,
+	0xba8d, 0xbaa7,
+	0xbaa9, 0xbac3,
+	0xbac5, 0xbadf,
+	0xbae1, 0xbafb,
+	0xbafd, 0xbb17,
+	0xbb19, 0xbb33,
+	0xbb35, 0xbb4f,
+	0xbb51, 0xbb6b,
+	0xbb6d, 0xbb87,
+	0xbb89, 0xbba3,
+	0xbba5, 0xbbbf,
+	0xbbc1, 0xbbdb,
+	0xbbdd, 0xbbf7,
+	0xbbf9, 0xbc13,
+	0xbc15, 0xbc2f,
+	0xbc31, 0xbc4b,
+	0xbc4d, 0xbc67,
+	0xbc69, 0xbc83,
+	0xbc85, 0xbc9f,
+	0xbca1, 0xbcbb,
+	0xbcbd, 0xbcd7,
+	0xbcd9, 0xbcf3,
+	0xbcf5, 0xbd0f,
+	0xbd11, 0xbd2b,
+	0xbd2d, 0xbd47,
+	0xbd49, 0xbd63,
+	0xbd65, 0xbd7f,
+	0xbd81, 0xbd9b,
+	0xbd9d, 0xbdb7,
+	0xbdb9, 0xbdd3,
+	0xbdd5, 0xbdef,
+	0xbdf1, 0xbe0b,
+	0xbe0d, 0xbe27,
+	0xbe29, 0xbe43,
+	0xbe45, 0xbe5f,
+	0xbe61, 0xbe7b,
+	0xbe7d, 0xbe97,
+	0xbe99, 0xbeb3,
+	0xbeb5, 0xbecf,
+	0xbed1, 0xbeeb,
+	0xbeed, 0xbf07,
+	0xbf09, 0xbf23,
+	0xbf25, 0xbf3f,
+	0xbf41, 0xbf5b,
+	0xbf5d, 0xbf77,
+	0xbf79, 0xbf93,
+	0xbf95, 0xbfaf,
+	0xbfb1, 0xbfcb,
+	0xbfcd, 0xbfe7,
+	0xbfe9, 0xc003,
+	0xc005, 0xc01f,
+	0xc021, 0xc03b,
+	0xc03d, 0xc057,
+	0xc059, 0xc073,
+	0xc075, 0xc08f,
+	0xc091, 0xc0ab,
+	0xc0ad, 0xc0c7,
+	0xc0c9, 0xc0e3,
+	0xc0e5, 0xc0ff,
+	0xc101, 0xc11b,
+	0xc11d, 0xc137,
+	0xc139, 0xc153,
+	0xc155, 0xc16f,
+	0xc171, 0xc18b,
+	0xc18d, 0xc1a7,
+	0xc1a9, 0xc1c3,
+	0xc1c5, 0xc1df,
+	0xc1e1, 0xc1fb,
+	0xc1fd, 0xc217,
+	0xc219, 0xc233,
+	0xc235, 0xc24f,
+	0xc251, 0xc26b,
+	0xc26d, 0xc287,
+	0xc289, 0xc2a3,
+	0xc2a5, 0xc2bf,
+	0xc2c1, 0xc2db,
+	0xc2dd, 0xc2f7,
+	0xc2f9, 0xc313,
+	0xc315, 0xc32f,
+	0xc331, 0xc34b,
+	0xc34d, 0xc367,
+	0xc369, 0xc383,
+	0xc385, 0xc39f,
+	0xc3a1, 0xc3bb,
+	0xc3bd, 0xc3d7,
+	0xc3d9, 0xc3f3,
+	0xc3f5, 0xc40f,
+	0xc411, 0xc42b,
+	0xc42d, 0xc447,
+	0xc449, 0xc463,
+	0xc465, 0xc47f,
+	0xc481, 0xc49b,
+	0xc49d, 0xc4b7,
+	0xc4b9, 0xc4d3,
+	0xc4d5, 0xc4ef,
+	0xc4f1, 0xc50b,
+	0xc50d, 0xc527,
+	0xc529, 0xc543,
+	0xc545, 0xc55f,
+	0xc561, 0xc57b,
+	0xc57d, 0xc597,
+	0xc599, 0xc5b3,
+	0xc5b5, 0xc5cf,
+	0xc5d1, 0xc5eb,
+	0xc5ed, 0xc607,
+	0xc609, 0xc623,
+	0xc625, 0xc63f,
+	0xc641, 0xc65b,
+	0xc65d, 0xc677,
+	0xc679, 0xc693,
+	0xc695, 0xc6af,
+	0xc6b1, 0xc6cb,
+	0xc6cd, 0xc6e7,
+	0xc6e9, 0xc703,
+	0xc705, 0xc71f,
+	0xc721, 0xc73b,
+	0xc73d, 0xc757,
+	0xc759, 0xc773,
+	0xc775, 0xc78f,
+	0xc791, 0xc7ab,
+	0xc7ad, 0xc7c7,
+	0xc7c9, 0xc7e3,
+	0xc7e5, 0xc7ff,
+	0xc801, 0xc81b,
+	0xc81d, 0xc837,
+	0xc839, 0xc853,
+	0xc855, 0xc86f,
+	0xc871, 0xc88b,
+	0xc88d, 0xc8a7,
+	0xc8a9, 0xc8c3,
+	0xc8c5, 0xc8df,
+	0xc8e1, 0xc8fb,
+	0xc8fd, 0xc917,
+	0xc919, 0xc933,
+	0xc935, 0xc94f,
+	0xc951, 0xc96b,
+	0xc96d, 0xc987,
+	0xc989, 0xc9a3,
+	0xc9a5, 0xc9bf,
+	0xc9c1, 0xc9db,
+	0xc9dd, 0xc9f7,
+	0xc9f9, 0xca13,
+	0xca15, 0xca2f,
+	0xca31, 0xca4b,
+	0xca4d, 0xca67,
+	0xca69, 0xca83,
+	0xca85, 0xca9f,
+	0xcaa1, 0xcabb,
+	0xcabd, 0xcad7,
+	0xcad9, 0xcaf3,
+	0xcaf5, 0xcb0f,
+	0xcb11, 0xcb2b,
+	0xcb2d, 0xcb47,
+	0xcb49, 0xcb63,
+	0xcb65, 0xcb7f,
+	0xcb81, 0xcb9b,
+	0xcb9d, 0xcbb7,
+	0xcbb9, 0xcbd3,
+	0xcbd5, 0xcbef,
+	0xcbf1, 0xcc0b,
+	0xcc0d, 0xcc27,
+	0xcc29, 0xcc43,
+	0xcc45, 0xcc5f,
+	0xcc61, 0xcc7b,
+	0xcc7d, 0xcc97,
+	0xcc99, 0xccb3,
+	0xccb5, 0xcccf,
+	0xccd1, 0xcceb,
+	0xcced, 0xcd07,
+	0xcd09, 0xcd23,
+	0xcd25, 0xcd3f,
+	0xcd41, 0xcd5b,
+	0xcd5d, 0xcd77,
+	0xcd79, 0xcd93,
+	0xcd95, 0xcdaf,
+	0xcdb1, 0xcdcb,
+	0xcdcd, 0xcde7,
+	0xcde9, 0xce03,
+	0xce05, 0xce1f,
+	0xce21, 0xce3b,
+	0xce3d, 0xce57,
+	0xce59, 0xce73,
+	0xce75, 0xce8f,
+	0xce91, 0xceab,
+	0xcead, 0xcec7,
+	0xcec9, 0xcee3,
+	0xcee5, 0xceff,
+	0xcf01, 0xcf1b,
+	0xcf1d, 0xcf37,
+	0xcf39, 0xcf53,
+	0xcf55, 0xcf6f,
+	0xcf71, 0xcf8b,
+	0xcf8d, 0xcfa7,
+	0xcfa9, 0xcfc3,
+	0xcfc5, 0xcfdf,
+	0xcfe1, 0xcffb,
+	0xcffd, 0xd017,
+	0xd019, 0xd033,
+	0xd035, 0xd04f,
+	0xd051, 0xd06b,
+	0xd06d, 0xd087,
+	0xd089, 0xd0a3,
+	0xd0a5, 0xd0bf,
+	0xd0c1, 0xd0db,
+	0xd0dd, 0xd0f7,
+	0xd0f9, 0xd113,
+	0xd115, 0xd12f,
+	0xd131, 0xd14b,
+	0xd14d, 0xd167,
+	0xd169, 0xd183,
+	0xd185, 0xd19f,
+	0xd1a1, 0xd1bb,
+	0xd1bd, 0xd1d7,
+	0xd1d9, 0xd1f3,
+	0xd1f5, 0xd20f,
+	0xd211, 0xd22b,
+	0xd22d, 0xd247,
+	0xd249, 0xd263,
+	0xd265, 0xd27f,
+	0xd281, 0xd29b,
+	0xd29d, 0xd2b7,
+	0xd2b9, 0xd2d3,
+	0xd2d5, 0xd2ef,
+	0xd2f1, 0xd30b,
+	0xd30d, 0xd327,
+	0xd329, 0xd343,
+	0xd345, 0xd35f,
+	0xd361, 0xd37b,
+	0xd37d, 0xd397,
+	0xd399, 0xd3b3,
+	0xd3b5, 0xd3cf,
+	0xd3d1, 0xd3eb,
+	0xd3ed, 0xd407,
+	0xd409, 0xd423,
+	0xd425, 0xd43f,
+	0xd441, 0xd45b,
+	0xd45d, 0xd477,
+	0xd479, 0xd493,
+	0xd495, 0xd4af,
+	0xd4b1, 0xd4cb,
+	0xd4cd, 0xd4e7,
+	0xd4e9, 0xd503,
+	0xd505, 0xd51f,
+	0xd521, 0xd53b,
+	0xd53d, 0xd557,
+	0xd559, 0xd573,
+	0xd575, 0xd58f,
+	0xd591, 0xd5ab,
+	0xd5ad, 0xd5c7,
+	0xd5c9, 0xd5e3,
+	0xd5e5, 0xd5ff,
+	0xd601, 0xd61b,
+	0xd61d, 0xd637,
+	0xd639, 0xd653,
+	0xd655, 0xd66f,
+	0xd671, 0xd68b,
+	0xd68d, 0xd6a7,
+	0xd6a9, 0xd6c3,
+	0xd6c5, 0xd6df,
+	0xd6e1, 0xd6fb,
+	0xd6fd, 0xd717,
+	0xd719, 0xd733,
+	0xd735, 0xd74f,
+	0xd751, 0xd76b,
+	0xd76d, 0xd787,
+	0xd789, 0xd7a3,
+}; /* CR_Grapheme_Cluster_Break_LVT */
+
+/* 'Grapheme_Cluster_Break_ZWJ': Grapheme_Cluster_Break=ZWJ */
+static const OnigCodePoint CR_Grapheme_Cluster_Break_ZWJ[] = {
+	1,
+	0x200d, 0x200d,
+}; /* CR_Grapheme_Cluster_Break_ZWJ */
+
+/* 'In_Basic_Latin': Block */
+#define CR_In_Basic_Latin CR_ASCII
+
+/* 'In_Latin_1_Supplement': Block */
+static const OnigCodePoint CR_In_Latin_1_Supplement[] = {
+	1,
+	0x0080, 0x00ff,
+}; /* CR_In_Latin_1_Supplement */
+
+/* 'In_Latin_Extended_A': Block */
+static const OnigCodePoint CR_In_Latin_Extended_A[] = {
+	1,
+	0x0100, 0x017f,
+}; /* CR_In_Latin_Extended_A */
+
+/* 'In_Latin_Extended_B': Block */
+static const OnigCodePoint CR_In_Latin_Extended_B[] = {
+	1,
+	0x0180, 0x024f,
+}; /* CR_In_Latin_Extended_B */
+
+/* 'In_IPA_Extensions': Block */
+static const OnigCodePoint CR_In_IPA_Extensions[] = {
+	1,
+	0x0250, 0x02af,
+}; /* CR_In_IPA_Extensions */
+
+/* 'In_Spacing_Modifier_Letters': Block */
+static const OnigCodePoint CR_In_Spacing_Modifier_Letters[] = {
+	1,
+	0x02b0, 0x02ff,
+}; /* CR_In_Spacing_Modifier_Letters */
+
+/* 'In_Combining_Diacritical_Marks': Block */
+static const OnigCodePoint CR_In_Combining_Diacritical_Marks[] = {
+	1,
+	0x0300, 0x036f,
+}; /* CR_In_Combining_Diacritical_Marks */
+
+/* 'In_Greek_and_Coptic': Block */
+static const OnigCodePoint CR_In_Greek_and_Coptic[] = {
+	1,
+	0x0370, 0x03ff,
+}; /* CR_In_Greek_and_Coptic */
+
+/* 'In_Cyrillic': Block */
+static const OnigCodePoint CR_In_Cyrillic[] = {
+	1,
+	0x0400, 0x04ff,
+}; /* CR_In_Cyrillic */
+
+/* 'In_Cyrillic_Supplement': Block */
+static const OnigCodePoint CR_In_Cyrillic_Supplement[] = {
+	1,
+	0x0500, 0x052f,
+}; /* CR_In_Cyrillic_Supplement */
+
+/* 'In_Armenian': Block */
+static const OnigCodePoint CR_In_Armenian[] = {
+	1,
+	0x0530, 0x058f,
+}; /* CR_In_Armenian */
+
+/* 'In_Hebrew': Block */
+static const OnigCodePoint CR_In_Hebrew[] = {
+	1,
+	0x0590, 0x05ff,
+}; /* CR_In_Hebrew */
+
+/* 'In_Arabic': Block */
+static const OnigCodePoint CR_In_Arabic[] = {
+	1,
+	0x0600, 0x06ff,
+}; /* CR_In_Arabic */
+
+/* 'In_Syriac': Block */
+static const OnigCodePoint CR_In_Syriac[] = {
+	1,
+	0x0700, 0x074f,
+}; /* CR_In_Syriac */
+
+/* 'In_Arabic_Supplement': Block */
+static const OnigCodePoint CR_In_Arabic_Supplement[] = {
+	1,
+	0x0750, 0x077f,
+}; /* CR_In_Arabic_Supplement */
+
+/* 'In_Thaana': Block */
+static const OnigCodePoint CR_In_Thaana[] = {
+	1,
+	0x0780, 0x07bf,
+}; /* CR_In_Thaana */
+
+/* 'In_NKo': Block */
+static const OnigCodePoint CR_In_NKo[] = {
+	1,
+	0x07c0, 0x07ff,
+}; /* CR_In_NKo */
+
+/* 'In_Samaritan': Block */
+static const OnigCodePoint CR_In_Samaritan[] = {
+	1,
+	0x0800, 0x083f,
+}; /* CR_In_Samaritan */
+
+/* 'In_Mandaic': Block */
+static const OnigCodePoint CR_In_Mandaic[] = {
+	1,
+	0x0840, 0x085f,
+}; /* CR_In_Mandaic */
+
+/* 'In_Syriac_Supplement': Block */
+static const OnigCodePoint CR_In_Syriac_Supplement[] = {
+	1,
+	0x0860, 0x086f,
+}; /* CR_In_Syriac_Supplement */
+
+/* 'In_Arabic_Extended_A': Block */
+static const OnigCodePoint CR_In_Arabic_Extended_A[] = {
+	1,
+	0x08a0, 0x08ff,
+}; /* CR_In_Arabic_Extended_A */
+
+/* 'In_Devanagari': Block */
+static const OnigCodePoint CR_In_Devanagari[] = {
+	1,
+	0x0900, 0x097f,
+}; /* CR_In_Devanagari */
+
+/* 'In_Bengali': Block */
+static const OnigCodePoint CR_In_Bengali[] = {
+	1,
+	0x0980, 0x09ff,
+}; /* CR_In_Bengali */
+
+/* 'In_Gurmukhi': Block */
+static const OnigCodePoint CR_In_Gurmukhi[] = {
+	1,
+	0x0a00, 0x0a7f,
+}; /* CR_In_Gurmukhi */
+
+/* 'In_Gujarati': Block */
+static const OnigCodePoint CR_In_Gujarati[] = {
+	1,
+	0x0a80, 0x0aff,
+}; /* CR_In_Gujarati */
+
+/* 'In_Oriya': Block */
+static const OnigCodePoint CR_In_Oriya[] = {
+	1,
+	0x0b00, 0x0b7f,
+}; /* CR_In_Oriya */
+
+/* 'In_Tamil': Block */
+static const OnigCodePoint CR_In_Tamil[] = {
+	1,
+	0x0b80, 0x0bff,
+}; /* CR_In_Tamil */
+
+/* 'In_Telugu': Block */
+static const OnigCodePoint CR_In_Telugu[] = {
+	1,
+	0x0c00, 0x0c7f,
+}; /* CR_In_Telugu */
+
+/* 'In_Kannada': Block */
+static const OnigCodePoint CR_In_Kannada[] = {
+	1,
+	0x0c80, 0x0cff,
+}; /* CR_In_Kannada */
+
+/* 'In_Malayalam': Block */
+static const OnigCodePoint CR_In_Malayalam[] = {
+	1,
+	0x0d00, 0x0d7f,
+}; /* CR_In_Malayalam */
+
+/* 'In_Sinhala': Block */
+static const OnigCodePoint CR_In_Sinhala[] = {
+	1,
+	0x0d80, 0x0dff,
+}; /* CR_In_Sinhala */
+
+/* 'In_Thai': Block */
+static const OnigCodePoint CR_In_Thai[] = {
+	1,
+	0x0e00, 0x0e7f,
+}; /* CR_In_Thai */
+
+/* 'In_Lao': Block */
+static const OnigCodePoint CR_In_Lao[] = {
+	1,
+	0x0e80, 0x0eff,
+}; /* CR_In_Lao */
+
+/* 'In_Tibetan': Block */
+static const OnigCodePoint CR_In_Tibetan[] = {
+	1,
+	0x0f00, 0x0fff,
+}; /* CR_In_Tibetan */
+
+/* 'In_Myanmar': Block */
+static const OnigCodePoint CR_In_Myanmar[] = {
+	1,
+	0x1000, 0x109f,
+}; /* CR_In_Myanmar */
+
+/* 'In_Georgian': Block */
+static const OnigCodePoint CR_In_Georgian[] = {
+	1,
+	0x10a0, 0x10ff,
+}; /* CR_In_Georgian */
+
+/* 'In_Hangul_Jamo': Block */
+static const OnigCodePoint CR_In_Hangul_Jamo[] = {
+	1,
+	0x1100, 0x11ff,
+}; /* CR_In_Hangul_Jamo */
+
+/* 'In_Ethiopic': Block */
+static const OnigCodePoint CR_In_Ethiopic[] = {
+	1,
+	0x1200, 0x137f,
+}; /* CR_In_Ethiopic */
+
+/* 'In_Ethiopic_Supplement': Block */
+static const OnigCodePoint CR_In_Ethiopic_Supplement[] = {
+	1,
+	0x1380, 0x139f,
+}; /* CR_In_Ethiopic_Supplement */
+
+/* 'In_Cherokee': Block */
+static const OnigCodePoint CR_In_Cherokee[] = {
+	1,
+	0x13a0, 0x13ff,
+}; /* CR_In_Cherokee */
+
+/* 'In_Unified_Canadian_Aboriginal_Syllabics': Block */
+static const OnigCodePoint CR_In_Unified_Canadian_Aboriginal_Syllabics[] = {
+	1,
+	0x1400, 0x167f,
+}; /* CR_In_Unified_Canadian_Aboriginal_Syllabics */
+
+/* 'In_Ogham': Block */
+static const OnigCodePoint CR_In_Ogham[] = {
+	1,
+	0x1680, 0x169f,
+}; /* CR_In_Ogham */
+
+/* 'In_Runic': Block */
+static const OnigCodePoint CR_In_Runic[] = {
+	1,
+	0x16a0, 0x16ff,
+}; /* CR_In_Runic */
+
+/* 'In_Tagalog': Block */
+static const OnigCodePoint CR_In_Tagalog[] = {
+	1,
+	0x1700, 0x171f,
+}; /* CR_In_Tagalog */
+
+/* 'In_Hanunoo': Block */
+static const OnigCodePoint CR_In_Hanunoo[] = {
+	1,
+	0x1720, 0x173f,
+}; /* CR_In_Hanunoo */
+
+/* 'In_Buhid': Block */
+static const OnigCodePoint CR_In_Buhid[] = {
+	1,
+	0x1740, 0x175f,
+}; /* CR_In_Buhid */
+
+/* 'In_Tagbanwa': Block */
+static const OnigCodePoint CR_In_Tagbanwa[] = {
+	1,
+	0x1760, 0x177f,
+}; /* CR_In_Tagbanwa */
+
+/* 'In_Khmer': Block */
+static const OnigCodePoint CR_In_Khmer[] = {
+	1,
+	0x1780, 0x17ff,
+}; /* CR_In_Khmer */
+
+/* 'In_Mongolian': Block */
+static const OnigCodePoint CR_In_Mongolian[] = {
+	1,
+	0x1800, 0x18af,
+}; /* CR_In_Mongolian */
+
+/* 'In_Unified_Canadian_Aboriginal_Syllabics_Extended': Block */
+static const OnigCodePoint CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended[] = {
+	1,
+	0x18b0, 0x18ff,
+}; /* CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended */
+
+/* 'In_Limbu': Block */
+static const OnigCodePoint CR_In_Limbu[] = {
+	1,
+	0x1900, 0x194f,
+}; /* CR_In_Limbu */
+
+/* 'In_Tai_Le': Block */
+static const OnigCodePoint CR_In_Tai_Le[] = {
+	1,
+	0x1950, 0x197f,
+}; /* CR_In_Tai_Le */
+
+/* 'In_New_Tai_Lue': Block */
+static const OnigCodePoint CR_In_New_Tai_Lue[] = {
+	1,
+	0x1980, 0x19df,
+}; /* CR_In_New_Tai_Lue */
+
+/* 'In_Khmer_Symbols': Block */
+static const OnigCodePoint CR_In_Khmer_Symbols[] = {
+	1,
+	0x19e0, 0x19ff,
+}; /* CR_In_Khmer_Symbols */
+
+/* 'In_Buginese': Block */
+static const OnigCodePoint CR_In_Buginese[] = {
+	1,
+	0x1a00, 0x1a1f,
+}; /* CR_In_Buginese */
+
+/* 'In_Tai_Tham': Block */
+static const OnigCodePoint CR_In_Tai_Tham[] = {
+	1,
+	0x1a20, 0x1aaf,
+}; /* CR_In_Tai_Tham */
+
+/* 'In_Combining_Diacritical_Marks_Extended': Block */
+static const OnigCodePoint CR_In_Combining_Diacritical_Marks_Extended[] = {
+	1,
+	0x1ab0, 0x1aff,
+}; /* CR_In_Combining_Diacritical_Marks_Extended */
+
+/* 'In_Balinese': Block */
+static const OnigCodePoint CR_In_Balinese[] = {
+	1,
+	0x1b00, 0x1b7f,
+}; /* CR_In_Balinese */
+
+/* 'In_Sundanese': Block */
+static const OnigCodePoint CR_In_Sundanese[] = {
+	1,
+	0x1b80, 0x1bbf,
+}; /* CR_In_Sundanese */
+
+/* 'In_Batak': Block */
+static const OnigCodePoint CR_In_Batak[] = {
+	1,
+	0x1bc0, 0x1bff,
+}; /* CR_In_Batak */
+
+/* 'In_Lepcha': Block */
+static const OnigCodePoint CR_In_Lepcha[] = {
+	1,
+	0x1c00, 0x1c4f,
+}; /* CR_In_Lepcha */
+
+/* 'In_Ol_Chiki': Block */
+#define CR_In_Ol_Chiki CR_Ol_Chiki
+
+/* 'In_Cyrillic_Extended_C': Block */
+static const OnigCodePoint CR_In_Cyrillic_Extended_C[] = {
+	1,
+	0x1c80, 0x1c8f,
+}; /* CR_In_Cyrillic_Extended_C */
+
+/* 'In_Georgian_Extended': Block */
+static const OnigCodePoint CR_In_Georgian_Extended[] = {
+	1,
+	0x1c90, 0x1cbf,
+}; /* CR_In_Georgian_Extended */
+
+/* 'In_Sundanese_Supplement': Block */
+static const OnigCodePoint CR_In_Sundanese_Supplement[] = {
+	1,
+	0x1cc0, 0x1ccf,
+}; /* CR_In_Sundanese_Supplement */
+
+/* 'In_Vedic_Extensions': Block */
+static const OnigCodePoint CR_In_Vedic_Extensions[] = {
+	1,
+	0x1cd0, 0x1cff,
+}; /* CR_In_Vedic_Extensions */
+
+/* 'In_Phonetic_Extensions': Block */
+static const OnigCodePoint CR_In_Phonetic_Extensions[] = {
+	1,
+	0x1d00, 0x1d7f,
+}; /* CR_In_Phonetic_Extensions */
+
+/* 'In_Phonetic_Extensions_Supplement': Block */
+static const OnigCodePoint CR_In_Phonetic_Extensions_Supplement[] = {
+	1,
+	0x1d80, 0x1dbf,
+}; /* CR_In_Phonetic_Extensions_Supplement */
+
+/* 'In_Combining_Diacritical_Marks_Supplement': Block */
+static const OnigCodePoint CR_In_Combining_Diacritical_Marks_Supplement[] = {
+	1,
+	0x1dc0, 0x1dff,
+}; /* CR_In_Combining_Diacritical_Marks_Supplement */
+
+/* 'In_Latin_Extended_Additional': Block */
+static const OnigCodePoint CR_In_Latin_Extended_Additional[] = {
+	1,
+	0x1e00, 0x1eff,
+}; /* CR_In_Latin_Extended_Additional */
+
+/* 'In_Greek_Extended': Block */
+static const OnigCodePoint CR_In_Greek_Extended[] = {
+	1,
+	0x1f00, 0x1fff,
+}; /* CR_In_Greek_Extended */
+
+/* 'In_General_Punctuation': Block */
+static const OnigCodePoint CR_In_General_Punctuation[] = {
+	1,
+	0x2000, 0x206f,
+}; /* CR_In_General_Punctuation */
+
+/* 'In_Superscripts_and_Subscripts': Block */
+static const OnigCodePoint CR_In_Superscripts_and_Subscripts[] = {
+	1,
+	0x2070, 0x209f,
+}; /* CR_In_Superscripts_and_Subscripts */
+
+/* 'In_Currency_Symbols': Block */
+static const OnigCodePoint CR_In_Currency_Symbols[] = {
+	1,
+	0x20a0, 0x20cf,
+}; /* CR_In_Currency_Symbols */
+
+/* 'In_Combining_Diacritical_Marks_for_Symbols': Block */
+static const OnigCodePoint CR_In_Combining_Diacritical_Marks_for_Symbols[] = {
+	1,
+	0x20d0, 0x20ff,
+}; /* CR_In_Combining_Diacritical_Marks_for_Symbols */
+
+/* 'In_Letterlike_Symbols': Block */
+static const OnigCodePoint CR_In_Letterlike_Symbols[] = {
+	1,
+	0x2100, 0x214f,
+}; /* CR_In_Letterlike_Symbols */
+
+/* 'In_Number_Forms': Block */
+static const OnigCodePoint CR_In_Number_Forms[] = {
+	1,
+	0x2150, 0x218f,
+}; /* CR_In_Number_Forms */
+
+/* 'In_Arrows': Block */
+static const OnigCodePoint CR_In_Arrows[] = {
+	1,
+	0x2190, 0x21ff,
+}; /* CR_In_Arrows */
+
+/* 'In_Mathematical_Operators': Block */
+static const OnigCodePoint CR_In_Mathematical_Operators[] = {
+	1,
+	0x2200, 0x22ff,
+}; /* CR_In_Mathematical_Operators */
+
+/* 'In_Miscellaneous_Technical': Block */
+static const OnigCodePoint CR_In_Miscellaneous_Technical[] = {
+	1,
+	0x2300, 0x23ff,
+}; /* CR_In_Miscellaneous_Technical */
+
+/* 'In_Control_Pictures': Block */
+static const OnigCodePoint CR_In_Control_Pictures[] = {
+	1,
+	0x2400, 0x243f,
+}; /* CR_In_Control_Pictures */
+
+/* 'In_Optical_Character_Recognition': Block */
+static const OnigCodePoint CR_In_Optical_Character_Recognition[] = {
+	1,
+	0x2440, 0x245f,
+}; /* CR_In_Optical_Character_Recognition */
+
+/* 'In_Enclosed_Alphanumerics': Block */
+static const OnigCodePoint CR_In_Enclosed_Alphanumerics[] = {
+	1,
+	0x2460, 0x24ff,
+}; /* CR_In_Enclosed_Alphanumerics */
+
+/* 'In_Box_Drawing': Block */
+static const OnigCodePoint CR_In_Box_Drawing[] = {
+	1,
+	0x2500, 0x257f,
+}; /* CR_In_Box_Drawing */
+
+/* 'In_Block_Elements': Block */
+static const OnigCodePoint CR_In_Block_Elements[] = {
+	1,
+	0x2580, 0x259f,
+}; /* CR_In_Block_Elements */
+
+/* 'In_Geometric_Shapes': Block */
+static const OnigCodePoint CR_In_Geometric_Shapes[] = {
+	1,
+	0x25a0, 0x25ff,
+}; /* CR_In_Geometric_Shapes */
+
+/* 'In_Miscellaneous_Symbols': Block */
+static const OnigCodePoint CR_In_Miscellaneous_Symbols[] = {
+	1,
+	0x2600, 0x26ff,
+}; /* CR_In_Miscellaneous_Symbols */
+
+/* 'In_Dingbats': Block */
+static const OnigCodePoint CR_In_Dingbats[] = {
+	1,
+	0x2700, 0x27bf,
+}; /* CR_In_Dingbats */
+
+/* 'In_Miscellaneous_Mathematical_Symbols_A': Block */
+static const OnigCodePoint CR_In_Miscellaneous_Mathematical_Symbols_A[] = {
+	1,
+	0x27c0, 0x27ef,
+}; /* CR_In_Miscellaneous_Mathematical_Symbols_A */
+
+/* 'In_Supplemental_Arrows_A': Block */
+static const OnigCodePoint CR_In_Supplemental_Arrows_A[] = {
+	1,
+	0x27f0, 0x27ff,
+}; /* CR_In_Supplemental_Arrows_A */
+
+/* 'In_Braille_Patterns': Block */
+#define CR_In_Braille_Patterns CR_Braille
+
+/* 'In_Supplemental_Arrows_B': Block */
+static const OnigCodePoint CR_In_Supplemental_Arrows_B[] = {
+	1,
+	0x2900, 0x297f,
+}; /* CR_In_Supplemental_Arrows_B */
+
+/* 'In_Miscellaneous_Mathematical_Symbols_B': Block */
+static const OnigCodePoint CR_In_Miscellaneous_Mathematical_Symbols_B[] = {
+	1,
+	0x2980, 0x29ff,
+}; /* CR_In_Miscellaneous_Mathematical_Symbols_B */
+
+/* 'In_Supplemental_Mathematical_Operators': Block */
+static const OnigCodePoint CR_In_Supplemental_Mathematical_Operators[] = {
+	1,
+	0x2a00, 0x2aff,
+}; /* CR_In_Supplemental_Mathematical_Operators */
+
+/* 'In_Miscellaneous_Symbols_and_Arrows': Block */
+static const OnigCodePoint CR_In_Miscellaneous_Symbols_and_Arrows[] = {
+	1,
+	0x2b00, 0x2bff,
+}; /* CR_In_Miscellaneous_Symbols_and_Arrows */
+
+/* 'In_Glagolitic': Block */
+static const OnigCodePoint CR_In_Glagolitic[] = {
+	1,
+	0x2c00, 0x2c5f,
+}; /* CR_In_Glagolitic */
+
+/* 'In_Latin_Extended_C': Block */
+static const OnigCodePoint CR_In_Latin_Extended_C[] = {
+	1,
+	0x2c60, 0x2c7f,
+}; /* CR_In_Latin_Extended_C */
+
+/* 'In_Coptic': Block */
+static const OnigCodePoint CR_In_Coptic[] = {
+	1,
+	0x2c80, 0x2cff,
+}; /* CR_In_Coptic */
+
+/* 'In_Georgian_Supplement': Block */
+static const OnigCodePoint CR_In_Georgian_Supplement[] = {
+	1,
+	0x2d00, 0x2d2f,
+}; /* CR_In_Georgian_Supplement */
+
+/* 'In_Tifinagh': Block */
+static const OnigCodePoint CR_In_Tifinagh[] = {
+	1,
+	0x2d30, 0x2d7f,
+}; /* CR_In_Tifinagh */
+
+/* 'In_Ethiopic_Extended': Block */
+static const OnigCodePoint CR_In_Ethiopic_Extended[] = {
+	1,
+	0x2d80, 0x2ddf,
+}; /* CR_In_Ethiopic_Extended */
+
+/* 'In_Cyrillic_Extended_A': Block */
+static const OnigCodePoint CR_In_Cyrillic_Extended_A[] = {
+	1,
+	0x2de0, 0x2dff,
+}; /* CR_In_Cyrillic_Extended_A */
+
+/* 'In_Supplemental_Punctuation': Block */
+static const OnigCodePoint CR_In_Supplemental_Punctuation[] = {
+	1,
+	0x2e00, 0x2e7f,
+}; /* CR_In_Supplemental_Punctuation */
+
+/* 'In_CJK_Radicals_Supplement': Block */
+static const OnigCodePoint CR_In_CJK_Radicals_Supplement[] = {
+	1,
+	0x2e80, 0x2eff,
+}; /* CR_In_CJK_Radicals_Supplement */
+
+/* 'In_Kangxi_Radicals': Block */
+static const OnigCodePoint CR_In_Kangxi_Radicals[] = {
+	1,
+	0x2f00, 0x2fdf,
+}; /* CR_In_Kangxi_Radicals */
+
+/* 'In_Ideographic_Description_Characters': Block */
+static const OnigCodePoint CR_In_Ideographic_Description_Characters[] = {
+	1,
+	0x2ff0, 0x2fff,
+}; /* CR_In_Ideographic_Description_Characters */
+
+/* 'In_CJK_Symbols_and_Punctuation': Block */
+static const OnigCodePoint CR_In_CJK_Symbols_and_Punctuation[] = {
+	1,
+	0x3000, 0x303f,
+}; /* CR_In_CJK_Symbols_and_Punctuation */
+
+/* 'In_Hiragana': Block */
+static const OnigCodePoint CR_In_Hiragana[] = {
+	1,
+	0x3040, 0x309f,
+}; /* CR_In_Hiragana */
+
+/* 'In_Katakana': Block */
+static const OnigCodePoint CR_In_Katakana[] = {
+	1,
+	0x30a0, 0x30ff,
+}; /* CR_In_Katakana */
+
+/* 'In_Bopomofo': Block */
+static const OnigCodePoint CR_In_Bopomofo[] = {
+	1,
+	0x3100, 0x312f,
+}; /* CR_In_Bopomofo */
+
+/* 'In_Hangul_Compatibility_Jamo': Block */
+static const OnigCodePoint CR_In_Hangul_Compatibility_Jamo[] = {
+	1,
+	0x3130, 0x318f,
+}; /* CR_In_Hangul_Compatibility_Jamo */
+
+/* 'In_Kanbun': Block */
+static const OnigCodePoint CR_In_Kanbun[] = {
+	1,
+	0x3190, 0x319f,
+}; /* CR_In_Kanbun */
+
+/* 'In_Bopomofo_Extended': Block */
+static const OnigCodePoint CR_In_Bopomofo_Extended[] = {
+	1,
+	0x31a0, 0x31bf,
+}; /* CR_In_Bopomofo_Extended */
+
+/* 'In_CJK_Strokes': Block */
+static const OnigCodePoint CR_In_CJK_Strokes[] = {
+	1,
+	0x31c0, 0x31ef,
+}; /* CR_In_CJK_Strokes */
+
+/* 'In_Katakana_Phonetic_Extensions': Block */
+static const OnigCodePoint CR_In_Katakana_Phonetic_Extensions[] = {
+	1,
+	0x31f0, 0x31ff,
+}; /* CR_In_Katakana_Phonetic_Extensions */
+
+/* 'In_Enclosed_CJK_Letters_and_Months': Block */
+static const OnigCodePoint CR_In_Enclosed_CJK_Letters_and_Months[] = {
+	1,
+	0x3200, 0x32ff,
+}; /* CR_In_Enclosed_CJK_Letters_and_Months */
+
+/* 'In_CJK_Compatibility': Block */
+static const OnigCodePoint CR_In_CJK_Compatibility[] = {
+	1,
+	0x3300, 0x33ff,
+}; /* CR_In_CJK_Compatibility */
+
+/* 'In_CJK_Unified_Ideographs_Extension_A': Block */
+static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_A[] = {
+	1,
+	0x3400, 0x4dbf,
+}; /* CR_In_CJK_Unified_Ideographs_Extension_A */
+
+/* 'In_Yijing_Hexagram_Symbols': Block */
+static const OnigCodePoint CR_In_Yijing_Hexagram_Symbols[] = {
+	1,
+	0x4dc0, 0x4dff,
+}; /* CR_In_Yijing_Hexagram_Symbols */
+
+/* 'In_CJK_Unified_Ideographs': Block */
+static const OnigCodePoint CR_In_CJK_Unified_Ideographs[] = {
+	1,
+	0x4e00, 0x9fff,
+}; /* CR_In_CJK_Unified_Ideographs */
+
+/* 'In_Yi_Syllables': Block */
+static const OnigCodePoint CR_In_Yi_Syllables[] = {
+	1,
+	0xa000, 0xa48f,
+}; /* CR_In_Yi_Syllables */
+
+/* 'In_Yi_Radicals': Block */
+static const OnigCodePoint CR_In_Yi_Radicals[] = {
+	1,
+	0xa490, 0xa4cf,
+}; /* CR_In_Yi_Radicals */
+
+/* 'In_Lisu': Block */
+#define CR_In_Lisu CR_Lisu
+
+/* 'In_Vai': Block */
+static const OnigCodePoint CR_In_Vai[] = {
+	1,
+	0xa500, 0xa63f,
+}; /* CR_In_Vai */
+
+/* 'In_Cyrillic_Extended_B': Block */
+static const OnigCodePoint CR_In_Cyrillic_Extended_B[] = {
+	1,
+	0xa640, 0xa69f,
+}; /* CR_In_Cyrillic_Extended_B */
+
+/* 'In_Bamum': Block */
+static const OnigCodePoint CR_In_Bamum[] = {
+	1,
+	0xa6a0, 0xa6ff,
+}; /* CR_In_Bamum */
+
+/* 'In_Modifier_Tone_Letters': Block */
+static const OnigCodePoint CR_In_Modifier_Tone_Letters[] = {
+	1,
+	0xa700, 0xa71f,
+}; /* CR_In_Modifier_Tone_Letters */
+
+/* 'In_Latin_Extended_D': Block */
+static const OnigCodePoint CR_In_Latin_Extended_D[] = {
+	1,
+	0xa720, 0xa7ff,
+}; /* CR_In_Latin_Extended_D */
+
+/* 'In_Syloti_Nagri': Block */
+static const OnigCodePoint CR_In_Syloti_Nagri[] = {
+	1,
+	0xa800, 0xa82f,
+}; /* CR_In_Syloti_Nagri */
+
+/* 'In_Common_Indic_Number_Forms': Block */
+static const OnigCodePoint CR_In_Common_Indic_Number_Forms[] = {
+	1,
+	0xa830, 0xa83f,
+}; /* CR_In_Common_Indic_Number_Forms */
+
+/* 'In_Phags_pa': Block */
+static const OnigCodePoint CR_In_Phags_pa[] = {
+	1,
+	0xa840, 0xa87f,
+}; /* CR_In_Phags_pa */
+
+/* 'In_Saurashtra': Block */
+static const OnigCodePoint CR_In_Saurashtra[] = {
+	1,
+	0xa880, 0xa8df,
+}; /* CR_In_Saurashtra */
+
+/* 'In_Devanagari_Extended': Block */
+static const OnigCodePoint CR_In_Devanagari_Extended[] = {
+	1,
+	0xa8e0, 0xa8ff,
+}; /* CR_In_Devanagari_Extended */
+
+/* 'In_Kayah_Li': Block */
+static const OnigCodePoint CR_In_Kayah_Li[] = {
+	1,
+	0xa900, 0xa92f,
+}; /* CR_In_Kayah_Li */
+
+/* 'In_Rejang': Block */
+static const OnigCodePoint CR_In_Rejang[] = {
+	1,
+	0xa930, 0xa95f,
+}; /* CR_In_Rejang */
+
+/* 'In_Hangul_Jamo_Extended_A': Block */
+static const OnigCodePoint CR_In_Hangul_Jamo_Extended_A[] = {
+	1,
+	0xa960, 0xa97f,
+}; /* CR_In_Hangul_Jamo_Extended_A */
+
+/* 'In_Javanese': Block */
+static const OnigCodePoint CR_In_Javanese[] = {
+	1,
+	0xa980, 0xa9df,
+}; /* CR_In_Javanese */
+
+/* 'In_Myanmar_Extended_B': Block */
+static const OnigCodePoint CR_In_Myanmar_Extended_B[] = {
+	1,
+	0xa9e0, 0xa9ff,
+}; /* CR_In_Myanmar_Extended_B */
+
+/* 'In_Cham': Block */
+static const OnigCodePoint CR_In_Cham[] = {
+	1,
+	0xaa00, 0xaa5f,
+}; /* CR_In_Cham */
+
+/* 'In_Myanmar_Extended_A': Block */
+static const OnigCodePoint CR_In_Myanmar_Extended_A[] = {
+	1,
+	0xaa60, 0xaa7f,
+}; /* CR_In_Myanmar_Extended_A */
+
+/* 'In_Tai_Viet': Block */
+static const OnigCodePoint CR_In_Tai_Viet[] = {
+	1,
+	0xaa80, 0xaadf,
+}; /* CR_In_Tai_Viet */
+
+/* 'In_Meetei_Mayek_Extensions': Block */
+static const OnigCodePoint CR_In_Meetei_Mayek_Extensions[] = {
+	1,
+	0xaae0, 0xaaff,
+}; /* CR_In_Meetei_Mayek_Extensions */
+
+/* 'In_Ethiopic_Extended_A': Block */
+static const OnigCodePoint CR_In_Ethiopic_Extended_A[] = {
+	1,
+	0xab00, 0xab2f,
+}; /* CR_In_Ethiopic_Extended_A */
+
+/* 'In_Latin_Extended_E': Block */
+static const OnigCodePoint CR_In_Latin_Extended_E[] = {
+	1,
+	0xab30, 0xab6f,
+}; /* CR_In_Latin_Extended_E */
+
+/* 'In_Cherokee_Supplement': Block */
+static const OnigCodePoint CR_In_Cherokee_Supplement[] = {
+	1,
+	0xab70, 0xabbf,
+}; /* CR_In_Cherokee_Supplement */
+
+/* 'In_Meetei_Mayek': Block */
+static const OnigCodePoint CR_In_Meetei_Mayek[] = {
+	1,
+	0xabc0, 0xabff,
+}; /* CR_In_Meetei_Mayek */
+
+/* 'In_Hangul_Syllables': Block */
+static const OnigCodePoint CR_In_Hangul_Syllables[] = {
+	1,
+	0xac00, 0xd7af,
+}; /* CR_In_Hangul_Syllables */
+
+/* 'In_Hangul_Jamo_Extended_B': Block */
+static const OnigCodePoint CR_In_Hangul_Jamo_Extended_B[] = {
+	1,
+	0xd7b0, 0xd7ff,
+}; /* CR_In_Hangul_Jamo_Extended_B */
+
+/* 'In_High_Surrogates': Block */
+static const OnigCodePoint CR_In_High_Surrogates[] = {
+	1,
+	0xd800, 0xdb7f,
+}; /* CR_In_High_Surrogates */
+
+/* 'In_High_Private_Use_Surrogates': Block */
+static const OnigCodePoint CR_In_High_Private_Use_Surrogates[] = {
+	1,
+	0xdb80, 0xdbff,
+}; /* CR_In_High_Private_Use_Surrogates */
+
+/* 'In_Low_Surrogates': Block */
+static const OnigCodePoint CR_In_Low_Surrogates[] = {
+	1,
+	0xdc00, 0xdfff,
+}; /* CR_In_Low_Surrogates */
+
+/* 'In_Private_Use_Area': Block */
+static const OnigCodePoint CR_In_Private_Use_Area[] = {
+	1,
+	0xe000, 0xf8ff,
+}; /* CR_In_Private_Use_Area */
+
+/* 'In_CJK_Compatibility_Ideographs': Block */
+static const OnigCodePoint CR_In_CJK_Compatibility_Ideographs[] = {
+	1,
+	0xf900, 0xfaff,
+}; /* CR_In_CJK_Compatibility_Ideographs */
+
+/* 'In_Alphabetic_Presentation_Forms': Block */
+static const OnigCodePoint CR_In_Alphabetic_Presentation_Forms[] = {
+	1,
+	0xfb00, 0xfb4f,
+}; /* CR_In_Alphabetic_Presentation_Forms */
+
+/* 'In_Arabic_Presentation_Forms_A': Block */
+static const OnigCodePoint CR_In_Arabic_Presentation_Forms_A[] = {
+	1,
+	0xfb50, 0xfdff,
+}; /* CR_In_Arabic_Presentation_Forms_A */
+
+/* 'In_Variation_Selectors': Block */
+static const OnigCodePoint CR_In_Variation_Selectors[] = {
+	1,
+	0xfe00, 0xfe0f,
+}; /* CR_In_Variation_Selectors */
+
+/* 'In_Vertical_Forms': Block */
+static const OnigCodePoint CR_In_Vertical_Forms[] = {
+	1,
+	0xfe10, 0xfe1f,
+}; /* CR_In_Vertical_Forms */
+
+/* 'In_Combining_Half_Marks': Block */
+static const OnigCodePoint CR_In_Combining_Half_Marks[] = {
+	1,
+	0xfe20, 0xfe2f,
+}; /* CR_In_Combining_Half_Marks */
+
+/* 'In_CJK_Compatibility_Forms': Block */
+static const OnigCodePoint CR_In_CJK_Compatibility_Forms[] = {
+	1,
+	0xfe30, 0xfe4f,
+}; /* CR_In_CJK_Compatibility_Forms */
+
+/* 'In_Small_Form_Variants': Block */
+static const OnigCodePoint CR_In_Small_Form_Variants[] = {
+	1,
+	0xfe50, 0xfe6f,
+}; /* CR_In_Small_Form_Variants */
+
+/* 'In_Arabic_Presentation_Forms_B': Block */
+static const OnigCodePoint CR_In_Arabic_Presentation_Forms_B[] = {
+	1,
+	0xfe70, 0xfeff,
+}; /* CR_In_Arabic_Presentation_Forms_B */
+
+/* 'In_Halfwidth_and_Fullwidth_Forms': Block */
+static const OnigCodePoint CR_In_Halfwidth_and_Fullwidth_Forms[] = {
+	1,
+	0xff00, 0xffef,
+}; /* CR_In_Halfwidth_and_Fullwidth_Forms */
+
+/* 'In_Specials': Block */
+static const OnigCodePoint CR_In_Specials[] = {
+	1,
+	0xfff0, 0xffff,
+}; /* CR_In_Specials */
+
+/* 'In_Linear_B_Syllabary': Block */
+static const OnigCodePoint CR_In_Linear_B_Syllabary[] = {
+	1,
+	0x10000, 0x1007f,
+}; /* CR_In_Linear_B_Syllabary */
+
+/* 'In_Linear_B_Ideograms': Block */
+static const OnigCodePoint CR_In_Linear_B_Ideograms[] = {
+	1,
+	0x10080, 0x100ff,
+}; /* CR_In_Linear_B_Ideograms */
+
+/* 'In_Aegean_Numbers': Block */
+static const OnigCodePoint CR_In_Aegean_Numbers[] = {
+	1,
+	0x10100, 0x1013f,
+}; /* CR_In_Aegean_Numbers */
+
+/* 'In_Ancient_Greek_Numbers': Block */
+static const OnigCodePoint CR_In_Ancient_Greek_Numbers[] = {
+	1,
+	0x10140, 0x1018f,
+}; /* CR_In_Ancient_Greek_Numbers */
+
+/* 'In_Ancient_Symbols': Block */
+static const OnigCodePoint CR_In_Ancient_Symbols[] = {
+	1,
+	0x10190, 0x101cf,
+}; /* CR_In_Ancient_Symbols */
+
+/* 'In_Phaistos_Disc': Block */
+static const OnigCodePoint CR_In_Phaistos_Disc[] = {
+	1,
+	0x101d0, 0x101ff,
+}; /* CR_In_Phaistos_Disc */
+
+/* 'In_Lycian': Block */
+static const OnigCodePoint CR_In_Lycian[] = {
+	1,
+	0x10280, 0x1029f,
+}; /* CR_In_Lycian */
+
+/* 'In_Carian': Block */
+static const OnigCodePoint CR_In_Carian[] = {
+	1,
+	0x102a0, 0x102df,
+}; /* CR_In_Carian */
+
+/* 'In_Coptic_Epact_Numbers': Block */
+static const OnigCodePoint CR_In_Coptic_Epact_Numbers[] = {
+	1,
+	0x102e0, 0x102ff,
+}; /* CR_In_Coptic_Epact_Numbers */
+
+/* 'In_Old_Italic': Block */
+static const OnigCodePoint CR_In_Old_Italic[] = {
+	1,
+	0x10300, 0x1032f,
+}; /* CR_In_Old_Italic */
+
+/* 'In_Gothic': Block */
+static const OnigCodePoint CR_In_Gothic[] = {
+	1,
+	0x10330, 0x1034f,
+}; /* CR_In_Gothic */
+
+/* 'In_Old_Permic': Block */
+static const OnigCodePoint CR_In_Old_Permic[] = {
+	1,
+	0x10350, 0x1037f,
+}; /* CR_In_Old_Permic */
+
+/* 'In_Ugaritic': Block */
+static const OnigCodePoint CR_In_Ugaritic[] = {
+	1,
+	0x10380, 0x1039f,
+}; /* CR_In_Ugaritic */
+
+/* 'In_Old_Persian': Block */
+static const OnigCodePoint CR_In_Old_Persian[] = {
+	1,
+	0x103a0, 0x103df,
+}; /* CR_In_Old_Persian */
+
+/* 'In_Deseret': Block */
+#define CR_In_Deseret CR_Deseret
+
+/* 'In_Shavian': Block */
+#define CR_In_Shavian CR_Shavian
+
+/* 'In_Osmanya': Block */
+static const OnigCodePoint CR_In_Osmanya[] = {
+	1,
+	0x10480, 0x104af,
+}; /* CR_In_Osmanya */
+
+/* 'In_Osage': Block */
+static const OnigCodePoint CR_In_Osage[] = {
+	1,
+	0x104b0, 0x104ff,
+}; /* CR_In_Osage */
+
+/* 'In_Elbasan': Block */
+static const OnigCodePoint CR_In_Elbasan[] = {
+	1,
+	0x10500, 0x1052f,
+}; /* CR_In_Elbasan */
+
+/* 'In_Caucasian_Albanian': Block */
+static const OnigCodePoint CR_In_Caucasian_Albanian[] = {
+	1,
+	0x10530, 0x1056f,
+}; /* CR_In_Caucasian_Albanian */
+
+/* 'In_Linear_A': Block */
+static const OnigCodePoint CR_In_Linear_A[] = {
+	1,
+	0x10600, 0x1077f,
+}; /* CR_In_Linear_A */
+
+/* 'In_Cypriot_Syllabary': Block */
+static const OnigCodePoint CR_In_Cypriot_Syllabary[] = {
+	1,
+	0x10800, 0x1083f,
+}; /* CR_In_Cypriot_Syllabary */
+
+/* 'In_Imperial_Aramaic': Block */
+static const OnigCodePoint CR_In_Imperial_Aramaic[] = {
+	1,
+	0x10840, 0x1085f,
+}; /* CR_In_Imperial_Aramaic */
+
+/* 'In_Palmyrene': Block */
+#define CR_In_Palmyrene CR_Palmyrene
+
+/* 'In_Nabataean': Block */
+static const OnigCodePoint CR_In_Nabataean[] = {
+	1,
+	0x10880, 0x108af,
+}; /* CR_In_Nabataean */
+
+/* 'In_Hatran': Block */
+static const OnigCodePoint CR_In_Hatran[] = {
+	1,
+	0x108e0, 0x108ff,
+}; /* CR_In_Hatran */
+
+/* 'In_Phoenician': Block */
+static const OnigCodePoint CR_In_Phoenician[] = {
+	1,
+	0x10900, 0x1091f,
+}; /* CR_In_Phoenician */
+
+/* 'In_Lydian': Block */
+static const OnigCodePoint CR_In_Lydian[] = {
+	1,
+	0x10920, 0x1093f,
+}; /* CR_In_Lydian */
+
+/* 'In_Meroitic_Hieroglyphs': Block */
+#define CR_In_Meroitic_Hieroglyphs CR_Meroitic_Hieroglyphs
+
+/* 'In_Meroitic_Cursive': Block */
+static const OnigCodePoint CR_In_Meroitic_Cursive[] = {
+	1,
+	0x109a0, 0x109ff,
+}; /* CR_In_Meroitic_Cursive */
+
+/* 'In_Kharoshthi': Block */
+static const OnigCodePoint CR_In_Kharoshthi[] = {
+	1,
+	0x10a00, 0x10a5f,
+}; /* CR_In_Kharoshthi */
+
+/* 'In_Old_South_Arabian': Block */
+#define CR_In_Old_South_Arabian CR_Old_South_Arabian
+
+/* 'In_Old_North_Arabian': Block */
+#define CR_In_Old_North_Arabian CR_Old_North_Arabian
+
+/* 'In_Manichaean': Block */
+static const OnigCodePoint CR_In_Manichaean[] = {
+	1,
+	0x10ac0, 0x10aff,
+}; /* CR_In_Manichaean */
+
+/* 'In_Avestan': Block */
+static const OnigCodePoint CR_In_Avestan[] = {
+	1,
+	0x10b00, 0x10b3f,
+}; /* CR_In_Avestan */
+
+/* 'In_Inscriptional_Parthian': Block */
+static const OnigCodePoint CR_In_Inscriptional_Parthian[] = {
+	1,
+	0x10b40, 0x10b5f,
+}; /* CR_In_Inscriptional_Parthian */
+
+/* 'In_Inscriptional_Pahlavi': Block */
+static const OnigCodePoint CR_In_Inscriptional_Pahlavi[] = {
+	1,
+	0x10b60, 0x10b7f,
+}; /* CR_In_Inscriptional_Pahlavi */
+
+/* 'In_Psalter_Pahlavi': Block */
+static const OnigCodePoint CR_In_Psalter_Pahlavi[] = {
+	1,
+	0x10b80, 0x10baf,
+}; /* CR_In_Psalter_Pahlavi */
+
+/* 'In_Old_Turkic': Block */
+static const OnigCodePoint CR_In_Old_Turkic[] = {
+	1,
+	0x10c00, 0x10c4f,
+}; /* CR_In_Old_Turkic */
+
+/* 'In_Old_Hungarian': Block */
+static const OnigCodePoint CR_In_Old_Hungarian[] = {
+	1,
+	0x10c80, 0x10cff,
+}; /* CR_In_Old_Hungarian */
+
+/* 'In_Hanifi_Rohingya': Block */
+static const OnigCodePoint CR_In_Hanifi_Rohingya[] = {
+	1,
+	0x10d00, 0x10d3f,
+}; /* CR_In_Hanifi_Rohingya */
+
+/* 'In_Rumi_Numeral_Symbols': Block */
+static const OnigCodePoint CR_In_Rumi_Numeral_Symbols[] = {
+	1,
+	0x10e60, 0x10e7f,
+}; /* CR_In_Rumi_Numeral_Symbols */
+
+/* 'In_Old_Sogdian': Block */
+static const OnigCodePoint CR_In_Old_Sogdian[] = {
+	1,
+	0x10f00, 0x10f2f,
+}; /* CR_In_Old_Sogdian */
+
+/* 'In_Sogdian': Block */
+static const OnigCodePoint CR_In_Sogdian[] = {
+	1,
+	0x10f30, 0x10f6f,
+}; /* CR_In_Sogdian */
+
+/* 'In_Elymaic': Block */
+static const OnigCodePoint CR_In_Elymaic[] = {
+	1,
+	0x10fe0, 0x10fff,
+}; /* CR_In_Elymaic */
+
+/* 'In_Brahmi': Block */
+static const OnigCodePoint CR_In_Brahmi[] = {
+	1,
+	0x11000, 0x1107f,
+}; /* CR_In_Brahmi */
+
+/* 'In_Kaithi': Block */
+static const OnigCodePoint CR_In_Kaithi[] = {
+	1,
+	0x11080, 0x110cf,
+}; /* CR_In_Kaithi */
+
+/* 'In_Sora_Sompeng': Block */
+static const OnigCodePoint CR_In_Sora_Sompeng[] = {
+	1,
+	0x110d0, 0x110ff,
+}; /* CR_In_Sora_Sompeng */
+
+/* 'In_Chakma': Block */
+static const OnigCodePoint CR_In_Chakma[] = {
+	1,
+	0x11100, 0x1114f,
+}; /* CR_In_Chakma */
+
+/* 'In_Mahajani': Block */
+static const OnigCodePoint CR_In_Mahajani[] = {
+	1,
+	0x11150, 0x1117f,
+}; /* CR_In_Mahajani */
+
+/* 'In_Sharada': Block */
+static const OnigCodePoint CR_In_Sharada[] = {
+	1,
+	0x11180, 0x111df,
+}; /* CR_In_Sharada */
+
+/* 'In_Sinhala_Archaic_Numbers': Block */
+static const OnigCodePoint CR_In_Sinhala_Archaic_Numbers[] = {
+	1,
+	0x111e0, 0x111ff,
+}; /* CR_In_Sinhala_Archaic_Numbers */
+
+/* 'In_Khojki': Block */
+static const OnigCodePoint CR_In_Khojki[] = {
+	1,
+	0x11200, 0x1124f,
+}; /* CR_In_Khojki */
+
+/* 'In_Multani': Block */
+static const OnigCodePoint CR_In_Multani[] = {
+	1,
+	0x11280, 0x112af,
+}; /* CR_In_Multani */
+
+/* 'In_Khudawadi': Block */
+static const OnigCodePoint CR_In_Khudawadi[] = {
+	1,
+	0x112b0, 0x112ff,
+}; /* CR_In_Khudawadi */
+
+/* 'In_Grantha': Block */
+static const OnigCodePoint CR_In_Grantha[] = {
+	1,
+	0x11300, 0x1137f,
+}; /* CR_In_Grantha */
+
+/* 'In_Newa': Block */
+static const OnigCodePoint CR_In_Newa[] = {
+	1,
+	0x11400, 0x1147f,
+}; /* CR_In_Newa */
+
+/* 'In_Tirhuta': Block */
+static const OnigCodePoint CR_In_Tirhuta[] = {
+	1,
+	0x11480, 0x114df,
+}; /* CR_In_Tirhuta */
+
+/* 'In_Siddham': Block */
+static const OnigCodePoint CR_In_Siddham[] = {
+	1,
+	0x11580, 0x115ff,
+}; /* CR_In_Siddham */
+
+/* 'In_Modi': Block */
+static const OnigCodePoint CR_In_Modi[] = {
+	1,
+	0x11600, 0x1165f,
+}; /* CR_In_Modi */
+
+/* 'In_Mongolian_Supplement': Block */
+static const OnigCodePoint CR_In_Mongolian_Supplement[] = {
+	1,
+	0x11660, 0x1167f,
+}; /* CR_In_Mongolian_Supplement */
+
+/* 'In_Takri': Block */
+static const OnigCodePoint CR_In_Takri[] = {
+	1,
+	0x11680, 0x116cf,
+}; /* CR_In_Takri */
+
+/* 'In_Ahom': Block */
+static const OnigCodePoint CR_In_Ahom[] = {
+	1,
+	0x11700, 0x1173f,
+}; /* CR_In_Ahom */
+
+/* 'In_Dogra': Block */
+static const OnigCodePoint CR_In_Dogra[] = {
+	1,
+	0x11800, 0x1184f,
+}; /* CR_In_Dogra */
+
+/* 'In_Warang_Citi': Block */
+static const OnigCodePoint CR_In_Warang_Citi[] = {
+	1,
+	0x118a0, 0x118ff,
+}; /* CR_In_Warang_Citi */
+
+/* 'In_Nandinagari': Block */
+static const OnigCodePoint CR_In_Nandinagari[] = {
+	1,
+	0x119a0, 0x119ff,
+}; /* CR_In_Nandinagari */
+
+/* 'In_Zanabazar_Square': Block */
+static const OnigCodePoint CR_In_Zanabazar_Square[] = {
+	1,
+	0x11a00, 0x11a4f,
+}; /* CR_In_Zanabazar_Square */
+
+/* 'In_Soyombo': Block */
+static const OnigCodePoint CR_In_Soyombo[] = {
+	1,
+	0x11a50, 0x11aaf,
+}; /* CR_In_Soyombo */
+
+/* 'In_Pau_Cin_Hau': Block */
+static const OnigCodePoint CR_In_Pau_Cin_Hau[] = {
+	1,
+	0x11ac0, 0x11aff,
+}; /* CR_In_Pau_Cin_Hau */
+
+/* 'In_Bhaiksuki': Block */
+static const OnigCodePoint CR_In_Bhaiksuki[] = {
+	1,
+	0x11c00, 0x11c6f,
+}; /* CR_In_Bhaiksuki */
+
+/* 'In_Marchen': Block */
+static const OnigCodePoint CR_In_Marchen[] = {
+	1,
+	0x11c70, 0x11cbf,
+}; /* CR_In_Marchen */
+
+/* 'In_Masaram_Gondi': Block */
+static const OnigCodePoint CR_In_Masaram_Gondi[] = {
+	1,
+	0x11d00, 0x11d5f,
+}; /* CR_In_Masaram_Gondi */
+
+/* 'In_Gunjala_Gondi': Block */
+static const OnigCodePoint CR_In_Gunjala_Gondi[] = {
+	1,
+	0x11d60, 0x11daf,
+}; /* CR_In_Gunjala_Gondi */
+
+/* 'In_Makasar': Block */
+static const OnigCodePoint CR_In_Makasar[] = {
+	1,
+	0x11ee0, 0x11eff,
+}; /* CR_In_Makasar */
+
+/* 'In_Tamil_Supplement': Block */
+static const OnigCodePoint CR_In_Tamil_Supplement[] = {
+	1,
+	0x11fc0, 0x11fff,
+}; /* CR_In_Tamil_Supplement */
+
+/* 'In_Cuneiform': Block */
+static const OnigCodePoint CR_In_Cuneiform[] = {
+	1,
+	0x12000, 0x123ff,
+}; /* CR_In_Cuneiform */
+
+/* 'In_Cuneiform_Numbers_and_Punctuation': Block */
+static const OnigCodePoint CR_In_Cuneiform_Numbers_and_Punctuation[] = {
+	1,
+	0x12400, 0x1247f,
+}; /* CR_In_Cuneiform_Numbers_and_Punctuation */
+
+/* 'In_Early_Dynastic_Cuneiform': Block */
+static const OnigCodePoint CR_In_Early_Dynastic_Cuneiform[] = {
+	1,
+	0x12480, 0x1254f,
+}; /* CR_In_Early_Dynastic_Cuneiform */
+
+/* 'In_Egyptian_Hieroglyphs': Block */
+static const OnigCodePoint CR_In_Egyptian_Hieroglyphs[] = {
+	1,
+	0x13000, 0x1342f,
+}; /* CR_In_Egyptian_Hieroglyphs */
+
+/* 'In_Egyptian_Hieroglyph_Format_Controls': Block */
+static const OnigCodePoint CR_In_Egyptian_Hieroglyph_Format_Controls[] = {
+	1,
+	0x13430, 0x1343f,
+}; /* CR_In_Egyptian_Hieroglyph_Format_Controls */
+
+/* 'In_Anatolian_Hieroglyphs': Block */
+static const OnigCodePoint CR_In_Anatolian_Hieroglyphs[] = {
+	1,
+	0x14400, 0x1467f,
+}; /* CR_In_Anatolian_Hieroglyphs */
+
+/* 'In_Bamum_Supplement': Block */
+static const OnigCodePoint CR_In_Bamum_Supplement[] = {
+	1,
+	0x16800, 0x16a3f,
+}; /* CR_In_Bamum_Supplement */
+
+/* 'In_Mro': Block */
+static const OnigCodePoint CR_In_Mro[] = {
+	1,
+	0x16a40, 0x16a6f,
+}; /* CR_In_Mro */
+
+/* 'In_Bassa_Vah': Block */
+static const OnigCodePoint CR_In_Bassa_Vah[] = {
+	1,
+	0x16ad0, 0x16aff,
+}; /* CR_In_Bassa_Vah */
+
+/* 'In_Pahawh_Hmong': Block */
+static const OnigCodePoint CR_In_Pahawh_Hmong[] = {
+	1,
+	0x16b00, 0x16b8f,
+}; /* CR_In_Pahawh_Hmong */
+
+/* 'In_Medefaidrin': Block */
+static const OnigCodePoint CR_In_Medefaidrin[] = {
+	1,
+	0x16e40, 0x16e9f,
+}; /* CR_In_Medefaidrin */
+
+/* 'In_Miao': Block */
+static const OnigCodePoint CR_In_Miao[] = {
+	1,
+	0x16f00, 0x16f9f,
+}; /* CR_In_Miao */
+
+/* 'In_Ideographic_Symbols_and_Punctuation': Block */
+static const OnigCodePoint CR_In_Ideographic_Symbols_and_Punctuation[] = {
+	1,
+	0x16fe0, 0x16fff,
+}; /* CR_In_Ideographic_Symbols_and_Punctuation */
+
+/* 'In_Tangut': Block */
+static const OnigCodePoint CR_In_Tangut[] = {
+	1,
+	0x17000, 0x187ff,
+}; /* CR_In_Tangut */
+
+/* 'In_Tangut_Components': Block */
+static const OnigCodePoint CR_In_Tangut_Components[] = {
+	1,
+	0x18800, 0x18aff,
+}; /* CR_In_Tangut_Components */
+
+/* 'In_Kana_Supplement': Block */
+static const OnigCodePoint CR_In_Kana_Supplement[] = {
+	1,
+	0x1b000, 0x1b0ff,
+}; /* CR_In_Kana_Supplement */
+
+/* 'In_Kana_Extended_A': Block */
+static const OnigCodePoint CR_In_Kana_Extended_A[] = {
+	1,
+	0x1b100, 0x1b12f,
+}; /* CR_In_Kana_Extended_A */
+
+/* 'In_Small_Kana_Extension': Block */
+static const OnigCodePoint CR_In_Small_Kana_Extension[] = {
+	1,
+	0x1b130, 0x1b16f,
+}; /* CR_In_Small_Kana_Extension */
+
+/* 'In_Nushu': Block */
+static const OnigCodePoint CR_In_Nushu[] = {
+	1,
+	0x1b170, 0x1b2ff,
+}; /* CR_In_Nushu */
+
+/* 'In_Duployan': Block */
+static const OnigCodePoint CR_In_Duployan[] = {
+	1,
+	0x1bc00, 0x1bc9f,
+}; /* CR_In_Duployan */
+
+/* 'In_Shorthand_Format_Controls': Block */
+static const OnigCodePoint CR_In_Shorthand_Format_Controls[] = {
+	1,
+	0x1bca0, 0x1bcaf,
+}; /* CR_In_Shorthand_Format_Controls */
+
+/* 'In_Byzantine_Musical_Symbols': Block */
+static const OnigCodePoint CR_In_Byzantine_Musical_Symbols[] = {
+	1,
+	0x1d000, 0x1d0ff,
+}; /* CR_In_Byzantine_Musical_Symbols */
+
+/* 'In_Musical_Symbols': Block */
+static const OnigCodePoint CR_In_Musical_Symbols[] = {
+	1,
+	0x1d100, 0x1d1ff,
+}; /* CR_In_Musical_Symbols */
+
+/* 'In_Ancient_Greek_Musical_Notation': Block */
+static const OnigCodePoint CR_In_Ancient_Greek_Musical_Notation[] = {
+	1,
+	0x1d200, 0x1d24f,
+}; /* CR_In_Ancient_Greek_Musical_Notation */
+
+/* 'In_Mayan_Numerals': Block */
+static const OnigCodePoint CR_In_Mayan_Numerals[] = {
+	1,
+	0x1d2e0, 0x1d2ff,
+}; /* CR_In_Mayan_Numerals */
+
+/* 'In_Tai_Xuan_Jing_Symbols': Block */
+static const OnigCodePoint CR_In_Tai_Xuan_Jing_Symbols[] = {
+	1,
+	0x1d300, 0x1d35f,
+}; /* CR_In_Tai_Xuan_Jing_Symbols */
+
+/* 'In_Counting_Rod_Numerals': Block */
+static const OnigCodePoint CR_In_Counting_Rod_Numerals[] = {
+	1,
+	0x1d360, 0x1d37f,
+}; /* CR_In_Counting_Rod_Numerals */
+
+/* 'In_Mathematical_Alphanumeric_Symbols': Block */
+static const OnigCodePoint CR_In_Mathematical_Alphanumeric_Symbols[] = {
+	1,
+	0x1d400, 0x1d7ff,
+}; /* CR_In_Mathematical_Alphanumeric_Symbols */
+
+/* 'In_Sutton_SignWriting': Block */
+static const OnigCodePoint CR_In_Sutton_SignWriting[] = {
+	1,
+	0x1d800, 0x1daaf,
+}; /* CR_In_Sutton_SignWriting */
+
+/* 'In_Glagolitic_Supplement': Block */
+static const OnigCodePoint CR_In_Glagolitic_Supplement[] = {
+	1,
+	0x1e000, 0x1e02f,
+}; /* CR_In_Glagolitic_Supplement */
+
+/* 'In_Nyiakeng_Puachue_Hmong': Block */
+static const OnigCodePoint CR_In_Nyiakeng_Puachue_Hmong[] = {
+	1,
+	0x1e100, 0x1e14f,
+}; /* CR_In_Nyiakeng_Puachue_Hmong */
+
+/* 'In_Wancho': Block */
+static const OnigCodePoint CR_In_Wancho[] = {
+	1,
+	0x1e2c0, 0x1e2ff,
+}; /* CR_In_Wancho */
+
+/* 'In_Mende_Kikakui': Block */
+static const OnigCodePoint CR_In_Mende_Kikakui[] = {
+	1,
+	0x1e800, 0x1e8df,
+}; /* CR_In_Mende_Kikakui */
+
+/* 'In_Adlam': Block */
+static const OnigCodePoint CR_In_Adlam[] = {
+	1,
+	0x1e900, 0x1e95f,
+}; /* CR_In_Adlam */
+
+/* 'In_Indic_Siyaq_Numbers': Block */
+static const OnigCodePoint CR_In_Indic_Siyaq_Numbers[] = {
+	1,
+	0x1ec70, 0x1ecbf,
+}; /* CR_In_Indic_Siyaq_Numbers */
+
+/* 'In_Ottoman_Siyaq_Numbers': Block */
+static const OnigCodePoint CR_In_Ottoman_Siyaq_Numbers[] = {
+	1,
+	0x1ed00, 0x1ed4f,
+}; /* CR_In_Ottoman_Siyaq_Numbers */
+
+/* 'In_Arabic_Mathematical_Alphabetic_Symbols': Block */
+static const OnigCodePoint CR_In_Arabic_Mathematical_Alphabetic_Symbols[] = {
+	1,
+	0x1ee00, 0x1eeff,
+}; /* CR_In_Arabic_Mathematical_Alphabetic_Symbols */
+
+/* 'In_Mahjong_Tiles': Block */
+static const OnigCodePoint CR_In_Mahjong_Tiles[] = {
+	1,
+	0x1f000, 0x1f02f,
+}; /* CR_In_Mahjong_Tiles */
+
+/* 'In_Domino_Tiles': Block */
+static const OnigCodePoint CR_In_Domino_Tiles[] = {
+	1,
+	0x1f030, 0x1f09f,
+}; /* CR_In_Domino_Tiles */
+
+/* 'In_Playing_Cards': Block */
+static const OnigCodePoint CR_In_Playing_Cards[] = {
+	1,
+	0x1f0a0, 0x1f0ff,
+}; /* CR_In_Playing_Cards */
+
+/* 'In_Enclosed_Alphanumeric_Supplement': Block */
+static const OnigCodePoint CR_In_Enclosed_Alphanumeric_Supplement[] = {
+	1,
+	0x1f100, 0x1f1ff,
+}; /* CR_In_Enclosed_Alphanumeric_Supplement */
+
+/* 'In_Enclosed_Ideographic_Supplement': Block */
+static const OnigCodePoint CR_In_Enclosed_Ideographic_Supplement[] = {
+	1,
+	0x1f200, 0x1f2ff,
+}; /* CR_In_Enclosed_Ideographic_Supplement */
+
+/* 'In_Miscellaneous_Symbols_and_Pictographs': Block */
+static const OnigCodePoint CR_In_Miscellaneous_Symbols_and_Pictographs[] = {
+	1,
+	0x1f300, 0x1f5ff,
+}; /* CR_In_Miscellaneous_Symbols_and_Pictographs */
+
+/* 'In_Emoticons': Block */
+static const OnigCodePoint CR_In_Emoticons[] = {
+	1,
+	0x1f600, 0x1f64f,
+}; /* CR_In_Emoticons */
+
+/* 'In_Ornamental_Dingbats': Block */
+static const OnigCodePoint CR_In_Ornamental_Dingbats[] = {
+	1,
+	0x1f650, 0x1f67f,
+}; /* CR_In_Ornamental_Dingbats */
+
+/* 'In_Transport_and_Map_Symbols': Block */
+static const OnigCodePoint CR_In_Transport_and_Map_Symbols[] = {
+	1,
+	0x1f680, 0x1f6ff,
+}; /* CR_In_Transport_and_Map_Symbols */
+
+/* 'In_Alchemical_Symbols': Block */
+static const OnigCodePoint CR_In_Alchemical_Symbols[] = {
+	1,
+	0x1f700, 0x1f77f,
+}; /* CR_In_Alchemical_Symbols */
+
+/* 'In_Geometric_Shapes_Extended': Block */
+static const OnigCodePoint CR_In_Geometric_Shapes_Extended[] = {
+	1,
+	0x1f780, 0x1f7ff,
+}; /* CR_In_Geometric_Shapes_Extended */
+
+/* 'In_Supplemental_Arrows_C': Block */
+static const OnigCodePoint CR_In_Supplemental_Arrows_C[] = {
+	1,
+	0x1f800, 0x1f8ff,
+}; /* CR_In_Supplemental_Arrows_C */
+
+/* 'In_Supplemental_Symbols_and_Pictographs': Block */
+static const OnigCodePoint CR_In_Supplemental_Symbols_and_Pictographs[] = {
+	1,
+	0x1f900, 0x1f9ff,
+}; /* CR_In_Supplemental_Symbols_and_Pictographs */
+
+/* 'In_Chess_Symbols': Block */
+static const OnigCodePoint CR_In_Chess_Symbols[] = {
+	1,
+	0x1fa00, 0x1fa6f,
+}; /* CR_In_Chess_Symbols */
+
+/* 'In_Symbols_and_Pictographs_Extended_A': Block */
+static const OnigCodePoint CR_In_Symbols_and_Pictographs_Extended_A[] = {
+	1,
+	0x1fa70, 0x1faff,
+}; /* CR_In_Symbols_and_Pictographs_Extended_A */
+
+/* 'In_CJK_Unified_Ideographs_Extension_B': Block */
+static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_B[] = {
+	1,
+	0x20000, 0x2a6df,
+}; /* CR_In_CJK_Unified_Ideographs_Extension_B */
+
+/* 'In_CJK_Unified_Ideographs_Extension_C': Block */
+static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_C[] = {
+	1,
+	0x2a700, 0x2b73f,
+}; /* CR_In_CJK_Unified_Ideographs_Extension_C */
+
+/* 'In_CJK_Unified_Ideographs_Extension_D': Block */
+static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_D[] = {
+	1,
+	0x2b740, 0x2b81f,
+}; /* CR_In_CJK_Unified_Ideographs_Extension_D */
+
+/* 'In_CJK_Unified_Ideographs_Extension_E': Block */
+static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_E[] = {
+	1,
+	0x2b820, 0x2ceaf,
+}; /* CR_In_CJK_Unified_Ideographs_Extension_E */
+
+/* 'In_CJK_Unified_Ideographs_Extension_F': Block */
+static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_F[] = {
+	1,
+	0x2ceb0, 0x2ebef,
+}; /* CR_In_CJK_Unified_Ideographs_Extension_F */
+
+/* 'In_CJK_Compatibility_Ideographs_Supplement': Block */
+static const OnigCodePoint CR_In_CJK_Compatibility_Ideographs_Supplement[] = {
+	1,
+	0x2f800, 0x2fa1f,
+}; /* CR_In_CJK_Compatibility_Ideographs_Supplement */
+
+/* 'In_Tags': Block */
+static const OnigCodePoint CR_In_Tags[] = {
+	1,
+	0xe0000, 0xe007f,
+}; /* CR_In_Tags */
+
+/* 'In_Variation_Selectors_Supplement': Block */
+static const OnigCodePoint CR_In_Variation_Selectors_Supplement[] = {
+	1,
+	0xe0100, 0xe01ef,
+}; /* CR_In_Variation_Selectors_Supplement */
+
+/* 'In_Supplementary_Private_Use_Area_A': Block */
+static const OnigCodePoint CR_In_Supplementary_Private_Use_Area_A[] = {
+	1,
+	0xf0000, 0xfffff,
+}; /* CR_In_Supplementary_Private_Use_Area_A */
+
+/* 'In_Supplementary_Private_Use_Area_B': Block */
+static const OnigCodePoint CR_In_Supplementary_Private_Use_Area_B[] = {
+	1,
+	0x100000, 0x10ffff,
+}; /* CR_In_Supplementary_Private_Use_Area_B */
+
+/* 'In_No_Block': Block */
+static const OnigCodePoint CR_In_No_Block[] = {
+	53,
+	0x0870, 0x089f,
+	0x2fe0, 0x2fef,
+	0x10200, 0x1027f,
+	0x103e0, 0x103ff,
+	0x10570, 0x105ff,
+	0x10780, 0x107ff,
+	0x108b0, 0x108df,
+	0x10940, 0x1097f,
+	0x10aa0, 0x10abf,
+	0x10bb0, 0x10bff,
+	0x10c50, 0x10c7f,
+	0x10d40, 0x10e5f,
+	0x10e80, 0x10eff,
+	0x10f70, 0x10fdf,
+	0x11250, 0x1127f,
+	0x11380, 0x113ff,
+	0x114e0, 0x1157f,
+	0x116d0, 0x116ff,
+	0x11740, 0x117ff,
+	0x11850, 0x1189f,
+	0x11900, 0x1199f,
+	0x11ab0, 0x11abf,
+	0x11b00, 0x11bff,
+	0x11cc0, 0x11cff,
+	0x11db0, 0x11edf,
+	0x11f00, 0x11fbf,
+	0x12550, 0x12fff,
+	0x13440, 0x143ff,
+	0x14680, 0x167ff,
+	0x16a70, 0x16acf,
+	0x16b90, 0x16e3f,
+	0x16ea0, 0x16eff,
+	0x16fa0, 0x16fdf,
+	0x18b00, 0x1afff,
+	0x1b300, 0x1bbff,
+	0x1bcb0, 0x1cfff,
+	0x1d250, 0x1d2df,
+	0x1d380, 0x1d3ff,
+	0x1dab0, 0x1dfff,
+	0x1e030, 0x1e0ff,
+	0x1e150, 0x1e2bf,
+	0x1e300, 0x1e7ff,
+	0x1e8e0, 0x1e8ff,
+	0x1e960, 0x1ec6f,
+	0x1ecc0, 0x1ecff,
+	0x1ed50, 0x1edff,
+	0x1ef00, 0x1efff,
+	0x1fb00, 0x1ffff,
+	0x2a6e0, 0x2a6ff,
+	0x2ebf0, 0x2f7ff,
+	0x2fa20, 0xdffff,
+	0xe0080, 0xe00ff,
+	0xe01f0, 0xeffff,
+}; /* CR_In_No_Block */
+
+#endif /* USE_UNICODE_PROPERTIES */
+static const OnigCodePoint* const CodeRanges[] = {
+  CR_NEWLINE,
+  CR_Alpha,
+  CR_Blank,
+  CR_Cntrl,
+  CR_Digit,
+  CR_Graph,
+  CR_Lower,
+  CR_Print,
+  CR_XPosixPunct,
+  CR_Space,
+  CR_Upper,
+  CR_XDigit,
+  CR_Word,
+  CR_Alnum,
+  CR_ASCII,
+  CR_Punct,
+#ifdef USE_UNICODE_PROPERTIES
+  CR_Any,
+  CR_Assigned,
+  CR_C,
+  CR_Cc,
+  CR_Cf,
+  CR_Cn,
+  CR_Co,
+  CR_Cs,
+  CR_L,
+  CR_LC,
+  CR_Ll,
+  CR_Lm,
+  CR_Lo,
+  CR_Lt,
+  CR_Lu,
+  CR_M,
+  CR_Mc,
+  CR_Me,
+  CR_Mn,
+  CR_N,
+  CR_Nd,
+  CR_Nl,
+  CR_No,
+  CR_P,
+  CR_Pc,
+  CR_Pd,
+  CR_Pe,
+  CR_Pf,
+  CR_Pi,
+  CR_Po,
+  CR_Ps,
+  CR_S,
+  CR_Sc,
+  CR_Sk,
+  CR_Sm,
+  CR_So,
+  CR_Z,
+  CR_Zl,
+  CR_Zp,
+  CR_Zs,
+  CR_Math,
+  CR_Alphabetic,
+  CR_Lowercase,
+  CR_Uppercase,
+  CR_Cased,
+  CR_Case_Ignorable,
+  CR_Changes_When_Lowercased,
+  CR_Changes_When_Uppercased,
+  CR_Changes_When_Titlecased,
+  CR_Changes_When_Casefolded,
+  CR_Changes_When_Casemapped,
+  CR_ID_Start,
+  CR_ID_Continue,
+  CR_XID_Start,
+  CR_XID_Continue,
+  CR_Default_Ignorable_Code_Point,
+  CR_Grapheme_Extend,
+  CR_Grapheme_Base,
+  CR_Grapheme_Link,
+  CR_Common,
+  CR_Latin,
+  CR_Greek,
+  CR_Cyrillic,
+  CR_Armenian,
+  CR_Hebrew,
+  CR_Arabic,
+  CR_Syriac,
+  CR_Thaana,
+  CR_Devanagari,
+  CR_Bengali,
+  CR_Gurmukhi,
+  CR_Gujarati,
+  CR_Oriya,
+  CR_Tamil,
+  CR_Telugu,
+  CR_Kannada,
+  CR_Malayalam,
+  CR_Sinhala,
+  CR_Thai,
+  CR_Lao,
+  CR_Tibetan,
+  CR_Myanmar,
+  CR_Georgian,
+  CR_Hangul,
+  CR_Ethiopic,
+  CR_Cherokee,
+  CR_Canadian_Aboriginal,
+  CR_Ogham,
+  CR_Runic,
+  CR_Khmer,
+  CR_Mongolian,
+  CR_Hiragana,
+  CR_Katakana,
+  CR_Bopomofo,
+  CR_Han,
+  CR_Yi,
+  CR_Old_Italic,
+  CR_Gothic,
+  CR_Deseret,
+  CR_Inherited,
+  CR_Tagalog,
+  CR_Hanunoo,
+  CR_Buhid,
+  CR_Tagbanwa,
+  CR_Limbu,
+  CR_Tai_Le,
+  CR_Linear_B,
+  CR_Ugaritic,
+  CR_Shavian,
+  CR_Osmanya,
+  CR_Cypriot,
+  CR_Braille,
+  CR_Buginese,
+  CR_Coptic,
+  CR_New_Tai_Lue,
+  CR_Glagolitic,
+  CR_Tifinagh,
+  CR_Syloti_Nagri,
+  CR_Old_Persian,
+  CR_Kharoshthi,
+  CR_Balinese,
+  CR_Cuneiform,
+  CR_Phoenician,
+  CR_Phags_Pa,
+  CR_Nko,
+  CR_Sundanese,
+  CR_Lepcha,
+  CR_Ol_Chiki,
+  CR_Vai,
+  CR_Saurashtra,
+  CR_Kayah_Li,
+  CR_Rejang,
+  CR_Lycian,
+  CR_Carian,
+  CR_Lydian,
+  CR_Cham,
+  CR_Tai_Tham,
+  CR_Tai_Viet,
+  CR_Avestan,
+  CR_Egyptian_Hieroglyphs,
+  CR_Samaritan,
+  CR_Lisu,
+  CR_Bamum,
+  CR_Javanese,
+  CR_Meetei_Mayek,
+  CR_Imperial_Aramaic,
+  CR_Old_South_Arabian,
+  CR_Inscriptional_Parthian,
+  CR_Inscriptional_Pahlavi,
+  CR_Old_Turkic,
+  CR_Kaithi,
+  CR_Batak,
+  CR_Brahmi,
+  CR_Mandaic,
+  CR_Chakma,
+  CR_Meroitic_Cursive,
+  CR_Meroitic_Hieroglyphs,
+  CR_Miao,
+  CR_Sharada,
+  CR_Sora_Sompeng,
+  CR_Takri,
+  CR_Caucasian_Albanian,
+  CR_Bassa_Vah,
+  CR_Duployan,
+  CR_Elbasan,
+  CR_Grantha,
+  CR_Pahawh_Hmong,
+  CR_Khojki,
+  CR_Linear_A,
+  CR_Mahajani,
+  CR_Manichaean,
+  CR_Mende_Kikakui,
+  CR_Modi,
+  CR_Mro,
+  CR_Old_North_Arabian,
+  CR_Nabataean,
+  CR_Palmyrene,
+  CR_Pau_Cin_Hau,
+  CR_Old_Permic,
+  CR_Psalter_Pahlavi,
+  CR_Siddham,
+  CR_Khudawadi,
+  CR_Tirhuta,
+  CR_Warang_Citi,
+  CR_Ahom,
+  CR_Anatolian_Hieroglyphs,
+  CR_Hatran,
+  CR_Multani,
+  CR_Old_Hungarian,
+  CR_SignWriting,
+  CR_Adlam,
+  CR_Bhaiksuki,
+  CR_Marchen,
+  CR_Newa,
+  CR_Osage,
+  CR_Tangut,
+  CR_Masaram_Gondi,
+  CR_Nushu,
+  CR_Soyombo,
+  CR_Zanabazar_Square,
+  CR_Dogra,
+  CR_Gunjala_Gondi,
+  CR_Makasar,
+  CR_Medefaidrin,
+  CR_Hanifi_Rohingya,
+  CR_Sogdian,
+  CR_Old_Sogdian,
+  CR_Elymaic,
+  CR_Nandinagari,
+  CR_Nyiakeng_Puachue_Hmong,
+  CR_Wancho,
+  CR_White_Space,
+  CR_Bidi_Control,
+  CR_Join_Control,
+  CR_Dash,
+  CR_Hyphen,
+  CR_Quotation_Mark,
+  CR_Terminal_Punctuation,
+  CR_Other_Math,
+  CR_Hex_Digit,
+  CR_ASCII_Hex_Digit,
+  CR_Other_Alphabetic,
+  CR_Ideographic,
+  CR_Diacritic,
+  CR_Extender,
+  CR_Other_Lowercase,
+  CR_Other_Uppercase,
+  CR_Noncharacter_Code_Point,
+  CR_Other_Grapheme_Extend,
+  CR_IDS_Binary_Operator,
+  CR_IDS_Trinary_Operator,
+  CR_Radical,
+  CR_Unified_Ideograph,
+  CR_Other_Default_Ignorable_Code_Point,
+  CR_Deprecated,
+  CR_Soft_Dotted,
+  CR_Logical_Order_Exception,
+  CR_Other_ID_Start,
+  CR_Other_ID_Continue,
+  CR_Sentence_Terminal,
+  CR_Variation_Selector,
+  CR_Pattern_White_Space,
+  CR_Pattern_Syntax,
+  CR_Prepended_Concatenation_Mark,
+  CR_Regional_Indicator,
+  CR_Emoji,
+  CR_Emoji_Presentation,
+  CR_Emoji_Modifier,
+  CR_Emoji_Modifier_Base,
+  CR_Emoji_Component,
+  CR_Extended_Pictographic,
+  CR_Unknown,
+#ifdef USE_UNICODE_AGE_PROPERTIES
+  CR_Age_1_1,
+  CR_Age_2_0,
+  CR_Age_2_1,
+  CR_Age_3_0,
+  CR_Age_3_1,
+  CR_Age_3_2,
+  CR_Age_4_0,
+  CR_Age_4_1,
+  CR_Age_5_0,
+  CR_Age_5_1,
+  CR_Age_5_2,
+  CR_Age_6_0,
+  CR_Age_6_1,
+  CR_Age_6_2,
+  CR_Age_6_3,
+  CR_Age_7_0,
+  CR_Age_8_0,
+  CR_Age_9_0,
+  CR_Age_10_0,
+  CR_Age_11_0,
+  CR_Age_12_0,
+  CR_Age_12_1,
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+  CR_Grapheme_Cluster_Break_Prepend,
+  CR_Grapheme_Cluster_Break_CR,
+  CR_Grapheme_Cluster_Break_LF,
+  CR_Grapheme_Cluster_Break_Control,
+  CR_Grapheme_Cluster_Break_Extend,
+  CR_Grapheme_Cluster_Break_Regional_Indicator,
+  CR_Grapheme_Cluster_Break_SpacingMark,
+  CR_Grapheme_Cluster_Break_L,
+  CR_Grapheme_Cluster_Break_V,
+  CR_Grapheme_Cluster_Break_T,
+  CR_Grapheme_Cluster_Break_LV,
+  CR_Grapheme_Cluster_Break_LVT,
+  CR_Grapheme_Cluster_Break_ZWJ,
+  CR_In_Basic_Latin,
+  CR_In_Latin_1_Supplement,
+  CR_In_Latin_Extended_A,
+  CR_In_Latin_Extended_B,
+  CR_In_IPA_Extensions,
+  CR_In_Spacing_Modifier_Letters,
+  CR_In_Combining_Diacritical_Marks,
+  CR_In_Greek_and_Coptic,
+  CR_In_Cyrillic,
+  CR_In_Cyrillic_Supplement,
+  CR_In_Armenian,
+  CR_In_Hebrew,
+  CR_In_Arabic,
+  CR_In_Syriac,
+  CR_In_Arabic_Supplement,
+  CR_In_Thaana,
+  CR_In_NKo,
+  CR_In_Samaritan,
+  CR_In_Mandaic,
+  CR_In_Syriac_Supplement,
+  CR_In_Arabic_Extended_A,
+  CR_In_Devanagari,
+  CR_In_Bengali,
+  CR_In_Gurmukhi,
+  CR_In_Gujarati,
+  CR_In_Oriya,
+  CR_In_Tamil,
+  CR_In_Telugu,
+  CR_In_Kannada,
+  CR_In_Malayalam,
+  CR_In_Sinhala,
+  CR_In_Thai,
+  CR_In_Lao,
+  CR_In_Tibetan,
+  CR_In_Myanmar,
+  CR_In_Georgian,
+  CR_In_Hangul_Jamo,
+  CR_In_Ethiopic,
+  CR_In_Ethiopic_Supplement,
+  CR_In_Cherokee,
+  CR_In_Unified_Canadian_Aboriginal_Syllabics,
+  CR_In_Ogham,
+  CR_In_Runic,
+  CR_In_Tagalog,
+  CR_In_Hanunoo,
+  CR_In_Buhid,
+  CR_In_Tagbanwa,
+  CR_In_Khmer,
+  CR_In_Mongolian,
+  CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended,
+  CR_In_Limbu,
+  CR_In_Tai_Le,
+  CR_In_New_Tai_Lue,
+  CR_In_Khmer_Symbols,
+  CR_In_Buginese,
+  CR_In_Tai_Tham,
+  CR_In_Combining_Diacritical_Marks_Extended,
+  CR_In_Balinese,
+  CR_In_Sundanese,
+  CR_In_Batak,
+  CR_In_Lepcha,
+  CR_In_Ol_Chiki,
+  CR_In_Cyrillic_Extended_C,
+  CR_In_Georgian_Extended,
+  CR_In_Sundanese_Supplement,
+  CR_In_Vedic_Extensions,
+  CR_In_Phonetic_Extensions,
+  CR_In_Phonetic_Extensions_Supplement,
+  CR_In_Combining_Diacritical_Marks_Supplement,
+  CR_In_Latin_Extended_Additional,
+  CR_In_Greek_Extended,
+  CR_In_General_Punctuation,
+  CR_In_Superscripts_and_Subscripts,
+  CR_In_Currency_Symbols,
+  CR_In_Combining_Diacritical_Marks_for_Symbols,
+  CR_In_Letterlike_Symbols,
+  CR_In_Number_Forms,
+  CR_In_Arrows,
+  CR_In_Mathematical_Operators,
+  CR_In_Miscellaneous_Technical,
+  CR_In_Control_Pictures,
+  CR_In_Optical_Character_Recognition,
+  CR_In_Enclosed_Alphanumerics,
+  CR_In_Box_Drawing,
+  CR_In_Block_Elements,
+  CR_In_Geometric_Shapes,
+  CR_In_Miscellaneous_Symbols,
+  CR_In_Dingbats,
+  CR_In_Miscellaneous_Mathematical_Symbols_A,
+  CR_In_Supplemental_Arrows_A,
+  CR_In_Braille_Patterns,
+  CR_In_Supplemental_Arrows_B,
+  CR_In_Miscellaneous_Mathematical_Symbols_B,
+  CR_In_Supplemental_Mathematical_Operators,
+  CR_In_Miscellaneous_Symbols_and_Arrows,
+  CR_In_Glagolitic,
+  CR_In_Latin_Extended_C,
+  CR_In_Coptic,
+  CR_In_Georgian_Supplement,
+  CR_In_Tifinagh,
+  CR_In_Ethiopic_Extended,
+  CR_In_Cyrillic_Extended_A,
+  CR_In_Supplemental_Punctuation,
+  CR_In_CJK_Radicals_Supplement,
+  CR_In_Kangxi_Radicals,
+  CR_In_Ideographic_Description_Characters,
+  CR_In_CJK_Symbols_and_Punctuation,
+  CR_In_Hiragana,
+  CR_In_Katakana,
+  CR_In_Bopomofo,
+  CR_In_Hangul_Compatibility_Jamo,
+  CR_In_Kanbun,
+  CR_In_Bopomofo_Extended,
+  CR_In_CJK_Strokes,
+  CR_In_Katakana_Phonetic_Extensions,
+  CR_In_Enclosed_CJK_Letters_and_Months,
+  CR_In_CJK_Compatibility,
+  CR_In_CJK_Unified_Ideographs_Extension_A,
+  CR_In_Yijing_Hexagram_Symbols,
+  CR_In_CJK_Unified_Ideographs,
+  CR_In_Yi_Syllables,
+  CR_In_Yi_Radicals,
+  CR_In_Lisu,
+  CR_In_Vai,
+  CR_In_Cyrillic_Extended_B,
+  CR_In_Bamum,
+  CR_In_Modifier_Tone_Letters,
+  CR_In_Latin_Extended_D,
+  CR_In_Syloti_Nagri,
+  CR_In_Common_Indic_Number_Forms,
+  CR_In_Phags_pa,
+  CR_In_Saurashtra,
+  CR_In_Devanagari_Extended,
+  CR_In_Kayah_Li,
+  CR_In_Rejang,
+  CR_In_Hangul_Jamo_Extended_A,
+  CR_In_Javanese,
+  CR_In_Myanmar_Extended_B,
+  CR_In_Cham,
+  CR_In_Myanmar_Extended_A,
+  CR_In_Tai_Viet,
+  CR_In_Meetei_Mayek_Extensions,
+  CR_In_Ethiopic_Extended_A,
+  CR_In_Latin_Extended_E,
+  CR_In_Cherokee_Supplement,
+  CR_In_Meetei_Mayek,
+  CR_In_Hangul_Syllables,
+  CR_In_Hangul_Jamo_Extended_B,
+  CR_In_High_Surrogates,
+  CR_In_High_Private_Use_Surrogates,
+  CR_In_Low_Surrogates,
+  CR_In_Private_Use_Area,
+  CR_In_CJK_Compatibility_Ideographs,
+  CR_In_Alphabetic_Presentation_Forms,
+  CR_In_Arabic_Presentation_Forms_A,
+  CR_In_Variation_Selectors,
+  CR_In_Vertical_Forms,
+  CR_In_Combining_Half_Marks,
+  CR_In_CJK_Compatibility_Forms,
+  CR_In_Small_Form_Variants,
+  CR_In_Arabic_Presentation_Forms_B,
+  CR_In_Halfwidth_and_Fullwidth_Forms,
+  CR_In_Specials,
+  CR_In_Linear_B_Syllabary,
+  CR_In_Linear_B_Ideograms,
+  CR_In_Aegean_Numbers,
+  CR_In_Ancient_Greek_Numbers,
+  CR_In_Ancient_Symbols,
+  CR_In_Phaistos_Disc,
+  CR_In_Lycian,
+  CR_In_Carian,
+  CR_In_Coptic_Epact_Numbers,
+  CR_In_Old_Italic,
+  CR_In_Gothic,
+  CR_In_Old_Permic,
+  CR_In_Ugaritic,
+  CR_In_Old_Persian,
+  CR_In_Deseret,
+  CR_In_Shavian,
+  CR_In_Osmanya,
+  CR_In_Osage,
+  CR_In_Elbasan,
+  CR_In_Caucasian_Albanian,
+  CR_In_Linear_A,
+  CR_In_Cypriot_Syllabary,
+  CR_In_Imperial_Aramaic,
+  CR_In_Palmyrene,
+  CR_In_Nabataean,
+  CR_In_Hatran,
+  CR_In_Phoenician,
+  CR_In_Lydian,
+  CR_In_Meroitic_Hieroglyphs,
+  CR_In_Meroitic_Cursive,
+  CR_In_Kharoshthi,
+  CR_In_Old_South_Arabian,
+  CR_In_Old_North_Arabian,
+  CR_In_Manichaean,
+  CR_In_Avestan,
+  CR_In_Inscriptional_Parthian,
+  CR_In_Inscriptional_Pahlavi,
+  CR_In_Psalter_Pahlavi,
+  CR_In_Old_Turkic,
+  CR_In_Old_Hungarian,
+  CR_In_Hanifi_Rohingya,
+  CR_In_Rumi_Numeral_Symbols,
+  CR_In_Old_Sogdian,
+  CR_In_Sogdian,
+  CR_In_Elymaic,
+  CR_In_Brahmi,
+  CR_In_Kaithi,
+  CR_In_Sora_Sompeng,
+  CR_In_Chakma,
+  CR_In_Mahajani,
+  CR_In_Sharada,
+  CR_In_Sinhala_Archaic_Numbers,
+  CR_In_Khojki,
+  CR_In_Multani,
+  CR_In_Khudawadi,
+  CR_In_Grantha,
+  CR_In_Newa,
+  CR_In_Tirhuta,
+  CR_In_Siddham,
+  CR_In_Modi,
+  CR_In_Mongolian_Supplement,
+  CR_In_Takri,
+  CR_In_Ahom,
+  CR_In_Dogra,
+  CR_In_Warang_Citi,
+  CR_In_Nandinagari,
+  CR_In_Zanabazar_Square,
+  CR_In_Soyombo,
+  CR_In_Pau_Cin_Hau,
+  CR_In_Bhaiksuki,
+  CR_In_Marchen,
+  CR_In_Masaram_Gondi,
+  CR_In_Gunjala_Gondi,
+  CR_In_Makasar,
+  CR_In_Tamil_Supplement,
+  CR_In_Cuneiform,
+  CR_In_Cuneiform_Numbers_and_Punctuation,
+  CR_In_Early_Dynastic_Cuneiform,
+  CR_In_Egyptian_Hieroglyphs,
+  CR_In_Egyptian_Hieroglyph_Format_Controls,
+  CR_In_Anatolian_Hieroglyphs,
+  CR_In_Bamum_Supplement,
+  CR_In_Mro,
+  CR_In_Bassa_Vah,
+  CR_In_Pahawh_Hmong,
+  CR_In_Medefaidrin,
+  CR_In_Miao,
+  CR_In_Ideographic_Symbols_and_Punctuation,
+  CR_In_Tangut,
+  CR_In_Tangut_Components,
+  CR_In_Kana_Supplement,
+  CR_In_Kana_Extended_A,
+  CR_In_Small_Kana_Extension,
+  CR_In_Nushu,
+  CR_In_Duployan,
+  CR_In_Shorthand_Format_Controls,
+  CR_In_Byzantine_Musical_Symbols,
+  CR_In_Musical_Symbols,
+  CR_In_Ancient_Greek_Musical_Notation,
+  CR_In_Mayan_Numerals,
+  CR_In_Tai_Xuan_Jing_Symbols,
+  CR_In_Counting_Rod_Numerals,
+  CR_In_Mathematical_Alphanumeric_Symbols,
+  CR_In_Sutton_SignWriting,
+  CR_In_Glagolitic_Supplement,
+  CR_In_Nyiakeng_Puachue_Hmong,
+  CR_In_Wancho,
+  CR_In_Mende_Kikakui,
+  CR_In_Adlam,
+  CR_In_Indic_Siyaq_Numbers,
+  CR_In_Ottoman_Siyaq_Numbers,
+  CR_In_Arabic_Mathematical_Alphabetic_Symbols,
+  CR_In_Mahjong_Tiles,
+  CR_In_Domino_Tiles,
+  CR_In_Playing_Cards,
+  CR_In_Enclosed_Alphanumeric_Supplement,
+  CR_In_Enclosed_Ideographic_Supplement,
+  CR_In_Miscellaneous_Symbols_and_Pictographs,
+  CR_In_Emoticons,
+  CR_In_Ornamental_Dingbats,
+  CR_In_Transport_and_Map_Symbols,
+  CR_In_Alchemical_Symbols,
+  CR_In_Geometric_Shapes_Extended,
+  CR_In_Supplemental_Arrows_C,
+  CR_In_Supplemental_Symbols_and_Pictographs,
+  CR_In_Chess_Symbols,
+  CR_In_Symbols_and_Pictographs_Extended_A,
+  CR_In_CJK_Unified_Ideographs_Extension_B,
+  CR_In_CJK_Unified_Ideographs_Extension_C,
+  CR_In_CJK_Unified_Ideographs_Extension_D,
+  CR_In_CJK_Unified_Ideographs_Extension_E,
+  CR_In_CJK_Unified_Ideographs_Extension_F,
+  CR_In_CJK_Compatibility_Ideographs_Supplement,
+  CR_In_Tags,
+  CR_In_Variation_Selectors_Supplement,
+  CR_In_Supplementary_Private_Use_Area_A,
+  CR_In_Supplementary_Private_Use_Area_B,
+  CR_In_No_Block,
+#endif /* USE_UNICODE_PROPERTIES */
+};
+struct uniname2ctype_struct {
+  short name;
+  unsigned short ctype;
+};
+#define uniname2ctype_offset(str) offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_##str)
+
+static const struct uniname2ctype_struct *uniname2ctype_p(
+#if !(1+0) /* if ANSI, old style not to conflict with generated prototype */
+    const char *, unsigned int
+#endif
+);
+
+#ifndef USE_UNICODE_PROPERTIES
+#define TOTAL_KEYWORDS 15
+#define MIN_WORD_LENGTH 4
+#define MAX_WORD_LENGTH 11
+#define MIN_HASH_VALUE 6
+#define MAX_HASH_VALUE 20
+/* maximum key range = 15, duplicates = 0 */
+#else /* USE_UNICODE_PROPERTIES */
+#ifndef USE_UNICODE_AGE_PROPERTIES
+#define TOTAL_KEYWORDS 814
+#else /* USE_UNICODE_AGE_PROPERTIES */
+#define TOTAL_KEYWORDS 836
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+#define MIN_WORD_LENGTH 1
+#define MAX_WORD_LENGTH 44
+#define MIN_HASH_VALUE 11
+#define MAX_HASH_VALUE 6098
+/* maximum key range = 6088, duplicates = 0 */
+#endif /* USE_UNICODE_PROPERTIES */
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static unsigned int
+uniname2ctype_hash (register const char *str, register size_t len)
+{
+#ifndef USE_UNICODE_PROPERTIES
+  static const unsigned char asso_values[] =
+#else /* USE_UNICODE_PROPERTIES */
+  static const unsigned short asso_values[] =
+#endif /* USE_UNICODE_PROPERTIES */
+    {
+#ifndef USE_UNICODE_PROPERTIES
+      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, 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, 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,  3, 12,  5,
+       4, 21, 21, 10, 21,  1, 21, 21, 11, 21,
+       2,  1,  1, 21,  1,  7,  4,  6, 21,  1,
+       4, 21, 21, 21, 21, 21, 21, 21
+#else /* USE_UNICODE_PROPERTIES */
+      6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099,
+      6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099,
+      6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099,
+      6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099,
+#ifndef USE_UNICODE_AGE_PROPERTIES
+      6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099,
+      6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099,
+#else /* USE_UNICODE_AGE_PROPERTIES */
+      6099, 6099, 6099, 6099, 6099, 6099,   17, 6099,    3,    1,
+         4,   13,    3,   22,    9,   16,   12,    5, 6099, 6099,
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+      6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099,
+      6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099,
+      6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099, 6099,
+      6099, 6099, 6099, 6099, 6099, 6099, 6099,    1, 1425,  113,
+       437,   37, 1023, 1071, 1051,    4, 1492,    9,  500,   88,
+         8,   18, 1371,  797,   54,  203,  310,  619, 1608,  603,
+       364, 1438,   20,    1,    3, 6099, 6099, 6099, 6099, 6099
+#endif /* USE_UNICODE_PROPERTIES */
+    };
+#ifndef USE_UNICODE_PROPERTIES
+  return len + asso_values[(unsigned char)str[2]] + asso_values[(unsigned char)str[0]];
+#else /* USE_UNICODE_PROPERTIES */
+  register unsigned int hval = (unsigned int)len;
+
+  switch (hval)
+    {
+      default:
+        hval += asso_values[(unsigned char)str[15]];
+      /*FALLTHROUGH*/
+      case 15:
+      case 14:
+      case 13:
+      case 12:
+        hval += asso_values[(unsigned char)str[11]];
+      /*FALLTHROUGH*/
+      case 11:
+      case 10:
+      case 9:
+      case 8:
+      case 7:
+      case 6:
+        hval += asso_values[(unsigned char)str[5]];
+      /*FALLTHROUGH*/
+      case 5:
+        hval += asso_values[(unsigned char)str[4]];
+      /*FALLTHROUGH*/
+      case 4:
+      case 3:
+        hval += asso_values[(unsigned char)str[2]];
+      /*FALLTHROUGH*/
+      case 2:
+        hval += asso_values[(unsigned char)str[1]];
+      /*FALLTHROUGH*/
+      case 1:
+        hval += asso_values[(unsigned char)str[0]+2];
+        break;
+    }
+  return hval + asso_values[(unsigned char)str[len - 1]];
+#endif /* USE_UNICODE_PROPERTIES */
+}
+
+struct uniname2ctype_pool_t
+  {
+#ifndef USE_UNICODE_PROPERTIES
+    char uniname2ctype_pool_str6[sizeof("word")];
+    char uniname2ctype_pool_str7[sizeof("print")];
+    char uniname2ctype_pool_str8[sizeof("punct")];
+    char uniname2ctype_pool_str9[sizeof("alpha")];
+    char uniname2ctype_pool_str10[sizeof("alnum")];
+    char uniname2ctype_pool_str11[sizeof("xdigit")];
+    char uniname2ctype_pool_str12[sizeof("upper")];
+    char uniname2ctype_pool_str13[sizeof("ascii")];
+    char uniname2ctype_pool_str14[sizeof("cntrl")];
+    char uniname2ctype_pool_str15[sizeof("space")];
+    char uniname2ctype_pool_str16[sizeof("xposixpunct")];
+    char uniname2ctype_pool_str17[sizeof("lower")];
+    char uniname2ctype_pool_str18[sizeof("graph")];
+    char uniname2ctype_pool_str19[sizeof("digit")];
+    char uniname2ctype_pool_str20[sizeof("blank")];
+#else /* USE_UNICODE_PROPERTIES */
+    char uniname2ctype_pool_str11[sizeof("yi")];
+    char uniname2ctype_pool_str17[sizeof("yiii")];
+    char uniname2ctype_pool_str22[sizeof("lana")];
+    char uniname2ctype_pool_str24[sizeof("z")];
+    char uniname2ctype_pool_str25[sizeof("lina")];
+    char uniname2ctype_pool_str33[sizeof("maka")];
+    char uniname2ctype_pool_str35[sizeof("mani")];
+    char uniname2ctype_pool_str36[sizeof("mn")];
+    char uniname2ctype_pool_str45[sizeof("miao")];
+    char uniname2ctype_pool_str46[sizeof("lo")];
+    char uniname2ctype_pool_str47[sizeof("ci")];
+    char uniname2ctype_pool_str48[sizeof("lao")];
+    char uniname2ctype_pool_str49[sizeof("laoo")];
+    char uniname2ctype_pool_str52[sizeof("inkannada")];
+    char uniname2ctype_pool_str55[sizeof("cn")];
+    char uniname2ctype_pool_str64[sizeof("pi")];
+    char uniname2ctype_pool_str66[sizeof("innko")];
+    char uniname2ctype_pool_str67[sizeof("zzzz")];
+    char uniname2ctype_pool_str71[sizeof("gran")];
+    char uniname2ctype_pool_str75[sizeof("co")];
+    char uniname2ctype_pool_str83[sizeof("lineara")];
+    char uniname2ctype_pool_str86[sizeof("mark")];
+    char uniname2ctype_pool_str92[sizeof("po")];
+    char uniname2ctype_pool_str94[sizeof("me")];
+    char uniname2ctype_pool_str100[sizeof("cari")];
+    char uniname2ctype_pool_str101[sizeof("inkharoshthi")];
+    char uniname2ctype_pool_str102[sizeof("kana")];
+    char uniname2ctype_pool_str103[sizeof("loe")];
+    char uniname2ctype_pool_str107[sizeof("m")];
+    char uniname2ctype_pool_str108[sizeof("grek")];
+    char uniname2ctype_pool_str111[sizeof("mro")];
+    char uniname2ctype_pool_str112[sizeof("mroo")];
+    char uniname2ctype_pool_str115[sizeof("carian")];
+    char uniname2ctype_pool_str117[sizeof("geor")];
+    char uniname2ctype_pool_str118[sizeof("greek")];
+    char uniname2ctype_pool_str122[sizeof("gonm")];
+    char uniname2ctype_pool_str129[sizeof("mendekikakui")];
+    char uniname2ctype_pool_str130[sizeof("pe")];
+    char uniname2ctype_pool_str131[sizeof("mero")];
+    char uniname2ctype_pool_str134[sizeof("inosmanya")];
+    char uniname2ctype_pool_str139[sizeof("cakm")];
+    char uniname2ctype_pool_str145[sizeof("inmanichaean")];
+    char uniname2ctype_pool_str146[sizeof("inmro")];
+    char uniname2ctype_pool_str148[sizeof("inmiao")];
+    char uniname2ctype_pool_str149[sizeof("inchakma")];
+    char uniname2ctype_pool_str151[sizeof("c")];
+    char uniname2ctype_pool_str152[sizeof("mandaic")];
+    char uniname2ctype_pool_str153[sizeof("meeteimayek")];
+    char uniname2ctype_pool_str161[sizeof("inarmenian")];
+    char uniname2ctype_pool_str177[sizeof("inmyanmar")];
+    char uniname2ctype_pool_str178[sizeof("inmakasar")];
+    char uniname2ctype_pool_str183[sizeof("common")];
+    char uniname2ctype_pool_str186[sizeof("lm")];
+    char uniname2ctype_pool_str190[sizeof("marc")];
+    char uniname2ctype_pool_str203[sizeof("inrunic")];
+    char uniname2ctype_pool_str204[sizeof("incarian")];
+    char uniname2ctype_pool_str210[sizeof("inideographicsymbolsandpunctuation")];
+    char uniname2ctype_pool_str212[sizeof("inkhmer")];
+    char uniname2ctype_pool_str213[sizeof("qaai")];
+    char uniname2ctype_pool_str218[sizeof("inahom")];
+    char uniname2ctype_pool_str226[sizeof("merc")];
+    char uniname2ctype_pool_str231[sizeof("combiningmark")];
+    char uniname2ctype_pool_str236[sizeof("lc")];
+    char uniname2ctype_pool_str237[sizeof("perm")];
+    char uniname2ctype_pool_str246[sizeof("mc")];
+    char uniname2ctype_pool_str250[sizeof("connectorpunctuation")];
+    char uniname2ctype_pool_str253[sizeof("cans")];
+    char uniname2ctype_pool_str260[sizeof("incuneiformnumbersandpunctuation")];
+    char uniname2ctype_pool_str263[sizeof("armi")];
+    char uniname2ctype_pool_str265[sizeof("cc")];
+    char uniname2ctype_pool_str267[sizeof("armn")];
+    char uniname2ctype_pool_str268[sizeof("incherokee")];
+    char uniname2ctype_pool_str270[sizeof("prependedconcatenationmark")];
+    char uniname2ctype_pool_str274[sizeof("incuneiform")];
+    char uniname2ctype_pool_str275[sizeof("inavestan")];
+    char uniname2ctype_pool_str281[sizeof("inipaextensions")];
+    char uniname2ctype_pool_str282[sizeof("pc")];
+    char uniname2ctype_pool_str283[sizeof("armenian")];
+    char uniname2ctype_pool_str285[sizeof("insharada")];
+    char uniname2ctype_pool_str289[sizeof("inmarchen")];
+    char uniname2ctype_pool_str293[sizeof("makasar")];
+    char uniname2ctype_pool_str297[sizeof("masaramgondi")];
+    char uniname2ctype_pool_str301[sizeof("inarrows")];
+    char uniname2ctype_pool_str311[sizeof("incyrillic")];
+    char uniname2ctype_pool_str313[sizeof("incham")];
+    char uniname2ctype_pool_str315[sizeof("qmark")];
+    char uniname2ctype_pool_str320[sizeof("ri")];
+    char uniname2ctype_pool_str322[sizeof("qaac")];
+    char uniname2ctype_pool_str328[sizeof("insamaritan")];
+    char uniname2ctype_pool_str331[sizeof("latn")];
+    char uniname2ctype_pool_str335[sizeof("inmasaramgondi")];
+    char uniname2ctype_pool_str338[sizeof("inthaana")];
+    char uniname2ctype_pool_str340[sizeof("latin")];
+    char uniname2ctype_pool_str342[sizeof("inthai")];
+    char uniname2ctype_pool_str345[sizeof("lineseparator")];
+    char uniname2ctype_pool_str346[sizeof("pcm")];
+    char uniname2ctype_pool_str348[sizeof("inkatakana")];
+    char uniname2ctype_pool_str352[sizeof("inkaithi")];
+    char uniname2ctype_pool_str357[sizeof("inzanabazarsquare")];
+    char uniname2ctype_pool_str362[sizeof("inscriptionalparthian")];
+    char uniname2ctype_pool_str366[sizeof("initialpunctuation")];
+    char uniname2ctype_pool_str373[sizeof("mtei")];
+    char uniname2ctype_pool_str376[sizeof("vai")];
+    char uniname2ctype_pool_str377[sizeof("vaii")];
+    char uniname2ctype_pool_str386[sizeof("inkhmersymbols")];
+    char uniname2ctype_pool_str399[sizeof("insyriac")];
+    char uniname2ctype_pool_str401[sizeof("intakri")];
+    char uniname2ctype_pool_str404[sizeof("arabic")];
+    char uniname2ctype_pool_str411[sizeof("zs")];
+    char uniname2ctype_pool_str418[sizeof("katakana")];
+    char uniname2ctype_pool_str426[sizeof("prti")];
+    char uniname2ctype_pool_str442[sizeof("ascii")];
+    char uniname2ctype_pool_str445[sizeof("cs")];
+    char uniname2ctype_pool_str462[sizeof("ps")];
+    char uniname2ctype_pool_str468[sizeof("mand")];
+    char uniname2ctype_pool_str470[sizeof("privateuse")];
+    char uniname2ctype_pool_str475[sizeof("inruminumeralsymbols")];
+    char uniname2ctype_pool_str480[sizeof("inmyanmarextendeda")];
+    char uniname2ctype_pool_str481[sizeof("modi")];
+    char uniname2ctype_pool_str486[sizeof("incjkcompatibilityforms")];
+    char uniname2ctype_pool_str488[sizeof("inkanaextendeda")];
+    char uniname2ctype_pool_str491[sizeof("incjkcompatibilityideographs")];
+    char uniname2ctype_pool_str500[sizeof("brai")];
+    char uniname2ctype_pool_str504[sizeof("mend")];
+    char uniname2ctype_pool_str505[sizeof("ideo")];
+    char uniname2ctype_pool_str506[sizeof("letter")];
+    char uniname2ctype_pool_str509[sizeof("l")];
+    char uniname2ctype_pool_str511[sizeof("inmeeteimayek")];
+    char uniname2ctype_pool_str520[sizeof("inideographicdescriptioncharacters")];
+    char uniname2ctype_pool_str535[sizeof("xidcontinue")];
+    char uniname2ctype_pool_str538[sizeof("knda")];
+    char uniname2ctype_pool_str541[sizeof("innandinagari")];
+    char uniname2ctype_pool_str543[sizeof("kannada")];
+    char uniname2ctype_pool_str556[sizeof("inmodi")];
+    char uniname2ctype_pool_str558[sizeof("inlao")];
+    char uniname2ctype_pool_str560[sizeof("inoldnortharabian")];
+    char uniname2ctype_pool_str565[sizeof("intransportandmapsymbols")];
+    char uniname2ctype_pool_str566[sizeof("letternumber")];
+    char uniname2ctype_pool_str568[sizeof("gothic")];
+    char uniname2ctype_pool_str572[sizeof("inlineara")];
+    char uniname2ctype_pool_str577[sizeof("inmendekikakui")];
+    char uniname2ctype_pool_str578[sizeof("xidc")];
+    char uniname2ctype_pool_str579[sizeof("mongolian")];
+    char uniname2ctype_pool_str582[sizeof("inmiscellaneousmathematicalsymbolsa")];
+    char uniname2ctype_pool_str583[sizeof("inspecials")];
+    char uniname2ctype_pool_str590[sizeof("grlink")];
+    char uniname2ctype_pool_str594[sizeof("brahmi")];
+    char uniname2ctype_pool_str596[sizeof("inemoticons")];
+    char uniname2ctype_pool_str597[sizeof("kali")];
+    char uniname2ctype_pool_str600[sizeof("inolditalic")];
+    char uniname2ctype_pool_str604[sizeof("inmedefaidrin")];
+    char uniname2ctype_pool_str605[sizeof("inchesssymbols")];
+    char uniname2ctype_pool_str608[sizeof("incjkcompatibilityideographssupplement")];
+    char uniname2ctype_pool_str614[sizeof("inadlam")];
+    char uniname2ctype_pool_str624[sizeof("psalterpahlavi")];
+    char uniname2ctype_pool_str625[sizeof("incommonindicnumberforms")];
+    char uniname2ctype_pool_str630[sizeof("lt")];
+    char uniname2ctype_pool_str636[sizeof("innewa")];
+    char uniname2ctype_pool_str639[sizeof("sk")];
+    char uniname2ctype_pool_str642[sizeof("control")];
+    char uniname2ctype_pool_str645[sizeof("inancientsymbols")];
+    char uniname2ctype_pool_str647[sizeof("palm")];
+    char uniname2ctype_pool_str650[sizeof("inlycian")];
+    char uniname2ctype_pool_str657[sizeof("so")];
+    char uniname2ctype_pool_str660[sizeof("patternwhitespace")];
+    char uniname2ctype_pool_str668[sizeof("xids")];
+    char uniname2ctype_pool_str672[sizeof("inmandaic")];
+    char uniname2ctype_pool_str675[sizeof("idc")];
+    char uniname2ctype_pool_str678[sizeof("meroiticcursive")];
+    char uniname2ctype_pool_str695[sizeof("inwarangciti")];
+    char uniname2ctype_pool_str696[sizeof("sora")];
+    char uniname2ctype_pool_str697[sizeof("inopticalcharacterrecognition")];
+    char uniname2ctype_pool_str703[sizeof("inoldsogdian")];
+    char uniname2ctype_pool_str705[sizeof("inmalayalam")];
+    char uniname2ctype_pool_str707[sizeof("bamum")];
+    char uniname2ctype_pool_str708[sizeof("inkanasupplement")];
+    char uniname2ctype_pool_str713[sizeof("insundanese")];
+    char uniname2ctype_pool_str720[sizeof("grext")];
+    char uniname2ctype_pool_str737[sizeof("print")];
+    char uniname2ctype_pool_str738[sizeof("intaitham")];
+    char uniname2ctype_pool_str742[sizeof("lower")];
+    char uniname2ctype_pool_str753[sizeof("joinc")];
+    char uniname2ctype_pool_str755[sizeof("inoldsoutharabian")];
+    char uniname2ctype_pool_str760[sizeof("incjkstrokes")];
+    char uniname2ctype_pool_str761[sizeof("batk")];
+    char uniname2ctype_pool_str766[sizeof("samr")];
+    char uniname2ctype_pool_str767[sizeof("inwancho")];
+    char uniname2ctype_pool_str771[sizeof("batak")];
+    char uniname2ctype_pool_str772[sizeof("vs")];
+    char uniname2ctype_pool_str776[sizeof("patws")];
+    char uniname2ctype_pool_str783[sizeof("samaritan")];
+    char uniname2ctype_pool_str787[sizeof("idsbinaryoperator")];
+    char uniname2ctype_pool_str791[sizeof("pauc")];
+    char uniname2ctype_pool_str794[sizeof("insmallkanaextension")];
+    char uniname2ctype_pool_str797[sizeof("sm")];
+    char uniname2ctype_pool_str799[sizeof("indominotiles")];
+    char uniname2ctype_pool_str802[sizeof("alnum")];
+    char uniname2ctype_pool_str809[sizeof("insylotinagri")];
+    char uniname2ctype_pool_str814[sizeof("inugaritic")];
+    char uniname2ctype_pool_str818[sizeof("incontrolpictures")];
+    char uniname2ctype_pool_str821[sizeof("inlinearbideograms")];
+    char uniname2ctype_pool_str822[sizeof("inmusicalsymbols")];
+    char uniname2ctype_pool_str823[sizeof("s")];
+    char uniname2ctype_pool_str824[sizeof("ital")];
+    char uniname2ctype_pool_str825[sizeof("inmodifiertoneletters")];
+    char uniname2ctype_pool_str828[sizeof("inancientgreekmusicalnotation")];
+    char uniname2ctype_pool_str834[sizeof("patternsyntax")];
+    char uniname2ctype_pool_str838[sizeof("lisu")];
+    char uniname2ctype_pool_str842[sizeof("lowercase")];
+    char uniname2ctype_pool_str845[sizeof("cwcm")];
+    char uniname2ctype_pool_str847[sizeof("sc")];
+    char uniname2ctype_pool_str848[sizeof("bass")];
+    char uniname2ctype_pool_str855[sizeof("ids")];
+    char uniname2ctype_pool_str857[sizeof("inlatinextendeda")];
+    char uniname2ctype_pool_str862[sizeof("oriya")];
+    char uniname2ctype_pool_str875[sizeof("intaile")];
+    char uniname2ctype_pool_str886[sizeof("inmiscellaneoussymbols")];
+    char uniname2ctype_pool_str895[sizeof("inmiscellaneoussymbolsandarrows")];
+    char uniname2ctype_pool_str898[sizeof("incaucasianalbanian")];
+    char uniname2ctype_pool_str900[sizeof("inmiscellaneoussymbolsandpictographs")];
+    char uniname2ctype_pool_str906[sizeof("inoldturkic")];
+    char uniname2ctype_pool_str907[sizeof("insaurashtra")];
+    char uniname2ctype_pool_str924[sizeof("idcontinue")];
+    char uniname2ctype_pool_str926[sizeof("intamil")];
+    char uniname2ctype_pool_str928[sizeof("inmultani")];
+    char uniname2ctype_pool_str929[sizeof("inlatinextendede")];
+    char uniname2ctype_pool_str930[sizeof("pd")];
+    char uniname2ctype_pool_str946[sizeof("bali")];
+    char uniname2ctype_pool_str961[sizeof("blank")];
+    char uniname2ctype_pool_str963[sizeof("idst")];
+    char uniname2ctype_pool_str974[sizeof("inlydian")];
+    char uniname2ctype_pool_str986[sizeof("innewtailue")];
+    char uniname2ctype_pool_str994[sizeof("bengali")];
+    char uniname2ctype_pool_str995[sizeof("runr")];
+    char uniname2ctype_pool_str1005[sizeof("zl")];
+    char uniname2ctype_pool_str1009[sizeof("incyrillicextendeda")];
+    char uniname2ctype_pool_str1010[sizeof("ll")];
+    char uniname2ctype_pool_str1013[sizeof("indeseret")];
+    char uniname2ctype_pool_str1014[sizeof("intaixuanjingsymbols")];
+    char uniname2ctype_pool_str1015[sizeof("inancientgreeknumbers")];
+    char uniname2ctype_pool_str1021[sizeof("idstart")];
+    char uniname2ctype_pool_str1025[sizeof("inmeeteimayekextensions")];
+    char uniname2ctype_pool_str1028[sizeof("balinese")];
+    char uniname2ctype_pool_str1032[sizeof("dia")];
+    char uniname2ctype_pool_str1033[sizeof("di")];
+    char uniname2ctype_pool_str1035[sizeof("inspacingmodifierletters")];
+    char uniname2ctype_pool_str1036[sizeof("inearlydynasticcuneiform")];
+    char uniname2ctype_pool_str1049[sizeof("plrd")];
+    char uniname2ctype_pool_str1067[sizeof("canadianaboriginal")];
+    char uniname2ctype_pool_str1070[sizeof("zinh")];
+    char uniname2ctype_pool_str1072[sizeof("sind")];
+    char uniname2ctype_pool_str1080[sizeof("osage")];
+    char uniname2ctype_pool_str1081[sizeof("inlatinextendedc")];
+    char uniname2ctype_pool_str1085[sizeof("uideo")];
+    char uniname2ctype_pool_str1087[sizeof("incountingrodnumerals")];
+    char uniname2ctype_pool_str1090[sizeof("xidstart")];
+    char uniname2ctype_pool_str1091[sizeof("xdigit")];
+    char uniname2ctype_pool_str1093[sizeof("osma")];
+    char uniname2ctype_pool_str1097[sizeof("inkhudawadi")];
+    char uniname2ctype_pool_str1102[sizeof("inhanifirohingya")];
+    char uniname2ctype_pool_str1105[sizeof("gong")];
+    char uniname2ctype_pool_str1107[sizeof("ingrantha")];
+    char uniname2ctype_pool_str1109[sizeof("bidic")];
+    char uniname2ctype_pool_str1119[sizeof("mong")];
+    char uniname2ctype_pool_str1120[sizeof("cased")];
+    char uniname2ctype_pool_str1121[sizeof("incyrillicextendedc")];
+    char uniname2ctype_pool_str1134[sizeof("inhiragana")];
+    char uniname2ctype_pool_str1140[sizeof("sinhala")];
+    char uniname2ctype_pool_str1142[sizeof("adlm")];
+    char uniname2ctype_pool_str1146[sizeof("glagolitic")];
+    char uniname2ctype_pool_str1147[sizeof("sterm")];
+    char uniname2ctype_pool_str1149[sizeof("bamu")];
+    char uniname2ctype_pool_str1150[sizeof("georgian")];
+    char uniname2ctype_pool_str1151[sizeof("inosage")];
+    char uniname2ctype_pool_str1152[sizeof("gunjalagondi")];
+    char uniname2ctype_pool_str1153[sizeof("phoenician")];
+    char uniname2ctype_pool_str1157[sizeof("multani")];
+    char uniname2ctype_pool_str1158[sizeof("kaithi")];
+    char uniname2ctype_pool_str1164[sizeof("joincontrol")];
+    char uniname2ctype_pool_str1168[sizeof("runic")];
+    char uniname2ctype_pool_str1170[sizeof("ingeneralpunctuation")];
+    char uniname2ctype_pool_str1171[sizeof("inmahajani")];
+    char uniname2ctype_pool_str1174[sizeof("incyrillicsupplement")];
+    char uniname2ctype_pool_str1175[sizeof("lowercaseletter")];
+    char uniname2ctype_pool_str1176[sizeof("marchen")];
+    char uniname2ctype_pool_str1177[sizeof("graphemelink")];
+    char uniname2ctype_pool_str1178[sizeof("ingeorgian")];
+    char uniname2ctype_pool_str1180[sizeof("khojki")];
+    char uniname2ctype_pool_str1181[sizeof("cham")];
+    char uniname2ctype_pool_str1182[sizeof("inogham")];
+    char uniname2ctype_pool_str1183[sizeof("cher")];
+    char uniname2ctype_pool_str1185[sizeof("chakma")];
+    char uniname2ctype_pool_str1190[sizeof("emoji")];
+    char uniname2ctype_pool_str1191[sizeof("insiddham")];
+    char uniname2ctype_pool_str1197[sizeof("cherokee")];
+    char uniname2ctype_pool_str1198[sizeof("khar")];
+    char uniname2ctype_pool_str1203[sizeof("inmongolian")];
+    char uniname2ctype_pool_str1207[sizeof("incherokeesupplement")];
+    char uniname2ctype_pool_str1208[sizeof("diacritic")];
+    char uniname2ctype_pool_str1209[sizeof("manichaean")];
+    char uniname2ctype_pool_str1210[sizeof("xsux")];
+    char uniname2ctype_pool_str1212[sizeof("inolchiki")];
+    char uniname2ctype_pool_str1227[sizeof("quotationmark")];
+    char uniname2ctype_pool_str1231[sizeof("adlam")];
+    char uniname2ctype_pool_str1232[sizeof("inethiopic")];
+    char uniname2ctype_pool_str1233[sizeof("graphemebase")];
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    char uniname2ctype_pool_str1234[sizeof("age=11.0")];
+    char uniname2ctype_pool_str1235[sizeof("age=12.1")];
+    char uniname2ctype_pool_str1236[sizeof("age=10.0")];
+    char uniname2ctype_pool_str1237[sizeof("age=12.0")];
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    char uniname2ctype_pool_str1243[sizeof("casedletter")];
+    char uniname2ctype_pool_str1244[sizeof("ingurmukhi")];
+    char uniname2ctype_pool_str1245[sizeof("odi")];
+    char uniname2ctype_pool_str1246[sizeof("incjkunifiedideographsextensiona")];
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    char uniname2ctype_pool_str1247[sizeof("age=1.1")];
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    char uniname2ctype_pool_str1248[sizeof("lu")];
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    char uniname2ctype_pool_str1249[sizeof("age=4.1")];
+    char uniname2ctype_pool_str1250[sizeof("age=2.1")];
+    char uniname2ctype_pool_str1251[sizeof("age=4.0")];
+    char uniname2ctype_pool_str1252[sizeof("age=2.0")];
+    char uniname2ctype_pool_str1253[sizeof("age=9.0")];
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    char uniname2ctype_pool_str1254[sizeof("intamilsupplement")];
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    char uniname2ctype_pool_str1255[sizeof("age=6.1")];
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    char uniname2ctype_pool_str1256[sizeof("unknown")];
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    char uniname2ctype_pool_str1257[sizeof("age=6.0")];
+    char uniname2ctype_pool_str1258[sizeof("age=6.2")];
+    char uniname2ctype_pool_str1259[sizeof("age=3.1")];
+    char uniname2ctype_pool_str1260[sizeof("age=8.0")];
+    char uniname2ctype_pool_str1261[sizeof("age=3.0")];
+    char uniname2ctype_pool_str1262[sizeof("age=3.2")];
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    char uniname2ctype_pool_str1263[sizeof("cwt")];
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    char uniname2ctype_pool_str1264[sizeof("age=7.0")];
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    char uniname2ctype_pool_str1266[sizeof("unassigned")];
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    char uniname2ctype_pool_str1267[sizeof("age=6.3")];
+    char uniname2ctype_pool_str1268[sizeof("age=5.1")];
+    char uniname2ctype_pool_str1270[sizeof("age=5.0")];
+    char uniname2ctype_pool_str1271[sizeof("age=5.2")];
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    char uniname2ctype_pool_str1274[sizeof("ahom")];
+    char uniname2ctype_pool_str1282[sizeof("incjkunifiedideographsextensione")];
+    char uniname2ctype_pool_str1285[sizeof("khmr")];
+    char uniname2ctype_pool_str1289[sizeof("insinhala")];
+    char uniname2ctype_pool_str1292[sizeof("inmiscellaneoustechnical")];
+    char uniname2ctype_pool_str1297[sizeof("saur")];
+    char uniname2ctype_pool_str1300[sizeof("guru")];
+    char uniname2ctype_pool_str1301[sizeof("sundanese")];
+    char uniname2ctype_pool_str1306[sizeof("punct")];
+    char uniname2ctype_pool_str1314[sizeof("paucinhau")];
+    char uniname2ctype_pool_str1317[sizeof("gurmukhi")];
+    char uniname2ctype_pool_str1319[sizeof("variationselector")];
+    char uniname2ctype_pool_str1331[sizeof("logicalorderexception")];
+    char uniname2ctype_pool_str1340[sizeof("khmer")];
+    char uniname2ctype_pool_str1343[sizeof("limbu")];
+    char uniname2ctype_pool_str1354[sizeof("inscriptionalpahlavi")];
+    char uniname2ctype_pool_str1355[sizeof("oidc")];
+    char uniname2ctype_pool_str1358[sizeof("incjkunifiedideographsextensionc")];
+    char uniname2ctype_pool_str1360[sizeof("cntrl")];
+    char uniname2ctype_pool_str1365[sizeof("inlatinextendedadditional")];
+    char uniname2ctype_pool_str1366[sizeof("decimalnumber")];
+    char uniname2ctype_pool_str1367[sizeof("insorasompeng")];
+    char uniname2ctype_pool_str1369[sizeof("radical")];
+    char uniname2ctype_pool_str1373[sizeof("emojimodifier")];
+    char uniname2ctype_pool_str1375[sizeof("kharoshthi")];
+    char uniname2ctype_pool_str1380[sizeof("n")];
+    char uniname2ctype_pool_str1384[sizeof("math")];
+    char uniname2ctype_pool_str1387[sizeof("goth")];
+    char uniname2ctype_pool_str1400[sizeof("anatolianhieroglyphs")];
+    char uniname2ctype_pool_str1401[sizeof("inenclosedalphanumerics")];
+    char uniname2ctype_pool_str1407[sizeof("nandinagari")];
+    char uniname2ctype_pool_str1409[sizeof("no")];
+    char uniname2ctype_pool_str1419[sizeof("nko")];
+    char uniname2ctype_pool_str1420[sizeof("nkoo")];
+    char uniname2ctype_pool_str1422[sizeof("ingreekandcoptic")];
+    char uniname2ctype_pool_str1423[sizeof("olck")];
+    char uniname2ctype_pool_str1426[sizeof("p")];
+    char uniname2ctype_pool_str1428[sizeof("grantha")];
+    char uniname2ctype_pool_str1434[sizeof("olchiki")];
+    char uniname2ctype_pool_str1438[sizeof("incjkunifiedideographs")];
+    char uniname2ctype_pool_str1441[sizeof("zanb")];
+    char uniname2ctype_pool_str1442[sizeof("intirhuta")];
+    char uniname2ctype_pool_str1445[sizeof("oids")];
+    char uniname2ctype_pool_str1448[sizeof("inhatran")];
+    char uniname2ctype_pool_str1449[sizeof("linb")];
+    char uniname2ctype_pool_str1450[sizeof("xpeo")];
+    char uniname2ctype_pool_str1451[sizeof("mult")];
+    char uniname2ctype_pool_str1454[sizeof("saurashtra")];
+    char uniname2ctype_pool_str1457[sizeof("kthi")];
+    char uniname2ctype_pool_str1462[sizeof("inbhaiksuki")];
+    char uniname2ctype_pool_str1466[sizeof("olower")];
+    char uniname2ctype_pool_str1470[sizeof("innabataean")];
+    char uniname2ctype_pool_str1471[sizeof("inphoenician")];
+    char uniname2ctype_pool_str1475[sizeof("inkanbun")];
+    char uniname2ctype_pool_str1476[sizeof("inmeroitichieroglyphs")];
+    char uniname2ctype_pool_str1478[sizeof("inkayahli")];
+    char uniname2ctype_pool_str1481[sizeof("phnx")];
+    char uniname2ctype_pool_str1485[sizeof("inoriya")];
+    char uniname2ctype_pool_str1489[sizeof("enclosingmark")];
+    char uniname2ctype_pool_str1495[sizeof("sd")];
+    char uniname2ctype_pool_str1497[sizeof("inelbasan")];
+    char uniname2ctype_pool_str1498[sizeof("wara")];
+    char uniname2ctype_pool_str1499[sizeof("inenclosedideographicsupplement")];
+    char uniname2ctype_pool_str1501[sizeof("sidd")];
+    char uniname2ctype_pool_str1507[sizeof("linearb")];
+    char uniname2ctype_pool_str1509[sizeof("hani")];
+    char uniname2ctype_pool_str1512[sizeof("han")];
+    char uniname2ctype_pool_str1517[sizeof("inenclosedalphanumericsupplement")];
+    char uniname2ctype_pool_str1519[sizeof("medf")];
+    char uniname2ctype_pool_str1520[sizeof("bidicontrol")];
+    char uniname2ctype_pool_str1523[sizeof("hano")];
+    char uniname2ctype_pool_str1524[sizeof("inphaistosdisc")];
+    char uniname2ctype_pool_str1529[sizeof("limb")];
+    char uniname2ctype_pool_str1531[sizeof("inkangxiradicals")];
+    char uniname2ctype_pool_str1533[sizeof("lepc")];
+    char uniname2ctype_pool_str1535[sizeof("medefaidrin")];
+    char uniname2ctype_pool_str1536[sizeof("braille")];
+    char uniname2ctype_pool_str1537[sizeof("regionalindicator")];
+    char uniname2ctype_pool_str1542[sizeof("inlowsurrogates")];
+    char uniname2ctype_pool_str1544[sizeof("inshorthandformatcontrols")];
+    char uniname2ctype_pool_str1547[sizeof("brah")];
+    char uniname2ctype_pool_str1548[sizeof("inkhojki")];
+    char uniname2ctype_pool_str1549[sizeof("inoldhungarian")];
+    char uniname2ctype_pool_str1552[sizeof("hanunoo")];
+    char uniname2ctype_pool_str1555[sizeof("hira")];
+    char uniname2ctype_pool_str1557[sizeof("beng")];
+    char uniname2ctype_pool_str1563[sizeof("emojimodifierbase")];
+    char uniname2ctype_pool_str1565[sizeof("inarabic")];
+    char uniname2ctype_pool_str1567[sizeof("lyci")];
+    char uniname2ctype_pool_str1569[sizeof("ahex")];
+    char uniname2ctype_pool_str1572[sizeof("inherited")];
+    char uniname2ctype_pool_str1580[sizeof("glag")];
+    char uniname2ctype_pool_str1582[sizeof("lycian")];
+    char uniname2ctype_pool_str1587[sizeof("indogra")];
+    char uniname2ctype_pool_str1594[sizeof("dsrt")];
+    char uniname2ctype_pool_str1597[sizeof("arab")];
+    char uniname2ctype_pool_str1602[sizeof("mymr")];
+    char uniname2ctype_pool_str1607[sizeof("myanmar")];
+    char uniname2ctype_pool_str1613[sizeof("phli")];
+    char uniname2ctype_pool_str1617[sizeof("inimperialaramaic")];
+    char uniname2ctype_pool_str1622[sizeof("ingreekextended")];
+    char uniname2ctype_pool_str1623[sizeof("inanatolianhieroglyphs")];
+    char uniname2ctype_pool_str1629[sizeof("punctuation")];
+    char uniname2ctype_pool_str1631[sizeof("takri")];
+    char uniname2ctype_pool_str1635[sizeof("graphemeextend")];
+    char uniname2ctype_pool_str1638[sizeof("invai")];
+    char uniname2ctype_pool_str1643[sizeof("cwl")];
+    char uniname2ctype_pool_str1654[sizeof("ingeometricshapes")];
+    char uniname2ctype_pool_str1655[sizeof("emojicomponent")];
+    char uniname2ctype_pool_str1662[sizeof("coptic")];
+    char uniname2ctype_pool_str1671[sizeof("deseret")];
+    char uniname2ctype_pool_str1675[sizeof("inarabicpresentationformsa")];
+    char uniname2ctype_pool_str1676[sizeof("takr")];
+    char uniname2ctype_pool_str1677[sizeof("inbasiclatin")];
+    char uniname2ctype_pool_str1682[sizeof("incjkunifiedideographsextensiond")];
+    char uniname2ctype_pool_str1686[sizeof("sinh")];
+    char uniname2ctype_pool_str1687[sizeof("sund")];
+    char uniname2ctype_pool_str1691[sizeof("shavian")];
+    char uniname2ctype_pool_str1692[sizeof("taile")];
+    char uniname2ctype_pool_str1699[sizeof("insundanesesupplement")];
+    char uniname2ctype_pool_str1702[sizeof("inelymaic")];
+    char uniname2ctype_pool_str1703[sizeof("insoyombo")];
+    char uniname2ctype_pool_str1704[sizeof("bhks")];
+    char uniname2ctype_pool_str1714[sizeof("bhaiksuki")];
+    char uniname2ctype_pool_str1716[sizeof("incjkcompatibility")];
+    char uniname2ctype_pool_str1722[sizeof("inhanunoo")];
+    char uniname2ctype_pool_str1724[sizeof("intangut")];
+    char uniname2ctype_pool_str1728[sizeof("sogdian")];
+    char uniname2ctype_pool_str1729[sizeof("inlatinextendedd")];
+    char uniname2ctype_pool_str1730[sizeof("sogo")];
+    char uniname2ctype_pool_str1731[sizeof("insinhalaarchaicnumbers")];
+    char uniname2ctype_pool_str1732[sizeof("ideographic")];
+    char uniname2ctype_pool_str1733[sizeof("ugar")];
+    char uniname2ctype_pool_str1740[sizeof("copt")];
+    char uniname2ctype_pool_str1742[sizeof("imperialaramaic")];
+    char uniname2ctype_pool_str1745[sizeof("insogdian")];
+    char uniname2ctype_pool_str1746[sizeof("indingbats")];
+    char uniname2ctype_pool_str1750[sizeof("format")];
+    char uniname2ctype_pool_str1752[sizeof("ininscriptionalpahlavi")];
+    char uniname2ctype_pool_str1757[sizeof("ininscriptionalparthian")];
+    char uniname2ctype_pool_str1766[sizeof("grbase")];
+    char uniname2ctype_pool_str1769[sizeof("inbatak")];
+    char uniname2ctype_pool_str1776[sizeof("cprt")];
+    char uniname2ctype_pool_str1780[sizeof("cwcf")];
+    char uniname2ctype_pool_str1788[sizeof("cuneiform")];
+    char uniname2ctype_pool_str1791[sizeof("term")];
+    char uniname2ctype_pool_str1806[sizeof("intibetan")];
+    char uniname2ctype_pool_str1810[sizeof("intags")];
+    char uniname2ctype_pool_str1811[sizeof("asciihexdigit")];
+    char uniname2ctype_pool_str1813[sizeof("sentenceterminal")];
+    char uniname2ctype_pool_str1816[sizeof("inmayannumerals")];
+    char uniname2ctype_pool_str1821[sizeof("nand")];
+    char uniname2ctype_pool_str1825[sizeof("patsyn")];
+    char uniname2ctype_pool_str1826[sizeof("hatran")];
+    char uniname2ctype_pool_str1828[sizeof("inblockelements")];
+    char uniname2ctype_pool_str1838[sizeof("inornamentaldingbats")];
+    char uniname2ctype_pool_str1842[sizeof("innumberforms")];
+    char uniname2ctype_pool_str1843[sizeof("oldpersian")];
+    char uniname2ctype_pool_str1846[sizeof("inshavian")];
+    char uniname2ctype_pool_str1848[sizeof("bopo")];
+    char uniname2ctype_pool_str1861[sizeof("hatr")];
+    char uniname2ctype_pool_str1866[sizeof("caseignorable")];
+    char uniname2ctype_pool_str1871[sizeof("inoldpersian")];
+    char uniname2ctype_pool_str1878[sizeof("modifierletter")];
+    char uniname2ctype_pool_str1881[sizeof("cwu")];
+    char uniname2ctype_pool_str1891[sizeof("lydi")];
+    char uniname2ctype_pool_str1892[sizeof("inbyzantinemusicalsymbols")];
+    char uniname2ctype_pool_str1896[sizeof("ingeometricshapesextended")];
+    char uniname2ctype_pool_str1904[sizeof("inmyanmarextendedb")];
+    char uniname2ctype_pool_str1905[sizeof("innushu")];
+    char uniname2ctype_pool_str1906[sizeof("lydian")];
+    char uniname2ctype_pool_str1911[sizeof("inunifiedcanadianaboriginalsyllabics")];
+    char uniname2ctype_pool_str1915[sizeof("orkh")];
+    char uniname2ctype_pool_str1928[sizeof("inyiradicals")];
+    char uniname2ctype_pool_str1929[sizeof("inkatakanaphoneticextensions")];
+    char uniname2ctype_pool_str1930[sizeof("inethiopicextendeda")];
+    char uniname2ctype_pool_str1932[sizeof("incoptic")];
+    char uniname2ctype_pool_str1936[sizeof("inarabicextendeda")];
+    char uniname2ctype_pool_str1947[sizeof("oldpermic")];
+    char uniname2ctype_pool_str1950[sizeof("incjksymbolsandpunctuation")];
+    char uniname2ctype_pool_str1951[sizeof("word")];
+    char uniname2ctype_pool_str1958[sizeof("bopomofo")];
+    char uniname2ctype_pool_str1961[sizeof("ogam")];
+    char uniname2ctype_pool_str1964[sizeof("inlisu")];
+    char uniname2ctype_pool_str1967[sizeof("inoldpermic")];
+    char uniname2ctype_pool_str1968[sizeof("innoblock")];
+    char uniname2ctype_pool_str1971[sizeof("taiviet")];
+    char uniname2ctype_pool_str1985[sizeof("inbraillepatterns")];
+    char uniname2ctype_pool_str1991[sizeof("alpha")];
+    char uniname2ctype_pool_str1993[sizeof("inbalinese")];
+    char uniname2ctype_pool_str1994[sizeof("sorasompeng")];
+    char uniname2ctype_pool_str1996[sizeof("closepunctuation")];
+    char uniname2ctype_pool_str2006[sizeof("inmiscellaneousmathematicalsymbolsb")];
+    char uniname2ctype_pool_str2010[sizeof("inlepcha")];
+    char uniname2ctype_pool_str2014[sizeof("insyriacsupplement")];
+    char uniname2ctype_pool_str2016[sizeof("newa")];
+    char uniname2ctype_pool_str2023[sizeof("spacingmark")];
+    char uniname2ctype_pool_str2024[sizeof("inpalmyrene")];
+    char uniname2ctype_pool_str2033[sizeof("cyrl")];
+    char uniname2ctype_pool_str2043[sizeof("assigned")];
+    char uniname2ctype_pool_str2048[sizeof("mlym")];
+    char uniname2ctype_pool_str2055[sizeof("malayalam")];
+    char uniname2ctype_pool_str2058[sizeof("ext")];
+    char uniname2ctype_pool_str2062[sizeof("newtailue")];
+    char uniname2ctype_pool_str2070[sizeof("space")];
+    char uniname2ctype_pool_str2073[sizeof("intelugu")];
+    char uniname2ctype_pool_str2078[sizeof("idsb")];
+    char uniname2ctype_pool_str2083[sizeof("indevanagari")];
+    char uniname2ctype_pool_str2084[sizeof("avestan")];
+    char uniname2ctype_pool_str2085[sizeof("cf")];
+    char uniname2ctype_pool_str2093[sizeof("palmyrene")];
+    char uniname2ctype_pool_str2095[sizeof("inethiopicsupplement")];
+    char uniname2ctype_pool_str2097[sizeof("soyo")];
+    char uniname2ctype_pool_str2098[sizeof("xposixpunct")];
+    char uniname2ctype_pool_str2102[sizeof("pf")];
+    char uniname2ctype_pool_str2103[sizeof("sarb")];
+    char uniname2ctype_pool_str2109[sizeof("zanabazarsquare")];
+    char uniname2ctype_pool_str2110[sizeof("ugaritic")];
+    char uniname2ctype_pool_str2112[sizeof("osge")];
+    char uniname2ctype_pool_str2114[sizeof("java")];
+    char uniname2ctype_pool_str2117[sizeof("sharada")];
+    char uniname2ctype_pool_str2119[sizeof("dogra")];
+    char uniname2ctype_pool_str2135[sizeof("bugi")];
+    char uniname2ctype_pool_str2137[sizeof("meroitichieroglyphs")];
+    char uniname2ctype_pool_str2145[sizeof("separator")];
+    char uniname2ctype_pool_str2146[sizeof("ingeorgiansupplement")];
+    char uniname2ctype_pool_str2149[sizeof("sogd")];
+    char uniname2ctype_pool_str2150[sizeof("tale")];
+    char uniname2ctype_pool_str2153[sizeof("inunifiedcanadianaboriginalsyllabicsextended")];
+    char uniname2ctype_pool_str2161[sizeof("terminalpunctuation")];
+    char uniname2ctype_pool_str2165[sizeof("shrd")];
+    char uniname2ctype_pool_str2166[sizeof("graph")];
+    char uniname2ctype_pool_str2167[sizeof("olditalic")];
+    char uniname2ctype_pool_str2170[sizeof("dogr")];
+    char uniname2ctype_pool_str2173[sizeof("gujr")];
+    char uniname2ctype_pool_str2181[sizeof("phag")];
+    char uniname2ctype_pool_str2182[sizeof("gujarati")];
+    char uniname2ctype_pool_str2195[sizeof("inhanguljamo")];
+    char uniname2ctype_pool_str2199[sizeof("javanese")];
+    char uniname2ctype_pool_str2201[sizeof("taml")];
+    char uniname2ctype_pool_str2204[sizeof("inphoneticextensions")];
+    char uniname2ctype_pool_str2207[sizeof("siddham")];
+    char uniname2ctype_pool_str2217[sizeof("buginese")];
+    char uniname2ctype_pool_str2218[sizeof("inmongoliansupplement")];
+    char uniname2ctype_pool_str2222[sizeof("invariationselectors")];
+    char uniname2ctype_pool_str2224[sizeof("inhanguljamoextendeda")];
+    char uniname2ctype_pool_str2225[sizeof("inverticalforms")];
+    char uniname2ctype_pool_str2228[sizeof("syrc")];
+    char uniname2ctype_pool_str2229[sizeof("number")];
+    char uniname2ctype_pool_str2235[sizeof("incopticepactnumbers")];
+    char uniname2ctype_pool_str2238[sizeof("avst")];
+    char uniname2ctype_pool_str2244[sizeof("inbamum")];
+    char uniname2ctype_pool_str2247[sizeof("nd")];
+    char uniname2ctype_pool_str2248[sizeof("insuttonsignwriting")];
+    char uniname2ctype_pool_str2252[sizeof("extender")];
+    char uniname2ctype_pool_str2258[sizeof("intaiviet")];
+    char uniname2ctype_pool_str2260[sizeof("hex")];
+    char uniname2ctype_pool_str2268[sizeof("incjkunifiedideographsextensionf")];
+    char uniname2ctype_pool_str2271[sizeof("other")];
+    char uniname2ctype_pool_str2272[sizeof("otheridcontinue")];
+    char uniname2ctype_pool_str2278[sizeof("shaw")];
+    char uniname2ctype_pool_str2282[sizeof("dash")];
+    char uniname2ctype_pool_str2285[sizeof("othernumber")];
+    char uniname2ctype_pool_str2294[sizeof("orya")];
+    char uniname2ctype_pool_str2302[sizeof("invedicextensions")];
+    char uniname2ctype_pool_str2305[sizeof("sgnw")];
+    char uniname2ctype_pool_str2312[sizeof("caucasianalbanian")];
+    char uniname2ctype_pool_str2315[sizeof("inmathematicalalphanumericsymbols")];
+    char uniname2ctype_pool_str2321[sizeof("inphoneticextensionssupplement")];
+    char uniname2ctype_pool_str2339[sizeof("invariationselectorssupplement")];
+    char uniname2ctype_pool_str2343[sizeof("induployan")];
+    char uniname2ctype_pool_str2344[sizeof("syriac")];
+    char uniname2ctype_pool_str2357[sizeof("oalpha")];
+    char uniname2ctype_pool_str2361[sizeof("innyiakengpuachuehmong")];
+    char uniname2ctype_pool_str2364[sizeof("incombiningdiacriticalmarks")];
+    char uniname2ctype_pool_str2365[sizeof("inethiopicextended")];
+    char uniname2ctype_pool_str2373[sizeof("nl")];
+    char uniname2ctype_pool_str2374[sizeof("incombiningdiacriticalmarksforsymbols")];
+    char uniname2ctype_pool_str2375[sizeof("khudawadi")];
+    char uniname2ctype_pool_str2378[sizeof("otheralphabetic")];
+    char uniname2ctype_pool_str2389[sizeof("oldhungarian")];
+    char uniname2ctype_pool_str2396[sizeof("incurrencysymbols")];
+    char uniname2ctype_pool_str2397[sizeof("incjkradicalssupplement")];
+    char uniname2ctype_pool_str2398[sizeof("inglagolitic")];
+    char uniname2ctype_pool_str2415[sizeof("intifinagh")];
+    char uniname2ctype_pool_str2416[sizeof("ingeorgianextended")];
+    char uniname2ctype_pool_str2427[sizeof("surrogate")];
+    char uniname2ctype_pool_str2433[sizeof("incyrillicextendedb")];
+    char uniname2ctype_pool_str2440[sizeof("ethi")];
+    char uniname2ctype_pool_str2451[sizeof("titlecaseletter")];
+    char uniname2ctype_pool_str2454[sizeof("rohg")];
+    char uniname2ctype_pool_str2458[sizeof("inmeroiticcursive")];
+    char uniname2ctype_pool_str2460[sizeof("idstrinaryoperator")];
+    char uniname2ctype_pool_str2470[sizeof("inphagspa")];
+    char uniname2ctype_pool_str2475[sizeof("lepcha")];
+    char uniname2ctype_pool_str2479[sizeof("intagalog")];
+    char uniname2ctype_pool_str2480[sizeof("mathsymbol")];
+    char uniname2ctype_pool_str2481[sizeof("incombiningdiacriticalmarkssupplement")];
+    char uniname2ctype_pool_str2506[sizeof("inbrahmi")];
+    char uniname2ctype_pool_str2513[sizeof("insymbolsandpictographsextendeda")];
+    char uniname2ctype_pool_str2519[sizeof("inlinearbsyllabary")];
+    char uniname2ctype_pool_str2529[sizeof("oldturkic")];
+    char uniname2ctype_pool_str2534[sizeof("inbengali")];
+    char uniname2ctype_pool_str2540[sizeof("wancho")];
+    char uniname2ctype_pool_str2542[sizeof("osmanya")];
+    char uniname2ctype_pool_str2548[sizeof("buhd")];
+    char uniname2ctype_pool_str2552[sizeof("insmallformvariants")];
+    char uniname2ctype_pool_str2561[sizeof("indevanagariextended")];
+    char uniname2ctype_pool_str2562[sizeof("softdotted")];
+    char uniname2ctype_pool_str2564[sizeof("inbuginese")];
+    char uniname2ctype_pool_str2566[sizeof("mahj")];
+    char uniname2ctype_pool_str2567[sizeof("inlatin1supplement")];
+    char uniname2ctype_pool_str2570[sizeof("ingothic")];
+    char uniname2ctype_pool_str2575[sizeof("mahajani")];
+    char uniname2ctype_pool_str2576[sizeof("hang")];
+    char uniname2ctype_pool_str2579[sizeof("sylo")];
+    char uniname2ctype_pool_str2586[sizeof("warangciti")];
+    char uniname2ctype_pool_str2595[sizeof("ingujarati")];
+    char uniname2ctype_pool_str2603[sizeof("tirhuta")];
+    char uniname2ctype_pool_str2606[sizeof("incombiningdiacriticalmarksextended")];
+    char uniname2ctype_pool_str2609[sizeof("spaceseparator")];
+    char uniname2ctype_pool_str2614[sizeof("ingunjalagondi")];
+    char uniname2ctype_pool_str2624[sizeof("wcho")];
+    char uniname2ctype_pool_str2631[sizeof("hiragana")];
+    char uniname2ctype_pool_str2634[sizeof("extendedpictographic")];
+    char uniname2ctype_pool_str2643[sizeof("inrejang")];
+    char uniname2ctype_pool_str2644[sizeof("inottomansiyaqnumbers")];
+    char uniname2ctype_pool_str2648[sizeof("nchar")];
+    char uniname2ctype_pool_str2650[sizeof("cyrillic")];
+    char uniname2ctype_pool_str2653[sizeof("khoj")];
+    char uniname2ctype_pool_str2656[sizeof("inlimbu")];
+    char uniname2ctype_pool_str2663[sizeof("hmng")];
+    char uniname2ctype_pool_str2665[sizeof("thaa")];
+    char uniname2ctype_pool_str2668[sizeof("thai")];
+    char uniname2ctype_pool_str2670[sizeof("incjkunifiedideographsextensionb")];
+    char uniname2ctype_pool_str2673[sizeof("deva")];
+    char uniname2ctype_pool_str2676[sizeof("thaana")];
+    char uniname2ctype_pool_str2688[sizeof("phagspa")];
+    char uniname2ctype_pool_str2691[sizeof("devanagari")];
+    char uniname2ctype_pool_str2692[sizeof("tang")];
+    char uniname2ctype_pool_str2694[sizeof("currencysymbol")];
+    char uniname2ctype_pool_str2698[sizeof("tagbanwa")];
+    char uniname2ctype_pool_str2701[sizeof("inenclosedcjklettersandmonths")];
+    char uniname2ctype_pool_str2702[sizeof("tamil")];
+    char uniname2ctype_pool_str2721[sizeof("tirh")];
+    char uniname2ctype_pool_str2723[sizeof("digit")];
+    char uniname2ctype_pool_str2732[sizeof("talu")];
+    char uniname2ctype_pool_str2747[sizeof("zp")];
+    char uniname2ctype_pool_str2750[sizeof("inpaucinhau")];
+    char uniname2ctype_pool_str2760[sizeof("taitham")];
+    char uniname2ctype_pool_str2764[sizeof("otherlowercase")];
+    char uniname2ctype_pool_str2768[sizeof("telu")];
+    char uniname2ctype_pool_str2769[sizeof("inaegeannumbers")];
+    char uniname2ctype_pool_str2777[sizeof("otherletter")];
+    char uniname2ctype_pool_str2780[sizeof("whitespace")];
+    char uniname2ctype_pool_str2793[sizeof("nonspacingmark")];
+    char uniname2ctype_pool_str2816[sizeof("graphemeclusterbreak=spacingmark")];
+    char uniname2ctype_pool_str2821[sizeof("inletterlikesymbols")];
+    char uniname2ctype_pool_str2834[sizeof("intagbanwa")];
+    char uniname2ctype_pool_str2841[sizeof("oldsogdian")];
+    char uniname2ctype_pool_str2848[sizeof("otheridstart")];
+    char uniname2ctype_pool_str2852[sizeof("graphemeclusterbreak=cr")];
+    char uniname2ctype_pool_str2855[sizeof("narb")];
+    char uniname2ctype_pool_str2856[sizeof("changeswhencasemapped")];
+    char uniname2ctype_pool_str2859[sizeof("inbopomofo")];
+    char uniname2ctype_pool_str2862[sizeof("tangut")];
+    char uniname2ctype_pool_str2867[sizeof("graphemeclusterbreak=regionalindicator")];
+    char uniname2ctype_pool_str2871[sizeof("noncharactercodepoint")];
+    char uniname2ctype_pool_str2883[sizeof("otheruppercase")];
+    char uniname2ctype_pool_str2885[sizeof("rjng")];
+    char uniname2ctype_pool_str2886[sizeof("sylotinagri")];
+    char uniname2ctype_pool_str2904[sizeof("inhangulsyllables")];
+    char uniname2ctype_pool_str2905[sizeof("emojipresentation")];
+    char uniname2ctype_pool_str2906[sizeof("inindicsiyaqnumbers")];
+    char uniname2ctype_pool_str2909[sizeof("inbassavah")];
+    char uniname2ctype_pool_str2912[sizeof("ogrext")];
+    char uniname2ctype_pool_str2926[sizeof("othersymbol")];
+    char uniname2ctype_pool_str2938[sizeof("oupper")];
+    char uniname2ctype_pool_str2941[sizeof("inbuhid")];
+    char uniname2ctype_pool_str2963[sizeof("hmnp")];
+    char uniname2ctype_pool_str2964[sizeof("inpsalterpahlavi")];
+    char uniname2ctype_pool_str2967[sizeof("finalpunctuation")];
+    char uniname2ctype_pool_str2980[sizeof("phlp")];
+    char uniname2ctype_pool_str2984[sizeof("inbamumsupplement")];
+    char uniname2ctype_pool_str2986[sizeof("buhid")];
+    char uniname2ctype_pool_str2987[sizeof("paragraphseparator")];
+    char uniname2ctype_pool_str2988[sizeof("inalphabeticpresentationforms")];
+    char uniname2ctype_pool_str2993[sizeof("omath")];
+    char uniname2ctype_pool_str3000[sizeof("any")];
+    char uniname2ctype_pool_str3001[sizeof("elba")];
+    char uniname2ctype_pool_str3002[sizeof("changeswhentitlecased")];
+    char uniname2ctype_pool_str3005[sizeof("incombininghalfmarks")];
+    char uniname2ctype_pool_str3006[sizeof("intangutcomponents")];
+    char uniname2ctype_pool_str3012[sizeof("hebr")];
+    char uniname2ctype_pool_str3028[sizeof("deprecated")];
+    char uniname2ctype_pool_str3045[sizeof("inarabicmathematicalalphabeticsymbols")];
+    char uniname2ctype_pool_str3055[sizeof("inprivateusearea")];
+    char uniname2ctype_pool_str3089[sizeof("kayahli")];
+    char uniname2ctype_pool_str3098[sizeof("inplayingcards")];
+    char uniname2ctype_pool_str3099[sizeof("inarabicpresentationformsb")];
+    char uniname2ctype_pool_str3100[sizeof("ogham")];
+    char uniname2ctype_pool_str3101[sizeof("elym")];
+    char uniname2ctype_pool_str3107[sizeof("graphemeclusterbreak=t")];
+    char uniname2ctype_pool_str3109[sizeof("graphemeclusterbreak=lvt")];
+    char uniname2ctype_pool_str3111[sizeof("nbat")];
+    char uniname2ctype_pool_str3125[sizeof("nabataean")];
+    char uniname2ctype_pool_str3126[sizeof("hangul")];
+    char uniname2ctype_pool_str3134[sizeof("elymaic")];
+    char uniname2ctype_pool_str3158[sizeof("inhebrew")];
+    char uniname2ctype_pool_str3165[sizeof("injavanese")];
+    char uniname2ctype_pool_str3169[sizeof("symbol")];
+    char uniname2ctype_pool_str3176[sizeof("inmathematicaloperators")];
+    char uniname2ctype_pool_str3180[sizeof("inarabicsupplement")];
+    char uniname2ctype_pool_str3185[sizeof("cypriot")];
+    char uniname2ctype_pool_str3194[sizeof("hung")];
+    char uniname2ctype_pool_str3205[sizeof("wspace")];
+    char uniname2ctype_pool_str3209[sizeof("changeswhenlowercased")];
+    char uniname2ctype_pool_str3215[sizeof("elbasan")];
+    char uniname2ctype_pool_str3218[sizeof("hluw")];
+    char uniname2ctype_pool_str3237[sizeof("insuperscriptsandsubscripts")];
+    char uniname2ctype_pool_str3239[sizeof("graphemeclusterbreak=extend")];
+    char uniname2ctype_pool_str3240[sizeof("graphemeclusterbreak=prepend")];
+    char uniname2ctype_pool_str3248[sizeof("nshu")];
+    char uniname2ctype_pool_str3254[sizeof("oldnortharabian")];
+    char uniname2ctype_pool_str3266[sizeof("inyijinghexagramsymbols")];
+    char uniname2ctype_pool_str3286[sizeof("hexdigit")];
+    char uniname2ctype_pool_str3297[sizeof("graphemeclusterbreak=l")];
+    char uniname2ctype_pool_str3303[sizeof("graphemeclusterbreak=control")];
+    char uniname2ctype_pool_str3309[sizeof("bassavah")];
+    char uniname2ctype_pool_str3317[sizeof("otherdefaultignorablecodepoint")];
+    char uniname2ctype_pool_str3328[sizeof("changeswhenuppercased")];
+    char uniname2ctype_pool_str3329[sizeof("inalchemicalsymbols")];
+    char uniname2ctype_pool_str3348[sizeof("insupplementalarrowsa")];
+    char uniname2ctype_pool_str3349[sizeof("inyisyllables")];
+    char uniname2ctype_pool_str3351[sizeof("tibt")];
+    char uniname2ctype_pool_str3360[sizeof("othermath")];
+    char uniname2ctype_pool_str3363[sizeof("tibetan")];
+    char uniname2ctype_pool_str3365[sizeof("inmahjongtiles")];
+    char uniname2ctype_pool_str3433[sizeof("signwriting")];
+    char uniname2ctype_pool_str3436[sizeof("nushu")];
+    char uniname2ctype_pool_str3439[sizeof("modifiersymbol")];
+    char uniname2ctype_pool_str3442[sizeof("inhalfwidthandfullwidthforms")];
+    char uniname2ctype_pool_str3458[sizeof("upper")];
+    char uniname2ctype_pool_str3460[sizeof("insupplementalarrowsc")];
+    char uniname2ctype_pool_str3511[sizeof("insupplementalmathematicaloperators")];
+    char uniname2ctype_pool_str3512[sizeof("incypriotsyllabary")];
+    char uniname2ctype_pool_str3517[sizeof("dupl")];
+    char uniname2ctype_pool_str3531[sizeof("tavt")];
+    char uniname2ctype_pool_str3532[sizeof("inpahawhhmong")];
+    char uniname2ctype_pool_str3533[sizeof("alphabetic")];
+    char uniname2ctype_pool_str3550[sizeof("dashpunctuation")];
+    char uniname2ctype_pool_str3558[sizeof("uppercase")];
+    char uniname2ctype_pool_str3613[sizeof("soyombo")];
+    char uniname2ctype_pool_str3614[sizeof("hanifirohingya")];
+    char uniname2ctype_pool_str3616[sizeof("otherpunctuation")];
+    char uniname2ctype_pool_str3628[sizeof("defaultignorablecodepoint")];
+    char uniname2ctype_pool_str3648[sizeof("inhanguljamoextendedb")];
+    char uniname2ctype_pool_str3664[sizeof("aghb")];
+    char uniname2ctype_pool_str3703[sizeof("tifinagh")];
+    char uniname2ctype_pool_str3705[sizeof("inlatinextendedb")];
+    char uniname2ctype_pool_str3714[sizeof("tfng")];
+    char uniname2ctype_pool_str3766[sizeof("inhighprivateusesurrogates")];
+    char uniname2ctype_pool_str3791[sizeof("changeswhencasefolded")];
+    char uniname2ctype_pool_str3805[sizeof("dep")];
+    char uniname2ctype_pool_str3819[sizeof("oldsoutharabian")];
+    char uniname2ctype_pool_str3821[sizeof("graphemeclusterbreak=lf")];
+    char uniname2ctype_pool_str3842[sizeof("pahawhhmong")];
+    char uniname2ctype_pool_str3845[sizeof("unifiedideograph")];
+    char uniname2ctype_pool_str3891[sizeof("uppercaseletter")];
+    char uniname2ctype_pool_str3924[sizeof("insupplementalpunctuation")];
+    char uniname2ctype_pool_str3942[sizeof("ethiopic")];
+    char uniname2ctype_pool_str3976[sizeof("inglagoliticsupplement")];
+    char uniname2ctype_pool_str3995[sizeof("rejang")];
+    char uniname2ctype_pool_str4087[sizeof("inbopomofoextended")];
+    char uniname2ctype_pool_str4109[sizeof("tagb")];
+    char uniname2ctype_pool_str4137[sizeof("othergraphemeextend")];
+    char uniname2ctype_pool_str4162[sizeof("inegyptianhieroglyphs")];
+    char uniname2ctype_pool_str4175[sizeof("inegyptianhieroglyphformatcontrols")];
+    char uniname2ctype_pool_str4203[sizeof("hebrew")];
+    char uniname2ctype_pool_str4254[sizeof("tglg")];
+    char uniname2ctype_pool_str4276[sizeof("tagalog")];
+    char uniname2ctype_pool_str4291[sizeof("graphemeclusterbreak=zwj")];
+    char uniname2ctype_pool_str4321[sizeof("zyyy")];
+    char uniname2ctype_pool_str4360[sizeof("hyphen")];
+    char uniname2ctype_pool_str4397[sizeof("inboxdrawing")];
+    char uniname2ctype_pool_str4405[sizeof("graphemeclusterbreak=v")];
+    char uniname2ctype_pool_str4406[sizeof("graphemeclusterbreak=lv")];
+    char uniname2ctype_pool_str4460[sizeof("telugu")];
+    char uniname2ctype_pool_str4485[sizeof("duployan")];
+    char uniname2ctype_pool_str4528[sizeof("openpunctuation")];
+    char uniname2ctype_pool_str4674[sizeof("insupplementaryprivateuseareaa")];
+    char uniname2ctype_pool_str4683[sizeof("inhighsurrogates")];
+    char uniname2ctype_pool_str4772[sizeof("insupplementalarrowsb")];
+    char uniname2ctype_pool_str4948[sizeof("insupplementalsymbolsandpictographs")];
+    char uniname2ctype_pool_str4955[sizeof("egyp")];
+    char uniname2ctype_pool_str4986[sizeof("inhangulcompatibilityjamo")];
+    char uniname2ctype_pool_str5114[sizeof("nyiakengpuachuehmong")];
+    char uniname2ctype_pool_str5608[sizeof("egyptianhieroglyphs")];
+    char uniname2ctype_pool_str6098[sizeof("insupplementaryprivateuseareab")];
+#endif /* USE_UNICODE_PROPERTIES */
+  };
+static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
+  {
+#ifndef USE_UNICODE_PROPERTIES
+    "word",
+#else /* USE_UNICODE_PROPERTIES */
+    "yi",
+    "yiii",
+    "lana",
+    "z",
+    "lina",
+    "maka",
+    "mani",
+    "mn",
+    "miao",
+    "lo",
+    "ci",
+    "lao",
+    "laoo",
+    "inkannada",
+    "cn",
+    "pi",
+    "innko",
+    "zzzz",
+    "gran",
+    "co",
+    "lineara",
+    "mark",
+    "po",
+    "me",
+    "cari",
+    "inkharoshthi",
+    "kana",
+    "loe",
+    "m",
+    "grek",
+    "mro",
+    "mroo",
+    "carian",
+    "geor",
+    "greek",
+    "gonm",
+    "mendekikakui",
+    "pe",
+    "mero",
+    "inosmanya",
+    "cakm",
+    "inmanichaean",
+    "inmro",
+    "inmiao",
+    "inchakma",
+    "c",
+    "mandaic",
+    "meeteimayek",
+    "inarmenian",
+    "inmyanmar",
+    "inmakasar",
+    "common",
+    "lm",
+    "marc",
+    "inrunic",
+    "incarian",
+    "inideographicsymbolsandpunctuation",
+    "inkhmer",
+    "qaai",
+    "inahom",
+    "merc",
+    "combiningmark",
+    "lc",
+    "perm",
+    "mc",
+    "connectorpunctuation",
+    "cans",
+    "incuneiformnumbersandpunctuation",
+    "armi",
+    "cc",
+    "armn",
+    "incherokee",
+    "prependedconcatenationmark",
+    "incuneiform",
+    "inavestan",
+    "inipaextensions",
+    "pc",
+    "armenian",
+    "insharada",
+    "inmarchen",
+    "makasar",
+    "masaramgondi",
+    "inarrows",
+    "incyrillic",
+    "incham",
+    "qmark",
+    "ri",
+    "qaac",
+    "insamaritan",
+    "latn",
+    "inmasaramgondi",
+    "inthaana",
+    "latin",
+    "inthai",
+    "lineseparator",
+    "pcm",
+    "inkatakana",
+    "inkaithi",
+    "inzanabazarsquare",
+    "inscriptionalparthian",
+    "initialpunctuation",
+    "mtei",
+    "vai",
+    "vaii",
+    "inkhmersymbols",
+    "insyriac",
+    "intakri",
+    "arabic",
+    "zs",
+    "katakana",
+    "prti",
+    "ascii",
+    "cs",
+    "ps",
+    "mand",
+    "privateuse",
+    "inruminumeralsymbols",
+    "inmyanmarextendeda",
+    "modi",
+    "incjkcompatibilityforms",
+    "inkanaextendeda",
+    "incjkcompatibilityideographs",
+    "brai",
+    "mend",
+    "ideo",
+    "letter",
+    "l",
+    "inmeeteimayek",
+    "inideographicdescriptioncharacters",
+    "xidcontinue",
+    "knda",
+    "innandinagari",
+    "kannada",
+    "inmodi",
+    "inlao",
+    "inoldnortharabian",
+    "intransportandmapsymbols",
+    "letternumber",
+    "gothic",
+    "inlineara",
+    "inmendekikakui",
+    "xidc",
+    "mongolian",
+    "inmiscellaneousmathematicalsymbolsa",
+    "inspecials",
+    "grlink",
+    "brahmi",
+    "inemoticons",
+    "kali",
+    "inolditalic",
+    "inmedefaidrin",
+    "inchesssymbols",
+    "incjkcompatibilityideographssupplement",
+    "inadlam",
+    "psalterpahlavi",
+    "incommonindicnumberforms",
+    "lt",
+    "innewa",
+    "sk",
+    "control",
+    "inancientsymbols",
+    "palm",
+    "inlycian",
+    "so",
+    "patternwhitespace",
+    "xids",
+    "inmandaic",
+    "idc",
+    "meroiticcursive",
+    "inwarangciti",
+    "sora",
+    "inopticalcharacterrecognition",
+    "inoldsogdian",
+    "inmalayalam",
+    "bamum",
+    "inkanasupplement",
+    "insundanese",
+    "grext",
+#endif /* USE_UNICODE_PROPERTIES */
+    "print",
+#ifndef USE_UNICODE_PROPERTIES
+    "punct",
+    "alpha",
+#else /* USE_UNICODE_PROPERTIES */
+    "intaitham",
+    "lower",
+    "joinc",
+    "inoldsoutharabian",
+    "incjkstrokes",
+    "batk",
+    "samr",
+    "inwancho",
+    "batak",
+    "vs",
+    "patws",
+    "samaritan",
+    "idsbinaryoperator",
+    "pauc",
+    "insmallkanaextension",
+    "sm",
+    "indominotiles",
+#endif /* USE_UNICODE_PROPERTIES */
+    "alnum",
+#ifdef USE_UNICODE_PROPERTIES
+    "insylotinagri",
+    "inugaritic",
+    "incontrolpictures",
+    "inlinearbideograms",
+    "inmusicalsymbols",
+    "s",
+    "ital",
+    "inmodifiertoneletters",
+    "inancientgreekmusicalnotation",
+    "patternsyntax",
+    "lisu",
+    "lowercase",
+    "cwcm",
+    "sc",
+    "bass",
+    "ids",
+    "inlatinextendeda",
+    "oriya",
+    "intaile",
+    "inmiscellaneoussymbols",
+    "inmiscellaneoussymbolsandarrows",
+    "incaucasianalbanian",
+    "inmiscellaneoussymbolsandpictographs",
+    "inoldturkic",
+    "insaurashtra",
+    "idcontinue",
+    "intamil",
+    "inmultani",
+    "inlatinextendede",
+    "pd",
+    "bali",
+    "blank",
+    "idst",
+    "inlydian",
+    "innewtailue",
+    "bengali",
+    "runr",
+    "zl",
+    "incyrillicextendeda",
+    "ll",
+    "indeseret",
+    "intaixuanjingsymbols",
+    "inancientgreeknumbers",
+    "idstart",
+    "inmeeteimayekextensions",
+    "balinese",
+    "dia",
+    "di",
+    "inspacingmodifierletters",
+    "inearlydynasticcuneiform",
+    "plrd",
+    "canadianaboriginal",
+    "zinh",
+    "sind",
+    "osage",
+    "inlatinextendedc",
+    "uideo",
+    "incountingrodnumerals",
+    "xidstart",
+#endif /* USE_UNICODE_PROPERTIES */
+    "xdigit",
+#ifndef USE_UNICODE_PROPERTIES
+    "upper",
+    "ascii",
+#else /* USE_UNICODE_PROPERTIES */
+    "osma",
+    "inkhudawadi",
+    "inhanifirohingya",
+    "gong",
+    "ingrantha",
+    "bidic",
+    "mong",
+    "cased",
+    "incyrillicextendedc",
+    "inhiragana",
+    "sinhala",
+    "adlm",
+    "glagolitic",
+    "sterm",
+    "bamu",
+    "georgian",
+    "inosage",
+    "gunjalagondi",
+    "phoenician",
+    "multani",
+    "kaithi",
+    "joincontrol",
+    "runic",
+    "ingeneralpunctuation",
+    "inmahajani",
+    "incyrillicsupplement",
+    "lowercaseletter",
+    "marchen",
+    "graphemelink",
+    "ingeorgian",
+    "khojki",
+    "cham",
+    "inogham",
+    "cher",
+    "chakma",
+    "emoji",
+    "insiddham",
+    "cherokee",
+    "khar",
+    "inmongolian",
+    "incherokeesupplement",
+    "diacritic",
+    "manichaean",
+    "xsux",
+    "inolchiki",
+    "quotationmark",
+    "adlam",
+    "inethiopic",
+    "graphemebase",
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    "age=11.0",
+    "age=12.1",
+    "age=10.0",
+    "age=12.0",
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    "casedletter",
+    "ingurmukhi",
+    "odi",
+    "incjkunifiedideographsextensiona",
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    "age=1.1",
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    "lu",
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    "age=4.1",
+    "age=2.1",
+    "age=4.0",
+    "age=2.0",
+    "age=9.0",
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    "intamilsupplement",
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    "age=6.1",
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    "unknown",
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    "age=6.0",
+    "age=6.2",
+    "age=3.1",
+    "age=8.0",
+    "age=3.0",
+    "age=3.2",
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    "cwt",
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    "age=7.0",
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    "unassigned",
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    "age=6.3",
+    "age=5.1",
+    "age=5.0",
+    "age=5.2",
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    "ahom",
+    "incjkunifiedideographsextensione",
+    "khmr",
+    "insinhala",
+    "inmiscellaneoustechnical",
+    "saur",
+    "guru",
+    "sundanese",
+    "punct",
+    "paucinhau",
+    "gurmukhi",
+    "variationselector",
+    "logicalorderexception",
+    "khmer",
+    "limbu",
+    "inscriptionalpahlavi",
+    "oidc",
+    "incjkunifiedideographsextensionc",
+#endif /* USE_UNICODE_PROPERTIES */
+    "cntrl",
+#ifdef USE_UNICODE_PROPERTIES
+    "inlatinextendedadditional",
+    "decimalnumber",
+    "insorasompeng",
+    "radical",
+    "emojimodifier",
+    "kharoshthi",
+    "n",
+    "math",
+    "goth",
+    "anatolianhieroglyphs",
+    "inenclosedalphanumerics",
+    "nandinagari",
+    "no",
+    "nko",
+    "nkoo",
+    "ingreekandcoptic",
+    "olck",
+    "p",
+    "grantha",
+    "olchiki",
+    "incjkunifiedideographs",
+    "zanb",
+    "intirhuta",
+    "oids",
+    "inhatran",
+    "linb",
+    "xpeo",
+    "mult",
+    "saurashtra",
+    "kthi",
+    "inbhaiksuki",
+    "olower",
+    "innabataean",
+    "inphoenician",
+    "inkanbun",
+    "inmeroitichieroglyphs",
+    "inkayahli",
+    "phnx",
+    "inoriya",
+    "enclosingmark",
+    "sd",
+    "inelbasan",
+    "wara",
+    "inenclosedideographicsupplement",
+    "sidd",
+    "linearb",
+    "hani",
+    "han",
+    "inenclosedalphanumericsupplement",
+    "medf",
+    "bidicontrol",
+    "hano",
+    "inphaistosdisc",
+    "limb",
+    "inkangxiradicals",
+    "lepc",
+    "medefaidrin",
+    "braille",
+    "regionalindicator",
+    "inlowsurrogates",
+    "inshorthandformatcontrols",
+    "brah",
+    "inkhojki",
+    "inoldhungarian",
+    "hanunoo",
+    "hira",
+    "beng",
+    "emojimodifierbase",
+    "inarabic",
+    "lyci",
+    "ahex",
+    "inherited",
+    "glag",
+    "lycian",
+    "indogra",
+    "dsrt",
+    "arab",
+    "mymr",
+    "myanmar",
+    "phli",
+    "inimperialaramaic",
+    "ingreekextended",
+    "inanatolianhieroglyphs",
+    "punctuation",
+    "takri",
+    "graphemeextend",
+    "invai",
+    "cwl",
+    "ingeometricshapes",
+    "emojicomponent",
+    "coptic",
+    "deseret",
+    "inarabicpresentationformsa",
+    "takr",
+    "inbasiclatin",
+    "incjkunifiedideographsextensiond",
+    "sinh",
+    "sund",
+    "shavian",
+    "taile",
+    "insundanesesupplement",
+    "inelymaic",
+    "insoyombo",
+    "bhks",
+    "bhaiksuki",
+    "incjkcompatibility",
+    "inhanunoo",
+    "intangut",
+    "sogdian",
+    "inlatinextendedd",
+    "sogo",
+    "insinhalaarchaicnumbers",
+    "ideographic",
+    "ugar",
+    "copt",
+    "imperialaramaic",
+    "insogdian",
+    "indingbats",
+    "format",
+    "ininscriptionalpahlavi",
+    "ininscriptionalparthian",
+    "grbase",
+    "inbatak",
+    "cprt",
+    "cwcf",
+    "cuneiform",
+    "term",
+    "intibetan",
+    "intags",
+    "asciihexdigit",
+    "sentenceterminal",
+    "inmayannumerals",
+    "nand",
+    "patsyn",
+    "hatran",
+    "inblockelements",
+    "inornamentaldingbats",
+    "innumberforms",
+    "oldpersian",
+    "inshavian",
+    "bopo",
+    "hatr",
+    "caseignorable",
+    "inoldpersian",
+    "modifierletter",
+    "cwu",
+    "lydi",
+    "inbyzantinemusicalsymbols",
+    "ingeometricshapesextended",
+    "inmyanmarextendedb",
+    "innushu",
+    "lydian",
+    "inunifiedcanadianaboriginalsyllabics",
+    "orkh",
+    "inyiradicals",
+    "inkatakanaphoneticextensions",
+    "inethiopicextendeda",
+    "incoptic",
+    "inarabicextendeda",
+    "oldpermic",
+    "incjksymbolsandpunctuation",
+    "word",
+    "bopomofo",
+    "ogam",
+    "inlisu",
+    "inoldpermic",
+    "innoblock",
+    "taiviet",
+    "inbraillepatterns",
+    "alpha",
+    "inbalinese",
+    "sorasompeng",
+    "closepunctuation",
+    "inmiscellaneousmathematicalsymbolsb",
+    "inlepcha",
+    "insyriacsupplement",
+    "newa",
+    "spacingmark",
+    "inpalmyrene",
+    "cyrl",
+    "assigned",
+    "mlym",
+    "malayalam",
+    "ext",
+    "newtailue",
+#endif /* USE_UNICODE_PROPERTIES */
+    "space",
+#ifdef USE_UNICODE_PROPERTIES
+    "intelugu",
+    "idsb",
+    "indevanagari",
+    "avestan",
+    "cf",
+    "palmyrene",
+    "inethiopicsupplement",
+    "soyo",
+#endif /* USE_UNICODE_PROPERTIES */
+    "xposixpunct",
+#ifndef USE_UNICODE_PROPERTIES
+    "lower",
+#else /* USE_UNICODE_PROPERTIES */
+    "pf",
+    "sarb",
+    "zanabazarsquare",
+    "ugaritic",
+    "osge",
+    "java",
+    "sharada",
+    "dogra",
+    "bugi",
+    "meroitichieroglyphs",
+    "separator",
+    "ingeorgiansupplement",
+    "sogd",
+    "tale",
+    "inunifiedcanadianaboriginalsyllabicsextended",
+    "terminalpunctuation",
+    "shrd",
+#endif /* USE_UNICODE_PROPERTIES */
+    "graph",
+#ifdef USE_UNICODE_PROPERTIES
+    "olditalic",
+    "dogr",
+    "gujr",
+    "phag",
+    "gujarati",
+    "inhanguljamo",
+    "javanese",
+    "taml",
+    "inphoneticextensions",
+    "siddham",
+    "buginese",
+    "inmongoliansupplement",
+    "invariationselectors",
+    "inhanguljamoextendeda",
+    "inverticalforms",
+    "syrc",
+    "number",
+    "incopticepactnumbers",
+    "avst",
+    "inbamum",
+    "nd",
+    "insuttonsignwriting",
+    "extender",
+    "intaiviet",
+    "hex",
+    "incjkunifiedideographsextensionf",
+    "other",
+    "otheridcontinue",
+    "shaw",
+    "dash",
+    "othernumber",
+    "orya",
+    "invedicextensions",
+    "sgnw",
+    "caucasianalbanian",
+    "inmathematicalalphanumericsymbols",
+    "inphoneticextensionssupplement",
+    "invariationselectorssupplement",
+    "induployan",
+    "syriac",
+    "oalpha",
+    "innyiakengpuachuehmong",
+    "incombiningdiacriticalmarks",
+    "inethiopicextended",
+    "nl",
+    "incombiningdiacriticalmarksforsymbols",
+    "khudawadi",
+    "otheralphabetic",
+    "oldhungarian",
+    "incurrencysymbols",
+    "incjkradicalssupplement",
+    "inglagolitic",
+    "intifinagh",
+    "ingeorgianextended",
+    "surrogate",
+    "incyrillicextendedb",
+    "ethi",
+    "titlecaseletter",
+    "rohg",
+    "inmeroiticcursive",
+    "idstrinaryoperator",
+    "inphagspa",
+    "lepcha",
+    "intagalog",
+    "mathsymbol",
+    "incombiningdiacriticalmarkssupplement",
+    "inbrahmi",
+    "insymbolsandpictographsextendeda",
+    "inlinearbsyllabary",
+    "oldturkic",
+    "inbengali",
+    "wancho",
+    "osmanya",
+    "buhd",
+    "insmallformvariants",
+    "indevanagariextended",
+    "softdotted",
+    "inbuginese",
+    "mahj",
+    "inlatin1supplement",
+    "ingothic",
+    "mahajani",
+    "hang",
+    "sylo",
+    "warangciti",
+    "ingujarati",
+    "tirhuta",
+    "incombiningdiacriticalmarksextended",
+    "spaceseparator",
+    "ingunjalagondi",
+    "wcho",
+    "hiragana",
+    "extendedpictographic",
+    "inrejang",
+    "inottomansiyaqnumbers",
+    "nchar",
+    "cyrillic",
+    "khoj",
+    "inlimbu",
+    "hmng",
+    "thaa",
+    "thai",
+    "incjkunifiedideographsextensionb",
+    "deva",
+    "thaana",
+    "phagspa",
+    "devanagari",
+    "tang",
+    "currencysymbol",
+    "tagbanwa",
+    "inenclosedcjklettersandmonths",
+    "tamil",
+    "tirh",
+#endif /* USE_UNICODE_PROPERTIES */
+    "digit",
+#ifndef USE_UNICODE_PROPERTIES
+    "blank"
+#else /* USE_UNICODE_PROPERTIES */
+    "talu",
+    "zp",
+    "inpaucinhau",
+    "taitham",
+    "otherlowercase",
+    "telu",
+    "inaegeannumbers",
+    "otherletter",
+    "whitespace",
+    "nonspacingmark",
+    "graphemeclusterbreak=spacingmark",
+    "inletterlikesymbols",
+    "intagbanwa",
+    "oldsogdian",
+    "otheridstart",
+    "graphemeclusterbreak=cr",
+    "narb",
+    "changeswhencasemapped",
+    "inbopomofo",
+    "tangut",
+    "graphemeclusterbreak=regionalindicator",
+    "noncharactercodepoint",
+    "otheruppercase",
+    "rjng",
+    "sylotinagri",
+    "inhangulsyllables",
+    "emojipresentation",
+    "inindicsiyaqnumbers",
+    "inbassavah",
+    "ogrext",
+    "othersymbol",
+    "oupper",
+    "inbuhid",
+    "hmnp",
+    "inpsalterpahlavi",
+    "finalpunctuation",
+    "phlp",
+    "inbamumsupplement",
+    "buhid",
+    "paragraphseparator",
+    "inalphabeticpresentationforms",
+    "omath",
+    "any",
+    "elba",
+    "changeswhentitlecased",
+    "incombininghalfmarks",
+    "intangutcomponents",
+    "hebr",
+    "deprecated",
+    "inarabicmathematicalalphabeticsymbols",
+    "inprivateusearea",
+    "kayahli",
+    "inplayingcards",
+    "inarabicpresentationformsb",
+    "ogham",
+    "elym",
+    "graphemeclusterbreak=t",
+    "graphemeclusterbreak=lvt",
+    "nbat",
+    "nabataean",
+    "hangul",
+    "elymaic",
+    "inhebrew",
+    "injavanese",
+    "symbol",
+    "inmathematicaloperators",
+    "inarabicsupplement",
+    "cypriot",
+    "hung",
+    "wspace",
+    "changeswhenlowercased",
+    "elbasan",
+    "hluw",
+    "insuperscriptsandsubscripts",
+    "graphemeclusterbreak=extend",
+    "graphemeclusterbreak=prepend",
+    "nshu",
+    "oldnortharabian",
+    "inyijinghexagramsymbols",
+    "hexdigit",
+    "graphemeclusterbreak=l",
+    "graphemeclusterbreak=control",
+    "bassavah",
+    "otherdefaultignorablecodepoint",
+    "changeswhenuppercased",
+    "inalchemicalsymbols",
+    "insupplementalarrowsa",
+    "inyisyllables",
+    "tibt",
+    "othermath",
+    "tibetan",
+    "inmahjongtiles",
+    "signwriting",
+    "nushu",
+    "modifiersymbol",
+    "inhalfwidthandfullwidthforms",
+    "upper",
+    "insupplementalarrowsc",
+    "insupplementalmathematicaloperators",
+    "incypriotsyllabary",
+    "dupl",
+    "tavt",
+    "inpahawhhmong",
+    "alphabetic",
+    "dashpunctuation",
+    "uppercase",
+    "soyombo",
+    "hanifirohingya",
+    "otherpunctuation",
+    "defaultignorablecodepoint",
+    "inhanguljamoextendedb",
+    "aghb",
+    "tifinagh",
+    "inlatinextendedb",
+    "tfng",
+    "inhighprivateusesurrogates",
+    "changeswhencasefolded",
+    "dep",
+    "oldsoutharabian",
+    "graphemeclusterbreak=lf",
+    "pahawhhmong",
+    "unifiedideograph",
+    "uppercaseletter",
+    "insupplementalpunctuation",
+    "ethiopic",
+    "inglagoliticsupplement",
+    "rejang",
+    "inbopomofoextended",
+    "tagb",
+    "othergraphemeextend",
+    "inegyptianhieroglyphs",
+    "inegyptianhieroglyphformatcontrols",
+    "hebrew",
+    "tglg",
+    "tagalog",
+    "graphemeclusterbreak=zwj",
+    "zyyy",
+    "hyphen",
+    "inboxdrawing",
+    "graphemeclusterbreak=v",
+    "graphemeclusterbreak=lv",
+    "telugu",
+    "duployan",
+    "openpunctuation",
+    "insupplementaryprivateuseareaa",
+    "inhighsurrogates",
+    "insupplementalarrowsb",
+    "insupplementalsymbolsandpictographs",
+    "egyp",
+    "inhangulcompatibilityjamo",
+    "nyiakengpuachuehmong",
+    "egyptianhieroglyphs",
+    "insupplementaryprivateuseareab"
+#endif /* USE_UNICODE_PROPERTIES */
+  };
+#define uniname2ctype_pool ((const char *) &uniname2ctype_pool_contents)
+const struct uniname2ctype_struct *
+uniname2ctype_p (register const char *str, register size_t len)
+{
+  static const struct uniname2ctype_struct wordlist[] =
+    {
+#ifdef USE_UNICODE_PROPERTIES
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {uniname2ctype_offset(str11), 111},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str17), 111},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str22), 152},
+      {-1},
+      {uniname2ctype_offset(str24), 52},
+      {uniname2ctype_offset(str25), 184},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str33), 218},
+      {-1},
+      {uniname2ctype_offset(str35), 186},
+      {uniname2ctype_offset(str36), 34},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str45), 173},
+      {uniname2ctype_offset(str46), 28},
+      {uniname2ctype_offset(str47), 61},
+      {uniname2ctype_offset(str48), 95},
+      {uniname2ctype_offset(str49), 95},
+      {-1}, {-1},
+      {uniname2ctype_offset(str52), 331},
+      {-1}, {-1},
+      {uniname2ctype_offset(str55), 21},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str64), 44},
+      {-1},
+      {uniname2ctype_offset(str66), 319},
+      {uniname2ctype_offset(str67), 267},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str71), 181},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str75), 22},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str83), 184},
+      {-1}, {-1},
+      {uniname2ctype_offset(str86), 31},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str92), 45},
+      {-1},
+      {uniname2ctype_offset(str94), 33},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str100), 149},
+      {uniname2ctype_offset(str101), 496},
+      {uniname2ctype_offset(str102), 108},
+      {uniname2ctype_offset(str103), 252},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str107), 31},
+      {uniname2ctype_offset(str108), 77},
+      {-1}, {-1},
+      {uniname2ctype_offset(str111), 189},
+      {uniname2ctype_offset(str112), 189},
+      {-1}, {-1},
+      {uniname2ctype_offset(str115), 149},
+      {-1},
+      {uniname2ctype_offset(str117), 98},
+      {uniname2ctype_offset(str118), 77},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str122), 212},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str129), 187},
+      {uniname2ctype_offset(str130), 42},
+      {uniname2ctype_offset(str131), 172},
+      {-1}, {-1},
+      {uniname2ctype_offset(str134), 482},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str139), 170},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str145), 499},
+      {uniname2ctype_offset(str146), 548},
+      {-1},
+      {uniname2ctype_offset(str148), 552},
+      {uniname2ctype_offset(str149), 514},
+      {-1},
+      {uniname2ctype_offset(str151), 18},
+      {uniname2ctype_offset(str152), 169},
+      {uniname2ctype_offset(str153), 160},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str161), 313},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str177), 337},
+      {uniname2ctype_offset(str178), 539},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str183), 75},
+      {-1}, {-1},
+      {uniname2ctype_offset(str186), 27},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str190), 208},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str203), 345},
+      {uniname2ctype_offset(str204), 473},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str210), 553},
+      {-1},
+      {uniname2ctype_offset(str212), 350},
+      {uniname2ctype_offset(str213), 115},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str218), 528},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str226), 171},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str231), 31},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str236), 25},
+      {uniname2ctype_offset(str237), 194},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str246), 32},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str250), 40},
+      {-1}, {-1},
+      {uniname2ctype_offset(str253), 102},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str260), 542},
+      {-1}, {-1},
+      {uniname2ctype_offset(str263), 161},
+      {-1},
+      {uniname2ctype_offset(str265), 19},
+      {-1},
+      {uniname2ctype_offset(str267), 79},
+      {uniname2ctype_offset(str268), 342},
+      {-1},
+      {uniname2ctype_offset(str270), 259},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str274), 541},
+      {uniname2ctype_offset(str275), 500},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str281), 307},
+      {uniname2ctype_offset(str282), 40},
+      {uniname2ctype_offset(str283), 79},
+      {-1},
+      {uniname2ctype_offset(str285), 516},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str289), 536},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str293), 218},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str297), 212},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str301), 380},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str311), 311},
+      {-1},
+      {uniname2ctype_offset(str313), 441},
+      {-1},
+      {uniname2ctype_offset(str315), 232},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str320), 260},
+      {-1},
+      {uniname2ctype_offset(str322), 129},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str328), 320},
+      {-1}, {-1},
+      {uniname2ctype_offset(str331), 76},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str335), 537},
+      {-1}, {-1},
+      {uniname2ctype_offset(str338), 318},
+      {-1},
+      {uniname2ctype_offset(str340), 76},
+      {-1},
+      {uniname2ctype_offset(str342), 334},
+      {-1}, {-1},
+      {uniname2ctype_offset(str345), 53},
+      {uniname2ctype_offset(str346), 259},
+      {-1},
+      {uniname2ctype_offset(str348), 411},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str352), 512},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str357), 532},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str362), 163},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str366), 44},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str373), 160},
+      {-1}, {-1},
+      {uniname2ctype_offset(str376), 144},
+      {uniname2ctype_offset(str377), 144},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str386), 356},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str399), 316},
+      {-1},
+      {uniname2ctype_offset(str401), 527},
+      {-1}, {-1},
+      {uniname2ctype_offset(str404), 81},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str411), 55},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str418), 108},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str426), 163},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str442), 14},
+      {-1}, {-1},
+      {uniname2ctype_offset(str445), 23},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str462), 46},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str468), 169},
+      {-1},
+      {uniname2ctype_offset(str470), 22},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str475), 507},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str480), 442},
+      {uniname2ctype_offset(str481), 188},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str486), 461},
+      {-1},
+      {uniname2ctype_offset(str488), 557},
+      {-1}, {-1},
+      {uniname2ctype_offset(str491), 455},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str500), 127},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str504), 187},
+      {uniname2ctype_offset(str505), 238},
+      {uniname2ctype_offset(str506), 24},
+      {-1}, {-1},
+      {uniname2ctype_offset(str509), 24},
+      {-1},
+      {uniname2ctype_offset(str511), 448},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str520), 408},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str535), 70},
+      {-1}, {-1},
+      {uniname2ctype_offset(str538), 91},
+      {-1}, {-1},
+      {uniname2ctype_offset(str541), 531},
+      {-1},
+      {uniname2ctype_offset(str543), 91},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str556), 525},
+      {-1},
+      {uniname2ctype_offset(str558), 335},
+      {-1},
+      {uniname2ctype_offset(str560), 498},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str565), 586},
+      {uniname2ctype_offset(str566), 37},
+      {-1},
+      {uniname2ctype_offset(str568), 113},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str572), 486},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str577), 573},
+      {uniname2ctype_offset(str578), 70},
+      {uniname2ctype_offset(str579), 106},
+      {-1}, {-1},
+      {uniname2ctype_offset(str582), 391},
+      {uniname2ctype_offset(str583), 465},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str590), 74},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str594), 168},
+      {-1},
+      {uniname2ctype_offset(str596), 584},
+      {uniname2ctype_offset(str597), 146},
+      {-1}, {-1},
+      {uniname2ctype_offset(str600), 475},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str604), 551},
+      {uniname2ctype_offset(str605), 591},
+      {-1}, {-1},
+      {uniname2ctype_offset(str608), 598},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str614), 574},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str624), 195},
+      {uniname2ctype_offset(str625), 432},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str630), 29},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str636), 522},
+      {-1}, {-1},
+      {uniname2ctype_offset(str639), 49},
+      {-1}, {-1},
+      {uniname2ctype_offset(str642), 19},
+      {-1}, {-1},
+      {uniname2ctype_offset(str645), 470},
+      {-1},
+      {uniname2ctype_offset(str647), 192},
+      {-1}, {-1},
+      {uniname2ctype_offset(str650), 472},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str657), 51},
+      {-1}, {-1},
+      {uniname2ctype_offset(str660), 257},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str668), 69},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str672), 321},
+      {-1}, {-1},
+      {uniname2ctype_offset(str675), 68},
+      {-1}, {-1},
+      {uniname2ctype_offset(str678), 171},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str695), 530},
+      {uniname2ctype_offset(str696), 175},
+      {uniname2ctype_offset(str697), 384},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str703), 508},
+      {-1},
+      {uniname2ctype_offset(str705), 332},
+      {-1},
+      {uniname2ctype_offset(str707), 158},
+      {uniname2ctype_offset(str708), 556},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str713), 361},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str720), 72},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str737), 7},
+      {uniname2ctype_offset(str738), 358},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str742), 6},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str753), 229},
+      {-1},
+      {uniname2ctype_offset(str755), 497},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str760), 416},
+      {uniname2ctype_offset(str761), 167},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str766), 156},
+      {uniname2ctype_offset(str767), 572},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str771), 167},
+      {uniname2ctype_offset(str772), 256},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str776), 257},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str783), 156},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str787), 245},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str791), 193},
+      {-1}, {-1},
+      {uniname2ctype_offset(str794), 558},
+      {-1}, {-1},
+      {uniname2ctype_offset(str797), 50},
+      {-1},
+      {uniname2ctype_offset(str799), 579},
+      {-1}, {-1},
+      {uniname2ctype_offset(str802), 13},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str809), 431},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str814), 478},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str818), 383},
+      {-1}, {-1},
+      {uniname2ctype_offset(str821), 467},
+      {uniname2ctype_offset(str822), 563},
+      {uniname2ctype_offset(str823), 47},
+      {uniname2ctype_offset(str824), 112},
+      {uniname2ctype_offset(str825), 429},
+      {-1}, {-1},
+      {uniname2ctype_offset(str828), 564},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str834), 258},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str838), 157},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str842), 58},
+      {-1}, {-1},
+      {uniname2ctype_offset(str845), 66},
+      {-1},
+      {uniname2ctype_offset(str847), 48},
+      {uniname2ctype_offset(str848), 178},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str855), 67},
+      {-1},
+      {uniname2ctype_offset(str857), 305},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str862), 88},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str875), 354},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str886), 389},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str895), 397},
+      {-1}, {-1},
+      {uniname2ctype_offset(str898), 485},
+      {-1},
+      {uniname2ctype_offset(str900), 583},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str906), 504},
+      {uniname2ctype_offset(str907), 434},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str924), 68},
+      {-1},
+      {uniname2ctype_offset(str926), 329},
+      {-1},
+      {uniname2ctype_offset(str928), 519},
+      {uniname2ctype_offset(str929), 446},
+      {uniname2ctype_offset(str930), 41},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str946), 136},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str961), 2},
+      {-1},
+      {uniname2ctype_offset(str963), 246},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str974), 493},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {uniname2ctype_offset(str986), 355},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str994), 85},
+      {uniname2ctype_offset(str995), 104},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1005), 53},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1009), 404},
+      {uniname2ctype_offset(str1010), 26},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1013), 480},
+      {uniname2ctype_offset(str1014), 566},
+      {uniname2ctype_offset(str1015), 469},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1021), 67},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1025), 444},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1028), 136},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1032), 239},
+      {uniname2ctype_offset(str1033), 71},
+      {-1},
+      {uniname2ctype_offset(str1035), 308},
+      {uniname2ctype_offset(str1036), 543},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1049), 173},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1067), 102},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1070), 115},
+      {-1},
+      {uniname2ctype_offset(str1072), 197},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1080), 210},
+      {uniname2ctype_offset(str1081), 399},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1085), 248},
+      {-1},
+      {uniname2ctype_offset(str1087), 567},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1090), 69},
+      {uniname2ctype_offset(str1091), 11},
+      {-1},
+      {uniname2ctype_offset(str1093), 125},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1097), 520},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1102), 506},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1105), 217},
+      {-1},
+      {uniname2ctype_offset(str1107), 521},
+      {-1},
+      {uniname2ctype_offset(str1109), 228},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1119), 106},
+      {uniname2ctype_offset(str1120), 60},
+      {uniname2ctype_offset(str1121), 365},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1134), 410},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1140), 93},
+      {-1},
+      {uniname2ctype_offset(str1142), 206},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1146), 131},
+      {uniname2ctype_offset(str1147), 255},
+      {-1},
+      {uniname2ctype_offset(str1149), 158},
+      {uniname2ctype_offset(str1150), 98},
+      {uniname2ctype_offset(str1151), 483},
+      {uniname2ctype_offset(str1152), 217},
+      {uniname2ctype_offset(str1153), 138},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1157), 203},
+      {uniname2ctype_offset(str1158), 166},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1164), 229},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1168), 104},
+      {-1},
+      {uniname2ctype_offset(str1170), 374},
+      {uniname2ctype_offset(str1171), 515},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1174), 312},
+      {uniname2ctype_offset(str1175), 26},
+      {uniname2ctype_offset(str1176), 208},
+      {uniname2ctype_offset(str1177), 74},
+      {uniname2ctype_offset(str1178), 338},
+      {-1},
+      {uniname2ctype_offset(str1180), 183},
+      {uniname2ctype_offset(str1181), 151},
+      {uniname2ctype_offset(str1182), 344},
+      {uniname2ctype_offset(str1183), 101},
+      {-1},
+      {uniname2ctype_offset(str1185), 170},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1190), 261},
+      {uniname2ctype_offset(str1191), 524},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1197), 101},
+      {uniname2ctype_offset(str1198), 135},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1203), 351},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1207), 447},
+      {uniname2ctype_offset(str1208), 239},
+      {uniname2ctype_offset(str1209), 186},
+      {uniname2ctype_offset(str1210), 137},
+      {-1},
+      {uniname2ctype_offset(str1212), 364},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1227), 232},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1231), 206},
+      {uniname2ctype_offset(str1232), 340},
+      {uniname2ctype_offset(str1233), 73},
+#ifndef USE_UNICODE_AGE_PROPERTIES
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#else /* USE_UNICODE_AGE_PROPERTIES */
+      {uniname2ctype_offset(str1234), 287},
+      {uniname2ctype_offset(str1235), 289},
+      {uniname2ctype_offset(str1236), 286},
+      {uniname2ctype_offset(str1237), 288},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+      {uniname2ctype_offset(str1243), 25},
+      {uniname2ctype_offset(str1244), 326},
+      {uniname2ctype_offset(str1245), 249},
+      {uniname2ctype_offset(str1246), 420},
+#ifndef USE_UNICODE_AGE_PROPERTIES
+      {-1},
+#else /* USE_UNICODE_AGE_PROPERTIES */
+      {uniname2ctype_offset(str1247), 268},
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+      {uniname2ctype_offset(str1248), 30},
+#ifndef USE_UNICODE_AGE_PROPERTIES
+      {-1}, {-1}, {-1}, {-1}, {-1},
+#else /* USE_UNICODE_AGE_PROPERTIES */
+      {uniname2ctype_offset(str1249), 275},
+      {uniname2ctype_offset(str1250), 270},
+      {uniname2ctype_offset(str1251), 274},
+      {uniname2ctype_offset(str1252), 269},
+      {uniname2ctype_offset(str1253), 285},
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+      {uniname2ctype_offset(str1254), 540},
+#ifndef USE_UNICODE_AGE_PROPERTIES
+      {-1},
+#else /* USE_UNICODE_AGE_PROPERTIES */
+      {uniname2ctype_offset(str1255), 280},
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+      {uniname2ctype_offset(str1256), 267},
+#ifndef USE_UNICODE_AGE_PROPERTIES
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#else /* USE_UNICODE_AGE_PROPERTIES */
+      {uniname2ctype_offset(str1257), 279},
+      {uniname2ctype_offset(str1258), 281},
+      {uniname2ctype_offset(str1259), 272},
+      {uniname2ctype_offset(str1260), 284},
+      {uniname2ctype_offset(str1261), 271},
+      {uniname2ctype_offset(str1262), 273},
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+      {uniname2ctype_offset(str1263), 64},
+#ifndef USE_UNICODE_AGE_PROPERTIES
+      {-1}, {-1},
+#else /* USE_UNICODE_AGE_PROPERTIES */
+      {uniname2ctype_offset(str1264), 283},
+      {-1},
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+      {uniname2ctype_offset(str1266), 21},
+#ifndef USE_UNICODE_AGE_PROPERTIES
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#else /* USE_UNICODE_AGE_PROPERTIES */
+      {uniname2ctype_offset(str1267), 282},
+      {uniname2ctype_offset(str1268), 277},
+      {-1},
+      {uniname2ctype_offset(str1270), 276},
+      {uniname2ctype_offset(str1271), 278},
+      {-1}, {-1},
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+      {uniname2ctype_offset(str1274), 200},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1282), 596},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1285), 105},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1289), 333},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1292), 382},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1297), 145},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1300), 86},
+      {uniname2ctype_offset(str1301), 141},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1306), 15},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1314), 193},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1317), 86},
+      {-1},
+      {uniname2ctype_offset(str1319), 256},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1331), 252},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1340), 105},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1343), 120},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str1354), 164},
+      {uniname2ctype_offset(str1355), 254},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1358), 594},
+      {-1},
+      {uniname2ctype_offset(str1360), 3},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1365), 372},
+      {uniname2ctype_offset(str1366), 36},
+      {uniname2ctype_offset(str1367), 513},
+      {-1},
+      {uniname2ctype_offset(str1369), 247},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1373), 263},
+      {-1},
+      {uniname2ctype_offset(str1375), 135},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1380), 35},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1384), 56},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1387), 113},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1400), 201},
+      {uniname2ctype_offset(str1401), 385},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1407), 224},
+      {-1},
+      {uniname2ctype_offset(str1409), 38},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1419), 140},
+      {uniname2ctype_offset(str1420), 140},
+      {-1},
+      {uniname2ctype_offset(str1422), 310},
+      {uniname2ctype_offset(str1423), 143},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1426), 39},
+      {-1},
+      {uniname2ctype_offset(str1428), 181},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1434), 143},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1438), 422},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1441), 215},
+      {uniname2ctype_offset(str1442), 523},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1445), 253},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1448), 491},
+      {uniname2ctype_offset(str1449), 122},
+      {uniname2ctype_offset(str1450), 134},
+      {uniname2ctype_offset(str1451), 203},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1454), 145},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1457), 166},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1462), 535},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1466), 241},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1470), 490},
+      {uniname2ctype_offset(str1471), 492},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1475), 414},
+      {uniname2ctype_offset(str1476), 494},
+      {-1},
+      {uniname2ctype_offset(str1478), 436},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1481), 138},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1485), 328},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1489), 33},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1495), 251},
+      {-1},
+      {uniname2ctype_offset(str1497), 484},
+      {uniname2ctype_offset(str1498), 199},
+      {uniname2ctype_offset(str1499), 582},
+      {-1},
+      {uniname2ctype_offset(str1501), 196},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1507), 122},
+      {-1},
+      {uniname2ctype_offset(str1509), 110},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1512), 110},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1517), 581},
+      {-1},
+      {uniname2ctype_offset(str1519), 219},
+      {uniname2ctype_offset(str1520), 228},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1523), 117},
+      {uniname2ctype_offset(str1524), 471},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1529), 120},
+      {-1},
+      {uniname2ctype_offset(str1531), 407},
+      {-1},
+      {uniname2ctype_offset(str1533), 142},
+      {-1},
+      {uniname2ctype_offset(str1535), 219},
+      {uniname2ctype_offset(str1536), 127},
+      {uniname2ctype_offset(str1537), 260},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1542), 453},
+      {-1},
+      {uniname2ctype_offset(str1544), 561},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1547), 168},
+      {uniname2ctype_offset(str1548), 518},
+      {uniname2ctype_offset(str1549), 505},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1552), 117},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1555), 107},
+      {-1},
+      {uniname2ctype_offset(str1557), 85},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1563), 264},
+      {-1},
+      {uniname2ctype_offset(str1565), 315},
+      {-1},
+      {uniname2ctype_offset(str1567), 148},
+      {-1},
+      {uniname2ctype_offset(str1569), 236},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1572), 115},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1580), 131},
+      {-1},
+      {uniname2ctype_offset(str1582), 148},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1587), 529},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1594), 114},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1597), 81},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1602), 97},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1607), 97},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1613), 164},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1617), 488},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1622), 373},
+      {uniname2ctype_offset(str1623), 546},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1629), 39},
+      {-1},
+      {uniname2ctype_offset(str1631), 176},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1635), 72},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1638), 426},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1643), 62},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str1654), 388},
+      {uniname2ctype_offset(str1655), 265},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1662), 129},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1671), 114},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1675), 457},
+      {uniname2ctype_offset(str1676), 176},
+      {uniname2ctype_offset(str1677), 303},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1682), 595},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1686), 93},
+      {uniname2ctype_offset(str1687), 141},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1691), 124},
+      {uniname2ctype_offset(str1692), 121},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1699), 367},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1702), 510},
+      {uniname2ctype_offset(str1703), 533},
+      {uniname2ctype_offset(str1704), 207},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1714), 207},
+      {-1},
+      {uniname2ctype_offset(str1716), 419},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1722), 347},
+      {-1},
+      {uniname2ctype_offset(str1724), 554},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1728), 221},
+      {uniname2ctype_offset(str1729), 430},
+      {uniname2ctype_offset(str1730), 222},
+      {uniname2ctype_offset(str1731), 517},
+      {uniname2ctype_offset(str1732), 238},
+      {uniname2ctype_offset(str1733), 123},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1740), 129},
+      {-1},
+      {uniname2ctype_offset(str1742), 161},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1745), 509},
+      {uniname2ctype_offset(str1746), 390},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1750), 20},
+      {-1},
+      {uniname2ctype_offset(str1752), 502},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1757), 501},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1766), 73},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1769), 362},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1776), 126},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1780), 65},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1788), 137},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1791), 233},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1806), 336},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1810), 599},
+      {uniname2ctype_offset(str1811), 236},
+      {-1},
+      {uniname2ctype_offset(str1813), 255},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1816), 565},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1821), 224},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1825), 258},
+      {uniname2ctype_offset(str1826), 202},
+      {-1},
+      {uniname2ctype_offset(str1828), 387},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1838), 585},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1842), 379},
+      {uniname2ctype_offset(str1843), 134},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1846), 481},
+      {-1},
+      {uniname2ctype_offset(str1848), 109},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1861), 202},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1866), 61},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1871), 479},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1878), 27},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1881), 63},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1891), 150},
+      {uniname2ctype_offset(str1892), 562},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1896), 588},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1904), 440},
+      {uniname2ctype_offset(str1905), 559},
+      {uniname2ctype_offset(str1906), 150},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1911), 343},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1915), 165},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1928), 424},
+      {uniname2ctype_offset(str1929), 417},
+      {uniname2ctype_offset(str1930), 445},
+      {-1},
+      {uniname2ctype_offset(str1932), 400},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1936), 323},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str1947), 194},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1950), 409},
+      {uniname2ctype_offset(str1951), 12},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1958), 109},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1961), 103},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1964), 425},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1967), 477},
+      {uniname2ctype_offset(str1968), 603},
+      {-1}, {-1},
+      {uniname2ctype_offset(str1971), 153},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1985), 393},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str1991), 1},
+      {-1},
+      {uniname2ctype_offset(str1993), 360},
+      {uniname2ctype_offset(str1994), 175},
+      {-1},
+      {uniname2ctype_offset(str1996), 42},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2006), 395},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2010), 363},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2014), 322},
+      {-1},
+      {uniname2ctype_offset(str2016), 209},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2023), 32},
+      {uniname2ctype_offset(str2024), 489},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2033), 78},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2043), 17},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2048), 92},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2055), 92},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2058), 240},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2062), 130},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2070), 9},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2073), 330},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2078), 245},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2083), 324},
+      {uniname2ctype_offset(str2084), 154},
+      {uniname2ctype_offset(str2085), 20},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2093), 192},
+      {-1},
+      {uniname2ctype_offset(str2095), 341},
+      {-1},
+      {uniname2ctype_offset(str2097), 214},
+      {uniname2ctype_offset(str2098), 8},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2102), 43},
+      {uniname2ctype_offset(str2103), 162},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2109), 215},
+      {uniname2ctype_offset(str2110), 123},
+      {-1},
+      {uniname2ctype_offset(str2112), 210},
+      {-1},
+      {uniname2ctype_offset(str2114), 159},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2117), 174},
+      {-1},
+      {uniname2ctype_offset(str2119), 216},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2135), 128},
+      {-1},
+      {uniname2ctype_offset(str2137), 172},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2145), 52},
+      {uniname2ctype_offset(str2146), 401},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2149), 221},
+      {uniname2ctype_offset(str2150), 121},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2153), 352},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2161), 233},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2165), 174},
+      {uniname2ctype_offset(str2166), 5},
+      {uniname2ctype_offset(str2167), 112},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2170), 216},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2173), 87},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2181), 139},
+      {uniname2ctype_offset(str2182), 87},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2195), 339},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2199), 159},
+      {-1},
+      {uniname2ctype_offset(str2201), 89},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2204), 369},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2207), 196},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2217), 128},
+      {uniname2ctype_offset(str2218), 526},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2222), 458},
+      {-1},
+      {uniname2ctype_offset(str2224), 438},
+      {uniname2ctype_offset(str2225), 459},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2228), 82},
+      {uniname2ctype_offset(str2229), 35},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2235), 474},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2238), 154},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2244), 428},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2247), 36},
+      {uniname2ctype_offset(str2248), 569},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2252), 240},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2258), 443},
+      {-1},
+      {uniname2ctype_offset(str2260), 235},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2268), 597},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2271), 18},
+      {uniname2ctype_offset(str2272), 254},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2278), 124},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2282), 230},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2285), 38},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2294), 88},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2302), 368},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2305), 205},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2312), 177},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2315), 568},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2321), 370},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2339), 600},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2343), 560},
+      {uniname2ctype_offset(str2344), 82},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2357), 237},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2361), 571},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2364), 309},
+      {uniname2ctype_offset(str2365), 403},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2373), 37},
+      {uniname2ctype_offset(str2374), 377},
+      {uniname2ctype_offset(str2375), 197},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2378), 237},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str2389), 204},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2396), 376},
+      {uniname2ctype_offset(str2397), 406},
+      {uniname2ctype_offset(str2398), 398},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2415), 402},
+      {uniname2ctype_offset(str2416), 366},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str2427), 23},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2433), 427},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2440), 100},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str2451), 29},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2454), 220},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2458), 495},
+      {-1},
+      {uniname2ctype_offset(str2460), 246},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2470), 433},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2475), 142},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2479), 346},
+      {uniname2ctype_offset(str2480), 50},
+      {uniname2ctype_offset(str2481), 371},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2506), 511},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2513), 592},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2519), 466},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2529), 165},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2534), 325},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2540), 226},
+      {-1},
+      {uniname2ctype_offset(str2542), 125},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2548), 118},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2552), 462},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2561), 435},
+      {uniname2ctype_offset(str2562), 251},
+      {-1},
+      {uniname2ctype_offset(str2564), 357},
+      {-1},
+      {uniname2ctype_offset(str2566), 185},
+      {uniname2ctype_offset(str2567), 304},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2570), 476},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2575), 185},
+      {uniname2ctype_offset(str2576), 99},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2579), 133},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2586), 199},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2595), 327},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2603), 198},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2606), 359},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2609), 55},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2614), 538},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2624), 226},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2631), 107},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2634), 266},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2643), 437},
+      {uniname2ctype_offset(str2644), 576},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2648), 243},
+      {-1},
+      {uniname2ctype_offset(str2650), 78},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2653), 183},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2656), 353},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2663), 182},
+      {-1},
+      {uniname2ctype_offset(str2665), 83},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2668), 94},
+      {-1},
+      {uniname2ctype_offset(str2670), 593},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2673), 84},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2676), 83},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2688), 139},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2691), 84},
+      {uniname2ctype_offset(str2692), 211},
+      {-1},
+      {uniname2ctype_offset(str2694), 48},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2698), 119},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2701), 418},
+      {uniname2ctype_offset(str2702), 89},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2721), 198},
+      {-1},
+      {uniname2ctype_offset(str2723), 4},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2732), 130},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2747), 54},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2750), 534},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2760), 152},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2764), 241},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2768), 90},
+      {uniname2ctype_offset(str2769), 468},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2777), 28},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2780), 227},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2793), 34},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2816), 296},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2821), 378},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2834), 349},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2841), 222},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2848), 253},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2852), 291},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2855), 190},
+      {uniname2ctype_offset(str2856), 66},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2859), 412},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2862), 211},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2867), 295},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2871), 243},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2883), 242},
+      {-1},
+      {uniname2ctype_offset(str2885), 147},
+      {uniname2ctype_offset(str2886), 133},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2904), 449},
+      {uniname2ctype_offset(str2905), 262},
+      {uniname2ctype_offset(str2906), 575},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2909), 549},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2912), 244},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2926), 51},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2938), 242},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2941), 348},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2963), 225},
+      {uniname2ctype_offset(str2964), 503},
+      {-1}, {-1},
+      {uniname2ctype_offset(str2967), 43},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2980), 195},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2984), 547},
+      {-1},
+      {uniname2ctype_offset(str2986), 118},
+      {uniname2ctype_offset(str2987), 54},
+      {uniname2ctype_offset(str2988), 456},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str2993), 234},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3000), 16},
+      {uniname2ctype_offset(str3001), 180},
+      {uniname2ctype_offset(str3002), 64},
+      {-1}, {-1},
+      {uniname2ctype_offset(str3005), 460},
+      {uniname2ctype_offset(str3006), 555},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3012), 80},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3028), 250},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3045), 577},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3055), 454},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3089), 146},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3098), 580},
+      {uniname2ctype_offset(str3099), 463},
+      {uniname2ctype_offset(str3100), 103},
+      {uniname2ctype_offset(str3101), 223},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3107), 299},
+      {-1},
+      {uniname2ctype_offset(str3109), 301},
+      {-1},
+      {uniname2ctype_offset(str3111), 191},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3125), 191},
+      {uniname2ctype_offset(str3126), 99},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3134), 223},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3158), 314},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3165), 439},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3169), 47},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3176), 381},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3180), 317},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3185), 126},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3194), 204},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str3205), 227},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3209), 62},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3215), 180},
+      {-1}, {-1},
+      {uniname2ctype_offset(str3218), 201},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3237), 375},
+      {-1},
+      {uniname2ctype_offset(str3239), 294},
+      {uniname2ctype_offset(str3240), 290},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3248), 213},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3254), 190},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {uniname2ctype_offset(str3266), 421},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str3286), 235},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str3297), 297},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3303), 293},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3309), 178},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3317), 249},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str3328), 63},
+      {uniname2ctype_offset(str3329), 587},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3348), 392},
+      {uniname2ctype_offset(str3349), 423},
+      {-1},
+      {uniname2ctype_offset(str3351), 96},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3360), 234},
+      {-1}, {-1},
+      {uniname2ctype_offset(str3363), 96},
+      {-1},
+      {uniname2ctype_offset(str3365), 578},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3433), 205},
+      {-1}, {-1},
+      {uniname2ctype_offset(str3436), 213},
+      {-1}, {-1},
+      {uniname2ctype_offset(str3439), 49},
+      {-1}, {-1},
+      {uniname2ctype_offset(str3442), 464},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3458), 10},
+      {-1},
+      {uniname2ctype_offset(str3460), 589},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3511), 396},
+      {uniname2ctype_offset(str3512), 487},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3517), 179},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3531), 153},
+      {uniname2ctype_offset(str3532), 550},
+      {uniname2ctype_offset(str3533), 57},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3550), 41},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3558), 59},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3613), 214},
+      {uniname2ctype_offset(str3614), 220},
+      {-1},
+      {uniname2ctype_offset(str3616), 45},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {uniname2ctype_offset(str3628), 71},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str3648), 450},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3664), 177},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {uniname2ctype_offset(str3703), 132},
+      {-1},
+      {uniname2ctype_offset(str3705), 306},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3714), 132},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3766), 452},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3791), 65},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3805), 250},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3819), 162},
+      {-1},
+      {uniname2ctype_offset(str3821), 292},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {uniname2ctype_offset(str3842), 182},
+      {-1}, {-1},
+      {uniname2ctype_offset(str3845), 248},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3891), 30},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3924), 405},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3942), 100},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3976), 570},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str3995), 147},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str4087), 415},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4109), 119},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4137), 244},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4162), 544},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4175), 545},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4203), 80},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4254), 116},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4276), 116},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4291), 302},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {uniname2ctype_offset(str4321), 75},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {uniname2ctype_offset(str4360), 231},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4397), 386},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4405), 298},
+      {uniname2ctype_offset(str4406), 300},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4460), 90},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4485), 179},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4528), 46},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str4674), 601},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4683), 451},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4772), 394},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4948), 590},
+#endif /* USE_UNICODE_PROPERTIES */
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#ifndef USE_UNICODE_PROPERTIES
+      {uniname2ctype_offset(str6), 12},
+      {uniname2ctype_offset(str7), 7},
+      {uniname2ctype_offset(str8), 15},
+      {uniname2ctype_offset(str9), 1},
+      {uniname2ctype_offset(str10), 13},
+      {uniname2ctype_offset(str11), 11},
+      {uniname2ctype_offset(str12), 10},
+      {uniname2ctype_offset(str13), 14},
+      {uniname2ctype_offset(str14), 3},
+      {uniname2ctype_offset(str15), 9},
+      {uniname2ctype_offset(str16), 8},
+      {uniname2ctype_offset(str17), 6},
+      {uniname2ctype_offset(str18), 5},
+      {uniname2ctype_offset(str19), 4},
+      {uniname2ctype_offset(str20), 2}
+#else /* USE_UNICODE_PROPERTIES */
+      {uniname2ctype_offset(str4955), 155},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str4986), 413},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {uniname2ctype_offset(str5114), 225},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str5608), 155},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {uniname2ctype_offset(str6098), 602}
+#endif /* USE_UNICODE_PROPERTIES */
+    };
+
+  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
+    {
+      register unsigned int key = uniname2ctype_hash (str, len);
+
+      if (key <= MAX_HASH_VALUE)
+        {
+          register int o = wordlist[key].name;
+          if (o >= 0)
+            {
+              register const char *s = o + uniname2ctype_pool;
+
+              if (*str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0')
+                return &wordlist[key];
+            }
+        }
+    }
+  return 0;
+}
+
+static int
+uniname2ctype(const UChar *name, unsigned int len)
+{
+  const struct uniname2ctype_struct *p = uniname2ctype_p((const char *)name, len);
+  if (p) return p->ctype;
+  return -1;
+}
+#if defined ONIG_UNICODE_VERSION_STRING && !( \
+      ONIG_UNICODE_VERSION_MAJOR == 12 && \
+      ONIG_UNICODE_VERSION_MINOR == 1 && \
+      ONIG_UNICODE_VERSION_TEENY == 0 && \
+      1)
+# error ONIG_UNICODE_VERSION_STRING mismatch
+#endif
+#define ONIG_UNICODE_VERSION_STRING "12.1.0"
+#define ONIG_UNICODE_VERSION_MAJOR 12
+#define ONIG_UNICODE_VERSION_MINOR 1
+#define ONIG_UNICODE_VERSION_TEENY 0
+#if defined ONIG_UNICODE_EMOJI_VERSION_STRING && !( \
+      ONIG_UNICODE_EMOJI_VERSION_MAJOR == 12 && \
+      ONIG_UNICODE_EMOJI_VERSION_MINOR == 0 && \
+      1)
+# error ONIG_UNICODE_EMOJI_VERSION_STRING mismatch
+#endif
+#define ONIG_UNICODE_EMOJI_VERSION_STRING "12.0"
+#define ONIG_UNICODE_EMOJI_VERSION_MAJOR 12
+#define ONIG_UNICODE_EMOJI_VERSION_MINOR 0
diff --git a/enc/unicode/case-folding.rb b/enc/unicode/case-folding.rb
index 433ce74dfe..4a29fdebf7 100755..100644
--- a/enc/unicode/case-folding.rb
+++ b/enc/unicode/case-folding.rb
@@ -1,4 +1,5 @@
 #!/usr/bin/ruby
+require 'stringio'
 
 # Usage (for case folding only):
 #   $ wget http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
@@ -15,15 +16,20 @@ class CaseFolding
     module_function
 
     def hex_seq(v)
-      v.map {|i| "0x%04x" % i}.join(", ")
+      v.map { |i| "0x%04x" % i }.join(", ")
     end
 
     def print_table_1(dest, type, mapping_data, data)
       for k, v in data = data.sort
         sk = (Array === k and k.length > 1) ? "{#{hex_seq(k)}}" : ("0x%04x" % k)
-        ck = cv = ''
-        ck = ' /* ' + Array(k).pack("U*") + ' */' if @debug
-        cv = ' /* ' + Array(v).map{|c|[c].pack("U*")}.join(", ") + ' */' if @debug
+        if type=='CaseUnfold_11' and v.length>1
+          # reorder CaseUnfold_11 entries to avoid special treatment for U+03B9/U+03BC/U+A64B
+          item = mapping_data.map("%04X" % k[0])
+          upper = item.upper if item
+          v = v.sort_by { |i| ("%04X"%i) == upper ? 0 : 1 }
+        end
+        ck = @debug ? ' /* ' + Array(k).pack("U*") + ' */' : ''
+        cv = @debug ? ' /* ' + Array(v).map{|c|[c].pack("U*")}.join(", ") + ' */' : ''
         dest.print("  {#{sk}#{ck}, {#{v.length}#{mapping_data.flags(k, type, v)}, {#{hex_seq(v)}#{cv}}}},\n")
       end
       data
@@ -44,7 +50,7 @@ class CaseFolding
 
   include Util
 
-  attr_reader :fold, :fold_locale, :unfold, :unfold_locale
+  attr_reader :fold, :fold_locale, :unfold, :unfold_locale, :version
 
   def load(filename)
     pattern = /([0-9A-F]{4,6}); ([CFT]); ([0-9A-F]{4,6})(?: ([0-9A-F]{4,6}))?(?: ([0-9A-F]{4,6}))?;/
@@ -52,9 +58,11 @@ class CaseFolding
     @fold = fold = {}
     @unfold = unfold = [{}, {}, {}]
     @debug = false
+    @version = nil
     turkic = []
 
-    IO.foreach(filename) do |line|
+    IO.foreach(filename, mode: "rb") do |line|
+      @version ||= line[/-([0-9.]+).txt/, 1]
       next unless res = pattern.match(line)
       ch_from = res[1].to_i(16)
 
@@ -96,7 +104,7 @@ class CaseFolding
     hash = "onigenc_unicode_#{key}_hash"
     lookup = "onigenc_unicode_#{key}_lookup"
     arity = Array(data[0][0]).size
-    gperf = %W"gperf -7 -k#{[*1..(arity*3)].join(",")} -F,-1 -c -j1 -i1 -t -T -E -C -H #{hash} -N #{lookup} -n"
+    gperf = %W"gperf -7 -k#{[*1..(arity*3)].join(',')} -F,-1 -c -j1 -i1 -t -T -E -C -H #{hash} -N #{lookup} -n"
     argname = arity > 1 ? "codes" : "code"
     argdecl = "const OnigCodePoint #{arity > 1 ? "*": ""}#{argname}"
     n = 7
@@ -152,6 +160,20 @@ class CaseFolding
     dest.print("/* DO NOT EDIT THIS FILE. */\n")
     dest.print("/* Generated by enc/unicode/case-folding.rb */\n\n")
 
+    versions = version.scan(/\d+/)
+    dest.print("#if defined ONIG_UNICODE_VERSION_STRING && !( \\\n")
+    %w[MAJOR MINOR TEENY].zip(versions) do |n, v|
+      dest.print("      ONIG_UNICODE_VERSION_#{n} == #{v} && \\\n")
+    end
+    dest.print("      1)\n")
+    dest.print("# error ONIG_UNICODE_VERSION_STRING mismatch\n")
+    dest.print("#endif\n")
+    dest.print("#define ONIG_UNICODE_VERSION_STRING #{version.dump}\n")
+    %w[MAJOR MINOR TEENY].zip(versions) do |n, v|
+      dest.print("#define ONIG_UNICODE_VERSION_#{n} #{v}\n")
+    end
+    dest.print("\n")
+
     # print folding data
 
     # CaseFold + CaseFold_Locale
@@ -201,19 +223,24 @@ class MapItem
 end
 
 class CaseMapping
-  def initialize (mapping_directory)
+  attr_reader :filename, :version
+
+  def initialize(mapping_directory)
     @mappings = {}
     @specials = []
     @specials_length = 0
-    IO.readlines(File.expand_path('UnicodeData.txt', mapping_directory), encoding: Encoding::ASCII_8BIT).each do |line|
+    @version = nil
+    IO.foreach(File.join(mapping_directory, 'UnicodeData.txt'), mode: "rb") do |line|
       next if line =~ /^</
-      code, _1,_2,_3,_4,_5,_6,_7,_8,_9,_10,_11, upper, lower, title = line.chomp.split ';'
+      code, _, _, _, _, _, _, _, _, _, _, _, upper, lower, title = line.chomp.split ';'
       unless upper and lower and title and (upper+lower+title)==''
         @mappings[code] = MapItem.new(code, upper, lower, title)
       end
     end
 
-    IO.readlines(File.expand_path('SpecialCasing.txt', mapping_directory), encoding: Encoding::ASCII_8BIT).each do |line|
+    @filename = File.join(mapping_directory, 'SpecialCasing.txt')
+    IO.foreach(@filename, mode: "rb") do |line|
+      @version ||= line[/-([0-9.]+).txt/, 1]
       line.chomp!
       line, comment = line.split(/ *#/)
       next if not line or line == ''
@@ -227,13 +254,16 @@ class CaseMapping
     end
   end
 
+  def map (from)
+    @mappings[from]
+  end
+
   def flags(from, type, to)
     # types: CaseFold_11, CaseUnfold_11, CaseUnfold_12, CaseUnfold_13
     flags = ""
     from = Array(from).map {|i| "%04X" % i}.join(" ")
     to   = Array(to).map {|i| "%04X" % i}.join(" ")
-    item = @mappings[from]
-    specials_index = nil
+    item = map(from)
     specials = []
     case type
     when 'CaseFold_11'
@@ -274,17 +304,15 @@ class CaseMapping
         when item.upper  then  flags += '|U'
         when item.lower  then  flags += '|D'
         else
-          unless from=='03B9' or from=='03BC'
-            warn 'Unpredicted case 0; check data or adjust program (enc/unicode/case_folding.rb).'
-          end
+          raise "Unpredicted case 0 in enc/unicode/case_folding.rb. Please contact https://bugs.ruby-lang.org/."
         end
         unless item.upper == item.title
           if item.code == item.title
-            warn 'Unpredicted case 1; check data or adjust program (enc/unicode/case_folding.rb).'
+            flags += '|IT'   # was unpredicted case 1
           elsif item.title==to[1]
             flags += '|ST'
           else
-            warn 'Unpredicted case 2; check data or adjust program (enc/unicode/case_folding.rb).'
+            raise "Unpredicted case 2 in enc/unicode/case_folding.rb. Please contact https://bugs.ruby-lang.org/."
           end
         end
       end
@@ -302,7 +330,7 @@ class CaseMapping
   end
 
   def specials_output
-    "OnigCodePoint CaseMappingSpecials[] = {\n" +
+    "static const OnigCodePoint CaseMappingSpecials[] = {\n" +
     @specials.map do |sps|
       '   ' + sps.map do |sp|
         chars = sp.split(/ /)
@@ -352,22 +380,39 @@ if $0 == __FILE__
       warn "Either specify directory or individual file, but not both."
       exit
     end
-    filename = File.expand_path('CaseFolding.txt', mapping_directory)
+    filename = File.join(mapping_directory, 'CaseFolding.txt')
     mapping_data = CaseMapping.load(mapping_directory)
   end
   filename ||= ARGV[0] || 'CaseFolding.txt'
+  data = CaseFolding.load(filename)
+  if mapping_data and data.version != mapping_data.version
+    abort "Unicode data version mismatch\n" \
+          "  #{filename} = #{data.version}\n" \
+          "  #{mapping_data.filename} = #{mapping_data.version}"
+  end
   mapping_data ||= CaseMappingDummy.new
 
-  data = CaseFolding.load(filename)
   if debug
     data.debug!
     mapping_data.debug!
   end
+  f = StringIO.new
+  begin
+    data.display(f, mapping_data)
+  rescue Errno::ENOENT => e
+    raise unless /gperf/ =~ e.message
+    warn e.message
+    abort unless dest
+    File.utime(nil, nil, dest) # assume existing file is OK
+    exit
+  else
+    s = f.string
+  end
   if dest
-    open(dest, "wb") do |f|
-      data.display(f, mapping_data)
+    open(dest, "wb") do |file|
+      file.print(s)
     end
   else
-    data.display(STDOUT, mapping_data)
+    STDOUT.print(s)
   end
 end
diff --git a/enc/unicode/casefold.h b/enc/unicode/casefold.h
deleted file mode 100644
index 9023e71684..0000000000
--- a/enc/unicode/casefold.h
+++ /dev/null
@@ -1,6374 +0,0 @@
-/* DO NOT EDIT THIS FILE. */
-/* Generated by enc/unicode/case-folding.rb */
-
-static const CaseFold_11_Type CaseFold_11_Table[] = {
-#define CaseFold (*(CaseFold_11_Type (*)[1319])(CaseFold_11_Table+0))
-  {0x0041, {1|F|D, {0x0061}}},
-  {0x0042, {1|F|D, {0x0062}}},
-  {0x0043, {1|F|D, {0x0063}}},
-  {0x0044, {1|F|D, {0x0064}}},
-  {0x0045, {1|F|D, {0x0065}}},
-  {0x0046, {1|F|D, {0x0066}}},
-  {0x0047, {1|F|D, {0x0067}}},
-  {0x0048, {1|F|D, {0x0068}}},
-  {0x004a, {1|F|D, {0x006a}}},
-  {0x004b, {1|F|D, {0x006b}}},
-  {0x004c, {1|F|D, {0x006c}}},
-  {0x004d, {1|F|D, {0x006d}}},
-  {0x004e, {1|F|D, {0x006e}}},
-  {0x004f, {1|F|D, {0x006f}}},
-  {0x0050, {1|F|D, {0x0070}}},
-  {0x0051, {1|F|D, {0x0071}}},
-  {0x0052, {1|F|D, {0x0072}}},
-  {0x0053, {1|F|D, {0x0073}}},
-  {0x0054, {1|F|D, {0x0074}}},
-  {0x0055, {1|F|D, {0x0075}}},
-  {0x0056, {1|F|D, {0x0076}}},
-  {0x0057, {1|F|D, {0x0077}}},
-  {0x0058, {1|F|D, {0x0078}}},
-  {0x0059, {1|F|D, {0x0079}}},
-  {0x005a, {1|F|D, {0x007a}}},
-  {0x00b5, {1|F|SU|I(0), {0x03bc}}},
-  {0x00c0, {1|F|D, {0x00e0}}},
-  {0x00c1, {1|F|D, {0x00e1}}},
-  {0x00c2, {1|F|D, {0x00e2}}},
-  {0x00c3, {1|F|D, {0x00e3}}},
-  {0x00c4, {1|F|D, {0x00e4}}},
-  {0x00c5, {1|F|D, {0x00e5}}},
-  {0x00c6, {1|F|D, {0x00e6}}},
-  {0x00c7, {1|F|D, {0x00e7}}},
-  {0x00c8, {1|F|D, {0x00e8}}},
-  {0x00c9, {1|F|D, {0x00e9}}},
-  {0x00ca, {1|F|D, {0x00ea}}},
-  {0x00cb, {1|F|D, {0x00eb}}},
-  {0x00cc, {1|F|D, {0x00ec}}},
-  {0x00cd, {1|F|D, {0x00ed}}},
-  {0x00ce, {1|F|D, {0x00ee}}},
-  {0x00cf, {1|F|D, {0x00ef}}},
-  {0x00d0, {1|F|D, {0x00f0}}},
-  {0x00d1, {1|F|D, {0x00f1}}},
-  {0x00d2, {1|F|D, {0x00f2}}},
-  {0x00d3, {1|F|D, {0x00f3}}},
-  {0x00d4, {1|F|D, {0x00f4}}},
-  {0x00d5, {1|F|D, {0x00f5}}},
-  {0x00d6, {1|F|D, {0x00f6}}},
-  {0x00d8, {1|F|D, {0x00f8}}},
-  {0x00d9, {1|F|D, {0x00f9}}},
-  {0x00da, {1|F|D, {0x00fa}}},
-  {0x00db, {1|F|D, {0x00fb}}},
-  {0x00dc, {1|F|D, {0x00fc}}},
-  {0x00dd, {1|F|D, {0x00fd}}},
-  {0x00de, {1|F|D, {0x00fe}}},
-  {0x00df, {2|F|ST|SU|I(1), {0x0073, 0x0073}}},
-  {0x0100, {1|F|D, {0x0101}}},
-  {0x0102, {1|F|D, {0x0103}}},
-  {0x0104, {1|F|D, {0x0105}}},
-  {0x0106, {1|F|D, {0x0107}}},
-  {0x0108, {1|F|D, {0x0109}}},
-  {0x010a, {1|F|D, {0x010b}}},
-  {0x010c, {1|F|D, {0x010d}}},
-  {0x010e, {1|F|D, {0x010f}}},
-  {0x0110, {1|F|D, {0x0111}}},
-  {0x0112, {1|F|D, {0x0113}}},
-  {0x0114, {1|F|D, {0x0115}}},
-  {0x0116, {1|F|D, {0x0117}}},
-  {0x0118, {1|F|D, {0x0119}}},
-  {0x011a, {1|F|D, {0x011b}}},
-  {0x011c, {1|F|D, {0x011d}}},
-  {0x011e, {1|F|D, {0x011f}}},
-  {0x0120, {1|F|D, {0x0121}}},
-  {0x0122, {1|F|D, {0x0123}}},
-  {0x0124, {1|F|D, {0x0125}}},
-  {0x0126, {1|F|D, {0x0127}}},
-  {0x0128, {1|F|D, {0x0129}}},
-  {0x012a, {1|F|D, {0x012b}}},
-  {0x012c, {1|F|D, {0x012d}}},
-  {0x012e, {1|F|D, {0x012f}}},
-  {0x0132, {1|F|D, {0x0133}}},
-  {0x0134, {1|F|D, {0x0135}}},
-  {0x0136, {1|F|D, {0x0137}}},
-  {0x0139, {1|F|D, {0x013a}}},
-  {0x013b, {1|F|D, {0x013c}}},
-  {0x013d, {1|F|D, {0x013e}}},
-  {0x013f, {1|F|D, {0x0140}}},
-  {0x0141, {1|F|D, {0x0142}}},
-  {0x0143, {1|F|D, {0x0144}}},
-  {0x0145, {1|F|D, {0x0146}}},
-  {0x0147, {1|F|D, {0x0148}}},
-  {0x0149, {2|F|SU|I(5), {0x02bc, 0x006e}}},
-  {0x014a, {1|F|D, {0x014b}}},
-  {0x014c, {1|F|D, {0x014d}}},
-  {0x014e, {1|F|D, {0x014f}}},
-  {0x0150, {1|F|D, {0x0151}}},
-  {0x0152, {1|F|D, {0x0153}}},
-  {0x0154, {1|F|D, {0x0155}}},
-  {0x0156, {1|F|D, {0x0157}}},
-  {0x0158, {1|F|D, {0x0159}}},
-  {0x015a, {1|F|D, {0x015b}}},
-  {0x015c, {1|F|D, {0x015d}}},
-  {0x015e, {1|F|D, {0x015f}}},
-  {0x0160, {1|F|D, {0x0161}}},
-  {0x0162, {1|F|D, {0x0163}}},
-  {0x0164, {1|F|D, {0x0165}}},
-  {0x0166, {1|F|D, {0x0167}}},
-  {0x0168, {1|F|D, {0x0169}}},
-  {0x016a, {1|F|D, {0x016b}}},
-  {0x016c, {1|F|D, {0x016d}}},
-  {0x016e, {1|F|D, {0x016f}}},
-  {0x0170, {1|F|D, {0x0171}}},
-  {0x0172, {1|F|D, {0x0173}}},
-  {0x0174, {1|F|D, {0x0175}}},
-  {0x0176, {1|F|D, {0x0177}}},
-  {0x0178, {1|F|D, {0x00ff}}},
-  {0x0179, {1|F|D, {0x017a}}},
-  {0x017b, {1|F|D, {0x017c}}},
-  {0x017d, {1|F|D, {0x017e}}},
-  {0x017f, {1|F|SU|I(7), {0x0073}}},
-  {0x0181, {1|F|D, {0x0253}}},
-  {0x0182, {1|F|D, {0x0183}}},
-  {0x0184, {1|F|D, {0x0185}}},
-  {0x0186, {1|F|D, {0x0254}}},
-  {0x0187, {1|F|D, {0x0188}}},
-  {0x0189, {1|F|D, {0x0256}}},
-  {0x018a, {1|F|D, {0x0257}}},
-  {0x018b, {1|F|D, {0x018c}}},
-  {0x018e, {1|F|D, {0x01dd}}},
-  {0x018f, {1|F|D, {0x0259}}},
-  {0x0190, {1|F|D, {0x025b}}},
-  {0x0191, {1|F|D, {0x0192}}},
-  {0x0193, {1|F|D, {0x0260}}},
-  {0x0194, {1|F|D, {0x0263}}},
-  {0x0196, {1|F|D, {0x0269}}},
-  {0x0197, {1|F|D, {0x0268}}},
-  {0x0198, {1|F|D, {0x0199}}},
-  {0x019c, {1|F|D, {0x026f}}},
-  {0x019d, {1|F|D, {0x0272}}},
-  {0x019f, {1|F|D, {0x0275}}},
-  {0x01a0, {1|F|D, {0x01a1}}},
-  {0x01a2, {1|F|D, {0x01a3}}},
-  {0x01a4, {1|F|D, {0x01a5}}},
-  {0x01a6, {1|F|D, {0x0280}}},
-  {0x01a7, {1|F|D, {0x01a8}}},
-  {0x01a9, {1|F|D, {0x0283}}},
-  {0x01ac, {1|F|D, {0x01ad}}},
-  {0x01ae, {1|F|D, {0x0288}}},
-  {0x01af, {1|F|D, {0x01b0}}},
-  {0x01b1, {1|F|D, {0x028a}}},
-  {0x01b2, {1|F|D, {0x028b}}},
-  {0x01b3, {1|F|D, {0x01b4}}},
-  {0x01b5, {1|F|D, {0x01b6}}},
-  {0x01b7, {1|F|D, {0x0292}}},
-  {0x01b8, {1|F|D, {0x01b9}}},
-  {0x01bc, {1|F|D, {0x01bd}}},
-  {0x01c4, {1|F|D|ST|I(8), {0x01c6}}},
-  {0x01c5, {1|F|D|IT|SU|I(9), {0x01c6}}},
-  {0x01c7, {1|F|D|ST|I(12), {0x01c9}}},
-  {0x01c8, {1|F|D|IT|SU|I(13), {0x01c9}}},
-  {0x01ca, {1|F|D|ST|I(16), {0x01cc}}},
-  {0x01cb, {1|F|D|IT|SU|I(17), {0x01cc}}},
-  {0x01cd, {1|F|D, {0x01ce}}},
-  {0x01cf, {1|F|D, {0x01d0}}},
-  {0x01d1, {1|F|D, {0x01d2}}},
-  {0x01d3, {1|F|D, {0x01d4}}},
-  {0x01d5, {1|F|D, {0x01d6}}},
-  {0x01d7, {1|F|D, {0x01d8}}},
-  {0x01d9, {1|F|D, {0x01da}}},
-  {0x01db, {1|F|D, {0x01dc}}},
-  {0x01de, {1|F|D, {0x01df}}},
-  {0x01e0, {1|F|D, {0x01e1}}},
-  {0x01e2, {1|F|D, {0x01e3}}},
-  {0x01e4, {1|F|D, {0x01e5}}},
-  {0x01e6, {1|F|D, {0x01e7}}},
-  {0x01e8, {1|F|D, {0x01e9}}},
-  {0x01ea, {1|F|D, {0x01eb}}},
-  {0x01ec, {1|F|D, {0x01ed}}},
-  {0x01ee, {1|F|D, {0x01ef}}},
-  {0x01f0, {2|F|SU|I(20), {0x006a, 0x030c}}},
-  {0x01f1, {1|F|D|ST|I(22), {0x01f3}}},
-  {0x01f2, {1|F|D|IT|SU|I(23), {0x01f3}}},
-  {0x01f4, {1|F|D, {0x01f5}}},
-  {0x01f6, {1|F|D, {0x0195}}},
-  {0x01f7, {1|F|D, {0x01bf}}},
-  {0x01f8, {1|F|D, {0x01f9}}},
-  {0x01fa, {1|F|D, {0x01fb}}},
-  {0x01fc, {1|F|D, {0x01fd}}},
-  {0x01fe, {1|F|D, {0x01ff}}},
-  {0x0200, {1|F|D, {0x0201}}},
-  {0x0202, {1|F|D, {0x0203}}},
-  {0x0204, {1|F|D, {0x0205}}},
-  {0x0206, {1|F|D, {0x0207}}},
-  {0x0208, {1|F|D, {0x0209}}},
-  {0x020a, {1|F|D, {0x020b}}},
-  {0x020c, {1|F|D, {0x020d}}},
-  {0x020e, {1|F|D, {0x020f}}},
-  {0x0210, {1|F|D, {0x0211}}},
-  {0x0212, {1|F|D, {0x0213}}},
-  {0x0214, {1|F|D, {0x0215}}},
-  {0x0216, {1|F|D, {0x0217}}},
-  {0x0218, {1|F|D, {0x0219}}},
-  {0x021a, {1|F|D, {0x021b}}},
-  {0x021c, {1|F|D, {0x021d}}},
-  {0x021e, {1|F|D, {0x021f}}},
-  {0x0220, {1|F|D, {0x019e}}},
-  {0x0222, {1|F|D, {0x0223}}},
-  {0x0224, {1|F|D, {0x0225}}},
-  {0x0226, {1|F|D, {0x0227}}},
-  {0x0228, {1|F|D, {0x0229}}},
-  {0x022a, {1|F|D, {0x022b}}},
-  {0x022c, {1|F|D, {0x022d}}},
-  {0x022e, {1|F|D, {0x022f}}},
-  {0x0230, {1|F|D, {0x0231}}},
-  {0x0232, {1|F|D, {0x0233}}},
-  {0x023a, {1|F|D, {0x2c65}}},
-  {0x023b, {1|F|D, {0x023c}}},
-  {0x023d, {1|F|D, {0x019a}}},
-  {0x023e, {1|F|D, {0x2c66}}},
-  {0x0241, {1|F|D, {0x0242}}},
-  {0x0243, {1|F|D, {0x0180}}},
-  {0x0244, {1|F|D, {0x0289}}},
-  {0x0245, {1|F|D, {0x028c}}},
-  {0x0246, {1|F|D, {0x0247}}},
-  {0x0248, {1|F|D, {0x0249}}},
-  {0x024a, {1|F|D, {0x024b}}},
-  {0x024c, {1|F|D, {0x024d}}},
-  {0x024e, {1|F|D, {0x024f}}},
-  {0x0345, {1|F|SU|I(26), {0x03b9}}},
-  {0x0370, {1|F|D, {0x0371}}},
-  {0x0372, {1|F|D, {0x0373}}},
-  {0x0376, {1|F|D, {0x0377}}},
-  {0x037f, {1|F|D, {0x03f3}}},
-  {0x0386, {1|F|D, {0x03ac}}},
-  {0x0388, {1|F|D, {0x03ad}}},
-  {0x0389, {1|F|D, {0x03ae}}},
-  {0x038a, {1|F|D, {0x03af}}},
-  {0x038c, {1|F|D, {0x03cc}}},
-  {0x038e, {1|F|D, {0x03cd}}},
-  {0x038f, {1|F|D, {0x03ce}}},
-  {0x0390, {3|F|SU|I(27), {0x03b9, 0x0308, 0x0301}}},
-  {0x0391, {1|F|D, {0x03b1}}},
-  {0x0392, {1|F|D, {0x03b2}}},
-  {0x0393, {1|F|D, {0x03b3}}},
-  {0x0394, {1|F|D, {0x03b4}}},
-  {0x0395, {1|F|D, {0x03b5}}},
-  {0x0396, {1|F|D, {0x03b6}}},
-  {0x0397, {1|F|D, {0x03b7}}},
-  {0x0398, {1|F|D, {0x03b8}}},
-  {0x0399, {1|F|D, {0x03b9}}},
-  {0x039a, {1|F|D, {0x03ba}}},
-  {0x039b, {1|F|D, {0x03bb}}},
-  {0x039c, {1|F|D, {0x03bc}}},
-  {0x039d, {1|F|D, {0x03bd}}},
-  {0x039e, {1|F|D, {0x03be}}},
-  {0x039f, {1|F|D, {0x03bf}}},
-  {0x03a0, {1|F|D, {0x03c0}}},
-  {0x03a1, {1|F|D, {0x03c1}}},
-  {0x03a3, {1|F|D, {0x03c3}}},
-  {0x03a4, {1|F|D, {0x03c4}}},
-  {0x03a5, {1|F|D, {0x03c5}}},
-  {0x03a6, {1|F|D, {0x03c6}}},
-  {0x03a7, {1|F|D, {0x03c7}}},
-  {0x03a8, {1|F|D, {0x03c8}}},
-  {0x03a9, {1|F|D, {0x03c9}}},
-  {0x03aa, {1|F|D, {0x03ca}}},
-  {0x03ab, {1|F|D, {0x03cb}}},
-  {0x03b0, {3|F|SU|I(30), {0x03c5, 0x0308, 0x0301}}},
-  {0x03c2, {1|F|SU|I(33), {0x03c3}}},
-  {0x03cf, {1|F|D, {0x03d7}}},
-  {0x03d0, {1|F|SU|I(34), {0x03b2}}},
-  {0x03d1, {1|F|SU|I(35), {0x03b8}}},
-  {0x03d5, {1|F|SU|I(36), {0x03c6}}},
-  {0x03d6, {1|F|SU|I(37), {0x03c0}}},
-  {0x03d8, {1|F|D, {0x03d9}}},
-  {0x03da, {1|F|D, {0x03db}}},
-  {0x03dc, {1|F|D, {0x03dd}}},
-  {0x03de, {1|F|D, {0x03df}}},
-  {0x03e0, {1|F|D, {0x03e1}}},
-  {0x03e2, {1|F|D, {0x03e3}}},
-  {0x03e4, {1|F|D, {0x03e5}}},
-  {0x03e6, {1|F|D, {0x03e7}}},
-  {0x03e8, {1|F|D, {0x03e9}}},
-  {0x03ea, {1|F|D, {0x03eb}}},
-  {0x03ec, {1|F|D, {0x03ed}}},
-  {0x03ee, {1|F|D, {0x03ef}}},
-  {0x03f0, {1|F|SU|I(38), {0x03ba}}},
-  {0x03f1, {1|F|SU|I(39), {0x03c1}}},
-  {0x03f4, {1|F|D, {0x03b8}}},
-  {0x03f5, {1|F|SU|I(40), {0x03b5}}},
-  {0x03f7, {1|F|D, {0x03f8}}},
-  {0x03f9, {1|F|D, {0x03f2}}},
-  {0x03fa, {1|F|D, {0x03fb}}},
-  {0x03fd, {1|F|D, {0x037b}}},
-  {0x03fe, {1|F|D, {0x037c}}},
-  {0x03ff, {1|F|D, {0x037d}}},
-  {0x0400, {1|F|D, {0x0450}}},
-  {0x0401, {1|F|D, {0x0451}}},
-  {0x0402, {1|F|D, {0x0452}}},
-  {0x0403, {1|F|D, {0x0453}}},
-  {0x0404, {1|F|D, {0x0454}}},
-  {0x0405, {1|F|D, {0x0455}}},
-  {0x0406, {1|F|D, {0x0456}}},
-  {0x0407, {1|F|D, {0x0457}}},
-  {0x0408, {1|F|D, {0x0458}}},
-  {0x0409, {1|F|D, {0x0459}}},
-  {0x040a, {1|F|D, {0x045a}}},
-  {0x040b, {1|F|D, {0x045b}}},
-  {0x040c, {1|F|D, {0x045c}}},
-  {0x040d, {1|F|D, {0x045d}}},
-  {0x040e, {1|F|D, {0x045e}}},
-  {0x040f, {1|F|D, {0x045f}}},
-  {0x0410, {1|F|D, {0x0430}}},
-  {0x0411, {1|F|D, {0x0431}}},
-  {0x0412, {1|F|D, {0x0432}}},
-  {0x0413, {1|F|D, {0x0433}}},
-  {0x0414, {1|F|D, {0x0434}}},
-  {0x0415, {1|F|D, {0x0435}}},
-  {0x0416, {1|F|D, {0x0436}}},
-  {0x0417, {1|F|D, {0x0437}}},
-  {0x0418, {1|F|D, {0x0438}}},
-  {0x0419, {1|F|D, {0x0439}}},
-  {0x041a, {1|F|D, {0x043a}}},
-  {0x041b, {1|F|D, {0x043b}}},
-  {0x041c, {1|F|D, {0x043c}}},
-  {0x041d, {1|F|D, {0x043d}}},
-  {0x041e, {1|F|D, {0x043e}}},
-  {0x041f, {1|F|D, {0x043f}}},
-  {0x0420, {1|F|D, {0x0440}}},
-  {0x0421, {1|F|D, {0x0441}}},
-  {0x0422, {1|F|D, {0x0442}}},
-  {0x0423, {1|F|D, {0x0443}}},
-  {0x0424, {1|F|D, {0x0444}}},
-  {0x0425, {1|F|D, {0x0445}}},
-  {0x0426, {1|F|D, {0x0446}}},
-  {0x0427, {1|F|D, {0x0447}}},
-  {0x0428, {1|F|D, {0x0448}}},
-  {0x0429, {1|F|D, {0x0449}}},
-  {0x042a, {1|F|D, {0x044a}}},
-  {0x042b, {1|F|D, {0x044b}}},
-  {0x042c, {1|F|D, {0x044c}}},
-  {0x042d, {1|F|D, {0x044d}}},
-  {0x042e, {1|F|D, {0x044e}}},
-  {0x042f, {1|F|D, {0x044f}}},
-  {0x0460, {1|F|D, {0x0461}}},
-  {0x0462, {1|F|D, {0x0463}}},
-  {0x0464, {1|F|D, {0x0465}}},
-  {0x0466, {1|F|D, {0x0467}}},
-  {0x0468, {1|F|D, {0x0469}}},
-  {0x046a, {1|F|D, {0x046b}}},
-  {0x046c, {1|F|D, {0x046d}}},
-  {0x046e, {1|F|D, {0x046f}}},
-  {0x0470, {1|F|D, {0x0471}}},
-  {0x0472, {1|F|D, {0x0473}}},
-  {0x0474, {1|F|D, {0x0475}}},
-  {0x0476, {1|F|D, {0x0477}}},
-  {0x0478, {1|F|D, {0x0479}}},
-  {0x047a, {1|F|D, {0x047b}}},
-  {0x047c, {1|F|D, {0x047d}}},
-  {0x047e, {1|F|D, {0x047f}}},
-  {0x0480, {1|F|D, {0x0481}}},
-  {0x048a, {1|F|D, {0x048b}}},
-  {0x048c, {1|F|D, {0x048d}}},
-  {0x048e, {1|F|D, {0x048f}}},
-  {0x0490, {1|F|D, {0x0491}}},
-  {0x0492, {1|F|D, {0x0493}}},
-  {0x0494, {1|F|D, {0x0495}}},
-  {0x0496, {1|F|D, {0x0497}}},
-  {0x0498, {1|F|D, {0x0499}}},
-  {0x049a, {1|F|D, {0x049b}}},
-  {0x049c, {1|F|D, {0x049d}}},
-  {0x049e, {1|F|D, {0x049f}}},
-  {0x04a0, {1|F|D, {0x04a1}}},
-  {0x04a2, {1|F|D, {0x04a3}}},
-  {0x04a4, {1|F|D, {0x04a5}}},
-  {0x04a6, {1|F|D, {0x04a7}}},
-  {0x04a8, {1|F|D, {0x04a9}}},
-  {0x04aa, {1|F|D, {0x04ab}}},
-  {0x04ac, {1|F|D, {0x04ad}}},
-  {0x04ae, {1|F|D, {0x04af}}},
-  {0x04b0, {1|F|D, {0x04b1}}},
-  {0x04b2, {1|F|D, {0x04b3}}},
-  {0x04b4, {1|F|D, {0x04b5}}},
-  {0x04b6, {1|F|D, {0x04b7}}},
-  {0x04b8, {1|F|D, {0x04b9}}},
-  {0x04ba, {1|F|D, {0x04bb}}},
-  {0x04bc, {1|F|D, {0x04bd}}},
-  {0x04be, {1|F|D, {0x04bf}}},
-  {0x04c0, {1|F|D, {0x04cf}}},
-  {0x04c1, {1|F|D, {0x04c2}}},
-  {0x04c3, {1|F|D, {0x04c4}}},
-  {0x04c5, {1|F|D, {0x04c6}}},
-  {0x04c7, {1|F|D, {0x04c8}}},
-  {0x04c9, {1|F|D, {0x04ca}}},
-  {0x04cb, {1|F|D, {0x04cc}}},
-  {0x04cd, {1|F|D, {0x04ce}}},
-  {0x04d0, {1|F|D, {0x04d1}}},
-  {0x04d2, {1|F|D, {0x04d3}}},
-  {0x04d4, {1|F|D, {0x04d5}}},
-  {0x04d6, {1|F|D, {0x04d7}}},
-  {0x04d8, {1|F|D, {0x04d9}}},
-  {0x04da, {1|F|D, {0x04db}}},
-  {0x04dc, {1|F|D, {0x04dd}}},
-  {0x04de, {1|F|D, {0x04df}}},
-  {0x04e0, {1|F|D, {0x04e1}}},
-  {0x04e2, {1|F|D, {0x04e3}}},
-  {0x04e4, {1|F|D, {0x04e5}}},
-  {0x04e6, {1|F|D, {0x04e7}}},
-  {0x04e8, {1|F|D, {0x04e9}}},
-  {0x04ea, {1|F|D, {0x04eb}}},
-  {0x04ec, {1|F|D, {0x04ed}}},
-  {0x04ee, {1|F|D, {0x04ef}}},
-  {0x04f0, {1|F|D, {0x04f1}}},
-  {0x04f2, {1|F|D, {0x04f3}}},
-  {0x04f4, {1|F|D, {0x04f5}}},
-  {0x04f6, {1|F|D, {0x04f7}}},
-  {0x04f8, {1|F|D, {0x04f9}}},
-  {0x04fa, {1|F|D, {0x04fb}}},
-  {0x04fc, {1|F|D, {0x04fd}}},
-  {0x04fe, {1|F|D, {0x04ff}}},
-  {0x0500, {1|F|D, {0x0501}}},
-  {0x0502, {1|F|D, {0x0503}}},
-  {0x0504, {1|F|D, {0x0505}}},
-  {0x0506, {1|F|D, {0x0507}}},
-  {0x0508, {1|F|D, {0x0509}}},
-  {0x050a, {1|F|D, {0x050b}}},
-  {0x050c, {1|F|D, {0x050d}}},
-  {0x050e, {1|F|D, {0x050f}}},
-  {0x0510, {1|F|D, {0x0511}}},
-  {0x0512, {1|F|D, {0x0513}}},
-  {0x0514, {1|F|D, {0x0515}}},
-  {0x0516, {1|F|D, {0x0517}}},
-  {0x0518, {1|F|D, {0x0519}}},
-  {0x051a, {1|F|D, {0x051b}}},
-  {0x051c, {1|F|D, {0x051d}}},
-  {0x051e, {1|F|D, {0x051f}}},
-  {0x0520, {1|F|D, {0x0521}}},
-  {0x0522, {1|F|D, {0x0523}}},
-  {0x0524, {1|F|D, {0x0525}}},
-  {0x0526, {1|F|D, {0x0527}}},
-  {0x0528, {1|F|D, {0x0529}}},
-  {0x052a, {1|F|D, {0x052b}}},
-  {0x052c, {1|F|D, {0x052d}}},
-  {0x052e, {1|F|D, {0x052f}}},
-  {0x0531, {1|F|D, {0x0561}}},
-  {0x0532, {1|F|D, {0x0562}}},
-  {0x0533, {1|F|D, {0x0563}}},
-  {0x0534, {1|F|D, {0x0564}}},
-  {0x0535, {1|F|D, {0x0565}}},
-  {0x0536, {1|F|D, {0x0566}}},
-  {0x0537, {1|F|D, {0x0567}}},
-  {0x0538, {1|F|D, {0x0568}}},
-  {0x0539, {1|F|D, {0x0569}}},
-  {0x053a, {1|F|D, {0x056a}}},
-  {0x053b, {1|F|D, {0x056b}}},
-  {0x053c, {1|F|D, {0x056c}}},
-  {0x053d, {1|F|D, {0x056d}}},
-  {0x053e, {1|F|D, {0x056e}}},
-  {0x053f, {1|F|D, {0x056f}}},
-  {0x0540, {1|F|D, {0x0570}}},
-  {0x0541, {1|F|D, {0x0571}}},
-  {0x0542, {1|F|D, {0x0572}}},
-  {0x0543, {1|F|D, {0x0573}}},
-  {0x0544, {1|F|D, {0x0574}}},
-  {0x0545, {1|F|D, {0x0575}}},
-  {0x0546, {1|F|D, {0x0576}}},
-  {0x0547, {1|F|D, {0x0577}}},
-  {0x0548, {1|F|D, {0x0578}}},
-  {0x0549, {1|F|D, {0x0579}}},
-  {0x054a, {1|F|D, {0x057a}}},
-  {0x054b, {1|F|D, {0x057b}}},
-  {0x054c, {1|F|D, {0x057c}}},
-  {0x054d, {1|F|D, {0x057d}}},
-  {0x054e, {1|F|D, {0x057e}}},
-  {0x054f, {1|F|D, {0x057f}}},
-  {0x0550, {1|F|D, {0x0580}}},
-  {0x0551, {1|F|D, {0x0581}}},
-  {0x0552, {1|F|D, {0x0582}}},
-  {0x0553, {1|F|D, {0x0583}}},
-  {0x0554, {1|F|D, {0x0584}}},
-  {0x0555, {1|F|D, {0x0585}}},
-  {0x0556, {1|F|D, {0x0586}}},
-  {0x0587, {2|F|ST|SU|I(41), {0x0565, 0x0582}}},
-  {0x10a0, {1|F|D, {0x2d00}}},
-  {0x10a1, {1|F|D, {0x2d01}}},
-  {0x10a2, {1|F|D, {0x2d02}}},
-  {0x10a3, {1|F|D, {0x2d03}}},
-  {0x10a4, {1|F|D, {0x2d04}}},
-  {0x10a5, {1|F|D, {0x2d05}}},
-  {0x10a6, {1|F|D, {0x2d06}}},
-  {0x10a7, {1|F|D, {0x2d07}}},
-  {0x10a8, {1|F|D, {0x2d08}}},
-  {0x10a9, {1|F|D, {0x2d09}}},
-  {0x10aa, {1|F|D, {0x2d0a}}},
-  {0x10ab, {1|F|D, {0x2d0b}}},
-  {0x10ac, {1|F|D, {0x2d0c}}},
-  {0x10ad, {1|F|D, {0x2d0d}}},
-  {0x10ae, {1|F|D, {0x2d0e}}},
-  {0x10af, {1|F|D, {0x2d0f}}},
-  {0x10b0, {1|F|D, {0x2d10}}},
-  {0x10b1, {1|F|D, {0x2d11}}},
-  {0x10b2, {1|F|D, {0x2d12}}},
-  {0x10b3, {1|F|D, {0x2d13}}},
-  {0x10b4, {1|F|D, {0x2d14}}},
-  {0x10b5, {1|F|D, {0x2d15}}},
-  {0x10b6, {1|F|D, {0x2d16}}},
-  {0x10b7, {1|F|D, {0x2d17}}},
-  {0x10b8, {1|F|D, {0x2d18}}},
-  {0x10b9, {1|F|D, {0x2d19}}},
-  {0x10ba, {1|F|D, {0x2d1a}}},
-  {0x10bb, {1|F|D, {0x2d1b}}},
-  {0x10bc, {1|F|D, {0x2d1c}}},
-  {0x10bd, {1|F|D, {0x2d1d}}},
-  {0x10be, {1|F|D, {0x2d1e}}},
-  {0x10bf, {1|F|D, {0x2d1f}}},
-  {0x10c0, {1|F|D, {0x2d20}}},
-  {0x10c1, {1|F|D, {0x2d21}}},
-  {0x10c2, {1|F|D, {0x2d22}}},
-  {0x10c3, {1|F|D, {0x2d23}}},
-  {0x10c4, {1|F|D, {0x2d24}}},
-  {0x10c5, {1|F|D, {0x2d25}}},
-  {0x10c7, {1|F|D, {0x2d27}}},
-  {0x10cd, {1|F|D, {0x2d2d}}},
-  {0x13f8, {1|F|U, {0x13f0}}},
-  {0x13f9, {1|F|U, {0x13f1}}},
-  {0x13fa, {1|F|U, {0x13f2}}},
-  {0x13fb, {1|F|U, {0x13f3}}},
-  {0x13fc, {1|F|U, {0x13f4}}},
-  {0x13fd, {1|F|U, {0x13f5}}},
-  {0x1e00, {1|F|D, {0x1e01}}},
-  {0x1e02, {1|F|D, {0x1e03}}},
-  {0x1e04, {1|F|D, {0x1e05}}},
-  {0x1e06, {1|F|D, {0x1e07}}},
-  {0x1e08, {1|F|D, {0x1e09}}},
-  {0x1e0a, {1|F|D, {0x1e0b}}},
-  {0x1e0c, {1|F|D, {0x1e0d}}},
-  {0x1e0e, {1|F|D, {0x1e0f}}},
-  {0x1e10, {1|F|D, {0x1e11}}},
-  {0x1e12, {1|F|D, {0x1e13}}},
-  {0x1e14, {1|F|D, {0x1e15}}},
-  {0x1e16, {1|F|D, {0x1e17}}},
-  {0x1e18, {1|F|D, {0x1e19}}},
-  {0x1e1a, {1|F|D, {0x1e1b}}},
-  {0x1e1c, {1|F|D, {0x1e1d}}},
-  {0x1e1e, {1|F|D, {0x1e1f}}},
-  {0x1e20, {1|F|D, {0x1e21}}},
-  {0x1e22, {1|F|D, {0x1e23}}},
-  {0x1e24, {1|F|D, {0x1e25}}},
-  {0x1e26, {1|F|D, {0x1e27}}},
-  {0x1e28, {1|F|D, {0x1e29}}},
-  {0x1e2a, {1|F|D, {0x1e2b}}},
-  {0x1e2c, {1|F|D, {0x1e2d}}},
-  {0x1e2e, {1|F|D, {0x1e2f}}},
-  {0x1e30, {1|F|D, {0x1e31}}},
-  {0x1e32, {1|F|D, {0x1e33}}},
-  {0x1e34, {1|F|D, {0x1e35}}},
-  {0x1e36, {1|F|D, {0x1e37}}},
-  {0x1e38, {1|F|D, {0x1e39}}},
-  {0x1e3a, {1|F|D, {0x1e3b}}},
-  {0x1e3c, {1|F|D, {0x1e3d}}},
-  {0x1e3e, {1|F|D, {0x1e3f}}},
-  {0x1e40, {1|F|D, {0x1e41}}},
-  {0x1e42, {1|F|D, {0x1e43}}},
-  {0x1e44, {1|F|D, {0x1e45}}},
-  {0x1e46, {1|F|D, {0x1e47}}},
-  {0x1e48, {1|F|D, {0x1e49}}},
-  {0x1e4a, {1|F|D, {0x1e4b}}},
-  {0x1e4c, {1|F|D, {0x1e4d}}},
-  {0x1e4e, {1|F|D, {0x1e4f}}},
-  {0x1e50, {1|F|D, {0x1e51}}},
-  {0x1e52, {1|F|D, {0x1e53}}},
-  {0x1e54, {1|F|D, {0x1e55}}},
-  {0x1e56, {1|F|D, {0x1e57}}},
-  {0x1e58, {1|F|D, {0x1e59}}},
-  {0x1e5a, {1|F|D, {0x1e5b}}},
-  {0x1e5c, {1|F|D, {0x1e5d}}},
-  {0x1e5e, {1|F|D, {0x1e5f}}},
-  {0x1e60, {1|F|D, {0x1e61}}},
-  {0x1e62, {1|F|D, {0x1e63}}},
-  {0x1e64, {1|F|D, {0x1e65}}},
-  {0x1e66, {1|F|D, {0x1e67}}},
-  {0x1e68, {1|F|D, {0x1e69}}},
-  {0x1e6a, {1|F|D, {0x1e6b}}},
-  {0x1e6c, {1|F|D, {0x1e6d}}},
-  {0x1e6e, {1|F|D, {0x1e6f}}},
-  {0x1e70, {1|F|D, {0x1e71}}},
-  {0x1e72, {1|F|D, {0x1e73}}},
-  {0x1e74, {1|F|D, {0x1e75}}},
-  {0x1e76, {1|F|D, {0x1e77}}},
-  {0x1e78, {1|F|D, {0x1e79}}},
-  {0x1e7a, {1|F|D, {0x1e7b}}},
-  {0x1e7c, {1|F|D, {0x1e7d}}},
-  {0x1e7e, {1|F|D, {0x1e7f}}},
-  {0x1e80, {1|F|D, {0x1e81}}},
-  {0x1e82, {1|F|D, {0x1e83}}},
-  {0x1e84, {1|F|D, {0x1e85}}},
-  {0x1e86, {1|F|D, {0x1e87}}},
-  {0x1e88, {1|F|D, {0x1e89}}},
-  {0x1e8a, {1|F|D, {0x1e8b}}},
-  {0x1e8c, {1|F|D, {0x1e8d}}},
-  {0x1e8e, {1|F|D, {0x1e8f}}},
-  {0x1e90, {1|F|D, {0x1e91}}},
-  {0x1e92, {1|F|D, {0x1e93}}},
-  {0x1e94, {1|F|D, {0x1e95}}},
-  {0x1e96, {2|F|SU|I(45), {0x0068, 0x0331}}},
-  {0x1e97, {2|F|SU|I(47), {0x0074, 0x0308}}},
-  {0x1e98, {2|F|SU|I(49), {0x0077, 0x030a}}},
-  {0x1e99, {2|F|SU|I(51), {0x0079, 0x030a}}},
-  {0x1e9a, {2|F|SU|I(53), {0x0061, 0x02be}}},
-  {0x1e9b, {1|F|SU|I(55), {0x1e61}}},
-  {0x1e9e, {2|F|SL|I(56), {0x0073, 0x0073}}},
-  {0x1ea0, {1|F|D, {0x1ea1}}},
-  {0x1ea2, {1|F|D, {0x1ea3}}},
-  {0x1ea4, {1|F|D, {0x1ea5}}},
-  {0x1ea6, {1|F|D, {0x1ea7}}},
-  {0x1ea8, {1|F|D, {0x1ea9}}},
-  {0x1eaa, {1|F|D, {0x1eab}}},
-  {0x1eac, {1|F|D, {0x1ead}}},
-  {0x1eae, {1|F|D, {0x1eaf}}},
-  {0x1eb0, {1|F|D, {0x1eb1}}},
-  {0x1eb2, {1|F|D, {0x1eb3}}},
-  {0x1eb4, {1|F|D, {0x1eb5}}},
-  {0x1eb6, {1|F|D, {0x1eb7}}},
-  {0x1eb8, {1|F|D, {0x1eb9}}},
-  {0x1eba, {1|F|D, {0x1ebb}}},
-  {0x1ebc, {1|F|D, {0x1ebd}}},
-  {0x1ebe, {1|F|D, {0x1ebf}}},
-  {0x1ec0, {1|F|D, {0x1ec1}}},
-  {0x1ec2, {1|F|D, {0x1ec3}}},
-  {0x1ec4, {1|F|D, {0x1ec5}}},
-  {0x1ec6, {1|F|D, {0x1ec7}}},
-  {0x1ec8, {1|F|D, {0x1ec9}}},
-  {0x1eca, {1|F|D, {0x1ecb}}},
-  {0x1ecc, {1|F|D, {0x1ecd}}},
-  {0x1ece, {1|F|D, {0x1ecf}}},
-  {0x1ed0, {1|F|D, {0x1ed1}}},
-  {0x1ed2, {1|F|D, {0x1ed3}}},
-  {0x1ed4, {1|F|D, {0x1ed5}}},
-  {0x1ed6, {1|F|D, {0x1ed7}}},
-  {0x1ed8, {1|F|D, {0x1ed9}}},
-  {0x1eda, {1|F|D, {0x1edb}}},
-  {0x1edc, {1|F|D, {0x1edd}}},
-  {0x1ede, {1|F|D, {0x1edf}}},
-  {0x1ee0, {1|F|D, {0x1ee1}}},
-  {0x1ee2, {1|F|D, {0x1ee3}}},
-  {0x1ee4, {1|F|D, {0x1ee5}}},
-  {0x1ee6, {1|F|D, {0x1ee7}}},
-  {0x1ee8, {1|F|D, {0x1ee9}}},
-  {0x1eea, {1|F|D, {0x1eeb}}},
-  {0x1eec, {1|F|D, {0x1eed}}},
-  {0x1eee, {1|F|D, {0x1eef}}},
-  {0x1ef0, {1|F|D, {0x1ef1}}},
-  {0x1ef2, {1|F|D, {0x1ef3}}},
-  {0x1ef4, {1|F|D, {0x1ef5}}},
-  {0x1ef6, {1|F|D, {0x1ef7}}},
-  {0x1ef8, {1|F|D, {0x1ef9}}},
-  {0x1efa, {1|F|D, {0x1efb}}},
-  {0x1efc, {1|F|D, {0x1efd}}},
-  {0x1efe, {1|F|D, {0x1eff}}},
-  {0x1f08, {1|F|D, {0x1f00}}},
-  {0x1f09, {1|F|D, {0x1f01}}},
-  {0x1f0a, {1|F|D, {0x1f02}}},
-  {0x1f0b, {1|F|D, {0x1f03}}},
-  {0x1f0c, {1|F|D, {0x1f04}}},
-  {0x1f0d, {1|F|D, {0x1f05}}},
-  {0x1f0e, {1|F|D, {0x1f06}}},
-  {0x1f0f, {1|F|D, {0x1f07}}},
-  {0x1f18, {1|F|D, {0x1f10}}},
-  {0x1f19, {1|F|D, {0x1f11}}},
-  {0x1f1a, {1|F|D, {0x1f12}}},
-  {0x1f1b, {1|F|D, {0x1f13}}},
-  {0x1f1c, {1|F|D, {0x1f14}}},
-  {0x1f1d, {1|F|D, {0x1f15}}},
-  {0x1f28, {1|F|D, {0x1f20}}},
-  {0x1f29, {1|F|D, {0x1f21}}},
-  {0x1f2a, {1|F|D, {0x1f22}}},
-  {0x1f2b, {1|F|D, {0x1f23}}},
-  {0x1f2c, {1|F|D, {0x1f24}}},
-  {0x1f2d, {1|F|D, {0x1f25}}},
-  {0x1f2e, {1|F|D, {0x1f26}}},
-  {0x1f2f, {1|F|D, {0x1f27}}},
-  {0x1f38, {1|F|D, {0x1f30}}},
-  {0x1f39, {1|F|D, {0x1f31}}},
-  {0x1f3a, {1|F|D, {0x1f32}}},
-  {0x1f3b, {1|F|D, {0x1f33}}},
-  {0x1f3c, {1|F|D, {0x1f34}}},
-  {0x1f3d, {1|F|D, {0x1f35}}},
-  {0x1f3e, {1|F|D, {0x1f36}}},
-  {0x1f3f, {1|F|D, {0x1f37}}},
-  {0x1f48, {1|F|D, {0x1f40}}},
-  {0x1f49, {1|F|D, {0x1f41}}},
-  {0x1f4a, {1|F|D, {0x1f42}}},
-  {0x1f4b, {1|F|D, {0x1f43}}},
-  {0x1f4c, {1|F|D, {0x1f44}}},
-  {0x1f4d, {1|F|D, {0x1f45}}},
-  {0x1f50, {2|F|SU|I(57), {0x03c5, 0x0313}}},
-  {0x1f52, {3|F|SU|I(59), {0x03c5, 0x0313, 0x0300}}},
-  {0x1f54, {3|F|SU|I(62), {0x03c5, 0x0313, 0x0301}}},
-  {0x1f56, {3|F|SU|I(65), {0x03c5, 0x0313, 0x0342}}},
-  {0x1f59, {1|F|D, {0x1f51}}},
-  {0x1f5b, {1|F|D, {0x1f53}}},
-  {0x1f5d, {1|F|D, {0x1f55}}},
-  {0x1f5f, {1|F|D, {0x1f57}}},
-  {0x1f68, {1|F|D, {0x1f60}}},
-  {0x1f69, {1|F|D, {0x1f61}}},
-  {0x1f6a, {1|F|D, {0x1f62}}},
-  {0x1f6b, {1|F|D, {0x1f63}}},
-  {0x1f6c, {1|F|D, {0x1f64}}},
-  {0x1f6d, {1|F|D, {0x1f65}}},
-  {0x1f6e, {1|F|D, {0x1f66}}},
-  {0x1f6f, {1|F|D, {0x1f67}}},
-  {0x1f80, {2|F|ST|SU|I(68), {0x1f00, 0x03b9}}},
-  {0x1f81, {2|F|ST|SU|I(71), {0x1f01, 0x03b9}}},
-  {0x1f82, {2|F|ST|SU|I(74), {0x1f02, 0x03b9}}},
-  {0x1f83, {2|F|ST|SU|I(77), {0x1f03, 0x03b9}}},
-  {0x1f84, {2|F|ST|SU|I(80), {0x1f04, 0x03b9}}},
-  {0x1f85, {2|F|ST|SU|I(83), {0x1f05, 0x03b9}}},
-  {0x1f86, {2|F|ST|SU|I(86), {0x1f06, 0x03b9}}},
-  {0x1f87, {2|F|ST|SU|I(89), {0x1f07, 0x03b9}}},
-  {0x1f88, {2|F|IT|SL|SU|I(92), {0x1f00, 0x03b9}}},
-  {0x1f89, {2|F|IT|SL|SU|I(97), {0x1f01, 0x03b9}}},
-  {0x1f8a, {2|F|IT|SL|SU|I(102), {0x1f02, 0x03b9}}},
-  {0x1f8b, {2|F|IT|SL|SU|I(107), {0x1f03, 0x03b9}}},
-  {0x1f8c, {2|F|IT|SL|SU|I(112), {0x1f04, 0x03b9}}},
-  {0x1f8d, {2|F|IT|SL|SU|I(117), {0x1f05, 0x03b9}}},
-  {0x1f8e, {2|F|IT|SL|SU|I(122), {0x1f06, 0x03b9}}},
-  {0x1f8f, {2|F|IT|SL|SU|I(127), {0x1f07, 0x03b9}}},
-  {0x1f90, {2|F|ST|SU|I(132), {0x1f20, 0x03b9}}},
-  {0x1f91, {2|F|ST|SU|I(135), {0x1f21, 0x03b9}}},
-  {0x1f92, {2|F|ST|SU|I(138), {0x1f22, 0x03b9}}},
-  {0x1f93, {2|F|ST|SU|I(141), {0x1f23, 0x03b9}}},
-  {0x1f94, {2|F|ST|SU|I(144), {0x1f24, 0x03b9}}},
-  {0x1f95, {2|F|ST|SU|I(147), {0x1f25, 0x03b9}}},
-  {0x1f96, {2|F|ST|SU|I(150), {0x1f26, 0x03b9}}},
-  {0x1f97, {2|F|ST|SU|I(153), {0x1f27, 0x03b9}}},
-  {0x1f98, {2|F|IT|SL|SU|I(156), {0x1f20, 0x03b9}}},
-  {0x1f99, {2|F|IT|SL|SU|I(161), {0x1f21, 0x03b9}}},
-  {0x1f9a, {2|F|IT|SL|SU|I(166), {0x1f22, 0x03b9}}},
-  {0x1f9b, {2|F|IT|SL|SU|I(171), {0x1f23, 0x03b9}}},
-  {0x1f9c, {2|F|IT|SL|SU|I(176), {0x1f24, 0x03b9}}},
-  {0x1f9d, {2|F|IT|SL|SU|I(181), {0x1f25, 0x03b9}}},
-  {0x1f9e, {2|F|IT|SL|SU|I(186), {0x1f26, 0x03b9}}},
-  {0x1f9f, {2|F|IT|SL|SU|I(191), {0x1f27, 0x03b9}}},
-  {0x1fa0, {2|F|ST|SU|I(196), {0x1f60, 0x03b9}}},
-  {0x1fa1, {2|F|ST|SU|I(199), {0x1f61, 0x03b9}}},
-  {0x1fa2, {2|F|ST|SU|I(202), {0x1f62, 0x03b9}}},
-  {0x1fa3, {2|F|ST|SU|I(205), {0x1f63, 0x03b9}}},
-  {0x1fa4, {2|F|ST|SU|I(208), {0x1f64, 0x03b9}}},
-  {0x1fa5, {2|F|ST|SU|I(211), {0x1f65, 0x03b9}}},
-  {0x1fa6, {2|F|ST|SU|I(214), {0x1f66, 0x03b9}}},
-  {0x1fa7, {2|F|ST|SU|I(217), {0x1f67, 0x03b9}}},
-  {0x1fa8, {2|F|IT|SL|SU|I(220), {0x1f60, 0x03b9}}},
-  {0x1fa9, {2|F|IT|SL|SU|I(225), {0x1f61, 0x03b9}}},
-  {0x1faa, {2|F|IT|SL|SU|I(230), {0x1f62, 0x03b9}}},
-  {0x1fab, {2|F|IT|SL|SU|I(235), {0x1f63, 0x03b9}}},
-  {0x1fac, {2|F|IT|SL|SU|I(240), {0x1f64, 0x03b9}}},
-  {0x1fad, {2|F|IT|SL|SU|I(245), {0x1f65, 0x03b9}}},
-  {0x1fae, {2|F|IT|SL|SU|I(250), {0x1f66, 0x03b9}}},
-  {0x1faf, {2|F|IT|SL|SU|I(255), {0x1f67, 0x03b9}}},
-  {0x1fb2, {2|F|ST|SU|I(260), {0x1f70, 0x03b9}}},
-  {0x1fb3, {2|F|ST|SU|I(264), {0x03b1, 0x03b9}}},
-  {0x1fb4, {2|F|ST|SU|I(267), {0x03ac, 0x03b9}}},
-  {0x1fb6, {2|F|SU|I(271), {0x03b1, 0x0342}}},
-  {0x1fb7, {3|F|ST|SU|I(273), {0x03b1, 0x0342, 0x03b9}}},
-  {0x1fb8, {1|F|D, {0x1fb0}}},
-  {0x1fb9, {1|F|D, {0x1fb1}}},
-  {0x1fba, {1|F|D, {0x1f70}}},
-  {0x1fbb, {1|F|D, {0x1f71}}},
-  {0x1fbc, {2|F|IT|SL|SU|I(279), {0x03b1, 0x03b9}}},
-  {0x1fbe, {1|F|SU|I(284), {0x03b9}}},
-  {0x1fc2, {2|F|ST|SU|I(285), {0x1f74, 0x03b9}}},
-  {0x1fc3, {2|F|ST|SU|I(289), {0x03b7, 0x03b9}}},
-  {0x1fc4, {2|F|ST|SU|I(292), {0x03ae, 0x03b9}}},
-  {0x1fc6, {2|F|SU|I(296), {0x03b7, 0x0342}}},
-  {0x1fc7, {3|F|ST|SU|I(298), {0x03b7, 0x0342, 0x03b9}}},
-  {0x1fc8, {1|F|D, {0x1f72}}},
-  {0x1fc9, {1|F|D, {0x1f73}}},
-  {0x1fca, {1|F|D, {0x1f74}}},
-  {0x1fcb, {1|F|D, {0x1f75}}},
-  {0x1fcc, {2|F|IT|SL|SU|I(304), {0x03b7, 0x03b9}}},
-  {0x1fd2, {3|F|SU|I(309), {0x03b9, 0x0308, 0x0300}}},
-  {0x1fd3, {3|F|SU|I(312), {0x03b9, 0x0308, 0x0301}}},
-  {0x1fd6, {2|F|SU|I(315), {0x03b9, 0x0342}}},
-  {0x1fd7, {3|F|SU|I(317), {0x03b9, 0x0308, 0x0342}}},
-  {0x1fd8, {1|F|D, {0x1fd0}}},
-  {0x1fd9, {1|F|D, {0x1fd1}}},
-  {0x1fda, {1|F|D, {0x1f76}}},
-  {0x1fdb, {1|F|D, {0x1f77}}},
-  {0x1fe2, {3|F|SU|I(320), {0x03c5, 0x0308, 0x0300}}},
-  {0x1fe3, {3|F|SU|I(323), {0x03c5, 0x0308, 0x0301}}},
-  {0x1fe4, {2|F|SU|I(326), {0x03c1, 0x0313}}},
-  {0x1fe6, {2|F|SU|I(328), {0x03c5, 0x0342}}},
-  {0x1fe7, {3|F|SU|I(330), {0x03c5, 0x0308, 0x0342}}},
-  {0x1fe8, {1|F|D, {0x1fe0}}},
-  {0x1fe9, {1|F|D, {0x1fe1}}},
-  {0x1fea, {1|F|D, {0x1f7a}}},
-  {0x1feb, {1|F|D, {0x1f7b}}},
-  {0x1fec, {1|F|D, {0x1fe5}}},
-  {0x1ff2, {2|F|ST|SU|I(333), {0x1f7c, 0x03b9}}},
-  {0x1ff3, {2|F|ST|SU|I(337), {0x03c9, 0x03b9}}},
-  {0x1ff4, {2|F|ST|SU|I(340), {0x03ce, 0x03b9}}},
-  {0x1ff6, {2|F|SU|I(344), {0x03c9, 0x0342}}},
-  {0x1ff7, {3|F|ST|SU|I(346), {0x03c9, 0x0342, 0x03b9}}},
-  {0x1ff8, {1|F|D, {0x1f78}}},
-  {0x1ff9, {1|F|D, {0x1f79}}},
-  {0x1ffa, {1|F|D, {0x1f7c}}},
-  {0x1ffb, {1|F|D, {0x1f7d}}},
-  {0x1ffc, {2|F|IT|SL|SU|I(352), {0x03c9, 0x03b9}}},
-  {0x2126, {1|F|D, {0x03c9}}},
-  {0x212a, {1|F|D, {0x006b}}},
-  {0x212b, {1|F|D, {0x00e5}}},
-  {0x2132, {1|F|D, {0x214e}}},
-  {0x2160, {1|F|D, {0x2170}}},
-  {0x2161, {1|F|D, {0x2171}}},
-  {0x2162, {1|F|D, {0x2172}}},
-  {0x2163, {1|F|D, {0x2173}}},
-  {0x2164, {1|F|D, {0x2174}}},
-  {0x2165, {1|F|D, {0x2175}}},
-  {0x2166, {1|F|D, {0x2176}}},
-  {0x2167, {1|F|D, {0x2177}}},
-  {0x2168, {1|F|D, {0x2178}}},
-  {0x2169, {1|F|D, {0x2179}}},
-  {0x216a, {1|F|D, {0x217a}}},
-  {0x216b, {1|F|D, {0x217b}}},
-  {0x216c, {1|F|D, {0x217c}}},
-  {0x216d, {1|F|D, {0x217d}}},
-  {0x216e, {1|F|D, {0x217e}}},
-  {0x216f, {1|F|D, {0x217f}}},
-  {0x2183, {1|F|D, {0x2184}}},
-  {0x24b6, {1|F|D, {0x24d0}}},
-  {0x24b7, {1|F|D, {0x24d1}}},
-  {0x24b8, {1|F|D, {0x24d2}}},
-  {0x24b9, {1|F|D, {0x24d3}}},
-  {0x24ba, {1|F|D, {0x24d4}}},
-  {0x24bb, {1|F|D, {0x24d5}}},
-  {0x24bc, {1|F|D, {0x24d6}}},
-  {0x24bd, {1|F|D, {0x24d7}}},
-  {0x24be, {1|F|D, {0x24d8}}},
-  {0x24bf, {1|F|D, {0x24d9}}},
-  {0x24c0, {1|F|D, {0x24da}}},
-  {0x24c1, {1|F|D, {0x24db}}},
-  {0x24c2, {1|F|D, {0x24dc}}},
-  {0x24c3, {1|F|D, {0x24dd}}},
-  {0x24c4, {1|F|D, {0x24de}}},
-  {0x24c5, {1|F|D, {0x24df}}},
-  {0x24c6, {1|F|D, {0x24e0}}},
-  {0x24c7, {1|F|D, {0x24e1}}},
-  {0x24c8, {1|F|D, {0x24e2}}},
-  {0x24c9, {1|F|D, {0x24e3}}},
-  {0x24ca, {1|F|D, {0x24e4}}},
-  {0x24cb, {1|F|D, {0x24e5}}},
-  {0x24cc, {1|F|D, {0x24e6}}},
-  {0x24cd, {1|F|D, {0x24e7}}},
-  {0x24ce, {1|F|D, {0x24e8}}},
-  {0x24cf, {1|F|D, {0x24e9}}},
-  {0x2c00, {1|F|D, {0x2c30}}},
-  {0x2c01, {1|F|D, {0x2c31}}},
-  {0x2c02, {1|F|D, {0x2c32}}},
-  {0x2c03, {1|F|D, {0x2c33}}},
-  {0x2c04, {1|F|D, {0x2c34}}},
-  {0x2c05, {1|F|D, {0x2c35}}},
-  {0x2c06, {1|F|D, {0x2c36}}},
-  {0x2c07, {1|F|D, {0x2c37}}},
-  {0x2c08, {1|F|D, {0x2c38}}},
-  {0x2c09, {1|F|D, {0x2c39}}},
-  {0x2c0a, {1|F|D, {0x2c3a}}},
-  {0x2c0b, {1|F|D, {0x2c3b}}},
-  {0x2c0c, {1|F|D, {0x2c3c}}},
-  {0x2c0d, {1|F|D, {0x2c3d}}},
-  {0x2c0e, {1|F|D, {0x2c3e}}},
-  {0x2c0f, {1|F|D, {0x2c3f}}},
-  {0x2c10, {1|F|D, {0x2c40}}},
-  {0x2c11, {1|F|D, {0x2c41}}},
-  {0x2c12, {1|F|D, {0x2c42}}},
-  {0x2c13, {1|F|D, {0x2c43}}},
-  {0x2c14, {1|F|D, {0x2c44}}},
-  {0x2c15, {1|F|D, {0x2c45}}},
-  {0x2c16, {1|F|D, {0x2c46}}},
-  {0x2c17, {1|F|D, {0x2c47}}},
-  {0x2c18, {1|F|D, {0x2c48}}},
-  {0x2c19, {1|F|D, {0x2c49}}},
-  {0x2c1a, {1|F|D, {0x2c4a}}},
-  {0x2c1b, {1|F|D, {0x2c4b}}},
-  {0x2c1c, {1|F|D, {0x2c4c}}},
-  {0x2c1d, {1|F|D, {0x2c4d}}},
-  {0x2c1e, {1|F|D, {0x2c4e}}},
-  {0x2c1f, {1|F|D, {0x2c4f}}},
-  {0x2c20, {1|F|D, {0x2c50}}},
-  {0x2c21, {1|F|D, {0x2c51}}},
-  {0x2c22, {1|F|D, {0x2c52}}},
-  {0x2c23, {1|F|D, {0x2c53}}},
-  {0x2c24, {1|F|D, {0x2c54}}},
-  {0x2c25, {1|F|D, {0x2c55}}},
-  {0x2c26, {1|F|D, {0x2c56}}},
-  {0x2c27, {1|F|D, {0x2c57}}},
-  {0x2c28, {1|F|D, {0x2c58}}},
-  {0x2c29, {1|F|D, {0x2c59}}},
-  {0x2c2a, {1|F|D, {0x2c5a}}},
-  {0x2c2b, {1|F|D, {0x2c5b}}},
-  {0x2c2c, {1|F|D, {0x2c5c}}},
-  {0x2c2d, {1|F|D, {0x2c5d}}},
-  {0x2c2e, {1|F|D, {0x2c5e}}},
-  {0x2c60, {1|F|D, {0x2c61}}},
-  {0x2c62, {1|F|D, {0x026b}}},
-  {0x2c63, {1|F|D, {0x1d7d}}},
-  {0x2c64, {1|F|D, {0x027d}}},
-  {0x2c67, {1|F|D, {0x2c68}}},
-  {0x2c69, {1|F|D, {0x2c6a}}},
-  {0x2c6b, {1|F|D, {0x2c6c}}},
-  {0x2c6d, {1|F|D, {0x0251}}},
-  {0x2c6e, {1|F|D, {0x0271}}},
-  {0x2c6f, {1|F|D, {0x0250}}},
-  {0x2c70, {1|F|D, {0x0252}}},
-  {0x2c72, {1|F|D, {0x2c73}}},
-  {0x2c75, {1|F|D, {0x2c76}}},
-  {0x2c7e, {1|F|D, {0x023f}}},
-  {0x2c7f, {1|F|D, {0x0240}}},
-  {0x2c80, {1|F|D, {0x2c81}}},
-  {0x2c82, {1|F|D, {0x2c83}}},
-  {0x2c84, {1|F|D, {0x2c85}}},
-  {0x2c86, {1|F|D, {0x2c87}}},
-  {0x2c88, {1|F|D, {0x2c89}}},
-  {0x2c8a, {1|F|D, {0x2c8b}}},
-  {0x2c8c, {1|F|D, {0x2c8d}}},
-  {0x2c8e, {1|F|D, {0x2c8f}}},
-  {0x2c90, {1|F|D, {0x2c91}}},
-  {0x2c92, {1|F|D, {0x2c93}}},
-  {0x2c94, {1|F|D, {0x2c95}}},
-  {0x2c96, {1|F|D, {0x2c97}}},
-  {0x2c98, {1|F|D, {0x2c99}}},
-  {0x2c9a, {1|F|D, {0x2c9b}}},
-  {0x2c9c, {1|F|D, {0x2c9d}}},
-  {0x2c9e, {1|F|D, {0x2c9f}}},
-  {0x2ca0, {1|F|D, {0x2ca1}}},
-  {0x2ca2, {1|F|D, {0x2ca3}}},
-  {0x2ca4, {1|F|D, {0x2ca5}}},
-  {0x2ca6, {1|F|D, {0x2ca7}}},
-  {0x2ca8, {1|F|D, {0x2ca9}}},
-  {0x2caa, {1|F|D, {0x2cab}}},
-  {0x2cac, {1|F|D, {0x2cad}}},
-  {0x2cae, {1|F|D, {0x2caf}}},
-  {0x2cb0, {1|F|D, {0x2cb1}}},
-  {0x2cb2, {1|F|D, {0x2cb3}}},
-  {0x2cb4, {1|F|D, {0x2cb5}}},
-  {0x2cb6, {1|F|D, {0x2cb7}}},
-  {0x2cb8, {1|F|D, {0x2cb9}}},
-  {0x2cba, {1|F|D, {0x2cbb}}},
-  {0x2cbc, {1|F|D, {0x2cbd}}},
-  {0x2cbe, {1|F|D, {0x2cbf}}},
-  {0x2cc0, {1|F|D, {0x2cc1}}},
-  {0x2cc2, {1|F|D, {0x2cc3}}},
-  {0x2cc4, {1|F|D, {0x2cc5}}},
-  {0x2cc6, {1|F|D, {0x2cc7}}},
-  {0x2cc8, {1|F|D, {0x2cc9}}},
-  {0x2cca, {1|F|D, {0x2ccb}}},
-  {0x2ccc, {1|F|D, {0x2ccd}}},
-  {0x2cce, {1|F|D, {0x2ccf}}},
-  {0x2cd0, {1|F|D, {0x2cd1}}},
-  {0x2cd2, {1|F|D, {0x2cd3}}},
-  {0x2cd4, {1|F|D, {0x2cd5}}},
-  {0x2cd6, {1|F|D, {0x2cd7}}},
-  {0x2cd8, {1|F|D, {0x2cd9}}},
-  {0x2cda, {1|F|D, {0x2cdb}}},
-  {0x2cdc, {1|F|D, {0x2cdd}}},
-  {0x2cde, {1|F|D, {0x2cdf}}},
-  {0x2ce0, {1|F|D, {0x2ce1}}},
-  {0x2ce2, {1|F|D, {0x2ce3}}},
-  {0x2ceb, {1|F|D, {0x2cec}}},
-  {0x2ced, {1|F|D, {0x2cee}}},
-  {0x2cf2, {1|F|D, {0x2cf3}}},
-  {0xa640, {1|F|D, {0xa641}}},
-  {0xa642, {1|F|D, {0xa643}}},
-  {0xa644, {1|F|D, {0xa645}}},
-  {0xa646, {1|F|D, {0xa647}}},
-  {0xa648, {1|F|D, {0xa649}}},
-  {0xa64a, {1|F|D, {0xa64b}}},
-  {0xa64c, {1|F|D, {0xa64d}}},
-  {0xa64e, {1|F|D, {0xa64f}}},
-  {0xa650, {1|F|D, {0xa651}}},
-  {0xa652, {1|F|D, {0xa653}}},
-  {0xa654, {1|F|D, {0xa655}}},
-  {0xa656, {1|F|D, {0xa657}}},
-  {0xa658, {1|F|D, {0xa659}}},
-  {0xa65a, {1|F|D, {0xa65b}}},
-  {0xa65c, {1|F|D, {0xa65d}}},
-  {0xa65e, {1|F|D, {0xa65f}}},
-  {0xa660, {1|F|D, {0xa661}}},
-  {0xa662, {1|F|D, {0xa663}}},
-  {0xa664, {1|F|D, {0xa665}}},
-  {0xa666, {1|F|D, {0xa667}}},
-  {0xa668, {1|F|D, {0xa669}}},
-  {0xa66a, {1|F|D, {0xa66b}}},
-  {0xa66c, {1|F|D, {0xa66d}}},
-  {0xa680, {1|F|D, {0xa681}}},
-  {0xa682, {1|F|D, {0xa683}}},
-  {0xa684, {1|F|D, {0xa685}}},
-  {0xa686, {1|F|D, {0xa687}}},
-  {0xa688, {1|F|D, {0xa689}}},
-  {0xa68a, {1|F|D, {0xa68b}}},
-  {0xa68c, {1|F|D, {0xa68d}}},
-  {0xa68e, {1|F|D, {0xa68f}}},
-  {0xa690, {1|F|D, {0xa691}}},
-  {0xa692, {1|F|D, {0xa693}}},
-  {0xa694, {1|F|D, {0xa695}}},
-  {0xa696, {1|F|D, {0xa697}}},
-  {0xa698, {1|F|D, {0xa699}}},
-  {0xa69a, {1|F|D, {0xa69b}}},
-  {0xa722, {1|F|D, {0xa723}}},
-  {0xa724, {1|F|D, {0xa725}}},
-  {0xa726, {1|F|D, {0xa727}}},
-  {0xa728, {1|F|D, {0xa729}}},
-  {0xa72a, {1|F|D, {0xa72b}}},
-  {0xa72c, {1|F|D, {0xa72d}}},
-  {0xa72e, {1|F|D, {0xa72f}}},
-  {0xa732, {1|F|D, {0xa733}}},
-  {0xa734, {1|F|D, {0xa735}}},
-  {0xa736, {1|F|D, {0xa737}}},
-  {0xa738, {1|F|D, {0xa739}}},
-  {0xa73a, {1|F|D, {0xa73b}}},
-  {0xa73c, {1|F|D, {0xa73d}}},
-  {0xa73e, {1|F|D, {0xa73f}}},
-  {0xa740, {1|F|D, {0xa741}}},
-  {0xa742, {1|F|D, {0xa743}}},
-  {0xa744, {1|F|D, {0xa745}}},
-  {0xa746, {1|F|D, {0xa747}}},
-  {0xa748, {1|F|D, {0xa749}}},
-  {0xa74a, {1|F|D, {0xa74b}}},
-  {0xa74c, {1|F|D, {0xa74d}}},
-  {0xa74e, {1|F|D, {0xa74f}}},
-  {0xa750, {1|F|D, {0xa751}}},
-  {0xa752, {1|F|D, {0xa753}}},
-  {0xa754, {1|F|D, {0xa755}}},
-  {0xa756, {1|F|D, {0xa757}}},
-  {0xa758, {1|F|D, {0xa759}}},
-  {0xa75a, {1|F|D, {0xa75b}}},
-  {0xa75c, {1|F|D, {0xa75d}}},
-  {0xa75e, {1|F|D, {0xa75f}}},
-  {0xa760, {1|F|D, {0xa761}}},
-  {0xa762, {1|F|D, {0xa763}}},
-  {0xa764, {1|F|D, {0xa765}}},
-  {0xa766, {1|F|D, {0xa767}}},
-  {0xa768, {1|F|D, {0xa769}}},
-  {0xa76a, {1|F|D, {0xa76b}}},
-  {0xa76c, {1|F|D, {0xa76d}}},
-  {0xa76e, {1|F|D, {0xa76f}}},
-  {0xa779, {1|F|D, {0xa77a}}},
-  {0xa77b, {1|F|D, {0xa77c}}},
-  {0xa77d, {1|F|D, {0x1d79}}},
-  {0xa77e, {1|F|D, {0xa77f}}},
-  {0xa780, {1|F|D, {0xa781}}},
-  {0xa782, {1|F|D, {0xa783}}},
-  {0xa784, {1|F|D, {0xa785}}},
-  {0xa786, {1|F|D, {0xa787}}},
-  {0xa78b, {1|F|D, {0xa78c}}},
-  {0xa78d, {1|F|D, {0x0265}}},
-  {0xa790, {1|F|D, {0xa791}}},
-  {0xa792, {1|F|D, {0xa793}}},
-  {0xa796, {1|F|D, {0xa797}}},
-  {0xa798, {1|F|D, {0xa799}}},
-  {0xa79a, {1|F|D, {0xa79b}}},
-  {0xa79c, {1|F|D, {0xa79d}}},
-  {0xa79e, {1|F|D, {0xa79f}}},
-  {0xa7a0, {1|F|D, {0xa7a1}}},
-  {0xa7a2, {1|F|D, {0xa7a3}}},
-  {0xa7a4, {1|F|D, {0xa7a5}}},
-  {0xa7a6, {1|F|D, {0xa7a7}}},
-  {0xa7a8, {1|F|D, {0xa7a9}}},
-  {0xa7aa, {1|F|D, {0x0266}}},
-  {0xa7ab, {1|F|D, {0x025c}}},
-  {0xa7ac, {1|F|D, {0x0261}}},
-  {0xa7ad, {1|F|D, {0x026c}}},
-  {0xa7b0, {1|F|D, {0x029e}}},
-  {0xa7b1, {1|F|D, {0x0287}}},
-  {0xa7b2, {1|F|D, {0x029d}}},
-  {0xa7b3, {1|F|D, {0xab53}}},
-  {0xa7b4, {1|F|D, {0xa7b5}}},
-  {0xa7b6, {1|F|D, {0xa7b7}}},
-  {0xab70, {1|F|U, {0x13a0}}},
-  {0xab71, {1|F|U, {0x13a1}}},
-  {0xab72, {1|F|U, {0x13a2}}},
-  {0xab73, {1|F|U, {0x13a3}}},
-  {0xab74, {1|F|U, {0x13a4}}},
-  {0xab75, {1|F|U, {0x13a5}}},
-  {0xab76, {1|F|U, {0x13a6}}},
-  {0xab77, {1|F|U, {0x13a7}}},
-  {0xab78, {1|F|U, {0x13a8}}},
-  {0xab79, {1|F|U, {0x13a9}}},
-  {0xab7a, {1|F|U, {0x13aa}}},
-  {0xab7b, {1|F|U, {0x13ab}}},
-  {0xab7c, {1|F|U, {0x13ac}}},
-  {0xab7d, {1|F|U, {0x13ad}}},
-  {0xab7e, {1|F|U, {0x13ae}}},
-  {0xab7f, {1|F|U, {0x13af}}},
-  {0xab80, {1|F|U, {0x13b0}}},
-  {0xab81, {1|F|U, {0x13b1}}},
-  {0xab82, {1|F|U, {0x13b2}}},
-  {0xab83, {1|F|U, {0x13b3}}},
-  {0xab84, {1|F|U, {0x13b4}}},
-  {0xab85, {1|F|U, {0x13b5}}},
-  {0xab86, {1|F|U, {0x13b6}}},
-  {0xab87, {1|F|U, {0x13b7}}},
-  {0xab88, {1|F|U, {0x13b8}}},
-  {0xab89, {1|F|U, {0x13b9}}},
-  {0xab8a, {1|F|U, {0x13ba}}},
-  {0xab8b, {1|F|U, {0x13bb}}},
-  {0xab8c, {1|F|U, {0x13bc}}},
-  {0xab8d, {1|F|U, {0x13bd}}},
-  {0xab8e, {1|F|U, {0x13be}}},
-  {0xab8f, {1|F|U, {0x13bf}}},
-  {0xab90, {1|F|U, {0x13c0}}},
-  {0xab91, {1|F|U, {0x13c1}}},
-  {0xab92, {1|F|U, {0x13c2}}},
-  {0xab93, {1|F|U, {0x13c3}}},
-  {0xab94, {1|F|U, {0x13c4}}},
-  {0xab95, {1|F|U, {0x13c5}}},
-  {0xab96, {1|F|U, {0x13c6}}},
-  {0xab97, {1|F|U, {0x13c7}}},
-  {0xab98, {1|F|U, {0x13c8}}},
-  {0xab99, {1|F|U, {0x13c9}}},
-  {0xab9a, {1|F|U, {0x13ca}}},
-  {0xab9b, {1|F|U, {0x13cb}}},
-  {0xab9c, {1|F|U, {0x13cc}}},
-  {0xab9d, {1|F|U, {0x13cd}}},
-  {0xab9e, {1|F|U, {0x13ce}}},
-  {0xab9f, {1|F|U, {0x13cf}}},
-  {0xaba0, {1|F|U, {0x13d0}}},
-  {0xaba1, {1|F|U, {0x13d1}}},
-  {0xaba2, {1|F|U, {0x13d2}}},
-  {0xaba3, {1|F|U, {0x13d3}}},
-  {0xaba4, {1|F|U, {0x13d4}}},
-  {0xaba5, {1|F|U, {0x13d5}}},
-  {0xaba6, {1|F|U, {0x13d6}}},
-  {0xaba7, {1|F|U, {0x13d7}}},
-  {0xaba8, {1|F|U, {0x13d8}}},
-  {0xaba9, {1|F|U, {0x13d9}}},
-  {0xabaa, {1|F|U, {0x13da}}},
-  {0xabab, {1|F|U, {0x13db}}},
-  {0xabac, {1|F|U, {0x13dc}}},
-  {0xabad, {1|F|U, {0x13dd}}},
-  {0xabae, {1|F|U, {0x13de}}},
-  {0xabaf, {1|F|U, {0x13df}}},
-  {0xabb0, {1|F|U, {0x13e0}}},
-  {0xabb1, {1|F|U, {0x13e1}}},
-  {0xabb2, {1|F|U, {0x13e2}}},
-  {0xabb3, {1|F|U, {0x13e3}}},
-  {0xabb4, {1|F|U, {0x13e4}}},
-  {0xabb5, {1|F|U, {0x13e5}}},
-  {0xabb6, {1|F|U, {0x13e6}}},
-  {0xabb7, {1|F|U, {0x13e7}}},
-  {0xabb8, {1|F|U, {0x13e8}}},
-  {0xabb9, {1|F|U, {0x13e9}}},
-  {0xabba, {1|F|U, {0x13ea}}},
-  {0xabbb, {1|F|U, {0x13eb}}},
-  {0xabbc, {1|F|U, {0x13ec}}},
-  {0xabbd, {1|F|U, {0x13ed}}},
-  {0xabbe, {1|F|U, {0x13ee}}},
-  {0xabbf, {1|F|U, {0x13ef}}},
-  {0xfb00, {2|F|ST|SU|I(357), {0x0066, 0x0066}}},
-  {0xfb01, {2|F|ST|SU|I(361), {0x0066, 0x0069}}},
-  {0xfb02, {2|F|ST|SU|I(365), {0x0066, 0x006c}}},
-  {0xfb03, {3|F|ST|SU|I(369), {0x0066, 0x0066, 0x0069}}},
-  {0xfb04, {3|F|ST|SU|I(375), {0x0066, 0x0066, 0x006c}}},
-  {0xfb05, {2|F|ST|SU|I(381), {0x0073, 0x0074}}},
-  {0xfb06, {2|F|ST|SU|I(385), {0x0073, 0x0074}}},
-  {0xfb13, {2|F|ST|SU|I(389), {0x0574, 0x0576}}},
-  {0xfb14, {2|F|ST|SU|I(393), {0x0574, 0x0565}}},
-  {0xfb15, {2|F|ST|SU|I(397), {0x0574, 0x056b}}},
-  {0xfb16, {2|F|ST|SU|I(401), {0x057e, 0x0576}}},
-  {0xfb17, {2|F|ST|SU|I(405), {0x0574, 0x056d}}},
-  {0xff21, {1|F|D, {0xff41}}},
-  {0xff22, {1|F|D, {0xff42}}},
-  {0xff23, {1|F|D, {0xff43}}},
-  {0xff24, {1|F|D, {0xff44}}},
-  {0xff25, {1|F|D, {0xff45}}},
-  {0xff26, {1|F|D, {0xff46}}},
-  {0xff27, {1|F|D, {0xff47}}},
-  {0xff28, {1|F|D, {0xff48}}},
-  {0xff29, {1|F|D, {0xff49}}},
-  {0xff2a, {1|F|D, {0xff4a}}},
-  {0xff2b, {1|F|D, {0xff4b}}},
-  {0xff2c, {1|F|D, {0xff4c}}},
-  {0xff2d, {1|F|D, {0xff4d}}},
-  {0xff2e, {1|F|D, {0xff4e}}},
-  {0xff2f, {1|F|D, {0xff4f}}},
-  {0xff30, {1|F|D, {0xff50}}},
-  {0xff31, {1|F|D, {0xff51}}},
-  {0xff32, {1|F|D, {0xff52}}},
-  {0xff33, {1|F|D, {0xff53}}},
-  {0xff34, {1|F|D, {0xff54}}},
-  {0xff35, {1|F|D, {0xff55}}},
-  {0xff36, {1|F|D, {0xff56}}},
-  {0xff37, {1|F|D, {0xff57}}},
-  {0xff38, {1|F|D, {0xff58}}},
-  {0xff39, {1|F|D, {0xff59}}},
-  {0xff3a, {1|F|D, {0xff5a}}},
-  {0x10400, {1|F|D, {0x10428}}},
-  {0x10401, {1|F|D, {0x10429}}},
-  {0x10402, {1|F|D, {0x1042a}}},
-  {0x10403, {1|F|D, {0x1042b}}},
-  {0x10404, {1|F|D, {0x1042c}}},
-  {0x10405, {1|F|D, {0x1042d}}},
-  {0x10406, {1|F|D, {0x1042e}}},
-  {0x10407, {1|F|D, {0x1042f}}},
-  {0x10408, {1|F|D, {0x10430}}},
-  {0x10409, {1|F|D, {0x10431}}},
-  {0x1040a, {1|F|D, {0x10432}}},
-  {0x1040b, {1|F|D, {0x10433}}},
-  {0x1040c, {1|F|D, {0x10434}}},
-  {0x1040d, {1|F|D, {0x10435}}},
-  {0x1040e, {1|F|D, {0x10436}}},
-  {0x1040f, {1|F|D, {0x10437}}},
-  {0x10410, {1|F|D, {0x10438}}},
-  {0x10411, {1|F|D, {0x10439}}},
-  {0x10412, {1|F|D, {0x1043a}}},
-  {0x10413, {1|F|D, {0x1043b}}},
-  {0x10414, {1|F|D, {0x1043c}}},
-  {0x10415, {1|F|D, {0x1043d}}},
-  {0x10416, {1|F|D, {0x1043e}}},
-  {0x10417, {1|F|D, {0x1043f}}},
-  {0x10418, {1|F|D, {0x10440}}},
-  {0x10419, {1|F|D, {0x10441}}},
-  {0x1041a, {1|F|D, {0x10442}}},
-  {0x1041b, {1|F|D, {0x10443}}},
-  {0x1041c, {1|F|D, {0x10444}}},
-  {0x1041d, {1|F|D, {0x10445}}},
-  {0x1041e, {1|F|D, {0x10446}}},
-  {0x1041f, {1|F|D, {0x10447}}},
-  {0x10420, {1|F|D, {0x10448}}},
-  {0x10421, {1|F|D, {0x10449}}},
-  {0x10422, {1|F|D, {0x1044a}}},
-  {0x10423, {1|F|D, {0x1044b}}},
-  {0x10424, {1|F|D, {0x1044c}}},
-  {0x10425, {1|F|D, {0x1044d}}},
-  {0x10426, {1|F|D, {0x1044e}}},
-  {0x10427, {1|F|D, {0x1044f}}},
-  {0x10c80, {1|F|D, {0x10cc0}}},
-  {0x10c81, {1|F|D, {0x10cc1}}},
-  {0x10c82, {1|F|D, {0x10cc2}}},
-  {0x10c83, {1|F|D, {0x10cc3}}},
-  {0x10c84, {1|F|D, {0x10cc4}}},
-  {0x10c85, {1|F|D, {0x10cc5}}},
-  {0x10c86, {1|F|D, {0x10cc6}}},
-  {0x10c87, {1|F|D, {0x10cc7}}},
-  {0x10c88, {1|F|D, {0x10cc8}}},
-  {0x10c89, {1|F|D, {0x10cc9}}},
-  {0x10c8a, {1|F|D, {0x10cca}}},
-  {0x10c8b, {1|F|D, {0x10ccb}}},
-  {0x10c8c, {1|F|D, {0x10ccc}}},
-  {0x10c8d, {1|F|D, {0x10ccd}}},
-  {0x10c8e, {1|F|D, {0x10cce}}},
-  {0x10c8f, {1|F|D, {0x10ccf}}},
-  {0x10c90, {1|F|D, {0x10cd0}}},
-  {0x10c91, {1|F|D, {0x10cd1}}},
-  {0x10c92, {1|F|D, {0x10cd2}}},
-  {0x10c93, {1|F|D, {0x10cd3}}},
-  {0x10c94, {1|F|D, {0x10cd4}}},
-  {0x10c95, {1|F|D, {0x10cd5}}},
-  {0x10c96, {1|F|D, {0x10cd6}}},
-  {0x10c97, {1|F|D, {0x10cd7}}},
-  {0x10c98, {1|F|D, {0x10cd8}}},
-  {0x10c99, {1|F|D, {0x10cd9}}},
-  {0x10c9a, {1|F|D, {0x10cda}}},
-  {0x10c9b, {1|F|D, {0x10cdb}}},
-  {0x10c9c, {1|F|D, {0x10cdc}}},
-  {0x10c9d, {1|F|D, {0x10cdd}}},
-  {0x10c9e, {1|F|D, {0x10cde}}},
-  {0x10c9f, {1|F|D, {0x10cdf}}},
-  {0x10ca0, {1|F|D, {0x10ce0}}},
-  {0x10ca1, {1|F|D, {0x10ce1}}},
-  {0x10ca2, {1|F|D, {0x10ce2}}},
-  {0x10ca3, {1|F|D, {0x10ce3}}},
-  {0x10ca4, {1|F|D, {0x10ce4}}},
-  {0x10ca5, {1|F|D, {0x10ce5}}},
-  {0x10ca6, {1|F|D, {0x10ce6}}},
-  {0x10ca7, {1|F|D, {0x10ce7}}},
-  {0x10ca8, {1|F|D, {0x10ce8}}},
-  {0x10ca9, {1|F|D, {0x10ce9}}},
-  {0x10caa, {1|F|D, {0x10cea}}},
-  {0x10cab, {1|F|D, {0x10ceb}}},
-  {0x10cac, {1|F|D, {0x10cec}}},
-  {0x10cad, {1|F|D, {0x10ced}}},
-  {0x10cae, {1|F|D, {0x10cee}}},
-  {0x10caf, {1|F|D, {0x10cef}}},
-  {0x10cb0, {1|F|D, {0x10cf0}}},
-  {0x10cb1, {1|F|D, {0x10cf1}}},
-  {0x10cb2, {1|F|D, {0x10cf2}}},
-  {0x118a0, {1|F|D, {0x118c0}}},
-  {0x118a1, {1|F|D, {0x118c1}}},
-  {0x118a2, {1|F|D, {0x118c2}}},
-  {0x118a3, {1|F|D, {0x118c3}}},
-  {0x118a4, {1|F|D, {0x118c4}}},
-  {0x118a5, {1|F|D, {0x118c5}}},
-  {0x118a6, {1|F|D, {0x118c6}}},
-  {0x118a7, {1|F|D, {0x118c7}}},
-  {0x118a8, {1|F|D, {0x118c8}}},
-  {0x118a9, {1|F|D, {0x118c9}}},
-  {0x118aa, {1|F|D, {0x118ca}}},
-  {0x118ab, {1|F|D, {0x118cb}}},
-  {0x118ac, {1|F|D, {0x118cc}}},
-  {0x118ad, {1|F|D, {0x118cd}}},
-  {0x118ae, {1|F|D, {0x118ce}}},
-  {0x118af, {1|F|D, {0x118cf}}},
-  {0x118b0, {1|F|D, {0x118d0}}},
-  {0x118b1, {1|F|D, {0x118d1}}},
-  {0x118b2, {1|F|D, {0x118d2}}},
-  {0x118b3, {1|F|D, {0x118d3}}},
-  {0x118b4, {1|F|D, {0x118d4}}},
-  {0x118b5, {1|F|D, {0x118d5}}},
-  {0x118b6, {1|F|D, {0x118d6}}},
-  {0x118b7, {1|F|D, {0x118d7}}},
-  {0x118b8, {1|F|D, {0x118d8}}},
-  {0x118b9, {1|F|D, {0x118d9}}},
-  {0x118ba, {1|F|D, {0x118da}}},
-  {0x118bb, {1|F|D, {0x118db}}},
-  {0x118bc, {1|F|D, {0x118dc}}},
-  {0x118bd, {1|F|D, {0x118dd}}},
-  {0x118be, {1|F|D, {0x118de}}},
-  {0x118bf, {1|F|D, {0x118df}}},
-#define CaseFold_Locale (*(CaseFold_11_Type (*)[2])(CaseFold_11_Table+1319))
-  {0x0049, {1|F|D, {0x0069}}},
-  {0x0130, {2|F|D, {0x0069, 0x0307}}},
-};
-
-/* C code produced by gperf version 3.0.4 */
-/* Command-line: gperf -7 -k1,2,3 -F,-1 -c -j1 -i1 -t -T -E -C -H onigenc_unicode_CaseFold_11_hash -N onigenc_unicode_CaseFold_11_lookup -n  */
-
-/* maximum key range = 2294, duplicates = 0 */
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-/*ARGSUSED*/
-static unsigned int
-onigenc_unicode_CaseFold_11_hash(const OnigCodePoint code)
-{
-  static const unsigned short asso_values[] =
-    {
-         5,  207,    4,  313,    3, 2304,   97,  155,    2,  208,
-       137,    4, 2304, 2304, 2304, 2304, 2304, 2304, 2304, 2304,
-      2304, 2304, 2304, 2304, 2304,   11, 2304, 2304, 2304, 2304,
-      2304, 2304, 2304,  204, 2304, 2304, 2304, 2304, 2304,   17,
-      2304, 2304, 2304, 2304, 2304, 2304, 2304, 2304, 2304,  308,
-      2304, 2304, 2304, 2304, 2304, 2304, 2304, 2304, 2304, 2304,
-        13,   10,  290,    1, 2304, 2304,  275,    3, 2304, 2304,
-      2304, 2304, 2304,  458, 2304, 2304,  163,  595,  210,   39,
-      1658,  461, 1716,  421, 1686,  317,  685,    6,   12,   25,
-      1581,  592, 1645,  241, 1544,  115, 1621,  191, 1530,  272,
-      1605,   70, 1388,   53, 1474,  146, 1454,  367, 1448,  210,
-      1587,  132, 1360,  348, 1347,  101, 1312,   84,  177,  561,
-      1199,  504, 1080,  534,  438,  578,  197,  635, 1371,  611,
-      1363,  758,  670,  726, 1069,  694, 1421,  671, 1440,  736,
-      1519,  788,  556, 1310,  949, 1137, 1433,  926,  546, 1290,
-      1321,  913,  713,  813, 1505,  884,   87, 1273,  651,  515,
-       942, 1043, 1536, 1262,  767,  851,  182, 1223,  168, 1212,
-        97, 1404,   24, 1284,   23, 1006,   11,  832,  332,  989,
-         5, 1098,  259,  969,  225,  955,  278,  868,  237, 1102,
-       142, 1208,   26, 1326,    4, 1330,  100,  624,  208, 1559,
-        19, 1494, 1178, 1614,  674, 1392,  296
-    };
-  return asso_values[bits_of(code, 2)+79] + asso_values[bits_of(code, 1)] + asso_values[bits_of(code, 0)];
-}
-
-#ifdef __GNUC__
-__inline
-#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
-__attribute__ ((__gnu_inline__))
-#endif
-#endif
-static const CodePointList3 *
-onigenc_unicode_CaseFold_11_lookup(const OnigCodePoint code)
-{
-  enum
-    {
-      MIN_CODE_VALUE = 0x41,
-      MAX_CODE_VALUE = 0x118bf,
-      TOTAL_KEYWORDS = 1321,
-      MIN_WORD_LENGTH = 3,
-      MAX_WORD_LENGTH = 3,
-      MIN_HASH_VALUE = 10,
-      MAX_HASH_VALUE = 2303
-    };
-
-  static const short wordlist[] =
-    {
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1,
-      /*0x1ff3*/ 800,
-      /*0x10408*/ 1204,
-      /*0x1f88*/ 720,
-      /*0x0408*/ 305,
-      /*0x0208*/ 194,
-      /*0x0108*/ 61,
-      /*0xab88*/ 1102,
-      /*0x10409*/ 1205,
-      /*0x1f89*/ 721,
-      /*0x0409*/ 306,
-      /*0x10c88*/ 1244,
-      /*0x1e88*/ 598,
-      /*0xab89*/ 1103,
-      /*0x2c08*/ 864,
-      /*0x1e08*/ 534,
-      /*0x1ff9*/ 805,
-      /*0x10c89*/ 1245,
-      -1,
-      /*0x0179*/ 117,
-      /*0x2c09*/ 865,
-      /*0x1040a*/ 1206,
-      /*0x1f8a*/ 722,
-      /*0x040a*/ 307,
-      /*0x020a*/ 195,
-      /*0x010a*/ 62,
-      /*0xab8a*/ 1104,
-      /*0x2c88*/ 922,
-      -1, -1,
-      /*0x10c8a*/ 1246,
-      /*0x1e8a*/ 599,
-      /*0x13f9*/ 525,
-      /*0x2c0a*/ 866,
-      /*0x1e0a*/ 535,
-      /*0x10400*/ 1196,
-      /*0x1f80*/ 712,
-      /*0x0400*/ 297,
-      /*0x0200*/ 190,
-      /*0x0100*/ 57,
-      /*0xab80*/ 1094,
-      -1, -1, -1,
-      /*0x10c80*/ 1236,
-      /*0x1e80*/ 594,
-      /*0x2c8a*/ 923,
-      /*0x2c00*/ 856,
-      /*0x1e00*/ 530,
-      /*0x10418*/ 1220,
-      /*0x1f98*/ 736,
-      /*0x0418*/ 321,
-      /*0x0218*/ 202,
-      /*0x0118*/ 69,
-      /*0xab98*/ 1118,
-      -1, -1, -1,
-      /*0x10c98*/ 1260,
-      /*0x1e98*/ 607,
-      /*0x2c80*/ 918,
-      /*0x2c18*/ 880,
-      /*0x1e18*/ 542,
-      -1, -1, -1,
-      /*0x10416*/ 1218,
-      /*0x1f96*/ 734,
-      /*0x0416*/ 319,
-      /*0x0216*/ 201,
-      /*0x0116*/ 68,
-      /*0xab96*/ 1116,
-      -1,
-      /*0xa780*/ 1050,
-      /*0x2c98*/ 930,
-      /*0x10c96*/ 1258,
-      /*0x1e96*/ 605,
-      -1,
-      /*0x2c16*/ 878,
-      /*0x1e16*/ 541,
-      /*0x10426*/ 1234,
-      /*0x1fa6*/ 750,
-      /*0x0426*/ 335,
-      /*0x0226*/ 209,
-      /*0x0126*/ 76,
-      /*0xaba6*/ 1132,
-      -1,
-      /*0xa798*/ 1059,
-      /*0x004d*/ 11,
-      /*0x10ca6*/ 1274,
-      /*0x1ea6*/ 615,
-      /*0x2c96*/ 929,
-      /*0x2c26*/ 894,
-      /*0x1e26*/ 549,
-      /*0x1fdb*/ 788,
-      -1, -1,
-      /*0x10424*/ 1232,
-      /*0x1fa4*/ 748,
-      /*0x0424*/ 333,
-      /*0x0224*/ 208,
-      /*0x0124*/ 75,
-      /*0xaba4*/ 1130,
-      -1,
-      /*0xa796*/ 1058,
-      /*0x2ca6*/ 937,
-      /*0x10ca4*/ 1272,
-      /*0x1ea4*/ 614,
-      /*0x2c75*/ 915,
-      /*0x2c24*/ 892,
-      /*0x1e24*/ 548,
-      /*0x10410*/ 1212,
-      /*0x1f90*/ 728,
-      /*0x0410*/ 313,
-      /*0x0210*/ 198,
-      /*0x0110*/ 65,
-      /*0xab90*/ 1110,
-      -1,
-      /*0xa7a6*/ 1066,
-      -1,
-      /*0x10c90*/ 1252,
-      /*0x1e90*/ 602,
-      /*0x2ca4*/ 936,
-      /*0x2c10*/ 872,
-      /*0x1e10*/ 538,
-      -1, -1, -1,
-      /*0x10420*/ 1228,
-      /*0x1fa0*/ 744,
-      /*0x0420*/ 329,
-      /*0x0220*/ 206,
-      /*0x0120*/ 73,
-      /*0xaba0*/ 1126,
-      -1,
-      /*0xa7a4*/ 1065,
-      /*0x2c90*/ 926,
-      /*0x10ca0*/ 1268,
-      /*0x1ea0*/ 612,
-      /*0x0508*/ 425,
-      /*0x2c20*/ 888,
-      /*0x1e20*/ 546,
-      /*0x1041a*/ 1222,
-      /*0x1f9a*/ 738,
-      /*0x041a*/ 323,
-      /*0x021a*/ 203,
-      /*0x011a*/ 70,
-      /*0xab9a*/ 1120,
-      -1,
-      /*0xa790*/ 1056,
-      /*0x2c6f*/ 912,
-      /*0x10c9a*/ 1262,
-      /*0x1e9a*/ 609,
-      /*0x2ca0*/ 934,
-      /*0x2c1a*/ 882,
-      /*0x1e1a*/ 543,
-      -1,
-      /*0x0388*/ 235,
-      /*0x050a*/ 426,
-      -1, -1, -1, -1,
-      /*0x0389*/ 236,
-      -1,
-      /*0x1fd9*/ 786,
-      /*0xa7a0*/ 1063,
-      /*0x2c9a*/ 931,
-      -1,
-      /*0x0059*/ 23,
-      /*0x03f9*/ 292,
-      -1,
-      /*0x0500*/ 421,
-      /*0x10427*/ 1235,
-      /*0x1fa7*/ 751,
-      /*0x0427*/ 336,
-      /*0x038a*/ 237,
-      /*0x03f1*/ 288,
-      /*0xaba7*/ 1133,
-      /*0x1fd7*/ 784,
-      /*0xa79a*/ 1060,
-      -1,
-      /*0x10ca7*/ 1275,
-      /*0x0057*/ 21,
-      -1,
-      /*0x2c27*/ 895,
-      /*0x0518*/ 433,
-      /*0x10412*/ 1214,
-      /*0x1f92*/ 730,
-      /*0x0412*/ 315,
-      /*0x0212*/ 199,
-      /*0x0112*/ 66,
-      /*0xab92*/ 1112,
-      -1,
-      /*0x1faf*/ 759,
-      /*0x042f*/ 344,
-      /*0x10c92*/ 1254,
-      /*0x1e92*/ 603,
-      /*0xabaf*/ 1141,
-      /*0x2c12*/ 874,
-      /*0x1e12*/ 539,
-      -1,
-      /*0x10caf*/ 1283,
-      /*0x0516*/ 432,
-      /*0x0398*/ 249,
-      /*0x1ff7*/ 803,
-      /*0x1041e*/ 1226,
-      /*0x1f9e*/ 742,
-      /*0x041e*/ 327,
-      /*0x021e*/ 205,
-      /*0x011e*/ 72,
-      /*0xab9e*/ 1124,
-      /*0x2c92*/ 927,
-      -1, -1,
-      /*0x10c9e*/ 1266,
-      /*0x1e9e*/ 611,
-      /*0x0526*/ 440,
-      /*0x2c1e*/ 886,
-      /*0x1e1e*/ 545,
-      /*0x054d*/ 473,
-      /*0x0396*/ 247,
-      /*0x1fe9*/ 795,
-      -1,
-      /*0xa779*/ 1046,
-      /*0xa792*/ 1057,
-      /*0x00df*/ 56,
-      /*0x00dd*/ 54,
-      -1,
-      /*0x048a*/ 362,
-      -1,
-      /*0x2c9e*/ 933,
-      -1,
-      /*0x2c69*/ 908,
-      /*0x0524*/ 439,
-      /*0x03a6*/ 262,
-      -1,
-      /*0x1040e*/ 1210,
-      /*0x1f8e*/ 726,
-      /*0x040e*/ 311,
-      /*0x020e*/ 197,
-      /*0x010e*/ 64,
-      /*0xab8e*/ 1108,
-      /*0x0480*/ 361,
-      /*0xa79e*/ 1062,
-      /*0x2c6d*/ 910,
-      /*0x10c8e*/ 1250,
-      /*0x1e8e*/ 601,
-      /*0x0510*/ 429,
-      /*0x2c0e*/ 870,
-      /*0x1e0e*/ 537,
-      /*0x03f5*/ 290,
-      /*0x03a4*/ 260,
-      -1, -1, -1,
-      /*0x1fe7*/ 793,
-      /*0x0498*/ 369,
-      /*0x2ced*/ 969,
-      -1, -1, -1,
-      /*0x2c8e*/ 925,
-      -1, -1,
-      /*0x0520*/ 437,
-      /*0x0390*/ 241,
-      /*0x2c67*/ 907,
-      /*0x10414*/ 1216,
-      /*0x1f94*/ 732,
-      /*0x0414*/ 317,
-      /*0x0214*/ 200,
-      /*0x0114*/ 67,
-      /*0xab94*/ 1114,
-      /*0x0496*/ 368,
-      /*0x1feb*/ 797,
-      /*0x2165*/ 818,
-      /*0x10c94*/ 1256,
-      /*0x1e94*/ 604,
-      /*0x051a*/ 434,
-      /*0x2c14*/ 876,
-      /*0x1e14*/ 540,
-      /*0x2161*/ 814,
-      /*0x03a0*/ 257,
-      /*0x10a6*/ 490,
-      -1,
-      /*0x2c6b*/ 909,
-      /*0x10cd*/ 523,
-      /*0x04a6*/ 376,
-      /*0xa726*/ 1010,
-      /*0x00cd*/ 39,
-      /*0x04cd*/ 396,
-      /*0x1f08*/ 660,
-      /*0x2c94*/ 928,
-      -1, -1,
-      /*0x017f*/ 120,
-      /*0x039a*/ 251,
-      /*0x1f09*/ 661,
-      /*0x2ceb*/ 968,
-      /*0x00db*/ 52,
-      /*0x10a4*/ 488,
-      -1, -1,
-      /*0x2c7f*/ 917,
-      /*0x04a4*/ 375,
-      /*0xa724*/ 1009,
-      -1, -1,
-      /*0x1f5f*/ 703,
-      /*0x1f5d*/ 702,
-      /*0x1f0a*/ 662,
-      -1,
-      /*0x10406*/ 1202,
-      /*0x1f86*/ 718,
-      /*0x0406*/ 303,
-      /*0x0206*/ 193,
-      /*0x0106*/ 60,
-      /*0xab86*/ 1100,
-      /*0x0490*/ 365,
-      -1,
-      /*0x0189*/ 126,
-      /*0x10c86*/ 1242,
-      /*0x1e86*/ 597,
-      /*0x0512*/ 430,
-      /*0x2c06*/ 862,
-      /*0x1e06*/ 533,
-      -1,
-      /*0x03a7*/ 263,
-      /*0x1fe3*/ 790,
-      -1, -1,
-      /*0x10a0*/ 484,
-      -1,
-      /*0x018a*/ 127,
-      /*0x01f1*/ 181,
-      /*0x04a0*/ 373,
-      -1,
-      /*0x2c86*/ 921,
-      /*0x1f18*/ 668,
-      /*0x2c63*/ 905,
-      -1,
-      /*0x0392*/ 243,
-      /*0x051e*/ 436,
-      /*0x10422*/ 1230,
-      /*0x1fa2*/ 746,
-      /*0x0422*/ 331,
-      /*0x0222*/ 207,
-      /*0x0122*/ 74,
-      /*0xaba2*/ 1128,
-      /*0x049a*/ 370,
-      /*0xa786*/ 1053,
-      -1,
-      /*0x10ca2*/ 1270,
-      /*0x1ea2*/ 613,
-      /*0x2126*/ 809,
-      /*0x2c22*/ 890,
-      /*0x1e22*/ 547,
-      -1,
-      /*0x03f7*/ 291,
-      -1,
-      /*0x039e*/ 255,
-      /*0x0198*/ 137,
-      /*0x1041c*/ 1224,
-      /*0x1f9c*/ 740,
-      /*0x041c*/ 325,
-      /*0x021c*/ 204,
-      /*0x011c*/ 71,
-      /*0xab9c*/ 1122,
-      /*0x2ca2*/ 935,
-      -1,
-      /*0x00d9*/ 50,
-      /*0x10c9c*/ 1264,
-      /*0x1f4d*/ 695,
-      /*0x050e*/ 428,
-      /*0x2c1c*/ 884,
-      /*0x1e1c*/ 544,
-      /*0x10a7*/ 491,
-      -1,
-      /*0x0196*/ 135,
-      -1, -1,
-      /*0xa7a2*/ 1064,
-      /*0x1f5b*/ 701,
-      -1, -1,
-      /*0x118a6*/ 1293,
-      -1,
-      /*0x2c9c*/ 932,
-      /*0x037f*/ 233,
-      -1, -1,
-      /*0x038e*/ 239,
-      /*0x01a6*/ 144,
-      -1,
-      /*0x0492*/ 366,
-      /*0x01cd*/ 163,
-      /*0x10af*/ 499,
-      -1, -1, -1,
-      /*0xa79c*/ 1061,
-      -1,
-      /*0x118a4*/ 1291,
-      -1,
-      /*0x0514*/ 431,
-      /*0x01db*/ 170,
-      -1, -1, -1,
-      /*0x01a4*/ 143,
-      -1, -1,
-      /*0x216f*/ 828,
-      /*0x049e*/ 372,
-      -1, -1,
-      /*0x10404*/ 1200,
-      /*0x1f84*/ 716,
-      /*0x0404*/ 301,
-      /*0x0204*/ 192,
-      /*0x0104*/ 59,
-      /*0xab84*/ 1098,
-      /*0x0394*/ 245,
-      /*0x0190*/ 131,
-      -1,
-      /*0x10c84*/ 1240,
-      /*0x1e84*/ 596,
-      /*0x1f6f*/ 711,
-      /*0x2c04*/ 860,
-      /*0x1e04*/ 532,
-      -1,
-      /*0x1f1a*/ 670,
-      -1,
-      /*0x118a0*/ 1287,
-      /*0x1fad*/ 757,
-      /*0x042d*/ 342,
-      -1, -1,
-      /*0xabad*/ 1139,
-      -1,
-      /*0x01a0*/ 141,
-      /*0x2c84*/ 920,
-      /*0x10cad*/ 1281,
-      -1,
-      /*0x048e*/ 364,
-      /*0x2c2d*/ 901,
-      /*0x03ff*/ 296,
-      -1, -1,
-      /*0x0506*/ 424,
-      -1, -1, -1,
-      /*0x1f59*/ 700,
-      /*0xa784*/ 1052,
-      -1,
-      /*0x10402*/ 1198,
-      /*0x1f82*/ 714,
-      /*0x0402*/ 299,
-      /*0x0202*/ 191,
-      /*0x0102*/ 58,
-      /*0xab82*/ 1096,
-      -1, -1, -1,
-      /*0x10c82*/ 1238,
-      /*0x1e82*/ 595,
-      /*0x0386*/ 234,
-      /*0x2c02*/ 858,
-      /*0x1e02*/ 531,
-      -1,
-      /*0xa7ad*/ 1071,
-      -1, -1, -1,
-      /*0x0494*/ 367,
-      /*0x01d9*/ 169,
-      -1,
-      /*0x118a7*/ 1294,
-      -1,
-      /*0x0522*/ 438,
-      /*0x2c82*/ 919,
-      /*0x1f2f*/ 681,
-      -1, -1,
-      /*0x01a7*/ 145,
-      -1, -1, -1, -1,
-      /*0x01d7*/ 168,
-      -1, -1, -1,
-      /*0xa782*/ 1051,
-      /*0x2169*/ 822,
-      -1, -1,
-      /*0x118af*/ 1302,
-      /*0x051c*/ 435,
-      /*0x1faa*/ 754,
-      /*0x042a*/ 339,
-      /*0x022a*/ 211,
-      /*0x012a*/ 78,
-      /*0xabaa*/ 1136,
-      /*0x01af*/ 149,
-      -1,
-      /*0x216d*/ 826,
-      /*0x10caa*/ 1278,
-      /*0x1eaa*/ 617,
-      /*0x1f69*/ 705,
-      /*0x2c2a*/ 898,
-      /*0x1e2a*/ 551,
-      -1,
-      /*0x0150*/ 96,
-      /*0x0050*/ 14,
-      /*0x01f7*/ 185,
-      /*0x039c*/ 253,
-      -1,
-      /*0xfb00*/ 1158,
-      /*0x1ed0*/ 636,
-      -1,
-      /*0x1f6d*/ 709,
-      /*0x1e50*/ 570,
-      /*0x2caa*/ 939,
-      -1,
-      /*0x1f0e*/ 666,
-      -1, -1,
-      /*0x2167*/ 820,
-      /*0x1fac*/ 756,
-      /*0x042c*/ 341,
-      /*0x022c*/ 212,
-      /*0x012c*/ 79,
-      /*0xabac*/ 1138,
-      /*0x2cd0*/ 958,
-      -1,
-      /*0xa7aa*/ 1068,
-      /*0x10cac*/ 1280,
-      /*0x1eac*/ 618,
-      /*0x24cd*/ 853,
-      /*0x2c2c*/ 900,
-      /*0x1e2c*/ 552,
-      -1,
-      /*0x0245*/ 223,
-      /*0x0145*/ 90,
-      /*0x0045*/ 4,
-      /*0x10a2*/ 486,
-      /*0x216b*/ 824,
-      /*0x018e*/ 129,
-      /*0xfb16*/ 1168,
-      /*0x04a2*/ 374,
-      /*0xa722*/ 1008,
-      /*0x0504*/ 423,
-      /*0x2cac*/ 940,
-      /*0x013f*/ 87,
-      /*0xabbf*/ 1157,
-      /*0x1fa8*/ 752,
-      /*0x0428*/ 337,
-      /*0x0228*/ 210,
-      /*0x0128*/ 77,
-      /*0xaba8*/ 1134,
-      -1,
-      /*0x1f6b*/ 707,
-      -1,
-      /*0x10ca8*/ 1276,
-      /*0x1ea8*/ 616,
-      /*0xa7ac*/ 1070,
-      /*0x2c28*/ 896,
-      /*0x1e28*/ 550,
-      /*0x049c*/ 371,
-      -1, -1, -1,
-      /*0x1fae*/ 758,
-      /*0x042e*/ 343,
-      /*0x022e*/ 213,
-      /*0x012e*/ 80,
-      /*0xabae*/ 1140,
-      -1,
-      /*0x0194*/ 134,
-      /*0x2ca8*/ 938,
-      /*0x10cae*/ 1282,
-      /*0x1eae*/ 619,
-      /*0xff26*/ 1175,
-      /*0x2c2e*/ 902,
-      /*0x1e2e*/ 553,
-      /*0x1040c*/ 1208,
-      /*0x1f8c*/ 724,
-      /*0x040c*/ 309,
-      /*0x020c*/ 196,
-      /*0x010c*/ 63,
-      /*0xab8c*/ 1106,
-      /*0x0502*/ 422,
-      /*0xa7a8*/ 1067,
-      /*0xa688*/ 998,
-      /*0x10c8c*/ 1248,
-      /*0x1e8c*/ 600,
-      /*0x2cae*/ 941,
-      /*0x2c0c*/ 868,
-      /*0x1e0c*/ 536,
-      /*0xff24*/ 1173,
-      /*0x2163*/ 816,
-      -1, -1, -1, -1,
-      /*0x1fb2*/ 760,
-      -1,
-      /*0x0232*/ 215,
-      /*0x0132*/ 81,
-      /*0xabb2*/ 1144,
-      /*0x2c8c*/ 924,
-      -1,
-      /*0xa68a*/ 999,
-      /*0x10cb2*/ 1286,
-      /*0x1eb2*/ 621,
-      -1, -1,
-      /*0x1e32*/ 555,
-      /*0x1ff6*/ 802,
-      /*0x0476*/ 356,
-      -1,
-      /*0x0176*/ 115,
-      -1,
-      /*0x0186*/ 124,
-      -1, -1,
-      /*0xa680*/ 994,
-      /*0x1ef6*/ 655,
-      -1,
-      /*0x2cb2*/ 943,
-      /*0x1e76*/ 589,
-      /*0x0230*/ 214,
-      /*0x0130*/ 1320,
-      /*0xabb0*/ 1142,
-      /*0x052a*/ 442,
-      /*0x10ad*/ 497,
-      /*0x0345*/ 229,
-      /*0x10cb0*/ 1284,
-      /*0x1eb0*/ 620,
-      -1,
-      /*0xa698*/ 1006,
-      /*0x1e30*/ 554,
-      /*0xa7b2*/ 1074,
-      -1, -1,
-      /*0x0550*/ 476,
-      -1,
-      /*0x118a2*/ 1289,
-      -1,
-      /*0x004f*/ 13,
-      /*0x1f1c*/ 672,
-      -1,
-      /*0x03aa*/ 266,
-      /*0x2cb0*/ 942,
-      /*0x01a2*/ 142,
-      -1, -1,
-      /*0xa696*/ 1005,
-      -1, -1, -1, -1, -1,
-      /*0x03d0*/ 271,
-      /*0x052c*/ 443,
-      /*0x1fba*/ 767,
-      /*0xa7b0*/ 1072,
-      /*0x023a*/ 216,
-      /*0xabb5*/ 1147,
-      /*0xabba*/ 1152,
-      /*0xa650*/ 979,
-      /*0x017d*/ 119,
-      -1,
-      /*0x019c*/ 138,
-      /*0x1eba*/ 625,
-      /*0xff27*/ 1176,
-      /*0x0545*/ 465,
-      /*0x1e3a*/ 559,
-      /*0x10407*/ 1203,
-      /*0x1f87*/ 719,
-      /*0x0407*/ 304,
-      /*0xab73*/ 1081,
-      /*0x0587*/ 483,
-      /*0xab87*/ 1101,
-      /*0x13fd*/ 529,
-      -1,
-      /*0x053f*/ 459,
-      /*0x10c87*/ 1243,
-      /*0x1fb8*/ 765,
-      /*0x2cba*/ 947,
-      /*0x2c07*/ 863,
-      /*0x0528*/ 441,
-      /*0xabb8*/ 1150,
-      -1, -1,
-      /*0xff2f*/ 1184,
-      /*0xab79*/ 1087,
-      /*0x1eb8*/ 624,
-      -1, -1,
-      /*0x1e38*/ 558,
-      /*0x10aa*/ 494,
-      /*0xa690*/ 1002,
-      /*0xab71*/ 1079,
-      -1,
-      /*0x04aa*/ 378,
-      /*0xa72a*/ 1012,
-      /*0x1fc9*/ 777,
-      /*0x052e*/ 444,
-      /*0x03a8*/ 264,
-      /*0x0149*/ 92,
-      /*0x0049*/ 1319,
-      /*0x2cb8*/ 946,
-      -1,
-      /*0x0376*/ 232,
-      /*0x00d0*/ 42,
-      /*0x04d0*/ 397,
-      /*0xa750*/ 1030,
-      -1, -1,
-      /*0x1fb6*/ 763,
-      /*0x1f2d*/ 679,
-      /*0x050c*/ 427,
-      /*0x0136*/ 83,
-      /*0xabb6*/ 1148,
-      -1, -1,
-      /*0x0184*/ 123,
-      -1,
-      /*0x1eb6*/ 623,
-      /*0x1fbc*/ 769,
-      /*0x10ac*/ 496,
-      /*0x1e36*/ 557,
-      /*0xa69a*/ 1007,
-      /*0xabbc*/ 1154,
-      /*0x04ac*/ 379,
-      /*0xa72c*/ 1013,
-      /*0x118ad*/ 1300,
-      -1,
-      /*0x1ebc*/ 626,
-      /*0x038c*/ 238,
-      /*0x0532*/ 446,
-      /*0x1e3c*/ 560,
-      /*0x10c5*/ 521,
-      /*0x2cb6*/ 945,
-      -1,
-      /*0x00c5*/ 31,
-      /*0x04c5*/ 392,
-      -1, -1,
-      /*0xfb14*/ 1166,
-      -1,
-      /*0x1fb4*/ 762,
-      /*0x10bf*/ 515,
-      /*0x2cbc*/ 948,
-      /*0x0134*/ 82,
-      /*0xabb4*/ 1146,
-      /*0xa7b6*/ 1077,
-      /*0x10a8*/ 492,
-      -1, -1,
-      /*0x1eb4*/ 622,
-      /*0x04a8*/ 377,
-      /*0xa728*/ 1011,
-      /*0x1e34*/ 556,
-      /*0x0055*/ 19,
-      -1,
-      /*0x0182*/ 122,
-      -1, -1, -1, -1,
-      /*0x212a*/ 810,
-      -1, -1,
-      /*0x10ae*/ 498,
-      /*0x2cb4*/ 944,
-      /*0xab75*/ 1083,
-      /*0xa692*/ 1003,
-      /*0x04ae*/ 380,
-      /*0xa72e*/ 1014,
-      /*0x054f*/ 475,
-      /*0x1fbe*/ 770,
-      /*0x03b0*/ 268,
-      /*0x023e*/ 219,
-      -1,
-      /*0xabbe*/ 1156,
-      /*0x1f2a*/ 676,
-      -1,
-      /*0xa7b4*/ 1076,
-      -1,
-      /*0x1ebe*/ 627,
-      -1,
-      /*0x048c*/ 363,
-      /*0x1e3e*/ 561,
-      /*0xfb06*/ 1164,
-      -1, -1,
-      /*0x1f50*/ 696,
-      /*0x03cf*/ 270,
-      /*0x0535*/ 449,
-      /*0x053a*/ 454,
-      -1,
-      /*0x118aa*/ 1297,
-      -1, -1,
-      /*0x2cbe*/ 949,
-      /*0x1fca*/ 778,
-      /*0x10b2*/ 502,
-      /*0x024a*/ 226,
-      /*0x014a*/ 93,
-      /*0x004a*/ 8,
-      /*0x04b2*/ 382,
-      /*0xa732*/ 1015,
-      -1, -1,
-      /*0x1eca*/ 633,
-      /*0x1f2c*/ 678,
-      -1,
-      /*0x1e4a*/ 567,
-      -1, -1,
-      /*0x03fd*/ 294,
-      -1,
-      /*0x0538*/ 452,
-      /*0x04f6*/ 416,
-      /*0x1fe2*/ 789,
-      /*0x0462*/ 346,
-      /*0xa68e*/ 1001,
-      /*0x0162*/ 105,
-      -1,
-      /*0x2cca*/ 955,
-      /*0x10b0*/ 500,
-      /*0x118ac*/ 1299,
-      -1,
-      /*0x1ee2*/ 645,
-      /*0x04b0*/ 381,
-      /*0x2c62*/ 904,
-      /*0x1e62*/ 579,
-      /*0x1f3f*/ 689,
-      /*0x01ac*/ 147,
-      -1, -1,
-      /*0x0549*/ 469,
-      /*0x1f28*/ 674,
-      /*0x1fd6*/ 783,
-      /*0xff22*/ 1171,
-      -1,
-      /*0x0156*/ 99,
-      /*0x0056*/ 20,
-      /*0x2ce2*/ 967,
-      /*0x00cf*/ 41,
-      /*0x01c5*/ 158,
-      -1,
-      /*0x1ed6*/ 639,
-      /*0x118bf*/ 1318,
-      /*0x0536*/ 450,
-      /*0x1e56*/ 573,
-      -1,
-      /*0xa694*/ 1004,
-      /*0x118a8*/ 1295,
-      /*0x1f2e*/ 680,
-      /*0x1fec*/ 798,
-      /*0x046c*/ 351,
-      -1,
-      /*0x016c*/ 110,
-      /*0x053c*/ 456,
-      /*0x10b5*/ 505,
-      /*0x10ba*/ 510,
-      /*0x2cd6*/ 961,
-      /*0x00b5*/ 25,
-      /*0x1eec*/ 650,
-      /*0x04ba*/ 386,
-      /*0xa73a*/ 1019,
-      /*0x1e6c*/ 584,
-      /*0x1f0c*/ 664,
-      /*0xa77d*/ 1048,
-      /*0x118ae*/ 1301,
-      /*0x1fcc*/ 780,
-      /*0x2132*/ 812,
-      /*0x024c*/ 227,
-      /*0x014c*/ 94,
-      /*0x004c*/ 10,
-      -1,
-      /*0x01ae*/ 148,
-      /*0xab77*/ 1085,
-      -1,
-      /*0x1ecc*/ 634,
-      /*0x0534*/ 448,
-      -1,
-      /*0x1e4c*/ 568,
-      /*0x10b8*/ 508,
-      -1, -1, -1,
-      /*0x04b8*/ 385,
-      /*0xa738*/ 1018,
-      /*0x0555*/ 481,
-      -1,
-      /*0xfb04*/ 1162,
-      -1, -1,
-      /*0x2ccc*/ 956,
-      -1,
-      /*0xa686*/ 997,
-      -1, -1,
-      /*0x1fc8*/ 776,
-      -1,
-      /*0x0248*/ 225,
-      /*0x118b2*/ 1305,
-      /*0x0048*/ 7,
-      -1,
-      /*0x00c9*/ 35,
-      /*0x04c9*/ 394,
-      /*0x03d5*/ 273,
-      /*0x1ec8*/ 632,
-      /*0x01b2*/ 151,
-      /*0x053e*/ 458,
-      /*0x1e48*/ 566,
-      /*0x1fc4*/ 773,
-      -1,
-      /*0x0244*/ 222,
-      /*0x10b6*/ 506,
-      /*0x0044*/ 3,
-      -1, -1,
-      /*0x04b6*/ 384,
-      /*0xa736*/ 1017,
-      /*0x1ec4*/ 630,
-      /*0x01f6*/ 184,
-      /*0x2cc8*/ 954,
-      /*0x1e44*/ 564,
-      /*0x10bc*/ 512,
-      /*0x118b0*/ 1303,
-      -1,
-      /*0xff2d*/ 1182,
-      /*0x04bc*/ 387,
-      /*0xa73c*/ 1020,
-      /*0xfb02*/ 1160,
-      /*0x0051*/ 15,
-      -1, -1,
-      /*0x054a*/ 470,
-      /*0x2cc4*/ 952,
-      /*0x0241*/ 220,
-      /*0x0141*/ 88,
-      /*0x0041*/ 0,
-      -1,
-      /*0x1fea*/ 796,
-      /*0x046a*/ 350,
-      -1,
-      /*0x016a*/ 109,
-      -1,
-      /*0x1f3a*/ 684,
-      /*0x10b4*/ 504,
-      -1,
-      /*0x01cf*/ 164,
-      /*0x1eea*/ 649,
-      /*0x04b4*/ 383,
-      /*0xa734*/ 1016,
-      /*0x1e6a*/ 583,
-      -1,
-      /*0x1fe8*/ 794,
-      /*0x0468*/ 349,
-      -1,
-      /*0x0168*/ 108,
-      /*0x00d5*/ 47,
-      /*0xa64a*/ 976,
-      /*0x118b5*/ 1308,
-      /*0x118ba*/ 1313,
-      -1,
-      /*0x1ee8*/ 648,
-      /*0xab7f*/ 1093,
-      -1,
-      /*0x1e68*/ 582,
-      /*0x01b5*/ 153,
-      /*0x1f38*/ 682,
-      -1, -1,
-      /*0x03e2*/ 280,
-      /*0x0556*/ 482,
-      -1,
-      /*0x1fe4*/ 791,
-      /*0x0464*/ 347,
-      /*0x10be*/ 514,
-      /*0x0164*/ 106,
-      /*0xa662*/ 988,
-      -1,
-      /*0x04be*/ 388,
-      /*0xa73e*/ 1021,
-      /*0x0187*/ 125,
-      /*0x1ee4*/ 646,
-      /*0x118b8*/ 1311,
-      /*0x2c64*/ 906,
-      /*0x1e64*/ 580,
-      /*0x1f49*/ 691,
-      /*0x24c5*/ 845,
-      -1,
-      /*0x03d6*/ 274,
-      /*0x01b8*/ 155,
-      /*0x0460*/ 345,
-      /*0xff2a*/ 1179,
-      /*0x0160*/ 104,
-      -1, -1,
-      /*0xa656*/ 982,
-      /*0x24bf*/ 839,
-      /*0xa684*/ 996,
-      /*0x1ee0*/ 644,
-      -1,
-      /*0x2c60*/ 903,
-      /*0x1e60*/ 578,
-      /*0x00ca*/ 36,
-      /*0x054c*/ 472,
-      /*0xa74a*/ 1027,
-      /*0x03ec*/ 285,
-      -1, -1,
-      /*0x1f3c*/ 686,
-      -1, -1, -1,
-      /*0xa66c*/ 993,
-      /*0x2ce0*/ 966,
-      /*0x118b6*/ 1309,
-      -1, -1, -1, -1, -1, -1,
-      /*0xff2c*/ 1181,
-      /*0x04e2*/ 406,
-      /*0xa762*/ 1039,
-      /*0x118bc*/ 1315,
-      -1,
-      /*0x1fd2*/ 781,
-      -1,
-      /*0xa64c*/ 977,
-      /*0x0152*/ 97,
-      /*0x0052*/ 16,
-      /*0x01bc*/ 156,
-      /*0x0548*/ 468,
-      -1, -1,
-      /*0x1ed2*/ 637,
-      -1,
-      /*0xa682*/ 995,
-      /*0x1e52*/ 571,
-      -1,
-      /*0x00d6*/ 48,
-      /*0x04d6*/ 400,
-      /*0xa756*/ 1033,
-      -1, -1,
-      /*0x0544*/ 464,
-      /*0x118b4*/ 1307,
-      -1,
-      /*0xff28*/ 1177,
-      -1,
-      /*0x2cd2*/ 959,
-      -1,
-      /*0x1fb7*/ 764,
-      -1, -1, -1,
-      /*0xabb7*/ 1149,
-      /*0xa648*/ 975,
-      /*0x04ec*/ 411,
-      /*0xa76c*/ 1044,
-      /*0x1f3e*/ 688,
-      /*0x0551*/ 477,
-      /*0x01d5*/ 167,
-      /*0x1fab*/ 755,
-      /*0x042b*/ 340,
-      /*0xff2e*/ 1183,
-      -1,
-      /*0xabab*/ 1137,
-      /*0x0541*/ 461,
-      -1,
-      /*0xa644*/ 973,
-      /*0x10cab*/ 1279,
-      -1,
-      /*0x00cc*/ 38,
-      /*0x2c2b*/ 899,
-      /*0xa74c*/ 1028,
-      /*0x118be*/ 1317,
-      -1, -1,
-      /*0x03d1*/ 272,
-      -1,
-      /*0x1fe6*/ 792,
-      /*0x0466*/ 348,
-      -1,
-      /*0x0166*/ 107,
-      /*0x1f4a*/ 692,
-      /*0x046e*/ 352,
-      -1,
-      /*0x016e*/ 111,
-      /*0x2162*/ 815,
-      /*0x1ee6*/ 647,
-      /*0x24cf*/ 855,
-      /*0x03ea*/ 284,
-      /*0x1e66*/ 581,
-      /*0x1eee*/ 651,
-      -1,
-      /*0x2c6e*/ 911,
-      /*0x1e6e*/ 585,
-      /*0xff32*/ 1187,
-      /*0xa66a*/ 992,
-      /*0xa7ab*/ 1069,
-      -1,
-      /*0x00c8*/ 34,
-      -1,
-      /*0xa748*/ 1026,
-      -1,
-      /*0x03e8*/ 283,
-      -1,
-      /*0x01ca*/ 161,
-      -1, -1,
-      /*0x24ba*/ 834,
-      /*0x10c4*/ 520,
-      /*0xa668*/ 991,
-      -1,
-      /*0x00c4*/ 30,
-      -1,
-      /*0xa744*/ 1024,
-      -1, -1,
-      /*0x1fc2*/ 771,
-      -1,
-      /*0xff30*/ 1185,
-      /*0x1f56*/ 699,
-      /*0x0042*/ 1,
-      /*0x216c*/ 825,
-      /*0x03e4*/ 281,
-      /*0x01e2*/ 173,
-      -1,
-      /*0x1ec2*/ 629,
-      -1,
-      /*0x00d1*/ 43,
-      /*0x1e42*/ 563,
-      /*0xa664*/ 989,
-      /*0x24b8*/ 832,
-      /*0x10c1*/ 517,
-      -1, -1,
-      /*0x00c1*/ 27,
-      /*0x04c1*/ 390,
-      /*0x1f6c*/ 708,
-      -1, -1,
-      /*0x03e0*/ 279,
-      /*0x2cc2*/ 951,
-      /*0x04ea*/ 410,
-      /*0xa76a*/ 1043,
-      -1, -1, -1,
-      /*0xa660*/ 987,
-      -1, -1,
-      /*0x24c9*/ 849,
-      -1, -1,
-      /*0x1f4c*/ 694,
-      /*0xff35*/ 1190,
-      /*0xff3a*/ 1195,
-      /*0x04e8*/ 409,
-      /*0xa768*/ 1042,
-      /*0x1ffb*/ 807,
-      /*0x0552*/ 478,
-      /*0x01ec*/ 178,
-      /*0x017b*/ 118,
-      -1,
-      /*0x24b6*/ 830,
-      -1,
-      /*0xa68c*/ 1000,
-      -1, -1, -1, -1, -1, -1,
-      -1,
-      /*0x24bc*/ 836,
-      /*0x13fb*/ 527,
-      -1,
-      /*0x04e4*/ 407,
-      /*0xa764*/ 1040,
-      /*0xff38*/ 1193,
-      /*0x1fa9*/ 753,
-      /*0x0429*/ 338,
-      -1,
-      /*0x1f48*/ 690,
-      /*0xaba9*/ 1135,
-      /*0xa652*/ 980,
-      /*0x0537*/ 451,
-      -1,
-      /*0x10ca9*/ 1277,
-      -1,
-      /*0x0470*/ 353,
-      /*0x2c29*/ 897,
-      /*0x0170*/ 112,
-      /*0x1fda*/ 787,
-      /*0x04e0*/ 405,
-      /*0xa760*/ 1038,
-      /*0x015a*/ 101,
-      /*0x005a*/ 24,
-      /*0x1ef0*/ 652,
-      -1,
-      /*0x2c70*/ 913,
-      /*0x1e70*/ 586,
-      /*0x1eda*/ 641,
-      -1,
-      /*0x1fd8*/ 785,
-      /*0x1e5a*/ 575,
-      /*0x01c8*/ 160,
-      /*0x0158*/ 100,
-      /*0x0058*/ 22,
-      -1,
-      /*0x216a*/ 823,
-      /*0xff36*/ 1191,
-      -1,
-      /*0x1ed8*/ 640,
-      -1,
-      /*0x03ab*/ 267,
-      /*0x1e58*/ 574,
-      /*0x2cda*/ 963,
-      -1,
-      /*0x01c4*/ 157,
-      -1, -1, -1, -1,
-      /*0x2168*/ 821,
-      /*0x1f6a*/ 706,
-      /*0x24be*/ 838,
-      -1,
-      /*0x2cd8*/ 962,
-      -1,
-      /*0x00d2*/ 44,
-      /*0x04d2*/ 398,
-      /*0xa752*/ 1031,
-      /*0x03e6*/ 282,
-      -1,
-      /*0x01d1*/ 165,
-      -1,
-      /*0x03ee*/ 286,
-      -1,
-      /*0x1f68*/ 704,
-      /*0xa666*/ 990,
-      -1, -1,
-      /*0xff34*/ 1189,
-      /*0x2164*/ 817,
-      -1,
-      /*0x0154*/ 98,
-      /*0x0054*/ 18,
-      /*0x01ea*/ 177,
-      -1, -1,
-      /*0x24ca*/ 850,
-      /*0x1ed4*/ 638,
-      /*0x10b7*/ 507,
-      /*0x0542*/ 462,
-      /*0x1e54*/ 572,
-      /*0x024e*/ 228,
-      /*0x014e*/ 95,
-      /*0x004e*/ 12,
-      -1, -1,
-      /*0x2160*/ 813,
-      /*0x01e8*/ 176,
-      /*0x1ece*/ 635,
-      /*0x10ab*/ 495,
-      -1,
-      /*0x1e4e*/ 569,
-      /*0x2cd4*/ 960,
-      /*0x015e*/ 103,
-      -1, -1,
-      /*0x1fc6*/ 774,
-      /*0x03c2*/ 269,
-      /*0x0246*/ 224,
-      /*0x1ede*/ 643,
-      /*0x0046*/ 5,
-      -1,
-      /*0x1e5e*/ 577,
-      /*0x2cce*/ 957,
-      /*0xa642*/ 972,
-      /*0x1ec6*/ 631,
-      -1,
-      /*0x01e4*/ 174,
-      /*0x1e46*/ 565,
-      -1,
-      /*0x0370*/ 230,
-      /*0x04e6*/ 408,
-      /*0xa766*/ 1041,
-      /*0xab76*/ 1084,
-      /*0x2cde*/ 965,
-      /*0x04ee*/ 412,
-      /*0xa76e*/ 1045,
-      /*0x10425*/ 1233,
-      /*0x1fa5*/ 749,
-      /*0x0425*/ 334,
-      /*0x2cc6*/ 953,
-      -1,
-      /*0xaba5*/ 1131,
-      -1,
-      /*0x01e0*/ 172,
-      /*0x1ec0*/ 628,
-      /*0x10ca5*/ 1273,
-      /*0x1fc7*/ 775,
-      /*0x1e40*/ 562,
-      /*0x2c25*/ 893,
-      /*0x0147*/ 91,
-      /*0x0047*/ 6,
-      /*0x1ff2*/ 799,
-      /*0x0472*/ 354,
-      -1,
-      /*0x0172*/ 113,
-      /*0x1ff4*/ 801,
-      /*0x0474*/ 355,
-      /*0x1f52*/ 697,
-      /*0x0174*/ 114,
-      /*0x2cc0*/ 950,
-      /*0x1ef2*/ 653,
-      -1,
-      /*0x2c72*/ 914,
-      /*0x1e72*/ 587,
-      /*0x1ef4*/ 654,
-      /*0x10c2*/ 518,
-      /*0x24cc*/ 852,
-      /*0x1e74*/ 588,
-      /*0x00c2*/ 28,
-      -1,
-      /*0xa742*/ 1023,
-      /*0x10423*/ 1231,
-      /*0x1fa3*/ 747,
-      /*0x0423*/ 332,
-      -1,
-      /*0x2cf2*/ 970,
-      /*0xaba3*/ 1129,
-      -1,
-      /*0x03a9*/ 265,
-      /*0x212b*/ 811,
-      /*0x10ca3*/ 1271,
-      -1,
-      /*0xab7d*/ 1091,
-      /*0x2c23*/ 891,
-      /*0x10421*/ 1229,
-      /*0x1fa1*/ 745,
-      /*0x0421*/ 330,
-      /*0x03f0*/ 287,
-      /*0x1fb3*/ 761,
-      /*0xaba1*/ 1127,
-      -1,
-      /*0x03da*/ 276,
-      /*0xabb3*/ 1145,
-      /*0x10ca1*/ 1269,
-      /*0x1f2b*/ 677,
-      /*0x24c8*/ 848,
-      /*0x2c21*/ 889,
-      /*0x2166*/ 819,
-      /*0xa65a*/ 984,
-      /*0x118b7*/ 1310,
-      /*0xabb1*/ 1143,
-      /*0x216e*/ 827,
-      /*0x03d8*/ 275,
-      -1,
-      /*0x10cb1*/ 1285,
-      -1,
-      /*0x01b7*/ 154,
-      -1,
-      /*0x24c4*/ 844,
-      /*0xa658*/ 983,
-      /*0x118ab*/ 1298,
-      /*0xa77b*/ 1047,
-      /*0x10417*/ 1219,
-      /*0x1f97*/ 735,
-      /*0x0417*/ 320,
-      -1,
-      /*0x1f6e*/ 710,
-      /*0xab97*/ 1117,
-      /*0x047e*/ 360,
-      -1, -1,
-      /*0x10c97*/ 1259,
-      /*0x1e97*/ 606,
-      /*0x0554*/ 480,
-      /*0x2c17*/ 879,
-      /*0xa7b3*/ 1075,
-      /*0x1efe*/ 659,
-      /*0x10a9*/ 493,
-      /*0x2c7e*/ 916,
-      /*0x1e7e*/ 593,
-      -1,
-      /*0x24c1*/ 841,
-      /*0x015c*/ 102,
-      /*0xa7b1*/ 1073,
-      /*0x054e*/ 474,
-      /*0x01e6*/ 175,
-      -1, -1,
-      /*0x1edc*/ 642,
-      /*0x01ee*/ 179,
-      /*0x04f0*/ 413,
-      /*0x1e5c*/ 576,
-      -1,
-      /*0x00da*/ 51,
-      /*0x04da*/ 402,
-      /*0xa75a*/ 1035,
-      /*0x1fb9*/ 766,
-      /*0x0372*/ 231,
-      /*0xa654*/ 981,
-      /*0x0139*/ 84,
-      /*0xabb9*/ 1151,
-      /*0x0546*/ 466,
-      -1,
-      /*0x2cdc*/ 964,
-      /*0x00d8*/ 49,
-      /*0x04d8*/ 401,
-      /*0xa758*/ 1034,
-      -1,
-      /*0x1fc3*/ 772,
-      /*0xa64e*/ 978,
-      /*0x0243*/ 221,
-      /*0x0143*/ 89,
-      /*0x0043*/ 2,
-      /*0x03de*/ 278,
-      -1,
-      /*0x1fbb*/ 768,
-      -1,
-      /*0x023b*/ 217,
-      /*0x013b*/ 85,
-      /*0xabbb*/ 1153,
-      /*0xa65e*/ 986,
-      /*0x0540*/ 460,
-      /*0x1041d*/ 1225,
-      /*0x1f9d*/ 741,
-      /*0x041d*/ 326,
-      -1,
-      /*0xa646*/ 974,
-      /*0xab9d*/ 1123,
-      /*0x1041b*/ 1223,
-      /*0x1f9b*/ 739,
-      /*0x041b*/ 324,
-      /*0x10c9d*/ 1265,
-      /*0x0547*/ 467,
-      /*0xab9b*/ 1121,
-      /*0x2c1d*/ 885,
-      -1, -1,
-      /*0x10c9b*/ 1263,
-      /*0x1e9b*/ 610,
-      -1,
-      /*0x2c1b*/ 883,
-      /*0x03a5*/ 261,
-      -1,
-      /*0x00d4*/ 46,
-      /*0x04d4*/ 399,
-      /*0xa754*/ 1032,
-      /*0xa640*/ 971,
-      -1,
-      /*0x10419*/ 1221,
-      /*0x1f99*/ 737,
-      /*0x0419*/ 322,
-      -1, -1,
-      /*0xab99*/ 1119,
-      /*0x00ce*/ 40,
-      -1,
-      /*0xa74e*/ 1029,
-      /*0x10c99*/ 1261,
-      /*0x1e99*/ 608,
-      /*0x03f4*/ 289,
-      /*0x2c19*/ 881,
-      -1, -1,
-      /*0x1f29*/ 675,
-      -1,
-      /*0x00de*/ 55,
-      /*0x04de*/ 404,
-      /*0xa75e*/ 1037,
-      -1,
-      /*0x1ffa*/ 806,
-      /*0x047a*/ 358,
-      /*0x00c6*/ 32,
-      -1,
-      /*0xa746*/ 1025,
-      /*0x0533*/ 447,
-      -1,
-      /*0x03a3*/ 259,
-      -1,
-      /*0x1efa*/ 657,
-      /*0x118a9*/ 1296,
-      /*0x1fcb*/ 779,
-      /*0x1e7a*/ 591,
-      /*0x0531*/ 445,
-      -1,
-      /*0x004b*/ 9,
-      /*0x13fa*/ 526,
-      /*0x01a9*/ 146,
-      -1,
-      /*0x10c0*/ 516,
-      /*0x03a1*/ 258,
-      /*0x10a5*/ 489,
-      /*0x00c0*/ 26,
-      /*0x04c0*/ 389,
-      /*0xa740*/ 1022,
-      -1,
-      /*0x01f0*/ 180,
-      /*0x023d*/ 218,
-      /*0x013d*/ 86,
-      /*0xabbd*/ 1155,
-      /*0x10c7*/ 522,
-      -1,
-      /*0x24b7*/ 831,
-      /*0x00c7*/ 33,
-      /*0x04c7*/ 393,
-      /*0x10413*/ 1215,
-      /*0x1f93*/ 731,
-      /*0x0413*/ 316,
-      -1,
-      /*0x04f2*/ 414,
-      /*0xab93*/ 1113,
-      -1,
-      /*0x1fd3*/ 782,
-      /*0x04f4*/ 415,
-      /*0x10c93*/ 1255,
-      -1,
-      /*0x0053*/ 17,
-      /*0x2c13*/ 875,
-      /*0x0397*/ 248,
-      /*0x1040f*/ 1211,
-      /*0x1f8f*/ 727,
-      /*0x040f*/ 312,
-      /*0x03fe*/ 295,
-      -1,
-      /*0xab8f*/ 1109,
-      -1,
-      /*0x10a3*/ 487,
-      /*0x1f54*/ 698,
-      /*0x10c8f*/ 1251,
-      -1, -1,
-      /*0x2c0f*/ 871,
-      -1,
-      /*0x0539*/ 453,
-      /*0x03dc*/ 277,
-      /*0x1ff8*/ 804,
-      /*0x0478*/ 357,
-      -1,
-      /*0x0178*/ 116,
-      /*0x10a1*/ 485,
-      -1,
-      /*0xa65c*/ 985,
-      /*0x10b3*/ 503,
-      -1,
-      /*0x1ef8*/ 656,
-      /*0x0543*/ 463,
-      -1,
-      /*0x1e78*/ 590,
-      -1,
-      /*0xff37*/ 1192,
-      /*0x10b1*/ 501,
-      /*0x13f8*/ 524,
-      /*0x053b*/ 455,
-      -1, -1, -1,
-      /*0x1040b*/ 1207,
-      /*0x1f8b*/ 723,
-      /*0x040b*/ 308,
-      -1,
-      /*0xff2b*/ 1180,
-      /*0xab8b*/ 1105,
-      /*0x1041f*/ 1227,
-      /*0x1f9f*/ 743,
-      /*0x041f*/ 328,
-      /*0x10c8b*/ 1247,
-      -1,
-      /*0xab9f*/ 1125,
-      /*0x2c0b*/ 867,
-      -1,
-      /*0x24c2*/ 842,
-      /*0x10c9f*/ 1267,
-      /*0x01de*/ 171,
-      -1,
-      /*0x2c1f*/ 887,
-      /*0x04fe*/ 420,
-      /*0xa77e*/ 1049,
-      -1,
-      /*0x039d*/ 254,
-      -1,
-      /*0x10415*/ 1217,
-      /*0x1f95*/ 733,
-      /*0x0415*/ 318,
-      -1,
-      /*0x039b*/ 252,
-      /*0xab95*/ 1115,
-      /*0x00dc*/ 53,
-      /*0x04dc*/ 403,
-      /*0xa75c*/ 1036,
-      /*0x10c95*/ 1257,
-      /*0x1ffc*/ 808,
-      /*0x047c*/ 359,
-      /*0x2c15*/ 877,
-      /*0x118a5*/ 1292,
-      /*0xa78b*/ 1054,
-      -1,
-      /*0x10411*/ 1213,
-      /*0x1f91*/ 729,
-      /*0x0411*/ 314,
-      /*0x1efc*/ 658,
-      /*0x10b9*/ 509,
-      /*0xab91*/ 1111,
-      /*0x1e7c*/ 592,
-      -1,
-      /*0x0399*/ 250,
-      /*0x10c91*/ 1253,
-      /*0x13fc*/ 528,
-      -1,
-      /*0x2c11*/ 873,
-      /*0x01c7*/ 159,
-      -1, -1,
-      /*0x10c3*/ 519,
-      -1,
-      /*0x01f2*/ 182,
-      /*0x00c3*/ 29,
-      /*0x04c3*/ 391,
-      /*0x054b*/ 471,
-      /*0x01f4*/ 183,
-      /*0x10bb*/ 511,
-      /*0x1040d*/ 1209,
-      /*0x1f8d*/ 725,
-      /*0x040d*/ 310,
-      -1,
-      /*0x03fa*/ 293,
-      /*0xab8d*/ 1107,
-      -1, -1,
-      /*0x118a3*/ 1290,
-      /*0x10c8d*/ 1249,
-      -1,
-      /*0x053d*/ 457,
-      /*0x2c0d*/ 869,
-      /*0x10401*/ 1197,
-      /*0x1f81*/ 713,
-      /*0x0401*/ 298,
-      -1, -1,
-      /*0xab81*/ 1095,
-      -1, -1,
-      /*0x118a1*/ 1288,
-      /*0x10c81*/ 1237,
-      -1,
-      /*0x118b3*/ 1306,
-      /*0x2c01*/ 857,
-      -1, -1,
-      /*0x0553*/ 479,
-      -1, -1,
-      /*0x01b3*/ 152,
-      /*0x118b1*/ 1304,
-      -1, -1, -1, -1, -1,
-      /*0xa78d*/ 1055,
-      /*0x01b1*/ 150,
-      /*0x0393*/ 244,
-      /*0x10405*/ 1201,
-      /*0x1f85*/ 717,
-      /*0x0405*/ 302,
-      -1, -1,
-      /*0xab85*/ 1099,
-      -1, -1, -1,
-      /*0x10c85*/ 1241,
-      -1, -1,
-      /*0x2c05*/ 861,
-      /*0x038f*/ 240,
-      -1,
-      /*0x0197*/ 136,
-      /*0x04fa*/ 418,
-      -1,
-      /*0xff29*/ 1178,
-      /*0x01fe*/ 189,
-      -1, -1, -1, -1, -1,
-      /*0x1f39*/ 683,
-      /*0x00cb*/ 37,
-      /*0x04cb*/ 395,
-      -1, -1,
-      /*0x10403*/ 1199,
-      /*0x1f83*/ 715,
-      /*0x0403*/ 300,
-      /*0x2183*/ 829,
-      -1,
-      /*0xab83*/ 1097,
-      -1,
-      /*0x10bd*/ 513,
-      -1,
-      /*0x10c83*/ 1239,
-      -1,
-      /*0x118b9*/ 1312,
-      /*0x2c03*/ 859,
-      -1,
-      /*0x1f3b*/ 685,
-      /*0x24ce*/ 854,
-      -1, -1, -1, -1, -1, -1,
-      /*0x1f1d*/ 673,
-      -1, -1, -1,
-      /*0x039f*/ 256,
-      /*0x00d3*/ 45,
-      /*0x1f1b*/ 671,
-      -1,
-      /*0x118bb*/ 1314,
-      -1,
-      /*0x24c6*/ 846,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1,
-      /*0x0395*/ 246,
-      /*0x019d*/ 139,
-      -1, -1,
-      /*0x1f19*/ 669,
-      -1, -1,
-      /*0x04f8*/ 417,
-      /*0x24c0*/ 840,
-      -1, -1, -1, -1, -1, -1,
-      -1,
-      /*0x0391*/ 242,
-      -1, -1,
-      /*0x24c7*/ 847,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1,
-      /*0x1f4b*/ 693,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1,
-      /*0x01fa*/ 187,
-      -1,
-      /*0x1f3d*/ 687,
-      -1, -1, -1, -1, -1, -1,
-      -1,
-      /*0xff25*/ 1174,
-      /*0x01cb*/ 162,
-      -1, -1, -1,
-      /*0x04fc*/ 419,
-      -1, -1,
-      /*0x118bd*/ 1316,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1,
-      /*0x1f0f*/ 667,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1,
-      /*0x0193*/ 133,
-      -1, -1, -1, -1, -1,
-      /*0x01d3*/ 166,
-      -1, -1,
-      /*0xff23*/ 1172,
-      -1, -1, -1, -1,
-      /*0x018f*/ 130,
-      -1, -1, -1, -1,
-      /*0xab7b*/ 1089,
-      -1, -1,
-      /*0xff21*/ 1170,
-      -1, -1,
-      /*0xff33*/ 1188,
-      -1, -1,
-      /*0x1f0b*/ 663,
-      /*0x01f8*/ 186,
-      /*0xfb17*/ 1169,
-      -1, -1,
-      /*0xff31*/ 1186,
-      -1, -1,
-      /*0x24b9*/ 833,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1,
-      /*0x24c3*/ 843,
-      /*0xab70*/ 1078,
-      -1,
-      /*0x018b*/ 128,
-      -1, -1, -1,
-      /*0x24bb*/ 835,
-      -1,
-      /*0x019f*/ 140,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1,
-      /*0xff39*/ 1194,
-      /*0x01fc*/ 188,
-      -1, -1, -1, -1, -1, -1,
-      /*0x0191*/ 132,
-      /*0x1f0d*/ 665,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1,
-      /*0x24cb*/ 851,
-      -1, -1, -1, -1, -1, -1,
-      -1,
-      /*0x0181*/ 121,
-      -1, -1, -1, -1, -1,
-      /*0x24bd*/ 837,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1,
-      /*0xab72*/ 1080,
-      -1, -1, -1,
-      /*0xab74*/ 1082,
-      /*0xfb13*/ 1165,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      /*0xab7e*/ 1092,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1,
-      /*0xfb15*/ 1167,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1,
-      /*0xfb01*/ 1159,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1,
-      /*0xfb05*/ 1163,
-      -1, -1, -1, -1, -1, -1,
-      /*0xab7a*/ 1088,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1,
-      /*0xfb03*/ 1161,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1,
-      /*0xab78*/ 1086,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      /*0xab7c*/ 1090
-    };
-
-  if (code <= MAX_CODE_VALUE && code >= MIN_CODE_VALUE)
-    {
-      register int key = onigenc_unicode_CaseFold_11_hash(code);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        {
-          register short s = wordlist[key];
-
-          if (s >= 0 && code1_equal(code, CaseFold_11_Table[s].from))
-            return &CaseFold_11_Table[s].to;
-        }
-    }
-  return 0;
-}
-
-static const CaseUnfold_11_Type CaseUnfold_11_Table[] = {
-#define CaseUnfold_11 (*(CaseUnfold_11_Type (*)[1195])(CaseUnfold_11_Table+0))
-  {0x0061, {1|U, {0x0041}}},
-  {0x0062, {1|U, {0x0042}}},
-  {0x0063, {1|U, {0x0043}}},
-  {0x0064, {1|U, {0x0044}}},
-  {0x0065, {1|U, {0x0045}}},
-  {0x0066, {1|U, {0x0046}}},
-  {0x0067, {1|U, {0x0047}}},
-  {0x0068, {1|U, {0x0048}}},
-  {0x006a, {1|U, {0x004a}}},
-  {0x006b, {2|U, {0x004b, 0x212a}}},
-  {0x006c, {1|U, {0x004c}}},
-  {0x006d, {1|U, {0x004d}}},
-  {0x006e, {1|U, {0x004e}}},
-  {0x006f, {1|U, {0x004f}}},
-  {0x0070, {1|U, {0x0050}}},
-  {0x0071, {1|U, {0x0051}}},
-  {0x0072, {1|U, {0x0052}}},
-  {0x0073, {2|U, {0x0053, 0x017f}}},
-  {0x0074, {1|U, {0x0054}}},
-  {0x0075, {1|U, {0x0055}}},
-  {0x0076, {1|U, {0x0056}}},
-  {0x0077, {1|U, {0x0057}}},
-  {0x0078, {1|U, {0x0058}}},
-  {0x0079, {1|U, {0x0059}}},
-  {0x007a, {1|U, {0x005a}}},
-  {0x00e0, {1|U, {0x00c0}}},
-  {0x00e1, {1|U, {0x00c1}}},
-  {0x00e2, {1|U, {0x00c2}}},
-  {0x00e3, {1|U, {0x00c3}}},
-  {0x00e4, {1|U, {0x00c4}}},
-  {0x00e5, {2|U, {0x00c5, 0x212b}}},
-  {0x00e6, {1|U, {0x00c6}}},
-  {0x00e7, {1|U, {0x00c7}}},
-  {0x00e8, {1|U, {0x00c8}}},
-  {0x00e9, {1|U, {0x00c9}}},
-  {0x00ea, {1|U, {0x00ca}}},
-  {0x00eb, {1|U, {0x00cb}}},
-  {0x00ec, {1|U, {0x00cc}}},
-  {0x00ed, {1|U, {0x00cd}}},
-  {0x00ee, {1|U, {0x00ce}}},
-  {0x00ef, {1|U, {0x00cf}}},
-  {0x00f0, {1|U, {0x00d0}}},
-  {0x00f1, {1|U, {0x00d1}}},
-  {0x00f2, {1|U, {0x00d2}}},
-  {0x00f3, {1|U, {0x00d3}}},
-  {0x00f4, {1|U, {0x00d4}}},
-  {0x00f5, {1|U, {0x00d5}}},
-  {0x00f6, {1|U, {0x00d6}}},
-  {0x00f8, {1|U, {0x00d8}}},
-  {0x00f9, {1|U, {0x00d9}}},
-  {0x00fa, {1|U, {0x00da}}},
-  {0x00fb, {1|U, {0x00db}}},
-  {0x00fc, {1|U, {0x00dc}}},
-  {0x00fd, {1|U, {0x00dd}}},
-  {0x00fe, {1|U, {0x00de}}},
-  {0x00ff, {1|U, {0x0178}}},
-  {0x0101, {1|U, {0x0100}}},
-  {0x0103, {1|U, {0x0102}}},
-  {0x0105, {1|U, {0x0104}}},
-  {0x0107, {1|U, {0x0106}}},
-  {0x0109, {1|U, {0x0108}}},
-  {0x010b, {1|U, {0x010a}}},
-  {0x010d, {1|U, {0x010c}}},
-  {0x010f, {1|U, {0x010e}}},
-  {0x0111, {1|U, {0x0110}}},
-  {0x0113, {1|U, {0x0112}}},
-  {0x0115, {1|U, {0x0114}}},
-  {0x0117, {1|U, {0x0116}}},
-  {0x0119, {1|U, {0x0118}}},
-  {0x011b, {1|U, {0x011a}}},
-  {0x011d, {1|U, {0x011c}}},
-  {0x011f, {1|U, {0x011e}}},
-  {0x0121, {1|U, {0x0120}}},
-  {0x0123, {1|U, {0x0122}}},
-  {0x0125, {1|U, {0x0124}}},
-  {0x0127, {1|U, {0x0126}}},
-  {0x0129, {1|U, {0x0128}}},
-  {0x012b, {1|U, {0x012a}}},
-  {0x012d, {1|U, {0x012c}}},
-  {0x012f, {1|U, {0x012e}}},
-  {0x0133, {1|U, {0x0132}}},
-  {0x0135, {1|U, {0x0134}}},
-  {0x0137, {1|U, {0x0136}}},
-  {0x013a, {1|U, {0x0139}}},
-  {0x013c, {1|U, {0x013b}}},
-  {0x013e, {1|U, {0x013d}}},
-  {0x0140, {1|U, {0x013f}}},
-  {0x0142, {1|U, {0x0141}}},
-  {0x0144, {1|U, {0x0143}}},
-  {0x0146, {1|U, {0x0145}}},
-  {0x0148, {1|U, {0x0147}}},
-  {0x014b, {1|U, {0x014a}}},
-  {0x014d, {1|U, {0x014c}}},
-  {0x014f, {1|U, {0x014e}}},
-  {0x0151, {1|U, {0x0150}}},
-  {0x0153, {1|U, {0x0152}}},
-  {0x0155, {1|U, {0x0154}}},
-  {0x0157, {1|U, {0x0156}}},
-  {0x0159, {1|U, {0x0158}}},
-  {0x015b, {1|U, {0x015a}}},
-  {0x015d, {1|U, {0x015c}}},
-  {0x015f, {1|U, {0x015e}}},
-  {0x0161, {1|U, {0x0160}}},
-  {0x0163, {1|U, {0x0162}}},
-  {0x0165, {1|U, {0x0164}}},
-  {0x0167, {1|U, {0x0166}}},
-  {0x0169, {1|U, {0x0168}}},
-  {0x016b, {1|U, {0x016a}}},
-  {0x016d, {1|U, {0x016c}}},
-  {0x016f, {1|U, {0x016e}}},
-  {0x0171, {1|U, {0x0170}}},
-  {0x0173, {1|U, {0x0172}}},
-  {0x0175, {1|U, {0x0174}}},
-  {0x0177, {1|U, {0x0176}}},
-  {0x017a, {1|U, {0x0179}}},
-  {0x017c, {1|U, {0x017b}}},
-  {0x017e, {1|U, {0x017d}}},
-  {0x0180, {1|U, {0x0243}}},
-  {0x0183, {1|U, {0x0182}}},
-  {0x0185, {1|U, {0x0184}}},
-  {0x0188, {1|U, {0x0187}}},
-  {0x018c, {1|U, {0x018b}}},
-  {0x0192, {1|U, {0x0191}}},
-  {0x0195, {1|U, {0x01f6}}},
-  {0x0199, {1|U, {0x0198}}},
-  {0x019a, {1|U, {0x023d}}},
-  {0x019e, {1|U, {0x0220}}},
-  {0x01a1, {1|U, {0x01a0}}},
-  {0x01a3, {1|U, {0x01a2}}},
-  {0x01a5, {1|U, {0x01a4}}},
-  {0x01a8, {1|U, {0x01a7}}},
-  {0x01ad, {1|U, {0x01ac}}},
-  {0x01b0, {1|U, {0x01af}}},
-  {0x01b4, {1|U, {0x01b3}}},
-  {0x01b6, {1|U, {0x01b5}}},
-  {0x01b9, {1|U, {0x01b8}}},
-  {0x01bd, {1|U, {0x01bc}}},
-  {0x01bf, {1|U, {0x01f7}}},
-  {0x01c6, {2|U|ST, {0x01c4, 0x01c5}}},
-  {0x01c9, {2|U|ST, {0x01c7, 0x01c8}}},
-  {0x01cc, {2|U|ST, {0x01ca, 0x01cb}}},
-  {0x01ce, {1|U, {0x01cd}}},
-  {0x01d0, {1|U, {0x01cf}}},
-  {0x01d2, {1|U, {0x01d1}}},
-  {0x01d4, {1|U, {0x01d3}}},
-  {0x01d6, {1|U, {0x01d5}}},
-  {0x01d8, {1|U, {0x01d7}}},
-  {0x01da, {1|U, {0x01d9}}},
-  {0x01dc, {1|U, {0x01db}}},
-  {0x01dd, {1|U, {0x018e}}},
-  {0x01df, {1|U, {0x01de}}},
-  {0x01e1, {1|U, {0x01e0}}},
-  {0x01e3, {1|U, {0x01e2}}},
-  {0x01e5, {1|U, {0x01e4}}},
-  {0x01e7, {1|U, {0x01e6}}},
-  {0x01e9, {1|U, {0x01e8}}},
-  {0x01eb, {1|U, {0x01ea}}},
-  {0x01ed, {1|U, {0x01ec}}},
-  {0x01ef, {1|U, {0x01ee}}},
-  {0x01f3, {2|U|ST, {0x01f1, 0x01f2}}},
-  {0x01f5, {1|U, {0x01f4}}},
-  {0x01f9, {1|U, {0x01f8}}},
-  {0x01fb, {1|U, {0x01fa}}},
-  {0x01fd, {1|U, {0x01fc}}},
-  {0x01ff, {1|U, {0x01fe}}},
-  {0x0201, {1|U, {0x0200}}},
-  {0x0203, {1|U, {0x0202}}},
-  {0x0205, {1|U, {0x0204}}},
-  {0x0207, {1|U, {0x0206}}},
-  {0x0209, {1|U, {0x0208}}},
-  {0x020b, {1|U, {0x020a}}},
-  {0x020d, {1|U, {0x020c}}},
-  {0x020f, {1|U, {0x020e}}},
-  {0x0211, {1|U, {0x0210}}},
-  {0x0213, {1|U, {0x0212}}},
-  {0x0215, {1|U, {0x0214}}},
-  {0x0217, {1|U, {0x0216}}},
-  {0x0219, {1|U, {0x0218}}},
-  {0x021b, {1|U, {0x021a}}},
-  {0x021d, {1|U, {0x021c}}},
-  {0x021f, {1|U, {0x021e}}},
-  {0x0223, {1|U, {0x0222}}},
-  {0x0225, {1|U, {0x0224}}},
-  {0x0227, {1|U, {0x0226}}},
-  {0x0229, {1|U, {0x0228}}},
-  {0x022b, {1|U, {0x022a}}},
-  {0x022d, {1|U, {0x022c}}},
-  {0x022f, {1|U, {0x022e}}},
-  {0x0231, {1|U, {0x0230}}},
-  {0x0233, {1|U, {0x0232}}},
-  {0x023c, {1|U, {0x023b}}},
-  {0x023f, {1|U, {0x2c7e}}},
-  {0x0240, {1|U, {0x2c7f}}},
-  {0x0242, {1|U, {0x0241}}},
-  {0x0247, {1|U, {0x0246}}},
-  {0x0249, {1|U, {0x0248}}},
-  {0x024b, {1|U, {0x024a}}},
-  {0x024d, {1|U, {0x024c}}},
-  {0x024f, {1|U, {0x024e}}},
-  {0x0250, {1|U, {0x2c6f}}},
-  {0x0251, {1|U, {0x2c6d}}},
-  {0x0252, {1|U, {0x2c70}}},
-  {0x0253, {1|U, {0x0181}}},
-  {0x0254, {1|U, {0x0186}}},
-  {0x0256, {1|U, {0x0189}}},
-  {0x0257, {1|U, {0x018a}}},
-  {0x0259, {1|U, {0x018f}}},
-  {0x025b, {1|U, {0x0190}}},
-  {0x025c, {1|U, {0xa7ab}}},
-  {0x0260, {1|U, {0x0193}}},
-  {0x0261, {1|U, {0xa7ac}}},
-  {0x0263, {1|U, {0x0194}}},
-  {0x0265, {1|U, {0xa78d}}},
-  {0x0266, {1|U, {0xa7aa}}},
-  {0x0268, {1|U, {0x0197}}},
-  {0x0269, {1|U, {0x0196}}},
-  {0x026b, {1|U, {0x2c62}}},
-  {0x026c, {1|U, {0xa7ad}}},
-  {0x026f, {1|U, {0x019c}}},
-  {0x0271, {1|U, {0x2c6e}}},
-  {0x0272, {1|U, {0x019d}}},
-  {0x0275, {1|U, {0x019f}}},
-  {0x027d, {1|U, {0x2c64}}},
-  {0x0280, {1|U, {0x01a6}}},
-  {0x0283, {1|U, {0x01a9}}},
-  {0x0287, {1|U, {0xa7b1}}},
-  {0x0288, {1|U, {0x01ae}}},
-  {0x0289, {1|U, {0x0244}}},
-  {0x028a, {1|U, {0x01b1}}},
-  {0x028b, {1|U, {0x01b2}}},
-  {0x028c, {1|U, {0x0245}}},
-  {0x0292, {1|U, {0x01b7}}},
-  {0x029d, {1|U, {0xa7b2}}},
-  {0x029e, {1|U, {0xa7b0}}},
-  {0x0371, {1|U, {0x0370}}},
-  {0x0373, {1|U, {0x0372}}},
-  {0x0377, {1|U, {0x0376}}},
-  {0x037b, {1|U, {0x03fd}}},
-  {0x037c, {1|U, {0x03fe}}},
-  {0x037d, {1|U, {0x03ff}}},
-  {0x03ac, {1|U, {0x0386}}},
-  {0x03ad, {1|U, {0x0388}}},
-  {0x03ae, {1|U, {0x0389}}},
-  {0x03af, {1|U, {0x038a}}},
-  {0x03b1, {1|U, {0x0391}}},
-  {0x03b2, {2|U, {0x0392, 0x03d0}}},
-  {0x03b3, {1|U, {0x0393}}},
-  {0x03b4, {1|U, {0x0394}}},
-  {0x03b5, {2|U, {0x0395, 0x03f5}}},
-  {0x03b6, {1|U, {0x0396}}},
-  {0x03b7, {1|U, {0x0397}}},
-  {0x03b8, {3|U, {0x0398, 0x03d1, 0x03f4}}},
-  {0x03b9, {3, {0x0345, 0x0399, 0x1fbe}}},
-  {0x03ba, {2|U, {0x039a, 0x03f0}}},
-  {0x03bb, {1|U, {0x039b}}},
-  {0x03bc, {2, {0x00b5, 0x039c}}},
-  {0x03bd, {1|U, {0x039d}}},
-  {0x03be, {1|U, {0x039e}}},
-  {0x03bf, {1|U, {0x039f}}},
-  {0x03c0, {2|U, {0x03a0, 0x03d6}}},
-  {0x03c1, {2|U, {0x03a1, 0x03f1}}},
-  {0x03c3, {2|U, {0x03a3, 0x03c2}}},
-  {0x03c4, {1|U, {0x03a4}}},
-  {0x03c5, {1|U, {0x03a5}}},
-  {0x03c6, {2|U, {0x03a6, 0x03d5}}},
-  {0x03c7, {1|U, {0x03a7}}},
-  {0x03c8, {1|U, {0x03a8}}},
-  {0x03c9, {2|U, {0x03a9, 0x2126}}},
-  {0x03ca, {1|U, {0x03aa}}},
-  {0x03cb, {1|U, {0x03ab}}},
-  {0x03cc, {1|U, {0x038c}}},
-  {0x03cd, {1|U, {0x038e}}},
-  {0x03ce, {1|U, {0x038f}}},
-  {0x03d7, {1|U, {0x03cf}}},
-  {0x03d9, {1|U, {0x03d8}}},
-  {0x03db, {1|U, {0x03da}}},
-  {0x03dd, {1|U, {0x03dc}}},
-  {0x03df, {1|U, {0x03de}}},
-  {0x03e1, {1|U, {0x03e0}}},
-  {0x03e3, {1|U, {0x03e2}}},
-  {0x03e5, {1|U, {0x03e4}}},
-  {0x03e7, {1|U, {0x03e6}}},
-  {0x03e9, {1|U, {0x03e8}}},
-  {0x03eb, {1|U, {0x03ea}}},
-  {0x03ed, {1|U, {0x03ec}}},
-  {0x03ef, {1|U, {0x03ee}}},
-  {0x03f2, {1|U, {0x03f9}}},
-  {0x03f3, {1|U, {0x037f}}},
-  {0x03f8, {1|U, {0x03f7}}},
-  {0x03fb, {1|U, {0x03fa}}},
-  {0x0430, {1|U, {0x0410}}},
-  {0x0431, {1|U, {0x0411}}},
-  {0x0432, {1|U, {0x0412}}},
-  {0x0433, {1|U, {0x0413}}},
-  {0x0434, {1|U, {0x0414}}},
-  {0x0435, {1|U, {0x0415}}},
-  {0x0436, {1|U, {0x0416}}},
-  {0x0437, {1|U, {0x0417}}},
-  {0x0438, {1|U, {0x0418}}},
-  {0x0439, {1|U, {0x0419}}},
-  {0x043a, {1|U, {0x041a}}},
-  {0x043b, {1|U, {0x041b}}},
-  {0x043c, {1|U, {0x041c}}},
-  {0x043d, {1|U, {0x041d}}},
-  {0x043e, {1|U, {0x041e}}},
-  {0x043f, {1|U, {0x041f}}},
-  {0x0440, {1|U, {0x0420}}},
-  {0x0441, {1|U, {0x0421}}},
-  {0x0442, {1|U, {0x0422}}},
-  {0x0443, {1|U, {0x0423}}},
-  {0x0444, {1|U, {0x0424}}},
-  {0x0445, {1|U, {0x0425}}},
-  {0x0446, {1|U, {0x0426}}},
-  {0x0447, {1|U, {0x0427}}},
-  {0x0448, {1|U, {0x0428}}},
-  {0x0449, {1|U, {0x0429}}},
-  {0x044a, {1|U, {0x042a}}},
-  {0x044b, {1|U, {0x042b}}},
-  {0x044c, {1|U, {0x042c}}},
-  {0x044d, {1|U, {0x042d}}},
-  {0x044e, {1|U, {0x042e}}},
-  {0x044f, {1|U, {0x042f}}},
-  {0x0450, {1|U, {0x0400}}},
-  {0x0451, {1|U, {0x0401}}},
-  {0x0452, {1|U, {0x0402}}},
-  {0x0453, {1|U, {0x0403}}},
-  {0x0454, {1|U, {0x0404}}},
-  {0x0455, {1|U, {0x0405}}},
-  {0x0456, {1|U, {0x0406}}},
-  {0x0457, {1|U, {0x0407}}},
-  {0x0458, {1|U, {0x0408}}},
-  {0x0459, {1|U, {0x0409}}},
-  {0x045a, {1|U, {0x040a}}},
-  {0x045b, {1|U, {0x040b}}},
-  {0x045c, {1|U, {0x040c}}},
-  {0x045d, {1|U, {0x040d}}},
-  {0x045e, {1|U, {0x040e}}},
-  {0x045f, {1|U, {0x040f}}},
-  {0x0461, {1|U, {0x0460}}},
-  {0x0463, {1|U, {0x0462}}},
-  {0x0465, {1|U, {0x0464}}},
-  {0x0467, {1|U, {0x0466}}},
-  {0x0469, {1|U, {0x0468}}},
-  {0x046b, {1|U, {0x046a}}},
-  {0x046d, {1|U, {0x046c}}},
-  {0x046f, {1|U, {0x046e}}},
-  {0x0471, {1|U, {0x0470}}},
-  {0x0473, {1|U, {0x0472}}},
-  {0x0475, {1|U, {0x0474}}},
-  {0x0477, {1|U, {0x0476}}},
-  {0x0479, {1|U, {0x0478}}},
-  {0x047b, {1|U, {0x047a}}},
-  {0x047d, {1|U, {0x047c}}},
-  {0x047f, {1|U, {0x047e}}},
-  {0x0481, {1|U, {0x0480}}},
-  {0x048b, {1|U, {0x048a}}},
-  {0x048d, {1|U, {0x048c}}},
-  {0x048f, {1|U, {0x048e}}},
-  {0x0491, {1|U, {0x0490}}},
-  {0x0493, {1|U, {0x0492}}},
-  {0x0495, {1|U, {0x0494}}},
-  {0x0497, {1|U, {0x0496}}},
-  {0x0499, {1|U, {0x0498}}},
-  {0x049b, {1|U, {0x049a}}},
-  {0x049d, {1|U, {0x049c}}},
-  {0x049f, {1|U, {0x049e}}},
-  {0x04a1, {1|U, {0x04a0}}},
-  {0x04a3, {1|U, {0x04a2}}},
-  {0x04a5, {1|U, {0x04a4}}},
-  {0x04a7, {1|U, {0x04a6}}},
-  {0x04a9, {1|U, {0x04a8}}},
-  {0x04ab, {1|U, {0x04aa}}},
-  {0x04ad, {1|U, {0x04ac}}},
-  {0x04af, {1|U, {0x04ae}}},
-  {0x04b1, {1|U, {0x04b0}}},
-  {0x04b3, {1|U, {0x04b2}}},
-  {0x04b5, {1|U, {0x04b4}}},
-  {0x04b7, {1|U, {0x04b6}}},
-  {0x04b9, {1|U, {0x04b8}}},
-  {0x04bb, {1|U, {0x04ba}}},
-  {0x04bd, {1|U, {0x04bc}}},
-  {0x04bf, {1|U, {0x04be}}},
-  {0x04c2, {1|U, {0x04c1}}},
-  {0x04c4, {1|U, {0x04c3}}},
-  {0x04c6, {1|U, {0x04c5}}},
-  {0x04c8, {1|U, {0x04c7}}},
-  {0x04ca, {1|U, {0x04c9}}},
-  {0x04cc, {1|U, {0x04cb}}},
-  {0x04ce, {1|U, {0x04cd}}},
-  {0x04cf, {1|U, {0x04c0}}},
-  {0x04d1, {1|U, {0x04d0}}},
-  {0x04d3, {1|U, {0x04d2}}},
-  {0x04d5, {1|U, {0x04d4}}},
-  {0x04d7, {1|U, {0x04d6}}},
-  {0x04d9, {1|U, {0x04d8}}},
-  {0x04db, {1|U, {0x04da}}},
-  {0x04dd, {1|U, {0x04dc}}},
-  {0x04df, {1|U, {0x04de}}},
-  {0x04e1, {1|U, {0x04e0}}},
-  {0x04e3, {1|U, {0x04e2}}},
-  {0x04e5, {1|U, {0x04e4}}},
-  {0x04e7, {1|U, {0x04e6}}},
-  {0x04e9, {1|U, {0x04e8}}},
-  {0x04eb, {1|U, {0x04ea}}},
-  {0x04ed, {1|U, {0x04ec}}},
-  {0x04ef, {1|U, {0x04ee}}},
-  {0x04f1, {1|U, {0x04f0}}},
-  {0x04f3, {1|U, {0x04f2}}},
-  {0x04f5, {1|U, {0x04f4}}},
-  {0x04f7, {1|U, {0x04f6}}},
-  {0x04f9, {1|U, {0x04f8}}},
-  {0x04fb, {1|U, {0x04fa}}},
-  {0x04fd, {1|U, {0x04fc}}},
-  {0x04ff, {1|U, {0x04fe}}},
-  {0x0501, {1|U, {0x0500}}},
-  {0x0503, {1|U, {0x0502}}},
-  {0x0505, {1|U, {0x0504}}},
-  {0x0507, {1|U, {0x0506}}},
-  {0x0509, {1|U, {0x0508}}},
-  {0x050b, {1|U, {0x050a}}},
-  {0x050d, {1|U, {0x050c}}},
-  {0x050f, {1|U, {0x050e}}},
-  {0x0511, {1|U, {0x0510}}},
-  {0x0513, {1|U, {0x0512}}},
-  {0x0515, {1|U, {0x0514}}},
-  {0x0517, {1|U, {0x0516}}},
-  {0x0519, {1|U, {0x0518}}},
-  {0x051b, {1|U, {0x051a}}},
-  {0x051d, {1|U, {0x051c}}},
-  {0x051f, {1|U, {0x051e}}},
-  {0x0521, {1|U, {0x0520}}},
-  {0x0523, {1|U, {0x0522}}},
-  {0x0525, {1|U, {0x0524}}},
-  {0x0527, {1|U, {0x0526}}},
-  {0x0529, {1|U, {0x0528}}},
-  {0x052b, {1|U, {0x052a}}},
-  {0x052d, {1|U, {0x052c}}},
-  {0x052f, {1|U, {0x052e}}},
-  {0x0561, {1|U, {0x0531}}},
-  {0x0562, {1|U, {0x0532}}},
-  {0x0563, {1|U, {0x0533}}},
-  {0x0564, {1|U, {0x0534}}},
-  {0x0565, {1|U, {0x0535}}},
-  {0x0566, {1|U, {0x0536}}},
-  {0x0567, {1|U, {0x0537}}},
-  {0x0568, {1|U, {0x0538}}},
-  {0x0569, {1|U, {0x0539}}},
-  {0x056a, {1|U, {0x053a}}},
-  {0x056b, {1|U, {0x053b}}},
-  {0x056c, {1|U, {0x053c}}},
-  {0x056d, {1|U, {0x053d}}},
-  {0x056e, {1|U, {0x053e}}},
-  {0x056f, {1|U, {0x053f}}},
-  {0x0570, {1|U, {0x0540}}},
-  {0x0571, {1|U, {0x0541}}},
-  {0x0572, {1|U, {0x0542}}},
-  {0x0573, {1|U, {0x0543}}},
-  {0x0574, {1|U, {0x0544}}},
-  {0x0575, {1|U, {0x0545}}},
-  {0x0576, {1|U, {0x0546}}},
-  {0x0577, {1|U, {0x0547}}},
-  {0x0578, {1|U, {0x0548}}},
-  {0x0579, {1|U, {0x0549}}},
-  {0x057a, {1|U, {0x054a}}},
-  {0x057b, {1|U, {0x054b}}},
-  {0x057c, {1|U, {0x054c}}},
-  {0x057d, {1|U, {0x054d}}},
-  {0x057e, {1|U, {0x054e}}},
-  {0x057f, {1|U, {0x054f}}},
-  {0x0580, {1|U, {0x0550}}},
-  {0x0581, {1|U, {0x0551}}},
-  {0x0582, {1|U, {0x0552}}},
-  {0x0583, {1|U, {0x0553}}},
-  {0x0584, {1|U, {0x0554}}},
-  {0x0585, {1|U, {0x0555}}},
-  {0x0586, {1|U, {0x0556}}},
-  {0x13a0, {1|D, {0xab70}}},
-  {0x13a1, {1|D, {0xab71}}},
-  {0x13a2, {1|D, {0xab72}}},
-  {0x13a3, {1|D, {0xab73}}},
-  {0x13a4, {1|D, {0xab74}}},
-  {0x13a5, {1|D, {0xab75}}},
-  {0x13a6, {1|D, {0xab76}}},
-  {0x13a7, {1|D, {0xab77}}},
-  {0x13a8, {1|D, {0xab78}}},
-  {0x13a9, {1|D, {0xab79}}},
-  {0x13aa, {1|D, {0xab7a}}},
-  {0x13ab, {1|D, {0xab7b}}},
-  {0x13ac, {1|D, {0xab7c}}},
-  {0x13ad, {1|D, {0xab7d}}},
-  {0x13ae, {1|D, {0xab7e}}},
-  {0x13af, {1|D, {0xab7f}}},
-  {0x13b0, {1|D, {0xab80}}},
-  {0x13b1, {1|D, {0xab81}}},
-  {0x13b2, {1|D, {0xab82}}},
-  {0x13b3, {1|D, {0xab83}}},
-  {0x13b4, {1|D, {0xab84}}},
-  {0x13b5, {1|D, {0xab85}}},
-  {0x13b6, {1|D, {0xab86}}},
-  {0x13b7, {1|D, {0xab87}}},
-  {0x13b8, {1|D, {0xab88}}},
-  {0x13b9, {1|D, {0xab89}}},
-  {0x13ba, {1|D, {0xab8a}}},
-  {0x13bb, {1|D, {0xab8b}}},
-  {0x13bc, {1|D, {0xab8c}}},
-  {0x13bd, {1|D, {0xab8d}}},
-  {0x13be, {1|D, {0xab8e}}},
-  {0x13bf, {1|D, {0xab8f}}},
-  {0x13c0, {1|D, {0xab90}}},
-  {0x13c1, {1|D, {0xab91}}},
-  {0x13c2, {1|D, {0xab92}}},
-  {0x13c3, {1|D, {0xab93}}},
-  {0x13c4, {1|D, {0xab94}}},
-  {0x13c5, {1|D, {0xab95}}},
-  {0x13c6, {1|D, {0xab96}}},
-  {0x13c7, {1|D, {0xab97}}},
-  {0x13c8, {1|D, {0xab98}}},
-  {0x13c9, {1|D, {0xab99}}},
-  {0x13ca, {1|D, {0xab9a}}},
-  {0x13cb, {1|D, {0xab9b}}},
-  {0x13cc, {1|D, {0xab9c}}},
-  {0x13cd, {1|D, {0xab9d}}},
-  {0x13ce, {1|D, {0xab9e}}},
-  {0x13cf, {1|D, {0xab9f}}},
-  {0x13d0, {1|D, {0xaba0}}},
-  {0x13d1, {1|D, {0xaba1}}},
-  {0x13d2, {1|D, {0xaba2}}},
-  {0x13d3, {1|D, {0xaba3}}},
-  {0x13d4, {1|D, {0xaba4}}},
-  {0x13d5, {1|D, {0xaba5}}},
-  {0x13d6, {1|D, {0xaba6}}},
-  {0x13d7, {1|D, {0xaba7}}},
-  {0x13d8, {1|D, {0xaba8}}},
-  {0x13d9, {1|D, {0xaba9}}},
-  {0x13da, {1|D, {0xabaa}}},
-  {0x13db, {1|D, {0xabab}}},
-  {0x13dc, {1|D, {0xabac}}},
-  {0x13dd, {1|D, {0xabad}}},
-  {0x13de, {1|D, {0xabae}}},
-  {0x13df, {1|D, {0xabaf}}},
-  {0x13e0, {1|D, {0xabb0}}},
-  {0x13e1, {1|D, {0xabb1}}},
-  {0x13e2, {1|D, {0xabb2}}},
-  {0x13e3, {1|D, {0xabb3}}},
-  {0x13e4, {1|D, {0xabb4}}},
-  {0x13e5, {1|D, {0xabb5}}},
-  {0x13e6, {1|D, {0xabb6}}},
-  {0x13e7, {1|D, {0xabb7}}},
-  {0x13e8, {1|D, {0xabb8}}},
-  {0x13e9, {1|D, {0xabb9}}},
-  {0x13ea, {1|D, {0xabba}}},
-  {0x13eb, {1|D, {0xabbb}}},
-  {0x13ec, {1|D, {0xabbc}}},
-  {0x13ed, {1|D, {0xabbd}}},
-  {0x13ee, {1|D, {0xabbe}}},
-  {0x13ef, {1|D, {0xabbf}}},
-  {0x13f0, {1|D, {0x13f8}}},
-  {0x13f1, {1|D, {0x13f9}}},
-  {0x13f2, {1|D, {0x13fa}}},
-  {0x13f3, {1|D, {0x13fb}}},
-  {0x13f4, {1|D, {0x13fc}}},
-  {0x13f5, {1|D, {0x13fd}}},
-  {0x1d79, {1|U, {0xa77d}}},
-  {0x1d7d, {1|U, {0x2c63}}},
-  {0x1e01, {1|U, {0x1e00}}},
-  {0x1e03, {1|U, {0x1e02}}},
-  {0x1e05, {1|U, {0x1e04}}},
-  {0x1e07, {1|U, {0x1e06}}},
-  {0x1e09, {1|U, {0x1e08}}},
-  {0x1e0b, {1|U, {0x1e0a}}},
-  {0x1e0d, {1|U, {0x1e0c}}},
-  {0x1e0f, {1|U, {0x1e0e}}},
-  {0x1e11, {1|U, {0x1e10}}},
-  {0x1e13, {1|U, {0x1e12}}},
-  {0x1e15, {1|U, {0x1e14}}},
-  {0x1e17, {1|U, {0x1e16}}},
-  {0x1e19, {1|U, {0x1e18}}},
-  {0x1e1b, {1|U, {0x1e1a}}},
-  {0x1e1d, {1|U, {0x1e1c}}},
-  {0x1e1f, {1|U, {0x1e1e}}},
-  {0x1e21, {1|U, {0x1e20}}},
-  {0x1e23, {1|U, {0x1e22}}},
-  {0x1e25, {1|U, {0x1e24}}},
-  {0x1e27, {1|U, {0x1e26}}},
-  {0x1e29, {1|U, {0x1e28}}},
-  {0x1e2b, {1|U, {0x1e2a}}},
-  {0x1e2d, {1|U, {0x1e2c}}},
-  {0x1e2f, {1|U, {0x1e2e}}},
-  {0x1e31, {1|U, {0x1e30}}},
-  {0x1e33, {1|U, {0x1e32}}},
-  {0x1e35, {1|U, {0x1e34}}},
-  {0x1e37, {1|U, {0x1e36}}},
-  {0x1e39, {1|U, {0x1e38}}},
-  {0x1e3b, {1|U, {0x1e3a}}},
-  {0x1e3d, {1|U, {0x1e3c}}},
-  {0x1e3f, {1|U, {0x1e3e}}},
-  {0x1e41, {1|U, {0x1e40}}},
-  {0x1e43, {1|U, {0x1e42}}},
-  {0x1e45, {1|U, {0x1e44}}},
-  {0x1e47, {1|U, {0x1e46}}},
-  {0x1e49, {1|U, {0x1e48}}},
-  {0x1e4b, {1|U, {0x1e4a}}},
-  {0x1e4d, {1|U, {0x1e4c}}},
-  {0x1e4f, {1|U, {0x1e4e}}},
-  {0x1e51, {1|U, {0x1e50}}},
-  {0x1e53, {1|U, {0x1e52}}},
-  {0x1e55, {1|U, {0x1e54}}},
-  {0x1e57, {1|U, {0x1e56}}},
-  {0x1e59, {1|U, {0x1e58}}},
-  {0x1e5b, {1|U, {0x1e5a}}},
-  {0x1e5d, {1|U, {0x1e5c}}},
-  {0x1e5f, {1|U, {0x1e5e}}},
-  {0x1e61, {2|U, {0x1e60, 0x1e9b}}},
-  {0x1e63, {1|U, {0x1e62}}},
-  {0x1e65, {1|U, {0x1e64}}},
-  {0x1e67, {1|U, {0x1e66}}},
-  {0x1e69, {1|U, {0x1e68}}},
-  {0x1e6b, {1|U, {0x1e6a}}},
-  {0x1e6d, {1|U, {0x1e6c}}},
-  {0x1e6f, {1|U, {0x1e6e}}},
-  {0x1e71, {1|U, {0x1e70}}},
-  {0x1e73, {1|U, {0x1e72}}},
-  {0x1e75, {1|U, {0x1e74}}},
-  {0x1e77, {1|U, {0x1e76}}},
-  {0x1e79, {1|U, {0x1e78}}},
-  {0x1e7b, {1|U, {0x1e7a}}},
-  {0x1e7d, {1|U, {0x1e7c}}},
-  {0x1e7f, {1|U, {0x1e7e}}},
-  {0x1e81, {1|U, {0x1e80}}},
-  {0x1e83, {1|U, {0x1e82}}},
-  {0x1e85, {1|U, {0x1e84}}},
-  {0x1e87, {1|U, {0x1e86}}},
-  {0x1e89, {1|U, {0x1e88}}},
-  {0x1e8b, {1|U, {0x1e8a}}},
-  {0x1e8d, {1|U, {0x1e8c}}},
-  {0x1e8f, {1|U, {0x1e8e}}},
-  {0x1e91, {1|U, {0x1e90}}},
-  {0x1e93, {1|U, {0x1e92}}},
-  {0x1e95, {1|U, {0x1e94}}},
-  {0x1ea1, {1|U, {0x1ea0}}},
-  {0x1ea3, {1|U, {0x1ea2}}},
-  {0x1ea5, {1|U, {0x1ea4}}},
-  {0x1ea7, {1|U, {0x1ea6}}},
-  {0x1ea9, {1|U, {0x1ea8}}},
-  {0x1eab, {1|U, {0x1eaa}}},
-  {0x1ead, {1|U, {0x1eac}}},
-  {0x1eaf, {1|U, {0x1eae}}},
-  {0x1eb1, {1|U, {0x1eb0}}},
-  {0x1eb3, {1|U, {0x1eb2}}},
-  {0x1eb5, {1|U, {0x1eb4}}},
-  {0x1eb7, {1|U, {0x1eb6}}},
-  {0x1eb9, {1|U, {0x1eb8}}},
-  {0x1ebb, {1|U, {0x1eba}}},
-  {0x1ebd, {1|U, {0x1ebc}}},
-  {0x1ebf, {1|U, {0x1ebe}}},
-  {0x1ec1, {1|U, {0x1ec0}}},
-  {0x1ec3, {1|U, {0x1ec2}}},
-  {0x1ec5, {1|U, {0x1ec4}}},
-  {0x1ec7, {1|U, {0x1ec6}}},
-  {0x1ec9, {1|U, {0x1ec8}}},
-  {0x1ecb, {1|U, {0x1eca}}},
-  {0x1ecd, {1|U, {0x1ecc}}},
-  {0x1ecf, {1|U, {0x1ece}}},
-  {0x1ed1, {1|U, {0x1ed0}}},
-  {0x1ed3, {1|U, {0x1ed2}}},
-  {0x1ed5, {1|U, {0x1ed4}}},
-  {0x1ed7, {1|U, {0x1ed6}}},
-  {0x1ed9, {1|U, {0x1ed8}}},
-  {0x1edb, {1|U, {0x1eda}}},
-  {0x1edd, {1|U, {0x1edc}}},
-  {0x1edf, {1|U, {0x1ede}}},
-  {0x1ee1, {1|U, {0x1ee0}}},
-  {0x1ee3, {1|U, {0x1ee2}}},
-  {0x1ee5, {1|U, {0x1ee4}}},
-  {0x1ee7, {1|U, {0x1ee6}}},
-  {0x1ee9, {1|U, {0x1ee8}}},
-  {0x1eeb, {1|U, {0x1eea}}},
-  {0x1eed, {1|U, {0x1eec}}},
-  {0x1eef, {1|U, {0x1eee}}},
-  {0x1ef1, {1|U, {0x1ef0}}},
-  {0x1ef3, {1|U, {0x1ef2}}},
-  {0x1ef5, {1|U, {0x1ef4}}},
-  {0x1ef7, {1|U, {0x1ef6}}},
-  {0x1ef9, {1|U, {0x1ef8}}},
-  {0x1efb, {1|U, {0x1efa}}},
-  {0x1efd, {1|U, {0x1efc}}},
-  {0x1eff, {1|U, {0x1efe}}},
-  {0x1f00, {1|U, {0x1f08}}},
-  {0x1f01, {1|U, {0x1f09}}},
-  {0x1f02, {1|U, {0x1f0a}}},
-  {0x1f03, {1|U, {0x1f0b}}},
-  {0x1f04, {1|U, {0x1f0c}}},
-  {0x1f05, {1|U, {0x1f0d}}},
-  {0x1f06, {1|U, {0x1f0e}}},
-  {0x1f07, {1|U, {0x1f0f}}},
-  {0x1f10, {1|U, {0x1f18}}},
-  {0x1f11, {1|U, {0x1f19}}},
-  {0x1f12, {1|U, {0x1f1a}}},
-  {0x1f13, {1|U, {0x1f1b}}},
-  {0x1f14, {1|U, {0x1f1c}}},
-  {0x1f15, {1|U, {0x1f1d}}},
-  {0x1f20, {1|U, {0x1f28}}},
-  {0x1f21, {1|U, {0x1f29}}},
-  {0x1f22, {1|U, {0x1f2a}}},
-  {0x1f23, {1|U, {0x1f2b}}},
-  {0x1f24, {1|U, {0x1f2c}}},
-  {0x1f25, {1|U, {0x1f2d}}},
-  {0x1f26, {1|U, {0x1f2e}}},
-  {0x1f27, {1|U, {0x1f2f}}},
-  {0x1f30, {1|U, {0x1f38}}},
-  {0x1f31, {1|U, {0x1f39}}},
-  {0x1f32, {1|U, {0x1f3a}}},
-  {0x1f33, {1|U, {0x1f3b}}},
-  {0x1f34, {1|U, {0x1f3c}}},
-  {0x1f35, {1|U, {0x1f3d}}},
-  {0x1f36, {1|U, {0x1f3e}}},
-  {0x1f37, {1|U, {0x1f3f}}},
-  {0x1f40, {1|U, {0x1f48}}},
-  {0x1f41, {1|U, {0x1f49}}},
-  {0x1f42, {1|U, {0x1f4a}}},
-  {0x1f43, {1|U, {0x1f4b}}},
-  {0x1f44, {1|U, {0x1f4c}}},
-  {0x1f45, {1|U, {0x1f4d}}},
-  {0x1f51, {1|U, {0x1f59}}},
-  {0x1f53, {1|U, {0x1f5b}}},
-  {0x1f55, {1|U, {0x1f5d}}},
-  {0x1f57, {1|U, {0x1f5f}}},
-  {0x1f60, {1|U, {0x1f68}}},
-  {0x1f61, {1|U, {0x1f69}}},
-  {0x1f62, {1|U, {0x1f6a}}},
-  {0x1f63, {1|U, {0x1f6b}}},
-  {0x1f64, {1|U, {0x1f6c}}},
-  {0x1f65, {1|U, {0x1f6d}}},
-  {0x1f66, {1|U, {0x1f6e}}},
-  {0x1f67, {1|U, {0x1f6f}}},
-  {0x1f70, {1|U, {0x1fba}}},
-  {0x1f71, {1|U, {0x1fbb}}},
-  {0x1f72, {1|U, {0x1fc8}}},
-  {0x1f73, {1|U, {0x1fc9}}},
-  {0x1f74, {1|U, {0x1fca}}},
-  {0x1f75, {1|U, {0x1fcb}}},
-  {0x1f76, {1|U, {0x1fda}}},
-  {0x1f77, {1|U, {0x1fdb}}},
-  {0x1f78, {1|U, {0x1ff8}}},
-  {0x1f79, {1|U, {0x1ff9}}},
-  {0x1f7a, {1|U, {0x1fea}}},
-  {0x1f7b, {1|U, {0x1feb}}},
-  {0x1f7c, {1|U, {0x1ffa}}},
-  {0x1f7d, {1|U, {0x1ffb}}},
-  {0x1fb0, {1|U, {0x1fb8}}},
-  {0x1fb1, {1|U, {0x1fb9}}},
-  {0x1fd0, {1|U, {0x1fd8}}},
-  {0x1fd1, {1|U, {0x1fd9}}},
-  {0x1fe0, {1|U, {0x1fe8}}},
-  {0x1fe1, {1|U, {0x1fe9}}},
-  {0x1fe5, {1|U, {0x1fec}}},
-  {0x214e, {1|U, {0x2132}}},
-  {0x2170, {1|U, {0x2160}}},
-  {0x2171, {1|U, {0x2161}}},
-  {0x2172, {1|U, {0x2162}}},
-  {0x2173, {1|U, {0x2163}}},
-  {0x2174, {1|U, {0x2164}}},
-  {0x2175, {1|U, {0x2165}}},
-  {0x2176, {1|U, {0x2166}}},
-  {0x2177, {1|U, {0x2167}}},
-  {0x2178, {1|U, {0x2168}}},
-  {0x2179, {1|U, {0x2169}}},
-  {0x217a, {1|U, {0x216a}}},
-  {0x217b, {1|U, {0x216b}}},
-  {0x217c, {1|U, {0x216c}}},
-  {0x217d, {1|U, {0x216d}}},
-  {0x217e, {1|U, {0x216e}}},
-  {0x217f, {1|U, {0x216f}}},
-  {0x2184, {1|U, {0x2183}}},
-  {0x24d0, {1|U, {0x24b6}}},
-  {0x24d1, {1|U, {0x24b7}}},
-  {0x24d2, {1|U, {0x24b8}}},
-  {0x24d3, {1|U, {0x24b9}}},
-  {0x24d4, {1|U, {0x24ba}}},
-  {0x24d5, {1|U, {0x24bb}}},
-  {0x24d6, {1|U, {0x24bc}}},
-  {0x24d7, {1|U, {0x24bd}}},
-  {0x24d8, {1|U, {0x24be}}},
-  {0x24d9, {1|U, {0x24bf}}},
-  {0x24da, {1|U, {0x24c0}}},
-  {0x24db, {1|U, {0x24c1}}},
-  {0x24dc, {1|U, {0x24c2}}},
-  {0x24dd, {1|U, {0x24c3}}},
-  {0x24de, {1|U, {0x24c4}}},
-  {0x24df, {1|U, {0x24c5}}},
-  {0x24e0, {1|U, {0x24c6}}},
-  {0x24e1, {1|U, {0x24c7}}},
-  {0x24e2, {1|U, {0x24c8}}},
-  {0x24e3, {1|U, {0x24c9}}},
-  {0x24e4, {1|U, {0x24ca}}},
-  {0x24e5, {1|U, {0x24cb}}},
-  {0x24e6, {1|U, {0x24cc}}},
-  {0x24e7, {1|U, {0x24cd}}},
-  {0x24e8, {1|U, {0x24ce}}},
-  {0x24e9, {1|U, {0x24cf}}},
-  {0x2c30, {1|U, {0x2c00}}},
-  {0x2c31, {1|U, {0x2c01}}},
-  {0x2c32, {1|U, {0x2c02}}},
-  {0x2c33, {1|U, {0x2c03}}},
-  {0x2c34, {1|U, {0x2c04}}},
-  {0x2c35, {1|U, {0x2c05}}},
-  {0x2c36, {1|U, {0x2c06}}},
-  {0x2c37, {1|U, {0x2c07}}},
-  {0x2c38, {1|U, {0x2c08}}},
-  {0x2c39, {1|U, {0x2c09}}},
-  {0x2c3a, {1|U, {0x2c0a}}},
-  {0x2c3b, {1|U, {0x2c0b}}},
-  {0x2c3c, {1|U, {0x2c0c}}},
-  {0x2c3d, {1|U, {0x2c0d}}},
-  {0x2c3e, {1|U, {0x2c0e}}},
-  {0x2c3f, {1|U, {0x2c0f}}},
-  {0x2c40, {1|U, {0x2c10}}},
-  {0x2c41, {1|U, {0x2c11}}},
-  {0x2c42, {1|U, {0x2c12}}},
-  {0x2c43, {1|U, {0x2c13}}},
-  {0x2c44, {1|U, {0x2c14}}},
-  {0x2c45, {1|U, {0x2c15}}},
-  {0x2c46, {1|U, {0x2c16}}},
-  {0x2c47, {1|U, {0x2c17}}},
-  {0x2c48, {1|U, {0x2c18}}},
-  {0x2c49, {1|U, {0x2c19}}},
-  {0x2c4a, {1|U, {0x2c1a}}},
-  {0x2c4b, {1|U, {0x2c1b}}},
-  {0x2c4c, {1|U, {0x2c1c}}},
-  {0x2c4d, {1|U, {0x2c1d}}},
-  {0x2c4e, {1|U, {0x2c1e}}},
-  {0x2c4f, {1|U, {0x2c1f}}},
-  {0x2c50, {1|U, {0x2c20}}},
-  {0x2c51, {1|U, {0x2c21}}},
-  {0x2c52, {1|U, {0x2c22}}},
-  {0x2c53, {1|U, {0x2c23}}},
-  {0x2c54, {1|U, {0x2c24}}},
-  {0x2c55, {1|U, {0x2c25}}},
-  {0x2c56, {1|U, {0x2c26}}},
-  {0x2c57, {1|U, {0x2c27}}},
-  {0x2c58, {1|U, {0x2c28}}},
-  {0x2c59, {1|U, {0x2c29}}},
-  {0x2c5a, {1|U, {0x2c2a}}},
-  {0x2c5b, {1|U, {0x2c2b}}},
-  {0x2c5c, {1|U, {0x2c2c}}},
-  {0x2c5d, {1|U, {0x2c2d}}},
-  {0x2c5e, {1|U, {0x2c2e}}},
-  {0x2c61, {1|U, {0x2c60}}},
-  {0x2c65, {1|U, {0x023a}}},
-  {0x2c66, {1|U, {0x023e}}},
-  {0x2c68, {1|U, {0x2c67}}},
-  {0x2c6a, {1|U, {0x2c69}}},
-  {0x2c6c, {1|U, {0x2c6b}}},
-  {0x2c73, {1|U, {0x2c72}}},
-  {0x2c76, {1|U, {0x2c75}}},
-  {0x2c81, {1|U, {0x2c80}}},
-  {0x2c83, {1|U, {0x2c82}}},
-  {0x2c85, {1|U, {0x2c84}}},
-  {0x2c87, {1|U, {0x2c86}}},
-  {0x2c89, {1|U, {0x2c88}}},
-  {0x2c8b, {1|U, {0x2c8a}}},
-  {0x2c8d, {1|U, {0x2c8c}}},
-  {0x2c8f, {1|U, {0x2c8e}}},
-  {0x2c91, {1|U, {0x2c90}}},
-  {0x2c93, {1|U, {0x2c92}}},
-  {0x2c95, {1|U, {0x2c94}}},
-  {0x2c97, {1|U, {0x2c96}}},
-  {0x2c99, {1|U, {0x2c98}}},
-  {0x2c9b, {1|U, {0x2c9a}}},
-  {0x2c9d, {1|U, {0x2c9c}}},
-  {0x2c9f, {1|U, {0x2c9e}}},
-  {0x2ca1, {1|U, {0x2ca0}}},
-  {0x2ca3, {1|U, {0x2ca2}}},
-  {0x2ca5, {1|U, {0x2ca4}}},
-  {0x2ca7, {1|U, {0x2ca6}}},
-  {0x2ca9, {1|U, {0x2ca8}}},
-  {0x2cab, {1|U, {0x2caa}}},
-  {0x2cad, {1|U, {0x2cac}}},
-  {0x2caf, {1|U, {0x2cae}}},
-  {0x2cb1, {1|U, {0x2cb0}}},
-  {0x2cb3, {1|U, {0x2cb2}}},
-  {0x2cb5, {1|U, {0x2cb4}}},
-  {0x2cb7, {1|U, {0x2cb6}}},
-  {0x2cb9, {1|U, {0x2cb8}}},
-  {0x2cbb, {1|U, {0x2cba}}},
-  {0x2cbd, {1|U, {0x2cbc}}},
-  {0x2cbf, {1|U, {0x2cbe}}},
-  {0x2cc1, {1|U, {0x2cc0}}},
-  {0x2cc3, {1|U, {0x2cc2}}},
-  {0x2cc5, {1|U, {0x2cc4}}},
-  {0x2cc7, {1|U, {0x2cc6}}},
-  {0x2cc9, {1|U, {0x2cc8}}},
-  {0x2ccb, {1|U, {0x2cca}}},
-  {0x2ccd, {1|U, {0x2ccc}}},
-  {0x2ccf, {1|U, {0x2cce}}},
-  {0x2cd1, {1|U, {0x2cd0}}},
-  {0x2cd3, {1|U, {0x2cd2}}},
-  {0x2cd5, {1|U, {0x2cd4}}},
-  {0x2cd7, {1|U, {0x2cd6}}},
-  {0x2cd9, {1|U, {0x2cd8}}},
-  {0x2cdb, {1|U, {0x2cda}}},
-  {0x2cdd, {1|U, {0x2cdc}}},
-  {0x2cdf, {1|U, {0x2cde}}},
-  {0x2ce1, {1|U, {0x2ce0}}},
-  {0x2ce3, {1|U, {0x2ce2}}},
-  {0x2cec, {1|U, {0x2ceb}}},
-  {0x2cee, {1|U, {0x2ced}}},
-  {0x2cf3, {1|U, {0x2cf2}}},
-  {0x2d00, {1|U, {0x10a0}}},
-  {0x2d01, {1|U, {0x10a1}}},
-  {0x2d02, {1|U, {0x10a2}}},
-  {0x2d03, {1|U, {0x10a3}}},
-  {0x2d04, {1|U, {0x10a4}}},
-  {0x2d05, {1|U, {0x10a5}}},
-  {0x2d06, {1|U, {0x10a6}}},
-  {0x2d07, {1|U, {0x10a7}}},
-  {0x2d08, {1|U, {0x10a8}}},
-  {0x2d09, {1|U, {0x10a9}}},
-  {0x2d0a, {1|U, {0x10aa}}},
-  {0x2d0b, {1|U, {0x10ab}}},
-  {0x2d0c, {1|U, {0x10ac}}},
-  {0x2d0d, {1|U, {0x10ad}}},
-  {0x2d0e, {1|U, {0x10ae}}},
-  {0x2d0f, {1|U, {0x10af}}},
-  {0x2d10, {1|U, {0x10b0}}},
-  {0x2d11, {1|U, {0x10b1}}},
-  {0x2d12, {1|U, {0x10b2}}},
-  {0x2d13, {1|U, {0x10b3}}},
-  {0x2d14, {1|U, {0x10b4}}},
-  {0x2d15, {1|U, {0x10b5}}},
-  {0x2d16, {1|U, {0x10b6}}},
-  {0x2d17, {1|U, {0x10b7}}},
-  {0x2d18, {1|U, {0x10b8}}},
-  {0x2d19, {1|U, {0x10b9}}},
-  {0x2d1a, {1|U, {0x10ba}}},
-  {0x2d1b, {1|U, {0x10bb}}},
-  {0x2d1c, {1|U, {0x10bc}}},
-  {0x2d1d, {1|U, {0x10bd}}},
-  {0x2d1e, {1|U, {0x10be}}},
-  {0x2d1f, {1|U, {0x10bf}}},
-  {0x2d20, {1|U, {0x10c0}}},
-  {0x2d21, {1|U, {0x10c1}}},
-  {0x2d22, {1|U, {0x10c2}}},
-  {0x2d23, {1|U, {0x10c3}}},
-  {0x2d24, {1|U, {0x10c4}}},
-  {0x2d25, {1|U, {0x10c5}}},
-  {0x2d27, {1|U, {0x10c7}}},
-  {0x2d2d, {1|U, {0x10cd}}},
-  {0xa641, {1|U, {0xa640}}},
-  {0xa643, {1|U, {0xa642}}},
-  {0xa645, {1|U, {0xa644}}},
-  {0xa647, {1|U, {0xa646}}},
-  {0xa649, {1|U, {0xa648}}},
-  {0xa64b, {1|U, {0xa64a}}},
-  {0xa64d, {1|U, {0xa64c}}},
-  {0xa64f, {1|U, {0xa64e}}},
-  {0xa651, {1|U, {0xa650}}},
-  {0xa653, {1|U, {0xa652}}},
-  {0xa655, {1|U, {0xa654}}},
-  {0xa657, {1|U, {0xa656}}},
-  {0xa659, {1|U, {0xa658}}},
-  {0xa65b, {1|U, {0xa65a}}},
-  {0xa65d, {1|U, {0xa65c}}},
-  {0xa65f, {1|U, {0xa65e}}},
-  {0xa661, {1|U, {0xa660}}},
-  {0xa663, {1|U, {0xa662}}},
-  {0xa665, {1|U, {0xa664}}},
-  {0xa667, {1|U, {0xa666}}},
-  {0xa669, {1|U, {0xa668}}},
-  {0xa66b, {1|U, {0xa66a}}},
-  {0xa66d, {1|U, {0xa66c}}},
-  {0xa681, {1|U, {0xa680}}},
-  {0xa683, {1|U, {0xa682}}},
-  {0xa685, {1|U, {0xa684}}},
-  {0xa687, {1|U, {0xa686}}},
-  {0xa689, {1|U, {0xa688}}},
-  {0xa68b, {1|U, {0xa68a}}},
-  {0xa68d, {1|U, {0xa68c}}},
-  {0xa68f, {1|U, {0xa68e}}},
-  {0xa691, {1|U, {0xa690}}},
-  {0xa693, {1|U, {0xa692}}},
-  {0xa695, {1|U, {0xa694}}},
-  {0xa697, {1|U, {0xa696}}},
-  {0xa699, {1|U, {0xa698}}},
-  {0xa69b, {1|U, {0xa69a}}},
-  {0xa723, {1|U, {0xa722}}},
-  {0xa725, {1|U, {0xa724}}},
-  {0xa727, {1|U, {0xa726}}},
-  {0xa729, {1|U, {0xa728}}},
-  {0xa72b, {1|U, {0xa72a}}},
-  {0xa72d, {1|U, {0xa72c}}},
-  {0xa72f, {1|U, {0xa72e}}},
-  {0xa733, {1|U, {0xa732}}},
-  {0xa735, {1|U, {0xa734}}},
-  {0xa737, {1|U, {0xa736}}},
-  {0xa739, {1|U, {0xa738}}},
-  {0xa73b, {1|U, {0xa73a}}},
-  {0xa73d, {1|U, {0xa73c}}},
-  {0xa73f, {1|U, {0xa73e}}},
-  {0xa741, {1|U, {0xa740}}},
-  {0xa743, {1|U, {0xa742}}},
-  {0xa745, {1|U, {0xa744}}},
-  {0xa747, {1|U, {0xa746}}},
-  {0xa749, {1|U, {0xa748}}},
-  {0xa74b, {1|U, {0xa74a}}},
-  {0xa74d, {1|U, {0xa74c}}},
-  {0xa74f, {1|U, {0xa74e}}},
-  {0xa751, {1|U, {0xa750}}},
-  {0xa753, {1|U, {0xa752}}},
-  {0xa755, {1|U, {0xa754}}},
-  {0xa757, {1|U, {0xa756}}},
-  {0xa759, {1|U, {0xa758}}},
-  {0xa75b, {1|U, {0xa75a}}},
-  {0xa75d, {1|U, {0xa75c}}},
-  {0xa75f, {1|U, {0xa75e}}},
-  {0xa761, {1|U, {0xa760}}},
-  {0xa763, {1|U, {0xa762}}},
-  {0xa765, {1|U, {0xa764}}},
-  {0xa767, {1|U, {0xa766}}},
-  {0xa769, {1|U, {0xa768}}},
-  {0xa76b, {1|U, {0xa76a}}},
-  {0xa76d, {1|U, {0xa76c}}},
-  {0xa76f, {1|U, {0xa76e}}},
-  {0xa77a, {1|U, {0xa779}}},
-  {0xa77c, {1|U, {0xa77b}}},
-  {0xa77f, {1|U, {0xa77e}}},
-  {0xa781, {1|U, {0xa780}}},
-  {0xa783, {1|U, {0xa782}}},
-  {0xa785, {1|U, {0xa784}}},
-  {0xa787, {1|U, {0xa786}}},
-  {0xa78c, {1|U, {0xa78b}}},
-  {0xa791, {1|U, {0xa790}}},
-  {0xa793, {1|U, {0xa792}}},
-  {0xa797, {1|U, {0xa796}}},
-  {0xa799, {1|U, {0xa798}}},
-  {0xa79b, {1|U, {0xa79a}}},
-  {0xa79d, {1|U, {0xa79c}}},
-  {0xa79f, {1|U, {0xa79e}}},
-  {0xa7a1, {1|U, {0xa7a0}}},
-  {0xa7a3, {1|U, {0xa7a2}}},
-  {0xa7a5, {1|U, {0xa7a4}}},
-  {0xa7a7, {1|U, {0xa7a6}}},
-  {0xa7a9, {1|U, {0xa7a8}}},
-  {0xa7b5, {1|U, {0xa7b4}}},
-  {0xa7b7, {1|U, {0xa7b6}}},
-  {0xab53, {1|U, {0xa7b3}}},
-  {0xff41, {1|U, {0xff21}}},
-  {0xff42, {1|U, {0xff22}}},
-  {0xff43, {1|U, {0xff23}}},
-  {0xff44, {1|U, {0xff24}}},
-  {0xff45, {1|U, {0xff25}}},
-  {0xff46, {1|U, {0xff26}}},
-  {0xff47, {1|U, {0xff27}}},
-  {0xff48, {1|U, {0xff28}}},
-  {0xff49, {1|U, {0xff29}}},
-  {0xff4a, {1|U, {0xff2a}}},
-  {0xff4b, {1|U, {0xff2b}}},
-  {0xff4c, {1|U, {0xff2c}}},
-  {0xff4d, {1|U, {0xff2d}}},
-  {0xff4e, {1|U, {0xff2e}}},
-  {0xff4f, {1|U, {0xff2f}}},
-  {0xff50, {1|U, {0xff30}}},
-  {0xff51, {1|U, {0xff31}}},
-  {0xff52, {1|U, {0xff32}}},
-  {0xff53, {1|U, {0xff33}}},
-  {0xff54, {1|U, {0xff34}}},
-  {0xff55, {1|U, {0xff35}}},
-  {0xff56, {1|U, {0xff36}}},
-  {0xff57, {1|U, {0xff37}}},
-  {0xff58, {1|U, {0xff38}}},
-  {0xff59, {1|U, {0xff39}}},
-  {0xff5a, {1|U, {0xff3a}}},
-  {0x10428, {1|U, {0x10400}}},
-  {0x10429, {1|U, {0x10401}}},
-  {0x1042a, {1|U, {0x10402}}},
-  {0x1042b, {1|U, {0x10403}}},
-  {0x1042c, {1|U, {0x10404}}},
-  {0x1042d, {1|U, {0x10405}}},
-  {0x1042e, {1|U, {0x10406}}},
-  {0x1042f, {1|U, {0x10407}}},
-  {0x10430, {1|U, {0x10408}}},
-  {0x10431, {1|U, {0x10409}}},
-  {0x10432, {1|U, {0x1040a}}},
-  {0x10433, {1|U, {0x1040b}}},
-  {0x10434, {1|U, {0x1040c}}},
-  {0x10435, {1|U, {0x1040d}}},
-  {0x10436, {1|U, {0x1040e}}},
-  {0x10437, {1|U, {0x1040f}}},
-  {0x10438, {1|U, {0x10410}}},
-  {0x10439, {1|U, {0x10411}}},
-  {0x1043a, {1|U, {0x10412}}},
-  {0x1043b, {1|U, {0x10413}}},
-  {0x1043c, {1|U, {0x10414}}},
-  {0x1043d, {1|U, {0x10415}}},
-  {0x1043e, {1|U, {0x10416}}},
-  {0x1043f, {1|U, {0x10417}}},
-  {0x10440, {1|U, {0x10418}}},
-  {0x10441, {1|U, {0x10419}}},
-  {0x10442, {1|U, {0x1041a}}},
-  {0x10443, {1|U, {0x1041b}}},
-  {0x10444, {1|U, {0x1041c}}},
-  {0x10445, {1|U, {0x1041d}}},
-  {0x10446, {1|U, {0x1041e}}},
-  {0x10447, {1|U, {0x1041f}}},
-  {0x10448, {1|U, {0x10420}}},
-  {0x10449, {1|U, {0x10421}}},
-  {0x1044a, {1|U, {0x10422}}},
-  {0x1044b, {1|U, {0x10423}}},
-  {0x1044c, {1|U, {0x10424}}},
-  {0x1044d, {1|U, {0x10425}}},
-  {0x1044e, {1|U, {0x10426}}},
-  {0x1044f, {1|U, {0x10427}}},
-  {0x10cc0, {1|U, {0x10c80}}},
-  {0x10cc1, {1|U, {0x10c81}}},
-  {0x10cc2, {1|U, {0x10c82}}},
-  {0x10cc3, {1|U, {0x10c83}}},
-  {0x10cc4, {1|U, {0x10c84}}},
-  {0x10cc5, {1|U, {0x10c85}}},
-  {0x10cc6, {1|U, {0x10c86}}},
-  {0x10cc7, {1|U, {0x10c87}}},
-  {0x10cc8, {1|U, {0x10c88}}},
-  {0x10cc9, {1|U, {0x10c89}}},
-  {0x10cca, {1|U, {0x10c8a}}},
-  {0x10ccb, {1|U, {0x10c8b}}},
-  {0x10ccc, {1|U, {0x10c8c}}},
-  {0x10ccd, {1|U, {0x10c8d}}},
-  {0x10cce, {1|U, {0x10c8e}}},
-  {0x10ccf, {1|U, {0x10c8f}}},
-  {0x10cd0, {1|U, {0x10c90}}},
-  {0x10cd1, {1|U, {0x10c91}}},
-  {0x10cd2, {1|U, {0x10c92}}},
-  {0x10cd3, {1|U, {0x10c93}}},
-  {0x10cd4, {1|U, {0x10c94}}},
-  {0x10cd5, {1|U, {0x10c95}}},
-  {0x10cd6, {1|U, {0x10c96}}},
-  {0x10cd7, {1|U, {0x10c97}}},
-  {0x10cd8, {1|U, {0x10c98}}},
-  {0x10cd9, {1|U, {0x10c99}}},
-  {0x10cda, {1|U, {0x10c9a}}},
-  {0x10cdb, {1|U, {0x10c9b}}},
-  {0x10cdc, {1|U, {0x10c9c}}},
-  {0x10cdd, {1|U, {0x10c9d}}},
-  {0x10cde, {1|U, {0x10c9e}}},
-  {0x10cdf, {1|U, {0x10c9f}}},
-  {0x10ce0, {1|U, {0x10ca0}}},
-  {0x10ce1, {1|U, {0x10ca1}}},
-  {0x10ce2, {1|U, {0x10ca2}}},
-  {0x10ce3, {1|U, {0x10ca3}}},
-  {0x10ce4, {1|U, {0x10ca4}}},
-  {0x10ce5, {1|U, {0x10ca5}}},
-  {0x10ce6, {1|U, {0x10ca6}}},
-  {0x10ce7, {1|U, {0x10ca7}}},
-  {0x10ce8, {1|U, {0x10ca8}}},
-  {0x10ce9, {1|U, {0x10ca9}}},
-  {0x10cea, {1|U, {0x10caa}}},
-  {0x10ceb, {1|U, {0x10cab}}},
-  {0x10cec, {1|U, {0x10cac}}},
-  {0x10ced, {1|U, {0x10cad}}},
-  {0x10cee, {1|U, {0x10cae}}},
-  {0x10cef, {1|U, {0x10caf}}},
-  {0x10cf0, {1|U, {0x10cb0}}},
-  {0x10cf1, {1|U, {0x10cb1}}},
-  {0x10cf2, {1|U, {0x10cb2}}},
-  {0x118c0, {1|U, {0x118a0}}},
-  {0x118c1, {1|U, {0x118a1}}},
-  {0x118c2, {1|U, {0x118a2}}},
-  {0x118c3, {1|U, {0x118a3}}},
-  {0x118c4, {1|U, {0x118a4}}},
-  {0x118c5, {1|U, {0x118a5}}},
-  {0x118c6, {1|U, {0x118a6}}},
-  {0x118c7, {1|U, {0x118a7}}},
-  {0x118c8, {1|U, {0x118a8}}},
-  {0x118c9, {1|U, {0x118a9}}},
-  {0x118ca, {1|U, {0x118aa}}},
-  {0x118cb, {1|U, {0x118ab}}},
-  {0x118cc, {1|U, {0x118ac}}},
-  {0x118cd, {1|U, {0x118ad}}},
-  {0x118ce, {1|U, {0x118ae}}},
-  {0x118cf, {1|U, {0x118af}}},
-  {0x118d0, {1|U, {0x118b0}}},
-  {0x118d1, {1|U, {0x118b1}}},
-  {0x118d2, {1|U, {0x118b2}}},
-  {0x118d3, {1|U, {0x118b3}}},
-  {0x118d4, {1|U, {0x118b4}}},
-  {0x118d5, {1|U, {0x118b5}}},
-  {0x118d6, {1|U, {0x118b6}}},
-  {0x118d7, {1|U, {0x118b7}}},
-  {0x118d8, {1|U, {0x118b8}}},
-  {0x118d9, {1|U, {0x118b9}}},
-  {0x118da, {1|U, {0x118ba}}},
-  {0x118db, {1|U, {0x118bb}}},
-  {0x118dc, {1|U, {0x118bc}}},
-  {0x118dd, {1|U, {0x118bd}}},
-  {0x118de, {1|U, {0x118be}}},
-  {0x118df, {1|U, {0x118bf}}},
-#define CaseUnfold_11_Locale (*(CaseUnfold_11_Type (*)[1])(CaseUnfold_11_Table+1195))
-  {0x0069, {1|U, {0x0049}}},
-};
-
-/* C code produced by gperf version 3.0.4 */
-/* Command-line: gperf -7 -k1,2,3 -F,-1 -c -j1 -i1 -t -T -E -C -H onigenc_unicode_CaseUnfold_11_hash -N onigenc_unicode_CaseUnfold_11_lookup -n  */
-
-/* maximum key range = 1827, duplicates = 0 */
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-/*ARGSUSED*/
-static unsigned int
-onigenc_unicode_CaseUnfold_11_hash(const OnigCodePoint code)
-{
-  static const unsigned short asso_values[] =
-    {
-         1, 1835,    2,    3,   10,  394,    4,  366,    7,  116,
-       606,  172,    8,    3,  427,  383, 1835, 1835, 1835, 1835,
-      1835, 1835, 1835, 1835, 1835, 1835, 1835, 1835, 1835,    2,
-      1835, 1835, 1835, 1835, 1835, 1835, 1835, 1835, 1835, 1835,
-      1835, 1835, 1835,    6, 1835, 1835, 1835, 1835, 1835, 1835,
-      1835, 1835, 1835,   99, 1835, 1835, 1835, 1835, 1835, 1835,
-      1835, 1835,   17, 1835,    2,    1,  247,  534,   98,  649,
-       515,  641,   50,  852,  359, 1213,   51,   12,  636, 1194,
-       134,  459,    8,  386,  441,  708,    1,  680,    7,  976,
-        40,  899,   70,    5,  433, 1006,  116, 1273,  227,  773,
-       128,  660,   59,  618,   35,  698,  622,  968,  121, 1055,
-       305,  598,  129,  934, 1138,  669, 1398,  397, 1329,  589,
-      1283,  542, 1384,  825, 1364, 1032,  579,  815, 1341,  689,
-       327,  307,  797,  287,  782,  259,  752,  235,  995,  211,
-      1176,  175,  623,  151,  565,  115,  984,   31, 1163,   67,
-      1151,  139, 1108,   55, 1258,   79, 1226,   91, 1217,  192,
-       199,  350, 1299,   19, 1292,   43, 1239,  103, 1141,  370,
-      1250,  417, 1166,  446, 1237,  517, 1333,  506, 1011,  716,
-       903,  485,  947,  739,  983, 1126, 1122,  874, 1069,  847,
-       408,  861,  220,  957
-    };
-  return asso_values[bits_of(code, 2)+66] + asso_values[bits_of(code, 1)+4] + asso_values[bits_of(code, 0)];
-}
-
-#ifdef __GNUC__
-__inline
-#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
-__attribute__ ((__gnu_inline__))
-#endif
-#endif
-static const CodePointList3 *
-onigenc_unicode_CaseUnfold_11_lookup(const OnigCodePoint code)
-{
-  enum
-    {
-      MIN_CODE_VALUE = 0x61,
-      MAX_CODE_VALUE = 0x118df,
-      TOTAL_KEYWORDS = 1196,
-      MIN_WORD_LENGTH = 3,
-      MAX_WORD_LENGTH = 3,
-      MIN_HASH_VALUE = 8,
-      MAX_HASH_VALUE = 1834
-    };
-
-  static const short wordlist[] =
-    {
-      -1, -1, -1, -1, -1, -1,
-      -1, -1,
-      /*0x1e1b*/ 577,
-      /*0x049b*/ 363,
-      /*0x011b*/ 69,
-      /*0x2c9b*/ 868,
-      -1,
-      /*0x021b*/ 178,
-      /*0x1e8b*/ 633,
-      /*0x1e0b*/ 569,
-      /*0x048b*/ 355,
-      /*0x010b*/ 61,
-      /*0x2c8b*/ 860,
-      -1,
-      /*0x020b*/ 170,
-      /*0x1ee1*/ 671,
-      /*0x1e61*/ 612,
-      /*0x04e1*/ 398,
-      /*0x0161*/ 102,
-      /*0x2ce1*/ 903,
-      /*0x13e1*/ 541,
-      /*0x0261*/ 210,
-      /*0x0461*/ 338,
-      /*0xa761*/ 1015,
-      /*0x0061*/ 0,
-      /*0x10ce1*/ 1145,
-      /*0x24e1*/ 791,
-      /*0x1ed1*/ 663,
-      /*0x1e51*/ 604,
-      /*0x04d1*/ 390,
-      /*0x0151*/ 94,
-      /*0x2cd1*/ 895,
-      /*0x13d1*/ 525,
-      /*0x0251*/ 200,
-      /*0x0451*/ 323,
-      /*0xa751*/ 1007,
-      /*0x13a6*/ 482,
-      /*0x10cd1*/ 1129,
-      /*0x24d1*/ 775,
-      /*0x1ee3*/ 672,
-      /*0x1e63*/ 613,
-      /*0x04e3*/ 399,
-      /*0x0163*/ 103,
-      /*0x2ce3*/ 904,
-      /*0x13e3*/ 543,
-      /*0x0263*/ 211,
-      /*0x0463*/ 339,
-      /*0xa763*/ 1016,
-      /*0x0063*/ 2,
-      /*0x10ce3*/ 1147,
-      /*0x24e3*/ 793,
-      /*0x1ed7*/ 666,
-      /*0x1e57*/ 607,
-      /*0x04d7*/ 393,
-      /*0x0157*/ 97,
-      /*0x2cd7*/ 898,
-      /*0x13d7*/ 531,
-      /*0x0257*/ 205,
-      /*0x0457*/ 329,
-      /*0xa757*/ 1010,
-      /*0x13a4*/ 480,
-      /*0x10cd7*/ 1135,
-      /*0x24d7*/ 781,
-      /*0x1ed3*/ 664,
-      /*0x1e53*/ 605,
-      /*0x04d3*/ 391,
-      /*0x0153*/ 95,
-      /*0x2cd3*/ 896,
-      /*0x13d3*/ 527,
-      /*0x0253*/ 202,
-      /*0x0453*/ 325,
-      /*0xa753*/ 1008,
-      -1,
-      /*0x10cd3*/ 1131,
-      /*0x24d3*/ 777,
-      /*0x1ed9*/ 667,
-      /*0x1e59*/ 608,
-      /*0x04d9*/ 394,
-      /*0x0159*/ 98,
-      /*0x2cd9*/ 899,
-      /*0x13d9*/ 533,
-      /*0x0259*/ 206,
-      /*0x0459*/ 331,
-      /*0xa759*/ 1011,
-      /*0x2c61*/ 847,
-      /*0x10cd9*/ 1137,
-      /*0x24d9*/ 783,
-      /*0x1edb*/ 668,
-      /*0x1e5b*/ 609,
-      /*0x04db*/ 395,
-      /*0x015b*/ 99,
-      /*0x2cdb*/ 900,
-      /*0x13db*/ 535,
-      /*0x025b*/ 207,
-      /*0x045b*/ 333,
-      /*0xa75b*/ 1012,
-      /*0x2c51*/ 833,
-      /*0x10cdb*/ 1139,
-      /*0x24db*/ 785,
-      /*0x1ee5*/ 673,
-      /*0x1e65*/ 614,
-      /*0x04e5*/ 400,
-      /*0x0165*/ 104,
-      /*0xab53*/ 1045,
-      /*0x13e5*/ 545,
-      /*0x0265*/ 212,
-      /*0x0465*/ 340,
-      /*0xa765*/ 1017,
-      /*0x0065*/ 4,
-      /*0x10ce5*/ 1149,
-      /*0x24e5*/ 795,
-      /*0x1ecf*/ 662,
-      /*0x1e4f*/ 603,
-      /*0x04cf*/ 389,
-      /*0x014f*/ 93,
-      /*0x2ccf*/ 894,
-      /*0x13cf*/ 523,
-      /*0x024f*/ 198,
-      /*0x044f*/ 321,
-      /*0xa74f*/ 1006,
-      /*0x2c57*/ 839,
-      /*0x10ccf*/ 1127,
-      /*0x13aa*/ 486,
-      /*0x028b*/ 229,
-      -1, -1, -1,
-      /*0x1044f*/ 1111,
-      -1,
-      /*0x13a2*/ 478,
-      /*0x13ae*/ 490,
-      -1,
-      /*0x2c53*/ 835,
-      /*0x1042a*/ 1074,
-      /*0x118d1*/ 1180,
-      /*0x1ed5*/ 665,
-      /*0x1e55*/ 606,
-      /*0x04d5*/ 392,
-      /*0x0155*/ 96,
-      /*0x2cd5*/ 897,
-      /*0x13d5*/ 529,
-      /*0x1042e*/ 1078,
-      /*0x0455*/ 327,
-      /*0xa755*/ 1009,
-      /*0x2c59*/ 841,
-      /*0x10cd5*/ 1133,
-      /*0x24d5*/ 779,
-      /*0x1ecd*/ 661,
-      /*0x1e4d*/ 602,
-      /*0xa661*/ 964,
-      /*0x014d*/ 92,
-      /*0x2ccd*/ 893,
-      /*0x13cd*/ 521,
-      /*0x024d*/ 197,
-      /*0x044d*/ 319,
-      /*0xa74d*/ 1005,
-      /*0x2c5b*/ 843,
-      /*0x10ccd*/ 1125,
-      /*0x118d7*/ 1186,
-      -1, -1,
-      /*0xa651*/ 956,
-      /*0x028a*/ 228,
-      /*0x1044d*/ 1109,
-      -1, -1, -1, -1,
-      /*0x2c65*/ 848,
-      -1,
-      /*0x118d3*/ 1182,
-      /*0x1ecb*/ 660,
-      /*0x1e4b*/ 601,
-      /*0xa663*/ 965,
-      /*0x014b*/ 91,
-      /*0x2ccb*/ 892,
-      /*0x13cb*/ 519,
-      /*0x024b*/ 196,
-      /*0x044b*/ 317,
-      /*0xa74b*/ 1004,
-      /*0x2c4f*/ 831,
-      /*0x10ccb*/ 1123,
-      /*0x118d9*/ 1188,
-      -1, -1,
-      /*0xa657*/ 959,
-      /*0x03e1*/ 278,
-      /*0x1044b*/ 1107,
-      /*0x1edd*/ 669,
-      /*0x1e5d*/ 610,
-      /*0x04dd*/ 396,
-      /*0x015d*/ 100,
-      /*0x2cdd*/ 901,
-      /*0x13dd*/ 537,
-      /*0x118db*/ 1190,
-      /*0x045d*/ 335,
-      /*0xa75d*/ 1013,
-      /*0xa653*/ 957,
-      /*0x10cdd*/ 1141,
-      /*0x24dd*/ 787,
-      /*0x13de*/ 538,
-      -1,
-      /*0x045e*/ 336,
-      -1,
-      /*0x2c55*/ 837,
-      /*0x10cde*/ 1142,
-      /*0x24de*/ 788,
-      /*0x1ec9*/ 659,
-      /*0x1e49*/ 600,
-      /*0xa659*/ 960,
-      /*0x03e3*/ 279,
-      /*0x2cc9*/ 891,
-      /*0x13c9*/ 517,
-      /*0x0249*/ 195,
-      /*0x0449*/ 315,
-      /*0xa749*/ 1003,
-      /*0x2c4d*/ 829,
-      /*0x10cc9*/ 1121,
-      /*0x118cf*/ 1178,
-      /*0x017e*/ 116,
-      -1,
-      /*0xa65b*/ 961,
-      /*0x03d7*/ 273,
-      /*0x10449*/ 1105,
-      -1, -1, -1,
-      /*0x029e*/ 233,
-      /*0x13a0*/ 476,
-      -1, -1,
-      /*0x1ec7*/ 658,
-      /*0x1e47*/ 599,
-      /*0xa665*/ 966,
-      -1,
-      /*0x2cc7*/ 890,
-      /*0x13c7*/ 515,
-      /*0x0247*/ 194,
-      /*0x0447*/ 313,
-      /*0xa747*/ 1002,
-      /*0x2c4b*/ 827,
-      /*0x10cc7*/ 1119,
-      /*0x118d5*/ 1184,
-      /*0x1f14*/ 699,
-      -1,
-      /*0xa64f*/ 955,
-      /*0x03d9*/ 274,
-      /*0x10447*/ 1103,
-      -1, -1,
-      /*0x1f10*/ 695,
-      -1, -1, -1,
-      /*0x118cd*/ 1176,
-      /*0x1ec5*/ 657,
-      /*0x1e45*/ 598,
-      /*0x2c5d*/ 845,
-      /*0x03db*/ 275,
-      /*0x2cc5*/ 889,
-      /*0x13c5*/ 513,
-      /*0x1f61*/ 728,
-      /*0x0445*/ 311,
-      /*0xa745*/ 1001,
-      /*0x2c5e*/ 846,
-      /*0x10cc5*/ 1117,
-      -1, -1, -1,
-      /*0xa655*/ 958,
-      /*0x03e5*/ 280,
-      /*0x10445*/ 1101,
-      -1,
-      /*0x1f51*/ 723,
-      -1, -1,
-      /*0x2c49*/ 825,
-      /*0x1f26*/ 707,
-      /*0x118cb*/ 1174,
-      -1, -1,
-      /*0xa64d*/ 954,
-      -1,
-      /*0x1ec3*/ 656,
-      /*0x1e43*/ 597,
-      /*0x1f63*/ 730,
-      -1,
-      /*0x2cc3*/ 888,
-      /*0x13c3*/ 511,
-      -1,
-      /*0x0443*/ 309,
-      /*0xa743*/ 1000,
-      /*0x1f06*/ 693,
-      /*0x10cc3*/ 1115,
-      -1,
-      /*0x118dd*/ 1192,
-      /*0x03ae*/ 242,
-      /*0x1f57*/ 726,
-      -1,
-      /*0x10443*/ 1099,
-      /*0x2c47*/ 823,
-      /*0x1f24*/ 705,
-      /*0x118de*/ 1193,
-      /*0x1ec1*/ 655,
-      /*0x1e41*/ 596,
-      /*0xa64b*/ 953,
-      /*0x13ac*/ 488,
-      /*0x2cc1*/ 887,
-      /*0x13c1*/ 509,
-      /*0x1f53*/ 724,
-      /*0x0441*/ 307,
-      /*0xa741*/ 999,
-      -1,
-      /*0x10cc1*/ 1113,
-      /*0x118c9*/ 1172,
-      -1, -1,
-      /*0x1042c*/ 1076,
-      /*0x03cd*/ 271,
-      /*0x10441*/ 1097,
-      -1, -1,
-      /*0xa65d*/ 962,
-      -1,
-      /*0x2c45*/ 821,
-      -1,
-      /*0x0140*/ 86,
-      -1,
-      /*0x13c0*/ 508,
-      /*0x0240*/ 192,
-      /*0x0440*/ 306,
-      -1, -1,
-      /*0x10cc0*/ 1112,
-      -1, -1, -1, -1,
-      /*0x118c7*/ 1170,
-      /*0x10440*/ 1096,
-      /*0x1f02*/ 689,
-      /*0xa649*/ 952,
-      /*0x03cb*/ 269,
-      -1, -1,
-      /*0x1f65*/ 732,
-      /*0x1edf*/ 670,
-      /*0x1e5f*/ 611,
-      /*0x04df*/ 397,
-      /*0x015f*/ 101,
-      /*0x2cdf*/ 902,
-      /*0x13df*/ 539,
-      /*0x2c43*/ 819,
-      /*0x045f*/ 337,
-      /*0xa75f*/ 1014,
-      /*0xff51*/ 1062,
-      /*0x10cdf*/ 1143,
-      /*0x24df*/ 789,
-      /*0x0280*/ 223,
-      /*0x03dd*/ 276,
-      -1, -1,
-      /*0x118c5*/ 1168,
-      -1, -1,
-      /*0xa647*/ 951,
-      /*0x1ee7*/ 674,
-      /*0x1e67*/ 615,
-      /*0x04e7*/ 401,
-      /*0x0167*/ 105,
-      /*0x1f22*/ 703,
-      /*0x13e7*/ 547,
-      /*0x2c41*/ 817,
-      /*0x0467*/ 341,
-      /*0xa767*/ 1018,
-      /*0x0067*/ 6,
-      /*0x10ce7*/ 1151,
-      /*0x24e7*/ 797,
-      /*0x03c9*/ 267,
-      /*0xff57*/ 1068,
-      /*0x01e1*/ 151,
-      /*0x1f55*/ 725,
-      /*0x1e91*/ 636,
-      /*0x1e11*/ 572,
-      /*0x0491*/ 358,
-      /*0x0111*/ 64,
-      /*0x2c91*/ 863,
-      /*0xa79b*/ 1035,
-      /*0x0211*/ 173,
-      /*0xa645*/ 950,
-      /*0x118c3*/ 1166,
-      /*0xff53*/ 1064,
-      /*0x2c40*/ 816,
-      /*0x1eb3*/ 648,
-      /*0x1e33*/ 589,
-      /*0x04b3*/ 375,
-      /*0x0133*/ 80,
-      /*0x2cb3*/ 880,
-      /*0x13b3*/ 495,
-      /*0x0233*/ 189,
-      /*0x0433*/ 293,
-      /*0xa733*/ 992,
-      /*0x03c7*/ 265,
-      /*0xff59*/ 1070,
-      /*0x01e3*/ 152,
-      -1, -1,
-      /*0x017c*/ 115,
-      /*0x00e1*/ 26,
-      /*0x10433*/ 1083,
-      /*0x118c1*/ 1164,
-      -1,
-      /*0xa77c*/ 1024,
-      /*0x1ee9*/ 675,
-      /*0x1e69*/ 616,
-      /*0x04e9*/ 402,
-      /*0x0169*/ 106,
-      /*0xa643*/ 949,
-      /*0x13e9*/ 549,
-      /*0x0269*/ 215,
-      /*0x0469*/ 342,
-      /*0xa769*/ 1019,
-      /*0x0069*/ 1195,
-      /*0x10ce9*/ 1153,
-      /*0x24e9*/ 799,
-      -1,
-      /*0x03c5*/ 263,
-      /*0x051b*/ 427,
-      /*0x0586*/ 475,
-      /*0x2d14*/ 928,
-      /*0x118c0*/ 1163,
-      /*0x019a*/ 125,
-      /*0x00e3*/ 28,
-      /*0x2d1b*/ 935,
-      /*0x050b*/ 419,
-      /*0x2d16*/ 930,
-      /*0x2d10*/ 924,
-      /*0xa641*/ 948,
-      -1,
-      /*0xff4f*/ 1060,
-      /*0x2d0b*/ 919,
-      /*0x0561*/ 438,
-      /*0x1eeb*/ 676,
-      /*0x1e6b*/ 617,
-      /*0x04eb*/ 403,
-      /*0x016b*/ 107,
-      -1,
-      /*0x13eb*/ 551,
-      /*0x026b*/ 216,
-      /*0x046b*/ 343,
-      /*0xa76b*/ 1020,
-      /*0x006b*/ 9,
-      /*0x10ceb*/ 1155,
-      /*0x118df*/ 1194,
-      /*0x03c3*/ 261,
-      /*0x1e8f*/ 635,
-      /*0x1e0f*/ 571,
-      /*0x048f*/ 357,
-      /*0x010f*/ 63,
-      /*0x2c8f*/ 862,
-      /*0xa69b*/ 984,
-      /*0x020f*/ 172,
-      /*0x2c33*/ 803,
-      /*0xff55*/ 1066,
-      /*0x01e5*/ 153,
-      /*0x0563*/ 440,
-      -1,
-      /*0xa68b*/ 976,
-      /*0x2d18*/ 932,
-      /*0x1f20*/ 701,
-      /*0x0288*/ 226,
-      -1,
-      /*0x03ac*/ 240,
-      -1,
-      /*0x03c1*/ 260,
-      /*0xff4d*/ 1058,
-      /*0x0582*/ 471,
-      /*0x019e*/ 126,
-      /*0x2d06*/ 914,
-      /*0x2d0a*/ 918,
-      /*0xa65f*/ 963,
-      /*0x1ef3*/ 680,
-      /*0x1e73*/ 621,
-      /*0x04f3*/ 407,
-      /*0x0173*/ 111,
-      /*0x2cf3*/ 907,
-      /*0x13f3*/ 559,
-      /*0x2d24*/ 944,
-      /*0x0473*/ 347,
-      /*0x1f00*/ 687,
-      /*0x0073*/ 17,
-      -1,
-      /*0x00e5*/ 30,
-      -1,
-      /*0x03c0*/ 259,
-      -1, -1, -1,
-      /*0x2d1a*/ 934,
-      /*0xff4b*/ 1056,
-      /*0xa667*/ 967,
-      /*0x1f45*/ 722,
-      /*0x1eef*/ 678,
-      /*0x1e6f*/ 619,
-      /*0x04ef*/ 405,
-      /*0x016f*/ 109,
-      -1,
-      /*0x13ef*/ 555,
-      /*0x026f*/ 218,
-      /*0x046f*/ 345,
-      /*0xa76f*/ 1022,
-      /*0x006f*/ 13,
-      /*0x10cef*/ 1159,
-      /*0x1eed*/ 677,
-      /*0x1e6d*/ 618,
-      /*0x04ed*/ 404,
-      /*0x016d*/ 108,
-      /*0x03df*/ 277,
-      /*0x13ed*/ 553,
-      -1,
-      /*0x046d*/ 344,
-      /*0xa76d*/ 1021,
-      /*0x006d*/ 11,
-      /*0x10ced*/ 1157,
-      -1,
-      /*0x0565*/ 442,
-      /*0x2d02*/ 910,
-      -1, -1,
-      /*0x1f43*/ 720,
-      /*0x1e81*/ 628,
-      /*0x1e01*/ 564,
-      /*0x0481*/ 354,
-      /*0x0101*/ 56,
-      /*0x2c81*/ 855,
-      /*0xff49*/ 1054,
-      /*0x0201*/ 165,
-      /*0x03e7*/ 281,
-      /*0x1eb7*/ 650,
-      /*0x1e37*/ 591,
-      /*0x04b7*/ 377,
-      /*0x0137*/ 82,
-      /*0x2cb7*/ 882,
-      /*0x13b7*/ 499,
-      /*0x2d1e*/ 938,
-      /*0x0437*/ 297,
-      /*0xa737*/ 994,
-      /*0xa669*/ 968,
-      /*0x1fe1*/ 754,
-      /*0x1f41*/ 718,
-      /*0x2c73*/ 853,
-      -1,
-      /*0x0292*/ 231,
-      /*0x01dd*/ 149,
-      /*0x10437*/ 1087,
-      -1,
-      /*0x2d22*/ 942,
-      -1, -1,
-      /*0xff47*/ 1052,
-      /*0x1fd1*/ 752,
-      -1,
-      /*0x2d0e*/ 922,
-      /*0x04ce*/ 388,
-      /*0x03b3*/ 246,
-      -1,
-      /*0x13ce*/ 522,
-      -1,
-      /*0x044e*/ 320,
-      /*0x1f40*/ 717,
-      -1,
-      /*0x10cce*/ 1126,
-      /*0x01c9*/ 139,
-      -1, -1, -1,
-      /*0xa66b*/ 969,
-      /*0x1044e*/ 1110,
-      /*0x013c*/ 84,
-      -1,
-      /*0x13bc*/ 504,
-      /*0x023c*/ 190,
-      /*0x043c*/ 302,
-      /*0xff45*/ 1050,
-      /*0x03e9*/ 282,
-      /*0x1eb5*/ 649,
-      /*0x1e35*/ 590,
-      /*0x04b5*/ 376,
-      /*0x0135*/ 81,
-      /*0x2cb5*/ 881,
-      /*0x13b5*/ 497,
-      /*0x1043c*/ 1092,
-      /*0x0435*/ 295,
-      /*0xa735*/ 993,
-      /*0x1ead*/ 645,
-      /*0x1e2d*/ 586,
-      /*0x04ad*/ 372,
-      /*0x012d*/ 78,
-      /*0x2cad*/ 877,
-      /*0x13ad*/ 489,
-      /*0x022d*/ 186,
-      /*0x10435*/ 1085,
-      /*0xa72d*/ 990,
-      -1, -1, -1, -1,
-      /*0x2c37*/ 807,
-      /*0x0180*/ 117,
-      /*0x00fe*/ 54,
-      /*0x1042d*/ 1077,
-      /*0xff43*/ 1048,
-      /*0x1f67*/ 734,
-      /*0x03eb*/ 283,
-      /*0x1ea5*/ 641,
-      /*0x1e25*/ 582,
-      /*0x04a5*/ 368,
-      /*0x0125*/ 74,
-      /*0x2ca5*/ 873,
-      /*0x13a5*/ 481,
-      /*0x0225*/ 182,
-      /*0x04cc*/ 387,
-      /*0xa725*/ 986,
-      /*0x13a8*/ 484,
-      /*0x13cc*/ 520,
-      /*0x0580*/ 469,
-      /*0x044c*/ 318,
-      -1,
-      /*0x1f11*/ 696,
-      /*0x10ccc*/ 1124,
-      /*0x2c4e*/ 830,
-      /*0xff41*/ 1046,
-      /*0x1fe5*/ 755,
-      -1,
-      /*0x10428*/ 1072,
-      /*0x1044c*/ 1108,
-      -1,
-      /*0x1e85*/ 630,
-      /*0x1e05*/ 566,
-      /*0x1f33*/ 712,
-      /*0x0105*/ 58,
-      /*0x2c85*/ 857,
-      /*0x057e*/ 467,
-      /*0x0205*/ 167,
-      /*0x2c3c*/ 812,
-      /*0x1e83*/ 629,
-      /*0x1e03*/ 565,
-      /*0xa66d*/ 970,
-      /*0x0103*/ 57,
-      /*0x2c83*/ 856,
-      /*0x1f7c*/ 747,
-      /*0x0203*/ 166,
-      /*0x03f3*/ 287,
-      -1,
-      /*0x2c35*/ 805,
-      /*0x2d20*/ 940,
-      /*0x1ea3*/ 640,
-      /*0x1e23*/ 581,
-      /*0x04a3*/ 367,
-      /*0x0123*/ 73,
-      /*0x2ca3*/ 872,
-      /*0x13a3*/ 479,
-      /*0x0223*/ 181,
-      -1,
-      /*0xa723*/ 985,
-      /*0x1eb1*/ 647,
-      /*0x1e31*/ 588,
-      /*0x04b1*/ 374,
-      /*0x118ce*/ 1177,
-      /*0x2cb1*/ 879,
-      /*0x13b1*/ 493,
-      /*0x0231*/ 188,
-      /*0x0431*/ 291,
-      /*0x03ef*/ 285,
-      -1,
-      /*0x2d00*/ 908,
-      /*0x1e95*/ 638,
-      /*0x1e15*/ 574,
-      /*0x0495*/ 360,
-      /*0x0115*/ 66,
-      /*0x2c95*/ 865,
-      /*0x10431*/ 1081,
-      /*0x0215*/ 175,
-      /*0x1f12*/ 697,
-      /*0x03ed*/ 284,
-      /*0x1ebf*/ 654,
-      /*0x1e3f*/ 595,
-      /*0x04bf*/ 381,
-      /*0x2c4c*/ 828,
-      /*0x2cbf*/ 886,
-      /*0x13bf*/ 507,
-      /*0x023f*/ 191,
-      /*0x043f*/ 305,
-      /*0xa73f*/ 998,
-      /*0x1ea7*/ 642,
-      /*0x1e27*/ 583,
-      /*0x04a7*/ 369,
-      /*0x0127*/ 75,
-      /*0x2ca7*/ 874,
-      /*0x13a7*/ 483,
-      /*0x0227*/ 183,
-      /*0x1043f*/ 1095,
-      /*0xa727*/ 987,
-      -1,
-      /*0x1e93*/ 637,
-      /*0x1e13*/ 573,
-      /*0x0493*/ 359,
-      /*0x0113*/ 65,
-      /*0x2c93*/ 864,
-      /*0x03b7*/ 250,
-      /*0x0213*/ 174,
-      /*0x01df*/ 150,
-      /*0x1ef1*/ 679,
-      /*0x1e71*/ 620,
-      /*0x04f1*/ 406,
-      /*0x0171*/ 110,
-      -1,
-      /*0x13f1*/ 557,
-      /*0x0271*/ 219,
-      /*0x0471*/ 346,
-      /*0x0188*/ 120,
-      /*0x0071*/ 15,
-      /*0x10cf1*/ 1161,
-      -1, -1, -1,
-      /*0x118cc*/ 1175,
-      /*0x1f73*/ 738,
-      -1, -1,
-      /*0x217e*/ 771,
-      /*0x01e7*/ 154,
-      /*0x03ce*/ 272,
-      -1,
-      /*0x2c31*/ 801,
-      /*0x1ef5*/ 681,
-      /*0x1e75*/ 622,
-      /*0x04f5*/ 408,
-      /*0x0175*/ 112,
-      -1,
-      /*0x13f5*/ 561,
-      /*0x0275*/ 221,
-      /*0x0475*/ 348,
-      -1,
-      /*0x0075*/ 19,
-      -1,
-      /*0x03bc*/ 255,
-      /*0x028c*/ 230,
-      -1, -1,
-      /*0x04c6*/ 384,
-      /*0x0146*/ 89,
-      -1,
-      /*0x13c6*/ 514,
-      /*0x2c3f*/ 815,
-      /*0x0446*/ 312,
-      /*0x03b5*/ 248,
-      /*0x1f04*/ 691,
-      /*0x10cc6*/ 1118,
-      /*0x00e7*/ 32,
-      /*0x0283*/ 224,
-      -1, -1, -1,
-      /*0x10446*/ 1102,
-      /*0x03ad*/ 241,
-      -1, -1,
-      /*0xa791*/ 1031,
-      /*0x1ea1*/ 639,
-      /*0x1e21*/ 580,
-      /*0x04a1*/ 366,
-      /*0x0121*/ 72,
-      /*0x2ca1*/ 871,
-      /*0x13a1*/ 477,
-      -1,
-      /*0x1f01*/ 688,
-      -1,
-      /*0x01e9*/ 155,
-      -1,
-      /*0x04c4*/ 383,
-      /*0x0144*/ 88,
-      -1,
-      /*0x13c4*/ 512,
-      /*0x1f37*/ 716,
-      /*0x0444*/ 310,
-      -1,
-      /*0x2d08*/ 916,
-      /*0x10cc4*/ 1116,
-      -1,
-      /*0x03cc*/ 270,
-      -1,
-      /*0x0567*/ 444,
-      -1,
-      /*0x10444*/ 1100,
-      /*0x04c2*/ 382,
-      /*0x0142*/ 87,
-      /*0x00fc*/ 52,
-      /*0x13c2*/ 510,
-      /*0x0242*/ 193,
-      /*0x0442*/ 308,
-      -1,
-      /*0x0192*/ 122,
-      /*0x10cc2*/ 1114,
-      -1, -1,
-      /*0x00e9*/ 34,
-      /*0x01eb*/ 156,
-      /*0x0511*/ 422,
-      /*0x10442*/ 1098,
-      -1,
-      /*0x1ebd*/ 653,
-      /*0x1e3d*/ 594,
-      /*0x04bd*/ 380,
-      /*0x2d11*/ 925,
-      /*0x2cbd*/ 885,
-      /*0x13bd*/ 505,
-      /*0x2c46*/ 822,
-      /*0x043d*/ 303,
-      /*0xa73d*/ 997,
-      -1,
-      /*0x1eb9*/ 651,
-      /*0x1e39*/ 592,
-      /*0x04b9*/ 378,
-      -1,
-      /*0x2cb9*/ 883,
-      /*0x13b9*/ 501,
-      /*0x1043d*/ 1093,
-      /*0x0439*/ 299,
-      /*0xa739*/ 995,
-      /*0x057c*/ 465,
-      /*0x1f35*/ 714,
-      -1, -1, -1,
-      /*0x00eb*/ 36,
-      /*0x03b1*/ 244,
-      /*0x10439*/ 1089,
-      -1,
-      /*0x0569*/ 446,
-      -1,
-      /*0xa691*/ 979,
-      -1,
-      /*0x1efb*/ 684,
-      /*0x1e7b*/ 625,
-      /*0x04fb*/ 411,
-      /*0x01f3*/ 159,
-      /*0x2c44*/ 820,
-      /*0x1e87*/ 631,
-      /*0x1e07*/ 567,
-      /*0x047b*/ 351,
-      /*0x0107*/ 59,
-      /*0x2c87*/ 858,
-      -1,
-      /*0x0207*/ 168,
-      /*0x118c6*/ 1169,
-      /*0x03bf*/ 258,
-      /*0x1efd*/ 685,
-      /*0x1e7d*/ 626,
-      /*0x04fd*/ 412,
-      /*0x1f25*/ 706,
-      /*0x2d1c*/ 936,
-      /*0x2c42*/ 818,
-      /*0x027d*/ 222,
-      /*0x047d*/ 352,
-      -1, -1,
-      /*0x01ef*/ 158,
-      /*0x056b*/ 448,
-      /*0x2d12*/ 926,
-      /*0x1ef9*/ 683,
-      /*0x1e79*/ 624,
-      /*0x04f9*/ 410,
-      /*0x1d7d*/ 563,
-      /*0x00f3*/ 44,
-      -1, -1,
-      /*0x0479*/ 350,
-      /*0x01ed*/ 157,
-      /*0x0079*/ 23,
-      /*0x2c3d*/ 813,
-      /*0x050f*/ 421,
-      -1,
-      /*0x1f05*/ 692,
-      -1,
-      /*0x118c4*/ 1167,
-      /*0x1d79*/ 562,
-      /*0x2d0f*/ 923,
-      -1,
-      /*0xff4e*/ 1059,
-      /*0x2c39*/ 809,
-      /*0x1f03*/ 690,
-      -1,
-      /*0x0584*/ 473,
-      -1,
-      /*0x00ef*/ 40,
-      /*0x1e19*/ 576,
-      /*0x0499*/ 362,
-      /*0x0119*/ 68,
-      /*0x2c99*/ 867,
-      /*0x118c2*/ 1165,
-      /*0x0219*/ 177,
-      /*0x1f23*/ 704,
-      -1,
-      /*0x13f2*/ 558,
-      /*0x0272*/ 220,
-      /*0x00ed*/ 38,
-      /*0x0573*/ 456,
-      /*0x0072*/ 16,
-      /*0x10cf2*/ 1162,
-      -1,
-      /*0x1f31*/ 710,
-      /*0x0581*/ 470,
-      -1,
-      /*0xa68f*/ 978,
-      -1,
-      /*0xa781*/ 1026,
-      -1,
-      /*0x217c*/ 769,
-      /*0x03c6*/ 264,
-      -1, -1,
-      /*0x1f15*/ 700,
-      -1,
-      /*0xa7b7*/ 1044,
-      -1,
-      /*0x01ce*/ 141,
-      -1,
-      /*0x056f*/ 452,
-      -1,
-      /*0x1eaf*/ 646,
-      /*0x1e2f*/ 587,
-      /*0x04af*/ 373,
-      /*0x012f*/ 79,
-      /*0x2caf*/ 878,
-      /*0x13af*/ 491,
-      /*0x022f*/ 187,
-      -1,
-      /*0xa72f*/ 991,
-      /*0x056d*/ 450,
-      /*0x1f27*/ 708,
-      -1, -1,
-      /*0x2d04*/ 912,
-      -1, -1,
-      /*0x1042f*/ 1079,
-      /*0xff4c*/ 1057,
-      /*0x13f4*/ 560,
-      /*0x03c4*/ 262,
-      /*0x1f13*/ 698,
-      -1,
-      /*0x0074*/ 18,
-      /*0x1eff*/ 686,
-      /*0x1e7f*/ 627,
-      /*0x04ff*/ 413,
-      /*0x0501*/ 414,
-      -1,
-      /*0x1f71*/ 736,
-      /*0x01ad*/ 131,
-      /*0x047f*/ 353,
-      /*0xa77f*/ 1025,
-      /*0x2d01*/ 909,
-      /*0x0287*/ 225,
-      /*0x1ea9*/ 643,
-      /*0x1e29*/ 584,
-      /*0x04a9*/ 370,
-      /*0x0129*/ 76,
-      /*0x2ca9*/ 875,
-      /*0x13a9*/ 485,
-      /*0x0229*/ 184,
-      /*0xa7b5*/ 1043,
-      /*0xa729*/ 988,
-      /*0x1e17*/ 575,
-      /*0x0497*/ 361,
-      /*0x0117*/ 67,
-      /*0x2c97*/ 866,
-      -1,
-      /*0x0217*/ 176,
-      /*0x01a5*/ 129,
-      /*0x10429*/ 1073,
-      /*0x1f75*/ 740,
-      /*0x03bd*/ 256,
-      /*0x01a8*/ 130,
-      /*0x01cc*/ 140,
-      /*0x13d0*/ 524,
-      /*0x0250*/ 199,
-      /*0x0450*/ 322,
-      /*0x0076*/ 20,
-      /*0xa681*/ 971,
-      /*0x10cd0*/ 1128,
-      /*0x24d0*/ 774,
-      /*0x03b9*/ 252,
-      /*0x04c8*/ 385,
-      /*0x0148*/ 90,
-      /*0x2173*/ 760,
-      /*0x13c8*/ 516,
-      /*0x018c*/ 121,
-      /*0x0448*/ 314,
-      -1,
-      /*0xa7a5*/ 1040,
-      /*0x10cc8*/ 1120,
-      /*0x0185*/ 119,
-      /*0x1e1d*/ 578,
-      /*0x049d*/ 364,
-      /*0x011d*/ 70,
-      /*0x2c9d*/ 869,
-      /*0x10448*/ 1104,
-      /*0x021d*/ 179,
-      /*0x037c*/ 238,
-      /*0x0183*/ 118,
-      -1,
-      /*0x13f0*/ 556,
-      -1,
-      /*0x03fb*/ 289,
-      /*0x1f21*/ 702,
-      /*0x0070*/ 14,
-      /*0x10cf0*/ 1160,
-      /*0xa78c*/ 1030,
-      /*0x0585*/ 474,
-      /*0x052d*/ 436,
-      /*0x01a3*/ 128,
-      -1,
-      /*0xa785*/ 1028,
-      /*0x1f44*/ 721,
-      -1,
-      /*0x2d2d*/ 947,
-      /*0x0583*/ 472,
-      /*0x1ebb*/ 652,
-      /*0x1e3b*/ 593,
-      /*0x04bb*/ 379,
-      /*0xa783*/ 1027,
-      /*0x2cbb*/ 884,
-      /*0x13bb*/ 503,
-      -1,
-      /*0x043b*/ 301,
-      /*0xa73b*/ 996,
-      -1, -1,
-      /*0x1f42*/ 719,
-      /*0x0525*/ 432,
-      /*0x0195*/ 123,
-      /*0xa7a3*/ 1039,
-      -1,
-      /*0x1043b*/ 1091,
-      -1,
-      /*0x2d25*/ 945,
-      -1,
-      /*0x2c76*/ 854,
-      /*0x2c50*/ 832,
-      /*0x01bf*/ 137,
-      /*0x1eab*/ 644,
-      /*0x1e2b*/ 585,
-      /*0x04ab*/ 371,
-      /*0x012b*/ 77,
-      /*0x2cab*/ 876,
-      /*0x13ab*/ 487,
-      /*0x022b*/ 185,
-      -1,
-      /*0xa72b*/ 989,
-      /*0x2c48*/ 824,
-      -1, -1,
-      /*0x0505*/ 416,
-      /*0x2d0c*/ 920,
-      -1, -1,
-      /*0x1042b*/ 1075,
-      /*0x017a*/ 114,
-      /*0x2d05*/ 913,
-      /*0x03f2*/ 286,
-      /*0x0503*/ 415,
-      -1,
-      /*0xa77a*/ 1023,
-      /*0x007a*/ 24,
-      /*0x214e*/ 756,
-      /*0xff46*/ 1051,
-      /*0x2d03*/ 911,
-      -1, -1,
-      /*0xa7a7*/ 1041,
-      -1,
-      /*0x0523*/ 431,
-      -1, -1, -1,
-      /*0x0373*/ 235,
-      /*0x118d0*/ 1179,
-      /*0x2d23*/ 943,
-      /*0x1f7b*/ 746,
-      /*0xa793*/ 1032,
-      -1, -1, -1,
-      /*0x1f07*/ 694,
-      -1,
-      /*0xa685*/ 973,
-      /*0x2c3b*/ 811,
-      /*0x118c8*/ 1171,
-      -1,
-      /*0x01f5*/ 160,
-      /*0x03af*/ 243,
-      /*0x0515*/ 424,
-      /*0x1f7d*/ 748,
-      /*0xa683*/ 972,
-      /*0x00f1*/ 42,
-      /*0xff44*/ 1049,
-      -1,
-      /*0x2d15*/ 929,
-      /*0x13d6*/ 530,
-      /*0x0256*/ 204,
-      /*0x0456*/ 328,
-      -1,
-      /*0x01c6*/ 138,
-      /*0x10cd6*/ 1134,
-      /*0x24d6*/ 780,
-      /*0x1f79*/ 744,
-      /*0x029d*/ 232,
-      -1, -1,
-      /*0x0527*/ 433,
-      /*0xff42*/ 1047,
-      /*0x1ef7*/ 682,
-      /*0x1e77*/ 623,
-      /*0x04f7*/ 409,
-      /*0x0177*/ 113,
-      /*0x2d27*/ 946,
-      /*0x0078*/ 22,
-      /*0x00f5*/ 46,
-      /*0x0477*/ 349,
-      /*0x0513*/ 423,
-      /*0x0077*/ 21,
-      -1, -1,
-      /*0x01a1*/ 127,
-      /*0xa695*/ 981,
-      /*0x2d13*/ 927,
-      -1,
-      /*0x0571*/ 454,
-      /*0x13b0*/ 492,
-      -1,
-      /*0x0430*/ 290,
-      /*0x13e6*/ 546,
-      /*0x0266*/ 213,
-      -1,
-      /*0x1f72*/ 737,
-      /*0x0066*/ 5,
-      /*0x10ce6*/ 1150,
-      /*0x24e6*/ 796,
-      -1,
-      /*0x10430*/ 1080,
-      /*0x2184*/ 773,
-      /*0x13d4*/ 528,
-      /*0x0254*/ 203,
-      /*0x0454*/ 326,
-      /*0xa7a1*/ 1038,
-      -1,
-      /*0x10cd4*/ 1132,
-      /*0x24d4*/ 778,
-      -1, -1,
-      /*0x0575*/ 458,
-      /*0x03c8*/ 266,
-      /*0xa693*/ 980,
-      /*0x13d2*/ 526,
-      /*0x0252*/ 201,
-      /*0x0452*/ 324,
-      /*0x13ea*/ 550,
-      -1,
-      /*0x10cd2*/ 1130,
-      /*0x24d2*/ 776,
-      /*0x006a*/ 8,
-      /*0x10cea*/ 1154,
-      /*0x2c56*/ 838,
-      /*0x04ca*/ 386,
-      -1,
-      /*0x01bd*/ 136,
-      /*0x13ca*/ 518,
-      -1,
-      /*0x044a*/ 316,
-      -1, -1,
-      /*0x10cca*/ 1122,
-      -1, -1, -1,
-      /*0x01b9*/ 135,
-      -1,
-      /*0x1044a*/ 1106,
-      /*0x1f74*/ 739,
-      /*0x1e8d*/ 634,
-      /*0x1e0d*/ 570,
-      /*0x048d*/ 356,
-      /*0x010d*/ 62,
-      /*0x2c8d*/ 861,
-      /*0x0521*/ 430,
-      /*0x020d*/ 171,
-      -1,
-      /*0x1fb1*/ 750,
-      /*0x03bb*/ 254,
-      -1,
-      /*0x2d21*/ 941,
-      -1,
-      /*0x2c30*/ 800,
-      -1, -1,
-      /*0x2c66*/ 849,
-      -1,
-      /*0x01fb*/ 162,
-      /*0x1e89*/ 632,
-      /*0x1e09*/ 568,
-      /*0x118d6*/ 1185,
-      /*0x0109*/ 60,
-      /*0x2c89*/ 859,
-      -1,
-      /*0x0209*/ 169,
-      /*0x2c54*/ 836,
-      -1,
-      /*0x13dc*/ 536,
-      /*0x025c*/ 208,
-      /*0x045c*/ 334,
-      -1,
-      /*0x01fd*/ 163,
-      /*0x10cdc*/ 1140,
-      /*0x24dc*/ 786,
-      /*0x1f76*/ 741,
-      /*0x2171*/ 758,
-      /*0x13da*/ 534,
-      /*0x2c52*/ 834,
-      /*0x045a*/ 332,
-      -1,
-      /*0x2c6a*/ 851,
-      /*0x10cda*/ 1138,
-      /*0x24da*/ 784,
-      /*0xa787*/ 1029,
-      /*0x01f9*/ 161,
-      /*0x00fb*/ 51,
-      /*0x2cec*/ 905,
-      /*0x13ec*/ 552,
-      /*0x026c*/ 217,
-      /*0x13e4*/ 544,
-      /*0x2c4a*/ 826,
-      /*0x006c*/ 10,
-      /*0x10cec*/ 1156,
-      /*0x0064*/ 3,
-      /*0x10ce4*/ 1148,
-      /*0x24e4*/ 794,
-      -1, -1,
-      /*0x2175*/ 762,
-      /*0x00fd*/ 53,
-      /*0x13e8*/ 548,
-      /*0x0268*/ 214,
-      /*0x1f70*/ 735,
-      /*0x118d4*/ 1183,
-      /*0x0068*/ 7,
-      /*0x10ce8*/ 1152,
-      /*0x24e8*/ 798,
-      -1,
-      /*0x13d8*/ 532,
-      /*0x0199*/ 124,
-      /*0x0458*/ 330,
-      -1,
-      /*0x00f9*/ 49,
-      /*0x10cd8*/ 1136,
-      /*0x24d8*/ 782,
-      /*0x118d2*/ 1181,
-      -1, -1,
-      /*0x057b*/ 464,
-      /*0x1e1f*/ 579,
-      /*0x049f*/ 365,
-      /*0x011f*/ 71,
-      /*0x2c9f*/ 870,
-      /*0x0507*/ 417,
-      /*0x021f*/ 180,
-      -1, -1, -1,
-      /*0x118ca*/ 1173,
-      /*0x2d07*/ 915,
-      /*0xa799*/ 1034,
-      /*0x2c5c*/ 844,
-      /*0x057d*/ 466,
-      /*0x13b6*/ 498,
-      -1,
-      /*0x0436*/ 296,
-      -1, -1,
-      /*0x03f8*/ 288,
-      -1,
-      /*0x2c5a*/ 842,
-      /*0x00f2*/ 43,
-      /*0x13e2*/ 542,
-      -1,
-      /*0x10436*/ 1086,
-      /*0x0579*/ 462,
-      /*0x0062*/ 1,
-      /*0x10ce2*/ 1146,
-      /*0x24e2*/ 792,
-      /*0x13e0*/ 540,
-      /*0x0260*/ 209,
-      /*0x2c6c*/ 852,
-      -1, -1,
-      /*0x10ce0*/ 1144,
-      /*0x24e0*/ 790,
-      /*0xa687*/ 974,
-      /*0xff50*/ 1061,
-      -1, -1,
-      /*0x1f7a*/ 745,
-      -1, -1, -1,
-      /*0x2c68*/ 850,
-      -1,
-      /*0x0371*/ 234,
-      /*0x01ff*/ 164,
-      /*0xff48*/ 1053,
-      /*0x118dc*/ 1191,
-      /*0x0519*/ 426,
-      -1,
-      /*0x2c58*/ 840,
-      /*0x0289*/ 227,
-      /*0x0572*/ 455,
-      -1,
-      /*0x2d19*/ 933,
-      -1,
-      /*0x118da*/ 1189,
-      /*0x13b4*/ 496,
-      -1,
-      /*0x0434*/ 294,
-      /*0x2cee*/ 906,
-      /*0x13ee*/ 554,
-      -1,
-      /*0x00f4*/ 45,
-      -1,
-      /*0x006e*/ 12,
-      /*0x10cee*/ 1158,
-      /*0x013e*/ 85,
-      /*0x10434*/ 1084,
-      /*0x13be*/ 506,
-      /*0x03ca*/ 268,
-      /*0x043e*/ 304,
-      /*0x01d0*/ 142,
-      /*0x00ff*/ 55,
-      -1,
-      /*0x2c36*/ 806,
-      -1,
-      /*0xa7a9*/ 1042,
-      -1, -1,
-      /*0x1043e*/ 1094,
-      /*0xa699*/ 983,
-      -1,
-      /*0x052f*/ 437,
-      /*0x217b*/ 768,
-      /*0xa797*/ 1033,
-      -1, -1,
-      /*0x118d8*/ 1187,
-      -1,
-      /*0x013a*/ 83,
-      /*0x1f78*/ 743,
-      /*0x13ba*/ 502,
-      -1,
-      /*0x043a*/ 300,
-      /*0x1f77*/ 742,
-      /*0x0574*/ 457,
-      -1,
-      /*0x217d*/ 770,
-      /*0x00f6*/ 47,
-      -1, -1, -1,
-      /*0x1043a*/ 1090,
-      -1, -1,
-      /*0x057f*/ 468,
-      /*0x1f30*/ 709,
-      -1, -1,
-      /*0x1f66*/ 733,
-      /*0x2179*/ 766,
-      /*0x13b8*/ 500,
-      -1,
-      /*0x0438*/ 298,
-      /*0xa79d*/ 1036,
-      -1,
-      /*0x0529*/ 434,
-      -1, -1, -1,
-      /*0x2c34*/ 804,
-      -1,
-      /*0x10438*/ 1088,
-      -1,
-      /*0x0517*/ 425,
-      /*0x13b2*/ 494,
-      /*0x00f0*/ 41,
-      /*0x0432*/ 292,
-      -1, -1,
-      /*0x2d17*/ 931,
-      /*0x0576*/ 459,
-      /*0x2c3e*/ 814,
-      -1, -1, -1,
-      /*0x10432*/ 1082,
-      -1, -1,
-      /*0x2172*/ 759,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1,
-      /*0x051d*/ 428,
-      /*0x2c3a*/ 810,
-      -1,
-      /*0xa697*/ 982,
-      /*0xff56*/ 1067,
-      /*0x0570*/ 453,
-      /*0x2d1d*/ 937,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1,
-      /*0x037b*/ 237,
-      /*0x2c38*/ 808,
-      /*0x03b6*/ 249,
-      -1, -1, -1, -1, -1, -1,
-      /*0x2174*/ 761,
-      /*0x00fa*/ 50,
-      -1, -1, -1,
-      /*0x037d*/ 239,
-      /*0x2c32*/ 802,
-      -1, -1, -1,
-      /*0x217f*/ 772,
-      -1,
-      /*0x01d6*/ 145,
-      -1, -1, -1, -1, -1,
-      /*0xff54*/ 1065,
-      -1,
-      /*0x052b*/ 435,
-      -1, -1, -1,
-      /*0x1f64*/ 731,
-      -1, -1, -1, -1, -1,
-      /*0xff52*/ 1063,
-      -1, -1, -1,
-      /*0x057a*/ 463,
-      -1,
-      /*0x2176*/ 763,
-      -1, -1,
-      /*0x03b4*/ 247,
-      -1, -1,
-      /*0x01b0*/ 132,
-      /*0xff4a*/ 1055,
-      -1, -1, -1, -1, -1, -1,
-      -1,
-      /*0x03be*/ 257,
-      -1, -1,
-      /*0x00f8*/ 48,
-      /*0x01d4*/ 144,
-      /*0x1fd0*/ 751,
-      -1, -1, -1, -1, -1, -1,
-      -1,
-      /*0x2170*/ 757,
-      -1, -1,
-      /*0x01d2*/ 143,
-      /*0x1f36*/ 715,
-      -1, -1, -1, -1,
-      /*0x00e6*/ 31,
-      /*0x03ba*/ 253,
-      -1, -1,
-      /*0x1f62*/ 729,
-      -1, -1, -1, -1, -1, -1,
-      /*0x1f60*/ 727,
-      -1, -1,
-      /*0x0578*/ 461,
-      -1, -1, -1,
-      /*0x0577*/ 460,
-      -1,
-      /*0xff5a*/ 1071,
-      /*0x03b8*/ 251,
-      -1, -1, -1,
-      /*0x00ea*/ 35,
-      -1, -1, -1, -1, -1, -1,
-      -1,
-      /*0x0566*/ 443,
-      -1,
-      /*0x03b2*/ 245,
-      -1, -1, -1, -1, -1,
-      /*0x1f34*/ 713,
-      -1, -1, -1, -1, -1, -1,
-      /*0x01dc*/ 148,
-      /*0x217a*/ 767,
-      -1, -1,
-      /*0xff58*/ 1069,
-      -1, -1, -1, -1,
-      /*0x01da*/ 147,
-      /*0x056a*/ 447,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1,
-      /*0x050d*/ 420,
-      -1, -1,
-      /*0x01d8*/ 146,
-      -1, -1,
-      /*0x2d0d*/ 921,
-      -1, -1, -1,
-      /*0x00ec*/ 37,
-      -1,
-      /*0x00e4*/ 29,
-      -1, -1, -1,
-      /*0x2178*/ 765,
-      -1, -1,
-      /*0x0509*/ 418,
-      /*0x2177*/ 764,
-      -1, -1,
-      /*0x00e8*/ 33,
-      /*0x1f32*/ 711,
-      /*0x2d09*/ 917,
-      -1, -1,
-      /*0x01b6*/ 134,
-      -1, -1, -1, -1,
-      /*0xa68d*/ 977,
-      -1, -1, -1, -1, -1,
-      /*0xa79f*/ 1037,
-      -1, -1, -1,
-      /*0x056c*/ 449,
-      -1,
-      /*0x0564*/ 441,
-      -1, -1, -1, -1, -1,
-      /*0x1fb0*/ 749,
-      /*0xa689*/ 975,
-      -1, -1, -1,
-      /*0x0568*/ 445,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1,
-      /*0x00e2*/ 27,
-      -1, -1, -1, -1, -1, -1,
-      /*0x00e0*/ 25,
-      -1,
-      /*0x01b4*/ 133,
-      -1, -1, -1, -1,
-      /*0x051f*/ 429,
-      -1, -1, -1, -1, -1,
-      /*0x2d1f*/ 939,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      /*0x0562*/ 439,
-      -1, -1, -1, -1, -1, -1,
-      -1,
-      /*0x00ee*/ 39,
-      -1, -1, -1, -1,
-      /*0x0377*/ 236,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1,
-      /*0x056e*/ 451,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      /*0x1fe0*/ 753
-    };
-
-  if (code <= MAX_CODE_VALUE && code >= MIN_CODE_VALUE)
-    {
-      register int key = onigenc_unicode_CaseUnfold_11_hash(code);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        {
-          register short s = wordlist[key];
-
-          if (s >= 0 && code1_equal(code, CaseUnfold_11_Table[s].from))
-            return &CaseUnfold_11_Table[s].to;
-        }
-    }
-  return 0;
-}
-
-static const CaseUnfold_12_Type CaseUnfold_12_Table[] = {
-#define CaseUnfold_12 (*(CaseUnfold_12_Type (*)[58])(CaseUnfold_12_Table+0))
-  {{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}, {2, {0x00df, 0x1e9e}}},
-  {{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, {0x1f80, 0x1f88}}},
-  {{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}}},
-#define CaseUnfold_12_Locale (*(CaseUnfold_12_Type (*)[1])(CaseUnfold_12_Table+58))
-  {{0x0069, 0x0307}, {1, {0x0130}}},
-};
-
-/* C code produced by gperf version 3.0.4 */
-/* Command-line: gperf -7 -k1,2,3,4,5,6 -F,-1 -c -j1 -i1 -t -T -E -C -H onigenc_unicode_CaseUnfold_12_hash -N onigenc_unicode_CaseUnfold_12_lookup -n  */
-
-/* maximum key range = 71, duplicates = 0 */
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-/*ARGSUSED*/
-static unsigned int
-onigenc_unicode_CaseUnfold_12_hash(const OnigCodePoint *codes)
-{
-  static const unsigned char asso_values[] =
-    {
-       3, 58, 54, 57, 56, 16,  8,  2, 43, 82,
-       3,  1, 23, 82, 82, 82, 82, 82, 82,  4,
-      82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-      82, 82, 52, 51, 50, 49, 48, 47, 46, 45,
-      82, 82, 82, 82, 43, 82, 42, 82, 82, 13,
-      82, 82, 82, 82, 82, 11, 82,  1, 82, 82,
-      14, 82,  1, 82, 82, 31,  3, 82, 82, 30,
-      82, 82, 82, 10, 82, 82, 82, 82, 37, 82,
-      82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-      82, 82, 82, 82, 82, 82, 37, 15, 36, 35,
-      34, 17,  1, 33, 12,  4, 23, 23, 26, 21,
-      13, 82, 27, 82, 82,  2,  5, 82, 11, 16,
-      82, 15, 82, 82, 23, 82,  8, 82
-    };
-  return asso_values[bits_at(codes, 5)] + asso_values[bits_at(codes, 4)] + asso_values[bits_at(codes, 3)] + asso_values[bits_at(codes, 2)] + asso_values[bits_at(codes, 1)] + asso_values[bits_at(codes, 0)];
-}
-
-#ifdef __GNUC__
-__inline
-#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
-__attribute__ ((__gnu_inline__))
-#endif
-#endif
-static const CodePointList2 *
-onigenc_unicode_CaseUnfold_12_lookup(const OnigCodePoint *codes)
-{
-  enum
-    {
-      MIN_CODE_VALUE = 0x61,
-      MAX_CODE_VALUE = 0x1f7c,
-      TOTAL_KEYWORDS = 59,
-      MIN_WORD_LENGTH = 6,
-      MAX_WORD_LENGTH = 6,
-      MIN_HASH_VALUE = 11,
-      MAX_HASH_VALUE = 81
-    };
-
-  static const short wordlist[] =
-    {
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1,
-      /*0x1f66,0x03b9*/ 53,
-      /*0x1f07,0x03b9*/ 38,
-      /*0x1f00,0x03b9*/ 31,
-      /*0x0066,0x0066*/ 1,
-      /*0x1f74,0x03b9*/ 56,
-      /*0x0073,0x0073*/ 6,
-      /*0x0066,0x0069*/ 2,
-      /*0x1f06,0x03b9*/ 37,
-      /*0x0073,0x0074*/ 7,
-      /*0x03b9,0x0342*/ 18,
-      /*0x03c9,0x03b9*/ 23,
-      /*0x03b7,0x03b9*/ 17,
-      /*0x0069,0x0307*/ 58,
-      /*0x03b1,0x03b9*/ 15,
-      /*0x1f61,0x03b9*/ 48,
-      /*0x1f05,0x03b9*/ 36,
-      /*0x1f65,0x03b9*/ 52,
-      /*0x0574,0x0576*/ 29,
-      /*0x03c9,0x0342*/ 22,
-      /*0x03b7,0x0342*/ 16,
-      /*0x057e,0x0576*/ 30,
-      /*0x03b1,0x0342*/ 14,
-      /*0x1f7c,0x03b9*/ 57,
-      /*0x0574,0x0565*/ 26,
-      /*0x0079,0x030a*/ 10,
-      /*0x0077,0x030a*/ 9,
-      /*0x1f70,0x03b9*/ 55,
-      /*0x0574,0x056d*/ 28,
-      /*0x0066,0x006c*/ 3,
-      /*0x0574,0x056b*/ 27,
-      /*0x0061,0x02be*/ 0,
-      /*0x0068,0x0331*/ 4,
-      /*0x1f67,0x03b9*/ 54,
-      /*0x1f64,0x03b9*/ 51,
-      /*0x1f63,0x03b9*/ 50,
-      /*0x1f62,0x03b9*/ 49,
-      /*0x1f60,0x03b9*/ 47,
-      /*0x03ce,0x03b9*/ 24,
-      /*0x03c5,0x0342*/ 21,
-      /*0x03c5,0x0313*/ 20,
-      /*0x03c1,0x0313*/ 19,
-      /*0x02bc,0x006e*/ 11,
-      /*0x03ae,0x03b9*/ 13,
-      /*0x03ac,0x03b9*/ 12,
-      /*0x1f27,0x03b9*/ 46,
-      /*0x1f26,0x03b9*/ 45,
-      /*0x1f25,0x03b9*/ 44,
-      /*0x1f24,0x03b9*/ 43,
-      /*0x1f23,0x03b9*/ 42,
-      /*0x1f22,0x03b9*/ 41,
-      /*0x1f21,0x03b9*/ 40,
-      /*0x1f20,0x03b9*/ 39,
-      /*0x006a,0x030c*/ 5,
-      /*0x1f02,0x03b9*/ 33,
-      /*0x0074,0x0308*/ 8,
-      /*0x1f04,0x03b9*/ 35,
-      /*0x1f03,0x03b9*/ 34,
-      /*0x1f01,0x03b9*/ 32,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      /*0x0565,0x0582*/ 25
-    };
-
-  if (codes[0] <= MAX_CODE_VALUE && codes[0] >= MIN_CODE_VALUE &&
-      codes[1] <= MAX_CODE_VALUE && codes[1] >= MIN_CODE_VALUE)
-    {
-      register int key = onigenc_unicode_CaseUnfold_12_hash(codes);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        {
-          register short s = wordlist[key];
-
-          if (s >= 0 && code2_equal(codes, CaseUnfold_12_Table[s].from))
-            return &CaseUnfold_12_Table[s].to;
-        }
-    }
-  return 0;
-}
-
-static const CaseUnfold_13_Type CaseUnfold_13_Table[] = {
-#define CaseUnfold_13 (*(CaseUnfold_13_Type (*)[14])(CaseUnfold_13_Table+0))
-  {{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}}},
-};
-
-/* C code produced by gperf version 3.0.4 */
-/* Command-line: gperf -7 -k1,2,3,4,5,6,7,8,9 -F,-1 -c -j1 -i1 -t -T -E -C -H onigenc_unicode_CaseUnfold_13_hash -N onigenc_unicode_CaseUnfold_13_lookup -n  */
-
-/* maximum key range = 20, duplicates = 0 */
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-/*ARGSUSED*/
-static unsigned int
-onigenc_unicode_CaseUnfold_13_hash(const OnigCodePoint *codes)
-{
-  static const unsigned char asso_values[] =
-    {
-       7,  4, 47, 47, 47, 47,  1,  1,  2, 47,
-      47, 47, 47, 47, 47, 47, 47, 47, 47,  1,
-      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
-      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
-      47, 47, 47, 47, 47, 47, 47, 47, 47, 11,
-      47, 47, 47, 47, 47, 10, 47,  2, 47, 47,
-      47, 47, 47, 47, 47, 47,  1, 47, 47,  1,
-      47, 47, 47,  9, 47, 47, 47, 47, 47, 47,
-      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
-      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
-      47, 47,  1, 47, 47,  2, 47, 47,  1, 47,
-      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
-      47, 47, 47, 47, 47, 47, 47, 47
-    };
-  return asso_values[bits_at(codes, 8)] + asso_values[bits_at(codes, 7)] + asso_values[bits_at(codes, 6)] + asso_values[bits_at(codes, 5)] + asso_values[bits_at(codes, 4)] + asso_values[bits_at(codes, 3)] + asso_values[bits_at(codes, 2)] + asso_values[bits_at(codes, 1)] + asso_values[bits_at(codes, 0)];
-}
-
-#ifdef __GNUC__
-__inline
-#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
-__attribute__ ((__gnu_inline__))
-#endif
-#endif
-static const CodePointList2 *
-onigenc_unicode_CaseUnfold_13_lookup(const OnigCodePoint *codes)
-{
-  enum
-    {
-      MIN_CODE_VALUE = 0x66,
-      MAX_CODE_VALUE = 0x3c9,
-      TOTAL_KEYWORDS = 14,
-      MIN_WORD_LENGTH = 9,
-      MAX_WORD_LENGTH = 9,
-      MIN_HASH_VALUE = 27,
-      MAX_HASH_VALUE = 46
-    };
-
-  static const short wordlist[] =
-    {
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1,
-      /*0x03c5,0x0313,0x0342*/ 12,
-      /*0x03c5,0x0308,0x0342*/ 9,
-      /*0x03b9,0x0308,0x0342*/ 6,
-      /*0x03c5,0x0313,0x0301*/ 11,
-      /*0x03c5,0x0308,0x0301*/ 8,
-      /*0x03b9,0x0308,0x0301*/ 5,
-      /*0x03c5,0x0313,0x0300*/ 10,
-      /*0x03c5,0x0308,0x0300*/ 7,
-      /*0x03b9,0x0308,0x0300*/ 4,
-      /*0x03c9,0x0342,0x03b9*/ 13,
-      /*0x03b7,0x0342,0x03b9*/ 3,
-      /*0x03b1,0x0342,0x03b9*/ 2,
-      -1, -1, -1, -1, -1, -1,
-      /*0x0066,0x0066,0x006c*/ 1,
-      /*0x0066,0x0066,0x0069*/ 0
-    };
-
-  if (codes[0] <= MAX_CODE_VALUE && codes[0] >= MIN_CODE_VALUE &&
-      codes[1] <= MAX_CODE_VALUE && codes[1] >= MIN_CODE_VALUE &&
-      codes[2] <= MAX_CODE_VALUE && codes[2] >= MIN_CODE_VALUE)
-    {
-      register int key = onigenc_unicode_CaseUnfold_13_hash(codes);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        {
-          register short s = wordlist[key];
-
-          if (s >= 0 && code3_equal(codes, CaseUnfold_13_Table[s].from))
-            return &CaseUnfold_13_Table[s].to;
-        }
-    }
-  return 0;
-}
-
-OnigCodePoint CaseMappingSpecials[] = {
-    L(1)|0x039C,
-    L(2)|0x0053, 0x0073, L(2)|0x0053, 0x0053,
-    L(2)|0x02BC, 0x004E,
-    L(1)|0x0053,
-    L(1)|0x01C5,
-    L(2)|0x0064, 0x017D, L(1)|0x01C4,
-    L(1)|0x01C8,
-    L(2)|0x006C, 0x004A, L(1)|0x01C7,
-    L(1)|0x01CB,
-    L(2)|0x006E, 0x004A, L(1)|0x01CA,
-    L(2)|0x004A, 0x030C,
-    L(1)|0x01F2,
-    L(2)|0x0064, 0x005A, L(1)|0x01F1,
-    L(1)|0x0399,
-    L(3)|0x0399, 0x0308, 0x0301,
-    L(3)|0x03A5, 0x0308, 0x0301,
-    L(1)|0x03A3,
-    L(1)|0x0392,
-    L(1)|0x0398,
-    L(1)|0x03A6,
-    L(1)|0x03A0,
-    L(1)|0x039A,
-    L(1)|0x03A1,
-    L(1)|0x0395,
-    L(2)|0x0535, 0x0582, L(2)|0x0535, 0x0552,
-    L(2)|0x0048, 0x0331,
-    L(2)|0x0054, 0x0308,
-    L(2)|0x0057, 0x030A,
-    L(2)|0x0059, 0x030A,
-    L(2)|0x0041, 0x02BE,
-    L(1)|0x1E60,
-    L(1)|0x00DF,
-    L(2)|0x03A5, 0x0313,
-    L(3)|0x03A5, 0x0313, 0x0300,
-    L(3)|0x03A5, 0x0313, 0x0301,
-    L(3)|0x03A5, 0x0313, 0x0342,
-    L(1)|0x1F88, L(2)|0x1F08, 0x0399,
-    L(1)|0x1F89, L(2)|0x1F09, 0x0399,
-    L(1)|0x1F8A, L(2)|0x1F0A, 0x0399,
-    L(1)|0x1F8B, L(2)|0x1F0B, 0x0399,
-    L(1)|0x1F8C, L(2)|0x1F0C, 0x0399,
-    L(1)|0x1F8D, L(2)|0x1F0D, 0x0399,
-    L(1)|0x1F8E, L(2)|0x1F0E, 0x0399,
-    L(1)|0x1F8F, L(2)|0x1F0F, 0x0399,
-    L(2)|0x1F00, 0x0399, L(1)|0x1F80, L(2)|0x1F08, 0x0399,
-    L(2)|0x1F01, 0x0399, L(1)|0x1F81, L(2)|0x1F09, 0x0399,
-    L(2)|0x1F02, 0x0399, L(1)|0x1F82, L(2)|0x1F0A, 0x0399,
-    L(2)|0x1F03, 0x0399, L(1)|0x1F83, L(2)|0x1F0B, 0x0399,
-    L(2)|0x1F04, 0x0399, L(1)|0x1F84, L(2)|0x1F0C, 0x0399,
-    L(2)|0x1F05, 0x0399, L(1)|0x1F85, L(2)|0x1F0D, 0x0399,
-    L(2)|0x1F06, 0x0399, L(1)|0x1F86, L(2)|0x1F0E, 0x0399,
-    L(2)|0x1F07, 0x0399, L(1)|0x1F87, L(2)|0x1F0F, 0x0399,
-    L(1)|0x1F98, L(2)|0x1F28, 0x0399,
-    L(1)|0x1F99, L(2)|0x1F29, 0x0399,
-    L(1)|0x1F9A, L(2)|0x1F2A, 0x0399,
-    L(1)|0x1F9B, L(2)|0x1F2B, 0x0399,
-    L(1)|0x1F9C, L(2)|0x1F2C, 0x0399,
-    L(1)|0x1F9D, L(2)|0x1F2D, 0x0399,
-    L(1)|0x1F9E, L(2)|0x1F2E, 0x0399,
-    L(1)|0x1F9F, L(2)|0x1F2F, 0x0399,
-    L(2)|0x1F20, 0x0399, L(1)|0x1F90, L(2)|0x1F28, 0x0399,
-    L(2)|0x1F21, 0x0399, L(1)|0x1F91, L(2)|0x1F29, 0x0399,
-    L(2)|0x1F22, 0x0399, L(1)|0x1F92, L(2)|0x1F2A, 0x0399,
-    L(2)|0x1F23, 0x0399, L(1)|0x1F93, L(2)|0x1F2B, 0x0399,
-    L(2)|0x1F24, 0x0399, L(1)|0x1F94, L(2)|0x1F2C, 0x0399,
-    L(2)|0x1F25, 0x0399, L(1)|0x1F95, L(2)|0x1F2D, 0x0399,
-    L(2)|0x1F26, 0x0399, L(1)|0x1F96, L(2)|0x1F2E, 0x0399,
-    L(2)|0x1F27, 0x0399, L(1)|0x1F97, L(2)|0x1F2F, 0x0399,
-    L(1)|0x1FA8, L(2)|0x1F68, 0x0399,
-    L(1)|0x1FA9, L(2)|0x1F69, 0x0399,
-    L(1)|0x1FAA, L(2)|0x1F6A, 0x0399,
-    L(1)|0x1FAB, L(2)|0x1F6B, 0x0399,
-    L(1)|0x1FAC, L(2)|0x1F6C, 0x0399,
-    L(1)|0x1FAD, L(2)|0x1F6D, 0x0399,
-    L(1)|0x1FAE, L(2)|0x1F6E, 0x0399,
-    L(1)|0x1FAF, L(2)|0x1F6F, 0x0399,
-    L(2)|0x1F60, 0x0399, L(1)|0x1FA0, L(2)|0x1F68, 0x0399,
-    L(2)|0x1F61, 0x0399, L(1)|0x1FA1, L(2)|0x1F69, 0x0399,
-    L(2)|0x1F62, 0x0399, L(1)|0x1FA2, L(2)|0x1F6A, 0x0399,
-    L(2)|0x1F63, 0x0399, L(1)|0x1FA3, L(2)|0x1F6B, 0x0399,
-    L(2)|0x1F64, 0x0399, L(1)|0x1FA4, L(2)|0x1F6C, 0x0399,
-    L(2)|0x1F65, 0x0399, L(1)|0x1FA5, L(2)|0x1F6D, 0x0399,
-    L(2)|0x1F66, 0x0399, L(1)|0x1FA6, L(2)|0x1F6E, 0x0399,
-    L(2)|0x1F67, 0x0399, L(1)|0x1FA7, L(2)|0x1F6F, 0x0399,
-    L(2)|0x1FBA, 0x0345, L(2)|0x1FBA, 0x0399,
-    L(1)|0x1FBC, L(2)|0x0391, 0x0399,
-    L(2)|0x0386, 0x0345, L(2)|0x0386, 0x0399,
-    L(2)|0x0391, 0x0342,
-    L(3)|0x0391, 0x0342, 0x0345, L(3)|0x0391, 0x0342, 0x0399,
-    L(2)|0x03B1, 0x0399, L(1)|0x1FB3, L(2)|0x0391, 0x0399,
-    L(1)|0x0399,
-    L(2)|0x1FCA, 0x0345, L(2)|0x1FCA, 0x0399,
-    L(1)|0x1FCC, L(2)|0x0397, 0x0399,
-    L(2)|0x0389, 0x0345, L(2)|0x0389, 0x0399,
-    L(2)|0x0397, 0x0342,
-    L(3)|0x0397, 0x0342, 0x0345, L(3)|0x0397, 0x0342, 0x0399,
-    L(2)|0x03B7, 0x0399, L(1)|0x1FC3, L(2)|0x0397, 0x0399,
-    L(3)|0x0399, 0x0308, 0x0300,
-    L(3)|0x0399, 0x0308, 0x0301,
-    L(2)|0x0399, 0x0342,
-    L(3)|0x0399, 0x0308, 0x0342,
-    L(3)|0x03A5, 0x0308, 0x0300,
-    L(3)|0x03A5, 0x0308, 0x0301,
-    L(2)|0x03A1, 0x0313,
-    L(2)|0x03A5, 0x0342,
-    L(3)|0x03A5, 0x0308, 0x0342,
-    L(2)|0x1FFA, 0x0345, L(2)|0x1FFA, 0x0399,
-    L(1)|0x1FFC, L(2)|0x03A9, 0x0399,
-    L(2)|0x038F, 0x0345, L(2)|0x038F, 0x0399,
-    L(2)|0x03A9, 0x0342,
-    L(3)|0x03A9, 0x0342, 0x0345, L(3)|0x03A9, 0x0342, 0x0399,
-    L(2)|0x03C9, 0x0399, L(1)|0x1FF3, L(2)|0x03A9, 0x0399,
-    L(2)|0x0046, 0x0066, L(2)|0x0046, 0x0046,
-    L(2)|0x0046, 0x0069, L(2)|0x0046, 0x0049,
-    L(2)|0x0046, 0x006C, L(2)|0x0046, 0x004C,
-    L(3)|0x0046, 0x0066, 0x0069, L(3)|0x0046, 0x0046, 0x0049,
-    L(3)|0x0046, 0x0066, 0x006C, L(3)|0x0046, 0x0046, 0x004C,
-    L(2)|0x0053, 0x0074, L(2)|0x0053, 0x0054,
-    L(2)|0x0053, 0x0074, L(2)|0x0053, 0x0054,
-    L(2)|0x0544, 0x0576, L(2)|0x0544, 0x0546,
-    L(2)|0x0544, 0x0565, L(2)|0x0544, 0x0535,
-    L(2)|0x0544, 0x056B, L(2)|0x0544, 0x053B,
-    L(2)|0x054E, 0x0576, L(2)|0x054E, 0x0546,
-    L(2)|0x0544, 0x056D, L(2)|0x0544, 0x053D,
-};
diff --git a/enc/unicode/name2ctype.h b/enc/unicode/name2ctype.h
deleted file mode 100644
index 8c193dc4a1..0000000000
--- a/enc/unicode/name2ctype.h
+++ /dev/null
@@ -1,34027 +0,0 @@
-/* C code produced by gperf version 3.0.4 */
-/* Command-line: gperf -7 -c -j1 -i1 -t -C -P -T -H uniname2ctype_hash -Q uniname2ctype_pool -N uniname2ctype_p  */
-#ifndef USE_UNICODE_PROPERTIES
-/* Computed positions: -k'1,3' */
-#else /* USE_UNICODE_PROPERTIES */
-/* Computed positions: -k'1-3,5-6,12,16,$' */
-#endif /* USE_UNICODE_PROPERTIES */
-
-#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
-
-
-#define long size_t
-
-/* 'NEWLINE': [[:NEWLINE:]] */
-static const OnigCodePoint CR_NEWLINE[] = {
-	1,
-	0x000a, 0x000a,
-}; /* CR_NEWLINE */
-
-/* 'Alpha': [[:Alpha:]] */
-static const OnigCodePoint CR_Alpha[] = {
-	617,
-	0x0041, 0x005a,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00b5, 0x00b5,
-	0x00ba, 0x00ba,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x02c1,
-	0x02c6, 0x02d1,
-	0x02e0, 0x02e4,
-	0x02ec, 0x02ec,
-	0x02ee, 0x02ee,
-	0x0345, 0x0345,
-	0x0370, 0x0374,
-	0x0376, 0x0377,
-	0x037a, 0x037d,
-	0x037f, 0x037f,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x048a, 0x052f,
-	0x0531, 0x0556,
-	0x0559, 0x0559,
-	0x0561, 0x0587,
-	0x05b0, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0610, 0x061a,
-	0x0620, 0x0657,
-	0x0659, 0x065f,
-	0x066e, 0x06d3,
-	0x06d5, 0x06dc,
-	0x06e1, 0x06e8,
-	0x06ed, 0x06ef,
-	0x06fa, 0x06fc,
-	0x06ff, 0x06ff,
-	0x0710, 0x073f,
-	0x074d, 0x07b1,
-	0x07ca, 0x07ea,
-	0x07f4, 0x07f5,
-	0x07fa, 0x07fa,
-	0x0800, 0x0817,
-	0x081a, 0x082c,
-	0x0840, 0x0858,
-	0x08a0, 0x08b4,
-	0x08e3, 0x08e9,
-	0x08f0, 0x093b,
-	0x093d, 0x094c,
-	0x094e, 0x0950,
-	0x0955, 0x0963,
-	0x0971, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bd, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cc,
-	0x09ce, 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,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4c,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a70, 0x0a75,
-	0x0a81, 0x0a83,
-	0x0a85, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abd, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acc,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae3,
-	0x0af9, 0x0af9,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3d, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4c,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	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, 0x0bcc,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0c00, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4c,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c5a,
-	0x0c60, 0x0c63,
-	0x0c81, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbd, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccc,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0cf1, 0x0cf2,
-	0x0d01, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4c,
-	0x0d4e, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d5f, 0x0d63,
-	0x0d7a, 0x0d7f,
-	0x0d82, 0x0d83,
-	0x0d85, 0x0d96,
-	0x0d9a, 0x0db1,
-	0x0db3, 0x0dbb,
-	0x0dbd, 0x0dbd,
-	0x0dc0, 0x0dc6,
-	0x0dcf, 0x0dd4,
-	0x0dd6, 0x0dd6,
-	0x0dd8, 0x0ddf,
-	0x0df2, 0x0df3,
-	0x0e01, 0x0e3a,
-	0x0e40, 0x0e46,
-	0x0e4d, 0x0e4d,
-	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,
-	0x0ecd, 0x0ecd,
-	0x0edc, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f40, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f81,
-	0x0f88, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x1000, 0x1036,
-	0x1038, 0x1038,
-	0x103b, 0x103f,
-	0x1050, 0x1062,
-	0x1065, 0x1068,
-	0x106e, 0x1086,
-	0x108e, 0x108e,
-	0x109c, 0x109d,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 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, 0x13f5,
-	0x13f8, 0x13fd,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f8,
-	0x1700, 0x170c,
-	0x170e, 0x1713,
-	0x1720, 0x1733,
-	0x1740, 0x1753,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-	0x1780, 0x17b3,
-	0x17b6, 0x17c8,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dc,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191e,
-	0x1920, 0x192b,
-	0x1930, 0x1938,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x1a00, 0x1a1b,
-	0x1a20, 0x1a5e,
-	0x1a61, 0x1a74,
-	0x1aa7, 0x1aa7,
-	0x1b00, 0x1b33,
-	0x1b35, 0x1b43,
-	0x1b45, 0x1b4b,
-	0x1b80, 0x1ba9,
-	0x1bac, 0x1baf,
-	0x1bba, 0x1be5,
-	0x1be7, 0x1bf1,
-	0x1c00, 0x1c35,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c7d,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf3,
-	0x1cf5, 0x1cf6,
-	0x1d00, 0x1dbf,
-	0x1de7, 0x1df4,
-	0x1e00, 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, 0x209c,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2119, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x212d,
-	0x212f, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2160, 0x2188,
-	0x24b6, 0x24e9,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2ce4,
-	0x2ceb, 0x2cee,
-	0x2cf2, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2dff,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3007,
-	0x3021, 0x3029,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x309d, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fd5,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa640, 0xa66e,
-	0xa674, 0xa67b,
-	0xa67f, 0xa6ef,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa7ad,
-	0xa7b0, 0xa7b7,
-	0xa7f7, 0xa801,
-	0xa803, 0xa805,
-	0xa807, 0xa80a,
-	0xa80c, 0xa827,
-	0xa840, 0xa873,
-	0xa880, 0xa8c3,
-	0xa8f2, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa8fd, 0xa8fd,
-	0xa90a, 0xa92a,
-	0xa930, 0xa952,
-	0xa960, 0xa97c,
-	0xa980, 0xa9b2,
-	0xa9b4, 0xa9bf,
-	0xa9cf, 0xa9cf,
-	0xa9e0, 0xa9e4,
-	0xa9e6, 0xa9ef,
-	0xa9fa, 0xa9fe,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa60, 0xaa76,
-	0xaa7a, 0xaa7a,
-	0xaa7e, 0xaabe,
-	0xaac0, 0xaac0,
-	0xaac2, 0xaac2,
-	0xaadb, 0xaadd,
-	0xaae0, 0xaaef,
-	0xaaf2, 0xaaf5,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xab30, 0xab5a,
-	0xab5c, 0xab65,
-	0xab70, 0xabea,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa6d,
-	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,
-	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,
-	0x10140, 0x10174,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031f,
-	0x10330, 0x1034a,
-	0x10350, 0x1037a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10860, 0x10876,
-	0x10880, 0x1089e,
-	0x108e0, 0x108f2,
-	0x108f4, 0x108f5,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10a80, 0x10a9c,
-	0x10ac0, 0x10ac7,
-	0x10ac9, 0x10ae4,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10b80, 0x10b91,
-	0x10c00, 0x10c48,
-	0x10c80, 0x10cb2,
-	0x10cc0, 0x10cf2,
-	0x11000, 0x11045,
-	0x11082, 0x110b8,
-	0x110d0, 0x110e8,
-	0x11100, 0x11132,
-	0x11150, 0x11172,
-	0x11176, 0x11176,
-	0x11180, 0x111bf,
-	0x111c1, 0x111c4,
-	0x111da, 0x111da,
-	0x111dc, 0x111dc,
-	0x11200, 0x11211,
-	0x11213, 0x11234,
-	0x11237, 0x11237,
-	0x11280, 0x11286,
-	0x11288, 0x11288,
-	0x1128a, 0x1128d,
-	0x1128f, 0x1129d,
-	0x1129f, 0x112a8,
-	0x112b0, 0x112e8,
-	0x11300, 0x11303,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133d, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134c,
-	0x11350, 0x11350,
-	0x11357, 0x11357,
-	0x1135d, 0x11363,
-	0x11480, 0x114c1,
-	0x114c4, 0x114c5,
-	0x114c7, 0x114c7,
-	0x11580, 0x115b5,
-	0x115b8, 0x115be,
-	0x115d8, 0x115dd,
-	0x11600, 0x1163e,
-	0x11640, 0x11640,
-	0x11644, 0x11644,
-	0x11680, 0x116b5,
-	0x11700, 0x11719,
-	0x1171d, 0x1172a,
-	0x118a0, 0x118df,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x12000, 0x12399,
-	0x12400, 0x1246e,
-	0x12480, 0x12543,
-	0x13000, 0x1342e,
-	0x14400, 0x14646,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16ad0, 0x16aed,
-	0x16b00, 0x16b36,
-	0x16b40, 0x16b43,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f93, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	0x1bc9e, 0x1bc9e,
-	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, 0x1d7cb,
-	0x1e800, 0x1e8c4,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1f130, 0x1f149,
-	0x1f150, 0x1f169,
-	0x1f170, 0x1f189,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2b820, 0x2cea1,
-	0x2f800, 0x2fa1d,
-}; /* CR_Alpha */
-
-/* 'Blank': [[:Blank:]] */
-static const OnigCodePoint CR_Blank[] = {
-	8,
-	0x0009, 0x0009,
-	0x0020, 0x0020,
-	0x00a0, 0x00a0,
-	0x1680, 0x1680,
-	0x2000, 0x200a,
-	0x202f, 0x202f,
-	0x205f, 0x205f,
-	0x3000, 0x3000,
-}; /* CR_Blank */
-
-/* 'Cntrl': [[:Cntrl:]] */
-static const OnigCodePoint CR_Cntrl[] = {
-	2,
-	0x0000, 0x001f,
-	0x007f, 0x009f,
-}; /* CR_Cntrl */
-
-/* 'Digit': [[:Digit:]] */
-static const OnigCodePoint CR_Digit[] = {
-	51,
-	0x0030, 0x0039,
-	0x0660, 0x0669,
-	0x06f0, 0x06f9,
-	0x07c0, 0x07c9,
-	0x0966, 0x096f,
-	0x09e6, 0x09ef,
-	0x0a66, 0x0a6f,
-	0x0ae6, 0x0aef,
-	0x0b66, 0x0b6f,
-	0x0be6, 0x0bef,
-	0x0c66, 0x0c6f,
-	0x0ce6, 0x0cef,
-	0x0d66, 0x0d6f,
-	0x0de6, 0x0def,
-	0x0e50, 0x0e59,
-	0x0ed0, 0x0ed9,
-	0x0f20, 0x0f29,
-	0x1040, 0x1049,
-	0x1090, 0x1099,
-	0x17e0, 0x17e9,
-	0x1810, 0x1819,
-	0x1946, 0x194f,
-	0x19d0, 0x19d9,
-	0x1a80, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1b50, 0x1b59,
-	0x1bb0, 0x1bb9,
-	0x1c40, 0x1c49,
-	0x1c50, 0x1c59,
-	0xa620, 0xa629,
-	0xa8d0, 0xa8d9,
-	0xa900, 0xa909,
-	0xa9d0, 0xa9d9,
-	0xa9f0, 0xa9f9,
-	0xaa50, 0xaa59,
-	0xabf0, 0xabf9,
-	0xff10, 0xff19,
-	0x104a0, 0x104a9,
-	0x11066, 0x1106f,
-	0x110f0, 0x110f9,
-	0x11136, 0x1113f,
-	0x111d0, 0x111d9,
-	0x112f0, 0x112f9,
-	0x114d0, 0x114d9,
-	0x11650, 0x11659,
-	0x116c0, 0x116c9,
-	0x11730, 0x11739,
-	0x118e0, 0x118e9,
-	0x16a60, 0x16a69,
-	0x16b50, 0x16b59,
-	0x1d7ce, 0x1d7ff,
-}; /* CR_Digit */
-
-/* 'Graph': [[:Graph:]] */
-static const OnigCodePoint CR_Graph[] = {
-	618,
-	0x0021, 0x007e,
-	0x00a1, 0x0377,
-	0x037a, 0x037f,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x052f,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x058d, 0x058f,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x061c,
-	0x061e, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-	0x0840, 0x085b,
-	0x085e, 0x085e,
-	0x08a0, 0x08b4,
-	0x08e3, 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, 0x09fb,
-	0x0a01, 0x0a03,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0af1,
-	0x0af9, 0x0af9,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3c, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	0x0b66, 0x0b77,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bfa,
-	0x0c00, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c5a,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-	0x0c81, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d01, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d5f, 0x0d63,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
-	0x0d82, 0x0d83,
-	0x0d85, 0x0d96,
-	0x0d9a, 0x0db1,
-	0x0db3, 0x0dbb,
-	0x0dbd, 0x0dbd,
-	0x0dc0, 0x0dc6,
-	0x0dca, 0x0dca,
-	0x0dcf, 0x0dd4,
-	0x0dd6, 0x0dd6,
-	0x0dd8, 0x0ddf,
-	0x0de6, 0x0def,
-	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, 0x0edf,
-	0x0f00, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fda,
-	0x1000, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 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,
-	0x135d, 0x137c,
-	0x1380, 0x1399,
-	0x13a0, 0x13f5,
-	0x13f8, 0x13fd,
-	0x1400, 0x167f,
-	0x1681, 0x169c,
-	0x16a0, 0x16f8,
-	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, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191e,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a1b,
-	0x1a1e, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-	0x1ab0, 0x1abe,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1bf3,
-	0x1bfc, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cc0, 0x1cc7,
-	0x1cd0, 0x1cf6,
-	0x1cf8, 0x1cf9,
-	0x1d00, 0x1df5,
-	0x1dfc, 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, 0x2064,
-	0x2066, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x209c,
-	0x20a0, 0x20be,
-	0x20d0, 0x20f0,
-	0x2100, 0x218b,
-	0x2190, 0x23fa,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x2b73,
-	0x2b76, 0x2b95,
-	0x2b98, 0x2bb9,
-	0x2bbd, 0x2bc8,
-	0x2bca, 0x2bd1,
-	0x2bec, 0x2bef,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf3,
-	0x2cf9, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d70,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2e42,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3001, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fd5,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa6f7,
-	0xa700, 0xa7ad,
-	0xa7b0, 0xa7b7,
-	0xa7f7, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-	0xa8e0, 0xa8fd,
-	0xa900, 0xa953,
-	0xa95f, 0xa97c,
-	0xa980, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9fe,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaac2,
-	0xaadb, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xab30, 0xab65,
-	0xab70, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xe000, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbc1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 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, 0x1018c,
-	0x10190, 0x1019b,
-	0x101a0, 0x101a0,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x102e0, 0x102fb,
-	0x10300, 0x10323,
-	0x10330, 0x1034a,
-	0x10350, 0x1037a,
-	0x10380, 0x1039d,
-	0x1039f, 0x103c3,
-	0x103c8, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x1056f, 0x1056f,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10857, 0x1089e,
-	0x108a7, 0x108af,
-	0x108e0, 0x108f2,
-	0x108f4, 0x108f5,
-	0x108fb, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10980, 0x109b7,
-	0x109bc, 0x109cf,
-	0x109d2, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a9f,
-	0x10ac0, 0x10ae6,
-	0x10aeb, 0x10af6,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b91,
-	0x10b99, 0x10b9c,
-	0x10ba9, 0x10baf,
-	0x10c00, 0x10c48,
-	0x10c80, 0x10cb2,
-	0x10cc0, 0x10cf2,
-	0x10cfa, 0x10cff,
-	0x10e60, 0x10e7e,
-	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-	0x1107f, 0x110c1,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x11143,
-	0x11150, 0x11176,
-	0x11180, 0x111cd,
-	0x111d0, 0x111df,
-	0x111e1, 0x111f4,
-	0x11200, 0x11211,
-	0x11213, 0x1123d,
-	0x11280, 0x11286,
-	0x11288, 0x11288,
-	0x1128a, 0x1128d,
-	0x1128f, 0x1129d,
-	0x1129f, 0x112a9,
-	0x112b0, 0x112ea,
-	0x112f0, 0x112f9,
-	0x11300, 0x11303,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133c, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134d,
-	0x11350, 0x11350,
-	0x11357, 0x11357,
-	0x1135d, 0x11363,
-	0x11366, 0x1136c,
-	0x11370, 0x11374,
-	0x11480, 0x114c7,
-	0x114d0, 0x114d9,
-	0x11580, 0x115b5,
-	0x115b8, 0x115dd,
-	0x11600, 0x11644,
-	0x11650, 0x11659,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x11700, 0x11719,
-	0x1171d, 0x1172b,
-	0x11730, 0x1173f,
-	0x118a0, 0x118f2,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x12000, 0x12399,
-	0x12400, 0x1246e,
-	0x12470, 0x12474,
-	0x12480, 0x12543,
-	0x13000, 0x1342e,
-	0x14400, 0x14646,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16a60, 0x16a69,
-	0x16a6e, 0x16a6f,
-	0x16ad0, 0x16aed,
-	0x16af0, 0x16af5,
-	0x16b00, 0x16b45,
-	0x16b50, 0x16b59,
-	0x16b5b, 0x16b61,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	0x1bc9c, 0x1bca3,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d1e8,
-	0x1d200, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1da8b,
-	0x1da9b, 0x1da9f,
-	0x1daa1, 0x1daaf,
-	0x1e800, 0x1e8c4,
-	0x1e8c7, 0x1e8d6,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0bf,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0f5,
-	0x1f100, 0x1f10c,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f579,
-	0x1f57b, 0x1f5a3,
-	0x1f5a5, 0x1f6d0,
-	0x1f6e0, 0x1f6ec,
-	0x1f6f0, 0x1f6f3,
-	0x1f700, 0x1f773,
-	0x1f780, 0x1f7d4,
-	0x1f800, 0x1f80b,
-	0x1f810, 0x1f847,
-	0x1f850, 0x1f859,
-	0x1f860, 0x1f887,
-	0x1f890, 0x1f8ad,
-	0x1f910, 0x1f918,
-	0x1f980, 0x1f984,
-	0x1f9c0, 0x1f9c0,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2b820, 0x2cea1,
-	0x2f800, 0x2fa1d,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xf0000, 0xffffd,
-	0x100000, 0x10fffd,
-}; /* CR_Graph */
-
-/* 'Lower': [[:Lower:]] */
-static const OnigCodePoint CR_Lower[] = {
-	637,
-	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,
-	0x0242, 0x0242,
-	0x0247, 0x0247,
-	0x0249, 0x0249,
-	0x024b, 0x024b,
-	0x024d, 0x024d,
-	0x024f, 0x0293,
-	0x0295, 0x02b8,
-	0x02c0, 0x02c1,
-	0x02e0, 0x02e4,
-	0x0345, 0x0345,
-	0x0371, 0x0371,
-	0x0373, 0x0373,
-	0x0377, 0x0377,
-	0x037a, 0x037d,
-	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, 0x04cf,
-	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,
-	0x04fb, 0x04fb,
-	0x04fd, 0x04fd,
-	0x04ff, 0x04ff,
-	0x0501, 0x0501,
-	0x0503, 0x0503,
-	0x0505, 0x0505,
-	0x0507, 0x0507,
-	0x0509, 0x0509,
-	0x050b, 0x050b,
-	0x050d, 0x050d,
-	0x050f, 0x050f,
-	0x0511, 0x0511,
-	0x0513, 0x0513,
-	0x0515, 0x0515,
-	0x0517, 0x0517,
-	0x0519, 0x0519,
-	0x051b, 0x051b,
-	0x051d, 0x051d,
-	0x051f, 0x051f,
-	0x0521, 0x0521,
-	0x0523, 0x0523,
-	0x0525, 0x0525,
-	0x0527, 0x0527,
-	0x0529, 0x0529,
-	0x052b, 0x052b,
-	0x052d, 0x052d,
-	0x052f, 0x052f,
-	0x0561, 0x0587,
-	0x13f8, 0x13fd,
-	0x1d00, 0x1dbf,
-	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, 0x1e9d,
-	0x1e9f, 0x1e9f,
-	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,
-	0x1efb, 0x1efb,
-	0x1efd, 0x1efd,
-	0x1eff, 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,
-	0x2090, 0x209c,
-	0x210a, 0x210a,
-	0x210e, 0x210f,
-	0x2113, 0x2113,
-	0x212f, 0x212f,
-	0x2134, 0x2134,
-	0x2139, 0x2139,
-	0x213c, 0x213d,
-	0x2146, 0x2149,
-	0x214e, 0x214e,
-	0x2170, 0x217f,
-	0x2184, 0x2184,
-	0x24d0, 0x24e9,
-	0x2c30, 0x2c5e,
-	0x2c61, 0x2c61,
-	0x2c65, 0x2c66,
-	0x2c68, 0x2c68,
-	0x2c6a, 0x2c6a,
-	0x2c6c, 0x2c6c,
-	0x2c71, 0x2c71,
-	0x2c73, 0x2c74,
-	0x2c76, 0x2c7d,
-	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,
-	0x2cec, 0x2cec,
-	0x2cee, 0x2cee,
-	0x2cf3, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0xa641, 0xa641,
-	0xa643, 0xa643,
-	0xa645, 0xa645,
-	0xa647, 0xa647,
-	0xa649, 0xa649,
-	0xa64b, 0xa64b,
-	0xa64d, 0xa64d,
-	0xa64f, 0xa64f,
-	0xa651, 0xa651,
-	0xa653, 0xa653,
-	0xa655, 0xa655,
-	0xa657, 0xa657,
-	0xa659, 0xa659,
-	0xa65b, 0xa65b,
-	0xa65d, 0xa65d,
-	0xa65f, 0xa65f,
-	0xa661, 0xa661,
-	0xa663, 0xa663,
-	0xa665, 0xa665,
-	0xa667, 0xa667,
-	0xa669, 0xa669,
-	0xa66b, 0xa66b,
-	0xa66d, 0xa66d,
-	0xa681, 0xa681,
-	0xa683, 0xa683,
-	0xa685, 0xa685,
-	0xa687, 0xa687,
-	0xa689, 0xa689,
-	0xa68b, 0xa68b,
-	0xa68d, 0xa68d,
-	0xa68f, 0xa68f,
-	0xa691, 0xa691,
-	0xa693, 0xa693,
-	0xa695, 0xa695,
-	0xa697, 0xa697,
-	0xa699, 0xa699,
-	0xa69b, 0xa69d,
-	0xa723, 0xa723,
-	0xa725, 0xa725,
-	0xa727, 0xa727,
-	0xa729, 0xa729,
-	0xa72b, 0xa72b,
-	0xa72d, 0xa72d,
-	0xa72f, 0xa731,
-	0xa733, 0xa733,
-	0xa735, 0xa735,
-	0xa737, 0xa737,
-	0xa739, 0xa739,
-	0xa73b, 0xa73b,
-	0xa73d, 0xa73d,
-	0xa73f, 0xa73f,
-	0xa741, 0xa741,
-	0xa743, 0xa743,
-	0xa745, 0xa745,
-	0xa747, 0xa747,
-	0xa749, 0xa749,
-	0xa74b, 0xa74b,
-	0xa74d, 0xa74d,
-	0xa74f, 0xa74f,
-	0xa751, 0xa751,
-	0xa753, 0xa753,
-	0xa755, 0xa755,
-	0xa757, 0xa757,
-	0xa759, 0xa759,
-	0xa75b, 0xa75b,
-	0xa75d, 0xa75d,
-	0xa75f, 0xa75f,
-	0xa761, 0xa761,
-	0xa763, 0xa763,
-	0xa765, 0xa765,
-	0xa767, 0xa767,
-	0xa769, 0xa769,
-	0xa76b, 0xa76b,
-	0xa76d, 0xa76d,
-	0xa76f, 0xa778,
-	0xa77a, 0xa77a,
-	0xa77c, 0xa77c,
-	0xa77f, 0xa77f,
-	0xa781, 0xa781,
-	0xa783, 0xa783,
-	0xa785, 0xa785,
-	0xa787, 0xa787,
-	0xa78c, 0xa78c,
-	0xa78e, 0xa78e,
-	0xa791, 0xa791,
-	0xa793, 0xa795,
-	0xa797, 0xa797,
-	0xa799, 0xa799,
-	0xa79b, 0xa79b,
-	0xa79d, 0xa79d,
-	0xa79f, 0xa79f,
-	0xa7a1, 0xa7a1,
-	0xa7a3, 0xa7a3,
-	0xa7a5, 0xa7a5,
-	0xa7a7, 0xa7a7,
-	0xa7a9, 0xa7a9,
-	0xa7b5, 0xa7b5,
-	0xa7b7, 0xa7b7,
-	0xa7f8, 0xa7fa,
-	0xab30, 0xab5a,
-	0xab5c, 0xab65,
-	0xab70, 0xabbf,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff41, 0xff5a,
-	0x10428, 0x1044f,
-	0x10cc0, 0x10cf2,
-	0x118c0, 0x118df,
-	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,
-	0x1d7cb, 0x1d7cb,
-}; /* CR_Lower */
-
-/* 'Print': [[:Print:]] */
-static const OnigCodePoint CR_Print[] = {
-	615,
-	0x0020, 0x007e,
-	0x00a0, 0x0377,
-	0x037a, 0x037f,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x052f,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x058d, 0x058f,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x061c,
-	0x061e, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-	0x0840, 0x085b,
-	0x085e, 0x085e,
-	0x08a0, 0x08b4,
-	0x08e3, 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, 0x09fb,
-	0x0a01, 0x0a03,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0af1,
-	0x0af9, 0x0af9,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3c, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	0x0b66, 0x0b77,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bfa,
-	0x0c00, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c5a,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-	0x0c81, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d01, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d5f, 0x0d63,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
-	0x0d82, 0x0d83,
-	0x0d85, 0x0d96,
-	0x0d9a, 0x0db1,
-	0x0db3, 0x0dbb,
-	0x0dbd, 0x0dbd,
-	0x0dc0, 0x0dc6,
-	0x0dca, 0x0dca,
-	0x0dcf, 0x0dd4,
-	0x0dd6, 0x0dd6,
-	0x0dd8, 0x0ddf,
-	0x0de6, 0x0def,
-	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, 0x0edf,
-	0x0f00, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fda,
-	0x1000, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 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,
-	0x135d, 0x137c,
-	0x1380, 0x1399,
-	0x13a0, 0x13f5,
-	0x13f8, 0x13fd,
-	0x1400, 0x169c,
-	0x16a0, 0x16f8,
-	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, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191e,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a1b,
-	0x1a1e, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-	0x1ab0, 0x1abe,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1bf3,
-	0x1bfc, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cc0, 0x1cc7,
-	0x1cd0, 0x1cf6,
-	0x1cf8, 0x1cf9,
-	0x1d00, 0x1df5,
-	0x1dfc, 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, 0x2027,
-	0x202a, 0x2064,
-	0x2066, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x209c,
-	0x20a0, 0x20be,
-	0x20d0, 0x20f0,
-	0x2100, 0x218b,
-	0x2190, 0x23fa,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x2b73,
-	0x2b76, 0x2b95,
-	0x2b98, 0x2bb9,
-	0x2bbd, 0x2bc8,
-	0x2bca, 0x2bd1,
-	0x2bec, 0x2bef,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf3,
-	0x2cf9, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d70,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2e42,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fd5,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa6f7,
-	0xa700, 0xa7ad,
-	0xa7b0, 0xa7b7,
-	0xa7f7, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-	0xa8e0, 0xa8fd,
-	0xa900, 0xa953,
-	0xa95f, 0xa97c,
-	0xa980, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9fe,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaac2,
-	0xaadb, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xab30, 0xab65,
-	0xab70, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xe000, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbc1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 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, 0x1018c,
-	0x10190, 0x1019b,
-	0x101a0, 0x101a0,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x102e0, 0x102fb,
-	0x10300, 0x10323,
-	0x10330, 0x1034a,
-	0x10350, 0x1037a,
-	0x10380, 0x1039d,
-	0x1039f, 0x103c3,
-	0x103c8, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x1056f, 0x1056f,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10857, 0x1089e,
-	0x108a7, 0x108af,
-	0x108e0, 0x108f2,
-	0x108f4, 0x108f5,
-	0x108fb, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10980, 0x109b7,
-	0x109bc, 0x109cf,
-	0x109d2, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a9f,
-	0x10ac0, 0x10ae6,
-	0x10aeb, 0x10af6,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b91,
-	0x10b99, 0x10b9c,
-	0x10ba9, 0x10baf,
-	0x10c00, 0x10c48,
-	0x10c80, 0x10cb2,
-	0x10cc0, 0x10cf2,
-	0x10cfa, 0x10cff,
-	0x10e60, 0x10e7e,
-	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-	0x1107f, 0x110c1,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x11143,
-	0x11150, 0x11176,
-	0x11180, 0x111cd,
-	0x111d0, 0x111df,
-	0x111e1, 0x111f4,
-	0x11200, 0x11211,
-	0x11213, 0x1123d,
-	0x11280, 0x11286,
-	0x11288, 0x11288,
-	0x1128a, 0x1128d,
-	0x1128f, 0x1129d,
-	0x1129f, 0x112a9,
-	0x112b0, 0x112ea,
-	0x112f0, 0x112f9,
-	0x11300, 0x11303,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133c, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134d,
-	0x11350, 0x11350,
-	0x11357, 0x11357,
-	0x1135d, 0x11363,
-	0x11366, 0x1136c,
-	0x11370, 0x11374,
-	0x11480, 0x114c7,
-	0x114d0, 0x114d9,
-	0x11580, 0x115b5,
-	0x115b8, 0x115dd,
-	0x11600, 0x11644,
-	0x11650, 0x11659,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x11700, 0x11719,
-	0x1171d, 0x1172b,
-	0x11730, 0x1173f,
-	0x118a0, 0x118f2,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x12000, 0x12399,
-	0x12400, 0x1246e,
-	0x12470, 0x12474,
-	0x12480, 0x12543,
-	0x13000, 0x1342e,
-	0x14400, 0x14646,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16a60, 0x16a69,
-	0x16a6e, 0x16a6f,
-	0x16ad0, 0x16aed,
-	0x16af0, 0x16af5,
-	0x16b00, 0x16b45,
-	0x16b50, 0x16b59,
-	0x16b5b, 0x16b61,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	0x1bc9c, 0x1bca3,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d1e8,
-	0x1d200, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1da8b,
-	0x1da9b, 0x1da9f,
-	0x1daa1, 0x1daaf,
-	0x1e800, 0x1e8c4,
-	0x1e8c7, 0x1e8d6,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0bf,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0f5,
-	0x1f100, 0x1f10c,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f579,
-	0x1f57b, 0x1f5a3,
-	0x1f5a5, 0x1f6d0,
-	0x1f6e0, 0x1f6ec,
-	0x1f6f0, 0x1f6f3,
-	0x1f700, 0x1f773,
-	0x1f780, 0x1f7d4,
-	0x1f800, 0x1f80b,
-	0x1f810, 0x1f847,
-	0x1f850, 0x1f859,
-	0x1f860, 0x1f887,
-	0x1f890, 0x1f8ad,
-	0x1f910, 0x1f918,
-	0x1f980, 0x1f984,
-	0x1f9c0, 0x1f9c0,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2b820, 0x2cea1,
-	0x2f800, 0x2fa1d,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xf0000, 0xffffd,
-	0x100000, 0x10fffd,
-}; /* CR_Print */
-
-/* 'Punct': [[:Punct:]] */
-static const OnigCodePoint CR_Punct[] = {
-	161,
-	0x0021, 0x0023,
-	0x0025, 0x002a,
-	0x002c, 0x002f,
-	0x003a, 0x003b,
-	0x003f, 0x0040,
-	0x005b, 0x005d,
-	0x005f, 0x005f,
-	0x007b, 0x007b,
-	0x007d, 0x007d,
-	0x00a1, 0x00a1,
-	0x00a7, 0x00a7,
-	0x00ab, 0x00ab,
-	0x00b6, 0x00b7,
-	0x00bb, 0x00bb,
-	0x00bf, 0x00bf,
-	0x037e, 0x037e,
-	0x0387, 0x0387,
-	0x055a, 0x055f,
-	0x0589, 0x058a,
-	0x05be, 0x05be,
-	0x05c0, 0x05c0,
-	0x05c3, 0x05c3,
-	0x05c6, 0x05c6,
-	0x05f3, 0x05f4,
-	0x0609, 0x060a,
-	0x060c, 0x060d,
-	0x061b, 0x061b,
-	0x061e, 0x061f,
-	0x066a, 0x066d,
-	0x06d4, 0x06d4,
-	0x0700, 0x070d,
-	0x07f7, 0x07f9,
-	0x0830, 0x083e,
-	0x085e, 0x085e,
-	0x0964, 0x0965,
-	0x0970, 0x0970,
-	0x0af0, 0x0af0,
-	0x0df4, 0x0df4,
-	0x0e4f, 0x0e4f,
-	0x0e5a, 0x0e5b,
-	0x0f04, 0x0f12,
-	0x0f14, 0x0f14,
-	0x0f3a, 0x0f3d,
-	0x0f85, 0x0f85,
-	0x0fd0, 0x0fd4,
-	0x0fd9, 0x0fda,
-	0x104a, 0x104f,
-	0x10fb, 0x10fb,
-	0x1360, 0x1368,
-	0x1400, 0x1400,
-	0x166d, 0x166e,
-	0x169b, 0x169c,
-	0x16eb, 0x16ed,
-	0x1735, 0x1736,
-	0x17d4, 0x17d6,
-	0x17d8, 0x17da,
-	0x1800, 0x180a,
-	0x1944, 0x1945,
-	0x1a1e, 0x1a1f,
-	0x1aa0, 0x1aa6,
-	0x1aa8, 0x1aad,
-	0x1b5a, 0x1b60,
-	0x1bfc, 0x1bff,
-	0x1c3b, 0x1c3f,
-	0x1c7e, 0x1c7f,
-	0x1cc0, 0x1cc7,
-	0x1cd3, 0x1cd3,
-	0x2010, 0x2027,
-	0x2030, 0x2043,
-	0x2045, 0x2051,
-	0x2053, 0x205e,
-	0x207d, 0x207e,
-	0x208d, 0x208e,
-	0x2308, 0x230b,
-	0x2329, 0x232a,
-	0x2768, 0x2775,
-	0x27c5, 0x27c6,
-	0x27e6, 0x27ef,
-	0x2983, 0x2998,
-	0x29d8, 0x29db,
-	0x29fc, 0x29fd,
-	0x2cf9, 0x2cfc,
-	0x2cfe, 0x2cff,
-	0x2d70, 0x2d70,
-	0x2e00, 0x2e2e,
-	0x2e30, 0x2e42,
-	0x3001, 0x3003,
-	0x3008, 0x3011,
-	0x3014, 0x301f,
-	0x3030, 0x3030,
-	0x303d, 0x303d,
-	0x30a0, 0x30a0,
-	0x30fb, 0x30fb,
-	0xa4fe, 0xa4ff,
-	0xa60d, 0xa60f,
-	0xa673, 0xa673,
-	0xa67e, 0xa67e,
-	0xa6f2, 0xa6f7,
-	0xa874, 0xa877,
-	0xa8ce, 0xa8cf,
-	0xa8f8, 0xa8fa,
-	0xa8fc, 0xa8fc,
-	0xa92e, 0xa92f,
-	0xa95f, 0xa95f,
-	0xa9c1, 0xa9cd,
-	0xa9de, 0xa9df,
-	0xaa5c, 0xaa5f,
-	0xaade, 0xaadf,
-	0xaaf0, 0xaaf1,
-	0xabeb, 0xabeb,
-	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, 0x10102,
-	0x1039f, 0x1039f,
-	0x103d0, 0x103d0,
-	0x1056f, 0x1056f,
-	0x10857, 0x10857,
-	0x1091f, 0x1091f,
-	0x1093f, 0x1093f,
-	0x10a50, 0x10a58,
-	0x10a7f, 0x10a7f,
-	0x10af0, 0x10af6,
-	0x10b39, 0x10b3f,
-	0x10b99, 0x10b9c,
-	0x11047, 0x1104d,
-	0x110bb, 0x110bc,
-	0x110be, 0x110c1,
-	0x11140, 0x11143,
-	0x11174, 0x11175,
-	0x111c5, 0x111c9,
-	0x111cd, 0x111cd,
-	0x111db, 0x111db,
-	0x111dd, 0x111df,
-	0x11238, 0x1123d,
-	0x112a9, 0x112a9,
-	0x114c6, 0x114c6,
-	0x115c1, 0x115d7,
-	0x11641, 0x11643,
-	0x1173c, 0x1173e,
-	0x12470, 0x12474,
-	0x16a6e, 0x16a6f,
-	0x16af5, 0x16af5,
-	0x16b37, 0x16b3b,
-	0x16b44, 0x16b44,
-	0x1bc9f, 0x1bc9f,
-	0x1da87, 0x1da8b,
-}; /* CR_Punct */
-
-/* 'Space': [[:Space:]] */
-static const OnigCodePoint CR_Space[] = {
-	10,
-	0x0009, 0x000d,
-	0x0020, 0x0020,
-	0x0085, 0x0085,
-	0x00a0, 0x00a0,
-	0x1680, 0x1680,
-	0x2000, 0x200a,
-	0x2028, 0x2029,
-	0x202f, 0x202f,
-	0x205f, 0x205f,
-	0x3000, 0x3000,
-}; /* CR_Space */
-
-/* 'Upper': [[:Upper:]] */
-static const OnigCodePoint CR_Upper[] = {
-	630,
-	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,
-	0x0243, 0x0246,
-	0x0248, 0x0248,
-	0x024a, 0x024a,
-	0x024c, 0x024c,
-	0x024e, 0x024e,
-	0x0370, 0x0370,
-	0x0372, 0x0372,
-	0x0376, 0x0376,
-	0x037f, 0x037f,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x038f,
-	0x0391, 0x03a1,
-	0x03a3, 0x03ab,
-	0x03cf, 0x03cf,
-	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,
-	0x04fa, 0x04fa,
-	0x04fc, 0x04fc,
-	0x04fe, 0x04fe,
-	0x0500, 0x0500,
-	0x0502, 0x0502,
-	0x0504, 0x0504,
-	0x0506, 0x0506,
-	0x0508, 0x0508,
-	0x050a, 0x050a,
-	0x050c, 0x050c,
-	0x050e, 0x050e,
-	0x0510, 0x0510,
-	0x0512, 0x0512,
-	0x0514, 0x0514,
-	0x0516, 0x0516,
-	0x0518, 0x0518,
-	0x051a, 0x051a,
-	0x051c, 0x051c,
-	0x051e, 0x051e,
-	0x0520, 0x0520,
-	0x0522, 0x0522,
-	0x0524, 0x0524,
-	0x0526, 0x0526,
-	0x0528, 0x0528,
-	0x052a, 0x052a,
-	0x052c, 0x052c,
-	0x052e, 0x052e,
-	0x0531, 0x0556,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x13a0, 0x13f5,
-	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,
-	0x1e9e, 0x1e9e,
-	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,
-	0x1efa, 0x1efa,
-	0x1efc, 0x1efc,
-	0x1efe, 0x1efe,
-	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, 0x2133,
-	0x213e, 0x213f,
-	0x2145, 0x2145,
-	0x2160, 0x216f,
-	0x2183, 0x2183,
-	0x24b6, 0x24cf,
-	0x2c00, 0x2c2e,
-	0x2c60, 0x2c60,
-	0x2c62, 0x2c64,
-	0x2c67, 0x2c67,
-	0x2c69, 0x2c69,
-	0x2c6b, 0x2c6b,
-	0x2c6d, 0x2c70,
-	0x2c72, 0x2c72,
-	0x2c75, 0x2c75,
-	0x2c7e, 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,
-	0x2ceb, 0x2ceb,
-	0x2ced, 0x2ced,
-	0x2cf2, 0x2cf2,
-	0xa640, 0xa640,
-	0xa642, 0xa642,
-	0xa644, 0xa644,
-	0xa646, 0xa646,
-	0xa648, 0xa648,
-	0xa64a, 0xa64a,
-	0xa64c, 0xa64c,
-	0xa64e, 0xa64e,
-	0xa650, 0xa650,
-	0xa652, 0xa652,
-	0xa654, 0xa654,
-	0xa656, 0xa656,
-	0xa658, 0xa658,
-	0xa65a, 0xa65a,
-	0xa65c, 0xa65c,
-	0xa65e, 0xa65e,
-	0xa660, 0xa660,
-	0xa662, 0xa662,
-	0xa664, 0xa664,
-	0xa666, 0xa666,
-	0xa668, 0xa668,
-	0xa66a, 0xa66a,
-	0xa66c, 0xa66c,
-	0xa680, 0xa680,
-	0xa682, 0xa682,
-	0xa684, 0xa684,
-	0xa686, 0xa686,
-	0xa688, 0xa688,
-	0xa68a, 0xa68a,
-	0xa68c, 0xa68c,
-	0xa68e, 0xa68e,
-	0xa690, 0xa690,
-	0xa692, 0xa692,
-	0xa694, 0xa694,
-	0xa696, 0xa696,
-	0xa698, 0xa698,
-	0xa69a, 0xa69a,
-	0xa722, 0xa722,
-	0xa724, 0xa724,
-	0xa726, 0xa726,
-	0xa728, 0xa728,
-	0xa72a, 0xa72a,
-	0xa72c, 0xa72c,
-	0xa72e, 0xa72e,
-	0xa732, 0xa732,
-	0xa734, 0xa734,
-	0xa736, 0xa736,
-	0xa738, 0xa738,
-	0xa73a, 0xa73a,
-	0xa73c, 0xa73c,
-	0xa73e, 0xa73e,
-	0xa740, 0xa740,
-	0xa742, 0xa742,
-	0xa744, 0xa744,
-	0xa746, 0xa746,
-	0xa748, 0xa748,
-	0xa74a, 0xa74a,
-	0xa74c, 0xa74c,
-	0xa74e, 0xa74e,
-	0xa750, 0xa750,
-	0xa752, 0xa752,
-	0xa754, 0xa754,
-	0xa756, 0xa756,
-	0xa758, 0xa758,
-	0xa75a, 0xa75a,
-	0xa75c, 0xa75c,
-	0xa75e, 0xa75e,
-	0xa760, 0xa760,
-	0xa762, 0xa762,
-	0xa764, 0xa764,
-	0xa766, 0xa766,
-	0xa768, 0xa768,
-	0xa76a, 0xa76a,
-	0xa76c, 0xa76c,
-	0xa76e, 0xa76e,
-	0xa779, 0xa779,
-	0xa77b, 0xa77b,
-	0xa77d, 0xa77e,
-	0xa780, 0xa780,
-	0xa782, 0xa782,
-	0xa784, 0xa784,
-	0xa786, 0xa786,
-	0xa78b, 0xa78b,
-	0xa78d, 0xa78d,
-	0xa790, 0xa790,
-	0xa792, 0xa792,
-	0xa796, 0xa796,
-	0xa798, 0xa798,
-	0xa79a, 0xa79a,
-	0xa79c, 0xa79c,
-	0xa79e, 0xa79e,
-	0xa7a0, 0xa7a0,
-	0xa7a2, 0xa7a2,
-	0xa7a4, 0xa7a4,
-	0xa7a6, 0xa7a6,
-	0xa7a8, 0xa7a8,
-	0xa7aa, 0xa7ad,
-	0xa7b0, 0xa7b4,
-	0xa7b6, 0xa7b6,
-	0xff21, 0xff3a,
-	0x10400, 0x10427,
-	0x10c80, 0x10cb2,
-	0x118a0, 0x118bf,
-	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,
-	0x1d7ca, 0x1d7ca,
-	0x1f130, 0x1f149,
-	0x1f150, 0x1f169,
-	0x1f170, 0x1f189,
-}; /* 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[] = {
-	654,
-	0x0030, 0x0039,
-	0x0041, 0x005a,
-	0x005f, 0x005f,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00b5, 0x00b5,
-	0x00ba, 0x00ba,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x02c1,
-	0x02c6, 0x02d1,
-	0x02e0, 0x02e4,
-	0x02ec, 0x02ec,
-	0x02ee, 0x02ee,
-	0x0300, 0x0374,
-	0x0376, 0x0377,
-	0x037a, 0x037d,
-	0x037f, 0x037f,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x0483, 0x052f,
-	0x0531, 0x0556,
-	0x0559, 0x0559,
-	0x0561, 0x0587,
-	0x0591, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0610, 0x061a,
-	0x0620, 0x0669,
-	0x066e, 0x06d3,
-	0x06d5, 0x06dc,
-	0x06df, 0x06e8,
-	0x06ea, 0x06fc,
-	0x06ff, 0x06ff,
-	0x0710, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07f5,
-	0x07fa, 0x07fa,
-	0x0800, 0x082d,
-	0x0840, 0x085b,
-	0x08a0, 0x08b4,
-	0x08e3, 0x0963,
-	0x0966, 0x096f,
-	0x0971, 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,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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,
-	0x0af9, 0x0af9,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3c, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bef,
-	0x0c00, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c5a,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c81, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d01, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d5f, 0x0d63,
-	0x0d66, 0x0d6f,
-	0x0d7a, 0x0d7f,
-	0x0d82, 0x0d83,
-	0x0d85, 0x0d96,
-	0x0d9a, 0x0db1,
-	0x0db3, 0x0dbb,
-	0x0dbd, 0x0dbd,
-	0x0dc0, 0x0dc6,
-	0x0dca, 0x0dca,
-	0x0dcf, 0x0dd4,
-	0x0dd6, 0x0dd6,
-	0x0dd8, 0x0ddf,
-	0x0de6, 0x0def,
-	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, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f18, 0x0f19,
-	0x0f20, 0x0f29,
-	0x0f35, 0x0f35,
-	0x0f37, 0x0f37,
-	0x0f39, 0x0f39,
-	0x0f3e, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f84,
-	0x0f86, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fc6, 0x0fc6,
-	0x1000, 0x1049,
-	0x1050, 0x109d,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 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,
-	0x135d, 0x135f,
-	0x1380, 0x138f,
-	0x13a0, 0x13f5,
-	0x13f8, 0x13fd,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f8,
-	0x1700, 0x170c,
-	0x170e, 0x1714,
-	0x1720, 0x1734,
-	0x1740, 0x1753,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-	0x1780, 0x17d3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dd,
-	0x17e0, 0x17e9,
-	0x180b, 0x180d,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191e,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1946, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19d9,
-	0x1a00, 0x1a1b,
-	0x1a20, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa7, 0x1aa7,
-	0x1ab0, 0x1abe,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b59,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1bf3,
-	0x1c00, 0x1c37,
-	0x1c40, 0x1c49,
-	0x1c4d, 0x1c7d,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1cf6,
-	0x1cf8, 0x1cf9,
-	0x1d00, 0x1df5,
-	0x1dfc, 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,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 0x209c,
-	0x20d0, 0x20f0,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2119, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x212d,
-	0x212f, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2160, 0x2188,
-	0x24b6, 0x24e9,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2ce4,
-	0x2ceb, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d6f,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2dff,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3007,
-	0x3021, 0x302f,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x3099, 0x309a,
-	0x309d, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fd5,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa62b,
-	0xa640, 0xa672,
-	0xa674, 0xa67d,
-	0xa67f, 0xa6f1,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa7ad,
-	0xa7b0, 0xa7b7,
-	0xa7f7, 0xa827,
-	0xa840, 0xa873,
-	0xa880, 0xa8c4,
-	0xa8d0, 0xa8d9,
-	0xa8e0, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa8fd, 0xa8fd,
-	0xa900, 0xa92d,
-	0xa930, 0xa953,
-	0xa960, 0xa97c,
-	0xa980, 0xa9c0,
-	0xa9cf, 0xa9d9,
-	0xa9e0, 0xa9fe,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa60, 0xaa76,
-	0xaa7a, 0xaac2,
-	0xaadb, 0xaadd,
-	0xaae0, 0xaaef,
-	0xaaf2, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xab30, 0xab5a,
-	0xab5c, 0xab65,
-	0xab70, 0xabea,
-	0xabec, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa6d,
-	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, 0xfe2f,
-	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,
-	0x10140, 0x10174,
-	0x101fd, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x102e0, 0x102e0,
-	0x10300, 0x1031f,
-	0x10330, 0x1034a,
-	0x10350, 0x1037a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10860, 0x10876,
-	0x10880, 0x1089e,
-	0x108e0, 0x108f2,
-	0x108f4, 0x108f5,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x10a60, 0x10a7c,
-	0x10a80, 0x10a9c,
-	0x10ac0, 0x10ac7,
-	0x10ac9, 0x10ae6,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10b80, 0x10b91,
-	0x10c00, 0x10c48,
-	0x10c80, 0x10cb2,
-	0x10cc0, 0x10cf2,
-	0x11000, 0x11046,
-	0x11066, 0x1106f,
-	0x1107f, 0x110ba,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x1113f,
-	0x11150, 0x11173,
-	0x11176, 0x11176,
-	0x11180, 0x111c4,
-	0x111ca, 0x111cc,
-	0x111d0, 0x111da,
-	0x111dc, 0x111dc,
-	0x11200, 0x11211,
-	0x11213, 0x11237,
-	0x11280, 0x11286,
-	0x11288, 0x11288,
-	0x1128a, 0x1128d,
-	0x1128f, 0x1129d,
-	0x1129f, 0x112a8,
-	0x112b0, 0x112ea,
-	0x112f0, 0x112f9,
-	0x11300, 0x11303,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133c, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134d,
-	0x11350, 0x11350,
-	0x11357, 0x11357,
-	0x1135d, 0x11363,
-	0x11366, 0x1136c,
-	0x11370, 0x11374,
-	0x11480, 0x114c5,
-	0x114c7, 0x114c7,
-	0x114d0, 0x114d9,
-	0x11580, 0x115b5,
-	0x115b8, 0x115c0,
-	0x115d8, 0x115dd,
-	0x11600, 0x11640,
-	0x11644, 0x11644,
-	0x11650, 0x11659,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x11700, 0x11719,
-	0x1171d, 0x1172b,
-	0x11730, 0x11739,
-	0x118a0, 0x118e9,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x12000, 0x12399,
-	0x12400, 0x1246e,
-	0x12480, 0x12543,
-	0x13000, 0x1342e,
-	0x14400, 0x14646,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16a60, 0x16a69,
-	0x16ad0, 0x16aed,
-	0x16af0, 0x16af4,
-	0x16b00, 0x16b36,
-	0x16b40, 0x16b43,
-	0x16b50, 0x16b59,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	0x1bc9d, 0x1bc9e,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1da00, 0x1da36,
-	0x1da3b, 0x1da6c,
-	0x1da75, 0x1da75,
-	0x1da84, 0x1da84,
-	0x1da9b, 0x1da9f,
-	0x1daa1, 0x1daaf,
-	0x1e800, 0x1e8c4,
-	0x1e8d0, 0x1e8d6,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1f130, 0x1f149,
-	0x1f150, 0x1f169,
-	0x1f170, 0x1f189,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2b820, 0x2cea1,
-	0x2f800, 0x2fa1d,
-	0xe0100, 0xe01ef,
-}; /* CR_Word */
-
-/* 'Alnum': [[:Alnum:]] */
-static const OnigCodePoint CR_Alnum[] = {
-	648,
-	0x0030, 0x0039,
-	0x0041, 0x005a,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00b5, 0x00b5,
-	0x00ba, 0x00ba,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x02c1,
-	0x02c6, 0x02d1,
-	0x02e0, 0x02e4,
-	0x02ec, 0x02ec,
-	0x02ee, 0x02ee,
-	0x0345, 0x0345,
-	0x0370, 0x0374,
-	0x0376, 0x0377,
-	0x037a, 0x037d,
-	0x037f, 0x037f,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x048a, 0x052f,
-	0x0531, 0x0556,
-	0x0559, 0x0559,
-	0x0561, 0x0587,
-	0x05b0, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0610, 0x061a,
-	0x0620, 0x0657,
-	0x0659, 0x0669,
-	0x066e, 0x06d3,
-	0x06d5, 0x06dc,
-	0x06e1, 0x06e8,
-	0x06ed, 0x06fc,
-	0x06ff, 0x06ff,
-	0x0710, 0x073f,
-	0x074d, 0x07b1,
-	0x07c0, 0x07ea,
-	0x07f4, 0x07f5,
-	0x07fa, 0x07fa,
-	0x0800, 0x0817,
-	0x081a, 0x082c,
-	0x0840, 0x0858,
-	0x08a0, 0x08b4,
-	0x08e3, 0x08e9,
-	0x08f0, 0x093b,
-	0x093d, 0x094c,
-	0x094e, 0x0950,
-	0x0955, 0x0963,
-	0x0966, 0x096f,
-	0x0971, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bd, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cc,
-	0x09ce, 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,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4c,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	0x0a81, 0x0a83,
-	0x0a85, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abd, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acc,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae3,
-	0x0ae6, 0x0aef,
-	0x0af9, 0x0af9,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3d, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4c,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	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, 0x0bcc,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bef,
-	0x0c00, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4c,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c5a,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c81, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbd, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccc,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d01, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4c,
-	0x0d4e, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d5f, 0x0d63,
-	0x0d66, 0x0d6f,
-	0x0d7a, 0x0d7f,
-	0x0d82, 0x0d83,
-	0x0d85, 0x0d96,
-	0x0d9a, 0x0db1,
-	0x0db3, 0x0dbb,
-	0x0dbd, 0x0dbd,
-	0x0dc0, 0x0dc6,
-	0x0dcf, 0x0dd4,
-	0x0dd6, 0x0dd6,
-	0x0dd8, 0x0ddf,
-	0x0de6, 0x0def,
-	0x0df2, 0x0df3,
-	0x0e01, 0x0e3a,
-	0x0e40, 0x0e46,
-	0x0e4d, 0x0e4d,
-	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,
-	0x0ecd, 0x0ecd,
-	0x0ed0, 0x0ed9,
-	0x0edc, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f20, 0x0f29,
-	0x0f40, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f81,
-	0x0f88, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x1000, 0x1036,
-	0x1038, 0x1038,
-	0x103b, 0x1049,
-	0x1050, 0x1062,
-	0x1065, 0x1068,
-	0x106e, 0x1086,
-	0x108e, 0x108e,
-	0x1090, 0x1099,
-	0x109c, 0x109d,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 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, 0x13f5,
-	0x13f8, 0x13fd,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f8,
-	0x1700, 0x170c,
-	0x170e, 0x1713,
-	0x1720, 0x1733,
-	0x1740, 0x1753,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-	0x1780, 0x17b3,
-	0x17b6, 0x17c8,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dc,
-	0x17e0, 0x17e9,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191e,
-	0x1920, 0x192b,
-	0x1930, 0x1938,
-	0x1946, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19d9,
-	0x1a00, 0x1a1b,
-	0x1a20, 0x1a5e,
-	0x1a61, 0x1a74,
-	0x1a80, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa7, 0x1aa7,
-	0x1b00, 0x1b33,
-	0x1b35, 0x1b43,
-	0x1b45, 0x1b4b,
-	0x1b50, 0x1b59,
-	0x1b80, 0x1ba9,
-	0x1bac, 0x1be5,
-	0x1be7, 0x1bf1,
-	0x1c00, 0x1c35,
-	0x1c40, 0x1c49,
-	0x1c4d, 0x1c7d,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf3,
-	0x1cf5, 0x1cf6,
-	0x1d00, 0x1dbf,
-	0x1de7, 0x1df4,
-	0x1e00, 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, 0x209c,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2119, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x212d,
-	0x212f, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2160, 0x2188,
-	0x24b6, 0x24e9,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2ce4,
-	0x2ceb, 0x2cee,
-	0x2cf2, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2dff,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3007,
-	0x3021, 0x3029,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x309d, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fd5,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa62b,
-	0xa640, 0xa66e,
-	0xa674, 0xa67b,
-	0xa67f, 0xa6ef,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa7ad,
-	0xa7b0, 0xa7b7,
-	0xa7f7, 0xa801,
-	0xa803, 0xa805,
-	0xa807, 0xa80a,
-	0xa80c, 0xa827,
-	0xa840, 0xa873,
-	0xa880, 0xa8c3,
-	0xa8d0, 0xa8d9,
-	0xa8f2, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa8fd, 0xa8fd,
-	0xa900, 0xa92a,
-	0xa930, 0xa952,
-	0xa960, 0xa97c,
-	0xa980, 0xa9b2,
-	0xa9b4, 0xa9bf,
-	0xa9cf, 0xa9d9,
-	0xa9e0, 0xa9e4,
-	0xa9e6, 0xa9fe,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa60, 0xaa76,
-	0xaa7a, 0xaa7a,
-	0xaa7e, 0xaabe,
-	0xaac0, 0xaac0,
-	0xaac2, 0xaac2,
-	0xaadb, 0xaadd,
-	0xaae0, 0xaaef,
-	0xaaf2, 0xaaf5,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xab30, 0xab5a,
-	0xab5c, 0xab65,
-	0xab70, 0xabea,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa6d,
-	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,
-	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,
-	0x10140, 0x10174,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031f,
-	0x10330, 0x1034a,
-	0x10350, 0x1037a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10860, 0x10876,
-	0x10880, 0x1089e,
-	0x108e0, 0x108f2,
-	0x108f4, 0x108f5,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10a80, 0x10a9c,
-	0x10ac0, 0x10ac7,
-	0x10ac9, 0x10ae4,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10b80, 0x10b91,
-	0x10c00, 0x10c48,
-	0x10c80, 0x10cb2,
-	0x10cc0, 0x10cf2,
-	0x11000, 0x11045,
-	0x11066, 0x1106f,
-	0x11082, 0x110b8,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11132,
-	0x11136, 0x1113f,
-	0x11150, 0x11172,
-	0x11176, 0x11176,
-	0x11180, 0x111bf,
-	0x111c1, 0x111c4,
-	0x111d0, 0x111da,
-	0x111dc, 0x111dc,
-	0x11200, 0x11211,
-	0x11213, 0x11234,
-	0x11237, 0x11237,
-	0x11280, 0x11286,
-	0x11288, 0x11288,
-	0x1128a, 0x1128d,
-	0x1128f, 0x1129d,
-	0x1129f, 0x112a8,
-	0x112b0, 0x112e8,
-	0x112f0, 0x112f9,
-	0x11300, 0x11303,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133d, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134c,
-	0x11350, 0x11350,
-	0x11357, 0x11357,
-	0x1135d, 0x11363,
-	0x11480, 0x114c1,
-	0x114c4, 0x114c5,
-	0x114c7, 0x114c7,
-	0x114d0, 0x114d9,
-	0x11580, 0x115b5,
-	0x115b8, 0x115be,
-	0x115d8, 0x115dd,
-	0x11600, 0x1163e,
-	0x11640, 0x11640,
-	0x11644, 0x11644,
-	0x11650, 0x11659,
-	0x11680, 0x116b5,
-	0x116c0, 0x116c9,
-	0x11700, 0x11719,
-	0x1171d, 0x1172a,
-	0x11730, 0x11739,
-	0x118a0, 0x118e9,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x12000, 0x12399,
-	0x12400, 0x1246e,
-	0x12480, 0x12543,
-	0x13000, 0x1342e,
-	0x14400, 0x14646,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16a60, 0x16a69,
-	0x16ad0, 0x16aed,
-	0x16b00, 0x16b36,
-	0x16b40, 0x16b43,
-	0x16b50, 0x16b59,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f93, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	0x1bc9e, 0x1bc9e,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1e800, 0x1e8c4,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1f130, 0x1f149,
-	0x1f150, 0x1f169,
-	0x1f170, 0x1f189,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2b820, 0x2cea1,
-	0x2f800, 0x2fa1d,
-}; /* 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[] = {
-	613,
-	0x0000, 0x0377,
-	0x037a, 0x037f,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x052f,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x058d, 0x058f,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x061c,
-	0x061e, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-	0x0840, 0x085b,
-	0x085e, 0x085e,
-	0x08a0, 0x08b4,
-	0x08e3, 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, 0x09fb,
-	0x0a01, 0x0a03,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0af1,
-	0x0af9, 0x0af9,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3c, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	0x0b66, 0x0b77,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bfa,
-	0x0c00, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c5a,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-	0x0c81, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d01, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d5f, 0x0d63,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
-	0x0d82, 0x0d83,
-	0x0d85, 0x0d96,
-	0x0d9a, 0x0db1,
-	0x0db3, 0x0dbb,
-	0x0dbd, 0x0dbd,
-	0x0dc0, 0x0dc6,
-	0x0dca, 0x0dca,
-	0x0dcf, 0x0dd4,
-	0x0dd6, 0x0dd6,
-	0x0dd8, 0x0ddf,
-	0x0de6, 0x0def,
-	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, 0x0edf,
-	0x0f00, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fda,
-	0x1000, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 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,
-	0x135d, 0x137c,
-	0x1380, 0x1399,
-	0x13a0, 0x13f5,
-	0x13f8, 0x13fd,
-	0x1400, 0x169c,
-	0x16a0, 0x16f8,
-	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, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191e,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a1b,
-	0x1a1e, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-	0x1ab0, 0x1abe,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1bf3,
-	0x1bfc, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cc0, 0x1cc7,
-	0x1cd0, 0x1cf6,
-	0x1cf8, 0x1cf9,
-	0x1d00, 0x1df5,
-	0x1dfc, 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, 0x2064,
-	0x2066, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x209c,
-	0x20a0, 0x20be,
-	0x20d0, 0x20f0,
-	0x2100, 0x218b,
-	0x2190, 0x23fa,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x2b73,
-	0x2b76, 0x2b95,
-	0x2b98, 0x2bb9,
-	0x2bbd, 0x2bc8,
-	0x2bca, 0x2bd1,
-	0x2bec, 0x2bef,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf3,
-	0x2cf9, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d70,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2e42,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fd5,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa6f7,
-	0xa700, 0xa7ad,
-	0xa7b0, 0xa7b7,
-	0xa7f7, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-	0xa8e0, 0xa8fd,
-	0xa900, 0xa953,
-	0xa95f, 0xa97c,
-	0xa980, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9fe,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaac2,
-	0xaadb, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xab30, 0xab65,
-	0xab70, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xd800, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbc1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 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, 0x1018c,
-	0x10190, 0x1019b,
-	0x101a0, 0x101a0,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x102e0, 0x102fb,
-	0x10300, 0x10323,
-	0x10330, 0x1034a,
-	0x10350, 0x1037a,
-	0x10380, 0x1039d,
-	0x1039f, 0x103c3,
-	0x103c8, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x1056f, 0x1056f,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10857, 0x1089e,
-	0x108a7, 0x108af,
-	0x108e0, 0x108f2,
-	0x108f4, 0x108f5,
-	0x108fb, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10980, 0x109b7,
-	0x109bc, 0x109cf,
-	0x109d2, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a9f,
-	0x10ac0, 0x10ae6,
-	0x10aeb, 0x10af6,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b91,
-	0x10b99, 0x10b9c,
-	0x10ba9, 0x10baf,
-	0x10c00, 0x10c48,
-	0x10c80, 0x10cb2,
-	0x10cc0, 0x10cf2,
-	0x10cfa, 0x10cff,
-	0x10e60, 0x10e7e,
-	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-	0x1107f, 0x110c1,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x11143,
-	0x11150, 0x11176,
-	0x11180, 0x111cd,
-	0x111d0, 0x111df,
-	0x111e1, 0x111f4,
-	0x11200, 0x11211,
-	0x11213, 0x1123d,
-	0x11280, 0x11286,
-	0x11288, 0x11288,
-	0x1128a, 0x1128d,
-	0x1128f, 0x1129d,
-	0x1129f, 0x112a9,
-	0x112b0, 0x112ea,
-	0x112f0, 0x112f9,
-	0x11300, 0x11303,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133c, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134d,
-	0x11350, 0x11350,
-	0x11357, 0x11357,
-	0x1135d, 0x11363,
-	0x11366, 0x1136c,
-	0x11370, 0x11374,
-	0x11480, 0x114c7,
-	0x114d0, 0x114d9,
-	0x11580, 0x115b5,
-	0x115b8, 0x115dd,
-	0x11600, 0x11644,
-	0x11650, 0x11659,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x11700, 0x11719,
-	0x1171d, 0x1172b,
-	0x11730, 0x1173f,
-	0x118a0, 0x118f2,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x12000, 0x12399,
-	0x12400, 0x1246e,
-	0x12470, 0x12474,
-	0x12480, 0x12543,
-	0x13000, 0x1342e,
-	0x14400, 0x14646,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16a60, 0x16a69,
-	0x16a6e, 0x16a6f,
-	0x16ad0, 0x16aed,
-	0x16af0, 0x16af5,
-	0x16b00, 0x16b45,
-	0x16b50, 0x16b59,
-	0x16b5b, 0x16b61,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	0x1bc9c, 0x1bca3,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d1e8,
-	0x1d200, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1da8b,
-	0x1da9b, 0x1da9f,
-	0x1daa1, 0x1daaf,
-	0x1e800, 0x1e8c4,
-	0x1e8c7, 0x1e8d6,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0bf,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0f5,
-	0x1f100, 0x1f10c,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f579,
-	0x1f57b, 0x1f5a3,
-	0x1f5a5, 0x1f6d0,
-	0x1f6e0, 0x1f6ec,
-	0x1f6f0, 0x1f6f3,
-	0x1f700, 0x1f773,
-	0x1f780, 0x1f7d4,
-	0x1f800, 0x1f80b,
-	0x1f810, 0x1f847,
-	0x1f850, 0x1f859,
-	0x1f860, 0x1f887,
-	0x1f890, 0x1f8ad,
-	0x1f910, 0x1f918,
-	0x1f980, 0x1f984,
-	0x1f9c0, 0x1f9c0,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2b820, 0x2cea1,
-	0x2f800, 0x2fa1d,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xf0000, 0xffffd,
-	0x100000, 0x10fffd,
-}; /* CR_Assigned */
-
-/* 'C': Major Category */
-static const OnigCodePoint CR_C[] = {
-	616,
-	0x0000, 0x001f,
-	0x007f, 0x009f,
-	0x00ad, 0x00ad,
-	0x0378, 0x0379,
-	0x0380, 0x0383,
-	0x038b, 0x038b,
-	0x038d, 0x038d,
-	0x03a2, 0x03a2,
-	0x0530, 0x0530,
-	0x0557, 0x0558,
-	0x0560, 0x0560,
-	0x0588, 0x0588,
-	0x058b, 0x058c,
-	0x0590, 0x0590,
-	0x05c8, 0x05cf,
-	0x05eb, 0x05ef,
-	0x05f5, 0x0605,
-	0x061c, 0x061d,
-	0x06dd, 0x06dd,
-	0x070e, 0x070f,
-	0x074b, 0x074c,
-	0x07b2, 0x07bf,
-	0x07fb, 0x07ff,
-	0x082e, 0x082f,
-	0x083f, 0x083f,
-	0x085c, 0x085d,
-	0x085f, 0x089f,
-	0x08b5, 0x08e2,
-	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,
-	0x09fc, 0x0a00,
-	0x0a04, 0x0a04,
-	0x0a0b, 0x0a0e,
-	0x0a11, 0x0a12,
-	0x0a29, 0x0a29,
-	0x0a31, 0x0a31,
-	0x0a34, 0x0a34,
-	0x0a37, 0x0a37,
-	0x0a3a, 0x0a3b,
-	0x0a3d, 0x0a3d,
-	0x0a43, 0x0a46,
-	0x0a49, 0x0a4a,
-	0x0a4e, 0x0a50,
-	0x0a52, 0x0a58,
-	0x0a5d, 0x0a5d,
-	0x0a5f, 0x0a65,
-	0x0a76, 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,
-	0x0af2, 0x0af8,
-	0x0afa, 0x0b00,
-	0x0b04, 0x0b04,
-	0x0b0d, 0x0b0e,
-	0x0b11, 0x0b12,
-	0x0b29, 0x0b29,
-	0x0b31, 0x0b31,
-	0x0b34, 0x0b34,
-	0x0b3a, 0x0b3b,
-	0x0b45, 0x0b46,
-	0x0b49, 0x0b4a,
-	0x0b4e, 0x0b55,
-	0x0b58, 0x0b5b,
-	0x0b5e, 0x0b5e,
-	0x0b64, 0x0b65,
-	0x0b78, 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, 0x0bcf,
-	0x0bd1, 0x0bd6,
-	0x0bd8, 0x0be5,
-	0x0bfb, 0x0bff,
-	0x0c04, 0x0c04,
-	0x0c0d, 0x0c0d,
-	0x0c11, 0x0c11,
-	0x0c29, 0x0c29,
-	0x0c3a, 0x0c3c,
-	0x0c45, 0x0c45,
-	0x0c49, 0x0c49,
-	0x0c4e, 0x0c54,
-	0x0c57, 0x0c57,
-	0x0c5b, 0x0c5f,
-	0x0c64, 0x0c65,
-	0x0c70, 0x0c77,
-	0x0c80, 0x0c80,
-	0x0c84, 0x0c84,
-	0x0c8d, 0x0c8d,
-	0x0c91, 0x0c91,
-	0x0ca9, 0x0ca9,
-	0x0cb4, 0x0cb4,
-	0x0cba, 0x0cbb,
-	0x0cc5, 0x0cc5,
-	0x0cc9, 0x0cc9,
-	0x0cce, 0x0cd4,
-	0x0cd7, 0x0cdd,
-	0x0cdf, 0x0cdf,
-	0x0ce4, 0x0ce5,
-	0x0cf0, 0x0cf0,
-	0x0cf3, 0x0d00,
-	0x0d04, 0x0d04,
-	0x0d0d, 0x0d0d,
-	0x0d11, 0x0d11,
-	0x0d3b, 0x0d3c,
-	0x0d45, 0x0d45,
-	0x0d49, 0x0d49,
-	0x0d4f, 0x0d56,
-	0x0d58, 0x0d5e,
-	0x0d64, 0x0d65,
-	0x0d76, 0x0d78,
-	0x0d80, 0x0d81,
-	0x0d84, 0x0d84,
-	0x0d97, 0x0d99,
-	0x0db2, 0x0db2,
-	0x0dbc, 0x0dbc,
-	0x0dbe, 0x0dbf,
-	0x0dc7, 0x0dc9,
-	0x0dcb, 0x0dce,
-	0x0dd5, 0x0dd5,
-	0x0dd7, 0x0dd7,
-	0x0de0, 0x0de5,
-	0x0df0, 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,
-	0x0ee0, 0x0eff,
-	0x0f48, 0x0f48,
-	0x0f6d, 0x0f70,
-	0x0f98, 0x0f98,
-	0x0fbd, 0x0fbd,
-	0x0fcd, 0x0fcd,
-	0x0fdb, 0x0fff,
-	0x10c6, 0x10c6,
-	0x10c8, 0x10cc,
-	0x10ce, 0x10cf,
-	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, 0x135c,
-	0x137d, 0x137f,
-	0x139a, 0x139f,
-	0x13f6, 0x13f7,
-	0x13fe, 0x13ff,
-	0x169d, 0x169f,
-	0x16f9, 0x16ff,
-	0x170d, 0x170d,
-	0x1715, 0x171f,
-	0x1737, 0x173f,
-	0x1754, 0x175f,
-	0x176d, 0x176d,
-	0x1771, 0x1771,
-	0x1774, 0x177f,
-	0x17de, 0x17df,
-	0x17ea, 0x17ef,
-	0x17fa, 0x17ff,
-	0x180e, 0x180f,
-	0x181a, 0x181f,
-	0x1878, 0x187f,
-	0x18ab, 0x18af,
-	0x18f6, 0x18ff,
-	0x191f, 0x191f,
-	0x192c, 0x192f,
-	0x193c, 0x193f,
-	0x1941, 0x1943,
-	0x196e, 0x196f,
-	0x1975, 0x197f,
-	0x19ac, 0x19af,
-	0x19ca, 0x19cf,
-	0x19db, 0x19dd,
-	0x1a1c, 0x1a1d,
-	0x1a5f, 0x1a5f,
-	0x1a7d, 0x1a7e,
-	0x1a8a, 0x1a8f,
-	0x1a9a, 0x1a9f,
-	0x1aae, 0x1aaf,
-	0x1abf, 0x1aff,
-	0x1b4c, 0x1b4f,
-	0x1b7d, 0x1b7f,
-	0x1bf4, 0x1bfb,
-	0x1c38, 0x1c3a,
-	0x1c4a, 0x1c4c,
-	0x1c80, 0x1cbf,
-	0x1cc8, 0x1ccf,
-	0x1cf7, 0x1cf7,
-	0x1cfa, 0x1cff,
-	0x1df6, 0x1dfb,
-	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,
-	0x209d, 0x209f,
-	0x20bf, 0x20cf,
-	0x20f1, 0x20ff,
-	0x218c, 0x218f,
-	0x23fb, 0x23ff,
-	0x2427, 0x243f,
-	0x244b, 0x245f,
-	0x2b74, 0x2b75,
-	0x2b96, 0x2b97,
-	0x2bba, 0x2bbc,
-	0x2bc9, 0x2bc9,
-	0x2bd2, 0x2beb,
-	0x2bf0, 0x2bff,
-	0x2c2f, 0x2c2f,
-	0x2c5f, 0x2c5f,
-	0x2cf4, 0x2cf8,
-	0x2d26, 0x2d26,
-	0x2d28, 0x2d2c,
-	0x2d2e, 0x2d2f,
-	0x2d68, 0x2d6e,
-	0x2d71, 0x2d7e,
-	0x2d97, 0x2d9f,
-	0x2da7, 0x2da7,
-	0x2daf, 0x2daf,
-	0x2db7, 0x2db7,
-	0x2dbf, 0x2dbf,
-	0x2dc7, 0x2dc7,
-	0x2dcf, 0x2dcf,
-	0x2dd7, 0x2dd7,
-	0x2ddf, 0x2ddf,
-	0x2e43, 0x2e7f,
-	0x2e9a, 0x2e9a,
-	0x2ef4, 0x2eff,
-	0x2fd6, 0x2fef,
-	0x2ffc, 0x2fff,
-	0x3040, 0x3040,
-	0x3097, 0x3098,
-	0x3100, 0x3104,
-	0x312e, 0x3130,
-	0x318f, 0x318f,
-	0x31bb, 0x31bf,
-	0x31e4, 0x31ef,
-	0x321f, 0x321f,
-	0x32ff, 0x32ff,
-	0x4db6, 0x4dbf,
-	0x9fd6, 0x9fff,
-	0xa48d, 0xa48f,
-	0xa4c7, 0xa4cf,
-	0xa62c, 0xa63f,
-	0xa6f8, 0xa6ff,
-	0xa7ae, 0xa7af,
-	0xa7b8, 0xa7f6,
-	0xa82c, 0xa82f,
-	0xa83a, 0xa83f,
-	0xa878, 0xa87f,
-	0xa8c5, 0xa8cd,
-	0xa8da, 0xa8df,
-	0xa8fe, 0xa8ff,
-	0xa954, 0xa95e,
-	0xa97d, 0xa97f,
-	0xa9ce, 0xa9ce,
-	0xa9da, 0xa9dd,
-	0xa9ff, 0xa9ff,
-	0xaa37, 0xaa3f,
-	0xaa4e, 0xaa4f,
-	0xaa5a, 0xaa5b,
-	0xaac3, 0xaada,
-	0xaaf7, 0xab00,
-	0xab07, 0xab08,
-	0xab0f, 0xab10,
-	0xab17, 0xab1f,
-	0xab27, 0xab27,
-	0xab2f, 0xab2f,
-	0xab66, 0xab6f,
-	0xabee, 0xabef,
-	0xabfa, 0xabff,
-	0xd7a4, 0xd7af,
-	0xd7c7, 0xd7ca,
-	0xd7fc, 0xf8ff,
-	0xfa6e, 0xfa6f,
-	0xfada, 0xfaff,
-	0xfb07, 0xfb12,
-	0xfb18, 0xfb1c,
-	0xfb37, 0xfb37,
-	0xfb3d, 0xfb3d,
-	0xfb3f, 0xfb3f,
-	0xfb42, 0xfb42,
-	0xfb45, 0xfb45,
-	0xfbc2, 0xfbd2,
-	0xfd40, 0xfd4f,
-	0xfd90, 0xfd91,
-	0xfdc8, 0xfdef,
-	0xfdfe, 0xfdff,
-	0xfe1a, 0xfe1f,
-	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,
-	0x1018d, 0x1018f,
-	0x1019c, 0x1019f,
-	0x101a1, 0x101cf,
-	0x101fe, 0x1027f,
-	0x1029d, 0x1029f,
-	0x102d1, 0x102df,
-	0x102fc, 0x102ff,
-	0x10324, 0x1032f,
-	0x1034b, 0x1034f,
-	0x1037b, 0x1037f,
-	0x1039e, 0x1039e,
-	0x103c4, 0x103c7,
-	0x103d6, 0x103ff,
-	0x1049e, 0x1049f,
-	0x104aa, 0x104ff,
-	0x10528, 0x1052f,
-	0x10564, 0x1056e,
-	0x10570, 0x105ff,
-	0x10737, 0x1073f,
-	0x10756, 0x1075f,
-	0x10768, 0x107ff,
-	0x10806, 0x10807,
-	0x10809, 0x10809,
-	0x10836, 0x10836,
-	0x10839, 0x1083b,
-	0x1083d, 0x1083e,
-	0x10856, 0x10856,
-	0x1089f, 0x108a6,
-	0x108b0, 0x108df,
-	0x108f3, 0x108f3,
-	0x108f6, 0x108fa,
-	0x1091c, 0x1091e,
-	0x1093a, 0x1093e,
-	0x10940, 0x1097f,
-	0x109b8, 0x109bb,
-	0x109d0, 0x109d1,
-	0x10a04, 0x10a04,
-	0x10a07, 0x10a0b,
-	0x10a14, 0x10a14,
-	0x10a18, 0x10a18,
-	0x10a34, 0x10a37,
-	0x10a3b, 0x10a3e,
-	0x10a48, 0x10a4f,
-	0x10a59, 0x10a5f,
-	0x10aa0, 0x10abf,
-	0x10ae7, 0x10aea,
-	0x10af7, 0x10aff,
-	0x10b36, 0x10b38,
-	0x10b56, 0x10b57,
-	0x10b73, 0x10b77,
-	0x10b92, 0x10b98,
-	0x10b9d, 0x10ba8,
-	0x10bb0, 0x10bff,
-	0x10c49, 0x10c7f,
-	0x10cb3, 0x10cbf,
-	0x10cf3, 0x10cf9,
-	0x10d00, 0x10e5f,
-	0x10e7f, 0x10fff,
-	0x1104e, 0x11051,
-	0x11070, 0x1107e,
-	0x110bd, 0x110bd,
-	0x110c2, 0x110cf,
-	0x110e9, 0x110ef,
-	0x110fa, 0x110ff,
-	0x11135, 0x11135,
-	0x11144, 0x1114f,
-	0x11177, 0x1117f,
-	0x111ce, 0x111cf,
-	0x111e0, 0x111e0,
-	0x111f5, 0x111ff,
-	0x11212, 0x11212,
-	0x1123e, 0x1127f,
-	0x11287, 0x11287,
-	0x11289, 0x11289,
-	0x1128e, 0x1128e,
-	0x1129e, 0x1129e,
-	0x112aa, 0x112af,
-	0x112eb, 0x112ef,
-	0x112fa, 0x112ff,
-	0x11304, 0x11304,
-	0x1130d, 0x1130e,
-	0x11311, 0x11312,
-	0x11329, 0x11329,
-	0x11331, 0x11331,
-	0x11334, 0x11334,
-	0x1133a, 0x1133b,
-	0x11345, 0x11346,
-	0x11349, 0x1134a,
-	0x1134e, 0x1134f,
-	0x11351, 0x11356,
-	0x11358, 0x1135c,
-	0x11364, 0x11365,
-	0x1136d, 0x1136f,
-	0x11375, 0x1147f,
-	0x114c8, 0x114cf,
-	0x114da, 0x1157f,
-	0x115b6, 0x115b7,
-	0x115de, 0x115ff,
-	0x11645, 0x1164f,
-	0x1165a, 0x1167f,
-	0x116b8, 0x116bf,
-	0x116ca, 0x116ff,
-	0x1171a, 0x1171c,
-	0x1172c, 0x1172f,
-	0x11740, 0x1189f,
-	0x118f3, 0x118fe,
-	0x11900, 0x11abf,
-	0x11af9, 0x11fff,
-	0x1239a, 0x123ff,
-	0x1246f, 0x1246f,
-	0x12475, 0x1247f,
-	0x12544, 0x12fff,
-	0x1342f, 0x143ff,
-	0x14647, 0x167ff,
-	0x16a39, 0x16a3f,
-	0x16a5f, 0x16a5f,
-	0x16a6a, 0x16a6d,
-	0x16a70, 0x16acf,
-	0x16aee, 0x16aef,
-	0x16af6, 0x16aff,
-	0x16b46, 0x16b4f,
-	0x16b5a, 0x16b5a,
-	0x16b62, 0x16b62,
-	0x16b78, 0x16b7c,
-	0x16b90, 0x16eff,
-	0x16f45, 0x16f4f,
-	0x16f7f, 0x16f8e,
-	0x16fa0, 0x1afff,
-	0x1b002, 0x1bbff,
-	0x1bc6b, 0x1bc6f,
-	0x1bc7d, 0x1bc7f,
-	0x1bc89, 0x1bc8f,
-	0x1bc9a, 0x1bc9b,
-	0x1bca0, 0x1cfff,
-	0x1d0f6, 0x1d0ff,
-	0x1d127, 0x1d128,
-	0x1d173, 0x1d17a,
-	0x1d1e9, 0x1d1ff,
-	0x1d246, 0x1d2ff,
-	0x1d357, 0x1d35f,
-	0x1d372, 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,
-	0x1d7cc, 0x1d7cd,
-	0x1da8c, 0x1da9a,
-	0x1daa0, 0x1daa0,
-	0x1dab0, 0x1e7ff,
-	0x1e8c5, 0x1e8c6,
-	0x1e8d7, 0x1edff,
-	0x1ee04, 0x1ee04,
-	0x1ee20, 0x1ee20,
-	0x1ee23, 0x1ee23,
-	0x1ee25, 0x1ee26,
-	0x1ee28, 0x1ee28,
-	0x1ee33, 0x1ee33,
-	0x1ee38, 0x1ee38,
-	0x1ee3a, 0x1ee3a,
-	0x1ee3c, 0x1ee41,
-	0x1ee43, 0x1ee46,
-	0x1ee48, 0x1ee48,
-	0x1ee4a, 0x1ee4a,
-	0x1ee4c, 0x1ee4c,
-	0x1ee50, 0x1ee50,
-	0x1ee53, 0x1ee53,
-	0x1ee55, 0x1ee56,
-	0x1ee58, 0x1ee58,
-	0x1ee5a, 0x1ee5a,
-	0x1ee5c, 0x1ee5c,
-	0x1ee5e, 0x1ee5e,
-	0x1ee60, 0x1ee60,
-	0x1ee63, 0x1ee63,
-	0x1ee65, 0x1ee66,
-	0x1ee6b, 0x1ee6b,
-	0x1ee73, 0x1ee73,
-	0x1ee78, 0x1ee78,
-	0x1ee7d, 0x1ee7d,
-	0x1ee7f, 0x1ee7f,
-	0x1ee8a, 0x1ee8a,
-	0x1ee9c, 0x1eea0,
-	0x1eea4, 0x1eea4,
-	0x1eeaa, 0x1eeaa,
-	0x1eebc, 0x1eeef,
-	0x1eef2, 0x1efff,
-	0x1f02c, 0x1f02f,
-	0x1f094, 0x1f09f,
-	0x1f0af, 0x1f0b0,
-	0x1f0c0, 0x1f0c0,
-	0x1f0d0, 0x1f0d0,
-	0x1f0f6, 0x1f0ff,
-	0x1f10d, 0x1f10f,
-	0x1f12f, 0x1f12f,
-	0x1f16c, 0x1f16f,
-	0x1f19b, 0x1f1e5,
-	0x1f203, 0x1f20f,
-	0x1f23b, 0x1f23f,
-	0x1f249, 0x1f24f,
-	0x1f252, 0x1f2ff,
-	0x1f57a, 0x1f57a,
-	0x1f5a4, 0x1f5a4,
-	0x1f6d1, 0x1f6df,
-	0x1f6ed, 0x1f6ef,
-	0x1f6f4, 0x1f6ff,
-	0x1f774, 0x1f77f,
-	0x1f7d5, 0x1f7ff,
-	0x1f80c, 0x1f80f,
-	0x1f848, 0x1f84f,
-	0x1f85a, 0x1f85f,
-	0x1f888, 0x1f88f,
-	0x1f8ae, 0x1f90f,
-	0x1f919, 0x1f97f,
-	0x1f985, 0x1f9bf,
-	0x1f9c1, 0x1ffff,
-	0x2a6d7, 0x2a6ff,
-	0x2b735, 0x2b73f,
-	0x2b81e, 0x2b81f,
-	0x2cea2, 0x2f7ff,
-	0x2fa1e, 0xe00ff,
-	0xe01f0, 0x10ffff,
-}; /* CR_C */
-
-/* 'Cc': General Category */
-#define CR_Cc CR_Cntrl
-
-/* 'Cf': General Category */
-static const OnigCodePoint CR_Cf[] = {
-	17,
-	0x00ad, 0x00ad,
-	0x0600, 0x0605,
-	0x061c, 0x061c,
-	0x06dd, 0x06dd,
-	0x070f, 0x070f,
-	0x180e, 0x180e,
-	0x200b, 0x200f,
-	0x202a, 0x202e,
-	0x2060, 0x2064,
-	0x2066, 0x206f,
-	0xfeff, 0xfeff,
-	0xfff9, 0xfffb,
-	0x110bd, 0x110bd,
-	0x1bca0, 0x1bca3,
-	0x1d173, 0x1d17a,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-}; /* CR_Cf */
-
-/* 'Cn': General Category */
-static const OnigCodePoint CR_Cn[] = {
-	613,
-	0x0378, 0x0379,
-	0x0380, 0x0383,
-	0x038b, 0x038b,
-	0x038d, 0x038d,
-	0x03a2, 0x03a2,
-	0x0530, 0x0530,
-	0x0557, 0x0558,
-	0x0560, 0x0560,
-	0x0588, 0x0588,
-	0x058b, 0x058c,
-	0x0590, 0x0590,
-	0x05c8, 0x05cf,
-	0x05eb, 0x05ef,
-	0x05f5, 0x05ff,
-	0x061d, 0x061d,
-	0x070e, 0x070e,
-	0x074b, 0x074c,
-	0x07b2, 0x07bf,
-	0x07fb, 0x07ff,
-	0x082e, 0x082f,
-	0x083f, 0x083f,
-	0x085c, 0x085d,
-	0x085f, 0x089f,
-	0x08b5, 0x08e2,
-	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,
-	0x09fc, 0x0a00,
-	0x0a04, 0x0a04,
-	0x0a0b, 0x0a0e,
-	0x0a11, 0x0a12,
-	0x0a29, 0x0a29,
-	0x0a31, 0x0a31,
-	0x0a34, 0x0a34,
-	0x0a37, 0x0a37,
-	0x0a3a, 0x0a3b,
-	0x0a3d, 0x0a3d,
-	0x0a43, 0x0a46,
-	0x0a49, 0x0a4a,
-	0x0a4e, 0x0a50,
-	0x0a52, 0x0a58,
-	0x0a5d, 0x0a5d,
-	0x0a5f, 0x0a65,
-	0x0a76, 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,
-	0x0af2, 0x0af8,
-	0x0afa, 0x0b00,
-	0x0b04, 0x0b04,
-	0x0b0d, 0x0b0e,
-	0x0b11, 0x0b12,
-	0x0b29, 0x0b29,
-	0x0b31, 0x0b31,
-	0x0b34, 0x0b34,
-	0x0b3a, 0x0b3b,
-	0x0b45, 0x0b46,
-	0x0b49, 0x0b4a,
-	0x0b4e, 0x0b55,
-	0x0b58, 0x0b5b,
-	0x0b5e, 0x0b5e,
-	0x0b64, 0x0b65,
-	0x0b78, 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, 0x0bcf,
-	0x0bd1, 0x0bd6,
-	0x0bd8, 0x0be5,
-	0x0bfb, 0x0bff,
-	0x0c04, 0x0c04,
-	0x0c0d, 0x0c0d,
-	0x0c11, 0x0c11,
-	0x0c29, 0x0c29,
-	0x0c3a, 0x0c3c,
-	0x0c45, 0x0c45,
-	0x0c49, 0x0c49,
-	0x0c4e, 0x0c54,
-	0x0c57, 0x0c57,
-	0x0c5b, 0x0c5f,
-	0x0c64, 0x0c65,
-	0x0c70, 0x0c77,
-	0x0c80, 0x0c80,
-	0x0c84, 0x0c84,
-	0x0c8d, 0x0c8d,
-	0x0c91, 0x0c91,
-	0x0ca9, 0x0ca9,
-	0x0cb4, 0x0cb4,
-	0x0cba, 0x0cbb,
-	0x0cc5, 0x0cc5,
-	0x0cc9, 0x0cc9,
-	0x0cce, 0x0cd4,
-	0x0cd7, 0x0cdd,
-	0x0cdf, 0x0cdf,
-	0x0ce4, 0x0ce5,
-	0x0cf0, 0x0cf0,
-	0x0cf3, 0x0d00,
-	0x0d04, 0x0d04,
-	0x0d0d, 0x0d0d,
-	0x0d11, 0x0d11,
-	0x0d3b, 0x0d3c,
-	0x0d45, 0x0d45,
-	0x0d49, 0x0d49,
-	0x0d4f, 0x0d56,
-	0x0d58, 0x0d5e,
-	0x0d64, 0x0d65,
-	0x0d76, 0x0d78,
-	0x0d80, 0x0d81,
-	0x0d84, 0x0d84,
-	0x0d97, 0x0d99,
-	0x0db2, 0x0db2,
-	0x0dbc, 0x0dbc,
-	0x0dbe, 0x0dbf,
-	0x0dc7, 0x0dc9,
-	0x0dcb, 0x0dce,
-	0x0dd5, 0x0dd5,
-	0x0dd7, 0x0dd7,
-	0x0de0, 0x0de5,
-	0x0df0, 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,
-	0x0ee0, 0x0eff,
-	0x0f48, 0x0f48,
-	0x0f6d, 0x0f70,
-	0x0f98, 0x0f98,
-	0x0fbd, 0x0fbd,
-	0x0fcd, 0x0fcd,
-	0x0fdb, 0x0fff,
-	0x10c6, 0x10c6,
-	0x10c8, 0x10cc,
-	0x10ce, 0x10cf,
-	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, 0x135c,
-	0x137d, 0x137f,
-	0x139a, 0x139f,
-	0x13f6, 0x13f7,
-	0x13fe, 0x13ff,
-	0x169d, 0x169f,
-	0x16f9, 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,
-	0x18ab, 0x18af,
-	0x18f6, 0x18ff,
-	0x191f, 0x191f,
-	0x192c, 0x192f,
-	0x193c, 0x193f,
-	0x1941, 0x1943,
-	0x196e, 0x196f,
-	0x1975, 0x197f,
-	0x19ac, 0x19af,
-	0x19ca, 0x19cf,
-	0x19db, 0x19dd,
-	0x1a1c, 0x1a1d,
-	0x1a5f, 0x1a5f,
-	0x1a7d, 0x1a7e,
-	0x1a8a, 0x1a8f,
-	0x1a9a, 0x1a9f,
-	0x1aae, 0x1aaf,
-	0x1abf, 0x1aff,
-	0x1b4c, 0x1b4f,
-	0x1b7d, 0x1b7f,
-	0x1bf4, 0x1bfb,
-	0x1c38, 0x1c3a,
-	0x1c4a, 0x1c4c,
-	0x1c80, 0x1cbf,
-	0x1cc8, 0x1ccf,
-	0x1cf7, 0x1cf7,
-	0x1cfa, 0x1cff,
-	0x1df6, 0x1dfb,
-	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,
-	0x2065, 0x2065,
-	0x2072, 0x2073,
-	0x208f, 0x208f,
-	0x209d, 0x209f,
-	0x20bf, 0x20cf,
-	0x20f1, 0x20ff,
-	0x218c, 0x218f,
-	0x23fb, 0x23ff,
-	0x2427, 0x243f,
-	0x244b, 0x245f,
-	0x2b74, 0x2b75,
-	0x2b96, 0x2b97,
-	0x2bba, 0x2bbc,
-	0x2bc9, 0x2bc9,
-	0x2bd2, 0x2beb,
-	0x2bf0, 0x2bff,
-	0x2c2f, 0x2c2f,
-	0x2c5f, 0x2c5f,
-	0x2cf4, 0x2cf8,
-	0x2d26, 0x2d26,
-	0x2d28, 0x2d2c,
-	0x2d2e, 0x2d2f,
-	0x2d68, 0x2d6e,
-	0x2d71, 0x2d7e,
-	0x2d97, 0x2d9f,
-	0x2da7, 0x2da7,
-	0x2daf, 0x2daf,
-	0x2db7, 0x2db7,
-	0x2dbf, 0x2dbf,
-	0x2dc7, 0x2dc7,
-	0x2dcf, 0x2dcf,
-	0x2dd7, 0x2dd7,
-	0x2ddf, 0x2ddf,
-	0x2e43, 0x2e7f,
-	0x2e9a, 0x2e9a,
-	0x2ef4, 0x2eff,
-	0x2fd6, 0x2fef,
-	0x2ffc, 0x2fff,
-	0x3040, 0x3040,
-	0x3097, 0x3098,
-	0x3100, 0x3104,
-	0x312e, 0x3130,
-	0x318f, 0x318f,
-	0x31bb, 0x31bf,
-	0x31e4, 0x31ef,
-	0x321f, 0x321f,
-	0x32ff, 0x32ff,
-	0x4db6, 0x4dbf,
-	0x9fd6, 0x9fff,
-	0xa48d, 0xa48f,
-	0xa4c7, 0xa4cf,
-	0xa62c, 0xa63f,
-	0xa6f8, 0xa6ff,
-	0xa7ae, 0xa7af,
-	0xa7b8, 0xa7f6,
-	0xa82c, 0xa82f,
-	0xa83a, 0xa83f,
-	0xa878, 0xa87f,
-	0xa8c5, 0xa8cd,
-	0xa8da, 0xa8df,
-	0xa8fe, 0xa8ff,
-	0xa954, 0xa95e,
-	0xa97d, 0xa97f,
-	0xa9ce, 0xa9ce,
-	0xa9da, 0xa9dd,
-	0xa9ff, 0xa9ff,
-	0xaa37, 0xaa3f,
-	0xaa4e, 0xaa4f,
-	0xaa5a, 0xaa5b,
-	0xaac3, 0xaada,
-	0xaaf7, 0xab00,
-	0xab07, 0xab08,
-	0xab0f, 0xab10,
-	0xab17, 0xab1f,
-	0xab27, 0xab27,
-	0xab2f, 0xab2f,
-	0xab66, 0xab6f,
-	0xabee, 0xabef,
-	0xabfa, 0xabff,
-	0xd7a4, 0xd7af,
-	0xd7c7, 0xd7ca,
-	0xd7fc, 0xd7ff,
-	0xfa6e, 0xfa6f,
-	0xfada, 0xfaff,
-	0xfb07, 0xfb12,
-	0xfb18, 0xfb1c,
-	0xfb37, 0xfb37,
-	0xfb3d, 0xfb3d,
-	0xfb3f, 0xfb3f,
-	0xfb42, 0xfb42,
-	0xfb45, 0xfb45,
-	0xfbc2, 0xfbd2,
-	0xfd40, 0xfd4f,
-	0xfd90, 0xfd91,
-	0xfdc8, 0xfdef,
-	0xfdfe, 0xfdff,
-	0xfe1a, 0xfe1f,
-	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,
-	0x1018d, 0x1018f,
-	0x1019c, 0x1019f,
-	0x101a1, 0x101cf,
-	0x101fe, 0x1027f,
-	0x1029d, 0x1029f,
-	0x102d1, 0x102df,
-	0x102fc, 0x102ff,
-	0x10324, 0x1032f,
-	0x1034b, 0x1034f,
-	0x1037b, 0x1037f,
-	0x1039e, 0x1039e,
-	0x103c4, 0x103c7,
-	0x103d6, 0x103ff,
-	0x1049e, 0x1049f,
-	0x104aa, 0x104ff,
-	0x10528, 0x1052f,
-	0x10564, 0x1056e,
-	0x10570, 0x105ff,
-	0x10737, 0x1073f,
-	0x10756, 0x1075f,
-	0x10768, 0x107ff,
-	0x10806, 0x10807,
-	0x10809, 0x10809,
-	0x10836, 0x10836,
-	0x10839, 0x1083b,
-	0x1083d, 0x1083e,
-	0x10856, 0x10856,
-	0x1089f, 0x108a6,
-	0x108b0, 0x108df,
-	0x108f3, 0x108f3,
-	0x108f6, 0x108fa,
-	0x1091c, 0x1091e,
-	0x1093a, 0x1093e,
-	0x10940, 0x1097f,
-	0x109b8, 0x109bb,
-	0x109d0, 0x109d1,
-	0x10a04, 0x10a04,
-	0x10a07, 0x10a0b,
-	0x10a14, 0x10a14,
-	0x10a18, 0x10a18,
-	0x10a34, 0x10a37,
-	0x10a3b, 0x10a3e,
-	0x10a48, 0x10a4f,
-	0x10a59, 0x10a5f,
-	0x10aa0, 0x10abf,
-	0x10ae7, 0x10aea,
-	0x10af7, 0x10aff,
-	0x10b36, 0x10b38,
-	0x10b56, 0x10b57,
-	0x10b73, 0x10b77,
-	0x10b92, 0x10b98,
-	0x10b9d, 0x10ba8,
-	0x10bb0, 0x10bff,
-	0x10c49, 0x10c7f,
-	0x10cb3, 0x10cbf,
-	0x10cf3, 0x10cf9,
-	0x10d00, 0x10e5f,
-	0x10e7f, 0x10fff,
-	0x1104e, 0x11051,
-	0x11070, 0x1107e,
-	0x110c2, 0x110cf,
-	0x110e9, 0x110ef,
-	0x110fa, 0x110ff,
-	0x11135, 0x11135,
-	0x11144, 0x1114f,
-	0x11177, 0x1117f,
-	0x111ce, 0x111cf,
-	0x111e0, 0x111e0,
-	0x111f5, 0x111ff,
-	0x11212, 0x11212,
-	0x1123e, 0x1127f,
-	0x11287, 0x11287,
-	0x11289, 0x11289,
-	0x1128e, 0x1128e,
-	0x1129e, 0x1129e,
-	0x112aa, 0x112af,
-	0x112eb, 0x112ef,
-	0x112fa, 0x112ff,
-	0x11304, 0x11304,
-	0x1130d, 0x1130e,
-	0x11311, 0x11312,
-	0x11329, 0x11329,
-	0x11331, 0x11331,
-	0x11334, 0x11334,
-	0x1133a, 0x1133b,
-	0x11345, 0x11346,
-	0x11349, 0x1134a,
-	0x1134e, 0x1134f,
-	0x11351, 0x11356,
-	0x11358, 0x1135c,
-	0x11364, 0x11365,
-	0x1136d, 0x1136f,
-	0x11375, 0x1147f,
-	0x114c8, 0x114cf,
-	0x114da, 0x1157f,
-	0x115b6, 0x115b7,
-	0x115de, 0x115ff,
-	0x11645, 0x1164f,
-	0x1165a, 0x1167f,
-	0x116b8, 0x116bf,
-	0x116ca, 0x116ff,
-	0x1171a, 0x1171c,
-	0x1172c, 0x1172f,
-	0x11740, 0x1189f,
-	0x118f3, 0x118fe,
-	0x11900, 0x11abf,
-	0x11af9, 0x11fff,
-	0x1239a, 0x123ff,
-	0x1246f, 0x1246f,
-	0x12475, 0x1247f,
-	0x12544, 0x12fff,
-	0x1342f, 0x143ff,
-	0x14647, 0x167ff,
-	0x16a39, 0x16a3f,
-	0x16a5f, 0x16a5f,
-	0x16a6a, 0x16a6d,
-	0x16a70, 0x16acf,
-	0x16aee, 0x16aef,
-	0x16af6, 0x16aff,
-	0x16b46, 0x16b4f,
-	0x16b5a, 0x16b5a,
-	0x16b62, 0x16b62,
-	0x16b78, 0x16b7c,
-	0x16b90, 0x16eff,
-	0x16f45, 0x16f4f,
-	0x16f7f, 0x16f8e,
-	0x16fa0, 0x1afff,
-	0x1b002, 0x1bbff,
-	0x1bc6b, 0x1bc6f,
-	0x1bc7d, 0x1bc7f,
-	0x1bc89, 0x1bc8f,
-	0x1bc9a, 0x1bc9b,
-	0x1bca4, 0x1cfff,
-	0x1d0f6, 0x1d0ff,
-	0x1d127, 0x1d128,
-	0x1d1e9, 0x1d1ff,
-	0x1d246, 0x1d2ff,
-	0x1d357, 0x1d35f,
-	0x1d372, 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,
-	0x1d7cc, 0x1d7cd,
-	0x1da8c, 0x1da9a,
-	0x1daa0, 0x1daa0,
-	0x1dab0, 0x1e7ff,
-	0x1e8c5, 0x1e8c6,
-	0x1e8d7, 0x1edff,
-	0x1ee04, 0x1ee04,
-	0x1ee20, 0x1ee20,
-	0x1ee23, 0x1ee23,
-	0x1ee25, 0x1ee26,
-	0x1ee28, 0x1ee28,
-	0x1ee33, 0x1ee33,
-	0x1ee38, 0x1ee38,
-	0x1ee3a, 0x1ee3a,
-	0x1ee3c, 0x1ee41,
-	0x1ee43, 0x1ee46,
-	0x1ee48, 0x1ee48,
-	0x1ee4a, 0x1ee4a,
-	0x1ee4c, 0x1ee4c,
-	0x1ee50, 0x1ee50,
-	0x1ee53, 0x1ee53,
-	0x1ee55, 0x1ee56,
-	0x1ee58, 0x1ee58,
-	0x1ee5a, 0x1ee5a,
-	0x1ee5c, 0x1ee5c,
-	0x1ee5e, 0x1ee5e,
-	0x1ee60, 0x1ee60,
-	0x1ee63, 0x1ee63,
-	0x1ee65, 0x1ee66,
-	0x1ee6b, 0x1ee6b,
-	0x1ee73, 0x1ee73,
-	0x1ee78, 0x1ee78,
-	0x1ee7d, 0x1ee7d,
-	0x1ee7f, 0x1ee7f,
-	0x1ee8a, 0x1ee8a,
-	0x1ee9c, 0x1eea0,
-	0x1eea4, 0x1eea4,
-	0x1eeaa, 0x1eeaa,
-	0x1eebc, 0x1eeef,
-	0x1eef2, 0x1efff,
-	0x1f02c, 0x1f02f,
-	0x1f094, 0x1f09f,
-	0x1f0af, 0x1f0b0,
-	0x1f0c0, 0x1f0c0,
-	0x1f0d0, 0x1f0d0,
-	0x1f0f6, 0x1f0ff,
-	0x1f10d, 0x1f10f,
-	0x1f12f, 0x1f12f,
-	0x1f16c, 0x1f16f,
-	0x1f19b, 0x1f1e5,
-	0x1f203, 0x1f20f,
-	0x1f23b, 0x1f23f,
-	0x1f249, 0x1f24f,
-	0x1f252, 0x1f2ff,
-	0x1f57a, 0x1f57a,
-	0x1f5a4, 0x1f5a4,
-	0x1f6d1, 0x1f6df,
-	0x1f6ed, 0x1f6ef,
-	0x1f6f4, 0x1f6ff,
-	0x1f774, 0x1f77f,
-	0x1f7d5, 0x1f7ff,
-	0x1f80c, 0x1f80f,
-	0x1f848, 0x1f84f,
-	0x1f85a, 0x1f85f,
-	0x1f888, 0x1f88f,
-	0x1f8ae, 0x1f90f,
-	0x1f919, 0x1f97f,
-	0x1f985, 0x1f9bf,
-	0x1f9c1, 0x1ffff,
-	0x2a6d7, 0x2a6ff,
-	0x2b735, 0x2b73f,
-	0x2b81e, 0x2b81f,
-	0x2cea2, 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[] = {
-	554,
-	0x0041, 0x005a,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00b5, 0x00b5,
-	0x00ba, 0x00ba,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x02c1,
-	0x02c6, 0x02d1,
-	0x02e0, 0x02e4,
-	0x02ec, 0x02ec,
-	0x02ee, 0x02ee,
-	0x0370, 0x0374,
-	0x0376, 0x0377,
-	0x037a, 0x037d,
-	0x037f, 0x037f,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x048a, 0x052f,
-	0x0531, 0x0556,
-	0x0559, 0x0559,
-	0x0561, 0x0587,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0620, 0x064a,
-	0x066e, 0x066f,
-	0x0671, 0x06d3,
-	0x06d5, 0x06d5,
-	0x06e5, 0x06e6,
-	0x06ee, 0x06ef,
-	0x06fa, 0x06fc,
-	0x06ff, 0x06ff,
-	0x0710, 0x0710,
-	0x0712, 0x072f,
-	0x074d, 0x07a5,
-	0x07b1, 0x07b1,
-	0x07ca, 0x07ea,
-	0x07f4, 0x07f5,
-	0x07fa, 0x07fa,
-	0x0800, 0x0815,
-	0x081a, 0x081a,
-	0x0824, 0x0824,
-	0x0828, 0x0828,
-	0x0840, 0x0858,
-	0x08a0, 0x08b4,
-	0x0904, 0x0939,
-	0x093d, 0x093d,
-	0x0950, 0x0950,
-	0x0958, 0x0961,
-	0x0971, 0x0980,
-	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,
-	0x0af9, 0x0af9,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c3d,
-	0x0c58, 0x0c5a,
-	0x0c60, 0x0c61,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbd, 0x0cbd,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce1,
-	0x0cf1, 0x0cf2,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d3d,
-	0x0d4e, 0x0d4e,
-	0x0d5f, 0x0d61,
-	0x0d7a, 0x0d7f,
-	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, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f40, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f88, 0x0f8c,
-	0x1000, 0x102a,
-	0x103f, 0x103f,
-	0x1050, 0x1055,
-	0x105a, 0x105d,
-	0x1061, 0x1061,
-	0x1065, 0x1066,
-	0x106e, 0x1070,
-	0x1075, 0x1081,
-	0x108e, 0x108e,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 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, 0x13f5,
-	0x13f8, 0x13fd,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16f1, 0x16f8,
-	0x1700, 0x170c,
-	0x170e, 0x1711,
-	0x1720, 0x1731,
-	0x1740, 0x1751,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1780, 0x17b3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dc,
-	0x1820, 0x1877,
-	0x1880, 0x18a8,
-	0x18aa, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191e,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x1a00, 0x1a16,
-	0x1a20, 0x1a54,
-	0x1aa7, 0x1aa7,
-	0x1b05, 0x1b33,
-	0x1b45, 0x1b4b,
-	0x1b83, 0x1ba0,
-	0x1bae, 0x1baf,
-	0x1bba, 0x1be5,
-	0x1c00, 0x1c23,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c7d,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf1,
-	0x1cf5, 0x1cf6,
-	0x1d00, 0x1dbf,
-	0x1e00, 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, 0x209c,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2119, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x212d,
-	0x212f, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2183, 0x2184,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2ce4,
-	0x2ceb, 0x2cee,
-	0x2cf2, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3006,
-	0x3031, 0x3035,
-	0x303b, 0x303c,
-	0x3041, 0x3096,
-	0x309d, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fd5,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa640, 0xa66e,
-	0xa67f, 0xa69d,
-	0xa6a0, 0xa6e5,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa7ad,
-	0xa7b0, 0xa7b7,
-	0xa7f7, 0xa801,
-	0xa803, 0xa805,
-	0xa807, 0xa80a,
-	0xa80c, 0xa822,
-	0xa840, 0xa873,
-	0xa882, 0xa8b3,
-	0xa8f2, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa8fd, 0xa8fd,
-	0xa90a, 0xa925,
-	0xa930, 0xa946,
-	0xa960, 0xa97c,
-	0xa984, 0xa9b2,
-	0xa9cf, 0xa9cf,
-	0xa9e0, 0xa9e4,
-	0xa9e6, 0xa9ef,
-	0xa9fa, 0xa9fe,
-	0xaa00, 0xaa28,
-	0xaa40, 0xaa42,
-	0xaa44, 0xaa4b,
-	0xaa60, 0xaa76,
-	0xaa7a, 0xaa7a,
-	0xaa7e, 0xaaaf,
-	0xaab1, 0xaab1,
-	0xaab5, 0xaab6,
-	0xaab9, 0xaabd,
-	0xaac0, 0xaac0,
-	0xaac2, 0xaac2,
-	0xaadb, 0xaadd,
-	0xaae0, 0xaaea,
-	0xaaf2, 0xaaf4,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xab30, 0xab5a,
-	0xab5c, 0xab65,
-	0xab70, 0xabe2,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa6d,
-	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,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031f,
-	0x10330, 0x10340,
-	0x10342, 0x10349,
-	0x10350, 0x10375,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x10400, 0x1049d,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10860, 0x10876,
-	0x10880, 0x1089e,
-	0x108e0, 0x108f2,
-	0x108f4, 0x108f5,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a00,
-	0x10a10, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10a80, 0x10a9c,
-	0x10ac0, 0x10ac7,
-	0x10ac9, 0x10ae4,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10b80, 0x10b91,
-	0x10c00, 0x10c48,
-	0x10c80, 0x10cb2,
-	0x10cc0, 0x10cf2,
-	0x11003, 0x11037,
-	0x11083, 0x110af,
-	0x110d0, 0x110e8,
-	0x11103, 0x11126,
-	0x11150, 0x11172,
-	0x11176, 0x11176,
-	0x11183, 0x111b2,
-	0x111c1, 0x111c4,
-	0x111da, 0x111da,
-	0x111dc, 0x111dc,
-	0x11200, 0x11211,
-	0x11213, 0x1122b,
-	0x11280, 0x11286,
-	0x11288, 0x11288,
-	0x1128a, 0x1128d,
-	0x1128f, 0x1129d,
-	0x1129f, 0x112a8,
-	0x112b0, 0x112de,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133d, 0x1133d,
-	0x11350, 0x11350,
-	0x1135d, 0x11361,
-	0x11480, 0x114af,
-	0x114c4, 0x114c5,
-	0x114c7, 0x114c7,
-	0x11580, 0x115ae,
-	0x115d8, 0x115db,
-	0x11600, 0x1162f,
-	0x11644, 0x11644,
-	0x11680, 0x116aa,
-	0x11700, 0x11719,
-	0x118a0, 0x118df,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x12000, 0x12399,
-	0x12480, 0x12543,
-	0x13000, 0x1342e,
-	0x14400, 0x14646,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16ad0, 0x16aed,
-	0x16b00, 0x16b2f,
-	0x16b40, 0x16b43,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f50,
-	0x16f93, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	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, 0x1d7cb,
-	0x1e800, 0x1e8c4,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2b820, 0x2cea1,
-	0x2f800, 0x2fa1d,
-}; /* CR_L */
-
-/* 'LC': General Category */
-static const OnigCodePoint CR_LC[] = {
-	122,
-	0x0041, 0x005a,
-	0x0061, 0x007a,
-	0x00b5, 0x00b5,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x01ba,
-	0x01bc, 0x01bf,
-	0x01c4, 0x0293,
-	0x0295, 0x02af,
-	0x0370, 0x0373,
-	0x0376, 0x0377,
-	0x037b, 0x037d,
-	0x037f, 0x037f,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x048a, 0x052f,
-	0x0531, 0x0556,
-	0x0561, 0x0587,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x13a0, 0x13f5,
-	0x13f8, 0x13fd,
-	0x1d00, 0x1d2b,
-	0x1d6b, 0x1d77,
-	0x1d79, 0x1d9a,
-	0x1e00, 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,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2119, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x212d,
-	0x212f, 0x2134,
-	0x2139, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2183, 0x2184,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2c7b,
-	0x2c7e, 0x2ce4,
-	0x2ceb, 0x2cee,
-	0x2cf2, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0xa640, 0xa66d,
-	0xa680, 0xa69b,
-	0xa722, 0xa76f,
-	0xa771, 0xa787,
-	0xa78b, 0xa78e,
-	0xa790, 0xa7ad,
-	0xa7b0, 0xa7b7,
-	0xa7fa, 0xa7fa,
-	0xab30, 0xab5a,
-	0xab60, 0xab65,
-	0xab70, 0xabbf,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0x10400, 0x1044f,
-	0x10c80, 0x10cb2,
-	0x10cc0, 0x10cf2,
-	0x118a0, 0x118df,
-	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, 0x1d7cb,
-}; /* CR_LC */
-
-/* 'Ll': General Category */
-static const OnigCodePoint CR_Ll[] = {
-	630,
-	0x0061, 0x007a,
-	0x00b5, 0x00b5,
-	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,
-	0x0242, 0x0242,
-	0x0247, 0x0247,
-	0x0249, 0x0249,
-	0x024b, 0x024b,
-	0x024d, 0x024d,
-	0x024f, 0x0293,
-	0x0295, 0x02af,
-	0x0371, 0x0371,
-	0x0373, 0x0373,
-	0x0377, 0x0377,
-	0x037b, 0x037d,
-	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, 0x04cf,
-	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,
-	0x04fb, 0x04fb,
-	0x04fd, 0x04fd,
-	0x04ff, 0x04ff,
-	0x0501, 0x0501,
-	0x0503, 0x0503,
-	0x0505, 0x0505,
-	0x0507, 0x0507,
-	0x0509, 0x0509,
-	0x050b, 0x050b,
-	0x050d, 0x050d,
-	0x050f, 0x050f,
-	0x0511, 0x0511,
-	0x0513, 0x0513,
-	0x0515, 0x0515,
-	0x0517, 0x0517,
-	0x0519, 0x0519,
-	0x051b, 0x051b,
-	0x051d, 0x051d,
-	0x051f, 0x051f,
-	0x0521, 0x0521,
-	0x0523, 0x0523,
-	0x0525, 0x0525,
-	0x0527, 0x0527,
-	0x0529, 0x0529,
-	0x052b, 0x052b,
-	0x052d, 0x052d,
-	0x052f, 0x052f,
-	0x0561, 0x0587,
-	0x13f8, 0x13fd,
-	0x1d00, 0x1d2b,
-	0x1d6b, 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, 0x1e9d,
-	0x1e9f, 0x1e9f,
-	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,
-	0x1efb, 0x1efb,
-	0x1efd, 0x1efd,
-	0x1eff, 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,
-	0x210a, 0x210a,
-	0x210e, 0x210f,
-	0x2113, 0x2113,
-	0x212f, 0x212f,
-	0x2134, 0x2134,
-	0x2139, 0x2139,
-	0x213c, 0x213d,
-	0x2146, 0x2149,
-	0x214e, 0x214e,
-	0x2184, 0x2184,
-	0x2c30, 0x2c5e,
-	0x2c61, 0x2c61,
-	0x2c65, 0x2c66,
-	0x2c68, 0x2c68,
-	0x2c6a, 0x2c6a,
-	0x2c6c, 0x2c6c,
-	0x2c71, 0x2c71,
-	0x2c73, 0x2c74,
-	0x2c76, 0x2c7b,
-	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,
-	0x2cec, 0x2cec,
-	0x2cee, 0x2cee,
-	0x2cf3, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0xa641, 0xa641,
-	0xa643, 0xa643,
-	0xa645, 0xa645,
-	0xa647, 0xa647,
-	0xa649, 0xa649,
-	0xa64b, 0xa64b,
-	0xa64d, 0xa64d,
-	0xa64f, 0xa64f,
-	0xa651, 0xa651,
-	0xa653, 0xa653,
-	0xa655, 0xa655,
-	0xa657, 0xa657,
-	0xa659, 0xa659,
-	0xa65b, 0xa65b,
-	0xa65d, 0xa65d,
-	0xa65f, 0xa65f,
-	0xa661, 0xa661,
-	0xa663, 0xa663,
-	0xa665, 0xa665,
-	0xa667, 0xa667,
-	0xa669, 0xa669,
-	0xa66b, 0xa66b,
-	0xa66d, 0xa66d,
-	0xa681, 0xa681,
-	0xa683, 0xa683,
-	0xa685, 0xa685,
-	0xa687, 0xa687,
-	0xa689, 0xa689,
-	0xa68b, 0xa68b,
-	0xa68d, 0xa68d,
-	0xa68f, 0xa68f,
-	0xa691, 0xa691,
-	0xa693, 0xa693,
-	0xa695, 0xa695,
-	0xa697, 0xa697,
-	0xa699, 0xa699,
-	0xa69b, 0xa69b,
-	0xa723, 0xa723,
-	0xa725, 0xa725,
-	0xa727, 0xa727,
-	0xa729, 0xa729,
-	0xa72b, 0xa72b,
-	0xa72d, 0xa72d,
-	0xa72f, 0xa731,
-	0xa733, 0xa733,
-	0xa735, 0xa735,
-	0xa737, 0xa737,
-	0xa739, 0xa739,
-	0xa73b, 0xa73b,
-	0xa73d, 0xa73d,
-	0xa73f, 0xa73f,
-	0xa741, 0xa741,
-	0xa743, 0xa743,
-	0xa745, 0xa745,
-	0xa747, 0xa747,
-	0xa749, 0xa749,
-	0xa74b, 0xa74b,
-	0xa74d, 0xa74d,
-	0xa74f, 0xa74f,
-	0xa751, 0xa751,
-	0xa753, 0xa753,
-	0xa755, 0xa755,
-	0xa757, 0xa757,
-	0xa759, 0xa759,
-	0xa75b, 0xa75b,
-	0xa75d, 0xa75d,
-	0xa75f, 0xa75f,
-	0xa761, 0xa761,
-	0xa763, 0xa763,
-	0xa765, 0xa765,
-	0xa767, 0xa767,
-	0xa769, 0xa769,
-	0xa76b, 0xa76b,
-	0xa76d, 0xa76d,
-	0xa76f, 0xa76f,
-	0xa771, 0xa778,
-	0xa77a, 0xa77a,
-	0xa77c, 0xa77c,
-	0xa77f, 0xa77f,
-	0xa781, 0xa781,
-	0xa783, 0xa783,
-	0xa785, 0xa785,
-	0xa787, 0xa787,
-	0xa78c, 0xa78c,
-	0xa78e, 0xa78e,
-	0xa791, 0xa791,
-	0xa793, 0xa795,
-	0xa797, 0xa797,
-	0xa799, 0xa799,
-	0xa79b, 0xa79b,
-	0xa79d, 0xa79d,
-	0xa79f, 0xa79f,
-	0xa7a1, 0xa7a1,
-	0xa7a3, 0xa7a3,
-	0xa7a5, 0xa7a5,
-	0xa7a7, 0xa7a7,
-	0xa7a9, 0xa7a9,
-	0xa7b5, 0xa7b5,
-	0xa7b7, 0xa7b7,
-	0xa7fa, 0xa7fa,
-	0xab30, 0xab5a,
-	0xab60, 0xab65,
-	0xab70, 0xabbf,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff41, 0xff5a,
-	0x10428, 0x1044f,
-	0x10cc0, 0x10cf2,
-	0x118c0, 0x118df,
-	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,
-	0x1d7cb, 0x1d7cb,
-}; /* CR_Ll */
-
-/* 'Lm': General Category */
-static const OnigCodePoint CR_Lm[] = {
-	56,
-	0x02b0, 0x02c1,
-	0x02c6, 0x02d1,
-	0x02e0, 0x02e4,
-	0x02ec, 0x02ec,
-	0x02ee, 0x02ee,
-	0x0374, 0x0374,
-	0x037a, 0x037a,
-	0x0559, 0x0559,
-	0x0640, 0x0640,
-	0x06e5, 0x06e6,
-	0x07f4, 0x07f5,
-	0x07fa, 0x07fa,
-	0x081a, 0x081a,
-	0x0824, 0x0824,
-	0x0828, 0x0828,
-	0x0971, 0x0971,
-	0x0e46, 0x0e46,
-	0x0ec6, 0x0ec6,
-	0x10fc, 0x10fc,
-	0x17d7, 0x17d7,
-	0x1843, 0x1843,
-	0x1aa7, 0x1aa7,
-	0x1c78, 0x1c7d,
-	0x1d2c, 0x1d6a,
-	0x1d78, 0x1d78,
-	0x1d9b, 0x1dbf,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 0x209c,
-	0x2c7c, 0x2c7d,
-	0x2d6f, 0x2d6f,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3005,
-	0x3031, 0x3035,
-	0x303b, 0x303b,
-	0x309d, 0x309e,
-	0x30fc, 0x30fe,
-	0xa015, 0xa015,
-	0xa4f8, 0xa4fd,
-	0xa60c, 0xa60c,
-	0xa67f, 0xa67f,
-	0xa69c, 0xa69d,
-	0xa717, 0xa71f,
-	0xa770, 0xa770,
-	0xa788, 0xa788,
-	0xa7f8, 0xa7f9,
-	0xa9cf, 0xa9cf,
-	0xa9e6, 0xa9e6,
-	0xaa70, 0xaa70,
-	0xaadd, 0xaadd,
-	0xaaf3, 0xaaf4,
-	0xab5c, 0xab5f,
-	0xff70, 0xff70,
-	0xff9e, 0xff9f,
-	0x16b40, 0x16b43,
-	0x16f93, 0x16f9f,
-}; /* CR_Lm */
-
-/* 'Lo': General Category */
-static const OnigCodePoint CR_Lo[] = {
-	433,
-	0x00aa, 0x00aa,
-	0x00ba, 0x00ba,
-	0x01bb, 0x01bb,
-	0x01c0, 0x01c3,
-	0x0294, 0x0294,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0620, 0x063f,
-	0x0641, 0x064a,
-	0x066e, 0x066f,
-	0x0671, 0x06d3,
-	0x06d5, 0x06d5,
-	0x06ee, 0x06ef,
-	0x06fa, 0x06fc,
-	0x06ff, 0x06ff,
-	0x0710, 0x0710,
-	0x0712, 0x072f,
-	0x074d, 0x07a5,
-	0x07b1, 0x07b1,
-	0x07ca, 0x07ea,
-	0x0800, 0x0815,
-	0x0840, 0x0858,
-	0x08a0, 0x08b4,
-	0x0904, 0x0939,
-	0x093d, 0x093d,
-	0x0950, 0x0950,
-	0x0958, 0x0961,
-	0x0972, 0x0980,
-	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,
-	0x0af9, 0x0af9,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c3d,
-	0x0c58, 0x0c5a,
-	0x0c60, 0x0c61,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbd, 0x0cbd,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce1,
-	0x0cf1, 0x0cf2,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d3d,
-	0x0d4e, 0x0d4e,
-	0x0d5f, 0x0d61,
-	0x0d7a, 0x0d7f,
-	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, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f40, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f88, 0x0f8c,
-	0x1000, 0x102a,
-	0x103f, 0x103f,
-	0x1050, 0x1055,
-	0x105a, 0x105d,
-	0x1061, 0x1061,
-	0x1065, 0x1066,
-	0x106e, 0x1070,
-	0x1075, 0x1081,
-	0x108e, 0x108e,
-	0x10d0, 0x10fa,
-	0x10fd, 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,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16f1, 0x16f8,
-	0x1700, 0x170c,
-	0x170e, 0x1711,
-	0x1720, 0x1731,
-	0x1740, 0x1751,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1780, 0x17b3,
-	0x17dc, 0x17dc,
-	0x1820, 0x1842,
-	0x1844, 0x1877,
-	0x1880, 0x18a8,
-	0x18aa, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191e,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x1a00, 0x1a16,
-	0x1a20, 0x1a54,
-	0x1b05, 0x1b33,
-	0x1b45, 0x1b4b,
-	0x1b83, 0x1ba0,
-	0x1bae, 0x1baf,
-	0x1bba, 0x1be5,
-	0x1c00, 0x1c23,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c77,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf1,
-	0x1cf5, 0x1cf6,
-	0x2135, 0x2138,
-	0x2d30, 0x2d67,
-	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, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fd5,
-	0xa000, 0xa014,
-	0xa016, 0xa48c,
-	0xa4d0, 0xa4f7,
-	0xa500, 0xa60b,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa66e, 0xa66e,
-	0xa6a0, 0xa6e5,
-	0xa78f, 0xa78f,
-	0xa7f7, 0xa7f7,
-	0xa7fb, 0xa801,
-	0xa803, 0xa805,
-	0xa807, 0xa80a,
-	0xa80c, 0xa822,
-	0xa840, 0xa873,
-	0xa882, 0xa8b3,
-	0xa8f2, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa8fd, 0xa8fd,
-	0xa90a, 0xa925,
-	0xa930, 0xa946,
-	0xa960, 0xa97c,
-	0xa984, 0xa9b2,
-	0xa9e0, 0xa9e4,
-	0xa9e7, 0xa9ef,
-	0xa9fa, 0xa9fe,
-	0xaa00, 0xaa28,
-	0xaa40, 0xaa42,
-	0xaa44, 0xaa4b,
-	0xaa60, 0xaa6f,
-	0xaa71, 0xaa76,
-	0xaa7a, 0xaa7a,
-	0xaa7e, 0xaaaf,
-	0xaab1, 0xaab1,
-	0xaab5, 0xaab6,
-	0xaab9, 0xaabd,
-	0xaac0, 0xaac0,
-	0xaac2, 0xaac2,
-	0xaadb, 0xaadc,
-	0xaae0, 0xaaea,
-	0xaaf2, 0xaaf2,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabe2,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa6d,
-	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,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031f,
-	0x10330, 0x10340,
-	0x10342, 0x10349,
-	0x10350, 0x10375,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x10450, 0x1049d,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10860, 0x10876,
-	0x10880, 0x1089e,
-	0x108e0, 0x108f2,
-	0x108f4, 0x108f5,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a00,
-	0x10a10, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10a80, 0x10a9c,
-	0x10ac0, 0x10ac7,
-	0x10ac9, 0x10ae4,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10b80, 0x10b91,
-	0x10c00, 0x10c48,
-	0x11003, 0x11037,
-	0x11083, 0x110af,
-	0x110d0, 0x110e8,
-	0x11103, 0x11126,
-	0x11150, 0x11172,
-	0x11176, 0x11176,
-	0x11183, 0x111b2,
-	0x111c1, 0x111c4,
-	0x111da, 0x111da,
-	0x111dc, 0x111dc,
-	0x11200, 0x11211,
-	0x11213, 0x1122b,
-	0x11280, 0x11286,
-	0x11288, 0x11288,
-	0x1128a, 0x1128d,
-	0x1128f, 0x1129d,
-	0x1129f, 0x112a8,
-	0x112b0, 0x112de,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133d, 0x1133d,
-	0x11350, 0x11350,
-	0x1135d, 0x11361,
-	0x11480, 0x114af,
-	0x114c4, 0x114c5,
-	0x114c7, 0x114c7,
-	0x11580, 0x115ae,
-	0x115d8, 0x115db,
-	0x11600, 0x1162f,
-	0x11644, 0x11644,
-	0x11680, 0x116aa,
-	0x11700, 0x11719,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x12000, 0x12399,
-	0x12480, 0x12543,
-	0x13000, 0x1342e,
-	0x14400, 0x14646,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16ad0, 0x16aed,
-	0x16b00, 0x16b2f,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f50,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	0x1e800, 0x1e8c4,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2b820, 0x2cea1,
-	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[] = {
-	625,
-	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,
-	0x0243, 0x0246,
-	0x0248, 0x0248,
-	0x024a, 0x024a,
-	0x024c, 0x024c,
-	0x024e, 0x024e,
-	0x0370, 0x0370,
-	0x0372, 0x0372,
-	0x0376, 0x0376,
-	0x037f, 0x037f,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x038f,
-	0x0391, 0x03a1,
-	0x03a3, 0x03ab,
-	0x03cf, 0x03cf,
-	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,
-	0x04fa, 0x04fa,
-	0x04fc, 0x04fc,
-	0x04fe, 0x04fe,
-	0x0500, 0x0500,
-	0x0502, 0x0502,
-	0x0504, 0x0504,
-	0x0506, 0x0506,
-	0x0508, 0x0508,
-	0x050a, 0x050a,
-	0x050c, 0x050c,
-	0x050e, 0x050e,
-	0x0510, 0x0510,
-	0x0512, 0x0512,
-	0x0514, 0x0514,
-	0x0516, 0x0516,
-	0x0518, 0x0518,
-	0x051a, 0x051a,
-	0x051c, 0x051c,
-	0x051e, 0x051e,
-	0x0520, 0x0520,
-	0x0522, 0x0522,
-	0x0524, 0x0524,
-	0x0526, 0x0526,
-	0x0528, 0x0528,
-	0x052a, 0x052a,
-	0x052c, 0x052c,
-	0x052e, 0x052e,
-	0x0531, 0x0556,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x13a0, 0x13f5,
-	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,
-	0x1e9e, 0x1e9e,
-	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,
-	0x1efa, 0x1efa,
-	0x1efc, 0x1efc,
-	0x1efe, 0x1efe,
-	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, 0x2133,
-	0x213e, 0x213f,
-	0x2145, 0x2145,
-	0x2183, 0x2183,
-	0x2c00, 0x2c2e,
-	0x2c60, 0x2c60,
-	0x2c62, 0x2c64,
-	0x2c67, 0x2c67,
-	0x2c69, 0x2c69,
-	0x2c6b, 0x2c6b,
-	0x2c6d, 0x2c70,
-	0x2c72, 0x2c72,
-	0x2c75, 0x2c75,
-	0x2c7e, 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,
-	0x2ceb, 0x2ceb,
-	0x2ced, 0x2ced,
-	0x2cf2, 0x2cf2,
-	0xa640, 0xa640,
-	0xa642, 0xa642,
-	0xa644, 0xa644,
-	0xa646, 0xa646,
-	0xa648, 0xa648,
-	0xa64a, 0xa64a,
-	0xa64c, 0xa64c,
-	0xa64e, 0xa64e,
-	0xa650, 0xa650,
-	0xa652, 0xa652,
-	0xa654, 0xa654,
-	0xa656, 0xa656,
-	0xa658, 0xa658,
-	0xa65a, 0xa65a,
-	0xa65c, 0xa65c,
-	0xa65e, 0xa65e,
-	0xa660, 0xa660,
-	0xa662, 0xa662,
-	0xa664, 0xa664,
-	0xa666, 0xa666,
-	0xa668, 0xa668,
-	0xa66a, 0xa66a,
-	0xa66c, 0xa66c,
-	0xa680, 0xa680,
-	0xa682, 0xa682,
-	0xa684, 0xa684,
-	0xa686, 0xa686,
-	0xa688, 0xa688,
-	0xa68a, 0xa68a,
-	0xa68c, 0xa68c,
-	0xa68e, 0xa68e,
-	0xa690, 0xa690,
-	0xa692, 0xa692,
-	0xa694, 0xa694,
-	0xa696, 0xa696,
-	0xa698, 0xa698,
-	0xa69a, 0xa69a,
-	0xa722, 0xa722,
-	0xa724, 0xa724,
-	0xa726, 0xa726,
-	0xa728, 0xa728,
-	0xa72a, 0xa72a,
-	0xa72c, 0xa72c,
-	0xa72e, 0xa72e,
-	0xa732, 0xa732,
-	0xa734, 0xa734,
-	0xa736, 0xa736,
-	0xa738, 0xa738,
-	0xa73a, 0xa73a,
-	0xa73c, 0xa73c,
-	0xa73e, 0xa73e,
-	0xa740, 0xa740,
-	0xa742, 0xa742,
-	0xa744, 0xa744,
-	0xa746, 0xa746,
-	0xa748, 0xa748,
-	0xa74a, 0xa74a,
-	0xa74c, 0xa74c,
-	0xa74e, 0xa74e,
-	0xa750, 0xa750,
-	0xa752, 0xa752,
-	0xa754, 0xa754,
-	0xa756, 0xa756,
-	0xa758, 0xa758,
-	0xa75a, 0xa75a,
-	0xa75c, 0xa75c,
-	0xa75e, 0xa75e,
-	0xa760, 0xa760,
-	0xa762, 0xa762,
-	0xa764, 0xa764,
-	0xa766, 0xa766,
-	0xa768, 0xa768,
-	0xa76a, 0xa76a,
-	0xa76c, 0xa76c,
-	0xa76e, 0xa76e,
-	0xa779, 0xa779,
-	0xa77b, 0xa77b,
-	0xa77d, 0xa77e,
-	0xa780, 0xa780,
-	0xa782, 0xa782,
-	0xa784, 0xa784,
-	0xa786, 0xa786,
-	0xa78b, 0xa78b,
-	0xa78d, 0xa78d,
-	0xa790, 0xa790,
-	0xa792, 0xa792,
-	0xa796, 0xa796,
-	0xa798, 0xa798,
-	0xa79a, 0xa79a,
-	0xa79c, 0xa79c,
-	0xa79e, 0xa79e,
-	0xa7a0, 0xa7a0,
-	0xa7a2, 0xa7a2,
-	0xa7a4, 0xa7a4,
-	0xa7a6, 0xa7a6,
-	0xa7a8, 0xa7a8,
-	0xa7aa, 0xa7ad,
-	0xa7b0, 0xa7b4,
-	0xa7b6, 0xa7b6,
-	0xff21, 0xff3a,
-	0x10400, 0x10427,
-	0x10c80, 0x10cb2,
-	0x118a0, 0x118bf,
-	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,
-	0x1d7ca, 0x1d7ca,
-}; /* CR_Lu */
-
-/* 'M': Major Category */
-static const OnigCodePoint CR_M[] = {
-	236,
-	0x0300, 0x036f,
-	0x0483, 0x0489,
-	0x0591, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x0610, 0x061a,
-	0x064b, 0x065f,
-	0x0670, 0x0670,
-	0x06d6, 0x06dc,
-	0x06df, 0x06e4,
-	0x06e7, 0x06e8,
-	0x06ea, 0x06ed,
-	0x0711, 0x0711,
-	0x0730, 0x074a,
-	0x07a6, 0x07b0,
-	0x07eb, 0x07f3,
-	0x0816, 0x0819,
-	0x081b, 0x0823,
-	0x0825, 0x0827,
-	0x0829, 0x082d,
-	0x0859, 0x085b,
-	0x08e3, 0x0903,
-	0x093a, 0x093c,
-	0x093e, 0x094f,
-	0x0951, 0x0957,
-	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,
-	0x0a51, 0x0a51,
-	0x0a70, 0x0a71,
-	0x0a75, 0x0a75,
-	0x0a81, 0x0a83,
-	0x0abc, 0x0abc,
-	0x0abe, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acd,
-	0x0ae2, 0x0ae3,
-	0x0b01, 0x0b03,
-	0x0b3c, 0x0b3c,
-	0x0b3e, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b62, 0x0b63,
-	0x0b82, 0x0b82,
-	0x0bbe, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcd,
-	0x0bd7, 0x0bd7,
-	0x0c00, 0x0c03,
-	0x0c3e, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c62, 0x0c63,
-	0x0c81, 0x0c83,
-	0x0cbc, 0x0cbc,
-	0x0cbe, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0ce2, 0x0ce3,
-	0x0d01, 0x0d03,
-	0x0d3e, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
-	0x0d57, 0x0d57,
-	0x0d62, 0x0d63,
-	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,
-	0x0f8d, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fc6, 0x0fc6,
-	0x102b, 0x103e,
-	0x1056, 0x1059,
-	0x105e, 0x1060,
-	0x1062, 0x1064,
-	0x1067, 0x106d,
-	0x1071, 0x1074,
-	0x1082, 0x108d,
-	0x108f, 0x108f,
-	0x109a, 0x109d,
-	0x135d, 0x135f,
-	0x1712, 0x1714,
-	0x1732, 0x1734,
-	0x1752, 0x1753,
-	0x1772, 0x1773,
-	0x17b4, 0x17d3,
-	0x17dd, 0x17dd,
-	0x180b, 0x180d,
-	0x18a9, 0x18a9,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1a17, 0x1a1b,
-	0x1a55, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a7f,
-	0x1ab0, 0x1abe,
-	0x1b00, 0x1b04,
-	0x1b34, 0x1b44,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1b82,
-	0x1ba1, 0x1bad,
-	0x1be6, 0x1bf3,
-	0x1c24, 0x1c37,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1cf2, 0x1cf4,
-	0x1cf8, 0x1cf9,
-	0x1dc0, 0x1df5,
-	0x1dfc, 0x1dff,
-	0x20d0, 0x20f0,
-	0x2cef, 0x2cf1,
-	0x2d7f, 0x2d7f,
-	0x2de0, 0x2dff,
-	0x302a, 0x302f,
-	0x3099, 0x309a,
-	0xa66f, 0xa672,
-	0xa674, 0xa67d,
-	0xa69e, 0xa69f,
-	0xa6f0, 0xa6f1,
-	0xa802, 0xa802,
-	0xa806, 0xa806,
-	0xa80b, 0xa80b,
-	0xa823, 0xa827,
-	0xa880, 0xa881,
-	0xa8b4, 0xa8c4,
-	0xa8e0, 0xa8f1,
-	0xa926, 0xa92d,
-	0xa947, 0xa953,
-	0xa980, 0xa983,
-	0xa9b3, 0xa9c0,
-	0xa9e5, 0xa9e5,
-	0xaa29, 0xaa36,
-	0xaa43, 0xaa43,
-	0xaa4c, 0xaa4d,
-	0xaa7b, 0xaa7d,
-	0xaab0, 0xaab0,
-	0xaab2, 0xaab4,
-	0xaab7, 0xaab8,
-	0xaabe, 0xaabf,
-	0xaac1, 0xaac1,
-	0xaaeb, 0xaaef,
-	0xaaf5, 0xaaf6,
-	0xabe3, 0xabea,
-	0xabec, 0xabed,
-	0xfb1e, 0xfb1e,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe2f,
-	0x101fd, 0x101fd,
-	0x102e0, 0x102e0,
-	0x10376, 0x1037a,
-	0x10a01, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a0f,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x10ae5, 0x10ae6,
-	0x11000, 0x11002,
-	0x11038, 0x11046,
-	0x1107f, 0x11082,
-	0x110b0, 0x110ba,
-	0x11100, 0x11102,
-	0x11127, 0x11134,
-	0x11173, 0x11173,
-	0x11180, 0x11182,
-	0x111b3, 0x111c0,
-	0x111ca, 0x111cc,
-	0x1122c, 0x11237,
-	0x112df, 0x112ea,
-	0x11300, 0x11303,
-	0x1133c, 0x1133c,
-	0x1133e, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134d,
-	0x11357, 0x11357,
-	0x11362, 0x11363,
-	0x11366, 0x1136c,
-	0x11370, 0x11374,
-	0x114b0, 0x114c3,
-	0x115af, 0x115b5,
-	0x115b8, 0x115c0,
-	0x115dc, 0x115dd,
-	0x11630, 0x11640,
-	0x116ab, 0x116b7,
-	0x1171d, 0x1172b,
-	0x16af0, 0x16af4,
-	0x16b30, 0x16b36,
-	0x16f51, 0x16f7e,
-	0x16f8f, 0x16f92,
-	0x1bc9d, 0x1bc9e,
-	0x1d165, 0x1d169,
-	0x1d16d, 0x1d172,
-	0x1d17b, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-	0x1d242, 0x1d244,
-	0x1da00, 0x1da36,
-	0x1da3b, 0x1da6c,
-	0x1da75, 0x1da75,
-	0x1da84, 0x1da84,
-	0x1da9b, 0x1da9f,
-	0x1daa1, 0x1daaf,
-	0x1e8d0, 0x1e8d6,
-	0xe0100, 0xe01ef,
-}; /* CR_M */
-
-/* 'Mc': General Category */
-static const OnigCodePoint CR_Mc[] = {
-	147,
-	0x0903, 0x0903,
-	0x093b, 0x093b,
-	0x093e, 0x0940,
-	0x0949, 0x094c,
-	0x094e, 0x094f,
-	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,
-	0x102b, 0x102c,
-	0x1031, 0x1031,
-	0x1038, 0x1038,
-	0x103b, 0x103c,
-	0x1056, 0x1057,
-	0x1062, 0x1064,
-	0x1067, 0x106d,
-	0x1083, 0x1084,
-	0x1087, 0x108c,
-	0x108f, 0x108f,
-	0x109a, 0x109c,
-	0x17b6, 0x17b6,
-	0x17be, 0x17c5,
-	0x17c7, 0x17c8,
-	0x1923, 0x1926,
-	0x1929, 0x192b,
-	0x1930, 0x1931,
-	0x1933, 0x1938,
-	0x1a19, 0x1a1a,
-	0x1a55, 0x1a55,
-	0x1a57, 0x1a57,
-	0x1a61, 0x1a61,
-	0x1a63, 0x1a64,
-	0x1a6d, 0x1a72,
-	0x1b04, 0x1b04,
-	0x1b35, 0x1b35,
-	0x1b3b, 0x1b3b,
-	0x1b3d, 0x1b41,
-	0x1b43, 0x1b44,
-	0x1b82, 0x1b82,
-	0x1ba1, 0x1ba1,
-	0x1ba6, 0x1ba7,
-	0x1baa, 0x1baa,
-	0x1be7, 0x1be7,
-	0x1bea, 0x1bec,
-	0x1bee, 0x1bee,
-	0x1bf2, 0x1bf3,
-	0x1c24, 0x1c2b,
-	0x1c34, 0x1c35,
-	0x1ce1, 0x1ce1,
-	0x1cf2, 0x1cf3,
-	0x302e, 0x302f,
-	0xa823, 0xa824,
-	0xa827, 0xa827,
-	0xa880, 0xa881,
-	0xa8b4, 0xa8c3,
-	0xa952, 0xa953,
-	0xa983, 0xa983,
-	0xa9b4, 0xa9b5,
-	0xa9ba, 0xa9bb,
-	0xa9bd, 0xa9c0,
-	0xaa2f, 0xaa30,
-	0xaa33, 0xaa34,
-	0xaa4d, 0xaa4d,
-	0xaa7b, 0xaa7b,
-	0xaa7d, 0xaa7d,
-	0xaaeb, 0xaaeb,
-	0xaaee, 0xaaef,
-	0xaaf5, 0xaaf5,
-	0xabe3, 0xabe4,
-	0xabe6, 0xabe7,
-	0xabe9, 0xabea,
-	0xabec, 0xabec,
-	0x11000, 0x11000,
-	0x11002, 0x11002,
-	0x11082, 0x11082,
-	0x110b0, 0x110b2,
-	0x110b7, 0x110b8,
-	0x1112c, 0x1112c,
-	0x11182, 0x11182,
-	0x111b3, 0x111b5,
-	0x111bf, 0x111c0,
-	0x1122c, 0x1122e,
-	0x11232, 0x11233,
-	0x11235, 0x11235,
-	0x112e0, 0x112e2,
-	0x11302, 0x11303,
-	0x1133e, 0x1133f,
-	0x11341, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134d,
-	0x11357, 0x11357,
-	0x11362, 0x11363,
-	0x114b0, 0x114b2,
-	0x114b9, 0x114b9,
-	0x114bb, 0x114be,
-	0x114c1, 0x114c1,
-	0x115af, 0x115b1,
-	0x115b8, 0x115bb,
-	0x115be, 0x115be,
-	0x11630, 0x11632,
-	0x1163b, 0x1163c,
-	0x1163e, 0x1163e,
-	0x116ac, 0x116ac,
-	0x116ae, 0x116af,
-	0x116b6, 0x116b6,
-	0x11720, 0x11721,
-	0x11726, 0x11726,
-	0x16f51, 0x16f7e,
-	0x1d165, 0x1d166,
-	0x1d16d, 0x1d172,
-}; /* CR_Mc */
-
-/* 'Me': General Category */
-static const OnigCodePoint CR_Me[] = {
-	5,
-	0x0488, 0x0489,
-	0x1abe, 0x1abe,
-	0x20dd, 0x20e0,
-	0x20e2, 0x20e4,
-	0xa670, 0xa672,
-}; /* CR_Me */
-
-/* 'Mn': General Category */
-static const OnigCodePoint CR_Mn[] = {
-	266,
-	0x0300, 0x036f,
-	0x0483, 0x0487,
-	0x0591, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x0610, 0x061a,
-	0x064b, 0x065f,
-	0x0670, 0x0670,
-	0x06d6, 0x06dc,
-	0x06df, 0x06e4,
-	0x06e7, 0x06e8,
-	0x06ea, 0x06ed,
-	0x0711, 0x0711,
-	0x0730, 0x074a,
-	0x07a6, 0x07b0,
-	0x07eb, 0x07f3,
-	0x0816, 0x0819,
-	0x081b, 0x0823,
-	0x0825, 0x0827,
-	0x0829, 0x082d,
-	0x0859, 0x085b,
-	0x08e3, 0x0902,
-	0x093a, 0x093a,
-	0x093c, 0x093c,
-	0x0941, 0x0948,
-	0x094d, 0x094d,
-	0x0951, 0x0957,
-	0x0962, 0x0963,
-	0x0981, 0x0981,
-	0x09bc, 0x09bc,
-	0x09c1, 0x09c4,
-	0x09cd, 0x09cd,
-	0x09e2, 0x09e3,
-	0x0a01, 0x0a02,
-	0x0a3c, 0x0a3c,
-	0x0a41, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a70, 0x0a71,
-	0x0a75, 0x0a75,
-	0x0a81, 0x0a82,
-	0x0abc, 0x0abc,
-	0x0ac1, 0x0ac5,
-	0x0ac7, 0x0ac8,
-	0x0acd, 0x0acd,
-	0x0ae2, 0x0ae3,
-	0x0b01, 0x0b01,
-	0x0b3c, 0x0b3c,
-	0x0b3f, 0x0b3f,
-	0x0b41, 0x0b44,
-	0x0b4d, 0x0b4d,
-	0x0b56, 0x0b56,
-	0x0b62, 0x0b63,
-	0x0b82, 0x0b82,
-	0x0bc0, 0x0bc0,
-	0x0bcd, 0x0bcd,
-	0x0c00, 0x0c00,
-	0x0c3e, 0x0c40,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c62, 0x0c63,
-	0x0c81, 0x0c81,
-	0x0cbc, 0x0cbc,
-	0x0cbf, 0x0cbf,
-	0x0cc6, 0x0cc6,
-	0x0ccc, 0x0ccd,
-	0x0ce2, 0x0ce3,
-	0x0d01, 0x0d01,
-	0x0d41, 0x0d44,
-	0x0d4d, 0x0d4d,
-	0x0d62, 0x0d63,
-	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,
-	0x0f8d, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fc6, 0x0fc6,
-	0x102d, 0x1030,
-	0x1032, 0x1037,
-	0x1039, 0x103a,
-	0x103d, 0x103e,
-	0x1058, 0x1059,
-	0x105e, 0x1060,
-	0x1071, 0x1074,
-	0x1082, 0x1082,
-	0x1085, 0x1086,
-	0x108d, 0x108d,
-	0x109d, 0x109d,
-	0x135d, 0x135f,
-	0x1712, 0x1714,
-	0x1732, 0x1734,
-	0x1752, 0x1753,
-	0x1772, 0x1773,
-	0x17b4, 0x17b5,
-	0x17b7, 0x17bd,
-	0x17c6, 0x17c6,
-	0x17c9, 0x17d3,
-	0x17dd, 0x17dd,
-	0x180b, 0x180d,
-	0x18a9, 0x18a9,
-	0x1920, 0x1922,
-	0x1927, 0x1928,
-	0x1932, 0x1932,
-	0x1939, 0x193b,
-	0x1a17, 0x1a18,
-	0x1a1b, 0x1a1b,
-	0x1a56, 0x1a56,
-	0x1a58, 0x1a5e,
-	0x1a60, 0x1a60,
-	0x1a62, 0x1a62,
-	0x1a65, 0x1a6c,
-	0x1a73, 0x1a7c,
-	0x1a7f, 0x1a7f,
-	0x1ab0, 0x1abd,
-	0x1b00, 0x1b03,
-	0x1b34, 0x1b34,
-	0x1b36, 0x1b3a,
-	0x1b3c, 0x1b3c,
-	0x1b42, 0x1b42,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1b81,
-	0x1ba2, 0x1ba5,
-	0x1ba8, 0x1ba9,
-	0x1bab, 0x1bad,
-	0x1be6, 0x1be6,
-	0x1be8, 0x1be9,
-	0x1bed, 0x1bed,
-	0x1bef, 0x1bf1,
-	0x1c2c, 0x1c33,
-	0x1c36, 0x1c37,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce0,
-	0x1ce2, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1cf4, 0x1cf4,
-	0x1cf8, 0x1cf9,
-	0x1dc0, 0x1df5,
-	0x1dfc, 0x1dff,
-	0x20d0, 0x20dc,
-	0x20e1, 0x20e1,
-	0x20e5, 0x20f0,
-	0x2cef, 0x2cf1,
-	0x2d7f, 0x2d7f,
-	0x2de0, 0x2dff,
-	0x302a, 0x302d,
-	0x3099, 0x309a,
-	0xa66f, 0xa66f,
-	0xa674, 0xa67d,
-	0xa69e, 0xa69f,
-	0xa6f0, 0xa6f1,
-	0xa802, 0xa802,
-	0xa806, 0xa806,
-	0xa80b, 0xa80b,
-	0xa825, 0xa826,
-	0xa8c4, 0xa8c4,
-	0xa8e0, 0xa8f1,
-	0xa926, 0xa92d,
-	0xa947, 0xa951,
-	0xa980, 0xa982,
-	0xa9b3, 0xa9b3,
-	0xa9b6, 0xa9b9,
-	0xa9bc, 0xa9bc,
-	0xa9e5, 0xa9e5,
-	0xaa29, 0xaa2e,
-	0xaa31, 0xaa32,
-	0xaa35, 0xaa36,
-	0xaa43, 0xaa43,
-	0xaa4c, 0xaa4c,
-	0xaa7c, 0xaa7c,
-	0xaab0, 0xaab0,
-	0xaab2, 0xaab4,
-	0xaab7, 0xaab8,
-	0xaabe, 0xaabf,
-	0xaac1, 0xaac1,
-	0xaaec, 0xaaed,
-	0xaaf6, 0xaaf6,
-	0xabe5, 0xabe5,
-	0xabe8, 0xabe8,
-	0xabed, 0xabed,
-	0xfb1e, 0xfb1e,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe2f,
-	0x101fd, 0x101fd,
-	0x102e0, 0x102e0,
-	0x10376, 0x1037a,
-	0x10a01, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a0f,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x10ae5, 0x10ae6,
-	0x11001, 0x11001,
-	0x11038, 0x11046,
-	0x1107f, 0x11081,
-	0x110b3, 0x110b6,
-	0x110b9, 0x110ba,
-	0x11100, 0x11102,
-	0x11127, 0x1112b,
-	0x1112d, 0x11134,
-	0x11173, 0x11173,
-	0x11180, 0x11181,
-	0x111b6, 0x111be,
-	0x111ca, 0x111cc,
-	0x1122f, 0x11231,
-	0x11234, 0x11234,
-	0x11236, 0x11237,
-	0x112df, 0x112df,
-	0x112e3, 0x112ea,
-	0x11300, 0x11301,
-	0x1133c, 0x1133c,
-	0x11340, 0x11340,
-	0x11366, 0x1136c,
-	0x11370, 0x11374,
-	0x114b3, 0x114b8,
-	0x114ba, 0x114ba,
-	0x114bf, 0x114c0,
-	0x114c2, 0x114c3,
-	0x115b2, 0x115b5,
-	0x115bc, 0x115bd,
-	0x115bf, 0x115c0,
-	0x115dc, 0x115dd,
-	0x11633, 0x1163a,
-	0x1163d, 0x1163d,
-	0x1163f, 0x11640,
-	0x116ab, 0x116ab,
-	0x116ad, 0x116ad,
-	0x116b0, 0x116b5,
-	0x116b7, 0x116b7,
-	0x1171d, 0x1171f,
-	0x11722, 0x11725,
-	0x11727, 0x1172b,
-	0x16af0, 0x16af4,
-	0x16b30, 0x16b36,
-	0x16f8f, 0x16f92,
-	0x1bc9d, 0x1bc9e,
-	0x1d167, 0x1d169,
-	0x1d17b, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-	0x1d242, 0x1d244,
-	0x1da00, 0x1da36,
-	0x1da3b, 0x1da6c,
-	0x1da75, 0x1da75,
-	0x1da84, 0x1da84,
-	0x1da9b, 0x1da9f,
-	0x1daa1, 0x1daaf,
-	0x1e8d0, 0x1e8d6,
-	0xe0100, 0xe01ef,
-}; /* CR_Mn */
-
-/* 'N': Major Category */
-static const OnigCodePoint CR_N[] = {
-	111,
-	0x0030, 0x0039,
-	0x00b2, 0x00b3,
-	0x00b9, 0x00b9,
-	0x00bc, 0x00be,
-	0x0660, 0x0669,
-	0x06f0, 0x06f9,
-	0x07c0, 0x07c9,
-	0x0966, 0x096f,
-	0x09e6, 0x09ef,
-	0x09f4, 0x09f9,
-	0x0a66, 0x0a6f,
-	0x0ae6, 0x0aef,
-	0x0b66, 0x0b6f,
-	0x0b72, 0x0b77,
-	0x0be6, 0x0bf2,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7e,
-	0x0ce6, 0x0cef,
-	0x0d66, 0x0d75,
-	0x0de6, 0x0def,
-	0x0e50, 0x0e59,
-	0x0ed0, 0x0ed9,
-	0x0f20, 0x0f33,
-	0x1040, 0x1049,
-	0x1090, 0x1099,
-	0x1369, 0x137c,
-	0x16ee, 0x16f0,
-	0x17e0, 0x17e9,
-	0x17f0, 0x17f9,
-	0x1810, 0x1819,
-	0x1946, 0x194f,
-	0x19d0, 0x19da,
-	0x1a80, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1b50, 0x1b59,
-	0x1bb0, 0x1bb9,
-	0x1c40, 0x1c49,
-	0x1c50, 0x1c59,
-	0x2070, 0x2070,
-	0x2074, 0x2079,
-	0x2080, 0x2089,
-	0x2150, 0x2182,
-	0x2185, 0x2189,
-	0x2460, 0x249b,
-	0x24ea, 0x24ff,
-	0x2776, 0x2793,
-	0x2cfd, 0x2cfd,
-	0x3007, 0x3007,
-	0x3021, 0x3029,
-	0x3038, 0x303a,
-	0x3192, 0x3195,
-	0x3220, 0x3229,
-	0x3248, 0x324f,
-	0x3251, 0x325f,
-	0x3280, 0x3289,
-	0x32b1, 0x32bf,
-	0xa620, 0xa629,
-	0xa6e6, 0xa6ef,
-	0xa830, 0xa835,
-	0xa8d0, 0xa8d9,
-	0xa900, 0xa909,
-	0xa9d0, 0xa9d9,
-	0xa9f0, 0xa9f9,
-	0xaa50, 0xaa59,
-	0xabf0, 0xabf9,
-	0xff10, 0xff19,
-	0x10107, 0x10133,
-	0x10140, 0x10178,
-	0x1018a, 0x1018b,
-	0x102e1, 0x102fb,
-	0x10320, 0x10323,
-	0x10341, 0x10341,
-	0x1034a, 0x1034a,
-	0x103d1, 0x103d5,
-	0x104a0, 0x104a9,
-	0x10858, 0x1085f,
-	0x10879, 0x1087f,
-	0x108a7, 0x108af,
-	0x108fb, 0x108ff,
-	0x10916, 0x1091b,
-	0x109bc, 0x109bd,
-	0x109c0, 0x109cf,
-	0x109d2, 0x109ff,
-	0x10a40, 0x10a47,
-	0x10a7d, 0x10a7e,
-	0x10a9d, 0x10a9f,
-	0x10aeb, 0x10aef,
-	0x10b58, 0x10b5f,
-	0x10b78, 0x10b7f,
-	0x10ba9, 0x10baf,
-	0x10cfa, 0x10cff,
-	0x10e60, 0x10e7e,
-	0x11052, 0x1106f,
-	0x110f0, 0x110f9,
-	0x11136, 0x1113f,
-	0x111d0, 0x111d9,
-	0x111e1, 0x111f4,
-	0x112f0, 0x112f9,
-	0x114d0, 0x114d9,
-	0x11650, 0x11659,
-	0x116c0, 0x116c9,
-	0x11730, 0x1173b,
-	0x118e0, 0x118f2,
-	0x12400, 0x1246e,
-	0x16a60, 0x16a69,
-	0x16b50, 0x16b59,
-	0x16b5b, 0x16b61,
-	0x1d360, 0x1d371,
-	0x1d7ce, 0x1d7ff,
-	0x1e8c7, 0x1e8cf,
-	0x1f100, 0x1f10c,
-}; /* CR_N */
-
-/* 'Nd': General Category */
-#define CR_Nd CR_Digit
-
-/* 'Nl': General Category */
-static const OnigCodePoint CR_Nl[] = {
-	12,
-	0x16ee, 0x16f0,
-	0x2160, 0x2182,
-	0x2185, 0x2188,
-	0x3007, 0x3007,
-	0x3021, 0x3029,
-	0x3038, 0x303a,
-	0xa6e6, 0xa6ef,
-	0x10140, 0x10174,
-	0x10341, 0x10341,
-	0x1034a, 0x1034a,
-	0x103d1, 0x103d5,
-	0x12400, 0x1246e,
-}; /* CR_Nl */
-
-/* 'No': General Category */
-static const OnigCodePoint CR_No[] = {
-	58,
-	0x00b2, 0x00b3,
-	0x00b9, 0x00b9,
-	0x00bc, 0x00be,
-	0x09f4, 0x09f9,
-	0x0b72, 0x0b77,
-	0x0bf0, 0x0bf2,
-	0x0c78, 0x0c7e,
-	0x0d70, 0x0d75,
-	0x0f2a, 0x0f33,
-	0x1369, 0x137c,
-	0x17f0, 0x17f9,
-	0x19da, 0x19da,
-	0x2070, 0x2070,
-	0x2074, 0x2079,
-	0x2080, 0x2089,
-	0x2150, 0x215f,
-	0x2189, 0x2189,
-	0x2460, 0x249b,
-	0x24ea, 0x24ff,
-	0x2776, 0x2793,
-	0x2cfd, 0x2cfd,
-	0x3192, 0x3195,
-	0x3220, 0x3229,
-	0x3248, 0x324f,
-	0x3251, 0x325f,
-	0x3280, 0x3289,
-	0x32b1, 0x32bf,
-	0xa830, 0xa835,
-	0x10107, 0x10133,
-	0x10175, 0x10178,
-	0x1018a, 0x1018b,
-	0x102e1, 0x102fb,
-	0x10320, 0x10323,
-	0x10858, 0x1085f,
-	0x10879, 0x1087f,
-	0x108a7, 0x108af,
-	0x108fb, 0x108ff,
-	0x10916, 0x1091b,
-	0x109bc, 0x109bd,
-	0x109c0, 0x109cf,
-	0x109d2, 0x109ff,
-	0x10a40, 0x10a47,
-	0x10a7d, 0x10a7e,
-	0x10a9d, 0x10a9f,
-	0x10aeb, 0x10aef,
-	0x10b58, 0x10b5f,
-	0x10b78, 0x10b7f,
-	0x10ba9, 0x10baf,
-	0x10cfa, 0x10cff,
-	0x10e60, 0x10e7e,
-	0x11052, 0x11065,
-	0x111e1, 0x111f4,
-	0x1173a, 0x1173b,
-	0x118ea, 0x118f2,
-	0x16b5b, 0x16b61,
-	0x1d360, 0x1d371,
-	0x1e8c7, 0x1e8cf,
-	0x1f100, 0x1f10c,
-}; /* CR_No */
-
-/* 'P': Major Category */
-#define CR_P CR_Punct
-
-/* '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[] = {
-	17,
-	0x002d, 0x002d,
-	0x058a, 0x058a,
-	0x05be, 0x05be,
-	0x1400, 0x1400,
-	0x1806, 0x1806,
-	0x2010, 0x2015,
-	0x2e17, 0x2e17,
-	0x2e1a, 0x2e1a,
-	0x2e3a, 0x2e3b,
-	0x2e40, 0x2e40,
-	0x301c, 0x301c,
-	0x3030, 0x3030,
-	0x30a0, 0x30a0,
-	0xfe31, 0xfe32,
-	0xfe58, 0xfe58,
-	0xfe63, 0xfe63,
-	0xff0d, 0xff0d,
-}; /* CR_Pd */
-
-/* 'Pe': General Category */
-static const OnigCodePoint CR_Pe[] = {
-	72,
-	0x0029, 0x0029,
-	0x005d, 0x005d,
-	0x007d, 0x007d,
-	0x0f3b, 0x0f3b,
-	0x0f3d, 0x0f3d,
-	0x169c, 0x169c,
-	0x2046, 0x2046,
-	0x207e, 0x207e,
-	0x208e, 0x208e,
-	0x2309, 0x2309,
-	0x230b, 0x230b,
-	0x232a, 0x232a,
-	0x2769, 0x2769,
-	0x276b, 0x276b,
-	0x276d, 0x276d,
-	0x276f, 0x276f,
-	0x2771, 0x2771,
-	0x2773, 0x2773,
-	0x2775, 0x2775,
-	0x27c6, 0x27c6,
-	0x27e7, 0x27e7,
-	0x27e9, 0x27e9,
-	0x27eb, 0x27eb,
-	0x27ed, 0x27ed,
-	0x27ef, 0x27ef,
-	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,
-	0x2e23, 0x2e23,
-	0x2e25, 0x2e25,
-	0x2e27, 0x2e27,
-	0x2e29, 0x2e29,
-	0x3009, 0x3009,
-	0x300b, 0x300b,
-	0x300d, 0x300d,
-	0x300f, 0x300f,
-	0x3011, 0x3011,
-	0x3015, 0x3015,
-	0x3017, 0x3017,
-	0x3019, 0x3019,
-	0x301b, 0x301b,
-	0x301e, 0x301f,
-	0xfd3e, 0xfd3e,
-	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[] = {
-	10,
-	0x00bb, 0x00bb,
-	0x2019, 0x2019,
-	0x201d, 0x201d,
-	0x203a, 0x203a,
-	0x2e03, 0x2e03,
-	0x2e05, 0x2e05,
-	0x2e0a, 0x2e0a,
-	0x2e0d, 0x2e0d,
-	0x2e1d, 0x2e1d,
-	0x2e21, 0x2e21,
-}; /* CR_Pf */
-
-/* 'Pi': General Category */
-static const OnigCodePoint CR_Pi[] = {
-	11,
-	0x00ab, 0x00ab,
-	0x2018, 0x2018,
-	0x201b, 0x201c,
-	0x201f, 0x201f,
-	0x2039, 0x2039,
-	0x2e02, 0x2e02,
-	0x2e04, 0x2e04,
-	0x2e09, 0x2e09,
-	0x2e0c, 0x2e0c,
-	0x2e1c, 0x2e1c,
-	0x2e20, 0x2e20,
-}; /* CR_Pi */
-
-/* 'Po': General Category */
-static const OnigCodePoint CR_Po[] = {
-	157,
-	0x0021, 0x0023,
-	0x0025, 0x0027,
-	0x002a, 0x002a,
-	0x002c, 0x002c,
-	0x002e, 0x002f,
-	0x003a, 0x003b,
-	0x003f, 0x0040,
-	0x005c, 0x005c,
-	0x00a1, 0x00a1,
-	0x00a7, 0x00a7,
-	0x00b6, 0x00b7,
-	0x00bf, 0x00bf,
-	0x037e, 0x037e,
-	0x0387, 0x0387,
-	0x055a, 0x055f,
-	0x0589, 0x0589,
-	0x05c0, 0x05c0,
-	0x05c3, 0x05c3,
-	0x05c6, 0x05c6,
-	0x05f3, 0x05f4,
-	0x0609, 0x060a,
-	0x060c, 0x060d,
-	0x061b, 0x061b,
-	0x061e, 0x061f,
-	0x066a, 0x066d,
-	0x06d4, 0x06d4,
-	0x0700, 0x070d,
-	0x07f7, 0x07f9,
-	0x0830, 0x083e,
-	0x085e, 0x085e,
-	0x0964, 0x0965,
-	0x0970, 0x0970,
-	0x0af0, 0x0af0,
-	0x0df4, 0x0df4,
-	0x0e4f, 0x0e4f,
-	0x0e5a, 0x0e5b,
-	0x0f04, 0x0f12,
-	0x0f14, 0x0f14,
-	0x0f85, 0x0f85,
-	0x0fd0, 0x0fd4,
-	0x0fd9, 0x0fda,
-	0x104a, 0x104f,
-	0x10fb, 0x10fb,
-	0x1360, 0x1368,
-	0x166d, 0x166e,
-	0x16eb, 0x16ed,
-	0x1735, 0x1736,
-	0x17d4, 0x17d6,
-	0x17d8, 0x17da,
-	0x1800, 0x1805,
-	0x1807, 0x180a,
-	0x1944, 0x1945,
-	0x1a1e, 0x1a1f,
-	0x1aa0, 0x1aa6,
-	0x1aa8, 0x1aad,
-	0x1b5a, 0x1b60,
-	0x1bfc, 0x1bff,
-	0x1c3b, 0x1c3f,
-	0x1c7e, 0x1c7f,
-	0x1cc0, 0x1cc7,
-	0x1cd3, 0x1cd3,
-	0x2016, 0x2017,
-	0x2020, 0x2027,
-	0x2030, 0x2038,
-	0x203b, 0x203e,
-	0x2041, 0x2043,
-	0x2047, 0x2051,
-	0x2053, 0x2053,
-	0x2055, 0x205e,
-	0x2cf9, 0x2cfc,
-	0x2cfe, 0x2cff,
-	0x2d70, 0x2d70,
-	0x2e00, 0x2e01,
-	0x2e06, 0x2e08,
-	0x2e0b, 0x2e0b,
-	0x2e0e, 0x2e16,
-	0x2e18, 0x2e19,
-	0x2e1b, 0x2e1b,
-	0x2e1e, 0x2e1f,
-	0x2e2a, 0x2e2e,
-	0x2e30, 0x2e39,
-	0x2e3c, 0x2e3f,
-	0x2e41, 0x2e41,
-	0x3001, 0x3003,
-	0x303d, 0x303d,
-	0x30fb, 0x30fb,
-	0xa4fe, 0xa4ff,
-	0xa60d, 0xa60f,
-	0xa673, 0xa673,
-	0xa67e, 0xa67e,
-	0xa6f2, 0xa6f7,
-	0xa874, 0xa877,
-	0xa8ce, 0xa8cf,
-	0xa8f8, 0xa8fa,
-	0xa8fc, 0xa8fc,
-	0xa92e, 0xa92f,
-	0xa95f, 0xa95f,
-	0xa9c1, 0xa9cd,
-	0xa9de, 0xa9df,
-	0xaa5c, 0xaa5f,
-	0xaade, 0xaadf,
-	0xaaf0, 0xaaf1,
-	0xabeb, 0xabeb,
-	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, 0x10102,
-	0x1039f, 0x1039f,
-	0x103d0, 0x103d0,
-	0x1056f, 0x1056f,
-	0x10857, 0x10857,
-	0x1091f, 0x1091f,
-	0x1093f, 0x1093f,
-	0x10a50, 0x10a58,
-	0x10a7f, 0x10a7f,
-	0x10af0, 0x10af6,
-	0x10b39, 0x10b3f,
-	0x10b99, 0x10b9c,
-	0x11047, 0x1104d,
-	0x110bb, 0x110bc,
-	0x110be, 0x110c1,
-	0x11140, 0x11143,
-	0x11174, 0x11175,
-	0x111c5, 0x111c9,
-	0x111cd, 0x111cd,
-	0x111db, 0x111db,
-	0x111dd, 0x111df,
-	0x11238, 0x1123d,
-	0x112a9, 0x112a9,
-	0x114c6, 0x114c6,
-	0x115c1, 0x115d7,
-	0x11641, 0x11643,
-	0x1173c, 0x1173e,
-	0x12470, 0x12474,
-	0x16a6e, 0x16a6f,
-	0x16af5, 0x16af5,
-	0x16b37, 0x16b3b,
-	0x16b44, 0x16b44,
-	0x1bc9f, 0x1bc9f,
-	0x1da87, 0x1da8b,
-}; /* CR_Po */
-
-/* 'Ps': General Category */
-static const OnigCodePoint CR_Ps[] = {
-	75,
-	0x0028, 0x0028,
-	0x005b, 0x005b,
-	0x007b, 0x007b,
-	0x0f3a, 0x0f3a,
-	0x0f3c, 0x0f3c,
-	0x169b, 0x169b,
-	0x201a, 0x201a,
-	0x201e, 0x201e,
-	0x2045, 0x2045,
-	0x207d, 0x207d,
-	0x208d, 0x208d,
-	0x2308, 0x2308,
-	0x230a, 0x230a,
-	0x2329, 0x2329,
-	0x2768, 0x2768,
-	0x276a, 0x276a,
-	0x276c, 0x276c,
-	0x276e, 0x276e,
-	0x2770, 0x2770,
-	0x2772, 0x2772,
-	0x2774, 0x2774,
-	0x27c5, 0x27c5,
-	0x27e6, 0x27e6,
-	0x27e8, 0x27e8,
-	0x27ea, 0x27ea,
-	0x27ec, 0x27ec,
-	0x27ee, 0x27ee,
-	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,
-	0x2e22, 0x2e22,
-	0x2e24, 0x2e24,
-	0x2e26, 0x2e26,
-	0x2e28, 0x2e28,
-	0x2e42, 0x2e42,
-	0x3008, 0x3008,
-	0x300a, 0x300a,
-	0x300c, 0x300c,
-	0x300e, 0x300e,
-	0x3010, 0x3010,
-	0x3014, 0x3014,
-	0x3016, 0x3016,
-	0x3018, 0x3018,
-	0x301a, 0x301a,
-	0x301d, 0x301d,
-	0xfd3f, 0xfd3f,
-	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[] = {
-	214,
-	0x0024, 0x0024,
-	0x002b, 0x002b,
-	0x003c, 0x003e,
-	0x005e, 0x005e,
-	0x0060, 0x0060,
-	0x007c, 0x007c,
-	0x007e, 0x007e,
-	0x00a2, 0x00a6,
-	0x00a8, 0x00a9,
-	0x00ac, 0x00ac,
-	0x00ae, 0x00b1,
-	0x00b4, 0x00b4,
-	0x00b8, 0x00b8,
-	0x00d7, 0x00d7,
-	0x00f7, 0x00f7,
-	0x02c2, 0x02c5,
-	0x02d2, 0x02df,
-	0x02e5, 0x02eb,
-	0x02ed, 0x02ed,
-	0x02ef, 0x02ff,
-	0x0375, 0x0375,
-	0x0384, 0x0385,
-	0x03f6, 0x03f6,
-	0x0482, 0x0482,
-	0x058d, 0x058f,
-	0x0606, 0x0608,
-	0x060b, 0x060b,
-	0x060e, 0x060f,
-	0x06de, 0x06de,
-	0x06e9, 0x06e9,
-	0x06fd, 0x06fe,
-	0x07f6, 0x07f6,
-	0x09f2, 0x09f3,
-	0x09fa, 0x09fb,
-	0x0af1, 0x0af1,
-	0x0b70, 0x0b70,
-	0x0bf3, 0x0bfa,
-	0x0c7f, 0x0c7f,
-	0x0d79, 0x0d79,
-	0x0e3f, 0x0e3f,
-	0x0f01, 0x0f03,
-	0x0f13, 0x0f13,
-	0x0f15, 0x0f17,
-	0x0f1a, 0x0f1f,
-	0x0f34, 0x0f34,
-	0x0f36, 0x0f36,
-	0x0f38, 0x0f38,
-	0x0fbe, 0x0fc5,
-	0x0fc7, 0x0fcc,
-	0x0fce, 0x0fcf,
-	0x0fd5, 0x0fd8,
-	0x109e, 0x109f,
-	0x1390, 0x1399,
-	0x17db, 0x17db,
-	0x1940, 0x1940,
-	0x19de, 0x19ff,
-	0x1b61, 0x1b6a,
-	0x1b74, 0x1b7c,
-	0x1fbd, 0x1fbd,
-	0x1fbf, 0x1fc1,
-	0x1fcd, 0x1fcf,
-	0x1fdd, 0x1fdf,
-	0x1fed, 0x1fef,
-	0x1ffd, 0x1ffe,
-	0x2044, 0x2044,
-	0x2052, 0x2052,
-	0x207a, 0x207c,
-	0x208a, 0x208c,
-	0x20a0, 0x20be,
-	0x2100, 0x2101,
-	0x2103, 0x2106,
-	0x2108, 0x2109,
-	0x2114, 0x2114,
-	0x2116, 0x2118,
-	0x211e, 0x2123,
-	0x2125, 0x2125,
-	0x2127, 0x2127,
-	0x2129, 0x2129,
-	0x212e, 0x212e,
-	0x213a, 0x213b,
-	0x2140, 0x2144,
-	0x214a, 0x214d,
-	0x214f, 0x214f,
-	0x218a, 0x218b,
-	0x2190, 0x2307,
-	0x230c, 0x2328,
-	0x232b, 0x23fa,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x249c, 0x24e9,
-	0x2500, 0x2767,
-	0x2794, 0x27c4,
-	0x27c7, 0x27e5,
-	0x27f0, 0x2982,
-	0x2999, 0x29d7,
-	0x29dc, 0x29fb,
-	0x29fe, 0x2b73,
-	0x2b76, 0x2b95,
-	0x2b98, 0x2bb9,
-	0x2bbd, 0x2bc8,
-	0x2bca, 0x2bd1,
-	0x2bec, 0x2bef,
-	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, 0x31e3,
-	0x3200, 0x321e,
-	0x322a, 0x3247,
-	0x3250, 0x3250,
-	0x3260, 0x327f,
-	0x328a, 0x32b0,
-	0x32c0, 0x32fe,
-	0x3300, 0x33ff,
-	0x4dc0, 0x4dff,
-	0xa490, 0xa4c6,
-	0xa700, 0xa716,
-	0xa720, 0xa721,
-	0xa789, 0xa78a,
-	0xa828, 0xa82b,
-	0xa836, 0xa839,
-	0xaa77, 0xaa79,
-	0xab5b, 0xab5b,
-	0xfb29, 0xfb29,
-	0xfbb2, 0xfbc1,
-	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,
-	0x10137, 0x1013f,
-	0x10179, 0x10189,
-	0x1018c, 0x1018c,
-	0x10190, 0x1019b,
-	0x101a0, 0x101a0,
-	0x101d0, 0x101fc,
-	0x10877, 0x10878,
-	0x10ac8, 0x10ac8,
-	0x1173f, 0x1173f,
-	0x16b3c, 0x16b3f,
-	0x16b45, 0x16b45,
-	0x1bc9c, 0x1bc9c,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d164,
-	0x1d16a, 0x1d16c,
-	0x1d183, 0x1d184,
-	0x1d18c, 0x1d1a9,
-	0x1d1ae, 0x1d1e8,
-	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,
-	0x1d800, 0x1d9ff,
-	0x1da37, 0x1da3a,
-	0x1da6d, 0x1da74,
-	0x1da76, 0x1da83,
-	0x1da85, 0x1da86,
-	0x1eef0, 0x1eef1,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0bf,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0f5,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f579,
-	0x1f57b, 0x1f5a3,
-	0x1f5a5, 0x1f6d0,
-	0x1f6e0, 0x1f6ec,
-	0x1f6f0, 0x1f6f3,
-	0x1f700, 0x1f773,
-	0x1f780, 0x1f7d4,
-	0x1f800, 0x1f80b,
-	0x1f810, 0x1f847,
-	0x1f850, 0x1f859,
-	0x1f860, 0x1f887,
-	0x1f890, 0x1f8ad,
-	0x1f910, 0x1f918,
-	0x1f980, 0x1f984,
-	0x1f9c0, 0x1f9c0,
-}; /* CR_S */
-
-/* 'Sc': General Category */
-static const OnigCodePoint CR_Sc[] = {
-	17,
-	0x0024, 0x0024,
-	0x00a2, 0x00a5,
-	0x058f, 0x058f,
-	0x060b, 0x060b,
-	0x09f2, 0x09f3,
-	0x09fb, 0x09fb,
-	0x0af1, 0x0af1,
-	0x0bf9, 0x0bf9,
-	0x0e3f, 0x0e3f,
-	0x17db, 0x17db,
-	0x20a0, 0x20be,
-	0xa838, 0xa838,
-	0xfdfc, 0xfdfc,
-	0xfe69, 0xfe69,
-	0xff04, 0xff04,
-	0xffe0, 0xffe1,
-	0xffe5, 0xffe6,
-}; /* CR_Sc */
-
-/* 'Sk': General Category */
-static const OnigCodePoint CR_Sk[] = {
-	29,
-	0x005e, 0x005e,
-	0x0060, 0x0060,
-	0x00a8, 0x00a8,
-	0x00af, 0x00af,
-	0x00b4, 0x00b4,
-	0x00b8, 0x00b8,
-	0x02c2, 0x02c5,
-	0x02d2, 0x02df,
-	0x02e5, 0x02eb,
-	0x02ed, 0x02ed,
-	0x02ef, 0x02ff,
-	0x0375, 0x0375,
-	0x0384, 0x0385,
-	0x1fbd, 0x1fbd,
-	0x1fbf, 0x1fc1,
-	0x1fcd, 0x1fcf,
-	0x1fdd, 0x1fdf,
-	0x1fed, 0x1fef,
-	0x1ffd, 0x1ffe,
-	0x309b, 0x309c,
-	0xa700, 0xa716,
-	0xa720, 0xa721,
-	0xa789, 0xa78a,
-	0xab5b, 0xab5b,
-	0xfbb2, 0xfbc1,
-	0xff3e, 0xff3e,
-	0xff40, 0xff40,
-	0xffe3, 0xffe3,
-	0x1f3fb, 0x1f3ff,
-}; /* CR_Sk */
-
-/* 'Sm': General Category */
-static const OnigCodePoint CR_Sm[] = {
-	64,
-	0x002b, 0x002b,
-	0x003c, 0x003e,
-	0x007c, 0x007c,
-	0x007e, 0x007e,
-	0x00ac, 0x00ac,
-	0x00b1, 0x00b1,
-	0x00d7, 0x00d7,
-	0x00f7, 0x00f7,
-	0x03f6, 0x03f6,
-	0x0606, 0x0608,
-	0x2044, 0x2044,
-	0x2052, 0x2052,
-	0x207a, 0x207c,
-	0x208a, 0x208c,
-	0x2118, 0x2118,
-	0x2140, 0x2144,
-	0x214b, 0x214b,
-	0x2190, 0x2194,
-	0x219a, 0x219b,
-	0x21a0, 0x21a0,
-	0x21a3, 0x21a3,
-	0x21a6, 0x21a6,
-	0x21ae, 0x21ae,
-	0x21ce, 0x21cf,
-	0x21d2, 0x21d2,
-	0x21d4, 0x21d4,
-	0x21f4, 0x22ff,
-	0x2320, 0x2321,
-	0x237c, 0x237c,
-	0x239b, 0x23b3,
-	0x23dc, 0x23e1,
-	0x25b7, 0x25b7,
-	0x25c1, 0x25c1,
-	0x25f8, 0x25ff,
-	0x266f, 0x266f,
-	0x27c0, 0x27c4,
-	0x27c7, 0x27e5,
-	0x27f0, 0x27ff,
-	0x2900, 0x2982,
-	0x2999, 0x29d7,
-	0x29dc, 0x29fb,
-	0x29fe, 0x2aff,
-	0x2b30, 0x2b44,
-	0x2b47, 0x2b4c,
-	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,
-	0x1eef0, 0x1eef1,
-}; /* CR_Sm */
-
-/* 'So': General Category */
-static const OnigCodePoint CR_So[] = {
-	170,
-	0x00a6, 0x00a6,
-	0x00a9, 0x00a9,
-	0x00ae, 0x00ae,
-	0x00b0, 0x00b0,
-	0x0482, 0x0482,
-	0x058d, 0x058e,
-	0x060e, 0x060f,
-	0x06de, 0x06de,
-	0x06e9, 0x06e9,
-	0x06fd, 0x06fe,
-	0x07f6, 0x07f6,
-	0x09fa, 0x09fa,
-	0x0b70, 0x0b70,
-	0x0bf3, 0x0bf8,
-	0x0bfa, 0x0bfa,
-	0x0c7f, 0x0c7f,
-	0x0d79, 0x0d79,
-	0x0f01, 0x0f03,
-	0x0f13, 0x0f13,
-	0x0f15, 0x0f17,
-	0x0f1a, 0x0f1f,
-	0x0f34, 0x0f34,
-	0x0f36, 0x0f36,
-	0x0f38, 0x0f38,
-	0x0fbe, 0x0fc5,
-	0x0fc7, 0x0fcc,
-	0x0fce, 0x0fcf,
-	0x0fd5, 0x0fd8,
-	0x109e, 0x109f,
-	0x1390, 0x1399,
-	0x1940, 0x1940,
-	0x19de, 0x19ff,
-	0x1b61, 0x1b6a,
-	0x1b74, 0x1b7c,
-	0x2100, 0x2101,
-	0x2103, 0x2106,
-	0x2108, 0x2109,
-	0x2114, 0x2114,
-	0x2116, 0x2117,
-	0x211e, 0x2123,
-	0x2125, 0x2125,
-	0x2127, 0x2127,
-	0x2129, 0x2129,
-	0x212e, 0x212e,
-	0x213a, 0x213b,
-	0x214a, 0x214a,
-	0x214c, 0x214d,
-	0x214f, 0x214f,
-	0x218a, 0x218b,
-	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,
-	0x23b4, 0x23db,
-	0x23e2, 0x23fa,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x249c, 0x24e9,
-	0x2500, 0x25b6,
-	0x25b8, 0x25c0,
-	0x25c2, 0x25f7,
-	0x2600, 0x266e,
-	0x2670, 0x2767,
-	0x2794, 0x27bf,
-	0x2800, 0x28ff,
-	0x2b00, 0x2b2f,
-	0x2b45, 0x2b46,
-	0x2b4d, 0x2b73,
-	0x2b76, 0x2b95,
-	0x2b98, 0x2bb9,
-	0x2bbd, 0x2bc8,
-	0x2bca, 0x2bd1,
-	0x2bec, 0x2bef,
-	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, 0x31e3,
-	0x3200, 0x321e,
-	0x322a, 0x3247,
-	0x3250, 0x3250,
-	0x3260, 0x327f,
-	0x328a, 0x32b0,
-	0x32c0, 0x32fe,
-	0x3300, 0x33ff,
-	0x4dc0, 0x4dff,
-	0xa490, 0xa4c6,
-	0xa828, 0xa82b,
-	0xa836, 0xa837,
-	0xa839, 0xa839,
-	0xaa77, 0xaa79,
-	0xfdfd, 0xfdfd,
-	0xffe4, 0xffe4,
-	0xffe8, 0xffe8,
-	0xffed, 0xffee,
-	0xfffc, 0xfffd,
-	0x10137, 0x1013f,
-	0x10179, 0x10189,
-	0x1018c, 0x1018c,
-	0x10190, 0x1019b,
-	0x101a0, 0x101a0,
-	0x101d0, 0x101fc,
-	0x10877, 0x10878,
-	0x10ac8, 0x10ac8,
-	0x1173f, 0x1173f,
-	0x16b3c, 0x16b3f,
-	0x16b45, 0x16b45,
-	0x1bc9c, 0x1bc9c,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d164,
-	0x1d16a, 0x1d16c,
-	0x1d183, 0x1d184,
-	0x1d18c, 0x1d1a9,
-	0x1d1ae, 0x1d1e8,
-	0x1d200, 0x1d241,
-	0x1d245, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d800, 0x1d9ff,
-	0x1da37, 0x1da3a,
-	0x1da6d, 0x1da74,
-	0x1da76, 0x1da83,
-	0x1da85, 0x1da86,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0bf,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0f5,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f3fa,
-	0x1f400, 0x1f579,
-	0x1f57b, 0x1f5a3,
-	0x1f5a5, 0x1f6d0,
-	0x1f6e0, 0x1f6ec,
-	0x1f6f0, 0x1f6f3,
-	0x1f700, 0x1f773,
-	0x1f780, 0x1f7d4,
-	0x1f800, 0x1f80b,
-	0x1f810, 0x1f847,
-	0x1f850, 0x1f859,
-	0x1f860, 0x1f887,
-	0x1f890, 0x1f8ad,
-	0x1f910, 0x1f918,
-	0x1f980, 0x1f984,
-	0x1f9c0, 0x1f9c0,
-}; /* CR_So */
-
-/* 'Z': Major Category */
-static const OnigCodePoint CR_Z[] = {
-	8,
-	0x0020, 0x0020,
-	0x00a0, 0x00a0,
-	0x1680, 0x1680,
-	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[] = {
-	7,
-	0x0020, 0x0020,
-	0x00a0, 0x00a0,
-	0x1680, 0x1680,
-	0x2000, 0x200a,
-	0x202f, 0x202f,
-	0x205f, 0x205f,
-	0x3000, 0x3000,
-}; /* CR_Zs */
-
-/* 'Math': Derived Property */
-static const OnigCodePoint CR_Math[] = {
-	138,
-	0x002b, 0x002b,
-	0x003c, 0x003e,
-	0x005e, 0x005e,
-	0x007c, 0x007c,
-	0x007e, 0x007e,
-	0x00ac, 0x00ac,
-	0x00b1, 0x00b1,
-	0x00d7, 0x00d7,
-	0x00f7, 0x00f7,
-	0x03d0, 0x03d2,
-	0x03d5, 0x03d5,
-	0x03f0, 0x03f1,
-	0x03f4, 0x03f6,
-	0x0606, 0x0608,
-	0x2016, 0x2016,
-	0x2032, 0x2034,
-	0x2040, 0x2040,
-	0x2044, 0x2044,
-	0x2052, 0x2052,
-	0x2061, 0x2064,
-	0x207a, 0x207e,
-	0x208a, 0x208e,
-	0x20d0, 0x20dc,
-	0x20e1, 0x20e1,
-	0x20e5, 0x20e6,
-	0x20eb, 0x20ef,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2118, 0x211d,
-	0x2124, 0x2124,
-	0x2128, 0x2129,
-	0x212c, 0x212d,
-	0x212f, 0x2131,
-	0x2133, 0x2138,
-	0x213c, 0x2149,
-	0x214b, 0x214b,
-	0x2190, 0x21a7,
-	0x21a9, 0x21ae,
-	0x21b0, 0x21b1,
-	0x21b6, 0x21b7,
-	0x21bc, 0x21db,
-	0x21dd, 0x21dd,
-	0x21e4, 0x21e5,
-	0x21f4, 0x22ff,
-	0x2308, 0x230b,
-	0x2320, 0x2321,
-	0x237c, 0x237c,
-	0x239b, 0x23b5,
-	0x23b7, 0x23b7,
-	0x23d0, 0x23d0,
-	0x23dc, 0x23e2,
-	0x25a0, 0x25a1,
-	0x25ae, 0x25b7,
-	0x25bc, 0x25c1,
-	0x25c6, 0x25c7,
-	0x25ca, 0x25cb,
-	0x25cf, 0x25d3,
-	0x25e2, 0x25e2,
-	0x25e4, 0x25e4,
-	0x25e7, 0x25ec,
-	0x25f8, 0x25ff,
-	0x2605, 0x2606,
-	0x2640, 0x2640,
-	0x2642, 0x2642,
-	0x2660, 0x2663,
-	0x266d, 0x266f,
-	0x27c0, 0x27ff,
-	0x2900, 0x2aff,
-	0x2b30, 0x2b44,
-	0x2b47, 0x2b4c,
-	0xfb29, 0xfb29,
-	0xfe61, 0xfe66,
-	0xfe68, 0xfe68,
-	0xff0b, 0xff0b,
-	0xff1c, 0xff1e,
-	0xff3c, 0xff3c,
-	0xff3e, 0xff3e,
-	0xff5c, 0xff5c,
-	0xff5e, 0xff5e,
-	0xffe2, 0xffe2,
-	0xffe9, 0xffec,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-}; /* CR_Math */
-
-/* 'Alphabetic': Derived Property */
-#define CR_Alphabetic CR_Alpha
-
-/* 'Lowercase': Derived Property */
-#define CR_Lowercase CR_Lower
-
-/* 'Uppercase': Derived Property */
-#define CR_Uppercase CR_Upper
-
-/* 'Cased': Derived Property */
-static const OnigCodePoint CR_Cased[] = {
-	131,
-	0x0041, 0x005a,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00b5, 0x00b5,
-	0x00ba, 0x00ba,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x01ba,
-	0x01bc, 0x01bf,
-	0x01c4, 0x0293,
-	0x0295, 0x02b8,
-	0x02c0, 0x02c1,
-	0x02e0, 0x02e4,
-	0x0345, 0x0345,
-	0x0370, 0x0373,
-	0x0376, 0x0377,
-	0x037a, 0x037d,
-	0x037f, 0x037f,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x048a, 0x052f,
-	0x0531, 0x0556,
-	0x0561, 0x0587,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x13a0, 0x13f5,
-	0x13f8, 0x13fd,
-	0x1d00, 0x1dbf,
-	0x1e00, 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, 0x209c,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2119, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x212d,
-	0x212f, 0x2134,
-	0x2139, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2160, 0x217f,
-	0x2183, 0x2184,
-	0x24b6, 0x24e9,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2ce4,
-	0x2ceb, 0x2cee,
-	0x2cf2, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0xa640, 0xa66d,
-	0xa680, 0xa69d,
-	0xa722, 0xa787,
-	0xa78b, 0xa78e,
-	0xa790, 0xa7ad,
-	0xa7b0, 0xa7b7,
-	0xa7f8, 0xa7fa,
-	0xab30, 0xab5a,
-	0xab5c, 0xab65,
-	0xab70, 0xabbf,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0x10400, 0x1044f,
-	0x10c80, 0x10cb2,
-	0x10cc0, 0x10cf2,
-	0x118a0, 0x118df,
-	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, 0x1d7cb,
-	0x1f130, 0x1f149,
-	0x1f150, 0x1f169,
-	0x1f170, 0x1f189,
-}; /* CR_Cased */
-
-/* 'Case_Ignorable': Derived Property */
-static const OnigCodePoint CR_Case_Ignorable[] = {
-	346,
-	0x0027, 0x0027,
-	0x002e, 0x002e,
-	0x003a, 0x003a,
-	0x005e, 0x005e,
-	0x0060, 0x0060,
-	0x00a8, 0x00a8,
-	0x00ad, 0x00ad,
-	0x00af, 0x00af,
-	0x00b4, 0x00b4,
-	0x00b7, 0x00b8,
-	0x02b0, 0x036f,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x0384, 0x0385,
-	0x0387, 0x0387,
-	0x0483, 0x0489,
-	0x0559, 0x0559,
-	0x0591, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x05f4, 0x05f4,
-	0x0600, 0x0605,
-	0x0610, 0x061a,
-	0x061c, 0x061c,
-	0x0640, 0x0640,
-	0x064b, 0x065f,
-	0x0670, 0x0670,
-	0x06d6, 0x06dd,
-	0x06df, 0x06e8,
-	0x06ea, 0x06ed,
-	0x070f, 0x070f,
-	0x0711, 0x0711,
-	0x0730, 0x074a,
-	0x07a6, 0x07b0,
-	0x07eb, 0x07f5,
-	0x07fa, 0x07fa,
-	0x0816, 0x082d,
-	0x0859, 0x085b,
-	0x08e3, 0x0902,
-	0x093a, 0x093a,
-	0x093c, 0x093c,
-	0x0941, 0x0948,
-	0x094d, 0x094d,
-	0x0951, 0x0957,
-	0x0962, 0x0963,
-	0x0971, 0x0971,
-	0x0981, 0x0981,
-	0x09bc, 0x09bc,
-	0x09c1, 0x09c4,
-	0x09cd, 0x09cd,
-	0x09e2, 0x09e3,
-	0x0a01, 0x0a02,
-	0x0a3c, 0x0a3c,
-	0x0a41, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a70, 0x0a71,
-	0x0a75, 0x0a75,
-	0x0a81, 0x0a82,
-	0x0abc, 0x0abc,
-	0x0ac1, 0x0ac5,
-	0x0ac7, 0x0ac8,
-	0x0acd, 0x0acd,
-	0x0ae2, 0x0ae3,
-	0x0b01, 0x0b01,
-	0x0b3c, 0x0b3c,
-	0x0b3f, 0x0b3f,
-	0x0b41, 0x0b44,
-	0x0b4d, 0x0b4d,
-	0x0b56, 0x0b56,
-	0x0b62, 0x0b63,
-	0x0b82, 0x0b82,
-	0x0bc0, 0x0bc0,
-	0x0bcd, 0x0bcd,
-	0x0c00, 0x0c00,
-	0x0c3e, 0x0c40,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c62, 0x0c63,
-	0x0c81, 0x0c81,
-	0x0cbc, 0x0cbc,
-	0x0cbf, 0x0cbf,
-	0x0cc6, 0x0cc6,
-	0x0ccc, 0x0ccd,
-	0x0ce2, 0x0ce3,
-	0x0d01, 0x0d01,
-	0x0d41, 0x0d44,
-	0x0d4d, 0x0d4d,
-	0x0d62, 0x0d63,
-	0x0dca, 0x0dca,
-	0x0dd2, 0x0dd4,
-	0x0dd6, 0x0dd6,
-	0x0e31, 0x0e31,
-	0x0e34, 0x0e3a,
-	0x0e46, 0x0e4e,
-	0x0eb1, 0x0eb1,
-	0x0eb4, 0x0eb9,
-	0x0ebb, 0x0ebc,
-	0x0ec6, 0x0ec6,
-	0x0ec8, 0x0ecd,
-	0x0f18, 0x0f19,
-	0x0f35, 0x0f35,
-	0x0f37, 0x0f37,
-	0x0f39, 0x0f39,
-	0x0f71, 0x0f7e,
-	0x0f80, 0x0f84,
-	0x0f86, 0x0f87,
-	0x0f8d, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fc6, 0x0fc6,
-	0x102d, 0x1030,
-	0x1032, 0x1037,
-	0x1039, 0x103a,
-	0x103d, 0x103e,
-	0x1058, 0x1059,
-	0x105e, 0x1060,
-	0x1071, 0x1074,
-	0x1082, 0x1082,
-	0x1085, 0x1086,
-	0x108d, 0x108d,
-	0x109d, 0x109d,
-	0x10fc, 0x10fc,
-	0x135d, 0x135f,
-	0x1712, 0x1714,
-	0x1732, 0x1734,
-	0x1752, 0x1753,
-	0x1772, 0x1773,
-	0x17b4, 0x17b5,
-	0x17b7, 0x17bd,
-	0x17c6, 0x17c6,
-	0x17c9, 0x17d3,
-	0x17d7, 0x17d7,
-	0x17dd, 0x17dd,
-	0x180b, 0x180e,
-	0x1843, 0x1843,
-	0x18a9, 0x18a9,
-	0x1920, 0x1922,
-	0x1927, 0x1928,
-	0x1932, 0x1932,
-	0x1939, 0x193b,
-	0x1a17, 0x1a18,
-	0x1a1b, 0x1a1b,
-	0x1a56, 0x1a56,
-	0x1a58, 0x1a5e,
-	0x1a60, 0x1a60,
-	0x1a62, 0x1a62,
-	0x1a65, 0x1a6c,
-	0x1a73, 0x1a7c,
-	0x1a7f, 0x1a7f,
-	0x1aa7, 0x1aa7,
-	0x1ab0, 0x1abe,
-	0x1b00, 0x1b03,
-	0x1b34, 0x1b34,
-	0x1b36, 0x1b3a,
-	0x1b3c, 0x1b3c,
-	0x1b42, 0x1b42,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1b81,
-	0x1ba2, 0x1ba5,
-	0x1ba8, 0x1ba9,
-	0x1bab, 0x1bad,
-	0x1be6, 0x1be6,
-	0x1be8, 0x1be9,
-	0x1bed, 0x1bed,
-	0x1bef, 0x1bf1,
-	0x1c2c, 0x1c33,
-	0x1c36, 0x1c37,
-	0x1c78, 0x1c7d,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce0,
-	0x1ce2, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1cf4, 0x1cf4,
-	0x1cf8, 0x1cf9,
-	0x1d2c, 0x1d6a,
-	0x1d78, 0x1d78,
-	0x1d9b, 0x1df5,
-	0x1dfc, 0x1dff,
-	0x1fbd, 0x1fbd,
-	0x1fbf, 0x1fc1,
-	0x1fcd, 0x1fcf,
-	0x1fdd, 0x1fdf,
-	0x1fed, 0x1fef,
-	0x1ffd, 0x1ffe,
-	0x200b, 0x200f,
-	0x2018, 0x2019,
-	0x2024, 0x2024,
-	0x2027, 0x2027,
-	0x202a, 0x202e,
-	0x2060, 0x2064,
-	0x2066, 0x206f,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 0x209c,
-	0x20d0, 0x20f0,
-	0x2c7c, 0x2c7d,
-	0x2cef, 0x2cf1,
-	0x2d6f, 0x2d6f,
-	0x2d7f, 0x2d7f,
-	0x2de0, 0x2dff,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3005,
-	0x302a, 0x302d,
-	0x3031, 0x3035,
-	0x303b, 0x303b,
-	0x3099, 0x309e,
-	0x30fc, 0x30fe,
-	0xa015, 0xa015,
-	0xa4f8, 0xa4fd,
-	0xa60c, 0xa60c,
-	0xa66f, 0xa672,
-	0xa674, 0xa67d,
-	0xa67f, 0xa67f,
-	0xa69c, 0xa69f,
-	0xa6f0, 0xa6f1,
-	0xa700, 0xa721,
-	0xa770, 0xa770,
-	0xa788, 0xa78a,
-	0xa7f8, 0xa7f9,
-	0xa802, 0xa802,
-	0xa806, 0xa806,
-	0xa80b, 0xa80b,
-	0xa825, 0xa826,
-	0xa8c4, 0xa8c4,
-	0xa8e0, 0xa8f1,
-	0xa926, 0xa92d,
-	0xa947, 0xa951,
-	0xa980, 0xa982,
-	0xa9b3, 0xa9b3,
-	0xa9b6, 0xa9b9,
-	0xa9bc, 0xa9bc,
-	0xa9cf, 0xa9cf,
-	0xa9e5, 0xa9e6,
-	0xaa29, 0xaa2e,
-	0xaa31, 0xaa32,
-	0xaa35, 0xaa36,
-	0xaa43, 0xaa43,
-	0xaa4c, 0xaa4c,
-	0xaa70, 0xaa70,
-	0xaa7c, 0xaa7c,
-	0xaab0, 0xaab0,
-	0xaab2, 0xaab4,
-	0xaab7, 0xaab8,
-	0xaabe, 0xaabf,
-	0xaac1, 0xaac1,
-	0xaadd, 0xaadd,
-	0xaaec, 0xaaed,
-	0xaaf3, 0xaaf4,
-	0xaaf6, 0xaaf6,
-	0xab5b, 0xab5f,
-	0xabe5, 0xabe5,
-	0xabe8, 0xabe8,
-	0xabed, 0xabed,
-	0xfb1e, 0xfb1e,
-	0xfbb2, 0xfbc1,
-	0xfe00, 0xfe0f,
-	0xfe13, 0xfe13,
-	0xfe20, 0xfe2f,
-	0xfe52, 0xfe52,
-	0xfe55, 0xfe55,
-	0xfeff, 0xfeff,
-	0xff07, 0xff07,
-	0xff0e, 0xff0e,
-	0xff1a, 0xff1a,
-	0xff3e, 0xff3e,
-	0xff40, 0xff40,
-	0xff70, 0xff70,
-	0xff9e, 0xff9f,
-	0xffe3, 0xffe3,
-	0xfff9, 0xfffb,
-	0x101fd, 0x101fd,
-	0x102e0, 0x102e0,
-	0x10376, 0x1037a,
-	0x10a01, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a0f,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x10ae5, 0x10ae6,
-	0x11001, 0x11001,
-	0x11038, 0x11046,
-	0x1107f, 0x11081,
-	0x110b3, 0x110b6,
-	0x110b9, 0x110ba,
-	0x110bd, 0x110bd,
-	0x11100, 0x11102,
-	0x11127, 0x1112b,
-	0x1112d, 0x11134,
-	0x11173, 0x11173,
-	0x11180, 0x11181,
-	0x111b6, 0x111be,
-	0x111ca, 0x111cc,
-	0x1122f, 0x11231,
-	0x11234, 0x11234,
-	0x11236, 0x11237,
-	0x112df, 0x112df,
-	0x112e3, 0x112ea,
-	0x11300, 0x11301,
-	0x1133c, 0x1133c,
-	0x11340, 0x11340,
-	0x11366, 0x1136c,
-	0x11370, 0x11374,
-	0x114b3, 0x114b8,
-	0x114ba, 0x114ba,
-	0x114bf, 0x114c0,
-	0x114c2, 0x114c3,
-	0x115b2, 0x115b5,
-	0x115bc, 0x115bd,
-	0x115bf, 0x115c0,
-	0x115dc, 0x115dd,
-	0x11633, 0x1163a,
-	0x1163d, 0x1163d,
-	0x1163f, 0x11640,
-	0x116ab, 0x116ab,
-	0x116ad, 0x116ad,
-	0x116b0, 0x116b5,
-	0x116b7, 0x116b7,
-	0x1171d, 0x1171f,
-	0x11722, 0x11725,
-	0x11727, 0x1172b,
-	0x16af0, 0x16af4,
-	0x16b30, 0x16b36,
-	0x16b40, 0x16b43,
-	0x16f8f, 0x16f9f,
-	0x1bc9d, 0x1bc9e,
-	0x1bca0, 0x1bca3,
-	0x1d167, 0x1d169,
-	0x1d173, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-	0x1d242, 0x1d244,
-	0x1da00, 0x1da36,
-	0x1da3b, 0x1da6c,
-	0x1da75, 0x1da75,
-	0x1da84, 0x1da84,
-	0x1da9b, 0x1da9f,
-	0x1daa1, 0x1daaf,
-	0x1e8d0, 0x1e8d6,
-	0x1f3fb, 0x1f3ff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-}; /* CR_Case_Ignorable */
-
-/* 'Changes_When_Lowercased': Derived Property */
-static const OnigCodePoint CR_Changes_When_Lowercased[] = {
-	588,
-	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, 0x01c5,
-	0x01c7, 0x01c8,
-	0x01ca, 0x01cb,
-	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, 0x01f2,
-	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,
-	0x0243, 0x0246,
-	0x0248, 0x0248,
-	0x024a, 0x024a,
-	0x024c, 0x024c,
-	0x024e, 0x024e,
-	0x0370, 0x0370,
-	0x0372, 0x0372,
-	0x0376, 0x0376,
-	0x037f, 0x037f,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x038f,
-	0x0391, 0x03a1,
-	0x03a3, 0x03ab,
-	0x03cf, 0x03cf,
-	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,
-	0x04fa, 0x04fa,
-	0x04fc, 0x04fc,
-	0x04fe, 0x04fe,
-	0x0500, 0x0500,
-	0x0502, 0x0502,
-	0x0504, 0x0504,
-	0x0506, 0x0506,
-	0x0508, 0x0508,
-	0x050a, 0x050a,
-	0x050c, 0x050c,
-	0x050e, 0x050e,
-	0x0510, 0x0510,
-	0x0512, 0x0512,
-	0x0514, 0x0514,
-	0x0516, 0x0516,
-	0x0518, 0x0518,
-	0x051a, 0x051a,
-	0x051c, 0x051c,
-	0x051e, 0x051e,
-	0x0520, 0x0520,
-	0x0522, 0x0522,
-	0x0524, 0x0524,
-	0x0526, 0x0526,
-	0x0528, 0x0528,
-	0x052a, 0x052a,
-	0x052c, 0x052c,
-	0x052e, 0x052e,
-	0x0531, 0x0556,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x13a0, 0x13f5,
-	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,
-	0x1e9e, 0x1e9e,
-	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,
-	0x1efa, 0x1efa,
-	0x1efc, 0x1efc,
-	0x1efe, 0x1efe,
-	0x1f08, 0x1f0f,
-	0x1f18, 0x1f1d,
-	0x1f28, 0x1f2f,
-	0x1f38, 0x1f3f,
-	0x1f48, 0x1f4d,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f5f,
-	0x1f68, 0x1f6f,
-	0x1f88, 0x1f8f,
-	0x1f98, 0x1f9f,
-	0x1fa8, 0x1faf,
-	0x1fb8, 0x1fbc,
-	0x1fc8, 0x1fcc,
-	0x1fd8, 0x1fdb,
-	0x1fe8, 0x1fec,
-	0x1ff8, 0x1ffc,
-	0x2126, 0x2126,
-	0x212a, 0x212b,
-	0x2132, 0x2132,
-	0x2160, 0x216f,
-	0x2183, 0x2183,
-	0x24b6, 0x24cf,
-	0x2c00, 0x2c2e,
-	0x2c60, 0x2c60,
-	0x2c62, 0x2c64,
-	0x2c67, 0x2c67,
-	0x2c69, 0x2c69,
-	0x2c6b, 0x2c6b,
-	0x2c6d, 0x2c70,
-	0x2c72, 0x2c72,
-	0x2c75, 0x2c75,
-	0x2c7e, 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,
-	0x2ceb, 0x2ceb,
-	0x2ced, 0x2ced,
-	0x2cf2, 0x2cf2,
-	0xa640, 0xa640,
-	0xa642, 0xa642,
-	0xa644, 0xa644,
-	0xa646, 0xa646,
-	0xa648, 0xa648,
-	0xa64a, 0xa64a,
-	0xa64c, 0xa64c,
-	0xa64e, 0xa64e,
-	0xa650, 0xa650,
-	0xa652, 0xa652,
-	0xa654, 0xa654,
-	0xa656, 0xa656,
-	0xa658, 0xa658,
-	0xa65a, 0xa65a,
-	0xa65c, 0xa65c,
-	0xa65e, 0xa65e,
-	0xa660, 0xa660,
-	0xa662, 0xa662,
-	0xa664, 0xa664,
-	0xa666, 0xa666,
-	0xa668, 0xa668,
-	0xa66a, 0xa66a,
-	0xa66c, 0xa66c,
-	0xa680, 0xa680,
-	0xa682, 0xa682,
-	0xa684, 0xa684,
-	0xa686, 0xa686,
-	0xa688, 0xa688,
-	0xa68a, 0xa68a,
-	0xa68c, 0xa68c,
-	0xa68e, 0xa68e,
-	0xa690, 0xa690,
-	0xa692, 0xa692,
-	0xa694, 0xa694,
-	0xa696, 0xa696,
-	0xa698, 0xa698,
-	0xa69a, 0xa69a,
-	0xa722, 0xa722,
-	0xa724, 0xa724,
-	0xa726, 0xa726,
-	0xa728, 0xa728,
-	0xa72a, 0xa72a,
-	0xa72c, 0xa72c,
-	0xa72e, 0xa72e,
-	0xa732, 0xa732,
-	0xa734, 0xa734,
-	0xa736, 0xa736,
-	0xa738, 0xa738,
-	0xa73a, 0xa73a,
-	0xa73c, 0xa73c,
-	0xa73e, 0xa73e,
-	0xa740, 0xa740,
-	0xa742, 0xa742,
-	0xa744, 0xa744,
-	0xa746, 0xa746,
-	0xa748, 0xa748,
-	0xa74a, 0xa74a,
-	0xa74c, 0xa74c,
-	0xa74e, 0xa74e,
-	0xa750, 0xa750,
-	0xa752, 0xa752,
-	0xa754, 0xa754,
-	0xa756, 0xa756,
-	0xa758, 0xa758,
-	0xa75a, 0xa75a,
-	0xa75c, 0xa75c,
-	0xa75e, 0xa75e,
-	0xa760, 0xa760,
-	0xa762, 0xa762,
-	0xa764, 0xa764,
-	0xa766, 0xa766,
-	0xa768, 0xa768,
-	0xa76a, 0xa76a,
-	0xa76c, 0xa76c,
-	0xa76e, 0xa76e,
-	0xa779, 0xa779,
-	0xa77b, 0xa77b,
-	0xa77d, 0xa77e,
-	0xa780, 0xa780,
-	0xa782, 0xa782,
-	0xa784, 0xa784,
-	0xa786, 0xa786,
-	0xa78b, 0xa78b,
-	0xa78d, 0xa78d,
-	0xa790, 0xa790,
-	0xa792, 0xa792,
-	0xa796, 0xa796,
-	0xa798, 0xa798,
-	0xa79a, 0xa79a,
-	0xa79c, 0xa79c,
-	0xa79e, 0xa79e,
-	0xa7a0, 0xa7a0,
-	0xa7a2, 0xa7a2,
-	0xa7a4, 0xa7a4,
-	0xa7a6, 0xa7a6,
-	0xa7a8, 0xa7a8,
-	0xa7aa, 0xa7ad,
-	0xa7b0, 0xa7b4,
-	0xa7b6, 0xa7b6,
-	0xff21, 0xff3a,
-	0x10400, 0x10427,
-	0x10c80, 0x10cb2,
-	0x118a0, 0x118bf,
-}; /* CR_Changes_When_Lowercased */
-
-/* 'Changes_When_Uppercased': Derived Property */
-static const OnigCodePoint CR_Changes_When_Uppercased[] = {
-	605,
-	0x0061, 0x007a,
-	0x00b5, 0x00b5,
-	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, 0x0137,
-	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, 0x018c,
-	0x0192, 0x0192,
-	0x0195, 0x0195,
-	0x0199, 0x019a,
-	0x019e, 0x019e,
-	0x01a1, 0x01a1,
-	0x01a3, 0x01a3,
-	0x01a5, 0x01a5,
-	0x01a8, 0x01a8,
-	0x01ad, 0x01ad,
-	0x01b0, 0x01b0,
-	0x01b4, 0x01b4,
-	0x01b6, 0x01b6,
-	0x01b9, 0x01b9,
-	0x01bd, 0x01bd,
-	0x01bf, 0x01bf,
-	0x01c5, 0x01c6,
-	0x01c8, 0x01c9,
-	0x01cb, 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,
-	0x01f2, 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,
-	0x0223, 0x0223,
-	0x0225, 0x0225,
-	0x0227, 0x0227,
-	0x0229, 0x0229,
-	0x022b, 0x022b,
-	0x022d, 0x022d,
-	0x022f, 0x022f,
-	0x0231, 0x0231,
-	0x0233, 0x0233,
-	0x023c, 0x023c,
-	0x023f, 0x0240,
-	0x0242, 0x0242,
-	0x0247, 0x0247,
-	0x0249, 0x0249,
-	0x024b, 0x024b,
-	0x024d, 0x024d,
-	0x024f, 0x0254,
-	0x0256, 0x0257,
-	0x0259, 0x0259,
-	0x025b, 0x025c,
-	0x0260, 0x0261,
-	0x0263, 0x0263,
-	0x0265, 0x0266,
-	0x0268, 0x0269,
-	0x026b, 0x026c,
-	0x026f, 0x026f,
-	0x0271, 0x0272,
-	0x0275, 0x0275,
-	0x027d, 0x027d,
-	0x0280, 0x0280,
-	0x0283, 0x0283,
-	0x0287, 0x028c,
-	0x0292, 0x0292,
-	0x029d, 0x029e,
-	0x0345, 0x0345,
-	0x0371, 0x0371,
-	0x0373, 0x0373,
-	0x0377, 0x0377,
-	0x037b, 0x037d,
-	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, 0x03fb,
-	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, 0x04cf,
-	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,
-	0x04fb, 0x04fb,
-	0x04fd, 0x04fd,
-	0x04ff, 0x04ff,
-	0x0501, 0x0501,
-	0x0503, 0x0503,
-	0x0505, 0x0505,
-	0x0507, 0x0507,
-	0x0509, 0x0509,
-	0x050b, 0x050b,
-	0x050d, 0x050d,
-	0x050f, 0x050f,
-	0x0511, 0x0511,
-	0x0513, 0x0513,
-	0x0515, 0x0515,
-	0x0517, 0x0517,
-	0x0519, 0x0519,
-	0x051b, 0x051b,
-	0x051d, 0x051d,
-	0x051f, 0x051f,
-	0x0521, 0x0521,
-	0x0523, 0x0523,
-	0x0525, 0x0525,
-	0x0527, 0x0527,
-	0x0529, 0x0529,
-	0x052b, 0x052b,
-	0x052d, 0x052d,
-	0x052f, 0x052f,
-	0x0561, 0x0587,
-	0x13f8, 0x13fd,
-	0x1d79, 0x1d79,
-	0x1d7d, 0x1d7d,
-	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,
-	0x1efb, 0x1efb,
-	0x1efd, 0x1efd,
-	0x1eff, 0x1f07,
-	0x1f10, 0x1f15,
-	0x1f20, 0x1f27,
-	0x1f30, 0x1f37,
-	0x1f40, 0x1f45,
-	0x1f50, 0x1f57,
-	0x1f60, 0x1f67,
-	0x1f70, 0x1f7d,
-	0x1f80, 0x1fb4,
-	0x1fb6, 0x1fb7,
-	0x1fbc, 0x1fbc,
-	0x1fbe, 0x1fbe,
-	0x1fc2, 0x1fc4,
-	0x1fc6, 0x1fc7,
-	0x1fcc, 0x1fcc,
-	0x1fd0, 0x1fd3,
-	0x1fd6, 0x1fd7,
-	0x1fe0, 0x1fe7,
-	0x1ff2, 0x1ff4,
-	0x1ff6, 0x1ff7,
-	0x1ffc, 0x1ffc,
-	0x214e, 0x214e,
-	0x2170, 0x217f,
-	0x2184, 0x2184,
-	0x24d0, 0x24e9,
-	0x2c30, 0x2c5e,
-	0x2c61, 0x2c61,
-	0x2c65, 0x2c66,
-	0x2c68, 0x2c68,
-	0x2c6a, 0x2c6a,
-	0x2c6c, 0x2c6c,
-	0x2c73, 0x2c73,
-	0x2c76, 0x2c76,
-	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, 0x2ce3,
-	0x2cec, 0x2cec,
-	0x2cee, 0x2cee,
-	0x2cf3, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0xa641, 0xa641,
-	0xa643, 0xa643,
-	0xa645, 0xa645,
-	0xa647, 0xa647,
-	0xa649, 0xa649,
-	0xa64b, 0xa64b,
-	0xa64d, 0xa64d,
-	0xa64f, 0xa64f,
-	0xa651, 0xa651,
-	0xa653, 0xa653,
-	0xa655, 0xa655,
-	0xa657, 0xa657,
-	0xa659, 0xa659,
-	0xa65b, 0xa65b,
-	0xa65d, 0xa65d,
-	0xa65f, 0xa65f,
-	0xa661, 0xa661,
-	0xa663, 0xa663,
-	0xa665, 0xa665,
-	0xa667, 0xa667,
-	0xa669, 0xa669,
-	0xa66b, 0xa66b,
-	0xa66d, 0xa66d,
-	0xa681, 0xa681,
-	0xa683, 0xa683,
-	0xa685, 0xa685,
-	0xa687, 0xa687,
-	0xa689, 0xa689,
-	0xa68b, 0xa68b,
-	0xa68d, 0xa68d,
-	0xa68f, 0xa68f,
-	0xa691, 0xa691,
-	0xa693, 0xa693,
-	0xa695, 0xa695,
-	0xa697, 0xa697,
-	0xa699, 0xa699,
-	0xa69b, 0xa69b,
-	0xa723, 0xa723,
-	0xa725, 0xa725,
-	0xa727, 0xa727,
-	0xa729, 0xa729,
-	0xa72b, 0xa72b,
-	0xa72d, 0xa72d,
-	0xa72f, 0xa72f,
-	0xa733, 0xa733,
-	0xa735, 0xa735,
-	0xa737, 0xa737,
-	0xa739, 0xa739,
-	0xa73b, 0xa73b,
-	0xa73d, 0xa73d,
-	0xa73f, 0xa73f,
-	0xa741, 0xa741,
-	0xa743, 0xa743,
-	0xa745, 0xa745,
-	0xa747, 0xa747,
-	0xa749, 0xa749,
-	0xa74b, 0xa74b,
-	0xa74d, 0xa74d,
-	0xa74f, 0xa74f,
-	0xa751, 0xa751,
-	0xa753, 0xa753,
-	0xa755, 0xa755,
-	0xa757, 0xa757,
-	0xa759, 0xa759,
-	0xa75b, 0xa75b,
-	0xa75d, 0xa75d,
-	0xa75f, 0xa75f,
-	0xa761, 0xa761,
-	0xa763, 0xa763,
-	0xa765, 0xa765,
-	0xa767, 0xa767,
-	0xa769, 0xa769,
-	0xa76b, 0xa76b,
-	0xa76d, 0xa76d,
-	0xa76f, 0xa76f,
-	0xa77a, 0xa77a,
-	0xa77c, 0xa77c,
-	0xa77f, 0xa77f,
-	0xa781, 0xa781,
-	0xa783, 0xa783,
-	0xa785, 0xa785,
-	0xa787, 0xa787,
-	0xa78c, 0xa78c,
-	0xa791, 0xa791,
-	0xa793, 0xa793,
-	0xa797, 0xa797,
-	0xa799, 0xa799,
-	0xa79b, 0xa79b,
-	0xa79d, 0xa79d,
-	0xa79f, 0xa79f,
-	0xa7a1, 0xa7a1,
-	0xa7a3, 0xa7a3,
-	0xa7a5, 0xa7a5,
-	0xa7a7, 0xa7a7,
-	0xa7a9, 0xa7a9,
-	0xa7b5, 0xa7b5,
-	0xa7b7, 0xa7b7,
-	0xab53, 0xab53,
-	0xab70, 0xabbf,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff41, 0xff5a,
-	0x10428, 0x1044f,
-	0x10cc0, 0x10cf2,
-	0x118c0, 0x118df,
-}; /* CR_Changes_When_Uppercased */
-
-/* 'Changes_When_Titlecased': Derived Property */
-static const OnigCodePoint CR_Changes_When_Titlecased[] = {
-	606,
-	0x0061, 0x007a,
-	0x00b5, 0x00b5,
-	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, 0x0137,
-	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, 0x018c,
-	0x0192, 0x0192,
-	0x0195, 0x0195,
-	0x0199, 0x019a,
-	0x019e, 0x019e,
-	0x01a1, 0x01a1,
-	0x01a3, 0x01a3,
-	0x01a5, 0x01a5,
-	0x01a8, 0x01a8,
-	0x01ad, 0x01ad,
-	0x01b0, 0x01b0,
-	0x01b4, 0x01b4,
-	0x01b6, 0x01b6,
-	0x01b9, 0x01b9,
-	0x01bd, 0x01bd,
-	0x01bf, 0x01bf,
-	0x01c4, 0x01c4,
-	0x01c6, 0x01c7,
-	0x01c9, 0x01ca,
-	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, 0x01f1,
-	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,
-	0x0223, 0x0223,
-	0x0225, 0x0225,
-	0x0227, 0x0227,
-	0x0229, 0x0229,
-	0x022b, 0x022b,
-	0x022d, 0x022d,
-	0x022f, 0x022f,
-	0x0231, 0x0231,
-	0x0233, 0x0233,
-	0x023c, 0x023c,
-	0x023f, 0x0240,
-	0x0242, 0x0242,
-	0x0247, 0x0247,
-	0x0249, 0x0249,
-	0x024b, 0x024b,
-	0x024d, 0x024d,
-	0x024f, 0x0254,
-	0x0256, 0x0257,
-	0x0259, 0x0259,
-	0x025b, 0x025c,
-	0x0260, 0x0261,
-	0x0263, 0x0263,
-	0x0265, 0x0266,
-	0x0268, 0x0269,
-	0x026b, 0x026c,
-	0x026f, 0x026f,
-	0x0271, 0x0272,
-	0x0275, 0x0275,
-	0x027d, 0x027d,
-	0x0280, 0x0280,
-	0x0283, 0x0283,
-	0x0287, 0x028c,
-	0x0292, 0x0292,
-	0x029d, 0x029e,
-	0x0345, 0x0345,
-	0x0371, 0x0371,
-	0x0373, 0x0373,
-	0x0377, 0x0377,
-	0x037b, 0x037d,
-	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, 0x03fb,
-	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, 0x04cf,
-	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,
-	0x04fb, 0x04fb,
-	0x04fd, 0x04fd,
-	0x04ff, 0x04ff,
-	0x0501, 0x0501,
-	0x0503, 0x0503,
-	0x0505, 0x0505,
-	0x0507, 0x0507,
-	0x0509, 0x0509,
-	0x050b, 0x050b,
-	0x050d, 0x050d,
-	0x050f, 0x050f,
-	0x0511, 0x0511,
-	0x0513, 0x0513,
-	0x0515, 0x0515,
-	0x0517, 0x0517,
-	0x0519, 0x0519,
-	0x051b, 0x051b,
-	0x051d, 0x051d,
-	0x051f, 0x051f,
-	0x0521, 0x0521,
-	0x0523, 0x0523,
-	0x0525, 0x0525,
-	0x0527, 0x0527,
-	0x0529, 0x0529,
-	0x052b, 0x052b,
-	0x052d, 0x052d,
-	0x052f, 0x052f,
-	0x0561, 0x0587,
-	0x13f8, 0x13fd,
-	0x1d79, 0x1d79,
-	0x1d7d, 0x1d7d,
-	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,
-	0x1efb, 0x1efb,
-	0x1efd, 0x1efd,
-	0x1eff, 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,
-	0x214e, 0x214e,
-	0x2170, 0x217f,
-	0x2184, 0x2184,
-	0x24d0, 0x24e9,
-	0x2c30, 0x2c5e,
-	0x2c61, 0x2c61,
-	0x2c65, 0x2c66,
-	0x2c68, 0x2c68,
-	0x2c6a, 0x2c6a,
-	0x2c6c, 0x2c6c,
-	0x2c73, 0x2c73,
-	0x2c76, 0x2c76,
-	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, 0x2ce3,
-	0x2cec, 0x2cec,
-	0x2cee, 0x2cee,
-	0x2cf3, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0xa641, 0xa641,
-	0xa643, 0xa643,
-	0xa645, 0xa645,
-	0xa647, 0xa647,
-	0xa649, 0xa649,
-	0xa64b, 0xa64b,
-	0xa64d, 0xa64d,
-	0xa64f, 0xa64f,
-	0xa651, 0xa651,
-	0xa653, 0xa653,
-	0xa655, 0xa655,
-	0xa657, 0xa657,
-	0xa659, 0xa659,
-	0xa65b, 0xa65b,
-	0xa65d, 0xa65d,
-	0xa65f, 0xa65f,
-	0xa661, 0xa661,
-	0xa663, 0xa663,
-	0xa665, 0xa665,
-	0xa667, 0xa667,
-	0xa669, 0xa669,
-	0xa66b, 0xa66b,
-	0xa66d, 0xa66d,
-	0xa681, 0xa681,
-	0xa683, 0xa683,
-	0xa685, 0xa685,
-	0xa687, 0xa687,
-	0xa689, 0xa689,
-	0xa68b, 0xa68b,
-	0xa68d, 0xa68d,
-	0xa68f, 0xa68f,
-	0xa691, 0xa691,
-	0xa693, 0xa693,
-	0xa695, 0xa695,
-	0xa697, 0xa697,
-	0xa699, 0xa699,
-	0xa69b, 0xa69b,
-	0xa723, 0xa723,
-	0xa725, 0xa725,
-	0xa727, 0xa727,
-	0xa729, 0xa729,
-	0xa72b, 0xa72b,
-	0xa72d, 0xa72d,
-	0xa72f, 0xa72f,
-	0xa733, 0xa733,
-	0xa735, 0xa735,
-	0xa737, 0xa737,
-	0xa739, 0xa739,
-	0xa73b, 0xa73b,
-	0xa73d, 0xa73d,
-	0xa73f, 0xa73f,
-	0xa741, 0xa741,
-	0xa743, 0xa743,
-	0xa745, 0xa745,
-	0xa747, 0xa747,
-	0xa749, 0xa749,
-	0xa74b, 0xa74b,
-	0xa74d, 0xa74d,
-	0xa74f, 0xa74f,
-	0xa751, 0xa751,
-	0xa753, 0xa753,
-	0xa755, 0xa755,
-	0xa757, 0xa757,
-	0xa759, 0xa759,
-	0xa75b, 0xa75b,
-	0xa75d, 0xa75d,
-	0xa75f, 0xa75f,
-	0xa761, 0xa761,
-	0xa763, 0xa763,
-	0xa765, 0xa765,
-	0xa767, 0xa767,
-	0xa769, 0xa769,
-	0xa76b, 0xa76b,
-	0xa76d, 0xa76d,
-	0xa76f, 0xa76f,
-	0xa77a, 0xa77a,
-	0xa77c, 0xa77c,
-	0xa77f, 0xa77f,
-	0xa781, 0xa781,
-	0xa783, 0xa783,
-	0xa785, 0xa785,
-	0xa787, 0xa787,
-	0xa78c, 0xa78c,
-	0xa791, 0xa791,
-	0xa793, 0xa793,
-	0xa797, 0xa797,
-	0xa799, 0xa799,
-	0xa79b, 0xa79b,
-	0xa79d, 0xa79d,
-	0xa79f, 0xa79f,
-	0xa7a1, 0xa7a1,
-	0xa7a3, 0xa7a3,
-	0xa7a5, 0xa7a5,
-	0xa7a7, 0xa7a7,
-	0xa7a9, 0xa7a9,
-	0xa7b5, 0xa7b5,
-	0xa7b7, 0xa7b7,
-	0xab53, 0xab53,
-	0xab70, 0xabbf,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff41, 0xff5a,
-	0x10428, 0x1044f,
-	0x10cc0, 0x10cf2,
-	0x118c0, 0x118df,
-}; /* CR_Changes_When_Titlecased */
-
-/* 'Changes_When_Casefolded': Derived Property */
-static const OnigCodePoint CR_Changes_When_Casefolded[] = {
-	600,
-	0x0041, 0x005a,
-	0x00b5, 0x00b5,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00df,
-	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,
-	0x0149, 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,
-	0x017f, 0x017f,
-	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, 0x01c5,
-	0x01c7, 0x01c8,
-	0x01ca, 0x01cb,
-	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, 0x01f2,
-	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,
-	0x0243, 0x0246,
-	0x0248, 0x0248,
-	0x024a, 0x024a,
-	0x024c, 0x024c,
-	0x024e, 0x024e,
-	0x0345, 0x0345,
-	0x0370, 0x0370,
-	0x0372, 0x0372,
-	0x0376, 0x0376,
-	0x037f, 0x037f,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x038f,
-	0x0391, 0x03a1,
-	0x03a3, 0x03ab,
-	0x03c2, 0x03c2,
-	0x03cf, 0x03d1,
-	0x03d5, 0x03d6,
-	0x03d8, 0x03d8,
-	0x03da, 0x03da,
-	0x03dc, 0x03dc,
-	0x03de, 0x03de,
-	0x03e0, 0x03e0,
-	0x03e2, 0x03e2,
-	0x03e4, 0x03e4,
-	0x03e6, 0x03e6,
-	0x03e8, 0x03e8,
-	0x03ea, 0x03ea,
-	0x03ec, 0x03ec,
-	0x03ee, 0x03ee,
-	0x03f0, 0x03f1,
-	0x03f4, 0x03f5,
-	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,
-	0x04fa, 0x04fa,
-	0x04fc, 0x04fc,
-	0x04fe, 0x04fe,
-	0x0500, 0x0500,
-	0x0502, 0x0502,
-	0x0504, 0x0504,
-	0x0506, 0x0506,
-	0x0508, 0x0508,
-	0x050a, 0x050a,
-	0x050c, 0x050c,
-	0x050e, 0x050e,
-	0x0510, 0x0510,
-	0x0512, 0x0512,
-	0x0514, 0x0514,
-	0x0516, 0x0516,
-	0x0518, 0x0518,
-	0x051a, 0x051a,
-	0x051c, 0x051c,
-	0x051e, 0x051e,
-	0x0520, 0x0520,
-	0x0522, 0x0522,
-	0x0524, 0x0524,
-	0x0526, 0x0526,
-	0x0528, 0x0528,
-	0x052a, 0x052a,
-	0x052c, 0x052c,
-	0x052e, 0x052e,
-	0x0531, 0x0556,
-	0x0587, 0x0587,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x13f8, 0x13fd,
-	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,
-	0x1e9a, 0x1e9b,
-	0x1e9e, 0x1e9e,
-	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,
-	0x1efa, 0x1efa,
-	0x1efc, 0x1efc,
-	0x1efe, 0x1efe,
-	0x1f08, 0x1f0f,
-	0x1f18, 0x1f1d,
-	0x1f28, 0x1f2f,
-	0x1f38, 0x1f3f,
-	0x1f48, 0x1f4d,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f5f,
-	0x1f68, 0x1f6f,
-	0x1f80, 0x1faf,
-	0x1fb2, 0x1fb4,
-	0x1fb7, 0x1fbc,
-	0x1fc2, 0x1fc4,
-	0x1fc7, 0x1fcc,
-	0x1fd8, 0x1fdb,
-	0x1fe8, 0x1fec,
-	0x1ff2, 0x1ff4,
-	0x1ff7, 0x1ffc,
-	0x2126, 0x2126,
-	0x212a, 0x212b,
-	0x2132, 0x2132,
-	0x2160, 0x216f,
-	0x2183, 0x2183,
-	0x24b6, 0x24cf,
-	0x2c00, 0x2c2e,
-	0x2c60, 0x2c60,
-	0x2c62, 0x2c64,
-	0x2c67, 0x2c67,
-	0x2c69, 0x2c69,
-	0x2c6b, 0x2c6b,
-	0x2c6d, 0x2c70,
-	0x2c72, 0x2c72,
-	0x2c75, 0x2c75,
-	0x2c7e, 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,
-	0x2ceb, 0x2ceb,
-	0x2ced, 0x2ced,
-	0x2cf2, 0x2cf2,
-	0xa640, 0xa640,
-	0xa642, 0xa642,
-	0xa644, 0xa644,
-	0xa646, 0xa646,
-	0xa648, 0xa648,
-	0xa64a, 0xa64a,
-	0xa64c, 0xa64c,
-	0xa64e, 0xa64e,
-	0xa650, 0xa650,
-	0xa652, 0xa652,
-	0xa654, 0xa654,
-	0xa656, 0xa656,
-	0xa658, 0xa658,
-	0xa65a, 0xa65a,
-	0xa65c, 0xa65c,
-	0xa65e, 0xa65e,
-	0xa660, 0xa660,
-	0xa662, 0xa662,
-	0xa664, 0xa664,
-	0xa666, 0xa666,
-	0xa668, 0xa668,
-	0xa66a, 0xa66a,
-	0xa66c, 0xa66c,
-	0xa680, 0xa680,
-	0xa682, 0xa682,
-	0xa684, 0xa684,
-	0xa686, 0xa686,
-	0xa688, 0xa688,
-	0xa68a, 0xa68a,
-	0xa68c, 0xa68c,
-	0xa68e, 0xa68e,
-	0xa690, 0xa690,
-	0xa692, 0xa692,
-	0xa694, 0xa694,
-	0xa696, 0xa696,
-	0xa698, 0xa698,
-	0xa69a, 0xa69a,
-	0xa722, 0xa722,
-	0xa724, 0xa724,
-	0xa726, 0xa726,
-	0xa728, 0xa728,
-	0xa72a, 0xa72a,
-	0xa72c, 0xa72c,
-	0xa72e, 0xa72e,
-	0xa732, 0xa732,
-	0xa734, 0xa734,
-	0xa736, 0xa736,
-	0xa738, 0xa738,
-	0xa73a, 0xa73a,
-	0xa73c, 0xa73c,
-	0xa73e, 0xa73e,
-	0xa740, 0xa740,
-	0xa742, 0xa742,
-	0xa744, 0xa744,
-	0xa746, 0xa746,
-	0xa748, 0xa748,
-	0xa74a, 0xa74a,
-	0xa74c, 0xa74c,
-	0xa74e, 0xa74e,
-	0xa750, 0xa750,
-	0xa752, 0xa752,
-	0xa754, 0xa754,
-	0xa756, 0xa756,
-	0xa758, 0xa758,
-	0xa75a, 0xa75a,
-	0xa75c, 0xa75c,
-	0xa75e, 0xa75e,
-	0xa760, 0xa760,
-	0xa762, 0xa762,
-	0xa764, 0xa764,
-	0xa766, 0xa766,
-	0xa768, 0xa768,
-	0xa76a, 0xa76a,
-	0xa76c, 0xa76c,
-	0xa76e, 0xa76e,
-	0xa779, 0xa779,
-	0xa77b, 0xa77b,
-	0xa77d, 0xa77e,
-	0xa780, 0xa780,
-	0xa782, 0xa782,
-	0xa784, 0xa784,
-	0xa786, 0xa786,
-	0xa78b, 0xa78b,
-	0xa78d, 0xa78d,
-	0xa790, 0xa790,
-	0xa792, 0xa792,
-	0xa796, 0xa796,
-	0xa798, 0xa798,
-	0xa79a, 0xa79a,
-	0xa79c, 0xa79c,
-	0xa79e, 0xa79e,
-	0xa7a0, 0xa7a0,
-	0xa7a2, 0xa7a2,
-	0xa7a4, 0xa7a4,
-	0xa7a6, 0xa7a6,
-	0xa7a8, 0xa7a8,
-	0xa7aa, 0xa7ad,
-	0xa7b0, 0xa7b4,
-	0xa7b6, 0xa7b6,
-	0xab70, 0xabbf,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff21, 0xff3a,
-	0x10400, 0x10427,
-	0x10c80, 0x10cb2,
-	0x118a0, 0x118bf,
-}; /* CR_Changes_When_Casefolded */
-
-/* 'Changes_When_Casemapped': Derived Property */
-static const OnigCodePoint CR_Changes_When_Casemapped[] = {
-	113,
-	0x0041, 0x005a,
-	0x0061, 0x007a,
-	0x00b5, 0x00b5,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x0137,
-	0x0139, 0x018c,
-	0x018e, 0x019a,
-	0x019c, 0x01a9,
-	0x01ac, 0x01b9,
-	0x01bc, 0x01bd,
-	0x01bf, 0x01bf,
-	0x01c4, 0x0220,
-	0x0222, 0x0233,
-	0x023a, 0x0254,
-	0x0256, 0x0257,
-	0x0259, 0x0259,
-	0x025b, 0x025c,
-	0x0260, 0x0261,
-	0x0263, 0x0263,
-	0x0265, 0x0266,
-	0x0268, 0x0269,
-	0x026b, 0x026c,
-	0x026f, 0x026f,
-	0x0271, 0x0272,
-	0x0275, 0x0275,
-	0x027d, 0x027d,
-	0x0280, 0x0280,
-	0x0283, 0x0283,
-	0x0287, 0x028c,
-	0x0292, 0x0292,
-	0x029d, 0x029e,
-	0x0345, 0x0345,
-	0x0370, 0x0373,
-	0x0376, 0x0377,
-	0x037b, 0x037d,
-	0x037f, 0x037f,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03d1,
-	0x03d5, 0x03f5,
-	0x03f7, 0x03fb,
-	0x03fd, 0x0481,
-	0x048a, 0x052f,
-	0x0531, 0x0556,
-	0x0561, 0x0587,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x13a0, 0x13f5,
-	0x13f8, 0x13fd,
-	0x1d79, 0x1d79,
-	0x1d7d, 0x1d7d,
-	0x1e00, 0x1e9b,
-	0x1e9e, 0x1e9e,
-	0x1ea0, 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,
-	0x2126, 0x2126,
-	0x212a, 0x212b,
-	0x2132, 0x2132,
-	0x214e, 0x214e,
-	0x2160, 0x217f,
-	0x2183, 0x2184,
-	0x24b6, 0x24e9,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2c70,
-	0x2c72, 0x2c73,
-	0x2c75, 0x2c76,
-	0x2c7e, 0x2ce3,
-	0x2ceb, 0x2cee,
-	0x2cf2, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0xa640, 0xa66d,
-	0xa680, 0xa69b,
-	0xa722, 0xa72f,
-	0xa732, 0xa76f,
-	0xa779, 0xa787,
-	0xa78b, 0xa78d,
-	0xa790, 0xa793,
-	0xa796, 0xa7ad,
-	0xa7b0, 0xa7b7,
-	0xab53, 0xab53,
-	0xab70, 0xabbf,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0x10400, 0x1044f,
-	0x10c80, 0x10cb2,
-	0x10cc0, 0x10cf2,
-	0x118a0, 0x118df,
-}; /* CR_Changes_When_Casemapped */
-
-/* 'ID_Start': Derived Property */
-static const OnigCodePoint CR_ID_Start[] = {
-	555,
-	0x0041, 0x005a,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00b5, 0x00b5,
-	0x00ba, 0x00ba,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x02c1,
-	0x02c6, 0x02d1,
-	0x02e0, 0x02e4,
-	0x02ec, 0x02ec,
-	0x02ee, 0x02ee,
-	0x0370, 0x0374,
-	0x0376, 0x0377,
-	0x037a, 0x037d,
-	0x037f, 0x037f,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x048a, 0x052f,
-	0x0531, 0x0556,
-	0x0559, 0x0559,
-	0x0561, 0x0587,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0620, 0x064a,
-	0x066e, 0x066f,
-	0x0671, 0x06d3,
-	0x06d5, 0x06d5,
-	0x06e5, 0x06e6,
-	0x06ee, 0x06ef,
-	0x06fa, 0x06fc,
-	0x06ff, 0x06ff,
-	0x0710, 0x0710,
-	0x0712, 0x072f,
-	0x074d, 0x07a5,
-	0x07b1, 0x07b1,
-	0x07ca, 0x07ea,
-	0x07f4, 0x07f5,
-	0x07fa, 0x07fa,
-	0x0800, 0x0815,
-	0x081a, 0x081a,
-	0x0824, 0x0824,
-	0x0828, 0x0828,
-	0x0840, 0x0858,
-	0x08a0, 0x08b4,
-	0x0904, 0x0939,
-	0x093d, 0x093d,
-	0x0950, 0x0950,
-	0x0958, 0x0961,
-	0x0971, 0x0980,
-	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,
-	0x0af9, 0x0af9,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c3d,
-	0x0c58, 0x0c5a,
-	0x0c60, 0x0c61,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbd, 0x0cbd,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce1,
-	0x0cf1, 0x0cf2,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d3d,
-	0x0d4e, 0x0d4e,
-	0x0d5f, 0x0d61,
-	0x0d7a, 0x0d7f,
-	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, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f40, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f88, 0x0f8c,
-	0x1000, 0x102a,
-	0x103f, 0x103f,
-	0x1050, 0x1055,
-	0x105a, 0x105d,
-	0x1061, 0x1061,
-	0x1065, 0x1066,
-	0x106e, 0x1070,
-	0x1075, 0x1081,
-	0x108e, 0x108e,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 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, 0x13f5,
-	0x13f8, 0x13fd,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f8,
-	0x1700, 0x170c,
-	0x170e, 0x1711,
-	0x1720, 0x1731,
-	0x1740, 0x1751,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1780, 0x17b3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dc,
-	0x1820, 0x1877,
-	0x1880, 0x18a8,
-	0x18aa, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191e,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x1a00, 0x1a16,
-	0x1a20, 0x1a54,
-	0x1aa7, 0x1aa7,
-	0x1b05, 0x1b33,
-	0x1b45, 0x1b4b,
-	0x1b83, 0x1ba0,
-	0x1bae, 0x1baf,
-	0x1bba, 0x1be5,
-	0x1c00, 0x1c23,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c7d,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf1,
-	0x1cf5, 0x1cf6,
-	0x1d00, 0x1dbf,
-	0x1e00, 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, 0x209c,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2118, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2160, 0x2188,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2ce4,
-	0x2ceb, 0x2cee,
-	0x2cf2, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x3005, 0x3007,
-	0x3021, 0x3029,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x309b, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fd5,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa640, 0xa66e,
-	0xa67f, 0xa69d,
-	0xa6a0, 0xa6ef,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa7ad,
-	0xa7b0, 0xa7b7,
-	0xa7f7, 0xa801,
-	0xa803, 0xa805,
-	0xa807, 0xa80a,
-	0xa80c, 0xa822,
-	0xa840, 0xa873,
-	0xa882, 0xa8b3,
-	0xa8f2, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa8fd, 0xa8fd,
-	0xa90a, 0xa925,
-	0xa930, 0xa946,
-	0xa960, 0xa97c,
-	0xa984, 0xa9b2,
-	0xa9cf, 0xa9cf,
-	0xa9e0, 0xa9e4,
-	0xa9e6, 0xa9ef,
-	0xa9fa, 0xa9fe,
-	0xaa00, 0xaa28,
-	0xaa40, 0xaa42,
-	0xaa44, 0xaa4b,
-	0xaa60, 0xaa76,
-	0xaa7a, 0xaa7a,
-	0xaa7e, 0xaaaf,
-	0xaab1, 0xaab1,
-	0xaab5, 0xaab6,
-	0xaab9, 0xaabd,
-	0xaac0, 0xaac0,
-	0xaac2, 0xaac2,
-	0xaadb, 0xaadd,
-	0xaae0, 0xaaea,
-	0xaaf2, 0xaaf4,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xab30, 0xab5a,
-	0xab5c, 0xab65,
-	0xab70, 0xabe2,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa6d,
-	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,
-	0x10140, 0x10174,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031f,
-	0x10330, 0x1034a,
-	0x10350, 0x10375,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10860, 0x10876,
-	0x10880, 0x1089e,
-	0x108e0, 0x108f2,
-	0x108f4, 0x108f5,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a00,
-	0x10a10, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10a80, 0x10a9c,
-	0x10ac0, 0x10ac7,
-	0x10ac9, 0x10ae4,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10b80, 0x10b91,
-	0x10c00, 0x10c48,
-	0x10c80, 0x10cb2,
-	0x10cc0, 0x10cf2,
-	0x11003, 0x11037,
-	0x11083, 0x110af,
-	0x110d0, 0x110e8,
-	0x11103, 0x11126,
-	0x11150, 0x11172,
-	0x11176, 0x11176,
-	0x11183, 0x111b2,
-	0x111c1, 0x111c4,
-	0x111da, 0x111da,
-	0x111dc, 0x111dc,
-	0x11200, 0x11211,
-	0x11213, 0x1122b,
-	0x11280, 0x11286,
-	0x11288, 0x11288,
-	0x1128a, 0x1128d,
-	0x1128f, 0x1129d,
-	0x1129f, 0x112a8,
-	0x112b0, 0x112de,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133d, 0x1133d,
-	0x11350, 0x11350,
-	0x1135d, 0x11361,
-	0x11480, 0x114af,
-	0x114c4, 0x114c5,
-	0x114c7, 0x114c7,
-	0x11580, 0x115ae,
-	0x115d8, 0x115db,
-	0x11600, 0x1162f,
-	0x11644, 0x11644,
-	0x11680, 0x116aa,
-	0x11700, 0x11719,
-	0x118a0, 0x118df,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x12000, 0x12399,
-	0x12400, 0x1246e,
-	0x12480, 0x12543,
-	0x13000, 0x1342e,
-	0x14400, 0x14646,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16ad0, 0x16aed,
-	0x16b00, 0x16b2f,
-	0x16b40, 0x16b43,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f50,
-	0x16f93, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	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, 0x1d7cb,
-	0x1e800, 0x1e8c4,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2b820, 0x2cea1,
-	0x2f800, 0x2fa1d,
-}; /* CR_ID_Start */
-
-/* 'ID_Continue': Derived Property */
-static const OnigCodePoint CR_ID_Continue[] = {
-	651,
-	0x0030, 0x0039,
-	0x0041, 0x005a,
-	0x005f, 0x005f,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00b5, 0x00b5,
-	0x00b7, 0x00b7,
-	0x00ba, 0x00ba,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x02c1,
-	0x02c6, 0x02d1,
-	0x02e0, 0x02e4,
-	0x02ec, 0x02ec,
-	0x02ee, 0x02ee,
-	0x0300, 0x0374,
-	0x0376, 0x0377,
-	0x037a, 0x037d,
-	0x037f, 0x037f,
-	0x0386, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x0483, 0x0487,
-	0x048a, 0x052f,
-	0x0531, 0x0556,
-	0x0559, 0x0559,
-	0x0561, 0x0587,
-	0x0591, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0610, 0x061a,
-	0x0620, 0x0669,
-	0x066e, 0x06d3,
-	0x06d5, 0x06dc,
-	0x06df, 0x06e8,
-	0x06ea, 0x06fc,
-	0x06ff, 0x06ff,
-	0x0710, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07f5,
-	0x07fa, 0x07fa,
-	0x0800, 0x082d,
-	0x0840, 0x085b,
-	0x08a0, 0x08b4,
-	0x08e3, 0x0963,
-	0x0966, 0x096f,
-	0x0971, 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,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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,
-	0x0af9, 0x0af9,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3c, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bef,
-	0x0c00, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c5a,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c81, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d01, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d5f, 0x0d63,
-	0x0d66, 0x0d6f,
-	0x0d7a, 0x0d7f,
-	0x0d82, 0x0d83,
-	0x0d85, 0x0d96,
-	0x0d9a, 0x0db1,
-	0x0db3, 0x0dbb,
-	0x0dbd, 0x0dbd,
-	0x0dc0, 0x0dc6,
-	0x0dca, 0x0dca,
-	0x0dcf, 0x0dd4,
-	0x0dd6, 0x0dd6,
-	0x0dd8, 0x0ddf,
-	0x0de6, 0x0def,
-	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, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f18, 0x0f19,
-	0x0f20, 0x0f29,
-	0x0f35, 0x0f35,
-	0x0f37, 0x0f37,
-	0x0f39, 0x0f39,
-	0x0f3e, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f84,
-	0x0f86, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fc6, 0x0fc6,
-	0x1000, 0x1049,
-	0x1050, 0x109d,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 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,
-	0x135d, 0x135f,
-	0x1369, 0x1371,
-	0x1380, 0x138f,
-	0x13a0, 0x13f5,
-	0x13f8, 0x13fd,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f8,
-	0x1700, 0x170c,
-	0x170e, 0x1714,
-	0x1720, 0x1734,
-	0x1740, 0x1753,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-	0x1780, 0x17d3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dd,
-	0x17e0, 0x17e9,
-	0x180b, 0x180d,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191e,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1946, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x1a00, 0x1a1b,
-	0x1a20, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa7, 0x1aa7,
-	0x1ab0, 0x1abd,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b59,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1bf3,
-	0x1c00, 0x1c37,
-	0x1c40, 0x1c49,
-	0x1c4d, 0x1c7d,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1cf6,
-	0x1cf8, 0x1cf9,
-	0x1d00, 0x1df5,
-	0x1dfc, 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,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 0x209c,
-	0x20d0, 0x20dc,
-	0x20e1, 0x20e1,
-	0x20e5, 0x20f0,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2118, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2160, 0x2188,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2ce4,
-	0x2ceb, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d6f,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2dff,
-	0x3005, 0x3007,
-	0x3021, 0x302f,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x3099, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fd5,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa62b,
-	0xa640, 0xa66f,
-	0xa674, 0xa67d,
-	0xa67f, 0xa6f1,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa7ad,
-	0xa7b0, 0xa7b7,
-	0xa7f7, 0xa827,
-	0xa840, 0xa873,
-	0xa880, 0xa8c4,
-	0xa8d0, 0xa8d9,
-	0xa8e0, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa8fd, 0xa8fd,
-	0xa900, 0xa92d,
-	0xa930, 0xa953,
-	0xa960, 0xa97c,
-	0xa980, 0xa9c0,
-	0xa9cf, 0xa9d9,
-	0xa9e0, 0xa9fe,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa60, 0xaa76,
-	0xaa7a, 0xaac2,
-	0xaadb, 0xaadd,
-	0xaae0, 0xaaef,
-	0xaaf2, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xab30, 0xab5a,
-	0xab5c, 0xab65,
-	0xab70, 0xabea,
-	0xabec, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa6d,
-	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, 0xfe2f,
-	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,
-	0x10140, 0x10174,
-	0x101fd, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x102e0, 0x102e0,
-	0x10300, 0x1031f,
-	0x10330, 0x1034a,
-	0x10350, 0x1037a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10860, 0x10876,
-	0x10880, 0x1089e,
-	0x108e0, 0x108f2,
-	0x108f4, 0x108f5,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x10a60, 0x10a7c,
-	0x10a80, 0x10a9c,
-	0x10ac0, 0x10ac7,
-	0x10ac9, 0x10ae6,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10b80, 0x10b91,
-	0x10c00, 0x10c48,
-	0x10c80, 0x10cb2,
-	0x10cc0, 0x10cf2,
-	0x11000, 0x11046,
-	0x11066, 0x1106f,
-	0x1107f, 0x110ba,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x1113f,
-	0x11150, 0x11173,
-	0x11176, 0x11176,
-	0x11180, 0x111c4,
-	0x111ca, 0x111cc,
-	0x111d0, 0x111da,
-	0x111dc, 0x111dc,
-	0x11200, 0x11211,
-	0x11213, 0x11237,
-	0x11280, 0x11286,
-	0x11288, 0x11288,
-	0x1128a, 0x1128d,
-	0x1128f, 0x1129d,
-	0x1129f, 0x112a8,
-	0x112b0, 0x112ea,
-	0x112f0, 0x112f9,
-	0x11300, 0x11303,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133c, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134d,
-	0x11350, 0x11350,
-	0x11357, 0x11357,
-	0x1135d, 0x11363,
-	0x11366, 0x1136c,
-	0x11370, 0x11374,
-	0x11480, 0x114c5,
-	0x114c7, 0x114c7,
-	0x114d0, 0x114d9,
-	0x11580, 0x115b5,
-	0x115b8, 0x115c0,
-	0x115d8, 0x115dd,
-	0x11600, 0x11640,
-	0x11644, 0x11644,
-	0x11650, 0x11659,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x11700, 0x11719,
-	0x1171d, 0x1172b,
-	0x11730, 0x11739,
-	0x118a0, 0x118e9,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x12000, 0x12399,
-	0x12400, 0x1246e,
-	0x12480, 0x12543,
-	0x13000, 0x1342e,
-	0x14400, 0x14646,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16a60, 0x16a69,
-	0x16ad0, 0x16aed,
-	0x16af0, 0x16af4,
-	0x16b00, 0x16b36,
-	0x16b40, 0x16b43,
-	0x16b50, 0x16b59,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	0x1bc9d, 0x1bc9e,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1da00, 0x1da36,
-	0x1da3b, 0x1da6c,
-	0x1da75, 0x1da75,
-	0x1da84, 0x1da84,
-	0x1da9b, 0x1da9f,
-	0x1daa1, 0x1daaf,
-	0x1e800, 0x1e8c4,
-	0x1e8d0, 0x1e8d6,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2b820, 0x2cea1,
-	0x2f800, 0x2fa1d,
-	0xe0100, 0xe01ef,
-}; /* CR_ID_Continue */
-
-/* 'XID_Start': Derived Property */
-static const OnigCodePoint CR_XID_Start[] = {
-	562,
-	0x0041, 0x005a,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00b5, 0x00b5,
-	0x00ba, 0x00ba,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x02c1,
-	0x02c6, 0x02d1,
-	0x02e0, 0x02e4,
-	0x02ec, 0x02ec,
-	0x02ee, 0x02ee,
-	0x0370, 0x0374,
-	0x0376, 0x0377,
-	0x037b, 0x037d,
-	0x037f, 0x037f,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x048a, 0x052f,
-	0x0531, 0x0556,
-	0x0559, 0x0559,
-	0x0561, 0x0587,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0620, 0x064a,
-	0x066e, 0x066f,
-	0x0671, 0x06d3,
-	0x06d5, 0x06d5,
-	0x06e5, 0x06e6,
-	0x06ee, 0x06ef,
-	0x06fa, 0x06fc,
-	0x06ff, 0x06ff,
-	0x0710, 0x0710,
-	0x0712, 0x072f,
-	0x074d, 0x07a5,
-	0x07b1, 0x07b1,
-	0x07ca, 0x07ea,
-	0x07f4, 0x07f5,
-	0x07fa, 0x07fa,
-	0x0800, 0x0815,
-	0x081a, 0x081a,
-	0x0824, 0x0824,
-	0x0828, 0x0828,
-	0x0840, 0x0858,
-	0x08a0, 0x08b4,
-	0x0904, 0x0939,
-	0x093d, 0x093d,
-	0x0950, 0x0950,
-	0x0958, 0x0961,
-	0x0971, 0x0980,
-	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,
-	0x0af9, 0x0af9,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c3d,
-	0x0c58, 0x0c5a,
-	0x0c60, 0x0c61,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbd, 0x0cbd,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce1,
-	0x0cf1, 0x0cf2,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d3d,
-	0x0d4e, 0x0d4e,
-	0x0d5f, 0x0d61,
-	0x0d7a, 0x0d7f,
-	0x0d85, 0x0d96,
-	0x0d9a, 0x0db1,
-	0x0db3, 0x0dbb,
-	0x0dbd, 0x0dbd,
-	0x0dc0, 0x0dc6,
-	0x0e01, 0x0e30,
-	0x0e32, 0x0e32,
-	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, 0x0eb2,
-	0x0ebd, 0x0ebd,
-	0x0ec0, 0x0ec4,
-	0x0ec6, 0x0ec6,
-	0x0edc, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f40, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f88, 0x0f8c,
-	0x1000, 0x102a,
-	0x103f, 0x103f,
-	0x1050, 0x1055,
-	0x105a, 0x105d,
-	0x1061, 0x1061,
-	0x1065, 0x1066,
-	0x106e, 0x1070,
-	0x1075, 0x1081,
-	0x108e, 0x108e,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 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, 0x13f5,
-	0x13f8, 0x13fd,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f8,
-	0x1700, 0x170c,
-	0x170e, 0x1711,
-	0x1720, 0x1731,
-	0x1740, 0x1751,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1780, 0x17b3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dc,
-	0x1820, 0x1877,
-	0x1880, 0x18a8,
-	0x18aa, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191e,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x1a00, 0x1a16,
-	0x1a20, 0x1a54,
-	0x1aa7, 0x1aa7,
-	0x1b05, 0x1b33,
-	0x1b45, 0x1b4b,
-	0x1b83, 0x1ba0,
-	0x1bae, 0x1baf,
-	0x1bba, 0x1be5,
-	0x1c00, 0x1c23,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c7d,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf1,
-	0x1cf5, 0x1cf6,
-	0x1d00, 0x1dbf,
-	0x1e00, 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, 0x209c,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2118, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2160, 0x2188,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2ce4,
-	0x2ceb, 0x2cee,
-	0x2cf2, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x3005, 0x3007,
-	0x3021, 0x3029,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x309d, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fd5,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa640, 0xa66e,
-	0xa67f, 0xa69d,
-	0xa6a0, 0xa6ef,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa7ad,
-	0xa7b0, 0xa7b7,
-	0xa7f7, 0xa801,
-	0xa803, 0xa805,
-	0xa807, 0xa80a,
-	0xa80c, 0xa822,
-	0xa840, 0xa873,
-	0xa882, 0xa8b3,
-	0xa8f2, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa8fd, 0xa8fd,
-	0xa90a, 0xa925,
-	0xa930, 0xa946,
-	0xa960, 0xa97c,
-	0xa984, 0xa9b2,
-	0xa9cf, 0xa9cf,
-	0xa9e0, 0xa9e4,
-	0xa9e6, 0xa9ef,
-	0xa9fa, 0xa9fe,
-	0xaa00, 0xaa28,
-	0xaa40, 0xaa42,
-	0xaa44, 0xaa4b,
-	0xaa60, 0xaa76,
-	0xaa7a, 0xaa7a,
-	0xaa7e, 0xaaaf,
-	0xaab1, 0xaab1,
-	0xaab5, 0xaab6,
-	0xaab9, 0xaabd,
-	0xaac0, 0xaac0,
-	0xaac2, 0xaac2,
-	0xaadb, 0xaadd,
-	0xaae0, 0xaaea,
-	0xaaf2, 0xaaf4,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xab30, 0xab5a,
-	0xab5c, 0xab65,
-	0xab70, 0xabe2,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb1d,
-	0xfb1f, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfc5d,
-	0xfc64, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdf9,
-	0xfe71, 0xfe71,
-	0xfe73, 0xfe73,
-	0xfe77, 0xfe77,
-	0xfe79, 0xfe79,
-	0xfe7b, 0xfe7b,
-	0xfe7d, 0xfe7d,
-	0xfe7f, 0xfefc,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0xff66, 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,
-	0x10140, 0x10174,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031f,
-	0x10330, 0x1034a,
-	0x10350, 0x10375,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10860, 0x10876,
-	0x10880, 0x1089e,
-	0x108e0, 0x108f2,
-	0x108f4, 0x108f5,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a00,
-	0x10a10, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10a80, 0x10a9c,
-	0x10ac0, 0x10ac7,
-	0x10ac9, 0x10ae4,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10b80, 0x10b91,
-	0x10c00, 0x10c48,
-	0x10c80, 0x10cb2,
-	0x10cc0, 0x10cf2,
-	0x11003, 0x11037,
-	0x11083, 0x110af,
-	0x110d0, 0x110e8,
-	0x11103, 0x11126,
-	0x11150, 0x11172,
-	0x11176, 0x11176,
-	0x11183, 0x111b2,
-	0x111c1, 0x111c4,
-	0x111da, 0x111da,
-	0x111dc, 0x111dc,
-	0x11200, 0x11211,
-	0x11213, 0x1122b,
-	0x11280, 0x11286,
-	0x11288, 0x11288,
-	0x1128a, 0x1128d,
-	0x1128f, 0x1129d,
-	0x1129f, 0x112a8,
-	0x112b0, 0x112de,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133d, 0x1133d,
-	0x11350, 0x11350,
-	0x1135d, 0x11361,
-	0x11480, 0x114af,
-	0x114c4, 0x114c5,
-	0x114c7, 0x114c7,
-	0x11580, 0x115ae,
-	0x115d8, 0x115db,
-	0x11600, 0x1162f,
-	0x11644, 0x11644,
-	0x11680, 0x116aa,
-	0x11700, 0x11719,
-	0x118a0, 0x118df,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x12000, 0x12399,
-	0x12400, 0x1246e,
-	0x12480, 0x12543,
-	0x13000, 0x1342e,
-	0x14400, 0x14646,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16ad0, 0x16aed,
-	0x16b00, 0x16b2f,
-	0x16b40, 0x16b43,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f50,
-	0x16f93, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	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, 0x1d7cb,
-	0x1e800, 0x1e8c4,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2b820, 0x2cea1,
-	0x2f800, 0x2fa1d,
-}; /* CR_XID_Start */
-
-/* 'XID_Continue': Derived Property */
-static const OnigCodePoint CR_XID_Continue[] = {
-	658,
-	0x0030, 0x0039,
-	0x0041, 0x005a,
-	0x005f, 0x005f,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00b5, 0x00b5,
-	0x00b7, 0x00b7,
-	0x00ba, 0x00ba,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x02c1,
-	0x02c6, 0x02d1,
-	0x02e0, 0x02e4,
-	0x02ec, 0x02ec,
-	0x02ee, 0x02ee,
-	0x0300, 0x0374,
-	0x0376, 0x0377,
-	0x037b, 0x037d,
-	0x037f, 0x037f,
-	0x0386, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x0483, 0x0487,
-	0x048a, 0x052f,
-	0x0531, 0x0556,
-	0x0559, 0x0559,
-	0x0561, 0x0587,
-	0x0591, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0610, 0x061a,
-	0x0620, 0x0669,
-	0x066e, 0x06d3,
-	0x06d5, 0x06dc,
-	0x06df, 0x06e8,
-	0x06ea, 0x06fc,
-	0x06ff, 0x06ff,
-	0x0710, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07f5,
-	0x07fa, 0x07fa,
-	0x0800, 0x082d,
-	0x0840, 0x085b,
-	0x08a0, 0x08b4,
-	0x08e3, 0x0963,
-	0x0966, 0x096f,
-	0x0971, 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,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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,
-	0x0af9, 0x0af9,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3c, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bef,
-	0x0c00, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c5a,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c81, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d01, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d5f, 0x0d63,
-	0x0d66, 0x0d6f,
-	0x0d7a, 0x0d7f,
-	0x0d82, 0x0d83,
-	0x0d85, 0x0d96,
-	0x0d9a, 0x0db1,
-	0x0db3, 0x0dbb,
-	0x0dbd, 0x0dbd,
-	0x0dc0, 0x0dc6,
-	0x0dca, 0x0dca,
-	0x0dcf, 0x0dd4,
-	0x0dd6, 0x0dd6,
-	0x0dd8, 0x0ddf,
-	0x0de6, 0x0def,
-	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, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f18, 0x0f19,
-	0x0f20, 0x0f29,
-	0x0f35, 0x0f35,
-	0x0f37, 0x0f37,
-	0x0f39, 0x0f39,
-	0x0f3e, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f84,
-	0x0f86, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fc6, 0x0fc6,
-	0x1000, 0x1049,
-	0x1050, 0x109d,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 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,
-	0x135d, 0x135f,
-	0x1369, 0x1371,
-	0x1380, 0x138f,
-	0x13a0, 0x13f5,
-	0x13f8, 0x13fd,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f8,
-	0x1700, 0x170c,
-	0x170e, 0x1714,
-	0x1720, 0x1734,
-	0x1740, 0x1753,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-	0x1780, 0x17d3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dd,
-	0x17e0, 0x17e9,
-	0x180b, 0x180d,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191e,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1946, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x1a00, 0x1a1b,
-	0x1a20, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa7, 0x1aa7,
-	0x1ab0, 0x1abd,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b59,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1bf3,
-	0x1c00, 0x1c37,
-	0x1c40, 0x1c49,
-	0x1c4d, 0x1c7d,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1cf6,
-	0x1cf8, 0x1cf9,
-	0x1d00, 0x1df5,
-	0x1dfc, 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,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 0x209c,
-	0x20d0, 0x20dc,
-	0x20e1, 0x20e1,
-	0x20e5, 0x20f0,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2118, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2160, 0x2188,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2ce4,
-	0x2ceb, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d6f,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2dff,
-	0x3005, 0x3007,
-	0x3021, 0x302f,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x3099, 0x309a,
-	0x309d, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fd5,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa62b,
-	0xa640, 0xa66f,
-	0xa674, 0xa67d,
-	0xa67f, 0xa6f1,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa7ad,
-	0xa7b0, 0xa7b7,
-	0xa7f7, 0xa827,
-	0xa840, 0xa873,
-	0xa880, 0xa8c4,
-	0xa8d0, 0xa8d9,
-	0xa8e0, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa8fd, 0xa8fd,
-	0xa900, 0xa92d,
-	0xa930, 0xa953,
-	0xa960, 0xa97c,
-	0xa980, 0xa9c0,
-	0xa9cf, 0xa9d9,
-	0xa9e0, 0xa9fe,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa60, 0xaa76,
-	0xaa7a, 0xaac2,
-	0xaadb, 0xaadd,
-	0xaae0, 0xaaef,
-	0xaaf2, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xab30, 0xab5a,
-	0xab5c, 0xab65,
-	0xab70, 0xabea,
-	0xabec, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfc5d,
-	0xfc64, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdf9,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe2f,
-	0xfe33, 0xfe34,
-	0xfe4d, 0xfe4f,
-	0xfe71, 0xfe71,
-	0xfe73, 0xfe73,
-	0xfe77, 0xfe77,
-	0xfe79, 0xfe79,
-	0xfe7b, 0xfe7b,
-	0xfe7d, 0xfe7d,
-	0xfe7f, 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,
-	0x10140, 0x10174,
-	0x101fd, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x102e0, 0x102e0,
-	0x10300, 0x1031f,
-	0x10330, 0x1034a,
-	0x10350, 0x1037a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10860, 0x10876,
-	0x10880, 0x1089e,
-	0x108e0, 0x108f2,
-	0x108f4, 0x108f5,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x10a60, 0x10a7c,
-	0x10a80, 0x10a9c,
-	0x10ac0, 0x10ac7,
-	0x10ac9, 0x10ae6,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10b80, 0x10b91,
-	0x10c00, 0x10c48,
-	0x10c80, 0x10cb2,
-	0x10cc0, 0x10cf2,
-	0x11000, 0x11046,
-	0x11066, 0x1106f,
-	0x1107f, 0x110ba,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x1113f,
-	0x11150, 0x11173,
-	0x11176, 0x11176,
-	0x11180, 0x111c4,
-	0x111ca, 0x111cc,
-	0x111d0, 0x111da,
-	0x111dc, 0x111dc,
-	0x11200, 0x11211,
-	0x11213, 0x11237,
-	0x11280, 0x11286,
-	0x11288, 0x11288,
-	0x1128a, 0x1128d,
-	0x1128f, 0x1129d,
-	0x1129f, 0x112a8,
-	0x112b0, 0x112ea,
-	0x112f0, 0x112f9,
-	0x11300, 0x11303,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133c, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134d,
-	0x11350, 0x11350,
-	0x11357, 0x11357,
-	0x1135d, 0x11363,
-	0x11366, 0x1136c,
-	0x11370, 0x11374,
-	0x11480, 0x114c5,
-	0x114c7, 0x114c7,
-	0x114d0, 0x114d9,
-	0x11580, 0x115b5,
-	0x115b8, 0x115c0,
-	0x115d8, 0x115dd,
-	0x11600, 0x11640,
-	0x11644, 0x11644,
-	0x11650, 0x11659,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x11700, 0x11719,
-	0x1171d, 0x1172b,
-	0x11730, 0x11739,
-	0x118a0, 0x118e9,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x12000, 0x12399,
-	0x12400, 0x1246e,
-	0x12480, 0x12543,
-	0x13000, 0x1342e,
-	0x14400, 0x14646,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16a60, 0x16a69,
-	0x16ad0, 0x16aed,
-	0x16af0, 0x16af4,
-	0x16b00, 0x16b36,
-	0x16b40, 0x16b43,
-	0x16b50, 0x16b59,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	0x1bc9d, 0x1bc9e,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1da00, 0x1da36,
-	0x1da3b, 0x1da6c,
-	0x1da75, 0x1da75,
-	0x1da84, 0x1da84,
-	0x1da9b, 0x1da9f,
-	0x1daa1, 0x1daaf,
-	0x1e800, 0x1e8c4,
-	0x1e8d0, 0x1e8d6,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2b820, 0x2cea1,
-	0x2f800, 0x2fa1d,
-	0xe0100, 0xe01ef,
-}; /* CR_XID_Continue */
-
-/* 'Default_Ignorable_Code_Point': Derived Property */
-static const OnigCodePoint CR_Default_Ignorable_Code_Point[] = {
-	17,
-	0x00ad, 0x00ad,
-	0x034f, 0x034f,
-	0x061c, 0x061c,
-	0x115f, 0x1160,
-	0x17b4, 0x17b5,
-	0x180b, 0x180e,
-	0x200b, 0x200f,
-	0x202a, 0x202e,
-	0x2060, 0x206f,
-	0x3164, 0x3164,
-	0xfe00, 0xfe0f,
-	0xfeff, 0xfeff,
-	0xffa0, 0xffa0,
-	0xfff0, 0xfff8,
-	0x1bca0, 0x1bca3,
-	0x1d173, 0x1d17a,
-	0xe0000, 0xe0fff,
-}; /* CR_Default_Ignorable_Code_Point */
-
-/* 'Grapheme_Extend': Derived Property */
-static const OnigCodePoint CR_Grapheme_Extend[] = {
-	283,
-	0x0300, 0x036f,
-	0x0483, 0x0489,
-	0x0591, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x0610, 0x061a,
-	0x064b, 0x065f,
-	0x0670, 0x0670,
-	0x06d6, 0x06dc,
-	0x06df, 0x06e4,
-	0x06e7, 0x06e8,
-	0x06ea, 0x06ed,
-	0x0711, 0x0711,
-	0x0730, 0x074a,
-	0x07a6, 0x07b0,
-	0x07eb, 0x07f3,
-	0x0816, 0x0819,
-	0x081b, 0x0823,
-	0x0825, 0x0827,
-	0x0829, 0x082d,
-	0x0859, 0x085b,
-	0x08e3, 0x0902,
-	0x093a, 0x093a,
-	0x093c, 0x093c,
-	0x0941, 0x0948,
-	0x094d, 0x094d,
-	0x0951, 0x0957,
-	0x0962, 0x0963,
-	0x0981, 0x0981,
-	0x09bc, 0x09bc,
-	0x09be, 0x09be,
-	0x09c1, 0x09c4,
-	0x09cd, 0x09cd,
-	0x09d7, 0x09d7,
-	0x09e2, 0x09e3,
-	0x0a01, 0x0a02,
-	0x0a3c, 0x0a3c,
-	0x0a41, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a70, 0x0a71,
-	0x0a75, 0x0a75,
-	0x0a81, 0x0a82,
-	0x0abc, 0x0abc,
-	0x0ac1, 0x0ac5,
-	0x0ac7, 0x0ac8,
-	0x0acd, 0x0acd,
-	0x0ae2, 0x0ae3,
-	0x0b01, 0x0b01,
-	0x0b3c, 0x0b3c,
-	0x0b3e, 0x0b3f,
-	0x0b41, 0x0b44,
-	0x0b4d, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b62, 0x0b63,
-	0x0b82, 0x0b82,
-	0x0bbe, 0x0bbe,
-	0x0bc0, 0x0bc0,
-	0x0bcd, 0x0bcd,
-	0x0bd7, 0x0bd7,
-	0x0c00, 0x0c00,
-	0x0c3e, 0x0c40,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c62, 0x0c63,
-	0x0c81, 0x0c81,
-	0x0cbc, 0x0cbc,
-	0x0cbf, 0x0cbf,
-	0x0cc2, 0x0cc2,
-	0x0cc6, 0x0cc6,
-	0x0ccc, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0ce2, 0x0ce3,
-	0x0d01, 0x0d01,
-	0x0d3e, 0x0d3e,
-	0x0d41, 0x0d44,
-	0x0d4d, 0x0d4d,
-	0x0d57, 0x0d57,
-	0x0d62, 0x0d63,
-	0x0dca, 0x0dca,
-	0x0dcf, 0x0dcf,
-	0x0dd2, 0x0dd4,
-	0x0dd6, 0x0dd6,
-	0x0ddf, 0x0ddf,
-	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,
-	0x0f8d, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fc6, 0x0fc6,
-	0x102d, 0x1030,
-	0x1032, 0x1037,
-	0x1039, 0x103a,
-	0x103d, 0x103e,
-	0x1058, 0x1059,
-	0x105e, 0x1060,
-	0x1071, 0x1074,
-	0x1082, 0x1082,
-	0x1085, 0x1086,
-	0x108d, 0x108d,
-	0x109d, 0x109d,
-	0x135d, 0x135f,
-	0x1712, 0x1714,
-	0x1732, 0x1734,
-	0x1752, 0x1753,
-	0x1772, 0x1773,
-	0x17b4, 0x17b5,
-	0x17b7, 0x17bd,
-	0x17c6, 0x17c6,
-	0x17c9, 0x17d3,
-	0x17dd, 0x17dd,
-	0x180b, 0x180d,
-	0x18a9, 0x18a9,
-	0x1920, 0x1922,
-	0x1927, 0x1928,
-	0x1932, 0x1932,
-	0x1939, 0x193b,
-	0x1a17, 0x1a18,
-	0x1a1b, 0x1a1b,
-	0x1a56, 0x1a56,
-	0x1a58, 0x1a5e,
-	0x1a60, 0x1a60,
-	0x1a62, 0x1a62,
-	0x1a65, 0x1a6c,
-	0x1a73, 0x1a7c,
-	0x1a7f, 0x1a7f,
-	0x1ab0, 0x1abe,
-	0x1b00, 0x1b03,
-	0x1b34, 0x1b34,
-	0x1b36, 0x1b3a,
-	0x1b3c, 0x1b3c,
-	0x1b42, 0x1b42,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1b81,
-	0x1ba2, 0x1ba5,
-	0x1ba8, 0x1ba9,
-	0x1bab, 0x1bad,
-	0x1be6, 0x1be6,
-	0x1be8, 0x1be9,
-	0x1bed, 0x1bed,
-	0x1bef, 0x1bf1,
-	0x1c2c, 0x1c33,
-	0x1c36, 0x1c37,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce0,
-	0x1ce2, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1cf4, 0x1cf4,
-	0x1cf8, 0x1cf9,
-	0x1dc0, 0x1df5,
-	0x1dfc, 0x1dff,
-	0x200c, 0x200d,
-	0x20d0, 0x20f0,
-	0x2cef, 0x2cf1,
-	0x2d7f, 0x2d7f,
-	0x2de0, 0x2dff,
-	0x302a, 0x302f,
-	0x3099, 0x309a,
-	0xa66f, 0xa672,
-	0xa674, 0xa67d,
-	0xa69e, 0xa69f,
-	0xa6f0, 0xa6f1,
-	0xa802, 0xa802,
-	0xa806, 0xa806,
-	0xa80b, 0xa80b,
-	0xa825, 0xa826,
-	0xa8c4, 0xa8c4,
-	0xa8e0, 0xa8f1,
-	0xa926, 0xa92d,
-	0xa947, 0xa951,
-	0xa980, 0xa982,
-	0xa9b3, 0xa9b3,
-	0xa9b6, 0xa9b9,
-	0xa9bc, 0xa9bc,
-	0xa9e5, 0xa9e5,
-	0xaa29, 0xaa2e,
-	0xaa31, 0xaa32,
-	0xaa35, 0xaa36,
-	0xaa43, 0xaa43,
-	0xaa4c, 0xaa4c,
-	0xaa7c, 0xaa7c,
-	0xaab0, 0xaab0,
-	0xaab2, 0xaab4,
-	0xaab7, 0xaab8,
-	0xaabe, 0xaabf,
-	0xaac1, 0xaac1,
-	0xaaec, 0xaaed,
-	0xaaf6, 0xaaf6,
-	0xabe5, 0xabe5,
-	0xabe8, 0xabe8,
-	0xabed, 0xabed,
-	0xfb1e, 0xfb1e,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe2f,
-	0xff9e, 0xff9f,
-	0x101fd, 0x101fd,
-	0x102e0, 0x102e0,
-	0x10376, 0x1037a,
-	0x10a01, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a0f,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x10ae5, 0x10ae6,
-	0x11001, 0x11001,
-	0x11038, 0x11046,
-	0x1107f, 0x11081,
-	0x110b3, 0x110b6,
-	0x110b9, 0x110ba,
-	0x11100, 0x11102,
-	0x11127, 0x1112b,
-	0x1112d, 0x11134,
-	0x11173, 0x11173,
-	0x11180, 0x11181,
-	0x111b6, 0x111be,
-	0x111ca, 0x111cc,
-	0x1122f, 0x11231,
-	0x11234, 0x11234,
-	0x11236, 0x11237,
-	0x112df, 0x112df,
-	0x112e3, 0x112ea,
-	0x11300, 0x11301,
-	0x1133c, 0x1133c,
-	0x1133e, 0x1133e,
-	0x11340, 0x11340,
-	0x11357, 0x11357,
-	0x11366, 0x1136c,
-	0x11370, 0x11374,
-	0x114b0, 0x114b0,
-	0x114b3, 0x114b8,
-	0x114ba, 0x114ba,
-	0x114bd, 0x114bd,
-	0x114bf, 0x114c0,
-	0x114c2, 0x114c3,
-	0x115af, 0x115af,
-	0x115b2, 0x115b5,
-	0x115bc, 0x115bd,
-	0x115bf, 0x115c0,
-	0x115dc, 0x115dd,
-	0x11633, 0x1163a,
-	0x1163d, 0x1163d,
-	0x1163f, 0x11640,
-	0x116ab, 0x116ab,
-	0x116ad, 0x116ad,
-	0x116b0, 0x116b5,
-	0x116b7, 0x116b7,
-	0x1171d, 0x1171f,
-	0x11722, 0x11725,
-	0x11727, 0x1172b,
-	0x16af0, 0x16af4,
-	0x16b30, 0x16b36,
-	0x16f8f, 0x16f92,
-	0x1bc9d, 0x1bc9e,
-	0x1d165, 0x1d165,
-	0x1d167, 0x1d169,
-	0x1d16e, 0x1d172,
-	0x1d17b, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-	0x1d242, 0x1d244,
-	0x1da00, 0x1da36,
-	0x1da3b, 0x1da6c,
-	0x1da75, 0x1da75,
-	0x1da84, 0x1da84,
-	0x1da9b, 0x1da9f,
-	0x1daa1, 0x1daaf,
-	0x1e8d0, 0x1e8d6,
-	0xe0100, 0xe01ef,
-}; /* CR_Grapheme_Extend */
-
-/* 'Grapheme_Base': Derived Property */
-static const OnigCodePoint CR_Grapheme_Base[] = {
-	743,
-	0x0020, 0x007e,
-	0x00a0, 0x00ac,
-	0x00ae, 0x02ff,
-	0x0370, 0x0377,
-	0x037a, 0x037f,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x0482,
-	0x048a, 0x052f,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x058d, 0x058f,
-	0x05be, 0x05be,
-	0x05c0, 0x05c0,
-	0x05c3, 0x05c3,
-	0x05c6, 0x05c6,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0606, 0x060f,
-	0x061b, 0x061b,
-	0x061e, 0x064a,
-	0x0660, 0x066f,
-	0x0671, 0x06d5,
-	0x06de, 0x06de,
-	0x06e5, 0x06e6,
-	0x06e9, 0x06e9,
-	0x06ee, 0x070d,
-	0x0710, 0x0710,
-	0x0712, 0x072f,
-	0x074d, 0x07a5,
-	0x07b1, 0x07b1,
-	0x07c0, 0x07ea,
-	0x07f4, 0x07fa,
-	0x0800, 0x0815,
-	0x081a, 0x081a,
-	0x0824, 0x0824,
-	0x0828, 0x0828,
-	0x0830, 0x083e,
-	0x0840, 0x0858,
-	0x085e, 0x085e,
-	0x08a0, 0x08b4,
-	0x0903, 0x0939,
-	0x093b, 0x093b,
-	0x093d, 0x0940,
-	0x0949, 0x094c,
-	0x094e, 0x0950,
-	0x0958, 0x0961,
-	0x0964, 0x0980,
-	0x0982, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bd, 0x09bd,
-	0x09bf, 0x09c0,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cc,
-	0x09ce, 0x09ce,
-	0x09dc, 0x09dd,
-	0x09df, 0x09e1,
-	0x09e6, 0x09fb,
-	0x0a03, 0x0a03,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3e, 0x0a40,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a6f,
-	0x0a72, 0x0a74,
-	0x0a83, 0x0a83,
-	0x0a85, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abd, 0x0ac0,
-	0x0ac9, 0x0ac9,
-	0x0acb, 0x0acc,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae1,
-	0x0ae6, 0x0af1,
-	0x0af9, 0x0af9,
-	0x0b02, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3d, 0x0b3d,
-	0x0b40, 0x0b40,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4c,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b61,
-	0x0b66, 0x0b77,
-	0x0b83, 0x0b83,
-	0x0b85, 0x0b8a,
-	0x0b8e, 0x0b90,
-	0x0b92, 0x0b95,
-	0x0b99, 0x0b9a,
-	0x0b9c, 0x0b9c,
-	0x0b9e, 0x0b9f,
-	0x0ba3, 0x0ba4,
-	0x0ba8, 0x0baa,
-	0x0bae, 0x0bb9,
-	0x0bbf, 0x0bbf,
-	0x0bc1, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcc,
-	0x0bd0, 0x0bd0,
-	0x0be6, 0x0bfa,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c3d,
-	0x0c41, 0x0c44,
-	0x0c58, 0x0c5a,
-	0x0c60, 0x0c61,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-	0x0c82, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbd, 0x0cbe,
-	0x0cc0, 0x0cc1,
-	0x0cc3, 0x0cc4,
-	0x0cc7, 0x0cc8,
-	0x0cca, 0x0ccb,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce1,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d3d,
-	0x0d3f, 0x0d40,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4c,
-	0x0d4e, 0x0d4e,
-	0x0d5f, 0x0d61,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
-	0x0d82, 0x0d83,
-	0x0d85, 0x0d96,
-	0x0d9a, 0x0db1,
-	0x0db3, 0x0dbb,
-	0x0dbd, 0x0dbd,
-	0x0dc0, 0x0dc6,
-	0x0dd0, 0x0dd1,
-	0x0dd8, 0x0dde,
-	0x0de6, 0x0def,
-	0x0df2, 0x0df4,
-	0x0e01, 0x0e30,
-	0x0e32, 0x0e33,
-	0x0e3f, 0x0e46,
-	0x0e4f, 0x0e5b,
-	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,
-	0x0ed0, 0x0ed9,
-	0x0edc, 0x0edf,
-	0x0f00, 0x0f17,
-	0x0f1a, 0x0f34,
-	0x0f36, 0x0f36,
-	0x0f38, 0x0f38,
-	0x0f3a, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f7f, 0x0f7f,
-	0x0f85, 0x0f85,
-	0x0f88, 0x0f8c,
-	0x0fbe, 0x0fc5,
-	0x0fc7, 0x0fcc,
-	0x0fce, 0x0fda,
-	0x1000, 0x102c,
-	0x1031, 0x1031,
-	0x1038, 0x1038,
-	0x103b, 0x103c,
-	0x103f, 0x1057,
-	0x105a, 0x105d,
-	0x1061, 0x1070,
-	0x1075, 0x1081,
-	0x1083, 0x1084,
-	0x1087, 0x108c,
-	0x108e, 0x109c,
-	0x109e, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 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,
-	0x1360, 0x137c,
-	0x1380, 0x1399,
-	0x13a0, 0x13f5,
-	0x13f8, 0x13fd,
-	0x1400, 0x169c,
-	0x16a0, 0x16f8,
-	0x1700, 0x170c,
-	0x170e, 0x1711,
-	0x1720, 0x1731,
-	0x1735, 0x1736,
-	0x1740, 0x1751,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1780, 0x17b3,
-	0x17b6, 0x17b6,
-	0x17be, 0x17c5,
-	0x17c7, 0x17c8,
-	0x17d4, 0x17dc,
-	0x17e0, 0x17e9,
-	0x17f0, 0x17f9,
-	0x1800, 0x180a,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18a8,
-	0x18aa, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191e,
-	0x1923, 0x1926,
-	0x1929, 0x192b,
-	0x1930, 0x1931,
-	0x1933, 0x1938,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a16,
-	0x1a19, 0x1a1a,
-	0x1a1e, 0x1a55,
-	0x1a57, 0x1a57,
-	0x1a61, 0x1a61,
-	0x1a63, 0x1a64,
-	0x1a6d, 0x1a72,
-	0x1a80, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-	0x1b04, 0x1b33,
-	0x1b35, 0x1b35,
-	0x1b3b, 0x1b3b,
-	0x1b3d, 0x1b41,
-	0x1b43, 0x1b4b,
-	0x1b50, 0x1b6a,
-	0x1b74, 0x1b7c,
-	0x1b82, 0x1ba1,
-	0x1ba6, 0x1ba7,
-	0x1baa, 0x1baa,
-	0x1bae, 0x1be5,
-	0x1be7, 0x1be7,
-	0x1bea, 0x1bec,
-	0x1bee, 0x1bee,
-	0x1bf2, 0x1bf3,
-	0x1bfc, 0x1c2b,
-	0x1c34, 0x1c35,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cc0, 0x1cc7,
-	0x1cd3, 0x1cd3,
-	0x1ce1, 0x1ce1,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf3,
-	0x1cf5, 0x1cf6,
-	0x1d00, 0x1dbf,
-	0x1e00, 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, 0x200a,
-	0x2010, 0x2027,
-	0x202f, 0x205f,
-	0x2070, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x209c,
-	0x20a0, 0x20be,
-	0x2100, 0x218b,
-	0x2190, 0x23fa,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x2b73,
-	0x2b76, 0x2b95,
-	0x2b98, 0x2bb9,
-	0x2bbd, 0x2bc8,
-	0x2bca, 0x2bd1,
-	0x2bec, 0x2bef,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cee,
-	0x2cf2, 0x2cf3,
-	0x2cf9, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d70,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2e00, 0x2e42,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x3029,
-	0x3030, 0x303f,
-	0x3041, 0x3096,
-	0x309b, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fd5,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa66e,
-	0xa673, 0xa673,
-	0xa67e, 0xa69d,
-	0xa6a0, 0xa6ef,
-	0xa6f2, 0xa6f7,
-	0xa700, 0xa7ad,
-	0xa7b0, 0xa7b7,
-	0xa7f7, 0xa801,
-	0xa803, 0xa805,
-	0xa807, 0xa80a,
-	0xa80c, 0xa824,
-	0xa827, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c3,
-	0xa8ce, 0xa8d9,
-	0xa8f2, 0xa8fd,
-	0xa900, 0xa925,
-	0xa92e, 0xa946,
-	0xa952, 0xa953,
-	0xa95f, 0xa97c,
-	0xa983, 0xa9b2,
-	0xa9b4, 0xa9b5,
-	0xa9ba, 0xa9bb,
-	0xa9bd, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9e4,
-	0xa9e6, 0xa9fe,
-	0xaa00, 0xaa28,
-	0xaa2f, 0xaa30,
-	0xaa33, 0xaa34,
-	0xaa40, 0xaa42,
-	0xaa44, 0xaa4b,
-	0xaa4d, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa7b,
-	0xaa7d, 0xaaaf,
-	0xaab1, 0xaab1,
-	0xaab5, 0xaab6,
-	0xaab9, 0xaabd,
-	0xaac0, 0xaac0,
-	0xaac2, 0xaac2,
-	0xaadb, 0xaaeb,
-	0xaaee, 0xaaf5,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xab30, 0xab65,
-	0xab70, 0xabe4,
-	0xabe6, 0xabe7,
-	0xabe9, 0xabec,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb1d,
-	0xfb1f, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbc1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfd,
-	0xfe10, 0xfe19,
-	0xfe30, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xff01, 0xff9d,
-	0xffa0, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfffc, 0xfffd,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018c,
-	0x10190, 0x1019b,
-	0x101a0, 0x101a0,
-	0x101d0, 0x101fc,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x102e1, 0x102fb,
-	0x10300, 0x10323,
-	0x10330, 0x1034a,
-	0x10350, 0x10375,
-	0x10380, 0x1039d,
-	0x1039f, 0x103c3,
-	0x103c8, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x1056f, 0x1056f,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10857, 0x1089e,
-	0x108a7, 0x108af,
-	0x108e0, 0x108f2,
-	0x108f4, 0x108f5,
-	0x108fb, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10980, 0x109b7,
-	0x109bc, 0x109cf,
-	0x109d2, 0x10a00,
-	0x10a10, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a40, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a9f,
-	0x10ac0, 0x10ae4,
-	0x10aeb, 0x10af6,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b91,
-	0x10b99, 0x10b9c,
-	0x10ba9, 0x10baf,
-	0x10c00, 0x10c48,
-	0x10c80, 0x10cb2,
-	0x10cc0, 0x10cf2,
-	0x10cfa, 0x10cff,
-	0x10e60, 0x10e7e,
-	0x11000, 0x11000,
-	0x11002, 0x11037,
-	0x11047, 0x1104d,
-	0x11052, 0x1106f,
-	0x11082, 0x110b2,
-	0x110b7, 0x110b8,
-	0x110bb, 0x110bc,
-	0x110be, 0x110c1,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11103, 0x11126,
-	0x1112c, 0x1112c,
-	0x11136, 0x11143,
-	0x11150, 0x11172,
-	0x11174, 0x11176,
-	0x11182, 0x111b5,
-	0x111bf, 0x111c9,
-	0x111cd, 0x111cd,
-	0x111d0, 0x111df,
-	0x111e1, 0x111f4,
-	0x11200, 0x11211,
-	0x11213, 0x1122e,
-	0x11232, 0x11233,
-	0x11235, 0x11235,
-	0x11238, 0x1123d,
-	0x11280, 0x11286,
-	0x11288, 0x11288,
-	0x1128a, 0x1128d,
-	0x1128f, 0x1129d,
-	0x1129f, 0x112a9,
-	0x112b0, 0x112de,
-	0x112e0, 0x112e2,
-	0x112f0, 0x112f9,
-	0x11302, 0x11303,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133d, 0x1133d,
-	0x1133f, 0x1133f,
-	0x11341, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134d,
-	0x11350, 0x11350,
-	0x1135d, 0x11363,
-	0x11480, 0x114af,
-	0x114b1, 0x114b2,
-	0x114b9, 0x114b9,
-	0x114bb, 0x114bc,
-	0x114be, 0x114be,
-	0x114c1, 0x114c1,
-	0x114c4, 0x114c7,
-	0x114d0, 0x114d9,
-	0x11580, 0x115ae,
-	0x115b0, 0x115b1,
-	0x115b8, 0x115bb,
-	0x115be, 0x115be,
-	0x115c1, 0x115db,
-	0x11600, 0x11632,
-	0x1163b, 0x1163c,
-	0x1163e, 0x1163e,
-	0x11641, 0x11644,
-	0x11650, 0x11659,
-	0x11680, 0x116aa,
-	0x116ac, 0x116ac,
-	0x116ae, 0x116af,
-	0x116b6, 0x116b6,
-	0x116c0, 0x116c9,
-	0x11700, 0x11719,
-	0x11720, 0x11721,
-	0x11726, 0x11726,
-	0x11730, 0x1173f,
-	0x118a0, 0x118f2,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x12000, 0x12399,
-	0x12400, 0x1246e,
-	0x12470, 0x12474,
-	0x12480, 0x12543,
-	0x13000, 0x1342e,
-	0x14400, 0x14646,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16a60, 0x16a69,
-	0x16a6e, 0x16a6f,
-	0x16ad0, 0x16aed,
-	0x16af5, 0x16af5,
-	0x16b00, 0x16b2f,
-	0x16b37, 0x16b45,
-	0x16b50, 0x16b59,
-	0x16b5b, 0x16b61,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f93, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	0x1bc9c, 0x1bc9c,
-	0x1bc9f, 0x1bc9f,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d164,
-	0x1d166, 0x1d166,
-	0x1d16a, 0x1d16d,
-	0x1d183, 0x1d184,
-	0x1d18c, 0x1d1a9,
-	0x1d1ae, 0x1d1e8,
-	0x1d200, 0x1d241,
-	0x1d245, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d9ff,
-	0x1da37, 0x1da3a,
-	0x1da6d, 0x1da74,
-	0x1da76, 0x1da83,
-	0x1da85, 0x1da8b,
-	0x1e800, 0x1e8c4,
-	0x1e8c7, 0x1e8cf,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0bf,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0f5,
-	0x1f100, 0x1f10c,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f579,
-	0x1f57b, 0x1f5a3,
-	0x1f5a5, 0x1f6d0,
-	0x1f6e0, 0x1f6ec,
-	0x1f6f0, 0x1f6f3,
-	0x1f700, 0x1f773,
-	0x1f780, 0x1f7d4,
-	0x1f800, 0x1f80b,
-	0x1f810, 0x1f847,
-	0x1f850, 0x1f859,
-	0x1f860, 0x1f887,
-	0x1f890, 0x1f8ad,
-	0x1f910, 0x1f918,
-	0x1f980, 0x1f984,
-	0x1f9c0, 0x1f9c0,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2b820, 0x2cea1,
-	0x2f800, 0x2fa1d,
-}; /* CR_Grapheme_Base */
-
-/* 'Grapheme_Link': Derived Property */
-static const OnigCodePoint CR_Grapheme_Link[] = {
-	41,
-	0x094d, 0x094d,
-	0x09cd, 0x09cd,
-	0x0a4d, 0x0a4d,
-	0x0acd, 0x0acd,
-	0x0b4d, 0x0b4d,
-	0x0bcd, 0x0bcd,
-	0x0c4d, 0x0c4d,
-	0x0ccd, 0x0ccd,
-	0x0d4d, 0x0d4d,
-	0x0dca, 0x0dca,
-	0x0e3a, 0x0e3a,
-	0x0f84, 0x0f84,
-	0x1039, 0x103a,
-	0x1714, 0x1714,
-	0x1734, 0x1734,
-	0x17d2, 0x17d2,
-	0x1a60, 0x1a60,
-	0x1b44, 0x1b44,
-	0x1baa, 0x1bab,
-	0x1bf2, 0x1bf3,
-	0x2d7f, 0x2d7f,
-	0xa806, 0xa806,
-	0xa8c4, 0xa8c4,
-	0xa953, 0xa953,
-	0xa9c0, 0xa9c0,
-	0xaaf6, 0xaaf6,
-	0xabed, 0xabed,
-	0x10a3f, 0x10a3f,
-	0x11046, 0x11046,
-	0x1107f, 0x1107f,
-	0x110b9, 0x110b9,
-	0x11133, 0x11134,
-	0x111c0, 0x111c0,
-	0x11235, 0x11235,
-	0x112ea, 0x112ea,
-	0x1134d, 0x1134d,
-	0x114c2, 0x114c2,
-	0x115bf, 0x115bf,
-	0x1163f, 0x1163f,
-	0x116b6, 0x116b6,
-	0x1172b, 0x1172b,
-}; /* CR_Grapheme_Link */
-
-/* 'Common': Script */
-static const OnigCodePoint CR_Common[] = {
-	161,
-	0x0000, 0x0040,
-	0x005b, 0x0060,
-	0x007b, 0x00a9,
-	0x00ab, 0x00b9,
-	0x00bb, 0x00bf,
-	0x00d7, 0x00d7,
-	0x00f7, 0x00f7,
-	0x02b9, 0x02df,
-	0x02e5, 0x02e9,
-	0x02ec, 0x02ff,
-	0x0374, 0x0374,
-	0x037e, 0x037e,
-	0x0385, 0x0385,
-	0x0387, 0x0387,
-	0x0589, 0x0589,
-	0x0605, 0x0605,
-	0x060c, 0x060c,
-	0x061b, 0x061c,
-	0x061f, 0x061f,
-	0x0640, 0x0640,
-	0x06dd, 0x06dd,
-	0x0964, 0x0965,
-	0x0e3f, 0x0e3f,
-	0x0fd5, 0x0fd8,
-	0x10fb, 0x10fb,
-	0x16eb, 0x16ed,
-	0x1735, 0x1736,
-	0x1802, 0x1803,
-	0x1805, 0x1805,
-	0x1cd3, 0x1cd3,
-	0x1ce1, 0x1ce1,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf3,
-	0x1cf5, 0x1cf6,
-	0x2000, 0x200b,
-	0x200e, 0x2064,
-	0x2066, 0x2070,
-	0x2074, 0x207e,
-	0x2080, 0x208e,
-	0x20a0, 0x20be,
-	0x2100, 0x2125,
-	0x2127, 0x2129,
-	0x212c, 0x2131,
-	0x2133, 0x214d,
-	0x214f, 0x215f,
-	0x2189, 0x218b,
-	0x2190, 0x23fa,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x27ff,
-	0x2900, 0x2b73,
-	0x2b76, 0x2b95,
-	0x2b98, 0x2bb9,
-	0x2bbd, 0x2bc8,
-	0x2bca, 0x2bd1,
-	0x2bec, 0x2bef,
-	0x2e00, 0x2e42,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x3004,
-	0x3006, 0x3006,
-	0x3008, 0x3020,
-	0x3030, 0x3037,
-	0x303c, 0x303f,
-	0x309b, 0x309c,
-	0x30a0, 0x30a0,
-	0x30fb, 0x30fc,
-	0x3190, 0x319f,
-	0x31c0, 0x31e3,
-	0x3220, 0x325f,
-	0x327f, 0x32cf,
-	0x3358, 0x33ff,
-	0x4dc0, 0x4dff,
-	0xa700, 0xa721,
-	0xa788, 0xa78a,
-	0xa830, 0xa839,
-	0xa92e, 0xa92e,
-	0xa9cf, 0xa9cf,
-	0xab5b, 0xab5b,
-	0xfd3e, 0xfd3f,
-	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,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fc,
-	0x102e1, 0x102fb,
-	0x1bca0, 0x1bca3,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d166,
-	0x1d16a, 0x1d17a,
-	0x1d183, 0x1d184,
-	0x1d18c, 0x1d1a9,
-	0x1d1ae, 0x1d1e8,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0bf,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0f5,
-	0x1f100, 0x1f10c,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f1ff,
-	0x1f201, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f579,
-	0x1f57b, 0x1f5a3,
-	0x1f5a5, 0x1f6d0,
-	0x1f6e0, 0x1f6ec,
-	0x1f6f0, 0x1f6f3,
-	0x1f700, 0x1f773,
-	0x1f780, 0x1f7d4,
-	0x1f800, 0x1f80b,
-	0x1f810, 0x1f847,
-	0x1f850, 0x1f859,
-	0x1f860, 0x1f887,
-	0x1f890, 0x1f8ad,
-	0x1f910, 0x1f918,
-	0x1f980, 0x1f984,
-	0x1f9c0, 0x1f9c0,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-}; /* CR_Common */
-
-/* 'Latin': Script */
-static const OnigCodePoint CR_Latin[] = {
-	31,
-	0x0041, 0x005a,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00ba, 0x00ba,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x02b8,
-	0x02e0, 0x02e4,
-	0x1d00, 0x1d25,
-	0x1d2c, 0x1d5c,
-	0x1d62, 0x1d65,
-	0x1d6b, 0x1d77,
-	0x1d79, 0x1dbe,
-	0x1e00, 0x1eff,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 0x209c,
-	0x212a, 0x212b,
-	0x2132, 0x2132,
-	0x214e, 0x214e,
-	0x2160, 0x2188,
-	0x2c60, 0x2c7f,
-	0xa722, 0xa787,
-	0xa78b, 0xa7ad,
-	0xa7b0, 0xa7b7,
-	0xa7f7, 0xa7ff,
-	0xab30, 0xab5a,
-	0xab5c, 0xab64,
-	0xfb00, 0xfb06,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-}; /* CR_Latin */
-
-/* 'Greek': Script */
-static const OnigCodePoint CR_Greek[] = {
-	36,
-	0x0370, 0x0373,
-	0x0375, 0x0377,
-	0x037a, 0x037d,
-	0x037f, 0x037f,
-	0x0384, 0x0384,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03e1,
-	0x03f0, 0x03ff,
-	0x1d26, 0x1d2a,
-	0x1d5d, 0x1d61,
-	0x1d66, 0x1d6a,
-	0x1dbf, 0x1dbf,
-	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,
-	0xab65, 0xab65,
-	0x10140, 0x1018c,
-	0x101a0, 0x101a0,
-	0x1d200, 0x1d245,
-}; /* CR_Greek */
-
-/* 'Cyrillic': Script */
-static const OnigCodePoint CR_Cyrillic[] = {
-	7,
-	0x0400, 0x0484,
-	0x0487, 0x052f,
-	0x1d2b, 0x1d2b,
-	0x1d78, 0x1d78,
-	0x2de0, 0x2dff,
-	0xa640, 0xa69f,
-	0xfe2e, 0xfe2f,
-}; /* CR_Cyrillic */
-
-/* 'Armenian': Script */
-static const OnigCodePoint CR_Armenian[] = {
-	6,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x058a, 0x058a,
-	0x058d, 0x058f,
-	0xfb13, 0xfb17,
-}; /* CR_Armenian */
-
-/* 'Hebrew': Script */
-static const OnigCodePoint CR_Hebrew[] = {
-	9,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfb4f,
-}; /* CR_Hebrew */
-
-/* 'Arabic': Script */
-static const OnigCodePoint CR_Arabic[] = {
-	54,
-	0x0600, 0x0604,
-	0x0606, 0x060b,
-	0x060d, 0x061a,
-	0x061e, 0x061e,
-	0x0620, 0x063f,
-	0x0641, 0x064a,
-	0x0656, 0x066f,
-	0x0671, 0x06dc,
-	0x06de, 0x06ff,
-	0x0750, 0x077f,
-	0x08a0, 0x08b4,
-	0x08e3, 0x08ff,
-	0xfb50, 0xfbc1,
-	0xfbd3, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfd,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0x10e60, 0x10e7e,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-}; /* CR_Arabic */
-
-/* 'Syriac': Script */
-static const OnigCodePoint CR_Syriac[] = {
-	3,
-	0x0700, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x074f,
-}; /* CR_Syriac */
-
-/* 'Thaana': Script */
-static const OnigCodePoint CR_Thaana[] = {
-	1,
-	0x0780, 0x07b1,
-}; /* CR_Thaana */
-
-/* 'Devanagari': Script */
-static const OnigCodePoint CR_Devanagari[] = {
-	4,
-	0x0900, 0x0950,
-	0x0953, 0x0963,
-	0x0966, 0x097f,
-	0xa8e0, 0xa8fd,
-}; /* CR_Devanagari */
-
-/* 'Bengali': Script */
-static const OnigCodePoint CR_Bengali[] = {
-	14,
-	0x0980, 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, 0x09fb,
-}; /* CR_Bengali */
-
-/* 'Gurmukhi': Script */
-static const OnigCodePoint CR_Gurmukhi[] = {
-	16,
-	0x0a01, 0x0a03,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-}; /* CR_Gurmukhi */
-
-/* '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, 0x0af1,
-	0x0af9, 0x0af9,
-}; /* CR_Gujarati */
-
-/* 'Oriya': Script */
-static const OnigCodePoint CR_Oriya[] = {
-	14,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3c, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	0x0b66, 0x0b77,
-}; /* CR_Oriya */
-
-/* 'Tamil': Script */
-static const OnigCodePoint CR_Tamil[] = {
-	16,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bfa,
-}; /* CR_Tamil */
-
-/* 'Telugu': Script */
-static const OnigCodePoint CR_Telugu[] = {
-	13,
-	0x0c00, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c5a,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-}; /* CR_Telugu */
-
-/* 'Kannada': Script */
-static const OnigCodePoint CR_Kannada[] = {
-	14,
-	0x0c81, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-}; /* CR_Kannada */
-
-/* 'Malayalam': Script */
-static const OnigCodePoint CR_Malayalam[] = {
-	11,
-	0x0d01, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d5f, 0x0d63,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
-}; /* CR_Malayalam */
-
-/* 'Sinhala': Script */
-static const OnigCodePoint CR_Sinhala[] = {
-	13,
-	0x0d82, 0x0d83,
-	0x0d85, 0x0d96,
-	0x0d9a, 0x0db1,
-	0x0db3, 0x0dbb,
-	0x0dbd, 0x0dbd,
-	0x0dc0, 0x0dc6,
-	0x0dca, 0x0dca,
-	0x0dcf, 0x0dd4,
-	0x0dd6, 0x0dd6,
-	0x0dd8, 0x0ddf,
-	0x0de6, 0x0def,
-	0x0df2, 0x0df4,
-	0x111e1, 0x111f4,
-}; /* CR_Sinhala */
-
-/* 'Thai': Script */
-static const OnigCodePoint CR_Thai[] = {
-	2,
-	0x0e01, 0x0e3a,
-	0x0e40, 0x0e5b,
-}; /* CR_Thai */
-
-/* '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, 0x0edf,
-}; /* CR_Lao */
-
-/* 'Tibetan': Script */
-static const OnigCodePoint CR_Tibetan[] = {
-	7,
-	0x0f00, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fd4,
-	0x0fd9, 0x0fda,
-}; /* CR_Tibetan */
-
-/* 'Myanmar': Script */
-static const OnigCodePoint CR_Myanmar[] = {
-	3,
-	0x1000, 0x109f,
-	0xa9e0, 0xa9fe,
-	0xaa60, 0xaa7f,
-}; /* CR_Myanmar */
-
-/* 'Georgian': Script */
-static const OnigCodePoint CR_Georgian[] = {
-	8,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 0x10ff,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-}; /* CR_Georgian */
-
-/* 'Hangul': Script */
-static const OnigCodePoint CR_Hangul[] = {
-	14,
-	0x1100, 0x11ff,
-	0x302e, 0x302f,
-	0x3131, 0x318e,
-	0x3200, 0x321e,
-	0x3260, 0x327e,
-	0xa960, 0xa97c,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xffa0, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-}; /* CR_Hangul */
-
-/* 'Ethiopic': Script */
-static const OnigCodePoint CR_Ethiopic[] = {
-	32,
-	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,
-	0x135d, 0x137c,
-	0x1380, 0x1399,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-}; /* CR_Ethiopic */
-
-/* 'Cherokee': Script */
-static const OnigCodePoint CR_Cherokee[] = {
-	3,
-	0x13a0, 0x13f5,
-	0x13f8, 0x13fd,
-	0xab70, 0xabbf,
-}; /* CR_Cherokee */
-
-/* 'Canadian_Aboriginal': Script */
-static const OnigCodePoint CR_Canadian_Aboriginal[] = {
-	2,
-	0x1400, 0x167f,
-	0x18b0, 0x18f5,
-}; /* CR_Canadian_Aboriginal */
-
-/* 'Ogham': Script */
-static const OnigCodePoint CR_Ogham[] = {
-	1,
-	0x1680, 0x169c,
-}; /* CR_Ogham */
-
-/* 'Runic': Script */
-static const OnigCodePoint CR_Runic[] = {
-	2,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f8,
-}; /* CR_Runic */
-
-/* 'Khmer': Script */
-static const OnigCodePoint CR_Khmer[] = {
-	4,
-	0x1780, 0x17dd,
-	0x17e0, 0x17e9,
-	0x17f0, 0x17f9,
-	0x19e0, 0x19ff,
-}; /* CR_Khmer */
-
-/* 'Mongolian': Script */
-static const OnigCodePoint CR_Mongolian[] = {
-	6,
-	0x1800, 0x1801,
-	0x1804, 0x1804,
-	0x1806, 0x180e,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-}; /* CR_Mongolian */
-
-/* 'Hiragana': Script */
-static const OnigCodePoint CR_Hiragana[] = {
-	4,
-	0x3041, 0x3096,
-	0x309d, 0x309f,
-	0x1b001, 0x1b001,
-	0x1f200, 0x1f200,
-}; /* CR_Hiragana */
-
-/* 'Katakana': Script */
-static const OnigCodePoint CR_Katakana[] = {
-	8,
-	0x30a1, 0x30fa,
-	0x30fd, 0x30ff,
-	0x31f0, 0x31ff,
-	0x32d0, 0x32fe,
-	0x3300, 0x3357,
-	0xff66, 0xff6f,
-	0xff71, 0xff9d,
-	0x1b000, 0x1b000,
-}; /* CR_Katakana */
-
-/* 'Bopomofo': Script */
-static const OnigCodePoint CR_Bopomofo[] = {
-	3,
-	0x02ea, 0x02eb,
-	0x3105, 0x312d,
-	0x31a0, 0x31ba,
-}; /* CR_Bopomofo */
-
-/* 'Han': Script */
-static const OnigCodePoint CR_Han[] = {
-	16,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x3005, 0x3005,
-	0x3007, 0x3007,
-	0x3021, 0x3029,
-	0x3038, 0x303b,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fd5,
-	0xf900, 0xfa6d,
-	0xfa70, 0xfad9,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2b820, 0x2cea1,
-	0x2f800, 0x2fa1d,
-}; /* CR_Han */
-
-/* 'Yi': Script */
-static const OnigCodePoint CR_Yi[] = {
-	2,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-}; /* CR_Yi */
-
-/* 'Old_Italic': Script */
-static const OnigCodePoint CR_Old_Italic[] = {
-	1,
-	0x10300, 0x10323,
-}; /* CR_Old_Italic */
-
-/* 'Gothic': Script */
-static const OnigCodePoint CR_Gothic[] = {
-	1,
-	0x10330, 0x1034a,
-}; /* CR_Gothic */
-
-/* 'Deseret': Script */
-static const OnigCodePoint CR_Deseret[] = {
-	1,
-	0x10400, 0x1044f,
-}; /* CR_Deseret */
-
-/* 'Inherited': Script */
-static const OnigCodePoint CR_Inherited[] = {
-	27,
-	0x0300, 0x036f,
-	0x0485, 0x0486,
-	0x064b, 0x0655,
-	0x0670, 0x0670,
-	0x0951, 0x0952,
-	0x1ab0, 0x1abe,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce0,
-	0x1ce2, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1cf4, 0x1cf4,
-	0x1cf8, 0x1cf9,
-	0x1dc0, 0x1df5,
-	0x1dfc, 0x1dff,
-	0x200c, 0x200d,
-	0x20d0, 0x20f0,
-	0x302a, 0x302d,
-	0x3099, 0x309a,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe2d,
-	0x101fd, 0x101fd,
-	0x102e0, 0x102e0,
-	0x1d167, 0x1d169,
-	0x1d17b, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-	0xe0100, 0xe01ef,
-}; /* CR_Inherited */
-
-/* 'Tagalog': Script */
-static const OnigCodePoint CR_Tagalog[] = {
-	2,
-	0x1700, 0x170c,
-	0x170e, 0x1714,
-}; /* CR_Tagalog */
-
-/* 'Hanunoo': Script */
-static const OnigCodePoint CR_Hanunoo[] = {
-	1,
-	0x1720, 0x1734,
-}; /* CR_Hanunoo */
-
-/* 'Buhid': Script */
-static const OnigCodePoint CR_Buhid[] = {
-	1,
-	0x1740, 0x1753,
-}; /* CR_Buhid */
-
-/* 'Tagbanwa': Script */
-static const OnigCodePoint CR_Tagbanwa[] = {
-	3,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-}; /* CR_Tagbanwa */
-
-/* 'Limbu': Script */
-static const OnigCodePoint CR_Limbu[] = {
-	5,
-	0x1900, 0x191e,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x194f,
-}; /* CR_Limbu */
-
-/* 'Tai_Le': Script */
-static const OnigCodePoint CR_Tai_Le[] = {
-	2,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-}; /* CR_Tai_Le */
-
-/* '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 */
-
-/* 'Ugaritic': Script */
-static const OnigCodePoint CR_Ugaritic[] = {
-	2,
-	0x10380, 0x1039d,
-	0x1039f, 0x1039f,
-}; /* CR_Ugaritic */
-
-/* 'Shavian': Script */
-static const OnigCodePoint CR_Shavian[] = {
-	1,
-	0x10450, 0x1047f,
-}; /* CR_Shavian */
-
-/* 'Osmanya': Script */
-static const OnigCodePoint CR_Osmanya[] = {
-	2,
-	0x10480, 0x1049d,
-	0x104a0, 0x104a9,
-}; /* CR_Osmanya */
-
-/* 'Cypriot': Script */
-static const OnigCodePoint CR_Cypriot[] = {
-	6,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x1083f,
-}; /* CR_Cypriot */
-
-/* '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 */
-
-/* 'Coptic': Script */
-static const OnigCodePoint CR_Coptic[] = {
-	3,
-	0x03e2, 0x03ef,
-	0x2c80, 0x2cf3,
-	0x2cf9, 0x2cff,
-}; /* CR_Coptic */
-
-/* 'New_Tai_Lue': Script */
-static const OnigCodePoint CR_New_Tai_Lue[] = {
-	4,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x19df,
-}; /* CR_New_Tai_Lue */
-
-/* 'Glagolitic': Script */
-static const OnigCodePoint CR_Glagolitic[] = {
-	2,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-}; /* CR_Glagolitic */
-
-/* 'Tifinagh': Script */
-static const OnigCodePoint CR_Tifinagh[] = {
-	3,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d70,
-	0x2d7f, 0x2d7f,
-}; /* CR_Tifinagh */
-
-/* 'Syloti_Nagri': Script */
-static const OnigCodePoint CR_Syloti_Nagri[] = {
-	1,
-	0xa800, 0xa82b,
-}; /* CR_Syloti_Nagri */
-
-/* 'Old_Persian': Script */
-static const OnigCodePoint CR_Old_Persian[] = {
-	2,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103d5,
-}; /* CR_Old_Persian */
-
-/* '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 */
-
-/* 'Balinese': Script */
-static const OnigCodePoint CR_Balinese[] = {
-	2,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-}; /* CR_Balinese */
-
-/* 'Cuneiform': Script */
-static const OnigCodePoint CR_Cuneiform[] = {
-	4,
-	0x12000, 0x12399,
-	0x12400, 0x1246e,
-	0x12470, 0x12474,
-	0x12480, 0x12543,
-}; /* CR_Cuneiform */
-
-/* 'Phoenician': Script */
-static const OnigCodePoint CR_Phoenician[] = {
-	2,
-	0x10900, 0x1091b,
-	0x1091f, 0x1091f,
-}; /* CR_Phoenician */
-
-/* 'Phags_Pa': Script */
-static const OnigCodePoint CR_Phags_Pa[] = {
-	1,
-	0xa840, 0xa877,
-}; /* CR_Phags_Pa */
-
-/* 'Nko': Script */
-static const OnigCodePoint CR_Nko[] = {
-	1,
-	0x07c0, 0x07fa,
-}; /* CR_Nko */
-
-/* 'Sundanese': Script */
-static const OnigCodePoint CR_Sundanese[] = {
-	2,
-	0x1b80, 0x1bbf,
-	0x1cc0, 0x1cc7,
-}; /* CR_Sundanese */
-
-/* 'Lepcha': Script */
-static const OnigCodePoint CR_Lepcha[] = {
-	3,
-	0x1c00, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c4f,
-}; /* CR_Lepcha */
-
-/* 'Ol_Chiki': Script */
-static const OnigCodePoint CR_Ol_Chiki[] = {
-	1,
-	0x1c50, 0x1c7f,
-}; /* CR_Ol_Chiki */
-
-/* 'Vai': Script */
-static const OnigCodePoint CR_Vai[] = {
-	1,
-	0xa500, 0xa62b,
-}; /* CR_Vai */
-
-/* 'Saurashtra': Script */
-static const OnigCodePoint CR_Saurashtra[] = {
-	2,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-}; /* CR_Saurashtra */
-
-/* 'Kayah_Li': Script */
-static const OnigCodePoint CR_Kayah_Li[] = {
-	2,
-	0xa900, 0xa92d,
-	0xa92f, 0xa92f,
-}; /* CR_Kayah_Li */
-
-/* 'Rejang': Script */
-static const OnigCodePoint CR_Rejang[] = {
-	2,
-	0xa930, 0xa953,
-	0xa95f, 0xa95f,
-}; /* CR_Rejang */
-
-/* 'Lycian': Script */
-static const OnigCodePoint CR_Lycian[] = {
-	1,
-	0x10280, 0x1029c,
-}; /* CR_Lycian */
-
-/* 'Carian': Script */
-static const OnigCodePoint CR_Carian[] = {
-	1,
-	0x102a0, 0x102d0,
-}; /* CR_Carian */
-
-/* 'Lydian': Script */
-static const OnigCodePoint CR_Lydian[] = {
-	2,
-	0x10920, 0x10939,
-	0x1093f, 0x1093f,
-}; /* CR_Lydian */
-
-/* 'Cham': Script */
-static const OnigCodePoint CR_Cham[] = {
-	4,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa5f,
-}; /* CR_Cham */
-
-/* 'Tai_Tham': Script */
-static const OnigCodePoint CR_Tai_Tham[] = {
-	5,
-	0x1a20, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-}; /* CR_Tai_Tham */
-
-/* 'Tai_Viet': Script */
-static const OnigCodePoint CR_Tai_Viet[] = {
-	2,
-	0xaa80, 0xaac2,
-	0xaadb, 0xaadf,
-}; /* CR_Tai_Viet */
-
-/* 'Avestan': Script */
-static const OnigCodePoint CR_Avestan[] = {
-	2,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b3f,
-}; /* CR_Avestan */
-
-/* 'Egyptian_Hieroglyphs': Script */
-static const OnigCodePoint CR_Egyptian_Hieroglyphs[] = {
-	1,
-	0x13000, 0x1342e,
-}; /* CR_Egyptian_Hieroglyphs */
-
-/* 'Samaritan': Script */
-static const OnigCodePoint CR_Samaritan[] = {
-	2,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-}; /* CR_Samaritan */
-
-/* 'Lisu': Script */
-static const OnigCodePoint CR_Lisu[] = {
-	1,
-	0xa4d0, 0xa4ff,
-}; /* CR_Lisu */
-
-/* 'Bamum': Script */
-static const OnigCodePoint CR_Bamum[] = {
-	2,
-	0xa6a0, 0xa6f7,
-	0x16800, 0x16a38,
-}; /* CR_Bamum */
-
-/* 'Javanese': Script */
-static const OnigCodePoint CR_Javanese[] = {
-	3,
-	0xa980, 0xa9cd,
-	0xa9d0, 0xa9d9,
-	0xa9de, 0xa9df,
-}; /* CR_Javanese */
-
-/* 'Meetei_Mayek': Script */
-static const OnigCodePoint CR_Meetei_Mayek[] = {
-	3,
-	0xaae0, 0xaaf6,
-	0xabc0, 0xabed,
-	0xabf0, 0xabf9,
-}; /* CR_Meetei_Mayek */
-
-/* 'Imperial_Aramaic': Script */
-static const OnigCodePoint CR_Imperial_Aramaic[] = {
-	2,
-	0x10840, 0x10855,
-	0x10857, 0x1085f,
-}; /* CR_Imperial_Aramaic */
-
-/* 'Old_South_Arabian': Script */
-static const OnigCodePoint CR_Old_South_Arabian[] = {
-	1,
-	0x10a60, 0x10a7f,
-}; /* CR_Old_South_Arabian */
-
-/* 'Inscriptional_Parthian': Script */
-static const OnigCodePoint CR_Inscriptional_Parthian[] = {
-	2,
-	0x10b40, 0x10b55,
-	0x10b58, 0x10b5f,
-}; /* CR_Inscriptional_Parthian */
-
-/* 'Inscriptional_Pahlavi': Script */
-static const OnigCodePoint CR_Inscriptional_Pahlavi[] = {
-	2,
-	0x10b60, 0x10b72,
-	0x10b78, 0x10b7f,
-}; /* CR_Inscriptional_Pahlavi */
-
-/* 'Old_Turkic': Script */
-static const OnigCodePoint CR_Old_Turkic[] = {
-	1,
-	0x10c00, 0x10c48,
-}; /* CR_Old_Turkic */
-
-/* 'Kaithi': Script */
-static const OnigCodePoint CR_Kaithi[] = {
-	1,
-	0x11080, 0x110c1,
-}; /* CR_Kaithi */
-
-/* 'Batak': Script */
-static const OnigCodePoint CR_Batak[] = {
-	2,
-	0x1bc0, 0x1bf3,
-	0x1bfc, 0x1bff,
-}; /* CR_Batak */
-
-/* 'Brahmi': Script */
-static const OnigCodePoint CR_Brahmi[] = {
-	3,
-	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-	0x1107f, 0x1107f,
-}; /* CR_Brahmi */
-
-/* 'Mandaic': Script */
-static const OnigCodePoint CR_Mandaic[] = {
-	2,
-	0x0840, 0x085b,
-	0x085e, 0x085e,
-}; /* CR_Mandaic */
-
-/* 'Chakma': Script */
-static const OnigCodePoint CR_Chakma[] = {
-	2,
-	0x11100, 0x11134,
-	0x11136, 0x11143,
-}; /* CR_Chakma */
-
-/* 'Meroitic_Cursive': Script */
-static const OnigCodePoint CR_Meroitic_Cursive[] = {
-	3,
-	0x109a0, 0x109b7,
-	0x109bc, 0x109cf,
-	0x109d2, 0x109ff,
-}; /* CR_Meroitic_Cursive */
-
-/* 'Meroitic_Hieroglyphs': Script */
-static const OnigCodePoint CR_Meroitic_Hieroglyphs[] = {
-	1,
-	0x10980, 0x1099f,
-}; /* CR_Meroitic_Hieroglyphs */
-
-/* 'Miao': Script */
-static const OnigCodePoint CR_Miao[] = {
-	3,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-}; /* CR_Miao */
-
-/* 'Sharada': Script */
-static const OnigCodePoint CR_Sharada[] = {
-	2,
-	0x11180, 0x111cd,
-	0x111d0, 0x111df,
-}; /* CR_Sharada */
-
-/* 'Sora_Sompeng': Script */
-static const OnigCodePoint CR_Sora_Sompeng[] = {
-	2,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-}; /* CR_Sora_Sompeng */
-
-/* 'Takri': Script */
-static const OnigCodePoint CR_Takri[] = {
-	2,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-}; /* CR_Takri */
-
-/* 'Caucasian_Albanian': Script */
-static const OnigCodePoint CR_Caucasian_Albanian[] = {
-	2,
-	0x10530, 0x10563,
-	0x1056f, 0x1056f,
-}; /* CR_Caucasian_Albanian */
-
-/* 'Bassa_Vah': Script */
-static const OnigCodePoint CR_Bassa_Vah[] = {
-	2,
-	0x16ad0, 0x16aed,
-	0x16af0, 0x16af5,
-}; /* CR_Bassa_Vah */
-
-/* 'Duployan': Script */
-static const OnigCodePoint CR_Duployan[] = {
-	5,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	0x1bc9c, 0x1bc9f,
-}; /* CR_Duployan */
-
-/* 'Elbasan': Script */
-static const OnigCodePoint CR_Elbasan[] = {
-	1,
-	0x10500, 0x10527,
-}; /* CR_Elbasan */
-
-/* 'Grantha': Script */
-static const OnigCodePoint CR_Grantha[] = {
-	15,
-	0x11300, 0x11303,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133c, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134d,
-	0x11350, 0x11350,
-	0x11357, 0x11357,
-	0x1135d, 0x11363,
-	0x11366, 0x1136c,
-	0x11370, 0x11374,
-}; /* CR_Grantha */
-
-/* 'Pahawh_Hmong': Script */
-static const OnigCodePoint CR_Pahawh_Hmong[] = {
-	5,
-	0x16b00, 0x16b45,
-	0x16b50, 0x16b59,
-	0x16b5b, 0x16b61,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-}; /* CR_Pahawh_Hmong */
-
-/* 'Khojki': Script */
-static const OnigCodePoint CR_Khojki[] = {
-	2,
-	0x11200, 0x11211,
-	0x11213, 0x1123d,
-}; /* CR_Khojki */
-
-/* 'Linear_A': Script */
-static const OnigCodePoint CR_Linear_A[] = {
-	3,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-}; /* CR_Linear_A */
-
-/* 'Mahajani': Script */
-static const OnigCodePoint CR_Mahajani[] = {
-	1,
-	0x11150, 0x11176,
-}; /* CR_Mahajani */
-
-/* 'Manichaean': Script */
-static const OnigCodePoint CR_Manichaean[] = {
-	2,
-	0x10ac0, 0x10ae6,
-	0x10aeb, 0x10af6,
-}; /* CR_Manichaean */
-
-/* 'Mende_Kikakui': Script */
-static const OnigCodePoint CR_Mende_Kikakui[] = {
-	2,
-	0x1e800, 0x1e8c4,
-	0x1e8c7, 0x1e8d6,
-}; /* CR_Mende_Kikakui */
-
-/* 'Modi': Script */
-static const OnigCodePoint CR_Modi[] = {
-	2,
-	0x11600, 0x11644,
-	0x11650, 0x11659,
-}; /* CR_Modi */
-
-/* 'Mro': Script */
-static const OnigCodePoint CR_Mro[] = {
-	3,
-	0x16a40, 0x16a5e,
-	0x16a60, 0x16a69,
-	0x16a6e, 0x16a6f,
-}; /* CR_Mro */
-
-/* 'Old_North_Arabian': Script */
-static const OnigCodePoint CR_Old_North_Arabian[] = {
-	1,
-	0x10a80, 0x10a9f,
-}; /* CR_Old_North_Arabian */
-
-/* 'Nabataean': Script */
-static const OnigCodePoint CR_Nabataean[] = {
-	2,
-	0x10880, 0x1089e,
-	0x108a7, 0x108af,
-}; /* CR_Nabataean */
-
-/* 'Palmyrene': Script */
-static const OnigCodePoint CR_Palmyrene[] = {
-	1,
-	0x10860, 0x1087f,
-}; /* CR_Palmyrene */
-
-/* 'Pau_Cin_Hau': Script */
-static const OnigCodePoint CR_Pau_Cin_Hau[] = {
-	1,
-	0x11ac0, 0x11af8,
-}; /* CR_Pau_Cin_Hau */
-
-/* 'Old_Permic': Script */
-static const OnigCodePoint CR_Old_Permic[] = {
-	1,
-	0x10350, 0x1037a,
-}; /* CR_Old_Permic */
-
-/* 'Psalter_Pahlavi': Script */
-static const OnigCodePoint CR_Psalter_Pahlavi[] = {
-	3,
-	0x10b80, 0x10b91,
-	0x10b99, 0x10b9c,
-	0x10ba9, 0x10baf,
-}; /* CR_Psalter_Pahlavi */
-
-/* 'Siddham': Script */
-static const OnigCodePoint CR_Siddham[] = {
-	2,
-	0x11580, 0x115b5,
-	0x115b8, 0x115dd,
-}; /* CR_Siddham */
-
-/* 'Khudawadi': Script */
-static const OnigCodePoint CR_Khudawadi[] = {
-	2,
-	0x112b0, 0x112ea,
-	0x112f0, 0x112f9,
-}; /* CR_Khudawadi */
-
-/* 'Tirhuta': Script */
-static const OnigCodePoint CR_Tirhuta[] = {
-	2,
-	0x11480, 0x114c7,
-	0x114d0, 0x114d9,
-}; /* CR_Tirhuta */
-
-/* 'Warang_Citi': Script */
-static const OnigCodePoint CR_Warang_Citi[] = {
-	2,
-	0x118a0, 0x118f2,
-	0x118ff, 0x118ff,
-}; /* CR_Warang_Citi */
-
-/* 'Ahom': Script */
-static const OnigCodePoint CR_Ahom[] = {
-	3,
-	0x11700, 0x11719,
-	0x1171d, 0x1172b,
-	0x11730, 0x1173f,
-}; /* CR_Ahom */
-
-/* 'Anatolian_Hieroglyphs': Script */
-static const OnigCodePoint CR_Anatolian_Hieroglyphs[] = {
-	1,
-	0x14400, 0x14646,
-}; /* CR_Anatolian_Hieroglyphs */
-
-/* 'Hatran': Script */
-static const OnigCodePoint CR_Hatran[] = {
-	3,
-	0x108e0, 0x108f2,
-	0x108f4, 0x108f5,
-	0x108fb, 0x108ff,
-}; /* CR_Hatran */
-
-/* 'Multani': Script */
-static const OnigCodePoint CR_Multani[] = {
-	5,
-	0x11280, 0x11286,
-	0x11288, 0x11288,
-	0x1128a, 0x1128d,
-	0x1128f, 0x1129d,
-	0x1129f, 0x112a9,
-}; /* CR_Multani */
-
-/* 'Old_Hungarian': Script */
-static const OnigCodePoint CR_Old_Hungarian[] = {
-	3,
-	0x10c80, 0x10cb2,
-	0x10cc0, 0x10cf2,
-	0x10cfa, 0x10cff,
-}; /* CR_Old_Hungarian */
-
-/* 'SignWriting': Script */
-static const OnigCodePoint CR_SignWriting[] = {
-	3,
-	0x1d800, 0x1da8b,
-	0x1da9b, 0x1da9f,
-	0x1daa1, 0x1daaf,
-}; /* CR_SignWriting */
-
-/* 'White_Space': Binary Property */
-#define CR_White_Space CR_Space
-
-/* 'Bidi_Control': Binary Property */
-static const OnigCodePoint CR_Bidi_Control[] = {
-	4,
-	0x061c, 0x061c,
-	0x200e, 0x200f,
-	0x202a, 0x202e,
-	0x2066, 0x2069,
-}; /* CR_Bidi_Control */
-
-/* 'Join_Control': Binary Property */
-static const OnigCodePoint CR_Join_Control[] = {
-	1,
-	0x200c, 0x200d,
-}; /* CR_Join_Control */
-
-/* 'Dash': Binary Property */
-static const OnigCodePoint CR_Dash[] = {
-	21,
-	0x002d, 0x002d,
-	0x058a, 0x058a,
-	0x05be, 0x05be,
-	0x1400, 0x1400,
-	0x1806, 0x1806,
-	0x2010, 0x2015,
-	0x2053, 0x2053,
-	0x207b, 0x207b,
-	0x208b, 0x208b,
-	0x2212, 0x2212,
-	0x2e17, 0x2e17,
-	0x2e1a, 0x2e1a,
-	0x2e3a, 0x2e3b,
-	0x2e40, 0x2e40,
-	0x301c, 0x301c,
-	0x3030, 0x3030,
-	0x30a0, 0x30a0,
-	0xfe31, 0xfe32,
-	0xfe58, 0xfe58,
-	0xfe63, 0xfe63,
-	0xff0d, 0xff0d,
-}; /* CR_Dash */
-
-/* 'Hyphen': Binary Property */
-static const OnigCodePoint CR_Hyphen[] = {
-	10,
-	0x002d, 0x002d,
-	0x00ad, 0x00ad,
-	0x058a, 0x058a,
-	0x1806, 0x1806,
-	0x2010, 0x2011,
-	0x2e17, 0x2e17,
-	0x30fb, 0x30fb,
-	0xfe63, 0xfe63,
-	0xff0d, 0xff0d,
-	0xff65, 0xff65,
-}; /* CR_Hyphen */
-
-/* 'Quotation_Mark': Binary Property */
-static const OnigCodePoint CR_Quotation_Mark[] = {
-	13,
-	0x0022, 0x0022,
-	0x0027, 0x0027,
-	0x00ab, 0x00ab,
-	0x00bb, 0x00bb,
-	0x2018, 0x201f,
-	0x2039, 0x203a,
-	0x2e42, 0x2e42,
-	0x300c, 0x300f,
-	0x301d, 0x301f,
-	0xfe41, 0xfe44,
-	0xff02, 0xff02,
-	0xff07, 0xff07,
-	0xff62, 0xff63,
-}; /* CR_Quotation_Mark */
-
-/* 'Terminal_Punctuation': Binary Property */
-static const OnigCodePoint CR_Terminal_Punctuation[] = {
-	90,
-	0x0021, 0x0021,
-	0x002c, 0x002c,
-	0x002e, 0x002e,
-	0x003a, 0x003b,
-	0x003f, 0x003f,
-	0x037e, 0x037e,
-	0x0387, 0x0387,
-	0x0589, 0x0589,
-	0x05c3, 0x05c3,
-	0x060c, 0x060c,
-	0x061b, 0x061b,
-	0x061f, 0x061f,
-	0x06d4, 0x06d4,
-	0x0700, 0x070a,
-	0x070c, 0x070c,
-	0x07f8, 0x07f9,
-	0x0830, 0x083e,
-	0x085e, 0x085e,
-	0x0964, 0x0965,
-	0x0e5a, 0x0e5b,
-	0x0f08, 0x0f08,
-	0x0f0d, 0x0f12,
-	0x104a, 0x104b,
-	0x1361, 0x1368,
-	0x166d, 0x166e,
-	0x16eb, 0x16ed,
-	0x1735, 0x1736,
-	0x17d4, 0x17d6,
-	0x17da, 0x17da,
-	0x1802, 0x1805,
-	0x1808, 0x1809,
-	0x1944, 0x1945,
-	0x1aa8, 0x1aab,
-	0x1b5a, 0x1b5b,
-	0x1b5d, 0x1b5f,
-	0x1c3b, 0x1c3f,
-	0x1c7e, 0x1c7f,
-	0x203c, 0x203d,
-	0x2047, 0x2049,
-	0x2e2e, 0x2e2e,
-	0x2e3c, 0x2e3c,
-	0x2e41, 0x2e41,
-	0x3001, 0x3002,
-	0xa4fe, 0xa4ff,
-	0xa60d, 0xa60f,
-	0xa6f3, 0xa6f7,
-	0xa876, 0xa877,
-	0xa8ce, 0xa8cf,
-	0xa92f, 0xa92f,
-	0xa9c7, 0xa9c9,
-	0xaa5d, 0xaa5f,
-	0xaadf, 0xaadf,
-	0xaaf0, 0xaaf1,
-	0xabeb, 0xabeb,
-	0xfe50, 0xfe52,
-	0xfe54, 0xfe57,
-	0xff01, 0xff01,
-	0xff0c, 0xff0c,
-	0xff0e, 0xff0e,
-	0xff1a, 0xff1b,
-	0xff1f, 0xff1f,
-	0xff61, 0xff61,
-	0xff64, 0xff64,
-	0x1039f, 0x1039f,
-	0x103d0, 0x103d0,
-	0x10857, 0x10857,
-	0x1091f, 0x1091f,
-	0x10a56, 0x10a57,
-	0x10af0, 0x10af5,
-	0x10b3a, 0x10b3f,
-	0x10b99, 0x10b9c,
-	0x11047, 0x1104d,
-	0x110be, 0x110c1,
-	0x11141, 0x11143,
-	0x111c5, 0x111c6,
-	0x111cd, 0x111cd,
-	0x111de, 0x111df,
-	0x11238, 0x1123c,
-	0x112a9, 0x112a9,
-	0x115c2, 0x115c5,
-	0x115c9, 0x115d7,
-	0x11641, 0x11642,
-	0x1173c, 0x1173e,
-	0x12470, 0x12474,
-	0x16a6e, 0x16a6f,
-	0x16af5, 0x16af5,
-	0x16b37, 0x16b39,
-	0x16b44, 0x16b44,
-	0x1bc9f, 0x1bc9f,
-	0x1da87, 0x1da8a,
-}; /* CR_Terminal_Punctuation */
-
-/* 'Other_Math': Binary Property */
-static const OnigCodePoint CR_Other_Math[] = {
-	134,
-	0x005e, 0x005e,
-	0x03d0, 0x03d2,
-	0x03d5, 0x03d5,
-	0x03f0, 0x03f1,
-	0x03f4, 0x03f5,
-	0x2016, 0x2016,
-	0x2032, 0x2034,
-	0x2040, 0x2040,
-	0x2061, 0x2064,
-	0x207d, 0x207e,
-	0x208d, 0x208e,
-	0x20d0, 0x20dc,
-	0x20e1, 0x20e1,
-	0x20e5, 0x20e6,
-	0x20eb, 0x20ef,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2119, 0x211d,
-	0x2124, 0x2124,
-	0x2128, 0x2129,
-	0x212c, 0x212d,
-	0x212f, 0x2131,
-	0x2133, 0x2138,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x2195, 0x2199,
-	0x219c, 0x219f,
-	0x21a1, 0x21a2,
-	0x21a4, 0x21a5,
-	0x21a7, 0x21a7,
-	0x21a9, 0x21ad,
-	0x21b0, 0x21b1,
-	0x21b6, 0x21b7,
-	0x21bc, 0x21cd,
-	0x21d0, 0x21d1,
-	0x21d3, 0x21d3,
-	0x21d5, 0x21db,
-	0x21dd, 0x21dd,
-	0x21e4, 0x21e5,
-	0x2308, 0x230b,
-	0x23b4, 0x23b5,
-	0x23b7, 0x23b7,
-	0x23d0, 0x23d0,
-	0x23e2, 0x23e2,
-	0x25a0, 0x25a1,
-	0x25ae, 0x25b6,
-	0x25bc, 0x25c0,
-	0x25c6, 0x25c7,
-	0x25ca, 0x25cb,
-	0x25cf, 0x25d3,
-	0x25e2, 0x25e2,
-	0x25e4, 0x25e4,
-	0x25e7, 0x25ec,
-	0x2605, 0x2606,
-	0x2640, 0x2640,
-	0x2642, 0x2642,
-	0x2660, 0x2663,
-	0x266d, 0x266e,
-	0x27c5, 0x27c6,
-	0x27e6, 0x27ef,
-	0x2983, 0x2998,
-	0x29d8, 0x29db,
-	0x29fc, 0x29fd,
-	0xfe61, 0xfe61,
-	0xfe63, 0xfe63,
-	0xfe68, 0xfe68,
-	0xff3c, 0xff3c,
-	0xff3e, 0xff3e,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-}; /* CR_Other_Math */
-
-/* 'Hex_Digit': Binary Property */
-static const OnigCodePoint CR_Hex_Digit[] = {
-	6,
-	0x0030, 0x0039,
-	0x0041, 0x0046,
-	0x0061, 0x0066,
-	0xff10, 0xff19,
-	0xff21, 0xff26,
-	0xff41, 0xff46,
-}; /* CR_Hex_Digit */
-
-/* 'ASCII_Hex_Digit': Binary Property */
-#define CR_ASCII_Hex_Digit CR_XDigit
-
-/* 'Other_Alphabetic': Binary Property */
-static const OnigCodePoint CR_Other_Alphabetic[] = {
-	178,
-	0x0345, 0x0345,
-	0x05b0, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x0610, 0x061a,
-	0x064b, 0x0657,
-	0x0659, 0x065f,
-	0x0670, 0x0670,
-	0x06d6, 0x06dc,
-	0x06e1, 0x06e4,
-	0x06e7, 0x06e8,
-	0x06ed, 0x06ed,
-	0x0711, 0x0711,
-	0x0730, 0x073f,
-	0x07a6, 0x07b0,
-	0x0816, 0x0817,
-	0x081b, 0x0823,
-	0x0825, 0x0827,
-	0x0829, 0x082c,
-	0x08e3, 0x08e9,
-	0x08f0, 0x0903,
-	0x093a, 0x093b,
-	0x093e, 0x094c,
-	0x094e, 0x094f,
-	0x0955, 0x0957,
-	0x0962, 0x0963,
-	0x0981, 0x0983,
-	0x09be, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cc,
-	0x09d7, 0x09d7,
-	0x09e2, 0x09e3,
-	0x0a01, 0x0a03,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4c,
-	0x0a51, 0x0a51,
-	0x0a70, 0x0a71,
-	0x0a75, 0x0a75,
-	0x0a81, 0x0a83,
-	0x0abe, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acc,
-	0x0ae2, 0x0ae3,
-	0x0b01, 0x0b03,
-	0x0b3e, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4c,
-	0x0b56, 0x0b57,
-	0x0b62, 0x0b63,
-	0x0b82, 0x0b82,
-	0x0bbe, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcc,
-	0x0bd7, 0x0bd7,
-	0x0c00, 0x0c03,
-	0x0c3e, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4c,
-	0x0c55, 0x0c56,
-	0x0c62, 0x0c63,
-	0x0c81, 0x0c83,
-	0x0cbe, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccc,
-	0x0cd5, 0x0cd6,
-	0x0ce2, 0x0ce3,
-	0x0d01, 0x0d03,
-	0x0d3e, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4c,
-	0x0d57, 0x0d57,
-	0x0d62, 0x0d63,
-	0x0d82, 0x0d83,
-	0x0dcf, 0x0dd4,
-	0x0dd6, 0x0dd6,
-	0x0dd8, 0x0ddf,
-	0x0df2, 0x0df3,
-	0x0e31, 0x0e31,
-	0x0e34, 0x0e3a,
-	0x0e4d, 0x0e4d,
-	0x0eb1, 0x0eb1,
-	0x0eb4, 0x0eb9,
-	0x0ebb, 0x0ebc,
-	0x0ecd, 0x0ecd,
-	0x0f71, 0x0f81,
-	0x0f8d, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x102b, 0x1036,
-	0x1038, 0x1038,
-	0x103b, 0x103e,
-	0x1056, 0x1059,
-	0x105e, 0x1060,
-	0x1062, 0x1062,
-	0x1067, 0x1068,
-	0x1071, 0x1074,
-	0x1082, 0x1086,
-	0x109c, 0x109d,
-	0x135f, 0x135f,
-	0x1712, 0x1713,
-	0x1732, 0x1733,
-	0x1752, 0x1753,
-	0x1772, 0x1773,
-	0x17b6, 0x17c8,
-	0x18a9, 0x18a9,
-	0x1920, 0x192b,
-	0x1930, 0x1938,
-	0x1a17, 0x1a1b,
-	0x1a55, 0x1a5e,
-	0x1a61, 0x1a74,
-	0x1b00, 0x1b04,
-	0x1b35, 0x1b43,
-	0x1b80, 0x1b82,
-	0x1ba1, 0x1ba9,
-	0x1bac, 0x1bad,
-	0x1be7, 0x1bf1,
-	0x1c24, 0x1c35,
-	0x1cf2, 0x1cf3,
-	0x1de7, 0x1df4,
-	0x24b6, 0x24e9,
-	0x2de0, 0x2dff,
-	0xa674, 0xa67b,
-	0xa69e, 0xa69f,
-	0xa823, 0xa827,
-	0xa880, 0xa881,
-	0xa8b4, 0xa8c3,
-	0xa926, 0xa92a,
-	0xa947, 0xa952,
-	0xa980, 0xa983,
-	0xa9b4, 0xa9bf,
-	0xaa29, 0xaa36,
-	0xaa43, 0xaa43,
-	0xaa4c, 0xaa4d,
-	0xaab0, 0xaab0,
-	0xaab2, 0xaab4,
-	0xaab7, 0xaab8,
-	0xaabe, 0xaabe,
-	0xaaeb, 0xaaef,
-	0xaaf5, 0xaaf5,
-	0xabe3, 0xabea,
-	0xfb1e, 0xfb1e,
-	0x10376, 0x1037a,
-	0x10a01, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a0f,
-	0x11000, 0x11002,
-	0x11038, 0x11045,
-	0x11082, 0x11082,
-	0x110b0, 0x110b8,
-	0x11100, 0x11102,
-	0x11127, 0x11132,
-	0x11180, 0x11182,
-	0x111b3, 0x111bf,
-	0x1122c, 0x11234,
-	0x11237, 0x11237,
-	0x112df, 0x112e8,
-	0x11300, 0x11303,
-	0x1133e, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134c,
-	0x11357, 0x11357,
-	0x11362, 0x11363,
-	0x114b0, 0x114c1,
-	0x115af, 0x115b5,
-	0x115b8, 0x115be,
-	0x115dc, 0x115dd,
-	0x11630, 0x1163e,
-	0x11640, 0x11640,
-	0x116ab, 0x116b5,
-	0x1171d, 0x1172a,
-	0x16b30, 0x16b36,
-	0x16f51, 0x16f7e,
-	0x1bc9e, 0x1bc9e,
-	0x1f130, 0x1f149,
-	0x1f150, 0x1f169,
-	0x1f170, 0x1f189,
-}; /* CR_Other_Alphabetic */
-
-/* 'Ideographic': Binary Property */
-static const OnigCodePoint CR_Ideographic[] = {
-	12,
-	0x3006, 0x3007,
-	0x3021, 0x3029,
-	0x3038, 0x303a,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fd5,
-	0xf900, 0xfa6d,
-	0xfa70, 0xfad9,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2b820, 0x2cea1,
-	0x2f800, 0x2fa1d,
-}; /* CR_Ideographic */
-
-/* 'Diacritic': Binary Property */
-static const OnigCodePoint CR_Diacritic[] = {
-	147,
-	0x005e, 0x005e,
-	0x0060, 0x0060,
-	0x00a8, 0x00a8,
-	0x00af, 0x00af,
-	0x00b4, 0x00b4,
-	0x00b7, 0x00b8,
-	0x02b0, 0x034e,
-	0x0350, 0x0357,
-	0x035d, 0x0362,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x0384, 0x0385,
-	0x0483, 0x0487,
-	0x0559, 0x0559,
-	0x0591, 0x05a1,
-	0x05a3, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c4,
-	0x064b, 0x0652,
-	0x0657, 0x0658,
-	0x06df, 0x06e0,
-	0x06e5, 0x06e6,
-	0x06ea, 0x06ec,
-	0x0730, 0x074a,
-	0x07a6, 0x07b0,
-	0x07eb, 0x07f5,
-	0x0818, 0x0819,
-	0x08e3, 0x08fe,
-	0x093c, 0x093c,
-	0x094d, 0x094d,
-	0x0951, 0x0954,
-	0x0971, 0x0971,
-	0x09bc, 0x09bc,
-	0x09cd, 0x09cd,
-	0x0a3c, 0x0a3c,
-	0x0a4d, 0x0a4d,
-	0x0abc, 0x0abc,
-	0x0acd, 0x0acd,
-	0x0b3c, 0x0b3c,
-	0x0b4d, 0x0b4d,
-	0x0bcd, 0x0bcd,
-	0x0c4d, 0x0c4d,
-	0x0cbc, 0x0cbc,
-	0x0ccd, 0x0ccd,
-	0x0d4d, 0x0d4d,
-	0x0dca, 0x0dca,
-	0x0e47, 0x0e4c,
-	0x0e4e, 0x0e4e,
-	0x0ec8, 0x0ecc,
-	0x0f18, 0x0f19,
-	0x0f35, 0x0f35,
-	0x0f37, 0x0f37,
-	0x0f39, 0x0f39,
-	0x0f3e, 0x0f3f,
-	0x0f82, 0x0f84,
-	0x0f86, 0x0f87,
-	0x0fc6, 0x0fc6,
-	0x1037, 0x1037,
-	0x1039, 0x103a,
-	0x1087, 0x108d,
-	0x108f, 0x108f,
-	0x109a, 0x109b,
-	0x17c9, 0x17d3,
-	0x17dd, 0x17dd,
-	0x1939, 0x193b,
-	0x1a75, 0x1a7c,
-	0x1a7f, 0x1a7f,
-	0x1ab0, 0x1abd,
-	0x1b34, 0x1b34,
-	0x1b44, 0x1b44,
-	0x1b6b, 0x1b73,
-	0x1baa, 0x1bab,
-	0x1c36, 0x1c37,
-	0x1c78, 0x1c7d,
-	0x1cd0, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1cf4, 0x1cf4,
-	0x1cf8, 0x1cf9,
-	0x1d2c, 0x1d6a,
-	0x1dc4, 0x1dcf,
-	0x1df5, 0x1df5,
-	0x1dfd, 0x1dff,
-	0x1fbd, 0x1fbd,
-	0x1fbf, 0x1fc1,
-	0x1fcd, 0x1fcf,
-	0x1fdd, 0x1fdf,
-	0x1fed, 0x1fef,
-	0x1ffd, 0x1ffe,
-	0x2cef, 0x2cf1,
-	0x2e2f, 0x2e2f,
-	0x302a, 0x302f,
-	0x3099, 0x309c,
-	0x30fc, 0x30fc,
-	0xa66f, 0xa66f,
-	0xa67c, 0xa67d,
-	0xa67f, 0xa67f,
-	0xa69c, 0xa69d,
-	0xa6f0, 0xa6f1,
-	0xa717, 0xa721,
-	0xa788, 0xa788,
-	0xa7f8, 0xa7f9,
-	0xa8c4, 0xa8c4,
-	0xa8e0, 0xa8f1,
-	0xa92b, 0xa92e,
-	0xa953, 0xa953,
-	0xa9b3, 0xa9b3,
-	0xa9c0, 0xa9c0,
-	0xa9e5, 0xa9e5,
-	0xaa7b, 0xaa7d,
-	0xaabf, 0xaac2,
-	0xaaf6, 0xaaf6,
-	0xab5b, 0xab5f,
-	0xabec, 0xabed,
-	0xfb1e, 0xfb1e,
-	0xfe20, 0xfe2f,
-	0xff3e, 0xff3e,
-	0xff40, 0xff40,
-	0xff70, 0xff70,
-	0xff9e, 0xff9f,
-	0xffe3, 0xffe3,
-	0x102e0, 0x102e0,
-	0x10ae5, 0x10ae6,
-	0x110b9, 0x110ba,
-	0x11133, 0x11134,
-	0x11173, 0x11173,
-	0x111c0, 0x111c0,
-	0x111ca, 0x111cc,
-	0x11235, 0x11236,
-	0x112e9, 0x112ea,
-	0x1133c, 0x1133c,
-	0x1134d, 0x1134d,
-	0x11366, 0x1136c,
-	0x11370, 0x11374,
-	0x114c2, 0x114c3,
-	0x115bf, 0x115c0,
-	0x1163f, 0x1163f,
-	0x116b6, 0x116b7,
-	0x1172b, 0x1172b,
-	0x16af0, 0x16af4,
-	0x16f8f, 0x16f9f,
-	0x1d167, 0x1d169,
-	0x1d16d, 0x1d172,
-	0x1d17b, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-	0x1e8d0, 0x1e8d6,
-}; /* CR_Diacritic */
-
-/* 'Extender': Binary Property */
-static const OnigCodePoint CR_Extender[] = {
-	26,
-	0x00b7, 0x00b7,
-	0x02d0, 0x02d1,
-	0x0640, 0x0640,
-	0x07fa, 0x07fa,
-	0x0e46, 0x0e46,
-	0x0ec6, 0x0ec6,
-	0x180a, 0x180a,
-	0x1843, 0x1843,
-	0x1aa7, 0x1aa7,
-	0x1c36, 0x1c36,
-	0x1c7b, 0x1c7b,
-	0x3005, 0x3005,
-	0x3031, 0x3035,
-	0x309d, 0x309e,
-	0x30fc, 0x30fe,
-	0xa015, 0xa015,
-	0xa60c, 0xa60c,
-	0xa9cf, 0xa9cf,
-	0xa9e6, 0xa9e6,
-	0xaa70, 0xaa70,
-	0xaadd, 0xaadd,
-	0xaaf3, 0xaaf4,
-	0xff70, 0xff70,
-	0x1135d, 0x1135d,
-	0x115c6, 0x115c8,
-	0x16b42, 0x16b43,
-}; /* CR_Extender */
-
-/* 'Other_Lowercase': Binary Property */
-static const OnigCodePoint CR_Other_Lowercase[] = {
-	20,
-	0x00aa, 0x00aa,
-	0x00ba, 0x00ba,
-	0x02b0, 0x02b8,
-	0x02c0, 0x02c1,
-	0x02e0, 0x02e4,
-	0x0345, 0x0345,
-	0x037a, 0x037a,
-	0x1d2c, 0x1d6a,
-	0x1d78, 0x1d78,
-	0x1d9b, 0x1dbf,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 0x209c,
-	0x2170, 0x217f,
-	0x24d0, 0x24e9,
-	0x2c7c, 0x2c7d,
-	0xa69c, 0xa69d,
-	0xa770, 0xa770,
-	0xa7f8, 0xa7f9,
-	0xab5c, 0xab5f,
-}; /* CR_Other_Lowercase */
-
-/* 'Other_Uppercase': Binary Property */
-static const OnigCodePoint CR_Other_Uppercase[] = {
-	5,
-	0x2160, 0x216f,
-	0x24b6, 0x24cf,
-	0x1f130, 0x1f149,
-	0x1f150, 0x1f169,
-	0x1f170, 0x1f189,
-}; /* CR_Other_Uppercase */
-
-/* 'Noncharacter_Code_Point': Binary Property */
-static const OnigCodePoint CR_Noncharacter_Code_Point[] = {
-	18,
-	0xfdd0, 0xfdef,
-	0xfffe, 0xffff,
-	0x1fffe, 0x1ffff,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xefffe, 0xeffff,
-	0xffffe, 0xfffff,
-	0x10fffe, 0x10ffff,
-}; /* CR_Noncharacter_Code_Point */
-
-/* 'Other_Grapheme_Extend': Binary Property */
-static const OnigCodePoint CR_Other_Grapheme_Extend[] = {
-	22,
-	0x09be, 0x09be,
-	0x09d7, 0x09d7,
-	0x0b3e, 0x0b3e,
-	0x0b57, 0x0b57,
-	0x0bbe, 0x0bbe,
-	0x0bd7, 0x0bd7,
-	0x0cc2, 0x0cc2,
-	0x0cd5, 0x0cd6,
-	0x0d3e, 0x0d3e,
-	0x0d57, 0x0d57,
-	0x0dcf, 0x0dcf,
-	0x0ddf, 0x0ddf,
-	0x200c, 0x200d,
-	0x302e, 0x302f,
-	0xff9e, 0xff9f,
-	0x1133e, 0x1133e,
-	0x11357, 0x11357,
-	0x114b0, 0x114b0,
-	0x114bd, 0x114bd,
-	0x115af, 0x115af,
-	0x1d165, 0x1d165,
-	0x1d16e, 0x1d172,
-}; /* CR_Other_Grapheme_Extend */
-
-/* 'IDS_Binary_Operator': Binary Property */
-static const OnigCodePoint CR_IDS_Binary_Operator[] = {
-	2,
-	0x2ff0, 0x2ff1,
-	0x2ff4, 0x2ffb,
-}; /* CR_IDS_Binary_Operator */
-
-/* 'IDS_Trinary_Operator': Binary Property */
-static const OnigCodePoint CR_IDS_Trinary_Operator[] = {
-	1,
-	0x2ff2, 0x2ff3,
-}; /* CR_IDS_Trinary_Operator */
-
-/* 'Radical': Binary Property */
-static const OnigCodePoint CR_Radical[] = {
-	3,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-}; /* CR_Radical */
-
-/* 'Unified_Ideograph': Binary Property */
-static const OnigCodePoint CR_Unified_Ideograph[] = {
-	13,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fd5,
-	0xfa0e, 0xfa0f,
-	0xfa11, 0xfa11,
-	0xfa13, 0xfa14,
-	0xfa1f, 0xfa1f,
-	0xfa21, 0xfa21,
-	0xfa23, 0xfa24,
-	0xfa27, 0xfa29,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2b820, 0x2cea1,
-}; /* CR_Unified_Ideograph */
-
-/* 'Other_Default_Ignorable_Code_Point': Binary Property */
-static const OnigCodePoint CR_Other_Default_Ignorable_Code_Point[] = {
-	11,
-	0x034f, 0x034f,
-	0x115f, 0x1160,
-	0x17b4, 0x17b5,
-	0x2065, 0x2065,
-	0x3164, 0x3164,
-	0xffa0, 0xffa0,
-	0xfff0, 0xfff8,
-	0xe0000, 0xe0000,
-	0xe0002, 0xe001f,
-	0xe0080, 0xe00ff,
-	0xe01f0, 0xe0fff,
-}; /* CR_Other_Default_Ignorable_Code_Point */
-
-/* 'Deprecated': Binary Property */
-static const OnigCodePoint CR_Deprecated[] = {
-	9,
-	0x0149, 0x0149,
-	0x0673, 0x0673,
-	0x0f77, 0x0f77,
-	0x0f79, 0x0f79,
-	0x17a3, 0x17a4,
-	0x206a, 0x206f,
-	0x2329, 0x232a,
-	0xe0001, 0xe0001,
-	0xe007f, 0xe007f,
-}; /* CR_Deprecated */
-
-/* 'Soft_Dotted': Binary Property */
-static const OnigCodePoint CR_Soft_Dotted[] = {
-	31,
-	0x0069, 0x006a,
-	0x012f, 0x012f,
-	0x0249, 0x0249,
-	0x0268, 0x0268,
-	0x029d, 0x029d,
-	0x02b2, 0x02b2,
-	0x03f3, 0x03f3,
-	0x0456, 0x0456,
-	0x0458, 0x0458,
-	0x1d62, 0x1d62,
-	0x1d96, 0x1d96,
-	0x1da4, 0x1da4,
-	0x1da8, 0x1da8,
-	0x1e2d, 0x1e2d,
-	0x1ecb, 0x1ecb,
-	0x2071, 0x2071,
-	0x2148, 0x2149,
-	0x2c7c, 0x2c7c,
-	0x1d422, 0x1d423,
-	0x1d456, 0x1d457,
-	0x1d48a, 0x1d48b,
-	0x1d4be, 0x1d4bf,
-	0x1d4f2, 0x1d4f3,
-	0x1d526, 0x1d527,
-	0x1d55a, 0x1d55b,
-	0x1d58e, 0x1d58f,
-	0x1d5c2, 0x1d5c3,
-	0x1d5f6, 0x1d5f7,
-	0x1d62a, 0x1d62b,
-	0x1d65e, 0x1d65f,
-	0x1d692, 0x1d693,
-}; /* CR_Soft_Dotted */
-
-/* 'Logical_Order_Exception': Binary Property */
-static const OnigCodePoint CR_Logical_Order_Exception[] = {
-	7,
-	0x0e40, 0x0e44,
-	0x0ec0, 0x0ec4,
-	0x19b5, 0x19b7,
-	0x19ba, 0x19ba,
-	0xaab5, 0xaab6,
-	0xaab9, 0xaab9,
-	0xaabb, 0xaabc,
-}; /* CR_Logical_Order_Exception */
-
-/* 'Other_ID_Start': Binary Property */
-static const OnigCodePoint CR_Other_ID_Start[] = {
-	3,
-	0x2118, 0x2118,
-	0x212e, 0x212e,
-	0x309b, 0x309c,
-}; /* CR_Other_ID_Start */
-
-/* 'Other_ID_Continue': Binary Property */
-static const OnigCodePoint CR_Other_ID_Continue[] = {
-	4,
-	0x00b7, 0x00b7,
-	0x0387, 0x0387,
-	0x1369, 0x1371,
-	0x19da, 0x19da,
-}; /* CR_Other_ID_Continue */
-
-/* 'STerm': Binary Property */
-static const OnigCodePoint CR_STerm[] = {
-	64,
-	0x0021, 0x0021,
-	0x002e, 0x002e,
-	0x003f, 0x003f,
-	0x0589, 0x0589,
-	0x061f, 0x061f,
-	0x06d4, 0x06d4,
-	0x0700, 0x0702,
-	0x07f9, 0x07f9,
-	0x0964, 0x0965,
-	0x104a, 0x104b,
-	0x1362, 0x1362,
-	0x1367, 0x1368,
-	0x166e, 0x166e,
-	0x1735, 0x1736,
-	0x1803, 0x1803,
-	0x1809, 0x1809,
-	0x1944, 0x1945,
-	0x1aa8, 0x1aab,
-	0x1b5a, 0x1b5b,
-	0x1b5e, 0x1b5f,
-	0x1c3b, 0x1c3c,
-	0x1c7e, 0x1c7f,
-	0x203c, 0x203d,
-	0x2047, 0x2049,
-	0x2e2e, 0x2e2e,
-	0x2e3c, 0x2e3c,
-	0x3002, 0x3002,
-	0xa4ff, 0xa4ff,
-	0xa60e, 0xa60f,
-	0xa6f3, 0xa6f3,
-	0xa6f7, 0xa6f7,
-	0xa876, 0xa877,
-	0xa8ce, 0xa8cf,
-	0xa92f, 0xa92f,
-	0xa9c8, 0xa9c9,
-	0xaa5d, 0xaa5f,
-	0xaaf0, 0xaaf1,
-	0xabeb, 0xabeb,
-	0xfe52, 0xfe52,
-	0xfe56, 0xfe57,
-	0xff01, 0xff01,
-	0xff0e, 0xff0e,
-	0xff1f, 0xff1f,
-	0xff61, 0xff61,
-	0x10a56, 0x10a57,
-	0x11047, 0x11048,
-	0x110be, 0x110c1,
-	0x11141, 0x11143,
-	0x111c5, 0x111c6,
-	0x111cd, 0x111cd,
-	0x111de, 0x111df,
-	0x11238, 0x11239,
-	0x1123b, 0x1123c,
-	0x112a9, 0x112a9,
-	0x115c2, 0x115c3,
-	0x115c9, 0x115d7,
-	0x11641, 0x11642,
-	0x1173c, 0x1173e,
-	0x16a6e, 0x16a6f,
-	0x16af5, 0x16af5,
-	0x16b37, 0x16b38,
-	0x16b44, 0x16b44,
-	0x1bc9f, 0x1bc9f,
-	0x1da88, 0x1da88,
-}; /* CR_STerm */
-
-/* 'Variation_Selector': Binary Property */
-static const OnigCodePoint CR_Variation_Selector[] = {
-	3,
-	0x180b, 0x180d,
-	0xfe00, 0xfe0f,
-	0xe0100, 0xe01ef,
-}; /* CR_Variation_Selector */
-
-/* 'Pattern_White_Space': Binary Property */
-static const OnigCodePoint CR_Pattern_White_Space[] = {
-	5,
-	0x0009, 0x000d,
-	0x0020, 0x0020,
-	0x0085, 0x0085,
-	0x200e, 0x200f,
-	0x2028, 0x2029,
-}; /* CR_Pattern_White_Space */
-
-/* 'Pattern_Syntax': Binary Property */
-static const OnigCodePoint CR_Pattern_Syntax[] = {
-	28,
-	0x0021, 0x002f,
-	0x003a, 0x0040,
-	0x005b, 0x005e,
-	0x0060, 0x0060,
-	0x007b, 0x007e,
-	0x00a1, 0x00a7,
-	0x00a9, 0x00a9,
-	0x00ab, 0x00ac,
-	0x00ae, 0x00ae,
-	0x00b0, 0x00b1,
-	0x00b6, 0x00b6,
-	0x00bb, 0x00bb,
-	0x00bf, 0x00bf,
-	0x00d7, 0x00d7,
-	0x00f7, 0x00f7,
-	0x2010, 0x2027,
-	0x2030, 0x203e,
-	0x2041, 0x2053,
-	0x2055, 0x205e,
-	0x2190, 0x245f,
-	0x2500, 0x2775,
-	0x2794, 0x2bff,
-	0x2e00, 0x2e7f,
-	0x3001, 0x3003,
-	0x3008, 0x3020,
-	0x3030, 0x3030,
-	0xfd3e, 0xfd3f,
-	0xfe45, 0xfe46,
-}; /* CR_Pattern_Syntax */
-
-/* 'Unknown': Script */
-static const OnigCodePoint CR_Unknown[] = {
-	611,
-	0x0378, 0x0379,
-	0x0380, 0x0383,
-	0x038b, 0x038b,
-	0x038d, 0x038d,
-	0x03a2, 0x03a2,
-	0x0530, 0x0530,
-	0x0557, 0x0558,
-	0x0560, 0x0560,
-	0x0588, 0x0588,
-	0x058b, 0x058c,
-	0x0590, 0x0590,
-	0x05c8, 0x05cf,
-	0x05eb, 0x05ef,
-	0x05f5, 0x05ff,
-	0x061d, 0x061d,
-	0x070e, 0x070e,
-	0x074b, 0x074c,
-	0x07b2, 0x07bf,
-	0x07fb, 0x07ff,
-	0x082e, 0x082f,
-	0x083f, 0x083f,
-	0x085c, 0x085d,
-	0x085f, 0x089f,
-	0x08b5, 0x08e2,
-	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,
-	0x09fc, 0x0a00,
-	0x0a04, 0x0a04,
-	0x0a0b, 0x0a0e,
-	0x0a11, 0x0a12,
-	0x0a29, 0x0a29,
-	0x0a31, 0x0a31,
-	0x0a34, 0x0a34,
-	0x0a37, 0x0a37,
-	0x0a3a, 0x0a3b,
-	0x0a3d, 0x0a3d,
-	0x0a43, 0x0a46,
-	0x0a49, 0x0a4a,
-	0x0a4e, 0x0a50,
-	0x0a52, 0x0a58,
-	0x0a5d, 0x0a5d,
-	0x0a5f, 0x0a65,
-	0x0a76, 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,
-	0x0af2, 0x0af8,
-	0x0afa, 0x0b00,
-	0x0b04, 0x0b04,
-	0x0b0d, 0x0b0e,
-	0x0b11, 0x0b12,
-	0x0b29, 0x0b29,
-	0x0b31, 0x0b31,
-	0x0b34, 0x0b34,
-	0x0b3a, 0x0b3b,
-	0x0b45, 0x0b46,
-	0x0b49, 0x0b4a,
-	0x0b4e, 0x0b55,
-	0x0b58, 0x0b5b,
-	0x0b5e, 0x0b5e,
-	0x0b64, 0x0b65,
-	0x0b78, 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, 0x0bcf,
-	0x0bd1, 0x0bd6,
-	0x0bd8, 0x0be5,
-	0x0bfb, 0x0bff,
-	0x0c04, 0x0c04,
-	0x0c0d, 0x0c0d,
-	0x0c11, 0x0c11,
-	0x0c29, 0x0c29,
-	0x0c3a, 0x0c3c,
-	0x0c45, 0x0c45,
-	0x0c49, 0x0c49,
-	0x0c4e, 0x0c54,
-	0x0c57, 0x0c57,
-	0x0c5b, 0x0c5f,
-	0x0c64, 0x0c65,
-	0x0c70, 0x0c77,
-	0x0c80, 0x0c80,
-	0x0c84, 0x0c84,
-	0x0c8d, 0x0c8d,
-	0x0c91, 0x0c91,
-	0x0ca9, 0x0ca9,
-	0x0cb4, 0x0cb4,
-	0x0cba, 0x0cbb,
-	0x0cc5, 0x0cc5,
-	0x0cc9, 0x0cc9,
-	0x0cce, 0x0cd4,
-	0x0cd7, 0x0cdd,
-	0x0cdf, 0x0cdf,
-	0x0ce4, 0x0ce5,
-	0x0cf0, 0x0cf0,
-	0x0cf3, 0x0d00,
-	0x0d04, 0x0d04,
-	0x0d0d, 0x0d0d,
-	0x0d11, 0x0d11,
-	0x0d3b, 0x0d3c,
-	0x0d45, 0x0d45,
-	0x0d49, 0x0d49,
-	0x0d4f, 0x0d56,
-	0x0d58, 0x0d5e,
-	0x0d64, 0x0d65,
-	0x0d76, 0x0d78,
-	0x0d80, 0x0d81,
-	0x0d84, 0x0d84,
-	0x0d97, 0x0d99,
-	0x0db2, 0x0db2,
-	0x0dbc, 0x0dbc,
-	0x0dbe, 0x0dbf,
-	0x0dc7, 0x0dc9,
-	0x0dcb, 0x0dce,
-	0x0dd5, 0x0dd5,
-	0x0dd7, 0x0dd7,
-	0x0de0, 0x0de5,
-	0x0df0, 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,
-	0x0ee0, 0x0eff,
-	0x0f48, 0x0f48,
-	0x0f6d, 0x0f70,
-	0x0f98, 0x0f98,
-	0x0fbd, 0x0fbd,
-	0x0fcd, 0x0fcd,
-	0x0fdb, 0x0fff,
-	0x10c6, 0x10c6,
-	0x10c8, 0x10cc,
-	0x10ce, 0x10cf,
-	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, 0x135c,
-	0x137d, 0x137f,
-	0x139a, 0x139f,
-	0x13f6, 0x13f7,
-	0x13fe, 0x13ff,
-	0x169d, 0x169f,
-	0x16f9, 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,
-	0x18ab, 0x18af,
-	0x18f6, 0x18ff,
-	0x191f, 0x191f,
-	0x192c, 0x192f,
-	0x193c, 0x193f,
-	0x1941, 0x1943,
-	0x196e, 0x196f,
-	0x1975, 0x197f,
-	0x19ac, 0x19af,
-	0x19ca, 0x19cf,
-	0x19db, 0x19dd,
-	0x1a1c, 0x1a1d,
-	0x1a5f, 0x1a5f,
-	0x1a7d, 0x1a7e,
-	0x1a8a, 0x1a8f,
-	0x1a9a, 0x1a9f,
-	0x1aae, 0x1aaf,
-	0x1abf, 0x1aff,
-	0x1b4c, 0x1b4f,
-	0x1b7d, 0x1b7f,
-	0x1bf4, 0x1bfb,
-	0x1c38, 0x1c3a,
-	0x1c4a, 0x1c4c,
-	0x1c80, 0x1cbf,
-	0x1cc8, 0x1ccf,
-	0x1cf7, 0x1cf7,
-	0x1cfa, 0x1cff,
-	0x1df6, 0x1dfb,
-	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,
-	0x2065, 0x2065,
-	0x2072, 0x2073,
-	0x208f, 0x208f,
-	0x209d, 0x209f,
-	0x20bf, 0x20cf,
-	0x20f1, 0x20ff,
-	0x218c, 0x218f,
-	0x23fb, 0x23ff,
-	0x2427, 0x243f,
-	0x244b, 0x245f,
-	0x2b74, 0x2b75,
-	0x2b96, 0x2b97,
-	0x2bba, 0x2bbc,
-	0x2bc9, 0x2bc9,
-	0x2bd2, 0x2beb,
-	0x2bf0, 0x2bff,
-	0x2c2f, 0x2c2f,
-	0x2c5f, 0x2c5f,
-	0x2cf4, 0x2cf8,
-	0x2d26, 0x2d26,
-	0x2d28, 0x2d2c,
-	0x2d2e, 0x2d2f,
-	0x2d68, 0x2d6e,
-	0x2d71, 0x2d7e,
-	0x2d97, 0x2d9f,
-	0x2da7, 0x2da7,
-	0x2daf, 0x2daf,
-	0x2db7, 0x2db7,
-	0x2dbf, 0x2dbf,
-	0x2dc7, 0x2dc7,
-	0x2dcf, 0x2dcf,
-	0x2dd7, 0x2dd7,
-	0x2ddf, 0x2ddf,
-	0x2e43, 0x2e7f,
-	0x2e9a, 0x2e9a,
-	0x2ef4, 0x2eff,
-	0x2fd6, 0x2fef,
-	0x2ffc, 0x2fff,
-	0x3040, 0x3040,
-	0x3097, 0x3098,
-	0x3100, 0x3104,
-	0x312e, 0x3130,
-	0x318f, 0x318f,
-	0x31bb, 0x31bf,
-	0x31e4, 0x31ef,
-	0x321f, 0x321f,
-	0x32ff, 0x32ff,
-	0x4db6, 0x4dbf,
-	0x9fd6, 0x9fff,
-	0xa48d, 0xa48f,
-	0xa4c7, 0xa4cf,
-	0xa62c, 0xa63f,
-	0xa6f8, 0xa6ff,
-	0xa7ae, 0xa7af,
-	0xa7b8, 0xa7f6,
-	0xa82c, 0xa82f,
-	0xa83a, 0xa83f,
-	0xa878, 0xa87f,
-	0xa8c5, 0xa8cd,
-	0xa8da, 0xa8df,
-	0xa8fe, 0xa8ff,
-	0xa954, 0xa95e,
-	0xa97d, 0xa97f,
-	0xa9ce, 0xa9ce,
-	0xa9da, 0xa9dd,
-	0xa9ff, 0xa9ff,
-	0xaa37, 0xaa3f,
-	0xaa4e, 0xaa4f,
-	0xaa5a, 0xaa5b,
-	0xaac3, 0xaada,
-	0xaaf7, 0xab00,
-	0xab07, 0xab08,
-	0xab0f, 0xab10,
-	0xab17, 0xab1f,
-	0xab27, 0xab27,
-	0xab2f, 0xab2f,
-	0xab66, 0xab6f,
-	0xabee, 0xabef,
-	0xabfa, 0xabff,
-	0xd7a4, 0xd7af,
-	0xd7c7, 0xd7ca,
-	0xd7fc, 0xf8ff,
-	0xfa6e, 0xfa6f,
-	0xfada, 0xfaff,
-	0xfb07, 0xfb12,
-	0xfb18, 0xfb1c,
-	0xfb37, 0xfb37,
-	0xfb3d, 0xfb3d,
-	0xfb3f, 0xfb3f,
-	0xfb42, 0xfb42,
-	0xfb45, 0xfb45,
-	0xfbc2, 0xfbd2,
-	0xfd40, 0xfd4f,
-	0xfd90, 0xfd91,
-	0xfdc8, 0xfdef,
-	0xfdfe, 0xfdff,
-	0xfe1a, 0xfe1f,
-	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,
-	0x1018d, 0x1018f,
-	0x1019c, 0x1019f,
-	0x101a1, 0x101cf,
-	0x101fe, 0x1027f,
-	0x1029d, 0x1029f,
-	0x102d1, 0x102df,
-	0x102fc, 0x102ff,
-	0x10324, 0x1032f,
-	0x1034b, 0x1034f,
-	0x1037b, 0x1037f,
-	0x1039e, 0x1039e,
-	0x103c4, 0x103c7,
-	0x103d6, 0x103ff,
-	0x1049e, 0x1049f,
-	0x104aa, 0x104ff,
-	0x10528, 0x1052f,
-	0x10564, 0x1056e,
-	0x10570, 0x105ff,
-	0x10737, 0x1073f,
-	0x10756, 0x1075f,
-	0x10768, 0x107ff,
-	0x10806, 0x10807,
-	0x10809, 0x10809,
-	0x10836, 0x10836,
-	0x10839, 0x1083b,
-	0x1083d, 0x1083e,
-	0x10856, 0x10856,
-	0x1089f, 0x108a6,
-	0x108b0, 0x108df,
-	0x108f3, 0x108f3,
-	0x108f6, 0x108fa,
-	0x1091c, 0x1091e,
-	0x1093a, 0x1093e,
-	0x10940, 0x1097f,
-	0x109b8, 0x109bb,
-	0x109d0, 0x109d1,
-	0x10a04, 0x10a04,
-	0x10a07, 0x10a0b,
-	0x10a14, 0x10a14,
-	0x10a18, 0x10a18,
-	0x10a34, 0x10a37,
-	0x10a3b, 0x10a3e,
-	0x10a48, 0x10a4f,
-	0x10a59, 0x10a5f,
-	0x10aa0, 0x10abf,
-	0x10ae7, 0x10aea,
-	0x10af7, 0x10aff,
-	0x10b36, 0x10b38,
-	0x10b56, 0x10b57,
-	0x10b73, 0x10b77,
-	0x10b92, 0x10b98,
-	0x10b9d, 0x10ba8,
-	0x10bb0, 0x10bff,
-	0x10c49, 0x10c7f,
-	0x10cb3, 0x10cbf,
-	0x10cf3, 0x10cf9,
-	0x10d00, 0x10e5f,
-	0x10e7f, 0x10fff,
-	0x1104e, 0x11051,
-	0x11070, 0x1107e,
-	0x110c2, 0x110cf,
-	0x110e9, 0x110ef,
-	0x110fa, 0x110ff,
-	0x11135, 0x11135,
-	0x11144, 0x1114f,
-	0x11177, 0x1117f,
-	0x111ce, 0x111cf,
-	0x111e0, 0x111e0,
-	0x111f5, 0x111ff,
-	0x11212, 0x11212,
-	0x1123e, 0x1127f,
-	0x11287, 0x11287,
-	0x11289, 0x11289,
-	0x1128e, 0x1128e,
-	0x1129e, 0x1129e,
-	0x112aa, 0x112af,
-	0x112eb, 0x112ef,
-	0x112fa, 0x112ff,
-	0x11304, 0x11304,
-	0x1130d, 0x1130e,
-	0x11311, 0x11312,
-	0x11329, 0x11329,
-	0x11331, 0x11331,
-	0x11334, 0x11334,
-	0x1133a, 0x1133b,
-	0x11345, 0x11346,
-	0x11349, 0x1134a,
-	0x1134e, 0x1134f,
-	0x11351, 0x11356,
-	0x11358, 0x1135c,
-	0x11364, 0x11365,
-	0x1136d, 0x1136f,
-	0x11375, 0x1147f,
-	0x114c8, 0x114cf,
-	0x114da, 0x1157f,
-	0x115b6, 0x115b7,
-	0x115de, 0x115ff,
-	0x11645, 0x1164f,
-	0x1165a, 0x1167f,
-	0x116b8, 0x116bf,
-	0x116ca, 0x116ff,
-	0x1171a, 0x1171c,
-	0x1172c, 0x1172f,
-	0x11740, 0x1189f,
-	0x118f3, 0x118fe,
-	0x11900, 0x11abf,
-	0x11af9, 0x11fff,
-	0x1239a, 0x123ff,
-	0x1246f, 0x1246f,
-	0x12475, 0x1247f,
-	0x12544, 0x12fff,
-	0x1342f, 0x143ff,
-	0x14647, 0x167ff,
-	0x16a39, 0x16a3f,
-	0x16a5f, 0x16a5f,
-	0x16a6a, 0x16a6d,
-	0x16a70, 0x16acf,
-	0x16aee, 0x16aef,
-	0x16af6, 0x16aff,
-	0x16b46, 0x16b4f,
-	0x16b5a, 0x16b5a,
-	0x16b62, 0x16b62,
-	0x16b78, 0x16b7c,
-	0x16b90, 0x16eff,
-	0x16f45, 0x16f4f,
-	0x16f7f, 0x16f8e,
-	0x16fa0, 0x1afff,
-	0x1b002, 0x1bbff,
-	0x1bc6b, 0x1bc6f,
-	0x1bc7d, 0x1bc7f,
-	0x1bc89, 0x1bc8f,
-	0x1bc9a, 0x1bc9b,
-	0x1bca4, 0x1cfff,
-	0x1d0f6, 0x1d0ff,
-	0x1d127, 0x1d128,
-	0x1d1e9, 0x1d1ff,
-	0x1d246, 0x1d2ff,
-	0x1d357, 0x1d35f,
-	0x1d372, 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,
-	0x1d7cc, 0x1d7cd,
-	0x1da8c, 0x1da9a,
-	0x1daa0, 0x1daa0,
-	0x1dab0, 0x1e7ff,
-	0x1e8c5, 0x1e8c6,
-	0x1e8d7, 0x1edff,
-	0x1ee04, 0x1ee04,
-	0x1ee20, 0x1ee20,
-	0x1ee23, 0x1ee23,
-	0x1ee25, 0x1ee26,
-	0x1ee28, 0x1ee28,
-	0x1ee33, 0x1ee33,
-	0x1ee38, 0x1ee38,
-	0x1ee3a, 0x1ee3a,
-	0x1ee3c, 0x1ee41,
-	0x1ee43, 0x1ee46,
-	0x1ee48, 0x1ee48,
-	0x1ee4a, 0x1ee4a,
-	0x1ee4c, 0x1ee4c,
-	0x1ee50, 0x1ee50,
-	0x1ee53, 0x1ee53,
-	0x1ee55, 0x1ee56,
-	0x1ee58, 0x1ee58,
-	0x1ee5a, 0x1ee5a,
-	0x1ee5c, 0x1ee5c,
-	0x1ee5e, 0x1ee5e,
-	0x1ee60, 0x1ee60,
-	0x1ee63, 0x1ee63,
-	0x1ee65, 0x1ee66,
-	0x1ee6b, 0x1ee6b,
-	0x1ee73, 0x1ee73,
-	0x1ee78, 0x1ee78,
-	0x1ee7d, 0x1ee7d,
-	0x1ee7f, 0x1ee7f,
-	0x1ee8a, 0x1ee8a,
-	0x1ee9c, 0x1eea0,
-	0x1eea4, 0x1eea4,
-	0x1eeaa, 0x1eeaa,
-	0x1eebc, 0x1eeef,
-	0x1eef2, 0x1efff,
-	0x1f02c, 0x1f02f,
-	0x1f094, 0x1f09f,
-	0x1f0af, 0x1f0b0,
-	0x1f0c0, 0x1f0c0,
-	0x1f0d0, 0x1f0d0,
-	0x1f0f6, 0x1f0ff,
-	0x1f10d, 0x1f10f,
-	0x1f12f, 0x1f12f,
-	0x1f16c, 0x1f16f,
-	0x1f19b, 0x1f1e5,
-	0x1f203, 0x1f20f,
-	0x1f23b, 0x1f23f,
-	0x1f249, 0x1f24f,
-	0x1f252, 0x1f2ff,
-	0x1f57a, 0x1f57a,
-	0x1f5a4, 0x1f5a4,
-	0x1f6d1, 0x1f6df,
-	0x1f6ed, 0x1f6ef,
-	0x1f6f4, 0x1f6ff,
-	0x1f774, 0x1f77f,
-	0x1f7d5, 0x1f7ff,
-	0x1f80c, 0x1f80f,
-	0x1f848, 0x1f84f,
-	0x1f85a, 0x1f85f,
-	0x1f888, 0x1f88f,
-	0x1f8ae, 0x1f90f,
-	0x1f919, 0x1f97f,
-	0x1f985, 0x1f9bf,
-	0x1f9c1, 0x1ffff,
-	0x2a6d7, 0x2a6ff,
-	0x2b735, 0x2b73f,
-	0x2b81e, 0x2b81f,
-	0x2cea2, 0x2f7ff,
-	0x2fa1e, 0xe0000,
-	0xe0002, 0xe001f,
-	0xe0080, 0xe00ff,
-	0xe01f0, 0x10ffff,
-}; /* CR_Unknown */
-
-#ifdef USE_UNICODE_AGE_PROPERTIES
-/* 'Age_1_1': Derived Age 1.1 */
-static const OnigCodePoint CR_Age_1_1[] = {
-	288,
-	0x0000, 0x01f5,
-	0x01fa, 0x0217,
-	0x0250, 0x02a8,
-	0x02b0, 0x02de,
-	0x02e0, 0x02e9,
-	0x0300, 0x0345,
-	0x0360, 0x0361,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x037e, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03ce,
-	0x03d0, 0x03d6,
-	0x03da, 0x03da,
-	0x03dc, 0x03dc,
-	0x03de, 0x03de,
-	0x03e0, 0x03e0,
-	0x03e2, 0x03f3,
-	0x0401, 0x040c,
-	0x040e, 0x044f,
-	0x0451, 0x045c,
-	0x045e, 0x0486,
-	0x0490, 0x04c4,
-	0x04c7, 0x04c8,
-	0x04cb, 0x04cc,
-	0x04d0, 0x04eb,
-	0x04ee, 0x04f5,
-	0x04f8, 0x04f9,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x0589,
-	0x05b0, 0x05b9,
-	0x05bb, 0x05c3,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x060c, 0x060c,
-	0x061b, 0x061b,
-	0x061f, 0x061f,
-	0x0621, 0x063a,
-	0x0640, 0x0652,
-	0x0660, 0x066d,
-	0x0670, 0x06b7,
-	0x06ba, 0x06be,
-	0x06c0, 0x06ce,
-	0x06d0, 0x06ed,
-	0x06f0, 0x06f9,
-	0x0901, 0x0903,
-	0x0905, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0970,
-	0x0981, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bc, 0x09bc,
-	0x09be, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cd,
-	0x09d7, 0x09d7,
-	0x09dc, 0x09dd,
-	0x09df, 0x09e3,
-	0x09e6, 0x09fa,
-	0x0a02, 0x0a02,
-	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, 0x0a8b,
-	0x0a8d, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abc, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acd,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae0,
-	0x0ae6, 0x0aef,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b36, 0x0b39,
-	0x0b3c, 0x0b43,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b61,
-	0x0b66, 0x0b70,
-	0x0b82, 0x0b83,
-	0x0b85, 0x0b8a,
-	0x0b8e, 0x0b90,
-	0x0b92, 0x0b95,
-	0x0b99, 0x0b9a,
-	0x0b9c, 0x0b9c,
-	0x0b9e, 0x0b9f,
-	0x0ba3, 0x0ba4,
-	0x0ba8, 0x0baa,
-	0x0bae, 0x0bb5,
-	0x0bb7, 0x0bb9,
-	0x0bbe, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcd,
-	0x0bd7, 0x0bd7,
-	0x0be7, 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,
-	0x0cbe, 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,
-	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,
-	0x10a0, 0x10c5,
-	0x10d0, 0x10f6,
-	0x10fb, 0x10fb,
-	0x1100, 0x1159,
-	0x115f, 0x11a2,
-	0x11a8, 0x11f9,
-	0x1e00, 0x1e9a,
-	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, 0x202e,
-	0x2030, 0x2046,
-	0x206a, 0x2070,
-	0x2074, 0x208e,
-	0x20a0, 0x20aa,
-	0x20d0, 0x20e1,
-	0x2100, 0x2138,
-	0x2153, 0x2182,
-	0x2190, 0x21ea,
-	0x2200, 0x22f1,
-	0x2300, 0x2300,
-	0x2302, 0x237a,
-	0x2400, 0x2424,
-	0x2440, 0x244a,
-	0x2460, 0x24ea,
-	0x2500, 0x2595,
-	0x25a0, 0x25ef,
-	0x2600, 0x2613,
-	0x261a, 0x266f,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2767,
-	0x2776, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x3000, 0x3037,
-	0x303f, 0x303f,
-	0x3041, 0x3094,
-	0x3099, 0x309e,
-	0x30a1, 0x30fe,
-	0x3105, 0x312c,
-	0x3131, 0x318e,
-	0x3190, 0x319f,
-	0x3200, 0x321c,
-	0x3220, 0x3243,
-	0x3260, 0x327b,
-	0x327f, 0x32b0,
-	0x32c0, 0x32cb,
-	0x32d0, 0x32fe,
-	0x3300, 0x3376,
-	0x337b, 0x33dd,
-	0x33e0, 0x33fe,
-	0x4e00, 0x9fa5,
-	0xe000, 0xfa2d,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1e, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe20, 0xfe23,
-	0xfe30, 0xfe44,
-	0xfe49, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfe70, 0xfe72,
-	0xfe74, 0xfe74,
-	0xfe76, 0xfefc,
-	0xfeff, 0xfeff,
-	0xff01, 0xff5e,
-	0xff61, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfffd, 0xffff,
-}; /* CR_Age_1_1 */
-
-/* 'Age_2_0': Derived Age 2.0 */
-static const OnigCodePoint CR_Age_2_0[] = {
-	312,
-	0x0000, 0x01f5,
-	0x01fa, 0x0217,
-	0x0250, 0x02a8,
-	0x02b0, 0x02de,
-	0x02e0, 0x02e9,
-	0x0300, 0x0345,
-	0x0360, 0x0361,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x037e, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03ce,
-	0x03d0, 0x03d6,
-	0x03da, 0x03da,
-	0x03dc, 0x03dc,
-	0x03de, 0x03de,
-	0x03e0, 0x03e0,
-	0x03e2, 0x03f3,
-	0x0401, 0x040c,
-	0x040e, 0x044f,
-	0x0451, 0x045c,
-	0x045e, 0x0486,
-	0x0490, 0x04c4,
-	0x04c7, 0x04c8,
-	0x04cb, 0x04cc,
-	0x04d0, 0x04eb,
-	0x04ee, 0x04f5,
-	0x04f8, 0x04f9,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x0589,
-	0x0591, 0x05a1,
-	0x05a3, 0x05b9,
-	0x05bb, 0x05c4,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x060c, 0x060c,
-	0x061b, 0x061b,
-	0x061f, 0x061f,
-	0x0621, 0x063a,
-	0x0640, 0x0652,
-	0x0660, 0x066d,
-	0x0670, 0x06b7,
-	0x06ba, 0x06be,
-	0x06c0, 0x06ce,
-	0x06d0, 0x06ed,
-	0x06f0, 0x06f9,
-	0x0901, 0x0903,
-	0x0905, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0970,
-	0x0981, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bc, 0x09bc,
-	0x09be, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cd,
-	0x09d7, 0x09d7,
-	0x09dc, 0x09dd,
-	0x09df, 0x09e3,
-	0x09e6, 0x09fa,
-	0x0a02, 0x0a02,
-	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, 0x0a8b,
-	0x0a8d, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abc, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acd,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae0,
-	0x0ae6, 0x0aef,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b36, 0x0b39,
-	0x0b3c, 0x0b43,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b61,
-	0x0b66, 0x0b70,
-	0x0b82, 0x0b83,
-	0x0b85, 0x0b8a,
-	0x0b8e, 0x0b90,
-	0x0b92, 0x0b95,
-	0x0b99, 0x0b9a,
-	0x0b9c, 0x0b9c,
-	0x0b9e, 0x0b9f,
-	0x0ba3, 0x0ba4,
-	0x0ba8, 0x0baa,
-	0x0bae, 0x0bb5,
-	0x0bb7, 0x0bb9,
-	0x0bbe, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcd,
-	0x0bd7, 0x0bd7,
-	0x0be7, 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,
-	0x0cbe, 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,
-	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, 0x0f69,
-	0x0f71, 0x0f8b,
-	0x0f90, 0x0f95,
-	0x0f97, 0x0f97,
-	0x0f99, 0x0fad,
-	0x0fb1, 0x0fb7,
-	0x0fb9, 0x0fb9,
-	0x10a0, 0x10c5,
-	0x10d0, 0x10f6,
-	0x10fb, 0x10fb,
-	0x1100, 0x1159,
-	0x115f, 0x11a2,
-	0x11a8, 0x11f9,
-	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, 0x202e,
-	0x2030, 0x2046,
-	0x206a, 0x2070,
-	0x2074, 0x208e,
-	0x20a0, 0x20ab,
-	0x20d0, 0x20e1,
-	0x2100, 0x2138,
-	0x2153, 0x2182,
-	0x2190, 0x21ea,
-	0x2200, 0x22f1,
-	0x2300, 0x2300,
-	0x2302, 0x237a,
-	0x2400, 0x2424,
-	0x2440, 0x244a,
-	0x2460, 0x24ea,
-	0x2500, 0x2595,
-	0x25a0, 0x25ef,
-	0x2600, 0x2613,
-	0x261a, 0x266f,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2767,
-	0x2776, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x3000, 0x3037,
-	0x303f, 0x303f,
-	0x3041, 0x3094,
-	0x3099, 0x309e,
-	0x30a1, 0x30fe,
-	0x3105, 0x312c,
-	0x3131, 0x318e,
-	0x3190, 0x319f,
-	0x3200, 0x321c,
-	0x3220, 0x3243,
-	0x3260, 0x327b,
-	0x327f, 0x32b0,
-	0x32c0, 0x32cb,
-	0x32d0, 0x32fe,
-	0x3300, 0x3376,
-	0x337b, 0x33dd,
-	0x33e0, 0x33fe,
-	0x4e00, 0x9fa5,
-	0xac00, 0xd7a3,
-	0xd800, 0xfa2d,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1e, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe20, 0xfe23,
-	0xfe30, 0xfe44,
-	0xfe49, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfe70, 0xfe72,
-	0xfe74, 0xfe74,
-	0xfe76, 0xfefc,
-	0xfeff, 0xfeff,
-	0xff01, 0xff5e,
-	0xff61, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfffd, 0xffff,
-	0x1fffe, 0x1ffff,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_2_0 */
-
-/* 'Age_2_1': Derived Age 2.1 */
-static const OnigCodePoint CR_Age_2_1[] = {
-	312,
-	0x0000, 0x01f5,
-	0x01fa, 0x0217,
-	0x0250, 0x02a8,
-	0x02b0, 0x02de,
-	0x02e0, 0x02e9,
-	0x0300, 0x0345,
-	0x0360, 0x0361,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x037e, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03ce,
-	0x03d0, 0x03d6,
-	0x03da, 0x03da,
-	0x03dc, 0x03dc,
-	0x03de, 0x03de,
-	0x03e0, 0x03e0,
-	0x03e2, 0x03f3,
-	0x0401, 0x040c,
-	0x040e, 0x044f,
-	0x0451, 0x045c,
-	0x045e, 0x0486,
-	0x0490, 0x04c4,
-	0x04c7, 0x04c8,
-	0x04cb, 0x04cc,
-	0x04d0, 0x04eb,
-	0x04ee, 0x04f5,
-	0x04f8, 0x04f9,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x0589,
-	0x0591, 0x05a1,
-	0x05a3, 0x05b9,
-	0x05bb, 0x05c4,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x060c, 0x060c,
-	0x061b, 0x061b,
-	0x061f, 0x061f,
-	0x0621, 0x063a,
-	0x0640, 0x0652,
-	0x0660, 0x066d,
-	0x0670, 0x06b7,
-	0x06ba, 0x06be,
-	0x06c0, 0x06ce,
-	0x06d0, 0x06ed,
-	0x06f0, 0x06f9,
-	0x0901, 0x0903,
-	0x0905, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0970,
-	0x0981, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bc, 0x09bc,
-	0x09be, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cd,
-	0x09d7, 0x09d7,
-	0x09dc, 0x09dd,
-	0x09df, 0x09e3,
-	0x09e6, 0x09fa,
-	0x0a02, 0x0a02,
-	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, 0x0a8b,
-	0x0a8d, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abc, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acd,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae0,
-	0x0ae6, 0x0aef,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b36, 0x0b39,
-	0x0b3c, 0x0b43,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b61,
-	0x0b66, 0x0b70,
-	0x0b82, 0x0b83,
-	0x0b85, 0x0b8a,
-	0x0b8e, 0x0b90,
-	0x0b92, 0x0b95,
-	0x0b99, 0x0b9a,
-	0x0b9c, 0x0b9c,
-	0x0b9e, 0x0b9f,
-	0x0ba3, 0x0ba4,
-	0x0ba8, 0x0baa,
-	0x0bae, 0x0bb5,
-	0x0bb7, 0x0bb9,
-	0x0bbe, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcd,
-	0x0bd7, 0x0bd7,
-	0x0be7, 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,
-	0x0cbe, 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,
-	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, 0x0f69,
-	0x0f71, 0x0f8b,
-	0x0f90, 0x0f95,
-	0x0f97, 0x0f97,
-	0x0f99, 0x0fad,
-	0x0fb1, 0x0fb7,
-	0x0fb9, 0x0fb9,
-	0x10a0, 0x10c5,
-	0x10d0, 0x10f6,
-	0x10fb, 0x10fb,
-	0x1100, 0x1159,
-	0x115f, 0x11a2,
-	0x11a8, 0x11f9,
-	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, 0x202e,
-	0x2030, 0x2046,
-	0x206a, 0x2070,
-	0x2074, 0x208e,
-	0x20a0, 0x20ac,
-	0x20d0, 0x20e1,
-	0x2100, 0x2138,
-	0x2153, 0x2182,
-	0x2190, 0x21ea,
-	0x2200, 0x22f1,
-	0x2300, 0x2300,
-	0x2302, 0x237a,
-	0x2400, 0x2424,
-	0x2440, 0x244a,
-	0x2460, 0x24ea,
-	0x2500, 0x2595,
-	0x25a0, 0x25ef,
-	0x2600, 0x2613,
-	0x261a, 0x266f,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2767,
-	0x2776, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x3000, 0x3037,
-	0x303f, 0x303f,
-	0x3041, 0x3094,
-	0x3099, 0x309e,
-	0x30a1, 0x30fe,
-	0x3105, 0x312c,
-	0x3131, 0x318e,
-	0x3190, 0x319f,
-	0x3200, 0x321c,
-	0x3220, 0x3243,
-	0x3260, 0x327b,
-	0x327f, 0x32b0,
-	0x32c0, 0x32cb,
-	0x32d0, 0x32fe,
-	0x3300, 0x3376,
-	0x337b, 0x33dd,
-	0x33e0, 0x33fe,
-	0x4e00, 0x9fa5,
-	0xac00, 0xd7a3,
-	0xd800, 0xfa2d,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1e, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe20, 0xfe23,
-	0xfe30, 0xfe44,
-	0xfe49, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfe70, 0xfe72,
-	0xfe74, 0xfe74,
-	0xfe76, 0xfefc,
-	0xfeff, 0xfeff,
-	0xff01, 0xff5e,
-	0xff61, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfffc, 0xffff,
-	0x1fffe, 0x1ffff,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_2_1 */
-
-/* 'Age_3_0': Derived Age 3.0 */
-static const OnigCodePoint CR_Age_3_0[] = {
-	369,
-	0x0000, 0x021f,
-	0x0222, 0x0233,
-	0x0250, 0x02ad,
-	0x02b0, 0x02ee,
-	0x0300, 0x034e,
-	0x0360, 0x0362,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x037e, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03ce,
-	0x03d0, 0x03d7,
-	0x03da, 0x03f3,
-	0x0400, 0x0486,
-	0x0488, 0x0489,
-	0x048c, 0x04c4,
-	0x04c7, 0x04c8,
-	0x04cb, 0x04cc,
-	0x04d0, 0x04f5,
-	0x04f8, 0x04f9,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x0591, 0x05a1,
-	0x05a3, 0x05b9,
-	0x05bb, 0x05c4,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x060c, 0x060c,
-	0x061b, 0x061b,
-	0x061f, 0x061f,
-	0x0621, 0x063a,
-	0x0640, 0x0655,
-	0x0660, 0x066d,
-	0x0670, 0x06ed,
-	0x06f0, 0x06fe,
-	0x0700, 0x070d,
-	0x070f, 0x072c,
-	0x0730, 0x074a,
-	0x0780, 0x07b0,
-	0x0901, 0x0903,
-	0x0905, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0970,
-	0x0981, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bc, 0x09bc,
-	0x09be, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cd,
-	0x09d7, 0x09d7,
-	0x09dc, 0x09dd,
-	0x09df, 0x09e3,
-	0x09e6, 0x09fa,
-	0x0a02, 0x0a02,
-	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, 0x0a8b,
-	0x0a8d, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abc, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acd,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae0,
-	0x0ae6, 0x0aef,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b36, 0x0b39,
-	0x0b3c, 0x0b43,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b61,
-	0x0b66, 0x0b70,
-	0x0b82, 0x0b83,
-	0x0b85, 0x0b8a,
-	0x0b8e, 0x0b90,
-	0x0b92, 0x0b95,
-	0x0b99, 0x0b9a,
-	0x0b9c, 0x0b9c,
-	0x0b9e, 0x0b9f,
-	0x0ba3, 0x0ba4,
-	0x0ba8, 0x0baa,
-	0x0bae, 0x0bb5,
-	0x0bb7, 0x0bb9,
-	0x0bbe, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcd,
-	0x0bd7, 0x0bd7,
-	0x0be7, 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,
-	0x0cbe, 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, 0x0fcf,
-	0x1000, 0x1021,
-	0x1023, 0x1027,
-	0x1029, 0x102a,
-	0x102c, 0x1032,
-	0x1036, 0x1039,
-	0x1040, 0x1059,
-	0x10a0, 0x10c5,
-	0x10d0, 0x10f6,
-	0x10fb, 0x10fb,
-	0x1100, 0x1159,
-	0x115f, 0x11a2,
-	0x11a8, 0x11f9,
-	0x1200, 0x1206,
-	0x1208, 0x1246,
-	0x1248, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1286,
-	0x1288, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12ae,
-	0x12b0, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12ce,
-	0x12d0, 0x12d6,
-	0x12d8, 0x12ee,
-	0x12f0, 0x130e,
-	0x1310, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x131e,
-	0x1320, 0x1346,
-	0x1348, 0x135a,
-	0x1361, 0x137c,
-	0x13a0, 0x13f4,
-	0x1401, 0x1676,
-	0x1680, 0x169c,
-	0x16a0, 0x16f0,
-	0x1780, 0x17dc,
-	0x17e0, 0x17e9,
-	0x1800, 0x180e,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18a9,
-	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, 0x2046,
-	0x2048, 0x204d,
-	0x206a, 0x2070,
-	0x2074, 0x208e,
-	0x20a0, 0x20af,
-	0x20d0, 0x20e3,
-	0x2100, 0x213a,
-	0x2153, 0x2183,
-	0x2190, 0x21f3,
-	0x2200, 0x22f1,
-	0x2300, 0x237b,
-	0x237d, 0x239a,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x24ea,
-	0x2500, 0x2595,
-	0x25a0, 0x25f7,
-	0x2600, 0x2613,
-	0x2619, 0x2671,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2767,
-	0x2776, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x2800, 0x28ff,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303a,
-	0x303e, 0x303f,
-	0x3041, 0x3094,
-	0x3099, 0x309e,
-	0x30a1, 0x30fe,
-	0x3105, 0x312c,
-	0x3131, 0x318e,
-	0x3190, 0x31b7,
-	0x3200, 0x321c,
-	0x3220, 0x3243,
-	0x3260, 0x327b,
-	0x327f, 0x32b0,
-	0x32c0, 0x32cb,
-	0x32d0, 0x32fe,
-	0x3300, 0x3376,
-	0x337b, 0x33dd,
-	0x33e0, 0x33fe,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fa5,
-	0xa000, 0xa48c,
-	0xa490, 0xa4a1,
-	0xa4a4, 0xa4b3,
-	0xa4b5, 0xa4c0,
-	0xa4c2, 0xa4c4,
-	0xa4c6, 0xa4c6,
-	0xac00, 0xd7a3,
-	0xd800, 0xfa2d,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe20, 0xfe23,
-	0xfe30, 0xfe44,
-	0xfe49, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfe70, 0xfe72,
-	0xfe74, 0xfe74,
-	0xfe76, 0xfefc,
-	0xfeff, 0xfeff,
-	0xff01, 0xff5e,
-	0xff61, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfff9, 0xffff,
-	0x1fffe, 0x1ffff,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_3_0 */
-
-/* 'Age_3_1': Derived Age 3.1 */
-static const OnigCodePoint CR_Age_3_1[] = {
-	402,
-	0x0000, 0x021f,
-	0x0222, 0x0233,
-	0x0250, 0x02ad,
-	0x02b0, 0x02ee,
-	0x0300, 0x034e,
-	0x0360, 0x0362,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x037e, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03ce,
-	0x03d0, 0x03d7,
-	0x03da, 0x03f5,
-	0x0400, 0x0486,
-	0x0488, 0x0489,
-	0x048c, 0x04c4,
-	0x04c7, 0x04c8,
-	0x04cb, 0x04cc,
-	0x04d0, 0x04f5,
-	0x04f8, 0x04f9,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x0591, 0x05a1,
-	0x05a3, 0x05b9,
-	0x05bb, 0x05c4,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x060c, 0x060c,
-	0x061b, 0x061b,
-	0x061f, 0x061f,
-	0x0621, 0x063a,
-	0x0640, 0x0655,
-	0x0660, 0x066d,
-	0x0670, 0x06ed,
-	0x06f0, 0x06fe,
-	0x0700, 0x070d,
-	0x070f, 0x072c,
-	0x0730, 0x074a,
-	0x0780, 0x07b0,
-	0x0901, 0x0903,
-	0x0905, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0970,
-	0x0981, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bc, 0x09bc,
-	0x09be, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cd,
-	0x09d7, 0x09d7,
-	0x09dc, 0x09dd,
-	0x09df, 0x09e3,
-	0x09e6, 0x09fa,
-	0x0a02, 0x0a02,
-	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, 0x0a8b,
-	0x0a8d, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abc, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acd,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae0,
-	0x0ae6, 0x0aef,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b36, 0x0b39,
-	0x0b3c, 0x0b43,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b61,
-	0x0b66, 0x0b70,
-	0x0b82, 0x0b83,
-	0x0b85, 0x0b8a,
-	0x0b8e, 0x0b90,
-	0x0b92, 0x0b95,
-	0x0b99, 0x0b9a,
-	0x0b9c, 0x0b9c,
-	0x0b9e, 0x0b9f,
-	0x0ba3, 0x0ba4,
-	0x0ba8, 0x0baa,
-	0x0bae, 0x0bb5,
-	0x0bb7, 0x0bb9,
-	0x0bbe, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcd,
-	0x0bd7, 0x0bd7,
-	0x0be7, 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,
-	0x0cbe, 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, 0x0fcf,
-	0x1000, 0x1021,
-	0x1023, 0x1027,
-	0x1029, 0x102a,
-	0x102c, 0x1032,
-	0x1036, 0x1039,
-	0x1040, 0x1059,
-	0x10a0, 0x10c5,
-	0x10d0, 0x10f6,
-	0x10fb, 0x10fb,
-	0x1100, 0x1159,
-	0x115f, 0x11a2,
-	0x11a8, 0x11f9,
-	0x1200, 0x1206,
-	0x1208, 0x1246,
-	0x1248, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1286,
-	0x1288, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12ae,
-	0x12b0, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12ce,
-	0x12d0, 0x12d6,
-	0x12d8, 0x12ee,
-	0x12f0, 0x130e,
-	0x1310, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x131e,
-	0x1320, 0x1346,
-	0x1348, 0x135a,
-	0x1361, 0x137c,
-	0x13a0, 0x13f4,
-	0x1401, 0x1676,
-	0x1680, 0x169c,
-	0x16a0, 0x16f0,
-	0x1780, 0x17dc,
-	0x17e0, 0x17e9,
-	0x1800, 0x180e,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18a9,
-	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, 0x2046,
-	0x2048, 0x204d,
-	0x206a, 0x2070,
-	0x2074, 0x208e,
-	0x20a0, 0x20af,
-	0x20d0, 0x20e3,
-	0x2100, 0x213a,
-	0x2153, 0x2183,
-	0x2190, 0x21f3,
-	0x2200, 0x22f1,
-	0x2300, 0x237b,
-	0x237d, 0x239a,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x24ea,
-	0x2500, 0x2595,
-	0x25a0, 0x25f7,
-	0x2600, 0x2613,
-	0x2619, 0x2671,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2767,
-	0x2776, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x2800, 0x28ff,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303a,
-	0x303e, 0x303f,
-	0x3041, 0x3094,
-	0x3099, 0x309e,
-	0x30a1, 0x30fe,
-	0x3105, 0x312c,
-	0x3131, 0x318e,
-	0x3190, 0x31b7,
-	0x3200, 0x321c,
-	0x3220, 0x3243,
-	0x3260, 0x327b,
-	0x327f, 0x32b0,
-	0x32c0, 0x32cb,
-	0x32d0, 0x32fe,
-	0x3300, 0x3376,
-	0x337b, 0x33dd,
-	0x33e0, 0x33fe,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fa5,
-	0xa000, 0xa48c,
-	0xa490, 0xa4a1,
-	0xa4a4, 0xa4b3,
-	0xa4b5, 0xa4c0,
-	0xa4c2, 0xa4c4,
-	0xa4c6, 0xa4c6,
-	0xac00, 0xd7a3,
-	0xd800, 0xfa2d,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 0xfdfb,
-	0xfe20, 0xfe23,
-	0xfe30, 0xfe44,
-	0xfe49, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfe70, 0xfe72,
-	0xfe74, 0xfe74,
-	0xfe76, 0xfefc,
-	0xfeff, 0xfeff,
-	0xff01, 0xff5e,
-	0xff61, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfff9, 0xffff,
-	0x10300, 0x1031e,
-	0x10320, 0x10323,
-	0x10330, 0x1034a,
-	0x10400, 0x10425,
-	0x10428, 0x1044d,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d12a, 0x1d1dd,
-	0x1d400, 0x1d454,
-	0x1d456, 0x1d49c,
-	0x1d49e, 0x1d49f,
-	0x1d4a2, 0x1d4a2,
-	0x1d4a5, 0x1d4a6,
-	0x1d4a9, 0x1d4ac,
-	0x1d4ae, 0x1d4b9,
-	0x1d4bb, 0x1d4bb,
-	0x1d4bd, 0x1d4c0,
-	0x1d4c2, 0x1d4c3,
-	0x1d4c5, 0x1d505,
-	0x1d507, 0x1d50a,
-	0x1d50d, 0x1d514,
-	0x1d516, 0x1d51c,
-	0x1d51e, 0x1d539,
-	0x1d53b, 0x1d53e,
-	0x1d540, 0x1d544,
-	0x1d546, 0x1d546,
-	0x1d54a, 0x1d550,
-	0x1d552, 0x1d6a3,
-	0x1d6a8, 0x1d7c9,
-	0x1d7ce, 0x1d7ff,
-	0x1fffe, 0x2a6d6,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_3_1 */
-
-/* 'Age_3_2': Derived Age 3.2 */
-static const OnigCodePoint CR_Age_3_2[] = {
-	397,
-	0x0000, 0x0220,
-	0x0222, 0x0233,
-	0x0250, 0x02ad,
-	0x02b0, 0x02ee,
-	0x0300, 0x034f,
-	0x0360, 0x036f,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x037e, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03ce,
-	0x03d0, 0x03f6,
-	0x0400, 0x0486,
-	0x0488, 0x04ce,
-	0x04d0, 0x04f5,
-	0x04f8, 0x04f9,
-	0x0500, 0x050f,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x0591, 0x05a1,
-	0x05a3, 0x05b9,
-	0x05bb, 0x05c4,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x060c, 0x060c,
-	0x061b, 0x061b,
-	0x061f, 0x061f,
-	0x0621, 0x063a,
-	0x0640, 0x0655,
-	0x0660, 0x06ed,
-	0x06f0, 0x06fe,
-	0x0700, 0x070d,
-	0x070f, 0x072c,
-	0x0730, 0x074a,
-	0x0780, 0x07b1,
-	0x0901, 0x0903,
-	0x0905, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0970,
-	0x0981, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bc, 0x09bc,
-	0x09be, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cd,
-	0x09d7, 0x09d7,
-	0x09dc, 0x09dd,
-	0x09df, 0x09e3,
-	0x09e6, 0x09fa,
-	0x0a02, 0x0a02,
-	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, 0x0a8b,
-	0x0a8d, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abc, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acd,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae0,
-	0x0ae6, 0x0aef,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b36, 0x0b39,
-	0x0b3c, 0x0b43,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b61,
-	0x0b66, 0x0b70,
-	0x0b82, 0x0b83,
-	0x0b85, 0x0b8a,
-	0x0b8e, 0x0b90,
-	0x0b92, 0x0b95,
-	0x0b99, 0x0b9a,
-	0x0b9c, 0x0b9c,
-	0x0b9e, 0x0b9f,
-	0x0ba3, 0x0ba4,
-	0x0ba8, 0x0baa,
-	0x0bae, 0x0bb5,
-	0x0bb7, 0x0bb9,
-	0x0bbe, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcd,
-	0x0bd7, 0x0bd7,
-	0x0be7, 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,
-	0x0cbe, 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, 0x0fcf,
-	0x1000, 0x1021,
-	0x1023, 0x1027,
-	0x1029, 0x102a,
-	0x102c, 0x1032,
-	0x1036, 0x1039,
-	0x1040, 0x1059,
-	0x10a0, 0x10c5,
-	0x10d0, 0x10f8,
-	0x10fb, 0x10fb,
-	0x1100, 0x1159,
-	0x115f, 0x11a2,
-	0x11a8, 0x11f9,
-	0x1200, 0x1206,
-	0x1208, 0x1246,
-	0x1248, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1286,
-	0x1288, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12ae,
-	0x12b0, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12ce,
-	0x12d0, 0x12d6,
-	0x12d8, 0x12ee,
-	0x12f0, 0x130e,
-	0x1310, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x131e,
-	0x1320, 0x1346,
-	0x1348, 0x135a,
-	0x1361, 0x137c,
-	0x13a0, 0x13f4,
-	0x1401, 0x1676,
-	0x1680, 0x169c,
-	0x16a0, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1714,
-	0x1720, 0x1736,
-	0x1740, 0x1753,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-	0x1780, 0x17dc,
-	0x17e0, 0x17e9,
-	0x1800, 0x180e,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18a9,
-	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, 0x2052,
-	0x2057, 0x2057,
-	0x205f, 0x2063,
-	0x206a, 0x2071,
-	0x2074, 0x208e,
-	0x20a0, 0x20b1,
-	0x20d0, 0x20ea,
-	0x2100, 0x213a,
-	0x213d, 0x214b,
-	0x2153, 0x2183,
-	0x2190, 0x23ce,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x24fe,
-	0x2500, 0x2613,
-	0x2616, 0x2617,
-	0x2619, 0x267d,
-	0x2680, 0x2689,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27d0, 0x27eb,
-	0x27f0, 0x2aff,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312c,
-	0x3131, 0x318e,
-	0x3190, 0x31b7,
-	0x31f0, 0x321c,
-	0x3220, 0x3243,
-	0x3251, 0x327b,
-	0x327f, 0x32cb,
-	0x32d0, 0x32fe,
-	0x3300, 0x3376,
-	0x337b, 0x33dd,
-	0x33e0, 0x33fe,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fa5,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xac00, 0xd7a3,
-	0xd800, 0xfa2d,
-	0xfa30, 0xfa6a,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 0xfdfc,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe23,
-	0xfe30, 0xfe46,
-	0xfe49, 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, 0xffff,
-	0x10300, 0x1031e,
-	0x10320, 0x10323,
-	0x10330, 0x1034a,
-	0x10400, 0x10425,
-	0x10428, 0x1044d,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d12a, 0x1d1dd,
-	0x1d400, 0x1d454,
-	0x1d456, 0x1d49c,
-	0x1d49e, 0x1d49f,
-	0x1d4a2, 0x1d4a2,
-	0x1d4a5, 0x1d4a6,
-	0x1d4a9, 0x1d4ac,
-	0x1d4ae, 0x1d4b9,
-	0x1d4bb, 0x1d4bb,
-	0x1d4bd, 0x1d4c0,
-	0x1d4c2, 0x1d4c3,
-	0x1d4c5, 0x1d505,
-	0x1d507, 0x1d50a,
-	0x1d50d, 0x1d514,
-	0x1d516, 0x1d51c,
-	0x1d51e, 0x1d539,
-	0x1d53b, 0x1d53e,
-	0x1d540, 0x1d544,
-	0x1d546, 0x1d546,
-	0x1d54a, 0x1d550,
-	0x1d552, 0x1d6a3,
-	0x1d6a8, 0x1d7c9,
-	0x1d7ce, 0x1d7ff,
-	0x1fffe, 0x2a6d6,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_3_2 */
-
-/* 'Age_4_0': Derived Age 4.0 */
-static const OnigCodePoint CR_Age_4_0[] = {
-	412,
-	0x0000, 0x0236,
-	0x0250, 0x0357,
-	0x035d, 0x036f,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x037e, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03ce,
-	0x03d0, 0x03fb,
-	0x0400, 0x0486,
-	0x0488, 0x04ce,
-	0x04d0, 0x04f5,
-	0x04f8, 0x04f9,
-	0x0500, 0x050f,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x0591, 0x05a1,
-	0x05a3, 0x05b9,
-	0x05bb, 0x05c4,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x0603,
-	0x060c, 0x0615,
-	0x061b, 0x061b,
-	0x061f, 0x061f,
-	0x0621, 0x063a,
-	0x0640, 0x0658,
-	0x0660, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x074f,
-	0x0780, 0x07b1,
-	0x0901, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0970,
-	0x0981, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bc, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cd,
-	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, 0x0bb5,
-	0x0bb7, 0x0bb9,
-	0x0bbe, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcd,
-	0x0bd7, 0x0bd7,
-	0x0be7, 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, 0x0fcf,
-	0x1000, 0x1021,
-	0x1023, 0x1027,
-	0x1029, 0x102a,
-	0x102c, 0x1032,
-	0x1036, 0x1039,
-	0x1040, 0x1059,
-	0x10a0, 0x10c5,
-	0x10d0, 0x10f8,
-	0x10fb, 0x10fb,
-	0x1100, 0x1159,
-	0x115f, 0x11a2,
-	0x11a8, 0x11f9,
-	0x1200, 0x1206,
-	0x1208, 0x1246,
-	0x1248, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1286,
-	0x1288, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12ae,
-	0x12b0, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12ce,
-	0x12d0, 0x12d6,
-	0x12d8, 0x12ee,
-	0x12f0, 0x130e,
-	0x1310, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x131e,
-	0x1320, 0x1346,
-	0x1348, 0x135a,
-	0x1361, 0x137c,
-	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,
-	0x19e0, 0x19ff,
-	0x1d00, 0x1d6b,
-	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, 0x2054,
-	0x2057, 0x2057,
-	0x205f, 0x2063,
-	0x206a, 0x2071,
-	0x2074, 0x208e,
-	0x20a0, 0x20b1,
-	0x20d0, 0x20ea,
-	0x2100, 0x213b,
-	0x213d, 0x214b,
-	0x2153, 0x2183,
-	0x2190, 0x23d0,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x2617,
-	0x2619, 0x267d,
-	0x2680, 0x2691,
-	0x26a0, 0x26a1,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27d0, 0x27eb,
-	0x27f0, 0x2b0d,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312c,
-	0x3131, 0x318e,
-	0x3190, 0x31b7,
-	0x31f0, 0x321e,
-	0x3220, 0x3243,
-	0x3250, 0x327d,
-	0x327f, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fa5,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xac00, 0xd7a3,
-	0xd800, 0xfa2d,
-	0xfa30, 0xfa6a,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 0xfdfd,
-	0xfe00, 0xfe0f,
-	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, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1013f,
-	0x10300, 0x1031e,
-	0x10320, 0x10323,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x1039f, 0x1039f,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x1083f,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d12a, 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, 0x1d6a3,
-	0x1d6a8, 0x1d7c9,
-	0x1d7ce, 0x1d7ff,
-	0x1fffe, 0x2a6d6,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_4_0 */
-
-/* 'Age_4_1': Derived Age 4.1 */
-static const OnigCodePoint CR_Age_4_1[] = {
-	430,
-	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,
-	0xfdd0, 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, 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,
-	0x1fffe, 0x2a6d6,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_4_1 */
-
-/* 'Age_5_0': Derived Age 5.0 */
-static const OnigCodePoint CR_Age_5_0[] = {
-	440,
-	0x0000, 0x036f,
-	0x0374, 0x0375,
-	0x037a, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03ce,
-	0x03d0, 0x0486,
-	0x0488, 0x0513,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x0591, 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,
-	0x07c0, 0x07fa,
-	0x0901, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0970,
-	0x097b, 0x097f,
-	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, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	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,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1d00, 0x1dca,
-	0x1dfe, 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, 0x20ef,
-	0x2100, 0x214e,
-	0x2153, 0x2184,
-	0x2190, 0x23e7,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x269c,
-	0x26a0, 0x26b2,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27c0, 0x27ca,
-	0x27d0, 0x27eb,
-	0x27f0, 0x2b1a,
-	0x2b20, 0x2b23,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2c6c,
-	0x2c74, 0x2c77,
-	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, 0xa71a,
-	0xa720, 0xa721,
-	0xa800, 0xa82b,
-	0xa840, 0xa877,
-	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,
-	0xfdd0, 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, 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,
-	0x10900, 0x10919,
-	0x1091f, 0x1091f,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d12a, 0x1d1dd,
-	0x1d200, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1fffe, 0x2a6d6,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_5_0 */
-
-/* 'Age_5_1': Derived Age 5.1 */
-static const OnigCodePoint CR_Age_5_1[] = {
-	455,
-	0x0000, 0x0377,
-	0x037a, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x0523,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x0603,
-	0x0606, 0x061b,
-	0x061e, 0x061f,
-	0x0621, 0x065e,
-	0x0660, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0901, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0972,
-	0x097b, 0x097f,
-	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,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bfa,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-	0x0c82, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
-	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, 0x0f6c,
-	0x0f71, 0x0f8b,
-	0x0f90, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fd4,
-	0x1000, 0x1099,
-	0x109e, 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, 0x18aa,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19a9,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19d9,
-	0x19de, 0x1a1b,
-	0x1a1e, 0x1a1f,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1baa,
-	0x1bae, 0x1bb9,
-	0x1c00, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1d00, 0x1de6,
-	0x1dfe, 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, 0x2064,
-	0x206a, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x2094,
-	0x20a0, 0x20b5,
-	0x20d0, 0x20f0,
-	0x2100, 0x214f,
-	0x2153, 0x2188,
-	0x2190, 0x23e7,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x269d,
-	0x26a0, 0x26bc,
-	0x26c0, 0x26c3,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27c0, 0x27ca,
-	0x27cc, 0x27cc,
-	0x27d0, 0x2b4c,
-	0x2b50, 0x2b54,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2c6f,
-	0x2c71, 0x2c7d,
-	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,
-	0x2de0, 0x2e30,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31b7,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x3243,
-	0x3250, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fc3,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa500, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa673,
-	0xa67c, 0xa697,
-	0xa700, 0xa78c,
-	0xa7fb, 0xa82b,
-	0xa840, 0xa877,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-	0xa900, 0xa953,
-	0xa95f, 0xa95f,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa5f,
-	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,
-	0xfdd0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe26,
-	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, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018a,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	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,
-	0x10900, 0x10919,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d1dd,
-	0x1d200, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1fffe, 0x2a6d6,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_5_1 */
-
-/* 'Age_5_2': Derived Age 5.2 */
-static const OnigCodePoint CR_Age_5_2[] = {
-	495,
-	0x0000, 0x0377,
-	0x037a, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x0525,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x0603,
-	0x0606, 0x061b,
-	0x061e, 0x061f,
-	0x0621, 0x065e,
-	0x0660, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-	0x0900, 0x0939,
-	0x093c, 0x094e,
-	0x0950, 0x0955,
-	0x0958, 0x0972,
-	0x0979, 0x097f,
-	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, 0x09fb,
-	0x0a01, 0x0a03,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bfa,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-	0x0c82, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
-	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, 0x0f6c,
-	0x0f71, 0x0f8b,
-	0x0f90, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fd8,
-	0x1000, 0x10c5,
-	0x10d0, 0x10fc,
-	0x1100, 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,
-	0x1400, 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, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a1b,
-	0x1a1e, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1baa,
-	0x1bae, 0x1bb9,
-	0x1c00, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cd0, 0x1cf2,
-	0x1d00, 0x1de6,
-	0x1dfd, 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, 0x2064,
-	0x206a, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x2094,
-	0x20a0, 0x20b8,
-	0x20d0, 0x20f0,
-	0x2100, 0x2189,
-	0x2190, 0x23e8,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x26cd,
-	0x26cf, 0x26e1,
-	0x26e3, 0x26e3,
-	0x26e8, 0x26ff,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27c0, 0x27ca,
-	0x27cc, 0x27cc,
-	0x27d0, 0x2b4c,
-	0x2b50, 0x2b59,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf1,
-	0x2cf9, 0x2d25,
-	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2e31,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31b7,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa673,
-	0xa67c, 0xa697,
-	0xa6a0, 0xa6f7,
-	0xa700, 0xa78c,
-	0xa7fb, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-	0xa8e0, 0xa8fb,
-	0xa900, 0xa953,
-	0xa95f, 0xa97c,
-	0xa980, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9df,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa7b,
-	0xaa80, 0xaac2,
-	0xaadb, 0xaadf,
-	0xabc0, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xd800, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe26,
-	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, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018a,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	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, 0x10855,
-	0x10857, 0x1085f,
-	0x10900, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a7f,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b7f,
-	0x10c00, 0x10c48,
-	0x10e60, 0x10e7e,
-	0x11080, 0x110c1,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-	0x13000, 0x1342e,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d1dd,
-	0x1d200, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f100, 0x1f10a,
-	0x1f110, 0x1f12e,
-	0x1f131, 0x1f131,
-	0x1f13d, 0x1f13d,
-	0x1f13f, 0x1f13f,
-	0x1f142, 0x1f142,
-	0x1f146, 0x1f146,
-	0x1f14a, 0x1f14e,
-	0x1f157, 0x1f157,
-	0x1f15f, 0x1f15f,
-	0x1f179, 0x1f179,
-	0x1f17b, 0x1f17c,
-	0x1f17f, 0x1f17f,
-	0x1f18a, 0x1f18d,
-	0x1f190, 0x1f190,
-	0x1f200, 0x1f200,
-	0x1f210, 0x1f231,
-	0x1f240, 0x1f248,
-	0x1fffe, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_5_2 */
-
-/* 'Age_6_0': Derived Age 6.0 */
-static const OnigCodePoint CR_Age_6_0[] = {
-	511,
-	0x0000, 0x0377,
-	0x037a, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x0527,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x0603,
-	0x0606, 0x061b,
-	0x061e, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-	0x0840, 0x085b,
-	0x085e, 0x085e,
-	0x0900, 0x0977,
-	0x0979, 0x097f,
-	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, 0x09fb,
-	0x0a01, 0x0a03,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	0x0b66, 0x0b77,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bfa,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-	0x0c82, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
-	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, 0x0f6c,
-	0x0f71, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fda,
-	0x1000, 0x10c5,
-	0x10d0, 0x10fc,
-	0x1100, 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,
-	0x135d, 0x137c,
-	0x1380, 0x1399,
-	0x13a0, 0x13f4,
-	0x1400, 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, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a1b,
-	0x1a1e, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1baa,
-	0x1bae, 0x1bb9,
-	0x1bc0, 0x1bf3,
-	0x1bfc, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cd0, 0x1cf2,
-	0x1d00, 0x1de6,
-	0x1dfc, 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, 0x2064,
-	0x206a, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x209c,
-	0x20a0, 0x20b9,
-	0x20d0, 0x20f0,
-	0x2100, 0x2189,
-	0x2190, 0x23f3,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x26ff,
-	0x2701, 0x27ca,
-	0x27cc, 0x27cc,
-	0x27ce, 0x2b4c,
-	0x2b50, 0x2b59,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf1,
-	0x2cf9, 0x2d25,
-	0x2d30, 0x2d65,
-	0x2d6f, 0x2d70,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2e31,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa673,
-	0xa67c, 0xa697,
-	0xa6a0, 0xa6f7,
-	0xa700, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-	0xa8e0, 0xa8fb,
-	0xa900, 0xa953,
-	0xa95f, 0xa97c,
-	0xa980, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9df,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa7b,
-	0xaa80, 0xaac2,
-	0xaadb, 0xaadf,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xd800, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbc1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe26,
-	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, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018a,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	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, 0x10855,
-	0x10857, 0x1085f,
-	0x10900, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a7f,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b7f,
-	0x10c00, 0x10c48,
-	0x10e60, 0x10e7e,
-	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-	0x11080, 0x110c1,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x1b000, 0x1b001,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d1dd,
-	0x1d200, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	0x1f100, 0x1f10a,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f169,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f320,
-	0x1f330, 0x1f335,
-	0x1f337, 0x1f37c,
-	0x1f380, 0x1f393,
-	0x1f3a0, 0x1f3c4,
-	0x1f3c6, 0x1f3ca,
-	0x1f3e0, 0x1f3f0,
-	0x1f400, 0x1f43e,
-	0x1f440, 0x1f440,
-	0x1f442, 0x1f4f7,
-	0x1f4f9, 0x1f4fc,
-	0x1f500, 0x1f53d,
-	0x1f550, 0x1f567,
-	0x1f5fb, 0x1f5ff,
-	0x1f601, 0x1f610,
-	0x1f612, 0x1f614,
-	0x1f616, 0x1f616,
-	0x1f618, 0x1f618,
-	0x1f61a, 0x1f61a,
-	0x1f61c, 0x1f61e,
-	0x1f620, 0x1f625,
-	0x1f628, 0x1f62b,
-	0x1f62d, 0x1f62d,
-	0x1f630, 0x1f633,
-	0x1f635, 0x1f640,
-	0x1f645, 0x1f64f,
-	0x1f680, 0x1f6c5,
-	0x1f700, 0x1f773,
-	0x1fffe, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_6_0 */
-
-/* 'Age_6_1': Derived Age 6.1 */
-static const OnigCodePoint CR_Age_6_1[] = {
-	549,
-	0x0000, 0x0377,
-	0x037a, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x0527,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x058f, 0x058f,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x0604,
-	0x0606, 0x061b,
-	0x061e, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-	0x0840, 0x085b,
-	0x085e, 0x085e,
-	0x08a0, 0x08a0,
-	0x08a2, 0x08ac,
-	0x08e4, 0x08fe,
-	0x0900, 0x0977,
-	0x0979, 0x097f,
-	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, 0x09fb,
-	0x0a01, 0x0a03,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0af1,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3c, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	0x0b66, 0x0b77,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bfa,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-	0x0c82, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
-	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, 0x0edf,
-	0x0f00, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fda,
-	0x1000, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 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,
-	0x135d, 0x137c,
-	0x1380, 0x1399,
-	0x13a0, 0x13f4,
-	0x1400, 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, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a1b,
-	0x1a1e, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1bf3,
-	0x1bfc, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cc0, 0x1cc7,
-	0x1cd0, 0x1cf6,
-	0x1d00, 0x1de6,
-	0x1dfc, 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, 0x2064,
-	0x206a, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x209c,
-	0x20a0, 0x20b9,
-	0x20d0, 0x20f0,
-	0x2100, 0x2189,
-	0x2190, 0x23f3,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x26ff,
-	0x2701, 0x2b4c,
-	0x2b50, 0x2b59,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf3,
-	0x2cf9, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d70,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2e3b,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa697,
-	0xa69f, 0xa6f7,
-	0xa700, 0xa78e,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xa7f8, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-	0xa8e0, 0xa8fb,
-	0xa900, 0xa953,
-	0xa95f, 0xa97c,
-	0xa980, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9df,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa7b,
-	0xaa80, 0xaac2,
-	0xaadb, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xd800, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbc1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe26,
-	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, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018a,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	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, 0x10855,
-	0x10857, 0x1085f,
-	0x10900, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a7f,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b7f,
-	0x10c00, 0x10c48,
-	0x10e60, 0x10e7e,
-	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-	0x11080, 0x110c1,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x11143,
-	0x11180, 0x111c8,
-	0x111d0, 0x111d9,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d1dd,
-	0x1d200, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	0x1f100, 0x1f10a,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f320,
-	0x1f330, 0x1f335,
-	0x1f337, 0x1f37c,
-	0x1f380, 0x1f393,
-	0x1f3a0, 0x1f3c4,
-	0x1f3c6, 0x1f3ca,
-	0x1f3e0, 0x1f3f0,
-	0x1f400, 0x1f43e,
-	0x1f440, 0x1f440,
-	0x1f442, 0x1f4f7,
-	0x1f4f9, 0x1f4fc,
-	0x1f500, 0x1f53d,
-	0x1f540, 0x1f543,
-	0x1f550, 0x1f567,
-	0x1f5fb, 0x1f640,
-	0x1f645, 0x1f64f,
-	0x1f680, 0x1f6c5,
-	0x1f700, 0x1f773,
-	0x1fffe, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_6_1 */
-
-/* 'Age_6_2': Derived Age 6.2 */
-static const OnigCodePoint CR_Age_6_2[] = {
-	549,
-	0x0000, 0x0377,
-	0x037a, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x0527,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x058f, 0x058f,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x0604,
-	0x0606, 0x061b,
-	0x061e, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-	0x0840, 0x085b,
-	0x085e, 0x085e,
-	0x08a0, 0x08a0,
-	0x08a2, 0x08ac,
-	0x08e4, 0x08fe,
-	0x0900, 0x0977,
-	0x0979, 0x097f,
-	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, 0x09fb,
-	0x0a01, 0x0a03,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0af1,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3c, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	0x0b66, 0x0b77,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bfa,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-	0x0c82, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
-	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, 0x0edf,
-	0x0f00, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fda,
-	0x1000, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 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,
-	0x135d, 0x137c,
-	0x1380, 0x1399,
-	0x13a0, 0x13f4,
-	0x1400, 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, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a1b,
-	0x1a1e, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1bf3,
-	0x1bfc, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cc0, 0x1cc7,
-	0x1cd0, 0x1cf6,
-	0x1d00, 0x1de6,
-	0x1dfc, 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, 0x2064,
-	0x206a, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x209c,
-	0x20a0, 0x20ba,
-	0x20d0, 0x20f0,
-	0x2100, 0x2189,
-	0x2190, 0x23f3,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x26ff,
-	0x2701, 0x2b4c,
-	0x2b50, 0x2b59,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf3,
-	0x2cf9, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d70,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2e3b,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa697,
-	0xa69f, 0xa6f7,
-	0xa700, 0xa78e,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xa7f8, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-	0xa8e0, 0xa8fb,
-	0xa900, 0xa953,
-	0xa95f, 0xa97c,
-	0xa980, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9df,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa7b,
-	0xaa80, 0xaac2,
-	0xaadb, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xd800, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbc1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe26,
-	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, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018a,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	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, 0x10855,
-	0x10857, 0x1085f,
-	0x10900, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a7f,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b7f,
-	0x10c00, 0x10c48,
-	0x10e60, 0x10e7e,
-	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-	0x11080, 0x110c1,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x11143,
-	0x11180, 0x111c8,
-	0x111d0, 0x111d9,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d1dd,
-	0x1d200, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	0x1f100, 0x1f10a,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f320,
-	0x1f330, 0x1f335,
-	0x1f337, 0x1f37c,
-	0x1f380, 0x1f393,
-	0x1f3a0, 0x1f3c4,
-	0x1f3c6, 0x1f3ca,
-	0x1f3e0, 0x1f3f0,
-	0x1f400, 0x1f43e,
-	0x1f440, 0x1f440,
-	0x1f442, 0x1f4f7,
-	0x1f4f9, 0x1f4fc,
-	0x1f500, 0x1f53d,
-	0x1f540, 0x1f543,
-	0x1f550, 0x1f567,
-	0x1f5fb, 0x1f640,
-	0x1f645, 0x1f64f,
-	0x1f680, 0x1f6c5,
-	0x1f700, 0x1f773,
-	0x1fffe, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_6_2 */
-
-/* 'Age_6_3': Derived Age 6.3 */
-static const OnigCodePoint CR_Age_6_3[] = {
-	549,
-	0x0000, 0x0377,
-	0x037a, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x0527,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x058f, 0x058f,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x0604,
-	0x0606, 0x061c,
-	0x061e, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-	0x0840, 0x085b,
-	0x085e, 0x085e,
-	0x08a0, 0x08a0,
-	0x08a2, 0x08ac,
-	0x08e4, 0x08fe,
-	0x0900, 0x0977,
-	0x0979, 0x097f,
-	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, 0x09fb,
-	0x0a01, 0x0a03,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0af1,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3c, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	0x0b66, 0x0b77,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bfa,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-	0x0c82, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
-	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, 0x0edf,
-	0x0f00, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fda,
-	0x1000, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 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,
-	0x135d, 0x137c,
-	0x1380, 0x1399,
-	0x13a0, 0x13f4,
-	0x1400, 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, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a1b,
-	0x1a1e, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1bf3,
-	0x1bfc, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cc0, 0x1cc7,
-	0x1cd0, 0x1cf6,
-	0x1d00, 0x1de6,
-	0x1dfc, 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, 0x2064,
-	0x2066, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x209c,
-	0x20a0, 0x20ba,
-	0x20d0, 0x20f0,
-	0x2100, 0x2189,
-	0x2190, 0x23f3,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x26ff,
-	0x2701, 0x2b4c,
-	0x2b50, 0x2b59,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf3,
-	0x2cf9, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d70,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2e3b,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa697,
-	0xa69f, 0xa6f7,
-	0xa700, 0xa78e,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xa7f8, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-	0xa8e0, 0xa8fb,
-	0xa900, 0xa953,
-	0xa95f, 0xa97c,
-	0xa980, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9df,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa7b,
-	0xaa80, 0xaac2,
-	0xaadb, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xd800, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbc1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe26,
-	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, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018a,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	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, 0x10855,
-	0x10857, 0x1085f,
-	0x10900, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a7f,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b7f,
-	0x10c00, 0x10c48,
-	0x10e60, 0x10e7e,
-	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-	0x11080, 0x110c1,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x11143,
-	0x11180, 0x111c8,
-	0x111d0, 0x111d9,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d1dd,
-	0x1d200, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	0x1f100, 0x1f10a,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f320,
-	0x1f330, 0x1f335,
-	0x1f337, 0x1f37c,
-	0x1f380, 0x1f393,
-	0x1f3a0, 0x1f3c4,
-	0x1f3c6, 0x1f3ca,
-	0x1f3e0, 0x1f3f0,
-	0x1f400, 0x1f43e,
-	0x1f440, 0x1f440,
-	0x1f442, 0x1f4f7,
-	0x1f4f9, 0x1f4fc,
-	0x1f500, 0x1f53d,
-	0x1f540, 0x1f543,
-	0x1f550, 0x1f567,
-	0x1f5fb, 0x1f640,
-	0x1f645, 0x1f64f,
-	0x1f680, 0x1f6c5,
-	0x1f700, 0x1f773,
-	0x1fffe, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_6_3 */
-
-/* 'Age_7_0': Derived Age 7.0 */
-static const OnigCodePoint CR_Age_7_0[] = {
-	610,
-	0x0000, 0x0377,
-	0x037a, 0x037f,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x052f,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x058d, 0x058f,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x061c,
-	0x061e, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-	0x0840, 0x085b,
-	0x085e, 0x085e,
-	0x08a0, 0x08b2,
-	0x08e4, 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, 0x09fb,
-	0x0a01, 0x0a03,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0af1,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3c, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	0x0b66, 0x0b77,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bfa,
-	0x0c00, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-	0x0c81, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d01, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
-	0x0d82, 0x0d83,
-	0x0d85, 0x0d96,
-	0x0d9a, 0x0db1,
-	0x0db3, 0x0dbb,
-	0x0dbd, 0x0dbd,
-	0x0dc0, 0x0dc6,
-	0x0dca, 0x0dca,
-	0x0dcf, 0x0dd4,
-	0x0dd6, 0x0dd6,
-	0x0dd8, 0x0ddf,
-	0x0de6, 0x0def,
-	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, 0x0edf,
-	0x0f00, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fda,
-	0x1000, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 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,
-	0x135d, 0x137c,
-	0x1380, 0x1399,
-	0x13a0, 0x13f4,
-	0x1400, 0x169c,
-	0x16a0, 0x16f8,
-	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, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191e,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a1b,
-	0x1a1e, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-	0x1ab0, 0x1abe,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1bf3,
-	0x1bfc, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cc0, 0x1cc7,
-	0x1cd0, 0x1cf6,
-	0x1cf8, 0x1cf9,
-	0x1d00, 0x1df5,
-	0x1dfc, 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, 0x2064,
-	0x2066, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x209c,
-	0x20a0, 0x20bd,
-	0x20d0, 0x20f0,
-	0x2100, 0x2189,
-	0x2190, 0x23fa,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x2b73,
-	0x2b76, 0x2b95,
-	0x2b98, 0x2bb9,
-	0x2bbd, 0x2bc8,
-	0x2bca, 0x2bd1,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf3,
-	0x2cf9, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d70,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2e42,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa69d,
-	0xa69f, 0xa6f7,
-	0xa700, 0xa78e,
-	0xa790, 0xa7ad,
-	0xa7b0, 0xa7b1,
-	0xa7f7, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-	0xa8e0, 0xa8fb,
-	0xa900, 0xa953,
-	0xa95f, 0xa97c,
-	0xa980, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9fe,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaac2,
-	0xaadb, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xab30, 0xab5f,
-	0xab64, 0xab65,
-	0xabc0, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xd800, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbc1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe2d,
-	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, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018c,
-	0x10190, 0x1019b,
-	0x101a0, 0x101a0,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x102e0, 0x102fb,
-	0x10300, 0x10323,
-	0x10330, 0x1034a,
-	0x10350, 0x1037a,
-	0x10380, 0x1039d,
-	0x1039f, 0x103c3,
-	0x103c8, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x1056f, 0x1056f,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10857, 0x1089e,
-	0x108a7, 0x108af,
-	0x10900, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a9f,
-	0x10ac0, 0x10ae6,
-	0x10aeb, 0x10af6,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b91,
-	0x10b99, 0x10b9c,
-	0x10ba9, 0x10baf,
-	0x10c00, 0x10c48,
-	0x10e60, 0x10e7e,
-	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-	0x1107f, 0x110c1,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x11143,
-	0x11150, 0x11176,
-	0x11180, 0x111c8,
-	0x111cd, 0x111cd,
-	0x111d0, 0x111da,
-	0x111e1, 0x111f4,
-	0x11200, 0x11211,
-	0x11213, 0x1123d,
-	0x112b0, 0x112ea,
-	0x112f0, 0x112f9,
-	0x11301, 0x11303,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133c, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134d,
-	0x11357, 0x11357,
-	0x1135d, 0x11363,
-	0x11366, 0x1136c,
-	0x11370, 0x11374,
-	0x11480, 0x114c7,
-	0x114d0, 0x114d9,
-	0x11580, 0x115b5,
-	0x115b8, 0x115c9,
-	0x11600, 0x11644,
-	0x11650, 0x11659,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x118a0, 0x118f2,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x12000, 0x12398,
-	0x12400, 0x1246e,
-	0x12470, 0x12474,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16a60, 0x16a69,
-	0x16a6e, 0x16a6f,
-	0x16ad0, 0x16aed,
-	0x16af0, 0x16af5,
-	0x16b00, 0x16b45,
-	0x16b50, 0x16b59,
-	0x16b5b, 0x16b61,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	0x1bc9c, 0x1bca3,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d1dd,
-	0x1d200, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1e800, 0x1e8c4,
-	0x1e8c7, 0x1e8d6,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0bf,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0f5,
-	0x1f100, 0x1f10c,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f32c,
-	0x1f330, 0x1f37d,
-	0x1f380, 0x1f3ce,
-	0x1f3d4, 0x1f3f7,
-	0x1f400, 0x1f4fe,
-	0x1f500, 0x1f54a,
-	0x1f550, 0x1f579,
-	0x1f57b, 0x1f5a3,
-	0x1f5a5, 0x1f642,
-	0x1f645, 0x1f6cf,
-	0x1f6e0, 0x1f6ec,
-	0x1f6f0, 0x1f6f3,
-	0x1f700, 0x1f773,
-	0x1f780, 0x1f7d4,
-	0x1f800, 0x1f80b,
-	0x1f810, 0x1f847,
-	0x1f850, 0x1f859,
-	0x1f860, 0x1f887,
-	0x1f890, 0x1f8ad,
-	0x1fffe, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_7_0 */
-
-/* 'Age_8_0': Derived Age 8.0 */
-static const OnigCodePoint CR_Age_8_0[] = {
-	623,
-	0x0000, 0x0377,
-	0x037a, 0x037f,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x052f,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x058d, 0x058f,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x061c,
-	0x061e, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-	0x0840, 0x085b,
-	0x085e, 0x085e,
-	0x08a0, 0x08b4,
-	0x08e3, 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, 0x09fb,
-	0x0a01, 0x0a03,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0af1,
-	0x0af9, 0x0af9,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3c, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	0x0b66, 0x0b77,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bfa,
-	0x0c00, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c5a,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-	0x0c81, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d01, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d5f, 0x0d63,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
-	0x0d82, 0x0d83,
-	0x0d85, 0x0d96,
-	0x0d9a, 0x0db1,
-	0x0db3, 0x0dbb,
-	0x0dbd, 0x0dbd,
-	0x0dc0, 0x0dc6,
-	0x0dca, 0x0dca,
-	0x0dcf, 0x0dd4,
-	0x0dd6, 0x0dd6,
-	0x0dd8, 0x0ddf,
-	0x0de6, 0x0def,
-	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, 0x0edf,
-	0x0f00, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fda,
-	0x1000, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 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,
-	0x135d, 0x137c,
-	0x1380, 0x1399,
-	0x13a0, 0x13f5,
-	0x13f8, 0x13fd,
-	0x1400, 0x169c,
-	0x16a0, 0x16f8,
-	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, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191e,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a1b,
-	0x1a1e, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-	0x1ab0, 0x1abe,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1bf3,
-	0x1bfc, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cc0, 0x1cc7,
-	0x1cd0, 0x1cf6,
-	0x1cf8, 0x1cf9,
-	0x1d00, 0x1df5,
-	0x1dfc, 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, 0x2064,
-	0x2066, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x209c,
-	0x20a0, 0x20be,
-	0x20d0, 0x20f0,
-	0x2100, 0x218b,
-	0x2190, 0x23fa,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x2b73,
-	0x2b76, 0x2b95,
-	0x2b98, 0x2bb9,
-	0x2bbd, 0x2bc8,
-	0x2bca, 0x2bd1,
-	0x2bec, 0x2bef,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf3,
-	0x2cf9, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d70,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2e42,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fd5,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa6f7,
-	0xa700, 0xa7ad,
-	0xa7b0, 0xa7b7,
-	0xa7f7, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-	0xa8e0, 0xa8fd,
-	0xa900, 0xa953,
-	0xa95f, 0xa97c,
-	0xa980, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9fe,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaac2,
-	0xaadb, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xab30, 0xab65,
-	0xab70, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xd800, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbc1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 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, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018c,
-	0x10190, 0x1019b,
-	0x101a0, 0x101a0,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x102e0, 0x102fb,
-	0x10300, 0x10323,
-	0x10330, 0x1034a,
-	0x10350, 0x1037a,
-	0x10380, 0x1039d,
-	0x1039f, 0x103c3,
-	0x103c8, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x1056f, 0x1056f,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10857, 0x1089e,
-	0x108a7, 0x108af,
-	0x108e0, 0x108f2,
-	0x108f4, 0x108f5,
-	0x108fb, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10980, 0x109b7,
-	0x109bc, 0x109cf,
-	0x109d2, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a9f,
-	0x10ac0, 0x10ae6,
-	0x10aeb, 0x10af6,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b91,
-	0x10b99, 0x10b9c,
-	0x10ba9, 0x10baf,
-	0x10c00, 0x10c48,
-	0x10c80, 0x10cb2,
-	0x10cc0, 0x10cf2,
-	0x10cfa, 0x10cff,
-	0x10e60, 0x10e7e,
-	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-	0x1107f, 0x110c1,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x11143,
-	0x11150, 0x11176,
-	0x11180, 0x111cd,
-	0x111d0, 0x111df,
-	0x111e1, 0x111f4,
-	0x11200, 0x11211,
-	0x11213, 0x1123d,
-	0x11280, 0x11286,
-	0x11288, 0x11288,
-	0x1128a, 0x1128d,
-	0x1128f, 0x1129d,
-	0x1129f, 0x112a9,
-	0x112b0, 0x112ea,
-	0x112f0, 0x112f9,
-	0x11300, 0x11303,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133c, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134d,
-	0x11350, 0x11350,
-	0x11357, 0x11357,
-	0x1135d, 0x11363,
-	0x11366, 0x1136c,
-	0x11370, 0x11374,
-	0x11480, 0x114c7,
-	0x114d0, 0x114d9,
-	0x11580, 0x115b5,
-	0x115b8, 0x115dd,
-	0x11600, 0x11644,
-	0x11650, 0x11659,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x11700, 0x11719,
-	0x1171d, 0x1172b,
-	0x11730, 0x1173f,
-	0x118a0, 0x118f2,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x12000, 0x12399,
-	0x12400, 0x1246e,
-	0x12470, 0x12474,
-	0x12480, 0x12543,
-	0x13000, 0x1342e,
-	0x14400, 0x14646,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16a60, 0x16a69,
-	0x16a6e, 0x16a6f,
-	0x16ad0, 0x16aed,
-	0x16af0, 0x16af5,
-	0x16b00, 0x16b45,
-	0x16b50, 0x16b59,
-	0x16b5b, 0x16b61,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	0x1bc9c, 0x1bca3,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d1e8,
-	0x1d200, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1da8b,
-	0x1da9b, 0x1da9f,
-	0x1daa1, 0x1daaf,
-	0x1e800, 0x1e8c4,
-	0x1e8c7, 0x1e8d6,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0bf,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0f5,
-	0x1f100, 0x1f10c,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f579,
-	0x1f57b, 0x1f5a3,
-	0x1f5a5, 0x1f6d0,
-	0x1f6e0, 0x1f6ec,
-	0x1f6f0, 0x1f6f3,
-	0x1f700, 0x1f773,
-	0x1f780, 0x1f7d4,
-	0x1f800, 0x1f80b,
-	0x1f810, 0x1f847,
-	0x1f850, 0x1f859,
-	0x1f860, 0x1f887,
-	0x1f890, 0x1f8ad,
-	0x1f910, 0x1f918,
-	0x1f980, 0x1f984,
-	0x1f9c0, 0x1f9c0,
-	0x1fffe, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2b820, 0x2cea1,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_8_0 */
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-
-/* 'In_Basic_Latin': Block */
-#define CR_In_Basic_Latin CR_ASCII
-
-/* 'In_Latin_1_Supplement': Block */
-static const OnigCodePoint CR_In_Latin_1_Supplement[] = {
-	1,
-	0x0080, 0x00ff,
-}; /* CR_In_Latin_1_Supplement */
-
-/* 'In_Latin_Extended_A': Block */
-static const OnigCodePoint CR_In_Latin_Extended_A[] = {
-	1,
-	0x0100, 0x017f,
-}; /* CR_In_Latin_Extended_A */
-
-/* 'In_Latin_Extended_B': Block */
-static const OnigCodePoint CR_In_Latin_Extended_B[] = {
-	1,
-	0x0180, 0x024f,
-}; /* CR_In_Latin_Extended_B */
-
-/* 'In_IPA_Extensions': Block */
-static const OnigCodePoint CR_In_IPA_Extensions[] = {
-	1,
-	0x0250, 0x02af,
-}; /* CR_In_IPA_Extensions */
-
-/* 'In_Spacing_Modifier_Letters': Block */
-static const OnigCodePoint CR_In_Spacing_Modifier_Letters[] = {
-	1,
-	0x02b0, 0x02ff,
-}; /* CR_In_Spacing_Modifier_Letters */
-
-/* 'In_Combining_Diacritical_Marks': Block */
-static const OnigCodePoint CR_In_Combining_Diacritical_Marks[] = {
-	1,
-	0x0300, 0x036f,
-}; /* CR_In_Combining_Diacritical_Marks */
-
-/* 'In_Greek_and_Coptic': Block */
-static const OnigCodePoint CR_In_Greek_and_Coptic[] = {
-	1,
-	0x0370, 0x03ff,
-}; /* CR_In_Greek_and_Coptic */
-
-/* 'In_Cyrillic': Block */
-static const OnigCodePoint CR_In_Cyrillic[] = {
-	1,
-	0x0400, 0x04ff,
-}; /* CR_In_Cyrillic */
-
-/* 'In_Cyrillic_Supplement': Block */
-static const OnigCodePoint CR_In_Cyrillic_Supplement[] = {
-	1,
-	0x0500, 0x052f,
-}; /* CR_In_Cyrillic_Supplement */
-
-/* 'In_Armenian': Block */
-static const OnigCodePoint CR_In_Armenian[] = {
-	1,
-	0x0530, 0x058f,
-}; /* CR_In_Armenian */
-
-/* 'In_Hebrew': Block */
-static const OnigCodePoint CR_In_Hebrew[] = {
-	1,
-	0x0590, 0x05ff,
-}; /* CR_In_Hebrew */
-
-/* 'In_Arabic': Block */
-static const OnigCodePoint CR_In_Arabic[] = {
-	1,
-	0x0600, 0x06ff,
-}; /* CR_In_Arabic */
-
-/* 'In_Syriac': Block */
-static const OnigCodePoint CR_In_Syriac[] = {
-	1,
-	0x0700, 0x074f,
-}; /* CR_In_Syriac */
-
-/* 'In_Arabic_Supplement': Block */
-static const OnigCodePoint CR_In_Arabic_Supplement[] = {
-	1,
-	0x0750, 0x077f,
-}; /* CR_In_Arabic_Supplement */
-
-/* 'In_Thaana': Block */
-static const OnigCodePoint CR_In_Thaana[] = {
-	1,
-	0x0780, 0x07bf,
-}; /* CR_In_Thaana */
-
-/* 'In_NKo': Block */
-static const OnigCodePoint CR_In_NKo[] = {
-	1,
-	0x07c0, 0x07ff,
-}; /* CR_In_NKo */
-
-/* 'In_Samaritan': Block */
-static const OnigCodePoint CR_In_Samaritan[] = {
-	1,
-	0x0800, 0x083f,
-}; /* CR_In_Samaritan */
-
-/* 'In_Mandaic': Block */
-static const OnigCodePoint CR_In_Mandaic[] = {
-	1,
-	0x0840, 0x085f,
-}; /* CR_In_Mandaic */
-
-/* 'In_Arabic_Extended_A': Block */
-static const OnigCodePoint CR_In_Arabic_Extended_A[] = {
-	1,
-	0x08a0, 0x08ff,
-}; /* CR_In_Arabic_Extended_A */
-
-/* 'In_Devanagari': Block */
-static const OnigCodePoint CR_In_Devanagari[] = {
-	1,
-	0x0900, 0x097f,
-}; /* CR_In_Devanagari */
-
-/* 'In_Bengali': Block */
-static const OnigCodePoint CR_In_Bengali[] = {
-	1,
-	0x0980, 0x09ff,
-}; /* CR_In_Bengali */
-
-/* 'In_Gurmukhi': Block */
-static const OnigCodePoint CR_In_Gurmukhi[] = {
-	1,
-	0x0a00, 0x0a7f,
-}; /* CR_In_Gurmukhi */
-
-/* 'In_Gujarati': Block */
-static const OnigCodePoint CR_In_Gujarati[] = {
-	1,
-	0x0a80, 0x0aff,
-}; /* CR_In_Gujarati */
-
-/* 'In_Oriya': Block */
-static const OnigCodePoint CR_In_Oriya[] = {
-	1,
-	0x0b00, 0x0b7f,
-}; /* CR_In_Oriya */
-
-/* 'In_Tamil': Block */
-static const OnigCodePoint CR_In_Tamil[] = {
-	1,
-	0x0b80, 0x0bff,
-}; /* CR_In_Tamil */
-
-/* 'In_Telugu': Block */
-static const OnigCodePoint CR_In_Telugu[] = {
-	1,
-	0x0c00, 0x0c7f,
-}; /* CR_In_Telugu */
-
-/* 'In_Kannada': Block */
-static const OnigCodePoint CR_In_Kannada[] = {
-	1,
-	0x0c80, 0x0cff,
-}; /* CR_In_Kannada */
-
-/* 'In_Malayalam': Block */
-static const OnigCodePoint CR_In_Malayalam[] = {
-	1,
-	0x0d00, 0x0d7f,
-}; /* CR_In_Malayalam */
-
-/* 'In_Sinhala': Block */
-static const OnigCodePoint CR_In_Sinhala[] = {
-	1,
-	0x0d80, 0x0dff,
-}; /* CR_In_Sinhala */
-
-/* 'In_Thai': Block */
-static const OnigCodePoint CR_In_Thai[] = {
-	1,
-	0x0e00, 0x0e7f,
-}; /* CR_In_Thai */
-
-/* 'In_Lao': Block */
-static const OnigCodePoint CR_In_Lao[] = {
-	1,
-	0x0e80, 0x0eff,
-}; /* CR_In_Lao */
-
-/* 'In_Tibetan': Block */
-static const OnigCodePoint CR_In_Tibetan[] = {
-	1,
-	0x0f00, 0x0fff,
-}; /* CR_In_Tibetan */
-
-/* 'In_Myanmar': Block */
-static const OnigCodePoint CR_In_Myanmar[] = {
-	1,
-	0x1000, 0x109f,
-}; /* CR_In_Myanmar */
-
-/* 'In_Georgian': Block */
-static const OnigCodePoint CR_In_Georgian[] = {
-	1,
-	0x10a0, 0x10ff,
-}; /* CR_In_Georgian */
-
-/* 'In_Hangul_Jamo': Block */
-static const OnigCodePoint CR_In_Hangul_Jamo[] = {
-	1,
-	0x1100, 0x11ff,
-}; /* CR_In_Hangul_Jamo */
-
-/* 'In_Ethiopic': Block */
-static const OnigCodePoint CR_In_Ethiopic[] = {
-	1,
-	0x1200, 0x137f,
-}; /* CR_In_Ethiopic */
-
-/* 'In_Ethiopic_Supplement': Block */
-static const OnigCodePoint CR_In_Ethiopic_Supplement[] = {
-	1,
-	0x1380, 0x139f,
-}; /* CR_In_Ethiopic_Supplement */
-
-/* 'In_Cherokee': Block */
-static const OnigCodePoint CR_In_Cherokee[] = {
-	1,
-	0x13a0, 0x13ff,
-}; /* CR_In_Cherokee */
-
-/* 'In_Unified_Canadian_Aboriginal_Syllabics': Block */
-static const OnigCodePoint CR_In_Unified_Canadian_Aboriginal_Syllabics[] = {
-	1,
-	0x1400, 0x167f,
-}; /* CR_In_Unified_Canadian_Aboriginal_Syllabics */
-
-/* 'In_Ogham': Block */
-static const OnigCodePoint CR_In_Ogham[] = {
-	1,
-	0x1680, 0x169f,
-}; /* CR_In_Ogham */
-
-/* 'In_Runic': Block */
-static const OnigCodePoint CR_In_Runic[] = {
-	1,
-	0x16a0, 0x16ff,
-}; /* CR_In_Runic */
-
-/* 'In_Tagalog': Block */
-static const OnigCodePoint CR_In_Tagalog[] = {
-	1,
-	0x1700, 0x171f,
-}; /* CR_In_Tagalog */
-
-/* 'In_Hanunoo': Block */
-static const OnigCodePoint CR_In_Hanunoo[] = {
-	1,
-	0x1720, 0x173f,
-}; /* CR_In_Hanunoo */
-
-/* 'In_Buhid': Block */
-static const OnigCodePoint CR_In_Buhid[] = {
-	1,
-	0x1740, 0x175f,
-}; /* CR_In_Buhid */
-
-/* 'In_Tagbanwa': Block */
-static const OnigCodePoint CR_In_Tagbanwa[] = {
-	1,
-	0x1760, 0x177f,
-}; /* CR_In_Tagbanwa */
-
-/* 'In_Khmer': Block */
-static const OnigCodePoint CR_In_Khmer[] = {
-	1,
-	0x1780, 0x17ff,
-}; /* CR_In_Khmer */
-
-/* 'In_Mongolian': Block */
-static const OnigCodePoint CR_In_Mongolian[] = {
-	1,
-	0x1800, 0x18af,
-}; /* CR_In_Mongolian */
-
-/* 'In_Unified_Canadian_Aboriginal_Syllabics_Extended': Block */
-static const OnigCodePoint CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended[] = {
-	1,
-	0x18b0, 0x18ff,
-}; /* CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended */
-
-/* 'In_Limbu': Block */
-static const OnigCodePoint CR_In_Limbu[] = {
-	1,
-	0x1900, 0x194f,
-}; /* CR_In_Limbu */
-
-/* 'In_Tai_Le': Block */
-static const OnigCodePoint CR_In_Tai_Le[] = {
-	1,
-	0x1950, 0x197f,
-}; /* CR_In_Tai_Le */
-
-/* 'In_New_Tai_Lue': Block */
-static const OnigCodePoint CR_In_New_Tai_Lue[] = {
-	1,
-	0x1980, 0x19df,
-}; /* CR_In_New_Tai_Lue */
-
-/* 'In_Khmer_Symbols': Block */
-static const OnigCodePoint CR_In_Khmer_Symbols[] = {
-	1,
-	0x19e0, 0x19ff,
-}; /* CR_In_Khmer_Symbols */
-
-/* 'In_Buginese': Block */
-static const OnigCodePoint CR_In_Buginese[] = {
-	1,
-	0x1a00, 0x1a1f,
-}; /* CR_In_Buginese */
-
-/* 'In_Tai_Tham': Block */
-static const OnigCodePoint CR_In_Tai_Tham[] = {
-	1,
-	0x1a20, 0x1aaf,
-}; /* CR_In_Tai_Tham */
-
-/* 'In_Combining_Diacritical_Marks_Extended': Block */
-static const OnigCodePoint CR_In_Combining_Diacritical_Marks_Extended[] = {
-	1,
-	0x1ab0, 0x1aff,
-}; /* CR_In_Combining_Diacritical_Marks_Extended */
-
-/* 'In_Balinese': Block */
-static const OnigCodePoint CR_In_Balinese[] = {
-	1,
-	0x1b00, 0x1b7f,
-}; /* CR_In_Balinese */
-
-/* 'In_Sundanese': Block */
-static const OnigCodePoint CR_In_Sundanese[] = {
-	1,
-	0x1b80, 0x1bbf,
-}; /* CR_In_Sundanese */
-
-/* 'In_Batak': Block */
-static const OnigCodePoint CR_In_Batak[] = {
-	1,
-	0x1bc0, 0x1bff,
-}; /* CR_In_Batak */
-
-/* 'In_Lepcha': Block */
-static const OnigCodePoint CR_In_Lepcha[] = {
-	1,
-	0x1c00, 0x1c4f,
-}; /* CR_In_Lepcha */
-
-/* 'In_Ol_Chiki': Block */
-#define CR_In_Ol_Chiki CR_Ol_Chiki
-
-/* 'In_Sundanese_Supplement': Block */
-static const OnigCodePoint CR_In_Sundanese_Supplement[] = {
-	1,
-	0x1cc0, 0x1ccf,
-}; /* CR_In_Sundanese_Supplement */
-
-/* 'In_Vedic_Extensions': Block */
-static const OnigCodePoint CR_In_Vedic_Extensions[] = {
-	1,
-	0x1cd0, 0x1cff,
-}; /* CR_In_Vedic_Extensions */
-
-/* 'In_Phonetic_Extensions': Block */
-static const OnigCodePoint CR_In_Phonetic_Extensions[] = {
-	1,
-	0x1d00, 0x1d7f,
-}; /* CR_In_Phonetic_Extensions */
-
-/* 'In_Phonetic_Extensions_Supplement': Block */
-static const OnigCodePoint CR_In_Phonetic_Extensions_Supplement[] = {
-	1,
-	0x1d80, 0x1dbf,
-}; /* CR_In_Phonetic_Extensions_Supplement */
-
-/* 'In_Combining_Diacritical_Marks_Supplement': Block */
-static const OnigCodePoint CR_In_Combining_Diacritical_Marks_Supplement[] = {
-	1,
-	0x1dc0, 0x1dff,
-}; /* CR_In_Combining_Diacritical_Marks_Supplement */
-
-/* 'In_Latin_Extended_Additional': Block */
-static const OnigCodePoint CR_In_Latin_Extended_Additional[] = {
-	1,
-	0x1e00, 0x1eff,
-}; /* CR_In_Latin_Extended_Additional */
-
-/* 'In_Greek_Extended': Block */
-static const OnigCodePoint CR_In_Greek_Extended[] = {
-	1,
-	0x1f00, 0x1fff,
-}; /* CR_In_Greek_Extended */
-
-/* 'In_General_Punctuation': Block */
-static const OnigCodePoint CR_In_General_Punctuation[] = {
-	1,
-	0x2000, 0x206f,
-}; /* CR_In_General_Punctuation */
-
-/* 'In_Superscripts_and_Subscripts': Block */
-static const OnigCodePoint CR_In_Superscripts_and_Subscripts[] = {
-	1,
-	0x2070, 0x209f,
-}; /* CR_In_Superscripts_and_Subscripts */
-
-/* 'In_Currency_Symbols': Block */
-static const OnigCodePoint CR_In_Currency_Symbols[] = {
-	1,
-	0x20a0, 0x20cf,
-}; /* CR_In_Currency_Symbols */
-
-/* 'In_Combining_Diacritical_Marks_for_Symbols': Block */
-static const OnigCodePoint CR_In_Combining_Diacritical_Marks_for_Symbols[] = {
-	1,
-	0x20d0, 0x20ff,
-}; /* CR_In_Combining_Diacritical_Marks_for_Symbols */
-
-/* 'In_Letterlike_Symbols': Block */
-static const OnigCodePoint CR_In_Letterlike_Symbols[] = {
-	1,
-	0x2100, 0x214f,
-}; /* CR_In_Letterlike_Symbols */
-
-/* 'In_Number_Forms': Block */
-static const OnigCodePoint CR_In_Number_Forms[] = {
-	1,
-	0x2150, 0x218f,
-}; /* CR_In_Number_Forms */
-
-/* 'In_Arrows': Block */
-static const OnigCodePoint CR_In_Arrows[] = {
-	1,
-	0x2190, 0x21ff,
-}; /* CR_In_Arrows */
-
-/* 'In_Mathematical_Operators': Block */
-static const OnigCodePoint CR_In_Mathematical_Operators[] = {
-	1,
-	0x2200, 0x22ff,
-}; /* CR_In_Mathematical_Operators */
-
-/* 'In_Miscellaneous_Technical': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Technical[] = {
-	1,
-	0x2300, 0x23ff,
-}; /* CR_In_Miscellaneous_Technical */
-
-/* 'In_Control_Pictures': Block */
-static const OnigCodePoint CR_In_Control_Pictures[] = {
-	1,
-	0x2400, 0x243f,
-}; /* CR_In_Control_Pictures */
-
-/* 'In_Optical_Character_Recognition': Block */
-static const OnigCodePoint CR_In_Optical_Character_Recognition[] = {
-	1,
-	0x2440, 0x245f,
-}; /* CR_In_Optical_Character_Recognition */
-
-/* 'In_Enclosed_Alphanumerics': Block */
-static const OnigCodePoint CR_In_Enclosed_Alphanumerics[] = {
-	1,
-	0x2460, 0x24ff,
-}; /* CR_In_Enclosed_Alphanumerics */
-
-/* 'In_Box_Drawing': Block */
-static const OnigCodePoint CR_In_Box_Drawing[] = {
-	1,
-	0x2500, 0x257f,
-}; /* CR_In_Box_Drawing */
-
-/* 'In_Block_Elements': Block */
-static const OnigCodePoint CR_In_Block_Elements[] = {
-	1,
-	0x2580, 0x259f,
-}; /* CR_In_Block_Elements */
-
-/* 'In_Geometric_Shapes': Block */
-static const OnigCodePoint CR_In_Geometric_Shapes[] = {
-	1,
-	0x25a0, 0x25ff,
-}; /* CR_In_Geometric_Shapes */
-
-/* 'In_Miscellaneous_Symbols': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Symbols[] = {
-	1,
-	0x2600, 0x26ff,
-}; /* CR_In_Miscellaneous_Symbols */
-
-/* 'In_Dingbats': Block */
-static const OnigCodePoint CR_In_Dingbats[] = {
-	1,
-	0x2700, 0x27bf,
-}; /* CR_In_Dingbats */
-
-/* 'In_Miscellaneous_Mathematical_Symbols_A': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Mathematical_Symbols_A[] = {
-	1,
-	0x27c0, 0x27ef,
-}; /* CR_In_Miscellaneous_Mathematical_Symbols_A */
-
-/* 'In_Supplemental_Arrows_A': Block */
-static const OnigCodePoint CR_In_Supplemental_Arrows_A[] = {
-	1,
-	0x27f0, 0x27ff,
-}; /* CR_In_Supplemental_Arrows_A */
-
-/* 'In_Braille_Patterns': Block */
-#define CR_In_Braille_Patterns CR_Braille
-
-/* 'In_Supplemental_Arrows_B': Block */
-static const OnigCodePoint CR_In_Supplemental_Arrows_B[] = {
-	1,
-	0x2900, 0x297f,
-}; /* CR_In_Supplemental_Arrows_B */
-
-/* 'In_Miscellaneous_Mathematical_Symbols_B': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Mathematical_Symbols_B[] = {
-	1,
-	0x2980, 0x29ff,
-}; /* CR_In_Miscellaneous_Mathematical_Symbols_B */
-
-/* 'In_Supplemental_Mathematical_Operators': Block */
-static const OnigCodePoint CR_In_Supplemental_Mathematical_Operators[] = {
-	1,
-	0x2a00, 0x2aff,
-}; /* CR_In_Supplemental_Mathematical_Operators */
-
-/* 'In_Miscellaneous_Symbols_and_Arrows': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Symbols_and_Arrows[] = {
-	1,
-	0x2b00, 0x2bff,
-}; /* CR_In_Miscellaneous_Symbols_and_Arrows */
-
-/* 'In_Glagolitic': Block */
-static const OnigCodePoint CR_In_Glagolitic[] = {
-	1,
-	0x2c00, 0x2c5f,
-}; /* CR_In_Glagolitic */
-
-/* 'In_Latin_Extended_C': Block */
-static const OnigCodePoint CR_In_Latin_Extended_C[] = {
-	1,
-	0x2c60, 0x2c7f,
-}; /* CR_In_Latin_Extended_C */
-
-/* 'In_Coptic': Block */
-static const OnigCodePoint CR_In_Coptic[] = {
-	1,
-	0x2c80, 0x2cff,
-}; /* CR_In_Coptic */
-
-/* 'In_Georgian_Supplement': Block */
-static const OnigCodePoint CR_In_Georgian_Supplement[] = {
-	1,
-	0x2d00, 0x2d2f,
-}; /* CR_In_Georgian_Supplement */
-
-/* 'In_Tifinagh': Block */
-static const OnigCodePoint CR_In_Tifinagh[] = {
-	1,
-	0x2d30, 0x2d7f,
-}; /* CR_In_Tifinagh */
-
-/* 'In_Ethiopic_Extended': Block */
-static const OnigCodePoint CR_In_Ethiopic_Extended[] = {
-	1,
-	0x2d80, 0x2ddf,
-}; /* CR_In_Ethiopic_Extended */
-
-/* 'In_Cyrillic_Extended_A': Block */
-static const OnigCodePoint CR_In_Cyrillic_Extended_A[] = {
-	1,
-	0x2de0, 0x2dff,
-}; /* CR_In_Cyrillic_Extended_A */
-
-/* 'In_Supplemental_Punctuation': Block */
-static const OnigCodePoint CR_In_Supplemental_Punctuation[] = {
-	1,
-	0x2e00, 0x2e7f,
-}; /* CR_In_Supplemental_Punctuation */
-
-/* 'In_CJK_Radicals_Supplement': Block */
-static const OnigCodePoint CR_In_CJK_Radicals_Supplement[] = {
-	1,
-	0x2e80, 0x2eff,
-}; /* CR_In_CJK_Radicals_Supplement */
-
-/* 'In_Kangxi_Radicals': Block */
-static const OnigCodePoint CR_In_Kangxi_Radicals[] = {
-	1,
-	0x2f00, 0x2fdf,
-}; /* CR_In_Kangxi_Radicals */
-
-/* 'In_Ideographic_Description_Characters': Block */
-static const OnigCodePoint CR_In_Ideographic_Description_Characters[] = {
-	1,
-	0x2ff0, 0x2fff,
-}; /* CR_In_Ideographic_Description_Characters */
-
-/* 'In_CJK_Symbols_and_Punctuation': Block */
-static const OnigCodePoint CR_In_CJK_Symbols_and_Punctuation[] = {
-	1,
-	0x3000, 0x303f,
-}; /* CR_In_CJK_Symbols_and_Punctuation */
-
-/* 'In_Hiragana': Block */
-static const OnigCodePoint CR_In_Hiragana[] = {
-	1,
-	0x3040, 0x309f,
-}; /* CR_In_Hiragana */
-
-/* 'In_Katakana': Block */
-static const OnigCodePoint CR_In_Katakana[] = {
-	1,
-	0x30a0, 0x30ff,
-}; /* CR_In_Katakana */
-
-/* 'In_Bopomofo': Block */
-static const OnigCodePoint CR_In_Bopomofo[] = {
-	1,
-	0x3100, 0x312f,
-}; /* CR_In_Bopomofo */
-
-/* 'In_Hangul_Compatibility_Jamo': Block */
-static const OnigCodePoint CR_In_Hangul_Compatibility_Jamo[] = {
-	1,
-	0x3130, 0x318f,
-}; /* CR_In_Hangul_Compatibility_Jamo */
-
-/* 'In_Kanbun': Block */
-static const OnigCodePoint CR_In_Kanbun[] = {
-	1,
-	0x3190, 0x319f,
-}; /* CR_In_Kanbun */
-
-/* 'In_Bopomofo_Extended': Block */
-static const OnigCodePoint CR_In_Bopomofo_Extended[] = {
-	1,
-	0x31a0, 0x31bf,
-}; /* CR_In_Bopomofo_Extended */
-
-/* 'In_CJK_Strokes': Block */
-static const OnigCodePoint CR_In_CJK_Strokes[] = {
-	1,
-	0x31c0, 0x31ef,
-}; /* CR_In_CJK_Strokes */
-
-/* 'In_Katakana_Phonetic_Extensions': Block */
-static const OnigCodePoint CR_In_Katakana_Phonetic_Extensions[] = {
-	1,
-	0x31f0, 0x31ff,
-}; /* CR_In_Katakana_Phonetic_Extensions */
-
-/* 'In_Enclosed_CJK_Letters_and_Months': Block */
-static const OnigCodePoint CR_In_Enclosed_CJK_Letters_and_Months[] = {
-	1,
-	0x3200, 0x32ff,
-}; /* CR_In_Enclosed_CJK_Letters_and_Months */
-
-/* 'In_CJK_Compatibility': Block */
-static const OnigCodePoint CR_In_CJK_Compatibility[] = {
-	1,
-	0x3300, 0x33ff,
-}; /* CR_In_CJK_Compatibility */
-
-/* 'In_CJK_Unified_Ideographs_Extension_A': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_A[] = {
-	1,
-	0x3400, 0x4dbf,
-}; /* CR_In_CJK_Unified_Ideographs_Extension_A */
-
-/* 'In_Yijing_Hexagram_Symbols': Block */
-static const OnigCodePoint CR_In_Yijing_Hexagram_Symbols[] = {
-	1,
-	0x4dc0, 0x4dff,
-}; /* CR_In_Yijing_Hexagram_Symbols */
-
-/* 'In_CJK_Unified_Ideographs': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs[] = {
-	1,
-	0x4e00, 0x9fff,
-}; /* CR_In_CJK_Unified_Ideographs */
-
-/* 'In_Yi_Syllables': Block */
-static const OnigCodePoint CR_In_Yi_Syllables[] = {
-	1,
-	0xa000, 0xa48f,
-}; /* CR_In_Yi_Syllables */
-
-/* 'In_Yi_Radicals': Block */
-static const OnigCodePoint CR_In_Yi_Radicals[] = {
-	1,
-	0xa490, 0xa4cf,
-}; /* CR_In_Yi_Radicals */
-
-/* 'In_Lisu': Block */
-#define CR_In_Lisu CR_Lisu
-
-/* 'In_Vai': Block */
-static const OnigCodePoint CR_In_Vai[] = {
-	1,
-	0xa500, 0xa63f,
-}; /* CR_In_Vai */
-
-/* 'In_Cyrillic_Extended_B': Block */
-static const OnigCodePoint CR_In_Cyrillic_Extended_B[] = {
-	1,
-	0xa640, 0xa69f,
-}; /* CR_In_Cyrillic_Extended_B */
-
-/* 'In_Bamum': Block */
-static const OnigCodePoint CR_In_Bamum[] = {
-	1,
-	0xa6a0, 0xa6ff,
-}; /* CR_In_Bamum */
-
-/* 'In_Modifier_Tone_Letters': Block */
-static const OnigCodePoint CR_In_Modifier_Tone_Letters[] = {
-	1,
-	0xa700, 0xa71f,
-}; /* CR_In_Modifier_Tone_Letters */
-
-/* 'In_Latin_Extended_D': Block */
-static const OnigCodePoint CR_In_Latin_Extended_D[] = {
-	1,
-	0xa720, 0xa7ff,
-}; /* CR_In_Latin_Extended_D */
-
-/* 'In_Syloti_Nagri': Block */
-static const OnigCodePoint CR_In_Syloti_Nagri[] = {
-	1,
-	0xa800, 0xa82f,
-}; /* CR_In_Syloti_Nagri */
-
-/* 'In_Common_Indic_Number_Forms': Block */
-static const OnigCodePoint CR_In_Common_Indic_Number_Forms[] = {
-	1,
-	0xa830, 0xa83f,
-}; /* CR_In_Common_Indic_Number_Forms */
-
-/* 'In_Phags_pa': Block */
-static const OnigCodePoint CR_In_Phags_pa[] = {
-	1,
-	0xa840, 0xa87f,
-}; /* CR_In_Phags_pa */
-
-/* 'In_Saurashtra': Block */
-static const OnigCodePoint CR_In_Saurashtra[] = {
-	1,
-	0xa880, 0xa8df,
-}; /* CR_In_Saurashtra */
-
-/* 'In_Devanagari_Extended': Block */
-static const OnigCodePoint CR_In_Devanagari_Extended[] = {
-	1,
-	0xa8e0, 0xa8ff,
-}; /* CR_In_Devanagari_Extended */
-
-/* 'In_Kayah_Li': Block */
-static const OnigCodePoint CR_In_Kayah_Li[] = {
-	1,
-	0xa900, 0xa92f,
-}; /* CR_In_Kayah_Li */
-
-/* 'In_Rejang': Block */
-static const OnigCodePoint CR_In_Rejang[] = {
-	1,
-	0xa930, 0xa95f,
-}; /* CR_In_Rejang */
-
-/* 'In_Hangul_Jamo_Extended_A': Block */
-static const OnigCodePoint CR_In_Hangul_Jamo_Extended_A[] = {
-	1,
-	0xa960, 0xa97f,
-}; /* CR_In_Hangul_Jamo_Extended_A */
-
-/* 'In_Javanese': Block */
-static const OnigCodePoint CR_In_Javanese[] = {
-	1,
-	0xa980, 0xa9df,
-}; /* CR_In_Javanese */
-
-/* 'In_Myanmar_Extended_B': Block */
-static const OnigCodePoint CR_In_Myanmar_Extended_B[] = {
-	1,
-	0xa9e0, 0xa9ff,
-}; /* CR_In_Myanmar_Extended_B */
-
-/* 'In_Cham': Block */
-static const OnigCodePoint CR_In_Cham[] = {
-	1,
-	0xaa00, 0xaa5f,
-}; /* CR_In_Cham */
-
-/* 'In_Myanmar_Extended_A': Block */
-static const OnigCodePoint CR_In_Myanmar_Extended_A[] = {
-	1,
-	0xaa60, 0xaa7f,
-}; /* CR_In_Myanmar_Extended_A */
-
-/* 'In_Tai_Viet': Block */
-static const OnigCodePoint CR_In_Tai_Viet[] = {
-	1,
-	0xaa80, 0xaadf,
-}; /* CR_In_Tai_Viet */
-
-/* 'In_Meetei_Mayek_Extensions': Block */
-static const OnigCodePoint CR_In_Meetei_Mayek_Extensions[] = {
-	1,
-	0xaae0, 0xaaff,
-}; /* CR_In_Meetei_Mayek_Extensions */
-
-/* 'In_Ethiopic_Extended_A': Block */
-static const OnigCodePoint CR_In_Ethiopic_Extended_A[] = {
-	1,
-	0xab00, 0xab2f,
-}; /* CR_In_Ethiopic_Extended_A */
-
-/* 'In_Latin_Extended_E': Block */
-static const OnigCodePoint CR_In_Latin_Extended_E[] = {
-	1,
-	0xab30, 0xab6f,
-}; /* CR_In_Latin_Extended_E */
-
-/* 'In_Cherokee_Supplement': Block */
-static const OnigCodePoint CR_In_Cherokee_Supplement[] = {
-	1,
-	0xab70, 0xabbf,
-}; /* CR_In_Cherokee_Supplement */
-
-/* 'In_Meetei_Mayek': Block */
-static const OnigCodePoint CR_In_Meetei_Mayek[] = {
-	1,
-	0xabc0, 0xabff,
-}; /* CR_In_Meetei_Mayek */
-
-/* 'In_Hangul_Syllables': Block */
-static const OnigCodePoint CR_In_Hangul_Syllables[] = {
-	1,
-	0xac00, 0xd7af,
-}; /* CR_In_Hangul_Syllables */
-
-/* 'In_Hangul_Jamo_Extended_B': Block */
-static const OnigCodePoint CR_In_Hangul_Jamo_Extended_B[] = {
-	1,
-	0xd7b0, 0xd7ff,
-}; /* CR_In_Hangul_Jamo_Extended_B */
-
-/* 'In_High_Surrogates': Block */
-static const OnigCodePoint CR_In_High_Surrogates[] = {
-	1,
-	0xd800, 0xdb7f,
-}; /* CR_In_High_Surrogates */
-
-/* 'In_High_Private_Use_Surrogates': Block */
-static const OnigCodePoint CR_In_High_Private_Use_Surrogates[] = {
-	1,
-	0xdb80, 0xdbff,
-}; /* CR_In_High_Private_Use_Surrogates */
-
-/* 'In_Low_Surrogates': Block */
-static const OnigCodePoint CR_In_Low_Surrogates[] = {
-	1,
-	0xdc00, 0xdfff,
-}; /* CR_In_Low_Surrogates */
-
-/* 'In_Private_Use_Area': Block */
-static const OnigCodePoint CR_In_Private_Use_Area[] = {
-	1,
-	0xe000, 0xf8ff,
-}; /* CR_In_Private_Use_Area */
-
-/* 'In_CJK_Compatibility_Ideographs': Block */
-static const OnigCodePoint CR_In_CJK_Compatibility_Ideographs[] = {
-	1,
-	0xf900, 0xfaff,
-}; /* CR_In_CJK_Compatibility_Ideographs */
-
-/* 'In_Alphabetic_Presentation_Forms': Block */
-static const OnigCodePoint CR_In_Alphabetic_Presentation_Forms[] = {
-	1,
-	0xfb00, 0xfb4f,
-}; /* CR_In_Alphabetic_Presentation_Forms */
-
-/* 'In_Arabic_Presentation_Forms_A': Block */
-static const OnigCodePoint CR_In_Arabic_Presentation_Forms_A[] = {
-	1,
-	0xfb50, 0xfdff,
-}; /* CR_In_Arabic_Presentation_Forms_A */
-
-/* 'In_Variation_Selectors': Block */
-static const OnigCodePoint CR_In_Variation_Selectors[] = {
-	1,
-	0xfe00, 0xfe0f,
-}; /* CR_In_Variation_Selectors */
-
-/* 'In_Vertical_Forms': Block */
-static const OnigCodePoint CR_In_Vertical_Forms[] = {
-	1,
-	0xfe10, 0xfe1f,
-}; /* CR_In_Vertical_Forms */
-
-/* 'In_Combining_Half_Marks': Block */
-static const OnigCodePoint CR_In_Combining_Half_Marks[] = {
-	1,
-	0xfe20, 0xfe2f,
-}; /* CR_In_Combining_Half_Marks */
-
-/* 'In_CJK_Compatibility_Forms': Block */
-static const OnigCodePoint CR_In_CJK_Compatibility_Forms[] = {
-	1,
-	0xfe30, 0xfe4f,
-}; /* CR_In_CJK_Compatibility_Forms */
-
-/* 'In_Small_Form_Variants': Block */
-static const OnigCodePoint CR_In_Small_Form_Variants[] = {
-	1,
-	0xfe50, 0xfe6f,
-}; /* CR_In_Small_Form_Variants */
-
-/* 'In_Arabic_Presentation_Forms_B': Block */
-static const OnigCodePoint CR_In_Arabic_Presentation_Forms_B[] = {
-	1,
-	0xfe70, 0xfeff,
-}; /* CR_In_Arabic_Presentation_Forms_B */
-
-/* 'In_Halfwidth_and_Fullwidth_Forms': Block */
-static const OnigCodePoint CR_In_Halfwidth_and_Fullwidth_Forms[] = {
-	1,
-	0xff00, 0xffef,
-}; /* CR_In_Halfwidth_and_Fullwidth_Forms */
-
-/* 'In_Specials': Block */
-static const OnigCodePoint CR_In_Specials[] = {
-	1,
-	0xfff0, 0xffff,
-}; /* CR_In_Specials */
-
-/* 'In_Linear_B_Syllabary': Block */
-static const OnigCodePoint CR_In_Linear_B_Syllabary[] = {
-	1,
-	0x10000, 0x1007f,
-}; /* CR_In_Linear_B_Syllabary */
-
-/* 'In_Linear_B_Ideograms': Block */
-static const OnigCodePoint CR_In_Linear_B_Ideograms[] = {
-	1,
-	0x10080, 0x100ff,
-}; /* CR_In_Linear_B_Ideograms */
-
-/* 'In_Aegean_Numbers': Block */
-static const OnigCodePoint CR_In_Aegean_Numbers[] = {
-	1,
-	0x10100, 0x1013f,
-}; /* CR_In_Aegean_Numbers */
-
-/* 'In_Ancient_Greek_Numbers': Block */
-static const OnigCodePoint CR_In_Ancient_Greek_Numbers[] = {
-	1,
-	0x10140, 0x1018f,
-}; /* CR_In_Ancient_Greek_Numbers */
-
-/* 'In_Ancient_Symbols': Block */
-static const OnigCodePoint CR_In_Ancient_Symbols[] = {
-	1,
-	0x10190, 0x101cf,
-}; /* CR_In_Ancient_Symbols */
-
-/* 'In_Phaistos_Disc': Block */
-static const OnigCodePoint CR_In_Phaistos_Disc[] = {
-	1,
-	0x101d0, 0x101ff,
-}; /* CR_In_Phaistos_Disc */
-
-/* 'In_Lycian': Block */
-static const OnigCodePoint CR_In_Lycian[] = {
-	1,
-	0x10280, 0x1029f,
-}; /* CR_In_Lycian */
-
-/* 'In_Carian': Block */
-static const OnigCodePoint CR_In_Carian[] = {
-	1,
-	0x102a0, 0x102df,
-}; /* CR_In_Carian */
-
-/* 'In_Coptic_Epact_Numbers': Block */
-static const OnigCodePoint CR_In_Coptic_Epact_Numbers[] = {
-	1,
-	0x102e0, 0x102ff,
-}; /* CR_In_Coptic_Epact_Numbers */
-
-/* 'In_Old_Italic': Block */
-static const OnigCodePoint CR_In_Old_Italic[] = {
-	1,
-	0x10300, 0x1032f,
-}; /* CR_In_Old_Italic */
-
-/* 'In_Gothic': Block */
-static const OnigCodePoint CR_In_Gothic[] = {
-	1,
-	0x10330, 0x1034f,
-}; /* CR_In_Gothic */
-
-/* 'In_Old_Permic': Block */
-static const OnigCodePoint CR_In_Old_Permic[] = {
-	1,
-	0x10350, 0x1037f,
-}; /* CR_In_Old_Permic */
-
-/* 'In_Ugaritic': Block */
-static const OnigCodePoint CR_In_Ugaritic[] = {
-	1,
-	0x10380, 0x1039f,
-}; /* CR_In_Ugaritic */
-
-/* 'In_Old_Persian': Block */
-static const OnigCodePoint CR_In_Old_Persian[] = {
-	1,
-	0x103a0, 0x103df,
-}; /* CR_In_Old_Persian */
-
-/* 'In_Deseret': Block */
-#define CR_In_Deseret CR_Deseret
-
-/* 'In_Shavian': Block */
-#define CR_In_Shavian CR_Shavian
-
-/* 'In_Osmanya': Block */
-static const OnigCodePoint CR_In_Osmanya[] = {
-	1,
-	0x10480, 0x104af,
-}; /* CR_In_Osmanya */
-
-/* 'In_Elbasan': Block */
-static const OnigCodePoint CR_In_Elbasan[] = {
-	1,
-	0x10500, 0x1052f,
-}; /* CR_In_Elbasan */
-
-/* 'In_Caucasian_Albanian': Block */
-static const OnigCodePoint CR_In_Caucasian_Albanian[] = {
-	1,
-	0x10530, 0x1056f,
-}; /* CR_In_Caucasian_Albanian */
-
-/* 'In_Linear_A': Block */
-static const OnigCodePoint CR_In_Linear_A[] = {
-	1,
-	0x10600, 0x1077f,
-}; /* CR_In_Linear_A */
-
-/* 'In_Cypriot_Syllabary': Block */
-static const OnigCodePoint CR_In_Cypriot_Syllabary[] = {
-	1,
-	0x10800, 0x1083f,
-}; /* CR_In_Cypriot_Syllabary */
-
-/* 'In_Imperial_Aramaic': Block */
-static const OnigCodePoint CR_In_Imperial_Aramaic[] = {
-	1,
-	0x10840, 0x1085f,
-}; /* CR_In_Imperial_Aramaic */
-
-/* 'In_Palmyrene': Block */
-#define CR_In_Palmyrene CR_Palmyrene
-
-/* 'In_Nabataean': Block */
-static const OnigCodePoint CR_In_Nabataean[] = {
-	1,
-	0x10880, 0x108af,
-}; /* CR_In_Nabataean */
-
-/* 'In_Hatran': Block */
-static const OnigCodePoint CR_In_Hatran[] = {
-	1,
-	0x108e0, 0x108ff,
-}; /* CR_In_Hatran */
-
-/* 'In_Phoenician': Block */
-static const OnigCodePoint CR_In_Phoenician[] = {
-	1,
-	0x10900, 0x1091f,
-}; /* CR_In_Phoenician */
-
-/* 'In_Lydian': Block */
-static const OnigCodePoint CR_In_Lydian[] = {
-	1,
-	0x10920, 0x1093f,
-}; /* CR_In_Lydian */
-
-/* 'In_Meroitic_Hieroglyphs': Block */
-#define CR_In_Meroitic_Hieroglyphs CR_Meroitic_Hieroglyphs
-
-/* 'In_Meroitic_Cursive': Block */
-static const OnigCodePoint CR_In_Meroitic_Cursive[] = {
-	1,
-	0x109a0, 0x109ff,
-}; /* CR_In_Meroitic_Cursive */
-
-/* 'In_Kharoshthi': Block */
-static const OnigCodePoint CR_In_Kharoshthi[] = {
-	1,
-	0x10a00, 0x10a5f,
-}; /* CR_In_Kharoshthi */
-
-/* 'In_Old_South_Arabian': Block */
-#define CR_In_Old_South_Arabian CR_Old_South_Arabian
-
-/* 'In_Old_North_Arabian': Block */
-#define CR_In_Old_North_Arabian CR_Old_North_Arabian
-
-/* 'In_Manichaean': Block */
-static const OnigCodePoint CR_In_Manichaean[] = {
-	1,
-	0x10ac0, 0x10aff,
-}; /* CR_In_Manichaean */
-
-/* 'In_Avestan': Block */
-static const OnigCodePoint CR_In_Avestan[] = {
-	1,
-	0x10b00, 0x10b3f,
-}; /* CR_In_Avestan */
-
-/* 'In_Inscriptional_Parthian': Block */
-static const OnigCodePoint CR_In_Inscriptional_Parthian[] = {
-	1,
-	0x10b40, 0x10b5f,
-}; /* CR_In_Inscriptional_Parthian */
-
-/* 'In_Inscriptional_Pahlavi': Block */
-static const OnigCodePoint CR_In_Inscriptional_Pahlavi[] = {
-	1,
-	0x10b60, 0x10b7f,
-}; /* CR_In_Inscriptional_Pahlavi */
-
-/* 'In_Psalter_Pahlavi': Block */
-static const OnigCodePoint CR_In_Psalter_Pahlavi[] = {
-	1,
-	0x10b80, 0x10baf,
-}; /* CR_In_Psalter_Pahlavi */
-
-/* 'In_Old_Turkic': Block */
-static const OnigCodePoint CR_In_Old_Turkic[] = {
-	1,
-	0x10c00, 0x10c4f,
-}; /* CR_In_Old_Turkic */
-
-/* 'In_Old_Hungarian': Block */
-static const OnigCodePoint CR_In_Old_Hungarian[] = {
-	1,
-	0x10c80, 0x10cff,
-}; /* CR_In_Old_Hungarian */
-
-/* 'In_Rumi_Numeral_Symbols': Block */
-static const OnigCodePoint CR_In_Rumi_Numeral_Symbols[] = {
-	1,
-	0x10e60, 0x10e7f,
-}; /* CR_In_Rumi_Numeral_Symbols */
-
-/* 'In_Brahmi': Block */
-static const OnigCodePoint CR_In_Brahmi[] = {
-	1,
-	0x11000, 0x1107f,
-}; /* CR_In_Brahmi */
-
-/* 'In_Kaithi': Block */
-static const OnigCodePoint CR_In_Kaithi[] = {
-	1,
-	0x11080, 0x110cf,
-}; /* CR_In_Kaithi */
-
-/* 'In_Sora_Sompeng': Block */
-static const OnigCodePoint CR_In_Sora_Sompeng[] = {
-	1,
-	0x110d0, 0x110ff,
-}; /* CR_In_Sora_Sompeng */
-
-/* 'In_Chakma': Block */
-static const OnigCodePoint CR_In_Chakma[] = {
-	1,
-	0x11100, 0x1114f,
-}; /* CR_In_Chakma */
-
-/* 'In_Mahajani': Block */
-static const OnigCodePoint CR_In_Mahajani[] = {
-	1,
-	0x11150, 0x1117f,
-}; /* CR_In_Mahajani */
-
-/* 'In_Sharada': Block */
-static const OnigCodePoint CR_In_Sharada[] = {
-	1,
-	0x11180, 0x111df,
-}; /* CR_In_Sharada */
-
-/* 'In_Sinhala_Archaic_Numbers': Block */
-static const OnigCodePoint CR_In_Sinhala_Archaic_Numbers[] = {
-	1,
-	0x111e0, 0x111ff,
-}; /* CR_In_Sinhala_Archaic_Numbers */
-
-/* 'In_Khojki': Block */
-static const OnigCodePoint CR_In_Khojki[] = {
-	1,
-	0x11200, 0x1124f,
-}; /* CR_In_Khojki */
-
-/* 'In_Multani': Block */
-static const OnigCodePoint CR_In_Multani[] = {
-	1,
-	0x11280, 0x112af,
-}; /* CR_In_Multani */
-
-/* 'In_Khudawadi': Block */
-static const OnigCodePoint CR_In_Khudawadi[] = {
-	1,
-	0x112b0, 0x112ff,
-}; /* CR_In_Khudawadi */
-
-/* 'In_Grantha': Block */
-static const OnigCodePoint CR_In_Grantha[] = {
-	1,
-	0x11300, 0x1137f,
-}; /* CR_In_Grantha */
-
-/* 'In_Tirhuta': Block */
-static const OnigCodePoint CR_In_Tirhuta[] = {
-	1,
-	0x11480, 0x114df,
-}; /* CR_In_Tirhuta */
-
-/* 'In_Siddham': Block */
-static const OnigCodePoint CR_In_Siddham[] = {
-	1,
-	0x11580, 0x115ff,
-}; /* CR_In_Siddham */
-
-/* 'In_Modi': Block */
-static const OnigCodePoint CR_In_Modi[] = {
-	1,
-	0x11600, 0x1165f,
-}; /* CR_In_Modi */
-
-/* 'In_Takri': Block */
-static const OnigCodePoint CR_In_Takri[] = {
-	1,
-	0x11680, 0x116cf,
-}; /* CR_In_Takri */
-
-/* 'In_Ahom': Block */
-static const OnigCodePoint CR_In_Ahom[] = {
-	1,
-	0x11700, 0x1173f,
-}; /* CR_In_Ahom */
-
-/* 'In_Warang_Citi': Block */
-static const OnigCodePoint CR_In_Warang_Citi[] = {
-	1,
-	0x118a0, 0x118ff,
-}; /* CR_In_Warang_Citi */
-
-/* 'In_Pau_Cin_Hau': Block */
-static const OnigCodePoint CR_In_Pau_Cin_Hau[] = {
-	1,
-	0x11ac0, 0x11aff,
-}; /* CR_In_Pau_Cin_Hau */
-
-/* 'In_Cuneiform': Block */
-static const OnigCodePoint CR_In_Cuneiform[] = {
-	1,
-	0x12000, 0x123ff,
-}; /* CR_In_Cuneiform */
-
-/* 'In_Cuneiform_Numbers_and_Punctuation': Block */
-static const OnigCodePoint CR_In_Cuneiform_Numbers_and_Punctuation[] = {
-	1,
-	0x12400, 0x1247f,
-}; /* CR_In_Cuneiform_Numbers_and_Punctuation */
-
-/* 'In_Early_Dynastic_Cuneiform': Block */
-static const OnigCodePoint CR_In_Early_Dynastic_Cuneiform[] = {
-	1,
-	0x12480, 0x1254f,
-}; /* CR_In_Early_Dynastic_Cuneiform */
-
-/* 'In_Egyptian_Hieroglyphs': Block */
-static const OnigCodePoint CR_In_Egyptian_Hieroglyphs[] = {
-	1,
-	0x13000, 0x1342f,
-}; /* CR_In_Egyptian_Hieroglyphs */
-
-/* 'In_Anatolian_Hieroglyphs': Block */
-static const OnigCodePoint CR_In_Anatolian_Hieroglyphs[] = {
-	1,
-	0x14400, 0x1467f,
-}; /* CR_In_Anatolian_Hieroglyphs */
-
-/* 'In_Bamum_Supplement': Block */
-static const OnigCodePoint CR_In_Bamum_Supplement[] = {
-	1,
-	0x16800, 0x16a3f,
-}; /* CR_In_Bamum_Supplement */
-
-/* 'In_Mro': Block */
-static const OnigCodePoint CR_In_Mro[] = {
-	1,
-	0x16a40, 0x16a6f,
-}; /* CR_In_Mro */
-
-/* 'In_Bassa_Vah': Block */
-static const OnigCodePoint CR_In_Bassa_Vah[] = {
-	1,
-	0x16ad0, 0x16aff,
-}; /* CR_In_Bassa_Vah */
-
-/* 'In_Pahawh_Hmong': Block */
-static const OnigCodePoint CR_In_Pahawh_Hmong[] = {
-	1,
-	0x16b00, 0x16b8f,
-}; /* CR_In_Pahawh_Hmong */
-
-/* 'In_Miao': Block */
-static const OnigCodePoint CR_In_Miao[] = {
-	1,
-	0x16f00, 0x16f9f,
-}; /* CR_In_Miao */
-
-/* 'In_Kana_Supplement': Block */
-static const OnigCodePoint CR_In_Kana_Supplement[] = {
-	1,
-	0x1b000, 0x1b0ff,
-}; /* CR_In_Kana_Supplement */
-
-/* 'In_Duployan': Block */
-static const OnigCodePoint CR_In_Duployan[] = {
-	1,
-	0x1bc00, 0x1bc9f,
-}; /* CR_In_Duployan */
-
-/* 'In_Shorthand_Format_Controls': Block */
-static const OnigCodePoint CR_In_Shorthand_Format_Controls[] = {
-	1,
-	0x1bca0, 0x1bcaf,
-}; /* CR_In_Shorthand_Format_Controls */
-
-/* 'In_Byzantine_Musical_Symbols': Block */
-static const OnigCodePoint CR_In_Byzantine_Musical_Symbols[] = {
-	1,
-	0x1d000, 0x1d0ff,
-}; /* CR_In_Byzantine_Musical_Symbols */
-
-/* 'In_Musical_Symbols': Block */
-static const OnigCodePoint CR_In_Musical_Symbols[] = {
-	1,
-	0x1d100, 0x1d1ff,
-}; /* CR_In_Musical_Symbols */
-
-/* 'In_Ancient_Greek_Musical_Notation': Block */
-static const OnigCodePoint CR_In_Ancient_Greek_Musical_Notation[] = {
-	1,
-	0x1d200, 0x1d24f,
-}; /* CR_In_Ancient_Greek_Musical_Notation */
-
-/* 'In_Tai_Xuan_Jing_Symbols': Block */
-static const OnigCodePoint CR_In_Tai_Xuan_Jing_Symbols[] = {
-	1,
-	0x1d300, 0x1d35f,
-}; /* CR_In_Tai_Xuan_Jing_Symbols */
-
-/* 'In_Counting_Rod_Numerals': Block */
-static const OnigCodePoint CR_In_Counting_Rod_Numerals[] = {
-	1,
-	0x1d360, 0x1d37f,
-}; /* CR_In_Counting_Rod_Numerals */
-
-/* 'In_Mathematical_Alphanumeric_Symbols': Block */
-static const OnigCodePoint CR_In_Mathematical_Alphanumeric_Symbols[] = {
-	1,
-	0x1d400, 0x1d7ff,
-}; /* CR_In_Mathematical_Alphanumeric_Symbols */
-
-/* 'In_Sutton_SignWriting': Block */
-static const OnigCodePoint CR_In_Sutton_SignWriting[] = {
-	1,
-	0x1d800, 0x1daaf,
-}; /* CR_In_Sutton_SignWriting */
-
-/* 'In_Mende_Kikakui': Block */
-static const OnigCodePoint CR_In_Mende_Kikakui[] = {
-	1,
-	0x1e800, 0x1e8df,
-}; /* CR_In_Mende_Kikakui */
-
-/* 'In_Arabic_Mathematical_Alphabetic_Symbols': Block */
-static const OnigCodePoint CR_In_Arabic_Mathematical_Alphabetic_Symbols[] = {
-	1,
-	0x1ee00, 0x1eeff,
-}; /* CR_In_Arabic_Mathematical_Alphabetic_Symbols */
-
-/* 'In_Mahjong_Tiles': Block */
-static const OnigCodePoint CR_In_Mahjong_Tiles[] = {
-	1,
-	0x1f000, 0x1f02f,
-}; /* CR_In_Mahjong_Tiles */
-
-/* 'In_Domino_Tiles': Block */
-static const OnigCodePoint CR_In_Domino_Tiles[] = {
-	1,
-	0x1f030, 0x1f09f,
-}; /* CR_In_Domino_Tiles */
-
-/* 'In_Playing_Cards': Block */
-static const OnigCodePoint CR_In_Playing_Cards[] = {
-	1,
-	0x1f0a0, 0x1f0ff,
-}; /* CR_In_Playing_Cards */
-
-/* 'In_Enclosed_Alphanumeric_Supplement': Block */
-static const OnigCodePoint CR_In_Enclosed_Alphanumeric_Supplement[] = {
-	1,
-	0x1f100, 0x1f1ff,
-}; /* CR_In_Enclosed_Alphanumeric_Supplement */
-
-/* 'In_Enclosed_Ideographic_Supplement': Block */
-static const OnigCodePoint CR_In_Enclosed_Ideographic_Supplement[] = {
-	1,
-	0x1f200, 0x1f2ff,
-}; /* CR_In_Enclosed_Ideographic_Supplement */
-
-/* 'In_Miscellaneous_Symbols_and_Pictographs': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Symbols_and_Pictographs[] = {
-	1,
-	0x1f300, 0x1f5ff,
-}; /* CR_In_Miscellaneous_Symbols_and_Pictographs */
-
-/* 'In_Emoticons': Block */
-static const OnigCodePoint CR_In_Emoticons[] = {
-	1,
-	0x1f600, 0x1f64f,
-}; /* CR_In_Emoticons */
-
-/* 'In_Ornamental_Dingbats': Block */
-static const OnigCodePoint CR_In_Ornamental_Dingbats[] = {
-	1,
-	0x1f650, 0x1f67f,
-}; /* CR_In_Ornamental_Dingbats */
-
-/* 'In_Transport_and_Map_Symbols': Block */
-static const OnigCodePoint CR_In_Transport_and_Map_Symbols[] = {
-	1,
-	0x1f680, 0x1f6ff,
-}; /* CR_In_Transport_and_Map_Symbols */
-
-/* 'In_Alchemical_Symbols': Block */
-static const OnigCodePoint CR_In_Alchemical_Symbols[] = {
-	1,
-	0x1f700, 0x1f77f,
-}; /* CR_In_Alchemical_Symbols */
-
-/* 'In_Geometric_Shapes_Extended': Block */
-static const OnigCodePoint CR_In_Geometric_Shapes_Extended[] = {
-	1,
-	0x1f780, 0x1f7ff,
-}; /* CR_In_Geometric_Shapes_Extended */
-
-/* 'In_Supplemental_Arrows_C': Block */
-static const OnigCodePoint CR_In_Supplemental_Arrows_C[] = {
-	1,
-	0x1f800, 0x1f8ff,
-}; /* CR_In_Supplemental_Arrows_C */
-
-/* 'In_Supplemental_Symbols_and_Pictographs': Block */
-static const OnigCodePoint CR_In_Supplemental_Symbols_and_Pictographs[] = {
-	1,
-	0x1f900, 0x1f9ff,
-}; /* CR_In_Supplemental_Symbols_and_Pictographs */
-
-/* 'In_CJK_Unified_Ideographs_Extension_B': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_B[] = {
-	1,
-	0x20000, 0x2a6df,
-}; /* CR_In_CJK_Unified_Ideographs_Extension_B */
-
-/* 'In_CJK_Unified_Ideographs_Extension_C': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_C[] = {
-	1,
-	0x2a700, 0x2b73f,
-}; /* CR_In_CJK_Unified_Ideographs_Extension_C */
-
-/* 'In_CJK_Unified_Ideographs_Extension_D': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_D[] = {
-	1,
-	0x2b740, 0x2b81f,
-}; /* CR_In_CJK_Unified_Ideographs_Extension_D */
-
-/* 'In_CJK_Unified_Ideographs_Extension_E': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_E[] = {
-	1,
-	0x2b820, 0x2ceaf,
-}; /* CR_In_CJK_Unified_Ideographs_Extension_E */
-
-/* 'In_CJK_Compatibility_Ideographs_Supplement': Block */
-static const OnigCodePoint CR_In_CJK_Compatibility_Ideographs_Supplement[] = {
-	1,
-	0x2f800, 0x2fa1f,
-}; /* CR_In_CJK_Compatibility_Ideographs_Supplement */
-
-/* 'In_Tags': Block */
-static const OnigCodePoint CR_In_Tags[] = {
-	1,
-	0xe0000, 0xe007f,
-}; /* CR_In_Tags */
-
-/* 'In_Variation_Selectors_Supplement': Block */
-static const OnigCodePoint CR_In_Variation_Selectors_Supplement[] = {
-	1,
-	0xe0100, 0xe01ef,
-}; /* CR_In_Variation_Selectors_Supplement */
-
-/* 'In_Supplementary_Private_Use_Area_A': Block */
-static const OnigCodePoint CR_In_Supplementary_Private_Use_Area_A[] = {
-	1,
-	0xf0000, 0xfffff,
-}; /* CR_In_Supplementary_Private_Use_Area_A */
-
-/* 'In_Supplementary_Private_Use_Area_B': Block */
-static const OnigCodePoint CR_In_Supplementary_Private_Use_Area_B[] = {
-	1,
-	0x100000, 0x10ffff,
-}; /* CR_In_Supplementary_Private_Use_Area_B */
-
-/* 'In_No_Block': Block */
-static const OnigCodePoint CR_In_No_Block[] = {
-	42,
-	0x0860, 0x089f,
-	0x1c80, 0x1cbf,
-	0x2fe0, 0x2fef,
-	0x10200, 0x1027f,
-	0x103e0, 0x103ff,
-	0x104b0, 0x104ff,
-	0x10570, 0x105ff,
-	0x10780, 0x107ff,
-	0x108b0, 0x108df,
-	0x10940, 0x1097f,
-	0x10aa0, 0x10abf,
-	0x10bb0, 0x10bff,
-	0x10c50, 0x10c7f,
-	0x10d00, 0x10e5f,
-	0x10e80, 0x10fff,
-	0x11250, 0x1127f,
-	0x11380, 0x1147f,
-	0x114e0, 0x1157f,
-	0x11660, 0x1167f,
-	0x116d0, 0x116ff,
-	0x11740, 0x1189f,
-	0x11900, 0x11abf,
-	0x11b00, 0x11fff,
-	0x12550, 0x12fff,
-	0x13430, 0x143ff,
-	0x14680, 0x167ff,
-	0x16a70, 0x16acf,
-	0x16b90, 0x16eff,
-	0x16fa0, 0x1afff,
-	0x1b100, 0x1bbff,
-	0x1bcb0, 0x1cfff,
-	0x1d250, 0x1d2ff,
-	0x1d380, 0x1d3ff,
-	0x1dab0, 0x1e7ff,
-	0x1e8e0, 0x1edff,
-	0x1ef00, 0x1efff,
-	0x1fa00, 0x1ffff,
-	0x2a6e0, 0x2a6ff,
-	0x2ceb0, 0x2f7ff,
-	0x2fa20, 0xdffff,
-	0xe0080, 0xe00ff,
-	0xe01f0, 0xeffff,
-}; /* CR_In_No_Block */
-#endif /* USE_UNICODE_PROPERTIES */
-
-static const OnigCodePoint* const CodeRanges[] = {
-  CR_NEWLINE,
-  CR_Alpha,
-  CR_Blank,
-  CR_Cntrl,
-  CR_Digit,
-  CR_Graph,
-  CR_Lower,
-  CR_Print,
-  CR_Punct,
-  CR_Space,
-  CR_Upper,
-  CR_XDigit,
-  CR_Word,
-  CR_Alnum,
-  CR_ASCII,
-#ifdef USE_UNICODE_PROPERTIES
-  CR_Any,
-  CR_Assigned,
-  CR_C,
-  CR_Cc,
-  CR_Cf,
-  CR_Cn,
-  CR_Co,
-  CR_Cs,
-  CR_L,
-  CR_LC,
-  CR_Ll,
-  CR_Lm,
-  CR_Lo,
-  CR_Lt,
-  CR_Lu,
-  CR_M,
-  CR_Mc,
-  CR_Me,
-  CR_Mn,
-  CR_N,
-  CR_Nd,
-  CR_Nl,
-  CR_No,
-  CR_P,
-  CR_Pc,
-  CR_Pd,
-  CR_Pe,
-  CR_Pf,
-  CR_Pi,
-  CR_Po,
-  CR_Ps,
-  CR_S,
-  CR_Sc,
-  CR_Sk,
-  CR_Sm,
-  CR_So,
-  CR_Z,
-  CR_Zl,
-  CR_Zp,
-  CR_Zs,
-  CR_Math,
-  CR_Alphabetic,
-  CR_Lowercase,
-  CR_Uppercase,
-  CR_Cased,
-  CR_Case_Ignorable,
-  CR_Changes_When_Lowercased,
-  CR_Changes_When_Uppercased,
-  CR_Changes_When_Titlecased,
-  CR_Changes_When_Casefolded,
-  CR_Changes_When_Casemapped,
-  CR_ID_Start,
-  CR_ID_Continue,
-  CR_XID_Start,
-  CR_XID_Continue,
-  CR_Default_Ignorable_Code_Point,
-  CR_Grapheme_Extend,
-  CR_Grapheme_Base,
-  CR_Grapheme_Link,
-  CR_Common,
-  CR_Latin,
-  CR_Greek,
-  CR_Cyrillic,
-  CR_Armenian,
-  CR_Hebrew,
-  CR_Arabic,
-  CR_Syriac,
-  CR_Thaana,
-  CR_Devanagari,
-  CR_Bengali,
-  CR_Gurmukhi,
-  CR_Gujarati,
-  CR_Oriya,
-  CR_Tamil,
-  CR_Telugu,
-  CR_Kannada,
-  CR_Malayalam,
-  CR_Sinhala,
-  CR_Thai,
-  CR_Lao,
-  CR_Tibetan,
-  CR_Myanmar,
-  CR_Georgian,
-  CR_Hangul,
-  CR_Ethiopic,
-  CR_Cherokee,
-  CR_Canadian_Aboriginal,
-  CR_Ogham,
-  CR_Runic,
-  CR_Khmer,
-  CR_Mongolian,
-  CR_Hiragana,
-  CR_Katakana,
-  CR_Bopomofo,
-  CR_Han,
-  CR_Yi,
-  CR_Old_Italic,
-  CR_Gothic,
-  CR_Deseret,
-  CR_Inherited,
-  CR_Tagalog,
-  CR_Hanunoo,
-  CR_Buhid,
-  CR_Tagbanwa,
-  CR_Limbu,
-  CR_Tai_Le,
-  CR_Linear_B,
-  CR_Ugaritic,
-  CR_Shavian,
-  CR_Osmanya,
-  CR_Cypriot,
-  CR_Braille,
-  CR_Buginese,
-  CR_Coptic,
-  CR_New_Tai_Lue,
-  CR_Glagolitic,
-  CR_Tifinagh,
-  CR_Syloti_Nagri,
-  CR_Old_Persian,
-  CR_Kharoshthi,
-  CR_Balinese,
-  CR_Cuneiform,
-  CR_Phoenician,
-  CR_Phags_Pa,
-  CR_Nko,
-  CR_Sundanese,
-  CR_Lepcha,
-  CR_Ol_Chiki,
-  CR_Vai,
-  CR_Saurashtra,
-  CR_Kayah_Li,
-  CR_Rejang,
-  CR_Lycian,
-  CR_Carian,
-  CR_Lydian,
-  CR_Cham,
-  CR_Tai_Tham,
-  CR_Tai_Viet,
-  CR_Avestan,
-  CR_Egyptian_Hieroglyphs,
-  CR_Samaritan,
-  CR_Lisu,
-  CR_Bamum,
-  CR_Javanese,
-  CR_Meetei_Mayek,
-  CR_Imperial_Aramaic,
-  CR_Old_South_Arabian,
-  CR_Inscriptional_Parthian,
-  CR_Inscriptional_Pahlavi,
-  CR_Old_Turkic,
-  CR_Kaithi,
-  CR_Batak,
-  CR_Brahmi,
-  CR_Mandaic,
-  CR_Chakma,
-  CR_Meroitic_Cursive,
-  CR_Meroitic_Hieroglyphs,
-  CR_Miao,
-  CR_Sharada,
-  CR_Sora_Sompeng,
-  CR_Takri,
-  CR_Caucasian_Albanian,
-  CR_Bassa_Vah,
-  CR_Duployan,
-  CR_Elbasan,
-  CR_Grantha,
-  CR_Pahawh_Hmong,
-  CR_Khojki,
-  CR_Linear_A,
-  CR_Mahajani,
-  CR_Manichaean,
-  CR_Mende_Kikakui,
-  CR_Modi,
-  CR_Mro,
-  CR_Old_North_Arabian,
-  CR_Nabataean,
-  CR_Palmyrene,
-  CR_Pau_Cin_Hau,
-  CR_Old_Permic,
-  CR_Psalter_Pahlavi,
-  CR_Siddham,
-  CR_Khudawadi,
-  CR_Tirhuta,
-  CR_Warang_Citi,
-  CR_Ahom,
-  CR_Anatolian_Hieroglyphs,
-  CR_Hatran,
-  CR_Multani,
-  CR_Old_Hungarian,
-  CR_SignWriting,
-  CR_White_Space,
-  CR_Bidi_Control,
-  CR_Join_Control,
-  CR_Dash,
-  CR_Hyphen,
-  CR_Quotation_Mark,
-  CR_Terminal_Punctuation,
-  CR_Other_Math,
-  CR_Hex_Digit,
-  CR_ASCII_Hex_Digit,
-  CR_Other_Alphabetic,
-  CR_Ideographic,
-  CR_Diacritic,
-  CR_Extender,
-  CR_Other_Lowercase,
-  CR_Other_Uppercase,
-  CR_Noncharacter_Code_Point,
-  CR_Other_Grapheme_Extend,
-  CR_IDS_Binary_Operator,
-  CR_IDS_Trinary_Operator,
-  CR_Radical,
-  CR_Unified_Ideograph,
-  CR_Other_Default_Ignorable_Code_Point,
-  CR_Deprecated,
-  CR_Soft_Dotted,
-  CR_Logical_Order_Exception,
-  CR_Other_ID_Start,
-  CR_Other_ID_Continue,
-  CR_STerm,
-  CR_Variation_Selector,
-  CR_Pattern_White_Space,
-  CR_Pattern_Syntax,
-  CR_Unknown,
-#ifdef USE_UNICODE_AGE_PROPERTIES
-  CR_Age_1_1,
-  CR_Age_2_0,
-  CR_Age_2_1,
-  CR_Age_3_0,
-  CR_Age_3_1,
-  CR_Age_3_2,
-  CR_Age_4_0,
-  CR_Age_4_1,
-  CR_Age_5_0,
-  CR_Age_5_1,
-  CR_Age_5_2,
-  CR_Age_6_0,
-  CR_Age_6_1,
-  CR_Age_6_2,
-  CR_Age_6_3,
-  CR_Age_7_0,
-  CR_Age_8_0,
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-  CR_In_Basic_Latin,
-  CR_In_Latin_1_Supplement,
-  CR_In_Latin_Extended_A,
-  CR_In_Latin_Extended_B,
-  CR_In_IPA_Extensions,
-  CR_In_Spacing_Modifier_Letters,
-  CR_In_Combining_Diacritical_Marks,
-  CR_In_Greek_and_Coptic,
-  CR_In_Cyrillic,
-  CR_In_Cyrillic_Supplement,
-  CR_In_Armenian,
-  CR_In_Hebrew,
-  CR_In_Arabic,
-  CR_In_Syriac,
-  CR_In_Arabic_Supplement,
-  CR_In_Thaana,
-  CR_In_NKo,
-  CR_In_Samaritan,
-  CR_In_Mandaic,
-  CR_In_Arabic_Extended_A,
-  CR_In_Devanagari,
-  CR_In_Bengali,
-  CR_In_Gurmukhi,
-  CR_In_Gujarati,
-  CR_In_Oriya,
-  CR_In_Tamil,
-  CR_In_Telugu,
-  CR_In_Kannada,
-  CR_In_Malayalam,
-  CR_In_Sinhala,
-  CR_In_Thai,
-  CR_In_Lao,
-  CR_In_Tibetan,
-  CR_In_Myanmar,
-  CR_In_Georgian,
-  CR_In_Hangul_Jamo,
-  CR_In_Ethiopic,
-  CR_In_Ethiopic_Supplement,
-  CR_In_Cherokee,
-  CR_In_Unified_Canadian_Aboriginal_Syllabics,
-  CR_In_Ogham,
-  CR_In_Runic,
-  CR_In_Tagalog,
-  CR_In_Hanunoo,
-  CR_In_Buhid,
-  CR_In_Tagbanwa,
-  CR_In_Khmer,
-  CR_In_Mongolian,
-  CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended,
-  CR_In_Limbu,
-  CR_In_Tai_Le,
-  CR_In_New_Tai_Lue,
-  CR_In_Khmer_Symbols,
-  CR_In_Buginese,
-  CR_In_Tai_Tham,
-  CR_In_Combining_Diacritical_Marks_Extended,
-  CR_In_Balinese,
-  CR_In_Sundanese,
-  CR_In_Batak,
-  CR_In_Lepcha,
-  CR_In_Ol_Chiki,
-  CR_In_Sundanese_Supplement,
-  CR_In_Vedic_Extensions,
-  CR_In_Phonetic_Extensions,
-  CR_In_Phonetic_Extensions_Supplement,
-  CR_In_Combining_Diacritical_Marks_Supplement,
-  CR_In_Latin_Extended_Additional,
-  CR_In_Greek_Extended,
-  CR_In_General_Punctuation,
-  CR_In_Superscripts_and_Subscripts,
-  CR_In_Currency_Symbols,
-  CR_In_Combining_Diacritical_Marks_for_Symbols,
-  CR_In_Letterlike_Symbols,
-  CR_In_Number_Forms,
-  CR_In_Arrows,
-  CR_In_Mathematical_Operators,
-  CR_In_Miscellaneous_Technical,
-  CR_In_Control_Pictures,
-  CR_In_Optical_Character_Recognition,
-  CR_In_Enclosed_Alphanumerics,
-  CR_In_Box_Drawing,
-  CR_In_Block_Elements,
-  CR_In_Geometric_Shapes,
-  CR_In_Miscellaneous_Symbols,
-  CR_In_Dingbats,
-  CR_In_Miscellaneous_Mathematical_Symbols_A,
-  CR_In_Supplemental_Arrows_A,
-  CR_In_Braille_Patterns,
-  CR_In_Supplemental_Arrows_B,
-  CR_In_Miscellaneous_Mathematical_Symbols_B,
-  CR_In_Supplemental_Mathematical_Operators,
-  CR_In_Miscellaneous_Symbols_and_Arrows,
-  CR_In_Glagolitic,
-  CR_In_Latin_Extended_C,
-  CR_In_Coptic,
-  CR_In_Georgian_Supplement,
-  CR_In_Tifinagh,
-  CR_In_Ethiopic_Extended,
-  CR_In_Cyrillic_Extended_A,
-  CR_In_Supplemental_Punctuation,
-  CR_In_CJK_Radicals_Supplement,
-  CR_In_Kangxi_Radicals,
-  CR_In_Ideographic_Description_Characters,
-  CR_In_CJK_Symbols_and_Punctuation,
-  CR_In_Hiragana,
-  CR_In_Katakana,
-  CR_In_Bopomofo,
-  CR_In_Hangul_Compatibility_Jamo,
-  CR_In_Kanbun,
-  CR_In_Bopomofo_Extended,
-  CR_In_CJK_Strokes,
-  CR_In_Katakana_Phonetic_Extensions,
-  CR_In_Enclosed_CJK_Letters_and_Months,
-  CR_In_CJK_Compatibility,
-  CR_In_CJK_Unified_Ideographs_Extension_A,
-  CR_In_Yijing_Hexagram_Symbols,
-  CR_In_CJK_Unified_Ideographs,
-  CR_In_Yi_Syllables,
-  CR_In_Yi_Radicals,
-  CR_In_Lisu,
-  CR_In_Vai,
-  CR_In_Cyrillic_Extended_B,
-  CR_In_Bamum,
-  CR_In_Modifier_Tone_Letters,
-  CR_In_Latin_Extended_D,
-  CR_In_Syloti_Nagri,
-  CR_In_Common_Indic_Number_Forms,
-  CR_In_Phags_pa,
-  CR_In_Saurashtra,
-  CR_In_Devanagari_Extended,
-  CR_In_Kayah_Li,
-  CR_In_Rejang,
-  CR_In_Hangul_Jamo_Extended_A,
-  CR_In_Javanese,
-  CR_In_Myanmar_Extended_B,
-  CR_In_Cham,
-  CR_In_Myanmar_Extended_A,
-  CR_In_Tai_Viet,
-  CR_In_Meetei_Mayek_Extensions,
-  CR_In_Ethiopic_Extended_A,
-  CR_In_Latin_Extended_E,
-  CR_In_Cherokee_Supplement,
-  CR_In_Meetei_Mayek,
-  CR_In_Hangul_Syllables,
-  CR_In_Hangul_Jamo_Extended_B,
-  CR_In_High_Surrogates,
-  CR_In_High_Private_Use_Surrogates,
-  CR_In_Low_Surrogates,
-  CR_In_Private_Use_Area,
-  CR_In_CJK_Compatibility_Ideographs,
-  CR_In_Alphabetic_Presentation_Forms,
-  CR_In_Arabic_Presentation_Forms_A,
-  CR_In_Variation_Selectors,
-  CR_In_Vertical_Forms,
-  CR_In_Combining_Half_Marks,
-  CR_In_CJK_Compatibility_Forms,
-  CR_In_Small_Form_Variants,
-  CR_In_Arabic_Presentation_Forms_B,
-  CR_In_Halfwidth_and_Fullwidth_Forms,
-  CR_In_Specials,
-  CR_In_Linear_B_Syllabary,
-  CR_In_Linear_B_Ideograms,
-  CR_In_Aegean_Numbers,
-  CR_In_Ancient_Greek_Numbers,
-  CR_In_Ancient_Symbols,
-  CR_In_Phaistos_Disc,
-  CR_In_Lycian,
-  CR_In_Carian,
-  CR_In_Coptic_Epact_Numbers,
-  CR_In_Old_Italic,
-  CR_In_Gothic,
-  CR_In_Old_Permic,
-  CR_In_Ugaritic,
-  CR_In_Old_Persian,
-  CR_In_Deseret,
-  CR_In_Shavian,
-  CR_In_Osmanya,
-  CR_In_Elbasan,
-  CR_In_Caucasian_Albanian,
-  CR_In_Linear_A,
-  CR_In_Cypriot_Syllabary,
-  CR_In_Imperial_Aramaic,
-  CR_In_Palmyrene,
-  CR_In_Nabataean,
-  CR_In_Hatran,
-  CR_In_Phoenician,
-  CR_In_Lydian,
-  CR_In_Meroitic_Hieroglyphs,
-  CR_In_Meroitic_Cursive,
-  CR_In_Kharoshthi,
-  CR_In_Old_South_Arabian,
-  CR_In_Old_North_Arabian,
-  CR_In_Manichaean,
-  CR_In_Avestan,
-  CR_In_Inscriptional_Parthian,
-  CR_In_Inscriptional_Pahlavi,
-  CR_In_Psalter_Pahlavi,
-  CR_In_Old_Turkic,
-  CR_In_Old_Hungarian,
-  CR_In_Rumi_Numeral_Symbols,
-  CR_In_Brahmi,
-  CR_In_Kaithi,
-  CR_In_Sora_Sompeng,
-  CR_In_Chakma,
-  CR_In_Mahajani,
-  CR_In_Sharada,
-  CR_In_Sinhala_Archaic_Numbers,
-  CR_In_Khojki,
-  CR_In_Multani,
-  CR_In_Khudawadi,
-  CR_In_Grantha,
-  CR_In_Tirhuta,
-  CR_In_Siddham,
-  CR_In_Modi,
-  CR_In_Takri,
-  CR_In_Ahom,
-  CR_In_Warang_Citi,
-  CR_In_Pau_Cin_Hau,
-  CR_In_Cuneiform,
-  CR_In_Cuneiform_Numbers_and_Punctuation,
-  CR_In_Early_Dynastic_Cuneiform,
-  CR_In_Egyptian_Hieroglyphs,
-  CR_In_Anatolian_Hieroglyphs,
-  CR_In_Bamum_Supplement,
-  CR_In_Mro,
-  CR_In_Bassa_Vah,
-  CR_In_Pahawh_Hmong,
-  CR_In_Miao,
-  CR_In_Kana_Supplement,
-  CR_In_Duployan,
-  CR_In_Shorthand_Format_Controls,
-  CR_In_Byzantine_Musical_Symbols,
-  CR_In_Musical_Symbols,
-  CR_In_Ancient_Greek_Musical_Notation,
-  CR_In_Tai_Xuan_Jing_Symbols,
-  CR_In_Counting_Rod_Numerals,
-  CR_In_Mathematical_Alphanumeric_Symbols,
-  CR_In_Sutton_SignWriting,
-  CR_In_Mende_Kikakui,
-  CR_In_Arabic_Mathematical_Alphabetic_Symbols,
-  CR_In_Mahjong_Tiles,
-  CR_In_Domino_Tiles,
-  CR_In_Playing_Cards,
-  CR_In_Enclosed_Alphanumeric_Supplement,
-  CR_In_Enclosed_Ideographic_Supplement,
-  CR_In_Miscellaneous_Symbols_and_Pictographs,
-  CR_In_Emoticons,
-  CR_In_Ornamental_Dingbats,
-  CR_In_Transport_and_Map_Symbols,
-  CR_In_Alchemical_Symbols,
-  CR_In_Geometric_Shapes_Extended,
-  CR_In_Supplemental_Arrows_C,
-  CR_In_Supplemental_Symbols_and_Pictographs,
-  CR_In_CJK_Unified_Ideographs_Extension_B,
-  CR_In_CJK_Unified_Ideographs_Extension_C,
-  CR_In_CJK_Unified_Ideographs_Extension_D,
-  CR_In_CJK_Unified_Ideographs_Extension_E,
-  CR_In_CJK_Compatibility_Ideographs_Supplement,
-  CR_In_Tags,
-  CR_In_Variation_Selectors_Supplement,
-  CR_In_Supplementary_Private_Use_Area_A,
-  CR_In_Supplementary_Private_Use_Area_B,
-  CR_In_No_Block,
-#endif /* USE_UNICODE_PROPERTIES */
-};
-struct uniname2ctype_struct {
-  int name, ctype;
-};
-
-static const struct uniname2ctype_struct *uniname2ctype_p(const char *, unsigned int);
-
-#ifndef USE_UNICODE_PROPERTIES
-#define TOTAL_KEYWORDS 14
-#define MIN_WORD_LENGTH 4
-#define MAX_WORD_LENGTH 6
-#define MIN_HASH_VALUE 6
-#define MAX_HASH_VALUE 19
-/* maximum key range = 14, duplicates = 0 */
-#else /* USE_UNICODE_PROPERTIES */
-#ifndef USE_UNICODE_AGE_PROPERTIES
-#define TOTAL_KEYWORDS 710
-#else /* USE_UNICODE_AGE_PROPERTIES */
-#define TOTAL_KEYWORDS 727
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-#define MIN_WORD_LENGTH 1
-#define MAX_WORD_LENGTH 44
-#define MIN_HASH_VALUE 3
-#define MAX_HASH_VALUE 5326
-/* maximum key range = 5324, duplicates = 0 */
-#endif /* USE_UNICODE_PROPERTIES */
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-static unsigned int
-uniname2ctype_hash (str, len)
-     register const char *str;
-     register unsigned int len;
-{
-#ifndef USE_UNICODE_PROPERTIES
-  static const unsigned char asso_values[] =
-#else /* USE_UNICODE_PROPERTIES */
-  static const unsigned short asso_values[] =
-#endif /* USE_UNICODE_PROPERTIES */
-    {
-#ifndef USE_UNICODE_PROPERTIES
-      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, 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, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20,  3, 11,  5,
-       4, 20, 20,  9, 20,  1, 20, 20, 10, 20,
-       2, 20,  1, 20,  1,  7,  4,  6, 20,  1,
-       4, 20, 20, 20, 20, 20, 20, 20
-#else /* USE_UNICODE_PROPERTIES */
-      5327, 5327, 5327, 5327, 5327, 5327, 5327, 5327, 5327, 5327,
-      5327, 5327, 5327, 5327, 5327, 5327, 5327, 5327, 5327, 5327,
-      5327, 5327, 5327, 5327, 5327, 5327, 5327, 5327, 5327, 5327,
-      5327, 5327, 5327, 5327, 5327, 5327, 5327, 5327, 5327, 5327,
-#ifndef USE_UNICODE_AGE_PROPERTIES
-      5327, 5327, 5327, 5327, 5327, 5327, 5327, 5327, 5327, 5327,
-      5327, 5327, 5327, 5327, 5327, 5327, 5327, 5327, 5327, 5327,
-#else /* USE_UNICODE_AGE_PROPERTIES */
-      5327, 5327, 5327, 5327, 5327, 5327,    2, 5327,   14,    1,
-         2,   11,   14,   20,    6,    9,    4, 5327, 5327, 5327,
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-      5327, 5327, 5327, 5327, 5327, 5327, 5327, 5327, 5327, 5327,
-      5327, 5327, 5327, 5327, 5327, 5327, 5327, 5327, 5327, 5327,
-      5327, 5327, 5327, 5327, 5327, 5327, 5327, 5327, 5327, 5327,
-      5327, 5327, 5327, 5327, 5327, 5327, 5327,   13, 1192,   20,
-       536,   25,  166, 1004,  345,    4,  194, 1391,  147,    7,
-         1,  302,  760,    3,  265,   40,   92, 1327,  124,   78,
-       110, 1040,    8, 5327, 5327, 5327, 5327, 5327
-#endif /* USE_UNICODE_PROPERTIES */
-    };
-#ifndef USE_UNICODE_PROPERTIES
-  return len + asso_values[(unsigned char)str[2]] + asso_values[(unsigned char)str[0]];
-#else /* USE_UNICODE_PROPERTIES */
-  register int hval = len;
-
-  switch (hval)
-    {
-      default:
-        hval += asso_values[(unsigned char)str[15]];
-      /*FALLTHROUGH*/
-      case 15:
-      case 14:
-      case 13:
-      case 12:
-        hval += asso_values[(unsigned char)str[11]];
-      /*FALLTHROUGH*/
-      case 11:
-      case 10:
-      case 9:
-      case 8:
-      case 7:
-      case 6:
-        hval += asso_values[(unsigned char)str[5]];
-      /*FALLTHROUGH*/
-      case 5:
-        hval += asso_values[(unsigned char)str[4]];
-      /*FALLTHROUGH*/
-      case 4:
-      case 3:
-        hval += asso_values[(unsigned char)str[2]];
-      /*FALLTHROUGH*/
-      case 2:
-        hval += asso_values[(unsigned char)str[1]];
-      /*FALLTHROUGH*/
-      case 1:
-        hval += asso_values[(unsigned char)str[0]];
-        break;
-    }
-  return hval + asso_values[(unsigned char)str[len - 1]];
-#endif /* USE_UNICODE_PROPERTIES */
-}
-
-struct uniname2ctype_pool_t
-  {
-#ifndef USE_UNICODE_PROPERTIES
-    char uniname2ctype_pool_str6[sizeof("word")];
-    char uniname2ctype_pool_str7[sizeof("print")];
-    char uniname2ctype_pool_str8[sizeof("punct")];
-    char uniname2ctype_pool_str9[sizeof("alpha")];
-    char uniname2ctype_pool_str10[sizeof("alnum")];
-    char uniname2ctype_pool_str11[sizeof("xdigit")];
-    char uniname2ctype_pool_str12[sizeof("upper")];
-    char uniname2ctype_pool_str13[sizeof("ascii")];
-    char uniname2ctype_pool_str14[sizeof("cntrl")];
-    char uniname2ctype_pool_str15[sizeof("space")];
-    char uniname2ctype_pool_str16[sizeof("lower")];
-    char uniname2ctype_pool_str17[sizeof("graph")];
-    char uniname2ctype_pool_str18[sizeof("digit")];
-    char uniname2ctype_pool_str19[sizeof("blank")];
-#else /* USE_UNICODE_PROPERTIES */
-    char uniname2ctype_pool_str3[sizeof("n")];
-    char uniname2ctype_pool_str11[sizeof("mn")];
-    char uniname2ctype_pool_str15[sizeof("m")];
-    char uniname2ctype_pool_str17[sizeof("z")];
-    char uniname2ctype_pool_str24[sizeof("cn")];
-    char uniname2ctype_pool_str29[sizeof("mani")];
-    char uniname2ctype_pool_str30[sizeof("ci")];
-    char uniname2ctype_pool_str31[sizeof("inmanichaean")];
-    char uniname2ctype_pool_str36[sizeof("zzzz")];
-    char uniname2ctype_pool_str37[sizeof("qaai")];
-    char uniname2ctype_pool_str41[sizeof("c")];
-    char uniname2ctype_pool_str49[sizeof("mc")];
-    char uniname2ctype_pool_str53[sizeof("qaac")];
-    char uniname2ctype_pool_str56[sizeof("sm")];
-    char uniname2ctype_pool_str58[sizeof("incham")];
-    char uniname2ctype_pool_str59[sizeof("me")];
-    char uniname2ctype_pool_str61[sizeof("inarmenian")];
-    char uniname2ctype_pool_str62[sizeof("cc")];
-    char uniname2ctype_pool_str65[sizeof("mandaic")];
-    char uniname2ctype_pool_str69[sizeof("incuneiform")];
-    char uniname2ctype_pool_str77[sizeof("insamaritan")];
-    char uniname2ctype_pool_str78[sizeof("cans")];
-    char uniname2ctype_pool_str81[sizeof("s")];
-    char uniname2ctype_pool_str82[sizeof("sc")];
-    char uniname2ctype_pool_str86[sizeof("ascii")];
-    char uniname2ctype_pool_str90[sizeof("zs")];
-    char uniname2ctype_pool_str93[sizeof("inavestan")];
-    char uniname2ctype_pool_str102[sizeof("cs")];
-    char uniname2ctype_pool_str106[sizeof("inipaextensions")];
-    char uniname2ctype_pool_str110[sizeof("incuneiformnumbersandpunctuation")];
-    char uniname2ctype_pool_str114[sizeof("incommonindicnumberforms")];
-    char uniname2ctype_pool_str124[sizeof("inthai")];
-    char uniname2ctype_pool_str129[sizeof("cwcm")];
-    char uniname2ctype_pool_str132[sizeof("mtei")];
-    char uniname2ctype_pool_str140[sizeof("inspecials")];
-    char uniname2ctype_pool_str141[sizeof("initialpunctuation")];
-    char uniname2ctype_pool_str142[sizeof("invai")];
-    char uniname2ctype_pool_str144[sizeof("inthaana")];
-    char uniname2ctype_pool_str145[sizeof("inancientsymbols")];
-    char uniname2ctype_pool_str148[sizeof("vai")];
-    char uniname2ctype_pool_str149[sizeof("vaii")];
-    char uniname2ctype_pool_str152[sizeof("inmiscellaneousmathematicalsymbolsa")];
-    char uniname2ctype_pool_str155[sizeof("newtailue")];
-    char uniname2ctype_pool_str159[sizeof("inmusicalsymbols")];
-    char uniname2ctype_pool_str163[sizeof("lm")];
-    char uniname2ctype_pool_str164[sizeof("taile")];
-    char uniname2ctype_pool_str169[sizeof("lina")];
-    char uniname2ctype_pool_str174[sizeof("inmyanmarextendeda")];
-    char uniname2ctype_pool_str176[sizeof("sterm")];
-    char uniname2ctype_pool_str178[sizeof("lana")];
-    char uniname2ctype_pool_str180[sizeof("alnum")];
-    char uniname2ctype_pool_str185[sizeof("inlycian")];
-    char uniname2ctype_pool_str189[sizeof("lc")];
-    char uniname2ctype_pool_str190[sizeof("inmalayalam")];
-    char uniname2ctype_pool_str192[sizeof("inshavian")];
-    char uniname2ctype_pool_str199[sizeof("inmiscellaneoussymbols")];
-    char uniname2ctype_pool_str200[sizeof("inlineara")];
-    char uniname2ctype_pool_str201[sizeof("intransportandmapsymbols")];
-    char uniname2ctype_pool_str206[sizeof("vs")];
-    char uniname2ctype_pool_str208[sizeof("inmiscellaneoussymbolsandarrows")];
-    char uniname2ctype_pool_str209[sizeof("intaitham")];
-    char uniname2ctype_pool_str212[sizeof("innewtailue")];
-    char uniname2ctype_pool_str213[sizeof("inmiscellaneoussymbolsandpictographs")];
-    char uniname2ctype_pool_str220[sizeof("incontrolpictures")];
-    char uniname2ctype_pool_str225[sizeof("sinhala")];
-    char uniname2ctype_pool_str237[sizeof("taiviet")];
-    char uniname2ctype_pool_str257[sizeof("latn")];
-    char uniname2ctype_pool_str259[sizeof("latin")];
-    char uniname2ctype_pool_str260[sizeof("ital")];
-    char uniname2ctype_pool_str262[sizeof("intamil")];
-    char uniname2ctype_pool_str263[sizeof("taml")];
-    char uniname2ctype_pool_str264[sizeof("inmultani")];
-    char uniname2ctype_pool_str273[sizeof("avst")];
-    char uniname2ctype_pool_str274[sizeof("inlinearbideograms")];
-    char uniname2ctype_pool_str275[sizeof("avestan")];
-    char uniname2ctype_pool_str279[sizeof("intaixuanjingsymbols")];
-    char uniname2ctype_pool_str280[sizeof("intaile")];
-    char uniname2ctype_pool_str281[sizeof("tale")];
-    char uniname2ctype_pool_str285[sizeof("cwt")];
-    char uniname2ctype_pool_str288[sizeof("cwcf")];
-    char uniname2ctype_pool_str290[sizeof("armn")];
-    char uniname2ctype_pool_str291[sizeof("inlatinextendeda")];
-    char uniname2ctype_pool_str293[sizeof("armi")];
-    char uniname2ctype_pool_str295[sizeof("l")];
-    char uniname2ctype_pool_str297[sizeof("nl")];
-    char uniname2ctype_pool_str299[sizeof("armenian")];
-    char uniname2ctype_pool_str300[sizeof("inmyanmar")];
-    char uniname2ctype_pool_str302[sizeof("inrunic")];
-    char uniname2ctype_pool_str303[sizeof("incarian")];
-    char uniname2ctype_pool_str304[sizeof("zl")];
-    char uniname2ctype_pool_str305[sizeof("inlatinextendedc")];
-    char uniname2ctype_pool_str306[sizeof("cari")];
-    char uniname2ctype_pool_str309[sizeof("inmeeteimayekextensions")];
-    char uniname2ctype_pool_str315[sizeof("inlatinextendede")];
-    char uniname2ctype_pool_str319[sizeof("carian")];
-    char uniname2ctype_pool_str321[sizeof("merc")];
-    char uniname2ctype_pool_str322[sizeof("ext")];
-    char uniname2ctype_pool_str324[sizeof("incyrillic")];
-    char uniname2ctype_pool_str325[sizeof("tavt")];
-    char uniname2ctype_pool_str326[sizeof("intaiviet")];
-    char uniname2ctype_pool_str329[sizeof("samr")];
-    char uniname2ctype_pool_str330[sizeof("miao")];
-    char uniname2ctype_pool_str333[sizeof("lt")];
-    char uniname2ctype_pool_str338[sizeof("inlowsurrogates")];
-    char uniname2ctype_pool_str339[sizeof("samaritan")];
-    char uniname2ctype_pool_str340[sizeof("inahom")];
-    char uniname2ctype_pool_str341[sizeof("arabic")];
-    char uniname2ctype_pool_str342[sizeof("insyriac")];
-    char uniname2ctype_pool_str345[sizeof("insharada")];
-    char uniname2ctype_pool_str348[sizeof("java")];
-    char uniname2ctype_pool_str349[sizeof("inosmanya")];
-    char uniname2ctype_pool_str350[sizeof("incherokee")];
-    char uniname2ctype_pool_str354[sizeof("cf")];
-    char uniname2ctype_pool_str360[sizeof("inmiscellaneoustechnical")];
-    char uniname2ctype_pool_str361[sizeof("inruminumeralsymbols")];
-    char uniname2ctype_pool_str362[sizeof("zinh")];
-    char uniname2ctype_pool_str363[sizeof("han")];
-    char uniname2ctype_pool_str366[sizeof("osma")];
-    char uniname2ctype_pool_str367[sizeof("hani")];
-    char uniname2ctype_pool_str371[sizeof("injavanese")];
-    char uniname2ctype_pool_str373[sizeof("wara")];
-    char uniname2ctype_pool_str381[sizeof("inwarangciti")];
-    char uniname2ctype_pool_str384[sizeof("inmahajani")];
-    char uniname2ctype_pool_str389[sizeof("cham")];
-    char uniname2ctype_pool_str390[sizeof("javanese")];
-    char uniname2ctype_pool_str393[sizeof("term")];
-    char uniname2ctype_pool_str394[sizeof("sinh")];
-    char uniname2ctype_pool_str395[sizeof("cwl")];
-    char uniname2ctype_pool_str397[sizeof("manichaean")];
-    char uniname2ctype_pool_str401[sizeof("insmallformvariants")];
-    char uniname2ctype_pool_str403[sizeof("connectorpunctuation")];
-    char uniname2ctype_pool_str408[sizeof("inenclosedalphanumerics")];
-    char uniname2ctype_pool_str409[sizeof("inethiopic")];
-    char uniname2ctype_pool_str411[sizeof("tamil")];
-    char uniname2ctype_pool_str412[sizeof("cntrl")];
-    char uniname2ctype_pool_str413[sizeof("insinhala")];
-    char uniname2ctype_pool_str417[sizeof("chakma")];
-    char uniname2ctype_pool_str423[sizeof("shavian")];
-    char uniname2ctype_pool_str434[sizeof("inlatinextendedadditional")];
-    char uniname2ctype_pool_str443[sizeof("ll")];
-    char uniname2ctype_pool_str450[sizeof("lineara")];
-    char uniname2ctype_pool_str454[sizeof("inideographicdescriptioncharacters")];
-    char uniname2ctype_pool_str458[sizeof("thai")];
-    char uniname2ctype_pool_str461[sizeof("math")];
-    char uniname2ctype_pool_str467[sizeof("thaa")];
-    char uniname2ctype_pool_str469[sizeof("inenclosedalphanumericsupplement")];
-    char uniname2ctype_pool_str470[sizeof("ethi")];
-    char uniname2ctype_pool_str471[sizeof("hatran")];
-    char uniname2ctype_pool_str473[sizeof("meroiticcursive")];
-    char uniname2ctype_pool_str475[sizeof("inemoticons")];
-    char uniname2ctype_pool_str480[sizeof("shaw")];
-    char uniname2ctype_pool_str481[sizeof("taitham")];
-    char uniname2ctype_pool_str483[sizeof("thaana")];
-    char uniname2ctype_pool_str494[sizeof("insinhalaarchaicnumbers")];
-    char uniname2ctype_pool_str497[sizeof("ahex")];
-    char uniname2ctype_pool_str502[sizeof("loe")];
-    char uniname2ctype_pool_str518[sizeof("invariationselectors")];
-    char uniname2ctype_pool_str519[sizeof("terminalpunctuation")];
-    char uniname2ctype_pool_str527[sizeof("whitespace")];
-    char uniname2ctype_pool_str531[sizeof("asciihexdigit")];
-    char uniname2ctype_pool_str533[sizeof("inearlydynasticcuneiform")];
-    char uniname2ctype_pool_str538[sizeof("inopticalcharacterrecognition")];
-    char uniname2ctype_pool_str545[sizeof("joinc")];
-    char uniname2ctype_pool_str546[sizeof("di")];
-    char uniname2ctype_pool_str552[sizeof("inenclosedcjklettersandmonths")];
-    char uniname2ctype_pool_str561[sizeof("mand")];
-    char uniname2ctype_pool_str562[sizeof("inmodi")];
-    char uniname2ctype_pool_str563[sizeof("mahj")];
-    char uniname2ctype_pool_str569[sizeof("dia")];
-    char uniname2ctype_pool_str573[sizeof("mend")];
-    char uniname2ctype_pool_str578[sizeof("inmandaic")];
-    char uniname2ctype_pool_str580[sizeof("invariationselectorssupplement")];
-    char uniname2ctype_pool_str583[sizeof("idc")];
-    char uniname2ctype_pool_str584[sizeof("mahajani")];
-    char uniname2ctype_pool_str585[sizeof("sind")];
-    char uniname2ctype_pool_str593[sizeof("hex")];
-    char uniname2ctype_pool_str602[sizeof("oriya")];
-    char uniname2ctype_pool_str603[sizeof("mero")];
-    char uniname2ctype_pool_str605[sizeof("titlecaseletter")];
-    char uniname2ctype_pool_str607[sizeof("no")];
-    char uniname2ctype_pool_str614[sizeof("inscriptionalparthian")];
-    char uniname2ctype_pool_str615[sizeof("innko")];
-    char uniname2ctype_pool_str618[sizeof("insundanese")];
-    char uniname2ctype_pool_str621[sizeof("inmro")];
-    char uniname2ctype_pool_str622[sizeof("intifinagh")];
-    char uniname2ctype_pool_str623[sizeof("ids")];
-    char uniname2ctype_pool_str624[sizeof("sora")];
-    char uniname2ctype_pool_str626[sizeof("co")];
-    char uniname2ctype_pool_str629[sizeof("tifinagh")];
-    char uniname2ctype_pool_str630[sizeof("indominotiles")];
-    char uniname2ctype_pool_str631[sizeof("hira")];
-    char uniname2ctype_pool_str633[sizeof("inarrows")];
-    char uniname2ctype_pool_str635[sizeof("inmiao")];
-    char uniname2ctype_pool_str639[sizeof("common")];
-    char uniname2ctype_pool_str646[sizeof("so")];
-    char uniname2ctype_pool_str651[sizeof("inhiragana")];
-    char uniname2ctype_pool_str659[sizeof("cher")];
-    char uniname2ctype_pool_str665[sizeof("hano")];
-    char uniname2ctype_pool_str671[sizeof("ahom")];
-    char uniname2ctype_pool_str674[sizeof("xidc")];
-    char uniname2ctype_pool_str676[sizeof("idst")];
-    char uniname2ctype_pool_str679[sizeof("inogham")];
-    char uniname2ctype_pool_str685[sizeof("inolchiki")];
-    char uniname2ctype_pool_str688[sizeof("idcontinue")];
-    char uniname2ctype_pool_str689[sizeof("inmathematicalalphanumericsymbols")];
-    char uniname2ctype_pool_str694[sizeof("xids")];
-    char uniname2ctype_pool_str696[sizeof("inscriptionalpahlavi")];
-    char uniname2ctype_pool_str698[sizeof("indevanagari")];
-    char uniname2ctype_pool_str701[sizeof("inlydian")];
-    char uniname2ctype_pool_str702[sizeof("deva")];
-    char uniname2ctype_pool_str703[sizeof("inspacingmodifierletters")];
-    char uniname2ctype_pool_str707[sizeof("indeseret")];
-    char uniname2ctype_pool_str708[sizeof("anatolianhieroglyphs")];
-    char uniname2ctype_pool_str710[sizeof("tirh")];
-    char uniname2ctype_pool_str713[sizeof("devanagari")];
-    char uniname2ctype_pool_str716[sizeof("inhatran")];
-    char uniname2ctype_pool_str719[sizeof("hatr")];
-    char uniname2ctype_pool_str728[sizeof("invedicextensions")];
-    char uniname2ctype_pool_str729[sizeof("intirhuta")];
-    char uniname2ctype_pool_str752[sizeof("inmahjongtiles")];
-    char uniname2ctype_pool_str753[sizeof("lo")];
-    char uniname2ctype_pool_str761[sizeof("inlao")];
-    char uniname2ctype_pool_str767[sizeof("lao")];
-    char uniname2ctype_pool_str768[sizeof("laoo")];
-    char uniname2ctype_pool_str769[sizeof("mongolian")];
-    char uniname2ctype_pool_str770[sizeof("pi")];
-    char uniname2ctype_pool_str776[sizeof("insylotinagri")];
-    char uniname2ctype_pool_str797[sizeof("lineseparator")];
-    char uniname2ctype_pool_str802[sizeof("pc")];
-    char uniname2ctype_pool_str812[sizeof("pe")];
-    char uniname2ctype_pool_str820[sizeof("inphaistosdisc")];
-    char uniname2ctype_pool_str825[sizeof("letter")];
-    char uniname2ctype_pool_str832[sizeof("inanatolianhieroglyphs")];
-    char uniname2ctype_pool_str839[sizeof("oalpha")];
-    char uniname2ctype_pool_str842[sizeof("ps")];
-    char uniname2ctype_pool_str843[sizeof("inverticalforms")];
-    char uniname2ctype_pool_str844[sizeof("xdigit")];
-    char uniname2ctype_pool_str846[sizeof("lowercase")];
-    char uniname2ctype_pool_str849[sizeof("odi")];
-    char uniname2ctype_pool_str851[sizeof("diacritic")];
-    char uniname2ctype_pool_str853[sizeof("modi")];
-    char uniname2ctype_pool_str855[sizeof("xidstart")];
-    char uniname2ctype_pool_str856[sizeof("inshorthandformatcontrols")];
-    char uniname2ctype_pool_str866[sizeof("oidc")];
-    char uniname2ctype_pool_str868[sizeof("space")];
-    char uniname2ctype_pool_str871[sizeof("ideo")];
-    char uniname2ctype_pool_str878[sizeof("inolditalic")];
-    char uniname2ctype_pool_str879[sizeof("mro")];
-    char uniname2ctype_pool_str880[sizeof("mroo")];
-    char uniname2ctype_pool_str882[sizeof("insundanesesupplement")];
-    char uniname2ctype_pool_str886[sizeof("oids")];
-    char uniname2ctype_pool_str901[sizeof("nchar")];
-    char uniname2ctype_pool_str904[sizeof("decimalnumber")];
-    char uniname2ctype_pool_str905[sizeof("incoptic")];
-    char uniname2ctype_pool_str931[sizeof("palm")];
-    char uniname2ctype_pool_str936[sizeof("format")];
-    char uniname2ctype_pool_str937[sizeof("dsrt")];
-    char uniname2ctype_pool_str938[sizeof("dash")];
-    char uniname2ctype_pool_str940[sizeof("inmodifiertoneletters")];
-    char uniname2ctype_pool_str950[sizeof("patws")];
-    char uniname2ctype_pool_str951[sizeof("alpha")];
-    char uniname2ctype_pool_str952[sizeof("siddham")];
-    char uniname2ctype_pool_str953[sizeof("inlepcha")];
-    char uniname2ctype_pool_str954[sizeof("wspace")];
-    char uniname2ctype_pool_str955[sizeof("inpalmyrene")];
-    char uniname2ctype_pool_str956[sizeof("lepc")];
-    char uniname2ctype_pool_str957[sizeof("idstart")];
-    char uniname2ctype_pool_str960[sizeof("inprivateusearea")];
-    char uniname2ctype_pool_str961[sizeof("psalterpahlavi")];
-    char uniname2ctype_pool_str964[sizeof("incopticepactnumbers")];
-    char uniname2ctype_pool_str966[sizeof("inoldturkic")];
-    char uniname2ctype_pool_str967[sizeof("sharada")];
-    char uniname2ctype_pool_str971[sizeof("hanunoo")];
-    char uniname2ctype_pool_str972[sizeof("incyrillicextendeda")];
-    char uniname2ctype_pool_str980[sizeof("joincontrol")];
-    char uniname2ctype_pool_str989[sizeof("xidcontinue")];
-    char uniname2ctype_pool_str990[sizeof("deseret")];
-    char uniname2ctype_pool_str1001[sizeof("radical")];
-    char uniname2ctype_pool_str1005[sizeof("canadianaboriginal")];
-    char uniname2ctype_pool_str1017[sizeof("omath")];
-    char uniname2ctype_pool_str1029[sizeof("inmongolian")];
-    char uniname2ctype_pool_str1032[sizeof("casedletter")];
-    char uniname2ctype_pool_str1037[sizeof("extender")];
-    char uniname2ctype_pool_str1044[sizeof("control")];
-    char uniname2ctype_pool_str1045[sizeof("ingrantha")];
-    char uniname2ctype_pool_str1050[sizeof("yi")];
-    char uniname2ctype_pool_str1052[sizeof("otheridcontinue")];
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    char uniname2ctype_pool_str1053[sizeof("age=1.1")];
-    char uniname2ctype_pool_str1054[sizeof("age=2.1")];
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    char uniname2ctype_pool_str1056[sizeof("yiii")];
-    char uniname2ctype_pool_str1057[sizeof("inethiopicextendeda")];
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    char uniname2ctype_pool_str1058[sizeof("age=6.1")];
-    char uniname2ctype_pool_str1059[sizeof("age=6.2")];
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    char uniname2ctype_pool_str1061[sizeof("perm")];
-    char uniname2ctype_pool_str1062[sizeof("lower")];
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    char uniname2ctype_pool_str1063[sizeof("age=3.1")];
-    char uniname2ctype_pool_str1064[sizeof("age=3.2")];
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    char uniname2ctype_pool_str1065[sizeof("noncharactercodepoint")];
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    char uniname2ctype_pool_str1066[sizeof("age=4.1")];
-    char uniname2ctype_pool_str1067[sizeof("age=2.0")];
-    char uniname2ctype_pool_str1068[sizeof("age=6.3")];
-    char uniname2ctype_pool_str1069[sizeof("age=8.0")];
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    char uniname2ctype_pool_str1070[sizeof("ingeneralpunctuation")];
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    char uniname2ctype_pool_str1071[sizeof("age=6.0")];
-    char uniname2ctype_pool_str1072[sizeof("age=5.1")];
-    char uniname2ctype_pool_str1073[sizeof("age=5.2")];
-    char uniname2ctype_pool_str1074[sizeof("age=7.0")];
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    char uniname2ctype_pool_str1075[sizeof("nd")];
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    char uniname2ctype_pool_str1076[sizeof("age=3.0")];
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    char uniname2ctype_pool_str1077[sizeof("otheralphabetic")];
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    char uniname2ctype_pool_str1079[sizeof("age=4.0")];
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    char uniname2ctype_pool_str1082[sizeof("imperialaramaic")];
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    char uniname2ctype_pool_str1085[sizeof("age=5.0")];
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    char uniname2ctype_pool_str1094[sizeof("pf")];
-    char uniname2ctype_pool_str1096[sizeof("letternumber")];
-    char uniname2ctype_pool_str1100[sizeof("inimperialaramaic")];
-    char uniname2ctype_pool_str1106[sizeof("inphoenician")];
-    char uniname2ctype_pool_str1109[sizeof("finalpunctuation")];
-    char uniname2ctype_pool_str1114[sizeof("sd")];
-    char uniname2ctype_pool_str1119[sizeof("olditalic")];
-    char uniname2ctype_pool_str1120[sizeof("sidd")];
-    char uniname2ctype_pool_str1121[sizeof("inenclosedideographicsupplement")];
-    char uniname2ctype_pool_str1125[sizeof("prti")];
-    char uniname2ctype_pool_str1127[sizeof("sgnw")];
-    char uniname2ctype_pool_str1132[sizeof("coptic")];
-    char uniname2ctype_pool_str1133[sizeof("insiddham")];
-    char uniname2ctype_pool_str1140[sizeof("inoldnortharabian")];
-    char uniname2ctype_pool_str1141[sizeof("cprt")];
-    char uniname2ctype_pool_str1143[sizeof("inlatin1supplement")];
-    char uniname2ctype_pool_str1144[sizeof("tagbanwa")];
-    char uniname2ctype_pool_str1150[sizeof("cased")];
-    char uniname2ctype_pool_str1155[sizeof("ininscriptionalparthian")];
-    char uniname2ctype_pool_str1157[sizeof("ininscriptionalpahlavi")];
-    char uniname2ctype_pool_str1164[sizeof("inherited")];
-    char uniname2ctype_pool_str1169[sizeof("privateuse")];
-    char uniname2ctype_pool_str1178[sizeof("copt")];
-    char uniname2ctype_pool_str1179[sizeof("inoldsoutharabian")];
-    char uniname2ctype_pool_str1184[sizeof("lowercaseletter")];
-    char uniname2ctype_pool_str1185[sizeof("word")];
-    char uniname2ctype_pool_str1187[sizeof("intags")];
-    char uniname2ctype_pool_str1190[sizeof("shrd")];
-    char uniname2ctype_pool_str1194[sizeof("idsbinaryoperator")];
-    char uniname2ctype_pool_str1201[sizeof("xpeo")];
-    char uniname2ctype_pool_str1202[sizeof("othersymbol")];
-    char uniname2ctype_pool_str1203[sizeof("otherlowercase")];
-    char uniname2ctype_pool_str1204[sizeof("otheridstart")];
-    char uniname2ctype_pool_str1205[sizeof("mlym")];
-    char uniname2ctype_pool_str1207[sizeof("inoldhungarian")];
-    char uniname2ctype_pool_str1215[sizeof("lyci")];
-    char uniname2ctype_pool_str1218[sizeof("print")];
-    char uniname2ctype_pool_str1220[sizeof("phnx")];
-    char uniname2ctype_pool_str1223[sizeof("innabataean")];
-    char uniname2ctype_pool_str1228[sizeof("lycian")];
-    char uniname2ctype_pool_str1230[sizeof("ingujarati")];
-    char uniname2ctype_pool_str1231[sizeof("bamum")];
-    char uniname2ctype_pool_str1236[sizeof("malayalam")];
-    char uniname2ctype_pool_str1238[sizeof("variationselector")];
-    char uniname2ctype_pool_str1242[sizeof("patternwhitespace")];
-    char uniname2ctype_pool_str1245[sizeof("inelbasan")];
-    char uniname2ctype_pool_str1249[sizeof("spaceseparator")];
-    char uniname2ctype_pool_str1251[sizeof("inarabic")];
-    char uniname2ctype_pool_str1252[sizeof("inalphabeticpresentationforms")];
-    char uniname2ctype_pool_str1255[sizeof("inbasiclatin")];
-    char uniname2ctype_pool_str1260[sizeof("phli")];
-    char uniname2ctype_pool_str1263[sizeof("indevanagariextended")];
-    char uniname2ctype_pool_str1265[sizeof("innumberforms")];
-    char uniname2ctype_pool_str1266[sizeof("caseignorable")];
-    char uniname2ctype_pool_str1267[sizeof("tfng")];
-    char uniname2ctype_pool_str1274[sizeof("other")];
-    char uniname2ctype_pool_str1278[sizeof("inphoneticextensions")];
-    char uniname2ctype_pool_str1281[sizeof("othernumber")];
-    char uniname2ctype_pool_str1285[sizeof("closepunctuation")];
-    char uniname2ctype_pool_str1286[sizeof("oldpersian")];
-    char uniname2ctype_pool_str1287[sizeof("gran")];
-    char uniname2ctype_pool_str1289[sizeof("bass")];
-    char uniname2ctype_pool_str1291[sizeof("patternsyntax")];
-    char uniname2ctype_pool_str1292[sizeof("inmathematicaloperators")];
-    char uniname2ctype_pool_str1294[sizeof("inpsalterpahlavi")];
-    char uniname2ctype_pool_str1295[sizeof("ingurmukhi")];
-    char uniname2ctype_pool_str1302[sizeof("nbat")];
-    char uniname2ctype_pool_str1304[sizeof("oldpermic")];
-    char uniname2ctype_pool_str1309[sizeof("lepcha")];
-    char uniname2ctype_pool_str1310[sizeof("inbyzantinemusicalsymbols")];
-    char uniname2ctype_pool_str1312[sizeof("olower")];
-    char uniname2ctype_pool_str1315[sizeof("inarabicpresentationformsa")];
-    char uniname2ctype_pool_str1318[sizeof("mong")];
-    char uniname2ctype_pool_str1321[sizeof("nabataean")];
-    char uniname2ctype_pool_str1323[sizeof("mymr")];
-    char uniname2ctype_pool_str1324[sizeof("intibetan")];
-    char uniname2ctype_pool_str1326[sizeof("inyijinghexagramsymbols")];
-    char uniname2ctype_pool_str1330[sizeof("ogam")];
-    char uniname2ctype_pool_str1331[sizeof("inmiscellaneousmathematicalsymbolsb")];
-    char uniname2ctype_pool_str1337[sizeof("inlatinextendedd")];
-    char uniname2ctype_pool_str1338[sizeof("sylotinagri")];
-    char uniname2ctype_pool_str1340[sizeof("inphoneticextensionssupplement")];
-    char uniname2ctype_pool_str1341[sizeof("insorasompeng")];
-    char uniname2ctype_pool_str1345[sizeof("insuttonsignwriting")];
-    char uniname2ctype_pool_str1348[sizeof("linb")];
-    char uniname2ctype_pool_str1349[sizeof("mathsymbol")];
-    char uniname2ctype_pool_str1352[sizeof("myanmar")];
-    char uniname2ctype_pool_str1353[sizeof("inmyanmarextendedb")];
-    char uniname2ctype_pool_str1354[sizeof("limb")];
-    char uniname2ctype_pool_str1360[sizeof("bali")];
-    char uniname2ctype_pool_str1361[sizeof("hmng")];
-    char uniname2ctype_pool_str1364[sizeof("inbraillepatterns")];
-    char uniname2ctype_pool_str1365[sizeof("othermath")];
-    char uniname2ctype_pool_str1366[sizeof("po")];
-    char uniname2ctype_pool_str1367[sizeof("hang")];
-    char uniname2ctype_pool_str1369[sizeof("syrc")];
-    char uniname2ctype_pool_str1371[sizeof("inoriya")];
-    char uniname2ctype_pool_str1375[sizeof("warangciti")];
-    char uniname2ctype_pool_str1377[sizeof("separator")];
-    char uniname2ctype_pool_str1381[sizeof("elba")];
-    char uniname2ctype_pool_str1383[sizeof("inbalinese")];
-    char uniname2ctype_pool_str1384[sizeof("tibt")];
-    char uniname2ctype_pool_str1386[sizeof("modifierletter")];
-    char uniname2ctype_pool_str1389[sizeof("bengali")];
-    char uniname2ctype_pool_str1396[sizeof("inlinearbsyllabary")];
-    char uniname2ctype_pool_str1401[sizeof("tibetan")];
-    char uniname2ctype_pool_str1404[sizeof("syriac")];
-    char uniname2ctype_pool_str1406[sizeof("incaucasianalbanian")];
-    char uniname2ctype_pool_str1410[sizeof("osmanya")];
-    char uniname2ctype_pool_str1411[sizeof("balinese")];
-    char uniname2ctype_pool_str1415[sizeof("inyiradicals")];
-    char uniname2ctype_pool_str1416[sizeof("sundanese")];
-    char uniname2ctype_pool_str1417[sizeof("ingreekandcoptic")];
-    char uniname2ctype_pool_str1420[sizeof("inkannada")];
-    char uniname2ctype_pool_str1422[sizeof("kana")];
-    char uniname2ctype_pool_str1423[sizeof("phoenician")];
-    char uniname2ctype_pool_str1424[sizeof("inancientgreekmusicalnotation")];
-    char uniname2ctype_pool_str1425[sizeof("elbasan")];
-    char uniname2ctype_pool_str1427[sizeof("otherletter")];
-    char uniname2ctype_pool_str1435[sizeof("cakm")];
-    char uniname2ctype_pool_str1440[sizeof("ingeometricshapes")];
-    char uniname2ctype_pool_str1448[sizeof("gothic")];
-    char uniname2ctype_pool_str1450[sizeof("inchakma")];
-    char uniname2ctype_pool_str1455[sizeof("inancientgreeknumbers")];
-    char uniname2ctype_pool_str1456[sizeof("saurashtra")];
-    char uniname2ctype_pool_str1459[sizeof("induployan")];
-    char uniname2ctype_pool_str1468[sizeof("rjng")];
-    char uniname2ctype_pool_str1469[sizeof("mendekikakui")];
-    char uniname2ctype_pool_str1474[sizeof("ingothic")];
-    char uniname2ctype_pool_str1475[sizeof("narb")];
-    char uniname2ctype_pool_str1476[sizeof("cyrl")];
-    char uniname2ctype_pool_str1478[sizeof("brai")];
-    char uniname2ctype_pool_str1483[sizeof("grext")];
-    char uniname2ctype_pool_str1487[sizeof("arab")];
-    char uniname2ctype_pool_str1488[sizeof("meeteimayek")];
-    char uniname2ctype_pool_str1489[sizeof("inrejang")];
-    char uniname2ctype_pool_str1491[sizeof("brahmi")];
-    char uniname2ctype_pool_str1504[sizeof("inkaithi")];
-    char uniname2ctype_pool_str1506[sizeof("multani")];
-    char uniname2ctype_pool_str1507[sizeof("incjkcompatibilityforms")];
-    char uniname2ctype_pool_str1509[sizeof("takri")];
-    char uniname2ctype_pool_str1512[sizeof("incjkcompatibilityideographs")];
-    char uniname2ctype_pool_str1514[sizeof("sarb")];
-    char uniname2ctype_pool_str1521[sizeof("p")];
-    char uniname2ctype_pool_str1522[sizeof("lisu")];
-    char uniname2ctype_pool_str1524[sizeof("inkatakana")];
-    char uniname2ctype_pool_str1530[sizeof("zp")];
-    char uniname2ctype_pool_str1532[sizeof("inornamentaldingbats")];
-    char uniname2ctype_pool_str1533[sizeof("sylo")];
-    char uniname2ctype_pool_str1534[sizeof("cuneiform")];
-    char uniname2ctype_pool_str1548[sizeof("incjkstrokes")];
-    char uniname2ctype_pool_str1552[sizeof("ethiopic")];
-    char uniname2ctype_pool_str1558[sizeof("inmeeteimayek")];
-    char uniname2ctype_pool_str1559[sizeof("kali")];
-    char uniname2ctype_pool_str1567[sizeof("inbrahmi")];
-    char uniname2ctype_pool_str1574[sizeof("incjkcompatibilityideographssupplement")];
-    char uniname2ctype_pool_str1577[sizeof("mult")];
-    char uniname2ctype_pool_str1579[sizeof("inethiopicextended")];
-    char uniname2ctype_pool_str1583[sizeof("talu")];
-    char uniname2ctype_pool_str1584[sizeof("inhangulsyllables")];
-    char uniname2ctype_pool_str1587[sizeof("ingeorgian")];
-    char uniname2ctype_pool_str1588[sizeof("hexdigit")];
-    char uniname2ctype_pool_str1591[sizeof("xsux")];
-    char uniname2ctype_pool_str1592[sizeof("inunifiedcanadianaboriginalsyllabics")];
-    char uniname2ctype_pool_str1595[sizeof("telu")];
-    char uniname2ctype_pool_str1596[sizeof("indingbats")];
-    char uniname2ctype_pool_str1599[sizeof("inblockelements")];
-    char uniname2ctype_pool_str1600[sizeof("geor")];
-    char uniname2ctype_pool_str1611[sizeof("ingreekextended")];
-    char uniname2ctype_pool_str1612[sizeof("inletterlikesymbols")];
-    char uniname2ctype_pool_str1617[sizeof("inoldpersian")];
-    char uniname2ctype_pool_str1624[sizeof("orya")];
-    char uniname2ctype_pool_str1629[sizeof("linearb")];
-    char uniname2ctype_pool_str1632[sizeof("inbassavah")];
-    char uniname2ctype_pool_str1634[sizeof("inoldpermic")];
-    char uniname2ctype_pool_str1635[sizeof("inkanasupplement")];
-    char uniname2ctype_pool_str1636[sizeof("incombininghalfmarks")];
-    char uniname2ctype_pool_str1638[sizeof("runic")];
-    char uniname2ctype_pool_str1640[sizeof("inugaritic")];
-    char uniname2ctype_pool_str1642[sizeof("assigned")];
-    char uniname2ctype_pool_str1643[sizeof("glagolitic")];
-    char uniname2ctype_pool_str1647[sizeof("cyrillic")];
-    char uniname2ctype_pool_str1648[sizeof("inmeroitichieroglyphs")];
-    char uniname2ctype_pool_str1649[sizeof("saur")];
-    char uniname2ctype_pool_str1652[sizeof("hiragana")];
-    char uniname2ctype_pool_str1658[sizeof("insuperscriptsandsubscripts")];
-    char uniname2ctype_pool_str1670[sizeof("ogham")];
-    char uniname2ctype_pool_str1675[sizeof("insaurashtra")];
-    char uniname2ctype_pool_str1680[sizeof("mark")];
-    char uniname2ctype_pool_str1689[sizeof("symbol")];
-    char uniname2ctype_pool_str1694[sizeof("inkharoshthi")];
-    char uniname2ctype_pool_str1700[sizeof("inkhmer")];
-    char uniname2ctype_pool_str1712[sizeof("plrd")];
-    char uniname2ctype_pool_str1714[sizeof("graphemebase")];
-    char uniname2ctype_pool_str1716[sizeof("inhanguljamoextendeda")];
-    char uniname2ctype_pool_str1723[sizeof("incountingrodnumerals")];
-    char uniname2ctype_pool_str1731[sizeof("lydi")];
-    char uniname2ctype_pool_str1733[sizeof("digit")];
-    char uniname2ctype_pool_str1735[sizeof("bassavah")];
-    char uniname2ctype_pool_str1737[sizeof("inarabicmathematicalalphabeticsymbols")];
-    char uniname2ctype_pool_str1739[sizeof("grantha")];
-    char uniname2ctype_pool_str1744[sizeof("lydian")];
-    char uniname2ctype_pool_str1745[sizeof("insupplementalmathematicaloperators")];
-    char uniname2ctype_pool_str1747[sizeof("goth")];
-    char uniname2ctype_pool_str1749[sizeof("hebrew")];
-    char uniname2ctype_pool_str1757[sizeof("meroitichieroglyphs")];
-    char uniname2ctype_pool_str1758[sizeof("incyrillicsupplement")];
-    char uniname2ctype_pool_str1764[sizeof("intakri")];
-    char uniname2ctype_pool_str1765[sizeof("takr")];
-    char uniname2ctype_pool_str1767[sizeof("kaithi")];
-    char uniname2ctype_pool_str1776[sizeof("idsb")];
-    char uniname2ctype_pool_str1777[sizeof("bidic")];
-    char uniname2ctype_pool_str1779[sizeof("incherokeesupplement")];
-    char uniname2ctype_pool_str1781[sizeof("inalchemicalsymbols")];
-    char uniname2ctype_pool_str1784[sizeof("inkhmersymbols")];
-    char uniname2ctype_pool_str1795[sizeof("otherpunctuation")];
-    char uniname2ctype_pool_str1796[sizeof("braille")];
-    char uniname2ctype_pool_str1798[sizeof("logicalorderexception")];
-    char uniname2ctype_pool_str1799[sizeof("incurrencysymbols")];
-    char uniname2ctype_pool_str1800[sizeof("tirhuta")];
-    char uniname2ctype_pool_str1804[sizeof("inphagspa")];
-    char uniname2ctype_pool_str1814[sizeof("inarabicextendeda")];
-    char uniname2ctype_pool_str1819[sizeof("brah")];
-    char uniname2ctype_pool_str1831[sizeof("hebr")];
-    char uniname2ctype_pool_str1834[sizeof("pd")];
-    char uniname2ctype_pool_str1836[sizeof("kthi")];
-    char uniname2ctype_pool_str1843[sizeof("inethiopicsupplement")];
-    char uniname2ctype_pool_str1862[sizeof("runr")];
-    char uniname2ctype_pool_str1864[sizeof("olck")];
-    char uniname2ctype_pool_str1865[sizeof("ideographic")];
-    char uniname2ctype_pool_str1871[sizeof("ogrext")];
-    char uniname2ctype_pool_str1875[sizeof("olchiki")];
-    char uniname2ctype_pool_str1882[sizeof("inhighprivateusesurrogates")];
-    char uniname2ctype_pool_str1892[sizeof("softdotted")];
-    char uniname2ctype_pool_str1893[sizeof("inhebrew")];
-    char uniname2ctype_pool_str1896[sizeof("number")];
-    char uniname2ctype_pool_str1901[sizeof("hluw")];
-    char uniname2ctype_pool_str1904[sizeof("inkhojki")];
-    char uniname2ctype_pool_str1908[sizeof("sund")];
-    char uniname2ctype_pool_str1912[sizeof("deprecated")];
-    char uniname2ctype_pool_str1913[sizeof("patsyn")];
-    char uniname2ctype_pool_str1931[sizeof("unassigned")];
-    char uniname2ctype_pool_str1938[sizeof("phagspa")];
-    char uniname2ctype_pool_str1944[sizeof("ingeometricshapesextended")];
-    char uniname2ctype_pool_str1945[sizeof("knda")];
-    char uniname2ctype_pool_str1956[sizeof("insupplementalarrowsa")];
-    char uniname2ctype_pool_str1958[sizeof("inmendekikakui")];
-    char uniname2ctype_pool_str1963[sizeof("insupplementalarrowsc")];
-    char uniname2ctype_pool_str1964[sizeof("sorasompeng")];
-    char uniname2ctype_pool_str1971[sizeof("inhanguljamo")];
-    char uniname2ctype_pool_str1974[sizeof("kannada")];
-    char uniname2ctype_pool_str1977[sizeof("graph")];
-    char uniname2ctype_pool_str1984[sizeof("idstrinaryoperator")];
-    char uniname2ctype_pool_str1986[sizeof("hangul")];
-    char uniname2ctype_pool_str1989[sizeof("inhanunoo")];
-    char uniname2ctype_pool_str1991[sizeof("changeswhencasemapped")];
-    char uniname2ctype_pool_str1999[sizeof("nko")];
-    char uniname2ctype_pool_str2000[sizeof("nkoo")];
-    char uniname2ctype_pool_str2003[sizeof("combiningmark")];
-    char uniname2ctype_pool_str2006[sizeof("inkatakanaphoneticextensions")];
-    char uniname2ctype_pool_str2012[sizeof("khmr")];
-    char uniname2ctype_pool_str2016[sizeof("phlp")];
-    char uniname2ctype_pool_str2018[sizeof("khar")];
-    char uniname2ctype_pool_str2056[sizeof("otherdefaultignorablecodepoint")];
-    char uniname2ctype_pool_str2057[sizeof("enclosingmark")];
-    char uniname2ctype_pool_str2071[sizeof("inhalfwidthandfullwidthforms")];
-    char uniname2ctype_pool_str2072[sizeof("inmeroiticcursive")];
-    char uniname2ctype_pool_str2078[sizeof("inglagolitic")];
-    char uniname2ctype_pool_str2081[sizeof("changeswhentitlecased")];
-    char uniname2ctype_pool_str2084[sizeof("dep")];
-    char uniname2ctype_pool_str2089[sizeof("inbuhid")];
-    char uniname2ctype_pool_str2092[sizeof("incombiningdiacriticalmarks")];
-    char uniname2ctype_pool_str2096[sizeof("inunifiedcanadianaboriginalsyllabicsextended")];
-    char uniname2ctype_pool_str2097[sizeof("any")];
-    char uniname2ctype_pool_str2102[sizeof("incombiningdiacriticalmarksforsymbols")];
-    char uniname2ctype_pool_str2105[sizeof("kharoshthi")];
-    char uniname2ctype_pool_str2116[sizeof("cherokee")];
-    char uniname2ctype_pool_str2118[sizeof("inarabicsupplement")];
-    char uniname2ctype_pool_str2124[sizeof("pauc")];
-    char uniname2ctype_pool_str2126[sizeof("phag")];
-    char uniname2ctype_pool_str2127[sizeof("intagalog")];
-    char uniname2ctype_pool_str2137[sizeof("inplayingcards")];
-    char uniname2ctype_pool_str2141[sizeof("inpahawhhmong")];
-    char uniname2ctype_pool_str2150[sizeof("changeswhencasefolded")];
-    char uniname2ctype_pool_str2151[sizeof("incyrillicextendedb")];
-    char uniname2ctype_pool_str2154[sizeof("incombiningdiacriticalmarkssupplement")];
-    char uniname2ctype_pool_str2155[sizeof("alphabetic")];
-    char uniname2ctype_pool_str2172[sizeof("glag")];
-    char uniname2ctype_pool_str2178[sizeof("hyphen")];
-    char uniname2ctype_pool_str2203[sizeof("inyisyllables")];
-    char uniname2ctype_pool_str2212[sizeof("bidicontrol")];
-    char uniname2ctype_pool_str2215[sizeof("inbengali")];
-    char uniname2ctype_pool_str2220[sizeof("spacingmark")];
-    char uniname2ctype_pool_str2225[sizeof("cypriot")];
-    char uniname2ctype_pool_str2226[sizeof("beng")];
-    char uniname2ctype_pool_str2227[sizeof("graphemeextend")];
-    char uniname2ctype_pool_str2236[sizeof("khoj")];
-    char uniname2ctype_pool_str2240[sizeof("inbuginese")];
-    char uniname2ctype_pool_str2251[sizeof("tglg")];
-    char uniname2ctype_pool_str2259[sizeof("palmyrene")];
-    char uniname2ctype_pool_str2268[sizeof("incypriotsyllabary")];
-    char uniname2ctype_pool_str2277[sizeof("punct")];
-    char uniname2ctype_pool_str2278[sizeof("khmer")];
-    char uniname2ctype_pool_str2283[sizeof("incjksymbolsandpunctuation")];
-    char uniname2ctype_pool_str2294[sizeof("inaegeannumbers")];
-    char uniname2ctype_pool_str2305[sizeof("tagb")];
-    char uniname2ctype_pool_str2307[sizeof("orkh")];
-    char uniname2ctype_pool_str2316[sizeof("intagbanwa")];
-    char uniname2ctype_pool_str2327[sizeof("oldhungarian")];
-    char uniname2ctype_pool_str2348[sizeof("georgian")];
-    char uniname2ctype_pool_str2368[sizeof("modifiersymbol")];
-    char uniname2ctype_pool_str2376[sizeof("changeswhenlowercased")];
-    char uniname2ctype_pool_str2383[sizeof("otheruppercase")];
-    char uniname2ctype_pool_str2406[sizeof("signwriting")];
-    char uniname2ctype_pool_str2460[sizeof("insupplementaryprivateuseareaa")];
-    char uniname2ctype_pool_str2462[sizeof("inkayahli")];
-    char uniname2ctype_pool_str2468[sizeof("ugaritic")];
-    char uniname2ctype_pool_str2476[sizeof("uideo")];
-    char uniname2ctype_pool_str2494[sizeof("inarabicpresentationformsb")];
-    char uniname2ctype_pool_str2495[sizeof("nonspacingmark")];
-    char uniname2ctype_pool_str2499[sizeof("rejang")];
-    char uniname2ctype_pool_str2501[sizeof("inkangxiradicals")];
-    char uniname2ctype_pool_str2502[sizeof("incjkcompatibility")];
-    char uniname2ctype_pool_str2543[sizeof("bamu")];
-    char uniname2ctype_pool_str2545[sizeof("inbamum")];
-    char uniname2ctype_pool_str2556[sizeof("pahawhhmong")];
-    char uniname2ctype_pool_str2557[sizeof("grbase")];
-    char uniname2ctype_pool_str2558[sizeof("aghb")];
-    char uniname2ctype_pool_str2560[sizeof("bopo")];
-    char uniname2ctype_pool_str2569[sizeof("tagalog")];
-    char uniname2ctype_pool_str2571[sizeof("inbopomofo")];
-    char uniname2ctype_pool_str2596[sizeof("incombiningdiacriticalmarksextended")];
-    char uniname2ctype_pool_str2598[sizeof("inkanbun")];
-    char uniname2ctype_pool_str2606[sizeof("oldturkic")];
-    char uniname2ctype_pool_str2608[sizeof("defaultignorablecodepoint")];
-    char uniname2ctype_pool_str2613[sizeof("ugar")];
-    char uniname2ctype_pool_str2636[sizeof("caucasianalbanian")];
-    char uniname2ctype_pool_str2649[sizeof("inlatinextendedb")];
-    char uniname2ctype_pool_str2662[sizeof("othergraphemeextend")];
-    char uniname2ctype_pool_str2681[sizeof("hung")];
-    char uniname2ctype_pool_str2685[sizeof("inlimbu")];
-    char uniname2ctype_pool_str2689[sizeof("grek")];
-    char uniname2ctype_pool_str2692[sizeof("batk")];
-    char uniname2ctype_pool_str2700[sizeof("inbatak")];
-    char uniname2ctype_pool_str2703[sizeof("incjkradicalssupplement")];
-    char uniname2ctype_pool_str2745[sizeof("innoblock")];
-    char uniname2ctype_pool_str2755[sizeof("cwu")];
-    char uniname2ctype_pool_str2760[sizeof("oldnortharabian")];
-    char uniname2ctype_pool_str2772[sizeof("insupplementalsymbolsandpictographs")];
-    char uniname2ctype_pool_str2774[sizeof("dupl")];
-    char uniname2ctype_pool_str2784[sizeof("dashpunctuation")];
-    char uniname2ctype_pool_str2788[sizeof("inbamumsupplement")];
-    char uniname2ctype_pool_str2794[sizeof("gujr")];
-    char uniname2ctype_pool_str2799[sizeof("inhighsurrogates")];
-    char uniname2ctype_pool_str2803[sizeof("lu")];
-    char uniname2ctype_pool_str2810[sizeof("qmark")];
-    char uniname2ctype_pool_str2815[sizeof("gujarati")];
-    char uniname2ctype_pool_str2817[sizeof("limbu")];
-    char uniname2ctype_pool_str2824[sizeof("sk")];
-    char uniname2ctype_pool_str2833[sizeof("egyp")];
-    char uniname2ctype_pool_str2852[sizeof("inlisu")];
-    char uniname2ctype_pool_str2873[sizeof("bopomofo")];
-    char uniname2ctype_pool_str2895[sizeof("inhanguljamoextendedb")];
-    char uniname2ctype_pool_str2899[sizeof("inegyptianhieroglyphs")];
-    char uniname2ctype_pool_str2906[sizeof("intelugu")];
-    char uniname2ctype_pool_str2921[sizeof("katakana")];
-    char uniname2ctype_pool_str2947[sizeof("kayahli")];
-    char uniname2ctype_pool_str2950[sizeof("oupper")];
-    char uniname2ctype_pool_str2972[sizeof("surrogate")];
-    char uniname2ctype_pool_str2991[sizeof("currencysymbol")];
-    char uniname2ctype_pool_str3010[sizeof("insupplementalpunctuation")];
-    char uniname2ctype_pool_str3040[sizeof("ingeorgiansupplement")];
-    char uniname2ctype_pool_str3071[sizeof("unifiedideograph")];
-    char uniname2ctype_pool_str3107[sizeof("unknown")];
-    char uniname2ctype_pool_str3132[sizeof("zyyy")];
-    char uniname2ctype_pool_str3135[sizeof("insupplementalarrowsb")];
-    char uniname2ctype_pool_str3166[sizeof("uppercase")];
-    char uniname2ctype_pool_str3167[sizeof("khudawadi")];
-    char uniname2ctype_pool_str3274[sizeof("inkhudawadi")];
-    char uniname2ctype_pool_str3282[sizeof("openpunctuation")];
-    char uniname2ctype_pool_str3382[sizeof("upper")];
-    char uniname2ctype_pool_str3404[sizeof("buhd")];
-    char uniname2ctype_pool_str3406[sizeof("quotationmark")];
-    char uniname2ctype_pool_str3441[sizeof("paucinhau")];
-    char uniname2ctype_pool_str3442[sizeof("paragraphseparator")];
-    char uniname2ctype_pool_str3443[sizeof("khojki")];
-    char uniname2ctype_pool_str3450[sizeof("inpaucinhau")];
-    char uniname2ctype_pool_str3459[sizeof("inbopomofoextended")];
-    char uniname2ctype_pool_str3504[sizeof("uppercaseletter")];
-    char uniname2ctype_pool_str3519[sizeof("punctuation")];
-    char uniname2ctype_pool_str3529[sizeof("egyptianhieroglyphs")];
-    char uniname2ctype_pool_str3531[sizeof("bugi")];
-    char uniname2ctype_pool_str3556[sizeof("changeswhenuppercased")];
-    char uniname2ctype_pool_str3582[sizeof("buginese")];
-    char uniname2ctype_pool_str3626[sizeof("incjkunifiedideographsextensiona")];
-    char uniname2ctype_pool_str3633[sizeof("incjkunifiedideographsextensionc")];
-    char uniname2ctype_pool_str3634[sizeof("inhangulcompatibilityjamo")];
-    char uniname2ctype_pool_str3638[sizeof("incjkunifiedideographsextensione")];
-    char uniname2ctype_pool_str3639[sizeof("insupplementaryprivateuseareab")];
-    char uniname2ctype_pool_str3643[sizeof("incjkunifiedideographs")];
-    char uniname2ctype_pool_str3822[sizeof("oldsoutharabian")];
-    char uniname2ctype_pool_str3863[sizeof("inboxdrawing")];
-    char uniname2ctype_pool_str3927[sizeof("guru")];
-    char uniname2ctype_pool_str3928[sizeof("telugu")];
-    char uniname2ctype_pool_str3941[sizeof("buhid")];
-    char uniname2ctype_pool_str3974[sizeof("duployan")];
-    char uniname2ctype_pool_str4081[sizeof("greek")];
-    char uniname2ctype_pool_str4084[sizeof("batak")];
-    char uniname2ctype_pool_str4139[sizeof("blank")];
-    char uniname2ctype_pool_str4149[sizeof("incjkunifiedideographsextensiond")];
-    char uniname2ctype_pool_str4205[sizeof("grlink")];
-    char uniname2ctype_pool_str4446[sizeof("graphemelink")];
-    char uniname2ctype_pool_str4805[sizeof("incjkunifiedideographsextensionb")];
-    char uniname2ctype_pool_str5326[sizeof("gurmukhi")];
-#endif /* USE_UNICODE_PROPERTIES */
-  };
-static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
-  {
-#ifndef USE_UNICODE_PROPERTIES
-    "word",
-    "print",
-    "punct",
-    "alpha",
-    "alnum",
-    "xdigit",
-    "upper",
-#else /* USE_UNICODE_PROPERTIES */
-    "n",
-    "mn",
-    "m",
-    "z",
-    "cn",
-    "mani",
-    "ci",
-    "inmanichaean",
-    "zzzz",
-    "qaai",
-    "c",
-    "mc",
-    "qaac",
-    "sm",
-    "incham",
-    "me",
-    "inarmenian",
-    "cc",
-    "mandaic",
-    "incuneiform",
-    "insamaritan",
-    "cans",
-    "s",
-    "sc",
-#endif /* USE_UNICODE_PROPERTIES */
-    "ascii",
-#ifdef USE_UNICODE_PROPERTIES
-    "zs",
-    "inavestan",
-    "cs",
-    "inipaextensions",
-    "incuneiformnumbersandpunctuation",
-    "incommonindicnumberforms",
-    "inthai",
-    "cwcm",
-    "mtei",
-    "inspecials",
-    "initialpunctuation",
-    "invai",
-    "inthaana",
-    "inancientsymbols",
-    "vai",
-    "vaii",
-    "inmiscellaneousmathematicalsymbolsa",
-    "newtailue",
-    "inmusicalsymbols",
-    "lm",
-    "taile",
-    "lina",
-    "inmyanmarextendeda",
-    "sterm",
-    "lana",
-    "alnum",
-    "inlycian",
-    "lc",
-    "inmalayalam",
-    "inshavian",
-    "inmiscellaneoussymbols",
-    "inlineara",
-    "intransportandmapsymbols",
-    "vs",
-    "inmiscellaneoussymbolsandarrows",
-    "intaitham",
-    "innewtailue",
-    "inmiscellaneoussymbolsandpictographs",
-    "incontrolpictures",
-    "sinhala",
-    "taiviet",
-    "latn",
-    "latin",
-    "ital",
-    "intamil",
-    "taml",
-    "inmultani",
-    "avst",
-    "inlinearbideograms",
-    "avestan",
-    "intaixuanjingsymbols",
-    "intaile",
-    "tale",
-    "cwt",
-    "cwcf",
-    "armn",
-    "inlatinextendeda",
-    "armi",
-    "l",
-    "nl",
-    "armenian",
-    "inmyanmar",
-    "inrunic",
-    "incarian",
-    "zl",
-    "inlatinextendedc",
-    "cari",
-    "inmeeteimayekextensions",
-    "inlatinextendede",
-    "carian",
-    "merc",
-    "ext",
-    "incyrillic",
-    "tavt",
-    "intaiviet",
-    "samr",
-    "miao",
-    "lt",
-    "inlowsurrogates",
-    "samaritan",
-    "inahom",
-    "arabic",
-    "insyriac",
-    "insharada",
-    "java",
-    "inosmanya",
-    "incherokee",
-    "cf",
-    "inmiscellaneoustechnical",
-    "inruminumeralsymbols",
-    "zinh",
-    "han",
-    "osma",
-    "hani",
-    "injavanese",
-    "wara",
-    "inwarangciti",
-    "inmahajani",
-    "cham",
-    "javanese",
-    "term",
-    "sinh",
-    "cwl",
-    "manichaean",
-    "insmallformvariants",
-    "connectorpunctuation",
-    "inenclosedalphanumerics",
-    "inethiopic",
-    "tamil",
-#endif /* USE_UNICODE_PROPERTIES */
-    "cntrl",
-#ifdef USE_UNICODE_PROPERTIES
-    "insinhala",
-    "chakma",
-    "shavian",
-    "inlatinextendedadditional",
-    "ll",
-    "lineara",
-    "inideographicdescriptioncharacters",
-    "thai",
-    "math",
-    "thaa",
-    "inenclosedalphanumericsupplement",
-    "ethi",
-    "hatran",
-    "meroiticcursive",
-    "inemoticons",
-    "shaw",
-    "taitham",
-    "thaana",
-    "insinhalaarchaicnumbers",
-    "ahex",
-    "loe",
-    "invariationselectors",
-    "terminalpunctuation",
-    "whitespace",
-    "asciihexdigit",
-    "inearlydynasticcuneiform",
-    "inopticalcharacterrecognition",
-    "joinc",
-    "di",
-    "inenclosedcjklettersandmonths",
-    "mand",
-    "inmodi",
-    "mahj",
-    "dia",
-    "mend",
-    "inmandaic",
-    "invariationselectorssupplement",
-    "idc",
-    "mahajani",
-    "sind",
-    "hex",
-    "oriya",
-    "mero",
-    "titlecaseletter",
-    "no",
-    "inscriptionalparthian",
-    "innko",
-    "insundanese",
-    "inmro",
-    "intifinagh",
-    "ids",
-    "sora",
-    "co",
-    "tifinagh",
-    "indominotiles",
-    "hira",
-    "inarrows",
-    "inmiao",
-    "common",
-    "so",
-    "inhiragana",
-    "cher",
-    "hano",
-    "ahom",
-    "xidc",
-    "idst",
-    "inogham",
-    "inolchiki",
-    "idcontinue",
-    "inmathematicalalphanumericsymbols",
-    "xids",
-    "inscriptionalpahlavi",
-    "indevanagari",
-    "inlydian",
-    "deva",
-    "inspacingmodifierletters",
-    "indeseret",
-    "anatolianhieroglyphs",
-    "tirh",
-    "devanagari",
-    "inhatran",
-    "hatr",
-    "invedicextensions",
-    "intirhuta",
-    "inmahjongtiles",
-    "lo",
-    "inlao",
-    "lao",
-    "laoo",
-    "mongolian",
-    "pi",
-    "insylotinagri",
-    "lineseparator",
-    "pc",
-    "pe",
-    "inphaistosdisc",
-    "letter",
-    "inanatolianhieroglyphs",
-    "oalpha",
-    "ps",
-    "inverticalforms",
-    "xdigit",
-    "lowercase",
-    "odi",
-    "diacritic",
-    "modi",
-    "xidstart",
-    "inshorthandformatcontrols",
-    "oidc",
-#endif /* USE_UNICODE_PROPERTIES */
-    "space",
-#ifdef USE_UNICODE_PROPERTIES
-    "ideo",
-    "inolditalic",
-    "mro",
-    "mroo",
-    "insundanesesupplement",
-    "oids",
-    "nchar",
-    "decimalnumber",
-    "incoptic",
-    "palm",
-    "format",
-    "dsrt",
-    "dash",
-    "inmodifiertoneletters",
-    "patws",
-    "alpha",
-    "siddham",
-    "inlepcha",
-    "wspace",
-    "inpalmyrene",
-    "lepc",
-    "idstart",
-    "inprivateusearea",
-    "psalterpahlavi",
-    "incopticepactnumbers",
-    "inoldturkic",
-    "sharada",
-    "hanunoo",
-    "incyrillicextendeda",
-    "joincontrol",
-    "xidcontinue",
-    "deseret",
-    "radical",
-    "canadianaboriginal",
-    "omath",
-    "inmongolian",
-    "casedletter",
-    "extender",
-    "control",
-    "ingrantha",
-    "yi",
-    "otheridcontinue",
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    "age=1.1",
-    "age=2.1",
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    "yiii",
-    "inethiopicextendeda",
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    "age=6.1",
-    "age=6.2",
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    "perm",
-#endif /* USE_UNICODE_PROPERTIES */
-    "lower",
-#ifndef USE_UNICODE_PROPERTIES
-    "graph",
-#else /* USE_UNICODE_PROPERTIES */
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    "age=3.1",
-    "age=3.2",
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    "noncharactercodepoint",
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    "age=4.1",
-    "age=2.0",
-    "age=6.3",
-    "age=8.0",
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    "ingeneralpunctuation",
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    "age=6.0",
-    "age=5.1",
-    "age=5.2",
-    "age=7.0",
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    "nd",
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    "age=3.0",
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    "otheralphabetic",
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    "age=4.0",
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    "imperialaramaic",
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    "age=5.0",
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    "pf",
-    "letternumber",
-    "inimperialaramaic",
-    "inphoenician",
-    "finalpunctuation",
-    "sd",
-    "olditalic",
-    "sidd",
-    "inenclosedideographicsupplement",
-    "prti",
-    "sgnw",
-    "coptic",
-    "insiddham",
-    "inoldnortharabian",
-    "cprt",
-    "inlatin1supplement",
-    "tagbanwa",
-    "cased",
-    "ininscriptionalparthian",
-    "ininscriptionalpahlavi",
-    "inherited",
-    "privateuse",
-    "copt",
-    "inoldsoutharabian",
-    "lowercaseletter",
-    "word",
-    "intags",
-    "shrd",
-    "idsbinaryoperator",
-    "xpeo",
-    "othersymbol",
-    "otherlowercase",
-    "otheridstart",
-    "mlym",
-    "inoldhungarian",
-    "lyci",
-    "print",
-    "phnx",
-    "innabataean",
-    "lycian",
-    "ingujarati",
-    "bamum",
-    "malayalam",
-    "variationselector",
-    "patternwhitespace",
-    "inelbasan",
-    "spaceseparator",
-    "inarabic",
-    "inalphabeticpresentationforms",
-    "inbasiclatin",
-    "phli",
-    "indevanagariextended",
-    "innumberforms",
-    "caseignorable",
-    "tfng",
-    "other",
-    "inphoneticextensions",
-    "othernumber",
-    "closepunctuation",
-    "oldpersian",
-    "gran",
-    "bass",
-    "patternsyntax",
-    "inmathematicaloperators",
-    "inpsalterpahlavi",
-    "ingurmukhi",
-    "nbat",
-    "oldpermic",
-    "lepcha",
-    "inbyzantinemusicalsymbols",
-    "olower",
-    "inarabicpresentationformsa",
-    "mong",
-    "nabataean",
-    "mymr",
-    "intibetan",
-    "inyijinghexagramsymbols",
-    "ogam",
-    "inmiscellaneousmathematicalsymbolsb",
-    "inlatinextendedd",
-    "sylotinagri",
-    "inphoneticextensionssupplement",
-    "insorasompeng",
-    "insuttonsignwriting",
-    "linb",
-    "mathsymbol",
-    "myanmar",
-    "inmyanmarextendedb",
-    "limb",
-    "bali",
-    "hmng",
-    "inbraillepatterns",
-    "othermath",
-    "po",
-    "hang",
-    "syrc",
-    "inoriya",
-    "warangciti",
-    "separator",
-    "elba",
-    "inbalinese",
-    "tibt",
-    "modifierletter",
-    "bengali",
-    "inlinearbsyllabary",
-    "tibetan",
-    "syriac",
-    "incaucasianalbanian",
-    "osmanya",
-    "balinese",
-    "inyiradicals",
-    "sundanese",
-    "ingreekandcoptic",
-    "inkannada",
-    "kana",
-    "phoenician",
-    "inancientgreekmusicalnotation",
-    "elbasan",
-    "otherletter",
-    "cakm",
-    "ingeometricshapes",
-    "gothic",
-    "inchakma",
-    "inancientgreeknumbers",
-    "saurashtra",
-    "induployan",
-    "rjng",
-    "mendekikakui",
-    "ingothic",
-    "narb",
-    "cyrl",
-    "brai",
-    "grext",
-    "arab",
-    "meeteimayek",
-    "inrejang",
-    "brahmi",
-    "inkaithi",
-    "multani",
-    "incjkcompatibilityforms",
-    "takri",
-    "incjkcompatibilityideographs",
-    "sarb",
-    "p",
-    "lisu",
-    "inkatakana",
-    "zp",
-    "inornamentaldingbats",
-    "sylo",
-    "cuneiform",
-    "incjkstrokes",
-    "ethiopic",
-    "inmeeteimayek",
-    "kali",
-    "inbrahmi",
-    "incjkcompatibilityideographssupplement",
-    "mult",
-    "inethiopicextended",
-    "talu",
-    "inhangulsyllables",
-    "ingeorgian",
-    "hexdigit",
-    "xsux",
-    "inunifiedcanadianaboriginalsyllabics",
-    "telu",
-    "indingbats",
-    "inblockelements",
-    "geor",
-    "ingreekextended",
-    "inletterlikesymbols",
-    "inoldpersian",
-    "orya",
-    "linearb",
-    "inbassavah",
-    "inoldpermic",
-    "inkanasupplement",
-    "incombininghalfmarks",
-    "runic",
-    "inugaritic",
-    "assigned",
-    "glagolitic",
-    "cyrillic",
-    "inmeroitichieroglyphs",
-    "saur",
-    "hiragana",
-    "insuperscriptsandsubscripts",
-    "ogham",
-    "insaurashtra",
-    "mark",
-    "symbol",
-    "inkharoshthi",
-    "inkhmer",
-    "plrd",
-    "graphemebase",
-    "inhanguljamoextendeda",
-    "incountingrodnumerals",
-    "lydi",
-#endif /* USE_UNICODE_PROPERTIES */
-    "digit",
-#ifndef USE_UNICODE_PROPERTIES
-    "blank"
-#else /* USE_UNICODE_PROPERTIES */
-    "bassavah",
-    "inarabicmathematicalalphabeticsymbols",
-    "grantha",
-    "lydian",
-    "insupplementalmathematicaloperators",
-    "goth",
-    "hebrew",
-    "meroitichieroglyphs",
-    "incyrillicsupplement",
-    "intakri",
-    "takr",
-    "kaithi",
-    "idsb",
-    "bidic",
-    "incherokeesupplement",
-    "inalchemicalsymbols",
-    "inkhmersymbols",
-    "otherpunctuation",
-    "braille",
-    "logicalorderexception",
-    "incurrencysymbols",
-    "tirhuta",
-    "inphagspa",
-    "inarabicextendeda",
-    "brah",
-    "hebr",
-    "pd",
-    "kthi",
-    "inethiopicsupplement",
-    "runr",
-    "olck",
-    "ideographic",
-    "ogrext",
-    "olchiki",
-    "inhighprivateusesurrogates",
-    "softdotted",
-    "inhebrew",
-    "number",
-    "hluw",
-    "inkhojki",
-    "sund",
-    "deprecated",
-    "patsyn",
-    "unassigned",
-    "phagspa",
-    "ingeometricshapesextended",
-    "knda",
-    "insupplementalarrowsa",
-    "inmendekikakui",
-    "insupplementalarrowsc",
-    "sorasompeng",
-    "inhanguljamo",
-    "kannada",
-    "graph",
-    "idstrinaryoperator",
-    "hangul",
-    "inhanunoo",
-    "changeswhencasemapped",
-    "nko",
-    "nkoo",
-    "combiningmark",
-    "inkatakanaphoneticextensions",
-    "khmr",
-    "phlp",
-    "khar",
-    "otherdefaultignorablecodepoint",
-    "enclosingmark",
-    "inhalfwidthandfullwidthforms",
-    "inmeroiticcursive",
-    "inglagolitic",
-    "changeswhentitlecased",
-    "dep",
-    "inbuhid",
-    "incombiningdiacriticalmarks",
-    "inunifiedcanadianaboriginalsyllabicsextended",
-    "any",
-    "incombiningdiacriticalmarksforsymbols",
-    "kharoshthi",
-    "cherokee",
-    "inarabicsupplement",
-    "pauc",
-    "phag",
-    "intagalog",
-    "inplayingcards",
-    "inpahawhhmong",
-    "changeswhencasefolded",
-    "incyrillicextendedb",
-    "incombiningdiacriticalmarkssupplement",
-    "alphabetic",
-    "glag",
-    "hyphen",
-    "inyisyllables",
-    "bidicontrol",
-    "inbengali",
-    "spacingmark",
-    "cypriot",
-    "beng",
-    "graphemeextend",
-    "khoj",
-    "inbuginese",
-    "tglg",
-    "palmyrene",
-    "incypriotsyllabary",
-    "punct",
-    "khmer",
-    "incjksymbolsandpunctuation",
-    "inaegeannumbers",
-    "tagb",
-    "orkh",
-    "intagbanwa",
-    "oldhungarian",
-    "georgian",
-    "modifiersymbol",
-    "changeswhenlowercased",
-    "otheruppercase",
-    "signwriting",
-    "insupplementaryprivateuseareaa",
-    "inkayahli",
-    "ugaritic",
-    "uideo",
-    "inarabicpresentationformsb",
-    "nonspacingmark",
-    "rejang",
-    "inkangxiradicals",
-    "incjkcompatibility",
-    "bamu",
-    "inbamum",
-    "pahawhhmong",
-    "grbase",
-    "aghb",
-    "bopo",
-    "tagalog",
-    "inbopomofo",
-    "incombiningdiacriticalmarksextended",
-    "inkanbun",
-    "oldturkic",
-    "defaultignorablecodepoint",
-    "ugar",
-    "caucasianalbanian",
-    "inlatinextendedb",
-    "othergraphemeextend",
-    "hung",
-    "inlimbu",
-    "grek",
-    "batk",
-    "inbatak",
-    "incjkradicalssupplement",
-    "innoblock",
-    "cwu",
-    "oldnortharabian",
-    "insupplementalsymbolsandpictographs",
-    "dupl",
-    "dashpunctuation",
-    "inbamumsupplement",
-    "gujr",
-    "inhighsurrogates",
-    "lu",
-    "qmark",
-    "gujarati",
-    "limbu",
-    "sk",
-    "egyp",
-    "inlisu",
-    "bopomofo",
-    "inhanguljamoextendedb",
-    "inegyptianhieroglyphs",
-    "intelugu",
-    "katakana",
-    "kayahli",
-    "oupper",
-    "surrogate",
-    "currencysymbol",
-    "insupplementalpunctuation",
-    "ingeorgiansupplement",
-    "unifiedideograph",
-    "unknown",
-    "zyyy",
-    "insupplementalarrowsb",
-    "uppercase",
-    "khudawadi",
-    "inkhudawadi",
-    "openpunctuation",
-    "upper",
-    "buhd",
-    "quotationmark",
-    "paucinhau",
-    "paragraphseparator",
-    "khojki",
-    "inpaucinhau",
-    "inbopomofoextended",
-    "uppercaseletter",
-    "punctuation",
-    "egyptianhieroglyphs",
-    "bugi",
-    "changeswhenuppercased",
-    "buginese",
-    "incjkunifiedideographsextensiona",
-    "incjkunifiedideographsextensionc",
-    "inhangulcompatibilityjamo",
-    "incjkunifiedideographsextensione",
-    "insupplementaryprivateuseareab",
-    "incjkunifiedideographs",
-    "oldsoutharabian",
-    "inboxdrawing",
-    "guru",
-    "telugu",
-    "buhid",
-    "duployan",
-    "greek",
-    "batak",
-    "blank",
-    "incjkunifiedideographsextensiond",
-    "grlink",
-    "graphemelink",
-    "incjkunifiedideographsextensionb",
-    "gurmukhi"
-#endif /* USE_UNICODE_PROPERTIES */
-  };
-#define uniname2ctype_pool ((const char *) &uniname2ctype_pool_contents)
-#ifdef __GNUC__
-__inline
-#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
-__attribute__ ((__gnu_inline__))
-#endif
-#endif
-const struct uniname2ctype_struct *
-uniname2ctype_p (str, len)
-     register const char *str;
-     register unsigned int len;
-{
-  static const struct uniname2ctype_struct wordlist[] =
-    {
-#ifdef USE_UNICODE_PROPERTIES
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3,                                        34},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str11,                                       33},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str15,                                        30},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str17,                                        51},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str24,                                       20},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str29,                                    185},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str30,                                       60},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str31,                            447},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str36,                                    237},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str37,                                    114},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str41,                                        17},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str49,                                       31},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str53,                                    128},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str56,                                       49},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str58,                                  390},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str59,                                       32},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str61,                              265},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str62,                                       18},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str65,                                 168},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str69,                             473},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str77,                             272},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str78,                                    101},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str81,                                        46},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str82,                                       47},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str86,                                    14},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str90,                                       54},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str93,                               448},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str102,                                       22},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str106,                         259},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str110,        474},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str114,                381},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str124,                                  285},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str129,                                     65},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str132,                                    159},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str140,                              414},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str141,                       43},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str142,                                   375},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str144,                                270},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str145,                        419},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str148,                                     143},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str149,                                    143},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str152,     340},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str155,                               129},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str159,                        487},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str163,                                       26},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str164,                                   120},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str169,                                    183},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str174,                      391},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str176,                                   233},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str178,                                    151},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str180,                                    13},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str185,                                421},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str189,                                       24},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str190,                             283},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str192,                               430},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str199,                  338},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str200,                               434},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str201,                503},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str206,                                      234},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str208,         346},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str209,                               309},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str212,                             306},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str213,    500},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str220,                       332},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str225,                                  92},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str237,                                 152},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str257,                                     75},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str259,                                    75},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str260,                                    111},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str262,                                 280},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str263,                                     88},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str264,                               463},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str273,                                    153},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str274,                      416},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str275,                                 153},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str279,                    489},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str280,                                 305},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str281,                                    120},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str285,                                      63},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str288,                                     64},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str290,                                     78},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str291,                        257},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str293,                                    160},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str295,                                        23},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str297,                                       36},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str299,                                 78},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str300,                               288},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str302,                                 296},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str303,                                422},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str304,                                       52},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str305,                        348},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str306,                                    148},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str309,                 393},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str315,                        395},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str319,                                  148},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str321,                                    170},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str322,                                     218},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str324,                              263},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str325,                                    152},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str326,                               392},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str329,                                    155},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str330,                                    172},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str333,                                       28},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str338,                         402},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str339,                               155},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str340,                                  470},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str341,                                   80},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str342,                                268},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str345,                               460},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str348,                                    158},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str349,                               431},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str350,                              293},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str354,                                       19},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str360,                331},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str361,                    454},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str362,                                    114},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str363,                                     109},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str366,                                    124},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str367,                                    109},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str371,                              388},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str373,                                    198},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str381,                            471},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str384,                              459},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str389,                                    150},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str390,                                158},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str393,                                    211},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str394,                                     92},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str395,                                      61},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str397,                              185},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str401,                     411},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str403,                     39},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str408,                 334},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str409,                              291},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str411,                                    88},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str412,                                     3},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str413,                               284},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str417,                                  169},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str423,                                 123},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str434,               321},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str443,                                       25},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str450,                                 183},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str454,      357},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str458,                                     93},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str461,                                     55},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str467,                                     82},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str469,        498},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str470,                                     99},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str471,                                  201},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str473,                         170},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str475,                             501},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str480,                                    123},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str481,                                 151},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str483,                                   82},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str494,                 461},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str497,                                    214},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str502,                                     230},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str518,                    407},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str519,                     211},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str527,                              205},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str531,                           214},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str533,                475},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str538,           333},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str545,                                   207},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str546,                                       70},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str552,           367},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str561,                                    168},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str562,                                  468},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str563,                                    184},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str569,                                     217},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str573,                                    186},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str578,                               273},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str580,          514},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str583,                                      67},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str584,                                184},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str585,                                    196},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str593,                                     213},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str602,                                    87},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str603,                                    171},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str605,                          28},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str607,                                       37},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str614,                   162},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str615,                                   271},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str618,                             312},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str621,                                   479},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str622,                              351},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str623,                                      66},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str624,                                    174},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str626,                                       21},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str629,                                131},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str630,                           496},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str631,                                    106},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str633,                                329},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str635,                                  482},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str639,                                   74},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str646,                                       50},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str651,                              359},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str659,                                    100},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str665,                                    116},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str671,                                    199},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str674,                                     69},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str676,                                    224},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str679,                                 295},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str685,                               315},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str688,                               67},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str689,       491},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str694,                                     68},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str696,                    163},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str698,                            275},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str701,                                441},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str702,                                     83},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str703,                260},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str707,                               429},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str708,                    200},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str710,                                    197},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str713,                               83},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str716,                                439},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str719,                                    201},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str728,                       317},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str729,                               466},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str752,                          495},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str753,                                       27},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str761,                                   286},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str767,                                      94},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str768,                                     94},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str769,                               105},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str770,                                       43},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str776,                           380},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str797,                            52},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str802,                                       39},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str812,                                       41},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str820,                          420},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str825,                                   23},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str832,                  477},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str839,                                  215},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str842,                                       45},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str843,                         408},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str844,                                   11},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str846,                                57},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str849,                                     227},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str851,                               217},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str853,                                    187},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str855,                                 68},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str856,               485},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str866,                                    232},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str868,                                     9},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str871,                                    216},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str878,                             424},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str879,                                     188},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str880,                                    188},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str882,                   316},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str886,                                    231},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str901,                                   221},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str904,                            35},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str905,                                349},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str931,                                    191},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str936,                                   19},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str937,                                    113},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str938,                                    208},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str940,                   378},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str950,                                   235},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str951,                                     1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str952,                                 195},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str953,                                314},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str954,                                  205},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str955,                             437},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str956,                                    141},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str957,                                  66},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str960,                        403},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str961,                          194},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str964,                    423},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str966,                             452},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str967,                                 173},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str971,                                 116},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str972,                     353},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str980,                             207},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str989,                              69},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str990,                                 113},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1001,                                 225},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1005,                      101},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1017,                                   212},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1029,                             302},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1032,                              24},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1037,                                218},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1044,                                  18},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1045,                               465},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1050,                                      110},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1052,                         232},
-#ifndef USE_UNICODE_AGE_PROPERTIES
-      {-1}, {-1}, {-1},
-#else /* USE_UNICODE_AGE_PROPERTIES */
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1053,                                 238},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1054,                                 240},
-      {-1},
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1056,                                    110},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1057,                     394},
-#ifndef USE_UNICODE_AGE_PROPERTIES
-      {-1}, {-1}, {-1},
-#else /* USE_UNICODE_AGE_PROPERTIES */
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1058,                                 250},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1059,                                 251},
-      {-1},
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1061,                                    193},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1062,                                     6},
-#ifndef USE_UNICODE_AGE_PROPERTIES
-      {-1}, {-1},
-#else /* USE_UNICODE_AGE_PROPERTIES */
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1063,                                 242},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1064,                                 243},
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1065,                   221},
-#ifndef USE_UNICODE_AGE_PROPERTIES
-      {-1}, {-1}, {-1}, {-1},
-#else /* USE_UNICODE_AGE_PROPERTIES */
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1066,                                 245},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1067,                                 239},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1068,                                 252},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1069,                                 254},
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1070,                    323},
-#ifndef USE_UNICODE_AGE_PROPERTIES
-      {-1}, {-1}, {-1}, {-1},
-#else /* USE_UNICODE_AGE_PROPERTIES */
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1071,                                 249},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1072,                                 247},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1073,                                 248},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1074,                                 253},
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1075,                                       35},
-#ifndef USE_UNICODE_AGE_PROPERTIES
-      {-1},
-#else /* USE_UNICODE_AGE_PROPERTIES */
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1076,                                 241},
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1077,                         215},
-#ifndef USE_UNICODE_AGE_PROPERTIES
-      {-1}, {-1}, {-1}, {-1},
-#else /* USE_UNICODE_AGE_PROPERTIES */
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1079,                                 244},
-      {-1}, {-1},
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1082,                         160},
-#ifndef USE_UNICODE_AGE_PROPERTIES
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#endif /* ! USE_UNICODE_AGE_PROPERTIES */
-      {-1}, {-1},
-#ifdef USE_UNICODE_AGE_PROPERTIES
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1085,                                 246},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1094,                                       42},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1096,                             36},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1100,                       436},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1106,                            440},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1109,                         42},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1114,                                      229},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1119,                               111},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1120,                                    195},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1121,         499},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1125,                                    162},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1127,                                    204},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1132,                                  128},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1133,                               467},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1140,                       446},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1141,                                    125},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1143,                      256},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1144,                                118},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1150,                                    59},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1155,                 449},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1157,                  450},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1164,                               114},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1169,                               21},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1178,                                    128},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1179,                       445},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1184,                          25},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1185,                                     12},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1187,                                  513},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1190,                                    173},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1194,                       223},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1201,                                    133},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1202,                              50},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1203,                          219},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1204,                            231},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1205,                                     91},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1207,                          453},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1215,                                    147},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1218,                                     7},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1220,                                    137},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1223,                             438},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1228,                                  147},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1230,                              278},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1231,                                   157},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1236,                                91},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1238,                       234},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1242,                       235},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1245,                               432},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1249,                           54},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1251,                                267},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1252,           405},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1255,                            255},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1260,                                    163},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1263,                    384},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1265,                           328},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1266,                            60},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1267,                                    131},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1274,                                    17},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1278,                    318},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1281,                              37},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1285,                         41},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1286,                              133},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1287,                                    180},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1289,                                    177},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1291,                           236},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1292,                 330},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1294,                        451},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1295,                              277},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1302,                                    190},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1304,                               193},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1309,                                  141},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1310,               486},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1312,                                  219},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1315,              406},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1318,                                    105},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1321,                               190},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1323,                                     96},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1324,                               287},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1326,                 370},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1330,                                    102},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1331,     344},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1337,                        379},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1338,                             132},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1340,          319},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1341,                           457},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1345,                     492},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1348,                                    121},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1349,                               49},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1352,                                  96},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1353,                      389},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1354,                                    119},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1360,                                    135},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1361,                                    181},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1364,                       342},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1365,                               212},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1366,                                       44},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1367,                                     98},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1369,                                     81},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1371,                                 279},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1375,                              198},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1377,                                51},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1381,                                    179},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1383,                              311},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1384,                                     95},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1386,                           26},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1389,                                  84},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1396,                      415},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1401,                                  95},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1404,                                   81},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1406,                     433},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1410,                                 124},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1411,                                135},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1415,                            373},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1416,                               140},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1417,                        262},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1420,                               282},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1422,                                    107},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1423,                              137},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1424,           488},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1425,                                 179},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1427,                              27},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1435,                                    169},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1440,                       337},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1448,                                  112},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1450,                                458},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1455,                   418},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1456,                              144},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1459,                              484},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1468,                                    146},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1469,                            186},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1474,                                425},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1475,                                    189},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1476,                                     77},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1478,                                    126},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1483,                                    71},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1487,                                     80},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1488,                             159},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1489,                                386},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1491,                                  167},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1504,                                456},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1506,                                 202},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1507,                 410},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1509,                                   175},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1512,            404},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1514,                                    161},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1521,                                        38},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1522,                                    156},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1524,                              360},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1530,                                       53},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1532,                    502},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1533,                                    132},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1534,                               136},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1548,                            365},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1552,                                 99},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1558,                           397},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1559,                                    145},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1567,                                455},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1574,  512},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1577,                                    202},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1579,                      352},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1583,                                    129},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1584,                       398},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1587,                              289},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1588,                                213},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1591,                                    136},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1592,    294},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1595,                                     89},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1596,                              339},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1599,                         336},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1600,                                     97},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1611,                         322},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1612,                     327},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1617,                            428},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1624,                                     87},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1629,                                 121},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1632,                              480},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1634,                             426},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1635,                        483},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1636,                    409},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1638,                                   103},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1640,                              427},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1642,                                 16},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1643,                              130},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1647,                                 77},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1648,                   442},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1649,                                    144},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1652,                                106},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1658,             324},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1670,                                   102},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1675,                            383},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1680,                                     30},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1689,                                   46},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1694,                            444},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1700,                                 301},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1712,                                    172},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1714,                             72},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1716,                   387},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1723,                   490},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1731,                                    149},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1733,                                     4},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1735,                                177},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1737,   494},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1739,                                 180},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1744,                                  149},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1745,     345},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1747,                                    112},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1749,                                   79},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1757,                     171},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1758,                    264},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1764,                                 469},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1765,                                    175},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1767,                                  165},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1776,                                    223},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1777,                                   206},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1779,                    396},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1781,                     504},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1784,                          307},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1795,                         44},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1796,                                 126},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1798,                   230},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1799,                       325},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1800,                                 197},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1804,                               382},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1814,                       274},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1819,                                    167},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1831,                                     79},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1834,                                       40},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1836,                                    165},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1843,                    292},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1862,                                    103},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1864,                                    142},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1865,                             216},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1871,                                  222},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1875,                                 142},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1882,              401},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1892,                              229},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1893,                                266},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1896,                                   34},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1901,                                    200},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1904,                                462},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1908,                                    140},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1912,                              228},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1913,                                  236},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1931,                               20},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1938,                                 138},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1944,               505},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1945,                                     90},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1956,                   341},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1958,                          493},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1963,                   506},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1964,                             174},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1971,                            290},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1974,                                  90},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1977,                                     5},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1984,                      224},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1986,                                   98},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1989,                               298},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1991,                    65},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1999,                                     139},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2000,                                    139},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2003,                            30},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2006,            366},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2012,                                    104},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2016,                                    194},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2018,                                    134},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2056,          227},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2057,                            32},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2071,            413},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2072,                       443},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2078,                            347},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2081,                    63},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2084,                                     228},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2089,                                 299},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2092,             261},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2096, 303},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2097,                                      15},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2102,   326},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2105,                              134},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2116,                                100},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2118,                      269},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2124,                                    192},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2126,                                    138},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2127,                               297},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2137,                          497},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2141,                           481},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2150,                    64},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2151,                     376},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2154,   320},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2155,                               56},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2172,                                    130},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2178,                                  209},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2203,                           372},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2212,                             206},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2215,                               276},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2220,                              31},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2225,                                 125},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2226,                                     84},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2227,                           71},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2236,                                    182},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2240,                              308},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2251,                                    115},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2259,                               191},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2268,                      435},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2277,                                     8},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2278,                                   104},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2283,              358},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2294,                         417},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2305,                                    118},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2307,                                    164},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2316,                              300},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2327,                            203},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2348,                                 97},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2368,                           48},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2376,                    61},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2383,                          220},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2406,                             204},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2460,          515},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2462,                               385},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2468,                                122},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2476,                                   226},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2494,              412},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2495,                           33},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2499,                                  146},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2501,                        356},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2502,                      368},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2543,                                    157},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2545,                                 377},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2556,                             181},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2557,                                   72},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2558,                                    176},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2560,                                    108},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2569,                                 115},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2571,                              361},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2596,     310},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2598,                                363},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2606,                               164},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2608,                70},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2613,                                    122},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2636,                       176},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2649,                        258},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2662,                     222},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2681,                                    203},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2685,                                 304},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2689,                                     76},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2692,                                    166},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2700,                                 313},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2703,                 355},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2745,                               517},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2755,                                      62},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2760,                         189},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2772,     507},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2774,                                    178},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2784,                          40},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2788,                       478},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2794,                                     86},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2799,                        400},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2803,                                       29},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2810,                                   210},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2815,                                 86},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2817,                                   119},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2824,                                       48},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2833,                                    154},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2852,                                  374},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2873,                                108},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2895,                   399},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2899,                   476},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2906,                                281},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2921,                                107},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2947,                                 145},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2950,                                  220},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2972,                                22},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2991,                           47},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3010,               354},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3040,                    350},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3071,                        226},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3107,                                 237},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3132,                                     74},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3135,                   343},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3166,                                58},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3167,                               196},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3274,                             464},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3282,                          45},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3382,                                    10},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3404,                                    117},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3406,                           210},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3441,                               192},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3442,                       53},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3443,                                  182},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3450,                             472},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3459,                      364},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3504,                          29},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3519,                              38},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3529,                     154},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3531,                                    127},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3556,                    62},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3582,                                127},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3626,        369},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3633,        509},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3634,               362},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3638,        511},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3639,          516},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3643,                  371},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3822,                         161},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3863,                            335},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3927,                                     85},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3928,                                   89},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3941,                                   117},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3974,                                178},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str4081,                                    76},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str4084,                                   166},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str4139,                                     2},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str4149,        510},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str4205,                                   73},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#endif /* USE_UNICODE_PROPERTIES */
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#ifndef USE_UNICODE_PROPERTIES
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str6,                                     12},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str7,                                     7},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str8,                                     8},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str9,                                     1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str10,                                    13},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str11,                                   11},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str12,                                    10},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str13,                                    14},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str14,                                     3},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str15,                                     9},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str16,                                     6},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str17,                                     5},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str18,                                     4},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str19,                                     2}
-#else /* USE_UNICODE_PROPERTIES */
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str4446,                             73},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str4805,        508},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str5326,                                 85}
-#endif /* USE_UNICODE_PROPERTIES */
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = uniname2ctype_hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        {
-          register int o = wordlist[key].name;
-          if (o >= 0)
-            {
-              register const char *s = o + uniname2ctype_pool;
-
-              if (*str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0')
-                return &wordlist[key];
-            }
-        }
-    }
-  return 0;
-}
-
-static int
-uniname2ctype(const UChar *name, unsigned int len)
-{
-  const struct uniname2ctype_struct *p = uniname2ctype_p((const char *)name, len);
-  if (p) return p->ctype;
-  return -1;
-}
diff --git a/enc/unicode/name2ctype.h.blt b/enc/unicode/name2ctype.h.blt
deleted file mode 100644
index 80b79abc3e..0000000000
--- a/enc/unicode/name2ctype.h.blt
+++ /dev/null
@@ -1,32679 +0,0 @@
-/* C code produced by gperf version 3.0.3 */
-/* Command-line: gperf -7 -c -j1 -i1 -t -C -P -T -H uniname2ctype_hash -Q uniname2ctype_pool -N uniname2ctype_p  */
-#ifndef USE_UNICODE_PROPERTIES
-/* Computed positions: -k'1,3' */
-#else /* USE_UNICODE_PROPERTIES */
-/* Computed positions: -k'1-3,5-6,12,16,$' */
-#endif /* USE_UNICODE_PROPERTIES */
-
-#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
-
-
-#define long size_t
-
-/* 'NEWLINE': [[:NEWLINE:]] */
-static const OnigCodePoint CR_NEWLINE[] = {
-	1,
-	0x000a, 0x000a,
-}; /* CR_NEWLINE */
-
-/* 'Alpha': [[:Alpha:]] */
-static const OnigCodePoint CR_Alpha[] = {
-	600,
-	0x0041, 0x005a,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00b5, 0x00b5,
-	0x00ba, 0x00ba,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x02c1,
-	0x02c6, 0x02d1,
-	0x02e0, 0x02e4,
-	0x02ec, 0x02ec,
-	0x02ee, 0x02ee,
-	0x0345, 0x0345,
-	0x0370, 0x0374,
-	0x0376, 0x0377,
-	0x037a, 0x037d,
-	0x037f, 0x037f,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x048a, 0x052f,
-	0x0531, 0x0556,
-	0x0559, 0x0559,
-	0x0561, 0x0587,
-	0x05b0, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0610, 0x061a,
-	0x0620, 0x0657,
-	0x0659, 0x065f,
-	0x066e, 0x06d3,
-	0x06d5, 0x06dc,
-	0x06e1, 0x06e8,
-	0x06ed, 0x06ef,
-	0x06fa, 0x06fc,
-	0x06ff, 0x06ff,
-	0x0710, 0x073f,
-	0x074d, 0x07b1,
-	0x07ca, 0x07ea,
-	0x07f4, 0x07f5,
-	0x07fa, 0x07fa,
-	0x0800, 0x0817,
-	0x081a, 0x082c,
-	0x0840, 0x0858,
-	0x08a0, 0x08b2,
-	0x08e4, 0x08e9,
-	0x08f0, 0x093b,
-	0x093d, 0x094c,
-	0x094e, 0x0950,
-	0x0955, 0x0963,
-	0x0971, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bd, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cc,
-	0x09ce, 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,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4c,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a70, 0x0a75,
-	0x0a81, 0x0a83,
-	0x0a85, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abd, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acc,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae3,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3d, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4c,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	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, 0x0bcc,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0c00, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4c,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c81, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbd, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccc,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0cf1, 0x0cf2,
-	0x0d01, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4c,
-	0x0d4e, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d7a, 0x0d7f,
-	0x0d82, 0x0d83,
-	0x0d85, 0x0d96,
-	0x0d9a, 0x0db1,
-	0x0db3, 0x0dbb,
-	0x0dbd, 0x0dbd,
-	0x0dc0, 0x0dc6,
-	0x0dcf, 0x0dd4,
-	0x0dd6, 0x0dd6,
-	0x0dd8, 0x0ddf,
-	0x0df2, 0x0df3,
-	0x0e01, 0x0e3a,
-	0x0e40, 0x0e46,
-	0x0e4d, 0x0e4d,
-	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,
-	0x0ecd, 0x0ecd,
-	0x0edc, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f40, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f81,
-	0x0f88, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x1000, 0x1036,
-	0x1038, 0x1038,
-	0x103b, 0x103f,
-	0x1050, 0x1062,
-	0x1065, 0x1068,
-	0x106e, 0x1086,
-	0x108e, 0x108e,
-	0x109c, 0x109d,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 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, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f8,
-	0x1700, 0x170c,
-	0x170e, 0x1713,
-	0x1720, 0x1733,
-	0x1740, 0x1753,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-	0x1780, 0x17b3,
-	0x17b6, 0x17c8,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dc,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191e,
-	0x1920, 0x192b,
-	0x1930, 0x1938,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x1a00, 0x1a1b,
-	0x1a20, 0x1a5e,
-	0x1a61, 0x1a74,
-	0x1aa7, 0x1aa7,
-	0x1b00, 0x1b33,
-	0x1b35, 0x1b43,
-	0x1b45, 0x1b4b,
-	0x1b80, 0x1ba9,
-	0x1bac, 0x1baf,
-	0x1bba, 0x1be5,
-	0x1be7, 0x1bf1,
-	0x1c00, 0x1c35,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c7d,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf3,
-	0x1cf5, 0x1cf6,
-	0x1d00, 0x1dbf,
-	0x1de7, 0x1df4,
-	0x1e00, 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, 0x209c,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2119, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x212d,
-	0x212f, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2160, 0x2188,
-	0x24b6, 0x24e9,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2ce4,
-	0x2ceb, 0x2cee,
-	0x2cf2, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2dff,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3007,
-	0x3021, 0x3029,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x309d, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa640, 0xa66e,
-	0xa674, 0xa67b,
-	0xa67f, 0xa69d,
-	0xa69f, 0xa6ef,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa7ad,
-	0xa7b0, 0xa7b1,
-	0xa7f7, 0xa801,
-	0xa803, 0xa805,
-	0xa807, 0xa80a,
-	0xa80c, 0xa827,
-	0xa840, 0xa873,
-	0xa880, 0xa8c3,
-	0xa8f2, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa90a, 0xa92a,
-	0xa930, 0xa952,
-	0xa960, 0xa97c,
-	0xa980, 0xa9b2,
-	0xa9b4, 0xa9bf,
-	0xa9cf, 0xa9cf,
-	0xa9e0, 0xa9e4,
-	0xa9e6, 0xa9ef,
-	0xa9fa, 0xa9fe,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa60, 0xaa76,
-	0xaa7a, 0xaa7a,
-	0xaa7e, 0xaabe,
-	0xaac0, 0xaac0,
-	0xaac2, 0xaac2,
-	0xaadb, 0xaadd,
-	0xaae0, 0xaaef,
-	0xaaf2, 0xaaf5,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xab30, 0xab5a,
-	0xab5c, 0xab5f,
-	0xab64, 0xab65,
-	0xabc0, 0xabea,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa6d,
-	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,
-	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,
-	0x10140, 0x10174,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031f,
-	0x10330, 0x1034a,
-	0x10350, 0x1037a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10860, 0x10876,
-	0x10880, 0x1089e,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10a80, 0x10a9c,
-	0x10ac0, 0x10ac7,
-	0x10ac9, 0x10ae4,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10b80, 0x10b91,
-	0x10c00, 0x10c48,
-	0x11000, 0x11045,
-	0x11082, 0x110b8,
-	0x110d0, 0x110e8,
-	0x11100, 0x11132,
-	0x11150, 0x11172,
-	0x11176, 0x11176,
-	0x11180, 0x111bf,
-	0x111c1, 0x111c4,
-	0x111da, 0x111da,
-	0x11200, 0x11211,
-	0x11213, 0x11234,
-	0x11237, 0x11237,
-	0x112b0, 0x112e8,
-	0x11301, 0x11303,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133d, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134c,
-	0x11357, 0x11357,
-	0x1135d, 0x11363,
-	0x11480, 0x114c1,
-	0x114c4, 0x114c5,
-	0x114c7, 0x114c7,
-	0x11580, 0x115b5,
-	0x115b8, 0x115be,
-	0x11600, 0x1163e,
-	0x11640, 0x11640,
-	0x11644, 0x11644,
-	0x11680, 0x116b5,
-	0x118a0, 0x118df,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x12000, 0x12398,
-	0x12400, 0x1246e,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16ad0, 0x16aed,
-	0x16b00, 0x16b36,
-	0x16b40, 0x16b43,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f93, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	0x1bc9e, 0x1bc9e,
-	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, 0x1d7cb,
-	0x1e800, 0x1e8c4,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1f130, 0x1f149,
-	0x1f150, 0x1f169,
-	0x1f170, 0x1f189,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_Alpha */
-
-/* 'Blank': [[:Blank:]] */
-static const OnigCodePoint CR_Blank[] = {
-	8,
-	0x0009, 0x0009,
-	0x0020, 0x0020,
-	0x00a0, 0x00a0,
-	0x1680, 0x1680,
-	0x2000, 0x200a,
-	0x202f, 0x202f,
-	0x205f, 0x205f,
-	0x3000, 0x3000,
-}; /* CR_Blank */
-
-/* 'Cntrl': [[:Cntrl:]] */
-static const OnigCodePoint CR_Cntrl[] = {
-	2,
-	0x0000, 0x001f,
-	0x007f, 0x009f,
-}; /* CR_Cntrl */
-
-/* 'Digit': [[:Digit:]] */
-static const OnigCodePoint CR_Digit[] = {
-	50,
-	0x0030, 0x0039,
-	0x0660, 0x0669,
-	0x06f0, 0x06f9,
-	0x07c0, 0x07c9,
-	0x0966, 0x096f,
-	0x09e6, 0x09ef,
-	0x0a66, 0x0a6f,
-	0x0ae6, 0x0aef,
-	0x0b66, 0x0b6f,
-	0x0be6, 0x0bef,
-	0x0c66, 0x0c6f,
-	0x0ce6, 0x0cef,
-	0x0d66, 0x0d6f,
-	0x0de6, 0x0def,
-	0x0e50, 0x0e59,
-	0x0ed0, 0x0ed9,
-	0x0f20, 0x0f29,
-	0x1040, 0x1049,
-	0x1090, 0x1099,
-	0x17e0, 0x17e9,
-	0x1810, 0x1819,
-	0x1946, 0x194f,
-	0x19d0, 0x19d9,
-	0x1a80, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1b50, 0x1b59,
-	0x1bb0, 0x1bb9,
-	0x1c40, 0x1c49,
-	0x1c50, 0x1c59,
-	0xa620, 0xa629,
-	0xa8d0, 0xa8d9,
-	0xa900, 0xa909,
-	0xa9d0, 0xa9d9,
-	0xa9f0, 0xa9f9,
-	0xaa50, 0xaa59,
-	0xabf0, 0xabf9,
-	0xff10, 0xff19,
-	0x104a0, 0x104a9,
-	0x11066, 0x1106f,
-	0x110f0, 0x110f9,
-	0x11136, 0x1113f,
-	0x111d0, 0x111d9,
-	0x112f0, 0x112f9,
-	0x114d0, 0x114d9,
-	0x11650, 0x11659,
-	0x116c0, 0x116c9,
-	0x118e0, 0x118e9,
-	0x16a60, 0x16a69,
-	0x16b50, 0x16b59,
-	0x1d7ce, 0x1d7ff,
-}; /* CR_Digit */
-
-/* 'Graph': [[:Graph:]] */
-static const OnigCodePoint CR_Graph[] = {
-	605,
-	0x0021, 0x007e,
-	0x00a1, 0x0377,
-	0x037a, 0x037f,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x052f,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x058d, 0x058f,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x061c,
-	0x061e, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-	0x0840, 0x085b,
-	0x085e, 0x085e,
-	0x08a0, 0x08b2,
-	0x08e4, 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, 0x09fb,
-	0x0a01, 0x0a03,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0af1,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3c, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	0x0b66, 0x0b77,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bfa,
-	0x0c00, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-	0x0c81, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d01, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
-	0x0d82, 0x0d83,
-	0x0d85, 0x0d96,
-	0x0d9a, 0x0db1,
-	0x0db3, 0x0dbb,
-	0x0dbd, 0x0dbd,
-	0x0dc0, 0x0dc6,
-	0x0dca, 0x0dca,
-	0x0dcf, 0x0dd4,
-	0x0dd6, 0x0dd6,
-	0x0dd8, 0x0ddf,
-	0x0de6, 0x0def,
-	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, 0x0edf,
-	0x0f00, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fda,
-	0x1000, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 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,
-	0x135d, 0x137c,
-	0x1380, 0x1399,
-	0x13a0, 0x13f4,
-	0x1400, 0x167f,
-	0x1681, 0x169c,
-	0x16a0, 0x16f8,
-	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, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191e,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a1b,
-	0x1a1e, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-	0x1ab0, 0x1abe,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1bf3,
-	0x1bfc, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cc0, 0x1cc7,
-	0x1cd0, 0x1cf6,
-	0x1cf8, 0x1cf9,
-	0x1d00, 0x1df5,
-	0x1dfc, 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, 0x2064,
-	0x2066, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x209c,
-	0x20a0, 0x20bd,
-	0x20d0, 0x20f0,
-	0x2100, 0x2189,
-	0x2190, 0x23fa,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x2b73,
-	0x2b76, 0x2b95,
-	0x2b98, 0x2bb9,
-	0x2bbd, 0x2bc8,
-	0x2bca, 0x2bd1,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf3,
-	0x2cf9, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d70,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2e42,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3001, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa69d,
-	0xa69f, 0xa6f7,
-	0xa700, 0xa78e,
-	0xa790, 0xa7ad,
-	0xa7b0, 0xa7b1,
-	0xa7f7, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-	0xa8e0, 0xa8fb,
-	0xa900, 0xa953,
-	0xa95f, 0xa97c,
-	0xa980, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9fe,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaac2,
-	0xaadb, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xab30, 0xab5f,
-	0xab64, 0xab65,
-	0xabc0, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xe000, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbc1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe2d,
-	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, 0x1018c,
-	0x10190, 0x1019b,
-	0x101a0, 0x101a0,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x102e0, 0x102fb,
-	0x10300, 0x10323,
-	0x10330, 0x1034a,
-	0x10350, 0x1037a,
-	0x10380, 0x1039d,
-	0x1039f, 0x103c3,
-	0x103c8, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x1056f, 0x1056f,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10857, 0x1089e,
-	0x108a7, 0x108af,
-	0x10900, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a9f,
-	0x10ac0, 0x10ae6,
-	0x10aeb, 0x10af6,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b91,
-	0x10b99, 0x10b9c,
-	0x10ba9, 0x10baf,
-	0x10c00, 0x10c48,
-	0x10e60, 0x10e7e,
-	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-	0x1107f, 0x110c1,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x11143,
-	0x11150, 0x11176,
-	0x11180, 0x111c8,
-	0x111cd, 0x111cd,
-	0x111d0, 0x111da,
-	0x111e1, 0x111f4,
-	0x11200, 0x11211,
-	0x11213, 0x1123d,
-	0x112b0, 0x112ea,
-	0x112f0, 0x112f9,
-	0x11301, 0x11303,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133c, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134d,
-	0x11357, 0x11357,
-	0x1135d, 0x11363,
-	0x11366, 0x1136c,
-	0x11370, 0x11374,
-	0x11480, 0x114c7,
-	0x114d0, 0x114d9,
-	0x11580, 0x115b5,
-	0x115b8, 0x115c9,
-	0x11600, 0x11644,
-	0x11650, 0x11659,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x118a0, 0x118f2,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x12000, 0x12398,
-	0x12400, 0x1246e,
-	0x12470, 0x12474,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16a60, 0x16a69,
-	0x16a6e, 0x16a6f,
-	0x16ad0, 0x16aed,
-	0x16af0, 0x16af5,
-	0x16b00, 0x16b45,
-	0x16b50, 0x16b59,
-	0x16b5b, 0x16b61,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	0x1bc9c, 0x1bca3,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d1dd,
-	0x1d200, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1e800, 0x1e8c4,
-	0x1e8c7, 0x1e8d6,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0bf,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0f5,
-	0x1f100, 0x1f10c,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f32c,
-	0x1f330, 0x1f37d,
-	0x1f380, 0x1f3ce,
-	0x1f3d4, 0x1f3f7,
-	0x1f400, 0x1f4fe,
-	0x1f500, 0x1f54a,
-	0x1f550, 0x1f579,
-	0x1f57b, 0x1f5a3,
-	0x1f5a5, 0x1f642,
-	0x1f645, 0x1f6cf,
-	0x1f6e0, 0x1f6ec,
-	0x1f6f0, 0x1f6f3,
-	0x1f700, 0x1f773,
-	0x1f780, 0x1f7d4,
-	0x1f800, 0x1f80b,
-	0x1f810, 0x1f847,
-	0x1f850, 0x1f859,
-	0x1f860, 0x1f887,
-	0x1f890, 0x1f8ad,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xf0000, 0xffffd,
-	0x100000, 0x10fffd,
-}; /* CR_Graph */
-
-/* 'Lower': [[:Lower:]] */
-static const OnigCodePoint CR_Lower[] = {
-	633,
-	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,
-	0x0242, 0x0242,
-	0x0247, 0x0247,
-	0x0249, 0x0249,
-	0x024b, 0x024b,
-	0x024d, 0x024d,
-	0x024f, 0x0293,
-	0x0295, 0x02b8,
-	0x02c0, 0x02c1,
-	0x02e0, 0x02e4,
-	0x0345, 0x0345,
-	0x0371, 0x0371,
-	0x0373, 0x0373,
-	0x0377, 0x0377,
-	0x037a, 0x037d,
-	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, 0x04cf,
-	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,
-	0x04fb, 0x04fb,
-	0x04fd, 0x04fd,
-	0x04ff, 0x04ff,
-	0x0501, 0x0501,
-	0x0503, 0x0503,
-	0x0505, 0x0505,
-	0x0507, 0x0507,
-	0x0509, 0x0509,
-	0x050b, 0x050b,
-	0x050d, 0x050d,
-	0x050f, 0x050f,
-	0x0511, 0x0511,
-	0x0513, 0x0513,
-	0x0515, 0x0515,
-	0x0517, 0x0517,
-	0x0519, 0x0519,
-	0x051b, 0x051b,
-	0x051d, 0x051d,
-	0x051f, 0x051f,
-	0x0521, 0x0521,
-	0x0523, 0x0523,
-	0x0525, 0x0525,
-	0x0527, 0x0527,
-	0x0529, 0x0529,
-	0x052b, 0x052b,
-	0x052d, 0x052d,
-	0x052f, 0x052f,
-	0x0561, 0x0587,
-	0x1d00, 0x1dbf,
-	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, 0x1e9d,
-	0x1e9f, 0x1e9f,
-	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,
-	0x1efb, 0x1efb,
-	0x1efd, 0x1efd,
-	0x1eff, 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,
-	0x2090, 0x209c,
-	0x210a, 0x210a,
-	0x210e, 0x210f,
-	0x2113, 0x2113,
-	0x212f, 0x212f,
-	0x2134, 0x2134,
-	0x2139, 0x2139,
-	0x213c, 0x213d,
-	0x2146, 0x2149,
-	0x214e, 0x214e,
-	0x2170, 0x217f,
-	0x2184, 0x2184,
-	0x24d0, 0x24e9,
-	0x2c30, 0x2c5e,
-	0x2c61, 0x2c61,
-	0x2c65, 0x2c66,
-	0x2c68, 0x2c68,
-	0x2c6a, 0x2c6a,
-	0x2c6c, 0x2c6c,
-	0x2c71, 0x2c71,
-	0x2c73, 0x2c74,
-	0x2c76, 0x2c7d,
-	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,
-	0x2cec, 0x2cec,
-	0x2cee, 0x2cee,
-	0x2cf3, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0xa641, 0xa641,
-	0xa643, 0xa643,
-	0xa645, 0xa645,
-	0xa647, 0xa647,
-	0xa649, 0xa649,
-	0xa64b, 0xa64b,
-	0xa64d, 0xa64d,
-	0xa64f, 0xa64f,
-	0xa651, 0xa651,
-	0xa653, 0xa653,
-	0xa655, 0xa655,
-	0xa657, 0xa657,
-	0xa659, 0xa659,
-	0xa65b, 0xa65b,
-	0xa65d, 0xa65d,
-	0xa65f, 0xa65f,
-	0xa661, 0xa661,
-	0xa663, 0xa663,
-	0xa665, 0xa665,
-	0xa667, 0xa667,
-	0xa669, 0xa669,
-	0xa66b, 0xa66b,
-	0xa66d, 0xa66d,
-	0xa681, 0xa681,
-	0xa683, 0xa683,
-	0xa685, 0xa685,
-	0xa687, 0xa687,
-	0xa689, 0xa689,
-	0xa68b, 0xa68b,
-	0xa68d, 0xa68d,
-	0xa68f, 0xa68f,
-	0xa691, 0xa691,
-	0xa693, 0xa693,
-	0xa695, 0xa695,
-	0xa697, 0xa697,
-	0xa699, 0xa699,
-	0xa69b, 0xa69d,
-	0xa723, 0xa723,
-	0xa725, 0xa725,
-	0xa727, 0xa727,
-	0xa729, 0xa729,
-	0xa72b, 0xa72b,
-	0xa72d, 0xa72d,
-	0xa72f, 0xa731,
-	0xa733, 0xa733,
-	0xa735, 0xa735,
-	0xa737, 0xa737,
-	0xa739, 0xa739,
-	0xa73b, 0xa73b,
-	0xa73d, 0xa73d,
-	0xa73f, 0xa73f,
-	0xa741, 0xa741,
-	0xa743, 0xa743,
-	0xa745, 0xa745,
-	0xa747, 0xa747,
-	0xa749, 0xa749,
-	0xa74b, 0xa74b,
-	0xa74d, 0xa74d,
-	0xa74f, 0xa74f,
-	0xa751, 0xa751,
-	0xa753, 0xa753,
-	0xa755, 0xa755,
-	0xa757, 0xa757,
-	0xa759, 0xa759,
-	0xa75b, 0xa75b,
-	0xa75d, 0xa75d,
-	0xa75f, 0xa75f,
-	0xa761, 0xa761,
-	0xa763, 0xa763,
-	0xa765, 0xa765,
-	0xa767, 0xa767,
-	0xa769, 0xa769,
-	0xa76b, 0xa76b,
-	0xa76d, 0xa76d,
-	0xa76f, 0xa778,
-	0xa77a, 0xa77a,
-	0xa77c, 0xa77c,
-	0xa77f, 0xa77f,
-	0xa781, 0xa781,
-	0xa783, 0xa783,
-	0xa785, 0xa785,
-	0xa787, 0xa787,
-	0xa78c, 0xa78c,
-	0xa78e, 0xa78e,
-	0xa791, 0xa791,
-	0xa793, 0xa795,
-	0xa797, 0xa797,
-	0xa799, 0xa799,
-	0xa79b, 0xa79b,
-	0xa79d, 0xa79d,
-	0xa79f, 0xa79f,
-	0xa7a1, 0xa7a1,
-	0xa7a3, 0xa7a3,
-	0xa7a5, 0xa7a5,
-	0xa7a7, 0xa7a7,
-	0xa7a9, 0xa7a9,
-	0xa7f8, 0xa7fa,
-	0xab30, 0xab5a,
-	0xab5c, 0xab5f,
-	0xab64, 0xab65,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff41, 0xff5a,
-	0x10428, 0x1044f,
-	0x118c0, 0x118df,
-	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,
-	0x1d7cb, 0x1d7cb,
-}; /* CR_Lower */
-
-/* 'Print': [[:Print:]] */
-static const OnigCodePoint CR_Print[] = {
-	602,
-	0x0020, 0x007e,
-	0x00a0, 0x0377,
-	0x037a, 0x037f,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x052f,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x058d, 0x058f,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x061c,
-	0x061e, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-	0x0840, 0x085b,
-	0x085e, 0x085e,
-	0x08a0, 0x08b2,
-	0x08e4, 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, 0x09fb,
-	0x0a01, 0x0a03,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0af1,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3c, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	0x0b66, 0x0b77,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bfa,
-	0x0c00, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-	0x0c81, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d01, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
-	0x0d82, 0x0d83,
-	0x0d85, 0x0d96,
-	0x0d9a, 0x0db1,
-	0x0db3, 0x0dbb,
-	0x0dbd, 0x0dbd,
-	0x0dc0, 0x0dc6,
-	0x0dca, 0x0dca,
-	0x0dcf, 0x0dd4,
-	0x0dd6, 0x0dd6,
-	0x0dd8, 0x0ddf,
-	0x0de6, 0x0def,
-	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, 0x0edf,
-	0x0f00, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fda,
-	0x1000, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 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,
-	0x135d, 0x137c,
-	0x1380, 0x1399,
-	0x13a0, 0x13f4,
-	0x1400, 0x169c,
-	0x16a0, 0x16f8,
-	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, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191e,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a1b,
-	0x1a1e, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-	0x1ab0, 0x1abe,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1bf3,
-	0x1bfc, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cc0, 0x1cc7,
-	0x1cd0, 0x1cf6,
-	0x1cf8, 0x1cf9,
-	0x1d00, 0x1df5,
-	0x1dfc, 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, 0x2027,
-	0x202a, 0x2064,
-	0x2066, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x209c,
-	0x20a0, 0x20bd,
-	0x20d0, 0x20f0,
-	0x2100, 0x2189,
-	0x2190, 0x23fa,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x2b73,
-	0x2b76, 0x2b95,
-	0x2b98, 0x2bb9,
-	0x2bbd, 0x2bc8,
-	0x2bca, 0x2bd1,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf3,
-	0x2cf9, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d70,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2e42,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa69d,
-	0xa69f, 0xa6f7,
-	0xa700, 0xa78e,
-	0xa790, 0xa7ad,
-	0xa7b0, 0xa7b1,
-	0xa7f7, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-	0xa8e0, 0xa8fb,
-	0xa900, 0xa953,
-	0xa95f, 0xa97c,
-	0xa980, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9fe,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaac2,
-	0xaadb, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xab30, 0xab5f,
-	0xab64, 0xab65,
-	0xabc0, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xe000, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbc1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe2d,
-	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, 0x1018c,
-	0x10190, 0x1019b,
-	0x101a0, 0x101a0,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x102e0, 0x102fb,
-	0x10300, 0x10323,
-	0x10330, 0x1034a,
-	0x10350, 0x1037a,
-	0x10380, 0x1039d,
-	0x1039f, 0x103c3,
-	0x103c8, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x1056f, 0x1056f,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10857, 0x1089e,
-	0x108a7, 0x108af,
-	0x10900, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a9f,
-	0x10ac0, 0x10ae6,
-	0x10aeb, 0x10af6,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b91,
-	0x10b99, 0x10b9c,
-	0x10ba9, 0x10baf,
-	0x10c00, 0x10c48,
-	0x10e60, 0x10e7e,
-	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-	0x1107f, 0x110c1,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x11143,
-	0x11150, 0x11176,
-	0x11180, 0x111c8,
-	0x111cd, 0x111cd,
-	0x111d0, 0x111da,
-	0x111e1, 0x111f4,
-	0x11200, 0x11211,
-	0x11213, 0x1123d,
-	0x112b0, 0x112ea,
-	0x112f0, 0x112f9,
-	0x11301, 0x11303,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133c, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134d,
-	0x11357, 0x11357,
-	0x1135d, 0x11363,
-	0x11366, 0x1136c,
-	0x11370, 0x11374,
-	0x11480, 0x114c7,
-	0x114d0, 0x114d9,
-	0x11580, 0x115b5,
-	0x115b8, 0x115c9,
-	0x11600, 0x11644,
-	0x11650, 0x11659,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x118a0, 0x118f2,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x12000, 0x12398,
-	0x12400, 0x1246e,
-	0x12470, 0x12474,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16a60, 0x16a69,
-	0x16a6e, 0x16a6f,
-	0x16ad0, 0x16aed,
-	0x16af0, 0x16af5,
-	0x16b00, 0x16b45,
-	0x16b50, 0x16b59,
-	0x16b5b, 0x16b61,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	0x1bc9c, 0x1bca3,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d1dd,
-	0x1d200, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1e800, 0x1e8c4,
-	0x1e8c7, 0x1e8d6,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0bf,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0f5,
-	0x1f100, 0x1f10c,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f32c,
-	0x1f330, 0x1f37d,
-	0x1f380, 0x1f3ce,
-	0x1f3d4, 0x1f3f7,
-	0x1f400, 0x1f4fe,
-	0x1f500, 0x1f54a,
-	0x1f550, 0x1f579,
-	0x1f57b, 0x1f5a3,
-	0x1f5a5, 0x1f642,
-	0x1f645, 0x1f6cf,
-	0x1f6e0, 0x1f6ec,
-	0x1f6f0, 0x1f6f3,
-	0x1f700, 0x1f773,
-	0x1f780, 0x1f7d4,
-	0x1f800, 0x1f80b,
-	0x1f810, 0x1f847,
-	0x1f850, 0x1f859,
-	0x1f860, 0x1f887,
-	0x1f890, 0x1f8ad,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xf0000, 0xffffd,
-	0x100000, 0x10fffd,
-}; /* CR_Print */
-
-/* 'Punct': [[:Punct:]] */
-static const OnigCodePoint CR_Punct[] = {
-	155,
-	0x0021, 0x0023,
-	0x0025, 0x002a,
-	0x002c, 0x002f,
-	0x003a, 0x003b,
-	0x003f, 0x0040,
-	0x005b, 0x005d,
-	0x005f, 0x005f,
-	0x007b, 0x007b,
-	0x007d, 0x007d,
-	0x00a1, 0x00a1,
-	0x00a7, 0x00a7,
-	0x00ab, 0x00ab,
-	0x00b6, 0x00b7,
-	0x00bb, 0x00bb,
-	0x00bf, 0x00bf,
-	0x037e, 0x037e,
-	0x0387, 0x0387,
-	0x055a, 0x055f,
-	0x0589, 0x058a,
-	0x05be, 0x05be,
-	0x05c0, 0x05c0,
-	0x05c3, 0x05c3,
-	0x05c6, 0x05c6,
-	0x05f3, 0x05f4,
-	0x0609, 0x060a,
-	0x060c, 0x060d,
-	0x061b, 0x061b,
-	0x061e, 0x061f,
-	0x066a, 0x066d,
-	0x06d4, 0x06d4,
-	0x0700, 0x070d,
-	0x07f7, 0x07f9,
-	0x0830, 0x083e,
-	0x085e, 0x085e,
-	0x0964, 0x0965,
-	0x0970, 0x0970,
-	0x0af0, 0x0af0,
-	0x0df4, 0x0df4,
-	0x0e4f, 0x0e4f,
-	0x0e5a, 0x0e5b,
-	0x0f04, 0x0f12,
-	0x0f14, 0x0f14,
-	0x0f3a, 0x0f3d,
-	0x0f85, 0x0f85,
-	0x0fd0, 0x0fd4,
-	0x0fd9, 0x0fda,
-	0x104a, 0x104f,
-	0x10fb, 0x10fb,
-	0x1360, 0x1368,
-	0x1400, 0x1400,
-	0x166d, 0x166e,
-	0x169b, 0x169c,
-	0x16eb, 0x16ed,
-	0x1735, 0x1736,
-	0x17d4, 0x17d6,
-	0x17d8, 0x17da,
-	0x1800, 0x180a,
-	0x1944, 0x1945,
-	0x1a1e, 0x1a1f,
-	0x1aa0, 0x1aa6,
-	0x1aa8, 0x1aad,
-	0x1b5a, 0x1b60,
-	0x1bfc, 0x1bff,
-	0x1c3b, 0x1c3f,
-	0x1c7e, 0x1c7f,
-	0x1cc0, 0x1cc7,
-	0x1cd3, 0x1cd3,
-	0x2010, 0x2027,
-	0x2030, 0x2043,
-	0x2045, 0x2051,
-	0x2053, 0x205e,
-	0x207d, 0x207e,
-	0x208d, 0x208e,
-	0x2308, 0x230b,
-	0x2329, 0x232a,
-	0x2768, 0x2775,
-	0x27c5, 0x27c6,
-	0x27e6, 0x27ef,
-	0x2983, 0x2998,
-	0x29d8, 0x29db,
-	0x29fc, 0x29fd,
-	0x2cf9, 0x2cfc,
-	0x2cfe, 0x2cff,
-	0x2d70, 0x2d70,
-	0x2e00, 0x2e2e,
-	0x2e30, 0x2e42,
-	0x3001, 0x3003,
-	0x3008, 0x3011,
-	0x3014, 0x301f,
-	0x3030, 0x3030,
-	0x303d, 0x303d,
-	0x30a0, 0x30a0,
-	0x30fb, 0x30fb,
-	0xa4fe, 0xa4ff,
-	0xa60d, 0xa60f,
-	0xa673, 0xa673,
-	0xa67e, 0xa67e,
-	0xa6f2, 0xa6f7,
-	0xa874, 0xa877,
-	0xa8ce, 0xa8cf,
-	0xa8f8, 0xa8fa,
-	0xa92e, 0xa92f,
-	0xa95f, 0xa95f,
-	0xa9c1, 0xa9cd,
-	0xa9de, 0xa9df,
-	0xaa5c, 0xaa5f,
-	0xaade, 0xaadf,
-	0xaaf0, 0xaaf1,
-	0xabeb, 0xabeb,
-	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, 0x10102,
-	0x1039f, 0x1039f,
-	0x103d0, 0x103d0,
-	0x1056f, 0x1056f,
-	0x10857, 0x10857,
-	0x1091f, 0x1091f,
-	0x1093f, 0x1093f,
-	0x10a50, 0x10a58,
-	0x10a7f, 0x10a7f,
-	0x10af0, 0x10af6,
-	0x10b39, 0x10b3f,
-	0x10b99, 0x10b9c,
-	0x11047, 0x1104d,
-	0x110bb, 0x110bc,
-	0x110be, 0x110c1,
-	0x11140, 0x11143,
-	0x11174, 0x11175,
-	0x111c5, 0x111c8,
-	0x111cd, 0x111cd,
-	0x11238, 0x1123d,
-	0x114c6, 0x114c6,
-	0x115c1, 0x115c9,
-	0x11641, 0x11643,
-	0x12470, 0x12474,
-	0x16a6e, 0x16a6f,
-	0x16af5, 0x16af5,
-	0x16b37, 0x16b3b,
-	0x16b44, 0x16b44,
-	0x1bc9f, 0x1bc9f,
-}; /* CR_Punct */
-
-/* 'Space': [[:Space:]] */
-static const OnigCodePoint CR_Space[] = {
-	10,
-	0x0009, 0x000d,
-	0x0020, 0x0020,
-	0x0085, 0x0085,
-	0x00a0, 0x00a0,
-	0x1680, 0x1680,
-	0x2000, 0x200a,
-	0x2028, 0x2029,
-	0x202f, 0x202f,
-	0x205f, 0x205f,
-	0x3000, 0x3000,
-}; /* CR_Space */
-
-/* 'Upper': [[:Upper:]] */
-static const OnigCodePoint CR_Upper[] = {
-	627,
-	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,
-	0x0243, 0x0246,
-	0x0248, 0x0248,
-	0x024a, 0x024a,
-	0x024c, 0x024c,
-	0x024e, 0x024e,
-	0x0370, 0x0370,
-	0x0372, 0x0372,
-	0x0376, 0x0376,
-	0x037f, 0x037f,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x038f,
-	0x0391, 0x03a1,
-	0x03a3, 0x03ab,
-	0x03cf, 0x03cf,
-	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,
-	0x04fa, 0x04fa,
-	0x04fc, 0x04fc,
-	0x04fe, 0x04fe,
-	0x0500, 0x0500,
-	0x0502, 0x0502,
-	0x0504, 0x0504,
-	0x0506, 0x0506,
-	0x0508, 0x0508,
-	0x050a, 0x050a,
-	0x050c, 0x050c,
-	0x050e, 0x050e,
-	0x0510, 0x0510,
-	0x0512, 0x0512,
-	0x0514, 0x0514,
-	0x0516, 0x0516,
-	0x0518, 0x0518,
-	0x051a, 0x051a,
-	0x051c, 0x051c,
-	0x051e, 0x051e,
-	0x0520, 0x0520,
-	0x0522, 0x0522,
-	0x0524, 0x0524,
-	0x0526, 0x0526,
-	0x0528, 0x0528,
-	0x052a, 0x052a,
-	0x052c, 0x052c,
-	0x052e, 0x052e,
-	0x0531, 0x0556,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	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,
-	0x1e9e, 0x1e9e,
-	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,
-	0x1efa, 0x1efa,
-	0x1efc, 0x1efc,
-	0x1efe, 0x1efe,
-	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, 0x2133,
-	0x213e, 0x213f,
-	0x2145, 0x2145,
-	0x2160, 0x216f,
-	0x2183, 0x2183,
-	0x24b6, 0x24cf,
-	0x2c00, 0x2c2e,
-	0x2c60, 0x2c60,
-	0x2c62, 0x2c64,
-	0x2c67, 0x2c67,
-	0x2c69, 0x2c69,
-	0x2c6b, 0x2c6b,
-	0x2c6d, 0x2c70,
-	0x2c72, 0x2c72,
-	0x2c75, 0x2c75,
-	0x2c7e, 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,
-	0x2ceb, 0x2ceb,
-	0x2ced, 0x2ced,
-	0x2cf2, 0x2cf2,
-	0xa640, 0xa640,
-	0xa642, 0xa642,
-	0xa644, 0xa644,
-	0xa646, 0xa646,
-	0xa648, 0xa648,
-	0xa64a, 0xa64a,
-	0xa64c, 0xa64c,
-	0xa64e, 0xa64e,
-	0xa650, 0xa650,
-	0xa652, 0xa652,
-	0xa654, 0xa654,
-	0xa656, 0xa656,
-	0xa658, 0xa658,
-	0xa65a, 0xa65a,
-	0xa65c, 0xa65c,
-	0xa65e, 0xa65e,
-	0xa660, 0xa660,
-	0xa662, 0xa662,
-	0xa664, 0xa664,
-	0xa666, 0xa666,
-	0xa668, 0xa668,
-	0xa66a, 0xa66a,
-	0xa66c, 0xa66c,
-	0xa680, 0xa680,
-	0xa682, 0xa682,
-	0xa684, 0xa684,
-	0xa686, 0xa686,
-	0xa688, 0xa688,
-	0xa68a, 0xa68a,
-	0xa68c, 0xa68c,
-	0xa68e, 0xa68e,
-	0xa690, 0xa690,
-	0xa692, 0xa692,
-	0xa694, 0xa694,
-	0xa696, 0xa696,
-	0xa698, 0xa698,
-	0xa69a, 0xa69a,
-	0xa722, 0xa722,
-	0xa724, 0xa724,
-	0xa726, 0xa726,
-	0xa728, 0xa728,
-	0xa72a, 0xa72a,
-	0xa72c, 0xa72c,
-	0xa72e, 0xa72e,
-	0xa732, 0xa732,
-	0xa734, 0xa734,
-	0xa736, 0xa736,
-	0xa738, 0xa738,
-	0xa73a, 0xa73a,
-	0xa73c, 0xa73c,
-	0xa73e, 0xa73e,
-	0xa740, 0xa740,
-	0xa742, 0xa742,
-	0xa744, 0xa744,
-	0xa746, 0xa746,
-	0xa748, 0xa748,
-	0xa74a, 0xa74a,
-	0xa74c, 0xa74c,
-	0xa74e, 0xa74e,
-	0xa750, 0xa750,
-	0xa752, 0xa752,
-	0xa754, 0xa754,
-	0xa756, 0xa756,
-	0xa758, 0xa758,
-	0xa75a, 0xa75a,
-	0xa75c, 0xa75c,
-	0xa75e, 0xa75e,
-	0xa760, 0xa760,
-	0xa762, 0xa762,
-	0xa764, 0xa764,
-	0xa766, 0xa766,
-	0xa768, 0xa768,
-	0xa76a, 0xa76a,
-	0xa76c, 0xa76c,
-	0xa76e, 0xa76e,
-	0xa779, 0xa779,
-	0xa77b, 0xa77b,
-	0xa77d, 0xa77e,
-	0xa780, 0xa780,
-	0xa782, 0xa782,
-	0xa784, 0xa784,
-	0xa786, 0xa786,
-	0xa78b, 0xa78b,
-	0xa78d, 0xa78d,
-	0xa790, 0xa790,
-	0xa792, 0xa792,
-	0xa796, 0xa796,
-	0xa798, 0xa798,
-	0xa79a, 0xa79a,
-	0xa79c, 0xa79c,
-	0xa79e, 0xa79e,
-	0xa7a0, 0xa7a0,
-	0xa7a2, 0xa7a2,
-	0xa7a4, 0xa7a4,
-	0xa7a6, 0xa7a6,
-	0xa7a8, 0xa7a8,
-	0xa7aa, 0xa7ad,
-	0xa7b0, 0xa7b1,
-	0xff21, 0xff3a,
-	0x10400, 0x10427,
-	0x118a0, 0x118bf,
-	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,
-	0x1d7ca, 0x1d7ca,
-	0x1f130, 0x1f149,
-	0x1f150, 0x1f169,
-	0x1f170, 0x1f189,
-}; /* 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[] = {
-	629,
-	0x0030, 0x0039,
-	0x0041, 0x005a,
-	0x005f, 0x005f,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00b5, 0x00b5,
-	0x00ba, 0x00ba,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x02c1,
-	0x02c6, 0x02d1,
-	0x02e0, 0x02e4,
-	0x02ec, 0x02ec,
-	0x02ee, 0x02ee,
-	0x0300, 0x0374,
-	0x0376, 0x0377,
-	0x037a, 0x037d,
-	0x037f, 0x037f,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x0483, 0x052f,
-	0x0531, 0x0556,
-	0x0559, 0x0559,
-	0x0561, 0x0587,
-	0x0591, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0610, 0x061a,
-	0x0620, 0x0669,
-	0x066e, 0x06d3,
-	0x06d5, 0x06dc,
-	0x06df, 0x06e8,
-	0x06ea, 0x06fc,
-	0x06ff, 0x06ff,
-	0x0710, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07f5,
-	0x07fa, 0x07fa,
-	0x0800, 0x082d,
-	0x0840, 0x085b,
-	0x08a0, 0x08b2,
-	0x08e4, 0x0963,
-	0x0966, 0x096f,
-	0x0971, 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,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bef,
-	0x0c00, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c81, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d01, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d6f,
-	0x0d7a, 0x0d7f,
-	0x0d82, 0x0d83,
-	0x0d85, 0x0d96,
-	0x0d9a, 0x0db1,
-	0x0db3, 0x0dbb,
-	0x0dbd, 0x0dbd,
-	0x0dc0, 0x0dc6,
-	0x0dca, 0x0dca,
-	0x0dcf, 0x0dd4,
-	0x0dd6, 0x0dd6,
-	0x0dd8, 0x0ddf,
-	0x0de6, 0x0def,
-	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, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f18, 0x0f19,
-	0x0f20, 0x0f29,
-	0x0f35, 0x0f35,
-	0x0f37, 0x0f37,
-	0x0f39, 0x0f39,
-	0x0f3e, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f84,
-	0x0f86, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fc6, 0x0fc6,
-	0x1000, 0x1049,
-	0x1050, 0x109d,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 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,
-	0x135d, 0x135f,
-	0x1380, 0x138f,
-	0x13a0, 0x13f4,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f8,
-	0x1700, 0x170c,
-	0x170e, 0x1714,
-	0x1720, 0x1734,
-	0x1740, 0x1753,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-	0x1780, 0x17d3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dd,
-	0x17e0, 0x17e9,
-	0x180b, 0x180d,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191e,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1946, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19d9,
-	0x1a00, 0x1a1b,
-	0x1a20, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa7, 0x1aa7,
-	0x1ab0, 0x1abe,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b59,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1bf3,
-	0x1c00, 0x1c37,
-	0x1c40, 0x1c49,
-	0x1c4d, 0x1c7d,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1cf6,
-	0x1cf8, 0x1cf9,
-	0x1d00, 0x1df5,
-	0x1dfc, 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,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 0x209c,
-	0x20d0, 0x20f0,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2119, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x212d,
-	0x212f, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2160, 0x2188,
-	0x24b6, 0x24e9,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2ce4,
-	0x2ceb, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d6f,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2dff,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3007,
-	0x3021, 0x302f,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x3099, 0x309a,
-	0x309d, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa62b,
-	0xa640, 0xa672,
-	0xa674, 0xa67d,
-	0xa67f, 0xa69d,
-	0xa69f, 0xa6f1,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa7ad,
-	0xa7b0, 0xa7b1,
-	0xa7f7, 0xa827,
-	0xa840, 0xa873,
-	0xa880, 0xa8c4,
-	0xa8d0, 0xa8d9,
-	0xa8e0, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa900, 0xa92d,
-	0xa930, 0xa953,
-	0xa960, 0xa97c,
-	0xa980, 0xa9c0,
-	0xa9cf, 0xa9d9,
-	0xa9e0, 0xa9fe,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa60, 0xaa76,
-	0xaa7a, 0xaac2,
-	0xaadb, 0xaadd,
-	0xaae0, 0xaaef,
-	0xaaf2, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xab30, 0xab5a,
-	0xab5c, 0xab5f,
-	0xab64, 0xab65,
-	0xabc0, 0xabea,
-	0xabec, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa6d,
-	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, 0xfe2d,
-	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,
-	0x10140, 0x10174,
-	0x101fd, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x102e0, 0x102e0,
-	0x10300, 0x1031f,
-	0x10330, 0x1034a,
-	0x10350, 0x1037a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10860, 0x10876,
-	0x10880, 0x1089e,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x10a60, 0x10a7c,
-	0x10a80, 0x10a9c,
-	0x10ac0, 0x10ac7,
-	0x10ac9, 0x10ae6,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10b80, 0x10b91,
-	0x10c00, 0x10c48,
-	0x11000, 0x11046,
-	0x11066, 0x1106f,
-	0x1107f, 0x110ba,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x1113f,
-	0x11150, 0x11173,
-	0x11176, 0x11176,
-	0x11180, 0x111c4,
-	0x111d0, 0x111da,
-	0x11200, 0x11211,
-	0x11213, 0x11237,
-	0x112b0, 0x112ea,
-	0x112f0, 0x112f9,
-	0x11301, 0x11303,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133c, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134d,
-	0x11357, 0x11357,
-	0x1135d, 0x11363,
-	0x11366, 0x1136c,
-	0x11370, 0x11374,
-	0x11480, 0x114c5,
-	0x114c7, 0x114c7,
-	0x114d0, 0x114d9,
-	0x11580, 0x115b5,
-	0x115b8, 0x115c0,
-	0x11600, 0x11640,
-	0x11644, 0x11644,
-	0x11650, 0x11659,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x118a0, 0x118e9,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x12000, 0x12398,
-	0x12400, 0x1246e,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16a60, 0x16a69,
-	0x16ad0, 0x16aed,
-	0x16af0, 0x16af4,
-	0x16b00, 0x16b36,
-	0x16b40, 0x16b43,
-	0x16b50, 0x16b59,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	0x1bc9d, 0x1bc9e,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1e800, 0x1e8c4,
-	0x1e8d0, 0x1e8d6,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1f130, 0x1f149,
-	0x1f150, 0x1f169,
-	0x1f170, 0x1f189,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0xe0100, 0xe01ef,
-}; /* CR_Word */
-
-/* 'Alnum': [[:Alnum:]] */
-static const OnigCodePoint CR_Alnum[] = {
-	630,
-	0x0030, 0x0039,
-	0x0041, 0x005a,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00b5, 0x00b5,
-	0x00ba, 0x00ba,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x02c1,
-	0x02c6, 0x02d1,
-	0x02e0, 0x02e4,
-	0x02ec, 0x02ec,
-	0x02ee, 0x02ee,
-	0x0345, 0x0345,
-	0x0370, 0x0374,
-	0x0376, 0x0377,
-	0x037a, 0x037d,
-	0x037f, 0x037f,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x048a, 0x052f,
-	0x0531, 0x0556,
-	0x0559, 0x0559,
-	0x0561, 0x0587,
-	0x05b0, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0610, 0x061a,
-	0x0620, 0x0657,
-	0x0659, 0x0669,
-	0x066e, 0x06d3,
-	0x06d5, 0x06dc,
-	0x06e1, 0x06e8,
-	0x06ed, 0x06fc,
-	0x06ff, 0x06ff,
-	0x0710, 0x073f,
-	0x074d, 0x07b1,
-	0x07c0, 0x07ea,
-	0x07f4, 0x07f5,
-	0x07fa, 0x07fa,
-	0x0800, 0x0817,
-	0x081a, 0x082c,
-	0x0840, 0x0858,
-	0x08a0, 0x08b2,
-	0x08e4, 0x08e9,
-	0x08f0, 0x093b,
-	0x093d, 0x094c,
-	0x094e, 0x0950,
-	0x0955, 0x0963,
-	0x0966, 0x096f,
-	0x0971, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bd, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cc,
-	0x09ce, 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,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4c,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	0x0a81, 0x0a83,
-	0x0a85, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abd, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acc,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae3,
-	0x0ae6, 0x0aef,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3d, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4c,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	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, 0x0bcc,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bef,
-	0x0c00, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4c,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c81, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbd, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccc,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d01, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4c,
-	0x0d4e, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d6f,
-	0x0d7a, 0x0d7f,
-	0x0d82, 0x0d83,
-	0x0d85, 0x0d96,
-	0x0d9a, 0x0db1,
-	0x0db3, 0x0dbb,
-	0x0dbd, 0x0dbd,
-	0x0dc0, 0x0dc6,
-	0x0dcf, 0x0dd4,
-	0x0dd6, 0x0dd6,
-	0x0dd8, 0x0ddf,
-	0x0de6, 0x0def,
-	0x0df2, 0x0df3,
-	0x0e01, 0x0e3a,
-	0x0e40, 0x0e46,
-	0x0e4d, 0x0e4d,
-	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,
-	0x0ecd, 0x0ecd,
-	0x0ed0, 0x0ed9,
-	0x0edc, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f20, 0x0f29,
-	0x0f40, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f81,
-	0x0f88, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x1000, 0x1036,
-	0x1038, 0x1038,
-	0x103b, 0x1049,
-	0x1050, 0x1062,
-	0x1065, 0x1068,
-	0x106e, 0x1086,
-	0x108e, 0x108e,
-	0x1090, 0x1099,
-	0x109c, 0x109d,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 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, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f8,
-	0x1700, 0x170c,
-	0x170e, 0x1713,
-	0x1720, 0x1733,
-	0x1740, 0x1753,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-	0x1780, 0x17b3,
-	0x17b6, 0x17c8,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dc,
-	0x17e0, 0x17e9,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191e,
-	0x1920, 0x192b,
-	0x1930, 0x1938,
-	0x1946, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19d9,
-	0x1a00, 0x1a1b,
-	0x1a20, 0x1a5e,
-	0x1a61, 0x1a74,
-	0x1a80, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa7, 0x1aa7,
-	0x1b00, 0x1b33,
-	0x1b35, 0x1b43,
-	0x1b45, 0x1b4b,
-	0x1b50, 0x1b59,
-	0x1b80, 0x1ba9,
-	0x1bac, 0x1be5,
-	0x1be7, 0x1bf1,
-	0x1c00, 0x1c35,
-	0x1c40, 0x1c49,
-	0x1c4d, 0x1c7d,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf3,
-	0x1cf5, 0x1cf6,
-	0x1d00, 0x1dbf,
-	0x1de7, 0x1df4,
-	0x1e00, 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, 0x209c,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2119, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x212d,
-	0x212f, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2160, 0x2188,
-	0x24b6, 0x24e9,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2ce4,
-	0x2ceb, 0x2cee,
-	0x2cf2, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2dff,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3007,
-	0x3021, 0x3029,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x309d, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa62b,
-	0xa640, 0xa66e,
-	0xa674, 0xa67b,
-	0xa67f, 0xa69d,
-	0xa69f, 0xa6ef,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa7ad,
-	0xa7b0, 0xa7b1,
-	0xa7f7, 0xa801,
-	0xa803, 0xa805,
-	0xa807, 0xa80a,
-	0xa80c, 0xa827,
-	0xa840, 0xa873,
-	0xa880, 0xa8c3,
-	0xa8d0, 0xa8d9,
-	0xa8f2, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa900, 0xa92a,
-	0xa930, 0xa952,
-	0xa960, 0xa97c,
-	0xa980, 0xa9b2,
-	0xa9b4, 0xa9bf,
-	0xa9cf, 0xa9d9,
-	0xa9e0, 0xa9e4,
-	0xa9e6, 0xa9fe,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa60, 0xaa76,
-	0xaa7a, 0xaa7a,
-	0xaa7e, 0xaabe,
-	0xaac0, 0xaac0,
-	0xaac2, 0xaac2,
-	0xaadb, 0xaadd,
-	0xaae0, 0xaaef,
-	0xaaf2, 0xaaf5,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xab30, 0xab5a,
-	0xab5c, 0xab5f,
-	0xab64, 0xab65,
-	0xabc0, 0xabea,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa6d,
-	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,
-	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,
-	0x10140, 0x10174,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031f,
-	0x10330, 0x1034a,
-	0x10350, 0x1037a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10860, 0x10876,
-	0x10880, 0x1089e,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10a80, 0x10a9c,
-	0x10ac0, 0x10ac7,
-	0x10ac9, 0x10ae4,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10b80, 0x10b91,
-	0x10c00, 0x10c48,
-	0x11000, 0x11045,
-	0x11066, 0x1106f,
-	0x11082, 0x110b8,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11132,
-	0x11136, 0x1113f,
-	0x11150, 0x11172,
-	0x11176, 0x11176,
-	0x11180, 0x111bf,
-	0x111c1, 0x111c4,
-	0x111d0, 0x111da,
-	0x11200, 0x11211,
-	0x11213, 0x11234,
-	0x11237, 0x11237,
-	0x112b0, 0x112e8,
-	0x112f0, 0x112f9,
-	0x11301, 0x11303,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133d, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134c,
-	0x11357, 0x11357,
-	0x1135d, 0x11363,
-	0x11480, 0x114c1,
-	0x114c4, 0x114c5,
-	0x114c7, 0x114c7,
-	0x114d0, 0x114d9,
-	0x11580, 0x115b5,
-	0x115b8, 0x115be,
-	0x11600, 0x1163e,
-	0x11640, 0x11640,
-	0x11644, 0x11644,
-	0x11650, 0x11659,
-	0x11680, 0x116b5,
-	0x116c0, 0x116c9,
-	0x118a0, 0x118e9,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x12000, 0x12398,
-	0x12400, 0x1246e,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16a60, 0x16a69,
-	0x16ad0, 0x16aed,
-	0x16b00, 0x16b36,
-	0x16b40, 0x16b43,
-	0x16b50, 0x16b59,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f93, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	0x1bc9e, 0x1bc9e,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1e800, 0x1e8c4,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1f130, 0x1f149,
-	0x1f150, 0x1f169,
-	0x1f170, 0x1f189,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* 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[] = {
-	600,
-	0x0000, 0x0377,
-	0x037a, 0x037f,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x052f,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x058d, 0x058f,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x061c,
-	0x061e, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-	0x0840, 0x085b,
-	0x085e, 0x085e,
-	0x08a0, 0x08b2,
-	0x08e4, 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, 0x09fb,
-	0x0a01, 0x0a03,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0af1,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3c, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	0x0b66, 0x0b77,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bfa,
-	0x0c00, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-	0x0c81, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d01, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
-	0x0d82, 0x0d83,
-	0x0d85, 0x0d96,
-	0x0d9a, 0x0db1,
-	0x0db3, 0x0dbb,
-	0x0dbd, 0x0dbd,
-	0x0dc0, 0x0dc6,
-	0x0dca, 0x0dca,
-	0x0dcf, 0x0dd4,
-	0x0dd6, 0x0dd6,
-	0x0dd8, 0x0ddf,
-	0x0de6, 0x0def,
-	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, 0x0edf,
-	0x0f00, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fda,
-	0x1000, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 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,
-	0x135d, 0x137c,
-	0x1380, 0x1399,
-	0x13a0, 0x13f4,
-	0x1400, 0x169c,
-	0x16a0, 0x16f8,
-	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, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191e,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a1b,
-	0x1a1e, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-	0x1ab0, 0x1abe,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1bf3,
-	0x1bfc, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cc0, 0x1cc7,
-	0x1cd0, 0x1cf6,
-	0x1cf8, 0x1cf9,
-	0x1d00, 0x1df5,
-	0x1dfc, 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, 0x2064,
-	0x2066, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x209c,
-	0x20a0, 0x20bd,
-	0x20d0, 0x20f0,
-	0x2100, 0x2189,
-	0x2190, 0x23fa,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x2b73,
-	0x2b76, 0x2b95,
-	0x2b98, 0x2bb9,
-	0x2bbd, 0x2bc8,
-	0x2bca, 0x2bd1,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf3,
-	0x2cf9, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d70,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2e42,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa69d,
-	0xa69f, 0xa6f7,
-	0xa700, 0xa78e,
-	0xa790, 0xa7ad,
-	0xa7b0, 0xa7b1,
-	0xa7f7, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-	0xa8e0, 0xa8fb,
-	0xa900, 0xa953,
-	0xa95f, 0xa97c,
-	0xa980, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9fe,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaac2,
-	0xaadb, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xab30, 0xab5f,
-	0xab64, 0xab65,
-	0xabc0, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xd800, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbc1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe2d,
-	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, 0x1018c,
-	0x10190, 0x1019b,
-	0x101a0, 0x101a0,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x102e0, 0x102fb,
-	0x10300, 0x10323,
-	0x10330, 0x1034a,
-	0x10350, 0x1037a,
-	0x10380, 0x1039d,
-	0x1039f, 0x103c3,
-	0x103c8, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x1056f, 0x1056f,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10857, 0x1089e,
-	0x108a7, 0x108af,
-	0x10900, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a9f,
-	0x10ac0, 0x10ae6,
-	0x10aeb, 0x10af6,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b91,
-	0x10b99, 0x10b9c,
-	0x10ba9, 0x10baf,
-	0x10c00, 0x10c48,
-	0x10e60, 0x10e7e,
-	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-	0x1107f, 0x110c1,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x11143,
-	0x11150, 0x11176,
-	0x11180, 0x111c8,
-	0x111cd, 0x111cd,
-	0x111d0, 0x111da,
-	0x111e1, 0x111f4,
-	0x11200, 0x11211,
-	0x11213, 0x1123d,
-	0x112b0, 0x112ea,
-	0x112f0, 0x112f9,
-	0x11301, 0x11303,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133c, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134d,
-	0x11357, 0x11357,
-	0x1135d, 0x11363,
-	0x11366, 0x1136c,
-	0x11370, 0x11374,
-	0x11480, 0x114c7,
-	0x114d0, 0x114d9,
-	0x11580, 0x115b5,
-	0x115b8, 0x115c9,
-	0x11600, 0x11644,
-	0x11650, 0x11659,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x118a0, 0x118f2,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x12000, 0x12398,
-	0x12400, 0x1246e,
-	0x12470, 0x12474,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16a60, 0x16a69,
-	0x16a6e, 0x16a6f,
-	0x16ad0, 0x16aed,
-	0x16af0, 0x16af5,
-	0x16b00, 0x16b45,
-	0x16b50, 0x16b59,
-	0x16b5b, 0x16b61,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	0x1bc9c, 0x1bca3,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d1dd,
-	0x1d200, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1e800, 0x1e8c4,
-	0x1e8c7, 0x1e8d6,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0bf,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0f5,
-	0x1f100, 0x1f10c,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f32c,
-	0x1f330, 0x1f37d,
-	0x1f380, 0x1f3ce,
-	0x1f3d4, 0x1f3f7,
-	0x1f400, 0x1f4fe,
-	0x1f500, 0x1f54a,
-	0x1f550, 0x1f579,
-	0x1f57b, 0x1f5a3,
-	0x1f5a5, 0x1f642,
-	0x1f645, 0x1f6cf,
-	0x1f6e0, 0x1f6ec,
-	0x1f6f0, 0x1f6f3,
-	0x1f700, 0x1f773,
-	0x1f780, 0x1f7d4,
-	0x1f800, 0x1f80b,
-	0x1f810, 0x1f847,
-	0x1f850, 0x1f859,
-	0x1f860, 0x1f887,
-	0x1f890, 0x1f8ad,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xf0000, 0xffffd,
-	0x100000, 0x10fffd,
-}; /* CR_Assigned */
-
-/* 'C': Major Category */
-static const OnigCodePoint CR_C[] = {
-	603,
-	0x0000, 0x001f,
-	0x007f, 0x009f,
-	0x00ad, 0x00ad,
-	0x0378, 0x0379,
-	0x0380, 0x0383,
-	0x038b, 0x038b,
-	0x038d, 0x038d,
-	0x03a2, 0x03a2,
-	0x0530, 0x0530,
-	0x0557, 0x0558,
-	0x0560, 0x0560,
-	0x0588, 0x0588,
-	0x058b, 0x058c,
-	0x0590, 0x0590,
-	0x05c8, 0x05cf,
-	0x05eb, 0x05ef,
-	0x05f5, 0x0605,
-	0x061c, 0x061d,
-	0x06dd, 0x06dd,
-	0x070e, 0x070f,
-	0x074b, 0x074c,
-	0x07b2, 0x07bf,
-	0x07fb, 0x07ff,
-	0x082e, 0x082f,
-	0x083f, 0x083f,
-	0x085c, 0x085d,
-	0x085f, 0x089f,
-	0x08b3, 0x08e3,
-	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,
-	0x09fc, 0x0a00,
-	0x0a04, 0x0a04,
-	0x0a0b, 0x0a0e,
-	0x0a11, 0x0a12,
-	0x0a29, 0x0a29,
-	0x0a31, 0x0a31,
-	0x0a34, 0x0a34,
-	0x0a37, 0x0a37,
-	0x0a3a, 0x0a3b,
-	0x0a3d, 0x0a3d,
-	0x0a43, 0x0a46,
-	0x0a49, 0x0a4a,
-	0x0a4e, 0x0a50,
-	0x0a52, 0x0a58,
-	0x0a5d, 0x0a5d,
-	0x0a5f, 0x0a65,
-	0x0a76, 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,
-	0x0af2, 0x0b00,
-	0x0b04, 0x0b04,
-	0x0b0d, 0x0b0e,
-	0x0b11, 0x0b12,
-	0x0b29, 0x0b29,
-	0x0b31, 0x0b31,
-	0x0b34, 0x0b34,
-	0x0b3a, 0x0b3b,
-	0x0b45, 0x0b46,
-	0x0b49, 0x0b4a,
-	0x0b4e, 0x0b55,
-	0x0b58, 0x0b5b,
-	0x0b5e, 0x0b5e,
-	0x0b64, 0x0b65,
-	0x0b78, 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, 0x0bcf,
-	0x0bd1, 0x0bd6,
-	0x0bd8, 0x0be5,
-	0x0bfb, 0x0bff,
-	0x0c04, 0x0c04,
-	0x0c0d, 0x0c0d,
-	0x0c11, 0x0c11,
-	0x0c29, 0x0c29,
-	0x0c3a, 0x0c3c,
-	0x0c45, 0x0c45,
-	0x0c49, 0x0c49,
-	0x0c4e, 0x0c54,
-	0x0c57, 0x0c57,
-	0x0c5a, 0x0c5f,
-	0x0c64, 0x0c65,
-	0x0c70, 0x0c77,
-	0x0c80, 0x0c80,
-	0x0c84, 0x0c84,
-	0x0c8d, 0x0c8d,
-	0x0c91, 0x0c91,
-	0x0ca9, 0x0ca9,
-	0x0cb4, 0x0cb4,
-	0x0cba, 0x0cbb,
-	0x0cc5, 0x0cc5,
-	0x0cc9, 0x0cc9,
-	0x0cce, 0x0cd4,
-	0x0cd7, 0x0cdd,
-	0x0cdf, 0x0cdf,
-	0x0ce4, 0x0ce5,
-	0x0cf0, 0x0cf0,
-	0x0cf3, 0x0d00,
-	0x0d04, 0x0d04,
-	0x0d0d, 0x0d0d,
-	0x0d11, 0x0d11,
-	0x0d3b, 0x0d3c,
-	0x0d45, 0x0d45,
-	0x0d49, 0x0d49,
-	0x0d4f, 0x0d56,
-	0x0d58, 0x0d5f,
-	0x0d64, 0x0d65,
-	0x0d76, 0x0d78,
-	0x0d80, 0x0d81,
-	0x0d84, 0x0d84,
-	0x0d97, 0x0d99,
-	0x0db2, 0x0db2,
-	0x0dbc, 0x0dbc,
-	0x0dbe, 0x0dbf,
-	0x0dc7, 0x0dc9,
-	0x0dcb, 0x0dce,
-	0x0dd5, 0x0dd5,
-	0x0dd7, 0x0dd7,
-	0x0de0, 0x0de5,
-	0x0df0, 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,
-	0x0ee0, 0x0eff,
-	0x0f48, 0x0f48,
-	0x0f6d, 0x0f70,
-	0x0f98, 0x0f98,
-	0x0fbd, 0x0fbd,
-	0x0fcd, 0x0fcd,
-	0x0fdb, 0x0fff,
-	0x10c6, 0x10c6,
-	0x10c8, 0x10cc,
-	0x10ce, 0x10cf,
-	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, 0x135c,
-	0x137d, 0x137f,
-	0x139a, 0x139f,
-	0x13f5, 0x13ff,
-	0x169d, 0x169f,
-	0x16f9, 0x16ff,
-	0x170d, 0x170d,
-	0x1715, 0x171f,
-	0x1737, 0x173f,
-	0x1754, 0x175f,
-	0x176d, 0x176d,
-	0x1771, 0x1771,
-	0x1774, 0x177f,
-	0x17de, 0x17df,
-	0x17ea, 0x17ef,
-	0x17fa, 0x17ff,
-	0x180e, 0x180f,
-	0x181a, 0x181f,
-	0x1878, 0x187f,
-	0x18ab, 0x18af,
-	0x18f6, 0x18ff,
-	0x191f, 0x191f,
-	0x192c, 0x192f,
-	0x193c, 0x193f,
-	0x1941, 0x1943,
-	0x196e, 0x196f,
-	0x1975, 0x197f,
-	0x19ac, 0x19af,
-	0x19ca, 0x19cf,
-	0x19db, 0x19dd,
-	0x1a1c, 0x1a1d,
-	0x1a5f, 0x1a5f,
-	0x1a7d, 0x1a7e,
-	0x1a8a, 0x1a8f,
-	0x1a9a, 0x1a9f,
-	0x1aae, 0x1aaf,
-	0x1abf, 0x1aff,
-	0x1b4c, 0x1b4f,
-	0x1b7d, 0x1b7f,
-	0x1bf4, 0x1bfb,
-	0x1c38, 0x1c3a,
-	0x1c4a, 0x1c4c,
-	0x1c80, 0x1cbf,
-	0x1cc8, 0x1ccf,
-	0x1cf7, 0x1cf7,
-	0x1cfa, 0x1cff,
-	0x1df6, 0x1dfb,
-	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,
-	0x209d, 0x209f,
-	0x20be, 0x20cf,
-	0x20f1, 0x20ff,
-	0x218a, 0x218f,
-	0x23fb, 0x23ff,
-	0x2427, 0x243f,
-	0x244b, 0x245f,
-	0x2b74, 0x2b75,
-	0x2b96, 0x2b97,
-	0x2bba, 0x2bbc,
-	0x2bc9, 0x2bc9,
-	0x2bd2, 0x2bff,
-	0x2c2f, 0x2c2f,
-	0x2c5f, 0x2c5f,
-	0x2cf4, 0x2cf8,
-	0x2d26, 0x2d26,
-	0x2d28, 0x2d2c,
-	0x2d2e, 0x2d2f,
-	0x2d68, 0x2d6e,
-	0x2d71, 0x2d7e,
-	0x2d97, 0x2d9f,
-	0x2da7, 0x2da7,
-	0x2daf, 0x2daf,
-	0x2db7, 0x2db7,
-	0x2dbf, 0x2dbf,
-	0x2dc7, 0x2dc7,
-	0x2dcf, 0x2dcf,
-	0x2dd7, 0x2dd7,
-	0x2ddf, 0x2ddf,
-	0x2e43, 0x2e7f,
-	0x2e9a, 0x2e9a,
-	0x2ef4, 0x2eff,
-	0x2fd6, 0x2fef,
-	0x2ffc, 0x2fff,
-	0x3040, 0x3040,
-	0x3097, 0x3098,
-	0x3100, 0x3104,
-	0x312e, 0x3130,
-	0x318f, 0x318f,
-	0x31bb, 0x31bf,
-	0x31e4, 0x31ef,
-	0x321f, 0x321f,
-	0x32ff, 0x32ff,
-	0x4db6, 0x4dbf,
-	0x9fcd, 0x9fff,
-	0xa48d, 0xa48f,
-	0xa4c7, 0xa4cf,
-	0xa62c, 0xa63f,
-	0xa69e, 0xa69e,
-	0xa6f8, 0xa6ff,
-	0xa78f, 0xa78f,
-	0xa7ae, 0xa7af,
-	0xa7b2, 0xa7f6,
-	0xa82c, 0xa82f,
-	0xa83a, 0xa83f,
-	0xa878, 0xa87f,
-	0xa8c5, 0xa8cd,
-	0xa8da, 0xa8df,
-	0xa8fc, 0xa8ff,
-	0xa954, 0xa95e,
-	0xa97d, 0xa97f,
-	0xa9ce, 0xa9ce,
-	0xa9da, 0xa9dd,
-	0xa9ff, 0xa9ff,
-	0xaa37, 0xaa3f,
-	0xaa4e, 0xaa4f,
-	0xaa5a, 0xaa5b,
-	0xaac3, 0xaada,
-	0xaaf7, 0xab00,
-	0xab07, 0xab08,
-	0xab0f, 0xab10,
-	0xab17, 0xab1f,
-	0xab27, 0xab27,
-	0xab2f, 0xab2f,
-	0xab60, 0xab63,
-	0xab66, 0xabbf,
-	0xabee, 0xabef,
-	0xabfa, 0xabff,
-	0xd7a4, 0xd7af,
-	0xd7c7, 0xd7ca,
-	0xd7fc, 0xf8ff,
-	0xfa6e, 0xfa6f,
-	0xfada, 0xfaff,
-	0xfb07, 0xfb12,
-	0xfb18, 0xfb1c,
-	0xfb37, 0xfb37,
-	0xfb3d, 0xfb3d,
-	0xfb3f, 0xfb3f,
-	0xfb42, 0xfb42,
-	0xfb45, 0xfb45,
-	0xfbc2, 0xfbd2,
-	0xfd40, 0xfd4f,
-	0xfd90, 0xfd91,
-	0xfdc8, 0xfdef,
-	0xfdfe, 0xfdff,
-	0xfe1a, 0xfe1f,
-	0xfe2e, 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,
-	0x1018d, 0x1018f,
-	0x1019c, 0x1019f,
-	0x101a1, 0x101cf,
-	0x101fe, 0x1027f,
-	0x1029d, 0x1029f,
-	0x102d1, 0x102df,
-	0x102fc, 0x102ff,
-	0x10324, 0x1032f,
-	0x1034b, 0x1034f,
-	0x1037b, 0x1037f,
-	0x1039e, 0x1039e,
-	0x103c4, 0x103c7,
-	0x103d6, 0x103ff,
-	0x1049e, 0x1049f,
-	0x104aa, 0x104ff,
-	0x10528, 0x1052f,
-	0x10564, 0x1056e,
-	0x10570, 0x105ff,
-	0x10737, 0x1073f,
-	0x10756, 0x1075f,
-	0x10768, 0x107ff,
-	0x10806, 0x10807,
-	0x10809, 0x10809,
-	0x10836, 0x10836,
-	0x10839, 0x1083b,
-	0x1083d, 0x1083e,
-	0x10856, 0x10856,
-	0x1089f, 0x108a6,
-	0x108b0, 0x108ff,
-	0x1091c, 0x1091e,
-	0x1093a, 0x1093e,
-	0x10940, 0x1097f,
-	0x109b8, 0x109bd,
-	0x109c0, 0x109ff,
-	0x10a04, 0x10a04,
-	0x10a07, 0x10a0b,
-	0x10a14, 0x10a14,
-	0x10a18, 0x10a18,
-	0x10a34, 0x10a37,
-	0x10a3b, 0x10a3e,
-	0x10a48, 0x10a4f,
-	0x10a59, 0x10a5f,
-	0x10aa0, 0x10abf,
-	0x10ae7, 0x10aea,
-	0x10af7, 0x10aff,
-	0x10b36, 0x10b38,
-	0x10b56, 0x10b57,
-	0x10b73, 0x10b77,
-	0x10b92, 0x10b98,
-	0x10b9d, 0x10ba8,
-	0x10bb0, 0x10bff,
-	0x10c49, 0x10e5f,
-	0x10e7f, 0x10fff,
-	0x1104e, 0x11051,
-	0x11070, 0x1107e,
-	0x110bd, 0x110bd,
-	0x110c2, 0x110cf,
-	0x110e9, 0x110ef,
-	0x110fa, 0x110ff,
-	0x11135, 0x11135,
-	0x11144, 0x1114f,
-	0x11177, 0x1117f,
-	0x111c9, 0x111cc,
-	0x111ce, 0x111cf,
-	0x111db, 0x111e0,
-	0x111f5, 0x111ff,
-	0x11212, 0x11212,
-	0x1123e, 0x112af,
-	0x112eb, 0x112ef,
-	0x112fa, 0x11300,
-	0x11304, 0x11304,
-	0x1130d, 0x1130e,
-	0x11311, 0x11312,
-	0x11329, 0x11329,
-	0x11331, 0x11331,
-	0x11334, 0x11334,
-	0x1133a, 0x1133b,
-	0x11345, 0x11346,
-	0x11349, 0x1134a,
-	0x1134e, 0x11356,
-	0x11358, 0x1135c,
-	0x11364, 0x11365,
-	0x1136d, 0x1136f,
-	0x11375, 0x1147f,
-	0x114c8, 0x114cf,
-	0x114da, 0x1157f,
-	0x115b6, 0x115b7,
-	0x115ca, 0x115ff,
-	0x11645, 0x1164f,
-	0x1165a, 0x1167f,
-	0x116b8, 0x116bf,
-	0x116ca, 0x1189f,
-	0x118f3, 0x118fe,
-	0x11900, 0x11abf,
-	0x11af9, 0x11fff,
-	0x12399, 0x123ff,
-	0x1246f, 0x1246f,
-	0x12475, 0x12fff,
-	0x1342f, 0x167ff,
-	0x16a39, 0x16a3f,
-	0x16a5f, 0x16a5f,
-	0x16a6a, 0x16a6d,
-	0x16a70, 0x16acf,
-	0x16aee, 0x16aef,
-	0x16af6, 0x16aff,
-	0x16b46, 0x16b4f,
-	0x16b5a, 0x16b5a,
-	0x16b62, 0x16b62,
-	0x16b78, 0x16b7c,
-	0x16b90, 0x16eff,
-	0x16f45, 0x16f4f,
-	0x16f7f, 0x16f8e,
-	0x16fa0, 0x1afff,
-	0x1b002, 0x1bbff,
-	0x1bc6b, 0x1bc6f,
-	0x1bc7d, 0x1bc7f,
-	0x1bc89, 0x1bc8f,
-	0x1bc9a, 0x1bc9b,
-	0x1bca0, 0x1cfff,
-	0x1d0f6, 0x1d0ff,
-	0x1d127, 0x1d128,
-	0x1d173, 0x1d17a,
-	0x1d1de, 0x1d1ff,
-	0x1d246, 0x1d2ff,
-	0x1d357, 0x1d35f,
-	0x1d372, 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,
-	0x1d7cc, 0x1d7cd,
-	0x1d800, 0x1e7ff,
-	0x1e8c5, 0x1e8c6,
-	0x1e8d7, 0x1edff,
-	0x1ee04, 0x1ee04,
-	0x1ee20, 0x1ee20,
-	0x1ee23, 0x1ee23,
-	0x1ee25, 0x1ee26,
-	0x1ee28, 0x1ee28,
-	0x1ee33, 0x1ee33,
-	0x1ee38, 0x1ee38,
-	0x1ee3a, 0x1ee3a,
-	0x1ee3c, 0x1ee41,
-	0x1ee43, 0x1ee46,
-	0x1ee48, 0x1ee48,
-	0x1ee4a, 0x1ee4a,
-	0x1ee4c, 0x1ee4c,
-	0x1ee50, 0x1ee50,
-	0x1ee53, 0x1ee53,
-	0x1ee55, 0x1ee56,
-	0x1ee58, 0x1ee58,
-	0x1ee5a, 0x1ee5a,
-	0x1ee5c, 0x1ee5c,
-	0x1ee5e, 0x1ee5e,
-	0x1ee60, 0x1ee60,
-	0x1ee63, 0x1ee63,
-	0x1ee65, 0x1ee66,
-	0x1ee6b, 0x1ee6b,
-	0x1ee73, 0x1ee73,
-	0x1ee78, 0x1ee78,
-	0x1ee7d, 0x1ee7d,
-	0x1ee7f, 0x1ee7f,
-	0x1ee8a, 0x1ee8a,
-	0x1ee9c, 0x1eea0,
-	0x1eea4, 0x1eea4,
-	0x1eeaa, 0x1eeaa,
-	0x1eebc, 0x1eeef,
-	0x1eef2, 0x1efff,
-	0x1f02c, 0x1f02f,
-	0x1f094, 0x1f09f,
-	0x1f0af, 0x1f0b0,
-	0x1f0c0, 0x1f0c0,
-	0x1f0d0, 0x1f0d0,
-	0x1f0f6, 0x1f0ff,
-	0x1f10d, 0x1f10f,
-	0x1f12f, 0x1f12f,
-	0x1f16c, 0x1f16f,
-	0x1f19b, 0x1f1e5,
-	0x1f203, 0x1f20f,
-	0x1f23b, 0x1f23f,
-	0x1f249, 0x1f24f,
-	0x1f252, 0x1f2ff,
-	0x1f32d, 0x1f32f,
-	0x1f37e, 0x1f37f,
-	0x1f3cf, 0x1f3d3,
-	0x1f3f8, 0x1f3ff,
-	0x1f4ff, 0x1f4ff,
-	0x1f54b, 0x1f54f,
-	0x1f57a, 0x1f57a,
-	0x1f5a4, 0x1f5a4,
-	0x1f643, 0x1f644,
-	0x1f6d0, 0x1f6df,
-	0x1f6ed, 0x1f6ef,
-	0x1f6f4, 0x1f6ff,
-	0x1f774, 0x1f77f,
-	0x1f7d5, 0x1f7ff,
-	0x1f80c, 0x1f80f,
-	0x1f848, 0x1f84f,
-	0x1f85a, 0x1f85f,
-	0x1f888, 0x1f88f,
-	0x1f8ae, 0x1ffff,
-	0x2a6d7, 0x2a6ff,
-	0x2b735, 0x2b73f,
-	0x2b81e, 0x2f7ff,
-	0x2fa1e, 0xe00ff,
-	0xe01f0, 0x10ffff,
-}; /* CR_C */
-
-/* 'Cc': General Category */
-#define CR_Cc CR_Cntrl
-
-/* 'Cf': General Category */
-static const OnigCodePoint CR_Cf[] = {
-	17,
-	0x00ad, 0x00ad,
-	0x0600, 0x0605,
-	0x061c, 0x061c,
-	0x06dd, 0x06dd,
-	0x070f, 0x070f,
-	0x180e, 0x180e,
-	0x200b, 0x200f,
-	0x202a, 0x202e,
-	0x2060, 0x2064,
-	0x2066, 0x206f,
-	0xfeff, 0xfeff,
-	0xfff9, 0xfffb,
-	0x110bd, 0x110bd,
-	0x1bca0, 0x1bca3,
-	0x1d173, 0x1d17a,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-}; /* CR_Cf */
-
-/* 'Cn': General Category */
-static const OnigCodePoint CR_Cn[] = {
-	600,
-	0x0378, 0x0379,
-	0x0380, 0x0383,
-	0x038b, 0x038b,
-	0x038d, 0x038d,
-	0x03a2, 0x03a2,
-	0x0530, 0x0530,
-	0x0557, 0x0558,
-	0x0560, 0x0560,
-	0x0588, 0x0588,
-	0x058b, 0x058c,
-	0x0590, 0x0590,
-	0x05c8, 0x05cf,
-	0x05eb, 0x05ef,
-	0x05f5, 0x05ff,
-	0x061d, 0x061d,
-	0x070e, 0x070e,
-	0x074b, 0x074c,
-	0x07b2, 0x07bf,
-	0x07fb, 0x07ff,
-	0x082e, 0x082f,
-	0x083f, 0x083f,
-	0x085c, 0x085d,
-	0x085f, 0x089f,
-	0x08b3, 0x08e3,
-	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,
-	0x09fc, 0x0a00,
-	0x0a04, 0x0a04,
-	0x0a0b, 0x0a0e,
-	0x0a11, 0x0a12,
-	0x0a29, 0x0a29,
-	0x0a31, 0x0a31,
-	0x0a34, 0x0a34,
-	0x0a37, 0x0a37,
-	0x0a3a, 0x0a3b,
-	0x0a3d, 0x0a3d,
-	0x0a43, 0x0a46,
-	0x0a49, 0x0a4a,
-	0x0a4e, 0x0a50,
-	0x0a52, 0x0a58,
-	0x0a5d, 0x0a5d,
-	0x0a5f, 0x0a65,
-	0x0a76, 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,
-	0x0af2, 0x0b00,
-	0x0b04, 0x0b04,
-	0x0b0d, 0x0b0e,
-	0x0b11, 0x0b12,
-	0x0b29, 0x0b29,
-	0x0b31, 0x0b31,
-	0x0b34, 0x0b34,
-	0x0b3a, 0x0b3b,
-	0x0b45, 0x0b46,
-	0x0b49, 0x0b4a,
-	0x0b4e, 0x0b55,
-	0x0b58, 0x0b5b,
-	0x0b5e, 0x0b5e,
-	0x0b64, 0x0b65,
-	0x0b78, 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, 0x0bcf,
-	0x0bd1, 0x0bd6,
-	0x0bd8, 0x0be5,
-	0x0bfb, 0x0bff,
-	0x0c04, 0x0c04,
-	0x0c0d, 0x0c0d,
-	0x0c11, 0x0c11,
-	0x0c29, 0x0c29,
-	0x0c3a, 0x0c3c,
-	0x0c45, 0x0c45,
-	0x0c49, 0x0c49,
-	0x0c4e, 0x0c54,
-	0x0c57, 0x0c57,
-	0x0c5a, 0x0c5f,
-	0x0c64, 0x0c65,
-	0x0c70, 0x0c77,
-	0x0c80, 0x0c80,
-	0x0c84, 0x0c84,
-	0x0c8d, 0x0c8d,
-	0x0c91, 0x0c91,
-	0x0ca9, 0x0ca9,
-	0x0cb4, 0x0cb4,
-	0x0cba, 0x0cbb,
-	0x0cc5, 0x0cc5,
-	0x0cc9, 0x0cc9,
-	0x0cce, 0x0cd4,
-	0x0cd7, 0x0cdd,
-	0x0cdf, 0x0cdf,
-	0x0ce4, 0x0ce5,
-	0x0cf0, 0x0cf0,
-	0x0cf3, 0x0d00,
-	0x0d04, 0x0d04,
-	0x0d0d, 0x0d0d,
-	0x0d11, 0x0d11,
-	0x0d3b, 0x0d3c,
-	0x0d45, 0x0d45,
-	0x0d49, 0x0d49,
-	0x0d4f, 0x0d56,
-	0x0d58, 0x0d5f,
-	0x0d64, 0x0d65,
-	0x0d76, 0x0d78,
-	0x0d80, 0x0d81,
-	0x0d84, 0x0d84,
-	0x0d97, 0x0d99,
-	0x0db2, 0x0db2,
-	0x0dbc, 0x0dbc,
-	0x0dbe, 0x0dbf,
-	0x0dc7, 0x0dc9,
-	0x0dcb, 0x0dce,
-	0x0dd5, 0x0dd5,
-	0x0dd7, 0x0dd7,
-	0x0de0, 0x0de5,
-	0x0df0, 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,
-	0x0ee0, 0x0eff,
-	0x0f48, 0x0f48,
-	0x0f6d, 0x0f70,
-	0x0f98, 0x0f98,
-	0x0fbd, 0x0fbd,
-	0x0fcd, 0x0fcd,
-	0x0fdb, 0x0fff,
-	0x10c6, 0x10c6,
-	0x10c8, 0x10cc,
-	0x10ce, 0x10cf,
-	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, 0x135c,
-	0x137d, 0x137f,
-	0x139a, 0x139f,
-	0x13f5, 0x13ff,
-	0x169d, 0x169f,
-	0x16f9, 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,
-	0x18ab, 0x18af,
-	0x18f6, 0x18ff,
-	0x191f, 0x191f,
-	0x192c, 0x192f,
-	0x193c, 0x193f,
-	0x1941, 0x1943,
-	0x196e, 0x196f,
-	0x1975, 0x197f,
-	0x19ac, 0x19af,
-	0x19ca, 0x19cf,
-	0x19db, 0x19dd,
-	0x1a1c, 0x1a1d,
-	0x1a5f, 0x1a5f,
-	0x1a7d, 0x1a7e,
-	0x1a8a, 0x1a8f,
-	0x1a9a, 0x1a9f,
-	0x1aae, 0x1aaf,
-	0x1abf, 0x1aff,
-	0x1b4c, 0x1b4f,
-	0x1b7d, 0x1b7f,
-	0x1bf4, 0x1bfb,
-	0x1c38, 0x1c3a,
-	0x1c4a, 0x1c4c,
-	0x1c80, 0x1cbf,
-	0x1cc8, 0x1ccf,
-	0x1cf7, 0x1cf7,
-	0x1cfa, 0x1cff,
-	0x1df6, 0x1dfb,
-	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,
-	0x2065, 0x2065,
-	0x2072, 0x2073,
-	0x208f, 0x208f,
-	0x209d, 0x209f,
-	0x20be, 0x20cf,
-	0x20f1, 0x20ff,
-	0x218a, 0x218f,
-	0x23fb, 0x23ff,
-	0x2427, 0x243f,
-	0x244b, 0x245f,
-	0x2b74, 0x2b75,
-	0x2b96, 0x2b97,
-	0x2bba, 0x2bbc,
-	0x2bc9, 0x2bc9,
-	0x2bd2, 0x2bff,
-	0x2c2f, 0x2c2f,
-	0x2c5f, 0x2c5f,
-	0x2cf4, 0x2cf8,
-	0x2d26, 0x2d26,
-	0x2d28, 0x2d2c,
-	0x2d2e, 0x2d2f,
-	0x2d68, 0x2d6e,
-	0x2d71, 0x2d7e,
-	0x2d97, 0x2d9f,
-	0x2da7, 0x2da7,
-	0x2daf, 0x2daf,
-	0x2db7, 0x2db7,
-	0x2dbf, 0x2dbf,
-	0x2dc7, 0x2dc7,
-	0x2dcf, 0x2dcf,
-	0x2dd7, 0x2dd7,
-	0x2ddf, 0x2ddf,
-	0x2e43, 0x2e7f,
-	0x2e9a, 0x2e9a,
-	0x2ef4, 0x2eff,
-	0x2fd6, 0x2fef,
-	0x2ffc, 0x2fff,
-	0x3040, 0x3040,
-	0x3097, 0x3098,
-	0x3100, 0x3104,
-	0x312e, 0x3130,
-	0x318f, 0x318f,
-	0x31bb, 0x31bf,
-	0x31e4, 0x31ef,
-	0x321f, 0x321f,
-	0x32ff, 0x32ff,
-	0x4db6, 0x4dbf,
-	0x9fcd, 0x9fff,
-	0xa48d, 0xa48f,
-	0xa4c7, 0xa4cf,
-	0xa62c, 0xa63f,
-	0xa69e, 0xa69e,
-	0xa6f8, 0xa6ff,
-	0xa78f, 0xa78f,
-	0xa7ae, 0xa7af,
-	0xa7b2, 0xa7f6,
-	0xa82c, 0xa82f,
-	0xa83a, 0xa83f,
-	0xa878, 0xa87f,
-	0xa8c5, 0xa8cd,
-	0xa8da, 0xa8df,
-	0xa8fc, 0xa8ff,
-	0xa954, 0xa95e,
-	0xa97d, 0xa97f,
-	0xa9ce, 0xa9ce,
-	0xa9da, 0xa9dd,
-	0xa9ff, 0xa9ff,
-	0xaa37, 0xaa3f,
-	0xaa4e, 0xaa4f,
-	0xaa5a, 0xaa5b,
-	0xaac3, 0xaada,
-	0xaaf7, 0xab00,
-	0xab07, 0xab08,
-	0xab0f, 0xab10,
-	0xab17, 0xab1f,
-	0xab27, 0xab27,
-	0xab2f, 0xab2f,
-	0xab60, 0xab63,
-	0xab66, 0xabbf,
-	0xabee, 0xabef,
-	0xabfa, 0xabff,
-	0xd7a4, 0xd7af,
-	0xd7c7, 0xd7ca,
-	0xd7fc, 0xd7ff,
-	0xfa6e, 0xfa6f,
-	0xfada, 0xfaff,
-	0xfb07, 0xfb12,
-	0xfb18, 0xfb1c,
-	0xfb37, 0xfb37,
-	0xfb3d, 0xfb3d,
-	0xfb3f, 0xfb3f,
-	0xfb42, 0xfb42,
-	0xfb45, 0xfb45,
-	0xfbc2, 0xfbd2,
-	0xfd40, 0xfd4f,
-	0xfd90, 0xfd91,
-	0xfdc8, 0xfdef,
-	0xfdfe, 0xfdff,
-	0xfe1a, 0xfe1f,
-	0xfe2e, 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,
-	0x1018d, 0x1018f,
-	0x1019c, 0x1019f,
-	0x101a1, 0x101cf,
-	0x101fe, 0x1027f,
-	0x1029d, 0x1029f,
-	0x102d1, 0x102df,
-	0x102fc, 0x102ff,
-	0x10324, 0x1032f,
-	0x1034b, 0x1034f,
-	0x1037b, 0x1037f,
-	0x1039e, 0x1039e,
-	0x103c4, 0x103c7,
-	0x103d6, 0x103ff,
-	0x1049e, 0x1049f,
-	0x104aa, 0x104ff,
-	0x10528, 0x1052f,
-	0x10564, 0x1056e,
-	0x10570, 0x105ff,
-	0x10737, 0x1073f,
-	0x10756, 0x1075f,
-	0x10768, 0x107ff,
-	0x10806, 0x10807,
-	0x10809, 0x10809,
-	0x10836, 0x10836,
-	0x10839, 0x1083b,
-	0x1083d, 0x1083e,
-	0x10856, 0x10856,
-	0x1089f, 0x108a6,
-	0x108b0, 0x108ff,
-	0x1091c, 0x1091e,
-	0x1093a, 0x1093e,
-	0x10940, 0x1097f,
-	0x109b8, 0x109bd,
-	0x109c0, 0x109ff,
-	0x10a04, 0x10a04,
-	0x10a07, 0x10a0b,
-	0x10a14, 0x10a14,
-	0x10a18, 0x10a18,
-	0x10a34, 0x10a37,
-	0x10a3b, 0x10a3e,
-	0x10a48, 0x10a4f,
-	0x10a59, 0x10a5f,
-	0x10aa0, 0x10abf,
-	0x10ae7, 0x10aea,
-	0x10af7, 0x10aff,
-	0x10b36, 0x10b38,
-	0x10b56, 0x10b57,
-	0x10b73, 0x10b77,
-	0x10b92, 0x10b98,
-	0x10b9d, 0x10ba8,
-	0x10bb0, 0x10bff,
-	0x10c49, 0x10e5f,
-	0x10e7f, 0x10fff,
-	0x1104e, 0x11051,
-	0x11070, 0x1107e,
-	0x110c2, 0x110cf,
-	0x110e9, 0x110ef,
-	0x110fa, 0x110ff,
-	0x11135, 0x11135,
-	0x11144, 0x1114f,
-	0x11177, 0x1117f,
-	0x111c9, 0x111cc,
-	0x111ce, 0x111cf,
-	0x111db, 0x111e0,
-	0x111f5, 0x111ff,
-	0x11212, 0x11212,
-	0x1123e, 0x112af,
-	0x112eb, 0x112ef,
-	0x112fa, 0x11300,
-	0x11304, 0x11304,
-	0x1130d, 0x1130e,
-	0x11311, 0x11312,
-	0x11329, 0x11329,
-	0x11331, 0x11331,
-	0x11334, 0x11334,
-	0x1133a, 0x1133b,
-	0x11345, 0x11346,
-	0x11349, 0x1134a,
-	0x1134e, 0x11356,
-	0x11358, 0x1135c,
-	0x11364, 0x11365,
-	0x1136d, 0x1136f,
-	0x11375, 0x1147f,
-	0x114c8, 0x114cf,
-	0x114da, 0x1157f,
-	0x115b6, 0x115b7,
-	0x115ca, 0x115ff,
-	0x11645, 0x1164f,
-	0x1165a, 0x1167f,
-	0x116b8, 0x116bf,
-	0x116ca, 0x1189f,
-	0x118f3, 0x118fe,
-	0x11900, 0x11abf,
-	0x11af9, 0x11fff,
-	0x12399, 0x123ff,
-	0x1246f, 0x1246f,
-	0x12475, 0x12fff,
-	0x1342f, 0x167ff,
-	0x16a39, 0x16a3f,
-	0x16a5f, 0x16a5f,
-	0x16a6a, 0x16a6d,
-	0x16a70, 0x16acf,
-	0x16aee, 0x16aef,
-	0x16af6, 0x16aff,
-	0x16b46, 0x16b4f,
-	0x16b5a, 0x16b5a,
-	0x16b62, 0x16b62,
-	0x16b78, 0x16b7c,
-	0x16b90, 0x16eff,
-	0x16f45, 0x16f4f,
-	0x16f7f, 0x16f8e,
-	0x16fa0, 0x1afff,
-	0x1b002, 0x1bbff,
-	0x1bc6b, 0x1bc6f,
-	0x1bc7d, 0x1bc7f,
-	0x1bc89, 0x1bc8f,
-	0x1bc9a, 0x1bc9b,
-	0x1bca4, 0x1cfff,
-	0x1d0f6, 0x1d0ff,
-	0x1d127, 0x1d128,
-	0x1d1de, 0x1d1ff,
-	0x1d246, 0x1d2ff,
-	0x1d357, 0x1d35f,
-	0x1d372, 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,
-	0x1d7cc, 0x1d7cd,
-	0x1d800, 0x1e7ff,
-	0x1e8c5, 0x1e8c6,
-	0x1e8d7, 0x1edff,
-	0x1ee04, 0x1ee04,
-	0x1ee20, 0x1ee20,
-	0x1ee23, 0x1ee23,
-	0x1ee25, 0x1ee26,
-	0x1ee28, 0x1ee28,
-	0x1ee33, 0x1ee33,
-	0x1ee38, 0x1ee38,
-	0x1ee3a, 0x1ee3a,
-	0x1ee3c, 0x1ee41,
-	0x1ee43, 0x1ee46,
-	0x1ee48, 0x1ee48,
-	0x1ee4a, 0x1ee4a,
-	0x1ee4c, 0x1ee4c,
-	0x1ee50, 0x1ee50,
-	0x1ee53, 0x1ee53,
-	0x1ee55, 0x1ee56,
-	0x1ee58, 0x1ee58,
-	0x1ee5a, 0x1ee5a,
-	0x1ee5c, 0x1ee5c,
-	0x1ee5e, 0x1ee5e,
-	0x1ee60, 0x1ee60,
-	0x1ee63, 0x1ee63,
-	0x1ee65, 0x1ee66,
-	0x1ee6b, 0x1ee6b,
-	0x1ee73, 0x1ee73,
-	0x1ee78, 0x1ee78,
-	0x1ee7d, 0x1ee7d,
-	0x1ee7f, 0x1ee7f,
-	0x1ee8a, 0x1ee8a,
-	0x1ee9c, 0x1eea0,
-	0x1eea4, 0x1eea4,
-	0x1eeaa, 0x1eeaa,
-	0x1eebc, 0x1eeef,
-	0x1eef2, 0x1efff,
-	0x1f02c, 0x1f02f,
-	0x1f094, 0x1f09f,
-	0x1f0af, 0x1f0b0,
-	0x1f0c0, 0x1f0c0,
-	0x1f0d0, 0x1f0d0,
-	0x1f0f6, 0x1f0ff,
-	0x1f10d, 0x1f10f,
-	0x1f12f, 0x1f12f,
-	0x1f16c, 0x1f16f,
-	0x1f19b, 0x1f1e5,
-	0x1f203, 0x1f20f,
-	0x1f23b, 0x1f23f,
-	0x1f249, 0x1f24f,
-	0x1f252, 0x1f2ff,
-	0x1f32d, 0x1f32f,
-	0x1f37e, 0x1f37f,
-	0x1f3cf, 0x1f3d3,
-	0x1f3f8, 0x1f3ff,
-	0x1f4ff, 0x1f4ff,
-	0x1f54b, 0x1f54f,
-	0x1f57a, 0x1f57a,
-	0x1f5a4, 0x1f5a4,
-	0x1f643, 0x1f644,
-	0x1f6d0, 0x1f6df,
-	0x1f6ed, 0x1f6ef,
-	0x1f6f4, 0x1f6ff,
-	0x1f774, 0x1f77f,
-	0x1f7d5, 0x1f7ff,
-	0x1f80c, 0x1f80f,
-	0x1f848, 0x1f84f,
-	0x1f85a, 0x1f85f,
-	0x1f888, 0x1f88f,
-	0x1f8ae, 0x1ffff,
-	0x2a6d7, 0x2a6ff,
-	0x2b735, 0x2b73f,
-	0x2b81e, 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[] = {
-	537,
-	0x0041, 0x005a,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00b5, 0x00b5,
-	0x00ba, 0x00ba,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x02c1,
-	0x02c6, 0x02d1,
-	0x02e0, 0x02e4,
-	0x02ec, 0x02ec,
-	0x02ee, 0x02ee,
-	0x0370, 0x0374,
-	0x0376, 0x0377,
-	0x037a, 0x037d,
-	0x037f, 0x037f,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x048a, 0x052f,
-	0x0531, 0x0556,
-	0x0559, 0x0559,
-	0x0561, 0x0587,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0620, 0x064a,
-	0x066e, 0x066f,
-	0x0671, 0x06d3,
-	0x06d5, 0x06d5,
-	0x06e5, 0x06e6,
-	0x06ee, 0x06ef,
-	0x06fa, 0x06fc,
-	0x06ff, 0x06ff,
-	0x0710, 0x0710,
-	0x0712, 0x072f,
-	0x074d, 0x07a5,
-	0x07b1, 0x07b1,
-	0x07ca, 0x07ea,
-	0x07f4, 0x07f5,
-	0x07fa, 0x07fa,
-	0x0800, 0x0815,
-	0x081a, 0x081a,
-	0x0824, 0x0824,
-	0x0828, 0x0828,
-	0x0840, 0x0858,
-	0x08a0, 0x08b2,
-	0x0904, 0x0939,
-	0x093d, 0x093d,
-	0x0950, 0x0950,
-	0x0958, 0x0961,
-	0x0971, 0x0980,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c3d,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c61,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbd, 0x0cbd,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce1,
-	0x0cf1, 0x0cf2,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d3d,
-	0x0d4e, 0x0d4e,
-	0x0d60, 0x0d61,
-	0x0d7a, 0x0d7f,
-	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, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f40, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f88, 0x0f8c,
-	0x1000, 0x102a,
-	0x103f, 0x103f,
-	0x1050, 0x1055,
-	0x105a, 0x105d,
-	0x1061, 0x1061,
-	0x1065, 0x1066,
-	0x106e, 0x1070,
-	0x1075, 0x1081,
-	0x108e, 0x108e,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 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, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16f1, 0x16f8,
-	0x1700, 0x170c,
-	0x170e, 0x1711,
-	0x1720, 0x1731,
-	0x1740, 0x1751,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1780, 0x17b3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dc,
-	0x1820, 0x1877,
-	0x1880, 0x18a8,
-	0x18aa, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191e,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19c1, 0x19c7,
-	0x1a00, 0x1a16,
-	0x1a20, 0x1a54,
-	0x1aa7, 0x1aa7,
-	0x1b05, 0x1b33,
-	0x1b45, 0x1b4b,
-	0x1b83, 0x1ba0,
-	0x1bae, 0x1baf,
-	0x1bba, 0x1be5,
-	0x1c00, 0x1c23,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c7d,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf1,
-	0x1cf5, 0x1cf6,
-	0x1d00, 0x1dbf,
-	0x1e00, 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, 0x209c,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2119, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x212d,
-	0x212f, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2183, 0x2184,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2ce4,
-	0x2ceb, 0x2cee,
-	0x2cf2, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3006,
-	0x3031, 0x3035,
-	0x303b, 0x303c,
-	0x3041, 0x3096,
-	0x309d, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa640, 0xa66e,
-	0xa67f, 0xa69d,
-	0xa6a0, 0xa6e5,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa7ad,
-	0xa7b0, 0xa7b1,
-	0xa7f7, 0xa801,
-	0xa803, 0xa805,
-	0xa807, 0xa80a,
-	0xa80c, 0xa822,
-	0xa840, 0xa873,
-	0xa882, 0xa8b3,
-	0xa8f2, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa90a, 0xa925,
-	0xa930, 0xa946,
-	0xa960, 0xa97c,
-	0xa984, 0xa9b2,
-	0xa9cf, 0xa9cf,
-	0xa9e0, 0xa9e4,
-	0xa9e6, 0xa9ef,
-	0xa9fa, 0xa9fe,
-	0xaa00, 0xaa28,
-	0xaa40, 0xaa42,
-	0xaa44, 0xaa4b,
-	0xaa60, 0xaa76,
-	0xaa7a, 0xaa7a,
-	0xaa7e, 0xaaaf,
-	0xaab1, 0xaab1,
-	0xaab5, 0xaab6,
-	0xaab9, 0xaabd,
-	0xaac0, 0xaac0,
-	0xaac2, 0xaac2,
-	0xaadb, 0xaadd,
-	0xaae0, 0xaaea,
-	0xaaf2, 0xaaf4,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xab30, 0xab5a,
-	0xab5c, 0xab5f,
-	0xab64, 0xab65,
-	0xabc0, 0xabe2,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa6d,
-	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,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031f,
-	0x10330, 0x10340,
-	0x10342, 0x10349,
-	0x10350, 0x10375,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x10400, 0x1049d,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10860, 0x10876,
-	0x10880, 0x1089e,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a00,
-	0x10a10, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10a80, 0x10a9c,
-	0x10ac0, 0x10ac7,
-	0x10ac9, 0x10ae4,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10b80, 0x10b91,
-	0x10c00, 0x10c48,
-	0x11003, 0x11037,
-	0x11083, 0x110af,
-	0x110d0, 0x110e8,
-	0x11103, 0x11126,
-	0x11150, 0x11172,
-	0x11176, 0x11176,
-	0x11183, 0x111b2,
-	0x111c1, 0x111c4,
-	0x111da, 0x111da,
-	0x11200, 0x11211,
-	0x11213, 0x1122b,
-	0x112b0, 0x112de,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133d, 0x1133d,
-	0x1135d, 0x11361,
-	0x11480, 0x114af,
-	0x114c4, 0x114c5,
-	0x114c7, 0x114c7,
-	0x11580, 0x115ae,
-	0x11600, 0x1162f,
-	0x11644, 0x11644,
-	0x11680, 0x116aa,
-	0x118a0, 0x118df,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x12000, 0x12398,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16ad0, 0x16aed,
-	0x16b00, 0x16b2f,
-	0x16b40, 0x16b43,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f50,
-	0x16f93, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	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, 0x1d7cb,
-	0x1e800, 0x1e8c4,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_L */
-
-/* 'LC': General Category */
-static const OnigCodePoint CR_LC[] = {
-	117,
-	0x0041, 0x005a,
-	0x0061, 0x007a,
-	0x00b5, 0x00b5,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x01ba,
-	0x01bc, 0x01bf,
-	0x01c4, 0x0293,
-	0x0295, 0x02af,
-	0x0370, 0x0373,
-	0x0376, 0x0377,
-	0x037b, 0x037d,
-	0x037f, 0x037f,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x048a, 0x052f,
-	0x0531, 0x0556,
-	0x0561, 0x0587,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x1d00, 0x1d2b,
-	0x1d6b, 0x1d77,
-	0x1d79, 0x1d9a,
-	0x1e00, 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,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2119, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x212d,
-	0x212f, 0x2134,
-	0x2139, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2183, 0x2184,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2c7b,
-	0x2c7e, 0x2ce4,
-	0x2ceb, 0x2cee,
-	0x2cf2, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0xa640, 0xa66d,
-	0xa680, 0xa69b,
-	0xa722, 0xa76f,
-	0xa771, 0xa787,
-	0xa78b, 0xa78e,
-	0xa790, 0xa7ad,
-	0xa7b0, 0xa7b1,
-	0xa7fa, 0xa7fa,
-	0xab30, 0xab5a,
-	0xab64, 0xab65,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0x10400, 0x1044f,
-	0x118a0, 0x118df,
-	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, 0x1d7cb,
-}; /* CR_LC */
-
-/* 'Ll': General Category */
-static const OnigCodePoint CR_Ll[] = {
-	625,
-	0x0061, 0x007a,
-	0x00b5, 0x00b5,
-	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,
-	0x0242, 0x0242,
-	0x0247, 0x0247,
-	0x0249, 0x0249,
-	0x024b, 0x024b,
-	0x024d, 0x024d,
-	0x024f, 0x0293,
-	0x0295, 0x02af,
-	0x0371, 0x0371,
-	0x0373, 0x0373,
-	0x0377, 0x0377,
-	0x037b, 0x037d,
-	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, 0x04cf,
-	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,
-	0x04fb, 0x04fb,
-	0x04fd, 0x04fd,
-	0x04ff, 0x04ff,
-	0x0501, 0x0501,
-	0x0503, 0x0503,
-	0x0505, 0x0505,
-	0x0507, 0x0507,
-	0x0509, 0x0509,
-	0x050b, 0x050b,
-	0x050d, 0x050d,
-	0x050f, 0x050f,
-	0x0511, 0x0511,
-	0x0513, 0x0513,
-	0x0515, 0x0515,
-	0x0517, 0x0517,
-	0x0519, 0x0519,
-	0x051b, 0x051b,
-	0x051d, 0x051d,
-	0x051f, 0x051f,
-	0x0521, 0x0521,
-	0x0523, 0x0523,
-	0x0525, 0x0525,
-	0x0527, 0x0527,
-	0x0529, 0x0529,
-	0x052b, 0x052b,
-	0x052d, 0x052d,
-	0x052f, 0x052f,
-	0x0561, 0x0587,
-	0x1d00, 0x1d2b,
-	0x1d6b, 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, 0x1e9d,
-	0x1e9f, 0x1e9f,
-	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,
-	0x1efb, 0x1efb,
-	0x1efd, 0x1efd,
-	0x1eff, 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,
-	0x210a, 0x210a,
-	0x210e, 0x210f,
-	0x2113, 0x2113,
-	0x212f, 0x212f,
-	0x2134, 0x2134,
-	0x2139, 0x2139,
-	0x213c, 0x213d,
-	0x2146, 0x2149,
-	0x214e, 0x214e,
-	0x2184, 0x2184,
-	0x2c30, 0x2c5e,
-	0x2c61, 0x2c61,
-	0x2c65, 0x2c66,
-	0x2c68, 0x2c68,
-	0x2c6a, 0x2c6a,
-	0x2c6c, 0x2c6c,
-	0x2c71, 0x2c71,
-	0x2c73, 0x2c74,
-	0x2c76, 0x2c7b,
-	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,
-	0x2cec, 0x2cec,
-	0x2cee, 0x2cee,
-	0x2cf3, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0xa641, 0xa641,
-	0xa643, 0xa643,
-	0xa645, 0xa645,
-	0xa647, 0xa647,
-	0xa649, 0xa649,
-	0xa64b, 0xa64b,
-	0xa64d, 0xa64d,
-	0xa64f, 0xa64f,
-	0xa651, 0xa651,
-	0xa653, 0xa653,
-	0xa655, 0xa655,
-	0xa657, 0xa657,
-	0xa659, 0xa659,
-	0xa65b, 0xa65b,
-	0xa65d, 0xa65d,
-	0xa65f, 0xa65f,
-	0xa661, 0xa661,
-	0xa663, 0xa663,
-	0xa665, 0xa665,
-	0xa667, 0xa667,
-	0xa669, 0xa669,
-	0xa66b, 0xa66b,
-	0xa66d, 0xa66d,
-	0xa681, 0xa681,
-	0xa683, 0xa683,
-	0xa685, 0xa685,
-	0xa687, 0xa687,
-	0xa689, 0xa689,
-	0xa68b, 0xa68b,
-	0xa68d, 0xa68d,
-	0xa68f, 0xa68f,
-	0xa691, 0xa691,
-	0xa693, 0xa693,
-	0xa695, 0xa695,
-	0xa697, 0xa697,
-	0xa699, 0xa699,
-	0xa69b, 0xa69b,
-	0xa723, 0xa723,
-	0xa725, 0xa725,
-	0xa727, 0xa727,
-	0xa729, 0xa729,
-	0xa72b, 0xa72b,
-	0xa72d, 0xa72d,
-	0xa72f, 0xa731,
-	0xa733, 0xa733,
-	0xa735, 0xa735,
-	0xa737, 0xa737,
-	0xa739, 0xa739,
-	0xa73b, 0xa73b,
-	0xa73d, 0xa73d,
-	0xa73f, 0xa73f,
-	0xa741, 0xa741,
-	0xa743, 0xa743,
-	0xa745, 0xa745,
-	0xa747, 0xa747,
-	0xa749, 0xa749,
-	0xa74b, 0xa74b,
-	0xa74d, 0xa74d,
-	0xa74f, 0xa74f,
-	0xa751, 0xa751,
-	0xa753, 0xa753,
-	0xa755, 0xa755,
-	0xa757, 0xa757,
-	0xa759, 0xa759,
-	0xa75b, 0xa75b,
-	0xa75d, 0xa75d,
-	0xa75f, 0xa75f,
-	0xa761, 0xa761,
-	0xa763, 0xa763,
-	0xa765, 0xa765,
-	0xa767, 0xa767,
-	0xa769, 0xa769,
-	0xa76b, 0xa76b,
-	0xa76d, 0xa76d,
-	0xa76f, 0xa76f,
-	0xa771, 0xa778,
-	0xa77a, 0xa77a,
-	0xa77c, 0xa77c,
-	0xa77f, 0xa77f,
-	0xa781, 0xa781,
-	0xa783, 0xa783,
-	0xa785, 0xa785,
-	0xa787, 0xa787,
-	0xa78c, 0xa78c,
-	0xa78e, 0xa78e,
-	0xa791, 0xa791,
-	0xa793, 0xa795,
-	0xa797, 0xa797,
-	0xa799, 0xa799,
-	0xa79b, 0xa79b,
-	0xa79d, 0xa79d,
-	0xa79f, 0xa79f,
-	0xa7a1, 0xa7a1,
-	0xa7a3, 0xa7a3,
-	0xa7a5, 0xa7a5,
-	0xa7a7, 0xa7a7,
-	0xa7a9, 0xa7a9,
-	0xa7fa, 0xa7fa,
-	0xab30, 0xab5a,
-	0xab64, 0xab65,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff41, 0xff5a,
-	0x10428, 0x1044f,
-	0x118c0, 0x118df,
-	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,
-	0x1d7cb, 0x1d7cb,
-}; /* CR_Ll */
-
-/* 'Lm': General Category */
-static const OnigCodePoint CR_Lm[] = {
-	56,
-	0x02b0, 0x02c1,
-	0x02c6, 0x02d1,
-	0x02e0, 0x02e4,
-	0x02ec, 0x02ec,
-	0x02ee, 0x02ee,
-	0x0374, 0x0374,
-	0x037a, 0x037a,
-	0x0559, 0x0559,
-	0x0640, 0x0640,
-	0x06e5, 0x06e6,
-	0x07f4, 0x07f5,
-	0x07fa, 0x07fa,
-	0x081a, 0x081a,
-	0x0824, 0x0824,
-	0x0828, 0x0828,
-	0x0971, 0x0971,
-	0x0e46, 0x0e46,
-	0x0ec6, 0x0ec6,
-	0x10fc, 0x10fc,
-	0x17d7, 0x17d7,
-	0x1843, 0x1843,
-	0x1aa7, 0x1aa7,
-	0x1c78, 0x1c7d,
-	0x1d2c, 0x1d6a,
-	0x1d78, 0x1d78,
-	0x1d9b, 0x1dbf,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 0x209c,
-	0x2c7c, 0x2c7d,
-	0x2d6f, 0x2d6f,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3005,
-	0x3031, 0x3035,
-	0x303b, 0x303b,
-	0x309d, 0x309e,
-	0x30fc, 0x30fe,
-	0xa015, 0xa015,
-	0xa4f8, 0xa4fd,
-	0xa60c, 0xa60c,
-	0xa67f, 0xa67f,
-	0xa69c, 0xa69d,
-	0xa717, 0xa71f,
-	0xa770, 0xa770,
-	0xa788, 0xa788,
-	0xa7f8, 0xa7f9,
-	0xa9cf, 0xa9cf,
-	0xa9e6, 0xa9e6,
-	0xaa70, 0xaa70,
-	0xaadd, 0xaadd,
-	0xaaf3, 0xaaf4,
-	0xab5c, 0xab5f,
-	0xff70, 0xff70,
-	0xff9e, 0xff9f,
-	0x16b40, 0x16b43,
-	0x16f93, 0x16f9f,
-}; /* CR_Lm */
-
-/* 'Lo': General Category */
-static const OnigCodePoint CR_Lo[] = {
-	417,
-	0x00aa, 0x00aa,
-	0x00ba, 0x00ba,
-	0x01bb, 0x01bb,
-	0x01c0, 0x01c3,
-	0x0294, 0x0294,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0620, 0x063f,
-	0x0641, 0x064a,
-	0x066e, 0x066f,
-	0x0671, 0x06d3,
-	0x06d5, 0x06d5,
-	0x06ee, 0x06ef,
-	0x06fa, 0x06fc,
-	0x06ff, 0x06ff,
-	0x0710, 0x0710,
-	0x0712, 0x072f,
-	0x074d, 0x07a5,
-	0x07b1, 0x07b1,
-	0x07ca, 0x07ea,
-	0x0800, 0x0815,
-	0x0840, 0x0858,
-	0x08a0, 0x08b2,
-	0x0904, 0x0939,
-	0x093d, 0x093d,
-	0x0950, 0x0950,
-	0x0958, 0x0961,
-	0x0972, 0x0980,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c3d,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c61,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbd, 0x0cbd,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce1,
-	0x0cf1, 0x0cf2,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d3d,
-	0x0d4e, 0x0d4e,
-	0x0d60, 0x0d61,
-	0x0d7a, 0x0d7f,
-	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, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f40, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f88, 0x0f8c,
-	0x1000, 0x102a,
-	0x103f, 0x103f,
-	0x1050, 0x1055,
-	0x105a, 0x105d,
-	0x1061, 0x1061,
-	0x1065, 0x1066,
-	0x106e, 0x1070,
-	0x1075, 0x1081,
-	0x108e, 0x108e,
-	0x10d0, 0x10fa,
-	0x10fd, 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, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16f1, 0x16f8,
-	0x1700, 0x170c,
-	0x170e, 0x1711,
-	0x1720, 0x1731,
-	0x1740, 0x1751,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1780, 0x17b3,
-	0x17dc, 0x17dc,
-	0x1820, 0x1842,
-	0x1844, 0x1877,
-	0x1880, 0x18a8,
-	0x18aa, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191e,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19c1, 0x19c7,
-	0x1a00, 0x1a16,
-	0x1a20, 0x1a54,
-	0x1b05, 0x1b33,
-	0x1b45, 0x1b4b,
-	0x1b83, 0x1ba0,
-	0x1bae, 0x1baf,
-	0x1bba, 0x1be5,
-	0x1c00, 0x1c23,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c77,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf1,
-	0x1cf5, 0x1cf6,
-	0x2135, 0x2138,
-	0x2d30, 0x2d67,
-	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, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcc,
-	0xa000, 0xa014,
-	0xa016, 0xa48c,
-	0xa4d0, 0xa4f7,
-	0xa500, 0xa60b,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa66e, 0xa66e,
-	0xa6a0, 0xa6e5,
-	0xa7f7, 0xa7f7,
-	0xa7fb, 0xa801,
-	0xa803, 0xa805,
-	0xa807, 0xa80a,
-	0xa80c, 0xa822,
-	0xa840, 0xa873,
-	0xa882, 0xa8b3,
-	0xa8f2, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa90a, 0xa925,
-	0xa930, 0xa946,
-	0xa960, 0xa97c,
-	0xa984, 0xa9b2,
-	0xa9e0, 0xa9e4,
-	0xa9e7, 0xa9ef,
-	0xa9fa, 0xa9fe,
-	0xaa00, 0xaa28,
-	0xaa40, 0xaa42,
-	0xaa44, 0xaa4b,
-	0xaa60, 0xaa6f,
-	0xaa71, 0xaa76,
-	0xaa7a, 0xaa7a,
-	0xaa7e, 0xaaaf,
-	0xaab1, 0xaab1,
-	0xaab5, 0xaab6,
-	0xaab9, 0xaabd,
-	0xaac0, 0xaac0,
-	0xaac2, 0xaac2,
-	0xaadb, 0xaadc,
-	0xaae0, 0xaaea,
-	0xaaf2, 0xaaf2,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabe2,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa6d,
-	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,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031f,
-	0x10330, 0x10340,
-	0x10342, 0x10349,
-	0x10350, 0x10375,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x10450, 0x1049d,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10860, 0x10876,
-	0x10880, 0x1089e,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a00,
-	0x10a10, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10a80, 0x10a9c,
-	0x10ac0, 0x10ac7,
-	0x10ac9, 0x10ae4,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10b80, 0x10b91,
-	0x10c00, 0x10c48,
-	0x11003, 0x11037,
-	0x11083, 0x110af,
-	0x110d0, 0x110e8,
-	0x11103, 0x11126,
-	0x11150, 0x11172,
-	0x11176, 0x11176,
-	0x11183, 0x111b2,
-	0x111c1, 0x111c4,
-	0x111da, 0x111da,
-	0x11200, 0x11211,
-	0x11213, 0x1122b,
-	0x112b0, 0x112de,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133d, 0x1133d,
-	0x1135d, 0x11361,
-	0x11480, 0x114af,
-	0x114c4, 0x114c5,
-	0x114c7, 0x114c7,
-	0x11580, 0x115ae,
-	0x11600, 0x1162f,
-	0x11644, 0x11644,
-	0x11680, 0x116aa,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x12000, 0x12398,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16ad0, 0x16aed,
-	0x16b00, 0x16b2f,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f50,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	0x1e800, 0x1e8c4,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	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[] = {
-	622,
-	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,
-	0x0243, 0x0246,
-	0x0248, 0x0248,
-	0x024a, 0x024a,
-	0x024c, 0x024c,
-	0x024e, 0x024e,
-	0x0370, 0x0370,
-	0x0372, 0x0372,
-	0x0376, 0x0376,
-	0x037f, 0x037f,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x038f,
-	0x0391, 0x03a1,
-	0x03a3, 0x03ab,
-	0x03cf, 0x03cf,
-	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,
-	0x04fa, 0x04fa,
-	0x04fc, 0x04fc,
-	0x04fe, 0x04fe,
-	0x0500, 0x0500,
-	0x0502, 0x0502,
-	0x0504, 0x0504,
-	0x0506, 0x0506,
-	0x0508, 0x0508,
-	0x050a, 0x050a,
-	0x050c, 0x050c,
-	0x050e, 0x050e,
-	0x0510, 0x0510,
-	0x0512, 0x0512,
-	0x0514, 0x0514,
-	0x0516, 0x0516,
-	0x0518, 0x0518,
-	0x051a, 0x051a,
-	0x051c, 0x051c,
-	0x051e, 0x051e,
-	0x0520, 0x0520,
-	0x0522, 0x0522,
-	0x0524, 0x0524,
-	0x0526, 0x0526,
-	0x0528, 0x0528,
-	0x052a, 0x052a,
-	0x052c, 0x052c,
-	0x052e, 0x052e,
-	0x0531, 0x0556,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	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,
-	0x1e9e, 0x1e9e,
-	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,
-	0x1efa, 0x1efa,
-	0x1efc, 0x1efc,
-	0x1efe, 0x1efe,
-	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, 0x2133,
-	0x213e, 0x213f,
-	0x2145, 0x2145,
-	0x2183, 0x2183,
-	0x2c00, 0x2c2e,
-	0x2c60, 0x2c60,
-	0x2c62, 0x2c64,
-	0x2c67, 0x2c67,
-	0x2c69, 0x2c69,
-	0x2c6b, 0x2c6b,
-	0x2c6d, 0x2c70,
-	0x2c72, 0x2c72,
-	0x2c75, 0x2c75,
-	0x2c7e, 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,
-	0x2ceb, 0x2ceb,
-	0x2ced, 0x2ced,
-	0x2cf2, 0x2cf2,
-	0xa640, 0xa640,
-	0xa642, 0xa642,
-	0xa644, 0xa644,
-	0xa646, 0xa646,
-	0xa648, 0xa648,
-	0xa64a, 0xa64a,
-	0xa64c, 0xa64c,
-	0xa64e, 0xa64e,
-	0xa650, 0xa650,
-	0xa652, 0xa652,
-	0xa654, 0xa654,
-	0xa656, 0xa656,
-	0xa658, 0xa658,
-	0xa65a, 0xa65a,
-	0xa65c, 0xa65c,
-	0xa65e, 0xa65e,
-	0xa660, 0xa660,
-	0xa662, 0xa662,
-	0xa664, 0xa664,
-	0xa666, 0xa666,
-	0xa668, 0xa668,
-	0xa66a, 0xa66a,
-	0xa66c, 0xa66c,
-	0xa680, 0xa680,
-	0xa682, 0xa682,
-	0xa684, 0xa684,
-	0xa686, 0xa686,
-	0xa688, 0xa688,
-	0xa68a, 0xa68a,
-	0xa68c, 0xa68c,
-	0xa68e, 0xa68e,
-	0xa690, 0xa690,
-	0xa692, 0xa692,
-	0xa694, 0xa694,
-	0xa696, 0xa696,
-	0xa698, 0xa698,
-	0xa69a, 0xa69a,
-	0xa722, 0xa722,
-	0xa724, 0xa724,
-	0xa726, 0xa726,
-	0xa728, 0xa728,
-	0xa72a, 0xa72a,
-	0xa72c, 0xa72c,
-	0xa72e, 0xa72e,
-	0xa732, 0xa732,
-	0xa734, 0xa734,
-	0xa736, 0xa736,
-	0xa738, 0xa738,
-	0xa73a, 0xa73a,
-	0xa73c, 0xa73c,
-	0xa73e, 0xa73e,
-	0xa740, 0xa740,
-	0xa742, 0xa742,
-	0xa744, 0xa744,
-	0xa746, 0xa746,
-	0xa748, 0xa748,
-	0xa74a, 0xa74a,
-	0xa74c, 0xa74c,
-	0xa74e, 0xa74e,
-	0xa750, 0xa750,
-	0xa752, 0xa752,
-	0xa754, 0xa754,
-	0xa756, 0xa756,
-	0xa758, 0xa758,
-	0xa75a, 0xa75a,
-	0xa75c, 0xa75c,
-	0xa75e, 0xa75e,
-	0xa760, 0xa760,
-	0xa762, 0xa762,
-	0xa764, 0xa764,
-	0xa766, 0xa766,
-	0xa768, 0xa768,
-	0xa76a, 0xa76a,
-	0xa76c, 0xa76c,
-	0xa76e, 0xa76e,
-	0xa779, 0xa779,
-	0xa77b, 0xa77b,
-	0xa77d, 0xa77e,
-	0xa780, 0xa780,
-	0xa782, 0xa782,
-	0xa784, 0xa784,
-	0xa786, 0xa786,
-	0xa78b, 0xa78b,
-	0xa78d, 0xa78d,
-	0xa790, 0xa790,
-	0xa792, 0xa792,
-	0xa796, 0xa796,
-	0xa798, 0xa798,
-	0xa79a, 0xa79a,
-	0xa79c, 0xa79c,
-	0xa79e, 0xa79e,
-	0xa7a0, 0xa7a0,
-	0xa7a2, 0xa7a2,
-	0xa7a4, 0xa7a4,
-	0xa7a6, 0xa7a6,
-	0xa7a8, 0xa7a8,
-	0xa7aa, 0xa7ad,
-	0xa7b0, 0xa7b1,
-	0xff21, 0xff3a,
-	0x10400, 0x10427,
-	0x118a0, 0x118bf,
-	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,
-	0x1d7ca, 0x1d7ca,
-}; /* CR_Lu */
-
-/* 'M': Major Category */
-static const OnigCodePoint CR_M[] = {
-	229,
-	0x0300, 0x036f,
-	0x0483, 0x0489,
-	0x0591, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x0610, 0x061a,
-	0x064b, 0x065f,
-	0x0670, 0x0670,
-	0x06d6, 0x06dc,
-	0x06df, 0x06e4,
-	0x06e7, 0x06e8,
-	0x06ea, 0x06ed,
-	0x0711, 0x0711,
-	0x0730, 0x074a,
-	0x07a6, 0x07b0,
-	0x07eb, 0x07f3,
-	0x0816, 0x0819,
-	0x081b, 0x0823,
-	0x0825, 0x0827,
-	0x0829, 0x082d,
-	0x0859, 0x085b,
-	0x08e4, 0x0903,
-	0x093a, 0x093c,
-	0x093e, 0x094f,
-	0x0951, 0x0957,
-	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,
-	0x0a51, 0x0a51,
-	0x0a70, 0x0a71,
-	0x0a75, 0x0a75,
-	0x0a81, 0x0a83,
-	0x0abc, 0x0abc,
-	0x0abe, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acd,
-	0x0ae2, 0x0ae3,
-	0x0b01, 0x0b03,
-	0x0b3c, 0x0b3c,
-	0x0b3e, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b62, 0x0b63,
-	0x0b82, 0x0b82,
-	0x0bbe, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcd,
-	0x0bd7, 0x0bd7,
-	0x0c00, 0x0c03,
-	0x0c3e, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c62, 0x0c63,
-	0x0c81, 0x0c83,
-	0x0cbc, 0x0cbc,
-	0x0cbe, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0ce2, 0x0ce3,
-	0x0d01, 0x0d03,
-	0x0d3e, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
-	0x0d57, 0x0d57,
-	0x0d62, 0x0d63,
-	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,
-	0x0f8d, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fc6, 0x0fc6,
-	0x102b, 0x103e,
-	0x1056, 0x1059,
-	0x105e, 0x1060,
-	0x1062, 0x1064,
-	0x1067, 0x106d,
-	0x1071, 0x1074,
-	0x1082, 0x108d,
-	0x108f, 0x108f,
-	0x109a, 0x109d,
-	0x135d, 0x135f,
-	0x1712, 0x1714,
-	0x1732, 0x1734,
-	0x1752, 0x1753,
-	0x1772, 0x1773,
-	0x17b4, 0x17d3,
-	0x17dd, 0x17dd,
-	0x180b, 0x180d,
-	0x18a9, 0x18a9,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x19b0, 0x19c0,
-	0x19c8, 0x19c9,
-	0x1a17, 0x1a1b,
-	0x1a55, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a7f,
-	0x1ab0, 0x1abe,
-	0x1b00, 0x1b04,
-	0x1b34, 0x1b44,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1b82,
-	0x1ba1, 0x1bad,
-	0x1be6, 0x1bf3,
-	0x1c24, 0x1c37,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1cf2, 0x1cf4,
-	0x1cf8, 0x1cf9,
-	0x1dc0, 0x1df5,
-	0x1dfc, 0x1dff,
-	0x20d0, 0x20f0,
-	0x2cef, 0x2cf1,
-	0x2d7f, 0x2d7f,
-	0x2de0, 0x2dff,
-	0x302a, 0x302f,
-	0x3099, 0x309a,
-	0xa66f, 0xa672,
-	0xa674, 0xa67d,
-	0xa69f, 0xa69f,
-	0xa6f0, 0xa6f1,
-	0xa802, 0xa802,
-	0xa806, 0xa806,
-	0xa80b, 0xa80b,
-	0xa823, 0xa827,
-	0xa880, 0xa881,
-	0xa8b4, 0xa8c4,
-	0xa8e0, 0xa8f1,
-	0xa926, 0xa92d,
-	0xa947, 0xa953,
-	0xa980, 0xa983,
-	0xa9b3, 0xa9c0,
-	0xa9e5, 0xa9e5,
-	0xaa29, 0xaa36,
-	0xaa43, 0xaa43,
-	0xaa4c, 0xaa4d,
-	0xaa7b, 0xaa7d,
-	0xaab0, 0xaab0,
-	0xaab2, 0xaab4,
-	0xaab7, 0xaab8,
-	0xaabe, 0xaabf,
-	0xaac1, 0xaac1,
-	0xaaeb, 0xaaef,
-	0xaaf5, 0xaaf6,
-	0xabe3, 0xabea,
-	0xabec, 0xabed,
-	0xfb1e, 0xfb1e,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe2d,
-	0x101fd, 0x101fd,
-	0x102e0, 0x102e0,
-	0x10376, 0x1037a,
-	0x10a01, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a0f,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x10ae5, 0x10ae6,
-	0x11000, 0x11002,
-	0x11038, 0x11046,
-	0x1107f, 0x11082,
-	0x110b0, 0x110ba,
-	0x11100, 0x11102,
-	0x11127, 0x11134,
-	0x11173, 0x11173,
-	0x11180, 0x11182,
-	0x111b3, 0x111c0,
-	0x1122c, 0x11237,
-	0x112df, 0x112ea,
-	0x11301, 0x11303,
-	0x1133c, 0x1133c,
-	0x1133e, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134d,
-	0x11357, 0x11357,
-	0x11362, 0x11363,
-	0x11366, 0x1136c,
-	0x11370, 0x11374,
-	0x114b0, 0x114c3,
-	0x115af, 0x115b5,
-	0x115b8, 0x115c0,
-	0x11630, 0x11640,
-	0x116ab, 0x116b7,
-	0x16af0, 0x16af4,
-	0x16b30, 0x16b36,
-	0x16f51, 0x16f7e,
-	0x16f8f, 0x16f92,
-	0x1bc9d, 0x1bc9e,
-	0x1d165, 0x1d169,
-	0x1d16d, 0x1d172,
-	0x1d17b, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-	0x1d242, 0x1d244,
-	0x1e8d0, 0x1e8d6,
-	0xe0100, 0xe01ef,
-}; /* CR_M */
-
-/* 'Mc': General Category */
-static const OnigCodePoint CR_Mc[] = {
-	147,
-	0x0903, 0x0903,
-	0x093b, 0x093b,
-	0x093e, 0x0940,
-	0x0949, 0x094c,
-	0x094e, 0x094f,
-	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,
-	0x102b, 0x102c,
-	0x1031, 0x1031,
-	0x1038, 0x1038,
-	0x103b, 0x103c,
-	0x1056, 0x1057,
-	0x1062, 0x1064,
-	0x1067, 0x106d,
-	0x1083, 0x1084,
-	0x1087, 0x108c,
-	0x108f, 0x108f,
-	0x109a, 0x109c,
-	0x17b6, 0x17b6,
-	0x17be, 0x17c5,
-	0x17c7, 0x17c8,
-	0x1923, 0x1926,
-	0x1929, 0x192b,
-	0x1930, 0x1931,
-	0x1933, 0x1938,
-	0x19b0, 0x19c0,
-	0x19c8, 0x19c9,
-	0x1a19, 0x1a1a,
-	0x1a55, 0x1a55,
-	0x1a57, 0x1a57,
-	0x1a61, 0x1a61,
-	0x1a63, 0x1a64,
-	0x1a6d, 0x1a72,
-	0x1b04, 0x1b04,
-	0x1b35, 0x1b35,
-	0x1b3b, 0x1b3b,
-	0x1b3d, 0x1b41,
-	0x1b43, 0x1b44,
-	0x1b82, 0x1b82,
-	0x1ba1, 0x1ba1,
-	0x1ba6, 0x1ba7,
-	0x1baa, 0x1baa,
-	0x1be7, 0x1be7,
-	0x1bea, 0x1bec,
-	0x1bee, 0x1bee,
-	0x1bf2, 0x1bf3,
-	0x1c24, 0x1c2b,
-	0x1c34, 0x1c35,
-	0x1ce1, 0x1ce1,
-	0x1cf2, 0x1cf3,
-	0x302e, 0x302f,
-	0xa823, 0xa824,
-	0xa827, 0xa827,
-	0xa880, 0xa881,
-	0xa8b4, 0xa8c3,
-	0xa952, 0xa953,
-	0xa983, 0xa983,
-	0xa9b4, 0xa9b5,
-	0xa9ba, 0xa9bb,
-	0xa9bd, 0xa9c0,
-	0xaa2f, 0xaa30,
-	0xaa33, 0xaa34,
-	0xaa4d, 0xaa4d,
-	0xaa7b, 0xaa7b,
-	0xaa7d, 0xaa7d,
-	0xaaeb, 0xaaeb,
-	0xaaee, 0xaaef,
-	0xaaf5, 0xaaf5,
-	0xabe3, 0xabe4,
-	0xabe6, 0xabe7,
-	0xabe9, 0xabea,
-	0xabec, 0xabec,
-	0x11000, 0x11000,
-	0x11002, 0x11002,
-	0x11082, 0x11082,
-	0x110b0, 0x110b2,
-	0x110b7, 0x110b8,
-	0x1112c, 0x1112c,
-	0x11182, 0x11182,
-	0x111b3, 0x111b5,
-	0x111bf, 0x111c0,
-	0x1122c, 0x1122e,
-	0x11232, 0x11233,
-	0x11235, 0x11235,
-	0x112e0, 0x112e2,
-	0x11302, 0x11303,
-	0x1133e, 0x1133f,
-	0x11341, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134d,
-	0x11357, 0x11357,
-	0x11362, 0x11363,
-	0x114b0, 0x114b2,
-	0x114b9, 0x114b9,
-	0x114bb, 0x114be,
-	0x114c1, 0x114c1,
-	0x115af, 0x115b1,
-	0x115b8, 0x115bb,
-	0x115be, 0x115be,
-	0x11630, 0x11632,
-	0x1163b, 0x1163c,
-	0x1163e, 0x1163e,
-	0x116ac, 0x116ac,
-	0x116ae, 0x116af,
-	0x116b6, 0x116b6,
-	0x16f51, 0x16f7e,
-	0x1d165, 0x1d166,
-	0x1d16d, 0x1d172,
-}; /* CR_Mc */
-
-/* 'Me': General Category */
-static const OnigCodePoint CR_Me[] = {
-	5,
-	0x0488, 0x0489,
-	0x1abe, 0x1abe,
-	0x20dd, 0x20e0,
-	0x20e2, 0x20e4,
-	0xa670, 0xa672,
-}; /* CR_Me */
-
-/* 'Mn': General Category */
-static const OnigCodePoint CR_Mn[] = {
-	255,
-	0x0300, 0x036f,
-	0x0483, 0x0487,
-	0x0591, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x0610, 0x061a,
-	0x064b, 0x065f,
-	0x0670, 0x0670,
-	0x06d6, 0x06dc,
-	0x06df, 0x06e4,
-	0x06e7, 0x06e8,
-	0x06ea, 0x06ed,
-	0x0711, 0x0711,
-	0x0730, 0x074a,
-	0x07a6, 0x07b0,
-	0x07eb, 0x07f3,
-	0x0816, 0x0819,
-	0x081b, 0x0823,
-	0x0825, 0x0827,
-	0x0829, 0x082d,
-	0x0859, 0x085b,
-	0x08e4, 0x0902,
-	0x093a, 0x093a,
-	0x093c, 0x093c,
-	0x0941, 0x0948,
-	0x094d, 0x094d,
-	0x0951, 0x0957,
-	0x0962, 0x0963,
-	0x0981, 0x0981,
-	0x09bc, 0x09bc,
-	0x09c1, 0x09c4,
-	0x09cd, 0x09cd,
-	0x09e2, 0x09e3,
-	0x0a01, 0x0a02,
-	0x0a3c, 0x0a3c,
-	0x0a41, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a70, 0x0a71,
-	0x0a75, 0x0a75,
-	0x0a81, 0x0a82,
-	0x0abc, 0x0abc,
-	0x0ac1, 0x0ac5,
-	0x0ac7, 0x0ac8,
-	0x0acd, 0x0acd,
-	0x0ae2, 0x0ae3,
-	0x0b01, 0x0b01,
-	0x0b3c, 0x0b3c,
-	0x0b3f, 0x0b3f,
-	0x0b41, 0x0b44,
-	0x0b4d, 0x0b4d,
-	0x0b56, 0x0b56,
-	0x0b62, 0x0b63,
-	0x0b82, 0x0b82,
-	0x0bc0, 0x0bc0,
-	0x0bcd, 0x0bcd,
-	0x0c00, 0x0c00,
-	0x0c3e, 0x0c40,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c62, 0x0c63,
-	0x0c81, 0x0c81,
-	0x0cbc, 0x0cbc,
-	0x0cbf, 0x0cbf,
-	0x0cc6, 0x0cc6,
-	0x0ccc, 0x0ccd,
-	0x0ce2, 0x0ce3,
-	0x0d01, 0x0d01,
-	0x0d41, 0x0d44,
-	0x0d4d, 0x0d4d,
-	0x0d62, 0x0d63,
-	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,
-	0x0f8d, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fc6, 0x0fc6,
-	0x102d, 0x1030,
-	0x1032, 0x1037,
-	0x1039, 0x103a,
-	0x103d, 0x103e,
-	0x1058, 0x1059,
-	0x105e, 0x1060,
-	0x1071, 0x1074,
-	0x1082, 0x1082,
-	0x1085, 0x1086,
-	0x108d, 0x108d,
-	0x109d, 0x109d,
-	0x135d, 0x135f,
-	0x1712, 0x1714,
-	0x1732, 0x1734,
-	0x1752, 0x1753,
-	0x1772, 0x1773,
-	0x17b4, 0x17b5,
-	0x17b7, 0x17bd,
-	0x17c6, 0x17c6,
-	0x17c9, 0x17d3,
-	0x17dd, 0x17dd,
-	0x180b, 0x180d,
-	0x18a9, 0x18a9,
-	0x1920, 0x1922,
-	0x1927, 0x1928,
-	0x1932, 0x1932,
-	0x1939, 0x193b,
-	0x1a17, 0x1a18,
-	0x1a1b, 0x1a1b,
-	0x1a56, 0x1a56,
-	0x1a58, 0x1a5e,
-	0x1a60, 0x1a60,
-	0x1a62, 0x1a62,
-	0x1a65, 0x1a6c,
-	0x1a73, 0x1a7c,
-	0x1a7f, 0x1a7f,
-	0x1ab0, 0x1abd,
-	0x1b00, 0x1b03,
-	0x1b34, 0x1b34,
-	0x1b36, 0x1b3a,
-	0x1b3c, 0x1b3c,
-	0x1b42, 0x1b42,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1b81,
-	0x1ba2, 0x1ba5,
-	0x1ba8, 0x1ba9,
-	0x1bab, 0x1bad,
-	0x1be6, 0x1be6,
-	0x1be8, 0x1be9,
-	0x1bed, 0x1bed,
-	0x1bef, 0x1bf1,
-	0x1c2c, 0x1c33,
-	0x1c36, 0x1c37,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce0,
-	0x1ce2, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1cf4, 0x1cf4,
-	0x1cf8, 0x1cf9,
-	0x1dc0, 0x1df5,
-	0x1dfc, 0x1dff,
-	0x20d0, 0x20dc,
-	0x20e1, 0x20e1,
-	0x20e5, 0x20f0,
-	0x2cef, 0x2cf1,
-	0x2d7f, 0x2d7f,
-	0x2de0, 0x2dff,
-	0x302a, 0x302d,
-	0x3099, 0x309a,
-	0xa66f, 0xa66f,
-	0xa674, 0xa67d,
-	0xa69f, 0xa69f,
-	0xa6f0, 0xa6f1,
-	0xa802, 0xa802,
-	0xa806, 0xa806,
-	0xa80b, 0xa80b,
-	0xa825, 0xa826,
-	0xa8c4, 0xa8c4,
-	0xa8e0, 0xa8f1,
-	0xa926, 0xa92d,
-	0xa947, 0xa951,
-	0xa980, 0xa982,
-	0xa9b3, 0xa9b3,
-	0xa9b6, 0xa9b9,
-	0xa9bc, 0xa9bc,
-	0xa9e5, 0xa9e5,
-	0xaa29, 0xaa2e,
-	0xaa31, 0xaa32,
-	0xaa35, 0xaa36,
-	0xaa43, 0xaa43,
-	0xaa4c, 0xaa4c,
-	0xaa7c, 0xaa7c,
-	0xaab0, 0xaab0,
-	0xaab2, 0xaab4,
-	0xaab7, 0xaab8,
-	0xaabe, 0xaabf,
-	0xaac1, 0xaac1,
-	0xaaec, 0xaaed,
-	0xaaf6, 0xaaf6,
-	0xabe5, 0xabe5,
-	0xabe8, 0xabe8,
-	0xabed, 0xabed,
-	0xfb1e, 0xfb1e,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe2d,
-	0x101fd, 0x101fd,
-	0x102e0, 0x102e0,
-	0x10376, 0x1037a,
-	0x10a01, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a0f,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x10ae5, 0x10ae6,
-	0x11001, 0x11001,
-	0x11038, 0x11046,
-	0x1107f, 0x11081,
-	0x110b3, 0x110b6,
-	0x110b9, 0x110ba,
-	0x11100, 0x11102,
-	0x11127, 0x1112b,
-	0x1112d, 0x11134,
-	0x11173, 0x11173,
-	0x11180, 0x11181,
-	0x111b6, 0x111be,
-	0x1122f, 0x11231,
-	0x11234, 0x11234,
-	0x11236, 0x11237,
-	0x112df, 0x112df,
-	0x112e3, 0x112ea,
-	0x11301, 0x11301,
-	0x1133c, 0x1133c,
-	0x11340, 0x11340,
-	0x11366, 0x1136c,
-	0x11370, 0x11374,
-	0x114b3, 0x114b8,
-	0x114ba, 0x114ba,
-	0x114bf, 0x114c0,
-	0x114c2, 0x114c3,
-	0x115b2, 0x115b5,
-	0x115bc, 0x115bd,
-	0x115bf, 0x115c0,
-	0x11633, 0x1163a,
-	0x1163d, 0x1163d,
-	0x1163f, 0x11640,
-	0x116ab, 0x116ab,
-	0x116ad, 0x116ad,
-	0x116b0, 0x116b5,
-	0x116b7, 0x116b7,
-	0x16af0, 0x16af4,
-	0x16b30, 0x16b36,
-	0x16f8f, 0x16f92,
-	0x1bc9d, 0x1bc9e,
-	0x1d167, 0x1d169,
-	0x1d17b, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-	0x1d242, 0x1d244,
-	0x1e8d0, 0x1e8d6,
-	0xe0100, 0xe01ef,
-}; /* CR_Mn */
-
-/* 'N': Major Category */
-static const OnigCodePoint CR_N[] = {
-	105,
-	0x0030, 0x0039,
-	0x00b2, 0x00b3,
-	0x00b9, 0x00b9,
-	0x00bc, 0x00be,
-	0x0660, 0x0669,
-	0x06f0, 0x06f9,
-	0x07c0, 0x07c9,
-	0x0966, 0x096f,
-	0x09e6, 0x09ef,
-	0x09f4, 0x09f9,
-	0x0a66, 0x0a6f,
-	0x0ae6, 0x0aef,
-	0x0b66, 0x0b6f,
-	0x0b72, 0x0b77,
-	0x0be6, 0x0bf2,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7e,
-	0x0ce6, 0x0cef,
-	0x0d66, 0x0d75,
-	0x0de6, 0x0def,
-	0x0e50, 0x0e59,
-	0x0ed0, 0x0ed9,
-	0x0f20, 0x0f33,
-	0x1040, 0x1049,
-	0x1090, 0x1099,
-	0x1369, 0x137c,
-	0x16ee, 0x16f0,
-	0x17e0, 0x17e9,
-	0x17f0, 0x17f9,
-	0x1810, 0x1819,
-	0x1946, 0x194f,
-	0x19d0, 0x19da,
-	0x1a80, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1b50, 0x1b59,
-	0x1bb0, 0x1bb9,
-	0x1c40, 0x1c49,
-	0x1c50, 0x1c59,
-	0x2070, 0x2070,
-	0x2074, 0x2079,
-	0x2080, 0x2089,
-	0x2150, 0x2182,
-	0x2185, 0x2189,
-	0x2460, 0x249b,
-	0x24ea, 0x24ff,
-	0x2776, 0x2793,
-	0x2cfd, 0x2cfd,
-	0x3007, 0x3007,
-	0x3021, 0x3029,
-	0x3038, 0x303a,
-	0x3192, 0x3195,
-	0x3220, 0x3229,
-	0x3248, 0x324f,
-	0x3251, 0x325f,
-	0x3280, 0x3289,
-	0x32b1, 0x32bf,
-	0xa620, 0xa629,
-	0xa6e6, 0xa6ef,
-	0xa830, 0xa835,
-	0xa8d0, 0xa8d9,
-	0xa900, 0xa909,
-	0xa9d0, 0xa9d9,
-	0xa9f0, 0xa9f9,
-	0xaa50, 0xaa59,
-	0xabf0, 0xabf9,
-	0xff10, 0xff19,
-	0x10107, 0x10133,
-	0x10140, 0x10178,
-	0x1018a, 0x1018b,
-	0x102e1, 0x102fb,
-	0x10320, 0x10323,
-	0x10341, 0x10341,
-	0x1034a, 0x1034a,
-	0x103d1, 0x103d5,
-	0x104a0, 0x104a9,
-	0x10858, 0x1085f,
-	0x10879, 0x1087f,
-	0x108a7, 0x108af,
-	0x10916, 0x1091b,
-	0x10a40, 0x10a47,
-	0x10a7d, 0x10a7e,
-	0x10a9d, 0x10a9f,
-	0x10aeb, 0x10aef,
-	0x10b58, 0x10b5f,
-	0x10b78, 0x10b7f,
-	0x10ba9, 0x10baf,
-	0x10e60, 0x10e7e,
-	0x11052, 0x1106f,
-	0x110f0, 0x110f9,
-	0x11136, 0x1113f,
-	0x111d0, 0x111d9,
-	0x111e1, 0x111f4,
-	0x112f0, 0x112f9,
-	0x114d0, 0x114d9,
-	0x11650, 0x11659,
-	0x116c0, 0x116c9,
-	0x118e0, 0x118f2,
-	0x12400, 0x1246e,
-	0x16a60, 0x16a69,
-	0x16b50, 0x16b59,
-	0x16b5b, 0x16b61,
-	0x1d360, 0x1d371,
-	0x1d7ce, 0x1d7ff,
-	0x1e8c7, 0x1e8cf,
-	0x1f100, 0x1f10c,
-}; /* CR_N */
-
-/* 'Nd': General Category */
-#define CR_Nd CR_Digit
-
-/* 'Nl': General Category */
-static const OnigCodePoint CR_Nl[] = {
-	12,
-	0x16ee, 0x16f0,
-	0x2160, 0x2182,
-	0x2185, 0x2188,
-	0x3007, 0x3007,
-	0x3021, 0x3029,
-	0x3038, 0x303a,
-	0xa6e6, 0xa6ef,
-	0x10140, 0x10174,
-	0x10341, 0x10341,
-	0x1034a, 0x1034a,
-	0x103d1, 0x103d5,
-	0x12400, 0x1246e,
-}; /* CR_Nl */
-
-/* 'No': General Category */
-static const OnigCodePoint CR_No[] = {
-	52,
-	0x00b2, 0x00b3,
-	0x00b9, 0x00b9,
-	0x00bc, 0x00be,
-	0x09f4, 0x09f9,
-	0x0b72, 0x0b77,
-	0x0bf0, 0x0bf2,
-	0x0c78, 0x0c7e,
-	0x0d70, 0x0d75,
-	0x0f2a, 0x0f33,
-	0x1369, 0x137c,
-	0x17f0, 0x17f9,
-	0x19da, 0x19da,
-	0x2070, 0x2070,
-	0x2074, 0x2079,
-	0x2080, 0x2089,
-	0x2150, 0x215f,
-	0x2189, 0x2189,
-	0x2460, 0x249b,
-	0x24ea, 0x24ff,
-	0x2776, 0x2793,
-	0x2cfd, 0x2cfd,
-	0x3192, 0x3195,
-	0x3220, 0x3229,
-	0x3248, 0x324f,
-	0x3251, 0x325f,
-	0x3280, 0x3289,
-	0x32b1, 0x32bf,
-	0xa830, 0xa835,
-	0x10107, 0x10133,
-	0x10175, 0x10178,
-	0x1018a, 0x1018b,
-	0x102e1, 0x102fb,
-	0x10320, 0x10323,
-	0x10858, 0x1085f,
-	0x10879, 0x1087f,
-	0x108a7, 0x108af,
-	0x10916, 0x1091b,
-	0x10a40, 0x10a47,
-	0x10a7d, 0x10a7e,
-	0x10a9d, 0x10a9f,
-	0x10aeb, 0x10aef,
-	0x10b58, 0x10b5f,
-	0x10b78, 0x10b7f,
-	0x10ba9, 0x10baf,
-	0x10e60, 0x10e7e,
-	0x11052, 0x11065,
-	0x111e1, 0x111f4,
-	0x118ea, 0x118f2,
-	0x16b5b, 0x16b61,
-	0x1d360, 0x1d371,
-	0x1e8c7, 0x1e8cf,
-	0x1f100, 0x1f10c,
-}; /* CR_No */
-
-/* 'P': Major Category */
-#define CR_P CR_Punct
-
-/* '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[] = {
-	17,
-	0x002d, 0x002d,
-	0x058a, 0x058a,
-	0x05be, 0x05be,
-	0x1400, 0x1400,
-	0x1806, 0x1806,
-	0x2010, 0x2015,
-	0x2e17, 0x2e17,
-	0x2e1a, 0x2e1a,
-	0x2e3a, 0x2e3b,
-	0x2e40, 0x2e40,
-	0x301c, 0x301c,
-	0x3030, 0x3030,
-	0x30a0, 0x30a0,
-	0xfe31, 0xfe32,
-	0xfe58, 0xfe58,
-	0xfe63, 0xfe63,
-	0xff0d, 0xff0d,
-}; /* CR_Pd */
-
-/* 'Pe': General Category */
-static const OnigCodePoint CR_Pe[] = {
-	72,
-	0x0029, 0x0029,
-	0x005d, 0x005d,
-	0x007d, 0x007d,
-	0x0f3b, 0x0f3b,
-	0x0f3d, 0x0f3d,
-	0x169c, 0x169c,
-	0x2046, 0x2046,
-	0x207e, 0x207e,
-	0x208e, 0x208e,
-	0x2309, 0x2309,
-	0x230b, 0x230b,
-	0x232a, 0x232a,
-	0x2769, 0x2769,
-	0x276b, 0x276b,
-	0x276d, 0x276d,
-	0x276f, 0x276f,
-	0x2771, 0x2771,
-	0x2773, 0x2773,
-	0x2775, 0x2775,
-	0x27c6, 0x27c6,
-	0x27e7, 0x27e7,
-	0x27e9, 0x27e9,
-	0x27eb, 0x27eb,
-	0x27ed, 0x27ed,
-	0x27ef, 0x27ef,
-	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,
-	0x2e23, 0x2e23,
-	0x2e25, 0x2e25,
-	0x2e27, 0x2e27,
-	0x2e29, 0x2e29,
-	0x3009, 0x3009,
-	0x300b, 0x300b,
-	0x300d, 0x300d,
-	0x300f, 0x300f,
-	0x3011, 0x3011,
-	0x3015, 0x3015,
-	0x3017, 0x3017,
-	0x3019, 0x3019,
-	0x301b, 0x301b,
-	0x301e, 0x301f,
-	0xfd3e, 0xfd3e,
-	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[] = {
-	10,
-	0x00bb, 0x00bb,
-	0x2019, 0x2019,
-	0x201d, 0x201d,
-	0x203a, 0x203a,
-	0x2e03, 0x2e03,
-	0x2e05, 0x2e05,
-	0x2e0a, 0x2e0a,
-	0x2e0d, 0x2e0d,
-	0x2e1d, 0x2e1d,
-	0x2e21, 0x2e21,
-}; /* CR_Pf */
-
-/* 'Pi': General Category */
-static const OnigCodePoint CR_Pi[] = {
-	11,
-	0x00ab, 0x00ab,
-	0x2018, 0x2018,
-	0x201b, 0x201c,
-	0x201f, 0x201f,
-	0x2039, 0x2039,
-	0x2e02, 0x2e02,
-	0x2e04, 0x2e04,
-	0x2e09, 0x2e09,
-	0x2e0c, 0x2e0c,
-	0x2e1c, 0x2e1c,
-	0x2e20, 0x2e20,
-}; /* CR_Pi */
-
-/* 'Po': General Category */
-static const OnigCodePoint CR_Po[] = {
-	151,
-	0x0021, 0x0023,
-	0x0025, 0x0027,
-	0x002a, 0x002a,
-	0x002c, 0x002c,
-	0x002e, 0x002f,
-	0x003a, 0x003b,
-	0x003f, 0x0040,
-	0x005c, 0x005c,
-	0x00a1, 0x00a1,
-	0x00a7, 0x00a7,
-	0x00b6, 0x00b7,
-	0x00bf, 0x00bf,
-	0x037e, 0x037e,
-	0x0387, 0x0387,
-	0x055a, 0x055f,
-	0x0589, 0x0589,
-	0x05c0, 0x05c0,
-	0x05c3, 0x05c3,
-	0x05c6, 0x05c6,
-	0x05f3, 0x05f4,
-	0x0609, 0x060a,
-	0x060c, 0x060d,
-	0x061b, 0x061b,
-	0x061e, 0x061f,
-	0x066a, 0x066d,
-	0x06d4, 0x06d4,
-	0x0700, 0x070d,
-	0x07f7, 0x07f9,
-	0x0830, 0x083e,
-	0x085e, 0x085e,
-	0x0964, 0x0965,
-	0x0970, 0x0970,
-	0x0af0, 0x0af0,
-	0x0df4, 0x0df4,
-	0x0e4f, 0x0e4f,
-	0x0e5a, 0x0e5b,
-	0x0f04, 0x0f12,
-	0x0f14, 0x0f14,
-	0x0f85, 0x0f85,
-	0x0fd0, 0x0fd4,
-	0x0fd9, 0x0fda,
-	0x104a, 0x104f,
-	0x10fb, 0x10fb,
-	0x1360, 0x1368,
-	0x166d, 0x166e,
-	0x16eb, 0x16ed,
-	0x1735, 0x1736,
-	0x17d4, 0x17d6,
-	0x17d8, 0x17da,
-	0x1800, 0x1805,
-	0x1807, 0x180a,
-	0x1944, 0x1945,
-	0x1a1e, 0x1a1f,
-	0x1aa0, 0x1aa6,
-	0x1aa8, 0x1aad,
-	0x1b5a, 0x1b60,
-	0x1bfc, 0x1bff,
-	0x1c3b, 0x1c3f,
-	0x1c7e, 0x1c7f,
-	0x1cc0, 0x1cc7,
-	0x1cd3, 0x1cd3,
-	0x2016, 0x2017,
-	0x2020, 0x2027,
-	0x2030, 0x2038,
-	0x203b, 0x203e,
-	0x2041, 0x2043,
-	0x2047, 0x2051,
-	0x2053, 0x2053,
-	0x2055, 0x205e,
-	0x2cf9, 0x2cfc,
-	0x2cfe, 0x2cff,
-	0x2d70, 0x2d70,
-	0x2e00, 0x2e01,
-	0x2e06, 0x2e08,
-	0x2e0b, 0x2e0b,
-	0x2e0e, 0x2e16,
-	0x2e18, 0x2e19,
-	0x2e1b, 0x2e1b,
-	0x2e1e, 0x2e1f,
-	0x2e2a, 0x2e2e,
-	0x2e30, 0x2e39,
-	0x2e3c, 0x2e3f,
-	0x2e41, 0x2e41,
-	0x3001, 0x3003,
-	0x303d, 0x303d,
-	0x30fb, 0x30fb,
-	0xa4fe, 0xa4ff,
-	0xa60d, 0xa60f,
-	0xa673, 0xa673,
-	0xa67e, 0xa67e,
-	0xa6f2, 0xa6f7,
-	0xa874, 0xa877,
-	0xa8ce, 0xa8cf,
-	0xa8f8, 0xa8fa,
-	0xa92e, 0xa92f,
-	0xa95f, 0xa95f,
-	0xa9c1, 0xa9cd,
-	0xa9de, 0xa9df,
-	0xaa5c, 0xaa5f,
-	0xaade, 0xaadf,
-	0xaaf0, 0xaaf1,
-	0xabeb, 0xabeb,
-	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, 0x10102,
-	0x1039f, 0x1039f,
-	0x103d0, 0x103d0,
-	0x1056f, 0x1056f,
-	0x10857, 0x10857,
-	0x1091f, 0x1091f,
-	0x1093f, 0x1093f,
-	0x10a50, 0x10a58,
-	0x10a7f, 0x10a7f,
-	0x10af0, 0x10af6,
-	0x10b39, 0x10b3f,
-	0x10b99, 0x10b9c,
-	0x11047, 0x1104d,
-	0x110bb, 0x110bc,
-	0x110be, 0x110c1,
-	0x11140, 0x11143,
-	0x11174, 0x11175,
-	0x111c5, 0x111c8,
-	0x111cd, 0x111cd,
-	0x11238, 0x1123d,
-	0x114c6, 0x114c6,
-	0x115c1, 0x115c9,
-	0x11641, 0x11643,
-	0x12470, 0x12474,
-	0x16a6e, 0x16a6f,
-	0x16af5, 0x16af5,
-	0x16b37, 0x16b3b,
-	0x16b44, 0x16b44,
-	0x1bc9f, 0x1bc9f,
-}; /* CR_Po */
-
-/* 'Ps': General Category */
-static const OnigCodePoint CR_Ps[] = {
-	75,
-	0x0028, 0x0028,
-	0x005b, 0x005b,
-	0x007b, 0x007b,
-	0x0f3a, 0x0f3a,
-	0x0f3c, 0x0f3c,
-	0x169b, 0x169b,
-	0x201a, 0x201a,
-	0x201e, 0x201e,
-	0x2045, 0x2045,
-	0x207d, 0x207d,
-	0x208d, 0x208d,
-	0x2308, 0x2308,
-	0x230a, 0x230a,
-	0x2329, 0x2329,
-	0x2768, 0x2768,
-	0x276a, 0x276a,
-	0x276c, 0x276c,
-	0x276e, 0x276e,
-	0x2770, 0x2770,
-	0x2772, 0x2772,
-	0x2774, 0x2774,
-	0x27c5, 0x27c5,
-	0x27e6, 0x27e6,
-	0x27e8, 0x27e8,
-	0x27ea, 0x27ea,
-	0x27ec, 0x27ec,
-	0x27ee, 0x27ee,
-	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,
-	0x2e22, 0x2e22,
-	0x2e24, 0x2e24,
-	0x2e26, 0x2e26,
-	0x2e28, 0x2e28,
-	0x2e42, 0x2e42,
-	0x3008, 0x3008,
-	0x300a, 0x300a,
-	0x300c, 0x300c,
-	0x300e, 0x300e,
-	0x3010, 0x3010,
-	0x3014, 0x3014,
-	0x3016, 0x3016,
-	0x3018, 0x3018,
-	0x301a, 0x301a,
-	0x301d, 0x301d,
-	0xfd3f, 0xfd3f,
-	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[] = {
-	210,
-	0x0024, 0x0024,
-	0x002b, 0x002b,
-	0x003c, 0x003e,
-	0x005e, 0x005e,
-	0x0060, 0x0060,
-	0x007c, 0x007c,
-	0x007e, 0x007e,
-	0x00a2, 0x00a6,
-	0x00a8, 0x00a9,
-	0x00ac, 0x00ac,
-	0x00ae, 0x00b1,
-	0x00b4, 0x00b4,
-	0x00b8, 0x00b8,
-	0x00d7, 0x00d7,
-	0x00f7, 0x00f7,
-	0x02c2, 0x02c5,
-	0x02d2, 0x02df,
-	0x02e5, 0x02eb,
-	0x02ed, 0x02ed,
-	0x02ef, 0x02ff,
-	0x0375, 0x0375,
-	0x0384, 0x0385,
-	0x03f6, 0x03f6,
-	0x0482, 0x0482,
-	0x058d, 0x058f,
-	0x0606, 0x0608,
-	0x060b, 0x060b,
-	0x060e, 0x060f,
-	0x06de, 0x06de,
-	0x06e9, 0x06e9,
-	0x06fd, 0x06fe,
-	0x07f6, 0x07f6,
-	0x09f2, 0x09f3,
-	0x09fa, 0x09fb,
-	0x0af1, 0x0af1,
-	0x0b70, 0x0b70,
-	0x0bf3, 0x0bfa,
-	0x0c7f, 0x0c7f,
-	0x0d79, 0x0d79,
-	0x0e3f, 0x0e3f,
-	0x0f01, 0x0f03,
-	0x0f13, 0x0f13,
-	0x0f15, 0x0f17,
-	0x0f1a, 0x0f1f,
-	0x0f34, 0x0f34,
-	0x0f36, 0x0f36,
-	0x0f38, 0x0f38,
-	0x0fbe, 0x0fc5,
-	0x0fc7, 0x0fcc,
-	0x0fce, 0x0fcf,
-	0x0fd5, 0x0fd8,
-	0x109e, 0x109f,
-	0x1390, 0x1399,
-	0x17db, 0x17db,
-	0x1940, 0x1940,
-	0x19de, 0x19ff,
-	0x1b61, 0x1b6a,
-	0x1b74, 0x1b7c,
-	0x1fbd, 0x1fbd,
-	0x1fbf, 0x1fc1,
-	0x1fcd, 0x1fcf,
-	0x1fdd, 0x1fdf,
-	0x1fed, 0x1fef,
-	0x1ffd, 0x1ffe,
-	0x2044, 0x2044,
-	0x2052, 0x2052,
-	0x207a, 0x207c,
-	0x208a, 0x208c,
-	0x20a0, 0x20bd,
-	0x2100, 0x2101,
-	0x2103, 0x2106,
-	0x2108, 0x2109,
-	0x2114, 0x2114,
-	0x2116, 0x2118,
-	0x211e, 0x2123,
-	0x2125, 0x2125,
-	0x2127, 0x2127,
-	0x2129, 0x2129,
-	0x212e, 0x212e,
-	0x213a, 0x213b,
-	0x2140, 0x2144,
-	0x214a, 0x214d,
-	0x214f, 0x214f,
-	0x2190, 0x2307,
-	0x230c, 0x2328,
-	0x232b, 0x23fa,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x249c, 0x24e9,
-	0x2500, 0x2767,
-	0x2794, 0x27c4,
-	0x27c7, 0x27e5,
-	0x27f0, 0x2982,
-	0x2999, 0x29d7,
-	0x29dc, 0x29fb,
-	0x29fe, 0x2b73,
-	0x2b76, 0x2b95,
-	0x2b98, 0x2bb9,
-	0x2bbd, 0x2bc8,
-	0x2bca, 0x2bd1,
-	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, 0x31e3,
-	0x3200, 0x321e,
-	0x322a, 0x3247,
-	0x3250, 0x3250,
-	0x3260, 0x327f,
-	0x328a, 0x32b0,
-	0x32c0, 0x32fe,
-	0x3300, 0x33ff,
-	0x4dc0, 0x4dff,
-	0xa490, 0xa4c6,
-	0xa700, 0xa716,
-	0xa720, 0xa721,
-	0xa789, 0xa78a,
-	0xa828, 0xa82b,
-	0xa836, 0xa839,
-	0xaa77, 0xaa79,
-	0xab5b, 0xab5b,
-	0xfb29, 0xfb29,
-	0xfbb2, 0xfbc1,
-	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,
-	0x10137, 0x1013f,
-	0x10179, 0x10189,
-	0x1018c, 0x1018c,
-	0x10190, 0x1019b,
-	0x101a0, 0x101a0,
-	0x101d0, 0x101fc,
-	0x10877, 0x10878,
-	0x10ac8, 0x10ac8,
-	0x16b3c, 0x16b3f,
-	0x16b45, 0x16b45,
-	0x1bc9c, 0x1bc9c,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 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,
-	0x1eef0, 0x1eef1,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0bf,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0f5,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f32c,
-	0x1f330, 0x1f37d,
-	0x1f380, 0x1f3ce,
-	0x1f3d4, 0x1f3f7,
-	0x1f400, 0x1f4fe,
-	0x1f500, 0x1f54a,
-	0x1f550, 0x1f579,
-	0x1f57b, 0x1f5a3,
-	0x1f5a5, 0x1f642,
-	0x1f645, 0x1f6cf,
-	0x1f6e0, 0x1f6ec,
-	0x1f6f0, 0x1f6f3,
-	0x1f700, 0x1f773,
-	0x1f780, 0x1f7d4,
-	0x1f800, 0x1f80b,
-	0x1f810, 0x1f847,
-	0x1f850, 0x1f859,
-	0x1f860, 0x1f887,
-	0x1f890, 0x1f8ad,
-}; /* CR_S */
-
-/* 'Sc': General Category */
-static const OnigCodePoint CR_Sc[] = {
-	17,
-	0x0024, 0x0024,
-	0x00a2, 0x00a5,
-	0x058f, 0x058f,
-	0x060b, 0x060b,
-	0x09f2, 0x09f3,
-	0x09fb, 0x09fb,
-	0x0af1, 0x0af1,
-	0x0bf9, 0x0bf9,
-	0x0e3f, 0x0e3f,
-	0x17db, 0x17db,
-	0x20a0, 0x20bd,
-	0xa838, 0xa838,
-	0xfdfc, 0xfdfc,
-	0xfe69, 0xfe69,
-	0xff04, 0xff04,
-	0xffe0, 0xffe1,
-	0xffe5, 0xffe6,
-}; /* CR_Sc */
-
-/* 'Sk': General Category */
-static const OnigCodePoint CR_Sk[] = {
-	28,
-	0x005e, 0x005e,
-	0x0060, 0x0060,
-	0x00a8, 0x00a8,
-	0x00af, 0x00af,
-	0x00b4, 0x00b4,
-	0x00b8, 0x00b8,
-	0x02c2, 0x02c5,
-	0x02d2, 0x02df,
-	0x02e5, 0x02eb,
-	0x02ed, 0x02ed,
-	0x02ef, 0x02ff,
-	0x0375, 0x0375,
-	0x0384, 0x0385,
-	0x1fbd, 0x1fbd,
-	0x1fbf, 0x1fc1,
-	0x1fcd, 0x1fcf,
-	0x1fdd, 0x1fdf,
-	0x1fed, 0x1fef,
-	0x1ffd, 0x1ffe,
-	0x309b, 0x309c,
-	0xa700, 0xa716,
-	0xa720, 0xa721,
-	0xa789, 0xa78a,
-	0xab5b, 0xab5b,
-	0xfbb2, 0xfbc1,
-	0xff3e, 0xff3e,
-	0xff40, 0xff40,
-	0xffe3, 0xffe3,
-}; /* CR_Sk */
-
-/* 'Sm': General Category */
-static const OnigCodePoint CR_Sm[] = {
-	64,
-	0x002b, 0x002b,
-	0x003c, 0x003e,
-	0x007c, 0x007c,
-	0x007e, 0x007e,
-	0x00ac, 0x00ac,
-	0x00b1, 0x00b1,
-	0x00d7, 0x00d7,
-	0x00f7, 0x00f7,
-	0x03f6, 0x03f6,
-	0x0606, 0x0608,
-	0x2044, 0x2044,
-	0x2052, 0x2052,
-	0x207a, 0x207c,
-	0x208a, 0x208c,
-	0x2118, 0x2118,
-	0x2140, 0x2144,
-	0x214b, 0x214b,
-	0x2190, 0x2194,
-	0x219a, 0x219b,
-	0x21a0, 0x21a0,
-	0x21a3, 0x21a3,
-	0x21a6, 0x21a6,
-	0x21ae, 0x21ae,
-	0x21ce, 0x21cf,
-	0x21d2, 0x21d2,
-	0x21d4, 0x21d4,
-	0x21f4, 0x22ff,
-	0x2320, 0x2321,
-	0x237c, 0x237c,
-	0x239b, 0x23b3,
-	0x23dc, 0x23e1,
-	0x25b7, 0x25b7,
-	0x25c1, 0x25c1,
-	0x25f8, 0x25ff,
-	0x266f, 0x266f,
-	0x27c0, 0x27c4,
-	0x27c7, 0x27e5,
-	0x27f0, 0x27ff,
-	0x2900, 0x2982,
-	0x2999, 0x29d7,
-	0x29dc, 0x29fb,
-	0x29fe, 0x2aff,
-	0x2b30, 0x2b44,
-	0x2b47, 0x2b4c,
-	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,
-	0x1eef0, 0x1eef1,
-}; /* CR_Sm */
-
-/* 'So': General Category */
-static const OnigCodePoint CR_So[] = {
-	165,
-	0x00a6, 0x00a6,
-	0x00a9, 0x00a9,
-	0x00ae, 0x00ae,
-	0x00b0, 0x00b0,
-	0x0482, 0x0482,
-	0x058d, 0x058e,
-	0x060e, 0x060f,
-	0x06de, 0x06de,
-	0x06e9, 0x06e9,
-	0x06fd, 0x06fe,
-	0x07f6, 0x07f6,
-	0x09fa, 0x09fa,
-	0x0b70, 0x0b70,
-	0x0bf3, 0x0bf8,
-	0x0bfa, 0x0bfa,
-	0x0c7f, 0x0c7f,
-	0x0d79, 0x0d79,
-	0x0f01, 0x0f03,
-	0x0f13, 0x0f13,
-	0x0f15, 0x0f17,
-	0x0f1a, 0x0f1f,
-	0x0f34, 0x0f34,
-	0x0f36, 0x0f36,
-	0x0f38, 0x0f38,
-	0x0fbe, 0x0fc5,
-	0x0fc7, 0x0fcc,
-	0x0fce, 0x0fcf,
-	0x0fd5, 0x0fd8,
-	0x109e, 0x109f,
-	0x1390, 0x1399,
-	0x1940, 0x1940,
-	0x19de, 0x19ff,
-	0x1b61, 0x1b6a,
-	0x1b74, 0x1b7c,
-	0x2100, 0x2101,
-	0x2103, 0x2106,
-	0x2108, 0x2109,
-	0x2114, 0x2114,
-	0x2116, 0x2117,
-	0x211e, 0x2123,
-	0x2125, 0x2125,
-	0x2127, 0x2127,
-	0x2129, 0x2129,
-	0x212e, 0x212e,
-	0x213a, 0x213b,
-	0x214a, 0x214a,
-	0x214c, 0x214d,
-	0x214f, 0x214f,
-	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,
-	0x23b4, 0x23db,
-	0x23e2, 0x23fa,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x249c, 0x24e9,
-	0x2500, 0x25b6,
-	0x25b8, 0x25c0,
-	0x25c2, 0x25f7,
-	0x2600, 0x266e,
-	0x2670, 0x2767,
-	0x2794, 0x27bf,
-	0x2800, 0x28ff,
-	0x2b00, 0x2b2f,
-	0x2b45, 0x2b46,
-	0x2b4d, 0x2b73,
-	0x2b76, 0x2b95,
-	0x2b98, 0x2bb9,
-	0x2bbd, 0x2bc8,
-	0x2bca, 0x2bd1,
-	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, 0x31e3,
-	0x3200, 0x321e,
-	0x322a, 0x3247,
-	0x3250, 0x3250,
-	0x3260, 0x327f,
-	0x328a, 0x32b0,
-	0x32c0, 0x32fe,
-	0x3300, 0x33ff,
-	0x4dc0, 0x4dff,
-	0xa490, 0xa4c6,
-	0xa828, 0xa82b,
-	0xa836, 0xa837,
-	0xa839, 0xa839,
-	0xaa77, 0xaa79,
-	0xfdfd, 0xfdfd,
-	0xffe4, 0xffe4,
-	0xffe8, 0xffe8,
-	0xffed, 0xffee,
-	0xfffc, 0xfffd,
-	0x10137, 0x1013f,
-	0x10179, 0x10189,
-	0x1018c, 0x1018c,
-	0x10190, 0x1019b,
-	0x101a0, 0x101a0,
-	0x101d0, 0x101fc,
-	0x10877, 0x10878,
-	0x10ac8, 0x10ac8,
-	0x16b3c, 0x16b3f,
-	0x16b45, 0x16b45,
-	0x1bc9c, 0x1bc9c,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d164,
-	0x1d16a, 0x1d16c,
-	0x1d183, 0x1d184,
-	0x1d18c, 0x1d1a9,
-	0x1d1ae, 0x1d1dd,
-	0x1d200, 0x1d241,
-	0x1d245, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0bf,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0f5,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f32c,
-	0x1f330, 0x1f37d,
-	0x1f380, 0x1f3ce,
-	0x1f3d4, 0x1f3f7,
-	0x1f400, 0x1f4fe,
-	0x1f500, 0x1f54a,
-	0x1f550, 0x1f579,
-	0x1f57b, 0x1f5a3,
-	0x1f5a5, 0x1f642,
-	0x1f645, 0x1f6cf,
-	0x1f6e0, 0x1f6ec,
-	0x1f6f0, 0x1f6f3,
-	0x1f700, 0x1f773,
-	0x1f780, 0x1f7d4,
-	0x1f800, 0x1f80b,
-	0x1f810, 0x1f847,
-	0x1f850, 0x1f859,
-	0x1f860, 0x1f887,
-	0x1f890, 0x1f8ad,
-}; /* CR_So */
-
-/* 'Z': Major Category */
-static const OnigCodePoint CR_Z[] = {
-	8,
-	0x0020, 0x0020,
-	0x00a0, 0x00a0,
-	0x1680, 0x1680,
-	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[] = {
-	7,
-	0x0020, 0x0020,
-	0x00a0, 0x00a0,
-	0x1680, 0x1680,
-	0x2000, 0x200a,
-	0x202f, 0x202f,
-	0x205f, 0x205f,
-	0x3000, 0x3000,
-}; /* CR_Zs */
-
-/* 'Math': Derived Property */
-static const OnigCodePoint CR_Math[] = {
-	138,
-	0x002b, 0x002b,
-	0x003c, 0x003e,
-	0x005e, 0x005e,
-	0x007c, 0x007c,
-	0x007e, 0x007e,
-	0x00ac, 0x00ac,
-	0x00b1, 0x00b1,
-	0x00d7, 0x00d7,
-	0x00f7, 0x00f7,
-	0x03d0, 0x03d2,
-	0x03d5, 0x03d5,
-	0x03f0, 0x03f1,
-	0x03f4, 0x03f6,
-	0x0606, 0x0608,
-	0x2016, 0x2016,
-	0x2032, 0x2034,
-	0x2040, 0x2040,
-	0x2044, 0x2044,
-	0x2052, 0x2052,
-	0x2061, 0x2064,
-	0x207a, 0x207e,
-	0x208a, 0x208e,
-	0x20d0, 0x20dc,
-	0x20e1, 0x20e1,
-	0x20e5, 0x20e6,
-	0x20eb, 0x20ef,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2118, 0x211d,
-	0x2124, 0x2124,
-	0x2128, 0x2129,
-	0x212c, 0x212d,
-	0x212f, 0x2131,
-	0x2133, 0x2138,
-	0x213c, 0x2149,
-	0x214b, 0x214b,
-	0x2190, 0x21a7,
-	0x21a9, 0x21ae,
-	0x21b0, 0x21b1,
-	0x21b6, 0x21b7,
-	0x21bc, 0x21db,
-	0x21dd, 0x21dd,
-	0x21e4, 0x21e5,
-	0x21f4, 0x22ff,
-	0x2308, 0x230b,
-	0x2320, 0x2321,
-	0x237c, 0x237c,
-	0x239b, 0x23b5,
-	0x23b7, 0x23b7,
-	0x23d0, 0x23d0,
-	0x23dc, 0x23e2,
-	0x25a0, 0x25a1,
-	0x25ae, 0x25b7,
-	0x25bc, 0x25c1,
-	0x25c6, 0x25c7,
-	0x25ca, 0x25cb,
-	0x25cf, 0x25d3,
-	0x25e2, 0x25e2,
-	0x25e4, 0x25e4,
-	0x25e7, 0x25ec,
-	0x25f8, 0x25ff,
-	0x2605, 0x2606,
-	0x2640, 0x2640,
-	0x2642, 0x2642,
-	0x2660, 0x2663,
-	0x266d, 0x266f,
-	0x27c0, 0x27ff,
-	0x2900, 0x2aff,
-	0x2b30, 0x2b44,
-	0x2b47, 0x2b4c,
-	0xfb29, 0xfb29,
-	0xfe61, 0xfe66,
-	0xfe68, 0xfe68,
-	0xff0b, 0xff0b,
-	0xff1c, 0xff1e,
-	0xff3c, 0xff3c,
-	0xff3e, 0xff3e,
-	0xff5c, 0xff5c,
-	0xff5e, 0xff5e,
-	0xffe2, 0xffe2,
-	0xffe9, 0xffec,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-}; /* CR_Math */
-
-/* 'Alphabetic': Derived Property */
-#define CR_Alphabetic CR_Alpha
-
-/* 'Lowercase': Derived Property */
-#define CR_Lowercase CR_Lower
-
-/* 'Uppercase': Derived Property */
-#define CR_Uppercase CR_Upper
-
-/* 'Cased': Derived Property */
-static const OnigCodePoint CR_Cased[] = {
-	127,
-	0x0041, 0x005a,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00b5, 0x00b5,
-	0x00ba, 0x00ba,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x01ba,
-	0x01bc, 0x01bf,
-	0x01c4, 0x0293,
-	0x0295, 0x02b8,
-	0x02c0, 0x02c1,
-	0x02e0, 0x02e4,
-	0x0345, 0x0345,
-	0x0370, 0x0373,
-	0x0376, 0x0377,
-	0x037a, 0x037d,
-	0x037f, 0x037f,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x048a, 0x052f,
-	0x0531, 0x0556,
-	0x0561, 0x0587,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x1d00, 0x1dbf,
-	0x1e00, 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, 0x209c,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2119, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x212d,
-	0x212f, 0x2134,
-	0x2139, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2160, 0x217f,
-	0x2183, 0x2184,
-	0x24b6, 0x24e9,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2ce4,
-	0x2ceb, 0x2cee,
-	0x2cf2, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0xa640, 0xa66d,
-	0xa680, 0xa69d,
-	0xa722, 0xa787,
-	0xa78b, 0xa78e,
-	0xa790, 0xa7ad,
-	0xa7b0, 0xa7b1,
-	0xa7f8, 0xa7fa,
-	0xab30, 0xab5a,
-	0xab5c, 0xab5f,
-	0xab64, 0xab65,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0x10400, 0x1044f,
-	0x118a0, 0x118df,
-	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, 0x1d7cb,
-	0x1f130, 0x1f149,
-	0x1f150, 0x1f169,
-	0x1f170, 0x1f189,
-}; /* CR_Cased */
-
-/* 'Case_Ignorable': Derived Property */
-static const OnigCodePoint CR_Case_Ignorable[] = {
-	335,
-	0x0027, 0x0027,
-	0x002e, 0x002e,
-	0x003a, 0x003a,
-	0x005e, 0x005e,
-	0x0060, 0x0060,
-	0x00a8, 0x00a8,
-	0x00ad, 0x00ad,
-	0x00af, 0x00af,
-	0x00b4, 0x00b4,
-	0x00b7, 0x00b8,
-	0x02b0, 0x036f,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x0384, 0x0385,
-	0x0387, 0x0387,
-	0x0483, 0x0489,
-	0x0559, 0x0559,
-	0x0591, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x05f4, 0x05f4,
-	0x0600, 0x0605,
-	0x0610, 0x061a,
-	0x061c, 0x061c,
-	0x0640, 0x0640,
-	0x064b, 0x065f,
-	0x0670, 0x0670,
-	0x06d6, 0x06dd,
-	0x06df, 0x06e8,
-	0x06ea, 0x06ed,
-	0x070f, 0x070f,
-	0x0711, 0x0711,
-	0x0730, 0x074a,
-	0x07a6, 0x07b0,
-	0x07eb, 0x07f5,
-	0x07fa, 0x07fa,
-	0x0816, 0x082d,
-	0x0859, 0x085b,
-	0x08e4, 0x0902,
-	0x093a, 0x093a,
-	0x093c, 0x093c,
-	0x0941, 0x0948,
-	0x094d, 0x094d,
-	0x0951, 0x0957,
-	0x0962, 0x0963,
-	0x0971, 0x0971,
-	0x0981, 0x0981,
-	0x09bc, 0x09bc,
-	0x09c1, 0x09c4,
-	0x09cd, 0x09cd,
-	0x09e2, 0x09e3,
-	0x0a01, 0x0a02,
-	0x0a3c, 0x0a3c,
-	0x0a41, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a70, 0x0a71,
-	0x0a75, 0x0a75,
-	0x0a81, 0x0a82,
-	0x0abc, 0x0abc,
-	0x0ac1, 0x0ac5,
-	0x0ac7, 0x0ac8,
-	0x0acd, 0x0acd,
-	0x0ae2, 0x0ae3,
-	0x0b01, 0x0b01,
-	0x0b3c, 0x0b3c,
-	0x0b3f, 0x0b3f,
-	0x0b41, 0x0b44,
-	0x0b4d, 0x0b4d,
-	0x0b56, 0x0b56,
-	0x0b62, 0x0b63,
-	0x0b82, 0x0b82,
-	0x0bc0, 0x0bc0,
-	0x0bcd, 0x0bcd,
-	0x0c00, 0x0c00,
-	0x0c3e, 0x0c40,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c62, 0x0c63,
-	0x0c81, 0x0c81,
-	0x0cbc, 0x0cbc,
-	0x0cbf, 0x0cbf,
-	0x0cc6, 0x0cc6,
-	0x0ccc, 0x0ccd,
-	0x0ce2, 0x0ce3,
-	0x0d01, 0x0d01,
-	0x0d41, 0x0d44,
-	0x0d4d, 0x0d4d,
-	0x0d62, 0x0d63,
-	0x0dca, 0x0dca,
-	0x0dd2, 0x0dd4,
-	0x0dd6, 0x0dd6,
-	0x0e31, 0x0e31,
-	0x0e34, 0x0e3a,
-	0x0e46, 0x0e4e,
-	0x0eb1, 0x0eb1,
-	0x0eb4, 0x0eb9,
-	0x0ebb, 0x0ebc,
-	0x0ec6, 0x0ec6,
-	0x0ec8, 0x0ecd,
-	0x0f18, 0x0f19,
-	0x0f35, 0x0f35,
-	0x0f37, 0x0f37,
-	0x0f39, 0x0f39,
-	0x0f71, 0x0f7e,
-	0x0f80, 0x0f84,
-	0x0f86, 0x0f87,
-	0x0f8d, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fc6, 0x0fc6,
-	0x102d, 0x1030,
-	0x1032, 0x1037,
-	0x1039, 0x103a,
-	0x103d, 0x103e,
-	0x1058, 0x1059,
-	0x105e, 0x1060,
-	0x1071, 0x1074,
-	0x1082, 0x1082,
-	0x1085, 0x1086,
-	0x108d, 0x108d,
-	0x109d, 0x109d,
-	0x10fc, 0x10fc,
-	0x135d, 0x135f,
-	0x1712, 0x1714,
-	0x1732, 0x1734,
-	0x1752, 0x1753,
-	0x1772, 0x1773,
-	0x17b4, 0x17b5,
-	0x17b7, 0x17bd,
-	0x17c6, 0x17c6,
-	0x17c9, 0x17d3,
-	0x17d7, 0x17d7,
-	0x17dd, 0x17dd,
-	0x180b, 0x180e,
-	0x1843, 0x1843,
-	0x18a9, 0x18a9,
-	0x1920, 0x1922,
-	0x1927, 0x1928,
-	0x1932, 0x1932,
-	0x1939, 0x193b,
-	0x1a17, 0x1a18,
-	0x1a1b, 0x1a1b,
-	0x1a56, 0x1a56,
-	0x1a58, 0x1a5e,
-	0x1a60, 0x1a60,
-	0x1a62, 0x1a62,
-	0x1a65, 0x1a6c,
-	0x1a73, 0x1a7c,
-	0x1a7f, 0x1a7f,
-	0x1aa7, 0x1aa7,
-	0x1ab0, 0x1abe,
-	0x1b00, 0x1b03,
-	0x1b34, 0x1b34,
-	0x1b36, 0x1b3a,
-	0x1b3c, 0x1b3c,
-	0x1b42, 0x1b42,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1b81,
-	0x1ba2, 0x1ba5,
-	0x1ba8, 0x1ba9,
-	0x1bab, 0x1bad,
-	0x1be6, 0x1be6,
-	0x1be8, 0x1be9,
-	0x1bed, 0x1bed,
-	0x1bef, 0x1bf1,
-	0x1c2c, 0x1c33,
-	0x1c36, 0x1c37,
-	0x1c78, 0x1c7d,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce0,
-	0x1ce2, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1cf4, 0x1cf4,
-	0x1cf8, 0x1cf9,
-	0x1d2c, 0x1d6a,
-	0x1d78, 0x1d78,
-	0x1d9b, 0x1df5,
-	0x1dfc, 0x1dff,
-	0x1fbd, 0x1fbd,
-	0x1fbf, 0x1fc1,
-	0x1fcd, 0x1fcf,
-	0x1fdd, 0x1fdf,
-	0x1fed, 0x1fef,
-	0x1ffd, 0x1ffe,
-	0x200b, 0x200f,
-	0x2018, 0x2019,
-	0x2024, 0x2024,
-	0x2027, 0x2027,
-	0x202a, 0x202e,
-	0x2060, 0x2064,
-	0x2066, 0x206f,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 0x209c,
-	0x20d0, 0x20f0,
-	0x2c7c, 0x2c7d,
-	0x2cef, 0x2cf1,
-	0x2d6f, 0x2d6f,
-	0x2d7f, 0x2d7f,
-	0x2de0, 0x2dff,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3005,
-	0x302a, 0x302d,
-	0x3031, 0x3035,
-	0x303b, 0x303b,
-	0x3099, 0x309e,
-	0x30fc, 0x30fe,
-	0xa015, 0xa015,
-	0xa4f8, 0xa4fd,
-	0xa60c, 0xa60c,
-	0xa66f, 0xa672,
-	0xa674, 0xa67d,
-	0xa67f, 0xa67f,
-	0xa69c, 0xa69d,
-	0xa69f, 0xa69f,
-	0xa6f0, 0xa6f1,
-	0xa700, 0xa721,
-	0xa770, 0xa770,
-	0xa788, 0xa78a,
-	0xa7f8, 0xa7f9,
-	0xa802, 0xa802,
-	0xa806, 0xa806,
-	0xa80b, 0xa80b,
-	0xa825, 0xa826,
-	0xa8c4, 0xa8c4,
-	0xa8e0, 0xa8f1,
-	0xa926, 0xa92d,
-	0xa947, 0xa951,
-	0xa980, 0xa982,
-	0xa9b3, 0xa9b3,
-	0xa9b6, 0xa9b9,
-	0xa9bc, 0xa9bc,
-	0xa9cf, 0xa9cf,
-	0xa9e5, 0xa9e6,
-	0xaa29, 0xaa2e,
-	0xaa31, 0xaa32,
-	0xaa35, 0xaa36,
-	0xaa43, 0xaa43,
-	0xaa4c, 0xaa4c,
-	0xaa70, 0xaa70,
-	0xaa7c, 0xaa7c,
-	0xaab0, 0xaab0,
-	0xaab2, 0xaab4,
-	0xaab7, 0xaab8,
-	0xaabe, 0xaabf,
-	0xaac1, 0xaac1,
-	0xaadd, 0xaadd,
-	0xaaec, 0xaaed,
-	0xaaf3, 0xaaf4,
-	0xaaf6, 0xaaf6,
-	0xab5b, 0xab5f,
-	0xabe5, 0xabe5,
-	0xabe8, 0xabe8,
-	0xabed, 0xabed,
-	0xfb1e, 0xfb1e,
-	0xfbb2, 0xfbc1,
-	0xfe00, 0xfe0f,
-	0xfe13, 0xfe13,
-	0xfe20, 0xfe2d,
-	0xfe52, 0xfe52,
-	0xfe55, 0xfe55,
-	0xfeff, 0xfeff,
-	0xff07, 0xff07,
-	0xff0e, 0xff0e,
-	0xff1a, 0xff1a,
-	0xff3e, 0xff3e,
-	0xff40, 0xff40,
-	0xff70, 0xff70,
-	0xff9e, 0xff9f,
-	0xffe3, 0xffe3,
-	0xfff9, 0xfffb,
-	0x101fd, 0x101fd,
-	0x102e0, 0x102e0,
-	0x10376, 0x1037a,
-	0x10a01, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a0f,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x10ae5, 0x10ae6,
-	0x11001, 0x11001,
-	0x11038, 0x11046,
-	0x1107f, 0x11081,
-	0x110b3, 0x110b6,
-	0x110b9, 0x110ba,
-	0x110bd, 0x110bd,
-	0x11100, 0x11102,
-	0x11127, 0x1112b,
-	0x1112d, 0x11134,
-	0x11173, 0x11173,
-	0x11180, 0x11181,
-	0x111b6, 0x111be,
-	0x1122f, 0x11231,
-	0x11234, 0x11234,
-	0x11236, 0x11237,
-	0x112df, 0x112df,
-	0x112e3, 0x112ea,
-	0x11301, 0x11301,
-	0x1133c, 0x1133c,
-	0x11340, 0x11340,
-	0x11366, 0x1136c,
-	0x11370, 0x11374,
-	0x114b3, 0x114b8,
-	0x114ba, 0x114ba,
-	0x114bf, 0x114c0,
-	0x114c2, 0x114c3,
-	0x115b2, 0x115b5,
-	0x115bc, 0x115bd,
-	0x115bf, 0x115c0,
-	0x11633, 0x1163a,
-	0x1163d, 0x1163d,
-	0x1163f, 0x11640,
-	0x116ab, 0x116ab,
-	0x116ad, 0x116ad,
-	0x116b0, 0x116b5,
-	0x116b7, 0x116b7,
-	0x16af0, 0x16af4,
-	0x16b30, 0x16b36,
-	0x16b40, 0x16b43,
-	0x16f8f, 0x16f9f,
-	0x1bc9d, 0x1bc9e,
-	0x1bca0, 0x1bca3,
-	0x1d167, 0x1d169,
-	0x1d173, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-	0x1d242, 0x1d244,
-	0x1e8d0, 0x1e8d6,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-}; /* CR_Case_Ignorable */
-
-/* 'Changes_When_Lowercased': Derived Property */
-static const OnigCodePoint CR_Changes_When_Lowercased[] = {
-	585,
-	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, 0x01c5,
-	0x01c7, 0x01c8,
-	0x01ca, 0x01cb,
-	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, 0x01f2,
-	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,
-	0x0243, 0x0246,
-	0x0248, 0x0248,
-	0x024a, 0x024a,
-	0x024c, 0x024c,
-	0x024e, 0x024e,
-	0x0370, 0x0370,
-	0x0372, 0x0372,
-	0x0376, 0x0376,
-	0x037f, 0x037f,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x038f,
-	0x0391, 0x03a1,
-	0x03a3, 0x03ab,
-	0x03cf, 0x03cf,
-	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,
-	0x04fa, 0x04fa,
-	0x04fc, 0x04fc,
-	0x04fe, 0x04fe,
-	0x0500, 0x0500,
-	0x0502, 0x0502,
-	0x0504, 0x0504,
-	0x0506, 0x0506,
-	0x0508, 0x0508,
-	0x050a, 0x050a,
-	0x050c, 0x050c,
-	0x050e, 0x050e,
-	0x0510, 0x0510,
-	0x0512, 0x0512,
-	0x0514, 0x0514,
-	0x0516, 0x0516,
-	0x0518, 0x0518,
-	0x051a, 0x051a,
-	0x051c, 0x051c,
-	0x051e, 0x051e,
-	0x0520, 0x0520,
-	0x0522, 0x0522,
-	0x0524, 0x0524,
-	0x0526, 0x0526,
-	0x0528, 0x0528,
-	0x052a, 0x052a,
-	0x052c, 0x052c,
-	0x052e, 0x052e,
-	0x0531, 0x0556,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	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,
-	0x1e9e, 0x1e9e,
-	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,
-	0x1efa, 0x1efa,
-	0x1efc, 0x1efc,
-	0x1efe, 0x1efe,
-	0x1f08, 0x1f0f,
-	0x1f18, 0x1f1d,
-	0x1f28, 0x1f2f,
-	0x1f38, 0x1f3f,
-	0x1f48, 0x1f4d,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f5f,
-	0x1f68, 0x1f6f,
-	0x1f88, 0x1f8f,
-	0x1f98, 0x1f9f,
-	0x1fa8, 0x1faf,
-	0x1fb8, 0x1fbc,
-	0x1fc8, 0x1fcc,
-	0x1fd8, 0x1fdb,
-	0x1fe8, 0x1fec,
-	0x1ff8, 0x1ffc,
-	0x2126, 0x2126,
-	0x212a, 0x212b,
-	0x2132, 0x2132,
-	0x2160, 0x216f,
-	0x2183, 0x2183,
-	0x24b6, 0x24cf,
-	0x2c00, 0x2c2e,
-	0x2c60, 0x2c60,
-	0x2c62, 0x2c64,
-	0x2c67, 0x2c67,
-	0x2c69, 0x2c69,
-	0x2c6b, 0x2c6b,
-	0x2c6d, 0x2c70,
-	0x2c72, 0x2c72,
-	0x2c75, 0x2c75,
-	0x2c7e, 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,
-	0x2ceb, 0x2ceb,
-	0x2ced, 0x2ced,
-	0x2cf2, 0x2cf2,
-	0xa640, 0xa640,
-	0xa642, 0xa642,
-	0xa644, 0xa644,
-	0xa646, 0xa646,
-	0xa648, 0xa648,
-	0xa64a, 0xa64a,
-	0xa64c, 0xa64c,
-	0xa64e, 0xa64e,
-	0xa650, 0xa650,
-	0xa652, 0xa652,
-	0xa654, 0xa654,
-	0xa656, 0xa656,
-	0xa658, 0xa658,
-	0xa65a, 0xa65a,
-	0xa65c, 0xa65c,
-	0xa65e, 0xa65e,
-	0xa660, 0xa660,
-	0xa662, 0xa662,
-	0xa664, 0xa664,
-	0xa666, 0xa666,
-	0xa668, 0xa668,
-	0xa66a, 0xa66a,
-	0xa66c, 0xa66c,
-	0xa680, 0xa680,
-	0xa682, 0xa682,
-	0xa684, 0xa684,
-	0xa686, 0xa686,
-	0xa688, 0xa688,
-	0xa68a, 0xa68a,
-	0xa68c, 0xa68c,
-	0xa68e, 0xa68e,
-	0xa690, 0xa690,
-	0xa692, 0xa692,
-	0xa694, 0xa694,
-	0xa696, 0xa696,
-	0xa698, 0xa698,
-	0xa69a, 0xa69a,
-	0xa722, 0xa722,
-	0xa724, 0xa724,
-	0xa726, 0xa726,
-	0xa728, 0xa728,
-	0xa72a, 0xa72a,
-	0xa72c, 0xa72c,
-	0xa72e, 0xa72e,
-	0xa732, 0xa732,
-	0xa734, 0xa734,
-	0xa736, 0xa736,
-	0xa738, 0xa738,
-	0xa73a, 0xa73a,
-	0xa73c, 0xa73c,
-	0xa73e, 0xa73e,
-	0xa740, 0xa740,
-	0xa742, 0xa742,
-	0xa744, 0xa744,
-	0xa746, 0xa746,
-	0xa748, 0xa748,
-	0xa74a, 0xa74a,
-	0xa74c, 0xa74c,
-	0xa74e, 0xa74e,
-	0xa750, 0xa750,
-	0xa752, 0xa752,
-	0xa754, 0xa754,
-	0xa756, 0xa756,
-	0xa758, 0xa758,
-	0xa75a, 0xa75a,
-	0xa75c, 0xa75c,
-	0xa75e, 0xa75e,
-	0xa760, 0xa760,
-	0xa762, 0xa762,
-	0xa764, 0xa764,
-	0xa766, 0xa766,
-	0xa768, 0xa768,
-	0xa76a, 0xa76a,
-	0xa76c, 0xa76c,
-	0xa76e, 0xa76e,
-	0xa779, 0xa779,
-	0xa77b, 0xa77b,
-	0xa77d, 0xa77e,
-	0xa780, 0xa780,
-	0xa782, 0xa782,
-	0xa784, 0xa784,
-	0xa786, 0xa786,
-	0xa78b, 0xa78b,
-	0xa78d, 0xa78d,
-	0xa790, 0xa790,
-	0xa792, 0xa792,
-	0xa796, 0xa796,
-	0xa798, 0xa798,
-	0xa79a, 0xa79a,
-	0xa79c, 0xa79c,
-	0xa79e, 0xa79e,
-	0xa7a0, 0xa7a0,
-	0xa7a2, 0xa7a2,
-	0xa7a4, 0xa7a4,
-	0xa7a6, 0xa7a6,
-	0xa7a8, 0xa7a8,
-	0xa7aa, 0xa7ad,
-	0xa7b0, 0xa7b1,
-	0xff21, 0xff3a,
-	0x10400, 0x10427,
-	0x118a0, 0x118bf,
-}; /* CR_Changes_When_Lowercased */
-
-/* 'Changes_When_Uppercased': Derived Property */
-static const OnigCodePoint CR_Changes_When_Uppercased[] = {
-	599,
-	0x0061, 0x007a,
-	0x00b5, 0x00b5,
-	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, 0x0137,
-	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, 0x018c,
-	0x0192, 0x0192,
-	0x0195, 0x0195,
-	0x0199, 0x019a,
-	0x019e, 0x019e,
-	0x01a1, 0x01a1,
-	0x01a3, 0x01a3,
-	0x01a5, 0x01a5,
-	0x01a8, 0x01a8,
-	0x01ad, 0x01ad,
-	0x01b0, 0x01b0,
-	0x01b4, 0x01b4,
-	0x01b6, 0x01b6,
-	0x01b9, 0x01b9,
-	0x01bd, 0x01bd,
-	0x01bf, 0x01bf,
-	0x01c5, 0x01c6,
-	0x01c8, 0x01c9,
-	0x01cb, 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,
-	0x01f2, 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,
-	0x0223, 0x0223,
-	0x0225, 0x0225,
-	0x0227, 0x0227,
-	0x0229, 0x0229,
-	0x022b, 0x022b,
-	0x022d, 0x022d,
-	0x022f, 0x022f,
-	0x0231, 0x0231,
-	0x0233, 0x0233,
-	0x023c, 0x023c,
-	0x023f, 0x0240,
-	0x0242, 0x0242,
-	0x0247, 0x0247,
-	0x0249, 0x0249,
-	0x024b, 0x024b,
-	0x024d, 0x024d,
-	0x024f, 0x0254,
-	0x0256, 0x0257,
-	0x0259, 0x0259,
-	0x025b, 0x025c,
-	0x0260, 0x0261,
-	0x0263, 0x0263,
-	0x0265, 0x0266,
-	0x0268, 0x0269,
-	0x026b, 0x026c,
-	0x026f, 0x026f,
-	0x0271, 0x0272,
-	0x0275, 0x0275,
-	0x027d, 0x027d,
-	0x0280, 0x0280,
-	0x0283, 0x0283,
-	0x0287, 0x028c,
-	0x0292, 0x0292,
-	0x029e, 0x029e,
-	0x0345, 0x0345,
-	0x0371, 0x0371,
-	0x0373, 0x0373,
-	0x0377, 0x0377,
-	0x037b, 0x037d,
-	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, 0x03fb,
-	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, 0x04cf,
-	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,
-	0x04fb, 0x04fb,
-	0x04fd, 0x04fd,
-	0x04ff, 0x04ff,
-	0x0501, 0x0501,
-	0x0503, 0x0503,
-	0x0505, 0x0505,
-	0x0507, 0x0507,
-	0x0509, 0x0509,
-	0x050b, 0x050b,
-	0x050d, 0x050d,
-	0x050f, 0x050f,
-	0x0511, 0x0511,
-	0x0513, 0x0513,
-	0x0515, 0x0515,
-	0x0517, 0x0517,
-	0x0519, 0x0519,
-	0x051b, 0x051b,
-	0x051d, 0x051d,
-	0x051f, 0x051f,
-	0x0521, 0x0521,
-	0x0523, 0x0523,
-	0x0525, 0x0525,
-	0x0527, 0x0527,
-	0x0529, 0x0529,
-	0x052b, 0x052b,
-	0x052d, 0x052d,
-	0x052f, 0x052f,
-	0x0561, 0x0587,
-	0x1d79, 0x1d79,
-	0x1d7d, 0x1d7d,
-	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,
-	0x1efb, 0x1efb,
-	0x1efd, 0x1efd,
-	0x1eff, 0x1f07,
-	0x1f10, 0x1f15,
-	0x1f20, 0x1f27,
-	0x1f30, 0x1f37,
-	0x1f40, 0x1f45,
-	0x1f50, 0x1f57,
-	0x1f60, 0x1f67,
-	0x1f70, 0x1f7d,
-	0x1f80, 0x1fb4,
-	0x1fb6, 0x1fb7,
-	0x1fbc, 0x1fbc,
-	0x1fbe, 0x1fbe,
-	0x1fc2, 0x1fc4,
-	0x1fc6, 0x1fc7,
-	0x1fcc, 0x1fcc,
-	0x1fd0, 0x1fd3,
-	0x1fd6, 0x1fd7,
-	0x1fe0, 0x1fe7,
-	0x1ff2, 0x1ff4,
-	0x1ff6, 0x1ff7,
-	0x1ffc, 0x1ffc,
-	0x214e, 0x214e,
-	0x2170, 0x217f,
-	0x2184, 0x2184,
-	0x24d0, 0x24e9,
-	0x2c30, 0x2c5e,
-	0x2c61, 0x2c61,
-	0x2c65, 0x2c66,
-	0x2c68, 0x2c68,
-	0x2c6a, 0x2c6a,
-	0x2c6c, 0x2c6c,
-	0x2c73, 0x2c73,
-	0x2c76, 0x2c76,
-	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, 0x2ce3,
-	0x2cec, 0x2cec,
-	0x2cee, 0x2cee,
-	0x2cf3, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0xa641, 0xa641,
-	0xa643, 0xa643,
-	0xa645, 0xa645,
-	0xa647, 0xa647,
-	0xa649, 0xa649,
-	0xa64b, 0xa64b,
-	0xa64d, 0xa64d,
-	0xa64f, 0xa64f,
-	0xa651, 0xa651,
-	0xa653, 0xa653,
-	0xa655, 0xa655,
-	0xa657, 0xa657,
-	0xa659, 0xa659,
-	0xa65b, 0xa65b,
-	0xa65d, 0xa65d,
-	0xa65f, 0xa65f,
-	0xa661, 0xa661,
-	0xa663, 0xa663,
-	0xa665, 0xa665,
-	0xa667, 0xa667,
-	0xa669, 0xa669,
-	0xa66b, 0xa66b,
-	0xa66d, 0xa66d,
-	0xa681, 0xa681,
-	0xa683, 0xa683,
-	0xa685, 0xa685,
-	0xa687, 0xa687,
-	0xa689, 0xa689,
-	0xa68b, 0xa68b,
-	0xa68d, 0xa68d,
-	0xa68f, 0xa68f,
-	0xa691, 0xa691,
-	0xa693, 0xa693,
-	0xa695, 0xa695,
-	0xa697, 0xa697,
-	0xa699, 0xa699,
-	0xa69b, 0xa69b,
-	0xa723, 0xa723,
-	0xa725, 0xa725,
-	0xa727, 0xa727,
-	0xa729, 0xa729,
-	0xa72b, 0xa72b,
-	0xa72d, 0xa72d,
-	0xa72f, 0xa72f,
-	0xa733, 0xa733,
-	0xa735, 0xa735,
-	0xa737, 0xa737,
-	0xa739, 0xa739,
-	0xa73b, 0xa73b,
-	0xa73d, 0xa73d,
-	0xa73f, 0xa73f,
-	0xa741, 0xa741,
-	0xa743, 0xa743,
-	0xa745, 0xa745,
-	0xa747, 0xa747,
-	0xa749, 0xa749,
-	0xa74b, 0xa74b,
-	0xa74d, 0xa74d,
-	0xa74f, 0xa74f,
-	0xa751, 0xa751,
-	0xa753, 0xa753,
-	0xa755, 0xa755,
-	0xa757, 0xa757,
-	0xa759, 0xa759,
-	0xa75b, 0xa75b,
-	0xa75d, 0xa75d,
-	0xa75f, 0xa75f,
-	0xa761, 0xa761,
-	0xa763, 0xa763,
-	0xa765, 0xa765,
-	0xa767, 0xa767,
-	0xa769, 0xa769,
-	0xa76b, 0xa76b,
-	0xa76d, 0xa76d,
-	0xa76f, 0xa76f,
-	0xa77a, 0xa77a,
-	0xa77c, 0xa77c,
-	0xa77f, 0xa77f,
-	0xa781, 0xa781,
-	0xa783, 0xa783,
-	0xa785, 0xa785,
-	0xa787, 0xa787,
-	0xa78c, 0xa78c,
-	0xa791, 0xa791,
-	0xa793, 0xa793,
-	0xa797, 0xa797,
-	0xa799, 0xa799,
-	0xa79b, 0xa79b,
-	0xa79d, 0xa79d,
-	0xa79f, 0xa79f,
-	0xa7a1, 0xa7a1,
-	0xa7a3, 0xa7a3,
-	0xa7a5, 0xa7a5,
-	0xa7a7, 0xa7a7,
-	0xa7a9, 0xa7a9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff41, 0xff5a,
-	0x10428, 0x1044f,
-	0x118c0, 0x118df,
-}; /* CR_Changes_When_Uppercased */
-
-/* 'Changes_When_Titlecased': Derived Property */
-static const OnigCodePoint CR_Changes_When_Titlecased[] = {
-	600,
-	0x0061, 0x007a,
-	0x00b5, 0x00b5,
-	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, 0x0137,
-	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, 0x018c,
-	0x0192, 0x0192,
-	0x0195, 0x0195,
-	0x0199, 0x019a,
-	0x019e, 0x019e,
-	0x01a1, 0x01a1,
-	0x01a3, 0x01a3,
-	0x01a5, 0x01a5,
-	0x01a8, 0x01a8,
-	0x01ad, 0x01ad,
-	0x01b0, 0x01b0,
-	0x01b4, 0x01b4,
-	0x01b6, 0x01b6,
-	0x01b9, 0x01b9,
-	0x01bd, 0x01bd,
-	0x01bf, 0x01bf,
-	0x01c4, 0x01c4,
-	0x01c6, 0x01c7,
-	0x01c9, 0x01ca,
-	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, 0x01f1,
-	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,
-	0x0223, 0x0223,
-	0x0225, 0x0225,
-	0x0227, 0x0227,
-	0x0229, 0x0229,
-	0x022b, 0x022b,
-	0x022d, 0x022d,
-	0x022f, 0x022f,
-	0x0231, 0x0231,
-	0x0233, 0x0233,
-	0x023c, 0x023c,
-	0x023f, 0x0240,
-	0x0242, 0x0242,
-	0x0247, 0x0247,
-	0x0249, 0x0249,
-	0x024b, 0x024b,
-	0x024d, 0x024d,
-	0x024f, 0x0254,
-	0x0256, 0x0257,
-	0x0259, 0x0259,
-	0x025b, 0x025c,
-	0x0260, 0x0261,
-	0x0263, 0x0263,
-	0x0265, 0x0266,
-	0x0268, 0x0269,
-	0x026b, 0x026c,
-	0x026f, 0x026f,
-	0x0271, 0x0272,
-	0x0275, 0x0275,
-	0x027d, 0x027d,
-	0x0280, 0x0280,
-	0x0283, 0x0283,
-	0x0287, 0x028c,
-	0x0292, 0x0292,
-	0x029e, 0x029e,
-	0x0345, 0x0345,
-	0x0371, 0x0371,
-	0x0373, 0x0373,
-	0x0377, 0x0377,
-	0x037b, 0x037d,
-	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, 0x03fb,
-	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, 0x04cf,
-	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,
-	0x04fb, 0x04fb,
-	0x04fd, 0x04fd,
-	0x04ff, 0x04ff,
-	0x0501, 0x0501,
-	0x0503, 0x0503,
-	0x0505, 0x0505,
-	0x0507, 0x0507,
-	0x0509, 0x0509,
-	0x050b, 0x050b,
-	0x050d, 0x050d,
-	0x050f, 0x050f,
-	0x0511, 0x0511,
-	0x0513, 0x0513,
-	0x0515, 0x0515,
-	0x0517, 0x0517,
-	0x0519, 0x0519,
-	0x051b, 0x051b,
-	0x051d, 0x051d,
-	0x051f, 0x051f,
-	0x0521, 0x0521,
-	0x0523, 0x0523,
-	0x0525, 0x0525,
-	0x0527, 0x0527,
-	0x0529, 0x0529,
-	0x052b, 0x052b,
-	0x052d, 0x052d,
-	0x052f, 0x052f,
-	0x0561, 0x0587,
-	0x1d79, 0x1d79,
-	0x1d7d, 0x1d7d,
-	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,
-	0x1efb, 0x1efb,
-	0x1efd, 0x1efd,
-	0x1eff, 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,
-	0x214e, 0x214e,
-	0x2170, 0x217f,
-	0x2184, 0x2184,
-	0x24d0, 0x24e9,
-	0x2c30, 0x2c5e,
-	0x2c61, 0x2c61,
-	0x2c65, 0x2c66,
-	0x2c68, 0x2c68,
-	0x2c6a, 0x2c6a,
-	0x2c6c, 0x2c6c,
-	0x2c73, 0x2c73,
-	0x2c76, 0x2c76,
-	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, 0x2ce3,
-	0x2cec, 0x2cec,
-	0x2cee, 0x2cee,
-	0x2cf3, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0xa641, 0xa641,
-	0xa643, 0xa643,
-	0xa645, 0xa645,
-	0xa647, 0xa647,
-	0xa649, 0xa649,
-	0xa64b, 0xa64b,
-	0xa64d, 0xa64d,
-	0xa64f, 0xa64f,
-	0xa651, 0xa651,
-	0xa653, 0xa653,
-	0xa655, 0xa655,
-	0xa657, 0xa657,
-	0xa659, 0xa659,
-	0xa65b, 0xa65b,
-	0xa65d, 0xa65d,
-	0xa65f, 0xa65f,
-	0xa661, 0xa661,
-	0xa663, 0xa663,
-	0xa665, 0xa665,
-	0xa667, 0xa667,
-	0xa669, 0xa669,
-	0xa66b, 0xa66b,
-	0xa66d, 0xa66d,
-	0xa681, 0xa681,
-	0xa683, 0xa683,
-	0xa685, 0xa685,
-	0xa687, 0xa687,
-	0xa689, 0xa689,
-	0xa68b, 0xa68b,
-	0xa68d, 0xa68d,
-	0xa68f, 0xa68f,
-	0xa691, 0xa691,
-	0xa693, 0xa693,
-	0xa695, 0xa695,
-	0xa697, 0xa697,
-	0xa699, 0xa699,
-	0xa69b, 0xa69b,
-	0xa723, 0xa723,
-	0xa725, 0xa725,
-	0xa727, 0xa727,
-	0xa729, 0xa729,
-	0xa72b, 0xa72b,
-	0xa72d, 0xa72d,
-	0xa72f, 0xa72f,
-	0xa733, 0xa733,
-	0xa735, 0xa735,
-	0xa737, 0xa737,
-	0xa739, 0xa739,
-	0xa73b, 0xa73b,
-	0xa73d, 0xa73d,
-	0xa73f, 0xa73f,
-	0xa741, 0xa741,
-	0xa743, 0xa743,
-	0xa745, 0xa745,
-	0xa747, 0xa747,
-	0xa749, 0xa749,
-	0xa74b, 0xa74b,
-	0xa74d, 0xa74d,
-	0xa74f, 0xa74f,
-	0xa751, 0xa751,
-	0xa753, 0xa753,
-	0xa755, 0xa755,
-	0xa757, 0xa757,
-	0xa759, 0xa759,
-	0xa75b, 0xa75b,
-	0xa75d, 0xa75d,
-	0xa75f, 0xa75f,
-	0xa761, 0xa761,
-	0xa763, 0xa763,
-	0xa765, 0xa765,
-	0xa767, 0xa767,
-	0xa769, 0xa769,
-	0xa76b, 0xa76b,
-	0xa76d, 0xa76d,
-	0xa76f, 0xa76f,
-	0xa77a, 0xa77a,
-	0xa77c, 0xa77c,
-	0xa77f, 0xa77f,
-	0xa781, 0xa781,
-	0xa783, 0xa783,
-	0xa785, 0xa785,
-	0xa787, 0xa787,
-	0xa78c, 0xa78c,
-	0xa791, 0xa791,
-	0xa793, 0xa793,
-	0xa797, 0xa797,
-	0xa799, 0xa799,
-	0xa79b, 0xa79b,
-	0xa79d, 0xa79d,
-	0xa79f, 0xa79f,
-	0xa7a1, 0xa7a1,
-	0xa7a3, 0xa7a3,
-	0xa7a5, 0xa7a5,
-	0xa7a7, 0xa7a7,
-	0xa7a9, 0xa7a9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff41, 0xff5a,
-	0x10428, 0x1044f,
-	0x118c0, 0x118df,
-}; /* CR_Changes_When_Titlecased */
-
-/* 'Changes_When_Casefolded': Derived Property */
-static const OnigCodePoint CR_Changes_When_Casefolded[] = {
-	596,
-	0x0041, 0x005a,
-	0x00b5, 0x00b5,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00df,
-	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,
-	0x0149, 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,
-	0x017f, 0x017f,
-	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, 0x01c5,
-	0x01c7, 0x01c8,
-	0x01ca, 0x01cb,
-	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, 0x01f2,
-	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,
-	0x0243, 0x0246,
-	0x0248, 0x0248,
-	0x024a, 0x024a,
-	0x024c, 0x024c,
-	0x024e, 0x024e,
-	0x0345, 0x0345,
-	0x0370, 0x0370,
-	0x0372, 0x0372,
-	0x0376, 0x0376,
-	0x037f, 0x037f,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x038f,
-	0x0391, 0x03a1,
-	0x03a3, 0x03ab,
-	0x03c2, 0x03c2,
-	0x03cf, 0x03d1,
-	0x03d5, 0x03d6,
-	0x03d8, 0x03d8,
-	0x03da, 0x03da,
-	0x03dc, 0x03dc,
-	0x03de, 0x03de,
-	0x03e0, 0x03e0,
-	0x03e2, 0x03e2,
-	0x03e4, 0x03e4,
-	0x03e6, 0x03e6,
-	0x03e8, 0x03e8,
-	0x03ea, 0x03ea,
-	0x03ec, 0x03ec,
-	0x03ee, 0x03ee,
-	0x03f0, 0x03f1,
-	0x03f4, 0x03f5,
-	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,
-	0x04fa, 0x04fa,
-	0x04fc, 0x04fc,
-	0x04fe, 0x04fe,
-	0x0500, 0x0500,
-	0x0502, 0x0502,
-	0x0504, 0x0504,
-	0x0506, 0x0506,
-	0x0508, 0x0508,
-	0x050a, 0x050a,
-	0x050c, 0x050c,
-	0x050e, 0x050e,
-	0x0510, 0x0510,
-	0x0512, 0x0512,
-	0x0514, 0x0514,
-	0x0516, 0x0516,
-	0x0518, 0x0518,
-	0x051a, 0x051a,
-	0x051c, 0x051c,
-	0x051e, 0x051e,
-	0x0520, 0x0520,
-	0x0522, 0x0522,
-	0x0524, 0x0524,
-	0x0526, 0x0526,
-	0x0528, 0x0528,
-	0x052a, 0x052a,
-	0x052c, 0x052c,
-	0x052e, 0x052e,
-	0x0531, 0x0556,
-	0x0587, 0x0587,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	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,
-	0x1e9a, 0x1e9b,
-	0x1e9e, 0x1e9e,
-	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,
-	0x1efa, 0x1efa,
-	0x1efc, 0x1efc,
-	0x1efe, 0x1efe,
-	0x1f08, 0x1f0f,
-	0x1f18, 0x1f1d,
-	0x1f28, 0x1f2f,
-	0x1f38, 0x1f3f,
-	0x1f48, 0x1f4d,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f5f,
-	0x1f68, 0x1f6f,
-	0x1f80, 0x1faf,
-	0x1fb2, 0x1fb4,
-	0x1fb7, 0x1fbc,
-	0x1fc2, 0x1fc4,
-	0x1fc7, 0x1fcc,
-	0x1fd8, 0x1fdb,
-	0x1fe8, 0x1fec,
-	0x1ff2, 0x1ff4,
-	0x1ff7, 0x1ffc,
-	0x2126, 0x2126,
-	0x212a, 0x212b,
-	0x2132, 0x2132,
-	0x2160, 0x216f,
-	0x2183, 0x2183,
-	0x24b6, 0x24cf,
-	0x2c00, 0x2c2e,
-	0x2c60, 0x2c60,
-	0x2c62, 0x2c64,
-	0x2c67, 0x2c67,
-	0x2c69, 0x2c69,
-	0x2c6b, 0x2c6b,
-	0x2c6d, 0x2c70,
-	0x2c72, 0x2c72,
-	0x2c75, 0x2c75,
-	0x2c7e, 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,
-	0x2ceb, 0x2ceb,
-	0x2ced, 0x2ced,
-	0x2cf2, 0x2cf2,
-	0xa640, 0xa640,
-	0xa642, 0xa642,
-	0xa644, 0xa644,
-	0xa646, 0xa646,
-	0xa648, 0xa648,
-	0xa64a, 0xa64a,
-	0xa64c, 0xa64c,
-	0xa64e, 0xa64e,
-	0xa650, 0xa650,
-	0xa652, 0xa652,
-	0xa654, 0xa654,
-	0xa656, 0xa656,
-	0xa658, 0xa658,
-	0xa65a, 0xa65a,
-	0xa65c, 0xa65c,
-	0xa65e, 0xa65e,
-	0xa660, 0xa660,
-	0xa662, 0xa662,
-	0xa664, 0xa664,
-	0xa666, 0xa666,
-	0xa668, 0xa668,
-	0xa66a, 0xa66a,
-	0xa66c, 0xa66c,
-	0xa680, 0xa680,
-	0xa682, 0xa682,
-	0xa684, 0xa684,
-	0xa686, 0xa686,
-	0xa688, 0xa688,
-	0xa68a, 0xa68a,
-	0xa68c, 0xa68c,
-	0xa68e, 0xa68e,
-	0xa690, 0xa690,
-	0xa692, 0xa692,
-	0xa694, 0xa694,
-	0xa696, 0xa696,
-	0xa698, 0xa698,
-	0xa69a, 0xa69a,
-	0xa722, 0xa722,
-	0xa724, 0xa724,
-	0xa726, 0xa726,
-	0xa728, 0xa728,
-	0xa72a, 0xa72a,
-	0xa72c, 0xa72c,
-	0xa72e, 0xa72e,
-	0xa732, 0xa732,
-	0xa734, 0xa734,
-	0xa736, 0xa736,
-	0xa738, 0xa738,
-	0xa73a, 0xa73a,
-	0xa73c, 0xa73c,
-	0xa73e, 0xa73e,
-	0xa740, 0xa740,
-	0xa742, 0xa742,
-	0xa744, 0xa744,
-	0xa746, 0xa746,
-	0xa748, 0xa748,
-	0xa74a, 0xa74a,
-	0xa74c, 0xa74c,
-	0xa74e, 0xa74e,
-	0xa750, 0xa750,
-	0xa752, 0xa752,
-	0xa754, 0xa754,
-	0xa756, 0xa756,
-	0xa758, 0xa758,
-	0xa75a, 0xa75a,
-	0xa75c, 0xa75c,
-	0xa75e, 0xa75e,
-	0xa760, 0xa760,
-	0xa762, 0xa762,
-	0xa764, 0xa764,
-	0xa766, 0xa766,
-	0xa768, 0xa768,
-	0xa76a, 0xa76a,
-	0xa76c, 0xa76c,
-	0xa76e, 0xa76e,
-	0xa779, 0xa779,
-	0xa77b, 0xa77b,
-	0xa77d, 0xa77e,
-	0xa780, 0xa780,
-	0xa782, 0xa782,
-	0xa784, 0xa784,
-	0xa786, 0xa786,
-	0xa78b, 0xa78b,
-	0xa78d, 0xa78d,
-	0xa790, 0xa790,
-	0xa792, 0xa792,
-	0xa796, 0xa796,
-	0xa798, 0xa798,
-	0xa79a, 0xa79a,
-	0xa79c, 0xa79c,
-	0xa79e, 0xa79e,
-	0xa7a0, 0xa7a0,
-	0xa7a2, 0xa7a2,
-	0xa7a4, 0xa7a4,
-	0xa7a6, 0xa7a6,
-	0xa7a8, 0xa7a8,
-	0xa7aa, 0xa7ad,
-	0xa7b0, 0xa7b1,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff21, 0xff3a,
-	0x10400, 0x10427,
-	0x118a0, 0x118bf,
-}; /* CR_Changes_When_Casefolded */
-
-/* 'Changes_When_Casemapped': Derived Property */
-static const OnigCodePoint CR_Changes_When_Casemapped[] = {
-	107,
-	0x0041, 0x005a,
-	0x0061, 0x007a,
-	0x00b5, 0x00b5,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x0137,
-	0x0139, 0x018c,
-	0x018e, 0x019a,
-	0x019c, 0x01a9,
-	0x01ac, 0x01b9,
-	0x01bc, 0x01bd,
-	0x01bf, 0x01bf,
-	0x01c4, 0x0220,
-	0x0222, 0x0233,
-	0x023a, 0x0254,
-	0x0256, 0x0257,
-	0x0259, 0x0259,
-	0x025b, 0x025c,
-	0x0260, 0x0261,
-	0x0263, 0x0263,
-	0x0265, 0x0266,
-	0x0268, 0x0269,
-	0x026b, 0x026c,
-	0x026f, 0x026f,
-	0x0271, 0x0272,
-	0x0275, 0x0275,
-	0x027d, 0x027d,
-	0x0280, 0x0280,
-	0x0283, 0x0283,
-	0x0287, 0x028c,
-	0x0292, 0x0292,
-	0x029e, 0x029e,
-	0x0345, 0x0345,
-	0x0370, 0x0373,
-	0x0376, 0x0377,
-	0x037b, 0x037d,
-	0x037f, 0x037f,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03d1,
-	0x03d5, 0x03f5,
-	0x03f7, 0x03fb,
-	0x03fd, 0x0481,
-	0x048a, 0x052f,
-	0x0531, 0x0556,
-	0x0561, 0x0587,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x1d79, 0x1d79,
-	0x1d7d, 0x1d7d,
-	0x1e00, 0x1e9b,
-	0x1e9e, 0x1e9e,
-	0x1ea0, 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,
-	0x2126, 0x2126,
-	0x212a, 0x212b,
-	0x2132, 0x2132,
-	0x214e, 0x214e,
-	0x2160, 0x217f,
-	0x2183, 0x2184,
-	0x24b6, 0x24e9,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2c70,
-	0x2c72, 0x2c73,
-	0x2c75, 0x2c76,
-	0x2c7e, 0x2ce3,
-	0x2ceb, 0x2cee,
-	0x2cf2, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0xa640, 0xa66d,
-	0xa680, 0xa69b,
-	0xa722, 0xa72f,
-	0xa732, 0xa76f,
-	0xa779, 0xa787,
-	0xa78b, 0xa78d,
-	0xa790, 0xa793,
-	0xa796, 0xa7ad,
-	0xa7b0, 0xa7b1,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0x10400, 0x1044f,
-	0x118a0, 0x118df,
-}; /* CR_Changes_When_Casemapped */
-
-/* 'ID_Start': Derived Property */
-static const OnigCodePoint CR_ID_Start[] = {
-	538,
-	0x0041, 0x005a,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00b5, 0x00b5,
-	0x00ba, 0x00ba,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x02c1,
-	0x02c6, 0x02d1,
-	0x02e0, 0x02e4,
-	0x02ec, 0x02ec,
-	0x02ee, 0x02ee,
-	0x0370, 0x0374,
-	0x0376, 0x0377,
-	0x037a, 0x037d,
-	0x037f, 0x037f,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x048a, 0x052f,
-	0x0531, 0x0556,
-	0x0559, 0x0559,
-	0x0561, 0x0587,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0620, 0x064a,
-	0x066e, 0x066f,
-	0x0671, 0x06d3,
-	0x06d5, 0x06d5,
-	0x06e5, 0x06e6,
-	0x06ee, 0x06ef,
-	0x06fa, 0x06fc,
-	0x06ff, 0x06ff,
-	0x0710, 0x0710,
-	0x0712, 0x072f,
-	0x074d, 0x07a5,
-	0x07b1, 0x07b1,
-	0x07ca, 0x07ea,
-	0x07f4, 0x07f5,
-	0x07fa, 0x07fa,
-	0x0800, 0x0815,
-	0x081a, 0x081a,
-	0x0824, 0x0824,
-	0x0828, 0x0828,
-	0x0840, 0x0858,
-	0x08a0, 0x08b2,
-	0x0904, 0x0939,
-	0x093d, 0x093d,
-	0x0950, 0x0950,
-	0x0958, 0x0961,
-	0x0971, 0x0980,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c3d,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c61,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbd, 0x0cbd,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce1,
-	0x0cf1, 0x0cf2,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d3d,
-	0x0d4e, 0x0d4e,
-	0x0d60, 0x0d61,
-	0x0d7a, 0x0d7f,
-	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, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f40, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f88, 0x0f8c,
-	0x1000, 0x102a,
-	0x103f, 0x103f,
-	0x1050, 0x1055,
-	0x105a, 0x105d,
-	0x1061, 0x1061,
-	0x1065, 0x1066,
-	0x106e, 0x1070,
-	0x1075, 0x1081,
-	0x108e, 0x108e,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 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, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f8,
-	0x1700, 0x170c,
-	0x170e, 0x1711,
-	0x1720, 0x1731,
-	0x1740, 0x1751,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1780, 0x17b3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dc,
-	0x1820, 0x1877,
-	0x1880, 0x18a8,
-	0x18aa, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191e,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19c1, 0x19c7,
-	0x1a00, 0x1a16,
-	0x1a20, 0x1a54,
-	0x1aa7, 0x1aa7,
-	0x1b05, 0x1b33,
-	0x1b45, 0x1b4b,
-	0x1b83, 0x1ba0,
-	0x1bae, 0x1baf,
-	0x1bba, 0x1be5,
-	0x1c00, 0x1c23,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c7d,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf1,
-	0x1cf5, 0x1cf6,
-	0x1d00, 0x1dbf,
-	0x1e00, 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, 0x209c,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2118, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2160, 0x2188,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2ce4,
-	0x2ceb, 0x2cee,
-	0x2cf2, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x3005, 0x3007,
-	0x3021, 0x3029,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x309b, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa640, 0xa66e,
-	0xa67f, 0xa69d,
-	0xa6a0, 0xa6ef,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa7ad,
-	0xa7b0, 0xa7b1,
-	0xa7f7, 0xa801,
-	0xa803, 0xa805,
-	0xa807, 0xa80a,
-	0xa80c, 0xa822,
-	0xa840, 0xa873,
-	0xa882, 0xa8b3,
-	0xa8f2, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa90a, 0xa925,
-	0xa930, 0xa946,
-	0xa960, 0xa97c,
-	0xa984, 0xa9b2,
-	0xa9cf, 0xa9cf,
-	0xa9e0, 0xa9e4,
-	0xa9e6, 0xa9ef,
-	0xa9fa, 0xa9fe,
-	0xaa00, 0xaa28,
-	0xaa40, 0xaa42,
-	0xaa44, 0xaa4b,
-	0xaa60, 0xaa76,
-	0xaa7a, 0xaa7a,
-	0xaa7e, 0xaaaf,
-	0xaab1, 0xaab1,
-	0xaab5, 0xaab6,
-	0xaab9, 0xaabd,
-	0xaac0, 0xaac0,
-	0xaac2, 0xaac2,
-	0xaadb, 0xaadd,
-	0xaae0, 0xaaea,
-	0xaaf2, 0xaaf4,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xab30, 0xab5a,
-	0xab5c, 0xab5f,
-	0xab64, 0xab65,
-	0xabc0, 0xabe2,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa6d,
-	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,
-	0x10140, 0x10174,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031f,
-	0x10330, 0x1034a,
-	0x10350, 0x10375,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10860, 0x10876,
-	0x10880, 0x1089e,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a00,
-	0x10a10, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10a80, 0x10a9c,
-	0x10ac0, 0x10ac7,
-	0x10ac9, 0x10ae4,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10b80, 0x10b91,
-	0x10c00, 0x10c48,
-	0x11003, 0x11037,
-	0x11083, 0x110af,
-	0x110d0, 0x110e8,
-	0x11103, 0x11126,
-	0x11150, 0x11172,
-	0x11176, 0x11176,
-	0x11183, 0x111b2,
-	0x111c1, 0x111c4,
-	0x111da, 0x111da,
-	0x11200, 0x11211,
-	0x11213, 0x1122b,
-	0x112b0, 0x112de,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133d, 0x1133d,
-	0x1135d, 0x11361,
-	0x11480, 0x114af,
-	0x114c4, 0x114c5,
-	0x114c7, 0x114c7,
-	0x11580, 0x115ae,
-	0x11600, 0x1162f,
-	0x11644, 0x11644,
-	0x11680, 0x116aa,
-	0x118a0, 0x118df,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x12000, 0x12398,
-	0x12400, 0x1246e,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16ad0, 0x16aed,
-	0x16b00, 0x16b2f,
-	0x16b40, 0x16b43,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f50,
-	0x16f93, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	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, 0x1d7cb,
-	0x1e800, 0x1e8c4,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_ID_Start */
-
-/* 'ID_Continue': Derived Property */
-static const OnigCodePoint CR_ID_Continue[] = {
-	626,
-	0x0030, 0x0039,
-	0x0041, 0x005a,
-	0x005f, 0x005f,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00b5, 0x00b5,
-	0x00b7, 0x00b7,
-	0x00ba, 0x00ba,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x02c1,
-	0x02c6, 0x02d1,
-	0x02e0, 0x02e4,
-	0x02ec, 0x02ec,
-	0x02ee, 0x02ee,
-	0x0300, 0x0374,
-	0x0376, 0x0377,
-	0x037a, 0x037d,
-	0x037f, 0x037f,
-	0x0386, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x0483, 0x0487,
-	0x048a, 0x052f,
-	0x0531, 0x0556,
-	0x0559, 0x0559,
-	0x0561, 0x0587,
-	0x0591, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0610, 0x061a,
-	0x0620, 0x0669,
-	0x066e, 0x06d3,
-	0x06d5, 0x06dc,
-	0x06df, 0x06e8,
-	0x06ea, 0x06fc,
-	0x06ff, 0x06ff,
-	0x0710, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07f5,
-	0x07fa, 0x07fa,
-	0x0800, 0x082d,
-	0x0840, 0x085b,
-	0x08a0, 0x08b2,
-	0x08e4, 0x0963,
-	0x0966, 0x096f,
-	0x0971, 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,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bef,
-	0x0c00, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c81, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d01, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d6f,
-	0x0d7a, 0x0d7f,
-	0x0d82, 0x0d83,
-	0x0d85, 0x0d96,
-	0x0d9a, 0x0db1,
-	0x0db3, 0x0dbb,
-	0x0dbd, 0x0dbd,
-	0x0dc0, 0x0dc6,
-	0x0dca, 0x0dca,
-	0x0dcf, 0x0dd4,
-	0x0dd6, 0x0dd6,
-	0x0dd8, 0x0ddf,
-	0x0de6, 0x0def,
-	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, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f18, 0x0f19,
-	0x0f20, 0x0f29,
-	0x0f35, 0x0f35,
-	0x0f37, 0x0f37,
-	0x0f39, 0x0f39,
-	0x0f3e, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f84,
-	0x0f86, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fc6, 0x0fc6,
-	0x1000, 0x1049,
-	0x1050, 0x109d,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 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,
-	0x135d, 0x135f,
-	0x1369, 0x1371,
-	0x1380, 0x138f,
-	0x13a0, 0x13f4,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f8,
-	0x1700, 0x170c,
-	0x170e, 0x1714,
-	0x1720, 0x1734,
-	0x1740, 0x1753,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-	0x1780, 0x17d3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dd,
-	0x17e0, 0x17e9,
-	0x180b, 0x180d,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191e,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1946, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x1a00, 0x1a1b,
-	0x1a20, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa7, 0x1aa7,
-	0x1ab0, 0x1abd,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b59,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1bf3,
-	0x1c00, 0x1c37,
-	0x1c40, 0x1c49,
-	0x1c4d, 0x1c7d,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1cf6,
-	0x1cf8, 0x1cf9,
-	0x1d00, 0x1df5,
-	0x1dfc, 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,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 0x209c,
-	0x20d0, 0x20dc,
-	0x20e1, 0x20e1,
-	0x20e5, 0x20f0,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2118, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2160, 0x2188,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2ce4,
-	0x2ceb, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d6f,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2dff,
-	0x3005, 0x3007,
-	0x3021, 0x302f,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x3099, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa62b,
-	0xa640, 0xa66f,
-	0xa674, 0xa67d,
-	0xa67f, 0xa69d,
-	0xa69f, 0xa6f1,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa7ad,
-	0xa7b0, 0xa7b1,
-	0xa7f7, 0xa827,
-	0xa840, 0xa873,
-	0xa880, 0xa8c4,
-	0xa8d0, 0xa8d9,
-	0xa8e0, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa900, 0xa92d,
-	0xa930, 0xa953,
-	0xa960, 0xa97c,
-	0xa980, 0xa9c0,
-	0xa9cf, 0xa9d9,
-	0xa9e0, 0xa9fe,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa60, 0xaa76,
-	0xaa7a, 0xaac2,
-	0xaadb, 0xaadd,
-	0xaae0, 0xaaef,
-	0xaaf2, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xab30, 0xab5a,
-	0xab5c, 0xab5f,
-	0xab64, 0xab65,
-	0xabc0, 0xabea,
-	0xabec, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa6d,
-	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, 0xfe2d,
-	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,
-	0x10140, 0x10174,
-	0x101fd, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x102e0, 0x102e0,
-	0x10300, 0x1031f,
-	0x10330, 0x1034a,
-	0x10350, 0x1037a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10860, 0x10876,
-	0x10880, 0x1089e,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x10a60, 0x10a7c,
-	0x10a80, 0x10a9c,
-	0x10ac0, 0x10ac7,
-	0x10ac9, 0x10ae6,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10b80, 0x10b91,
-	0x10c00, 0x10c48,
-	0x11000, 0x11046,
-	0x11066, 0x1106f,
-	0x1107f, 0x110ba,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x1113f,
-	0x11150, 0x11173,
-	0x11176, 0x11176,
-	0x11180, 0x111c4,
-	0x111d0, 0x111da,
-	0x11200, 0x11211,
-	0x11213, 0x11237,
-	0x112b0, 0x112ea,
-	0x112f0, 0x112f9,
-	0x11301, 0x11303,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133c, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134d,
-	0x11357, 0x11357,
-	0x1135d, 0x11363,
-	0x11366, 0x1136c,
-	0x11370, 0x11374,
-	0x11480, 0x114c5,
-	0x114c7, 0x114c7,
-	0x114d0, 0x114d9,
-	0x11580, 0x115b5,
-	0x115b8, 0x115c0,
-	0x11600, 0x11640,
-	0x11644, 0x11644,
-	0x11650, 0x11659,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x118a0, 0x118e9,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x12000, 0x12398,
-	0x12400, 0x1246e,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16a60, 0x16a69,
-	0x16ad0, 0x16aed,
-	0x16af0, 0x16af4,
-	0x16b00, 0x16b36,
-	0x16b40, 0x16b43,
-	0x16b50, 0x16b59,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	0x1bc9d, 0x1bc9e,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1e800, 0x1e8c4,
-	0x1e8d0, 0x1e8d6,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0xe0100, 0xe01ef,
-}; /* CR_ID_Continue */
-
-/* 'XID_Start': Derived Property */
-static const OnigCodePoint CR_XID_Start[] = {
-	545,
-	0x0041, 0x005a,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00b5, 0x00b5,
-	0x00ba, 0x00ba,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x02c1,
-	0x02c6, 0x02d1,
-	0x02e0, 0x02e4,
-	0x02ec, 0x02ec,
-	0x02ee, 0x02ee,
-	0x0370, 0x0374,
-	0x0376, 0x0377,
-	0x037b, 0x037d,
-	0x037f, 0x037f,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x048a, 0x052f,
-	0x0531, 0x0556,
-	0x0559, 0x0559,
-	0x0561, 0x0587,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0620, 0x064a,
-	0x066e, 0x066f,
-	0x0671, 0x06d3,
-	0x06d5, 0x06d5,
-	0x06e5, 0x06e6,
-	0x06ee, 0x06ef,
-	0x06fa, 0x06fc,
-	0x06ff, 0x06ff,
-	0x0710, 0x0710,
-	0x0712, 0x072f,
-	0x074d, 0x07a5,
-	0x07b1, 0x07b1,
-	0x07ca, 0x07ea,
-	0x07f4, 0x07f5,
-	0x07fa, 0x07fa,
-	0x0800, 0x0815,
-	0x081a, 0x081a,
-	0x0824, 0x0824,
-	0x0828, 0x0828,
-	0x0840, 0x0858,
-	0x08a0, 0x08b2,
-	0x0904, 0x0939,
-	0x093d, 0x093d,
-	0x0950, 0x0950,
-	0x0958, 0x0961,
-	0x0971, 0x0980,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c3d,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c61,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbd, 0x0cbd,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce1,
-	0x0cf1, 0x0cf2,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d3d,
-	0x0d4e, 0x0d4e,
-	0x0d60, 0x0d61,
-	0x0d7a, 0x0d7f,
-	0x0d85, 0x0d96,
-	0x0d9a, 0x0db1,
-	0x0db3, 0x0dbb,
-	0x0dbd, 0x0dbd,
-	0x0dc0, 0x0dc6,
-	0x0e01, 0x0e30,
-	0x0e32, 0x0e32,
-	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, 0x0eb2,
-	0x0ebd, 0x0ebd,
-	0x0ec0, 0x0ec4,
-	0x0ec6, 0x0ec6,
-	0x0edc, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f40, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f88, 0x0f8c,
-	0x1000, 0x102a,
-	0x103f, 0x103f,
-	0x1050, 0x1055,
-	0x105a, 0x105d,
-	0x1061, 0x1061,
-	0x1065, 0x1066,
-	0x106e, 0x1070,
-	0x1075, 0x1081,
-	0x108e, 0x108e,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 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, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f8,
-	0x1700, 0x170c,
-	0x170e, 0x1711,
-	0x1720, 0x1731,
-	0x1740, 0x1751,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1780, 0x17b3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dc,
-	0x1820, 0x1877,
-	0x1880, 0x18a8,
-	0x18aa, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191e,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19c1, 0x19c7,
-	0x1a00, 0x1a16,
-	0x1a20, 0x1a54,
-	0x1aa7, 0x1aa7,
-	0x1b05, 0x1b33,
-	0x1b45, 0x1b4b,
-	0x1b83, 0x1ba0,
-	0x1bae, 0x1baf,
-	0x1bba, 0x1be5,
-	0x1c00, 0x1c23,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c7d,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf1,
-	0x1cf5, 0x1cf6,
-	0x1d00, 0x1dbf,
-	0x1e00, 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, 0x209c,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2118, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2160, 0x2188,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2ce4,
-	0x2ceb, 0x2cee,
-	0x2cf2, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x3005, 0x3007,
-	0x3021, 0x3029,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x309d, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa640, 0xa66e,
-	0xa67f, 0xa69d,
-	0xa6a0, 0xa6ef,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa7ad,
-	0xa7b0, 0xa7b1,
-	0xa7f7, 0xa801,
-	0xa803, 0xa805,
-	0xa807, 0xa80a,
-	0xa80c, 0xa822,
-	0xa840, 0xa873,
-	0xa882, 0xa8b3,
-	0xa8f2, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa90a, 0xa925,
-	0xa930, 0xa946,
-	0xa960, 0xa97c,
-	0xa984, 0xa9b2,
-	0xa9cf, 0xa9cf,
-	0xa9e0, 0xa9e4,
-	0xa9e6, 0xa9ef,
-	0xa9fa, 0xa9fe,
-	0xaa00, 0xaa28,
-	0xaa40, 0xaa42,
-	0xaa44, 0xaa4b,
-	0xaa60, 0xaa76,
-	0xaa7a, 0xaa7a,
-	0xaa7e, 0xaaaf,
-	0xaab1, 0xaab1,
-	0xaab5, 0xaab6,
-	0xaab9, 0xaabd,
-	0xaac0, 0xaac0,
-	0xaac2, 0xaac2,
-	0xaadb, 0xaadd,
-	0xaae0, 0xaaea,
-	0xaaf2, 0xaaf4,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xab30, 0xab5a,
-	0xab5c, 0xab5f,
-	0xab64, 0xab65,
-	0xabc0, 0xabe2,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb1d,
-	0xfb1f, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfc5d,
-	0xfc64, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdf9,
-	0xfe71, 0xfe71,
-	0xfe73, 0xfe73,
-	0xfe77, 0xfe77,
-	0xfe79, 0xfe79,
-	0xfe7b, 0xfe7b,
-	0xfe7d, 0xfe7d,
-	0xfe7f, 0xfefc,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0xff66, 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,
-	0x10140, 0x10174,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031f,
-	0x10330, 0x1034a,
-	0x10350, 0x10375,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10860, 0x10876,
-	0x10880, 0x1089e,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a00,
-	0x10a10, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10a80, 0x10a9c,
-	0x10ac0, 0x10ac7,
-	0x10ac9, 0x10ae4,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10b80, 0x10b91,
-	0x10c00, 0x10c48,
-	0x11003, 0x11037,
-	0x11083, 0x110af,
-	0x110d0, 0x110e8,
-	0x11103, 0x11126,
-	0x11150, 0x11172,
-	0x11176, 0x11176,
-	0x11183, 0x111b2,
-	0x111c1, 0x111c4,
-	0x111da, 0x111da,
-	0x11200, 0x11211,
-	0x11213, 0x1122b,
-	0x112b0, 0x112de,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133d, 0x1133d,
-	0x1135d, 0x11361,
-	0x11480, 0x114af,
-	0x114c4, 0x114c5,
-	0x114c7, 0x114c7,
-	0x11580, 0x115ae,
-	0x11600, 0x1162f,
-	0x11644, 0x11644,
-	0x11680, 0x116aa,
-	0x118a0, 0x118df,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x12000, 0x12398,
-	0x12400, 0x1246e,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16ad0, 0x16aed,
-	0x16b00, 0x16b2f,
-	0x16b40, 0x16b43,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f50,
-	0x16f93, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	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, 0x1d7cb,
-	0x1e800, 0x1e8c4,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_XID_Start */
-
-/* 'XID_Continue': Derived Property */
-static const OnigCodePoint CR_XID_Continue[] = {
-	633,
-	0x0030, 0x0039,
-	0x0041, 0x005a,
-	0x005f, 0x005f,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00b5, 0x00b5,
-	0x00b7, 0x00b7,
-	0x00ba, 0x00ba,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x02c1,
-	0x02c6, 0x02d1,
-	0x02e0, 0x02e4,
-	0x02ec, 0x02ec,
-	0x02ee, 0x02ee,
-	0x0300, 0x0374,
-	0x0376, 0x0377,
-	0x037b, 0x037d,
-	0x037f, 0x037f,
-	0x0386, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x0483, 0x0487,
-	0x048a, 0x052f,
-	0x0531, 0x0556,
-	0x0559, 0x0559,
-	0x0561, 0x0587,
-	0x0591, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0610, 0x061a,
-	0x0620, 0x0669,
-	0x066e, 0x06d3,
-	0x06d5, 0x06dc,
-	0x06df, 0x06e8,
-	0x06ea, 0x06fc,
-	0x06ff, 0x06ff,
-	0x0710, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07f5,
-	0x07fa, 0x07fa,
-	0x0800, 0x082d,
-	0x0840, 0x085b,
-	0x08a0, 0x08b2,
-	0x08e4, 0x0963,
-	0x0966, 0x096f,
-	0x0971, 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,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bef,
-	0x0c00, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c81, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d01, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d6f,
-	0x0d7a, 0x0d7f,
-	0x0d82, 0x0d83,
-	0x0d85, 0x0d96,
-	0x0d9a, 0x0db1,
-	0x0db3, 0x0dbb,
-	0x0dbd, 0x0dbd,
-	0x0dc0, 0x0dc6,
-	0x0dca, 0x0dca,
-	0x0dcf, 0x0dd4,
-	0x0dd6, 0x0dd6,
-	0x0dd8, 0x0ddf,
-	0x0de6, 0x0def,
-	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, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f18, 0x0f19,
-	0x0f20, 0x0f29,
-	0x0f35, 0x0f35,
-	0x0f37, 0x0f37,
-	0x0f39, 0x0f39,
-	0x0f3e, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f84,
-	0x0f86, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fc6, 0x0fc6,
-	0x1000, 0x1049,
-	0x1050, 0x109d,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 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,
-	0x135d, 0x135f,
-	0x1369, 0x1371,
-	0x1380, 0x138f,
-	0x13a0, 0x13f4,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f8,
-	0x1700, 0x170c,
-	0x170e, 0x1714,
-	0x1720, 0x1734,
-	0x1740, 0x1753,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-	0x1780, 0x17d3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dd,
-	0x17e0, 0x17e9,
-	0x180b, 0x180d,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191e,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1946, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x1a00, 0x1a1b,
-	0x1a20, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa7, 0x1aa7,
-	0x1ab0, 0x1abd,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b59,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1bf3,
-	0x1c00, 0x1c37,
-	0x1c40, 0x1c49,
-	0x1c4d, 0x1c7d,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1cf6,
-	0x1cf8, 0x1cf9,
-	0x1d00, 0x1df5,
-	0x1dfc, 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,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 0x209c,
-	0x20d0, 0x20dc,
-	0x20e1, 0x20e1,
-	0x20e5, 0x20f0,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2118, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2160, 0x2188,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2ce4,
-	0x2ceb, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d6f,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2dff,
-	0x3005, 0x3007,
-	0x3021, 0x302f,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x3099, 0x309a,
-	0x309d, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa62b,
-	0xa640, 0xa66f,
-	0xa674, 0xa67d,
-	0xa67f, 0xa69d,
-	0xa69f, 0xa6f1,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa7ad,
-	0xa7b0, 0xa7b1,
-	0xa7f7, 0xa827,
-	0xa840, 0xa873,
-	0xa880, 0xa8c4,
-	0xa8d0, 0xa8d9,
-	0xa8e0, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa900, 0xa92d,
-	0xa930, 0xa953,
-	0xa960, 0xa97c,
-	0xa980, 0xa9c0,
-	0xa9cf, 0xa9d9,
-	0xa9e0, 0xa9fe,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa60, 0xaa76,
-	0xaa7a, 0xaac2,
-	0xaadb, 0xaadd,
-	0xaae0, 0xaaef,
-	0xaaf2, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xab30, 0xab5a,
-	0xab5c, 0xab5f,
-	0xab64, 0xab65,
-	0xabc0, 0xabea,
-	0xabec, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfc5d,
-	0xfc64, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdf9,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe2d,
-	0xfe33, 0xfe34,
-	0xfe4d, 0xfe4f,
-	0xfe71, 0xfe71,
-	0xfe73, 0xfe73,
-	0xfe77, 0xfe77,
-	0xfe79, 0xfe79,
-	0xfe7b, 0xfe7b,
-	0xfe7d, 0xfe7d,
-	0xfe7f, 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,
-	0x10140, 0x10174,
-	0x101fd, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x102e0, 0x102e0,
-	0x10300, 0x1031f,
-	0x10330, 0x1034a,
-	0x10350, 0x1037a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10860, 0x10876,
-	0x10880, 0x1089e,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x10a60, 0x10a7c,
-	0x10a80, 0x10a9c,
-	0x10ac0, 0x10ac7,
-	0x10ac9, 0x10ae6,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10b80, 0x10b91,
-	0x10c00, 0x10c48,
-	0x11000, 0x11046,
-	0x11066, 0x1106f,
-	0x1107f, 0x110ba,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x1113f,
-	0x11150, 0x11173,
-	0x11176, 0x11176,
-	0x11180, 0x111c4,
-	0x111d0, 0x111da,
-	0x11200, 0x11211,
-	0x11213, 0x11237,
-	0x112b0, 0x112ea,
-	0x112f0, 0x112f9,
-	0x11301, 0x11303,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133c, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134d,
-	0x11357, 0x11357,
-	0x1135d, 0x11363,
-	0x11366, 0x1136c,
-	0x11370, 0x11374,
-	0x11480, 0x114c5,
-	0x114c7, 0x114c7,
-	0x114d0, 0x114d9,
-	0x11580, 0x115b5,
-	0x115b8, 0x115c0,
-	0x11600, 0x11640,
-	0x11644, 0x11644,
-	0x11650, 0x11659,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x118a0, 0x118e9,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x12000, 0x12398,
-	0x12400, 0x1246e,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16a60, 0x16a69,
-	0x16ad0, 0x16aed,
-	0x16af0, 0x16af4,
-	0x16b00, 0x16b36,
-	0x16b40, 0x16b43,
-	0x16b50, 0x16b59,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	0x1bc9d, 0x1bc9e,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1e800, 0x1e8c4,
-	0x1e8d0, 0x1e8d6,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0xe0100, 0xe01ef,
-}; /* CR_XID_Continue */
-
-/* 'Default_Ignorable_Code_Point': Derived Property */
-static const OnigCodePoint CR_Default_Ignorable_Code_Point[] = {
-	17,
-	0x00ad, 0x00ad,
-	0x034f, 0x034f,
-	0x061c, 0x061c,
-	0x115f, 0x1160,
-	0x17b4, 0x17b5,
-	0x180b, 0x180e,
-	0x200b, 0x200f,
-	0x202a, 0x202e,
-	0x2060, 0x206f,
-	0x3164, 0x3164,
-	0xfe00, 0xfe0f,
-	0xfeff, 0xfeff,
-	0xffa0, 0xffa0,
-	0xfff0, 0xfff8,
-	0x1bca0, 0x1bca3,
-	0x1d173, 0x1d17a,
-	0xe0000, 0xe0fff,
-}; /* CR_Default_Ignorable_Code_Point */
-
-/* 'Grapheme_Extend': Derived Property */
-static const OnigCodePoint CR_Grapheme_Extend[] = {
-	272,
-	0x0300, 0x036f,
-	0x0483, 0x0489,
-	0x0591, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x0610, 0x061a,
-	0x064b, 0x065f,
-	0x0670, 0x0670,
-	0x06d6, 0x06dc,
-	0x06df, 0x06e4,
-	0x06e7, 0x06e8,
-	0x06ea, 0x06ed,
-	0x0711, 0x0711,
-	0x0730, 0x074a,
-	0x07a6, 0x07b0,
-	0x07eb, 0x07f3,
-	0x0816, 0x0819,
-	0x081b, 0x0823,
-	0x0825, 0x0827,
-	0x0829, 0x082d,
-	0x0859, 0x085b,
-	0x08e4, 0x0902,
-	0x093a, 0x093a,
-	0x093c, 0x093c,
-	0x0941, 0x0948,
-	0x094d, 0x094d,
-	0x0951, 0x0957,
-	0x0962, 0x0963,
-	0x0981, 0x0981,
-	0x09bc, 0x09bc,
-	0x09be, 0x09be,
-	0x09c1, 0x09c4,
-	0x09cd, 0x09cd,
-	0x09d7, 0x09d7,
-	0x09e2, 0x09e3,
-	0x0a01, 0x0a02,
-	0x0a3c, 0x0a3c,
-	0x0a41, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a70, 0x0a71,
-	0x0a75, 0x0a75,
-	0x0a81, 0x0a82,
-	0x0abc, 0x0abc,
-	0x0ac1, 0x0ac5,
-	0x0ac7, 0x0ac8,
-	0x0acd, 0x0acd,
-	0x0ae2, 0x0ae3,
-	0x0b01, 0x0b01,
-	0x0b3c, 0x0b3c,
-	0x0b3e, 0x0b3f,
-	0x0b41, 0x0b44,
-	0x0b4d, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b62, 0x0b63,
-	0x0b82, 0x0b82,
-	0x0bbe, 0x0bbe,
-	0x0bc0, 0x0bc0,
-	0x0bcd, 0x0bcd,
-	0x0bd7, 0x0bd7,
-	0x0c00, 0x0c00,
-	0x0c3e, 0x0c40,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c62, 0x0c63,
-	0x0c81, 0x0c81,
-	0x0cbc, 0x0cbc,
-	0x0cbf, 0x0cbf,
-	0x0cc2, 0x0cc2,
-	0x0cc6, 0x0cc6,
-	0x0ccc, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0ce2, 0x0ce3,
-	0x0d01, 0x0d01,
-	0x0d3e, 0x0d3e,
-	0x0d41, 0x0d44,
-	0x0d4d, 0x0d4d,
-	0x0d57, 0x0d57,
-	0x0d62, 0x0d63,
-	0x0dca, 0x0dca,
-	0x0dcf, 0x0dcf,
-	0x0dd2, 0x0dd4,
-	0x0dd6, 0x0dd6,
-	0x0ddf, 0x0ddf,
-	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,
-	0x0f8d, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fc6, 0x0fc6,
-	0x102d, 0x1030,
-	0x1032, 0x1037,
-	0x1039, 0x103a,
-	0x103d, 0x103e,
-	0x1058, 0x1059,
-	0x105e, 0x1060,
-	0x1071, 0x1074,
-	0x1082, 0x1082,
-	0x1085, 0x1086,
-	0x108d, 0x108d,
-	0x109d, 0x109d,
-	0x135d, 0x135f,
-	0x1712, 0x1714,
-	0x1732, 0x1734,
-	0x1752, 0x1753,
-	0x1772, 0x1773,
-	0x17b4, 0x17b5,
-	0x17b7, 0x17bd,
-	0x17c6, 0x17c6,
-	0x17c9, 0x17d3,
-	0x17dd, 0x17dd,
-	0x180b, 0x180d,
-	0x18a9, 0x18a9,
-	0x1920, 0x1922,
-	0x1927, 0x1928,
-	0x1932, 0x1932,
-	0x1939, 0x193b,
-	0x1a17, 0x1a18,
-	0x1a1b, 0x1a1b,
-	0x1a56, 0x1a56,
-	0x1a58, 0x1a5e,
-	0x1a60, 0x1a60,
-	0x1a62, 0x1a62,
-	0x1a65, 0x1a6c,
-	0x1a73, 0x1a7c,
-	0x1a7f, 0x1a7f,
-	0x1ab0, 0x1abe,
-	0x1b00, 0x1b03,
-	0x1b34, 0x1b34,
-	0x1b36, 0x1b3a,
-	0x1b3c, 0x1b3c,
-	0x1b42, 0x1b42,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1b81,
-	0x1ba2, 0x1ba5,
-	0x1ba8, 0x1ba9,
-	0x1bab, 0x1bad,
-	0x1be6, 0x1be6,
-	0x1be8, 0x1be9,
-	0x1bed, 0x1bed,
-	0x1bef, 0x1bf1,
-	0x1c2c, 0x1c33,
-	0x1c36, 0x1c37,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce0,
-	0x1ce2, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1cf4, 0x1cf4,
-	0x1cf8, 0x1cf9,
-	0x1dc0, 0x1df5,
-	0x1dfc, 0x1dff,
-	0x200c, 0x200d,
-	0x20d0, 0x20f0,
-	0x2cef, 0x2cf1,
-	0x2d7f, 0x2d7f,
-	0x2de0, 0x2dff,
-	0x302a, 0x302f,
-	0x3099, 0x309a,
-	0xa66f, 0xa672,
-	0xa674, 0xa67d,
-	0xa69f, 0xa69f,
-	0xa6f0, 0xa6f1,
-	0xa802, 0xa802,
-	0xa806, 0xa806,
-	0xa80b, 0xa80b,
-	0xa825, 0xa826,
-	0xa8c4, 0xa8c4,
-	0xa8e0, 0xa8f1,
-	0xa926, 0xa92d,
-	0xa947, 0xa951,
-	0xa980, 0xa982,
-	0xa9b3, 0xa9b3,
-	0xa9b6, 0xa9b9,
-	0xa9bc, 0xa9bc,
-	0xa9e5, 0xa9e5,
-	0xaa29, 0xaa2e,
-	0xaa31, 0xaa32,
-	0xaa35, 0xaa36,
-	0xaa43, 0xaa43,
-	0xaa4c, 0xaa4c,
-	0xaa7c, 0xaa7c,
-	0xaab0, 0xaab0,
-	0xaab2, 0xaab4,
-	0xaab7, 0xaab8,
-	0xaabe, 0xaabf,
-	0xaac1, 0xaac1,
-	0xaaec, 0xaaed,
-	0xaaf6, 0xaaf6,
-	0xabe5, 0xabe5,
-	0xabe8, 0xabe8,
-	0xabed, 0xabed,
-	0xfb1e, 0xfb1e,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe2d,
-	0xff9e, 0xff9f,
-	0x101fd, 0x101fd,
-	0x102e0, 0x102e0,
-	0x10376, 0x1037a,
-	0x10a01, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a0f,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x10ae5, 0x10ae6,
-	0x11001, 0x11001,
-	0x11038, 0x11046,
-	0x1107f, 0x11081,
-	0x110b3, 0x110b6,
-	0x110b9, 0x110ba,
-	0x11100, 0x11102,
-	0x11127, 0x1112b,
-	0x1112d, 0x11134,
-	0x11173, 0x11173,
-	0x11180, 0x11181,
-	0x111b6, 0x111be,
-	0x1122f, 0x11231,
-	0x11234, 0x11234,
-	0x11236, 0x11237,
-	0x112df, 0x112df,
-	0x112e3, 0x112ea,
-	0x11301, 0x11301,
-	0x1133c, 0x1133c,
-	0x1133e, 0x1133e,
-	0x11340, 0x11340,
-	0x11357, 0x11357,
-	0x11366, 0x1136c,
-	0x11370, 0x11374,
-	0x114b0, 0x114b0,
-	0x114b3, 0x114b8,
-	0x114ba, 0x114ba,
-	0x114bd, 0x114bd,
-	0x114bf, 0x114c0,
-	0x114c2, 0x114c3,
-	0x115af, 0x115af,
-	0x115b2, 0x115b5,
-	0x115bc, 0x115bd,
-	0x115bf, 0x115c0,
-	0x11633, 0x1163a,
-	0x1163d, 0x1163d,
-	0x1163f, 0x11640,
-	0x116ab, 0x116ab,
-	0x116ad, 0x116ad,
-	0x116b0, 0x116b5,
-	0x116b7, 0x116b7,
-	0x16af0, 0x16af4,
-	0x16b30, 0x16b36,
-	0x16f8f, 0x16f92,
-	0x1bc9d, 0x1bc9e,
-	0x1d165, 0x1d165,
-	0x1d167, 0x1d169,
-	0x1d16e, 0x1d172,
-	0x1d17b, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-	0x1d242, 0x1d244,
-	0x1e8d0, 0x1e8d6,
-	0xe0100, 0xe01ef,
-}; /* CR_Grapheme_Extend */
-
-/* 'Grapheme_Base': Derived Property */
-static const OnigCodePoint CR_Grapheme_Base[] = {
-	724,
-	0x0020, 0x007e,
-	0x00a0, 0x00ac,
-	0x00ae, 0x02ff,
-	0x0370, 0x0377,
-	0x037a, 0x037f,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x0482,
-	0x048a, 0x052f,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x058d, 0x058f,
-	0x05be, 0x05be,
-	0x05c0, 0x05c0,
-	0x05c3, 0x05c3,
-	0x05c6, 0x05c6,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0606, 0x060f,
-	0x061b, 0x061b,
-	0x061e, 0x064a,
-	0x0660, 0x066f,
-	0x0671, 0x06d5,
-	0x06de, 0x06de,
-	0x06e5, 0x06e6,
-	0x06e9, 0x06e9,
-	0x06ee, 0x070d,
-	0x0710, 0x0710,
-	0x0712, 0x072f,
-	0x074d, 0x07a5,
-	0x07b1, 0x07b1,
-	0x07c0, 0x07ea,
-	0x07f4, 0x07fa,
-	0x0800, 0x0815,
-	0x081a, 0x081a,
-	0x0824, 0x0824,
-	0x0828, 0x0828,
-	0x0830, 0x083e,
-	0x0840, 0x0858,
-	0x085e, 0x085e,
-	0x08a0, 0x08b2,
-	0x0903, 0x0939,
-	0x093b, 0x093b,
-	0x093d, 0x0940,
-	0x0949, 0x094c,
-	0x094e, 0x0950,
-	0x0958, 0x0961,
-	0x0964, 0x0980,
-	0x0982, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bd, 0x09bd,
-	0x09bf, 0x09c0,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cc,
-	0x09ce, 0x09ce,
-	0x09dc, 0x09dd,
-	0x09df, 0x09e1,
-	0x09e6, 0x09fb,
-	0x0a03, 0x0a03,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3e, 0x0a40,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a6f,
-	0x0a72, 0x0a74,
-	0x0a83, 0x0a83,
-	0x0a85, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abd, 0x0ac0,
-	0x0ac9, 0x0ac9,
-	0x0acb, 0x0acc,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae1,
-	0x0ae6, 0x0af1,
-	0x0b02, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3d, 0x0b3d,
-	0x0b40, 0x0b40,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4c,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b61,
-	0x0b66, 0x0b77,
-	0x0b83, 0x0b83,
-	0x0b85, 0x0b8a,
-	0x0b8e, 0x0b90,
-	0x0b92, 0x0b95,
-	0x0b99, 0x0b9a,
-	0x0b9c, 0x0b9c,
-	0x0b9e, 0x0b9f,
-	0x0ba3, 0x0ba4,
-	0x0ba8, 0x0baa,
-	0x0bae, 0x0bb9,
-	0x0bbf, 0x0bbf,
-	0x0bc1, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcc,
-	0x0bd0, 0x0bd0,
-	0x0be6, 0x0bfa,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c3d,
-	0x0c41, 0x0c44,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c61,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-	0x0c82, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbd, 0x0cbe,
-	0x0cc0, 0x0cc1,
-	0x0cc3, 0x0cc4,
-	0x0cc7, 0x0cc8,
-	0x0cca, 0x0ccb,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce1,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d3d,
-	0x0d3f, 0x0d40,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4c,
-	0x0d4e, 0x0d4e,
-	0x0d60, 0x0d61,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
-	0x0d82, 0x0d83,
-	0x0d85, 0x0d96,
-	0x0d9a, 0x0db1,
-	0x0db3, 0x0dbb,
-	0x0dbd, 0x0dbd,
-	0x0dc0, 0x0dc6,
-	0x0dd0, 0x0dd1,
-	0x0dd8, 0x0dde,
-	0x0de6, 0x0def,
-	0x0df2, 0x0df4,
-	0x0e01, 0x0e30,
-	0x0e32, 0x0e33,
-	0x0e3f, 0x0e46,
-	0x0e4f, 0x0e5b,
-	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,
-	0x0ed0, 0x0ed9,
-	0x0edc, 0x0edf,
-	0x0f00, 0x0f17,
-	0x0f1a, 0x0f34,
-	0x0f36, 0x0f36,
-	0x0f38, 0x0f38,
-	0x0f3a, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f7f, 0x0f7f,
-	0x0f85, 0x0f85,
-	0x0f88, 0x0f8c,
-	0x0fbe, 0x0fc5,
-	0x0fc7, 0x0fcc,
-	0x0fce, 0x0fda,
-	0x1000, 0x102c,
-	0x1031, 0x1031,
-	0x1038, 0x1038,
-	0x103b, 0x103c,
-	0x103f, 0x1057,
-	0x105a, 0x105d,
-	0x1061, 0x1070,
-	0x1075, 0x1081,
-	0x1083, 0x1084,
-	0x1087, 0x108c,
-	0x108e, 0x109c,
-	0x109e, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 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,
-	0x1360, 0x137c,
-	0x1380, 0x1399,
-	0x13a0, 0x13f4,
-	0x1400, 0x169c,
-	0x16a0, 0x16f8,
-	0x1700, 0x170c,
-	0x170e, 0x1711,
-	0x1720, 0x1731,
-	0x1735, 0x1736,
-	0x1740, 0x1751,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1780, 0x17b3,
-	0x17b6, 0x17b6,
-	0x17be, 0x17c5,
-	0x17c7, 0x17c8,
-	0x17d4, 0x17dc,
-	0x17e0, 0x17e9,
-	0x17f0, 0x17f9,
-	0x1800, 0x180a,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18a8,
-	0x18aa, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191e,
-	0x1923, 0x1926,
-	0x1929, 0x192b,
-	0x1930, 0x1931,
-	0x1933, 0x1938,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a16,
-	0x1a19, 0x1a1a,
-	0x1a1e, 0x1a55,
-	0x1a57, 0x1a57,
-	0x1a61, 0x1a61,
-	0x1a63, 0x1a64,
-	0x1a6d, 0x1a72,
-	0x1a80, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-	0x1b04, 0x1b33,
-	0x1b35, 0x1b35,
-	0x1b3b, 0x1b3b,
-	0x1b3d, 0x1b41,
-	0x1b43, 0x1b4b,
-	0x1b50, 0x1b6a,
-	0x1b74, 0x1b7c,
-	0x1b82, 0x1ba1,
-	0x1ba6, 0x1ba7,
-	0x1baa, 0x1baa,
-	0x1bae, 0x1be5,
-	0x1be7, 0x1be7,
-	0x1bea, 0x1bec,
-	0x1bee, 0x1bee,
-	0x1bf2, 0x1bf3,
-	0x1bfc, 0x1c2b,
-	0x1c34, 0x1c35,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cc0, 0x1cc7,
-	0x1cd3, 0x1cd3,
-	0x1ce1, 0x1ce1,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf3,
-	0x1cf5, 0x1cf6,
-	0x1d00, 0x1dbf,
-	0x1e00, 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, 0x200a,
-	0x2010, 0x2027,
-	0x202f, 0x205f,
-	0x2070, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x209c,
-	0x20a0, 0x20bd,
-	0x2100, 0x2189,
-	0x2190, 0x23fa,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x2b73,
-	0x2b76, 0x2b95,
-	0x2b98, 0x2bb9,
-	0x2bbd, 0x2bc8,
-	0x2bca, 0x2bd1,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cee,
-	0x2cf2, 0x2cf3,
-	0x2cf9, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d70,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2e00, 0x2e42,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x3029,
-	0x3030, 0x303f,
-	0x3041, 0x3096,
-	0x309b, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa66e,
-	0xa673, 0xa673,
-	0xa67e, 0xa69d,
-	0xa6a0, 0xa6ef,
-	0xa6f2, 0xa6f7,
-	0xa700, 0xa78e,
-	0xa790, 0xa7ad,
-	0xa7b0, 0xa7b1,
-	0xa7f7, 0xa801,
-	0xa803, 0xa805,
-	0xa807, 0xa80a,
-	0xa80c, 0xa824,
-	0xa827, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c3,
-	0xa8ce, 0xa8d9,
-	0xa8f2, 0xa8fb,
-	0xa900, 0xa925,
-	0xa92e, 0xa946,
-	0xa952, 0xa953,
-	0xa95f, 0xa97c,
-	0xa983, 0xa9b2,
-	0xa9b4, 0xa9b5,
-	0xa9ba, 0xa9bb,
-	0xa9bd, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9e4,
-	0xa9e6, 0xa9fe,
-	0xaa00, 0xaa28,
-	0xaa2f, 0xaa30,
-	0xaa33, 0xaa34,
-	0xaa40, 0xaa42,
-	0xaa44, 0xaa4b,
-	0xaa4d, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa7b,
-	0xaa7d, 0xaaaf,
-	0xaab1, 0xaab1,
-	0xaab5, 0xaab6,
-	0xaab9, 0xaabd,
-	0xaac0, 0xaac0,
-	0xaac2, 0xaac2,
-	0xaadb, 0xaaeb,
-	0xaaee, 0xaaf5,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xab30, 0xab5f,
-	0xab64, 0xab65,
-	0xabc0, 0xabe4,
-	0xabe6, 0xabe7,
-	0xabe9, 0xabec,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb1d,
-	0xfb1f, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbc1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfd,
-	0xfe10, 0xfe19,
-	0xfe30, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xff01, 0xff9d,
-	0xffa0, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfffc, 0xfffd,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018c,
-	0x10190, 0x1019b,
-	0x101a0, 0x101a0,
-	0x101d0, 0x101fc,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x102e1, 0x102fb,
-	0x10300, 0x10323,
-	0x10330, 0x1034a,
-	0x10350, 0x10375,
-	0x10380, 0x1039d,
-	0x1039f, 0x103c3,
-	0x103c8, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x1056f, 0x1056f,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10857, 0x1089e,
-	0x108a7, 0x108af,
-	0x10900, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a00,
-	0x10a10, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a40, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a9f,
-	0x10ac0, 0x10ae4,
-	0x10aeb, 0x10af6,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b91,
-	0x10b99, 0x10b9c,
-	0x10ba9, 0x10baf,
-	0x10c00, 0x10c48,
-	0x10e60, 0x10e7e,
-	0x11000, 0x11000,
-	0x11002, 0x11037,
-	0x11047, 0x1104d,
-	0x11052, 0x1106f,
-	0x11082, 0x110b2,
-	0x110b7, 0x110b8,
-	0x110bb, 0x110bc,
-	0x110be, 0x110c1,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11103, 0x11126,
-	0x1112c, 0x1112c,
-	0x11136, 0x11143,
-	0x11150, 0x11172,
-	0x11174, 0x11176,
-	0x11182, 0x111b5,
-	0x111bf, 0x111c8,
-	0x111cd, 0x111cd,
-	0x111d0, 0x111da,
-	0x111e1, 0x111f4,
-	0x11200, 0x11211,
-	0x11213, 0x1122e,
-	0x11232, 0x11233,
-	0x11235, 0x11235,
-	0x11238, 0x1123d,
-	0x112b0, 0x112de,
-	0x112e0, 0x112e2,
-	0x112f0, 0x112f9,
-	0x11302, 0x11303,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133d, 0x1133d,
-	0x1133f, 0x1133f,
-	0x11341, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134d,
-	0x1135d, 0x11363,
-	0x11480, 0x114af,
-	0x114b1, 0x114b2,
-	0x114b9, 0x114b9,
-	0x114bb, 0x114bc,
-	0x114be, 0x114be,
-	0x114c1, 0x114c1,
-	0x114c4, 0x114c7,
-	0x114d0, 0x114d9,
-	0x11580, 0x115ae,
-	0x115b0, 0x115b1,
-	0x115b8, 0x115bb,
-	0x115be, 0x115be,
-	0x115c1, 0x115c9,
-	0x11600, 0x11632,
-	0x1163b, 0x1163c,
-	0x1163e, 0x1163e,
-	0x11641, 0x11644,
-	0x11650, 0x11659,
-	0x11680, 0x116aa,
-	0x116ac, 0x116ac,
-	0x116ae, 0x116af,
-	0x116b6, 0x116b6,
-	0x116c0, 0x116c9,
-	0x118a0, 0x118f2,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x12000, 0x12398,
-	0x12400, 0x1246e,
-	0x12470, 0x12474,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16a60, 0x16a69,
-	0x16a6e, 0x16a6f,
-	0x16ad0, 0x16aed,
-	0x16af5, 0x16af5,
-	0x16b00, 0x16b2f,
-	0x16b37, 0x16b45,
-	0x16b50, 0x16b59,
-	0x16b5b, 0x16b61,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f93, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	0x1bc9c, 0x1bc9c,
-	0x1bc9f, 0x1bc9f,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d164,
-	0x1d166, 0x1d166,
-	0x1d16a, 0x1d16d,
-	0x1d183, 0x1d184,
-	0x1d18c, 0x1d1a9,
-	0x1d1ae, 0x1d1dd,
-	0x1d200, 0x1d241,
-	0x1d245, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1e800, 0x1e8c4,
-	0x1e8c7, 0x1e8cf,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0bf,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0f5,
-	0x1f100, 0x1f10c,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f32c,
-	0x1f330, 0x1f37d,
-	0x1f380, 0x1f3ce,
-	0x1f3d4, 0x1f3f7,
-	0x1f400, 0x1f4fe,
-	0x1f500, 0x1f54a,
-	0x1f550, 0x1f579,
-	0x1f57b, 0x1f5a3,
-	0x1f5a5, 0x1f642,
-	0x1f645, 0x1f6cf,
-	0x1f6e0, 0x1f6ec,
-	0x1f6f0, 0x1f6f3,
-	0x1f700, 0x1f773,
-	0x1f780, 0x1f7d4,
-	0x1f800, 0x1f80b,
-	0x1f810, 0x1f847,
-	0x1f850, 0x1f859,
-	0x1f860, 0x1f887,
-	0x1f890, 0x1f8ad,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_Grapheme_Base */
-
-/* 'Grapheme_Link': Derived Property */
-static const OnigCodePoint CR_Grapheme_Link[] = {
-	40,
-	0x094d, 0x094d,
-	0x09cd, 0x09cd,
-	0x0a4d, 0x0a4d,
-	0x0acd, 0x0acd,
-	0x0b4d, 0x0b4d,
-	0x0bcd, 0x0bcd,
-	0x0c4d, 0x0c4d,
-	0x0ccd, 0x0ccd,
-	0x0d4d, 0x0d4d,
-	0x0dca, 0x0dca,
-	0x0e3a, 0x0e3a,
-	0x0f84, 0x0f84,
-	0x1039, 0x103a,
-	0x1714, 0x1714,
-	0x1734, 0x1734,
-	0x17d2, 0x17d2,
-	0x1a60, 0x1a60,
-	0x1b44, 0x1b44,
-	0x1baa, 0x1bab,
-	0x1bf2, 0x1bf3,
-	0x2d7f, 0x2d7f,
-	0xa806, 0xa806,
-	0xa8c4, 0xa8c4,
-	0xa953, 0xa953,
-	0xa9c0, 0xa9c0,
-	0xaaf6, 0xaaf6,
-	0xabed, 0xabed,
-	0x10a3f, 0x10a3f,
-	0x11046, 0x11046,
-	0x1107f, 0x1107f,
-	0x110b9, 0x110b9,
-	0x11133, 0x11134,
-	0x111c0, 0x111c0,
-	0x11235, 0x11235,
-	0x112ea, 0x112ea,
-	0x1134d, 0x1134d,
-	0x114c2, 0x114c2,
-	0x115bf, 0x115bf,
-	0x1163f, 0x1163f,
-	0x116b6, 0x116b6,
-}; /* CR_Grapheme_Link */
-
-/* 'Common': Script */
-static const OnigCodePoint CR_Common[] = {
-	165,
-	0x0000, 0x0040,
-	0x005b, 0x0060,
-	0x007b, 0x00a9,
-	0x00ab, 0x00b9,
-	0x00bb, 0x00bf,
-	0x00d7, 0x00d7,
-	0x00f7, 0x00f7,
-	0x02b9, 0x02df,
-	0x02e5, 0x02e9,
-	0x02ec, 0x02ff,
-	0x0374, 0x0374,
-	0x037e, 0x037e,
-	0x0385, 0x0385,
-	0x0387, 0x0387,
-	0x0589, 0x0589,
-	0x0605, 0x0605,
-	0x060c, 0x060c,
-	0x061b, 0x061c,
-	0x061f, 0x061f,
-	0x0640, 0x0640,
-	0x0660, 0x0669,
-	0x06dd, 0x06dd,
-	0x0964, 0x0965,
-	0x0e3f, 0x0e3f,
-	0x0fd5, 0x0fd8,
-	0x10fb, 0x10fb,
-	0x16eb, 0x16ed,
-	0x1735, 0x1736,
-	0x1802, 0x1803,
-	0x1805, 0x1805,
-	0x1cd3, 0x1cd3,
-	0x1ce1, 0x1ce1,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf3,
-	0x1cf5, 0x1cf6,
-	0x2000, 0x200b,
-	0x200e, 0x2064,
-	0x2066, 0x2070,
-	0x2074, 0x207e,
-	0x2080, 0x208e,
-	0x20a0, 0x20bd,
-	0x2100, 0x2125,
-	0x2127, 0x2129,
-	0x212c, 0x2131,
-	0x2133, 0x214d,
-	0x214f, 0x215f,
-	0x2189, 0x2189,
-	0x2190, 0x23fa,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x27ff,
-	0x2900, 0x2b73,
-	0x2b76, 0x2b95,
-	0x2b98, 0x2bb9,
-	0x2bbd, 0x2bc8,
-	0x2bca, 0x2bd1,
-	0x2e00, 0x2e42,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x3004,
-	0x3006, 0x3006,
-	0x3008, 0x3020,
-	0x3030, 0x3037,
-	0x303c, 0x303f,
-	0x309b, 0x309c,
-	0x30a0, 0x30a0,
-	0x30fb, 0x30fc,
-	0x3190, 0x319f,
-	0x31c0, 0x31e3,
-	0x3220, 0x325f,
-	0x327f, 0x32cf,
-	0x3358, 0x33ff,
-	0x4dc0, 0x4dff,
-	0xa700, 0xa721,
-	0xa788, 0xa78a,
-	0xa830, 0xa839,
-	0xa92e, 0xa92e,
-	0xa9cf, 0xa9cf,
-	0xab5b, 0xab5b,
-	0xfd3e, 0xfd3f,
-	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,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fc,
-	0x102e1, 0x102fb,
-	0x1bca0, 0x1bca3,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d166,
-	0x1d16a, 0x1d17a,
-	0x1d183, 0x1d184,
-	0x1d18c, 0x1d1a9,
-	0x1d1ae, 0x1d1dd,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0bf,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0f5,
-	0x1f100, 0x1f10c,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f1ff,
-	0x1f201, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f32c,
-	0x1f330, 0x1f37d,
-	0x1f380, 0x1f3ce,
-	0x1f3d4, 0x1f3f7,
-	0x1f400, 0x1f4fe,
-	0x1f500, 0x1f54a,
-	0x1f550, 0x1f579,
-	0x1f57b, 0x1f5a3,
-	0x1f5a5, 0x1f642,
-	0x1f645, 0x1f6cf,
-	0x1f6e0, 0x1f6ec,
-	0x1f6f0, 0x1f6f3,
-	0x1f700, 0x1f773,
-	0x1f780, 0x1f7d4,
-	0x1f800, 0x1f80b,
-	0x1f810, 0x1f847,
-	0x1f850, 0x1f859,
-	0x1f860, 0x1f887,
-	0x1f890, 0x1f8ad,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-}; /* CR_Common */
-
-/* 'Latin': Script */
-static const OnigCodePoint CR_Latin[] = {
-	33,
-	0x0041, 0x005a,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00ba, 0x00ba,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x02b8,
-	0x02e0, 0x02e4,
-	0x1d00, 0x1d25,
-	0x1d2c, 0x1d5c,
-	0x1d62, 0x1d65,
-	0x1d6b, 0x1d77,
-	0x1d79, 0x1dbe,
-	0x1e00, 0x1eff,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 0x209c,
-	0x212a, 0x212b,
-	0x2132, 0x2132,
-	0x214e, 0x214e,
-	0x2160, 0x2188,
-	0x2c60, 0x2c7f,
-	0xa722, 0xa787,
-	0xa78b, 0xa78e,
-	0xa790, 0xa7ad,
-	0xa7b0, 0xa7b1,
-	0xa7f7, 0xa7ff,
-	0xab30, 0xab5a,
-	0xab5c, 0xab5f,
-	0xab64, 0xab64,
-	0xfb00, 0xfb06,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-}; /* CR_Latin */
-
-/* 'Greek': Script */
-static const OnigCodePoint CR_Greek[] = {
-	36,
-	0x0370, 0x0373,
-	0x0375, 0x0377,
-	0x037a, 0x037d,
-	0x037f, 0x037f,
-	0x0384, 0x0384,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03e1,
-	0x03f0, 0x03ff,
-	0x1d26, 0x1d2a,
-	0x1d5d, 0x1d61,
-	0x1d66, 0x1d6a,
-	0x1dbf, 0x1dbf,
-	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,
-	0xab65, 0xab65,
-	0x10140, 0x1018c,
-	0x101a0, 0x101a0,
-	0x1d200, 0x1d245,
-}; /* CR_Greek */
-
-/* 'Cyrillic': Script */
-static const OnigCodePoint CR_Cyrillic[] = {
-	7,
-	0x0400, 0x0484,
-	0x0487, 0x052f,
-	0x1d2b, 0x1d2b,
-	0x1d78, 0x1d78,
-	0x2de0, 0x2dff,
-	0xa640, 0xa69d,
-	0xa69f, 0xa69f,
-}; /* CR_Cyrillic */
-
-/* 'Armenian': Script */
-static const OnigCodePoint CR_Armenian[] = {
-	6,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x058a, 0x058a,
-	0x058d, 0x058f,
-	0xfb13, 0xfb17,
-}; /* CR_Armenian */
-
-/* 'Hebrew': Script */
-static const OnigCodePoint CR_Hebrew[] = {
-	9,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfb4f,
-}; /* CR_Hebrew */
-
-/* 'Arabic': Script */
-static const OnigCodePoint CR_Arabic[] = {
-	55,
-	0x0600, 0x0604,
-	0x0606, 0x060b,
-	0x060d, 0x061a,
-	0x061e, 0x061e,
-	0x0620, 0x063f,
-	0x0641, 0x064a,
-	0x0656, 0x065f,
-	0x066a, 0x066f,
-	0x0671, 0x06dc,
-	0x06de, 0x06ff,
-	0x0750, 0x077f,
-	0x08a0, 0x08b2,
-	0x08e4, 0x08ff,
-	0xfb50, 0xfbc1,
-	0xfbd3, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfd,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0x10e60, 0x10e7e,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-}; /* CR_Arabic */
-
-/* 'Syriac': Script */
-static const OnigCodePoint CR_Syriac[] = {
-	3,
-	0x0700, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x074f,
-}; /* CR_Syriac */
-
-/* 'Thaana': Script */
-static const OnigCodePoint CR_Thaana[] = {
-	1,
-	0x0780, 0x07b1,
-}; /* CR_Thaana */
-
-/* 'Devanagari': Script */
-static const OnigCodePoint CR_Devanagari[] = {
-	4,
-	0x0900, 0x0950,
-	0x0953, 0x0963,
-	0x0966, 0x097f,
-	0xa8e0, 0xa8fb,
-}; /* CR_Devanagari */
-
-/* 'Bengali': Script */
-static const OnigCodePoint CR_Bengali[] = {
-	14,
-	0x0980, 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, 0x09fb,
-}; /* CR_Bengali */
-
-/* 'Gurmukhi': Script */
-static const OnigCodePoint CR_Gurmukhi[] = {
-	16,
-	0x0a01, 0x0a03,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-}; /* CR_Gurmukhi */
-
-/* 'Gujarati': Script */
-static const OnigCodePoint CR_Gujarati[] = {
-	13,
-	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, 0x0af1,
-}; /* CR_Gujarati */
-
-/* 'Oriya': Script */
-static const OnigCodePoint CR_Oriya[] = {
-	14,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3c, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	0x0b66, 0x0b77,
-}; /* CR_Oriya */
-
-/* 'Tamil': Script */
-static const OnigCodePoint CR_Tamil[] = {
-	16,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bfa,
-}; /* CR_Tamil */
-
-/* 'Telugu': Script */
-static const OnigCodePoint CR_Telugu[] = {
-	13,
-	0x0c00, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-}; /* CR_Telugu */
-
-/* 'Kannada': Script */
-static const OnigCodePoint CR_Kannada[] = {
-	14,
-	0x0c81, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-}; /* CR_Kannada */
-
-/* 'Malayalam': Script */
-static const OnigCodePoint CR_Malayalam[] = {
-	11,
-	0x0d01, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
-}; /* CR_Malayalam */
-
-/* 'Sinhala': Script */
-static const OnigCodePoint CR_Sinhala[] = {
-	13,
-	0x0d82, 0x0d83,
-	0x0d85, 0x0d96,
-	0x0d9a, 0x0db1,
-	0x0db3, 0x0dbb,
-	0x0dbd, 0x0dbd,
-	0x0dc0, 0x0dc6,
-	0x0dca, 0x0dca,
-	0x0dcf, 0x0dd4,
-	0x0dd6, 0x0dd6,
-	0x0dd8, 0x0ddf,
-	0x0de6, 0x0def,
-	0x0df2, 0x0df4,
-	0x111e1, 0x111f4,
-}; /* CR_Sinhala */
-
-/* 'Thai': Script */
-static const OnigCodePoint CR_Thai[] = {
-	2,
-	0x0e01, 0x0e3a,
-	0x0e40, 0x0e5b,
-}; /* CR_Thai */
-
-/* '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, 0x0edf,
-}; /* CR_Lao */
-
-/* 'Tibetan': Script */
-static const OnigCodePoint CR_Tibetan[] = {
-	7,
-	0x0f00, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fd4,
-	0x0fd9, 0x0fda,
-}; /* CR_Tibetan */
-
-/* 'Myanmar': Script */
-static const OnigCodePoint CR_Myanmar[] = {
-	3,
-	0x1000, 0x109f,
-	0xa9e0, 0xa9fe,
-	0xaa60, 0xaa7f,
-}; /* CR_Myanmar */
-
-/* 'Georgian': Script */
-static const OnigCodePoint CR_Georgian[] = {
-	8,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 0x10ff,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-}; /* CR_Georgian */
-
-/* 'Hangul': Script */
-static const OnigCodePoint CR_Hangul[] = {
-	14,
-	0x1100, 0x11ff,
-	0x302e, 0x302f,
-	0x3131, 0x318e,
-	0x3200, 0x321e,
-	0x3260, 0x327e,
-	0xa960, 0xa97c,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xffa0, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-}; /* CR_Hangul */
-
-/* 'Ethiopic': Script */
-static const OnigCodePoint CR_Ethiopic[] = {
-	32,
-	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,
-	0x135d, 0x137c,
-	0x1380, 0x1399,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-}; /* CR_Ethiopic */
-
-/* 'Cherokee': Script */
-static const OnigCodePoint CR_Cherokee[] = {
-	1,
-	0x13a0, 0x13f4,
-}; /* CR_Cherokee */
-
-/* 'Canadian_Aboriginal': Script */
-static const OnigCodePoint CR_Canadian_Aboriginal[] = {
-	2,
-	0x1400, 0x167f,
-	0x18b0, 0x18f5,
-}; /* CR_Canadian_Aboriginal */
-
-/* 'Ogham': Script */
-static const OnigCodePoint CR_Ogham[] = {
-	1,
-	0x1680, 0x169c,
-}; /* CR_Ogham */
-
-/* 'Runic': Script */
-static const OnigCodePoint CR_Runic[] = {
-	2,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f8,
-}; /* CR_Runic */
-
-/* 'Khmer': Script */
-static const OnigCodePoint CR_Khmer[] = {
-	4,
-	0x1780, 0x17dd,
-	0x17e0, 0x17e9,
-	0x17f0, 0x17f9,
-	0x19e0, 0x19ff,
-}; /* CR_Khmer */
-
-/* 'Mongolian': Script */
-static const OnigCodePoint CR_Mongolian[] = {
-	6,
-	0x1800, 0x1801,
-	0x1804, 0x1804,
-	0x1806, 0x180e,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-}; /* CR_Mongolian */
-
-/* 'Hiragana': Script */
-static const OnigCodePoint CR_Hiragana[] = {
-	4,
-	0x3041, 0x3096,
-	0x309d, 0x309f,
-	0x1b001, 0x1b001,
-	0x1f200, 0x1f200,
-}; /* CR_Hiragana */
-
-/* 'Katakana': Script */
-static const OnigCodePoint CR_Katakana[] = {
-	8,
-	0x30a1, 0x30fa,
-	0x30fd, 0x30ff,
-	0x31f0, 0x31ff,
-	0x32d0, 0x32fe,
-	0x3300, 0x3357,
-	0xff66, 0xff6f,
-	0xff71, 0xff9d,
-	0x1b000, 0x1b000,
-}; /* CR_Katakana */
-
-/* 'Bopomofo': Script */
-static const OnigCodePoint CR_Bopomofo[] = {
-	3,
-	0x02ea, 0x02eb,
-	0x3105, 0x312d,
-	0x31a0, 0x31ba,
-}; /* CR_Bopomofo */
-
-/* 'Han': Script */
-static const OnigCodePoint CR_Han[] = {
-	15,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x3005, 0x3005,
-	0x3007, 0x3007,
-	0x3021, 0x3029,
-	0x3038, 0x303b,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcc,
-	0xf900, 0xfa6d,
-	0xfa70, 0xfad9,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_Han */
-
-/* 'Yi': Script */
-static const OnigCodePoint CR_Yi[] = {
-	2,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-}; /* CR_Yi */
-
-/* 'Old_Italic': Script */
-static const OnigCodePoint CR_Old_Italic[] = {
-	1,
-	0x10300, 0x10323,
-}; /* CR_Old_Italic */
-
-/* 'Gothic': Script */
-static const OnigCodePoint CR_Gothic[] = {
-	1,
-	0x10330, 0x1034a,
-}; /* CR_Gothic */
-
-/* 'Deseret': Script */
-static const OnigCodePoint CR_Deseret[] = {
-	1,
-	0x10400, 0x1044f,
-}; /* CR_Deseret */
-
-/* 'Inherited': Script */
-static const OnigCodePoint CR_Inherited[] = {
-	27,
-	0x0300, 0x036f,
-	0x0485, 0x0486,
-	0x064b, 0x0655,
-	0x0670, 0x0670,
-	0x0951, 0x0952,
-	0x1ab0, 0x1abe,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce0,
-	0x1ce2, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1cf4, 0x1cf4,
-	0x1cf8, 0x1cf9,
-	0x1dc0, 0x1df5,
-	0x1dfc, 0x1dff,
-	0x200c, 0x200d,
-	0x20d0, 0x20f0,
-	0x302a, 0x302d,
-	0x3099, 0x309a,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe2d,
-	0x101fd, 0x101fd,
-	0x102e0, 0x102e0,
-	0x1d167, 0x1d169,
-	0x1d17b, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-	0xe0100, 0xe01ef,
-}; /* CR_Inherited */
-
-/* 'Tagalog': Script */
-static const OnigCodePoint CR_Tagalog[] = {
-	2,
-	0x1700, 0x170c,
-	0x170e, 0x1714,
-}; /* CR_Tagalog */
-
-/* 'Hanunoo': Script */
-static const OnigCodePoint CR_Hanunoo[] = {
-	1,
-	0x1720, 0x1734,
-}; /* CR_Hanunoo */
-
-/* 'Buhid': Script */
-static const OnigCodePoint CR_Buhid[] = {
-	1,
-	0x1740, 0x1753,
-}; /* CR_Buhid */
-
-/* 'Tagbanwa': Script */
-static const OnigCodePoint CR_Tagbanwa[] = {
-	3,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-}; /* CR_Tagbanwa */
-
-/* 'Limbu': Script */
-static const OnigCodePoint CR_Limbu[] = {
-	5,
-	0x1900, 0x191e,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x194f,
-}; /* CR_Limbu */
-
-/* 'Tai_Le': Script */
-static const OnigCodePoint CR_Tai_Le[] = {
-	2,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-}; /* CR_Tai_Le */
-
-/* '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 */
-
-/* 'Ugaritic': Script */
-static const OnigCodePoint CR_Ugaritic[] = {
-	2,
-	0x10380, 0x1039d,
-	0x1039f, 0x1039f,
-}; /* CR_Ugaritic */
-
-/* 'Shavian': Script */
-static const OnigCodePoint CR_Shavian[] = {
-	1,
-	0x10450, 0x1047f,
-}; /* CR_Shavian */
-
-/* 'Osmanya': Script */
-static const OnigCodePoint CR_Osmanya[] = {
-	2,
-	0x10480, 0x1049d,
-	0x104a0, 0x104a9,
-}; /* CR_Osmanya */
-
-/* 'Cypriot': Script */
-static const OnigCodePoint CR_Cypriot[] = {
-	6,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x1083f,
-}; /* CR_Cypriot */
-
-/* '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 */
-
-/* 'Coptic': Script */
-static const OnigCodePoint CR_Coptic[] = {
-	3,
-	0x03e2, 0x03ef,
-	0x2c80, 0x2cf3,
-	0x2cf9, 0x2cff,
-}; /* CR_Coptic */
-
-/* 'New_Tai_Lue': Script */
-static const OnigCodePoint CR_New_Tai_Lue[] = {
-	4,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x19df,
-}; /* CR_New_Tai_Lue */
-
-/* 'Glagolitic': Script */
-static const OnigCodePoint CR_Glagolitic[] = {
-	2,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-}; /* CR_Glagolitic */
-
-/* 'Tifinagh': Script */
-static const OnigCodePoint CR_Tifinagh[] = {
-	3,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d70,
-	0x2d7f, 0x2d7f,
-}; /* CR_Tifinagh */
-
-/* 'Syloti_Nagri': Script */
-static const OnigCodePoint CR_Syloti_Nagri[] = {
-	1,
-	0xa800, 0xa82b,
-}; /* CR_Syloti_Nagri */
-
-/* 'Old_Persian': Script */
-static const OnigCodePoint CR_Old_Persian[] = {
-	2,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103d5,
-}; /* CR_Old_Persian */
-
-/* '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 */
-
-/* 'Balinese': Script */
-static const OnigCodePoint CR_Balinese[] = {
-	2,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-}; /* CR_Balinese */
-
-/* 'Cuneiform': Script */
-static const OnigCodePoint CR_Cuneiform[] = {
-	3,
-	0x12000, 0x12398,
-	0x12400, 0x1246e,
-	0x12470, 0x12474,
-}; /* CR_Cuneiform */
-
-/* 'Phoenician': Script */
-static const OnigCodePoint CR_Phoenician[] = {
-	2,
-	0x10900, 0x1091b,
-	0x1091f, 0x1091f,
-}; /* CR_Phoenician */
-
-/* 'Phags_Pa': Script */
-static const OnigCodePoint CR_Phags_Pa[] = {
-	1,
-	0xa840, 0xa877,
-}; /* CR_Phags_Pa */
-
-/* 'Nko': Script */
-static const OnigCodePoint CR_Nko[] = {
-	1,
-	0x07c0, 0x07fa,
-}; /* CR_Nko */
-
-/* 'Sundanese': Script */
-static const OnigCodePoint CR_Sundanese[] = {
-	2,
-	0x1b80, 0x1bbf,
-	0x1cc0, 0x1cc7,
-}; /* CR_Sundanese */
-
-/* 'Lepcha': Script */
-static const OnigCodePoint CR_Lepcha[] = {
-	3,
-	0x1c00, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c4f,
-}; /* CR_Lepcha */
-
-/* 'Ol_Chiki': Script */
-static const OnigCodePoint CR_Ol_Chiki[] = {
-	1,
-	0x1c50, 0x1c7f,
-}; /* CR_Ol_Chiki */
-
-/* 'Vai': Script */
-static const OnigCodePoint CR_Vai[] = {
-	1,
-	0xa500, 0xa62b,
-}; /* CR_Vai */
-
-/* 'Saurashtra': Script */
-static const OnigCodePoint CR_Saurashtra[] = {
-	2,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-}; /* CR_Saurashtra */
-
-/* 'Kayah_Li': Script */
-static const OnigCodePoint CR_Kayah_Li[] = {
-	2,
-	0xa900, 0xa92d,
-	0xa92f, 0xa92f,
-}; /* CR_Kayah_Li */
-
-/* 'Rejang': Script */
-static const OnigCodePoint CR_Rejang[] = {
-	2,
-	0xa930, 0xa953,
-	0xa95f, 0xa95f,
-}; /* CR_Rejang */
-
-/* 'Lycian': Script */
-static const OnigCodePoint CR_Lycian[] = {
-	1,
-	0x10280, 0x1029c,
-}; /* CR_Lycian */
-
-/* 'Carian': Script */
-static const OnigCodePoint CR_Carian[] = {
-	1,
-	0x102a0, 0x102d0,
-}; /* CR_Carian */
-
-/* 'Lydian': Script */
-static const OnigCodePoint CR_Lydian[] = {
-	2,
-	0x10920, 0x10939,
-	0x1093f, 0x1093f,
-}; /* CR_Lydian */
-
-/* 'Cham': Script */
-static const OnigCodePoint CR_Cham[] = {
-	4,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa5f,
-}; /* CR_Cham */
-
-/* 'Tai_Tham': Script */
-static const OnigCodePoint CR_Tai_Tham[] = {
-	5,
-	0x1a20, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-}; /* CR_Tai_Tham */
-
-/* 'Tai_Viet': Script */
-static const OnigCodePoint CR_Tai_Viet[] = {
-	2,
-	0xaa80, 0xaac2,
-	0xaadb, 0xaadf,
-}; /* CR_Tai_Viet */
-
-/* 'Avestan': Script */
-static const OnigCodePoint CR_Avestan[] = {
-	2,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b3f,
-}; /* CR_Avestan */
-
-/* 'Egyptian_Hieroglyphs': Script */
-static const OnigCodePoint CR_Egyptian_Hieroglyphs[] = {
-	1,
-	0x13000, 0x1342e,
-}; /* CR_Egyptian_Hieroglyphs */
-
-/* 'Samaritan': Script */
-static const OnigCodePoint CR_Samaritan[] = {
-	2,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-}; /* CR_Samaritan */
-
-/* 'Lisu': Script */
-static const OnigCodePoint CR_Lisu[] = {
-	1,
-	0xa4d0, 0xa4ff,
-}; /* CR_Lisu */
-
-/* 'Bamum': Script */
-static const OnigCodePoint CR_Bamum[] = {
-	2,
-	0xa6a0, 0xa6f7,
-	0x16800, 0x16a38,
-}; /* CR_Bamum */
-
-/* 'Javanese': Script */
-static const OnigCodePoint CR_Javanese[] = {
-	3,
-	0xa980, 0xa9cd,
-	0xa9d0, 0xa9d9,
-	0xa9de, 0xa9df,
-}; /* CR_Javanese */
-
-/* 'Meetei_Mayek': Script */
-static const OnigCodePoint CR_Meetei_Mayek[] = {
-	3,
-	0xaae0, 0xaaf6,
-	0xabc0, 0xabed,
-	0xabf0, 0xabf9,
-}; /* CR_Meetei_Mayek */
-
-/* 'Imperial_Aramaic': Script */
-static const OnigCodePoint CR_Imperial_Aramaic[] = {
-	2,
-	0x10840, 0x10855,
-	0x10857, 0x1085f,
-}; /* CR_Imperial_Aramaic */
-
-/* 'Old_South_Arabian': Script */
-static const OnigCodePoint CR_Old_South_Arabian[] = {
-	1,
-	0x10a60, 0x10a7f,
-}; /* CR_Old_South_Arabian */
-
-/* 'Inscriptional_Parthian': Script */
-static const OnigCodePoint CR_Inscriptional_Parthian[] = {
-	2,
-	0x10b40, 0x10b55,
-	0x10b58, 0x10b5f,
-}; /* CR_Inscriptional_Parthian */
-
-/* 'Inscriptional_Pahlavi': Script */
-static const OnigCodePoint CR_Inscriptional_Pahlavi[] = {
-	2,
-	0x10b60, 0x10b72,
-	0x10b78, 0x10b7f,
-}; /* CR_Inscriptional_Pahlavi */
-
-/* 'Old_Turkic': Script */
-static const OnigCodePoint CR_Old_Turkic[] = {
-	1,
-	0x10c00, 0x10c48,
-}; /* CR_Old_Turkic */
-
-/* 'Kaithi': Script */
-static const OnigCodePoint CR_Kaithi[] = {
-	1,
-	0x11080, 0x110c1,
-}; /* CR_Kaithi */
-
-/* 'Batak': Script */
-static const OnigCodePoint CR_Batak[] = {
-	2,
-	0x1bc0, 0x1bf3,
-	0x1bfc, 0x1bff,
-}; /* CR_Batak */
-
-/* 'Brahmi': Script */
-static const OnigCodePoint CR_Brahmi[] = {
-	3,
-	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-	0x1107f, 0x1107f,
-}; /* CR_Brahmi */
-
-/* 'Mandaic': Script */
-static const OnigCodePoint CR_Mandaic[] = {
-	2,
-	0x0840, 0x085b,
-	0x085e, 0x085e,
-}; /* CR_Mandaic */
-
-/* 'Chakma': Script */
-static const OnigCodePoint CR_Chakma[] = {
-	2,
-	0x11100, 0x11134,
-	0x11136, 0x11143,
-}; /* CR_Chakma */
-
-/* 'Meroitic_Cursive': Script */
-static const OnigCodePoint CR_Meroitic_Cursive[] = {
-	2,
-	0x109a0, 0x109b7,
-	0x109be, 0x109bf,
-}; /* CR_Meroitic_Cursive */
-
-/* 'Meroitic_Hieroglyphs': Script */
-static const OnigCodePoint CR_Meroitic_Hieroglyphs[] = {
-	1,
-	0x10980, 0x1099f,
-}; /* CR_Meroitic_Hieroglyphs */
-
-/* 'Miao': Script */
-static const OnigCodePoint CR_Miao[] = {
-	3,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-}; /* CR_Miao */
-
-/* 'Sharada': Script */
-static const OnigCodePoint CR_Sharada[] = {
-	3,
-	0x11180, 0x111c8,
-	0x111cd, 0x111cd,
-	0x111d0, 0x111da,
-}; /* CR_Sharada */
-
-/* 'Sora_Sompeng': Script */
-static const OnigCodePoint CR_Sora_Sompeng[] = {
-	2,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-}; /* CR_Sora_Sompeng */
-
-/* 'Takri': Script */
-static const OnigCodePoint CR_Takri[] = {
-	2,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-}; /* CR_Takri */
-
-/* 'Caucasian_Albanian': Script */
-static const OnigCodePoint CR_Caucasian_Albanian[] = {
-	2,
-	0x10530, 0x10563,
-	0x1056f, 0x1056f,
-}; /* CR_Caucasian_Albanian */
-
-/* 'Bassa_Vah': Script */
-static const OnigCodePoint CR_Bassa_Vah[] = {
-	2,
-	0x16ad0, 0x16aed,
-	0x16af0, 0x16af5,
-}; /* CR_Bassa_Vah */
-
-/* 'Duployan': Script */
-static const OnigCodePoint CR_Duployan[] = {
-	5,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	0x1bc9c, 0x1bc9f,
-}; /* CR_Duployan */
-
-/* 'Elbasan': Script */
-static const OnigCodePoint CR_Elbasan[] = {
-	1,
-	0x10500, 0x10527,
-}; /* CR_Elbasan */
-
-/* 'Grantha': Script */
-static const OnigCodePoint CR_Grantha[] = {
-	14,
-	0x11301, 0x11303,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133c, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134d,
-	0x11357, 0x11357,
-	0x1135d, 0x11363,
-	0x11366, 0x1136c,
-	0x11370, 0x11374,
-}; /* CR_Grantha */
-
-/* 'Pahawh_Hmong': Script */
-static const OnigCodePoint CR_Pahawh_Hmong[] = {
-	5,
-	0x16b00, 0x16b45,
-	0x16b50, 0x16b59,
-	0x16b5b, 0x16b61,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-}; /* CR_Pahawh_Hmong */
-
-/* 'Khojki': Script */
-static const OnigCodePoint CR_Khojki[] = {
-	2,
-	0x11200, 0x11211,
-	0x11213, 0x1123d,
-}; /* CR_Khojki */
-
-/* 'Linear_A': Script */
-static const OnigCodePoint CR_Linear_A[] = {
-	3,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-}; /* CR_Linear_A */
-
-/* 'Mahajani': Script */
-static const OnigCodePoint CR_Mahajani[] = {
-	1,
-	0x11150, 0x11176,
-}; /* CR_Mahajani */
-
-/* 'Manichaean': Script */
-static const OnigCodePoint CR_Manichaean[] = {
-	2,
-	0x10ac0, 0x10ae6,
-	0x10aeb, 0x10af6,
-}; /* CR_Manichaean */
-
-/* 'Mende_Kikakui': Script */
-static const OnigCodePoint CR_Mende_Kikakui[] = {
-	2,
-	0x1e800, 0x1e8c4,
-	0x1e8c7, 0x1e8d6,
-}; /* CR_Mende_Kikakui */
-
-/* 'Modi': Script */
-static const OnigCodePoint CR_Modi[] = {
-	2,
-	0x11600, 0x11644,
-	0x11650, 0x11659,
-}; /* CR_Modi */
-
-/* 'Mro': Script */
-static const OnigCodePoint CR_Mro[] = {
-	3,
-	0x16a40, 0x16a5e,
-	0x16a60, 0x16a69,
-	0x16a6e, 0x16a6f,
-}; /* CR_Mro */
-
-/* 'Old_North_Arabian': Script */
-static const OnigCodePoint CR_Old_North_Arabian[] = {
-	1,
-	0x10a80, 0x10a9f,
-}; /* CR_Old_North_Arabian */
-
-/* 'Nabataean': Script */
-static const OnigCodePoint CR_Nabataean[] = {
-	2,
-	0x10880, 0x1089e,
-	0x108a7, 0x108af,
-}; /* CR_Nabataean */
-
-/* 'Palmyrene': Script */
-static const OnigCodePoint CR_Palmyrene[] = {
-	1,
-	0x10860, 0x1087f,
-}; /* CR_Palmyrene */
-
-/* 'Pau_Cin_Hau': Script */
-static const OnigCodePoint CR_Pau_Cin_Hau[] = {
-	1,
-	0x11ac0, 0x11af8,
-}; /* CR_Pau_Cin_Hau */
-
-/* 'Old_Permic': Script */
-static const OnigCodePoint CR_Old_Permic[] = {
-	1,
-	0x10350, 0x1037a,
-}; /* CR_Old_Permic */
-
-/* 'Psalter_Pahlavi': Script */
-static const OnigCodePoint CR_Psalter_Pahlavi[] = {
-	3,
-	0x10b80, 0x10b91,
-	0x10b99, 0x10b9c,
-	0x10ba9, 0x10baf,
-}; /* CR_Psalter_Pahlavi */
-
-/* 'Siddham': Script */
-static const OnigCodePoint CR_Siddham[] = {
-	2,
-	0x11580, 0x115b5,
-	0x115b8, 0x115c9,
-}; /* CR_Siddham */
-
-/* 'Khudawadi': Script */
-static const OnigCodePoint CR_Khudawadi[] = {
-	2,
-	0x112b0, 0x112ea,
-	0x112f0, 0x112f9,
-}; /* CR_Khudawadi */
-
-/* 'Tirhuta': Script */
-static const OnigCodePoint CR_Tirhuta[] = {
-	2,
-	0x11480, 0x114c7,
-	0x114d0, 0x114d9,
-}; /* CR_Tirhuta */
-
-/* 'Warang_Citi': Script */
-static const OnigCodePoint CR_Warang_Citi[] = {
-	2,
-	0x118a0, 0x118f2,
-	0x118ff, 0x118ff,
-}; /* CR_Warang_Citi */
-
-/* 'White_Space': Binary Property */
-#define CR_White_Space CR_Space
-
-/* 'Bidi_Control': Binary Property */
-static const OnigCodePoint CR_Bidi_Control[] = {
-	4,
-	0x061c, 0x061c,
-	0x200e, 0x200f,
-	0x202a, 0x202e,
-	0x2066, 0x2069,
-}; /* CR_Bidi_Control */
-
-/* 'Join_Control': Binary Property */
-static const OnigCodePoint CR_Join_Control[] = {
-	1,
-	0x200c, 0x200d,
-}; /* CR_Join_Control */
-
-/* 'Dash': Binary Property */
-static const OnigCodePoint CR_Dash[] = {
-	21,
-	0x002d, 0x002d,
-	0x058a, 0x058a,
-	0x05be, 0x05be,
-	0x1400, 0x1400,
-	0x1806, 0x1806,
-	0x2010, 0x2015,
-	0x2053, 0x2053,
-	0x207b, 0x207b,
-	0x208b, 0x208b,
-	0x2212, 0x2212,
-	0x2e17, 0x2e17,
-	0x2e1a, 0x2e1a,
-	0x2e3a, 0x2e3b,
-	0x2e40, 0x2e40,
-	0x301c, 0x301c,
-	0x3030, 0x3030,
-	0x30a0, 0x30a0,
-	0xfe31, 0xfe32,
-	0xfe58, 0xfe58,
-	0xfe63, 0xfe63,
-	0xff0d, 0xff0d,
-}; /* CR_Dash */
-
-/* 'Hyphen': Binary Property */
-static const OnigCodePoint CR_Hyphen[] = {
-	10,
-	0x002d, 0x002d,
-	0x00ad, 0x00ad,
-	0x058a, 0x058a,
-	0x1806, 0x1806,
-	0x2010, 0x2011,
-	0x2e17, 0x2e17,
-	0x30fb, 0x30fb,
-	0xfe63, 0xfe63,
-	0xff0d, 0xff0d,
-	0xff65, 0xff65,
-}; /* CR_Hyphen */
-
-/* 'Quotation_Mark': Binary Property */
-static const OnigCodePoint CR_Quotation_Mark[] = {
-	13,
-	0x0022, 0x0022,
-	0x0027, 0x0027,
-	0x00ab, 0x00ab,
-	0x00bb, 0x00bb,
-	0x2018, 0x201f,
-	0x2039, 0x203a,
-	0x2e42, 0x2e42,
-	0x300c, 0x300f,
-	0x301d, 0x301f,
-	0xfe41, 0xfe44,
-	0xff02, 0xff02,
-	0xff07, 0xff07,
-	0xff62, 0xff63,
-}; /* CR_Quotation_Mark */
-
-/* 'Terminal_Punctuation': Binary Property */
-static const OnigCodePoint CR_Terminal_Punctuation[] = {
-	86,
-	0x0021, 0x0021,
-	0x002c, 0x002c,
-	0x002e, 0x002e,
-	0x003a, 0x003b,
-	0x003f, 0x003f,
-	0x037e, 0x037e,
-	0x0387, 0x0387,
-	0x0589, 0x0589,
-	0x05c3, 0x05c3,
-	0x060c, 0x060c,
-	0x061b, 0x061b,
-	0x061f, 0x061f,
-	0x06d4, 0x06d4,
-	0x0700, 0x070a,
-	0x070c, 0x070c,
-	0x07f8, 0x07f9,
-	0x0830, 0x083e,
-	0x085e, 0x085e,
-	0x0964, 0x0965,
-	0x0e5a, 0x0e5b,
-	0x0f08, 0x0f08,
-	0x0f0d, 0x0f12,
-	0x104a, 0x104b,
-	0x1361, 0x1368,
-	0x166d, 0x166e,
-	0x16eb, 0x16ed,
-	0x1735, 0x1736,
-	0x17d4, 0x17d6,
-	0x17da, 0x17da,
-	0x1802, 0x1805,
-	0x1808, 0x1809,
-	0x1944, 0x1945,
-	0x1aa8, 0x1aab,
-	0x1b5a, 0x1b5b,
-	0x1b5d, 0x1b5f,
-	0x1c3b, 0x1c3f,
-	0x1c7e, 0x1c7f,
-	0x203c, 0x203d,
-	0x2047, 0x2049,
-	0x2e2e, 0x2e2e,
-	0x2e3c, 0x2e3c,
-	0x2e41, 0x2e41,
-	0x3001, 0x3002,
-	0xa4fe, 0xa4ff,
-	0xa60d, 0xa60f,
-	0xa6f3, 0xa6f7,
-	0xa876, 0xa877,
-	0xa8ce, 0xa8cf,
-	0xa92f, 0xa92f,
-	0xa9c7, 0xa9c9,
-	0xaa5d, 0xaa5f,
-	0xaadf, 0xaadf,
-	0xaaf0, 0xaaf1,
-	0xabeb, 0xabeb,
-	0xfe50, 0xfe52,
-	0xfe54, 0xfe57,
-	0xff01, 0xff01,
-	0xff0c, 0xff0c,
-	0xff0e, 0xff0e,
-	0xff1a, 0xff1b,
-	0xff1f, 0xff1f,
-	0xff61, 0xff61,
-	0xff64, 0xff64,
-	0x1039f, 0x1039f,
-	0x103d0, 0x103d0,
-	0x10857, 0x10857,
-	0x1091f, 0x1091f,
-	0x10a56, 0x10a57,
-	0x10af0, 0x10af5,
-	0x10b3a, 0x10b3f,
-	0x10b99, 0x10b9c,
-	0x11047, 0x1104d,
-	0x110be, 0x110c1,
-	0x11141, 0x11143,
-	0x111c5, 0x111c6,
-	0x111cd, 0x111cd,
-	0x11238, 0x1123c,
-	0x115c2, 0x115c5,
-	0x115c9, 0x115c9,
-	0x11641, 0x11642,
-	0x12470, 0x12474,
-	0x16a6e, 0x16a6f,
-	0x16af5, 0x16af5,
-	0x16b37, 0x16b39,
-	0x16b44, 0x16b44,
-	0x1bc9f, 0x1bc9f,
-}; /* CR_Terminal_Punctuation */
-
-/* 'Other_Math': Binary Property */
-static const OnigCodePoint CR_Other_Math[] = {
-	134,
-	0x005e, 0x005e,
-	0x03d0, 0x03d2,
-	0x03d5, 0x03d5,
-	0x03f0, 0x03f1,
-	0x03f4, 0x03f5,
-	0x2016, 0x2016,
-	0x2032, 0x2034,
-	0x2040, 0x2040,
-	0x2061, 0x2064,
-	0x207d, 0x207e,
-	0x208d, 0x208e,
-	0x20d0, 0x20dc,
-	0x20e1, 0x20e1,
-	0x20e5, 0x20e6,
-	0x20eb, 0x20ef,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2119, 0x211d,
-	0x2124, 0x2124,
-	0x2128, 0x2129,
-	0x212c, 0x212d,
-	0x212f, 0x2131,
-	0x2133, 0x2138,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x2195, 0x2199,
-	0x219c, 0x219f,
-	0x21a1, 0x21a2,
-	0x21a4, 0x21a5,
-	0x21a7, 0x21a7,
-	0x21a9, 0x21ad,
-	0x21b0, 0x21b1,
-	0x21b6, 0x21b7,
-	0x21bc, 0x21cd,
-	0x21d0, 0x21d1,
-	0x21d3, 0x21d3,
-	0x21d5, 0x21db,
-	0x21dd, 0x21dd,
-	0x21e4, 0x21e5,
-	0x2308, 0x230b,
-	0x23b4, 0x23b5,
-	0x23b7, 0x23b7,
-	0x23d0, 0x23d0,
-	0x23e2, 0x23e2,
-	0x25a0, 0x25a1,
-	0x25ae, 0x25b6,
-	0x25bc, 0x25c0,
-	0x25c6, 0x25c7,
-	0x25ca, 0x25cb,
-	0x25cf, 0x25d3,
-	0x25e2, 0x25e2,
-	0x25e4, 0x25e4,
-	0x25e7, 0x25ec,
-	0x2605, 0x2606,
-	0x2640, 0x2640,
-	0x2642, 0x2642,
-	0x2660, 0x2663,
-	0x266d, 0x266e,
-	0x27c5, 0x27c6,
-	0x27e6, 0x27ef,
-	0x2983, 0x2998,
-	0x29d8, 0x29db,
-	0x29fc, 0x29fd,
-	0xfe61, 0xfe61,
-	0xfe63, 0xfe63,
-	0xfe68, 0xfe68,
-	0xff3c, 0xff3c,
-	0xff3e, 0xff3e,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-}; /* CR_Other_Math */
-
-/* 'Hex_Digit': Binary Property */
-static const OnigCodePoint CR_Hex_Digit[] = {
-	6,
-	0x0030, 0x0039,
-	0x0041, 0x0046,
-	0x0061, 0x0066,
-	0xff10, 0xff19,
-	0xff21, 0xff26,
-	0xff41, 0xff46,
-}; /* CR_Hex_Digit */
-
-/* 'ASCII_Hex_Digit': Binary Property */
-#define CR_ASCII_Hex_Digit CR_XDigit
-
-/* 'Other_Alphabetic': Binary Property */
-static const OnigCodePoint CR_Other_Alphabetic[] = {
-	178,
-	0x0345, 0x0345,
-	0x05b0, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x0610, 0x061a,
-	0x064b, 0x0657,
-	0x0659, 0x065f,
-	0x0670, 0x0670,
-	0x06d6, 0x06dc,
-	0x06e1, 0x06e4,
-	0x06e7, 0x06e8,
-	0x06ed, 0x06ed,
-	0x0711, 0x0711,
-	0x0730, 0x073f,
-	0x07a6, 0x07b0,
-	0x0816, 0x0817,
-	0x081b, 0x0823,
-	0x0825, 0x0827,
-	0x0829, 0x082c,
-	0x08e4, 0x08e9,
-	0x08f0, 0x0903,
-	0x093a, 0x093b,
-	0x093e, 0x094c,
-	0x094e, 0x094f,
-	0x0955, 0x0957,
-	0x0962, 0x0963,
-	0x0981, 0x0983,
-	0x09be, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cc,
-	0x09d7, 0x09d7,
-	0x09e2, 0x09e3,
-	0x0a01, 0x0a03,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4c,
-	0x0a51, 0x0a51,
-	0x0a70, 0x0a71,
-	0x0a75, 0x0a75,
-	0x0a81, 0x0a83,
-	0x0abe, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acc,
-	0x0ae2, 0x0ae3,
-	0x0b01, 0x0b03,
-	0x0b3e, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4c,
-	0x0b56, 0x0b57,
-	0x0b62, 0x0b63,
-	0x0b82, 0x0b82,
-	0x0bbe, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcc,
-	0x0bd7, 0x0bd7,
-	0x0c00, 0x0c03,
-	0x0c3e, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4c,
-	0x0c55, 0x0c56,
-	0x0c62, 0x0c63,
-	0x0c81, 0x0c83,
-	0x0cbe, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccc,
-	0x0cd5, 0x0cd6,
-	0x0ce2, 0x0ce3,
-	0x0d01, 0x0d03,
-	0x0d3e, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4c,
-	0x0d57, 0x0d57,
-	0x0d62, 0x0d63,
-	0x0d82, 0x0d83,
-	0x0dcf, 0x0dd4,
-	0x0dd6, 0x0dd6,
-	0x0dd8, 0x0ddf,
-	0x0df2, 0x0df3,
-	0x0e31, 0x0e31,
-	0x0e34, 0x0e3a,
-	0x0e4d, 0x0e4d,
-	0x0eb1, 0x0eb1,
-	0x0eb4, 0x0eb9,
-	0x0ebb, 0x0ebc,
-	0x0ecd, 0x0ecd,
-	0x0f71, 0x0f81,
-	0x0f8d, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x102b, 0x1036,
-	0x1038, 0x1038,
-	0x103b, 0x103e,
-	0x1056, 0x1059,
-	0x105e, 0x1060,
-	0x1062, 0x1062,
-	0x1067, 0x1068,
-	0x1071, 0x1074,
-	0x1082, 0x1086,
-	0x109c, 0x109d,
-	0x135f, 0x135f,
-	0x1712, 0x1713,
-	0x1732, 0x1733,
-	0x1752, 0x1753,
-	0x1772, 0x1773,
-	0x17b6, 0x17c8,
-	0x18a9, 0x18a9,
-	0x1920, 0x192b,
-	0x1930, 0x1938,
-	0x19b0, 0x19c0,
-	0x19c8, 0x19c9,
-	0x1a17, 0x1a1b,
-	0x1a55, 0x1a5e,
-	0x1a61, 0x1a74,
-	0x1b00, 0x1b04,
-	0x1b35, 0x1b43,
-	0x1b80, 0x1b82,
-	0x1ba1, 0x1ba9,
-	0x1bac, 0x1bad,
-	0x1be7, 0x1bf1,
-	0x1c24, 0x1c35,
-	0x1cf2, 0x1cf3,
-	0x1de7, 0x1df4,
-	0x24b6, 0x24e9,
-	0x2de0, 0x2dff,
-	0xa674, 0xa67b,
-	0xa69f, 0xa69f,
-	0xa823, 0xa827,
-	0xa880, 0xa881,
-	0xa8b4, 0xa8c3,
-	0xa926, 0xa92a,
-	0xa947, 0xa952,
-	0xa980, 0xa983,
-	0xa9b4, 0xa9bf,
-	0xaa29, 0xaa36,
-	0xaa43, 0xaa43,
-	0xaa4c, 0xaa4d,
-	0xaab0, 0xaab0,
-	0xaab2, 0xaab4,
-	0xaab7, 0xaab8,
-	0xaabe, 0xaabe,
-	0xaaeb, 0xaaef,
-	0xaaf5, 0xaaf5,
-	0xabe3, 0xabea,
-	0xfb1e, 0xfb1e,
-	0x10376, 0x1037a,
-	0x10a01, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a0f,
-	0x11000, 0x11002,
-	0x11038, 0x11045,
-	0x11082, 0x11082,
-	0x110b0, 0x110b8,
-	0x11100, 0x11102,
-	0x11127, 0x11132,
-	0x11180, 0x11182,
-	0x111b3, 0x111bf,
-	0x1122c, 0x11234,
-	0x11237, 0x11237,
-	0x112df, 0x112e8,
-	0x11301, 0x11303,
-	0x1133e, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134c,
-	0x11357, 0x11357,
-	0x11362, 0x11363,
-	0x114b0, 0x114c1,
-	0x115af, 0x115b5,
-	0x115b8, 0x115be,
-	0x11630, 0x1163e,
-	0x11640, 0x11640,
-	0x116ab, 0x116b5,
-	0x16b30, 0x16b36,
-	0x16f51, 0x16f7e,
-	0x1bc9e, 0x1bc9e,
-	0x1f130, 0x1f149,
-	0x1f150, 0x1f169,
-	0x1f170, 0x1f189,
-}; /* CR_Other_Alphabetic */
-
-/* 'Ideographic': Binary Property */
-static const OnigCodePoint CR_Ideographic[] = {
-	11,
-	0x3006, 0x3007,
-	0x3021, 0x3029,
-	0x3038, 0x303a,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcc,
-	0xf900, 0xfa6d,
-	0xfa70, 0xfad9,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_Ideographic */
-
-/* 'Diacritic': Binary Property */
-static const OnigCodePoint CR_Diacritic[] = {
-	145,
-	0x005e, 0x005e,
-	0x0060, 0x0060,
-	0x00a8, 0x00a8,
-	0x00af, 0x00af,
-	0x00b4, 0x00b4,
-	0x00b7, 0x00b8,
-	0x02b0, 0x034e,
-	0x0350, 0x0357,
-	0x035d, 0x0362,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x0384, 0x0385,
-	0x0483, 0x0487,
-	0x0559, 0x0559,
-	0x0591, 0x05a1,
-	0x05a3, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c4,
-	0x064b, 0x0652,
-	0x0657, 0x0658,
-	0x06df, 0x06e0,
-	0x06e5, 0x06e6,
-	0x06ea, 0x06ec,
-	0x0730, 0x074a,
-	0x07a6, 0x07b0,
-	0x07eb, 0x07f5,
-	0x0818, 0x0819,
-	0x08e4, 0x08fe,
-	0x093c, 0x093c,
-	0x094d, 0x094d,
-	0x0951, 0x0954,
-	0x0971, 0x0971,
-	0x09bc, 0x09bc,
-	0x09cd, 0x09cd,
-	0x0a3c, 0x0a3c,
-	0x0a4d, 0x0a4d,
-	0x0abc, 0x0abc,
-	0x0acd, 0x0acd,
-	0x0b3c, 0x0b3c,
-	0x0b4d, 0x0b4d,
-	0x0bcd, 0x0bcd,
-	0x0c4d, 0x0c4d,
-	0x0cbc, 0x0cbc,
-	0x0ccd, 0x0ccd,
-	0x0d4d, 0x0d4d,
-	0x0dca, 0x0dca,
-	0x0e47, 0x0e4c,
-	0x0e4e, 0x0e4e,
-	0x0ec8, 0x0ecc,
-	0x0f18, 0x0f19,
-	0x0f35, 0x0f35,
-	0x0f37, 0x0f37,
-	0x0f39, 0x0f39,
-	0x0f3e, 0x0f3f,
-	0x0f82, 0x0f84,
-	0x0f86, 0x0f87,
-	0x0fc6, 0x0fc6,
-	0x1037, 0x1037,
-	0x1039, 0x103a,
-	0x1087, 0x108d,
-	0x108f, 0x108f,
-	0x109a, 0x109b,
-	0x17c9, 0x17d3,
-	0x17dd, 0x17dd,
-	0x1939, 0x193b,
-	0x1a75, 0x1a7c,
-	0x1a7f, 0x1a7f,
-	0x1ab0, 0x1abd,
-	0x1b34, 0x1b34,
-	0x1b44, 0x1b44,
-	0x1b6b, 0x1b73,
-	0x1baa, 0x1bab,
-	0x1c36, 0x1c37,
-	0x1c78, 0x1c7d,
-	0x1cd0, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1cf4, 0x1cf4,
-	0x1cf8, 0x1cf9,
-	0x1d2c, 0x1d6a,
-	0x1dc4, 0x1dcf,
-	0x1df5, 0x1df5,
-	0x1dfd, 0x1dff,
-	0x1fbd, 0x1fbd,
-	0x1fbf, 0x1fc1,
-	0x1fcd, 0x1fcf,
-	0x1fdd, 0x1fdf,
-	0x1fed, 0x1fef,
-	0x1ffd, 0x1ffe,
-	0x2cef, 0x2cf1,
-	0x2e2f, 0x2e2f,
-	0x302a, 0x302f,
-	0x3099, 0x309c,
-	0x30fc, 0x30fc,
-	0xa66f, 0xa66f,
-	0xa67c, 0xa67d,
-	0xa67f, 0xa67f,
-	0xa69c, 0xa69d,
-	0xa6f0, 0xa6f1,
-	0xa717, 0xa721,
-	0xa788, 0xa788,
-	0xa7f8, 0xa7f9,
-	0xa8c4, 0xa8c4,
-	0xa8e0, 0xa8f1,
-	0xa92b, 0xa92e,
-	0xa953, 0xa953,
-	0xa9b3, 0xa9b3,
-	0xa9c0, 0xa9c0,
-	0xa9e5, 0xa9e5,
-	0xaa7b, 0xaa7d,
-	0xaabf, 0xaac2,
-	0xaaf6, 0xaaf6,
-	0xab5b, 0xab5f,
-	0xabec, 0xabed,
-	0xfb1e, 0xfb1e,
-	0xfe20, 0xfe2d,
-	0xff3e, 0xff3e,
-	0xff40, 0xff40,
-	0xff70, 0xff70,
-	0xff9e, 0xff9f,
-	0xffe3, 0xffe3,
-	0x102e0, 0x102e0,
-	0x10ae5, 0x10ae6,
-	0x110b9, 0x110ba,
-	0x11133, 0x11134,
-	0x11173, 0x11173,
-	0x111c0, 0x111c0,
-	0x11235, 0x11236,
-	0x112e9, 0x112ea,
-	0x1133c, 0x1133c,
-	0x1134d, 0x1134d,
-	0x11366, 0x1136c,
-	0x11370, 0x11374,
-	0x114c2, 0x114c3,
-	0x115bf, 0x115c0,
-	0x1163f, 0x1163f,
-	0x116b6, 0x116b7,
-	0x16af0, 0x16af4,
-	0x16f8f, 0x16f9f,
-	0x1d167, 0x1d169,
-	0x1d16d, 0x1d172,
-	0x1d17b, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-	0x1e8d0, 0x1e8d6,
-}; /* CR_Diacritic */
-
-/* 'Extender': Binary Property */
-static const OnigCodePoint CR_Extender[] = {
-	26,
-	0x00b7, 0x00b7,
-	0x02d0, 0x02d1,
-	0x0640, 0x0640,
-	0x07fa, 0x07fa,
-	0x0e46, 0x0e46,
-	0x0ec6, 0x0ec6,
-	0x180a, 0x180a,
-	0x1843, 0x1843,
-	0x1aa7, 0x1aa7,
-	0x1c36, 0x1c36,
-	0x1c7b, 0x1c7b,
-	0x3005, 0x3005,
-	0x3031, 0x3035,
-	0x309d, 0x309e,
-	0x30fc, 0x30fe,
-	0xa015, 0xa015,
-	0xa60c, 0xa60c,
-	0xa9cf, 0xa9cf,
-	0xa9e6, 0xa9e6,
-	0xaa70, 0xaa70,
-	0xaadd, 0xaadd,
-	0xaaf3, 0xaaf4,
-	0xff70, 0xff70,
-	0x1135d, 0x1135d,
-	0x115c6, 0x115c8,
-	0x16b42, 0x16b43,
-}; /* CR_Extender */
-
-/* 'Other_Lowercase': Binary Property */
-static const OnigCodePoint CR_Other_Lowercase[] = {
-	20,
-	0x00aa, 0x00aa,
-	0x00ba, 0x00ba,
-	0x02b0, 0x02b8,
-	0x02c0, 0x02c1,
-	0x02e0, 0x02e4,
-	0x0345, 0x0345,
-	0x037a, 0x037a,
-	0x1d2c, 0x1d6a,
-	0x1d78, 0x1d78,
-	0x1d9b, 0x1dbf,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 0x209c,
-	0x2170, 0x217f,
-	0x24d0, 0x24e9,
-	0x2c7c, 0x2c7d,
-	0xa69c, 0xa69d,
-	0xa770, 0xa770,
-	0xa7f8, 0xa7f9,
-	0xab5c, 0xab5f,
-}; /* CR_Other_Lowercase */
-
-/* 'Other_Uppercase': Binary Property */
-static const OnigCodePoint CR_Other_Uppercase[] = {
-	5,
-	0x2160, 0x216f,
-	0x24b6, 0x24cf,
-	0x1f130, 0x1f149,
-	0x1f150, 0x1f169,
-	0x1f170, 0x1f189,
-}; /* CR_Other_Uppercase */
-
-/* 'Noncharacter_Code_Point': Binary Property */
-static const OnigCodePoint CR_Noncharacter_Code_Point[] = {
-	18,
-	0xfdd0, 0xfdef,
-	0xfffe, 0xffff,
-	0x1fffe, 0x1ffff,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xefffe, 0xeffff,
-	0xffffe, 0xfffff,
-	0x10fffe, 0x10ffff,
-}; /* CR_Noncharacter_Code_Point */
-
-/* 'Other_Grapheme_Extend': Binary Property */
-static const OnigCodePoint CR_Other_Grapheme_Extend[] = {
-	22,
-	0x09be, 0x09be,
-	0x09d7, 0x09d7,
-	0x0b3e, 0x0b3e,
-	0x0b57, 0x0b57,
-	0x0bbe, 0x0bbe,
-	0x0bd7, 0x0bd7,
-	0x0cc2, 0x0cc2,
-	0x0cd5, 0x0cd6,
-	0x0d3e, 0x0d3e,
-	0x0d57, 0x0d57,
-	0x0dcf, 0x0dcf,
-	0x0ddf, 0x0ddf,
-	0x200c, 0x200d,
-	0x302e, 0x302f,
-	0xff9e, 0xff9f,
-	0x1133e, 0x1133e,
-	0x11357, 0x11357,
-	0x114b0, 0x114b0,
-	0x114bd, 0x114bd,
-	0x115af, 0x115af,
-	0x1d165, 0x1d165,
-	0x1d16e, 0x1d172,
-}; /* CR_Other_Grapheme_Extend */
-
-/* 'IDS_Binary_Operator': Binary Property */
-static const OnigCodePoint CR_IDS_Binary_Operator[] = {
-	2,
-	0x2ff0, 0x2ff1,
-	0x2ff4, 0x2ffb,
-}; /* CR_IDS_Binary_Operator */
-
-/* 'IDS_Trinary_Operator': Binary Property */
-static const OnigCodePoint CR_IDS_Trinary_Operator[] = {
-	1,
-	0x2ff2, 0x2ff3,
-}; /* CR_IDS_Trinary_Operator */
-
-/* 'Radical': Binary Property */
-static const OnigCodePoint CR_Radical[] = {
-	3,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-}; /* CR_Radical */
-
-/* 'Unified_Ideograph': Binary Property */
-static const OnigCodePoint CR_Unified_Ideograph[] = {
-	12,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcc,
-	0xfa0e, 0xfa0f,
-	0xfa11, 0xfa11,
-	0xfa13, 0xfa14,
-	0xfa1f, 0xfa1f,
-	0xfa21, 0xfa21,
-	0xfa23, 0xfa24,
-	0xfa27, 0xfa29,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-}; /* CR_Unified_Ideograph */
-
-/* 'Other_Default_Ignorable_Code_Point': Binary Property */
-static const OnigCodePoint CR_Other_Default_Ignorable_Code_Point[] = {
-	11,
-	0x034f, 0x034f,
-	0x115f, 0x1160,
-	0x17b4, 0x17b5,
-	0x2065, 0x2065,
-	0x3164, 0x3164,
-	0xffa0, 0xffa0,
-	0xfff0, 0xfff8,
-	0xe0000, 0xe0000,
-	0xe0002, 0xe001f,
-	0xe0080, 0xe00ff,
-	0xe01f0, 0xe0fff,
-}; /* CR_Other_Default_Ignorable_Code_Point */
-
-/* 'Deprecated': Binary Property */
-static const OnigCodePoint CR_Deprecated[] = {
-	9,
-	0x0149, 0x0149,
-	0x0673, 0x0673,
-	0x0f77, 0x0f77,
-	0x0f79, 0x0f79,
-	0x17a3, 0x17a4,
-	0x206a, 0x206f,
-	0x2329, 0x232a,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-}; /* CR_Deprecated */
-
-/* 'Soft_Dotted': Binary Property */
-static const OnigCodePoint CR_Soft_Dotted[] = {
-	31,
-	0x0069, 0x006a,
-	0x012f, 0x012f,
-	0x0249, 0x0249,
-	0x0268, 0x0268,
-	0x029d, 0x029d,
-	0x02b2, 0x02b2,
-	0x03f3, 0x03f3,
-	0x0456, 0x0456,
-	0x0458, 0x0458,
-	0x1d62, 0x1d62,
-	0x1d96, 0x1d96,
-	0x1da4, 0x1da4,
-	0x1da8, 0x1da8,
-	0x1e2d, 0x1e2d,
-	0x1ecb, 0x1ecb,
-	0x2071, 0x2071,
-	0x2148, 0x2149,
-	0x2c7c, 0x2c7c,
-	0x1d422, 0x1d423,
-	0x1d456, 0x1d457,
-	0x1d48a, 0x1d48b,
-	0x1d4be, 0x1d4bf,
-	0x1d4f2, 0x1d4f3,
-	0x1d526, 0x1d527,
-	0x1d55a, 0x1d55b,
-	0x1d58e, 0x1d58f,
-	0x1d5c2, 0x1d5c3,
-	0x1d5f6, 0x1d5f7,
-	0x1d62a, 0x1d62b,
-	0x1d65e, 0x1d65f,
-	0x1d692, 0x1d693,
-}; /* CR_Soft_Dotted */
-
-/* 'Logical_Order_Exception': Binary Property */
-static const OnigCodePoint CR_Logical_Order_Exception[] = {
-	5,
-	0x0e40, 0x0e44,
-	0x0ec0, 0x0ec4,
-	0xaab5, 0xaab6,
-	0xaab9, 0xaab9,
-	0xaabb, 0xaabc,
-}; /* CR_Logical_Order_Exception */
-
-/* 'Other_ID_Start': Binary Property */
-static const OnigCodePoint CR_Other_ID_Start[] = {
-	3,
-	0x2118, 0x2118,
-	0x212e, 0x212e,
-	0x309b, 0x309c,
-}; /* CR_Other_ID_Start */
-
-/* 'Other_ID_Continue': Binary Property */
-static const OnigCodePoint CR_Other_ID_Continue[] = {
-	4,
-	0x00b7, 0x00b7,
-	0x0387, 0x0387,
-	0x1369, 0x1371,
-	0x19da, 0x19da,
-}; /* CR_Other_ID_Continue */
-
-/* 'STerm': Binary Property */
-static const OnigCodePoint CR_STerm[] = {
-	60,
-	0x0021, 0x0021,
-	0x002e, 0x002e,
-	0x003f, 0x003f,
-	0x0589, 0x0589,
-	0x061f, 0x061f,
-	0x06d4, 0x06d4,
-	0x0700, 0x0702,
-	0x07f9, 0x07f9,
-	0x0964, 0x0965,
-	0x104a, 0x104b,
-	0x1362, 0x1362,
-	0x1367, 0x1368,
-	0x166e, 0x166e,
-	0x1735, 0x1736,
-	0x1803, 0x1803,
-	0x1809, 0x1809,
-	0x1944, 0x1945,
-	0x1aa8, 0x1aab,
-	0x1b5a, 0x1b5b,
-	0x1b5e, 0x1b5f,
-	0x1c3b, 0x1c3c,
-	0x1c7e, 0x1c7f,
-	0x203c, 0x203d,
-	0x2047, 0x2049,
-	0x2e2e, 0x2e2e,
-	0x2e3c, 0x2e3c,
-	0x3002, 0x3002,
-	0xa4ff, 0xa4ff,
-	0xa60e, 0xa60f,
-	0xa6f3, 0xa6f3,
-	0xa6f7, 0xa6f7,
-	0xa876, 0xa877,
-	0xa8ce, 0xa8cf,
-	0xa92f, 0xa92f,
-	0xa9c8, 0xa9c9,
-	0xaa5d, 0xaa5f,
-	0xaaf0, 0xaaf1,
-	0xabeb, 0xabeb,
-	0xfe52, 0xfe52,
-	0xfe56, 0xfe57,
-	0xff01, 0xff01,
-	0xff0e, 0xff0e,
-	0xff1f, 0xff1f,
-	0xff61, 0xff61,
-	0x10a56, 0x10a57,
-	0x11047, 0x11048,
-	0x110be, 0x110c1,
-	0x11141, 0x11143,
-	0x111c5, 0x111c6,
-	0x111cd, 0x111cd,
-	0x11238, 0x11239,
-	0x1123b, 0x1123c,
-	0x115c2, 0x115c3,
-	0x115c9, 0x115c9,
-	0x11641, 0x11642,
-	0x16a6e, 0x16a6f,
-	0x16af5, 0x16af5,
-	0x16b37, 0x16b38,
-	0x16b44, 0x16b44,
-	0x1bc9f, 0x1bc9f,
-}; /* CR_STerm */
-
-/* 'Variation_Selector': Binary Property */
-static const OnigCodePoint CR_Variation_Selector[] = {
-	3,
-	0x180b, 0x180d,
-	0xfe00, 0xfe0f,
-	0xe0100, 0xe01ef,
-}; /* CR_Variation_Selector */
-
-/* 'Pattern_White_Space': Binary Property */
-static const OnigCodePoint CR_Pattern_White_Space[] = {
-	5,
-	0x0009, 0x000d,
-	0x0020, 0x0020,
-	0x0085, 0x0085,
-	0x200e, 0x200f,
-	0x2028, 0x2029,
-}; /* CR_Pattern_White_Space */
-
-/* 'Pattern_Syntax': Binary Property */
-static const OnigCodePoint CR_Pattern_Syntax[] = {
-	28,
-	0x0021, 0x002f,
-	0x003a, 0x0040,
-	0x005b, 0x005e,
-	0x0060, 0x0060,
-	0x007b, 0x007e,
-	0x00a1, 0x00a7,
-	0x00a9, 0x00a9,
-	0x00ab, 0x00ac,
-	0x00ae, 0x00ae,
-	0x00b0, 0x00b1,
-	0x00b6, 0x00b6,
-	0x00bb, 0x00bb,
-	0x00bf, 0x00bf,
-	0x00d7, 0x00d7,
-	0x00f7, 0x00f7,
-	0x2010, 0x2027,
-	0x2030, 0x203e,
-	0x2041, 0x2053,
-	0x2055, 0x205e,
-	0x2190, 0x245f,
-	0x2500, 0x2775,
-	0x2794, 0x2bff,
-	0x2e00, 0x2e7f,
-	0x3001, 0x3003,
-	0x3008, 0x3020,
-	0x3030, 0x3030,
-	0xfd3e, 0xfd3f,
-	0xfe45, 0xfe46,
-}; /* CR_Pattern_Syntax */
-
-/* 'Unknown': Script */
-static const OnigCodePoint CR_Unknown[] = {
-	598,
-	0x0378, 0x0379,
-	0x0380, 0x0383,
-	0x038b, 0x038b,
-	0x038d, 0x038d,
-	0x03a2, 0x03a2,
-	0x0530, 0x0530,
-	0x0557, 0x0558,
-	0x0560, 0x0560,
-	0x0588, 0x0588,
-	0x058b, 0x058c,
-	0x0590, 0x0590,
-	0x05c8, 0x05cf,
-	0x05eb, 0x05ef,
-	0x05f5, 0x05ff,
-	0x061d, 0x061d,
-	0x070e, 0x070e,
-	0x074b, 0x074c,
-	0x07b2, 0x07bf,
-	0x07fb, 0x07ff,
-	0x082e, 0x082f,
-	0x083f, 0x083f,
-	0x085c, 0x085d,
-	0x085f, 0x089f,
-	0x08b3, 0x08e3,
-	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,
-	0x09fc, 0x0a00,
-	0x0a04, 0x0a04,
-	0x0a0b, 0x0a0e,
-	0x0a11, 0x0a12,
-	0x0a29, 0x0a29,
-	0x0a31, 0x0a31,
-	0x0a34, 0x0a34,
-	0x0a37, 0x0a37,
-	0x0a3a, 0x0a3b,
-	0x0a3d, 0x0a3d,
-	0x0a43, 0x0a46,
-	0x0a49, 0x0a4a,
-	0x0a4e, 0x0a50,
-	0x0a52, 0x0a58,
-	0x0a5d, 0x0a5d,
-	0x0a5f, 0x0a65,
-	0x0a76, 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,
-	0x0af2, 0x0b00,
-	0x0b04, 0x0b04,
-	0x0b0d, 0x0b0e,
-	0x0b11, 0x0b12,
-	0x0b29, 0x0b29,
-	0x0b31, 0x0b31,
-	0x0b34, 0x0b34,
-	0x0b3a, 0x0b3b,
-	0x0b45, 0x0b46,
-	0x0b49, 0x0b4a,
-	0x0b4e, 0x0b55,
-	0x0b58, 0x0b5b,
-	0x0b5e, 0x0b5e,
-	0x0b64, 0x0b65,
-	0x0b78, 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, 0x0bcf,
-	0x0bd1, 0x0bd6,
-	0x0bd8, 0x0be5,
-	0x0bfb, 0x0bff,
-	0x0c04, 0x0c04,
-	0x0c0d, 0x0c0d,
-	0x0c11, 0x0c11,
-	0x0c29, 0x0c29,
-	0x0c3a, 0x0c3c,
-	0x0c45, 0x0c45,
-	0x0c49, 0x0c49,
-	0x0c4e, 0x0c54,
-	0x0c57, 0x0c57,
-	0x0c5a, 0x0c5f,
-	0x0c64, 0x0c65,
-	0x0c70, 0x0c77,
-	0x0c80, 0x0c80,
-	0x0c84, 0x0c84,
-	0x0c8d, 0x0c8d,
-	0x0c91, 0x0c91,
-	0x0ca9, 0x0ca9,
-	0x0cb4, 0x0cb4,
-	0x0cba, 0x0cbb,
-	0x0cc5, 0x0cc5,
-	0x0cc9, 0x0cc9,
-	0x0cce, 0x0cd4,
-	0x0cd7, 0x0cdd,
-	0x0cdf, 0x0cdf,
-	0x0ce4, 0x0ce5,
-	0x0cf0, 0x0cf0,
-	0x0cf3, 0x0d00,
-	0x0d04, 0x0d04,
-	0x0d0d, 0x0d0d,
-	0x0d11, 0x0d11,
-	0x0d3b, 0x0d3c,
-	0x0d45, 0x0d45,
-	0x0d49, 0x0d49,
-	0x0d4f, 0x0d56,
-	0x0d58, 0x0d5f,
-	0x0d64, 0x0d65,
-	0x0d76, 0x0d78,
-	0x0d80, 0x0d81,
-	0x0d84, 0x0d84,
-	0x0d97, 0x0d99,
-	0x0db2, 0x0db2,
-	0x0dbc, 0x0dbc,
-	0x0dbe, 0x0dbf,
-	0x0dc7, 0x0dc9,
-	0x0dcb, 0x0dce,
-	0x0dd5, 0x0dd5,
-	0x0dd7, 0x0dd7,
-	0x0de0, 0x0de5,
-	0x0df0, 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,
-	0x0ee0, 0x0eff,
-	0x0f48, 0x0f48,
-	0x0f6d, 0x0f70,
-	0x0f98, 0x0f98,
-	0x0fbd, 0x0fbd,
-	0x0fcd, 0x0fcd,
-	0x0fdb, 0x0fff,
-	0x10c6, 0x10c6,
-	0x10c8, 0x10cc,
-	0x10ce, 0x10cf,
-	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, 0x135c,
-	0x137d, 0x137f,
-	0x139a, 0x139f,
-	0x13f5, 0x13ff,
-	0x169d, 0x169f,
-	0x16f9, 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,
-	0x18ab, 0x18af,
-	0x18f6, 0x18ff,
-	0x191f, 0x191f,
-	0x192c, 0x192f,
-	0x193c, 0x193f,
-	0x1941, 0x1943,
-	0x196e, 0x196f,
-	0x1975, 0x197f,
-	0x19ac, 0x19af,
-	0x19ca, 0x19cf,
-	0x19db, 0x19dd,
-	0x1a1c, 0x1a1d,
-	0x1a5f, 0x1a5f,
-	0x1a7d, 0x1a7e,
-	0x1a8a, 0x1a8f,
-	0x1a9a, 0x1a9f,
-	0x1aae, 0x1aaf,
-	0x1abf, 0x1aff,
-	0x1b4c, 0x1b4f,
-	0x1b7d, 0x1b7f,
-	0x1bf4, 0x1bfb,
-	0x1c38, 0x1c3a,
-	0x1c4a, 0x1c4c,
-	0x1c80, 0x1cbf,
-	0x1cc8, 0x1ccf,
-	0x1cf7, 0x1cf7,
-	0x1cfa, 0x1cff,
-	0x1df6, 0x1dfb,
-	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,
-	0x2065, 0x2065,
-	0x2072, 0x2073,
-	0x208f, 0x208f,
-	0x209d, 0x209f,
-	0x20be, 0x20cf,
-	0x20f1, 0x20ff,
-	0x218a, 0x218f,
-	0x23fb, 0x23ff,
-	0x2427, 0x243f,
-	0x244b, 0x245f,
-	0x2b74, 0x2b75,
-	0x2b96, 0x2b97,
-	0x2bba, 0x2bbc,
-	0x2bc9, 0x2bc9,
-	0x2bd2, 0x2bff,
-	0x2c2f, 0x2c2f,
-	0x2c5f, 0x2c5f,
-	0x2cf4, 0x2cf8,
-	0x2d26, 0x2d26,
-	0x2d28, 0x2d2c,
-	0x2d2e, 0x2d2f,
-	0x2d68, 0x2d6e,
-	0x2d71, 0x2d7e,
-	0x2d97, 0x2d9f,
-	0x2da7, 0x2da7,
-	0x2daf, 0x2daf,
-	0x2db7, 0x2db7,
-	0x2dbf, 0x2dbf,
-	0x2dc7, 0x2dc7,
-	0x2dcf, 0x2dcf,
-	0x2dd7, 0x2dd7,
-	0x2ddf, 0x2ddf,
-	0x2e43, 0x2e7f,
-	0x2e9a, 0x2e9a,
-	0x2ef4, 0x2eff,
-	0x2fd6, 0x2fef,
-	0x2ffc, 0x2fff,
-	0x3040, 0x3040,
-	0x3097, 0x3098,
-	0x3100, 0x3104,
-	0x312e, 0x3130,
-	0x318f, 0x318f,
-	0x31bb, 0x31bf,
-	0x31e4, 0x31ef,
-	0x321f, 0x321f,
-	0x32ff, 0x32ff,
-	0x4db6, 0x4dbf,
-	0x9fcd, 0x9fff,
-	0xa48d, 0xa48f,
-	0xa4c7, 0xa4cf,
-	0xa62c, 0xa63f,
-	0xa69e, 0xa69e,
-	0xa6f8, 0xa6ff,
-	0xa78f, 0xa78f,
-	0xa7ae, 0xa7af,
-	0xa7b2, 0xa7f6,
-	0xa82c, 0xa82f,
-	0xa83a, 0xa83f,
-	0xa878, 0xa87f,
-	0xa8c5, 0xa8cd,
-	0xa8da, 0xa8df,
-	0xa8fc, 0xa8ff,
-	0xa954, 0xa95e,
-	0xa97d, 0xa97f,
-	0xa9ce, 0xa9ce,
-	0xa9da, 0xa9dd,
-	0xa9ff, 0xa9ff,
-	0xaa37, 0xaa3f,
-	0xaa4e, 0xaa4f,
-	0xaa5a, 0xaa5b,
-	0xaac3, 0xaada,
-	0xaaf7, 0xab00,
-	0xab07, 0xab08,
-	0xab0f, 0xab10,
-	0xab17, 0xab1f,
-	0xab27, 0xab27,
-	0xab2f, 0xab2f,
-	0xab60, 0xab63,
-	0xab66, 0xabbf,
-	0xabee, 0xabef,
-	0xabfa, 0xabff,
-	0xd7a4, 0xd7af,
-	0xd7c7, 0xd7ca,
-	0xd7fc, 0xf8ff,
-	0xfa6e, 0xfa6f,
-	0xfada, 0xfaff,
-	0xfb07, 0xfb12,
-	0xfb18, 0xfb1c,
-	0xfb37, 0xfb37,
-	0xfb3d, 0xfb3d,
-	0xfb3f, 0xfb3f,
-	0xfb42, 0xfb42,
-	0xfb45, 0xfb45,
-	0xfbc2, 0xfbd2,
-	0xfd40, 0xfd4f,
-	0xfd90, 0xfd91,
-	0xfdc8, 0xfdef,
-	0xfdfe, 0xfdff,
-	0xfe1a, 0xfe1f,
-	0xfe2e, 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,
-	0x1018d, 0x1018f,
-	0x1019c, 0x1019f,
-	0x101a1, 0x101cf,
-	0x101fe, 0x1027f,
-	0x1029d, 0x1029f,
-	0x102d1, 0x102df,
-	0x102fc, 0x102ff,
-	0x10324, 0x1032f,
-	0x1034b, 0x1034f,
-	0x1037b, 0x1037f,
-	0x1039e, 0x1039e,
-	0x103c4, 0x103c7,
-	0x103d6, 0x103ff,
-	0x1049e, 0x1049f,
-	0x104aa, 0x104ff,
-	0x10528, 0x1052f,
-	0x10564, 0x1056e,
-	0x10570, 0x105ff,
-	0x10737, 0x1073f,
-	0x10756, 0x1075f,
-	0x10768, 0x107ff,
-	0x10806, 0x10807,
-	0x10809, 0x10809,
-	0x10836, 0x10836,
-	0x10839, 0x1083b,
-	0x1083d, 0x1083e,
-	0x10856, 0x10856,
-	0x1089f, 0x108a6,
-	0x108b0, 0x108ff,
-	0x1091c, 0x1091e,
-	0x1093a, 0x1093e,
-	0x10940, 0x1097f,
-	0x109b8, 0x109bd,
-	0x109c0, 0x109ff,
-	0x10a04, 0x10a04,
-	0x10a07, 0x10a0b,
-	0x10a14, 0x10a14,
-	0x10a18, 0x10a18,
-	0x10a34, 0x10a37,
-	0x10a3b, 0x10a3e,
-	0x10a48, 0x10a4f,
-	0x10a59, 0x10a5f,
-	0x10aa0, 0x10abf,
-	0x10ae7, 0x10aea,
-	0x10af7, 0x10aff,
-	0x10b36, 0x10b38,
-	0x10b56, 0x10b57,
-	0x10b73, 0x10b77,
-	0x10b92, 0x10b98,
-	0x10b9d, 0x10ba8,
-	0x10bb0, 0x10bff,
-	0x10c49, 0x10e5f,
-	0x10e7f, 0x10fff,
-	0x1104e, 0x11051,
-	0x11070, 0x1107e,
-	0x110c2, 0x110cf,
-	0x110e9, 0x110ef,
-	0x110fa, 0x110ff,
-	0x11135, 0x11135,
-	0x11144, 0x1114f,
-	0x11177, 0x1117f,
-	0x111c9, 0x111cc,
-	0x111ce, 0x111cf,
-	0x111db, 0x111e0,
-	0x111f5, 0x111ff,
-	0x11212, 0x11212,
-	0x1123e, 0x112af,
-	0x112eb, 0x112ef,
-	0x112fa, 0x11300,
-	0x11304, 0x11304,
-	0x1130d, 0x1130e,
-	0x11311, 0x11312,
-	0x11329, 0x11329,
-	0x11331, 0x11331,
-	0x11334, 0x11334,
-	0x1133a, 0x1133b,
-	0x11345, 0x11346,
-	0x11349, 0x1134a,
-	0x1134e, 0x11356,
-	0x11358, 0x1135c,
-	0x11364, 0x11365,
-	0x1136d, 0x1136f,
-	0x11375, 0x1147f,
-	0x114c8, 0x114cf,
-	0x114da, 0x1157f,
-	0x115b6, 0x115b7,
-	0x115ca, 0x115ff,
-	0x11645, 0x1164f,
-	0x1165a, 0x1167f,
-	0x116b8, 0x116bf,
-	0x116ca, 0x1189f,
-	0x118f3, 0x118fe,
-	0x11900, 0x11abf,
-	0x11af9, 0x11fff,
-	0x12399, 0x123ff,
-	0x1246f, 0x1246f,
-	0x12475, 0x12fff,
-	0x1342f, 0x167ff,
-	0x16a39, 0x16a3f,
-	0x16a5f, 0x16a5f,
-	0x16a6a, 0x16a6d,
-	0x16a70, 0x16acf,
-	0x16aee, 0x16aef,
-	0x16af6, 0x16aff,
-	0x16b46, 0x16b4f,
-	0x16b5a, 0x16b5a,
-	0x16b62, 0x16b62,
-	0x16b78, 0x16b7c,
-	0x16b90, 0x16eff,
-	0x16f45, 0x16f4f,
-	0x16f7f, 0x16f8e,
-	0x16fa0, 0x1afff,
-	0x1b002, 0x1bbff,
-	0x1bc6b, 0x1bc6f,
-	0x1bc7d, 0x1bc7f,
-	0x1bc89, 0x1bc8f,
-	0x1bc9a, 0x1bc9b,
-	0x1bca4, 0x1cfff,
-	0x1d0f6, 0x1d0ff,
-	0x1d127, 0x1d128,
-	0x1d1de, 0x1d1ff,
-	0x1d246, 0x1d2ff,
-	0x1d357, 0x1d35f,
-	0x1d372, 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,
-	0x1d7cc, 0x1d7cd,
-	0x1d800, 0x1e7ff,
-	0x1e8c5, 0x1e8c6,
-	0x1e8d7, 0x1edff,
-	0x1ee04, 0x1ee04,
-	0x1ee20, 0x1ee20,
-	0x1ee23, 0x1ee23,
-	0x1ee25, 0x1ee26,
-	0x1ee28, 0x1ee28,
-	0x1ee33, 0x1ee33,
-	0x1ee38, 0x1ee38,
-	0x1ee3a, 0x1ee3a,
-	0x1ee3c, 0x1ee41,
-	0x1ee43, 0x1ee46,
-	0x1ee48, 0x1ee48,
-	0x1ee4a, 0x1ee4a,
-	0x1ee4c, 0x1ee4c,
-	0x1ee50, 0x1ee50,
-	0x1ee53, 0x1ee53,
-	0x1ee55, 0x1ee56,
-	0x1ee58, 0x1ee58,
-	0x1ee5a, 0x1ee5a,
-	0x1ee5c, 0x1ee5c,
-	0x1ee5e, 0x1ee5e,
-	0x1ee60, 0x1ee60,
-	0x1ee63, 0x1ee63,
-	0x1ee65, 0x1ee66,
-	0x1ee6b, 0x1ee6b,
-	0x1ee73, 0x1ee73,
-	0x1ee78, 0x1ee78,
-	0x1ee7d, 0x1ee7d,
-	0x1ee7f, 0x1ee7f,
-	0x1ee8a, 0x1ee8a,
-	0x1ee9c, 0x1eea0,
-	0x1eea4, 0x1eea4,
-	0x1eeaa, 0x1eeaa,
-	0x1eebc, 0x1eeef,
-	0x1eef2, 0x1efff,
-	0x1f02c, 0x1f02f,
-	0x1f094, 0x1f09f,
-	0x1f0af, 0x1f0b0,
-	0x1f0c0, 0x1f0c0,
-	0x1f0d0, 0x1f0d0,
-	0x1f0f6, 0x1f0ff,
-	0x1f10d, 0x1f10f,
-	0x1f12f, 0x1f12f,
-	0x1f16c, 0x1f16f,
-	0x1f19b, 0x1f1e5,
-	0x1f203, 0x1f20f,
-	0x1f23b, 0x1f23f,
-	0x1f249, 0x1f24f,
-	0x1f252, 0x1f2ff,
-	0x1f32d, 0x1f32f,
-	0x1f37e, 0x1f37f,
-	0x1f3cf, 0x1f3d3,
-	0x1f3f8, 0x1f3ff,
-	0x1f4ff, 0x1f4ff,
-	0x1f54b, 0x1f54f,
-	0x1f57a, 0x1f57a,
-	0x1f5a4, 0x1f5a4,
-	0x1f643, 0x1f644,
-	0x1f6d0, 0x1f6df,
-	0x1f6ed, 0x1f6ef,
-	0x1f6f4, 0x1f6ff,
-	0x1f774, 0x1f77f,
-	0x1f7d5, 0x1f7ff,
-	0x1f80c, 0x1f80f,
-	0x1f848, 0x1f84f,
-	0x1f85a, 0x1f85f,
-	0x1f888, 0x1f88f,
-	0x1f8ae, 0x1ffff,
-	0x2a6d7, 0x2a6ff,
-	0x2b735, 0x2b73f,
-	0x2b81e, 0x2f7ff,
-	0x2fa1e, 0xe0000,
-	0xe0002, 0xe001f,
-	0xe0080, 0xe00ff,
-	0xe01f0, 0x10ffff,
-}; /* CR_Unknown */
-
-#ifdef USE_UNICODE_AGE_PROPERTIES
-/* 'Age_1_1': Derived Age 1.1 */
-static const OnigCodePoint CR_Age_1_1[] = {
-	288,
-	0x0000, 0x01f5,
-	0x01fa, 0x0217,
-	0x0250, 0x02a8,
-	0x02b0, 0x02de,
-	0x02e0, 0x02e9,
-	0x0300, 0x0345,
-	0x0360, 0x0361,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x037e, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03ce,
-	0x03d0, 0x03d6,
-	0x03da, 0x03da,
-	0x03dc, 0x03dc,
-	0x03de, 0x03de,
-	0x03e0, 0x03e0,
-	0x03e2, 0x03f3,
-	0x0401, 0x040c,
-	0x040e, 0x044f,
-	0x0451, 0x045c,
-	0x045e, 0x0486,
-	0x0490, 0x04c4,
-	0x04c7, 0x04c8,
-	0x04cb, 0x04cc,
-	0x04d0, 0x04eb,
-	0x04ee, 0x04f5,
-	0x04f8, 0x04f9,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x0589,
-	0x05b0, 0x05b9,
-	0x05bb, 0x05c3,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x060c, 0x060c,
-	0x061b, 0x061b,
-	0x061f, 0x061f,
-	0x0621, 0x063a,
-	0x0640, 0x0652,
-	0x0660, 0x066d,
-	0x0670, 0x06b7,
-	0x06ba, 0x06be,
-	0x06c0, 0x06ce,
-	0x06d0, 0x06ed,
-	0x06f0, 0x06f9,
-	0x0901, 0x0903,
-	0x0905, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0970,
-	0x0981, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bc, 0x09bc,
-	0x09be, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cd,
-	0x09d7, 0x09d7,
-	0x09dc, 0x09dd,
-	0x09df, 0x09e3,
-	0x09e6, 0x09fa,
-	0x0a02, 0x0a02,
-	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, 0x0a8b,
-	0x0a8d, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abc, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acd,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae0,
-	0x0ae6, 0x0aef,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b36, 0x0b39,
-	0x0b3c, 0x0b43,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b61,
-	0x0b66, 0x0b70,
-	0x0b82, 0x0b83,
-	0x0b85, 0x0b8a,
-	0x0b8e, 0x0b90,
-	0x0b92, 0x0b95,
-	0x0b99, 0x0b9a,
-	0x0b9c, 0x0b9c,
-	0x0b9e, 0x0b9f,
-	0x0ba3, 0x0ba4,
-	0x0ba8, 0x0baa,
-	0x0bae, 0x0bb5,
-	0x0bb7, 0x0bb9,
-	0x0bbe, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcd,
-	0x0bd7, 0x0bd7,
-	0x0be7, 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,
-	0x0cbe, 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,
-	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,
-	0x10a0, 0x10c5,
-	0x10d0, 0x10f6,
-	0x10fb, 0x10fb,
-	0x1100, 0x1159,
-	0x115f, 0x11a2,
-	0x11a8, 0x11f9,
-	0x1e00, 0x1e9a,
-	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, 0x202e,
-	0x2030, 0x2046,
-	0x206a, 0x2070,
-	0x2074, 0x208e,
-	0x20a0, 0x20aa,
-	0x20d0, 0x20e1,
-	0x2100, 0x2138,
-	0x2153, 0x2182,
-	0x2190, 0x21ea,
-	0x2200, 0x22f1,
-	0x2300, 0x2300,
-	0x2302, 0x237a,
-	0x2400, 0x2424,
-	0x2440, 0x244a,
-	0x2460, 0x24ea,
-	0x2500, 0x2595,
-	0x25a0, 0x25ef,
-	0x2600, 0x2613,
-	0x261a, 0x266f,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2767,
-	0x2776, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x3000, 0x3037,
-	0x303f, 0x303f,
-	0x3041, 0x3094,
-	0x3099, 0x309e,
-	0x30a1, 0x30fe,
-	0x3105, 0x312c,
-	0x3131, 0x318e,
-	0x3190, 0x319f,
-	0x3200, 0x321c,
-	0x3220, 0x3243,
-	0x3260, 0x327b,
-	0x327f, 0x32b0,
-	0x32c0, 0x32cb,
-	0x32d0, 0x32fe,
-	0x3300, 0x3376,
-	0x337b, 0x33dd,
-	0x33e0, 0x33fe,
-	0x4e00, 0x9fa5,
-	0xe000, 0xfa2d,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1e, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe20, 0xfe23,
-	0xfe30, 0xfe44,
-	0xfe49, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfe70, 0xfe72,
-	0xfe74, 0xfe74,
-	0xfe76, 0xfefc,
-	0xfeff, 0xfeff,
-	0xff01, 0xff5e,
-	0xff61, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfffd, 0xffff,
-}; /* CR_Age_1_1 */
-
-/* 'Age_2_0': Derived Age 2.0 */
-static const OnigCodePoint CR_Age_2_0[] = {
-	312,
-	0x0000, 0x01f5,
-	0x01fa, 0x0217,
-	0x0250, 0x02a8,
-	0x02b0, 0x02de,
-	0x02e0, 0x02e9,
-	0x0300, 0x0345,
-	0x0360, 0x0361,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x037e, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03ce,
-	0x03d0, 0x03d6,
-	0x03da, 0x03da,
-	0x03dc, 0x03dc,
-	0x03de, 0x03de,
-	0x03e0, 0x03e0,
-	0x03e2, 0x03f3,
-	0x0401, 0x040c,
-	0x040e, 0x044f,
-	0x0451, 0x045c,
-	0x045e, 0x0486,
-	0x0490, 0x04c4,
-	0x04c7, 0x04c8,
-	0x04cb, 0x04cc,
-	0x04d0, 0x04eb,
-	0x04ee, 0x04f5,
-	0x04f8, 0x04f9,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x0589,
-	0x0591, 0x05a1,
-	0x05a3, 0x05b9,
-	0x05bb, 0x05c4,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x060c, 0x060c,
-	0x061b, 0x061b,
-	0x061f, 0x061f,
-	0x0621, 0x063a,
-	0x0640, 0x0652,
-	0x0660, 0x066d,
-	0x0670, 0x06b7,
-	0x06ba, 0x06be,
-	0x06c0, 0x06ce,
-	0x06d0, 0x06ed,
-	0x06f0, 0x06f9,
-	0x0901, 0x0903,
-	0x0905, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0970,
-	0x0981, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bc, 0x09bc,
-	0x09be, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cd,
-	0x09d7, 0x09d7,
-	0x09dc, 0x09dd,
-	0x09df, 0x09e3,
-	0x09e6, 0x09fa,
-	0x0a02, 0x0a02,
-	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, 0x0a8b,
-	0x0a8d, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abc, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acd,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae0,
-	0x0ae6, 0x0aef,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b36, 0x0b39,
-	0x0b3c, 0x0b43,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b61,
-	0x0b66, 0x0b70,
-	0x0b82, 0x0b83,
-	0x0b85, 0x0b8a,
-	0x0b8e, 0x0b90,
-	0x0b92, 0x0b95,
-	0x0b99, 0x0b9a,
-	0x0b9c, 0x0b9c,
-	0x0b9e, 0x0b9f,
-	0x0ba3, 0x0ba4,
-	0x0ba8, 0x0baa,
-	0x0bae, 0x0bb5,
-	0x0bb7, 0x0bb9,
-	0x0bbe, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcd,
-	0x0bd7, 0x0bd7,
-	0x0be7, 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,
-	0x0cbe, 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,
-	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, 0x0f69,
-	0x0f71, 0x0f8b,
-	0x0f90, 0x0f95,
-	0x0f97, 0x0f97,
-	0x0f99, 0x0fad,
-	0x0fb1, 0x0fb7,
-	0x0fb9, 0x0fb9,
-	0x10a0, 0x10c5,
-	0x10d0, 0x10f6,
-	0x10fb, 0x10fb,
-	0x1100, 0x1159,
-	0x115f, 0x11a2,
-	0x11a8, 0x11f9,
-	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, 0x202e,
-	0x2030, 0x2046,
-	0x206a, 0x2070,
-	0x2074, 0x208e,
-	0x20a0, 0x20ab,
-	0x20d0, 0x20e1,
-	0x2100, 0x2138,
-	0x2153, 0x2182,
-	0x2190, 0x21ea,
-	0x2200, 0x22f1,
-	0x2300, 0x2300,
-	0x2302, 0x237a,
-	0x2400, 0x2424,
-	0x2440, 0x244a,
-	0x2460, 0x24ea,
-	0x2500, 0x2595,
-	0x25a0, 0x25ef,
-	0x2600, 0x2613,
-	0x261a, 0x266f,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2767,
-	0x2776, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x3000, 0x3037,
-	0x303f, 0x303f,
-	0x3041, 0x3094,
-	0x3099, 0x309e,
-	0x30a1, 0x30fe,
-	0x3105, 0x312c,
-	0x3131, 0x318e,
-	0x3190, 0x319f,
-	0x3200, 0x321c,
-	0x3220, 0x3243,
-	0x3260, 0x327b,
-	0x327f, 0x32b0,
-	0x32c0, 0x32cb,
-	0x32d0, 0x32fe,
-	0x3300, 0x3376,
-	0x337b, 0x33dd,
-	0x33e0, 0x33fe,
-	0x4e00, 0x9fa5,
-	0xac00, 0xd7a3,
-	0xd800, 0xfa2d,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1e, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe20, 0xfe23,
-	0xfe30, 0xfe44,
-	0xfe49, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfe70, 0xfe72,
-	0xfe74, 0xfe74,
-	0xfe76, 0xfefc,
-	0xfeff, 0xfeff,
-	0xff01, 0xff5e,
-	0xff61, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfffd, 0xffff,
-	0x1fffe, 0x1ffff,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_2_0 */
-
-/* 'Age_2_1': Derived Age 2.1 */
-static const OnigCodePoint CR_Age_2_1[] = {
-	312,
-	0x0000, 0x01f5,
-	0x01fa, 0x0217,
-	0x0250, 0x02a8,
-	0x02b0, 0x02de,
-	0x02e0, 0x02e9,
-	0x0300, 0x0345,
-	0x0360, 0x0361,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x037e, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03ce,
-	0x03d0, 0x03d6,
-	0x03da, 0x03da,
-	0x03dc, 0x03dc,
-	0x03de, 0x03de,
-	0x03e0, 0x03e0,
-	0x03e2, 0x03f3,
-	0x0401, 0x040c,
-	0x040e, 0x044f,
-	0x0451, 0x045c,
-	0x045e, 0x0486,
-	0x0490, 0x04c4,
-	0x04c7, 0x04c8,
-	0x04cb, 0x04cc,
-	0x04d0, 0x04eb,
-	0x04ee, 0x04f5,
-	0x04f8, 0x04f9,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x0589,
-	0x0591, 0x05a1,
-	0x05a3, 0x05b9,
-	0x05bb, 0x05c4,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x060c, 0x060c,
-	0x061b, 0x061b,
-	0x061f, 0x061f,
-	0x0621, 0x063a,
-	0x0640, 0x0652,
-	0x0660, 0x066d,
-	0x0670, 0x06b7,
-	0x06ba, 0x06be,
-	0x06c0, 0x06ce,
-	0x06d0, 0x06ed,
-	0x06f0, 0x06f9,
-	0x0901, 0x0903,
-	0x0905, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0970,
-	0x0981, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bc, 0x09bc,
-	0x09be, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cd,
-	0x09d7, 0x09d7,
-	0x09dc, 0x09dd,
-	0x09df, 0x09e3,
-	0x09e6, 0x09fa,
-	0x0a02, 0x0a02,
-	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, 0x0a8b,
-	0x0a8d, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abc, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acd,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae0,
-	0x0ae6, 0x0aef,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b36, 0x0b39,
-	0x0b3c, 0x0b43,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b61,
-	0x0b66, 0x0b70,
-	0x0b82, 0x0b83,
-	0x0b85, 0x0b8a,
-	0x0b8e, 0x0b90,
-	0x0b92, 0x0b95,
-	0x0b99, 0x0b9a,
-	0x0b9c, 0x0b9c,
-	0x0b9e, 0x0b9f,
-	0x0ba3, 0x0ba4,
-	0x0ba8, 0x0baa,
-	0x0bae, 0x0bb5,
-	0x0bb7, 0x0bb9,
-	0x0bbe, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcd,
-	0x0bd7, 0x0bd7,
-	0x0be7, 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,
-	0x0cbe, 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,
-	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, 0x0f69,
-	0x0f71, 0x0f8b,
-	0x0f90, 0x0f95,
-	0x0f97, 0x0f97,
-	0x0f99, 0x0fad,
-	0x0fb1, 0x0fb7,
-	0x0fb9, 0x0fb9,
-	0x10a0, 0x10c5,
-	0x10d0, 0x10f6,
-	0x10fb, 0x10fb,
-	0x1100, 0x1159,
-	0x115f, 0x11a2,
-	0x11a8, 0x11f9,
-	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, 0x202e,
-	0x2030, 0x2046,
-	0x206a, 0x2070,
-	0x2074, 0x208e,
-	0x20a0, 0x20ac,
-	0x20d0, 0x20e1,
-	0x2100, 0x2138,
-	0x2153, 0x2182,
-	0x2190, 0x21ea,
-	0x2200, 0x22f1,
-	0x2300, 0x2300,
-	0x2302, 0x237a,
-	0x2400, 0x2424,
-	0x2440, 0x244a,
-	0x2460, 0x24ea,
-	0x2500, 0x2595,
-	0x25a0, 0x25ef,
-	0x2600, 0x2613,
-	0x261a, 0x266f,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2767,
-	0x2776, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x3000, 0x3037,
-	0x303f, 0x303f,
-	0x3041, 0x3094,
-	0x3099, 0x309e,
-	0x30a1, 0x30fe,
-	0x3105, 0x312c,
-	0x3131, 0x318e,
-	0x3190, 0x319f,
-	0x3200, 0x321c,
-	0x3220, 0x3243,
-	0x3260, 0x327b,
-	0x327f, 0x32b0,
-	0x32c0, 0x32cb,
-	0x32d0, 0x32fe,
-	0x3300, 0x3376,
-	0x337b, 0x33dd,
-	0x33e0, 0x33fe,
-	0x4e00, 0x9fa5,
-	0xac00, 0xd7a3,
-	0xd800, 0xfa2d,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1e, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe20, 0xfe23,
-	0xfe30, 0xfe44,
-	0xfe49, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfe70, 0xfe72,
-	0xfe74, 0xfe74,
-	0xfe76, 0xfefc,
-	0xfeff, 0xfeff,
-	0xff01, 0xff5e,
-	0xff61, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfffc, 0xffff,
-	0x1fffe, 0x1ffff,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_2_1 */
-
-/* 'Age_3_0': Derived Age 3.0 */
-static const OnigCodePoint CR_Age_3_0[] = {
-	369,
-	0x0000, 0x021f,
-	0x0222, 0x0233,
-	0x0250, 0x02ad,
-	0x02b0, 0x02ee,
-	0x0300, 0x034e,
-	0x0360, 0x0362,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x037e, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03ce,
-	0x03d0, 0x03d7,
-	0x03da, 0x03f3,
-	0x0400, 0x0486,
-	0x0488, 0x0489,
-	0x048c, 0x04c4,
-	0x04c7, 0x04c8,
-	0x04cb, 0x04cc,
-	0x04d0, 0x04f5,
-	0x04f8, 0x04f9,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x0591, 0x05a1,
-	0x05a3, 0x05b9,
-	0x05bb, 0x05c4,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x060c, 0x060c,
-	0x061b, 0x061b,
-	0x061f, 0x061f,
-	0x0621, 0x063a,
-	0x0640, 0x0655,
-	0x0660, 0x066d,
-	0x0670, 0x06ed,
-	0x06f0, 0x06fe,
-	0x0700, 0x070d,
-	0x070f, 0x072c,
-	0x0730, 0x074a,
-	0x0780, 0x07b0,
-	0x0901, 0x0903,
-	0x0905, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0970,
-	0x0981, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bc, 0x09bc,
-	0x09be, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cd,
-	0x09d7, 0x09d7,
-	0x09dc, 0x09dd,
-	0x09df, 0x09e3,
-	0x09e6, 0x09fa,
-	0x0a02, 0x0a02,
-	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, 0x0a8b,
-	0x0a8d, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abc, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acd,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae0,
-	0x0ae6, 0x0aef,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b36, 0x0b39,
-	0x0b3c, 0x0b43,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b61,
-	0x0b66, 0x0b70,
-	0x0b82, 0x0b83,
-	0x0b85, 0x0b8a,
-	0x0b8e, 0x0b90,
-	0x0b92, 0x0b95,
-	0x0b99, 0x0b9a,
-	0x0b9c, 0x0b9c,
-	0x0b9e, 0x0b9f,
-	0x0ba3, 0x0ba4,
-	0x0ba8, 0x0baa,
-	0x0bae, 0x0bb5,
-	0x0bb7, 0x0bb9,
-	0x0bbe, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcd,
-	0x0bd7, 0x0bd7,
-	0x0be7, 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,
-	0x0cbe, 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, 0x0fcf,
-	0x1000, 0x1021,
-	0x1023, 0x1027,
-	0x1029, 0x102a,
-	0x102c, 0x1032,
-	0x1036, 0x1039,
-	0x1040, 0x1059,
-	0x10a0, 0x10c5,
-	0x10d0, 0x10f6,
-	0x10fb, 0x10fb,
-	0x1100, 0x1159,
-	0x115f, 0x11a2,
-	0x11a8, 0x11f9,
-	0x1200, 0x1206,
-	0x1208, 0x1246,
-	0x1248, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1286,
-	0x1288, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12ae,
-	0x12b0, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12ce,
-	0x12d0, 0x12d6,
-	0x12d8, 0x12ee,
-	0x12f0, 0x130e,
-	0x1310, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x131e,
-	0x1320, 0x1346,
-	0x1348, 0x135a,
-	0x1361, 0x137c,
-	0x13a0, 0x13f4,
-	0x1401, 0x1676,
-	0x1680, 0x169c,
-	0x16a0, 0x16f0,
-	0x1780, 0x17dc,
-	0x17e0, 0x17e9,
-	0x1800, 0x180e,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18a9,
-	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, 0x2046,
-	0x2048, 0x204d,
-	0x206a, 0x2070,
-	0x2074, 0x208e,
-	0x20a0, 0x20af,
-	0x20d0, 0x20e3,
-	0x2100, 0x213a,
-	0x2153, 0x2183,
-	0x2190, 0x21f3,
-	0x2200, 0x22f1,
-	0x2300, 0x237b,
-	0x237d, 0x239a,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x24ea,
-	0x2500, 0x2595,
-	0x25a0, 0x25f7,
-	0x2600, 0x2613,
-	0x2619, 0x2671,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2767,
-	0x2776, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x2800, 0x28ff,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303a,
-	0x303e, 0x303f,
-	0x3041, 0x3094,
-	0x3099, 0x309e,
-	0x30a1, 0x30fe,
-	0x3105, 0x312c,
-	0x3131, 0x318e,
-	0x3190, 0x31b7,
-	0x3200, 0x321c,
-	0x3220, 0x3243,
-	0x3260, 0x327b,
-	0x327f, 0x32b0,
-	0x32c0, 0x32cb,
-	0x32d0, 0x32fe,
-	0x3300, 0x3376,
-	0x337b, 0x33dd,
-	0x33e0, 0x33fe,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fa5,
-	0xa000, 0xa48c,
-	0xa490, 0xa4a1,
-	0xa4a4, 0xa4b3,
-	0xa4b5, 0xa4c0,
-	0xa4c2, 0xa4c4,
-	0xa4c6, 0xa4c6,
-	0xac00, 0xd7a3,
-	0xd800, 0xfa2d,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe20, 0xfe23,
-	0xfe30, 0xfe44,
-	0xfe49, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfe70, 0xfe72,
-	0xfe74, 0xfe74,
-	0xfe76, 0xfefc,
-	0xfeff, 0xfeff,
-	0xff01, 0xff5e,
-	0xff61, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfff9, 0xffff,
-	0x1fffe, 0x1ffff,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_3_0 */
-
-/* 'Age_3_1': Derived Age 3.1 */
-static const OnigCodePoint CR_Age_3_1[] = {
-	402,
-	0x0000, 0x021f,
-	0x0222, 0x0233,
-	0x0250, 0x02ad,
-	0x02b0, 0x02ee,
-	0x0300, 0x034e,
-	0x0360, 0x0362,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x037e, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03ce,
-	0x03d0, 0x03d7,
-	0x03da, 0x03f5,
-	0x0400, 0x0486,
-	0x0488, 0x0489,
-	0x048c, 0x04c4,
-	0x04c7, 0x04c8,
-	0x04cb, 0x04cc,
-	0x04d0, 0x04f5,
-	0x04f8, 0x04f9,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x0591, 0x05a1,
-	0x05a3, 0x05b9,
-	0x05bb, 0x05c4,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x060c, 0x060c,
-	0x061b, 0x061b,
-	0x061f, 0x061f,
-	0x0621, 0x063a,
-	0x0640, 0x0655,
-	0x0660, 0x066d,
-	0x0670, 0x06ed,
-	0x06f0, 0x06fe,
-	0x0700, 0x070d,
-	0x070f, 0x072c,
-	0x0730, 0x074a,
-	0x0780, 0x07b0,
-	0x0901, 0x0903,
-	0x0905, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0970,
-	0x0981, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bc, 0x09bc,
-	0x09be, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cd,
-	0x09d7, 0x09d7,
-	0x09dc, 0x09dd,
-	0x09df, 0x09e3,
-	0x09e6, 0x09fa,
-	0x0a02, 0x0a02,
-	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, 0x0a8b,
-	0x0a8d, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abc, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acd,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae0,
-	0x0ae6, 0x0aef,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b36, 0x0b39,
-	0x0b3c, 0x0b43,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b61,
-	0x0b66, 0x0b70,
-	0x0b82, 0x0b83,
-	0x0b85, 0x0b8a,
-	0x0b8e, 0x0b90,
-	0x0b92, 0x0b95,
-	0x0b99, 0x0b9a,
-	0x0b9c, 0x0b9c,
-	0x0b9e, 0x0b9f,
-	0x0ba3, 0x0ba4,
-	0x0ba8, 0x0baa,
-	0x0bae, 0x0bb5,
-	0x0bb7, 0x0bb9,
-	0x0bbe, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcd,
-	0x0bd7, 0x0bd7,
-	0x0be7, 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,
-	0x0cbe, 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, 0x0fcf,
-	0x1000, 0x1021,
-	0x1023, 0x1027,
-	0x1029, 0x102a,
-	0x102c, 0x1032,
-	0x1036, 0x1039,
-	0x1040, 0x1059,
-	0x10a0, 0x10c5,
-	0x10d0, 0x10f6,
-	0x10fb, 0x10fb,
-	0x1100, 0x1159,
-	0x115f, 0x11a2,
-	0x11a8, 0x11f9,
-	0x1200, 0x1206,
-	0x1208, 0x1246,
-	0x1248, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1286,
-	0x1288, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12ae,
-	0x12b0, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12ce,
-	0x12d0, 0x12d6,
-	0x12d8, 0x12ee,
-	0x12f0, 0x130e,
-	0x1310, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x131e,
-	0x1320, 0x1346,
-	0x1348, 0x135a,
-	0x1361, 0x137c,
-	0x13a0, 0x13f4,
-	0x1401, 0x1676,
-	0x1680, 0x169c,
-	0x16a0, 0x16f0,
-	0x1780, 0x17dc,
-	0x17e0, 0x17e9,
-	0x1800, 0x180e,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18a9,
-	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, 0x2046,
-	0x2048, 0x204d,
-	0x206a, 0x2070,
-	0x2074, 0x208e,
-	0x20a0, 0x20af,
-	0x20d0, 0x20e3,
-	0x2100, 0x213a,
-	0x2153, 0x2183,
-	0x2190, 0x21f3,
-	0x2200, 0x22f1,
-	0x2300, 0x237b,
-	0x237d, 0x239a,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x24ea,
-	0x2500, 0x2595,
-	0x25a0, 0x25f7,
-	0x2600, 0x2613,
-	0x2619, 0x2671,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2767,
-	0x2776, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x2800, 0x28ff,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303a,
-	0x303e, 0x303f,
-	0x3041, 0x3094,
-	0x3099, 0x309e,
-	0x30a1, 0x30fe,
-	0x3105, 0x312c,
-	0x3131, 0x318e,
-	0x3190, 0x31b7,
-	0x3200, 0x321c,
-	0x3220, 0x3243,
-	0x3260, 0x327b,
-	0x327f, 0x32b0,
-	0x32c0, 0x32cb,
-	0x32d0, 0x32fe,
-	0x3300, 0x3376,
-	0x337b, 0x33dd,
-	0x33e0, 0x33fe,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fa5,
-	0xa000, 0xa48c,
-	0xa490, 0xa4a1,
-	0xa4a4, 0xa4b3,
-	0xa4b5, 0xa4c0,
-	0xa4c2, 0xa4c4,
-	0xa4c6, 0xa4c6,
-	0xac00, 0xd7a3,
-	0xd800, 0xfa2d,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 0xfdfb,
-	0xfe20, 0xfe23,
-	0xfe30, 0xfe44,
-	0xfe49, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfe70, 0xfe72,
-	0xfe74, 0xfe74,
-	0xfe76, 0xfefc,
-	0xfeff, 0xfeff,
-	0xff01, 0xff5e,
-	0xff61, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfff9, 0xffff,
-	0x10300, 0x1031e,
-	0x10320, 0x10323,
-	0x10330, 0x1034a,
-	0x10400, 0x10425,
-	0x10428, 0x1044d,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d12a, 0x1d1dd,
-	0x1d400, 0x1d454,
-	0x1d456, 0x1d49c,
-	0x1d49e, 0x1d49f,
-	0x1d4a2, 0x1d4a2,
-	0x1d4a5, 0x1d4a6,
-	0x1d4a9, 0x1d4ac,
-	0x1d4ae, 0x1d4b9,
-	0x1d4bb, 0x1d4bb,
-	0x1d4bd, 0x1d4c0,
-	0x1d4c2, 0x1d4c3,
-	0x1d4c5, 0x1d505,
-	0x1d507, 0x1d50a,
-	0x1d50d, 0x1d514,
-	0x1d516, 0x1d51c,
-	0x1d51e, 0x1d539,
-	0x1d53b, 0x1d53e,
-	0x1d540, 0x1d544,
-	0x1d546, 0x1d546,
-	0x1d54a, 0x1d550,
-	0x1d552, 0x1d6a3,
-	0x1d6a8, 0x1d7c9,
-	0x1d7ce, 0x1d7ff,
-	0x1fffe, 0x2a6d6,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_3_1 */
-
-/* 'Age_3_2': Derived Age 3.2 */
-static const OnigCodePoint CR_Age_3_2[] = {
-	397,
-	0x0000, 0x0220,
-	0x0222, 0x0233,
-	0x0250, 0x02ad,
-	0x02b0, 0x02ee,
-	0x0300, 0x034f,
-	0x0360, 0x036f,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x037e, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03ce,
-	0x03d0, 0x03f6,
-	0x0400, 0x0486,
-	0x0488, 0x04ce,
-	0x04d0, 0x04f5,
-	0x04f8, 0x04f9,
-	0x0500, 0x050f,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x0591, 0x05a1,
-	0x05a3, 0x05b9,
-	0x05bb, 0x05c4,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x060c, 0x060c,
-	0x061b, 0x061b,
-	0x061f, 0x061f,
-	0x0621, 0x063a,
-	0x0640, 0x0655,
-	0x0660, 0x06ed,
-	0x06f0, 0x06fe,
-	0x0700, 0x070d,
-	0x070f, 0x072c,
-	0x0730, 0x074a,
-	0x0780, 0x07b1,
-	0x0901, 0x0903,
-	0x0905, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0970,
-	0x0981, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bc, 0x09bc,
-	0x09be, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cd,
-	0x09d7, 0x09d7,
-	0x09dc, 0x09dd,
-	0x09df, 0x09e3,
-	0x09e6, 0x09fa,
-	0x0a02, 0x0a02,
-	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, 0x0a8b,
-	0x0a8d, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abc, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acd,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae0,
-	0x0ae6, 0x0aef,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b36, 0x0b39,
-	0x0b3c, 0x0b43,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b61,
-	0x0b66, 0x0b70,
-	0x0b82, 0x0b83,
-	0x0b85, 0x0b8a,
-	0x0b8e, 0x0b90,
-	0x0b92, 0x0b95,
-	0x0b99, 0x0b9a,
-	0x0b9c, 0x0b9c,
-	0x0b9e, 0x0b9f,
-	0x0ba3, 0x0ba4,
-	0x0ba8, 0x0baa,
-	0x0bae, 0x0bb5,
-	0x0bb7, 0x0bb9,
-	0x0bbe, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcd,
-	0x0bd7, 0x0bd7,
-	0x0be7, 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,
-	0x0cbe, 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, 0x0fcf,
-	0x1000, 0x1021,
-	0x1023, 0x1027,
-	0x1029, 0x102a,
-	0x102c, 0x1032,
-	0x1036, 0x1039,
-	0x1040, 0x1059,
-	0x10a0, 0x10c5,
-	0x10d0, 0x10f8,
-	0x10fb, 0x10fb,
-	0x1100, 0x1159,
-	0x115f, 0x11a2,
-	0x11a8, 0x11f9,
-	0x1200, 0x1206,
-	0x1208, 0x1246,
-	0x1248, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1286,
-	0x1288, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12ae,
-	0x12b0, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12ce,
-	0x12d0, 0x12d6,
-	0x12d8, 0x12ee,
-	0x12f0, 0x130e,
-	0x1310, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x131e,
-	0x1320, 0x1346,
-	0x1348, 0x135a,
-	0x1361, 0x137c,
-	0x13a0, 0x13f4,
-	0x1401, 0x1676,
-	0x1680, 0x169c,
-	0x16a0, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1714,
-	0x1720, 0x1736,
-	0x1740, 0x1753,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-	0x1780, 0x17dc,
-	0x17e0, 0x17e9,
-	0x1800, 0x180e,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18a9,
-	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, 0x2052,
-	0x2057, 0x2057,
-	0x205f, 0x2063,
-	0x206a, 0x2071,
-	0x2074, 0x208e,
-	0x20a0, 0x20b1,
-	0x20d0, 0x20ea,
-	0x2100, 0x213a,
-	0x213d, 0x214b,
-	0x2153, 0x2183,
-	0x2190, 0x23ce,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x24fe,
-	0x2500, 0x2613,
-	0x2616, 0x2617,
-	0x2619, 0x267d,
-	0x2680, 0x2689,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27d0, 0x27eb,
-	0x27f0, 0x2aff,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312c,
-	0x3131, 0x318e,
-	0x3190, 0x31b7,
-	0x31f0, 0x321c,
-	0x3220, 0x3243,
-	0x3251, 0x327b,
-	0x327f, 0x32cb,
-	0x32d0, 0x32fe,
-	0x3300, 0x3376,
-	0x337b, 0x33dd,
-	0x33e0, 0x33fe,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fa5,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xac00, 0xd7a3,
-	0xd800, 0xfa2d,
-	0xfa30, 0xfa6a,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 0xfdfc,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe23,
-	0xfe30, 0xfe46,
-	0xfe49, 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, 0xffff,
-	0x10300, 0x1031e,
-	0x10320, 0x10323,
-	0x10330, 0x1034a,
-	0x10400, 0x10425,
-	0x10428, 0x1044d,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d12a, 0x1d1dd,
-	0x1d400, 0x1d454,
-	0x1d456, 0x1d49c,
-	0x1d49e, 0x1d49f,
-	0x1d4a2, 0x1d4a2,
-	0x1d4a5, 0x1d4a6,
-	0x1d4a9, 0x1d4ac,
-	0x1d4ae, 0x1d4b9,
-	0x1d4bb, 0x1d4bb,
-	0x1d4bd, 0x1d4c0,
-	0x1d4c2, 0x1d4c3,
-	0x1d4c5, 0x1d505,
-	0x1d507, 0x1d50a,
-	0x1d50d, 0x1d514,
-	0x1d516, 0x1d51c,
-	0x1d51e, 0x1d539,
-	0x1d53b, 0x1d53e,
-	0x1d540, 0x1d544,
-	0x1d546, 0x1d546,
-	0x1d54a, 0x1d550,
-	0x1d552, 0x1d6a3,
-	0x1d6a8, 0x1d7c9,
-	0x1d7ce, 0x1d7ff,
-	0x1fffe, 0x2a6d6,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_3_2 */
-
-/* 'Age_4_0': Derived Age 4.0 */
-static const OnigCodePoint CR_Age_4_0[] = {
-	412,
-	0x0000, 0x0236,
-	0x0250, 0x0357,
-	0x035d, 0x036f,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x037e, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03ce,
-	0x03d0, 0x03fb,
-	0x0400, 0x0486,
-	0x0488, 0x04ce,
-	0x04d0, 0x04f5,
-	0x04f8, 0x04f9,
-	0x0500, 0x050f,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x0591, 0x05a1,
-	0x05a3, 0x05b9,
-	0x05bb, 0x05c4,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x0603,
-	0x060c, 0x0615,
-	0x061b, 0x061b,
-	0x061f, 0x061f,
-	0x0621, 0x063a,
-	0x0640, 0x0658,
-	0x0660, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x074f,
-	0x0780, 0x07b1,
-	0x0901, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0970,
-	0x0981, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bc, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cd,
-	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, 0x0bb5,
-	0x0bb7, 0x0bb9,
-	0x0bbe, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcd,
-	0x0bd7, 0x0bd7,
-	0x0be7, 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, 0x0fcf,
-	0x1000, 0x1021,
-	0x1023, 0x1027,
-	0x1029, 0x102a,
-	0x102c, 0x1032,
-	0x1036, 0x1039,
-	0x1040, 0x1059,
-	0x10a0, 0x10c5,
-	0x10d0, 0x10f8,
-	0x10fb, 0x10fb,
-	0x1100, 0x1159,
-	0x115f, 0x11a2,
-	0x11a8, 0x11f9,
-	0x1200, 0x1206,
-	0x1208, 0x1246,
-	0x1248, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1286,
-	0x1288, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12ae,
-	0x12b0, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12ce,
-	0x12d0, 0x12d6,
-	0x12d8, 0x12ee,
-	0x12f0, 0x130e,
-	0x1310, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x131e,
-	0x1320, 0x1346,
-	0x1348, 0x135a,
-	0x1361, 0x137c,
-	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,
-	0x19e0, 0x19ff,
-	0x1d00, 0x1d6b,
-	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, 0x2054,
-	0x2057, 0x2057,
-	0x205f, 0x2063,
-	0x206a, 0x2071,
-	0x2074, 0x208e,
-	0x20a0, 0x20b1,
-	0x20d0, 0x20ea,
-	0x2100, 0x213b,
-	0x213d, 0x214b,
-	0x2153, 0x2183,
-	0x2190, 0x23d0,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x2617,
-	0x2619, 0x267d,
-	0x2680, 0x2691,
-	0x26a0, 0x26a1,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27d0, 0x27eb,
-	0x27f0, 0x2b0d,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312c,
-	0x3131, 0x318e,
-	0x3190, 0x31b7,
-	0x31f0, 0x321e,
-	0x3220, 0x3243,
-	0x3250, 0x327d,
-	0x327f, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fa5,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xac00, 0xd7a3,
-	0xd800, 0xfa2d,
-	0xfa30, 0xfa6a,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 0xfdfd,
-	0xfe00, 0xfe0f,
-	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, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1013f,
-	0x10300, 0x1031e,
-	0x10320, 0x10323,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x1039f, 0x1039f,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x1083f,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d12a, 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, 0x1d6a3,
-	0x1d6a8, 0x1d7c9,
-	0x1d7ce, 0x1d7ff,
-	0x1fffe, 0x2a6d6,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_4_0 */
-
-/* 'Age_4_1': Derived Age 4.1 */
-static const OnigCodePoint CR_Age_4_1[] = {
-	430,
-	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,
-	0xfdd0, 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, 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,
-	0x1fffe, 0x2a6d6,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_4_1 */
-
-/* 'Age_5_0': Derived Age 5.0 */
-static const OnigCodePoint CR_Age_5_0[] = {
-	440,
-	0x0000, 0x036f,
-	0x0374, 0x0375,
-	0x037a, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03ce,
-	0x03d0, 0x0486,
-	0x0488, 0x0513,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x0591, 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,
-	0x07c0, 0x07fa,
-	0x0901, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0970,
-	0x097b, 0x097f,
-	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, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	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,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1d00, 0x1dca,
-	0x1dfe, 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, 0x20ef,
-	0x2100, 0x214e,
-	0x2153, 0x2184,
-	0x2190, 0x23e7,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x269c,
-	0x26a0, 0x26b2,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27c0, 0x27ca,
-	0x27d0, 0x27eb,
-	0x27f0, 0x2b1a,
-	0x2b20, 0x2b23,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2c6c,
-	0x2c74, 0x2c77,
-	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, 0xa71a,
-	0xa720, 0xa721,
-	0xa800, 0xa82b,
-	0xa840, 0xa877,
-	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,
-	0xfdd0, 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, 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,
-	0x10900, 0x10919,
-	0x1091f, 0x1091f,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d12a, 0x1d1dd,
-	0x1d200, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1fffe, 0x2a6d6,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_5_0 */
-
-/* 'Age_5_1': Derived Age 5.1 */
-static const OnigCodePoint CR_Age_5_1[] = {
-	455,
-	0x0000, 0x0377,
-	0x037a, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x0523,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x0603,
-	0x0606, 0x061b,
-	0x061e, 0x061f,
-	0x0621, 0x065e,
-	0x0660, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0901, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0972,
-	0x097b, 0x097f,
-	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,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bfa,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-	0x0c82, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
-	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, 0x0f6c,
-	0x0f71, 0x0f8b,
-	0x0f90, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fd4,
-	0x1000, 0x1099,
-	0x109e, 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, 0x18aa,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19a9,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19d9,
-	0x19de, 0x1a1b,
-	0x1a1e, 0x1a1f,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1baa,
-	0x1bae, 0x1bb9,
-	0x1c00, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1d00, 0x1de6,
-	0x1dfe, 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, 0x2064,
-	0x206a, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x2094,
-	0x20a0, 0x20b5,
-	0x20d0, 0x20f0,
-	0x2100, 0x214f,
-	0x2153, 0x2188,
-	0x2190, 0x23e7,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x269d,
-	0x26a0, 0x26bc,
-	0x26c0, 0x26c3,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27c0, 0x27ca,
-	0x27cc, 0x27cc,
-	0x27d0, 0x2b4c,
-	0x2b50, 0x2b54,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2c6f,
-	0x2c71, 0x2c7d,
-	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,
-	0x2de0, 0x2e30,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31b7,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x3243,
-	0x3250, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fc3,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa500, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa673,
-	0xa67c, 0xa697,
-	0xa700, 0xa78c,
-	0xa7fb, 0xa82b,
-	0xa840, 0xa877,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-	0xa900, 0xa953,
-	0xa95f, 0xa95f,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa5f,
-	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,
-	0xfdd0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe26,
-	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, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018a,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	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,
-	0x10900, 0x10919,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d1dd,
-	0x1d200, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1fffe, 0x2a6d6,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_5_1 */
-
-/* 'Age_5_2': Derived Age 5.2 */
-static const OnigCodePoint CR_Age_5_2[] = {
-	495,
-	0x0000, 0x0377,
-	0x037a, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x0525,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x0603,
-	0x0606, 0x061b,
-	0x061e, 0x061f,
-	0x0621, 0x065e,
-	0x0660, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-	0x0900, 0x0939,
-	0x093c, 0x094e,
-	0x0950, 0x0955,
-	0x0958, 0x0972,
-	0x0979, 0x097f,
-	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, 0x09fb,
-	0x0a01, 0x0a03,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bfa,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-	0x0c82, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
-	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, 0x0f6c,
-	0x0f71, 0x0f8b,
-	0x0f90, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fd8,
-	0x1000, 0x10c5,
-	0x10d0, 0x10fc,
-	0x1100, 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,
-	0x1400, 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, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a1b,
-	0x1a1e, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1baa,
-	0x1bae, 0x1bb9,
-	0x1c00, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cd0, 0x1cf2,
-	0x1d00, 0x1de6,
-	0x1dfd, 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, 0x2064,
-	0x206a, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x2094,
-	0x20a0, 0x20b8,
-	0x20d0, 0x20f0,
-	0x2100, 0x2189,
-	0x2190, 0x23e8,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x26cd,
-	0x26cf, 0x26e1,
-	0x26e3, 0x26e3,
-	0x26e8, 0x26ff,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27c0, 0x27ca,
-	0x27cc, 0x27cc,
-	0x27d0, 0x2b4c,
-	0x2b50, 0x2b59,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf1,
-	0x2cf9, 0x2d25,
-	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2e31,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31b7,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa673,
-	0xa67c, 0xa697,
-	0xa6a0, 0xa6f7,
-	0xa700, 0xa78c,
-	0xa7fb, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-	0xa8e0, 0xa8fb,
-	0xa900, 0xa953,
-	0xa95f, 0xa97c,
-	0xa980, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9df,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa7b,
-	0xaa80, 0xaac2,
-	0xaadb, 0xaadf,
-	0xabc0, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xd800, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe26,
-	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, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018a,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	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, 0x10855,
-	0x10857, 0x1085f,
-	0x10900, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a7f,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b7f,
-	0x10c00, 0x10c48,
-	0x10e60, 0x10e7e,
-	0x11080, 0x110c1,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-	0x13000, 0x1342e,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d1dd,
-	0x1d200, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f100, 0x1f10a,
-	0x1f110, 0x1f12e,
-	0x1f131, 0x1f131,
-	0x1f13d, 0x1f13d,
-	0x1f13f, 0x1f13f,
-	0x1f142, 0x1f142,
-	0x1f146, 0x1f146,
-	0x1f14a, 0x1f14e,
-	0x1f157, 0x1f157,
-	0x1f15f, 0x1f15f,
-	0x1f179, 0x1f179,
-	0x1f17b, 0x1f17c,
-	0x1f17f, 0x1f17f,
-	0x1f18a, 0x1f18d,
-	0x1f190, 0x1f190,
-	0x1f200, 0x1f200,
-	0x1f210, 0x1f231,
-	0x1f240, 0x1f248,
-	0x1fffe, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_5_2 */
-
-/* 'Age_6_0': Derived Age 6.0 */
-static const OnigCodePoint CR_Age_6_0[] = {
-	511,
-	0x0000, 0x0377,
-	0x037a, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x0527,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x0603,
-	0x0606, 0x061b,
-	0x061e, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-	0x0840, 0x085b,
-	0x085e, 0x085e,
-	0x0900, 0x0977,
-	0x0979, 0x097f,
-	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, 0x09fb,
-	0x0a01, 0x0a03,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	0x0b66, 0x0b77,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bfa,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-	0x0c82, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
-	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, 0x0f6c,
-	0x0f71, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fda,
-	0x1000, 0x10c5,
-	0x10d0, 0x10fc,
-	0x1100, 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,
-	0x135d, 0x137c,
-	0x1380, 0x1399,
-	0x13a0, 0x13f4,
-	0x1400, 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, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a1b,
-	0x1a1e, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1baa,
-	0x1bae, 0x1bb9,
-	0x1bc0, 0x1bf3,
-	0x1bfc, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cd0, 0x1cf2,
-	0x1d00, 0x1de6,
-	0x1dfc, 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, 0x2064,
-	0x206a, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x209c,
-	0x20a0, 0x20b9,
-	0x20d0, 0x20f0,
-	0x2100, 0x2189,
-	0x2190, 0x23f3,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x26ff,
-	0x2701, 0x27ca,
-	0x27cc, 0x27cc,
-	0x27ce, 0x2b4c,
-	0x2b50, 0x2b59,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf1,
-	0x2cf9, 0x2d25,
-	0x2d30, 0x2d65,
-	0x2d6f, 0x2d70,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2e31,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa673,
-	0xa67c, 0xa697,
-	0xa6a0, 0xa6f7,
-	0xa700, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-	0xa8e0, 0xa8fb,
-	0xa900, 0xa953,
-	0xa95f, 0xa97c,
-	0xa980, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9df,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa7b,
-	0xaa80, 0xaac2,
-	0xaadb, 0xaadf,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xd800, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbc1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe26,
-	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, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018a,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	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, 0x10855,
-	0x10857, 0x1085f,
-	0x10900, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a7f,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b7f,
-	0x10c00, 0x10c48,
-	0x10e60, 0x10e7e,
-	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-	0x11080, 0x110c1,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x1b000, 0x1b001,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d1dd,
-	0x1d200, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	0x1f100, 0x1f10a,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f169,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f320,
-	0x1f330, 0x1f335,
-	0x1f337, 0x1f37c,
-	0x1f380, 0x1f393,
-	0x1f3a0, 0x1f3c4,
-	0x1f3c6, 0x1f3ca,
-	0x1f3e0, 0x1f3f0,
-	0x1f400, 0x1f43e,
-	0x1f440, 0x1f440,
-	0x1f442, 0x1f4f7,
-	0x1f4f9, 0x1f4fc,
-	0x1f500, 0x1f53d,
-	0x1f550, 0x1f567,
-	0x1f5fb, 0x1f5ff,
-	0x1f601, 0x1f610,
-	0x1f612, 0x1f614,
-	0x1f616, 0x1f616,
-	0x1f618, 0x1f618,
-	0x1f61a, 0x1f61a,
-	0x1f61c, 0x1f61e,
-	0x1f620, 0x1f625,
-	0x1f628, 0x1f62b,
-	0x1f62d, 0x1f62d,
-	0x1f630, 0x1f633,
-	0x1f635, 0x1f640,
-	0x1f645, 0x1f64f,
-	0x1f680, 0x1f6c5,
-	0x1f700, 0x1f773,
-	0x1fffe, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_6_0 */
-
-/* 'Age_6_1': Derived Age 6.1 */
-static const OnigCodePoint CR_Age_6_1[] = {
-	549,
-	0x0000, 0x0377,
-	0x037a, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x0527,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x058f, 0x058f,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x0604,
-	0x0606, 0x061b,
-	0x061e, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-	0x0840, 0x085b,
-	0x085e, 0x085e,
-	0x08a0, 0x08a0,
-	0x08a2, 0x08ac,
-	0x08e4, 0x08fe,
-	0x0900, 0x0977,
-	0x0979, 0x097f,
-	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, 0x09fb,
-	0x0a01, 0x0a03,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0af1,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3c, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	0x0b66, 0x0b77,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bfa,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-	0x0c82, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
-	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, 0x0edf,
-	0x0f00, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fda,
-	0x1000, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 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,
-	0x135d, 0x137c,
-	0x1380, 0x1399,
-	0x13a0, 0x13f4,
-	0x1400, 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, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a1b,
-	0x1a1e, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1bf3,
-	0x1bfc, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cc0, 0x1cc7,
-	0x1cd0, 0x1cf6,
-	0x1d00, 0x1de6,
-	0x1dfc, 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, 0x2064,
-	0x206a, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x209c,
-	0x20a0, 0x20b9,
-	0x20d0, 0x20f0,
-	0x2100, 0x2189,
-	0x2190, 0x23f3,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x26ff,
-	0x2701, 0x2b4c,
-	0x2b50, 0x2b59,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf3,
-	0x2cf9, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d70,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2e3b,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa697,
-	0xa69f, 0xa6f7,
-	0xa700, 0xa78e,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xa7f8, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-	0xa8e0, 0xa8fb,
-	0xa900, 0xa953,
-	0xa95f, 0xa97c,
-	0xa980, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9df,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa7b,
-	0xaa80, 0xaac2,
-	0xaadb, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xd800, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbc1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe26,
-	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, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018a,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	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, 0x10855,
-	0x10857, 0x1085f,
-	0x10900, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a7f,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b7f,
-	0x10c00, 0x10c48,
-	0x10e60, 0x10e7e,
-	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-	0x11080, 0x110c1,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x11143,
-	0x11180, 0x111c8,
-	0x111d0, 0x111d9,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d1dd,
-	0x1d200, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	0x1f100, 0x1f10a,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f320,
-	0x1f330, 0x1f335,
-	0x1f337, 0x1f37c,
-	0x1f380, 0x1f393,
-	0x1f3a0, 0x1f3c4,
-	0x1f3c6, 0x1f3ca,
-	0x1f3e0, 0x1f3f0,
-	0x1f400, 0x1f43e,
-	0x1f440, 0x1f440,
-	0x1f442, 0x1f4f7,
-	0x1f4f9, 0x1f4fc,
-	0x1f500, 0x1f53d,
-	0x1f540, 0x1f543,
-	0x1f550, 0x1f567,
-	0x1f5fb, 0x1f640,
-	0x1f645, 0x1f64f,
-	0x1f680, 0x1f6c5,
-	0x1f700, 0x1f773,
-	0x1fffe, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_6_1 */
-
-/* 'Age_6_2': Derived Age 6.2 */
-static const OnigCodePoint CR_Age_6_2[] = {
-	549,
-	0x0000, 0x0377,
-	0x037a, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x0527,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x058f, 0x058f,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x0604,
-	0x0606, 0x061b,
-	0x061e, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-	0x0840, 0x085b,
-	0x085e, 0x085e,
-	0x08a0, 0x08a0,
-	0x08a2, 0x08ac,
-	0x08e4, 0x08fe,
-	0x0900, 0x0977,
-	0x0979, 0x097f,
-	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, 0x09fb,
-	0x0a01, 0x0a03,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0af1,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3c, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	0x0b66, 0x0b77,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bfa,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-	0x0c82, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
-	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, 0x0edf,
-	0x0f00, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fda,
-	0x1000, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 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,
-	0x135d, 0x137c,
-	0x1380, 0x1399,
-	0x13a0, 0x13f4,
-	0x1400, 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, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a1b,
-	0x1a1e, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1bf3,
-	0x1bfc, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cc0, 0x1cc7,
-	0x1cd0, 0x1cf6,
-	0x1d00, 0x1de6,
-	0x1dfc, 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, 0x2064,
-	0x206a, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x209c,
-	0x20a0, 0x20ba,
-	0x20d0, 0x20f0,
-	0x2100, 0x2189,
-	0x2190, 0x23f3,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x26ff,
-	0x2701, 0x2b4c,
-	0x2b50, 0x2b59,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf3,
-	0x2cf9, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d70,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2e3b,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa697,
-	0xa69f, 0xa6f7,
-	0xa700, 0xa78e,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xa7f8, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-	0xa8e0, 0xa8fb,
-	0xa900, 0xa953,
-	0xa95f, 0xa97c,
-	0xa980, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9df,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa7b,
-	0xaa80, 0xaac2,
-	0xaadb, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xd800, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbc1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe26,
-	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, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018a,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	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, 0x10855,
-	0x10857, 0x1085f,
-	0x10900, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a7f,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b7f,
-	0x10c00, 0x10c48,
-	0x10e60, 0x10e7e,
-	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-	0x11080, 0x110c1,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x11143,
-	0x11180, 0x111c8,
-	0x111d0, 0x111d9,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d1dd,
-	0x1d200, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	0x1f100, 0x1f10a,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f320,
-	0x1f330, 0x1f335,
-	0x1f337, 0x1f37c,
-	0x1f380, 0x1f393,
-	0x1f3a0, 0x1f3c4,
-	0x1f3c6, 0x1f3ca,
-	0x1f3e0, 0x1f3f0,
-	0x1f400, 0x1f43e,
-	0x1f440, 0x1f440,
-	0x1f442, 0x1f4f7,
-	0x1f4f9, 0x1f4fc,
-	0x1f500, 0x1f53d,
-	0x1f540, 0x1f543,
-	0x1f550, 0x1f567,
-	0x1f5fb, 0x1f640,
-	0x1f645, 0x1f64f,
-	0x1f680, 0x1f6c5,
-	0x1f700, 0x1f773,
-	0x1fffe, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_6_2 */
-
-/* 'Age_6_3': Derived Age 6.3 */
-static const OnigCodePoint CR_Age_6_3[] = {
-	549,
-	0x0000, 0x0377,
-	0x037a, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x0527,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x058f, 0x058f,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x0604,
-	0x0606, 0x061c,
-	0x061e, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-	0x0840, 0x085b,
-	0x085e, 0x085e,
-	0x08a0, 0x08a0,
-	0x08a2, 0x08ac,
-	0x08e4, 0x08fe,
-	0x0900, 0x0977,
-	0x0979, 0x097f,
-	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, 0x09fb,
-	0x0a01, 0x0a03,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0af1,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3c, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	0x0b66, 0x0b77,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bfa,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-	0x0c82, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
-	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, 0x0edf,
-	0x0f00, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fda,
-	0x1000, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 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,
-	0x135d, 0x137c,
-	0x1380, 0x1399,
-	0x13a0, 0x13f4,
-	0x1400, 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, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a1b,
-	0x1a1e, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1bf3,
-	0x1bfc, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cc0, 0x1cc7,
-	0x1cd0, 0x1cf6,
-	0x1d00, 0x1de6,
-	0x1dfc, 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, 0x2064,
-	0x2066, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x209c,
-	0x20a0, 0x20ba,
-	0x20d0, 0x20f0,
-	0x2100, 0x2189,
-	0x2190, 0x23f3,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x26ff,
-	0x2701, 0x2b4c,
-	0x2b50, 0x2b59,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf3,
-	0x2cf9, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d70,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2e3b,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa697,
-	0xa69f, 0xa6f7,
-	0xa700, 0xa78e,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xa7f8, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-	0xa8e0, 0xa8fb,
-	0xa900, 0xa953,
-	0xa95f, 0xa97c,
-	0xa980, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9df,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa7b,
-	0xaa80, 0xaac2,
-	0xaadb, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xd800, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbc1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe26,
-	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, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018a,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	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, 0x10855,
-	0x10857, 0x1085f,
-	0x10900, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a7f,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b7f,
-	0x10c00, 0x10c48,
-	0x10e60, 0x10e7e,
-	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-	0x11080, 0x110c1,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x11143,
-	0x11180, 0x111c8,
-	0x111d0, 0x111d9,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d1dd,
-	0x1d200, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	0x1f100, 0x1f10a,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f320,
-	0x1f330, 0x1f335,
-	0x1f337, 0x1f37c,
-	0x1f380, 0x1f393,
-	0x1f3a0, 0x1f3c4,
-	0x1f3c6, 0x1f3ca,
-	0x1f3e0, 0x1f3f0,
-	0x1f400, 0x1f43e,
-	0x1f440, 0x1f440,
-	0x1f442, 0x1f4f7,
-	0x1f4f9, 0x1f4fc,
-	0x1f500, 0x1f53d,
-	0x1f540, 0x1f543,
-	0x1f550, 0x1f567,
-	0x1f5fb, 0x1f640,
-	0x1f645, 0x1f64f,
-	0x1f680, 0x1f6c5,
-	0x1f700, 0x1f773,
-	0x1fffe, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_6_3 */
-
-/* 'Age_7_0': Derived Age 7.0 */
-static const OnigCodePoint CR_Age_7_0[] = {
-	610,
-	0x0000, 0x0377,
-	0x037a, 0x037f,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x052f,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x058d, 0x058f,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x061c,
-	0x061e, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-	0x0840, 0x085b,
-	0x085e, 0x085e,
-	0x08a0, 0x08b2,
-	0x08e4, 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, 0x09fb,
-	0x0a01, 0x0a03,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0af1,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3c, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	0x0b66, 0x0b77,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bfa,
-	0x0c00, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-	0x0c81, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d01, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
-	0x0d82, 0x0d83,
-	0x0d85, 0x0d96,
-	0x0d9a, 0x0db1,
-	0x0db3, 0x0dbb,
-	0x0dbd, 0x0dbd,
-	0x0dc0, 0x0dc6,
-	0x0dca, 0x0dca,
-	0x0dcf, 0x0dd4,
-	0x0dd6, 0x0dd6,
-	0x0dd8, 0x0ddf,
-	0x0de6, 0x0def,
-	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, 0x0edf,
-	0x0f00, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fda,
-	0x1000, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 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,
-	0x135d, 0x137c,
-	0x1380, 0x1399,
-	0x13a0, 0x13f4,
-	0x1400, 0x169c,
-	0x16a0, 0x16f8,
-	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, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191e,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a1b,
-	0x1a1e, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-	0x1ab0, 0x1abe,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1bf3,
-	0x1bfc, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cc0, 0x1cc7,
-	0x1cd0, 0x1cf6,
-	0x1cf8, 0x1cf9,
-	0x1d00, 0x1df5,
-	0x1dfc, 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, 0x2064,
-	0x2066, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x209c,
-	0x20a0, 0x20bd,
-	0x20d0, 0x20f0,
-	0x2100, 0x2189,
-	0x2190, 0x23fa,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x2b73,
-	0x2b76, 0x2b95,
-	0x2b98, 0x2bb9,
-	0x2bbd, 0x2bc8,
-	0x2bca, 0x2bd1,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf3,
-	0x2cf9, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d70,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2e42,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa69d,
-	0xa69f, 0xa6f7,
-	0xa700, 0xa78e,
-	0xa790, 0xa7ad,
-	0xa7b0, 0xa7b1,
-	0xa7f7, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-	0xa8e0, 0xa8fb,
-	0xa900, 0xa953,
-	0xa95f, 0xa97c,
-	0xa980, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9fe,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaac2,
-	0xaadb, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xab30, 0xab5f,
-	0xab64, 0xab65,
-	0xabc0, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xd800, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbc1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe2d,
-	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, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018c,
-	0x10190, 0x1019b,
-	0x101a0, 0x101a0,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x102e0, 0x102fb,
-	0x10300, 0x10323,
-	0x10330, 0x1034a,
-	0x10350, 0x1037a,
-	0x10380, 0x1039d,
-	0x1039f, 0x103c3,
-	0x103c8, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x1056f, 0x1056f,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10857, 0x1089e,
-	0x108a7, 0x108af,
-	0x10900, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a9f,
-	0x10ac0, 0x10ae6,
-	0x10aeb, 0x10af6,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b91,
-	0x10b99, 0x10b9c,
-	0x10ba9, 0x10baf,
-	0x10c00, 0x10c48,
-	0x10e60, 0x10e7e,
-	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-	0x1107f, 0x110c1,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x11143,
-	0x11150, 0x11176,
-	0x11180, 0x111c8,
-	0x111cd, 0x111cd,
-	0x111d0, 0x111da,
-	0x111e1, 0x111f4,
-	0x11200, 0x11211,
-	0x11213, 0x1123d,
-	0x112b0, 0x112ea,
-	0x112f0, 0x112f9,
-	0x11301, 0x11303,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133c, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134d,
-	0x11357, 0x11357,
-	0x1135d, 0x11363,
-	0x11366, 0x1136c,
-	0x11370, 0x11374,
-	0x11480, 0x114c7,
-	0x114d0, 0x114d9,
-	0x11580, 0x115b5,
-	0x115b8, 0x115c9,
-	0x11600, 0x11644,
-	0x11650, 0x11659,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x118a0, 0x118f2,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x12000, 0x12398,
-	0x12400, 0x1246e,
-	0x12470, 0x12474,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16a60, 0x16a69,
-	0x16a6e, 0x16a6f,
-	0x16ad0, 0x16aed,
-	0x16af0, 0x16af5,
-	0x16b00, 0x16b45,
-	0x16b50, 0x16b59,
-	0x16b5b, 0x16b61,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	0x1bc9c, 0x1bca3,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d1dd,
-	0x1d200, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1e800, 0x1e8c4,
-	0x1e8c7, 0x1e8d6,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0bf,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0f5,
-	0x1f100, 0x1f10c,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f32c,
-	0x1f330, 0x1f37d,
-	0x1f380, 0x1f3ce,
-	0x1f3d4, 0x1f3f7,
-	0x1f400, 0x1f4fe,
-	0x1f500, 0x1f54a,
-	0x1f550, 0x1f579,
-	0x1f57b, 0x1f5a3,
-	0x1f5a5, 0x1f642,
-	0x1f645, 0x1f6cf,
-	0x1f6e0, 0x1f6ec,
-	0x1f6f0, 0x1f6f3,
-	0x1f700, 0x1f773,
-	0x1f780, 0x1f7d4,
-	0x1f800, 0x1f80b,
-	0x1f810, 0x1f847,
-	0x1f850, 0x1f859,
-	0x1f860, 0x1f887,
-	0x1f890, 0x1f8ad,
-	0x1fffe, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_7_0 */
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-
-/* 'In_Basic_Latin': Block */
-#define CR_In_Basic_Latin CR_ASCII
-
-/* 'In_Latin_1_Supplement': Block */
-static const OnigCodePoint CR_In_Latin_1_Supplement[] = {
-	1,
-	0x0080, 0x00ff,
-}; /* CR_In_Latin_1_Supplement */
-
-/* 'In_Latin_Extended_A': Block */
-static const OnigCodePoint CR_In_Latin_Extended_A[] = {
-	1,
-	0x0100, 0x017f,
-}; /* CR_In_Latin_Extended_A */
-
-/* 'In_Latin_Extended_B': Block */
-static const OnigCodePoint CR_In_Latin_Extended_B[] = {
-	1,
-	0x0180, 0x024f,
-}; /* CR_In_Latin_Extended_B */
-
-/* 'In_IPA_Extensions': Block */
-static const OnigCodePoint CR_In_IPA_Extensions[] = {
-	1,
-	0x0250, 0x02af,
-}; /* CR_In_IPA_Extensions */
-
-/* 'In_Spacing_Modifier_Letters': Block */
-static const OnigCodePoint CR_In_Spacing_Modifier_Letters[] = {
-	1,
-	0x02b0, 0x02ff,
-}; /* CR_In_Spacing_Modifier_Letters */
-
-/* 'In_Combining_Diacritical_Marks': Block */
-static const OnigCodePoint CR_In_Combining_Diacritical_Marks[] = {
-	1,
-	0x0300, 0x036f,
-}; /* CR_In_Combining_Diacritical_Marks */
-
-/* 'In_Greek_and_Coptic': Block */
-static const OnigCodePoint CR_In_Greek_and_Coptic[] = {
-	1,
-	0x0370, 0x03ff,
-}; /* CR_In_Greek_and_Coptic */
-
-/* 'In_Cyrillic': Block */
-static const OnigCodePoint CR_In_Cyrillic[] = {
-	1,
-	0x0400, 0x04ff,
-}; /* CR_In_Cyrillic */
-
-/* 'In_Cyrillic_Supplement': Block */
-static const OnigCodePoint CR_In_Cyrillic_Supplement[] = {
-	1,
-	0x0500, 0x052f,
-}; /* CR_In_Cyrillic_Supplement */
-
-/* 'In_Armenian': Block */
-static const OnigCodePoint CR_In_Armenian[] = {
-	1,
-	0x0530, 0x058f,
-}; /* CR_In_Armenian */
-
-/* 'In_Hebrew': Block */
-static const OnigCodePoint CR_In_Hebrew[] = {
-	1,
-	0x0590, 0x05ff,
-}; /* CR_In_Hebrew */
-
-/* 'In_Arabic': Block */
-static const OnigCodePoint CR_In_Arabic[] = {
-	1,
-	0x0600, 0x06ff,
-}; /* CR_In_Arabic */
-
-/* 'In_Syriac': Block */
-static const OnigCodePoint CR_In_Syriac[] = {
-	1,
-	0x0700, 0x074f,
-}; /* CR_In_Syriac */
-
-/* 'In_Arabic_Supplement': Block */
-static const OnigCodePoint CR_In_Arabic_Supplement[] = {
-	1,
-	0x0750, 0x077f,
-}; /* CR_In_Arabic_Supplement */
-
-/* 'In_Thaana': Block */
-static const OnigCodePoint CR_In_Thaana[] = {
-	1,
-	0x0780, 0x07bf,
-}; /* CR_In_Thaana */
-
-/* 'In_NKo': Block */
-static const OnigCodePoint CR_In_NKo[] = {
-	1,
-	0x07c0, 0x07ff,
-}; /* CR_In_NKo */
-
-/* 'In_Samaritan': Block */
-static const OnigCodePoint CR_In_Samaritan[] = {
-	1,
-	0x0800, 0x083f,
-}; /* CR_In_Samaritan */
-
-/* 'In_Mandaic': Block */
-static const OnigCodePoint CR_In_Mandaic[] = {
-	1,
-	0x0840, 0x085f,
-}; /* CR_In_Mandaic */
-
-/* 'In_Arabic_Extended_A': Block */
-static const OnigCodePoint CR_In_Arabic_Extended_A[] = {
-	1,
-	0x08a0, 0x08ff,
-}; /* CR_In_Arabic_Extended_A */
-
-/* 'In_Devanagari': Block */
-static const OnigCodePoint CR_In_Devanagari[] = {
-	1,
-	0x0900, 0x097f,
-}; /* CR_In_Devanagari */
-
-/* 'In_Bengali': Block */
-static const OnigCodePoint CR_In_Bengali[] = {
-	1,
-	0x0980, 0x09ff,
-}; /* CR_In_Bengali */
-
-/* 'In_Gurmukhi': Block */
-static const OnigCodePoint CR_In_Gurmukhi[] = {
-	1,
-	0x0a00, 0x0a7f,
-}; /* CR_In_Gurmukhi */
-
-/* 'In_Gujarati': Block */
-static const OnigCodePoint CR_In_Gujarati[] = {
-	1,
-	0x0a80, 0x0aff,
-}; /* CR_In_Gujarati */
-
-/* 'In_Oriya': Block */
-static const OnigCodePoint CR_In_Oriya[] = {
-	1,
-	0x0b00, 0x0b7f,
-}; /* CR_In_Oriya */
-
-/* 'In_Tamil': Block */
-static const OnigCodePoint CR_In_Tamil[] = {
-	1,
-	0x0b80, 0x0bff,
-}; /* CR_In_Tamil */
-
-/* 'In_Telugu': Block */
-static const OnigCodePoint CR_In_Telugu[] = {
-	1,
-	0x0c00, 0x0c7f,
-}; /* CR_In_Telugu */
-
-/* 'In_Kannada': Block */
-static const OnigCodePoint CR_In_Kannada[] = {
-	1,
-	0x0c80, 0x0cff,
-}; /* CR_In_Kannada */
-
-/* 'In_Malayalam': Block */
-static const OnigCodePoint CR_In_Malayalam[] = {
-	1,
-	0x0d00, 0x0d7f,
-}; /* CR_In_Malayalam */
-
-/* 'In_Sinhala': Block */
-static const OnigCodePoint CR_In_Sinhala[] = {
-	1,
-	0x0d80, 0x0dff,
-}; /* CR_In_Sinhala */
-
-/* 'In_Thai': Block */
-static const OnigCodePoint CR_In_Thai[] = {
-	1,
-	0x0e00, 0x0e7f,
-}; /* CR_In_Thai */
-
-/* 'In_Lao': Block */
-static const OnigCodePoint CR_In_Lao[] = {
-	1,
-	0x0e80, 0x0eff,
-}; /* CR_In_Lao */
-
-/* 'In_Tibetan': Block */
-static const OnigCodePoint CR_In_Tibetan[] = {
-	1,
-	0x0f00, 0x0fff,
-}; /* CR_In_Tibetan */
-
-/* 'In_Myanmar': Block */
-static const OnigCodePoint CR_In_Myanmar[] = {
-	1,
-	0x1000, 0x109f,
-}; /* CR_In_Myanmar */
-
-/* 'In_Georgian': Block */
-static const OnigCodePoint CR_In_Georgian[] = {
-	1,
-	0x10a0, 0x10ff,
-}; /* CR_In_Georgian */
-
-/* 'In_Hangul_Jamo': Block */
-static const OnigCodePoint CR_In_Hangul_Jamo[] = {
-	1,
-	0x1100, 0x11ff,
-}; /* CR_In_Hangul_Jamo */
-
-/* 'In_Ethiopic': Block */
-static const OnigCodePoint CR_In_Ethiopic[] = {
-	1,
-	0x1200, 0x137f,
-}; /* CR_In_Ethiopic */
-
-/* 'In_Ethiopic_Supplement': Block */
-static const OnigCodePoint CR_In_Ethiopic_Supplement[] = {
-	1,
-	0x1380, 0x139f,
-}; /* CR_In_Ethiopic_Supplement */
-
-/* 'In_Cherokee': Block */
-static const OnigCodePoint CR_In_Cherokee[] = {
-	1,
-	0x13a0, 0x13ff,
-}; /* CR_In_Cherokee */
-
-/* 'In_Unified_Canadian_Aboriginal_Syllabics': Block */
-static const OnigCodePoint CR_In_Unified_Canadian_Aboriginal_Syllabics[] = {
-	1,
-	0x1400, 0x167f,
-}; /* CR_In_Unified_Canadian_Aboriginal_Syllabics */
-
-/* 'In_Ogham': Block */
-static const OnigCodePoint CR_In_Ogham[] = {
-	1,
-	0x1680, 0x169f,
-}; /* CR_In_Ogham */
-
-/* 'In_Runic': Block */
-static const OnigCodePoint CR_In_Runic[] = {
-	1,
-	0x16a0, 0x16ff,
-}; /* CR_In_Runic */
-
-/* 'In_Tagalog': Block */
-static const OnigCodePoint CR_In_Tagalog[] = {
-	1,
-	0x1700, 0x171f,
-}; /* CR_In_Tagalog */
-
-/* 'In_Hanunoo': Block */
-static const OnigCodePoint CR_In_Hanunoo[] = {
-	1,
-	0x1720, 0x173f,
-}; /* CR_In_Hanunoo */
-
-/* 'In_Buhid': Block */
-static const OnigCodePoint CR_In_Buhid[] = {
-	1,
-	0x1740, 0x175f,
-}; /* CR_In_Buhid */
-
-/* 'In_Tagbanwa': Block */
-static const OnigCodePoint CR_In_Tagbanwa[] = {
-	1,
-	0x1760, 0x177f,
-}; /* CR_In_Tagbanwa */
-
-/* 'In_Khmer': Block */
-static const OnigCodePoint CR_In_Khmer[] = {
-	1,
-	0x1780, 0x17ff,
-}; /* CR_In_Khmer */
-
-/* 'In_Mongolian': Block */
-static const OnigCodePoint CR_In_Mongolian[] = {
-	1,
-	0x1800, 0x18af,
-}; /* CR_In_Mongolian */
-
-/* 'In_Unified_Canadian_Aboriginal_Syllabics_Extended': Block */
-static const OnigCodePoint CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended[] = {
-	1,
-	0x18b0, 0x18ff,
-}; /* CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended */
-
-/* 'In_Limbu': Block */
-static const OnigCodePoint CR_In_Limbu[] = {
-	1,
-	0x1900, 0x194f,
-}; /* CR_In_Limbu */
-
-/* 'In_Tai_Le': Block */
-static const OnigCodePoint CR_In_Tai_Le[] = {
-	1,
-	0x1950, 0x197f,
-}; /* CR_In_Tai_Le */
-
-/* 'In_New_Tai_Lue': Block */
-static const OnigCodePoint CR_In_New_Tai_Lue[] = {
-	1,
-	0x1980, 0x19df,
-}; /* CR_In_New_Tai_Lue */
-
-/* 'In_Khmer_Symbols': Block */
-static const OnigCodePoint CR_In_Khmer_Symbols[] = {
-	1,
-	0x19e0, 0x19ff,
-}; /* CR_In_Khmer_Symbols */
-
-/* 'In_Buginese': Block */
-static const OnigCodePoint CR_In_Buginese[] = {
-	1,
-	0x1a00, 0x1a1f,
-}; /* CR_In_Buginese */
-
-/* 'In_Tai_Tham': Block */
-static const OnigCodePoint CR_In_Tai_Tham[] = {
-	1,
-	0x1a20, 0x1aaf,
-}; /* CR_In_Tai_Tham */
-
-/* 'In_Combining_Diacritical_Marks_Extended': Block */
-static const OnigCodePoint CR_In_Combining_Diacritical_Marks_Extended[] = {
-	1,
-	0x1ab0, 0x1aff,
-}; /* CR_In_Combining_Diacritical_Marks_Extended */
-
-/* 'In_Balinese': Block */
-static const OnigCodePoint CR_In_Balinese[] = {
-	1,
-	0x1b00, 0x1b7f,
-}; /* CR_In_Balinese */
-
-/* 'In_Sundanese': Block */
-static const OnigCodePoint CR_In_Sundanese[] = {
-	1,
-	0x1b80, 0x1bbf,
-}; /* CR_In_Sundanese */
-
-/* 'In_Batak': Block */
-static const OnigCodePoint CR_In_Batak[] = {
-	1,
-	0x1bc0, 0x1bff,
-}; /* CR_In_Batak */
-
-/* 'In_Lepcha': Block */
-static const OnigCodePoint CR_In_Lepcha[] = {
-	1,
-	0x1c00, 0x1c4f,
-}; /* CR_In_Lepcha */
-
-/* 'In_Ol_Chiki': Block */
-#define CR_In_Ol_Chiki CR_Ol_Chiki
-
-/* 'In_Sundanese_Supplement': Block */
-static const OnigCodePoint CR_In_Sundanese_Supplement[] = {
-	1,
-	0x1cc0, 0x1ccf,
-}; /* CR_In_Sundanese_Supplement */
-
-/* 'In_Vedic_Extensions': Block */
-static const OnigCodePoint CR_In_Vedic_Extensions[] = {
-	1,
-	0x1cd0, 0x1cff,
-}; /* CR_In_Vedic_Extensions */
-
-/* 'In_Phonetic_Extensions': Block */
-static const OnigCodePoint CR_In_Phonetic_Extensions[] = {
-	1,
-	0x1d00, 0x1d7f,
-}; /* CR_In_Phonetic_Extensions */
-
-/* 'In_Phonetic_Extensions_Supplement': Block */
-static const OnigCodePoint CR_In_Phonetic_Extensions_Supplement[] = {
-	1,
-	0x1d80, 0x1dbf,
-}; /* CR_In_Phonetic_Extensions_Supplement */
-
-/* 'In_Combining_Diacritical_Marks_Supplement': Block */
-static const OnigCodePoint CR_In_Combining_Diacritical_Marks_Supplement[] = {
-	1,
-	0x1dc0, 0x1dff,
-}; /* CR_In_Combining_Diacritical_Marks_Supplement */
-
-/* 'In_Latin_Extended_Additional': Block */
-static const OnigCodePoint CR_In_Latin_Extended_Additional[] = {
-	1,
-	0x1e00, 0x1eff,
-}; /* CR_In_Latin_Extended_Additional */
-
-/* 'In_Greek_Extended': Block */
-static const OnigCodePoint CR_In_Greek_Extended[] = {
-	1,
-	0x1f00, 0x1fff,
-}; /* CR_In_Greek_Extended */
-
-/* 'In_General_Punctuation': Block */
-static const OnigCodePoint CR_In_General_Punctuation[] = {
-	1,
-	0x2000, 0x206f,
-}; /* CR_In_General_Punctuation */
-
-/* 'In_Superscripts_and_Subscripts': Block */
-static const OnigCodePoint CR_In_Superscripts_and_Subscripts[] = {
-	1,
-	0x2070, 0x209f,
-}; /* CR_In_Superscripts_and_Subscripts */
-
-/* 'In_Currency_Symbols': Block */
-static const OnigCodePoint CR_In_Currency_Symbols[] = {
-	1,
-	0x20a0, 0x20cf,
-}; /* CR_In_Currency_Symbols */
-
-/* 'In_Combining_Diacritical_Marks_for_Symbols': Block */
-static const OnigCodePoint CR_In_Combining_Diacritical_Marks_for_Symbols[] = {
-	1,
-	0x20d0, 0x20ff,
-}; /* CR_In_Combining_Diacritical_Marks_for_Symbols */
-
-/* 'In_Letterlike_Symbols': Block */
-static const OnigCodePoint CR_In_Letterlike_Symbols[] = {
-	1,
-	0x2100, 0x214f,
-}; /* CR_In_Letterlike_Symbols */
-
-/* 'In_Number_Forms': Block */
-static const OnigCodePoint CR_In_Number_Forms[] = {
-	1,
-	0x2150, 0x218f,
-}; /* CR_In_Number_Forms */
-
-/* 'In_Arrows': Block */
-static const OnigCodePoint CR_In_Arrows[] = {
-	1,
-	0x2190, 0x21ff,
-}; /* CR_In_Arrows */
-
-/* 'In_Mathematical_Operators': Block */
-static const OnigCodePoint CR_In_Mathematical_Operators[] = {
-	1,
-	0x2200, 0x22ff,
-}; /* CR_In_Mathematical_Operators */
-
-/* 'In_Miscellaneous_Technical': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Technical[] = {
-	1,
-	0x2300, 0x23ff,
-}; /* CR_In_Miscellaneous_Technical */
-
-/* 'In_Control_Pictures': Block */
-static const OnigCodePoint CR_In_Control_Pictures[] = {
-	1,
-	0x2400, 0x243f,
-}; /* CR_In_Control_Pictures */
-
-/* 'In_Optical_Character_Recognition': Block */
-static const OnigCodePoint CR_In_Optical_Character_Recognition[] = {
-	1,
-	0x2440, 0x245f,
-}; /* CR_In_Optical_Character_Recognition */
-
-/* 'In_Enclosed_Alphanumerics': Block */
-static const OnigCodePoint CR_In_Enclosed_Alphanumerics[] = {
-	1,
-	0x2460, 0x24ff,
-}; /* CR_In_Enclosed_Alphanumerics */
-
-/* 'In_Box_Drawing': Block */
-static const OnigCodePoint CR_In_Box_Drawing[] = {
-	1,
-	0x2500, 0x257f,
-}; /* CR_In_Box_Drawing */
-
-/* 'In_Block_Elements': Block */
-static const OnigCodePoint CR_In_Block_Elements[] = {
-	1,
-	0x2580, 0x259f,
-}; /* CR_In_Block_Elements */
-
-/* 'In_Geometric_Shapes': Block */
-static const OnigCodePoint CR_In_Geometric_Shapes[] = {
-	1,
-	0x25a0, 0x25ff,
-}; /* CR_In_Geometric_Shapes */
-
-/* 'In_Miscellaneous_Symbols': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Symbols[] = {
-	1,
-	0x2600, 0x26ff,
-}; /* CR_In_Miscellaneous_Symbols */
-
-/* 'In_Dingbats': Block */
-static const OnigCodePoint CR_In_Dingbats[] = {
-	1,
-	0x2700, 0x27bf,
-}; /* CR_In_Dingbats */
-
-/* 'In_Miscellaneous_Mathematical_Symbols_A': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Mathematical_Symbols_A[] = {
-	1,
-	0x27c0, 0x27ef,
-}; /* CR_In_Miscellaneous_Mathematical_Symbols_A */
-
-/* 'In_Supplemental_Arrows_A': Block */
-static const OnigCodePoint CR_In_Supplemental_Arrows_A[] = {
-	1,
-	0x27f0, 0x27ff,
-}; /* CR_In_Supplemental_Arrows_A */
-
-/* 'In_Braille_Patterns': Block */
-#define CR_In_Braille_Patterns CR_Braille
-
-/* 'In_Supplemental_Arrows_B': Block */
-static const OnigCodePoint CR_In_Supplemental_Arrows_B[] = {
-	1,
-	0x2900, 0x297f,
-}; /* CR_In_Supplemental_Arrows_B */
-
-/* 'In_Miscellaneous_Mathematical_Symbols_B': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Mathematical_Symbols_B[] = {
-	1,
-	0x2980, 0x29ff,
-}; /* CR_In_Miscellaneous_Mathematical_Symbols_B */
-
-/* 'In_Supplemental_Mathematical_Operators': Block */
-static const OnigCodePoint CR_In_Supplemental_Mathematical_Operators[] = {
-	1,
-	0x2a00, 0x2aff,
-}; /* CR_In_Supplemental_Mathematical_Operators */
-
-/* 'In_Miscellaneous_Symbols_and_Arrows': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Symbols_and_Arrows[] = {
-	1,
-	0x2b00, 0x2bff,
-}; /* CR_In_Miscellaneous_Symbols_and_Arrows */
-
-/* 'In_Glagolitic': Block */
-static const OnigCodePoint CR_In_Glagolitic[] = {
-	1,
-	0x2c00, 0x2c5f,
-}; /* CR_In_Glagolitic */
-
-/* 'In_Latin_Extended_C': Block */
-static const OnigCodePoint CR_In_Latin_Extended_C[] = {
-	1,
-	0x2c60, 0x2c7f,
-}; /* CR_In_Latin_Extended_C */
-
-/* 'In_Coptic': Block */
-static const OnigCodePoint CR_In_Coptic[] = {
-	1,
-	0x2c80, 0x2cff,
-}; /* CR_In_Coptic */
-
-/* 'In_Georgian_Supplement': Block */
-static const OnigCodePoint CR_In_Georgian_Supplement[] = {
-	1,
-	0x2d00, 0x2d2f,
-}; /* CR_In_Georgian_Supplement */
-
-/* 'In_Tifinagh': Block */
-static const OnigCodePoint CR_In_Tifinagh[] = {
-	1,
-	0x2d30, 0x2d7f,
-}; /* CR_In_Tifinagh */
-
-/* 'In_Ethiopic_Extended': Block */
-static const OnigCodePoint CR_In_Ethiopic_Extended[] = {
-	1,
-	0x2d80, 0x2ddf,
-}; /* CR_In_Ethiopic_Extended */
-
-/* 'In_Cyrillic_Extended_A': Block */
-static const OnigCodePoint CR_In_Cyrillic_Extended_A[] = {
-	1,
-	0x2de0, 0x2dff,
-}; /* CR_In_Cyrillic_Extended_A */
-
-/* 'In_Supplemental_Punctuation': Block */
-static const OnigCodePoint CR_In_Supplemental_Punctuation[] = {
-	1,
-	0x2e00, 0x2e7f,
-}; /* CR_In_Supplemental_Punctuation */
-
-/* 'In_CJK_Radicals_Supplement': Block */
-static const OnigCodePoint CR_In_CJK_Radicals_Supplement[] = {
-	1,
-	0x2e80, 0x2eff,
-}; /* CR_In_CJK_Radicals_Supplement */
-
-/* 'In_Kangxi_Radicals': Block */
-static const OnigCodePoint CR_In_Kangxi_Radicals[] = {
-	1,
-	0x2f00, 0x2fdf,
-}; /* CR_In_Kangxi_Radicals */
-
-/* 'In_Ideographic_Description_Characters': Block */
-static const OnigCodePoint CR_In_Ideographic_Description_Characters[] = {
-	1,
-	0x2ff0, 0x2fff,
-}; /* CR_In_Ideographic_Description_Characters */
-
-/* 'In_CJK_Symbols_and_Punctuation': Block */
-static const OnigCodePoint CR_In_CJK_Symbols_and_Punctuation[] = {
-	1,
-	0x3000, 0x303f,
-}; /* CR_In_CJK_Symbols_and_Punctuation */
-
-/* 'In_Hiragana': Block */
-static const OnigCodePoint CR_In_Hiragana[] = {
-	1,
-	0x3040, 0x309f,
-}; /* CR_In_Hiragana */
-
-/* 'In_Katakana': Block */
-static const OnigCodePoint CR_In_Katakana[] = {
-	1,
-	0x30a0, 0x30ff,
-}; /* CR_In_Katakana */
-
-/* 'In_Bopomofo': Block */
-static const OnigCodePoint CR_In_Bopomofo[] = {
-	1,
-	0x3100, 0x312f,
-}; /* CR_In_Bopomofo */
-
-/* 'In_Hangul_Compatibility_Jamo': Block */
-static const OnigCodePoint CR_In_Hangul_Compatibility_Jamo[] = {
-	1,
-	0x3130, 0x318f,
-}; /* CR_In_Hangul_Compatibility_Jamo */
-
-/* 'In_Kanbun': Block */
-static const OnigCodePoint CR_In_Kanbun[] = {
-	1,
-	0x3190, 0x319f,
-}; /* CR_In_Kanbun */
-
-/* 'In_Bopomofo_Extended': Block */
-static const OnigCodePoint CR_In_Bopomofo_Extended[] = {
-	1,
-	0x31a0, 0x31bf,
-}; /* CR_In_Bopomofo_Extended */
-
-/* 'In_CJK_Strokes': Block */
-static const OnigCodePoint CR_In_CJK_Strokes[] = {
-	1,
-	0x31c0, 0x31ef,
-}; /* CR_In_CJK_Strokes */
-
-/* 'In_Katakana_Phonetic_Extensions': Block */
-static const OnigCodePoint CR_In_Katakana_Phonetic_Extensions[] = {
-	1,
-	0x31f0, 0x31ff,
-}; /* CR_In_Katakana_Phonetic_Extensions */
-
-/* 'In_Enclosed_CJK_Letters_and_Months': Block */
-static const OnigCodePoint CR_In_Enclosed_CJK_Letters_and_Months[] = {
-	1,
-	0x3200, 0x32ff,
-}; /* CR_In_Enclosed_CJK_Letters_and_Months */
-
-/* 'In_CJK_Compatibility': Block */
-static const OnigCodePoint CR_In_CJK_Compatibility[] = {
-	1,
-	0x3300, 0x33ff,
-}; /* CR_In_CJK_Compatibility */
-
-/* 'In_CJK_Unified_Ideographs_Extension_A': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_A[] = {
-	1,
-	0x3400, 0x4dbf,
-}; /* CR_In_CJK_Unified_Ideographs_Extension_A */
-
-/* 'In_Yijing_Hexagram_Symbols': Block */
-static const OnigCodePoint CR_In_Yijing_Hexagram_Symbols[] = {
-	1,
-	0x4dc0, 0x4dff,
-}; /* CR_In_Yijing_Hexagram_Symbols */
-
-/* 'In_CJK_Unified_Ideographs': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs[] = {
-	1,
-	0x4e00, 0x9fff,
-}; /* CR_In_CJK_Unified_Ideographs */
-
-/* 'In_Yi_Syllables': Block */
-static const OnigCodePoint CR_In_Yi_Syllables[] = {
-	1,
-	0xa000, 0xa48f,
-}; /* CR_In_Yi_Syllables */
-
-/* 'In_Yi_Radicals': Block */
-static const OnigCodePoint CR_In_Yi_Radicals[] = {
-	1,
-	0xa490, 0xa4cf,
-}; /* CR_In_Yi_Radicals */
-
-/* 'In_Lisu': Block */
-#define CR_In_Lisu CR_Lisu
-
-/* 'In_Vai': Block */
-static const OnigCodePoint CR_In_Vai[] = {
-	1,
-	0xa500, 0xa63f,
-}; /* CR_In_Vai */
-
-/* 'In_Cyrillic_Extended_B': Block */
-static const OnigCodePoint CR_In_Cyrillic_Extended_B[] = {
-	1,
-	0xa640, 0xa69f,
-}; /* CR_In_Cyrillic_Extended_B */
-
-/* 'In_Bamum': Block */
-static const OnigCodePoint CR_In_Bamum[] = {
-	1,
-	0xa6a0, 0xa6ff,
-}; /* CR_In_Bamum */
-
-/* 'In_Modifier_Tone_Letters': Block */
-static const OnigCodePoint CR_In_Modifier_Tone_Letters[] = {
-	1,
-	0xa700, 0xa71f,
-}; /* CR_In_Modifier_Tone_Letters */
-
-/* 'In_Latin_Extended_D': Block */
-static const OnigCodePoint CR_In_Latin_Extended_D[] = {
-	1,
-	0xa720, 0xa7ff,
-}; /* CR_In_Latin_Extended_D */
-
-/* 'In_Syloti_Nagri': Block */
-static const OnigCodePoint CR_In_Syloti_Nagri[] = {
-	1,
-	0xa800, 0xa82f,
-}; /* CR_In_Syloti_Nagri */
-
-/* 'In_Common_Indic_Number_Forms': Block */
-static const OnigCodePoint CR_In_Common_Indic_Number_Forms[] = {
-	1,
-	0xa830, 0xa83f,
-}; /* CR_In_Common_Indic_Number_Forms */
-
-/* 'In_Phags_pa': Block */
-static const OnigCodePoint CR_In_Phags_pa[] = {
-	1,
-	0xa840, 0xa87f,
-}; /* CR_In_Phags_pa */
-
-/* 'In_Saurashtra': Block */
-static const OnigCodePoint CR_In_Saurashtra[] = {
-	1,
-	0xa880, 0xa8df,
-}; /* CR_In_Saurashtra */
-
-/* 'In_Devanagari_Extended': Block */
-static const OnigCodePoint CR_In_Devanagari_Extended[] = {
-	1,
-	0xa8e0, 0xa8ff,
-}; /* CR_In_Devanagari_Extended */
-
-/* 'In_Kayah_Li': Block */
-static const OnigCodePoint CR_In_Kayah_Li[] = {
-	1,
-	0xa900, 0xa92f,
-}; /* CR_In_Kayah_Li */
-
-/* 'In_Rejang': Block */
-static const OnigCodePoint CR_In_Rejang[] = {
-	1,
-	0xa930, 0xa95f,
-}; /* CR_In_Rejang */
-
-/* 'In_Hangul_Jamo_Extended_A': Block */
-static const OnigCodePoint CR_In_Hangul_Jamo_Extended_A[] = {
-	1,
-	0xa960, 0xa97f,
-}; /* CR_In_Hangul_Jamo_Extended_A */
-
-/* 'In_Javanese': Block */
-static const OnigCodePoint CR_In_Javanese[] = {
-	1,
-	0xa980, 0xa9df,
-}; /* CR_In_Javanese */
-
-/* 'In_Myanmar_Extended_B': Block */
-static const OnigCodePoint CR_In_Myanmar_Extended_B[] = {
-	1,
-	0xa9e0, 0xa9ff,
-}; /* CR_In_Myanmar_Extended_B */
-
-/* 'In_Cham': Block */
-static const OnigCodePoint CR_In_Cham[] = {
-	1,
-	0xaa00, 0xaa5f,
-}; /* CR_In_Cham */
-
-/* 'In_Myanmar_Extended_A': Block */
-static const OnigCodePoint CR_In_Myanmar_Extended_A[] = {
-	1,
-	0xaa60, 0xaa7f,
-}; /* CR_In_Myanmar_Extended_A */
-
-/* 'In_Tai_Viet': Block */
-static const OnigCodePoint CR_In_Tai_Viet[] = {
-	1,
-	0xaa80, 0xaadf,
-}; /* CR_In_Tai_Viet */
-
-/* 'In_Meetei_Mayek_Extensions': Block */
-static const OnigCodePoint CR_In_Meetei_Mayek_Extensions[] = {
-	1,
-	0xaae0, 0xaaff,
-}; /* CR_In_Meetei_Mayek_Extensions */
-
-/* 'In_Ethiopic_Extended_A': Block */
-static const OnigCodePoint CR_In_Ethiopic_Extended_A[] = {
-	1,
-	0xab00, 0xab2f,
-}; /* CR_In_Ethiopic_Extended_A */
-
-/* 'In_Latin_Extended_E': Block */
-static const OnigCodePoint CR_In_Latin_Extended_E[] = {
-	1,
-	0xab30, 0xab6f,
-}; /* CR_In_Latin_Extended_E */
-
-/* 'In_Meetei_Mayek': Block */
-static const OnigCodePoint CR_In_Meetei_Mayek[] = {
-	1,
-	0xabc0, 0xabff,
-}; /* CR_In_Meetei_Mayek */
-
-/* 'In_Hangul_Syllables': Block */
-static const OnigCodePoint CR_In_Hangul_Syllables[] = {
-	1,
-	0xac00, 0xd7af,
-}; /* CR_In_Hangul_Syllables */
-
-/* 'In_Hangul_Jamo_Extended_B': Block */
-static const OnigCodePoint CR_In_Hangul_Jamo_Extended_B[] = {
-	1,
-	0xd7b0, 0xd7ff,
-}; /* CR_In_Hangul_Jamo_Extended_B */
-
-/* 'In_High_Surrogates': Block */
-static const OnigCodePoint CR_In_High_Surrogates[] = {
-	1,
-	0xd800, 0xdb7f,
-}; /* CR_In_High_Surrogates */
-
-/* 'In_High_Private_Use_Surrogates': Block */
-static const OnigCodePoint CR_In_High_Private_Use_Surrogates[] = {
-	1,
-	0xdb80, 0xdbff,
-}; /* CR_In_High_Private_Use_Surrogates */
-
-/* 'In_Low_Surrogates': Block */
-static const OnigCodePoint CR_In_Low_Surrogates[] = {
-	1,
-	0xdc00, 0xdfff,
-}; /* CR_In_Low_Surrogates */
-
-/* 'In_Private_Use_Area': Block */
-static const OnigCodePoint CR_In_Private_Use_Area[] = {
-	1,
-	0xe000, 0xf8ff,
-}; /* CR_In_Private_Use_Area */
-
-/* 'In_CJK_Compatibility_Ideographs': Block */
-static const OnigCodePoint CR_In_CJK_Compatibility_Ideographs[] = {
-	1,
-	0xf900, 0xfaff,
-}; /* CR_In_CJK_Compatibility_Ideographs */
-
-/* 'In_Alphabetic_Presentation_Forms': Block */
-static const OnigCodePoint CR_In_Alphabetic_Presentation_Forms[] = {
-	1,
-	0xfb00, 0xfb4f,
-}; /* CR_In_Alphabetic_Presentation_Forms */
-
-/* 'In_Arabic_Presentation_Forms_A': Block */
-static const OnigCodePoint CR_In_Arabic_Presentation_Forms_A[] = {
-	1,
-	0xfb50, 0xfdff,
-}; /* CR_In_Arabic_Presentation_Forms_A */
-
-/* 'In_Variation_Selectors': Block */
-static const OnigCodePoint CR_In_Variation_Selectors[] = {
-	1,
-	0xfe00, 0xfe0f,
-}; /* CR_In_Variation_Selectors */
-
-/* 'In_Vertical_Forms': Block */
-static const OnigCodePoint CR_In_Vertical_Forms[] = {
-	1,
-	0xfe10, 0xfe1f,
-}; /* CR_In_Vertical_Forms */
-
-/* 'In_Combining_Half_Marks': Block */
-static const OnigCodePoint CR_In_Combining_Half_Marks[] = {
-	1,
-	0xfe20, 0xfe2f,
-}; /* CR_In_Combining_Half_Marks */
-
-/* 'In_CJK_Compatibility_Forms': Block */
-static const OnigCodePoint CR_In_CJK_Compatibility_Forms[] = {
-	1,
-	0xfe30, 0xfe4f,
-}; /* CR_In_CJK_Compatibility_Forms */
-
-/* 'In_Small_Form_Variants': Block */
-static const OnigCodePoint CR_In_Small_Form_Variants[] = {
-	1,
-	0xfe50, 0xfe6f,
-}; /* CR_In_Small_Form_Variants */
-
-/* 'In_Arabic_Presentation_Forms_B': Block */
-static const OnigCodePoint CR_In_Arabic_Presentation_Forms_B[] = {
-	1,
-	0xfe70, 0xfeff,
-}; /* CR_In_Arabic_Presentation_Forms_B */
-
-/* 'In_Halfwidth_and_Fullwidth_Forms': Block */
-static const OnigCodePoint CR_In_Halfwidth_and_Fullwidth_Forms[] = {
-	1,
-	0xff00, 0xffef,
-}; /* CR_In_Halfwidth_and_Fullwidth_Forms */
-
-/* 'In_Specials': Block */
-static const OnigCodePoint CR_In_Specials[] = {
-	1,
-	0xfff0, 0xffff,
-}; /* CR_In_Specials */
-
-/* 'In_Linear_B_Syllabary': Block */
-static const OnigCodePoint CR_In_Linear_B_Syllabary[] = {
-	1,
-	0x10000, 0x1007f,
-}; /* CR_In_Linear_B_Syllabary */
-
-/* 'In_Linear_B_Ideograms': Block */
-static const OnigCodePoint CR_In_Linear_B_Ideograms[] = {
-	1,
-	0x10080, 0x100ff,
-}; /* CR_In_Linear_B_Ideograms */
-
-/* 'In_Aegean_Numbers': Block */
-static const OnigCodePoint CR_In_Aegean_Numbers[] = {
-	1,
-	0x10100, 0x1013f,
-}; /* CR_In_Aegean_Numbers */
-
-/* 'In_Ancient_Greek_Numbers': Block */
-static const OnigCodePoint CR_In_Ancient_Greek_Numbers[] = {
-	1,
-	0x10140, 0x1018f,
-}; /* CR_In_Ancient_Greek_Numbers */
-
-/* 'In_Ancient_Symbols': Block */
-static const OnigCodePoint CR_In_Ancient_Symbols[] = {
-	1,
-	0x10190, 0x101cf,
-}; /* CR_In_Ancient_Symbols */
-
-/* 'In_Phaistos_Disc': Block */
-static const OnigCodePoint CR_In_Phaistos_Disc[] = {
-	1,
-	0x101d0, 0x101ff,
-}; /* CR_In_Phaistos_Disc */
-
-/* 'In_Lycian': Block */
-static const OnigCodePoint CR_In_Lycian[] = {
-	1,
-	0x10280, 0x1029f,
-}; /* CR_In_Lycian */
-
-/* 'In_Carian': Block */
-static const OnigCodePoint CR_In_Carian[] = {
-	1,
-	0x102a0, 0x102df,
-}; /* CR_In_Carian */
-
-/* 'In_Coptic_Epact_Numbers': Block */
-static const OnigCodePoint CR_In_Coptic_Epact_Numbers[] = {
-	1,
-	0x102e0, 0x102ff,
-}; /* CR_In_Coptic_Epact_Numbers */
-
-/* 'In_Old_Italic': Block */
-static const OnigCodePoint CR_In_Old_Italic[] = {
-	1,
-	0x10300, 0x1032f,
-}; /* CR_In_Old_Italic */
-
-/* 'In_Gothic': Block */
-static const OnigCodePoint CR_In_Gothic[] = {
-	1,
-	0x10330, 0x1034f,
-}; /* CR_In_Gothic */
-
-/* 'In_Old_Permic': Block */
-static const OnigCodePoint CR_In_Old_Permic[] = {
-	1,
-	0x10350, 0x1037f,
-}; /* CR_In_Old_Permic */
-
-/* 'In_Ugaritic': Block */
-static const OnigCodePoint CR_In_Ugaritic[] = {
-	1,
-	0x10380, 0x1039f,
-}; /* CR_In_Ugaritic */
-
-/* 'In_Old_Persian': Block */
-static const OnigCodePoint CR_In_Old_Persian[] = {
-	1,
-	0x103a0, 0x103df,
-}; /* CR_In_Old_Persian */
-
-/* 'In_Deseret': Block */
-#define CR_In_Deseret CR_Deseret
-
-/* 'In_Shavian': Block */
-#define CR_In_Shavian CR_Shavian
-
-/* 'In_Osmanya': Block */
-static const OnigCodePoint CR_In_Osmanya[] = {
-	1,
-	0x10480, 0x104af,
-}; /* CR_In_Osmanya */
-
-/* 'In_Elbasan': Block */
-static const OnigCodePoint CR_In_Elbasan[] = {
-	1,
-	0x10500, 0x1052f,
-}; /* CR_In_Elbasan */
-
-/* 'In_Caucasian_Albanian': Block */
-static const OnigCodePoint CR_In_Caucasian_Albanian[] = {
-	1,
-	0x10530, 0x1056f,
-}; /* CR_In_Caucasian_Albanian */
-
-/* 'In_Linear_A': Block */
-static const OnigCodePoint CR_In_Linear_A[] = {
-	1,
-	0x10600, 0x1077f,
-}; /* CR_In_Linear_A */
-
-/* 'In_Cypriot_Syllabary': Block */
-static const OnigCodePoint CR_In_Cypriot_Syllabary[] = {
-	1,
-	0x10800, 0x1083f,
-}; /* CR_In_Cypriot_Syllabary */
-
-/* 'In_Imperial_Aramaic': Block */
-static const OnigCodePoint CR_In_Imperial_Aramaic[] = {
-	1,
-	0x10840, 0x1085f,
-}; /* CR_In_Imperial_Aramaic */
-
-/* 'In_Palmyrene': Block */
-#define CR_In_Palmyrene CR_Palmyrene
-
-/* 'In_Nabataean': Block */
-static const OnigCodePoint CR_In_Nabataean[] = {
-	1,
-	0x10880, 0x108af,
-}; /* CR_In_Nabataean */
-
-/* 'In_Phoenician': Block */
-static const OnigCodePoint CR_In_Phoenician[] = {
-	1,
-	0x10900, 0x1091f,
-}; /* CR_In_Phoenician */
-
-/* 'In_Lydian': Block */
-static const OnigCodePoint CR_In_Lydian[] = {
-	1,
-	0x10920, 0x1093f,
-}; /* CR_In_Lydian */
-
-/* 'In_Meroitic_Hieroglyphs': Block */
-#define CR_In_Meroitic_Hieroglyphs CR_Meroitic_Hieroglyphs
-
-/* 'In_Meroitic_Cursive': Block */
-static const OnigCodePoint CR_In_Meroitic_Cursive[] = {
-	1,
-	0x109a0, 0x109ff,
-}; /* CR_In_Meroitic_Cursive */
-
-/* 'In_Kharoshthi': Block */
-static const OnigCodePoint CR_In_Kharoshthi[] = {
-	1,
-	0x10a00, 0x10a5f,
-}; /* CR_In_Kharoshthi */
-
-/* 'In_Old_South_Arabian': Block */
-#define CR_In_Old_South_Arabian CR_Old_South_Arabian
-
-/* 'In_Old_North_Arabian': Block */
-#define CR_In_Old_North_Arabian CR_Old_North_Arabian
-
-/* 'In_Manichaean': Block */
-static const OnigCodePoint CR_In_Manichaean[] = {
-	1,
-	0x10ac0, 0x10aff,
-}; /* CR_In_Manichaean */
-
-/* 'In_Avestan': Block */
-static const OnigCodePoint CR_In_Avestan[] = {
-	1,
-	0x10b00, 0x10b3f,
-}; /* CR_In_Avestan */
-
-/* 'In_Inscriptional_Parthian': Block */
-static const OnigCodePoint CR_In_Inscriptional_Parthian[] = {
-	1,
-	0x10b40, 0x10b5f,
-}; /* CR_In_Inscriptional_Parthian */
-
-/* 'In_Inscriptional_Pahlavi': Block */
-static const OnigCodePoint CR_In_Inscriptional_Pahlavi[] = {
-	1,
-	0x10b60, 0x10b7f,
-}; /* CR_In_Inscriptional_Pahlavi */
-
-/* 'In_Psalter_Pahlavi': Block */
-static const OnigCodePoint CR_In_Psalter_Pahlavi[] = {
-	1,
-	0x10b80, 0x10baf,
-}; /* CR_In_Psalter_Pahlavi */
-
-/* 'In_Old_Turkic': Block */
-static const OnigCodePoint CR_In_Old_Turkic[] = {
-	1,
-	0x10c00, 0x10c4f,
-}; /* CR_In_Old_Turkic */
-
-/* 'In_Rumi_Numeral_Symbols': Block */
-static const OnigCodePoint CR_In_Rumi_Numeral_Symbols[] = {
-	1,
-	0x10e60, 0x10e7f,
-}; /* CR_In_Rumi_Numeral_Symbols */
-
-/* 'In_Brahmi': Block */
-static const OnigCodePoint CR_In_Brahmi[] = {
-	1,
-	0x11000, 0x1107f,
-}; /* CR_In_Brahmi */
-
-/* 'In_Kaithi': Block */
-static const OnigCodePoint CR_In_Kaithi[] = {
-	1,
-	0x11080, 0x110cf,
-}; /* CR_In_Kaithi */
-
-/* 'In_Sora_Sompeng': Block */
-static const OnigCodePoint CR_In_Sora_Sompeng[] = {
-	1,
-	0x110d0, 0x110ff,
-}; /* CR_In_Sora_Sompeng */
-
-/* 'In_Chakma': Block */
-static const OnigCodePoint CR_In_Chakma[] = {
-	1,
-	0x11100, 0x1114f,
-}; /* CR_In_Chakma */
-
-/* 'In_Mahajani': Block */
-static const OnigCodePoint CR_In_Mahajani[] = {
-	1,
-	0x11150, 0x1117f,
-}; /* CR_In_Mahajani */
-
-/* 'In_Sharada': Block */
-static const OnigCodePoint CR_In_Sharada[] = {
-	1,
-	0x11180, 0x111df,
-}; /* CR_In_Sharada */
-
-/* 'In_Sinhala_Archaic_Numbers': Block */
-static const OnigCodePoint CR_In_Sinhala_Archaic_Numbers[] = {
-	1,
-	0x111e0, 0x111ff,
-}; /* CR_In_Sinhala_Archaic_Numbers */
-
-/* 'In_Khojki': Block */
-static const OnigCodePoint CR_In_Khojki[] = {
-	1,
-	0x11200, 0x1124f,
-}; /* CR_In_Khojki */
-
-/* 'In_Khudawadi': Block */
-static const OnigCodePoint CR_In_Khudawadi[] = {
-	1,
-	0x112b0, 0x112ff,
-}; /* CR_In_Khudawadi */
-
-/* 'In_Grantha': Block */
-static const OnigCodePoint CR_In_Grantha[] = {
-	1,
-	0x11300, 0x1137f,
-}; /* CR_In_Grantha */
-
-/* 'In_Tirhuta': Block */
-static const OnigCodePoint CR_In_Tirhuta[] = {
-	1,
-	0x11480, 0x114df,
-}; /* CR_In_Tirhuta */
-
-/* 'In_Siddham': Block */
-static const OnigCodePoint CR_In_Siddham[] = {
-	1,
-	0x11580, 0x115ff,
-}; /* CR_In_Siddham */
-
-/* 'In_Modi': Block */
-static const OnigCodePoint CR_In_Modi[] = {
-	1,
-	0x11600, 0x1165f,
-}; /* CR_In_Modi */
-
-/* 'In_Takri': Block */
-static const OnigCodePoint CR_In_Takri[] = {
-	1,
-	0x11680, 0x116cf,
-}; /* CR_In_Takri */
-
-/* 'In_Warang_Citi': Block */
-static const OnigCodePoint CR_In_Warang_Citi[] = {
-	1,
-	0x118a0, 0x118ff,
-}; /* CR_In_Warang_Citi */
-
-/* 'In_Pau_Cin_Hau': Block */
-static const OnigCodePoint CR_In_Pau_Cin_Hau[] = {
-	1,
-	0x11ac0, 0x11aff,
-}; /* CR_In_Pau_Cin_Hau */
-
-/* 'In_Cuneiform': Block */
-static const OnigCodePoint CR_In_Cuneiform[] = {
-	1,
-	0x12000, 0x123ff,
-}; /* CR_In_Cuneiform */
-
-/* 'In_Cuneiform_Numbers_and_Punctuation': Block */
-static const OnigCodePoint CR_In_Cuneiform_Numbers_and_Punctuation[] = {
-	1,
-	0x12400, 0x1247f,
-}; /* CR_In_Cuneiform_Numbers_and_Punctuation */
-
-/* 'In_Egyptian_Hieroglyphs': Block */
-static const OnigCodePoint CR_In_Egyptian_Hieroglyphs[] = {
-	1,
-	0x13000, 0x1342f,
-}; /* CR_In_Egyptian_Hieroglyphs */
-
-/* 'In_Bamum_Supplement': Block */
-static const OnigCodePoint CR_In_Bamum_Supplement[] = {
-	1,
-	0x16800, 0x16a3f,
-}; /* CR_In_Bamum_Supplement */
-
-/* 'In_Mro': Block */
-static const OnigCodePoint CR_In_Mro[] = {
-	1,
-	0x16a40, 0x16a6f,
-}; /* CR_In_Mro */
-
-/* 'In_Bassa_Vah': Block */
-static const OnigCodePoint CR_In_Bassa_Vah[] = {
-	1,
-	0x16ad0, 0x16aff,
-}; /* CR_In_Bassa_Vah */
-
-/* 'In_Pahawh_Hmong': Block */
-static const OnigCodePoint CR_In_Pahawh_Hmong[] = {
-	1,
-	0x16b00, 0x16b8f,
-}; /* CR_In_Pahawh_Hmong */
-
-/* 'In_Miao': Block */
-static const OnigCodePoint CR_In_Miao[] = {
-	1,
-	0x16f00, 0x16f9f,
-}; /* CR_In_Miao */
-
-/* 'In_Kana_Supplement': Block */
-static const OnigCodePoint CR_In_Kana_Supplement[] = {
-	1,
-	0x1b000, 0x1b0ff,
-}; /* CR_In_Kana_Supplement */
-
-/* 'In_Duployan': Block */
-static const OnigCodePoint CR_In_Duployan[] = {
-	1,
-	0x1bc00, 0x1bc9f,
-}; /* CR_In_Duployan */
-
-/* 'In_Shorthand_Format_Controls': Block */
-static const OnigCodePoint CR_In_Shorthand_Format_Controls[] = {
-	1,
-	0x1bca0, 0x1bcaf,
-}; /* CR_In_Shorthand_Format_Controls */
-
-/* 'In_Byzantine_Musical_Symbols': Block */
-static const OnigCodePoint CR_In_Byzantine_Musical_Symbols[] = {
-	1,
-	0x1d000, 0x1d0ff,
-}; /* CR_In_Byzantine_Musical_Symbols */
-
-/* 'In_Musical_Symbols': Block */
-static const OnigCodePoint CR_In_Musical_Symbols[] = {
-	1,
-	0x1d100, 0x1d1ff,
-}; /* CR_In_Musical_Symbols */
-
-/* 'In_Ancient_Greek_Musical_Notation': Block */
-static const OnigCodePoint CR_In_Ancient_Greek_Musical_Notation[] = {
-	1,
-	0x1d200, 0x1d24f,
-}; /* CR_In_Ancient_Greek_Musical_Notation */
-
-/* 'In_Tai_Xuan_Jing_Symbols': Block */
-static const OnigCodePoint CR_In_Tai_Xuan_Jing_Symbols[] = {
-	1,
-	0x1d300, 0x1d35f,
-}; /* CR_In_Tai_Xuan_Jing_Symbols */
-
-/* 'In_Counting_Rod_Numerals': Block */
-static const OnigCodePoint CR_In_Counting_Rod_Numerals[] = {
-	1,
-	0x1d360, 0x1d37f,
-}; /* CR_In_Counting_Rod_Numerals */
-
-/* 'In_Mathematical_Alphanumeric_Symbols': Block */
-static const OnigCodePoint CR_In_Mathematical_Alphanumeric_Symbols[] = {
-	1,
-	0x1d400, 0x1d7ff,
-}; /* CR_In_Mathematical_Alphanumeric_Symbols */
-
-/* 'In_Mende_Kikakui': Block */
-static const OnigCodePoint CR_In_Mende_Kikakui[] = {
-	1,
-	0x1e800, 0x1e8df,
-}; /* CR_In_Mende_Kikakui */
-
-/* 'In_Arabic_Mathematical_Alphabetic_Symbols': Block */
-static const OnigCodePoint CR_In_Arabic_Mathematical_Alphabetic_Symbols[] = {
-	1,
-	0x1ee00, 0x1eeff,
-}; /* CR_In_Arabic_Mathematical_Alphabetic_Symbols */
-
-/* 'In_Mahjong_Tiles': Block */
-static const OnigCodePoint CR_In_Mahjong_Tiles[] = {
-	1,
-	0x1f000, 0x1f02f,
-}; /* CR_In_Mahjong_Tiles */
-
-/* 'In_Domino_Tiles': Block */
-static const OnigCodePoint CR_In_Domino_Tiles[] = {
-	1,
-	0x1f030, 0x1f09f,
-}; /* CR_In_Domino_Tiles */
-
-/* 'In_Playing_Cards': Block */
-static const OnigCodePoint CR_In_Playing_Cards[] = {
-	1,
-	0x1f0a0, 0x1f0ff,
-}; /* CR_In_Playing_Cards */
-
-/* 'In_Enclosed_Alphanumeric_Supplement': Block */
-static const OnigCodePoint CR_In_Enclosed_Alphanumeric_Supplement[] = {
-	1,
-	0x1f100, 0x1f1ff,
-}; /* CR_In_Enclosed_Alphanumeric_Supplement */
-
-/* 'In_Enclosed_Ideographic_Supplement': Block */
-static const OnigCodePoint CR_In_Enclosed_Ideographic_Supplement[] = {
-	1,
-	0x1f200, 0x1f2ff,
-}; /* CR_In_Enclosed_Ideographic_Supplement */
-
-/* 'In_Miscellaneous_Symbols_and_Pictographs': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Symbols_and_Pictographs[] = {
-	1,
-	0x1f300, 0x1f5ff,
-}; /* CR_In_Miscellaneous_Symbols_and_Pictographs */
-
-/* 'In_Emoticons': Block */
-static const OnigCodePoint CR_In_Emoticons[] = {
-	1,
-	0x1f600, 0x1f64f,
-}; /* CR_In_Emoticons */
-
-/* 'In_Ornamental_Dingbats': Block */
-static const OnigCodePoint CR_In_Ornamental_Dingbats[] = {
-	1,
-	0x1f650, 0x1f67f,
-}; /* CR_In_Ornamental_Dingbats */
-
-/* 'In_Transport_and_Map_Symbols': Block */
-static const OnigCodePoint CR_In_Transport_and_Map_Symbols[] = {
-	1,
-	0x1f680, 0x1f6ff,
-}; /* CR_In_Transport_and_Map_Symbols */
-
-/* 'In_Alchemical_Symbols': Block */
-static const OnigCodePoint CR_In_Alchemical_Symbols[] = {
-	1,
-	0x1f700, 0x1f77f,
-}; /* CR_In_Alchemical_Symbols */
-
-/* 'In_Geometric_Shapes_Extended': Block */
-static const OnigCodePoint CR_In_Geometric_Shapes_Extended[] = {
-	1,
-	0x1f780, 0x1f7ff,
-}; /* CR_In_Geometric_Shapes_Extended */
-
-/* 'In_Supplemental_Arrows_C': Block */
-static const OnigCodePoint CR_In_Supplemental_Arrows_C[] = {
-	1,
-	0x1f800, 0x1f8ff,
-}; /* CR_In_Supplemental_Arrows_C */
-
-/* 'In_CJK_Unified_Ideographs_Extension_B': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_B[] = {
-	1,
-	0x20000, 0x2a6df,
-}; /* CR_In_CJK_Unified_Ideographs_Extension_B */
-
-/* 'In_CJK_Unified_Ideographs_Extension_C': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_C[] = {
-	1,
-	0x2a700, 0x2b73f,
-}; /* CR_In_CJK_Unified_Ideographs_Extension_C */
-
-/* 'In_CJK_Unified_Ideographs_Extension_D': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_D[] = {
-	1,
-	0x2b740, 0x2b81f,
-}; /* CR_In_CJK_Unified_Ideographs_Extension_D */
-
-/* 'In_CJK_Compatibility_Ideographs_Supplement': Block */
-static const OnigCodePoint CR_In_CJK_Compatibility_Ideographs_Supplement[] = {
-	1,
-	0x2f800, 0x2fa1f,
-}; /* CR_In_CJK_Compatibility_Ideographs_Supplement */
-
-/* 'In_Tags': Block */
-static const OnigCodePoint CR_In_Tags[] = {
-	1,
-	0xe0000, 0xe007f,
-}; /* CR_In_Tags */
-
-/* 'In_Variation_Selectors_Supplement': Block */
-static const OnigCodePoint CR_In_Variation_Selectors_Supplement[] = {
-	1,
-	0xe0100, 0xe01ef,
-}; /* CR_In_Variation_Selectors_Supplement */
-
-/* 'In_Supplementary_Private_Use_Area_A': Block */
-static const OnigCodePoint CR_In_Supplementary_Private_Use_Area_A[] = {
-	1,
-	0xf0000, 0xfffff,
-}; /* CR_In_Supplementary_Private_Use_Area_A */
-
-/* 'In_Supplementary_Private_Use_Area_B': Block */
-static const OnigCodePoint CR_In_Supplementary_Private_Use_Area_B[] = {
-	1,
-	0x100000, 0x10ffff,
-}; /* CR_In_Supplementary_Private_Use_Area_B */
-
-/* 'In_No_Block': Block */
-static const OnigCodePoint CR_In_No_Block[] = {
-	40,
-	0x0860, 0x089f,
-	0x1c80, 0x1cbf,
-	0x2fe0, 0x2fef,
-	0xab70, 0xabbf,
-	0x10200, 0x1027f,
-	0x103e0, 0x103ff,
-	0x104b0, 0x104ff,
-	0x10570, 0x105ff,
-	0x10780, 0x107ff,
-	0x108b0, 0x108ff,
-	0x10940, 0x1097f,
-	0x10aa0, 0x10abf,
-	0x10bb0, 0x10bff,
-	0x10c50, 0x10e5f,
-	0x10e80, 0x10fff,
-	0x11250, 0x112af,
-	0x11380, 0x1147f,
-	0x114e0, 0x1157f,
-	0x11660, 0x1167f,
-	0x116d0, 0x1189f,
-	0x11900, 0x11abf,
-	0x11b00, 0x11fff,
-	0x12480, 0x12fff,
-	0x13430, 0x167ff,
-	0x16a70, 0x16acf,
-	0x16b90, 0x16eff,
-	0x16fa0, 0x1afff,
-	0x1b100, 0x1bbff,
-	0x1bcb0, 0x1cfff,
-	0x1d250, 0x1d2ff,
-	0x1d380, 0x1d3ff,
-	0x1d800, 0x1e7ff,
-	0x1e8e0, 0x1edff,
-	0x1ef00, 0x1efff,
-	0x1f900, 0x1ffff,
-	0x2a6e0, 0x2a6ff,
-	0x2b820, 0x2f7ff,
-	0x2fa20, 0xdffff,
-	0xe0080, 0xe00ff,
-	0xe01f0, 0xeffff,
-}; /* CR_In_No_Block */
-#endif /* USE_UNICODE_PROPERTIES */
-
-static const OnigCodePoint* const CodeRanges[] = {
-  CR_NEWLINE,
-  CR_Alpha,
-  CR_Blank,
-  CR_Cntrl,
-  CR_Digit,
-  CR_Graph,
-  CR_Lower,
-  CR_Print,
-  CR_Punct,
-  CR_Space,
-  CR_Upper,
-  CR_XDigit,
-  CR_Word,
-  CR_Alnum,
-  CR_ASCII,
-#ifdef USE_UNICODE_PROPERTIES
-  CR_Any,
-  CR_Assigned,
-  CR_C,
-  CR_Cc,
-  CR_Cf,
-  CR_Cn,
-  CR_Co,
-  CR_Cs,
-  CR_L,
-  CR_LC,
-  CR_Ll,
-  CR_Lm,
-  CR_Lo,
-  CR_Lt,
-  CR_Lu,
-  CR_M,
-  CR_Mc,
-  CR_Me,
-  CR_Mn,
-  CR_N,
-  CR_Nd,
-  CR_Nl,
-  CR_No,
-  CR_P,
-  CR_Pc,
-  CR_Pd,
-  CR_Pe,
-  CR_Pf,
-  CR_Pi,
-  CR_Po,
-  CR_Ps,
-  CR_S,
-  CR_Sc,
-  CR_Sk,
-  CR_Sm,
-  CR_So,
-  CR_Z,
-  CR_Zl,
-  CR_Zp,
-  CR_Zs,
-  CR_Math,
-  CR_Alphabetic,
-  CR_Lowercase,
-  CR_Uppercase,
-  CR_Cased,
-  CR_Case_Ignorable,
-  CR_Changes_When_Lowercased,
-  CR_Changes_When_Uppercased,
-  CR_Changes_When_Titlecased,
-  CR_Changes_When_Casefolded,
-  CR_Changes_When_Casemapped,
-  CR_ID_Start,
-  CR_ID_Continue,
-  CR_XID_Start,
-  CR_XID_Continue,
-  CR_Default_Ignorable_Code_Point,
-  CR_Grapheme_Extend,
-  CR_Grapheme_Base,
-  CR_Grapheme_Link,
-  CR_Common,
-  CR_Latin,
-  CR_Greek,
-  CR_Cyrillic,
-  CR_Armenian,
-  CR_Hebrew,
-  CR_Arabic,
-  CR_Syriac,
-  CR_Thaana,
-  CR_Devanagari,
-  CR_Bengali,
-  CR_Gurmukhi,
-  CR_Gujarati,
-  CR_Oriya,
-  CR_Tamil,
-  CR_Telugu,
-  CR_Kannada,
-  CR_Malayalam,
-  CR_Sinhala,
-  CR_Thai,
-  CR_Lao,
-  CR_Tibetan,
-  CR_Myanmar,
-  CR_Georgian,
-  CR_Hangul,
-  CR_Ethiopic,
-  CR_Cherokee,
-  CR_Canadian_Aboriginal,
-  CR_Ogham,
-  CR_Runic,
-  CR_Khmer,
-  CR_Mongolian,
-  CR_Hiragana,
-  CR_Katakana,
-  CR_Bopomofo,
-  CR_Han,
-  CR_Yi,
-  CR_Old_Italic,
-  CR_Gothic,
-  CR_Deseret,
-  CR_Inherited,
-  CR_Tagalog,
-  CR_Hanunoo,
-  CR_Buhid,
-  CR_Tagbanwa,
-  CR_Limbu,
-  CR_Tai_Le,
-  CR_Linear_B,
-  CR_Ugaritic,
-  CR_Shavian,
-  CR_Osmanya,
-  CR_Cypriot,
-  CR_Braille,
-  CR_Buginese,
-  CR_Coptic,
-  CR_New_Tai_Lue,
-  CR_Glagolitic,
-  CR_Tifinagh,
-  CR_Syloti_Nagri,
-  CR_Old_Persian,
-  CR_Kharoshthi,
-  CR_Balinese,
-  CR_Cuneiform,
-  CR_Phoenician,
-  CR_Phags_Pa,
-  CR_Nko,
-  CR_Sundanese,
-  CR_Lepcha,
-  CR_Ol_Chiki,
-  CR_Vai,
-  CR_Saurashtra,
-  CR_Kayah_Li,
-  CR_Rejang,
-  CR_Lycian,
-  CR_Carian,
-  CR_Lydian,
-  CR_Cham,
-  CR_Tai_Tham,
-  CR_Tai_Viet,
-  CR_Avestan,
-  CR_Egyptian_Hieroglyphs,
-  CR_Samaritan,
-  CR_Lisu,
-  CR_Bamum,
-  CR_Javanese,
-  CR_Meetei_Mayek,
-  CR_Imperial_Aramaic,
-  CR_Old_South_Arabian,
-  CR_Inscriptional_Parthian,
-  CR_Inscriptional_Pahlavi,
-  CR_Old_Turkic,
-  CR_Kaithi,
-  CR_Batak,
-  CR_Brahmi,
-  CR_Mandaic,
-  CR_Chakma,
-  CR_Meroitic_Cursive,
-  CR_Meroitic_Hieroglyphs,
-  CR_Miao,
-  CR_Sharada,
-  CR_Sora_Sompeng,
-  CR_Takri,
-  CR_Caucasian_Albanian,
-  CR_Bassa_Vah,
-  CR_Duployan,
-  CR_Elbasan,
-  CR_Grantha,
-  CR_Pahawh_Hmong,
-  CR_Khojki,
-  CR_Linear_A,
-  CR_Mahajani,
-  CR_Manichaean,
-  CR_Mende_Kikakui,
-  CR_Modi,
-  CR_Mro,
-  CR_Old_North_Arabian,
-  CR_Nabataean,
-  CR_Palmyrene,
-  CR_Pau_Cin_Hau,
-  CR_Old_Permic,
-  CR_Psalter_Pahlavi,
-  CR_Siddham,
-  CR_Khudawadi,
-  CR_Tirhuta,
-  CR_Warang_Citi,
-  CR_White_Space,
-  CR_Bidi_Control,
-  CR_Join_Control,
-  CR_Dash,
-  CR_Hyphen,
-  CR_Quotation_Mark,
-  CR_Terminal_Punctuation,
-  CR_Other_Math,
-  CR_Hex_Digit,
-  CR_ASCII_Hex_Digit,
-  CR_Other_Alphabetic,
-  CR_Ideographic,
-  CR_Diacritic,
-  CR_Extender,
-  CR_Other_Lowercase,
-  CR_Other_Uppercase,
-  CR_Noncharacter_Code_Point,
-  CR_Other_Grapheme_Extend,
-  CR_IDS_Binary_Operator,
-  CR_IDS_Trinary_Operator,
-  CR_Radical,
-  CR_Unified_Ideograph,
-  CR_Other_Default_Ignorable_Code_Point,
-  CR_Deprecated,
-  CR_Soft_Dotted,
-  CR_Logical_Order_Exception,
-  CR_Other_ID_Start,
-  CR_Other_ID_Continue,
-  CR_STerm,
-  CR_Variation_Selector,
-  CR_Pattern_White_Space,
-  CR_Pattern_Syntax,
-  CR_Unknown,
-#ifdef USE_UNICODE_AGE_PROPERTIES
-  CR_Age_1_1,
-  CR_Age_2_0,
-  CR_Age_2_1,
-  CR_Age_3_0,
-  CR_Age_3_1,
-  CR_Age_3_2,
-  CR_Age_4_0,
-  CR_Age_4_1,
-  CR_Age_5_0,
-  CR_Age_5_1,
-  CR_Age_5_2,
-  CR_Age_6_0,
-  CR_Age_6_1,
-  CR_Age_6_2,
-  CR_Age_6_3,
-  CR_Age_7_0,
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-  CR_In_Basic_Latin,
-  CR_In_Latin_1_Supplement,
-  CR_In_Latin_Extended_A,
-  CR_In_Latin_Extended_B,
-  CR_In_IPA_Extensions,
-  CR_In_Spacing_Modifier_Letters,
-  CR_In_Combining_Diacritical_Marks,
-  CR_In_Greek_and_Coptic,
-  CR_In_Cyrillic,
-  CR_In_Cyrillic_Supplement,
-  CR_In_Armenian,
-  CR_In_Hebrew,
-  CR_In_Arabic,
-  CR_In_Syriac,
-  CR_In_Arabic_Supplement,
-  CR_In_Thaana,
-  CR_In_NKo,
-  CR_In_Samaritan,
-  CR_In_Mandaic,
-  CR_In_Arabic_Extended_A,
-  CR_In_Devanagari,
-  CR_In_Bengali,
-  CR_In_Gurmukhi,
-  CR_In_Gujarati,
-  CR_In_Oriya,
-  CR_In_Tamil,
-  CR_In_Telugu,
-  CR_In_Kannada,
-  CR_In_Malayalam,
-  CR_In_Sinhala,
-  CR_In_Thai,
-  CR_In_Lao,
-  CR_In_Tibetan,
-  CR_In_Myanmar,
-  CR_In_Georgian,
-  CR_In_Hangul_Jamo,
-  CR_In_Ethiopic,
-  CR_In_Ethiopic_Supplement,
-  CR_In_Cherokee,
-  CR_In_Unified_Canadian_Aboriginal_Syllabics,
-  CR_In_Ogham,
-  CR_In_Runic,
-  CR_In_Tagalog,
-  CR_In_Hanunoo,
-  CR_In_Buhid,
-  CR_In_Tagbanwa,
-  CR_In_Khmer,
-  CR_In_Mongolian,
-  CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended,
-  CR_In_Limbu,
-  CR_In_Tai_Le,
-  CR_In_New_Tai_Lue,
-  CR_In_Khmer_Symbols,
-  CR_In_Buginese,
-  CR_In_Tai_Tham,
-  CR_In_Combining_Diacritical_Marks_Extended,
-  CR_In_Balinese,
-  CR_In_Sundanese,
-  CR_In_Batak,
-  CR_In_Lepcha,
-  CR_In_Ol_Chiki,
-  CR_In_Sundanese_Supplement,
-  CR_In_Vedic_Extensions,
-  CR_In_Phonetic_Extensions,
-  CR_In_Phonetic_Extensions_Supplement,
-  CR_In_Combining_Diacritical_Marks_Supplement,
-  CR_In_Latin_Extended_Additional,
-  CR_In_Greek_Extended,
-  CR_In_General_Punctuation,
-  CR_In_Superscripts_and_Subscripts,
-  CR_In_Currency_Symbols,
-  CR_In_Combining_Diacritical_Marks_for_Symbols,
-  CR_In_Letterlike_Symbols,
-  CR_In_Number_Forms,
-  CR_In_Arrows,
-  CR_In_Mathematical_Operators,
-  CR_In_Miscellaneous_Technical,
-  CR_In_Control_Pictures,
-  CR_In_Optical_Character_Recognition,
-  CR_In_Enclosed_Alphanumerics,
-  CR_In_Box_Drawing,
-  CR_In_Block_Elements,
-  CR_In_Geometric_Shapes,
-  CR_In_Miscellaneous_Symbols,
-  CR_In_Dingbats,
-  CR_In_Miscellaneous_Mathematical_Symbols_A,
-  CR_In_Supplemental_Arrows_A,
-  CR_In_Braille_Patterns,
-  CR_In_Supplemental_Arrows_B,
-  CR_In_Miscellaneous_Mathematical_Symbols_B,
-  CR_In_Supplemental_Mathematical_Operators,
-  CR_In_Miscellaneous_Symbols_and_Arrows,
-  CR_In_Glagolitic,
-  CR_In_Latin_Extended_C,
-  CR_In_Coptic,
-  CR_In_Georgian_Supplement,
-  CR_In_Tifinagh,
-  CR_In_Ethiopic_Extended,
-  CR_In_Cyrillic_Extended_A,
-  CR_In_Supplemental_Punctuation,
-  CR_In_CJK_Radicals_Supplement,
-  CR_In_Kangxi_Radicals,
-  CR_In_Ideographic_Description_Characters,
-  CR_In_CJK_Symbols_and_Punctuation,
-  CR_In_Hiragana,
-  CR_In_Katakana,
-  CR_In_Bopomofo,
-  CR_In_Hangul_Compatibility_Jamo,
-  CR_In_Kanbun,
-  CR_In_Bopomofo_Extended,
-  CR_In_CJK_Strokes,
-  CR_In_Katakana_Phonetic_Extensions,
-  CR_In_Enclosed_CJK_Letters_and_Months,
-  CR_In_CJK_Compatibility,
-  CR_In_CJK_Unified_Ideographs_Extension_A,
-  CR_In_Yijing_Hexagram_Symbols,
-  CR_In_CJK_Unified_Ideographs,
-  CR_In_Yi_Syllables,
-  CR_In_Yi_Radicals,
-  CR_In_Lisu,
-  CR_In_Vai,
-  CR_In_Cyrillic_Extended_B,
-  CR_In_Bamum,
-  CR_In_Modifier_Tone_Letters,
-  CR_In_Latin_Extended_D,
-  CR_In_Syloti_Nagri,
-  CR_In_Common_Indic_Number_Forms,
-  CR_In_Phags_pa,
-  CR_In_Saurashtra,
-  CR_In_Devanagari_Extended,
-  CR_In_Kayah_Li,
-  CR_In_Rejang,
-  CR_In_Hangul_Jamo_Extended_A,
-  CR_In_Javanese,
-  CR_In_Myanmar_Extended_B,
-  CR_In_Cham,
-  CR_In_Myanmar_Extended_A,
-  CR_In_Tai_Viet,
-  CR_In_Meetei_Mayek_Extensions,
-  CR_In_Ethiopic_Extended_A,
-  CR_In_Latin_Extended_E,
-  CR_In_Meetei_Mayek,
-  CR_In_Hangul_Syllables,
-  CR_In_Hangul_Jamo_Extended_B,
-  CR_In_High_Surrogates,
-  CR_In_High_Private_Use_Surrogates,
-  CR_In_Low_Surrogates,
-  CR_In_Private_Use_Area,
-  CR_In_CJK_Compatibility_Ideographs,
-  CR_In_Alphabetic_Presentation_Forms,
-  CR_In_Arabic_Presentation_Forms_A,
-  CR_In_Variation_Selectors,
-  CR_In_Vertical_Forms,
-  CR_In_Combining_Half_Marks,
-  CR_In_CJK_Compatibility_Forms,
-  CR_In_Small_Form_Variants,
-  CR_In_Arabic_Presentation_Forms_B,
-  CR_In_Halfwidth_and_Fullwidth_Forms,
-  CR_In_Specials,
-  CR_In_Linear_B_Syllabary,
-  CR_In_Linear_B_Ideograms,
-  CR_In_Aegean_Numbers,
-  CR_In_Ancient_Greek_Numbers,
-  CR_In_Ancient_Symbols,
-  CR_In_Phaistos_Disc,
-  CR_In_Lycian,
-  CR_In_Carian,
-  CR_In_Coptic_Epact_Numbers,
-  CR_In_Old_Italic,
-  CR_In_Gothic,
-  CR_In_Old_Permic,
-  CR_In_Ugaritic,
-  CR_In_Old_Persian,
-  CR_In_Deseret,
-  CR_In_Shavian,
-  CR_In_Osmanya,
-  CR_In_Elbasan,
-  CR_In_Caucasian_Albanian,
-  CR_In_Linear_A,
-  CR_In_Cypriot_Syllabary,
-  CR_In_Imperial_Aramaic,
-  CR_In_Palmyrene,
-  CR_In_Nabataean,
-  CR_In_Phoenician,
-  CR_In_Lydian,
-  CR_In_Meroitic_Hieroglyphs,
-  CR_In_Meroitic_Cursive,
-  CR_In_Kharoshthi,
-  CR_In_Old_South_Arabian,
-  CR_In_Old_North_Arabian,
-  CR_In_Manichaean,
-  CR_In_Avestan,
-  CR_In_Inscriptional_Parthian,
-  CR_In_Inscriptional_Pahlavi,
-  CR_In_Psalter_Pahlavi,
-  CR_In_Old_Turkic,
-  CR_In_Rumi_Numeral_Symbols,
-  CR_In_Brahmi,
-  CR_In_Kaithi,
-  CR_In_Sora_Sompeng,
-  CR_In_Chakma,
-  CR_In_Mahajani,
-  CR_In_Sharada,
-  CR_In_Sinhala_Archaic_Numbers,
-  CR_In_Khojki,
-  CR_In_Khudawadi,
-  CR_In_Grantha,
-  CR_In_Tirhuta,
-  CR_In_Siddham,
-  CR_In_Modi,
-  CR_In_Takri,
-  CR_In_Warang_Citi,
-  CR_In_Pau_Cin_Hau,
-  CR_In_Cuneiform,
-  CR_In_Cuneiform_Numbers_and_Punctuation,
-  CR_In_Egyptian_Hieroglyphs,
-  CR_In_Bamum_Supplement,
-  CR_In_Mro,
-  CR_In_Bassa_Vah,
-  CR_In_Pahawh_Hmong,
-  CR_In_Miao,
-  CR_In_Kana_Supplement,
-  CR_In_Duployan,
-  CR_In_Shorthand_Format_Controls,
-  CR_In_Byzantine_Musical_Symbols,
-  CR_In_Musical_Symbols,
-  CR_In_Ancient_Greek_Musical_Notation,
-  CR_In_Tai_Xuan_Jing_Symbols,
-  CR_In_Counting_Rod_Numerals,
-  CR_In_Mathematical_Alphanumeric_Symbols,
-  CR_In_Mende_Kikakui,
-  CR_In_Arabic_Mathematical_Alphabetic_Symbols,
-  CR_In_Mahjong_Tiles,
-  CR_In_Domino_Tiles,
-  CR_In_Playing_Cards,
-  CR_In_Enclosed_Alphanumeric_Supplement,
-  CR_In_Enclosed_Ideographic_Supplement,
-  CR_In_Miscellaneous_Symbols_and_Pictographs,
-  CR_In_Emoticons,
-  CR_In_Ornamental_Dingbats,
-  CR_In_Transport_and_Map_Symbols,
-  CR_In_Alchemical_Symbols,
-  CR_In_Geometric_Shapes_Extended,
-  CR_In_Supplemental_Arrows_C,
-  CR_In_CJK_Unified_Ideographs_Extension_B,
-  CR_In_CJK_Unified_Ideographs_Extension_C,
-  CR_In_CJK_Unified_Ideographs_Extension_D,
-  CR_In_CJK_Compatibility_Ideographs_Supplement,
-  CR_In_Tags,
-  CR_In_Variation_Selectors_Supplement,
-  CR_In_Supplementary_Private_Use_Area_A,
-  CR_In_Supplementary_Private_Use_Area_B,
-  CR_In_No_Block,
-#endif /* USE_UNICODE_PROPERTIES */
-};
-struct uniname2ctype_struct {
-  int name, ctype;
-};
-
-static const struct uniname2ctype_struct *uniname2ctype_p(const char *, unsigned int);
-
-#ifndef USE_UNICODE_PROPERTIES
-#define TOTAL_KEYWORDS 14
-#define MIN_WORD_LENGTH 4
-#define MAX_WORD_LENGTH 6
-#define MIN_HASH_VALUE 6
-#define MAX_HASH_VALUE 19
-/* maximum key range = 14, duplicates = 0 */
-#else /* USE_UNICODE_PROPERTIES */
-#ifndef USE_UNICODE_AGE_PROPERTIES
-#define TOTAL_KEYWORDS 689
-#else /* USE_UNICODE_AGE_PROPERTIES */
-#define TOTAL_KEYWORDS 705
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-#define MIN_WORD_LENGTH 1
-#define MAX_WORD_LENGTH 44
-#define MIN_HASH_VALUE 3
-#define MAX_HASH_VALUE 4322
-/* maximum key range = 4320, duplicates = 0 */
-#endif /* USE_UNICODE_PROPERTIES */
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-static unsigned int
-uniname2ctype_hash (str, len)
-     register const char *str;
-     register unsigned int len;
-{
-#ifndef USE_UNICODE_PROPERTIES
-  static const unsigned char asso_values[] =
-#else /* USE_UNICODE_PROPERTIES */
-  static const unsigned short asso_values[] =
-#endif /* USE_UNICODE_PROPERTIES */
-    {
-#ifndef USE_UNICODE_PROPERTIES
-      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, 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, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20,  3, 11,  5,
-       4, 20, 20,  9, 20,  1, 20, 20, 10, 20,
-       2, 20,  1, 20,  1,  7,  4,  6, 20,  1,
-       4, 20, 20, 20, 20, 20, 20, 20
-#else /* USE_UNICODE_PROPERTIES */
-      4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323,
-      4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323,
-      4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323,
-      4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323,
-#ifndef USE_UNICODE_AGE_PROPERTIES
-      4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323,
-      4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323,
-#else /* USE_UNICODE_AGE_PROPERTIES */
-      4323, 4323, 4323, 4323, 4323, 4323,    1, 4323,   12,    1,
-         2,    9,   18,   11,    6,   10, 4323, 4323, 4323, 4323,
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-      4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323,
-      4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323,
-      4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323,
-      4323, 4323, 4323, 4323, 4323, 4323, 4323,   13,  931,    6,
-       382,   25,  311,  891,  277,    4,  272, 1436,  120,    7,
-         1,  303,  456,    1,  232,   32,   65,  732, 1411,  163,
-       883, 1255,    8, 4323, 4323, 4323, 4323, 4323
-#endif /* USE_UNICODE_PROPERTIES */
-    };
-#ifndef USE_UNICODE_PROPERTIES
-  return len + asso_values[(unsigned char)str[2]] + asso_values[(unsigned char)str[0]];
-#else /* USE_UNICODE_PROPERTIES */
-  register int hval = len;
-
-  switch (hval)
-    {
-      default:
-        hval += asso_values[(unsigned char)str[15]];
-      /*FALLTHROUGH*/
-      case 15:
-      case 14:
-      case 13:
-      case 12:
-        hval += asso_values[(unsigned char)str[11]];
-      /*FALLTHROUGH*/
-      case 11:
-      case 10:
-      case 9:
-      case 8:
-      case 7:
-      case 6:
-        hval += asso_values[(unsigned char)str[5]];
-      /*FALLTHROUGH*/
-      case 5:
-        hval += asso_values[(unsigned char)str[4]];
-      /*FALLTHROUGH*/
-      case 4:
-      case 3:
-        hval += asso_values[(unsigned char)str[2]];
-      /*FALLTHROUGH*/
-      case 2:
-        hval += asso_values[(unsigned char)str[1]];
-      /*FALLTHROUGH*/
-      case 1:
-        hval += asso_values[(unsigned char)str[0]];
-        break;
-    }
-  return hval + asso_values[(unsigned char)str[len - 1]];
-#endif /* USE_UNICODE_PROPERTIES */
-}
-
-struct uniname2ctype_pool_t
-  {
-#ifndef USE_UNICODE_PROPERTIES
-    char uniname2ctype_pool_str6[sizeof("word")];
-    char uniname2ctype_pool_str7[sizeof("print")];
-    char uniname2ctype_pool_str8[sizeof("punct")];
-    char uniname2ctype_pool_str9[sizeof("alpha")];
-    char uniname2ctype_pool_str10[sizeof("alnum")];
-    char uniname2ctype_pool_str11[sizeof("xdigit")];
-    char uniname2ctype_pool_str12[sizeof("upper")];
-    char uniname2ctype_pool_str13[sizeof("ascii")];
-    char uniname2ctype_pool_str14[sizeof("cntrl")];
-    char uniname2ctype_pool_str15[sizeof("space")];
-    char uniname2ctype_pool_str16[sizeof("lower")];
-    char uniname2ctype_pool_str17[sizeof("graph")];
-    char uniname2ctype_pool_str18[sizeof("digit")];
-    char uniname2ctype_pool_str19[sizeof("blank")];
-#else /* USE_UNICODE_PROPERTIES */
-    char uniname2ctype_pool_str3[sizeof("n")];
-    char uniname2ctype_pool_str10[sizeof("cn")];
-    char uniname2ctype_pool_str11[sizeof("mn")];
-    char uniname2ctype_pool_str13[sizeof("c")];
-    char uniname2ctype_pool_str15[sizeof("m")];
-    char uniname2ctype_pool_str16[sizeof("ci")];
-    char uniname2ctype_pool_str17[sizeof("z")];
-    char uniname2ctype_pool_str20[sizeof("cc")];
-    char uniname2ctype_pool_str21[sizeof("mc")];
-    char uniname2ctype_pool_str29[sizeof("mani")];
-    char uniname2ctype_pool_str31[sizeof("inmanichaean")];
-    char uniname2ctype_pool_str35[sizeof("qaai")];
-    char uniname2ctype_pool_str36[sizeof("zzzz")];
-    char uniname2ctype_pool_str37[sizeof("qaac")];
-    char uniname2ctype_pool_str44[sizeof("incham")];
-    char uniname2ctype_pool_str46[sizeof("sc")];
-    char uniname2ctype_pool_str48[sizeof("sm")];
-    char uniname2ctype_pool_str51[sizeof("mandaic")];
-    char uniname2ctype_pool_str55[sizeof("incuneiform")];
-    char uniname2ctype_pool_str56[sizeof("cans")];
-    char uniname2ctype_pool_str59[sizeof("me")];
-    char uniname2ctype_pool_str61[sizeof("inarmenian")];
-    char uniname2ctype_pool_str64[sizeof("ascii")];
-    char uniname2ctype_pool_str65[sizeof("s")];
-    char uniname2ctype_pool_str69[sizeof("insamaritan")];
-    char uniname2ctype_pool_str72[sizeof("cs")];
-    char uniname2ctype_pool_str74[sizeof("zs")];
-    char uniname2ctype_pool_str85[sizeof("inavestan")];
-    char uniname2ctype_pool_str92[sizeof("incommonindicnumberforms")];
-    char uniname2ctype_pool_str96[sizeof("incuneiformnumbersandpunctuation")];
-    char uniname2ctype_pool_str97[sizeof("inthai")];
-    char uniname2ctype_pool_str98[sizeof("inipaextensions")];
-    char uniname2ctype_pool_str105[sizeof("mtei")];
-    char uniname2ctype_pool_str110[sizeof("inspecials")];
-    char uniname2ctype_pool_str114[sizeof("initialpunctuation")];
-    char uniname2ctype_pool_str115[sizeof("inancientsymbols")];
-    char uniname2ctype_pool_str117[sizeof("inthaana")];
-    char uniname2ctype_pool_str130[sizeof("inmiscellaneousmathematicalsymbolsa")];
-    char uniname2ctype_pool_str134[sizeof("lc")];
-    char uniname2ctype_pool_str135[sizeof("inmusicalsymbols")];
-    char uniname2ctype_pool_str136[sizeof("lm")];
-    char uniname2ctype_pool_str137[sizeof("taile")];
-    char uniname2ctype_pool_str141[sizeof("sterm")];
-    char uniname2ctype_pool_str142[sizeof("lina")];
-    char uniname2ctype_pool_str144[sizeof("inlycian")];
-    char uniname2ctype_pool_str147[sizeof("inmyanmarextendeda")];
-    char uniname2ctype_pool_str151[sizeof("lana")];
-    char uniname2ctype_pool_str153[sizeof("alnum")];
-    char uniname2ctype_pool_str155[sizeof("intaitham")];
-    char uniname2ctype_pool_str157[sizeof("incontrolpictures")];
-    char uniname2ctype_pool_str161[sizeof("inmiscellaneoussymbols")];
-    char uniname2ctype_pool_str163[sizeof("inmalayalam")];
-    char uniname2ctype_pool_str166[sizeof("intransportandmapsymbols")];
-    char uniname2ctype_pool_str170[sizeof("inmiscellaneoussymbolsandarrows")];
-    char uniname2ctype_pool_str173[sizeof("inlineara")];
-    char uniname2ctype_pool_str175[sizeof("inmiscellaneoussymbolsandpictographs")];
-    char uniname2ctype_pool_str183[sizeof("taiviet")];
-    char uniname2ctype_pool_str186[sizeof("cwcm")];
-    char uniname2ctype_pool_str190[sizeof("sinhala")];
-    char uniname2ctype_pool_str203[sizeof("latn")];
-    char uniname2ctype_pool_str205[sizeof("latin")];
-    char uniname2ctype_pool_str206[sizeof("ital")];
-    char uniname2ctype_pool_str208[sizeof("intamil")];
-    char uniname2ctype_pool_str209[sizeof("taml")];
-    char uniname2ctype_pool_str223[sizeof("inlatinextendedc")];
-    char uniname2ctype_pool_str226[sizeof("intaile")];
-    char uniname2ctype_pool_str227[sizeof("tale")];
-    char uniname2ctype_pool_str237[sizeof("inlatinextendeda")];
-    char uniname2ctype_pool_str239[sizeof("inlinearbideograms")];
-    char uniname2ctype_pool_str240[sizeof("newtailue")];
-    char uniname2ctype_pool_str241[sizeof("l")];
-    char uniname2ctype_pool_str243[sizeof("nl")];
-    char uniname2ctype_pool_str247[sizeof("inmeeteimayekextensions")];
-    char uniname2ctype_pool_str250[sizeof("zl")];
-    char uniname2ctype_pool_str252[sizeof("lt")];
-    char uniname2ctype_pool_str255[sizeof("inrunic")];
-    char uniname2ctype_pool_str256[sizeof("incarian")];
-    char uniname2ctype_pool_str257[sizeof("armn")];
-    char uniname2ctype_pool_str259[sizeof("cari")];
-    char uniname2ctype_pool_str260[sizeof("armi")];
-    char uniname2ctype_pool_str261[sizeof("inlatinextendede")];
-    char uniname2ctype_pool_str263[sizeof("incyrillic")];
-    char uniname2ctype_pool_str266[sizeof("armenian")];
-    char uniname2ctype_pool_str267[sizeof("inmyanmar")];
-    char uniname2ctype_pool_str270[sizeof("innewtailue")];
-    char uniname2ctype_pool_str272[sizeof("carian")];
-    char uniname2ctype_pool_str274[sizeof("merc")];
-    char uniname2ctype_pool_str280[sizeof("arabic")];
-    char uniname2ctype_pool_str284[sizeof("inmiscellaneoustechnical")];
-    char uniname2ctype_pool_str287[sizeof("insyriac")];
-    char uniname2ctype_pool_str288[sizeof("samr")];
-    char uniname2ctype_pool_str294[sizeof("zinh")];
-    char uniname2ctype_pool_str295[sizeof("han")];
-    char uniname2ctype_pool_str298[sizeof("samaritan")];
-    char uniname2ctype_pool_str299[sizeof("hani")];
-    char uniname2ctype_pool_str302[sizeof("cwt")];
-    char uniname2ctype_pool_str303[sizeof("incherokee")];
-    char uniname2ctype_pool_str304[sizeof("insharada")];
-    char uniname2ctype_pool_str307[sizeof("cham")];
-    char uniname2ctype_pool_str315[sizeof("manichaean")];
-    char uniname2ctype_pool_str316[sizeof("inmahajani")];
-    char uniname2ctype_pool_str317[sizeof("cntrl")];
-    char uniname2ctype_pool_str318[sizeof("sinh")];
-    char uniname2ctype_pool_str320[sizeof("inruminumeralsymbols")];
-    char uniname2ctype_pool_str327[sizeof("inethiopic")];
-    char uniname2ctype_pool_str330[sizeof("tamil")];
-    char uniname2ctype_pool_str331[sizeof("miao")];
-    char uniname2ctype_pool_str332[sizeof("inenclosedalphanumerics")];
-    char uniname2ctype_pool_str333[sizeof("term")];
-    char uniname2ctype_pool_str335[sizeof("chakma")];
-    char uniname2ctype_pool_str337[sizeof("insinhala")];
-    char uniname2ctype_pool_str347[sizeof("shavian")];
-    char uniname2ctype_pool_str350[sizeof("inosmanya")];
-    char uniname2ctype_pool_str353[sizeof("inlatinextendedadditional")];
-    char uniname2ctype_pool_str359[sizeof("osma")];
-    char uniname2ctype_pool_str362[sizeof("ll")];
-    char uniname2ctype_pool_str363[sizeof("thai")];
-    char uniname2ctype_pool_str366[sizeof("math")];
-    char uniname2ctype_pool_str372[sizeof("thaa")];
-    char uniname2ctype_pool_str374[sizeof("inenclosedalphanumericsupplement")];
-    char uniname2ctype_pool_str375[sizeof("ethi")];
-    char uniname2ctype_pool_str376[sizeof("connectorpunctuation")];
-    char uniname2ctype_pool_str380[sizeof("inlowsurrogates")];
-    char uniname2ctype_pool_str382[sizeof("insinhalaarchaicnumbers")];
-    char uniname2ctype_pool_str386[sizeof("taitham")];
-    char uniname2ctype_pool_str388[sizeof("thaana")];
-    char uniname2ctype_pool_str390[sizeof("lineara")];
-    char uniname2ctype_pool_str392[sizeof("di")];
-    char uniname2ctype_pool_str401[sizeof("idc")];
-    char uniname2ctype_pool_str405[sizeof("meroiticcursive")];
-    char uniname2ctype_pool_str407[sizeof("mand")];
-    char uniname2ctype_pool_str408[sizeof("inmodi")];
-    char uniname2ctype_pool_str410[sizeof("inmandaic")];
-    char uniname2ctype_pool_str412[sizeof("cwl")];
-    char uniname2ctype_pool_str414[sizeof("asciihexdigit")];
-    char uniname2ctype_pool_str415[sizeof("dia")];
-    char uniname2ctype_pool_str418[sizeof("terminalpunctuation")];
-    char uniname2ctype_pool_str419[sizeof("mend")];
-    char uniname2ctype_pool_str423[sizeof("sind")];
-    char uniname2ctype_pool_str425[sizeof("wara")];
-    char uniname2ctype_pool_str433[sizeof("inwarangciti")];
-    char uniname2ctype_pool_str439[sizeof("inideographicdescriptioncharacters")];
-    char uniname2ctype_pool_str441[sizeof("inemoticons")];
-    char uniname2ctype_pool_str453[sizeof("ids")];
-    char uniname2ctype_pool_str456[sizeof("insundanese")];
-    char uniname2ctype_pool_str466[sizeof("pi")];
-    char uniname2ctype_pool_str468[sizeof("indominotiles")];
-    char uniname2ctype_pool_str470[sizeof("pc")];
-    char uniname2ctype_pool_str476[sizeof("loe")];
-    char uniname2ctype_pool_str477[sizeof("titlecaseletter")];
-    char uniname2ctype_pool_str485[sizeof("inopticalcharacterrecognition")];
-    char uniname2ctype_pool_str487[sizeof("idst")];
-    char uniname2ctype_pool_str489[sizeof("shaw")];
-    char uniname2ctype_pool_str490[sizeof("cwcf")];
-    char uniname2ctype_pool_str493[sizeof("idcontinue")];
-    char uniname2ctype_pool_str502[sizeof("inphaistosdisc")];
-    char uniname2ctype_pool_str508[sizeof("pe")];
-    char uniname2ctype_pool_str518[sizeof("indeseret")];
-    char uniname2ctype_pool_str519[sizeof("inspacingmodifierletters")];
-    char uniname2ctype_pool_str520[sizeof("inlydian")];
-    char uniname2ctype_pool_str522[sizeof("ps")];
-    char uniname2ctype_pool_str530[sizeof("hira")];
-    char uniname2ctype_pool_str536[sizeof("whitespace")];
-    char uniname2ctype_pool_str540[sizeof("inscriptionalparthian")];
-    char uniname2ctype_pool_str544[sizeof("cher")];
-    char uniname2ctype_pool_str545[sizeof("inmathematicalalphanumericsymbols")];
-    char uniname2ctype_pool_str546[sizeof("incoptic")];
-    char uniname2ctype_pool_str550[sizeof("inhiragana")];
-    char uniname2ctype_pool_str554[sizeof("inenclosedcjklettersandmonths")];
-    char uniname2ctype_pool_str556[sizeof("space")];
-    char uniname2ctype_pool_str570[sizeof("oriya")];
-    char uniname2ctype_pool_str571[sizeof("mero")];
-    char uniname2ctype_pool_str573[sizeof("mahj")];
-    char uniname2ctype_pool_str582[sizeof("tirh")];
-    char uniname2ctype_pool_str584[sizeof("sora")];
-    char uniname2ctype_pool_str587[sizeof("inscriptionalpahlavi")];
-    char uniname2ctype_pool_str593[sizeof("inarrows")];
-    char uniname2ctype_pool_str594[sizeof("mahajani")];
-    char uniname2ctype_pool_str596[sizeof("joinc")];
-    char uniname2ctype_pool_str597[sizeof("incopticepactnumbers")];
-    char uniname2ctype_pool_str598[sizeof("hano")];
-    char uniname2ctype_pool_str600[sizeof("palm")];
-    char uniname2ctype_pool_str601[sizeof("intirhuta")];
-    char uniname2ctype_pool_str603[sizeof("patws")];
-    char uniname2ctype_pool_str604[sizeof("inolchiki")];
-    char uniname2ctype_pool_str608[sizeof("inlepcha")];
-    char uniname2ctype_pool_str609[sizeof("no")];
-    char uniname2ctype_pool_str611[sizeof("lepc")];
-    char uniname2ctype_pool_str612[sizeof("inogham")];
-    char uniname2ctype_pool_str614[sizeof("co")];
-    char uniname2ctype_pool_str617[sizeof("innko")];
-    char uniname2ctype_pool_str620[sizeof("alpha")];
-    char uniname2ctype_pool_str622[sizeof("psalterpahlavi")];
-    char uniname2ctype_pool_str623[sizeof("inmro")];
-    char uniname2ctype_pool_str624[sizeof("inpalmyrene")];
-    char uniname2ctype_pool_str627[sizeof("common")];
-    char uniname2ctype_pool_str630[sizeof("cf")];
-    char uniname2ctype_pool_str637[sizeof("inmiao")];
-    char uniname2ctype_pool_str640[sizeof("so")];
-    char uniname2ctype_pool_str650[sizeof("diacritic")];
-    char uniname2ctype_pool_str658[sizeof("insundanesesupplement")];
-    char uniname2ctype_pool_str672[sizeof("intifinagh")];
-    char uniname2ctype_pool_str679[sizeof("tifinagh")];
-    char uniname2ctype_pool_str696[sizeof("odi")];
-    char uniname2ctype_pool_str699[sizeof("oidc")];
-    char uniname2ctype_pool_str700[sizeof("modi")];
-    char uniname2ctype_pool_str703[sizeof("decimalnumber")];
-    char uniname2ctype_pool_str705[sizeof("letter")];
-    char uniname2ctype_pool_str708[sizeof("dash")];
-    char uniname2ctype_pool_str709[sizeof("insylotinagri")];
-    char uniname2ctype_pool_str711[sizeof("inolditalic")];
-    char uniname2ctype_pool_str713[sizeof("wspace")];
-    char uniname2ctype_pool_str715[sizeof("dsrt")];
-    char uniname2ctype_pool_str718[sizeof("ideo")];
-    char uniname2ctype_pool_str722[sizeof("siddham")];
-    char uniname2ctype_pool_str724[sizeof("perm")];
-    char uniname2ctype_pool_str725[sizeof("oids")];
-    char uniname2ctype_pool_str727[sizeof("inmahjongtiles")];
-    char uniname2ctype_pool_str728[sizeof("lo")];
-    char uniname2ctype_pool_str730[sizeof("lineseparator")];
-    char uniname2ctype_pool_str731[sizeof("imperialaramaic")];
-    char uniname2ctype_pool_str735[sizeof("idstart")];
-    char uniname2ctype_pool_str736[sizeof("inlao")];
-    char uniname2ctype_pool_str737[sizeof("sharada")];
-    char uniname2ctype_pool_str742[sizeof("lao")];
-    char uniname2ctype_pool_str743[sizeof("laoo")];
-    char uniname2ctype_pool_str744[sizeof("mongolian")];
-    char uniname2ctype_pool_str745[sizeof("oalpha")];
-    char uniname2ctype_pool_str749[sizeof("inimperialaramaic")];
-    char uniname2ctype_pool_str753[sizeof("nchar")];
-    char uniname2ctype_pool_str758[sizeof("inlatin1supplement")];
-    char uniname2ctype_pool_str761[sizeof("prti")];
-    char uniname2ctype_pool_str763[sizeof("cprt")];
-    char uniname2ctype_pool_str767[sizeof("nd")];
-    char uniname2ctype_pool_str768[sizeof("deseret")];
-    char uniname2ctype_pool_str772[sizeof("inoldturkic")];
-    char uniname2ctype_pool_str773[sizeof("radical")];
-    char uniname2ctype_pool_str777[sizeof("canadianaboriginal")];
-    char uniname2ctype_pool_str779[sizeof("inmodifiertoneletters")];
-    char uniname2ctype_pool_str783[sizeof("incaucasianalbanian")];
-    char uniname2ctype_pool_str787[sizeof("coptic")];
-    char uniname2ctype_pool_str796[sizeof("casedletter")];
-    char uniname2ctype_pool_str798[sizeof("sd")];
-    char uniname2ctype_pool_str803[sizeof("inphoenician")];
-    char uniname2ctype_pool_str804[sizeof("sidd")];
-    char uniname2ctype_pool_str805[sizeof("privateuse")];
-    char uniname2ctype_pool_str813[sizeof("sundanese")];
-    char uniname2ctype_pool_str815[sizeof("inancientgreekmusicalnotation")];
-    char uniname2ctype_pool_str817[sizeof("insiddham")];
-    char uniname2ctype_pool_str820[sizeof("cased")];
-    char uniname2ctype_pool_str827[sizeof("print")];
-    char uniname2ctype_pool_str830[sizeof("ininscriptionalparthian")];
-    char uniname2ctype_pool_str832[sizeof("ininscriptionalpahlavi")];
-    char uniname2ctype_pool_str834[sizeof("copt")];
-    char uniname2ctype_pool_str838[sizeof("inancientgreeknumbers")];
-    char uniname2ctype_pool_str845[sizeof("saurashtra")];
-    char uniname2ctype_pool_str848[sizeof("mro")];
-    char uniname2ctype_pool_str849[sizeof("mroo")];
-    char uniname2ctype_pool_str850[sizeof("inalphabeticpresentationforms")];
-    char uniname2ctype_pool_str858[sizeof("lowercase")];
-    char uniname2ctype_pool_str861[sizeof("phli")];
-    char uniname2ctype_pool_str864[sizeof("patternwhitespace")];
-    char uniname2ctype_pool_str866[sizeof("inenclosedideographicsupplement")];
-    char uniname2ctype_pool_str869[sizeof("spaceseparator")];
-    char uniname2ctype_pool_str871[sizeof("inmathematicaloperators")];
-    char uniname2ctype_pool_str882[sizeof("omath")];
-    char uniname2ctype_pool_str892[sizeof("lisu")];
-    char uniname2ctype_pool_str895[sizeof("inpsalterpahlavi")];
-    char uniname2ctype_pool_str898[sizeof("olditalic")];
-    char uniname2ctype_pool_str905[sizeof("hanunoo")];
-    char uniname2ctype_pool_str909[sizeof("inherited")];
-    char uniname2ctype_pool_str910[sizeof("lepcha")];
-    char uniname2ctype_pool_str913[sizeof("p")];
-    char uniname2ctype_pool_str916[sizeof("inmongolian")];
-    char uniname2ctype_pool_str922[sizeof("zp")];
-    char uniname2ctype_pool_str923[sizeof("finalpunctuation")];
-    char uniname2ctype_pool_str925[sizeof("otheridcontinue")];
-    char uniname2ctype_pool_str927[sizeof("shrd")];
-    char uniname2ctype_pool_str932[sizeof("ingrantha")];
-    char uniname2ctype_pool_str934[sizeof("talu")];
-    char uniname2ctype_pool_str936[sizeof("otheralphabetic")];
-    char uniname2ctype_pool_str938[sizeof("noncharactercodepoint")];
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    char uniname2ctype_pool_str939[sizeof("age=1.1")];
-    char uniname2ctype_pool_str940[sizeof("age=2.1")];
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    char uniname2ctype_pool_str941[sizeof("closepunctuation")];
-    char uniname2ctype_pool_str943[sizeof("letternumber")];
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    char uniname2ctype_pool_str944[sizeof("age=6.1")];
-    char uniname2ctype_pool_str945[sizeof("age=6.2")];
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    char uniname2ctype_pool_str946[sizeof("telu")];
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    char uniname2ctype_pool_str947[sizeof("age=3.1")];
-    char uniname2ctype_pool_str948[sizeof("age=3.2")];
-    char uniname2ctype_pool_str949[sizeof("age=5.1")];
-    char uniname2ctype_pool_str950[sizeof("age=5.2")];
-    char uniname2ctype_pool_str951[sizeof("age=2.0")];
-    char uniname2ctype_pool_str952[sizeof("age=6.3")];
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    char uniname2ctype_pool_str953[sizeof("inshorthandformatcontrols")];
-    char uniname2ctype_pool_str954[sizeof("inoldnortharabian")];
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    char uniname2ctype_pool_str955[sizeof("age=6.0")];
-    char uniname2ctype_pool_str956[sizeof("age=4.1")];
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    char uniname2ctype_pool_str957[sizeof("ingeneralpunctuation")];
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    char uniname2ctype_pool_str958[sizeof("age=3.0")];
-    char uniname2ctype_pool_str959[sizeof("age=7.0")];
-    char uniname2ctype_pool_str960[sizeof("age=5.0")];
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    char uniname2ctype_pool_str962[sizeof("innabataean")];
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    char uniname2ctype_pool_str967[sizeof("age=4.0")];
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    char uniname2ctype_pool_str970[sizeof("bamum")];
-    char uniname2ctype_pool_str972[sizeof("control")];
-    char uniname2ctype_pool_str974[sizeof("induployan")];
-    char uniname2ctype_pool_str975[sizeof("inlatinextendedd")];
-    char uniname2ctype_pool_str976[sizeof("inarabic")];
-    char uniname2ctype_pool_str982[sizeof("runic")];
-    char uniname2ctype_pool_str984[sizeof("inelbasan")];
-    char uniname2ctype_pool_str985[sizeof("inoldsoutharabian")];
-    char uniname2ctype_pool_str986[sizeof("inbasiclatin")];
-    char uniname2ctype_pool_str995[sizeof("format")];
-    char uniname2ctype_pool_str996[sizeof("innumberforms")];
-    char uniname2ctype_pool_str998[sizeof("inugaritic")];
-    char uniname2ctype_pool_str999[sizeof("separator")];
-    char uniname2ctype_pool_str1000[sizeof("idsbinaryoperator")];
-    char uniname2ctype_pool_str1004[sizeof("tagbanwa")];
-    char uniname2ctype_pool_str1012[sizeof("bass")];
-    char uniname2ctype_pool_str1013[sizeof("saur")];
-    char uniname2ctype_pool_str1014[sizeof("nbat")];
-    char uniname2ctype_pool_str1017[sizeof("intaixuanjingsymbols")];
-    char uniname2ctype_pool_str1019[sizeof("joincontrol")];
-    char uniname2ctype_pool_str1023[sizeof("otheridstart")];
-    char uniname2ctype_pool_str1027[sizeof("inbyzantinemusicalsymbols")];
-    char uniname2ctype_pool_str1031[sizeof("intags")];
-    char uniname2ctype_pool_str1033[sizeof("nabataean")];
-    char uniname2ctype_pool_str1034[sizeof("insuperscriptsandsubscripts")];
-    char uniname2ctype_pool_str1036[sizeof("intibetan")];
-    char uniname2ctype_pool_str1039[sizeof("insaurashtra")];
-    char uniname2ctype_pool_str1040[sizeof("othersymbol")];
-    char uniname2ctype_pool_str1041[sizeof("ext")];
-    char uniname2ctype_pool_str1046[sizeof("inarabicpresentationformsa")];
-    char uniname2ctype_pool_str1048[sizeof("inmiscellaneousmathematicalsymbolsb")];
-    char uniname2ctype_pool_str1049[sizeof("otherlowercase")];
-    char uniname2ctype_pool_str1052[sizeof("phoenician")];
-    char uniname2ctype_pool_str1055[sizeof("lower")];
-    char uniname2ctype_pool_str1060[sizeof("linb")];
-    char uniname2ctype_pool_str1064[sizeof("po")];
-    char uniname2ctype_pool_str1065[sizeof("inmyanmarextendedb")];
-    char uniname2ctype_pool_str1066[sizeof("limb")];
-    char uniname2ctype_pool_str1068[sizeof("inbraillepatterns")];
-    char uniname2ctype_pool_str1069[sizeof("tibt")];
-    char uniname2ctype_pool_str1070[sizeof("cuneiform")];
-    char uniname2ctype_pool_str1072[sizeof("bali")];
-    char uniname2ctype_pool_str1073[sizeof("oldpersian")];
-    char uniname2ctype_pool_str1077[sizeof("oldpermic")];
-    char uniname2ctype_pool_str1080[sizeof("pf")];
-    char uniname2ctype_pool_str1084[sizeof("word")];
-    char uniname2ctype_pool_str1086[sizeof("tibetan")];
-    char uniname2ctype_pool_str1089[sizeof("incyrillicsupplement")];
-    char uniname2ctype_pool_str1093[sizeof("elba")];
-    char uniname2ctype_pool_str1094[sizeof("insupplementalmathematicaloperators")];
-    char uniname2ctype_pool_str1095[sizeof("inbalinese")];
-    char uniname2ctype_pool_str1101[sizeof("bengali")];
-    char uniname2ctype_pool_str1104[sizeof("caseignorable")];
-    char uniname2ctype_pool_str1107[sizeof("incountingrodnumerals")];
-    char uniname2ctype_pool_str1114[sizeof("other")];
-    char uniname2ctype_pool_str1118[sizeof("tirhuta")];
-    char uniname2ctype_pool_str1121[sizeof("othernumber")];
-    char uniname2ctype_pool_str1123[sizeof("balinese")];
-    char uniname2ctype_pool_str1129[sizeof("elbasan")];
-    char uniname2ctype_pool_str1134[sizeof("inunifiedcanadianaboriginalsyllabics")];
-    char uniname2ctype_pool_str1136[sizeof("lowercaseletter")];
-    char uniname2ctype_pool_str1140[sizeof("ethiopic")];
-    char uniname2ctype_pool_str1141[sizeof("gran")];
-    char uniname2ctype_pool_str1149[sizeof("ingurmukhi")];
-    char uniname2ctype_pool_str1151[sizeof("sund")];
-    char uniname2ctype_pool_str1153[sizeof("inethiopicsupplement")];
-    char uniname2ctype_pool_str1160[sizeof("inoldpersian")];
-    char uniname2ctype_pool_str1163[sizeof("inoldpermic")];
-    char uniname2ctype_pool_str1170[sizeof("othermath")];
-    char uniname2ctype_pool_str1174[sizeof("unassigned")];
-    char uniname2ctype_pool_str1180[sizeof("hmng")];
-    char uniname2ctype_pool_str1181[sizeof("narb")];
-    char uniname2ctype_pool_str1184[sizeof("brai")];
-    char uniname2ctype_pool_str1186[sizeof("hang")];
-    char uniname2ctype_pool_str1187[sizeof("insorasompeng")];
-    char uniname2ctype_pool_str1193[sizeof("arab")];
-    char uniname2ctype_pool_str1194[sizeof("plrd")];
-    char uniname2ctype_pool_str1195[sizeof("ingujarati")];
-    char uniname2ctype_pool_str1197[sizeof("brahmi")];
-    char uniname2ctype_pool_str1201[sizeof("runr")];
-    char uniname2ctype_pool_str1202[sizeof("ahex")];
-    char uniname2ctype_pool_str1206[sizeof("mong")];
-    char uniname2ctype_pool_str1211[sizeof("pauc")];
-    char uniname2ctype_pool_str1212[sizeof("sarb")];
-    char uniname2ctype_pool_str1218[sizeof("ogam")];
-    char uniname2ctype_pool_str1221[sizeof("olower")];
-    char uniname2ctype_pool_str1222[sizeof("pd")];
-    char uniname2ctype_pool_str1235[sizeof("number")];
-    char uniname2ctype_pool_str1238[sizeof("inbrahmi")];
-    char uniname2ctype_pool_str1240[sizeof("otherletter")];
-    char uniname2ctype_pool_str1252[sizeof("ingothic")];
-    char uniname2ctype_pool_str1254[sizeof("phagspa")];
-    char uniname2ctype_pool_str1262[sizeof("inletterlikesymbols")];
-    char uniname2ctype_pool_str1265[sizeof("yi")];
-    char uniname2ctype_pool_str1269[sizeof("hangul")];
-    char uniname2ctype_pool_str1271[sizeof("yiii")];
-    char uniname2ctype_pool_str1272[sizeof("tfng")];
-    char uniname2ctype_pool_str1273[sizeof("insupplementalarrowsc")];
-    char uniname2ctype_pool_str1277[sizeof("ingreekandcoptic")];
-    char uniname2ctype_pool_str1279[sizeof("xidc")];
-    char uniname2ctype_pool_str1280[sizeof("insupplementalarrowsa")];
-    char uniname2ctype_pool_str1281[sizeof("gothic")];
-    char uniname2ctype_pool_str1283[sizeof("grext")];
-    char uniname2ctype_pool_str1285[sizeof("incombininghalfmarks")];
-    char uniname2ctype_pool_str1286[sizeof("deprecated")];
-    char uniname2ctype_pool_str1287[sizeof("inbassavah")];
-    char uniname2ctype_pool_str1305[sizeof("xids")];
-    char uniname2ctype_pool_str1308[sizeof("linearb")];
-    char uniname2ctype_pool_str1312[sizeof("ingeometricshapes")];
-    char uniname2ctype_pool_str1313[sizeof("phlp")];
-    char uniname2ctype_pool_str1314[sizeof("warangciti")];
-    char uniname2ctype_pool_str1317[sizeof("inblockelements")];
-    char uniname2ctype_pool_str1318[sizeof("modifierletter")];
-    char uniname2ctype_pool_str1321[sizeof("indingbats")];
-    char uniname2ctype_pool_str1322[sizeof("dep")];
-    char uniname2ctype_pool_str1324[sizeof("punct")];
-    char uniname2ctype_pool_str1327[sizeof("inhanunoo")];
-    char uniname2ctype_pool_str1334[sizeof("bidic")];
-    char uniname2ctype_pool_str1344[sizeof("ingreekextended")];
-    char uniname2ctype_pool_str1353[sizeof("idsb")];
-    char uniname2ctype_pool_str1359[sizeof("assigned")];
-    char uniname2ctype_pool_str1364[sizeof("otherpunctuation")];
-    char uniname2ctype_pool_str1368[sizeof("inhangulsyllables")];
-    char uniname2ctype_pool_str1373[sizeof("inarabicmathematicalalphabeticsymbols")];
-    char uniname2ctype_pool_str1385[sizeof("inornamentaldingbats")];
-    char uniname2ctype_pool_str1387[sizeof("inphagspa")];
-    char uniname2ctype_pool_str1389[sizeof("lyci")];
-    char uniname2ctype_pool_str1393[sizeof("mlym")];
-    char uniname2ctype_pool_str1399[sizeof("inarabicextendeda")];
-    char uniname2ctype_pool_str1400[sizeof("rjng")];
-    char uniname2ctype_pool_str1402[sizeof("lycian")];
-    char uniname2ctype_pool_str1403[sizeof("inalchemicalsymbols")];
-    char uniname2ctype_pool_str1409[sizeof("xdigit")];
-    char uniname2ctype_pool_str1412[sizeof("digit")];
-    char uniname2ctype_pool_str1420[sizeof("xidstart")];
-    char uniname2ctype_pool_str1421[sizeof("inrejang")];
-    char uniname2ctype_pool_str1424[sizeof("malayalam")];
-    char uniname2ctype_pool_str1425[sizeof("idstrinaryoperator")];
-    char uniname2ctype_pool_str1429[sizeof("invai")];
-    char uniname2ctype_pool_str1435[sizeof("vai")];
-    char uniname2ctype_pool_str1436[sizeof("vaii")];
-    char uniname2ctype_pool_str1438[sizeof("hiragana")];
-    char uniname2ctype_pool_str1442[sizeof("ingeorgian")];
-    char uniname2ctype_pool_str1448[sizeof("braille")];
-    char uniname2ctype_pool_str1455[sizeof("geor")];
-    char uniname2ctype_pool_str1457[sizeof("brah")];
-    char uniname2ctype_pool_str1463[sizeof("glagolitic")];
-    char uniname2ctype_pool_str1465[sizeof("inkannada")];
-    char uniname2ctype_pool_str1466[sizeof("cakm")];
-    char uniname2ctype_pool_str1467[sizeof("kana")];
-    char uniname2ctype_pool_str1469[sizeof("hebr")];
-    char uniname2ctype_pool_str1471[sizeof("inshavian")];
-    char uniname2ctype_pool_str1477[sizeof("vs")];
-    char uniname2ctype_pool_str1481[sizeof("inchakma")];
-    char uniname2ctype_pool_str1490[sizeof("ogham")];
-    char uniname2ctype_pool_str1491[sizeof("sylotinagri")];
-    char uniname2ctype_pool_str1492[sizeof("inunifiedcanadianaboriginalsyllabicsextended")];
-    char uniname2ctype_pool_str1495[sizeof("inmeroitichieroglyphs")];
-    char uniname2ctype_pool_str1498[sizeof("grantha")];
-    char uniname2ctype_pool_str1500[sizeof("graphemebase")];
-    char uniname2ctype_pool_str1502[sizeof("mathsymbol")];
-    char uniname2ctype_pool_str1505[sizeof("mymr")];
-    char uniname2ctype_pool_str1513[sizeof("insupplementaryprivateuseareaa")];
-    char uniname2ctype_pool_str1514[sizeof("mendekikakui")];
-    char uniname2ctype_pool_str1516[sizeof("incjkcompatibilityforms")];
-    char uniname2ctype_pool_str1518[sizeof("inhalfwidthandfullwidthforms")];
-    char uniname2ctype_pool_str1521[sizeof("incjkcompatibilityideographs")];
-    char uniname2ctype_pool_str1522[sizeof("inkaithi")];
-    char uniname2ctype_pool_str1525[sizeof("avst")];
-    char uniname2ctype_pool_str1526[sizeof("inarabicsupplement")];
-    char uniname2ctype_pool_str1527[sizeof("takri")];
-    char uniname2ctype_pool_str1529[sizeof("syrc")];
-    char uniname2ctype_pool_str1533[sizeof("meeteimayek")];
-    char uniname2ctype_pool_str1534[sizeof("myanmar")];
-    char uniname2ctype_pool_str1535[sizeof("avestan")];
-    char uniname2ctype_pool_str1536[sizeof("inhanguljamoextendeda")];
-    char uniname2ctype_pool_str1540[sizeof("goth")];
-    char uniname2ctype_pool_str1542[sizeof("inkatakana")];
-    char uniname2ctype_pool_str1544[sizeof("incyrillicextendeda")];
-    char uniname2ctype_pool_str1549[sizeof("alphabetic")];
-    char uniname2ctype_pool_str1550[sizeof("syriac")];
-    char uniname2ctype_pool_str1551[sizeof("ideographic")];
-    char uniname2ctype_pool_str1555[sizeof("incjkstrokes")];
-    char uniname2ctype_pool_str1557[sizeof("inlinearbsyllabary")];
-    char uniname2ctype_pool_str1558[sizeof("tavt")];
-    char uniname2ctype_pool_str1559[sizeof("intaiviet")];
-    char uniname2ctype_pool_str1564[sizeof("incjkcompatibilityideographssupplement")];
-    char uniname2ctype_pool_str1576[sizeof("inmeeteimayek")];
-    char uniname2ctype_pool_str1577[sizeof("kali")];
-    char uniname2ctype_pool_str1581[sizeof("inyiradicals")];
-    char uniname2ctype_pool_str1586[sizeof("lu")];
-    char uniname2ctype_pool_str1587[sizeof("inoriya")];
-    char uniname2ctype_pool_str1590[sizeof("hebrew")];
-    char uniname2ctype_pool_str1596[sizeof("extender")];
-    char uniname2ctype_pool_str1598[sizeof("inhighprivateusesurrogates")];
-    char uniname2ctype_pool_str1600[sizeof("limbu")];
-    char uniname2ctype_pool_str1606[sizeof("inbuhid")];
-    char uniname2ctype_pool_str1608[sizeof("inethiopicextendeda")];
-    char uniname2ctype_pool_str1609[sizeof("xidcontinue")];
-    char uniname2ctype_pool_str1611[sizeof("inyijinghexagramsymbols")];
-    char uniname2ctype_pool_str1612[sizeof("logicalorderexception")];
-    char uniname2ctype_pool_str1616[sizeof("inhebrew")];
-    char uniname2ctype_pool_str1617[sizeof("cyrl")];
-    char uniname2ctype_pool_str1618[sizeof("osmanya")];
-    char uniname2ctype_pool_str1621[sizeof("phnx")];
-    char uniname2ctype_pool_str1622[sizeof("incombiningdiacriticalmarks")];
-    char uniname2ctype_pool_str1626[sizeof("inkanasupplement")];
-    char uniname2ctype_pool_str1627[sizeof("inlisu")];
-    char uniname2ctype_pool_str1628[sizeof("changeswhencasemapped")];
-    char uniname2ctype_pool_str1632[sizeof("incombiningdiacriticalmarksforsymbols")];
-    char uniname2ctype_pool_str1636[sizeof("cwu")];
-    char uniname2ctype_pool_str1641[sizeof("phag")];
-    char uniname2ctype_pool_str1645[sizeof("insmallformvariants")];
-    char uniname2ctype_pool_str1656[sizeof("inpahawhhmong")];
-    char uniname2ctype_pool_str1661[sizeof("otheruppercase")];
-    char uniname2ctype_pool_str1662[sizeof("intelugu")];
-    char uniname2ctype_pool_str1665[sizeof("incombiningdiacriticalmarkssupplement")];
-    char uniname2ctype_pool_str1670[sizeof("ingeometricshapesextended")];
-    char uniname2ctype_pool_str1671[sizeof("xpeo")];
-    char uniname2ctype_pool_str1687[sizeof("bamu")];
-    char uniname2ctype_pool_str1689[sizeof("inbamum")];
-    char uniname2ctype_pool_str1692[sizeof("mark")];
-    char uniname2ctype_pool_str1694[sizeof("dupl")];
-    char uniname2ctype_pool_str1695[sizeof("graph")];
-    char uniname2ctype_pool_str1696[sizeof("dashpunctuation")];
-    char uniname2ctype_pool_str1700[sizeof("patternsyntax")];
-    char uniname2ctype_pool_str1705[sizeof("changeswhentitlecased")];
-    char uniname2ctype_pool_str1706[sizeof("inkharoshthi")];
-    char uniname2ctype_pool_str1712[sizeof("inkhmer")];
-    char uniname2ctype_pool_str1713[sizeof("java")];
-    char uniname2ctype_pool_str1714[sizeof("sylo")];
-    char uniname2ctype_pool_str1719[sizeof("ugaritic")];
-    char uniname2ctype_pool_str1722[sizeof("otherdefaultignorablecodepoint")];
-    char uniname2ctype_pool_str1723[sizeof("softdotted")];
-    char uniname2ctype_pool_str1729[sizeof("uideo")];
-    char uniname2ctype_pool_str1732[sizeof("inphoneticextensions")];
-    char uniname2ctype_pool_str1736[sizeof("injavanese")];
-    char uniname2ctype_pool_str1742[sizeof("invariationselectors")];
-    char uniname2ctype_pool_str1744[sizeof("kaithi")];
-    char uniname2ctype_pool_str1747[sizeof("cyrillic")];
-    char uniname2ctype_pool_str1749[sizeof("intakri")];
-    char uniname2ctype_pool_str1750[sizeof("takr")];
-    char uniname2ctype_pool_str1755[sizeof("javanese")];
-    char uniname2ctype_pool_str1757[sizeof("bidicontrol")];
-    char uniname2ctype_pool_str1758[sizeof("caucasianalbanian")];
-    char uniname2ctype_pool_str1765[sizeof("lydi")];
-    char uniname2ctype_pool_str1772[sizeof("insupplementalpunctuation")];
-    char uniname2ctype_pool_str1775[sizeof("inphoneticextensionssupplement")];
-    char uniname2ctype_pool_str1778[sizeof("lydian")];
-    char uniname2ctype_pool_str1784[sizeof("oldturkic")];
-    char uniname2ctype_pool_str1785[sizeof("invariationselectorssupplement")];
-    char uniname2ctype_pool_str1786[sizeof("kthi")];
-    char uniname2ctype_pool_str1792[sizeof("inhanguljamo")];
-    char uniname2ctype_pool_str1797[sizeof("patsyn")];
-    char uniname2ctype_pool_str1802[sizeof("inlimbu")];
-    char uniname2ctype_pool_str1804[sizeof("sorasompeng")];
-    char uniname2ctype_pool_str1807[sizeof("orya")];
-    char uniname2ctype_pool_str1822[sizeof("inkhmersymbols")];
-    char uniname2ctype_pool_str1824[sizeof("inglagolitic")];
-    char uniname2ctype_pool_str1831[sizeof("indevanagari")];
-    char uniname2ctype_pool_str1835[sizeof("deva")];
-    char uniname2ctype_pool_str1836[sizeof("knda")];
-    char uniname2ctype_pool_str1841[sizeof("inbengali")];
-    char uniname2ctype_pool_str1843[sizeof("symbol")];
-    char uniname2ctype_pool_str1846[sizeof("devanagari")];
-    char uniname2ctype_pool_str1849[sizeof("inmendekikakui")];
-    char uniname2ctype_pool_str1852[sizeof("beng")];
-    char uniname2ctype_pool_str1853[sizeof("invedicextensions")];
-    char uniname2ctype_pool_str1859[sizeof("graphemeextend")];
-    char uniname2ctype_pool_str1865[sizeof("kannada")];
-    char uniname2ctype_pool_str1866[sizeof("inbuginese")];
-    char uniname2ctype_pool_str1869[sizeof("olck")];
-    char uniname2ctype_pool_str1871[sizeof("meroitichieroglyphs")];
-    char uniname2ctype_pool_str1872[sizeof("ugar")];
-    char uniname2ctype_pool_str1874[sizeof("intagalog")];
-    char uniname2ctype_pool_str1878[sizeof("inbamumsupplement")];
-    char uniname2ctype_pool_str1880[sizeof("olchiki")];
-    char uniname2ctype_pool_str1899[sizeof("incurrencysymbols")];
-    char uniname2ctype_pool_str1904[sizeof("tagb")];
-    char uniname2ctype_pool_str1912[sizeof("inaegeannumbers")];
-    char uniname2ctype_pool_str1915[sizeof("intagbanwa")];
-    char uniname2ctype_pool_str1916[sizeof("uppercase")];
-    char uniname2ctype_pool_str1917[sizeof("defaultignorablecodepoint")];
-    char uniname2ctype_pool_str1919[sizeof("glag")];
-    char uniname2ctype_pool_str1921[sizeof("inkatakanaphoneticextensions")];
-    char uniname2ctype_pool_str1932[sizeof("changeswhencasefolded")];
-    char uniname2ctype_pool_str1942[sizeof("inpaucinhau")];
-    char uniname2ctype_pool_str1943[sizeof("inprivateusearea")];
-    char uniname2ctype_pool_str1947[sizeof("paucinhau")];
-    char uniname2ctype_pool_str1953[sizeof("spacingmark")];
-    char uniname2ctype_pool_str1956[sizeof("khmr")];
-    char uniname2ctype_pool_str1962[sizeof("khar")];
-    char uniname2ctype_pool_str1964[sizeof("inarabicpresentationformsb")];
-    char uniname2ctype_pool_str1967[sizeof("changeswhenlowercased")];
-    char uniname2ctype_pool_str1971[sizeof("tglg")];
-    char uniname2ctype_pool_str1976[sizeof("inethiopicextended")];
-    char uniname2ctype_pool_str1980[sizeof("incombiningdiacriticalmarksextended")];
-    char uniname2ctype_pool_str1986[sizeof("oupper")];
-    char uniname2ctype_pool_str1994[sizeof("incjksymbolsandpunctuation")];
-    char uniname2ctype_pool_str1997[sizeof("bopo")];
-    char uniname2ctype_pool_str1998[sizeof("punctuation")];
-    char uniname2ctype_pool_str2002[sizeof("combiningmark")];
-    char uniname2ctype_pool_str2007[sizeof("inplayingcards")];
-    char uniname2ctype_pool_str2008[sizeof("inbopomofo")];
-    char uniname2ctype_pool_str2021[sizeof("hyphen")];
-    char uniname2ctype_pool_str2028[sizeof("inkhojki")];
-    char uniname2ctype_pool_str2046[sizeof("nko")];
-    char uniname2ctype_pool_str2047[sizeof("nkoo")];
-    char uniname2ctype_pool_str2048[sizeof("enclosingmark")];
-    char uniname2ctype_pool_str2053[sizeof("openpunctuation")];
-    char uniname2ctype_pool_str2061[sizeof("currencysymbol")];
-    char uniname2ctype_pool_str2063[sizeof("inverticalforms")];
-    char uniname2ctype_pool_str2071[sizeof("hex")];
-    char uniname2ctype_pool_str2072[sizeof("modifiersymbol")];
-    char uniname2ctype_pool_str2073[sizeof("inlatinextendedb")];
-    char uniname2ctype_pool_str2075[sizeof("kharoshthi")];
-    char uniname2ctype_pool_str2080[sizeof("cherokee")];
-    char uniname2ctype_pool_str2088[sizeof("pahawhhmong")];
-    char uniname2ctype_pool_str2096[sizeof("cypriot")];
-    char uniname2ctype_pool_str2105[sizeof("incypriotsyllabary")];
-    char uniname2ctype_pool_str2110[sizeof("palmyrene")];
-    char uniname2ctype_pool_str2113[sizeof("upper")];
-    char uniname2ctype_pool_str2116[sizeof("aghb")];
-    char uniname2ctype_pool_str2123[sizeof("georgian")];
-    char uniname2ctype_pool_str2131[sizeof("gujr")];
-    char uniname2ctype_pool_str2142[sizeof("grbase")];
-    char uniname2ctype_pool_str2152[sizeof("gujarati")];
-    char uniname2ctype_pool_str2153[sizeof("hexdigit")];
-    char uniname2ctype_pool_str2189[sizeof("khmer")];
-    char uniname2ctype_pool_str2194[sizeof("uppercaseletter")];
-    char uniname2ctype_pool_str2198[sizeof("insupplementalarrowsb")];
-    char uniname2ctype_pool_str2224[sizeof("surrogate")];
-    char uniname2ctype_pool_str2227[sizeof("unifiedideograph")];
-    char uniname2ctype_pool_str2237[sizeof("nonspacingmark")];
-    char uniname2ctype_pool_str2241[sizeof("othergraphemeextend")];
-    char uniname2ctype_pool_str2242[sizeof("indevanagariextended")];
-    char uniname2ctype_pool_str2252[sizeof("orkh")];
-    char uniname2ctype_pool_str2273[sizeof("ingeorgiansupplement")];
-    char uniname2ctype_pool_str2287[sizeof("oldnortharabian")];
-    char uniname2ctype_pool_str2290[sizeof("tagalog")];
-    char uniname2ctype_pool_str2292[sizeof("khoj")];
-    char uniname2ctype_pool_str2311[sizeof("bopomofo")];
-    char uniname2ctype_pool_str2318[sizeof("rejang")];
-    char uniname2ctype_pool_str2326[sizeof("buhd")];
-    char uniname2ctype_pool_str2343[sizeof("incjkradicalssupplement")];
-    char uniname2ctype_pool_str2382[sizeof("inkanbun")];
-    char uniname2ctype_pool_str2406[sizeof("variationselector")];
-    char uniname2ctype_pool_str2417[sizeof("inkangxiradicals")];
-    char uniname2ctype_pool_str2421[sizeof("inhighsurrogates")];
-    char uniname2ctype_pool_str2431[sizeof("insupplementaryprivateuseareab")];
-    char uniname2ctype_pool_str2445[sizeof("ogrext")];
-    char uniname2ctype_pool_str2449[sizeof("batk")];
-    char uniname2ctype_pool_str2454[sizeof("inhanguljamoextendedb")];
-    char uniname2ctype_pool_str2457[sizeof("inbatak")];
-    char uniname2ctype_pool_str2462[sizeof("incyrillicextendedb")];
-    char uniname2ctype_pool_str2502[sizeof("innoblock")];
-    char uniname2ctype_pool_str2527[sizeof("any")];
-    char uniname2ctype_pool_str2534[sizeof("xsux")];
-    char uniname2ctype_pool_str2562[sizeof("bugi")];
-    char uniname2ctype_pool_str2570[sizeof("inkhudawadi")];
-    char uniname2ctype_pool_str2571[sizeof("telugu")];
-    char uniname2ctype_pool_str2579[sizeof("changeswhenuppercased")];
-    char uniname2ctype_pool_str2588[sizeof("grek")];
-    char uniname2ctype_pool_str2591[sizeof("guru")];
-    char uniname2ctype_pool_str2595[sizeof("paragraphseparator")];
-    char uniname2ctype_pool_str2613[sizeof("buginese")];
-    char uniname2ctype_pool_str2617[sizeof("inyisyllables")];
-    char uniname2ctype_pool_str2631[sizeof("egyp")];
-    char uniname2ctype_pool_str2634[sizeof("khudawadi")];
-    char uniname2ctype_pool_str2643[sizeof("unknown")];
-    char uniname2ctype_pool_str2685[sizeof("bassavah")];
-    char uniname2ctype_pool_str2689[sizeof("inegyptianhieroglyphs")];
-    char uniname2ctype_pool_str2709[sizeof("buhid")];
-    char uniname2ctype_pool_str2722[sizeof("inkayahli")];
-    char uniname2ctype_pool_str2732[sizeof("inmeroiticcursive")];
-    char uniname2ctype_pool_str2734[sizeof("incjkcompatibility")];
-    char uniname2ctype_pool_str2787[sizeof("oldsoutharabian")];
-    char uniname2ctype_pool_str2795[sizeof("quotationmark")];
-    char uniname2ctype_pool_str2889[sizeof("inhangulcompatibilityjamo")];
-    char uniname2ctype_pool_str2898[sizeof("qmark")];
-    char uniname2ctype_pool_str2902[sizeof("incjkunifiedideographsextensionc")];
-    char uniname2ctype_pool_str2906[sizeof("sk")];
-    char uniname2ctype_pool_str2909[sizeof("incjkunifiedideographsextensiona")];
-    char uniname2ctype_pool_str2918[sizeof("incjkunifiedideographs")];
-    char uniname2ctype_pool_str2984[sizeof("katakana")];
-    char uniname2ctype_pool_str3112[sizeof("kayahli")];
-    char uniname2ctype_pool_str3137[sizeof("duployan")];
-    char uniname2ctype_pool_str3278[sizeof("incjkunifiedideographsextensiond")];
-    char uniname2ctype_pool_str3360[sizeof("inbopomofoextended")];
-    char uniname2ctype_pool_str3466[sizeof("khojki")];
-    char uniname2ctype_pool_str3777[sizeof("zyyy")];
-    char uniname2ctype_pool_str3778[sizeof("egyptianhieroglyphs")];
-    char uniname2ctype_pool_str3827[sizeof("incjkunifiedideographsextensionb")];
-    char uniname2ctype_pool_str3886[sizeof("batak")];
-    char uniname2ctype_pool_str3941[sizeof("blank")];
-    char uniname2ctype_pool_str3995[sizeof("inboxdrawing")];
-    char uniname2ctype_pool_str4025[sizeof("greek")];
-    char uniname2ctype_pool_str4035[sizeof("gurmukhi")];
-    char uniname2ctype_pool_str4122[sizeof("grlink")];
-    char uniname2ctype_pool_str4322[sizeof("graphemelink")];
-#endif /* USE_UNICODE_PROPERTIES */
-  };
-static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
-  {
-#ifndef USE_UNICODE_PROPERTIES
-    "word",
-    "print",
-    "punct",
-    "alpha",
-    "alnum",
-    "xdigit",
-    "upper",
-#else /* USE_UNICODE_PROPERTIES */
-    "n",
-    "cn",
-    "mn",
-    "c",
-    "m",
-    "ci",
-    "z",
-    "cc",
-    "mc",
-    "mani",
-    "inmanichaean",
-    "qaai",
-    "zzzz",
-    "qaac",
-    "incham",
-    "sc",
-    "sm",
-    "mandaic",
-    "incuneiform",
-    "cans",
-    "me",
-    "inarmenian",
-#endif /* USE_UNICODE_PROPERTIES */
-    "ascii",
-#ifdef USE_UNICODE_PROPERTIES
-    "s",
-    "insamaritan",
-    "cs",
-    "zs",
-    "inavestan",
-    "incommonindicnumberforms",
-    "incuneiformnumbersandpunctuation",
-    "inthai",
-    "inipaextensions",
-    "mtei",
-    "inspecials",
-    "initialpunctuation",
-    "inancientsymbols",
-    "inthaana",
-    "inmiscellaneousmathematicalsymbolsa",
-    "lc",
-    "inmusicalsymbols",
-    "lm",
-    "taile",
-    "sterm",
-    "lina",
-    "inlycian",
-    "inmyanmarextendeda",
-    "lana",
-    "alnum",
-    "intaitham",
-    "incontrolpictures",
-    "inmiscellaneoussymbols",
-    "inmalayalam",
-    "intransportandmapsymbols",
-    "inmiscellaneoussymbolsandarrows",
-    "inlineara",
-    "inmiscellaneoussymbolsandpictographs",
-    "taiviet",
-    "cwcm",
-    "sinhala",
-    "latn",
-    "latin",
-    "ital",
-    "intamil",
-    "taml",
-    "inlatinextendedc",
-    "intaile",
-    "tale",
-    "inlatinextendeda",
-    "inlinearbideograms",
-    "newtailue",
-    "l",
-    "nl",
-    "inmeeteimayekextensions",
-    "zl",
-    "lt",
-    "inrunic",
-    "incarian",
-    "armn",
-    "cari",
-    "armi",
-    "inlatinextendede",
-    "incyrillic",
-    "armenian",
-    "inmyanmar",
-    "innewtailue",
-    "carian",
-    "merc",
-    "arabic",
-    "inmiscellaneoustechnical",
-    "insyriac",
-    "samr",
-    "zinh",
-    "han",
-    "samaritan",
-    "hani",
-    "cwt",
-    "incherokee",
-    "insharada",
-    "cham",
-    "manichaean",
-    "inmahajani",
-#endif /* USE_UNICODE_PROPERTIES */
-    "cntrl",
-#ifdef USE_UNICODE_PROPERTIES
-    "sinh",
-    "inruminumeralsymbols",
-    "inethiopic",
-    "tamil",
-    "miao",
-    "inenclosedalphanumerics",
-    "term",
-    "chakma",
-    "insinhala",
-    "shavian",
-    "inosmanya",
-    "inlatinextendedadditional",
-    "osma",
-    "ll",
-    "thai",
-    "math",
-    "thaa",
-    "inenclosedalphanumericsupplement",
-    "ethi",
-    "connectorpunctuation",
-    "inlowsurrogates",
-    "insinhalaarchaicnumbers",
-    "taitham",
-    "thaana",
-    "lineara",
-    "di",
-    "idc",
-    "meroiticcursive",
-    "mand",
-    "inmodi",
-    "inmandaic",
-    "cwl",
-    "asciihexdigit",
-    "dia",
-    "terminalpunctuation",
-    "mend",
-    "sind",
-    "wara",
-    "inwarangciti",
-    "inideographicdescriptioncharacters",
-    "inemoticons",
-    "ids",
-    "insundanese",
-    "pi",
-    "indominotiles",
-    "pc",
-    "loe",
-    "titlecaseletter",
-    "inopticalcharacterrecognition",
-    "idst",
-    "shaw",
-    "cwcf",
-    "idcontinue",
-    "inphaistosdisc",
-    "pe",
-    "indeseret",
-    "inspacingmodifierletters",
-    "inlydian",
-    "ps",
-    "hira",
-    "whitespace",
-    "inscriptionalparthian",
-    "cher",
-    "inmathematicalalphanumericsymbols",
-    "incoptic",
-    "inhiragana",
-    "inenclosedcjklettersandmonths",
-#endif /* USE_UNICODE_PROPERTIES */
-    "space",
-#ifdef USE_UNICODE_PROPERTIES
-    "oriya",
-    "mero",
-    "mahj",
-    "tirh",
-    "sora",
-    "inscriptionalpahlavi",
-    "inarrows",
-    "mahajani",
-    "joinc",
-    "incopticepactnumbers",
-    "hano",
-    "palm",
-    "intirhuta",
-    "patws",
-    "inolchiki",
-    "inlepcha",
-    "no",
-    "lepc",
-    "inogham",
-    "co",
-    "innko",
-    "alpha",
-    "psalterpahlavi",
-    "inmro",
-    "inpalmyrene",
-    "common",
-    "cf",
-    "inmiao",
-    "so",
-    "diacritic",
-    "insundanesesupplement",
-    "intifinagh",
-    "tifinagh",
-    "odi",
-    "oidc",
-    "modi",
-    "decimalnumber",
-    "letter",
-    "dash",
-    "insylotinagri",
-    "inolditalic",
-    "wspace",
-    "dsrt",
-    "ideo",
-    "siddham",
-    "perm",
-    "oids",
-    "inmahjongtiles",
-    "lo",
-    "lineseparator",
-    "imperialaramaic",
-    "idstart",
-    "inlao",
-    "sharada",
-    "lao",
-    "laoo",
-    "mongolian",
-    "oalpha",
-    "inimperialaramaic",
-    "nchar",
-    "inlatin1supplement",
-    "prti",
-    "cprt",
-    "nd",
-    "deseret",
-    "inoldturkic",
-    "radical",
-    "canadianaboriginal",
-    "inmodifiertoneletters",
-    "incaucasianalbanian",
-    "coptic",
-    "casedletter",
-    "sd",
-    "inphoenician",
-    "sidd",
-    "privateuse",
-    "sundanese",
-    "inancientgreekmusicalnotation",
-    "insiddham",
-    "cased",
-    "print",
-    "ininscriptionalparthian",
-    "ininscriptionalpahlavi",
-    "copt",
-    "inancientgreeknumbers",
-    "saurashtra",
-    "mro",
-    "mroo",
-    "inalphabeticpresentationforms",
-    "lowercase",
-    "phli",
-    "patternwhitespace",
-    "inenclosedideographicsupplement",
-    "spaceseparator",
-    "inmathematicaloperators",
-    "omath",
-    "lisu",
-    "inpsalterpahlavi",
-    "olditalic",
-    "hanunoo",
-    "inherited",
-    "lepcha",
-    "p",
-    "inmongolian",
-    "zp",
-    "finalpunctuation",
-    "otheridcontinue",
-    "shrd",
-    "ingrantha",
-    "talu",
-    "otheralphabetic",
-    "noncharactercodepoint",
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    "age=1.1",
-    "age=2.1",
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    "closepunctuation",
-    "letternumber",
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    "age=6.1",
-    "age=6.2",
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    "telu",
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    "age=3.1",
-    "age=3.2",
-    "age=5.1",
-    "age=5.2",
-    "age=2.0",
-    "age=6.3",
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    "inshorthandformatcontrols",
-    "inoldnortharabian",
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    "age=6.0",
-    "age=4.1",
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    "ingeneralpunctuation",
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    "age=3.0",
-    "age=7.0",
-    "age=5.0",
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    "innabataean",
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    "age=4.0",
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    "bamum",
-    "control",
-    "induployan",
-    "inlatinextendedd",
-    "inarabic",
-    "runic",
-    "inelbasan",
-    "inoldsoutharabian",
-    "inbasiclatin",
-    "format",
-    "innumberforms",
-    "inugaritic",
-    "separator",
-    "idsbinaryoperator",
-    "tagbanwa",
-    "bass",
-    "saur",
-    "nbat",
-    "intaixuanjingsymbols",
-    "joincontrol",
-    "otheridstart",
-    "inbyzantinemusicalsymbols",
-    "intags",
-    "nabataean",
-    "insuperscriptsandsubscripts",
-    "intibetan",
-    "insaurashtra",
-    "othersymbol",
-    "ext",
-    "inarabicpresentationformsa",
-    "inmiscellaneousmathematicalsymbolsb",
-    "otherlowercase",
-    "phoenician",
-#endif /* USE_UNICODE_PROPERTIES */
-    "lower",
-#ifndef USE_UNICODE_PROPERTIES
-    "graph",
-#else /* USE_UNICODE_PROPERTIES */
-    "linb",
-    "po",
-    "inmyanmarextendedb",
-    "limb",
-    "inbraillepatterns",
-    "tibt",
-    "cuneiform",
-    "bali",
-    "oldpersian",
-    "oldpermic",
-    "pf",
-    "word",
-    "tibetan",
-    "incyrillicsupplement",
-    "elba",
-    "insupplementalmathematicaloperators",
-    "inbalinese",
-    "bengali",
-    "caseignorable",
-    "incountingrodnumerals",
-    "other",
-    "tirhuta",
-    "othernumber",
-    "balinese",
-    "elbasan",
-    "inunifiedcanadianaboriginalsyllabics",
-    "lowercaseletter",
-    "ethiopic",
-    "gran",
-    "ingurmukhi",
-    "sund",
-    "inethiopicsupplement",
-    "inoldpersian",
-    "inoldpermic",
-    "othermath",
-    "unassigned",
-    "hmng",
-    "narb",
-    "brai",
-    "hang",
-    "insorasompeng",
-    "arab",
-    "plrd",
-    "ingujarati",
-    "brahmi",
-    "runr",
-    "ahex",
-    "mong",
-    "pauc",
-    "sarb",
-    "ogam",
-    "olower",
-    "pd",
-    "number",
-    "inbrahmi",
-    "otherletter",
-    "ingothic",
-    "phagspa",
-    "inletterlikesymbols",
-    "yi",
-    "hangul",
-    "yiii",
-    "tfng",
-    "insupplementalarrowsc",
-    "ingreekandcoptic",
-    "xidc",
-    "insupplementalarrowsa",
-    "gothic",
-    "grext",
-    "incombininghalfmarks",
-    "deprecated",
-    "inbassavah",
-    "xids",
-    "linearb",
-    "ingeometricshapes",
-    "phlp",
-    "warangciti",
-    "inblockelements",
-    "modifierletter",
-    "indingbats",
-    "dep",
-    "punct",
-    "inhanunoo",
-    "bidic",
-    "ingreekextended",
-    "idsb",
-    "assigned",
-    "otherpunctuation",
-    "inhangulsyllables",
-    "inarabicmathematicalalphabeticsymbols",
-    "inornamentaldingbats",
-    "inphagspa",
-    "lyci",
-    "mlym",
-    "inarabicextendeda",
-    "rjng",
-    "lycian",
-    "inalchemicalsymbols",
-    "xdigit",
-#endif /* USE_UNICODE_PROPERTIES */
-    "digit",
-#ifndef USE_UNICODE_PROPERTIES
-    "blank"
-#else /* USE_UNICODE_PROPERTIES */
-    "xidstart",
-    "inrejang",
-    "malayalam",
-    "idstrinaryoperator",
-    "invai",
-    "vai",
-    "vaii",
-    "hiragana",
-    "ingeorgian",
-    "braille",
-    "geor",
-    "brah",
-    "glagolitic",
-    "inkannada",
-    "cakm",
-    "kana",
-    "hebr",
-    "inshavian",
-    "vs",
-    "inchakma",
-    "ogham",
-    "sylotinagri",
-    "inunifiedcanadianaboriginalsyllabicsextended",
-    "inmeroitichieroglyphs",
-    "grantha",
-    "graphemebase",
-    "mathsymbol",
-    "mymr",
-    "insupplementaryprivateuseareaa",
-    "mendekikakui",
-    "incjkcompatibilityforms",
-    "inhalfwidthandfullwidthforms",
-    "incjkcompatibilityideographs",
-    "inkaithi",
-    "avst",
-    "inarabicsupplement",
-    "takri",
-    "syrc",
-    "meeteimayek",
-    "myanmar",
-    "avestan",
-    "inhanguljamoextendeda",
-    "goth",
-    "inkatakana",
-    "incyrillicextendeda",
-    "alphabetic",
-    "syriac",
-    "ideographic",
-    "incjkstrokes",
-    "inlinearbsyllabary",
-    "tavt",
-    "intaiviet",
-    "incjkcompatibilityideographssupplement",
-    "inmeeteimayek",
-    "kali",
-    "inyiradicals",
-    "lu",
-    "inoriya",
-    "hebrew",
-    "extender",
-    "inhighprivateusesurrogates",
-    "limbu",
-    "inbuhid",
-    "inethiopicextendeda",
-    "xidcontinue",
-    "inyijinghexagramsymbols",
-    "logicalorderexception",
-    "inhebrew",
-    "cyrl",
-    "osmanya",
-    "phnx",
-    "incombiningdiacriticalmarks",
-    "inkanasupplement",
-    "inlisu",
-    "changeswhencasemapped",
-    "incombiningdiacriticalmarksforsymbols",
-    "cwu",
-    "phag",
-    "insmallformvariants",
-    "inpahawhhmong",
-    "otheruppercase",
-    "intelugu",
-    "incombiningdiacriticalmarkssupplement",
-    "ingeometricshapesextended",
-    "xpeo",
-    "bamu",
-    "inbamum",
-    "mark",
-    "dupl",
-    "graph",
-    "dashpunctuation",
-    "patternsyntax",
-    "changeswhentitlecased",
-    "inkharoshthi",
-    "inkhmer",
-    "java",
-    "sylo",
-    "ugaritic",
-    "otherdefaultignorablecodepoint",
-    "softdotted",
-    "uideo",
-    "inphoneticextensions",
-    "injavanese",
-    "invariationselectors",
-    "kaithi",
-    "cyrillic",
-    "intakri",
-    "takr",
-    "javanese",
-    "bidicontrol",
-    "caucasianalbanian",
-    "lydi",
-    "insupplementalpunctuation",
-    "inphoneticextensionssupplement",
-    "lydian",
-    "oldturkic",
-    "invariationselectorssupplement",
-    "kthi",
-    "inhanguljamo",
-    "patsyn",
-    "inlimbu",
-    "sorasompeng",
-    "orya",
-    "inkhmersymbols",
-    "inglagolitic",
-    "indevanagari",
-    "deva",
-    "knda",
-    "inbengali",
-    "symbol",
-    "devanagari",
-    "inmendekikakui",
-    "beng",
-    "invedicextensions",
-    "graphemeextend",
-    "kannada",
-    "inbuginese",
-    "olck",
-    "meroitichieroglyphs",
-    "ugar",
-    "intagalog",
-    "inbamumsupplement",
-    "olchiki",
-    "incurrencysymbols",
-    "tagb",
-    "inaegeannumbers",
-    "intagbanwa",
-    "uppercase",
-    "defaultignorablecodepoint",
-    "glag",
-    "inkatakanaphoneticextensions",
-    "changeswhencasefolded",
-    "inpaucinhau",
-    "inprivateusearea",
-    "paucinhau",
-    "spacingmark",
-    "khmr",
-    "khar",
-    "inarabicpresentationformsb",
-    "changeswhenlowercased",
-    "tglg",
-    "inethiopicextended",
-    "incombiningdiacriticalmarksextended",
-    "oupper",
-    "incjksymbolsandpunctuation",
-    "bopo",
-    "punctuation",
-    "combiningmark",
-    "inplayingcards",
-    "inbopomofo",
-    "hyphen",
-    "inkhojki",
-    "nko",
-    "nkoo",
-    "enclosingmark",
-    "openpunctuation",
-    "currencysymbol",
-    "inverticalforms",
-    "hex",
-    "modifiersymbol",
-    "inlatinextendedb",
-    "kharoshthi",
-    "cherokee",
-    "pahawhhmong",
-    "cypriot",
-    "incypriotsyllabary",
-    "palmyrene",
-    "upper",
-    "aghb",
-    "georgian",
-    "gujr",
-    "grbase",
-    "gujarati",
-    "hexdigit",
-    "khmer",
-    "uppercaseletter",
-    "insupplementalarrowsb",
-    "surrogate",
-    "unifiedideograph",
-    "nonspacingmark",
-    "othergraphemeextend",
-    "indevanagariextended",
-    "orkh",
-    "ingeorgiansupplement",
-    "oldnortharabian",
-    "tagalog",
-    "khoj",
-    "bopomofo",
-    "rejang",
-    "buhd",
-    "incjkradicalssupplement",
-    "inkanbun",
-    "variationselector",
-    "inkangxiradicals",
-    "inhighsurrogates",
-    "insupplementaryprivateuseareab",
-    "ogrext",
-    "batk",
-    "inhanguljamoextendedb",
-    "inbatak",
-    "incyrillicextendedb",
-    "innoblock",
-    "any",
-    "xsux",
-    "bugi",
-    "inkhudawadi",
-    "telugu",
-    "changeswhenuppercased",
-    "grek",
-    "guru",
-    "paragraphseparator",
-    "buginese",
-    "inyisyllables",
-    "egyp",
-    "khudawadi",
-    "unknown",
-    "bassavah",
-    "inegyptianhieroglyphs",
-    "buhid",
-    "inkayahli",
-    "inmeroiticcursive",
-    "incjkcompatibility",
-    "oldsoutharabian",
-    "quotationmark",
-    "inhangulcompatibilityjamo",
-    "qmark",
-    "incjkunifiedideographsextensionc",
-    "sk",
-    "incjkunifiedideographsextensiona",
-    "incjkunifiedideographs",
-    "katakana",
-    "kayahli",
-    "duployan",
-    "incjkunifiedideographsextensiond",
-    "inbopomofoextended",
-    "khojki",
-    "zyyy",
-    "egyptianhieroglyphs",
-    "incjkunifiedideographsextensionb",
-    "batak",
-    "blank",
-    "inboxdrawing",
-    "greek",
-    "gurmukhi",
-    "grlink",
-    "graphemelink"
-#endif /* USE_UNICODE_PROPERTIES */
-  };
-#define uniname2ctype_pool ((const char *) &uniname2ctype_pool_contents)
-#ifdef __GNUC__
-__inline
-#ifdef __GNUC_STDC_INLINE__
-__attribute__ ((__gnu_inline__))
-#endif
-#endif
-const struct uniname2ctype_struct *
-uniname2ctype_p (str, len)
-     register const char *str;
-     register unsigned int len;
-{
-  static const struct uniname2ctype_struct wordlist[] =
-    {
-#ifdef USE_UNICODE_PROPERTIES
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3,                                        34},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str10,                                       20},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str11,                                       33},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str13,                                        17},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str15,                                        30},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str16,                                       60},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str17,                                        51},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str20,                                       18},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str21,                                       31},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str29,                                    185},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str31,                            438},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str35,                                    114},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str36,                                    231},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str37,                                    128},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str44,                                  383},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str46,                                       47},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str48,                                       49},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str51,                                 168},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str55,                             461},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str56,                                    101},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str59,                                       32},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str61,                              258},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str64,                                    14},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str65,                                        46},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str69,                             265},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str72,                                       22},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str74,                                       54},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str85,                               439},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str92,                374},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str96,        462},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str97,                                  278},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str98,                         252},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str105,                                    159},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str110,                              406},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str114,                       43},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str115,                        411},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str117,                                263},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str130,     333},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str134,                                       24},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str135,                        473},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str136,                                       26},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str137,                                   120},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str141,                                   227},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str142,                                    183},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str144,                                413},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str147,                      384},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str151,                                    151},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str153,                                    13},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str155,                               302},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str157,                       325},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str161,                  331},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str163,                             276},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str166,                488},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str170,         339},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str173,                               426},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str175,    485},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str183,                                 152},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str186,                                     65},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str190,                                  92},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str203,                                     75},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str205,                                    75},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str206,                                    111},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str208,                                 273},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str209,                                     88},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str223,                        341},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str226,                                 298},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str227,                                    120},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str237,                        250},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str239,                      408},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str240,                               129},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str241,                                        23},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str243,                                       36},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str247,                 386},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str250,                                       52},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str252,                                       28},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str255,                                 289},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str256,                                414},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str257,                                     78},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str259,                                    148},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str260,                                    160},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str261,                        388},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str263,                              256},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str266,                                 78},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str267,                               281},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str270,                             299},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str272,                                  148},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str274,                                    170},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str280,                                   80},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str284,                324},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str287,                                261},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str288,                                    155},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str294,                                    114},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str295,                                     109},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str298,                               155},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str299,                                    109},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str302,                                      63},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str303,                              286},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str304,                               450},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str307,                                    150},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str315,                              185},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str316,                              449},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str317,                                     3},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str318,                                     92},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str320,                    444},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str327,                              284},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str330,                                    88},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str331,                                    172},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str332,                 327},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str333,                                    205},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str335,                                  169},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str337,                               277},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str347,                                 123},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str350,                               423},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str353,               314},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str359,                                    124},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str362,                                       25},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str363,                                     93},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str366,                                     55},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str372,                                     82},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str374,        483},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str375,                                     99},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str376,                     39},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str380,                         394},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str382,                 451},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str386,                                 151},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str388,                                   82},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str390,                                 183},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str392,                                       70},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str401,                                      67},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str405,                         170},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str407,                                    168},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str408,                                  457},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str410,                               266},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str412,                                      61},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str414,                           208},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str415,                                     211},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str418,                     205},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str419,                                    186},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str423,                                    196},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str425,                                    198},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str433,                            459},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str439,      350},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str441,                             486},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str453,                                      66},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str456,                             305},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str466,                                       43},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str468,                           481},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str470,                                       39},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str476,                                     224},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str477,                          28},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str485,           326},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str487,                                    218},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str489,                                    123},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str490,                                     64},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str493,                               67},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str502,                          412},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str508,                                       41},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str518,                               421},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str519,                253},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str520,                                432},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str522,                                       45},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str530,                                    106},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str536,                              199},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str540,                   162},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str544,                                    100},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str545,       477},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str546,                                342},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str550,                              352},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str554,           360},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str556,                                     9},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str570,                                    87},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str571,                                    171},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str573,                                    184},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str582,                                    197},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str584,                                    174},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str587,                    163},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str593,                                322},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str594,                                184},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str596,                                   201},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str597,                    415},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str598,                                    116},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str600,                                    191},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str601,                               455},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str603,                                   229},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str604,                               308},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str608,                                307},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str609,                                       37},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str611,                                    141},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str612,                                 288},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str614,                                       21},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str617,                                   264},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str620,                                     1},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str622,                          194},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str623,                                   465},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str624,                             429},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str627,                                   74},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str630,                                       19},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str637,                                  468},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str640,                                       50},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str650,                               211},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str658,                   309},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str672,                              344},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str679,                                131},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str696,                                     221},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str699,                                    226},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str700,                                    187},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str703,                            35},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str705,                                   23},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str708,                                    202},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str709,                           373},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str711,                             416},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str713,                                  199},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str715,                                    113},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str718,                                    210},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str722,                                 195},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str724,                                    193},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str725,                                    225},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str727,                          480},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str728,                                       27},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str730,                            52},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str731,                         160},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str735,                                  66},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str736,                                   279},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str737,                                 173},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str742,                                      94},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str743,                                     94},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str744,                               105},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str745,                                  209},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str749,                       428},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str753,                                   215},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str758,                      249},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str761,                                    162},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str763,                                    125},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str767,                                       35},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str768,                                 113},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str772,                             443},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str773,                                 219},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str777,                      101},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str779,                   371},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str783,                     425},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str787,                                  128},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str796,                              24},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str798,                                      223},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str803,                            431},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str804,                                    195},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str805,                               21},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str813,                               140},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str815,           474},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str817,                               456},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str820,                                    59},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str827,                                     7},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str830,                 440},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str832,                  441},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str834,                                    128},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str838,                   410},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str845,                              144},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str848,                                     188},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str849,                                    188},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str850,           397},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str858,                                57},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str861,                                    163},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str864,                       229},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str866,         484},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str869,                           54},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str871,                 323},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str882,                                   206},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str892,                                    156},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str895,                        442},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str898,                               111},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str905,                                 116},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str909,                               114},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str910,                                  141},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str913,                                        38},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str916,                             295},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str922,                                       53},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str923,                         42},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str925,                         226},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str927,                                    173},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str932,                               454},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str934,                                    129},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str936,                         209},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str938,                   215},
-#ifndef USE_UNICODE_AGE_PROPERTIES
-      {-1}, {-1},
-#else /* USE_UNICODE_AGE_PROPERTIES */
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str939,                                 232},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str940,                                 234},
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str941,                         41},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str943,                             36},
-#ifndef USE_UNICODE_AGE_PROPERTIES
-      {-1}, {-1},
-#else /* USE_UNICODE_AGE_PROPERTIES */
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str944,                                 244},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str945,                                 245},
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str946,                                     89},
-#ifndef USE_UNICODE_AGE_PROPERTIES
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#else /* USE_UNICODE_AGE_PROPERTIES */
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str947,                                 236},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str948,                                 237},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str949,                                 241},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str950,                                 242},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str951,                                 233},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str952,                                 246},
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str953,               471},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str954,                       437},
-#ifndef USE_UNICODE_AGE_PROPERTIES
-      {-1}, {-1},
-#else /* USE_UNICODE_AGE_PROPERTIES */
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str955,                                 243},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str956,                                 239},
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str957,                    316},
-#ifndef USE_UNICODE_AGE_PROPERTIES
-      {-1}, {-1}, {-1}, {-1},
-#else /* USE_UNICODE_AGE_PROPERTIES */
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str958,                                 235},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str959,                                 247},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str960,                                 240},
-      {-1},
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str962,                             430},
-#ifndef USE_UNICODE_AGE_PROPERTIES
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#else /* USE_UNICODE_AGE_PROPERTIES */
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str967,                                 238},
-      {-1}, {-1},
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str970,                                   157},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str972,                                  18},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str974,                              470},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str975,                        372},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str976,                                260},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str982,                                   103},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str984,                               424},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str985,                       436},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str986,                            248},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str995,                                   19},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str996,                           321},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str998,                              419},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str999,                                51},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1000,                       217},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1004,                                118},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1012,                                    177},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1013,                                    144},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1014,                                    190},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1017,                    475},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1019,                             201},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1023,                            225},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1027,               472},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1031,                                  496},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1033,                               190},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1034,             317},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1036,                               280},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1039,                            376},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1040,                              50},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1041,                                     212},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1046,              398},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1048,     337},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1049,                          213},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1052,                              137},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1055,                                     6},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1060,                                    121},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1064,                                       44},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1065,                      382},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1066,                                    119},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1068,                       335},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1069,                                     95},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1070,                               136},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1072,                                    135},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1073,                              133},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1077,                               193},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1080,                                       42},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1084,                                     12},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1086,                                  95},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1089,                    257},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1093,                                    179},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1094,     338},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1095,                              304},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1101,                                  84},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1104,                            60},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1107,                   476},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1114,                                    17},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1118,                                 197},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1121,                              37},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1123,                                135},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1129,                                 179},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1134,    287},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1136,                          25},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1140,                                 99},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1141,                                    180},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1149,                              270},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1151,                                    140},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1153,                    285},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1160,                            420},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1163,                             418},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1170,                               206},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1174,                               20},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1180,                                    181},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1181,                                    189},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1184,                                    126},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1186,                                     98},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1187,                           447},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1193,                                     80},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1194,                                    172},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1195,                              271},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1197,                                  167},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1201,                                    103},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1202,                                    208},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1206,                                    105},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1211,                                    192},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1212,                                    161},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1218,                                    102},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1221,                                  213},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1222,                                       40},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1235,                                   34},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1238,                                445},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1240,                              27},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1252,                                417},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1254,                                 138},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1262,                     320},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1265,                                      110},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1269,                                   98},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1271,                                    110},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1272,                                    131},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1273,                   491},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1277,                        255},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1279,                                     69},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1280,                   334},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1281,                                  112},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1283,                                    71},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1285,                    401},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1286,                              222},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1287,                              466},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1305,                                     68},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1308,                                 121},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1312,                       330},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1313,                                    194},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1314,                              198},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1317,                         329},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1318,                           26},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1321,                              332},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1322,                                     222},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1324,                                     8},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1327,                               291},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1334,                                   200},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1344,                         315},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1353,                                    217},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1359,                                 16},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1364,                         44},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1368,                       390},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1373,   479},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1385,                    487},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1387,                               375},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1389,                                    147},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1393,                                     91},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1399,                       267},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1400,                                    146},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1402,                                  147},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1403,                     489},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1409,                                   11},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1412,                                     4},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1420,                                 68},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1421,                                379},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1424,                                91},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1425,                      218},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1429,                                   368},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1435,                                     143},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1436,                                    143},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1438,                                106},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1442,                              282},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1448,                                 126},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1455,                                     97},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1457,                                    167},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1463,                              130},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1465,                               275},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1466,                                    169},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1467,                                    107},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1469,                                     79},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1471,                               422},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1477,                                      228},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1481,                                448},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1490,                                   102},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1491,                             132},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1492, 296},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1495,                   433},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1498,                                 180},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1500,                             72},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1502,                               49},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1505,                                     96},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1513,          498},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1514,                            186},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1516,                 402},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1518,            405},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1521,            396},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1522,                                446},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1525,                                    153},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1526,                      262},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1527,                                   175},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1529,                                     81},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1533,                             159},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1534,                                  96},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1535,                                 153},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1536,                   380},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1540,                                    112},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1542,                              353},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1544,                     346},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1549,                               56},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1550,                                   81},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1551,                             210},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1555,                            358},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1557,                      407},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1558,                                    152},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1559,                               385},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1564,  495},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1576,                           389},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1577,                                    145},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1581,                            366},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1586,                                       29},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1587,                                 272},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1590,                                   79},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1596,                                212},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1598,              393},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1600,                                   119},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1606,                                 292},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1608,                     387},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1609,                              69},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1611,                 363},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1612,                   224},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1616,                                259},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1617,                                     77},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1618,                                 124},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1621,                                    137},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1622,             254},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1626,                        469},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1627,                                  367},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1628,                    65},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1632,   319},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1636,                                      62},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1641,                                    138},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1645,                     403},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1656,                           467},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1661,                          214},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1662,                                274},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1665,   313},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1670,               490},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1671,                                    133},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1687,                                    157},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1689,                                 370},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1692,                                     30},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1694,                                    178},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1695,                                     5},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1696,                          40},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1700,                           230},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1705,                    63},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1706,                            435},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1712,                                 294},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1713,                                    158},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1714,                                    132},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1719,                                122},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1722,          221},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1723,                              223},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1729,                                   220},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1732,                    311},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1736,                              381},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1742,                    399},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1744,                                  165},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1747,                                 77},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1749,                                 458},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1750,                                    175},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1755,                                158},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1757,                             200},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1758,                       176},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1765,                                    149},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1772,               347},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1775,          312},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1778,                                  149},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1784,                               164},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1785,          497},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1786,                                    165},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1792,                            283},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1797,                                  230},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1802,                                 297},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1804,                             174},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1807,                                     87},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1822,                          300},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1824,                            340},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1831,                            268},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1835,                                     83},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1836,                                     90},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1841,                               269},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1843,                                   46},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1846,                               83},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1849,                          478},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1852,                                     84},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1853,                       310},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1859,                           71},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1865,                                  90},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1866,                              301},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1869,                                    142},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1871,                     171},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1872,                                    122},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1874,                               290},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1878,                       464},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1880,                                 142},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1899,                       318},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1904,                                    118},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1912,                         409},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1915,                              293},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1916,                                58},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1917,                70},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1919,                                    130},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1921,            359},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1932,                    64},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1942,                             460},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1943,                        395},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1947,                               192},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1953,                              31},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1956,                                    104},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1962,                                    134},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1964,              404},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1967,                    61},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1971,                                    115},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1976,                      345},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1980,     303},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1986,                                  214},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1994,              351},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1997,                                    108},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1998,                              38},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2002,                            30},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2007,                          482},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2008,                              354},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2021,                                  203},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2028,                                452},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2046,                                     139},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2047,                                    139},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2048,                            32},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2053,                          45},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2061,                           47},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2063,                         400},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2071,                                     207},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2072,                           48},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2073,                        251},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2075,                              134},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2080,                                100},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2088,                             181},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2096,                                 125},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2105,                      427},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2110,                               191},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2113,                                    10},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2116,                                    176},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2123,                                 97},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2131,                                     86},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2142,                                   72},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2152,                                 86},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2153,                                207},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2189,                                   104},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2194,                          29},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2198,                   336},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2224,                                22},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2227,                        220},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2237,                           33},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2241,                     216},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2242,                    377},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2252,                                    164},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2273,                    343},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2287,                         189},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2290,                                 115},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2292,                                    182},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2311,                                108},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2318,                                  146},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2326,                                    117},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2343,                 348},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2382,                                356},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2406,                       228},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2417,                        349},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2421,                        392},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2431,          499},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2445,                                  216},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2449,                                    166},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2454,                   391},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2457,                                 306},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2462,                     369},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2502,                               500},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2527,                                      15},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2534,                                    136},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2562,                                    127},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2570,                             453},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2571,                                   89},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2579,                    62},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2588,                                     76},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2591,                                     85},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2595,                       53},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2613,                                127},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2617,                           365},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2631,                                    154},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2634,                               196},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2643,                                 231},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2685,                                177},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2689,                   463},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2709,                                   117},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2722,                               378},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2732,                       434},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2734,                      361},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2787,                         161},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2795,                           204},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2889,               355},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2898,                                   204},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2902,        493},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2906,                                       48},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2909,        362},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2918,                  364},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2984,                                107},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3112,                                 145},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3137,                                178},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3278,        494},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3360,                      357},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#endif /* USE_UNICODE_PROPERTIES */
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#ifndef USE_UNICODE_PROPERTIES
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str6,                                     12},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str7,                                     7},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str8,                                     8},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str9,                                     1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str10,                                    13},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str11,                                   11},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str12,                                    10},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str13,                                    14},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str14,                                     3},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str15,                                     9},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str16,                                     6},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str17,                                     5},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str18,                                     4},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str19,                                     2}
-#else /* USE_UNICODE_PROPERTIES */
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3466,                                  182},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3777,                                     74},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3778,                     154},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3827,        492},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3886,                                   166},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3941,                                     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},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3995,                            328},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str4025,                                    76},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str4035,                                 85},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str4122,                                   73},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str4322,                             73}
-#endif /* USE_UNICODE_PROPERTIES */
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = uniname2ctype_hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        {
-          register int o = wordlist[key].name;
-          if (o >= 0)
-            {
-              register const char *s = o + uniname2ctype_pool;
-
-              if (*str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0')
-                return &wordlist[key];
-            }
-        }
-    }
-  return 0;
-}
-
-static int
-uniname2ctype(const UChar *name, unsigned int len)
-{
-  const struct uniname2ctype_struct *p = uniname2ctype_p((const char *)name, len);
-  if (p) return p->ctype;
-  return -1;
-}
diff --git a/enc/unicode/name2ctype.kwd b/enc/unicode/name2ctype.kwd
deleted file mode 100644
index ff94d68b3b..0000000000
--- a/enc/unicode/name2ctype.kwd
+++ /dev/null
@@ -1,26550 +0,0 @@
-%{
-#define long size_t
-
-/* 'NEWLINE': [[:NEWLINE:]] */
-static const OnigCodePoint CR_NEWLINE[] = {
-	1,
-	0x000a, 0x000a,
-}; /* CR_NEWLINE */
-
-/* 'Alpha': [[:Alpha:]] */
-static const OnigCodePoint CR_Alpha[] = {
-	540,
-	0x0041, 0x005a,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00b5, 0x00b5,
-	0x00ba, 0x00ba,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x02c1,
-	0x02c6, 0x02d1,
-	0x02e0, 0x02e4,
-	0x02ec, 0x02ec,
-	0x02ee, 0x02ee,
-	0x0345, 0x0345,
-	0x0370, 0x0374,
-	0x0376, 0x0377,
-	0x037a, 0x037d,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x048a, 0x0527,
-	0x0531, 0x0556,
-	0x0559, 0x0559,
-	0x0561, 0x0587,
-	0x05b0, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0610, 0x061a,
-	0x0620, 0x0657,
-	0x0659, 0x065f,
-	0x066e, 0x06d3,
-	0x06d5, 0x06dc,
-	0x06e1, 0x06e8,
-	0x06ed, 0x06ef,
-	0x06fa, 0x06fc,
-	0x06ff, 0x06ff,
-	0x0710, 0x073f,
-	0x074d, 0x07b1,
-	0x07ca, 0x07ea,
-	0x07f4, 0x07f5,
-	0x07fa, 0x07fa,
-	0x0800, 0x0817,
-	0x081a, 0x082c,
-	0x0840, 0x0858,
-	0x08a0, 0x08a0,
-	0x08a2, 0x08ac,
-	0x08e4, 0x08e9,
-	0x08f0, 0x08fe,
-	0x0900, 0x093b,
-	0x093d, 0x094c,
-	0x094e, 0x0950,
-	0x0955, 0x0963,
-	0x0971, 0x0977,
-	0x0979, 0x097f,
-	0x0981, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bd, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cc,
-	0x09ce, 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,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4c,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a70, 0x0a75,
-	0x0a81, 0x0a83,
-	0x0a85, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abd, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acc,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae3,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3d, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4c,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	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, 0x0bcc,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4c,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c82, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbd, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccc,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0cf1, 0x0cf2,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4c,
-	0x0d4e, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d7a, 0x0d7f,
-	0x0d82, 0x0d83,
-	0x0d85, 0x0d96,
-	0x0d9a, 0x0db1,
-	0x0db3, 0x0dbb,
-	0x0dbd, 0x0dbd,
-	0x0dc0, 0x0dc6,
-	0x0dcf, 0x0dd4,
-	0x0dd6, 0x0dd6,
-	0x0dd8, 0x0ddf,
-	0x0df2, 0x0df3,
-	0x0e01, 0x0e3a,
-	0x0e40, 0x0e46,
-	0x0e4d, 0x0e4d,
-	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,
-	0x0ecd, 0x0ecd,
-	0x0edc, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f40, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f81,
-	0x0f88, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x1000, 0x1036,
-	0x1038, 0x1038,
-	0x103b, 0x103f,
-	0x1050, 0x1062,
-	0x1065, 0x1068,
-	0x106e, 0x1086,
-	0x108e, 0x108e,
-	0x109c, 0x109d,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 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, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1713,
-	0x1720, 0x1733,
-	0x1740, 0x1753,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-	0x1780, 0x17b3,
-	0x17b6, 0x17c8,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dc,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x1938,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x1a00, 0x1a1b,
-	0x1a20, 0x1a5e,
-	0x1a61, 0x1a74,
-	0x1aa7, 0x1aa7,
-	0x1b00, 0x1b33,
-	0x1b35, 0x1b43,
-	0x1b45, 0x1b4b,
-	0x1b80, 0x1ba9,
-	0x1bac, 0x1baf,
-	0x1bba, 0x1be5,
-	0x1be7, 0x1bf1,
-	0x1c00, 0x1c35,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c7d,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf3,
-	0x1cf5, 0x1cf6,
-	0x1d00, 0x1dbf,
-	0x1e00, 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, 0x209c,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2119, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x212d,
-	0x212f, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2160, 0x2188,
-	0x24b6, 0x24e9,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2ce4,
-	0x2ceb, 0x2cee,
-	0x2cf2, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2dff,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3007,
-	0x3021, 0x3029,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x309d, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa640, 0xa66e,
-	0xa674, 0xa67b,
-	0xa67f, 0xa697,
-	0xa69f, 0xa6ef,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xa7f8, 0xa801,
-	0xa803, 0xa805,
-	0xa807, 0xa80a,
-	0xa80c, 0xa827,
-	0xa840, 0xa873,
-	0xa880, 0xa8c3,
-	0xa8f2, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa90a, 0xa92a,
-	0xa930, 0xa952,
-	0xa960, 0xa97c,
-	0xa980, 0xa9b2,
-	0xa9b4, 0xa9bf,
-	0xa9cf, 0xa9cf,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa60, 0xaa76,
-	0xaa7a, 0xaa7a,
-	0xaa80, 0xaabe,
-	0xaac0, 0xaac0,
-	0xaac2, 0xaac2,
-	0xaadb, 0xaadd,
-	0xaae0, 0xaaef,
-	0xaaf2, 0xaaf5,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabea,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa6d,
-	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,
-	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,
-	0x10140, 0x10174,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11000, 0x11045,
-	0x11082, 0x110b8,
-	0x110d0, 0x110e8,
-	0x11100, 0x11132,
-	0x11180, 0x111bf,
-	0x111c1, 0x111c4,
-	0x11680, 0x116b5,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f93, 0x16f9f,
-	0x1b000, 0x1b001,
-	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, 0x1d7cb,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* 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[] = {
-	2,
-	0x0000, 0x001f,
-	0x007f, 0x009f,
-}; /* CR_Cntrl */
-
-/* 'Digit': [[:Digit:]] */
-static const OnigCodePoint CR_Digit[] = {
-	42,
-	0x0030, 0x0039,
-	0x0660, 0x0669,
-	0x06f0, 0x06f9,
-	0x07c0, 0x07c9,
-	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,
-	0x1090, 0x1099,
-	0x17e0, 0x17e9,
-	0x1810, 0x1819,
-	0x1946, 0x194f,
-	0x19d0, 0x19d9,
-	0x1a80, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1b50, 0x1b59,
-	0x1bb0, 0x1bb9,
-	0x1c40, 0x1c49,
-	0x1c50, 0x1c59,
-	0xa620, 0xa629,
-	0xa8d0, 0xa8d9,
-	0xa900, 0xa909,
-	0xa9d0, 0xa9d9,
-	0xaa50, 0xaa59,
-	0xabf0, 0xabf9,
-	0xff10, 0xff19,
-	0x104a0, 0x104a9,
-	0x11066, 0x1106f,
-	0x110f0, 0x110f9,
-	0x11136, 0x1113f,
-	0x111d0, 0x111d9,
-	0x116c0, 0x116c9,
-	0x1d7ce, 0x1d7ff,
-}; /* CR_Digit */
-
-/* 'Graph': [[:Graph:]] */
-static const OnigCodePoint CR_Graph[] = {
-	544,
-	0x0021, 0x007e,
-	0x00a1, 0x0377,
-	0x037a, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x0527,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x058f, 0x058f,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x0604,
-	0x0606, 0x061b,
-	0x061e, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-	0x0840, 0x085b,
-	0x085e, 0x085e,
-	0x08a0, 0x08a0,
-	0x08a2, 0x08ac,
-	0x08e4, 0x08fe,
-	0x0900, 0x0977,
-	0x0979, 0x097f,
-	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, 0x09fb,
-	0x0a01, 0x0a03,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0af1,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3c, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	0x0b66, 0x0b77,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bfa,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-	0x0c82, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
-	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, 0x0edf,
-	0x0f00, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fda,
-	0x1000, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 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,
-	0x135d, 0x137c,
-	0x1380, 0x1399,
-	0x13a0, 0x13f4,
-	0x1400, 0x167f,
-	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, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a1b,
-	0x1a1e, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1bf3,
-	0x1bfc, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cc0, 0x1cc7,
-	0x1cd0, 0x1cf6,
-	0x1d00, 0x1de6,
-	0x1dfc, 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, 0x2064,
-	0x206a, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x209c,
-	0x20a0, 0x20b9,
-	0x20d0, 0x20f0,
-	0x2100, 0x2189,
-	0x2190, 0x23f3,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x26ff,
-	0x2701, 0x2b4c,
-	0x2b50, 0x2b59,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf3,
-	0x2cf9, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d70,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2e3b,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3001, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa697,
-	0xa69f, 0xa6f7,
-	0xa700, 0xa78e,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xa7f8, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-	0xa8e0, 0xa8fb,
-	0xa900, 0xa953,
-	0xa95f, 0xa97c,
-	0xa980, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9df,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa7b,
-	0xaa80, 0xaac2,
-	0xaadb, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xe000, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbc1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe26,
-	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,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	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, 0x10855,
-	0x10857, 0x1085f,
-	0x10900, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a7f,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b7f,
-	0x10c00, 0x10c48,
-	0x10e60, 0x10e7e,
-	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-	0x11080, 0x110c1,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x11143,
-	0x11180, 0x111c8,
-	0x111d0, 0x111d9,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d1dd,
-	0x1d200, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	0x1f100, 0x1f10a,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f320,
-	0x1f330, 0x1f335,
-	0x1f337, 0x1f37c,
-	0x1f380, 0x1f393,
-	0x1f3a0, 0x1f3c4,
-	0x1f3c6, 0x1f3ca,
-	0x1f3e0, 0x1f3f0,
-	0x1f400, 0x1f43e,
-	0x1f440, 0x1f440,
-	0x1f442, 0x1f4f7,
-	0x1f4f9, 0x1f4fc,
-	0x1f500, 0x1f53d,
-	0x1f540, 0x1f543,
-	0x1f550, 0x1f567,
-	0x1f5fb, 0x1f640,
-	0x1f645, 0x1f64f,
-	0x1f680, 0x1f6c5,
-	0x1f700, 0x1f773,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xf0000, 0xffffd,
-	0x100000, 0x10fffd,
-}; /* CR_Graph */
-
-/* 'Lower': [[:Lower:]] */
-static const OnigCodePoint CR_Lower[] = {
-	618,
-	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,
-	0x0242, 0x0242,
-	0x0247, 0x0247,
-	0x0249, 0x0249,
-	0x024b, 0x024b,
-	0x024d, 0x024d,
-	0x024f, 0x0293,
-	0x0295, 0x02b8,
-	0x02c0, 0x02c1,
-	0x02e0, 0x02e4,
-	0x0345, 0x0345,
-	0x0371, 0x0371,
-	0x0373, 0x0373,
-	0x0377, 0x0377,
-	0x037a, 0x037d,
-	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, 0x04cf,
-	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,
-	0x04fb, 0x04fb,
-	0x04fd, 0x04fd,
-	0x04ff, 0x04ff,
-	0x0501, 0x0501,
-	0x0503, 0x0503,
-	0x0505, 0x0505,
-	0x0507, 0x0507,
-	0x0509, 0x0509,
-	0x050b, 0x050b,
-	0x050d, 0x050d,
-	0x050f, 0x050f,
-	0x0511, 0x0511,
-	0x0513, 0x0513,
-	0x0515, 0x0515,
-	0x0517, 0x0517,
-	0x0519, 0x0519,
-	0x051b, 0x051b,
-	0x051d, 0x051d,
-	0x051f, 0x051f,
-	0x0521, 0x0521,
-	0x0523, 0x0523,
-	0x0525, 0x0525,
-	0x0527, 0x0527,
-	0x0561, 0x0587,
-	0x1d00, 0x1dbf,
-	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, 0x1e9d,
-	0x1e9f, 0x1e9f,
-	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,
-	0x1efb, 0x1efb,
-	0x1efd, 0x1efd,
-	0x1eff, 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,
-	0x2090, 0x209c,
-	0x210a, 0x210a,
-	0x210e, 0x210f,
-	0x2113, 0x2113,
-	0x212f, 0x212f,
-	0x2134, 0x2134,
-	0x2139, 0x2139,
-	0x213c, 0x213d,
-	0x2146, 0x2149,
-	0x214e, 0x214e,
-	0x2170, 0x217f,
-	0x2184, 0x2184,
-	0x24d0, 0x24e9,
-	0x2c30, 0x2c5e,
-	0x2c61, 0x2c61,
-	0x2c65, 0x2c66,
-	0x2c68, 0x2c68,
-	0x2c6a, 0x2c6a,
-	0x2c6c, 0x2c6c,
-	0x2c71, 0x2c71,
-	0x2c73, 0x2c74,
-	0x2c76, 0x2c7d,
-	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,
-	0x2cec, 0x2cec,
-	0x2cee, 0x2cee,
-	0x2cf3, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0xa641, 0xa641,
-	0xa643, 0xa643,
-	0xa645, 0xa645,
-	0xa647, 0xa647,
-	0xa649, 0xa649,
-	0xa64b, 0xa64b,
-	0xa64d, 0xa64d,
-	0xa64f, 0xa64f,
-	0xa651, 0xa651,
-	0xa653, 0xa653,
-	0xa655, 0xa655,
-	0xa657, 0xa657,
-	0xa659, 0xa659,
-	0xa65b, 0xa65b,
-	0xa65d, 0xa65d,
-	0xa65f, 0xa65f,
-	0xa661, 0xa661,
-	0xa663, 0xa663,
-	0xa665, 0xa665,
-	0xa667, 0xa667,
-	0xa669, 0xa669,
-	0xa66b, 0xa66b,
-	0xa66d, 0xa66d,
-	0xa681, 0xa681,
-	0xa683, 0xa683,
-	0xa685, 0xa685,
-	0xa687, 0xa687,
-	0xa689, 0xa689,
-	0xa68b, 0xa68b,
-	0xa68d, 0xa68d,
-	0xa68f, 0xa68f,
-	0xa691, 0xa691,
-	0xa693, 0xa693,
-	0xa695, 0xa695,
-	0xa697, 0xa697,
-	0xa723, 0xa723,
-	0xa725, 0xa725,
-	0xa727, 0xa727,
-	0xa729, 0xa729,
-	0xa72b, 0xa72b,
-	0xa72d, 0xa72d,
-	0xa72f, 0xa731,
-	0xa733, 0xa733,
-	0xa735, 0xa735,
-	0xa737, 0xa737,
-	0xa739, 0xa739,
-	0xa73b, 0xa73b,
-	0xa73d, 0xa73d,
-	0xa73f, 0xa73f,
-	0xa741, 0xa741,
-	0xa743, 0xa743,
-	0xa745, 0xa745,
-	0xa747, 0xa747,
-	0xa749, 0xa749,
-	0xa74b, 0xa74b,
-	0xa74d, 0xa74d,
-	0xa74f, 0xa74f,
-	0xa751, 0xa751,
-	0xa753, 0xa753,
-	0xa755, 0xa755,
-	0xa757, 0xa757,
-	0xa759, 0xa759,
-	0xa75b, 0xa75b,
-	0xa75d, 0xa75d,
-	0xa75f, 0xa75f,
-	0xa761, 0xa761,
-	0xa763, 0xa763,
-	0xa765, 0xa765,
-	0xa767, 0xa767,
-	0xa769, 0xa769,
-	0xa76b, 0xa76b,
-	0xa76d, 0xa76d,
-	0xa76f, 0xa778,
-	0xa77a, 0xa77a,
-	0xa77c, 0xa77c,
-	0xa77f, 0xa77f,
-	0xa781, 0xa781,
-	0xa783, 0xa783,
-	0xa785, 0xa785,
-	0xa787, 0xa787,
-	0xa78c, 0xa78c,
-	0xa78e, 0xa78e,
-	0xa791, 0xa791,
-	0xa793, 0xa793,
-	0xa7a1, 0xa7a1,
-	0xa7a3, 0xa7a3,
-	0xa7a5, 0xa7a5,
-	0xa7a7, 0xa7a7,
-	0xa7a9, 0xa7a9,
-	0xa7f8, 0xa7fa,
-	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,
-	0x1d7cb, 0x1d7cb,
-}; /* CR_Lower */
-
-/* 'Print': [[:Print:]] */
-static const OnigCodePoint CR_Print[] = {
-	541,
-	0x0020, 0x007e,
-	0x00a0, 0x0377,
-	0x037a, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x0527,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x058f, 0x058f,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x0604,
-	0x0606, 0x061b,
-	0x061e, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-	0x0840, 0x085b,
-	0x085e, 0x085e,
-	0x08a0, 0x08a0,
-	0x08a2, 0x08ac,
-	0x08e4, 0x08fe,
-	0x0900, 0x0977,
-	0x0979, 0x097f,
-	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, 0x09fb,
-	0x0a01, 0x0a03,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0af1,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3c, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	0x0b66, 0x0b77,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bfa,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-	0x0c82, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
-	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, 0x0edf,
-	0x0f00, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fda,
-	0x1000, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 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,
-	0x135d, 0x137c,
-	0x1380, 0x1399,
-	0x13a0, 0x13f4,
-	0x1400, 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, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a1b,
-	0x1a1e, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1bf3,
-	0x1bfc, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cc0, 0x1cc7,
-	0x1cd0, 0x1cf6,
-	0x1d00, 0x1de6,
-	0x1dfc, 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, 0x2027,
-	0x202a, 0x2064,
-	0x206a, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x209c,
-	0x20a0, 0x20b9,
-	0x20d0, 0x20f0,
-	0x2100, 0x2189,
-	0x2190, 0x23f3,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x26ff,
-	0x2701, 0x2b4c,
-	0x2b50, 0x2b59,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf3,
-	0x2cf9, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d70,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2e3b,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa697,
-	0xa69f, 0xa6f7,
-	0xa700, 0xa78e,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xa7f8, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-	0xa8e0, 0xa8fb,
-	0xa900, 0xa953,
-	0xa95f, 0xa97c,
-	0xa980, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9df,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa7b,
-	0xaa80, 0xaac2,
-	0xaadb, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xe000, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbc1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe26,
-	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,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	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, 0x10855,
-	0x10857, 0x1085f,
-	0x10900, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a7f,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b7f,
-	0x10c00, 0x10c48,
-	0x10e60, 0x10e7e,
-	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-	0x11080, 0x110c1,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x11143,
-	0x11180, 0x111c8,
-	0x111d0, 0x111d9,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d1dd,
-	0x1d200, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	0x1f100, 0x1f10a,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f320,
-	0x1f330, 0x1f335,
-	0x1f337, 0x1f37c,
-	0x1f380, 0x1f393,
-	0x1f3a0, 0x1f3c4,
-	0x1f3c6, 0x1f3ca,
-	0x1f3e0, 0x1f3f0,
-	0x1f400, 0x1f43e,
-	0x1f440, 0x1f440,
-	0x1f442, 0x1f4f7,
-	0x1f4f9, 0x1f4fc,
-	0x1f500, 0x1f53d,
-	0x1f540, 0x1f543,
-	0x1f550, 0x1f567,
-	0x1f5fb, 0x1f640,
-	0x1f645, 0x1f64f,
-	0x1f680, 0x1f6c5,
-	0x1f700, 0x1f773,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xf0000, 0xffffd,
-	0x100000, 0x10fffd,
-}; /* CR_Print */
-
-/* 'Punct': [[:Punct:]] */
-static const OnigCodePoint CR_Punct[] = {
-	140,
-	0x0021, 0x0023,
-	0x0025, 0x002a,
-	0x002c, 0x002f,
-	0x003a, 0x003b,
-	0x003f, 0x0040,
-	0x005b, 0x005d,
-	0x005f, 0x005f,
-	0x007b, 0x007b,
-	0x007d, 0x007d,
-	0x00a1, 0x00a1,
-	0x00a7, 0x00a7,
-	0x00ab, 0x00ab,
-	0x00b6, 0x00b7,
-	0x00bb, 0x00bb,
-	0x00bf, 0x00bf,
-	0x037e, 0x037e,
-	0x0387, 0x0387,
-	0x055a, 0x055f,
-	0x0589, 0x058a,
-	0x05be, 0x05be,
-	0x05c0, 0x05c0,
-	0x05c3, 0x05c3,
-	0x05c6, 0x05c6,
-	0x05f3, 0x05f4,
-	0x0609, 0x060a,
-	0x060c, 0x060d,
-	0x061b, 0x061b,
-	0x061e, 0x061f,
-	0x066a, 0x066d,
-	0x06d4, 0x06d4,
-	0x0700, 0x070d,
-	0x07f7, 0x07f9,
-	0x0830, 0x083e,
-	0x085e, 0x085e,
-	0x0964, 0x0965,
-	0x0970, 0x0970,
-	0x0af0, 0x0af0,
-	0x0df4, 0x0df4,
-	0x0e4f, 0x0e4f,
-	0x0e5a, 0x0e5b,
-	0x0f04, 0x0f12,
-	0x0f14, 0x0f14,
-	0x0f3a, 0x0f3d,
-	0x0f85, 0x0f85,
-	0x0fd0, 0x0fd4,
-	0x0fd9, 0x0fda,
-	0x104a, 0x104f,
-	0x10fb, 0x10fb,
-	0x1360, 0x1368,
-	0x1400, 0x1400,
-	0x166d, 0x166e,
-	0x169b, 0x169c,
-	0x16eb, 0x16ed,
-	0x1735, 0x1736,
-	0x17d4, 0x17d6,
-	0x17d8, 0x17da,
-	0x1800, 0x180a,
-	0x1944, 0x1945,
-	0x1a1e, 0x1a1f,
-	0x1aa0, 0x1aa6,
-	0x1aa8, 0x1aad,
-	0x1b5a, 0x1b60,
-	0x1bfc, 0x1bff,
-	0x1c3b, 0x1c3f,
-	0x1c7e, 0x1c7f,
-	0x1cc0, 0x1cc7,
-	0x1cd3, 0x1cd3,
-	0x2010, 0x2027,
-	0x2030, 0x2043,
-	0x2045, 0x2051,
-	0x2053, 0x205e,
-	0x207d, 0x207e,
-	0x208d, 0x208e,
-	0x2329, 0x232a,
-	0x2768, 0x2775,
-	0x27c5, 0x27c6,
-	0x27e6, 0x27ef,
-	0x2983, 0x2998,
-	0x29d8, 0x29db,
-	0x29fc, 0x29fd,
-	0x2cf9, 0x2cfc,
-	0x2cfe, 0x2cff,
-	0x2d70, 0x2d70,
-	0x2e00, 0x2e2e,
-	0x2e30, 0x2e3b,
-	0x3001, 0x3003,
-	0x3008, 0x3011,
-	0x3014, 0x301f,
-	0x3030, 0x3030,
-	0x303d, 0x303d,
-	0x30a0, 0x30a0,
-	0x30fb, 0x30fb,
-	0xa4fe, 0xa4ff,
-	0xa60d, 0xa60f,
-	0xa673, 0xa673,
-	0xa67e, 0xa67e,
-	0xa6f2, 0xa6f7,
-	0xa874, 0xa877,
-	0xa8ce, 0xa8cf,
-	0xa8f8, 0xa8fa,
-	0xa92e, 0xa92f,
-	0xa95f, 0xa95f,
-	0xa9c1, 0xa9cd,
-	0xa9de, 0xa9df,
-	0xaa5c, 0xaa5f,
-	0xaade, 0xaadf,
-	0xaaf0, 0xaaf1,
-	0xabeb, 0xabeb,
-	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, 0x10102,
-	0x1039f, 0x1039f,
-	0x103d0, 0x103d0,
-	0x10857, 0x10857,
-	0x1091f, 0x1091f,
-	0x1093f, 0x1093f,
-	0x10a50, 0x10a58,
-	0x10a7f, 0x10a7f,
-	0x10b39, 0x10b3f,
-	0x11047, 0x1104d,
-	0x110bb, 0x110bc,
-	0x110be, 0x110c1,
-	0x11140, 0x11143,
-	0x111c5, 0x111c8,
-	0x12470, 0x12473,
-}; /* 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[] = {
-	610,
-	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,
-	0x0243, 0x0246,
-	0x0248, 0x0248,
-	0x024a, 0x024a,
-	0x024c, 0x024c,
-	0x024e, 0x024e,
-	0x0370, 0x0370,
-	0x0372, 0x0372,
-	0x0376, 0x0376,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x038f,
-	0x0391, 0x03a1,
-	0x03a3, 0x03ab,
-	0x03cf, 0x03cf,
-	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,
-	0x04fa, 0x04fa,
-	0x04fc, 0x04fc,
-	0x04fe, 0x04fe,
-	0x0500, 0x0500,
-	0x0502, 0x0502,
-	0x0504, 0x0504,
-	0x0506, 0x0506,
-	0x0508, 0x0508,
-	0x050a, 0x050a,
-	0x050c, 0x050c,
-	0x050e, 0x050e,
-	0x0510, 0x0510,
-	0x0512, 0x0512,
-	0x0514, 0x0514,
-	0x0516, 0x0516,
-	0x0518, 0x0518,
-	0x051a, 0x051a,
-	0x051c, 0x051c,
-	0x051e, 0x051e,
-	0x0520, 0x0520,
-	0x0522, 0x0522,
-	0x0524, 0x0524,
-	0x0526, 0x0526,
-	0x0531, 0x0556,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	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,
-	0x1e9e, 0x1e9e,
-	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,
-	0x1efa, 0x1efa,
-	0x1efc, 0x1efc,
-	0x1efe, 0x1efe,
-	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, 0x2133,
-	0x213e, 0x213f,
-	0x2145, 0x2145,
-	0x2160, 0x216f,
-	0x2183, 0x2183,
-	0x24b6, 0x24cf,
-	0x2c00, 0x2c2e,
-	0x2c60, 0x2c60,
-	0x2c62, 0x2c64,
-	0x2c67, 0x2c67,
-	0x2c69, 0x2c69,
-	0x2c6b, 0x2c6b,
-	0x2c6d, 0x2c70,
-	0x2c72, 0x2c72,
-	0x2c75, 0x2c75,
-	0x2c7e, 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,
-	0x2ceb, 0x2ceb,
-	0x2ced, 0x2ced,
-	0x2cf2, 0x2cf2,
-	0xa640, 0xa640,
-	0xa642, 0xa642,
-	0xa644, 0xa644,
-	0xa646, 0xa646,
-	0xa648, 0xa648,
-	0xa64a, 0xa64a,
-	0xa64c, 0xa64c,
-	0xa64e, 0xa64e,
-	0xa650, 0xa650,
-	0xa652, 0xa652,
-	0xa654, 0xa654,
-	0xa656, 0xa656,
-	0xa658, 0xa658,
-	0xa65a, 0xa65a,
-	0xa65c, 0xa65c,
-	0xa65e, 0xa65e,
-	0xa660, 0xa660,
-	0xa662, 0xa662,
-	0xa664, 0xa664,
-	0xa666, 0xa666,
-	0xa668, 0xa668,
-	0xa66a, 0xa66a,
-	0xa66c, 0xa66c,
-	0xa680, 0xa680,
-	0xa682, 0xa682,
-	0xa684, 0xa684,
-	0xa686, 0xa686,
-	0xa688, 0xa688,
-	0xa68a, 0xa68a,
-	0xa68c, 0xa68c,
-	0xa68e, 0xa68e,
-	0xa690, 0xa690,
-	0xa692, 0xa692,
-	0xa694, 0xa694,
-	0xa696, 0xa696,
-	0xa722, 0xa722,
-	0xa724, 0xa724,
-	0xa726, 0xa726,
-	0xa728, 0xa728,
-	0xa72a, 0xa72a,
-	0xa72c, 0xa72c,
-	0xa72e, 0xa72e,
-	0xa732, 0xa732,
-	0xa734, 0xa734,
-	0xa736, 0xa736,
-	0xa738, 0xa738,
-	0xa73a, 0xa73a,
-	0xa73c, 0xa73c,
-	0xa73e, 0xa73e,
-	0xa740, 0xa740,
-	0xa742, 0xa742,
-	0xa744, 0xa744,
-	0xa746, 0xa746,
-	0xa748, 0xa748,
-	0xa74a, 0xa74a,
-	0xa74c, 0xa74c,
-	0xa74e, 0xa74e,
-	0xa750, 0xa750,
-	0xa752, 0xa752,
-	0xa754, 0xa754,
-	0xa756, 0xa756,
-	0xa758, 0xa758,
-	0xa75a, 0xa75a,
-	0xa75c, 0xa75c,
-	0xa75e, 0xa75e,
-	0xa760, 0xa760,
-	0xa762, 0xa762,
-	0xa764, 0xa764,
-	0xa766, 0xa766,
-	0xa768, 0xa768,
-	0xa76a, 0xa76a,
-	0xa76c, 0xa76c,
-	0xa76e, 0xa76e,
-	0xa779, 0xa779,
-	0xa77b, 0xa77b,
-	0xa77d, 0xa77e,
-	0xa780, 0xa780,
-	0xa782, 0xa782,
-	0xa784, 0xa784,
-	0xa786, 0xa786,
-	0xa78b, 0xa78b,
-	0xa78d, 0xa78d,
-	0xa790, 0xa790,
-	0xa792, 0xa792,
-	0xa7a0, 0xa7a0,
-	0xa7a2, 0xa7a2,
-	0xa7a4, 0xa7a4,
-	0xa7a6, 0xa7a6,
-	0xa7a8, 0xa7a8,
-	0xa7aa, 0xa7aa,
-	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,
-	0x1d7ca, 0x1d7ca,
-}; /* 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[] = {
-	564,
-	0x0030, 0x0039,
-	0x0041, 0x005a,
-	0x005f, 0x005f,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00b5, 0x00b5,
-	0x00ba, 0x00ba,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x02c1,
-	0x02c6, 0x02d1,
-	0x02e0, 0x02e4,
-	0x02ec, 0x02ec,
-	0x02ee, 0x02ee,
-	0x0300, 0x0374,
-	0x0376, 0x0377,
-	0x037a, 0x037d,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x0483, 0x0527,
-	0x0531, 0x0556,
-	0x0559, 0x0559,
-	0x0561, 0x0587,
-	0x0591, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0610, 0x061a,
-	0x0620, 0x0669,
-	0x066e, 0x06d3,
-	0x06d5, 0x06dc,
-	0x06df, 0x06e8,
-	0x06ea, 0x06fc,
-	0x06ff, 0x06ff,
-	0x0710, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07f5,
-	0x07fa, 0x07fa,
-	0x0800, 0x082d,
-	0x0840, 0x085b,
-	0x08a0, 0x08a0,
-	0x08a2, 0x08ac,
-	0x08e4, 0x08fe,
-	0x0900, 0x0963,
-	0x0966, 0x096f,
-	0x0971, 0x0977,
-	0x0979, 0x097f,
-	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,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bef,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	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, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d6f,
-	0x0d7a, 0x0d7f,
-	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, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f18, 0x0f19,
-	0x0f20, 0x0f29,
-	0x0f35, 0x0f35,
-	0x0f37, 0x0f37,
-	0x0f39, 0x0f39,
-	0x0f3e, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f84,
-	0x0f86, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fc6, 0x0fc6,
-	0x1000, 0x1049,
-	0x1050, 0x109d,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 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,
-	0x135d, 0x135f,
-	0x1380, 0x138f,
-	0x13a0, 0x13f4,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1714,
-	0x1720, 0x1734,
-	0x1740, 0x1753,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-	0x1780, 0x17d3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dd,
-	0x17e0, 0x17e9,
-	0x180b, 0x180d,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1946, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19d9,
-	0x1a00, 0x1a1b,
-	0x1a20, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa7, 0x1aa7,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b59,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1bf3,
-	0x1c00, 0x1c37,
-	0x1c40, 0x1c49,
-	0x1c4d, 0x1c7d,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1cf6,
-	0x1d00, 0x1de6,
-	0x1dfc, 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,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 0x209c,
-	0x20d0, 0x20f0,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2119, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x212d,
-	0x212f, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2160, 0x2188,
-	0x24b6, 0x24e9,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2ce4,
-	0x2ceb, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d6f,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2dff,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3007,
-	0x3021, 0x302f,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x3099, 0x309a,
-	0x309d, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa62b,
-	0xa640, 0xa672,
-	0xa674, 0xa67d,
-	0xa67f, 0xa697,
-	0xa69f, 0xa6f1,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xa7f8, 0xa827,
-	0xa840, 0xa873,
-	0xa880, 0xa8c4,
-	0xa8d0, 0xa8d9,
-	0xa8e0, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa900, 0xa92d,
-	0xa930, 0xa953,
-	0xa960, 0xa97c,
-	0xa980, 0xa9c0,
-	0xa9cf, 0xa9d9,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa60, 0xaa76,
-	0xaa7a, 0xaa7b,
-	0xaa80, 0xaac2,
-	0xaadb, 0xaadd,
-	0xaae0, 0xaaef,
-	0xaaf2, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabea,
-	0xabec, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa6d,
-	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, 0xfe26,
-	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,
-	0x10140, 0x10174,
-	0x101fd, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	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, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11000, 0x11046,
-	0x11066, 0x1106f,
-	0x11080, 0x110ba,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x1113f,
-	0x11180, 0x111c4,
-	0x111d0, 0x111d9,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x1b000, 0x1b001,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0xe0100, 0xe01ef,
-}; /* CR_Word */
-
-/* 'Alnum': [[:Alnum:]] */
-static const OnigCodePoint CR_Alnum[] = {
-	566,
-	0x0030, 0x0039,
-	0x0041, 0x005a,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00b5, 0x00b5,
-	0x00ba, 0x00ba,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x02c1,
-	0x02c6, 0x02d1,
-	0x02e0, 0x02e4,
-	0x02ec, 0x02ec,
-	0x02ee, 0x02ee,
-	0x0345, 0x0345,
-	0x0370, 0x0374,
-	0x0376, 0x0377,
-	0x037a, 0x037d,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x048a, 0x0527,
-	0x0531, 0x0556,
-	0x0559, 0x0559,
-	0x0561, 0x0587,
-	0x05b0, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0610, 0x061a,
-	0x0620, 0x0657,
-	0x0659, 0x0669,
-	0x066e, 0x06d3,
-	0x06d5, 0x06dc,
-	0x06e1, 0x06e8,
-	0x06ed, 0x06fc,
-	0x06ff, 0x06ff,
-	0x0710, 0x073f,
-	0x074d, 0x07b1,
-	0x07c0, 0x07ea,
-	0x07f4, 0x07f5,
-	0x07fa, 0x07fa,
-	0x0800, 0x0817,
-	0x081a, 0x082c,
-	0x0840, 0x0858,
-	0x08a0, 0x08a0,
-	0x08a2, 0x08ac,
-	0x08e4, 0x08e9,
-	0x08f0, 0x08fe,
-	0x0900, 0x093b,
-	0x093d, 0x094c,
-	0x094e, 0x0950,
-	0x0955, 0x0963,
-	0x0966, 0x096f,
-	0x0971, 0x0977,
-	0x0979, 0x097f,
-	0x0981, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bd, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cc,
-	0x09ce, 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,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4c,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	0x0a81, 0x0a83,
-	0x0a85, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abd, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acc,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae3,
-	0x0ae6, 0x0aef,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3d, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4c,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	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, 0x0bcc,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bef,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4c,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c82, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbd, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccc,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4c,
-	0x0d4e, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d6f,
-	0x0d7a, 0x0d7f,
-	0x0d82, 0x0d83,
-	0x0d85, 0x0d96,
-	0x0d9a, 0x0db1,
-	0x0db3, 0x0dbb,
-	0x0dbd, 0x0dbd,
-	0x0dc0, 0x0dc6,
-	0x0dcf, 0x0dd4,
-	0x0dd6, 0x0dd6,
-	0x0dd8, 0x0ddf,
-	0x0df2, 0x0df3,
-	0x0e01, 0x0e3a,
-	0x0e40, 0x0e46,
-	0x0e4d, 0x0e4d,
-	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,
-	0x0ecd, 0x0ecd,
-	0x0ed0, 0x0ed9,
-	0x0edc, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f20, 0x0f29,
-	0x0f40, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f81,
-	0x0f88, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x1000, 0x1036,
-	0x1038, 0x1038,
-	0x103b, 0x1049,
-	0x1050, 0x1062,
-	0x1065, 0x1068,
-	0x106e, 0x1086,
-	0x108e, 0x108e,
-	0x1090, 0x1099,
-	0x109c, 0x109d,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 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, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1713,
-	0x1720, 0x1733,
-	0x1740, 0x1753,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-	0x1780, 0x17b3,
-	0x17b6, 0x17c8,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dc,
-	0x17e0, 0x17e9,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x1938,
-	0x1946, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19d9,
-	0x1a00, 0x1a1b,
-	0x1a20, 0x1a5e,
-	0x1a61, 0x1a74,
-	0x1a80, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa7, 0x1aa7,
-	0x1b00, 0x1b33,
-	0x1b35, 0x1b43,
-	0x1b45, 0x1b4b,
-	0x1b50, 0x1b59,
-	0x1b80, 0x1ba9,
-	0x1bac, 0x1be5,
-	0x1be7, 0x1bf1,
-	0x1c00, 0x1c35,
-	0x1c40, 0x1c49,
-	0x1c4d, 0x1c7d,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf3,
-	0x1cf5, 0x1cf6,
-	0x1d00, 0x1dbf,
-	0x1e00, 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, 0x209c,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2119, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x212d,
-	0x212f, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2160, 0x2188,
-	0x24b6, 0x24e9,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2ce4,
-	0x2ceb, 0x2cee,
-	0x2cf2, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2dff,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3007,
-	0x3021, 0x3029,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x309d, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa62b,
-	0xa640, 0xa66e,
-	0xa674, 0xa67b,
-	0xa67f, 0xa697,
-	0xa69f, 0xa6ef,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xa7f8, 0xa801,
-	0xa803, 0xa805,
-	0xa807, 0xa80a,
-	0xa80c, 0xa827,
-	0xa840, 0xa873,
-	0xa880, 0xa8c3,
-	0xa8d0, 0xa8d9,
-	0xa8f2, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa900, 0xa92a,
-	0xa930, 0xa952,
-	0xa960, 0xa97c,
-	0xa980, 0xa9b2,
-	0xa9b4, 0xa9bf,
-	0xa9cf, 0xa9d9,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa60, 0xaa76,
-	0xaa7a, 0xaa7a,
-	0xaa80, 0xaabe,
-	0xaac0, 0xaac0,
-	0xaac2, 0xaac2,
-	0xaadb, 0xaadd,
-	0xaae0, 0xaaef,
-	0xaaf2, 0xaaf5,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabea,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa6d,
-	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,
-	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,
-	0x10140, 0x10174,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	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, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11000, 0x11045,
-	0x11066, 0x1106f,
-	0x11082, 0x110b8,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11132,
-	0x11136, 0x1113f,
-	0x11180, 0x111bf,
-	0x111c1, 0x111c4,
-	0x111d0, 0x111d9,
-	0x11680, 0x116b5,
-	0x116c0, 0x116c9,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f93, 0x16f9f,
-	0x1b000, 0x1b001,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* 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[] = {
-	539,
-	0x0000, 0x0377,
-	0x037a, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x0527,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x058f, 0x058f,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x0604,
-	0x0606, 0x061b,
-	0x061e, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-	0x0840, 0x085b,
-	0x085e, 0x085e,
-	0x08a0, 0x08a0,
-	0x08a2, 0x08ac,
-	0x08e4, 0x08fe,
-	0x0900, 0x0977,
-	0x0979, 0x097f,
-	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, 0x09fb,
-	0x0a01, 0x0a03,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0af1,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3c, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	0x0b66, 0x0b77,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bfa,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-	0x0c82, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
-	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, 0x0edf,
-	0x0f00, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fda,
-	0x1000, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 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,
-	0x135d, 0x137c,
-	0x1380, 0x1399,
-	0x13a0, 0x13f4,
-	0x1400, 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, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a1b,
-	0x1a1e, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1bf3,
-	0x1bfc, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cc0, 0x1cc7,
-	0x1cd0, 0x1cf6,
-	0x1d00, 0x1de6,
-	0x1dfc, 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, 0x2064,
-	0x206a, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x209c,
-	0x20a0, 0x20b9,
-	0x20d0, 0x20f0,
-	0x2100, 0x2189,
-	0x2190, 0x23f3,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x26ff,
-	0x2701, 0x2b4c,
-	0x2b50, 0x2b59,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf3,
-	0x2cf9, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d70,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2e3b,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa697,
-	0xa69f, 0xa6f7,
-	0xa700, 0xa78e,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xa7f8, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-	0xa8e0, 0xa8fb,
-	0xa900, 0xa953,
-	0xa95f, 0xa97c,
-	0xa980, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9df,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa7b,
-	0xaa80, 0xaac2,
-	0xaadb, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xd800, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbc1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe26,
-	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,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	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, 0x10855,
-	0x10857, 0x1085f,
-	0x10900, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a7f,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b7f,
-	0x10c00, 0x10c48,
-	0x10e60, 0x10e7e,
-	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-	0x11080, 0x110c1,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x11143,
-	0x11180, 0x111c8,
-	0x111d0, 0x111d9,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d1dd,
-	0x1d200, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	0x1f100, 0x1f10a,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f320,
-	0x1f330, 0x1f335,
-	0x1f337, 0x1f37c,
-	0x1f380, 0x1f393,
-	0x1f3a0, 0x1f3c4,
-	0x1f3c6, 0x1f3ca,
-	0x1f3e0, 0x1f3f0,
-	0x1f400, 0x1f43e,
-	0x1f440, 0x1f440,
-	0x1f442, 0x1f4f7,
-	0x1f4f9, 0x1f4fc,
-	0x1f500, 0x1f53d,
-	0x1f540, 0x1f543,
-	0x1f550, 0x1f567,
-	0x1f5fb, 0x1f640,
-	0x1f645, 0x1f64f,
-	0x1f680, 0x1f6c5,
-	0x1f700, 0x1f773,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xf0000, 0xffffd,
-	0x100000, 0x10fffd,
-}; /* CR_Assigned */
-
-/* 'C': Major Category */
-static const OnigCodePoint CR_C[] = {
-	541,
-	0x0000, 0x001f,
-	0x007f, 0x009f,
-	0x00ad, 0x00ad,
-	0x0378, 0x0379,
-	0x037f, 0x0383,
-	0x038b, 0x038b,
-	0x038d, 0x038d,
-	0x03a2, 0x03a2,
-	0x0528, 0x0530,
-	0x0557, 0x0558,
-	0x0560, 0x0560,
-	0x0588, 0x0588,
-	0x058b, 0x058e,
-	0x0590, 0x0590,
-	0x05c8, 0x05cf,
-	0x05eb, 0x05ef,
-	0x05f5, 0x0605,
-	0x061c, 0x061d,
-	0x06dd, 0x06dd,
-	0x070e, 0x070f,
-	0x074b, 0x074c,
-	0x07b2, 0x07bf,
-	0x07fb, 0x07ff,
-	0x082e, 0x082f,
-	0x083f, 0x083f,
-	0x085c, 0x085d,
-	0x085f, 0x089f,
-	0x08a1, 0x08a1,
-	0x08ad, 0x08e3,
-	0x08ff, 0x08ff,
-	0x0978, 0x0978,
-	0x0980, 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,
-	0x09fc, 0x0a00,
-	0x0a04, 0x0a04,
-	0x0a0b, 0x0a0e,
-	0x0a11, 0x0a12,
-	0x0a29, 0x0a29,
-	0x0a31, 0x0a31,
-	0x0a34, 0x0a34,
-	0x0a37, 0x0a37,
-	0x0a3a, 0x0a3b,
-	0x0a3d, 0x0a3d,
-	0x0a43, 0x0a46,
-	0x0a49, 0x0a4a,
-	0x0a4e, 0x0a50,
-	0x0a52, 0x0a58,
-	0x0a5d, 0x0a5d,
-	0x0a5f, 0x0a65,
-	0x0a76, 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,
-	0x0af2, 0x0b00,
-	0x0b04, 0x0b04,
-	0x0b0d, 0x0b0e,
-	0x0b11, 0x0b12,
-	0x0b29, 0x0b29,
-	0x0b31, 0x0b31,
-	0x0b34, 0x0b34,
-	0x0b3a, 0x0b3b,
-	0x0b45, 0x0b46,
-	0x0b49, 0x0b4a,
-	0x0b4e, 0x0b55,
-	0x0b58, 0x0b5b,
-	0x0b5e, 0x0b5e,
-	0x0b64, 0x0b65,
-	0x0b78, 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, 0x0bcf,
-	0x0bd1, 0x0bd6,
-	0x0bd8, 0x0be5,
-	0x0bfb, 0x0c00,
-	0x0c04, 0x0c04,
-	0x0c0d, 0x0c0d,
-	0x0c11, 0x0c11,
-	0x0c29, 0x0c29,
-	0x0c34, 0x0c34,
-	0x0c3a, 0x0c3c,
-	0x0c45, 0x0c45,
-	0x0c49, 0x0c49,
-	0x0c4e, 0x0c54,
-	0x0c57, 0x0c57,
-	0x0c5a, 0x0c5f,
-	0x0c64, 0x0c65,
-	0x0c70, 0x0c77,
-	0x0c80, 0x0c81,
-	0x0c84, 0x0c84,
-	0x0c8d, 0x0c8d,
-	0x0c91, 0x0c91,
-	0x0ca9, 0x0ca9,
-	0x0cb4, 0x0cb4,
-	0x0cba, 0x0cbb,
-	0x0cc5, 0x0cc5,
-	0x0cc9, 0x0cc9,
-	0x0cce, 0x0cd4,
-	0x0cd7, 0x0cdd,
-	0x0cdf, 0x0cdf,
-	0x0ce4, 0x0ce5,
-	0x0cf0, 0x0cf0,
-	0x0cf3, 0x0d01,
-	0x0d04, 0x0d04,
-	0x0d0d, 0x0d0d,
-	0x0d11, 0x0d11,
-	0x0d3b, 0x0d3c,
-	0x0d45, 0x0d45,
-	0x0d49, 0x0d49,
-	0x0d4f, 0x0d56,
-	0x0d58, 0x0d5f,
-	0x0d64, 0x0d65,
-	0x0d76, 0x0d78,
-	0x0d80, 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,
-	0x0ee0, 0x0eff,
-	0x0f48, 0x0f48,
-	0x0f6d, 0x0f70,
-	0x0f98, 0x0f98,
-	0x0fbd, 0x0fbd,
-	0x0fcd, 0x0fcd,
-	0x0fdb, 0x0fff,
-	0x10c6, 0x10c6,
-	0x10c8, 0x10cc,
-	0x10ce, 0x10cf,
-	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, 0x135c,
-	0x137d, 0x137f,
-	0x139a, 0x139f,
-	0x13f5, 0x13ff,
-	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,
-	0x18ab, 0x18af,
-	0x18f6, 0x18ff,
-	0x191d, 0x191f,
-	0x192c, 0x192f,
-	0x193c, 0x193f,
-	0x1941, 0x1943,
-	0x196e, 0x196f,
-	0x1975, 0x197f,
-	0x19ac, 0x19af,
-	0x19ca, 0x19cf,
-	0x19db, 0x19dd,
-	0x1a1c, 0x1a1d,
-	0x1a5f, 0x1a5f,
-	0x1a7d, 0x1a7e,
-	0x1a8a, 0x1a8f,
-	0x1a9a, 0x1a9f,
-	0x1aae, 0x1aff,
-	0x1b4c, 0x1b4f,
-	0x1b7d, 0x1b7f,
-	0x1bf4, 0x1bfb,
-	0x1c38, 0x1c3a,
-	0x1c4a, 0x1c4c,
-	0x1c80, 0x1cbf,
-	0x1cc8, 0x1ccf,
-	0x1cf7, 0x1cff,
-	0x1de7, 0x1dfb,
-	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,
-	0x209d, 0x209f,
-	0x20ba, 0x20cf,
-	0x20f1, 0x20ff,
-	0x218a, 0x218f,
-	0x23f4, 0x23ff,
-	0x2427, 0x243f,
-	0x244b, 0x245f,
-	0x2700, 0x2700,
-	0x2b4d, 0x2b4f,
-	0x2b5a, 0x2bff,
-	0x2c2f, 0x2c2f,
-	0x2c5f, 0x2c5f,
-	0x2cf4, 0x2cf8,
-	0x2d26, 0x2d26,
-	0x2d28, 0x2d2c,
-	0x2d2e, 0x2d2f,
-	0x2d68, 0x2d6e,
-	0x2d71, 0x2d7e,
-	0x2d97, 0x2d9f,
-	0x2da7, 0x2da7,
-	0x2daf, 0x2daf,
-	0x2db7, 0x2db7,
-	0x2dbf, 0x2dbf,
-	0x2dc7, 0x2dc7,
-	0x2dcf, 0x2dcf,
-	0x2dd7, 0x2dd7,
-	0x2ddf, 0x2ddf,
-	0x2e3c, 0x2e7f,
-	0x2e9a, 0x2e9a,
-	0x2ef4, 0x2eff,
-	0x2fd6, 0x2fef,
-	0x2ffc, 0x2fff,
-	0x3040, 0x3040,
-	0x3097, 0x3098,
-	0x3100, 0x3104,
-	0x312e, 0x3130,
-	0x318f, 0x318f,
-	0x31bb, 0x31bf,
-	0x31e4, 0x31ef,
-	0x321f, 0x321f,
-	0x32ff, 0x32ff,
-	0x4db6, 0x4dbf,
-	0x9fcd, 0x9fff,
-	0xa48d, 0xa48f,
-	0xa4c7, 0xa4cf,
-	0xa62c, 0xa63f,
-	0xa698, 0xa69e,
-	0xa6f8, 0xa6ff,
-	0xa78f, 0xa78f,
-	0xa794, 0xa79f,
-	0xa7ab, 0xa7f7,
-	0xa82c, 0xa82f,
-	0xa83a, 0xa83f,
-	0xa878, 0xa87f,
-	0xa8c5, 0xa8cd,
-	0xa8da, 0xa8df,
-	0xa8fc, 0xa8ff,
-	0xa954, 0xa95e,
-	0xa97d, 0xa97f,
-	0xa9ce, 0xa9ce,
-	0xa9da, 0xa9dd,
-	0xa9e0, 0xa9ff,
-	0xaa37, 0xaa3f,
-	0xaa4e, 0xaa4f,
-	0xaa5a, 0xaa5b,
-	0xaa7c, 0xaa7f,
-	0xaac3, 0xaada,
-	0xaaf7, 0xab00,
-	0xab07, 0xab08,
-	0xab0f, 0xab10,
-	0xab17, 0xab1f,
-	0xab27, 0xab27,
-	0xab2f, 0xabbf,
-	0xabee, 0xabef,
-	0xabfa, 0xabff,
-	0xd7a4, 0xd7af,
-	0xd7c7, 0xd7ca,
-	0xd7fc, 0xf8ff,
-	0xfa6e, 0xfa6f,
-	0xfada, 0xfaff,
-	0xfb07, 0xfb12,
-	0xfb18, 0xfb1c,
-	0xfb37, 0xfb37,
-	0xfb3d, 0xfb3d,
-	0xfb3f, 0xfb3f,
-	0xfb42, 0xfb42,
-	0xfb45, 0xfb45,
-	0xfbc2, 0xfbd2,
-	0xfd40, 0xfd4f,
-	0xfd90, 0xfd91,
-	0xfdc8, 0xfdef,
-	0xfdfe, 0xfdff,
-	0xfe1a, 0xfe1f,
-	0xfe27, 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, 0x1018f,
-	0x1019c, 0x101cf,
-	0x101fe, 0x1027f,
-	0x1029d, 0x1029f,
-	0x102d1, 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,
-	0x10856, 0x10856,
-	0x10860, 0x108ff,
-	0x1091c, 0x1091e,
-	0x1093a, 0x1093e,
-	0x10940, 0x1097f,
-	0x109b8, 0x109bd,
-	0x109c0, 0x109ff,
-	0x10a04, 0x10a04,
-	0x10a07, 0x10a0b,
-	0x10a14, 0x10a14,
-	0x10a18, 0x10a18,
-	0x10a34, 0x10a37,
-	0x10a3b, 0x10a3e,
-	0x10a48, 0x10a4f,
-	0x10a59, 0x10a5f,
-	0x10a80, 0x10aff,
-	0x10b36, 0x10b38,
-	0x10b56, 0x10b57,
-	0x10b73, 0x10b77,
-	0x10b80, 0x10bff,
-	0x10c49, 0x10e5f,
-	0x10e7f, 0x10fff,
-	0x1104e, 0x11051,
-	0x11070, 0x1107f,
-	0x110bd, 0x110bd,
-	0x110c2, 0x110cf,
-	0x110e9, 0x110ef,
-	0x110fa, 0x110ff,
-	0x11135, 0x11135,
-	0x11144, 0x1117f,
-	0x111c9, 0x111cf,
-	0x111da, 0x1167f,
-	0x116b8, 0x116bf,
-	0x116ca, 0x11fff,
-	0x1236f, 0x123ff,
-	0x12463, 0x1246f,
-	0x12474, 0x12fff,
-	0x1342f, 0x167ff,
-	0x16a39, 0x16eff,
-	0x16f45, 0x16f4f,
-	0x16f7f, 0x16f8e,
-	0x16fa0, 0x1afff,
-	0x1b002, 0x1cfff,
-	0x1d0f6, 0x1d0ff,
-	0x1d127, 0x1d128,
-	0x1d173, 0x1d17a,
-	0x1d1de, 0x1d1ff,
-	0x1d246, 0x1d2ff,
-	0x1d357, 0x1d35f,
-	0x1d372, 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,
-	0x1d7cc, 0x1d7cd,
-	0x1d800, 0x1edff,
-	0x1ee04, 0x1ee04,
-	0x1ee20, 0x1ee20,
-	0x1ee23, 0x1ee23,
-	0x1ee25, 0x1ee26,
-	0x1ee28, 0x1ee28,
-	0x1ee33, 0x1ee33,
-	0x1ee38, 0x1ee38,
-	0x1ee3a, 0x1ee3a,
-	0x1ee3c, 0x1ee41,
-	0x1ee43, 0x1ee46,
-	0x1ee48, 0x1ee48,
-	0x1ee4a, 0x1ee4a,
-	0x1ee4c, 0x1ee4c,
-	0x1ee50, 0x1ee50,
-	0x1ee53, 0x1ee53,
-	0x1ee55, 0x1ee56,
-	0x1ee58, 0x1ee58,
-	0x1ee5a, 0x1ee5a,
-	0x1ee5c, 0x1ee5c,
-	0x1ee5e, 0x1ee5e,
-	0x1ee60, 0x1ee60,
-	0x1ee63, 0x1ee63,
-	0x1ee65, 0x1ee66,
-	0x1ee6b, 0x1ee6b,
-	0x1ee73, 0x1ee73,
-	0x1ee78, 0x1ee78,
-	0x1ee7d, 0x1ee7d,
-	0x1ee7f, 0x1ee7f,
-	0x1ee8a, 0x1ee8a,
-	0x1ee9c, 0x1eea0,
-	0x1eea4, 0x1eea4,
-	0x1eeaa, 0x1eeaa,
-	0x1eebc, 0x1eeef,
-	0x1eef2, 0x1efff,
-	0x1f02c, 0x1f02f,
-	0x1f094, 0x1f09f,
-	0x1f0af, 0x1f0b0,
-	0x1f0bf, 0x1f0c0,
-	0x1f0d0, 0x1f0d0,
-	0x1f0e0, 0x1f0ff,
-	0x1f10b, 0x1f10f,
-	0x1f12f, 0x1f12f,
-	0x1f16c, 0x1f16f,
-	0x1f19b, 0x1f1e5,
-	0x1f203, 0x1f20f,
-	0x1f23b, 0x1f23f,
-	0x1f249, 0x1f24f,
-	0x1f252, 0x1f2ff,
-	0x1f321, 0x1f32f,
-	0x1f336, 0x1f336,
-	0x1f37d, 0x1f37f,
-	0x1f394, 0x1f39f,
-	0x1f3c5, 0x1f3c5,
-	0x1f3cb, 0x1f3df,
-	0x1f3f1, 0x1f3ff,
-	0x1f43f, 0x1f43f,
-	0x1f441, 0x1f441,
-	0x1f4f8, 0x1f4f8,
-	0x1f4fd, 0x1f4ff,
-	0x1f53e, 0x1f53f,
-	0x1f544, 0x1f54f,
-	0x1f568, 0x1f5fa,
-	0x1f641, 0x1f644,
-	0x1f650, 0x1f67f,
-	0x1f6c6, 0x1f6ff,
-	0x1f774, 0x1ffff,
-	0x2a6d7, 0x2a6ff,
-	0x2b735, 0x2b73f,
-	0x2b81e, 0x2f7ff,
-	0x2fa1e, 0xe00ff,
-	0xe01f0, 0x10ffff,
-}; /* CR_C */
-
-/* 'Cc': General Category */
-#define CR_Cc CR_Cntrl
-
-/* 'Cf': General Category */
-static const OnigCodePoint CR_Cf[] = {
-	14,
-	0x00ad, 0x00ad,
-	0x0600, 0x0604,
-	0x06dd, 0x06dd,
-	0x070f, 0x070f,
-	0x200b, 0x200f,
-	0x202a, 0x202e,
-	0x2060, 0x2064,
-	0x206a, 0x206f,
-	0xfeff, 0xfeff,
-	0xfff9, 0xfffb,
-	0x110bd, 0x110bd,
-	0x1d173, 0x1d17a,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-}; /* CR_Cf */
-
-/* 'Cn': General Category */
-static const OnigCodePoint CR_Cn[] = {
-	539,
-	0x0378, 0x0379,
-	0x037f, 0x0383,
-	0x038b, 0x038b,
-	0x038d, 0x038d,
-	0x03a2, 0x03a2,
-	0x0528, 0x0530,
-	0x0557, 0x0558,
-	0x0560, 0x0560,
-	0x0588, 0x0588,
-	0x058b, 0x058e,
-	0x0590, 0x0590,
-	0x05c8, 0x05cf,
-	0x05eb, 0x05ef,
-	0x05f5, 0x05ff,
-	0x0605, 0x0605,
-	0x061c, 0x061d,
-	0x070e, 0x070e,
-	0x074b, 0x074c,
-	0x07b2, 0x07bf,
-	0x07fb, 0x07ff,
-	0x082e, 0x082f,
-	0x083f, 0x083f,
-	0x085c, 0x085d,
-	0x085f, 0x089f,
-	0x08a1, 0x08a1,
-	0x08ad, 0x08e3,
-	0x08ff, 0x08ff,
-	0x0978, 0x0978,
-	0x0980, 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,
-	0x09fc, 0x0a00,
-	0x0a04, 0x0a04,
-	0x0a0b, 0x0a0e,
-	0x0a11, 0x0a12,
-	0x0a29, 0x0a29,
-	0x0a31, 0x0a31,
-	0x0a34, 0x0a34,
-	0x0a37, 0x0a37,
-	0x0a3a, 0x0a3b,
-	0x0a3d, 0x0a3d,
-	0x0a43, 0x0a46,
-	0x0a49, 0x0a4a,
-	0x0a4e, 0x0a50,
-	0x0a52, 0x0a58,
-	0x0a5d, 0x0a5d,
-	0x0a5f, 0x0a65,
-	0x0a76, 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,
-	0x0af2, 0x0b00,
-	0x0b04, 0x0b04,
-	0x0b0d, 0x0b0e,
-	0x0b11, 0x0b12,
-	0x0b29, 0x0b29,
-	0x0b31, 0x0b31,
-	0x0b34, 0x0b34,
-	0x0b3a, 0x0b3b,
-	0x0b45, 0x0b46,
-	0x0b49, 0x0b4a,
-	0x0b4e, 0x0b55,
-	0x0b58, 0x0b5b,
-	0x0b5e, 0x0b5e,
-	0x0b64, 0x0b65,
-	0x0b78, 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, 0x0bcf,
-	0x0bd1, 0x0bd6,
-	0x0bd8, 0x0be5,
-	0x0bfb, 0x0c00,
-	0x0c04, 0x0c04,
-	0x0c0d, 0x0c0d,
-	0x0c11, 0x0c11,
-	0x0c29, 0x0c29,
-	0x0c34, 0x0c34,
-	0x0c3a, 0x0c3c,
-	0x0c45, 0x0c45,
-	0x0c49, 0x0c49,
-	0x0c4e, 0x0c54,
-	0x0c57, 0x0c57,
-	0x0c5a, 0x0c5f,
-	0x0c64, 0x0c65,
-	0x0c70, 0x0c77,
-	0x0c80, 0x0c81,
-	0x0c84, 0x0c84,
-	0x0c8d, 0x0c8d,
-	0x0c91, 0x0c91,
-	0x0ca9, 0x0ca9,
-	0x0cb4, 0x0cb4,
-	0x0cba, 0x0cbb,
-	0x0cc5, 0x0cc5,
-	0x0cc9, 0x0cc9,
-	0x0cce, 0x0cd4,
-	0x0cd7, 0x0cdd,
-	0x0cdf, 0x0cdf,
-	0x0ce4, 0x0ce5,
-	0x0cf0, 0x0cf0,
-	0x0cf3, 0x0d01,
-	0x0d04, 0x0d04,
-	0x0d0d, 0x0d0d,
-	0x0d11, 0x0d11,
-	0x0d3b, 0x0d3c,
-	0x0d45, 0x0d45,
-	0x0d49, 0x0d49,
-	0x0d4f, 0x0d56,
-	0x0d58, 0x0d5f,
-	0x0d64, 0x0d65,
-	0x0d76, 0x0d78,
-	0x0d80, 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,
-	0x0ee0, 0x0eff,
-	0x0f48, 0x0f48,
-	0x0f6d, 0x0f70,
-	0x0f98, 0x0f98,
-	0x0fbd, 0x0fbd,
-	0x0fcd, 0x0fcd,
-	0x0fdb, 0x0fff,
-	0x10c6, 0x10c6,
-	0x10c8, 0x10cc,
-	0x10ce, 0x10cf,
-	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, 0x135c,
-	0x137d, 0x137f,
-	0x139a, 0x139f,
-	0x13f5, 0x13ff,
-	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,
-	0x18ab, 0x18af,
-	0x18f6, 0x18ff,
-	0x191d, 0x191f,
-	0x192c, 0x192f,
-	0x193c, 0x193f,
-	0x1941, 0x1943,
-	0x196e, 0x196f,
-	0x1975, 0x197f,
-	0x19ac, 0x19af,
-	0x19ca, 0x19cf,
-	0x19db, 0x19dd,
-	0x1a1c, 0x1a1d,
-	0x1a5f, 0x1a5f,
-	0x1a7d, 0x1a7e,
-	0x1a8a, 0x1a8f,
-	0x1a9a, 0x1a9f,
-	0x1aae, 0x1aff,
-	0x1b4c, 0x1b4f,
-	0x1b7d, 0x1b7f,
-	0x1bf4, 0x1bfb,
-	0x1c38, 0x1c3a,
-	0x1c4a, 0x1c4c,
-	0x1c80, 0x1cbf,
-	0x1cc8, 0x1ccf,
-	0x1cf7, 0x1cff,
-	0x1de7, 0x1dfb,
-	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,
-	0x2065, 0x2069,
-	0x2072, 0x2073,
-	0x208f, 0x208f,
-	0x209d, 0x209f,
-	0x20ba, 0x20cf,
-	0x20f1, 0x20ff,
-	0x218a, 0x218f,
-	0x23f4, 0x23ff,
-	0x2427, 0x243f,
-	0x244b, 0x245f,
-	0x2700, 0x2700,
-	0x2b4d, 0x2b4f,
-	0x2b5a, 0x2bff,
-	0x2c2f, 0x2c2f,
-	0x2c5f, 0x2c5f,
-	0x2cf4, 0x2cf8,
-	0x2d26, 0x2d26,
-	0x2d28, 0x2d2c,
-	0x2d2e, 0x2d2f,
-	0x2d68, 0x2d6e,
-	0x2d71, 0x2d7e,
-	0x2d97, 0x2d9f,
-	0x2da7, 0x2da7,
-	0x2daf, 0x2daf,
-	0x2db7, 0x2db7,
-	0x2dbf, 0x2dbf,
-	0x2dc7, 0x2dc7,
-	0x2dcf, 0x2dcf,
-	0x2dd7, 0x2dd7,
-	0x2ddf, 0x2ddf,
-	0x2e3c, 0x2e7f,
-	0x2e9a, 0x2e9a,
-	0x2ef4, 0x2eff,
-	0x2fd6, 0x2fef,
-	0x2ffc, 0x2fff,
-	0x3040, 0x3040,
-	0x3097, 0x3098,
-	0x3100, 0x3104,
-	0x312e, 0x3130,
-	0x318f, 0x318f,
-	0x31bb, 0x31bf,
-	0x31e4, 0x31ef,
-	0x321f, 0x321f,
-	0x32ff, 0x32ff,
-	0x4db6, 0x4dbf,
-	0x9fcd, 0x9fff,
-	0xa48d, 0xa48f,
-	0xa4c7, 0xa4cf,
-	0xa62c, 0xa63f,
-	0xa698, 0xa69e,
-	0xa6f8, 0xa6ff,
-	0xa78f, 0xa78f,
-	0xa794, 0xa79f,
-	0xa7ab, 0xa7f7,
-	0xa82c, 0xa82f,
-	0xa83a, 0xa83f,
-	0xa878, 0xa87f,
-	0xa8c5, 0xa8cd,
-	0xa8da, 0xa8df,
-	0xa8fc, 0xa8ff,
-	0xa954, 0xa95e,
-	0xa97d, 0xa97f,
-	0xa9ce, 0xa9ce,
-	0xa9da, 0xa9dd,
-	0xa9e0, 0xa9ff,
-	0xaa37, 0xaa3f,
-	0xaa4e, 0xaa4f,
-	0xaa5a, 0xaa5b,
-	0xaa7c, 0xaa7f,
-	0xaac3, 0xaada,
-	0xaaf7, 0xab00,
-	0xab07, 0xab08,
-	0xab0f, 0xab10,
-	0xab17, 0xab1f,
-	0xab27, 0xab27,
-	0xab2f, 0xabbf,
-	0xabee, 0xabef,
-	0xabfa, 0xabff,
-	0xd7a4, 0xd7af,
-	0xd7c7, 0xd7ca,
-	0xd7fc, 0xd7ff,
-	0xfa6e, 0xfa6f,
-	0xfada, 0xfaff,
-	0xfb07, 0xfb12,
-	0xfb18, 0xfb1c,
-	0xfb37, 0xfb37,
-	0xfb3d, 0xfb3d,
-	0xfb3f, 0xfb3f,
-	0xfb42, 0xfb42,
-	0xfb45, 0xfb45,
-	0xfbc2, 0xfbd2,
-	0xfd40, 0xfd4f,
-	0xfd90, 0xfd91,
-	0xfdc8, 0xfdef,
-	0xfdfe, 0xfdff,
-	0xfe1a, 0xfe1f,
-	0xfe27, 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, 0x1018f,
-	0x1019c, 0x101cf,
-	0x101fe, 0x1027f,
-	0x1029d, 0x1029f,
-	0x102d1, 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,
-	0x10856, 0x10856,
-	0x10860, 0x108ff,
-	0x1091c, 0x1091e,
-	0x1093a, 0x1093e,
-	0x10940, 0x1097f,
-	0x109b8, 0x109bd,
-	0x109c0, 0x109ff,
-	0x10a04, 0x10a04,
-	0x10a07, 0x10a0b,
-	0x10a14, 0x10a14,
-	0x10a18, 0x10a18,
-	0x10a34, 0x10a37,
-	0x10a3b, 0x10a3e,
-	0x10a48, 0x10a4f,
-	0x10a59, 0x10a5f,
-	0x10a80, 0x10aff,
-	0x10b36, 0x10b38,
-	0x10b56, 0x10b57,
-	0x10b73, 0x10b77,
-	0x10b80, 0x10bff,
-	0x10c49, 0x10e5f,
-	0x10e7f, 0x10fff,
-	0x1104e, 0x11051,
-	0x11070, 0x1107f,
-	0x110c2, 0x110cf,
-	0x110e9, 0x110ef,
-	0x110fa, 0x110ff,
-	0x11135, 0x11135,
-	0x11144, 0x1117f,
-	0x111c9, 0x111cf,
-	0x111da, 0x1167f,
-	0x116b8, 0x116bf,
-	0x116ca, 0x11fff,
-	0x1236f, 0x123ff,
-	0x12463, 0x1246f,
-	0x12474, 0x12fff,
-	0x1342f, 0x167ff,
-	0x16a39, 0x16eff,
-	0x16f45, 0x16f4f,
-	0x16f7f, 0x16f8e,
-	0x16fa0, 0x1afff,
-	0x1b002, 0x1cfff,
-	0x1d0f6, 0x1d0ff,
-	0x1d127, 0x1d128,
-	0x1d1de, 0x1d1ff,
-	0x1d246, 0x1d2ff,
-	0x1d357, 0x1d35f,
-	0x1d372, 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,
-	0x1d7cc, 0x1d7cd,
-	0x1d800, 0x1edff,
-	0x1ee04, 0x1ee04,
-	0x1ee20, 0x1ee20,
-	0x1ee23, 0x1ee23,
-	0x1ee25, 0x1ee26,
-	0x1ee28, 0x1ee28,
-	0x1ee33, 0x1ee33,
-	0x1ee38, 0x1ee38,
-	0x1ee3a, 0x1ee3a,
-	0x1ee3c, 0x1ee41,
-	0x1ee43, 0x1ee46,
-	0x1ee48, 0x1ee48,
-	0x1ee4a, 0x1ee4a,
-	0x1ee4c, 0x1ee4c,
-	0x1ee50, 0x1ee50,
-	0x1ee53, 0x1ee53,
-	0x1ee55, 0x1ee56,
-	0x1ee58, 0x1ee58,
-	0x1ee5a, 0x1ee5a,
-	0x1ee5c, 0x1ee5c,
-	0x1ee5e, 0x1ee5e,
-	0x1ee60, 0x1ee60,
-	0x1ee63, 0x1ee63,
-	0x1ee65, 0x1ee66,
-	0x1ee6b, 0x1ee6b,
-	0x1ee73, 0x1ee73,
-	0x1ee78, 0x1ee78,
-	0x1ee7d, 0x1ee7d,
-	0x1ee7f, 0x1ee7f,
-	0x1ee8a, 0x1ee8a,
-	0x1ee9c, 0x1eea0,
-	0x1eea4, 0x1eea4,
-	0x1eeaa, 0x1eeaa,
-	0x1eebc, 0x1eeef,
-	0x1eef2, 0x1efff,
-	0x1f02c, 0x1f02f,
-	0x1f094, 0x1f09f,
-	0x1f0af, 0x1f0b0,
-	0x1f0bf, 0x1f0c0,
-	0x1f0d0, 0x1f0d0,
-	0x1f0e0, 0x1f0ff,
-	0x1f10b, 0x1f10f,
-	0x1f12f, 0x1f12f,
-	0x1f16c, 0x1f16f,
-	0x1f19b, 0x1f1e5,
-	0x1f203, 0x1f20f,
-	0x1f23b, 0x1f23f,
-	0x1f249, 0x1f24f,
-	0x1f252, 0x1f2ff,
-	0x1f321, 0x1f32f,
-	0x1f336, 0x1f336,
-	0x1f37d, 0x1f37f,
-	0x1f394, 0x1f39f,
-	0x1f3c5, 0x1f3c5,
-	0x1f3cb, 0x1f3df,
-	0x1f3f1, 0x1f3ff,
-	0x1f43f, 0x1f43f,
-	0x1f441, 0x1f441,
-	0x1f4f8, 0x1f4f8,
-	0x1f4fd, 0x1f4ff,
-	0x1f53e, 0x1f53f,
-	0x1f544, 0x1f54f,
-	0x1f568, 0x1f5fa,
-	0x1f641, 0x1f644,
-	0x1f650, 0x1f67f,
-	0x1f6c6, 0x1f6ff,
-	0x1f774, 0x1ffff,
-	0x2a6d7, 0x2a6ff,
-	0x2b735, 0x2b73f,
-	0x2b81e, 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[] = {
-	486,
-	0x0041, 0x005a,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00b5, 0x00b5,
-	0x00ba, 0x00ba,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x02c1,
-	0x02c6, 0x02d1,
-	0x02e0, 0x02e4,
-	0x02ec, 0x02ec,
-	0x02ee, 0x02ee,
-	0x0370, 0x0374,
-	0x0376, 0x0377,
-	0x037a, 0x037d,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x048a, 0x0527,
-	0x0531, 0x0556,
-	0x0559, 0x0559,
-	0x0561, 0x0587,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0620, 0x064a,
-	0x066e, 0x066f,
-	0x0671, 0x06d3,
-	0x06d5, 0x06d5,
-	0x06e5, 0x06e6,
-	0x06ee, 0x06ef,
-	0x06fa, 0x06fc,
-	0x06ff, 0x06ff,
-	0x0710, 0x0710,
-	0x0712, 0x072f,
-	0x074d, 0x07a5,
-	0x07b1, 0x07b1,
-	0x07ca, 0x07ea,
-	0x07f4, 0x07f5,
-	0x07fa, 0x07fa,
-	0x0800, 0x0815,
-	0x081a, 0x081a,
-	0x0824, 0x0824,
-	0x0828, 0x0828,
-	0x0840, 0x0858,
-	0x08a0, 0x08a0,
-	0x08a2, 0x08ac,
-	0x0904, 0x0939,
-	0x093d, 0x093d,
-	0x0950, 0x0950,
-	0x0958, 0x0961,
-	0x0971, 0x0977,
-	0x0979, 0x097f,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c3d,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c61,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbd, 0x0cbd,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce1,
-	0x0cf1, 0x0cf2,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d3d,
-	0x0d4e, 0x0d4e,
-	0x0d60, 0x0d61,
-	0x0d7a, 0x0d7f,
-	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, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f40, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f88, 0x0f8c,
-	0x1000, 0x102a,
-	0x103f, 0x103f,
-	0x1050, 0x1055,
-	0x105a, 0x105d,
-	0x1061, 0x1061,
-	0x1065, 0x1066,
-	0x106e, 0x1070,
-	0x1075, 0x1081,
-	0x108e, 0x108e,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 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, 0x167f,
-	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,
-	0x18aa, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19c1, 0x19c7,
-	0x1a00, 0x1a16,
-	0x1a20, 0x1a54,
-	0x1aa7, 0x1aa7,
-	0x1b05, 0x1b33,
-	0x1b45, 0x1b4b,
-	0x1b83, 0x1ba0,
-	0x1bae, 0x1baf,
-	0x1bba, 0x1be5,
-	0x1c00, 0x1c23,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c7d,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf1,
-	0x1cf5, 0x1cf6,
-	0x1d00, 0x1dbf,
-	0x1e00, 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, 0x209c,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2119, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x212d,
-	0x212f, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2183, 0x2184,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2ce4,
-	0x2ceb, 0x2cee,
-	0x2cf2, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3006,
-	0x3031, 0x3035,
-	0x303b, 0x303c,
-	0x3041, 0x3096,
-	0x309d, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa640, 0xa66e,
-	0xa67f, 0xa697,
-	0xa6a0, 0xa6e5,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xa7f8, 0xa801,
-	0xa803, 0xa805,
-	0xa807, 0xa80a,
-	0xa80c, 0xa822,
-	0xa840, 0xa873,
-	0xa882, 0xa8b3,
-	0xa8f2, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa90a, 0xa925,
-	0xa930, 0xa946,
-	0xa960, 0xa97c,
-	0xa984, 0xa9b2,
-	0xa9cf, 0xa9cf,
-	0xaa00, 0xaa28,
-	0xaa40, 0xaa42,
-	0xaa44, 0xaa4b,
-	0xaa60, 0xaa76,
-	0xaa7a, 0xaa7a,
-	0xaa80, 0xaaaf,
-	0xaab1, 0xaab1,
-	0xaab5, 0xaab6,
-	0xaab9, 0xaabd,
-	0xaac0, 0xaac0,
-	0xaac2, 0xaac2,
-	0xaadb, 0xaadd,
-	0xaae0, 0xaaea,
-	0xaaf2, 0xaaf4,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabe2,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa6d,
-	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,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x10340,
-	0x10342, 0x10349,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x10400, 0x1049d,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a00,
-	0x10a10, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11003, 0x11037,
-	0x11083, 0x110af,
-	0x110d0, 0x110e8,
-	0x11103, 0x11126,
-	0x11183, 0x111b2,
-	0x111c1, 0x111c4,
-	0x11680, 0x116aa,
-	0x12000, 0x1236e,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f50,
-	0x16f93, 0x16f9f,
-	0x1b000, 0x1b001,
-	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, 0x1d7cb,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_L */
-
-/* 'LC': General Category */
-static const OnigCodePoint CR_LC[] = {
-	113,
-	0x0041, 0x005a,
-	0x0061, 0x007a,
-	0x00b5, 0x00b5,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x01ba,
-	0x01bc, 0x01bf,
-	0x01c4, 0x0293,
-	0x0295, 0x02af,
-	0x0370, 0x0373,
-	0x0376, 0x0377,
-	0x037b, 0x037d,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x048a, 0x0527,
-	0x0531, 0x0556,
-	0x0561, 0x0587,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x1d00, 0x1d2b,
-	0x1d6b, 0x1d77,
-	0x1d79, 0x1d9a,
-	0x1e00, 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,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2119, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x212d,
-	0x212f, 0x2134,
-	0x2139, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2183, 0x2184,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2c7b,
-	0x2c7e, 0x2ce4,
-	0x2ceb, 0x2cee,
-	0x2cf2, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0xa640, 0xa66d,
-	0xa680, 0xa697,
-	0xa722, 0xa76f,
-	0xa771, 0xa787,
-	0xa78b, 0xa78e,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xa7fa, 0xa7fa,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0x10400, 0x1044f,
-	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, 0x1d7cb,
-}; /* CR_LC */
-
-/* 'Ll': General Category */
-static const OnigCodePoint CR_Ll[] = {
-	611,
-	0x0061, 0x007a,
-	0x00b5, 0x00b5,
-	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,
-	0x0242, 0x0242,
-	0x0247, 0x0247,
-	0x0249, 0x0249,
-	0x024b, 0x024b,
-	0x024d, 0x024d,
-	0x024f, 0x0293,
-	0x0295, 0x02af,
-	0x0371, 0x0371,
-	0x0373, 0x0373,
-	0x0377, 0x0377,
-	0x037b, 0x037d,
-	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, 0x04cf,
-	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,
-	0x04fb, 0x04fb,
-	0x04fd, 0x04fd,
-	0x04ff, 0x04ff,
-	0x0501, 0x0501,
-	0x0503, 0x0503,
-	0x0505, 0x0505,
-	0x0507, 0x0507,
-	0x0509, 0x0509,
-	0x050b, 0x050b,
-	0x050d, 0x050d,
-	0x050f, 0x050f,
-	0x0511, 0x0511,
-	0x0513, 0x0513,
-	0x0515, 0x0515,
-	0x0517, 0x0517,
-	0x0519, 0x0519,
-	0x051b, 0x051b,
-	0x051d, 0x051d,
-	0x051f, 0x051f,
-	0x0521, 0x0521,
-	0x0523, 0x0523,
-	0x0525, 0x0525,
-	0x0527, 0x0527,
-	0x0561, 0x0587,
-	0x1d00, 0x1d2b,
-	0x1d6b, 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, 0x1e9d,
-	0x1e9f, 0x1e9f,
-	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,
-	0x1efb, 0x1efb,
-	0x1efd, 0x1efd,
-	0x1eff, 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,
-	0x210a, 0x210a,
-	0x210e, 0x210f,
-	0x2113, 0x2113,
-	0x212f, 0x212f,
-	0x2134, 0x2134,
-	0x2139, 0x2139,
-	0x213c, 0x213d,
-	0x2146, 0x2149,
-	0x214e, 0x214e,
-	0x2184, 0x2184,
-	0x2c30, 0x2c5e,
-	0x2c61, 0x2c61,
-	0x2c65, 0x2c66,
-	0x2c68, 0x2c68,
-	0x2c6a, 0x2c6a,
-	0x2c6c, 0x2c6c,
-	0x2c71, 0x2c71,
-	0x2c73, 0x2c74,
-	0x2c76, 0x2c7b,
-	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,
-	0x2cec, 0x2cec,
-	0x2cee, 0x2cee,
-	0x2cf3, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0xa641, 0xa641,
-	0xa643, 0xa643,
-	0xa645, 0xa645,
-	0xa647, 0xa647,
-	0xa649, 0xa649,
-	0xa64b, 0xa64b,
-	0xa64d, 0xa64d,
-	0xa64f, 0xa64f,
-	0xa651, 0xa651,
-	0xa653, 0xa653,
-	0xa655, 0xa655,
-	0xa657, 0xa657,
-	0xa659, 0xa659,
-	0xa65b, 0xa65b,
-	0xa65d, 0xa65d,
-	0xa65f, 0xa65f,
-	0xa661, 0xa661,
-	0xa663, 0xa663,
-	0xa665, 0xa665,
-	0xa667, 0xa667,
-	0xa669, 0xa669,
-	0xa66b, 0xa66b,
-	0xa66d, 0xa66d,
-	0xa681, 0xa681,
-	0xa683, 0xa683,
-	0xa685, 0xa685,
-	0xa687, 0xa687,
-	0xa689, 0xa689,
-	0xa68b, 0xa68b,
-	0xa68d, 0xa68d,
-	0xa68f, 0xa68f,
-	0xa691, 0xa691,
-	0xa693, 0xa693,
-	0xa695, 0xa695,
-	0xa697, 0xa697,
-	0xa723, 0xa723,
-	0xa725, 0xa725,
-	0xa727, 0xa727,
-	0xa729, 0xa729,
-	0xa72b, 0xa72b,
-	0xa72d, 0xa72d,
-	0xa72f, 0xa731,
-	0xa733, 0xa733,
-	0xa735, 0xa735,
-	0xa737, 0xa737,
-	0xa739, 0xa739,
-	0xa73b, 0xa73b,
-	0xa73d, 0xa73d,
-	0xa73f, 0xa73f,
-	0xa741, 0xa741,
-	0xa743, 0xa743,
-	0xa745, 0xa745,
-	0xa747, 0xa747,
-	0xa749, 0xa749,
-	0xa74b, 0xa74b,
-	0xa74d, 0xa74d,
-	0xa74f, 0xa74f,
-	0xa751, 0xa751,
-	0xa753, 0xa753,
-	0xa755, 0xa755,
-	0xa757, 0xa757,
-	0xa759, 0xa759,
-	0xa75b, 0xa75b,
-	0xa75d, 0xa75d,
-	0xa75f, 0xa75f,
-	0xa761, 0xa761,
-	0xa763, 0xa763,
-	0xa765, 0xa765,
-	0xa767, 0xa767,
-	0xa769, 0xa769,
-	0xa76b, 0xa76b,
-	0xa76d, 0xa76d,
-	0xa76f, 0xa76f,
-	0xa771, 0xa778,
-	0xa77a, 0xa77a,
-	0xa77c, 0xa77c,
-	0xa77f, 0xa77f,
-	0xa781, 0xa781,
-	0xa783, 0xa783,
-	0xa785, 0xa785,
-	0xa787, 0xa787,
-	0xa78c, 0xa78c,
-	0xa78e, 0xa78e,
-	0xa791, 0xa791,
-	0xa793, 0xa793,
-	0xa7a1, 0xa7a1,
-	0xa7a3, 0xa7a3,
-	0xa7a5, 0xa7a5,
-	0xa7a7, 0xa7a7,
-	0xa7a9, 0xa7a9,
-	0xa7fa, 0xa7fa,
-	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,
-	0x1d7cb, 0x1d7cb,
-}; /* CR_Ll */
-
-/* 'Lm': General Category */
-static const OnigCodePoint CR_Lm[] = {
-	52,
-	0x02b0, 0x02c1,
-	0x02c6, 0x02d1,
-	0x02e0, 0x02e4,
-	0x02ec, 0x02ec,
-	0x02ee, 0x02ee,
-	0x0374, 0x0374,
-	0x037a, 0x037a,
-	0x0559, 0x0559,
-	0x0640, 0x0640,
-	0x06e5, 0x06e6,
-	0x07f4, 0x07f5,
-	0x07fa, 0x07fa,
-	0x081a, 0x081a,
-	0x0824, 0x0824,
-	0x0828, 0x0828,
-	0x0971, 0x0971,
-	0x0e46, 0x0e46,
-	0x0ec6, 0x0ec6,
-	0x10fc, 0x10fc,
-	0x17d7, 0x17d7,
-	0x1843, 0x1843,
-	0x1aa7, 0x1aa7,
-	0x1c78, 0x1c7d,
-	0x1d2c, 0x1d6a,
-	0x1d78, 0x1d78,
-	0x1d9b, 0x1dbf,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 0x209c,
-	0x2c7c, 0x2c7d,
-	0x2d6f, 0x2d6f,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3005,
-	0x3031, 0x3035,
-	0x303b, 0x303b,
-	0x309d, 0x309e,
-	0x30fc, 0x30fe,
-	0xa015, 0xa015,
-	0xa4f8, 0xa4fd,
-	0xa60c, 0xa60c,
-	0xa67f, 0xa67f,
-	0xa717, 0xa71f,
-	0xa770, 0xa770,
-	0xa788, 0xa788,
-	0xa7f8, 0xa7f9,
-	0xa9cf, 0xa9cf,
-	0xaa70, 0xaa70,
-	0xaadd, 0xaadd,
-	0xaaf3, 0xaaf4,
-	0xff70, 0xff70,
-	0xff9e, 0xff9f,
-	0x16f93, 0x16f9f,
-}; /* CR_Lm */
-
-/* 'Lo': General Category */
-static const OnigCodePoint CR_Lo[] = {
-	371,
-	0x00aa, 0x00aa,
-	0x00ba, 0x00ba,
-	0x01bb, 0x01bb,
-	0x01c0, 0x01c3,
-	0x0294, 0x0294,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0620, 0x063f,
-	0x0641, 0x064a,
-	0x066e, 0x066f,
-	0x0671, 0x06d3,
-	0x06d5, 0x06d5,
-	0x06ee, 0x06ef,
-	0x06fa, 0x06fc,
-	0x06ff, 0x06ff,
-	0x0710, 0x0710,
-	0x0712, 0x072f,
-	0x074d, 0x07a5,
-	0x07b1, 0x07b1,
-	0x07ca, 0x07ea,
-	0x0800, 0x0815,
-	0x0840, 0x0858,
-	0x08a0, 0x08a0,
-	0x08a2, 0x08ac,
-	0x0904, 0x0939,
-	0x093d, 0x093d,
-	0x0950, 0x0950,
-	0x0958, 0x0961,
-	0x0972, 0x0977,
-	0x0979, 0x097f,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c3d,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c61,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbd, 0x0cbd,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce1,
-	0x0cf1, 0x0cf2,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d3d,
-	0x0d4e, 0x0d4e,
-	0x0d60, 0x0d61,
-	0x0d7a, 0x0d7f,
-	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, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f40, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f88, 0x0f8c,
-	0x1000, 0x102a,
-	0x103f, 0x103f,
-	0x1050, 0x1055,
-	0x105a, 0x105d,
-	0x1061, 0x1061,
-	0x1065, 0x1066,
-	0x106e, 0x1070,
-	0x1075, 0x1081,
-	0x108e, 0x108e,
-	0x10d0, 0x10fa,
-	0x10fd, 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, 0x167f,
-	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,
-	0x18aa, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19c1, 0x19c7,
-	0x1a00, 0x1a16,
-	0x1a20, 0x1a54,
-	0x1b05, 0x1b33,
-	0x1b45, 0x1b4b,
-	0x1b83, 0x1ba0,
-	0x1bae, 0x1baf,
-	0x1bba, 0x1be5,
-	0x1c00, 0x1c23,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c77,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf1,
-	0x1cf5, 0x1cf6,
-	0x2135, 0x2138,
-	0x2d30, 0x2d67,
-	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, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcc,
-	0xa000, 0xa014,
-	0xa016, 0xa48c,
-	0xa4d0, 0xa4f7,
-	0xa500, 0xa60b,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa66e, 0xa66e,
-	0xa6a0, 0xa6e5,
-	0xa7fb, 0xa801,
-	0xa803, 0xa805,
-	0xa807, 0xa80a,
-	0xa80c, 0xa822,
-	0xa840, 0xa873,
-	0xa882, 0xa8b3,
-	0xa8f2, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa90a, 0xa925,
-	0xa930, 0xa946,
-	0xa960, 0xa97c,
-	0xa984, 0xa9b2,
-	0xaa00, 0xaa28,
-	0xaa40, 0xaa42,
-	0xaa44, 0xaa4b,
-	0xaa60, 0xaa6f,
-	0xaa71, 0xaa76,
-	0xaa7a, 0xaa7a,
-	0xaa80, 0xaaaf,
-	0xaab1, 0xaab1,
-	0xaab5, 0xaab6,
-	0xaab9, 0xaabd,
-	0xaac0, 0xaac0,
-	0xaac2, 0xaac2,
-	0xaadb, 0xaadc,
-	0xaae0, 0xaaea,
-	0xaaf2, 0xaaf2,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabe2,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa6d,
-	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,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x10340,
-	0x10342, 0x10349,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x10450, 0x1049d,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a00,
-	0x10a10, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11003, 0x11037,
-	0x11083, 0x110af,
-	0x110d0, 0x110e8,
-	0x11103, 0x11126,
-	0x11183, 0x111b2,
-	0x111c1, 0x111c4,
-	0x11680, 0x116aa,
-	0x12000, 0x1236e,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f50,
-	0x1b000, 0x1b001,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	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[] = {
-	608,
-	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,
-	0x0243, 0x0246,
-	0x0248, 0x0248,
-	0x024a, 0x024a,
-	0x024c, 0x024c,
-	0x024e, 0x024e,
-	0x0370, 0x0370,
-	0x0372, 0x0372,
-	0x0376, 0x0376,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x038f,
-	0x0391, 0x03a1,
-	0x03a3, 0x03ab,
-	0x03cf, 0x03cf,
-	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,
-	0x04fa, 0x04fa,
-	0x04fc, 0x04fc,
-	0x04fe, 0x04fe,
-	0x0500, 0x0500,
-	0x0502, 0x0502,
-	0x0504, 0x0504,
-	0x0506, 0x0506,
-	0x0508, 0x0508,
-	0x050a, 0x050a,
-	0x050c, 0x050c,
-	0x050e, 0x050e,
-	0x0510, 0x0510,
-	0x0512, 0x0512,
-	0x0514, 0x0514,
-	0x0516, 0x0516,
-	0x0518, 0x0518,
-	0x051a, 0x051a,
-	0x051c, 0x051c,
-	0x051e, 0x051e,
-	0x0520, 0x0520,
-	0x0522, 0x0522,
-	0x0524, 0x0524,
-	0x0526, 0x0526,
-	0x0531, 0x0556,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	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,
-	0x1e9e, 0x1e9e,
-	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,
-	0x1efa, 0x1efa,
-	0x1efc, 0x1efc,
-	0x1efe, 0x1efe,
-	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, 0x2133,
-	0x213e, 0x213f,
-	0x2145, 0x2145,
-	0x2183, 0x2183,
-	0x2c00, 0x2c2e,
-	0x2c60, 0x2c60,
-	0x2c62, 0x2c64,
-	0x2c67, 0x2c67,
-	0x2c69, 0x2c69,
-	0x2c6b, 0x2c6b,
-	0x2c6d, 0x2c70,
-	0x2c72, 0x2c72,
-	0x2c75, 0x2c75,
-	0x2c7e, 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,
-	0x2ceb, 0x2ceb,
-	0x2ced, 0x2ced,
-	0x2cf2, 0x2cf2,
-	0xa640, 0xa640,
-	0xa642, 0xa642,
-	0xa644, 0xa644,
-	0xa646, 0xa646,
-	0xa648, 0xa648,
-	0xa64a, 0xa64a,
-	0xa64c, 0xa64c,
-	0xa64e, 0xa64e,
-	0xa650, 0xa650,
-	0xa652, 0xa652,
-	0xa654, 0xa654,
-	0xa656, 0xa656,
-	0xa658, 0xa658,
-	0xa65a, 0xa65a,
-	0xa65c, 0xa65c,
-	0xa65e, 0xa65e,
-	0xa660, 0xa660,
-	0xa662, 0xa662,
-	0xa664, 0xa664,
-	0xa666, 0xa666,
-	0xa668, 0xa668,
-	0xa66a, 0xa66a,
-	0xa66c, 0xa66c,
-	0xa680, 0xa680,
-	0xa682, 0xa682,
-	0xa684, 0xa684,
-	0xa686, 0xa686,
-	0xa688, 0xa688,
-	0xa68a, 0xa68a,
-	0xa68c, 0xa68c,
-	0xa68e, 0xa68e,
-	0xa690, 0xa690,
-	0xa692, 0xa692,
-	0xa694, 0xa694,
-	0xa696, 0xa696,
-	0xa722, 0xa722,
-	0xa724, 0xa724,
-	0xa726, 0xa726,
-	0xa728, 0xa728,
-	0xa72a, 0xa72a,
-	0xa72c, 0xa72c,
-	0xa72e, 0xa72e,
-	0xa732, 0xa732,
-	0xa734, 0xa734,
-	0xa736, 0xa736,
-	0xa738, 0xa738,
-	0xa73a, 0xa73a,
-	0xa73c, 0xa73c,
-	0xa73e, 0xa73e,
-	0xa740, 0xa740,
-	0xa742, 0xa742,
-	0xa744, 0xa744,
-	0xa746, 0xa746,
-	0xa748, 0xa748,
-	0xa74a, 0xa74a,
-	0xa74c, 0xa74c,
-	0xa74e, 0xa74e,
-	0xa750, 0xa750,
-	0xa752, 0xa752,
-	0xa754, 0xa754,
-	0xa756, 0xa756,
-	0xa758, 0xa758,
-	0xa75a, 0xa75a,
-	0xa75c, 0xa75c,
-	0xa75e, 0xa75e,
-	0xa760, 0xa760,
-	0xa762, 0xa762,
-	0xa764, 0xa764,
-	0xa766, 0xa766,
-	0xa768, 0xa768,
-	0xa76a, 0xa76a,
-	0xa76c, 0xa76c,
-	0xa76e, 0xa76e,
-	0xa779, 0xa779,
-	0xa77b, 0xa77b,
-	0xa77d, 0xa77e,
-	0xa780, 0xa780,
-	0xa782, 0xa782,
-	0xa784, 0xa784,
-	0xa786, 0xa786,
-	0xa78b, 0xa78b,
-	0xa78d, 0xa78d,
-	0xa790, 0xa790,
-	0xa792, 0xa792,
-	0xa7a0, 0xa7a0,
-	0xa7a2, 0xa7a2,
-	0xa7a4, 0xa7a4,
-	0xa7a6, 0xa7a6,
-	0xa7a8, 0xa7a8,
-	0xa7aa, 0xa7aa,
-	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,
-	0x1d7ca, 0x1d7ca,
-}; /* CR_Lu */
-
-/* 'M': Major Category */
-static const OnigCodePoint CR_M[] = {
-	204,
-	0x0300, 0x036f,
-	0x0483, 0x0489,
-	0x0591, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x0610, 0x061a,
-	0x064b, 0x065f,
-	0x0670, 0x0670,
-	0x06d6, 0x06dc,
-	0x06df, 0x06e4,
-	0x06e7, 0x06e8,
-	0x06ea, 0x06ed,
-	0x0711, 0x0711,
-	0x0730, 0x074a,
-	0x07a6, 0x07b0,
-	0x07eb, 0x07f3,
-	0x0816, 0x0819,
-	0x081b, 0x0823,
-	0x0825, 0x0827,
-	0x0829, 0x082d,
-	0x0859, 0x085b,
-	0x08e4, 0x08fe,
-	0x0900, 0x0903,
-	0x093a, 0x093c,
-	0x093e, 0x094f,
-	0x0951, 0x0957,
-	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,
-	0x0a51, 0x0a51,
-	0x0a70, 0x0a71,
-	0x0a75, 0x0a75,
-	0x0a81, 0x0a83,
-	0x0abc, 0x0abc,
-	0x0abe, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acd,
-	0x0ae2, 0x0ae3,
-	0x0b01, 0x0b03,
-	0x0b3c, 0x0b3c,
-	0x0b3e, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b62, 0x0b63,
-	0x0b82, 0x0b82,
-	0x0bbe, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcd,
-	0x0bd7, 0x0bd7,
-	0x0c01, 0x0c03,
-	0x0c3e, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c62, 0x0c63,
-	0x0c82, 0x0c83,
-	0x0cbc, 0x0cbc,
-	0x0cbe, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0ce2, 0x0ce3,
-	0x0d02, 0x0d03,
-	0x0d3e, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
-	0x0d57, 0x0d57,
-	0x0d62, 0x0d63,
-	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,
-	0x0f8d, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fc6, 0x0fc6,
-	0x102b, 0x103e,
-	0x1056, 0x1059,
-	0x105e, 0x1060,
-	0x1062, 0x1064,
-	0x1067, 0x106d,
-	0x1071, 0x1074,
-	0x1082, 0x108d,
-	0x108f, 0x108f,
-	0x109a, 0x109d,
-	0x135d, 0x135f,
-	0x1712, 0x1714,
-	0x1732, 0x1734,
-	0x1752, 0x1753,
-	0x1772, 0x1773,
-	0x17b4, 0x17d3,
-	0x17dd, 0x17dd,
-	0x180b, 0x180d,
-	0x18a9, 0x18a9,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x19b0, 0x19c0,
-	0x19c8, 0x19c9,
-	0x1a17, 0x1a1b,
-	0x1a55, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a7f,
-	0x1b00, 0x1b04,
-	0x1b34, 0x1b44,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1b82,
-	0x1ba1, 0x1bad,
-	0x1be6, 0x1bf3,
-	0x1c24, 0x1c37,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1cf2, 0x1cf4,
-	0x1dc0, 0x1de6,
-	0x1dfc, 0x1dff,
-	0x20d0, 0x20f0,
-	0x2cef, 0x2cf1,
-	0x2d7f, 0x2d7f,
-	0x2de0, 0x2dff,
-	0x302a, 0x302f,
-	0x3099, 0x309a,
-	0xa66f, 0xa672,
-	0xa674, 0xa67d,
-	0xa69f, 0xa69f,
-	0xa6f0, 0xa6f1,
-	0xa802, 0xa802,
-	0xa806, 0xa806,
-	0xa80b, 0xa80b,
-	0xa823, 0xa827,
-	0xa880, 0xa881,
-	0xa8b4, 0xa8c4,
-	0xa8e0, 0xa8f1,
-	0xa926, 0xa92d,
-	0xa947, 0xa953,
-	0xa980, 0xa983,
-	0xa9b3, 0xa9c0,
-	0xaa29, 0xaa36,
-	0xaa43, 0xaa43,
-	0xaa4c, 0xaa4d,
-	0xaa7b, 0xaa7b,
-	0xaab0, 0xaab0,
-	0xaab2, 0xaab4,
-	0xaab7, 0xaab8,
-	0xaabe, 0xaabf,
-	0xaac1, 0xaac1,
-	0xaaeb, 0xaaef,
-	0xaaf5, 0xaaf6,
-	0xabe3, 0xabea,
-	0xabec, 0xabed,
-	0xfb1e, 0xfb1e,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe26,
-	0x101fd, 0x101fd,
-	0x10a01, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a0f,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x11000, 0x11002,
-	0x11038, 0x11046,
-	0x11080, 0x11082,
-	0x110b0, 0x110ba,
-	0x11100, 0x11102,
-	0x11127, 0x11134,
-	0x11180, 0x11182,
-	0x111b3, 0x111c0,
-	0x116ab, 0x116b7,
-	0x16f51, 0x16f7e,
-	0x16f8f, 0x16f92,
-	0x1d165, 0x1d169,
-	0x1d16d, 0x1d172,
-	0x1d17b, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-	0x1d242, 0x1d244,
-	0xe0100, 0xe01ef,
-}; /* CR_M */
-
-/* 'Mc': General Category */
-static const OnigCodePoint CR_Mc[] = {
-	126,
-	0x0903, 0x0903,
-	0x093b, 0x093b,
-	0x093e, 0x0940,
-	0x0949, 0x094c,
-	0x094e, 0x094f,
-	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,
-	0x102b, 0x102c,
-	0x1031, 0x1031,
-	0x1038, 0x1038,
-	0x103b, 0x103c,
-	0x1056, 0x1057,
-	0x1062, 0x1064,
-	0x1067, 0x106d,
-	0x1083, 0x1084,
-	0x1087, 0x108c,
-	0x108f, 0x108f,
-	0x109a, 0x109c,
-	0x17b6, 0x17b6,
-	0x17be, 0x17c5,
-	0x17c7, 0x17c8,
-	0x1923, 0x1926,
-	0x1929, 0x192b,
-	0x1930, 0x1931,
-	0x1933, 0x1938,
-	0x19b0, 0x19c0,
-	0x19c8, 0x19c9,
-	0x1a19, 0x1a1b,
-	0x1a55, 0x1a55,
-	0x1a57, 0x1a57,
-	0x1a61, 0x1a61,
-	0x1a63, 0x1a64,
-	0x1a6d, 0x1a72,
-	0x1b04, 0x1b04,
-	0x1b35, 0x1b35,
-	0x1b3b, 0x1b3b,
-	0x1b3d, 0x1b41,
-	0x1b43, 0x1b44,
-	0x1b82, 0x1b82,
-	0x1ba1, 0x1ba1,
-	0x1ba6, 0x1ba7,
-	0x1baa, 0x1baa,
-	0x1bac, 0x1bad,
-	0x1be7, 0x1be7,
-	0x1bea, 0x1bec,
-	0x1bee, 0x1bee,
-	0x1bf2, 0x1bf3,
-	0x1c24, 0x1c2b,
-	0x1c34, 0x1c35,
-	0x1ce1, 0x1ce1,
-	0x1cf2, 0x1cf3,
-	0x302e, 0x302f,
-	0xa823, 0xa824,
-	0xa827, 0xa827,
-	0xa880, 0xa881,
-	0xa8b4, 0xa8c3,
-	0xa952, 0xa953,
-	0xa983, 0xa983,
-	0xa9b4, 0xa9b5,
-	0xa9ba, 0xa9bb,
-	0xa9bd, 0xa9c0,
-	0xaa2f, 0xaa30,
-	0xaa33, 0xaa34,
-	0xaa4d, 0xaa4d,
-	0xaa7b, 0xaa7b,
-	0xaaeb, 0xaaeb,
-	0xaaee, 0xaaef,
-	0xaaf5, 0xaaf5,
-	0xabe3, 0xabe4,
-	0xabe6, 0xabe7,
-	0xabe9, 0xabea,
-	0xabec, 0xabec,
-	0x11000, 0x11000,
-	0x11002, 0x11002,
-	0x11082, 0x11082,
-	0x110b0, 0x110b2,
-	0x110b7, 0x110b8,
-	0x1112c, 0x1112c,
-	0x11182, 0x11182,
-	0x111b3, 0x111b5,
-	0x111bf, 0x111c0,
-	0x116ac, 0x116ac,
-	0x116ae, 0x116af,
-	0x116b6, 0x116b6,
-	0x16f51, 0x16f7e,
-	0x1d165, 0x1d166,
-	0x1d16d, 0x1d172,
-}; /* CR_Mc */
-
-/* 'Me': General Category */
-static const OnigCodePoint CR_Me[] = {
-	4,
-	0x0488, 0x0489,
-	0x20dd, 0x20e0,
-	0x20e2, 0x20e4,
-	0xa670, 0xa672,
-}; /* CR_Me */
-
-/* 'Mn': General Category */
-static const OnigCodePoint CR_Mn[] = {
-	220,
-	0x0300, 0x036f,
-	0x0483, 0x0487,
-	0x0591, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x0610, 0x061a,
-	0x064b, 0x065f,
-	0x0670, 0x0670,
-	0x06d6, 0x06dc,
-	0x06df, 0x06e4,
-	0x06e7, 0x06e8,
-	0x06ea, 0x06ed,
-	0x0711, 0x0711,
-	0x0730, 0x074a,
-	0x07a6, 0x07b0,
-	0x07eb, 0x07f3,
-	0x0816, 0x0819,
-	0x081b, 0x0823,
-	0x0825, 0x0827,
-	0x0829, 0x082d,
-	0x0859, 0x085b,
-	0x08e4, 0x08fe,
-	0x0900, 0x0902,
-	0x093a, 0x093a,
-	0x093c, 0x093c,
-	0x0941, 0x0948,
-	0x094d, 0x094d,
-	0x0951, 0x0957,
-	0x0962, 0x0963,
-	0x0981, 0x0981,
-	0x09bc, 0x09bc,
-	0x09c1, 0x09c4,
-	0x09cd, 0x09cd,
-	0x09e2, 0x09e3,
-	0x0a01, 0x0a02,
-	0x0a3c, 0x0a3c,
-	0x0a41, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a70, 0x0a71,
-	0x0a75, 0x0a75,
-	0x0a81, 0x0a82,
-	0x0abc, 0x0abc,
-	0x0ac1, 0x0ac5,
-	0x0ac7, 0x0ac8,
-	0x0acd, 0x0acd,
-	0x0ae2, 0x0ae3,
-	0x0b01, 0x0b01,
-	0x0b3c, 0x0b3c,
-	0x0b3f, 0x0b3f,
-	0x0b41, 0x0b44,
-	0x0b4d, 0x0b4d,
-	0x0b56, 0x0b56,
-	0x0b62, 0x0b63,
-	0x0b82, 0x0b82,
-	0x0bc0, 0x0bc0,
-	0x0bcd, 0x0bcd,
-	0x0c3e, 0x0c40,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c62, 0x0c63,
-	0x0cbc, 0x0cbc,
-	0x0cbf, 0x0cbf,
-	0x0cc6, 0x0cc6,
-	0x0ccc, 0x0ccd,
-	0x0ce2, 0x0ce3,
-	0x0d41, 0x0d44,
-	0x0d4d, 0x0d4d,
-	0x0d62, 0x0d63,
-	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,
-	0x0f8d, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fc6, 0x0fc6,
-	0x102d, 0x1030,
-	0x1032, 0x1037,
-	0x1039, 0x103a,
-	0x103d, 0x103e,
-	0x1058, 0x1059,
-	0x105e, 0x1060,
-	0x1071, 0x1074,
-	0x1082, 0x1082,
-	0x1085, 0x1086,
-	0x108d, 0x108d,
-	0x109d, 0x109d,
-	0x135d, 0x135f,
-	0x1712, 0x1714,
-	0x1732, 0x1734,
-	0x1752, 0x1753,
-	0x1772, 0x1773,
-	0x17b4, 0x17b5,
-	0x17b7, 0x17bd,
-	0x17c6, 0x17c6,
-	0x17c9, 0x17d3,
-	0x17dd, 0x17dd,
-	0x180b, 0x180d,
-	0x18a9, 0x18a9,
-	0x1920, 0x1922,
-	0x1927, 0x1928,
-	0x1932, 0x1932,
-	0x1939, 0x193b,
-	0x1a17, 0x1a18,
-	0x1a56, 0x1a56,
-	0x1a58, 0x1a5e,
-	0x1a60, 0x1a60,
-	0x1a62, 0x1a62,
-	0x1a65, 0x1a6c,
-	0x1a73, 0x1a7c,
-	0x1a7f, 0x1a7f,
-	0x1b00, 0x1b03,
-	0x1b34, 0x1b34,
-	0x1b36, 0x1b3a,
-	0x1b3c, 0x1b3c,
-	0x1b42, 0x1b42,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1b81,
-	0x1ba2, 0x1ba5,
-	0x1ba8, 0x1ba9,
-	0x1bab, 0x1bab,
-	0x1be6, 0x1be6,
-	0x1be8, 0x1be9,
-	0x1bed, 0x1bed,
-	0x1bef, 0x1bf1,
-	0x1c2c, 0x1c33,
-	0x1c36, 0x1c37,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce0,
-	0x1ce2, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1cf4, 0x1cf4,
-	0x1dc0, 0x1de6,
-	0x1dfc, 0x1dff,
-	0x20d0, 0x20dc,
-	0x20e1, 0x20e1,
-	0x20e5, 0x20f0,
-	0x2cef, 0x2cf1,
-	0x2d7f, 0x2d7f,
-	0x2de0, 0x2dff,
-	0x302a, 0x302d,
-	0x3099, 0x309a,
-	0xa66f, 0xa66f,
-	0xa674, 0xa67d,
-	0xa69f, 0xa69f,
-	0xa6f0, 0xa6f1,
-	0xa802, 0xa802,
-	0xa806, 0xa806,
-	0xa80b, 0xa80b,
-	0xa825, 0xa826,
-	0xa8c4, 0xa8c4,
-	0xa8e0, 0xa8f1,
-	0xa926, 0xa92d,
-	0xa947, 0xa951,
-	0xa980, 0xa982,
-	0xa9b3, 0xa9b3,
-	0xa9b6, 0xa9b9,
-	0xa9bc, 0xa9bc,
-	0xaa29, 0xaa2e,
-	0xaa31, 0xaa32,
-	0xaa35, 0xaa36,
-	0xaa43, 0xaa43,
-	0xaa4c, 0xaa4c,
-	0xaab0, 0xaab0,
-	0xaab2, 0xaab4,
-	0xaab7, 0xaab8,
-	0xaabe, 0xaabf,
-	0xaac1, 0xaac1,
-	0xaaec, 0xaaed,
-	0xaaf6, 0xaaf6,
-	0xabe5, 0xabe5,
-	0xabe8, 0xabe8,
-	0xabed, 0xabed,
-	0xfb1e, 0xfb1e,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe26,
-	0x101fd, 0x101fd,
-	0x10a01, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a0f,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x11001, 0x11001,
-	0x11038, 0x11046,
-	0x11080, 0x11081,
-	0x110b3, 0x110b6,
-	0x110b9, 0x110ba,
-	0x11100, 0x11102,
-	0x11127, 0x1112b,
-	0x1112d, 0x11134,
-	0x11180, 0x11181,
-	0x111b6, 0x111be,
-	0x116ab, 0x116ab,
-	0x116ad, 0x116ad,
-	0x116b0, 0x116b5,
-	0x116b7, 0x116b7,
-	0x16f8f, 0x16f92,
-	0x1d167, 0x1d169,
-	0x1d17b, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-	0x1d242, 0x1d244,
-	0xe0100, 0xe01ef,
-}; /* CR_Mn */
-
-/* 'N': Major Category */
-static const OnigCodePoint CR_N[] = {
-	88,
-	0x0030, 0x0039,
-	0x00b2, 0x00b3,
-	0x00b9, 0x00b9,
-	0x00bc, 0x00be,
-	0x0660, 0x0669,
-	0x06f0, 0x06f9,
-	0x07c0, 0x07c9,
-	0x0966, 0x096f,
-	0x09e6, 0x09ef,
-	0x09f4, 0x09f9,
-	0x0a66, 0x0a6f,
-	0x0ae6, 0x0aef,
-	0x0b66, 0x0b6f,
-	0x0b72, 0x0b77,
-	0x0be6, 0x0bf2,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7e,
-	0x0ce6, 0x0cef,
-	0x0d66, 0x0d75,
-	0x0e50, 0x0e59,
-	0x0ed0, 0x0ed9,
-	0x0f20, 0x0f33,
-	0x1040, 0x1049,
-	0x1090, 0x1099,
-	0x1369, 0x137c,
-	0x16ee, 0x16f0,
-	0x17e0, 0x17e9,
-	0x17f0, 0x17f9,
-	0x1810, 0x1819,
-	0x1946, 0x194f,
-	0x19d0, 0x19da,
-	0x1a80, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1b50, 0x1b59,
-	0x1bb0, 0x1bb9,
-	0x1c40, 0x1c49,
-	0x1c50, 0x1c59,
-	0x2070, 0x2070,
-	0x2074, 0x2079,
-	0x2080, 0x2089,
-	0x2150, 0x2182,
-	0x2185, 0x2189,
-	0x2460, 0x249b,
-	0x24ea, 0x24ff,
-	0x2776, 0x2793,
-	0x2cfd, 0x2cfd,
-	0x3007, 0x3007,
-	0x3021, 0x3029,
-	0x3038, 0x303a,
-	0x3192, 0x3195,
-	0x3220, 0x3229,
-	0x3248, 0x324f,
-	0x3251, 0x325f,
-	0x3280, 0x3289,
-	0x32b1, 0x32bf,
-	0xa620, 0xa629,
-	0xa6e6, 0xa6ef,
-	0xa830, 0xa835,
-	0xa8d0, 0xa8d9,
-	0xa900, 0xa909,
-	0xa9d0, 0xa9d9,
-	0xaa50, 0xaa59,
-	0xabf0, 0xabf9,
-	0xff10, 0xff19,
-	0x10107, 0x10133,
-	0x10140, 0x10178,
-	0x1018a, 0x1018a,
-	0x10320, 0x10323,
-	0x10341, 0x10341,
-	0x1034a, 0x1034a,
-	0x103d1, 0x103d5,
-	0x104a0, 0x104a9,
-	0x10858, 0x1085f,
-	0x10916, 0x1091b,
-	0x10a40, 0x10a47,
-	0x10a7d, 0x10a7e,
-	0x10b58, 0x10b5f,
-	0x10b78, 0x10b7f,
-	0x10e60, 0x10e7e,
-	0x11052, 0x1106f,
-	0x110f0, 0x110f9,
-	0x11136, 0x1113f,
-	0x111d0, 0x111d9,
-	0x116c0, 0x116c9,
-	0x12400, 0x12462,
-	0x1d360, 0x1d371,
-	0x1d7ce, 0x1d7ff,
-	0x1f100, 0x1f10a,
-}; /* CR_N */
-
-/* 'Nd': General Category */
-#define CR_Nd CR_Digit
-
-/* 'Nl': General Category */
-static const OnigCodePoint CR_Nl[] = {
-	12,
-	0x16ee, 0x16f0,
-	0x2160, 0x2182,
-	0x2185, 0x2188,
-	0x3007, 0x3007,
-	0x3021, 0x3029,
-	0x3038, 0x303a,
-	0xa6e6, 0xa6ef,
-	0x10140, 0x10174,
-	0x10341, 0x10341,
-	0x1034a, 0x1034a,
-	0x103d1, 0x103d5,
-	0x12400, 0x12462,
-}; /* CR_Nl */
-
-/* 'No': General Category */
-static const OnigCodePoint CR_No[] = {
-	42,
-	0x00b2, 0x00b3,
-	0x00b9, 0x00b9,
-	0x00bc, 0x00be,
-	0x09f4, 0x09f9,
-	0x0b72, 0x0b77,
-	0x0bf0, 0x0bf2,
-	0x0c78, 0x0c7e,
-	0x0d70, 0x0d75,
-	0x0f2a, 0x0f33,
-	0x1369, 0x137c,
-	0x17f0, 0x17f9,
-	0x19da, 0x19da,
-	0x2070, 0x2070,
-	0x2074, 0x2079,
-	0x2080, 0x2089,
-	0x2150, 0x215f,
-	0x2189, 0x2189,
-	0x2460, 0x249b,
-	0x24ea, 0x24ff,
-	0x2776, 0x2793,
-	0x2cfd, 0x2cfd,
-	0x3192, 0x3195,
-	0x3220, 0x3229,
-	0x3248, 0x324f,
-	0x3251, 0x325f,
-	0x3280, 0x3289,
-	0x32b1, 0x32bf,
-	0xa830, 0xa835,
-	0x10107, 0x10133,
-	0x10175, 0x10178,
-	0x1018a, 0x1018a,
-	0x10320, 0x10323,
-	0x10858, 0x1085f,
-	0x10916, 0x1091b,
-	0x10a40, 0x10a47,
-	0x10a7d, 0x10a7e,
-	0x10b58, 0x10b5f,
-	0x10b78, 0x10b7f,
-	0x10e60, 0x10e7e,
-	0x11052, 0x11065,
-	0x1d360, 0x1d371,
-	0x1f100, 0x1f10a,
-}; /* CR_No */
-
-/* 'P': Major Category */
-#define CR_P CR_Punct
-
-/* '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[] = {
-	16,
-	0x002d, 0x002d,
-	0x058a, 0x058a,
-	0x05be, 0x05be,
-	0x1400, 0x1400,
-	0x1806, 0x1806,
-	0x2010, 0x2015,
-	0x2e17, 0x2e17,
-	0x2e1a, 0x2e1a,
-	0x2e3a, 0x2e3b,
-	0x301c, 0x301c,
-	0x3030, 0x3030,
-	0x30a0, 0x30a0,
-	0xfe31, 0xfe32,
-	0xfe58, 0xfe58,
-	0xfe63, 0xfe63,
-	0xff0d, 0xff0d,
-}; /* CR_Pd */
-
-/* 'Pe': General Category */
-static const OnigCodePoint CR_Pe[] = {
-	70,
-	0x0029, 0x0029,
-	0x005d, 0x005d,
-	0x007d, 0x007d,
-	0x0f3b, 0x0f3b,
-	0x0f3d, 0x0f3d,
-	0x169c, 0x169c,
-	0x2046, 0x2046,
-	0x207e, 0x207e,
-	0x208e, 0x208e,
-	0x232a, 0x232a,
-	0x2769, 0x2769,
-	0x276b, 0x276b,
-	0x276d, 0x276d,
-	0x276f, 0x276f,
-	0x2771, 0x2771,
-	0x2773, 0x2773,
-	0x2775, 0x2775,
-	0x27c6, 0x27c6,
-	0x27e7, 0x27e7,
-	0x27e9, 0x27e9,
-	0x27eb, 0x27eb,
-	0x27ed, 0x27ed,
-	0x27ef, 0x27ef,
-	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,
-	0x2e23, 0x2e23,
-	0x2e25, 0x2e25,
-	0x2e27, 0x2e27,
-	0x2e29, 0x2e29,
-	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[] = {
-	10,
-	0x00bb, 0x00bb,
-	0x2019, 0x2019,
-	0x201d, 0x201d,
-	0x203a, 0x203a,
-	0x2e03, 0x2e03,
-	0x2e05, 0x2e05,
-	0x2e0a, 0x2e0a,
-	0x2e0d, 0x2e0d,
-	0x2e1d, 0x2e1d,
-	0x2e21, 0x2e21,
-}; /* CR_Pf */
-
-/* 'Pi': General Category */
-static const OnigCodePoint CR_Pi[] = {
-	11,
-	0x00ab, 0x00ab,
-	0x2018, 0x2018,
-	0x201b, 0x201c,
-	0x201f, 0x201f,
-	0x2039, 0x2039,
-	0x2e02, 0x2e02,
-	0x2e04, 0x2e04,
-	0x2e09, 0x2e09,
-	0x2e0c, 0x2e0c,
-	0x2e1c, 0x2e1c,
-	0x2e20, 0x2e20,
-}; /* CR_Pi */
-
-/* 'Po': General Category */
-static const OnigCodePoint CR_Po[] = {
-	135,
-	0x0021, 0x0023,
-	0x0025, 0x0027,
-	0x002a, 0x002a,
-	0x002c, 0x002c,
-	0x002e, 0x002f,
-	0x003a, 0x003b,
-	0x003f, 0x0040,
-	0x005c, 0x005c,
-	0x00a1, 0x00a1,
-	0x00a7, 0x00a7,
-	0x00b6, 0x00b7,
-	0x00bf, 0x00bf,
-	0x037e, 0x037e,
-	0x0387, 0x0387,
-	0x055a, 0x055f,
-	0x0589, 0x0589,
-	0x05c0, 0x05c0,
-	0x05c3, 0x05c3,
-	0x05c6, 0x05c6,
-	0x05f3, 0x05f4,
-	0x0609, 0x060a,
-	0x060c, 0x060d,
-	0x061b, 0x061b,
-	0x061e, 0x061f,
-	0x066a, 0x066d,
-	0x06d4, 0x06d4,
-	0x0700, 0x070d,
-	0x07f7, 0x07f9,
-	0x0830, 0x083e,
-	0x085e, 0x085e,
-	0x0964, 0x0965,
-	0x0970, 0x0970,
-	0x0af0, 0x0af0,
-	0x0df4, 0x0df4,
-	0x0e4f, 0x0e4f,
-	0x0e5a, 0x0e5b,
-	0x0f04, 0x0f12,
-	0x0f14, 0x0f14,
-	0x0f85, 0x0f85,
-	0x0fd0, 0x0fd4,
-	0x0fd9, 0x0fda,
-	0x104a, 0x104f,
-	0x10fb, 0x10fb,
-	0x1360, 0x1368,
-	0x166d, 0x166e,
-	0x16eb, 0x16ed,
-	0x1735, 0x1736,
-	0x17d4, 0x17d6,
-	0x17d8, 0x17da,
-	0x1800, 0x1805,
-	0x1807, 0x180a,
-	0x1944, 0x1945,
-	0x1a1e, 0x1a1f,
-	0x1aa0, 0x1aa6,
-	0x1aa8, 0x1aad,
-	0x1b5a, 0x1b60,
-	0x1bfc, 0x1bff,
-	0x1c3b, 0x1c3f,
-	0x1c7e, 0x1c7f,
-	0x1cc0, 0x1cc7,
-	0x1cd3, 0x1cd3,
-	0x2016, 0x2017,
-	0x2020, 0x2027,
-	0x2030, 0x2038,
-	0x203b, 0x203e,
-	0x2041, 0x2043,
-	0x2047, 0x2051,
-	0x2053, 0x2053,
-	0x2055, 0x205e,
-	0x2cf9, 0x2cfc,
-	0x2cfe, 0x2cff,
-	0x2d70, 0x2d70,
-	0x2e00, 0x2e01,
-	0x2e06, 0x2e08,
-	0x2e0b, 0x2e0b,
-	0x2e0e, 0x2e16,
-	0x2e18, 0x2e19,
-	0x2e1b, 0x2e1b,
-	0x2e1e, 0x2e1f,
-	0x2e2a, 0x2e2e,
-	0x2e30, 0x2e39,
-	0x3001, 0x3003,
-	0x303d, 0x303d,
-	0x30fb, 0x30fb,
-	0xa4fe, 0xa4ff,
-	0xa60d, 0xa60f,
-	0xa673, 0xa673,
-	0xa67e, 0xa67e,
-	0xa6f2, 0xa6f7,
-	0xa874, 0xa877,
-	0xa8ce, 0xa8cf,
-	0xa8f8, 0xa8fa,
-	0xa92e, 0xa92f,
-	0xa95f, 0xa95f,
-	0xa9c1, 0xa9cd,
-	0xa9de, 0xa9df,
-	0xaa5c, 0xaa5f,
-	0xaade, 0xaadf,
-	0xaaf0, 0xaaf1,
-	0xabeb, 0xabeb,
-	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, 0x10102,
-	0x1039f, 0x1039f,
-	0x103d0, 0x103d0,
-	0x10857, 0x10857,
-	0x1091f, 0x1091f,
-	0x1093f, 0x1093f,
-	0x10a50, 0x10a58,
-	0x10a7f, 0x10a7f,
-	0x10b39, 0x10b3f,
-	0x11047, 0x1104d,
-	0x110bb, 0x110bc,
-	0x110be, 0x110c1,
-	0x11140, 0x11143,
-	0x111c5, 0x111c8,
-	0x12470, 0x12473,
-}; /* CR_Po */
-
-/* 'Ps': General Category */
-static const OnigCodePoint CR_Ps[] = {
-	72,
-	0x0028, 0x0028,
-	0x005b, 0x005b,
-	0x007b, 0x007b,
-	0x0f3a, 0x0f3a,
-	0x0f3c, 0x0f3c,
-	0x169b, 0x169b,
-	0x201a, 0x201a,
-	0x201e, 0x201e,
-	0x2045, 0x2045,
-	0x207d, 0x207d,
-	0x208d, 0x208d,
-	0x2329, 0x2329,
-	0x2768, 0x2768,
-	0x276a, 0x276a,
-	0x276c, 0x276c,
-	0x276e, 0x276e,
-	0x2770, 0x2770,
-	0x2772, 0x2772,
-	0x2774, 0x2774,
-	0x27c5, 0x27c5,
-	0x27e6, 0x27e6,
-	0x27e8, 0x27e8,
-	0x27ea, 0x27ea,
-	0x27ec, 0x27ec,
-	0x27ee, 0x27ee,
-	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,
-	0x2e22, 0x2e22,
-	0x2e24, 0x2e24,
-	0x2e26, 0x2e26,
-	0x2e28, 0x2e28,
-	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[] = {
-	198,
-	0x0024, 0x0024,
-	0x002b, 0x002b,
-	0x003c, 0x003e,
-	0x005e, 0x005e,
-	0x0060, 0x0060,
-	0x007c, 0x007c,
-	0x007e, 0x007e,
-	0x00a2, 0x00a6,
-	0x00a8, 0x00a9,
-	0x00ac, 0x00ac,
-	0x00ae, 0x00b1,
-	0x00b4, 0x00b4,
-	0x00b8, 0x00b8,
-	0x00d7, 0x00d7,
-	0x00f7, 0x00f7,
-	0x02c2, 0x02c5,
-	0x02d2, 0x02df,
-	0x02e5, 0x02eb,
-	0x02ed, 0x02ed,
-	0x02ef, 0x02ff,
-	0x0375, 0x0375,
-	0x0384, 0x0385,
-	0x03f6, 0x03f6,
-	0x0482, 0x0482,
-	0x058f, 0x058f,
-	0x0606, 0x0608,
-	0x060b, 0x060b,
-	0x060e, 0x060f,
-	0x06de, 0x06de,
-	0x06e9, 0x06e9,
-	0x06fd, 0x06fe,
-	0x07f6, 0x07f6,
-	0x09f2, 0x09f3,
-	0x09fa, 0x09fb,
-	0x0af1, 0x0af1,
-	0x0b70, 0x0b70,
-	0x0bf3, 0x0bfa,
-	0x0c7f, 0x0c7f,
-	0x0d79, 0x0d79,
-	0x0e3f, 0x0e3f,
-	0x0f01, 0x0f03,
-	0x0f13, 0x0f13,
-	0x0f15, 0x0f17,
-	0x0f1a, 0x0f1f,
-	0x0f34, 0x0f34,
-	0x0f36, 0x0f36,
-	0x0f38, 0x0f38,
-	0x0fbe, 0x0fc5,
-	0x0fc7, 0x0fcc,
-	0x0fce, 0x0fcf,
-	0x0fd5, 0x0fd8,
-	0x109e, 0x109f,
-	0x1390, 0x1399,
-	0x17db, 0x17db,
-	0x1940, 0x1940,
-	0x19de, 0x19ff,
-	0x1b61, 0x1b6a,
-	0x1b74, 0x1b7c,
-	0x1fbd, 0x1fbd,
-	0x1fbf, 0x1fc1,
-	0x1fcd, 0x1fcf,
-	0x1fdd, 0x1fdf,
-	0x1fed, 0x1fef,
-	0x1ffd, 0x1ffe,
-	0x2044, 0x2044,
-	0x2052, 0x2052,
-	0x207a, 0x207c,
-	0x208a, 0x208c,
-	0x20a0, 0x20b9,
-	0x2100, 0x2101,
-	0x2103, 0x2106,
-	0x2108, 0x2109,
-	0x2114, 0x2114,
-	0x2116, 0x2118,
-	0x211e, 0x2123,
-	0x2125, 0x2125,
-	0x2127, 0x2127,
-	0x2129, 0x2129,
-	0x212e, 0x212e,
-	0x213a, 0x213b,
-	0x2140, 0x2144,
-	0x214a, 0x214d,
-	0x214f, 0x214f,
-	0x2190, 0x2328,
-	0x232b, 0x23f3,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x249c, 0x24e9,
-	0x2500, 0x26ff,
-	0x2701, 0x2767,
-	0x2794, 0x27c4,
-	0x27c7, 0x27e5,
-	0x27f0, 0x2982,
-	0x2999, 0x29d7,
-	0x29dc, 0x29fb,
-	0x29fe, 0x2b4c,
-	0x2b50, 0x2b59,
-	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, 0x31e3,
-	0x3200, 0x321e,
-	0x322a, 0x3247,
-	0x3250, 0x3250,
-	0x3260, 0x327f,
-	0x328a, 0x32b0,
-	0x32c0, 0x32fe,
-	0x3300, 0x33ff,
-	0x4dc0, 0x4dff,
-	0xa490, 0xa4c6,
-	0xa700, 0xa716,
-	0xa720, 0xa721,
-	0xa789, 0xa78a,
-	0xa828, 0xa82b,
-	0xa836, 0xa839,
-	0xaa77, 0xaa79,
-	0xfb29, 0xfb29,
-	0xfbb2, 0xfbc1,
-	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,
-	0x10137, 0x1013f,
-	0x10179, 0x10189,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fc,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 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,
-	0x1eef0, 0x1eef1,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f320,
-	0x1f330, 0x1f335,
-	0x1f337, 0x1f37c,
-	0x1f380, 0x1f393,
-	0x1f3a0, 0x1f3c4,
-	0x1f3c6, 0x1f3ca,
-	0x1f3e0, 0x1f3f0,
-	0x1f400, 0x1f43e,
-	0x1f440, 0x1f440,
-	0x1f442, 0x1f4f7,
-	0x1f4f9, 0x1f4fc,
-	0x1f500, 0x1f53d,
-	0x1f540, 0x1f543,
-	0x1f550, 0x1f567,
-	0x1f5fb, 0x1f640,
-	0x1f645, 0x1f64f,
-	0x1f680, 0x1f6c5,
-	0x1f700, 0x1f773,
-}; /* CR_S */
-
-/* 'Sc': General Category */
-static const OnigCodePoint CR_Sc[] = {
-	17,
-	0x0024, 0x0024,
-	0x00a2, 0x00a5,
-	0x058f, 0x058f,
-	0x060b, 0x060b,
-	0x09f2, 0x09f3,
-	0x09fb, 0x09fb,
-	0x0af1, 0x0af1,
-	0x0bf9, 0x0bf9,
-	0x0e3f, 0x0e3f,
-	0x17db, 0x17db,
-	0x20a0, 0x20b9,
-	0xa838, 0xa838,
-	0xfdfc, 0xfdfc,
-	0xfe69, 0xfe69,
-	0xff04, 0xff04,
-	0xffe0, 0xffe1,
-	0xffe5, 0xffe6,
-}; /* CR_Sc */
-
-/* 'Sk': General Category */
-static const OnigCodePoint CR_Sk[] = {
-	27,
-	0x005e, 0x005e,
-	0x0060, 0x0060,
-	0x00a8, 0x00a8,
-	0x00af, 0x00af,
-	0x00b4, 0x00b4,
-	0x00b8, 0x00b8,
-	0x02c2, 0x02c5,
-	0x02d2, 0x02df,
-	0x02e5, 0x02eb,
-	0x02ed, 0x02ed,
-	0x02ef, 0x02ff,
-	0x0375, 0x0375,
-	0x0384, 0x0385,
-	0x1fbd, 0x1fbd,
-	0x1fbf, 0x1fc1,
-	0x1fcd, 0x1fcf,
-	0x1fdd, 0x1fdf,
-	0x1fed, 0x1fef,
-	0x1ffd, 0x1ffe,
-	0x309b, 0x309c,
-	0xa700, 0xa716,
-	0xa720, 0xa721,
-	0xa789, 0xa78a,
-	0xfbb2, 0xfbc1,
-	0xff3e, 0xff3e,
-	0xff40, 0xff40,
-	0xffe3, 0xffe3,
-}; /* CR_Sk */
-
-/* 'Sm': General Category */
-static const OnigCodePoint CR_Sm[] = {
-	65,
-	0x002b, 0x002b,
-	0x003c, 0x003e,
-	0x007c, 0x007c,
-	0x007e, 0x007e,
-	0x00ac, 0x00ac,
-	0x00b1, 0x00b1,
-	0x00d7, 0x00d7,
-	0x00f7, 0x00f7,
-	0x03f6, 0x03f6,
-	0x0606, 0x0608,
-	0x2044, 0x2044,
-	0x2052, 0x2052,
-	0x207a, 0x207c,
-	0x208a, 0x208c,
-	0x2118, 0x2118,
-	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,
-	0x23dc, 0x23e1,
-	0x25b7, 0x25b7,
-	0x25c1, 0x25c1,
-	0x25f8, 0x25ff,
-	0x266f, 0x266f,
-	0x27c0, 0x27c4,
-	0x27c7, 0x27e5,
-	0x27f0, 0x27ff,
-	0x2900, 0x2982,
-	0x2999, 0x29d7,
-	0x29dc, 0x29fb,
-	0x29fe, 0x2aff,
-	0x2b30, 0x2b44,
-	0x2b47, 0x2b4c,
-	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,
-	0x1eef0, 0x1eef1,
-}; /* CR_Sm */
-
-/* 'So': General Category */
-static const OnigCodePoint CR_So[] = {
-	153,
-	0x00a6, 0x00a6,
-	0x00a9, 0x00a9,
-	0x00ae, 0x00ae,
-	0x00b0, 0x00b0,
-	0x0482, 0x0482,
-	0x060e, 0x060f,
-	0x06de, 0x06de,
-	0x06e9, 0x06e9,
-	0x06fd, 0x06fe,
-	0x07f6, 0x07f6,
-	0x09fa, 0x09fa,
-	0x0b70, 0x0b70,
-	0x0bf3, 0x0bf8,
-	0x0bfa, 0x0bfa,
-	0x0c7f, 0x0c7f,
-	0x0d79, 0x0d79,
-	0x0f01, 0x0f03,
-	0x0f13, 0x0f13,
-	0x0f15, 0x0f17,
-	0x0f1a, 0x0f1f,
-	0x0f34, 0x0f34,
-	0x0f36, 0x0f36,
-	0x0f38, 0x0f38,
-	0x0fbe, 0x0fc5,
-	0x0fc7, 0x0fcc,
-	0x0fce, 0x0fcf,
-	0x0fd5, 0x0fd8,
-	0x109e, 0x109f,
-	0x1390, 0x1399,
-	0x1940, 0x1940,
-	0x19de, 0x19ff,
-	0x1b61, 0x1b6a,
-	0x1b74, 0x1b7c,
-	0x2100, 0x2101,
-	0x2103, 0x2106,
-	0x2108, 0x2109,
-	0x2114, 0x2114,
-	0x2116, 0x2117,
-	0x211e, 0x2123,
-	0x2125, 0x2125,
-	0x2127, 0x2127,
-	0x2129, 0x2129,
-	0x212e, 0x212e,
-	0x213a, 0x213b,
-	0x214a, 0x214a,
-	0x214c, 0x214d,
-	0x214f, 0x214f,
-	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,
-	0x23b4, 0x23db,
-	0x23e2, 0x23f3,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x249c, 0x24e9,
-	0x2500, 0x25b6,
-	0x25b8, 0x25c0,
-	0x25c2, 0x25f7,
-	0x2600, 0x266e,
-	0x2670, 0x26ff,
-	0x2701, 0x2767,
-	0x2794, 0x27bf,
-	0x2800, 0x28ff,
-	0x2b00, 0x2b2f,
-	0x2b45, 0x2b46,
-	0x2b50, 0x2b59,
-	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, 0x31e3,
-	0x3200, 0x321e,
-	0x322a, 0x3247,
-	0x3250, 0x3250,
-	0x3260, 0x327f,
-	0x328a, 0x32b0,
-	0x32c0, 0x32fe,
-	0x3300, 0x33ff,
-	0x4dc0, 0x4dff,
-	0xa490, 0xa4c6,
-	0xa828, 0xa82b,
-	0xa836, 0xa837,
-	0xa839, 0xa839,
-	0xaa77, 0xaa79,
-	0xfdfd, 0xfdfd,
-	0xffe4, 0xffe4,
-	0xffe8, 0xffe8,
-	0xffed, 0xffee,
-	0xfffc, 0xfffd,
-	0x10137, 0x1013f,
-	0x10179, 0x10189,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fc,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d164,
-	0x1d16a, 0x1d16c,
-	0x1d183, 0x1d184,
-	0x1d18c, 0x1d1a9,
-	0x1d1ae, 0x1d1dd,
-	0x1d200, 0x1d241,
-	0x1d245, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f320,
-	0x1f330, 0x1f335,
-	0x1f337, 0x1f37c,
-	0x1f380, 0x1f393,
-	0x1f3a0, 0x1f3c4,
-	0x1f3c6, 0x1f3ca,
-	0x1f3e0, 0x1f3f0,
-	0x1f400, 0x1f43e,
-	0x1f440, 0x1f440,
-	0x1f442, 0x1f4f7,
-	0x1f4f9, 0x1f4fc,
-	0x1f500, 0x1f53d,
-	0x1f540, 0x1f543,
-	0x1f550, 0x1f567,
-	0x1f5fb, 0x1f640,
-	0x1f645, 0x1f64f,
-	0x1f680, 0x1f6c5,
-	0x1f700, 0x1f773,
-}; /* 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 */
-
-/* 'Math': Derived Property */
-static const OnigCodePoint CR_Math[] = {
-	138,
-	0x002b, 0x002b,
-	0x003c, 0x003e,
-	0x005e, 0x005e,
-	0x007c, 0x007c,
-	0x007e, 0x007e,
-	0x00ac, 0x00ac,
-	0x00b1, 0x00b1,
-	0x00d7, 0x00d7,
-	0x00f7, 0x00f7,
-	0x03d0, 0x03d2,
-	0x03d5, 0x03d5,
-	0x03f0, 0x03f1,
-	0x03f4, 0x03f6,
-	0x0606, 0x0608,
-	0x2016, 0x2016,
-	0x2032, 0x2034,
-	0x2040, 0x2040,
-	0x2044, 0x2044,
-	0x2052, 0x2052,
-	0x2061, 0x2064,
-	0x207a, 0x207e,
-	0x208a, 0x208e,
-	0x20d0, 0x20dc,
-	0x20e1, 0x20e1,
-	0x20e5, 0x20e6,
-	0x20eb, 0x20ef,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2118, 0x211d,
-	0x2124, 0x2124,
-	0x2128, 0x2129,
-	0x212c, 0x212d,
-	0x212f, 0x2131,
-	0x2133, 0x2138,
-	0x213c, 0x2149,
-	0x214b, 0x214b,
-	0x2190, 0x21a7,
-	0x21a9, 0x21ae,
-	0x21b0, 0x21b1,
-	0x21b6, 0x21b7,
-	0x21bc, 0x21db,
-	0x21dd, 0x21dd,
-	0x21e4, 0x21e5,
-	0x21f4, 0x22ff,
-	0x2308, 0x230b,
-	0x2320, 0x2321,
-	0x237c, 0x237c,
-	0x239b, 0x23b5,
-	0x23b7, 0x23b7,
-	0x23d0, 0x23d0,
-	0x23dc, 0x23e2,
-	0x25a0, 0x25a1,
-	0x25ae, 0x25b7,
-	0x25bc, 0x25c1,
-	0x25c6, 0x25c7,
-	0x25ca, 0x25cb,
-	0x25cf, 0x25d3,
-	0x25e2, 0x25e2,
-	0x25e4, 0x25e4,
-	0x25e7, 0x25ec,
-	0x25f8, 0x25ff,
-	0x2605, 0x2606,
-	0x2640, 0x2640,
-	0x2642, 0x2642,
-	0x2660, 0x2663,
-	0x266d, 0x266f,
-	0x27c0, 0x27ff,
-	0x2900, 0x2aff,
-	0x2b30, 0x2b44,
-	0x2b47, 0x2b4c,
-	0xfb29, 0xfb29,
-	0xfe61, 0xfe66,
-	0xfe68, 0xfe68,
-	0xff0b, 0xff0b,
-	0xff1c, 0xff1e,
-	0xff3c, 0xff3c,
-	0xff3e, 0xff3e,
-	0xff5c, 0xff5c,
-	0xff5e, 0xff5e,
-	0xffe2, 0xffe2,
-	0xffe9, 0xffec,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-}; /* CR_Math */
-
-/* 'Alphabetic': Derived Property */
-#define CR_Alphabetic CR_Alpha
-
-/* 'Lowercase': Derived Property */
-#define CR_Lowercase CR_Lower
-
-/* 'Uppercase': Derived Property */
-#define CR_Uppercase CR_Upper
-
-/* 'Cased': Derived Property */
-static const OnigCodePoint CR_Cased[] = {
-	119,
-	0x0041, 0x005a,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00b5, 0x00b5,
-	0x00ba, 0x00ba,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x01ba,
-	0x01bc, 0x01bf,
-	0x01c4, 0x0293,
-	0x0295, 0x02b8,
-	0x02c0, 0x02c1,
-	0x02e0, 0x02e4,
-	0x0345, 0x0345,
-	0x0370, 0x0373,
-	0x0376, 0x0377,
-	0x037a, 0x037d,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x048a, 0x0527,
-	0x0531, 0x0556,
-	0x0561, 0x0587,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x1d00, 0x1dbf,
-	0x1e00, 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, 0x209c,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2119, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x212d,
-	0x212f, 0x2134,
-	0x2139, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2160, 0x217f,
-	0x2183, 0x2184,
-	0x24b6, 0x24e9,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2ce4,
-	0x2ceb, 0x2cee,
-	0x2cf2, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0xa640, 0xa66d,
-	0xa680, 0xa697,
-	0xa722, 0xa787,
-	0xa78b, 0xa78e,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xa7f8, 0xa7fa,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0x10400, 0x1044f,
-	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, 0x1d7cb,
-}; /* CR_Cased */
-
-/* 'Case_Ignorable': Derived Property */
-static const OnigCodePoint CR_Case_Ignorable[] = {
-	295,
-	0x0027, 0x0027,
-	0x002e, 0x002e,
-	0x003a, 0x003a,
-	0x005e, 0x005e,
-	0x0060, 0x0060,
-	0x00a8, 0x00a8,
-	0x00ad, 0x00ad,
-	0x00af, 0x00af,
-	0x00b4, 0x00b4,
-	0x00b7, 0x00b8,
-	0x02b0, 0x036f,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x0384, 0x0385,
-	0x0387, 0x0387,
-	0x0483, 0x0489,
-	0x0559, 0x0559,
-	0x0591, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x05f4, 0x05f4,
-	0x0600, 0x0604,
-	0x0610, 0x061a,
-	0x0640, 0x0640,
-	0x064b, 0x065f,
-	0x0670, 0x0670,
-	0x06d6, 0x06dd,
-	0x06df, 0x06e8,
-	0x06ea, 0x06ed,
-	0x070f, 0x070f,
-	0x0711, 0x0711,
-	0x0730, 0x074a,
-	0x07a6, 0x07b0,
-	0x07eb, 0x07f5,
-	0x07fa, 0x07fa,
-	0x0816, 0x082d,
-	0x0859, 0x085b,
-	0x08e4, 0x08fe,
-	0x0900, 0x0902,
-	0x093a, 0x093a,
-	0x093c, 0x093c,
-	0x0941, 0x0948,
-	0x094d, 0x094d,
-	0x0951, 0x0957,
-	0x0962, 0x0963,
-	0x0971, 0x0971,
-	0x0981, 0x0981,
-	0x09bc, 0x09bc,
-	0x09c1, 0x09c4,
-	0x09cd, 0x09cd,
-	0x09e2, 0x09e3,
-	0x0a01, 0x0a02,
-	0x0a3c, 0x0a3c,
-	0x0a41, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a70, 0x0a71,
-	0x0a75, 0x0a75,
-	0x0a81, 0x0a82,
-	0x0abc, 0x0abc,
-	0x0ac1, 0x0ac5,
-	0x0ac7, 0x0ac8,
-	0x0acd, 0x0acd,
-	0x0ae2, 0x0ae3,
-	0x0b01, 0x0b01,
-	0x0b3c, 0x0b3c,
-	0x0b3f, 0x0b3f,
-	0x0b41, 0x0b44,
-	0x0b4d, 0x0b4d,
-	0x0b56, 0x0b56,
-	0x0b62, 0x0b63,
-	0x0b82, 0x0b82,
-	0x0bc0, 0x0bc0,
-	0x0bcd, 0x0bcd,
-	0x0c3e, 0x0c40,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c62, 0x0c63,
-	0x0cbc, 0x0cbc,
-	0x0cbf, 0x0cbf,
-	0x0cc6, 0x0cc6,
-	0x0ccc, 0x0ccd,
-	0x0ce2, 0x0ce3,
-	0x0d41, 0x0d44,
-	0x0d4d, 0x0d4d,
-	0x0d62, 0x0d63,
-	0x0dca, 0x0dca,
-	0x0dd2, 0x0dd4,
-	0x0dd6, 0x0dd6,
-	0x0e31, 0x0e31,
-	0x0e34, 0x0e3a,
-	0x0e46, 0x0e4e,
-	0x0eb1, 0x0eb1,
-	0x0eb4, 0x0eb9,
-	0x0ebb, 0x0ebc,
-	0x0ec6, 0x0ec6,
-	0x0ec8, 0x0ecd,
-	0x0f18, 0x0f19,
-	0x0f35, 0x0f35,
-	0x0f37, 0x0f37,
-	0x0f39, 0x0f39,
-	0x0f71, 0x0f7e,
-	0x0f80, 0x0f84,
-	0x0f86, 0x0f87,
-	0x0f8d, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fc6, 0x0fc6,
-	0x102d, 0x1030,
-	0x1032, 0x1037,
-	0x1039, 0x103a,
-	0x103d, 0x103e,
-	0x1058, 0x1059,
-	0x105e, 0x1060,
-	0x1071, 0x1074,
-	0x1082, 0x1082,
-	0x1085, 0x1086,
-	0x108d, 0x108d,
-	0x109d, 0x109d,
-	0x10fc, 0x10fc,
-	0x135d, 0x135f,
-	0x1712, 0x1714,
-	0x1732, 0x1734,
-	0x1752, 0x1753,
-	0x1772, 0x1773,
-	0x17b4, 0x17b5,
-	0x17b7, 0x17bd,
-	0x17c6, 0x17c6,
-	0x17c9, 0x17d3,
-	0x17d7, 0x17d7,
-	0x17dd, 0x17dd,
-	0x180b, 0x180d,
-	0x1843, 0x1843,
-	0x18a9, 0x18a9,
-	0x1920, 0x1922,
-	0x1927, 0x1928,
-	0x1932, 0x1932,
-	0x1939, 0x193b,
-	0x1a17, 0x1a18,
-	0x1a56, 0x1a56,
-	0x1a58, 0x1a5e,
-	0x1a60, 0x1a60,
-	0x1a62, 0x1a62,
-	0x1a65, 0x1a6c,
-	0x1a73, 0x1a7c,
-	0x1a7f, 0x1a7f,
-	0x1aa7, 0x1aa7,
-	0x1b00, 0x1b03,
-	0x1b34, 0x1b34,
-	0x1b36, 0x1b3a,
-	0x1b3c, 0x1b3c,
-	0x1b42, 0x1b42,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1b81,
-	0x1ba2, 0x1ba5,
-	0x1ba8, 0x1ba9,
-	0x1bab, 0x1bab,
-	0x1be6, 0x1be6,
-	0x1be8, 0x1be9,
-	0x1bed, 0x1bed,
-	0x1bef, 0x1bf1,
-	0x1c2c, 0x1c33,
-	0x1c36, 0x1c37,
-	0x1c78, 0x1c7d,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce0,
-	0x1ce2, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1cf4, 0x1cf4,
-	0x1d2c, 0x1d6a,
-	0x1d78, 0x1d78,
-	0x1d9b, 0x1de6,
-	0x1dfc, 0x1dff,
-	0x1fbd, 0x1fbd,
-	0x1fbf, 0x1fc1,
-	0x1fcd, 0x1fcf,
-	0x1fdd, 0x1fdf,
-	0x1fed, 0x1fef,
-	0x1ffd, 0x1ffe,
-	0x200b, 0x200f,
-	0x2018, 0x2019,
-	0x2024, 0x2024,
-	0x2027, 0x2027,
-	0x202a, 0x202e,
-	0x2060, 0x2064,
-	0x206a, 0x206f,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 0x209c,
-	0x20d0, 0x20f0,
-	0x2c7c, 0x2c7d,
-	0x2cef, 0x2cf1,
-	0x2d6f, 0x2d6f,
-	0x2d7f, 0x2d7f,
-	0x2de0, 0x2dff,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3005,
-	0x302a, 0x302d,
-	0x3031, 0x3035,
-	0x303b, 0x303b,
-	0x3099, 0x309e,
-	0x30fc, 0x30fe,
-	0xa015, 0xa015,
-	0xa4f8, 0xa4fd,
-	0xa60c, 0xa60c,
-	0xa66f, 0xa672,
-	0xa674, 0xa67d,
-	0xa67f, 0xa67f,
-	0xa69f, 0xa69f,
-	0xa6f0, 0xa6f1,
-	0xa700, 0xa721,
-	0xa770, 0xa770,
-	0xa788, 0xa78a,
-	0xa7f8, 0xa7f9,
-	0xa802, 0xa802,
-	0xa806, 0xa806,
-	0xa80b, 0xa80b,
-	0xa825, 0xa826,
-	0xa8c4, 0xa8c4,
-	0xa8e0, 0xa8f1,
-	0xa926, 0xa92d,
-	0xa947, 0xa951,
-	0xa980, 0xa982,
-	0xa9b3, 0xa9b3,
-	0xa9b6, 0xa9b9,
-	0xa9bc, 0xa9bc,
-	0xa9cf, 0xa9cf,
-	0xaa29, 0xaa2e,
-	0xaa31, 0xaa32,
-	0xaa35, 0xaa36,
-	0xaa43, 0xaa43,
-	0xaa4c, 0xaa4c,
-	0xaa70, 0xaa70,
-	0xaab0, 0xaab0,
-	0xaab2, 0xaab4,
-	0xaab7, 0xaab8,
-	0xaabe, 0xaabf,
-	0xaac1, 0xaac1,
-	0xaadd, 0xaadd,
-	0xaaec, 0xaaed,
-	0xaaf3, 0xaaf4,
-	0xaaf6, 0xaaf6,
-	0xabe5, 0xabe5,
-	0xabe8, 0xabe8,
-	0xabed, 0xabed,
-	0xfb1e, 0xfb1e,
-	0xfbb2, 0xfbc1,
-	0xfe00, 0xfe0f,
-	0xfe13, 0xfe13,
-	0xfe20, 0xfe26,
-	0xfe52, 0xfe52,
-	0xfe55, 0xfe55,
-	0xfeff, 0xfeff,
-	0xff07, 0xff07,
-	0xff0e, 0xff0e,
-	0xff1a, 0xff1a,
-	0xff3e, 0xff3e,
-	0xff40, 0xff40,
-	0xff70, 0xff70,
-	0xff9e, 0xff9f,
-	0xffe3, 0xffe3,
-	0xfff9, 0xfffb,
-	0x101fd, 0x101fd,
-	0x10a01, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a0f,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x11001, 0x11001,
-	0x11038, 0x11046,
-	0x11080, 0x11081,
-	0x110b3, 0x110b6,
-	0x110b9, 0x110ba,
-	0x110bd, 0x110bd,
-	0x11100, 0x11102,
-	0x11127, 0x1112b,
-	0x1112d, 0x11134,
-	0x11180, 0x11181,
-	0x111b6, 0x111be,
-	0x116ab, 0x116ab,
-	0x116ad, 0x116ad,
-	0x116b0, 0x116b5,
-	0x116b7, 0x116b7,
-	0x16f8f, 0x16f9f,
-	0x1d167, 0x1d169,
-	0x1d173, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-	0x1d242, 0x1d244,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-}; /* CR_Case_Ignorable */
-
-/* 'Changes_When_Lowercased': Derived Property */
-static const OnigCodePoint CR_Changes_When_Lowercased[] = {
-	571,
-	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, 0x01c5,
-	0x01c7, 0x01c8,
-	0x01ca, 0x01cb,
-	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, 0x01f2,
-	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,
-	0x0243, 0x0246,
-	0x0248, 0x0248,
-	0x024a, 0x024a,
-	0x024c, 0x024c,
-	0x024e, 0x024e,
-	0x0370, 0x0370,
-	0x0372, 0x0372,
-	0x0376, 0x0376,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x038f,
-	0x0391, 0x03a1,
-	0x03a3, 0x03ab,
-	0x03cf, 0x03cf,
-	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,
-	0x04fa, 0x04fa,
-	0x04fc, 0x04fc,
-	0x04fe, 0x04fe,
-	0x0500, 0x0500,
-	0x0502, 0x0502,
-	0x0504, 0x0504,
-	0x0506, 0x0506,
-	0x0508, 0x0508,
-	0x050a, 0x050a,
-	0x050c, 0x050c,
-	0x050e, 0x050e,
-	0x0510, 0x0510,
-	0x0512, 0x0512,
-	0x0514, 0x0514,
-	0x0516, 0x0516,
-	0x0518, 0x0518,
-	0x051a, 0x051a,
-	0x051c, 0x051c,
-	0x051e, 0x051e,
-	0x0520, 0x0520,
-	0x0522, 0x0522,
-	0x0524, 0x0524,
-	0x0526, 0x0526,
-	0x0531, 0x0556,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	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,
-	0x1e9e, 0x1e9e,
-	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,
-	0x1efa, 0x1efa,
-	0x1efc, 0x1efc,
-	0x1efe, 0x1efe,
-	0x1f08, 0x1f0f,
-	0x1f18, 0x1f1d,
-	0x1f28, 0x1f2f,
-	0x1f38, 0x1f3f,
-	0x1f48, 0x1f4d,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f5f,
-	0x1f68, 0x1f6f,
-	0x1f88, 0x1f8f,
-	0x1f98, 0x1f9f,
-	0x1fa8, 0x1faf,
-	0x1fb8, 0x1fbc,
-	0x1fc8, 0x1fcc,
-	0x1fd8, 0x1fdb,
-	0x1fe8, 0x1fec,
-	0x1ff8, 0x1ffc,
-	0x2126, 0x2126,
-	0x212a, 0x212b,
-	0x2132, 0x2132,
-	0x2160, 0x216f,
-	0x2183, 0x2183,
-	0x24b6, 0x24cf,
-	0x2c00, 0x2c2e,
-	0x2c60, 0x2c60,
-	0x2c62, 0x2c64,
-	0x2c67, 0x2c67,
-	0x2c69, 0x2c69,
-	0x2c6b, 0x2c6b,
-	0x2c6d, 0x2c70,
-	0x2c72, 0x2c72,
-	0x2c75, 0x2c75,
-	0x2c7e, 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,
-	0x2ceb, 0x2ceb,
-	0x2ced, 0x2ced,
-	0x2cf2, 0x2cf2,
-	0xa640, 0xa640,
-	0xa642, 0xa642,
-	0xa644, 0xa644,
-	0xa646, 0xa646,
-	0xa648, 0xa648,
-	0xa64a, 0xa64a,
-	0xa64c, 0xa64c,
-	0xa64e, 0xa64e,
-	0xa650, 0xa650,
-	0xa652, 0xa652,
-	0xa654, 0xa654,
-	0xa656, 0xa656,
-	0xa658, 0xa658,
-	0xa65a, 0xa65a,
-	0xa65c, 0xa65c,
-	0xa65e, 0xa65e,
-	0xa660, 0xa660,
-	0xa662, 0xa662,
-	0xa664, 0xa664,
-	0xa666, 0xa666,
-	0xa668, 0xa668,
-	0xa66a, 0xa66a,
-	0xa66c, 0xa66c,
-	0xa680, 0xa680,
-	0xa682, 0xa682,
-	0xa684, 0xa684,
-	0xa686, 0xa686,
-	0xa688, 0xa688,
-	0xa68a, 0xa68a,
-	0xa68c, 0xa68c,
-	0xa68e, 0xa68e,
-	0xa690, 0xa690,
-	0xa692, 0xa692,
-	0xa694, 0xa694,
-	0xa696, 0xa696,
-	0xa722, 0xa722,
-	0xa724, 0xa724,
-	0xa726, 0xa726,
-	0xa728, 0xa728,
-	0xa72a, 0xa72a,
-	0xa72c, 0xa72c,
-	0xa72e, 0xa72e,
-	0xa732, 0xa732,
-	0xa734, 0xa734,
-	0xa736, 0xa736,
-	0xa738, 0xa738,
-	0xa73a, 0xa73a,
-	0xa73c, 0xa73c,
-	0xa73e, 0xa73e,
-	0xa740, 0xa740,
-	0xa742, 0xa742,
-	0xa744, 0xa744,
-	0xa746, 0xa746,
-	0xa748, 0xa748,
-	0xa74a, 0xa74a,
-	0xa74c, 0xa74c,
-	0xa74e, 0xa74e,
-	0xa750, 0xa750,
-	0xa752, 0xa752,
-	0xa754, 0xa754,
-	0xa756, 0xa756,
-	0xa758, 0xa758,
-	0xa75a, 0xa75a,
-	0xa75c, 0xa75c,
-	0xa75e, 0xa75e,
-	0xa760, 0xa760,
-	0xa762, 0xa762,
-	0xa764, 0xa764,
-	0xa766, 0xa766,
-	0xa768, 0xa768,
-	0xa76a, 0xa76a,
-	0xa76c, 0xa76c,
-	0xa76e, 0xa76e,
-	0xa779, 0xa779,
-	0xa77b, 0xa77b,
-	0xa77d, 0xa77e,
-	0xa780, 0xa780,
-	0xa782, 0xa782,
-	0xa784, 0xa784,
-	0xa786, 0xa786,
-	0xa78b, 0xa78b,
-	0xa78d, 0xa78d,
-	0xa790, 0xa790,
-	0xa792, 0xa792,
-	0xa7a0, 0xa7a0,
-	0xa7a2, 0xa7a2,
-	0xa7a4, 0xa7a4,
-	0xa7a6, 0xa7a6,
-	0xa7a8, 0xa7a8,
-	0xa7aa, 0xa7aa,
-	0xff21, 0xff3a,
-	0x10400, 0x10427,
-}; /* CR_Changes_When_Lowercased */
-
-/* 'Changes_When_Uppercased': Derived Property */
-static const OnigCodePoint CR_Changes_When_Uppercased[] = {
-	586,
-	0x0061, 0x007a,
-	0x00b5, 0x00b5,
-	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, 0x0137,
-	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, 0x018c,
-	0x0192, 0x0192,
-	0x0195, 0x0195,
-	0x0199, 0x019a,
-	0x019e, 0x019e,
-	0x01a1, 0x01a1,
-	0x01a3, 0x01a3,
-	0x01a5, 0x01a5,
-	0x01a8, 0x01a8,
-	0x01ad, 0x01ad,
-	0x01b0, 0x01b0,
-	0x01b4, 0x01b4,
-	0x01b6, 0x01b6,
-	0x01b9, 0x01b9,
-	0x01bd, 0x01bd,
-	0x01bf, 0x01bf,
-	0x01c5, 0x01c6,
-	0x01c8, 0x01c9,
-	0x01cb, 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,
-	0x01f2, 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,
-	0x0223, 0x0223,
-	0x0225, 0x0225,
-	0x0227, 0x0227,
-	0x0229, 0x0229,
-	0x022b, 0x022b,
-	0x022d, 0x022d,
-	0x022f, 0x022f,
-	0x0231, 0x0231,
-	0x0233, 0x0233,
-	0x023c, 0x023c,
-	0x023f, 0x0240,
-	0x0242, 0x0242,
-	0x0247, 0x0247,
-	0x0249, 0x0249,
-	0x024b, 0x024b,
-	0x024d, 0x024d,
-	0x024f, 0x0254,
-	0x0256, 0x0257,
-	0x0259, 0x0259,
-	0x025b, 0x025b,
-	0x0260, 0x0260,
-	0x0263, 0x0263,
-	0x0265, 0x0266,
-	0x0268, 0x0269,
-	0x026b, 0x026b,
-	0x026f, 0x026f,
-	0x0271, 0x0272,
-	0x0275, 0x0275,
-	0x027d, 0x027d,
-	0x0280, 0x0280,
-	0x0283, 0x0283,
-	0x0288, 0x028c,
-	0x0292, 0x0292,
-	0x0345, 0x0345,
-	0x0371, 0x0371,
-	0x0373, 0x0373,
-	0x0377, 0x0377,
-	0x037b, 0x037d,
-	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, 0x03f2,
-	0x03f5, 0x03f5,
-	0x03f8, 0x03f8,
-	0x03fb, 0x03fb,
-	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, 0x04cf,
-	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,
-	0x04fb, 0x04fb,
-	0x04fd, 0x04fd,
-	0x04ff, 0x04ff,
-	0x0501, 0x0501,
-	0x0503, 0x0503,
-	0x0505, 0x0505,
-	0x0507, 0x0507,
-	0x0509, 0x0509,
-	0x050b, 0x050b,
-	0x050d, 0x050d,
-	0x050f, 0x050f,
-	0x0511, 0x0511,
-	0x0513, 0x0513,
-	0x0515, 0x0515,
-	0x0517, 0x0517,
-	0x0519, 0x0519,
-	0x051b, 0x051b,
-	0x051d, 0x051d,
-	0x051f, 0x051f,
-	0x0521, 0x0521,
-	0x0523, 0x0523,
-	0x0525, 0x0525,
-	0x0527, 0x0527,
-	0x0561, 0x0587,
-	0x1d79, 0x1d79,
-	0x1d7d, 0x1d7d,
-	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,
-	0x1efb, 0x1efb,
-	0x1efd, 0x1efd,
-	0x1eff, 0x1f07,
-	0x1f10, 0x1f15,
-	0x1f20, 0x1f27,
-	0x1f30, 0x1f37,
-	0x1f40, 0x1f45,
-	0x1f50, 0x1f57,
-	0x1f60, 0x1f67,
-	0x1f70, 0x1f7d,
-	0x1f80, 0x1fb4,
-	0x1fb6, 0x1fb7,
-	0x1fbc, 0x1fbc,
-	0x1fbe, 0x1fbe,
-	0x1fc2, 0x1fc4,
-	0x1fc6, 0x1fc7,
-	0x1fcc, 0x1fcc,
-	0x1fd0, 0x1fd3,
-	0x1fd6, 0x1fd7,
-	0x1fe0, 0x1fe7,
-	0x1ff2, 0x1ff4,
-	0x1ff6, 0x1ff7,
-	0x1ffc, 0x1ffc,
-	0x214e, 0x214e,
-	0x2170, 0x217f,
-	0x2184, 0x2184,
-	0x24d0, 0x24e9,
-	0x2c30, 0x2c5e,
-	0x2c61, 0x2c61,
-	0x2c65, 0x2c66,
-	0x2c68, 0x2c68,
-	0x2c6a, 0x2c6a,
-	0x2c6c, 0x2c6c,
-	0x2c73, 0x2c73,
-	0x2c76, 0x2c76,
-	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, 0x2ce3,
-	0x2cec, 0x2cec,
-	0x2cee, 0x2cee,
-	0x2cf3, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0xa641, 0xa641,
-	0xa643, 0xa643,
-	0xa645, 0xa645,
-	0xa647, 0xa647,
-	0xa649, 0xa649,
-	0xa64b, 0xa64b,
-	0xa64d, 0xa64d,
-	0xa64f, 0xa64f,
-	0xa651, 0xa651,
-	0xa653, 0xa653,
-	0xa655, 0xa655,
-	0xa657, 0xa657,
-	0xa659, 0xa659,
-	0xa65b, 0xa65b,
-	0xa65d, 0xa65d,
-	0xa65f, 0xa65f,
-	0xa661, 0xa661,
-	0xa663, 0xa663,
-	0xa665, 0xa665,
-	0xa667, 0xa667,
-	0xa669, 0xa669,
-	0xa66b, 0xa66b,
-	0xa66d, 0xa66d,
-	0xa681, 0xa681,
-	0xa683, 0xa683,
-	0xa685, 0xa685,
-	0xa687, 0xa687,
-	0xa689, 0xa689,
-	0xa68b, 0xa68b,
-	0xa68d, 0xa68d,
-	0xa68f, 0xa68f,
-	0xa691, 0xa691,
-	0xa693, 0xa693,
-	0xa695, 0xa695,
-	0xa697, 0xa697,
-	0xa723, 0xa723,
-	0xa725, 0xa725,
-	0xa727, 0xa727,
-	0xa729, 0xa729,
-	0xa72b, 0xa72b,
-	0xa72d, 0xa72d,
-	0xa72f, 0xa72f,
-	0xa733, 0xa733,
-	0xa735, 0xa735,
-	0xa737, 0xa737,
-	0xa739, 0xa739,
-	0xa73b, 0xa73b,
-	0xa73d, 0xa73d,
-	0xa73f, 0xa73f,
-	0xa741, 0xa741,
-	0xa743, 0xa743,
-	0xa745, 0xa745,
-	0xa747, 0xa747,
-	0xa749, 0xa749,
-	0xa74b, 0xa74b,
-	0xa74d, 0xa74d,
-	0xa74f, 0xa74f,
-	0xa751, 0xa751,
-	0xa753, 0xa753,
-	0xa755, 0xa755,
-	0xa757, 0xa757,
-	0xa759, 0xa759,
-	0xa75b, 0xa75b,
-	0xa75d, 0xa75d,
-	0xa75f, 0xa75f,
-	0xa761, 0xa761,
-	0xa763, 0xa763,
-	0xa765, 0xa765,
-	0xa767, 0xa767,
-	0xa769, 0xa769,
-	0xa76b, 0xa76b,
-	0xa76d, 0xa76d,
-	0xa76f, 0xa76f,
-	0xa77a, 0xa77a,
-	0xa77c, 0xa77c,
-	0xa77f, 0xa77f,
-	0xa781, 0xa781,
-	0xa783, 0xa783,
-	0xa785, 0xa785,
-	0xa787, 0xa787,
-	0xa78c, 0xa78c,
-	0xa791, 0xa791,
-	0xa793, 0xa793,
-	0xa7a1, 0xa7a1,
-	0xa7a3, 0xa7a3,
-	0xa7a5, 0xa7a5,
-	0xa7a7, 0xa7a7,
-	0xa7a9, 0xa7a9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff41, 0xff5a,
-	0x10428, 0x1044f,
-}; /* CR_Changes_When_Uppercased */
-
-/* 'Changes_When_Titlecased': Derived Property */
-static const OnigCodePoint CR_Changes_When_Titlecased[] = {
-	587,
-	0x0061, 0x007a,
-	0x00b5, 0x00b5,
-	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, 0x0137,
-	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, 0x018c,
-	0x0192, 0x0192,
-	0x0195, 0x0195,
-	0x0199, 0x019a,
-	0x019e, 0x019e,
-	0x01a1, 0x01a1,
-	0x01a3, 0x01a3,
-	0x01a5, 0x01a5,
-	0x01a8, 0x01a8,
-	0x01ad, 0x01ad,
-	0x01b0, 0x01b0,
-	0x01b4, 0x01b4,
-	0x01b6, 0x01b6,
-	0x01b9, 0x01b9,
-	0x01bd, 0x01bd,
-	0x01bf, 0x01bf,
-	0x01c4, 0x01c4,
-	0x01c6, 0x01c7,
-	0x01c9, 0x01ca,
-	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, 0x01f1,
-	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,
-	0x0223, 0x0223,
-	0x0225, 0x0225,
-	0x0227, 0x0227,
-	0x0229, 0x0229,
-	0x022b, 0x022b,
-	0x022d, 0x022d,
-	0x022f, 0x022f,
-	0x0231, 0x0231,
-	0x0233, 0x0233,
-	0x023c, 0x023c,
-	0x023f, 0x0240,
-	0x0242, 0x0242,
-	0x0247, 0x0247,
-	0x0249, 0x0249,
-	0x024b, 0x024b,
-	0x024d, 0x024d,
-	0x024f, 0x0254,
-	0x0256, 0x0257,
-	0x0259, 0x0259,
-	0x025b, 0x025b,
-	0x0260, 0x0260,
-	0x0263, 0x0263,
-	0x0265, 0x0266,
-	0x0268, 0x0269,
-	0x026b, 0x026b,
-	0x026f, 0x026f,
-	0x0271, 0x0272,
-	0x0275, 0x0275,
-	0x027d, 0x027d,
-	0x0280, 0x0280,
-	0x0283, 0x0283,
-	0x0288, 0x028c,
-	0x0292, 0x0292,
-	0x0345, 0x0345,
-	0x0371, 0x0371,
-	0x0373, 0x0373,
-	0x0377, 0x0377,
-	0x037b, 0x037d,
-	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, 0x03f2,
-	0x03f5, 0x03f5,
-	0x03f8, 0x03f8,
-	0x03fb, 0x03fb,
-	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, 0x04cf,
-	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,
-	0x04fb, 0x04fb,
-	0x04fd, 0x04fd,
-	0x04ff, 0x04ff,
-	0x0501, 0x0501,
-	0x0503, 0x0503,
-	0x0505, 0x0505,
-	0x0507, 0x0507,
-	0x0509, 0x0509,
-	0x050b, 0x050b,
-	0x050d, 0x050d,
-	0x050f, 0x050f,
-	0x0511, 0x0511,
-	0x0513, 0x0513,
-	0x0515, 0x0515,
-	0x0517, 0x0517,
-	0x0519, 0x0519,
-	0x051b, 0x051b,
-	0x051d, 0x051d,
-	0x051f, 0x051f,
-	0x0521, 0x0521,
-	0x0523, 0x0523,
-	0x0525, 0x0525,
-	0x0527, 0x0527,
-	0x0561, 0x0587,
-	0x1d79, 0x1d79,
-	0x1d7d, 0x1d7d,
-	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,
-	0x1efb, 0x1efb,
-	0x1efd, 0x1efd,
-	0x1eff, 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,
-	0x214e, 0x214e,
-	0x2170, 0x217f,
-	0x2184, 0x2184,
-	0x24d0, 0x24e9,
-	0x2c30, 0x2c5e,
-	0x2c61, 0x2c61,
-	0x2c65, 0x2c66,
-	0x2c68, 0x2c68,
-	0x2c6a, 0x2c6a,
-	0x2c6c, 0x2c6c,
-	0x2c73, 0x2c73,
-	0x2c76, 0x2c76,
-	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, 0x2ce3,
-	0x2cec, 0x2cec,
-	0x2cee, 0x2cee,
-	0x2cf3, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0xa641, 0xa641,
-	0xa643, 0xa643,
-	0xa645, 0xa645,
-	0xa647, 0xa647,
-	0xa649, 0xa649,
-	0xa64b, 0xa64b,
-	0xa64d, 0xa64d,
-	0xa64f, 0xa64f,
-	0xa651, 0xa651,
-	0xa653, 0xa653,
-	0xa655, 0xa655,
-	0xa657, 0xa657,
-	0xa659, 0xa659,
-	0xa65b, 0xa65b,
-	0xa65d, 0xa65d,
-	0xa65f, 0xa65f,
-	0xa661, 0xa661,
-	0xa663, 0xa663,
-	0xa665, 0xa665,
-	0xa667, 0xa667,
-	0xa669, 0xa669,
-	0xa66b, 0xa66b,
-	0xa66d, 0xa66d,
-	0xa681, 0xa681,
-	0xa683, 0xa683,
-	0xa685, 0xa685,
-	0xa687, 0xa687,
-	0xa689, 0xa689,
-	0xa68b, 0xa68b,
-	0xa68d, 0xa68d,
-	0xa68f, 0xa68f,
-	0xa691, 0xa691,
-	0xa693, 0xa693,
-	0xa695, 0xa695,
-	0xa697, 0xa697,
-	0xa723, 0xa723,
-	0xa725, 0xa725,
-	0xa727, 0xa727,
-	0xa729, 0xa729,
-	0xa72b, 0xa72b,
-	0xa72d, 0xa72d,
-	0xa72f, 0xa72f,
-	0xa733, 0xa733,
-	0xa735, 0xa735,
-	0xa737, 0xa737,
-	0xa739, 0xa739,
-	0xa73b, 0xa73b,
-	0xa73d, 0xa73d,
-	0xa73f, 0xa73f,
-	0xa741, 0xa741,
-	0xa743, 0xa743,
-	0xa745, 0xa745,
-	0xa747, 0xa747,
-	0xa749, 0xa749,
-	0xa74b, 0xa74b,
-	0xa74d, 0xa74d,
-	0xa74f, 0xa74f,
-	0xa751, 0xa751,
-	0xa753, 0xa753,
-	0xa755, 0xa755,
-	0xa757, 0xa757,
-	0xa759, 0xa759,
-	0xa75b, 0xa75b,
-	0xa75d, 0xa75d,
-	0xa75f, 0xa75f,
-	0xa761, 0xa761,
-	0xa763, 0xa763,
-	0xa765, 0xa765,
-	0xa767, 0xa767,
-	0xa769, 0xa769,
-	0xa76b, 0xa76b,
-	0xa76d, 0xa76d,
-	0xa76f, 0xa76f,
-	0xa77a, 0xa77a,
-	0xa77c, 0xa77c,
-	0xa77f, 0xa77f,
-	0xa781, 0xa781,
-	0xa783, 0xa783,
-	0xa785, 0xa785,
-	0xa787, 0xa787,
-	0xa78c, 0xa78c,
-	0xa791, 0xa791,
-	0xa793, 0xa793,
-	0xa7a1, 0xa7a1,
-	0xa7a3, 0xa7a3,
-	0xa7a5, 0xa7a5,
-	0xa7a7, 0xa7a7,
-	0xa7a9, 0xa7a9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff41, 0xff5a,
-	0x10428, 0x1044f,
-}; /* CR_Changes_When_Titlecased */
-
-/* 'Changes_When_Casefolded': Derived Property */
-static const OnigCodePoint CR_Changes_When_Casefolded[] = {
-	582,
-	0x0041, 0x005a,
-	0x00b5, 0x00b5,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00df,
-	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,
-	0x0149, 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,
-	0x017f, 0x017f,
-	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, 0x01c5,
-	0x01c7, 0x01c8,
-	0x01ca, 0x01cb,
-	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, 0x01f2,
-	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,
-	0x0243, 0x0246,
-	0x0248, 0x0248,
-	0x024a, 0x024a,
-	0x024c, 0x024c,
-	0x024e, 0x024e,
-	0x0345, 0x0345,
-	0x0370, 0x0370,
-	0x0372, 0x0372,
-	0x0376, 0x0376,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x038f,
-	0x0391, 0x03a1,
-	0x03a3, 0x03ab,
-	0x03c2, 0x03c2,
-	0x03cf, 0x03d1,
-	0x03d5, 0x03d6,
-	0x03d8, 0x03d8,
-	0x03da, 0x03da,
-	0x03dc, 0x03dc,
-	0x03de, 0x03de,
-	0x03e0, 0x03e0,
-	0x03e2, 0x03e2,
-	0x03e4, 0x03e4,
-	0x03e6, 0x03e6,
-	0x03e8, 0x03e8,
-	0x03ea, 0x03ea,
-	0x03ec, 0x03ec,
-	0x03ee, 0x03ee,
-	0x03f0, 0x03f1,
-	0x03f4, 0x03f5,
-	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,
-	0x04fa, 0x04fa,
-	0x04fc, 0x04fc,
-	0x04fe, 0x04fe,
-	0x0500, 0x0500,
-	0x0502, 0x0502,
-	0x0504, 0x0504,
-	0x0506, 0x0506,
-	0x0508, 0x0508,
-	0x050a, 0x050a,
-	0x050c, 0x050c,
-	0x050e, 0x050e,
-	0x0510, 0x0510,
-	0x0512, 0x0512,
-	0x0514, 0x0514,
-	0x0516, 0x0516,
-	0x0518, 0x0518,
-	0x051a, 0x051a,
-	0x051c, 0x051c,
-	0x051e, 0x051e,
-	0x0520, 0x0520,
-	0x0522, 0x0522,
-	0x0524, 0x0524,
-	0x0526, 0x0526,
-	0x0531, 0x0556,
-	0x0587, 0x0587,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	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,
-	0x1e9a, 0x1e9b,
-	0x1e9e, 0x1e9e,
-	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,
-	0x1efa, 0x1efa,
-	0x1efc, 0x1efc,
-	0x1efe, 0x1efe,
-	0x1f08, 0x1f0f,
-	0x1f18, 0x1f1d,
-	0x1f28, 0x1f2f,
-	0x1f38, 0x1f3f,
-	0x1f48, 0x1f4d,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f5f,
-	0x1f68, 0x1f6f,
-	0x1f80, 0x1faf,
-	0x1fb2, 0x1fb4,
-	0x1fb7, 0x1fbc,
-	0x1fc2, 0x1fc4,
-	0x1fc7, 0x1fcc,
-	0x1fd8, 0x1fdb,
-	0x1fe8, 0x1fec,
-	0x1ff2, 0x1ff4,
-	0x1ff7, 0x1ffc,
-	0x2126, 0x2126,
-	0x212a, 0x212b,
-	0x2132, 0x2132,
-	0x2160, 0x216f,
-	0x2183, 0x2183,
-	0x24b6, 0x24cf,
-	0x2c00, 0x2c2e,
-	0x2c60, 0x2c60,
-	0x2c62, 0x2c64,
-	0x2c67, 0x2c67,
-	0x2c69, 0x2c69,
-	0x2c6b, 0x2c6b,
-	0x2c6d, 0x2c70,
-	0x2c72, 0x2c72,
-	0x2c75, 0x2c75,
-	0x2c7e, 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,
-	0x2ceb, 0x2ceb,
-	0x2ced, 0x2ced,
-	0x2cf2, 0x2cf2,
-	0xa640, 0xa640,
-	0xa642, 0xa642,
-	0xa644, 0xa644,
-	0xa646, 0xa646,
-	0xa648, 0xa648,
-	0xa64a, 0xa64a,
-	0xa64c, 0xa64c,
-	0xa64e, 0xa64e,
-	0xa650, 0xa650,
-	0xa652, 0xa652,
-	0xa654, 0xa654,
-	0xa656, 0xa656,
-	0xa658, 0xa658,
-	0xa65a, 0xa65a,
-	0xa65c, 0xa65c,
-	0xa65e, 0xa65e,
-	0xa660, 0xa660,
-	0xa662, 0xa662,
-	0xa664, 0xa664,
-	0xa666, 0xa666,
-	0xa668, 0xa668,
-	0xa66a, 0xa66a,
-	0xa66c, 0xa66c,
-	0xa680, 0xa680,
-	0xa682, 0xa682,
-	0xa684, 0xa684,
-	0xa686, 0xa686,
-	0xa688, 0xa688,
-	0xa68a, 0xa68a,
-	0xa68c, 0xa68c,
-	0xa68e, 0xa68e,
-	0xa690, 0xa690,
-	0xa692, 0xa692,
-	0xa694, 0xa694,
-	0xa696, 0xa696,
-	0xa722, 0xa722,
-	0xa724, 0xa724,
-	0xa726, 0xa726,
-	0xa728, 0xa728,
-	0xa72a, 0xa72a,
-	0xa72c, 0xa72c,
-	0xa72e, 0xa72e,
-	0xa732, 0xa732,
-	0xa734, 0xa734,
-	0xa736, 0xa736,
-	0xa738, 0xa738,
-	0xa73a, 0xa73a,
-	0xa73c, 0xa73c,
-	0xa73e, 0xa73e,
-	0xa740, 0xa740,
-	0xa742, 0xa742,
-	0xa744, 0xa744,
-	0xa746, 0xa746,
-	0xa748, 0xa748,
-	0xa74a, 0xa74a,
-	0xa74c, 0xa74c,
-	0xa74e, 0xa74e,
-	0xa750, 0xa750,
-	0xa752, 0xa752,
-	0xa754, 0xa754,
-	0xa756, 0xa756,
-	0xa758, 0xa758,
-	0xa75a, 0xa75a,
-	0xa75c, 0xa75c,
-	0xa75e, 0xa75e,
-	0xa760, 0xa760,
-	0xa762, 0xa762,
-	0xa764, 0xa764,
-	0xa766, 0xa766,
-	0xa768, 0xa768,
-	0xa76a, 0xa76a,
-	0xa76c, 0xa76c,
-	0xa76e, 0xa76e,
-	0xa779, 0xa779,
-	0xa77b, 0xa77b,
-	0xa77d, 0xa77e,
-	0xa780, 0xa780,
-	0xa782, 0xa782,
-	0xa784, 0xa784,
-	0xa786, 0xa786,
-	0xa78b, 0xa78b,
-	0xa78d, 0xa78d,
-	0xa790, 0xa790,
-	0xa792, 0xa792,
-	0xa7a0, 0xa7a0,
-	0xa7a2, 0xa7a2,
-	0xa7a4, 0xa7a4,
-	0xa7a6, 0xa7a6,
-	0xa7a8, 0xa7a8,
-	0xa7aa, 0xa7aa,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff21, 0xff3a,
-	0x10400, 0x10427,
-}; /* CR_Changes_When_Casefolded */
-
-/* 'Changes_When_Casemapped': Derived Property */
-static const OnigCodePoint CR_Changes_When_Casemapped[] = {
-	104,
-	0x0041, 0x005a,
-	0x0061, 0x007a,
-	0x00b5, 0x00b5,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x0137,
-	0x0139, 0x018c,
-	0x018e, 0x019a,
-	0x019c, 0x01a9,
-	0x01ac, 0x01b9,
-	0x01bc, 0x01bd,
-	0x01bf, 0x01bf,
-	0x01c4, 0x0220,
-	0x0222, 0x0233,
-	0x023a, 0x0254,
-	0x0256, 0x0257,
-	0x0259, 0x0259,
-	0x025b, 0x025b,
-	0x0260, 0x0260,
-	0x0263, 0x0263,
-	0x0265, 0x0266,
-	0x0268, 0x0269,
-	0x026b, 0x026b,
-	0x026f, 0x026f,
-	0x0271, 0x0272,
-	0x0275, 0x0275,
-	0x027d, 0x027d,
-	0x0280, 0x0280,
-	0x0283, 0x0283,
-	0x0288, 0x028c,
-	0x0292, 0x0292,
-	0x0345, 0x0345,
-	0x0370, 0x0373,
-	0x0376, 0x0377,
-	0x037b, 0x037d,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03d1,
-	0x03d5, 0x03f2,
-	0x03f4, 0x03f5,
-	0x03f7, 0x03fb,
-	0x03fd, 0x0481,
-	0x048a, 0x0527,
-	0x0531, 0x0556,
-	0x0561, 0x0587,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x1d79, 0x1d79,
-	0x1d7d, 0x1d7d,
-	0x1e00, 0x1e9b,
-	0x1e9e, 0x1e9e,
-	0x1ea0, 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,
-	0x2126, 0x2126,
-	0x212a, 0x212b,
-	0x2132, 0x2132,
-	0x214e, 0x214e,
-	0x2160, 0x217f,
-	0x2183, 0x2184,
-	0x24b6, 0x24e9,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2c70,
-	0x2c72, 0x2c73,
-	0x2c75, 0x2c76,
-	0x2c7e, 0x2ce3,
-	0x2ceb, 0x2cee,
-	0x2cf2, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0xa640, 0xa66d,
-	0xa680, 0xa697,
-	0xa722, 0xa72f,
-	0xa732, 0xa76f,
-	0xa779, 0xa787,
-	0xa78b, 0xa78d,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0x10400, 0x1044f,
-}; /* CR_Changes_When_Casemapped */
-
-/* 'ID_Start': Derived Property */
-static const OnigCodePoint CR_ID_Start[] = {
-	488,
-	0x0041, 0x005a,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00b5, 0x00b5,
-	0x00ba, 0x00ba,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x02c1,
-	0x02c6, 0x02d1,
-	0x02e0, 0x02e4,
-	0x02ec, 0x02ec,
-	0x02ee, 0x02ee,
-	0x0370, 0x0374,
-	0x0376, 0x0377,
-	0x037a, 0x037d,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x048a, 0x0527,
-	0x0531, 0x0556,
-	0x0559, 0x0559,
-	0x0561, 0x0587,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0620, 0x064a,
-	0x066e, 0x066f,
-	0x0671, 0x06d3,
-	0x06d5, 0x06d5,
-	0x06e5, 0x06e6,
-	0x06ee, 0x06ef,
-	0x06fa, 0x06fc,
-	0x06ff, 0x06ff,
-	0x0710, 0x0710,
-	0x0712, 0x072f,
-	0x074d, 0x07a5,
-	0x07b1, 0x07b1,
-	0x07ca, 0x07ea,
-	0x07f4, 0x07f5,
-	0x07fa, 0x07fa,
-	0x0800, 0x0815,
-	0x081a, 0x081a,
-	0x0824, 0x0824,
-	0x0828, 0x0828,
-	0x0840, 0x0858,
-	0x08a0, 0x08a0,
-	0x08a2, 0x08ac,
-	0x0904, 0x0939,
-	0x093d, 0x093d,
-	0x0950, 0x0950,
-	0x0958, 0x0961,
-	0x0971, 0x0977,
-	0x0979, 0x097f,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c3d,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c61,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbd, 0x0cbd,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce1,
-	0x0cf1, 0x0cf2,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d3d,
-	0x0d4e, 0x0d4e,
-	0x0d60, 0x0d61,
-	0x0d7a, 0x0d7f,
-	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, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f40, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f88, 0x0f8c,
-	0x1000, 0x102a,
-	0x103f, 0x103f,
-	0x1050, 0x1055,
-	0x105a, 0x105d,
-	0x1061, 0x1061,
-	0x1065, 0x1066,
-	0x106e, 0x1070,
-	0x1075, 0x1081,
-	0x108e, 0x108e,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 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, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1711,
-	0x1720, 0x1731,
-	0x1740, 0x1751,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1780, 0x17b3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dc,
-	0x1820, 0x1877,
-	0x1880, 0x18a8,
-	0x18aa, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19c1, 0x19c7,
-	0x1a00, 0x1a16,
-	0x1a20, 0x1a54,
-	0x1aa7, 0x1aa7,
-	0x1b05, 0x1b33,
-	0x1b45, 0x1b4b,
-	0x1b83, 0x1ba0,
-	0x1bae, 0x1baf,
-	0x1bba, 0x1be5,
-	0x1c00, 0x1c23,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c7d,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf1,
-	0x1cf5, 0x1cf6,
-	0x1d00, 0x1dbf,
-	0x1e00, 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, 0x209c,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2118, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2160, 0x2188,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2ce4,
-	0x2ceb, 0x2cee,
-	0x2cf2, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x3005, 0x3007,
-	0x3021, 0x3029,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x309b, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa640, 0xa66e,
-	0xa67f, 0xa697,
-	0xa6a0, 0xa6ef,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xa7f8, 0xa801,
-	0xa803, 0xa805,
-	0xa807, 0xa80a,
-	0xa80c, 0xa822,
-	0xa840, 0xa873,
-	0xa882, 0xa8b3,
-	0xa8f2, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa90a, 0xa925,
-	0xa930, 0xa946,
-	0xa960, 0xa97c,
-	0xa984, 0xa9b2,
-	0xa9cf, 0xa9cf,
-	0xaa00, 0xaa28,
-	0xaa40, 0xaa42,
-	0xaa44, 0xaa4b,
-	0xaa60, 0xaa76,
-	0xaa7a, 0xaa7a,
-	0xaa80, 0xaaaf,
-	0xaab1, 0xaab1,
-	0xaab5, 0xaab6,
-	0xaab9, 0xaabd,
-	0xaac0, 0xaac0,
-	0xaac2, 0xaac2,
-	0xaadb, 0xaadd,
-	0xaae0, 0xaaea,
-	0xaaf2, 0xaaf4,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabe2,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa6d,
-	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,
-	0x10140, 0x10174,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a00,
-	0x10a10, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11003, 0x11037,
-	0x11083, 0x110af,
-	0x110d0, 0x110e8,
-	0x11103, 0x11126,
-	0x11183, 0x111b2,
-	0x111c1, 0x111c4,
-	0x11680, 0x116aa,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f50,
-	0x16f93, 0x16f9f,
-	0x1b000, 0x1b001,
-	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, 0x1d7cb,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_ID_Start */
-
-/* 'ID_Continue': Derived Property */
-static const OnigCodePoint CR_ID_Continue[] = {
-	564,
-	0x0030, 0x0039,
-	0x0041, 0x005a,
-	0x005f, 0x005f,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00b5, 0x00b5,
-	0x00b7, 0x00b7,
-	0x00ba, 0x00ba,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x02c1,
-	0x02c6, 0x02d1,
-	0x02e0, 0x02e4,
-	0x02ec, 0x02ec,
-	0x02ee, 0x02ee,
-	0x0300, 0x0374,
-	0x0376, 0x0377,
-	0x037a, 0x037d,
-	0x0386, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x0483, 0x0487,
-	0x048a, 0x0527,
-	0x0531, 0x0556,
-	0x0559, 0x0559,
-	0x0561, 0x0587,
-	0x0591, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0610, 0x061a,
-	0x0620, 0x0669,
-	0x066e, 0x06d3,
-	0x06d5, 0x06dc,
-	0x06df, 0x06e8,
-	0x06ea, 0x06fc,
-	0x06ff, 0x06ff,
-	0x0710, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07f5,
-	0x07fa, 0x07fa,
-	0x0800, 0x082d,
-	0x0840, 0x085b,
-	0x08a0, 0x08a0,
-	0x08a2, 0x08ac,
-	0x08e4, 0x08fe,
-	0x0900, 0x0963,
-	0x0966, 0x096f,
-	0x0971, 0x0977,
-	0x0979, 0x097f,
-	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,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bef,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	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, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d6f,
-	0x0d7a, 0x0d7f,
-	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, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f18, 0x0f19,
-	0x0f20, 0x0f29,
-	0x0f35, 0x0f35,
-	0x0f37, 0x0f37,
-	0x0f39, 0x0f39,
-	0x0f3e, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f84,
-	0x0f86, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fc6, 0x0fc6,
-	0x1000, 0x1049,
-	0x1050, 0x109d,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 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,
-	0x135d, 0x135f,
-	0x1369, 0x1371,
-	0x1380, 0x138f,
-	0x13a0, 0x13f4,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1714,
-	0x1720, 0x1734,
-	0x1740, 0x1753,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-	0x1780, 0x17d3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dd,
-	0x17e0, 0x17e9,
-	0x180b, 0x180d,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1946, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x1a00, 0x1a1b,
-	0x1a20, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa7, 0x1aa7,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b59,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1bf3,
-	0x1c00, 0x1c37,
-	0x1c40, 0x1c49,
-	0x1c4d, 0x1c7d,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1cf6,
-	0x1d00, 0x1de6,
-	0x1dfc, 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,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 0x209c,
-	0x20d0, 0x20dc,
-	0x20e1, 0x20e1,
-	0x20e5, 0x20f0,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2118, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2160, 0x2188,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2ce4,
-	0x2ceb, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d6f,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2dff,
-	0x3005, 0x3007,
-	0x3021, 0x302f,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x3099, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa62b,
-	0xa640, 0xa66f,
-	0xa674, 0xa67d,
-	0xa67f, 0xa697,
-	0xa69f, 0xa6f1,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xa7f8, 0xa827,
-	0xa840, 0xa873,
-	0xa880, 0xa8c4,
-	0xa8d0, 0xa8d9,
-	0xa8e0, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa900, 0xa92d,
-	0xa930, 0xa953,
-	0xa960, 0xa97c,
-	0xa980, 0xa9c0,
-	0xa9cf, 0xa9d9,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa60, 0xaa76,
-	0xaa7a, 0xaa7b,
-	0xaa80, 0xaac2,
-	0xaadb, 0xaadd,
-	0xaae0, 0xaaef,
-	0xaaf2, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabea,
-	0xabec, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa6d,
-	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, 0xfe26,
-	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,
-	0x10140, 0x10174,
-	0x101fd, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	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, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11000, 0x11046,
-	0x11066, 0x1106f,
-	0x11080, 0x110ba,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x1113f,
-	0x11180, 0x111c4,
-	0x111d0, 0x111d9,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x1b000, 0x1b001,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0xe0100, 0xe01ef,
-}; /* CR_ID_Continue */
-
-/* 'XID_Start': Derived Property */
-static const OnigCodePoint CR_XID_Start[] = {
-	495,
-	0x0041, 0x005a,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00b5, 0x00b5,
-	0x00ba, 0x00ba,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x02c1,
-	0x02c6, 0x02d1,
-	0x02e0, 0x02e4,
-	0x02ec, 0x02ec,
-	0x02ee, 0x02ee,
-	0x0370, 0x0374,
-	0x0376, 0x0377,
-	0x037b, 0x037d,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x048a, 0x0527,
-	0x0531, 0x0556,
-	0x0559, 0x0559,
-	0x0561, 0x0587,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0620, 0x064a,
-	0x066e, 0x066f,
-	0x0671, 0x06d3,
-	0x06d5, 0x06d5,
-	0x06e5, 0x06e6,
-	0x06ee, 0x06ef,
-	0x06fa, 0x06fc,
-	0x06ff, 0x06ff,
-	0x0710, 0x0710,
-	0x0712, 0x072f,
-	0x074d, 0x07a5,
-	0x07b1, 0x07b1,
-	0x07ca, 0x07ea,
-	0x07f4, 0x07f5,
-	0x07fa, 0x07fa,
-	0x0800, 0x0815,
-	0x081a, 0x081a,
-	0x0824, 0x0824,
-	0x0828, 0x0828,
-	0x0840, 0x0858,
-	0x08a0, 0x08a0,
-	0x08a2, 0x08ac,
-	0x0904, 0x0939,
-	0x093d, 0x093d,
-	0x0950, 0x0950,
-	0x0958, 0x0961,
-	0x0971, 0x0977,
-	0x0979, 0x097f,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c3d,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c61,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbd, 0x0cbd,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce1,
-	0x0cf1, 0x0cf2,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d3d,
-	0x0d4e, 0x0d4e,
-	0x0d60, 0x0d61,
-	0x0d7a, 0x0d7f,
-	0x0d85, 0x0d96,
-	0x0d9a, 0x0db1,
-	0x0db3, 0x0dbb,
-	0x0dbd, 0x0dbd,
-	0x0dc0, 0x0dc6,
-	0x0e01, 0x0e30,
-	0x0e32, 0x0e32,
-	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, 0x0eb2,
-	0x0ebd, 0x0ebd,
-	0x0ec0, 0x0ec4,
-	0x0ec6, 0x0ec6,
-	0x0edc, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f40, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f88, 0x0f8c,
-	0x1000, 0x102a,
-	0x103f, 0x103f,
-	0x1050, 0x1055,
-	0x105a, 0x105d,
-	0x1061, 0x1061,
-	0x1065, 0x1066,
-	0x106e, 0x1070,
-	0x1075, 0x1081,
-	0x108e, 0x108e,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 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, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1711,
-	0x1720, 0x1731,
-	0x1740, 0x1751,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1780, 0x17b3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dc,
-	0x1820, 0x1877,
-	0x1880, 0x18a8,
-	0x18aa, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19c1, 0x19c7,
-	0x1a00, 0x1a16,
-	0x1a20, 0x1a54,
-	0x1aa7, 0x1aa7,
-	0x1b05, 0x1b33,
-	0x1b45, 0x1b4b,
-	0x1b83, 0x1ba0,
-	0x1bae, 0x1baf,
-	0x1bba, 0x1be5,
-	0x1c00, 0x1c23,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c7d,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf1,
-	0x1cf5, 0x1cf6,
-	0x1d00, 0x1dbf,
-	0x1e00, 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, 0x209c,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2118, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2160, 0x2188,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2ce4,
-	0x2ceb, 0x2cee,
-	0x2cf2, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x3005, 0x3007,
-	0x3021, 0x3029,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x309d, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa640, 0xa66e,
-	0xa67f, 0xa697,
-	0xa6a0, 0xa6ef,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xa7f8, 0xa801,
-	0xa803, 0xa805,
-	0xa807, 0xa80a,
-	0xa80c, 0xa822,
-	0xa840, 0xa873,
-	0xa882, 0xa8b3,
-	0xa8f2, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa90a, 0xa925,
-	0xa930, 0xa946,
-	0xa960, 0xa97c,
-	0xa984, 0xa9b2,
-	0xa9cf, 0xa9cf,
-	0xaa00, 0xaa28,
-	0xaa40, 0xaa42,
-	0xaa44, 0xaa4b,
-	0xaa60, 0xaa76,
-	0xaa7a, 0xaa7a,
-	0xaa80, 0xaaaf,
-	0xaab1, 0xaab1,
-	0xaab5, 0xaab6,
-	0xaab9, 0xaabd,
-	0xaac0, 0xaac0,
-	0xaac2, 0xaac2,
-	0xaadb, 0xaadd,
-	0xaae0, 0xaaea,
-	0xaaf2, 0xaaf4,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabe2,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb1d,
-	0xfb1f, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfc5d,
-	0xfc64, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdf9,
-	0xfe71, 0xfe71,
-	0xfe73, 0xfe73,
-	0xfe77, 0xfe77,
-	0xfe79, 0xfe79,
-	0xfe7b, 0xfe7b,
-	0xfe7d, 0xfe7d,
-	0xfe7f, 0xfefc,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0xff66, 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,
-	0x10140, 0x10174,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a00,
-	0x10a10, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11003, 0x11037,
-	0x11083, 0x110af,
-	0x110d0, 0x110e8,
-	0x11103, 0x11126,
-	0x11183, 0x111b2,
-	0x111c1, 0x111c4,
-	0x11680, 0x116aa,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f50,
-	0x16f93, 0x16f9f,
-	0x1b000, 0x1b001,
-	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, 0x1d7cb,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_XID_Start */
-
-/* 'XID_Continue': Derived Property */
-static const OnigCodePoint CR_XID_Continue[] = {
-	571,
-	0x0030, 0x0039,
-	0x0041, 0x005a,
-	0x005f, 0x005f,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00b5, 0x00b5,
-	0x00b7, 0x00b7,
-	0x00ba, 0x00ba,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x02c1,
-	0x02c6, 0x02d1,
-	0x02e0, 0x02e4,
-	0x02ec, 0x02ec,
-	0x02ee, 0x02ee,
-	0x0300, 0x0374,
-	0x0376, 0x0377,
-	0x037b, 0x037d,
-	0x0386, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x0483, 0x0487,
-	0x048a, 0x0527,
-	0x0531, 0x0556,
-	0x0559, 0x0559,
-	0x0561, 0x0587,
-	0x0591, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0610, 0x061a,
-	0x0620, 0x0669,
-	0x066e, 0x06d3,
-	0x06d5, 0x06dc,
-	0x06df, 0x06e8,
-	0x06ea, 0x06fc,
-	0x06ff, 0x06ff,
-	0x0710, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07f5,
-	0x07fa, 0x07fa,
-	0x0800, 0x082d,
-	0x0840, 0x085b,
-	0x08a0, 0x08a0,
-	0x08a2, 0x08ac,
-	0x08e4, 0x08fe,
-	0x0900, 0x0963,
-	0x0966, 0x096f,
-	0x0971, 0x0977,
-	0x0979, 0x097f,
-	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,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bef,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	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, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d6f,
-	0x0d7a, 0x0d7f,
-	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, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f18, 0x0f19,
-	0x0f20, 0x0f29,
-	0x0f35, 0x0f35,
-	0x0f37, 0x0f37,
-	0x0f39, 0x0f39,
-	0x0f3e, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f84,
-	0x0f86, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fc6, 0x0fc6,
-	0x1000, 0x1049,
-	0x1050, 0x109d,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 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,
-	0x135d, 0x135f,
-	0x1369, 0x1371,
-	0x1380, 0x138f,
-	0x13a0, 0x13f4,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1714,
-	0x1720, 0x1734,
-	0x1740, 0x1753,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-	0x1780, 0x17d3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dd,
-	0x17e0, 0x17e9,
-	0x180b, 0x180d,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1946, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x1a00, 0x1a1b,
-	0x1a20, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa7, 0x1aa7,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b59,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1bf3,
-	0x1c00, 0x1c37,
-	0x1c40, 0x1c49,
-	0x1c4d, 0x1c7d,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1cf6,
-	0x1d00, 0x1de6,
-	0x1dfc, 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,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 0x209c,
-	0x20d0, 0x20dc,
-	0x20e1, 0x20e1,
-	0x20e5, 0x20f0,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2118, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2160, 0x2188,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2ce4,
-	0x2ceb, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d6f,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2dff,
-	0x3005, 0x3007,
-	0x3021, 0x302f,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x3099, 0x309a,
-	0x309d, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa62b,
-	0xa640, 0xa66f,
-	0xa674, 0xa67d,
-	0xa67f, 0xa697,
-	0xa69f, 0xa6f1,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xa7f8, 0xa827,
-	0xa840, 0xa873,
-	0xa880, 0xa8c4,
-	0xa8d0, 0xa8d9,
-	0xa8e0, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa900, 0xa92d,
-	0xa930, 0xa953,
-	0xa960, 0xa97c,
-	0xa980, 0xa9c0,
-	0xa9cf, 0xa9d9,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa60, 0xaa76,
-	0xaa7a, 0xaa7b,
-	0xaa80, 0xaac2,
-	0xaadb, 0xaadd,
-	0xaae0, 0xaaef,
-	0xaaf2, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabea,
-	0xabec, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfc5d,
-	0xfc64, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdf9,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe26,
-	0xfe33, 0xfe34,
-	0xfe4d, 0xfe4f,
-	0xfe71, 0xfe71,
-	0xfe73, 0xfe73,
-	0xfe77, 0xfe77,
-	0xfe79, 0xfe79,
-	0xfe7b, 0xfe7b,
-	0xfe7d, 0xfe7d,
-	0xfe7f, 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,
-	0x10140, 0x10174,
-	0x101fd, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	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, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11000, 0x11046,
-	0x11066, 0x1106f,
-	0x11080, 0x110ba,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x1113f,
-	0x11180, 0x111c4,
-	0x111d0, 0x111d9,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x1b000, 0x1b001,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0xe0100, 0xe01ef,
-}; /* CR_XID_Continue */
-
-/* 'Default_Ignorable_Code_Point': Derived Property */
-static const OnigCodePoint CR_Default_Ignorable_Code_Point[] = {
-	15,
-	0x00ad, 0x00ad,
-	0x034f, 0x034f,
-	0x115f, 0x1160,
-	0x17b4, 0x17b5,
-	0x180b, 0x180d,
-	0x200b, 0x200f,
-	0x202a, 0x202e,
-	0x2060, 0x206f,
-	0x3164, 0x3164,
-	0xfe00, 0xfe0f,
-	0xfeff, 0xfeff,
-	0xffa0, 0xffa0,
-	0xfff0, 0xfff8,
-	0x1d173, 0x1d17a,
-	0xe0000, 0xe0fff,
-}; /* CR_Default_Ignorable_Code_Point */
-
-/* 'Grapheme_Extend': Derived Property */
-static const OnigCodePoint CR_Grapheme_Extend[] = {
-	232,
-	0x0300, 0x036f,
-	0x0483, 0x0489,
-	0x0591, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x0610, 0x061a,
-	0x064b, 0x065f,
-	0x0670, 0x0670,
-	0x06d6, 0x06dc,
-	0x06df, 0x06e4,
-	0x06e7, 0x06e8,
-	0x06ea, 0x06ed,
-	0x0711, 0x0711,
-	0x0730, 0x074a,
-	0x07a6, 0x07b0,
-	0x07eb, 0x07f3,
-	0x0816, 0x0819,
-	0x081b, 0x0823,
-	0x0825, 0x0827,
-	0x0829, 0x082d,
-	0x0859, 0x085b,
-	0x08e4, 0x08fe,
-	0x0900, 0x0902,
-	0x093a, 0x093a,
-	0x093c, 0x093c,
-	0x0941, 0x0948,
-	0x094d, 0x094d,
-	0x0951, 0x0957,
-	0x0962, 0x0963,
-	0x0981, 0x0981,
-	0x09bc, 0x09bc,
-	0x09be, 0x09be,
-	0x09c1, 0x09c4,
-	0x09cd, 0x09cd,
-	0x09d7, 0x09d7,
-	0x09e2, 0x09e3,
-	0x0a01, 0x0a02,
-	0x0a3c, 0x0a3c,
-	0x0a41, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a70, 0x0a71,
-	0x0a75, 0x0a75,
-	0x0a81, 0x0a82,
-	0x0abc, 0x0abc,
-	0x0ac1, 0x0ac5,
-	0x0ac7, 0x0ac8,
-	0x0acd, 0x0acd,
-	0x0ae2, 0x0ae3,
-	0x0b01, 0x0b01,
-	0x0b3c, 0x0b3c,
-	0x0b3e, 0x0b3f,
-	0x0b41, 0x0b44,
-	0x0b4d, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b62, 0x0b63,
-	0x0b82, 0x0b82,
-	0x0bbe, 0x0bbe,
-	0x0bc0, 0x0bc0,
-	0x0bcd, 0x0bcd,
-	0x0bd7, 0x0bd7,
-	0x0c3e, 0x0c40,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c62, 0x0c63,
-	0x0cbc, 0x0cbc,
-	0x0cbf, 0x0cbf,
-	0x0cc2, 0x0cc2,
-	0x0cc6, 0x0cc6,
-	0x0ccc, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0ce2, 0x0ce3,
-	0x0d3e, 0x0d3e,
-	0x0d41, 0x0d44,
-	0x0d4d, 0x0d4d,
-	0x0d57, 0x0d57,
-	0x0d62, 0x0d63,
-	0x0dca, 0x0dca,
-	0x0dcf, 0x0dcf,
-	0x0dd2, 0x0dd4,
-	0x0dd6, 0x0dd6,
-	0x0ddf, 0x0ddf,
-	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,
-	0x0f8d, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fc6, 0x0fc6,
-	0x102d, 0x1030,
-	0x1032, 0x1037,
-	0x1039, 0x103a,
-	0x103d, 0x103e,
-	0x1058, 0x1059,
-	0x105e, 0x1060,
-	0x1071, 0x1074,
-	0x1082, 0x1082,
-	0x1085, 0x1086,
-	0x108d, 0x108d,
-	0x109d, 0x109d,
-	0x135d, 0x135f,
-	0x1712, 0x1714,
-	0x1732, 0x1734,
-	0x1752, 0x1753,
-	0x1772, 0x1773,
-	0x17b4, 0x17b5,
-	0x17b7, 0x17bd,
-	0x17c6, 0x17c6,
-	0x17c9, 0x17d3,
-	0x17dd, 0x17dd,
-	0x180b, 0x180d,
-	0x18a9, 0x18a9,
-	0x1920, 0x1922,
-	0x1927, 0x1928,
-	0x1932, 0x1932,
-	0x1939, 0x193b,
-	0x1a17, 0x1a18,
-	0x1a56, 0x1a56,
-	0x1a58, 0x1a5e,
-	0x1a60, 0x1a60,
-	0x1a62, 0x1a62,
-	0x1a65, 0x1a6c,
-	0x1a73, 0x1a7c,
-	0x1a7f, 0x1a7f,
-	0x1b00, 0x1b03,
-	0x1b34, 0x1b34,
-	0x1b36, 0x1b3a,
-	0x1b3c, 0x1b3c,
-	0x1b42, 0x1b42,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1b81,
-	0x1ba2, 0x1ba5,
-	0x1ba8, 0x1ba9,
-	0x1bab, 0x1bab,
-	0x1be6, 0x1be6,
-	0x1be8, 0x1be9,
-	0x1bed, 0x1bed,
-	0x1bef, 0x1bf1,
-	0x1c2c, 0x1c33,
-	0x1c36, 0x1c37,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce0,
-	0x1ce2, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1cf4, 0x1cf4,
-	0x1dc0, 0x1de6,
-	0x1dfc, 0x1dff,
-	0x200c, 0x200d,
-	0x20d0, 0x20f0,
-	0x2cef, 0x2cf1,
-	0x2d7f, 0x2d7f,
-	0x2de0, 0x2dff,
-	0x302a, 0x302f,
-	0x3099, 0x309a,
-	0xa66f, 0xa672,
-	0xa674, 0xa67d,
-	0xa69f, 0xa69f,
-	0xa6f0, 0xa6f1,
-	0xa802, 0xa802,
-	0xa806, 0xa806,
-	0xa80b, 0xa80b,
-	0xa825, 0xa826,
-	0xa8c4, 0xa8c4,
-	0xa8e0, 0xa8f1,
-	0xa926, 0xa92d,
-	0xa947, 0xa951,
-	0xa980, 0xa982,
-	0xa9b3, 0xa9b3,
-	0xa9b6, 0xa9b9,
-	0xa9bc, 0xa9bc,
-	0xaa29, 0xaa2e,
-	0xaa31, 0xaa32,
-	0xaa35, 0xaa36,
-	0xaa43, 0xaa43,
-	0xaa4c, 0xaa4c,
-	0xaab0, 0xaab0,
-	0xaab2, 0xaab4,
-	0xaab7, 0xaab8,
-	0xaabe, 0xaabf,
-	0xaac1, 0xaac1,
-	0xaaec, 0xaaed,
-	0xaaf6, 0xaaf6,
-	0xabe5, 0xabe5,
-	0xabe8, 0xabe8,
-	0xabed, 0xabed,
-	0xfb1e, 0xfb1e,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe26,
-	0xff9e, 0xff9f,
-	0x101fd, 0x101fd,
-	0x10a01, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a0f,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x11001, 0x11001,
-	0x11038, 0x11046,
-	0x11080, 0x11081,
-	0x110b3, 0x110b6,
-	0x110b9, 0x110ba,
-	0x11100, 0x11102,
-	0x11127, 0x1112b,
-	0x1112d, 0x11134,
-	0x11180, 0x11181,
-	0x111b6, 0x111be,
-	0x116ab, 0x116ab,
-	0x116ad, 0x116ad,
-	0x116b0, 0x116b5,
-	0x116b7, 0x116b7,
-	0x16f8f, 0x16f92,
-	0x1d165, 0x1d165,
-	0x1d167, 0x1d169,
-	0x1d16e, 0x1d172,
-	0x1d17b, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-	0x1d242, 0x1d244,
-	0xe0100, 0xe01ef,
-}; /* CR_Grapheme_Extend */
-
-/* 'Grapheme_Base': Derived Property */
-static const OnigCodePoint CR_Grapheme_Base[] = {
-	643,
-	0x0020, 0x007e,
-	0x00a0, 0x00ac,
-	0x00ae, 0x02ff,
-	0x0370, 0x0377,
-	0x037a, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x0482,
-	0x048a, 0x0527,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x058f, 0x058f,
-	0x05be, 0x05be,
-	0x05c0, 0x05c0,
-	0x05c3, 0x05c3,
-	0x05c6, 0x05c6,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0606, 0x060f,
-	0x061b, 0x061b,
-	0x061e, 0x064a,
-	0x0660, 0x066f,
-	0x0671, 0x06d5,
-	0x06de, 0x06de,
-	0x06e5, 0x06e6,
-	0x06e9, 0x06e9,
-	0x06ee, 0x070d,
-	0x0710, 0x0710,
-	0x0712, 0x072f,
-	0x074d, 0x07a5,
-	0x07b1, 0x07b1,
-	0x07c0, 0x07ea,
-	0x07f4, 0x07fa,
-	0x0800, 0x0815,
-	0x081a, 0x081a,
-	0x0824, 0x0824,
-	0x0828, 0x0828,
-	0x0830, 0x083e,
-	0x0840, 0x0858,
-	0x085e, 0x085e,
-	0x08a0, 0x08a0,
-	0x08a2, 0x08ac,
-	0x0903, 0x0939,
-	0x093b, 0x093b,
-	0x093d, 0x0940,
-	0x0949, 0x094c,
-	0x094e, 0x0950,
-	0x0958, 0x0961,
-	0x0964, 0x0977,
-	0x0979, 0x097f,
-	0x0982, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bd, 0x09bd,
-	0x09bf, 0x09c0,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cc,
-	0x09ce, 0x09ce,
-	0x09dc, 0x09dd,
-	0x09df, 0x09e1,
-	0x09e6, 0x09fb,
-	0x0a03, 0x0a03,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3e, 0x0a40,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a6f,
-	0x0a72, 0x0a74,
-	0x0a83, 0x0a83,
-	0x0a85, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abd, 0x0ac0,
-	0x0ac9, 0x0ac9,
-	0x0acb, 0x0acc,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae1,
-	0x0ae6, 0x0af1,
-	0x0b02, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3d, 0x0b3d,
-	0x0b40, 0x0b40,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4c,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b61,
-	0x0b66, 0x0b77,
-	0x0b83, 0x0b83,
-	0x0b85, 0x0b8a,
-	0x0b8e, 0x0b90,
-	0x0b92, 0x0b95,
-	0x0b99, 0x0b9a,
-	0x0b9c, 0x0b9c,
-	0x0b9e, 0x0b9f,
-	0x0ba3, 0x0ba4,
-	0x0ba8, 0x0baa,
-	0x0bae, 0x0bb9,
-	0x0bbf, 0x0bbf,
-	0x0bc1, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcc,
-	0x0bd0, 0x0bd0,
-	0x0be6, 0x0bfa,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c3d,
-	0x0c41, 0x0c44,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c61,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-	0x0c82, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbd, 0x0cbe,
-	0x0cc0, 0x0cc1,
-	0x0cc3, 0x0cc4,
-	0x0cc7, 0x0cc8,
-	0x0cca, 0x0ccb,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce1,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d3d,
-	0x0d3f, 0x0d40,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4c,
-	0x0d4e, 0x0d4e,
-	0x0d60, 0x0d61,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
-	0x0d82, 0x0d83,
-	0x0d85, 0x0d96,
-	0x0d9a, 0x0db1,
-	0x0db3, 0x0dbb,
-	0x0dbd, 0x0dbd,
-	0x0dc0, 0x0dc6,
-	0x0dd0, 0x0dd1,
-	0x0dd8, 0x0dde,
-	0x0df2, 0x0df4,
-	0x0e01, 0x0e30,
-	0x0e32, 0x0e33,
-	0x0e3f, 0x0e46,
-	0x0e4f, 0x0e5b,
-	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,
-	0x0ed0, 0x0ed9,
-	0x0edc, 0x0edf,
-	0x0f00, 0x0f17,
-	0x0f1a, 0x0f34,
-	0x0f36, 0x0f36,
-	0x0f38, 0x0f38,
-	0x0f3a, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f7f, 0x0f7f,
-	0x0f85, 0x0f85,
-	0x0f88, 0x0f8c,
-	0x0fbe, 0x0fc5,
-	0x0fc7, 0x0fcc,
-	0x0fce, 0x0fda,
-	0x1000, 0x102c,
-	0x1031, 0x1031,
-	0x1038, 0x1038,
-	0x103b, 0x103c,
-	0x103f, 0x1057,
-	0x105a, 0x105d,
-	0x1061, 0x1070,
-	0x1075, 0x1081,
-	0x1083, 0x1084,
-	0x1087, 0x108c,
-	0x108e, 0x109c,
-	0x109e, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 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,
-	0x1360, 0x137c,
-	0x1380, 0x1399,
-	0x13a0, 0x13f4,
-	0x1400, 0x169c,
-	0x16a0, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1711,
-	0x1720, 0x1731,
-	0x1735, 0x1736,
-	0x1740, 0x1751,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1780, 0x17b3,
-	0x17b6, 0x17b6,
-	0x17be, 0x17c5,
-	0x17c7, 0x17c8,
-	0x17d4, 0x17dc,
-	0x17e0, 0x17e9,
-	0x17f0, 0x17f9,
-	0x1800, 0x180a,
-	0x180e, 0x180e,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18a8,
-	0x18aa, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1923, 0x1926,
-	0x1929, 0x192b,
-	0x1930, 0x1931,
-	0x1933, 0x1938,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a16,
-	0x1a19, 0x1a1b,
-	0x1a1e, 0x1a55,
-	0x1a57, 0x1a57,
-	0x1a61, 0x1a61,
-	0x1a63, 0x1a64,
-	0x1a6d, 0x1a72,
-	0x1a80, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-	0x1b04, 0x1b33,
-	0x1b35, 0x1b35,
-	0x1b3b, 0x1b3b,
-	0x1b3d, 0x1b41,
-	0x1b43, 0x1b4b,
-	0x1b50, 0x1b6a,
-	0x1b74, 0x1b7c,
-	0x1b82, 0x1ba1,
-	0x1ba6, 0x1ba7,
-	0x1baa, 0x1baa,
-	0x1bac, 0x1be5,
-	0x1be7, 0x1be7,
-	0x1bea, 0x1bec,
-	0x1bee, 0x1bee,
-	0x1bf2, 0x1bf3,
-	0x1bfc, 0x1c2b,
-	0x1c34, 0x1c35,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cc0, 0x1cc7,
-	0x1cd3, 0x1cd3,
-	0x1ce1, 0x1ce1,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf3,
-	0x1cf5, 0x1cf6,
-	0x1d00, 0x1dbf,
-	0x1e00, 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, 0x200a,
-	0x2010, 0x2027,
-	0x202f, 0x205f,
-	0x2070, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x209c,
-	0x20a0, 0x20b9,
-	0x2100, 0x2189,
-	0x2190, 0x23f3,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x26ff,
-	0x2701, 0x2b4c,
-	0x2b50, 0x2b59,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cee,
-	0x2cf2, 0x2cf3,
-	0x2cf9, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d70,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2e00, 0x2e3b,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x3029,
-	0x3030, 0x303f,
-	0x3041, 0x3096,
-	0x309b, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa66e,
-	0xa673, 0xa673,
-	0xa67e, 0xa697,
-	0xa6a0, 0xa6ef,
-	0xa6f2, 0xa6f7,
-	0xa700, 0xa78e,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xa7f8, 0xa801,
-	0xa803, 0xa805,
-	0xa807, 0xa80a,
-	0xa80c, 0xa824,
-	0xa827, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c3,
-	0xa8ce, 0xa8d9,
-	0xa8f2, 0xa8fb,
-	0xa900, 0xa925,
-	0xa92e, 0xa946,
-	0xa952, 0xa953,
-	0xa95f, 0xa97c,
-	0xa983, 0xa9b2,
-	0xa9b4, 0xa9b5,
-	0xa9ba, 0xa9bb,
-	0xa9bd, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9df,
-	0xaa00, 0xaa28,
-	0xaa2f, 0xaa30,
-	0xaa33, 0xaa34,
-	0xaa40, 0xaa42,
-	0xaa44, 0xaa4b,
-	0xaa4d, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa7b,
-	0xaa80, 0xaaaf,
-	0xaab1, 0xaab1,
-	0xaab5, 0xaab6,
-	0xaab9, 0xaabd,
-	0xaac0, 0xaac0,
-	0xaac2, 0xaac2,
-	0xaadb, 0xaaeb,
-	0xaaee, 0xaaf5,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabe4,
-	0xabe6, 0xabe7,
-	0xabe9, 0xabec,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb1d,
-	0xfb1f, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbc1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfd,
-	0xfe10, 0xfe19,
-	0xfe30, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xff01, 0xff9d,
-	0xffa0, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfffc, 0xfffd,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018a,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fc,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	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, 0x10855,
-	0x10857, 0x1085f,
-	0x10900, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a00,
-	0x10a10, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a40, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a7f,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b7f,
-	0x10c00, 0x10c48,
-	0x10e60, 0x10e7e,
-	0x11000, 0x11000,
-	0x11002, 0x11037,
-	0x11047, 0x1104d,
-	0x11052, 0x1106f,
-	0x11082, 0x110b2,
-	0x110b7, 0x110b8,
-	0x110bb, 0x110bc,
-	0x110be, 0x110c1,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11103, 0x11126,
-	0x1112c, 0x1112c,
-	0x11136, 0x11143,
-	0x11182, 0x111b5,
-	0x111bf, 0x111c8,
-	0x111d0, 0x111d9,
-	0x11680, 0x116aa,
-	0x116ac, 0x116ac,
-	0x116ae, 0x116af,
-	0x116b6, 0x116b6,
-	0x116c0, 0x116c9,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f93, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d164,
-	0x1d166, 0x1d166,
-	0x1d16a, 0x1d16d,
-	0x1d183, 0x1d184,
-	0x1d18c, 0x1d1a9,
-	0x1d1ae, 0x1d1dd,
-	0x1d200, 0x1d241,
-	0x1d245, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	0x1f100, 0x1f10a,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f320,
-	0x1f330, 0x1f335,
-	0x1f337, 0x1f37c,
-	0x1f380, 0x1f393,
-	0x1f3a0, 0x1f3c4,
-	0x1f3c6, 0x1f3ca,
-	0x1f3e0, 0x1f3f0,
-	0x1f400, 0x1f43e,
-	0x1f440, 0x1f440,
-	0x1f442, 0x1f4f7,
-	0x1f4f9, 0x1f4fc,
-	0x1f500, 0x1f53d,
-	0x1f540, 0x1f543,
-	0x1f550, 0x1f567,
-	0x1f5fb, 0x1f640,
-	0x1f645, 0x1f64f,
-	0x1f680, 0x1f6c5,
-	0x1f700, 0x1f773,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_Grapheme_Base */
-
-/* 'Grapheme_Link': Derived Property */
-static const OnigCodePoint CR_Grapheme_Link[] = {
-	33,
-	0x094d, 0x094d,
-	0x09cd, 0x09cd,
-	0x0a4d, 0x0a4d,
-	0x0acd, 0x0acd,
-	0x0b4d, 0x0b4d,
-	0x0bcd, 0x0bcd,
-	0x0c4d, 0x0c4d,
-	0x0ccd, 0x0ccd,
-	0x0d4d, 0x0d4d,
-	0x0dca, 0x0dca,
-	0x0e3a, 0x0e3a,
-	0x0f84, 0x0f84,
-	0x1039, 0x103a,
-	0x1714, 0x1714,
-	0x1734, 0x1734,
-	0x17d2, 0x17d2,
-	0x1a60, 0x1a60,
-	0x1b44, 0x1b44,
-	0x1baa, 0x1bab,
-	0x1bf2, 0x1bf3,
-	0x2d7f, 0x2d7f,
-	0xa806, 0xa806,
-	0xa8c4, 0xa8c4,
-	0xa953, 0xa953,
-	0xa9c0, 0xa9c0,
-	0xaaf6, 0xaaf6,
-	0xabed, 0xabed,
-	0x10a3f, 0x10a3f,
-	0x11046, 0x11046,
-	0x110b9, 0x110b9,
-	0x11133, 0x11134,
-	0x111c0, 0x111c0,
-	0x116b6, 0x116b6,
-}; /* CR_Grapheme_Link */
-
-/* 'Common': Script */
-static const OnigCodePoint CR_Common[] = {
-	157,
-	0x0000, 0x0040,
-	0x005b, 0x0060,
-	0x007b, 0x00a9,
-	0x00ab, 0x00b9,
-	0x00bb, 0x00bf,
-	0x00d7, 0x00d7,
-	0x00f7, 0x00f7,
-	0x02b9, 0x02df,
-	0x02e5, 0x02e9,
-	0x02ec, 0x02ff,
-	0x0374, 0x0374,
-	0x037e, 0x037e,
-	0x0385, 0x0385,
-	0x0387, 0x0387,
-	0x0589, 0x0589,
-	0x060c, 0x060c,
-	0x061b, 0x061b,
-	0x061f, 0x061f,
-	0x0640, 0x0640,
-	0x0660, 0x0669,
-	0x06dd, 0x06dd,
-	0x0964, 0x0965,
-	0x0e3f, 0x0e3f,
-	0x0fd5, 0x0fd8,
-	0x10fb, 0x10fb,
-	0x16eb, 0x16ed,
-	0x1735, 0x1736,
-	0x1802, 0x1803,
-	0x1805, 0x1805,
-	0x1cd3, 0x1cd3,
-	0x1ce1, 0x1ce1,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf3,
-	0x1cf5, 0x1cf6,
-	0x2000, 0x200b,
-	0x200e, 0x2064,
-	0x206a, 0x2070,
-	0x2074, 0x207e,
-	0x2080, 0x208e,
-	0x20a0, 0x20b9,
-	0x2100, 0x2125,
-	0x2127, 0x2129,
-	0x212c, 0x2131,
-	0x2133, 0x214d,
-	0x214f, 0x215f,
-	0x2189, 0x2189,
-	0x2190, 0x23f3,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x26ff,
-	0x2701, 0x27ff,
-	0x2900, 0x2b4c,
-	0x2b50, 0x2b59,
-	0x2e00, 0x2e3b,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x3004,
-	0x3006, 0x3006,
-	0x3008, 0x3020,
-	0x3030, 0x3037,
-	0x303c, 0x303f,
-	0x309b, 0x309c,
-	0x30a0, 0x30a0,
-	0x30fb, 0x30fc,
-	0x3190, 0x319f,
-	0x31c0, 0x31e3,
-	0x3220, 0x325f,
-	0x327f, 0x32cf,
-	0x3358, 0x33ff,
-	0x4dc0, 0x4dff,
-	0xa700, 0xa721,
-	0xa788, 0xa78a,
-	0xa830, 0xa839,
-	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,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fc,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d166,
-	0x1d16a, 0x1d17a,
-	0x1d183, 0x1d184,
-	0x1d18c, 0x1d1a9,
-	0x1d1ae, 0x1d1dd,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	0x1f100, 0x1f10a,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f1ff,
-	0x1f201, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f320,
-	0x1f330, 0x1f335,
-	0x1f337, 0x1f37c,
-	0x1f380, 0x1f393,
-	0x1f3a0, 0x1f3c4,
-	0x1f3c6, 0x1f3ca,
-	0x1f3e0, 0x1f3f0,
-	0x1f400, 0x1f43e,
-	0x1f440, 0x1f440,
-	0x1f442, 0x1f4f7,
-	0x1f4f9, 0x1f4fc,
-	0x1f500, 0x1f53d,
-	0x1f540, 0x1f543,
-	0x1f550, 0x1f567,
-	0x1f5fb, 0x1f640,
-	0x1f645, 0x1f64f,
-	0x1f680, 0x1f6c5,
-	0x1f700, 0x1f773,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-}; /* CR_Common */
-
-/* 'Latin': Script */
-static const OnigCodePoint CR_Latin[] = {
-	30,
-	0x0041, 0x005a,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00ba, 0x00ba,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x02b8,
-	0x02e0, 0x02e4,
-	0x1d00, 0x1d25,
-	0x1d2c, 0x1d5c,
-	0x1d62, 0x1d65,
-	0x1d6b, 0x1d77,
-	0x1d79, 0x1dbe,
-	0x1e00, 0x1eff,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 0x209c,
-	0x212a, 0x212b,
-	0x2132, 0x2132,
-	0x214e, 0x214e,
-	0x2160, 0x2188,
-	0x2c60, 0x2c7f,
-	0xa722, 0xa787,
-	0xa78b, 0xa78e,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xa7f8, 0xa7ff,
-	0xfb00, 0xfb06,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-}; /* CR_Latin */
-
-/* 'Greek': Script */
-static const OnigCodePoint CR_Greek[] = {
-	33,
-	0x0370, 0x0373,
-	0x0375, 0x0377,
-	0x037a, 0x037d,
-	0x0384, 0x0384,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03e1,
-	0x03f0, 0x03ff,
-	0x1d26, 0x1d2a,
-	0x1d5d, 0x1d61,
-	0x1d66, 0x1d6a,
-	0x1dbf, 0x1dbf,
-	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 */
-
-/* 'Cyrillic': Script */
-static const OnigCodePoint CR_Cyrillic[] = {
-	7,
-	0x0400, 0x0484,
-	0x0487, 0x0527,
-	0x1d2b, 0x1d2b,
-	0x1d78, 0x1d78,
-	0x2de0, 0x2dff,
-	0xa640, 0xa697,
-	0xa69f, 0xa69f,
-}; /* CR_Cyrillic */
-
-/* 'Armenian': Script */
-static const OnigCodePoint CR_Armenian[] = {
-	6,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x058a, 0x058a,
-	0x058f, 0x058f,
-	0xfb13, 0xfb17,
-}; /* CR_Armenian */
-
-/* 'Hebrew': Script */
-static const OnigCodePoint CR_Hebrew[] = {
-	9,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfb4f,
-}; /* CR_Hebrew */
-
-/* 'Arabic': Script */
-static const OnigCodePoint CR_Arabic[] = {
-	56,
-	0x0600, 0x0604,
-	0x0606, 0x060b,
-	0x060d, 0x061a,
-	0x061e, 0x061e,
-	0x0620, 0x063f,
-	0x0641, 0x064a,
-	0x0656, 0x065e,
-	0x066a, 0x066f,
-	0x0671, 0x06dc,
-	0x06de, 0x06ff,
-	0x0750, 0x077f,
-	0x08a0, 0x08a0,
-	0x08a2, 0x08ac,
-	0x08e4, 0x08fe,
-	0xfb50, 0xfbc1,
-	0xfbd3, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfc,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0x10e60, 0x10e7e,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-}; /* CR_Arabic */
-
-/* 'Syriac': Script */
-static const OnigCodePoint CR_Syriac[] = {
-	3,
-	0x0700, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x074f,
-}; /* CR_Syriac */
-
-/* 'Thaana': Script */
-static const OnigCodePoint CR_Thaana[] = {
-	1,
-	0x0780, 0x07b1,
-}; /* CR_Thaana */
-
-/* 'Devanagari': Script */
-static const OnigCodePoint CR_Devanagari[] = {
-	5,
-	0x0900, 0x0950,
-	0x0953, 0x0963,
-	0x0966, 0x0977,
-	0x0979, 0x097f,
-	0xa8e0, 0xa8fb,
-}; /* CR_Devanagari */
-
-/* '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, 0x09fb,
-}; /* CR_Bengali */
-
-/* 'Gurmukhi': Script */
-static const OnigCodePoint CR_Gurmukhi[] = {
-	16,
-	0x0a01, 0x0a03,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-}; /* CR_Gurmukhi */
-
-/* 'Gujarati': Script */
-static const OnigCodePoint CR_Gujarati[] = {
-	13,
-	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, 0x0af1,
-}; /* CR_Gujarati */
-
-/* 'Oriya': Script */
-static const OnigCodePoint CR_Oriya[] = {
-	14,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3c, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	0x0b66, 0x0b77,
-}; /* CR_Oriya */
-
-/* 'Tamil': Script */
-static const OnigCodePoint CR_Tamil[] = {
-	16,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bfa,
-}; /* CR_Tamil */
-
-/* 'Telugu': Script */
-static const OnigCodePoint CR_Telugu[] = {
-	14,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-}; /* CR_Telugu */
-
-/* 'Kannada': Script */
-static const OnigCodePoint CR_Kannada[] = {
-	14,
-	0x0c82, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-}; /* CR_Kannada */
-
-/* 'Malayalam': Script */
-static const OnigCodePoint CR_Malayalam[] = {
-	11,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
-}; /* CR_Malayalam */
-
-/* '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 */
-
-/* 'Thai': Script */
-static const OnigCodePoint CR_Thai[] = {
-	2,
-	0x0e01, 0x0e3a,
-	0x0e40, 0x0e5b,
-}; /* CR_Thai */
-
-/* '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, 0x0edf,
-}; /* CR_Lao */
-
-/* 'Tibetan': Script */
-static const OnigCodePoint CR_Tibetan[] = {
-	7,
-	0x0f00, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fd4,
-	0x0fd9, 0x0fda,
-}; /* CR_Tibetan */
-
-/* 'Myanmar': Script */
-static const OnigCodePoint CR_Myanmar[] = {
-	2,
-	0x1000, 0x109f,
-	0xaa60, 0xaa7b,
-}; /* CR_Myanmar */
-
-/* 'Georgian': Script */
-static const OnigCodePoint CR_Georgian[] = {
-	8,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 0x10ff,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-}; /* CR_Georgian */
-
-/* 'Hangul': Script */
-static const OnigCodePoint CR_Hangul[] = {
-	14,
-	0x1100, 0x11ff,
-	0x302e, 0x302f,
-	0x3131, 0x318e,
-	0x3200, 0x321e,
-	0x3260, 0x327e,
-	0xa960, 0xa97c,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xffa0, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-}; /* CR_Hangul */
-
-/* 'Ethiopic': Script */
-static const OnigCodePoint CR_Ethiopic[] = {
-	32,
-	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,
-	0x135d, 0x137c,
-	0x1380, 0x1399,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-}; /* CR_Ethiopic */
-
-/* 'Cherokee': Script */
-static const OnigCodePoint CR_Cherokee[] = {
-	1,
-	0x13a0, 0x13f4,
-}; /* CR_Cherokee */
-
-/* 'Canadian_Aboriginal': Script */
-static const OnigCodePoint CR_Canadian_Aboriginal[] = {
-	2,
-	0x1400, 0x167f,
-	0x18b0, 0x18f5,
-}; /* CR_Canadian_Aboriginal */
-
-/* 'Ogham': Script */
-static const OnigCodePoint CR_Ogham[] = {
-	1,
-	0x1680, 0x169c,
-}; /* CR_Ogham */
-
-/* 'Runic': Script */
-static const OnigCodePoint CR_Runic[] = {
-	2,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f0,
-}; /* CR_Runic */
-
-/* 'Khmer': Script */
-static const OnigCodePoint CR_Khmer[] = {
-	4,
-	0x1780, 0x17dd,
-	0x17e0, 0x17e9,
-	0x17f0, 0x17f9,
-	0x19e0, 0x19ff,
-}; /* CR_Khmer */
-
-/* 'Mongolian': Script */
-static const OnigCodePoint CR_Mongolian[] = {
-	6,
-	0x1800, 0x1801,
-	0x1804, 0x1804,
-	0x1806, 0x180e,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-}; /* CR_Mongolian */
-
-/* 'Hiragana': Script */
-static const OnigCodePoint CR_Hiragana[] = {
-	4,
-	0x3041, 0x3096,
-	0x309d, 0x309f,
-	0x1b001, 0x1b001,
-	0x1f200, 0x1f200,
-}; /* CR_Hiragana */
-
-/* 'Katakana': Script */
-static const OnigCodePoint CR_Katakana[] = {
-	8,
-	0x30a1, 0x30fa,
-	0x30fd, 0x30ff,
-	0x31f0, 0x31ff,
-	0x32d0, 0x32fe,
-	0x3300, 0x3357,
-	0xff66, 0xff6f,
-	0xff71, 0xff9d,
-	0x1b000, 0x1b000,
-}; /* CR_Katakana */
-
-/* 'Bopomofo': Script */
-static const OnigCodePoint CR_Bopomofo[] = {
-	3,
-	0x02ea, 0x02eb,
-	0x3105, 0x312d,
-	0x31a0, 0x31ba,
-}; /* CR_Bopomofo */
-
-/* 'Han': Script */
-static const OnigCodePoint CR_Han[] = {
-	15,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x3005, 0x3005,
-	0x3007, 0x3007,
-	0x3021, 0x3029,
-	0x3038, 0x303b,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcc,
-	0xf900, 0xfa6d,
-	0xfa70, 0xfad9,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_Han */
-
-/* 'Yi': Script */
-static const OnigCodePoint CR_Yi[] = {
-	2,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-}; /* CR_Yi */
-
-/* 'Old_Italic': Script */
-static const OnigCodePoint CR_Old_Italic[] = {
-	2,
-	0x10300, 0x1031e,
-	0x10320, 0x10323,
-}; /* CR_Old_Italic */
-
-/* 'Gothic': Script */
-static const OnigCodePoint CR_Gothic[] = {
-	1,
-	0x10330, 0x1034a,
-}; /* CR_Gothic */
-
-/* 'Deseret': Script */
-static const OnigCodePoint CR_Deseret[] = {
-	1,
-	0x10400, 0x1044f,
-}; /* CR_Deseret */
-
-/* 'Inherited': Script */
-static const OnigCodePoint CR_Inherited[] = {
-	25,
-	0x0300, 0x036f,
-	0x0485, 0x0486,
-	0x064b, 0x0655,
-	0x065f, 0x065f,
-	0x0670, 0x0670,
-	0x0951, 0x0952,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce0,
-	0x1ce2, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1cf4, 0x1cf4,
-	0x1dc0, 0x1de6,
-	0x1dfc, 0x1dff,
-	0x200c, 0x200d,
-	0x20d0, 0x20f0,
-	0x302a, 0x302d,
-	0x3099, 0x309a,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe26,
-	0x101fd, 0x101fd,
-	0x1d167, 0x1d169,
-	0x1d17b, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-	0xe0100, 0xe01ef,
-}; /* CR_Inherited */
-
-/* 'Tagalog': Script */
-static const OnigCodePoint CR_Tagalog[] = {
-	2,
-	0x1700, 0x170c,
-	0x170e, 0x1714,
-}; /* CR_Tagalog */
-
-/* 'Hanunoo': Script */
-static const OnigCodePoint CR_Hanunoo[] = {
-	1,
-	0x1720, 0x1734,
-}; /* CR_Hanunoo */
-
-/* 'Buhid': Script */
-static const OnigCodePoint CR_Buhid[] = {
-	1,
-	0x1740, 0x1753,
-}; /* CR_Buhid */
-
-/* 'Tagbanwa': Script */
-static const OnigCodePoint CR_Tagbanwa[] = {
-	3,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-}; /* CR_Tagbanwa */
-
-/* 'Limbu': Script */
-static const OnigCodePoint CR_Limbu[] = {
-	5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x194f,
-}; /* CR_Limbu */
-
-/* 'Tai_Le': Script */
-static const OnigCodePoint CR_Tai_Le[] = {
-	2,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-}; /* CR_Tai_Le */
-
-/* '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 */
-
-/* 'Ugaritic': Script */
-static const OnigCodePoint CR_Ugaritic[] = {
-	2,
-	0x10380, 0x1039d,
-	0x1039f, 0x1039f,
-}; /* CR_Ugaritic */
-
-/* 'Shavian': Script */
-static const OnigCodePoint CR_Shavian[] = {
-	1,
-	0x10450, 0x1047f,
-}; /* CR_Shavian */
-
-/* 'Osmanya': Script */
-static const OnigCodePoint CR_Osmanya[] = {
-	2,
-	0x10480, 0x1049d,
-	0x104a0, 0x104a9,
-}; /* CR_Osmanya */
-
-/* 'Cypriot': Script */
-static const OnigCodePoint CR_Cypriot[] = {
-	6,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x1083f,
-}; /* CR_Cypriot */
-
-/* '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 */
-
-/* 'Coptic': Script */
-static const OnigCodePoint CR_Coptic[] = {
-	3,
-	0x03e2, 0x03ef,
-	0x2c80, 0x2cf3,
-	0x2cf9, 0x2cff,
-}; /* CR_Coptic */
-
-/* 'New_Tai_Lue': Script */
-static const OnigCodePoint CR_New_Tai_Lue[] = {
-	4,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x19df,
-}; /* CR_New_Tai_Lue */
-
-/* 'Glagolitic': Script */
-static const OnigCodePoint CR_Glagolitic[] = {
-	2,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-}; /* CR_Glagolitic */
-
-/* 'Tifinagh': Script */
-static const OnigCodePoint CR_Tifinagh[] = {
-	3,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d70,
-	0x2d7f, 0x2d7f,
-}; /* CR_Tifinagh */
-
-/* 'Syloti_Nagri': Script */
-static const OnigCodePoint CR_Syloti_Nagri[] = {
-	1,
-	0xa800, 0xa82b,
-}; /* CR_Syloti_Nagri */
-
-/* 'Old_Persian': Script */
-static const OnigCodePoint CR_Old_Persian[] = {
-	2,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103d5,
-}; /* CR_Old_Persian */
-
-/* '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 */
-
-/* 'Balinese': Script */
-static const OnigCodePoint CR_Balinese[] = {
-	2,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-}; /* CR_Balinese */
-
-/* 'Cuneiform': Script */
-static const OnigCodePoint CR_Cuneiform[] = {
-	3,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-}; /* CR_Cuneiform */
-
-/* 'Phoenician': Script */
-static const OnigCodePoint CR_Phoenician[] = {
-	2,
-	0x10900, 0x1091b,
-	0x1091f, 0x1091f,
-}; /* CR_Phoenician */
-
-/* 'Phags_Pa': Script */
-static const OnigCodePoint CR_Phags_Pa[] = {
-	1,
-	0xa840, 0xa877,
-}; /* CR_Phags_Pa */
-
-/* 'Nko': Script */
-static const OnigCodePoint CR_Nko[] = {
-	1,
-	0x07c0, 0x07fa,
-}; /* CR_Nko */
-
-/* 'Sundanese': Script */
-static const OnigCodePoint CR_Sundanese[] = {
-	2,
-	0x1b80, 0x1bbf,
-	0x1cc0, 0x1cc7,
-}; /* CR_Sundanese */
-
-/* 'Lepcha': Script */
-static const OnigCodePoint CR_Lepcha[] = {
-	3,
-	0x1c00, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c4f,
-}; /* CR_Lepcha */
-
-/* 'Ol_Chiki': Script */
-static const OnigCodePoint CR_Ol_Chiki[] = {
-	1,
-	0x1c50, 0x1c7f,
-}; /* CR_Ol_Chiki */
-
-/* 'Vai': Script */
-static const OnigCodePoint CR_Vai[] = {
-	1,
-	0xa500, 0xa62b,
-}; /* CR_Vai */
-
-/* 'Saurashtra': Script */
-static const OnigCodePoint CR_Saurashtra[] = {
-	2,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-}; /* CR_Saurashtra */
-
-/* 'Kayah_Li': Script */
-static const OnigCodePoint CR_Kayah_Li[] = {
-	1,
-	0xa900, 0xa92f,
-}; /* CR_Kayah_Li */
-
-/* 'Rejang': Script */
-static const OnigCodePoint CR_Rejang[] = {
-	2,
-	0xa930, 0xa953,
-	0xa95f, 0xa95f,
-}; /* CR_Rejang */
-
-/* 'Lycian': Script */
-static const OnigCodePoint CR_Lycian[] = {
-	1,
-	0x10280, 0x1029c,
-}; /* CR_Lycian */
-
-/* 'Carian': Script */
-static const OnigCodePoint CR_Carian[] = {
-	1,
-	0x102a0, 0x102d0,
-}; /* CR_Carian */
-
-/* 'Lydian': Script */
-static const OnigCodePoint CR_Lydian[] = {
-	2,
-	0x10920, 0x10939,
-	0x1093f, 0x1093f,
-}; /* CR_Lydian */
-
-/* 'Cham': Script */
-static const OnigCodePoint CR_Cham[] = {
-	4,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa5f,
-}; /* CR_Cham */
-
-/* 'Tai_Tham': Script */
-static const OnigCodePoint CR_Tai_Tham[] = {
-	5,
-	0x1a20, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-}; /* CR_Tai_Tham */
-
-/* 'Tai_Viet': Script */
-static const OnigCodePoint CR_Tai_Viet[] = {
-	2,
-	0xaa80, 0xaac2,
-	0xaadb, 0xaadf,
-}; /* CR_Tai_Viet */
-
-/* 'Avestan': Script */
-static const OnigCodePoint CR_Avestan[] = {
-	2,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b3f,
-}; /* CR_Avestan */
-
-/* 'Egyptian_Hieroglyphs': Script */
-static const OnigCodePoint CR_Egyptian_Hieroglyphs[] = {
-	1,
-	0x13000, 0x1342e,
-}; /* CR_Egyptian_Hieroglyphs */
-
-/* 'Samaritan': Script */
-static const OnigCodePoint CR_Samaritan[] = {
-	2,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-}; /* CR_Samaritan */
-
-/* 'Lisu': Script */
-static const OnigCodePoint CR_Lisu[] = {
-	1,
-	0xa4d0, 0xa4ff,
-}; /* CR_Lisu */
-
-/* 'Bamum': Script */
-static const OnigCodePoint CR_Bamum[] = {
-	2,
-	0xa6a0, 0xa6f7,
-	0x16800, 0x16a38,
-}; /* CR_Bamum */
-
-/* 'Javanese': Script */
-static const OnigCodePoint CR_Javanese[] = {
-	3,
-	0xa980, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9df,
-}; /* CR_Javanese */
-
-/* 'Meetei_Mayek': Script */
-static const OnigCodePoint CR_Meetei_Mayek[] = {
-	3,
-	0xaae0, 0xaaf6,
-	0xabc0, 0xabed,
-	0xabf0, 0xabf9,
-}; /* CR_Meetei_Mayek */
-
-/* 'Imperial_Aramaic': Script */
-static const OnigCodePoint CR_Imperial_Aramaic[] = {
-	2,
-	0x10840, 0x10855,
-	0x10857, 0x1085f,
-}; /* CR_Imperial_Aramaic */
-
-/* 'Old_South_Arabian': Script */
-static const OnigCodePoint CR_Old_South_Arabian[] = {
-	1,
-	0x10a60, 0x10a7f,
-}; /* CR_Old_South_Arabian */
-
-/* 'Inscriptional_Parthian': Script */
-static const OnigCodePoint CR_Inscriptional_Parthian[] = {
-	2,
-	0x10b40, 0x10b55,
-	0x10b58, 0x10b5f,
-}; /* CR_Inscriptional_Parthian */
-
-/* 'Inscriptional_Pahlavi': Script */
-static const OnigCodePoint CR_Inscriptional_Pahlavi[] = {
-	2,
-	0x10b60, 0x10b72,
-	0x10b78, 0x10b7f,
-}; /* CR_Inscriptional_Pahlavi */
-
-/* 'Old_Turkic': Script */
-static const OnigCodePoint CR_Old_Turkic[] = {
-	1,
-	0x10c00, 0x10c48,
-}; /* CR_Old_Turkic */
-
-/* 'Kaithi': Script */
-static const OnigCodePoint CR_Kaithi[] = {
-	1,
-	0x11080, 0x110c1,
-}; /* CR_Kaithi */
-
-/* 'Batak': Script */
-static const OnigCodePoint CR_Batak[] = {
-	2,
-	0x1bc0, 0x1bf3,
-	0x1bfc, 0x1bff,
-}; /* CR_Batak */
-
-/* 'Brahmi': Script */
-static const OnigCodePoint CR_Brahmi[] = {
-	2,
-	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-}; /* CR_Brahmi */
-
-/* 'Mandaic': Script */
-static const OnigCodePoint CR_Mandaic[] = {
-	2,
-	0x0840, 0x085b,
-	0x085e, 0x085e,
-}; /* CR_Mandaic */
-
-/* 'Chakma': Script */
-static const OnigCodePoint CR_Chakma[] = {
-	2,
-	0x11100, 0x11134,
-	0x11136, 0x11143,
-}; /* CR_Chakma */
-
-/* 'Meroitic_Cursive': Script */
-static const OnigCodePoint CR_Meroitic_Cursive[] = {
-	2,
-	0x109a0, 0x109b7,
-	0x109be, 0x109bf,
-}; /* CR_Meroitic_Cursive */
-
-/* 'Meroitic_Hieroglyphs': Script */
-static const OnigCodePoint CR_Meroitic_Hieroglyphs[] = {
-	1,
-	0x10980, 0x1099f,
-}; /* CR_Meroitic_Hieroglyphs */
-
-/* 'Miao': Script */
-static const OnigCodePoint CR_Miao[] = {
-	3,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-}; /* CR_Miao */
-
-/* 'Sharada': Script */
-static const OnigCodePoint CR_Sharada[] = {
-	2,
-	0x11180, 0x111c8,
-	0x111d0, 0x111d9,
-}; /* CR_Sharada */
-
-/* 'Sora_Sompeng': Script */
-static const OnigCodePoint CR_Sora_Sompeng[] = {
-	2,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-}; /* CR_Sora_Sompeng */
-
-/* 'Takri': Script */
-static const OnigCodePoint CR_Takri[] = {
-	2,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-}; /* CR_Takri */
-
-/* 'White_Space': Binary Property */
-#define CR_White_Space CR_Space
-
-/* 'Bidi_Control': Binary Property */
-static const OnigCodePoint CR_Bidi_Control[] = {
-	2,
-	0x200e, 0x200f,
-	0x202a, 0x202e,
-}; /* CR_Bidi_Control */
-
-/* 'Join_Control': Binary Property */
-static const OnigCodePoint CR_Join_Control[] = {
-	1,
-	0x200c, 0x200d,
-}; /* CR_Join_Control */
-
-/* 'Dash': Binary Property */
-static const OnigCodePoint CR_Dash[] = {
-	20,
-	0x002d, 0x002d,
-	0x058a, 0x058a,
-	0x05be, 0x05be,
-	0x1400, 0x1400,
-	0x1806, 0x1806,
-	0x2010, 0x2015,
-	0x2053, 0x2053,
-	0x207b, 0x207b,
-	0x208b, 0x208b,
-	0x2212, 0x2212,
-	0x2e17, 0x2e17,
-	0x2e1a, 0x2e1a,
-	0x2e3a, 0x2e3b,
-	0x301c, 0x301c,
-	0x3030, 0x3030,
-	0x30a0, 0x30a0,
-	0xfe31, 0xfe32,
-	0xfe58, 0xfe58,
-	0xfe63, 0xfe63,
-	0xff0d, 0xff0d,
-}; /* CR_Dash */
-
-/* 'Hyphen': Binary Property */
-static const OnigCodePoint CR_Hyphen[] = {
-	10,
-	0x002d, 0x002d,
-	0x00ad, 0x00ad,
-	0x058a, 0x058a,
-	0x1806, 0x1806,
-	0x2010, 0x2011,
-	0x2e17, 0x2e17,
-	0x30fb, 0x30fb,
-	0xfe63, 0xfe63,
-	0xff0d, 0xff0d,
-	0xff65, 0xff65,
-}; /* CR_Hyphen */
-
-/* 'Quotation_Mark': Binary Property */
-static const OnigCodePoint CR_Quotation_Mark[] = {
-	12,
-	0x0022, 0x0022,
-	0x0027, 0x0027,
-	0x00ab, 0x00ab,
-	0x00bb, 0x00bb,
-	0x2018, 0x201f,
-	0x2039, 0x203a,
-	0x300c, 0x300f,
-	0x301d, 0x301f,
-	0xfe41, 0xfe44,
-	0xff02, 0xff02,
-	0xff07, 0xff07,
-	0xff62, 0xff63,
-}; /* CR_Quotation_Mark */
-
-/* 'Terminal_Punctuation': Binary Property */
-static const OnigCodePoint CR_Terminal_Punctuation[] = {
-	70,
-	0x0021, 0x0021,
-	0x002c, 0x002c,
-	0x002e, 0x002e,
-	0x003a, 0x003b,
-	0x003f, 0x003f,
-	0x037e, 0x037e,
-	0x0387, 0x0387,
-	0x0589, 0x0589,
-	0x05c3, 0x05c3,
-	0x060c, 0x060c,
-	0x061b, 0x061b,
-	0x061f, 0x061f,
-	0x06d4, 0x06d4,
-	0x0700, 0x070a,
-	0x070c, 0x070c,
-	0x07f8, 0x07f9,
-	0x0830, 0x083e,
-	0x085e, 0x085e,
-	0x0964, 0x0965,
-	0x0e5a, 0x0e5b,
-	0x0f08, 0x0f08,
-	0x0f0d, 0x0f12,
-	0x104a, 0x104b,
-	0x1361, 0x1368,
-	0x166d, 0x166e,
-	0x16eb, 0x16ed,
-	0x17d4, 0x17d6,
-	0x17da, 0x17da,
-	0x1802, 0x1805,
-	0x1808, 0x1809,
-	0x1944, 0x1945,
-	0x1aa8, 0x1aab,
-	0x1b5a, 0x1b5b,
-	0x1b5d, 0x1b5f,
-	0x1c3b, 0x1c3f,
-	0x1c7e, 0x1c7f,
-	0x203c, 0x203d,
-	0x2047, 0x2049,
-	0x2e2e, 0x2e2e,
-	0x3001, 0x3002,
-	0xa4fe, 0xa4ff,
-	0xa60d, 0xa60f,
-	0xa6f3, 0xa6f7,
-	0xa876, 0xa877,
-	0xa8ce, 0xa8cf,
-	0xa92f, 0xa92f,
-	0xa9c7, 0xa9c9,
-	0xaa5d, 0xaa5f,
-	0xaadf, 0xaadf,
-	0xaaf0, 0xaaf1,
-	0xabeb, 0xabeb,
-	0xfe50, 0xfe52,
-	0xfe54, 0xfe57,
-	0xff01, 0xff01,
-	0xff0c, 0xff0c,
-	0xff0e, 0xff0e,
-	0xff1a, 0xff1b,
-	0xff1f, 0xff1f,
-	0xff61, 0xff61,
-	0xff64, 0xff64,
-	0x1039f, 0x1039f,
-	0x103d0, 0x103d0,
-	0x10857, 0x10857,
-	0x1091f, 0x1091f,
-	0x10b3a, 0x10b3f,
-	0x11047, 0x1104d,
-	0x110be, 0x110c1,
-	0x11141, 0x11143,
-	0x111c5, 0x111c6,
-	0x12470, 0x12473,
-}; /* CR_Terminal_Punctuation */
-
-/* 'Other_Math': Binary Property */
-static const OnigCodePoint CR_Other_Math[] = {
-	133,
-	0x005e, 0x005e,
-	0x03d0, 0x03d2,
-	0x03d5, 0x03d5,
-	0x03f0, 0x03f1,
-	0x03f4, 0x03f5,
-	0x2016, 0x2016,
-	0x2032, 0x2034,
-	0x2040, 0x2040,
-	0x2061, 0x2064,
-	0x207d, 0x207e,
-	0x208d, 0x208e,
-	0x20d0, 0x20dc,
-	0x20e1, 0x20e1,
-	0x20e5, 0x20e6,
-	0x20eb, 0x20ef,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2119, 0x211d,
-	0x2124, 0x2124,
-	0x2128, 0x2129,
-	0x212c, 0x212d,
-	0x212f, 0x2131,
-	0x2133, 0x2138,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x2195, 0x2199,
-	0x219c, 0x219f,
-	0x21a1, 0x21a2,
-	0x21a4, 0x21a5,
-	0x21a7, 0x21a7,
-	0x21a9, 0x21ad,
-	0x21b0, 0x21b1,
-	0x21b6, 0x21b7,
-	0x21bc, 0x21cd,
-	0x21d0, 0x21d1,
-	0x21d3, 0x21d3,
-	0x21d5, 0x21db,
-	0x21dd, 0x21dd,
-	0x21e4, 0x21e5,
-	0x23b4, 0x23b5,
-	0x23b7, 0x23b7,
-	0x23d0, 0x23d0,
-	0x23e2, 0x23e2,
-	0x25a0, 0x25a1,
-	0x25ae, 0x25b6,
-	0x25bc, 0x25c0,
-	0x25c6, 0x25c7,
-	0x25ca, 0x25cb,
-	0x25cf, 0x25d3,
-	0x25e2, 0x25e2,
-	0x25e4, 0x25e4,
-	0x25e7, 0x25ec,
-	0x2605, 0x2606,
-	0x2640, 0x2640,
-	0x2642, 0x2642,
-	0x2660, 0x2663,
-	0x266d, 0x266e,
-	0x27c5, 0x27c6,
-	0x27e6, 0x27ef,
-	0x2983, 0x2998,
-	0x29d8, 0x29db,
-	0x29fc, 0x29fd,
-	0xfe61, 0xfe61,
-	0xfe63, 0xfe63,
-	0xfe68, 0xfe68,
-	0xff3c, 0xff3c,
-	0xff3e, 0xff3e,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-}; /* CR_Other_Math */
-
-/* 'Hex_Digit': Binary Property */
-static const OnigCodePoint CR_Hex_Digit[] = {
-	6,
-	0x0030, 0x0039,
-	0x0041, 0x0046,
-	0x0061, 0x0066,
-	0xff10, 0xff19,
-	0xff21, 0xff26,
-	0xff41, 0xff46,
-}; /* CR_Hex_Digit */
-
-/* 'ASCII_Hex_Digit': Binary Property */
-#define CR_ASCII_Hex_Digit CR_XDigit
-
-/* 'Other_Alphabetic': Binary Property */
-static const OnigCodePoint CR_Other_Alphabetic[] = {
-	158,
-	0x0345, 0x0345,
-	0x05b0, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x0610, 0x061a,
-	0x064b, 0x0657,
-	0x0659, 0x065f,
-	0x0670, 0x0670,
-	0x06d6, 0x06dc,
-	0x06e1, 0x06e4,
-	0x06e7, 0x06e8,
-	0x06ed, 0x06ed,
-	0x0711, 0x0711,
-	0x0730, 0x073f,
-	0x07a6, 0x07b0,
-	0x0816, 0x0817,
-	0x081b, 0x0823,
-	0x0825, 0x0827,
-	0x0829, 0x082c,
-	0x08e4, 0x08e9,
-	0x08f0, 0x08fe,
-	0x0900, 0x0903,
-	0x093a, 0x093b,
-	0x093e, 0x094c,
-	0x094e, 0x094f,
-	0x0955, 0x0957,
-	0x0962, 0x0963,
-	0x0981, 0x0983,
-	0x09be, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cc,
-	0x09d7, 0x09d7,
-	0x09e2, 0x09e3,
-	0x0a01, 0x0a03,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4c,
-	0x0a51, 0x0a51,
-	0x0a70, 0x0a71,
-	0x0a75, 0x0a75,
-	0x0a81, 0x0a83,
-	0x0abe, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acc,
-	0x0ae2, 0x0ae3,
-	0x0b01, 0x0b03,
-	0x0b3e, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4c,
-	0x0b56, 0x0b57,
-	0x0b62, 0x0b63,
-	0x0b82, 0x0b82,
-	0x0bbe, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcc,
-	0x0bd7, 0x0bd7,
-	0x0c01, 0x0c03,
-	0x0c3e, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4c,
-	0x0c55, 0x0c56,
-	0x0c62, 0x0c63,
-	0x0c82, 0x0c83,
-	0x0cbe, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccc,
-	0x0cd5, 0x0cd6,
-	0x0ce2, 0x0ce3,
-	0x0d02, 0x0d03,
-	0x0d3e, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4c,
-	0x0d57, 0x0d57,
-	0x0d62, 0x0d63,
-	0x0d82, 0x0d83,
-	0x0dcf, 0x0dd4,
-	0x0dd6, 0x0dd6,
-	0x0dd8, 0x0ddf,
-	0x0df2, 0x0df3,
-	0x0e31, 0x0e31,
-	0x0e34, 0x0e3a,
-	0x0e4d, 0x0e4d,
-	0x0eb1, 0x0eb1,
-	0x0eb4, 0x0eb9,
-	0x0ebb, 0x0ebc,
-	0x0ecd, 0x0ecd,
-	0x0f71, 0x0f81,
-	0x0f8d, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x102b, 0x1036,
-	0x1038, 0x1038,
-	0x103b, 0x103e,
-	0x1056, 0x1059,
-	0x105e, 0x1060,
-	0x1062, 0x1062,
-	0x1067, 0x1068,
-	0x1071, 0x1074,
-	0x1082, 0x1086,
-	0x109c, 0x109d,
-	0x135f, 0x135f,
-	0x1712, 0x1713,
-	0x1732, 0x1733,
-	0x1752, 0x1753,
-	0x1772, 0x1773,
-	0x17b6, 0x17c8,
-	0x18a9, 0x18a9,
-	0x1920, 0x192b,
-	0x1930, 0x1938,
-	0x19b0, 0x19c0,
-	0x19c8, 0x19c9,
-	0x1a17, 0x1a1b,
-	0x1a55, 0x1a5e,
-	0x1a61, 0x1a74,
-	0x1b00, 0x1b04,
-	0x1b35, 0x1b43,
-	0x1b80, 0x1b82,
-	0x1ba1, 0x1ba9,
-	0x1bac, 0x1bad,
-	0x1be7, 0x1bf1,
-	0x1c24, 0x1c35,
-	0x1cf2, 0x1cf3,
-	0x24b6, 0x24e9,
-	0x2de0, 0x2dff,
-	0xa674, 0xa67b,
-	0xa69f, 0xa69f,
-	0xa823, 0xa827,
-	0xa880, 0xa881,
-	0xa8b4, 0xa8c3,
-	0xa926, 0xa92a,
-	0xa947, 0xa952,
-	0xa980, 0xa983,
-	0xa9b4, 0xa9bf,
-	0xaa29, 0xaa36,
-	0xaa43, 0xaa43,
-	0xaa4c, 0xaa4d,
-	0xaab0, 0xaab0,
-	0xaab2, 0xaab4,
-	0xaab7, 0xaab8,
-	0xaabe, 0xaabe,
-	0xaaeb, 0xaaef,
-	0xaaf5, 0xaaf5,
-	0xabe3, 0xabea,
-	0xfb1e, 0xfb1e,
-	0x10a01, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a0f,
-	0x11000, 0x11002,
-	0x11038, 0x11045,
-	0x11082, 0x11082,
-	0x110b0, 0x110b8,
-	0x11100, 0x11102,
-	0x11127, 0x11132,
-	0x11180, 0x11182,
-	0x111b3, 0x111bf,
-	0x116ab, 0x116b5,
-	0x16f51, 0x16f7e,
-}; /* CR_Other_Alphabetic */
-
-/* 'Ideographic': Binary Property */
-static const OnigCodePoint CR_Ideographic[] = {
-	11,
-	0x3006, 0x3007,
-	0x3021, 0x3029,
-	0x3038, 0x303a,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcc,
-	0xf900, 0xfa6d,
-	0xfa70, 0xfad9,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_Ideographic */
-
-/* 'Diacritic': Binary Property */
-static const OnigCodePoint CR_Diacritic[] = {
-	125,
-	0x005e, 0x005e,
-	0x0060, 0x0060,
-	0x00a8, 0x00a8,
-	0x00af, 0x00af,
-	0x00b4, 0x00b4,
-	0x00b7, 0x00b8,
-	0x02b0, 0x034e,
-	0x0350, 0x0357,
-	0x035d, 0x0362,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x0384, 0x0385,
-	0x0483, 0x0487,
-	0x0559, 0x0559,
-	0x0591, 0x05a1,
-	0x05a3, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c4,
-	0x064b, 0x0652,
-	0x0657, 0x0658,
-	0x06df, 0x06e0,
-	0x06e5, 0x06e6,
-	0x06ea, 0x06ec,
-	0x0730, 0x074a,
-	0x07a6, 0x07b0,
-	0x07eb, 0x07f5,
-	0x0818, 0x0819,
-	0x08e4, 0x08fe,
-	0x093c, 0x093c,
-	0x094d, 0x094d,
-	0x0951, 0x0954,
-	0x0971, 0x0971,
-	0x09bc, 0x09bc,
-	0x09cd, 0x09cd,
-	0x0a3c, 0x0a3c,
-	0x0a4d, 0x0a4d,
-	0x0abc, 0x0abc,
-	0x0acd, 0x0acd,
-	0x0b3c, 0x0b3c,
-	0x0b4d, 0x0b4d,
-	0x0bcd, 0x0bcd,
-	0x0c4d, 0x0c4d,
-	0x0cbc, 0x0cbc,
-	0x0ccd, 0x0ccd,
-	0x0d4d, 0x0d4d,
-	0x0dca, 0x0dca,
-	0x0e47, 0x0e4c,
-	0x0e4e, 0x0e4e,
-	0x0ec8, 0x0ecc,
-	0x0f18, 0x0f19,
-	0x0f35, 0x0f35,
-	0x0f37, 0x0f37,
-	0x0f39, 0x0f39,
-	0x0f3e, 0x0f3f,
-	0x0f82, 0x0f84,
-	0x0f86, 0x0f87,
-	0x0fc6, 0x0fc6,
-	0x1037, 0x1037,
-	0x1039, 0x103a,
-	0x1087, 0x108d,
-	0x108f, 0x108f,
-	0x109a, 0x109b,
-	0x17c9, 0x17d3,
-	0x17dd, 0x17dd,
-	0x1939, 0x193b,
-	0x1a75, 0x1a7c,
-	0x1a7f, 0x1a7f,
-	0x1b34, 0x1b34,
-	0x1b44, 0x1b44,
-	0x1b6b, 0x1b73,
-	0x1baa, 0x1bab,
-	0x1c36, 0x1c37,
-	0x1c78, 0x1c7d,
-	0x1cd0, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1cf4, 0x1cf4,
-	0x1d2c, 0x1d6a,
-	0x1dc4, 0x1dcf,
-	0x1dfd, 0x1dff,
-	0x1fbd, 0x1fbd,
-	0x1fbf, 0x1fc1,
-	0x1fcd, 0x1fcf,
-	0x1fdd, 0x1fdf,
-	0x1fed, 0x1fef,
-	0x1ffd, 0x1ffe,
-	0x2cef, 0x2cf1,
-	0x2e2f, 0x2e2f,
-	0x302a, 0x302f,
-	0x3099, 0x309c,
-	0x30fc, 0x30fc,
-	0xa66f, 0xa66f,
-	0xa67c, 0xa67d,
-	0xa67f, 0xa67f,
-	0xa6f0, 0xa6f1,
-	0xa717, 0xa721,
-	0xa788, 0xa788,
-	0xa7f8, 0xa7f9,
-	0xa8c4, 0xa8c4,
-	0xa8e0, 0xa8f1,
-	0xa92b, 0xa92e,
-	0xa953, 0xa953,
-	0xa9b3, 0xa9b3,
-	0xa9c0, 0xa9c0,
-	0xaa7b, 0xaa7b,
-	0xaabf, 0xaac2,
-	0xaaf6, 0xaaf6,
-	0xabec, 0xabed,
-	0xfb1e, 0xfb1e,
-	0xfe20, 0xfe26,
-	0xff3e, 0xff3e,
-	0xff40, 0xff40,
-	0xff70, 0xff70,
-	0xff9e, 0xff9f,
-	0xffe3, 0xffe3,
-	0x110b9, 0x110ba,
-	0x11133, 0x11134,
-	0x111c0, 0x111c0,
-	0x116b6, 0x116b7,
-	0x16f8f, 0x16f9f,
-	0x1d167, 0x1d169,
-	0x1d16d, 0x1d172,
-	0x1d17b, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-}; /* CR_Diacritic */
-
-/* 'Extender': Binary Property */
-static const OnigCodePoint CR_Extender[] = {
-	22,
-	0x00b7, 0x00b7,
-	0x02d0, 0x02d1,
-	0x0640, 0x0640,
-	0x07fa, 0x07fa,
-	0x0e46, 0x0e46,
-	0x0ec6, 0x0ec6,
-	0x180a, 0x180a,
-	0x1843, 0x1843,
-	0x1aa7, 0x1aa7,
-	0x1c36, 0x1c36,
-	0x1c7b, 0x1c7b,
-	0x3005, 0x3005,
-	0x3031, 0x3035,
-	0x309d, 0x309e,
-	0x30fc, 0x30fe,
-	0xa015, 0xa015,
-	0xa60c, 0xa60c,
-	0xa9cf, 0xa9cf,
-	0xaa70, 0xaa70,
-	0xaadd, 0xaadd,
-	0xaaf3, 0xaaf4,
-	0xff70, 0xff70,
-}; /* CR_Extender */
-
-/* 'Other_Lowercase': Binary Property */
-static const OnigCodePoint CR_Other_Lowercase[] = {
-	18,
-	0x00aa, 0x00aa,
-	0x00ba, 0x00ba,
-	0x02b0, 0x02b8,
-	0x02c0, 0x02c1,
-	0x02e0, 0x02e4,
-	0x0345, 0x0345,
-	0x037a, 0x037a,
-	0x1d2c, 0x1d6a,
-	0x1d78, 0x1d78,
-	0x1d9b, 0x1dbf,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 0x209c,
-	0x2170, 0x217f,
-	0x24d0, 0x24e9,
-	0x2c7c, 0x2c7d,
-	0xa770, 0xa770,
-	0xa7f8, 0xa7f9,
-}; /* CR_Other_Lowercase */
-
-/* 'Other_Uppercase': Binary Property */
-static const OnigCodePoint CR_Other_Uppercase[] = {
-	2,
-	0x2160, 0x216f,
-	0x24b6, 0x24cf,
-}; /* CR_Other_Uppercase */
-
-/* 'Noncharacter_Code_Point': Binary Property */
-static const OnigCodePoint CR_Noncharacter_Code_Point[] = {
-	18,
-	0xfdd0, 0xfdef,
-	0xfffe, 0xffff,
-	0x1fffe, 0x1ffff,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xefffe, 0xeffff,
-	0xffffe, 0xfffff,
-	0x10fffe, 0x10ffff,
-}; /* CR_Noncharacter_Code_Point */
-
-/* 'Other_Grapheme_Extend': Binary Property */
-static const OnigCodePoint CR_Other_Grapheme_Extend[] = {
-	17,
-	0x09be, 0x09be,
-	0x09d7, 0x09d7,
-	0x0b3e, 0x0b3e,
-	0x0b57, 0x0b57,
-	0x0bbe, 0x0bbe,
-	0x0bd7, 0x0bd7,
-	0x0cc2, 0x0cc2,
-	0x0cd5, 0x0cd6,
-	0x0d3e, 0x0d3e,
-	0x0d57, 0x0d57,
-	0x0dcf, 0x0dcf,
-	0x0ddf, 0x0ddf,
-	0x200c, 0x200d,
-	0x302e, 0x302f,
-	0xff9e, 0xff9f,
-	0x1d165, 0x1d165,
-	0x1d16e, 0x1d172,
-}; /* CR_Other_Grapheme_Extend */
-
-/* 'IDS_Binary_Operator': Binary Property */
-static const OnigCodePoint CR_IDS_Binary_Operator[] = {
-	2,
-	0x2ff0, 0x2ff1,
-	0x2ff4, 0x2ffb,
-}; /* CR_IDS_Binary_Operator */
-
-/* 'IDS_Trinary_Operator': Binary Property */
-static const OnigCodePoint CR_IDS_Trinary_Operator[] = {
-	1,
-	0x2ff2, 0x2ff3,
-}; /* CR_IDS_Trinary_Operator */
-
-/* 'Radical': Binary Property */
-static const OnigCodePoint CR_Radical[] = {
-	3,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-}; /* CR_Radical */
-
-/* 'Unified_Ideograph': Binary Property */
-static const OnigCodePoint CR_Unified_Ideograph[] = {
-	12,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcc,
-	0xfa0e, 0xfa0f,
-	0xfa11, 0xfa11,
-	0xfa13, 0xfa14,
-	0xfa1f, 0xfa1f,
-	0xfa21, 0xfa21,
-	0xfa23, 0xfa24,
-	0xfa27, 0xfa29,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-}; /* CR_Unified_Ideograph */
-
-/* 'Other_Default_Ignorable_Code_Point': Binary Property */
-static const OnigCodePoint CR_Other_Default_Ignorable_Code_Point[] = {
-	11,
-	0x034f, 0x034f,
-	0x115f, 0x1160,
-	0x17b4, 0x17b5,
-	0x2065, 0x2069,
-	0x3164, 0x3164,
-	0xffa0, 0xffa0,
-	0xfff0, 0xfff8,
-	0xe0000, 0xe0000,
-	0xe0002, 0xe001f,
-	0xe0080, 0xe00ff,
-	0xe01f0, 0xe0fff,
-}; /* CR_Other_Default_Ignorable_Code_Point */
-
-/* 'Deprecated': Binary Property */
-static const OnigCodePoint CR_Deprecated[] = {
-	9,
-	0x0149, 0x0149,
-	0x0673, 0x0673,
-	0x0f77, 0x0f77,
-	0x0f79, 0x0f79,
-	0x17a3, 0x17a4,
-	0x206a, 0x206f,
-	0x2329, 0x232a,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-}; /* CR_Deprecated */
-
-/* 'Soft_Dotted': Binary Property */
-static const OnigCodePoint CR_Soft_Dotted[] = {
-	31,
-	0x0069, 0x006a,
-	0x012f, 0x012f,
-	0x0249, 0x0249,
-	0x0268, 0x0268,
-	0x029d, 0x029d,
-	0x02b2, 0x02b2,
-	0x03f3, 0x03f3,
-	0x0456, 0x0456,
-	0x0458, 0x0458,
-	0x1d62, 0x1d62,
-	0x1d96, 0x1d96,
-	0x1da4, 0x1da4,
-	0x1da8, 0x1da8,
-	0x1e2d, 0x1e2d,
-	0x1ecb, 0x1ecb,
-	0x2071, 0x2071,
-	0x2148, 0x2149,
-	0x2c7c, 0x2c7c,
-	0x1d422, 0x1d423,
-	0x1d456, 0x1d457,
-	0x1d48a, 0x1d48b,
-	0x1d4be, 0x1d4bf,
-	0x1d4f2, 0x1d4f3,
-	0x1d526, 0x1d527,
-	0x1d55a, 0x1d55b,
-	0x1d58e, 0x1d58f,
-	0x1d5c2, 0x1d5c3,
-	0x1d5f6, 0x1d5f7,
-	0x1d62a, 0x1d62b,
-	0x1d65e, 0x1d65f,
-	0x1d692, 0x1d693,
-}; /* CR_Soft_Dotted */
-
-/* 'Logical_Order_Exception': Binary Property */
-static const OnigCodePoint CR_Logical_Order_Exception[] = {
-	5,
-	0x0e40, 0x0e44,
-	0x0ec0, 0x0ec4,
-	0xaab5, 0xaab6,
-	0xaab9, 0xaab9,
-	0xaabb, 0xaabc,
-}; /* CR_Logical_Order_Exception */
-
-/* 'Other_ID_Start': Binary Property */
-static const OnigCodePoint CR_Other_ID_Start[] = {
-	3,
-	0x2118, 0x2118,
-	0x212e, 0x212e,
-	0x309b, 0x309c,
-}; /* CR_Other_ID_Start */
-
-/* 'Other_ID_Continue': Binary Property */
-static const OnigCodePoint CR_Other_ID_Continue[] = {
-	4,
-	0x00b7, 0x00b7,
-	0x0387, 0x0387,
-	0x1369, 0x1371,
-	0x19da, 0x19da,
-}; /* CR_Other_ID_Continue */
-
-/* 'STerm': Binary Property */
-static const OnigCodePoint CR_STerm[] = {
-	50,
-	0x0021, 0x0021,
-	0x002e, 0x002e,
-	0x003f, 0x003f,
-	0x055c, 0x055c,
-	0x055e, 0x055e,
-	0x0589, 0x0589,
-	0x061f, 0x061f,
-	0x06d4, 0x06d4,
-	0x0700, 0x0702,
-	0x07f9, 0x07f9,
-	0x0964, 0x0965,
-	0x104a, 0x104b,
-	0x1362, 0x1362,
-	0x1367, 0x1368,
-	0x166e, 0x166e,
-	0x1735, 0x1736,
-	0x1803, 0x1803,
-	0x1809, 0x1809,
-	0x1944, 0x1945,
-	0x1aa8, 0x1aab,
-	0x1b5a, 0x1b5b,
-	0x1b5e, 0x1b5f,
-	0x1c3b, 0x1c3c,
-	0x1c7e, 0x1c7f,
-	0x203c, 0x203d,
-	0x2047, 0x2049,
-	0x2e2e, 0x2e2e,
-	0x3002, 0x3002,
-	0xa4ff, 0xa4ff,
-	0xa60e, 0xa60f,
-	0xa6f3, 0xa6f3,
-	0xa6f7, 0xa6f7,
-	0xa876, 0xa877,
-	0xa8ce, 0xa8cf,
-	0xa92f, 0xa92f,
-	0xa9c8, 0xa9c9,
-	0xaa5d, 0xaa5f,
-	0xaaf0, 0xaaf1,
-	0xabeb, 0xabeb,
-	0xfe52, 0xfe52,
-	0xfe56, 0xfe57,
-	0xff01, 0xff01,
-	0xff0e, 0xff0e,
-	0xff1f, 0xff1f,
-	0xff61, 0xff61,
-	0x10a56, 0x10a57,
-	0x11047, 0x11048,
-	0x110be, 0x110c1,
-	0x11141, 0x11143,
-	0x111c5, 0x111c6,
-}; /* CR_STerm */
-
-/* 'Variation_Selector': Binary Property */
-static const OnigCodePoint CR_Variation_Selector[] = {
-	3,
-	0x180b, 0x180d,
-	0xfe00, 0xfe0f,
-	0xe0100, 0xe01ef,
-}; /* CR_Variation_Selector */
-
-/* 'Pattern_White_Space': Binary Property */
-static const OnigCodePoint CR_Pattern_White_Space[] = {
-	5,
-	0x0009, 0x000d,
-	0x0020, 0x0020,
-	0x0085, 0x0085,
-	0x200e, 0x200f,
-	0x2028, 0x2029,
-}; /* CR_Pattern_White_Space */
-
-/* 'Pattern_Syntax': Binary Property */
-static const OnigCodePoint CR_Pattern_Syntax[] = {
-	28,
-	0x0021, 0x002f,
-	0x003a, 0x0040,
-	0x005b, 0x005e,
-	0x0060, 0x0060,
-	0x007b, 0x007e,
-	0x00a1, 0x00a7,
-	0x00a9, 0x00a9,
-	0x00ab, 0x00ac,
-	0x00ae, 0x00ae,
-	0x00b0, 0x00b1,
-	0x00b6, 0x00b6,
-	0x00bb, 0x00bb,
-	0x00bf, 0x00bf,
-	0x00d7, 0x00d7,
-	0x00f7, 0x00f7,
-	0x2010, 0x2027,
-	0x2030, 0x203e,
-	0x2041, 0x2053,
-	0x2055, 0x205e,
-	0x2190, 0x245f,
-	0x2500, 0x2775,
-	0x2794, 0x2bff,
-	0x2e00, 0x2e7f,
-	0x3001, 0x3003,
-	0x3008, 0x3020,
-	0x3030, 0x3030,
-	0xfd3e, 0xfd3f,
-	0xfe45, 0xfe46,
-}; /* CR_Pattern_Syntax */
-
-/* 'Unknown': Script */
-static const OnigCodePoint CR_Unknown[] = {
-	537,
-	0x0378, 0x0379,
-	0x037f, 0x0383,
-	0x038b, 0x038b,
-	0x038d, 0x038d,
-	0x03a2, 0x03a2,
-	0x0528, 0x0530,
-	0x0557, 0x0558,
-	0x0560, 0x0560,
-	0x0588, 0x0588,
-	0x058b, 0x058e,
-	0x0590, 0x0590,
-	0x05c8, 0x05cf,
-	0x05eb, 0x05ef,
-	0x05f5, 0x05ff,
-	0x0605, 0x0605,
-	0x061c, 0x061d,
-	0x070e, 0x070e,
-	0x074b, 0x074c,
-	0x07b2, 0x07bf,
-	0x07fb, 0x07ff,
-	0x082e, 0x082f,
-	0x083f, 0x083f,
-	0x085c, 0x085d,
-	0x085f, 0x089f,
-	0x08a1, 0x08a1,
-	0x08ad, 0x08e3,
-	0x08ff, 0x08ff,
-	0x0978, 0x0978,
-	0x0980, 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,
-	0x09fc, 0x0a00,
-	0x0a04, 0x0a04,
-	0x0a0b, 0x0a0e,
-	0x0a11, 0x0a12,
-	0x0a29, 0x0a29,
-	0x0a31, 0x0a31,
-	0x0a34, 0x0a34,
-	0x0a37, 0x0a37,
-	0x0a3a, 0x0a3b,
-	0x0a3d, 0x0a3d,
-	0x0a43, 0x0a46,
-	0x0a49, 0x0a4a,
-	0x0a4e, 0x0a50,
-	0x0a52, 0x0a58,
-	0x0a5d, 0x0a5d,
-	0x0a5f, 0x0a65,
-	0x0a76, 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,
-	0x0af2, 0x0b00,
-	0x0b04, 0x0b04,
-	0x0b0d, 0x0b0e,
-	0x0b11, 0x0b12,
-	0x0b29, 0x0b29,
-	0x0b31, 0x0b31,
-	0x0b34, 0x0b34,
-	0x0b3a, 0x0b3b,
-	0x0b45, 0x0b46,
-	0x0b49, 0x0b4a,
-	0x0b4e, 0x0b55,
-	0x0b58, 0x0b5b,
-	0x0b5e, 0x0b5e,
-	0x0b64, 0x0b65,
-	0x0b78, 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, 0x0bcf,
-	0x0bd1, 0x0bd6,
-	0x0bd8, 0x0be5,
-	0x0bfb, 0x0c00,
-	0x0c04, 0x0c04,
-	0x0c0d, 0x0c0d,
-	0x0c11, 0x0c11,
-	0x0c29, 0x0c29,
-	0x0c34, 0x0c34,
-	0x0c3a, 0x0c3c,
-	0x0c45, 0x0c45,
-	0x0c49, 0x0c49,
-	0x0c4e, 0x0c54,
-	0x0c57, 0x0c57,
-	0x0c5a, 0x0c5f,
-	0x0c64, 0x0c65,
-	0x0c70, 0x0c77,
-	0x0c80, 0x0c81,
-	0x0c84, 0x0c84,
-	0x0c8d, 0x0c8d,
-	0x0c91, 0x0c91,
-	0x0ca9, 0x0ca9,
-	0x0cb4, 0x0cb4,
-	0x0cba, 0x0cbb,
-	0x0cc5, 0x0cc5,
-	0x0cc9, 0x0cc9,
-	0x0cce, 0x0cd4,
-	0x0cd7, 0x0cdd,
-	0x0cdf, 0x0cdf,
-	0x0ce4, 0x0ce5,
-	0x0cf0, 0x0cf0,
-	0x0cf3, 0x0d01,
-	0x0d04, 0x0d04,
-	0x0d0d, 0x0d0d,
-	0x0d11, 0x0d11,
-	0x0d3b, 0x0d3c,
-	0x0d45, 0x0d45,
-	0x0d49, 0x0d49,
-	0x0d4f, 0x0d56,
-	0x0d58, 0x0d5f,
-	0x0d64, 0x0d65,
-	0x0d76, 0x0d78,
-	0x0d80, 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,
-	0x0ee0, 0x0eff,
-	0x0f48, 0x0f48,
-	0x0f6d, 0x0f70,
-	0x0f98, 0x0f98,
-	0x0fbd, 0x0fbd,
-	0x0fcd, 0x0fcd,
-	0x0fdb, 0x0fff,
-	0x10c6, 0x10c6,
-	0x10c8, 0x10cc,
-	0x10ce, 0x10cf,
-	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, 0x135c,
-	0x137d, 0x137f,
-	0x139a, 0x139f,
-	0x13f5, 0x13ff,
-	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,
-	0x18ab, 0x18af,
-	0x18f6, 0x18ff,
-	0x191d, 0x191f,
-	0x192c, 0x192f,
-	0x193c, 0x193f,
-	0x1941, 0x1943,
-	0x196e, 0x196f,
-	0x1975, 0x197f,
-	0x19ac, 0x19af,
-	0x19ca, 0x19cf,
-	0x19db, 0x19dd,
-	0x1a1c, 0x1a1d,
-	0x1a5f, 0x1a5f,
-	0x1a7d, 0x1a7e,
-	0x1a8a, 0x1a8f,
-	0x1a9a, 0x1a9f,
-	0x1aae, 0x1aff,
-	0x1b4c, 0x1b4f,
-	0x1b7d, 0x1b7f,
-	0x1bf4, 0x1bfb,
-	0x1c38, 0x1c3a,
-	0x1c4a, 0x1c4c,
-	0x1c80, 0x1cbf,
-	0x1cc8, 0x1ccf,
-	0x1cf7, 0x1cff,
-	0x1de7, 0x1dfb,
-	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,
-	0x2065, 0x2069,
-	0x2072, 0x2073,
-	0x208f, 0x208f,
-	0x209d, 0x209f,
-	0x20ba, 0x20cf,
-	0x20f1, 0x20ff,
-	0x218a, 0x218f,
-	0x23f4, 0x23ff,
-	0x2427, 0x243f,
-	0x244b, 0x245f,
-	0x2700, 0x2700,
-	0x2b4d, 0x2b4f,
-	0x2b5a, 0x2bff,
-	0x2c2f, 0x2c2f,
-	0x2c5f, 0x2c5f,
-	0x2cf4, 0x2cf8,
-	0x2d26, 0x2d26,
-	0x2d28, 0x2d2c,
-	0x2d2e, 0x2d2f,
-	0x2d68, 0x2d6e,
-	0x2d71, 0x2d7e,
-	0x2d97, 0x2d9f,
-	0x2da7, 0x2da7,
-	0x2daf, 0x2daf,
-	0x2db7, 0x2db7,
-	0x2dbf, 0x2dbf,
-	0x2dc7, 0x2dc7,
-	0x2dcf, 0x2dcf,
-	0x2dd7, 0x2dd7,
-	0x2ddf, 0x2ddf,
-	0x2e3c, 0x2e7f,
-	0x2e9a, 0x2e9a,
-	0x2ef4, 0x2eff,
-	0x2fd6, 0x2fef,
-	0x2ffc, 0x2fff,
-	0x3040, 0x3040,
-	0x3097, 0x3098,
-	0x3100, 0x3104,
-	0x312e, 0x3130,
-	0x318f, 0x318f,
-	0x31bb, 0x31bf,
-	0x31e4, 0x31ef,
-	0x321f, 0x321f,
-	0x32ff, 0x32ff,
-	0x4db6, 0x4dbf,
-	0x9fcd, 0x9fff,
-	0xa48d, 0xa48f,
-	0xa4c7, 0xa4cf,
-	0xa62c, 0xa63f,
-	0xa698, 0xa69e,
-	0xa6f8, 0xa6ff,
-	0xa78f, 0xa78f,
-	0xa794, 0xa79f,
-	0xa7ab, 0xa7f7,
-	0xa82c, 0xa82f,
-	0xa83a, 0xa83f,
-	0xa878, 0xa87f,
-	0xa8c5, 0xa8cd,
-	0xa8da, 0xa8df,
-	0xa8fc, 0xa8ff,
-	0xa954, 0xa95e,
-	0xa97d, 0xa97f,
-	0xa9ce, 0xa9ce,
-	0xa9da, 0xa9dd,
-	0xa9e0, 0xa9ff,
-	0xaa37, 0xaa3f,
-	0xaa4e, 0xaa4f,
-	0xaa5a, 0xaa5b,
-	0xaa7c, 0xaa7f,
-	0xaac3, 0xaada,
-	0xaaf7, 0xab00,
-	0xab07, 0xab08,
-	0xab0f, 0xab10,
-	0xab17, 0xab1f,
-	0xab27, 0xab27,
-	0xab2f, 0xabbf,
-	0xabee, 0xabef,
-	0xabfa, 0xabff,
-	0xd7a4, 0xd7af,
-	0xd7c7, 0xd7ca,
-	0xd7fc, 0xf8ff,
-	0xfa6e, 0xfa6f,
-	0xfada, 0xfaff,
-	0xfb07, 0xfb12,
-	0xfb18, 0xfb1c,
-	0xfb37, 0xfb37,
-	0xfb3d, 0xfb3d,
-	0xfb3f, 0xfb3f,
-	0xfb42, 0xfb42,
-	0xfb45, 0xfb45,
-	0xfbc2, 0xfbd2,
-	0xfd40, 0xfd4f,
-	0xfd90, 0xfd91,
-	0xfdc8, 0xfdef,
-	0xfdfe, 0xfdff,
-	0xfe1a, 0xfe1f,
-	0xfe27, 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, 0x1018f,
-	0x1019c, 0x101cf,
-	0x101fe, 0x1027f,
-	0x1029d, 0x1029f,
-	0x102d1, 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,
-	0x10856, 0x10856,
-	0x10860, 0x108ff,
-	0x1091c, 0x1091e,
-	0x1093a, 0x1093e,
-	0x10940, 0x1097f,
-	0x109b8, 0x109bd,
-	0x109c0, 0x109ff,
-	0x10a04, 0x10a04,
-	0x10a07, 0x10a0b,
-	0x10a14, 0x10a14,
-	0x10a18, 0x10a18,
-	0x10a34, 0x10a37,
-	0x10a3b, 0x10a3e,
-	0x10a48, 0x10a4f,
-	0x10a59, 0x10a5f,
-	0x10a80, 0x10aff,
-	0x10b36, 0x10b38,
-	0x10b56, 0x10b57,
-	0x10b73, 0x10b77,
-	0x10b80, 0x10bff,
-	0x10c49, 0x10e5f,
-	0x10e7f, 0x10fff,
-	0x1104e, 0x11051,
-	0x11070, 0x1107f,
-	0x110c2, 0x110cf,
-	0x110e9, 0x110ef,
-	0x110fa, 0x110ff,
-	0x11135, 0x11135,
-	0x11144, 0x1117f,
-	0x111c9, 0x111cf,
-	0x111da, 0x1167f,
-	0x116b8, 0x116bf,
-	0x116ca, 0x11fff,
-	0x1236f, 0x123ff,
-	0x12463, 0x1246f,
-	0x12474, 0x12fff,
-	0x1342f, 0x167ff,
-	0x16a39, 0x16eff,
-	0x16f45, 0x16f4f,
-	0x16f7f, 0x16f8e,
-	0x16fa0, 0x1afff,
-	0x1b002, 0x1cfff,
-	0x1d0f6, 0x1d0ff,
-	0x1d127, 0x1d128,
-	0x1d1de, 0x1d1ff,
-	0x1d246, 0x1d2ff,
-	0x1d357, 0x1d35f,
-	0x1d372, 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,
-	0x1d7cc, 0x1d7cd,
-	0x1d800, 0x1edff,
-	0x1ee04, 0x1ee04,
-	0x1ee20, 0x1ee20,
-	0x1ee23, 0x1ee23,
-	0x1ee25, 0x1ee26,
-	0x1ee28, 0x1ee28,
-	0x1ee33, 0x1ee33,
-	0x1ee38, 0x1ee38,
-	0x1ee3a, 0x1ee3a,
-	0x1ee3c, 0x1ee41,
-	0x1ee43, 0x1ee46,
-	0x1ee48, 0x1ee48,
-	0x1ee4a, 0x1ee4a,
-	0x1ee4c, 0x1ee4c,
-	0x1ee50, 0x1ee50,
-	0x1ee53, 0x1ee53,
-	0x1ee55, 0x1ee56,
-	0x1ee58, 0x1ee58,
-	0x1ee5a, 0x1ee5a,
-	0x1ee5c, 0x1ee5c,
-	0x1ee5e, 0x1ee5e,
-	0x1ee60, 0x1ee60,
-	0x1ee63, 0x1ee63,
-	0x1ee65, 0x1ee66,
-	0x1ee6b, 0x1ee6b,
-	0x1ee73, 0x1ee73,
-	0x1ee78, 0x1ee78,
-	0x1ee7d, 0x1ee7d,
-	0x1ee7f, 0x1ee7f,
-	0x1ee8a, 0x1ee8a,
-	0x1ee9c, 0x1eea0,
-	0x1eea4, 0x1eea4,
-	0x1eeaa, 0x1eeaa,
-	0x1eebc, 0x1eeef,
-	0x1eef2, 0x1efff,
-	0x1f02c, 0x1f02f,
-	0x1f094, 0x1f09f,
-	0x1f0af, 0x1f0b0,
-	0x1f0bf, 0x1f0c0,
-	0x1f0d0, 0x1f0d0,
-	0x1f0e0, 0x1f0ff,
-	0x1f10b, 0x1f10f,
-	0x1f12f, 0x1f12f,
-	0x1f16c, 0x1f16f,
-	0x1f19b, 0x1f1e5,
-	0x1f203, 0x1f20f,
-	0x1f23b, 0x1f23f,
-	0x1f249, 0x1f24f,
-	0x1f252, 0x1f2ff,
-	0x1f321, 0x1f32f,
-	0x1f336, 0x1f336,
-	0x1f37d, 0x1f37f,
-	0x1f394, 0x1f39f,
-	0x1f3c5, 0x1f3c5,
-	0x1f3cb, 0x1f3df,
-	0x1f3f1, 0x1f3ff,
-	0x1f43f, 0x1f43f,
-	0x1f441, 0x1f441,
-	0x1f4f8, 0x1f4f8,
-	0x1f4fd, 0x1f4ff,
-	0x1f53e, 0x1f53f,
-	0x1f544, 0x1f54f,
-	0x1f568, 0x1f5fa,
-	0x1f641, 0x1f644,
-	0x1f650, 0x1f67f,
-	0x1f6c6, 0x1f6ff,
-	0x1f774, 0x1ffff,
-	0x2a6d7, 0x2a6ff,
-	0x2b735, 0x2b73f,
-	0x2b81e, 0x2f7ff,
-	0x2fa1e, 0xe0000,
-	0xe0002, 0xe001f,
-	0xe0080, 0xe00ff,
-	0xe01f0, 0x10ffff,
-}; /* CR_Unknown */
-
-/* 'Age_1_1': Derived Age 1.1 */
-static const OnigCodePoint CR_Age_1_1[] = {
-	288,
-	0x0000, 0x01f5,
-	0x01fa, 0x0217,
-	0x0250, 0x02a8,
-	0x02b0, 0x02de,
-	0x02e0, 0x02e9,
-	0x0300, 0x0345,
-	0x0360, 0x0361,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x037e, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03ce,
-	0x03d0, 0x03d6,
-	0x03da, 0x03da,
-	0x03dc, 0x03dc,
-	0x03de, 0x03de,
-	0x03e0, 0x03e0,
-	0x03e2, 0x03f3,
-	0x0401, 0x040c,
-	0x040e, 0x044f,
-	0x0451, 0x045c,
-	0x045e, 0x0486,
-	0x0490, 0x04c4,
-	0x04c7, 0x04c8,
-	0x04cb, 0x04cc,
-	0x04d0, 0x04eb,
-	0x04ee, 0x04f5,
-	0x04f8, 0x04f9,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x0589,
-	0x05b0, 0x05b9,
-	0x05bb, 0x05c3,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x060c, 0x060c,
-	0x061b, 0x061b,
-	0x061f, 0x061f,
-	0x0621, 0x063a,
-	0x0640, 0x0652,
-	0x0660, 0x066d,
-	0x0670, 0x06b7,
-	0x06ba, 0x06be,
-	0x06c0, 0x06ce,
-	0x06d0, 0x06ed,
-	0x06f0, 0x06f9,
-	0x0901, 0x0903,
-	0x0905, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0970,
-	0x0981, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bc, 0x09bc,
-	0x09be, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cd,
-	0x09d7, 0x09d7,
-	0x09dc, 0x09dd,
-	0x09df, 0x09e3,
-	0x09e6, 0x09fa,
-	0x0a02, 0x0a02,
-	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, 0x0a8b,
-	0x0a8d, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abc, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acd,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae0,
-	0x0ae6, 0x0aef,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b36, 0x0b39,
-	0x0b3c, 0x0b43,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b61,
-	0x0b66, 0x0b70,
-	0x0b82, 0x0b83,
-	0x0b85, 0x0b8a,
-	0x0b8e, 0x0b90,
-	0x0b92, 0x0b95,
-	0x0b99, 0x0b9a,
-	0x0b9c, 0x0b9c,
-	0x0b9e, 0x0b9f,
-	0x0ba3, 0x0ba4,
-	0x0ba8, 0x0baa,
-	0x0bae, 0x0bb5,
-	0x0bb7, 0x0bb9,
-	0x0bbe, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcd,
-	0x0bd7, 0x0bd7,
-	0x0be7, 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,
-	0x0cbe, 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,
-	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,
-	0x10a0, 0x10c5,
-	0x10d0, 0x10f6,
-	0x10fb, 0x10fb,
-	0x1100, 0x1159,
-	0x115f, 0x11a2,
-	0x11a8, 0x11f9,
-	0x1e00, 0x1e9a,
-	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, 0x202e,
-	0x2030, 0x2046,
-	0x206a, 0x2070,
-	0x2074, 0x208e,
-	0x20a0, 0x20aa,
-	0x20d0, 0x20e1,
-	0x2100, 0x2138,
-	0x2153, 0x2182,
-	0x2190, 0x21ea,
-	0x2200, 0x22f1,
-	0x2300, 0x2300,
-	0x2302, 0x237a,
-	0x2400, 0x2424,
-	0x2440, 0x244a,
-	0x2460, 0x24ea,
-	0x2500, 0x2595,
-	0x25a0, 0x25ef,
-	0x2600, 0x2613,
-	0x261a, 0x266f,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2767,
-	0x2776, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x3000, 0x3037,
-	0x303f, 0x303f,
-	0x3041, 0x3094,
-	0x3099, 0x309e,
-	0x30a1, 0x30fe,
-	0x3105, 0x312c,
-	0x3131, 0x318e,
-	0x3190, 0x319f,
-	0x3200, 0x321c,
-	0x3220, 0x3243,
-	0x3260, 0x327b,
-	0x327f, 0x32b0,
-	0x32c0, 0x32cb,
-	0x32d0, 0x32fe,
-	0x3300, 0x3376,
-	0x337b, 0x33dd,
-	0x33e0, 0x33fe,
-	0x4e00, 0x9fa5,
-	0xe000, 0xfa2d,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1e, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe20, 0xfe23,
-	0xfe30, 0xfe44,
-	0xfe49, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfe70, 0xfe72,
-	0xfe74, 0xfe74,
-	0xfe76, 0xfefc,
-	0xfeff, 0xfeff,
-	0xff01, 0xff5e,
-	0xff61, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfffd, 0xffff,
-}; /* CR_Age_1_1 */
-
-/* 'Age_2_0': Derived Age 2.0 */
-static const OnigCodePoint CR_Age_2_0[] = {
-	312,
-	0x0000, 0x01f5,
-	0x01fa, 0x0217,
-	0x0250, 0x02a8,
-	0x02b0, 0x02de,
-	0x02e0, 0x02e9,
-	0x0300, 0x0345,
-	0x0360, 0x0361,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x037e, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03ce,
-	0x03d0, 0x03d6,
-	0x03da, 0x03da,
-	0x03dc, 0x03dc,
-	0x03de, 0x03de,
-	0x03e0, 0x03e0,
-	0x03e2, 0x03f3,
-	0x0401, 0x040c,
-	0x040e, 0x044f,
-	0x0451, 0x045c,
-	0x045e, 0x0486,
-	0x0490, 0x04c4,
-	0x04c7, 0x04c8,
-	0x04cb, 0x04cc,
-	0x04d0, 0x04eb,
-	0x04ee, 0x04f5,
-	0x04f8, 0x04f9,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x0589,
-	0x0591, 0x05a1,
-	0x05a3, 0x05b9,
-	0x05bb, 0x05c4,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x060c, 0x060c,
-	0x061b, 0x061b,
-	0x061f, 0x061f,
-	0x0621, 0x063a,
-	0x0640, 0x0652,
-	0x0660, 0x066d,
-	0x0670, 0x06b7,
-	0x06ba, 0x06be,
-	0x06c0, 0x06ce,
-	0x06d0, 0x06ed,
-	0x06f0, 0x06f9,
-	0x0901, 0x0903,
-	0x0905, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0970,
-	0x0981, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bc, 0x09bc,
-	0x09be, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cd,
-	0x09d7, 0x09d7,
-	0x09dc, 0x09dd,
-	0x09df, 0x09e3,
-	0x09e6, 0x09fa,
-	0x0a02, 0x0a02,
-	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, 0x0a8b,
-	0x0a8d, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abc, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acd,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae0,
-	0x0ae6, 0x0aef,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b36, 0x0b39,
-	0x0b3c, 0x0b43,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b61,
-	0x0b66, 0x0b70,
-	0x0b82, 0x0b83,
-	0x0b85, 0x0b8a,
-	0x0b8e, 0x0b90,
-	0x0b92, 0x0b95,
-	0x0b99, 0x0b9a,
-	0x0b9c, 0x0b9c,
-	0x0b9e, 0x0b9f,
-	0x0ba3, 0x0ba4,
-	0x0ba8, 0x0baa,
-	0x0bae, 0x0bb5,
-	0x0bb7, 0x0bb9,
-	0x0bbe, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcd,
-	0x0bd7, 0x0bd7,
-	0x0be7, 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,
-	0x0cbe, 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,
-	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, 0x0f69,
-	0x0f71, 0x0f8b,
-	0x0f90, 0x0f95,
-	0x0f97, 0x0f97,
-	0x0f99, 0x0fad,
-	0x0fb1, 0x0fb7,
-	0x0fb9, 0x0fb9,
-	0x10a0, 0x10c5,
-	0x10d0, 0x10f6,
-	0x10fb, 0x10fb,
-	0x1100, 0x1159,
-	0x115f, 0x11a2,
-	0x11a8, 0x11f9,
-	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, 0x202e,
-	0x2030, 0x2046,
-	0x206a, 0x2070,
-	0x2074, 0x208e,
-	0x20a0, 0x20ab,
-	0x20d0, 0x20e1,
-	0x2100, 0x2138,
-	0x2153, 0x2182,
-	0x2190, 0x21ea,
-	0x2200, 0x22f1,
-	0x2300, 0x2300,
-	0x2302, 0x237a,
-	0x2400, 0x2424,
-	0x2440, 0x244a,
-	0x2460, 0x24ea,
-	0x2500, 0x2595,
-	0x25a0, 0x25ef,
-	0x2600, 0x2613,
-	0x261a, 0x266f,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2767,
-	0x2776, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x3000, 0x3037,
-	0x303f, 0x303f,
-	0x3041, 0x3094,
-	0x3099, 0x309e,
-	0x30a1, 0x30fe,
-	0x3105, 0x312c,
-	0x3131, 0x318e,
-	0x3190, 0x319f,
-	0x3200, 0x321c,
-	0x3220, 0x3243,
-	0x3260, 0x327b,
-	0x327f, 0x32b0,
-	0x32c0, 0x32cb,
-	0x32d0, 0x32fe,
-	0x3300, 0x3376,
-	0x337b, 0x33dd,
-	0x33e0, 0x33fe,
-	0x4e00, 0x9fa5,
-	0xac00, 0xd7a3,
-	0xd800, 0xfa2d,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1e, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe20, 0xfe23,
-	0xfe30, 0xfe44,
-	0xfe49, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfe70, 0xfe72,
-	0xfe74, 0xfe74,
-	0xfe76, 0xfefc,
-	0xfeff, 0xfeff,
-	0xff01, 0xff5e,
-	0xff61, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfffd, 0xffff,
-	0x1fffe, 0x1ffff,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_2_0 */
-
-/* 'Age_2_1': Derived Age 2.1 */
-static const OnigCodePoint CR_Age_2_1[] = {
-	312,
-	0x0000, 0x01f5,
-	0x01fa, 0x0217,
-	0x0250, 0x02a8,
-	0x02b0, 0x02de,
-	0x02e0, 0x02e9,
-	0x0300, 0x0345,
-	0x0360, 0x0361,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x037e, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03ce,
-	0x03d0, 0x03d6,
-	0x03da, 0x03da,
-	0x03dc, 0x03dc,
-	0x03de, 0x03de,
-	0x03e0, 0x03e0,
-	0x03e2, 0x03f3,
-	0x0401, 0x040c,
-	0x040e, 0x044f,
-	0x0451, 0x045c,
-	0x045e, 0x0486,
-	0x0490, 0x04c4,
-	0x04c7, 0x04c8,
-	0x04cb, 0x04cc,
-	0x04d0, 0x04eb,
-	0x04ee, 0x04f5,
-	0x04f8, 0x04f9,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x0589,
-	0x0591, 0x05a1,
-	0x05a3, 0x05b9,
-	0x05bb, 0x05c4,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x060c, 0x060c,
-	0x061b, 0x061b,
-	0x061f, 0x061f,
-	0x0621, 0x063a,
-	0x0640, 0x0652,
-	0x0660, 0x066d,
-	0x0670, 0x06b7,
-	0x06ba, 0x06be,
-	0x06c0, 0x06ce,
-	0x06d0, 0x06ed,
-	0x06f0, 0x06f9,
-	0x0901, 0x0903,
-	0x0905, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0970,
-	0x0981, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bc, 0x09bc,
-	0x09be, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cd,
-	0x09d7, 0x09d7,
-	0x09dc, 0x09dd,
-	0x09df, 0x09e3,
-	0x09e6, 0x09fa,
-	0x0a02, 0x0a02,
-	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, 0x0a8b,
-	0x0a8d, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abc, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acd,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae0,
-	0x0ae6, 0x0aef,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b36, 0x0b39,
-	0x0b3c, 0x0b43,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b61,
-	0x0b66, 0x0b70,
-	0x0b82, 0x0b83,
-	0x0b85, 0x0b8a,
-	0x0b8e, 0x0b90,
-	0x0b92, 0x0b95,
-	0x0b99, 0x0b9a,
-	0x0b9c, 0x0b9c,
-	0x0b9e, 0x0b9f,
-	0x0ba3, 0x0ba4,
-	0x0ba8, 0x0baa,
-	0x0bae, 0x0bb5,
-	0x0bb7, 0x0bb9,
-	0x0bbe, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcd,
-	0x0bd7, 0x0bd7,
-	0x0be7, 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,
-	0x0cbe, 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,
-	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, 0x0f69,
-	0x0f71, 0x0f8b,
-	0x0f90, 0x0f95,
-	0x0f97, 0x0f97,
-	0x0f99, 0x0fad,
-	0x0fb1, 0x0fb7,
-	0x0fb9, 0x0fb9,
-	0x10a0, 0x10c5,
-	0x10d0, 0x10f6,
-	0x10fb, 0x10fb,
-	0x1100, 0x1159,
-	0x115f, 0x11a2,
-	0x11a8, 0x11f9,
-	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, 0x202e,
-	0x2030, 0x2046,
-	0x206a, 0x2070,
-	0x2074, 0x208e,
-	0x20a0, 0x20ac,
-	0x20d0, 0x20e1,
-	0x2100, 0x2138,
-	0x2153, 0x2182,
-	0x2190, 0x21ea,
-	0x2200, 0x22f1,
-	0x2300, 0x2300,
-	0x2302, 0x237a,
-	0x2400, 0x2424,
-	0x2440, 0x244a,
-	0x2460, 0x24ea,
-	0x2500, 0x2595,
-	0x25a0, 0x25ef,
-	0x2600, 0x2613,
-	0x261a, 0x266f,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2767,
-	0x2776, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x3000, 0x3037,
-	0x303f, 0x303f,
-	0x3041, 0x3094,
-	0x3099, 0x309e,
-	0x30a1, 0x30fe,
-	0x3105, 0x312c,
-	0x3131, 0x318e,
-	0x3190, 0x319f,
-	0x3200, 0x321c,
-	0x3220, 0x3243,
-	0x3260, 0x327b,
-	0x327f, 0x32b0,
-	0x32c0, 0x32cb,
-	0x32d0, 0x32fe,
-	0x3300, 0x3376,
-	0x337b, 0x33dd,
-	0x33e0, 0x33fe,
-	0x4e00, 0x9fa5,
-	0xac00, 0xd7a3,
-	0xd800, 0xfa2d,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1e, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe20, 0xfe23,
-	0xfe30, 0xfe44,
-	0xfe49, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfe70, 0xfe72,
-	0xfe74, 0xfe74,
-	0xfe76, 0xfefc,
-	0xfeff, 0xfeff,
-	0xff01, 0xff5e,
-	0xff61, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfffc, 0xffff,
-	0x1fffe, 0x1ffff,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_2_1 */
-
-/* 'Age_3_0': Derived Age 3.0 */
-static const OnigCodePoint CR_Age_3_0[] = {
-	369,
-	0x0000, 0x021f,
-	0x0222, 0x0233,
-	0x0250, 0x02ad,
-	0x02b0, 0x02ee,
-	0x0300, 0x034e,
-	0x0360, 0x0362,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x037e, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03ce,
-	0x03d0, 0x03d7,
-	0x03da, 0x03f3,
-	0x0400, 0x0486,
-	0x0488, 0x0489,
-	0x048c, 0x04c4,
-	0x04c7, 0x04c8,
-	0x04cb, 0x04cc,
-	0x04d0, 0x04f5,
-	0x04f8, 0x04f9,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x0591, 0x05a1,
-	0x05a3, 0x05b9,
-	0x05bb, 0x05c4,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x060c, 0x060c,
-	0x061b, 0x061b,
-	0x061f, 0x061f,
-	0x0621, 0x063a,
-	0x0640, 0x0655,
-	0x0660, 0x066d,
-	0x0670, 0x06ed,
-	0x06f0, 0x06fe,
-	0x0700, 0x070d,
-	0x070f, 0x072c,
-	0x0730, 0x074a,
-	0x0780, 0x07b0,
-	0x0901, 0x0903,
-	0x0905, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0970,
-	0x0981, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bc, 0x09bc,
-	0x09be, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cd,
-	0x09d7, 0x09d7,
-	0x09dc, 0x09dd,
-	0x09df, 0x09e3,
-	0x09e6, 0x09fa,
-	0x0a02, 0x0a02,
-	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, 0x0a8b,
-	0x0a8d, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abc, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acd,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae0,
-	0x0ae6, 0x0aef,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b36, 0x0b39,
-	0x0b3c, 0x0b43,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b61,
-	0x0b66, 0x0b70,
-	0x0b82, 0x0b83,
-	0x0b85, 0x0b8a,
-	0x0b8e, 0x0b90,
-	0x0b92, 0x0b95,
-	0x0b99, 0x0b9a,
-	0x0b9c, 0x0b9c,
-	0x0b9e, 0x0b9f,
-	0x0ba3, 0x0ba4,
-	0x0ba8, 0x0baa,
-	0x0bae, 0x0bb5,
-	0x0bb7, 0x0bb9,
-	0x0bbe, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcd,
-	0x0bd7, 0x0bd7,
-	0x0be7, 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,
-	0x0cbe, 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, 0x0fcf,
-	0x1000, 0x1021,
-	0x1023, 0x1027,
-	0x1029, 0x102a,
-	0x102c, 0x1032,
-	0x1036, 0x1039,
-	0x1040, 0x1059,
-	0x10a0, 0x10c5,
-	0x10d0, 0x10f6,
-	0x10fb, 0x10fb,
-	0x1100, 0x1159,
-	0x115f, 0x11a2,
-	0x11a8, 0x11f9,
-	0x1200, 0x1206,
-	0x1208, 0x1246,
-	0x1248, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1286,
-	0x1288, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12ae,
-	0x12b0, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12ce,
-	0x12d0, 0x12d6,
-	0x12d8, 0x12ee,
-	0x12f0, 0x130e,
-	0x1310, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x131e,
-	0x1320, 0x1346,
-	0x1348, 0x135a,
-	0x1361, 0x137c,
-	0x13a0, 0x13f4,
-	0x1401, 0x1676,
-	0x1680, 0x169c,
-	0x16a0, 0x16f0,
-	0x1780, 0x17dc,
-	0x17e0, 0x17e9,
-	0x1800, 0x180e,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18a9,
-	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, 0x2046,
-	0x2048, 0x204d,
-	0x206a, 0x2070,
-	0x2074, 0x208e,
-	0x20a0, 0x20af,
-	0x20d0, 0x20e3,
-	0x2100, 0x213a,
-	0x2153, 0x2183,
-	0x2190, 0x21f3,
-	0x2200, 0x22f1,
-	0x2300, 0x237b,
-	0x237d, 0x239a,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x24ea,
-	0x2500, 0x2595,
-	0x25a0, 0x25f7,
-	0x2600, 0x2613,
-	0x2619, 0x2671,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2767,
-	0x2776, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x2800, 0x28ff,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303a,
-	0x303e, 0x303f,
-	0x3041, 0x3094,
-	0x3099, 0x309e,
-	0x30a1, 0x30fe,
-	0x3105, 0x312c,
-	0x3131, 0x318e,
-	0x3190, 0x31b7,
-	0x3200, 0x321c,
-	0x3220, 0x3243,
-	0x3260, 0x327b,
-	0x327f, 0x32b0,
-	0x32c0, 0x32cb,
-	0x32d0, 0x32fe,
-	0x3300, 0x3376,
-	0x337b, 0x33dd,
-	0x33e0, 0x33fe,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fa5,
-	0xa000, 0xa48c,
-	0xa490, 0xa4a1,
-	0xa4a4, 0xa4b3,
-	0xa4b5, 0xa4c0,
-	0xa4c2, 0xa4c4,
-	0xa4c6, 0xa4c6,
-	0xac00, 0xd7a3,
-	0xd800, 0xfa2d,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe20, 0xfe23,
-	0xfe30, 0xfe44,
-	0xfe49, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfe70, 0xfe72,
-	0xfe74, 0xfe74,
-	0xfe76, 0xfefc,
-	0xfeff, 0xfeff,
-	0xff01, 0xff5e,
-	0xff61, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfff9, 0xffff,
-	0x1fffe, 0x1ffff,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_3_0 */
-
-/* 'Age_3_1': Derived Age 3.1 */
-static const OnigCodePoint CR_Age_3_1[] = {
-	402,
-	0x0000, 0x021f,
-	0x0222, 0x0233,
-	0x0250, 0x02ad,
-	0x02b0, 0x02ee,
-	0x0300, 0x034e,
-	0x0360, 0x0362,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x037e, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03ce,
-	0x03d0, 0x03d7,
-	0x03da, 0x03f5,
-	0x0400, 0x0486,
-	0x0488, 0x0489,
-	0x048c, 0x04c4,
-	0x04c7, 0x04c8,
-	0x04cb, 0x04cc,
-	0x04d0, 0x04f5,
-	0x04f8, 0x04f9,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x0591, 0x05a1,
-	0x05a3, 0x05b9,
-	0x05bb, 0x05c4,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x060c, 0x060c,
-	0x061b, 0x061b,
-	0x061f, 0x061f,
-	0x0621, 0x063a,
-	0x0640, 0x0655,
-	0x0660, 0x066d,
-	0x0670, 0x06ed,
-	0x06f0, 0x06fe,
-	0x0700, 0x070d,
-	0x070f, 0x072c,
-	0x0730, 0x074a,
-	0x0780, 0x07b0,
-	0x0901, 0x0903,
-	0x0905, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0970,
-	0x0981, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bc, 0x09bc,
-	0x09be, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cd,
-	0x09d7, 0x09d7,
-	0x09dc, 0x09dd,
-	0x09df, 0x09e3,
-	0x09e6, 0x09fa,
-	0x0a02, 0x0a02,
-	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, 0x0a8b,
-	0x0a8d, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abc, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acd,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae0,
-	0x0ae6, 0x0aef,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b36, 0x0b39,
-	0x0b3c, 0x0b43,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b61,
-	0x0b66, 0x0b70,
-	0x0b82, 0x0b83,
-	0x0b85, 0x0b8a,
-	0x0b8e, 0x0b90,
-	0x0b92, 0x0b95,
-	0x0b99, 0x0b9a,
-	0x0b9c, 0x0b9c,
-	0x0b9e, 0x0b9f,
-	0x0ba3, 0x0ba4,
-	0x0ba8, 0x0baa,
-	0x0bae, 0x0bb5,
-	0x0bb7, 0x0bb9,
-	0x0bbe, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcd,
-	0x0bd7, 0x0bd7,
-	0x0be7, 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,
-	0x0cbe, 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, 0x0fcf,
-	0x1000, 0x1021,
-	0x1023, 0x1027,
-	0x1029, 0x102a,
-	0x102c, 0x1032,
-	0x1036, 0x1039,
-	0x1040, 0x1059,
-	0x10a0, 0x10c5,
-	0x10d0, 0x10f6,
-	0x10fb, 0x10fb,
-	0x1100, 0x1159,
-	0x115f, 0x11a2,
-	0x11a8, 0x11f9,
-	0x1200, 0x1206,
-	0x1208, 0x1246,
-	0x1248, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1286,
-	0x1288, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12ae,
-	0x12b0, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12ce,
-	0x12d0, 0x12d6,
-	0x12d8, 0x12ee,
-	0x12f0, 0x130e,
-	0x1310, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x131e,
-	0x1320, 0x1346,
-	0x1348, 0x135a,
-	0x1361, 0x137c,
-	0x13a0, 0x13f4,
-	0x1401, 0x1676,
-	0x1680, 0x169c,
-	0x16a0, 0x16f0,
-	0x1780, 0x17dc,
-	0x17e0, 0x17e9,
-	0x1800, 0x180e,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18a9,
-	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, 0x2046,
-	0x2048, 0x204d,
-	0x206a, 0x2070,
-	0x2074, 0x208e,
-	0x20a0, 0x20af,
-	0x20d0, 0x20e3,
-	0x2100, 0x213a,
-	0x2153, 0x2183,
-	0x2190, 0x21f3,
-	0x2200, 0x22f1,
-	0x2300, 0x237b,
-	0x237d, 0x239a,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x24ea,
-	0x2500, 0x2595,
-	0x25a0, 0x25f7,
-	0x2600, 0x2613,
-	0x2619, 0x2671,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2767,
-	0x2776, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x2800, 0x28ff,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303a,
-	0x303e, 0x303f,
-	0x3041, 0x3094,
-	0x3099, 0x309e,
-	0x30a1, 0x30fe,
-	0x3105, 0x312c,
-	0x3131, 0x318e,
-	0x3190, 0x31b7,
-	0x3200, 0x321c,
-	0x3220, 0x3243,
-	0x3260, 0x327b,
-	0x327f, 0x32b0,
-	0x32c0, 0x32cb,
-	0x32d0, 0x32fe,
-	0x3300, 0x3376,
-	0x337b, 0x33dd,
-	0x33e0, 0x33fe,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fa5,
-	0xa000, 0xa48c,
-	0xa490, 0xa4a1,
-	0xa4a4, 0xa4b3,
-	0xa4b5, 0xa4c0,
-	0xa4c2, 0xa4c4,
-	0xa4c6, 0xa4c6,
-	0xac00, 0xd7a3,
-	0xd800, 0xfa2d,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 0xfdfb,
-	0xfe20, 0xfe23,
-	0xfe30, 0xfe44,
-	0xfe49, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfe70, 0xfe72,
-	0xfe74, 0xfe74,
-	0xfe76, 0xfefc,
-	0xfeff, 0xfeff,
-	0xff01, 0xff5e,
-	0xff61, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfff9, 0xffff,
-	0x10300, 0x1031e,
-	0x10320, 0x10323,
-	0x10330, 0x1034a,
-	0x10400, 0x10425,
-	0x10428, 0x1044d,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d12a, 0x1d1dd,
-	0x1d400, 0x1d454,
-	0x1d456, 0x1d49c,
-	0x1d49e, 0x1d49f,
-	0x1d4a2, 0x1d4a2,
-	0x1d4a5, 0x1d4a6,
-	0x1d4a9, 0x1d4ac,
-	0x1d4ae, 0x1d4b9,
-	0x1d4bb, 0x1d4bb,
-	0x1d4bd, 0x1d4c0,
-	0x1d4c2, 0x1d4c3,
-	0x1d4c5, 0x1d505,
-	0x1d507, 0x1d50a,
-	0x1d50d, 0x1d514,
-	0x1d516, 0x1d51c,
-	0x1d51e, 0x1d539,
-	0x1d53b, 0x1d53e,
-	0x1d540, 0x1d544,
-	0x1d546, 0x1d546,
-	0x1d54a, 0x1d550,
-	0x1d552, 0x1d6a3,
-	0x1d6a8, 0x1d7c9,
-	0x1d7ce, 0x1d7ff,
-	0x1fffe, 0x2a6d6,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_3_1 */
-
-/* 'Age_3_2': Derived Age 3.2 */
-static const OnigCodePoint CR_Age_3_2[] = {
-	397,
-	0x0000, 0x0220,
-	0x0222, 0x0233,
-	0x0250, 0x02ad,
-	0x02b0, 0x02ee,
-	0x0300, 0x034f,
-	0x0360, 0x036f,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x037e, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03ce,
-	0x03d0, 0x03f6,
-	0x0400, 0x0486,
-	0x0488, 0x04ce,
-	0x04d0, 0x04f5,
-	0x04f8, 0x04f9,
-	0x0500, 0x050f,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x0591, 0x05a1,
-	0x05a3, 0x05b9,
-	0x05bb, 0x05c4,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x060c, 0x060c,
-	0x061b, 0x061b,
-	0x061f, 0x061f,
-	0x0621, 0x063a,
-	0x0640, 0x0655,
-	0x0660, 0x06ed,
-	0x06f0, 0x06fe,
-	0x0700, 0x070d,
-	0x070f, 0x072c,
-	0x0730, 0x074a,
-	0x0780, 0x07b1,
-	0x0901, 0x0903,
-	0x0905, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0970,
-	0x0981, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bc, 0x09bc,
-	0x09be, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cd,
-	0x09d7, 0x09d7,
-	0x09dc, 0x09dd,
-	0x09df, 0x09e3,
-	0x09e6, 0x09fa,
-	0x0a02, 0x0a02,
-	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, 0x0a8b,
-	0x0a8d, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abc, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acd,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae0,
-	0x0ae6, 0x0aef,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b36, 0x0b39,
-	0x0b3c, 0x0b43,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b61,
-	0x0b66, 0x0b70,
-	0x0b82, 0x0b83,
-	0x0b85, 0x0b8a,
-	0x0b8e, 0x0b90,
-	0x0b92, 0x0b95,
-	0x0b99, 0x0b9a,
-	0x0b9c, 0x0b9c,
-	0x0b9e, 0x0b9f,
-	0x0ba3, 0x0ba4,
-	0x0ba8, 0x0baa,
-	0x0bae, 0x0bb5,
-	0x0bb7, 0x0bb9,
-	0x0bbe, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcd,
-	0x0bd7, 0x0bd7,
-	0x0be7, 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,
-	0x0cbe, 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, 0x0fcf,
-	0x1000, 0x1021,
-	0x1023, 0x1027,
-	0x1029, 0x102a,
-	0x102c, 0x1032,
-	0x1036, 0x1039,
-	0x1040, 0x1059,
-	0x10a0, 0x10c5,
-	0x10d0, 0x10f8,
-	0x10fb, 0x10fb,
-	0x1100, 0x1159,
-	0x115f, 0x11a2,
-	0x11a8, 0x11f9,
-	0x1200, 0x1206,
-	0x1208, 0x1246,
-	0x1248, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1286,
-	0x1288, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12ae,
-	0x12b0, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12ce,
-	0x12d0, 0x12d6,
-	0x12d8, 0x12ee,
-	0x12f0, 0x130e,
-	0x1310, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x131e,
-	0x1320, 0x1346,
-	0x1348, 0x135a,
-	0x1361, 0x137c,
-	0x13a0, 0x13f4,
-	0x1401, 0x1676,
-	0x1680, 0x169c,
-	0x16a0, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1714,
-	0x1720, 0x1736,
-	0x1740, 0x1753,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-	0x1780, 0x17dc,
-	0x17e0, 0x17e9,
-	0x1800, 0x180e,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18a9,
-	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, 0x2052,
-	0x2057, 0x2057,
-	0x205f, 0x2063,
-	0x206a, 0x2071,
-	0x2074, 0x208e,
-	0x20a0, 0x20b1,
-	0x20d0, 0x20ea,
-	0x2100, 0x213a,
-	0x213d, 0x214b,
-	0x2153, 0x2183,
-	0x2190, 0x23ce,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x24fe,
-	0x2500, 0x2613,
-	0x2616, 0x2617,
-	0x2619, 0x267d,
-	0x2680, 0x2689,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27d0, 0x27eb,
-	0x27f0, 0x2aff,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312c,
-	0x3131, 0x318e,
-	0x3190, 0x31b7,
-	0x31f0, 0x321c,
-	0x3220, 0x3243,
-	0x3251, 0x327b,
-	0x327f, 0x32cb,
-	0x32d0, 0x32fe,
-	0x3300, 0x3376,
-	0x337b, 0x33dd,
-	0x33e0, 0x33fe,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fa5,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xac00, 0xd7a3,
-	0xd800, 0xfa2d,
-	0xfa30, 0xfa6a,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 0xfdfc,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe23,
-	0xfe30, 0xfe46,
-	0xfe49, 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, 0xffff,
-	0x10300, 0x1031e,
-	0x10320, 0x10323,
-	0x10330, 0x1034a,
-	0x10400, 0x10425,
-	0x10428, 0x1044d,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d12a, 0x1d1dd,
-	0x1d400, 0x1d454,
-	0x1d456, 0x1d49c,
-	0x1d49e, 0x1d49f,
-	0x1d4a2, 0x1d4a2,
-	0x1d4a5, 0x1d4a6,
-	0x1d4a9, 0x1d4ac,
-	0x1d4ae, 0x1d4b9,
-	0x1d4bb, 0x1d4bb,
-	0x1d4bd, 0x1d4c0,
-	0x1d4c2, 0x1d4c3,
-	0x1d4c5, 0x1d505,
-	0x1d507, 0x1d50a,
-	0x1d50d, 0x1d514,
-	0x1d516, 0x1d51c,
-	0x1d51e, 0x1d539,
-	0x1d53b, 0x1d53e,
-	0x1d540, 0x1d544,
-	0x1d546, 0x1d546,
-	0x1d54a, 0x1d550,
-	0x1d552, 0x1d6a3,
-	0x1d6a8, 0x1d7c9,
-	0x1d7ce, 0x1d7ff,
-	0x1fffe, 0x2a6d6,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_3_2 */
-
-/* 'Age_4_0': Derived Age 4.0 */
-static const OnigCodePoint CR_Age_4_0[] = {
-	412,
-	0x0000, 0x0236,
-	0x0250, 0x0357,
-	0x035d, 0x036f,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x037e, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03ce,
-	0x03d0, 0x03fb,
-	0x0400, 0x0486,
-	0x0488, 0x04ce,
-	0x04d0, 0x04f5,
-	0x04f8, 0x04f9,
-	0x0500, 0x050f,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x0591, 0x05a1,
-	0x05a3, 0x05b9,
-	0x05bb, 0x05c4,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x0603,
-	0x060c, 0x0615,
-	0x061b, 0x061b,
-	0x061f, 0x061f,
-	0x0621, 0x063a,
-	0x0640, 0x0658,
-	0x0660, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x074f,
-	0x0780, 0x07b1,
-	0x0901, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0970,
-	0x0981, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bc, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cd,
-	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, 0x0bb5,
-	0x0bb7, 0x0bb9,
-	0x0bbe, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcd,
-	0x0bd7, 0x0bd7,
-	0x0be7, 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, 0x0fcf,
-	0x1000, 0x1021,
-	0x1023, 0x1027,
-	0x1029, 0x102a,
-	0x102c, 0x1032,
-	0x1036, 0x1039,
-	0x1040, 0x1059,
-	0x10a0, 0x10c5,
-	0x10d0, 0x10f8,
-	0x10fb, 0x10fb,
-	0x1100, 0x1159,
-	0x115f, 0x11a2,
-	0x11a8, 0x11f9,
-	0x1200, 0x1206,
-	0x1208, 0x1246,
-	0x1248, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1286,
-	0x1288, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12ae,
-	0x12b0, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12ce,
-	0x12d0, 0x12d6,
-	0x12d8, 0x12ee,
-	0x12f0, 0x130e,
-	0x1310, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x131e,
-	0x1320, 0x1346,
-	0x1348, 0x135a,
-	0x1361, 0x137c,
-	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,
-	0x19e0, 0x19ff,
-	0x1d00, 0x1d6b,
-	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, 0x2054,
-	0x2057, 0x2057,
-	0x205f, 0x2063,
-	0x206a, 0x2071,
-	0x2074, 0x208e,
-	0x20a0, 0x20b1,
-	0x20d0, 0x20ea,
-	0x2100, 0x213b,
-	0x213d, 0x214b,
-	0x2153, 0x2183,
-	0x2190, 0x23d0,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x2617,
-	0x2619, 0x267d,
-	0x2680, 0x2691,
-	0x26a0, 0x26a1,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27d0, 0x27eb,
-	0x27f0, 0x2b0d,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312c,
-	0x3131, 0x318e,
-	0x3190, 0x31b7,
-	0x31f0, 0x321e,
-	0x3220, 0x3243,
-	0x3250, 0x327d,
-	0x327f, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fa5,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xac00, 0xd7a3,
-	0xd800, 0xfa2d,
-	0xfa30, 0xfa6a,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 0xfdfd,
-	0xfe00, 0xfe0f,
-	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, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1013f,
-	0x10300, 0x1031e,
-	0x10320, 0x10323,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x1039f, 0x1039f,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x1083f,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d12a, 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, 0x1d6a3,
-	0x1d6a8, 0x1d7c9,
-	0x1d7ce, 0x1d7ff,
-	0x1fffe, 0x2a6d6,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_4_0 */
-
-/* 'Age_4_1': Derived Age 4.1 */
-static const OnigCodePoint CR_Age_4_1[] = {
-	430,
-	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,
-	0xfdd0, 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, 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,
-	0x1fffe, 0x2a6d6,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_4_1 */
-
-/* 'Age_5_0': Derived Age 5.0 */
-static const OnigCodePoint CR_Age_5_0[] = {
-	440,
-	0x0000, 0x036f,
-	0x0374, 0x0375,
-	0x037a, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03ce,
-	0x03d0, 0x0486,
-	0x0488, 0x0513,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x0591, 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,
-	0x07c0, 0x07fa,
-	0x0901, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0970,
-	0x097b, 0x097f,
-	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, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	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,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1d00, 0x1dca,
-	0x1dfe, 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, 0x20ef,
-	0x2100, 0x214e,
-	0x2153, 0x2184,
-	0x2190, 0x23e7,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x269c,
-	0x26a0, 0x26b2,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27c0, 0x27ca,
-	0x27d0, 0x27eb,
-	0x27f0, 0x2b1a,
-	0x2b20, 0x2b23,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2c6c,
-	0x2c74, 0x2c77,
-	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, 0xa71a,
-	0xa720, 0xa721,
-	0xa800, 0xa82b,
-	0xa840, 0xa877,
-	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,
-	0xfdd0, 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, 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,
-	0x10900, 0x10919,
-	0x1091f, 0x1091f,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d12a, 0x1d1dd,
-	0x1d200, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1fffe, 0x2a6d6,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_5_0 */
-
-/* 'Age_5_1': Derived Age 5.1 */
-static const OnigCodePoint CR_Age_5_1[] = {
-	455,
-	0x0000, 0x0377,
-	0x037a, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x0523,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x0603,
-	0x0606, 0x061b,
-	0x061e, 0x061f,
-	0x0621, 0x065e,
-	0x0660, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0901, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0972,
-	0x097b, 0x097f,
-	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,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bfa,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-	0x0c82, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
-	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, 0x0f6c,
-	0x0f71, 0x0f8b,
-	0x0f90, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fd4,
-	0x1000, 0x1099,
-	0x109e, 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, 0x18aa,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19a9,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19d9,
-	0x19de, 0x1a1b,
-	0x1a1e, 0x1a1f,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1baa,
-	0x1bae, 0x1bb9,
-	0x1c00, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1d00, 0x1de6,
-	0x1dfe, 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, 0x2064,
-	0x206a, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x2094,
-	0x20a0, 0x20b5,
-	0x20d0, 0x20f0,
-	0x2100, 0x214f,
-	0x2153, 0x2188,
-	0x2190, 0x23e7,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x269d,
-	0x26a0, 0x26bc,
-	0x26c0, 0x26c3,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27c0, 0x27ca,
-	0x27cc, 0x27cc,
-	0x27d0, 0x2b4c,
-	0x2b50, 0x2b54,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2c6f,
-	0x2c71, 0x2c7d,
-	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,
-	0x2de0, 0x2e30,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31b7,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x3243,
-	0x3250, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fc3,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa500, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa673,
-	0xa67c, 0xa697,
-	0xa700, 0xa78c,
-	0xa7fb, 0xa82b,
-	0xa840, 0xa877,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-	0xa900, 0xa953,
-	0xa95f, 0xa95f,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa5f,
-	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,
-	0xfdd0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe26,
-	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, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018a,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	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,
-	0x10900, 0x10919,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d1dd,
-	0x1d200, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1fffe, 0x2a6d6,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_5_1 */
-
-/* 'Age_5_2': Derived Age 5.2 */
-static const OnigCodePoint CR_Age_5_2[] = {
-	495,
-	0x0000, 0x0377,
-	0x037a, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x0525,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x0603,
-	0x0606, 0x061b,
-	0x061e, 0x061f,
-	0x0621, 0x065e,
-	0x0660, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-	0x0900, 0x0939,
-	0x093c, 0x094e,
-	0x0950, 0x0955,
-	0x0958, 0x0972,
-	0x0979, 0x097f,
-	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, 0x09fb,
-	0x0a01, 0x0a03,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bfa,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-	0x0c82, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
-	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, 0x0f6c,
-	0x0f71, 0x0f8b,
-	0x0f90, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fd8,
-	0x1000, 0x10c5,
-	0x10d0, 0x10fc,
-	0x1100, 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,
-	0x1400, 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, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a1b,
-	0x1a1e, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1baa,
-	0x1bae, 0x1bb9,
-	0x1c00, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cd0, 0x1cf2,
-	0x1d00, 0x1de6,
-	0x1dfd, 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, 0x2064,
-	0x206a, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x2094,
-	0x20a0, 0x20b8,
-	0x20d0, 0x20f0,
-	0x2100, 0x2189,
-	0x2190, 0x23e8,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x26cd,
-	0x26cf, 0x26e1,
-	0x26e3, 0x26e3,
-	0x26e8, 0x26ff,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27c0, 0x27ca,
-	0x27cc, 0x27cc,
-	0x27d0, 0x2b4c,
-	0x2b50, 0x2b59,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf1,
-	0x2cf9, 0x2d25,
-	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2e31,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31b7,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa673,
-	0xa67c, 0xa697,
-	0xa6a0, 0xa6f7,
-	0xa700, 0xa78c,
-	0xa7fb, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-	0xa8e0, 0xa8fb,
-	0xa900, 0xa953,
-	0xa95f, 0xa97c,
-	0xa980, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9df,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa7b,
-	0xaa80, 0xaac2,
-	0xaadb, 0xaadf,
-	0xabc0, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xd800, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe26,
-	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, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018a,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	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, 0x10855,
-	0x10857, 0x1085f,
-	0x10900, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a7f,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b7f,
-	0x10c00, 0x10c48,
-	0x10e60, 0x10e7e,
-	0x11080, 0x110c1,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-	0x13000, 0x1342e,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d1dd,
-	0x1d200, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f100, 0x1f10a,
-	0x1f110, 0x1f12e,
-	0x1f131, 0x1f131,
-	0x1f13d, 0x1f13d,
-	0x1f13f, 0x1f13f,
-	0x1f142, 0x1f142,
-	0x1f146, 0x1f146,
-	0x1f14a, 0x1f14e,
-	0x1f157, 0x1f157,
-	0x1f15f, 0x1f15f,
-	0x1f179, 0x1f179,
-	0x1f17b, 0x1f17c,
-	0x1f17f, 0x1f17f,
-	0x1f18a, 0x1f18d,
-	0x1f190, 0x1f190,
-	0x1f200, 0x1f200,
-	0x1f210, 0x1f231,
-	0x1f240, 0x1f248,
-	0x1fffe, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_5_2 */
-
-/* 'Age_6_0': Derived Age 6.0 */
-static const OnigCodePoint CR_Age_6_0[] = {
-	511,
-	0x0000, 0x0377,
-	0x037a, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x0527,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x0603,
-	0x0606, 0x061b,
-	0x061e, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-	0x0840, 0x085b,
-	0x085e, 0x085e,
-	0x0900, 0x0977,
-	0x0979, 0x097f,
-	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, 0x09fb,
-	0x0a01, 0x0a03,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	0x0b66, 0x0b77,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bfa,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-	0x0c82, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
-	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, 0x0f6c,
-	0x0f71, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fda,
-	0x1000, 0x10c5,
-	0x10d0, 0x10fc,
-	0x1100, 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,
-	0x135d, 0x137c,
-	0x1380, 0x1399,
-	0x13a0, 0x13f4,
-	0x1400, 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, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a1b,
-	0x1a1e, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1baa,
-	0x1bae, 0x1bb9,
-	0x1bc0, 0x1bf3,
-	0x1bfc, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cd0, 0x1cf2,
-	0x1d00, 0x1de6,
-	0x1dfc, 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, 0x2064,
-	0x206a, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x209c,
-	0x20a0, 0x20b9,
-	0x20d0, 0x20f0,
-	0x2100, 0x2189,
-	0x2190, 0x23f3,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x26ff,
-	0x2701, 0x27ca,
-	0x27cc, 0x27cc,
-	0x27ce, 0x2b4c,
-	0x2b50, 0x2b59,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf1,
-	0x2cf9, 0x2d25,
-	0x2d30, 0x2d65,
-	0x2d6f, 0x2d70,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2e31,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa673,
-	0xa67c, 0xa697,
-	0xa6a0, 0xa6f7,
-	0xa700, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-	0xa8e0, 0xa8fb,
-	0xa900, 0xa953,
-	0xa95f, 0xa97c,
-	0xa980, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9df,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa7b,
-	0xaa80, 0xaac2,
-	0xaadb, 0xaadf,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xd800, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbc1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe26,
-	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, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018a,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	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, 0x10855,
-	0x10857, 0x1085f,
-	0x10900, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a7f,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b7f,
-	0x10c00, 0x10c48,
-	0x10e60, 0x10e7e,
-	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-	0x11080, 0x110c1,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x1b000, 0x1b001,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d1dd,
-	0x1d200, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	0x1f100, 0x1f10a,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f169,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f320,
-	0x1f330, 0x1f335,
-	0x1f337, 0x1f37c,
-	0x1f380, 0x1f393,
-	0x1f3a0, 0x1f3c4,
-	0x1f3c6, 0x1f3ca,
-	0x1f3e0, 0x1f3f0,
-	0x1f400, 0x1f43e,
-	0x1f440, 0x1f440,
-	0x1f442, 0x1f4f7,
-	0x1f4f9, 0x1f4fc,
-	0x1f500, 0x1f53d,
-	0x1f550, 0x1f567,
-	0x1f5fb, 0x1f5ff,
-	0x1f601, 0x1f610,
-	0x1f612, 0x1f614,
-	0x1f616, 0x1f616,
-	0x1f618, 0x1f618,
-	0x1f61a, 0x1f61a,
-	0x1f61c, 0x1f61e,
-	0x1f620, 0x1f625,
-	0x1f628, 0x1f62b,
-	0x1f62d, 0x1f62d,
-	0x1f630, 0x1f633,
-	0x1f635, 0x1f640,
-	0x1f645, 0x1f64f,
-	0x1f680, 0x1f6c5,
-	0x1f700, 0x1f773,
-	0x1fffe, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_6_0 */
-
-/* 'Age_6_1': Derived Age 6.1 */
-static const OnigCodePoint CR_Age_6_1[] = {
-	549,
-	0x0000, 0x0377,
-	0x037a, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x0527,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x058f, 0x058f,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x0604,
-	0x0606, 0x061b,
-	0x061e, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-	0x0840, 0x085b,
-	0x085e, 0x085e,
-	0x08a0, 0x08a0,
-	0x08a2, 0x08ac,
-	0x08e4, 0x08fe,
-	0x0900, 0x0977,
-	0x0979, 0x097f,
-	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, 0x09fb,
-	0x0a01, 0x0a03,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0af1,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3c, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	0x0b66, 0x0b77,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bfa,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-	0x0c82, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
-	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, 0x0edf,
-	0x0f00, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fda,
-	0x1000, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 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,
-	0x135d, 0x137c,
-	0x1380, 0x1399,
-	0x13a0, 0x13f4,
-	0x1400, 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, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a1b,
-	0x1a1e, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1bf3,
-	0x1bfc, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cc0, 0x1cc7,
-	0x1cd0, 0x1cf6,
-	0x1d00, 0x1de6,
-	0x1dfc, 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, 0x2064,
-	0x206a, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x209c,
-	0x20a0, 0x20b9,
-	0x20d0, 0x20f0,
-	0x2100, 0x2189,
-	0x2190, 0x23f3,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x26ff,
-	0x2701, 0x2b4c,
-	0x2b50, 0x2b59,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf3,
-	0x2cf9, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d70,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2e3b,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa697,
-	0xa69f, 0xa6f7,
-	0xa700, 0xa78e,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xa7f8, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-	0xa8e0, 0xa8fb,
-	0xa900, 0xa953,
-	0xa95f, 0xa97c,
-	0xa980, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9df,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa7b,
-	0xaa80, 0xaac2,
-	0xaadb, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xd800, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbc1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe26,
-	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, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018a,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	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, 0x10855,
-	0x10857, 0x1085f,
-	0x10900, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a7f,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b7f,
-	0x10c00, 0x10c48,
-	0x10e60, 0x10e7e,
-	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-	0x11080, 0x110c1,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x11143,
-	0x11180, 0x111c8,
-	0x111d0, 0x111d9,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d1dd,
-	0x1d200, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	0x1f100, 0x1f10a,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f320,
-	0x1f330, 0x1f335,
-	0x1f337, 0x1f37c,
-	0x1f380, 0x1f393,
-	0x1f3a0, 0x1f3c4,
-	0x1f3c6, 0x1f3ca,
-	0x1f3e0, 0x1f3f0,
-	0x1f400, 0x1f43e,
-	0x1f440, 0x1f440,
-	0x1f442, 0x1f4f7,
-	0x1f4f9, 0x1f4fc,
-	0x1f500, 0x1f53d,
-	0x1f540, 0x1f543,
-	0x1f550, 0x1f567,
-	0x1f5fb, 0x1f640,
-	0x1f645, 0x1f64f,
-	0x1f680, 0x1f6c5,
-	0x1f700, 0x1f773,
-	0x1fffe, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_6_1 */
-
-/* 'In_Basic_Latin': Block */
-#define CR_In_Basic_Latin CR_ASCII
-
-/* 'In_Latin_1_Supplement': Block */
-static const OnigCodePoint CR_In_Latin_1_Supplement[] = {
-	1,
-	0x0080, 0x00ff,
-}; /* CR_In_Latin_1_Supplement */
-
-/* 'In_Latin_Extended_A': Block */
-static const OnigCodePoint CR_In_Latin_Extended_A[] = {
-	1,
-	0x0100, 0x017f,
-}; /* CR_In_Latin_Extended_A */
-
-/* 'In_Latin_Extended_B': Block */
-static const OnigCodePoint CR_In_Latin_Extended_B[] = {
-	1,
-	0x0180, 0x024f,
-}; /* CR_In_Latin_Extended_B */
-
-/* 'In_IPA_Extensions': Block */
-static const OnigCodePoint CR_In_IPA_Extensions[] = {
-	1,
-	0x0250, 0x02af,
-}; /* CR_In_IPA_Extensions */
-
-/* 'In_Spacing_Modifier_Letters': Block */
-static const OnigCodePoint CR_In_Spacing_Modifier_Letters[] = {
-	1,
-	0x02b0, 0x02ff,
-}; /* CR_In_Spacing_Modifier_Letters */
-
-/* 'In_Combining_Diacritical_Marks': Block */
-static const OnigCodePoint CR_In_Combining_Diacritical_Marks[] = {
-	1,
-	0x0300, 0x036f,
-}; /* CR_In_Combining_Diacritical_Marks */
-
-/* 'In_Greek_and_Coptic': Block */
-static const OnigCodePoint CR_In_Greek_and_Coptic[] = {
-	1,
-	0x0370, 0x03ff,
-}; /* CR_In_Greek_and_Coptic */
-
-/* 'In_Cyrillic': Block */
-static const OnigCodePoint CR_In_Cyrillic[] = {
-	1,
-	0x0400, 0x04ff,
-}; /* CR_In_Cyrillic */
-
-/* 'In_Cyrillic_Supplement': Block */
-static const OnigCodePoint CR_In_Cyrillic_Supplement[] = {
-	1,
-	0x0500, 0x052f,
-}; /* CR_In_Cyrillic_Supplement */
-
-/* 'In_Armenian': Block */
-static const OnigCodePoint CR_In_Armenian[] = {
-	1,
-	0x0530, 0x058f,
-}; /* CR_In_Armenian */
-
-/* 'In_Hebrew': Block */
-static const OnigCodePoint CR_In_Hebrew[] = {
-	1,
-	0x0590, 0x05ff,
-}; /* CR_In_Hebrew */
-
-/* 'In_Arabic': Block */
-static const OnigCodePoint CR_In_Arabic[] = {
-	1,
-	0x0600, 0x06ff,
-}; /* CR_In_Arabic */
-
-/* 'In_Syriac': Block */
-static const OnigCodePoint CR_In_Syriac[] = {
-	1,
-	0x0700, 0x074f,
-}; /* CR_In_Syriac */
-
-/* 'In_Arabic_Supplement': Block */
-static const OnigCodePoint CR_In_Arabic_Supplement[] = {
-	1,
-	0x0750, 0x077f,
-}; /* CR_In_Arabic_Supplement */
-
-/* 'In_Thaana': Block */
-static const OnigCodePoint CR_In_Thaana[] = {
-	1,
-	0x0780, 0x07bf,
-}; /* CR_In_Thaana */
-
-/* 'In_NKo': Block */
-static const OnigCodePoint CR_In_NKo[] = {
-	1,
-	0x07c0, 0x07ff,
-}; /* CR_In_NKo */
-
-/* 'In_Samaritan': Block */
-static const OnigCodePoint CR_In_Samaritan[] = {
-	1,
-	0x0800, 0x083f,
-}; /* CR_In_Samaritan */
-
-/* 'In_Mandaic': Block */
-static const OnigCodePoint CR_In_Mandaic[] = {
-	1,
-	0x0840, 0x085f,
-}; /* CR_In_Mandaic */
-
-/* 'In_Arabic_Extended_A': Block */
-static const OnigCodePoint CR_In_Arabic_Extended_A[] = {
-	1,
-	0x08a0, 0x08ff,
-}; /* CR_In_Arabic_Extended_A */
-
-/* 'In_Devanagari': Block */
-static const OnigCodePoint CR_In_Devanagari[] = {
-	1,
-	0x0900, 0x097f,
-}; /* CR_In_Devanagari */
-
-/* 'In_Bengali': Block */
-static const OnigCodePoint CR_In_Bengali[] = {
-	1,
-	0x0980, 0x09ff,
-}; /* CR_In_Bengali */
-
-/* 'In_Gurmukhi': Block */
-static const OnigCodePoint CR_In_Gurmukhi[] = {
-	1,
-	0x0a00, 0x0a7f,
-}; /* CR_In_Gurmukhi */
-
-/* 'In_Gujarati': Block */
-static const OnigCodePoint CR_In_Gujarati[] = {
-	1,
-	0x0a80, 0x0aff,
-}; /* CR_In_Gujarati */
-
-/* 'In_Oriya': Block */
-static const OnigCodePoint CR_In_Oriya[] = {
-	1,
-	0x0b00, 0x0b7f,
-}; /* CR_In_Oriya */
-
-/* 'In_Tamil': Block */
-static const OnigCodePoint CR_In_Tamil[] = {
-	1,
-	0x0b80, 0x0bff,
-}; /* CR_In_Tamil */
-
-/* 'In_Telugu': Block */
-static const OnigCodePoint CR_In_Telugu[] = {
-	1,
-	0x0c00, 0x0c7f,
-}; /* CR_In_Telugu */
-
-/* 'In_Kannada': Block */
-static const OnigCodePoint CR_In_Kannada[] = {
-	1,
-	0x0c80, 0x0cff,
-}; /* CR_In_Kannada */
-
-/* 'In_Malayalam': Block */
-static const OnigCodePoint CR_In_Malayalam[] = {
-	1,
-	0x0d00, 0x0d7f,
-}; /* CR_In_Malayalam */
-
-/* 'In_Sinhala': Block */
-static const OnigCodePoint CR_In_Sinhala[] = {
-	1,
-	0x0d80, 0x0dff,
-}; /* CR_In_Sinhala */
-
-/* 'In_Thai': Block */
-static const OnigCodePoint CR_In_Thai[] = {
-	1,
-	0x0e00, 0x0e7f,
-}; /* CR_In_Thai */
-
-/* 'In_Lao': Block */
-static const OnigCodePoint CR_In_Lao[] = {
-	1,
-	0x0e80, 0x0eff,
-}; /* CR_In_Lao */
-
-/* 'In_Tibetan': Block */
-static const OnigCodePoint CR_In_Tibetan[] = {
-	1,
-	0x0f00, 0x0fff,
-}; /* CR_In_Tibetan */
-
-/* 'In_Myanmar': Block */
-static const OnigCodePoint CR_In_Myanmar[] = {
-	1,
-	0x1000, 0x109f,
-}; /* CR_In_Myanmar */
-
-/* 'In_Georgian': Block */
-static const OnigCodePoint CR_In_Georgian[] = {
-	1,
-	0x10a0, 0x10ff,
-}; /* CR_In_Georgian */
-
-/* 'In_Hangul_Jamo': Block */
-static const OnigCodePoint CR_In_Hangul_Jamo[] = {
-	1,
-	0x1100, 0x11ff,
-}; /* CR_In_Hangul_Jamo */
-
-/* 'In_Ethiopic': Block */
-static const OnigCodePoint CR_In_Ethiopic[] = {
-	1,
-	0x1200, 0x137f,
-}; /* CR_In_Ethiopic */
-
-/* 'In_Ethiopic_Supplement': Block */
-static const OnigCodePoint CR_In_Ethiopic_Supplement[] = {
-	1,
-	0x1380, 0x139f,
-}; /* CR_In_Ethiopic_Supplement */
-
-/* 'In_Cherokee': Block */
-static const OnigCodePoint CR_In_Cherokee[] = {
-	1,
-	0x13a0, 0x13ff,
-}; /* CR_In_Cherokee */
-
-/* 'In_Unified_Canadian_Aboriginal_Syllabics': Block */
-static const OnigCodePoint CR_In_Unified_Canadian_Aboriginal_Syllabics[] = {
-	1,
-	0x1400, 0x167f,
-}; /* CR_In_Unified_Canadian_Aboriginal_Syllabics */
-
-/* 'In_Ogham': Block */
-static const OnigCodePoint CR_In_Ogham[] = {
-	1,
-	0x1680, 0x169f,
-}; /* CR_In_Ogham */
-
-/* 'In_Runic': Block */
-static const OnigCodePoint CR_In_Runic[] = {
-	1,
-	0x16a0, 0x16ff,
-}; /* CR_In_Runic */
-
-/* 'In_Tagalog': Block */
-static const OnigCodePoint CR_In_Tagalog[] = {
-	1,
-	0x1700, 0x171f,
-}; /* CR_In_Tagalog */
-
-/* 'In_Hanunoo': Block */
-static const OnigCodePoint CR_In_Hanunoo[] = {
-	1,
-	0x1720, 0x173f,
-}; /* CR_In_Hanunoo */
-
-/* 'In_Buhid': Block */
-static const OnigCodePoint CR_In_Buhid[] = {
-	1,
-	0x1740, 0x175f,
-}; /* CR_In_Buhid */
-
-/* 'In_Tagbanwa': Block */
-static const OnigCodePoint CR_In_Tagbanwa[] = {
-	1,
-	0x1760, 0x177f,
-}; /* CR_In_Tagbanwa */
-
-/* 'In_Khmer': Block */
-static const OnigCodePoint CR_In_Khmer[] = {
-	1,
-	0x1780, 0x17ff,
-}; /* CR_In_Khmer */
-
-/* 'In_Mongolian': Block */
-static const OnigCodePoint CR_In_Mongolian[] = {
-	1,
-	0x1800, 0x18af,
-}; /* CR_In_Mongolian */
-
-/* 'In_Unified_Canadian_Aboriginal_Syllabics_Extended': Block */
-static const OnigCodePoint CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended[] = {
-	1,
-	0x18b0, 0x18ff,
-}; /* CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended */
-
-/* 'In_Limbu': Block */
-static const OnigCodePoint CR_In_Limbu[] = {
-	1,
-	0x1900, 0x194f,
-}; /* CR_In_Limbu */
-
-/* 'In_Tai_Le': Block */
-static const OnigCodePoint CR_In_Tai_Le[] = {
-	1,
-	0x1950, 0x197f,
-}; /* CR_In_Tai_Le */
-
-/* 'In_New_Tai_Lue': Block */
-static const OnigCodePoint CR_In_New_Tai_Lue[] = {
-	1,
-	0x1980, 0x19df,
-}; /* CR_In_New_Tai_Lue */
-
-/* 'In_Khmer_Symbols': Block */
-static const OnigCodePoint CR_In_Khmer_Symbols[] = {
-	1,
-	0x19e0, 0x19ff,
-}; /* CR_In_Khmer_Symbols */
-
-/* 'In_Buginese': Block */
-static const OnigCodePoint CR_In_Buginese[] = {
-	1,
-	0x1a00, 0x1a1f,
-}; /* CR_In_Buginese */
-
-/* 'In_Tai_Tham': Block */
-static const OnigCodePoint CR_In_Tai_Tham[] = {
-	1,
-	0x1a20, 0x1aaf,
-}; /* CR_In_Tai_Tham */
-
-/* 'In_Balinese': Block */
-static const OnigCodePoint CR_In_Balinese[] = {
-	1,
-	0x1b00, 0x1b7f,
-}; /* CR_In_Balinese */
-
-/* 'In_Sundanese': Block */
-static const OnigCodePoint CR_In_Sundanese[] = {
-	1,
-	0x1b80, 0x1bbf,
-}; /* CR_In_Sundanese */
-
-/* 'In_Batak': Block */
-static const OnigCodePoint CR_In_Batak[] = {
-	1,
-	0x1bc0, 0x1bff,
-}; /* CR_In_Batak */
-
-/* 'In_Lepcha': Block */
-static const OnigCodePoint CR_In_Lepcha[] = {
-	1,
-	0x1c00, 0x1c4f,
-}; /* CR_In_Lepcha */
-
-/* 'In_Ol_Chiki': Block */
-#define CR_In_Ol_Chiki CR_Ol_Chiki
-
-/* 'In_Sundanese_Supplement': Block */
-static const OnigCodePoint CR_In_Sundanese_Supplement[] = {
-	1,
-	0x1cc0, 0x1ccf,
-}; /* CR_In_Sundanese_Supplement */
-
-/* 'In_Vedic_Extensions': Block */
-static const OnigCodePoint CR_In_Vedic_Extensions[] = {
-	1,
-	0x1cd0, 0x1cff,
-}; /* CR_In_Vedic_Extensions */
-
-/* 'In_Phonetic_Extensions': Block */
-static const OnigCodePoint CR_In_Phonetic_Extensions[] = {
-	1,
-	0x1d00, 0x1d7f,
-}; /* CR_In_Phonetic_Extensions */
-
-/* 'In_Phonetic_Extensions_Supplement': Block */
-static const OnigCodePoint CR_In_Phonetic_Extensions_Supplement[] = {
-	1,
-	0x1d80, 0x1dbf,
-}; /* CR_In_Phonetic_Extensions_Supplement */
-
-/* 'In_Combining_Diacritical_Marks_Supplement': Block */
-static const OnigCodePoint CR_In_Combining_Diacritical_Marks_Supplement[] = {
-	1,
-	0x1dc0, 0x1dff,
-}; /* CR_In_Combining_Diacritical_Marks_Supplement */
-
-/* 'In_Latin_Extended_Additional': Block */
-static const OnigCodePoint CR_In_Latin_Extended_Additional[] = {
-	1,
-	0x1e00, 0x1eff,
-}; /* CR_In_Latin_Extended_Additional */
-
-/* 'In_Greek_Extended': Block */
-static const OnigCodePoint CR_In_Greek_Extended[] = {
-	1,
-	0x1f00, 0x1fff,
-}; /* CR_In_Greek_Extended */
-
-/* 'In_General_Punctuation': Block */
-static const OnigCodePoint CR_In_General_Punctuation[] = {
-	1,
-	0x2000, 0x206f,
-}; /* CR_In_General_Punctuation */
-
-/* 'In_Superscripts_and_Subscripts': Block */
-static const OnigCodePoint CR_In_Superscripts_and_Subscripts[] = {
-	1,
-	0x2070, 0x209f,
-}; /* CR_In_Superscripts_and_Subscripts */
-
-/* 'In_Currency_Symbols': Block */
-static const OnigCodePoint CR_In_Currency_Symbols[] = {
-	1,
-	0x20a0, 0x20cf,
-}; /* CR_In_Currency_Symbols */
-
-/* 'In_Combining_Diacritical_Marks_for_Symbols': Block */
-static const OnigCodePoint CR_In_Combining_Diacritical_Marks_for_Symbols[] = {
-	1,
-	0x20d0, 0x20ff,
-}; /* CR_In_Combining_Diacritical_Marks_for_Symbols */
-
-/* 'In_Letterlike_Symbols': Block */
-static const OnigCodePoint CR_In_Letterlike_Symbols[] = {
-	1,
-	0x2100, 0x214f,
-}; /* CR_In_Letterlike_Symbols */
-
-/* 'In_Number_Forms': Block */
-static const OnigCodePoint CR_In_Number_Forms[] = {
-	1,
-	0x2150, 0x218f,
-}; /* CR_In_Number_Forms */
-
-/* 'In_Arrows': Block */
-static const OnigCodePoint CR_In_Arrows[] = {
-	1,
-	0x2190, 0x21ff,
-}; /* CR_In_Arrows */
-
-/* 'In_Mathematical_Operators': Block */
-static const OnigCodePoint CR_In_Mathematical_Operators[] = {
-	1,
-	0x2200, 0x22ff,
-}; /* CR_In_Mathematical_Operators */
-
-/* 'In_Miscellaneous_Technical': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Technical[] = {
-	1,
-	0x2300, 0x23ff,
-}; /* CR_In_Miscellaneous_Technical */
-
-/* 'In_Control_Pictures': Block */
-static const OnigCodePoint CR_In_Control_Pictures[] = {
-	1,
-	0x2400, 0x243f,
-}; /* CR_In_Control_Pictures */
-
-/* 'In_Optical_Character_Recognition': Block */
-static const OnigCodePoint CR_In_Optical_Character_Recognition[] = {
-	1,
-	0x2440, 0x245f,
-}; /* CR_In_Optical_Character_Recognition */
-
-/* 'In_Enclosed_Alphanumerics': Block */
-static const OnigCodePoint CR_In_Enclosed_Alphanumerics[] = {
-	1,
-	0x2460, 0x24ff,
-}; /* CR_In_Enclosed_Alphanumerics */
-
-/* 'In_Box_Drawing': Block */
-static const OnigCodePoint CR_In_Box_Drawing[] = {
-	1,
-	0x2500, 0x257f,
-}; /* CR_In_Box_Drawing */
-
-/* 'In_Block_Elements': Block */
-static const OnigCodePoint CR_In_Block_Elements[] = {
-	1,
-	0x2580, 0x259f,
-}; /* CR_In_Block_Elements */
-
-/* 'In_Geometric_Shapes': Block */
-static const OnigCodePoint CR_In_Geometric_Shapes[] = {
-	1,
-	0x25a0, 0x25ff,
-}; /* CR_In_Geometric_Shapes */
-
-/* 'In_Miscellaneous_Symbols': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Symbols[] = {
-	1,
-	0x2600, 0x26ff,
-}; /* CR_In_Miscellaneous_Symbols */
-
-/* 'In_Dingbats': Block */
-static const OnigCodePoint CR_In_Dingbats[] = {
-	1,
-	0x2700, 0x27bf,
-}; /* CR_In_Dingbats */
-
-/* 'In_Miscellaneous_Mathematical_Symbols_A': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Mathematical_Symbols_A[] = {
-	1,
-	0x27c0, 0x27ef,
-}; /* CR_In_Miscellaneous_Mathematical_Symbols_A */
-
-/* 'In_Supplemental_Arrows_A': Block */
-static const OnigCodePoint CR_In_Supplemental_Arrows_A[] = {
-	1,
-	0x27f0, 0x27ff,
-}; /* CR_In_Supplemental_Arrows_A */
-
-/* 'In_Braille_Patterns': Block */
-#define CR_In_Braille_Patterns CR_Braille
-
-/* 'In_Supplemental_Arrows_B': Block */
-static const OnigCodePoint CR_In_Supplemental_Arrows_B[] = {
-	1,
-	0x2900, 0x297f,
-}; /* CR_In_Supplemental_Arrows_B */
-
-/* 'In_Miscellaneous_Mathematical_Symbols_B': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Mathematical_Symbols_B[] = {
-	1,
-	0x2980, 0x29ff,
-}; /* CR_In_Miscellaneous_Mathematical_Symbols_B */
-
-/* 'In_Supplemental_Mathematical_Operators': Block */
-static const OnigCodePoint CR_In_Supplemental_Mathematical_Operators[] = {
-	1,
-	0x2a00, 0x2aff,
-}; /* CR_In_Supplemental_Mathematical_Operators */
-
-/* 'In_Miscellaneous_Symbols_and_Arrows': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Symbols_and_Arrows[] = {
-	1,
-	0x2b00, 0x2bff,
-}; /* CR_In_Miscellaneous_Symbols_and_Arrows */
-
-/* 'In_Glagolitic': Block */
-static const OnigCodePoint CR_In_Glagolitic[] = {
-	1,
-	0x2c00, 0x2c5f,
-}; /* CR_In_Glagolitic */
-
-/* 'In_Latin_Extended_C': Block */
-static const OnigCodePoint CR_In_Latin_Extended_C[] = {
-	1,
-	0x2c60, 0x2c7f,
-}; /* CR_In_Latin_Extended_C */
-
-/* 'In_Coptic': Block */
-static const OnigCodePoint CR_In_Coptic[] = {
-	1,
-	0x2c80, 0x2cff,
-}; /* CR_In_Coptic */
-
-/* 'In_Georgian_Supplement': Block */
-static const OnigCodePoint CR_In_Georgian_Supplement[] = {
-	1,
-	0x2d00, 0x2d2f,
-}; /* CR_In_Georgian_Supplement */
-
-/* 'In_Tifinagh': Block */
-static const OnigCodePoint CR_In_Tifinagh[] = {
-	1,
-	0x2d30, 0x2d7f,
-}; /* CR_In_Tifinagh */
-
-/* 'In_Ethiopic_Extended': Block */
-static const OnigCodePoint CR_In_Ethiopic_Extended[] = {
-	1,
-	0x2d80, 0x2ddf,
-}; /* CR_In_Ethiopic_Extended */
-
-/* 'In_Cyrillic_Extended_A': Block */
-static const OnigCodePoint CR_In_Cyrillic_Extended_A[] = {
-	1,
-	0x2de0, 0x2dff,
-}; /* CR_In_Cyrillic_Extended_A */
-
-/* 'In_Supplemental_Punctuation': Block */
-static const OnigCodePoint CR_In_Supplemental_Punctuation[] = {
-	1,
-	0x2e00, 0x2e7f,
-}; /* CR_In_Supplemental_Punctuation */
-
-/* 'In_CJK_Radicals_Supplement': Block */
-static const OnigCodePoint CR_In_CJK_Radicals_Supplement[] = {
-	1,
-	0x2e80, 0x2eff,
-}; /* CR_In_CJK_Radicals_Supplement */
-
-/* 'In_Kangxi_Radicals': Block */
-static const OnigCodePoint CR_In_Kangxi_Radicals[] = {
-	1,
-	0x2f00, 0x2fdf,
-}; /* CR_In_Kangxi_Radicals */
-
-/* 'In_Ideographic_Description_Characters': Block */
-static const OnigCodePoint CR_In_Ideographic_Description_Characters[] = {
-	1,
-	0x2ff0, 0x2fff,
-}; /* CR_In_Ideographic_Description_Characters */
-
-/* 'In_CJK_Symbols_and_Punctuation': Block */
-static const OnigCodePoint CR_In_CJK_Symbols_and_Punctuation[] = {
-	1,
-	0x3000, 0x303f,
-}; /* CR_In_CJK_Symbols_and_Punctuation */
-
-/* 'In_Hiragana': Block */
-static const OnigCodePoint CR_In_Hiragana[] = {
-	1,
-	0x3040, 0x309f,
-}; /* CR_In_Hiragana */
-
-/* 'In_Katakana': Block */
-static const OnigCodePoint CR_In_Katakana[] = {
-	1,
-	0x30a0, 0x30ff,
-}; /* CR_In_Katakana */
-
-/* 'In_Bopomofo': Block */
-static const OnigCodePoint CR_In_Bopomofo[] = {
-	1,
-	0x3100, 0x312f,
-}; /* CR_In_Bopomofo */
-
-/* 'In_Hangul_Compatibility_Jamo': Block */
-static const OnigCodePoint CR_In_Hangul_Compatibility_Jamo[] = {
-	1,
-	0x3130, 0x318f,
-}; /* CR_In_Hangul_Compatibility_Jamo */
-
-/* 'In_Kanbun': Block */
-static const OnigCodePoint CR_In_Kanbun[] = {
-	1,
-	0x3190, 0x319f,
-}; /* CR_In_Kanbun */
-
-/* 'In_Bopomofo_Extended': Block */
-static const OnigCodePoint CR_In_Bopomofo_Extended[] = {
-	1,
-	0x31a0, 0x31bf,
-}; /* CR_In_Bopomofo_Extended */
-
-/* 'In_CJK_Strokes': Block */
-static const OnigCodePoint CR_In_CJK_Strokes[] = {
-	1,
-	0x31c0, 0x31ef,
-}; /* CR_In_CJK_Strokes */
-
-/* 'In_Katakana_Phonetic_Extensions': Block */
-static const OnigCodePoint CR_In_Katakana_Phonetic_Extensions[] = {
-	1,
-	0x31f0, 0x31ff,
-}; /* CR_In_Katakana_Phonetic_Extensions */
-
-/* 'In_Enclosed_CJK_Letters_and_Months': Block */
-static const OnigCodePoint CR_In_Enclosed_CJK_Letters_and_Months[] = {
-	1,
-	0x3200, 0x32ff,
-}; /* CR_In_Enclosed_CJK_Letters_and_Months */
-
-/* 'In_CJK_Compatibility': Block */
-static const OnigCodePoint CR_In_CJK_Compatibility[] = {
-	1,
-	0x3300, 0x33ff,
-}; /* CR_In_CJK_Compatibility */
-
-/* 'In_CJK_Unified_Ideographs_Extension_A': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_A[] = {
-	1,
-	0x3400, 0x4dbf,
-}; /* CR_In_CJK_Unified_Ideographs_Extension_A */
-
-/* 'In_Yijing_Hexagram_Symbols': Block */
-static const OnigCodePoint CR_In_Yijing_Hexagram_Symbols[] = {
-	1,
-	0x4dc0, 0x4dff,
-}; /* CR_In_Yijing_Hexagram_Symbols */
-
-/* 'In_CJK_Unified_Ideographs': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs[] = {
-	1,
-	0x4e00, 0x9fff,
-}; /* CR_In_CJK_Unified_Ideographs */
-
-/* 'In_Yi_Syllables': Block */
-static const OnigCodePoint CR_In_Yi_Syllables[] = {
-	1,
-	0xa000, 0xa48f,
-}; /* CR_In_Yi_Syllables */
-
-/* 'In_Yi_Radicals': Block */
-static const OnigCodePoint CR_In_Yi_Radicals[] = {
-	1,
-	0xa490, 0xa4cf,
-}; /* CR_In_Yi_Radicals */
-
-/* 'In_Lisu': Block */
-#define CR_In_Lisu CR_Lisu
-
-/* 'In_Vai': Block */
-static const OnigCodePoint CR_In_Vai[] = {
-	1,
-	0xa500, 0xa63f,
-}; /* CR_In_Vai */
-
-/* 'In_Cyrillic_Extended_B': Block */
-static const OnigCodePoint CR_In_Cyrillic_Extended_B[] = {
-	1,
-	0xa640, 0xa69f,
-}; /* CR_In_Cyrillic_Extended_B */
-
-/* 'In_Bamum': Block */
-static const OnigCodePoint CR_In_Bamum[] = {
-	1,
-	0xa6a0, 0xa6ff,
-}; /* CR_In_Bamum */
-
-/* 'In_Modifier_Tone_Letters': Block */
-static const OnigCodePoint CR_In_Modifier_Tone_Letters[] = {
-	1,
-	0xa700, 0xa71f,
-}; /* CR_In_Modifier_Tone_Letters */
-
-/* 'In_Latin_Extended_D': Block */
-static const OnigCodePoint CR_In_Latin_Extended_D[] = {
-	1,
-	0xa720, 0xa7ff,
-}; /* CR_In_Latin_Extended_D */
-
-/* 'In_Syloti_Nagri': Block */
-static const OnigCodePoint CR_In_Syloti_Nagri[] = {
-	1,
-	0xa800, 0xa82f,
-}; /* CR_In_Syloti_Nagri */
-
-/* 'In_Common_Indic_Number_Forms': Block */
-static const OnigCodePoint CR_In_Common_Indic_Number_Forms[] = {
-	1,
-	0xa830, 0xa83f,
-}; /* CR_In_Common_Indic_Number_Forms */
-
-/* 'In_Phags_pa': Block */
-static const OnigCodePoint CR_In_Phags_pa[] = {
-	1,
-	0xa840, 0xa87f,
-}; /* CR_In_Phags_pa */
-
-/* 'In_Saurashtra': Block */
-static const OnigCodePoint CR_In_Saurashtra[] = {
-	1,
-	0xa880, 0xa8df,
-}; /* CR_In_Saurashtra */
-
-/* 'In_Devanagari_Extended': Block */
-static const OnigCodePoint CR_In_Devanagari_Extended[] = {
-	1,
-	0xa8e0, 0xa8ff,
-}; /* CR_In_Devanagari_Extended */
-
-/* 'In_Kayah_Li': Block */
-#define CR_In_Kayah_Li CR_Kayah_Li
-
-/* 'In_Rejang': Block */
-static const OnigCodePoint CR_In_Rejang[] = {
-	1,
-	0xa930, 0xa95f,
-}; /* CR_In_Rejang */
-
-/* 'In_Hangul_Jamo_Extended_A': Block */
-static const OnigCodePoint CR_In_Hangul_Jamo_Extended_A[] = {
-	1,
-	0xa960, 0xa97f,
-}; /* CR_In_Hangul_Jamo_Extended_A */
-
-/* 'In_Javanese': Block */
-static const OnigCodePoint CR_In_Javanese[] = {
-	1,
-	0xa980, 0xa9df,
-}; /* CR_In_Javanese */
-
-/* 'In_Cham': Block */
-static const OnigCodePoint CR_In_Cham[] = {
-	1,
-	0xaa00, 0xaa5f,
-}; /* CR_In_Cham */
-
-/* 'In_Myanmar_Extended_A': Block */
-static const OnigCodePoint CR_In_Myanmar_Extended_A[] = {
-	1,
-	0xaa60, 0xaa7f,
-}; /* CR_In_Myanmar_Extended_A */
-
-/* 'In_Tai_Viet': Block */
-static const OnigCodePoint CR_In_Tai_Viet[] = {
-	1,
-	0xaa80, 0xaadf,
-}; /* CR_In_Tai_Viet */
-
-/* 'In_Meetei_Mayek_Extensions': Block */
-static const OnigCodePoint CR_In_Meetei_Mayek_Extensions[] = {
-	1,
-	0xaae0, 0xaaff,
-}; /* CR_In_Meetei_Mayek_Extensions */
-
-/* 'In_Ethiopic_Extended_A': Block */
-static const OnigCodePoint CR_In_Ethiopic_Extended_A[] = {
-	1,
-	0xab00, 0xab2f,
-}; /* CR_In_Ethiopic_Extended_A */
-
-/* 'In_Meetei_Mayek': Block */
-static const OnigCodePoint CR_In_Meetei_Mayek[] = {
-	1,
-	0xabc0, 0xabff,
-}; /* CR_In_Meetei_Mayek */
-
-/* 'In_Hangul_Syllables': Block */
-static const OnigCodePoint CR_In_Hangul_Syllables[] = {
-	1,
-	0xac00, 0xd7af,
-}; /* CR_In_Hangul_Syllables */
-
-/* 'In_Hangul_Jamo_Extended_B': Block */
-static const OnigCodePoint CR_In_Hangul_Jamo_Extended_B[] = {
-	1,
-	0xd7b0, 0xd7ff,
-}; /* CR_In_Hangul_Jamo_Extended_B */
-
-/* 'In_High_Surrogates': Block */
-static const OnigCodePoint CR_In_High_Surrogates[] = {
-	1,
-	0xd800, 0xdb7f,
-}; /* CR_In_High_Surrogates */
-
-/* 'In_High_Private_Use_Surrogates': Block */
-static const OnigCodePoint CR_In_High_Private_Use_Surrogates[] = {
-	1,
-	0xdb80, 0xdbff,
-}; /* CR_In_High_Private_Use_Surrogates */
-
-/* 'In_Low_Surrogates': Block */
-static const OnigCodePoint CR_In_Low_Surrogates[] = {
-	1,
-	0xdc00, 0xdfff,
-}; /* CR_In_Low_Surrogates */
-
-/* 'In_Private_Use_Area': Block */
-static const OnigCodePoint CR_In_Private_Use_Area[] = {
-	1,
-	0xe000, 0xf8ff,
-}; /* CR_In_Private_Use_Area */
-
-/* 'In_CJK_Compatibility_Ideographs': Block */
-static const OnigCodePoint CR_In_CJK_Compatibility_Ideographs[] = {
-	1,
-	0xf900, 0xfaff,
-}; /* CR_In_CJK_Compatibility_Ideographs */
-
-/* 'In_Alphabetic_Presentation_Forms': Block */
-static const OnigCodePoint CR_In_Alphabetic_Presentation_Forms[] = {
-	1,
-	0xfb00, 0xfb4f,
-}; /* CR_In_Alphabetic_Presentation_Forms */
-
-/* 'In_Arabic_Presentation_Forms_A': Block */
-static const OnigCodePoint CR_In_Arabic_Presentation_Forms_A[] = {
-	1,
-	0xfb50, 0xfdff,
-}; /* CR_In_Arabic_Presentation_Forms_A */
-
-/* 'In_Variation_Selectors': Block */
-static const OnigCodePoint CR_In_Variation_Selectors[] = {
-	1,
-	0xfe00, 0xfe0f,
-}; /* CR_In_Variation_Selectors */
-
-/* 'In_Vertical_Forms': Block */
-static const OnigCodePoint CR_In_Vertical_Forms[] = {
-	1,
-	0xfe10, 0xfe1f,
-}; /* CR_In_Vertical_Forms */
-
-/* 'In_Combining_Half_Marks': Block */
-static const OnigCodePoint CR_In_Combining_Half_Marks[] = {
-	1,
-	0xfe20, 0xfe2f,
-}; /* CR_In_Combining_Half_Marks */
-
-/* 'In_CJK_Compatibility_Forms': Block */
-static const OnigCodePoint CR_In_CJK_Compatibility_Forms[] = {
-	1,
-	0xfe30, 0xfe4f,
-}; /* CR_In_CJK_Compatibility_Forms */
-
-/* 'In_Small_Form_Variants': Block */
-static const OnigCodePoint CR_In_Small_Form_Variants[] = {
-	1,
-	0xfe50, 0xfe6f,
-}; /* CR_In_Small_Form_Variants */
-
-/* 'In_Arabic_Presentation_Forms_B': Block */
-static const OnigCodePoint CR_In_Arabic_Presentation_Forms_B[] = {
-	1,
-	0xfe70, 0xfeff,
-}; /* CR_In_Arabic_Presentation_Forms_B */
-
-/* 'In_Halfwidth_and_Fullwidth_Forms': Block */
-static const OnigCodePoint CR_In_Halfwidth_and_Fullwidth_Forms[] = {
-	1,
-	0xff00, 0xffef,
-}; /* CR_In_Halfwidth_and_Fullwidth_Forms */
-
-/* 'In_Specials': Block */
-static const OnigCodePoint CR_In_Specials[] = {
-	1,
-	0xfff0, 0xffff,
-}; /* CR_In_Specials */
-
-/* 'In_Linear_B_Syllabary': Block */
-static const OnigCodePoint CR_In_Linear_B_Syllabary[] = {
-	1,
-	0x10000, 0x1007f,
-}; /* CR_In_Linear_B_Syllabary */
-
-/* 'In_Linear_B_Ideograms': Block */
-static const OnigCodePoint CR_In_Linear_B_Ideograms[] = {
-	1,
-	0x10080, 0x100ff,
-}; /* CR_In_Linear_B_Ideograms */
-
-/* 'In_Aegean_Numbers': Block */
-static const OnigCodePoint CR_In_Aegean_Numbers[] = {
-	1,
-	0x10100, 0x1013f,
-}; /* CR_In_Aegean_Numbers */
-
-/* 'In_Ancient_Greek_Numbers': Block */
-static const OnigCodePoint CR_In_Ancient_Greek_Numbers[] = {
-	1,
-	0x10140, 0x1018f,
-}; /* CR_In_Ancient_Greek_Numbers */
-
-/* 'In_Ancient_Symbols': Block */
-static const OnigCodePoint CR_In_Ancient_Symbols[] = {
-	1,
-	0x10190, 0x101cf,
-}; /* CR_In_Ancient_Symbols */
-
-/* 'In_Phaistos_Disc': Block */
-static const OnigCodePoint CR_In_Phaistos_Disc[] = {
-	1,
-	0x101d0, 0x101ff,
-}; /* CR_In_Phaistos_Disc */
-
-/* 'In_Lycian': Block */
-static const OnigCodePoint CR_In_Lycian[] = {
-	1,
-	0x10280, 0x1029f,
-}; /* CR_In_Lycian */
-
-/* 'In_Carian': Block */
-static const OnigCodePoint CR_In_Carian[] = {
-	1,
-	0x102a0, 0x102df,
-}; /* CR_In_Carian */
-
-/* 'In_Old_Italic': Block */
-static const OnigCodePoint CR_In_Old_Italic[] = {
-	1,
-	0x10300, 0x1032f,
-}; /* CR_In_Old_Italic */
-
-/* 'In_Gothic': Block */
-static const OnigCodePoint CR_In_Gothic[] = {
-	1,
-	0x10330, 0x1034f,
-}; /* CR_In_Gothic */
-
-/* 'In_Ugaritic': Block */
-static const OnigCodePoint CR_In_Ugaritic[] = {
-	1,
-	0x10380, 0x1039f,
-}; /* CR_In_Ugaritic */
-
-/* 'In_Old_Persian': Block */
-static const OnigCodePoint CR_In_Old_Persian[] = {
-	1,
-	0x103a0, 0x103df,
-}; /* CR_In_Old_Persian */
-
-/* 'In_Deseret': Block */
-#define CR_In_Deseret CR_Deseret
-
-/* 'In_Shavian': Block */
-#define CR_In_Shavian CR_Shavian
-
-/* 'In_Osmanya': Block */
-static const OnigCodePoint CR_In_Osmanya[] = {
-	1,
-	0x10480, 0x104af,
-}; /* CR_In_Osmanya */
-
-/* 'In_Cypriot_Syllabary': Block */
-static const OnigCodePoint CR_In_Cypriot_Syllabary[] = {
-	1,
-	0x10800, 0x1083f,
-}; /* CR_In_Cypriot_Syllabary */
-
-/* 'In_Imperial_Aramaic': Block */
-static const OnigCodePoint CR_In_Imperial_Aramaic[] = {
-	1,
-	0x10840, 0x1085f,
-}; /* CR_In_Imperial_Aramaic */
-
-/* 'In_Phoenician': Block */
-static const OnigCodePoint CR_In_Phoenician[] = {
-	1,
-	0x10900, 0x1091f,
-}; /* CR_In_Phoenician */
-
-/* 'In_Lydian': Block */
-static const OnigCodePoint CR_In_Lydian[] = {
-	1,
-	0x10920, 0x1093f,
-}; /* CR_In_Lydian */
-
-/* 'In_Meroitic_Hieroglyphs': Block */
-#define CR_In_Meroitic_Hieroglyphs CR_Meroitic_Hieroglyphs
-
-/* 'In_Meroitic_Cursive': Block */
-static const OnigCodePoint CR_In_Meroitic_Cursive[] = {
-	1,
-	0x109a0, 0x109ff,
-}; /* CR_In_Meroitic_Cursive */
-
-/* 'In_Kharoshthi': Block */
-static const OnigCodePoint CR_In_Kharoshthi[] = {
-	1,
-	0x10a00, 0x10a5f,
-}; /* CR_In_Kharoshthi */
-
-/* 'In_Old_South_Arabian': Block */
-#define CR_In_Old_South_Arabian CR_Old_South_Arabian
-
-/* 'In_Avestan': Block */
-static const OnigCodePoint CR_In_Avestan[] = {
-	1,
-	0x10b00, 0x10b3f,
-}; /* CR_In_Avestan */
-
-/* 'In_Inscriptional_Parthian': Block */
-static const OnigCodePoint CR_In_Inscriptional_Parthian[] = {
-	1,
-	0x10b40, 0x10b5f,
-}; /* CR_In_Inscriptional_Parthian */
-
-/* 'In_Inscriptional_Pahlavi': Block */
-static const OnigCodePoint CR_In_Inscriptional_Pahlavi[] = {
-	1,
-	0x10b60, 0x10b7f,
-}; /* CR_In_Inscriptional_Pahlavi */
-
-/* 'In_Old_Turkic': Block */
-static const OnigCodePoint CR_In_Old_Turkic[] = {
-	1,
-	0x10c00, 0x10c4f,
-}; /* CR_In_Old_Turkic */
-
-/* 'In_Rumi_Numeral_Symbols': Block */
-static const OnigCodePoint CR_In_Rumi_Numeral_Symbols[] = {
-	1,
-	0x10e60, 0x10e7f,
-}; /* CR_In_Rumi_Numeral_Symbols */
-
-/* 'In_Brahmi': Block */
-static const OnigCodePoint CR_In_Brahmi[] = {
-	1,
-	0x11000, 0x1107f,
-}; /* CR_In_Brahmi */
-
-/* 'In_Kaithi': Block */
-static const OnigCodePoint CR_In_Kaithi[] = {
-	1,
-	0x11080, 0x110cf,
-}; /* CR_In_Kaithi */
-
-/* 'In_Sora_Sompeng': Block */
-static const OnigCodePoint CR_In_Sora_Sompeng[] = {
-	1,
-	0x110d0, 0x110ff,
-}; /* CR_In_Sora_Sompeng */
-
-/* 'In_Chakma': Block */
-static const OnigCodePoint CR_In_Chakma[] = {
-	1,
-	0x11100, 0x1114f,
-}; /* CR_In_Chakma */
-
-/* 'In_Sharada': Block */
-static const OnigCodePoint CR_In_Sharada[] = {
-	1,
-	0x11180, 0x111df,
-}; /* CR_In_Sharada */
-
-/* 'In_Takri': Block */
-static const OnigCodePoint CR_In_Takri[] = {
-	1,
-	0x11680, 0x116cf,
-}; /* CR_In_Takri */
-
-/* 'In_Cuneiform': Block */
-static const OnigCodePoint CR_In_Cuneiform[] = {
-	1,
-	0x12000, 0x123ff,
-}; /* CR_In_Cuneiform */
-
-/* 'In_Cuneiform_Numbers_and_Punctuation': Block */
-static const OnigCodePoint CR_In_Cuneiform_Numbers_and_Punctuation[] = {
-	1,
-	0x12400, 0x1247f,
-}; /* CR_In_Cuneiform_Numbers_and_Punctuation */
-
-/* 'In_Egyptian_Hieroglyphs': Block */
-static const OnigCodePoint CR_In_Egyptian_Hieroglyphs[] = {
-	1,
-	0x13000, 0x1342f,
-}; /* CR_In_Egyptian_Hieroglyphs */
-
-/* 'In_Bamum_Supplement': Block */
-static const OnigCodePoint CR_In_Bamum_Supplement[] = {
-	1,
-	0x16800, 0x16a3f,
-}; /* CR_In_Bamum_Supplement */
-
-/* 'In_Miao': Block */
-static const OnigCodePoint CR_In_Miao[] = {
-	1,
-	0x16f00, 0x16f9f,
-}; /* CR_In_Miao */
-
-/* 'In_Kana_Supplement': Block */
-static const OnigCodePoint CR_In_Kana_Supplement[] = {
-	1,
-	0x1b000, 0x1b0ff,
-}; /* CR_In_Kana_Supplement */
-
-/* 'In_Byzantine_Musical_Symbols': Block */
-static const OnigCodePoint CR_In_Byzantine_Musical_Symbols[] = {
-	1,
-	0x1d000, 0x1d0ff,
-}; /* CR_In_Byzantine_Musical_Symbols */
-
-/* 'In_Musical_Symbols': Block */
-static const OnigCodePoint CR_In_Musical_Symbols[] = {
-	1,
-	0x1d100, 0x1d1ff,
-}; /* CR_In_Musical_Symbols */
-
-/* 'In_Ancient_Greek_Musical_Notation': Block */
-static const OnigCodePoint CR_In_Ancient_Greek_Musical_Notation[] = {
-	1,
-	0x1d200, 0x1d24f,
-}; /* CR_In_Ancient_Greek_Musical_Notation */
-
-/* 'In_Tai_Xuan_Jing_Symbols': Block */
-static const OnigCodePoint CR_In_Tai_Xuan_Jing_Symbols[] = {
-	1,
-	0x1d300, 0x1d35f,
-}; /* CR_In_Tai_Xuan_Jing_Symbols */
-
-/* 'In_Counting_Rod_Numerals': Block */
-static const OnigCodePoint CR_In_Counting_Rod_Numerals[] = {
-	1,
-	0x1d360, 0x1d37f,
-}; /* CR_In_Counting_Rod_Numerals */
-
-/* 'In_Mathematical_Alphanumeric_Symbols': Block */
-static const OnigCodePoint CR_In_Mathematical_Alphanumeric_Symbols[] = {
-	1,
-	0x1d400, 0x1d7ff,
-}; /* CR_In_Mathematical_Alphanumeric_Symbols */
-
-/* 'In_Arabic_Mathematical_Alphabetic_Symbols': Block */
-static const OnigCodePoint CR_In_Arabic_Mathematical_Alphabetic_Symbols[] = {
-	1,
-	0x1ee00, 0x1eeff,
-}; /* CR_In_Arabic_Mathematical_Alphabetic_Symbols */
-
-/* 'In_Mahjong_Tiles': Block */
-static const OnigCodePoint CR_In_Mahjong_Tiles[] = {
-	1,
-	0x1f000, 0x1f02f,
-}; /* CR_In_Mahjong_Tiles */
-
-/* 'In_Domino_Tiles': Block */
-static const OnigCodePoint CR_In_Domino_Tiles[] = {
-	1,
-	0x1f030, 0x1f09f,
-}; /* CR_In_Domino_Tiles */
-
-/* 'In_Playing_Cards': Block */
-static const OnigCodePoint CR_In_Playing_Cards[] = {
-	1,
-	0x1f0a0, 0x1f0ff,
-}; /* CR_In_Playing_Cards */
-
-/* 'In_Enclosed_Alphanumeric_Supplement': Block */
-static const OnigCodePoint CR_In_Enclosed_Alphanumeric_Supplement[] = {
-	1,
-	0x1f100, 0x1f1ff,
-}; /* CR_In_Enclosed_Alphanumeric_Supplement */
-
-/* 'In_Enclosed_Ideographic_Supplement': Block */
-static const OnigCodePoint CR_In_Enclosed_Ideographic_Supplement[] = {
-	1,
-	0x1f200, 0x1f2ff,
-}; /* CR_In_Enclosed_Ideographic_Supplement */
-
-/* 'In_Miscellaneous_Symbols_And_Pictographs': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Symbols_And_Pictographs[] = {
-	1,
-	0x1f300, 0x1f5ff,
-}; /* CR_In_Miscellaneous_Symbols_And_Pictographs */
-
-/* 'In_Emoticons': Block */
-static const OnigCodePoint CR_In_Emoticons[] = {
-	1,
-	0x1f600, 0x1f64f,
-}; /* CR_In_Emoticons */
-
-/* 'In_Transport_And_Map_Symbols': Block */
-static const OnigCodePoint CR_In_Transport_And_Map_Symbols[] = {
-	1,
-	0x1f680, 0x1f6ff,
-}; /* CR_In_Transport_And_Map_Symbols */
-
-/* 'In_Alchemical_Symbols': Block */
-static const OnigCodePoint CR_In_Alchemical_Symbols[] = {
-	1,
-	0x1f700, 0x1f77f,
-}; /* CR_In_Alchemical_Symbols */
-
-/* 'In_CJK_Unified_Ideographs_Extension_B': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_B[] = {
-	1,
-	0x20000, 0x2a6df,
-}; /* CR_In_CJK_Unified_Ideographs_Extension_B */
-
-/* 'In_CJK_Unified_Ideographs_Extension_C': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_C[] = {
-	1,
-	0x2a700, 0x2b73f,
-}; /* CR_In_CJK_Unified_Ideographs_Extension_C */
-
-/* 'In_CJK_Unified_Ideographs_Extension_D': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_D[] = {
-	1,
-	0x2b740, 0x2b81f,
-}; /* CR_In_CJK_Unified_Ideographs_Extension_D */
-
-/* 'In_CJK_Compatibility_Ideographs_Supplement': Block */
-static const OnigCodePoint CR_In_CJK_Compatibility_Ideographs_Supplement[] = {
-	1,
-	0x2f800, 0x2fa1f,
-}; /* CR_In_CJK_Compatibility_Ideographs_Supplement */
-
-/* 'In_Tags': Block */
-static const OnigCodePoint CR_In_Tags[] = {
-	1,
-	0xe0000, 0xe007f,
-}; /* CR_In_Tags */
-
-/* 'In_Variation_Selectors_Supplement': Block */
-static const OnigCodePoint CR_In_Variation_Selectors_Supplement[] = {
-	1,
-	0xe0100, 0xe01ef,
-}; /* CR_In_Variation_Selectors_Supplement */
-
-/* 'In_Supplementary_Private_Use_Area_A': Block */
-static const OnigCodePoint CR_In_Supplementary_Private_Use_Area_A[] = {
-	1,
-	0xf0000, 0xfffff,
-}; /* CR_In_Supplementary_Private_Use_Area_A */
-
-/* 'In_Supplementary_Private_Use_Area_B': Block */
-static const OnigCodePoint CR_In_Supplementary_Private_Use_Area_B[] = {
-	1,
-	0x100000, 0x10ffff,
-}; /* CR_In_Supplementary_Private_Use_Area_B */
-
-/* 'In_No_Block': Block */
-static const OnigCodePoint CR_In_No_Block[] = {
-	36,
-	0x0860, 0x089f,
-	0x1ab0, 0x1aff,
-	0x1c80, 0x1cbf,
-	0x2fe0, 0x2fef,
-	0xa9e0, 0xa9ff,
-	0xab30, 0xabbf,
-	0x10200, 0x1027f,
-	0x102e0, 0x102ff,
-	0x10350, 0x1037f,
-	0x103e0, 0x103ff,
-	0x104b0, 0x107ff,
-	0x10860, 0x108ff,
-	0x10940, 0x1097f,
-	0x10a80, 0x10aff,
-	0x10b80, 0x10bff,
-	0x10c50, 0x10e5f,
-	0x10e80, 0x10fff,
-	0x11150, 0x1117f,
-	0x111e0, 0x1167f,
-	0x116d0, 0x11fff,
-	0x12480, 0x12fff,
-	0x13430, 0x167ff,
-	0x16a40, 0x16eff,
-	0x16fa0, 0x1afff,
-	0x1b100, 0x1cfff,
-	0x1d250, 0x1d2ff,
-	0x1d380, 0x1d3ff,
-	0x1d800, 0x1edff,
-	0x1ef00, 0x1efff,
-	0x1f650, 0x1f67f,
-	0x1f780, 0x1ffff,
-	0x2a6e0, 0x2a6ff,
-	0x2b820, 0x2f7ff,
-	0x2fa20, 0xdffff,
-	0xe0080, 0xe00ff,
-	0xe01f0, 0xeffff,
-}; /* CR_In_No_Block */
-#endif /* USE_UNICODE_PROPERTIES */
-
-static const OnigCodePoint* const CodeRanges[] = {
-  CR_NEWLINE,
-  CR_Alpha,
-  CR_Blank,
-  CR_Cntrl,
-  CR_Digit,
-  CR_Graph,
-  CR_Lower,
-  CR_Print,
-  CR_Punct,
-  CR_Space,
-  CR_Upper,
-  CR_XDigit,
-  CR_Word,
-  CR_Alnum,
-  CR_ASCII,
-#ifdef USE_UNICODE_PROPERTIES
-  CR_Any,
-  CR_Assigned,
-  CR_C,
-  CR_Cc,
-  CR_Cf,
-  CR_Cn,
-  CR_Co,
-  CR_Cs,
-  CR_L,
-  CR_LC,
-  CR_Ll,
-  CR_Lm,
-  CR_Lo,
-  CR_Lt,
-  CR_Lu,
-  CR_M,
-  CR_Mc,
-  CR_Me,
-  CR_Mn,
-  CR_N,
-  CR_Nd,
-  CR_Nl,
-  CR_No,
-  CR_P,
-  CR_Pc,
-  CR_Pd,
-  CR_Pe,
-  CR_Pf,
-  CR_Pi,
-  CR_Po,
-  CR_Ps,
-  CR_S,
-  CR_Sc,
-  CR_Sk,
-  CR_Sm,
-  CR_So,
-  CR_Z,
-  CR_Zl,
-  CR_Zp,
-  CR_Zs,
-  CR_Math,
-  CR_Alphabetic,
-  CR_Lowercase,
-  CR_Uppercase,
-  CR_Cased,
-  CR_Case_Ignorable,
-  CR_Changes_When_Lowercased,
-  CR_Changes_When_Uppercased,
-  CR_Changes_When_Titlecased,
-  CR_Changes_When_Casefolded,
-  CR_Changes_When_Casemapped,
-  CR_ID_Start,
-  CR_ID_Continue,
-  CR_XID_Start,
-  CR_XID_Continue,
-  CR_Default_Ignorable_Code_Point,
-  CR_Grapheme_Extend,
-  CR_Grapheme_Base,
-  CR_Grapheme_Link,
-  CR_Common,
-  CR_Latin,
-  CR_Greek,
-  CR_Cyrillic,
-  CR_Armenian,
-  CR_Hebrew,
-  CR_Arabic,
-  CR_Syriac,
-  CR_Thaana,
-  CR_Devanagari,
-  CR_Bengali,
-  CR_Gurmukhi,
-  CR_Gujarati,
-  CR_Oriya,
-  CR_Tamil,
-  CR_Telugu,
-  CR_Kannada,
-  CR_Malayalam,
-  CR_Sinhala,
-  CR_Thai,
-  CR_Lao,
-  CR_Tibetan,
-  CR_Myanmar,
-  CR_Georgian,
-  CR_Hangul,
-  CR_Ethiopic,
-  CR_Cherokee,
-  CR_Canadian_Aboriginal,
-  CR_Ogham,
-  CR_Runic,
-  CR_Khmer,
-  CR_Mongolian,
-  CR_Hiragana,
-  CR_Katakana,
-  CR_Bopomofo,
-  CR_Han,
-  CR_Yi,
-  CR_Old_Italic,
-  CR_Gothic,
-  CR_Deseret,
-  CR_Inherited,
-  CR_Tagalog,
-  CR_Hanunoo,
-  CR_Buhid,
-  CR_Tagbanwa,
-  CR_Limbu,
-  CR_Tai_Le,
-  CR_Linear_B,
-  CR_Ugaritic,
-  CR_Shavian,
-  CR_Osmanya,
-  CR_Cypriot,
-  CR_Braille,
-  CR_Buginese,
-  CR_Coptic,
-  CR_New_Tai_Lue,
-  CR_Glagolitic,
-  CR_Tifinagh,
-  CR_Syloti_Nagri,
-  CR_Old_Persian,
-  CR_Kharoshthi,
-  CR_Balinese,
-  CR_Cuneiform,
-  CR_Phoenician,
-  CR_Phags_Pa,
-  CR_Nko,
-  CR_Sundanese,
-  CR_Lepcha,
-  CR_Ol_Chiki,
-  CR_Vai,
-  CR_Saurashtra,
-  CR_Kayah_Li,
-  CR_Rejang,
-  CR_Lycian,
-  CR_Carian,
-  CR_Lydian,
-  CR_Cham,
-  CR_Tai_Tham,
-  CR_Tai_Viet,
-  CR_Avestan,
-  CR_Egyptian_Hieroglyphs,
-  CR_Samaritan,
-  CR_Lisu,
-  CR_Bamum,
-  CR_Javanese,
-  CR_Meetei_Mayek,
-  CR_Imperial_Aramaic,
-  CR_Old_South_Arabian,
-  CR_Inscriptional_Parthian,
-  CR_Inscriptional_Pahlavi,
-  CR_Old_Turkic,
-  CR_Kaithi,
-  CR_Batak,
-  CR_Brahmi,
-  CR_Mandaic,
-  CR_Chakma,
-  CR_Meroitic_Cursive,
-  CR_Meroitic_Hieroglyphs,
-  CR_Miao,
-  CR_Sharada,
-  CR_Sora_Sompeng,
-  CR_Takri,
-  CR_White_Space,
-  CR_Bidi_Control,
-  CR_Join_Control,
-  CR_Dash,
-  CR_Hyphen,
-  CR_Quotation_Mark,
-  CR_Terminal_Punctuation,
-  CR_Other_Math,
-  CR_Hex_Digit,
-  CR_ASCII_Hex_Digit,
-  CR_Other_Alphabetic,
-  CR_Ideographic,
-  CR_Diacritic,
-  CR_Extender,
-  CR_Other_Lowercase,
-  CR_Other_Uppercase,
-  CR_Noncharacter_Code_Point,
-  CR_Other_Grapheme_Extend,
-  CR_IDS_Binary_Operator,
-  CR_IDS_Trinary_Operator,
-  CR_Radical,
-  CR_Unified_Ideograph,
-  CR_Other_Default_Ignorable_Code_Point,
-  CR_Deprecated,
-  CR_Soft_Dotted,
-  CR_Logical_Order_Exception,
-  CR_Other_ID_Start,
-  CR_Other_ID_Continue,
-  CR_STerm,
-  CR_Variation_Selector,
-  CR_Pattern_White_Space,
-  CR_Pattern_Syntax,
-  CR_Unknown,
-  CR_Age_1_1,
-  CR_Age_2_0,
-  CR_Age_2_1,
-  CR_Age_3_0,
-  CR_Age_3_1,
-  CR_Age_3_2,
-  CR_Age_4_0,
-  CR_Age_4_1,
-  CR_Age_5_0,
-  CR_Age_5_1,
-  CR_Age_5_2,
-  CR_Age_6_0,
-  CR_Age_6_1,
-  CR_In_Basic_Latin,
-  CR_In_Latin_1_Supplement,
-  CR_In_Latin_Extended_A,
-  CR_In_Latin_Extended_B,
-  CR_In_IPA_Extensions,
-  CR_In_Spacing_Modifier_Letters,
-  CR_In_Combining_Diacritical_Marks,
-  CR_In_Greek_and_Coptic,
-  CR_In_Cyrillic,
-  CR_In_Cyrillic_Supplement,
-  CR_In_Armenian,
-  CR_In_Hebrew,
-  CR_In_Arabic,
-  CR_In_Syriac,
-  CR_In_Arabic_Supplement,
-  CR_In_Thaana,
-  CR_In_NKo,
-  CR_In_Samaritan,
-  CR_In_Mandaic,
-  CR_In_Arabic_Extended_A,
-  CR_In_Devanagari,
-  CR_In_Bengali,
-  CR_In_Gurmukhi,
-  CR_In_Gujarati,
-  CR_In_Oriya,
-  CR_In_Tamil,
-  CR_In_Telugu,
-  CR_In_Kannada,
-  CR_In_Malayalam,
-  CR_In_Sinhala,
-  CR_In_Thai,
-  CR_In_Lao,
-  CR_In_Tibetan,
-  CR_In_Myanmar,
-  CR_In_Georgian,
-  CR_In_Hangul_Jamo,
-  CR_In_Ethiopic,
-  CR_In_Ethiopic_Supplement,
-  CR_In_Cherokee,
-  CR_In_Unified_Canadian_Aboriginal_Syllabics,
-  CR_In_Ogham,
-  CR_In_Runic,
-  CR_In_Tagalog,
-  CR_In_Hanunoo,
-  CR_In_Buhid,
-  CR_In_Tagbanwa,
-  CR_In_Khmer,
-  CR_In_Mongolian,
-  CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended,
-  CR_In_Limbu,
-  CR_In_Tai_Le,
-  CR_In_New_Tai_Lue,
-  CR_In_Khmer_Symbols,
-  CR_In_Buginese,
-  CR_In_Tai_Tham,
-  CR_In_Balinese,
-  CR_In_Sundanese,
-  CR_In_Batak,
-  CR_In_Lepcha,
-  CR_In_Ol_Chiki,
-  CR_In_Sundanese_Supplement,
-  CR_In_Vedic_Extensions,
-  CR_In_Phonetic_Extensions,
-  CR_In_Phonetic_Extensions_Supplement,
-  CR_In_Combining_Diacritical_Marks_Supplement,
-  CR_In_Latin_Extended_Additional,
-  CR_In_Greek_Extended,
-  CR_In_General_Punctuation,
-  CR_In_Superscripts_and_Subscripts,
-  CR_In_Currency_Symbols,
-  CR_In_Combining_Diacritical_Marks_for_Symbols,
-  CR_In_Letterlike_Symbols,
-  CR_In_Number_Forms,
-  CR_In_Arrows,
-  CR_In_Mathematical_Operators,
-  CR_In_Miscellaneous_Technical,
-  CR_In_Control_Pictures,
-  CR_In_Optical_Character_Recognition,
-  CR_In_Enclosed_Alphanumerics,
-  CR_In_Box_Drawing,
-  CR_In_Block_Elements,
-  CR_In_Geometric_Shapes,
-  CR_In_Miscellaneous_Symbols,
-  CR_In_Dingbats,
-  CR_In_Miscellaneous_Mathematical_Symbols_A,
-  CR_In_Supplemental_Arrows_A,
-  CR_In_Braille_Patterns,
-  CR_In_Supplemental_Arrows_B,
-  CR_In_Miscellaneous_Mathematical_Symbols_B,
-  CR_In_Supplemental_Mathematical_Operators,
-  CR_In_Miscellaneous_Symbols_and_Arrows,
-  CR_In_Glagolitic,
-  CR_In_Latin_Extended_C,
-  CR_In_Coptic,
-  CR_In_Georgian_Supplement,
-  CR_In_Tifinagh,
-  CR_In_Ethiopic_Extended,
-  CR_In_Cyrillic_Extended_A,
-  CR_In_Supplemental_Punctuation,
-  CR_In_CJK_Radicals_Supplement,
-  CR_In_Kangxi_Radicals,
-  CR_In_Ideographic_Description_Characters,
-  CR_In_CJK_Symbols_and_Punctuation,
-  CR_In_Hiragana,
-  CR_In_Katakana,
-  CR_In_Bopomofo,
-  CR_In_Hangul_Compatibility_Jamo,
-  CR_In_Kanbun,
-  CR_In_Bopomofo_Extended,
-  CR_In_CJK_Strokes,
-  CR_In_Katakana_Phonetic_Extensions,
-  CR_In_Enclosed_CJK_Letters_and_Months,
-  CR_In_CJK_Compatibility,
-  CR_In_CJK_Unified_Ideographs_Extension_A,
-  CR_In_Yijing_Hexagram_Symbols,
-  CR_In_CJK_Unified_Ideographs,
-  CR_In_Yi_Syllables,
-  CR_In_Yi_Radicals,
-  CR_In_Lisu,
-  CR_In_Vai,
-  CR_In_Cyrillic_Extended_B,
-  CR_In_Bamum,
-  CR_In_Modifier_Tone_Letters,
-  CR_In_Latin_Extended_D,
-  CR_In_Syloti_Nagri,
-  CR_In_Common_Indic_Number_Forms,
-  CR_In_Phags_pa,
-  CR_In_Saurashtra,
-  CR_In_Devanagari_Extended,
-  CR_In_Kayah_Li,
-  CR_In_Rejang,
-  CR_In_Hangul_Jamo_Extended_A,
-  CR_In_Javanese,
-  CR_In_Cham,
-  CR_In_Myanmar_Extended_A,
-  CR_In_Tai_Viet,
-  CR_In_Meetei_Mayek_Extensions,
-  CR_In_Ethiopic_Extended_A,
-  CR_In_Meetei_Mayek,
-  CR_In_Hangul_Syllables,
-  CR_In_Hangul_Jamo_Extended_B,
-  CR_In_High_Surrogates,
-  CR_In_High_Private_Use_Surrogates,
-  CR_In_Low_Surrogates,
-  CR_In_Private_Use_Area,
-  CR_In_CJK_Compatibility_Ideographs,
-  CR_In_Alphabetic_Presentation_Forms,
-  CR_In_Arabic_Presentation_Forms_A,
-  CR_In_Variation_Selectors,
-  CR_In_Vertical_Forms,
-  CR_In_Combining_Half_Marks,
-  CR_In_CJK_Compatibility_Forms,
-  CR_In_Small_Form_Variants,
-  CR_In_Arabic_Presentation_Forms_B,
-  CR_In_Halfwidth_and_Fullwidth_Forms,
-  CR_In_Specials,
-  CR_In_Linear_B_Syllabary,
-  CR_In_Linear_B_Ideograms,
-  CR_In_Aegean_Numbers,
-  CR_In_Ancient_Greek_Numbers,
-  CR_In_Ancient_Symbols,
-  CR_In_Phaistos_Disc,
-  CR_In_Lycian,
-  CR_In_Carian,
-  CR_In_Old_Italic,
-  CR_In_Gothic,
-  CR_In_Ugaritic,
-  CR_In_Old_Persian,
-  CR_In_Deseret,
-  CR_In_Shavian,
-  CR_In_Osmanya,
-  CR_In_Cypriot_Syllabary,
-  CR_In_Imperial_Aramaic,
-  CR_In_Phoenician,
-  CR_In_Lydian,
-  CR_In_Meroitic_Hieroglyphs,
-  CR_In_Meroitic_Cursive,
-  CR_In_Kharoshthi,
-  CR_In_Old_South_Arabian,
-  CR_In_Avestan,
-  CR_In_Inscriptional_Parthian,
-  CR_In_Inscriptional_Pahlavi,
-  CR_In_Old_Turkic,
-  CR_In_Rumi_Numeral_Symbols,
-  CR_In_Brahmi,
-  CR_In_Kaithi,
-  CR_In_Sora_Sompeng,
-  CR_In_Chakma,
-  CR_In_Sharada,
-  CR_In_Takri,
-  CR_In_Cuneiform,
-  CR_In_Cuneiform_Numbers_and_Punctuation,
-  CR_In_Egyptian_Hieroglyphs,
-  CR_In_Bamum_Supplement,
-  CR_In_Miao,
-  CR_In_Kana_Supplement,
-  CR_In_Byzantine_Musical_Symbols,
-  CR_In_Musical_Symbols,
-  CR_In_Ancient_Greek_Musical_Notation,
-  CR_In_Tai_Xuan_Jing_Symbols,
-  CR_In_Counting_Rod_Numerals,
-  CR_In_Mathematical_Alphanumeric_Symbols,
-  CR_In_Arabic_Mathematical_Alphabetic_Symbols,
-  CR_In_Mahjong_Tiles,
-  CR_In_Domino_Tiles,
-  CR_In_Playing_Cards,
-  CR_In_Enclosed_Alphanumeric_Supplement,
-  CR_In_Enclosed_Ideographic_Supplement,
-  CR_In_Miscellaneous_Symbols_And_Pictographs,
-  CR_In_Emoticons,
-  CR_In_Transport_And_Map_Symbols,
-  CR_In_Alchemical_Symbols,
-  CR_In_CJK_Unified_Ideographs_Extension_B,
-  CR_In_CJK_Unified_Ideographs_Extension_C,
-  CR_In_CJK_Unified_Ideographs_Extension_D,
-  CR_In_CJK_Compatibility_Ideographs_Supplement,
-  CR_In_Tags,
-  CR_In_Variation_Selectors_Supplement,
-  CR_In_Supplementary_Private_Use_Area_A,
-  CR_In_Supplementary_Private_Use_Area_B,
-  CR_In_No_Block,
-#endif /* USE_UNICODE_PROPERTIES */
-};
-struct uniname2ctype_struct {
-  int name, ctype;
-};
-
-static const struct uniname2ctype_struct *uniname2ctype_p(const char *, unsigned int);
-%}
-struct uniname2ctype_struct;
-%%
-alpha,                                     1
-blank,                                     2
-cntrl,                                     3
-digit,                                     4
-graph,                                     5
-lower,                                     6
-print,                                     7
-punct,                                     8
-space,                                     9
-upper,                                    10
-xdigit,                                   11
-word,                                     12
-alnum,                                    13
-ascii,                                    14
-#ifdef USE_UNICODE_PROPERTIES
-any,                                      15
-assigned,                                 16
-c,                                        17
-cc,                                       18
-cf,                                       19
-cn,                                       20
-co,                                       21
-cs,                                       22
-l,                                        23
-lc,                                       24
-ll,                                       25
-lm,                                       26
-lo,                                       27
-lt,                                       28
-lu,                                       29
-m,                                        30
-mc,                                       31
-me,                                       32
-mn,                                       33
-n,                                        34
-nd,                                       35
-nl,                                       36
-no,                                       37
-p,                                        38
-pc,                                       39
-pd,                                       40
-pe,                                       41
-pf,                                       42
-pi,                                       43
-po,                                       44
-ps,                                       45
-s,                                        46
-sc,                                       47
-sk,                                       48
-sm,                                       49
-so,                                       50
-z,                                        51
-zl,                                       52
-zp,                                       53
-zs,                                       54
-math,                                     55
-alphabetic,                               56
-lowercase,                                57
-uppercase,                                58
-cased,                                    59
-caseignorable,                            60
-changeswhenlowercased,                    61
-changeswhenuppercased,                    62
-changeswhentitlecased,                    63
-changeswhencasefolded,                    64
-changeswhencasemapped,                    65
-idstart,                                  66
-idcontinue,                               67
-xidstart,                                 68
-xidcontinue,                              69
-defaultignorablecodepoint,                70
-graphemeextend,                           71
-graphemebase,                             72
-graphemelink,                             73
-common,                                   74
-latin,                                    75
-greek,                                    76
-cyrillic,                                 77
-armenian,                                 78
-hebrew,                                   79
-arabic,                                   80
-syriac,                                   81
-thaana,                                   82
-devanagari,                               83
-bengali,                                  84
-gurmukhi,                                 85
-gujarati,                                 86
-oriya,                                    87
-tamil,                                    88
-telugu,                                   89
-kannada,                                  90
-malayalam,                                91
-sinhala,                                  92
-thai,                                     93
-lao,                                      94
-tibetan,                                  95
-myanmar,                                  96
-georgian,                                 97
-hangul,                                   98
-ethiopic,                                 99
-cherokee,                                100
-canadianaboriginal,                      101
-ogham,                                   102
-runic,                                   103
-khmer,                                   104
-mongolian,                               105
-hiragana,                                106
-katakana,                                107
-bopomofo,                                108
-han,                                     109
-yi,                                      110
-olditalic,                               111
-gothic,                                  112
-deseret,                                 113
-inherited,                               114
-tagalog,                                 115
-hanunoo,                                 116
-buhid,                                   117
-tagbanwa,                                118
-limbu,                                   119
-taile,                                   120
-linearb,                                 121
-ugaritic,                                122
-shavian,                                 123
-osmanya,                                 124
-cypriot,                                 125
-braille,                                 126
-buginese,                                127
-coptic,                                  128
-newtailue,                               129
-glagolitic,                              130
-tifinagh,                                131
-sylotinagri,                             132
-oldpersian,                              133
-kharoshthi,                              134
-balinese,                                135
-cuneiform,                               136
-phoenician,                              137
-phagspa,                                 138
-nko,                                     139
-sundanese,                               140
-lepcha,                                  141
-olchiki,                                 142
-vai,                                     143
-saurashtra,                              144
-kayahli,                                 145
-rejang,                                  146
-lycian,                                  147
-carian,                                  148
-lydian,                                  149
-cham,                                    150
-taitham,                                 151
-taiviet,                                 152
-avestan,                                 153
-egyptianhieroglyphs,                     154
-samaritan,                               155
-lisu,                                    156
-bamum,                                   157
-javanese,                                158
-meeteimayek,                             159
-imperialaramaic,                         160
-oldsoutharabian,                         161
-inscriptionalparthian,                   162
-inscriptionalpahlavi,                    163
-oldturkic,                               164
-kaithi,                                  165
-batak,                                   166
-brahmi,                                  167
-mandaic,                                 168
-chakma,                                  169
-meroiticcursive,                         170
-meroitichieroglyphs,                     171
-miao,                                    172
-sharada,                                 173
-sorasompeng,                             174
-takri,                                   175
-whitespace,                              176
-bidicontrol,                             177
-joincontrol,                             178
-dash,                                    179
-hyphen,                                  180
-quotationmark,                           181
-terminalpunctuation,                     182
-othermath,                               183
-hexdigit,                                184
-asciihexdigit,                           185
-otheralphabetic,                         186
-ideographic,                             187
-diacritic,                               188
-extender,                                189
-otherlowercase,                          190
-otheruppercase,                          191
-noncharactercodepoint,                   192
-othergraphemeextend,                     193
-idsbinaryoperator,                       194
-idstrinaryoperator,                      195
-radical,                                 196
-unifiedideograph,                        197
-otherdefaultignorablecodepoint,          198
-deprecated,                              199
-softdotted,                              200
-logicalorderexception,                   201
-otheridstart,                            202
-otheridcontinue,                         203
-sterm,                                   204
-variationselector,                       205
-patternwhitespace,                       206
-patternsyntax,                           207
-unknown,                                 208
-ahex,                                    185
-bidic,                                   177
-ci,                                       60
-cwcf,                                     64
-cwcm,                                     65
-cwl,                                      61
-cwt,                                      63
-cwu,                                      62
-dep,                                     199
-di,                                       70
-dia,                                     188
-ext,                                     189
-grbase,                                   72
-grext,                                    71
-grlink,                                   73
-hex,                                     184
-idc,                                      67
-ideo,                                    187
-ids,                                      66
-idsb,                                    194
-idst,                                    195
-joinc,                                   178
-loe,                                     201
-nchar,                                   192
-oalpha,                                  186
-odi,                                     198
-ogrext,                                  193
-oidc,                                    203
-oids,                                    202
-olower,                                  190
-omath,                                   183
-oupper,                                  191
-patsyn,                                  207
-patws,                                   206
-qmark,                                   181
-sd,                                      200
-term,                                    182
-uideo,                                   197
-vs,                                      205
-wspace,                                  176
-xidc,                                     69
-xids,                                     68
-other,                                    17
-control,                                  18
-format,                                   19
-unassigned,                               20
-privateuse,                               21
-surrogate,                                22
-letter,                                   23
-casedletter,                              24
-lowercaseletter,                          25
-modifierletter,                           26
-otherletter,                              27
-titlecaseletter,                          28
-uppercaseletter,                          29
-mark,                                     30
-combiningmark,                            30
-spacingmark,                              31
-enclosingmark,                            32
-nonspacingmark,                           33
-number,                                   34
-decimalnumber,                            35
-letternumber,                             36
-othernumber,                              37
-punctuation,                              38
-connectorpunctuation,                     39
-dashpunctuation,                          40
-closepunctuation,                         41
-finalpunctuation,                         42
-initialpunctuation,                       43
-otherpunctuation,                         44
-openpunctuation,                          45
-symbol,                                   46
-currencysymbol,                           47
-modifiersymbol,                           48
-mathsymbol,                               49
-othersymbol,                              50
-separator,                                51
-lineseparator,                            52
-paragraphseparator,                       53
-spaceseparator,                           54
-arab,                                     80
-armi,                                    160
-armn,                                     78
-avst,                                    153
-bali,                                    135
-bamu,                                    157
-batk,                                    166
-beng,                                     84
-bopo,                                    108
-brah,                                    167
-brai,                                    126
-bugi,                                    127
-buhd,                                    117
-cakm,                                    169
-cans,                                    101
-cari,                                    148
-cher,                                    100
-copt,                                    128
-qaac,                                    128
-cprt,                                    125
-cyrl,                                     77
-deva,                                     83
-dsrt,                                    113
-egyp,                                    154
-ethi,                                     99
-geor,                                     97
-glag,                                    130
-goth,                                    112
-grek,                                     76
-gujr,                                     86
-guru,                                     85
-hang,                                     98
-hani,                                    109
-hano,                                    116
-hebr,                                     79
-hira,                                    106
-ital,                                    111
-java,                                    158
-kali,                                    145
-kana,                                    107
-khar,                                    134
-khmr,                                    104
-knda,                                     90
-kthi,                                    165
-lana,                                    151
-laoo,                                     94
-latn,                                     75
-lepc,                                    141
-limb,                                    119
-linb,                                    121
-lyci,                                    147
-lydi,                                    149
-mand,                                    168
-merc,                                    170
-mero,                                    171
-mlym,                                     91
-mong,                                    105
-mtei,                                    159
-mymr,                                     96
-nkoo,                                    139
-ogam,                                    102
-olck,                                    142
-orkh,                                    164
-orya,                                     87
-osma,                                    124
-phag,                                    138
-phli,                                    163
-phnx,                                    137
-plrd,                                    172
-prti,                                    162
-rjng,                                    146
-runr,                                    103
-samr,                                    155
-sarb,                                    161
-saur,                                    144
-shaw,                                    123
-shrd,                                    173
-sinh,                                     92
-sora,                                    174
-sund,                                    140
-sylo,                                    132
-syrc,                                     81
-tagb,                                    118
-takr,                                    175
-tale,                                    120
-talu,                                    129
-taml,                                     88
-tavt,                                    152
-telu,                                     89
-tfng,                                    131
-tglg,                                    115
-thaa,                                     82
-tibt,                                     95
-ugar,                                    122
-vaii,                                    143
-xpeo,                                    133
-xsux,                                    136
-yiii,                                    110
-zinh,                                    114
-qaai,                                    114
-zyyy,                                     74
-zzzz,                                    208
-age=1.1,                                 209
-age=2.0,                                 210
-age=2.1,                                 211
-age=3.0,                                 212
-age=3.1,                                 213
-age=3.2,                                 214
-age=4.0,                                 215
-age=4.1,                                 216
-age=5.0,                                 217
-age=5.1,                                 218
-age=5.2,                                 219
-age=6.0,                                 220
-age=6.1,                                 221
-inbasiclatin,                            222
-inlatin1supplement,                      223
-inlatinextendeda,                        224
-inlatinextendedb,                        225
-inipaextensions,                         226
-inspacingmodifierletters,                227
-incombiningdiacriticalmarks,             228
-ingreekandcoptic,                        229
-incyrillic,                              230
-incyrillicsupplement,                    231
-inarmenian,                              232
-inhebrew,                                233
-inarabic,                                234
-insyriac,                                235
-inarabicsupplement,                      236
-inthaana,                                237
-innko,                                   238
-insamaritan,                             239
-inmandaic,                               240
-inarabicextendeda,                       241
-indevanagari,                            242
-inbengali,                               243
-ingurmukhi,                              244
-ingujarati,                              245
-inoriya,                                 246
-intamil,                                 247
-intelugu,                                248
-inkannada,                               249
-inmalayalam,                             250
-insinhala,                               251
-inthai,                                  252
-inlao,                                   253
-intibetan,                               254
-inmyanmar,                               255
-ingeorgian,                              256
-inhanguljamo,                            257
-inethiopic,                              258
-inethiopicsupplement,                    259
-incherokee,                              260
-inunifiedcanadianaboriginalsyllabics,    261
-inogham,                                 262
-inrunic,                                 263
-intagalog,                               264
-inhanunoo,                               265
-inbuhid,                                 266
-intagbanwa,                              267
-inkhmer,                                 268
-inmongolian,                             269
-inunifiedcanadianaboriginalsyllabicsextended, 270
-inlimbu,                                 271
-intaile,                                 272
-innewtailue,                             273
-inkhmersymbols,                          274
-inbuginese,                              275
-intaitham,                               276
-inbalinese,                              277
-insundanese,                             278
-inbatak,                                 279
-inlepcha,                                280
-inolchiki,                               281
-insundanesesupplement,                   282
-invedicextensions,                       283
-inphoneticextensions,                    284
-inphoneticextensionssupplement,          285
-incombiningdiacriticalmarkssupplement,   286
-inlatinextendedadditional,               287
-ingreekextended,                         288
-ingeneralpunctuation,                    289
-insuperscriptsandsubscripts,             290
-incurrencysymbols,                       291
-incombiningdiacriticalmarksforsymbols,   292
-inletterlikesymbols,                     293
-innumberforms,                           294
-inarrows,                                295
-inmathematicaloperators,                 296
-inmiscellaneoustechnical,                297
-incontrolpictures,                       298
-inopticalcharacterrecognition,           299
-inenclosedalphanumerics,                 300
-inboxdrawing,                            301
-inblockelements,                         302
-ingeometricshapes,                       303
-inmiscellaneoussymbols,                  304
-indingbats,                              305
-inmiscellaneousmathematicalsymbolsa,     306
-insupplementalarrowsa,                   307
-inbraillepatterns,                       308
-insupplementalarrowsb,                   309
-inmiscellaneousmathematicalsymbolsb,     310
-insupplementalmathematicaloperators,     311
-inmiscellaneoussymbolsandarrows,         312
-inglagolitic,                            313
-inlatinextendedc,                        314
-incoptic,                                315
-ingeorgiansupplement,                    316
-intifinagh,                              317
-inethiopicextended,                      318
-incyrillicextendeda,                     319
-insupplementalpunctuation,               320
-incjkradicalssupplement,                 321
-inkangxiradicals,                        322
-inideographicdescriptioncharacters,      323
-incjksymbolsandpunctuation,              324
-inhiragana,                              325
-inkatakana,                              326
-inbopomofo,                              327
-inhangulcompatibilityjamo,               328
-inkanbun,                                329
-inbopomofoextended,                      330
-incjkstrokes,                            331
-inkatakanaphoneticextensions,            332
-inenclosedcjklettersandmonths,           333
-incjkcompatibility,                      334
-incjkunifiedideographsextensiona,        335
-inyijinghexagramsymbols,                 336
-incjkunifiedideographs,                  337
-inyisyllables,                           338
-inyiradicals,                            339
-inlisu,                                  340
-invai,                                   341
-incyrillicextendedb,                     342
-inbamum,                                 343
-inmodifiertoneletters,                   344
-inlatinextendedd,                        345
-insylotinagri,                           346
-incommonindicnumberforms,                347
-inphagspa,                               348
-insaurashtra,                            349
-indevanagariextended,                    350
-inkayahli,                               351
-inrejang,                                352
-inhanguljamoextendeda,                   353
-injavanese,                              354
-incham,                                  355
-inmyanmarextendeda,                      356
-intaiviet,                               357
-inmeeteimayekextensions,                 358
-inethiopicextendeda,                     359
-inmeeteimayek,                           360
-inhangulsyllables,                       361
-inhanguljamoextendedb,                   362
-inhighsurrogates,                        363
-inhighprivateusesurrogates,              364
-inlowsurrogates,                         365
-inprivateusearea,                        366
-incjkcompatibilityideographs,            367
-inalphabeticpresentationforms,           368
-inarabicpresentationformsa,              369
-invariationselectors,                    370
-inverticalforms,                         371
-incombininghalfmarks,                    372
-incjkcompatibilityforms,                 373
-insmallformvariants,                     374
-inarabicpresentationformsb,              375
-inhalfwidthandfullwidthforms,            376
-inspecials,                              377
-inlinearbsyllabary,                      378
-inlinearbideograms,                      379
-inaegeannumbers,                         380
-inancientgreeknumbers,                   381
-inancientsymbols,                        382
-inphaistosdisc,                          383
-inlycian,                                384
-incarian,                                385
-inolditalic,                             386
-ingothic,                                387
-inugaritic,                              388
-inoldpersian,                            389
-indeseret,                               390
-inshavian,                               391
-inosmanya,                               392
-incypriotsyllabary,                      393
-inimperialaramaic,                       394
-inphoenician,                            395
-inlydian,                                396
-inmeroitichieroglyphs,                   397
-inmeroiticcursive,                       398
-inkharoshthi,                            399
-inoldsoutharabian,                       400
-inavestan,                               401
-ininscriptionalparthian,                 402
-ininscriptionalpahlavi,                  403
-inoldturkic,                             404
-inruminumeralsymbols,                    405
-inbrahmi,                                406
-inkaithi,                                407
-insorasompeng,                           408
-inchakma,                                409
-insharada,                               410
-intakri,                                 411
-incuneiform,                             412
-incuneiformnumbersandpunctuation,        413
-inegyptianhieroglyphs,                   414
-inbamumsupplement,                       415
-inmiao,                                  416
-inkanasupplement,                        417
-inbyzantinemusicalsymbols,               418
-inmusicalsymbols,                        419
-inancientgreekmusicalnotation,           420
-intaixuanjingsymbols,                    421
-incountingrodnumerals,                   422
-inmathematicalalphanumericsymbols,       423
-inarabicmathematicalalphabeticsymbols,   424
-inmahjongtiles,                          425
-indominotiles,                           426
-inplayingcards,                          427
-inenclosedalphanumericsupplement,        428
-inenclosedideographicsupplement,         429
-inmiscellaneoussymbolsandpictographs,    430
-inemoticons,                             431
-intransportandmapsymbols,                432
-inalchemicalsymbols,                     433
-incjkunifiedideographsextensionb,        434
-incjkunifiedideographsextensionc,        435
-incjkunifiedideographsextensiond,        436
-incjkcompatibilityideographssupplement,  437
-intags,                                  438
-invariationselectorssupplement,          439
-insupplementaryprivateuseareaa,          440
-insupplementaryprivateuseareab,          441
-innoblock,                               442
-#endif /* USE_UNICODE_PROPERTIES */
-%%
-static int
-uniname2ctype(const UChar *name, unsigned int len)
-{
-  const struct uniname2ctype_struct *p = uniname2ctype_p((const char *)name, len);
-  if (p) return p->ctype;
-  return -1;
-}
diff --git a/enc/unicode/name2ctype.src b/enc/unicode/name2ctype.src
deleted file mode 100644
index ff94d68b3b..0000000000
--- a/enc/unicode/name2ctype.src
+++ /dev/null
@@ -1,26550 +0,0 @@
-%{
-#define long size_t
-
-/* 'NEWLINE': [[:NEWLINE:]] */
-static const OnigCodePoint CR_NEWLINE[] = {
-	1,
-	0x000a, 0x000a,
-}; /* CR_NEWLINE */
-
-/* 'Alpha': [[:Alpha:]] */
-static const OnigCodePoint CR_Alpha[] = {
-	540,
-	0x0041, 0x005a,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00b5, 0x00b5,
-	0x00ba, 0x00ba,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x02c1,
-	0x02c6, 0x02d1,
-	0x02e0, 0x02e4,
-	0x02ec, 0x02ec,
-	0x02ee, 0x02ee,
-	0x0345, 0x0345,
-	0x0370, 0x0374,
-	0x0376, 0x0377,
-	0x037a, 0x037d,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x048a, 0x0527,
-	0x0531, 0x0556,
-	0x0559, 0x0559,
-	0x0561, 0x0587,
-	0x05b0, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0610, 0x061a,
-	0x0620, 0x0657,
-	0x0659, 0x065f,
-	0x066e, 0x06d3,
-	0x06d5, 0x06dc,
-	0x06e1, 0x06e8,
-	0x06ed, 0x06ef,
-	0x06fa, 0x06fc,
-	0x06ff, 0x06ff,
-	0x0710, 0x073f,
-	0x074d, 0x07b1,
-	0x07ca, 0x07ea,
-	0x07f4, 0x07f5,
-	0x07fa, 0x07fa,
-	0x0800, 0x0817,
-	0x081a, 0x082c,
-	0x0840, 0x0858,
-	0x08a0, 0x08a0,
-	0x08a2, 0x08ac,
-	0x08e4, 0x08e9,
-	0x08f0, 0x08fe,
-	0x0900, 0x093b,
-	0x093d, 0x094c,
-	0x094e, 0x0950,
-	0x0955, 0x0963,
-	0x0971, 0x0977,
-	0x0979, 0x097f,
-	0x0981, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bd, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cc,
-	0x09ce, 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,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4c,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a70, 0x0a75,
-	0x0a81, 0x0a83,
-	0x0a85, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abd, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acc,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae3,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3d, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4c,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	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, 0x0bcc,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4c,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c82, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbd, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccc,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0cf1, 0x0cf2,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4c,
-	0x0d4e, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d7a, 0x0d7f,
-	0x0d82, 0x0d83,
-	0x0d85, 0x0d96,
-	0x0d9a, 0x0db1,
-	0x0db3, 0x0dbb,
-	0x0dbd, 0x0dbd,
-	0x0dc0, 0x0dc6,
-	0x0dcf, 0x0dd4,
-	0x0dd6, 0x0dd6,
-	0x0dd8, 0x0ddf,
-	0x0df2, 0x0df3,
-	0x0e01, 0x0e3a,
-	0x0e40, 0x0e46,
-	0x0e4d, 0x0e4d,
-	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,
-	0x0ecd, 0x0ecd,
-	0x0edc, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f40, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f81,
-	0x0f88, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x1000, 0x1036,
-	0x1038, 0x1038,
-	0x103b, 0x103f,
-	0x1050, 0x1062,
-	0x1065, 0x1068,
-	0x106e, 0x1086,
-	0x108e, 0x108e,
-	0x109c, 0x109d,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 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, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1713,
-	0x1720, 0x1733,
-	0x1740, 0x1753,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-	0x1780, 0x17b3,
-	0x17b6, 0x17c8,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dc,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x1938,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x1a00, 0x1a1b,
-	0x1a20, 0x1a5e,
-	0x1a61, 0x1a74,
-	0x1aa7, 0x1aa7,
-	0x1b00, 0x1b33,
-	0x1b35, 0x1b43,
-	0x1b45, 0x1b4b,
-	0x1b80, 0x1ba9,
-	0x1bac, 0x1baf,
-	0x1bba, 0x1be5,
-	0x1be7, 0x1bf1,
-	0x1c00, 0x1c35,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c7d,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf3,
-	0x1cf5, 0x1cf6,
-	0x1d00, 0x1dbf,
-	0x1e00, 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, 0x209c,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2119, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x212d,
-	0x212f, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2160, 0x2188,
-	0x24b6, 0x24e9,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2ce4,
-	0x2ceb, 0x2cee,
-	0x2cf2, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2dff,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3007,
-	0x3021, 0x3029,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x309d, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa640, 0xa66e,
-	0xa674, 0xa67b,
-	0xa67f, 0xa697,
-	0xa69f, 0xa6ef,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xa7f8, 0xa801,
-	0xa803, 0xa805,
-	0xa807, 0xa80a,
-	0xa80c, 0xa827,
-	0xa840, 0xa873,
-	0xa880, 0xa8c3,
-	0xa8f2, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa90a, 0xa92a,
-	0xa930, 0xa952,
-	0xa960, 0xa97c,
-	0xa980, 0xa9b2,
-	0xa9b4, 0xa9bf,
-	0xa9cf, 0xa9cf,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa60, 0xaa76,
-	0xaa7a, 0xaa7a,
-	0xaa80, 0xaabe,
-	0xaac0, 0xaac0,
-	0xaac2, 0xaac2,
-	0xaadb, 0xaadd,
-	0xaae0, 0xaaef,
-	0xaaf2, 0xaaf5,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabea,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa6d,
-	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,
-	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,
-	0x10140, 0x10174,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11000, 0x11045,
-	0x11082, 0x110b8,
-	0x110d0, 0x110e8,
-	0x11100, 0x11132,
-	0x11180, 0x111bf,
-	0x111c1, 0x111c4,
-	0x11680, 0x116b5,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f93, 0x16f9f,
-	0x1b000, 0x1b001,
-	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, 0x1d7cb,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* 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[] = {
-	2,
-	0x0000, 0x001f,
-	0x007f, 0x009f,
-}; /* CR_Cntrl */
-
-/* 'Digit': [[:Digit:]] */
-static const OnigCodePoint CR_Digit[] = {
-	42,
-	0x0030, 0x0039,
-	0x0660, 0x0669,
-	0x06f0, 0x06f9,
-	0x07c0, 0x07c9,
-	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,
-	0x1090, 0x1099,
-	0x17e0, 0x17e9,
-	0x1810, 0x1819,
-	0x1946, 0x194f,
-	0x19d0, 0x19d9,
-	0x1a80, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1b50, 0x1b59,
-	0x1bb0, 0x1bb9,
-	0x1c40, 0x1c49,
-	0x1c50, 0x1c59,
-	0xa620, 0xa629,
-	0xa8d0, 0xa8d9,
-	0xa900, 0xa909,
-	0xa9d0, 0xa9d9,
-	0xaa50, 0xaa59,
-	0xabf0, 0xabf9,
-	0xff10, 0xff19,
-	0x104a0, 0x104a9,
-	0x11066, 0x1106f,
-	0x110f0, 0x110f9,
-	0x11136, 0x1113f,
-	0x111d0, 0x111d9,
-	0x116c0, 0x116c9,
-	0x1d7ce, 0x1d7ff,
-}; /* CR_Digit */
-
-/* 'Graph': [[:Graph:]] */
-static const OnigCodePoint CR_Graph[] = {
-	544,
-	0x0021, 0x007e,
-	0x00a1, 0x0377,
-	0x037a, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x0527,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x058f, 0x058f,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x0604,
-	0x0606, 0x061b,
-	0x061e, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-	0x0840, 0x085b,
-	0x085e, 0x085e,
-	0x08a0, 0x08a0,
-	0x08a2, 0x08ac,
-	0x08e4, 0x08fe,
-	0x0900, 0x0977,
-	0x0979, 0x097f,
-	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, 0x09fb,
-	0x0a01, 0x0a03,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0af1,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3c, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	0x0b66, 0x0b77,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bfa,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-	0x0c82, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
-	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, 0x0edf,
-	0x0f00, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fda,
-	0x1000, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 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,
-	0x135d, 0x137c,
-	0x1380, 0x1399,
-	0x13a0, 0x13f4,
-	0x1400, 0x167f,
-	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, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a1b,
-	0x1a1e, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1bf3,
-	0x1bfc, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cc0, 0x1cc7,
-	0x1cd0, 0x1cf6,
-	0x1d00, 0x1de6,
-	0x1dfc, 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, 0x2064,
-	0x206a, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x209c,
-	0x20a0, 0x20b9,
-	0x20d0, 0x20f0,
-	0x2100, 0x2189,
-	0x2190, 0x23f3,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x26ff,
-	0x2701, 0x2b4c,
-	0x2b50, 0x2b59,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf3,
-	0x2cf9, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d70,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2e3b,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3001, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa697,
-	0xa69f, 0xa6f7,
-	0xa700, 0xa78e,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xa7f8, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-	0xa8e0, 0xa8fb,
-	0xa900, 0xa953,
-	0xa95f, 0xa97c,
-	0xa980, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9df,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa7b,
-	0xaa80, 0xaac2,
-	0xaadb, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xe000, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbc1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe26,
-	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,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	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, 0x10855,
-	0x10857, 0x1085f,
-	0x10900, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a7f,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b7f,
-	0x10c00, 0x10c48,
-	0x10e60, 0x10e7e,
-	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-	0x11080, 0x110c1,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x11143,
-	0x11180, 0x111c8,
-	0x111d0, 0x111d9,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d1dd,
-	0x1d200, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	0x1f100, 0x1f10a,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f320,
-	0x1f330, 0x1f335,
-	0x1f337, 0x1f37c,
-	0x1f380, 0x1f393,
-	0x1f3a0, 0x1f3c4,
-	0x1f3c6, 0x1f3ca,
-	0x1f3e0, 0x1f3f0,
-	0x1f400, 0x1f43e,
-	0x1f440, 0x1f440,
-	0x1f442, 0x1f4f7,
-	0x1f4f9, 0x1f4fc,
-	0x1f500, 0x1f53d,
-	0x1f540, 0x1f543,
-	0x1f550, 0x1f567,
-	0x1f5fb, 0x1f640,
-	0x1f645, 0x1f64f,
-	0x1f680, 0x1f6c5,
-	0x1f700, 0x1f773,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xf0000, 0xffffd,
-	0x100000, 0x10fffd,
-}; /* CR_Graph */
-
-/* 'Lower': [[:Lower:]] */
-static const OnigCodePoint CR_Lower[] = {
-	618,
-	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,
-	0x0242, 0x0242,
-	0x0247, 0x0247,
-	0x0249, 0x0249,
-	0x024b, 0x024b,
-	0x024d, 0x024d,
-	0x024f, 0x0293,
-	0x0295, 0x02b8,
-	0x02c0, 0x02c1,
-	0x02e0, 0x02e4,
-	0x0345, 0x0345,
-	0x0371, 0x0371,
-	0x0373, 0x0373,
-	0x0377, 0x0377,
-	0x037a, 0x037d,
-	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, 0x04cf,
-	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,
-	0x04fb, 0x04fb,
-	0x04fd, 0x04fd,
-	0x04ff, 0x04ff,
-	0x0501, 0x0501,
-	0x0503, 0x0503,
-	0x0505, 0x0505,
-	0x0507, 0x0507,
-	0x0509, 0x0509,
-	0x050b, 0x050b,
-	0x050d, 0x050d,
-	0x050f, 0x050f,
-	0x0511, 0x0511,
-	0x0513, 0x0513,
-	0x0515, 0x0515,
-	0x0517, 0x0517,
-	0x0519, 0x0519,
-	0x051b, 0x051b,
-	0x051d, 0x051d,
-	0x051f, 0x051f,
-	0x0521, 0x0521,
-	0x0523, 0x0523,
-	0x0525, 0x0525,
-	0x0527, 0x0527,
-	0x0561, 0x0587,
-	0x1d00, 0x1dbf,
-	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, 0x1e9d,
-	0x1e9f, 0x1e9f,
-	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,
-	0x1efb, 0x1efb,
-	0x1efd, 0x1efd,
-	0x1eff, 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,
-	0x2090, 0x209c,
-	0x210a, 0x210a,
-	0x210e, 0x210f,
-	0x2113, 0x2113,
-	0x212f, 0x212f,
-	0x2134, 0x2134,
-	0x2139, 0x2139,
-	0x213c, 0x213d,
-	0x2146, 0x2149,
-	0x214e, 0x214e,
-	0x2170, 0x217f,
-	0x2184, 0x2184,
-	0x24d0, 0x24e9,
-	0x2c30, 0x2c5e,
-	0x2c61, 0x2c61,
-	0x2c65, 0x2c66,
-	0x2c68, 0x2c68,
-	0x2c6a, 0x2c6a,
-	0x2c6c, 0x2c6c,
-	0x2c71, 0x2c71,
-	0x2c73, 0x2c74,
-	0x2c76, 0x2c7d,
-	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,
-	0x2cec, 0x2cec,
-	0x2cee, 0x2cee,
-	0x2cf3, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0xa641, 0xa641,
-	0xa643, 0xa643,
-	0xa645, 0xa645,
-	0xa647, 0xa647,
-	0xa649, 0xa649,
-	0xa64b, 0xa64b,
-	0xa64d, 0xa64d,
-	0xa64f, 0xa64f,
-	0xa651, 0xa651,
-	0xa653, 0xa653,
-	0xa655, 0xa655,
-	0xa657, 0xa657,
-	0xa659, 0xa659,
-	0xa65b, 0xa65b,
-	0xa65d, 0xa65d,
-	0xa65f, 0xa65f,
-	0xa661, 0xa661,
-	0xa663, 0xa663,
-	0xa665, 0xa665,
-	0xa667, 0xa667,
-	0xa669, 0xa669,
-	0xa66b, 0xa66b,
-	0xa66d, 0xa66d,
-	0xa681, 0xa681,
-	0xa683, 0xa683,
-	0xa685, 0xa685,
-	0xa687, 0xa687,
-	0xa689, 0xa689,
-	0xa68b, 0xa68b,
-	0xa68d, 0xa68d,
-	0xa68f, 0xa68f,
-	0xa691, 0xa691,
-	0xa693, 0xa693,
-	0xa695, 0xa695,
-	0xa697, 0xa697,
-	0xa723, 0xa723,
-	0xa725, 0xa725,
-	0xa727, 0xa727,
-	0xa729, 0xa729,
-	0xa72b, 0xa72b,
-	0xa72d, 0xa72d,
-	0xa72f, 0xa731,
-	0xa733, 0xa733,
-	0xa735, 0xa735,
-	0xa737, 0xa737,
-	0xa739, 0xa739,
-	0xa73b, 0xa73b,
-	0xa73d, 0xa73d,
-	0xa73f, 0xa73f,
-	0xa741, 0xa741,
-	0xa743, 0xa743,
-	0xa745, 0xa745,
-	0xa747, 0xa747,
-	0xa749, 0xa749,
-	0xa74b, 0xa74b,
-	0xa74d, 0xa74d,
-	0xa74f, 0xa74f,
-	0xa751, 0xa751,
-	0xa753, 0xa753,
-	0xa755, 0xa755,
-	0xa757, 0xa757,
-	0xa759, 0xa759,
-	0xa75b, 0xa75b,
-	0xa75d, 0xa75d,
-	0xa75f, 0xa75f,
-	0xa761, 0xa761,
-	0xa763, 0xa763,
-	0xa765, 0xa765,
-	0xa767, 0xa767,
-	0xa769, 0xa769,
-	0xa76b, 0xa76b,
-	0xa76d, 0xa76d,
-	0xa76f, 0xa778,
-	0xa77a, 0xa77a,
-	0xa77c, 0xa77c,
-	0xa77f, 0xa77f,
-	0xa781, 0xa781,
-	0xa783, 0xa783,
-	0xa785, 0xa785,
-	0xa787, 0xa787,
-	0xa78c, 0xa78c,
-	0xa78e, 0xa78e,
-	0xa791, 0xa791,
-	0xa793, 0xa793,
-	0xa7a1, 0xa7a1,
-	0xa7a3, 0xa7a3,
-	0xa7a5, 0xa7a5,
-	0xa7a7, 0xa7a7,
-	0xa7a9, 0xa7a9,
-	0xa7f8, 0xa7fa,
-	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,
-	0x1d7cb, 0x1d7cb,
-}; /* CR_Lower */
-
-/* 'Print': [[:Print:]] */
-static const OnigCodePoint CR_Print[] = {
-	541,
-	0x0020, 0x007e,
-	0x00a0, 0x0377,
-	0x037a, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x0527,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x058f, 0x058f,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x0604,
-	0x0606, 0x061b,
-	0x061e, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-	0x0840, 0x085b,
-	0x085e, 0x085e,
-	0x08a0, 0x08a0,
-	0x08a2, 0x08ac,
-	0x08e4, 0x08fe,
-	0x0900, 0x0977,
-	0x0979, 0x097f,
-	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, 0x09fb,
-	0x0a01, 0x0a03,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0af1,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3c, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	0x0b66, 0x0b77,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bfa,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-	0x0c82, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
-	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, 0x0edf,
-	0x0f00, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fda,
-	0x1000, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 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,
-	0x135d, 0x137c,
-	0x1380, 0x1399,
-	0x13a0, 0x13f4,
-	0x1400, 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, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a1b,
-	0x1a1e, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1bf3,
-	0x1bfc, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cc0, 0x1cc7,
-	0x1cd0, 0x1cf6,
-	0x1d00, 0x1de6,
-	0x1dfc, 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, 0x2027,
-	0x202a, 0x2064,
-	0x206a, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x209c,
-	0x20a0, 0x20b9,
-	0x20d0, 0x20f0,
-	0x2100, 0x2189,
-	0x2190, 0x23f3,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x26ff,
-	0x2701, 0x2b4c,
-	0x2b50, 0x2b59,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf3,
-	0x2cf9, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d70,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2e3b,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa697,
-	0xa69f, 0xa6f7,
-	0xa700, 0xa78e,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xa7f8, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-	0xa8e0, 0xa8fb,
-	0xa900, 0xa953,
-	0xa95f, 0xa97c,
-	0xa980, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9df,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa7b,
-	0xaa80, 0xaac2,
-	0xaadb, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xe000, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbc1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe26,
-	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,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	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, 0x10855,
-	0x10857, 0x1085f,
-	0x10900, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a7f,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b7f,
-	0x10c00, 0x10c48,
-	0x10e60, 0x10e7e,
-	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-	0x11080, 0x110c1,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x11143,
-	0x11180, 0x111c8,
-	0x111d0, 0x111d9,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d1dd,
-	0x1d200, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	0x1f100, 0x1f10a,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f320,
-	0x1f330, 0x1f335,
-	0x1f337, 0x1f37c,
-	0x1f380, 0x1f393,
-	0x1f3a0, 0x1f3c4,
-	0x1f3c6, 0x1f3ca,
-	0x1f3e0, 0x1f3f0,
-	0x1f400, 0x1f43e,
-	0x1f440, 0x1f440,
-	0x1f442, 0x1f4f7,
-	0x1f4f9, 0x1f4fc,
-	0x1f500, 0x1f53d,
-	0x1f540, 0x1f543,
-	0x1f550, 0x1f567,
-	0x1f5fb, 0x1f640,
-	0x1f645, 0x1f64f,
-	0x1f680, 0x1f6c5,
-	0x1f700, 0x1f773,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xf0000, 0xffffd,
-	0x100000, 0x10fffd,
-}; /* CR_Print */
-
-/* 'Punct': [[:Punct:]] */
-static const OnigCodePoint CR_Punct[] = {
-	140,
-	0x0021, 0x0023,
-	0x0025, 0x002a,
-	0x002c, 0x002f,
-	0x003a, 0x003b,
-	0x003f, 0x0040,
-	0x005b, 0x005d,
-	0x005f, 0x005f,
-	0x007b, 0x007b,
-	0x007d, 0x007d,
-	0x00a1, 0x00a1,
-	0x00a7, 0x00a7,
-	0x00ab, 0x00ab,
-	0x00b6, 0x00b7,
-	0x00bb, 0x00bb,
-	0x00bf, 0x00bf,
-	0x037e, 0x037e,
-	0x0387, 0x0387,
-	0x055a, 0x055f,
-	0x0589, 0x058a,
-	0x05be, 0x05be,
-	0x05c0, 0x05c0,
-	0x05c3, 0x05c3,
-	0x05c6, 0x05c6,
-	0x05f3, 0x05f4,
-	0x0609, 0x060a,
-	0x060c, 0x060d,
-	0x061b, 0x061b,
-	0x061e, 0x061f,
-	0x066a, 0x066d,
-	0x06d4, 0x06d4,
-	0x0700, 0x070d,
-	0x07f7, 0x07f9,
-	0x0830, 0x083e,
-	0x085e, 0x085e,
-	0x0964, 0x0965,
-	0x0970, 0x0970,
-	0x0af0, 0x0af0,
-	0x0df4, 0x0df4,
-	0x0e4f, 0x0e4f,
-	0x0e5a, 0x0e5b,
-	0x0f04, 0x0f12,
-	0x0f14, 0x0f14,
-	0x0f3a, 0x0f3d,
-	0x0f85, 0x0f85,
-	0x0fd0, 0x0fd4,
-	0x0fd9, 0x0fda,
-	0x104a, 0x104f,
-	0x10fb, 0x10fb,
-	0x1360, 0x1368,
-	0x1400, 0x1400,
-	0x166d, 0x166e,
-	0x169b, 0x169c,
-	0x16eb, 0x16ed,
-	0x1735, 0x1736,
-	0x17d4, 0x17d6,
-	0x17d8, 0x17da,
-	0x1800, 0x180a,
-	0x1944, 0x1945,
-	0x1a1e, 0x1a1f,
-	0x1aa0, 0x1aa6,
-	0x1aa8, 0x1aad,
-	0x1b5a, 0x1b60,
-	0x1bfc, 0x1bff,
-	0x1c3b, 0x1c3f,
-	0x1c7e, 0x1c7f,
-	0x1cc0, 0x1cc7,
-	0x1cd3, 0x1cd3,
-	0x2010, 0x2027,
-	0x2030, 0x2043,
-	0x2045, 0x2051,
-	0x2053, 0x205e,
-	0x207d, 0x207e,
-	0x208d, 0x208e,
-	0x2329, 0x232a,
-	0x2768, 0x2775,
-	0x27c5, 0x27c6,
-	0x27e6, 0x27ef,
-	0x2983, 0x2998,
-	0x29d8, 0x29db,
-	0x29fc, 0x29fd,
-	0x2cf9, 0x2cfc,
-	0x2cfe, 0x2cff,
-	0x2d70, 0x2d70,
-	0x2e00, 0x2e2e,
-	0x2e30, 0x2e3b,
-	0x3001, 0x3003,
-	0x3008, 0x3011,
-	0x3014, 0x301f,
-	0x3030, 0x3030,
-	0x303d, 0x303d,
-	0x30a0, 0x30a0,
-	0x30fb, 0x30fb,
-	0xa4fe, 0xa4ff,
-	0xa60d, 0xa60f,
-	0xa673, 0xa673,
-	0xa67e, 0xa67e,
-	0xa6f2, 0xa6f7,
-	0xa874, 0xa877,
-	0xa8ce, 0xa8cf,
-	0xa8f8, 0xa8fa,
-	0xa92e, 0xa92f,
-	0xa95f, 0xa95f,
-	0xa9c1, 0xa9cd,
-	0xa9de, 0xa9df,
-	0xaa5c, 0xaa5f,
-	0xaade, 0xaadf,
-	0xaaf0, 0xaaf1,
-	0xabeb, 0xabeb,
-	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, 0x10102,
-	0x1039f, 0x1039f,
-	0x103d0, 0x103d0,
-	0x10857, 0x10857,
-	0x1091f, 0x1091f,
-	0x1093f, 0x1093f,
-	0x10a50, 0x10a58,
-	0x10a7f, 0x10a7f,
-	0x10b39, 0x10b3f,
-	0x11047, 0x1104d,
-	0x110bb, 0x110bc,
-	0x110be, 0x110c1,
-	0x11140, 0x11143,
-	0x111c5, 0x111c8,
-	0x12470, 0x12473,
-}; /* 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[] = {
-	610,
-	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,
-	0x0243, 0x0246,
-	0x0248, 0x0248,
-	0x024a, 0x024a,
-	0x024c, 0x024c,
-	0x024e, 0x024e,
-	0x0370, 0x0370,
-	0x0372, 0x0372,
-	0x0376, 0x0376,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x038f,
-	0x0391, 0x03a1,
-	0x03a3, 0x03ab,
-	0x03cf, 0x03cf,
-	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,
-	0x04fa, 0x04fa,
-	0x04fc, 0x04fc,
-	0x04fe, 0x04fe,
-	0x0500, 0x0500,
-	0x0502, 0x0502,
-	0x0504, 0x0504,
-	0x0506, 0x0506,
-	0x0508, 0x0508,
-	0x050a, 0x050a,
-	0x050c, 0x050c,
-	0x050e, 0x050e,
-	0x0510, 0x0510,
-	0x0512, 0x0512,
-	0x0514, 0x0514,
-	0x0516, 0x0516,
-	0x0518, 0x0518,
-	0x051a, 0x051a,
-	0x051c, 0x051c,
-	0x051e, 0x051e,
-	0x0520, 0x0520,
-	0x0522, 0x0522,
-	0x0524, 0x0524,
-	0x0526, 0x0526,
-	0x0531, 0x0556,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	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,
-	0x1e9e, 0x1e9e,
-	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,
-	0x1efa, 0x1efa,
-	0x1efc, 0x1efc,
-	0x1efe, 0x1efe,
-	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, 0x2133,
-	0x213e, 0x213f,
-	0x2145, 0x2145,
-	0x2160, 0x216f,
-	0x2183, 0x2183,
-	0x24b6, 0x24cf,
-	0x2c00, 0x2c2e,
-	0x2c60, 0x2c60,
-	0x2c62, 0x2c64,
-	0x2c67, 0x2c67,
-	0x2c69, 0x2c69,
-	0x2c6b, 0x2c6b,
-	0x2c6d, 0x2c70,
-	0x2c72, 0x2c72,
-	0x2c75, 0x2c75,
-	0x2c7e, 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,
-	0x2ceb, 0x2ceb,
-	0x2ced, 0x2ced,
-	0x2cf2, 0x2cf2,
-	0xa640, 0xa640,
-	0xa642, 0xa642,
-	0xa644, 0xa644,
-	0xa646, 0xa646,
-	0xa648, 0xa648,
-	0xa64a, 0xa64a,
-	0xa64c, 0xa64c,
-	0xa64e, 0xa64e,
-	0xa650, 0xa650,
-	0xa652, 0xa652,
-	0xa654, 0xa654,
-	0xa656, 0xa656,
-	0xa658, 0xa658,
-	0xa65a, 0xa65a,
-	0xa65c, 0xa65c,
-	0xa65e, 0xa65e,
-	0xa660, 0xa660,
-	0xa662, 0xa662,
-	0xa664, 0xa664,
-	0xa666, 0xa666,
-	0xa668, 0xa668,
-	0xa66a, 0xa66a,
-	0xa66c, 0xa66c,
-	0xa680, 0xa680,
-	0xa682, 0xa682,
-	0xa684, 0xa684,
-	0xa686, 0xa686,
-	0xa688, 0xa688,
-	0xa68a, 0xa68a,
-	0xa68c, 0xa68c,
-	0xa68e, 0xa68e,
-	0xa690, 0xa690,
-	0xa692, 0xa692,
-	0xa694, 0xa694,
-	0xa696, 0xa696,
-	0xa722, 0xa722,
-	0xa724, 0xa724,
-	0xa726, 0xa726,
-	0xa728, 0xa728,
-	0xa72a, 0xa72a,
-	0xa72c, 0xa72c,
-	0xa72e, 0xa72e,
-	0xa732, 0xa732,
-	0xa734, 0xa734,
-	0xa736, 0xa736,
-	0xa738, 0xa738,
-	0xa73a, 0xa73a,
-	0xa73c, 0xa73c,
-	0xa73e, 0xa73e,
-	0xa740, 0xa740,
-	0xa742, 0xa742,
-	0xa744, 0xa744,
-	0xa746, 0xa746,
-	0xa748, 0xa748,
-	0xa74a, 0xa74a,
-	0xa74c, 0xa74c,
-	0xa74e, 0xa74e,
-	0xa750, 0xa750,
-	0xa752, 0xa752,
-	0xa754, 0xa754,
-	0xa756, 0xa756,
-	0xa758, 0xa758,
-	0xa75a, 0xa75a,
-	0xa75c, 0xa75c,
-	0xa75e, 0xa75e,
-	0xa760, 0xa760,
-	0xa762, 0xa762,
-	0xa764, 0xa764,
-	0xa766, 0xa766,
-	0xa768, 0xa768,
-	0xa76a, 0xa76a,
-	0xa76c, 0xa76c,
-	0xa76e, 0xa76e,
-	0xa779, 0xa779,
-	0xa77b, 0xa77b,
-	0xa77d, 0xa77e,
-	0xa780, 0xa780,
-	0xa782, 0xa782,
-	0xa784, 0xa784,
-	0xa786, 0xa786,
-	0xa78b, 0xa78b,
-	0xa78d, 0xa78d,
-	0xa790, 0xa790,
-	0xa792, 0xa792,
-	0xa7a0, 0xa7a0,
-	0xa7a2, 0xa7a2,
-	0xa7a4, 0xa7a4,
-	0xa7a6, 0xa7a6,
-	0xa7a8, 0xa7a8,
-	0xa7aa, 0xa7aa,
-	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,
-	0x1d7ca, 0x1d7ca,
-}; /* 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[] = {
-	564,
-	0x0030, 0x0039,
-	0x0041, 0x005a,
-	0x005f, 0x005f,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00b5, 0x00b5,
-	0x00ba, 0x00ba,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x02c1,
-	0x02c6, 0x02d1,
-	0x02e0, 0x02e4,
-	0x02ec, 0x02ec,
-	0x02ee, 0x02ee,
-	0x0300, 0x0374,
-	0x0376, 0x0377,
-	0x037a, 0x037d,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x0483, 0x0527,
-	0x0531, 0x0556,
-	0x0559, 0x0559,
-	0x0561, 0x0587,
-	0x0591, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0610, 0x061a,
-	0x0620, 0x0669,
-	0x066e, 0x06d3,
-	0x06d5, 0x06dc,
-	0x06df, 0x06e8,
-	0x06ea, 0x06fc,
-	0x06ff, 0x06ff,
-	0x0710, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07f5,
-	0x07fa, 0x07fa,
-	0x0800, 0x082d,
-	0x0840, 0x085b,
-	0x08a0, 0x08a0,
-	0x08a2, 0x08ac,
-	0x08e4, 0x08fe,
-	0x0900, 0x0963,
-	0x0966, 0x096f,
-	0x0971, 0x0977,
-	0x0979, 0x097f,
-	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,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bef,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	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, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d6f,
-	0x0d7a, 0x0d7f,
-	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, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f18, 0x0f19,
-	0x0f20, 0x0f29,
-	0x0f35, 0x0f35,
-	0x0f37, 0x0f37,
-	0x0f39, 0x0f39,
-	0x0f3e, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f84,
-	0x0f86, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fc6, 0x0fc6,
-	0x1000, 0x1049,
-	0x1050, 0x109d,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 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,
-	0x135d, 0x135f,
-	0x1380, 0x138f,
-	0x13a0, 0x13f4,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1714,
-	0x1720, 0x1734,
-	0x1740, 0x1753,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-	0x1780, 0x17d3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dd,
-	0x17e0, 0x17e9,
-	0x180b, 0x180d,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1946, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19d9,
-	0x1a00, 0x1a1b,
-	0x1a20, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa7, 0x1aa7,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b59,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1bf3,
-	0x1c00, 0x1c37,
-	0x1c40, 0x1c49,
-	0x1c4d, 0x1c7d,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1cf6,
-	0x1d00, 0x1de6,
-	0x1dfc, 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,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 0x209c,
-	0x20d0, 0x20f0,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2119, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x212d,
-	0x212f, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2160, 0x2188,
-	0x24b6, 0x24e9,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2ce4,
-	0x2ceb, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d6f,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2dff,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3007,
-	0x3021, 0x302f,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x3099, 0x309a,
-	0x309d, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa62b,
-	0xa640, 0xa672,
-	0xa674, 0xa67d,
-	0xa67f, 0xa697,
-	0xa69f, 0xa6f1,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xa7f8, 0xa827,
-	0xa840, 0xa873,
-	0xa880, 0xa8c4,
-	0xa8d0, 0xa8d9,
-	0xa8e0, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa900, 0xa92d,
-	0xa930, 0xa953,
-	0xa960, 0xa97c,
-	0xa980, 0xa9c0,
-	0xa9cf, 0xa9d9,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa60, 0xaa76,
-	0xaa7a, 0xaa7b,
-	0xaa80, 0xaac2,
-	0xaadb, 0xaadd,
-	0xaae0, 0xaaef,
-	0xaaf2, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabea,
-	0xabec, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa6d,
-	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, 0xfe26,
-	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,
-	0x10140, 0x10174,
-	0x101fd, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	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, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11000, 0x11046,
-	0x11066, 0x1106f,
-	0x11080, 0x110ba,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x1113f,
-	0x11180, 0x111c4,
-	0x111d0, 0x111d9,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x1b000, 0x1b001,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0xe0100, 0xe01ef,
-}; /* CR_Word */
-
-/* 'Alnum': [[:Alnum:]] */
-static const OnigCodePoint CR_Alnum[] = {
-	566,
-	0x0030, 0x0039,
-	0x0041, 0x005a,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00b5, 0x00b5,
-	0x00ba, 0x00ba,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x02c1,
-	0x02c6, 0x02d1,
-	0x02e0, 0x02e4,
-	0x02ec, 0x02ec,
-	0x02ee, 0x02ee,
-	0x0345, 0x0345,
-	0x0370, 0x0374,
-	0x0376, 0x0377,
-	0x037a, 0x037d,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x048a, 0x0527,
-	0x0531, 0x0556,
-	0x0559, 0x0559,
-	0x0561, 0x0587,
-	0x05b0, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0610, 0x061a,
-	0x0620, 0x0657,
-	0x0659, 0x0669,
-	0x066e, 0x06d3,
-	0x06d5, 0x06dc,
-	0x06e1, 0x06e8,
-	0x06ed, 0x06fc,
-	0x06ff, 0x06ff,
-	0x0710, 0x073f,
-	0x074d, 0x07b1,
-	0x07c0, 0x07ea,
-	0x07f4, 0x07f5,
-	0x07fa, 0x07fa,
-	0x0800, 0x0817,
-	0x081a, 0x082c,
-	0x0840, 0x0858,
-	0x08a0, 0x08a0,
-	0x08a2, 0x08ac,
-	0x08e4, 0x08e9,
-	0x08f0, 0x08fe,
-	0x0900, 0x093b,
-	0x093d, 0x094c,
-	0x094e, 0x0950,
-	0x0955, 0x0963,
-	0x0966, 0x096f,
-	0x0971, 0x0977,
-	0x0979, 0x097f,
-	0x0981, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bd, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cc,
-	0x09ce, 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,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4c,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	0x0a81, 0x0a83,
-	0x0a85, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abd, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acc,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae3,
-	0x0ae6, 0x0aef,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3d, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4c,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	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, 0x0bcc,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bef,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4c,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c82, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbd, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccc,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4c,
-	0x0d4e, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d6f,
-	0x0d7a, 0x0d7f,
-	0x0d82, 0x0d83,
-	0x0d85, 0x0d96,
-	0x0d9a, 0x0db1,
-	0x0db3, 0x0dbb,
-	0x0dbd, 0x0dbd,
-	0x0dc0, 0x0dc6,
-	0x0dcf, 0x0dd4,
-	0x0dd6, 0x0dd6,
-	0x0dd8, 0x0ddf,
-	0x0df2, 0x0df3,
-	0x0e01, 0x0e3a,
-	0x0e40, 0x0e46,
-	0x0e4d, 0x0e4d,
-	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,
-	0x0ecd, 0x0ecd,
-	0x0ed0, 0x0ed9,
-	0x0edc, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f20, 0x0f29,
-	0x0f40, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f81,
-	0x0f88, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x1000, 0x1036,
-	0x1038, 0x1038,
-	0x103b, 0x1049,
-	0x1050, 0x1062,
-	0x1065, 0x1068,
-	0x106e, 0x1086,
-	0x108e, 0x108e,
-	0x1090, 0x1099,
-	0x109c, 0x109d,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 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, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1713,
-	0x1720, 0x1733,
-	0x1740, 0x1753,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-	0x1780, 0x17b3,
-	0x17b6, 0x17c8,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dc,
-	0x17e0, 0x17e9,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x1938,
-	0x1946, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19d9,
-	0x1a00, 0x1a1b,
-	0x1a20, 0x1a5e,
-	0x1a61, 0x1a74,
-	0x1a80, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa7, 0x1aa7,
-	0x1b00, 0x1b33,
-	0x1b35, 0x1b43,
-	0x1b45, 0x1b4b,
-	0x1b50, 0x1b59,
-	0x1b80, 0x1ba9,
-	0x1bac, 0x1be5,
-	0x1be7, 0x1bf1,
-	0x1c00, 0x1c35,
-	0x1c40, 0x1c49,
-	0x1c4d, 0x1c7d,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf3,
-	0x1cf5, 0x1cf6,
-	0x1d00, 0x1dbf,
-	0x1e00, 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, 0x209c,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2119, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x212d,
-	0x212f, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2160, 0x2188,
-	0x24b6, 0x24e9,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2ce4,
-	0x2ceb, 0x2cee,
-	0x2cf2, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2dff,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3007,
-	0x3021, 0x3029,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x309d, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa62b,
-	0xa640, 0xa66e,
-	0xa674, 0xa67b,
-	0xa67f, 0xa697,
-	0xa69f, 0xa6ef,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xa7f8, 0xa801,
-	0xa803, 0xa805,
-	0xa807, 0xa80a,
-	0xa80c, 0xa827,
-	0xa840, 0xa873,
-	0xa880, 0xa8c3,
-	0xa8d0, 0xa8d9,
-	0xa8f2, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa900, 0xa92a,
-	0xa930, 0xa952,
-	0xa960, 0xa97c,
-	0xa980, 0xa9b2,
-	0xa9b4, 0xa9bf,
-	0xa9cf, 0xa9d9,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa60, 0xaa76,
-	0xaa7a, 0xaa7a,
-	0xaa80, 0xaabe,
-	0xaac0, 0xaac0,
-	0xaac2, 0xaac2,
-	0xaadb, 0xaadd,
-	0xaae0, 0xaaef,
-	0xaaf2, 0xaaf5,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabea,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa6d,
-	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,
-	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,
-	0x10140, 0x10174,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	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, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11000, 0x11045,
-	0x11066, 0x1106f,
-	0x11082, 0x110b8,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11132,
-	0x11136, 0x1113f,
-	0x11180, 0x111bf,
-	0x111c1, 0x111c4,
-	0x111d0, 0x111d9,
-	0x11680, 0x116b5,
-	0x116c0, 0x116c9,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f93, 0x16f9f,
-	0x1b000, 0x1b001,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* 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[] = {
-	539,
-	0x0000, 0x0377,
-	0x037a, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x0527,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x058f, 0x058f,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x0604,
-	0x0606, 0x061b,
-	0x061e, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-	0x0840, 0x085b,
-	0x085e, 0x085e,
-	0x08a0, 0x08a0,
-	0x08a2, 0x08ac,
-	0x08e4, 0x08fe,
-	0x0900, 0x0977,
-	0x0979, 0x097f,
-	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, 0x09fb,
-	0x0a01, 0x0a03,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0af1,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3c, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	0x0b66, 0x0b77,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bfa,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-	0x0c82, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
-	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, 0x0edf,
-	0x0f00, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fda,
-	0x1000, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 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,
-	0x135d, 0x137c,
-	0x1380, 0x1399,
-	0x13a0, 0x13f4,
-	0x1400, 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, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a1b,
-	0x1a1e, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1bf3,
-	0x1bfc, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cc0, 0x1cc7,
-	0x1cd0, 0x1cf6,
-	0x1d00, 0x1de6,
-	0x1dfc, 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, 0x2064,
-	0x206a, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x209c,
-	0x20a0, 0x20b9,
-	0x20d0, 0x20f0,
-	0x2100, 0x2189,
-	0x2190, 0x23f3,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x26ff,
-	0x2701, 0x2b4c,
-	0x2b50, 0x2b59,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf3,
-	0x2cf9, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d70,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2e3b,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa697,
-	0xa69f, 0xa6f7,
-	0xa700, 0xa78e,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xa7f8, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-	0xa8e0, 0xa8fb,
-	0xa900, 0xa953,
-	0xa95f, 0xa97c,
-	0xa980, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9df,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa7b,
-	0xaa80, 0xaac2,
-	0xaadb, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xd800, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbc1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe26,
-	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,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	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, 0x10855,
-	0x10857, 0x1085f,
-	0x10900, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a7f,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b7f,
-	0x10c00, 0x10c48,
-	0x10e60, 0x10e7e,
-	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-	0x11080, 0x110c1,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x11143,
-	0x11180, 0x111c8,
-	0x111d0, 0x111d9,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d1dd,
-	0x1d200, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	0x1f100, 0x1f10a,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f320,
-	0x1f330, 0x1f335,
-	0x1f337, 0x1f37c,
-	0x1f380, 0x1f393,
-	0x1f3a0, 0x1f3c4,
-	0x1f3c6, 0x1f3ca,
-	0x1f3e0, 0x1f3f0,
-	0x1f400, 0x1f43e,
-	0x1f440, 0x1f440,
-	0x1f442, 0x1f4f7,
-	0x1f4f9, 0x1f4fc,
-	0x1f500, 0x1f53d,
-	0x1f540, 0x1f543,
-	0x1f550, 0x1f567,
-	0x1f5fb, 0x1f640,
-	0x1f645, 0x1f64f,
-	0x1f680, 0x1f6c5,
-	0x1f700, 0x1f773,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xf0000, 0xffffd,
-	0x100000, 0x10fffd,
-}; /* CR_Assigned */
-
-/* 'C': Major Category */
-static const OnigCodePoint CR_C[] = {
-	541,
-	0x0000, 0x001f,
-	0x007f, 0x009f,
-	0x00ad, 0x00ad,
-	0x0378, 0x0379,
-	0x037f, 0x0383,
-	0x038b, 0x038b,
-	0x038d, 0x038d,
-	0x03a2, 0x03a2,
-	0x0528, 0x0530,
-	0x0557, 0x0558,
-	0x0560, 0x0560,
-	0x0588, 0x0588,
-	0x058b, 0x058e,
-	0x0590, 0x0590,
-	0x05c8, 0x05cf,
-	0x05eb, 0x05ef,
-	0x05f5, 0x0605,
-	0x061c, 0x061d,
-	0x06dd, 0x06dd,
-	0x070e, 0x070f,
-	0x074b, 0x074c,
-	0x07b2, 0x07bf,
-	0x07fb, 0x07ff,
-	0x082e, 0x082f,
-	0x083f, 0x083f,
-	0x085c, 0x085d,
-	0x085f, 0x089f,
-	0x08a1, 0x08a1,
-	0x08ad, 0x08e3,
-	0x08ff, 0x08ff,
-	0x0978, 0x0978,
-	0x0980, 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,
-	0x09fc, 0x0a00,
-	0x0a04, 0x0a04,
-	0x0a0b, 0x0a0e,
-	0x0a11, 0x0a12,
-	0x0a29, 0x0a29,
-	0x0a31, 0x0a31,
-	0x0a34, 0x0a34,
-	0x0a37, 0x0a37,
-	0x0a3a, 0x0a3b,
-	0x0a3d, 0x0a3d,
-	0x0a43, 0x0a46,
-	0x0a49, 0x0a4a,
-	0x0a4e, 0x0a50,
-	0x0a52, 0x0a58,
-	0x0a5d, 0x0a5d,
-	0x0a5f, 0x0a65,
-	0x0a76, 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,
-	0x0af2, 0x0b00,
-	0x0b04, 0x0b04,
-	0x0b0d, 0x0b0e,
-	0x0b11, 0x0b12,
-	0x0b29, 0x0b29,
-	0x0b31, 0x0b31,
-	0x0b34, 0x0b34,
-	0x0b3a, 0x0b3b,
-	0x0b45, 0x0b46,
-	0x0b49, 0x0b4a,
-	0x0b4e, 0x0b55,
-	0x0b58, 0x0b5b,
-	0x0b5e, 0x0b5e,
-	0x0b64, 0x0b65,
-	0x0b78, 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, 0x0bcf,
-	0x0bd1, 0x0bd6,
-	0x0bd8, 0x0be5,
-	0x0bfb, 0x0c00,
-	0x0c04, 0x0c04,
-	0x0c0d, 0x0c0d,
-	0x0c11, 0x0c11,
-	0x0c29, 0x0c29,
-	0x0c34, 0x0c34,
-	0x0c3a, 0x0c3c,
-	0x0c45, 0x0c45,
-	0x0c49, 0x0c49,
-	0x0c4e, 0x0c54,
-	0x0c57, 0x0c57,
-	0x0c5a, 0x0c5f,
-	0x0c64, 0x0c65,
-	0x0c70, 0x0c77,
-	0x0c80, 0x0c81,
-	0x0c84, 0x0c84,
-	0x0c8d, 0x0c8d,
-	0x0c91, 0x0c91,
-	0x0ca9, 0x0ca9,
-	0x0cb4, 0x0cb4,
-	0x0cba, 0x0cbb,
-	0x0cc5, 0x0cc5,
-	0x0cc9, 0x0cc9,
-	0x0cce, 0x0cd4,
-	0x0cd7, 0x0cdd,
-	0x0cdf, 0x0cdf,
-	0x0ce4, 0x0ce5,
-	0x0cf0, 0x0cf0,
-	0x0cf3, 0x0d01,
-	0x0d04, 0x0d04,
-	0x0d0d, 0x0d0d,
-	0x0d11, 0x0d11,
-	0x0d3b, 0x0d3c,
-	0x0d45, 0x0d45,
-	0x0d49, 0x0d49,
-	0x0d4f, 0x0d56,
-	0x0d58, 0x0d5f,
-	0x0d64, 0x0d65,
-	0x0d76, 0x0d78,
-	0x0d80, 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,
-	0x0ee0, 0x0eff,
-	0x0f48, 0x0f48,
-	0x0f6d, 0x0f70,
-	0x0f98, 0x0f98,
-	0x0fbd, 0x0fbd,
-	0x0fcd, 0x0fcd,
-	0x0fdb, 0x0fff,
-	0x10c6, 0x10c6,
-	0x10c8, 0x10cc,
-	0x10ce, 0x10cf,
-	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, 0x135c,
-	0x137d, 0x137f,
-	0x139a, 0x139f,
-	0x13f5, 0x13ff,
-	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,
-	0x18ab, 0x18af,
-	0x18f6, 0x18ff,
-	0x191d, 0x191f,
-	0x192c, 0x192f,
-	0x193c, 0x193f,
-	0x1941, 0x1943,
-	0x196e, 0x196f,
-	0x1975, 0x197f,
-	0x19ac, 0x19af,
-	0x19ca, 0x19cf,
-	0x19db, 0x19dd,
-	0x1a1c, 0x1a1d,
-	0x1a5f, 0x1a5f,
-	0x1a7d, 0x1a7e,
-	0x1a8a, 0x1a8f,
-	0x1a9a, 0x1a9f,
-	0x1aae, 0x1aff,
-	0x1b4c, 0x1b4f,
-	0x1b7d, 0x1b7f,
-	0x1bf4, 0x1bfb,
-	0x1c38, 0x1c3a,
-	0x1c4a, 0x1c4c,
-	0x1c80, 0x1cbf,
-	0x1cc8, 0x1ccf,
-	0x1cf7, 0x1cff,
-	0x1de7, 0x1dfb,
-	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,
-	0x209d, 0x209f,
-	0x20ba, 0x20cf,
-	0x20f1, 0x20ff,
-	0x218a, 0x218f,
-	0x23f4, 0x23ff,
-	0x2427, 0x243f,
-	0x244b, 0x245f,
-	0x2700, 0x2700,
-	0x2b4d, 0x2b4f,
-	0x2b5a, 0x2bff,
-	0x2c2f, 0x2c2f,
-	0x2c5f, 0x2c5f,
-	0x2cf4, 0x2cf8,
-	0x2d26, 0x2d26,
-	0x2d28, 0x2d2c,
-	0x2d2e, 0x2d2f,
-	0x2d68, 0x2d6e,
-	0x2d71, 0x2d7e,
-	0x2d97, 0x2d9f,
-	0x2da7, 0x2da7,
-	0x2daf, 0x2daf,
-	0x2db7, 0x2db7,
-	0x2dbf, 0x2dbf,
-	0x2dc7, 0x2dc7,
-	0x2dcf, 0x2dcf,
-	0x2dd7, 0x2dd7,
-	0x2ddf, 0x2ddf,
-	0x2e3c, 0x2e7f,
-	0x2e9a, 0x2e9a,
-	0x2ef4, 0x2eff,
-	0x2fd6, 0x2fef,
-	0x2ffc, 0x2fff,
-	0x3040, 0x3040,
-	0x3097, 0x3098,
-	0x3100, 0x3104,
-	0x312e, 0x3130,
-	0x318f, 0x318f,
-	0x31bb, 0x31bf,
-	0x31e4, 0x31ef,
-	0x321f, 0x321f,
-	0x32ff, 0x32ff,
-	0x4db6, 0x4dbf,
-	0x9fcd, 0x9fff,
-	0xa48d, 0xa48f,
-	0xa4c7, 0xa4cf,
-	0xa62c, 0xa63f,
-	0xa698, 0xa69e,
-	0xa6f8, 0xa6ff,
-	0xa78f, 0xa78f,
-	0xa794, 0xa79f,
-	0xa7ab, 0xa7f7,
-	0xa82c, 0xa82f,
-	0xa83a, 0xa83f,
-	0xa878, 0xa87f,
-	0xa8c5, 0xa8cd,
-	0xa8da, 0xa8df,
-	0xa8fc, 0xa8ff,
-	0xa954, 0xa95e,
-	0xa97d, 0xa97f,
-	0xa9ce, 0xa9ce,
-	0xa9da, 0xa9dd,
-	0xa9e0, 0xa9ff,
-	0xaa37, 0xaa3f,
-	0xaa4e, 0xaa4f,
-	0xaa5a, 0xaa5b,
-	0xaa7c, 0xaa7f,
-	0xaac3, 0xaada,
-	0xaaf7, 0xab00,
-	0xab07, 0xab08,
-	0xab0f, 0xab10,
-	0xab17, 0xab1f,
-	0xab27, 0xab27,
-	0xab2f, 0xabbf,
-	0xabee, 0xabef,
-	0xabfa, 0xabff,
-	0xd7a4, 0xd7af,
-	0xd7c7, 0xd7ca,
-	0xd7fc, 0xf8ff,
-	0xfa6e, 0xfa6f,
-	0xfada, 0xfaff,
-	0xfb07, 0xfb12,
-	0xfb18, 0xfb1c,
-	0xfb37, 0xfb37,
-	0xfb3d, 0xfb3d,
-	0xfb3f, 0xfb3f,
-	0xfb42, 0xfb42,
-	0xfb45, 0xfb45,
-	0xfbc2, 0xfbd2,
-	0xfd40, 0xfd4f,
-	0xfd90, 0xfd91,
-	0xfdc8, 0xfdef,
-	0xfdfe, 0xfdff,
-	0xfe1a, 0xfe1f,
-	0xfe27, 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, 0x1018f,
-	0x1019c, 0x101cf,
-	0x101fe, 0x1027f,
-	0x1029d, 0x1029f,
-	0x102d1, 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,
-	0x10856, 0x10856,
-	0x10860, 0x108ff,
-	0x1091c, 0x1091e,
-	0x1093a, 0x1093e,
-	0x10940, 0x1097f,
-	0x109b8, 0x109bd,
-	0x109c0, 0x109ff,
-	0x10a04, 0x10a04,
-	0x10a07, 0x10a0b,
-	0x10a14, 0x10a14,
-	0x10a18, 0x10a18,
-	0x10a34, 0x10a37,
-	0x10a3b, 0x10a3e,
-	0x10a48, 0x10a4f,
-	0x10a59, 0x10a5f,
-	0x10a80, 0x10aff,
-	0x10b36, 0x10b38,
-	0x10b56, 0x10b57,
-	0x10b73, 0x10b77,
-	0x10b80, 0x10bff,
-	0x10c49, 0x10e5f,
-	0x10e7f, 0x10fff,
-	0x1104e, 0x11051,
-	0x11070, 0x1107f,
-	0x110bd, 0x110bd,
-	0x110c2, 0x110cf,
-	0x110e9, 0x110ef,
-	0x110fa, 0x110ff,
-	0x11135, 0x11135,
-	0x11144, 0x1117f,
-	0x111c9, 0x111cf,
-	0x111da, 0x1167f,
-	0x116b8, 0x116bf,
-	0x116ca, 0x11fff,
-	0x1236f, 0x123ff,
-	0x12463, 0x1246f,
-	0x12474, 0x12fff,
-	0x1342f, 0x167ff,
-	0x16a39, 0x16eff,
-	0x16f45, 0x16f4f,
-	0x16f7f, 0x16f8e,
-	0x16fa0, 0x1afff,
-	0x1b002, 0x1cfff,
-	0x1d0f6, 0x1d0ff,
-	0x1d127, 0x1d128,
-	0x1d173, 0x1d17a,
-	0x1d1de, 0x1d1ff,
-	0x1d246, 0x1d2ff,
-	0x1d357, 0x1d35f,
-	0x1d372, 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,
-	0x1d7cc, 0x1d7cd,
-	0x1d800, 0x1edff,
-	0x1ee04, 0x1ee04,
-	0x1ee20, 0x1ee20,
-	0x1ee23, 0x1ee23,
-	0x1ee25, 0x1ee26,
-	0x1ee28, 0x1ee28,
-	0x1ee33, 0x1ee33,
-	0x1ee38, 0x1ee38,
-	0x1ee3a, 0x1ee3a,
-	0x1ee3c, 0x1ee41,
-	0x1ee43, 0x1ee46,
-	0x1ee48, 0x1ee48,
-	0x1ee4a, 0x1ee4a,
-	0x1ee4c, 0x1ee4c,
-	0x1ee50, 0x1ee50,
-	0x1ee53, 0x1ee53,
-	0x1ee55, 0x1ee56,
-	0x1ee58, 0x1ee58,
-	0x1ee5a, 0x1ee5a,
-	0x1ee5c, 0x1ee5c,
-	0x1ee5e, 0x1ee5e,
-	0x1ee60, 0x1ee60,
-	0x1ee63, 0x1ee63,
-	0x1ee65, 0x1ee66,
-	0x1ee6b, 0x1ee6b,
-	0x1ee73, 0x1ee73,
-	0x1ee78, 0x1ee78,
-	0x1ee7d, 0x1ee7d,
-	0x1ee7f, 0x1ee7f,
-	0x1ee8a, 0x1ee8a,
-	0x1ee9c, 0x1eea0,
-	0x1eea4, 0x1eea4,
-	0x1eeaa, 0x1eeaa,
-	0x1eebc, 0x1eeef,
-	0x1eef2, 0x1efff,
-	0x1f02c, 0x1f02f,
-	0x1f094, 0x1f09f,
-	0x1f0af, 0x1f0b0,
-	0x1f0bf, 0x1f0c0,
-	0x1f0d0, 0x1f0d0,
-	0x1f0e0, 0x1f0ff,
-	0x1f10b, 0x1f10f,
-	0x1f12f, 0x1f12f,
-	0x1f16c, 0x1f16f,
-	0x1f19b, 0x1f1e5,
-	0x1f203, 0x1f20f,
-	0x1f23b, 0x1f23f,
-	0x1f249, 0x1f24f,
-	0x1f252, 0x1f2ff,
-	0x1f321, 0x1f32f,
-	0x1f336, 0x1f336,
-	0x1f37d, 0x1f37f,
-	0x1f394, 0x1f39f,
-	0x1f3c5, 0x1f3c5,
-	0x1f3cb, 0x1f3df,
-	0x1f3f1, 0x1f3ff,
-	0x1f43f, 0x1f43f,
-	0x1f441, 0x1f441,
-	0x1f4f8, 0x1f4f8,
-	0x1f4fd, 0x1f4ff,
-	0x1f53e, 0x1f53f,
-	0x1f544, 0x1f54f,
-	0x1f568, 0x1f5fa,
-	0x1f641, 0x1f644,
-	0x1f650, 0x1f67f,
-	0x1f6c6, 0x1f6ff,
-	0x1f774, 0x1ffff,
-	0x2a6d7, 0x2a6ff,
-	0x2b735, 0x2b73f,
-	0x2b81e, 0x2f7ff,
-	0x2fa1e, 0xe00ff,
-	0xe01f0, 0x10ffff,
-}; /* CR_C */
-
-/* 'Cc': General Category */
-#define CR_Cc CR_Cntrl
-
-/* 'Cf': General Category */
-static const OnigCodePoint CR_Cf[] = {
-	14,
-	0x00ad, 0x00ad,
-	0x0600, 0x0604,
-	0x06dd, 0x06dd,
-	0x070f, 0x070f,
-	0x200b, 0x200f,
-	0x202a, 0x202e,
-	0x2060, 0x2064,
-	0x206a, 0x206f,
-	0xfeff, 0xfeff,
-	0xfff9, 0xfffb,
-	0x110bd, 0x110bd,
-	0x1d173, 0x1d17a,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-}; /* CR_Cf */
-
-/* 'Cn': General Category */
-static const OnigCodePoint CR_Cn[] = {
-	539,
-	0x0378, 0x0379,
-	0x037f, 0x0383,
-	0x038b, 0x038b,
-	0x038d, 0x038d,
-	0x03a2, 0x03a2,
-	0x0528, 0x0530,
-	0x0557, 0x0558,
-	0x0560, 0x0560,
-	0x0588, 0x0588,
-	0x058b, 0x058e,
-	0x0590, 0x0590,
-	0x05c8, 0x05cf,
-	0x05eb, 0x05ef,
-	0x05f5, 0x05ff,
-	0x0605, 0x0605,
-	0x061c, 0x061d,
-	0x070e, 0x070e,
-	0x074b, 0x074c,
-	0x07b2, 0x07bf,
-	0x07fb, 0x07ff,
-	0x082e, 0x082f,
-	0x083f, 0x083f,
-	0x085c, 0x085d,
-	0x085f, 0x089f,
-	0x08a1, 0x08a1,
-	0x08ad, 0x08e3,
-	0x08ff, 0x08ff,
-	0x0978, 0x0978,
-	0x0980, 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,
-	0x09fc, 0x0a00,
-	0x0a04, 0x0a04,
-	0x0a0b, 0x0a0e,
-	0x0a11, 0x0a12,
-	0x0a29, 0x0a29,
-	0x0a31, 0x0a31,
-	0x0a34, 0x0a34,
-	0x0a37, 0x0a37,
-	0x0a3a, 0x0a3b,
-	0x0a3d, 0x0a3d,
-	0x0a43, 0x0a46,
-	0x0a49, 0x0a4a,
-	0x0a4e, 0x0a50,
-	0x0a52, 0x0a58,
-	0x0a5d, 0x0a5d,
-	0x0a5f, 0x0a65,
-	0x0a76, 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,
-	0x0af2, 0x0b00,
-	0x0b04, 0x0b04,
-	0x0b0d, 0x0b0e,
-	0x0b11, 0x0b12,
-	0x0b29, 0x0b29,
-	0x0b31, 0x0b31,
-	0x0b34, 0x0b34,
-	0x0b3a, 0x0b3b,
-	0x0b45, 0x0b46,
-	0x0b49, 0x0b4a,
-	0x0b4e, 0x0b55,
-	0x0b58, 0x0b5b,
-	0x0b5e, 0x0b5e,
-	0x0b64, 0x0b65,
-	0x0b78, 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, 0x0bcf,
-	0x0bd1, 0x0bd6,
-	0x0bd8, 0x0be5,
-	0x0bfb, 0x0c00,
-	0x0c04, 0x0c04,
-	0x0c0d, 0x0c0d,
-	0x0c11, 0x0c11,
-	0x0c29, 0x0c29,
-	0x0c34, 0x0c34,
-	0x0c3a, 0x0c3c,
-	0x0c45, 0x0c45,
-	0x0c49, 0x0c49,
-	0x0c4e, 0x0c54,
-	0x0c57, 0x0c57,
-	0x0c5a, 0x0c5f,
-	0x0c64, 0x0c65,
-	0x0c70, 0x0c77,
-	0x0c80, 0x0c81,
-	0x0c84, 0x0c84,
-	0x0c8d, 0x0c8d,
-	0x0c91, 0x0c91,
-	0x0ca9, 0x0ca9,
-	0x0cb4, 0x0cb4,
-	0x0cba, 0x0cbb,
-	0x0cc5, 0x0cc5,
-	0x0cc9, 0x0cc9,
-	0x0cce, 0x0cd4,
-	0x0cd7, 0x0cdd,
-	0x0cdf, 0x0cdf,
-	0x0ce4, 0x0ce5,
-	0x0cf0, 0x0cf0,
-	0x0cf3, 0x0d01,
-	0x0d04, 0x0d04,
-	0x0d0d, 0x0d0d,
-	0x0d11, 0x0d11,
-	0x0d3b, 0x0d3c,
-	0x0d45, 0x0d45,
-	0x0d49, 0x0d49,
-	0x0d4f, 0x0d56,
-	0x0d58, 0x0d5f,
-	0x0d64, 0x0d65,
-	0x0d76, 0x0d78,
-	0x0d80, 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,
-	0x0ee0, 0x0eff,
-	0x0f48, 0x0f48,
-	0x0f6d, 0x0f70,
-	0x0f98, 0x0f98,
-	0x0fbd, 0x0fbd,
-	0x0fcd, 0x0fcd,
-	0x0fdb, 0x0fff,
-	0x10c6, 0x10c6,
-	0x10c8, 0x10cc,
-	0x10ce, 0x10cf,
-	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, 0x135c,
-	0x137d, 0x137f,
-	0x139a, 0x139f,
-	0x13f5, 0x13ff,
-	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,
-	0x18ab, 0x18af,
-	0x18f6, 0x18ff,
-	0x191d, 0x191f,
-	0x192c, 0x192f,
-	0x193c, 0x193f,
-	0x1941, 0x1943,
-	0x196e, 0x196f,
-	0x1975, 0x197f,
-	0x19ac, 0x19af,
-	0x19ca, 0x19cf,
-	0x19db, 0x19dd,
-	0x1a1c, 0x1a1d,
-	0x1a5f, 0x1a5f,
-	0x1a7d, 0x1a7e,
-	0x1a8a, 0x1a8f,
-	0x1a9a, 0x1a9f,
-	0x1aae, 0x1aff,
-	0x1b4c, 0x1b4f,
-	0x1b7d, 0x1b7f,
-	0x1bf4, 0x1bfb,
-	0x1c38, 0x1c3a,
-	0x1c4a, 0x1c4c,
-	0x1c80, 0x1cbf,
-	0x1cc8, 0x1ccf,
-	0x1cf7, 0x1cff,
-	0x1de7, 0x1dfb,
-	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,
-	0x2065, 0x2069,
-	0x2072, 0x2073,
-	0x208f, 0x208f,
-	0x209d, 0x209f,
-	0x20ba, 0x20cf,
-	0x20f1, 0x20ff,
-	0x218a, 0x218f,
-	0x23f4, 0x23ff,
-	0x2427, 0x243f,
-	0x244b, 0x245f,
-	0x2700, 0x2700,
-	0x2b4d, 0x2b4f,
-	0x2b5a, 0x2bff,
-	0x2c2f, 0x2c2f,
-	0x2c5f, 0x2c5f,
-	0x2cf4, 0x2cf8,
-	0x2d26, 0x2d26,
-	0x2d28, 0x2d2c,
-	0x2d2e, 0x2d2f,
-	0x2d68, 0x2d6e,
-	0x2d71, 0x2d7e,
-	0x2d97, 0x2d9f,
-	0x2da7, 0x2da7,
-	0x2daf, 0x2daf,
-	0x2db7, 0x2db7,
-	0x2dbf, 0x2dbf,
-	0x2dc7, 0x2dc7,
-	0x2dcf, 0x2dcf,
-	0x2dd7, 0x2dd7,
-	0x2ddf, 0x2ddf,
-	0x2e3c, 0x2e7f,
-	0x2e9a, 0x2e9a,
-	0x2ef4, 0x2eff,
-	0x2fd6, 0x2fef,
-	0x2ffc, 0x2fff,
-	0x3040, 0x3040,
-	0x3097, 0x3098,
-	0x3100, 0x3104,
-	0x312e, 0x3130,
-	0x318f, 0x318f,
-	0x31bb, 0x31bf,
-	0x31e4, 0x31ef,
-	0x321f, 0x321f,
-	0x32ff, 0x32ff,
-	0x4db6, 0x4dbf,
-	0x9fcd, 0x9fff,
-	0xa48d, 0xa48f,
-	0xa4c7, 0xa4cf,
-	0xa62c, 0xa63f,
-	0xa698, 0xa69e,
-	0xa6f8, 0xa6ff,
-	0xa78f, 0xa78f,
-	0xa794, 0xa79f,
-	0xa7ab, 0xa7f7,
-	0xa82c, 0xa82f,
-	0xa83a, 0xa83f,
-	0xa878, 0xa87f,
-	0xa8c5, 0xa8cd,
-	0xa8da, 0xa8df,
-	0xa8fc, 0xa8ff,
-	0xa954, 0xa95e,
-	0xa97d, 0xa97f,
-	0xa9ce, 0xa9ce,
-	0xa9da, 0xa9dd,
-	0xa9e0, 0xa9ff,
-	0xaa37, 0xaa3f,
-	0xaa4e, 0xaa4f,
-	0xaa5a, 0xaa5b,
-	0xaa7c, 0xaa7f,
-	0xaac3, 0xaada,
-	0xaaf7, 0xab00,
-	0xab07, 0xab08,
-	0xab0f, 0xab10,
-	0xab17, 0xab1f,
-	0xab27, 0xab27,
-	0xab2f, 0xabbf,
-	0xabee, 0xabef,
-	0xabfa, 0xabff,
-	0xd7a4, 0xd7af,
-	0xd7c7, 0xd7ca,
-	0xd7fc, 0xd7ff,
-	0xfa6e, 0xfa6f,
-	0xfada, 0xfaff,
-	0xfb07, 0xfb12,
-	0xfb18, 0xfb1c,
-	0xfb37, 0xfb37,
-	0xfb3d, 0xfb3d,
-	0xfb3f, 0xfb3f,
-	0xfb42, 0xfb42,
-	0xfb45, 0xfb45,
-	0xfbc2, 0xfbd2,
-	0xfd40, 0xfd4f,
-	0xfd90, 0xfd91,
-	0xfdc8, 0xfdef,
-	0xfdfe, 0xfdff,
-	0xfe1a, 0xfe1f,
-	0xfe27, 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, 0x1018f,
-	0x1019c, 0x101cf,
-	0x101fe, 0x1027f,
-	0x1029d, 0x1029f,
-	0x102d1, 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,
-	0x10856, 0x10856,
-	0x10860, 0x108ff,
-	0x1091c, 0x1091e,
-	0x1093a, 0x1093e,
-	0x10940, 0x1097f,
-	0x109b8, 0x109bd,
-	0x109c0, 0x109ff,
-	0x10a04, 0x10a04,
-	0x10a07, 0x10a0b,
-	0x10a14, 0x10a14,
-	0x10a18, 0x10a18,
-	0x10a34, 0x10a37,
-	0x10a3b, 0x10a3e,
-	0x10a48, 0x10a4f,
-	0x10a59, 0x10a5f,
-	0x10a80, 0x10aff,
-	0x10b36, 0x10b38,
-	0x10b56, 0x10b57,
-	0x10b73, 0x10b77,
-	0x10b80, 0x10bff,
-	0x10c49, 0x10e5f,
-	0x10e7f, 0x10fff,
-	0x1104e, 0x11051,
-	0x11070, 0x1107f,
-	0x110c2, 0x110cf,
-	0x110e9, 0x110ef,
-	0x110fa, 0x110ff,
-	0x11135, 0x11135,
-	0x11144, 0x1117f,
-	0x111c9, 0x111cf,
-	0x111da, 0x1167f,
-	0x116b8, 0x116bf,
-	0x116ca, 0x11fff,
-	0x1236f, 0x123ff,
-	0x12463, 0x1246f,
-	0x12474, 0x12fff,
-	0x1342f, 0x167ff,
-	0x16a39, 0x16eff,
-	0x16f45, 0x16f4f,
-	0x16f7f, 0x16f8e,
-	0x16fa0, 0x1afff,
-	0x1b002, 0x1cfff,
-	0x1d0f6, 0x1d0ff,
-	0x1d127, 0x1d128,
-	0x1d1de, 0x1d1ff,
-	0x1d246, 0x1d2ff,
-	0x1d357, 0x1d35f,
-	0x1d372, 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,
-	0x1d7cc, 0x1d7cd,
-	0x1d800, 0x1edff,
-	0x1ee04, 0x1ee04,
-	0x1ee20, 0x1ee20,
-	0x1ee23, 0x1ee23,
-	0x1ee25, 0x1ee26,
-	0x1ee28, 0x1ee28,
-	0x1ee33, 0x1ee33,
-	0x1ee38, 0x1ee38,
-	0x1ee3a, 0x1ee3a,
-	0x1ee3c, 0x1ee41,
-	0x1ee43, 0x1ee46,
-	0x1ee48, 0x1ee48,
-	0x1ee4a, 0x1ee4a,
-	0x1ee4c, 0x1ee4c,
-	0x1ee50, 0x1ee50,
-	0x1ee53, 0x1ee53,
-	0x1ee55, 0x1ee56,
-	0x1ee58, 0x1ee58,
-	0x1ee5a, 0x1ee5a,
-	0x1ee5c, 0x1ee5c,
-	0x1ee5e, 0x1ee5e,
-	0x1ee60, 0x1ee60,
-	0x1ee63, 0x1ee63,
-	0x1ee65, 0x1ee66,
-	0x1ee6b, 0x1ee6b,
-	0x1ee73, 0x1ee73,
-	0x1ee78, 0x1ee78,
-	0x1ee7d, 0x1ee7d,
-	0x1ee7f, 0x1ee7f,
-	0x1ee8a, 0x1ee8a,
-	0x1ee9c, 0x1eea0,
-	0x1eea4, 0x1eea4,
-	0x1eeaa, 0x1eeaa,
-	0x1eebc, 0x1eeef,
-	0x1eef2, 0x1efff,
-	0x1f02c, 0x1f02f,
-	0x1f094, 0x1f09f,
-	0x1f0af, 0x1f0b0,
-	0x1f0bf, 0x1f0c0,
-	0x1f0d0, 0x1f0d0,
-	0x1f0e0, 0x1f0ff,
-	0x1f10b, 0x1f10f,
-	0x1f12f, 0x1f12f,
-	0x1f16c, 0x1f16f,
-	0x1f19b, 0x1f1e5,
-	0x1f203, 0x1f20f,
-	0x1f23b, 0x1f23f,
-	0x1f249, 0x1f24f,
-	0x1f252, 0x1f2ff,
-	0x1f321, 0x1f32f,
-	0x1f336, 0x1f336,
-	0x1f37d, 0x1f37f,
-	0x1f394, 0x1f39f,
-	0x1f3c5, 0x1f3c5,
-	0x1f3cb, 0x1f3df,
-	0x1f3f1, 0x1f3ff,
-	0x1f43f, 0x1f43f,
-	0x1f441, 0x1f441,
-	0x1f4f8, 0x1f4f8,
-	0x1f4fd, 0x1f4ff,
-	0x1f53e, 0x1f53f,
-	0x1f544, 0x1f54f,
-	0x1f568, 0x1f5fa,
-	0x1f641, 0x1f644,
-	0x1f650, 0x1f67f,
-	0x1f6c6, 0x1f6ff,
-	0x1f774, 0x1ffff,
-	0x2a6d7, 0x2a6ff,
-	0x2b735, 0x2b73f,
-	0x2b81e, 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[] = {
-	486,
-	0x0041, 0x005a,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00b5, 0x00b5,
-	0x00ba, 0x00ba,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x02c1,
-	0x02c6, 0x02d1,
-	0x02e0, 0x02e4,
-	0x02ec, 0x02ec,
-	0x02ee, 0x02ee,
-	0x0370, 0x0374,
-	0x0376, 0x0377,
-	0x037a, 0x037d,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x048a, 0x0527,
-	0x0531, 0x0556,
-	0x0559, 0x0559,
-	0x0561, 0x0587,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0620, 0x064a,
-	0x066e, 0x066f,
-	0x0671, 0x06d3,
-	0x06d5, 0x06d5,
-	0x06e5, 0x06e6,
-	0x06ee, 0x06ef,
-	0x06fa, 0x06fc,
-	0x06ff, 0x06ff,
-	0x0710, 0x0710,
-	0x0712, 0x072f,
-	0x074d, 0x07a5,
-	0x07b1, 0x07b1,
-	0x07ca, 0x07ea,
-	0x07f4, 0x07f5,
-	0x07fa, 0x07fa,
-	0x0800, 0x0815,
-	0x081a, 0x081a,
-	0x0824, 0x0824,
-	0x0828, 0x0828,
-	0x0840, 0x0858,
-	0x08a0, 0x08a0,
-	0x08a2, 0x08ac,
-	0x0904, 0x0939,
-	0x093d, 0x093d,
-	0x0950, 0x0950,
-	0x0958, 0x0961,
-	0x0971, 0x0977,
-	0x0979, 0x097f,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c3d,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c61,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbd, 0x0cbd,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce1,
-	0x0cf1, 0x0cf2,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d3d,
-	0x0d4e, 0x0d4e,
-	0x0d60, 0x0d61,
-	0x0d7a, 0x0d7f,
-	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, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f40, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f88, 0x0f8c,
-	0x1000, 0x102a,
-	0x103f, 0x103f,
-	0x1050, 0x1055,
-	0x105a, 0x105d,
-	0x1061, 0x1061,
-	0x1065, 0x1066,
-	0x106e, 0x1070,
-	0x1075, 0x1081,
-	0x108e, 0x108e,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 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, 0x167f,
-	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,
-	0x18aa, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19c1, 0x19c7,
-	0x1a00, 0x1a16,
-	0x1a20, 0x1a54,
-	0x1aa7, 0x1aa7,
-	0x1b05, 0x1b33,
-	0x1b45, 0x1b4b,
-	0x1b83, 0x1ba0,
-	0x1bae, 0x1baf,
-	0x1bba, 0x1be5,
-	0x1c00, 0x1c23,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c7d,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf1,
-	0x1cf5, 0x1cf6,
-	0x1d00, 0x1dbf,
-	0x1e00, 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, 0x209c,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2119, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x212d,
-	0x212f, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2183, 0x2184,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2ce4,
-	0x2ceb, 0x2cee,
-	0x2cf2, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3006,
-	0x3031, 0x3035,
-	0x303b, 0x303c,
-	0x3041, 0x3096,
-	0x309d, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa640, 0xa66e,
-	0xa67f, 0xa697,
-	0xa6a0, 0xa6e5,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xa7f8, 0xa801,
-	0xa803, 0xa805,
-	0xa807, 0xa80a,
-	0xa80c, 0xa822,
-	0xa840, 0xa873,
-	0xa882, 0xa8b3,
-	0xa8f2, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa90a, 0xa925,
-	0xa930, 0xa946,
-	0xa960, 0xa97c,
-	0xa984, 0xa9b2,
-	0xa9cf, 0xa9cf,
-	0xaa00, 0xaa28,
-	0xaa40, 0xaa42,
-	0xaa44, 0xaa4b,
-	0xaa60, 0xaa76,
-	0xaa7a, 0xaa7a,
-	0xaa80, 0xaaaf,
-	0xaab1, 0xaab1,
-	0xaab5, 0xaab6,
-	0xaab9, 0xaabd,
-	0xaac0, 0xaac0,
-	0xaac2, 0xaac2,
-	0xaadb, 0xaadd,
-	0xaae0, 0xaaea,
-	0xaaf2, 0xaaf4,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabe2,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa6d,
-	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,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x10340,
-	0x10342, 0x10349,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x10400, 0x1049d,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a00,
-	0x10a10, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11003, 0x11037,
-	0x11083, 0x110af,
-	0x110d0, 0x110e8,
-	0x11103, 0x11126,
-	0x11183, 0x111b2,
-	0x111c1, 0x111c4,
-	0x11680, 0x116aa,
-	0x12000, 0x1236e,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f50,
-	0x16f93, 0x16f9f,
-	0x1b000, 0x1b001,
-	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, 0x1d7cb,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_L */
-
-/* 'LC': General Category */
-static const OnigCodePoint CR_LC[] = {
-	113,
-	0x0041, 0x005a,
-	0x0061, 0x007a,
-	0x00b5, 0x00b5,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x01ba,
-	0x01bc, 0x01bf,
-	0x01c4, 0x0293,
-	0x0295, 0x02af,
-	0x0370, 0x0373,
-	0x0376, 0x0377,
-	0x037b, 0x037d,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x048a, 0x0527,
-	0x0531, 0x0556,
-	0x0561, 0x0587,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x1d00, 0x1d2b,
-	0x1d6b, 0x1d77,
-	0x1d79, 0x1d9a,
-	0x1e00, 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,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2119, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x212d,
-	0x212f, 0x2134,
-	0x2139, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2183, 0x2184,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2c7b,
-	0x2c7e, 0x2ce4,
-	0x2ceb, 0x2cee,
-	0x2cf2, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0xa640, 0xa66d,
-	0xa680, 0xa697,
-	0xa722, 0xa76f,
-	0xa771, 0xa787,
-	0xa78b, 0xa78e,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xa7fa, 0xa7fa,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0x10400, 0x1044f,
-	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, 0x1d7cb,
-}; /* CR_LC */
-
-/* 'Ll': General Category */
-static const OnigCodePoint CR_Ll[] = {
-	611,
-	0x0061, 0x007a,
-	0x00b5, 0x00b5,
-	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,
-	0x0242, 0x0242,
-	0x0247, 0x0247,
-	0x0249, 0x0249,
-	0x024b, 0x024b,
-	0x024d, 0x024d,
-	0x024f, 0x0293,
-	0x0295, 0x02af,
-	0x0371, 0x0371,
-	0x0373, 0x0373,
-	0x0377, 0x0377,
-	0x037b, 0x037d,
-	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, 0x04cf,
-	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,
-	0x04fb, 0x04fb,
-	0x04fd, 0x04fd,
-	0x04ff, 0x04ff,
-	0x0501, 0x0501,
-	0x0503, 0x0503,
-	0x0505, 0x0505,
-	0x0507, 0x0507,
-	0x0509, 0x0509,
-	0x050b, 0x050b,
-	0x050d, 0x050d,
-	0x050f, 0x050f,
-	0x0511, 0x0511,
-	0x0513, 0x0513,
-	0x0515, 0x0515,
-	0x0517, 0x0517,
-	0x0519, 0x0519,
-	0x051b, 0x051b,
-	0x051d, 0x051d,
-	0x051f, 0x051f,
-	0x0521, 0x0521,
-	0x0523, 0x0523,
-	0x0525, 0x0525,
-	0x0527, 0x0527,
-	0x0561, 0x0587,
-	0x1d00, 0x1d2b,
-	0x1d6b, 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, 0x1e9d,
-	0x1e9f, 0x1e9f,
-	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,
-	0x1efb, 0x1efb,
-	0x1efd, 0x1efd,
-	0x1eff, 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,
-	0x210a, 0x210a,
-	0x210e, 0x210f,
-	0x2113, 0x2113,
-	0x212f, 0x212f,
-	0x2134, 0x2134,
-	0x2139, 0x2139,
-	0x213c, 0x213d,
-	0x2146, 0x2149,
-	0x214e, 0x214e,
-	0x2184, 0x2184,
-	0x2c30, 0x2c5e,
-	0x2c61, 0x2c61,
-	0x2c65, 0x2c66,
-	0x2c68, 0x2c68,
-	0x2c6a, 0x2c6a,
-	0x2c6c, 0x2c6c,
-	0x2c71, 0x2c71,
-	0x2c73, 0x2c74,
-	0x2c76, 0x2c7b,
-	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,
-	0x2cec, 0x2cec,
-	0x2cee, 0x2cee,
-	0x2cf3, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0xa641, 0xa641,
-	0xa643, 0xa643,
-	0xa645, 0xa645,
-	0xa647, 0xa647,
-	0xa649, 0xa649,
-	0xa64b, 0xa64b,
-	0xa64d, 0xa64d,
-	0xa64f, 0xa64f,
-	0xa651, 0xa651,
-	0xa653, 0xa653,
-	0xa655, 0xa655,
-	0xa657, 0xa657,
-	0xa659, 0xa659,
-	0xa65b, 0xa65b,
-	0xa65d, 0xa65d,
-	0xa65f, 0xa65f,
-	0xa661, 0xa661,
-	0xa663, 0xa663,
-	0xa665, 0xa665,
-	0xa667, 0xa667,
-	0xa669, 0xa669,
-	0xa66b, 0xa66b,
-	0xa66d, 0xa66d,
-	0xa681, 0xa681,
-	0xa683, 0xa683,
-	0xa685, 0xa685,
-	0xa687, 0xa687,
-	0xa689, 0xa689,
-	0xa68b, 0xa68b,
-	0xa68d, 0xa68d,
-	0xa68f, 0xa68f,
-	0xa691, 0xa691,
-	0xa693, 0xa693,
-	0xa695, 0xa695,
-	0xa697, 0xa697,
-	0xa723, 0xa723,
-	0xa725, 0xa725,
-	0xa727, 0xa727,
-	0xa729, 0xa729,
-	0xa72b, 0xa72b,
-	0xa72d, 0xa72d,
-	0xa72f, 0xa731,
-	0xa733, 0xa733,
-	0xa735, 0xa735,
-	0xa737, 0xa737,
-	0xa739, 0xa739,
-	0xa73b, 0xa73b,
-	0xa73d, 0xa73d,
-	0xa73f, 0xa73f,
-	0xa741, 0xa741,
-	0xa743, 0xa743,
-	0xa745, 0xa745,
-	0xa747, 0xa747,
-	0xa749, 0xa749,
-	0xa74b, 0xa74b,
-	0xa74d, 0xa74d,
-	0xa74f, 0xa74f,
-	0xa751, 0xa751,
-	0xa753, 0xa753,
-	0xa755, 0xa755,
-	0xa757, 0xa757,
-	0xa759, 0xa759,
-	0xa75b, 0xa75b,
-	0xa75d, 0xa75d,
-	0xa75f, 0xa75f,
-	0xa761, 0xa761,
-	0xa763, 0xa763,
-	0xa765, 0xa765,
-	0xa767, 0xa767,
-	0xa769, 0xa769,
-	0xa76b, 0xa76b,
-	0xa76d, 0xa76d,
-	0xa76f, 0xa76f,
-	0xa771, 0xa778,
-	0xa77a, 0xa77a,
-	0xa77c, 0xa77c,
-	0xa77f, 0xa77f,
-	0xa781, 0xa781,
-	0xa783, 0xa783,
-	0xa785, 0xa785,
-	0xa787, 0xa787,
-	0xa78c, 0xa78c,
-	0xa78e, 0xa78e,
-	0xa791, 0xa791,
-	0xa793, 0xa793,
-	0xa7a1, 0xa7a1,
-	0xa7a3, 0xa7a3,
-	0xa7a5, 0xa7a5,
-	0xa7a7, 0xa7a7,
-	0xa7a9, 0xa7a9,
-	0xa7fa, 0xa7fa,
-	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,
-	0x1d7cb, 0x1d7cb,
-}; /* CR_Ll */
-
-/* 'Lm': General Category */
-static const OnigCodePoint CR_Lm[] = {
-	52,
-	0x02b0, 0x02c1,
-	0x02c6, 0x02d1,
-	0x02e0, 0x02e4,
-	0x02ec, 0x02ec,
-	0x02ee, 0x02ee,
-	0x0374, 0x0374,
-	0x037a, 0x037a,
-	0x0559, 0x0559,
-	0x0640, 0x0640,
-	0x06e5, 0x06e6,
-	0x07f4, 0x07f5,
-	0x07fa, 0x07fa,
-	0x081a, 0x081a,
-	0x0824, 0x0824,
-	0x0828, 0x0828,
-	0x0971, 0x0971,
-	0x0e46, 0x0e46,
-	0x0ec6, 0x0ec6,
-	0x10fc, 0x10fc,
-	0x17d7, 0x17d7,
-	0x1843, 0x1843,
-	0x1aa7, 0x1aa7,
-	0x1c78, 0x1c7d,
-	0x1d2c, 0x1d6a,
-	0x1d78, 0x1d78,
-	0x1d9b, 0x1dbf,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 0x209c,
-	0x2c7c, 0x2c7d,
-	0x2d6f, 0x2d6f,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3005,
-	0x3031, 0x3035,
-	0x303b, 0x303b,
-	0x309d, 0x309e,
-	0x30fc, 0x30fe,
-	0xa015, 0xa015,
-	0xa4f8, 0xa4fd,
-	0xa60c, 0xa60c,
-	0xa67f, 0xa67f,
-	0xa717, 0xa71f,
-	0xa770, 0xa770,
-	0xa788, 0xa788,
-	0xa7f8, 0xa7f9,
-	0xa9cf, 0xa9cf,
-	0xaa70, 0xaa70,
-	0xaadd, 0xaadd,
-	0xaaf3, 0xaaf4,
-	0xff70, 0xff70,
-	0xff9e, 0xff9f,
-	0x16f93, 0x16f9f,
-}; /* CR_Lm */
-
-/* 'Lo': General Category */
-static const OnigCodePoint CR_Lo[] = {
-	371,
-	0x00aa, 0x00aa,
-	0x00ba, 0x00ba,
-	0x01bb, 0x01bb,
-	0x01c0, 0x01c3,
-	0x0294, 0x0294,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0620, 0x063f,
-	0x0641, 0x064a,
-	0x066e, 0x066f,
-	0x0671, 0x06d3,
-	0x06d5, 0x06d5,
-	0x06ee, 0x06ef,
-	0x06fa, 0x06fc,
-	0x06ff, 0x06ff,
-	0x0710, 0x0710,
-	0x0712, 0x072f,
-	0x074d, 0x07a5,
-	0x07b1, 0x07b1,
-	0x07ca, 0x07ea,
-	0x0800, 0x0815,
-	0x0840, 0x0858,
-	0x08a0, 0x08a0,
-	0x08a2, 0x08ac,
-	0x0904, 0x0939,
-	0x093d, 0x093d,
-	0x0950, 0x0950,
-	0x0958, 0x0961,
-	0x0972, 0x0977,
-	0x0979, 0x097f,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c3d,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c61,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbd, 0x0cbd,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce1,
-	0x0cf1, 0x0cf2,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d3d,
-	0x0d4e, 0x0d4e,
-	0x0d60, 0x0d61,
-	0x0d7a, 0x0d7f,
-	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, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f40, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f88, 0x0f8c,
-	0x1000, 0x102a,
-	0x103f, 0x103f,
-	0x1050, 0x1055,
-	0x105a, 0x105d,
-	0x1061, 0x1061,
-	0x1065, 0x1066,
-	0x106e, 0x1070,
-	0x1075, 0x1081,
-	0x108e, 0x108e,
-	0x10d0, 0x10fa,
-	0x10fd, 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, 0x167f,
-	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,
-	0x18aa, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19c1, 0x19c7,
-	0x1a00, 0x1a16,
-	0x1a20, 0x1a54,
-	0x1b05, 0x1b33,
-	0x1b45, 0x1b4b,
-	0x1b83, 0x1ba0,
-	0x1bae, 0x1baf,
-	0x1bba, 0x1be5,
-	0x1c00, 0x1c23,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c77,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf1,
-	0x1cf5, 0x1cf6,
-	0x2135, 0x2138,
-	0x2d30, 0x2d67,
-	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, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcc,
-	0xa000, 0xa014,
-	0xa016, 0xa48c,
-	0xa4d0, 0xa4f7,
-	0xa500, 0xa60b,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa66e, 0xa66e,
-	0xa6a0, 0xa6e5,
-	0xa7fb, 0xa801,
-	0xa803, 0xa805,
-	0xa807, 0xa80a,
-	0xa80c, 0xa822,
-	0xa840, 0xa873,
-	0xa882, 0xa8b3,
-	0xa8f2, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa90a, 0xa925,
-	0xa930, 0xa946,
-	0xa960, 0xa97c,
-	0xa984, 0xa9b2,
-	0xaa00, 0xaa28,
-	0xaa40, 0xaa42,
-	0xaa44, 0xaa4b,
-	0xaa60, 0xaa6f,
-	0xaa71, 0xaa76,
-	0xaa7a, 0xaa7a,
-	0xaa80, 0xaaaf,
-	0xaab1, 0xaab1,
-	0xaab5, 0xaab6,
-	0xaab9, 0xaabd,
-	0xaac0, 0xaac0,
-	0xaac2, 0xaac2,
-	0xaadb, 0xaadc,
-	0xaae0, 0xaaea,
-	0xaaf2, 0xaaf2,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabe2,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa6d,
-	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,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x10340,
-	0x10342, 0x10349,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x10450, 0x1049d,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a00,
-	0x10a10, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11003, 0x11037,
-	0x11083, 0x110af,
-	0x110d0, 0x110e8,
-	0x11103, 0x11126,
-	0x11183, 0x111b2,
-	0x111c1, 0x111c4,
-	0x11680, 0x116aa,
-	0x12000, 0x1236e,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f50,
-	0x1b000, 0x1b001,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	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[] = {
-	608,
-	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,
-	0x0243, 0x0246,
-	0x0248, 0x0248,
-	0x024a, 0x024a,
-	0x024c, 0x024c,
-	0x024e, 0x024e,
-	0x0370, 0x0370,
-	0x0372, 0x0372,
-	0x0376, 0x0376,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x038f,
-	0x0391, 0x03a1,
-	0x03a3, 0x03ab,
-	0x03cf, 0x03cf,
-	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,
-	0x04fa, 0x04fa,
-	0x04fc, 0x04fc,
-	0x04fe, 0x04fe,
-	0x0500, 0x0500,
-	0x0502, 0x0502,
-	0x0504, 0x0504,
-	0x0506, 0x0506,
-	0x0508, 0x0508,
-	0x050a, 0x050a,
-	0x050c, 0x050c,
-	0x050e, 0x050e,
-	0x0510, 0x0510,
-	0x0512, 0x0512,
-	0x0514, 0x0514,
-	0x0516, 0x0516,
-	0x0518, 0x0518,
-	0x051a, 0x051a,
-	0x051c, 0x051c,
-	0x051e, 0x051e,
-	0x0520, 0x0520,
-	0x0522, 0x0522,
-	0x0524, 0x0524,
-	0x0526, 0x0526,
-	0x0531, 0x0556,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	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,
-	0x1e9e, 0x1e9e,
-	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,
-	0x1efa, 0x1efa,
-	0x1efc, 0x1efc,
-	0x1efe, 0x1efe,
-	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, 0x2133,
-	0x213e, 0x213f,
-	0x2145, 0x2145,
-	0x2183, 0x2183,
-	0x2c00, 0x2c2e,
-	0x2c60, 0x2c60,
-	0x2c62, 0x2c64,
-	0x2c67, 0x2c67,
-	0x2c69, 0x2c69,
-	0x2c6b, 0x2c6b,
-	0x2c6d, 0x2c70,
-	0x2c72, 0x2c72,
-	0x2c75, 0x2c75,
-	0x2c7e, 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,
-	0x2ceb, 0x2ceb,
-	0x2ced, 0x2ced,
-	0x2cf2, 0x2cf2,
-	0xa640, 0xa640,
-	0xa642, 0xa642,
-	0xa644, 0xa644,
-	0xa646, 0xa646,
-	0xa648, 0xa648,
-	0xa64a, 0xa64a,
-	0xa64c, 0xa64c,
-	0xa64e, 0xa64e,
-	0xa650, 0xa650,
-	0xa652, 0xa652,
-	0xa654, 0xa654,
-	0xa656, 0xa656,
-	0xa658, 0xa658,
-	0xa65a, 0xa65a,
-	0xa65c, 0xa65c,
-	0xa65e, 0xa65e,
-	0xa660, 0xa660,
-	0xa662, 0xa662,
-	0xa664, 0xa664,
-	0xa666, 0xa666,
-	0xa668, 0xa668,
-	0xa66a, 0xa66a,
-	0xa66c, 0xa66c,
-	0xa680, 0xa680,
-	0xa682, 0xa682,
-	0xa684, 0xa684,
-	0xa686, 0xa686,
-	0xa688, 0xa688,
-	0xa68a, 0xa68a,
-	0xa68c, 0xa68c,
-	0xa68e, 0xa68e,
-	0xa690, 0xa690,
-	0xa692, 0xa692,
-	0xa694, 0xa694,
-	0xa696, 0xa696,
-	0xa722, 0xa722,
-	0xa724, 0xa724,
-	0xa726, 0xa726,
-	0xa728, 0xa728,
-	0xa72a, 0xa72a,
-	0xa72c, 0xa72c,
-	0xa72e, 0xa72e,
-	0xa732, 0xa732,
-	0xa734, 0xa734,
-	0xa736, 0xa736,
-	0xa738, 0xa738,
-	0xa73a, 0xa73a,
-	0xa73c, 0xa73c,
-	0xa73e, 0xa73e,
-	0xa740, 0xa740,
-	0xa742, 0xa742,
-	0xa744, 0xa744,
-	0xa746, 0xa746,
-	0xa748, 0xa748,
-	0xa74a, 0xa74a,
-	0xa74c, 0xa74c,
-	0xa74e, 0xa74e,
-	0xa750, 0xa750,
-	0xa752, 0xa752,
-	0xa754, 0xa754,
-	0xa756, 0xa756,
-	0xa758, 0xa758,
-	0xa75a, 0xa75a,
-	0xa75c, 0xa75c,
-	0xa75e, 0xa75e,
-	0xa760, 0xa760,
-	0xa762, 0xa762,
-	0xa764, 0xa764,
-	0xa766, 0xa766,
-	0xa768, 0xa768,
-	0xa76a, 0xa76a,
-	0xa76c, 0xa76c,
-	0xa76e, 0xa76e,
-	0xa779, 0xa779,
-	0xa77b, 0xa77b,
-	0xa77d, 0xa77e,
-	0xa780, 0xa780,
-	0xa782, 0xa782,
-	0xa784, 0xa784,
-	0xa786, 0xa786,
-	0xa78b, 0xa78b,
-	0xa78d, 0xa78d,
-	0xa790, 0xa790,
-	0xa792, 0xa792,
-	0xa7a0, 0xa7a0,
-	0xa7a2, 0xa7a2,
-	0xa7a4, 0xa7a4,
-	0xa7a6, 0xa7a6,
-	0xa7a8, 0xa7a8,
-	0xa7aa, 0xa7aa,
-	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,
-	0x1d7ca, 0x1d7ca,
-}; /* CR_Lu */
-
-/* 'M': Major Category */
-static const OnigCodePoint CR_M[] = {
-	204,
-	0x0300, 0x036f,
-	0x0483, 0x0489,
-	0x0591, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x0610, 0x061a,
-	0x064b, 0x065f,
-	0x0670, 0x0670,
-	0x06d6, 0x06dc,
-	0x06df, 0x06e4,
-	0x06e7, 0x06e8,
-	0x06ea, 0x06ed,
-	0x0711, 0x0711,
-	0x0730, 0x074a,
-	0x07a6, 0x07b0,
-	0x07eb, 0x07f3,
-	0x0816, 0x0819,
-	0x081b, 0x0823,
-	0x0825, 0x0827,
-	0x0829, 0x082d,
-	0x0859, 0x085b,
-	0x08e4, 0x08fe,
-	0x0900, 0x0903,
-	0x093a, 0x093c,
-	0x093e, 0x094f,
-	0x0951, 0x0957,
-	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,
-	0x0a51, 0x0a51,
-	0x0a70, 0x0a71,
-	0x0a75, 0x0a75,
-	0x0a81, 0x0a83,
-	0x0abc, 0x0abc,
-	0x0abe, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acd,
-	0x0ae2, 0x0ae3,
-	0x0b01, 0x0b03,
-	0x0b3c, 0x0b3c,
-	0x0b3e, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b62, 0x0b63,
-	0x0b82, 0x0b82,
-	0x0bbe, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcd,
-	0x0bd7, 0x0bd7,
-	0x0c01, 0x0c03,
-	0x0c3e, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c62, 0x0c63,
-	0x0c82, 0x0c83,
-	0x0cbc, 0x0cbc,
-	0x0cbe, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0ce2, 0x0ce3,
-	0x0d02, 0x0d03,
-	0x0d3e, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
-	0x0d57, 0x0d57,
-	0x0d62, 0x0d63,
-	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,
-	0x0f8d, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fc6, 0x0fc6,
-	0x102b, 0x103e,
-	0x1056, 0x1059,
-	0x105e, 0x1060,
-	0x1062, 0x1064,
-	0x1067, 0x106d,
-	0x1071, 0x1074,
-	0x1082, 0x108d,
-	0x108f, 0x108f,
-	0x109a, 0x109d,
-	0x135d, 0x135f,
-	0x1712, 0x1714,
-	0x1732, 0x1734,
-	0x1752, 0x1753,
-	0x1772, 0x1773,
-	0x17b4, 0x17d3,
-	0x17dd, 0x17dd,
-	0x180b, 0x180d,
-	0x18a9, 0x18a9,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x19b0, 0x19c0,
-	0x19c8, 0x19c9,
-	0x1a17, 0x1a1b,
-	0x1a55, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a7f,
-	0x1b00, 0x1b04,
-	0x1b34, 0x1b44,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1b82,
-	0x1ba1, 0x1bad,
-	0x1be6, 0x1bf3,
-	0x1c24, 0x1c37,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1cf2, 0x1cf4,
-	0x1dc0, 0x1de6,
-	0x1dfc, 0x1dff,
-	0x20d0, 0x20f0,
-	0x2cef, 0x2cf1,
-	0x2d7f, 0x2d7f,
-	0x2de0, 0x2dff,
-	0x302a, 0x302f,
-	0x3099, 0x309a,
-	0xa66f, 0xa672,
-	0xa674, 0xa67d,
-	0xa69f, 0xa69f,
-	0xa6f0, 0xa6f1,
-	0xa802, 0xa802,
-	0xa806, 0xa806,
-	0xa80b, 0xa80b,
-	0xa823, 0xa827,
-	0xa880, 0xa881,
-	0xa8b4, 0xa8c4,
-	0xa8e0, 0xa8f1,
-	0xa926, 0xa92d,
-	0xa947, 0xa953,
-	0xa980, 0xa983,
-	0xa9b3, 0xa9c0,
-	0xaa29, 0xaa36,
-	0xaa43, 0xaa43,
-	0xaa4c, 0xaa4d,
-	0xaa7b, 0xaa7b,
-	0xaab0, 0xaab0,
-	0xaab2, 0xaab4,
-	0xaab7, 0xaab8,
-	0xaabe, 0xaabf,
-	0xaac1, 0xaac1,
-	0xaaeb, 0xaaef,
-	0xaaf5, 0xaaf6,
-	0xabe3, 0xabea,
-	0xabec, 0xabed,
-	0xfb1e, 0xfb1e,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe26,
-	0x101fd, 0x101fd,
-	0x10a01, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a0f,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x11000, 0x11002,
-	0x11038, 0x11046,
-	0x11080, 0x11082,
-	0x110b0, 0x110ba,
-	0x11100, 0x11102,
-	0x11127, 0x11134,
-	0x11180, 0x11182,
-	0x111b3, 0x111c0,
-	0x116ab, 0x116b7,
-	0x16f51, 0x16f7e,
-	0x16f8f, 0x16f92,
-	0x1d165, 0x1d169,
-	0x1d16d, 0x1d172,
-	0x1d17b, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-	0x1d242, 0x1d244,
-	0xe0100, 0xe01ef,
-}; /* CR_M */
-
-/* 'Mc': General Category */
-static const OnigCodePoint CR_Mc[] = {
-	126,
-	0x0903, 0x0903,
-	0x093b, 0x093b,
-	0x093e, 0x0940,
-	0x0949, 0x094c,
-	0x094e, 0x094f,
-	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,
-	0x102b, 0x102c,
-	0x1031, 0x1031,
-	0x1038, 0x1038,
-	0x103b, 0x103c,
-	0x1056, 0x1057,
-	0x1062, 0x1064,
-	0x1067, 0x106d,
-	0x1083, 0x1084,
-	0x1087, 0x108c,
-	0x108f, 0x108f,
-	0x109a, 0x109c,
-	0x17b6, 0x17b6,
-	0x17be, 0x17c5,
-	0x17c7, 0x17c8,
-	0x1923, 0x1926,
-	0x1929, 0x192b,
-	0x1930, 0x1931,
-	0x1933, 0x1938,
-	0x19b0, 0x19c0,
-	0x19c8, 0x19c9,
-	0x1a19, 0x1a1b,
-	0x1a55, 0x1a55,
-	0x1a57, 0x1a57,
-	0x1a61, 0x1a61,
-	0x1a63, 0x1a64,
-	0x1a6d, 0x1a72,
-	0x1b04, 0x1b04,
-	0x1b35, 0x1b35,
-	0x1b3b, 0x1b3b,
-	0x1b3d, 0x1b41,
-	0x1b43, 0x1b44,
-	0x1b82, 0x1b82,
-	0x1ba1, 0x1ba1,
-	0x1ba6, 0x1ba7,
-	0x1baa, 0x1baa,
-	0x1bac, 0x1bad,
-	0x1be7, 0x1be7,
-	0x1bea, 0x1bec,
-	0x1bee, 0x1bee,
-	0x1bf2, 0x1bf3,
-	0x1c24, 0x1c2b,
-	0x1c34, 0x1c35,
-	0x1ce1, 0x1ce1,
-	0x1cf2, 0x1cf3,
-	0x302e, 0x302f,
-	0xa823, 0xa824,
-	0xa827, 0xa827,
-	0xa880, 0xa881,
-	0xa8b4, 0xa8c3,
-	0xa952, 0xa953,
-	0xa983, 0xa983,
-	0xa9b4, 0xa9b5,
-	0xa9ba, 0xa9bb,
-	0xa9bd, 0xa9c0,
-	0xaa2f, 0xaa30,
-	0xaa33, 0xaa34,
-	0xaa4d, 0xaa4d,
-	0xaa7b, 0xaa7b,
-	0xaaeb, 0xaaeb,
-	0xaaee, 0xaaef,
-	0xaaf5, 0xaaf5,
-	0xabe3, 0xabe4,
-	0xabe6, 0xabe7,
-	0xabe9, 0xabea,
-	0xabec, 0xabec,
-	0x11000, 0x11000,
-	0x11002, 0x11002,
-	0x11082, 0x11082,
-	0x110b0, 0x110b2,
-	0x110b7, 0x110b8,
-	0x1112c, 0x1112c,
-	0x11182, 0x11182,
-	0x111b3, 0x111b5,
-	0x111bf, 0x111c0,
-	0x116ac, 0x116ac,
-	0x116ae, 0x116af,
-	0x116b6, 0x116b6,
-	0x16f51, 0x16f7e,
-	0x1d165, 0x1d166,
-	0x1d16d, 0x1d172,
-}; /* CR_Mc */
-
-/* 'Me': General Category */
-static const OnigCodePoint CR_Me[] = {
-	4,
-	0x0488, 0x0489,
-	0x20dd, 0x20e0,
-	0x20e2, 0x20e4,
-	0xa670, 0xa672,
-}; /* CR_Me */
-
-/* 'Mn': General Category */
-static const OnigCodePoint CR_Mn[] = {
-	220,
-	0x0300, 0x036f,
-	0x0483, 0x0487,
-	0x0591, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x0610, 0x061a,
-	0x064b, 0x065f,
-	0x0670, 0x0670,
-	0x06d6, 0x06dc,
-	0x06df, 0x06e4,
-	0x06e7, 0x06e8,
-	0x06ea, 0x06ed,
-	0x0711, 0x0711,
-	0x0730, 0x074a,
-	0x07a6, 0x07b0,
-	0x07eb, 0x07f3,
-	0x0816, 0x0819,
-	0x081b, 0x0823,
-	0x0825, 0x0827,
-	0x0829, 0x082d,
-	0x0859, 0x085b,
-	0x08e4, 0x08fe,
-	0x0900, 0x0902,
-	0x093a, 0x093a,
-	0x093c, 0x093c,
-	0x0941, 0x0948,
-	0x094d, 0x094d,
-	0x0951, 0x0957,
-	0x0962, 0x0963,
-	0x0981, 0x0981,
-	0x09bc, 0x09bc,
-	0x09c1, 0x09c4,
-	0x09cd, 0x09cd,
-	0x09e2, 0x09e3,
-	0x0a01, 0x0a02,
-	0x0a3c, 0x0a3c,
-	0x0a41, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a70, 0x0a71,
-	0x0a75, 0x0a75,
-	0x0a81, 0x0a82,
-	0x0abc, 0x0abc,
-	0x0ac1, 0x0ac5,
-	0x0ac7, 0x0ac8,
-	0x0acd, 0x0acd,
-	0x0ae2, 0x0ae3,
-	0x0b01, 0x0b01,
-	0x0b3c, 0x0b3c,
-	0x0b3f, 0x0b3f,
-	0x0b41, 0x0b44,
-	0x0b4d, 0x0b4d,
-	0x0b56, 0x0b56,
-	0x0b62, 0x0b63,
-	0x0b82, 0x0b82,
-	0x0bc0, 0x0bc0,
-	0x0bcd, 0x0bcd,
-	0x0c3e, 0x0c40,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c62, 0x0c63,
-	0x0cbc, 0x0cbc,
-	0x0cbf, 0x0cbf,
-	0x0cc6, 0x0cc6,
-	0x0ccc, 0x0ccd,
-	0x0ce2, 0x0ce3,
-	0x0d41, 0x0d44,
-	0x0d4d, 0x0d4d,
-	0x0d62, 0x0d63,
-	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,
-	0x0f8d, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fc6, 0x0fc6,
-	0x102d, 0x1030,
-	0x1032, 0x1037,
-	0x1039, 0x103a,
-	0x103d, 0x103e,
-	0x1058, 0x1059,
-	0x105e, 0x1060,
-	0x1071, 0x1074,
-	0x1082, 0x1082,
-	0x1085, 0x1086,
-	0x108d, 0x108d,
-	0x109d, 0x109d,
-	0x135d, 0x135f,
-	0x1712, 0x1714,
-	0x1732, 0x1734,
-	0x1752, 0x1753,
-	0x1772, 0x1773,
-	0x17b4, 0x17b5,
-	0x17b7, 0x17bd,
-	0x17c6, 0x17c6,
-	0x17c9, 0x17d3,
-	0x17dd, 0x17dd,
-	0x180b, 0x180d,
-	0x18a9, 0x18a9,
-	0x1920, 0x1922,
-	0x1927, 0x1928,
-	0x1932, 0x1932,
-	0x1939, 0x193b,
-	0x1a17, 0x1a18,
-	0x1a56, 0x1a56,
-	0x1a58, 0x1a5e,
-	0x1a60, 0x1a60,
-	0x1a62, 0x1a62,
-	0x1a65, 0x1a6c,
-	0x1a73, 0x1a7c,
-	0x1a7f, 0x1a7f,
-	0x1b00, 0x1b03,
-	0x1b34, 0x1b34,
-	0x1b36, 0x1b3a,
-	0x1b3c, 0x1b3c,
-	0x1b42, 0x1b42,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1b81,
-	0x1ba2, 0x1ba5,
-	0x1ba8, 0x1ba9,
-	0x1bab, 0x1bab,
-	0x1be6, 0x1be6,
-	0x1be8, 0x1be9,
-	0x1bed, 0x1bed,
-	0x1bef, 0x1bf1,
-	0x1c2c, 0x1c33,
-	0x1c36, 0x1c37,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce0,
-	0x1ce2, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1cf4, 0x1cf4,
-	0x1dc0, 0x1de6,
-	0x1dfc, 0x1dff,
-	0x20d0, 0x20dc,
-	0x20e1, 0x20e1,
-	0x20e5, 0x20f0,
-	0x2cef, 0x2cf1,
-	0x2d7f, 0x2d7f,
-	0x2de0, 0x2dff,
-	0x302a, 0x302d,
-	0x3099, 0x309a,
-	0xa66f, 0xa66f,
-	0xa674, 0xa67d,
-	0xa69f, 0xa69f,
-	0xa6f0, 0xa6f1,
-	0xa802, 0xa802,
-	0xa806, 0xa806,
-	0xa80b, 0xa80b,
-	0xa825, 0xa826,
-	0xa8c4, 0xa8c4,
-	0xa8e0, 0xa8f1,
-	0xa926, 0xa92d,
-	0xa947, 0xa951,
-	0xa980, 0xa982,
-	0xa9b3, 0xa9b3,
-	0xa9b6, 0xa9b9,
-	0xa9bc, 0xa9bc,
-	0xaa29, 0xaa2e,
-	0xaa31, 0xaa32,
-	0xaa35, 0xaa36,
-	0xaa43, 0xaa43,
-	0xaa4c, 0xaa4c,
-	0xaab0, 0xaab0,
-	0xaab2, 0xaab4,
-	0xaab7, 0xaab8,
-	0xaabe, 0xaabf,
-	0xaac1, 0xaac1,
-	0xaaec, 0xaaed,
-	0xaaf6, 0xaaf6,
-	0xabe5, 0xabe5,
-	0xabe8, 0xabe8,
-	0xabed, 0xabed,
-	0xfb1e, 0xfb1e,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe26,
-	0x101fd, 0x101fd,
-	0x10a01, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a0f,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x11001, 0x11001,
-	0x11038, 0x11046,
-	0x11080, 0x11081,
-	0x110b3, 0x110b6,
-	0x110b9, 0x110ba,
-	0x11100, 0x11102,
-	0x11127, 0x1112b,
-	0x1112d, 0x11134,
-	0x11180, 0x11181,
-	0x111b6, 0x111be,
-	0x116ab, 0x116ab,
-	0x116ad, 0x116ad,
-	0x116b0, 0x116b5,
-	0x116b7, 0x116b7,
-	0x16f8f, 0x16f92,
-	0x1d167, 0x1d169,
-	0x1d17b, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-	0x1d242, 0x1d244,
-	0xe0100, 0xe01ef,
-}; /* CR_Mn */
-
-/* 'N': Major Category */
-static const OnigCodePoint CR_N[] = {
-	88,
-	0x0030, 0x0039,
-	0x00b2, 0x00b3,
-	0x00b9, 0x00b9,
-	0x00bc, 0x00be,
-	0x0660, 0x0669,
-	0x06f0, 0x06f9,
-	0x07c0, 0x07c9,
-	0x0966, 0x096f,
-	0x09e6, 0x09ef,
-	0x09f4, 0x09f9,
-	0x0a66, 0x0a6f,
-	0x0ae6, 0x0aef,
-	0x0b66, 0x0b6f,
-	0x0b72, 0x0b77,
-	0x0be6, 0x0bf2,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7e,
-	0x0ce6, 0x0cef,
-	0x0d66, 0x0d75,
-	0x0e50, 0x0e59,
-	0x0ed0, 0x0ed9,
-	0x0f20, 0x0f33,
-	0x1040, 0x1049,
-	0x1090, 0x1099,
-	0x1369, 0x137c,
-	0x16ee, 0x16f0,
-	0x17e0, 0x17e9,
-	0x17f0, 0x17f9,
-	0x1810, 0x1819,
-	0x1946, 0x194f,
-	0x19d0, 0x19da,
-	0x1a80, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1b50, 0x1b59,
-	0x1bb0, 0x1bb9,
-	0x1c40, 0x1c49,
-	0x1c50, 0x1c59,
-	0x2070, 0x2070,
-	0x2074, 0x2079,
-	0x2080, 0x2089,
-	0x2150, 0x2182,
-	0x2185, 0x2189,
-	0x2460, 0x249b,
-	0x24ea, 0x24ff,
-	0x2776, 0x2793,
-	0x2cfd, 0x2cfd,
-	0x3007, 0x3007,
-	0x3021, 0x3029,
-	0x3038, 0x303a,
-	0x3192, 0x3195,
-	0x3220, 0x3229,
-	0x3248, 0x324f,
-	0x3251, 0x325f,
-	0x3280, 0x3289,
-	0x32b1, 0x32bf,
-	0xa620, 0xa629,
-	0xa6e6, 0xa6ef,
-	0xa830, 0xa835,
-	0xa8d0, 0xa8d9,
-	0xa900, 0xa909,
-	0xa9d0, 0xa9d9,
-	0xaa50, 0xaa59,
-	0xabf0, 0xabf9,
-	0xff10, 0xff19,
-	0x10107, 0x10133,
-	0x10140, 0x10178,
-	0x1018a, 0x1018a,
-	0x10320, 0x10323,
-	0x10341, 0x10341,
-	0x1034a, 0x1034a,
-	0x103d1, 0x103d5,
-	0x104a0, 0x104a9,
-	0x10858, 0x1085f,
-	0x10916, 0x1091b,
-	0x10a40, 0x10a47,
-	0x10a7d, 0x10a7e,
-	0x10b58, 0x10b5f,
-	0x10b78, 0x10b7f,
-	0x10e60, 0x10e7e,
-	0x11052, 0x1106f,
-	0x110f0, 0x110f9,
-	0x11136, 0x1113f,
-	0x111d0, 0x111d9,
-	0x116c0, 0x116c9,
-	0x12400, 0x12462,
-	0x1d360, 0x1d371,
-	0x1d7ce, 0x1d7ff,
-	0x1f100, 0x1f10a,
-}; /* CR_N */
-
-/* 'Nd': General Category */
-#define CR_Nd CR_Digit
-
-/* 'Nl': General Category */
-static const OnigCodePoint CR_Nl[] = {
-	12,
-	0x16ee, 0x16f0,
-	0x2160, 0x2182,
-	0x2185, 0x2188,
-	0x3007, 0x3007,
-	0x3021, 0x3029,
-	0x3038, 0x303a,
-	0xa6e6, 0xa6ef,
-	0x10140, 0x10174,
-	0x10341, 0x10341,
-	0x1034a, 0x1034a,
-	0x103d1, 0x103d5,
-	0x12400, 0x12462,
-}; /* CR_Nl */
-
-/* 'No': General Category */
-static const OnigCodePoint CR_No[] = {
-	42,
-	0x00b2, 0x00b3,
-	0x00b9, 0x00b9,
-	0x00bc, 0x00be,
-	0x09f4, 0x09f9,
-	0x0b72, 0x0b77,
-	0x0bf0, 0x0bf2,
-	0x0c78, 0x0c7e,
-	0x0d70, 0x0d75,
-	0x0f2a, 0x0f33,
-	0x1369, 0x137c,
-	0x17f0, 0x17f9,
-	0x19da, 0x19da,
-	0x2070, 0x2070,
-	0x2074, 0x2079,
-	0x2080, 0x2089,
-	0x2150, 0x215f,
-	0x2189, 0x2189,
-	0x2460, 0x249b,
-	0x24ea, 0x24ff,
-	0x2776, 0x2793,
-	0x2cfd, 0x2cfd,
-	0x3192, 0x3195,
-	0x3220, 0x3229,
-	0x3248, 0x324f,
-	0x3251, 0x325f,
-	0x3280, 0x3289,
-	0x32b1, 0x32bf,
-	0xa830, 0xa835,
-	0x10107, 0x10133,
-	0x10175, 0x10178,
-	0x1018a, 0x1018a,
-	0x10320, 0x10323,
-	0x10858, 0x1085f,
-	0x10916, 0x1091b,
-	0x10a40, 0x10a47,
-	0x10a7d, 0x10a7e,
-	0x10b58, 0x10b5f,
-	0x10b78, 0x10b7f,
-	0x10e60, 0x10e7e,
-	0x11052, 0x11065,
-	0x1d360, 0x1d371,
-	0x1f100, 0x1f10a,
-}; /* CR_No */
-
-/* 'P': Major Category */
-#define CR_P CR_Punct
-
-/* '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[] = {
-	16,
-	0x002d, 0x002d,
-	0x058a, 0x058a,
-	0x05be, 0x05be,
-	0x1400, 0x1400,
-	0x1806, 0x1806,
-	0x2010, 0x2015,
-	0x2e17, 0x2e17,
-	0x2e1a, 0x2e1a,
-	0x2e3a, 0x2e3b,
-	0x301c, 0x301c,
-	0x3030, 0x3030,
-	0x30a0, 0x30a0,
-	0xfe31, 0xfe32,
-	0xfe58, 0xfe58,
-	0xfe63, 0xfe63,
-	0xff0d, 0xff0d,
-}; /* CR_Pd */
-
-/* 'Pe': General Category */
-static const OnigCodePoint CR_Pe[] = {
-	70,
-	0x0029, 0x0029,
-	0x005d, 0x005d,
-	0x007d, 0x007d,
-	0x0f3b, 0x0f3b,
-	0x0f3d, 0x0f3d,
-	0x169c, 0x169c,
-	0x2046, 0x2046,
-	0x207e, 0x207e,
-	0x208e, 0x208e,
-	0x232a, 0x232a,
-	0x2769, 0x2769,
-	0x276b, 0x276b,
-	0x276d, 0x276d,
-	0x276f, 0x276f,
-	0x2771, 0x2771,
-	0x2773, 0x2773,
-	0x2775, 0x2775,
-	0x27c6, 0x27c6,
-	0x27e7, 0x27e7,
-	0x27e9, 0x27e9,
-	0x27eb, 0x27eb,
-	0x27ed, 0x27ed,
-	0x27ef, 0x27ef,
-	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,
-	0x2e23, 0x2e23,
-	0x2e25, 0x2e25,
-	0x2e27, 0x2e27,
-	0x2e29, 0x2e29,
-	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[] = {
-	10,
-	0x00bb, 0x00bb,
-	0x2019, 0x2019,
-	0x201d, 0x201d,
-	0x203a, 0x203a,
-	0x2e03, 0x2e03,
-	0x2e05, 0x2e05,
-	0x2e0a, 0x2e0a,
-	0x2e0d, 0x2e0d,
-	0x2e1d, 0x2e1d,
-	0x2e21, 0x2e21,
-}; /* CR_Pf */
-
-/* 'Pi': General Category */
-static const OnigCodePoint CR_Pi[] = {
-	11,
-	0x00ab, 0x00ab,
-	0x2018, 0x2018,
-	0x201b, 0x201c,
-	0x201f, 0x201f,
-	0x2039, 0x2039,
-	0x2e02, 0x2e02,
-	0x2e04, 0x2e04,
-	0x2e09, 0x2e09,
-	0x2e0c, 0x2e0c,
-	0x2e1c, 0x2e1c,
-	0x2e20, 0x2e20,
-}; /* CR_Pi */
-
-/* 'Po': General Category */
-static const OnigCodePoint CR_Po[] = {
-	135,
-	0x0021, 0x0023,
-	0x0025, 0x0027,
-	0x002a, 0x002a,
-	0x002c, 0x002c,
-	0x002e, 0x002f,
-	0x003a, 0x003b,
-	0x003f, 0x0040,
-	0x005c, 0x005c,
-	0x00a1, 0x00a1,
-	0x00a7, 0x00a7,
-	0x00b6, 0x00b7,
-	0x00bf, 0x00bf,
-	0x037e, 0x037e,
-	0x0387, 0x0387,
-	0x055a, 0x055f,
-	0x0589, 0x0589,
-	0x05c0, 0x05c0,
-	0x05c3, 0x05c3,
-	0x05c6, 0x05c6,
-	0x05f3, 0x05f4,
-	0x0609, 0x060a,
-	0x060c, 0x060d,
-	0x061b, 0x061b,
-	0x061e, 0x061f,
-	0x066a, 0x066d,
-	0x06d4, 0x06d4,
-	0x0700, 0x070d,
-	0x07f7, 0x07f9,
-	0x0830, 0x083e,
-	0x085e, 0x085e,
-	0x0964, 0x0965,
-	0x0970, 0x0970,
-	0x0af0, 0x0af0,
-	0x0df4, 0x0df4,
-	0x0e4f, 0x0e4f,
-	0x0e5a, 0x0e5b,
-	0x0f04, 0x0f12,
-	0x0f14, 0x0f14,
-	0x0f85, 0x0f85,
-	0x0fd0, 0x0fd4,
-	0x0fd9, 0x0fda,
-	0x104a, 0x104f,
-	0x10fb, 0x10fb,
-	0x1360, 0x1368,
-	0x166d, 0x166e,
-	0x16eb, 0x16ed,
-	0x1735, 0x1736,
-	0x17d4, 0x17d6,
-	0x17d8, 0x17da,
-	0x1800, 0x1805,
-	0x1807, 0x180a,
-	0x1944, 0x1945,
-	0x1a1e, 0x1a1f,
-	0x1aa0, 0x1aa6,
-	0x1aa8, 0x1aad,
-	0x1b5a, 0x1b60,
-	0x1bfc, 0x1bff,
-	0x1c3b, 0x1c3f,
-	0x1c7e, 0x1c7f,
-	0x1cc0, 0x1cc7,
-	0x1cd3, 0x1cd3,
-	0x2016, 0x2017,
-	0x2020, 0x2027,
-	0x2030, 0x2038,
-	0x203b, 0x203e,
-	0x2041, 0x2043,
-	0x2047, 0x2051,
-	0x2053, 0x2053,
-	0x2055, 0x205e,
-	0x2cf9, 0x2cfc,
-	0x2cfe, 0x2cff,
-	0x2d70, 0x2d70,
-	0x2e00, 0x2e01,
-	0x2e06, 0x2e08,
-	0x2e0b, 0x2e0b,
-	0x2e0e, 0x2e16,
-	0x2e18, 0x2e19,
-	0x2e1b, 0x2e1b,
-	0x2e1e, 0x2e1f,
-	0x2e2a, 0x2e2e,
-	0x2e30, 0x2e39,
-	0x3001, 0x3003,
-	0x303d, 0x303d,
-	0x30fb, 0x30fb,
-	0xa4fe, 0xa4ff,
-	0xa60d, 0xa60f,
-	0xa673, 0xa673,
-	0xa67e, 0xa67e,
-	0xa6f2, 0xa6f7,
-	0xa874, 0xa877,
-	0xa8ce, 0xa8cf,
-	0xa8f8, 0xa8fa,
-	0xa92e, 0xa92f,
-	0xa95f, 0xa95f,
-	0xa9c1, 0xa9cd,
-	0xa9de, 0xa9df,
-	0xaa5c, 0xaa5f,
-	0xaade, 0xaadf,
-	0xaaf0, 0xaaf1,
-	0xabeb, 0xabeb,
-	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, 0x10102,
-	0x1039f, 0x1039f,
-	0x103d0, 0x103d0,
-	0x10857, 0x10857,
-	0x1091f, 0x1091f,
-	0x1093f, 0x1093f,
-	0x10a50, 0x10a58,
-	0x10a7f, 0x10a7f,
-	0x10b39, 0x10b3f,
-	0x11047, 0x1104d,
-	0x110bb, 0x110bc,
-	0x110be, 0x110c1,
-	0x11140, 0x11143,
-	0x111c5, 0x111c8,
-	0x12470, 0x12473,
-}; /* CR_Po */
-
-/* 'Ps': General Category */
-static const OnigCodePoint CR_Ps[] = {
-	72,
-	0x0028, 0x0028,
-	0x005b, 0x005b,
-	0x007b, 0x007b,
-	0x0f3a, 0x0f3a,
-	0x0f3c, 0x0f3c,
-	0x169b, 0x169b,
-	0x201a, 0x201a,
-	0x201e, 0x201e,
-	0x2045, 0x2045,
-	0x207d, 0x207d,
-	0x208d, 0x208d,
-	0x2329, 0x2329,
-	0x2768, 0x2768,
-	0x276a, 0x276a,
-	0x276c, 0x276c,
-	0x276e, 0x276e,
-	0x2770, 0x2770,
-	0x2772, 0x2772,
-	0x2774, 0x2774,
-	0x27c5, 0x27c5,
-	0x27e6, 0x27e6,
-	0x27e8, 0x27e8,
-	0x27ea, 0x27ea,
-	0x27ec, 0x27ec,
-	0x27ee, 0x27ee,
-	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,
-	0x2e22, 0x2e22,
-	0x2e24, 0x2e24,
-	0x2e26, 0x2e26,
-	0x2e28, 0x2e28,
-	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[] = {
-	198,
-	0x0024, 0x0024,
-	0x002b, 0x002b,
-	0x003c, 0x003e,
-	0x005e, 0x005e,
-	0x0060, 0x0060,
-	0x007c, 0x007c,
-	0x007e, 0x007e,
-	0x00a2, 0x00a6,
-	0x00a8, 0x00a9,
-	0x00ac, 0x00ac,
-	0x00ae, 0x00b1,
-	0x00b4, 0x00b4,
-	0x00b8, 0x00b8,
-	0x00d7, 0x00d7,
-	0x00f7, 0x00f7,
-	0x02c2, 0x02c5,
-	0x02d2, 0x02df,
-	0x02e5, 0x02eb,
-	0x02ed, 0x02ed,
-	0x02ef, 0x02ff,
-	0x0375, 0x0375,
-	0x0384, 0x0385,
-	0x03f6, 0x03f6,
-	0x0482, 0x0482,
-	0x058f, 0x058f,
-	0x0606, 0x0608,
-	0x060b, 0x060b,
-	0x060e, 0x060f,
-	0x06de, 0x06de,
-	0x06e9, 0x06e9,
-	0x06fd, 0x06fe,
-	0x07f6, 0x07f6,
-	0x09f2, 0x09f3,
-	0x09fa, 0x09fb,
-	0x0af1, 0x0af1,
-	0x0b70, 0x0b70,
-	0x0bf3, 0x0bfa,
-	0x0c7f, 0x0c7f,
-	0x0d79, 0x0d79,
-	0x0e3f, 0x0e3f,
-	0x0f01, 0x0f03,
-	0x0f13, 0x0f13,
-	0x0f15, 0x0f17,
-	0x0f1a, 0x0f1f,
-	0x0f34, 0x0f34,
-	0x0f36, 0x0f36,
-	0x0f38, 0x0f38,
-	0x0fbe, 0x0fc5,
-	0x0fc7, 0x0fcc,
-	0x0fce, 0x0fcf,
-	0x0fd5, 0x0fd8,
-	0x109e, 0x109f,
-	0x1390, 0x1399,
-	0x17db, 0x17db,
-	0x1940, 0x1940,
-	0x19de, 0x19ff,
-	0x1b61, 0x1b6a,
-	0x1b74, 0x1b7c,
-	0x1fbd, 0x1fbd,
-	0x1fbf, 0x1fc1,
-	0x1fcd, 0x1fcf,
-	0x1fdd, 0x1fdf,
-	0x1fed, 0x1fef,
-	0x1ffd, 0x1ffe,
-	0x2044, 0x2044,
-	0x2052, 0x2052,
-	0x207a, 0x207c,
-	0x208a, 0x208c,
-	0x20a0, 0x20b9,
-	0x2100, 0x2101,
-	0x2103, 0x2106,
-	0x2108, 0x2109,
-	0x2114, 0x2114,
-	0x2116, 0x2118,
-	0x211e, 0x2123,
-	0x2125, 0x2125,
-	0x2127, 0x2127,
-	0x2129, 0x2129,
-	0x212e, 0x212e,
-	0x213a, 0x213b,
-	0x2140, 0x2144,
-	0x214a, 0x214d,
-	0x214f, 0x214f,
-	0x2190, 0x2328,
-	0x232b, 0x23f3,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x249c, 0x24e9,
-	0x2500, 0x26ff,
-	0x2701, 0x2767,
-	0x2794, 0x27c4,
-	0x27c7, 0x27e5,
-	0x27f0, 0x2982,
-	0x2999, 0x29d7,
-	0x29dc, 0x29fb,
-	0x29fe, 0x2b4c,
-	0x2b50, 0x2b59,
-	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, 0x31e3,
-	0x3200, 0x321e,
-	0x322a, 0x3247,
-	0x3250, 0x3250,
-	0x3260, 0x327f,
-	0x328a, 0x32b0,
-	0x32c0, 0x32fe,
-	0x3300, 0x33ff,
-	0x4dc0, 0x4dff,
-	0xa490, 0xa4c6,
-	0xa700, 0xa716,
-	0xa720, 0xa721,
-	0xa789, 0xa78a,
-	0xa828, 0xa82b,
-	0xa836, 0xa839,
-	0xaa77, 0xaa79,
-	0xfb29, 0xfb29,
-	0xfbb2, 0xfbc1,
-	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,
-	0x10137, 0x1013f,
-	0x10179, 0x10189,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fc,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 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,
-	0x1eef0, 0x1eef1,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f320,
-	0x1f330, 0x1f335,
-	0x1f337, 0x1f37c,
-	0x1f380, 0x1f393,
-	0x1f3a0, 0x1f3c4,
-	0x1f3c6, 0x1f3ca,
-	0x1f3e0, 0x1f3f0,
-	0x1f400, 0x1f43e,
-	0x1f440, 0x1f440,
-	0x1f442, 0x1f4f7,
-	0x1f4f9, 0x1f4fc,
-	0x1f500, 0x1f53d,
-	0x1f540, 0x1f543,
-	0x1f550, 0x1f567,
-	0x1f5fb, 0x1f640,
-	0x1f645, 0x1f64f,
-	0x1f680, 0x1f6c5,
-	0x1f700, 0x1f773,
-}; /* CR_S */
-
-/* 'Sc': General Category */
-static const OnigCodePoint CR_Sc[] = {
-	17,
-	0x0024, 0x0024,
-	0x00a2, 0x00a5,
-	0x058f, 0x058f,
-	0x060b, 0x060b,
-	0x09f2, 0x09f3,
-	0x09fb, 0x09fb,
-	0x0af1, 0x0af1,
-	0x0bf9, 0x0bf9,
-	0x0e3f, 0x0e3f,
-	0x17db, 0x17db,
-	0x20a0, 0x20b9,
-	0xa838, 0xa838,
-	0xfdfc, 0xfdfc,
-	0xfe69, 0xfe69,
-	0xff04, 0xff04,
-	0xffe0, 0xffe1,
-	0xffe5, 0xffe6,
-}; /* CR_Sc */
-
-/* 'Sk': General Category */
-static const OnigCodePoint CR_Sk[] = {
-	27,
-	0x005e, 0x005e,
-	0x0060, 0x0060,
-	0x00a8, 0x00a8,
-	0x00af, 0x00af,
-	0x00b4, 0x00b4,
-	0x00b8, 0x00b8,
-	0x02c2, 0x02c5,
-	0x02d2, 0x02df,
-	0x02e5, 0x02eb,
-	0x02ed, 0x02ed,
-	0x02ef, 0x02ff,
-	0x0375, 0x0375,
-	0x0384, 0x0385,
-	0x1fbd, 0x1fbd,
-	0x1fbf, 0x1fc1,
-	0x1fcd, 0x1fcf,
-	0x1fdd, 0x1fdf,
-	0x1fed, 0x1fef,
-	0x1ffd, 0x1ffe,
-	0x309b, 0x309c,
-	0xa700, 0xa716,
-	0xa720, 0xa721,
-	0xa789, 0xa78a,
-	0xfbb2, 0xfbc1,
-	0xff3e, 0xff3e,
-	0xff40, 0xff40,
-	0xffe3, 0xffe3,
-}; /* CR_Sk */
-
-/* 'Sm': General Category */
-static const OnigCodePoint CR_Sm[] = {
-	65,
-	0x002b, 0x002b,
-	0x003c, 0x003e,
-	0x007c, 0x007c,
-	0x007e, 0x007e,
-	0x00ac, 0x00ac,
-	0x00b1, 0x00b1,
-	0x00d7, 0x00d7,
-	0x00f7, 0x00f7,
-	0x03f6, 0x03f6,
-	0x0606, 0x0608,
-	0x2044, 0x2044,
-	0x2052, 0x2052,
-	0x207a, 0x207c,
-	0x208a, 0x208c,
-	0x2118, 0x2118,
-	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,
-	0x23dc, 0x23e1,
-	0x25b7, 0x25b7,
-	0x25c1, 0x25c1,
-	0x25f8, 0x25ff,
-	0x266f, 0x266f,
-	0x27c0, 0x27c4,
-	0x27c7, 0x27e5,
-	0x27f0, 0x27ff,
-	0x2900, 0x2982,
-	0x2999, 0x29d7,
-	0x29dc, 0x29fb,
-	0x29fe, 0x2aff,
-	0x2b30, 0x2b44,
-	0x2b47, 0x2b4c,
-	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,
-	0x1eef0, 0x1eef1,
-}; /* CR_Sm */
-
-/* 'So': General Category */
-static const OnigCodePoint CR_So[] = {
-	153,
-	0x00a6, 0x00a6,
-	0x00a9, 0x00a9,
-	0x00ae, 0x00ae,
-	0x00b0, 0x00b0,
-	0x0482, 0x0482,
-	0x060e, 0x060f,
-	0x06de, 0x06de,
-	0x06e9, 0x06e9,
-	0x06fd, 0x06fe,
-	0x07f6, 0x07f6,
-	0x09fa, 0x09fa,
-	0x0b70, 0x0b70,
-	0x0bf3, 0x0bf8,
-	0x0bfa, 0x0bfa,
-	0x0c7f, 0x0c7f,
-	0x0d79, 0x0d79,
-	0x0f01, 0x0f03,
-	0x0f13, 0x0f13,
-	0x0f15, 0x0f17,
-	0x0f1a, 0x0f1f,
-	0x0f34, 0x0f34,
-	0x0f36, 0x0f36,
-	0x0f38, 0x0f38,
-	0x0fbe, 0x0fc5,
-	0x0fc7, 0x0fcc,
-	0x0fce, 0x0fcf,
-	0x0fd5, 0x0fd8,
-	0x109e, 0x109f,
-	0x1390, 0x1399,
-	0x1940, 0x1940,
-	0x19de, 0x19ff,
-	0x1b61, 0x1b6a,
-	0x1b74, 0x1b7c,
-	0x2100, 0x2101,
-	0x2103, 0x2106,
-	0x2108, 0x2109,
-	0x2114, 0x2114,
-	0x2116, 0x2117,
-	0x211e, 0x2123,
-	0x2125, 0x2125,
-	0x2127, 0x2127,
-	0x2129, 0x2129,
-	0x212e, 0x212e,
-	0x213a, 0x213b,
-	0x214a, 0x214a,
-	0x214c, 0x214d,
-	0x214f, 0x214f,
-	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,
-	0x23b4, 0x23db,
-	0x23e2, 0x23f3,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x249c, 0x24e9,
-	0x2500, 0x25b6,
-	0x25b8, 0x25c0,
-	0x25c2, 0x25f7,
-	0x2600, 0x266e,
-	0x2670, 0x26ff,
-	0x2701, 0x2767,
-	0x2794, 0x27bf,
-	0x2800, 0x28ff,
-	0x2b00, 0x2b2f,
-	0x2b45, 0x2b46,
-	0x2b50, 0x2b59,
-	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, 0x31e3,
-	0x3200, 0x321e,
-	0x322a, 0x3247,
-	0x3250, 0x3250,
-	0x3260, 0x327f,
-	0x328a, 0x32b0,
-	0x32c0, 0x32fe,
-	0x3300, 0x33ff,
-	0x4dc0, 0x4dff,
-	0xa490, 0xa4c6,
-	0xa828, 0xa82b,
-	0xa836, 0xa837,
-	0xa839, 0xa839,
-	0xaa77, 0xaa79,
-	0xfdfd, 0xfdfd,
-	0xffe4, 0xffe4,
-	0xffe8, 0xffe8,
-	0xffed, 0xffee,
-	0xfffc, 0xfffd,
-	0x10137, 0x1013f,
-	0x10179, 0x10189,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fc,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d164,
-	0x1d16a, 0x1d16c,
-	0x1d183, 0x1d184,
-	0x1d18c, 0x1d1a9,
-	0x1d1ae, 0x1d1dd,
-	0x1d200, 0x1d241,
-	0x1d245, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f320,
-	0x1f330, 0x1f335,
-	0x1f337, 0x1f37c,
-	0x1f380, 0x1f393,
-	0x1f3a0, 0x1f3c4,
-	0x1f3c6, 0x1f3ca,
-	0x1f3e0, 0x1f3f0,
-	0x1f400, 0x1f43e,
-	0x1f440, 0x1f440,
-	0x1f442, 0x1f4f7,
-	0x1f4f9, 0x1f4fc,
-	0x1f500, 0x1f53d,
-	0x1f540, 0x1f543,
-	0x1f550, 0x1f567,
-	0x1f5fb, 0x1f640,
-	0x1f645, 0x1f64f,
-	0x1f680, 0x1f6c5,
-	0x1f700, 0x1f773,
-}; /* 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 */
-
-/* 'Math': Derived Property */
-static const OnigCodePoint CR_Math[] = {
-	138,
-	0x002b, 0x002b,
-	0x003c, 0x003e,
-	0x005e, 0x005e,
-	0x007c, 0x007c,
-	0x007e, 0x007e,
-	0x00ac, 0x00ac,
-	0x00b1, 0x00b1,
-	0x00d7, 0x00d7,
-	0x00f7, 0x00f7,
-	0x03d0, 0x03d2,
-	0x03d5, 0x03d5,
-	0x03f0, 0x03f1,
-	0x03f4, 0x03f6,
-	0x0606, 0x0608,
-	0x2016, 0x2016,
-	0x2032, 0x2034,
-	0x2040, 0x2040,
-	0x2044, 0x2044,
-	0x2052, 0x2052,
-	0x2061, 0x2064,
-	0x207a, 0x207e,
-	0x208a, 0x208e,
-	0x20d0, 0x20dc,
-	0x20e1, 0x20e1,
-	0x20e5, 0x20e6,
-	0x20eb, 0x20ef,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2118, 0x211d,
-	0x2124, 0x2124,
-	0x2128, 0x2129,
-	0x212c, 0x212d,
-	0x212f, 0x2131,
-	0x2133, 0x2138,
-	0x213c, 0x2149,
-	0x214b, 0x214b,
-	0x2190, 0x21a7,
-	0x21a9, 0x21ae,
-	0x21b0, 0x21b1,
-	0x21b6, 0x21b7,
-	0x21bc, 0x21db,
-	0x21dd, 0x21dd,
-	0x21e4, 0x21e5,
-	0x21f4, 0x22ff,
-	0x2308, 0x230b,
-	0x2320, 0x2321,
-	0x237c, 0x237c,
-	0x239b, 0x23b5,
-	0x23b7, 0x23b7,
-	0x23d0, 0x23d0,
-	0x23dc, 0x23e2,
-	0x25a0, 0x25a1,
-	0x25ae, 0x25b7,
-	0x25bc, 0x25c1,
-	0x25c6, 0x25c7,
-	0x25ca, 0x25cb,
-	0x25cf, 0x25d3,
-	0x25e2, 0x25e2,
-	0x25e4, 0x25e4,
-	0x25e7, 0x25ec,
-	0x25f8, 0x25ff,
-	0x2605, 0x2606,
-	0x2640, 0x2640,
-	0x2642, 0x2642,
-	0x2660, 0x2663,
-	0x266d, 0x266f,
-	0x27c0, 0x27ff,
-	0x2900, 0x2aff,
-	0x2b30, 0x2b44,
-	0x2b47, 0x2b4c,
-	0xfb29, 0xfb29,
-	0xfe61, 0xfe66,
-	0xfe68, 0xfe68,
-	0xff0b, 0xff0b,
-	0xff1c, 0xff1e,
-	0xff3c, 0xff3c,
-	0xff3e, 0xff3e,
-	0xff5c, 0xff5c,
-	0xff5e, 0xff5e,
-	0xffe2, 0xffe2,
-	0xffe9, 0xffec,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-}; /* CR_Math */
-
-/* 'Alphabetic': Derived Property */
-#define CR_Alphabetic CR_Alpha
-
-/* 'Lowercase': Derived Property */
-#define CR_Lowercase CR_Lower
-
-/* 'Uppercase': Derived Property */
-#define CR_Uppercase CR_Upper
-
-/* 'Cased': Derived Property */
-static const OnigCodePoint CR_Cased[] = {
-	119,
-	0x0041, 0x005a,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00b5, 0x00b5,
-	0x00ba, 0x00ba,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x01ba,
-	0x01bc, 0x01bf,
-	0x01c4, 0x0293,
-	0x0295, 0x02b8,
-	0x02c0, 0x02c1,
-	0x02e0, 0x02e4,
-	0x0345, 0x0345,
-	0x0370, 0x0373,
-	0x0376, 0x0377,
-	0x037a, 0x037d,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x048a, 0x0527,
-	0x0531, 0x0556,
-	0x0561, 0x0587,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x1d00, 0x1dbf,
-	0x1e00, 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, 0x209c,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2119, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x212d,
-	0x212f, 0x2134,
-	0x2139, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2160, 0x217f,
-	0x2183, 0x2184,
-	0x24b6, 0x24e9,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2ce4,
-	0x2ceb, 0x2cee,
-	0x2cf2, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0xa640, 0xa66d,
-	0xa680, 0xa697,
-	0xa722, 0xa787,
-	0xa78b, 0xa78e,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xa7f8, 0xa7fa,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0x10400, 0x1044f,
-	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, 0x1d7cb,
-}; /* CR_Cased */
-
-/* 'Case_Ignorable': Derived Property */
-static const OnigCodePoint CR_Case_Ignorable[] = {
-	295,
-	0x0027, 0x0027,
-	0x002e, 0x002e,
-	0x003a, 0x003a,
-	0x005e, 0x005e,
-	0x0060, 0x0060,
-	0x00a8, 0x00a8,
-	0x00ad, 0x00ad,
-	0x00af, 0x00af,
-	0x00b4, 0x00b4,
-	0x00b7, 0x00b8,
-	0x02b0, 0x036f,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x0384, 0x0385,
-	0x0387, 0x0387,
-	0x0483, 0x0489,
-	0x0559, 0x0559,
-	0x0591, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x05f4, 0x05f4,
-	0x0600, 0x0604,
-	0x0610, 0x061a,
-	0x0640, 0x0640,
-	0x064b, 0x065f,
-	0x0670, 0x0670,
-	0x06d6, 0x06dd,
-	0x06df, 0x06e8,
-	0x06ea, 0x06ed,
-	0x070f, 0x070f,
-	0x0711, 0x0711,
-	0x0730, 0x074a,
-	0x07a6, 0x07b0,
-	0x07eb, 0x07f5,
-	0x07fa, 0x07fa,
-	0x0816, 0x082d,
-	0x0859, 0x085b,
-	0x08e4, 0x08fe,
-	0x0900, 0x0902,
-	0x093a, 0x093a,
-	0x093c, 0x093c,
-	0x0941, 0x0948,
-	0x094d, 0x094d,
-	0x0951, 0x0957,
-	0x0962, 0x0963,
-	0x0971, 0x0971,
-	0x0981, 0x0981,
-	0x09bc, 0x09bc,
-	0x09c1, 0x09c4,
-	0x09cd, 0x09cd,
-	0x09e2, 0x09e3,
-	0x0a01, 0x0a02,
-	0x0a3c, 0x0a3c,
-	0x0a41, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a70, 0x0a71,
-	0x0a75, 0x0a75,
-	0x0a81, 0x0a82,
-	0x0abc, 0x0abc,
-	0x0ac1, 0x0ac5,
-	0x0ac7, 0x0ac8,
-	0x0acd, 0x0acd,
-	0x0ae2, 0x0ae3,
-	0x0b01, 0x0b01,
-	0x0b3c, 0x0b3c,
-	0x0b3f, 0x0b3f,
-	0x0b41, 0x0b44,
-	0x0b4d, 0x0b4d,
-	0x0b56, 0x0b56,
-	0x0b62, 0x0b63,
-	0x0b82, 0x0b82,
-	0x0bc0, 0x0bc0,
-	0x0bcd, 0x0bcd,
-	0x0c3e, 0x0c40,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c62, 0x0c63,
-	0x0cbc, 0x0cbc,
-	0x0cbf, 0x0cbf,
-	0x0cc6, 0x0cc6,
-	0x0ccc, 0x0ccd,
-	0x0ce2, 0x0ce3,
-	0x0d41, 0x0d44,
-	0x0d4d, 0x0d4d,
-	0x0d62, 0x0d63,
-	0x0dca, 0x0dca,
-	0x0dd2, 0x0dd4,
-	0x0dd6, 0x0dd6,
-	0x0e31, 0x0e31,
-	0x0e34, 0x0e3a,
-	0x0e46, 0x0e4e,
-	0x0eb1, 0x0eb1,
-	0x0eb4, 0x0eb9,
-	0x0ebb, 0x0ebc,
-	0x0ec6, 0x0ec6,
-	0x0ec8, 0x0ecd,
-	0x0f18, 0x0f19,
-	0x0f35, 0x0f35,
-	0x0f37, 0x0f37,
-	0x0f39, 0x0f39,
-	0x0f71, 0x0f7e,
-	0x0f80, 0x0f84,
-	0x0f86, 0x0f87,
-	0x0f8d, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fc6, 0x0fc6,
-	0x102d, 0x1030,
-	0x1032, 0x1037,
-	0x1039, 0x103a,
-	0x103d, 0x103e,
-	0x1058, 0x1059,
-	0x105e, 0x1060,
-	0x1071, 0x1074,
-	0x1082, 0x1082,
-	0x1085, 0x1086,
-	0x108d, 0x108d,
-	0x109d, 0x109d,
-	0x10fc, 0x10fc,
-	0x135d, 0x135f,
-	0x1712, 0x1714,
-	0x1732, 0x1734,
-	0x1752, 0x1753,
-	0x1772, 0x1773,
-	0x17b4, 0x17b5,
-	0x17b7, 0x17bd,
-	0x17c6, 0x17c6,
-	0x17c9, 0x17d3,
-	0x17d7, 0x17d7,
-	0x17dd, 0x17dd,
-	0x180b, 0x180d,
-	0x1843, 0x1843,
-	0x18a9, 0x18a9,
-	0x1920, 0x1922,
-	0x1927, 0x1928,
-	0x1932, 0x1932,
-	0x1939, 0x193b,
-	0x1a17, 0x1a18,
-	0x1a56, 0x1a56,
-	0x1a58, 0x1a5e,
-	0x1a60, 0x1a60,
-	0x1a62, 0x1a62,
-	0x1a65, 0x1a6c,
-	0x1a73, 0x1a7c,
-	0x1a7f, 0x1a7f,
-	0x1aa7, 0x1aa7,
-	0x1b00, 0x1b03,
-	0x1b34, 0x1b34,
-	0x1b36, 0x1b3a,
-	0x1b3c, 0x1b3c,
-	0x1b42, 0x1b42,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1b81,
-	0x1ba2, 0x1ba5,
-	0x1ba8, 0x1ba9,
-	0x1bab, 0x1bab,
-	0x1be6, 0x1be6,
-	0x1be8, 0x1be9,
-	0x1bed, 0x1bed,
-	0x1bef, 0x1bf1,
-	0x1c2c, 0x1c33,
-	0x1c36, 0x1c37,
-	0x1c78, 0x1c7d,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce0,
-	0x1ce2, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1cf4, 0x1cf4,
-	0x1d2c, 0x1d6a,
-	0x1d78, 0x1d78,
-	0x1d9b, 0x1de6,
-	0x1dfc, 0x1dff,
-	0x1fbd, 0x1fbd,
-	0x1fbf, 0x1fc1,
-	0x1fcd, 0x1fcf,
-	0x1fdd, 0x1fdf,
-	0x1fed, 0x1fef,
-	0x1ffd, 0x1ffe,
-	0x200b, 0x200f,
-	0x2018, 0x2019,
-	0x2024, 0x2024,
-	0x2027, 0x2027,
-	0x202a, 0x202e,
-	0x2060, 0x2064,
-	0x206a, 0x206f,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 0x209c,
-	0x20d0, 0x20f0,
-	0x2c7c, 0x2c7d,
-	0x2cef, 0x2cf1,
-	0x2d6f, 0x2d6f,
-	0x2d7f, 0x2d7f,
-	0x2de0, 0x2dff,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3005,
-	0x302a, 0x302d,
-	0x3031, 0x3035,
-	0x303b, 0x303b,
-	0x3099, 0x309e,
-	0x30fc, 0x30fe,
-	0xa015, 0xa015,
-	0xa4f8, 0xa4fd,
-	0xa60c, 0xa60c,
-	0xa66f, 0xa672,
-	0xa674, 0xa67d,
-	0xa67f, 0xa67f,
-	0xa69f, 0xa69f,
-	0xa6f0, 0xa6f1,
-	0xa700, 0xa721,
-	0xa770, 0xa770,
-	0xa788, 0xa78a,
-	0xa7f8, 0xa7f9,
-	0xa802, 0xa802,
-	0xa806, 0xa806,
-	0xa80b, 0xa80b,
-	0xa825, 0xa826,
-	0xa8c4, 0xa8c4,
-	0xa8e0, 0xa8f1,
-	0xa926, 0xa92d,
-	0xa947, 0xa951,
-	0xa980, 0xa982,
-	0xa9b3, 0xa9b3,
-	0xa9b6, 0xa9b9,
-	0xa9bc, 0xa9bc,
-	0xa9cf, 0xa9cf,
-	0xaa29, 0xaa2e,
-	0xaa31, 0xaa32,
-	0xaa35, 0xaa36,
-	0xaa43, 0xaa43,
-	0xaa4c, 0xaa4c,
-	0xaa70, 0xaa70,
-	0xaab0, 0xaab0,
-	0xaab2, 0xaab4,
-	0xaab7, 0xaab8,
-	0xaabe, 0xaabf,
-	0xaac1, 0xaac1,
-	0xaadd, 0xaadd,
-	0xaaec, 0xaaed,
-	0xaaf3, 0xaaf4,
-	0xaaf6, 0xaaf6,
-	0xabe5, 0xabe5,
-	0xabe8, 0xabe8,
-	0xabed, 0xabed,
-	0xfb1e, 0xfb1e,
-	0xfbb2, 0xfbc1,
-	0xfe00, 0xfe0f,
-	0xfe13, 0xfe13,
-	0xfe20, 0xfe26,
-	0xfe52, 0xfe52,
-	0xfe55, 0xfe55,
-	0xfeff, 0xfeff,
-	0xff07, 0xff07,
-	0xff0e, 0xff0e,
-	0xff1a, 0xff1a,
-	0xff3e, 0xff3e,
-	0xff40, 0xff40,
-	0xff70, 0xff70,
-	0xff9e, 0xff9f,
-	0xffe3, 0xffe3,
-	0xfff9, 0xfffb,
-	0x101fd, 0x101fd,
-	0x10a01, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a0f,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x11001, 0x11001,
-	0x11038, 0x11046,
-	0x11080, 0x11081,
-	0x110b3, 0x110b6,
-	0x110b9, 0x110ba,
-	0x110bd, 0x110bd,
-	0x11100, 0x11102,
-	0x11127, 0x1112b,
-	0x1112d, 0x11134,
-	0x11180, 0x11181,
-	0x111b6, 0x111be,
-	0x116ab, 0x116ab,
-	0x116ad, 0x116ad,
-	0x116b0, 0x116b5,
-	0x116b7, 0x116b7,
-	0x16f8f, 0x16f9f,
-	0x1d167, 0x1d169,
-	0x1d173, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-	0x1d242, 0x1d244,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-}; /* CR_Case_Ignorable */
-
-/* 'Changes_When_Lowercased': Derived Property */
-static const OnigCodePoint CR_Changes_When_Lowercased[] = {
-	571,
-	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, 0x01c5,
-	0x01c7, 0x01c8,
-	0x01ca, 0x01cb,
-	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, 0x01f2,
-	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,
-	0x0243, 0x0246,
-	0x0248, 0x0248,
-	0x024a, 0x024a,
-	0x024c, 0x024c,
-	0x024e, 0x024e,
-	0x0370, 0x0370,
-	0x0372, 0x0372,
-	0x0376, 0x0376,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x038f,
-	0x0391, 0x03a1,
-	0x03a3, 0x03ab,
-	0x03cf, 0x03cf,
-	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,
-	0x04fa, 0x04fa,
-	0x04fc, 0x04fc,
-	0x04fe, 0x04fe,
-	0x0500, 0x0500,
-	0x0502, 0x0502,
-	0x0504, 0x0504,
-	0x0506, 0x0506,
-	0x0508, 0x0508,
-	0x050a, 0x050a,
-	0x050c, 0x050c,
-	0x050e, 0x050e,
-	0x0510, 0x0510,
-	0x0512, 0x0512,
-	0x0514, 0x0514,
-	0x0516, 0x0516,
-	0x0518, 0x0518,
-	0x051a, 0x051a,
-	0x051c, 0x051c,
-	0x051e, 0x051e,
-	0x0520, 0x0520,
-	0x0522, 0x0522,
-	0x0524, 0x0524,
-	0x0526, 0x0526,
-	0x0531, 0x0556,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	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,
-	0x1e9e, 0x1e9e,
-	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,
-	0x1efa, 0x1efa,
-	0x1efc, 0x1efc,
-	0x1efe, 0x1efe,
-	0x1f08, 0x1f0f,
-	0x1f18, 0x1f1d,
-	0x1f28, 0x1f2f,
-	0x1f38, 0x1f3f,
-	0x1f48, 0x1f4d,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f5f,
-	0x1f68, 0x1f6f,
-	0x1f88, 0x1f8f,
-	0x1f98, 0x1f9f,
-	0x1fa8, 0x1faf,
-	0x1fb8, 0x1fbc,
-	0x1fc8, 0x1fcc,
-	0x1fd8, 0x1fdb,
-	0x1fe8, 0x1fec,
-	0x1ff8, 0x1ffc,
-	0x2126, 0x2126,
-	0x212a, 0x212b,
-	0x2132, 0x2132,
-	0x2160, 0x216f,
-	0x2183, 0x2183,
-	0x24b6, 0x24cf,
-	0x2c00, 0x2c2e,
-	0x2c60, 0x2c60,
-	0x2c62, 0x2c64,
-	0x2c67, 0x2c67,
-	0x2c69, 0x2c69,
-	0x2c6b, 0x2c6b,
-	0x2c6d, 0x2c70,
-	0x2c72, 0x2c72,
-	0x2c75, 0x2c75,
-	0x2c7e, 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,
-	0x2ceb, 0x2ceb,
-	0x2ced, 0x2ced,
-	0x2cf2, 0x2cf2,
-	0xa640, 0xa640,
-	0xa642, 0xa642,
-	0xa644, 0xa644,
-	0xa646, 0xa646,
-	0xa648, 0xa648,
-	0xa64a, 0xa64a,
-	0xa64c, 0xa64c,
-	0xa64e, 0xa64e,
-	0xa650, 0xa650,
-	0xa652, 0xa652,
-	0xa654, 0xa654,
-	0xa656, 0xa656,
-	0xa658, 0xa658,
-	0xa65a, 0xa65a,
-	0xa65c, 0xa65c,
-	0xa65e, 0xa65e,
-	0xa660, 0xa660,
-	0xa662, 0xa662,
-	0xa664, 0xa664,
-	0xa666, 0xa666,
-	0xa668, 0xa668,
-	0xa66a, 0xa66a,
-	0xa66c, 0xa66c,
-	0xa680, 0xa680,
-	0xa682, 0xa682,
-	0xa684, 0xa684,
-	0xa686, 0xa686,
-	0xa688, 0xa688,
-	0xa68a, 0xa68a,
-	0xa68c, 0xa68c,
-	0xa68e, 0xa68e,
-	0xa690, 0xa690,
-	0xa692, 0xa692,
-	0xa694, 0xa694,
-	0xa696, 0xa696,
-	0xa722, 0xa722,
-	0xa724, 0xa724,
-	0xa726, 0xa726,
-	0xa728, 0xa728,
-	0xa72a, 0xa72a,
-	0xa72c, 0xa72c,
-	0xa72e, 0xa72e,
-	0xa732, 0xa732,
-	0xa734, 0xa734,
-	0xa736, 0xa736,
-	0xa738, 0xa738,
-	0xa73a, 0xa73a,
-	0xa73c, 0xa73c,
-	0xa73e, 0xa73e,
-	0xa740, 0xa740,
-	0xa742, 0xa742,
-	0xa744, 0xa744,
-	0xa746, 0xa746,
-	0xa748, 0xa748,
-	0xa74a, 0xa74a,
-	0xa74c, 0xa74c,
-	0xa74e, 0xa74e,
-	0xa750, 0xa750,
-	0xa752, 0xa752,
-	0xa754, 0xa754,
-	0xa756, 0xa756,
-	0xa758, 0xa758,
-	0xa75a, 0xa75a,
-	0xa75c, 0xa75c,
-	0xa75e, 0xa75e,
-	0xa760, 0xa760,
-	0xa762, 0xa762,
-	0xa764, 0xa764,
-	0xa766, 0xa766,
-	0xa768, 0xa768,
-	0xa76a, 0xa76a,
-	0xa76c, 0xa76c,
-	0xa76e, 0xa76e,
-	0xa779, 0xa779,
-	0xa77b, 0xa77b,
-	0xa77d, 0xa77e,
-	0xa780, 0xa780,
-	0xa782, 0xa782,
-	0xa784, 0xa784,
-	0xa786, 0xa786,
-	0xa78b, 0xa78b,
-	0xa78d, 0xa78d,
-	0xa790, 0xa790,
-	0xa792, 0xa792,
-	0xa7a0, 0xa7a0,
-	0xa7a2, 0xa7a2,
-	0xa7a4, 0xa7a4,
-	0xa7a6, 0xa7a6,
-	0xa7a8, 0xa7a8,
-	0xa7aa, 0xa7aa,
-	0xff21, 0xff3a,
-	0x10400, 0x10427,
-}; /* CR_Changes_When_Lowercased */
-
-/* 'Changes_When_Uppercased': Derived Property */
-static const OnigCodePoint CR_Changes_When_Uppercased[] = {
-	586,
-	0x0061, 0x007a,
-	0x00b5, 0x00b5,
-	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, 0x0137,
-	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, 0x018c,
-	0x0192, 0x0192,
-	0x0195, 0x0195,
-	0x0199, 0x019a,
-	0x019e, 0x019e,
-	0x01a1, 0x01a1,
-	0x01a3, 0x01a3,
-	0x01a5, 0x01a5,
-	0x01a8, 0x01a8,
-	0x01ad, 0x01ad,
-	0x01b0, 0x01b0,
-	0x01b4, 0x01b4,
-	0x01b6, 0x01b6,
-	0x01b9, 0x01b9,
-	0x01bd, 0x01bd,
-	0x01bf, 0x01bf,
-	0x01c5, 0x01c6,
-	0x01c8, 0x01c9,
-	0x01cb, 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,
-	0x01f2, 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,
-	0x0223, 0x0223,
-	0x0225, 0x0225,
-	0x0227, 0x0227,
-	0x0229, 0x0229,
-	0x022b, 0x022b,
-	0x022d, 0x022d,
-	0x022f, 0x022f,
-	0x0231, 0x0231,
-	0x0233, 0x0233,
-	0x023c, 0x023c,
-	0x023f, 0x0240,
-	0x0242, 0x0242,
-	0x0247, 0x0247,
-	0x0249, 0x0249,
-	0x024b, 0x024b,
-	0x024d, 0x024d,
-	0x024f, 0x0254,
-	0x0256, 0x0257,
-	0x0259, 0x0259,
-	0x025b, 0x025b,
-	0x0260, 0x0260,
-	0x0263, 0x0263,
-	0x0265, 0x0266,
-	0x0268, 0x0269,
-	0x026b, 0x026b,
-	0x026f, 0x026f,
-	0x0271, 0x0272,
-	0x0275, 0x0275,
-	0x027d, 0x027d,
-	0x0280, 0x0280,
-	0x0283, 0x0283,
-	0x0288, 0x028c,
-	0x0292, 0x0292,
-	0x0345, 0x0345,
-	0x0371, 0x0371,
-	0x0373, 0x0373,
-	0x0377, 0x0377,
-	0x037b, 0x037d,
-	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, 0x03f2,
-	0x03f5, 0x03f5,
-	0x03f8, 0x03f8,
-	0x03fb, 0x03fb,
-	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, 0x04cf,
-	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,
-	0x04fb, 0x04fb,
-	0x04fd, 0x04fd,
-	0x04ff, 0x04ff,
-	0x0501, 0x0501,
-	0x0503, 0x0503,
-	0x0505, 0x0505,
-	0x0507, 0x0507,
-	0x0509, 0x0509,
-	0x050b, 0x050b,
-	0x050d, 0x050d,
-	0x050f, 0x050f,
-	0x0511, 0x0511,
-	0x0513, 0x0513,
-	0x0515, 0x0515,
-	0x0517, 0x0517,
-	0x0519, 0x0519,
-	0x051b, 0x051b,
-	0x051d, 0x051d,
-	0x051f, 0x051f,
-	0x0521, 0x0521,
-	0x0523, 0x0523,
-	0x0525, 0x0525,
-	0x0527, 0x0527,
-	0x0561, 0x0587,
-	0x1d79, 0x1d79,
-	0x1d7d, 0x1d7d,
-	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,
-	0x1efb, 0x1efb,
-	0x1efd, 0x1efd,
-	0x1eff, 0x1f07,
-	0x1f10, 0x1f15,
-	0x1f20, 0x1f27,
-	0x1f30, 0x1f37,
-	0x1f40, 0x1f45,
-	0x1f50, 0x1f57,
-	0x1f60, 0x1f67,
-	0x1f70, 0x1f7d,
-	0x1f80, 0x1fb4,
-	0x1fb6, 0x1fb7,
-	0x1fbc, 0x1fbc,
-	0x1fbe, 0x1fbe,
-	0x1fc2, 0x1fc4,
-	0x1fc6, 0x1fc7,
-	0x1fcc, 0x1fcc,
-	0x1fd0, 0x1fd3,
-	0x1fd6, 0x1fd7,
-	0x1fe0, 0x1fe7,
-	0x1ff2, 0x1ff4,
-	0x1ff6, 0x1ff7,
-	0x1ffc, 0x1ffc,
-	0x214e, 0x214e,
-	0x2170, 0x217f,
-	0x2184, 0x2184,
-	0x24d0, 0x24e9,
-	0x2c30, 0x2c5e,
-	0x2c61, 0x2c61,
-	0x2c65, 0x2c66,
-	0x2c68, 0x2c68,
-	0x2c6a, 0x2c6a,
-	0x2c6c, 0x2c6c,
-	0x2c73, 0x2c73,
-	0x2c76, 0x2c76,
-	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, 0x2ce3,
-	0x2cec, 0x2cec,
-	0x2cee, 0x2cee,
-	0x2cf3, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0xa641, 0xa641,
-	0xa643, 0xa643,
-	0xa645, 0xa645,
-	0xa647, 0xa647,
-	0xa649, 0xa649,
-	0xa64b, 0xa64b,
-	0xa64d, 0xa64d,
-	0xa64f, 0xa64f,
-	0xa651, 0xa651,
-	0xa653, 0xa653,
-	0xa655, 0xa655,
-	0xa657, 0xa657,
-	0xa659, 0xa659,
-	0xa65b, 0xa65b,
-	0xa65d, 0xa65d,
-	0xa65f, 0xa65f,
-	0xa661, 0xa661,
-	0xa663, 0xa663,
-	0xa665, 0xa665,
-	0xa667, 0xa667,
-	0xa669, 0xa669,
-	0xa66b, 0xa66b,
-	0xa66d, 0xa66d,
-	0xa681, 0xa681,
-	0xa683, 0xa683,
-	0xa685, 0xa685,
-	0xa687, 0xa687,
-	0xa689, 0xa689,
-	0xa68b, 0xa68b,
-	0xa68d, 0xa68d,
-	0xa68f, 0xa68f,
-	0xa691, 0xa691,
-	0xa693, 0xa693,
-	0xa695, 0xa695,
-	0xa697, 0xa697,
-	0xa723, 0xa723,
-	0xa725, 0xa725,
-	0xa727, 0xa727,
-	0xa729, 0xa729,
-	0xa72b, 0xa72b,
-	0xa72d, 0xa72d,
-	0xa72f, 0xa72f,
-	0xa733, 0xa733,
-	0xa735, 0xa735,
-	0xa737, 0xa737,
-	0xa739, 0xa739,
-	0xa73b, 0xa73b,
-	0xa73d, 0xa73d,
-	0xa73f, 0xa73f,
-	0xa741, 0xa741,
-	0xa743, 0xa743,
-	0xa745, 0xa745,
-	0xa747, 0xa747,
-	0xa749, 0xa749,
-	0xa74b, 0xa74b,
-	0xa74d, 0xa74d,
-	0xa74f, 0xa74f,
-	0xa751, 0xa751,
-	0xa753, 0xa753,
-	0xa755, 0xa755,
-	0xa757, 0xa757,
-	0xa759, 0xa759,
-	0xa75b, 0xa75b,
-	0xa75d, 0xa75d,
-	0xa75f, 0xa75f,
-	0xa761, 0xa761,
-	0xa763, 0xa763,
-	0xa765, 0xa765,
-	0xa767, 0xa767,
-	0xa769, 0xa769,
-	0xa76b, 0xa76b,
-	0xa76d, 0xa76d,
-	0xa76f, 0xa76f,
-	0xa77a, 0xa77a,
-	0xa77c, 0xa77c,
-	0xa77f, 0xa77f,
-	0xa781, 0xa781,
-	0xa783, 0xa783,
-	0xa785, 0xa785,
-	0xa787, 0xa787,
-	0xa78c, 0xa78c,
-	0xa791, 0xa791,
-	0xa793, 0xa793,
-	0xa7a1, 0xa7a1,
-	0xa7a3, 0xa7a3,
-	0xa7a5, 0xa7a5,
-	0xa7a7, 0xa7a7,
-	0xa7a9, 0xa7a9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff41, 0xff5a,
-	0x10428, 0x1044f,
-}; /* CR_Changes_When_Uppercased */
-
-/* 'Changes_When_Titlecased': Derived Property */
-static const OnigCodePoint CR_Changes_When_Titlecased[] = {
-	587,
-	0x0061, 0x007a,
-	0x00b5, 0x00b5,
-	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, 0x0137,
-	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, 0x018c,
-	0x0192, 0x0192,
-	0x0195, 0x0195,
-	0x0199, 0x019a,
-	0x019e, 0x019e,
-	0x01a1, 0x01a1,
-	0x01a3, 0x01a3,
-	0x01a5, 0x01a5,
-	0x01a8, 0x01a8,
-	0x01ad, 0x01ad,
-	0x01b0, 0x01b0,
-	0x01b4, 0x01b4,
-	0x01b6, 0x01b6,
-	0x01b9, 0x01b9,
-	0x01bd, 0x01bd,
-	0x01bf, 0x01bf,
-	0x01c4, 0x01c4,
-	0x01c6, 0x01c7,
-	0x01c9, 0x01ca,
-	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, 0x01f1,
-	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,
-	0x0223, 0x0223,
-	0x0225, 0x0225,
-	0x0227, 0x0227,
-	0x0229, 0x0229,
-	0x022b, 0x022b,
-	0x022d, 0x022d,
-	0x022f, 0x022f,
-	0x0231, 0x0231,
-	0x0233, 0x0233,
-	0x023c, 0x023c,
-	0x023f, 0x0240,
-	0x0242, 0x0242,
-	0x0247, 0x0247,
-	0x0249, 0x0249,
-	0x024b, 0x024b,
-	0x024d, 0x024d,
-	0x024f, 0x0254,
-	0x0256, 0x0257,
-	0x0259, 0x0259,
-	0x025b, 0x025b,
-	0x0260, 0x0260,
-	0x0263, 0x0263,
-	0x0265, 0x0266,
-	0x0268, 0x0269,
-	0x026b, 0x026b,
-	0x026f, 0x026f,
-	0x0271, 0x0272,
-	0x0275, 0x0275,
-	0x027d, 0x027d,
-	0x0280, 0x0280,
-	0x0283, 0x0283,
-	0x0288, 0x028c,
-	0x0292, 0x0292,
-	0x0345, 0x0345,
-	0x0371, 0x0371,
-	0x0373, 0x0373,
-	0x0377, 0x0377,
-	0x037b, 0x037d,
-	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, 0x03f2,
-	0x03f5, 0x03f5,
-	0x03f8, 0x03f8,
-	0x03fb, 0x03fb,
-	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, 0x04cf,
-	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,
-	0x04fb, 0x04fb,
-	0x04fd, 0x04fd,
-	0x04ff, 0x04ff,
-	0x0501, 0x0501,
-	0x0503, 0x0503,
-	0x0505, 0x0505,
-	0x0507, 0x0507,
-	0x0509, 0x0509,
-	0x050b, 0x050b,
-	0x050d, 0x050d,
-	0x050f, 0x050f,
-	0x0511, 0x0511,
-	0x0513, 0x0513,
-	0x0515, 0x0515,
-	0x0517, 0x0517,
-	0x0519, 0x0519,
-	0x051b, 0x051b,
-	0x051d, 0x051d,
-	0x051f, 0x051f,
-	0x0521, 0x0521,
-	0x0523, 0x0523,
-	0x0525, 0x0525,
-	0x0527, 0x0527,
-	0x0561, 0x0587,
-	0x1d79, 0x1d79,
-	0x1d7d, 0x1d7d,
-	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,
-	0x1efb, 0x1efb,
-	0x1efd, 0x1efd,
-	0x1eff, 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,
-	0x214e, 0x214e,
-	0x2170, 0x217f,
-	0x2184, 0x2184,
-	0x24d0, 0x24e9,
-	0x2c30, 0x2c5e,
-	0x2c61, 0x2c61,
-	0x2c65, 0x2c66,
-	0x2c68, 0x2c68,
-	0x2c6a, 0x2c6a,
-	0x2c6c, 0x2c6c,
-	0x2c73, 0x2c73,
-	0x2c76, 0x2c76,
-	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, 0x2ce3,
-	0x2cec, 0x2cec,
-	0x2cee, 0x2cee,
-	0x2cf3, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0xa641, 0xa641,
-	0xa643, 0xa643,
-	0xa645, 0xa645,
-	0xa647, 0xa647,
-	0xa649, 0xa649,
-	0xa64b, 0xa64b,
-	0xa64d, 0xa64d,
-	0xa64f, 0xa64f,
-	0xa651, 0xa651,
-	0xa653, 0xa653,
-	0xa655, 0xa655,
-	0xa657, 0xa657,
-	0xa659, 0xa659,
-	0xa65b, 0xa65b,
-	0xa65d, 0xa65d,
-	0xa65f, 0xa65f,
-	0xa661, 0xa661,
-	0xa663, 0xa663,
-	0xa665, 0xa665,
-	0xa667, 0xa667,
-	0xa669, 0xa669,
-	0xa66b, 0xa66b,
-	0xa66d, 0xa66d,
-	0xa681, 0xa681,
-	0xa683, 0xa683,
-	0xa685, 0xa685,
-	0xa687, 0xa687,
-	0xa689, 0xa689,
-	0xa68b, 0xa68b,
-	0xa68d, 0xa68d,
-	0xa68f, 0xa68f,
-	0xa691, 0xa691,
-	0xa693, 0xa693,
-	0xa695, 0xa695,
-	0xa697, 0xa697,
-	0xa723, 0xa723,
-	0xa725, 0xa725,
-	0xa727, 0xa727,
-	0xa729, 0xa729,
-	0xa72b, 0xa72b,
-	0xa72d, 0xa72d,
-	0xa72f, 0xa72f,
-	0xa733, 0xa733,
-	0xa735, 0xa735,
-	0xa737, 0xa737,
-	0xa739, 0xa739,
-	0xa73b, 0xa73b,
-	0xa73d, 0xa73d,
-	0xa73f, 0xa73f,
-	0xa741, 0xa741,
-	0xa743, 0xa743,
-	0xa745, 0xa745,
-	0xa747, 0xa747,
-	0xa749, 0xa749,
-	0xa74b, 0xa74b,
-	0xa74d, 0xa74d,
-	0xa74f, 0xa74f,
-	0xa751, 0xa751,
-	0xa753, 0xa753,
-	0xa755, 0xa755,
-	0xa757, 0xa757,
-	0xa759, 0xa759,
-	0xa75b, 0xa75b,
-	0xa75d, 0xa75d,
-	0xa75f, 0xa75f,
-	0xa761, 0xa761,
-	0xa763, 0xa763,
-	0xa765, 0xa765,
-	0xa767, 0xa767,
-	0xa769, 0xa769,
-	0xa76b, 0xa76b,
-	0xa76d, 0xa76d,
-	0xa76f, 0xa76f,
-	0xa77a, 0xa77a,
-	0xa77c, 0xa77c,
-	0xa77f, 0xa77f,
-	0xa781, 0xa781,
-	0xa783, 0xa783,
-	0xa785, 0xa785,
-	0xa787, 0xa787,
-	0xa78c, 0xa78c,
-	0xa791, 0xa791,
-	0xa793, 0xa793,
-	0xa7a1, 0xa7a1,
-	0xa7a3, 0xa7a3,
-	0xa7a5, 0xa7a5,
-	0xa7a7, 0xa7a7,
-	0xa7a9, 0xa7a9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff41, 0xff5a,
-	0x10428, 0x1044f,
-}; /* CR_Changes_When_Titlecased */
-
-/* 'Changes_When_Casefolded': Derived Property */
-static const OnigCodePoint CR_Changes_When_Casefolded[] = {
-	582,
-	0x0041, 0x005a,
-	0x00b5, 0x00b5,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00df,
-	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,
-	0x0149, 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,
-	0x017f, 0x017f,
-	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, 0x01c5,
-	0x01c7, 0x01c8,
-	0x01ca, 0x01cb,
-	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, 0x01f2,
-	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,
-	0x0243, 0x0246,
-	0x0248, 0x0248,
-	0x024a, 0x024a,
-	0x024c, 0x024c,
-	0x024e, 0x024e,
-	0x0345, 0x0345,
-	0x0370, 0x0370,
-	0x0372, 0x0372,
-	0x0376, 0x0376,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x038f,
-	0x0391, 0x03a1,
-	0x03a3, 0x03ab,
-	0x03c2, 0x03c2,
-	0x03cf, 0x03d1,
-	0x03d5, 0x03d6,
-	0x03d8, 0x03d8,
-	0x03da, 0x03da,
-	0x03dc, 0x03dc,
-	0x03de, 0x03de,
-	0x03e0, 0x03e0,
-	0x03e2, 0x03e2,
-	0x03e4, 0x03e4,
-	0x03e6, 0x03e6,
-	0x03e8, 0x03e8,
-	0x03ea, 0x03ea,
-	0x03ec, 0x03ec,
-	0x03ee, 0x03ee,
-	0x03f0, 0x03f1,
-	0x03f4, 0x03f5,
-	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,
-	0x04fa, 0x04fa,
-	0x04fc, 0x04fc,
-	0x04fe, 0x04fe,
-	0x0500, 0x0500,
-	0x0502, 0x0502,
-	0x0504, 0x0504,
-	0x0506, 0x0506,
-	0x0508, 0x0508,
-	0x050a, 0x050a,
-	0x050c, 0x050c,
-	0x050e, 0x050e,
-	0x0510, 0x0510,
-	0x0512, 0x0512,
-	0x0514, 0x0514,
-	0x0516, 0x0516,
-	0x0518, 0x0518,
-	0x051a, 0x051a,
-	0x051c, 0x051c,
-	0x051e, 0x051e,
-	0x0520, 0x0520,
-	0x0522, 0x0522,
-	0x0524, 0x0524,
-	0x0526, 0x0526,
-	0x0531, 0x0556,
-	0x0587, 0x0587,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	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,
-	0x1e9a, 0x1e9b,
-	0x1e9e, 0x1e9e,
-	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,
-	0x1efa, 0x1efa,
-	0x1efc, 0x1efc,
-	0x1efe, 0x1efe,
-	0x1f08, 0x1f0f,
-	0x1f18, 0x1f1d,
-	0x1f28, 0x1f2f,
-	0x1f38, 0x1f3f,
-	0x1f48, 0x1f4d,
-	0x1f59, 0x1f59,
-	0x1f5b, 0x1f5b,
-	0x1f5d, 0x1f5d,
-	0x1f5f, 0x1f5f,
-	0x1f68, 0x1f6f,
-	0x1f80, 0x1faf,
-	0x1fb2, 0x1fb4,
-	0x1fb7, 0x1fbc,
-	0x1fc2, 0x1fc4,
-	0x1fc7, 0x1fcc,
-	0x1fd8, 0x1fdb,
-	0x1fe8, 0x1fec,
-	0x1ff2, 0x1ff4,
-	0x1ff7, 0x1ffc,
-	0x2126, 0x2126,
-	0x212a, 0x212b,
-	0x2132, 0x2132,
-	0x2160, 0x216f,
-	0x2183, 0x2183,
-	0x24b6, 0x24cf,
-	0x2c00, 0x2c2e,
-	0x2c60, 0x2c60,
-	0x2c62, 0x2c64,
-	0x2c67, 0x2c67,
-	0x2c69, 0x2c69,
-	0x2c6b, 0x2c6b,
-	0x2c6d, 0x2c70,
-	0x2c72, 0x2c72,
-	0x2c75, 0x2c75,
-	0x2c7e, 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,
-	0x2ceb, 0x2ceb,
-	0x2ced, 0x2ced,
-	0x2cf2, 0x2cf2,
-	0xa640, 0xa640,
-	0xa642, 0xa642,
-	0xa644, 0xa644,
-	0xa646, 0xa646,
-	0xa648, 0xa648,
-	0xa64a, 0xa64a,
-	0xa64c, 0xa64c,
-	0xa64e, 0xa64e,
-	0xa650, 0xa650,
-	0xa652, 0xa652,
-	0xa654, 0xa654,
-	0xa656, 0xa656,
-	0xa658, 0xa658,
-	0xa65a, 0xa65a,
-	0xa65c, 0xa65c,
-	0xa65e, 0xa65e,
-	0xa660, 0xa660,
-	0xa662, 0xa662,
-	0xa664, 0xa664,
-	0xa666, 0xa666,
-	0xa668, 0xa668,
-	0xa66a, 0xa66a,
-	0xa66c, 0xa66c,
-	0xa680, 0xa680,
-	0xa682, 0xa682,
-	0xa684, 0xa684,
-	0xa686, 0xa686,
-	0xa688, 0xa688,
-	0xa68a, 0xa68a,
-	0xa68c, 0xa68c,
-	0xa68e, 0xa68e,
-	0xa690, 0xa690,
-	0xa692, 0xa692,
-	0xa694, 0xa694,
-	0xa696, 0xa696,
-	0xa722, 0xa722,
-	0xa724, 0xa724,
-	0xa726, 0xa726,
-	0xa728, 0xa728,
-	0xa72a, 0xa72a,
-	0xa72c, 0xa72c,
-	0xa72e, 0xa72e,
-	0xa732, 0xa732,
-	0xa734, 0xa734,
-	0xa736, 0xa736,
-	0xa738, 0xa738,
-	0xa73a, 0xa73a,
-	0xa73c, 0xa73c,
-	0xa73e, 0xa73e,
-	0xa740, 0xa740,
-	0xa742, 0xa742,
-	0xa744, 0xa744,
-	0xa746, 0xa746,
-	0xa748, 0xa748,
-	0xa74a, 0xa74a,
-	0xa74c, 0xa74c,
-	0xa74e, 0xa74e,
-	0xa750, 0xa750,
-	0xa752, 0xa752,
-	0xa754, 0xa754,
-	0xa756, 0xa756,
-	0xa758, 0xa758,
-	0xa75a, 0xa75a,
-	0xa75c, 0xa75c,
-	0xa75e, 0xa75e,
-	0xa760, 0xa760,
-	0xa762, 0xa762,
-	0xa764, 0xa764,
-	0xa766, 0xa766,
-	0xa768, 0xa768,
-	0xa76a, 0xa76a,
-	0xa76c, 0xa76c,
-	0xa76e, 0xa76e,
-	0xa779, 0xa779,
-	0xa77b, 0xa77b,
-	0xa77d, 0xa77e,
-	0xa780, 0xa780,
-	0xa782, 0xa782,
-	0xa784, 0xa784,
-	0xa786, 0xa786,
-	0xa78b, 0xa78b,
-	0xa78d, 0xa78d,
-	0xa790, 0xa790,
-	0xa792, 0xa792,
-	0xa7a0, 0xa7a0,
-	0xa7a2, 0xa7a2,
-	0xa7a4, 0xa7a4,
-	0xa7a6, 0xa7a6,
-	0xa7a8, 0xa7a8,
-	0xa7aa, 0xa7aa,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff21, 0xff3a,
-	0x10400, 0x10427,
-}; /* CR_Changes_When_Casefolded */
-
-/* 'Changes_When_Casemapped': Derived Property */
-static const OnigCodePoint CR_Changes_When_Casemapped[] = {
-	104,
-	0x0041, 0x005a,
-	0x0061, 0x007a,
-	0x00b5, 0x00b5,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x0137,
-	0x0139, 0x018c,
-	0x018e, 0x019a,
-	0x019c, 0x01a9,
-	0x01ac, 0x01b9,
-	0x01bc, 0x01bd,
-	0x01bf, 0x01bf,
-	0x01c4, 0x0220,
-	0x0222, 0x0233,
-	0x023a, 0x0254,
-	0x0256, 0x0257,
-	0x0259, 0x0259,
-	0x025b, 0x025b,
-	0x0260, 0x0260,
-	0x0263, 0x0263,
-	0x0265, 0x0266,
-	0x0268, 0x0269,
-	0x026b, 0x026b,
-	0x026f, 0x026f,
-	0x0271, 0x0272,
-	0x0275, 0x0275,
-	0x027d, 0x027d,
-	0x0280, 0x0280,
-	0x0283, 0x0283,
-	0x0288, 0x028c,
-	0x0292, 0x0292,
-	0x0345, 0x0345,
-	0x0370, 0x0373,
-	0x0376, 0x0377,
-	0x037b, 0x037d,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03d1,
-	0x03d5, 0x03f2,
-	0x03f4, 0x03f5,
-	0x03f7, 0x03fb,
-	0x03fd, 0x0481,
-	0x048a, 0x0527,
-	0x0531, 0x0556,
-	0x0561, 0x0587,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x1d79, 0x1d79,
-	0x1d7d, 0x1d7d,
-	0x1e00, 0x1e9b,
-	0x1e9e, 0x1e9e,
-	0x1ea0, 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,
-	0x2126, 0x2126,
-	0x212a, 0x212b,
-	0x2132, 0x2132,
-	0x214e, 0x214e,
-	0x2160, 0x217f,
-	0x2183, 0x2184,
-	0x24b6, 0x24e9,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2c70,
-	0x2c72, 0x2c73,
-	0x2c75, 0x2c76,
-	0x2c7e, 0x2ce3,
-	0x2ceb, 0x2cee,
-	0x2cf2, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0xa640, 0xa66d,
-	0xa680, 0xa697,
-	0xa722, 0xa72f,
-	0xa732, 0xa76f,
-	0xa779, 0xa787,
-	0xa78b, 0xa78d,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0x10400, 0x1044f,
-}; /* CR_Changes_When_Casemapped */
-
-/* 'ID_Start': Derived Property */
-static const OnigCodePoint CR_ID_Start[] = {
-	488,
-	0x0041, 0x005a,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00b5, 0x00b5,
-	0x00ba, 0x00ba,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x02c1,
-	0x02c6, 0x02d1,
-	0x02e0, 0x02e4,
-	0x02ec, 0x02ec,
-	0x02ee, 0x02ee,
-	0x0370, 0x0374,
-	0x0376, 0x0377,
-	0x037a, 0x037d,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x048a, 0x0527,
-	0x0531, 0x0556,
-	0x0559, 0x0559,
-	0x0561, 0x0587,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0620, 0x064a,
-	0x066e, 0x066f,
-	0x0671, 0x06d3,
-	0x06d5, 0x06d5,
-	0x06e5, 0x06e6,
-	0x06ee, 0x06ef,
-	0x06fa, 0x06fc,
-	0x06ff, 0x06ff,
-	0x0710, 0x0710,
-	0x0712, 0x072f,
-	0x074d, 0x07a5,
-	0x07b1, 0x07b1,
-	0x07ca, 0x07ea,
-	0x07f4, 0x07f5,
-	0x07fa, 0x07fa,
-	0x0800, 0x0815,
-	0x081a, 0x081a,
-	0x0824, 0x0824,
-	0x0828, 0x0828,
-	0x0840, 0x0858,
-	0x08a0, 0x08a0,
-	0x08a2, 0x08ac,
-	0x0904, 0x0939,
-	0x093d, 0x093d,
-	0x0950, 0x0950,
-	0x0958, 0x0961,
-	0x0971, 0x0977,
-	0x0979, 0x097f,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c3d,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c61,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbd, 0x0cbd,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce1,
-	0x0cf1, 0x0cf2,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d3d,
-	0x0d4e, 0x0d4e,
-	0x0d60, 0x0d61,
-	0x0d7a, 0x0d7f,
-	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, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f40, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f88, 0x0f8c,
-	0x1000, 0x102a,
-	0x103f, 0x103f,
-	0x1050, 0x1055,
-	0x105a, 0x105d,
-	0x1061, 0x1061,
-	0x1065, 0x1066,
-	0x106e, 0x1070,
-	0x1075, 0x1081,
-	0x108e, 0x108e,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 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, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1711,
-	0x1720, 0x1731,
-	0x1740, 0x1751,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1780, 0x17b3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dc,
-	0x1820, 0x1877,
-	0x1880, 0x18a8,
-	0x18aa, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19c1, 0x19c7,
-	0x1a00, 0x1a16,
-	0x1a20, 0x1a54,
-	0x1aa7, 0x1aa7,
-	0x1b05, 0x1b33,
-	0x1b45, 0x1b4b,
-	0x1b83, 0x1ba0,
-	0x1bae, 0x1baf,
-	0x1bba, 0x1be5,
-	0x1c00, 0x1c23,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c7d,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf1,
-	0x1cf5, 0x1cf6,
-	0x1d00, 0x1dbf,
-	0x1e00, 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, 0x209c,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2118, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2160, 0x2188,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2ce4,
-	0x2ceb, 0x2cee,
-	0x2cf2, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x3005, 0x3007,
-	0x3021, 0x3029,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x309b, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa640, 0xa66e,
-	0xa67f, 0xa697,
-	0xa6a0, 0xa6ef,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xa7f8, 0xa801,
-	0xa803, 0xa805,
-	0xa807, 0xa80a,
-	0xa80c, 0xa822,
-	0xa840, 0xa873,
-	0xa882, 0xa8b3,
-	0xa8f2, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa90a, 0xa925,
-	0xa930, 0xa946,
-	0xa960, 0xa97c,
-	0xa984, 0xa9b2,
-	0xa9cf, 0xa9cf,
-	0xaa00, 0xaa28,
-	0xaa40, 0xaa42,
-	0xaa44, 0xaa4b,
-	0xaa60, 0xaa76,
-	0xaa7a, 0xaa7a,
-	0xaa80, 0xaaaf,
-	0xaab1, 0xaab1,
-	0xaab5, 0xaab6,
-	0xaab9, 0xaabd,
-	0xaac0, 0xaac0,
-	0xaac2, 0xaac2,
-	0xaadb, 0xaadd,
-	0xaae0, 0xaaea,
-	0xaaf2, 0xaaf4,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabe2,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa6d,
-	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,
-	0x10140, 0x10174,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a00,
-	0x10a10, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11003, 0x11037,
-	0x11083, 0x110af,
-	0x110d0, 0x110e8,
-	0x11103, 0x11126,
-	0x11183, 0x111b2,
-	0x111c1, 0x111c4,
-	0x11680, 0x116aa,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f50,
-	0x16f93, 0x16f9f,
-	0x1b000, 0x1b001,
-	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, 0x1d7cb,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_ID_Start */
-
-/* 'ID_Continue': Derived Property */
-static const OnigCodePoint CR_ID_Continue[] = {
-	564,
-	0x0030, 0x0039,
-	0x0041, 0x005a,
-	0x005f, 0x005f,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00b5, 0x00b5,
-	0x00b7, 0x00b7,
-	0x00ba, 0x00ba,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x02c1,
-	0x02c6, 0x02d1,
-	0x02e0, 0x02e4,
-	0x02ec, 0x02ec,
-	0x02ee, 0x02ee,
-	0x0300, 0x0374,
-	0x0376, 0x0377,
-	0x037a, 0x037d,
-	0x0386, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x0483, 0x0487,
-	0x048a, 0x0527,
-	0x0531, 0x0556,
-	0x0559, 0x0559,
-	0x0561, 0x0587,
-	0x0591, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0610, 0x061a,
-	0x0620, 0x0669,
-	0x066e, 0x06d3,
-	0x06d5, 0x06dc,
-	0x06df, 0x06e8,
-	0x06ea, 0x06fc,
-	0x06ff, 0x06ff,
-	0x0710, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07f5,
-	0x07fa, 0x07fa,
-	0x0800, 0x082d,
-	0x0840, 0x085b,
-	0x08a0, 0x08a0,
-	0x08a2, 0x08ac,
-	0x08e4, 0x08fe,
-	0x0900, 0x0963,
-	0x0966, 0x096f,
-	0x0971, 0x0977,
-	0x0979, 0x097f,
-	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,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bef,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	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, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d6f,
-	0x0d7a, 0x0d7f,
-	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, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f18, 0x0f19,
-	0x0f20, 0x0f29,
-	0x0f35, 0x0f35,
-	0x0f37, 0x0f37,
-	0x0f39, 0x0f39,
-	0x0f3e, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f84,
-	0x0f86, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fc6, 0x0fc6,
-	0x1000, 0x1049,
-	0x1050, 0x109d,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 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,
-	0x135d, 0x135f,
-	0x1369, 0x1371,
-	0x1380, 0x138f,
-	0x13a0, 0x13f4,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1714,
-	0x1720, 0x1734,
-	0x1740, 0x1753,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-	0x1780, 0x17d3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dd,
-	0x17e0, 0x17e9,
-	0x180b, 0x180d,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1946, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x1a00, 0x1a1b,
-	0x1a20, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa7, 0x1aa7,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b59,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1bf3,
-	0x1c00, 0x1c37,
-	0x1c40, 0x1c49,
-	0x1c4d, 0x1c7d,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1cf6,
-	0x1d00, 0x1de6,
-	0x1dfc, 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,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 0x209c,
-	0x20d0, 0x20dc,
-	0x20e1, 0x20e1,
-	0x20e5, 0x20f0,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2118, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2160, 0x2188,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2ce4,
-	0x2ceb, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d6f,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2dff,
-	0x3005, 0x3007,
-	0x3021, 0x302f,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x3099, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa62b,
-	0xa640, 0xa66f,
-	0xa674, 0xa67d,
-	0xa67f, 0xa697,
-	0xa69f, 0xa6f1,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xa7f8, 0xa827,
-	0xa840, 0xa873,
-	0xa880, 0xa8c4,
-	0xa8d0, 0xa8d9,
-	0xa8e0, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa900, 0xa92d,
-	0xa930, 0xa953,
-	0xa960, 0xa97c,
-	0xa980, 0xa9c0,
-	0xa9cf, 0xa9d9,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa60, 0xaa76,
-	0xaa7a, 0xaa7b,
-	0xaa80, 0xaac2,
-	0xaadb, 0xaadd,
-	0xaae0, 0xaaef,
-	0xaaf2, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabea,
-	0xabec, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa6d,
-	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, 0xfe26,
-	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,
-	0x10140, 0x10174,
-	0x101fd, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	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, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11000, 0x11046,
-	0x11066, 0x1106f,
-	0x11080, 0x110ba,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x1113f,
-	0x11180, 0x111c4,
-	0x111d0, 0x111d9,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x1b000, 0x1b001,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0xe0100, 0xe01ef,
-}; /* CR_ID_Continue */
-
-/* 'XID_Start': Derived Property */
-static const OnigCodePoint CR_XID_Start[] = {
-	495,
-	0x0041, 0x005a,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00b5, 0x00b5,
-	0x00ba, 0x00ba,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x02c1,
-	0x02c6, 0x02d1,
-	0x02e0, 0x02e4,
-	0x02ec, 0x02ec,
-	0x02ee, 0x02ee,
-	0x0370, 0x0374,
-	0x0376, 0x0377,
-	0x037b, 0x037d,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x048a, 0x0527,
-	0x0531, 0x0556,
-	0x0559, 0x0559,
-	0x0561, 0x0587,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0620, 0x064a,
-	0x066e, 0x066f,
-	0x0671, 0x06d3,
-	0x06d5, 0x06d5,
-	0x06e5, 0x06e6,
-	0x06ee, 0x06ef,
-	0x06fa, 0x06fc,
-	0x06ff, 0x06ff,
-	0x0710, 0x0710,
-	0x0712, 0x072f,
-	0x074d, 0x07a5,
-	0x07b1, 0x07b1,
-	0x07ca, 0x07ea,
-	0x07f4, 0x07f5,
-	0x07fa, 0x07fa,
-	0x0800, 0x0815,
-	0x081a, 0x081a,
-	0x0824, 0x0824,
-	0x0828, 0x0828,
-	0x0840, 0x0858,
-	0x08a0, 0x08a0,
-	0x08a2, 0x08ac,
-	0x0904, 0x0939,
-	0x093d, 0x093d,
-	0x0950, 0x0950,
-	0x0958, 0x0961,
-	0x0971, 0x0977,
-	0x0979, 0x097f,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c3d,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c61,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbd, 0x0cbd,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce1,
-	0x0cf1, 0x0cf2,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d3d,
-	0x0d4e, 0x0d4e,
-	0x0d60, 0x0d61,
-	0x0d7a, 0x0d7f,
-	0x0d85, 0x0d96,
-	0x0d9a, 0x0db1,
-	0x0db3, 0x0dbb,
-	0x0dbd, 0x0dbd,
-	0x0dc0, 0x0dc6,
-	0x0e01, 0x0e30,
-	0x0e32, 0x0e32,
-	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, 0x0eb2,
-	0x0ebd, 0x0ebd,
-	0x0ec0, 0x0ec4,
-	0x0ec6, 0x0ec6,
-	0x0edc, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f40, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f88, 0x0f8c,
-	0x1000, 0x102a,
-	0x103f, 0x103f,
-	0x1050, 0x1055,
-	0x105a, 0x105d,
-	0x1061, 0x1061,
-	0x1065, 0x1066,
-	0x106e, 0x1070,
-	0x1075, 0x1081,
-	0x108e, 0x108e,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 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, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1711,
-	0x1720, 0x1731,
-	0x1740, 0x1751,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1780, 0x17b3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dc,
-	0x1820, 0x1877,
-	0x1880, 0x18a8,
-	0x18aa, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19c1, 0x19c7,
-	0x1a00, 0x1a16,
-	0x1a20, 0x1a54,
-	0x1aa7, 0x1aa7,
-	0x1b05, 0x1b33,
-	0x1b45, 0x1b4b,
-	0x1b83, 0x1ba0,
-	0x1bae, 0x1baf,
-	0x1bba, 0x1be5,
-	0x1c00, 0x1c23,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c7d,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf1,
-	0x1cf5, 0x1cf6,
-	0x1d00, 0x1dbf,
-	0x1e00, 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, 0x209c,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2118, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2160, 0x2188,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2ce4,
-	0x2ceb, 0x2cee,
-	0x2cf2, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x3005, 0x3007,
-	0x3021, 0x3029,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x309d, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa640, 0xa66e,
-	0xa67f, 0xa697,
-	0xa6a0, 0xa6ef,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xa7f8, 0xa801,
-	0xa803, 0xa805,
-	0xa807, 0xa80a,
-	0xa80c, 0xa822,
-	0xa840, 0xa873,
-	0xa882, 0xa8b3,
-	0xa8f2, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa90a, 0xa925,
-	0xa930, 0xa946,
-	0xa960, 0xa97c,
-	0xa984, 0xa9b2,
-	0xa9cf, 0xa9cf,
-	0xaa00, 0xaa28,
-	0xaa40, 0xaa42,
-	0xaa44, 0xaa4b,
-	0xaa60, 0xaa76,
-	0xaa7a, 0xaa7a,
-	0xaa80, 0xaaaf,
-	0xaab1, 0xaab1,
-	0xaab5, 0xaab6,
-	0xaab9, 0xaabd,
-	0xaac0, 0xaac0,
-	0xaac2, 0xaac2,
-	0xaadb, 0xaadd,
-	0xaae0, 0xaaea,
-	0xaaf2, 0xaaf4,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabe2,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb1d,
-	0xfb1f, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfc5d,
-	0xfc64, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdf9,
-	0xfe71, 0xfe71,
-	0xfe73, 0xfe73,
-	0xfe77, 0xfe77,
-	0xfe79, 0xfe79,
-	0xfe7b, 0xfe7b,
-	0xfe7d, 0xfe7d,
-	0xfe7f, 0xfefc,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0xff66, 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,
-	0x10140, 0x10174,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a00,
-	0x10a10, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11003, 0x11037,
-	0x11083, 0x110af,
-	0x110d0, 0x110e8,
-	0x11103, 0x11126,
-	0x11183, 0x111b2,
-	0x111c1, 0x111c4,
-	0x11680, 0x116aa,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f50,
-	0x16f93, 0x16f9f,
-	0x1b000, 0x1b001,
-	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, 0x1d7cb,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_XID_Start */
-
-/* 'XID_Continue': Derived Property */
-static const OnigCodePoint CR_XID_Continue[] = {
-	571,
-	0x0030, 0x0039,
-	0x0041, 0x005a,
-	0x005f, 0x005f,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00b5, 0x00b5,
-	0x00b7, 0x00b7,
-	0x00ba, 0x00ba,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x02c1,
-	0x02c6, 0x02d1,
-	0x02e0, 0x02e4,
-	0x02ec, 0x02ec,
-	0x02ee, 0x02ee,
-	0x0300, 0x0374,
-	0x0376, 0x0377,
-	0x037b, 0x037d,
-	0x0386, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x0483, 0x0487,
-	0x048a, 0x0527,
-	0x0531, 0x0556,
-	0x0559, 0x0559,
-	0x0561, 0x0587,
-	0x0591, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0610, 0x061a,
-	0x0620, 0x0669,
-	0x066e, 0x06d3,
-	0x06d5, 0x06dc,
-	0x06df, 0x06e8,
-	0x06ea, 0x06fc,
-	0x06ff, 0x06ff,
-	0x0710, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07f5,
-	0x07fa, 0x07fa,
-	0x0800, 0x082d,
-	0x0840, 0x085b,
-	0x08a0, 0x08a0,
-	0x08a2, 0x08ac,
-	0x08e4, 0x08fe,
-	0x0900, 0x0963,
-	0x0966, 0x096f,
-	0x0971, 0x0977,
-	0x0979, 0x097f,
-	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,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bef,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	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, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d6f,
-	0x0d7a, 0x0d7f,
-	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, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f18, 0x0f19,
-	0x0f20, 0x0f29,
-	0x0f35, 0x0f35,
-	0x0f37, 0x0f37,
-	0x0f39, 0x0f39,
-	0x0f3e, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f84,
-	0x0f86, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fc6, 0x0fc6,
-	0x1000, 0x1049,
-	0x1050, 0x109d,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 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,
-	0x135d, 0x135f,
-	0x1369, 0x1371,
-	0x1380, 0x138f,
-	0x13a0, 0x13f4,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1714,
-	0x1720, 0x1734,
-	0x1740, 0x1753,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-	0x1780, 0x17d3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dd,
-	0x17e0, 0x17e9,
-	0x180b, 0x180d,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1946, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x1a00, 0x1a1b,
-	0x1a20, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa7, 0x1aa7,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b59,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1bf3,
-	0x1c00, 0x1c37,
-	0x1c40, 0x1c49,
-	0x1c4d, 0x1c7d,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1cf6,
-	0x1d00, 0x1de6,
-	0x1dfc, 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,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 0x209c,
-	0x20d0, 0x20dc,
-	0x20e1, 0x20e1,
-	0x20e5, 0x20f0,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2118, 0x211d,
-	0x2124, 0x2124,
-	0x2126, 0x2126,
-	0x2128, 0x2128,
-	0x212a, 0x2139,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x214e, 0x214e,
-	0x2160, 0x2188,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2ce4,
-	0x2ceb, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d6f,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2dff,
-	0x3005, 0x3007,
-	0x3021, 0x302f,
-	0x3031, 0x3035,
-	0x3038, 0x303c,
-	0x3041, 0x3096,
-	0x3099, 0x309a,
-	0x309d, 0x309f,
-	0x30a1, 0x30fa,
-	0x30fc, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x31a0, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa62b,
-	0xa640, 0xa66f,
-	0xa674, 0xa67d,
-	0xa67f, 0xa697,
-	0xa69f, 0xa6f1,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa78e,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xa7f8, 0xa827,
-	0xa840, 0xa873,
-	0xa880, 0xa8c4,
-	0xa8d0, 0xa8d9,
-	0xa8e0, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa900, 0xa92d,
-	0xa930, 0xa953,
-	0xa960, 0xa97c,
-	0xa980, 0xa9c0,
-	0xa9cf, 0xa9d9,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa60, 0xaa76,
-	0xaa7a, 0xaa7b,
-	0xaa80, 0xaac2,
-	0xaadb, 0xaadd,
-	0xaae0, 0xaaef,
-	0xaaf2, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabea,
-	0xabec, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb28,
-	0xfb2a, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfc5d,
-	0xfc64, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdf9,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe26,
-	0xfe33, 0xfe34,
-	0xfe4d, 0xfe4f,
-	0xfe71, 0xfe71,
-	0xfe73, 0xfe73,
-	0xfe77, 0xfe77,
-	0xfe79, 0xfe79,
-	0xfe7b, 0xfe7b,
-	0xfe7d, 0xfe7d,
-	0xfe7f, 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,
-	0x10140, 0x10174,
-	0x101fd, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x10300, 0x1031e,
-	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, 0x10855,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x10a60, 0x10a7c,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10c00, 0x10c48,
-	0x11000, 0x11046,
-	0x11066, 0x1106f,
-	0x11080, 0x110ba,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x1113f,
-	0x11180, 0x111c4,
-	0x111d0, 0x111d9,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x1b000, 0x1b001,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0xe0100, 0xe01ef,
-}; /* CR_XID_Continue */
-
-/* 'Default_Ignorable_Code_Point': Derived Property */
-static const OnigCodePoint CR_Default_Ignorable_Code_Point[] = {
-	15,
-	0x00ad, 0x00ad,
-	0x034f, 0x034f,
-	0x115f, 0x1160,
-	0x17b4, 0x17b5,
-	0x180b, 0x180d,
-	0x200b, 0x200f,
-	0x202a, 0x202e,
-	0x2060, 0x206f,
-	0x3164, 0x3164,
-	0xfe00, 0xfe0f,
-	0xfeff, 0xfeff,
-	0xffa0, 0xffa0,
-	0xfff0, 0xfff8,
-	0x1d173, 0x1d17a,
-	0xe0000, 0xe0fff,
-}; /* CR_Default_Ignorable_Code_Point */
-
-/* 'Grapheme_Extend': Derived Property */
-static const OnigCodePoint CR_Grapheme_Extend[] = {
-	232,
-	0x0300, 0x036f,
-	0x0483, 0x0489,
-	0x0591, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x0610, 0x061a,
-	0x064b, 0x065f,
-	0x0670, 0x0670,
-	0x06d6, 0x06dc,
-	0x06df, 0x06e4,
-	0x06e7, 0x06e8,
-	0x06ea, 0x06ed,
-	0x0711, 0x0711,
-	0x0730, 0x074a,
-	0x07a6, 0x07b0,
-	0x07eb, 0x07f3,
-	0x0816, 0x0819,
-	0x081b, 0x0823,
-	0x0825, 0x0827,
-	0x0829, 0x082d,
-	0x0859, 0x085b,
-	0x08e4, 0x08fe,
-	0x0900, 0x0902,
-	0x093a, 0x093a,
-	0x093c, 0x093c,
-	0x0941, 0x0948,
-	0x094d, 0x094d,
-	0x0951, 0x0957,
-	0x0962, 0x0963,
-	0x0981, 0x0981,
-	0x09bc, 0x09bc,
-	0x09be, 0x09be,
-	0x09c1, 0x09c4,
-	0x09cd, 0x09cd,
-	0x09d7, 0x09d7,
-	0x09e2, 0x09e3,
-	0x0a01, 0x0a02,
-	0x0a3c, 0x0a3c,
-	0x0a41, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a70, 0x0a71,
-	0x0a75, 0x0a75,
-	0x0a81, 0x0a82,
-	0x0abc, 0x0abc,
-	0x0ac1, 0x0ac5,
-	0x0ac7, 0x0ac8,
-	0x0acd, 0x0acd,
-	0x0ae2, 0x0ae3,
-	0x0b01, 0x0b01,
-	0x0b3c, 0x0b3c,
-	0x0b3e, 0x0b3f,
-	0x0b41, 0x0b44,
-	0x0b4d, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b62, 0x0b63,
-	0x0b82, 0x0b82,
-	0x0bbe, 0x0bbe,
-	0x0bc0, 0x0bc0,
-	0x0bcd, 0x0bcd,
-	0x0bd7, 0x0bd7,
-	0x0c3e, 0x0c40,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c62, 0x0c63,
-	0x0cbc, 0x0cbc,
-	0x0cbf, 0x0cbf,
-	0x0cc2, 0x0cc2,
-	0x0cc6, 0x0cc6,
-	0x0ccc, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0ce2, 0x0ce3,
-	0x0d3e, 0x0d3e,
-	0x0d41, 0x0d44,
-	0x0d4d, 0x0d4d,
-	0x0d57, 0x0d57,
-	0x0d62, 0x0d63,
-	0x0dca, 0x0dca,
-	0x0dcf, 0x0dcf,
-	0x0dd2, 0x0dd4,
-	0x0dd6, 0x0dd6,
-	0x0ddf, 0x0ddf,
-	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,
-	0x0f8d, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fc6, 0x0fc6,
-	0x102d, 0x1030,
-	0x1032, 0x1037,
-	0x1039, 0x103a,
-	0x103d, 0x103e,
-	0x1058, 0x1059,
-	0x105e, 0x1060,
-	0x1071, 0x1074,
-	0x1082, 0x1082,
-	0x1085, 0x1086,
-	0x108d, 0x108d,
-	0x109d, 0x109d,
-	0x135d, 0x135f,
-	0x1712, 0x1714,
-	0x1732, 0x1734,
-	0x1752, 0x1753,
-	0x1772, 0x1773,
-	0x17b4, 0x17b5,
-	0x17b7, 0x17bd,
-	0x17c6, 0x17c6,
-	0x17c9, 0x17d3,
-	0x17dd, 0x17dd,
-	0x180b, 0x180d,
-	0x18a9, 0x18a9,
-	0x1920, 0x1922,
-	0x1927, 0x1928,
-	0x1932, 0x1932,
-	0x1939, 0x193b,
-	0x1a17, 0x1a18,
-	0x1a56, 0x1a56,
-	0x1a58, 0x1a5e,
-	0x1a60, 0x1a60,
-	0x1a62, 0x1a62,
-	0x1a65, 0x1a6c,
-	0x1a73, 0x1a7c,
-	0x1a7f, 0x1a7f,
-	0x1b00, 0x1b03,
-	0x1b34, 0x1b34,
-	0x1b36, 0x1b3a,
-	0x1b3c, 0x1b3c,
-	0x1b42, 0x1b42,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1b81,
-	0x1ba2, 0x1ba5,
-	0x1ba8, 0x1ba9,
-	0x1bab, 0x1bab,
-	0x1be6, 0x1be6,
-	0x1be8, 0x1be9,
-	0x1bed, 0x1bed,
-	0x1bef, 0x1bf1,
-	0x1c2c, 0x1c33,
-	0x1c36, 0x1c37,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce0,
-	0x1ce2, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1cf4, 0x1cf4,
-	0x1dc0, 0x1de6,
-	0x1dfc, 0x1dff,
-	0x200c, 0x200d,
-	0x20d0, 0x20f0,
-	0x2cef, 0x2cf1,
-	0x2d7f, 0x2d7f,
-	0x2de0, 0x2dff,
-	0x302a, 0x302f,
-	0x3099, 0x309a,
-	0xa66f, 0xa672,
-	0xa674, 0xa67d,
-	0xa69f, 0xa69f,
-	0xa6f0, 0xa6f1,
-	0xa802, 0xa802,
-	0xa806, 0xa806,
-	0xa80b, 0xa80b,
-	0xa825, 0xa826,
-	0xa8c4, 0xa8c4,
-	0xa8e0, 0xa8f1,
-	0xa926, 0xa92d,
-	0xa947, 0xa951,
-	0xa980, 0xa982,
-	0xa9b3, 0xa9b3,
-	0xa9b6, 0xa9b9,
-	0xa9bc, 0xa9bc,
-	0xaa29, 0xaa2e,
-	0xaa31, 0xaa32,
-	0xaa35, 0xaa36,
-	0xaa43, 0xaa43,
-	0xaa4c, 0xaa4c,
-	0xaab0, 0xaab0,
-	0xaab2, 0xaab4,
-	0xaab7, 0xaab8,
-	0xaabe, 0xaabf,
-	0xaac1, 0xaac1,
-	0xaaec, 0xaaed,
-	0xaaf6, 0xaaf6,
-	0xabe5, 0xabe5,
-	0xabe8, 0xabe8,
-	0xabed, 0xabed,
-	0xfb1e, 0xfb1e,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe26,
-	0xff9e, 0xff9f,
-	0x101fd, 0x101fd,
-	0x10a01, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a0f,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x11001, 0x11001,
-	0x11038, 0x11046,
-	0x11080, 0x11081,
-	0x110b3, 0x110b6,
-	0x110b9, 0x110ba,
-	0x11100, 0x11102,
-	0x11127, 0x1112b,
-	0x1112d, 0x11134,
-	0x11180, 0x11181,
-	0x111b6, 0x111be,
-	0x116ab, 0x116ab,
-	0x116ad, 0x116ad,
-	0x116b0, 0x116b5,
-	0x116b7, 0x116b7,
-	0x16f8f, 0x16f92,
-	0x1d165, 0x1d165,
-	0x1d167, 0x1d169,
-	0x1d16e, 0x1d172,
-	0x1d17b, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-	0x1d242, 0x1d244,
-	0xe0100, 0xe01ef,
-}; /* CR_Grapheme_Extend */
-
-/* 'Grapheme_Base': Derived Property */
-static const OnigCodePoint CR_Grapheme_Base[] = {
-	643,
-	0x0020, 0x007e,
-	0x00a0, 0x00ac,
-	0x00ae, 0x02ff,
-	0x0370, 0x0377,
-	0x037a, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x0482,
-	0x048a, 0x0527,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x058f, 0x058f,
-	0x05be, 0x05be,
-	0x05c0, 0x05c0,
-	0x05c3, 0x05c3,
-	0x05c6, 0x05c6,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0606, 0x060f,
-	0x061b, 0x061b,
-	0x061e, 0x064a,
-	0x0660, 0x066f,
-	0x0671, 0x06d5,
-	0x06de, 0x06de,
-	0x06e5, 0x06e6,
-	0x06e9, 0x06e9,
-	0x06ee, 0x070d,
-	0x0710, 0x0710,
-	0x0712, 0x072f,
-	0x074d, 0x07a5,
-	0x07b1, 0x07b1,
-	0x07c0, 0x07ea,
-	0x07f4, 0x07fa,
-	0x0800, 0x0815,
-	0x081a, 0x081a,
-	0x0824, 0x0824,
-	0x0828, 0x0828,
-	0x0830, 0x083e,
-	0x0840, 0x0858,
-	0x085e, 0x085e,
-	0x08a0, 0x08a0,
-	0x08a2, 0x08ac,
-	0x0903, 0x0939,
-	0x093b, 0x093b,
-	0x093d, 0x0940,
-	0x0949, 0x094c,
-	0x094e, 0x0950,
-	0x0958, 0x0961,
-	0x0964, 0x0977,
-	0x0979, 0x097f,
-	0x0982, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bd, 0x09bd,
-	0x09bf, 0x09c0,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cc,
-	0x09ce, 0x09ce,
-	0x09dc, 0x09dd,
-	0x09df, 0x09e1,
-	0x09e6, 0x09fb,
-	0x0a03, 0x0a03,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3e, 0x0a40,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a6f,
-	0x0a72, 0x0a74,
-	0x0a83, 0x0a83,
-	0x0a85, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abd, 0x0ac0,
-	0x0ac9, 0x0ac9,
-	0x0acb, 0x0acc,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae1,
-	0x0ae6, 0x0af1,
-	0x0b02, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3d, 0x0b3d,
-	0x0b40, 0x0b40,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4c,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b61,
-	0x0b66, 0x0b77,
-	0x0b83, 0x0b83,
-	0x0b85, 0x0b8a,
-	0x0b8e, 0x0b90,
-	0x0b92, 0x0b95,
-	0x0b99, 0x0b9a,
-	0x0b9c, 0x0b9c,
-	0x0b9e, 0x0b9f,
-	0x0ba3, 0x0ba4,
-	0x0ba8, 0x0baa,
-	0x0bae, 0x0bb9,
-	0x0bbf, 0x0bbf,
-	0x0bc1, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcc,
-	0x0bd0, 0x0bd0,
-	0x0be6, 0x0bfa,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c3d,
-	0x0c41, 0x0c44,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c61,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-	0x0c82, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbd, 0x0cbe,
-	0x0cc0, 0x0cc1,
-	0x0cc3, 0x0cc4,
-	0x0cc7, 0x0cc8,
-	0x0cca, 0x0ccb,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce1,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d3d,
-	0x0d3f, 0x0d40,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4c,
-	0x0d4e, 0x0d4e,
-	0x0d60, 0x0d61,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
-	0x0d82, 0x0d83,
-	0x0d85, 0x0d96,
-	0x0d9a, 0x0db1,
-	0x0db3, 0x0dbb,
-	0x0dbd, 0x0dbd,
-	0x0dc0, 0x0dc6,
-	0x0dd0, 0x0dd1,
-	0x0dd8, 0x0dde,
-	0x0df2, 0x0df4,
-	0x0e01, 0x0e30,
-	0x0e32, 0x0e33,
-	0x0e3f, 0x0e46,
-	0x0e4f, 0x0e5b,
-	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,
-	0x0ed0, 0x0ed9,
-	0x0edc, 0x0edf,
-	0x0f00, 0x0f17,
-	0x0f1a, 0x0f34,
-	0x0f36, 0x0f36,
-	0x0f38, 0x0f38,
-	0x0f3a, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f7f, 0x0f7f,
-	0x0f85, 0x0f85,
-	0x0f88, 0x0f8c,
-	0x0fbe, 0x0fc5,
-	0x0fc7, 0x0fcc,
-	0x0fce, 0x0fda,
-	0x1000, 0x102c,
-	0x1031, 0x1031,
-	0x1038, 0x1038,
-	0x103b, 0x103c,
-	0x103f, 0x1057,
-	0x105a, 0x105d,
-	0x1061, 0x1070,
-	0x1075, 0x1081,
-	0x1083, 0x1084,
-	0x1087, 0x108c,
-	0x108e, 0x109c,
-	0x109e, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 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,
-	0x1360, 0x137c,
-	0x1380, 0x1399,
-	0x13a0, 0x13f4,
-	0x1400, 0x169c,
-	0x16a0, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1711,
-	0x1720, 0x1731,
-	0x1735, 0x1736,
-	0x1740, 0x1751,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1780, 0x17b3,
-	0x17b6, 0x17b6,
-	0x17be, 0x17c5,
-	0x17c7, 0x17c8,
-	0x17d4, 0x17dc,
-	0x17e0, 0x17e9,
-	0x17f0, 0x17f9,
-	0x1800, 0x180a,
-	0x180e, 0x180e,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18a8,
-	0x18aa, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1923, 0x1926,
-	0x1929, 0x192b,
-	0x1930, 0x1931,
-	0x1933, 0x1938,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a16,
-	0x1a19, 0x1a1b,
-	0x1a1e, 0x1a55,
-	0x1a57, 0x1a57,
-	0x1a61, 0x1a61,
-	0x1a63, 0x1a64,
-	0x1a6d, 0x1a72,
-	0x1a80, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-	0x1b04, 0x1b33,
-	0x1b35, 0x1b35,
-	0x1b3b, 0x1b3b,
-	0x1b3d, 0x1b41,
-	0x1b43, 0x1b4b,
-	0x1b50, 0x1b6a,
-	0x1b74, 0x1b7c,
-	0x1b82, 0x1ba1,
-	0x1ba6, 0x1ba7,
-	0x1baa, 0x1baa,
-	0x1bac, 0x1be5,
-	0x1be7, 0x1be7,
-	0x1bea, 0x1bec,
-	0x1bee, 0x1bee,
-	0x1bf2, 0x1bf3,
-	0x1bfc, 0x1c2b,
-	0x1c34, 0x1c35,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cc0, 0x1cc7,
-	0x1cd3, 0x1cd3,
-	0x1ce1, 0x1ce1,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf3,
-	0x1cf5, 0x1cf6,
-	0x1d00, 0x1dbf,
-	0x1e00, 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, 0x200a,
-	0x2010, 0x2027,
-	0x202f, 0x205f,
-	0x2070, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x209c,
-	0x20a0, 0x20b9,
-	0x2100, 0x2189,
-	0x2190, 0x23f3,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x26ff,
-	0x2701, 0x2b4c,
-	0x2b50, 0x2b59,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cee,
-	0x2cf2, 0x2cf3,
-	0x2cf9, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d70,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2e00, 0x2e3b,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x3029,
-	0x3030, 0x303f,
-	0x3041, 0x3096,
-	0x309b, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa66e,
-	0xa673, 0xa673,
-	0xa67e, 0xa697,
-	0xa6a0, 0xa6ef,
-	0xa6f2, 0xa6f7,
-	0xa700, 0xa78e,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xa7f8, 0xa801,
-	0xa803, 0xa805,
-	0xa807, 0xa80a,
-	0xa80c, 0xa824,
-	0xa827, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c3,
-	0xa8ce, 0xa8d9,
-	0xa8f2, 0xa8fb,
-	0xa900, 0xa925,
-	0xa92e, 0xa946,
-	0xa952, 0xa953,
-	0xa95f, 0xa97c,
-	0xa983, 0xa9b2,
-	0xa9b4, 0xa9b5,
-	0xa9ba, 0xa9bb,
-	0xa9bd, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9df,
-	0xaa00, 0xaa28,
-	0xaa2f, 0xaa30,
-	0xaa33, 0xaa34,
-	0xaa40, 0xaa42,
-	0xaa44, 0xaa4b,
-	0xaa4d, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa7b,
-	0xaa80, 0xaaaf,
-	0xaab1, 0xaab1,
-	0xaab5, 0xaab6,
-	0xaab9, 0xaabd,
-	0xaac0, 0xaac0,
-	0xaac2, 0xaac2,
-	0xaadb, 0xaaeb,
-	0xaaee, 0xaaf5,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabe4,
-	0xabe6, 0xabe7,
-	0xabe9, 0xabec,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb1d,
-	0xfb1f, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbc1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfd,
-	0xfe10, 0xfe19,
-	0xfe30, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0xff01, 0xff9d,
-	0xffa0, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfffc, 0xfffd,
-	0x10000, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018a,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fc,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	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, 0x10855,
-	0x10857, 0x1085f,
-	0x10900, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a00,
-	0x10a10, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a40, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a7f,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b7f,
-	0x10c00, 0x10c48,
-	0x10e60, 0x10e7e,
-	0x11000, 0x11000,
-	0x11002, 0x11037,
-	0x11047, 0x1104d,
-	0x11052, 0x1106f,
-	0x11082, 0x110b2,
-	0x110b7, 0x110b8,
-	0x110bb, 0x110bc,
-	0x110be, 0x110c1,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11103, 0x11126,
-	0x1112c, 0x1112c,
-	0x11136, 0x11143,
-	0x11182, 0x111b5,
-	0x111bf, 0x111c8,
-	0x111d0, 0x111d9,
-	0x11680, 0x116aa,
-	0x116ac, 0x116ac,
-	0x116ae, 0x116af,
-	0x116b6, 0x116b6,
-	0x116c0, 0x116c9,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f93, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d164,
-	0x1d166, 0x1d166,
-	0x1d16a, 0x1d16d,
-	0x1d183, 0x1d184,
-	0x1d18c, 0x1d1a9,
-	0x1d1ae, 0x1d1dd,
-	0x1d200, 0x1d241,
-	0x1d245, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	0x1f100, 0x1f10a,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f320,
-	0x1f330, 0x1f335,
-	0x1f337, 0x1f37c,
-	0x1f380, 0x1f393,
-	0x1f3a0, 0x1f3c4,
-	0x1f3c6, 0x1f3ca,
-	0x1f3e0, 0x1f3f0,
-	0x1f400, 0x1f43e,
-	0x1f440, 0x1f440,
-	0x1f442, 0x1f4f7,
-	0x1f4f9, 0x1f4fc,
-	0x1f500, 0x1f53d,
-	0x1f540, 0x1f543,
-	0x1f550, 0x1f567,
-	0x1f5fb, 0x1f640,
-	0x1f645, 0x1f64f,
-	0x1f680, 0x1f6c5,
-	0x1f700, 0x1f773,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_Grapheme_Base */
-
-/* 'Grapheme_Link': Derived Property */
-static const OnigCodePoint CR_Grapheme_Link[] = {
-	33,
-	0x094d, 0x094d,
-	0x09cd, 0x09cd,
-	0x0a4d, 0x0a4d,
-	0x0acd, 0x0acd,
-	0x0b4d, 0x0b4d,
-	0x0bcd, 0x0bcd,
-	0x0c4d, 0x0c4d,
-	0x0ccd, 0x0ccd,
-	0x0d4d, 0x0d4d,
-	0x0dca, 0x0dca,
-	0x0e3a, 0x0e3a,
-	0x0f84, 0x0f84,
-	0x1039, 0x103a,
-	0x1714, 0x1714,
-	0x1734, 0x1734,
-	0x17d2, 0x17d2,
-	0x1a60, 0x1a60,
-	0x1b44, 0x1b44,
-	0x1baa, 0x1bab,
-	0x1bf2, 0x1bf3,
-	0x2d7f, 0x2d7f,
-	0xa806, 0xa806,
-	0xa8c4, 0xa8c4,
-	0xa953, 0xa953,
-	0xa9c0, 0xa9c0,
-	0xaaf6, 0xaaf6,
-	0xabed, 0xabed,
-	0x10a3f, 0x10a3f,
-	0x11046, 0x11046,
-	0x110b9, 0x110b9,
-	0x11133, 0x11134,
-	0x111c0, 0x111c0,
-	0x116b6, 0x116b6,
-}; /* CR_Grapheme_Link */
-
-/* 'Common': Script */
-static const OnigCodePoint CR_Common[] = {
-	157,
-	0x0000, 0x0040,
-	0x005b, 0x0060,
-	0x007b, 0x00a9,
-	0x00ab, 0x00b9,
-	0x00bb, 0x00bf,
-	0x00d7, 0x00d7,
-	0x00f7, 0x00f7,
-	0x02b9, 0x02df,
-	0x02e5, 0x02e9,
-	0x02ec, 0x02ff,
-	0x0374, 0x0374,
-	0x037e, 0x037e,
-	0x0385, 0x0385,
-	0x0387, 0x0387,
-	0x0589, 0x0589,
-	0x060c, 0x060c,
-	0x061b, 0x061b,
-	0x061f, 0x061f,
-	0x0640, 0x0640,
-	0x0660, 0x0669,
-	0x06dd, 0x06dd,
-	0x0964, 0x0965,
-	0x0e3f, 0x0e3f,
-	0x0fd5, 0x0fd8,
-	0x10fb, 0x10fb,
-	0x16eb, 0x16ed,
-	0x1735, 0x1736,
-	0x1802, 0x1803,
-	0x1805, 0x1805,
-	0x1cd3, 0x1cd3,
-	0x1ce1, 0x1ce1,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf3,
-	0x1cf5, 0x1cf6,
-	0x2000, 0x200b,
-	0x200e, 0x2064,
-	0x206a, 0x2070,
-	0x2074, 0x207e,
-	0x2080, 0x208e,
-	0x20a0, 0x20b9,
-	0x2100, 0x2125,
-	0x2127, 0x2129,
-	0x212c, 0x2131,
-	0x2133, 0x214d,
-	0x214f, 0x215f,
-	0x2189, 0x2189,
-	0x2190, 0x23f3,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x26ff,
-	0x2701, 0x27ff,
-	0x2900, 0x2b4c,
-	0x2b50, 0x2b59,
-	0x2e00, 0x2e3b,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x3004,
-	0x3006, 0x3006,
-	0x3008, 0x3020,
-	0x3030, 0x3037,
-	0x303c, 0x303f,
-	0x309b, 0x309c,
-	0x30a0, 0x30a0,
-	0x30fb, 0x30fc,
-	0x3190, 0x319f,
-	0x31c0, 0x31e3,
-	0x3220, 0x325f,
-	0x327f, 0x32cf,
-	0x3358, 0x33ff,
-	0x4dc0, 0x4dff,
-	0xa700, 0xa721,
-	0xa788, 0xa78a,
-	0xa830, 0xa839,
-	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,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fc,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d166,
-	0x1d16a, 0x1d17a,
-	0x1d183, 0x1d184,
-	0x1d18c, 0x1d1a9,
-	0x1d1ae, 0x1d1dd,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	0x1f100, 0x1f10a,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f1ff,
-	0x1f201, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f320,
-	0x1f330, 0x1f335,
-	0x1f337, 0x1f37c,
-	0x1f380, 0x1f393,
-	0x1f3a0, 0x1f3c4,
-	0x1f3c6, 0x1f3ca,
-	0x1f3e0, 0x1f3f0,
-	0x1f400, 0x1f43e,
-	0x1f440, 0x1f440,
-	0x1f442, 0x1f4f7,
-	0x1f4f9, 0x1f4fc,
-	0x1f500, 0x1f53d,
-	0x1f540, 0x1f543,
-	0x1f550, 0x1f567,
-	0x1f5fb, 0x1f640,
-	0x1f645, 0x1f64f,
-	0x1f680, 0x1f6c5,
-	0x1f700, 0x1f773,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-}; /* CR_Common */
-
-/* 'Latin': Script */
-static const OnigCodePoint CR_Latin[] = {
-	30,
-	0x0041, 0x005a,
-	0x0061, 0x007a,
-	0x00aa, 0x00aa,
-	0x00ba, 0x00ba,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x02b8,
-	0x02e0, 0x02e4,
-	0x1d00, 0x1d25,
-	0x1d2c, 0x1d5c,
-	0x1d62, 0x1d65,
-	0x1d6b, 0x1d77,
-	0x1d79, 0x1dbe,
-	0x1e00, 0x1eff,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 0x209c,
-	0x212a, 0x212b,
-	0x2132, 0x2132,
-	0x214e, 0x214e,
-	0x2160, 0x2188,
-	0x2c60, 0x2c7f,
-	0xa722, 0xa787,
-	0xa78b, 0xa78e,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xa7f8, 0xa7ff,
-	0xfb00, 0xfb06,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-}; /* CR_Latin */
-
-/* 'Greek': Script */
-static const OnigCodePoint CR_Greek[] = {
-	33,
-	0x0370, 0x0373,
-	0x0375, 0x0377,
-	0x037a, 0x037d,
-	0x0384, 0x0384,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03e1,
-	0x03f0, 0x03ff,
-	0x1d26, 0x1d2a,
-	0x1d5d, 0x1d61,
-	0x1d66, 0x1d6a,
-	0x1dbf, 0x1dbf,
-	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 */
-
-/* 'Cyrillic': Script */
-static const OnigCodePoint CR_Cyrillic[] = {
-	7,
-	0x0400, 0x0484,
-	0x0487, 0x0527,
-	0x1d2b, 0x1d2b,
-	0x1d78, 0x1d78,
-	0x2de0, 0x2dff,
-	0xa640, 0xa697,
-	0xa69f, 0xa69f,
-}; /* CR_Cyrillic */
-
-/* 'Armenian': Script */
-static const OnigCodePoint CR_Armenian[] = {
-	6,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x058a, 0x058a,
-	0x058f, 0x058f,
-	0xfb13, 0xfb17,
-}; /* CR_Armenian */
-
-/* 'Hebrew': Script */
-static const OnigCodePoint CR_Hebrew[] = {
-	9,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfb4f,
-}; /* CR_Hebrew */
-
-/* 'Arabic': Script */
-static const OnigCodePoint CR_Arabic[] = {
-	56,
-	0x0600, 0x0604,
-	0x0606, 0x060b,
-	0x060d, 0x061a,
-	0x061e, 0x061e,
-	0x0620, 0x063f,
-	0x0641, 0x064a,
-	0x0656, 0x065e,
-	0x066a, 0x066f,
-	0x0671, 0x06dc,
-	0x06de, 0x06ff,
-	0x0750, 0x077f,
-	0x08a0, 0x08a0,
-	0x08a2, 0x08ac,
-	0x08e4, 0x08fe,
-	0xfb50, 0xfbc1,
-	0xfbd3, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfc,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0x10e60, 0x10e7e,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-}; /* CR_Arabic */
-
-/* 'Syriac': Script */
-static const OnigCodePoint CR_Syriac[] = {
-	3,
-	0x0700, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x074f,
-}; /* CR_Syriac */
-
-/* 'Thaana': Script */
-static const OnigCodePoint CR_Thaana[] = {
-	1,
-	0x0780, 0x07b1,
-}; /* CR_Thaana */
-
-/* 'Devanagari': Script */
-static const OnigCodePoint CR_Devanagari[] = {
-	5,
-	0x0900, 0x0950,
-	0x0953, 0x0963,
-	0x0966, 0x0977,
-	0x0979, 0x097f,
-	0xa8e0, 0xa8fb,
-}; /* CR_Devanagari */
-
-/* '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, 0x09fb,
-}; /* CR_Bengali */
-
-/* 'Gurmukhi': Script */
-static const OnigCodePoint CR_Gurmukhi[] = {
-	16,
-	0x0a01, 0x0a03,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-}; /* CR_Gurmukhi */
-
-/* 'Gujarati': Script */
-static const OnigCodePoint CR_Gujarati[] = {
-	13,
-	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, 0x0af1,
-}; /* CR_Gujarati */
-
-/* 'Oriya': Script */
-static const OnigCodePoint CR_Oriya[] = {
-	14,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3c, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	0x0b66, 0x0b77,
-}; /* CR_Oriya */
-
-/* 'Tamil': Script */
-static const OnigCodePoint CR_Tamil[] = {
-	16,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bfa,
-}; /* CR_Tamil */
-
-/* 'Telugu': Script */
-static const OnigCodePoint CR_Telugu[] = {
-	14,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-}; /* CR_Telugu */
-
-/* 'Kannada': Script */
-static const OnigCodePoint CR_Kannada[] = {
-	14,
-	0x0c82, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-}; /* CR_Kannada */
-
-/* 'Malayalam': Script */
-static const OnigCodePoint CR_Malayalam[] = {
-	11,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
-}; /* CR_Malayalam */
-
-/* '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 */
-
-/* 'Thai': Script */
-static const OnigCodePoint CR_Thai[] = {
-	2,
-	0x0e01, 0x0e3a,
-	0x0e40, 0x0e5b,
-}; /* CR_Thai */
-
-/* '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, 0x0edf,
-}; /* CR_Lao */
-
-/* 'Tibetan': Script */
-static const OnigCodePoint CR_Tibetan[] = {
-	7,
-	0x0f00, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fd4,
-	0x0fd9, 0x0fda,
-}; /* CR_Tibetan */
-
-/* 'Myanmar': Script */
-static const OnigCodePoint CR_Myanmar[] = {
-	2,
-	0x1000, 0x109f,
-	0xaa60, 0xaa7b,
-}; /* CR_Myanmar */
-
-/* 'Georgian': Script */
-static const OnigCodePoint CR_Georgian[] = {
-	8,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 0x10ff,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-}; /* CR_Georgian */
-
-/* 'Hangul': Script */
-static const OnigCodePoint CR_Hangul[] = {
-	14,
-	0x1100, 0x11ff,
-	0x302e, 0x302f,
-	0x3131, 0x318e,
-	0x3200, 0x321e,
-	0x3260, 0x327e,
-	0xa960, 0xa97c,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xffa0, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-}; /* CR_Hangul */
-
-/* 'Ethiopic': Script */
-static const OnigCodePoint CR_Ethiopic[] = {
-	32,
-	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,
-	0x135d, 0x137c,
-	0x1380, 0x1399,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-}; /* CR_Ethiopic */
-
-/* 'Cherokee': Script */
-static const OnigCodePoint CR_Cherokee[] = {
-	1,
-	0x13a0, 0x13f4,
-}; /* CR_Cherokee */
-
-/* 'Canadian_Aboriginal': Script */
-static const OnigCodePoint CR_Canadian_Aboriginal[] = {
-	2,
-	0x1400, 0x167f,
-	0x18b0, 0x18f5,
-}; /* CR_Canadian_Aboriginal */
-
-/* 'Ogham': Script */
-static const OnigCodePoint CR_Ogham[] = {
-	1,
-	0x1680, 0x169c,
-}; /* CR_Ogham */
-
-/* 'Runic': Script */
-static const OnigCodePoint CR_Runic[] = {
-	2,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f0,
-}; /* CR_Runic */
-
-/* 'Khmer': Script */
-static const OnigCodePoint CR_Khmer[] = {
-	4,
-	0x1780, 0x17dd,
-	0x17e0, 0x17e9,
-	0x17f0, 0x17f9,
-	0x19e0, 0x19ff,
-}; /* CR_Khmer */
-
-/* 'Mongolian': Script */
-static const OnigCodePoint CR_Mongolian[] = {
-	6,
-	0x1800, 0x1801,
-	0x1804, 0x1804,
-	0x1806, 0x180e,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-}; /* CR_Mongolian */
-
-/* 'Hiragana': Script */
-static const OnigCodePoint CR_Hiragana[] = {
-	4,
-	0x3041, 0x3096,
-	0x309d, 0x309f,
-	0x1b001, 0x1b001,
-	0x1f200, 0x1f200,
-}; /* CR_Hiragana */
-
-/* 'Katakana': Script */
-static const OnigCodePoint CR_Katakana[] = {
-	8,
-	0x30a1, 0x30fa,
-	0x30fd, 0x30ff,
-	0x31f0, 0x31ff,
-	0x32d0, 0x32fe,
-	0x3300, 0x3357,
-	0xff66, 0xff6f,
-	0xff71, 0xff9d,
-	0x1b000, 0x1b000,
-}; /* CR_Katakana */
-
-/* 'Bopomofo': Script */
-static const OnigCodePoint CR_Bopomofo[] = {
-	3,
-	0x02ea, 0x02eb,
-	0x3105, 0x312d,
-	0x31a0, 0x31ba,
-}; /* CR_Bopomofo */
-
-/* 'Han': Script */
-static const OnigCodePoint CR_Han[] = {
-	15,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x3005, 0x3005,
-	0x3007, 0x3007,
-	0x3021, 0x3029,
-	0x3038, 0x303b,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcc,
-	0xf900, 0xfa6d,
-	0xfa70, 0xfad9,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_Han */
-
-/* 'Yi': Script */
-static const OnigCodePoint CR_Yi[] = {
-	2,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-}; /* CR_Yi */
-
-/* 'Old_Italic': Script */
-static const OnigCodePoint CR_Old_Italic[] = {
-	2,
-	0x10300, 0x1031e,
-	0x10320, 0x10323,
-}; /* CR_Old_Italic */
-
-/* 'Gothic': Script */
-static const OnigCodePoint CR_Gothic[] = {
-	1,
-	0x10330, 0x1034a,
-}; /* CR_Gothic */
-
-/* 'Deseret': Script */
-static const OnigCodePoint CR_Deseret[] = {
-	1,
-	0x10400, 0x1044f,
-}; /* CR_Deseret */
-
-/* 'Inherited': Script */
-static const OnigCodePoint CR_Inherited[] = {
-	25,
-	0x0300, 0x036f,
-	0x0485, 0x0486,
-	0x064b, 0x0655,
-	0x065f, 0x065f,
-	0x0670, 0x0670,
-	0x0951, 0x0952,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce0,
-	0x1ce2, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1cf4, 0x1cf4,
-	0x1dc0, 0x1de6,
-	0x1dfc, 0x1dff,
-	0x200c, 0x200d,
-	0x20d0, 0x20f0,
-	0x302a, 0x302d,
-	0x3099, 0x309a,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe26,
-	0x101fd, 0x101fd,
-	0x1d167, 0x1d169,
-	0x1d17b, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-	0xe0100, 0xe01ef,
-}; /* CR_Inherited */
-
-/* 'Tagalog': Script */
-static const OnigCodePoint CR_Tagalog[] = {
-	2,
-	0x1700, 0x170c,
-	0x170e, 0x1714,
-}; /* CR_Tagalog */
-
-/* 'Hanunoo': Script */
-static const OnigCodePoint CR_Hanunoo[] = {
-	1,
-	0x1720, 0x1734,
-}; /* CR_Hanunoo */
-
-/* 'Buhid': Script */
-static const OnigCodePoint CR_Buhid[] = {
-	1,
-	0x1740, 0x1753,
-}; /* CR_Buhid */
-
-/* 'Tagbanwa': Script */
-static const OnigCodePoint CR_Tagbanwa[] = {
-	3,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-}; /* CR_Tagbanwa */
-
-/* 'Limbu': Script */
-static const OnigCodePoint CR_Limbu[] = {
-	5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x194f,
-}; /* CR_Limbu */
-
-/* 'Tai_Le': Script */
-static const OnigCodePoint CR_Tai_Le[] = {
-	2,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-}; /* CR_Tai_Le */
-
-/* '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 */
-
-/* 'Ugaritic': Script */
-static const OnigCodePoint CR_Ugaritic[] = {
-	2,
-	0x10380, 0x1039d,
-	0x1039f, 0x1039f,
-}; /* CR_Ugaritic */
-
-/* 'Shavian': Script */
-static const OnigCodePoint CR_Shavian[] = {
-	1,
-	0x10450, 0x1047f,
-}; /* CR_Shavian */
-
-/* 'Osmanya': Script */
-static const OnigCodePoint CR_Osmanya[] = {
-	2,
-	0x10480, 0x1049d,
-	0x104a0, 0x104a9,
-}; /* CR_Osmanya */
-
-/* 'Cypriot': Script */
-static const OnigCodePoint CR_Cypriot[] = {
-	6,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x1083f,
-}; /* CR_Cypriot */
-
-/* '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 */
-
-/* 'Coptic': Script */
-static const OnigCodePoint CR_Coptic[] = {
-	3,
-	0x03e2, 0x03ef,
-	0x2c80, 0x2cf3,
-	0x2cf9, 0x2cff,
-}; /* CR_Coptic */
-
-/* 'New_Tai_Lue': Script */
-static const OnigCodePoint CR_New_Tai_Lue[] = {
-	4,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x19df,
-}; /* CR_New_Tai_Lue */
-
-/* 'Glagolitic': Script */
-static const OnigCodePoint CR_Glagolitic[] = {
-	2,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-}; /* CR_Glagolitic */
-
-/* 'Tifinagh': Script */
-static const OnigCodePoint CR_Tifinagh[] = {
-	3,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d70,
-	0x2d7f, 0x2d7f,
-}; /* CR_Tifinagh */
-
-/* 'Syloti_Nagri': Script */
-static const OnigCodePoint CR_Syloti_Nagri[] = {
-	1,
-	0xa800, 0xa82b,
-}; /* CR_Syloti_Nagri */
-
-/* 'Old_Persian': Script */
-static const OnigCodePoint CR_Old_Persian[] = {
-	2,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103d5,
-}; /* CR_Old_Persian */
-
-/* '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 */
-
-/* 'Balinese': Script */
-static const OnigCodePoint CR_Balinese[] = {
-	2,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-}; /* CR_Balinese */
-
-/* 'Cuneiform': Script */
-static const OnigCodePoint CR_Cuneiform[] = {
-	3,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-}; /* CR_Cuneiform */
-
-/* 'Phoenician': Script */
-static const OnigCodePoint CR_Phoenician[] = {
-	2,
-	0x10900, 0x1091b,
-	0x1091f, 0x1091f,
-}; /* CR_Phoenician */
-
-/* 'Phags_Pa': Script */
-static const OnigCodePoint CR_Phags_Pa[] = {
-	1,
-	0xa840, 0xa877,
-}; /* CR_Phags_Pa */
-
-/* 'Nko': Script */
-static const OnigCodePoint CR_Nko[] = {
-	1,
-	0x07c0, 0x07fa,
-}; /* CR_Nko */
-
-/* 'Sundanese': Script */
-static const OnigCodePoint CR_Sundanese[] = {
-	2,
-	0x1b80, 0x1bbf,
-	0x1cc0, 0x1cc7,
-}; /* CR_Sundanese */
-
-/* 'Lepcha': Script */
-static const OnigCodePoint CR_Lepcha[] = {
-	3,
-	0x1c00, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c4f,
-}; /* CR_Lepcha */
-
-/* 'Ol_Chiki': Script */
-static const OnigCodePoint CR_Ol_Chiki[] = {
-	1,
-	0x1c50, 0x1c7f,
-}; /* CR_Ol_Chiki */
-
-/* 'Vai': Script */
-static const OnigCodePoint CR_Vai[] = {
-	1,
-	0xa500, 0xa62b,
-}; /* CR_Vai */
-
-/* 'Saurashtra': Script */
-static const OnigCodePoint CR_Saurashtra[] = {
-	2,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-}; /* CR_Saurashtra */
-
-/* 'Kayah_Li': Script */
-static const OnigCodePoint CR_Kayah_Li[] = {
-	1,
-	0xa900, 0xa92f,
-}; /* CR_Kayah_Li */
-
-/* 'Rejang': Script */
-static const OnigCodePoint CR_Rejang[] = {
-	2,
-	0xa930, 0xa953,
-	0xa95f, 0xa95f,
-}; /* CR_Rejang */
-
-/* 'Lycian': Script */
-static const OnigCodePoint CR_Lycian[] = {
-	1,
-	0x10280, 0x1029c,
-}; /* CR_Lycian */
-
-/* 'Carian': Script */
-static const OnigCodePoint CR_Carian[] = {
-	1,
-	0x102a0, 0x102d0,
-}; /* CR_Carian */
-
-/* 'Lydian': Script */
-static const OnigCodePoint CR_Lydian[] = {
-	2,
-	0x10920, 0x10939,
-	0x1093f, 0x1093f,
-}; /* CR_Lydian */
-
-/* 'Cham': Script */
-static const OnigCodePoint CR_Cham[] = {
-	4,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa5f,
-}; /* CR_Cham */
-
-/* 'Tai_Tham': Script */
-static const OnigCodePoint CR_Tai_Tham[] = {
-	5,
-	0x1a20, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-}; /* CR_Tai_Tham */
-
-/* 'Tai_Viet': Script */
-static const OnigCodePoint CR_Tai_Viet[] = {
-	2,
-	0xaa80, 0xaac2,
-	0xaadb, 0xaadf,
-}; /* CR_Tai_Viet */
-
-/* 'Avestan': Script */
-static const OnigCodePoint CR_Avestan[] = {
-	2,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b3f,
-}; /* CR_Avestan */
-
-/* 'Egyptian_Hieroglyphs': Script */
-static const OnigCodePoint CR_Egyptian_Hieroglyphs[] = {
-	1,
-	0x13000, 0x1342e,
-}; /* CR_Egyptian_Hieroglyphs */
-
-/* 'Samaritan': Script */
-static const OnigCodePoint CR_Samaritan[] = {
-	2,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-}; /* CR_Samaritan */
-
-/* 'Lisu': Script */
-static const OnigCodePoint CR_Lisu[] = {
-	1,
-	0xa4d0, 0xa4ff,
-}; /* CR_Lisu */
-
-/* 'Bamum': Script */
-static const OnigCodePoint CR_Bamum[] = {
-	2,
-	0xa6a0, 0xa6f7,
-	0x16800, 0x16a38,
-}; /* CR_Bamum */
-
-/* 'Javanese': Script */
-static const OnigCodePoint CR_Javanese[] = {
-	3,
-	0xa980, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9df,
-}; /* CR_Javanese */
-
-/* 'Meetei_Mayek': Script */
-static const OnigCodePoint CR_Meetei_Mayek[] = {
-	3,
-	0xaae0, 0xaaf6,
-	0xabc0, 0xabed,
-	0xabf0, 0xabf9,
-}; /* CR_Meetei_Mayek */
-
-/* 'Imperial_Aramaic': Script */
-static const OnigCodePoint CR_Imperial_Aramaic[] = {
-	2,
-	0x10840, 0x10855,
-	0x10857, 0x1085f,
-}; /* CR_Imperial_Aramaic */
-
-/* 'Old_South_Arabian': Script */
-static const OnigCodePoint CR_Old_South_Arabian[] = {
-	1,
-	0x10a60, 0x10a7f,
-}; /* CR_Old_South_Arabian */
-
-/* 'Inscriptional_Parthian': Script */
-static const OnigCodePoint CR_Inscriptional_Parthian[] = {
-	2,
-	0x10b40, 0x10b55,
-	0x10b58, 0x10b5f,
-}; /* CR_Inscriptional_Parthian */
-
-/* 'Inscriptional_Pahlavi': Script */
-static const OnigCodePoint CR_Inscriptional_Pahlavi[] = {
-	2,
-	0x10b60, 0x10b72,
-	0x10b78, 0x10b7f,
-}; /* CR_Inscriptional_Pahlavi */
-
-/* 'Old_Turkic': Script */
-static const OnigCodePoint CR_Old_Turkic[] = {
-	1,
-	0x10c00, 0x10c48,
-}; /* CR_Old_Turkic */
-
-/* 'Kaithi': Script */
-static const OnigCodePoint CR_Kaithi[] = {
-	1,
-	0x11080, 0x110c1,
-}; /* CR_Kaithi */
-
-/* 'Batak': Script */
-static const OnigCodePoint CR_Batak[] = {
-	2,
-	0x1bc0, 0x1bf3,
-	0x1bfc, 0x1bff,
-}; /* CR_Batak */
-
-/* 'Brahmi': Script */
-static const OnigCodePoint CR_Brahmi[] = {
-	2,
-	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-}; /* CR_Brahmi */
-
-/* 'Mandaic': Script */
-static const OnigCodePoint CR_Mandaic[] = {
-	2,
-	0x0840, 0x085b,
-	0x085e, 0x085e,
-}; /* CR_Mandaic */
-
-/* 'Chakma': Script */
-static const OnigCodePoint CR_Chakma[] = {
-	2,
-	0x11100, 0x11134,
-	0x11136, 0x11143,
-}; /* CR_Chakma */
-
-/* 'Meroitic_Cursive': Script */
-static const OnigCodePoint CR_Meroitic_Cursive[] = {
-	2,
-	0x109a0, 0x109b7,
-	0x109be, 0x109bf,
-}; /* CR_Meroitic_Cursive */
-
-/* 'Meroitic_Hieroglyphs': Script */
-static const OnigCodePoint CR_Meroitic_Hieroglyphs[] = {
-	1,
-	0x10980, 0x1099f,
-}; /* CR_Meroitic_Hieroglyphs */
-
-/* 'Miao': Script */
-static const OnigCodePoint CR_Miao[] = {
-	3,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-}; /* CR_Miao */
-
-/* 'Sharada': Script */
-static const OnigCodePoint CR_Sharada[] = {
-	2,
-	0x11180, 0x111c8,
-	0x111d0, 0x111d9,
-}; /* CR_Sharada */
-
-/* 'Sora_Sompeng': Script */
-static const OnigCodePoint CR_Sora_Sompeng[] = {
-	2,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-}; /* CR_Sora_Sompeng */
-
-/* 'Takri': Script */
-static const OnigCodePoint CR_Takri[] = {
-	2,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-}; /* CR_Takri */
-
-/* 'White_Space': Binary Property */
-#define CR_White_Space CR_Space
-
-/* 'Bidi_Control': Binary Property */
-static const OnigCodePoint CR_Bidi_Control[] = {
-	2,
-	0x200e, 0x200f,
-	0x202a, 0x202e,
-}; /* CR_Bidi_Control */
-
-/* 'Join_Control': Binary Property */
-static const OnigCodePoint CR_Join_Control[] = {
-	1,
-	0x200c, 0x200d,
-}; /* CR_Join_Control */
-
-/* 'Dash': Binary Property */
-static const OnigCodePoint CR_Dash[] = {
-	20,
-	0x002d, 0x002d,
-	0x058a, 0x058a,
-	0x05be, 0x05be,
-	0x1400, 0x1400,
-	0x1806, 0x1806,
-	0x2010, 0x2015,
-	0x2053, 0x2053,
-	0x207b, 0x207b,
-	0x208b, 0x208b,
-	0x2212, 0x2212,
-	0x2e17, 0x2e17,
-	0x2e1a, 0x2e1a,
-	0x2e3a, 0x2e3b,
-	0x301c, 0x301c,
-	0x3030, 0x3030,
-	0x30a0, 0x30a0,
-	0xfe31, 0xfe32,
-	0xfe58, 0xfe58,
-	0xfe63, 0xfe63,
-	0xff0d, 0xff0d,
-}; /* CR_Dash */
-
-/* 'Hyphen': Binary Property */
-static const OnigCodePoint CR_Hyphen[] = {
-	10,
-	0x002d, 0x002d,
-	0x00ad, 0x00ad,
-	0x058a, 0x058a,
-	0x1806, 0x1806,
-	0x2010, 0x2011,
-	0x2e17, 0x2e17,
-	0x30fb, 0x30fb,
-	0xfe63, 0xfe63,
-	0xff0d, 0xff0d,
-	0xff65, 0xff65,
-}; /* CR_Hyphen */
-
-/* 'Quotation_Mark': Binary Property */
-static const OnigCodePoint CR_Quotation_Mark[] = {
-	12,
-	0x0022, 0x0022,
-	0x0027, 0x0027,
-	0x00ab, 0x00ab,
-	0x00bb, 0x00bb,
-	0x2018, 0x201f,
-	0x2039, 0x203a,
-	0x300c, 0x300f,
-	0x301d, 0x301f,
-	0xfe41, 0xfe44,
-	0xff02, 0xff02,
-	0xff07, 0xff07,
-	0xff62, 0xff63,
-}; /* CR_Quotation_Mark */
-
-/* 'Terminal_Punctuation': Binary Property */
-static const OnigCodePoint CR_Terminal_Punctuation[] = {
-	70,
-	0x0021, 0x0021,
-	0x002c, 0x002c,
-	0x002e, 0x002e,
-	0x003a, 0x003b,
-	0x003f, 0x003f,
-	0x037e, 0x037e,
-	0x0387, 0x0387,
-	0x0589, 0x0589,
-	0x05c3, 0x05c3,
-	0x060c, 0x060c,
-	0x061b, 0x061b,
-	0x061f, 0x061f,
-	0x06d4, 0x06d4,
-	0x0700, 0x070a,
-	0x070c, 0x070c,
-	0x07f8, 0x07f9,
-	0x0830, 0x083e,
-	0x085e, 0x085e,
-	0x0964, 0x0965,
-	0x0e5a, 0x0e5b,
-	0x0f08, 0x0f08,
-	0x0f0d, 0x0f12,
-	0x104a, 0x104b,
-	0x1361, 0x1368,
-	0x166d, 0x166e,
-	0x16eb, 0x16ed,
-	0x17d4, 0x17d6,
-	0x17da, 0x17da,
-	0x1802, 0x1805,
-	0x1808, 0x1809,
-	0x1944, 0x1945,
-	0x1aa8, 0x1aab,
-	0x1b5a, 0x1b5b,
-	0x1b5d, 0x1b5f,
-	0x1c3b, 0x1c3f,
-	0x1c7e, 0x1c7f,
-	0x203c, 0x203d,
-	0x2047, 0x2049,
-	0x2e2e, 0x2e2e,
-	0x3001, 0x3002,
-	0xa4fe, 0xa4ff,
-	0xa60d, 0xa60f,
-	0xa6f3, 0xa6f7,
-	0xa876, 0xa877,
-	0xa8ce, 0xa8cf,
-	0xa92f, 0xa92f,
-	0xa9c7, 0xa9c9,
-	0xaa5d, 0xaa5f,
-	0xaadf, 0xaadf,
-	0xaaf0, 0xaaf1,
-	0xabeb, 0xabeb,
-	0xfe50, 0xfe52,
-	0xfe54, 0xfe57,
-	0xff01, 0xff01,
-	0xff0c, 0xff0c,
-	0xff0e, 0xff0e,
-	0xff1a, 0xff1b,
-	0xff1f, 0xff1f,
-	0xff61, 0xff61,
-	0xff64, 0xff64,
-	0x1039f, 0x1039f,
-	0x103d0, 0x103d0,
-	0x10857, 0x10857,
-	0x1091f, 0x1091f,
-	0x10b3a, 0x10b3f,
-	0x11047, 0x1104d,
-	0x110be, 0x110c1,
-	0x11141, 0x11143,
-	0x111c5, 0x111c6,
-	0x12470, 0x12473,
-}; /* CR_Terminal_Punctuation */
-
-/* 'Other_Math': Binary Property */
-static const OnigCodePoint CR_Other_Math[] = {
-	133,
-	0x005e, 0x005e,
-	0x03d0, 0x03d2,
-	0x03d5, 0x03d5,
-	0x03f0, 0x03f1,
-	0x03f4, 0x03f5,
-	0x2016, 0x2016,
-	0x2032, 0x2034,
-	0x2040, 0x2040,
-	0x2061, 0x2064,
-	0x207d, 0x207e,
-	0x208d, 0x208e,
-	0x20d0, 0x20dc,
-	0x20e1, 0x20e1,
-	0x20e5, 0x20e6,
-	0x20eb, 0x20ef,
-	0x2102, 0x2102,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2119, 0x211d,
-	0x2124, 0x2124,
-	0x2128, 0x2129,
-	0x212c, 0x212d,
-	0x212f, 0x2131,
-	0x2133, 0x2138,
-	0x213c, 0x213f,
-	0x2145, 0x2149,
-	0x2195, 0x2199,
-	0x219c, 0x219f,
-	0x21a1, 0x21a2,
-	0x21a4, 0x21a5,
-	0x21a7, 0x21a7,
-	0x21a9, 0x21ad,
-	0x21b0, 0x21b1,
-	0x21b6, 0x21b7,
-	0x21bc, 0x21cd,
-	0x21d0, 0x21d1,
-	0x21d3, 0x21d3,
-	0x21d5, 0x21db,
-	0x21dd, 0x21dd,
-	0x21e4, 0x21e5,
-	0x23b4, 0x23b5,
-	0x23b7, 0x23b7,
-	0x23d0, 0x23d0,
-	0x23e2, 0x23e2,
-	0x25a0, 0x25a1,
-	0x25ae, 0x25b6,
-	0x25bc, 0x25c0,
-	0x25c6, 0x25c7,
-	0x25ca, 0x25cb,
-	0x25cf, 0x25d3,
-	0x25e2, 0x25e2,
-	0x25e4, 0x25e4,
-	0x25e7, 0x25ec,
-	0x2605, 0x2606,
-	0x2640, 0x2640,
-	0x2642, 0x2642,
-	0x2660, 0x2663,
-	0x266d, 0x266e,
-	0x27c5, 0x27c6,
-	0x27e6, 0x27ef,
-	0x2983, 0x2998,
-	0x29d8, 0x29db,
-	0x29fc, 0x29fd,
-	0xfe61, 0xfe61,
-	0xfe63, 0xfe63,
-	0xfe68, 0xfe68,
-	0xff3c, 0xff3c,
-	0xff3e, 0xff3e,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-}; /* CR_Other_Math */
-
-/* 'Hex_Digit': Binary Property */
-static const OnigCodePoint CR_Hex_Digit[] = {
-	6,
-	0x0030, 0x0039,
-	0x0041, 0x0046,
-	0x0061, 0x0066,
-	0xff10, 0xff19,
-	0xff21, 0xff26,
-	0xff41, 0xff46,
-}; /* CR_Hex_Digit */
-
-/* 'ASCII_Hex_Digit': Binary Property */
-#define CR_ASCII_Hex_Digit CR_XDigit
-
-/* 'Other_Alphabetic': Binary Property */
-static const OnigCodePoint CR_Other_Alphabetic[] = {
-	158,
-	0x0345, 0x0345,
-	0x05b0, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x0610, 0x061a,
-	0x064b, 0x0657,
-	0x0659, 0x065f,
-	0x0670, 0x0670,
-	0x06d6, 0x06dc,
-	0x06e1, 0x06e4,
-	0x06e7, 0x06e8,
-	0x06ed, 0x06ed,
-	0x0711, 0x0711,
-	0x0730, 0x073f,
-	0x07a6, 0x07b0,
-	0x0816, 0x0817,
-	0x081b, 0x0823,
-	0x0825, 0x0827,
-	0x0829, 0x082c,
-	0x08e4, 0x08e9,
-	0x08f0, 0x08fe,
-	0x0900, 0x0903,
-	0x093a, 0x093b,
-	0x093e, 0x094c,
-	0x094e, 0x094f,
-	0x0955, 0x0957,
-	0x0962, 0x0963,
-	0x0981, 0x0983,
-	0x09be, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cc,
-	0x09d7, 0x09d7,
-	0x09e2, 0x09e3,
-	0x0a01, 0x0a03,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4c,
-	0x0a51, 0x0a51,
-	0x0a70, 0x0a71,
-	0x0a75, 0x0a75,
-	0x0a81, 0x0a83,
-	0x0abe, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acc,
-	0x0ae2, 0x0ae3,
-	0x0b01, 0x0b03,
-	0x0b3e, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4c,
-	0x0b56, 0x0b57,
-	0x0b62, 0x0b63,
-	0x0b82, 0x0b82,
-	0x0bbe, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcc,
-	0x0bd7, 0x0bd7,
-	0x0c01, 0x0c03,
-	0x0c3e, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4c,
-	0x0c55, 0x0c56,
-	0x0c62, 0x0c63,
-	0x0c82, 0x0c83,
-	0x0cbe, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccc,
-	0x0cd5, 0x0cd6,
-	0x0ce2, 0x0ce3,
-	0x0d02, 0x0d03,
-	0x0d3e, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4c,
-	0x0d57, 0x0d57,
-	0x0d62, 0x0d63,
-	0x0d82, 0x0d83,
-	0x0dcf, 0x0dd4,
-	0x0dd6, 0x0dd6,
-	0x0dd8, 0x0ddf,
-	0x0df2, 0x0df3,
-	0x0e31, 0x0e31,
-	0x0e34, 0x0e3a,
-	0x0e4d, 0x0e4d,
-	0x0eb1, 0x0eb1,
-	0x0eb4, 0x0eb9,
-	0x0ebb, 0x0ebc,
-	0x0ecd, 0x0ecd,
-	0x0f71, 0x0f81,
-	0x0f8d, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x102b, 0x1036,
-	0x1038, 0x1038,
-	0x103b, 0x103e,
-	0x1056, 0x1059,
-	0x105e, 0x1060,
-	0x1062, 0x1062,
-	0x1067, 0x1068,
-	0x1071, 0x1074,
-	0x1082, 0x1086,
-	0x109c, 0x109d,
-	0x135f, 0x135f,
-	0x1712, 0x1713,
-	0x1732, 0x1733,
-	0x1752, 0x1753,
-	0x1772, 0x1773,
-	0x17b6, 0x17c8,
-	0x18a9, 0x18a9,
-	0x1920, 0x192b,
-	0x1930, 0x1938,
-	0x19b0, 0x19c0,
-	0x19c8, 0x19c9,
-	0x1a17, 0x1a1b,
-	0x1a55, 0x1a5e,
-	0x1a61, 0x1a74,
-	0x1b00, 0x1b04,
-	0x1b35, 0x1b43,
-	0x1b80, 0x1b82,
-	0x1ba1, 0x1ba9,
-	0x1bac, 0x1bad,
-	0x1be7, 0x1bf1,
-	0x1c24, 0x1c35,
-	0x1cf2, 0x1cf3,
-	0x24b6, 0x24e9,
-	0x2de0, 0x2dff,
-	0xa674, 0xa67b,
-	0xa69f, 0xa69f,
-	0xa823, 0xa827,
-	0xa880, 0xa881,
-	0xa8b4, 0xa8c3,
-	0xa926, 0xa92a,
-	0xa947, 0xa952,
-	0xa980, 0xa983,
-	0xa9b4, 0xa9bf,
-	0xaa29, 0xaa36,
-	0xaa43, 0xaa43,
-	0xaa4c, 0xaa4d,
-	0xaab0, 0xaab0,
-	0xaab2, 0xaab4,
-	0xaab7, 0xaab8,
-	0xaabe, 0xaabe,
-	0xaaeb, 0xaaef,
-	0xaaf5, 0xaaf5,
-	0xabe3, 0xabea,
-	0xfb1e, 0xfb1e,
-	0x10a01, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a0f,
-	0x11000, 0x11002,
-	0x11038, 0x11045,
-	0x11082, 0x11082,
-	0x110b0, 0x110b8,
-	0x11100, 0x11102,
-	0x11127, 0x11132,
-	0x11180, 0x11182,
-	0x111b3, 0x111bf,
-	0x116ab, 0x116b5,
-	0x16f51, 0x16f7e,
-}; /* CR_Other_Alphabetic */
-
-/* 'Ideographic': Binary Property */
-static const OnigCodePoint CR_Ideographic[] = {
-	11,
-	0x3006, 0x3007,
-	0x3021, 0x3029,
-	0x3038, 0x303a,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcc,
-	0xf900, 0xfa6d,
-	0xfa70, 0xfad9,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-}; /* CR_Ideographic */
-
-/* 'Diacritic': Binary Property */
-static const OnigCodePoint CR_Diacritic[] = {
-	125,
-	0x005e, 0x005e,
-	0x0060, 0x0060,
-	0x00a8, 0x00a8,
-	0x00af, 0x00af,
-	0x00b4, 0x00b4,
-	0x00b7, 0x00b8,
-	0x02b0, 0x034e,
-	0x0350, 0x0357,
-	0x035d, 0x0362,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x0384, 0x0385,
-	0x0483, 0x0487,
-	0x0559, 0x0559,
-	0x0591, 0x05a1,
-	0x05a3, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c4,
-	0x064b, 0x0652,
-	0x0657, 0x0658,
-	0x06df, 0x06e0,
-	0x06e5, 0x06e6,
-	0x06ea, 0x06ec,
-	0x0730, 0x074a,
-	0x07a6, 0x07b0,
-	0x07eb, 0x07f5,
-	0x0818, 0x0819,
-	0x08e4, 0x08fe,
-	0x093c, 0x093c,
-	0x094d, 0x094d,
-	0x0951, 0x0954,
-	0x0971, 0x0971,
-	0x09bc, 0x09bc,
-	0x09cd, 0x09cd,
-	0x0a3c, 0x0a3c,
-	0x0a4d, 0x0a4d,
-	0x0abc, 0x0abc,
-	0x0acd, 0x0acd,
-	0x0b3c, 0x0b3c,
-	0x0b4d, 0x0b4d,
-	0x0bcd, 0x0bcd,
-	0x0c4d, 0x0c4d,
-	0x0cbc, 0x0cbc,
-	0x0ccd, 0x0ccd,
-	0x0d4d, 0x0d4d,
-	0x0dca, 0x0dca,
-	0x0e47, 0x0e4c,
-	0x0e4e, 0x0e4e,
-	0x0ec8, 0x0ecc,
-	0x0f18, 0x0f19,
-	0x0f35, 0x0f35,
-	0x0f37, 0x0f37,
-	0x0f39, 0x0f39,
-	0x0f3e, 0x0f3f,
-	0x0f82, 0x0f84,
-	0x0f86, 0x0f87,
-	0x0fc6, 0x0fc6,
-	0x1037, 0x1037,
-	0x1039, 0x103a,
-	0x1087, 0x108d,
-	0x108f, 0x108f,
-	0x109a, 0x109b,
-	0x17c9, 0x17d3,
-	0x17dd, 0x17dd,
-	0x1939, 0x193b,
-	0x1a75, 0x1a7c,
-	0x1a7f, 0x1a7f,
-	0x1b34, 0x1b34,
-	0x1b44, 0x1b44,
-	0x1b6b, 0x1b73,
-	0x1baa, 0x1bab,
-	0x1c36, 0x1c37,
-	0x1c78, 0x1c7d,
-	0x1cd0, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1cf4, 0x1cf4,
-	0x1d2c, 0x1d6a,
-	0x1dc4, 0x1dcf,
-	0x1dfd, 0x1dff,
-	0x1fbd, 0x1fbd,
-	0x1fbf, 0x1fc1,
-	0x1fcd, 0x1fcf,
-	0x1fdd, 0x1fdf,
-	0x1fed, 0x1fef,
-	0x1ffd, 0x1ffe,
-	0x2cef, 0x2cf1,
-	0x2e2f, 0x2e2f,
-	0x302a, 0x302f,
-	0x3099, 0x309c,
-	0x30fc, 0x30fc,
-	0xa66f, 0xa66f,
-	0xa67c, 0xa67d,
-	0xa67f, 0xa67f,
-	0xa6f0, 0xa6f1,
-	0xa717, 0xa721,
-	0xa788, 0xa788,
-	0xa7f8, 0xa7f9,
-	0xa8c4, 0xa8c4,
-	0xa8e0, 0xa8f1,
-	0xa92b, 0xa92e,
-	0xa953, 0xa953,
-	0xa9b3, 0xa9b3,
-	0xa9c0, 0xa9c0,
-	0xaa7b, 0xaa7b,
-	0xaabf, 0xaac2,
-	0xaaf6, 0xaaf6,
-	0xabec, 0xabed,
-	0xfb1e, 0xfb1e,
-	0xfe20, 0xfe26,
-	0xff3e, 0xff3e,
-	0xff40, 0xff40,
-	0xff70, 0xff70,
-	0xff9e, 0xff9f,
-	0xffe3, 0xffe3,
-	0x110b9, 0x110ba,
-	0x11133, 0x11134,
-	0x111c0, 0x111c0,
-	0x116b6, 0x116b7,
-	0x16f8f, 0x16f9f,
-	0x1d167, 0x1d169,
-	0x1d16d, 0x1d172,
-	0x1d17b, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-}; /* CR_Diacritic */
-
-/* 'Extender': Binary Property */
-static const OnigCodePoint CR_Extender[] = {
-	22,
-	0x00b7, 0x00b7,
-	0x02d0, 0x02d1,
-	0x0640, 0x0640,
-	0x07fa, 0x07fa,
-	0x0e46, 0x0e46,
-	0x0ec6, 0x0ec6,
-	0x180a, 0x180a,
-	0x1843, 0x1843,
-	0x1aa7, 0x1aa7,
-	0x1c36, 0x1c36,
-	0x1c7b, 0x1c7b,
-	0x3005, 0x3005,
-	0x3031, 0x3035,
-	0x309d, 0x309e,
-	0x30fc, 0x30fe,
-	0xa015, 0xa015,
-	0xa60c, 0xa60c,
-	0xa9cf, 0xa9cf,
-	0xaa70, 0xaa70,
-	0xaadd, 0xaadd,
-	0xaaf3, 0xaaf4,
-	0xff70, 0xff70,
-}; /* CR_Extender */
-
-/* 'Other_Lowercase': Binary Property */
-static const OnigCodePoint CR_Other_Lowercase[] = {
-	18,
-	0x00aa, 0x00aa,
-	0x00ba, 0x00ba,
-	0x02b0, 0x02b8,
-	0x02c0, 0x02c1,
-	0x02e0, 0x02e4,
-	0x0345, 0x0345,
-	0x037a, 0x037a,
-	0x1d2c, 0x1d6a,
-	0x1d78, 0x1d78,
-	0x1d9b, 0x1dbf,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 0x209c,
-	0x2170, 0x217f,
-	0x24d0, 0x24e9,
-	0x2c7c, 0x2c7d,
-	0xa770, 0xa770,
-	0xa7f8, 0xa7f9,
-}; /* CR_Other_Lowercase */
-
-/* 'Other_Uppercase': Binary Property */
-static const OnigCodePoint CR_Other_Uppercase[] = {
-	2,
-	0x2160, 0x216f,
-	0x24b6, 0x24cf,
-}; /* CR_Other_Uppercase */
-
-/* 'Noncharacter_Code_Point': Binary Property */
-static const OnigCodePoint CR_Noncharacter_Code_Point[] = {
-	18,
-	0xfdd0, 0xfdef,
-	0xfffe, 0xffff,
-	0x1fffe, 0x1ffff,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xefffe, 0xeffff,
-	0xffffe, 0xfffff,
-	0x10fffe, 0x10ffff,
-}; /* CR_Noncharacter_Code_Point */
-
-/* 'Other_Grapheme_Extend': Binary Property */
-static const OnigCodePoint CR_Other_Grapheme_Extend[] = {
-	17,
-	0x09be, 0x09be,
-	0x09d7, 0x09d7,
-	0x0b3e, 0x0b3e,
-	0x0b57, 0x0b57,
-	0x0bbe, 0x0bbe,
-	0x0bd7, 0x0bd7,
-	0x0cc2, 0x0cc2,
-	0x0cd5, 0x0cd6,
-	0x0d3e, 0x0d3e,
-	0x0d57, 0x0d57,
-	0x0dcf, 0x0dcf,
-	0x0ddf, 0x0ddf,
-	0x200c, 0x200d,
-	0x302e, 0x302f,
-	0xff9e, 0xff9f,
-	0x1d165, 0x1d165,
-	0x1d16e, 0x1d172,
-}; /* CR_Other_Grapheme_Extend */
-
-/* 'IDS_Binary_Operator': Binary Property */
-static const OnigCodePoint CR_IDS_Binary_Operator[] = {
-	2,
-	0x2ff0, 0x2ff1,
-	0x2ff4, 0x2ffb,
-}; /* CR_IDS_Binary_Operator */
-
-/* 'IDS_Trinary_Operator': Binary Property */
-static const OnigCodePoint CR_IDS_Trinary_Operator[] = {
-	1,
-	0x2ff2, 0x2ff3,
-}; /* CR_IDS_Trinary_Operator */
-
-/* 'Radical': Binary Property */
-static const OnigCodePoint CR_Radical[] = {
-	3,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-}; /* CR_Radical */
-
-/* 'Unified_Ideograph': Binary Property */
-static const OnigCodePoint CR_Unified_Ideograph[] = {
-	12,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fcc,
-	0xfa0e, 0xfa0f,
-	0xfa11, 0xfa11,
-	0xfa13, 0xfa14,
-	0xfa1f, 0xfa1f,
-	0xfa21, 0xfa21,
-	0xfa23, 0xfa24,
-	0xfa27, 0xfa29,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-}; /* CR_Unified_Ideograph */
-
-/* 'Other_Default_Ignorable_Code_Point': Binary Property */
-static const OnigCodePoint CR_Other_Default_Ignorable_Code_Point[] = {
-	11,
-	0x034f, 0x034f,
-	0x115f, 0x1160,
-	0x17b4, 0x17b5,
-	0x2065, 0x2069,
-	0x3164, 0x3164,
-	0xffa0, 0xffa0,
-	0xfff0, 0xfff8,
-	0xe0000, 0xe0000,
-	0xe0002, 0xe001f,
-	0xe0080, 0xe00ff,
-	0xe01f0, 0xe0fff,
-}; /* CR_Other_Default_Ignorable_Code_Point */
-
-/* 'Deprecated': Binary Property */
-static const OnigCodePoint CR_Deprecated[] = {
-	9,
-	0x0149, 0x0149,
-	0x0673, 0x0673,
-	0x0f77, 0x0f77,
-	0x0f79, 0x0f79,
-	0x17a3, 0x17a4,
-	0x206a, 0x206f,
-	0x2329, 0x232a,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-}; /* CR_Deprecated */
-
-/* 'Soft_Dotted': Binary Property */
-static const OnigCodePoint CR_Soft_Dotted[] = {
-	31,
-	0x0069, 0x006a,
-	0x012f, 0x012f,
-	0x0249, 0x0249,
-	0x0268, 0x0268,
-	0x029d, 0x029d,
-	0x02b2, 0x02b2,
-	0x03f3, 0x03f3,
-	0x0456, 0x0456,
-	0x0458, 0x0458,
-	0x1d62, 0x1d62,
-	0x1d96, 0x1d96,
-	0x1da4, 0x1da4,
-	0x1da8, 0x1da8,
-	0x1e2d, 0x1e2d,
-	0x1ecb, 0x1ecb,
-	0x2071, 0x2071,
-	0x2148, 0x2149,
-	0x2c7c, 0x2c7c,
-	0x1d422, 0x1d423,
-	0x1d456, 0x1d457,
-	0x1d48a, 0x1d48b,
-	0x1d4be, 0x1d4bf,
-	0x1d4f2, 0x1d4f3,
-	0x1d526, 0x1d527,
-	0x1d55a, 0x1d55b,
-	0x1d58e, 0x1d58f,
-	0x1d5c2, 0x1d5c3,
-	0x1d5f6, 0x1d5f7,
-	0x1d62a, 0x1d62b,
-	0x1d65e, 0x1d65f,
-	0x1d692, 0x1d693,
-}; /* CR_Soft_Dotted */
-
-/* 'Logical_Order_Exception': Binary Property */
-static const OnigCodePoint CR_Logical_Order_Exception[] = {
-	5,
-	0x0e40, 0x0e44,
-	0x0ec0, 0x0ec4,
-	0xaab5, 0xaab6,
-	0xaab9, 0xaab9,
-	0xaabb, 0xaabc,
-}; /* CR_Logical_Order_Exception */
-
-/* 'Other_ID_Start': Binary Property */
-static const OnigCodePoint CR_Other_ID_Start[] = {
-	3,
-	0x2118, 0x2118,
-	0x212e, 0x212e,
-	0x309b, 0x309c,
-}; /* CR_Other_ID_Start */
-
-/* 'Other_ID_Continue': Binary Property */
-static const OnigCodePoint CR_Other_ID_Continue[] = {
-	4,
-	0x00b7, 0x00b7,
-	0x0387, 0x0387,
-	0x1369, 0x1371,
-	0x19da, 0x19da,
-}; /* CR_Other_ID_Continue */
-
-/* 'STerm': Binary Property */
-static const OnigCodePoint CR_STerm[] = {
-	50,
-	0x0021, 0x0021,
-	0x002e, 0x002e,
-	0x003f, 0x003f,
-	0x055c, 0x055c,
-	0x055e, 0x055e,
-	0x0589, 0x0589,
-	0x061f, 0x061f,
-	0x06d4, 0x06d4,
-	0x0700, 0x0702,
-	0x07f9, 0x07f9,
-	0x0964, 0x0965,
-	0x104a, 0x104b,
-	0x1362, 0x1362,
-	0x1367, 0x1368,
-	0x166e, 0x166e,
-	0x1735, 0x1736,
-	0x1803, 0x1803,
-	0x1809, 0x1809,
-	0x1944, 0x1945,
-	0x1aa8, 0x1aab,
-	0x1b5a, 0x1b5b,
-	0x1b5e, 0x1b5f,
-	0x1c3b, 0x1c3c,
-	0x1c7e, 0x1c7f,
-	0x203c, 0x203d,
-	0x2047, 0x2049,
-	0x2e2e, 0x2e2e,
-	0x3002, 0x3002,
-	0xa4ff, 0xa4ff,
-	0xa60e, 0xa60f,
-	0xa6f3, 0xa6f3,
-	0xa6f7, 0xa6f7,
-	0xa876, 0xa877,
-	0xa8ce, 0xa8cf,
-	0xa92f, 0xa92f,
-	0xa9c8, 0xa9c9,
-	0xaa5d, 0xaa5f,
-	0xaaf0, 0xaaf1,
-	0xabeb, 0xabeb,
-	0xfe52, 0xfe52,
-	0xfe56, 0xfe57,
-	0xff01, 0xff01,
-	0xff0e, 0xff0e,
-	0xff1f, 0xff1f,
-	0xff61, 0xff61,
-	0x10a56, 0x10a57,
-	0x11047, 0x11048,
-	0x110be, 0x110c1,
-	0x11141, 0x11143,
-	0x111c5, 0x111c6,
-}; /* CR_STerm */
-
-/* 'Variation_Selector': Binary Property */
-static const OnigCodePoint CR_Variation_Selector[] = {
-	3,
-	0x180b, 0x180d,
-	0xfe00, 0xfe0f,
-	0xe0100, 0xe01ef,
-}; /* CR_Variation_Selector */
-
-/* 'Pattern_White_Space': Binary Property */
-static const OnigCodePoint CR_Pattern_White_Space[] = {
-	5,
-	0x0009, 0x000d,
-	0x0020, 0x0020,
-	0x0085, 0x0085,
-	0x200e, 0x200f,
-	0x2028, 0x2029,
-}; /* CR_Pattern_White_Space */
-
-/* 'Pattern_Syntax': Binary Property */
-static const OnigCodePoint CR_Pattern_Syntax[] = {
-	28,
-	0x0021, 0x002f,
-	0x003a, 0x0040,
-	0x005b, 0x005e,
-	0x0060, 0x0060,
-	0x007b, 0x007e,
-	0x00a1, 0x00a7,
-	0x00a9, 0x00a9,
-	0x00ab, 0x00ac,
-	0x00ae, 0x00ae,
-	0x00b0, 0x00b1,
-	0x00b6, 0x00b6,
-	0x00bb, 0x00bb,
-	0x00bf, 0x00bf,
-	0x00d7, 0x00d7,
-	0x00f7, 0x00f7,
-	0x2010, 0x2027,
-	0x2030, 0x203e,
-	0x2041, 0x2053,
-	0x2055, 0x205e,
-	0x2190, 0x245f,
-	0x2500, 0x2775,
-	0x2794, 0x2bff,
-	0x2e00, 0x2e7f,
-	0x3001, 0x3003,
-	0x3008, 0x3020,
-	0x3030, 0x3030,
-	0xfd3e, 0xfd3f,
-	0xfe45, 0xfe46,
-}; /* CR_Pattern_Syntax */
-
-/* 'Unknown': Script */
-static const OnigCodePoint CR_Unknown[] = {
-	537,
-	0x0378, 0x0379,
-	0x037f, 0x0383,
-	0x038b, 0x038b,
-	0x038d, 0x038d,
-	0x03a2, 0x03a2,
-	0x0528, 0x0530,
-	0x0557, 0x0558,
-	0x0560, 0x0560,
-	0x0588, 0x0588,
-	0x058b, 0x058e,
-	0x0590, 0x0590,
-	0x05c8, 0x05cf,
-	0x05eb, 0x05ef,
-	0x05f5, 0x05ff,
-	0x0605, 0x0605,
-	0x061c, 0x061d,
-	0x070e, 0x070e,
-	0x074b, 0x074c,
-	0x07b2, 0x07bf,
-	0x07fb, 0x07ff,
-	0x082e, 0x082f,
-	0x083f, 0x083f,
-	0x085c, 0x085d,
-	0x085f, 0x089f,
-	0x08a1, 0x08a1,
-	0x08ad, 0x08e3,
-	0x08ff, 0x08ff,
-	0x0978, 0x0978,
-	0x0980, 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,
-	0x09fc, 0x0a00,
-	0x0a04, 0x0a04,
-	0x0a0b, 0x0a0e,
-	0x0a11, 0x0a12,
-	0x0a29, 0x0a29,
-	0x0a31, 0x0a31,
-	0x0a34, 0x0a34,
-	0x0a37, 0x0a37,
-	0x0a3a, 0x0a3b,
-	0x0a3d, 0x0a3d,
-	0x0a43, 0x0a46,
-	0x0a49, 0x0a4a,
-	0x0a4e, 0x0a50,
-	0x0a52, 0x0a58,
-	0x0a5d, 0x0a5d,
-	0x0a5f, 0x0a65,
-	0x0a76, 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,
-	0x0af2, 0x0b00,
-	0x0b04, 0x0b04,
-	0x0b0d, 0x0b0e,
-	0x0b11, 0x0b12,
-	0x0b29, 0x0b29,
-	0x0b31, 0x0b31,
-	0x0b34, 0x0b34,
-	0x0b3a, 0x0b3b,
-	0x0b45, 0x0b46,
-	0x0b49, 0x0b4a,
-	0x0b4e, 0x0b55,
-	0x0b58, 0x0b5b,
-	0x0b5e, 0x0b5e,
-	0x0b64, 0x0b65,
-	0x0b78, 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, 0x0bcf,
-	0x0bd1, 0x0bd6,
-	0x0bd8, 0x0be5,
-	0x0bfb, 0x0c00,
-	0x0c04, 0x0c04,
-	0x0c0d, 0x0c0d,
-	0x0c11, 0x0c11,
-	0x0c29, 0x0c29,
-	0x0c34, 0x0c34,
-	0x0c3a, 0x0c3c,
-	0x0c45, 0x0c45,
-	0x0c49, 0x0c49,
-	0x0c4e, 0x0c54,
-	0x0c57, 0x0c57,
-	0x0c5a, 0x0c5f,
-	0x0c64, 0x0c65,
-	0x0c70, 0x0c77,
-	0x0c80, 0x0c81,
-	0x0c84, 0x0c84,
-	0x0c8d, 0x0c8d,
-	0x0c91, 0x0c91,
-	0x0ca9, 0x0ca9,
-	0x0cb4, 0x0cb4,
-	0x0cba, 0x0cbb,
-	0x0cc5, 0x0cc5,
-	0x0cc9, 0x0cc9,
-	0x0cce, 0x0cd4,
-	0x0cd7, 0x0cdd,
-	0x0cdf, 0x0cdf,
-	0x0ce4, 0x0ce5,
-	0x0cf0, 0x0cf0,
-	0x0cf3, 0x0d01,
-	0x0d04, 0x0d04,
-	0x0d0d, 0x0d0d,
-	0x0d11, 0x0d11,
-	0x0d3b, 0x0d3c,
-	0x0d45, 0x0d45,
-	0x0d49, 0x0d49,
-	0x0d4f, 0x0d56,
-	0x0d58, 0x0d5f,
-	0x0d64, 0x0d65,
-	0x0d76, 0x0d78,
-	0x0d80, 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,
-	0x0ee0, 0x0eff,
-	0x0f48, 0x0f48,
-	0x0f6d, 0x0f70,
-	0x0f98, 0x0f98,
-	0x0fbd, 0x0fbd,
-	0x0fcd, 0x0fcd,
-	0x0fdb, 0x0fff,
-	0x10c6, 0x10c6,
-	0x10c8, 0x10cc,
-	0x10ce, 0x10cf,
-	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, 0x135c,
-	0x137d, 0x137f,
-	0x139a, 0x139f,
-	0x13f5, 0x13ff,
-	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,
-	0x18ab, 0x18af,
-	0x18f6, 0x18ff,
-	0x191d, 0x191f,
-	0x192c, 0x192f,
-	0x193c, 0x193f,
-	0x1941, 0x1943,
-	0x196e, 0x196f,
-	0x1975, 0x197f,
-	0x19ac, 0x19af,
-	0x19ca, 0x19cf,
-	0x19db, 0x19dd,
-	0x1a1c, 0x1a1d,
-	0x1a5f, 0x1a5f,
-	0x1a7d, 0x1a7e,
-	0x1a8a, 0x1a8f,
-	0x1a9a, 0x1a9f,
-	0x1aae, 0x1aff,
-	0x1b4c, 0x1b4f,
-	0x1b7d, 0x1b7f,
-	0x1bf4, 0x1bfb,
-	0x1c38, 0x1c3a,
-	0x1c4a, 0x1c4c,
-	0x1c80, 0x1cbf,
-	0x1cc8, 0x1ccf,
-	0x1cf7, 0x1cff,
-	0x1de7, 0x1dfb,
-	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,
-	0x2065, 0x2069,
-	0x2072, 0x2073,
-	0x208f, 0x208f,
-	0x209d, 0x209f,
-	0x20ba, 0x20cf,
-	0x20f1, 0x20ff,
-	0x218a, 0x218f,
-	0x23f4, 0x23ff,
-	0x2427, 0x243f,
-	0x244b, 0x245f,
-	0x2700, 0x2700,
-	0x2b4d, 0x2b4f,
-	0x2b5a, 0x2bff,
-	0x2c2f, 0x2c2f,
-	0x2c5f, 0x2c5f,
-	0x2cf4, 0x2cf8,
-	0x2d26, 0x2d26,
-	0x2d28, 0x2d2c,
-	0x2d2e, 0x2d2f,
-	0x2d68, 0x2d6e,
-	0x2d71, 0x2d7e,
-	0x2d97, 0x2d9f,
-	0x2da7, 0x2da7,
-	0x2daf, 0x2daf,
-	0x2db7, 0x2db7,
-	0x2dbf, 0x2dbf,
-	0x2dc7, 0x2dc7,
-	0x2dcf, 0x2dcf,
-	0x2dd7, 0x2dd7,
-	0x2ddf, 0x2ddf,
-	0x2e3c, 0x2e7f,
-	0x2e9a, 0x2e9a,
-	0x2ef4, 0x2eff,
-	0x2fd6, 0x2fef,
-	0x2ffc, 0x2fff,
-	0x3040, 0x3040,
-	0x3097, 0x3098,
-	0x3100, 0x3104,
-	0x312e, 0x3130,
-	0x318f, 0x318f,
-	0x31bb, 0x31bf,
-	0x31e4, 0x31ef,
-	0x321f, 0x321f,
-	0x32ff, 0x32ff,
-	0x4db6, 0x4dbf,
-	0x9fcd, 0x9fff,
-	0xa48d, 0xa48f,
-	0xa4c7, 0xa4cf,
-	0xa62c, 0xa63f,
-	0xa698, 0xa69e,
-	0xa6f8, 0xa6ff,
-	0xa78f, 0xa78f,
-	0xa794, 0xa79f,
-	0xa7ab, 0xa7f7,
-	0xa82c, 0xa82f,
-	0xa83a, 0xa83f,
-	0xa878, 0xa87f,
-	0xa8c5, 0xa8cd,
-	0xa8da, 0xa8df,
-	0xa8fc, 0xa8ff,
-	0xa954, 0xa95e,
-	0xa97d, 0xa97f,
-	0xa9ce, 0xa9ce,
-	0xa9da, 0xa9dd,
-	0xa9e0, 0xa9ff,
-	0xaa37, 0xaa3f,
-	0xaa4e, 0xaa4f,
-	0xaa5a, 0xaa5b,
-	0xaa7c, 0xaa7f,
-	0xaac3, 0xaada,
-	0xaaf7, 0xab00,
-	0xab07, 0xab08,
-	0xab0f, 0xab10,
-	0xab17, 0xab1f,
-	0xab27, 0xab27,
-	0xab2f, 0xabbf,
-	0xabee, 0xabef,
-	0xabfa, 0xabff,
-	0xd7a4, 0xd7af,
-	0xd7c7, 0xd7ca,
-	0xd7fc, 0xf8ff,
-	0xfa6e, 0xfa6f,
-	0xfada, 0xfaff,
-	0xfb07, 0xfb12,
-	0xfb18, 0xfb1c,
-	0xfb37, 0xfb37,
-	0xfb3d, 0xfb3d,
-	0xfb3f, 0xfb3f,
-	0xfb42, 0xfb42,
-	0xfb45, 0xfb45,
-	0xfbc2, 0xfbd2,
-	0xfd40, 0xfd4f,
-	0xfd90, 0xfd91,
-	0xfdc8, 0xfdef,
-	0xfdfe, 0xfdff,
-	0xfe1a, 0xfe1f,
-	0xfe27, 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, 0x1018f,
-	0x1019c, 0x101cf,
-	0x101fe, 0x1027f,
-	0x1029d, 0x1029f,
-	0x102d1, 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,
-	0x10856, 0x10856,
-	0x10860, 0x108ff,
-	0x1091c, 0x1091e,
-	0x1093a, 0x1093e,
-	0x10940, 0x1097f,
-	0x109b8, 0x109bd,
-	0x109c0, 0x109ff,
-	0x10a04, 0x10a04,
-	0x10a07, 0x10a0b,
-	0x10a14, 0x10a14,
-	0x10a18, 0x10a18,
-	0x10a34, 0x10a37,
-	0x10a3b, 0x10a3e,
-	0x10a48, 0x10a4f,
-	0x10a59, 0x10a5f,
-	0x10a80, 0x10aff,
-	0x10b36, 0x10b38,
-	0x10b56, 0x10b57,
-	0x10b73, 0x10b77,
-	0x10b80, 0x10bff,
-	0x10c49, 0x10e5f,
-	0x10e7f, 0x10fff,
-	0x1104e, 0x11051,
-	0x11070, 0x1107f,
-	0x110c2, 0x110cf,
-	0x110e9, 0x110ef,
-	0x110fa, 0x110ff,
-	0x11135, 0x11135,
-	0x11144, 0x1117f,
-	0x111c9, 0x111cf,
-	0x111da, 0x1167f,
-	0x116b8, 0x116bf,
-	0x116ca, 0x11fff,
-	0x1236f, 0x123ff,
-	0x12463, 0x1246f,
-	0x12474, 0x12fff,
-	0x1342f, 0x167ff,
-	0x16a39, 0x16eff,
-	0x16f45, 0x16f4f,
-	0x16f7f, 0x16f8e,
-	0x16fa0, 0x1afff,
-	0x1b002, 0x1cfff,
-	0x1d0f6, 0x1d0ff,
-	0x1d127, 0x1d128,
-	0x1d1de, 0x1d1ff,
-	0x1d246, 0x1d2ff,
-	0x1d357, 0x1d35f,
-	0x1d372, 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,
-	0x1d7cc, 0x1d7cd,
-	0x1d800, 0x1edff,
-	0x1ee04, 0x1ee04,
-	0x1ee20, 0x1ee20,
-	0x1ee23, 0x1ee23,
-	0x1ee25, 0x1ee26,
-	0x1ee28, 0x1ee28,
-	0x1ee33, 0x1ee33,
-	0x1ee38, 0x1ee38,
-	0x1ee3a, 0x1ee3a,
-	0x1ee3c, 0x1ee41,
-	0x1ee43, 0x1ee46,
-	0x1ee48, 0x1ee48,
-	0x1ee4a, 0x1ee4a,
-	0x1ee4c, 0x1ee4c,
-	0x1ee50, 0x1ee50,
-	0x1ee53, 0x1ee53,
-	0x1ee55, 0x1ee56,
-	0x1ee58, 0x1ee58,
-	0x1ee5a, 0x1ee5a,
-	0x1ee5c, 0x1ee5c,
-	0x1ee5e, 0x1ee5e,
-	0x1ee60, 0x1ee60,
-	0x1ee63, 0x1ee63,
-	0x1ee65, 0x1ee66,
-	0x1ee6b, 0x1ee6b,
-	0x1ee73, 0x1ee73,
-	0x1ee78, 0x1ee78,
-	0x1ee7d, 0x1ee7d,
-	0x1ee7f, 0x1ee7f,
-	0x1ee8a, 0x1ee8a,
-	0x1ee9c, 0x1eea0,
-	0x1eea4, 0x1eea4,
-	0x1eeaa, 0x1eeaa,
-	0x1eebc, 0x1eeef,
-	0x1eef2, 0x1efff,
-	0x1f02c, 0x1f02f,
-	0x1f094, 0x1f09f,
-	0x1f0af, 0x1f0b0,
-	0x1f0bf, 0x1f0c0,
-	0x1f0d0, 0x1f0d0,
-	0x1f0e0, 0x1f0ff,
-	0x1f10b, 0x1f10f,
-	0x1f12f, 0x1f12f,
-	0x1f16c, 0x1f16f,
-	0x1f19b, 0x1f1e5,
-	0x1f203, 0x1f20f,
-	0x1f23b, 0x1f23f,
-	0x1f249, 0x1f24f,
-	0x1f252, 0x1f2ff,
-	0x1f321, 0x1f32f,
-	0x1f336, 0x1f336,
-	0x1f37d, 0x1f37f,
-	0x1f394, 0x1f39f,
-	0x1f3c5, 0x1f3c5,
-	0x1f3cb, 0x1f3df,
-	0x1f3f1, 0x1f3ff,
-	0x1f43f, 0x1f43f,
-	0x1f441, 0x1f441,
-	0x1f4f8, 0x1f4f8,
-	0x1f4fd, 0x1f4ff,
-	0x1f53e, 0x1f53f,
-	0x1f544, 0x1f54f,
-	0x1f568, 0x1f5fa,
-	0x1f641, 0x1f644,
-	0x1f650, 0x1f67f,
-	0x1f6c6, 0x1f6ff,
-	0x1f774, 0x1ffff,
-	0x2a6d7, 0x2a6ff,
-	0x2b735, 0x2b73f,
-	0x2b81e, 0x2f7ff,
-	0x2fa1e, 0xe0000,
-	0xe0002, 0xe001f,
-	0xe0080, 0xe00ff,
-	0xe01f0, 0x10ffff,
-}; /* CR_Unknown */
-
-/* 'Age_1_1': Derived Age 1.1 */
-static const OnigCodePoint CR_Age_1_1[] = {
-	288,
-	0x0000, 0x01f5,
-	0x01fa, 0x0217,
-	0x0250, 0x02a8,
-	0x02b0, 0x02de,
-	0x02e0, 0x02e9,
-	0x0300, 0x0345,
-	0x0360, 0x0361,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x037e, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03ce,
-	0x03d0, 0x03d6,
-	0x03da, 0x03da,
-	0x03dc, 0x03dc,
-	0x03de, 0x03de,
-	0x03e0, 0x03e0,
-	0x03e2, 0x03f3,
-	0x0401, 0x040c,
-	0x040e, 0x044f,
-	0x0451, 0x045c,
-	0x045e, 0x0486,
-	0x0490, 0x04c4,
-	0x04c7, 0x04c8,
-	0x04cb, 0x04cc,
-	0x04d0, 0x04eb,
-	0x04ee, 0x04f5,
-	0x04f8, 0x04f9,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x0589,
-	0x05b0, 0x05b9,
-	0x05bb, 0x05c3,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x060c, 0x060c,
-	0x061b, 0x061b,
-	0x061f, 0x061f,
-	0x0621, 0x063a,
-	0x0640, 0x0652,
-	0x0660, 0x066d,
-	0x0670, 0x06b7,
-	0x06ba, 0x06be,
-	0x06c0, 0x06ce,
-	0x06d0, 0x06ed,
-	0x06f0, 0x06f9,
-	0x0901, 0x0903,
-	0x0905, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0970,
-	0x0981, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bc, 0x09bc,
-	0x09be, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cd,
-	0x09d7, 0x09d7,
-	0x09dc, 0x09dd,
-	0x09df, 0x09e3,
-	0x09e6, 0x09fa,
-	0x0a02, 0x0a02,
-	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, 0x0a8b,
-	0x0a8d, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abc, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acd,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae0,
-	0x0ae6, 0x0aef,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b36, 0x0b39,
-	0x0b3c, 0x0b43,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b61,
-	0x0b66, 0x0b70,
-	0x0b82, 0x0b83,
-	0x0b85, 0x0b8a,
-	0x0b8e, 0x0b90,
-	0x0b92, 0x0b95,
-	0x0b99, 0x0b9a,
-	0x0b9c, 0x0b9c,
-	0x0b9e, 0x0b9f,
-	0x0ba3, 0x0ba4,
-	0x0ba8, 0x0baa,
-	0x0bae, 0x0bb5,
-	0x0bb7, 0x0bb9,
-	0x0bbe, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcd,
-	0x0bd7, 0x0bd7,
-	0x0be7, 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,
-	0x0cbe, 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,
-	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,
-	0x10a0, 0x10c5,
-	0x10d0, 0x10f6,
-	0x10fb, 0x10fb,
-	0x1100, 0x1159,
-	0x115f, 0x11a2,
-	0x11a8, 0x11f9,
-	0x1e00, 0x1e9a,
-	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, 0x202e,
-	0x2030, 0x2046,
-	0x206a, 0x2070,
-	0x2074, 0x208e,
-	0x20a0, 0x20aa,
-	0x20d0, 0x20e1,
-	0x2100, 0x2138,
-	0x2153, 0x2182,
-	0x2190, 0x21ea,
-	0x2200, 0x22f1,
-	0x2300, 0x2300,
-	0x2302, 0x237a,
-	0x2400, 0x2424,
-	0x2440, 0x244a,
-	0x2460, 0x24ea,
-	0x2500, 0x2595,
-	0x25a0, 0x25ef,
-	0x2600, 0x2613,
-	0x261a, 0x266f,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2767,
-	0x2776, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x3000, 0x3037,
-	0x303f, 0x303f,
-	0x3041, 0x3094,
-	0x3099, 0x309e,
-	0x30a1, 0x30fe,
-	0x3105, 0x312c,
-	0x3131, 0x318e,
-	0x3190, 0x319f,
-	0x3200, 0x321c,
-	0x3220, 0x3243,
-	0x3260, 0x327b,
-	0x327f, 0x32b0,
-	0x32c0, 0x32cb,
-	0x32d0, 0x32fe,
-	0x3300, 0x3376,
-	0x337b, 0x33dd,
-	0x33e0, 0x33fe,
-	0x4e00, 0x9fa5,
-	0xe000, 0xfa2d,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1e, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe20, 0xfe23,
-	0xfe30, 0xfe44,
-	0xfe49, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfe70, 0xfe72,
-	0xfe74, 0xfe74,
-	0xfe76, 0xfefc,
-	0xfeff, 0xfeff,
-	0xff01, 0xff5e,
-	0xff61, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfffd, 0xffff,
-}; /* CR_Age_1_1 */
-
-/* 'Age_2_0': Derived Age 2.0 */
-static const OnigCodePoint CR_Age_2_0[] = {
-	312,
-	0x0000, 0x01f5,
-	0x01fa, 0x0217,
-	0x0250, 0x02a8,
-	0x02b0, 0x02de,
-	0x02e0, 0x02e9,
-	0x0300, 0x0345,
-	0x0360, 0x0361,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x037e, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03ce,
-	0x03d0, 0x03d6,
-	0x03da, 0x03da,
-	0x03dc, 0x03dc,
-	0x03de, 0x03de,
-	0x03e0, 0x03e0,
-	0x03e2, 0x03f3,
-	0x0401, 0x040c,
-	0x040e, 0x044f,
-	0x0451, 0x045c,
-	0x045e, 0x0486,
-	0x0490, 0x04c4,
-	0x04c7, 0x04c8,
-	0x04cb, 0x04cc,
-	0x04d0, 0x04eb,
-	0x04ee, 0x04f5,
-	0x04f8, 0x04f9,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x0589,
-	0x0591, 0x05a1,
-	0x05a3, 0x05b9,
-	0x05bb, 0x05c4,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x060c, 0x060c,
-	0x061b, 0x061b,
-	0x061f, 0x061f,
-	0x0621, 0x063a,
-	0x0640, 0x0652,
-	0x0660, 0x066d,
-	0x0670, 0x06b7,
-	0x06ba, 0x06be,
-	0x06c0, 0x06ce,
-	0x06d0, 0x06ed,
-	0x06f0, 0x06f9,
-	0x0901, 0x0903,
-	0x0905, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0970,
-	0x0981, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bc, 0x09bc,
-	0x09be, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cd,
-	0x09d7, 0x09d7,
-	0x09dc, 0x09dd,
-	0x09df, 0x09e3,
-	0x09e6, 0x09fa,
-	0x0a02, 0x0a02,
-	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, 0x0a8b,
-	0x0a8d, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abc, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acd,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae0,
-	0x0ae6, 0x0aef,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b36, 0x0b39,
-	0x0b3c, 0x0b43,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b61,
-	0x0b66, 0x0b70,
-	0x0b82, 0x0b83,
-	0x0b85, 0x0b8a,
-	0x0b8e, 0x0b90,
-	0x0b92, 0x0b95,
-	0x0b99, 0x0b9a,
-	0x0b9c, 0x0b9c,
-	0x0b9e, 0x0b9f,
-	0x0ba3, 0x0ba4,
-	0x0ba8, 0x0baa,
-	0x0bae, 0x0bb5,
-	0x0bb7, 0x0bb9,
-	0x0bbe, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcd,
-	0x0bd7, 0x0bd7,
-	0x0be7, 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,
-	0x0cbe, 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,
-	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, 0x0f69,
-	0x0f71, 0x0f8b,
-	0x0f90, 0x0f95,
-	0x0f97, 0x0f97,
-	0x0f99, 0x0fad,
-	0x0fb1, 0x0fb7,
-	0x0fb9, 0x0fb9,
-	0x10a0, 0x10c5,
-	0x10d0, 0x10f6,
-	0x10fb, 0x10fb,
-	0x1100, 0x1159,
-	0x115f, 0x11a2,
-	0x11a8, 0x11f9,
-	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, 0x202e,
-	0x2030, 0x2046,
-	0x206a, 0x2070,
-	0x2074, 0x208e,
-	0x20a0, 0x20ab,
-	0x20d0, 0x20e1,
-	0x2100, 0x2138,
-	0x2153, 0x2182,
-	0x2190, 0x21ea,
-	0x2200, 0x22f1,
-	0x2300, 0x2300,
-	0x2302, 0x237a,
-	0x2400, 0x2424,
-	0x2440, 0x244a,
-	0x2460, 0x24ea,
-	0x2500, 0x2595,
-	0x25a0, 0x25ef,
-	0x2600, 0x2613,
-	0x261a, 0x266f,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2767,
-	0x2776, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x3000, 0x3037,
-	0x303f, 0x303f,
-	0x3041, 0x3094,
-	0x3099, 0x309e,
-	0x30a1, 0x30fe,
-	0x3105, 0x312c,
-	0x3131, 0x318e,
-	0x3190, 0x319f,
-	0x3200, 0x321c,
-	0x3220, 0x3243,
-	0x3260, 0x327b,
-	0x327f, 0x32b0,
-	0x32c0, 0x32cb,
-	0x32d0, 0x32fe,
-	0x3300, 0x3376,
-	0x337b, 0x33dd,
-	0x33e0, 0x33fe,
-	0x4e00, 0x9fa5,
-	0xac00, 0xd7a3,
-	0xd800, 0xfa2d,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1e, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe20, 0xfe23,
-	0xfe30, 0xfe44,
-	0xfe49, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfe70, 0xfe72,
-	0xfe74, 0xfe74,
-	0xfe76, 0xfefc,
-	0xfeff, 0xfeff,
-	0xff01, 0xff5e,
-	0xff61, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfffd, 0xffff,
-	0x1fffe, 0x1ffff,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_2_0 */
-
-/* 'Age_2_1': Derived Age 2.1 */
-static const OnigCodePoint CR_Age_2_1[] = {
-	312,
-	0x0000, 0x01f5,
-	0x01fa, 0x0217,
-	0x0250, 0x02a8,
-	0x02b0, 0x02de,
-	0x02e0, 0x02e9,
-	0x0300, 0x0345,
-	0x0360, 0x0361,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x037e, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03ce,
-	0x03d0, 0x03d6,
-	0x03da, 0x03da,
-	0x03dc, 0x03dc,
-	0x03de, 0x03de,
-	0x03e0, 0x03e0,
-	0x03e2, 0x03f3,
-	0x0401, 0x040c,
-	0x040e, 0x044f,
-	0x0451, 0x045c,
-	0x045e, 0x0486,
-	0x0490, 0x04c4,
-	0x04c7, 0x04c8,
-	0x04cb, 0x04cc,
-	0x04d0, 0x04eb,
-	0x04ee, 0x04f5,
-	0x04f8, 0x04f9,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x0589,
-	0x0591, 0x05a1,
-	0x05a3, 0x05b9,
-	0x05bb, 0x05c4,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x060c, 0x060c,
-	0x061b, 0x061b,
-	0x061f, 0x061f,
-	0x0621, 0x063a,
-	0x0640, 0x0652,
-	0x0660, 0x066d,
-	0x0670, 0x06b7,
-	0x06ba, 0x06be,
-	0x06c0, 0x06ce,
-	0x06d0, 0x06ed,
-	0x06f0, 0x06f9,
-	0x0901, 0x0903,
-	0x0905, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0970,
-	0x0981, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bc, 0x09bc,
-	0x09be, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cd,
-	0x09d7, 0x09d7,
-	0x09dc, 0x09dd,
-	0x09df, 0x09e3,
-	0x09e6, 0x09fa,
-	0x0a02, 0x0a02,
-	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, 0x0a8b,
-	0x0a8d, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abc, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acd,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae0,
-	0x0ae6, 0x0aef,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b36, 0x0b39,
-	0x0b3c, 0x0b43,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b61,
-	0x0b66, 0x0b70,
-	0x0b82, 0x0b83,
-	0x0b85, 0x0b8a,
-	0x0b8e, 0x0b90,
-	0x0b92, 0x0b95,
-	0x0b99, 0x0b9a,
-	0x0b9c, 0x0b9c,
-	0x0b9e, 0x0b9f,
-	0x0ba3, 0x0ba4,
-	0x0ba8, 0x0baa,
-	0x0bae, 0x0bb5,
-	0x0bb7, 0x0bb9,
-	0x0bbe, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcd,
-	0x0bd7, 0x0bd7,
-	0x0be7, 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,
-	0x0cbe, 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,
-	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, 0x0f69,
-	0x0f71, 0x0f8b,
-	0x0f90, 0x0f95,
-	0x0f97, 0x0f97,
-	0x0f99, 0x0fad,
-	0x0fb1, 0x0fb7,
-	0x0fb9, 0x0fb9,
-	0x10a0, 0x10c5,
-	0x10d0, 0x10f6,
-	0x10fb, 0x10fb,
-	0x1100, 0x1159,
-	0x115f, 0x11a2,
-	0x11a8, 0x11f9,
-	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, 0x202e,
-	0x2030, 0x2046,
-	0x206a, 0x2070,
-	0x2074, 0x208e,
-	0x20a0, 0x20ac,
-	0x20d0, 0x20e1,
-	0x2100, 0x2138,
-	0x2153, 0x2182,
-	0x2190, 0x21ea,
-	0x2200, 0x22f1,
-	0x2300, 0x2300,
-	0x2302, 0x237a,
-	0x2400, 0x2424,
-	0x2440, 0x244a,
-	0x2460, 0x24ea,
-	0x2500, 0x2595,
-	0x25a0, 0x25ef,
-	0x2600, 0x2613,
-	0x261a, 0x266f,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2767,
-	0x2776, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x3000, 0x3037,
-	0x303f, 0x303f,
-	0x3041, 0x3094,
-	0x3099, 0x309e,
-	0x30a1, 0x30fe,
-	0x3105, 0x312c,
-	0x3131, 0x318e,
-	0x3190, 0x319f,
-	0x3200, 0x321c,
-	0x3220, 0x3243,
-	0x3260, 0x327b,
-	0x327f, 0x32b0,
-	0x32c0, 0x32cb,
-	0x32d0, 0x32fe,
-	0x3300, 0x3376,
-	0x337b, 0x33dd,
-	0x33e0, 0x33fe,
-	0x4e00, 0x9fa5,
-	0xac00, 0xd7a3,
-	0xd800, 0xfa2d,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1e, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe20, 0xfe23,
-	0xfe30, 0xfe44,
-	0xfe49, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfe70, 0xfe72,
-	0xfe74, 0xfe74,
-	0xfe76, 0xfefc,
-	0xfeff, 0xfeff,
-	0xff01, 0xff5e,
-	0xff61, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfffc, 0xffff,
-	0x1fffe, 0x1ffff,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_2_1 */
-
-/* 'Age_3_0': Derived Age 3.0 */
-static const OnigCodePoint CR_Age_3_0[] = {
-	369,
-	0x0000, 0x021f,
-	0x0222, 0x0233,
-	0x0250, 0x02ad,
-	0x02b0, 0x02ee,
-	0x0300, 0x034e,
-	0x0360, 0x0362,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x037e, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03ce,
-	0x03d0, 0x03d7,
-	0x03da, 0x03f3,
-	0x0400, 0x0486,
-	0x0488, 0x0489,
-	0x048c, 0x04c4,
-	0x04c7, 0x04c8,
-	0x04cb, 0x04cc,
-	0x04d0, 0x04f5,
-	0x04f8, 0x04f9,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x0591, 0x05a1,
-	0x05a3, 0x05b9,
-	0x05bb, 0x05c4,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x060c, 0x060c,
-	0x061b, 0x061b,
-	0x061f, 0x061f,
-	0x0621, 0x063a,
-	0x0640, 0x0655,
-	0x0660, 0x066d,
-	0x0670, 0x06ed,
-	0x06f0, 0x06fe,
-	0x0700, 0x070d,
-	0x070f, 0x072c,
-	0x0730, 0x074a,
-	0x0780, 0x07b0,
-	0x0901, 0x0903,
-	0x0905, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0970,
-	0x0981, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bc, 0x09bc,
-	0x09be, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cd,
-	0x09d7, 0x09d7,
-	0x09dc, 0x09dd,
-	0x09df, 0x09e3,
-	0x09e6, 0x09fa,
-	0x0a02, 0x0a02,
-	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, 0x0a8b,
-	0x0a8d, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abc, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acd,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae0,
-	0x0ae6, 0x0aef,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b36, 0x0b39,
-	0x0b3c, 0x0b43,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b61,
-	0x0b66, 0x0b70,
-	0x0b82, 0x0b83,
-	0x0b85, 0x0b8a,
-	0x0b8e, 0x0b90,
-	0x0b92, 0x0b95,
-	0x0b99, 0x0b9a,
-	0x0b9c, 0x0b9c,
-	0x0b9e, 0x0b9f,
-	0x0ba3, 0x0ba4,
-	0x0ba8, 0x0baa,
-	0x0bae, 0x0bb5,
-	0x0bb7, 0x0bb9,
-	0x0bbe, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcd,
-	0x0bd7, 0x0bd7,
-	0x0be7, 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,
-	0x0cbe, 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, 0x0fcf,
-	0x1000, 0x1021,
-	0x1023, 0x1027,
-	0x1029, 0x102a,
-	0x102c, 0x1032,
-	0x1036, 0x1039,
-	0x1040, 0x1059,
-	0x10a0, 0x10c5,
-	0x10d0, 0x10f6,
-	0x10fb, 0x10fb,
-	0x1100, 0x1159,
-	0x115f, 0x11a2,
-	0x11a8, 0x11f9,
-	0x1200, 0x1206,
-	0x1208, 0x1246,
-	0x1248, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1286,
-	0x1288, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12ae,
-	0x12b0, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12ce,
-	0x12d0, 0x12d6,
-	0x12d8, 0x12ee,
-	0x12f0, 0x130e,
-	0x1310, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x131e,
-	0x1320, 0x1346,
-	0x1348, 0x135a,
-	0x1361, 0x137c,
-	0x13a0, 0x13f4,
-	0x1401, 0x1676,
-	0x1680, 0x169c,
-	0x16a0, 0x16f0,
-	0x1780, 0x17dc,
-	0x17e0, 0x17e9,
-	0x1800, 0x180e,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18a9,
-	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, 0x2046,
-	0x2048, 0x204d,
-	0x206a, 0x2070,
-	0x2074, 0x208e,
-	0x20a0, 0x20af,
-	0x20d0, 0x20e3,
-	0x2100, 0x213a,
-	0x2153, 0x2183,
-	0x2190, 0x21f3,
-	0x2200, 0x22f1,
-	0x2300, 0x237b,
-	0x237d, 0x239a,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x24ea,
-	0x2500, 0x2595,
-	0x25a0, 0x25f7,
-	0x2600, 0x2613,
-	0x2619, 0x2671,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2767,
-	0x2776, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x2800, 0x28ff,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303a,
-	0x303e, 0x303f,
-	0x3041, 0x3094,
-	0x3099, 0x309e,
-	0x30a1, 0x30fe,
-	0x3105, 0x312c,
-	0x3131, 0x318e,
-	0x3190, 0x31b7,
-	0x3200, 0x321c,
-	0x3220, 0x3243,
-	0x3260, 0x327b,
-	0x327f, 0x32b0,
-	0x32c0, 0x32cb,
-	0x32d0, 0x32fe,
-	0x3300, 0x3376,
-	0x337b, 0x33dd,
-	0x33e0, 0x33fe,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fa5,
-	0xa000, 0xa48c,
-	0xa490, 0xa4a1,
-	0xa4a4, 0xa4b3,
-	0xa4b5, 0xa4c0,
-	0xa4c2, 0xa4c4,
-	0xa4c6, 0xa4c6,
-	0xac00, 0xd7a3,
-	0xd800, 0xfa2d,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe20, 0xfe23,
-	0xfe30, 0xfe44,
-	0xfe49, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfe70, 0xfe72,
-	0xfe74, 0xfe74,
-	0xfe76, 0xfefc,
-	0xfeff, 0xfeff,
-	0xff01, 0xff5e,
-	0xff61, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfff9, 0xffff,
-	0x1fffe, 0x1ffff,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_3_0 */
-
-/* 'Age_3_1': Derived Age 3.1 */
-static const OnigCodePoint CR_Age_3_1[] = {
-	402,
-	0x0000, 0x021f,
-	0x0222, 0x0233,
-	0x0250, 0x02ad,
-	0x02b0, 0x02ee,
-	0x0300, 0x034e,
-	0x0360, 0x0362,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x037e, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03ce,
-	0x03d0, 0x03d7,
-	0x03da, 0x03f5,
-	0x0400, 0x0486,
-	0x0488, 0x0489,
-	0x048c, 0x04c4,
-	0x04c7, 0x04c8,
-	0x04cb, 0x04cc,
-	0x04d0, 0x04f5,
-	0x04f8, 0x04f9,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x0591, 0x05a1,
-	0x05a3, 0x05b9,
-	0x05bb, 0x05c4,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x060c, 0x060c,
-	0x061b, 0x061b,
-	0x061f, 0x061f,
-	0x0621, 0x063a,
-	0x0640, 0x0655,
-	0x0660, 0x066d,
-	0x0670, 0x06ed,
-	0x06f0, 0x06fe,
-	0x0700, 0x070d,
-	0x070f, 0x072c,
-	0x0730, 0x074a,
-	0x0780, 0x07b0,
-	0x0901, 0x0903,
-	0x0905, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0970,
-	0x0981, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bc, 0x09bc,
-	0x09be, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cd,
-	0x09d7, 0x09d7,
-	0x09dc, 0x09dd,
-	0x09df, 0x09e3,
-	0x09e6, 0x09fa,
-	0x0a02, 0x0a02,
-	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, 0x0a8b,
-	0x0a8d, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abc, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acd,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae0,
-	0x0ae6, 0x0aef,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b36, 0x0b39,
-	0x0b3c, 0x0b43,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b61,
-	0x0b66, 0x0b70,
-	0x0b82, 0x0b83,
-	0x0b85, 0x0b8a,
-	0x0b8e, 0x0b90,
-	0x0b92, 0x0b95,
-	0x0b99, 0x0b9a,
-	0x0b9c, 0x0b9c,
-	0x0b9e, 0x0b9f,
-	0x0ba3, 0x0ba4,
-	0x0ba8, 0x0baa,
-	0x0bae, 0x0bb5,
-	0x0bb7, 0x0bb9,
-	0x0bbe, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcd,
-	0x0bd7, 0x0bd7,
-	0x0be7, 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,
-	0x0cbe, 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, 0x0fcf,
-	0x1000, 0x1021,
-	0x1023, 0x1027,
-	0x1029, 0x102a,
-	0x102c, 0x1032,
-	0x1036, 0x1039,
-	0x1040, 0x1059,
-	0x10a0, 0x10c5,
-	0x10d0, 0x10f6,
-	0x10fb, 0x10fb,
-	0x1100, 0x1159,
-	0x115f, 0x11a2,
-	0x11a8, 0x11f9,
-	0x1200, 0x1206,
-	0x1208, 0x1246,
-	0x1248, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1286,
-	0x1288, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12ae,
-	0x12b0, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12ce,
-	0x12d0, 0x12d6,
-	0x12d8, 0x12ee,
-	0x12f0, 0x130e,
-	0x1310, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x131e,
-	0x1320, 0x1346,
-	0x1348, 0x135a,
-	0x1361, 0x137c,
-	0x13a0, 0x13f4,
-	0x1401, 0x1676,
-	0x1680, 0x169c,
-	0x16a0, 0x16f0,
-	0x1780, 0x17dc,
-	0x17e0, 0x17e9,
-	0x1800, 0x180e,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18a9,
-	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, 0x2046,
-	0x2048, 0x204d,
-	0x206a, 0x2070,
-	0x2074, 0x208e,
-	0x20a0, 0x20af,
-	0x20d0, 0x20e3,
-	0x2100, 0x213a,
-	0x2153, 0x2183,
-	0x2190, 0x21f3,
-	0x2200, 0x22f1,
-	0x2300, 0x237b,
-	0x237d, 0x239a,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x24ea,
-	0x2500, 0x2595,
-	0x25a0, 0x25f7,
-	0x2600, 0x2613,
-	0x2619, 0x2671,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2767,
-	0x2776, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x2800, 0x28ff,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303a,
-	0x303e, 0x303f,
-	0x3041, 0x3094,
-	0x3099, 0x309e,
-	0x30a1, 0x30fe,
-	0x3105, 0x312c,
-	0x3131, 0x318e,
-	0x3190, 0x31b7,
-	0x3200, 0x321c,
-	0x3220, 0x3243,
-	0x3260, 0x327b,
-	0x327f, 0x32b0,
-	0x32c0, 0x32cb,
-	0x32d0, 0x32fe,
-	0x3300, 0x3376,
-	0x337b, 0x33dd,
-	0x33e0, 0x33fe,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fa5,
-	0xa000, 0xa48c,
-	0xa490, 0xa4a1,
-	0xa4a4, 0xa4b3,
-	0xa4b5, 0xa4c0,
-	0xa4c2, 0xa4c4,
-	0xa4c6, 0xa4c6,
-	0xac00, 0xd7a3,
-	0xd800, 0xfa2d,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 0xfdfb,
-	0xfe20, 0xfe23,
-	0xfe30, 0xfe44,
-	0xfe49, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfe70, 0xfe72,
-	0xfe74, 0xfe74,
-	0xfe76, 0xfefc,
-	0xfeff, 0xfeff,
-	0xff01, 0xff5e,
-	0xff61, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfff9, 0xffff,
-	0x10300, 0x1031e,
-	0x10320, 0x10323,
-	0x10330, 0x1034a,
-	0x10400, 0x10425,
-	0x10428, 0x1044d,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d12a, 0x1d1dd,
-	0x1d400, 0x1d454,
-	0x1d456, 0x1d49c,
-	0x1d49e, 0x1d49f,
-	0x1d4a2, 0x1d4a2,
-	0x1d4a5, 0x1d4a6,
-	0x1d4a9, 0x1d4ac,
-	0x1d4ae, 0x1d4b9,
-	0x1d4bb, 0x1d4bb,
-	0x1d4bd, 0x1d4c0,
-	0x1d4c2, 0x1d4c3,
-	0x1d4c5, 0x1d505,
-	0x1d507, 0x1d50a,
-	0x1d50d, 0x1d514,
-	0x1d516, 0x1d51c,
-	0x1d51e, 0x1d539,
-	0x1d53b, 0x1d53e,
-	0x1d540, 0x1d544,
-	0x1d546, 0x1d546,
-	0x1d54a, 0x1d550,
-	0x1d552, 0x1d6a3,
-	0x1d6a8, 0x1d7c9,
-	0x1d7ce, 0x1d7ff,
-	0x1fffe, 0x2a6d6,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_3_1 */
-
-/* 'Age_3_2': Derived Age 3.2 */
-static const OnigCodePoint CR_Age_3_2[] = {
-	397,
-	0x0000, 0x0220,
-	0x0222, 0x0233,
-	0x0250, 0x02ad,
-	0x02b0, 0x02ee,
-	0x0300, 0x034f,
-	0x0360, 0x036f,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x037e, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03ce,
-	0x03d0, 0x03f6,
-	0x0400, 0x0486,
-	0x0488, 0x04ce,
-	0x04d0, 0x04f5,
-	0x04f8, 0x04f9,
-	0x0500, 0x050f,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x0591, 0x05a1,
-	0x05a3, 0x05b9,
-	0x05bb, 0x05c4,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x060c, 0x060c,
-	0x061b, 0x061b,
-	0x061f, 0x061f,
-	0x0621, 0x063a,
-	0x0640, 0x0655,
-	0x0660, 0x06ed,
-	0x06f0, 0x06fe,
-	0x0700, 0x070d,
-	0x070f, 0x072c,
-	0x0730, 0x074a,
-	0x0780, 0x07b1,
-	0x0901, 0x0903,
-	0x0905, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0970,
-	0x0981, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bc, 0x09bc,
-	0x09be, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cd,
-	0x09d7, 0x09d7,
-	0x09dc, 0x09dd,
-	0x09df, 0x09e3,
-	0x09e6, 0x09fa,
-	0x0a02, 0x0a02,
-	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, 0x0a8b,
-	0x0a8d, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abc, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acd,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae0,
-	0x0ae6, 0x0aef,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b36, 0x0b39,
-	0x0b3c, 0x0b43,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b61,
-	0x0b66, 0x0b70,
-	0x0b82, 0x0b83,
-	0x0b85, 0x0b8a,
-	0x0b8e, 0x0b90,
-	0x0b92, 0x0b95,
-	0x0b99, 0x0b9a,
-	0x0b9c, 0x0b9c,
-	0x0b9e, 0x0b9f,
-	0x0ba3, 0x0ba4,
-	0x0ba8, 0x0baa,
-	0x0bae, 0x0bb5,
-	0x0bb7, 0x0bb9,
-	0x0bbe, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcd,
-	0x0bd7, 0x0bd7,
-	0x0be7, 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,
-	0x0cbe, 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, 0x0fcf,
-	0x1000, 0x1021,
-	0x1023, 0x1027,
-	0x1029, 0x102a,
-	0x102c, 0x1032,
-	0x1036, 0x1039,
-	0x1040, 0x1059,
-	0x10a0, 0x10c5,
-	0x10d0, 0x10f8,
-	0x10fb, 0x10fb,
-	0x1100, 0x1159,
-	0x115f, 0x11a2,
-	0x11a8, 0x11f9,
-	0x1200, 0x1206,
-	0x1208, 0x1246,
-	0x1248, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1286,
-	0x1288, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12ae,
-	0x12b0, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12ce,
-	0x12d0, 0x12d6,
-	0x12d8, 0x12ee,
-	0x12f0, 0x130e,
-	0x1310, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x131e,
-	0x1320, 0x1346,
-	0x1348, 0x135a,
-	0x1361, 0x137c,
-	0x13a0, 0x13f4,
-	0x1401, 0x1676,
-	0x1680, 0x169c,
-	0x16a0, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1714,
-	0x1720, 0x1736,
-	0x1740, 0x1753,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-	0x1780, 0x17dc,
-	0x17e0, 0x17e9,
-	0x1800, 0x180e,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18a9,
-	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, 0x2052,
-	0x2057, 0x2057,
-	0x205f, 0x2063,
-	0x206a, 0x2071,
-	0x2074, 0x208e,
-	0x20a0, 0x20b1,
-	0x20d0, 0x20ea,
-	0x2100, 0x213a,
-	0x213d, 0x214b,
-	0x2153, 0x2183,
-	0x2190, 0x23ce,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x24fe,
-	0x2500, 0x2613,
-	0x2616, 0x2617,
-	0x2619, 0x267d,
-	0x2680, 0x2689,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27d0, 0x27eb,
-	0x27f0, 0x2aff,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312c,
-	0x3131, 0x318e,
-	0x3190, 0x31b7,
-	0x31f0, 0x321c,
-	0x3220, 0x3243,
-	0x3251, 0x327b,
-	0x327f, 0x32cb,
-	0x32d0, 0x32fe,
-	0x3300, 0x3376,
-	0x337b, 0x33dd,
-	0x33e0, 0x33fe,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fa5,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xac00, 0xd7a3,
-	0xd800, 0xfa2d,
-	0xfa30, 0xfa6a,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 0xfdfc,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe23,
-	0xfe30, 0xfe46,
-	0xfe49, 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, 0xffff,
-	0x10300, 0x1031e,
-	0x10320, 0x10323,
-	0x10330, 0x1034a,
-	0x10400, 0x10425,
-	0x10428, 0x1044d,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d12a, 0x1d1dd,
-	0x1d400, 0x1d454,
-	0x1d456, 0x1d49c,
-	0x1d49e, 0x1d49f,
-	0x1d4a2, 0x1d4a2,
-	0x1d4a5, 0x1d4a6,
-	0x1d4a9, 0x1d4ac,
-	0x1d4ae, 0x1d4b9,
-	0x1d4bb, 0x1d4bb,
-	0x1d4bd, 0x1d4c0,
-	0x1d4c2, 0x1d4c3,
-	0x1d4c5, 0x1d505,
-	0x1d507, 0x1d50a,
-	0x1d50d, 0x1d514,
-	0x1d516, 0x1d51c,
-	0x1d51e, 0x1d539,
-	0x1d53b, 0x1d53e,
-	0x1d540, 0x1d544,
-	0x1d546, 0x1d546,
-	0x1d54a, 0x1d550,
-	0x1d552, 0x1d6a3,
-	0x1d6a8, 0x1d7c9,
-	0x1d7ce, 0x1d7ff,
-	0x1fffe, 0x2a6d6,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_3_2 */
-
-/* 'Age_4_0': Derived Age 4.0 */
-static const OnigCodePoint CR_Age_4_0[] = {
-	412,
-	0x0000, 0x0236,
-	0x0250, 0x0357,
-	0x035d, 0x036f,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x037e, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03ce,
-	0x03d0, 0x03fb,
-	0x0400, 0x0486,
-	0x0488, 0x04ce,
-	0x04d0, 0x04f5,
-	0x04f8, 0x04f9,
-	0x0500, 0x050f,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x0591, 0x05a1,
-	0x05a3, 0x05b9,
-	0x05bb, 0x05c4,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x0603,
-	0x060c, 0x0615,
-	0x061b, 0x061b,
-	0x061f, 0x061f,
-	0x0621, 0x063a,
-	0x0640, 0x0658,
-	0x0660, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x074f,
-	0x0780, 0x07b1,
-	0x0901, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0970,
-	0x0981, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bc, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cd,
-	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, 0x0bb5,
-	0x0bb7, 0x0bb9,
-	0x0bbe, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcd,
-	0x0bd7, 0x0bd7,
-	0x0be7, 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, 0x0fcf,
-	0x1000, 0x1021,
-	0x1023, 0x1027,
-	0x1029, 0x102a,
-	0x102c, 0x1032,
-	0x1036, 0x1039,
-	0x1040, 0x1059,
-	0x10a0, 0x10c5,
-	0x10d0, 0x10f8,
-	0x10fb, 0x10fb,
-	0x1100, 0x1159,
-	0x115f, 0x11a2,
-	0x11a8, 0x11f9,
-	0x1200, 0x1206,
-	0x1208, 0x1246,
-	0x1248, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1286,
-	0x1288, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12ae,
-	0x12b0, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12ce,
-	0x12d0, 0x12d6,
-	0x12d8, 0x12ee,
-	0x12f0, 0x130e,
-	0x1310, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x131e,
-	0x1320, 0x1346,
-	0x1348, 0x135a,
-	0x1361, 0x137c,
-	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,
-	0x19e0, 0x19ff,
-	0x1d00, 0x1d6b,
-	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, 0x2054,
-	0x2057, 0x2057,
-	0x205f, 0x2063,
-	0x206a, 0x2071,
-	0x2074, 0x208e,
-	0x20a0, 0x20b1,
-	0x20d0, 0x20ea,
-	0x2100, 0x213b,
-	0x213d, 0x214b,
-	0x2153, 0x2183,
-	0x2190, 0x23d0,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x2617,
-	0x2619, 0x267d,
-	0x2680, 0x2691,
-	0x26a0, 0x26a1,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27d0, 0x27eb,
-	0x27f0, 0x2b0d,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312c,
-	0x3131, 0x318e,
-	0x3190, 0x31b7,
-	0x31f0, 0x321e,
-	0x3220, 0x3243,
-	0x3250, 0x327d,
-	0x327f, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fa5,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xac00, 0xd7a3,
-	0xd800, 0xfa2d,
-	0xfa30, 0xfa6a,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 0xfdfd,
-	0xfe00, 0xfe0f,
-	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, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1013f,
-	0x10300, 0x1031e,
-	0x10320, 0x10323,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x1039f, 0x1039f,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x1083f,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d12a, 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, 0x1d6a3,
-	0x1d6a8, 0x1d7c9,
-	0x1d7ce, 0x1d7ff,
-	0x1fffe, 0x2a6d6,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_4_0 */
-
-/* 'Age_4_1': Derived Age 4.1 */
-static const OnigCodePoint CR_Age_4_1[] = {
-	430,
-	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,
-	0xfdd0, 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, 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,
-	0x1fffe, 0x2a6d6,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_4_1 */
-
-/* 'Age_5_0': Derived Age 5.0 */
-static const OnigCodePoint CR_Age_5_0[] = {
-	440,
-	0x0000, 0x036f,
-	0x0374, 0x0375,
-	0x037a, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03ce,
-	0x03d0, 0x0486,
-	0x0488, 0x0513,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x0591, 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,
-	0x07c0, 0x07fa,
-	0x0901, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0970,
-	0x097b, 0x097f,
-	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, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	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,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1d00, 0x1dca,
-	0x1dfe, 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, 0x20ef,
-	0x2100, 0x214e,
-	0x2153, 0x2184,
-	0x2190, 0x23e7,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x269c,
-	0x26a0, 0x26b2,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27c0, 0x27ca,
-	0x27d0, 0x27eb,
-	0x27f0, 0x2b1a,
-	0x2b20, 0x2b23,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2c6c,
-	0x2c74, 0x2c77,
-	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, 0xa71a,
-	0xa720, 0xa721,
-	0xa800, 0xa82b,
-	0xa840, 0xa877,
-	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,
-	0xfdd0, 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, 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,
-	0x10900, 0x10919,
-	0x1091f, 0x1091f,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d12a, 0x1d1dd,
-	0x1d200, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1fffe, 0x2a6d6,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_5_0 */
-
-/* 'Age_5_1': Derived Age 5.1 */
-static const OnigCodePoint CR_Age_5_1[] = {
-	455,
-	0x0000, 0x0377,
-	0x037a, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x0523,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x0603,
-	0x0606, 0x061b,
-	0x061e, 0x061f,
-	0x0621, 0x065e,
-	0x0660, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0901, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0972,
-	0x097b, 0x097f,
-	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,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bfa,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-	0x0c82, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
-	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, 0x0f6c,
-	0x0f71, 0x0f8b,
-	0x0f90, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fd4,
-	0x1000, 0x1099,
-	0x109e, 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, 0x18aa,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19a9,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19d9,
-	0x19de, 0x1a1b,
-	0x1a1e, 0x1a1f,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1baa,
-	0x1bae, 0x1bb9,
-	0x1c00, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1d00, 0x1de6,
-	0x1dfe, 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, 0x2064,
-	0x206a, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x2094,
-	0x20a0, 0x20b5,
-	0x20d0, 0x20f0,
-	0x2100, 0x214f,
-	0x2153, 0x2188,
-	0x2190, 0x23e7,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x269d,
-	0x26a0, 0x26bc,
-	0x26c0, 0x26c3,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27c0, 0x27ca,
-	0x27cc, 0x27cc,
-	0x27d0, 0x2b4c,
-	0x2b50, 0x2b54,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2c6f,
-	0x2c71, 0x2c7d,
-	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,
-	0x2de0, 0x2e30,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31b7,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x3243,
-	0x3250, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fc3,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa500, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa673,
-	0xa67c, 0xa697,
-	0xa700, 0xa78c,
-	0xa7fb, 0xa82b,
-	0xa840, 0xa877,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-	0xa900, 0xa953,
-	0xa95f, 0xa95f,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa5f,
-	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,
-	0xfdd0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe26,
-	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, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018a,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	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,
-	0x10900, 0x10919,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d1dd,
-	0x1d200, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1fffe, 0x2a6d6,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_5_1 */
-
-/* 'Age_5_2': Derived Age 5.2 */
-static const OnigCodePoint CR_Age_5_2[] = {
-	495,
-	0x0000, 0x0377,
-	0x037a, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x0525,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x0603,
-	0x0606, 0x061b,
-	0x061e, 0x061f,
-	0x0621, 0x065e,
-	0x0660, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-	0x0900, 0x0939,
-	0x093c, 0x094e,
-	0x0950, 0x0955,
-	0x0958, 0x0972,
-	0x0979, 0x097f,
-	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, 0x09fb,
-	0x0a01, 0x0a03,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bfa,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-	0x0c82, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
-	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, 0x0f6c,
-	0x0f71, 0x0f8b,
-	0x0f90, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fd8,
-	0x1000, 0x10c5,
-	0x10d0, 0x10fc,
-	0x1100, 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,
-	0x1400, 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, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a1b,
-	0x1a1e, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1baa,
-	0x1bae, 0x1bb9,
-	0x1c00, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cd0, 0x1cf2,
-	0x1d00, 0x1de6,
-	0x1dfd, 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, 0x2064,
-	0x206a, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x2094,
-	0x20a0, 0x20b8,
-	0x20d0, 0x20f0,
-	0x2100, 0x2189,
-	0x2190, 0x23e8,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x26cd,
-	0x26cf, 0x26e1,
-	0x26e3, 0x26e3,
-	0x26e8, 0x26ff,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27c0, 0x27ca,
-	0x27cc, 0x27cc,
-	0x27d0, 0x2b4c,
-	0x2b50, 0x2b59,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf1,
-	0x2cf9, 0x2d25,
-	0x2d30, 0x2d65,
-	0x2d6f, 0x2d6f,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2e31,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31b7,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa673,
-	0xa67c, 0xa697,
-	0xa6a0, 0xa6f7,
-	0xa700, 0xa78c,
-	0xa7fb, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-	0xa8e0, 0xa8fb,
-	0xa900, 0xa953,
-	0xa95f, 0xa97c,
-	0xa980, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9df,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa7b,
-	0xaa80, 0xaac2,
-	0xaadb, 0xaadf,
-	0xabc0, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xd800, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe26,
-	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, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018a,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	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, 0x10855,
-	0x10857, 0x1085f,
-	0x10900, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a7f,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b7f,
-	0x10c00, 0x10c48,
-	0x10e60, 0x10e7e,
-	0x11080, 0x110c1,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-	0x13000, 0x1342e,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d1dd,
-	0x1d200, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f100, 0x1f10a,
-	0x1f110, 0x1f12e,
-	0x1f131, 0x1f131,
-	0x1f13d, 0x1f13d,
-	0x1f13f, 0x1f13f,
-	0x1f142, 0x1f142,
-	0x1f146, 0x1f146,
-	0x1f14a, 0x1f14e,
-	0x1f157, 0x1f157,
-	0x1f15f, 0x1f15f,
-	0x1f179, 0x1f179,
-	0x1f17b, 0x1f17c,
-	0x1f17f, 0x1f17f,
-	0x1f18a, 0x1f18d,
-	0x1f190, 0x1f190,
-	0x1f200, 0x1f200,
-	0x1f210, 0x1f231,
-	0x1f240, 0x1f248,
-	0x1fffe, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_5_2 */
-
-/* 'Age_6_0': Derived Age 6.0 */
-static const OnigCodePoint CR_Age_6_0[] = {
-	511,
-	0x0000, 0x0377,
-	0x037a, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x0527,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x0603,
-	0x0606, 0x061b,
-	0x061e, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-	0x0840, 0x085b,
-	0x085e, 0x085e,
-	0x0900, 0x0977,
-	0x0979, 0x097f,
-	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, 0x09fb,
-	0x0a01, 0x0a03,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	0x0b66, 0x0b77,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bfa,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-	0x0c82, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
-	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, 0x0f6c,
-	0x0f71, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fda,
-	0x1000, 0x10c5,
-	0x10d0, 0x10fc,
-	0x1100, 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,
-	0x135d, 0x137c,
-	0x1380, 0x1399,
-	0x13a0, 0x13f4,
-	0x1400, 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, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a1b,
-	0x1a1e, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1baa,
-	0x1bae, 0x1bb9,
-	0x1bc0, 0x1bf3,
-	0x1bfc, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cd0, 0x1cf2,
-	0x1d00, 0x1de6,
-	0x1dfc, 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, 0x2064,
-	0x206a, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x209c,
-	0x20a0, 0x20b9,
-	0x20d0, 0x20f0,
-	0x2100, 0x2189,
-	0x2190, 0x23f3,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x26ff,
-	0x2701, 0x27ca,
-	0x27cc, 0x27cc,
-	0x27ce, 0x2b4c,
-	0x2b50, 0x2b59,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf1,
-	0x2cf9, 0x2d25,
-	0x2d30, 0x2d65,
-	0x2d6f, 0x2d70,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2e31,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa673,
-	0xa67c, 0xa697,
-	0xa6a0, 0xa6f7,
-	0xa700, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-	0xa8e0, 0xa8fb,
-	0xa900, 0xa953,
-	0xa95f, 0xa97c,
-	0xa980, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9df,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa7b,
-	0xaa80, 0xaac2,
-	0xaadb, 0xaadf,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xd800, 0xfa2d,
-	0xfa30, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbc1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe26,
-	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, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018a,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	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, 0x10855,
-	0x10857, 0x1085f,
-	0x10900, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a7f,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b7f,
-	0x10c00, 0x10c48,
-	0x10e60, 0x10e7e,
-	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-	0x11080, 0x110c1,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x1b000, 0x1b001,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d1dd,
-	0x1d200, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	0x1f100, 0x1f10a,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f169,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f320,
-	0x1f330, 0x1f335,
-	0x1f337, 0x1f37c,
-	0x1f380, 0x1f393,
-	0x1f3a0, 0x1f3c4,
-	0x1f3c6, 0x1f3ca,
-	0x1f3e0, 0x1f3f0,
-	0x1f400, 0x1f43e,
-	0x1f440, 0x1f440,
-	0x1f442, 0x1f4f7,
-	0x1f4f9, 0x1f4fc,
-	0x1f500, 0x1f53d,
-	0x1f550, 0x1f567,
-	0x1f5fb, 0x1f5ff,
-	0x1f601, 0x1f610,
-	0x1f612, 0x1f614,
-	0x1f616, 0x1f616,
-	0x1f618, 0x1f618,
-	0x1f61a, 0x1f61a,
-	0x1f61c, 0x1f61e,
-	0x1f620, 0x1f625,
-	0x1f628, 0x1f62b,
-	0x1f62d, 0x1f62d,
-	0x1f630, 0x1f633,
-	0x1f635, 0x1f640,
-	0x1f645, 0x1f64f,
-	0x1f680, 0x1f6c5,
-	0x1f700, 0x1f773,
-	0x1fffe, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_6_0 */
-
-/* 'Age_6_1': Derived Age 6.1 */
-static const OnigCodePoint CR_Age_6_1[] = {
-	549,
-	0x0000, 0x0377,
-	0x037a, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x0527,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x058f, 0x058f,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x0604,
-	0x0606, 0x061b,
-	0x061e, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-	0x0840, 0x085b,
-	0x085e, 0x085e,
-	0x08a0, 0x08a0,
-	0x08a2, 0x08ac,
-	0x08e4, 0x08fe,
-	0x0900, 0x0977,
-	0x0979, 0x097f,
-	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, 0x09fb,
-	0x0a01, 0x0a03,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a51, 0x0a51,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a75,
-	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, 0x0af1,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b35, 0x0b39,
-	0x0b3c, 0x0b44,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b63,
-	0x0b66, 0x0b77,
-	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,
-	0x0bd0, 0x0bd0,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bfa,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-	0x0c82, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbc, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0ce6, 0x0cef,
-	0x0cf1, 0x0cf2,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d63,
-	0x0d66, 0x0d75,
-	0x0d79, 0x0d7f,
-	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, 0x0edf,
-	0x0f00, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fda,
-	0x1000, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 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,
-	0x135d, 0x137c,
-	0x1380, 0x1399,
-	0x13a0, 0x13f4,
-	0x1400, 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, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a1b,
-	0x1a1e, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa0, 0x1aad,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1bf3,
-	0x1bfc, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cc0, 0x1cc7,
-	0x1cd0, 0x1cf6,
-	0x1d00, 0x1de6,
-	0x1dfc, 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, 0x2064,
-	0x206a, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x209c,
-	0x20a0, 0x20b9,
-	0x20d0, 0x20f0,
-	0x2100, 0x2189,
-	0x2190, 0x23f3,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x26ff,
-	0x2701, 0x2b4c,
-	0x2b50, 0x2b59,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf3,
-	0x2cf9, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d70,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2e3b,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa697,
-	0xa69f, 0xa6f7,
-	0xa700, 0xa78e,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xa7f8, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-	0xa8e0, 0xa8fb,
-	0xa900, 0xa953,
-	0xa95f, 0xa97c,
-	0xa980, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9df,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa7b,
-	0xaa80, 0xaac2,
-	0xaadb, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xd800, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbc1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe26,
-	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, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018a,
-	0x10190, 0x1019b,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	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, 0x10855,
-	0x10857, 0x1085f,
-	0x10900, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a7f,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b7f,
-	0x10c00, 0x10c48,
-	0x10e60, 0x10e7e,
-	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-	0x11080, 0x110c1,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x11143,
-	0x11180, 0x111c8,
-	0x111d0, 0x111d9,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d1dd,
-	0x1d200, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d360, 0x1d371,
-	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, 0x1d7cb,
-	0x1d7ce, 0x1d7ff,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	0x1f100, 0x1f10a,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f320,
-	0x1f330, 0x1f335,
-	0x1f337, 0x1f37c,
-	0x1f380, 0x1f393,
-	0x1f3a0, 0x1f3c4,
-	0x1f3c6, 0x1f3ca,
-	0x1f3e0, 0x1f3f0,
-	0x1f400, 0x1f43e,
-	0x1f440, 0x1f440,
-	0x1f442, 0x1f4f7,
-	0x1f4f9, 0x1f4fc,
-	0x1f500, 0x1f53d,
-	0x1f540, 0x1f543,
-	0x1f550, 0x1f567,
-	0x1f5fb, 0x1f640,
-	0x1f645, 0x1f64f,
-	0x1f680, 0x1f6c5,
-	0x1f700, 0x1f773,
-	0x1fffe, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_6_1 */
-
-/* 'In_Basic_Latin': Block */
-#define CR_In_Basic_Latin CR_ASCII
-
-/* 'In_Latin_1_Supplement': Block */
-static const OnigCodePoint CR_In_Latin_1_Supplement[] = {
-	1,
-	0x0080, 0x00ff,
-}; /* CR_In_Latin_1_Supplement */
-
-/* 'In_Latin_Extended_A': Block */
-static const OnigCodePoint CR_In_Latin_Extended_A[] = {
-	1,
-	0x0100, 0x017f,
-}; /* CR_In_Latin_Extended_A */
-
-/* 'In_Latin_Extended_B': Block */
-static const OnigCodePoint CR_In_Latin_Extended_B[] = {
-	1,
-	0x0180, 0x024f,
-}; /* CR_In_Latin_Extended_B */
-
-/* 'In_IPA_Extensions': Block */
-static const OnigCodePoint CR_In_IPA_Extensions[] = {
-	1,
-	0x0250, 0x02af,
-}; /* CR_In_IPA_Extensions */
-
-/* 'In_Spacing_Modifier_Letters': Block */
-static const OnigCodePoint CR_In_Spacing_Modifier_Letters[] = {
-	1,
-	0x02b0, 0x02ff,
-}; /* CR_In_Spacing_Modifier_Letters */
-
-/* 'In_Combining_Diacritical_Marks': Block */
-static const OnigCodePoint CR_In_Combining_Diacritical_Marks[] = {
-	1,
-	0x0300, 0x036f,
-}; /* CR_In_Combining_Diacritical_Marks */
-
-/* 'In_Greek_and_Coptic': Block */
-static const OnigCodePoint CR_In_Greek_and_Coptic[] = {
-	1,
-	0x0370, 0x03ff,
-}; /* CR_In_Greek_and_Coptic */
-
-/* 'In_Cyrillic': Block */
-static const OnigCodePoint CR_In_Cyrillic[] = {
-	1,
-	0x0400, 0x04ff,
-}; /* CR_In_Cyrillic */
-
-/* 'In_Cyrillic_Supplement': Block */
-static const OnigCodePoint CR_In_Cyrillic_Supplement[] = {
-	1,
-	0x0500, 0x052f,
-}; /* CR_In_Cyrillic_Supplement */
-
-/* 'In_Armenian': Block */
-static const OnigCodePoint CR_In_Armenian[] = {
-	1,
-	0x0530, 0x058f,
-}; /* CR_In_Armenian */
-
-/* 'In_Hebrew': Block */
-static const OnigCodePoint CR_In_Hebrew[] = {
-	1,
-	0x0590, 0x05ff,
-}; /* CR_In_Hebrew */
-
-/* 'In_Arabic': Block */
-static const OnigCodePoint CR_In_Arabic[] = {
-	1,
-	0x0600, 0x06ff,
-}; /* CR_In_Arabic */
-
-/* 'In_Syriac': Block */
-static const OnigCodePoint CR_In_Syriac[] = {
-	1,
-	0x0700, 0x074f,
-}; /* CR_In_Syriac */
-
-/* 'In_Arabic_Supplement': Block */
-static const OnigCodePoint CR_In_Arabic_Supplement[] = {
-	1,
-	0x0750, 0x077f,
-}; /* CR_In_Arabic_Supplement */
-
-/* 'In_Thaana': Block */
-static const OnigCodePoint CR_In_Thaana[] = {
-	1,
-	0x0780, 0x07bf,
-}; /* CR_In_Thaana */
-
-/* 'In_NKo': Block */
-static const OnigCodePoint CR_In_NKo[] = {
-	1,
-	0x07c0, 0x07ff,
-}; /* CR_In_NKo */
-
-/* 'In_Samaritan': Block */
-static const OnigCodePoint CR_In_Samaritan[] = {
-	1,
-	0x0800, 0x083f,
-}; /* CR_In_Samaritan */
-
-/* 'In_Mandaic': Block */
-static const OnigCodePoint CR_In_Mandaic[] = {
-	1,
-	0x0840, 0x085f,
-}; /* CR_In_Mandaic */
-
-/* 'In_Arabic_Extended_A': Block */
-static const OnigCodePoint CR_In_Arabic_Extended_A[] = {
-	1,
-	0x08a0, 0x08ff,
-}; /* CR_In_Arabic_Extended_A */
-
-/* 'In_Devanagari': Block */
-static const OnigCodePoint CR_In_Devanagari[] = {
-	1,
-	0x0900, 0x097f,
-}; /* CR_In_Devanagari */
-
-/* 'In_Bengali': Block */
-static const OnigCodePoint CR_In_Bengali[] = {
-	1,
-	0x0980, 0x09ff,
-}; /* CR_In_Bengali */
-
-/* 'In_Gurmukhi': Block */
-static const OnigCodePoint CR_In_Gurmukhi[] = {
-	1,
-	0x0a00, 0x0a7f,
-}; /* CR_In_Gurmukhi */
-
-/* 'In_Gujarati': Block */
-static const OnigCodePoint CR_In_Gujarati[] = {
-	1,
-	0x0a80, 0x0aff,
-}; /* CR_In_Gujarati */
-
-/* 'In_Oriya': Block */
-static const OnigCodePoint CR_In_Oriya[] = {
-	1,
-	0x0b00, 0x0b7f,
-}; /* CR_In_Oriya */
-
-/* 'In_Tamil': Block */
-static const OnigCodePoint CR_In_Tamil[] = {
-	1,
-	0x0b80, 0x0bff,
-}; /* CR_In_Tamil */
-
-/* 'In_Telugu': Block */
-static const OnigCodePoint CR_In_Telugu[] = {
-	1,
-	0x0c00, 0x0c7f,
-}; /* CR_In_Telugu */
-
-/* 'In_Kannada': Block */
-static const OnigCodePoint CR_In_Kannada[] = {
-	1,
-	0x0c80, 0x0cff,
-}; /* CR_In_Kannada */
-
-/* 'In_Malayalam': Block */
-static const OnigCodePoint CR_In_Malayalam[] = {
-	1,
-	0x0d00, 0x0d7f,
-}; /* CR_In_Malayalam */
-
-/* 'In_Sinhala': Block */
-static const OnigCodePoint CR_In_Sinhala[] = {
-	1,
-	0x0d80, 0x0dff,
-}; /* CR_In_Sinhala */
-
-/* 'In_Thai': Block */
-static const OnigCodePoint CR_In_Thai[] = {
-	1,
-	0x0e00, 0x0e7f,
-}; /* CR_In_Thai */
-
-/* 'In_Lao': Block */
-static const OnigCodePoint CR_In_Lao[] = {
-	1,
-	0x0e80, 0x0eff,
-}; /* CR_In_Lao */
-
-/* 'In_Tibetan': Block */
-static const OnigCodePoint CR_In_Tibetan[] = {
-	1,
-	0x0f00, 0x0fff,
-}; /* CR_In_Tibetan */
-
-/* 'In_Myanmar': Block */
-static const OnigCodePoint CR_In_Myanmar[] = {
-	1,
-	0x1000, 0x109f,
-}; /* CR_In_Myanmar */
-
-/* 'In_Georgian': Block */
-static const OnigCodePoint CR_In_Georgian[] = {
-	1,
-	0x10a0, 0x10ff,
-}; /* CR_In_Georgian */
-
-/* 'In_Hangul_Jamo': Block */
-static const OnigCodePoint CR_In_Hangul_Jamo[] = {
-	1,
-	0x1100, 0x11ff,
-}; /* CR_In_Hangul_Jamo */
-
-/* 'In_Ethiopic': Block */
-static const OnigCodePoint CR_In_Ethiopic[] = {
-	1,
-	0x1200, 0x137f,
-}; /* CR_In_Ethiopic */
-
-/* 'In_Ethiopic_Supplement': Block */
-static const OnigCodePoint CR_In_Ethiopic_Supplement[] = {
-	1,
-	0x1380, 0x139f,
-}; /* CR_In_Ethiopic_Supplement */
-
-/* 'In_Cherokee': Block */
-static const OnigCodePoint CR_In_Cherokee[] = {
-	1,
-	0x13a0, 0x13ff,
-}; /* CR_In_Cherokee */
-
-/* 'In_Unified_Canadian_Aboriginal_Syllabics': Block */
-static const OnigCodePoint CR_In_Unified_Canadian_Aboriginal_Syllabics[] = {
-	1,
-	0x1400, 0x167f,
-}; /* CR_In_Unified_Canadian_Aboriginal_Syllabics */
-
-/* 'In_Ogham': Block */
-static const OnigCodePoint CR_In_Ogham[] = {
-	1,
-	0x1680, 0x169f,
-}; /* CR_In_Ogham */
-
-/* 'In_Runic': Block */
-static const OnigCodePoint CR_In_Runic[] = {
-	1,
-	0x16a0, 0x16ff,
-}; /* CR_In_Runic */
-
-/* 'In_Tagalog': Block */
-static const OnigCodePoint CR_In_Tagalog[] = {
-	1,
-	0x1700, 0x171f,
-}; /* CR_In_Tagalog */
-
-/* 'In_Hanunoo': Block */
-static const OnigCodePoint CR_In_Hanunoo[] = {
-	1,
-	0x1720, 0x173f,
-}; /* CR_In_Hanunoo */
-
-/* 'In_Buhid': Block */
-static const OnigCodePoint CR_In_Buhid[] = {
-	1,
-	0x1740, 0x175f,
-}; /* CR_In_Buhid */
-
-/* 'In_Tagbanwa': Block */
-static const OnigCodePoint CR_In_Tagbanwa[] = {
-	1,
-	0x1760, 0x177f,
-}; /* CR_In_Tagbanwa */
-
-/* 'In_Khmer': Block */
-static const OnigCodePoint CR_In_Khmer[] = {
-	1,
-	0x1780, 0x17ff,
-}; /* CR_In_Khmer */
-
-/* 'In_Mongolian': Block */
-static const OnigCodePoint CR_In_Mongolian[] = {
-	1,
-	0x1800, 0x18af,
-}; /* CR_In_Mongolian */
-
-/* 'In_Unified_Canadian_Aboriginal_Syllabics_Extended': Block */
-static const OnigCodePoint CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended[] = {
-	1,
-	0x18b0, 0x18ff,
-}; /* CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended */
-
-/* 'In_Limbu': Block */
-static const OnigCodePoint CR_In_Limbu[] = {
-	1,
-	0x1900, 0x194f,
-}; /* CR_In_Limbu */
-
-/* 'In_Tai_Le': Block */
-static const OnigCodePoint CR_In_Tai_Le[] = {
-	1,
-	0x1950, 0x197f,
-}; /* CR_In_Tai_Le */
-
-/* 'In_New_Tai_Lue': Block */
-static const OnigCodePoint CR_In_New_Tai_Lue[] = {
-	1,
-	0x1980, 0x19df,
-}; /* CR_In_New_Tai_Lue */
-
-/* 'In_Khmer_Symbols': Block */
-static const OnigCodePoint CR_In_Khmer_Symbols[] = {
-	1,
-	0x19e0, 0x19ff,
-}; /* CR_In_Khmer_Symbols */
-
-/* 'In_Buginese': Block */
-static const OnigCodePoint CR_In_Buginese[] = {
-	1,
-	0x1a00, 0x1a1f,
-}; /* CR_In_Buginese */
-
-/* 'In_Tai_Tham': Block */
-static const OnigCodePoint CR_In_Tai_Tham[] = {
-	1,
-	0x1a20, 0x1aaf,
-}; /* CR_In_Tai_Tham */
-
-/* 'In_Balinese': Block */
-static const OnigCodePoint CR_In_Balinese[] = {
-	1,
-	0x1b00, 0x1b7f,
-}; /* CR_In_Balinese */
-
-/* 'In_Sundanese': Block */
-static const OnigCodePoint CR_In_Sundanese[] = {
-	1,
-	0x1b80, 0x1bbf,
-}; /* CR_In_Sundanese */
-
-/* 'In_Batak': Block */
-static const OnigCodePoint CR_In_Batak[] = {
-	1,
-	0x1bc0, 0x1bff,
-}; /* CR_In_Batak */
-
-/* 'In_Lepcha': Block */
-static const OnigCodePoint CR_In_Lepcha[] = {
-	1,
-	0x1c00, 0x1c4f,
-}; /* CR_In_Lepcha */
-
-/* 'In_Ol_Chiki': Block */
-#define CR_In_Ol_Chiki CR_Ol_Chiki
-
-/* 'In_Sundanese_Supplement': Block */
-static const OnigCodePoint CR_In_Sundanese_Supplement[] = {
-	1,
-	0x1cc0, 0x1ccf,
-}; /* CR_In_Sundanese_Supplement */
-
-/* 'In_Vedic_Extensions': Block */
-static const OnigCodePoint CR_In_Vedic_Extensions[] = {
-	1,
-	0x1cd0, 0x1cff,
-}; /* CR_In_Vedic_Extensions */
-
-/* 'In_Phonetic_Extensions': Block */
-static const OnigCodePoint CR_In_Phonetic_Extensions[] = {
-	1,
-	0x1d00, 0x1d7f,
-}; /* CR_In_Phonetic_Extensions */
-
-/* 'In_Phonetic_Extensions_Supplement': Block */
-static const OnigCodePoint CR_In_Phonetic_Extensions_Supplement[] = {
-	1,
-	0x1d80, 0x1dbf,
-}; /* CR_In_Phonetic_Extensions_Supplement */
-
-/* 'In_Combining_Diacritical_Marks_Supplement': Block */
-static const OnigCodePoint CR_In_Combining_Diacritical_Marks_Supplement[] = {
-	1,
-	0x1dc0, 0x1dff,
-}; /* CR_In_Combining_Diacritical_Marks_Supplement */
-
-/* 'In_Latin_Extended_Additional': Block */
-static const OnigCodePoint CR_In_Latin_Extended_Additional[] = {
-	1,
-	0x1e00, 0x1eff,
-}; /* CR_In_Latin_Extended_Additional */
-
-/* 'In_Greek_Extended': Block */
-static const OnigCodePoint CR_In_Greek_Extended[] = {
-	1,
-	0x1f00, 0x1fff,
-}; /* CR_In_Greek_Extended */
-
-/* 'In_General_Punctuation': Block */
-static const OnigCodePoint CR_In_General_Punctuation[] = {
-	1,
-	0x2000, 0x206f,
-}; /* CR_In_General_Punctuation */
-
-/* 'In_Superscripts_and_Subscripts': Block */
-static const OnigCodePoint CR_In_Superscripts_and_Subscripts[] = {
-	1,
-	0x2070, 0x209f,
-}; /* CR_In_Superscripts_and_Subscripts */
-
-/* 'In_Currency_Symbols': Block */
-static const OnigCodePoint CR_In_Currency_Symbols[] = {
-	1,
-	0x20a0, 0x20cf,
-}; /* CR_In_Currency_Symbols */
-
-/* 'In_Combining_Diacritical_Marks_for_Symbols': Block */
-static const OnigCodePoint CR_In_Combining_Diacritical_Marks_for_Symbols[] = {
-	1,
-	0x20d0, 0x20ff,
-}; /* CR_In_Combining_Diacritical_Marks_for_Symbols */
-
-/* 'In_Letterlike_Symbols': Block */
-static const OnigCodePoint CR_In_Letterlike_Symbols[] = {
-	1,
-	0x2100, 0x214f,
-}; /* CR_In_Letterlike_Symbols */
-
-/* 'In_Number_Forms': Block */
-static const OnigCodePoint CR_In_Number_Forms[] = {
-	1,
-	0x2150, 0x218f,
-}; /* CR_In_Number_Forms */
-
-/* 'In_Arrows': Block */
-static const OnigCodePoint CR_In_Arrows[] = {
-	1,
-	0x2190, 0x21ff,
-}; /* CR_In_Arrows */
-
-/* 'In_Mathematical_Operators': Block */
-static const OnigCodePoint CR_In_Mathematical_Operators[] = {
-	1,
-	0x2200, 0x22ff,
-}; /* CR_In_Mathematical_Operators */
-
-/* 'In_Miscellaneous_Technical': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Technical[] = {
-	1,
-	0x2300, 0x23ff,
-}; /* CR_In_Miscellaneous_Technical */
-
-/* 'In_Control_Pictures': Block */
-static const OnigCodePoint CR_In_Control_Pictures[] = {
-	1,
-	0x2400, 0x243f,
-}; /* CR_In_Control_Pictures */
-
-/* 'In_Optical_Character_Recognition': Block */
-static const OnigCodePoint CR_In_Optical_Character_Recognition[] = {
-	1,
-	0x2440, 0x245f,
-}; /* CR_In_Optical_Character_Recognition */
-
-/* 'In_Enclosed_Alphanumerics': Block */
-static const OnigCodePoint CR_In_Enclosed_Alphanumerics[] = {
-	1,
-	0x2460, 0x24ff,
-}; /* CR_In_Enclosed_Alphanumerics */
-
-/* 'In_Box_Drawing': Block */
-static const OnigCodePoint CR_In_Box_Drawing[] = {
-	1,
-	0x2500, 0x257f,
-}; /* CR_In_Box_Drawing */
-
-/* 'In_Block_Elements': Block */
-static const OnigCodePoint CR_In_Block_Elements[] = {
-	1,
-	0x2580, 0x259f,
-}; /* CR_In_Block_Elements */
-
-/* 'In_Geometric_Shapes': Block */
-static const OnigCodePoint CR_In_Geometric_Shapes[] = {
-	1,
-	0x25a0, 0x25ff,
-}; /* CR_In_Geometric_Shapes */
-
-/* 'In_Miscellaneous_Symbols': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Symbols[] = {
-	1,
-	0x2600, 0x26ff,
-}; /* CR_In_Miscellaneous_Symbols */
-
-/* 'In_Dingbats': Block */
-static const OnigCodePoint CR_In_Dingbats[] = {
-	1,
-	0x2700, 0x27bf,
-}; /* CR_In_Dingbats */
-
-/* 'In_Miscellaneous_Mathematical_Symbols_A': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Mathematical_Symbols_A[] = {
-	1,
-	0x27c0, 0x27ef,
-}; /* CR_In_Miscellaneous_Mathematical_Symbols_A */
-
-/* 'In_Supplemental_Arrows_A': Block */
-static const OnigCodePoint CR_In_Supplemental_Arrows_A[] = {
-	1,
-	0x27f0, 0x27ff,
-}; /* CR_In_Supplemental_Arrows_A */
-
-/* 'In_Braille_Patterns': Block */
-#define CR_In_Braille_Patterns CR_Braille
-
-/* 'In_Supplemental_Arrows_B': Block */
-static const OnigCodePoint CR_In_Supplemental_Arrows_B[] = {
-	1,
-	0x2900, 0x297f,
-}; /* CR_In_Supplemental_Arrows_B */
-
-/* 'In_Miscellaneous_Mathematical_Symbols_B': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Mathematical_Symbols_B[] = {
-	1,
-	0x2980, 0x29ff,
-}; /* CR_In_Miscellaneous_Mathematical_Symbols_B */
-
-/* 'In_Supplemental_Mathematical_Operators': Block */
-static const OnigCodePoint CR_In_Supplemental_Mathematical_Operators[] = {
-	1,
-	0x2a00, 0x2aff,
-}; /* CR_In_Supplemental_Mathematical_Operators */
-
-/* 'In_Miscellaneous_Symbols_and_Arrows': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Symbols_and_Arrows[] = {
-	1,
-	0x2b00, 0x2bff,
-}; /* CR_In_Miscellaneous_Symbols_and_Arrows */
-
-/* 'In_Glagolitic': Block */
-static const OnigCodePoint CR_In_Glagolitic[] = {
-	1,
-	0x2c00, 0x2c5f,
-}; /* CR_In_Glagolitic */
-
-/* 'In_Latin_Extended_C': Block */
-static const OnigCodePoint CR_In_Latin_Extended_C[] = {
-	1,
-	0x2c60, 0x2c7f,
-}; /* CR_In_Latin_Extended_C */
-
-/* 'In_Coptic': Block */
-static const OnigCodePoint CR_In_Coptic[] = {
-	1,
-	0x2c80, 0x2cff,
-}; /* CR_In_Coptic */
-
-/* 'In_Georgian_Supplement': Block */
-static const OnigCodePoint CR_In_Georgian_Supplement[] = {
-	1,
-	0x2d00, 0x2d2f,
-}; /* CR_In_Georgian_Supplement */
-
-/* 'In_Tifinagh': Block */
-static const OnigCodePoint CR_In_Tifinagh[] = {
-	1,
-	0x2d30, 0x2d7f,
-}; /* CR_In_Tifinagh */
-
-/* 'In_Ethiopic_Extended': Block */
-static const OnigCodePoint CR_In_Ethiopic_Extended[] = {
-	1,
-	0x2d80, 0x2ddf,
-}; /* CR_In_Ethiopic_Extended */
-
-/* 'In_Cyrillic_Extended_A': Block */
-static const OnigCodePoint CR_In_Cyrillic_Extended_A[] = {
-	1,
-	0x2de0, 0x2dff,
-}; /* CR_In_Cyrillic_Extended_A */
-
-/* 'In_Supplemental_Punctuation': Block */
-static const OnigCodePoint CR_In_Supplemental_Punctuation[] = {
-	1,
-	0x2e00, 0x2e7f,
-}; /* CR_In_Supplemental_Punctuation */
-
-/* 'In_CJK_Radicals_Supplement': Block */
-static const OnigCodePoint CR_In_CJK_Radicals_Supplement[] = {
-	1,
-	0x2e80, 0x2eff,
-}; /* CR_In_CJK_Radicals_Supplement */
-
-/* 'In_Kangxi_Radicals': Block */
-static const OnigCodePoint CR_In_Kangxi_Radicals[] = {
-	1,
-	0x2f00, 0x2fdf,
-}; /* CR_In_Kangxi_Radicals */
-
-/* 'In_Ideographic_Description_Characters': Block */
-static const OnigCodePoint CR_In_Ideographic_Description_Characters[] = {
-	1,
-	0x2ff0, 0x2fff,
-}; /* CR_In_Ideographic_Description_Characters */
-
-/* 'In_CJK_Symbols_and_Punctuation': Block */
-static const OnigCodePoint CR_In_CJK_Symbols_and_Punctuation[] = {
-	1,
-	0x3000, 0x303f,
-}; /* CR_In_CJK_Symbols_and_Punctuation */
-
-/* 'In_Hiragana': Block */
-static const OnigCodePoint CR_In_Hiragana[] = {
-	1,
-	0x3040, 0x309f,
-}; /* CR_In_Hiragana */
-
-/* 'In_Katakana': Block */
-static const OnigCodePoint CR_In_Katakana[] = {
-	1,
-	0x30a0, 0x30ff,
-}; /* CR_In_Katakana */
-
-/* 'In_Bopomofo': Block */
-static const OnigCodePoint CR_In_Bopomofo[] = {
-	1,
-	0x3100, 0x312f,
-}; /* CR_In_Bopomofo */
-
-/* 'In_Hangul_Compatibility_Jamo': Block */
-static const OnigCodePoint CR_In_Hangul_Compatibility_Jamo[] = {
-	1,
-	0x3130, 0x318f,
-}; /* CR_In_Hangul_Compatibility_Jamo */
-
-/* 'In_Kanbun': Block */
-static const OnigCodePoint CR_In_Kanbun[] = {
-	1,
-	0x3190, 0x319f,
-}; /* CR_In_Kanbun */
-
-/* 'In_Bopomofo_Extended': Block */
-static const OnigCodePoint CR_In_Bopomofo_Extended[] = {
-	1,
-	0x31a0, 0x31bf,
-}; /* CR_In_Bopomofo_Extended */
-
-/* 'In_CJK_Strokes': Block */
-static const OnigCodePoint CR_In_CJK_Strokes[] = {
-	1,
-	0x31c0, 0x31ef,
-}; /* CR_In_CJK_Strokes */
-
-/* 'In_Katakana_Phonetic_Extensions': Block */
-static const OnigCodePoint CR_In_Katakana_Phonetic_Extensions[] = {
-	1,
-	0x31f0, 0x31ff,
-}; /* CR_In_Katakana_Phonetic_Extensions */
-
-/* 'In_Enclosed_CJK_Letters_and_Months': Block */
-static const OnigCodePoint CR_In_Enclosed_CJK_Letters_and_Months[] = {
-	1,
-	0x3200, 0x32ff,
-}; /* CR_In_Enclosed_CJK_Letters_and_Months */
-
-/* 'In_CJK_Compatibility': Block */
-static const OnigCodePoint CR_In_CJK_Compatibility[] = {
-	1,
-	0x3300, 0x33ff,
-}; /* CR_In_CJK_Compatibility */
-
-/* 'In_CJK_Unified_Ideographs_Extension_A': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_A[] = {
-	1,
-	0x3400, 0x4dbf,
-}; /* CR_In_CJK_Unified_Ideographs_Extension_A */
-
-/* 'In_Yijing_Hexagram_Symbols': Block */
-static const OnigCodePoint CR_In_Yijing_Hexagram_Symbols[] = {
-	1,
-	0x4dc0, 0x4dff,
-}; /* CR_In_Yijing_Hexagram_Symbols */
-
-/* 'In_CJK_Unified_Ideographs': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs[] = {
-	1,
-	0x4e00, 0x9fff,
-}; /* CR_In_CJK_Unified_Ideographs */
-
-/* 'In_Yi_Syllables': Block */
-static const OnigCodePoint CR_In_Yi_Syllables[] = {
-	1,
-	0xa000, 0xa48f,
-}; /* CR_In_Yi_Syllables */
-
-/* 'In_Yi_Radicals': Block */
-static const OnigCodePoint CR_In_Yi_Radicals[] = {
-	1,
-	0xa490, 0xa4cf,
-}; /* CR_In_Yi_Radicals */
-
-/* 'In_Lisu': Block */
-#define CR_In_Lisu CR_Lisu
-
-/* 'In_Vai': Block */
-static const OnigCodePoint CR_In_Vai[] = {
-	1,
-	0xa500, 0xa63f,
-}; /* CR_In_Vai */
-
-/* 'In_Cyrillic_Extended_B': Block */
-static const OnigCodePoint CR_In_Cyrillic_Extended_B[] = {
-	1,
-	0xa640, 0xa69f,
-}; /* CR_In_Cyrillic_Extended_B */
-
-/* 'In_Bamum': Block */
-static const OnigCodePoint CR_In_Bamum[] = {
-	1,
-	0xa6a0, 0xa6ff,
-}; /* CR_In_Bamum */
-
-/* 'In_Modifier_Tone_Letters': Block */
-static const OnigCodePoint CR_In_Modifier_Tone_Letters[] = {
-	1,
-	0xa700, 0xa71f,
-}; /* CR_In_Modifier_Tone_Letters */
-
-/* 'In_Latin_Extended_D': Block */
-static const OnigCodePoint CR_In_Latin_Extended_D[] = {
-	1,
-	0xa720, 0xa7ff,
-}; /* CR_In_Latin_Extended_D */
-
-/* 'In_Syloti_Nagri': Block */
-static const OnigCodePoint CR_In_Syloti_Nagri[] = {
-	1,
-	0xa800, 0xa82f,
-}; /* CR_In_Syloti_Nagri */
-
-/* 'In_Common_Indic_Number_Forms': Block */
-static const OnigCodePoint CR_In_Common_Indic_Number_Forms[] = {
-	1,
-	0xa830, 0xa83f,
-}; /* CR_In_Common_Indic_Number_Forms */
-
-/* 'In_Phags_pa': Block */
-static const OnigCodePoint CR_In_Phags_pa[] = {
-	1,
-	0xa840, 0xa87f,
-}; /* CR_In_Phags_pa */
-
-/* 'In_Saurashtra': Block */
-static const OnigCodePoint CR_In_Saurashtra[] = {
-	1,
-	0xa880, 0xa8df,
-}; /* CR_In_Saurashtra */
-
-/* 'In_Devanagari_Extended': Block */
-static const OnigCodePoint CR_In_Devanagari_Extended[] = {
-	1,
-	0xa8e0, 0xa8ff,
-}; /* CR_In_Devanagari_Extended */
-
-/* 'In_Kayah_Li': Block */
-#define CR_In_Kayah_Li CR_Kayah_Li
-
-/* 'In_Rejang': Block */
-static const OnigCodePoint CR_In_Rejang[] = {
-	1,
-	0xa930, 0xa95f,
-}; /* CR_In_Rejang */
-
-/* 'In_Hangul_Jamo_Extended_A': Block */
-static const OnigCodePoint CR_In_Hangul_Jamo_Extended_A[] = {
-	1,
-	0xa960, 0xa97f,
-}; /* CR_In_Hangul_Jamo_Extended_A */
-
-/* 'In_Javanese': Block */
-static const OnigCodePoint CR_In_Javanese[] = {
-	1,
-	0xa980, 0xa9df,
-}; /* CR_In_Javanese */
-
-/* 'In_Cham': Block */
-static const OnigCodePoint CR_In_Cham[] = {
-	1,
-	0xaa00, 0xaa5f,
-}; /* CR_In_Cham */
-
-/* 'In_Myanmar_Extended_A': Block */
-static const OnigCodePoint CR_In_Myanmar_Extended_A[] = {
-	1,
-	0xaa60, 0xaa7f,
-}; /* CR_In_Myanmar_Extended_A */
-
-/* 'In_Tai_Viet': Block */
-static const OnigCodePoint CR_In_Tai_Viet[] = {
-	1,
-	0xaa80, 0xaadf,
-}; /* CR_In_Tai_Viet */
-
-/* 'In_Meetei_Mayek_Extensions': Block */
-static const OnigCodePoint CR_In_Meetei_Mayek_Extensions[] = {
-	1,
-	0xaae0, 0xaaff,
-}; /* CR_In_Meetei_Mayek_Extensions */
-
-/* 'In_Ethiopic_Extended_A': Block */
-static const OnigCodePoint CR_In_Ethiopic_Extended_A[] = {
-	1,
-	0xab00, 0xab2f,
-}; /* CR_In_Ethiopic_Extended_A */
-
-/* 'In_Meetei_Mayek': Block */
-static const OnigCodePoint CR_In_Meetei_Mayek[] = {
-	1,
-	0xabc0, 0xabff,
-}; /* CR_In_Meetei_Mayek */
-
-/* 'In_Hangul_Syllables': Block */
-static const OnigCodePoint CR_In_Hangul_Syllables[] = {
-	1,
-	0xac00, 0xd7af,
-}; /* CR_In_Hangul_Syllables */
-
-/* 'In_Hangul_Jamo_Extended_B': Block */
-static const OnigCodePoint CR_In_Hangul_Jamo_Extended_B[] = {
-	1,
-	0xd7b0, 0xd7ff,
-}; /* CR_In_Hangul_Jamo_Extended_B */
-
-/* 'In_High_Surrogates': Block */
-static const OnigCodePoint CR_In_High_Surrogates[] = {
-	1,
-	0xd800, 0xdb7f,
-}; /* CR_In_High_Surrogates */
-
-/* 'In_High_Private_Use_Surrogates': Block */
-static const OnigCodePoint CR_In_High_Private_Use_Surrogates[] = {
-	1,
-	0xdb80, 0xdbff,
-}; /* CR_In_High_Private_Use_Surrogates */
-
-/* 'In_Low_Surrogates': Block */
-static const OnigCodePoint CR_In_Low_Surrogates[] = {
-	1,
-	0xdc00, 0xdfff,
-}; /* CR_In_Low_Surrogates */
-
-/* 'In_Private_Use_Area': Block */
-static const OnigCodePoint CR_In_Private_Use_Area[] = {
-	1,
-	0xe000, 0xf8ff,
-}; /* CR_In_Private_Use_Area */
-
-/* 'In_CJK_Compatibility_Ideographs': Block */
-static const OnigCodePoint CR_In_CJK_Compatibility_Ideographs[] = {
-	1,
-	0xf900, 0xfaff,
-}; /* CR_In_CJK_Compatibility_Ideographs */
-
-/* 'In_Alphabetic_Presentation_Forms': Block */
-static const OnigCodePoint CR_In_Alphabetic_Presentation_Forms[] = {
-	1,
-	0xfb00, 0xfb4f,
-}; /* CR_In_Alphabetic_Presentation_Forms */
-
-/* 'In_Arabic_Presentation_Forms_A': Block */
-static const OnigCodePoint CR_In_Arabic_Presentation_Forms_A[] = {
-	1,
-	0xfb50, 0xfdff,
-}; /* CR_In_Arabic_Presentation_Forms_A */
-
-/* 'In_Variation_Selectors': Block */
-static const OnigCodePoint CR_In_Variation_Selectors[] = {
-	1,
-	0xfe00, 0xfe0f,
-}; /* CR_In_Variation_Selectors */
-
-/* 'In_Vertical_Forms': Block */
-static const OnigCodePoint CR_In_Vertical_Forms[] = {
-	1,
-	0xfe10, 0xfe1f,
-}; /* CR_In_Vertical_Forms */
-
-/* 'In_Combining_Half_Marks': Block */
-static const OnigCodePoint CR_In_Combining_Half_Marks[] = {
-	1,
-	0xfe20, 0xfe2f,
-}; /* CR_In_Combining_Half_Marks */
-
-/* 'In_CJK_Compatibility_Forms': Block */
-static const OnigCodePoint CR_In_CJK_Compatibility_Forms[] = {
-	1,
-	0xfe30, 0xfe4f,
-}; /* CR_In_CJK_Compatibility_Forms */
-
-/* 'In_Small_Form_Variants': Block */
-static const OnigCodePoint CR_In_Small_Form_Variants[] = {
-	1,
-	0xfe50, 0xfe6f,
-}; /* CR_In_Small_Form_Variants */
-
-/* 'In_Arabic_Presentation_Forms_B': Block */
-static const OnigCodePoint CR_In_Arabic_Presentation_Forms_B[] = {
-	1,
-	0xfe70, 0xfeff,
-}; /* CR_In_Arabic_Presentation_Forms_B */
-
-/* 'In_Halfwidth_and_Fullwidth_Forms': Block */
-static const OnigCodePoint CR_In_Halfwidth_and_Fullwidth_Forms[] = {
-	1,
-	0xff00, 0xffef,
-}; /* CR_In_Halfwidth_and_Fullwidth_Forms */
-
-/* 'In_Specials': Block */
-static const OnigCodePoint CR_In_Specials[] = {
-	1,
-	0xfff0, 0xffff,
-}; /* CR_In_Specials */
-
-/* 'In_Linear_B_Syllabary': Block */
-static const OnigCodePoint CR_In_Linear_B_Syllabary[] = {
-	1,
-	0x10000, 0x1007f,
-}; /* CR_In_Linear_B_Syllabary */
-
-/* 'In_Linear_B_Ideograms': Block */
-static const OnigCodePoint CR_In_Linear_B_Ideograms[] = {
-	1,
-	0x10080, 0x100ff,
-}; /* CR_In_Linear_B_Ideograms */
-
-/* 'In_Aegean_Numbers': Block */
-static const OnigCodePoint CR_In_Aegean_Numbers[] = {
-	1,
-	0x10100, 0x1013f,
-}; /* CR_In_Aegean_Numbers */
-
-/* 'In_Ancient_Greek_Numbers': Block */
-static const OnigCodePoint CR_In_Ancient_Greek_Numbers[] = {
-	1,
-	0x10140, 0x1018f,
-}; /* CR_In_Ancient_Greek_Numbers */
-
-/* 'In_Ancient_Symbols': Block */
-static const OnigCodePoint CR_In_Ancient_Symbols[] = {
-	1,
-	0x10190, 0x101cf,
-}; /* CR_In_Ancient_Symbols */
-
-/* 'In_Phaistos_Disc': Block */
-static const OnigCodePoint CR_In_Phaistos_Disc[] = {
-	1,
-	0x101d0, 0x101ff,
-}; /* CR_In_Phaistos_Disc */
-
-/* 'In_Lycian': Block */
-static const OnigCodePoint CR_In_Lycian[] = {
-	1,
-	0x10280, 0x1029f,
-}; /* CR_In_Lycian */
-
-/* 'In_Carian': Block */
-static const OnigCodePoint CR_In_Carian[] = {
-	1,
-	0x102a0, 0x102df,
-}; /* CR_In_Carian */
-
-/* 'In_Old_Italic': Block */
-static const OnigCodePoint CR_In_Old_Italic[] = {
-	1,
-	0x10300, 0x1032f,
-}; /* CR_In_Old_Italic */
-
-/* 'In_Gothic': Block */
-static const OnigCodePoint CR_In_Gothic[] = {
-	1,
-	0x10330, 0x1034f,
-}; /* CR_In_Gothic */
-
-/* 'In_Ugaritic': Block */
-static const OnigCodePoint CR_In_Ugaritic[] = {
-	1,
-	0x10380, 0x1039f,
-}; /* CR_In_Ugaritic */
-
-/* 'In_Old_Persian': Block */
-static const OnigCodePoint CR_In_Old_Persian[] = {
-	1,
-	0x103a0, 0x103df,
-}; /* CR_In_Old_Persian */
-
-/* 'In_Deseret': Block */
-#define CR_In_Deseret CR_Deseret
-
-/* 'In_Shavian': Block */
-#define CR_In_Shavian CR_Shavian
-
-/* 'In_Osmanya': Block */
-static const OnigCodePoint CR_In_Osmanya[] = {
-	1,
-	0x10480, 0x104af,
-}; /* CR_In_Osmanya */
-
-/* 'In_Cypriot_Syllabary': Block */
-static const OnigCodePoint CR_In_Cypriot_Syllabary[] = {
-	1,
-	0x10800, 0x1083f,
-}; /* CR_In_Cypriot_Syllabary */
-
-/* 'In_Imperial_Aramaic': Block */
-static const OnigCodePoint CR_In_Imperial_Aramaic[] = {
-	1,
-	0x10840, 0x1085f,
-}; /* CR_In_Imperial_Aramaic */
-
-/* 'In_Phoenician': Block */
-static const OnigCodePoint CR_In_Phoenician[] = {
-	1,
-	0x10900, 0x1091f,
-}; /* CR_In_Phoenician */
-
-/* 'In_Lydian': Block */
-static const OnigCodePoint CR_In_Lydian[] = {
-	1,
-	0x10920, 0x1093f,
-}; /* CR_In_Lydian */
-
-/* 'In_Meroitic_Hieroglyphs': Block */
-#define CR_In_Meroitic_Hieroglyphs CR_Meroitic_Hieroglyphs
-
-/* 'In_Meroitic_Cursive': Block */
-static const OnigCodePoint CR_In_Meroitic_Cursive[] = {
-	1,
-	0x109a0, 0x109ff,
-}; /* CR_In_Meroitic_Cursive */
-
-/* 'In_Kharoshthi': Block */
-static const OnigCodePoint CR_In_Kharoshthi[] = {
-	1,
-	0x10a00, 0x10a5f,
-}; /* CR_In_Kharoshthi */
-
-/* 'In_Old_South_Arabian': Block */
-#define CR_In_Old_South_Arabian CR_Old_South_Arabian
-
-/* 'In_Avestan': Block */
-static const OnigCodePoint CR_In_Avestan[] = {
-	1,
-	0x10b00, 0x10b3f,
-}; /* CR_In_Avestan */
-
-/* 'In_Inscriptional_Parthian': Block */
-static const OnigCodePoint CR_In_Inscriptional_Parthian[] = {
-	1,
-	0x10b40, 0x10b5f,
-}; /* CR_In_Inscriptional_Parthian */
-
-/* 'In_Inscriptional_Pahlavi': Block */
-static const OnigCodePoint CR_In_Inscriptional_Pahlavi[] = {
-	1,
-	0x10b60, 0x10b7f,
-}; /* CR_In_Inscriptional_Pahlavi */
-
-/* 'In_Old_Turkic': Block */
-static const OnigCodePoint CR_In_Old_Turkic[] = {
-	1,
-	0x10c00, 0x10c4f,
-}; /* CR_In_Old_Turkic */
-
-/* 'In_Rumi_Numeral_Symbols': Block */
-static const OnigCodePoint CR_In_Rumi_Numeral_Symbols[] = {
-	1,
-	0x10e60, 0x10e7f,
-}; /* CR_In_Rumi_Numeral_Symbols */
-
-/* 'In_Brahmi': Block */
-static const OnigCodePoint CR_In_Brahmi[] = {
-	1,
-	0x11000, 0x1107f,
-}; /* CR_In_Brahmi */
-
-/* 'In_Kaithi': Block */
-static const OnigCodePoint CR_In_Kaithi[] = {
-	1,
-	0x11080, 0x110cf,
-}; /* CR_In_Kaithi */
-
-/* 'In_Sora_Sompeng': Block */
-static const OnigCodePoint CR_In_Sora_Sompeng[] = {
-	1,
-	0x110d0, 0x110ff,
-}; /* CR_In_Sora_Sompeng */
-
-/* 'In_Chakma': Block */
-static const OnigCodePoint CR_In_Chakma[] = {
-	1,
-	0x11100, 0x1114f,
-}; /* CR_In_Chakma */
-
-/* 'In_Sharada': Block */
-static const OnigCodePoint CR_In_Sharada[] = {
-	1,
-	0x11180, 0x111df,
-}; /* CR_In_Sharada */
-
-/* 'In_Takri': Block */
-static const OnigCodePoint CR_In_Takri[] = {
-	1,
-	0x11680, 0x116cf,
-}; /* CR_In_Takri */
-
-/* 'In_Cuneiform': Block */
-static const OnigCodePoint CR_In_Cuneiform[] = {
-	1,
-	0x12000, 0x123ff,
-}; /* CR_In_Cuneiform */
-
-/* 'In_Cuneiform_Numbers_and_Punctuation': Block */
-static const OnigCodePoint CR_In_Cuneiform_Numbers_and_Punctuation[] = {
-	1,
-	0x12400, 0x1247f,
-}; /* CR_In_Cuneiform_Numbers_and_Punctuation */
-
-/* 'In_Egyptian_Hieroglyphs': Block */
-static const OnigCodePoint CR_In_Egyptian_Hieroglyphs[] = {
-	1,
-	0x13000, 0x1342f,
-}; /* CR_In_Egyptian_Hieroglyphs */
-
-/* 'In_Bamum_Supplement': Block */
-static const OnigCodePoint CR_In_Bamum_Supplement[] = {
-	1,
-	0x16800, 0x16a3f,
-}; /* CR_In_Bamum_Supplement */
-
-/* 'In_Miao': Block */
-static const OnigCodePoint CR_In_Miao[] = {
-	1,
-	0x16f00, 0x16f9f,
-}; /* CR_In_Miao */
-
-/* 'In_Kana_Supplement': Block */
-static const OnigCodePoint CR_In_Kana_Supplement[] = {
-	1,
-	0x1b000, 0x1b0ff,
-}; /* CR_In_Kana_Supplement */
-
-/* 'In_Byzantine_Musical_Symbols': Block */
-static const OnigCodePoint CR_In_Byzantine_Musical_Symbols[] = {
-	1,
-	0x1d000, 0x1d0ff,
-}; /* CR_In_Byzantine_Musical_Symbols */
-
-/* 'In_Musical_Symbols': Block */
-static const OnigCodePoint CR_In_Musical_Symbols[] = {
-	1,
-	0x1d100, 0x1d1ff,
-}; /* CR_In_Musical_Symbols */
-
-/* 'In_Ancient_Greek_Musical_Notation': Block */
-static const OnigCodePoint CR_In_Ancient_Greek_Musical_Notation[] = {
-	1,
-	0x1d200, 0x1d24f,
-}; /* CR_In_Ancient_Greek_Musical_Notation */
-
-/* 'In_Tai_Xuan_Jing_Symbols': Block */
-static const OnigCodePoint CR_In_Tai_Xuan_Jing_Symbols[] = {
-	1,
-	0x1d300, 0x1d35f,
-}; /* CR_In_Tai_Xuan_Jing_Symbols */
-
-/* 'In_Counting_Rod_Numerals': Block */
-static const OnigCodePoint CR_In_Counting_Rod_Numerals[] = {
-	1,
-	0x1d360, 0x1d37f,
-}; /* CR_In_Counting_Rod_Numerals */
-
-/* 'In_Mathematical_Alphanumeric_Symbols': Block */
-static const OnigCodePoint CR_In_Mathematical_Alphanumeric_Symbols[] = {
-	1,
-	0x1d400, 0x1d7ff,
-}; /* CR_In_Mathematical_Alphanumeric_Symbols */
-
-/* 'In_Arabic_Mathematical_Alphabetic_Symbols': Block */
-static const OnigCodePoint CR_In_Arabic_Mathematical_Alphabetic_Symbols[] = {
-	1,
-	0x1ee00, 0x1eeff,
-}; /* CR_In_Arabic_Mathematical_Alphabetic_Symbols */
-
-/* 'In_Mahjong_Tiles': Block */
-static const OnigCodePoint CR_In_Mahjong_Tiles[] = {
-	1,
-	0x1f000, 0x1f02f,
-}; /* CR_In_Mahjong_Tiles */
-
-/* 'In_Domino_Tiles': Block */
-static const OnigCodePoint CR_In_Domino_Tiles[] = {
-	1,
-	0x1f030, 0x1f09f,
-}; /* CR_In_Domino_Tiles */
-
-/* 'In_Playing_Cards': Block */
-static const OnigCodePoint CR_In_Playing_Cards[] = {
-	1,
-	0x1f0a0, 0x1f0ff,
-}; /* CR_In_Playing_Cards */
-
-/* 'In_Enclosed_Alphanumeric_Supplement': Block */
-static const OnigCodePoint CR_In_Enclosed_Alphanumeric_Supplement[] = {
-	1,
-	0x1f100, 0x1f1ff,
-}; /* CR_In_Enclosed_Alphanumeric_Supplement */
-
-/* 'In_Enclosed_Ideographic_Supplement': Block */
-static const OnigCodePoint CR_In_Enclosed_Ideographic_Supplement[] = {
-	1,
-	0x1f200, 0x1f2ff,
-}; /* CR_In_Enclosed_Ideographic_Supplement */
-
-/* 'In_Miscellaneous_Symbols_And_Pictographs': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Symbols_And_Pictographs[] = {
-	1,
-	0x1f300, 0x1f5ff,
-}; /* CR_In_Miscellaneous_Symbols_And_Pictographs */
-
-/* 'In_Emoticons': Block */
-static const OnigCodePoint CR_In_Emoticons[] = {
-	1,
-	0x1f600, 0x1f64f,
-}; /* CR_In_Emoticons */
-
-/* 'In_Transport_And_Map_Symbols': Block */
-static const OnigCodePoint CR_In_Transport_And_Map_Symbols[] = {
-	1,
-	0x1f680, 0x1f6ff,
-}; /* CR_In_Transport_And_Map_Symbols */
-
-/* 'In_Alchemical_Symbols': Block */
-static const OnigCodePoint CR_In_Alchemical_Symbols[] = {
-	1,
-	0x1f700, 0x1f77f,
-}; /* CR_In_Alchemical_Symbols */
-
-/* 'In_CJK_Unified_Ideographs_Extension_B': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_B[] = {
-	1,
-	0x20000, 0x2a6df,
-}; /* CR_In_CJK_Unified_Ideographs_Extension_B */
-
-/* 'In_CJK_Unified_Ideographs_Extension_C': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_C[] = {
-	1,
-	0x2a700, 0x2b73f,
-}; /* CR_In_CJK_Unified_Ideographs_Extension_C */
-
-/* 'In_CJK_Unified_Ideographs_Extension_D': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_D[] = {
-	1,
-	0x2b740, 0x2b81f,
-}; /* CR_In_CJK_Unified_Ideographs_Extension_D */
-
-/* 'In_CJK_Compatibility_Ideographs_Supplement': Block */
-static const OnigCodePoint CR_In_CJK_Compatibility_Ideographs_Supplement[] = {
-	1,
-	0x2f800, 0x2fa1f,
-}; /* CR_In_CJK_Compatibility_Ideographs_Supplement */
-
-/* 'In_Tags': Block */
-static const OnigCodePoint CR_In_Tags[] = {
-	1,
-	0xe0000, 0xe007f,
-}; /* CR_In_Tags */
-
-/* 'In_Variation_Selectors_Supplement': Block */
-static const OnigCodePoint CR_In_Variation_Selectors_Supplement[] = {
-	1,
-	0xe0100, 0xe01ef,
-}; /* CR_In_Variation_Selectors_Supplement */
-
-/* 'In_Supplementary_Private_Use_Area_A': Block */
-static const OnigCodePoint CR_In_Supplementary_Private_Use_Area_A[] = {
-	1,
-	0xf0000, 0xfffff,
-}; /* CR_In_Supplementary_Private_Use_Area_A */
-
-/* 'In_Supplementary_Private_Use_Area_B': Block */
-static const OnigCodePoint CR_In_Supplementary_Private_Use_Area_B[] = {
-	1,
-	0x100000, 0x10ffff,
-}; /* CR_In_Supplementary_Private_Use_Area_B */
-
-/* 'In_No_Block': Block */
-static const OnigCodePoint CR_In_No_Block[] = {
-	36,
-	0x0860, 0x089f,
-	0x1ab0, 0x1aff,
-	0x1c80, 0x1cbf,
-	0x2fe0, 0x2fef,
-	0xa9e0, 0xa9ff,
-	0xab30, 0xabbf,
-	0x10200, 0x1027f,
-	0x102e0, 0x102ff,
-	0x10350, 0x1037f,
-	0x103e0, 0x103ff,
-	0x104b0, 0x107ff,
-	0x10860, 0x108ff,
-	0x10940, 0x1097f,
-	0x10a80, 0x10aff,
-	0x10b80, 0x10bff,
-	0x10c50, 0x10e5f,
-	0x10e80, 0x10fff,
-	0x11150, 0x1117f,
-	0x111e0, 0x1167f,
-	0x116d0, 0x11fff,
-	0x12480, 0x12fff,
-	0x13430, 0x167ff,
-	0x16a40, 0x16eff,
-	0x16fa0, 0x1afff,
-	0x1b100, 0x1cfff,
-	0x1d250, 0x1d2ff,
-	0x1d380, 0x1d3ff,
-	0x1d800, 0x1edff,
-	0x1ef00, 0x1efff,
-	0x1f650, 0x1f67f,
-	0x1f780, 0x1ffff,
-	0x2a6e0, 0x2a6ff,
-	0x2b820, 0x2f7ff,
-	0x2fa20, 0xdffff,
-	0xe0080, 0xe00ff,
-	0xe01f0, 0xeffff,
-}; /* CR_In_No_Block */
-#endif /* USE_UNICODE_PROPERTIES */
-
-static const OnigCodePoint* const CodeRanges[] = {
-  CR_NEWLINE,
-  CR_Alpha,
-  CR_Blank,
-  CR_Cntrl,
-  CR_Digit,
-  CR_Graph,
-  CR_Lower,
-  CR_Print,
-  CR_Punct,
-  CR_Space,
-  CR_Upper,
-  CR_XDigit,
-  CR_Word,
-  CR_Alnum,
-  CR_ASCII,
-#ifdef USE_UNICODE_PROPERTIES
-  CR_Any,
-  CR_Assigned,
-  CR_C,
-  CR_Cc,
-  CR_Cf,
-  CR_Cn,
-  CR_Co,
-  CR_Cs,
-  CR_L,
-  CR_LC,
-  CR_Ll,
-  CR_Lm,
-  CR_Lo,
-  CR_Lt,
-  CR_Lu,
-  CR_M,
-  CR_Mc,
-  CR_Me,
-  CR_Mn,
-  CR_N,
-  CR_Nd,
-  CR_Nl,
-  CR_No,
-  CR_P,
-  CR_Pc,
-  CR_Pd,
-  CR_Pe,
-  CR_Pf,
-  CR_Pi,
-  CR_Po,
-  CR_Ps,
-  CR_S,
-  CR_Sc,
-  CR_Sk,
-  CR_Sm,
-  CR_So,
-  CR_Z,
-  CR_Zl,
-  CR_Zp,
-  CR_Zs,
-  CR_Math,
-  CR_Alphabetic,
-  CR_Lowercase,
-  CR_Uppercase,
-  CR_Cased,
-  CR_Case_Ignorable,
-  CR_Changes_When_Lowercased,
-  CR_Changes_When_Uppercased,
-  CR_Changes_When_Titlecased,
-  CR_Changes_When_Casefolded,
-  CR_Changes_When_Casemapped,
-  CR_ID_Start,
-  CR_ID_Continue,
-  CR_XID_Start,
-  CR_XID_Continue,
-  CR_Default_Ignorable_Code_Point,
-  CR_Grapheme_Extend,
-  CR_Grapheme_Base,
-  CR_Grapheme_Link,
-  CR_Common,
-  CR_Latin,
-  CR_Greek,
-  CR_Cyrillic,
-  CR_Armenian,
-  CR_Hebrew,
-  CR_Arabic,
-  CR_Syriac,
-  CR_Thaana,
-  CR_Devanagari,
-  CR_Bengali,
-  CR_Gurmukhi,
-  CR_Gujarati,
-  CR_Oriya,
-  CR_Tamil,
-  CR_Telugu,
-  CR_Kannada,
-  CR_Malayalam,
-  CR_Sinhala,
-  CR_Thai,
-  CR_Lao,
-  CR_Tibetan,
-  CR_Myanmar,
-  CR_Georgian,
-  CR_Hangul,
-  CR_Ethiopic,
-  CR_Cherokee,
-  CR_Canadian_Aboriginal,
-  CR_Ogham,
-  CR_Runic,
-  CR_Khmer,
-  CR_Mongolian,
-  CR_Hiragana,
-  CR_Katakana,
-  CR_Bopomofo,
-  CR_Han,
-  CR_Yi,
-  CR_Old_Italic,
-  CR_Gothic,
-  CR_Deseret,
-  CR_Inherited,
-  CR_Tagalog,
-  CR_Hanunoo,
-  CR_Buhid,
-  CR_Tagbanwa,
-  CR_Limbu,
-  CR_Tai_Le,
-  CR_Linear_B,
-  CR_Ugaritic,
-  CR_Shavian,
-  CR_Osmanya,
-  CR_Cypriot,
-  CR_Braille,
-  CR_Buginese,
-  CR_Coptic,
-  CR_New_Tai_Lue,
-  CR_Glagolitic,
-  CR_Tifinagh,
-  CR_Syloti_Nagri,
-  CR_Old_Persian,
-  CR_Kharoshthi,
-  CR_Balinese,
-  CR_Cuneiform,
-  CR_Phoenician,
-  CR_Phags_Pa,
-  CR_Nko,
-  CR_Sundanese,
-  CR_Lepcha,
-  CR_Ol_Chiki,
-  CR_Vai,
-  CR_Saurashtra,
-  CR_Kayah_Li,
-  CR_Rejang,
-  CR_Lycian,
-  CR_Carian,
-  CR_Lydian,
-  CR_Cham,
-  CR_Tai_Tham,
-  CR_Tai_Viet,
-  CR_Avestan,
-  CR_Egyptian_Hieroglyphs,
-  CR_Samaritan,
-  CR_Lisu,
-  CR_Bamum,
-  CR_Javanese,
-  CR_Meetei_Mayek,
-  CR_Imperial_Aramaic,
-  CR_Old_South_Arabian,
-  CR_Inscriptional_Parthian,
-  CR_Inscriptional_Pahlavi,
-  CR_Old_Turkic,
-  CR_Kaithi,
-  CR_Batak,
-  CR_Brahmi,
-  CR_Mandaic,
-  CR_Chakma,
-  CR_Meroitic_Cursive,
-  CR_Meroitic_Hieroglyphs,
-  CR_Miao,
-  CR_Sharada,
-  CR_Sora_Sompeng,
-  CR_Takri,
-  CR_White_Space,
-  CR_Bidi_Control,
-  CR_Join_Control,
-  CR_Dash,
-  CR_Hyphen,
-  CR_Quotation_Mark,
-  CR_Terminal_Punctuation,
-  CR_Other_Math,
-  CR_Hex_Digit,
-  CR_ASCII_Hex_Digit,
-  CR_Other_Alphabetic,
-  CR_Ideographic,
-  CR_Diacritic,
-  CR_Extender,
-  CR_Other_Lowercase,
-  CR_Other_Uppercase,
-  CR_Noncharacter_Code_Point,
-  CR_Other_Grapheme_Extend,
-  CR_IDS_Binary_Operator,
-  CR_IDS_Trinary_Operator,
-  CR_Radical,
-  CR_Unified_Ideograph,
-  CR_Other_Default_Ignorable_Code_Point,
-  CR_Deprecated,
-  CR_Soft_Dotted,
-  CR_Logical_Order_Exception,
-  CR_Other_ID_Start,
-  CR_Other_ID_Continue,
-  CR_STerm,
-  CR_Variation_Selector,
-  CR_Pattern_White_Space,
-  CR_Pattern_Syntax,
-  CR_Unknown,
-  CR_Age_1_1,
-  CR_Age_2_0,
-  CR_Age_2_1,
-  CR_Age_3_0,
-  CR_Age_3_1,
-  CR_Age_3_2,
-  CR_Age_4_0,
-  CR_Age_4_1,
-  CR_Age_5_0,
-  CR_Age_5_1,
-  CR_Age_5_2,
-  CR_Age_6_0,
-  CR_Age_6_1,
-  CR_In_Basic_Latin,
-  CR_In_Latin_1_Supplement,
-  CR_In_Latin_Extended_A,
-  CR_In_Latin_Extended_B,
-  CR_In_IPA_Extensions,
-  CR_In_Spacing_Modifier_Letters,
-  CR_In_Combining_Diacritical_Marks,
-  CR_In_Greek_and_Coptic,
-  CR_In_Cyrillic,
-  CR_In_Cyrillic_Supplement,
-  CR_In_Armenian,
-  CR_In_Hebrew,
-  CR_In_Arabic,
-  CR_In_Syriac,
-  CR_In_Arabic_Supplement,
-  CR_In_Thaana,
-  CR_In_NKo,
-  CR_In_Samaritan,
-  CR_In_Mandaic,
-  CR_In_Arabic_Extended_A,
-  CR_In_Devanagari,
-  CR_In_Bengali,
-  CR_In_Gurmukhi,
-  CR_In_Gujarati,
-  CR_In_Oriya,
-  CR_In_Tamil,
-  CR_In_Telugu,
-  CR_In_Kannada,
-  CR_In_Malayalam,
-  CR_In_Sinhala,
-  CR_In_Thai,
-  CR_In_Lao,
-  CR_In_Tibetan,
-  CR_In_Myanmar,
-  CR_In_Georgian,
-  CR_In_Hangul_Jamo,
-  CR_In_Ethiopic,
-  CR_In_Ethiopic_Supplement,
-  CR_In_Cherokee,
-  CR_In_Unified_Canadian_Aboriginal_Syllabics,
-  CR_In_Ogham,
-  CR_In_Runic,
-  CR_In_Tagalog,
-  CR_In_Hanunoo,
-  CR_In_Buhid,
-  CR_In_Tagbanwa,
-  CR_In_Khmer,
-  CR_In_Mongolian,
-  CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended,
-  CR_In_Limbu,
-  CR_In_Tai_Le,
-  CR_In_New_Tai_Lue,
-  CR_In_Khmer_Symbols,
-  CR_In_Buginese,
-  CR_In_Tai_Tham,
-  CR_In_Balinese,
-  CR_In_Sundanese,
-  CR_In_Batak,
-  CR_In_Lepcha,
-  CR_In_Ol_Chiki,
-  CR_In_Sundanese_Supplement,
-  CR_In_Vedic_Extensions,
-  CR_In_Phonetic_Extensions,
-  CR_In_Phonetic_Extensions_Supplement,
-  CR_In_Combining_Diacritical_Marks_Supplement,
-  CR_In_Latin_Extended_Additional,
-  CR_In_Greek_Extended,
-  CR_In_General_Punctuation,
-  CR_In_Superscripts_and_Subscripts,
-  CR_In_Currency_Symbols,
-  CR_In_Combining_Diacritical_Marks_for_Symbols,
-  CR_In_Letterlike_Symbols,
-  CR_In_Number_Forms,
-  CR_In_Arrows,
-  CR_In_Mathematical_Operators,
-  CR_In_Miscellaneous_Technical,
-  CR_In_Control_Pictures,
-  CR_In_Optical_Character_Recognition,
-  CR_In_Enclosed_Alphanumerics,
-  CR_In_Box_Drawing,
-  CR_In_Block_Elements,
-  CR_In_Geometric_Shapes,
-  CR_In_Miscellaneous_Symbols,
-  CR_In_Dingbats,
-  CR_In_Miscellaneous_Mathematical_Symbols_A,
-  CR_In_Supplemental_Arrows_A,
-  CR_In_Braille_Patterns,
-  CR_In_Supplemental_Arrows_B,
-  CR_In_Miscellaneous_Mathematical_Symbols_B,
-  CR_In_Supplemental_Mathematical_Operators,
-  CR_In_Miscellaneous_Symbols_and_Arrows,
-  CR_In_Glagolitic,
-  CR_In_Latin_Extended_C,
-  CR_In_Coptic,
-  CR_In_Georgian_Supplement,
-  CR_In_Tifinagh,
-  CR_In_Ethiopic_Extended,
-  CR_In_Cyrillic_Extended_A,
-  CR_In_Supplemental_Punctuation,
-  CR_In_CJK_Radicals_Supplement,
-  CR_In_Kangxi_Radicals,
-  CR_In_Ideographic_Description_Characters,
-  CR_In_CJK_Symbols_and_Punctuation,
-  CR_In_Hiragana,
-  CR_In_Katakana,
-  CR_In_Bopomofo,
-  CR_In_Hangul_Compatibility_Jamo,
-  CR_In_Kanbun,
-  CR_In_Bopomofo_Extended,
-  CR_In_CJK_Strokes,
-  CR_In_Katakana_Phonetic_Extensions,
-  CR_In_Enclosed_CJK_Letters_and_Months,
-  CR_In_CJK_Compatibility,
-  CR_In_CJK_Unified_Ideographs_Extension_A,
-  CR_In_Yijing_Hexagram_Symbols,
-  CR_In_CJK_Unified_Ideographs,
-  CR_In_Yi_Syllables,
-  CR_In_Yi_Radicals,
-  CR_In_Lisu,
-  CR_In_Vai,
-  CR_In_Cyrillic_Extended_B,
-  CR_In_Bamum,
-  CR_In_Modifier_Tone_Letters,
-  CR_In_Latin_Extended_D,
-  CR_In_Syloti_Nagri,
-  CR_In_Common_Indic_Number_Forms,
-  CR_In_Phags_pa,
-  CR_In_Saurashtra,
-  CR_In_Devanagari_Extended,
-  CR_In_Kayah_Li,
-  CR_In_Rejang,
-  CR_In_Hangul_Jamo_Extended_A,
-  CR_In_Javanese,
-  CR_In_Cham,
-  CR_In_Myanmar_Extended_A,
-  CR_In_Tai_Viet,
-  CR_In_Meetei_Mayek_Extensions,
-  CR_In_Ethiopic_Extended_A,
-  CR_In_Meetei_Mayek,
-  CR_In_Hangul_Syllables,
-  CR_In_Hangul_Jamo_Extended_B,
-  CR_In_High_Surrogates,
-  CR_In_High_Private_Use_Surrogates,
-  CR_In_Low_Surrogates,
-  CR_In_Private_Use_Area,
-  CR_In_CJK_Compatibility_Ideographs,
-  CR_In_Alphabetic_Presentation_Forms,
-  CR_In_Arabic_Presentation_Forms_A,
-  CR_In_Variation_Selectors,
-  CR_In_Vertical_Forms,
-  CR_In_Combining_Half_Marks,
-  CR_In_CJK_Compatibility_Forms,
-  CR_In_Small_Form_Variants,
-  CR_In_Arabic_Presentation_Forms_B,
-  CR_In_Halfwidth_and_Fullwidth_Forms,
-  CR_In_Specials,
-  CR_In_Linear_B_Syllabary,
-  CR_In_Linear_B_Ideograms,
-  CR_In_Aegean_Numbers,
-  CR_In_Ancient_Greek_Numbers,
-  CR_In_Ancient_Symbols,
-  CR_In_Phaistos_Disc,
-  CR_In_Lycian,
-  CR_In_Carian,
-  CR_In_Old_Italic,
-  CR_In_Gothic,
-  CR_In_Ugaritic,
-  CR_In_Old_Persian,
-  CR_In_Deseret,
-  CR_In_Shavian,
-  CR_In_Osmanya,
-  CR_In_Cypriot_Syllabary,
-  CR_In_Imperial_Aramaic,
-  CR_In_Phoenician,
-  CR_In_Lydian,
-  CR_In_Meroitic_Hieroglyphs,
-  CR_In_Meroitic_Cursive,
-  CR_In_Kharoshthi,
-  CR_In_Old_South_Arabian,
-  CR_In_Avestan,
-  CR_In_Inscriptional_Parthian,
-  CR_In_Inscriptional_Pahlavi,
-  CR_In_Old_Turkic,
-  CR_In_Rumi_Numeral_Symbols,
-  CR_In_Brahmi,
-  CR_In_Kaithi,
-  CR_In_Sora_Sompeng,
-  CR_In_Chakma,
-  CR_In_Sharada,
-  CR_In_Takri,
-  CR_In_Cuneiform,
-  CR_In_Cuneiform_Numbers_and_Punctuation,
-  CR_In_Egyptian_Hieroglyphs,
-  CR_In_Bamum_Supplement,
-  CR_In_Miao,
-  CR_In_Kana_Supplement,
-  CR_In_Byzantine_Musical_Symbols,
-  CR_In_Musical_Symbols,
-  CR_In_Ancient_Greek_Musical_Notation,
-  CR_In_Tai_Xuan_Jing_Symbols,
-  CR_In_Counting_Rod_Numerals,
-  CR_In_Mathematical_Alphanumeric_Symbols,
-  CR_In_Arabic_Mathematical_Alphabetic_Symbols,
-  CR_In_Mahjong_Tiles,
-  CR_In_Domino_Tiles,
-  CR_In_Playing_Cards,
-  CR_In_Enclosed_Alphanumeric_Supplement,
-  CR_In_Enclosed_Ideographic_Supplement,
-  CR_In_Miscellaneous_Symbols_And_Pictographs,
-  CR_In_Emoticons,
-  CR_In_Transport_And_Map_Symbols,
-  CR_In_Alchemical_Symbols,
-  CR_In_CJK_Unified_Ideographs_Extension_B,
-  CR_In_CJK_Unified_Ideographs_Extension_C,
-  CR_In_CJK_Unified_Ideographs_Extension_D,
-  CR_In_CJK_Compatibility_Ideographs_Supplement,
-  CR_In_Tags,
-  CR_In_Variation_Selectors_Supplement,
-  CR_In_Supplementary_Private_Use_Area_A,
-  CR_In_Supplementary_Private_Use_Area_B,
-  CR_In_No_Block,
-#endif /* USE_UNICODE_PROPERTIES */
-};
-struct uniname2ctype_struct {
-  int name, ctype;
-};
-
-static const struct uniname2ctype_struct *uniname2ctype_p(const char *, unsigned int);
-%}
-struct uniname2ctype_struct;
-%%
-alpha,                                     1
-blank,                                     2
-cntrl,                                     3
-digit,                                     4
-graph,                                     5
-lower,                                     6
-print,                                     7
-punct,                                     8
-space,                                     9
-upper,                                    10
-xdigit,                                   11
-word,                                     12
-alnum,                                    13
-ascii,                                    14
-#ifdef USE_UNICODE_PROPERTIES
-any,                                      15
-assigned,                                 16
-c,                                        17
-cc,                                       18
-cf,                                       19
-cn,                                       20
-co,                                       21
-cs,                                       22
-l,                                        23
-lc,                                       24
-ll,                                       25
-lm,                                       26
-lo,                                       27
-lt,                                       28
-lu,                                       29
-m,                                        30
-mc,                                       31
-me,                                       32
-mn,                                       33
-n,                                        34
-nd,                                       35
-nl,                                       36
-no,                                       37
-p,                                        38
-pc,                                       39
-pd,                                       40
-pe,                                       41
-pf,                                       42
-pi,                                       43
-po,                                       44
-ps,                                       45
-s,                                        46
-sc,                                       47
-sk,                                       48
-sm,                                       49
-so,                                       50
-z,                                        51
-zl,                                       52
-zp,                                       53
-zs,                                       54
-math,                                     55
-alphabetic,                               56
-lowercase,                                57
-uppercase,                                58
-cased,                                    59
-caseignorable,                            60
-changeswhenlowercased,                    61
-changeswhenuppercased,                    62
-changeswhentitlecased,                    63
-changeswhencasefolded,                    64
-changeswhencasemapped,                    65
-idstart,                                  66
-idcontinue,                               67
-xidstart,                                 68
-xidcontinue,                              69
-defaultignorablecodepoint,                70
-graphemeextend,                           71
-graphemebase,                             72
-graphemelink,                             73
-common,                                   74
-latin,                                    75
-greek,                                    76
-cyrillic,                                 77
-armenian,                                 78
-hebrew,                                   79
-arabic,                                   80
-syriac,                                   81
-thaana,                                   82
-devanagari,                               83
-bengali,                                  84
-gurmukhi,                                 85
-gujarati,                                 86
-oriya,                                    87
-tamil,                                    88
-telugu,                                   89
-kannada,                                  90
-malayalam,                                91
-sinhala,                                  92
-thai,                                     93
-lao,                                      94
-tibetan,                                  95
-myanmar,                                  96
-georgian,                                 97
-hangul,                                   98
-ethiopic,                                 99
-cherokee,                                100
-canadianaboriginal,                      101
-ogham,                                   102
-runic,                                   103
-khmer,                                   104
-mongolian,                               105
-hiragana,                                106
-katakana,                                107
-bopomofo,                                108
-han,                                     109
-yi,                                      110
-olditalic,                               111
-gothic,                                  112
-deseret,                                 113
-inherited,                               114
-tagalog,                                 115
-hanunoo,                                 116
-buhid,                                   117
-tagbanwa,                                118
-limbu,                                   119
-taile,                                   120
-linearb,                                 121
-ugaritic,                                122
-shavian,                                 123
-osmanya,                                 124
-cypriot,                                 125
-braille,                                 126
-buginese,                                127
-coptic,                                  128
-newtailue,                               129
-glagolitic,                              130
-tifinagh,                                131
-sylotinagri,                             132
-oldpersian,                              133
-kharoshthi,                              134
-balinese,                                135
-cuneiform,                               136
-phoenician,                              137
-phagspa,                                 138
-nko,                                     139
-sundanese,                               140
-lepcha,                                  141
-olchiki,                                 142
-vai,                                     143
-saurashtra,                              144
-kayahli,                                 145
-rejang,                                  146
-lycian,                                  147
-carian,                                  148
-lydian,                                  149
-cham,                                    150
-taitham,                                 151
-taiviet,                                 152
-avestan,                                 153
-egyptianhieroglyphs,                     154
-samaritan,                               155
-lisu,                                    156
-bamum,                                   157
-javanese,                                158
-meeteimayek,                             159
-imperialaramaic,                         160
-oldsoutharabian,                         161
-inscriptionalparthian,                   162
-inscriptionalpahlavi,                    163
-oldturkic,                               164
-kaithi,                                  165
-batak,                                   166
-brahmi,                                  167
-mandaic,                                 168
-chakma,                                  169
-meroiticcursive,                         170
-meroitichieroglyphs,                     171
-miao,                                    172
-sharada,                                 173
-sorasompeng,                             174
-takri,                                   175
-whitespace,                              176
-bidicontrol,                             177
-joincontrol,                             178
-dash,                                    179
-hyphen,                                  180
-quotationmark,                           181
-terminalpunctuation,                     182
-othermath,                               183
-hexdigit,                                184
-asciihexdigit,                           185
-otheralphabetic,                         186
-ideographic,                             187
-diacritic,                               188
-extender,                                189
-otherlowercase,                          190
-otheruppercase,                          191
-noncharactercodepoint,                   192
-othergraphemeextend,                     193
-idsbinaryoperator,                       194
-idstrinaryoperator,                      195
-radical,                                 196
-unifiedideograph,                        197
-otherdefaultignorablecodepoint,          198
-deprecated,                              199
-softdotted,                              200
-logicalorderexception,                   201
-otheridstart,                            202
-otheridcontinue,                         203
-sterm,                                   204
-variationselector,                       205
-patternwhitespace,                       206
-patternsyntax,                           207
-unknown,                                 208
-ahex,                                    185
-bidic,                                   177
-ci,                                       60
-cwcf,                                     64
-cwcm,                                     65
-cwl,                                      61
-cwt,                                      63
-cwu,                                      62
-dep,                                     199
-di,                                       70
-dia,                                     188
-ext,                                     189
-grbase,                                   72
-grext,                                    71
-grlink,                                   73
-hex,                                     184
-idc,                                      67
-ideo,                                    187
-ids,                                      66
-idsb,                                    194
-idst,                                    195
-joinc,                                   178
-loe,                                     201
-nchar,                                   192
-oalpha,                                  186
-odi,                                     198
-ogrext,                                  193
-oidc,                                    203
-oids,                                    202
-olower,                                  190
-omath,                                   183
-oupper,                                  191
-patsyn,                                  207
-patws,                                   206
-qmark,                                   181
-sd,                                      200
-term,                                    182
-uideo,                                   197
-vs,                                      205
-wspace,                                  176
-xidc,                                     69
-xids,                                     68
-other,                                    17
-control,                                  18
-format,                                   19
-unassigned,                               20
-privateuse,                               21
-surrogate,                                22
-letter,                                   23
-casedletter,                              24
-lowercaseletter,                          25
-modifierletter,                           26
-otherletter,                              27
-titlecaseletter,                          28
-uppercaseletter,                          29
-mark,                                     30
-combiningmark,                            30
-spacingmark,                              31
-enclosingmark,                            32
-nonspacingmark,                           33
-number,                                   34
-decimalnumber,                            35
-letternumber,                             36
-othernumber,                              37
-punctuation,                              38
-connectorpunctuation,                     39
-dashpunctuation,                          40
-closepunctuation,                         41
-finalpunctuation,                         42
-initialpunctuation,                       43
-otherpunctuation,                         44
-openpunctuation,                          45
-symbol,                                   46
-currencysymbol,                           47
-modifiersymbol,                           48
-mathsymbol,                               49
-othersymbol,                              50
-separator,                                51
-lineseparator,                            52
-paragraphseparator,                       53
-spaceseparator,                           54
-arab,                                     80
-armi,                                    160
-armn,                                     78
-avst,                                    153
-bali,                                    135
-bamu,                                    157
-batk,                                    166
-beng,                                     84
-bopo,                                    108
-brah,                                    167
-brai,                                    126
-bugi,                                    127
-buhd,                                    117
-cakm,                                    169
-cans,                                    101
-cari,                                    148
-cher,                                    100
-copt,                                    128
-qaac,                                    128
-cprt,                                    125
-cyrl,                                     77
-deva,                                     83
-dsrt,                                    113
-egyp,                                    154
-ethi,                                     99
-geor,                                     97
-glag,                                    130
-goth,                                    112
-grek,                                     76
-gujr,                                     86
-guru,                                     85
-hang,                                     98
-hani,                                    109
-hano,                                    116
-hebr,                                     79
-hira,                                    106
-ital,                                    111
-java,                                    158
-kali,                                    145
-kana,                                    107
-khar,                                    134
-khmr,                                    104
-knda,                                     90
-kthi,                                    165
-lana,                                    151
-laoo,                                     94
-latn,                                     75
-lepc,                                    141
-limb,                                    119
-linb,                                    121
-lyci,                                    147
-lydi,                                    149
-mand,                                    168
-merc,                                    170
-mero,                                    171
-mlym,                                     91
-mong,                                    105
-mtei,                                    159
-mymr,                                     96
-nkoo,                                    139
-ogam,                                    102
-olck,                                    142
-orkh,                                    164
-orya,                                     87
-osma,                                    124
-phag,                                    138
-phli,                                    163
-phnx,                                    137
-plrd,                                    172
-prti,                                    162
-rjng,                                    146
-runr,                                    103
-samr,                                    155
-sarb,                                    161
-saur,                                    144
-shaw,                                    123
-shrd,                                    173
-sinh,                                     92
-sora,                                    174
-sund,                                    140
-sylo,                                    132
-syrc,                                     81
-tagb,                                    118
-takr,                                    175
-tale,                                    120
-talu,                                    129
-taml,                                     88
-tavt,                                    152
-telu,                                     89
-tfng,                                    131
-tglg,                                    115
-thaa,                                     82
-tibt,                                     95
-ugar,                                    122
-vaii,                                    143
-xpeo,                                    133
-xsux,                                    136
-yiii,                                    110
-zinh,                                    114
-qaai,                                    114
-zyyy,                                     74
-zzzz,                                    208
-age=1.1,                                 209
-age=2.0,                                 210
-age=2.1,                                 211
-age=3.0,                                 212
-age=3.1,                                 213
-age=3.2,                                 214
-age=4.0,                                 215
-age=4.1,                                 216
-age=5.0,                                 217
-age=5.1,                                 218
-age=5.2,                                 219
-age=6.0,                                 220
-age=6.1,                                 221
-inbasiclatin,                            222
-inlatin1supplement,                      223
-inlatinextendeda,                        224
-inlatinextendedb,                        225
-inipaextensions,                         226
-inspacingmodifierletters,                227
-incombiningdiacriticalmarks,             228
-ingreekandcoptic,                        229
-incyrillic,                              230
-incyrillicsupplement,                    231
-inarmenian,                              232
-inhebrew,                                233
-inarabic,                                234
-insyriac,                                235
-inarabicsupplement,                      236
-inthaana,                                237
-innko,                                   238
-insamaritan,                             239
-inmandaic,                               240
-inarabicextendeda,                       241
-indevanagari,                            242
-inbengali,                               243
-ingurmukhi,                              244
-ingujarati,                              245
-inoriya,                                 246
-intamil,                                 247
-intelugu,                                248
-inkannada,                               249
-inmalayalam,                             250
-insinhala,                               251
-inthai,                                  252
-inlao,                                   253
-intibetan,                               254
-inmyanmar,                               255
-ingeorgian,                              256
-inhanguljamo,                            257
-inethiopic,                              258
-inethiopicsupplement,                    259
-incherokee,                              260
-inunifiedcanadianaboriginalsyllabics,    261
-inogham,                                 262
-inrunic,                                 263
-intagalog,                               264
-inhanunoo,                               265
-inbuhid,                                 266
-intagbanwa,                              267
-inkhmer,                                 268
-inmongolian,                             269
-inunifiedcanadianaboriginalsyllabicsextended, 270
-inlimbu,                                 271
-intaile,                                 272
-innewtailue,                             273
-inkhmersymbols,                          274
-inbuginese,                              275
-intaitham,                               276
-inbalinese,                              277
-insundanese,                             278
-inbatak,                                 279
-inlepcha,                                280
-inolchiki,                               281
-insundanesesupplement,                   282
-invedicextensions,                       283
-inphoneticextensions,                    284
-inphoneticextensionssupplement,          285
-incombiningdiacriticalmarkssupplement,   286
-inlatinextendedadditional,               287
-ingreekextended,                         288
-ingeneralpunctuation,                    289
-insuperscriptsandsubscripts,             290
-incurrencysymbols,                       291
-incombiningdiacriticalmarksforsymbols,   292
-inletterlikesymbols,                     293
-innumberforms,                           294
-inarrows,                                295
-inmathematicaloperators,                 296
-inmiscellaneoustechnical,                297
-incontrolpictures,                       298
-inopticalcharacterrecognition,           299
-inenclosedalphanumerics,                 300
-inboxdrawing,                            301
-inblockelements,                         302
-ingeometricshapes,                       303
-inmiscellaneoussymbols,                  304
-indingbats,                              305
-inmiscellaneousmathematicalsymbolsa,     306
-insupplementalarrowsa,                   307
-inbraillepatterns,                       308
-insupplementalarrowsb,                   309
-inmiscellaneousmathematicalsymbolsb,     310
-insupplementalmathematicaloperators,     311
-inmiscellaneoussymbolsandarrows,         312
-inglagolitic,                            313
-inlatinextendedc,                        314
-incoptic,                                315
-ingeorgiansupplement,                    316
-intifinagh,                              317
-inethiopicextended,                      318
-incyrillicextendeda,                     319
-insupplementalpunctuation,               320
-incjkradicalssupplement,                 321
-inkangxiradicals,                        322
-inideographicdescriptioncharacters,      323
-incjksymbolsandpunctuation,              324
-inhiragana,                              325
-inkatakana,                              326
-inbopomofo,                              327
-inhangulcompatibilityjamo,               328
-inkanbun,                                329
-inbopomofoextended,                      330
-incjkstrokes,                            331
-inkatakanaphoneticextensions,            332
-inenclosedcjklettersandmonths,           333
-incjkcompatibility,                      334
-incjkunifiedideographsextensiona,        335
-inyijinghexagramsymbols,                 336
-incjkunifiedideographs,                  337
-inyisyllables,                           338
-inyiradicals,                            339
-inlisu,                                  340
-invai,                                   341
-incyrillicextendedb,                     342
-inbamum,                                 343
-inmodifiertoneletters,                   344
-inlatinextendedd,                        345
-insylotinagri,                           346
-incommonindicnumberforms,                347
-inphagspa,                               348
-insaurashtra,                            349
-indevanagariextended,                    350
-inkayahli,                               351
-inrejang,                                352
-inhanguljamoextendeda,                   353
-injavanese,                              354
-incham,                                  355
-inmyanmarextendeda,                      356
-intaiviet,                               357
-inmeeteimayekextensions,                 358
-inethiopicextendeda,                     359
-inmeeteimayek,                           360
-inhangulsyllables,                       361
-inhanguljamoextendedb,                   362
-inhighsurrogates,                        363
-inhighprivateusesurrogates,              364
-inlowsurrogates,                         365
-inprivateusearea,                        366
-incjkcompatibilityideographs,            367
-inalphabeticpresentationforms,           368
-inarabicpresentationformsa,              369
-invariationselectors,                    370
-inverticalforms,                         371
-incombininghalfmarks,                    372
-incjkcompatibilityforms,                 373
-insmallformvariants,                     374
-inarabicpresentationformsb,              375
-inhalfwidthandfullwidthforms,            376
-inspecials,                              377
-inlinearbsyllabary,                      378
-inlinearbideograms,                      379
-inaegeannumbers,                         380
-inancientgreeknumbers,                   381
-inancientsymbols,                        382
-inphaistosdisc,                          383
-inlycian,                                384
-incarian,                                385
-inolditalic,                             386
-ingothic,                                387
-inugaritic,                              388
-inoldpersian,                            389
-indeseret,                               390
-inshavian,                               391
-inosmanya,                               392
-incypriotsyllabary,                      393
-inimperialaramaic,                       394
-inphoenician,                            395
-inlydian,                                396
-inmeroitichieroglyphs,                   397
-inmeroiticcursive,                       398
-inkharoshthi,                            399
-inoldsoutharabian,                       400
-inavestan,                               401
-ininscriptionalparthian,                 402
-ininscriptionalpahlavi,                  403
-inoldturkic,                             404
-inruminumeralsymbols,                    405
-inbrahmi,                                406
-inkaithi,                                407
-insorasompeng,                           408
-inchakma,                                409
-insharada,                               410
-intakri,                                 411
-incuneiform,                             412
-incuneiformnumbersandpunctuation,        413
-inegyptianhieroglyphs,                   414
-inbamumsupplement,                       415
-inmiao,                                  416
-inkanasupplement,                        417
-inbyzantinemusicalsymbols,               418
-inmusicalsymbols,                        419
-inancientgreekmusicalnotation,           420
-intaixuanjingsymbols,                    421
-incountingrodnumerals,                   422
-inmathematicalalphanumericsymbols,       423
-inarabicmathematicalalphabeticsymbols,   424
-inmahjongtiles,                          425
-indominotiles,                           426
-inplayingcards,                          427
-inenclosedalphanumericsupplement,        428
-inenclosedideographicsupplement,         429
-inmiscellaneoussymbolsandpictographs,    430
-inemoticons,                             431
-intransportandmapsymbols,                432
-inalchemicalsymbols,                     433
-incjkunifiedideographsextensionb,        434
-incjkunifiedideographsextensionc,        435
-incjkunifiedideographsextensiond,        436
-incjkcompatibilityideographssupplement,  437
-intags,                                  438
-invariationselectorssupplement,          439
-insupplementaryprivateuseareaa,          440
-insupplementaryprivateuseareab,          441
-innoblock,                               442
-#endif /* USE_UNICODE_PROPERTIES */
-%%
-static int
-uniname2ctype(const UChar *name, unsigned int len)
-{
-  const struct uniname2ctype_struct *p = uniname2ctype_p((const char *)name, len);
-  if (p) return p->ctype;
-  return -1;
-}
diff --git a/enc/us_ascii.c b/enc/us_ascii.c
index 15b7beee04..08f9072c43 100644
--- a/enc/us_ascii.c
+++ b/enc/us_ascii.c
@@ -1,7 +1,10 @@
 #include "regenc.h"
-#include "encindex.h"
+#ifdef RUBY
+# include "encindex.h"
+#endif
+
 #ifndef ENCINDEX_US_ASCII
-#define ENCINDEX_US_ASCII 0
+# define ENCINDEX_US_ASCII 0
 #endif
 
 static int
@@ -29,11 +32,9 @@ OnigEncodingDefine(us_ascii, US_ASCII) = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
+  onigenc_single_byte_ascii_only_case_map,
   ENCINDEX_US_ASCII,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
-  onigenc_single_byte_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 ENC_ALIAS("ASCII", "US-ASCII")
 ENC_ALIAS("ANSI_X3.4-1968", "US-ASCII")
diff --git a/enc/utf_16be.c b/enc/utf_16be.c
index 526774ffbb..f9dd7119d6 100644
--- a/enc/utf_16be.c
+++ b/enc/utf_16be.c
@@ -249,10 +249,8 @@ OnigEncodingDefine(utf_16be, UTF_16BE) = {
   onigenc_utf16_32_get_ctype_code_range,
   utf16be_left_adjust_char_head,
   onigenc_always_false_is_allowed_reverse_match,
+  onigenc_unicode_case_map,
   0,
   ONIGENC_FLAG_UNICODE,
-#ifdef ONIG_CASE_MAPPING
-  onigenc_unicode_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 ENC_ALIAS("UCS-2BE", "UTF-16BE")
diff --git a/enc/utf_16le.c b/enc/utf_16le.c
index 78186e6279..2c8438d0be 100644
--- a/enc/utf_16le.c
+++ b/enc/utf_16le.c
@@ -242,9 +242,7 @@ OnigEncodingDefine(utf_16le, UTF_16LE) = {
   onigenc_utf16_32_get_ctype_code_range,
   utf16le_left_adjust_char_head,
   onigenc_always_false_is_allowed_reverse_match,
+  onigenc_unicode_case_map,
   0,
   ONIGENC_FLAG_UNICODE,
-#ifdef ONIG_CASE_MAPPING
-  onigenc_unicode_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
diff --git a/enc/utf_32be.c b/enc/utf_32be.c
index 059a33fea6..17841e52a4 100644
--- a/enc/utf_32be.c
+++ b/enc/utf_32be.c
@@ -30,11 +30,23 @@
 #include "regenc.h"
 #include "iso_8859.h"
 
+static OnigCodePoint utf32be_mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc);
 static int
-utf32be_mbc_enc_len(const UChar* p ARG_UNUSED, const OnigUChar* e ARG_UNUSED,
-		    OnigEncoding enc ARG_UNUSED)
+utf32be_mbc_enc_len(const UChar* p ARG_UNUSED, const OnigUChar* e,
+		    OnigEncoding enc)
 {
-  return 4;
+  if (e < p) {
+    return ONIGENC_CONSTRUCT_MBCLEN_INVALID();
+  }
+  else if (e-p < 4) {
+    return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(4-(int)(e-p));
+  }
+  else {
+    OnigCodePoint c = utf32be_mbc_to_code(p, e, enc);
+    if (!UNICODE_VALID_CODEPOINT_P(c))
+      return ONIGENC_CONSTRUCT_MBCLEN_INVALID();
+    return ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(4);
+  }
 }
 
 static int
@@ -187,11 +199,8 @@ OnigEncodingDefine(utf_32be, UTF_32BE) = {
   onigenc_utf16_32_get_ctype_code_range,
   utf32be_left_adjust_char_head,
   onigenc_always_false_is_allowed_reverse_match,
+  onigenc_unicode_case_map,
   0,
   ONIGENC_FLAG_UNICODE,
-#ifdef ONIG_CASE_MAPPING
-  onigenc_unicode_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 ENC_ALIAS("UCS-4BE", "UTF-32BE")
-
diff --git a/enc/utf_32le.c b/enc/utf_32le.c
index 27d8239d68..18b798f102 100644
--- a/enc/utf_32le.c
+++ b/enc/utf_32le.c
@@ -30,11 +30,23 @@
 #include "regenc.h"
 #include "iso_8859.h"
 
+static OnigCodePoint utf32le_mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc);
 static int
-utf32le_mbc_enc_len(const UChar* p ARG_UNUSED, const OnigUChar* e ARG_UNUSED,
-		    OnigEncoding enc ARG_UNUSED)
+utf32le_mbc_enc_len(const UChar* p ARG_UNUSED, const OnigUChar* e,
+		    OnigEncoding enc)
 {
-  return 4;
+  if (e < p) {
+    return ONIGENC_CONSTRUCT_MBCLEN_INVALID();
+  }
+  else if (e-p < 4) {
+    return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(4-(int)(e-p));
+  }
+  else {
+    OnigCodePoint c = utf32le_mbc_to_code(p, e, enc);
+    if (!UNICODE_VALID_CODEPOINT_P(c))
+      return ONIGENC_CONSTRUCT_MBCLEN_INVALID();
+    return ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(4);
+  }
 }
 
 static int
@@ -187,10 +199,8 @@ OnigEncodingDefine(utf_32le, UTF_32LE) = {
   onigenc_utf16_32_get_ctype_code_range,
   utf32le_left_adjust_char_head,
   onigenc_always_false_is_allowed_reverse_match,
+  onigenc_unicode_case_map,
   0,
   ONIGENC_FLAG_UNICODE,
-#ifdef ONIG_CASE_MAPPING
-  onigenc_unicode_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 ENC_ALIAS("UCS-4LE", "UTF-32LE")
diff --git a/enc/utf_8.c b/enc/utf_8.c
index 5766d04d57..cdf2510d84 100644
--- a/enc/utf_8.c
+++ b/enc/utf_8.c
@@ -28,17 +28,20 @@
  */
 
 #include "regenc.h"
-#include "encindex.h"
+#ifdef RUBY
+# include "encindex.h"
+#endif
+
 #ifndef ENCINDEX_UTF_8
-#define ENCINDEX_UTF_8 0
+# define ENCINDEX_UTF_8 0
 #endif
 
 #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 INVALID_CODE_FE  0xfffffffe
+# define INVALID_CODE_FF  0xffffffff
 #endif
 #define VALID_CODE_LIMIT  0x0010ffff
 
@@ -414,7 +417,7 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
 OnigEncodingDefine(utf_8, UTF_8) = {
   mbc_enc_len,
   "UTF-8",     /* name */
-  6,           /* max byte length */
+  4,           /* max byte length */
   1,           /* min byte length */
   is_mbc_newline,
   mbc_to_code,
@@ -428,11 +431,9 @@ OnigEncodingDefine(utf_8, UTF_8) = {
   get_ctype_code_range,
   left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
+  onigenc_unicode_case_map,
   ENCINDEX_UTF_8,
   ONIGENC_FLAG_UNICODE,
-#ifdef ONIG_CASE_MAPPING
-  onigenc_unicode_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 ENC_ALIAS("CP65001", "UTF-8")
 
@@ -446,4 +447,3 @@ ENC_ALIAS("CP65001", "UTF-8")
 ENC_REPLICATE("UTF8-MAC", "UTF-8")
 ENC_ALIAS("UTF-8-MAC", "UTF8-MAC")
 ENC_ALIAS("UTF-8-HFS", "UTF8-MAC") /* Emacs 23.2 */
-
diff --git a/enc/windows_1250.c b/enc/windows_1250.c
index 689ed77e43..daf23e9d1e 100644
--- a/enc/windows_1250.c
+++ b/enc/windows_1250.c
@@ -1,5 +1,5 @@
 /**********************************************************************
-  cp1250.c -  Oniguruma (regular expression library)
+  windows_1250.c -  Oniguruma (regular expression library)
 **********************************************************************/
 /*-
  * Copyright (c) 2006-2007  Byte      <byte AT mail DOT kna DOT ru>
@@ -29,6 +29,7 @@
  */
 
 #include "regenc.h"
+#include "iso_8859.h"
 
 #define ENC_CP1250_TO_LOWER_CASE(c) EncCP1250_ToLowerCaseTable[c]
 #define ENC_IS_CP1250_CTYPE(code,ctype) \
@@ -101,7 +102,7 @@ static const unsigned short EncCP1250_CtypeTable[256] = {
   0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,/* E */
   0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
   0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0,/* F */
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
+  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0,
 };
 
 static int
@@ -189,6 +190,56 @@ cp1250_get_case_fold_codes_by_str(OnigCaseFoldType flag,
 	     flag, p, end, items);
 }
 
+static int
+case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
+	 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
+	 const struct OnigEncodingTypeST* enc)
+{
+  OnigCodePoint code;
+  OnigUChar *to_start = to;
+  OnigCaseFoldType flags = *flagP;
+
+  while (*pp < end && to < to_end) {
+    code = *(*pp)++;
+    if (code == SHARP_s) {
+      if (flags & ONIGENC_CASE_UPCASE) {
+	flags |= ONIGENC_CASE_MODIFIED;
+	*to++ = 'S';
+	code = (flags & ONIGENC_CASE_TITLECASE) ? 's' : 'S';
+      }
+      else if (flags & ONIGENC_CASE_FOLD) {
+	flags |= ONIGENC_CASE_MODIFIED;
+	*to++ = 's';
+	code = 's';
+      }
+    }
+    else if ((EncCP1250_CtypeTable[code] & BIT_CTYPE_UPPER)
+	     && (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
+      flags |= ONIGENC_CASE_MODIFIED;
+      code = ENC_CP1250_TO_LOWER_CASE(code);
+    }
+    else if (code == 0xB5)
+      ;
+    else if ((EncCP1250_CtypeTable[code]&BIT_CTYPE_LOWER)
+	     && (flags & ONIGENC_CASE_UPCASE)) {
+      flags |= ONIGENC_CASE_MODIFIED;
+      if (code == 0xB9)
+	code = 0xA5;
+      else if (code == 0xBE)
+	code = 0xBC;
+      else if (code >= 0x8A && code <= 0xBF && code!=0xB9)
+	code -= 0x10;
+      else
+	code -= 0x20;
+    }
+    *to++ = code;
+    if (flags & ONIGENC_CASE_TITLECASE)  /* switch from titlecase to lowercase for capitalize */
+      flags ^= (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_TITLECASE);
+  }
+  *flagP = flags;
+  return (int )(to - to_start);
+}
+
 OnigEncodingDefine(windows_1250, Windows_1250) = {
   onigenc_single_byte_mbc_enc_len,
   "Windows-1250",      /* name */
@@ -206,18 +257,15 @@ OnigEncodingDefine(windows_1250, Windows_1250) = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
+  case_map,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
-  onigenc_single_byte_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 /*
  * Name: windows-1250
  * MIBenum: 2251
  * 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
+ * Link: https://en.wikipedia.org/wiki/Windows-1250
  */
 ENC_ALIAS("CP1250", "Windows-1250")
-
diff --git a/enc/windows_1251.c b/enc/windows_1251.c
index 826da725b3..6c892c1b8c 100644
--- a/enc/windows_1251.c
+++ b/enc/windows_1251.c
@@ -1,5 +1,5 @@
 /**********************************************************************
-  cp1251.c -  Oniguruma (regular expression library)
+  windows_1251.c -  Oniguruma (regular expression library)
 **********************************************************************/
 /*-
  * Copyright (c) 2006-2007  Byte      <byte AT mail DOT kna DOT ru>
@@ -180,9 +180,51 @@ cp1251_get_case_fold_codes_by_str(OnigCaseFoldType flag,
 	     flag, p, end, items);
 }
 
+static int
+case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
+	 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
+	 const struct OnigEncodingTypeST* enc)
+{
+  OnigCodePoint code;
+  OnigUChar *to_start = to;
+  OnigCaseFoldType flags = *flagP;
+
+  while (*pp < end && to < to_end) {
+    code = *(*pp)++;
+    if ((EncCP1251_CtypeTable[code] & BIT_CTYPE_UPPER)
+	     && (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
+      flags |= ONIGENC_CASE_MODIFIED;
+      code = ENC_CP1251_TO_LOWER_CASE(code);
+    }
+    else if (code == 0xB5)
+      ;
+    else if ((EncCP1251_CtypeTable[code]&BIT_CTYPE_LOWER)
+	     && (flags & ONIGENC_CASE_UPCASE)) {
+      flags |= ONIGENC_CASE_MODIFIED;
+      if ((0x61 <= code && code <= 0x7A) || (0xE0 <= code && code <= 0xFF))
+	code -= 0x20;
+      else if (code == 0xA2 || code == 0xB3 || code == 0xBE)
+	code -= 0x01;
+      else if (code == 0x83)
+	code = 0x81;
+      else if (code == 0xBC)
+	code = 0xA3;
+      else if (code == 0xB4)
+	code = 0xA5;
+      else
+	code -= 0x10;
+    }
+    *to++ = code;
+    if (flags & ONIGENC_CASE_TITLECASE)  /* switch from titlecase to lowercase for capitalize */
+      flags ^= (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_TITLECASE);
+  }
+  *flagP = flags;
+  return (int )(to - to_start);
+}
+
 OnigEncodingDefine(windows_1251, Windows_1251) = {
   onigenc_single_byte_mbc_enc_len,
-  "Windows-1251",      /* name */
+  "Windows-1251",/* name */
   1,             /* max enc length */
   1,             /* min enc length */
   onigenc_is_mbc_newline_0x0a,
@@ -197,17 +239,15 @@ OnigEncodingDefine(windows_1251, Windows_1251) = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
+  case_map,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
-  onigenc_single_byte_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 /*
  * 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
+ * Link: https://en.wikipedia.org/wiki/Windows-1251
  */
 ENC_ALIAS("CP1251", "Windows-1251")
diff --git a/enc/windows_1252.c b/enc/windows_1252.c
index 339df14e58..b685878d3f 100644
--- a/enc/windows_1252.c
+++ b/enc/windows_1252.c
@@ -1,5 +1,5 @@
 /**********************************************************************
-  cp1252.c -  Oniguruma (regular expression library)
+  windows_1252.c -  Oniguruma (regular expression library)
 **********************************************************************/
 /*-
  * Copyright (c) 2006-2007  Byte      <byte AT mail DOT kna DOT ru>
@@ -29,6 +29,7 @@
  */
 
 #include "regenc.h"
+#include "iso_8859.h"
 
 #define ENC_CP1252_TO_LOWER_CASE(c) EncCP1252_ToLowerCaseTable[c]
 #define ENC_IS_CP1252_CTYPE(code,ctype) \
@@ -114,7 +115,6 @@ cp1252_mbc_case_fold(OnigCaseFoldType flag ARG_UNUSED,
   (*pp)++;
   return 1;
 }
-
 static int
 cp1252_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
 {
@@ -181,6 +181,54 @@ cp1252_get_case_fold_codes_by_str(OnigCaseFoldType flag,
 	     flag, p, end, items);
 }
 
+static int
+case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
+	 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
+	 const struct OnigEncodingTypeST* enc)
+{
+  OnigCodePoint code;
+  OnigUChar *to_start = to;
+  OnigCaseFoldType flags = *flagP;
+
+  while (*pp < end && to < to_end) {
+    code = *(*pp)++;
+    if (code == SHARP_s) {
+      if (flags & ONIGENC_CASE_UPCASE) {
+	flags |= ONIGENC_CASE_MODIFIED;
+	*to++ = 'S';
+	code = (flags & ONIGENC_CASE_TITLECASE) ? 's' : 'S';
+      }
+      else if (flags & ONIGENC_CASE_FOLD) {
+	flags |= ONIGENC_CASE_MODIFIED;
+	*to++ = 's';
+	code = 's';
+      }
+    }
+    else if ((EncCP1252_CtypeTable[code] & BIT_CTYPE_UPPER)
+	     && (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
+      flags |= ONIGENC_CASE_MODIFIED;
+      code = ENC_CP1252_TO_LOWER_CASE(code);
+    }
+    else if (code == 0x83 || code == 0xAA || code == 0xBA || code == 0xB5)
+      ;
+    else if ((EncCP1252_CtypeTable[code]&BIT_CTYPE_LOWER)
+	     && (flags & ONIGENC_CASE_UPCASE)) {
+      flags |= ONIGENC_CASE_MODIFIED;
+      if (code == 0x9A || code == 0x9C || code == 0x9E)
+	code -= 0x10;
+      else if (code == 0xFF)
+	code -= 0x60;
+      else
+	code -= 0x20;
+    }
+    *to++ = code;
+    if (flags & ONIGENC_CASE_TITLECASE)  /* switch from titlecase to lowercase for capitalize */
+      flags ^= (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_TITLECASE);
+  }
+  *flagP = flags;
+  return (int )(to - to_start);
+}
+
 OnigEncodingDefine(windows_1252, Windows_1252) = {
   onigenc_single_byte_mbc_enc_len,
   "Windows-1252",      /* name */
@@ -198,17 +246,15 @@ OnigEncodingDefine(windows_1252, Windows_1252) = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
+  case_map,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
-  onigenc_single_byte_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 /*
  * Name: windows-1252
  * MIBenum: 2251
  * 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
+ * Link: https://en.wikipedia.org/wiki/Windows-1252
  */
 ENC_ALIAS("CP1252", "Windows-1252")
diff --git a/enc/windows_1253.c b/enc/windows_1253.c
new file mode 100644
index 0000000000..b2a43581c3
--- /dev/null
+++ b/enc/windows_1253.c
@@ -0,0 +1,297 @@
+/**********************************************************************
+  windows_1253.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.
+ */
+
+/*
+ * Name: windows-1253
+ * MIBenum: 2253
+ * Link: http://www.iana.org/assignments/character-sets
+ * Link: http://www.microsoft.com/globaldev/reference/sbcs/1253.mspx
+ * Link: https://en.wikipedia.org/wiki/Windows-1253
+ */
+
+#include "regenc.h"
+
+#define ENC_CP1253_TO_LOWER_CASE(c) EncCP1253_ToLowerCaseTable[c]
+#define ENC_IS_CP1253_CTYPE(code,ctype) \
+  ((EncCP1253_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
+
+static const UChar EncCP1253_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', '\334', '\243', '\244', '\245', '\246', '\247',
+  '\250', '\251', '\252', '\253', '\254', '\255', '\256', '\257',
+  '\260', '\261', '\262', '\263', '\264', '\354', '\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 EncCP1253_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, 0x34a2, 0x00a0, 0x0000, 0x0000, 0x00a0, 0x00a0,
+  0x00a0, 0x00a0, 0x0000, 0x01a0, 0x00a0, 0x01a0, 0x0000, 0x01a0,
+  0x00a0, 0x00a0, 0x10a0, 0x10a0, 0x00a0, 0x30e2, 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_CP1253_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 = (EncCP1253_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_CP1253_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(
+	     numberof(CaseFoldMap), 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(
+	     numberof(CaseFoldMap), CaseFoldMap, 0,
+	     flag, p, end, items);
+}
+
+static int
+case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
+	 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
+	 const struct OnigEncodingTypeST* enc)
+{
+  OnigCodePoint code;
+  OnigUChar *to_start = to;
+  OnigCaseFoldType flags = *flagP;
+
+  while (*pp < end && to < to_end) {
+    code = *(*pp)++;
+    if (code == 0xF2) {
+      if (flags & ONIGENC_CASE_UPCASE) {
+	flags |= ONIGENC_CASE_MODIFIED;
+	code = 0xD3;
+      }
+      else if (flags & ONIGENC_CASE_FOLD) {
+	flags |= ONIGENC_CASE_MODIFIED;
+	code = 0xF3;
+      }
+    }
+    else if (code == 0xB5) {
+      if (flags & ONIGENC_CASE_UPCASE) {
+	flags |= ONIGENC_CASE_MODIFIED;
+	code = 0xCC;
+      }
+      else if (flags & ONIGENC_CASE_FOLD) {
+	flags |= ONIGENC_CASE_MODIFIED;
+	code = 0xEC;
+      }
+    }
+    else if (code == 0xC0 || code == 0xE0 || code == 0xB6)
+      ;
+    else if ((EncCP1253_CtypeTable[code] & BIT_CTYPE_UPPER)
+	     && (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
+      flags |= ONIGENC_CASE_MODIFIED;
+      code = ENC_CP1253_TO_LOWER_CASE(code);
+    }
+    else if ((EncCP1253_CtypeTable[code] & BIT_CTYPE_LOWER)
+	     && (flags & ONIGENC_CASE_UPCASE)) {
+      flags |= ONIGENC_CASE_MODIFIED;
+      if (code == 0xDC)
+	code = 0xA2;
+      else if (code >= 0xDD && code <= 0xDF)
+	code -= 0x25;
+      else if (code == 0xFC)
+	code = 0xBC;
+      else if (code == 0xFD || code == 0xFE)
+	code -= 0x3F;
+      else
+	code -= 0x20;
+    }
+    *to++ = code;
+    if (flags & ONIGENC_CASE_TITLECASE)  /* switch from titlecase to lowercase for capitalize */
+      flags ^= (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_TITLECASE);
+  }
+  *flagP = flags;
+  return (int )(to - to_start);
+}
+
+OnigEncodingDefine(windows_1253, Windows_1253) = {
+  onigenc_single_byte_mbc_enc_len,
+  "Windows-1253",  /* 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,
+  case_map,
+  0,
+  ONIGENC_FLAG_NONE,
+};
+ENC_ALIAS("CP1253", "Windows-1253")
diff --git a/enc/windows_1254.c b/enc/windows_1254.c
new file mode 100644
index 0000000000..5e6d92d3d2
--- /dev/null
+++ b/enc/windows_1254.c
@@ -0,0 +1,302 @@
+/**********************************************************************
+  windows_1254.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.
+ */
+
+/*
+ * Name: windows-1254
+ * MIBenum: 2254
+ * Link: http://www.iana.org/assignments/character-sets
+ * Link: http://www.microsoft.com/globaldev/reference/sbcs/1254.mspx
+ * Link: https://en.wikipedia.org/wiki/Windows-1254
+ */
+
+#include "regenc.h"
+#include "iso_8859.h"
+
+#define ENC_CP1254_TO_LOWER_CASE(c) EncCP1254_ToLowerCaseTable[c]
+#define ENC_IS_CP1254_CTYPE(code,ctype) \
+  ((EncCP1254_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
+
+static const UChar EncCP1254_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', '\232', '\213', '\234', '\215', '\216', '\217',
+  '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
+  '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\377',
+  '\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', '\151', '\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 EncCP1254_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, 0x34a2, 0x0008, 0x34a2, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
+  0x0008, 0x0008, 0x30e2, 0x0008, 0x30e2, 0x0008, 0x0008, 0x34a2,
+  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 == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+    *lower++ = 's';
+    *lower   = 's';
+    (*pp)++;
+    return 2;
+  }
+
+  *lower = ENC_CP1254_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 == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+    (*pp)++;
+    return TRUE;
+  }
+
+  (*pp)++;
+  v = (EncCP1254_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_CP1254_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(
+             numberof(CaseFoldMap), 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(
+	     numberof(CaseFoldMap), CaseFoldMap, 1,
+	     flag, p, end, items);
+}
+
+#define DOTLESS_i        (0xFD)
+#define I_WITH_DOT_ABOVE (0xDD)
+static int
+case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
+	 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
+	 const struct OnigEncodingTypeST* enc)
+{
+  OnigCodePoint code;
+  OnigUChar *to_start = to;
+  OnigCaseFoldType flags = *flagP;
+
+  while (*pp < end && to < to_end) {
+    code = *(*pp)++;
+    if (code == SHARP_s) {
+      if (flags & ONIGENC_CASE_UPCASE) {
+	flags |= ONIGENC_CASE_MODIFIED;
+	*to++ = 'S';
+	code = (flags & ONIGENC_CASE_TITLECASE) ? 's' : 'S';
+      }
+      else if (flags & ONIGENC_CASE_FOLD) {
+	flags |= ONIGENC_CASE_MODIFIED;
+	*to++ = 's';
+	code = 's';
+      }
+    }
+    else if ((EncCP1254_CtypeTable[code] & BIT_CTYPE_UPPER)
+	     && (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
+      flags |= ONIGENC_CASE_MODIFIED;
+      if (code == 'I')
+	code = flags & ONIGENC_CASE_FOLD_TURKISH_AZERI ? DOTLESS_i : 'i';
+      else
+        code = ENC_CP1254_TO_LOWER_CASE(code);
+    }
+    else if (code == 0x83 || code == 0xAA || code == 0xBA || code == 0xB5)
+      ;
+    else if ((EncCP1254_CtypeTable[code] & BIT_CTYPE_LOWER)
+	     && (flags & ONIGENC_CASE_UPCASE)) {
+      flags |= ONIGENC_CASE_MODIFIED;
+      if (code == 'i')
+	code = flags & ONIGENC_CASE_FOLD_TURKISH_AZERI ? I_WITH_DOT_ABOVE : 'I';
+      else if (code == DOTLESS_i)
+	code = 'I';
+      else if (code == 0x9A || code == 0x9C || code == 0x9E)
+	code -= 0x10;
+      else if (code == 0xFF)
+	code -= 0x60;
+      else
+	code -= 0x20;
+    }
+    *to++ = code;
+    if (flags & ONIGENC_CASE_TITLECASE)  /* switch from titlecase to lowercase for capitalize */
+      flags ^= (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_TITLECASE);
+  }
+  *flagP = flags;
+  return (int )(to - to_start);
+}
+
+OnigEncodingDefine(windows_1254, Windows_1254) = {
+  onigenc_single_byte_mbc_enc_len,
+  "Windows-1254",  /* 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,
+  case_map,
+  0,
+  ONIGENC_FLAG_NONE,
+};
+ENC_ALIAS("CP1254", "Windows-1254")
diff --git a/enc/windows_1257.c b/enc/windows_1257.c
new file mode 100644
index 0000000000..ada03b72bf
--- /dev/null
+++ b/enc/windows_1257.c
@@ -0,0 +1,304 @@
+/**********************************************************************
+  windows_1257.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"
+#include "iso_8859.h"
+
+/*
+ * Name: windows-1257
+ * MIBenum: 2257
+ * Link: http://www.iana.org/assignments/character-sets
+ * Link: http://www.microsoft.com/globaldev/reference/sbcs/1257.mspx
+ * Link: https://en.wikipedia.org/wiki/Windows-1257
+ */
+
+#define ENC_CP1252_TO_LOWER_CASE(c) EncCP1252_ToLowerCaseTable[c]
+#define ENC_IS_CP1252_CTYPE(code,ctype) \
+  ((EncCP1252_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
+
+static const UChar EncCP1252_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 EncCP1252_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 == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+    *lower++ = 's';
+    *lower   = 's';
+    (*pp)++;
+    return 2;
+  }
+
+  *lower = ENC_CP1252_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 == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+    (*pp)++;
+    return TRUE;
+  }
+
+  (*pp)++;
+  v = (EncCP1252_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_CP1252_CTYPE(code, ctype);
+  else
+    return FALSE;
+}
+
+static const OnigPairCaseFoldCodes CaseFoldMap[] = {
+ { 0xa8, 0xb8 },
+ { 0xaa, 0xba },
+ { 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(
+             numberof(CaseFoldMap), 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(
+	     numberof(CaseFoldMap), CaseFoldMap, 1,
+	     flag, p, end, items);
+}
+
+#define DOTLESS_i        (0xB9)
+#define I_WITH_DOT_ABOVE (0xA9)
+static int
+case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
+	 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
+	 const struct OnigEncodingTypeST* enc)
+{
+  OnigCodePoint code;
+  OnigUChar *to_start = to;
+  OnigCaseFoldType flags = *flagP;
+
+  while (*pp < end && to < to_end) {
+    code = *(*pp)++;
+    if (code == SHARP_s) {
+      if (flags & ONIGENC_CASE_UPCASE) {
+	flags |= ONIGENC_CASE_MODIFIED;
+	*to++ = 'S';
+	code = (flags & ONIGENC_CASE_TITLECASE) ? 's' : 'S';
+      }
+      else if (flags & ONIGENC_CASE_FOLD) {
+	flags |= ONIGENC_CASE_MODIFIED;
+	*to++ = 's';
+	code = 's';
+      }
+    }
+    else if (code == 0xB5)
+      ;
+    else if ((EncCP1252_CtypeTable[code] & BIT_CTYPE_UPPER)
+	     && (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
+      flags |= ONIGENC_CASE_MODIFIED;
+      if (code == 'I')
+	code = flags & ONIGENC_CASE_FOLD_TURKISH_AZERI ? DOTLESS_i : 'i';
+      else
+	code = ENC_CP1252_TO_LOWER_CASE(code);
+    }
+    else if ((EncCP1252_CtypeTable[code]&BIT_CTYPE_LOWER)
+	     && (flags & ONIGENC_CASE_UPCASE)) {
+      flags |= ONIGENC_CASE_MODIFIED;
+      if (code == 'i')
+	code = flags & ONIGENC_CASE_FOLD_TURKISH_AZERI ? I_WITH_DOT_ABOVE : 'I';
+      else if (code == DOTLESS_i)
+	code = 'I';
+      else if (code >= 0xB0 && code <= 0xBF)
+	code -= 0x10;
+      else
+	code -= 0x20;
+    }
+    *to++ = code;
+    if (flags & ONIGENC_CASE_TITLECASE)  /* switch from titlecase to lowercase for capitalize */
+      flags ^= (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_TITLECASE);
+  }
+  *flagP = flags;
+  return (int )(to - to_start);
+}
+
+OnigEncodingDefine(windows_1257, Windows_1257) = {
+  onigenc_single_byte_mbc_enc_len,
+  "Windows-1257",  /* 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,
+  case_map,
+  0,
+  ONIGENC_FLAG_NONE,
+};
+ENC_ALIAS("CP1257", "Windows-1257")
diff --git a/enc/windows_31j.c b/enc/windows_31j.c
index e4ce906126..1eb859596a 100644
--- a/enc/windows_31j.c
+++ b/enc/windows_31j.c
@@ -1,5 +1,5 @@
 /**********************************************************************
-  cp932.c -  Onigmo (Oniguruma-mod) (regular expression library)
+  windows_31j.c -  Onigmo (Oniguruma-mod) (regular expression library)
 **********************************************************************/
 /*-
  * Copyright (c) 2002-2009  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
@@ -29,11 +29,11 @@
  */
 
 #define ENC_CP932
-#include "shift_jis.c"
+#include "shift_jis.h"
 
 OnigEncodingDefine(windows_31j, Windows_31J) = {
   mbc_enc_len,
-  "Windows-31J",   /* name */
+  "Windows-31J", /* name */
   2,             /* max byte length */
   1,             /* min byte length */
   onigenc_is_mbc_newline_0x0a,
@@ -48,18 +48,16 @@ OnigEncodingDefine(windows_31j, Windows_31J) = {
   get_ctype_code_range,
   left_adjust_char_head,
   is_allowed_reverse_match,
+  onigenc_ascii_only_case_map,
   0,
   ONIGENC_FLAG_NONE,
-#ifdef ONIG_CASE_MAPPING
-  onigenc_ascii_only_case_map,
-#endif   /* ONIG_CASE_MAPPING */
 };
 /*
  * 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: https://ja.wikipedia.org/wiki/Windows-31J
  * Link: http://source.icu-project.org/repos/icu/data/trunk/charset/data/ucm/windows-932-2000.ucm
  *
  * Windows Standard Character Set and its mapping to Unicode by Microsoft.
diff --git a/enc/x_emoji.h b/enc/x_emoji.h
index 23efa1dd9e..c0a3613f1b 100644
--- a/enc/x_emoji.h
+++ b/enc/x_emoji.h
@@ -2,8 +2,8 @@
 
 /*
  * Name: UTF8-DoCoMo, SJIS-DoCoMo
- * Link: https://www.nttdocomo.co.jp/english/service/developer/make/content/pictograph/basic/index.html
- * Link: https://www.nttdocomo.co.jp/english/service/developer/make/content/pictograph/extention/index.html
+ * Link: https://www.nttdocomo.co.jp/service/developer/make/content/pictograph/basic/index.html
+ * Link: https://www.nttdocomo.co.jp/service/developer/make/content/pictograph/extent%69on/index.html
  */
 ENC_REPLICATE("UTF8-DoCoMo", "UTF-8")
 ENC_REPLICATE("SJIS-DoCoMo", "Windows-31J")
diff --git a/encindex.h b/encindex.h
index dcb1646f3a..8457a7b39f 100644
--- a/encindex.h
+++ b/encindex.h
@@ -1,3 +1,5 @@
+#ifndef RUBY_ENCINDEX_H
+#define RUBY_ENCINDEX_H 1
 /**********************************************************************
 
   encindex.h -
@@ -9,8 +11,7 @@
 
 **********************************************************************/
 
-#ifndef RUBY_ENCINDEX_H
-#define RUBY_ENCINDEX_H 1
+#include "ruby/encoding.h"      /* rb_ascii8bit_encindex etc. */
 #if defined(__cplusplus)
 extern "C" {
 #if 0
@@ -57,6 +58,8 @@ enum ruby_preserved_encindex {
 #define rb_utf8_encindex()      RUBY_ENCINDEX_UTF_8
 #define rb_usascii_encindex()   RUBY_ENCINDEX_US_ASCII
 
+int rb_enc_find_index2(const char *name, long len);
+
 #if defined(__cplusplus)
 #if 0
 { /* satisfy cc-mode */
diff --git a/encoding.c b/encoding.c
index 88f31e157b..32d5a349eb 100644
--- a/encoding.c
+++ b/encoding.c
@@ -9,17 +9,29 @@
 
 **********************************************************************/
 
-#include "internal.h"
+#include "ruby/internal/config.h"
+
+#include <ctype.h>
+
 #include "encindex.h"
+#include "internal.h"
+#include "internal/enc.h"
+#include "internal/encoding.h"
+#include "internal/inits.h"
+#include "internal/load.h"
+#include "internal/object.h"
+#include "internal/string.h"
+#include "internal/vm.h"
 #include "regenc.h"
-#include <ctype.h>
+#include "ruby/encoding.h"
 #include "ruby/util.h"
-
 #include "ruby_assert.h"
+#include "vm_sync.h"
+
 #ifndef ENC_DEBUG
 #define ENC_DEBUG 0
 #endif
-#define ENC_ASSERT (!ENC_DEBUG)?(void)0:assert
+#define ENC_ASSERT(expr) RUBY_ASSERT_WHEN(ENC_DEBUG, expr)
 #define MUST_STRING(str) (ENC_ASSERT(RB_TYPE_P(str, T_STRING)), str)
 
 #undef rb_ascii8bit_encindex
@@ -43,7 +55,10 @@ void rb_encdb_set_unicode(int index);
 
 static ID id_encoding;
 VALUE rb_cEncoding;
-static VALUE rb_encoding_list;
+
+#define DEFAULT_ENCODING_LIST_CAPA 128
+static VALUE rb_default_encoding_list;
+static VALUE rb_additional_encoding_list;
 
 struct rb_encoding_entry {
     const char *name;
@@ -51,12 +66,27 @@ struct rb_encoding_entry {
     rb_encoding *base;
 };
 
-static struct {
+static struct enc_table {
     struct rb_encoding_entry *list;
     int count;
     int size;
     st_table *names;
-} enc_table;
+} global_enc_table;
+
+static rb_encoding *global_enc_ascii,
+                   *global_enc_utf_8,
+                   *global_enc_us_ascii;
+
+#define GLOBAL_ENC_TABLE_ENTER(enc_table) struct enc_table *enc_table = &global_enc_table; RB_VM_LOCK_ENTER()
+#define GLOBAL_ENC_TABLE_LEAVE()                                                           RB_VM_LOCK_LEAVE()
+#define GLOBAL_ENC_TABLE_EVAL(enc_table, expr) do { \
+    GLOBAL_ENC_TABLE_ENTER(enc_table); \
+    { \
+        expr; \
+    } \
+    GLOBAL_ENC_TABLE_LEAVE(); \
+} while (0)
+
 
 #define ENC_DUMMY_FLAG (1<<24)
 #define ENC_INDEX_MASK (~(~0U<<24))
@@ -65,18 +95,12 @@ static struct {
 #define ENC_DUMMY_P(enc) ((enc)->ruby_encoding_index & ENC_DUMMY_FLAG)
 #define ENC_SET_DUMMY(enc) ((enc)->ruby_encoding_index |= ENC_DUMMY_FLAG)
 
-void rb_enc_init(void);
-
 #define ENCODING_COUNT ENCINDEX_BUILTIN_MAX
 #define UNSPECIFIED_ENCODING INT_MAX
 
 #define ENCODING_NAMELEN_MAX 63
 #define valid_encoding_name_p(name) ((name) && strlen(name) <= ENCODING_NAMELEN_MAX)
 
-#define enc_autoload_p(enc) (!rb_enc_mbmaxlen(enc))
-
-static int load_encoding(const char *name);
-
 static const rb_data_type_t encoding_data_type = {
     "encoding",
     {0, 0, 0,},
@@ -95,22 +119,69 @@ rb_data_is_encoding(VALUE obj)
 static VALUE
 enc_new(rb_encoding *encoding)
 {
-    return TypedData_Wrap_Struct(rb_cEncoding, &encoding_data_type, (void *)encoding);
+    VALUE enc = TypedData_Wrap_Struct(rb_cEncoding, &encoding_data_type, (void *)encoding);
+    rb_obj_freeze(enc);
+    FL_SET_RAW(enc, RUBY_FL_SHAREABLE);
+    return enc;
+}
+
+static void
+enc_list_update(int index, rb_raw_encoding *encoding)
+{
+    if (index < DEFAULT_ENCODING_LIST_CAPA) {
+        VALUE list = rb_default_encoding_list;
+        if (list && NIL_P(rb_ary_entry(list, index))) {
+            /* initialize encoding data */
+            rb_ary_store(list, index, enc_new(encoding));
+        }
+    }
+    else {
+        RB_VM_LOCK_ENTER();
+        {
+            VALUE list = rb_additional_encoding_list;
+            if (list && NIL_P(rb_ary_entry(list, index))) {
+                /* initialize encoding data */
+                rb_ary_store(list, index - DEFAULT_ENCODING_LIST_CAPA, enc_new(encoding));
+            }
+        }
+        RB_VM_LOCK_LEAVE();
+    }
 }
 
 static VALUE
-rb_enc_from_encoding_index(int idx)
+enc_list_lookup(int idx)
 {
     VALUE list, enc;
 
-    if (!(list = rb_encoding_list)) {
-	rb_bug("rb_enc_from_encoding_index(%d): no rb_encoding_list", idx);
+    if (idx < DEFAULT_ENCODING_LIST_CAPA) {
+        if (!(list = rb_default_encoding_list)) {
+            rb_bug("rb_enc_from_encoding_index(%d): no rb_default_encoding_list", idx);
+        }
+        enc = rb_ary_entry(list, idx);
+    }
+    else {
+        RB_VM_LOCK_ENTER();
+        {
+            if (!(list = rb_additional_encoding_list)) {
+                rb_bug("rb_enc_from_encoding_index(%d): no rb_additional_encoding_list", idx);
+            }
+            enc = rb_ary_entry(list, idx - DEFAULT_ENCODING_LIST_CAPA);
+        }
+        RB_VM_LOCK_LEAVE();
     }
-    enc = rb_ary_entry(list, idx);
+
     if (NIL_P(enc)) {
-	rb_bug("rb_enc_from_encoding_index(%d): not created yet", idx);
+        rb_bug("rb_enc_from_encoding_index(%d): not created yet", idx);
+    }
+    else {
+        return enc;
     }
-    return enc;
+}
+
+static VALUE
+rb_enc_from_encoding_index(int idx)
+{
+    return enc_list_lookup(idx);
 }
 
 VALUE
@@ -134,16 +205,14 @@ rb_enc_dummy_p(rb_encoding *enc)
     return ENC_DUMMY_P(enc) != 0;
 }
 
-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);
+    if (rb_enc_autoload_p(enc)) {
+        index = rb_enc_autoload(enc);
     }
     return index;
 }
@@ -187,7 +256,7 @@ must_encindex(int index)
 	rb_raise(rb_eEncodingError, "wrong encoding index %d for %s (expected %d)",
 		 index, rb_enc_name(enc), ENC_TO_ENCINDEX(enc));
     }
-    if (enc_autoload_p(enc) && enc_autoload(enc) == -1) {
+    if (rb_enc_autoload_p(enc) && rb_enc_autoload(enc) == -1) {
 	rb_loaderror("failed to load encoding (%s)",
 		     rb_enc_name(enc));
     }
@@ -198,6 +267,7 @@ int
 rb_to_encoding_index(VALUE enc)
 {
     int idx;
+    const char *name;
 
     idx = enc_check_encoding(enc);
     if (idx >= 0) {
@@ -209,20 +279,33 @@ rb_to_encoding_index(VALUE enc)
     if (!rb_enc_asciicompat(rb_enc_get(enc))) {
 	return -1;
     }
-    return rb_enc_find_index(StringValueCStr(enc));
+    if (!(name = rb_str_to_cstr(enc))) {
+	return -1;
+    }
+    return rb_enc_find_index(name);
+}
+
+static const char *
+name_for_encoding(volatile VALUE *enc)
+{
+    VALUE name = StringValue(*enc);
+    const char *n;
+
+    if (!rb_enc_asciicompat(rb_enc_get(name))) {
+	rb_raise(rb_eArgError, "invalid encoding name (non ASCII)");
+    }
+    if (!(n = rb_str_to_cstr(name))) {
+	rb_raise(rb_eArgError, "invalid encoding name (NUL byte)");
+    }
+    return n;
 }
 
 /* Returns encoding index or UNSPECIFIED_ENCODING */
 static int
 str_find_encindex(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));
+    int idx = rb_enc_find_index(name_for_encoding(&enc));
+    RB_GC_GUARD(enc);
     return idx;
 }
 
@@ -259,33 +342,26 @@ rb_find_encoding(VALUE enc)
     return rb_enc_from_index(idx);
 }
 
-void
-rb_gc_mark_encodings(void)
-{
-}
-
 static int
-enc_table_expand(int newsize)
+enc_table_expand(struct enc_table *enc_table, int newsize)
 {
     struct rb_encoding_entry *ent;
     int count = newsize;
 
-    if (enc_table.size >= newsize) return 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;
+    ent = REALLOC_N(enc_table->list, struct rb_encoding_entry, newsize);
+    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 *base_encoding)
+enc_register_at(struct enc_table *enc_table, int index, const char *name, rb_encoding *base_encoding)
 {
-    struct rb_encoding_entry *ent = &enc_table.list[index];
+    struct rb_encoding_entry *ent = &enc_table->list[index];
     rb_raw_encoding *encoding;
-    VALUE list;
 
     if (!valid_encoding_name_p(name)) return -1;
     if (!ent->name) {
@@ -307,76 +383,120 @@ enc_register_at(int index, const char *name, rb_encoding *base_encoding)
     encoding->name = name;
     encoding->ruby_encoding_index = index;
     ent->enc = encoding;
-    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));
-    }
+    st_insert(enc_table->names, (st_data_t)name, (st_data_t)index);
+
+    enc_list_update(index, encoding);
     return index;
 }
 
 static int
-enc_register(const char *name, rb_encoding *encoding)
+enc_register(struct enc_table *enc_table, const char *name, rb_encoding *encoding)
 {
-    int index = enc_table.count;
+    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);
+    enc_table->count = enc_table_expand(enc_table, index + 1);
+    return enc_register_at(enc_table, index, name, encoding);
 }
 
 static void set_encoding_const(const char *, rb_encoding *);
-int rb_enc_registered(const char *name);
+static int enc_registered(struct enc_table *enc_table, const char *name);
+
+static rb_encoding *
+enc_from_index(struct enc_table *enc_table, int index)
+{
+    if (UNLIKELY(index < 0 || enc_table->count <= (index &= ENC_INDEX_MASK))) {
+	return 0;
+    }
+    return enc_table->list[index].enc;
+}
+
+rb_encoding *
+rb_enc_from_index(int index)
+{
+    rb_encoding *enc;
+
+    switch (index) {
+      case ENCINDEX_ASCII:    return global_enc_ascii;
+      case ENCINDEX_UTF_8:    return global_enc_utf_8;
+      case ENCINDEX_US_ASCII: return global_enc_us_ascii;
+      default:
+        GLOBAL_ENC_TABLE_EVAL(enc_table,
+                              enc = enc_from_index(enc_table, index));
+        return enc;
+    }
+}
 
 int
 rb_enc_register(const char *name, rb_encoding *encoding)
 {
-    int index = rb_enc_registered(name);
+    int index;
+
+    GLOBAL_ENC_TABLE_ENTER(enc_table);
+    {
+        index = enc_registered(enc_table, name);
+
+        if (index >= 0) {
+            rb_encoding *oldenc = enc_from_index(enc_table, index);
+            if (STRCASECMP(name, rb_enc_name(oldenc))) {
+                index = enc_register(enc_table, name, encoding);
+            }
+            else if (rb_enc_autoload_p(oldenc) || !ENC_DUMMY_P(oldenc)) {
+                enc_register_at(enc_table, index, name, encoding);
+            }
+            else {
+                rb_raise(rb_eArgError, "encoding %s is already registered", name);
+            }
+        }
+        else {
+            index = enc_register(enc_table, name, encoding);
+            set_encoding_const(name, rb_enc_from_index(index));
+        }
+    }
+    GLOBAL_ENC_TABLE_LEAVE();
+    return index;
+}
 
-    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));
+int
+enc_registered(struct enc_table *enc_table, 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 index;
+    return -1;
 }
 
 void
 rb_encdb_declare(const char *name)
 {
-    int idx = rb_enc_registered(name);
-    if (idx < 0) {
-	idx = enc_register(name, 0);
+    GLOBAL_ENC_TABLE_ENTER(enc_table);
+    {
+        int idx = enc_registered(enc_table, name);
+        if (idx < 0) {
+            idx = enc_register(enc_table, name, 0);
+        }
+        set_encoding_const(name, rb_enc_from_index(idx));
     }
-    set_encoding_const(name, rb_enc_from_index(idx));
+    GLOBAL_ENC_TABLE_LEAVE();
 }
 
 static void
-enc_check_duplication(const char *name)
+enc_check_duplication(struct enc_table *enc_table, const char *name)
 {
-    if (rb_enc_registered(name) >= 0) {
+    if (enc_registered(enc_table, name) >= 0) {
 	rb_raise(rb_eArgError, "encoding %s is already registered", name);
     }
 }
 
 static rb_encoding*
-set_base_encoding(int index, rb_encoding *base)
+set_base_encoding(struct enc_table *enc_table, int index, rb_encoding *base)
 {
-    rb_encoding *enc = enc_table.list[index].enc;
+    rb_encoding *enc = enc_table->list[index].enc;
 
-    enc_table.list[index].base = base;
+    enc_table->list[index].base = base;
     if (ENC_DUMMY_P(base)) ENC_SET_DUMMY((rb_raw_encoding *)enc);
     return enc;
 }
@@ -388,9 +508,13 @@ set_base_encoding(int index, rb_encoding *base)
 void
 rb_enc_set_base(const char *name, const char *orig)
 {
-    int idx = rb_enc_registered(name);
-    int origidx = rb_enc_registered(orig);
-    set_base_encoding(idx, rb_enc_from_index(origidx));
+    GLOBAL_ENC_TABLE_ENTER(enc_table);
+    {
+        int idx = enc_registered(enc_table, name);
+        int origidx = enc_registered(enc_table, orig);
+        set_base_encoding(enc_table, idx, rb_enc_from_index(origidx));
+    }
+    GLOBAL_ENC_TABLE_LEAVE();
 }
 
 /* for encdb.h
@@ -399,24 +523,39 @@ rb_enc_set_base(const char *name, const char *orig)
 int
 rb_enc_set_dummy(int index)
 {
-    rb_encoding *enc = enc_table.list[index].enc;
+    rb_encoding *enc;
+
+    GLOBAL_ENC_TABLE_EVAL(enc_table,
+                          enc = enc_table->list[index].enc);
 
     ENC_SET_DUMMY((rb_raw_encoding *)enc);
     return index;
 }
 
-int
-rb_enc_replicate(const char *name, rb_encoding *encoding)
+static int
+enc_replicate(struct enc_table *enc_table, const char *name, rb_encoding *encoding)
 {
     int idx;
 
-    enc_check_duplication(name);
-    idx = enc_register(name, encoding);
-    set_base_encoding(idx, encoding);
+    enc_check_duplication(enc_table, name);
+    idx = enc_register(enc_table, name, encoding);
+    if (idx < 0) rb_raise(rb_eArgError, "invalid encoding name: %s", name);
+    set_base_encoding(enc_table, idx, encoding);
     set_encoding_const(name, rb_enc_from_index(idx));
     return idx;
 }
 
+int
+rb_enc_replicate(const char *name, rb_encoding *encoding)
+{
+    int r;
+
+    GLOBAL_ENC_TABLE_EVAL(enc_table,
+                          r = enc_replicate(enc_table, name, encoding));
+
+    return r;
+}
+
 /*
  * call-seq:
  *   enc.replicate(name) -> encoding
@@ -427,59 +566,83 @@ rb_enc_replicate(const char *name, rb_encoding *encoding)
  *
  */
 static VALUE
-enc_replicate(VALUE encoding, VALUE name)
+enc_replicate_m(VALUE encoding, VALUE name)
 {
-    return rb_enc_from_encoding_index(
-	rb_enc_replicate(StringValueCStr(name),
-			 rb_to_encoding(encoding)));
+    int idx = rb_enc_replicate(name_for_encoding(&name), rb_to_encoding(encoding));
+    RB_GC_GUARD(name);
+    return rb_enc_from_encoding_index(idx);
 }
 
 static int
-enc_replicate_with_index(const char *name, rb_encoding *origenc, int idx)
+enc_replicate_with_index(struct enc_table *enc_table, const char *name, rb_encoding *origenc, int idx)
 {
     if (idx < 0) {
-	idx = enc_register(name, origenc);
+        idx = enc_register(enc_table, name, origenc);
     }
     else {
-	idx = enc_register_at(idx, name, origenc);
+	idx = enc_register_at(enc_table, idx, name, origenc);
     }
     if (idx >= 0) {
-	set_base_encoding(idx, origenc);
+	set_base_encoding(enc_table, idx, origenc);
 	set_encoding_const(name, rb_enc_from_index(idx));
     }
+    else {
+        rb_raise(rb_eArgError, "failed to replicate encoding");
+    }
     return idx;
 }
 
 int
 rb_encdb_replicate(const char *name, const char *orig)
 {
-    int origidx = rb_enc_registered(orig);
-    int idx = rb_enc_registered(name);
+    int r;
 
-    if (origidx < 0) {
-	origidx = enc_register(orig, 0);
+    GLOBAL_ENC_TABLE_ENTER(enc_table);
+    {
+        int origidx = enc_registered(enc_table, orig);
+        int idx = enc_registered(enc_table, name);
+
+        if (origidx < 0) {
+            origidx = enc_register(enc_table, orig, 0);
+        }
+        r = enc_replicate_with_index(enc_table, name, rb_enc_from_index(origidx), idx);
     }
-    return enc_replicate_with_index(name, rb_enc_from_index(origidx), idx);
+    GLOBAL_ENC_TABLE_LEAVE();
+
+    return r;
 }
 
 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;
+    int index;
+
+    GLOBAL_ENC_TABLE_ENTER(enc_table);
+    {
+        index = enc_replicate(enc_table, name, rb_ascii8bit_encoding());
+        rb_encoding *enc = enc_table->list[index].enc;
+        ENC_SET_DUMMY((rb_raw_encoding *)enc);
+    }
+    GLOBAL_ENC_TABLE_LEAVE();
 
-    ENC_SET_DUMMY((rb_raw_encoding *)enc);
     return index;
 }
 
 int
 rb_encdb_dummy(const char *name)
 {
-    int index = enc_replicate_with_index(name, rb_ascii8bit_encoding(),
-					 rb_enc_registered(name));
-    rb_encoding *enc = enc_table.list[index].enc;
+    int index;
+
+    GLOBAL_ENC_TABLE_ENTER(enc_table);
+    {
+        index = enc_replicate_with_index(enc_table, name,
+                                         rb_ascii8bit_encoding(),
+                                         enc_registered(enc_table, name));
+        rb_encoding *enc = enc_table->list[index].enc;
+        ENC_SET_DUMMY((rb_raw_encoding *)enc);
+    }
+    GLOBAL_ENC_TABLE_LEAVE();
 
-    ENC_SET_DUMMY((rb_raw_encoding *)enc);
     return index;
 }
 
@@ -538,45 +701,58 @@ enc_dup_name(st_data_t name)
  * else returns NULL.
  */
 static int
-enc_alias_internal(const char *alias, int idx)
+enc_alias_internal(struct enc_table *enc_table, const char *alias, int idx)
 {
-    return st_insert2(enc_table.names, (st_data_t)alias, (st_data_t)idx,
+    return st_insert2(enc_table->names, (st_data_t)alias, (st_data_t)idx,
 		      enc_dup_name);
 }
 
 static int
-enc_alias(const char *alias, int idx)
+enc_alias(struct enc_table *enc_table, const char *alias, int idx)
 {
     if (!valid_encoding_name_p(alias)) return -1;
-    if (!enc_alias_internal(alias, idx))
-	set_encoding_const(alias, rb_enc_from_index(idx));
+    if (!enc_alias_internal(enc_table, alias, idx))
+	set_encoding_const(alias, enc_from_index(enc_table, idx));
     return idx;
 }
 
 int
 rb_enc_alias(const char *alias, const char *orig)
 {
-    int idx;
+    int idx, r;
 
-    enc_check_duplication(alias);
-    if (!enc_table.list) {
-	rb_enc_init();
+    GLOBAL_ENC_TABLE_ENTER(enc_table);
+    {
+        enc_check_duplication(enc_table, alias);
+        if ((idx = rb_enc_find_index(orig)) < 0) {
+            r =  -1;
+        }
+        else {
+            r = enc_alias(enc_table, alias, idx);
+        }
     }
-    if ((idx = rb_enc_find_index(orig)) < 0) {
-	return -1;
-    }
-    return enc_alias(alias, idx);
+    GLOBAL_ENC_TABLE_LEAVE();
+
+    return r;
 }
 
 int
 rb_encdb_alias(const char *alias, const char *orig)
 {
-    int idx = rb_enc_registered(orig);
+    int r;
 
-    if (idx < 0) {
-	idx = enc_register(orig, 0);
+    GLOBAL_ENC_TABLE_ENTER(enc_table);
+    {
+        int idx = enc_registered(enc_table, orig);
+
+        if (idx < 0) {
+            idx = enc_register(enc_table, orig, 0);
+        }
+        r = enc_alias(enc_table, alias, idx);
     }
-    return enc_alias(alias, idx);
+    GLOBAL_ENC_TABLE_LEAVE();
+
+    return r;
 }
 
 void
@@ -585,19 +761,22 @@ rb_encdb_set_unicode(int index)
     ((rb_raw_encoding *)rb_enc_from_index(index))->flags |= ONIGENC_FLAG_UNICODE;
 }
 
-void
-rb_enc_init(void)
+static void
+rb_enc_init(struct enc_table *enc_table)
 {
-    enc_table_expand(ENCODING_COUNT + 1);
-    if (!enc_table.names) {
-	enc_table.names = st_init_strcasetable();
+    enc_table_expand(enc_table, 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)
+#define ENC_REGISTER(enc) enc_register_at(enc_table, ENCINDEX_##enc, rb_enc_name(&OnigEncoding##enc), &OnigEncoding##enc)
     ENC_REGISTER(ASCII);
     ENC_REGISTER(UTF_8);
     ENC_REGISTER(US_ASCII);
+    global_enc_ascii = enc_table->list[ENCINDEX_ASCII].enc;
+    global_enc_utf_8 = enc_table->list[ENCINDEX_UTF_8].enc;
+    global_enc_us_ascii = enc_table->list[ENCINDEX_US_ASCII].enc;
 #undef ENC_REGISTER
-#define ENCDB_REGISTER(name, enc) enc_register_at(ENCINDEX_##enc, name, NULL)
+#define ENCDB_REGISTER(name, enc) enc_register_at(enc_table, ENCINDEX_##enc, name, NULL)
     ENCDB_REGISTER("UTF-16BE", UTF_16BE);
     ENCDB_REGISTER("UTF-16LE", UTF_16LE);
     ENCDB_REGISTER("UTF-32BE", UTF_32BE);
@@ -609,19 +788,7 @@ rb_enc_init(void)
     ENCDB_REGISTER("EUC-JP", EUC_JP);
     ENCDB_REGISTER("Windows-31J", Windows_31J);
 #undef ENCDB_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 &= ENC_INDEX_MASK)) {
-	return 0;
-    }
-    return enc_table.list[index].enc;
+    enc_table->count = ENCINDEX_BUILTIN_MAX;
 }
 
 rb_encoding *
@@ -630,19 +797,6 @@ rb_enc_get_from_index(int index)
     return must_encindex(index);
 }
 
-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 int
 load_encoding(const char *name)
 {
@@ -659,42 +813,63 @@ load_encoding(const char *name)
 	else if (ISUPPER(*s)) *s = (char)TOLOWER(*s);
 	++s;
     }
-    FL_UNSET(enclib, FL_TAINT);
-    OBJ_FREEZE(enclib);
+    enclib = rb_fstring(enclib);
     ruby_verbose = Qfalse;
     ruby_debug = Qfalse;
     errinfo = rb_errinfo();
-    loaded = rb_require_internal(enclib, rb_safe_level());
+    loaded = rb_require_internal(enclib);
     ruby_verbose = verbose;
     ruby_debug = debug;
     rb_set_errinfo(errinfo);
-    if (loaded < 0 || 1 < loaded) return -1;
-    if ((idx = rb_enc_registered(name)) < 0) return -1;
-    if (enc_autoload_p(enc_table.list[idx].enc)) return -1;
+
+    GLOBAL_ENC_TABLE_ENTER(enc_table);
+    {
+        if (loaded < 0 || 1 < loaded) {
+            idx = -1;
+        }
+        else if ((idx = enc_registered(enc_table, name)) < 0) {
+            idx = -1;
+        }
+        else if (rb_enc_autoload_p(enc_table->list[idx].enc)) {
+            idx = -1;
+        }
+    }
+    GLOBAL_ENC_TABLE_LEAVE();
+
     return idx;
 }
 
 static int
-enc_autoload(rb_encoding *enc)
+enc_autoload_body(struct enc_table *enc_table, rb_encoding *enc)
 {
-    int i;
-    rb_encoding *base = enc_table.list[ENC_TO_ENCINDEX(enc)].base;
+    rb_encoding *base = enc_table->list[ENC_TO_ENCINDEX(enc)].base;
 
     if (base) {
-	i = 0;
+        int 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;
+	    if (i >= enc_table->count) return -1;
+	} while (enc_table->list[i].enc != base && (++i, 1));
+	if (rb_enc_autoload_p(base)) {
+	    if (rb_enc_autoload(base) < 0) return -1;
 	}
 	i = enc->ruby_encoding_index;
-	enc_register_at(i & ENC_INDEX_MASK, rb_enc_name(enc), base);
-	((rb_raw_encoding *)enc)->ruby_encoding_index = i;
+	enc_register_at(enc_table, i & ENC_INDEX_MASK, rb_enc_name(enc), base);
+        ((rb_raw_encoding *)enc)->ruby_encoding_index = i;
 	i &= ENC_INDEX_MASK;
+        return i;
     }
     else {
-	i = load_encoding(rb_enc_name(enc));
+        return -2;
+    }
+}
+
+int
+rb_enc_autoload(rb_encoding *enc)
+{
+    int i;
+    GLOBAL_ENC_TABLE_EVAL(enc_table, i = enc_autoload_body(enc_table, enc));
+    if (i == -2) {
+        i = load_encoding(rb_enc_name(enc));
     }
     return i;
 }
@@ -703,9 +878,11 @@ enc_autoload(rb_encoding *enc)
 int
 rb_enc_find_index(const char *name)
 {
-    int i = rb_enc_registered(name);
+    int i;
     rb_encoding *enc;
 
+    GLOBAL_ENC_TABLE_EVAL(enc_table, i = enc_registered(enc_table, name));
+
     if (i < 0) {
 	i = load_encoding(name);
     }
@@ -714,8 +891,8 @@ rb_enc_find_index(const char *name)
 	    rb_raise(rb_eArgError, "encoding %s is not registered", name);
 	}
     }
-    else if (enc_autoload_p(enc)) {
-	if (enc_autoload(enc) < 0) {
+    else if (rb_enc_autoload_p(enc)) {
+	if (rb_enc_autoload(enc) < 0) {
 	    rb_warn("failed to load encoding (%s); use ASCII-8BIT instead",
 		    name);
 	    return 0;
@@ -724,6 +901,17 @@ rb_enc_find_index(const char *name)
     return i;
 }
 
+int
+rb_enc_find_index2(const char *name, long len)
+{
+    char buf[ENCODING_NAMELEN_MAX+1];
+
+    if (len > ENCODING_NAMELEN_MAX) return -1;
+    memcpy(buf, name, len);
+    buf[len] = '\0';
+    return rb_enc_find_index(buf);
+}
+
 rb_encoding *
 rb_enc_find(const char *name)
 {
@@ -749,6 +937,12 @@ enc_capable(VALUE obj)
     }
 }
 
+int
+rb_enc_capable(VALUE obj)
+{
+    return enc_capable(obj);
+}
+
 ID
 rb_id_encoding(void)
 {
@@ -763,8 +957,18 @@ enc_get_index_str(VALUE str)
     if (i == ENCODING_INLINE_MAX) {
 	VALUE iv;
 
+#if 0
 	iv = rb_ivar_get(str, rb_id_encoding());
 	i = NUM2INT(iv);
+#else
+        /*
+         * Tentatively, assume ASCII-8BIT, if encoding index instance
+         * variable is not found.  This can happen when freeing after
+         * all instance variables are removed in `obj_free`.
+         */
+        iv = rb_attr_get(str, rb_id_encoding());
+        i = NIL_P(iv) ? ENCINDEX_ASCII : NUM2INT(iv);
+#endif
     }
     return i;
 }
@@ -780,24 +984,26 @@ rb_enc_get_index(VALUE obj)
 	obj = rb_sym2str(obj);
     }
     switch (BUILTIN_TYPE(obj)) {
-      as_default:
-      default:
       case T_STRING:
+      case T_SYMBOL:
       case T_REGEXP:
 	i = enc_get_index_str(obj);
 	break;
       case T_FILE:
 	tmp = rb_funcallv(obj, rb_intern("internal_encoding"), 0, 0);
-	if (NIL_P(tmp)) obj = rb_funcallv(obj, rb_intern("external_encoding"), 0, 0);
-	else obj = tmp;
-	if (NIL_P(obj)) break;
+	if (NIL_P(tmp)) {
+	    tmp = rb_funcallv(obj, rb_intern("external_encoding"), 0, 0);
+	}
+	if (is_obj_encoding(tmp)) {
+	    i = enc_check_encoding(tmp);
+	}
+	break;
       case T_DATA:
 	if (is_data_encoding(obj)) {
 	    i = enc_check_encoding(obj);
 	}
-	else {
-	    goto as_default;
-	}
+	break;
+      default:
 	break;
     }
     return i;
@@ -806,6 +1012,10 @@ rb_enc_get_index(VALUE obj)
 static void
 enc_set_index(VALUE obj, int idx)
 {
+    if (!enc_capable(obj)) {
+        rb_raise(rb_eArgError, "cannot set encoding on non-encoding capable object");
+    }
+
     if (idx < ENCODING_INLINE_MAX) {
 	ENCODING_SET_INLINED(obj, idx);
 	return;
@@ -843,8 +1053,8 @@ rb_enc_associate_index(VALUE obj, int idx)
     }
     termlen = rb_enc_mbminlen(enc);
     oldtermlen = rb_enc_mbminlen(rb_enc_from_index(oldidx));
-    if (oldtermlen < termlen && RB_TYPE_P(obj, T_STRING)) {
-	rb_str_fill_terminator(obj, termlen);
+    if (oldtermlen != termlen && RB_TYPE_P(obj, T_STRING)) {
+	rb_str_change_terminator_length(obj, oldtermlen, termlen);
     }
     enc_set_index(obj, idx);
     return obj;
@@ -897,7 +1107,7 @@ enc_compatible_latter(VALUE str1, VALUE str2, int idx1, int idx2)
     if (isstr2 && RSTRING_LEN(str2) == 0)
 	return enc1;
     isstr1 = RB_TYPE_P(str1, T_STRING);
-    if (isstr1 && RSTRING_LEN(str1) == 0)
+    if (isstr1 && isstr2 && RSTRING_LEN(str1) == 0)
 	return (rb_enc_asciicompat(enc1) && rb_enc_str_asciionly_p(str2)) ? enc1 : enc2;
     if (!rb_enc_asciicompat(enc1) || !rb_enc_asciicompat(enc2)) {
 	return 0;
@@ -1031,7 +1241,8 @@ rb_enc_precise_mbclen(const char *p, const char *e, rb_encoding *enc)
 int
 rb_enc_ascget(const char *p, const char *e, int *len, rb_encoding *enc)
 {
-    unsigned int c, l;
+    unsigned int c;
+    int l;
     if (e <= p)
         return -1;
     if (rb_enc_asciicompat(enc)) {
@@ -1125,7 +1336,7 @@ enc_inspect(VALUE self)
 			  "#<%"PRIsVALUE":%s%s%s>", rb_obj_class(self),
 			  rb_enc_name(enc),
 			  (ENC_DUMMY_P(enc) ? " (dummy)" : ""),
-			  enc_autoload_p(enc) ? " (autoload)" : "");
+			  rb_enc_autoload_p(enc) ? " (autoload)" : "");
 }
 
 /*
@@ -1149,8 +1360,7 @@ enc_names_i(st_data_t name, st_data_t idx, st_data_t args)
     VALUE *arg = (VALUE *)args;
 
     if ((int)idx == (int)arg[0]) {
-	VALUE str = rb_usascii_str_new2((char *)name);
-	OBJ_FREEZE(str);
+	VALUE str = rb_fstring_cstr((char *)name);
 	rb_ary_push(arg[1], str);
     }
     return ST_CONTINUE;
@@ -1162,7 +1372,7 @@ enc_names_i(st_data_t name, st_data_t idx, st_data_t args)
  *
  * Returns the list of name and aliases of the encoding.
  *
- *   Encoding::WINDOWS_31J.names  #=> ["Windows-31J", "CP932", "csWindows31J"]
+ *   Encoding::WINDOWS_31J.names  #=> ["Windows-31J", "CP932", "csWindows31J", "SJIS", "PCK"]
  */
 static VALUE
 enc_names(VALUE self)
@@ -1171,7 +1381,10 @@ enc_names(VALUE self)
 
     args[0] = (VALUE)rb_to_encoding_index(self);
     args[1] = rb_ary_new2(0);
-    st_foreach(enc_table.names, enc_names_i, (st_data_t)args);
+
+    GLOBAL_ENC_TABLE_EVAL(enc_table,
+                          st_foreach(enc_table->names, enc_names_i, (st_data_t)args));
+
     return args[1];
 }
 
@@ -1197,7 +1410,14 @@ static VALUE
 enc_list(VALUE klass)
 {
     VALUE ary = rb_ary_new2(0);
-    rb_ary_replace(ary, rb_encoding_list);
+
+    RB_VM_LOCK_ENTER();
+    {
+        rb_ary_replace(ary, rb_default_encoding_list);
+        rb_ary_concat(ary, rb_additional_encoding_list);
+    }
+    RB_VM_LOCK_LEAVE();
+
     return ary;
 }
 
@@ -1270,12 +1490,13 @@ enc_compatible_p(VALUE klass, VALUE str1, VALUE str2)
     return rb_enc_from_encoding(enc);
 }
 
+NORETURN(static VALUE enc_s_alloc(VALUE klass));
 /* :nodoc: */
 static VALUE
 enc_s_alloc(VALUE klass)
 {
     rb_undefined_alloc(klass);
-    return Qnil;
+    UNREACHABLE_RETURN(Qnil);
 }
 
 /* :nodoc: */
@@ -1303,10 +1524,7 @@ enc_m_loader(VALUE klass, VALUE str)
 rb_encoding *
 rb_ascii8bit_encoding(void)
 {
-    if (!enc_table.list) {
-	rb_enc_init();
-    }
-    return enc_table.list[ENCINDEX_ASCII].enc;
+    return global_enc_ascii;
 }
 
 int
@@ -1318,10 +1536,7 @@ rb_ascii8bit_encindex(void)
 rb_encoding *
 rb_utf8_encoding(void)
 {
-    if (!enc_table.list) {
-	rb_enc_init();
-    }
-    return enc_table.list[ENCINDEX_UTF_8].enc;
+    return global_enc_utf_8;
 }
 
 int
@@ -1333,10 +1548,7 @@ rb_utf8_encindex(void)
 rb_encoding *
 rb_usascii_encoding(void)
 {
-    if (!enc_table.list) {
-	rb_enc_init();
-    }
-    return enc_table.list[ENCINDEX_US_ASCII].enc;
+    return global_enc_us_ascii;
 }
 
 int
@@ -1352,15 +1564,17 @@ rb_locale_encindex(void)
 {
     int idx = rb_locale_charmap_index();
 
-    if (idx < 0) idx = ENCINDEX_ASCII;
+    if (idx < 0) idx = ENCINDEX_UTF_8;
 
-    if (rb_enc_registered("locale") < 0) {
+    GLOBAL_ENC_TABLE_ENTER(enc_table);
+    if (enc_registered(enc_table, "locale") < 0) {
 # if defined _WIN32
 	void Init_w32_codepage(void);
 	Init_w32_codepage();
 # endif
-	enc_alias_internal("locale", idx);
+	enc_alias_internal(enc_table, "locale", idx);
     }
+    GLOBAL_ENC_TABLE_LEAVE();
 
     return idx;
 }
@@ -1374,7 +1588,11 @@ rb_locale_encoding(void)
 int
 rb_filesystem_encindex(void)
 {
-    int idx = rb_enc_registered("filesystem");
+    int idx;
+
+    GLOBAL_ENC_TABLE_EVAL(enc_table,
+                          idx = enc_registered(enc_table, "filesystem"));
+
     if (idx < 0)
 	idx = ENCINDEX_ASCII;
     return idx;
@@ -1402,20 +1620,25 @@ enc_set_default_encoding(struct default_encoding *def, VALUE encoding, const cha
 	/* Already set */
 	overridden = TRUE;
 
-    if (NIL_P(encoding)) {
-	def->index = -1;
-	def->enc = 0;
-	st_insert(enc_table.names, (st_data_t)strdup(name),
-		  (st_data_t)UNSPECIFIED_ENCODING);
-    }
-    else {
-	def->index = rb_enc_to_index(rb_to_encoding(encoding));
-	def->enc = 0;
-	enc_alias_internal(name, def->index);
-    }
-
-    if (def == &default_external)
-	enc_alias_internal("filesystem", Init_enc_set_filesystem_encoding());
+    GLOBAL_ENC_TABLE_ENTER(enc_table);
+    {
+        if (NIL_P(encoding)) {
+            def->index = -1;
+            def->enc = 0;
+            st_insert(enc_table->names, (st_data_t)strdup(name),
+                      (st_data_t)UNSPECIFIED_ENCODING);
+        }
+        else {
+            def->index = rb_enc_to_index(rb_to_encoding(encoding));
+            def->enc = 0;
+            enc_alias_internal(enc_table, name, def->index);
+        }
+
+        if (def == &default_external) {
+            enc_alias_internal(enc_table, "filesystem", Init_enc_set_filesystem_encoding());
+        }
+    }
+    GLOBAL_ENC_TABLE_LEAVE();
 
     return overridden;
 }
@@ -1462,9 +1685,11 @@ rb_enc_default_external(void)
  * encoding may not be valid.  Be sure to check String#valid_encoding?.
  *
  * File data written to disk will be transcoded to the default external
- * encoding when written.
+ * encoding when written, if default_internal is not nil.
  *
- * The default external encoding is initialized by the locale or -E option.
+ * The default external encoding is initialized by the -E option.
+ * If -E isn't set, it is initialized to UTF-8 on Windows and the locale on
+ * other operating systems.
  */
 static VALUE
 get_default_external(VALUE klass)
@@ -1544,11 +1769,10 @@ rb_enc_default_internal(void)
  * Additionally String#encode and String#encode! use the default internal
  * encoding if no encoding is given.
  *
- * The locale encoding (__ENCODING__), not default_internal, is used as the
+ * The script encoding (__ENCODING__), not default_internal, is used as the
  * encoding of created strings.
  *
- * Encoding::default_internal is initialized by the source file's
- * internal_encoding or -E option.
+ * Encoding::default_internal is initialized with -E option or nil otherwise.
  */
 static VALUE
 get_default_internal(VALUE klass)
@@ -1661,8 +1885,15 @@ rb_enc_name_list_i(st_data_t name, st_data_t idx, st_data_t arg)
 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);
+    VALUE ary;
+
+    GLOBAL_ENC_TABLE_ENTER(enc_table);
+    {
+        ary = rb_ary_new2(enc_table->names->num_entries);
+        st_foreach(enc_table->names, rb_enc_name_list_i, (st_data_t)ary);
+    }
+    GLOBAL_ENC_TABLE_LEAVE();
+
     return ary;
 }
 
@@ -1684,8 +1915,7 @@ rb_enc_aliases_enc_i(st_data_t name, st_data_t orig, st_data_t arg)
 	str = rb_fstring_cstr(rb_enc_name(enc));
 	rb_ary_store(ary, idx, str);
     }
-    key = rb_usascii_str_new2((char *)name);
-    OBJ_FREEZE(key);
+    key = rb_fstring_cstr((char *)name);
     rb_hash_aset(aliases, key, str);
     return ST_CONTINUE;
 }
@@ -1697,8 +1927,8 @@ rb_enc_aliases_enc_i(st_data_t name, st_data_t orig, st_data_t arg)
  * 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"}
+ *   #=> {"BINARY"=>"ASCII-8BIT", "ASCII"=>"US-ASCII", "ANSI_X3.4-1968"=>"US-ASCII",
+ *         "SJIS"=>"Windows-31J", "eucJP"=>"EUC-JP", "CP932"=>"Windows-31J"}
  *
  */
 
@@ -1708,7 +1938,10 @@ 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);
+
+    GLOBAL_ENC_TABLE_EVAL(enc_table,
+                          st_foreach(enc_table->names, rb_enc_aliases_enc_i, (st_data_t)aliases));
+
     return aliases[0];
 }
 
@@ -1738,11 +1971,11 @@ rb_enc_aliases(VALUE klass)
  *   "some string".encode "ISO-8859-1"
  *   #=> "some string"
  *
- * <code>Encoding::ASCII_8BIT</code> is a special encoding that is usually
- * used for a byte string, not a character string. But as the name insists,
- * its characters in the range of ASCII are considered as ASCII characters.
- * This is useful when you use ASCII-8BIT characters with other ASCII
- * compatible characters.
+ * Encoding::ASCII_8BIT is a special encoding that is usually used for
+ * a byte string, not a character string. But as the name insists, its
+ * characters in the range of ASCII are considered as ASCII
+ * characters.  This is useful when you use ASCII-8BIT characters with
+ * other ASCII compatible characters.
  *
  * == Changing an encoding
  *
@@ -1780,11 +2013,12 @@ rb_enc_aliases(VALUE klass)
  * All Ruby script code has an associated Encoding which any String literal
  * created in the source code will be associated to.
  *
- * The default script encoding is <code>Encoding::UTF-8</code> after v2.0, but it can
- * be changed by a magic comment on the first line of the source code file (or
- * second line, if there is a shebang line on the first). The comment must
- * contain the word <code>coding</code> or <code>encoding</code>, followed
- * by a colon, space and the Encoding name or alias:
+ * The default script encoding is Encoding::UTF_8 after v2.0, but it
+ * can be changed by a magic comment on the first line of the source
+ * code file (or second line, if there is a shebang line on the
+ * first). The comment must contain the word <code>coding</code> or
+ * <code>encoding</code>, followed by a colon, space and the Encoding
+ * name or alias:
  *
  *   # encoding: UTF-8
  *
@@ -1915,8 +2149,6 @@ rb_enc_aliases(VALUE klass)
 void
 Init_Encoding(void)
 {
-#undef rb_intern
-#define rb_intern(str) rb_intern_const(str)
     VALUE list;
     int i;
 
@@ -1929,7 +2161,7 @@ Init_Encoding(void)
     rb_define_method(rb_cEncoding, "names", enc_names, 0);
     rb_define_method(rb_cEncoding, "dummy?", enc_dummy_p, 0);
     rb_define_method(rb_cEncoding, "ascii_compatible?", enc_ascii_compatible_p, 0);
-    rb_define_method(rb_cEncoding, "replicate", enc_replicate, 1);
+    rb_define_method(rb_cEncoding, "replicate", enc_replicate_m, 1);
     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);
@@ -1945,16 +2177,29 @@ Init_Encoding(void)
     rb_define_singleton_method(rb_cEncoding, "default_internal=", set_default_internal, 1);
     rb_define_singleton_method(rb_cEncoding, "locale_charmap", rb_locale_charmap, 0); /* in localeinit.c */
 
-    list = rb_ary_new2(enc_table.count);
+    struct enc_table *enc_table = &global_enc_table;
+
+    if (DEFAULT_ENCODING_LIST_CAPA < enc_table->count) rb_bug("DEFAULT_ENCODING_LIST_CAPA is too small");
+
+    list = rb_additional_encoding_list = rb_ary_new();
+    RBASIC_CLEAR_CLASS(list);
+    rb_gc_register_mark_object(list);
+
+    list = rb_default_encoding_list = rb_ary_new2(DEFAULT_ENCODING_LIST_CAPA);
     RBASIC_CLEAR_CLASS(list);
-    rb_encoding_list = list;
     rb_gc_register_mark_object(list);
 
-    for (i = 0; i < enc_table.count; ++i) {
-	rb_ary_push(list, enc_new(enc_table.list[i].enc));
+    for (i = 0; i < enc_table->count; ++i) {
+	rb_ary_push(list, enc_new(enc_table->list[i].enc));
     }
 
-    rb_marshal_define_compat(rb_cEncoding, Qnil, NULL, enc_m_loader);
+    rb_marshal_define_compat(rb_cEncoding, Qnil, 0, enc_m_loader);
+}
+
+void
+Init_encodings(void)
+{
+    rb_enc_init(&global_enc_table);
 }
 
 /* locale insensitive ctype functions */
@@ -1962,5 +2207,5 @@ Init_Encoding(void)
 void
 rb_enc_foreach_name(int (*func)(st_data_t name, st_data_t idx, st_data_t arg), st_data_t arg)
 {
-    st_foreach(enc_table.names, func, arg);
+    GLOBAL_ENC_TABLE_EVAL(enc_table, st_foreach(enc_table->names, func, arg));
 }
diff --git a/enum.c b/enum.c
index b62f7c3f37..b1a617d585 100644
--- a/enum.c
+++ b/enum.c
@@ -9,23 +9,32 @@
 
 **********************************************************************/
 
+#include "id.h"
 #include "internal.h"
+#include "internal/compar.h"
+#include "internal/enum.h"
+#include "internal/hash.h"
+#include "internal/imemo.h"
+#include "internal/numeric.h"
+#include "internal/object.h"
+#include "internal/proc.h"
+#include "internal/rational.h"
+#include "internal/re.h"
 #include "ruby/util.h"
-#include "id.h"
-
-#include <assert.h>
+#include "ruby_assert.h"
+#include "symbol.h"
 
 VALUE rb_mEnumerable;
 
 static ID id_next;
-static ID id_div;
-static ID id_call;
-static ID id_size;
 
+#define id_div idDiv
 #define id_each idEach
 #define id_eqq  idEqq
 #define id_cmp  idCmp
 #define id_lshift idLTLT
+#define id_call idCall
+#define id_size idSize
 
 VALUE
 rb_enum_values_pack(int argc, const VALUE *argv)
@@ -39,7 +48,27 @@ rb_enum_values_pack(int argc, const VALUE *argv)
     i = rb_enum_values_pack(argc, argv); \
 } while (0)
 
-#define enum_yield rb_yield_values2
+static VALUE
+enum_yield(int argc, VALUE ary)
+{
+    if (argc > 1)
+	return rb_yield_force_blockarg(ary);
+    if (argc == 1)
+	return rb_yield(ary);
+    return rb_yield_values2(0, 0);
+}
+
+static VALUE
+enum_yield_array(VALUE ary)
+{
+    long len = RARRAY_LEN(ary);
+
+    if (len > 1)
+	return rb_yield_force_blockarg(ary);
+    if (len == 1)
+	return rb_yield(RARRAY_AREF(ary, 0));
+    return rb_yield_values2(0, 0);
+}
 
 static VALUE
 grep_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
@@ -47,7 +76,23 @@ grep_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
     struct MEMO *memo = MEMO_CAST(args);
     ENUM_WANT_SVALUE();
 
-    if (RTEST(rb_funcall(memo->v1, id_eqq, 1, i)) == RTEST(memo->u3.value)) {
+    if (RTEST(rb_funcallv(memo->v1, id_eqq, 1, &i)) == RTEST(memo->u3.value)) {
+	rb_ary_push(memo->v2, i);
+    }
+    return Qnil;
+}
+
+static VALUE
+grep_regexp_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
+{
+    struct MEMO *memo = MEMO_CAST(args);
+    VALUE converted_element, match;
+    ENUM_WANT_SVALUE();
+
+    /* In case element can't be converted to a Symbol or String: not a match (don't raise) */
+    converted_element = SYMBOL_P(i) ? i : rb_check_string_type(i);
+    match = NIL_P(converted_element) ? Qfalse : rb_reg_match_p(memo->v1, i, 0);
+    if (match == memo->u3.value) {
 	rb_ary_push(memo->v2, i);
     }
     return Qnil;
@@ -59,12 +104,33 @@ grep_iter_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
     struct MEMO *memo = MEMO_CAST(args);
     ENUM_WANT_SVALUE();
 
-    if (RTEST(rb_funcall(memo->v1, id_eqq, 1, i)) == RTEST(memo->u3.value)) {
-	rb_ary_push(memo->v2, rb_yield(i));
+    if (RTEST(rb_funcallv(memo->v1, id_eqq, 1, &i)) == RTEST(memo->u3.value)) {
+	rb_ary_push(memo->v2, enum_yield(argc, i));
     }
     return Qnil;
 }
 
+static VALUE
+enum_grep0(VALUE obj, VALUE pat, VALUE test)
+{
+    VALUE ary = rb_ary_new();
+    struct MEMO *memo = MEMO_NEW(pat, ary, test);
+    rb_block_call_func_t fn;
+    if (rb_block_given_p()) {
+	fn = grep_iter_i;
+    }
+    else if (RB_TYPE_P(pat, T_REGEXP) &&
+      LIKELY(rb_method_basic_definition_p(CLASS_OF(pat), idEqq))) {
+	fn = grep_regexp_i;
+    }
+    else {
+	fn = grep_i;
+    }
+    rb_block_call(obj, id_each, 0, 0, fn, (VALUE)memo);
+
+    return ary;
+}
+
 /*
  *  call-seq:
  *     enum.grep(pattern)                  -> array
@@ -86,12 +152,7 @@ grep_iter_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 static VALUE
 enum_grep(VALUE obj, VALUE pat)
 {
-    VALUE ary = rb_ary_new();
-    struct MEMO *memo = MEMO_NEW(pat, ary, Qtrue);
-
-    rb_block_call(obj, id_each, 0, 0, rb_block_given_p() ? grep_iter_i : grep_i, (VALUE)memo);
-
-    return ary;
+    return enum_grep0(obj, pat, Qtrue);
 }
 
 /*
@@ -112,12 +173,35 @@ enum_grep(VALUE obj, VALUE pat)
 static VALUE
 enum_grep_v(VALUE obj, VALUE pat)
 {
-    VALUE ary = rb_ary_new();
-    struct MEMO *memo = MEMO_NEW(pat, ary, Qfalse);
+    return enum_grep0(obj, pat, Qfalse);
+}
 
-    rb_block_call(obj, id_each, 0, 0, rb_block_given_p() ? grep_iter_i : grep_i, (VALUE)memo);
+#define COUNT_BIGNUM IMEMO_FL_USER0
+#define MEMO_V3_SET(m, v) RB_OBJ_WRITE((m), &(m)->u3.value, (v))
 
-    return ary;
+static void
+imemo_count_up(struct MEMO *memo)
+{
+    if (memo->flags & COUNT_BIGNUM) {
+	MEMO_V3_SET(memo, rb_int_succ(memo->u3.value));
+    }
+    else if (++memo->u3.cnt == 0) {
+	/* overflow */
+	unsigned long buf[2] = {0, 1};
+	MEMO_V3_SET(memo, rb_big_unpack(buf, 2));
+	memo->flags |= COUNT_BIGNUM;
+    }
+}
+
+static VALUE
+imemo_count_value(struct MEMO *memo)
+{
+    if (memo->flags & COUNT_BIGNUM) {
+	return memo->u3.value;
+    }
+    else {
+	return ULONG2NUM(memo->u3.cnt);
+    }
 }
 
 static VALUE
@@ -128,7 +212,7 @@ count_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memop))
     ENUM_WANT_SVALUE();
 
     if (rb_equal(i, memo->v1)) {
-	memo->u3.cnt++;
+	imemo_count_up(memo);
     }
     return Qnil;
 }
@@ -138,8 +222,8 @@ count_iter_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memop))
 {
     struct MEMO *memo = MEMO_CAST(memop);
 
-    if (RTEST(enum_yield(argc, argv))) {
-	memo->u3.cnt++;
+    if (RTEST(rb_yield_values2(argc, argv))) {
+	imemo_count_up(memo);
     }
     return Qnil;
 }
@@ -149,7 +233,7 @@ count_all_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memop))
 {
     struct MEMO *memo = MEMO_CAST(memop);
 
-    memo->u3.cnt++;
+    imemo_count_up(memo);
     return Qnil;
 }
 
@@ -196,7 +280,7 @@ enum_count(int argc, VALUE *argv, VALUE obj)
 
     memo = MEMO_NEW(item, 0, 0);
     rb_block_call(obj, id_each, 0, 0, func, (VALUE)memo);
-    return INT2NUM(memo->u3.cnt);
+    return imemo_count_value(memo);
 }
 
 static VALUE
@@ -204,7 +288,7 @@ find_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memop))
 {
     ENUM_WANT_SVALUE();
 
-    if (RTEST(rb_yield(i))) {
+    if (RTEST(enum_yield(argc, i))) {
 	struct MEMO *memo = MEMO_CAST(memop);
 	MEMO_V1_SET(memo, i);
 	memo->u3.cnt = 1;
@@ -227,13 +311,15 @@ find_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memop))
  *
  *  If no block is given, an enumerator is returned instead.
  *
- *     (1..100).detect  => #<Enumerator: 1..100:detect>
- *     (1..100).find    => #<Enumerator: 1..100:find>
+ *     (1..100).detect  #=> #<Enumerator: 1..100:detect>
+ *     (1..100).find    #=> #<Enumerator: 1..100:find>
  *
- *     (1..10).detect	{ |i| i % 5 == 0 and i % 7 == 0 }   #=> nil
- *     (1..10).find	{ |i| i % 5 == 0 and i % 7 == 0 }   #=> nil
- *     (1..100).detect	{ |i| i % 5 == 0 and i % 7 == 0 }   #=> 35
- *     (1..100).find	{ |i| i % 5 == 0 and i % 7 == 0 }   #=> 35
+ *     (1..10).detect         { |i| i % 5 == 0 && i % 7 == 0 }   #=> nil
+ *     (1..10).find           { |i| i % 5 == 0 && i % 7 == 0 }   #=> nil
+ *     (1..10).detect(-> {0}) { |i| i % 5 == 0 && i % 7 == 0 }   #=> 0
+ *     (1..10).find(-> {0})   { |i| i % 5 == 0 && i % 7 == 0 }   #=> 0
+ *     (1..100).detect        { |i| i % 5 == 0 && i % 7 == 0 }   #=> 35
+ *     (1..100).find          { |i| i % 5 == 0 && i % 7 == 0 }   #=> 35
  *
  */
 
@@ -243,7 +329,7 @@ enum_find(int argc, VALUE *argv, VALUE obj)
     struct MEMO *memo;
     VALUE if_none;
 
-    rb_scan_args(argc, argv, "01", &if_none);
+    if_none = rb_check_arity(argc, 0, 1) ? argv[0] : Qnil;
     RETURN_ENUMERATOR(obj, argc, argv);
     memo = MEMO_NEW(Qundef, 0, 0);
     rb_block_call(obj, id_each, 0, 0, find_i, (VALUE)memo);
@@ -264,10 +350,10 @@ find_index_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memop))
     ENUM_WANT_SVALUE();
 
     if (rb_equal(i, memo->v2)) {
-	MEMO_V1_SET(memo, UINT2NUM(memo->u3.cnt));
+	MEMO_V1_SET(memo, imemo_count_value(memo));
 	rb_iter_break();
     }
-    memo->u3.cnt++;
+    imemo_count_up(memo);
     return Qnil;
 }
 
@@ -276,11 +362,11 @@ find_index_iter_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memop))
 {
     struct MEMO *memo = MEMO_CAST(memop);
 
-    if (RTEST(enum_yield(argc, argv))) {
-	MEMO_V1_SET(memo, UINT2NUM(memo->u3.cnt));
+    if (RTEST(rb_yield_values2(argc, argv))) {
+	MEMO_V1_SET(memo, imemo_count_value(memo));
 	rb_iter_break();
     }
-    memo->u3.cnt++;
+    imemo_count_up(memo);
     return Qnil;
 }
 
@@ -297,9 +383,9 @@ find_index_iter_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memop))
  *
  *  If neither block nor argument is given, an enumerator is returned instead.
  *
- *     (1..10).find_index  { |i| i % 5 == 0 and i % 7 == 0 }  #=> nil
- *     (1..100).find_index { |i| i % 5 == 0 and i % 7 == 0 }  #=> 34
- *     (1..100).find_index(50)                                #=> 49
+ *     (1..10).find_index  { |i| i % 5 == 0 && i % 7 == 0 }  #=> nil
+ *     (1..100).find_index { |i| i % 5 == 0 && i % 7 == 0 }  #=> 34
+ *     (1..100).find_index(50)                               #=> 49
  *
  */
 
@@ -332,7 +418,7 @@ find_all_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, ary))
 {
     ENUM_WANT_SVALUE();
 
-    if (RTEST(rb_yield(i))) {
+    if (RTEST(enum_yield(argc, i))) {
 	rb_ary_push(ary, i);
     }
     return Qnil;
@@ -341,9 +427,7 @@ find_all_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, ary))
 static VALUE
 enum_size(VALUE self, VALUE args, VALUE eobj)
 {
-    VALUE r;
-    r = rb_check_funcall(self, id_size, 0, 0);
-    return (r == Qundef) ? Qnil : r;
+    return rb_check_funcall_default(self, id_size, 0, 0, Qnil);
 }
 
 static long
@@ -368,12 +452,17 @@ enum_size_over_p(VALUE obj, long n)
  *  call-seq:
  *     enum.find_all { |obj| block } -> array
  *     enum.select   { |obj| block } -> array
+ *     enum.filter   { |obj| block } -> array
  *     enum.find_all                 -> an_enumerator
  *     enum.select                   -> an_enumerator
+ *     enum.filter                   -> an_enumerator
  *
  *  Returns an array containing all elements of +enum+
  *  for which the given +block+ returns a true value.
  *
+ *  The <i>find_all</i> and <i>select</i> methods are aliases.
+ *  There is no performance benefit to either.
+ *
  *  If no block is given, an Enumerator is returned instead.
  *
  *
@@ -381,7 +470,9 @@ enum_size_over_p(VALUE obj, long n)
  *
  *     [1,2,3,4,5].select { |num|  num.even?  }   #=> [2, 4]
  *
- *  See also Enumerable#reject.
+ *     [:foo, :bar].filter { |x| x == :foo }   #=> [:foo]
+ *
+ *  See also Enumerable#reject, Enumerable#grep.
  */
 
 static VALUE
@@ -398,11 +489,51 @@ enum_find_all(VALUE obj)
 }
 
 static VALUE
+filter_map_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, ary))
+{
+    i = rb_yield_values2(argc, argv);
+
+    if (RTEST(i)) {
+        rb_ary_push(ary, i);
+    }
+
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     enum.filter_map { |obj| block } -> array
+ *     enum.filter_map                 -> an_enumerator
+ *
+ *  Returns a new array containing the truthy results (everything except
+ *  +false+ or +nil+) of running the +block+ for every element in +enum+.
+ *
+ *  If no block is given, an Enumerator is returned instead.
+ *
+ *
+ *     (1..10).filter_map { |i| i * 2 if i.even? } #=> [4, 8, 12, 16, 20]
+ *
+ */
+static VALUE
+enum_filter_map(VALUE obj)
+{
+    VALUE ary;
+
+    RETURN_SIZED_ENUMERATOR(obj, 0, 0, enum_size);
+
+    ary = rb_ary_new();
+    rb_block_call(obj, id_each, 0, 0, filter_map_i, ary);
+
+    return ary;
+}
+
+
+static VALUE
 reject_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, ary))
 {
     ENUM_WANT_SVALUE();
 
-    if (!RTEST(rb_yield(i))) {
+    if (!RTEST(enum_yield(argc, i))) {
 	rb_ary_push(ary, i);
     }
     return Qnil;
@@ -414,7 +545,7 @@ reject_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, ary))
  *     enum.reject                 -> an_enumerator
  *
  *  Returns an array for all elements of +enum+ for which the given
- *  +block+ returns false.
+ *  +block+ returns <code>false</code>.
  *
  *  If no block is given, an Enumerator is returned instead.
  *
@@ -441,7 +572,7 @@ enum_reject(VALUE obj)
 static VALUE
 collect_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, ary))
 {
-    rb_ary_push(ary, enum_yield(argc, argv));
+    rb_ary_push(ary, rb_yield_values2(argc, argv));
 
     return Qnil;
 }
@@ -449,7 +580,6 @@ collect_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, ary))
 static VALUE
 collect_all(RB_BLOCK_CALL_FUNC_ARGLIST(i, ary))
 {
-    rb_thread_check_ints();
     rb_ary_push(ary, rb_enum_values_pack(argc, argv));
 
     return Qnil;
@@ -476,11 +606,13 @@ static VALUE
 enum_collect(VALUE obj)
 {
     VALUE ary;
+    int min_argc, max_argc;
 
     RETURN_SIZED_ENUMERATOR(obj, 0, 0, enum_size);
 
     ary = rb_ary_new();
-    rb_block_call(obj, id_each, 0, 0, collect_i, ary);
+    min_argc = rb_block_min_max_arity(&max_argc);
+    rb_lambda_call(obj, id_each, 0, 0, collect_i, min_argc, max_argc, ary);
 
     return ary;
 }
@@ -490,7 +622,7 @@ flat_map_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, ary))
 {
     VALUE tmp;
 
-    i = enum_yield(argc, argv);
+    i = rb_yield_values2(argc, argv);
     tmp = rb_check_array_type(i);
 
     if (NIL_P(tmp)) {
@@ -550,49 +682,55 @@ enum_to_a(int argc, VALUE *argv, VALUE obj)
 {
     VALUE ary = rb_ary_new();
 
-    rb_block_call(obj, id_each, argc, argv, collect_all, ary);
-    OBJ_INFECT(ary, obj);
+    rb_block_call_kw(obj, id_each, argc, argv, collect_all, ary, RB_PASS_CALLED_KEYWORDS);
 
     return ary;
 }
 
 static VALUE
+enum_hashify(VALUE obj, int argc, const VALUE *argv, rb_block_call_func *iter)
+{
+    VALUE hash = rb_hash_new();
+    rb_block_call(obj, id_each, argc, argv, iter, hash);
+    return hash;
+}
+
+static VALUE
 enum_to_h_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash))
 {
-    VALUE key_value_pair;
     ENUM_WANT_SVALUE();
-    rb_thread_check_ints();
-    key_value_pair = rb_check_array_type(i);
-    if (NIL_P(key_value_pair)) {
-	rb_raise(rb_eTypeError, "wrong element type %s (expected array)",
-	    rb_builtin_class_name(i));
-    }
-    if (RARRAY_LEN(key_value_pair) != 2) {
-        rb_raise(rb_eArgError, "element has wrong array length (expected 2, was %ld)",
-	    RARRAY_LEN(key_value_pair));
-    }
-    rb_hash_aset(hash, RARRAY_AREF(key_value_pair, 0), RARRAY_AREF(key_value_pair, 1));
-    return Qnil;
+    return rb_hash_set_pair(hash, i);
+}
+
+static VALUE
+enum_to_h_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash))
+{
+    return rb_hash_set_pair(hash, rb_yield_values2(argc, argv));
 }
 
 /*
  *  call-seq:
- *     enum.to_h(*args)  -> hash
+ *     enum.to_h(*args)        -> hash
+ *     enum.to_h(*args) {...}  -> hash
  *
  *  Returns the result of interpreting <i>enum</i> as a list of
  *  <tt>[key, value]</tt> pairs.
  *
  *     %i[hello world].each_with_index.to_h
  *       # => {:hello => 0, :world => 1}
+ *
+ *  If a block is given, the results of the block on each element of
+ *  the enum will be used as pairs.
+ *
+ *     (1..5).to_h {|x| [x, x ** 2]}
+ *       #=> {1=>1, 2=>4, 3=>9, 4=>16, 5=>25}
  */
 
 static VALUE
 enum_to_h(int argc, VALUE *argv, VALUE obj)
 {
-    VALUE hash = rb_hash_new();
-    rb_block_call(obj, id_each, argc, argv, enum_to_h_i, hash);
-    OBJ_INFECT(hash, obj);
-    return hash;
+    rb_block_call_func *iter = rb_block_given_p() ? enum_to_h_ii : enum_to_h_i;
+    return enum_hashify(obj, argc, argv, iter);
 }
 
 static VALUE
@@ -624,7 +762,7 @@ inject_op_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, p))
     }
     else if (SYMBOL_P(name = memo->u3.value)) {
 	const ID mid = SYM2ID(name);
-	MEMO_V1_SET(memo, rb_funcall(memo->v1, mid, 1, i));
+	MEMO_V1_SET(memo, rb_funcallv_public(memo->v1, mid, 1, &i));
     }
     else {
 	VALUE args[2];
@@ -658,8 +796,9 @@ ary_inject_op(VALUE ary, VALUE init, VALUE op)
 
     id = SYM2ID(op);
     if (id == idPLUS) {
-        if ((FIXNUM_P(v) || RB_TYPE_P(v, T_BIGNUM)) &&
-             rb_method_basic_definition_p(rb_cInteger, idPLUS)) {
+	if (RB_INTEGER_TYPE_P(v) &&
+	    rb_method_basic_definition_p(rb_cInteger, idPLUS) &&
+	    rb_obj_respond_to(v, idPLUS, FALSE)) {
             n = 0;
             for (; i < RARRAY_LEN(ary); i++) {
                 e = RARRAY_AREF(ary, i);
@@ -685,7 +824,8 @@ ary_inject_op(VALUE ary, VALUE init, VALUE op)
         }
     }
     for (; i < RARRAY_LEN(ary); i++) {
-        v = rb_funcall(v, id, 1, RARRAY_AREF(ary, i));
+        VALUE arg = RARRAY_AREF(ary, i);
+        v = rb_funcallv_public(v, id, 1, &arg);
     }
     return v;
 }
@@ -705,6 +845,9 @@ ary_inject_op(VALUE ary, VALUE init, VALUE op)
  *  operation, specified by a block or a symbol that names a
  *  method or operator.
  *
+ *  The <i>inject</i> and <i>reduce</i> methods are aliases. There
+ *  is no performance benefit to either.
+ *
  *  If you specify a block, then for each element in <i>enum</i>
  *  the block is passed an accumulator value (<i>memo</i>) and the element.
  *  If you specify a symbol instead, then each element in the collection
@@ -784,7 +927,7 @@ partition_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, arys))
     VALUE ary;
     ENUM_WANT_SVALUE();
 
-    if (RTEST(rb_yield(i))) {
+    if (RTEST(enum_yield(argc, i))) {
 	ary = memo->v1;
     }
     else {
@@ -830,7 +973,7 @@ group_by_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash))
 
     ENUM_WANT_SVALUE();
 
-    group = rb_yield(i);
+    group = enum_yield(argc, i);
     values = rb_hash_aref(hash, group);
     if (!RB_TYPE_P(values, T_ARRAY)) {
 	values = rb_ary_new3(1, i);
@@ -860,17 +1003,53 @@ group_by_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash))
 static VALUE
 enum_group_by(VALUE obj)
 {
-    VALUE hash;
-
     RETURN_SIZED_ENUMERATOR(obj, 0, 0, enum_size);
 
-    hash = rb_hash_new();
-    rb_block_call(obj, id_each, 0, 0, group_by_i, hash);
-    OBJ_INFECT(hash, obj);
+    return enum_hashify(obj, 0, 0, group_by_i);
+}
 
-    return hash;
+static void
+tally_up(VALUE hash, VALUE group)
+{
+    VALUE tally = rb_hash_aref(hash, group);
+    if (NIL_P(tally)) {
+        tally = INT2FIX(1);
+    }
+    else if (FIXNUM_P(tally) && tally < INT2FIX(FIXNUM_MAX)) {
+        tally += INT2FIX(1) & ~FIXNUM_FLAG;
+    }
+    else {
+        tally = rb_big_plus(tally, INT2FIX(1));
+    }
+    rb_hash_aset(hash, group, tally);
+}
+
+static VALUE
+tally_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash))
+{
+    ENUM_WANT_SVALUE();
+    tally_up(hash, i);
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     enum.tally -> a_hash
+ *
+ *  Tallies the collection, i.e., counts the occurrences of each element.
+ *  Returns a hash with the elements of the collection as keys and the
+ *  corresponding counts as values.
+ *
+ *     ["a", "b", "c", "b"].tally  #=> {"a"=>1, "b"=>2, "c"=>1}
+ */
+
+static VALUE
+enum_tally(VALUE obj)
+{
+    return enum_hashify(obj, 0, 0, tally_i);
 }
 
+NORETURN(static VALUE first_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, params)));
 static VALUE
 first_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, params))
 {
@@ -880,7 +1059,7 @@ first_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, params))
     MEMO_V1_SET(memo, i);
     rb_iter_break();
 
-    UNREACHABLE;
+    UNREACHABLE_RETURN(Qnil);
 }
 
 static VALUE enum_take(VALUE obj, VALUE n);
@@ -923,22 +1102,29 @@ enum_first(int argc, VALUE *argv, VALUE obj)
  *     enum.sort                  -> array
  *     enum.sort { |a, b| block } -> array
  *
- *  Returns an array containing the items in <i>enum</i> sorted,
- *  either according to their own <code><=></code> method, or by using
- *  the results of the supplied block. The block should return -1, 0, or
- *  +1 depending on the comparison between <i>a</i> and <i>b</i>. As of
- *  Ruby 1.8, the method <code>Enumerable#sort_by</code> implements a
- *  built-in Schwartzian Transform, useful when key computation or
- *  comparison is expensive.
+ *  Returns an array containing the items in <i>enum</i> sorted.
+ *
+ *  Comparisons for the sort will be done using the items' own
+ *  <code><=></code> operator or using an optional code block.
+ *
+ *  The block must implement a comparison between +a+ and +b+ and return
+ *  an integer less than 0 when +b+ follows +a+, +0+ when +a+ and +b+
+ *  are equivalent, or an integer greater than 0 when +a+ follows +b+.
  *
- *     %w(rhea kea flea).sort          #=> ["flea", "kea", "rhea"]
+ *  The result is not guaranteed to be stable.  When the comparison of two
+ *  elements returns +0+, the order of the elements is unpredictable.
+ *
+ *     %w(rhea kea flea).sort           #=> ["flea", "kea", "rhea"]
  *     (1..10).sort { |a, b| b <=> a }  #=> [10, 9, 8, 7, 6, 5, 4, 3, 2, 1]
+ *
+ *  See also Enumerable#sort_by. It implements a Schwartzian transform
+ *  which is useful when key computation or comparison is expensive.
  */
 
 static VALUE
 enum_sort(VALUE obj)
 {
-    return rb_ary_sort(enum_to_a(0, 0, obj));
+    return rb_ary_sort_bang(enum_to_a(0, 0, obj));
 }
 
 #define SORT_BY_BUFSIZE 16
@@ -957,7 +1143,7 @@ sort_by_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, _data))
 
     ENUM_WANT_SVALUE();
 
-    v = rb_yield(i);
+    v = enum_yield(argc, i);
 
     if (RBASIC(ary)->klass) {
 	rb_raise(rb_eRuntimeError, "sort_by reentered");
@@ -979,6 +1165,7 @@ sort_by_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, _data))
 static int
 sort_by_cmp(const void *ap, const void *bp, void *data)
 {
+    struct cmp_opt_data cmp_opt = { 0, 0 };
     VALUE a;
     VALUE b;
     VALUE ary = (VALUE)data;
@@ -990,7 +1177,7 @@ sort_by_cmp(const void *ap, const void *bp, void *data)
     a = *(VALUE *)ap;
     b = *(VALUE *)bp;
 
-    return rb_cmpint(rb_funcall(a, id_cmp, 1, b), a, b);
+    return OPTIMIZED_CMP(a, b, cmp_opt);
 }
 
 /*
@@ -1001,15 +1188,18 @@ sort_by_cmp(const void *ap, const void *bp, void *data)
  *  Sorts <i>enum</i> using a set of keys generated by mapping the
  *  values in <i>enum</i> through the given block.
  *
+ *  The result is not guaranteed to be stable.  When two keys are equal,
+ *  the order of the corresponding elements is unpredictable.
+ *
  *  If no block is given, an enumerator is returned instead.
  *
- *     %w{apple pear fig}.sort_by { |word| word.length}
+ *     %w{apple pear fig}.sort_by { |word| word.length }
  *                   #=> ["fig", "pear", "apple"]
  *
- *  The current implementation of <code>sort_by</code> generates an
- *  array of tuples containing the original collection element and the
- *  mapped value. This makes <code>sort_by</code> fairly expensive when
- *  the keysets are simple.
+ *  The current implementation of #sort_by generates an array of
+ *  tuples containing the original collection element and the mapped
+ *  value. This makes #sort_by fairly expensive when the keysets are
+ *  simple.
  *
  *     require 'benchmark'
  *
@@ -1028,15 +1218,15 @@ sort_by_cmp(const void *ap, const void *bp, void *data)
  *
  *  However, consider the case where comparing the keys is a non-trivial
  *  operation. The following code sorts some files on modification time
- *  using the basic <code>sort</code> method.
+ *  using the basic #sort method.
  *
  *     files = Dir["*"]
  *     sorted = files.sort { |a, b| File.new(a).mtime <=> File.new(b).mtime }
  *     sorted   #=> ["mon", "tues", "wed", "thurs"]
  *
- *  This sort is inefficient: it generates two new <code>File</code>
+ *  This sort is inefficient: it generates two new File
  *  objects during every comparison. A slightly better technique is to
- *  use the <code>Kernel#test</code> method to generate the modification
+ *  use the Kernel#test method to generate the modification
  *  times directly.
  *
  *     files = Dir["*"]
@@ -1045,23 +1235,27 @@ sort_by_cmp(const void *ap, const void *bp, void *data)
  *     }
  *     sorted   #=> ["mon", "tues", "wed", "thurs"]
  *
- *  This still generates many unnecessary <code>Time</code> objects. A
- *  more efficient technique is to cache the sort keys (modification
- *  times in this case) before the sort. Perl users often call this
- *  approach a Schwartzian Transform, after Randal Schwartz. We
- *  construct a temporary array, where each element is an array
- *  containing our sort key along with the filename. We sort this array,
- *  and then extract the filename from the result.
+ *  This still generates many unnecessary Time objects. A more
+ *  efficient technique is to cache the sort keys (modification times
+ *  in this case) before the sort. Perl users often call this approach
+ *  a Schwartzian transform, after Randal Schwartz. We construct a
+ *  temporary array, where each element is an array containing our
+ *  sort key along with the filename. We sort this array, and then
+ *  extract the filename from the result.
  *
  *     sorted = Dir["*"].collect { |f|
  *        [test(?M, f), f]
  *     }.sort.collect { |f| f[1] }
  *     sorted   #=> ["mon", "tues", "wed", "thurs"]
  *
- *  This is exactly what <code>sort_by</code> does internally.
+ *  This is exactly what #sort_by does internally.
  *
  *     sorted = Dir["*"].sort_by { |f| test(?M, f) }
  *     sorted   #=> ["mon", "tues", "wed", "thurs"]
+ *
+ *  To produce the reverse of a specific order, the following can be used:
+ *
+ *    ary.sort_by { ... }.reverse!
  */
 
 static VALUE
@@ -1084,7 +1278,6 @@ enum_sort_by(VALUE obj)
     buf = rb_ary_tmp_new(SORT_BY_BUFSIZE*2);
     rb_ary_store(buf, SORT_BY_BUFSIZE*2-1, Qnil);
     memo = MEMO_NEW(0, 0, 0);
-    OBJ_INFECT(memo, obj);
     data = (struct sort_by_data *)&memo->v1;
     RB_OBJ_WRITE(memo, &data->ary, ary);
     RB_OBJ_WRITE(memo, &data->buf, buf);
@@ -1097,9 +1290,9 @@ enum_sort_by(VALUE obj)
 	rb_ary_concat(ary, buf);
     }
     if (RARRAY_LEN(ary) > 2) {
-	RARRAY_PTR_USE(ary, ptr,
-		      ruby_qsort(ptr, RARRAY_LEN(ary)/2, 2*sizeof(VALUE),
-				 sort_by_cmp, (void *)ary));
+        RARRAY_PTR_USE(ary, ptr,
+                       ruby_qsort(ptr, RARRAY_LEN(ary)/2, 2*sizeof(VALUE),
+                                  sort_by_cmp, (void *)ary));
     }
     if (RBASIC(ary)->klass) {
 	rb_raise(rb_eRuntimeError, "sort_by reentered");
@@ -1109,12 +1302,13 @@ enum_sort_by(VALUE obj)
     }
     rb_ary_resize(ary, RARRAY_LEN(ary)/2);
     RBASIC_SET_CLASS_RAW(ary, rb_cArray);
-    OBJ_INFECT(ary, memo);
 
     return ary;
 }
 
-#define ENUMFUNC(name) rb_block_given_p() ? name##_iter_i : name##_i
+#define ENUMFUNC(name) argc ? name##_eqq : rb_block_given_p() ? name##_iter_i : name##_i
+
+#define MEMO_ENUM_NEW(v1) (rb_check_arity(argc, 0, 1), MEMO_NEW((v1), (argc ? *argv : 0), 0))
 
 #define DEFINE_ENUMFUNCS(name) \
 static VALUE enum_##name##_func(VALUE result, struct MEMO *memo); \
@@ -1128,12 +1322,25 @@ name##_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memo)) \
 static VALUE \
 name##_iter_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memo)) \
 { \
-    return enum_##name##_func(enum_yield(argc, argv), MEMO_CAST(memo));	\
+    return enum_##name##_func(rb_yield_values2(argc, argv), MEMO_CAST(memo));	\
+} \
+\
+static VALUE \
+name##_eqq(RB_BLOCK_CALL_FUNC_ARGLIST(i, memo)) \
+{ \
+    ENUM_WANT_SVALUE(); \
+    return enum_##name##_func(rb_funcallv(MEMO_CAST(memo)->v2, id_eqq, 1, &i), MEMO_CAST(memo)); \
 } \
 \
 static VALUE \
 enum_##name##_func(VALUE result, struct MEMO *memo)
 
+#define WARN_UNUSED_BLOCK(argc) do { \
+    if ((argc) > 0 && rb_block_given_p()) { \
+        rb_warn("given block not used"); \
+    } \
+} while (0)
+
 DEFINE_ENUMFUNCS(all)
 {
     if (!RTEST(result)) {
@@ -1146,6 +1353,7 @@ DEFINE_ENUMFUNCS(all)
 /*
  *  call-seq:
  *     enum.all? [{ |obj| block } ]   -> true or false
+ *     enum.all?(pattern)             -> true or false
  *
  *  Passes each element of the collection to the given block. The method
  *  returns <code>true</code> if the block never returns
@@ -1154,16 +1362,23 @@ DEFINE_ENUMFUNCS(all)
  *  cause #all? to return +true+ when none of the collection members are
  *  +false+ or +nil+.
  *
+ *  If instead a pattern is supplied, the method returns whether
+ *  <code>pattern === element</code> for every collection member.
+ *
  *     %w[ant bear cat].all? { |word| word.length >= 3 } #=> true
  *     %w[ant bear cat].all? { |word| word.length >= 4 } #=> false
+ *     %w[ant bear cat].all?(/t/)                        #=> false
+ *     [1, 2i, 3.14].all?(Numeric)                       #=> true
  *     [nil, true, 99].all?                              #=> false
+ *     [].all?                                           #=> true
  *
  */
 
 static VALUE
-enum_all(VALUE obj)
+enum_all(int argc, VALUE *argv, VALUE obj)
 {
-    struct MEMO *memo = MEMO_NEW(Qtrue, 0, 0);
+    struct MEMO *memo = MEMO_ENUM_NEW(Qtrue);
+    WARN_UNUSED_BLOCK(argc);
     rb_block_call(obj, id_each, 0, 0, ENUMFUNC(all), (VALUE)memo);
     return memo->v1;
 }
@@ -1180,6 +1395,7 @@ DEFINE_ENUMFUNCS(any)
 /*
  *  call-seq:
  *     enum.any? [{ |obj| block }]   -> true or false
+ *     enum.any?(pattern)            -> true or false
  *
  *  Passes each element of the collection to the given block. The method
  *  returns <code>true</code> if the block ever returns a value other
@@ -1188,16 +1404,23 @@ DEFINE_ENUMFUNCS(any)
  *  will cause #any? to return +true+ if at least one of the collection
  *  members is not +false+ or +nil+.
  *
+ *  If instead a pattern is supplied, the method returns whether
+ *  <code>pattern === element</code> for any collection member.
+ *
  *     %w[ant bear cat].any? { |word| word.length >= 3 } #=> true
  *     %w[ant bear cat].any? { |word| word.length >= 4 } #=> true
+ *     %w[ant bear cat].any?(/d/)                        #=> false
+ *     [nil, true, 99].any?(Integer)                     #=> true
  *     [nil, true, 99].any?                              #=> true
+ *     [].any?                                           #=> false
  *
  */
 
 static VALUE
-enum_any(VALUE obj)
+enum_any(int argc, VALUE *argv, VALUE obj)
 {
-    struct MEMO *memo = MEMO_NEW(Qfalse, 0, 0);
+    struct MEMO *memo = MEMO_ENUM_NEW(Qfalse);
+    WARN_UNUSED_BLOCK(argc);
     rb_block_call(obj, id_each, 0, 0, ENUMFUNC(any), (VALUE)memo);
     return memo->v1;
 }
@@ -1217,27 +1440,36 @@ DEFINE_ENUMFUNCS(one)
 }
 
 struct nmin_data {
-  long n;
-  long bufmax;
-  long curlen;
-  VALUE buf;
-  VALUE limit;
-  int (*cmpfunc)(const void *, const void *, void *);
-  int rev; /* max if 1 */
-  int by; /* min_by if 1 */
-  const char *method;
+    long n;
+    long bufmax;
+    long curlen;
+    VALUE buf;
+    VALUE limit;
+    int (*cmpfunc)(const void *, const void *, void *);
+    int rev: 1; /* max if 1 */
+    int by: 1; /* min_by if 1 */
 };
 
+static VALUE
+cmpint_reenter_check(struct nmin_data *data, VALUE val)
+{
+    if (RBASIC(data->buf)->klass) {
+        rb_raise(rb_eRuntimeError, "%s%s reentered",
+                 data->rev ? "max" : "min",
+                 data->by ? "_by" : "");
+    }
+    return val;
+}
+
 static int
 nmin_cmp(const void *ap, const void *bp, void *_data)
 {
+    struct cmp_opt_data cmp_opt = { 0, 0 };
     struct nmin_data *data = (struct nmin_data *)_data;
     VALUE a = *(const VALUE *)ap, b = *(const VALUE *)bp;
-    VALUE cmp = rb_funcall(a, id_cmp, 1, b);
-    if (RBASIC(data->buf)->klass) {
-	rb_raise(rb_eRuntimeError, "%s reentered", data->method);
-    }
-    return rb_cmpint(cmp, a, b);
+#define rb_cmpint(cmp, a, b) rb_cmpint(cmpint_reenter_check(data, (cmp)), a, b)
+    return OPTIMIZED_CMP(a, b, cmp_opt);
+#undef rb_cmpint
 }
 
 static int
@@ -1246,13 +1478,10 @@ nmin_block_cmp(const void *ap, const void *bp, void *_data)
     struct nmin_data *data = (struct nmin_data *)_data;
     VALUE a = *(const VALUE *)ap, b = *(const VALUE *)bp;
     VALUE cmp = rb_yield_values(2, a, b);
-    if (RBASIC(data->buf)->klass) {
-	rb_raise(rb_eRuntimeError, "%s reentered", data->method);
-    }
+    cmpint_reenter_check(data, cmp);
     return rb_cmpint(cmp, a, b);
 }
 
-
 static void
 nmin_filter(struct nmin_data *data)
 {
@@ -1331,13 +1560,13 @@ nmin_filter(struct nmin_data *data)
 #undef GETPTR
 #undef SWAP
 
-    data->limit = RARRAY_PTR(data->buf)[store_index*eltsize]; /* the last pivot */
+    data->limit = RARRAY_AREF(data->buf, store_index*eltsize); /* the last pivot */
     data->curlen = data->n;
     rb_ary_resize(data->buf, data->n * eltsize);
 }
 
 static VALUE
-nmin_i(VALUE i, VALUE *_data, int argc, VALUE *argv)
+nmin_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, _data))
 {
     struct nmin_data *data = (struct nmin_data *)_data;
     VALUE cmpv;
@@ -1345,7 +1574,7 @@ nmin_i(VALUE i, VALUE *_data, int argc, VALUE *argv)
     ENUM_WANT_SVALUE();
 
     if (data->by)
-	cmpv = rb_yield(i);
+	cmpv = enum_yield(argc, i);
     else
 	cmpv = i;
 
@@ -1392,14 +1621,12 @@ rb_nmin_run(VALUE obj, VALUE num, int by, int rev, int ary)
 		   nmin_cmp;
     data.rev = rev;
     data.by = by;
-    data.method = rev ? (by ? "max_by" : "max")
-                      : (by ? "min_by" : "min");
     if (ary) {
 	long i;
 	for (i = 0; i < RARRAY_LEN(obj); i++) {
-	   VALUE args[1];
-	   args[0] = RARRAY_AREF(obj, i);
-	   nmin_i(obj, (VALUE*)&data, 1, args);
+	    VALUE args[1];
+	    args[0] = RARRAY_AREF(obj, i);
+            nmin_i(obj, (VALUE)&data, 1, args, Qundef);
 	}
     }
     else {
@@ -1409,23 +1636,27 @@ rb_nmin_run(VALUE obj, VALUE num, int by, int rev, int ary)
     result = data.buf;
     if (by) {
 	long i;
-	ruby_qsort(RARRAY_PTR(result),
-	           RARRAY_LEN(result)/2,
-		   sizeof(VALUE)*2,
-		   data.cmpfunc, (void *)&data);
-	for (i=1; i<RARRAY_LEN(result); i+=2) {
-	    RARRAY_PTR(result)[i/2] = RARRAY_PTR(result)[i];
-	}
+        RARRAY_PTR_USE(result, ptr, {
+            ruby_qsort(ptr,
+                       RARRAY_LEN(result)/2,
+                       sizeof(VALUE)*2,
+                       data.cmpfunc, (void *)&data);
+            for (i=1; i<RARRAY_LEN(result); i+=2) {
+                ptr[i/2] = ptr[i];
+            }
+        });
 	rb_ary_resize(result, RARRAY_LEN(result)/2);
     }
     else {
-	ruby_qsort(RARRAY_PTR(result), RARRAY_LEN(result), sizeof(VALUE),
-		   data.cmpfunc, (void *)&data);
+        RARRAY_PTR_USE(result, ptr, {
+            ruby_qsort(ptr, RARRAY_LEN(result), sizeof(VALUE),
+                       data.cmpfunc, (void *)&data);
+        });
     }
     if (rev) {
         rb_ary_reverse(result);
     }
-    *((VALUE *)&RBASIC(result)->klass) = rb_cArray;
+    RBASIC_SET_CLASS(result, rb_cArray);
     return result;
 
 }
@@ -1433,6 +1664,7 @@ rb_nmin_run(VALUE obj, VALUE num, int by, int rev, int ary)
 /*
  *  call-seq:
  *     enum.one? [{ |obj| block }]   -> true or false
+ *     enum.one?(pattern)            -> true or false
  *
  *  Passes each element of the collection to the given block. The method
  *  returns <code>true</code> if the block returns <code>true</code>
@@ -1440,19 +1672,26 @@ rb_nmin_run(VALUE obj, VALUE num, int by, int rev, int ary)
  *  <code>true</code> only if exactly one of the collection members is
  *  true.
  *
+ *  If instead a pattern is supplied, the method returns whether
+ *  <code>pattern === element</code> for exactly one collection member.
+ *
  *     %w{ant bear cat}.one? { |word| word.length == 4 }  #=> true
  *     %w{ant bear cat}.one? { |word| word.length > 4 }   #=> false
  *     %w{ant bear cat}.one? { |word| word.length < 4 }   #=> false
+ *     %w{ant bear cat}.one?(/t/)                         #=> false
  *     [ nil, true, 99 ].one?                             #=> false
  *     [ nil, true, false ].one?                          #=> true
+ *     [ nil, true, 99 ].one?(Integer)                    #=> true
+ *     [].one?                                            #=> false
  *
  */
 static VALUE
-enum_one(VALUE obj)
+enum_one(int argc, VALUE *argv, VALUE obj)
 {
-    struct MEMO *memo = MEMO_NEW(Qundef, 0, 0);
+    struct MEMO *memo = MEMO_ENUM_NEW(Qundef);
     VALUE result;
 
+    WARN_UNUSED_BLOCK(argc);
     rb_block_call(obj, id_each, 0, 0, ENUMFUNC(one), (VALUE)memo);
     result = memo->v1;
     if (result == Qundef) return Qfalse;
@@ -1471,23 +1710,31 @@ DEFINE_ENUMFUNCS(none)
 /*
  *  call-seq:
  *     enum.none? [{ |obj| block }]   -> true or false
+ *     enum.none?(pattern)            -> true or false
  *
  *  Passes each element of the collection to the given block. The method
  *  returns <code>true</code> if the block never returns <code>true</code>
  *  for all elements. If the block is not given, <code>none?</code> will return
  *  <code>true</code> only if none of the collection members is true.
  *
+ *  If instead a pattern is supplied, the method returns whether
+ *  <code>pattern === element</code> for none of the collection members.
+ *
  *     %w{ant bear cat}.none? { |word| word.length == 5 } #=> true
  *     %w{ant bear cat}.none? { |word| word.length >= 4 } #=> false
+ *     %w{ant bear cat}.none?(/d/)                        #=> true
+ *     [1, 3.14, 42].none?(Float)                         #=> false
  *     [].none?                                           #=> true
  *     [nil].none?                                        #=> true
  *     [nil, false].none?                                 #=> true
  *     [nil, false, true].none?                           #=> false
  */
 static VALUE
-enum_none(VALUE obj)
+enum_none(int argc, VALUE *argv, VALUE obj)
 {
-    struct MEMO *memo = MEMO_NEW(Qtrue, 0, 0);
+    struct MEMO *memo = MEMO_ENUM_NEW(Qtrue);
+
+    WARN_UNUSED_BLOCK(argc);
     rb_block_call(obj, id_each, 0, 0, ENUMFUNC(none), (VALUE)memo);
     return memo->v1;
 }
@@ -1544,7 +1791,7 @@ min_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
  *     enum.min(n) { |a, b| block } -> array
  *
  *  Returns the object in _enum_ with the minimum value. The
- *  first form assumes all objects implement <code>Comparable</code>;
+ *  first form assumes all objects implement <code><=></code>;
  *  the second uses the block to return <em>a <=> b</em>.
  *
  *     a = %w(albatross dog horse)
@@ -1552,11 +1799,12 @@ min_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
  *     a.min { |a, b| a.length <=> b.length }  #=> "dog"
  *
  *  If the +n+ argument is given, minimum +n+ elements are returned
- *  as an array.
+ *  as a sorted array.
  *
  *     a = %w[albatross dog horse]
  *     a.min(2)                                  #=> ["albatross", "dog"]
  *     a.min(2) {|a, b| a.length <=> b.length }  #=> ["dog", "horse"]
+ *     [5, 1, 3, 4, 2].min(3)                    #=> [1, 2, 3]
  */
 
 static VALUE
@@ -1567,9 +1815,7 @@ enum_min(int argc, VALUE *argv, VALUE obj)
     VALUE result;
     VALUE num;
 
-    rb_scan_args(argc, argv, "01", &num);
-
-    if (!NIL_P(num))
+    if (rb_check_arity(argc, 0, 1) && !NIL_P(num = argv[0]))
        return rb_nmin_run(obj, num, 0, 0, 0);
 
     m->min = Qundef;
@@ -1637,7 +1883,7 @@ max_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
  *     enum.max(n) { |a, b| block } -> array
  *
  *  Returns the object in _enum_ with the maximum value. The
- *  first form assumes all objects implement <code>Comparable</code>;
+ *  first form assumes all objects implement <code><=></code>;
  *  the second uses the block to return <em>a <=> b</em>.
  *
  *     a = %w(albatross dog horse)
@@ -1645,11 +1891,12 @@ max_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
  *     a.max { |a, b| a.length <=> b.length }  #=> "albatross"
  *
  *  If the +n+ argument is given, maximum +n+ elements are returned
- *  as an array.
+ *  as an array, sorted in descending order.
  *
  *     a = %w[albatross dog horse]
  *     a.max(2)                                  #=> ["horse", "dog"]
  *     a.max(2) {|a, b| a.length <=> b.length }  #=> ["albatross", "horse"]
+ *     [5, 1, 3, 4, 2].max(3)                    #=> [5, 4, 3]
  */
 
 static VALUE
@@ -1660,9 +1907,7 @@ enum_max(int argc, VALUE *argv, VALUE obj)
     VALUE result;
     VALUE num;
 
-    rb_scan_args(argc, argv, "01", &num);
-
-    if (!NIL_P(num))
+    if (rb_check_arity(argc, 0, 1) && !NIL_P(num = argv[0]))
        return rb_nmin_run(obj, num, 0, 1, 0);
 
     m->max = Qundef;
@@ -1797,7 +2042,7 @@ minmax_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, _memo))
  *
  *  Returns a two element array which contains the minimum and the
  *  maximum value in the enumerable.  The first form assumes all
- *  objects implement <code>Comparable</code>; the second uses the
+ *  objects implement <code><=></code>; the second uses the
  *  block to return <em>a <=> b</em>.
  *
  *     a = %w(albatross dog horse)
@@ -1834,17 +2079,18 @@ enum_minmax(VALUE obj)
 static VALUE
 min_by_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 {
+    struct cmp_opt_data cmp_opt = { 0, 0 };
     struct MEMO *memo = MEMO_CAST(args);
     VALUE v;
 
     ENUM_WANT_SVALUE();
 
-    v = rb_yield(i);
+    v = enum_yield(argc, i);
     if (memo->v1 == Qundef) {
 	MEMO_V1_SET(memo, v);
 	MEMO_V2_SET(memo, i);
     }
-    else if (rb_cmpint(rb_funcall(v, id_cmp, 1, memo->v1), v, memo->v1) < 0) {
+    else if (OPTIMIZED_CMP(v, memo->v1, cmp_opt) < 0) {
 	MEMO_V1_SET(memo, v);
 	MEMO_V2_SET(memo, i);
     }
@@ -1867,7 +2113,8 @@ min_by_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
  *     a.min_by { |x| x.length }   #=> "dog"
  *
  *  If the +n+ argument is given, minimum +n+ elements are returned
- *  as an array.
+ *  as an array. These +n+ elements are sorted by the value from the
+ *  given block.
  *
  *     a = %w[albatross dog horse]
  *     p a.min_by(2) {|x| x.length } #=> ["dog", "horse"]
@@ -1879,11 +2126,11 @@ enum_min_by(int argc, VALUE *argv, VALUE obj)
     struct MEMO *memo;
     VALUE num;
 
-    rb_scan_args(argc, argv, "01", &num);
+    rb_check_arity(argc, 0, 1);
 
     RETURN_SIZED_ENUMERATOR(obj, argc, argv, enum_size);
 
-    if (!NIL_P(num))
+    if (argc && !NIL_P(num = argv[0]))
         return rb_nmin_run(obj, num, 1, 0, 0);
 
     memo = MEMO_NEW(Qundef, Qnil, 0);
@@ -1894,17 +2141,18 @@ enum_min_by(int argc, VALUE *argv, VALUE obj)
 static VALUE
 max_by_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 {
+    struct cmp_opt_data cmp_opt = { 0, 0 };
     struct MEMO *memo = MEMO_CAST(args);
     VALUE v;
 
     ENUM_WANT_SVALUE();
 
-    v = rb_yield(i);
+    v = enum_yield(argc, i);
     if (memo->v1 == Qundef) {
 	MEMO_V1_SET(memo, v);
 	MEMO_V2_SET(memo, i);
     }
-    else if (rb_cmpint(rb_funcall(v, id_cmp, 1, memo->v1), v, memo->v1) > 0) {
+    else if (OPTIMIZED_CMP(v, memo->v1, cmp_opt) > 0) {
 	MEMO_V1_SET(memo, v);
 	MEMO_V2_SET(memo, i);
     }
@@ -1926,8 +2174,9 @@ max_by_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
  *     a = %w(albatross dog horse)
  *     a.max_by { |x| x.length }   #=> "albatross"
  *
- *  If the +n+ argument is given, minimum +n+ elements are returned
- *  as an array.
+ *  If the +n+ argument is given, maximum +n+ elements are returned
+ *  as an array. These +n+ elements are sorted by the value from the
+ *  given block, in descending order.
  *
  *     a = %w[albatross dog horse]
  *     a.max_by(2) {|x| x.length } #=> ["albatross", "horse"]
@@ -1984,11 +2233,11 @@ enum_max_by(int argc, VALUE *argv, VALUE obj)
     struct MEMO *memo;
     VALUE num;
 
-    rb_scan_args(argc, argv, "01", &num);
+    rb_check_arity(argc, 0, 1);
 
     RETURN_SIZED_ENUMERATOR(obj, argc, argv, enum_size);
 
-    if (!NIL_P(num))
+    if (argc && !NIL_P(num = argv[0]))
         return rb_nmin_run(obj, num, 1, 1, 0);
 
     memo = MEMO_NEW(Qundef, Qnil, 0);
@@ -2008,6 +2257,8 @@ struct minmax_by_t {
 static void
 minmax_by_i_update(VALUE v1, VALUE v2, VALUE i1, VALUE i2, struct minmax_by_t *memo)
 {
+    struct cmp_opt_data cmp_opt = { 0, 0 };
+
     if (memo->min_bv == Qundef) {
 	memo->min_bv = v1;
 	memo->max_bv = v2;
@@ -2015,11 +2266,11 @@ minmax_by_i_update(VALUE v1, VALUE v2, VALUE i1, VALUE i2, struct minmax_by_t *m
 	memo->max = i2;
     }
     else {
-	if (rb_cmpint(rb_funcall(v1, id_cmp, 1, memo->min_bv), v1, memo->min_bv) < 0) {
+	if (OPTIMIZED_CMP(v1, memo->min_bv, cmp_opt) < 0) {
 	    memo->min_bv = v1;
 	    memo->min = i1;
 	}
-	if (rb_cmpint(rb_funcall(v2, id_cmp, 1, memo->max_bv), v2, memo->max_bv) > 0) {
+	if (OPTIMIZED_CMP(v2, memo->max_bv, cmp_opt) > 0) {
 	    memo->max_bv = v2;
 	    memo->max = i2;
 	}
@@ -2029,13 +2280,14 @@ minmax_by_i_update(VALUE v1, VALUE v2, VALUE i1, VALUE i2, struct minmax_by_t *m
 static VALUE
 minmax_by_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, _memo))
 {
+    struct cmp_opt_data cmp_opt = { 0, 0 };
     struct minmax_by_t *memo = MEMO_FOR(struct minmax_by_t, _memo);
     VALUE vi, vj, j;
     int n;
 
     ENUM_WANT_SVALUE();
 
-    vi = rb_yield(i);
+    vi = enum_yield(argc, i);
 
     if (memo->last_bv == Qundef) {
         memo->last_bv = vi;
@@ -2046,7 +2298,7 @@ minmax_by_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, _memo))
     j = memo->last;
     memo->last_bv = Qundef;
 
-    n = rb_cmpint(rb_funcall(vj, id_cmp, 1, vi), vj, vi);
+    n = OPTIMIZED_CMP(vj, vi, cmp_opt);
     if (n == 0) {
         i = j;
         vi = vj;
@@ -2122,10 +2374,10 @@ member_i(RB_BLOCK_CALL_FUNC_ARGLIST(iter, args))
  *  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.member? :SEEK_SET          #=> true
- *     IO.constants.member? :SEEK_NO_FURTHER   #=> false
+ *     (1..10).include? 5  #=> true
+ *     (1..10).include? 15 #=> false
+ *     (1..10).member? 5   #=> true
+ *     (1..10).member? 15  #=> false
  *
  */
 
@@ -2141,9 +2393,11 @@ enum_member(VALUE obj, VALUE val)
 static VALUE
 each_with_index_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memo))
 {
-    long n = MEMO_CAST(memo)->u3.cnt++;
+    struct MEMO *m = MEMO_CAST(memo);
+    VALUE n = imemo_count_value(m);
 
-    return rb_yield_values(2, rb_enum_values_pack(argc, argv), INT2NUM(n));
+    imemo_count_up(m);
+    return rb_yield_values(2, rb_enum_values_pack(argc, argv), n);
 }
 
 /*
@@ -2187,27 +2441,33 @@ enum_each_with_index(int argc, VALUE *argv, VALUE obj)
  *
  *  If no block is given, an enumerator is returned instead.
  *
- *      (1..3).reverse_each { |v| p v }
+ *     (1..3).reverse_each { |v| p v }
  *
- *    produces:
+ *  produces:
  *
- *      3
- *      2
- *      1
+ *     3
+ *     2
+ *     1
  */
 
 static VALUE
 enum_reverse_each(int argc, VALUE *argv, VALUE obj)
 {
     VALUE ary;
-    long i;
+    long len;
 
     RETURN_SIZED_ENUMERATOR(obj, argc, argv, enum_size);
 
     ary = enum_to_a(argc, argv, obj);
 
-    for (i = RARRAY_LEN(ary); --i >= 0; ) {
-	rb_yield(RARRAY_AREF(ary, i));
+    len = RARRAY_LEN(ary);
+    while (len--) {
+        long nlen;
+        rb_yield(RARRAY_AREF(ary, len));
+        nlen = RARRAY_LEN(ary);
+        if (nlen < len) {
+            len = nlen;
+        }
     }
 
     return obj;
@@ -2218,7 +2478,7 @@ static VALUE
 each_val_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, p))
 {
     ENUM_WANT_SVALUE();
-    rb_yield(i);
+    enum_yield(argc, i);
     return Qnil;
 }
 
@@ -2259,6 +2519,22 @@ enum_each_entry(int argc, VALUE *argv, VALUE obj)
     return obj;
 }
 
+static VALUE
+add_int(VALUE x, long n)
+{
+    const VALUE y = LONG2NUM(n);
+    if (RB_INTEGER_TYPE_P(x)) return rb_int_plus(x, y);
+    return rb_funcallv(x, '+', 1, &y);
+}
+
+static VALUE
+div_int(VALUE x, long n)
+{
+    const VALUE y = LONG2NUM(n);
+    if (RB_INTEGER_TYPE_P(x)) return rb_int_idiv(x, y);
+    return rb_funcallv(x, id_div, 1, &y);
+}
+
 #define dont_recycle_block_arg(arity) ((arity) == 1 || (arity) < 0)
 
 static VALUE
@@ -2291,13 +2567,18 @@ enum_each_slice_size(VALUE obj, VALUE args, VALUE eobj)
 {
     VALUE n, size;
     long slice_size = NUM2LONG(RARRAY_AREF(args, 0));
+    ID infinite_p;
+    CONST_ID(infinite_p, "infinite?");
     if (slice_size <= 0) rb_raise(rb_eArgError, "invalid slice size");
 
     size = enum_size(obj, 0, 0);
     if (size == Qnil) return Qnil;
+    if (RB_FLOAT_TYPE_P(size) && RTEST(rb_funcall(size, infinite_p, 0))) {
+        return size;
+    }
 
-    n = rb_funcall(size, '+', 1, LONG2NUM(slice_size-1));
-    return rb_funcall(n, id_div, 1, LONG2FIX(slice_size));
+    n = add_int(size, slice_size-1);
+    return div_int(n, slice_size);
 }
 
 /*
@@ -2362,6 +2643,8 @@ each_cons_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 static VALUE
 enum_each_cons_size(VALUE obj, VALUE args, VALUE eobj)
 {
+    struct cmp_opt_data cmp_opt = { 0, 0 };
+    const VALUE zero = LONG2FIX(0);
     VALUE n, size;
     long cons_size = NUM2LONG(RARRAY_AREF(args, 0));
     if (cons_size <= 0) rb_raise(rb_eArgError, "invalid size");
@@ -2369,8 +2652,8 @@ enum_each_cons_size(VALUE obj, VALUE args, VALUE eobj)
     size = enum_size(obj, 0, 0);
     if (size == Qnil) return Qnil;
 
-    n = rb_funcall(size, '+', 1, LONG2NUM(1 - cons_size));
-    return (rb_cmpint(rb_funcall(n, id_cmp, 1, LONG2FIX(0)), n, LONG2FIX(0)) == -1) ? LONG2FIX(0) : n;
+    n = add_int(size, 1 - cons_size);
+    return (OPTIMIZED_CMP(n, zero, cmp_opt) == -1) ? zero : n;
 }
 
 /*
@@ -2465,7 +2748,7 @@ zip_ary(RB_BLOCK_CALL_FUNC_ARGLIST(val, memoval))
 	}
     }
     if (NIL_P(result)) {
-	rb_yield(tmp);
+	enum_yield_array(tmp);
     }
     else {
 	rb_ary_push(result, tmp);
@@ -2477,14 +2760,16 @@ zip_ary(RB_BLOCK_CALL_FUNC_ARGLIST(val, memoval))
 }
 
 static VALUE
-call_next(VALUE *v)
+call_next(VALUE w)
 {
+    VALUE *v = (VALUE *)w;
     return v[0] = rb_funcallv(v[1], id_next, 0, 0);
 }
 
 static VALUE
-call_stop(VALUE *v)
+call_stop(VALUE w, VALUE _)
 {
+    VALUE *v = (VALUE *)w;
     return v[0] = Qundef;
 }
 
@@ -2516,7 +2801,7 @@ zip_i(RB_BLOCK_CALL_FUNC_ARGLIST(val, memoval))
 	}
     }
     if (NIL_P(result)) {
-	rb_yield(tmp);
+	enum_yield_array(tmp);
     }
     else {
 	rb_ary_push(result, tmp);
@@ -2575,13 +2860,14 @@ enum_zip(int argc, VALUE *argv, VALUE obj)
 	argv[i] = ary;
     }
     if (!allary) {
+	static const VALUE sym_each = STATIC_ID2SYM(id_each);
 	CONST_ID(conv, "to_enum");
 	for (i=0; i<argc; i++) {
 	    if (!rb_respond_to(argv[i], id_each)) {
 		rb_raise(rb_eTypeError, "wrong argument type %"PRIsVALUE" (must respond to :each)",
 			 rb_obj_class(argv[i]));
             }
-	    argv[i] = rb_funcall(argv[i], conv, 1, ID2SYM(id_each));
+	    argv[i] = rb_funcallv(argv[i], conv, 1, &sym_each);
 	}
     }
     if (!rb_block_given_p()) {
@@ -2638,7 +2924,7 @@ enum_take(VALUE obj, VALUE n)
 static VALUE
 take_while_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, ary))
 {
-    if (!RTEST(enum_yield(argc, argv))) rb_iter_break();
+    if (!RTEST(rb_yield_values2(argc, argv))) rb_iter_break();
     rb_ary_push(ary, rb_enum_values_pack(argc, argv));
     return Qnil;
 }
@@ -2718,7 +3004,7 @@ drop_while_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
     struct MEMO *memo = MEMO_CAST(args);
     ENUM_WANT_SVALUE();
 
-    if (!memo->u3.state && !RTEST(rb_yield(i))) {
+    if (!memo->u3.state && !RTEST(enum_yield(argc, i))) {
 	memo->u3.state = TRUE;
     }
     if (memo->u3.state) {
@@ -2761,27 +3047,30 @@ cycle_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, ary))
 {
     ENUM_WANT_SVALUE();
 
-    rb_ary_push(ary, i);
-    rb_yield(i);
+    rb_ary_push(ary, argc > 1 ? i : rb_ary_new_from_values(argc, argv));
+    enum_yield(argc, i);
     return Qnil;
 }
 
 static VALUE
 enum_cycle_size(VALUE self, VALUE args, VALUE eobj)
 {
-    long mul;
+    long mul = 0;
     VALUE n = Qnil;
-    VALUE size = enum_size(self, args, 0);
-
-    if (size == Qnil) return Qnil;
+    VALUE size;
 
     if (args && (RARRAY_LEN(args) > 0)) {
 	n = RARRAY_AREF(args, 0);
+	if (!NIL_P(n)) mul = NUM2LONG(n);
     }
-    if (n == Qnil) return DBL2NUM(INFINITY);
-    mul = NUM2LONG(n);
+
+    size = enum_size(self, args, 0);
+    if (NIL_P(size) || FIXNUM_ZERO_P(size)) return size;
+
+    if (NIL_P(n)) return DBL2NUM(HUGE_VAL);
     if (mul <= 0) return INT2FIX(0);
-    return rb_funcall(size, '*', 1, LONG2FIX(mul));
+    n = LONG2FIX(mul);
+    return rb_funcallv(size, '*', 1, &n);
 }
 
 /*
@@ -2812,10 +3101,10 @@ enum_cycle(int argc, VALUE *argv, VALUE obj)
     VALUE nv = Qnil;
     long n, i, len;
 
-    rb_scan_args(argc, argv, "01", &nv);
+    rb_check_arity(argc, 0, 1);
 
     RETURN_SIZED_ENUMERATOR(obj, argc, argv, enum_cycle_size);
-    if (NIL_P(nv)) {
+    if (!argc || NIL_P(nv = argv[0])) {
         n = -1;
     }
     else {
@@ -2829,7 +3118,7 @@ enum_cycle(int argc, VALUE *argv, VALUE obj)
     if (len == 0) return Qnil;
     while (n < 0 || 0 < --n) {
         for (i=0; i<len; i++) {
-            rb_yield(RARRAY_AREF(ary, i));
+	    enum_yield_array(RARRAY_AREF(ary, i));
         }
     }
     return Qnil;
@@ -2852,18 +3141,21 @@ chunk_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, _argp))
 
     ENUM_WANT_SVALUE();
 
-    v = rb_funcall(argp->categorize, id_call, 1, i);
+    v = rb_funcallv(argp->categorize, id_call, 1, &i);
 
     if (v == alone) {
         if (!NIL_P(argp->prev_value)) {
-            rb_funcall(argp->yielder, id_lshift, 1, rb_assoc_new(argp->prev_value, argp->prev_elts));
+	    s = rb_assoc_new(argp->prev_value, argp->prev_elts);
+            rb_funcallv(argp->yielder, id_lshift, 1, &s);
             argp->prev_value = argp->prev_elts = Qnil;
         }
-        rb_funcall(argp->yielder, id_lshift, 1, rb_assoc_new(v, rb_ary_new3(1, i)));
+	v = rb_assoc_new(v, rb_ary_new3(1, i));
+        rb_funcallv(argp->yielder, id_lshift, 1, &v);
     }
     else if (NIL_P(v) || v == separator) {
         if (!NIL_P(argp->prev_value)) {
-            rb_funcall(argp->yielder, id_lshift, 1, rb_assoc_new(argp->prev_value, argp->prev_elts));
+	    v = rb_assoc_new(argp->prev_value, argp->prev_elts);
+            rb_funcallv(argp->yielder, id_lshift, 1, &v);
             argp->prev_value = argp->prev_elts = Qnil;
         }
     }
@@ -2880,7 +3172,8 @@ chunk_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, _argp))
                 rb_ary_push(argp->prev_elts, i);
             }
             else {
-                rb_funcall(argp->yielder, id_lshift, 1, rb_assoc_new(argp->prev_value, argp->prev_elts));
+		s = rb_assoc_new(argp->prev_value, argp->prev_elts);
+                rb_funcallv(argp->yielder, id_lshift, 1, &s);
                 argp->prev_value = v;
                 argp->prev_elts = rb_ary_new3(1, i);
             }
@@ -2904,8 +3197,10 @@ chunk_i(RB_BLOCK_CALL_FUNC_ARGLIST(yielder, enumerator))
 
     rb_block_call(enumerable, id_each, 0, 0, chunk_ii, arg);
     memo = MEMO_FOR(struct chunk_arg, arg);
-    if (!NIL_P(memo->prev_elts))
-	rb_funcall(memo->yielder, id_lshift, 1, rb_assoc_new(memo->prev_value, memo->prev_elts));
+    if (!NIL_P(memo->prev_elts)) {
+	arg = rb_assoc_new(memo->prev_value, memo->prev_elts);
+	rb_funcallv(memo->yielder, id_lshift, 1, &arg);
+    }
     return Qnil;
 }
 
@@ -2936,7 +3231,7 @@ chunk_i(RB_BLOCK_CALL_FUNC_ARGLIST(yielder, enumerator))
  *  The following example counts words for each initial letter.
  *
  *    open("/usr/share/dict/words", "r:iso-8859-1") { |f|
- *      f.chunk { |line| line.ord }.each { |ch, lines| p [ch.chr, lines.length] }
+ *      f.chunk { |line| line.upcase.ord }.each { |ch, lines| p [ch.chr, lines.length] }
  *    }
  *    #=> ["\n", 1]
  *    #   ["A", 1327]
@@ -2995,14 +3290,14 @@ chunk_i(RB_BLOCK_CALL_FUNC_ARGLIST(yielder, enumerator))
  *      }
  *    }
  *
+ *  If no block is given, an enumerator to `chunk` is returned instead.
  */
 static VALUE
 enum_chunk(VALUE enumerable)
 {
     VALUE enumerator;
 
-    if (!rb_block_given_p())
-	rb_raise(rb_eArgError, "no block given");
+    RETURN_SIZED_ENUMERATOR(enumerable, 0, 0, enum_size);
 
     enumerator = rb_obj_alloc(rb_cEnumerator);
     rb_ivar_set(enumerator, rb_intern("chunk_enumerable"), enumerable);
@@ -3028,12 +3323,12 @@ slicebefore_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, _argp))
     ENUM_WANT_SVALUE();
 
     if (!NIL_P(argp->sep_pat))
-        header_p = rb_funcall(argp->sep_pat, id_eqq, 1, i);
+        header_p = rb_funcallv(argp->sep_pat, id_eqq, 1, &i);
     else
-        header_p = rb_funcall(argp->sep_pred, id_call, 1, i);
+        header_p = rb_funcallv(argp->sep_pred, id_call, 1, &i);
     if (RTEST(header_p)) {
         if (!NIL_P(argp->prev_elts))
-            rb_funcall(argp->yielder, id_lshift, 1, argp->prev_elts);
+            rb_funcallv(argp->yielder, id_lshift, 1, &argp->prev_elts);
         argp->prev_elts = rb_ary_new3(1, i);
     }
     else {
@@ -3062,7 +3357,7 @@ slicebefore_i(RB_BLOCK_CALL_FUNC_ARGLIST(yielder, enumerator))
     rb_block_call(enumerable, id_each, 0, 0, slicebefore_ii, arg);
     memo = MEMO_FOR(struct slicebefore_arg, arg);
     if (!NIL_P(memo->prev_elts))
-        rb_funcall(memo->yielder, id_lshift, 1, memo->prev_elts);
+        rb_funcallv(memo->yielder, id_lshift, 1, &memo->prev_elts);
     return Qnil;
 }
 
@@ -3088,7 +3383,7 @@ slicebefore_i(RB_BLOCK_CALL_FUNC_ARGLIST(yielder, enumerator))
  *    enum.slice_before { |elt| bool }.each { |ary| ... }
  *
  *  Other methods of the Enumerator class and Enumerable module,
- *  such as map, etc., are also usable.
+ *  such as +to_a+, +map+, etc., are also usable.
  *
  *  For example, iteration over ChangeLog entries can be implemented as
  *  follows:
@@ -3119,7 +3414,7 @@ slicebefore_i(RB_BLOCK_CALL_FUNC_ARGLIST(yielder, enumerator))
  *  If the block needs to maintain state over multiple elements,
  *  local variables can be used.
  *  For example, three or more consecutive increasing numbers can be squashed
- *  as follows:
+ *  as follows (see +chunk_while+ for a better way):
  *
  *    a = [0, 2, 3, 4, 6, 7, 9]
  *    prev = a[0]
@@ -3198,9 +3493,10 @@ slicebefore_i(RB_BLOCK_CALL_FUNC_ARGLIST(yielder, enumerator))
  *
  *    # split mails in mbox (slice before Unix From line after an empty line)
  *    open("mbox") { |f|
- *      f.slice_before(emp: true) { |line, h|
- *        prevemp = h[:emp]
- *        h[:emp] = line == "\n"
+ *      emp = true
+ *      f.slice_before { |line|
+ *        prevemp = emp
+ *        emp = line == "\n"
  *        prevemp && line.start_with?("From ")
  *      }.each { |mail|
  *        mail.pop if mail.last == "\n"
@@ -3257,16 +3553,16 @@ sliceafter_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, _memo))
     }
 
     if (NIL_P(memo->pred)) {
-        split_p = RTEST(rb_funcall(memo->pat, id_eqq, 1, i));
+        split_p = RTEST(rb_funcallv(memo->pat, id_eqq, 1, &i));
         UPDATE_MEMO;
     }
     else {
-        split_p = RTEST(rb_funcall(memo->pred, id_call, 1, i));
+        split_p = RTEST(rb_funcallv(memo->pred, id_call, 1, &i));
         UPDATE_MEMO;
     }
 
     if (split_p) {
-        rb_funcall(memo->yielder, id_lshift, 1, memo->prev_elts);
+        rb_funcallv(memo->yielder, id_lshift, 1, &memo->prev_elts);
         UPDATE_MEMO;
         memo->prev_elts = Qnil;
     }
@@ -3291,7 +3587,7 @@ sliceafter_i(RB_BLOCK_CALL_FUNC_ARGLIST(yielder, enumerator))
     rb_block_call(enumerable, id_each, 0, 0, sliceafter_ii, arg);
     memo = MEMO_FOR(struct sliceafter_arg, arg);
     if (!NIL_P(memo->prev_elts))
-        rb_funcall(memo->yielder, id_lshift, 1, memo->prev_elts);
+        rb_funcallv(memo->yielder, id_lshift, 1, &memo->prev_elts);
     return Qnil;
 }
 
@@ -3379,14 +3675,17 @@ slicewhen_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, _memo))
         memo->prev_elts = rb_ary_new3(1, i);
     }
     else {
-        split_p = RTEST(rb_funcall(memo->pred, id_call, 2, memo->prev_elt, i));
+	VALUE args[2];
+	args[0] = memo->prev_elt;
+	args[1] = i;
+        split_p = RTEST(rb_funcallv(memo->pred, id_call, 2, args));
         UPDATE_MEMO;
 
         if (memo->inverted)
             split_p = !split_p;
 
         if (split_p) {
-            rb_funcall(memo->yielder, id_lshift, 1, memo->prev_elts);
+            rb_funcallv(memo->yielder, id_lshift, 1, &memo->prev_elts);
             UPDATE_MEMO;
             memo->prev_elts = rb_ary_new3(1, i);
         }
@@ -3419,7 +3718,7 @@ slicewhen_i(RB_BLOCK_CALL_FUNC_ARGLIST(yielder, enumerator))
     rb_block_call(enumerable, id_each, 0, 0, slicewhen_ii, arg);
     memo = MEMO_FOR(struct slicewhen_arg, arg);
     if (!NIL_P(memo->prev_elts))
-        rb_funcall(memo->yielder, id_lshift, 1, memo->prev_elts);
+        rb_funcallv(memo->yielder, id_lshift, 1, &memo->prev_elts);
     return Qnil;
 }
 
@@ -3430,11 +3729,11 @@ slicewhen_i(RB_BLOCK_CALL_FUNC_ARGLIST(yielder, enumerator))
  *  Creates an enumerator for each chunked elements.
  *  The beginnings of chunks are defined by the block.
  *
- *  This method split each chunk using adjacent elements,
+ *  This method splits each chunk using adjacent elements,
  *  _elt_before_ and _elt_after_,
  *  in the receiver enumerator.
  *  This method split chunks between _elt_before_ and _elt_after_ where
- *  the block returns true.
+ *  the block returns <code>true</code>.
  *
  *  The block is called the length of the receiver enumerator minus one.
  *
@@ -3482,6 +3781,8 @@ slicewhen_i(RB_BLOCK_CALL_FUNC_ARGLIST(yielder, enumerator))
  *    p lines.slice_when {|l1, l2| /\A\s*\z/ =~ l1 && /\S/ =~ l2 }.to_a
  *    #=> [["foo\n", "bar\n", "\n"], ["baz\n", "qux\n"]]
  *
+ *  Enumerable#chunk_while does the same, except splitting when the block
+ *  returns <code>false</code> instead of <code>true</code>.
  */
 static VALUE
 enum_slice_when(VALUE enumerable)
@@ -3507,11 +3808,11 @@ enum_slice_when(VALUE enumerable)
  *  Creates an enumerator for each chunked elements.
  *  The beginnings of chunks are defined by the block.
  *
- *  This method split each chunk using adjacent elements,
+ *  This method splits each chunk using adjacent elements,
  *  _elt_before_ and _elt_after_,
  *  in the receiver enumerator.
  *  This method split chunks between _elt_before_ and _elt_after_ where
- *  the block returns false.
+ *  the block returns <code>false</code>.
  *
  *  The block is called the length of the receiver enumerator minus one.
  *
@@ -3546,6 +3847,8 @@ enum_slice_when(VALUE enumerable)
  *    p a.chunk_while {|i, j| i.even? == j.even? }.to_a
  *    #=> [[7, 5, 9], [2, 0], [7, 9], [4, 2, 0]]
  *
+ *  Enumerable#slice_when does the same, except splitting when the block
+ *  returns <code>true</code> instead of <code>false</code>.
  */
 static VALUE
 enum_chunk_while(VALUE enumerable)
@@ -3573,98 +3876,141 @@ struct enum_sum_memo {
 };
 
 static void
-sum_iter(VALUE i, struct enum_sum_memo *memo)
+sum_iter_normalize_memo(struct enum_sum_memo *memo)
 {
-    const int unused = (assert(memo != NULL), 0);
+    assert(FIXABLE(memo->n));
+    memo->v = rb_fix_plus(LONG2FIX(memo->n), memo->v);
+    memo->n = 0;
 
-    long n = memo->n;
-    VALUE v = memo->v;
-    VALUE r = memo->r;
-    double f = memo->f;
-    double c = memo->c;
+    switch (TYPE(memo->r)) {
+      case T_RATIONAL: memo->v = rb_rational_plus(memo->r, memo->v); break;
+      case T_UNDEF:    break;
+      default:         UNREACHABLE; /* or ...? */
+    }
+    memo->r = Qundef;
+}
 
-    if (memo->block_given)
-        i = rb_yield(i);
+static void
+sum_iter_fixnum(VALUE i, struct enum_sum_memo *memo)
+{
+    memo->n += FIX2LONG(i); /* should not overflow long type */
+    if (! FIXABLE(memo->n)) {
+        memo->v = rb_big_plus(LONG2NUM(memo->n), memo->v);
+        memo->n = 0;
+    }
+}
 
-    if (memo->float_value)
-        goto float_value;
+static void
+sum_iter_bignum(VALUE i, struct enum_sum_memo *memo)
+{
+    memo->v = rb_big_plus(i, memo->v);
+}
 
-    if (FIXNUM_P(v) || RB_TYPE_P(v, T_BIGNUM) || RB_TYPE_P(v, T_RATIONAL)) {
-        if (FIXNUM_P(i)) {
-            n += FIX2LONG(i); /* should not overflow long type */
-            if (!FIXABLE(n)) {
-                v = rb_big_plus(LONG2NUM(n), v);
-                n = 0;
-            }
-        }
-        else if (RB_TYPE_P(i, T_BIGNUM))
-            v = rb_big_plus(i, v);
-        else if (RB_TYPE_P(i, T_RATIONAL)) {
-            if (r == Qundef)
-                r = i;
-            else
-                r = rb_rational_plus(r, i);
-        }
-        else {
-            if (n != 0) {
-                v = rb_fix_plus(LONG2FIX(n), v);
-                n = 0;
-            }
-            if (r != Qundef) {
-                /* r can be a Integer when mathn is loaded */
-                if (FIXNUM_P(r))
-                    v = rb_fix_plus(r, v);
-                else if (RB_TYPE_P(r, T_BIGNUM))
-                    v = rb_big_plus(r, v);
-                else
-                    v = rb_rational_plus(r, v);
-                r = Qundef;
-            }
-            if (RB_FLOAT_TYPE_P(i)) {
-                f = NUM2DBL(v);
-                c = 0.0;
-                memo->float_value = 1;
-                goto float_value;
-            }
-            else
-                goto some_value;
-        }
+static void
+sum_iter_rational(VALUE i, struct enum_sum_memo *memo)
+{
+    if (memo->r == Qundef) {
+        memo->r = i;
     }
-    else if (RB_FLOAT_TYPE_P(v)) {
-        /* Kahan's compensated summation algorithm */
-        double x, y, t;
-
-      float_value:
-        if (RB_FLOAT_TYPE_P(i))
-            x = RFLOAT_VALUE(i);
-        else if (FIXNUM_P(i))
-            x = FIX2LONG(i);
-        else if (RB_TYPE_P(i, T_BIGNUM))
-            x = rb_big2dbl(i);
-        else if (RB_TYPE_P(i, T_RATIONAL))
-            x = rb_num2dbl(i);
-        else {
-            v = DBL2NUM(f);
-            memo->float_value = 0;
-            goto some_value;
+    else {
+        memo->r = rb_rational_plus(memo->r, i);
+    }
+}
+
+static void
+sum_iter_some_value(VALUE i, struct enum_sum_memo *memo)
+{
+    memo->v = rb_funcallv(memo->v, idPLUS, 1, &i);
+}
+
+static void
+sum_iter_Kahan_Babuska(VALUE i, struct enum_sum_memo *memo)
+{
+    /*
+     * Kahan-Babuska balancing compensated summation algorithm
+     * See https://link.springer.com/article/10.1007/s00607-005-0139-x
+     */
+    double x;
+
+    switch (TYPE(i)) {
+      case T_FLOAT:    x = RFLOAT_VALUE(i); break;
+      case T_FIXNUM:   x = FIX2LONG(i);     break;
+      case T_BIGNUM:   x = rb_big2dbl(i);   break;
+      case T_RATIONAL: x = rb_num2dbl(i);   break;
+      default:
+        memo->v = DBL2NUM(memo->f);
+        memo->float_value = 0;
+        sum_iter_some_value(i, memo);
+        return;
+    }
+
+    double f = memo->f;
+
+    if (isnan(f)) {
+        return;
+    }
+    else if (! isfinite(x)) {
+        if (isinf(x) && isinf(f) && signbit(x) != signbit(f)) {
+            i = DBL2NUM(f);
+            x = nan("");
         }
+        memo->v = i;
+        memo->f = x;
+        return;
+    }
+    else if (isinf(f)) {
+        return;
+    }
 
-        y = x - c;
-        t = f + y;
-        c = (t - f) - y;
-        f = t;
+    double c = memo->c;
+    double t = f + x;
+
+    if (fabs(f) >= fabs(x)) {
+        c += ((f - t) + x);
     }
     else {
-      some_value:
-        v = rb_funcall(v, idPLUS, 1, i);
+        c += ((x - t) + f);
     }
+    f = t;
 
-    memo->v = v;
-    memo->n = n;
-    memo->r = r;
     memo->f = f;
     memo->c = c;
-    (void)unused;
+}
+
+static void
+sum_iter(VALUE i, struct enum_sum_memo *memo)
+{
+    assert(memo != NULL);
+    if (memo->block_given) {
+        i = rb_yield(i);
+    }
+
+    if (memo->float_value) {
+        sum_iter_Kahan_Babuska(i, memo);
+    }
+    else switch (TYPE(memo->v)) {
+      default:      sum_iter_some_value(i, memo);    return;
+      case T_FLOAT: sum_iter_Kahan_Babuska(i, memo); return;
+      case T_FIXNUM:
+      case T_BIGNUM:
+      case T_RATIONAL:
+        switch (TYPE(i)) {
+          case T_FIXNUM:   sum_iter_fixnum(i, memo);   return;
+          case T_BIGNUM:   sum_iter_bignum(i, memo);   return;
+          case T_RATIONAL: sum_iter_rational(i, memo); return;
+          case T_FLOAT:
+            sum_iter_normalize_memo(memo);
+            memo->f = NUM2DBL(memo->v);
+            memo->c = 0.0;
+            memo->float_value = 1;
+            sum_iter_Kahan_Babuska(i, memo);
+            return;
+          default:
+            sum_iter_normalize_memo(memo);
+            sum_iter_some_value(i, memo);
+            return;
+        }
+    }
 }
 
 static VALUE
@@ -3729,7 +4075,7 @@ int_range_sum(VALUE beg, VALUE end, int excl, VALUE init)
  *   { 1 => 10, 2 => 20 }.sum {|k, v| k * v }  #=> 50
  *   (1..10).sum                               #=> 55
  *   (1..10).sum {|v| v * 2 }                  #=> 110
- *   [Object.new].each.sum                     #=> TypeError
+ *   ('a'..'z').sum                            #=> TypeError
  *
  * This method can be used for non-numeric objects by
  * explicit <i>init</i> argument.
@@ -3737,8 +4083,12 @@ int_range_sum(VALUE beg, VALUE end, int excl, VALUE init)
  *   { 1 => 10, 2 => 20 }.sum([])                   #=> [1, 10, 2, 20]
  *   "a\nb\nc".each_line.lazy.map(&:chomp).sum("")  #=> "abc"
  *
+ * If the method is applied to an Integer range without a block,
+ * the sum is not done by iteration, but instead using Gauss's summation
+ * formula.
+ *
  * Enumerable#sum method may not respect method redefinition of "+"
- * methods such as Integer#+.
+ * methods such as Integer#+, or "each" methods such as Range#each.
  */
 static VALUE
 enum_sum(int argc, VALUE* argv, VALUE obj)
@@ -3747,11 +4097,8 @@ enum_sum(int argc, VALUE* argv, VALUE obj)
     VALUE beg, end;
     int excl;
 
-    if (rb_scan_args(argc, argv, "01", &memo.v) == 0)
-        memo.v = LONG2FIX(0);
-
+    memo.v = (rb_check_arity(argc, 0, 1) == 0) ? LONG2FIX(0) : argv[0];
     memo.block_given = rb_block_given_p();
-
     memo.n = 0;
     memo.r = Qundef;
 
@@ -3759,6 +4106,10 @@ enum_sum(int argc, VALUE* argv, VALUE obj)
         memo.f = RFLOAT_VALUE(memo.v);
         memo.c = 0.0;
     }
+    else {
+        memo.f = 0.0;
+        memo.c = 0.0;
+    }
 
     if (RTEST(rb_range_values(obj, &beg, &end, &excl))) {
         if (!memo.block_given && !memo.float_value &&
@@ -3775,41 +4126,71 @@ enum_sum(int argc, VALUE* argv, VALUE obj)
         rb_block_call(obj, id_each, 0, 0, enum_sum_i, (VALUE)&memo);
 
     if (memo.float_value) {
-        return DBL2NUM(memo.f);
+        return DBL2NUM(memo.f + memo.c);
     }
     else {
         if (memo.n != 0)
             memo.v = rb_fix_plus(LONG2FIX(memo.n), memo.v);
         if (memo.r != Qundef) {
-            /* r can be a Integer when mathn is loaded */
-            if (FIXNUM_P(memo.r))
-                memo.v = rb_fix_plus(memo.r, memo.v);
-            else if (RB_TYPE_P(memo.r, T_BIGNUM))
-                memo.v = rb_big_plus(memo.r, memo.v);
-            else
-                memo.v = rb_rational_plus(memo.r, memo.v);
+            memo.v = rb_rational_plus(memo.r, memo.v);
         }
         return memo.v;
     }
 }
 
+static VALUE
+uniq_func(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash))
+{
+    ENUM_WANT_SVALUE();
+    rb_hash_add_new_element(hash, i, i);
+    return Qnil;
+}
+
+static VALUE
+uniq_iter(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash))
+{
+    ENUM_WANT_SVALUE();
+    rb_hash_add_new_element(hash, rb_yield_values2(argc, argv), i);
+    return Qnil;
+}
+
 /*
- *  The <code>Enumerable</code> mixin provides collection classes with
- *  several traversal and searching methods, and with the ability to
- *  sort. The class must provide a method <code>each</code>, which
- *  yields successive members of the collection. If
- *  <code>Enumerable#max</code>, <code>#min</code>, or
- *  <code>#sort</code> is used, the objects in the collection must also
- *  implement a meaningful <code><=></code> operator, as these methods
- *  rely on an ordering between members of the collection.
+ *  call-seq:
+ *     enum.uniq                -> new_ary
+ *     enum.uniq { |item| ... } -> new_ary
+ *
+ *  Returns a new array by removing duplicate values in +self+.
+ *
+ *  See also Array#uniq.
+ */
+
+static VALUE
+enum_uniq(VALUE obj)
+{
+    VALUE hash, ret;
+    rb_block_call_func *const func =
+	rb_block_given_p() ? uniq_iter : uniq_func;
+
+    hash = rb_obj_hide(rb_hash_new());
+    rb_block_call(obj, id_each, 0, 0, func, hash);
+    ret = rb_hash_values(hash);
+    rb_hash_clear(hash);
+    return ret;
+}
+
+/*
+ *  The Enumerable mixin provides collection classes with several
+ *  traversal and searching methods, and with the ability to sort. The
+ *  class must provide a method #each, which yields
+ *  successive members of the collection. If Enumerable#max, #min, or
+ *  #sort is used, the objects in the collection must also implement a
+ *  meaningful <code><=></code> operator, as these methods rely on an
+ *  ordering between members of the collection.
  */
 
 void
 Init_Enumerable(void)
 {
-#undef rb_intern
-#define rb_intern(str) rb_intern_const(str)
-
     rb_mEnumerable = rb_define_module("Enumerable");
 
     rb_define_method(rb_mEnumerable, "to_a", enum_to_a, -1);
@@ -3826,6 +4207,8 @@ Init_Enumerable(void)
     rb_define_method(rb_mEnumerable, "find_index", enum_find_index, -1);
     rb_define_method(rb_mEnumerable, "find_all", enum_find_all, 0);
     rb_define_method(rb_mEnumerable, "select", enum_find_all, 0);
+    rb_define_method(rb_mEnumerable, "filter", enum_find_all, 0);
+    rb_define_method(rb_mEnumerable, "filter_map", enum_filter_map, 0);
     rb_define_method(rb_mEnumerable, "reject", enum_reject, 0);
     rb_define_method(rb_mEnumerable, "collect", enum_collect, 0);
     rb_define_method(rb_mEnumerable, "map", enum_collect, 0);
@@ -3835,11 +4218,12 @@ Init_Enumerable(void)
     rb_define_method(rb_mEnumerable, "reduce", enum_inject, -1);
     rb_define_method(rb_mEnumerable, "partition", enum_partition, 0);
     rb_define_method(rb_mEnumerable, "group_by", enum_group_by, 0);
+    rb_define_method(rb_mEnumerable, "tally", enum_tally, 0);
     rb_define_method(rb_mEnumerable, "first", enum_first, -1);
-    rb_define_method(rb_mEnumerable, "all?", enum_all, 0);
-    rb_define_method(rb_mEnumerable, "any?", enum_any, 0);
-    rb_define_method(rb_mEnumerable, "one?", enum_one, 0);
-    rb_define_method(rb_mEnumerable, "none?", enum_none, 0);
+    rb_define_method(rb_mEnumerable, "all?", enum_all, -1);
+    rb_define_method(rb_mEnumerable, "any?", enum_any, -1);
+    rb_define_method(rb_mEnumerable, "one?", enum_one, -1);
+    rb_define_method(rb_mEnumerable, "none?", enum_none, -1);
     rb_define_method(rb_mEnumerable, "min", enum_min, -1);
     rb_define_method(rb_mEnumerable, "max", enum_max, -1);
     rb_define_method(rb_mEnumerable, "minmax", enum_minmax, 0);
@@ -3866,9 +4250,7 @@ Init_Enumerable(void)
     rb_define_method(rb_mEnumerable, "slice_when", enum_slice_when, 0);
     rb_define_method(rb_mEnumerable, "chunk_while", enum_chunk_while, 0);
     rb_define_method(rb_mEnumerable, "sum", enum_sum, -1);
+    rb_define_method(rb_mEnumerable, "uniq", enum_uniq, 0);
 
-    id_next = rb_intern("next");
-    id_call = rb_intern("call");
-    id_size = rb_intern("size");
-    id_div = rb_intern("div");
+    id_next = rb_intern_const("next");
 }
diff --git a/enumerator.c b/enumerator.c
index a59473a88c..90d2ec433c 100644
--- a/enumerator.c
+++ b/enumerator.c
@@ -12,7 +12,22 @@
 
 ************************************************/
 
+#include "ruby/internal/config.h"
+
+#ifdef HAVE_FLOAT_H
+#include <float.h>
+#endif
+
+#include "id.h"
 #include "internal.h"
+#include "internal/enumerator.h"
+#include "internal/error.h"
+#include "internal/hash.h"
+#include "internal/imemo.h"
+#include "internal/numeric.h"
+#include "internal/range.h"
+#include "internal/rational.h"
+#include "ruby/ruby.h"
 
 /*
  * Document-class: Enumerator
@@ -20,8 +35,8 @@
  * A class which allows both internal and external iteration.
  *
  * An Enumerator can be created by the following methods.
- * - Kernel#to_enum
- * - Kernel#enum_for
+ * - Object#to_enum
+ * - Object#enum_for
  * - Enumerator.new
  *
  * Most methods have two forms: a block form where the contents
@@ -67,6 +82,14 @@
  *   puts e.next   # => 3
  *   puts e.next   # raises StopIteration
  *
+ * Note that enumeration sequence by +next+, +next_values+, +peek+ and
+ * +peek_values+ do not affect other non-external
+ * enumeration methods, unless the underlying iteration method itself has
+ * side-effect, e.g. IO#each_line.
+ *
+ * Moreover, implementation typically uses fibers so performance could be
+ * slower and exception stacktraces different than expected.
+ *
  * You can use this to implement an internal iterator as follows:
  *
  *   def ext_each(e)
@@ -101,10 +124,19 @@
  *
  */
 VALUE rb_cEnumerator;
-VALUE rb_cLazy;
-static ID id_rewind, id_each, id_new, id_initialize, id_yield, id_call, id_size, id_to_enum;
-static ID id_eqq, id_next, id_result, id_lazy, id_receiver, id_arguments, id_memo, id_method, id_force;
-static VALUE sym_each, sym_cycle;
+static VALUE rb_cLazy;
+static ID id_rewind, id_new, id_to_enum;
+static ID id_next, id_result, id_receiver, id_arguments, id_memo, id_method, id_force;
+static ID id_begin, id_end, id_step, id_exclude_end;
+static VALUE sym_each, sym_cycle, sym_yield;
+
+static VALUE lazy_use_super_method;
+
+#define id_call idCall
+#define id_each idEach
+#define id_eqq idEqq
+#define id_initialize idInitialize
+#define id_size idSize
 
 VALUE rb_eStopIteration;
 
@@ -118,22 +150,52 @@ struct enumerator {
     VALUE feedvalue;
     VALUE stop_exc;
     VALUE size;
+    VALUE procs;
     rb_enumerator_size_func *size_fn;
+    int kw_splat;
 };
 
-static VALUE rb_cGenerator, rb_cYielder;
+static VALUE rb_cGenerator, rb_cYielder, rb_cEnumProducer;
 
 struct generator {
     VALUE proc;
+    VALUE obj;
 };
 
 struct yielder {
     VALUE proc;
 };
 
+struct producer {
+    VALUE init;
+    VALUE proc;
+};
+
+typedef struct MEMO *lazyenum_proc_func(VALUE, struct MEMO *, VALUE, long);
+typedef VALUE lazyenum_size_func(VALUE, VALUE);
+typedef struct {
+    lazyenum_proc_func *proc;
+    lazyenum_size_func *size;
+} lazyenum_funcs;
+
+struct proc_entry {
+    VALUE proc;
+    VALUE memo;
+    const lazyenum_funcs *fn;
+};
+
 static VALUE generator_allocate(VALUE klass);
 static VALUE generator_init(VALUE obj, VALUE proc);
 
+static VALUE rb_cEnumChain;
+
+struct enum_chain {
+    VALUE enums;
+    long pos;
+};
+
+VALUE rb_cArithSeq;
+
 /*
  * Enumerator
  */
@@ -141,14 +203,30 @@ static void
 enumerator_mark(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);
-    rb_gc_mark(ptr->lookahead);
-    rb_gc_mark(ptr->feedvalue);
-    rb_gc_mark(ptr->stop_exc);
-    rb_gc_mark(ptr->size);
+    rb_gc_mark_movable(ptr->obj);
+    rb_gc_mark_movable(ptr->args);
+    rb_gc_mark_movable(ptr->fib);
+    rb_gc_mark_movable(ptr->dst);
+    rb_gc_mark_movable(ptr->lookahead);
+    rb_gc_mark_movable(ptr->feedvalue);
+    rb_gc_mark_movable(ptr->stop_exc);
+    rb_gc_mark_movable(ptr->size);
+    rb_gc_mark_movable(ptr->procs);
+}
+
+static void
+enumerator_compact(void *p)
+{
+    struct enumerator *ptr = p;
+    ptr->obj = rb_gc_location(ptr->obj);
+    ptr->args = rb_gc_location(ptr->args);
+    ptr->fib = rb_gc_location(ptr->fib);
+    ptr->dst = rb_gc_location(ptr->dst);
+    ptr->lookahead = rb_gc_location(ptr->lookahead);
+    ptr->feedvalue = rb_gc_location(ptr->feedvalue);
+    ptr->stop_exc = rb_gc_location(ptr->stop_exc);
+    ptr->size = rb_gc_location(ptr->size);
+    ptr->procs = rb_gc_location(ptr->procs);
 }
 
 #define enumerator_free RUBY_TYPED_DEFAULT_FREE
@@ -165,6 +243,7 @@ static const rb_data_type_t enumerator_data_type = {
 	enumerator_mark,
 	enumerator_free,
 	enumerator_memsize,
+        enumerator_compact,
     },
     0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
@@ -181,6 +260,50 @@ enumerator_ptr(VALUE obj)
     return ptr;
 }
 
+static void
+proc_entry_mark(void *p)
+{
+    struct proc_entry *ptr = p;
+    rb_gc_mark_movable(ptr->proc);
+    rb_gc_mark_movable(ptr->memo);
+}
+
+static void
+proc_entry_compact(void *p)
+{
+    struct proc_entry *ptr = p;
+    ptr->proc = rb_gc_location(ptr->proc);
+    ptr->memo = rb_gc_location(ptr->memo);
+}
+
+#define proc_entry_free RUBY_TYPED_DEFAULT_FREE
+
+static size_t
+proc_entry_memsize(const void *p)
+{
+    return p ? sizeof(struct proc_entry) : 0;
+}
+
+static const rb_data_type_t proc_entry_data_type = {
+    "proc_entry",
+    {
+	proc_entry_mark,
+	proc_entry_free,
+	proc_entry_memsize,
+        proc_entry_compact,
+    },
+};
+
+static struct proc_entry *
+proc_entry_ptr(VALUE proc_entry)
+{
+    struct proc_entry *ptr;
+
+    TypedData_Get_Struct(proc_entry, struct proc_entry, &proc_entry_data_type, ptr);
+
+    return ptr;
+}
+
 /*
  * call-seq:
  *   obj.to_enum(method = :each, *args)                 -> enum
@@ -189,7 +312,8 @@ enumerator_ptr(VALUE obj)
  *   obj.enum_for(method = :each, *args){|*args| block} -> enum
  *
  * Creates a new Enumerator which will enumerate by calling +method+ on
- * +obj+, passing +args+ if any.
+ * +obj+, passing +args+ if any. What was _yielded_ by method becomes
+ * values of enumerator.
  *
  * If a block is given, it will be used to calculate the size of
  * the enumerator without the need to iterate it (see Enumerator#size).
@@ -208,6 +332,11 @@ enumerator_ptr(VALUE obj)
  *   a = [1, 2, 3]
  *   some_method(a.to_enum)
  *
+ *   # String#split in block form is more memory-effective:
+ *   very_large_string.split("|") { |chunk| return chunk if chunk.include?('DATE') }
+ *   # This could be rewritten more idiomatically with to_enum:
+ *   very_large_string.to_enum(:split, "|").lazy.grep(/DATE/).first
+ *
  * It is typical to call to_enum when defining methods for
  * a generic Enumerable, in case no block is passed.
  *
@@ -265,7 +394,7 @@ enumerator_allocate(VALUE klass)
 }
 
 static VALUE
-enumerator_init(VALUE enum_obj, VALUE obj, VALUE meth, int argc, const VALUE *argv, rb_enumerator_size_func *size_fn, VALUE size)
+enumerator_init(VALUE enum_obj, VALUE obj, VALUE meth, int argc, const VALUE *argv, rb_enumerator_size_func *size_fn, VALUE size, int kw_splat)
 {
     struct enumerator *ptr;
 
@@ -286,21 +415,38 @@ enumerator_init(VALUE enum_obj, VALUE obj, VALUE meth, int argc, const VALUE *ar
     ptr->stop_exc = Qfalse;
     ptr->size = size;
     ptr->size_fn = size_fn;
+    ptr->kw_splat = kw_splat;
 
     return enum_obj;
 }
 
+static VALUE
+convert_to_feasible_size_value(VALUE obj)
+{
+    if (NIL_P(obj)) {
+        return obj;
+    }
+    else if (rb_respond_to(obj, id_call)) {
+        return obj;
+    }
+    else if (RB_FLOAT_TYPE_P(obj) && RFLOAT_VALUE(obj) == HUGE_VAL) {
+        return obj;
+    }
+    else {
+        return rb_to_int(obj);
+    }
+}
+
 /*
  * call-seq:
  *   Enumerator.new(size = nil) { |yielder| ... }
- *   Enumerator.new(obj, method = :each, *args)
  *
  * Creates a new Enumerator object, which can be used as an
  * Enumerable.
  *
- * In the first form, iteration is defined by the given block, in
+ * Iteration is defined by the given block, in
  * which a "yielder" object, given as block parameter, can be used to
- * yield a value by calling the +yield+ method (aliased as +<<+):
+ * yield a value by calling the +yield+ method (aliased as <code><<</code>):
  *
  *   fib = Enumerator.new do |y|
  *     a = b = 1
@@ -310,55 +456,21 @@ enumerator_init(VALUE enum_obj, VALUE obj, VALUE meth, int argc, const VALUE *ar
  *     end
  *   end
  *
- *   p fib.take(10) # => [1, 1, 2, 3, 5, 8, 13, 21, 34, 55]
+ *   fib.take(10) # => [1, 1, 2, 3, 5, 8, 13, 21, 34, 55]
  *
  * The optional parameter can be used to specify how to calculate the size
  * in a lazy fashion (see Enumerator#size). It can either be a value or
  * a callable object.
- *
- * In the second, deprecated, form, a generated Enumerator iterates over the
- * given object using the given method with the given arguments passed.
- *
- * Use of this form is discouraged.  Use Kernel#enum_for or Kernel#to_enum
- * instead.
- *
- *   e = Enumerator.new(ObjectSpace, :each_object)
- *       #-> ObjectSpace.enum_for(:each_object)
- *
- *   e.select { |obj| obj.is_a?(Class) }  #=> array of all classes
- *
  */
 static VALUE
 enumerator_initialize(int argc, VALUE *argv, VALUE obj)
 {
-    VALUE recv, meth = sym_each;
-    VALUE size = Qnil;
+    VALUE iter = rb_block_proc();
+    VALUE recv = generator_init(generator_allocate(rb_cGenerator), iter);
+    VALUE arg0 = rb_check_arity(argc, 0, 1) ? argv[0] : Qnil;
+    VALUE size = convert_to_feasible_size_value(arg0);
 
-    if (rb_block_given_p()) {
-	rb_check_arity(argc, 0, 1);
-	recv = generator_init(generator_allocate(rb_cGenerator), rb_block_proc());
-	if (argc) {
-            if (NIL_P(argv[0]) || rb_respond_to(argv[0], id_call) ||
-                (RB_TYPE_P(argv[0], T_FLOAT) && RFLOAT_VALUE(argv[0]) == INFINITY)) {
-                size = argv[0];
-            }
-            else {
-                size = rb_to_int(argv[0]);
-            }
-            argc = 0;
-        }
-    }
-    else {
-	rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
-	rb_warn("Enumerator.new without a block is deprecated; use Object#to_enum");
-	recv = *argv++;
-	if (--argc) {
-	    meth = *argv++;
-	    --argc;
-	}
-    }
-
-    return enumerator_init(obj, recv, meth, argc, argv, 0, size);
+    return enumerator_init(obj, recv, sym_each, 0, 0, 0, size, false);
 }
 
 /* :nodoc: */
@@ -402,7 +514,7 @@ rb_enumeratorize(VALUE obj, VALUE meth, int argc, const VALUE *argv)
 }
 
 static VALUE
-lazy_to_enum_i(VALUE self, VALUE meth, int argc, const VALUE *argv, rb_enumerator_size_func *size_fn);
+lazy_to_enum_i(VALUE self, VALUE meth, int argc, const VALUE *argv, rb_enumerator_size_func *size_fn, int kw_splat);
 
 VALUE
 rb_enumeratorize_with_size(VALUE obj, VALUE meth, int argc, const VALUE *argv, rb_enumerator_size_func *size_fn)
@@ -410,10 +522,22 @@ rb_enumeratorize_with_size(VALUE obj, VALUE meth, int argc, const VALUE *argv, r
     /* Similar effect as calling obj.to_enum, i.e. dispatching to either
        Kernel#to_enum vs Lazy#to_enum */
     if (RTEST(rb_obj_is_kind_of(obj, rb_cLazy)))
-	return lazy_to_enum_i(obj, meth, argc, argv, size_fn);
+        return lazy_to_enum_i(obj, meth, argc, argv, size_fn, rb_keyword_given_p());
     else
 	return enumerator_init(enumerator_allocate(rb_cEnumerator),
-			       obj, meth, argc, argv, size_fn, Qnil);
+                               obj, meth, argc, argv, size_fn, Qnil, rb_keyword_given_p());
+}
+
+VALUE
+rb_enumeratorize_with_size_kw(VALUE obj, VALUE meth, int argc, const VALUE *argv, rb_enumerator_size_func *size_fn, int kw_splat)
+{
+    /* Similar effect as calling obj.to_enum, i.e. dispatching to either
+       Kernel#to_enum vs Lazy#to_enum */
+    if (RTEST(rb_obj_is_kind_of(obj, rb_cLazy)))
+        return lazy_to_enum_i(obj, meth, argc, argv, size_fn, kw_splat);
+    else
+        return enumerator_init(enumerator_allocate(rb_cEnumerator),
+                               obj, meth, argc, argv, size_fn, Qnil, kw_splat);
 }
 
 static VALUE
@@ -428,7 +552,7 @@ enumerator_block_call(VALUE obj, rb_block_call_func *func, VALUE arg)
 	argc = RARRAY_LENINT(e->args);
 	argv = RARRAY_CONST_PTR(e->args);
     }
-    return rb_block_call(e->obj, meth, argc, argv, func, arg);
+    return rb_block_call_kw(e->obj, meth, argc, argv, func, arg, e->kw_splat);
 }
 
 /*
@@ -485,6 +609,8 @@ enumerator_each(int argc, VALUE *argv, VALUE obj)
 	    args = rb_ary_new4(argc, argv);
 	}
 	e->args = args;
+        e->size = Qnil;
+        e->size_fn = 0;
     }
     if (!rb_block_given_p()) return obj;
     return enumerator_block_call(obj, 0, obj);
@@ -529,12 +655,9 @@ enumerator_with_index(int argc, VALUE *argv, VALUE obj)
 {
     VALUE memo;
 
-    rb_scan_args(argc, argv, "01", &memo);
+    rb_check_arity(argc, 0, 1);
     RETURN_SIZED_ENUMERATOR(obj, argc, argv, enumerator_enum_size);
-    if (NIL_P(memo))
-	memo = INT2FIX(0);
-    else
-	memo = rb_to_int(memo);
+    memo = (!argc || NIL_P(memo = argv[0])) ? INT2FIX(0) : rb_to_int(memo);
     return enumerator_block_call(obj, enumerator_with_index_i, (VALUE)MEMO_NEW(memo, 0, 0));
 }
 
@@ -588,9 +711,9 @@ enumerator_with_object_i(RB_BLOCK_CALL_FUNC_ARGLIST(val, memo))
  *     puts "#{string}: #{x}"
  *   end
  *
- *   # => foo:0
- *   # => foo:1
- *   # => foo:2
+ *   # => foo: 0
+ *   # => foo: 1
+ *   # => foo: 2
  */
 static VALUE
 enumerator_with_object(VALUE obj, VALUE memo)
@@ -616,7 +739,7 @@ next_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, obj))
 }
 
 static VALUE
-next_i(VALUE curr, VALUE obj)
+next_i(RB_BLOCK_CALL_FUNC_ARGLIST(_, obj))
 {
     struct enumerator *e = enumerator_ptr(obj);
     VALUE nil = Qnil;
@@ -670,6 +793,8 @@ get_next_values(VALUE obj, struct enumerator *e)
  * internal position forward.  When the position reached at the end,
  * StopIteration is raised.
  *
+ * See class-level notes about external iterators.
+ *
  * This method can be used to distinguish <code>yield</code> and <code>yield
  * nil</code>.
  *
@@ -703,10 +828,6 @@ get_next_values(VALUE obj, struct enumerator *e)
  *   #  yield nil        [nil]            nil
  *   #  yield [1, 2]     [[1, 2]]         [1, 2]
  *
- * Note that +next_values+ does not affect other non-external enumeration
- * methods unless underlying iteration method itself has side-effect, e.g.
- * IO#each_line.
- *
  */
 
 static VALUE
@@ -760,9 +881,7 @@ ary2sv(VALUE args, int dup)
  *   p e.next   #=> 3
  *   p e.next   #raises StopIteration
  *
- * Note that enumeration sequence by +next+ does not affect other non-external
- * enumeration methods, unless the underlying iteration methods itself has
- * side-effect, e.g. IO#each_line.
+ * See class-level notes about external iterators.
  *
  */
 
@@ -792,6 +911,8 @@ enumerator_peek_values(VALUE obj)
  * doesn't move the internal position forward.  If the position is already at
  * the end, StopIteration is raised.
  *
+ * See class-level notes about external iterators.
+ *
  * === Example
  *
  *   o = Object.new
@@ -826,6 +947,8 @@ enumerator_peek_values_m(VALUE obj)
  * position forward.  If the position is already at the end, StopIteration
  * is raised.
  *
+ * See class-level notes about external iterators.
+ *
  * === Example
  *
  *   a = [1,2,3]
@@ -930,6 +1053,7 @@ enumerator_rewind(VALUE obj)
     return obj;
 }
 
+static struct generator *generator_ptr(VALUE obj);
 static VALUE append_method(VALUE obj, VALUE str, ID default_method, VALUE default_args);
 
 static VALUE
@@ -948,7 +1072,25 @@ inspect_enumerator(VALUE obj, VALUE dummy, int recur)
 
     if (recur) {
 	str = rb_sprintf("#<%"PRIsVALUE": ...>", rb_class_path(cname));
-	OBJ_TAINT(str);
+	return str;
+    }
+
+    if (e->procs) {
+	long i;
+
+	eobj = generator_ptr(e->obj)->obj;
+	/* In case procs chained enumerator traversing all proc entries manually */
+	if (rb_obj_class(eobj) == cname) {
+	    str = rb_inspect(eobj);
+	}
+	else {
+	    str = rb_sprintf("#<%"PRIsVALUE": %+"PRIsVALUE">", rb_class_path(cname), eobj);
+	}
+	for (i = 0; i < RARRAY_LEN(e->procs); i++) {
+	    str = rb_sprintf("#<%"PRIsVALUE": %"PRIsVALUE, cname, str);
+	    append_method(RARRAY_AREF(e->procs, i), str, e->meth, e->args);
+	    rb_str_buf_cat2(str, ">");
+	}
 	return str;
     }
 
@@ -966,6 +1108,22 @@ inspect_enumerator(VALUE obj, VALUE dummy, int recur)
     return str;
 }
 
+static int
+key_symbol_p(VALUE key, VALUE val, VALUE arg)
+{
+    if (SYMBOL_P(key)) return ST_CONTINUE;
+    *(int *)arg = FALSE;
+    return ST_STOP;
+}
+
+static int
+kwd_append(VALUE key, VALUE val, VALUE str)
+{
+    if (!SYMBOL_P(key)) rb_raise(rb_eRuntimeError, "non-symbol key inserted");
+    rb_str_catf(str, "% "PRIsVALUE": %"PRIsVALUE", ", key, val);
+    return ST_CONTINUE;
+}
+
 static VALUE
 append_method(VALUE obj, VALUE str, ID default_method, VALUE default_args)
 {
@@ -993,15 +1151,27 @@ append_method(VALUE obj, VALUE str, ID default_method, VALUE default_args)
 	const VALUE *argv = RARRAY_CONST_PTR(eargs); /* WB: no new reference */
 
 	if (argc > 0) {
+	    VALUE kwds = Qnil;
+
 	    rb_str_buf_cat2(str, "(");
 
+            if (RB_TYPE_P(argv[argc-1], T_HASH) && !RHASH_EMPTY_P(argv[argc-1])) {
+		int all_key = TRUE;
+		rb_hash_foreach(argv[argc-1], key_symbol_p, (VALUE)&all_key);
+		if (all_key) kwds = argv[--argc];
+	    }
+
 	    while (argc--) {
 		VALUE arg = *argv++;
 
 		rb_str_append(str, rb_inspect(arg));
-		rb_str_buf_cat2(str, argc > 0 ? ", " : ")");
-		OBJ_INFECT(str, arg);
+		rb_str_buf_cat2(str, ", ");
 	    }
+	    if (!NIL_P(kwds)) {
+		rb_hash_foreach(kwds, kwd_append, str);
+	    }
+	    rb_str_set_len(str, RSTRING_LEN(str)-2);
+	    rb_str_buf_cat2(str, ")");
 	}
     }
 
@@ -1040,6 +1210,23 @@ enumerator_size(VALUE obj)
     const VALUE *argv = NULL;
     VALUE size;
 
+    if (e->procs) {
+	struct generator *g = generator_ptr(e->obj);
+	VALUE receiver = rb_check_funcall(g->obj, id_size, 0, 0);
+	long i = 0;
+
+	for (i = 0; i < RARRAY_LEN(e->procs); i++) {
+	    VALUE proc = RARRAY_AREF(e->procs, i);
+	    struct proc_entry *entry = proc_entry_ptr(proc);
+	    lazyenum_size_func *size_fn = entry->fn->size;
+	    if (!size_fn) {
+		return Qnil;
+	    }
+	    receiver = (*size_fn)(proc, receiver);
+	}
+	return receiver;
+    }
+
     if (e->size_fn) {
 	return (*e->size_fn)(e->obj, e->args, obj);
     }
@@ -1047,7 +1234,7 @@ enumerator_size(VALUE obj)
 	argc = (int)RARRAY_LEN(e->args);
 	argv = RARRAY_CONST_PTR(e->args);
     }
-    size = rb_check_funcall(e->size, id_call, argc, argv);
+    size = rb_check_funcall_kw(e->size, id_call, argc, argv, e->kw_splat);
     if (size != Qundef) return size;
     return e->size;
 }
@@ -1059,7 +1246,14 @@ static void
 yielder_mark(void *p)
 {
     struct yielder *ptr = p;
-    rb_gc_mark(ptr->proc);
+    rb_gc_mark_movable(ptr->proc);
+}
+
+static void
+yielder_compact(void *p)
+{
+    struct yielder *ptr = p;
+    ptr->proc = rb_gc_location(ptr->proc);
 }
 
 #define yielder_free RUBY_TYPED_DEFAULT_FREE
@@ -1076,6 +1270,7 @@ static const rb_data_type_t yielder_data_type = {
 	yielder_mark,
 	yielder_free,
 	yielder_memsize,
+        yielder_compact,
     },
     0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
@@ -1136,21 +1331,44 @@ yielder_yield(VALUE obj, VALUE args)
 {
     struct yielder *ptr = yielder_ptr(obj);
 
-    return rb_proc_call(ptr->proc, args);
+    return rb_proc_call_kw(ptr->proc, args, RB_PASS_CALLED_KEYWORDS);
 }
 
 /* :nodoc: */
 static VALUE
-yielder_yield_push(VALUE obj, VALUE args)
+yielder_yield_push(VALUE obj, VALUE arg)
 {
-    yielder_yield(obj, args);
+    struct yielder *ptr = yielder_ptr(obj);
+
+    rb_proc_call_with_block(ptr->proc, 1, &arg, Qnil);
+
     return obj;
 }
 
+/*
+ * Returns a Proc object that takes arguments and yields them.
+ *
+ * This method is implemented so that a Yielder object can be directly
+ * passed to another method as a block argument.
+ *
+ *   enum = Enumerator.new { |y|
+ *     Dir.glob("*.rb") { |file|
+ *       File.open(file) { |f| f.each_line(&y) }
+ *     }
+ *   }
+ */
+static VALUE
+yielder_to_proc(VALUE obj)
+{
+    VALUE method = rb_obj_method(obj, sym_yield);
+
+    return rb_funcall(method, idTo_proc, 0);
+}
+
 static VALUE
 yielder_yield_i(RB_BLOCK_CALL_FUNC_ARGLIST(obj, memo))
 {
-    return rb_yield_values2(argc, argv);
+    return rb_yield_values_kw(argc, argv, RB_PASS_CALLED_KEYWORDS);
 }
 
 static VALUE
@@ -1166,7 +1384,16 @@ static void
 generator_mark(void *p)
 {
     struct generator *ptr = p;
-    rb_gc_mark(ptr->proc);
+    rb_gc_mark_movable(ptr->proc);
+    rb_gc_mark_movable(ptr->obj);
+}
+
+static void
+generator_compact(void *p)
+{
+    struct generator *ptr = p;
+    ptr->proc = rb_gc_location(ptr->proc);
+    ptr->obj = rb_gc_location(ptr->obj);
 }
 
 #define generator_free RUBY_TYPED_DEFAULT_FREE
@@ -1183,6 +1410,7 @@ static const rb_data_type_t generator_data_type = {
 	generator_mark,
 	generator_free,
 	generator_memsize,
+        generator_compact,
     },
     0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
@@ -1289,7 +1517,7 @@ generator_each(int argc, VALUE *argv, VALUE obj)
 	rb_ary_cat(args, argv, argc);
     }
 
-    return rb_proc_call(ptr->proc, args);
+    return rb_proc_call_kw(ptr->proc, args, RB_PASS_CALLED_KEYWORDS);
 }
 
 /* Lazy Enumerator methods */
@@ -1306,17 +1534,7 @@ lazyenum_size(VALUE self, VALUE args, VALUE eobj)
     return enum_size(self);
 }
 
-static VALUE
-lazy_size(VALUE self)
-{
-    return enum_size(rb_ivar_get(self, id_receiver));
-}
-
-static VALUE
-lazy_receiver_size(VALUE generator, VALUE args, VALUE lazy)
-{
-    return lazy_size(lazy);
-}
+#define lazy_receiver_size lazy_map_size
 
 static VALUE
 lazy_init_iterator(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
@@ -1351,33 +1569,197 @@ lazy_init_block_i(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
     return Qnil;
 }
 
+#define memo_value v2
+#define memo_flags u3.state
+#define LAZY_MEMO_BREAK 1
+#define LAZY_MEMO_PACKED 2
+#define LAZY_MEMO_BREAK_P(memo) ((memo)->memo_flags & LAZY_MEMO_BREAK)
+#define LAZY_MEMO_PACKED_P(memo) ((memo)->memo_flags & LAZY_MEMO_PACKED)
+#define LAZY_MEMO_SET_BREAK(memo) ((memo)->memo_flags |= LAZY_MEMO_BREAK)
+#define LAZY_MEMO_RESET_BREAK(memo) ((memo)->memo_flags &= ~LAZY_MEMO_BREAK)
+#define LAZY_MEMO_SET_VALUE(memo, value) MEMO_V2_SET(memo, value)
+#define LAZY_MEMO_SET_PACKED(memo) ((memo)->memo_flags |= LAZY_MEMO_PACKED)
+#define LAZY_MEMO_RESET_PACKED(memo) ((memo)->memo_flags &= ~LAZY_MEMO_PACKED)
+
+static VALUE lazy_yielder_result(struct MEMO *result, VALUE yielder, VALUE procs_array, VALUE memos, long i);
+
+static VALUE
+lazy_init_yielder(RB_BLOCK_CALL_FUNC_ARGLIST(_, m))
+{
+    VALUE yielder = RARRAY_AREF(m, 0);
+    VALUE procs_array = RARRAY_AREF(m, 1);
+    VALUE memos = rb_attr_get(yielder, id_memo);
+    struct MEMO *result;
+
+    result = MEMO_NEW(m, rb_enum_values_pack(argc, argv),
+		      argc > 1 ? LAZY_MEMO_PACKED : 0);
+    return lazy_yielder_result(result, yielder, procs_array, memos, 0);
+}
+
+static VALUE
+lazy_yielder_yield(struct MEMO *result, long memo_index, int argc, const VALUE *argv)
+{
+    VALUE m = result->v1;
+    VALUE yielder = RARRAY_AREF(m, 0);
+    VALUE procs_array = RARRAY_AREF(m, 1);
+    VALUE memos = rb_attr_get(yielder, id_memo);
+    LAZY_MEMO_SET_VALUE(result, rb_enum_values_pack(argc, argv));
+    if (argc > 1)
+        LAZY_MEMO_SET_PACKED(result);
+    else
+        LAZY_MEMO_RESET_PACKED(result);
+    return lazy_yielder_result(result, yielder, procs_array, memos, memo_index);
+}
+
+static VALUE
+lazy_yielder_result(struct MEMO *result, VALUE yielder, VALUE procs_array, VALUE memos, long i)
+{
+    int cont = 1;
+
+    for (; i < RARRAY_LEN(procs_array); i++) {
+	VALUE proc = RARRAY_AREF(procs_array, i);
+	struct proc_entry *entry = proc_entry_ptr(proc);
+	if (!(*entry->fn->proc)(proc, result, memos, i)) {
+	    cont = 0;
+	    break;
+	}
+    }
+
+    if (cont) {
+	rb_funcall2(yielder, idLTLT, 1, &(result->memo_value));
+    }
+    if (LAZY_MEMO_BREAK_P(result)) {
+	rb_iter_break();
+    }
+    return result->memo_value;
+}
+
+static VALUE
+lazy_init_block(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
+{
+    VALUE procs = RARRAY_AREF(m, 1);
+
+    rb_ivar_set(val, id_memo, rb_ary_new2(RARRAY_LEN(procs)));
+    rb_block_call(RARRAY_AREF(m, 0), id_each, 0, 0,
+		  lazy_init_yielder, rb_ary_new3(2, val, procs));
+    return Qnil;
+}
+
+static VALUE
+lazy_generator_init(VALUE enumerator, VALUE procs)
+{
+    VALUE generator;
+    VALUE obj;
+    struct generator *gen_ptr;
+    struct enumerator *e = enumerator_ptr(enumerator);
+
+    if (RARRAY_LEN(procs) > 0) {
+	struct generator *old_gen_ptr = generator_ptr(e->obj);
+	obj = old_gen_ptr->obj;
+    }
+    else {
+	obj = enumerator;
+    }
+
+    generator = generator_allocate(rb_cGenerator);
+
+    rb_block_call(generator, id_initialize, 0, 0,
+		  lazy_init_block, rb_ary_new3(2, obj, procs));
+
+    gen_ptr = generator_ptr(generator);
+    gen_ptr->obj = obj;
+
+    return generator;
+}
+
+/*
+ * Document-class: Enumerator::Lazy
+ *
+ * Enumerator::Lazy is a special type of Enumerator, that allows constructing
+ * chains of operations without evaluating them immediately, and evaluating
+ * values on as-needed basis. In order to do so it redefines most of Enumerable
+ * methods so that they just construct another lazy enumerator.
+ *
+ * Enumerator::Lazy can be constructed from any Enumerable with the
+ * Enumerable#lazy method.
+ *
+ *    lazy = (1..Float::INFINITY).lazy.select(&:odd?).drop(10).take_while { |i| i < 30 }
+ *    # => #<Enumerator::Lazy: #<Enumerator::Lazy: #<Enumerator::Lazy: #<Enumerator::Lazy: 1..Infinity>:select>:drop(10)>:take_while>
+ *
+ * The real enumeration is performed when any non-redefined Enumerable method
+ * is called, like Enumerable#first or Enumerable#to_a (the latter is aliased
+ * as #force for more semantic code):
+ *
+ *    lazy.first(2)
+ *    #=> [21, 23]
+ *
+ *    lazy.force
+ *    #=> [21, 23, 25, 27, 29]
+ *
+ * Note that most Enumerable methods that could be called with or without
+ * a block, on Enumerator::Lazy will always require a block:
+ *
+ *    [1, 2, 3].map       #=> #<Enumerator: [1, 2, 3]:map>
+ *    [1, 2, 3].lazy.map  # ArgumentError: tried to call lazy map without a block
+ *
+ * This class allows idiomatic calculations on long or infinite sequences, as well
+ * as chaining of calculations without constructing intermediate arrays.
+ *
+ * Example for working with a slowly calculated sequence:
+ *
+ *    require 'open-uri'
+ *
+ *    # This will fetch all URLs before selecting
+ *    # necessary data
+ *    URLS.map { |u| JSON.parse(open(u).read) }
+ *      .select { |data| data.key?('stats') }
+ *      .first(5)
+ *
+ *    # This will fetch URLs one-by-one, only till
+ *    # there is enough data to satisfy the condition
+ *    URLS.lazy.map { |u| JSON.parse(open(u).read) }
+ *      .select { |data| data.key?('stats') }
+ *      .first(5)
+ *
+ * Ending a chain with ".eager" generates a non-lazy enumerator, which
+ * is suitable for returning or passing to another method that expects
+ * a normal enumerator.
+ *
+ *    def active_items
+ *      groups
+ *        .lazy
+ *        .flat_map(&:items)
+ *        .reject(&:disabled)
+ *        .eager
+ *    end
+ *
+ *    # This works lazily; if a checked item is found, it stops
+ *    # iteration and does not look into remaining groups.
+ *    first_checked = active_items.find(&:checked)
+ *
+ *    # This returns an array of items like a normal enumerator does.
+ *    all_checked = active_items.select(&:checked)
+ *
+ */
+
 /*
  * call-seq:
- *   Lazy.new(obj, size=nil) { |yielder, *values| ... }
+ *   Lazy.new(obj, size=nil) { |yielder, *values| block }
  *
  * Creates a new Lazy enumerator. When the enumerator is actually enumerated
  * (e.g. by calling #force), +obj+ will be enumerated and each value passed
  * to the given block. The block can yield values back using +yielder+.
- * For example, to create a method +filter_map+ in both lazy and
- * non-lazy fashions:
+ * For example, to create a "filter+map" enumerator:
  *
- *   module Enumerable
- *     def filter_map(&block)
- *       map(&block).compact
+ *   def filter_map(sequence)
+ *     Lazy.new(sequence) do |yielder, *values|
+ *       result = yield *values
+ *       yielder << result if result
  *     end
  *   end
  *
- *   class Enumerator::Lazy
- *     def filter_map
- *       Lazy.new(self) do |yielder, *values|
- *         result = yield *values
- *         yielder << result if result
- *       end
- *     end
- *   end
- *
- *   (1..Float::INFINITY).lazy.filter_map{|i| i*i if i.even?}.first(5)
- *       # => [4, 16, 36, 64, 100]
+ *   filter_map(1..Float::INFINITY) {|i| i*i if i.even?}.first(5)
+ *   #=> [4, 16, 36, 64, 100]
  */
 static VALUE
 lazy_initialize(int argc, VALUE *argv, VALUE self)
@@ -1395,17 +1777,30 @@ lazy_initialize(int argc, VALUE *argv, VALUE self)
     }
     generator = generator_allocate(rb_cGenerator);
     rb_block_call(generator, id_initialize, 0, 0, lazy_init_block_i, obj);
-    enumerator_init(self, generator, sym_each, 0, 0, 0, size);
+    enumerator_init(self, generator, sym_each, 0, 0, 0, size, 0);
     rb_ivar_set(self, id_receiver, obj);
 
     return self;
 }
 
-static VALUE
-lazy_set_method(VALUE lazy, VALUE args, rb_enumerator_size_func *size_fn)
+#if 0 /* for RDoc */
+/*
+ * call-seq:
+ *   lazy.to_a  -> array
+ *   lazy.force -> array
+ *
+ * Expands +lazy+ enumerator to an array.
+ * See Enumerable#to_a.
+ */
+static VALUE lazy_to_a(VALUE self)
+{
+}
+#endif
+
+static void
+lazy_set_args(VALUE lazy, VALUE args)
 {
     ID id = rb_frame_this_func();
-    struct enumerator *e = enumerator_ptr(lazy);
     rb_ivar_set(lazy, id_method, ID2SYM(id));
     if (NIL_P(args)) {
 	/* Qfalse indicates that the arguments are empty */
@@ -1414,19 +1809,66 @@ lazy_set_method(VALUE lazy, VALUE args, rb_enumerator_size_func *size_fn)
     else {
 	rb_ivar_set(lazy, id_arguments, args);
     }
+}
+
+#if 0
+static VALUE
+lazy_set_method(VALUE lazy, VALUE args, rb_enumerator_size_func *size_fn)
+{
+    struct enumerator *e = enumerator_ptr(lazy);
+    lazy_set_args(lazy, args);
     e->size_fn = size_fn;
     return lazy;
 }
+#endif
+
+static VALUE
+lazy_add_method(VALUE obj, int argc, VALUE *argv, VALUE args, VALUE memo,
+		const lazyenum_funcs *fn)
+{
+    struct enumerator *new_e;
+    VALUE new_obj;
+    VALUE new_generator;
+    VALUE new_procs;
+    struct enumerator *e = enumerator_ptr(obj);
+    struct proc_entry *entry;
+    VALUE entry_obj = TypedData_Make_Struct(rb_cObject, struct proc_entry,
+					    &proc_entry_data_type, entry);
+    if (rb_block_given_p()) {
+	entry->proc = rb_block_proc();
+    }
+    entry->fn = fn;
+    entry->memo = args;
+
+    lazy_set_args(entry_obj, memo);
+
+    new_procs = RTEST(e->procs) ? rb_ary_dup(e->procs) : rb_ary_new();
+    new_generator = lazy_generator_init(obj, new_procs);
+    rb_ary_push(new_procs, entry_obj);
+
+    new_obj = enumerator_init_copy(enumerator_allocate(rb_cLazy), obj);
+    new_e = DATA_PTR(new_obj);
+    new_e->obj = new_generator;
+    new_e->procs = new_procs;
+
+    if (argc > 0) {
+	new_e->meth = rb_to_id(*argv++);
+	--argc;
+    }
+    else {
+	new_e->meth = id_each;
+    }
+    new_e->args = rb_ary_new4(argc, argv);
+    return new_obj;
+}
 
 /*
  * call-seq:
  *   e.lazy -> lazy_enumerator
  *
- * Returns a lazy enumerator, whose methods map/collect,
- * flat_map/collect_concat, select/find_all, reject, grep, grep_v, zip, take,
- * take_while, drop, and drop_while enumerate values only on an
- * as-needed basis.  However, if a block is given to zip, values
- * are enumerated immediately.
+ * Returns an Enumerator::Lazy, which redefines most Enumerable
+ * methods to postpone enumeration and enumerate values only on an
+ * as-needed basis.
  *
  * === Example
  *
@@ -1452,33 +1894,33 @@ lazy_set_method(VALUE lazy, VALUE args, rb_enumerator_size_func *size_fn)
 static VALUE
 enumerable_lazy(VALUE obj)
 {
-    VALUE result = lazy_to_enum_i(obj, sym_each, 0, 0, lazyenum_size);
+    VALUE result = lazy_to_enum_i(obj, sym_each, 0, 0, lazyenum_size, rb_keyword_given_p());
     /* Qfalse indicates that the Enumerator::Lazy has no method name */
     rb_ivar_set(result, id_method, Qfalse);
     return result;
 }
 
 static VALUE
-lazy_to_enum_i(VALUE obj, VALUE meth, int argc, const VALUE *argv, rb_enumerator_size_func *size_fn)
+lazy_to_enum_i(VALUE obj, VALUE meth, int argc, const VALUE *argv, rb_enumerator_size_func *size_fn, int kw_splat)
 {
     return enumerator_init(enumerator_allocate(rb_cLazy),
-			   obj, meth, argc, argv, size_fn, Qnil);
+                           obj, meth, argc, argv, size_fn, Qnil, kw_splat);
 }
 
 /*
  * call-seq:
- *   lzy.to_enum(method = :each, *args)                 -> lazy_enum
- *   lzy.enum_for(method = :each, *args)                -> lazy_enum
- *   lzy.to_enum(method = :each, *args) {|*args| block} -> lazy_enum
- *   lzy.enum_for(method = :each, *args){|*args| block} -> lazy_enum
+ *   lzy.to_enum(method = :each, *args)                   -> lazy_enum
+ *   lzy.enum_for(method = :each, *args)                  -> lazy_enum
+ *   lzy.to_enum(method = :each, *args) {|*args| block }  -> lazy_enum
+ *   lzy.enum_for(method = :each, *args) {|*args| block } -> lazy_enum
  *
- * Similar to Kernel#to_enum, except it returns a lazy enumerator.
+ * Similar to Object#to_enum, except it returns a lazy enumerator.
  * This makes it easy to define Enumerable methods that will
  * naturally remain lazy if called from a lazy enumerator.
  *
- * For example, continuing from the example in Kernel#to_enum:
+ * For example, continuing from the example in Object#to_enum:
  *
- *   # See Kernel#to_enum for the definition of repeat
+ *   # See Object#to_enum for the definition of repeat
  *   r = 1..Float::INFINITY
  *   r.repeat(2).first(5) # => [1, 1, 2, 2, 3]
  *   r.repeat(2).class # => Enumerator
@@ -1491,13 +1933,16 @@ lazy_to_enum_i(VALUE obj, VALUE meth, int argc, const VALUE *argv, rb_enumerator
 static VALUE
 lazy_to_enum(int argc, VALUE *argv, VALUE self)
 {
-    VALUE lazy, meth = sym_each;
+    VALUE lazy, meth = sym_each, super_meth;
 
     if (argc > 0) {
 	--argc;
 	meth = *argv++;
     }
-    lazy = lazy_to_enum_i(self, meth, argc, argv, 0);
+    if (RTEST((super_meth = rb_hash_aref(lazy_use_super_method, meth)))) {
+        meth = super_meth;
+    }
+    lazy = lazy_to_enum_i(self, meth, argc, argv, 0, rb_keyword_given_p());
     if (rb_block_given_p()) {
 	enumerator_ptr(lazy)->size = rb_block_proc();
     }
@@ -1505,95 +1950,159 @@ lazy_to_enum(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-lazy_map_func(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
+lazy_eager_size(VALUE self, VALUE args, VALUE eobj)
 {
-    VALUE result = rb_yield_values2(argc - 1, &argv[1]);
-
-    rb_funcall(argv[0], id_yield, 1, result);
-    return Qnil;
+    return enum_size(self);
 }
 
+/*
+ * call-seq:
+ *   lzy.eager -> enum
+ *
+ * Returns a non-lazy Enumerator converted from the lazy enumerator.
+ */
+
 static VALUE
-lazy_map(VALUE obj)
+lazy_eager(VALUE self)
 {
-    if (!rb_block_given_p()) {
-	rb_raise(rb_eArgError, "tried to call lazy map without a block");
-    }
+    return enumerator_init(enumerator_allocate(rb_cEnumerator),
+                           self, sym_each, 0, 0, lazy_eager_size, Qnil, 0);
+}
 
-    return lazy_set_method(rb_block_call(rb_cLazy, id_new, 1, &obj,
-					 lazy_map_func, 0),
-			   Qnil, lazy_receiver_size);
+static VALUE
+lazyenum_yield(VALUE proc_entry, struct MEMO *result)
+{
+    struct proc_entry *entry = proc_entry_ptr(proc_entry);
+    return rb_proc_call_with_block(entry->proc, 1, &result->memo_value, Qnil);
 }
 
 static VALUE
-lazy_flat_map_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, yielder))
+lazyenum_yield_values(VALUE proc_entry, struct MEMO *result)
 {
-    return rb_funcall2(yielder, id_yield, argc, argv);
+    struct proc_entry *entry = proc_entry_ptr(proc_entry);
+    int argc = 1;
+    const VALUE *argv = &result->memo_value;
+    if (LAZY_MEMO_PACKED_P(result)) {
+	const VALUE args = *argv;
+	argc = RARRAY_LENINT(args);
+	argv = RARRAY_CONST_PTR(args);
+    }
+    return rb_proc_call_with_block(entry->proc, argc, argv, Qnil);
+}
+
+static struct MEMO *
+lazy_map_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
+{
+    VALUE value = lazyenum_yield_values(proc_entry, result);
+    LAZY_MEMO_SET_VALUE(result, value);
+    LAZY_MEMO_RESET_PACKED(result);
+    return result;
 }
 
 static VALUE
-lazy_flat_map_each(VALUE obj, VALUE yielder)
+lazy_map_size(VALUE entry, VALUE receiver)
 {
-    rb_block_call(obj, id_each, 0, 0, lazy_flat_map_i, yielder);
-    return Qnil;
+    return receiver;
 }
 
+static const lazyenum_funcs lazy_map_funcs = {
+    lazy_map_proc, lazy_map_size,
+};
+
+/*
+ *  call-seq:
+ *     lazy.collect { |obj| block } -> lazy_enumerator
+ *     lazy.map     { |obj| block } -> lazy_enumerator
+ *
+ *  Like Enumerable#map, but chains operation to be lazy-evaluated.
+ *
+ *     (1..Float::INFINITY).lazy.map {|i| i**2 }
+ *     #=> #<Enumerator::Lazy: #<Enumerator::Lazy: 1..Infinity>:map>
+ *     (1..Float::INFINITY).lazy.map {|i| i**2 }.first(3)
+ *     #=> [1, 4, 9]
+ */
+
 static VALUE
-lazy_flat_map_to_ary(VALUE obj, VALUE yielder)
+lazy_map(VALUE obj)
 {
-    VALUE ary = rb_check_array_type(obj);
-    if (NIL_P(ary)) {
-	rb_funcall(yielder, id_yield, 1, obj);
-    }
-    else {
-	long i;
-	for (i = 0; i < RARRAY_LEN(ary); i++) {
-	    rb_funcall(yielder, id_yield, 1, RARRAY_AREF(ary, i));
-	}
+    if (!rb_block_given_p()) {
+	rb_raise(rb_eArgError, "tried to call lazy map without a block");
     }
-    return Qnil;
+
+    return lazy_add_method(obj, 0, 0, Qnil, Qnil, &lazy_map_funcs);
 }
 
+struct flat_map_i_arg {
+    struct MEMO *result;
+    long index;
+};
+
 static VALUE
-lazy_flat_map_func(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
+lazy_flat_map_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, y))
 {
-    VALUE result = rb_yield_values2(argc - 1, &argv[1]);
-    if (RB_TYPE_P(result, T_ARRAY)) {
-	long i;
-	for (i = 0; i < RARRAY_LEN(result); i++) {
-	    rb_funcall(argv[0], id_yield, 1, RARRAY_AREF(result, i));
-	}
+    struct flat_map_i_arg *arg = (struct flat_map_i_arg *)y;
+
+    return lazy_yielder_yield(arg->result, arg->index, argc, argv);
+}
+
+static struct MEMO *
+lazy_flat_map_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
+{
+    VALUE value = lazyenum_yield_values(proc_entry, result);
+    VALUE ary = 0;
+    const long proc_index = memo_index + 1;
+    int break_p = LAZY_MEMO_BREAK_P(result);
+
+    if (RB_TYPE_P(value, T_ARRAY)) {
+        ary = value;
     }
-    else {
-	if (rb_respond_to(result, id_force) && rb_respond_to(result, id_each)) {
-	    lazy_flat_map_each(result, argv[0]);
-	}
-	else {
-	    lazy_flat_map_to_ary(result, argv[0]);
-	}
+    else if (rb_respond_to(value, id_force) && rb_respond_to(value, id_each)) {
+        struct flat_map_i_arg arg = {.result = result, .index = proc_index};
+        LAZY_MEMO_RESET_BREAK(result);
+        rb_block_call(value, id_each, 0, 0, lazy_flat_map_i, (VALUE)&arg);
+        if (break_p) LAZY_MEMO_SET_BREAK(result);
+        return 0;
     }
-    return Qnil;
+
+    if (ary || !NIL_P(ary = rb_check_array_type(value))) {
+        long i;
+        LAZY_MEMO_RESET_BREAK(result);
+        for (i = 0; i + 1 < RARRAY_LEN(ary); i++) {
+            const VALUE argv = RARRAY_AREF(ary, i);
+            lazy_yielder_yield(result, proc_index, 1, &argv);
+        }
+        if (break_p) LAZY_MEMO_SET_BREAK(result);
+        if (i >= RARRAY_LEN(ary)) return 0;
+        value = RARRAY_AREF(ary, i);
+    }
+    LAZY_MEMO_SET_VALUE(result, value);
+    LAZY_MEMO_RESET_PACKED(result);
+    return result;
 }
 
+static const lazyenum_funcs lazy_flat_map_funcs = {
+    lazy_flat_map_proc, 0,
+};
+
 /*
  *  call-seq:
  *     lazy.collect_concat { |obj| block } -> a_lazy_enumerator
  *     lazy.flat_map       { |obj| block } -> a_lazy_enumerator
  *
  *  Returns a new lazy enumerator with the concatenated results of running
- *  <i>block</i> once for every element in <i>lazy</i>.
+ *  +block+ once for every element in the lazy enumerator.
  *
  *    ["foo", "bar"].lazy.flat_map {|i| i.each_char.lazy}.force
  *    #=> ["f", "o", "o", "b", "a", "r"]
  *
- *  A value <i>x</i> returned by <i>block</i> is decomposed if either of
+ *  A value +x+ returned by +block+ is decomposed if either of
  *  the following conditions is true:
  *
- *    a) <i>x</i> responds to both each and force, which means that
- *       <i>x</i> is a lazy enumerator.
- *    b) <i>x</i> is an array or responds to to_ary.
+ *  * +x+ responds to both each and force, which means that
+ *    +x+ is a lazy enumerator.
+ *  * +x+ is an array or responds to to_ary.
  *
- *  Otherwise, <i>x</i> is contained as-is in the return value.
+ *  Otherwise, +x+ is contained as-is in the return value.
  *
  *    [{a:1}, {b:2}].lazy.flat_map {|i| i}.force
  *    #=> [{:a=>1}, {:b=>2}]
@@ -1605,22 +2114,29 @@ lazy_flat_map(VALUE obj)
 	rb_raise(rb_eArgError, "tried to call lazy flat_map without a block");
     }
 
-    return lazy_set_method(rb_block_call(rb_cLazy, id_new, 1, &obj,
-					 lazy_flat_map_func, 0),
-			   Qnil, 0);
+    return lazy_add_method(obj, 0, 0, Qnil, Qnil, &lazy_flat_map_funcs);
 }
 
-static VALUE
-lazy_select_func(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
+static struct MEMO *
+lazy_select_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
 {
-    VALUE element = rb_enum_values_pack(argc - 1, argv + 1);
-
-    if (RTEST(rb_yield(element))) {
-	return rb_funcall(argv[0], id_yield, 1, element);
-    }
-    return Qnil;
+    VALUE chain = lazyenum_yield(proc_entry, result);
+    if (!RTEST(chain)) return 0;
+    return result;
 }
 
+static const lazyenum_funcs lazy_select_funcs = {
+    lazy_select_proc, 0,
+};
+
+/*
+ *  call-seq:
+ *     lazy.find_all { |obj| block } -> lazy_enumerator
+ *     lazy.select   { |obj| block } -> lazy_enumerator
+ *     lazy.filter   { |obj| block } -> lazy_enumerator
+ *
+ *  Like Enumerable#select, but chains operation to be lazy-evaluated.
+ */
 static VALUE
 lazy_select(VALUE obj)
 {
@@ -1628,22 +2144,62 @@ lazy_select(VALUE obj)
 	rb_raise(rb_eArgError, "tried to call lazy select without a block");
     }
 
-    return lazy_set_method(rb_block_call(rb_cLazy, id_new, 1, &obj,
-					 lazy_select_func, 0),
-			   Qnil, 0);
+    return lazy_add_method(obj, 0, 0, Qnil, Qnil, &lazy_select_funcs);
 }
 
-static VALUE
-lazy_reject_func(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
+static struct MEMO *
+lazy_filter_map_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
 {
-    VALUE element = rb_enum_values_pack(argc - 1, argv + 1);
+    VALUE value = lazyenum_yield_values(proc_entry, result);
+    if (!RTEST(value)) return 0;
+    LAZY_MEMO_SET_VALUE(result, value);
+    LAZY_MEMO_RESET_PACKED(result);
+    return result;
+}
+
+static const lazyenum_funcs lazy_filter_map_funcs = {
+    lazy_filter_map_proc, 0,
+};
 
-    if (!RTEST(rb_yield(element))) {
-	return rb_funcall(argv[0], id_yield, 1, element);
+/*
+ *  call-seq:
+ *     lazy.filter_map { |obj| block } -> lazy_enumerator
+ *
+ *  Like Enumerable#filter_map, but chains operation to be lazy-evaluated.
+ *
+ *    (1..).lazy.filter_map { |i| i * 2 if i.even? }.first(5)
+ *    #=> [4, 8, 12, 16, 20]
+ */
+
+static VALUE
+lazy_filter_map(VALUE obj)
+{
+    if (!rb_block_given_p()) {
+        rb_raise(rb_eArgError, "tried to call lazy filter_map without a block");
     }
-    return Qnil;
+
+    return lazy_add_method(obj, 0, 0, Qnil, Qnil, &lazy_filter_map_funcs);
 }
 
+static struct MEMO *
+lazy_reject_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
+{
+    VALUE chain = lazyenum_yield(proc_entry, result);
+    if (RTEST(chain)) return 0;
+    return result;
+}
+
+static const lazyenum_funcs lazy_reject_funcs = {
+    lazy_reject_proc, 0,
+};
+
+/*
+ *  call-seq:
+ *     lazy.reject { |obj| block } -> lazy_enumerator
+ *
+ *  Like Enumerable#reject, but chains operation to be lazy-evaluated.
+ */
+
 static VALUE
 lazy_reject(VALUE obj)
 {
@@ -1651,77 +2207,101 @@ lazy_reject(VALUE obj)
 	rb_raise(rb_eArgError, "tried to call lazy reject without a block");
     }
 
-    return lazy_set_method(rb_block_call(rb_cLazy, id_new, 1, &obj,
-					 lazy_reject_func, 0),
-			   Qnil, 0);
+    return lazy_add_method(obj, 0, 0, Qnil, Qnil, &lazy_reject_funcs);
 }
 
-static VALUE
-lazy_grep_func(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
+static struct MEMO *
+lazy_grep_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
 {
-    VALUE i = rb_enum_values_pack(argc - 1, argv + 1);
-    VALUE result = rb_funcall(m, id_eqq, 1, i);
-
-    if (RTEST(result)) {
-	rb_funcall(argv[0], id_yield, 1, i);
-    }
-    return Qnil;
+    struct proc_entry *entry = proc_entry_ptr(proc_entry);
+    VALUE chain = rb_funcall(entry->memo, id_eqq, 1, result->memo_value);
+    if (!RTEST(chain)) return 0;
+    return result;
 }
 
-static VALUE
-lazy_grep_iter(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
+static struct MEMO *
+lazy_grep_iter_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
 {
-    VALUE i = rb_enum_values_pack(argc - 1, argv + 1);
-    VALUE result = rb_funcall(m, id_eqq, 1, i);
+    struct proc_entry *entry = proc_entry_ptr(proc_entry);
+    VALUE value, chain = rb_funcall(entry->memo, id_eqq, 1, result->memo_value);
 
-    if (RTEST(result)) {
-	rb_funcall(argv[0], id_yield, 1, rb_yield(i));
-    }
-    return Qnil;
+    if (!RTEST(chain)) return 0;
+    value = rb_proc_call_with_block(entry->proc, 1, &(result->memo_value), Qnil);
+    LAZY_MEMO_SET_VALUE(result, value);
+    LAZY_MEMO_RESET_PACKED(result);
+
+    return result;
 }
 
+static const lazyenum_funcs lazy_grep_iter_funcs = {
+    lazy_grep_iter_proc, 0,
+};
+
+static const lazyenum_funcs lazy_grep_funcs = {
+    lazy_grep_proc, 0,
+};
+
+/*
+ *  call-seq:
+ *     lazy.grep(pattern)                  -> lazy_enumerator
+ *     lazy.grep(pattern) { |obj| block }  -> lazy_enumerator
+ *
+ *  Like Enumerable#grep, but chains operation to be lazy-evaluated.
+ */
+
 static VALUE
 lazy_grep(VALUE obj, VALUE pattern)
 {
-    return lazy_set_method(rb_block_call(rb_cLazy, id_new, 1, &obj,
-					 rb_block_given_p() ?
-					 lazy_grep_iter : lazy_grep_func,
-					 pattern),
-			   rb_ary_new3(1, pattern), 0);
+    const lazyenum_funcs *const funcs = rb_block_given_p() ?
+	&lazy_grep_iter_funcs : &lazy_grep_funcs;
+    return lazy_add_method(obj, 0, 0, pattern, rb_ary_new3(1, pattern), funcs);
 }
 
-static VALUE
-lazy_grep_v_func(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
+static struct MEMO *
+lazy_grep_v_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
 {
-    VALUE i = rb_enum_values_pack(argc - 1, argv + 1);
-    VALUE result = rb_funcall(m, id_eqq, 1, i);
-
-    if (!RTEST(result)) {
-	rb_funcall(argv[0], id_yield, 1, i);
-    }
-    return Qnil;
+    struct proc_entry *entry = proc_entry_ptr(proc_entry);
+    VALUE chain = rb_funcall(entry->memo, id_eqq, 1, result->memo_value);
+    if (RTEST(chain)) return 0;
+    return result;
 }
 
-static VALUE
-lazy_grep_v_iter(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
+static struct MEMO *
+lazy_grep_v_iter_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
 {
-    VALUE i = rb_enum_values_pack(argc - 1, argv + 1);
-    VALUE result = rb_funcall(m, id_eqq, 1, i);
+    struct proc_entry *entry = proc_entry_ptr(proc_entry);
+    VALUE value, chain = rb_funcall(entry->memo, id_eqq, 1, result->memo_value);
 
-    if (!RTEST(result)) {
-	rb_funcall(argv[0], id_yield, 1, rb_yield(i));
-    }
-    return Qnil;
+    if (RTEST(chain)) return 0;
+    value = rb_proc_call_with_block(entry->proc, 1, &(result->memo_value), Qnil);
+    LAZY_MEMO_SET_VALUE(result, value);
+    LAZY_MEMO_RESET_PACKED(result);
+
+    return result;
 }
 
+static const lazyenum_funcs lazy_grep_v_iter_funcs = {
+    lazy_grep_v_iter_proc, 0,
+};
+
+static const lazyenum_funcs lazy_grep_v_funcs = {
+    lazy_grep_v_proc, 0,
+};
+
+/*
+ *  call-seq:
+ *     lazy.grep_v(pattern)                  -> lazy_enumerator
+ *     lazy.grep_v(pattern) { |obj| block }  -> lazy_enumerator
+ *
+ *  Like Enumerable#grep_v, but chains operation to be lazy-evaluated.
+ */
+
 static VALUE
 lazy_grep_v(VALUE obj, VALUE pattern)
 {
-    return lazy_set_method(rb_block_call(rb_cLazy, id_new, 1, &obj,
-					 rb_block_given_p() ?
-					 lazy_grep_v_iter : lazy_grep_v_func,
-					 pattern),
-			   rb_ary_new3(1, pattern), 0);
+    const lazyenum_funcs *const funcs = rb_block_given_p() ?
+        &lazy_grep_v_iter_funcs : &lazy_grep_v_funcs;
+    return lazy_add_method(obj, 0, 0, pattern, rb_ary_new3(1, pattern), funcs);
 }
 
 static VALUE
@@ -1731,69 +2311,78 @@ call_next(VALUE obj)
 }
 
 static VALUE
-next_stopped(VALUE obj)
+next_stopped(VALUE obj, VALUE _)
 {
     return Qnil;
 }
 
-static VALUE
-lazy_zip_arrays_func(RB_BLOCK_CALL_FUNC_ARGLIST(val, arrays))
+static struct MEMO *
+lazy_zip_arrays_func(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
 {
-    VALUE yielder, ary, memo;
-    long i, count;
-
-    yielder = argv[0];
-    memo = rb_attr_get(yielder, id_memo);
-    count = NIL_P(memo) ? 0 : NUM2LONG(memo);
+    struct proc_entry *entry = proc_entry_ptr(proc_entry);
+    VALUE ary, arrays = entry->memo;
+    VALUE memo = rb_ary_entry(memos, memo_index);
+    long i, count = NIL_P(memo) ? 0 : NUM2LONG(memo);
 
     ary = rb_ary_new2(RARRAY_LEN(arrays) + 1);
-    rb_ary_push(ary, argv[1]);
+    rb_ary_push(ary, result->memo_value);
     for (i = 0; i < RARRAY_LEN(arrays); i++) {
 	rb_ary_push(ary, rb_ary_entry(RARRAY_AREF(arrays, i), count));
     }
-    rb_funcall(yielder, id_yield, 1, ary);
-    rb_ivar_set(yielder, id_memo, LONG2NUM(++count));
-    return Qnil;
+    LAZY_MEMO_SET_VALUE(result, ary);
+    LAZY_MEMO_SET_PACKED(result);
+    rb_ary_store(memos, memo_index, LONG2NUM(++count));
+    return result;
 }
 
-static VALUE
-lazy_zip_func(RB_BLOCK_CALL_FUNC_ARGLIST(val, zip_args))
+static struct MEMO *
+lazy_zip_func(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
 {
-    VALUE yielder, ary, arg, v;
+    struct proc_entry *entry = proc_entry_ptr(proc_entry);
+    VALUE arg = rb_ary_entry(memos, memo_index);
+    VALUE zip_args = entry->memo;
+    VALUE ary, v;
     long i;
 
-    yielder = argv[0];
-    arg = rb_attr_get(yielder, id_memo);
     if (NIL_P(arg)) {
 	arg = rb_ary_new2(RARRAY_LEN(zip_args));
 	for (i = 0; i < RARRAY_LEN(zip_args); i++) {
 	    rb_ary_push(arg, rb_funcall(RARRAY_AREF(zip_args, i), id_to_enum, 0));
 	}
-	rb_ivar_set(yielder, id_memo, arg);
+	rb_ary_store(memos, memo_index, arg);
     }
 
     ary = rb_ary_new2(RARRAY_LEN(arg) + 1);
-    v = Qnil;
-    if (--argc > 0) {
-	++argv;
-	v = argc > 1 ? rb_ary_new_from_values(argc, argv) : *argv;
-    }
-    rb_ary_push(ary, v);
+    rb_ary_push(ary, result->memo_value);
     for (i = 0; i < RARRAY_LEN(arg); i++) {
 	v = rb_rescue2(call_next, RARRAY_AREF(arg, i), next_stopped, 0,
 		       rb_eStopIteration, (VALUE)0);
 	rb_ary_push(ary, v);
     }
-    rb_funcall(yielder, id_yield, 1, ary);
-    return Qnil;
+    LAZY_MEMO_SET_VALUE(result, ary);
+    LAZY_MEMO_SET_PACKED(result);
+    return result;
 }
 
+static const lazyenum_funcs lazy_zip_funcs[] = {
+    {lazy_zip_func, lazy_receiver_size,},
+    {lazy_zip_arrays_func, lazy_receiver_size,},
+};
+
+/*
+ *  call-seq:
+ *     lazy.zip(arg, ...)                  -> lazy_enumerator
+ *     lazy.zip(arg, ...) { |arr| block }  -> nil
+ *
+ *  Like Enumerable#zip, but chains operation to be lazy-evaluated.
+ *  However, if a block is given to zip, values are enumerated immediately.
+ */
 static VALUE
 lazy_zip(int argc, VALUE *argv, VALUE obj)
 {
     VALUE ary, v;
     long i;
-    rb_block_call_func *func = lazy_zip_arrays_func;
+    const lazyenum_funcs *funcs = &lazy_zip_funcs[1];
 
     if (rb_block_given_p()) {
 	return rb_call_super(argc, argv);
@@ -1810,91 +2399,113 @@ lazy_zip(int argc, VALUE *argv, VALUE obj)
 		}
 	    }
 	    ary = rb_ary_new4(argc, argv);
-	    func = lazy_zip_func;
+	    funcs = &lazy_zip_funcs[0];
 	    break;
 	}
 	rb_ary_push(ary, v);
     }
 
-    return lazy_set_method(rb_block_call(rb_cLazy, id_new, 1, &obj,
-					 func, ary),
-			   ary, lazy_receiver_size);
+    return lazy_add_method(obj, 0, 0, ary, ary, funcs);
 }
 
-static VALUE
-lazy_take_func(RB_BLOCK_CALL_FUNC_ARGLIST(val, args))
+static struct MEMO *
+lazy_take_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
 {
     long remain;
-    VALUE memo = rb_attr_get(argv[0], id_memo);
+    struct proc_entry *entry = proc_entry_ptr(proc_entry);
+    VALUE memo = rb_ary_entry(memos, memo_index);
+
     if (NIL_P(memo)) {
-	memo = args;
+	memo = entry->memo;
     }
 
-    rb_funcall2(argv[0], id_yield, argc - 1, argv + 1);
-    if ((remain = NUM2LONG(memo)-1) == 0) {
-	return Qundef;
+    remain = NUM2LONG(memo);
+    if (remain == 0) {
+	LAZY_MEMO_SET_BREAK(result);
     }
     else {
-	rb_ivar_set(argv[0], id_memo, LONG2NUM(remain));
-	return Qnil;
+	if (--remain == 0) LAZY_MEMO_SET_BREAK(result);
+	rb_ary_store(memos, memo_index, LONG2NUM(remain));
     }
+    return result;
 }
 
 static VALUE
-lazy_take_size(VALUE generator, VALUE args, VALUE lazy)
+lazy_take_size(VALUE entry, VALUE receiver)
 {
-    VALUE receiver = lazy_size(lazy);
-    long len = NUM2LONG(RARRAY_AREF(rb_ivar_get(lazy, id_arguments), 0));
+    long len = NUM2LONG(RARRAY_AREF(rb_ivar_get(entry, id_arguments), 0));
     if (NIL_P(receiver) || (FIXNUM_P(receiver) && FIX2LONG(receiver) < len))
 	return receiver;
     return LONG2NUM(len);
 }
 
+static const lazyenum_funcs lazy_take_funcs = {
+    lazy_take_proc, lazy_take_size,
+};
+
+/*
+ *  call-seq:
+ *     lazy.take(n)               -> lazy_enumerator
+ *
+ *  Like Enumerable#take, but chains operation to be lazy-evaluated.
+ */
+
 static VALUE
 lazy_take(VALUE obj, VALUE n)
 {
     long len = NUM2LONG(n);
-    VALUE lazy;
+    int argc = 0;
+    VALUE argv[2];
 
     if (len < 0) {
 	rb_raise(rb_eArgError, "attempt to take negative size");
     }
+
     if (len == 0) {
-	VALUE len = INT2FIX(0);
-	lazy = lazy_to_enum_i(obj, sym_cycle, 1, &len, 0);
-    }
-    else {
-	lazy = rb_block_call(rb_cLazy, id_new, 1, &obj,
-					 lazy_take_func, n);
+       argv[0] = sym_cycle;
+       argv[1] = INT2NUM(0);
+       argc = 2;
     }
-    return lazy_set_method(lazy, rb_ary_new3(1, n), lazy_take_size);
+
+    return lazy_add_method(obj, argc, argv, n, rb_ary_new3(1, n), &lazy_take_funcs);
 }
 
-static VALUE
-lazy_take_while_func(RB_BLOCK_CALL_FUNC_ARGLIST(val, args))
+static struct MEMO *
+lazy_take_while_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
 {
-    VALUE result = rb_yield_values2(argc - 1, &argv[1]);
-    if (!RTEST(result)) return Qundef;
-    rb_funcall2(argv[0], id_yield, argc - 1, argv + 1);
-    return Qnil;
+    VALUE take = lazyenum_yield_values(proc_entry, result);
+    if (!RTEST(take)) {
+	LAZY_MEMO_SET_BREAK(result);
+	return 0;
+    }
+    return result;
 }
 
+static const lazyenum_funcs lazy_take_while_funcs = {
+    lazy_take_while_proc, 0,
+};
+
+/*
+ *  call-seq:
+ *     lazy.take_while { |obj| block } -> lazy_enumerator
+ *
+ *  Like Enumerable#take_while, but chains operation to be lazy-evaluated.
+ */
+
 static VALUE
 lazy_take_while(VALUE obj)
 {
     if (!rb_block_given_p()) {
 	rb_raise(rb_eArgError, "tried to call lazy take_while without a block");
     }
-    return lazy_set_method(rb_block_call(rb_cLazy, id_new, 1, &obj,
-					 lazy_take_while_func, 0),
-			   Qnil, 0);
+
+    return lazy_add_method(obj, 0, 0, Qnil, Qnil, &lazy_take_while_funcs);
 }
 
 static VALUE
-lazy_drop_size(VALUE generator, VALUE args, VALUE lazy)
+lazy_drop_size(VALUE proc_entry, VALUE receiver)
 {
-    long len = NUM2LONG(RARRAY_AREF(rb_ivar_get(lazy, id_arguments), 0));
-    VALUE receiver = lazy_size(lazy);
+    long len = NUM2LONG(RARRAY_AREF(rb_ivar_get(proc_entry, id_arguments), 0));
     if (NIL_P(receiver))
 	return receiver;
     if (FIXNUM_P(receiver)) {
@@ -1904,66 +2515,274 @@ lazy_drop_size(VALUE generator, VALUE args, VALUE lazy)
     return rb_funcall(receiver, '-', 1, LONG2NUM(len));
 }
 
-static VALUE
-lazy_drop_func(RB_BLOCK_CALL_FUNC_ARGLIST(val, args))
+static struct MEMO *
+lazy_drop_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
 {
     long remain;
-    VALUE memo = rb_attr_get(argv[0], id_memo);
+    struct proc_entry *entry = proc_entry_ptr(proc_entry);
+    VALUE memo = rb_ary_entry(memos, memo_index);
+
     if (NIL_P(memo)) {
-	memo = args;
-    }
-    if ((remain = NUM2LONG(memo)) == 0) {
-	rb_funcall2(argv[0], id_yield, argc - 1, argv + 1);
+	memo = entry->memo;
     }
-    else {
-	rb_ivar_set(argv[0], id_memo, LONG2NUM(--remain));
+    remain = NUM2LONG(memo);
+    if (remain > 0) {
+	--remain;
+	rb_ary_store(memos, memo_index, LONG2NUM(remain));
+	return 0;
     }
-    return Qnil;
+
+    return result;
 }
 
+static const lazyenum_funcs lazy_drop_funcs = {
+    lazy_drop_proc, lazy_drop_size,
+};
+
+/*
+ *  call-seq:
+ *     lazy.drop(n)               -> lazy_enumerator
+ *
+ *  Like Enumerable#drop, but chains operation to be lazy-evaluated.
+ */
+
 static VALUE
 lazy_drop(VALUE obj, VALUE n)
 {
     long len = NUM2LONG(n);
+    VALUE argv[2];
+    argv[0] = sym_each;
+    argv[1] = n;
 
     if (len < 0) {
 	rb_raise(rb_eArgError, "attempt to drop negative size");
     }
-    return lazy_set_method(rb_block_call(rb_cLazy, id_new, 1, &obj,
-					 lazy_drop_func, n),
-			   rb_ary_new3(1, n), lazy_drop_size);
+
+    return lazy_add_method(obj, 2, argv, n, rb_ary_new3(1, n), &lazy_drop_funcs);
 }
 
-static VALUE
-lazy_drop_while_func(RB_BLOCK_CALL_FUNC_ARGLIST(val, args))
+static struct MEMO *
+lazy_drop_while_proc(VALUE proc_entry, struct MEMO* result, VALUE memos, long memo_index)
 {
-    VALUE memo = rb_attr_get(argv[0], id_memo);
-    if (NIL_P(memo) && !RTEST(rb_yield_values2(argc - 1, &argv[1]))) {
-	rb_ivar_set(argv[0], id_memo, memo = Qtrue);
+    struct proc_entry *entry = proc_entry_ptr(proc_entry);
+    VALUE memo = rb_ary_entry(memos, memo_index);
+
+    if (NIL_P(memo)) {
+	memo = entry->memo;
     }
-    if (memo == Qtrue) {
-	rb_funcall2(argv[0], id_yield, argc - 1, argv + 1);
+
+    if (!RTEST(memo)) {
+	VALUE drop = lazyenum_yield_values(proc_entry, result);
+	if (RTEST(drop)) return 0;
+	rb_ary_store(memos, memo_index, Qtrue);
     }
-    return Qnil;
+    return result;
 }
 
+static const lazyenum_funcs lazy_drop_while_funcs = {
+    lazy_drop_while_proc, 0,
+};
+
+/*
+ *  call-seq:
+ *     lazy.drop_while { |obj| block }  -> lazy_enumerator
+ *
+ *  Like Enumerable#drop_while, but chains operation to be lazy-evaluated.
+ */
+
 static VALUE
 lazy_drop_while(VALUE obj)
 {
     if (!rb_block_given_p()) {
 	rb_raise(rb_eArgError, "tried to call lazy drop_while without a block");
     }
-    return lazy_set_method(rb_block_call(rb_cLazy, id_new, 1, &obj,
-					 lazy_drop_while_func, 0),
-			   Qnil, 0);
+
+    return lazy_add_method(obj, 0, 0, Qfalse, Qnil, &lazy_drop_while_funcs);
+}
+
+static int
+lazy_uniq_check(VALUE chain, VALUE memos, long memo_index)
+{
+    VALUE hash = rb_ary_entry(memos, memo_index);
+
+    if (NIL_P(hash)) {
+        hash = rb_obj_hide(rb_hash_new());
+        rb_ary_store(memos, memo_index, hash);
+    }
+
+    return rb_hash_add_new_element(hash, chain, Qfalse);
+}
+
+static struct MEMO *
+lazy_uniq_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
+{
+    if (lazy_uniq_check(result->memo_value, memos, memo_index)) return 0;
+    return result;
+}
+
+static struct MEMO *
+lazy_uniq_iter_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
+{
+    VALUE chain = lazyenum_yield(proc_entry, result);
+
+    if (lazy_uniq_check(chain, memos, memo_index)) return 0;
+    return result;
+}
+
+static const lazyenum_funcs lazy_uniq_iter_funcs = {
+    lazy_uniq_iter_proc, 0,
+};
+
+static const lazyenum_funcs lazy_uniq_funcs = {
+    lazy_uniq_proc, 0,
+};
+
+/*
+ *  call-seq:
+ *     lazy.uniq                  -> lazy_enumerator
+ *     lazy.uniq { |item| block } -> lazy_enumerator
+ *
+ *  Like Enumerable#uniq, but chains operation to be lazy-evaluated.
+ */
+
+static VALUE
+lazy_uniq(VALUE obj)
+{
+    const lazyenum_funcs *const funcs =
+        rb_block_given_p() ? &lazy_uniq_iter_funcs : &lazy_uniq_funcs;
+    return lazy_add_method(obj, 0, 0, Qnil, Qnil, funcs);
+}
+
+static struct MEMO *
+lazy_with_index_proc(VALUE proc_entry, struct MEMO* result, VALUE memos, long memo_index)
+{
+    struct proc_entry *entry = proc_entry_ptr(proc_entry);
+    VALUE memo = rb_ary_entry(memos, memo_index);
+    VALUE argv[2];
+
+    if (NIL_P(memo)) {
+        memo = entry->memo;
+    }
+
+    argv[0] = result->memo_value;
+    argv[1] = memo;
+    if (entry->proc) {
+        rb_proc_call_with_block(entry->proc, 2, argv, Qnil);
+        LAZY_MEMO_RESET_PACKED(result);
+    }
+    else {
+        LAZY_MEMO_SET_VALUE(result, rb_ary_new_from_values(2, argv));
+        LAZY_MEMO_SET_PACKED(result);
+    }
+    rb_ary_store(memos, memo_index, LONG2NUM(NUM2LONG(memo) + 1));
+    return result;
 }
 
 static VALUE
+lazy_with_index_size(VALUE proc, VALUE receiver) {
+    return receiver;
+}
+
+static const lazyenum_funcs lazy_with_index_funcs = {
+    lazy_with_index_proc, lazy_with_index_size,
+};
+
+/*
+ * call-seq:
+ *   lazy.with_index(offset = 0) {|(*args), idx| block }
+ *   lazy.with_index(offset = 0)
+ *
+ * If a block is given, iterates the given block for each element
+ * with an index, which starts from +offset+, and returns a
+ * lazy enumerator that yields the same values (without the index).
+ *
+ * If a block is not given, returns a new lazy enumerator that
+ * includes the index, starting from +offset+.
+ *
+ * +offset+:: the starting index to use
+ *
+ * See Enumerator#with_index.
+ */
+static VALUE
+lazy_with_index(int argc, VALUE *argv, VALUE obj)
+{
+    VALUE memo;
+
+    rb_scan_args(argc, argv, "01", &memo);
+    if (NIL_P(memo))
+        memo = LONG2NUM(0);
+
+    return lazy_add_method(obj, 0, 0, memo, rb_ary_new_from_values(1, &memo), &lazy_with_index_funcs);
+}
+
+#if 0 /* for RDoc */
+
+/*
+ *  call-seq:
+ *     lazy.chunk { |elt| ... }                       -> lazy_enumerator
+ *
+ *  Like Enumerable#chunk, but chains operation to be lazy-evaluated.
+ */
+static VALUE lazy_chunk(VALUE self)
+{
+}
+
+/*
+ *  call-seq:
+ *     lazy.chunk_while {|elt_before, elt_after| bool } -> lazy_enumerator
+ *
+ *  Like Enumerable#chunk_while, but chains operation to be lazy-evaluated.
+ */
+static VALUE lazy_chunk_while(VALUE self)
+{
+}
+
+/*
+ *  call-seq:
+ *     lazy.slice_after(pattern)       -> lazy_enumerator
+ *     lazy.slice_after { |elt| bool } -> lazy_enumerator
+ *
+ *  Like Enumerable#slice_after, but chains operation to be lazy-evaluated.
+ */
+static VALUE lazy_slice_after(VALUE self)
+{
+}
+
+/*
+ *  call-seq:
+ *     lazy.slice_before(pattern)       -> lazy_enumerator
+ *     lazy.slice_before { |elt| bool } -> lazy_enumerator
+ *
+ *  Like Enumerable#slice_before, but chains operation to be lazy-evaluated.
+ */
+static VALUE lazy_slice_before(VALUE self)
+{
+}
+
+/*
+ *  call-seq:
+ *     lazy.slice_when {|elt_before, elt_after| bool } -> lazy_enumerator
+ *
+ *  Like Enumerable#slice_when, but chains operation to be lazy-evaluated.
+ */
+static VALUE lazy_slice_when(VALUE self)
+{
+}
+# endif
+
+static VALUE
 lazy_super(int argc, VALUE *argv, VALUE lazy)
 {
     return enumerable_lazy(rb_call_super(argc, argv));
 }
 
+/*
+ *  call-seq:
+ *     enum.lazy -> lazy_enumerator
+ *
+ *  Returns self.
+ */
+
 static VALUE
 lazy_lazy(VALUE obj)
 {
@@ -2023,9 +2842,1174 @@ stop_result(VALUE self)
     return rb_attr_get(self, id_result);
 }
 
+/*
+ * Producer
+ */
+
+static void
+producer_mark(void *p)
+{
+    struct producer *ptr = p;
+    rb_gc_mark_movable(ptr->init);
+    rb_gc_mark_movable(ptr->proc);
+}
+
+static void
+producer_compact(void *p)
+{
+    struct producer *ptr = p;
+    ptr->init = rb_gc_location(ptr->init);
+    ptr->proc = rb_gc_location(ptr->proc);
+}
+
+#define producer_free RUBY_TYPED_DEFAULT_FREE
+
+static size_t
+producer_memsize(const void *p)
+{
+    return sizeof(struct producer);
+}
+
+static const rb_data_type_t producer_data_type = {
+    "producer",
+    {
+        producer_mark,
+        producer_free,
+        producer_memsize,
+        producer_compact,
+    },
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+static struct producer *
+producer_ptr(VALUE obj)
+{
+    struct producer *ptr;
+
+    TypedData_Get_Struct(obj, struct producer, &producer_data_type, ptr);
+    if (!ptr || ptr->proc == Qundef) {
+        rb_raise(rb_eArgError, "uninitialized producer");
+    }
+    return ptr;
+}
+
+/* :nodoc: */
+static VALUE
+producer_allocate(VALUE klass)
+{
+    struct producer *ptr;
+    VALUE obj;
+
+    obj = TypedData_Make_Struct(klass, struct producer, &producer_data_type, ptr);
+    ptr->init = Qundef;
+    ptr->proc = Qundef;
+
+    return obj;
+}
+
+static VALUE
+producer_init(VALUE obj, VALUE init, VALUE proc)
+{
+    struct producer *ptr;
+
+    TypedData_Get_Struct(obj, struct producer, &producer_data_type, ptr);
+
+    if (!ptr) {
+        rb_raise(rb_eArgError, "unallocated producer");
+    }
+
+    ptr->init = init;
+    ptr->proc = proc;
+
+    return obj;
+}
+
+static VALUE
+producer_each_stop(VALUE dummy, VALUE exc)
+{
+    return rb_attr_get(exc, id_result);
+}
+
+NORETURN(static VALUE producer_each_i(VALUE obj));
+
+static VALUE
+producer_each_i(VALUE obj)
+{
+    struct producer *ptr;
+    VALUE init, proc, curr;
+
+    ptr = producer_ptr(obj);
+    init = ptr->init;
+    proc = ptr->proc;
+
+    if (init == Qundef) {
+        curr = Qnil;
+    }
+    else {
+        rb_yield(init);
+        curr = init;
+    }
+
+    for (;;) {
+        curr = rb_funcall(proc, id_call, 1, curr);
+        rb_yield(curr);
+    }
+
+    UNREACHABLE_RETURN(Qnil);
+}
+
+/* :nodoc: */
+static VALUE
+producer_each(VALUE obj)
+{
+    rb_need_block();
+
+    return rb_rescue2(producer_each_i, obj, producer_each_stop, (VALUE)0, rb_eStopIteration, (VALUE)0);
+}
+
+static VALUE
+producer_size(VALUE obj, VALUE args, VALUE eobj)
+{
+    return DBL2NUM(HUGE_VAL);
+}
+
+/*
+ * call-seq:
+ *    Enumerator.produce(initial = nil) { |prev| block } -> enumerator
+ *
+ * Creates an infinite enumerator from any block, just called over and
+ * over.  The result of the previous iteration is passed to the next one.
+ * If +initial+ is provided, it is passed to the first iteration, and
+ * becomes the first element of the enumerator; if it is not provided,
+ * the first iteration receives +nil+, and its result becomes the first
+ * element of the iterator.
+ *
+ * Raising StopIteration from the block stops an iteration.
+ *
+ *   Enumerator.produce(1, &:succ)   # => enumerator of 1, 2, 3, 4, ....
+ *
+ *   Enumerator.produce { rand(10) } # => infinite random number sequence
+ *
+ *   ancestors = Enumerator.produce(node) { |prev| node = prev.parent or raise StopIteration }
+ *   enclosing_section = ancestors.find { |n| n.type == :section }
+ *
+ * Using ::produce together with Enumerable methods like Enumerable#detect,
+ * Enumerable#slice_after, Enumerable#take_while can provide Enumerator-based alternatives
+ * for +while+ and +until+ cycles:
+ *
+ *   # Find next Tuesday
+ *   require "date"
+ *   Enumerator.produce(Date.today, &:succ).detect(&:tuesday?)
+ *
+ *   # Simple lexer:
+ *   require "strscan"
+ *   scanner = StringScanner.new("7+38/6")
+ *   PATTERN = %r{\d+|[-/+*]}
+ *   Enumerator.produce { scanner.scan(PATTERN) }.slice_after { scanner.eos? }.first
+ *   # => ["7", "+", "38", "/", "6"]
+ */
+static VALUE
+enumerator_s_produce(int argc, VALUE *argv, VALUE klass)
+{
+    VALUE init, producer;
+
+    if (!rb_block_given_p()) rb_raise(rb_eArgError, "no block given");
+
+    if (rb_scan_args(argc, argv, "01", &init) == 0) {
+        init = Qundef;
+    }
+
+    producer = producer_init(producer_allocate(rb_cEnumProducer), init, rb_block_proc());
+
+    return rb_enumeratorize_with_size_kw(producer, sym_each, 0, 0, producer_size, RB_NO_KEYWORDS);
+}
+
+/*
+ * Document-class: Enumerator::Chain
+ *
+ * Enumerator::Chain is a subclass of Enumerator, which represents a
+ * chain of enumerables that works as a single enumerator.
+ *
+ * This type of objects can be created by Enumerable#chain and
+ * Enumerator#+.
+ */
+
+static void
+enum_chain_mark(void *p)
+{
+    struct enum_chain *ptr = p;
+    rb_gc_mark_movable(ptr->enums);
+}
+
+static void
+enum_chain_compact(void *p)
+{
+    struct enum_chain *ptr = p;
+    ptr->enums = rb_gc_location(ptr->enums);
+}
+
+#define enum_chain_free RUBY_TYPED_DEFAULT_FREE
+
+static size_t
+enum_chain_memsize(const void *p)
+{
+    return sizeof(struct enum_chain);
+}
+
+static const rb_data_type_t enum_chain_data_type = {
+    "chain",
+    {
+        enum_chain_mark,
+        enum_chain_free,
+        enum_chain_memsize,
+        enum_chain_compact,
+    },
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+static struct enum_chain *
+enum_chain_ptr(VALUE obj)
+{
+    struct enum_chain *ptr;
+
+    TypedData_Get_Struct(obj, struct enum_chain, &enum_chain_data_type, ptr);
+    if (!ptr || ptr->enums == Qundef) {
+        rb_raise(rb_eArgError, "uninitialized chain");
+    }
+    return ptr;
+}
+
+/* :nodoc: */
+static VALUE
+enum_chain_allocate(VALUE klass)
+{
+    struct enum_chain *ptr;
+    VALUE obj;
+
+    obj = TypedData_Make_Struct(klass, struct enum_chain, &enum_chain_data_type, ptr);
+    ptr->enums = Qundef;
+    ptr->pos = -1;
+
+    return obj;
+}
+
+/*
+ * call-seq:
+ *   Enumerator::Chain.new(*enums) -> enum
+ *
+ * Generates a new enumerator object that iterates over the elements
+ * of given enumerable objects in sequence.
+ *
+ *   e = Enumerator::Chain.new(1..3, [4, 5])
+ *   e.to_a #=> [1, 2, 3, 4, 5]
+ *   e.size #=> 5
+ */
+static VALUE
+enum_chain_initialize(VALUE obj, VALUE enums)
+{
+    struct enum_chain *ptr;
+
+    rb_check_frozen(obj);
+    TypedData_Get_Struct(obj, struct enum_chain, &enum_chain_data_type, ptr);
+
+    if (!ptr) rb_raise(rb_eArgError, "unallocated chain");
+
+    ptr->enums = rb_obj_freeze(enums);
+    ptr->pos = -1;
+
+    return obj;
+}
+
+/* :nodoc: */
+static VALUE
+enum_chain_init_copy(VALUE obj, VALUE orig)
+{
+    struct enum_chain *ptr0, *ptr1;
+
+    if (!OBJ_INIT_COPY(obj, orig)) return obj;
+    ptr0 = enum_chain_ptr(orig);
+
+    TypedData_Get_Struct(obj, struct enum_chain, &enum_chain_data_type, ptr1);
+
+    if (!ptr1) rb_raise(rb_eArgError, "unallocated chain");
+
+    ptr1->enums = ptr0->enums;
+    ptr1->pos = ptr0->pos;
+
+    return obj;
+}
+
+static VALUE
+enum_chain_total_size(VALUE enums)
+{
+    VALUE total = INT2FIX(0);
+    long i;
+
+    for (i = 0; i < RARRAY_LEN(enums); i++) {
+        VALUE size = enum_size(RARRAY_AREF(enums, i));
+
+        if (NIL_P(size) || (RB_TYPE_P(size, T_FLOAT) && isinf(NUM2DBL(size)))) {
+            return size;
+        }
+        if (!RB_INTEGER_TYPE_P(size)) {
+            return Qnil;
+        }
+
+        total = rb_funcall(total, '+', 1, size);
+    }
+
+    return total;
+}
+
+/*
+ * call-seq:
+ *   obj.size -> int, Float::INFINITY or nil
+ *
+ * Returns the total size of the enumerator chain calculated by
+ * summing up the size of each enumerable in the chain.  If any of the
+ * enumerables reports its size as nil or Float::INFINITY, that value
+ * is returned as the total size.
+ */
+static VALUE
+enum_chain_size(VALUE obj)
+{
+    return enum_chain_total_size(enum_chain_ptr(obj)->enums);
+}
+
+static VALUE
+enum_chain_enum_size(VALUE obj, VALUE args, VALUE eobj)
+{
+    return enum_chain_size(obj);
+}
+
+static VALUE
+enum_chain_enum_no_size(VALUE obj, VALUE args, VALUE eobj)
+{
+    return Qnil;
+}
+
+/*
+ * call-seq:
+ *   obj.each(*args) { |...| ... } -> obj
+ *   obj.each(*args) -> enumerator
+ *
+ * Iterates over the elements of the first enumerable by calling the
+ * "each" method on it with the given arguments, then proceeds to the
+ * following enumerables in sequence until all of the enumerables are
+ * exhausted.
+ *
+ * If no block is given, returns an enumerator.
+ */
+static VALUE
+enum_chain_each(int argc, VALUE *argv, VALUE obj)
+{
+    VALUE enums, block;
+    struct enum_chain *objptr;
+    long i;
+
+    RETURN_SIZED_ENUMERATOR(obj, argc, argv, argc > 0 ? enum_chain_enum_no_size : enum_chain_enum_size);
+
+    objptr = enum_chain_ptr(obj);
+    enums = objptr->enums;
+    block = rb_block_proc();
+
+    for (i = 0; i < RARRAY_LEN(enums); i++) {
+        objptr->pos = i;
+        rb_funcall_with_block(RARRAY_AREF(enums, i), id_each, argc, argv, block);
+    }
+
+    return obj;
+}
+
+/*
+ * call-seq:
+ *   obj.rewind -> obj
+ *
+ * Rewinds the enumerator chain by calling the "rewind" method on each
+ * enumerable in reverse order.  Each call is performed only if the
+ * enumerable responds to the method.
+ */
+static VALUE
+enum_chain_rewind(VALUE obj)
+{
+    struct enum_chain *objptr = enum_chain_ptr(obj);
+    VALUE enums = objptr->enums;
+    long i;
+
+    for (i = objptr->pos; 0 <= i && i < RARRAY_LEN(enums); objptr->pos = --i) {
+        rb_check_funcall(RARRAY_AREF(enums, i), id_rewind, 0, 0);
+    }
+
+    return obj;
+}
+
+static VALUE
+inspect_enum_chain(VALUE obj, VALUE dummy, int recur)
+{
+    VALUE klass = rb_obj_class(obj);
+    struct enum_chain *ptr;
+
+    TypedData_Get_Struct(obj, struct enum_chain, &enum_chain_data_type, ptr);
+
+    if (!ptr || ptr->enums == Qundef) {
+        return rb_sprintf("#<%"PRIsVALUE": uninitialized>", rb_class_path(klass));
+    }
+
+    if (recur) {
+        return rb_sprintf("#<%"PRIsVALUE": ...>", rb_class_path(klass));
+    }
+
+    return rb_sprintf("#<%"PRIsVALUE": %+"PRIsVALUE">", rb_class_path(klass), ptr->enums);
+}
+
+/*
+ * call-seq:
+ *   obj.inspect -> string
+ *
+ * Returns a printable version of the enumerator chain.
+ */
+static VALUE
+enum_chain_inspect(VALUE obj)
+{
+    return rb_exec_recursive(inspect_enum_chain, obj, 0);
+}
+
+/*
+ * call-seq:
+ *   e.chain(*enums) -> enumerator
+ *
+ * Returns an enumerator object generated from this enumerator and
+ * given enumerables.
+ *
+ *   e = (1..3).chain([4, 5])
+ *   e.to_a #=> [1, 2, 3, 4, 5]
+ */
+static VALUE
+enum_chain(int argc, VALUE *argv, VALUE obj)
+{
+    VALUE enums = rb_ary_new_from_values(1, &obj);
+    rb_ary_cat(enums, argv, argc);
+
+    return enum_chain_initialize(enum_chain_allocate(rb_cEnumChain), enums);
+}
+
+/*
+ * call-seq:
+ *   e + enum -> enumerator
+ *
+ * Returns an enumerator object generated from this enumerator and a
+ * given enumerable.
+ *
+ *   e = (1..3).each + [4, 5]
+ *   e.to_a #=> [1, 2, 3, 4, 5]
+ */
+static VALUE
+enumerator_plus(VALUE obj, VALUE eobj)
+{
+    VALUE enums = rb_ary_new_from_args(2, obj, eobj);
+
+    return enum_chain_initialize(enum_chain_allocate(rb_cEnumChain), enums);
+}
+
+/*
+ * Document-class: Enumerator::ArithmeticSequence
+ *
+ * Enumerator::ArithmeticSequence is a subclass of Enumerator,
+ * that is a representation of sequences of numbers with common difference.
+ * Instances of this class can be generated by the Range#step and Numeric#step
+ * methods.
+ *
+ * The class can be used for slicing Array (see Array#slice) or custom
+ * collections.
+ */
+
+VALUE
+rb_arith_seq_new(VALUE obj, VALUE meth, int argc, VALUE const *argv,
+                 rb_enumerator_size_func *size_fn,
+                 VALUE beg, VALUE end, VALUE step, int excl)
+{
+    VALUE aseq = enumerator_init(enumerator_allocate(rb_cArithSeq),
+                                 obj, meth, argc, argv, size_fn, Qnil, rb_keyword_given_p());
+    rb_ivar_set(aseq, id_begin, beg);
+    rb_ivar_set(aseq, id_end, end);
+    rb_ivar_set(aseq, id_step, step);
+    rb_ivar_set(aseq, id_exclude_end, excl ? Qtrue : Qfalse);
+    return aseq;
+}
+
+/*
+ * call-seq: aseq.begin -> num or nil
+ *
+ * Returns the number that defines the first element of this arithmetic
+ * sequence.
+ */
+static inline VALUE
+arith_seq_begin(VALUE self)
+{
+    return rb_ivar_get(self, id_begin);
+}
+
+/*
+ * call-seq: aseq.end -> num or nil
+ *
+ * Returns the number that defines the end of this arithmetic sequence.
+ */
+static inline VALUE
+arith_seq_end(VALUE self)
+{
+    return rb_ivar_get(self, id_end);
+}
+
+/*
+ * call-seq: aseq.step -> num
+ *
+ * Returns the number that defines the common difference between
+ * two adjacent elements in this arithmetic sequence.
+ */
+static inline VALUE
+arith_seq_step(VALUE self)
+{
+    return rb_ivar_get(self, id_step);
+}
+
+/*
+ * call-seq: aseq.exclude_end? -> true or false
+ *
+ * Returns <code>true</code> if this arithmetic sequence excludes its end value.
+ */
+static inline VALUE
+arith_seq_exclude_end(VALUE self)
+{
+    return rb_ivar_get(self, id_exclude_end);
+}
+
+static inline int
+arith_seq_exclude_end_p(VALUE self)
+{
+    return RTEST(arith_seq_exclude_end(self));
+}
+
+int
+rb_arithmetic_sequence_extract(VALUE obj, rb_arithmetic_sequence_components_t *component)
+{
+    if (rb_obj_is_kind_of(obj, rb_cArithSeq)) {
+        component->begin = arith_seq_begin(obj);
+        component->end   = arith_seq_end(obj);
+        component->step  = arith_seq_step(obj);
+        component->exclude_end = arith_seq_exclude_end_p(obj);
+        return 1;
+    }
+    else if (rb_range_values(obj, &component->begin, &component->end, &component->exclude_end)) {
+        component->step  = INT2FIX(1);
+        return 1;
+    }
+
+    return 0;
+}
+
+VALUE
+rb_arithmetic_sequence_beg_len_step(VALUE obj, long *begp, long *lenp, long *stepp, long len, int err)
+{
+    RUBY_ASSERT(begp != NULL);
+    RUBY_ASSERT(lenp != NULL);
+    RUBY_ASSERT(stepp != NULL);
+
+    rb_arithmetic_sequence_components_t aseq;
+    if (!rb_arithmetic_sequence_extract(obj, &aseq)) {
+        return Qfalse;
+    }
+
+    long step = NIL_P(aseq.step) ? 1 : NUM2LONG(aseq.step);
+    *stepp = step;
+
+    if (step < 0) {
+        VALUE tmp = aseq.begin;
+        aseq.begin = aseq.end;
+        aseq.end = tmp;
+    }
+
+    if (err == 0 && (step < -1 || step > 1)) {
+        if (rb_range_component_beg_len(aseq.begin, aseq.end, aseq.exclude_end, begp, lenp, len, 1) == Qtrue) {
+            if (*begp > len)
+                goto out_of_range;
+            if (*lenp > len)
+                goto out_of_range;
+            return Qtrue;
+        }
+    }
+    else {
+        return rb_range_component_beg_len(aseq.begin, aseq.end, aseq.exclude_end, begp, lenp, len, err);
+    }
+
+  out_of_range:
+    rb_raise(rb_eRangeError, "%+"PRIsVALUE" out of range", obj);
+    return Qnil;
+}
+
+/*
+ * call-seq:
+ *   aseq.first -> num or nil
+ *   aseq.first(n) -> an_array
+ *
+ * Returns the first number in this arithmetic sequence,
+ * or an array of the first +n+ elements.
+ */
+static VALUE
+arith_seq_first(int argc, VALUE *argv, VALUE self)
+{
+    VALUE b, e, s, ary;
+    long n;
+    int x;
+
+    rb_check_arity(argc, 0, 1);
+
+    b = arith_seq_begin(self);
+    e = arith_seq_end(self);
+    s = arith_seq_step(self);
+    if (argc == 0) {
+        if (NIL_P(b)) {
+            return Qnil;
+        }
+        if (!NIL_P(e)) {
+            VALUE zero = INT2FIX(0);
+            int r = rb_cmpint(rb_num_coerce_cmp(s, zero, idCmp), s, zero);
+            if (r > 0 && RTEST(rb_funcall(b, '>', 1, e))) {
+                return Qnil;
+            }
+            if (r < 0 && RTEST(rb_funcall(b, '<', 1, e))) {
+                return Qnil;
+            }
+        }
+        return b;
+    }
+
+    // TODO: the following code should be extracted as arith_seq_take
+
+    n = NUM2LONG(argv[0]);
+    if (n < 0) {
+        rb_raise(rb_eArgError, "attempt to take negative size");
+    }
+    if (n == 0) {
+        return rb_ary_new_capa(0);
+    }
+
+    x = arith_seq_exclude_end_p(self);
+
+    if (FIXNUM_P(b) && NIL_P(e) && FIXNUM_P(s)) {
+        long i = FIX2LONG(b), unit = FIX2LONG(s);
+        ary = rb_ary_new_capa(n);
+        while (n > 0 && FIXABLE(i)) {
+            rb_ary_push(ary, LONG2FIX(i));
+            i += unit;  // FIXABLE + FIXABLE never overflow;
+            --n;
+        }
+        if (n > 0) {
+            b = LONG2NUM(i);
+            while (n > 0) {
+                rb_ary_push(ary, b);
+                b = rb_big_plus(b, s);
+                --n;
+            }
+        }
+        return ary;
+    }
+    else if (FIXNUM_P(b) && FIXNUM_P(e) && FIXNUM_P(s)) {
+        long i = FIX2LONG(b);
+        long end = FIX2LONG(e);
+        long unit = FIX2LONG(s);
+        long len;
+
+        if (unit >= 0) {
+            if (!x) end += 1;
+
+            len = end - i;
+            if (len < 0) len = 0;
+            ary = rb_ary_new_capa((n < len) ? n : len);
+            while (n > 0 && i < end) {
+                rb_ary_push(ary, LONG2FIX(i));
+                if (i + unit < i) break;
+                i += unit;
+                --n;
+            }
+        }
+        else {
+            if (!x) end -= 1;
+
+            len = i - end;
+            if (len < 0) len = 0;
+            ary = rb_ary_new_capa((n < len) ? n : len);
+            while (n > 0 && i > end) {
+                rb_ary_push(ary, LONG2FIX(i));
+                if (i + unit > i) break;
+                i += unit;
+                --n;
+            }
+        }
+        return ary;
+    }
+    else if (RB_FLOAT_TYPE_P(b) || RB_FLOAT_TYPE_P(e) || RB_FLOAT_TYPE_P(s)) {
+        /* generate values like ruby_float_step */
+
+        double unit = NUM2DBL(s);
+        double beg = NUM2DBL(b);
+        double end = NIL_P(e) ? (unit < 0 ? -1 : 1)*HUGE_VAL : NUM2DBL(e);
+        double len = ruby_float_step_size(beg, end, unit, x);
+        long i;
+
+        if (n > len)
+            n = (long)len;
+
+        if (isinf(unit)) {
+            if (len > 0) {
+                ary = rb_ary_new_capa(1);
+                rb_ary_push(ary, DBL2NUM(beg));
+            }
+            else {
+                ary = rb_ary_new_capa(0);
+            }
+        }
+        else if (unit == 0) {
+            VALUE val = DBL2NUM(beg);
+            ary = rb_ary_new_capa(n);
+            for (i = 0; i < len; ++i) {
+                rb_ary_push(ary, val);
+            }
+        }
+        else {
+            ary = rb_ary_new_capa(n);
+            for (i = 0; i < n; ++i) {
+                double d = i*unit+beg;
+                if (unit >= 0 ? end < d : d < end) d = end;
+                rb_ary_push(ary, DBL2NUM(d));
+            }
+        }
+
+        return ary;
+    }
+
+    return rb_call_super(argc, argv);
+}
+
+static inline VALUE
+num_plus(VALUE a, VALUE b)
+{
+    if (RB_INTEGER_TYPE_P(a)) {
+        return rb_int_plus(a, b);
+    }
+    else if (RB_FLOAT_TYPE_P(a)) {
+        return rb_float_plus(a, b);
+    }
+    else if (RB_TYPE_P(a, T_RATIONAL)) {
+        return rb_rational_plus(a, b);
+    }
+    else {
+        return rb_funcallv(a, '+', 1, &b);
+    }
+}
+
+static inline VALUE
+num_minus(VALUE a, VALUE b)
+{
+    if (RB_INTEGER_TYPE_P(a)) {
+        return rb_int_minus(a, b);
+    }
+    else if (RB_FLOAT_TYPE_P(a)) {
+        return rb_float_minus(a, b);
+    }
+    else if (RB_TYPE_P(a, T_RATIONAL)) {
+        return rb_rational_minus(a, b);
+    }
+    else {
+        return rb_funcallv(a, '-', 1, &b);
+    }
+}
+
+static inline VALUE
+num_mul(VALUE a, VALUE b)
+{
+    if (RB_INTEGER_TYPE_P(a)) {
+        return rb_int_mul(a, b);
+    }
+    else if (RB_FLOAT_TYPE_P(a)) {
+        return rb_float_mul(a, b);
+    }
+    else if (RB_TYPE_P(a, T_RATIONAL)) {
+        return rb_rational_mul(a, b);
+    }
+    else {
+        return rb_funcallv(a, '*', 1, &b);
+    }
+}
+
+static inline VALUE
+num_idiv(VALUE a, VALUE b)
+{
+    VALUE q;
+    if (RB_INTEGER_TYPE_P(a)) {
+        q = rb_int_idiv(a, b);
+    }
+    else if (RB_FLOAT_TYPE_P(a)) {
+        q = rb_float_div(a, b);
+    }
+    else if (RB_TYPE_P(a, T_RATIONAL)) {
+        q = rb_rational_div(a, b);
+    }
+    else {
+        q = rb_funcallv(a, idDiv, 1, &b);
+    }
+
+    if (RB_INTEGER_TYPE_P(q)) {
+        return q;
+    }
+    else if (RB_FLOAT_TYPE_P(q)) {
+        return rb_float_floor(q, 0);
+    }
+    else if (RB_TYPE_P(q, T_RATIONAL)) {
+        return rb_rational_floor(q, 0);
+    }
+    else {
+        return rb_funcall(q, rb_intern("floor"), 0);
+    }
+}
+
+/*
+ * call-seq:
+ *   aseq.last    -> num or nil
+ *   aseq.last(n) -> an_array
+ *
+ * Returns the last number in this arithmetic sequence,
+ * or an array of the last +n+ elements.
+ */
+static VALUE
+arith_seq_last(int argc, VALUE *argv, VALUE self)
+{
+    VALUE b, e, s, len_1, len, last, nv, ary;
+    int last_is_adjusted;
+    long n;
+
+    e = arith_seq_end(self);
+    if (NIL_P(e)) {
+        rb_raise(rb_eRangeError,
+                 "cannot get the last element of endless arithmetic sequence");
+    }
+
+    b = arith_seq_begin(self);
+    s = arith_seq_step(self);
+
+    len_1 = num_idiv(num_minus(e, b), s);
+    if (rb_num_negative_int_p(len_1)) {
+        if (argc == 0) {
+            return Qnil;
+        }
+        return rb_ary_new_capa(0);
+    }
+
+    last = num_plus(b, num_mul(s, len_1));
+    if ((last_is_adjusted = arith_seq_exclude_end_p(self) && rb_equal(last, e))) {
+        last = num_minus(last, s);
+    }
+
+    if (argc == 0) {
+        return last;
+    }
+
+    if (last_is_adjusted) {
+        len = len_1;
+    }
+    else {
+        len = rb_int_plus(len_1, INT2FIX(1));
+    }
+
+    rb_scan_args(argc, argv, "1", &nv);
+    if (!RB_INTEGER_TYPE_P(nv)) {
+        nv = rb_to_int(nv);
+    }
+    if (RTEST(rb_int_gt(nv, len))) {
+        nv = len;
+    }
+    n = NUM2LONG(nv);
+    if (n < 0) {
+        rb_raise(rb_eArgError, "negative array size");
+    }
+
+    ary = rb_ary_new_capa(n);
+    b = rb_int_minus(last, rb_int_mul(s, nv));
+    while (n) {
+        b = rb_int_plus(b, s);
+        rb_ary_push(ary, b);
+        --n;
+    }
+
+    return ary;
+}
+
+/*
+ * call-seq:
+ *   aseq.inspect -> string
+ *
+ * Convert this arithmetic sequence to a printable form.
+ */
+static VALUE
+arith_seq_inspect(VALUE self)
+{
+    struct enumerator *e;
+    VALUE eobj, str, eargs;
+    int range_p;
+
+    TypedData_Get_Struct(self, struct enumerator, &enumerator_data_type, e);
+
+    eobj = rb_attr_get(self, id_receiver);
+    if (NIL_P(eobj)) {
+        eobj = e->obj;
+    }
+
+    range_p = RTEST(rb_obj_is_kind_of(eobj, rb_cRange));
+    str = rb_sprintf("(%s%"PRIsVALUE"%s.", range_p ? "(" : "", eobj, range_p ? ")" : "");
+
+    rb_str_buf_append(str, rb_id2str(e->meth));
+
+    eargs = rb_attr_get(eobj, id_arguments);
+    if (NIL_P(eargs)) {
+        eargs = e->args;
+    }
+    if (eargs != Qfalse) {
+        long argc = RARRAY_LEN(eargs);
+        const VALUE *argv = RARRAY_CONST_PTR(eargs); /* WB: no new reference */
+
+        if (argc > 0) {
+            VALUE kwds = Qnil;
+
+            rb_str_buf_cat2(str, "(");
+
+            if (RB_TYPE_P(argv[argc-1], T_HASH)) {
+                int all_key = TRUE;
+                rb_hash_foreach(argv[argc-1], key_symbol_p, (VALUE)&all_key);
+                if (all_key) kwds = argv[--argc];
+            }
+
+            while (argc--) {
+                VALUE arg = *argv++;
+
+                rb_str_append(str, rb_inspect(arg));
+                rb_str_buf_cat2(str, ", ");
+            }
+            if (!NIL_P(kwds)) {
+                rb_hash_foreach(kwds, kwd_append, str);
+            }
+            rb_str_set_len(str, RSTRING_LEN(str)-2); /* drop the last ", " */
+            rb_str_buf_cat2(str, ")");
+        }
+    }
+
+    rb_str_buf_cat2(str, ")");
+
+    return str;
+}
+
+/*
+ * call-seq:
+ *   aseq == obj  -> true or false
+ *
+ * Returns <code>true</code> only if +obj+ is an Enumerator::ArithmeticSequence,
+ * has equivalent begin, end, step, and exclude_end? settings.
+ */
+static VALUE
+arith_seq_eq(VALUE self, VALUE other)
+{
+    if (!RTEST(rb_obj_is_kind_of(other, rb_cArithSeq))) {
+        return Qfalse;
+    }
+
+    if (!rb_equal(arith_seq_begin(self), arith_seq_begin(other))) {
+        return Qfalse;
+    }
+
+    if (!rb_equal(arith_seq_end(self), arith_seq_end(other))) {
+        return Qfalse;
+    }
+
+    if (!rb_equal(arith_seq_step(self), arith_seq_step(other))) {
+        return Qfalse;
+    }
+
+    if (arith_seq_exclude_end_p(self) != arith_seq_exclude_end_p(other)) {
+        return Qfalse;
+    }
+
+    return Qtrue;
+}
+
+/*
+ * call-seq:
+ *   aseq.hash  -> integer
+ *
+ * Compute a hash-value for this arithmetic sequence.
+ * Two arithmetic sequences with same begin, end, step, and exclude_end?
+ * values will generate the same hash-value.
+ *
+ * See also Object#hash.
+ */
+static VALUE
+arith_seq_hash(VALUE self)
+{
+    st_index_t hash;
+    VALUE v;
+
+    hash = rb_hash_start(arith_seq_exclude_end_p(self));
+    v = rb_hash(arith_seq_begin(self));
+    hash = rb_hash_uint(hash, NUM2LONG(v));
+    v = rb_hash(arith_seq_end(self));
+    hash = rb_hash_uint(hash, NUM2LONG(v));
+    v = rb_hash(arith_seq_step(self));
+    hash = rb_hash_uint(hash, NUM2LONG(v));
+    hash = rb_hash_end(hash);
+
+    return ST2FIX(hash);
+}
+
+#define NUM_GE(x, y) RTEST(rb_num_coerce_relop((x), (y), idGE))
+
+struct arith_seq_gen {
+    VALUE current;
+    VALUE end;
+    VALUE step;
+    int excl;
+};
+
+/*
+ * call-seq:
+ *   aseq.each {|i| block } -> aseq
+ *   aseq.each              -> aseq
+ */
+static VALUE
+arith_seq_each(VALUE self)
+{
+    VALUE c, e, s, len_1, last;
+    int x;
+
+    if (!rb_block_given_p()) return self;
+
+    c = arith_seq_begin(self);
+    e = arith_seq_end(self);
+    s = arith_seq_step(self);
+    x = arith_seq_exclude_end_p(self);
+
+    if (!RB_TYPE_P(s, T_COMPLEX) && ruby_float_step(c, e, s, x, TRUE)) {
+        return self;
+    }
+
+    if (NIL_P(e)) {
+        while (1) {
+            rb_yield(c);
+            c = rb_int_plus(c, s);
+        }
+
+        return self;
+    }
+
+    if (rb_equal(s, INT2FIX(0))) {
+        while (1) {
+            rb_yield(c);
+        }
+
+        return self;
+    }
+
+    len_1 = num_idiv(num_minus(e, c), s);
+    last = num_plus(c, num_mul(s, len_1));
+    if (x && rb_equal(last, e)) {
+        last = num_minus(last, s);
+    }
+
+    if (rb_num_negative_int_p(s)) {
+        while (NUM_GE(c, last)) {
+            rb_yield(c);
+            c = num_plus(c, s);
+        }
+    }
+    else {
+        while (NUM_GE(last, c)) {
+            rb_yield(c);
+            c = num_plus(c, s);
+        }
+    }
+
+    return self;
+}
+
+/*
+ * call-seq:
+ *   aseq.size -> num or nil
+ *
+ * Returns the number of elements in this arithmetic sequence if it is a finite
+ * sequence.  Otherwise, returns <code>nil</code>.
+ */
+static VALUE
+arith_seq_size(VALUE self)
+{
+    VALUE b, e, s, len_1, len, last;
+    int x;
+
+    b = arith_seq_begin(self);
+    e = arith_seq_end(self);
+    s = arith_seq_step(self);
+    x = arith_seq_exclude_end_p(self);
+
+    if (RB_FLOAT_TYPE_P(b) || RB_FLOAT_TYPE_P(e) || RB_FLOAT_TYPE_P(s)) {
+        double ee, n;
+
+        if (NIL_P(e)) {
+            if (rb_num_negative_int_p(s)) {
+                ee = -HUGE_VAL;
+            }
+            else {
+                ee = HUGE_VAL;
+            }
+        }
+        else {
+            ee = NUM2DBL(e);
+        }
+
+        n = ruby_float_step_size(NUM2DBL(b), ee, NUM2DBL(s), x);
+        if (isinf(n)) return DBL2NUM(n);
+        if (POSFIXABLE(n)) return LONG2FIX((long)n);
+        return rb_dbl2big(n);
+    }
+
+    if (NIL_P(e)) {
+        return DBL2NUM(HUGE_VAL);
+    }
+
+    if (!rb_obj_is_kind_of(s, rb_cNumeric)) {
+        s = rb_to_int(s);
+    }
+
+    if (rb_equal(s, INT2FIX(0))) {
+        return DBL2NUM(HUGE_VAL);
+    }
+
+    len_1 = rb_int_idiv(rb_int_minus(e, b), s);
+    if (rb_num_negative_int_p(len_1)) {
+        return INT2FIX(0);
+    }
+
+    last = rb_int_plus(b, rb_int_mul(s, len_1));
+    if (x && rb_equal(last, e)) {
+        len = len_1;
+    }
+    else {
+        len = rb_int_plus(len_1, INT2FIX(1));
+    }
+
+    return len;
+}
+
+#define sym(name) ID2SYM(rb_intern_const(name))
 void
 InitVM_Enumerator(void)
 {
+    ID id_private = rb_intern_const("private");
+
     rb_define_method(rb_mKernel, "to_enum", obj_to_enum, -1);
     rb_define_method(rb_mKernel, "enum_for", obj_to_enum, -1);
 
@@ -2048,19 +4032,62 @@ InitVM_Enumerator(void)
     rb_define_method(rb_cEnumerator, "rewind", enumerator_rewind, 0);
     rb_define_method(rb_cEnumerator, "inspect", enumerator_inspect, 0);
     rb_define_method(rb_cEnumerator, "size", enumerator_size, 0);
+    rb_define_method(rb_cEnumerator, "+", enumerator_plus, 1);
+    rb_define_method(rb_mEnumerable, "chain", enum_chain, -1);
 
     /* Lazy */
     rb_cLazy = rb_define_class_under(rb_cEnumerator, "Lazy", rb_cEnumerator);
     rb_define_method(rb_mEnumerable, "lazy", enumerable_lazy, 0);
+
+    rb_define_alias(rb_cLazy, "_enumerable_map", "map");
+    rb_define_alias(rb_cLazy, "_enumerable_collect", "collect");
+    rb_define_alias(rb_cLazy, "_enumerable_flat_map", "flat_map");
+    rb_define_alias(rb_cLazy, "_enumerable_collect_concat", "collect_concat");
+    rb_define_alias(rb_cLazy, "_enumerable_select", "select");
+    rb_define_alias(rb_cLazy, "_enumerable_find_all", "find_all");
+    rb_define_alias(rb_cLazy, "_enumerable_filter", "filter");
+    rb_define_alias(rb_cLazy, "_enumerable_filter_map", "filter_map");
+    rb_define_alias(rb_cLazy, "_enumerable_reject", "reject");
+    rb_define_alias(rb_cLazy, "_enumerable_grep", "grep");
+    rb_define_alias(rb_cLazy, "_enumerable_grep_v", "grep_v");
+    rb_define_alias(rb_cLazy, "_enumerable_zip", "zip");
+    rb_define_alias(rb_cLazy, "_enumerable_take", "take");
+    rb_define_alias(rb_cLazy, "_enumerable_take_while", "take_while");
+    rb_define_alias(rb_cLazy, "_enumerable_drop", "drop");
+    rb_define_alias(rb_cLazy, "_enumerable_drop_while", "drop_while");
+    rb_define_alias(rb_cLazy, "_enumerable_uniq", "uniq");
+    rb_define_private_method(rb_cLazy, "_enumerable_with_index", enumerator_with_index, -1);
+
+    rb_funcall(rb_cLazy, id_private, 1, sym("_enumerable_map"));
+    rb_funcall(rb_cLazy, id_private, 1, sym("_enumerable_collect"));
+    rb_funcall(rb_cLazy, id_private, 1, sym("_enumerable_flat_map"));
+    rb_funcall(rb_cLazy, id_private, 1, sym("_enumerable_collect_concat"));
+    rb_funcall(rb_cLazy, id_private, 1, sym("_enumerable_select"));
+    rb_funcall(rb_cLazy, id_private, 1, sym("_enumerable_find_all"));
+    rb_funcall(rb_cLazy, id_private, 1, sym("_enumerable_filter"));
+    rb_funcall(rb_cLazy, id_private, 1, sym("_enumerable_filter_map"));
+    rb_funcall(rb_cLazy, id_private, 1, sym("_enumerable_reject"));
+    rb_funcall(rb_cLazy, id_private, 1, sym("_enumerable_grep"));
+    rb_funcall(rb_cLazy, id_private, 1, sym("_enumerable_grep_v"));
+    rb_funcall(rb_cLazy, id_private, 1, sym("_enumerable_zip"));
+    rb_funcall(rb_cLazy, id_private, 1, sym("_enumerable_take"));
+    rb_funcall(rb_cLazy, id_private, 1, sym("_enumerable_take_while"));
+    rb_funcall(rb_cLazy, id_private, 1, sym("_enumerable_drop"));
+    rb_funcall(rb_cLazy, id_private, 1, sym("_enumerable_drop_while"));
+    rb_funcall(rb_cLazy, id_private, 1, sym("_enumerable_uniq"));
+
     rb_define_method(rb_cLazy, "initialize", lazy_initialize, -1);
     rb_define_method(rb_cLazy, "to_enum", lazy_to_enum, -1);
     rb_define_method(rb_cLazy, "enum_for", lazy_to_enum, -1);
+    rb_define_method(rb_cLazy, "eager", lazy_eager, 0);
     rb_define_method(rb_cLazy, "map", lazy_map, 0);
     rb_define_method(rb_cLazy, "collect", lazy_map, 0);
     rb_define_method(rb_cLazy, "flat_map", lazy_flat_map, 0);
     rb_define_method(rb_cLazy, "collect_concat", lazy_flat_map, 0);
     rb_define_method(rb_cLazy, "select", lazy_select, 0);
     rb_define_method(rb_cLazy, "find_all", lazy_select, 0);
+    rb_define_method(rb_cLazy, "filter", lazy_select, 0);
+    rb_define_method(rb_cLazy, "filter_map", lazy_filter_map, 0);
     rb_define_method(rb_cLazy, "reject", lazy_reject, 0);
     rb_define_method(rb_cLazy, "grep", lazy_grep, 1);
     rb_define_method(rb_cLazy, "grep_v", lazy_grep_v, 1);
@@ -2074,7 +4101,40 @@ InitVM_Enumerator(void)
     rb_define_method(rb_cLazy, "slice_before", lazy_super, -1);
     rb_define_method(rb_cLazy, "slice_after", lazy_super, -1);
     rb_define_method(rb_cLazy, "slice_when", lazy_super, -1);
-
+    rb_define_method(rb_cLazy, "chunk_while", lazy_super, -1);
+    rb_define_method(rb_cLazy, "uniq", lazy_uniq, 0);
+    rb_define_method(rb_cLazy, "with_index", lazy_with_index, -1);
+
+    lazy_use_super_method = rb_hash_new_with_size(18);
+    rb_hash_aset(lazy_use_super_method, sym("map"), sym("_enumerable_map"));
+    rb_hash_aset(lazy_use_super_method, sym("collect"), sym("_enumerable_collect"));
+    rb_hash_aset(lazy_use_super_method, sym("flat_map"), sym("_enumerable_flat_map"));
+    rb_hash_aset(lazy_use_super_method, sym("collect_concat"), sym("_enumerable_collect_concat"));
+    rb_hash_aset(lazy_use_super_method, sym("select"), sym("_enumerable_select"));
+    rb_hash_aset(lazy_use_super_method, sym("find_all"), sym("_enumerable_find_all"));
+    rb_hash_aset(lazy_use_super_method, sym("filter"), sym("_enumerable_filter"));
+    rb_hash_aset(lazy_use_super_method, sym("filter_map"), sym("_enumerable_filter_map"));
+    rb_hash_aset(lazy_use_super_method, sym("reject"), sym("_enumerable_reject"));
+    rb_hash_aset(lazy_use_super_method, sym("grep"), sym("_enumerable_grep"));
+    rb_hash_aset(lazy_use_super_method, sym("grep_v"), sym("_enumerable_grep_v"));
+    rb_hash_aset(lazy_use_super_method, sym("zip"), sym("_enumerable_zip"));
+    rb_hash_aset(lazy_use_super_method, sym("take"), sym("_enumerable_take"));
+    rb_hash_aset(lazy_use_super_method, sym("take_while"), sym("_enumerable_take_while"));
+    rb_hash_aset(lazy_use_super_method, sym("drop"), sym("_enumerable_drop"));
+    rb_hash_aset(lazy_use_super_method, sym("drop_while"), sym("_enumerable_drop_while"));
+    rb_hash_aset(lazy_use_super_method, sym("uniq"), sym("_enumerable_uniq"));
+    rb_hash_aset(lazy_use_super_method, sym("with_index"), sym("_enumerable_with_index"));
+    rb_obj_freeze(lazy_use_super_method);
+    rb_gc_register_mark_object(lazy_use_super_method);
+
+#if 0 /* for RDoc */
+    rb_define_method(rb_cLazy, "to_a", lazy_to_a, 0);
+    rb_define_method(rb_cLazy, "chunk", lazy_chunk, 0);
+    rb_define_method(rb_cLazy, "chunk_while", lazy_chunk_while, 0);
+    rb_define_method(rb_cLazy, "slice_after", lazy_slice_after, 0);
+    rb_define_method(rb_cLazy, "slice_before", lazy_slice_before, 0);
+    rb_define_method(rb_cLazy, "slice_when", lazy_slice_when, 0);
+#endif
     rb_define_alias(rb_cLazy, "force", "to_a");
 
     rb_eStopIteration = rb_define_class("StopIteration", rb_eIndexError);
@@ -2093,34 +4153,67 @@ InitVM_Enumerator(void)
     rb_define_alloc_func(rb_cYielder, yielder_allocate);
     rb_define_method(rb_cYielder, "initialize", yielder_initialize, 0);
     rb_define_method(rb_cYielder, "yield", yielder_yield, -2);
-    rb_define_method(rb_cYielder, "<<", yielder_yield_push, -2);
+    rb_define_method(rb_cYielder, "<<", yielder_yield_push, 1);
+    rb_define_method(rb_cYielder, "to_proc", yielder_to_proc, 0);
+
+    /* Producer */
+    rb_cEnumProducer = rb_define_class_under(rb_cEnumerator, "Producer", rb_cObject);
+    rb_define_alloc_func(rb_cEnumProducer, producer_allocate);
+    rb_define_method(rb_cEnumProducer, "each", producer_each, 0);
+    rb_define_singleton_method(rb_cEnumerator, "produce", enumerator_s_produce, -1);
+
+    /* Chain */
+    rb_cEnumChain = rb_define_class_under(rb_cEnumerator, "Chain", rb_cEnumerator);
+    rb_define_alloc_func(rb_cEnumChain, enum_chain_allocate);
+    rb_define_method(rb_cEnumChain, "initialize", enum_chain_initialize, -2);
+    rb_define_method(rb_cEnumChain, "initialize_copy", enum_chain_init_copy, 1);
+    rb_define_method(rb_cEnumChain, "each", enum_chain_each, -1);
+    rb_define_method(rb_cEnumChain, "size", enum_chain_size, 0);
+    rb_define_method(rb_cEnumChain, "rewind", enum_chain_rewind, 0);
+    rb_define_method(rb_cEnumChain, "inspect", enum_chain_inspect, 0);
+
+    /* ArithmeticSequence */
+    rb_cArithSeq = rb_define_class_under(rb_cEnumerator, "ArithmeticSequence", rb_cEnumerator);
+    rb_undef_alloc_func(rb_cArithSeq);
+    rb_undef_method(CLASS_OF(rb_cArithSeq), "new");
+    rb_define_method(rb_cArithSeq, "begin", arith_seq_begin, 0);
+    rb_define_method(rb_cArithSeq, "end", arith_seq_end, 0);
+    rb_define_method(rb_cArithSeq, "exclude_end?", arith_seq_exclude_end, 0);
+    rb_define_method(rb_cArithSeq, "step", arith_seq_step, 0);
+    rb_define_method(rb_cArithSeq, "first", arith_seq_first, -1);
+    rb_define_method(rb_cArithSeq, "last", arith_seq_last, -1);
+    rb_define_method(rb_cArithSeq, "inspect", arith_seq_inspect, 0);
+    rb_define_method(rb_cArithSeq, "==", arith_seq_eq, 1);
+    rb_define_method(rb_cArithSeq, "===", arith_seq_eq, 1);
+    rb_define_method(rb_cArithSeq, "eql?", arith_seq_eq, 1);
+    rb_define_method(rb_cArithSeq, "hash", arith_seq_hash, 0);
+    rb_define_method(rb_cArithSeq, "each", arith_seq_each, 0);
+    rb_define_method(rb_cArithSeq, "size", arith_seq_size, 0);
 
     rb_provide("enumerator.so");	/* for backward compatibility */
 }
+#undef sym
 
-#undef rb_intern
 void
 Init_Enumerator(void)
 {
-    id_rewind = rb_intern("rewind");
-    id_each = rb_intern("each");
-    id_call = rb_intern("call");
-    id_size = rb_intern("size");
-    id_yield = rb_intern("yield");
-    id_new = rb_intern("new");
-    id_initialize = rb_intern("initialize");
-    id_next = rb_intern("next");
-    id_result = rb_intern("result");
-    id_lazy = rb_intern("lazy");
-    id_eqq = rb_intern("===");
-    id_receiver = rb_intern("receiver");
-    id_arguments = rb_intern("arguments");
-    id_memo = rb_intern("memo");
-    id_method = rb_intern("method");
-    id_force = rb_intern("force");
-    id_to_enum = rb_intern("to_enum");
+    id_rewind = rb_intern_const("rewind");
+    id_new = rb_intern_const("new");
+    id_next = rb_intern_const("next");
+    id_result = rb_intern_const("result");
+    id_receiver = rb_intern_const("receiver");
+    id_arguments = rb_intern_const("arguments");
+    id_memo = rb_intern_const("memo");
+    id_method = rb_intern_const("method");
+    id_force = rb_intern_const("force");
+    id_to_enum = rb_intern_const("to_enum");
+    id_begin = rb_intern_const("begin");
+    id_end = rb_intern_const("end");
+    id_step = rb_intern_const("step");
+    id_exclude_end = rb_intern_const("exclude_end");
     sym_each = ID2SYM(id_each);
-    sym_cycle = ID2SYM(rb_intern("cycle"));
+    sym_cycle = ID2SYM(rb_intern_const("cycle"));
+    sym_yield = ID2SYM(rb_intern_const("yield"));
 
     InitVM(Enumerator);
 }
diff --git a/error.c b/error.c
index b795dc185c..d614a9c0a2 100644
--- a/error.c
+++ b/error.c
@@ -9,21 +9,45 @@
 
 **********************************************************************/
 
-#include "internal.h"
-#include "ruby/st.h"
-#include "ruby_assert.h"
-#include "vm_core.h"
+#include "ruby/internal/config.h"
 
-#include <stdio.h>
+#include <errno.h>
 #include <stdarg.h>
+#include <stdio.h>
+
 #ifdef HAVE_STDLIB_H
-#include <stdlib.h>
+# include <stdlib.h>
 #endif
-#include <errno.h>
+
 #ifdef HAVE_UNISTD_H
-#include <unistd.h>
+# include <unistd.h>
 #endif
 
+#if defined __APPLE__
+# include <AvailabilityMacros.h>
+#endif
+
+#include "internal.h"
+#include "internal/error.h"
+#include "internal/eval.h"
+#include "internal/io.h"
+#include "internal/load.h"
+#include "internal/object.h"
+#include "internal/symbol.h"
+#include "internal/thread.h"
+#include "internal/variable.h"
+#include "ruby/encoding.h"
+#include "ruby/st.h"
+#include "ruby_assert.h"
+#include "vm_core.h"
+
+#include "builtin.h"
+
+/*!
+ * \defgroup exception Exception handlings
+ * \{
+ */
+
 #ifndef EXIT_SUCCESS
 #define EXIT_SUCCESS 0
 #endif
@@ -38,21 +62,25 @@
 
 VALUE rb_iseqw_local_variables(VALUE iseqval);
 VALUE rb_iseqw_new(const rb_iseq_t *);
+int rb_str_end_with_asciichar(VALUE str, int c);
+VALUE rb_ident_hash_new(void);
 
+long rb_backtrace_length_limit = -1;
 VALUE rb_eEAGAIN;
 VALUE rb_eEWOULDBLOCK;
 VALUE rb_eEINPROGRESS;
+static VALUE rb_mWarning;
+static VALUE rb_cWarningBuffer;
 
-extern const char ruby_description[];
+static ID id_warn;
+static ID id_category;
+static ID id_deprecated;
+static ID id_experimental;
+static VALUE sym_category;
+static VALUE warning_categories;
+static VALUE warning_category_t_map;
 
-static const char REPORTBUG_MSG[] =
-	"[NOTE]\n" \
-	"You may have encountered a bug in the Ruby interpreter" \
-	" or extension libraries.\n" \
-	"Bug reports are welcome.\n" \
-	""
-	"For details: http://www.ruby-lang.org/bugreport.html\n\n" \
-    ;
+extern const char ruby_description[];
 
 static const char *
 rb_strerrno(int err)
@@ -106,44 +134,208 @@ rb_syntax_error_append(VALUE exc, VALUE file, int line, int column,
     }
     else {
 	VALUE mesg;
-	const char *pre = NULL;
 	if (NIL_P(exc)) {
 	    mesg = rb_enc_str_new(0, 0, enc);
 	    exc = rb_class_new_instance(1, &mesg, rb_eSyntaxError);
 	}
 	else {
 	    mesg = rb_attr_get(exc, idMesg);
-	    pre = "\n";
+	    if (RSTRING_LEN(mesg) > 0 && *(RSTRING_END(mesg)-1) != '\n')
+		rb_str_cat_cstr(mesg, "\n");
 	}
-	err_vcatf(mesg, pre, fn, line, fmt, args);
+	err_vcatf(mesg, NULL, fn, line, fmt, args);
     }
 
     return exc;
 }
 
-void
-rb_compile_error_with_enc(const char *file, int line, void *enc, const char *fmt, ...)
+static unsigned int warning_disabled_categories = (
+    1U << RB_WARN_CATEGORY_DEPRECATED |
+    0);
+
+static unsigned int
+rb_warning_category_mask(VALUE category)
 {
-    ONLY_FOR_INTERNAL_USE("rb_compile_error_with_enc()");
+    return 1U << rb_warning_category_from_name(category);
 }
 
-void
-rb_compile_error(const char *file, int line, const char *fmt, ...)
+rb_warning_category_t
+rb_warning_category_from_name(VALUE category)
 {
-    ONLY_FOR_INTERNAL_USE("rb_compile_error()");
+    VALUE cat_value;
+    Check_Type(category, T_SYMBOL);
+    cat_value = rb_hash_aref(warning_categories, category);
+    if (cat_value == Qnil) {
+        rb_raise(rb_eArgError, "unknown category: %"PRIsVALUE, category);
+    }
+    return NUM2INT(cat_value);
 }
 
 void
-rb_compile_error_append(const char *fmt, ...)
+rb_warning_category_update(unsigned int mask, unsigned int bits)
 {
-    ONLY_FOR_INTERNAL_USE("rb_compile_error_append()");
+    warning_disabled_categories &= ~mask;
+    warning_disabled_categories |= mask & ~bits;
 }
 
-void
-ruby_only_for_internal_use(const char *func)
+MJIT_FUNC_EXPORTED bool
+rb_warning_category_enabled_p(rb_warning_category_t category)
+{
+    return !(warning_disabled_categories & (1U << category));
+}
+
+/*
+ * call-seq:
+ *    Warning[category]  -> true or false
+ *
+ * Returns the flag to show the warning messages for +category+.
+ * Supported categories are:
+ *
+ * +:deprecated+ :: deprecation warnings
+ * * assignment of non-nil value to <code>$,</code> and <code>$;</code>
+ * * keyword arguments
+ * * proc/lambda without block
+ * etc.
+ *
+ * +:experimental+ :: experimental features
+ * * Pattern matching
+ */
+
+static VALUE
+rb_warning_s_aref(VALUE mod, VALUE category)
+{
+    rb_warning_category_t cat = rb_warning_category_from_name(category);
+    if (rb_warning_category_enabled_p(cat))
+        return Qtrue;
+    return Qfalse;
+}
+
+/*
+ * call-seq:
+ *    Warning[category] = flag -> flag
+ *
+ * Sets the warning flags for +category+.
+ * See Warning.[] for the categories.
+ */
+
+static VALUE
+rb_warning_s_aset(VALUE mod, VALUE category, VALUE flag)
+{
+    unsigned int mask = rb_warning_category_mask(category);
+    unsigned int disabled = warning_disabled_categories;
+    if (!RTEST(flag))
+        disabled |= mask;
+    else
+        disabled &= ~mask;
+    warning_disabled_categories = disabled;
+    return flag;
+}
+
+/*
+ * call-seq:
+ *    warn(msg, category: nil)  -> nil
+ *
+ * Writes warning message +msg+ to $stderr. This method is called by
+ * Ruby for all emitted warnings. A +category+ may be included with
+ * the warning.
+ *
+ * See the documentation of the Warning module for how to customize this.
+ */
+
+static VALUE
+rb_warning_s_warn(int argc, VALUE *argv, VALUE mod)
 {
-    rb_print_backtrace();
-    rb_fatal("%s is only for internal use and deprecated; do not use", func);
+    VALUE str;
+    VALUE opt;
+    VALUE category = Qnil;
+
+    rb_scan_args(argc, argv, "1:", &str, &opt);
+    if (!NIL_P(opt)) rb_get_kwargs(opt, &id_category, 0, 1, &category);
+
+    Check_Type(str, T_STRING);
+    rb_must_asciicompat(str);
+    if (!NIL_P(category)) {
+        rb_warning_category_t cat = rb_warning_category_from_name(category);
+        if (!rb_warning_category_enabled_p(cat)) return Qnil;
+    }
+    rb_write_error_str(str);
+    return Qnil;
+}
+
+/*
+ *  Document-module: Warning
+ *
+ *  The Warning module contains a single method named #warn, and the
+ *  module extends itself, making Warning.warn available.
+ *  Warning.warn is called for all warnings issued by Ruby.
+ *  By default, warnings are printed to $stderr.
+ *
+ *  Changing the behavior of Warning.warn is useful to customize how warnings are
+ *  handled by Ruby, for instance by filtering some warnings, and/or outputting
+ *  warnings somewhere other than $stderr.
+ *
+ *  If you want to change the behavior of Warning.warn you should use
+ *  +Warning.extend(MyNewModuleWithWarnMethod)+ and you can use `super`
+ *  to get the default behavior of printing the warning to $stderr.
+ *
+ *  Example:
+ *    module MyWarningFilter
+ *      def warn(message, category: nil, **kwargs)
+ *        if /some warning I want to ignore/.matches?(message)
+ *          # ignore
+ *        else
+ *          super
+ *        end
+ *      end
+ *    end
+ *    Warning.extend MyWarningFilter
+ *
+ *  You should never redefine Warning#warn (the instance method), as that will
+ *  then no longer provide a way to use the default behavior.
+ *
+ *  The +warning+ gem provides convenient ways to customize Warning.warn.
+ */
+
+static VALUE
+rb_warning_warn(VALUE mod, VALUE str)
+{
+    return rb_funcallv(mod, id_warn, 1, &str);
+}
+
+
+static int
+rb_warning_warn_arity(void)
+{
+    const rb_method_entry_t *me = rb_method_entry(rb_singleton_class(rb_mWarning), id_warn);
+    return me ? rb_method_entry_arity(me) : 1;
+}
+
+static VALUE
+rb_warn_category(VALUE str, VALUE category)
+{
+    if (category != Qnil) {
+        category = rb_to_symbol_type(category);
+        if (!RTEST(rb_hash_aref(warning_categories, category))) {
+            rb_raise(rb_eArgError, "invalid warning category used: %s", rb_id2name(SYM2ID(category)));
+        }
+    }
+
+    if (rb_warning_warn_arity() == 1) {
+        return rb_warning_warn(rb_mWarning, str);
+    }
+    else {
+        VALUE args[2];
+        args[0] = str;
+        args[1] = rb_hash_new();
+        rb_hash_aset(args[1], sym_category, category);
+        return rb_funcallv_kw(rb_mWarning, id_warn, 2, args, RB_PASS_KEYWORDS);
+    }
+}
+
+static void
+rb_write_warning_str(VALUE str)
+{
+    rb_warning_warn(rb_mWarning, str);
 }
 
 static VALUE
@@ -166,7 +358,7 @@ rb_compile_warn(const char *file, int line, const char *fmt, ...)
     va_start(args, fmt);
     str = warn_vsprintf(NULL, file, line, fmt, args);
     va_end(args);
-    rb_write_error_str(str);
+    rb_write_warning_str(str);
 }
 
 /* rb_compile_warning() reports only in verbose mode */
@@ -181,100 +373,203 @@ rb_compile_warning(const char *file, int line, const char *fmt, ...)
     va_start(args, fmt);
     str = warn_vsprintf(NULL, file, line, fmt, args);
     va_end(args);
-    rb_write_error_str(str);
+    rb_write_warning_str(str);
+}
+
+void
+rb_category_compile_warn(rb_warning_category_t category, const char *file, int line, const char *fmt, ...)
+{
+    VALUE str;
+    va_list args;
+
+    if (NIL_P(ruby_verbose)) return;
+
+    va_start(args, fmt);
+    str = warn_vsprintf(NULL, file, line, fmt, args);
+    va_end(args);
+    rb_warn_category(str, rb_hash_fetch(warning_category_t_map, INT2NUM(category)));
 }
 
 static VALUE
 warning_string(rb_encoding *enc, const char *fmt, va_list args)
 {
     int line;
-    VALUE file = rb_source_location(&line);
-
-    return warn_vsprintf(enc,
-			 NIL_P(file) ? NULL : RSTRING_PTR(file), line,
-			 fmt, args);
+    const char *file = rb_source_location_cstr(&line);
+    return warn_vsprintf(enc, file, line, fmt, args);
 }
 
+#define with_warning_string(mesg, enc, fmt) \
+    VALUE mesg; \
+    va_list args; va_start(args, fmt); \
+    mesg = warning_string(enc, fmt, args); \
+    va_end(args);
+
 void
 rb_warn(const char *fmt, ...)
 {
-    VALUE mesg;
-    va_list args;
-
-    if (NIL_P(ruby_verbose)) return;
+    if (!NIL_P(ruby_verbose)) {
+	with_warning_string(mesg, 0, fmt) {
+	    rb_write_warning_str(mesg);
+	}
+    }
+}
 
-    va_start(args, fmt);
-    mesg = warning_string(0, fmt, args);
-    va_end(args);
-    rb_write_error_str(mesg);
+void
+rb_category_warn(rb_warning_category_t category, const char *fmt, ...)
+{
+    if (!NIL_P(ruby_verbose)) {
+        with_warning_string(mesg, 0, fmt) {
+            rb_warn_category(mesg, rb_hash_fetch(warning_category_t_map, INT2NUM(category)));
+        }
+    }
 }
 
 void
 rb_enc_warn(rb_encoding *enc, const char *fmt, ...)
 {
-    VALUE mesg;
-    va_list args;
-
-    if (NIL_P(ruby_verbose)) return;
-
-    va_start(args, fmt);
-    mesg = warning_string(enc, fmt, args);
-    va_end(args);
-    rb_write_error_str(mesg);
+    if (!NIL_P(ruby_verbose)) {
+	with_warning_string(mesg, enc, fmt) {
+	    rb_write_warning_str(mesg);
+	}
+    }
 }
 
 /* rb_warning() reports only in verbose mode */
 void
 rb_warning(const char *fmt, ...)
 {
-    VALUE mesg;
-    va_list args;
+    if (RTEST(ruby_verbose)) {
+	with_warning_string(mesg, 0, fmt) {
+	    rb_write_warning_str(mesg);
+	}
+    }
+}
 
-    if (!RTEST(ruby_verbose)) return;
+/* rb_category_warning() reports only in verbose mode */
+void
+rb_category_warning(rb_warning_category_t category, const char *fmt, ...)
+{
+    if (RTEST(ruby_verbose)) {
+        with_warning_string(mesg, 0, fmt) {
+            rb_warn_category(mesg, rb_hash_fetch(warning_category_t_map, INT2NUM(category)));
+        }
+    }
+}
 
-    va_start(args, fmt);
-    mesg = warning_string(0, fmt, args);
-    va_end(args);
-    rb_write_error_str(mesg);
+VALUE
+rb_warning_string(const char *fmt, ...)
+{
+    with_warning_string(mesg, 0, fmt) {
+    }
+    return mesg;
 }
 
 #if 0
 void
 rb_enc_warning(rb_encoding *enc, const char *fmt, ...)
 {
-    VALUE mesg;
-    va_list args;
+    if (RTEST(ruby_verbose)) {
+	with_warning_string(mesg, enc, fmt) {
+	    rb_write_warning_str(mesg);
+	}
+    }
+}
+#endif
 
-    if (!RTEST(ruby_verbose)) return;
+void
+rb_warn_deprecated(const char *fmt, const char *suggest, ...)
+{
+    if (NIL_P(ruby_verbose)) return;
+    if (!rb_warning_category_enabled_p(RB_WARN_CATEGORY_DEPRECATED)) return;
+    va_list args;
+    va_start(args, suggest);
+    VALUE mesg = warning_string(0, fmt, args);
+    va_end(args);
+    rb_str_set_len(mesg, RSTRING_LEN(mesg) - 1);
+    rb_str_cat_cstr(mesg, " is deprecated");
+    if (suggest) rb_str_catf(mesg, "; use %s instead", suggest);
+    rb_str_cat_cstr(mesg, "\n");
+    rb_warn_category(mesg, ID2SYM(id_deprecated));
+}
 
-    va_start(args, fmt);
-    mesg = warning_string(enc, fmt, args);
+void
+rb_warn_deprecated_to_remove(const char *fmt, const char *removal, ...)
+{
+    if (NIL_P(ruby_verbose)) return;
+    if (!rb_warning_category_enabled_p(RB_WARN_CATEGORY_DEPRECATED)) return;
+    va_list args;
+    va_start(args, removal);
+    VALUE mesg = warning_string(0, fmt, args);
     va_end(args);
-    rb_write_error_str(mesg);
+    rb_str_set_len(mesg, RSTRING_LEN(mesg) - 1);
+    rb_str_catf(mesg, " is deprecated and will be removed in Ruby %s\n", removal);
+    rb_warn_category(mesg, ID2SYM(id_deprecated));
 }
-#endif
 
-/*
- * call-seq:
- *    warn(msg, ...)   -> nil
- *
- * Displays each of the given messages followed by a record separator on
- * STDERR unless warnings have been disabled (for example with the
- * <code>-W0</code> flag).
- *
- *    warn("warning 1", "warning 2")
- *
- *  <em>produces:</em>
- *
- *    warning 1
- *    warning 2
- */
+static inline int
+end_with_asciichar(VALUE str, int c)
+{
+    return RB_TYPE_P(str, T_STRING) &&
+	rb_str_end_with_asciichar(str, c);
+}
 
+/* :nodoc: */
 static VALUE
-rb_warn_m(int argc, VALUE *argv, VALUE exc)
+warning_write(int argc, VALUE *argv, VALUE buf)
 {
+    while (argc-- > 0) {
+	rb_str_append(buf, *argv++);
+    }
+    return buf;
+}
+
+VALUE rb_ec_backtrace_location_ary(const rb_execution_context_t *ec, long lev, long n, bool skip_internal);
+
+static VALUE
+rb_warn_m(rb_execution_context_t *ec, VALUE exc, VALUE msgs, VALUE uplevel, VALUE category)
+{
+    VALUE location = Qnil;
+    int argc = RARRAY_LENINT(msgs);
+    const VALUE *argv = RARRAY_CONST_PTR(msgs);
+
     if (!NIL_P(ruby_verbose) && argc > 0) {
-	rb_io_puts(argc, argv, rb_stderr);
+        VALUE str = argv[0];
+        if (!NIL_P(uplevel)) {
+            long lev = NUM2LONG(uplevel);
+            if (lev < 0) {
+                rb_raise(rb_eArgError, "negative level (%ld)", lev);
+            }
+            location = rb_ec_backtrace_location_ary(ec, lev + 1, 1, TRUE);
+            if (!NIL_P(location)) {
+                location = rb_ary_entry(location, 0);
+            }
+	}
+	if (argc > 1 || !NIL_P(uplevel) || !end_with_asciichar(str, '\n')) {
+	    VALUE path;
+	    if (NIL_P(uplevel)) {
+		str = rb_str_tmp_new(0);
+	    }
+	    else if (NIL_P(location) ||
+		     NIL_P(path = rb_funcall(location, rb_intern("path"), 0))) {
+		str = rb_str_new_cstr("warning: ");
+	    }
+	    else {
+		str = rb_sprintf("%s:%ld: warning: ",
+		    rb_string_value_ptr(&path),
+		    NUM2LONG(rb_funcall(location, rb_intern("lineno"), 0)));
+	    }
+	    RBASIC_SET_CLASS(str, rb_cWarningBuffer);
+	    rb_io_puts(argc, argv, str);
+	    RBASIC_SET_CLASS(str, rb_cString);
+	}
+
+	if (exc == rb_mWarning) {
+	    rb_must_asciicompat(str);
+	    rb_write_error_str(str);
+	}
+	else {
+            rb_warn_category(str, category);
+	}
     }
     return Qnil;
 }
@@ -313,11 +608,86 @@ bug_report_file(const char *file, int line)
 
     if ((ssize_t)fwrite(buf, 1, len, out) == (ssize_t)len ||
 	(ssize_t)fwrite(buf, 1, len, (out = stdout)) == (ssize_t)len) {
-	return out;
+        return out;
     }
+
     return NULL;
 }
 
+FUNC_MINIMIZED(static void bug_important_message(FILE *out, const char *const msg, size_t len));
+
+static void
+bug_important_message(FILE *out, const char *const msg, size_t len)
+{
+    const char *const endmsg = msg + len;
+    const char *p = msg;
+
+    if (!len) return;
+    if (isatty(fileno(out))) {
+	static const char red[] = "\033[;31;1;7m";
+	static const char green[] = "\033[;32;7m";
+	static const char reset[] = "\033[m";
+	const char *e = strchr(p, '\n');
+	const int w = (int)(e - p);
+	do {
+	    int i = (int)(e - p);
+	    fputs(*p == ' ' ? green : red, out);
+	    fwrite(p, 1, e - p, out);
+	    for (; i < w; ++i) fputc(' ', out);
+	    fputs(reset, out);
+	    fputc('\n', out);
+	} while ((p = e + 1) < endmsg && (e = strchr(p, '\n')) != 0 && e > p + 1);
+    }
+    fwrite(p, 1, endmsg - p, out);
+}
+
+static void
+preface_dump(FILE *out)
+{
+#if defined __APPLE__
+    static const char msg[] = ""
+	"-- Crash Report log information "
+	"--------------------------------------------\n"
+	"   See Crash Report log file under the one of following:\n"
+# if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6
+	"     * ~/Library/Logs/CrashReporter\n"
+	"     * /Library/Logs/CrashReporter\n"
+# endif
+	"     * ~/Library/Logs/DiagnosticReports\n"
+	"     * /Library/Logs/DiagnosticReports\n"
+	"   for more details.\n"
+	"Don't forget to include the above Crash Report log file in bug reports.\n"
+	"\n";
+    const size_t msglen = sizeof(msg) - 1;
+#else
+    const char *msg = NULL;
+    const size_t msglen = 0;
+#endif
+    bug_important_message(out, msg, msglen);
+}
+
+static void
+postscript_dump(FILE *out)
+{
+#if defined __APPLE__
+    static const char msg[] = ""
+	"[IMPORTANT]"
+	/*" ------------------------------------------------"*/
+	"\n""Don't forget to include the Crash Report log file under\n"
+# if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6
+	"CrashReporter or "
+# endif
+	"DiagnosticReports directory in bug reports.\n"
+	/*"------------------------------------------------------------\n"*/
+	"\n";
+    const size_t msglen = sizeof(msg) - 1;
+#else
+    const char *msg = NULL;
+    const size_t msglen = 0;
+#endif
+    bug_important_message(out, msg, msglen);
+}
+
 static void
 bug_report_begin_valist(FILE *out, const char *fmt, va_list args)
 {
@@ -328,6 +698,7 @@ bug_report_begin_valist(FILE *out, const char *fmt, va_list args)
     fputs(buf, out);
     snprintf(buf, sizeof(buf), "\n%s\n\n", ruby_description);
     fputs(buf, out);
+    preface_dump(out);
 }
 
 #define bug_report_begin(out, fmt) do { \
@@ -348,7 +719,7 @@ bug_report_end(FILE *out)
 	    (*reporter->func)(out, reporter->data);
 	}
     }
-    fprintf(out, REPORTBUG_MSG);
+    postscript_dump(out);
 }
 
 #define report_bug(file, line, fmt, ctx) do { \
@@ -381,32 +752,42 @@ die(void)
 }
 
 void
-rb_bug(const char *fmt, ...)
+rb_bug_without_die(const char *fmt, va_list args)
 {
     const char *file = NULL;
     int line = 0;
 
-    if (GET_THREAD()) {
-	file = rb_source_loc(&line);
+    if (GET_EC()) {
+        file = rb_source_location_cstr(&line);
     }
 
-    report_bug(file, line, fmt, NULL);
+    report_bug_valist(file, line, fmt, NULL, args);
+}
 
+void
+rb_bug(const char *fmt, ...)
+{
+    va_list args;
+    va_start(args, fmt);
+    rb_bug_without_die(fmt, args);
+    va_end(args);
     die();
 }
 
 void
-rb_bug_context(const void *ctx, const char *fmt, ...)
+rb_bug_for_fatal_signal(ruby_sighandler_t default_sighandler, int sig, const void *ctx, const char *fmt, ...)
 {
     const char *file = NULL;
     int line = 0;
 
-    if (GET_THREAD()) {
-	file = rb_source_loc(&line);
+    if (GET_EC()) {
+	file = rb_source_location_cstr(&line);
     }
 
     report_bug(file, line, fmt, ctx);
 
+    if (default_sighandler) default_sighandler(sig);
+
     die();
 }
 
@@ -451,8 +832,6 @@ rb_async_bug_errno(const char *mesg, int errno_arg)
     }
     WRITE_CONST(2, "\n\n");
     write_or_abort(2, ruby_description, strlen(ruby_description));
-    WRITE_CONST(2, "\n\n");
-    WRITE_CONST(2, REPORTBUG_MSG);
     abort();
 }
 
@@ -462,13 +841,14 @@ rb_report_bug_valist(VALUE file, int line, const char *fmt, va_list args)
     report_bug_valist(RSTRING_PTR(file), line, fmt, NULL, args);
 }
 
-void
+MJIT_FUNC_EXPORTED void
 rb_assert_failure(const char *file, int line, const char *name, const char *expr)
 {
     FILE *out = stderr;
     fprintf(out, "Assertion Failed: %s:%d:", file, line);
     if (name) fprintf(out, "%s:", name);
     fprintf(out, "%s\n%s\n\n", expr, ruby_description);
+    preface_dump(out);
     rb_vm_bugreport(NULL);
     bug_report_end(out);
     die();
@@ -485,7 +865,7 @@ static const char builtin_types[][10] = {
     "Array",
     "Hash",
     "Struct",
-    "Bignum",
+    "Integer",
     "File",
     "Data",			/* internal use: wrapped C pointers */
     "MatchData",		/* data of $~ */
@@ -496,7 +876,7 @@ static const char builtin_types[][10] = {
     "true",
     "false",
     "Symbol",			/* :symbol */
-    "Fixnum",
+    "Integer",
     "undef",			/* internal use: #undef; should not happen */
     "",				/* 0x17 */
     "",				/* 0x18 */
@@ -516,6 +896,17 @@ rb_builtin_type_name(int t)
     return 0;
 }
 
+static VALUE
+displaying_class_of(VALUE x)
+{
+    switch (x) {
+      case Qfalse: return rb_fstring_cstr("false");
+      case Qnil:   return rb_fstring_cstr("nil");
+      case Qtrue:  return rb_fstring_cstr("true");
+      default:     return rb_obj_class(x);
+    }
+}
+
 static const char *
 builtin_class_name(VALUE x)
 {
@@ -553,34 +944,55 @@ rb_builtin_class_name(VALUE x)
     return etype;
 }
 
+NORETURN(static void unexpected_type(VALUE, int, int));
+#define UNDEF_LEAKED "undef leaked to the Ruby space"
+
+static void
+unexpected_type(VALUE x, int xt, int t)
+{
+    const char *tname = rb_builtin_type_name(t);
+    VALUE mesg, exc = rb_eFatal;
+
+    if (tname) {
+        mesg = rb_sprintf("wrong argument type %"PRIsVALUE" (expected %s)",
+                          displaying_class_of(x), tname);
+	exc = rb_eTypeError;
+    }
+    else if (xt > T_MASK && xt <= 0x3f) {
+	mesg = rb_sprintf("unknown type 0x%x (0x%x given, probably comes"
+			  " from extension library for ruby 1.8)", t, xt);
+    }
+    else {
+	mesg = rb_sprintf("unknown type 0x%x (0x%x given)", t, xt);
+    }
+    rb_exc_raise(rb_exc_new_str(exc, mesg));
+}
+
 void
 rb_check_type(VALUE x, int t)
 {
     int xt;
 
     if (x == Qundef) {
-	rb_bug("undef leaked to the Ruby space");
+	rb_bug(UNDEF_LEAKED);
     }
 
     xt = TYPE(x);
     if (xt != t || (xt == T_DATA && RTYPEDDATA_P(x))) {
-	const char *tname = rb_builtin_type_name(t);
-	if (tname) {
-	    const char *cname = builtin_class_name(x);
-	    if (cname)
-		rb_raise(rb_eTypeError, "wrong argument type %s (expected %s)",
-			 cname, tname);
-	    else
-		rb_raise(rb_eTypeError, "wrong argument type %"PRIsVALUE" (expected %s)",
-			 rb_obj_class(x), tname);
-	}
-	if (xt > T_MASK && xt <= 0x3f) {
-	    rb_fatal("unknown type 0x%x (0x%x given, probably comes from extension library for ruby 1.8)", t, xt);
-	}
-	rb_bug("unknown type 0x%x (0x%x given)", t, xt);
+	unexpected_type(x, xt, t);
     }
 }
 
+void
+rb_unexpected_type(VALUE x, int t)
+{
+    if (x == Qundef) {
+	rb_bug(UNDEF_LEAKED);
+    }
+
+    unexpected_type(x, TYPE(x), t);
+}
+
 int
 rb_typeddata_inherited_p(const rb_data_type_t *child, const rb_data_type_t *parent)
 {
@@ -601,29 +1013,36 @@ rb_typeddata_is_kind_of(VALUE obj, const rb_data_type_t *data_type)
     return 1;
 }
 
+#undef rb_typeddata_is_instance_of
+int
+rb_typeddata_is_instance_of(VALUE obj, const rb_data_type_t *data_type)
+{
+    return rb_typeddata_is_instance_of_inline(obj, data_type);
+}
+
 void *
 rb_check_typeddata(VALUE obj, const rb_data_type_t *data_type)
 {
-    const char *etype;
+    VALUE actual;
 
     if (!RB_TYPE_P(obj, T_DATA)) {
-      wrong_type:
-	etype = builtin_class_name(obj);
-	if (!etype)
-	    rb_raise(rb_eTypeError, "wrong argument type %"PRIsVALUE" (expected %s)",
-		     rb_obj_class(obj), data_type->wrap_struct_name);
-      wrong_datatype:
-	rb_raise(rb_eTypeError, "wrong argument type %s (expected %s)",
-		 etype, data_type->wrap_struct_name);
-    }
-    if (!RTYPEDDATA_P(obj)) {
-	goto wrong_type;
+        actual = displaying_class_of(obj);
+    }
+    else if (!RTYPEDDATA_P(obj)) {
+        actual = displaying_class_of(obj);
     }
     else if (!rb_typeddata_inherited_p(RTYPEDDATA_TYPE(obj), data_type)) {
-	etype = RTYPEDDATA_TYPE(obj)->wrap_struct_name;
-	goto wrong_datatype;
+        const char *name = RTYPEDDATA_TYPE(obj)->wrap_struct_name;
+        actual = rb_str_new_cstr(name); /* or rb_fstring_cstr? not sure... */
+    }
+    else {
+        return DATA_PTR(obj);
     }
-    return DATA_PTR(obj);
+
+    const char *expected = data_type->wrap_struct_name;
+    rb_raise(rb_eTypeError, "wrong argument type %"PRIsVALUE" (expected %s)",
+             actual, expected);
+    UNREACHABLE_RETURN(NULL);
 }
 
 /* exception classes */
@@ -634,6 +1053,7 @@ VALUE rb_eSignal;
 VALUE rb_eFatal;
 VALUE rb_eStandardError;
 VALUE rb_eRuntimeError;
+VALUE rb_eFrozenError;
 VALUE rb_eTypeError;
 VALUE rb_eArgError;
 VALUE rb_eIndexError;
@@ -647,6 +1067,7 @@ VALUE rb_eSecurityError;
 VALUE rb_eNotImpError;
 VALUE rb_eNoMemError;
 VALUE rb_cNameErrorMesg;
+VALUE rb_eNoMatchingPatternError;
 
 VALUE rb_eScriptError;
 VALUE rb_eSyntaxError;
@@ -656,22 +1077,24 @@ VALUE rb_eSystemCallError;
 VALUE rb_mErrno;
 static VALUE rb_eNOERROR;
 
-static ID id_new, id_cause, id_message, id_backtrace;
-static ID id_name, id_args, id_Errno, id_errno, id_i_path;
-static ID id_receiver, id_iseq, id_local_variables;
-static ID id_private_call_p;
-extern ID ruby_static_id_status;
+ID ruby_static_id_cause;
+#define id_cause ruby_static_id_cause
+static ID id_message, id_backtrace;
+static ID id_key, id_args, id_Errno, id_errno, id_i_path;
+static ID id_receiver, id_recv, id_iseq, id_local_variables;
+static ID id_private_call_p, id_top, id_bottom;
 #define id_bt idBt
 #define id_bt_locations idBt_locations
 #define id_mesg idMesg
-#define id_status ruby_static_id_status
+#define id_name idName
 
 #undef rb_exc_new_cstr
 
 VALUE
 rb_exc_new(VALUE etype, const char *ptr, long len)
 {
-    return rb_funcall(etype, id_new, 1, rb_str_new(ptr, len));
+    VALUE mesg = rb_str_new(ptr, len);
+    return rb_class_new_instance(1, &mesg, etype);
 }
 
 VALUE
@@ -684,12 +1107,22 @@ VALUE
 rb_exc_new_str(VALUE etype, VALUE str)
 {
     StringValue(str);
-    return rb_funcall(etype, id_new, 1, str);
+    return rb_class_new_instance(1, &str, etype);
+}
+
+static VALUE
+exc_init(VALUE exc, VALUE mesg)
+{
+    rb_ivar_set(exc, id_mesg, mesg);
+    rb_ivar_set(exc, id_bt, Qnil);
+
+    return exc;
 }
 
 /*
  * call-seq:
- *    Exception.new(msg = nil)   ->  exception
+ *    Exception.new(msg = nil)        ->  exception
+ *    Exception.exception(msg = nil)  ->  exception
  *
  *  Construct a new Exception object, optionally passing in
  *  a message.
@@ -700,18 +1133,15 @@ exc_initialize(int argc, VALUE *argv, VALUE exc)
 {
     VALUE arg;
 
-    rb_scan_args(argc, argv, "01", &arg);
-    rb_ivar_set(exc, id_mesg, arg);
-    rb_ivar_set(exc, id_bt, Qnil);
-
-    return exc;
+    arg = (!rb_check_arity(argc, 0, 1) ? Qnil : argv[0]);
+    return exc_init(exc, arg);
 }
 
 /*
  *  Document-method: exception
  *
  *  call-seq:
- *     exc.exception(string)  ->  an_exception or exc
+ *     exc.exception([string])  ->  an_exception or exc
  *
  *  With no argument, or if the argument is the same as the receiver,
  *  return the receiver. Otherwise, create a new
@@ -725,11 +1155,11 @@ exc_exception(int argc, VALUE *argv, VALUE self)
 {
     VALUE exc;
 
+    argc = rb_check_arity(argc, 0, 1);
     if (argc == 0) return self;
     if (argc == 1 && self == argv[0]) return self;
     exc = rb_obj_clone(self);
-    exc_initialize(argc, argv, exc);
-
+    rb_ivar_set(exc, id_mesg, argv[0]);
     return exc;
 }
 
@@ -750,14 +1180,99 @@ exc_to_s(VALUE exc)
     return rb_String(mesg);
 }
 
+/* FIXME: Include eval_error.c */
+void rb_error_write(VALUE errinfo, VALUE emesg, VALUE errat, VALUE str, VALUE highlight, VALUE reverse);
+
+VALUE
+rb_get_message(VALUE exc)
+{
+    VALUE e = rb_check_funcall(exc, id_message, 0, 0);
+    if (e == Qundef) return Qnil;
+    if (!RB_TYPE_P(e, T_STRING)) e = rb_check_string_type(e);
+    return e;
+}
+
+/*
+ * call-seq:
+ *    Exception.to_tty?   ->  true or false
+ *
+ * Returns +true+ if exception messages will be sent to a tty.
+ */
+static VALUE
+exc_s_to_tty_p(VALUE self)
+{
+    return rb_stderr_tty_p() ? Qtrue : Qfalse;
+}
+
+/*
+ * call-seq:
+ *   exception.full_message(highlight: bool, order: [:top or :bottom]) ->  string
+ *
+ * Returns formatted string of _exception_.
+ * The returned string is formatted using the same format that Ruby uses
+ * when printing an uncaught exceptions to stderr.
+ *
+ * If _highlight_ is +true+ the default error handler will send the
+ * messages to a tty.
+ *
+ * _order_ must be either of +:top+ or +:bottom+, and places the error
+ * message and the innermost backtrace come at the top or the bottom.
+ *
+ * The default values of these options depend on <code>$stderr</code>
+ * and its +tty?+ at the timing of a call.
+ */
+
+static VALUE
+exc_full_message(int argc, VALUE *argv, VALUE exc)
+{
+    VALUE opt, str, emesg, errat;
+    enum {kw_highlight, kw_order, kw_max_};
+    static ID kw[kw_max_];
+    VALUE args[kw_max_] = {Qnil, Qnil};
+
+    rb_scan_args(argc, argv, "0:", &opt);
+    if (!NIL_P(opt)) {
+	if (!kw[0]) {
+#define INIT_KW(n) kw[kw_##n] = rb_intern_const(#n)
+	    INIT_KW(highlight);
+	    INIT_KW(order);
+#undef INIT_KW
+	}
+	rb_get_kwargs(opt, kw, 0, kw_max_, args);
+	switch (args[kw_highlight]) {
+	  default:
+	    rb_raise(rb_eArgError, "expected true or false as "
+		     "highlight: %+"PRIsVALUE, args[kw_highlight]);
+	  case Qundef: args[kw_highlight] = Qnil; break;
+	  case Qtrue: case Qfalse: case Qnil: break;
+	}
+	if (args[kw_order] == Qundef) {
+	    args[kw_order] = Qnil;
+	}
+	else {
+	    ID id = rb_check_id(&args[kw_order]);
+	    if (id == id_bottom) args[kw_order] = Qtrue;
+	    else if (id == id_top) args[kw_order] = Qfalse;
+	    else {
+		rb_raise(rb_eArgError, "expected :top or :bottom as "
+			 "order: %+"PRIsVALUE, args[kw_order]);
+	    }
+	}
+    }
+    str = rb_str_new2("");
+    errat = rb_get_backtrace(exc);
+    emesg = rb_get_message(exc);
+
+    rb_error_write(exc, emesg, errat, str, args[kw_highlight], args[kw_order]);
+    return str;
+}
+
 /*
  * call-seq:
  *   exception.message   ->  string
  *
  * Returns the result of invoking <code>exception.to_s</code>.
- * Normally this returns the exception's message or name. By
- * supplying a to_str method, exceptions are agreeing to
- * be used where Strings are expected.
+ * Normally this returns the exception's message or name.
  */
 
 static VALUE
@@ -770,7 +1285,7 @@ exc_message(VALUE exc)
  * call-seq:
  *   exception.inspect   -> string
  *
- * Return this exception's class name and message
+ * Return this exception's class name and message.
  */
 
 static VALUE
@@ -781,7 +1296,7 @@ exc_inspect(VALUE exc)
     klass = CLASS_OF(exc);
     exc = rb_obj_as_string(exc);
     if (RSTRING_LEN(exc) == 0) {
-	return rb_str_dup(rb_class_name(klass));
+        return rb_class_name(klass);
     }
 
     str = rb_str_buf_new2("#<");
@@ -796,7 +1311,7 @@ exc_inspect(VALUE exc)
 
 /*
  *  call-seq:
- *     exception.backtrace    -> array
+ *     exception.backtrace    -> array or nil
  *
  *  Returns any backtrace associated with the exception. The backtrace
  *  is an array of strings, each containing either ``filename:lineNo: in
@@ -821,6 +1336,12 @@ exc_inspect(VALUE exc)
  *     prog.rb:2:in `a'
  *     prog.rb:6:in `b'
  *     prog.rb:10
+ *
+ *  In the case no backtrace has been set, +nil+ is returned
+ *
+ *    ex = StandardError.new
+ *    ex.backtrace
+ *    #=> nil
 */
 
 static VALUE
@@ -838,15 +1359,38 @@ exc_backtrace(VALUE exc)
     return obj;
 }
 
+static VALUE rb_check_backtrace(VALUE);
+
+VALUE
+rb_get_backtrace(VALUE exc)
+{
+    ID mid = id_backtrace;
+    VALUE info;
+    if (rb_method_basic_definition_p(CLASS_OF(exc), id_backtrace)) {
+	VALUE klass = rb_eException;
+	rb_execution_context_t *ec = GET_EC();
+	if (NIL_P(exc))
+	    return Qnil;
+	EXEC_EVENT_HOOK(ec, RUBY_EVENT_C_CALL, exc, mid, mid, klass, Qundef);
+	info = exc_backtrace(exc);
+	EXEC_EVENT_HOOK(ec, RUBY_EVENT_C_RETURN, exc, mid, mid, klass, info);
+    }
+    else {
+	info = rb_funcallv(exc, mid, 0, 0);
+    }
+    if (NIL_P(info)) return Qnil;
+    return rb_check_backtrace(info);
+}
+
 /*
  *  call-seq:
- *     exception.backtrace_locations    -> array
+ *     exception.backtrace_locations    -> array or nil
  *
  *  Returns any backtrace associated with the exception. This method is
  *  similar to Exception#backtrace, but the backtrace is an array of
  *  Thread::Backtrace::Location.
  *
- *  Now, this method is not affected by Exception#set_backtrace().
+ *  This method is not affected by Exception#set_backtrace().
  */
 static VALUE
 exc_backtrace_locations(VALUE exc)
@@ -860,7 +1404,7 @@ exc_backtrace_locations(VALUE exc)
     return obj;
 }
 
-VALUE
+static VALUE
 rb_check_backtrace(VALUE bt)
 {
     long i;
@@ -898,7 +1442,7 @@ exc_set_backtrace(VALUE exc, VALUE bt)
     return rb_ivar_set(exc, id_bt, rb_check_backtrace(bt));
 }
 
-VALUE
+MJIT_FUNC_EXPORTED VALUE
 rb_exc_set_backtrace(VALUE exc, VALUE bt)
 {
     return exc_set_backtrace(exc, bt);
@@ -929,7 +1473,7 @@ try_convert_to_exception(VALUE obj)
  *  call-seq:
  *     exc == obj   -> true or false
  *
- *  Equality---If <i>obj</i> is not an <code>Exception</code>, returns
+ *  Equality---If <i>obj</i> is not an Exception, returns
  *  <code>false</code>. Otherwise, returns <code>true</code> if <i>exc</i> and
  *  <i>obj</i> share same class, messages, and backtrace.
  */
@@ -942,10 +1486,10 @@ exc_equal(VALUE exc, VALUE obj)
     if (exc == obj) return Qtrue;
 
     if (rb_obj_class(exc) != rb_obj_class(obj)) {
-	int status = 0;
+	int state;
 
-	obj = rb_protect(try_convert_to_exception, obj, &status);
-	if (status || obj == Qundef) {
+	obj = rb_protect(try_convert_to_exception, obj, &state);
+	if (state || obj == Qundef) {
 	    rb_set_errinfo(Qnil);
 	    return Qfalse;
 	}
@@ -1024,7 +1568,7 @@ exit_initialize(int argc, VALUE *argv, VALUE exc)
 
 /*
  * call-seq:
- *   system_exit.status   -> fixnum
+ *   system_exit.status   -> integer
  *
  * Return the status value associated with this system exit.
  */
@@ -1058,6 +1602,49 @@ exit_success_p(VALUE exc)
     return Qfalse;
 }
 
+static VALUE
+err_init_recv(VALUE exc, VALUE recv)
+{
+    if (recv != Qundef) rb_ivar_set(exc, id_recv, recv);
+    return exc;
+}
+
+/*
+ * call-seq:
+ *   FrozenError.new(msg=nil, receiver: nil)  -> frozen_error
+ *
+ * Construct a new FrozenError exception. If given the <i>receiver</i>
+ * parameter may subsequently be examined using the FrozenError#receiver
+ * method.
+ *
+ *    a = [].freeze
+ *    raise FrozenError.new("can't modify frozen array", receiver: a)
+ */
+
+static VALUE
+frozen_err_initialize(int argc, VALUE *argv, VALUE self)
+{
+    ID keywords[1];
+    VALUE values[numberof(keywords)], options;
+
+    argc = rb_scan_args(argc, argv, "*:", NULL, &options);
+    keywords[0] = id_receiver;
+    rb_get_kwargs(options, keywords, 0, numberof(values), values);
+    rb_call_super(argc, argv);
+    err_init_recv(self, values[0]);
+    return self;
+}
+
+/*
+ * Document-method: FrozenError#receiver
+ * call-seq:
+ *   frozen_error.receiver  -> object
+ *
+ * Return the receiver associated with this FrozenError exception.
+ */
+
+#define frozen_err_receiver name_err_receiver
+
 void
 rb_name_error(ID id, const char *fmt, ...)
 {
@@ -1088,34 +1675,62 @@ rb_name_error_str(VALUE str, const char *fmt, ...)
     rb_exc_raise(exc);
 }
 
+static VALUE
+name_err_init_attr(VALUE exc, VALUE recv, VALUE method)
+{
+    const rb_execution_context_t *ec = GET_EC();
+    rb_control_frame_t *cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(ec->cfp);
+    cfp = rb_vm_get_ruby_level_next_cfp(ec, cfp);
+    rb_ivar_set(exc, id_name, method);
+    err_init_recv(exc, recv);
+    if (cfp) rb_ivar_set(exc, id_iseq, rb_iseqw_new(cfp->iseq));
+    return exc;
+}
+
 /*
  * call-seq:
- *   NameError.new([msg, *, name])  -> name_error
+ *   NameError.new(msg=nil, name=nil, receiver: nil)  -> name_error
  *
  * Construct a new NameError exception. If given the <i>name</i>
- * parameter may subsequently be examined using the <code>NameError.name</code>
- * method.
+ * parameter may subsequently be examined using the NameError#name
+ * method. <i>receiver</i> parameter allows to pass object in
+ * context of which the error happened. Example:
+ *
+ *    [1, 2, 3].method(:rject) # NameError with name "rject" and receiver: Array
+ *    [1, 2, 3].singleton_method(:rject) # NameError with name "rject" and receiver: [1, 2, 3]
  */
 
 static VALUE
 name_err_initialize(int argc, VALUE *argv, VALUE self)
 {
-    VALUE name;
-    VALUE iseqw = Qnil;
+    ID keywords[1];
+    VALUE values[numberof(keywords)], name, options;
 
+    argc = rb_scan_args(argc, argv, "*:", NULL, &options);
+    keywords[0] = id_receiver;
+    rb_get_kwargs(options, keywords, 0, numberof(values), values);
     name = (argc > 1) ? argv[--argc] : Qnil;
     rb_call_super(argc, argv);
-    rb_ivar_set(self, id_name, name);
-    {
-	rb_thread_t *th = GET_THREAD();
-	rb_control_frame_t *cfp =
-	    rb_vm_get_ruby_level_next_cfp(th, RUBY_VM_PREVIOUS_CONTROL_FRAME(th->cfp));
-	if (cfp) iseqw = rb_iseqw_new(cfp->iseq);
-    }
-    rb_ivar_set(self, id_iseq, iseqw);
+    name_err_init_attr(self, values[0], name);
     return self;
 }
 
+static VALUE rb_name_err_mesg_new(VALUE mesg, VALUE recv, VALUE method);
+
+static VALUE
+name_err_init(VALUE exc, VALUE mesg, VALUE recv, VALUE method)
+{
+    exc_init(exc, rb_name_err_mesg_new(mesg, recv, method));
+    return name_err_init_attr(exc, recv, method);
+}
+
+VALUE
+rb_name_err_new(VALUE mesg, VALUE recv, VALUE method)
+{
+    VALUE exc = rb_obj_alloc(rb_eNameError);
+    return name_err_init(exc, mesg, recv, method);
+}
+
 /*
  *  call-seq:
  *    name_error.name    ->  string or nil
@@ -1153,25 +1768,49 @@ name_err_local_variables(VALUE self)
     return vars;
 }
 
+static VALUE
+nometh_err_init_attr(VALUE exc, VALUE args, int priv)
+{
+    rb_ivar_set(exc, id_args, args);
+    rb_ivar_set(exc, id_private_call_p, priv ? Qtrue : Qfalse);
+    return exc;
+}
+
 /*
  * call-seq:
- *   NoMethodError.new([msg, *, name [, args]])  -> no_method_error
+ *   NoMethodError.new(msg=nil, name=nil, args=nil, private=false, receiver: nil)  -> no_method_error
  *
  * Construct a NoMethodError exception for a method of the given name
  * called with the given arguments. The name may be accessed using
  * the <code>#name</code> method on the resulting object, and the
  * arguments using the <code>#args</code> method.
+ *
+ * If <i>private</i> argument were passed, it designates method was
+ * attempted to call in private context, and can be accessed with
+ * <code>#private_call?</code> method.
+ *
+ * <i>receiver</i> argument stores an object whose method was called.
  */
 
 static VALUE
 nometh_err_initialize(int argc, VALUE *argv, VALUE self)
 {
-    VALUE priv = (argc > 3) && (--argc, RTEST(argv[argc])) ? Qtrue : Qfalse;
-    VALUE args = (argc > 2) ? argv[--argc] : Qnil;
-    name_err_initialize(argc, argv, self);
-    rb_ivar_set(self, id_args, args);
-    rb_ivar_set(self, id_private_call_p, RTEST(priv) ? Qtrue : Qfalse);
-    return self;
+    int priv;
+    VALUE args, options;
+    argc = rb_scan_args(argc, argv, "*:", NULL, &options);
+    priv = (argc > 3) && (--argc, RTEST(argv[argc]));
+    args = (argc > 2) ? argv[--argc] : Qnil;
+    if (!NIL_P(options)) argv[argc++] = options;
+    rb_call_super_kw(argc, argv, RB_PASS_CALLED_KEYWORDS);
+    return nometh_err_init_attr(self, args, priv);
+}
+
+VALUE
+rb_nomethod_err_new(VALUE mesg, VALUE recv, VALUE method, VALUE args, int priv)
+{
+    VALUE exc = rb_obj_alloc(rb_eNoMethodError);
+    name_err_init(exc, mesg, recv, method);
+    return nometh_err_init_attr(exc, args, priv);
 }
 
 /* :nodoc: */
@@ -1208,10 +1847,10 @@ static const rb_data_type_t name_err_mesg_data_type = {
 };
 
 /* :nodoc: */
-VALUE
-rb_name_err_mesg_new(VALUE mesg, VALUE recv, VALUE method)
+static VALUE
+rb_name_err_mesg_init(VALUE klass, VALUE mesg, VALUE recv, VALUE method)
 {
-    VALUE result = TypedData_Wrap_Struct(rb_cNameErrorMesg, &name_err_mesg_data_type, 0);
+    VALUE result = TypedData_Wrap_Struct(klass, &name_err_mesg_data_type, 0);
     VALUE *ptr = ALLOC_N(VALUE, NAME_ERR_MESG_COUNT);
 
     ptr[NAME_ERR_MESG__MESG] = mesg;
@@ -1221,15 +1860,33 @@ rb_name_err_mesg_new(VALUE mesg, VALUE recv, VALUE method)
     return result;
 }
 
-VALUE
-rb_name_err_new(VALUE mesg, VALUE recv, VALUE method)
+/* :nodoc: */
+static VALUE
+rb_name_err_mesg_new(VALUE mesg, VALUE recv, VALUE method)
 {
-    VALUE exc = rb_obj_alloc(rb_eNameError);
-    rb_ivar_set(exc, id_mesg, rb_name_err_mesg_new(mesg, recv, method));
-    rb_ivar_set(exc, id_bt, Qnil);
-    rb_ivar_set(exc, id_name, method);
-    rb_ivar_set(exc, id_receiver, recv);
-    return exc;
+    return rb_name_err_mesg_init(rb_cNameErrorMesg, mesg, recv, method);
+}
+
+/* :nodoc: */
+static VALUE
+name_err_mesg_alloc(VALUE klass)
+{
+    return rb_name_err_mesg_init(klass, Qnil, Qnil, Qnil);
+}
+
+/* :nodoc: */
+static VALUE
+name_err_mesg_init_copy(VALUE obj1, VALUE obj2)
+{
+    VALUE *ptr1, *ptr2;
+
+    if (obj1 == obj2) return obj1;
+    rb_obj_init_copy(obj1, obj2);
+
+    TypedData_Get_Struct(obj1, VALUE, &name_err_mesg_data_type, ptr1);
+    TypedData_Get_Struct(obj2, VALUE, &name_err_mesg_data_type, ptr2);
+    MEMCPY(ptr1, ptr2, VALUE, NAME_ERR_MESG_COUNT);
+    return obj1;
 }
 
 /* :nodoc: */
@@ -1254,6 +1911,17 @@ name_err_mesg_equal(VALUE obj1, VALUE obj2)
 
 /* :nodoc: */
 static VALUE
+name_err_mesg_receiver_name(VALUE obj)
+{
+    if (RB_SPECIAL_CONST_P(obj)) return Qundef;
+    if (RB_BUILTIN_TYPE(obj) == T_MODULE || RB_BUILTIN_TYPE(obj) == T_CLASS) {
+        return rb_check_funcall(obj, rb_intern("name"), 0, 0);
+    }
+    return Qundef;
+}
+
+/* :nodoc: */
+static VALUE
 name_err_mesg_to_str(VALUE obj)
 {
     VALUE *ptr, mesg;
@@ -1280,14 +1948,17 @@ name_err_mesg_to_str(VALUE obj)
 	    d = FAKE_CSTR(&d_str, "false");
 	    break;
 	  default:
-	    d = rb_protect(rb_inspect, obj, &state);
-	    if (state)
+	    d = rb_protect(name_err_mesg_receiver_name, obj, &state);
+	    if (state || d == Qundef || d == Qnil)
+		d = rb_protect(rb_inspect, obj, &state);
+	    if (state) {
 		rb_set_errinfo(Qnil);
-	    if (NIL_P(d) || RSTRING_LEN(d) > 65) {
+	    }
+	    d = rb_check_string_type(d);
+	    if (NIL_P(d)) {
 		d = rb_any_to_s(obj);
 	    }
 	    singleton = (RSTRING_LEN(d) > 0 && RSTRING_PTR(d)[0] == '#');
-	    d = QUOTE(d);
 	    break;
 	}
 	if (!singleton) {
@@ -1297,7 +1968,7 @@ name_err_mesg_to_str(VALUE obj)
 	else {
 	    c = s = FAKE_CSTR(&s_str, "");
 	}
-	args[0] = QUOTE(rb_obj_as_string(ptr[NAME_ERR_MESG__NAME]));
+        args[0] = rb_obj_as_string(ptr[NAME_ERR_MESG__NAME]);
 	args[1] = d;
 	args[2] = s;
 	args[3] = c;
@@ -1332,7 +2003,7 @@ name_err_receiver(VALUE self)
 {
     VALUE *ptr, recv, mesg;
 
-    recv = rb_ivar_lookup(self, id_receiver, Qundef);
+    recv = rb_ivar_lookup(self, id_recv, Qundef);
     if (recv != Qundef) return recv;
 
     mesg = rb_attr_get(self, id_mesg);
@@ -1357,6 +2028,13 @@ nometh_err_args(VALUE self)
     return rb_attr_get(self, id_args);
 }
 
+/*
+ * call-seq:
+ *   no_method_error.private_call?  -> true or false
+ *
+ * Return true if the caused method was called as private.
+ */
+
 static VALUE
 nometh_err_private_call_p(VALUE self)
 {
@@ -1373,6 +2051,83 @@ rb_invalid_str(const char *str, const char *type)
 
 /*
  * call-seq:
+ *   key_error.receiver  -> object
+ *
+ * Return the receiver associated with this KeyError exception.
+ */
+
+static VALUE
+key_err_receiver(VALUE self)
+{
+    VALUE recv;
+
+    recv = rb_ivar_lookup(self, id_receiver, Qundef);
+    if (recv != Qundef) return recv;
+    rb_raise(rb_eArgError, "no receiver is available");
+}
+
+/*
+ * call-seq:
+ *   key_error.key  -> object
+ *
+ * Return the key caused this KeyError exception.
+ */
+
+static VALUE
+key_err_key(VALUE self)
+{
+    VALUE key;
+
+    key = rb_ivar_lookup(self, id_key, Qundef);
+    if (key != Qundef) return key;
+    rb_raise(rb_eArgError, "no key is available");
+}
+
+VALUE
+rb_key_err_new(VALUE mesg, VALUE recv, VALUE key)
+{
+    VALUE exc = rb_obj_alloc(rb_eKeyError);
+    rb_ivar_set(exc, id_mesg, mesg);
+    rb_ivar_set(exc, id_bt, Qnil);
+    rb_ivar_set(exc, id_key, key);
+    rb_ivar_set(exc, id_receiver, recv);
+    return exc;
+}
+
+/*
+ * call-seq:
+ *   KeyError.new(message=nil, receiver: nil, key: nil) -> key_error
+ *
+ * Construct a new +KeyError+ exception with the given message,
+ * receiver and key.
+ */
+
+static VALUE
+key_err_initialize(int argc, VALUE *argv, VALUE self)
+{
+    VALUE options;
+
+    rb_call_super(rb_scan_args(argc, argv, "01:", NULL, &options), argv);
+
+    if (!NIL_P(options)) {
+	ID keywords[2];
+	VALUE values[numberof(keywords)];
+	int i;
+	keywords[0] = id_receiver;
+	keywords[1] = id_key;
+	rb_get_kwargs(options, keywords, 0, numberof(values), values);
+	for (i = 0; i < numberof(values); ++i) {
+	    if (values[i] != Qundef) {
+		rb_ivar_set(self, keywords[i], values[i]);
+	    }
+	}
+    }
+
+    return self;
+}
+
+/*
+ * call-seq:
  *   SyntaxError.new([msg])  -> syntax_error
  *
  * Construct a SyntaxError exception.
@@ -1383,7 +2138,7 @@ syntax_error_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE mesg;
     if (argc == 0) {
-	mesg = rb_fstring_cstr("compile error");
+	mesg = rb_fstring_lit("compile error");
 	argc = 1;
 	argv = &mesg;
     }
@@ -1393,19 +2148,18 @@ syntax_error_initialize(int argc, VALUE *argv, VALUE self)
 /*
  *  Document-module: Errno
  *
- *  Ruby exception objects are subclasses of <code>Exception</code>.
- *  However, operating systems typically report errors using plain
- *  integers. Module <code>Errno</code> is created dynamically to map
- *  these operating system errors to Ruby classes, with each error
- *  number generating its own subclass of <code>SystemCallError</code>.
- *  As the subclass is created in module <code>Errno</code>, its name
- *  will start <code>Errno::</code>.
+ *  Ruby exception objects are subclasses of Exception.  However,
+ *  operating systems typically report errors using plain
+ *  integers. Module Errno is created dynamically to map these
+ *  operating system errors to Ruby classes, with each error number
+ *  generating its own subclass of SystemCallError.  As the subclass
+ *  is created in module Errno, its name will start
+ *  <code>Errno::</code>.
  *
- *  The names of the <code>Errno::</code> classes depend on
- *  the environment in which Ruby runs. On a typical Unix or Windows
- *  platform, there are <code>Errno</code> classes such as
- *  <code>Errno::EACCES</code>, <code>Errno::EAGAIN</code>,
- *  <code>Errno::EINTR</code>, and so on.
+ *  The names of the <code>Errno::</code> classes depend on the
+ *  environment in which Ruby runs. On a typical Unix or Windows
+ *  platform, there are Errno classes such as Errno::EACCES,
+ *  Errno::EAGAIN, Errno::EINTR, and so on.
  *
  *  The integer operating system error number corresponding to a
  *  particular error is available as the class constant
@@ -1416,7 +2170,7 @@ syntax_error_initialize(int argc, VALUE *argv, VALUE self)
  *     Errno::EINTR::Errno    #=> 4
  *
  *  The full list of operating system errors on your particular platform
- *  are available as the constants of <code>Errno</code>.
+ *  are available as the constants of Errno.
  *
  *     Errno.constants   #=> :E2BIG, :EACCES, :EADDRINUSE, :EADDRNOTAVAIL, ...
  */
@@ -1475,11 +2229,10 @@ get_syserr(int n)
  * call-seq:
  *   SystemCallError.new(msg, errno)  -> system_call_error_subclass
  *
- * If _errno_ corresponds to a known system error code, constructs
- * the appropriate <code>Errno</code> class for that error, otherwise
- * constructs a generic <code>SystemCallError</code> object. The
- * error number is subsequently available via the <code>errno</code>
- * method.
+ * If _errno_ corresponds to a known system error code, constructs the
+ * appropriate Errno class for that error, otherwise constructs a
+ * generic SystemCallError object. The error number is subsequently
+ * available via the #errno method.
  */
 
 static VALUE
@@ -1520,7 +2273,6 @@ syserr_initialize(int argc, VALUE *argv, VALUE self)
 
 	if (!NIL_P(func)) rb_str_catf(errmsg, " @ %"PRIsVALUE, func);
 	rb_str_catf(errmsg, " - %"PRIsVALUE, str);
-	OBJ_INFECT(errmsg, mesg);
     }
     mesg = errmsg;
 
@@ -1531,7 +2283,7 @@ syserr_initialize(int argc, VALUE *argv, VALUE self)
 
 /*
  * call-seq:
- *   system_call_error.errno   -> fixnum
+ *   system_call_error.errno   -> integer
  *
  * Return this SystemCallError's error number.
  */
@@ -1619,8 +2371,8 @@ syserr_eqq(VALUE self, VALUE exc)
 /*
  *  Document-class: Interrupt
  *
- *  Raised with the interrupt signal is received, typically because the
- *  user pressed on Control-C (on most posix platforms). As such, it is a
+ *  Raised when the interrupt signal is received, typically because the
+ *  user has pressed Control-C (on most posix platforms). As such, it is a
  *  subclass of +SignalException+.
  *
  *     begin
@@ -1772,7 +2524,7 @@ syserr_eqq(VALUE self, VALUE exc)
  *
  *  Since constant names must start with a capital:
  *
- *     Fixnum.const_set :answer, 42
+ *     Integer.const_set :answer, 42
  *
  *  <em>raises the exception:</em>
  *
@@ -1793,17 +2545,22 @@ syserr_eqq(VALUE self, VALUE exc)
  */
 
 /*
- *  Document-class: RuntimeError
+ *  Document-class: FrozenError
  *
- *  A generic error class raised when an invalid operation is attempted.
+ *  Raised when there is an attempt to modify a frozen object.
  *
  *     [1, 2, 3].freeze << 4
  *
  *  <em>raises the exception:</em>
  *
- *     RuntimeError: can't modify frozen Array
+ *     FrozenError: can't modify frozen Array
+ */
+
+/*
+ *  Document-class: RuntimeError
  *
- *  Kernel.raise will raise a RuntimeError if no Exception class is
+ *  A generic error class raised when an invalid operation is attempted.
+ *  Kernel#raise will raise a RuntimeError if no Exception class is
  *  specified.
  *
  *     raise "ouch"
@@ -1816,19 +2573,7 @@ syserr_eqq(VALUE self, VALUE exc)
 /*
  *  Document-class: SecurityError
  *
- *  Raised when attempting a potential unsafe operation, typically when
- *  the $SAFE level is raised above 0.
- *
- *     foo = "bar"
- *     proc = Proc.new do
- *       $SAFE = 3
- *       foo.untaint
- *     end
- *     proc.call
- *
- *  <em>raises the exception:</em>
- *
- *     SecurityError: Insecure: Insecure operation `untaint' at level 3
+ *  No longer used by internal code.
  */
 
 /*
@@ -1869,8 +2614,8 @@ syserr_eqq(VALUE self, VALUE exc)
 /*
  * Document-class: fatal
  *
- * fatal is an Exception that is raised when ruby has encountered a fatal
- * error and must exit.  You are not able to rescue fatal.
+ * fatal is an Exception that is raised when Ruby has encountered a fatal
+ * error and must exit.
  */
 
 /*
@@ -1879,32 +2624,48 @@ syserr_eqq(VALUE self, VALUE exc)
  */
 
 /*
- *  Descendants of class Exception are used to communicate between
+ *  Document-class: Exception
+ *
+ *  \Class Exception and its subclasses are used to communicate between
  *  Kernel#raise and +rescue+ statements in <code>begin ... end</code> blocks.
- *  Exception objects carry information about the exception -- its type (the
- *  exception's class name), an optional descriptive string, and optional
- *  traceback information.  Exception subclasses may add additional
- *  information like NameError#name.
  *
- *  Programs may make subclasses of Exception, typically of StandardError or
- *  RuntimeError, to provide custom classes and add additional information.
- *  See the subclass list below for defaults for +raise+ and +rescue+.
+ *  An Exception object carries information about an exception:
+ *  - Its type (the exception's class).
+ *  - An optional descriptive message.
+ *  - Optional backtrace information.
+ *
+ *  Some built-in subclasses of Exception have additional methods: e.g., NameError#name.
+ *
+ *  == Defaults
+ *
+ *  Two Ruby statements have default exception classes:
+ *  - +raise+: defaults to RuntimeError.
+ *  - +rescue+: defaults to StandardError.
+ *
+ *  == Global Variables
  *
  *  When an exception has been raised but not yet handled (in +rescue+,
- *  +ensure+, +at_exit+ and +END+ blocks) the global variable <code>$!</code>
- *  will contain the current exception and <code>$@</code> contains the
- *  current exception's backtrace.
+ *  +ensure+, +at_exit+ and +END+ blocks), two global variables are set:
+ *  - <code>$!</code> contains the current exception.
+ *  - <code>$@</code> contains its backtrace.
+ *
+ *  == Custom Exceptions
  *
- *  It is recommended that a library should have one subclass of StandardError
- *  or RuntimeError and have specific exception types inherit from it.  This
- *  allows the user to rescue a generic exception type to catch all exceptions
+ *  To provide additional or alternate information,
+ *  a program may create custom exception classes
+ *  that derive from the built-in exception classes.
+ *
+ *  A good practice is for a library to create a single "generic" exception class
+ *  (typically a subclass of StandardError or RuntimeError)
+ *  and have its other exception classes derive from that class.
+ *  This allows the user to rescue the generic exception, thus catching all exceptions
  *  the library may raise even if future versions of the library add new
  *  exception subclasses.
  *
  *  For example:
  *
  *    class MyLibrary
- *      class Error < RuntimeError
+ *      class Error < ::StandardError
  *      end
  *
  *      class WidgetError < Error
@@ -1915,8 +2676,10 @@ syserr_eqq(VALUE self, VALUE exc)
  *
  *    end
  *
- *  To handle both WidgetError and FrobError the library user can rescue
- *  MyLibrary::Error.
+ *  To handle both MyLibrary::WidgetError and MyLibrary::FrobError the library
+ *  user can rescue MyLibrary::Error.
+ *
+ *  == Built-In Exception Classes
  *
  *  The built-in subclasses of Exception are:
  *
@@ -1928,7 +2691,7 @@ syserr_eqq(VALUE self, VALUE exc)
  *  * SecurityError
  *  * SignalException
  *    * Interrupt
- *  * StandardError -- default for +rescue+
+ *  * StandardError
  *    * ArgumentError
  *      * UncaughtThrowError
  *    * EncodingError
@@ -1938,13 +2701,15 @@ syserr_eqq(VALUE self, VALUE exc)
  *    * IndexError
  *      * KeyError
  *      * StopIteration
+ *        * ClosedQueueError
  *    * LocalJumpError
  *    * NameError
  *      * NoMethodError
  *    * RangeError
  *      * FloatDomainError
  *    * RegexpError
- *    * RuntimeError -- default for +raise+
+ *    * RuntimeError
+ *      * FrozenError
  *    * SystemCallError
  *      * Errno::*
  *    * ThreadError
@@ -1952,19 +2717,67 @@ syserr_eqq(VALUE self, VALUE exc)
  *    * ZeroDivisionError
  *  * SystemExit
  *  * SystemStackError
- *  * fatal -- impossible to rescue
+ *  * fatal
  */
 
+static VALUE
+exception_alloc(VALUE klass)
+{
+    return rb_class_allocate_instance(klass);
+}
+
+static VALUE
+exception_dumper(VALUE exc)
+{
+    // TODO: Currently, the instance variables "bt" and "bt_locations"
+    // refers to the same object (Array of String). But "bt_locations"
+    // should have an Array of Thread::Backtrace::Locations.
+
+    return exc;
+}
+
+static int
+ivar_copy_i(st_data_t key, st_data_t val, st_data_t exc)
+{
+    rb_ivar_set((VALUE) exc, (ID) key, (VALUE) val);
+    return ST_CONTINUE;
+}
+
+static VALUE
+exception_loader(VALUE exc, VALUE obj)
+{
+    // The loader function of rb_marshal_define_compat seems to be called for two events:
+    // one is for fixup (r_fixup_compat), the other is for TYPE_USERDEF.
+    // In the former case, the first argument is an instance of Exception (because
+    // we pass rb_eException to rb_marshal_define_compat). In the latter case, the first
+    // argument is a class object (see TYPE_USERDEF case in r_object0).
+    // We want to copy all instance variables (but "bt_locations") from obj to exc.
+    // But we do not want to do so in the second case, so the following branch is for that.
+    if (RB_TYPE_P(exc, T_CLASS)) return obj; // maybe called from Marshal's TYPE_USERDEF
+
+    rb_ivar_foreach(obj, ivar_copy_i, exc);
+
+    if (rb_attr_get(exc, id_bt) == rb_attr_get(exc, id_bt_locations)) {
+        rb_ivar_set(exc, id_bt_locations, Qnil);
+    }
+
+    return exc;
+}
+
 void
 Init_Exception(void)
 {
     rb_eException   = rb_define_class("Exception", rb_cObject);
+    rb_define_alloc_func(rb_eException, exception_alloc);
+    rb_marshal_define_compat(rb_eException, rb_eException, exception_dumper, exception_loader);
     rb_define_singleton_method(rb_eException, "exception", rb_class_new_instance, -1);
+    rb_define_singleton_method(rb_eException, "to_tty?", exc_s_to_tty_p, 0);
     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, "full_message", exc_full_message, -1);
     rb_define_method(rb_eException, "inspect", exc_inspect, 0);
     rb_define_method(rb_eException, "backtrace", exc_backtrace, 0);
     rb_define_method(rb_eException, "backtrace_locations", exc_backtrace_locations, 0);
@@ -1985,6 +2798,9 @@ Init_Exception(void)
     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_define_method(rb_eKeyError, "initialize", key_err_initialize, -1);
+    rb_define_method(rb_eKeyError, "receiver", key_err_receiver, 0);
+    rb_define_method(rb_eKeyError, "key", key_err_key, 0);
     rb_eRangeError    = rb_define_class("RangeError", rb_eStandardError);
 
     rb_eScriptError = rb_define_class("ScriptError", rb_eException);
@@ -2002,7 +2818,9 @@ Init_Exception(void)
     rb_define_method(rb_eNameError, "name", name_err_name, 0);
     rb_define_method(rb_eNameError, "receiver", name_err_receiver, 0);
     rb_define_method(rb_eNameError, "local_variables", name_err_local_variables, 0);
-    rb_cNameErrorMesg = rb_define_class_under(rb_eNameError, "message", rb_cData);
+    rb_cNameErrorMesg = rb_define_class_under(rb_eNameError, "message", rb_cObject);
+    rb_define_alloc_func(rb_cNameErrorMesg, name_err_mesg_alloc);
+    rb_define_method(rb_cNameErrorMesg, "initialize_copy", name_err_mesg_init_copy, 1);
     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_dump, 1);
@@ -2013,10 +2831,14 @@ Init_Exception(void)
     rb_define_method(rb_eNoMethodError, "private_call?", nometh_err_private_call_p, 0);
 
     rb_eRuntimeError = rb_define_class("RuntimeError", rb_eStandardError);
+    rb_eFrozenError = rb_define_class("FrozenError", rb_eRuntimeError);
+    rb_define_method(rb_eFrozenError, "initialize", frozen_err_initialize, -1);
+    rb_define_method(rb_eFrozenError, "receiver", frozen_err_receiver, 0);
     rb_eSecurityError = rb_define_class("SecurityError", rb_eException);
     rb_eNoMemError = rb_define_class("NoMemoryError", rb_eException);
     rb_eEncodingError = rb_define_class("EncodingError", rb_eStandardError);
     rb_eEncCompatError = rb_define_class_under(rb_cEncoding, "CompatibilityError", rb_eEncodingError);
+    rb_eNoMatchingPatternError = rb_define_class("NoMatchingPatternError", rb_eStandardError);
 
     syserr_tbl = st_init_numtable();
     rb_eSystemCallError = rb_define_class("SystemCallError", rb_eStandardError);
@@ -2026,13 +2848,20 @@ Init_Exception(void)
 
     rb_mErrno = rb_define_module("Errno");
 
-    rb_define_global_function("warn", rb_warn_m, -1);
+    rb_mWarning = rb_define_module("Warning");
+    rb_define_singleton_method(rb_mWarning, "[]", rb_warning_s_aref, 1);
+    rb_define_singleton_method(rb_mWarning, "[]=", rb_warning_s_aset, 2);
+    rb_define_method(rb_mWarning, "warn", rb_warning_s_warn, -1);
+    rb_extend_object(rb_mWarning, rb_mWarning);
+
+    /* :nodoc: */
+    rb_cWarningBuffer = rb_define_class_under(rb_mWarning, "buffer", rb_cString);
+    rb_define_method(rb_cWarningBuffer, "write", warning_write, -1);
 
-    id_new = rb_intern_const("new");
     id_cause = rb_intern_const("cause");
     id_message = rb_intern_const("message");
     id_backtrace = rb_intern_const("backtrace");
-    id_name = rb_intern_const("name");
+    id_key = rb_intern_const("key");
     id_args = rb_intern_const("args");
     id_receiver = rb_intern_const("receiver");
     id_private_call_p = rb_intern_const("private_call?");
@@ -2040,7 +2869,29 @@ Init_Exception(void)
     id_Errno = rb_intern_const("Errno");
     id_errno = rb_intern_const("errno");
     id_i_path = rb_intern_const("@path");
+    id_warn = rb_intern_const("warn");
+    id_category = rb_intern_const("category");
+    id_deprecated = rb_intern_const("deprecated");
+    id_experimental = rb_intern_const("experimental");
+    id_top = rb_intern_const("top");
+    id_bottom = rb_intern_const("bottom");
     id_iseq = rb_make_internal_id();
+    id_recv = rb_make_internal_id();
+
+    sym_category = ID2SYM(id_category);
+
+    warning_categories = rb_ident_hash_new();
+    rb_gc_register_mark_object(warning_categories);
+    rb_hash_aset(warning_categories, ID2SYM(id_deprecated), INT2NUM(RB_WARN_CATEGORY_DEPRECATED));
+    rb_hash_aset(warning_categories, ID2SYM(id_experimental), INT2NUM(RB_WARN_CATEGORY_EXPERIMENTAL));
+    rb_obj_freeze(warning_categories);
+
+    warning_category_t_map = rb_ident_hash_new();
+    rb_gc_register_mark_object(warning_category_t_map);
+    rb_hash_aset(warning_category_t_map, INT2NUM(RB_WARN_CATEGORY_NONE), Qnil);
+    rb_hash_aset(warning_category_t_map, INT2NUM(RB_WARN_CATEGORY_DEPRECATED), ID2SYM(id_deprecated));
+    rb_hash_aset(warning_category_t_map, INT2NUM(RB_WARN_CATEGORY_EXPERIMENTAL), ID2SYM(id_experimental));
+    rb_obj_freeze(warning_category_t_map);
 }
 
 void
@@ -2057,15 +2908,18 @@ rb_enc_raise(rb_encoding *enc, VALUE exc, const char *fmt, ...)
 }
 
 void
+rb_vraise(VALUE exc, const char *fmt, va_list ap)
+{
+    rb_exc_raise(rb_exc_new3(exc, rb_vsprintf(fmt, ap)));
+}
+
+void
 rb_raise(VALUE exc, const char *fmt, ...)
 {
     va_list args;
-    VALUE mesg;
-
     va_start(args, fmt);
-    mesg = rb_vsprintf(fmt, args);
+    rb_vraise(exc, fmt, args);
     va_end(args);
-    rb_exc_raise(rb_exc_new3(exc, mesg));
 }
 
 NORETURN(static void raise_loaderror(VALUE path, VALUE mesg));
@@ -2116,6 +2970,14 @@ rb_fatal(const char *fmt, ...)
     va_list args;
     VALUE mesg;
 
+    if (! ruby_thread_has_gvl_p()) {
+        /* The thread has no GVL.  Object allocation impossible (cant run GC),
+         * thus no message can be printed out. */
+        fprintf(stderr, "[FATAL] rb_fatal() outside of GVL\n");
+        rb_print_backtrace();
+        die();
+    }
+
     va_start(args, fmt);
     mesg = rb_vsprintf(fmt, args);
     va_end(args);
@@ -2200,6 +3062,12 @@ rb_sys_fail_path_in(const char *func_name, VALUE path)
 void
 rb_syserr_fail_path_in(const char *func_name, int n, VALUE path)
 {
+    rb_exc_raise(rb_syserr_new_path_in(func_name, n, path));
+}
+
+VALUE
+rb_syserr_new_path_in(const char *func_name, int n, VALUE path)
+{
     VALUE args[2];
 
     if (!path) path = Qnil;
@@ -2211,7 +3079,7 @@ rb_syserr_fail_path_in(const char *func_name, int n, VALUE path)
     }
     args[0] = path;
     args[1] = rb_str_new_cstr(func_name);
-    rb_exc_raise(rb_class_new_instance(2, args, get_syserr(n)));
+    return rb_class_new_instance(2, args, get_syserr(n));
 }
 #endif
 
@@ -2247,44 +3115,104 @@ rb_mod_syserr_fail_str(VALUE mod, int e, VALUE mesg)
     rb_exc_raise(exc);
 }
 
+static void
+syserr_warning(VALUE mesg, int err)
+{
+    rb_str_set_len(mesg, RSTRING_LEN(mesg)-1);
+    rb_str_catf(mesg, ": %s\n", strerror(err));
+    rb_write_warning_str(mesg);
+}
+
+#if 0
 void
-rb_sys_warning(const char *fmt, ...)
+rb_sys_warn(const char *fmt, ...)
 {
-    VALUE mesg;
-    va_list args;
-    int errno_save;
+    if (!NIL_P(ruby_verbose)) {
+	int errno_save = errno;
+	with_warning_string(mesg, 0, fmt) {
+	    syserr_warning(mesg, errno_save);
+	}
+	errno = errno_save;
+    }
+}
 
-    errno_save = errno;
+void
+rb_syserr_warn(int err, const char *fmt, ...)
+{
+    if (!NIL_P(ruby_verbose)) {
+	with_warning_string(mesg, 0, fmt) {
+	    syserr_warning(mesg, err);
+	}
+    }
+}
 
-    if (!RTEST(ruby_verbose)) return;
+void
+rb_sys_enc_warn(rb_encoding *enc, const char *fmt, ...)
+{
+    if (!NIL_P(ruby_verbose)) {
+	int errno_save = errno;
+	with_warning_string(mesg, enc, fmt) {
+	    syserr_warning(mesg, errno_save);
+	}
+	errno = errno_save;
+    }
+}
 
-    va_start(args, fmt);
-    mesg = warning_string(0, fmt, args);
-    va_end(args);
-    rb_str_set_len(mesg, RSTRING_LEN(mesg)-1);
-    rb_str_catf(mesg, ": %s\n", strerror(errno_save));
-    rb_write_error_str(mesg);
-    errno = errno_save;
+void
+rb_syserr_enc_warn(int err, rb_encoding *enc, const char *fmt, ...)
+{
+    if (!NIL_P(ruby_verbose)) {
+	with_warning_string(mesg, enc, fmt) {
+	    syserr_warning(mesg, err);
+	}
+    }
 }
+#endif
 
 void
-rb_sys_enc_warning(rb_encoding *enc, const char *fmt, ...)
+rb_sys_warning(const char *fmt, ...)
 {
-    VALUE mesg;
-    va_list args;
-    int errno_save;
+    if (RTEST(ruby_verbose)) {
+	int errno_save = errno;
+	with_warning_string(mesg, 0, fmt) {
+	    syserr_warning(mesg, errno_save);
+	}
+	errno = errno_save;
+    }
+}
 
-    errno_save = errno;
+#if 0
+void
+rb_syserr_warning(int err, const char *fmt, ...)
+{
+    if (RTEST(ruby_verbose)) {
+	with_warning_string(mesg, 0, fmt) {
+	    syserr_warning(mesg, err);
+	}
+    }
+}
+#endif
 
-    if (!RTEST(ruby_verbose)) return;
+void
+rb_sys_enc_warning(rb_encoding *enc, const char *fmt, ...)
+{
+    if (RTEST(ruby_verbose)) {
+	int errno_save = errno;
+	with_warning_string(mesg, enc, fmt) {
+	    syserr_warning(mesg, errno_save);
+	}
+	errno = errno_save;
+    }
+}
 
-    va_start(args, fmt);
-    mesg = warning_string(enc, fmt, args);
-    va_end(args);
-    rb_str_set_len(mesg, RSTRING_LEN(mesg)-1);
-    rb_str_catf(mesg, ": %s\n", strerror(errno_save));
-    rb_write_error_str(mesg);
-    errno = errno_save;
+void
+rb_syserr_enc_warning(int err, rb_encoding *enc, const char *fmt, ...)
+{
+    if (RTEST(ruby_verbose)) {
+	with_warning_string(mesg, enc, fmt) {
+	    syserr_warning(mesg, err);
+	}
+    }
 }
 
 void
@@ -2299,7 +3227,33 @@ rb_load_fail(VALUE path, const char *err)
 void
 rb_error_frozen(const char *what)
 {
-    rb_raise(rb_eRuntimeError, "can't modify frozen %s", what);
+    rb_raise(rb_eFrozenError, "can't modify frozen %s", what);
+}
+
+void
+rb_frozen_error_raise(VALUE frozen_obj, const char *fmt, ...)
+{
+    va_list args;
+    VALUE exc, mesg;
+
+    va_start(args, fmt);
+    mesg = rb_vsprintf(fmt, args);
+    va_end(args);
+    exc = rb_exc_new3(rb_eFrozenError, mesg);
+    rb_ivar_set(exc, id_recv, frozen_obj);
+    rb_exc_raise(exc);
+}
+
+static VALUE
+inspect_frozen_obj(VALUE obj, VALUE mesg, int recur)
+{
+    if (recur) {
+        rb_str_cat_cstr(mesg, " ...");
+    }
+    else {
+        rb_str_append(mesg, rb_inspect(obj));
+    }
+    return mesg;
 }
 
 void
@@ -2307,18 +3261,20 @@ rb_error_frozen_object(VALUE frozen_obj)
 {
     VALUE debug_info;
     const ID created_info = id_debug_created_info;
+    VALUE mesg = rb_sprintf("can't modify frozen %"PRIsVALUE": ",
+                            CLASS_OF(frozen_obj));
+    VALUE exc = rb_exc_new_str(rb_eFrozenError, mesg);
+
+    rb_ivar_set(exc, id_recv, frozen_obj);
+    rb_exec_recursive(inspect_frozen_obj, frozen_obj, mesg);
 
     if (!NIL_P(debug_info = rb_attr_get(frozen_obj, created_info))) {
 	VALUE path = rb_ary_entry(debug_info, 0);
 	VALUE line = rb_ary_entry(debug_info, 1);
 
-	rb_raise(rb_eRuntimeError, "can't modify frozen %"PRIsVALUE", created at %"PRIsVALUE":%"PRIsVALUE,
-		 CLASS_OF(frozen_obj), path, line);
-    }
-    else {
-	rb_raise(rb_eRuntimeError, "can't modify frozen %"PRIsVALUE,
-		 CLASS_OF(frozen_obj));
+        rb_str_catf(mesg, ", created at %"PRIsVALUE":%"PRIsVALUE, path, line);
     }
+    rb_exc_raise(exc);
 }
 
 #undef rb_check_frozen
@@ -2331,12 +3287,14 @@ rb_check_frozen(VALUE obj)
 void
 rb_error_untrusted(VALUE obj)
 {
+    rb_warn_deprecated_to_remove("rb_error_untrusted", "3.2");
 }
 
 #undef rb_check_trusted
 void
 rb_check_trusted(VALUE obj)
 {
+    rb_warn_deprecated_to_remove("rb_check_trusted", "3.2");
 }
 
 void
@@ -2345,12 +3303,6 @@ rb_check_copyable(VALUE obj, VALUE orig)
     if (!FL_ABLE(obj)) return;
     rb_check_frozen_internal(obj);
     if (!FL_ABLE(orig)) return;
-    if ((~RBASIC(obj)->flags & RBASIC(orig)->flags) & FL_TAINT) {
-	if (rb_safe_level() > 0) {
-	    rb_raise(rb_eSecurityError, "Insecure: can't modify %"PRIsVALUE,
-		     RBASIC(obj)->klass);
-	}
-    }
 }
 
 void
@@ -2363,3 +3315,9 @@ Init_syserr(void)
 #undef defined_error
 #undef undefined_error
 }
+
+#include "warning.rbinc"
+
+/*!
+ * \}
+ */
diff --git a/eval.c b/eval.c
index 475d6ca7a8..839518185a 100644
--- a/eval.c
+++ b/eval.c
@@ -11,23 +11,46 @@
 
 **********************************************************************/
 
-#include "internal.h"
+#include "ruby/internal/config.h"
+
+#ifdef HAVE_SYS_PRCTL_H
+#include <sys/prctl.h>
+#endif
+
 #include "eval_intern.h"
-#include "iseq.h"
 #include "gc.h"
+#include "internal.h"
+#include "internal/class.h"
+#include "internal/error.h"
+#include "internal/eval.h"
+#include "internal/hash.h"
+#include "internal/inits.h"
+#include "internal/io.h"
+#include "internal/object.h"
+#include "internal/thread.h"
+#include "internal/variable.h"
+#include "internal/scheduler.h"
+#include "iseq.h"
+#include "mjit.h"
+#include "probes.h"
+#include "probes_helper.h"
 #include "ruby/vm.h"
 #include "vm_core.h"
-#include "probes_helper.h"
+#include "ractor_core.h"
 
 NORETURN(void rb_raise_jump(VALUE, VALUE));
+void rb_ec_clear_current_thread_trace_func(const rb_execution_context_t *ec);
+void rb_ec_clear_all_trace_func(const rb_execution_context_t *ec);
+
+static int rb_ec_cleanup(rb_execution_context_t *ec, volatile int ex);
+static int rb_ec_exec_node(rb_execution_context_t *ec, void *n);
 
 VALUE rb_eLocalJumpError;
 VALUE rb_eSysStackError;
 
 ID ruby_static_id_signo, ruby_static_id_status;
-static ID id_cause;
-#define id_signo ruby_static_id_signo
-#define id_status ruby_static_id_status
+extern ID ruby_static_id_cause;
+#define id_cause ruby_static_id_cause
 
 #define exception_error GET_VM()->special_exceptions[ruby_error_reenter]
 
@@ -38,35 +61,46 @@ static ID id_cause;
     (!SPECIAL_CONST_P(obj) && \
      (BUILTIN_TYPE(obj) == T_CLASS || BUILTIN_TYPE(obj) == T_MODULE))
 
-/* Initializes the Ruby VM and builtin libraries.
+/*!
+ * Initializes the VM and builtin libraries.
  * @retval 0 if succeeded.
  * @retval non-zero an error occurred.
  */
 int
 ruby_setup(void)
 {
-    int state;
+    enum ruby_tag_type state;
 
     if (GET_VM())
 	return 0;
 
     ruby_init_stack((void *)&state);
+
+    /*
+     * Disable THP early before mallocs happen because we want this to
+     * affect as many future pages as possible for CoW-friendliness
+     */
+#if defined(__linux__) && defined(PR_SET_THP_DISABLE)
+    prctl(PR_SET_THP_DISABLE, 1, 0, 0, 0);
+#endif
     Init_BareVM();
     Init_heap();
+    rb_vm_encoded_insn_data_table_init();
     Init_vm_objects();
 
-    PUSH_TAG();
-    if ((state = EXEC_TAG()) == 0) {
+    EC_PUSH_TAG(GET_EC());
+    if ((state = EC_EXEC_TAG()) == TAG_NONE) {
 	rb_call_inits();
 	ruby_prog_init();
 	GET_VM()->running = 1;
     }
-    POP_TAG();
+    EC_POP_TAG();
 
     return state;
 }
 
-/* Calls ruby_setup() and check error.
+/*!
+ * Calls ruby_setup() and check error.
  *
  * Prints errors and calls exit(3) if an error occurred.
  */
@@ -76,7 +110,7 @@ ruby_init(void)
     int state = ruby_setup();
     if (state) {
         if (RTEST(ruby_debug))
-            error_print(GET_THREAD());
+            error_print(GET_EC());
 	exit(EXIT_FAILURE);
     }
 }
@@ -94,41 +128,60 @@ ruby_init(void)
 void *
 ruby_options(int argc, char **argv)
 {
-    int state;
+    rb_execution_context_t *ec = GET_EC();
+    enum ruby_tag_type state;
     void *volatile iseq = 0;
 
     ruby_init_stack((void *)&iseq);
-    PUSH_TAG();
-    if ((state = EXEC_TAG()) == 0) {
+    EC_PUSH_TAG(ec);
+    if ((state = EC_EXEC_TAG()) == TAG_NONE) {
 	SAVE_ROOT_JMPBUF(GET_THREAD(), iseq = ruby_process_options(argc, argv));
     }
     else {
-	rb_clear_trace_func();
-	state = error_handle(state);
+        rb_ec_clear_current_thread_trace_func(ec);
+        state = error_handle(ec, state);
 	iseq = (void *)INT2FIX(state);
     }
-    POP_TAG();
+    EC_POP_TAG();
     return iseq;
 }
 
 static void
-ruby_finalize_0(void)
+rb_ec_scheduler_finalize(rb_execution_context_t *ec)
 {
-    PUSH_TAG();
-    if (EXEC_TAG() == 0) {
-	rb_trap_exit();
+    enum ruby_tag_type state;
+
+    EC_PUSH_TAG(ec);
+    if ((state = EC_EXEC_TAG()) == TAG_NONE) {
+        rb_scheduler_set(Qnil);
+    }
+    else {
+        state = error_handle(ec, state);
     }
-    POP_TAG();
-    rb_exec_end_proc();
-    rb_clear_trace_func();
+    EC_POP_TAG();
 }
 
 static void
-ruby_finalize_1(void)
+rb_ec_teardown(rb_execution_context_t *ec)
+{
+    // If the user code defined a scheduler for the top level thread, run it:
+    rb_ec_scheduler_finalize(ec);
+
+    EC_PUSH_TAG(ec);
+    if (EC_EXEC_TAG() == TAG_NONE) {
+        rb_vm_trap_exit(rb_ec_vm_ptr(ec));
+    }
+    EC_POP_TAG();
+    rb_ec_exec_end_proc(ec);
+    rb_ec_clear_all_trace_func(ec);
+}
+
+static void
+rb_ec_finalize(rb_execution_context_t *ec)
 {
     ruby_sig_finalize();
-    GET_THREAD()->errinfo = Qnil;
-    rb_gc_call_finalizer_at_exit();
+    ec->errinfo = Qnil;
+    rb_objspace_call_finalizer(rb_ec_vm_ptr(ec)->objspace);
 }
 
 /** Runs the VM finalization processes.
@@ -141,8 +194,9 @@ ruby_finalize_1(void)
 void
 ruby_finalize(void)
 {
-    ruby_finalize_0();
-    ruby_finalize_1();
+    rb_execution_context_t *ec = GET_EC();
+    rb_ec_teardown(ec);
+    rb_ec_finalize(ec);
 }
 
 /** Destructs the VM.
@@ -158,32 +212,43 @@ ruby_finalize(void)
 int
 ruby_cleanup(volatile int ex)
 {
+    return rb_ec_cleanup(GET_EC(), ex);
+}
+
+static int
+rb_ec_cleanup(rb_execution_context_t *ec, volatile int ex)
+{
     int state;
-    volatile VALUE errs[2];
-    rb_thread_t *th = GET_THREAD();
+    volatile VALUE errs[2] = { Qundef, Qundef };
     int nerr;
+    rb_thread_t *th = rb_ec_thread_ptr(ec);
+    rb_thread_t *const volatile th0 = th;
     volatile int sysex = EXIT_SUCCESS;
     volatile int step = 0;
 
     rb_threadptr_interrupt(th);
     rb_threadptr_check_signal(th);
-    TH_PUSH_TAG(th);
-    if ((state = EXEC_TAG()) == 0) {
-	SAVE_ROOT_JMPBUF(th, { RUBY_VM_CHECK_INTS(th); });
+
+    EC_PUSH_TAG(ec);
+    if ((state = EC_EXEC_TAG()) == TAG_NONE) {
+        th = th0;
+        SAVE_ROOT_JMPBUF(th, { RUBY_VM_CHECK_INTS(ec); });
 
       step_0: step++;
-	errs[1] = th->errinfo;
-	th->safe_level = 0;
+        th = th0;
+        errs[1] = ec->errinfo;
+        if (THROW_DATA_P(ec->errinfo)) ec->errinfo = Qnil;
 	ruby_init_stack(&errs[STACK_UPPER(errs, 0, 1)]);
 
-	SAVE_ROOT_JMPBUF(th, ruby_finalize_0());
+        SAVE_ROOT_JMPBUF(th, rb_ec_teardown(ec));
 
       step_1: step++;
+        th = th0;
 	/* protect from Thread#raise */
 	th->status = THREAD_KILLED;
 
-	errs[0] = th->errinfo;
-	SAVE_ROOT_JMPBUF(th, rb_thread_terminate_all());
+        errs[0] = ec->errinfo;
+	SAVE_ROOT_JMPBUF(th, rb_ractor_terminate_all());
     }
     else {
 	switch (step) {
@@ -192,16 +257,18 @@ ruby_cleanup(volatile int ex)
 	}
 	if (ex == 0) ex = state;
     }
-    th->errinfo = errs[1];
-    sysex = error_handle(ex);
+    th = th0;
+    ec->errinfo = errs[1];
+    sysex = error_handle(ec, ex);
 
     state = 0;
     for (nerr = 0; nerr < numberof(errs); ++nerr) {
 	VALUE err = ATOMIC_VALUE_EXCHANGE(errs[nerr], Qnil);
+        VALUE sig;
 
 	if (!RTEST(err)) continue;
 
-	/* th->errinfo contains a NODE while break'ing */
+        /* ec->errinfo contains a NODE while break'ing */
 	if (THROW_DATA_P(err)) continue;
 
 	if (rb_obj_is_kind_of(err, rb_eSystemExit)) {
@@ -213,39 +280,45 @@ ruby_cleanup(volatile int ex)
 	    state = NUM2INT(sig);
 	    break;
 	}
+        else if (rb_obj_is_kind_of(err, rb_eSystemCallError) &&
+                 FIXNUM_P(sig = rb_attr_get(err, id_signo))) {
+	    state = NUM2INT(sig);
+	    break;
+        }
 	else if (sysex == EXIT_SUCCESS) {
 	    sysex = EXIT_FAILURE;
 	}
     }
 
-    ruby_finalize_1();
+    mjit_finish(true); // We still need ISeqs here.
+
+    rb_ec_finalize(ec);
 
     /* unlock again if finalizer took mutexes. */
-    rb_threadptr_unlock_all_locking_mutexes(GET_THREAD());
-    TH_POP_TAG();
+    rb_threadptr_unlock_all_locking_mutexes(th);
+    EC_POP_TAG();
     rb_thread_stop_timer_thread();
-    ruby_vm_destruct(GET_VM());
+    ruby_vm_destruct(th->vm);
     if (state) ruby_default_signal(state);
 
     return sysex;
 }
 
 static int
-ruby_exec_internal(void *n)
+rb_ec_exec_node(rb_execution_context_t *ec, void *n)
 {
     volatile int state;
     rb_iseq_t *iseq = (rb_iseq_t *)n;
-    rb_thread_t *th = GET_THREAD();
-
     if (!n) return 0;
 
-    TH_PUSH_TAG(th);
-    if ((state = EXEC_TAG()) == 0) {
+    EC_PUSH_TAG(ec);
+    if ((state = EC_EXEC_TAG()) == TAG_NONE) {
+        rb_thread_t *const th = rb_ec_thread_ptr(ec);
 	SAVE_ROOT_JMPBUF(th, {
 	    rb_iseq_eval_main(iseq);
 	});
     }
-    TH_POP_TAG();
+    EC_POP_TAG();
     return state;
 }
 
@@ -292,12 +365,14 @@ ruby_executable_node(void *n, int *status)
 int
 ruby_run_node(void *n)
 {
+    rb_execution_context_t *ec = GET_EC();
     int status;
     if (!ruby_executable_node(n, &status)) {
-	ruby_cleanup(0);
+        rb_ec_cleanup(ec, 0);
 	return status;
     }
-    return ruby_cleanup(ruby_exec_node(n));
+    ruby_init_stack((void *)&status);
+    return rb_ec_cleanup(ec, rb_ec_exec_node(ec, n));
 }
 
 /*! Runs the given compiled source */
@@ -305,7 +380,7 @@ int
 ruby_exec_node(void *n)
 {
     ruby_init_stack((void *)&n);
-    return ruby_exec_internal(n);
+    return rb_ec_exec_node(GET_EC(), n);
 }
 
 /*
@@ -324,7 +399,7 @@ ruby_exec_node(void *n)
  */
 
 static VALUE
-rb_mod_nesting(void)
+rb_mod_nesting(VALUE _)
 {
     VALUE ary = rb_ary_new();
     const rb_cref_t *cref = rb_vm_cref();
@@ -392,11 +467,16 @@ rb_mod_s_constants(int argc, VALUE *argv, VALUE mod)
     return rb_const_list(data);
 }
 
+/*!
+ * Asserts that \a klass is not a frozen class.
+ * \param[in] klass a \c Module object
+ * \exception RuntimeError if \a klass is not a class or frozen.
+ * \ingroup class
+ */
 void
-rb_frozen_class_p(VALUE klass)
+rb_class_modify_check(VALUE klass)
 {
     if (SPECIAL_CONST_P(klass)) {
-      noclass:
 	Check_Type(klass, T_CLASS);
     }
     if (OBJ_FROZEN(klass)) {
@@ -414,6 +494,8 @@ rb_frozen_class_p(VALUE klass)
 		  case T_CLASS:
 		    desc = "Class";
 		    break;
+                  default:
+                    break;
 		}
 	    }
 	}
@@ -427,21 +509,22 @@ rb_frozen_class_p(VALUE klass)
 		desc = "class";
 		break;
 	      default:
-		goto noclass;
+                Check_Type(klass, T_CLASS);
+                UNREACHABLE;
 	    }
 	}
-	rb_error_frozen(desc);
+        rb_frozen_error_raise(klass, "can't modify frozen %s: %"PRIsVALUE, desc, klass);
     }
 }
 
-NORETURN(static void rb_longjmp(int, volatile VALUE, VALUE));
+NORETURN(static void rb_longjmp(rb_execution_context_t *, int, volatile VALUE, VALUE));
 static VALUE get_errinfo(void);
-static VALUE get_thread_errinfo(rb_thread_t *th);
+#define get_ec_errinfo(ec) rb_ec_get_errinfo(ec)
 
 static VALUE
 exc_setup_cause(VALUE exc, VALUE cause)
 {
-#if SUPPORT_JOKE
+#if OPT_SUPPORT_JOKE
     if (NIL_P(cause)) {
 	ID id_true_cause;
 	CONST_ID(id_true_cause, "true_cause");
@@ -457,80 +540,104 @@ exc_setup_cause(VALUE exc, VALUE cause)
 #endif
     if (!NIL_P(cause) && cause != exc) {
 	rb_ivar_set(exc, id_cause, cause);
+	if (!rb_ivar_defined(cause, id_cause)) {
+	    rb_ivar_set(cause, id_cause, Qnil);
+	}
     }
     return exc;
 }
 
-static inline int
-sysstack_error_p(VALUE exc)
-{
-    return exc == sysstack_error || (!SPECIAL_CONST_P(exc) && RBASIC_CLASS(exc) == rb_eSysStackError);
-}
-
-static void
-setup_exception(rb_thread_t *th, int tag, volatile VALUE mesg, VALUE cause)
+static inline VALUE
+exc_setup_message(const rb_execution_context_t *ec, VALUE mesg, VALUE *cause)
 {
-    VALUE e;
-    const char *file = 0;
-    int line;
     int nocause = 0;
+    int nocircular = 0;
 
     if (NIL_P(mesg)) {
-	mesg = th->errinfo;
-	if (INTERNAL_EXCEPTION_P(mesg)) TH_JUMP_TAG(th, TAG_FATAL);
+	mesg = ec->errinfo;
+	if (INTERNAL_EXCEPTION_P(mesg)) EC_JUMP_TAG(ec, TAG_FATAL);
 	nocause = 1;
     }
     if (NIL_P(mesg)) {
 	mesg = rb_exc_new(rb_eRuntimeError, 0, 0);
 	nocause = 0;
+        nocircular = 1;
     }
-    if (cause != Qundef) {
-	exc_setup_cause(mesg, cause);
+    if (*cause == Qundef) {
+	if (nocause) {
+	    *cause = Qnil;
+            nocircular = 1;
+	}
+	else if (!rb_ivar_defined(mesg, id_cause)) {
+	    *cause = get_ec_errinfo(ec);
+	}
+        else {
+            nocircular = 1;
+        }
     }
-    else if (nocause) {
-	exc_setup_cause(mesg, Qnil);
+    else if (!NIL_P(*cause) && !rb_obj_is_kind_of(*cause, rb_eException)) {
+        rb_raise(rb_eTypeError, "exception object expected");
     }
-    else if (!rb_ivar_defined(mesg, id_cause)) {
-	exc_setup_cause(mesg, get_thread_errinfo(th));
+
+    if (!nocircular && !NIL_P(*cause) && *cause != Qundef && *cause != mesg) {
+        VALUE c = *cause;
+        while (!NIL_P(c = rb_attr_get(c, id_cause))) {
+            if (c == mesg) {
+                rb_raise(rb_eArgError, "circular causes");
+            }
+        }
     }
+    return mesg;
+}
 
-    file = rb_source_loc(&line);
-    if (file && !NIL_P(mesg)) {
-	VALUE at;
-	if (sysstack_error_p(mesg)) {
-	    if (NIL_P(rb_attr_get(mesg, idBt))) {
-		at = rb_vm_backtrace_object();
-		if (mesg == sysstack_error) {
-		    mesg = ruby_vm_sysstack_error_copy();
+static void
+setup_exception(rb_execution_context_t *ec, int tag, volatile VALUE mesg, VALUE cause)
+{
+    VALUE e;
+    int line;
+    const char *file = rb_source_location_cstr(&line);
+    const char *const volatile file0 = file;
+
+    if ((file && !NIL_P(mesg)) || (cause != Qundef))  {
+	volatile int state = 0;
+
+	EC_PUSH_TAG(ec);
+	if (EC_EXEC_TAG() == TAG_NONE && !(state = rb_ec_set_raised(ec))) {
+	    VALUE bt = rb_get_backtrace(mesg);
+	    if (!NIL_P(bt) || cause == Qundef) {
+		if (OBJ_FROZEN(mesg)) {
+		    mesg = rb_obj_dup(mesg);
 		}
-		rb_ivar_set(mesg, idBt, at);
-		rb_ivar_set(mesg, idBt_locations, at);
 	    }
-	}
-	else if (NIL_P(get_backtrace(mesg))) {
-	    at = rb_vm_backtrace_object();
-	    if (OBJ_FROZEN(mesg)) {
-		mesg = rb_obj_dup(mesg);
+            if (cause != Qundef && !THROW_DATA_P(cause)) {
+		exc_setup_cause(mesg, cause);
+	    }
+	    if (NIL_P(bt)) {
+		VALUE at = rb_ec_backtrace_object(ec);
+		rb_ivar_set(mesg, idBt_locations, at);
+		set_backtrace(mesg, at);
 	    }
-	    rb_ivar_set(mesg, idBt_locations, at);
-	    set_backtrace(mesg, at);
+	    rb_ec_reset_raised(ec);
 	}
+	EC_POP_TAG();
+        file = file0;
+	if (state) goto fatal;
     }
 
     if (!NIL_P(mesg)) {
-	th->errinfo = mesg;
+	ec->errinfo = mesg;
     }
 
-    if (RTEST(ruby_debug) && !NIL_P(e = th->errinfo) &&
+    if (RTEST(ruby_debug) && !NIL_P(e = ec->errinfo) &&
 	!rb_obj_is_kind_of(e, rb_eSystemExit)) {
-	int status;
+	enum ruby_tag_type state;
 
 	mesg = e;
-	TH_PUSH_TAG(th);
-	if ((status = EXEC_TAG()) == 0) {
-	    th->errinfo = Qnil;
+	EC_PUSH_TAG(ec);
+	if ((state = EC_EXEC_TAG()) == TAG_NONE) {
+	    ec->errinfo = Qnil;
 	    e = rb_obj_as_string(mesg);
-	    th->errinfo = mesg;
+	    ec->errinfo = mesg;
 	    if (file && line) {
 		e = rb_sprintf("Exception `%"PRIsVALUE"' at %s:%d - %"PRIsVALUE"\n",
 			       rb_obj_class(mesg), file, line, e);
@@ -545,64 +652,98 @@ setup_exception(rb_thread_t *th, int tag, volatile VALUE mesg, VALUE cause)
 	    }
 	    warn_print_str(e);
 	}
-	TH_POP_TAG();
-	if (status == TAG_FATAL && th->errinfo == exception_error) {
-	    th->errinfo = mesg;
+	EC_POP_TAG();
+	if (state == TAG_FATAL && ec->errinfo == exception_error) {
+	    ec->errinfo = mesg;
 	}
-	else if (status) {
-	    rb_threadptr_reset_raised(th);
-	    TH_JUMP_TAG(th, status);
+	else if (state) {
+	    rb_ec_reset_raised(ec);
+	    EC_JUMP_TAG(ec, state);
 	}
     }
 
-    if (rb_threadptr_set_raised(th)) {
-	th->errinfo = exception_error;
-	rb_threadptr_reset_raised(th);
-	TH_JUMP_TAG(th, TAG_FATAL);
+    if (rb_ec_set_raised(ec)) {
+        goto fatal;
     }
 
     if (tag != TAG_FATAL) {
-	RUBY_DTRACE_HOOK(RAISE, rb_obj_classname(th->errinfo));
-	EXEC_EVENT_HOOK(th, RUBY_EVENT_RAISE, th->cfp->self, 0, 0, mesg);
+	RUBY_DTRACE_HOOK(RAISE, rb_obj_classname(ec->errinfo));
+	EXEC_EVENT_HOOK(ec, RUBY_EVENT_RAISE, ec->cfp->self, 0, 0, 0, mesg);
+    }
+    return;
+
+  fatal:
+    ec->errinfo = exception_error;
+    rb_ec_reset_raised(ec);
+    EC_JUMP_TAG(ec, TAG_FATAL);
+}
+
+/*! \private */
+void
+rb_ec_setup_exception(const rb_execution_context_t *ec, VALUE mesg, VALUE cause)
+{
+    if (cause == Qundef) {
+	cause = get_ec_errinfo(ec);
+    }
+    if (cause != mesg) {
+	rb_ivar_set(mesg, id_cause, cause);
     }
 }
 
 static void
-rb_longjmp(int tag, volatile VALUE mesg, VALUE cause)
+rb_longjmp(rb_execution_context_t *ec, int tag, volatile VALUE mesg, VALUE cause)
 {
-    rb_thread_t *th = GET_THREAD();
-    setup_exception(th, tag, mesg, cause);
-    rb_thread_raised_clear(th);
-    TH_JUMP_TAG(th, tag);
+    mesg = exc_setup_message(ec, mesg, &cause);
+    setup_exception(ec, tag, mesg, cause);
+    rb_ec_raised_clear(ec);
+    EC_JUMP_TAG(ec, tag);
 }
 
 static VALUE make_exception(int argc, const VALUE *argv, int isstr);
 
+/*!
+ * Raises an exception in the current thread.
+ * \param[in] mesg an Exception class or an \c Exception object.
+ * \exception always raises an instance of the given exception class or
+ *   the given \c Exception object.
+ * \ingroup exception
+ */
 void
 rb_exc_raise(VALUE mesg)
 {
     if (!NIL_P(mesg)) {
 	mesg = make_exception(1, &mesg, FALSE);
     }
-    rb_longjmp(TAG_RAISE, mesg, Qundef);
+    rb_longjmp(GET_EC(), TAG_RAISE, mesg, Qundef);
 }
 
+/*!
+ * Raises a fatal error in the current thread.
+ *
+ * Same as rb_exc_raise() but raises a fatal error, which Ruby codes
+ * cannot rescue.
+ * \ingroup exception
+ */
 void
 rb_exc_fatal(VALUE mesg)
 {
     if (!NIL_P(mesg)) {
 	mesg = make_exception(1, &mesg, FALSE);
     }
-    rb_longjmp(TAG_FATAL, mesg, Qnil);
+    rb_longjmp(GET_EC(), TAG_FATAL, mesg, Qnil);
 }
 
+/*!
+ * Raises an \c Interrupt exception.
+ * \ingroup exception
+ */
 void
 rb_interrupt(void)
 {
-    rb_raise(rb_eInterrupt, "%s", "");
+    rb_exc_raise(rb_exc_new(rb_eInterrupt, 0, 0));
 }
 
-enum {raise_opt_cause, raise_max_opt};
+enum {raise_opt_cause, raise_max_opt}; /*< \private */
 
 static int
 extract_raise_opts(int argc, const VALUE *argv, VALUE *opts)
@@ -626,156 +767,196 @@ extract_raise_opts(int argc, const VALUE *argv, VALUE *opts)
     return argc;
 }
 
+VALUE
+rb_f_raise(int argc, VALUE *argv)
+{
+    VALUE err;
+    VALUE opts[raise_max_opt], *const cause = &opts[raise_opt_cause];
+
+    argc = extract_raise_opts(argc, argv, opts);
+    if (argc == 0) {
+        if (*cause != Qundef) {
+            rb_raise(rb_eArgError, "only cause is given with no arguments");
+        }
+        err = get_errinfo();
+        if (!NIL_P(err)) {
+            argc = 1;
+            argv = &err;
+        }
+    }
+    rb_raise_jump(rb_make_exception(argc, argv), *cause);
+
+    UNREACHABLE_RETURN(Qnil);
+}
+
 /*
  *  call-seq:
  *     raise
- *     raise(string)
- *     raise(exception [, string [, array]])
+ *     raise(string, cause: $!)
+ *     raise(exception [, string [, array]], cause: $!)
  *     fail
- *     fail(string)
- *     fail(exception [, string [, array]])
+ *     fail(string, cause: $!)
+ *     fail(exception [, string [, array]], cause: $!)
  *
  *  With no arguments, raises the exception in <code>$!</code> or raises
- *  a <code>RuntimeError</code> if <code>$!</code> is +nil+.
- *  With a single +String+ argument, raises a
- *  +RuntimeError+ with the string as a message. Otherwise,
- *  the first parameter should be the name of an +Exception+
- *  class (or an object that returns an +Exception+ object when sent
- *  an +exception+ message). The optional second parameter sets the
- *  message associated with the exception, and the third parameter is an
- *  array of callback information. Exceptions are caught by the
- *  +rescue+ clause of <code>begin...end</code> blocks.
+ *  a RuntimeError if <code>$!</code> is +nil+.  With a single +String+
+ *  argument, raises a +RuntimeError+ with the string as a message. Otherwise,
+ *  the first parameter should be an +Exception+ class (or another
+ *  object that returns an +Exception+ object when sent an +exception+
+ *  message).  The optional second parameter sets the message associated with
+ *  the exception (accessible via Exception#message), and the third parameter
+ *  is an array of callback information (accessible via Exception#backtrace).
+ *  The +cause+ of the generated exception (accessible via Exception#cause)
+ *  is automatically set to the "current" exception (<code>$!</code>), if any.
+ *  An alternative value, either an +Exception+ object or +nil+, can be
+ *  specified via the +:cause+ argument.
+ *
+ *  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)
+f_raise(int c, VALUE *v, VALUE _)
 {
-    VALUE err;
-    VALUE opts[raise_max_opt], *const cause = &opts[raise_opt_cause];
-
-    argc = extract_raise_opts(argc, argv, opts);
-    if (argc == 0) {
-	if (*cause != Qundef) {
-	    rb_raise(rb_eArgError, "only cause is given with no arguments");
-	}
-	err = get_errinfo();
-	if (!NIL_P(err)) {
-	    argc = 1;
-	    argv = &err;
-	}
-    }
-    rb_raise_jump(rb_make_exception(argc, argv), *cause);
-
-    UNREACHABLE;
+    return rb_f_raise(c, v);
 }
 
 static VALUE
 make_exception(int argc, const VALUE *argv, int isstr)
 {
     VALUE mesg, exc;
-    int n;
 
     mesg = Qnil;
     switch (argc) {
       case 0:
-	break;
+        return Qnil;
       case 1:
 	exc = argv[0];
-	if (NIL_P(exc))
-	    break;
-	if (isstr) {
+        if (isstr &&! NIL_P(exc)) {
 	    mesg = rb_check_string_type(exc);
 	    if (!NIL_P(mesg)) {
-		mesg = rb_exc_new3(rb_eRuntimeError, mesg);
-		break;
+                return rb_exc_new3(rb_eRuntimeError, mesg);
 	    }
 	}
-	n = 0;
-	goto exception_call;
 
       case 2:
       case 3:
-	exc = argv[0];
-	n = 1;
-      exception_call:
-	if (sysstack_error_p(exc)) return exc;
-	mesg = rb_check_funcall(exc, idException, n, argv+1);
-	if (mesg == Qundef) {
-	    rb_raise(rb_eTypeError, "exception class/object expected");
-	}
 	break;
       default:
-	rb_check_arity(argc, 0, 3);
-	break;
+        rb_error_arity(argc, 0, 3);
     }
-    if (argc > 0) {
-	if (!rb_obj_is_kind_of(mesg, rb_eException))
-	    rb_raise(rb_eTypeError, "exception object expected");
-	if (argc > 2)
-	    set_backtrace(mesg, argv[2]);
+    if (NIL_P(mesg)) {
+        mesg = rb_check_funcall(argv[0], idException, argc != 1, &argv[1]);
+    }
+    if (mesg == Qundef) {
+        rb_raise(rb_eTypeError, "exception class/object expected");
+    }
+    if (!rb_obj_is_kind_of(mesg, rb_eException)) {
+        rb_raise(rb_eTypeError, "exception object expected");
+    }
+    if (argc == 3) {
+        set_backtrace(mesg, argv[2]);
     }
 
     return mesg;
 }
 
+/*!
+ * Make an \c Exception object from the list of arguments in a manner
+ * similar to \c Kernel\#raise.
+ *
+ * \param[in] argc the number of arguments
+ * \param[in] argv a pointer to the array of arguments.
+ *
+ * The first form of this function takes a \c String argument. Then
+ * it returns a \c RuntimeError whose error message is the given value.
+ *
+ * The second from of this function takes an \c Exception object. Then
+ * it just returns the given value.
+ *
+ * The last form takes an exception class, an optional error message and
+ * an optional array of backtrace. Then it passes the optional arguments
+ * to \c #exception method of the exception class.
+ *
+ * \return the exception object, or \c Qnil if \c argc is 0.
+ * \ingroup exception
+ */
 VALUE
 rb_make_exception(int argc, const VALUE *argv)
 {
     return make_exception(argc, argv, TRUE);
 }
 
+/*! \private
+ * \todo can be static?
+ */
 void
 rb_raise_jump(VALUE mesg, VALUE cause)
 {
-    rb_thread_t *th = GET_THREAD();
-    const rb_control_frame_t *cfp = th->cfp;
+    rb_execution_context_t *ec = GET_EC();
+    const rb_control_frame_t *cfp = ec->cfp;
     const rb_callable_method_entry_t *me = rb_vm_frame_method_entry(cfp);
     VALUE klass = me->owner;
     VALUE self = cfp->self;
     ID mid = me->called_id;
 
-    th->cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(th->cfp);
-    EXEC_EVENT_HOOK(th, RUBY_EVENT_C_RETURN, self, mid, klass, Qnil);
+    rb_vm_pop_frame(ec);
+    EXEC_EVENT_HOOK(ec, RUBY_EVENT_C_RETURN, self, me->def->original_id, mid, klass, Qnil);
 
-    setup_exception(th, TAG_RAISE, mesg, cause);
-
-    rb_thread_raised_clear(th);
-    TH_JUMP_TAG(th, TAG_RAISE);
+    rb_longjmp(ec, TAG_RAISE, mesg, cause);
 }
 
+/*!
+ * Continues the exception caught by rb_protect() and rb_eval_string_protect().
+ *
+ * This function never return to the caller.
+ * \param[in] the value of \c *state which the protect function has set to the
+ *   their last parameter.
+ * \ingroup exception
+ */
 void
 rb_jump_tag(int tag)
 {
     if (UNLIKELY(tag < TAG_RETURN || tag > TAG_FATAL)) {
 	unknown_longjmp_status(tag);
     }
-    JUMP_TAG(tag);
+    EC_JUMP_TAG(GET_EC(), tag);
 }
 
+/*! Determines if the current method is given a block.
+ * \retval zero if not given
+ * \retval non-zero if given
+ * \ingroup defmethod
+ */
 int
 rb_block_given_p(void)
 {
-    rb_thread_t *th = GET_THREAD();
-
-    if (rb_vm_control_frame_block_ptr(th->cfp)) {
-	return TRUE;
+    if (rb_vm_frame_block_handler(GET_EC()->cfp) == VM_BLOCK_HANDLER_NONE) {
+	return FALSE;
     }
     else {
-	return FALSE;
+	return TRUE;
     }
 }
 
+int rb_vm_cframe_keyword_p(const rb_control_frame_t *cfp);
+
 int
-rb_iterator_p(void)
+rb_keyword_given_p(void)
 {
-    return rb_block_given_p();
+    return rb_vm_cframe_keyword_p(GET_EC()->cfp);
 }
 
 VALUE rb_eThreadError;
 
+/*! Declares that the current method needs a block.
+ *
+ * Raises a \c LocalJumpError if not given a block.
+ * \ingroup defmethod
+ */
 void
 rb_need_block(void)
 {
@@ -784,133 +965,217 @@ rb_need_block(void)
     }
 }
 
+/*! An equivalent of \c rescue clause.
+ *
+ * Equivalent to <code>begin .. rescue err_type .. end</code>
+ *
+ * \param[in] b_proc a function which potentially raises an exception.
+ * \param[in] data1 the argument of \a b_proc
+ * \param[in] r_proc a function which rescues an exception in \a b_proc.
+ * \param[in] data2 the first argument of \a r_proc
+ * \param[in] ... 1 or more exception classes. Must be terminated by \c (VALUE)0.
+ *
+ * First it calls the function \a b_proc, with \a data1 as the argument.
+ * When \a b_proc raises an exception, it calls \a r_proc with \a data2 and
+ * the exception object if the exception is a kind of one of the given
+ * exception classes.
+ *
+ * \return the return value of \a b_proc if no exception occurs,
+ *   or the return value of \a r_proc if otherwise.
+ * \sa rb_rescue
+ * \sa rb_ensure
+ * \sa rb_protect
+ * \ingroup exception
+ */
 VALUE
-rb_rescue2(VALUE (* b_proc) (ANYARGS), VALUE data1,
-	   VALUE (* r_proc) (ANYARGS), VALUE data2, ...)
+rb_rescue2(VALUE (* b_proc) (VALUE), VALUE data1,
+           VALUE (* r_proc) (VALUE, VALUE), VALUE data2, ...)
 {
-    int state;
-    rb_thread_t *th = GET_THREAD();
-    rb_control_frame_t *cfp = th->cfp;
+    va_list ap;
+    va_start(ap, data2);
+    VALUE ret = rb_vrescue2(b_proc, data1, r_proc, data2, ap);
+    va_end(ap);
+    return ret;
+}
+
+/*!
+ * \copydoc rb_rescue2
+ * \param[in] args exception classes, terminated by (VALUE)0.
+ */
+VALUE
+rb_vrescue2(VALUE (* b_proc) (VALUE), VALUE data1,
+            VALUE (* r_proc) (VALUE, VALUE), VALUE data2,
+            va_list args)
+{
+    enum ruby_tag_type state;
+    rb_execution_context_t * volatile ec = GET_EC();
+    rb_control_frame_t *volatile cfp = ec->cfp;
     volatile VALUE result = Qfalse;
-    volatile VALUE e_info = th->errinfo;
-    va_list args;
+    volatile VALUE e_info = ec->errinfo;
 
-    TH_PUSH_TAG(th);
-    if ((state = TH_EXEC_TAG()) == 0) {
+    EC_PUSH_TAG(ec);
+    if ((state = EC_EXEC_TAG()) == TAG_NONE) {
       retry_entry:
 	result = (*b_proc) (data1);
     }
     else if (result) {
 	/* escape from r_proc */
 	if (state == TAG_RETRY) {
-	    state = 0;
-	    th->errinfo = Qnil;
+	    state = TAG_NONE;
+	    ec->errinfo = Qnil;
 	    result = Qfalse;
 	    goto retry_entry;
 	}
     }
     else {
-	rb_vm_rewind_cfp(th, cfp);
+	rb_vm_rewind_cfp(ec, cfp);
 
 	if (state == TAG_RAISE) {
 	    int handle = FALSE;
 	    VALUE eclass;
+	    va_list ap;
 
-	    va_init_list(args, data2);
-	    while ((eclass = va_arg(args, VALUE)) != 0) {
-		if (rb_obj_is_kind_of(th->errinfo, eclass)) {
+	    result = Qnil;
+	    /* reuses args when raised again after retrying in r_proc */
+	    va_copy(ap, args);
+	    while ((eclass = va_arg(ap, VALUE)) != 0) {
+		if (rb_obj_is_kind_of(ec->errinfo, eclass)) {
 		    handle = TRUE;
 		    break;
 		}
 	    }
-	    va_end(args);
+	    va_end(ap);
 
 	    if (handle) {
-		result = Qnil;
-		state = 0;
+		state = TAG_NONE;
 		if (r_proc) {
-		    result = (*r_proc) (data2, th->errinfo);
+		    result = (*r_proc) (data2, ec->errinfo);
 		}
-		th->errinfo = e_info;
+		ec->errinfo = e_info;
 	    }
 	}
     }
-    TH_POP_TAG();
+    EC_POP_TAG();
     if (state)
-	TH_JUMP_TAG(th, state);
+	EC_JUMP_TAG(ec, state);
 
     return result;
 }
 
+/*! An equivalent of \c rescue clause.
+ *
+ * Equivalent to <code>begin .. rescue .. end</code>.
+ *
+ * It is same as
+ * \code{cpp}
+ * rb_rescue2(b_proc, data1, r_proc, data2, rb_eStandardError, (VALUE)0);
+ * \endcode
+ *
+ * \sa rb_rescue2
+ * \sa rb_ensure
+ * \sa rb_protect
+ * \ingroup exception
+ */
 VALUE
-rb_rescue(VALUE (* b_proc)(ANYARGS), VALUE data1,
-	  VALUE (* r_proc)(ANYARGS), VALUE data2)
+rb_rescue(VALUE (* b_proc)(VALUE), VALUE data1,
+          VALUE (* r_proc)(VALUE, VALUE), VALUE data2)
 {
     return rb_rescue2(b_proc, data1, r_proc, data2, rb_eStandardError,
 		      (VALUE)0);
 }
 
+/*! Protects a function call from potential global escapes from the function.
+ *
+ * Such global escapes include exceptions, \c Kernel\#throw, \c break in
+ * an iterator, for example.
+ * It first calls the function func with arg as the argument.
+ * If no exception occurred during func, it returns the result of func and
+ * *state is zero.
+ * Otherwise, it returns Qnil and sets *state to nonzero.
+ * If state is NULL, it is not set in both cases.
+ *
+ * You have to clear the error info with rb_set_errinfo(Qnil) when
+ * ignoring the caught exception.
+ * \ingroup exception
+ * \sa rb_rescue
+ * \sa rb_rescue2
+ * \sa rb_ensure
+ */
 VALUE
-rb_protect(VALUE (* proc) (VALUE), VALUE data, int * state)
+rb_protect(VALUE (* proc) (VALUE), VALUE data, int *pstate)
 {
     volatile VALUE result = Qnil;
-    volatile int status;
-    rb_thread_t *th = GET_THREAD();
-    rb_control_frame_t *cfp = th->cfp;
+    volatile enum ruby_tag_type state;
+    rb_execution_context_t * volatile ec = GET_EC();
+    rb_control_frame_t *volatile cfp = ec->cfp;
     struct rb_vm_protect_tag protect_tag;
     rb_jmpbuf_t org_jmpbuf;
 
-    protect_tag.prev = th->protect_tag;
+    protect_tag.prev = ec->protect_tag;
 
-    TH_PUSH_TAG(th);
-    th->protect_tag = &protect_tag;
-    MEMCPY(&org_jmpbuf, &(th)->root_jmpbuf, rb_jmpbuf_t, 1);
-    if ((status = TH_EXEC_TAG()) == 0) {
-	SAVE_ROOT_JMPBUF(th, result = (*proc) (data));
+    EC_PUSH_TAG(ec);
+    ec->protect_tag = &protect_tag;
+    MEMCPY(&org_jmpbuf, &rb_ec_thread_ptr(ec)->root_jmpbuf, rb_jmpbuf_t, 1);
+    if ((state = EC_EXEC_TAG()) == TAG_NONE) {
+	SAVE_ROOT_JMPBUF(rb_ec_thread_ptr(ec), result = (*proc) (data));
     }
     else {
-	rb_vm_rewind_cfp(th, cfp);
-    }
-    MEMCPY(&(th)->root_jmpbuf, &org_jmpbuf, rb_jmpbuf_t, 1);
-    th->protect_tag = protect_tag.prev;
-    TH_POP_TAG();
-
-    if (state) {
-	*state = status;
+	rb_vm_rewind_cfp(ec, cfp);
     }
+    MEMCPY(&rb_ec_thread_ptr(ec)->root_jmpbuf, &org_jmpbuf, rb_jmpbuf_t, 1);
+    ec->protect_tag = protect_tag.prev;
+    EC_POP_TAG();
 
+    if (pstate != NULL) *pstate = state;
     return result;
 }
 
+/*!
+ * An equivalent to \c ensure clause.
+ *
+ * Equivalent to <code>begin .. ensure .. end</code>.
+ *
+ * Calls the function \a b_proc with \a data1 as the argument,
+ * then calls \a e_proc with \a data2 when execution terminated.
+ * \return The return value of \a b_proc if no exception occurred,
+ *   or \c Qnil if otherwise.
+ * \sa rb_rescue
+ * \sa rb_rescue2
+ * \sa rb_protect
+ * \ingroup exception
+ */
 VALUE
-rb_ensure(VALUE (*b_proc)(ANYARGS), VALUE data1, VALUE (*e_proc)(ANYARGS), VALUE data2)
+rb_ensure(VALUE (*b_proc)(VALUE), VALUE data1, VALUE (*e_proc)(VALUE), VALUE data2)
 {
     int state;
     volatile VALUE result = Qnil;
-    volatile VALUE errinfo;
-    rb_thread_t *const th = GET_THREAD();
+    VALUE errinfo;
+    rb_execution_context_t * volatile ec = GET_EC();
     rb_ensure_list_t ensure_list;
     ensure_list.entry.marker = 0;
     ensure_list.entry.e_proc = e_proc;
     ensure_list.entry.data2 = data2;
-    ensure_list.next = th->ensure_list;
-    th->ensure_list = &ensure_list;
-    TH_PUSH_TAG(th);
-    if ((state = EXEC_TAG()) == 0) {
+    ensure_list.next = ec->ensure_list;
+    ec->ensure_list = &ensure_list;
+    EC_PUSH_TAG(ec);
+    if ((state = EC_EXEC_TAG()) == TAG_NONE) {
 	result = (*b_proc) (data1);
     }
-    TH_POP_TAG();
-    errinfo = th->errinfo;
-    th->ensure_list=ensure_list.next;
+    EC_POP_TAG();
+    errinfo = ec->errinfo;
+    if (!NIL_P(errinfo) && !RB_TYPE_P(errinfo, T_OBJECT)) {
+	ec->errinfo = Qnil;
+    }
+    ec->ensure_list=ensure_list.next;
     (*ensure_list.entry.e_proc)(ensure_list.entry.data2);
-    th->errinfo = errinfo;
+    ec->errinfo = errinfo;
     if (state)
-	TH_JUMP_TAG(th, state);
+	EC_JUMP_TAG(ec, state);
     return result;
 }
 
 static ID
-frame_func_id(rb_control_frame_t *cfp)
+frame_func_id(const rb_control_frame_t *cfp)
 {
     const rb_callable_method_entry_t *me = rb_vm_frame_method_entry(cfp);
 
@@ -935,24 +1200,47 @@ frame_called_id(rb_control_frame_t *cfp)
     }
 }
 
+/*!
+ * The original name of the current method.
+ *
+ * The function returns the original name of the method even if
+ * an alias of the method is called.
+ * The function can also return 0 if it is not in a method. This
+ * case can happen in a toplevel of a source file, for example.
+ *
+ * \returns the ID of the name or 0
+ * \sa rb_frame_callee
+ * \ingroup defmethod
+ */
 ID
 rb_frame_this_func(void)
 {
-    return frame_func_id(GET_THREAD()->cfp);
+    return frame_func_id(GET_EC()->cfp);
 }
 
+/*!
+ * The name of the current method.
+ *
+ * The function returns the alias if an alias of the method is called.
+ * The function can also return 0 if it is not in a method. This
+ * case can happen in a toplevel of a source file, for example.
+ *
+ * \returns the ID of the name or 0.
+ * \sa rb_frame_this_func
+ * \ingroup defmethod
+ */
 ID
 rb_frame_callee(void)
 {
-    return frame_called_id(GET_THREAD()->cfp);
+    return frame_called_id(GET_EC()->cfp);
 }
 
 static rb_control_frame_t *
-previous_frame(rb_thread_t *th)
+previous_frame(const rb_execution_context_t *ec)
 {
-    rb_control_frame_t *prev_cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(th->cfp);
+    rb_control_frame_t *prev_cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(ec->cfp);
     /* check if prev_cfp can be accessible */
-    if ((void *)(th->stack + th->stack_size) == (void *)(prev_cfp)) {
+    if ((void *)(ec->vm_stack + ec->vm_stack_size) == (void *)(prev_cfp)) {
         return 0;
     }
     return prev_cfp;
@@ -961,7 +1249,7 @@ previous_frame(rb_thread_t *th)
 static ID
 prev_frame_callee(void)
 {
-    rb_control_frame_t *prev_cfp = previous_frame(GET_THREAD());
+    rb_control_frame_t *prev_cfp = previous_frame(GET_EC());
     if (!prev_cfp) return 0;
     return frame_called_id(prev_cfp);
 }
@@ -969,21 +1257,27 @@ prev_frame_callee(void)
 static ID
 prev_frame_func(void)
 {
-    rb_control_frame_t *prev_cfp = previous_frame(GET_THREAD());
+    rb_control_frame_t *prev_cfp = previous_frame(GET_EC());
     if (!prev_cfp) return 0;
     return frame_func_id(prev_cfp);
 }
 
+/*!
+ * \private
+ * Returns the ID of the last method in the call stack.
+ * \sa rb_frame_this_func
+ * \ingroup defmethod
+ */
 ID
 rb_frame_last_func(void)
 {
-    rb_thread_t *th = GET_THREAD();
-    rb_control_frame_t *cfp = th->cfp;
+    const rb_execution_context_t *ec = GET_EC();
+    const rb_control_frame_t *cfp = ec->cfp;
     ID mid;
 
     while (!(mid = frame_func_id(cfp)) &&
 	   (cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp),
-	    !RUBY_VM_CONTROL_FRAME_STACK_OVERFLOW_P(th, cfp)));
+	    !RUBY_VM_CONTROL_FRAME_STACK_OVERFLOW_P(ec, cfp)));
     return mid;
 }
 
@@ -992,11 +1286,11 @@ rb_frame_last_func(void)
  *     append_features(mod)   -> mod
  *
  *  When this module is included in another, Ruby calls
- *  <code>append_features</code> in this module, passing it the
- *  receiving module in _mod_. Ruby's default implementation is
- *  to add the constants, methods, and module variables of this module
- *  to _mod_ if this module has not already been added to
- *  _mod_ or one of its ancestors. See also <code>Module#include</code>.
+ *  #append_features in this module, passing it the receiving module
+ *  in _mod_. Ruby's default implementation is to add the constants,
+ *  methods, and module variables of this module to _mod_ if this
+ *  module has not already been added to _mod_ or one of its
+ *  ancestors. See also Module#include.
  */
 
 static VALUE
@@ -1014,7 +1308,7 @@ rb_mod_append_features(VALUE module, VALUE include)
  *  call-seq:
  *     include(module, ...)    -> self
  *
- *  Invokes <code>Module.append_features</code> on each parameter in reverse order.
+ *  Invokes Module.append_features on each parameter in reverse order.
  */
 
 static VALUE
@@ -1026,6 +1320,7 @@ rb_mod_include(int argc, VALUE *argv, VALUE module)
     CONST_ID(id_append_features, "append_features");
     CONST_ID(id_included, "included");
 
+    rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
     for (i = 0; i < argc; i++)
 	Check_Type(argv[i], T_MODULE);
     while (argc--) {
@@ -1040,11 +1335,11 @@ rb_mod_include(int argc, VALUE *argv, VALUE module)
  *     prepend_features(mod)   -> mod
  *
  *  When this module is prepended in another, Ruby calls
- *  <code>prepend_features</code> in this module, passing it the
- *  receiving module in _mod_. Ruby's default implementation is
- *  to overlay the constants, methods, and module variables of this module
- *  to _mod_ if this module has not already been added to
- *  _mod_ or one of its ancestors. See also <code>Module#prepend</code>.
+ *  #prepend_features in this module, passing it the receiving module
+ *  in _mod_. Ruby's default implementation is to overlay the
+ *  constants, methods, and module variables of this module to _mod_
+ *  if this module has not already been added to _mod_ or one of its
+ *  ancestors. See also Module#prepend.
  */
 
 static VALUE
@@ -1062,7 +1357,7 @@ rb_mod_prepend_features(VALUE module, VALUE prepend)
  *  call-seq:
  *     prepend(module, ...)    -> self
  *
- *  Invokes <code>Module.prepend_features</code> on each parameter in reverse order.
+ *  Invokes Module.prepend_features on each parameter in reverse order.
  */
 
 static VALUE
@@ -1073,6 +1368,8 @@ rb_mod_prepend(int argc, VALUE *argv, VALUE module)
 
     CONST_ID(id_prepend_features, "prepend_features");
     CONST_ID(id_prepended, "prepended");
+
+    rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
     for (i = 0; i < argc; i++)
 	Check_Type(argv[i], T_MODULE);
     while (argc--) {
@@ -1082,6 +1379,16 @@ rb_mod_prepend(int argc, VALUE *argv, VALUE module)
     return module;
 }
 
+static void
+ensure_class_or_module(VALUE obj)
+{
+    if (!RB_TYPE_P(obj, T_CLASS) && !RB_TYPE_P(obj, T_MODULE)) {
+	rb_raise(rb_eTypeError,
+		 "wrong argument type %"PRIsVALUE" (expected Class or Module)",
+		 rb_obj_class(obj));
+    }
+}
+
 static VALUE
 hidden_identity_hash_new(void)
 {
@@ -1091,12 +1398,28 @@ hidden_identity_hash_new(void)
     return hash;
 }
 
+static VALUE
+refinement_superclass(VALUE superclass)
+{
+    if (RB_TYPE_P(superclass, T_MODULE)) {
+	/* FIXME: Should ancestors of superclass be used here? */
+        return rb_include_class_new(RCLASS_ORIGIN(superclass), rb_cBasicObject);
+    }
+    else {
+	return superclass;
+    }
+}
+
+/*!
+ * \private
+ * \todo can be static?
+ */
 void
 rb_using_refinement(rb_cref_t *cref, VALUE klass, VALUE module)
 {
     VALUE iclass, c, superclass = klass;
 
-    Check_Type(klass, T_CLASS);
+    ensure_class_or_module(klass);
     Check_Type(module, T_MODULE);
     if (NIL_P(CREF_REFINEMENTS(cref))) {
 	CREF_REFINEMENTS_SET(cref, hidden_identity_hash_new());
@@ -1118,18 +1441,18 @@ rb_using_refinement(rb_cref_t *cref, VALUE klass, VALUE module)
 	}
     }
     FL_SET(module, RMODULE_IS_OVERLAID);
+    superclass = refinement_superclass(superclass);
     c = iclass = rb_include_class_new(module, superclass);
-    RCLASS_REFINED_CLASS(c) = klass;
+    RB_OBJ_WRITE(c, &RCLASS_REFINED_CLASS(c), klass);
 
-    RCLASS_M_TBL(OBJ_WB_UNPROTECT(c)) =
-      RCLASS_M_TBL(OBJ_WB_UNPROTECT(module)); /* TODO: check unprotecting */
+    RCLASS_M_TBL(c) = RCLASS_M_TBL(module);
 
     module = RCLASS_SUPER(module);
     while (module && module != klass) {
 	FL_SET(module, RMODULE_IS_OVERLAID);
 	c = RCLASS_SET_SUPER(c, rb_include_class_new(module, RCLASS_SUPER(c)));
-	RCLASS_REFINED_CLASS(c) = klass;
-	module = RCLASS_SUPER(module);
+        RB_OBJ_WRITE(c, &RCLASS_REFINED_CLASS(c), klass);
+        module = RCLASS_SUPER(module);
     }
     rb_hash_aset(CREF_REFINEMENTS(cref), klass, iclass);
 }
@@ -1173,14 +1496,19 @@ using_module_recursive(const rb_cref_t *cref, VALUE klass)
     rb_hash_foreach(refinements, using_refinement, (VALUE) cref);
 }
 
+/*!
+ * \private
+ * \todo can be static?
+ */
 void
 rb_using_module(const rb_cref_t *cref, VALUE module)
 {
     Check_Type(module, T_MODULE);
     using_module_recursive(cref, module);
-    rb_clear_method_cache_by_class(rb_cObject);
+    rb_clear_method_cache_all();
 }
 
+/*! \private */
 VALUE
 rb_refinement_module_get_refined_class(VALUE module)
 {
@@ -1207,13 +1535,14 @@ add_activated_refinement(VALUE activated_refinements,
 	}
     }
     FL_SET(refinement, RMODULE_IS_OVERLAID);
+    superclass = refinement_superclass(superclass);
     c = iclass = rb_include_class_new(refinement, superclass);
-    RCLASS_REFINED_CLASS(c) = klass;
+    RB_OBJ_WRITE(c, &RCLASS_REFINED_CLASS(c), klass);
     refinement = RCLASS_SUPER(refinement);
     while (refinement && refinement != klass) {
 	FL_SET(refinement, RMODULE_IS_OVERLAID);
 	c = RCLASS_SET_SUPER(c, rb_include_class_new(refinement, RCLASS_SUPER(c)));
-	RCLASS_REFINED_CLASS(c) = klass;
+        RB_OBJ_WRITE(c, &RCLASS_REFINED_CLASS(c), klass);
 	refinement = RCLASS_SUPER(refinement);
     }
     rb_hash_aset(activated_refinements, klass, iclass);
@@ -1221,11 +1550,11 @@ add_activated_refinement(VALUE activated_refinements,
 
 /*
  *  call-seq:
- *     refine(klass) { block }   -> module
+ *     refine(mod) { block }   -> module
  *
- *  Refine <i>klass</i> in the receiver.
+ *  Refine <i>mod</i> in the receiver.
  *
- *  Returns an overlaid module.
+ *  Returns a module, where refined methods are defined.
  */
 
 static VALUE
@@ -1236,16 +1565,16 @@ rb_mod_refine(VALUE module, VALUE klass)
        id_refined_class, id_defined_at;
     VALUE refinements, activated_refinements;
     rb_thread_t *th = GET_THREAD();
-    rb_block_t *block = rb_vm_control_frame_block_ptr(th->cfp);
+    VALUE block_handler = rb_vm_frame_block_handler(th->ec->cfp);
 
-    if (!block) {
-        rb_raise(rb_eArgError, "no block given");
+    if (block_handler == VM_BLOCK_HANDLER_NONE) {
+	rb_raise(rb_eArgError, "no block given");
     }
-    if (block->proc) {
-        rb_raise(rb_eArgError,
-		 "can't pass a Proc as a block to Module#refine");
+    if (vm_block_handler_type(block_handler) != block_handler_type_iseq) {
+	rb_raise(rb_eArgError, "can't pass a Proc as a block to Module#refine");
     }
-    Check_Type(klass, T_CLASS);
+
+    ensure_class_or_module(klass);
     CONST_ID(id_refinements, "__refinements__");
     refinements = rb_attr_get(module, id_refinements);
     if (NIL_P(refinements)) {
@@ -1261,8 +1590,9 @@ rb_mod_refine(VALUE module, VALUE klass)
     }
     refinement = rb_hash_lookup(refinements, klass);
     if (NIL_P(refinement)) {
+	VALUE superclass = refinement_superclass(klass);
 	refinement = rb_module_new();
-	RCLASS_SET_SUPER(refinement, klass);
+	RCLASS_SET_SUPER(refinement, superclass);
 	FL_SET(refinement, RMODULE_IS_REFINEMENT);
 	CONST_ID(id_refined_class, "__refined_class__");
 	rb_ivar_set(refinement, id_refined_class, klass);
@@ -1279,6 +1609,7 @@ static void
 ignored_block(VALUE module, const char *klass)
 {
     const char *anon = "";
+    Check_Type(module, T_MODULE);
     if (!RTEST(rb_search_class_path(module))) {
 	anon = ", maybe for Module.new";
     }
@@ -1296,7 +1627,7 @@ ignored_block(VALUE module, const char *klass)
 static VALUE
 mod_using(VALUE self, VALUE module)
 {
-    rb_control_frame_t *prev_cfp = previous_frame(GET_THREAD());
+    rb_control_frame_t *prev_cfp = previous_frame(GET_EC());
 
     if (prev_frame_func()) {
 	rb_raise(rb_eRuntimeError,
@@ -1312,13 +1643,89 @@ mod_using(VALUE self, VALUE module)
     return self;
 }
 
+static int
+used_modules_i(VALUE _, VALUE mod, VALUE ary)
+{
+    ID id_defined_at;
+    CONST_ID(id_defined_at, "__defined_at__");
+    while (FL_TEST(rb_class_of(mod), RMODULE_IS_REFINEMENT)) {
+	rb_ary_push(ary, rb_attr_get(rb_class_of(mod), id_defined_at));
+	mod = RCLASS_SUPER(mod);
+    }
+    return ST_CONTINUE;
+}
+
+/*
+ *  call-seq:
+ *     used_modules -> array
+ *
+ *  Returns an array of all modules used in the current scope. The ordering
+ *  of modules in the resulting array is not defined.
+ *
+ *     module A
+ *       refine Object do
+ *       end
+ *     end
+ *
+ *     module B
+ *       refine Object do
+ *       end
+ *     end
+ *
+ *     using A
+ *     using B
+ *     p Module.used_modules
+ *
+ *  <em>produces:</em>
+ *
+ *     [B, A]
+ */
+static VALUE
+rb_mod_s_used_modules(VALUE _)
+{
+    const rb_cref_t *cref = rb_vm_cref();
+    VALUE ary = rb_ary_new();
+
+    while (cref) {
+	if (!NIL_P(CREF_REFINEMENTS(cref))) {
+	    rb_hash_foreach(CREF_REFINEMENTS(cref), used_modules_i, ary);
+	}
+	cref = CREF_NEXT(cref);
+    }
+
+    return rb_funcall(ary, rb_intern("uniq"), 0);
+}
+
+/*!
+ * Calls \c #initialize method of \a obj with the given arguments.
+ *
+ * It also forwards the given block to \c #initialize if given.
+ *
+ * \param[in] obj the receiver object
+ * \param[in] argc the number of arguments
+ * \param[in] argv a pointer to the array of arguments
+ * \ingroup object
+ */
 void
 rb_obj_call_init(VALUE obj, int argc, const VALUE *argv)
 {
-    PASS_PASSED_BLOCK();
-    rb_funcall2(obj, idInitialize, argc, argv);
+    PASS_PASSED_BLOCK_HANDLER();
+    rb_funcallv_kw(obj, idInitialize, argc, argv, RB_NO_KEYWORDS);
+}
+
+void
+rb_obj_call_init_kw(VALUE obj, int argc, const VALUE *argv, int kw_splat)
+{
+    PASS_PASSED_BLOCK_HANDLER();
+    rb_funcallv_kw(obj, idInitialize, argc, argv, kw_splat);
 }
 
+/*!
+ * Extend the object with the module.
+ *
+ * Same as \c Module\#extend_object.
+ * \ingroup class
+ */
 void
 rb_extend_object(VALUE obj, VALUE module)
 {
@@ -1331,7 +1738,7 @@ rb_extend_object(VALUE obj, VALUE module)
  *
  *  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>.
+ *  method used by Object#extend.
  *
  *     module Picky
  *       def Picky.extend_object(o)
@@ -1407,9 +1814,9 @@ 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.
+ *  Invokes Module.append_features on each parameter in turn.
+ *  Effectively adds the methods and constants in each module to the
+ *  receiver.
  */
 
 static VALUE
@@ -1429,14 +1836,14 @@ top_include(int argc, VALUE *argv, VALUE self)
  *     using(module)    -> self
  *
  *  Import class refinements from <i>module</i> into the scope where
- *  <code>using</code> is called.
+ *  #using is called.
  */
 
 static VALUE
 top_using(VALUE self, VALUE module)
 {
     const rb_cref_t *cref = rb_vm_cref();
-    rb_control_frame_t *prev_cfp = previous_frame(GET_THREAD());
+    rb_control_frame_t *prev_cfp = previous_frame(GET_EC());
 
     if (CREF_NEXT(cref) || (prev_cfp && rb_vm_frame_method_entry(prev_cfp))) {
 	rb_raise(rb_eRuntimeError, "main.using is permitted only at toplevel");
@@ -1448,21 +1855,21 @@ top_using(VALUE self, VALUE module)
     return self;
 }
 
-static VALUE *
-errinfo_place(rb_thread_t *th)
+static const VALUE *
+errinfo_place(const rb_execution_context_t *ec)
 {
-    rb_control_frame_t *cfp = th->cfp;
-    rb_control_frame_t *end_cfp = RUBY_VM_END_CONTROL_FRAME(th);
+    const rb_control_frame_t *cfp = ec->cfp;
+    const rb_control_frame_t *end_cfp = RUBY_VM_END_CONTROL_FRAME(ec);
 
     while (RUBY_VM_VALID_CONTROL_FRAME_P(cfp, end_cfp)) {
-	if (RUBY_VM_NORMAL_ISEQ_P(cfp->iseq)) {
+	if (VM_FRAME_RUBYFRAME_P(cfp)) {
 	    if (cfp->iseq->body->type == ISEQ_TYPE_RESCUE) {
-		return &cfp->ep[-2];
+		return &cfp->ep[VM_ENV_INDEX_LAST_LVAR];
 	    }
 	    else if (cfp->iseq->body->type == ISEQ_TYPE_ENSURE &&
-		     !THROW_DATA_P(cfp->ep[-2]) &&
-		     !FIXNUM_P(cfp->ep[-2])) {
-		return &cfp->ep[-2];
+		     !THROW_DATA_P(cfp->ep[VM_ENV_INDEX_LAST_LVAR]) &&
+		     !FIXNUM_P(cfp->ep[VM_ENV_INDEX_LAST_LVAR])) {
+		return &cfp->ep[VM_ENV_INDEX_LAST_LVAR];
 	    }
 	}
 	cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
@@ -1470,77 +1877,65 @@ errinfo_place(rb_thread_t *th)
     return 0;
 }
 
-static VALUE
-get_thread_errinfo(rb_thread_t *th)
+VALUE
+rb_ec_get_errinfo(const rb_execution_context_t *ec)
 {
-    VALUE *ptr = errinfo_place(th);
+    const VALUE *ptr = errinfo_place(ec);
     if (ptr) {
 	return *ptr;
     }
     else {
-	return th->errinfo;
+	return ec->errinfo;
     }
 }
 
 static VALUE
 get_errinfo(void)
 {
-    return get_thread_errinfo(GET_THREAD());
+    return get_ec_errinfo(GET_EC());
 }
 
 static VALUE
-errinfo_getter(ID id)
+errinfo_getter(ID id, VALUE *_)
 {
     return get_errinfo();
 }
 
-#if 0
-static void
-errinfo_setter(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 $!");
-    }
-    else {
-	VALUE *ptr = errinfo_place(GET_THREAD());
-	if (ptr) {
-	    *ptr = val;
-	}
-	else {
-	    rb_raise(rb_eRuntimeError, "errinfo_setter: not in rescue clause.");
-	}
-    }
-}
-#endif
-
+/*! The current exception in the current thread.
+ *
+ * Same as \c $! in Ruby.
+ * \return the current exception or \c Qnil
+ * \ingroup exception
+ */
 VALUE
 rb_errinfo(void)
 {
-    rb_thread_t *th = GET_THREAD();
-    return th->errinfo;
+    return GET_EC()->errinfo;
 }
 
+/*! Sets the current exception (\c $!) to the given value
+ *
+ * \param[in] err an \c Exception object or \c Qnil.
+ * \exception TypeError if \a err is neither an exception nor \c nil.
+ * \note this function does not raise the exception.
+ *   Use \c rb_raise() when you want to raise.
+ * \ingroup exception
+ */
 void
 rb_set_errinfo(VALUE err)
 {
     if (!NIL_P(err) && !rb_obj_is_kind_of(err, rb_eException)) {
 	rb_raise(rb_eTypeError, "assigning non-exception to $!");
     }
-    GET_THREAD()->errinfo = err;
-}
-
-VALUE
-rb_rubylevel_errinfo(void)
-{
-    return get_errinfo();
+    GET_EC()->errinfo = err;
 }
 
 static VALUE
-errat_getter(ID id)
+errat_getter(ID id, VALUE *_)
 {
     VALUE err = get_errinfo();
     if (!NIL_P(err)) {
-	return get_backtrace(err);
+	return rb_get_backtrace(err);
     }
     else {
 	return Qnil;
@@ -1568,7 +1963,7 @@ errat_setter(VALUE val, ID id, VALUE *var)
  */
 
 static VALUE
-rb_f_method_name(void)
+rb_f_method_name(VALUE _)
 {
     ID fname = prev_frame_func(); /* need *method* ID */
 
@@ -1590,7 +1985,7 @@ rb_f_method_name(void)
  */
 
 static VALUE
-rb_f_callee_name(void)
+rb_f_callee_name(VALUE _)
 {
     ID fname = prev_frame_callee(); /* need *callee* ID */
 
@@ -1613,7 +2008,7 @@ rb_f_callee_name(void)
  *
  */
 static VALUE
-f_current_dirname(void)
+f_current_dirname(VALUE _)
 {
     VALUE base = rb_current_realfilepath();
     if (NIL_P(base)) {
@@ -1623,16 +2018,82 @@ f_current_dirname(void)
     return base;
 }
 
+/*
+ *  call-seq:
+ *     global_variables    -> array
+ *
+ *  Returns an array of the names of global variables. This includes
+ *  special regexp global variables such as <tt>$~</tt> and <tt>$+</tt>,
+ *  but does not include the numbered regexp global variables (<tt>$1</tt>,
+ *  <tt>$2</tt>, etc.).
+ *
+ *     global_variables.grep /std/   #=> [:$stdin, :$stdout, :$stderr]
+ */
+
+static VALUE
+f_global_variables(VALUE _)
+{
+    return rb_f_global_variables();
+}
+
+/*
+ *  call-seq:
+ *     trace_var(symbol, cmd )             -> nil
+ *     trace_var(symbol) {|val| block }    -> nil
+ *
+ *  Controls tracing of assignments to global variables. The parameter
+ *  +symbol+ identifies the variable (as either a string name or a
+ *  symbol identifier). _cmd_ (which may be a string or a
+ *  +Proc+ object) or block is executed whenever the variable
+ *  is assigned. The block or +Proc+ object receives the
+ *  variable's new value as a parameter. Also see
+ *  Kernel::untrace_var.
+ *
+ *     trace_var :$_, proc {|v| puts "$_ is now '#{v}'" }
+ *     $_ = "hello"
+ *     $_ = ' there'
+ *
+ *  <em>produces:</em>
+ *
+ *     $_ is now 'hello'
+ *     $_ is now ' there'
+ */
+
+static VALUE
+f_trace_var(int c, const VALUE *a, VALUE _)
+{
+    return rb_f_trace_var(c, a);
+}
+
+/*
+ *  call-seq:
+ *     untrace_var(symbol [, cmd] )   -> array or nil
+ *
+ *  Removes tracing for the specified command on the given global
+ *  variable and returns +nil+. If no command is specified,
+ *  removes all tracing for that variable and returns an array
+ *  containing the commands actually removed.
+ */
+
+static VALUE
+f_untrace_var(int c, const VALUE *a, VALUE _)
+{
+    return rb_f_untrace_var(c, a);
+}
+
 void
 Init_eval(void)
 {
     rb_define_virtual_variable("$@", errat_getter, errat_setter);
     rb_define_virtual_variable("$!", errinfo_getter, 0);
 
-    rb_define_global_function("raise", rb_f_raise, -1);
-    rb_define_global_function("fail", rb_f_raise, -1);
+    rb_gvar_ractor_local("$@");
+    rb_gvar_ractor_local("$!");
+
+    rb_define_global_function("raise", f_raise, -1);
+    rb_define_global_function("fail", f_raise, -1);
 
-    rb_define_global_function("global_variables", rb_f_global_variables, 0);	/* in variable.c */
+    rb_define_global_function("global_variables", f_global_variables, 0);
 
     rb_define_global_function("__method__", rb_f_method_name, 0);
     rb_define_global_function("__callee__", rb_f_callee_name, 0);
@@ -1646,6 +2107,8 @@ Init_eval(void)
     rb_define_private_method(rb_cModule, "prepend_features", rb_mod_prepend_features, 1);
     rb_define_private_method(rb_cModule, "refine", rb_mod_refine, 1);
     rb_define_private_method(rb_cModule, "using", mod_using, 1);
+    rb_define_singleton_method(rb_cModule, "used_modules",
+			       rb_mod_s_used_modules, 0);
     rb_undef_method(rb_cClass, "refine");
 
     rb_undef_method(rb_cClass, "module_function");
@@ -1663,12 +2126,12 @@ Init_eval(void)
 
     rb_define_method(rb_mKernel, "extend", rb_obj_extend, -1);
 
-    rb_define_global_function("trace_var", rb_f_trace_var, -1);	/* in variable.c */
-    rb_define_global_function("untrace_var", rb_f_untrace_var, -1);	/* in variable.c */
+    rb_define_global_function("trace_var", f_trace_var, -1);
+    rb_define_global_function("untrace_var", f_untrace_var, -1);
 
     rb_vm_register_special_exception(ruby_error_reenter, rb_eFatal, "exception reentered");
+    rb_vm_register_special_exception(ruby_error_stackfatal, rb_eFatal, "machine stack overflow in critical region");
 
     id_signo = rb_intern_const("signo");
     id_status = rb_intern_const("status");
-    id_cause = rb_intern_const("cause");
 }
diff --git a/eval_error.c b/eval_error.c
index cfb82d3a24..841275eed0 100644
--- a/eval_error.c
+++ b/eval_error.c
@@ -3,6 +3,10 @@
  * included by eval.c
  */
 
+#define write_warn(str, x) \
+    (NIL_P(str) ? warn_print(x) : (void)rb_str_cat_cstr(str, x))
+#define write_warn2(str, x, l) \
+    (NIL_P(str) ? warn_print2(x, l) : (void)rb_str_cat(str, x, l))
 #ifdef HAVE_BUILTIN___BUILTIN_CONSTANT_P
 #define warn_print(x) RB_GNUC_EXTENSION_BLOCK(	\
     (__builtin_constant_p(x)) ? 		\
@@ -12,17 +16,20 @@
 #else
 #define warn_print(x) rb_write_error(x)
 #endif
+
 #define warn_print2(x,l) rb_write_error2((x),(l))
+
+#define write_warn_str(str,x) NIL_P(str) ? rb_write_error_str(x) : (void)rb_str_concat((str), (x))
 #define warn_print_str(x) rb_write_error_str(x)
 
 static VALUE error_pos_str(void);
 
 static void
-error_pos(void)
+error_pos(const VALUE str)
 {
-    VALUE str = error_pos_str();
-    if (!NIL_P(str)) {
-	warn_print_str(str);
+    VALUE pos = error_pos_str();
+    if (!NIL_P(pos)) {
+	write_warn_str(str, pos);
     }
 }
 
@@ -32,7 +39,7 @@ error_pos_str(void)
     int sourceline;
     VALUE sourcefile = rb_source_location(&sourceline);
 
-    if (sourcefile) {
+    if (!NIL_P(sourcefile)) {
 	ID caller_name;
 	if (sourceline == 0) {
 	    return rb_sprintf("%"PRIsVALUE": ", sourcefile);
@@ -49,23 +56,6 @@ error_pos_str(void)
     return Qnil;
 }
 
-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)
 {
@@ -80,131 +70,324 @@ set_backtrace(VALUE info, VALUE bt)
 	    bt = rb_backtrace_to_str_ary(bt);
 	}
     }
-    rb_funcall(info, rb_intern("set_backtrace"), 1, bt);
+    rb_check_funcall(info, set_backtrace, 1, &bt);
 }
 
 static void
-error_print(rb_thread_t *th)
+error_print(rb_execution_context_t *ec)
 {
-    rb_threadptr_error_print(th, th->errinfo);
+    rb_ec_error_print(ec, ec->errinfo);
 }
 
-void
-rb_threadptr_error_print(rb_thread_t *th, VALUE errinfo)
+static void
+write_warnq(VALUE out, VALUE str, const char *ptr, long len)
 {
-    volatile VALUE errat = Qundef;
-    int raised_flag = th->raised_flag;
-    volatile VALUE eclass = Qundef, e = Qundef;
-    const char *volatile einfo;
-    volatile long elen;
-    VALUE mesg;
-
-    if (NIL_P(errinfo))
-	return;
-    rb_thread_raised_clear(th);
-
-    TH_PUSH_TAG(th);
-    if (TH_EXEC_TAG() == 0) {
-	errat = get_backtrace(errinfo);
-    }
-    else if (errat == Qundef) {
-	errat = Qnil;
-    }
-    else if (eclass == Qundef || e != Qundef) {
-	goto error;
+    if (NIL_P(out)) {
+        const char *beg = ptr;
+        const long olen = len;
+        for (; len > 0; --len, ++ptr) {
+            unsigned char c = *ptr;
+            switch (c) {
+              case '\n': case '\t': continue;
+            }
+            if (rb_iscntrl(c)) {
+                char buf[5];
+                const char *cc = 0;
+                if (ptr > beg) rb_write_error2(beg, ptr - beg);
+                beg = ptr + 1;
+                cc = ruby_escaped_char(c);
+                if (cc) {
+                    rb_write_error2(cc, strlen(cc));
+                }
+                else {
+                    rb_write_error2(buf, snprintf(buf, sizeof(buf), "\\x%02X", c));
+                }
+            }
+            else if (c == '\\') {
+                rb_write_error2(beg, ptr - beg + 1);
+                beg = ptr;
+            }
+        }
+        if (ptr > beg) {
+            if (beg == RSTRING_PTR(str) && olen == RSTRING_LEN(str))
+                rb_write_error_str(str);
+            else
+                rb_write_error2(beg, ptr - beg);
+        }
     }
     else {
-	goto no_message;
-    }
-    if (NIL_P(errat) || RARRAY_LEN(errat) == 0 ||
-	NIL_P(mesg = RARRAY_AREF(errat, 0))) {
-	error_pos();
-    }
-    else {
-	warn_print_str(mesg);
-	warn_print(": ");
+        rb_str_cat(out, ptr, len);
     }
+}
 
-    eclass = CLASS_OF(errinfo);
-    if (eclass != Qundef &&
-	(e = rb_check_funcall(errinfo, rb_intern("message"), 0, 0)) != Qundef &&
-	(RB_TYPE_P(e, T_STRING) || !NIL_P(e = rb_check_string_type(e)))) {
-	einfo = RSTRING_PTR(e);
-	elen = RSTRING_LEN(e);
-    }
-    else {
-      no_message:
-	einfo = "";
-	elen = 0;
+#define CSI_BEGIN "\033["
+#define CSI_SGR "m"
+
+static const char underline[] = CSI_BEGIN"1;4"CSI_SGR;
+static const char bold[] = CSI_BEGIN"1"CSI_SGR;
+static const char reset[] = CSI_BEGIN""CSI_SGR;
+
+static void
+print_errinfo(const VALUE eclass, const VALUE errat, const VALUE emesg, const VALUE str, int highlight)
+{
+    const char *einfo = "";
+    long elen = 0;
+    VALUE mesg;
+
+    if (emesg != Qundef) {
+	if (NIL_P(errat) || RARRAY_LEN(errat) == 0 ||
+	    NIL_P(mesg = RARRAY_AREF(errat, 0))) {
+	    error_pos(str);
+	}
+	else {
+	    write_warn_str(str, mesg);
+	    write_warn(str, ": ");
+	}
+
+	if (!NIL_P(emesg)) {
+	    einfo = RSTRING_PTR(emesg);
+            elen = RSTRING_LEN(emesg);
+	}
     }
+
     if (eclass == rb_eRuntimeError && elen == 0) {
-	warn_print("unhandled exception\n");
+	if (highlight) write_warn(str, underline);
+	write_warn(str, "unhandled exception");
+	if (highlight) write_warn(str, reset);
+	write_warn2(str, "\n", 1);
     }
     else {
 	VALUE epath;
 
 	epath = rb_class_name(eclass);
 	if (elen == 0) {
-	    warn_print_str(epath);
-	    warn_print("\n");
+	    if (highlight) write_warn(str, underline);
+	    write_warn_str(str, epath);
+	    if (highlight) write_warn(str, reset);
+	    write_warn(str, "\n");
 	}
 	else {
+            /* emesg is a String instance */
 	    const char *tail = 0;
-	    long len = elen;
 
+            if (highlight) write_warn(str, bold);
 	    if (RSTRING_PTR(epath)[0] == '#')
 		epath = 0;
 	    if ((tail = memchr(einfo, '\n', elen)) != 0) {
-		len = tail - einfo;
+                write_warnq(str, emesg, einfo, tail - einfo);
 		tail++;		/* skip newline */
 	    }
-	    warn_print_str(tail ? rb_str_subseq(e, 0, len) : e);
+	    else {
+                write_warnq(str, emesg, einfo, elen);
+	    }
 	    if (epath) {
-		warn_print(" (");
-		warn_print_str(epath);
-		warn_print(")\n");
+		write_warn(str, " (");
+		if (highlight) write_warn(str, underline);
+                write_warn_str(str, epath);
+		if (highlight) {
+		    write_warn(str, reset);
+		    write_warn(str, bold);
+		}
+		write_warn2(str, ")", 1);
+		if (highlight) write_warn(str, reset);
+		write_warn2(str, "\n", 1);
+	    }
+	    if (tail && einfo+elen > tail) {
+		if (!highlight) {
+                    write_warnq(str, emesg, tail, einfo+elen-tail);
+		    if (einfo[elen-1] != '\n') write_warn2(str, "\n", 1);
+		}
+		else {
+		    elen -= tail - einfo;
+		    einfo = tail;
+		    while (elen > 0) {
+			tail = memchr(einfo, '\n', elen);
+			if (!tail || tail > einfo) {
+			    write_warn(str, bold);
+                            write_warnq(str, emesg, einfo, tail ? tail-einfo : elen);
+			    write_warn(str, reset);
+			    if (!tail) {
+				write_warn2(str, "\n", 1);
+				break;
+			    }
+			}
+			elen -= tail - einfo;
+			einfo = tail;
+			do ++tail; while (tail < einfo+elen && *tail == '\n');
+                        write_warnq(str, emesg, einfo, tail-einfo);
+			elen -= tail - einfo;
+			einfo = tail;
+		    }
+		}
 	    }
-	    if (tail) {
-		warn_print_str(rb_str_subseq(e, tail - einfo, elen - len - 1));
+	    else if (!epath) {
+		write_warn2(str, "\n", 1);
 	    }
-	    if (tail ? einfo[elen-1] != '\n' : !epath) warn_print2("\n", 1);
 	}
     }
+}
 
+static void
+print_backtrace(const VALUE eclass, const VALUE errat, const VALUE str, int reverse)
+{
     if (!NIL_P(errat)) {
 	long i;
 	long len = RARRAY_LEN(errat);
-        int skip = eclass == rb_eSysStackError;
+	const int threshold = 1000000000;
+        int width = (len <= 1) ? INT_MIN : ((int)log10((double)(len > threshold ?
+					 ((len - 1) / threshold) :
+					 len - 1)) +
+		     (len < threshold ? 0 : 9) + 1);
+
+        long skip_start = -1, skip_len = 0;
+
+        // skip for stackoverflow
+        if (eclass == rb_eSysStackError) {
+            long trace_head = 9;
+            long trace_tail = 4;
+            long trace_max = trace_head + trace_tail + 5;
+            if (len > trace_max) {
+                skip_start = trace_head;
+                skip_len = len - trace_max + 5;
+            }
+        }
 
-#define TRACE_MAX (TRACE_HEAD+TRACE_TAIL+5)
-#define TRACE_HEAD 8
-#define TRACE_TAIL 5
+        // skip for explicit limit
+        if (rb_backtrace_length_limit >= 0 && len > rb_backtrace_length_limit + 2) {
+            skip_start = rb_backtrace_length_limit + 1;
+            skip_len = len - skip_start;
+        }
 
 	for (i = 1; i < len; i++) {
-	    VALUE line = RARRAY_AREF(errat, i);
-	    if (RB_TYPE_P(line, T_STRING)) {
-		warn_print_str(rb_sprintf("\tfrom %"PRIsVALUE"\n", line));
+	    if (i == skip_start) {
+		write_warn_str(str, rb_sprintf("\t ... %ld levels...\n", skip_len));
+		i += skip_len;
+                if (i >= len) break;
 	    }
-	    if (skip && i == TRACE_HEAD && len > TRACE_MAX) {
-		warn_print_str(rb_sprintf("\t ... %ld levels...\n",
-					  len - TRACE_HEAD - TRACE_TAIL));
-		i = len - TRACE_TAIL;
+	    VALUE line = RARRAY_AREF(errat, reverse ? len - i : i);
+	    if (RB_TYPE_P(line, T_STRING)) {
+		VALUE bt = rb_str_new_cstr("\t");
+		if (reverse) rb_str_catf(bt, "%*ld: ", width, len - i);
+		write_warn_str(str, rb_str_catf(bt, "from %"PRIsVALUE"\n", line));
 	    }
 	}
     }
-  error:
-    TH_POP_TAG();
-    th->errinfo = errinfo;
-    rb_thread_raised_set(th, raised_flag);
+}
+
+VALUE rb_get_message(VALUE exc);
+
+static int
+shown_cause_p(VALUE cause, VALUE *shown_causes)
+{
+    VALUE shown = *shown_causes;
+    if (!shown) {
+        *shown_causes = shown = rb_obj_hide(rb_ident_hash_new());
+    }
+    if (rb_hash_has_key(shown, cause)) return TRUE;
+    rb_hash_aset(shown, cause, Qtrue);
+    return FALSE;
+}
+
+static void
+show_cause(VALUE errinfo, VALUE str, VALUE highlight, VALUE reverse, VALUE *shown_causes)
+{
+    VALUE cause = rb_attr_get(errinfo, id_cause);
+    if (!NIL_P(cause) && rb_obj_is_kind_of(cause, rb_eException) &&
+        !shown_cause_p(cause, shown_causes)) {
+        volatile VALUE eclass = CLASS_OF(cause);
+        VALUE errat = rb_get_backtrace(cause);
+        VALUE emesg = rb_get_message(cause);
+        if (reverse) {
+            show_cause(cause, str, highlight, reverse, shown_causes);
+            print_backtrace(eclass, errat, str, TRUE);
+            print_errinfo(eclass, errat, emesg, str, highlight!=0);
+        }
+        else {
+            print_errinfo(eclass, errat, emesg, str, highlight!=0);
+            print_backtrace(eclass, errat, str, FALSE);
+            show_cause(cause, str, highlight, reverse, shown_causes);
+        }
+    }
+}
+
+void
+rb_error_write(VALUE errinfo, VALUE emesg, VALUE errat, VALUE str, VALUE highlight, VALUE reverse)
+{
+    volatile VALUE eclass;
+    VALUE shown_causes = 0;
+
+    if (NIL_P(errinfo))
+	return;
+
+    if (errat == Qundef) {
+	errat = Qnil;
+    }
+    eclass = CLASS_OF(errinfo);
+    if (NIL_P(reverse)) reverse = Qfalse;
+    if (NIL_P(highlight)) {
+	VALUE tty = (VALUE)rb_stderr_tty_p();
+	if (NIL_P(highlight)) highlight = tty;
+    }
+    if (reverse) {
+	static const char traceback[] = "Traceback "
+	    "(most recent call last):\n";
+	const int bold_part = rb_strlen_lit("Traceback");
+	char buff[sizeof(traceback)+sizeof(bold)+sizeof(reset)-2], *p = buff;
+	const char *msg = traceback;
+	long len = sizeof(traceback) - 1;
+	if (highlight) {
+#define APPEND(s, l) (memcpy(p, s, l), p += (l))
+	    APPEND(bold, sizeof(bold)-1);
+	    APPEND(traceback, bold_part);
+	    APPEND(reset, sizeof(reset)-1);
+	    APPEND(traceback + bold_part, sizeof(traceback)-bold_part-1);
+#undef APPEND
+	    len = p - (msg = buff);
+	}
+	write_warn2(str, msg, len);
+        show_cause(errinfo, str, highlight, reverse, &shown_causes);
+	print_backtrace(eclass, errat, str, TRUE);
+	print_errinfo(eclass, errat, emesg, str, highlight!=0);
+    }
+    else {
+	print_errinfo(eclass, errat, emesg, str, highlight!=0);
+	print_backtrace(eclass, errat, str, FALSE);
+        show_cause(errinfo, str, highlight, reverse, &shown_causes);
+    }
 }
 
 void
-ruby_error_print(void)
+rb_ec_error_print(rb_execution_context_t * volatile ec, volatile VALUE errinfo)
 {
-    error_print(GET_THREAD());
+    volatile uint8_t raised_flag = ec->raised_flag;
+    volatile VALUE errat = Qundef;
+    volatile VALUE emesg = Qundef;
+    volatile bool written = false;
+
+    if (NIL_P(errinfo))
+	return;
+    rb_ec_raised_clear(ec);
+
+    EC_PUSH_TAG(ec);
+    if (EC_EXEC_TAG() == TAG_NONE) {
+	errat = rb_get_backtrace(errinfo);
+    }
+    if (emesg == Qundef) {
+	emesg = Qnil;
+	emesg = rb_get_message(errinfo);
+    }
+
+    if (!written) {
+        written = true;
+        rb_error_write(errinfo, emesg, errat, Qnil, Qnil, Qfalse);
+    }
+
+    EC_POP_TAG();
+    ec->errinfo = errinfo;
+    rb_ec_raised_set(ec, raised_flag);
 }
 
-#define undef_mesg_for(v, k) rb_fstring_cstr("undefined"v" method `%1$s' for "k" `%2$s'")
+#define undef_mesg_for(v, k) rb_fstring_lit("undefined"v" method `%1$s' for "k" `%2$s'")
 #define undef_mesg(v) ( \
 	is_mod ? \
 	undef_mesg_for(v, "module") : \
@@ -232,7 +415,7 @@ rb_print_undef_str(VALUE klass, VALUE name)
     rb_name_err_raise_str(undef_mesg(""), klass, name);
 }
 
-#define inaccessible_mesg_for(v, k) rb_fstring_cstr("method `%1$s' for "k" `%2$s' is "v)
+#define inaccessible_mesg_for(v, k) rb_fstring_lit("method `%1$s' for "k" `%2$s' is "v)
 #define inaccessible_mesg(v) ( \
 	is_mod ? \
 	inaccessible_mesg_for(v, "module") : \
@@ -264,12 +447,11 @@ sysexit_status(VALUE err)
     rb_bug("Unknown longjmp status %d", status)
 
 static int
-error_handle(int ex)
+error_handle(rb_execution_context_t *ec, int ex)
 {
     int status = EXIT_FAILURE;
-    rb_thread_t *th = GET_THREAD();
 
-    if (rb_threadptr_set_raised(th))
+    if (rb_ec_set_raised(ec))
 	return EXIT_FAILURE;
     switch (ex & TAG_MASK) {
       case 0:
@@ -277,32 +459,32 @@ error_handle(int ex)
 	break;
 
       case TAG_RETURN:
-	error_pos();
+	error_pos(Qnil);
 	warn_print("unexpected return\n");
 	break;
       case TAG_NEXT:
-	error_pos();
+	error_pos(Qnil);
 	warn_print("unexpected next\n");
 	break;
       case TAG_BREAK:
-	error_pos();
+	error_pos(Qnil);
 	warn_print("unexpected break\n");
 	break;
       case TAG_REDO:
-	error_pos();
+	error_pos(Qnil);
 	warn_print("unexpected redo\n");
 	break;
       case TAG_RETRY:
-	error_pos();
+	error_pos(Qnil);
 	warn_print("retry outside of rescue clause\n");
 	break;
       case TAG_THROW:
 	/* TODO: fix me */
-	error_pos();
+	error_pos(Qnil);
 	warn_print("unexpected throw\n");
 	break;
       case TAG_RAISE: {
-	VALUE errinfo = th->errinfo;
+	VALUE errinfo = ec->errinfo;
 	if (rb_obj_is_kind_of(errinfo, rb_eSystemExit)) {
 	    status = sysexit_status(errinfo);
 	}
@@ -310,18 +492,22 @@ error_handle(int ex)
 		 rb_ivar_get(errinfo, id_signo) != INT2FIX(SIGSEGV)) {
 	    /* no message when exiting by signal */
 	}
+        else if (rb_obj_is_kind_of(errinfo, rb_eSystemCallError) &&
+                 FIXNUM_P(rb_attr_get(errinfo, id_signo))) {
+	    /* no message when exiting by error to be mapped to signal */
+        }
 	else {
-	    error_print(th);
+	    rb_ec_error_print(ec, errinfo);
 	}
 	break;
       }
       case TAG_FATAL:
-	error_print(th);
+	error_print(ec);
 	break;
       default:
 	unknown_longjmp_status(ex);
 	break;
     }
-    rb_threadptr_reset_raised(th);
+    rb_ec_reset_raised(ec);
     return status;
 }
diff --git a/eval_intern.h b/eval_intern.h
index bb4b93bbd6..9fa9031189 100644
--- a/eval_intern.h
+++ b/eval_intern.h
@@ -5,13 +5,22 @@
 #include "vm_core.h"
 
 static inline void
-pass_passed_block(rb_thread_t *th)
+vm_passed_block_handler_set(rb_execution_context_t *ec, VALUE block_handler)
 {
-    th->passed_block = rb_vm_control_frame_block_ptr(th->cfp);
-    th->cfp->flag |= VM_FRAME_FLAG_PASSED;
+    vm_block_handler_verify(block_handler);
+    ec->passed_block_handler = block_handler;
 }
-#define PASS_PASSED_BLOCK_TH(th) pass_passed_block(th)
-#define PASS_PASSED_BLOCK() pass_passed_block(GET_THREAD())
+
+static inline void
+pass_passed_block_handler(rb_execution_context_t *ec)
+{
+    VALUE block_handler = rb_vm_frame_block_handler(ec->cfp);
+    vm_passed_block_handler_set(ec, block_handler);
+    VM_ENV_FLAGS_SET(ec->cfp->ep, VM_FRAME_FLAG_PASSED);
+}
+
+#define PASS_PASSED_BLOCK_HANDLER_EC(ec) pass_passed_block_handler(ec)
+#define PASS_PASSED_BLOCK_HANDLER() pass_passed_block_handler(GET_EC())
 
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
@@ -88,7 +97,7 @@ extern int select_large_fdset(int, fd_set *, fd_set *, fd_set *, struct timeval
 #define SAVE_ROOT_JMPBUF_AFTER_STMT \
     } \
     __except (GetExceptionCode() == EXCEPTION_STACK_OVERFLOW ? \
-	      (rb_thread_raised_set(GET_THREAD(), RAISED_STACKOVERFLOW), \
+	      (rb_ec_raised_set(GET_EC(), RAISED_STACKOVERFLOW), \
 	       raise(SIGSEGV), \
 	       EXCEPTION_EXECUTE_HANDLER) : \
 	      EXCEPTION_CONTINUE_SEARCH) { \
@@ -118,25 +127,28 @@ LONG WINAPI rb_w32_stack_overflow_handler(struct _EXCEPTION_POINTERS *);
       rb_fiber_start(); \
   } while (0)
 
-#define TH_PUSH_TAG(th) do { \
-  rb_thread_t * const _th = (th); \
+#define EC_PUSH_TAG(ec) do { \
+  rb_execution_context_t * const _ec = (ec); \
   struct rb_vm_tag _tag; \
-  _tag.tag = 0; \
-  _tag.prev = _th->tag;
+  _tag.state = TAG_NONE; \
+  _tag.tag = Qundef; \
+  _tag.prev = _ec->tag; \
+  _tag.lock_rec = rb_ec_vm_lock_rec(_ec); \
 
-#define TH_POP_TAG() \
-  _th->tag = _tag.prev; \
+#define EC_POP_TAG() \
+  _ec->tag = _tag.prev; \
 } while (0)
 
-#define TH_TMPPOP_TAG() \
-  _th->tag = _tag.prev
+#define EC_TMPPOP_TAG() \
+  _ec->tag = _tag.prev
 
-#define TH_REPUSH_TAG() (void)(_th->tag = &_tag)
+#define EC_REPUSH_TAG() (void)(_ec->tag = &_tag)
 
-#define PUSH_TAG() TH_PUSH_TAG(GET_THREAD())
-#define POP_TAG()      TH_POP_TAG()
-
-#if defined __GNUC__ && __GNUC__ == 4 && (__GNUC_MINOR__ >= 6 && __GNUC_MINOR__ <= 8)
+#if defined __GNUC__ && __GNUC__ == 4 && (__GNUC_MINOR__ >= 6 && __GNUC_MINOR__ <= 8) || __clang__
+/* This macro prevents GCC 4.6--4.8 from emitting maybe-uninitialized warnings.
+ * This macro also prevents Clang from dumping core in EC_EXEC_TAG().
+ * (I confirmed Clang 4.0.1 and 5.0.0.)
+ */
 # define VAR_FROM_MEMORY(var) __extension__(*(__typeof__(var) volatile *)&(var))
 # define VAR_INITIALIZED(var) ((var) = VAR_FROM_MEMORY(var))
 # define VAR_NOCLOBBERED(var) volatile var
@@ -146,36 +158,42 @@ LONG WINAPI rb_w32_stack_overflow_handler(struct _EXCEPTION_POINTERS *);
 # define VAR_NOCLOBBERED(var) var
 #endif
 
-/* clear th->state, and return the value */
+static inline void
+rb_ec_vm_lock_rec_check(const rb_execution_context_t *ec, unsigned int recorded_lock_rec)
+{
+    unsigned int current_lock_rec = rb_ec_vm_lock_rec(ec);
+    if (current_lock_rec != recorded_lock_rec) {
+        rb_ec_vm_lock_rec_release(ec, recorded_lock_rec, current_lock_rec);
+    }
+}
+
+/* clear ec->tag->state, and return the value */
 static inline int
-rb_threadptr_tag_state(rb_thread_t *th)
+rb_ec_tag_state(const rb_execution_context_t *ec)
 {
-    int state = th->state;
-    th->state = 0;
+    struct rb_vm_tag *tag = ec->tag;
+    enum ruby_tag_type state = tag->state;
+    tag->state = TAG_NONE;
+    rb_ec_vm_lock_rec_check(ec, tag->lock_rec);
     return state;
 }
 
-NORETURN(static inline void rb_threadptr_tag_jump(rb_thread_t *, int));
+NORETURN(static inline void rb_ec_tag_jump(const rb_execution_context_t *ec, enum ruby_tag_type st));
 static inline void
-rb_threadptr_tag_jump(rb_thread_t *th, int st)
+rb_ec_tag_jump(const rb_execution_context_t *ec, enum ruby_tag_type st)
 {
-    th->state = st;
-    ruby_longjmp(th->tag->buf, 1);
+    ec->tag->state = st;
+    ruby_longjmp(ec->tag->buf, 1);
 }
 
 /*
   setjmp() in assignment expression rhs is undefined behavior
   [ISO/IEC 9899:1999] 7.13.1.1
 */
-#define TH_EXEC_TAG() \
-    (ruby_setjmp(_tag.buf) ? rb_threadptr_tag_state(VAR_FROM_MEMORY(_th)) : (TH_REPUSH_TAG(), 0))
-
-#define EXEC_TAG() \
-  TH_EXEC_TAG()
+#define EC_EXEC_TAG() \
+    (ruby_setjmp(_tag.buf) ? rb_ec_tag_state(VAR_FROM_MEMORY(_ec)) : (EC_REPUSH_TAG(), 0))
 
-#define TH_JUMP_TAG(th, st) rb_threadptr_tag_jump(th, st)
-
-#define JUMP_TAG(st) TH_JUMP_TAG(GET_THREAD(), (st))
+#define EC_JUMP_TAG(ec, st) rb_ec_tag_jump(ec, st)
 
 #define INTERNAL_EXCEPTION_P(exc) FIXNUM_P(exc)
 
@@ -244,20 +262,18 @@ CREF_OMOD_SHARED_UNSET(rb_cref_t *cref)
     cref->flags &= ~CREF_FL_OMOD_SHARED;
 }
 
-void rb_thread_cleanup(void);
-void rb_thread_wait_other_threads(void);
-
 enum {
     RAISED_EXCEPTION = 1,
     RAISED_STACKOVERFLOW = 2,
     RAISED_NOMEMORY = 4
 };
-int rb_threadptr_set_raised(rb_thread_t *th);
-int rb_threadptr_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)
+#define rb_ec_raised_set(ec, f)   ((ec)->raised_flag |= (f))
+#define rb_ec_raised_reset(ec, f) ((ec)->raised_flag &= ~(f))
+#define rb_ec_raised_p(ec, f)    (((ec)->raised_flag & (f)) != 0)
+#define rb_ec_raised_clear(ec)    ((ec)->raised_flag = 0)
+int rb_ec_set_raised(rb_execution_context_t *ec);
+int rb_ec_reset_raised(rb_execution_context_t *ec);
+int rb_ec_stack_check(rb_execution_context_t *ec);
 
 VALUE rb_f_eval(int argc, const VALUE *argv, VALUE self);
 VALUE rb_make_exception(int argc, const VALUE *argv);
@@ -271,20 +287,31 @@ NORETURN(void rb_print_undef_str(VALUE, VALUE));
 NORETURN(void rb_print_inaccessible(VALUE, ID, rb_method_visibility_t));
 NORETURN(void rb_vm_localjump_error(const char *,VALUE, int));
 NORETURN(void rb_vm_jump_tag_but_local_jump(int));
-NORETURN(void rb_raise_method_missing(rb_thread_t *th, int argc, const VALUE *argv,
-				      VALUE obj, int call_status));
 
 VALUE rb_vm_make_jump_tag_but_local_jump(int state, VALUE val);
 rb_cref_t *rb_vm_cref(void);
 rb_cref_t *rb_vm_cref_replace_with_duplicated_cref(void);
-VALUE rb_vm_call_cfunc(VALUE recv, VALUE (*func)(VALUE), VALUE arg, const rb_block_t *blockptr, VALUE filename);
+VALUE rb_vm_call_cfunc(VALUE recv, VALUE (*func)(VALUE), VALUE arg, VALUE block_handler, VALUE filename);
 void rb_vm_set_progname(VALUE filename);
-void rb_thread_terminate_all(void);
 VALUE rb_vm_cbase(void);
 
+/* vm_backtrace.c */
+VALUE rb_ec_backtrace_object(const rb_execution_context_t *ec);
+VALUE rb_ec_backtrace_str_ary(const rb_execution_context_t *ec, long lev, long n);
+VALUE rb_ec_backtrace_location_ary(const rb_execution_context_t *ec, long lev, long n, bool skip_internal);
+
 #ifndef CharNext		/* defined as CharNext[AW] on Windows. */
 # ifdef HAVE_MBLEN
-#  define CharNext(p) ((p) + mblen((p), RUBY_MBCHAR_MAXSIZE))
+#  define CharNext(p) rb_char_next(p)
+static inline const char *
+rb_char_next(const char *p)
+{
+    if (p) {
+        int len = mblen(p, RUBY_MBCHAR_MAXSIZE);
+        p += len > 0 ? len : 1;
+    }
+    return p;
+}
 # else
 #  define CharNext(p) ((p) + 1)
 # endif
diff --git a/eval_jump.c b/eval_jump.c
index 59dae109ce..75d4ad0207 100644
--- a/eval_jump.c
+++ b/eval_jump.c
@@ -35,7 +35,7 @@ rb_call_end_proc(VALUE data)
  */
 
 static VALUE
-rb_f_at_exit(void)
+rb_f_at_exit(VALUE _)
 {
     VALUE proc;
 
@@ -50,7 +50,6 @@ rb_f_at_exit(void)
 struct end_proc_data {
     void (*func) ();
     VALUE data;
-    int safe;
     struct end_proc_data *next;
 };
 
@@ -72,7 +71,6 @@ rb_set_end_proc(void (*func)(VALUE), VALUE data)
     link->next = *list;
     link->func = func;
     link->data = data;
-    link->safe = rb_safe_level();
     *list = link;
 }
 
@@ -104,38 +102,33 @@ exec_end_procs_chain(struct end_proc_data *volatile *procs, VALUE *errp)
 	*procs = link->next;
 	endproc = *link;
 	xfree(link);
-	rb_set_safe_level_force(endproc.safe);
 	(*endproc.func) (endproc.data);
 	*errp = errinfo;
     }
 }
 
-void
-rb_exec_end_proc(void)
+static void
+rb_ec_exec_end_proc(rb_execution_context_t * ec)
 {
-    int status;
-    volatile int safe = rb_safe_level();
-    rb_thread_t *th = GET_THREAD();
-    volatile VALUE errinfo = th->errinfo;
+    enum ruby_tag_type state;
+    volatile VALUE errinfo = ec->errinfo;
 
-    TH_PUSH_TAG(th);
-    if ((status = EXEC_TAG()) == 0) {
+    EC_PUSH_TAG(ec);
+    if ((state = EC_EXEC_TAG()) == TAG_NONE) {
       again:
-	exec_end_procs_chain(&ephemeral_end_procs, &th->errinfo);
-	exec_end_procs_chain(&end_procs, &th->errinfo);
+	exec_end_procs_chain(&ephemeral_end_procs, &ec->errinfo);
+	exec_end_procs_chain(&end_procs, &ec->errinfo);
     }
     else {
-	VAR_INITIALIZED(th);
-	TH_TMPPOP_TAG();
-	error_handle(status);
-	if (!NIL_P(th->errinfo)) errinfo = th->errinfo;
-	TH_REPUSH_TAG();
+	EC_TMPPOP_TAG();
+        error_handle(ec, state);
+	if (!NIL_P(ec->errinfo)) errinfo = ec->errinfo;
+	EC_REPUSH_TAG();
 	goto again;
     }
-    TH_POP_TAG();
+    EC_POP_TAG();
 
-    rb_set_safe_level_force(safe);
-    th->errinfo = errinfo;
+    ec->errinfo = errinfo;
 }
 
 void
diff --git a/ext/-test-/RUBY_ALIGNOF/c.c b/ext/-test-/RUBY_ALIGNOF/c.c
new file mode 100644
index 0000000000..7a9f7cb498
--- /dev/null
+++ b/ext/-test-/RUBY_ALIGNOF/c.c
@@ -0,0 +1,15 @@
+#include "ruby.h"
+#include <stddef.h>
+
+struct T {
+    char _;
+    double t;
+};
+
+RBIMPL_STATIC_ASSERT(RUBY_ALIGNOF, RUBY_ALIGNOF(double) == offsetof(struct T, t));
+
+void
+Init_RUBY_ALIGNOF(void)
+{
+    // Windows linker mandates this symbol to exist.
+}
diff --git a/ext/-test-/RUBY_ALIGNOF/cpp.cpp b/ext/-test-/RUBY_ALIGNOF/cpp.cpp
new file mode 100644
index 0000000000..ed76d49b9f
--- /dev/null
+++ b/ext/-test-/RUBY_ALIGNOF/cpp.cpp
@@ -0,0 +1,9 @@
+#include "ruby.h"
+#include <cstddef>
+
+struct T {
+    char _;
+    double t;
+};
+
+RBIMPL_STATIC_ASSERT(RUBY_ALIGNOF, RUBY_ALIGNOF(double) == offsetof(T, t));
diff --git a/ext/-test-/RUBY_ALIGNOF/depend b/ext/-test-/RUBY_ALIGNOF/depend
new file mode 100644
index 0000000000..1662feda25
--- /dev/null
+++ b/ext/-test-/RUBY_ALIGNOF/depend
@@ -0,0 +1,163 @@
+# AUTOGENERATED DEPENDENCIES START
+c.o: $(RUBY_EXTCONF_H)
+c.o: $(arch_hdrdir)/ruby/config.h
+c.o: $(hdrdir)/ruby.h
+c.o: $(hdrdir)/ruby/assert.h
+c.o: $(hdrdir)/ruby/backward.h
+c.o: $(hdrdir)/ruby/backward/2/assume.h
+c.o: $(hdrdir)/ruby/backward/2/attributes.h
+c.o: $(hdrdir)/ruby/backward/2/bool.h
+c.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+c.o: $(hdrdir)/ruby/backward/2/inttypes.h
+c.o: $(hdrdir)/ruby/backward/2/limits.h
+c.o: $(hdrdir)/ruby/backward/2/long_long.h
+c.o: $(hdrdir)/ruby/backward/2/stdalign.h
+c.o: $(hdrdir)/ruby/backward/2/stdarg.h
+c.o: $(hdrdir)/ruby/defines.h
+c.o: $(hdrdir)/ruby/intern.h
+c.o: $(hdrdir)/ruby/internal/anyargs.h
+c.o: $(hdrdir)/ruby/internal/arithmetic.h
+c.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+c.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+c.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+c.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+c.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+c.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+c.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+c.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+c.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+c.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+c.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+c.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+c.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+c.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+c.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+c.o: $(hdrdir)/ruby/internal/assume.h
+c.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+c.o: $(hdrdir)/ruby/internal/attr/artificial.h
+c.o: $(hdrdir)/ruby/internal/attr/cold.h
+c.o: $(hdrdir)/ruby/internal/attr/const.h
+c.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+c.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+c.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+c.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+c.o: $(hdrdir)/ruby/internal/attr/error.h
+c.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+c.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+c.o: $(hdrdir)/ruby/internal/attr/format.h
+c.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+c.o: $(hdrdir)/ruby/internal/attr/noalias.h
+c.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+c.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+c.o: $(hdrdir)/ruby/internal/attr/noinline.h
+c.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+c.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+c.o: $(hdrdir)/ruby/internal/attr/pure.h
+c.o: $(hdrdir)/ruby/internal/attr/restrict.h
+c.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+c.o: $(hdrdir)/ruby/internal/attr/warning.h
+c.o: $(hdrdir)/ruby/internal/attr/weakref.h
+c.o: $(hdrdir)/ruby/internal/cast.h
+c.o: $(hdrdir)/ruby/internal/compiler_is.h
+c.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+c.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+c.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+c.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+c.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+c.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+c.o: $(hdrdir)/ruby/internal/compiler_since.h
+c.o: $(hdrdir)/ruby/internal/config.h
+c.o: $(hdrdir)/ruby/internal/constant_p.h
+c.o: $(hdrdir)/ruby/internal/core.h
+c.o: $(hdrdir)/ruby/internal/core/rarray.h
+c.o: $(hdrdir)/ruby/internal/core/rbasic.h
+c.o: $(hdrdir)/ruby/internal/core/rbignum.h
+c.o: $(hdrdir)/ruby/internal/core/rclass.h
+c.o: $(hdrdir)/ruby/internal/core/rdata.h
+c.o: $(hdrdir)/ruby/internal/core/rfile.h
+c.o: $(hdrdir)/ruby/internal/core/rhash.h
+c.o: $(hdrdir)/ruby/internal/core/robject.h
+c.o: $(hdrdir)/ruby/internal/core/rregexp.h
+c.o: $(hdrdir)/ruby/internal/core/rstring.h
+c.o: $(hdrdir)/ruby/internal/core/rstruct.h
+c.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+c.o: $(hdrdir)/ruby/internal/ctype.h
+c.o: $(hdrdir)/ruby/internal/dllexport.h
+c.o: $(hdrdir)/ruby/internal/dosish.h
+c.o: $(hdrdir)/ruby/internal/error.h
+c.o: $(hdrdir)/ruby/internal/eval.h
+c.o: $(hdrdir)/ruby/internal/event.h
+c.o: $(hdrdir)/ruby/internal/fl_type.h
+c.o: $(hdrdir)/ruby/internal/gc.h
+c.o: $(hdrdir)/ruby/internal/glob.h
+c.o: $(hdrdir)/ruby/internal/globals.h
+c.o: $(hdrdir)/ruby/internal/has/attribute.h
+c.o: $(hdrdir)/ruby/internal/has/builtin.h
+c.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+c.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+c.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+c.o: $(hdrdir)/ruby/internal/has/extension.h
+c.o: $(hdrdir)/ruby/internal/has/feature.h
+c.o: $(hdrdir)/ruby/internal/has/warning.h
+c.o: $(hdrdir)/ruby/internal/intern/array.h
+c.o: $(hdrdir)/ruby/internal/intern/bignum.h
+c.o: $(hdrdir)/ruby/internal/intern/class.h
+c.o: $(hdrdir)/ruby/internal/intern/compar.h
+c.o: $(hdrdir)/ruby/internal/intern/complex.h
+c.o: $(hdrdir)/ruby/internal/intern/cont.h
+c.o: $(hdrdir)/ruby/internal/intern/dir.h
+c.o: $(hdrdir)/ruby/internal/intern/enum.h
+c.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+c.o: $(hdrdir)/ruby/internal/intern/error.h
+c.o: $(hdrdir)/ruby/internal/intern/eval.h
+c.o: $(hdrdir)/ruby/internal/intern/file.h
+c.o: $(hdrdir)/ruby/internal/intern/gc.h
+c.o: $(hdrdir)/ruby/internal/intern/hash.h
+c.o: $(hdrdir)/ruby/internal/intern/io.h
+c.o: $(hdrdir)/ruby/internal/intern/load.h
+c.o: $(hdrdir)/ruby/internal/intern/marshal.h
+c.o: $(hdrdir)/ruby/internal/intern/numeric.h
+c.o: $(hdrdir)/ruby/internal/intern/object.h
+c.o: $(hdrdir)/ruby/internal/intern/parse.h
+c.o: $(hdrdir)/ruby/internal/intern/proc.h
+c.o: $(hdrdir)/ruby/internal/intern/process.h
+c.o: $(hdrdir)/ruby/internal/intern/random.h
+c.o: $(hdrdir)/ruby/internal/intern/range.h
+c.o: $(hdrdir)/ruby/internal/intern/rational.h
+c.o: $(hdrdir)/ruby/internal/intern/re.h
+c.o: $(hdrdir)/ruby/internal/intern/ruby.h
+c.o: $(hdrdir)/ruby/internal/intern/select.h
+c.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+c.o: $(hdrdir)/ruby/internal/intern/signal.h
+c.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+c.o: $(hdrdir)/ruby/internal/intern/string.h
+c.o: $(hdrdir)/ruby/internal/intern/struct.h
+c.o: $(hdrdir)/ruby/internal/intern/thread.h
+c.o: $(hdrdir)/ruby/internal/intern/time.h
+c.o: $(hdrdir)/ruby/internal/intern/variable.h
+c.o: $(hdrdir)/ruby/internal/intern/vm.h
+c.o: $(hdrdir)/ruby/internal/interpreter.h
+c.o: $(hdrdir)/ruby/internal/iterator.h
+c.o: $(hdrdir)/ruby/internal/memory.h
+c.o: $(hdrdir)/ruby/internal/method.h
+c.o: $(hdrdir)/ruby/internal/module.h
+c.o: $(hdrdir)/ruby/internal/newobj.h
+c.o: $(hdrdir)/ruby/internal/rgengc.h
+c.o: $(hdrdir)/ruby/internal/scan_args.h
+c.o: $(hdrdir)/ruby/internal/special_consts.h
+c.o: $(hdrdir)/ruby/internal/static_assert.h
+c.o: $(hdrdir)/ruby/internal/stdalign.h
+c.o: $(hdrdir)/ruby/internal/stdbool.h
+c.o: $(hdrdir)/ruby/internal/symbol.h
+c.o: $(hdrdir)/ruby/internal/token_paste.h
+c.o: $(hdrdir)/ruby/internal/value.h
+c.o: $(hdrdir)/ruby/internal/value_type.h
+c.o: $(hdrdir)/ruby/internal/variable.h
+c.o: $(hdrdir)/ruby/internal/warning_push.h
+c.o: $(hdrdir)/ruby/internal/xmalloc.h
+c.o: $(hdrdir)/ruby/missing.h
+c.o: $(hdrdir)/ruby/ruby.h
+c.o: $(hdrdir)/ruby/st.h
+c.o: $(hdrdir)/ruby/subst.h
+c.o: c.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/RUBY_ALIGNOF/extconf.rb b/ext/-test-/RUBY_ALIGNOF/extconf.rb
new file mode 100644
index 0000000000..98a370e987
--- /dev/null
+++ b/ext/-test-/RUBY_ALIGNOF/extconf.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: false
+$objs = %W"c.#$OBJEXT"
+
+$objs << "cpp.#$OBJEXT" if MakeMakefile['C++'].have_devel?
+
+create_makefile("-test-/RUBY_ALIGNOF")
diff --git a/ext/-test-/arith_seq/extract/depend b/ext/-test-/arith_seq/extract/depend
new file mode 100644
index 0000000000..46117d1000
--- /dev/null
+++ b/ext/-test-/arith_seq/extract/depend
@@ -0,0 +1,162 @@
+# AUTOGENERATED DEPENDENCIES START
+extract.o: $(RUBY_EXTCONF_H)
+extract.o: $(arch_hdrdir)/ruby/config.h
+extract.o: $(hdrdir)/ruby/internal/anyargs.h
+extract.o: $(hdrdir)/ruby/internal/arithmetic.h
+extract.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+extract.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+extract.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+extract.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+extract.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+extract.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+extract.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+extract.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+extract.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+extract.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+extract.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+extract.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+extract.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+extract.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+extract.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+extract.o: $(hdrdir)/ruby/internal/assume.h
+extract.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+extract.o: $(hdrdir)/ruby/internal/attr/artificial.h
+extract.o: $(hdrdir)/ruby/internal/attr/cold.h
+extract.o: $(hdrdir)/ruby/internal/attr/const.h
+extract.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+extract.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+extract.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+extract.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+extract.o: $(hdrdir)/ruby/internal/attr/error.h
+extract.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+extract.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+extract.o: $(hdrdir)/ruby/internal/attr/format.h
+extract.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+extract.o: $(hdrdir)/ruby/internal/attr/noalias.h
+extract.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+extract.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+extract.o: $(hdrdir)/ruby/internal/attr/noinline.h
+extract.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+extract.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+extract.o: $(hdrdir)/ruby/internal/attr/pure.h
+extract.o: $(hdrdir)/ruby/internal/attr/restrict.h
+extract.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+extract.o: $(hdrdir)/ruby/internal/attr/warning.h
+extract.o: $(hdrdir)/ruby/internal/attr/weakref.h
+extract.o: $(hdrdir)/ruby/internal/cast.h
+extract.o: $(hdrdir)/ruby/internal/compiler_is.h
+extract.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+extract.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+extract.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+extract.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+extract.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+extract.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+extract.o: $(hdrdir)/ruby/internal/compiler_since.h
+extract.o: $(hdrdir)/ruby/internal/config.h
+extract.o: $(hdrdir)/ruby/internal/constant_p.h
+extract.o: $(hdrdir)/ruby/internal/core.h
+extract.o: $(hdrdir)/ruby/internal/core/rarray.h
+extract.o: $(hdrdir)/ruby/internal/core/rbasic.h
+extract.o: $(hdrdir)/ruby/internal/core/rbignum.h
+extract.o: $(hdrdir)/ruby/internal/core/rclass.h
+extract.o: $(hdrdir)/ruby/internal/core/rdata.h
+extract.o: $(hdrdir)/ruby/internal/core/rfile.h
+extract.o: $(hdrdir)/ruby/internal/core/rhash.h
+extract.o: $(hdrdir)/ruby/internal/core/robject.h
+extract.o: $(hdrdir)/ruby/internal/core/rregexp.h
+extract.o: $(hdrdir)/ruby/internal/core/rstring.h
+extract.o: $(hdrdir)/ruby/internal/core/rstruct.h
+extract.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+extract.o: $(hdrdir)/ruby/internal/ctype.h
+extract.o: $(hdrdir)/ruby/internal/dllexport.h
+extract.o: $(hdrdir)/ruby/internal/dosish.h
+extract.o: $(hdrdir)/ruby/internal/error.h
+extract.o: $(hdrdir)/ruby/internal/eval.h
+extract.o: $(hdrdir)/ruby/internal/event.h
+extract.o: $(hdrdir)/ruby/internal/fl_type.h
+extract.o: $(hdrdir)/ruby/internal/gc.h
+extract.o: $(hdrdir)/ruby/internal/glob.h
+extract.o: $(hdrdir)/ruby/internal/globals.h
+extract.o: $(hdrdir)/ruby/internal/has/attribute.h
+extract.o: $(hdrdir)/ruby/internal/has/builtin.h
+extract.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+extract.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+extract.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+extract.o: $(hdrdir)/ruby/internal/has/extension.h
+extract.o: $(hdrdir)/ruby/internal/has/feature.h
+extract.o: $(hdrdir)/ruby/internal/has/warning.h
+extract.o: $(hdrdir)/ruby/internal/intern/array.h
+extract.o: $(hdrdir)/ruby/internal/intern/bignum.h
+extract.o: $(hdrdir)/ruby/internal/intern/class.h
+extract.o: $(hdrdir)/ruby/internal/intern/compar.h
+extract.o: $(hdrdir)/ruby/internal/intern/complex.h
+extract.o: $(hdrdir)/ruby/internal/intern/cont.h
+extract.o: $(hdrdir)/ruby/internal/intern/dir.h
+extract.o: $(hdrdir)/ruby/internal/intern/enum.h
+extract.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+extract.o: $(hdrdir)/ruby/internal/intern/error.h
+extract.o: $(hdrdir)/ruby/internal/intern/eval.h
+extract.o: $(hdrdir)/ruby/internal/intern/file.h
+extract.o: $(hdrdir)/ruby/internal/intern/gc.h
+extract.o: $(hdrdir)/ruby/internal/intern/hash.h
+extract.o: $(hdrdir)/ruby/internal/intern/io.h
+extract.o: $(hdrdir)/ruby/internal/intern/load.h
+extract.o: $(hdrdir)/ruby/internal/intern/marshal.h
+extract.o: $(hdrdir)/ruby/internal/intern/numeric.h
+extract.o: $(hdrdir)/ruby/internal/intern/object.h
+extract.o: $(hdrdir)/ruby/internal/intern/parse.h
+extract.o: $(hdrdir)/ruby/internal/intern/proc.h
+extract.o: $(hdrdir)/ruby/internal/intern/process.h
+extract.o: $(hdrdir)/ruby/internal/intern/random.h
+extract.o: $(hdrdir)/ruby/internal/intern/range.h
+extract.o: $(hdrdir)/ruby/internal/intern/rational.h
+extract.o: $(hdrdir)/ruby/internal/intern/re.h
+extract.o: $(hdrdir)/ruby/internal/intern/ruby.h
+extract.o: $(hdrdir)/ruby/internal/intern/select.h
+extract.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+extract.o: $(hdrdir)/ruby/internal/intern/signal.h
+extract.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+extract.o: $(hdrdir)/ruby/internal/intern/string.h
+extract.o: $(hdrdir)/ruby/internal/intern/struct.h
+extract.o: $(hdrdir)/ruby/internal/intern/thread.h
+extract.o: $(hdrdir)/ruby/internal/intern/time.h
+extract.o: $(hdrdir)/ruby/internal/intern/variable.h
+extract.o: $(hdrdir)/ruby/internal/intern/vm.h
+extract.o: $(hdrdir)/ruby/internal/interpreter.h
+extract.o: $(hdrdir)/ruby/internal/iterator.h
+extract.o: $(hdrdir)/ruby/internal/memory.h
+extract.o: $(hdrdir)/ruby/internal/method.h
+extract.o: $(hdrdir)/ruby/internal/module.h
+extract.o: $(hdrdir)/ruby/internal/newobj.h
+extract.o: $(hdrdir)/ruby/internal/rgengc.h
+extract.o: $(hdrdir)/ruby/internal/scan_args.h
+extract.o: $(hdrdir)/ruby/internal/special_consts.h
+extract.o: $(hdrdir)/ruby/internal/static_assert.h
+extract.o: $(hdrdir)/ruby/internal/stdalign.h
+extract.o: $(hdrdir)/ruby/internal/stdbool.h
+extract.o: $(hdrdir)/ruby/internal/symbol.h
+extract.o: $(hdrdir)/ruby/internal/token_paste.h
+extract.o: $(hdrdir)/ruby/internal/value.h
+extract.o: $(hdrdir)/ruby/internal/value_type.h
+extract.o: $(hdrdir)/ruby/internal/variable.h
+extract.o: $(hdrdir)/ruby/internal/warning_push.h
+extract.o: $(hdrdir)/ruby/internal/xmalloc.h
+extract.o: $(hdrdir)/ruby/assert.h
+extract.o: $(hdrdir)/ruby/backward.h
+extract.o: $(hdrdir)/ruby/backward/2/assume.h
+extract.o: $(hdrdir)/ruby/backward/2/attributes.h
+extract.o: $(hdrdir)/ruby/backward/2/bool.h
+extract.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+extract.o: $(hdrdir)/ruby/backward/2/inttypes.h
+extract.o: $(hdrdir)/ruby/backward/2/limits.h
+extract.o: $(hdrdir)/ruby/backward/2/long_long.h
+extract.o: $(hdrdir)/ruby/backward/2/stdalign.h
+extract.o: $(hdrdir)/ruby/backward/2/stdarg.h
+extract.o: $(hdrdir)/ruby/defines.h
+extract.o: $(hdrdir)/ruby/intern.h
+extract.o: $(hdrdir)/ruby/missing.h
+extract.o: $(hdrdir)/ruby/ruby.h
+extract.o: $(hdrdir)/ruby/st.h
+extract.o: $(hdrdir)/ruby/subst.h
+extract.o: extract.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/arith_seq/extract/extconf.rb b/ext/-test-/arith_seq/extract/extconf.rb
new file mode 100644
index 0000000000..9c368bf50e
--- /dev/null
+++ b/ext/-test-/arith_seq/extract/extconf.rb
@@ -0,0 +1,2 @@
+# frozen_string_literal: false
+create_makefile("-test-/arith_seq/extract")
diff --git a/ext/-test-/arith_seq/extract/extract.c b/ext/-test-/arith_seq/extract/extract.c
new file mode 100644
index 0000000000..93b89c239a
--- /dev/null
+++ b/ext/-test-/arith_seq/extract/extract.c
@@ -0,0 +1,27 @@
+#include "ruby/ruby.h"
+
+static VALUE
+arith_seq_s_extract(VALUE mod, VALUE obj)
+{
+  rb_arithmetic_sequence_components_t x;
+  VALUE ret;
+  int r;
+
+  r = rb_arithmetic_sequence_extract(obj, &x);
+
+  ret = rb_ary_new2(5);
+  rb_ary_store(ret, 0, r ? x.begin : Qnil);
+  rb_ary_store(ret, 1, r ? x.end   : Qnil);
+  rb_ary_store(ret, 2, r ? x.step  : Qnil);
+  rb_ary_store(ret, 3, r ? INT2FIX(x.exclude_end) : Qnil);
+  rb_ary_store(ret, 4, INT2FIX(r));
+
+  return ret;
+}
+
+void
+Init_extract(void)
+{
+    VALUE cArithSeq = rb_path2class("Enumerator::ArithmeticSequence");
+    rb_define_singleton_method(cArithSeq, "__extract__", arith_seq_s_extract, 1);
+}
diff --git a/ext/-test-/array/concat/depend b/ext/-test-/array/concat/depend
new file mode 100644
index 0000000000..4f2ba01f71
--- /dev/null
+++ b/ext/-test-/array/concat/depend
@@ -0,0 +1,322 @@
+# AUTOGENERATED DEPENDENCIES START
+resize.o: $(RUBY_EXTCONF_H)
+resize.o: $(arch_hdrdir)/ruby/config.h
+resize.o: $(hdrdir)/ruby/assert.h
+resize.o: $(hdrdir)/ruby/backward.h
+resize.o: $(hdrdir)/ruby/backward/2/assume.h
+resize.o: $(hdrdir)/ruby/backward/2/attributes.h
+resize.o: $(hdrdir)/ruby/backward/2/bool.h
+resize.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+resize.o: $(hdrdir)/ruby/backward/2/inttypes.h
+resize.o: $(hdrdir)/ruby/backward/2/limits.h
+resize.o: $(hdrdir)/ruby/backward/2/long_long.h
+resize.o: $(hdrdir)/ruby/backward/2/stdalign.h
+resize.o: $(hdrdir)/ruby/backward/2/stdarg.h
+resize.o: $(hdrdir)/ruby/defines.h
+resize.o: $(hdrdir)/ruby/intern.h
+resize.o: $(hdrdir)/ruby/internal/anyargs.h
+resize.o: $(hdrdir)/ruby/internal/arithmetic.h
+resize.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+resize.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+resize.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+resize.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+resize.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+resize.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+resize.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+resize.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+resize.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+resize.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+resize.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+resize.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+resize.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+resize.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+resize.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+resize.o: $(hdrdir)/ruby/internal/assume.h
+resize.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+resize.o: $(hdrdir)/ruby/internal/attr/artificial.h
+resize.o: $(hdrdir)/ruby/internal/attr/cold.h
+resize.o: $(hdrdir)/ruby/internal/attr/const.h
+resize.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+resize.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+resize.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+resize.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+resize.o: $(hdrdir)/ruby/internal/attr/error.h
+resize.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+resize.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+resize.o: $(hdrdir)/ruby/internal/attr/format.h
+resize.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+resize.o: $(hdrdir)/ruby/internal/attr/noalias.h
+resize.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+resize.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+resize.o: $(hdrdir)/ruby/internal/attr/noinline.h
+resize.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+resize.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+resize.o: $(hdrdir)/ruby/internal/attr/pure.h
+resize.o: $(hdrdir)/ruby/internal/attr/restrict.h
+resize.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+resize.o: $(hdrdir)/ruby/internal/attr/warning.h
+resize.o: $(hdrdir)/ruby/internal/attr/weakref.h
+resize.o: $(hdrdir)/ruby/internal/cast.h
+resize.o: $(hdrdir)/ruby/internal/compiler_is.h
+resize.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+resize.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+resize.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+resize.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+resize.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+resize.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+resize.o: $(hdrdir)/ruby/internal/compiler_since.h
+resize.o: $(hdrdir)/ruby/internal/config.h
+resize.o: $(hdrdir)/ruby/internal/constant_p.h
+resize.o: $(hdrdir)/ruby/internal/core.h
+resize.o: $(hdrdir)/ruby/internal/core/rarray.h
+resize.o: $(hdrdir)/ruby/internal/core/rbasic.h
+resize.o: $(hdrdir)/ruby/internal/core/rbignum.h
+resize.o: $(hdrdir)/ruby/internal/core/rclass.h
+resize.o: $(hdrdir)/ruby/internal/core/rdata.h
+resize.o: $(hdrdir)/ruby/internal/core/rfile.h
+resize.o: $(hdrdir)/ruby/internal/core/rhash.h
+resize.o: $(hdrdir)/ruby/internal/core/robject.h
+resize.o: $(hdrdir)/ruby/internal/core/rregexp.h
+resize.o: $(hdrdir)/ruby/internal/core/rstring.h
+resize.o: $(hdrdir)/ruby/internal/core/rstruct.h
+resize.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+resize.o: $(hdrdir)/ruby/internal/ctype.h
+resize.o: $(hdrdir)/ruby/internal/dllexport.h
+resize.o: $(hdrdir)/ruby/internal/dosish.h
+resize.o: $(hdrdir)/ruby/internal/error.h
+resize.o: $(hdrdir)/ruby/internal/eval.h
+resize.o: $(hdrdir)/ruby/internal/event.h
+resize.o: $(hdrdir)/ruby/internal/fl_type.h
+resize.o: $(hdrdir)/ruby/internal/gc.h
+resize.o: $(hdrdir)/ruby/internal/glob.h
+resize.o: $(hdrdir)/ruby/internal/globals.h
+resize.o: $(hdrdir)/ruby/internal/has/attribute.h
+resize.o: $(hdrdir)/ruby/internal/has/builtin.h
+resize.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+resize.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+resize.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+resize.o: $(hdrdir)/ruby/internal/has/extension.h
+resize.o: $(hdrdir)/ruby/internal/has/feature.h
+resize.o: $(hdrdir)/ruby/internal/has/warning.h
+resize.o: $(hdrdir)/ruby/internal/intern/array.h
+resize.o: $(hdrdir)/ruby/internal/intern/bignum.h
+resize.o: $(hdrdir)/ruby/internal/intern/class.h
+resize.o: $(hdrdir)/ruby/internal/intern/compar.h
+resize.o: $(hdrdir)/ruby/internal/intern/complex.h
+resize.o: $(hdrdir)/ruby/internal/intern/cont.h
+resize.o: $(hdrdir)/ruby/internal/intern/dir.h
+resize.o: $(hdrdir)/ruby/internal/intern/enum.h
+resize.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+resize.o: $(hdrdir)/ruby/internal/intern/error.h
+resize.o: $(hdrdir)/ruby/internal/intern/eval.h
+resize.o: $(hdrdir)/ruby/internal/intern/file.h
+resize.o: $(hdrdir)/ruby/internal/intern/gc.h
+resize.o: $(hdrdir)/ruby/internal/intern/hash.h
+resize.o: $(hdrdir)/ruby/internal/intern/io.h
+resize.o: $(hdrdir)/ruby/internal/intern/load.h
+resize.o: $(hdrdir)/ruby/internal/intern/marshal.h
+resize.o: $(hdrdir)/ruby/internal/intern/numeric.h
+resize.o: $(hdrdir)/ruby/internal/intern/object.h
+resize.o: $(hdrdir)/ruby/internal/intern/parse.h
+resize.o: $(hdrdir)/ruby/internal/intern/proc.h
+resize.o: $(hdrdir)/ruby/internal/intern/process.h
+resize.o: $(hdrdir)/ruby/internal/intern/random.h
+resize.o: $(hdrdir)/ruby/internal/intern/range.h
+resize.o: $(hdrdir)/ruby/internal/intern/rational.h
+resize.o: $(hdrdir)/ruby/internal/intern/re.h
+resize.o: $(hdrdir)/ruby/internal/intern/ruby.h
+resize.o: $(hdrdir)/ruby/internal/intern/select.h
+resize.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+resize.o: $(hdrdir)/ruby/internal/intern/signal.h
+resize.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+resize.o: $(hdrdir)/ruby/internal/intern/string.h
+resize.o: $(hdrdir)/ruby/internal/intern/struct.h
+resize.o: $(hdrdir)/ruby/internal/intern/thread.h
+resize.o: $(hdrdir)/ruby/internal/intern/time.h
+resize.o: $(hdrdir)/ruby/internal/intern/variable.h
+resize.o: $(hdrdir)/ruby/internal/intern/vm.h
+resize.o: $(hdrdir)/ruby/internal/interpreter.h
+resize.o: $(hdrdir)/ruby/internal/iterator.h
+resize.o: $(hdrdir)/ruby/internal/memory.h
+resize.o: $(hdrdir)/ruby/internal/method.h
+resize.o: $(hdrdir)/ruby/internal/module.h
+resize.o: $(hdrdir)/ruby/internal/newobj.h
+resize.o: $(hdrdir)/ruby/internal/rgengc.h
+resize.o: $(hdrdir)/ruby/internal/scan_args.h
+resize.o: $(hdrdir)/ruby/internal/special_consts.h
+resize.o: $(hdrdir)/ruby/internal/static_assert.h
+resize.o: $(hdrdir)/ruby/internal/stdalign.h
+resize.o: $(hdrdir)/ruby/internal/stdbool.h
+resize.o: $(hdrdir)/ruby/internal/symbol.h
+resize.o: $(hdrdir)/ruby/internal/value.h
+resize.o: $(hdrdir)/ruby/internal/value_type.h
+resize.o: $(hdrdir)/ruby/internal/variable.h
+resize.o: $(hdrdir)/ruby/internal/warning_push.h
+resize.o: $(hdrdir)/ruby/internal/xmalloc.h
+resize.o: $(hdrdir)/ruby/missing.h
+resize.o: $(hdrdir)/ruby/ruby.h
+resize.o: $(hdrdir)/ruby/st.h
+resize.o: $(hdrdir)/ruby/subst.h
+resize.o: resize.c
+to_ary_conact.o: $(RUBY_EXTCONF_H)
+to_ary_conact.o: $(arch_hdrdir)/ruby/config.h
+to_ary_conact.o: $(hdrdir)/ruby.h
+to_ary_conact.o: $(hdrdir)/ruby/assert.h
+to_ary_conact.o: $(hdrdir)/ruby/backward.h
+to_ary_conact.o: $(hdrdir)/ruby/backward/2/assume.h
+to_ary_conact.o: $(hdrdir)/ruby/backward/2/attributes.h
+to_ary_conact.o: $(hdrdir)/ruby/backward/2/bool.h
+to_ary_conact.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+to_ary_conact.o: $(hdrdir)/ruby/backward/2/inttypes.h
+to_ary_conact.o: $(hdrdir)/ruby/backward/2/limits.h
+to_ary_conact.o: $(hdrdir)/ruby/backward/2/long_long.h
+to_ary_conact.o: $(hdrdir)/ruby/backward/2/stdalign.h
+to_ary_conact.o: $(hdrdir)/ruby/backward/2/stdarg.h
+to_ary_conact.o: $(hdrdir)/ruby/defines.h
+to_ary_conact.o: $(hdrdir)/ruby/intern.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/anyargs.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/arithmetic.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/assume.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/attr/artificial.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/attr/cold.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/attr/const.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/attr/error.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/attr/format.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/attr/noalias.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/attr/noinline.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/attr/pure.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/attr/restrict.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/attr/warning.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/attr/weakref.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/cast.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/compiler_is.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/compiler_since.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/config.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/constant_p.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/core.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/core/rarray.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/core/rbasic.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/core/rbignum.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/core/rclass.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/core/rdata.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/core/rfile.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/core/rhash.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/core/robject.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/core/rregexp.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/core/rstring.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/core/rstruct.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/ctype.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/dllexport.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/dosish.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/error.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/eval.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/event.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/fl_type.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/gc.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/glob.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/globals.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/has/attribute.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/has/builtin.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/has/extension.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/has/feature.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/has/warning.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/intern/array.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/intern/bignum.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/intern/class.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/intern/compar.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/intern/complex.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/intern/cont.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/intern/dir.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/intern/enum.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/intern/error.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/intern/eval.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/intern/file.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/intern/gc.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/intern/hash.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/intern/io.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/intern/load.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/intern/marshal.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/intern/numeric.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/intern/object.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/intern/parse.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/intern/proc.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/intern/process.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/intern/random.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/intern/range.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/intern/rational.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/intern/re.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/intern/ruby.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/intern/select.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/intern/signal.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/intern/string.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/intern/struct.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/intern/thread.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/intern/time.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/intern/variable.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/intern/vm.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/interpreter.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/iterator.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/memory.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/method.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/module.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/newobj.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/rgengc.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/scan_args.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/special_consts.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/static_assert.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/stdalign.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/stdbool.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/symbol.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/token_paste.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/value.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/value_type.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/variable.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/warning_push.h
+to_ary_conact.o: $(hdrdir)/ruby/internal/xmalloc.h
+to_ary_conact.o: $(hdrdir)/ruby/missing.h
+to_ary_conact.o: $(hdrdir)/ruby/ruby.h
+to_ary_conact.o: $(hdrdir)/ruby/st.h
+to_ary_conact.o: $(hdrdir)/ruby/subst.h
+to_ary_conact.o: to_ary_conact.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/array/concat/extconf.rb b/ext/-test-/array/concat/extconf.rb
new file mode 100644
index 0000000000..cdd79126c9
--- /dev/null
+++ b/ext/-test-/array/concat/extconf.rb
@@ -0,0 +1,2 @@
+# frozen_string_literal: false
+create_makefile("-test-/array/to_ary_concat")
diff --git a/ext/-test-/array/concat/to_ary_conact.c b/ext/-test-/array/concat/to_ary_conact.c
new file mode 100644
index 0000000000..ec1fd321ce
--- /dev/null
+++ b/ext/-test-/array/concat/to_ary_conact.c
@@ -0,0 +1,34 @@
+#include "ruby.h"
+
+// Bar
+
+typedef struct {
+    int dummy;
+} Bar;
+
+static rb_data_type_t Bar_type = {
+    "Bar",
+    {NULL, RUBY_TYPED_DEFAULT_FREE, NULL },
+};
+
+static VALUE
+Bar_alloc(VALUE klass)
+{
+    return TypedData_Wrap_Struct(klass, &Bar_type, NULL);
+}
+
+VALUE Bar_to_ary(VALUE _self) {
+    VALUE ary = rb_ary_new2(2);
+    VALUE foo = rb_ary_new2(0);
+    rb_ary_push(ary, foo);
+    rb_ary_push(ary, foo);
+    rb_ary_push(ary, foo);
+    return ary;
+}
+
+void Init_to_ary_concat() {
+    VALUE mBug = rb_define_module("Bug");
+    VALUE bar = rb_define_class_under(mBug, "Bar", rb_cObject);
+    rb_define_alloc_func(bar, Bar_alloc);
+    rb_define_method(bar, "to_ary", Bar_to_ary, 0);
+}
diff --git a/ext/-test-/array/resize/depend b/ext/-test-/array/resize/depend
new file mode 100644
index 0000000000..7c52b21e59
--- /dev/null
+++ b/ext/-test-/array/resize/depend
@@ -0,0 +1,162 @@
+# AUTOGENERATED DEPENDENCIES START
+resize.o: $(RUBY_EXTCONF_H)
+resize.o: $(arch_hdrdir)/ruby/config.h
+resize.o: $(hdrdir)/ruby/internal/anyargs.h
+resize.o: $(hdrdir)/ruby/internal/arithmetic.h
+resize.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+resize.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+resize.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+resize.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+resize.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+resize.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+resize.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+resize.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+resize.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+resize.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+resize.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+resize.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+resize.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+resize.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+resize.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+resize.o: $(hdrdir)/ruby/internal/assume.h
+resize.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+resize.o: $(hdrdir)/ruby/internal/attr/artificial.h
+resize.o: $(hdrdir)/ruby/internal/attr/cold.h
+resize.o: $(hdrdir)/ruby/internal/attr/const.h
+resize.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+resize.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+resize.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+resize.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+resize.o: $(hdrdir)/ruby/internal/attr/error.h
+resize.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+resize.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+resize.o: $(hdrdir)/ruby/internal/attr/format.h
+resize.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+resize.o: $(hdrdir)/ruby/internal/attr/noalias.h
+resize.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+resize.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+resize.o: $(hdrdir)/ruby/internal/attr/noinline.h
+resize.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+resize.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+resize.o: $(hdrdir)/ruby/internal/attr/pure.h
+resize.o: $(hdrdir)/ruby/internal/attr/restrict.h
+resize.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+resize.o: $(hdrdir)/ruby/internal/attr/warning.h
+resize.o: $(hdrdir)/ruby/internal/attr/weakref.h
+resize.o: $(hdrdir)/ruby/internal/cast.h
+resize.o: $(hdrdir)/ruby/internal/compiler_is.h
+resize.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+resize.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+resize.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+resize.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+resize.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+resize.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+resize.o: $(hdrdir)/ruby/internal/compiler_since.h
+resize.o: $(hdrdir)/ruby/internal/config.h
+resize.o: $(hdrdir)/ruby/internal/constant_p.h
+resize.o: $(hdrdir)/ruby/internal/core.h
+resize.o: $(hdrdir)/ruby/internal/core/rarray.h
+resize.o: $(hdrdir)/ruby/internal/core/rbasic.h
+resize.o: $(hdrdir)/ruby/internal/core/rbignum.h
+resize.o: $(hdrdir)/ruby/internal/core/rclass.h
+resize.o: $(hdrdir)/ruby/internal/core/rdata.h
+resize.o: $(hdrdir)/ruby/internal/core/rfile.h
+resize.o: $(hdrdir)/ruby/internal/core/rhash.h
+resize.o: $(hdrdir)/ruby/internal/core/robject.h
+resize.o: $(hdrdir)/ruby/internal/core/rregexp.h
+resize.o: $(hdrdir)/ruby/internal/core/rstring.h
+resize.o: $(hdrdir)/ruby/internal/core/rstruct.h
+resize.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+resize.o: $(hdrdir)/ruby/internal/ctype.h
+resize.o: $(hdrdir)/ruby/internal/dllexport.h
+resize.o: $(hdrdir)/ruby/internal/dosish.h
+resize.o: $(hdrdir)/ruby/internal/error.h
+resize.o: $(hdrdir)/ruby/internal/eval.h
+resize.o: $(hdrdir)/ruby/internal/event.h
+resize.o: $(hdrdir)/ruby/internal/fl_type.h
+resize.o: $(hdrdir)/ruby/internal/gc.h
+resize.o: $(hdrdir)/ruby/internal/glob.h
+resize.o: $(hdrdir)/ruby/internal/globals.h
+resize.o: $(hdrdir)/ruby/internal/has/attribute.h
+resize.o: $(hdrdir)/ruby/internal/has/builtin.h
+resize.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+resize.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+resize.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+resize.o: $(hdrdir)/ruby/internal/has/extension.h
+resize.o: $(hdrdir)/ruby/internal/has/feature.h
+resize.o: $(hdrdir)/ruby/internal/has/warning.h
+resize.o: $(hdrdir)/ruby/internal/intern/array.h
+resize.o: $(hdrdir)/ruby/internal/intern/bignum.h
+resize.o: $(hdrdir)/ruby/internal/intern/class.h
+resize.o: $(hdrdir)/ruby/internal/intern/compar.h
+resize.o: $(hdrdir)/ruby/internal/intern/complex.h
+resize.o: $(hdrdir)/ruby/internal/intern/cont.h
+resize.o: $(hdrdir)/ruby/internal/intern/dir.h
+resize.o: $(hdrdir)/ruby/internal/intern/enum.h
+resize.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+resize.o: $(hdrdir)/ruby/internal/intern/error.h
+resize.o: $(hdrdir)/ruby/internal/intern/eval.h
+resize.o: $(hdrdir)/ruby/internal/intern/file.h
+resize.o: $(hdrdir)/ruby/internal/intern/gc.h
+resize.o: $(hdrdir)/ruby/internal/intern/hash.h
+resize.o: $(hdrdir)/ruby/internal/intern/io.h
+resize.o: $(hdrdir)/ruby/internal/intern/load.h
+resize.o: $(hdrdir)/ruby/internal/intern/marshal.h
+resize.o: $(hdrdir)/ruby/internal/intern/numeric.h
+resize.o: $(hdrdir)/ruby/internal/intern/object.h
+resize.o: $(hdrdir)/ruby/internal/intern/parse.h
+resize.o: $(hdrdir)/ruby/internal/intern/proc.h
+resize.o: $(hdrdir)/ruby/internal/intern/process.h
+resize.o: $(hdrdir)/ruby/internal/intern/random.h
+resize.o: $(hdrdir)/ruby/internal/intern/range.h
+resize.o: $(hdrdir)/ruby/internal/intern/rational.h
+resize.o: $(hdrdir)/ruby/internal/intern/re.h
+resize.o: $(hdrdir)/ruby/internal/intern/ruby.h
+resize.o: $(hdrdir)/ruby/internal/intern/select.h
+resize.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+resize.o: $(hdrdir)/ruby/internal/intern/signal.h
+resize.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+resize.o: $(hdrdir)/ruby/internal/intern/string.h
+resize.o: $(hdrdir)/ruby/internal/intern/struct.h
+resize.o: $(hdrdir)/ruby/internal/intern/thread.h
+resize.o: $(hdrdir)/ruby/internal/intern/time.h
+resize.o: $(hdrdir)/ruby/internal/intern/variable.h
+resize.o: $(hdrdir)/ruby/internal/intern/vm.h
+resize.o: $(hdrdir)/ruby/internal/interpreter.h
+resize.o: $(hdrdir)/ruby/internal/iterator.h
+resize.o: $(hdrdir)/ruby/internal/memory.h
+resize.o: $(hdrdir)/ruby/internal/method.h
+resize.o: $(hdrdir)/ruby/internal/module.h
+resize.o: $(hdrdir)/ruby/internal/newobj.h
+resize.o: $(hdrdir)/ruby/internal/rgengc.h
+resize.o: $(hdrdir)/ruby/internal/scan_args.h
+resize.o: $(hdrdir)/ruby/internal/special_consts.h
+resize.o: $(hdrdir)/ruby/internal/static_assert.h
+resize.o: $(hdrdir)/ruby/internal/stdalign.h
+resize.o: $(hdrdir)/ruby/internal/stdbool.h
+resize.o: $(hdrdir)/ruby/internal/symbol.h
+resize.o: $(hdrdir)/ruby/internal/token_paste.h
+resize.o: $(hdrdir)/ruby/internal/value.h
+resize.o: $(hdrdir)/ruby/internal/value_type.h
+resize.o: $(hdrdir)/ruby/internal/variable.h
+resize.o: $(hdrdir)/ruby/internal/warning_push.h
+resize.o: $(hdrdir)/ruby/internal/xmalloc.h
+resize.o: $(hdrdir)/ruby/assert.h
+resize.o: $(hdrdir)/ruby/backward.h
+resize.o: $(hdrdir)/ruby/backward/2/assume.h
+resize.o: $(hdrdir)/ruby/backward/2/attributes.h
+resize.o: $(hdrdir)/ruby/backward/2/bool.h
+resize.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+resize.o: $(hdrdir)/ruby/backward/2/inttypes.h
+resize.o: $(hdrdir)/ruby/backward/2/limits.h
+resize.o: $(hdrdir)/ruby/backward/2/long_long.h
+resize.o: $(hdrdir)/ruby/backward/2/stdalign.h
+resize.o: $(hdrdir)/ruby/backward/2/stdarg.h
+resize.o: $(hdrdir)/ruby/defines.h
+resize.o: $(hdrdir)/ruby/intern.h
+resize.o: $(hdrdir)/ruby/missing.h
+resize.o: $(hdrdir)/ruby/ruby.h
+resize.o: $(hdrdir)/ruby/st.h
+resize.o: $(hdrdir)/ruby/subst.h
+resize.o: resize.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/bignum/big2str.c b/ext/-test-/bignum/big2str.c
index ec4bde2915..bc5a933f82 100644
--- a/ext/-test-/bignum/big2str.c
+++ b/ext/-test-/bignum/big2str.c
@@ -1,4 +1,4 @@
-#include "internal.h"
+#include "internal/bignum.h"
 
 static VALUE
 big(VALUE x)
diff --git a/ext/-test-/bignum/bigzero.c b/ext/-test-/bignum/bigzero.c
index 35117db7ae..e2bfebcd3e 100644
--- a/ext/-test-/bignum/bigzero.c
+++ b/ext/-test-/bignum/bigzero.c
@@ -1,4 +1,4 @@
-#include "internal.h"
+#include "internal/bignum.h"
 
 static VALUE
 bug_big_zero(VALUE self, VALUE length)
diff --git a/ext/-test-/bignum/depend b/ext/-test-/bignum/depend
index 5310a3a4be..7ddf1da1dc 100644
--- a/ext/-test-/bignum/depend
+++ b/ext/-test-/bignum/depend
@@ -1,109 +1,1141 @@
-big2str.o: big2str.c
-div.o: div.c
-intpack.o: intpack.c
-mul.o: mul.c
-str2big.o: str2big.c
-
 # AUTOGENERATED DEPENDENCIES START
 big2str.o: $(RUBY_EXTCONF_H)
 big2str.o: $(arch_hdrdir)/ruby/config.h
+big2str.o: $(hdrdir)/ruby.h
+big2str.o: $(hdrdir)/ruby/internal/anyargs.h
+big2str.o: $(hdrdir)/ruby/internal/arithmetic.h
+big2str.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+big2str.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+big2str.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+big2str.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+big2str.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+big2str.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+big2str.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+big2str.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+big2str.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+big2str.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+big2str.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+big2str.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+big2str.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+big2str.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+big2str.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+big2str.o: $(hdrdir)/ruby/internal/assume.h
+big2str.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+big2str.o: $(hdrdir)/ruby/internal/attr/artificial.h
+big2str.o: $(hdrdir)/ruby/internal/attr/cold.h
+big2str.o: $(hdrdir)/ruby/internal/attr/const.h
+big2str.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+big2str.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+big2str.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+big2str.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+big2str.o: $(hdrdir)/ruby/internal/attr/error.h
+big2str.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+big2str.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+big2str.o: $(hdrdir)/ruby/internal/attr/format.h
+big2str.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+big2str.o: $(hdrdir)/ruby/internal/attr/noalias.h
+big2str.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+big2str.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+big2str.o: $(hdrdir)/ruby/internal/attr/noinline.h
+big2str.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+big2str.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+big2str.o: $(hdrdir)/ruby/internal/attr/pure.h
+big2str.o: $(hdrdir)/ruby/internal/attr/restrict.h
+big2str.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+big2str.o: $(hdrdir)/ruby/internal/attr/warning.h
+big2str.o: $(hdrdir)/ruby/internal/attr/weakref.h
+big2str.o: $(hdrdir)/ruby/internal/cast.h
+big2str.o: $(hdrdir)/ruby/internal/compiler_is.h
+big2str.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+big2str.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+big2str.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+big2str.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+big2str.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+big2str.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+big2str.o: $(hdrdir)/ruby/internal/compiler_since.h
+big2str.o: $(hdrdir)/ruby/internal/config.h
+big2str.o: $(hdrdir)/ruby/internal/constant_p.h
+big2str.o: $(hdrdir)/ruby/internal/core.h
+big2str.o: $(hdrdir)/ruby/internal/core/rarray.h
+big2str.o: $(hdrdir)/ruby/internal/core/rbasic.h
+big2str.o: $(hdrdir)/ruby/internal/core/rbignum.h
+big2str.o: $(hdrdir)/ruby/internal/core/rclass.h
+big2str.o: $(hdrdir)/ruby/internal/core/rdata.h
+big2str.o: $(hdrdir)/ruby/internal/core/rfile.h
+big2str.o: $(hdrdir)/ruby/internal/core/rhash.h
+big2str.o: $(hdrdir)/ruby/internal/core/robject.h
+big2str.o: $(hdrdir)/ruby/internal/core/rregexp.h
+big2str.o: $(hdrdir)/ruby/internal/core/rstring.h
+big2str.o: $(hdrdir)/ruby/internal/core/rstruct.h
+big2str.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+big2str.o: $(hdrdir)/ruby/internal/ctype.h
+big2str.o: $(hdrdir)/ruby/internal/dllexport.h
+big2str.o: $(hdrdir)/ruby/internal/dosish.h
+big2str.o: $(hdrdir)/ruby/internal/error.h
+big2str.o: $(hdrdir)/ruby/internal/eval.h
+big2str.o: $(hdrdir)/ruby/internal/event.h
+big2str.o: $(hdrdir)/ruby/internal/fl_type.h
+big2str.o: $(hdrdir)/ruby/internal/gc.h
+big2str.o: $(hdrdir)/ruby/internal/glob.h
+big2str.o: $(hdrdir)/ruby/internal/globals.h
+big2str.o: $(hdrdir)/ruby/internal/has/attribute.h
+big2str.o: $(hdrdir)/ruby/internal/has/builtin.h
+big2str.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+big2str.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+big2str.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+big2str.o: $(hdrdir)/ruby/internal/has/extension.h
+big2str.o: $(hdrdir)/ruby/internal/has/feature.h
+big2str.o: $(hdrdir)/ruby/internal/has/warning.h
+big2str.o: $(hdrdir)/ruby/internal/intern/array.h
+big2str.o: $(hdrdir)/ruby/internal/intern/bignum.h
+big2str.o: $(hdrdir)/ruby/internal/intern/class.h
+big2str.o: $(hdrdir)/ruby/internal/intern/compar.h
+big2str.o: $(hdrdir)/ruby/internal/intern/complex.h
+big2str.o: $(hdrdir)/ruby/internal/intern/cont.h
+big2str.o: $(hdrdir)/ruby/internal/intern/dir.h
+big2str.o: $(hdrdir)/ruby/internal/intern/enum.h
+big2str.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+big2str.o: $(hdrdir)/ruby/internal/intern/error.h
+big2str.o: $(hdrdir)/ruby/internal/intern/eval.h
+big2str.o: $(hdrdir)/ruby/internal/intern/file.h
+big2str.o: $(hdrdir)/ruby/internal/intern/gc.h
+big2str.o: $(hdrdir)/ruby/internal/intern/hash.h
+big2str.o: $(hdrdir)/ruby/internal/intern/io.h
+big2str.o: $(hdrdir)/ruby/internal/intern/load.h
+big2str.o: $(hdrdir)/ruby/internal/intern/marshal.h
+big2str.o: $(hdrdir)/ruby/internal/intern/numeric.h
+big2str.o: $(hdrdir)/ruby/internal/intern/object.h
+big2str.o: $(hdrdir)/ruby/internal/intern/parse.h
+big2str.o: $(hdrdir)/ruby/internal/intern/proc.h
+big2str.o: $(hdrdir)/ruby/internal/intern/process.h
+big2str.o: $(hdrdir)/ruby/internal/intern/random.h
+big2str.o: $(hdrdir)/ruby/internal/intern/range.h
+big2str.o: $(hdrdir)/ruby/internal/intern/rational.h
+big2str.o: $(hdrdir)/ruby/internal/intern/re.h
+big2str.o: $(hdrdir)/ruby/internal/intern/ruby.h
+big2str.o: $(hdrdir)/ruby/internal/intern/select.h
+big2str.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+big2str.o: $(hdrdir)/ruby/internal/intern/signal.h
+big2str.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+big2str.o: $(hdrdir)/ruby/internal/intern/string.h
+big2str.o: $(hdrdir)/ruby/internal/intern/struct.h
+big2str.o: $(hdrdir)/ruby/internal/intern/thread.h
+big2str.o: $(hdrdir)/ruby/internal/intern/time.h
+big2str.o: $(hdrdir)/ruby/internal/intern/variable.h
+big2str.o: $(hdrdir)/ruby/internal/intern/vm.h
+big2str.o: $(hdrdir)/ruby/internal/interpreter.h
+big2str.o: $(hdrdir)/ruby/internal/iterator.h
+big2str.o: $(hdrdir)/ruby/internal/memory.h
+big2str.o: $(hdrdir)/ruby/internal/method.h
+big2str.o: $(hdrdir)/ruby/internal/module.h
+big2str.o: $(hdrdir)/ruby/internal/newobj.h
+big2str.o: $(hdrdir)/ruby/internal/rgengc.h
+big2str.o: $(hdrdir)/ruby/internal/scan_args.h
+big2str.o: $(hdrdir)/ruby/internal/special_consts.h
+big2str.o: $(hdrdir)/ruby/internal/static_assert.h
+big2str.o: $(hdrdir)/ruby/internal/stdalign.h
+big2str.o: $(hdrdir)/ruby/internal/stdbool.h
+big2str.o: $(hdrdir)/ruby/internal/symbol.h
+big2str.o: $(hdrdir)/ruby/internal/token_paste.h
+big2str.o: $(hdrdir)/ruby/internal/value.h
+big2str.o: $(hdrdir)/ruby/internal/value_type.h
+big2str.o: $(hdrdir)/ruby/internal/variable.h
+big2str.o: $(hdrdir)/ruby/internal/warning_push.h
+big2str.o: $(hdrdir)/ruby/internal/xmalloc.h
+big2str.o: $(hdrdir)/ruby/assert.h
 big2str.o: $(hdrdir)/ruby/backward.h
+big2str.o: $(hdrdir)/ruby/backward/2/assume.h
+big2str.o: $(hdrdir)/ruby/backward/2/attributes.h
+big2str.o: $(hdrdir)/ruby/backward/2/bool.h
+big2str.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+big2str.o: $(hdrdir)/ruby/backward/2/inttypes.h
+big2str.o: $(hdrdir)/ruby/backward/2/limits.h
+big2str.o: $(hdrdir)/ruby/backward/2/long_long.h
+big2str.o: $(hdrdir)/ruby/backward/2/stdalign.h
+big2str.o: $(hdrdir)/ruby/backward/2/stdarg.h
 big2str.o: $(hdrdir)/ruby/defines.h
-big2str.o: $(hdrdir)/ruby/encoding.h
 big2str.o: $(hdrdir)/ruby/intern.h
-big2str.o: $(hdrdir)/ruby/io.h
 big2str.o: $(hdrdir)/ruby/missing.h
-big2str.o: $(hdrdir)/ruby/oniguruma.h
 big2str.o: $(hdrdir)/ruby/ruby.h
 big2str.o: $(hdrdir)/ruby/st.h
 big2str.o: $(hdrdir)/ruby/subst.h
-big2str.o: $(top_srcdir)/include/ruby.h
 big2str.o: $(top_srcdir)/internal.h
+big2str.o: $(top_srcdir)/internal/bignum.h
 big2str.o: big2str.c
 bigzero.o: $(RUBY_EXTCONF_H)
 bigzero.o: $(arch_hdrdir)/ruby/config.h
+bigzero.o: $(hdrdir)/ruby.h
+bigzero.o: $(hdrdir)/ruby/internal/anyargs.h
+bigzero.o: $(hdrdir)/ruby/internal/arithmetic.h
+bigzero.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+bigzero.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+bigzero.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+bigzero.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+bigzero.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+bigzero.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+bigzero.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+bigzero.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+bigzero.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+bigzero.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+bigzero.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+bigzero.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+bigzero.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+bigzero.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+bigzero.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+bigzero.o: $(hdrdir)/ruby/internal/assume.h
+bigzero.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+bigzero.o: $(hdrdir)/ruby/internal/attr/artificial.h
+bigzero.o: $(hdrdir)/ruby/internal/attr/cold.h
+bigzero.o: $(hdrdir)/ruby/internal/attr/const.h
+bigzero.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+bigzero.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+bigzero.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+bigzero.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+bigzero.o: $(hdrdir)/ruby/internal/attr/error.h
+bigzero.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+bigzero.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+bigzero.o: $(hdrdir)/ruby/internal/attr/format.h
+bigzero.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+bigzero.o: $(hdrdir)/ruby/internal/attr/noalias.h
+bigzero.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+bigzero.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+bigzero.o: $(hdrdir)/ruby/internal/attr/noinline.h
+bigzero.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+bigzero.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+bigzero.o: $(hdrdir)/ruby/internal/attr/pure.h
+bigzero.o: $(hdrdir)/ruby/internal/attr/restrict.h
+bigzero.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+bigzero.o: $(hdrdir)/ruby/internal/attr/warning.h
+bigzero.o: $(hdrdir)/ruby/internal/attr/weakref.h
+bigzero.o: $(hdrdir)/ruby/internal/cast.h
+bigzero.o: $(hdrdir)/ruby/internal/compiler_is.h
+bigzero.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+bigzero.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+bigzero.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+bigzero.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+bigzero.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+bigzero.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+bigzero.o: $(hdrdir)/ruby/internal/compiler_since.h
+bigzero.o: $(hdrdir)/ruby/internal/config.h
+bigzero.o: $(hdrdir)/ruby/internal/constant_p.h
+bigzero.o: $(hdrdir)/ruby/internal/core.h
+bigzero.o: $(hdrdir)/ruby/internal/core/rarray.h
+bigzero.o: $(hdrdir)/ruby/internal/core/rbasic.h
+bigzero.o: $(hdrdir)/ruby/internal/core/rbignum.h
+bigzero.o: $(hdrdir)/ruby/internal/core/rclass.h
+bigzero.o: $(hdrdir)/ruby/internal/core/rdata.h
+bigzero.o: $(hdrdir)/ruby/internal/core/rfile.h
+bigzero.o: $(hdrdir)/ruby/internal/core/rhash.h
+bigzero.o: $(hdrdir)/ruby/internal/core/robject.h
+bigzero.o: $(hdrdir)/ruby/internal/core/rregexp.h
+bigzero.o: $(hdrdir)/ruby/internal/core/rstring.h
+bigzero.o: $(hdrdir)/ruby/internal/core/rstruct.h
+bigzero.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+bigzero.o: $(hdrdir)/ruby/internal/ctype.h
+bigzero.o: $(hdrdir)/ruby/internal/dllexport.h
+bigzero.o: $(hdrdir)/ruby/internal/dosish.h
+bigzero.o: $(hdrdir)/ruby/internal/error.h
+bigzero.o: $(hdrdir)/ruby/internal/eval.h
+bigzero.o: $(hdrdir)/ruby/internal/event.h
+bigzero.o: $(hdrdir)/ruby/internal/fl_type.h
+bigzero.o: $(hdrdir)/ruby/internal/gc.h
+bigzero.o: $(hdrdir)/ruby/internal/glob.h
+bigzero.o: $(hdrdir)/ruby/internal/globals.h
+bigzero.o: $(hdrdir)/ruby/internal/has/attribute.h
+bigzero.o: $(hdrdir)/ruby/internal/has/builtin.h
+bigzero.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+bigzero.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+bigzero.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+bigzero.o: $(hdrdir)/ruby/internal/has/extension.h
+bigzero.o: $(hdrdir)/ruby/internal/has/feature.h
+bigzero.o: $(hdrdir)/ruby/internal/has/warning.h
+bigzero.o: $(hdrdir)/ruby/internal/intern/array.h
+bigzero.o: $(hdrdir)/ruby/internal/intern/bignum.h
+bigzero.o: $(hdrdir)/ruby/internal/intern/class.h
+bigzero.o: $(hdrdir)/ruby/internal/intern/compar.h
+bigzero.o: $(hdrdir)/ruby/internal/intern/complex.h
+bigzero.o: $(hdrdir)/ruby/internal/intern/cont.h
+bigzero.o: $(hdrdir)/ruby/internal/intern/dir.h
+bigzero.o: $(hdrdir)/ruby/internal/intern/enum.h
+bigzero.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+bigzero.o: $(hdrdir)/ruby/internal/intern/error.h
+bigzero.o: $(hdrdir)/ruby/internal/intern/eval.h
+bigzero.o: $(hdrdir)/ruby/internal/intern/file.h
+bigzero.o: $(hdrdir)/ruby/internal/intern/gc.h
+bigzero.o: $(hdrdir)/ruby/internal/intern/hash.h
+bigzero.o: $(hdrdir)/ruby/internal/intern/io.h
+bigzero.o: $(hdrdir)/ruby/internal/intern/load.h
+bigzero.o: $(hdrdir)/ruby/internal/intern/marshal.h
+bigzero.o: $(hdrdir)/ruby/internal/intern/numeric.h
+bigzero.o: $(hdrdir)/ruby/internal/intern/object.h
+bigzero.o: $(hdrdir)/ruby/internal/intern/parse.h
+bigzero.o: $(hdrdir)/ruby/internal/intern/proc.h
+bigzero.o: $(hdrdir)/ruby/internal/intern/process.h
+bigzero.o: $(hdrdir)/ruby/internal/intern/random.h
+bigzero.o: $(hdrdir)/ruby/internal/intern/range.h
+bigzero.o: $(hdrdir)/ruby/internal/intern/rational.h
+bigzero.o: $(hdrdir)/ruby/internal/intern/re.h
+bigzero.o: $(hdrdir)/ruby/internal/intern/ruby.h
+bigzero.o: $(hdrdir)/ruby/internal/intern/select.h
+bigzero.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+bigzero.o: $(hdrdir)/ruby/internal/intern/signal.h
+bigzero.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+bigzero.o: $(hdrdir)/ruby/internal/intern/string.h
+bigzero.o: $(hdrdir)/ruby/internal/intern/struct.h
+bigzero.o: $(hdrdir)/ruby/internal/intern/thread.h
+bigzero.o: $(hdrdir)/ruby/internal/intern/time.h
+bigzero.o: $(hdrdir)/ruby/internal/intern/variable.h
+bigzero.o: $(hdrdir)/ruby/internal/intern/vm.h
+bigzero.o: $(hdrdir)/ruby/internal/interpreter.h
+bigzero.o: $(hdrdir)/ruby/internal/iterator.h
+bigzero.o: $(hdrdir)/ruby/internal/memory.h
+bigzero.o: $(hdrdir)/ruby/internal/method.h
+bigzero.o: $(hdrdir)/ruby/internal/module.h
+bigzero.o: $(hdrdir)/ruby/internal/newobj.h
+bigzero.o: $(hdrdir)/ruby/internal/rgengc.h
+bigzero.o: $(hdrdir)/ruby/internal/scan_args.h
+bigzero.o: $(hdrdir)/ruby/internal/special_consts.h
+bigzero.o: $(hdrdir)/ruby/internal/static_assert.h
+bigzero.o: $(hdrdir)/ruby/internal/stdalign.h
+bigzero.o: $(hdrdir)/ruby/internal/stdbool.h
+bigzero.o: $(hdrdir)/ruby/internal/symbol.h
+bigzero.o: $(hdrdir)/ruby/internal/token_paste.h
+bigzero.o: $(hdrdir)/ruby/internal/value.h
+bigzero.o: $(hdrdir)/ruby/internal/value_type.h
+bigzero.o: $(hdrdir)/ruby/internal/variable.h
+bigzero.o: $(hdrdir)/ruby/internal/warning_push.h
+bigzero.o: $(hdrdir)/ruby/internal/xmalloc.h
+bigzero.o: $(hdrdir)/ruby/assert.h
 bigzero.o: $(hdrdir)/ruby/backward.h
+bigzero.o: $(hdrdir)/ruby/backward/2/assume.h
+bigzero.o: $(hdrdir)/ruby/backward/2/attributes.h
+bigzero.o: $(hdrdir)/ruby/backward/2/bool.h
+bigzero.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+bigzero.o: $(hdrdir)/ruby/backward/2/inttypes.h
+bigzero.o: $(hdrdir)/ruby/backward/2/limits.h
+bigzero.o: $(hdrdir)/ruby/backward/2/long_long.h
+bigzero.o: $(hdrdir)/ruby/backward/2/stdalign.h
+bigzero.o: $(hdrdir)/ruby/backward/2/stdarg.h
 bigzero.o: $(hdrdir)/ruby/defines.h
-bigzero.o: $(hdrdir)/ruby/encoding.h
 bigzero.o: $(hdrdir)/ruby/intern.h
-bigzero.o: $(hdrdir)/ruby/io.h
 bigzero.o: $(hdrdir)/ruby/missing.h
-bigzero.o: $(hdrdir)/ruby/oniguruma.h
 bigzero.o: $(hdrdir)/ruby/ruby.h
 bigzero.o: $(hdrdir)/ruby/st.h
 bigzero.o: $(hdrdir)/ruby/subst.h
-bigzero.o: $(top_srcdir)/include/ruby.h
 bigzero.o: $(top_srcdir)/internal.h
+bigzero.o: $(top_srcdir)/internal/bignum.h
 bigzero.o: bigzero.c
 div.o: $(RUBY_EXTCONF_H)
 div.o: $(arch_hdrdir)/ruby/config.h
+div.o: $(hdrdir)/ruby.h
+div.o: $(hdrdir)/ruby/internal/anyargs.h
+div.o: $(hdrdir)/ruby/internal/arithmetic.h
+div.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+div.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+div.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+div.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+div.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+div.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+div.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+div.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+div.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+div.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+div.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+div.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+div.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+div.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+div.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+div.o: $(hdrdir)/ruby/internal/assume.h
+div.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+div.o: $(hdrdir)/ruby/internal/attr/artificial.h
+div.o: $(hdrdir)/ruby/internal/attr/cold.h
+div.o: $(hdrdir)/ruby/internal/attr/const.h
+div.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+div.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+div.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+div.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+div.o: $(hdrdir)/ruby/internal/attr/error.h
+div.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+div.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+div.o: $(hdrdir)/ruby/internal/attr/format.h
+div.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+div.o: $(hdrdir)/ruby/internal/attr/noalias.h
+div.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+div.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+div.o: $(hdrdir)/ruby/internal/attr/noinline.h
+div.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+div.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+div.o: $(hdrdir)/ruby/internal/attr/pure.h
+div.o: $(hdrdir)/ruby/internal/attr/restrict.h
+div.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+div.o: $(hdrdir)/ruby/internal/attr/warning.h
+div.o: $(hdrdir)/ruby/internal/attr/weakref.h
+div.o: $(hdrdir)/ruby/internal/cast.h
+div.o: $(hdrdir)/ruby/internal/compiler_is.h
+div.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+div.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+div.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+div.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+div.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+div.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+div.o: $(hdrdir)/ruby/internal/compiler_since.h
+div.o: $(hdrdir)/ruby/internal/config.h
+div.o: $(hdrdir)/ruby/internal/constant_p.h
+div.o: $(hdrdir)/ruby/internal/core.h
+div.o: $(hdrdir)/ruby/internal/core/rarray.h
+div.o: $(hdrdir)/ruby/internal/core/rbasic.h
+div.o: $(hdrdir)/ruby/internal/core/rbignum.h
+div.o: $(hdrdir)/ruby/internal/core/rclass.h
+div.o: $(hdrdir)/ruby/internal/core/rdata.h
+div.o: $(hdrdir)/ruby/internal/core/rfile.h
+div.o: $(hdrdir)/ruby/internal/core/rhash.h
+div.o: $(hdrdir)/ruby/internal/core/robject.h
+div.o: $(hdrdir)/ruby/internal/core/rregexp.h
+div.o: $(hdrdir)/ruby/internal/core/rstring.h
+div.o: $(hdrdir)/ruby/internal/core/rstruct.h
+div.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+div.o: $(hdrdir)/ruby/internal/ctype.h
+div.o: $(hdrdir)/ruby/internal/dllexport.h
+div.o: $(hdrdir)/ruby/internal/dosish.h
+div.o: $(hdrdir)/ruby/internal/error.h
+div.o: $(hdrdir)/ruby/internal/eval.h
+div.o: $(hdrdir)/ruby/internal/event.h
+div.o: $(hdrdir)/ruby/internal/fl_type.h
+div.o: $(hdrdir)/ruby/internal/gc.h
+div.o: $(hdrdir)/ruby/internal/glob.h
+div.o: $(hdrdir)/ruby/internal/globals.h
+div.o: $(hdrdir)/ruby/internal/has/attribute.h
+div.o: $(hdrdir)/ruby/internal/has/builtin.h
+div.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+div.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+div.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+div.o: $(hdrdir)/ruby/internal/has/extension.h
+div.o: $(hdrdir)/ruby/internal/has/feature.h
+div.o: $(hdrdir)/ruby/internal/has/warning.h
+div.o: $(hdrdir)/ruby/internal/intern/array.h
+div.o: $(hdrdir)/ruby/internal/intern/bignum.h
+div.o: $(hdrdir)/ruby/internal/intern/class.h
+div.o: $(hdrdir)/ruby/internal/intern/compar.h
+div.o: $(hdrdir)/ruby/internal/intern/complex.h
+div.o: $(hdrdir)/ruby/internal/intern/cont.h
+div.o: $(hdrdir)/ruby/internal/intern/dir.h
+div.o: $(hdrdir)/ruby/internal/intern/enum.h
+div.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+div.o: $(hdrdir)/ruby/internal/intern/error.h
+div.o: $(hdrdir)/ruby/internal/intern/eval.h
+div.o: $(hdrdir)/ruby/internal/intern/file.h
+div.o: $(hdrdir)/ruby/internal/intern/gc.h
+div.o: $(hdrdir)/ruby/internal/intern/hash.h
+div.o: $(hdrdir)/ruby/internal/intern/io.h
+div.o: $(hdrdir)/ruby/internal/intern/load.h
+div.o: $(hdrdir)/ruby/internal/intern/marshal.h
+div.o: $(hdrdir)/ruby/internal/intern/numeric.h
+div.o: $(hdrdir)/ruby/internal/intern/object.h
+div.o: $(hdrdir)/ruby/internal/intern/parse.h
+div.o: $(hdrdir)/ruby/internal/intern/proc.h
+div.o: $(hdrdir)/ruby/internal/intern/process.h
+div.o: $(hdrdir)/ruby/internal/intern/random.h
+div.o: $(hdrdir)/ruby/internal/intern/range.h
+div.o: $(hdrdir)/ruby/internal/intern/rational.h
+div.o: $(hdrdir)/ruby/internal/intern/re.h
+div.o: $(hdrdir)/ruby/internal/intern/ruby.h
+div.o: $(hdrdir)/ruby/internal/intern/select.h
+div.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+div.o: $(hdrdir)/ruby/internal/intern/signal.h
+div.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+div.o: $(hdrdir)/ruby/internal/intern/string.h
+div.o: $(hdrdir)/ruby/internal/intern/struct.h
+div.o: $(hdrdir)/ruby/internal/intern/thread.h
+div.o: $(hdrdir)/ruby/internal/intern/time.h
+div.o: $(hdrdir)/ruby/internal/intern/variable.h
+div.o: $(hdrdir)/ruby/internal/intern/vm.h
+div.o: $(hdrdir)/ruby/internal/interpreter.h
+div.o: $(hdrdir)/ruby/internal/iterator.h
+div.o: $(hdrdir)/ruby/internal/memory.h
+div.o: $(hdrdir)/ruby/internal/method.h
+div.o: $(hdrdir)/ruby/internal/module.h
+div.o: $(hdrdir)/ruby/internal/newobj.h
+div.o: $(hdrdir)/ruby/internal/rgengc.h
+div.o: $(hdrdir)/ruby/internal/scan_args.h
+div.o: $(hdrdir)/ruby/internal/special_consts.h
+div.o: $(hdrdir)/ruby/internal/static_assert.h
+div.o: $(hdrdir)/ruby/internal/stdalign.h
+div.o: $(hdrdir)/ruby/internal/stdbool.h
+div.o: $(hdrdir)/ruby/internal/symbol.h
+div.o: $(hdrdir)/ruby/internal/token_paste.h
+div.o: $(hdrdir)/ruby/internal/value.h
+div.o: $(hdrdir)/ruby/internal/value_type.h
+div.o: $(hdrdir)/ruby/internal/variable.h
+div.o: $(hdrdir)/ruby/internal/warning_push.h
+div.o: $(hdrdir)/ruby/internal/xmalloc.h
+div.o: $(hdrdir)/ruby/assert.h
 div.o: $(hdrdir)/ruby/backward.h
+div.o: $(hdrdir)/ruby/backward/2/assume.h
+div.o: $(hdrdir)/ruby/backward/2/attributes.h
+div.o: $(hdrdir)/ruby/backward/2/bool.h
+div.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+div.o: $(hdrdir)/ruby/backward/2/inttypes.h
+div.o: $(hdrdir)/ruby/backward/2/limits.h
+div.o: $(hdrdir)/ruby/backward/2/long_long.h
+div.o: $(hdrdir)/ruby/backward/2/stdalign.h
+div.o: $(hdrdir)/ruby/backward/2/stdarg.h
 div.o: $(hdrdir)/ruby/defines.h
-div.o: $(hdrdir)/ruby/encoding.h
 div.o: $(hdrdir)/ruby/intern.h
-div.o: $(hdrdir)/ruby/io.h
 div.o: $(hdrdir)/ruby/missing.h
-div.o: $(hdrdir)/ruby/oniguruma.h
 div.o: $(hdrdir)/ruby/ruby.h
 div.o: $(hdrdir)/ruby/st.h
 div.o: $(hdrdir)/ruby/subst.h
-div.o: $(top_srcdir)/include/ruby.h
 div.o: $(top_srcdir)/internal.h
+div.o: $(top_srcdir)/internal/bignum.h
 div.o: div.c
 init.o: $(RUBY_EXTCONF_H)
 init.o: $(arch_hdrdir)/ruby/config.h
+init.o: $(hdrdir)/ruby.h
+init.o: $(hdrdir)/ruby/internal/anyargs.h
+init.o: $(hdrdir)/ruby/internal/arithmetic.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+init.o: $(hdrdir)/ruby/internal/assume.h
+init.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+init.o: $(hdrdir)/ruby/internal/attr/artificial.h
+init.o: $(hdrdir)/ruby/internal/attr/cold.h
+init.o: $(hdrdir)/ruby/internal/attr/const.h
+init.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+init.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+init.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+init.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+init.o: $(hdrdir)/ruby/internal/attr/error.h
+init.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+init.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+init.o: $(hdrdir)/ruby/internal/attr/format.h
+init.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+init.o: $(hdrdir)/ruby/internal/attr/noalias.h
+init.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+init.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+init.o: $(hdrdir)/ruby/internal/attr/noinline.h
+init.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+init.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+init.o: $(hdrdir)/ruby/internal/attr/pure.h
+init.o: $(hdrdir)/ruby/internal/attr/restrict.h
+init.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+init.o: $(hdrdir)/ruby/internal/attr/warning.h
+init.o: $(hdrdir)/ruby/internal/attr/weakref.h
+init.o: $(hdrdir)/ruby/internal/cast.h
+init.o: $(hdrdir)/ruby/internal/compiler_is.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+init.o: $(hdrdir)/ruby/internal/compiler_since.h
+init.o: $(hdrdir)/ruby/internal/config.h
+init.o: $(hdrdir)/ruby/internal/constant_p.h
+init.o: $(hdrdir)/ruby/internal/core.h
+init.o: $(hdrdir)/ruby/internal/core/rarray.h
+init.o: $(hdrdir)/ruby/internal/core/rbasic.h
+init.o: $(hdrdir)/ruby/internal/core/rbignum.h
+init.o: $(hdrdir)/ruby/internal/core/rclass.h
+init.o: $(hdrdir)/ruby/internal/core/rdata.h
+init.o: $(hdrdir)/ruby/internal/core/rfile.h
+init.o: $(hdrdir)/ruby/internal/core/rhash.h
+init.o: $(hdrdir)/ruby/internal/core/robject.h
+init.o: $(hdrdir)/ruby/internal/core/rregexp.h
+init.o: $(hdrdir)/ruby/internal/core/rstring.h
+init.o: $(hdrdir)/ruby/internal/core/rstruct.h
+init.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+init.o: $(hdrdir)/ruby/internal/ctype.h
+init.o: $(hdrdir)/ruby/internal/dllexport.h
+init.o: $(hdrdir)/ruby/internal/dosish.h
+init.o: $(hdrdir)/ruby/internal/error.h
+init.o: $(hdrdir)/ruby/internal/eval.h
+init.o: $(hdrdir)/ruby/internal/event.h
+init.o: $(hdrdir)/ruby/internal/fl_type.h
+init.o: $(hdrdir)/ruby/internal/gc.h
+init.o: $(hdrdir)/ruby/internal/glob.h
+init.o: $(hdrdir)/ruby/internal/globals.h
+init.o: $(hdrdir)/ruby/internal/has/attribute.h
+init.o: $(hdrdir)/ruby/internal/has/builtin.h
+init.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/extension.h
+init.o: $(hdrdir)/ruby/internal/has/feature.h
+init.o: $(hdrdir)/ruby/internal/has/warning.h
+init.o: $(hdrdir)/ruby/internal/intern/array.h
+init.o: $(hdrdir)/ruby/internal/intern/bignum.h
+init.o: $(hdrdir)/ruby/internal/intern/class.h
+init.o: $(hdrdir)/ruby/internal/intern/compar.h
+init.o: $(hdrdir)/ruby/internal/intern/complex.h
+init.o: $(hdrdir)/ruby/internal/intern/cont.h
+init.o: $(hdrdir)/ruby/internal/intern/dir.h
+init.o: $(hdrdir)/ruby/internal/intern/enum.h
+init.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+init.o: $(hdrdir)/ruby/internal/intern/error.h
+init.o: $(hdrdir)/ruby/internal/intern/eval.h
+init.o: $(hdrdir)/ruby/internal/intern/file.h
+init.o: $(hdrdir)/ruby/internal/intern/gc.h
+init.o: $(hdrdir)/ruby/internal/intern/hash.h
+init.o: $(hdrdir)/ruby/internal/intern/io.h
+init.o: $(hdrdir)/ruby/internal/intern/load.h
+init.o: $(hdrdir)/ruby/internal/intern/marshal.h
+init.o: $(hdrdir)/ruby/internal/intern/numeric.h
+init.o: $(hdrdir)/ruby/internal/intern/object.h
+init.o: $(hdrdir)/ruby/internal/intern/parse.h
+init.o: $(hdrdir)/ruby/internal/intern/proc.h
+init.o: $(hdrdir)/ruby/internal/intern/process.h
+init.o: $(hdrdir)/ruby/internal/intern/random.h
+init.o: $(hdrdir)/ruby/internal/intern/range.h
+init.o: $(hdrdir)/ruby/internal/intern/rational.h
+init.o: $(hdrdir)/ruby/internal/intern/re.h
+init.o: $(hdrdir)/ruby/internal/intern/ruby.h
+init.o: $(hdrdir)/ruby/internal/intern/select.h
+init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+init.o: $(hdrdir)/ruby/internal/intern/signal.h
+init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+init.o: $(hdrdir)/ruby/internal/intern/string.h
+init.o: $(hdrdir)/ruby/internal/intern/struct.h
+init.o: $(hdrdir)/ruby/internal/intern/thread.h
+init.o: $(hdrdir)/ruby/internal/intern/time.h
+init.o: $(hdrdir)/ruby/internal/intern/variable.h
+init.o: $(hdrdir)/ruby/internal/intern/vm.h
+init.o: $(hdrdir)/ruby/internal/interpreter.h
+init.o: $(hdrdir)/ruby/internal/iterator.h
+init.o: $(hdrdir)/ruby/internal/memory.h
+init.o: $(hdrdir)/ruby/internal/method.h
+init.o: $(hdrdir)/ruby/internal/module.h
+init.o: $(hdrdir)/ruby/internal/newobj.h
+init.o: $(hdrdir)/ruby/internal/rgengc.h
+init.o: $(hdrdir)/ruby/internal/scan_args.h
+init.o: $(hdrdir)/ruby/internal/special_consts.h
+init.o: $(hdrdir)/ruby/internal/static_assert.h
+init.o: $(hdrdir)/ruby/internal/stdalign.h
+init.o: $(hdrdir)/ruby/internal/stdbool.h
+init.o: $(hdrdir)/ruby/internal/symbol.h
+init.o: $(hdrdir)/ruby/internal/token_paste.h
+init.o: $(hdrdir)/ruby/internal/value.h
+init.o: $(hdrdir)/ruby/internal/value_type.h
+init.o: $(hdrdir)/ruby/internal/variable.h
+init.o: $(hdrdir)/ruby/internal/warning_push.h
+init.o: $(hdrdir)/ruby/internal/xmalloc.h
+init.o: $(hdrdir)/ruby/assert.h
 init.o: $(hdrdir)/ruby/backward.h
+init.o: $(hdrdir)/ruby/backward/2/assume.h
+init.o: $(hdrdir)/ruby/backward/2/attributes.h
+init.o: $(hdrdir)/ruby/backward/2/bool.h
+init.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+init.o: $(hdrdir)/ruby/backward/2/inttypes.h
+init.o: $(hdrdir)/ruby/backward/2/limits.h
+init.o: $(hdrdir)/ruby/backward/2/long_long.h
+init.o: $(hdrdir)/ruby/backward/2/stdalign.h
+init.o: $(hdrdir)/ruby/backward/2/stdarg.h
 init.o: $(hdrdir)/ruby/defines.h
 init.o: $(hdrdir)/ruby/intern.h
 init.o: $(hdrdir)/ruby/missing.h
 init.o: $(hdrdir)/ruby/ruby.h
 init.o: $(hdrdir)/ruby/st.h
 init.o: $(hdrdir)/ruby/subst.h
-init.o: $(top_srcdir)/include/ruby.h
 init.o: init.c
 intpack.o: $(RUBY_EXTCONF_H)
 intpack.o: $(arch_hdrdir)/ruby/config.h
+intpack.o: $(hdrdir)/ruby.h
+intpack.o: $(hdrdir)/ruby/internal/anyargs.h
+intpack.o: $(hdrdir)/ruby/internal/arithmetic.h
+intpack.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+intpack.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+intpack.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+intpack.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+intpack.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+intpack.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+intpack.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+intpack.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+intpack.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+intpack.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+intpack.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+intpack.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+intpack.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+intpack.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+intpack.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+intpack.o: $(hdrdir)/ruby/internal/assume.h
+intpack.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+intpack.o: $(hdrdir)/ruby/internal/attr/artificial.h
+intpack.o: $(hdrdir)/ruby/internal/attr/cold.h
+intpack.o: $(hdrdir)/ruby/internal/attr/const.h
+intpack.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+intpack.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+intpack.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+intpack.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+intpack.o: $(hdrdir)/ruby/internal/attr/error.h
+intpack.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+intpack.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+intpack.o: $(hdrdir)/ruby/internal/attr/format.h
+intpack.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+intpack.o: $(hdrdir)/ruby/internal/attr/noalias.h
+intpack.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+intpack.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+intpack.o: $(hdrdir)/ruby/internal/attr/noinline.h
+intpack.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+intpack.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+intpack.o: $(hdrdir)/ruby/internal/attr/pure.h
+intpack.o: $(hdrdir)/ruby/internal/attr/restrict.h
+intpack.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+intpack.o: $(hdrdir)/ruby/internal/attr/warning.h
+intpack.o: $(hdrdir)/ruby/internal/attr/weakref.h
+intpack.o: $(hdrdir)/ruby/internal/cast.h
+intpack.o: $(hdrdir)/ruby/internal/compiler_is.h
+intpack.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+intpack.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+intpack.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+intpack.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+intpack.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+intpack.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+intpack.o: $(hdrdir)/ruby/internal/compiler_since.h
+intpack.o: $(hdrdir)/ruby/internal/config.h
+intpack.o: $(hdrdir)/ruby/internal/constant_p.h
+intpack.o: $(hdrdir)/ruby/internal/core.h
+intpack.o: $(hdrdir)/ruby/internal/core/rarray.h
+intpack.o: $(hdrdir)/ruby/internal/core/rbasic.h
+intpack.o: $(hdrdir)/ruby/internal/core/rbignum.h
+intpack.o: $(hdrdir)/ruby/internal/core/rclass.h
+intpack.o: $(hdrdir)/ruby/internal/core/rdata.h
+intpack.o: $(hdrdir)/ruby/internal/core/rfile.h
+intpack.o: $(hdrdir)/ruby/internal/core/rhash.h
+intpack.o: $(hdrdir)/ruby/internal/core/robject.h
+intpack.o: $(hdrdir)/ruby/internal/core/rregexp.h
+intpack.o: $(hdrdir)/ruby/internal/core/rstring.h
+intpack.o: $(hdrdir)/ruby/internal/core/rstruct.h
+intpack.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+intpack.o: $(hdrdir)/ruby/internal/ctype.h
+intpack.o: $(hdrdir)/ruby/internal/dllexport.h
+intpack.o: $(hdrdir)/ruby/internal/dosish.h
+intpack.o: $(hdrdir)/ruby/internal/error.h
+intpack.o: $(hdrdir)/ruby/internal/eval.h
+intpack.o: $(hdrdir)/ruby/internal/event.h
+intpack.o: $(hdrdir)/ruby/internal/fl_type.h
+intpack.o: $(hdrdir)/ruby/internal/gc.h
+intpack.o: $(hdrdir)/ruby/internal/glob.h
+intpack.o: $(hdrdir)/ruby/internal/globals.h
+intpack.o: $(hdrdir)/ruby/internal/has/attribute.h
+intpack.o: $(hdrdir)/ruby/internal/has/builtin.h
+intpack.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+intpack.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+intpack.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+intpack.o: $(hdrdir)/ruby/internal/has/extension.h
+intpack.o: $(hdrdir)/ruby/internal/has/feature.h
+intpack.o: $(hdrdir)/ruby/internal/has/warning.h
+intpack.o: $(hdrdir)/ruby/internal/intern/array.h
+intpack.o: $(hdrdir)/ruby/internal/intern/bignum.h
+intpack.o: $(hdrdir)/ruby/internal/intern/class.h
+intpack.o: $(hdrdir)/ruby/internal/intern/compar.h
+intpack.o: $(hdrdir)/ruby/internal/intern/complex.h
+intpack.o: $(hdrdir)/ruby/internal/intern/cont.h
+intpack.o: $(hdrdir)/ruby/internal/intern/dir.h
+intpack.o: $(hdrdir)/ruby/internal/intern/enum.h
+intpack.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+intpack.o: $(hdrdir)/ruby/internal/intern/error.h
+intpack.o: $(hdrdir)/ruby/internal/intern/eval.h
+intpack.o: $(hdrdir)/ruby/internal/intern/file.h
+intpack.o: $(hdrdir)/ruby/internal/intern/gc.h
+intpack.o: $(hdrdir)/ruby/internal/intern/hash.h
+intpack.o: $(hdrdir)/ruby/internal/intern/io.h
+intpack.o: $(hdrdir)/ruby/internal/intern/load.h
+intpack.o: $(hdrdir)/ruby/internal/intern/marshal.h
+intpack.o: $(hdrdir)/ruby/internal/intern/numeric.h
+intpack.o: $(hdrdir)/ruby/internal/intern/object.h
+intpack.o: $(hdrdir)/ruby/internal/intern/parse.h
+intpack.o: $(hdrdir)/ruby/internal/intern/proc.h
+intpack.o: $(hdrdir)/ruby/internal/intern/process.h
+intpack.o: $(hdrdir)/ruby/internal/intern/random.h
+intpack.o: $(hdrdir)/ruby/internal/intern/range.h
+intpack.o: $(hdrdir)/ruby/internal/intern/rational.h
+intpack.o: $(hdrdir)/ruby/internal/intern/re.h
+intpack.o: $(hdrdir)/ruby/internal/intern/ruby.h
+intpack.o: $(hdrdir)/ruby/internal/intern/select.h
+intpack.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+intpack.o: $(hdrdir)/ruby/internal/intern/signal.h
+intpack.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+intpack.o: $(hdrdir)/ruby/internal/intern/string.h
+intpack.o: $(hdrdir)/ruby/internal/intern/struct.h
+intpack.o: $(hdrdir)/ruby/internal/intern/thread.h
+intpack.o: $(hdrdir)/ruby/internal/intern/time.h
+intpack.o: $(hdrdir)/ruby/internal/intern/variable.h
+intpack.o: $(hdrdir)/ruby/internal/intern/vm.h
+intpack.o: $(hdrdir)/ruby/internal/interpreter.h
+intpack.o: $(hdrdir)/ruby/internal/iterator.h
+intpack.o: $(hdrdir)/ruby/internal/memory.h
+intpack.o: $(hdrdir)/ruby/internal/method.h
+intpack.o: $(hdrdir)/ruby/internal/module.h
+intpack.o: $(hdrdir)/ruby/internal/newobj.h
+intpack.o: $(hdrdir)/ruby/internal/rgengc.h
+intpack.o: $(hdrdir)/ruby/internal/scan_args.h
+intpack.o: $(hdrdir)/ruby/internal/special_consts.h
+intpack.o: $(hdrdir)/ruby/internal/static_assert.h
+intpack.o: $(hdrdir)/ruby/internal/stdalign.h
+intpack.o: $(hdrdir)/ruby/internal/stdbool.h
+intpack.o: $(hdrdir)/ruby/internal/symbol.h
+intpack.o: $(hdrdir)/ruby/internal/token_paste.h
+intpack.o: $(hdrdir)/ruby/internal/value.h
+intpack.o: $(hdrdir)/ruby/internal/value_type.h
+intpack.o: $(hdrdir)/ruby/internal/variable.h
+intpack.o: $(hdrdir)/ruby/internal/warning_push.h
+intpack.o: $(hdrdir)/ruby/internal/xmalloc.h
+intpack.o: $(hdrdir)/ruby/assert.h
 intpack.o: $(hdrdir)/ruby/backward.h
+intpack.o: $(hdrdir)/ruby/backward/2/assume.h
+intpack.o: $(hdrdir)/ruby/backward/2/attributes.h
+intpack.o: $(hdrdir)/ruby/backward/2/bool.h
+intpack.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+intpack.o: $(hdrdir)/ruby/backward/2/inttypes.h
+intpack.o: $(hdrdir)/ruby/backward/2/limits.h
+intpack.o: $(hdrdir)/ruby/backward/2/long_long.h
+intpack.o: $(hdrdir)/ruby/backward/2/stdalign.h
+intpack.o: $(hdrdir)/ruby/backward/2/stdarg.h
 intpack.o: $(hdrdir)/ruby/defines.h
-intpack.o: $(hdrdir)/ruby/encoding.h
 intpack.o: $(hdrdir)/ruby/intern.h
-intpack.o: $(hdrdir)/ruby/io.h
 intpack.o: $(hdrdir)/ruby/missing.h
-intpack.o: $(hdrdir)/ruby/oniguruma.h
 intpack.o: $(hdrdir)/ruby/ruby.h
 intpack.o: $(hdrdir)/ruby/st.h
 intpack.o: $(hdrdir)/ruby/subst.h
-intpack.o: $(top_srcdir)/include/ruby.h
 intpack.o: $(top_srcdir)/internal.h
+intpack.o: $(top_srcdir)/internal/bignum.h
 intpack.o: intpack.c
 mul.o: $(RUBY_EXTCONF_H)
 mul.o: $(arch_hdrdir)/ruby/config.h
+mul.o: $(hdrdir)/ruby.h
+mul.o: $(hdrdir)/ruby/internal/anyargs.h
+mul.o: $(hdrdir)/ruby/internal/arithmetic.h
+mul.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+mul.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+mul.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+mul.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+mul.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+mul.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+mul.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+mul.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+mul.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+mul.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+mul.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+mul.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+mul.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+mul.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+mul.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+mul.o: $(hdrdir)/ruby/internal/assume.h
+mul.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+mul.o: $(hdrdir)/ruby/internal/attr/artificial.h
+mul.o: $(hdrdir)/ruby/internal/attr/cold.h
+mul.o: $(hdrdir)/ruby/internal/attr/const.h
+mul.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+mul.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+mul.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+mul.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+mul.o: $(hdrdir)/ruby/internal/attr/error.h
+mul.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+mul.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+mul.o: $(hdrdir)/ruby/internal/attr/format.h
+mul.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+mul.o: $(hdrdir)/ruby/internal/attr/noalias.h
+mul.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+mul.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+mul.o: $(hdrdir)/ruby/internal/attr/noinline.h
+mul.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+mul.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+mul.o: $(hdrdir)/ruby/internal/attr/pure.h
+mul.o: $(hdrdir)/ruby/internal/attr/restrict.h
+mul.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+mul.o: $(hdrdir)/ruby/internal/attr/warning.h
+mul.o: $(hdrdir)/ruby/internal/attr/weakref.h
+mul.o: $(hdrdir)/ruby/internal/cast.h
+mul.o: $(hdrdir)/ruby/internal/compiler_is.h
+mul.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+mul.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+mul.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+mul.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+mul.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+mul.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+mul.o: $(hdrdir)/ruby/internal/compiler_since.h
+mul.o: $(hdrdir)/ruby/internal/config.h
+mul.o: $(hdrdir)/ruby/internal/constant_p.h
+mul.o: $(hdrdir)/ruby/internal/core.h
+mul.o: $(hdrdir)/ruby/internal/core/rarray.h
+mul.o: $(hdrdir)/ruby/internal/core/rbasic.h
+mul.o: $(hdrdir)/ruby/internal/core/rbignum.h
+mul.o: $(hdrdir)/ruby/internal/core/rclass.h
+mul.o: $(hdrdir)/ruby/internal/core/rdata.h
+mul.o: $(hdrdir)/ruby/internal/core/rfile.h
+mul.o: $(hdrdir)/ruby/internal/core/rhash.h
+mul.o: $(hdrdir)/ruby/internal/core/robject.h
+mul.o: $(hdrdir)/ruby/internal/core/rregexp.h
+mul.o: $(hdrdir)/ruby/internal/core/rstring.h
+mul.o: $(hdrdir)/ruby/internal/core/rstruct.h
+mul.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+mul.o: $(hdrdir)/ruby/internal/ctype.h
+mul.o: $(hdrdir)/ruby/internal/dllexport.h
+mul.o: $(hdrdir)/ruby/internal/dosish.h
+mul.o: $(hdrdir)/ruby/internal/error.h
+mul.o: $(hdrdir)/ruby/internal/eval.h
+mul.o: $(hdrdir)/ruby/internal/event.h
+mul.o: $(hdrdir)/ruby/internal/fl_type.h
+mul.o: $(hdrdir)/ruby/internal/gc.h
+mul.o: $(hdrdir)/ruby/internal/glob.h
+mul.o: $(hdrdir)/ruby/internal/globals.h
+mul.o: $(hdrdir)/ruby/internal/has/attribute.h
+mul.o: $(hdrdir)/ruby/internal/has/builtin.h
+mul.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+mul.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+mul.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+mul.o: $(hdrdir)/ruby/internal/has/extension.h
+mul.o: $(hdrdir)/ruby/internal/has/feature.h
+mul.o: $(hdrdir)/ruby/internal/has/warning.h
+mul.o: $(hdrdir)/ruby/internal/intern/array.h
+mul.o: $(hdrdir)/ruby/internal/intern/bignum.h
+mul.o: $(hdrdir)/ruby/internal/intern/class.h
+mul.o: $(hdrdir)/ruby/internal/intern/compar.h
+mul.o: $(hdrdir)/ruby/internal/intern/complex.h
+mul.o: $(hdrdir)/ruby/internal/intern/cont.h
+mul.o: $(hdrdir)/ruby/internal/intern/dir.h
+mul.o: $(hdrdir)/ruby/internal/intern/enum.h
+mul.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+mul.o: $(hdrdir)/ruby/internal/intern/error.h
+mul.o: $(hdrdir)/ruby/internal/intern/eval.h
+mul.o: $(hdrdir)/ruby/internal/intern/file.h
+mul.o: $(hdrdir)/ruby/internal/intern/gc.h
+mul.o: $(hdrdir)/ruby/internal/intern/hash.h
+mul.o: $(hdrdir)/ruby/internal/intern/io.h
+mul.o: $(hdrdir)/ruby/internal/intern/load.h
+mul.o: $(hdrdir)/ruby/internal/intern/marshal.h
+mul.o: $(hdrdir)/ruby/internal/intern/numeric.h
+mul.o: $(hdrdir)/ruby/internal/intern/object.h
+mul.o: $(hdrdir)/ruby/internal/intern/parse.h
+mul.o: $(hdrdir)/ruby/internal/intern/proc.h
+mul.o: $(hdrdir)/ruby/internal/intern/process.h
+mul.o: $(hdrdir)/ruby/internal/intern/random.h
+mul.o: $(hdrdir)/ruby/internal/intern/range.h
+mul.o: $(hdrdir)/ruby/internal/intern/rational.h
+mul.o: $(hdrdir)/ruby/internal/intern/re.h
+mul.o: $(hdrdir)/ruby/internal/intern/ruby.h
+mul.o: $(hdrdir)/ruby/internal/intern/select.h
+mul.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+mul.o: $(hdrdir)/ruby/internal/intern/signal.h
+mul.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+mul.o: $(hdrdir)/ruby/internal/intern/string.h
+mul.o: $(hdrdir)/ruby/internal/intern/struct.h
+mul.o: $(hdrdir)/ruby/internal/intern/thread.h
+mul.o: $(hdrdir)/ruby/internal/intern/time.h
+mul.o: $(hdrdir)/ruby/internal/intern/variable.h
+mul.o: $(hdrdir)/ruby/internal/intern/vm.h
+mul.o: $(hdrdir)/ruby/internal/interpreter.h
+mul.o: $(hdrdir)/ruby/internal/iterator.h
+mul.o: $(hdrdir)/ruby/internal/memory.h
+mul.o: $(hdrdir)/ruby/internal/method.h
+mul.o: $(hdrdir)/ruby/internal/module.h
+mul.o: $(hdrdir)/ruby/internal/newobj.h
+mul.o: $(hdrdir)/ruby/internal/rgengc.h
+mul.o: $(hdrdir)/ruby/internal/scan_args.h
+mul.o: $(hdrdir)/ruby/internal/special_consts.h
+mul.o: $(hdrdir)/ruby/internal/static_assert.h
+mul.o: $(hdrdir)/ruby/internal/stdalign.h
+mul.o: $(hdrdir)/ruby/internal/stdbool.h
+mul.o: $(hdrdir)/ruby/internal/symbol.h
+mul.o: $(hdrdir)/ruby/internal/token_paste.h
+mul.o: $(hdrdir)/ruby/internal/value.h
+mul.o: $(hdrdir)/ruby/internal/value_type.h
+mul.o: $(hdrdir)/ruby/internal/variable.h
+mul.o: $(hdrdir)/ruby/internal/warning_push.h
+mul.o: $(hdrdir)/ruby/internal/xmalloc.h
+mul.o: $(hdrdir)/ruby/assert.h
 mul.o: $(hdrdir)/ruby/backward.h
+mul.o: $(hdrdir)/ruby/backward/2/assume.h
+mul.o: $(hdrdir)/ruby/backward/2/attributes.h
+mul.o: $(hdrdir)/ruby/backward/2/bool.h
+mul.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+mul.o: $(hdrdir)/ruby/backward/2/inttypes.h
+mul.o: $(hdrdir)/ruby/backward/2/limits.h
+mul.o: $(hdrdir)/ruby/backward/2/long_long.h
+mul.o: $(hdrdir)/ruby/backward/2/stdalign.h
+mul.o: $(hdrdir)/ruby/backward/2/stdarg.h
 mul.o: $(hdrdir)/ruby/defines.h
-mul.o: $(hdrdir)/ruby/encoding.h
 mul.o: $(hdrdir)/ruby/intern.h
-mul.o: $(hdrdir)/ruby/io.h
 mul.o: $(hdrdir)/ruby/missing.h
-mul.o: $(hdrdir)/ruby/oniguruma.h
 mul.o: $(hdrdir)/ruby/ruby.h
 mul.o: $(hdrdir)/ruby/st.h
 mul.o: $(hdrdir)/ruby/subst.h
-mul.o: $(top_srcdir)/include/ruby.h
 mul.o: $(top_srcdir)/internal.h
+mul.o: $(top_srcdir)/internal/bignum.h
 mul.o: mul.c
 str2big.o: $(RUBY_EXTCONF_H)
 str2big.o: $(arch_hdrdir)/ruby/config.h
+str2big.o: $(hdrdir)/ruby.h
+str2big.o: $(hdrdir)/ruby/internal/anyargs.h
+str2big.o: $(hdrdir)/ruby/internal/arithmetic.h
+str2big.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+str2big.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+str2big.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+str2big.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+str2big.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+str2big.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+str2big.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+str2big.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+str2big.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+str2big.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+str2big.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+str2big.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+str2big.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+str2big.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+str2big.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+str2big.o: $(hdrdir)/ruby/internal/assume.h
+str2big.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+str2big.o: $(hdrdir)/ruby/internal/attr/artificial.h
+str2big.o: $(hdrdir)/ruby/internal/attr/cold.h
+str2big.o: $(hdrdir)/ruby/internal/attr/const.h
+str2big.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+str2big.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+str2big.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+str2big.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+str2big.o: $(hdrdir)/ruby/internal/attr/error.h
+str2big.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+str2big.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+str2big.o: $(hdrdir)/ruby/internal/attr/format.h
+str2big.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+str2big.o: $(hdrdir)/ruby/internal/attr/noalias.h
+str2big.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+str2big.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+str2big.o: $(hdrdir)/ruby/internal/attr/noinline.h
+str2big.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+str2big.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+str2big.o: $(hdrdir)/ruby/internal/attr/pure.h
+str2big.o: $(hdrdir)/ruby/internal/attr/restrict.h
+str2big.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+str2big.o: $(hdrdir)/ruby/internal/attr/warning.h
+str2big.o: $(hdrdir)/ruby/internal/attr/weakref.h
+str2big.o: $(hdrdir)/ruby/internal/cast.h
+str2big.o: $(hdrdir)/ruby/internal/compiler_is.h
+str2big.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+str2big.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+str2big.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+str2big.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+str2big.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+str2big.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+str2big.o: $(hdrdir)/ruby/internal/compiler_since.h
+str2big.o: $(hdrdir)/ruby/internal/config.h
+str2big.o: $(hdrdir)/ruby/internal/constant_p.h
+str2big.o: $(hdrdir)/ruby/internal/core.h
+str2big.o: $(hdrdir)/ruby/internal/core/rarray.h
+str2big.o: $(hdrdir)/ruby/internal/core/rbasic.h
+str2big.o: $(hdrdir)/ruby/internal/core/rbignum.h
+str2big.o: $(hdrdir)/ruby/internal/core/rclass.h
+str2big.o: $(hdrdir)/ruby/internal/core/rdata.h
+str2big.o: $(hdrdir)/ruby/internal/core/rfile.h
+str2big.o: $(hdrdir)/ruby/internal/core/rhash.h
+str2big.o: $(hdrdir)/ruby/internal/core/robject.h
+str2big.o: $(hdrdir)/ruby/internal/core/rregexp.h
+str2big.o: $(hdrdir)/ruby/internal/core/rstring.h
+str2big.o: $(hdrdir)/ruby/internal/core/rstruct.h
+str2big.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+str2big.o: $(hdrdir)/ruby/internal/ctype.h
+str2big.o: $(hdrdir)/ruby/internal/dllexport.h
+str2big.o: $(hdrdir)/ruby/internal/dosish.h
+str2big.o: $(hdrdir)/ruby/internal/error.h
+str2big.o: $(hdrdir)/ruby/internal/eval.h
+str2big.o: $(hdrdir)/ruby/internal/event.h
+str2big.o: $(hdrdir)/ruby/internal/fl_type.h
+str2big.o: $(hdrdir)/ruby/internal/gc.h
+str2big.o: $(hdrdir)/ruby/internal/glob.h
+str2big.o: $(hdrdir)/ruby/internal/globals.h
+str2big.o: $(hdrdir)/ruby/internal/has/attribute.h
+str2big.o: $(hdrdir)/ruby/internal/has/builtin.h
+str2big.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+str2big.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+str2big.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+str2big.o: $(hdrdir)/ruby/internal/has/extension.h
+str2big.o: $(hdrdir)/ruby/internal/has/feature.h
+str2big.o: $(hdrdir)/ruby/internal/has/warning.h
+str2big.o: $(hdrdir)/ruby/internal/intern/array.h
+str2big.o: $(hdrdir)/ruby/internal/intern/bignum.h
+str2big.o: $(hdrdir)/ruby/internal/intern/class.h
+str2big.o: $(hdrdir)/ruby/internal/intern/compar.h
+str2big.o: $(hdrdir)/ruby/internal/intern/complex.h
+str2big.o: $(hdrdir)/ruby/internal/intern/cont.h
+str2big.o: $(hdrdir)/ruby/internal/intern/dir.h
+str2big.o: $(hdrdir)/ruby/internal/intern/enum.h
+str2big.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+str2big.o: $(hdrdir)/ruby/internal/intern/error.h
+str2big.o: $(hdrdir)/ruby/internal/intern/eval.h
+str2big.o: $(hdrdir)/ruby/internal/intern/file.h
+str2big.o: $(hdrdir)/ruby/internal/intern/gc.h
+str2big.o: $(hdrdir)/ruby/internal/intern/hash.h
+str2big.o: $(hdrdir)/ruby/internal/intern/io.h
+str2big.o: $(hdrdir)/ruby/internal/intern/load.h
+str2big.o: $(hdrdir)/ruby/internal/intern/marshal.h
+str2big.o: $(hdrdir)/ruby/internal/intern/numeric.h
+str2big.o: $(hdrdir)/ruby/internal/intern/object.h
+str2big.o: $(hdrdir)/ruby/internal/intern/parse.h
+str2big.o: $(hdrdir)/ruby/internal/intern/proc.h
+str2big.o: $(hdrdir)/ruby/internal/intern/process.h
+str2big.o: $(hdrdir)/ruby/internal/intern/random.h
+str2big.o: $(hdrdir)/ruby/internal/intern/range.h
+str2big.o: $(hdrdir)/ruby/internal/intern/rational.h
+str2big.o: $(hdrdir)/ruby/internal/intern/re.h
+str2big.o: $(hdrdir)/ruby/internal/intern/ruby.h
+str2big.o: $(hdrdir)/ruby/internal/intern/select.h
+str2big.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+str2big.o: $(hdrdir)/ruby/internal/intern/signal.h
+str2big.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+str2big.o: $(hdrdir)/ruby/internal/intern/string.h
+str2big.o: $(hdrdir)/ruby/internal/intern/struct.h
+str2big.o: $(hdrdir)/ruby/internal/intern/thread.h
+str2big.o: $(hdrdir)/ruby/internal/intern/time.h
+str2big.o: $(hdrdir)/ruby/internal/intern/variable.h
+str2big.o: $(hdrdir)/ruby/internal/intern/vm.h
+str2big.o: $(hdrdir)/ruby/internal/interpreter.h
+str2big.o: $(hdrdir)/ruby/internal/iterator.h
+str2big.o: $(hdrdir)/ruby/internal/memory.h
+str2big.o: $(hdrdir)/ruby/internal/method.h
+str2big.o: $(hdrdir)/ruby/internal/module.h
+str2big.o: $(hdrdir)/ruby/internal/newobj.h
+str2big.o: $(hdrdir)/ruby/internal/rgengc.h
+str2big.o: $(hdrdir)/ruby/internal/scan_args.h
+str2big.o: $(hdrdir)/ruby/internal/special_consts.h
+str2big.o: $(hdrdir)/ruby/internal/static_assert.h
+str2big.o: $(hdrdir)/ruby/internal/stdalign.h
+str2big.o: $(hdrdir)/ruby/internal/stdbool.h
+str2big.o: $(hdrdir)/ruby/internal/symbol.h
+str2big.o: $(hdrdir)/ruby/internal/token_paste.h
+str2big.o: $(hdrdir)/ruby/internal/value.h
+str2big.o: $(hdrdir)/ruby/internal/value_type.h
+str2big.o: $(hdrdir)/ruby/internal/variable.h
+str2big.o: $(hdrdir)/ruby/internal/warning_push.h
+str2big.o: $(hdrdir)/ruby/internal/xmalloc.h
+str2big.o: $(hdrdir)/ruby/assert.h
 str2big.o: $(hdrdir)/ruby/backward.h
+str2big.o: $(hdrdir)/ruby/backward/2/assume.h
+str2big.o: $(hdrdir)/ruby/backward/2/attributes.h
+str2big.o: $(hdrdir)/ruby/backward/2/bool.h
+str2big.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+str2big.o: $(hdrdir)/ruby/backward/2/inttypes.h
+str2big.o: $(hdrdir)/ruby/backward/2/limits.h
+str2big.o: $(hdrdir)/ruby/backward/2/long_long.h
+str2big.o: $(hdrdir)/ruby/backward/2/stdalign.h
+str2big.o: $(hdrdir)/ruby/backward/2/stdarg.h
 str2big.o: $(hdrdir)/ruby/defines.h
-str2big.o: $(hdrdir)/ruby/encoding.h
 str2big.o: $(hdrdir)/ruby/intern.h
-str2big.o: $(hdrdir)/ruby/io.h
 str2big.o: $(hdrdir)/ruby/missing.h
-str2big.o: $(hdrdir)/ruby/oniguruma.h
 str2big.o: $(hdrdir)/ruby/ruby.h
 str2big.o: $(hdrdir)/ruby/st.h
 str2big.o: $(hdrdir)/ruby/subst.h
-str2big.o: $(top_srcdir)/include/ruby.h
 str2big.o: $(top_srcdir)/internal.h
+str2big.o: $(top_srcdir)/internal/bignum.h
 str2big.o: str2big.c
 # AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/bignum/div.c b/ext/-test-/bignum/div.c
index a1db21dc30..2be0d2d62a 100644
--- a/ext/-test-/bignum/div.c
+++ b/ext/-test-/bignum/div.c
@@ -1,4 +1,4 @@
-#include "internal.h"
+#include "internal/bignum.h"
 
 static VALUE
 big(VALUE x)
diff --git a/ext/-test-/bignum/intpack.c b/ext/-test-/bignum/intpack.c
index 2d19442cf2..698362f96f 100644
--- a/ext/-test-/bignum/intpack.c
+++ b/ext/-test-/bignum/intpack.c
@@ -1,4 +1,4 @@
-#include "internal.h"
+#include "internal/bignum.h"
 
 static VALUE
 rb_integer_pack_raw_m(VALUE val, VALUE buf, VALUE numwords_arg, VALUE wordsize_arg, VALUE nails, VALUE flags)
diff --git a/ext/-test-/bignum/mul.c b/ext/-test-/bignum/mul.c
index b922f34437..1b6eb911bd 100644
--- a/ext/-test-/bignum/mul.c
+++ b/ext/-test-/bignum/mul.c
@@ -1,4 +1,4 @@
-#include "internal.h"
+#include "internal/bignum.h"
 
 static VALUE
 big(VALUE x)
diff --git a/ext/-test-/bignum/str2big.c b/ext/-test-/bignum/str2big.c
index bc79ef0329..7dd2da9a07 100644
--- a/ext/-test-/bignum/str2big.c
+++ b/ext/-test-/bignum/str2big.c
@@ -1,4 +1,4 @@
-#include "internal.h"
+#include "internal/bignum.h"
 
 static VALUE
 str2big_poweroftwo(VALUE str, VALUE vbase, VALUE badcheck)
diff --git a/ext/-test-/bug-14834/bug-14384.c b/ext/-test-/bug-14834/bug-14384.c
new file mode 100644
index 0000000000..3a16a2d222
--- /dev/null
+++ b/ext/-test-/bug-14834/bug-14384.c
@@ -0,0 +1,39 @@
+#include <ruby/ruby.h>
+#include <ruby/debug.h>
+
+#ifndef MAYBE_UNUSED
+# define MAYBE_UNUSED(x) x
+#endif
+
+static NOINLINE(VALUE f(VALUE));
+static NOINLINE(void g(VALUE, void*));
+extern NOINLINE(void Init_bug_14384(void));
+
+void
+Init_bug_14834(void)
+{
+    VALUE q = rb_define_module("Bug");
+    rb_define_module_function(q, "bug_14834", f, 0);
+}
+
+VALUE
+f(VALUE q)
+{
+    int   w[] = { 0, 1024 };
+    VALUE e   = rb_tracepoint_new(Qnil, RUBY_INTERNAL_EVENT_NEWOBJ, g, w);
+
+    rb_tracepoint_enable(e);
+    return rb_ensure(rb_yield, q, rb_tracepoint_disable, e);
+}
+
+void
+g(MAYBE_UNUSED(VALUE q), void* w)
+{
+    const int *e = (const int *)w;
+    const int  r = *e++;
+    const int  t = *e++;
+    VALUE     *y = ALLOCA_N(VALUE, t);
+    int       *u = ALLOCA_N(int, t);
+
+    rb_profile_frames(r, t, y, u);
+}
diff --git a/ext/-test-/bug-14834/depend b/ext/-test-/bug-14834/depend
new file mode 100644
index 0000000000..dce5a8e5c5
--- /dev/null
+++ b/ext/-test-/bug-14834/depend
@@ -0,0 +1,163 @@
+# AUTOGENERATED DEPENDENCIES START
+bug-14384.o: $(RUBY_EXTCONF_H)
+bug-14384.o: $(arch_hdrdir)/ruby/config.h
+bug-14384.o: $(hdrdir)/ruby/internal/anyargs.h
+bug-14384.o: $(hdrdir)/ruby/internal/arithmetic.h
+bug-14384.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+bug-14384.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+bug-14384.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+bug-14384.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+bug-14384.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+bug-14384.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+bug-14384.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+bug-14384.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+bug-14384.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+bug-14384.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+bug-14384.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+bug-14384.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+bug-14384.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+bug-14384.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+bug-14384.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+bug-14384.o: $(hdrdir)/ruby/internal/assume.h
+bug-14384.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+bug-14384.o: $(hdrdir)/ruby/internal/attr/artificial.h
+bug-14384.o: $(hdrdir)/ruby/internal/attr/cold.h
+bug-14384.o: $(hdrdir)/ruby/internal/attr/const.h
+bug-14384.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+bug-14384.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+bug-14384.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+bug-14384.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+bug-14384.o: $(hdrdir)/ruby/internal/attr/error.h
+bug-14384.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+bug-14384.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+bug-14384.o: $(hdrdir)/ruby/internal/attr/format.h
+bug-14384.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+bug-14384.o: $(hdrdir)/ruby/internal/attr/noalias.h
+bug-14384.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+bug-14384.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+bug-14384.o: $(hdrdir)/ruby/internal/attr/noinline.h
+bug-14384.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+bug-14384.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+bug-14384.o: $(hdrdir)/ruby/internal/attr/pure.h
+bug-14384.o: $(hdrdir)/ruby/internal/attr/restrict.h
+bug-14384.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+bug-14384.o: $(hdrdir)/ruby/internal/attr/warning.h
+bug-14384.o: $(hdrdir)/ruby/internal/attr/weakref.h
+bug-14384.o: $(hdrdir)/ruby/internal/cast.h
+bug-14384.o: $(hdrdir)/ruby/internal/compiler_is.h
+bug-14384.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+bug-14384.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+bug-14384.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+bug-14384.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+bug-14384.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+bug-14384.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+bug-14384.o: $(hdrdir)/ruby/internal/compiler_since.h
+bug-14384.o: $(hdrdir)/ruby/internal/config.h
+bug-14384.o: $(hdrdir)/ruby/internal/constant_p.h
+bug-14384.o: $(hdrdir)/ruby/internal/core.h
+bug-14384.o: $(hdrdir)/ruby/internal/core/rarray.h
+bug-14384.o: $(hdrdir)/ruby/internal/core/rbasic.h
+bug-14384.o: $(hdrdir)/ruby/internal/core/rbignum.h
+bug-14384.o: $(hdrdir)/ruby/internal/core/rclass.h
+bug-14384.o: $(hdrdir)/ruby/internal/core/rdata.h
+bug-14384.o: $(hdrdir)/ruby/internal/core/rfile.h
+bug-14384.o: $(hdrdir)/ruby/internal/core/rhash.h
+bug-14384.o: $(hdrdir)/ruby/internal/core/robject.h
+bug-14384.o: $(hdrdir)/ruby/internal/core/rregexp.h
+bug-14384.o: $(hdrdir)/ruby/internal/core/rstring.h
+bug-14384.o: $(hdrdir)/ruby/internal/core/rstruct.h
+bug-14384.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+bug-14384.o: $(hdrdir)/ruby/internal/ctype.h
+bug-14384.o: $(hdrdir)/ruby/internal/dllexport.h
+bug-14384.o: $(hdrdir)/ruby/internal/dosish.h
+bug-14384.o: $(hdrdir)/ruby/internal/error.h
+bug-14384.o: $(hdrdir)/ruby/internal/eval.h
+bug-14384.o: $(hdrdir)/ruby/internal/event.h
+bug-14384.o: $(hdrdir)/ruby/internal/fl_type.h
+bug-14384.o: $(hdrdir)/ruby/internal/gc.h
+bug-14384.o: $(hdrdir)/ruby/internal/glob.h
+bug-14384.o: $(hdrdir)/ruby/internal/globals.h
+bug-14384.o: $(hdrdir)/ruby/internal/has/attribute.h
+bug-14384.o: $(hdrdir)/ruby/internal/has/builtin.h
+bug-14384.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+bug-14384.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+bug-14384.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+bug-14384.o: $(hdrdir)/ruby/internal/has/extension.h
+bug-14384.o: $(hdrdir)/ruby/internal/has/feature.h
+bug-14384.o: $(hdrdir)/ruby/internal/has/warning.h
+bug-14384.o: $(hdrdir)/ruby/internal/intern/array.h
+bug-14384.o: $(hdrdir)/ruby/internal/intern/bignum.h
+bug-14384.o: $(hdrdir)/ruby/internal/intern/class.h
+bug-14384.o: $(hdrdir)/ruby/internal/intern/compar.h
+bug-14384.o: $(hdrdir)/ruby/internal/intern/complex.h
+bug-14384.o: $(hdrdir)/ruby/internal/intern/cont.h
+bug-14384.o: $(hdrdir)/ruby/internal/intern/dir.h
+bug-14384.o: $(hdrdir)/ruby/internal/intern/enum.h
+bug-14384.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+bug-14384.o: $(hdrdir)/ruby/internal/intern/error.h
+bug-14384.o: $(hdrdir)/ruby/internal/intern/eval.h
+bug-14384.o: $(hdrdir)/ruby/internal/intern/file.h
+bug-14384.o: $(hdrdir)/ruby/internal/intern/gc.h
+bug-14384.o: $(hdrdir)/ruby/internal/intern/hash.h
+bug-14384.o: $(hdrdir)/ruby/internal/intern/io.h
+bug-14384.o: $(hdrdir)/ruby/internal/intern/load.h
+bug-14384.o: $(hdrdir)/ruby/internal/intern/marshal.h
+bug-14384.o: $(hdrdir)/ruby/internal/intern/numeric.h
+bug-14384.o: $(hdrdir)/ruby/internal/intern/object.h
+bug-14384.o: $(hdrdir)/ruby/internal/intern/parse.h
+bug-14384.o: $(hdrdir)/ruby/internal/intern/proc.h
+bug-14384.o: $(hdrdir)/ruby/internal/intern/process.h
+bug-14384.o: $(hdrdir)/ruby/internal/intern/random.h
+bug-14384.o: $(hdrdir)/ruby/internal/intern/range.h
+bug-14384.o: $(hdrdir)/ruby/internal/intern/rational.h
+bug-14384.o: $(hdrdir)/ruby/internal/intern/re.h
+bug-14384.o: $(hdrdir)/ruby/internal/intern/ruby.h
+bug-14384.o: $(hdrdir)/ruby/internal/intern/select.h
+bug-14384.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+bug-14384.o: $(hdrdir)/ruby/internal/intern/signal.h
+bug-14384.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+bug-14384.o: $(hdrdir)/ruby/internal/intern/string.h
+bug-14384.o: $(hdrdir)/ruby/internal/intern/struct.h
+bug-14384.o: $(hdrdir)/ruby/internal/intern/thread.h
+bug-14384.o: $(hdrdir)/ruby/internal/intern/time.h
+bug-14384.o: $(hdrdir)/ruby/internal/intern/variable.h
+bug-14384.o: $(hdrdir)/ruby/internal/intern/vm.h
+bug-14384.o: $(hdrdir)/ruby/internal/interpreter.h
+bug-14384.o: $(hdrdir)/ruby/internal/iterator.h
+bug-14384.o: $(hdrdir)/ruby/internal/memory.h
+bug-14384.o: $(hdrdir)/ruby/internal/method.h
+bug-14384.o: $(hdrdir)/ruby/internal/module.h
+bug-14384.o: $(hdrdir)/ruby/internal/newobj.h
+bug-14384.o: $(hdrdir)/ruby/internal/rgengc.h
+bug-14384.o: $(hdrdir)/ruby/internal/scan_args.h
+bug-14384.o: $(hdrdir)/ruby/internal/special_consts.h
+bug-14384.o: $(hdrdir)/ruby/internal/static_assert.h
+bug-14384.o: $(hdrdir)/ruby/internal/stdalign.h
+bug-14384.o: $(hdrdir)/ruby/internal/stdbool.h
+bug-14384.o: $(hdrdir)/ruby/internal/symbol.h
+bug-14384.o: $(hdrdir)/ruby/internal/token_paste.h
+bug-14384.o: $(hdrdir)/ruby/internal/value.h
+bug-14384.o: $(hdrdir)/ruby/internal/value_type.h
+bug-14384.o: $(hdrdir)/ruby/internal/variable.h
+bug-14384.o: $(hdrdir)/ruby/internal/warning_push.h
+bug-14384.o: $(hdrdir)/ruby/internal/xmalloc.h
+bug-14384.o: $(hdrdir)/ruby/assert.h
+bug-14384.o: $(hdrdir)/ruby/backward.h
+bug-14384.o: $(hdrdir)/ruby/backward/2/assume.h
+bug-14384.o: $(hdrdir)/ruby/backward/2/attributes.h
+bug-14384.o: $(hdrdir)/ruby/backward/2/bool.h
+bug-14384.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+bug-14384.o: $(hdrdir)/ruby/backward/2/inttypes.h
+bug-14384.o: $(hdrdir)/ruby/backward/2/limits.h
+bug-14384.o: $(hdrdir)/ruby/backward/2/long_long.h
+bug-14384.o: $(hdrdir)/ruby/backward/2/stdalign.h
+bug-14384.o: $(hdrdir)/ruby/backward/2/stdarg.h
+bug-14384.o: $(hdrdir)/ruby/debug.h
+bug-14384.o: $(hdrdir)/ruby/defines.h
+bug-14384.o: $(hdrdir)/ruby/intern.h
+bug-14384.o: $(hdrdir)/ruby/missing.h
+bug-14384.o: $(hdrdir)/ruby/ruby.h
+bug-14384.o: $(hdrdir)/ruby/st.h
+bug-14384.o: $(hdrdir)/ruby/subst.h
+bug-14384.o: bug-14384.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/bug-14834/extconf.rb b/ext/-test-/bug-14834/extconf.rb
new file mode 100644
index 0000000000..e8f3f1f437
--- /dev/null
+++ b/ext/-test-/bug-14834/extconf.rb
@@ -0,0 +1,2 @@
+# frozen_string_literal: true
+create_makefile("-test-/bug_14834")
diff --git a/ext/-test-/bug-3571/bug.c b/ext/-test-/bug-3571/bug.c
index a64f054740..dd3c85cd79 100644
--- a/ext/-test-/bug-3571/bug.c
+++ b/ext/-test-/bug-3571/bug.c
@@ -8,7 +8,7 @@ bug_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, arg))
 }
 
 static VALUE
-bug_start(VALUE self, VALUE hash)
+bug_start(VALUE self)
 {
     VALUE ary = rb_ary_new3(1, Qnil);
     rb_block_call(ary, rb_intern("map"), 0, 0, bug_i, self);
diff --git a/ext/-test-/bug-3571/depend b/ext/-test-/bug-3571/depend
new file mode 100644
index 0000000000..a21935558d
--- /dev/null
+++ b/ext/-test-/bug-3571/depend
@@ -0,0 +1,163 @@
+# AUTOGENERATED DEPENDENCIES START
+bug.o: $(RUBY_EXTCONF_H)
+bug.o: $(arch_hdrdir)/ruby/config.h
+bug.o: $(hdrdir)/ruby.h
+bug.o: $(hdrdir)/ruby/internal/anyargs.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+bug.o: $(hdrdir)/ruby/internal/assume.h
+bug.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+bug.o: $(hdrdir)/ruby/internal/attr/artificial.h
+bug.o: $(hdrdir)/ruby/internal/attr/cold.h
+bug.o: $(hdrdir)/ruby/internal/attr/const.h
+bug.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+bug.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+bug.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+bug.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+bug.o: $(hdrdir)/ruby/internal/attr/error.h
+bug.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+bug.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+bug.o: $(hdrdir)/ruby/internal/attr/format.h
+bug.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+bug.o: $(hdrdir)/ruby/internal/attr/noalias.h
+bug.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+bug.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+bug.o: $(hdrdir)/ruby/internal/attr/noinline.h
+bug.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+bug.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+bug.o: $(hdrdir)/ruby/internal/attr/pure.h
+bug.o: $(hdrdir)/ruby/internal/attr/restrict.h
+bug.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+bug.o: $(hdrdir)/ruby/internal/attr/warning.h
+bug.o: $(hdrdir)/ruby/internal/attr/weakref.h
+bug.o: $(hdrdir)/ruby/internal/cast.h
+bug.o: $(hdrdir)/ruby/internal/compiler_is.h
+bug.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+bug.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+bug.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+bug.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+bug.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+bug.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+bug.o: $(hdrdir)/ruby/internal/compiler_since.h
+bug.o: $(hdrdir)/ruby/internal/config.h
+bug.o: $(hdrdir)/ruby/internal/constant_p.h
+bug.o: $(hdrdir)/ruby/internal/core.h
+bug.o: $(hdrdir)/ruby/internal/core/rarray.h
+bug.o: $(hdrdir)/ruby/internal/core/rbasic.h
+bug.o: $(hdrdir)/ruby/internal/core/rbignum.h
+bug.o: $(hdrdir)/ruby/internal/core/rclass.h
+bug.o: $(hdrdir)/ruby/internal/core/rdata.h
+bug.o: $(hdrdir)/ruby/internal/core/rfile.h
+bug.o: $(hdrdir)/ruby/internal/core/rhash.h
+bug.o: $(hdrdir)/ruby/internal/core/robject.h
+bug.o: $(hdrdir)/ruby/internal/core/rregexp.h
+bug.o: $(hdrdir)/ruby/internal/core/rstring.h
+bug.o: $(hdrdir)/ruby/internal/core/rstruct.h
+bug.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+bug.o: $(hdrdir)/ruby/internal/ctype.h
+bug.o: $(hdrdir)/ruby/internal/dllexport.h
+bug.o: $(hdrdir)/ruby/internal/dosish.h
+bug.o: $(hdrdir)/ruby/internal/error.h
+bug.o: $(hdrdir)/ruby/internal/eval.h
+bug.o: $(hdrdir)/ruby/internal/event.h
+bug.o: $(hdrdir)/ruby/internal/fl_type.h
+bug.o: $(hdrdir)/ruby/internal/gc.h
+bug.o: $(hdrdir)/ruby/internal/glob.h
+bug.o: $(hdrdir)/ruby/internal/globals.h
+bug.o: $(hdrdir)/ruby/internal/has/attribute.h
+bug.o: $(hdrdir)/ruby/internal/has/builtin.h
+bug.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+bug.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+bug.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+bug.o: $(hdrdir)/ruby/internal/has/extension.h
+bug.o: $(hdrdir)/ruby/internal/has/feature.h
+bug.o: $(hdrdir)/ruby/internal/has/warning.h
+bug.o: $(hdrdir)/ruby/internal/intern/array.h
+bug.o: $(hdrdir)/ruby/internal/intern/bignum.h
+bug.o: $(hdrdir)/ruby/internal/intern/class.h
+bug.o: $(hdrdir)/ruby/internal/intern/compar.h
+bug.o: $(hdrdir)/ruby/internal/intern/complex.h
+bug.o: $(hdrdir)/ruby/internal/intern/cont.h
+bug.o: $(hdrdir)/ruby/internal/intern/dir.h
+bug.o: $(hdrdir)/ruby/internal/intern/enum.h
+bug.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+bug.o: $(hdrdir)/ruby/internal/intern/error.h
+bug.o: $(hdrdir)/ruby/internal/intern/eval.h
+bug.o: $(hdrdir)/ruby/internal/intern/file.h
+bug.o: $(hdrdir)/ruby/internal/intern/gc.h
+bug.o: $(hdrdir)/ruby/internal/intern/hash.h
+bug.o: $(hdrdir)/ruby/internal/intern/io.h
+bug.o: $(hdrdir)/ruby/internal/intern/load.h
+bug.o: $(hdrdir)/ruby/internal/intern/marshal.h
+bug.o: $(hdrdir)/ruby/internal/intern/numeric.h
+bug.o: $(hdrdir)/ruby/internal/intern/object.h
+bug.o: $(hdrdir)/ruby/internal/intern/parse.h
+bug.o: $(hdrdir)/ruby/internal/intern/proc.h
+bug.o: $(hdrdir)/ruby/internal/intern/process.h
+bug.o: $(hdrdir)/ruby/internal/intern/random.h
+bug.o: $(hdrdir)/ruby/internal/intern/range.h
+bug.o: $(hdrdir)/ruby/internal/intern/rational.h
+bug.o: $(hdrdir)/ruby/internal/intern/re.h
+bug.o: $(hdrdir)/ruby/internal/intern/ruby.h
+bug.o: $(hdrdir)/ruby/internal/intern/select.h
+bug.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+bug.o: $(hdrdir)/ruby/internal/intern/signal.h
+bug.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+bug.o: $(hdrdir)/ruby/internal/intern/string.h
+bug.o: $(hdrdir)/ruby/internal/intern/struct.h
+bug.o: $(hdrdir)/ruby/internal/intern/thread.h
+bug.o: $(hdrdir)/ruby/internal/intern/time.h
+bug.o: $(hdrdir)/ruby/internal/intern/variable.h
+bug.o: $(hdrdir)/ruby/internal/intern/vm.h
+bug.o: $(hdrdir)/ruby/internal/interpreter.h
+bug.o: $(hdrdir)/ruby/internal/iterator.h
+bug.o: $(hdrdir)/ruby/internal/memory.h
+bug.o: $(hdrdir)/ruby/internal/method.h
+bug.o: $(hdrdir)/ruby/internal/module.h
+bug.o: $(hdrdir)/ruby/internal/newobj.h
+bug.o: $(hdrdir)/ruby/internal/rgengc.h
+bug.o: $(hdrdir)/ruby/internal/scan_args.h
+bug.o: $(hdrdir)/ruby/internal/special_consts.h
+bug.o: $(hdrdir)/ruby/internal/static_assert.h
+bug.o: $(hdrdir)/ruby/internal/stdalign.h
+bug.o: $(hdrdir)/ruby/internal/stdbool.h
+bug.o: $(hdrdir)/ruby/internal/symbol.h
+bug.o: $(hdrdir)/ruby/internal/token_paste.h
+bug.o: $(hdrdir)/ruby/internal/value.h
+bug.o: $(hdrdir)/ruby/internal/value_type.h
+bug.o: $(hdrdir)/ruby/internal/variable.h
+bug.o: $(hdrdir)/ruby/internal/warning_push.h
+bug.o: $(hdrdir)/ruby/internal/xmalloc.h
+bug.o: $(hdrdir)/ruby/assert.h
+bug.o: $(hdrdir)/ruby/backward.h
+bug.o: $(hdrdir)/ruby/backward/2/assume.h
+bug.o: $(hdrdir)/ruby/backward/2/attributes.h
+bug.o: $(hdrdir)/ruby/backward/2/bool.h
+bug.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+bug.o: $(hdrdir)/ruby/backward/2/inttypes.h
+bug.o: $(hdrdir)/ruby/backward/2/limits.h
+bug.o: $(hdrdir)/ruby/backward/2/long_long.h
+bug.o: $(hdrdir)/ruby/backward/2/stdalign.h
+bug.o: $(hdrdir)/ruby/backward/2/stdarg.h
+bug.o: $(hdrdir)/ruby/defines.h
+bug.o: $(hdrdir)/ruby/intern.h
+bug.o: $(hdrdir)/ruby/missing.h
+bug.o: $(hdrdir)/ruby/ruby.h
+bug.o: $(hdrdir)/ruby/st.h
+bug.o: $(hdrdir)/ruby/subst.h
+bug.o: bug.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/bug-5832/depend b/ext/-test-/bug-5832/depend
new file mode 100644
index 0000000000..a21935558d
--- /dev/null
+++ b/ext/-test-/bug-5832/depend
@@ -0,0 +1,163 @@
+# AUTOGENERATED DEPENDENCIES START
+bug.o: $(RUBY_EXTCONF_H)
+bug.o: $(arch_hdrdir)/ruby/config.h
+bug.o: $(hdrdir)/ruby.h
+bug.o: $(hdrdir)/ruby/internal/anyargs.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+bug.o: $(hdrdir)/ruby/internal/assume.h
+bug.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+bug.o: $(hdrdir)/ruby/internal/attr/artificial.h
+bug.o: $(hdrdir)/ruby/internal/attr/cold.h
+bug.o: $(hdrdir)/ruby/internal/attr/const.h
+bug.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+bug.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+bug.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+bug.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+bug.o: $(hdrdir)/ruby/internal/attr/error.h
+bug.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+bug.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+bug.o: $(hdrdir)/ruby/internal/attr/format.h
+bug.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+bug.o: $(hdrdir)/ruby/internal/attr/noalias.h
+bug.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+bug.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+bug.o: $(hdrdir)/ruby/internal/attr/noinline.h
+bug.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+bug.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+bug.o: $(hdrdir)/ruby/internal/attr/pure.h
+bug.o: $(hdrdir)/ruby/internal/attr/restrict.h
+bug.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+bug.o: $(hdrdir)/ruby/internal/attr/warning.h
+bug.o: $(hdrdir)/ruby/internal/attr/weakref.h
+bug.o: $(hdrdir)/ruby/internal/cast.h
+bug.o: $(hdrdir)/ruby/internal/compiler_is.h
+bug.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+bug.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+bug.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+bug.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+bug.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+bug.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+bug.o: $(hdrdir)/ruby/internal/compiler_since.h
+bug.o: $(hdrdir)/ruby/internal/config.h
+bug.o: $(hdrdir)/ruby/internal/constant_p.h
+bug.o: $(hdrdir)/ruby/internal/core.h
+bug.o: $(hdrdir)/ruby/internal/core/rarray.h
+bug.o: $(hdrdir)/ruby/internal/core/rbasic.h
+bug.o: $(hdrdir)/ruby/internal/core/rbignum.h
+bug.o: $(hdrdir)/ruby/internal/core/rclass.h
+bug.o: $(hdrdir)/ruby/internal/core/rdata.h
+bug.o: $(hdrdir)/ruby/internal/core/rfile.h
+bug.o: $(hdrdir)/ruby/internal/core/rhash.h
+bug.o: $(hdrdir)/ruby/internal/core/robject.h
+bug.o: $(hdrdir)/ruby/internal/core/rregexp.h
+bug.o: $(hdrdir)/ruby/internal/core/rstring.h
+bug.o: $(hdrdir)/ruby/internal/core/rstruct.h
+bug.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+bug.o: $(hdrdir)/ruby/internal/ctype.h
+bug.o: $(hdrdir)/ruby/internal/dllexport.h
+bug.o: $(hdrdir)/ruby/internal/dosish.h
+bug.o: $(hdrdir)/ruby/internal/error.h
+bug.o: $(hdrdir)/ruby/internal/eval.h
+bug.o: $(hdrdir)/ruby/internal/event.h
+bug.o: $(hdrdir)/ruby/internal/fl_type.h
+bug.o: $(hdrdir)/ruby/internal/gc.h
+bug.o: $(hdrdir)/ruby/internal/glob.h
+bug.o: $(hdrdir)/ruby/internal/globals.h
+bug.o: $(hdrdir)/ruby/internal/has/attribute.h
+bug.o: $(hdrdir)/ruby/internal/has/builtin.h
+bug.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+bug.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+bug.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+bug.o: $(hdrdir)/ruby/internal/has/extension.h
+bug.o: $(hdrdir)/ruby/internal/has/feature.h
+bug.o: $(hdrdir)/ruby/internal/has/warning.h
+bug.o: $(hdrdir)/ruby/internal/intern/array.h
+bug.o: $(hdrdir)/ruby/internal/intern/bignum.h
+bug.o: $(hdrdir)/ruby/internal/intern/class.h
+bug.o: $(hdrdir)/ruby/internal/intern/compar.h
+bug.o: $(hdrdir)/ruby/internal/intern/complex.h
+bug.o: $(hdrdir)/ruby/internal/intern/cont.h
+bug.o: $(hdrdir)/ruby/internal/intern/dir.h
+bug.o: $(hdrdir)/ruby/internal/intern/enum.h
+bug.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+bug.o: $(hdrdir)/ruby/internal/intern/error.h
+bug.o: $(hdrdir)/ruby/internal/intern/eval.h
+bug.o: $(hdrdir)/ruby/internal/intern/file.h
+bug.o: $(hdrdir)/ruby/internal/intern/gc.h
+bug.o: $(hdrdir)/ruby/internal/intern/hash.h
+bug.o: $(hdrdir)/ruby/internal/intern/io.h
+bug.o: $(hdrdir)/ruby/internal/intern/load.h
+bug.o: $(hdrdir)/ruby/internal/intern/marshal.h
+bug.o: $(hdrdir)/ruby/internal/intern/numeric.h
+bug.o: $(hdrdir)/ruby/internal/intern/object.h
+bug.o: $(hdrdir)/ruby/internal/intern/parse.h
+bug.o: $(hdrdir)/ruby/internal/intern/proc.h
+bug.o: $(hdrdir)/ruby/internal/intern/process.h
+bug.o: $(hdrdir)/ruby/internal/intern/random.h
+bug.o: $(hdrdir)/ruby/internal/intern/range.h
+bug.o: $(hdrdir)/ruby/internal/intern/rational.h
+bug.o: $(hdrdir)/ruby/internal/intern/re.h
+bug.o: $(hdrdir)/ruby/internal/intern/ruby.h
+bug.o: $(hdrdir)/ruby/internal/intern/select.h
+bug.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+bug.o: $(hdrdir)/ruby/internal/intern/signal.h
+bug.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+bug.o: $(hdrdir)/ruby/internal/intern/string.h
+bug.o: $(hdrdir)/ruby/internal/intern/struct.h
+bug.o: $(hdrdir)/ruby/internal/intern/thread.h
+bug.o: $(hdrdir)/ruby/internal/intern/time.h
+bug.o: $(hdrdir)/ruby/internal/intern/variable.h
+bug.o: $(hdrdir)/ruby/internal/intern/vm.h
+bug.o: $(hdrdir)/ruby/internal/interpreter.h
+bug.o: $(hdrdir)/ruby/internal/iterator.h
+bug.o: $(hdrdir)/ruby/internal/memory.h
+bug.o: $(hdrdir)/ruby/internal/method.h
+bug.o: $(hdrdir)/ruby/internal/module.h
+bug.o: $(hdrdir)/ruby/internal/newobj.h
+bug.o: $(hdrdir)/ruby/internal/rgengc.h
+bug.o: $(hdrdir)/ruby/internal/scan_args.h
+bug.o: $(hdrdir)/ruby/internal/special_consts.h
+bug.o: $(hdrdir)/ruby/internal/static_assert.h
+bug.o: $(hdrdir)/ruby/internal/stdalign.h
+bug.o: $(hdrdir)/ruby/internal/stdbool.h
+bug.o: $(hdrdir)/ruby/internal/symbol.h
+bug.o: $(hdrdir)/ruby/internal/token_paste.h
+bug.o: $(hdrdir)/ruby/internal/value.h
+bug.o: $(hdrdir)/ruby/internal/value_type.h
+bug.o: $(hdrdir)/ruby/internal/variable.h
+bug.o: $(hdrdir)/ruby/internal/warning_push.h
+bug.o: $(hdrdir)/ruby/internal/xmalloc.h
+bug.o: $(hdrdir)/ruby/assert.h
+bug.o: $(hdrdir)/ruby/backward.h
+bug.o: $(hdrdir)/ruby/backward/2/assume.h
+bug.o: $(hdrdir)/ruby/backward/2/attributes.h
+bug.o: $(hdrdir)/ruby/backward/2/bool.h
+bug.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+bug.o: $(hdrdir)/ruby/backward/2/inttypes.h
+bug.o: $(hdrdir)/ruby/backward/2/limits.h
+bug.o: $(hdrdir)/ruby/backward/2/long_long.h
+bug.o: $(hdrdir)/ruby/backward/2/stdalign.h
+bug.o: $(hdrdir)/ruby/backward/2/stdarg.h
+bug.o: $(hdrdir)/ruby/defines.h
+bug.o: $(hdrdir)/ruby/intern.h
+bug.o: $(hdrdir)/ruby/missing.h
+bug.o: $(hdrdir)/ruby/ruby.h
+bug.o: $(hdrdir)/ruby/st.h
+bug.o: $(hdrdir)/ruby/subst.h
+bug.o: bug.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/bug_reporter/depend b/ext/-test-/bug_reporter/depend
new file mode 100644
index 0000000000..f49b6147e6
--- /dev/null
+++ b/ext/-test-/bug_reporter/depend
@@ -0,0 +1,163 @@
+# AUTOGENERATED DEPENDENCIES START
+bug_reporter.o: $(RUBY_EXTCONF_H)
+bug_reporter.o: $(arch_hdrdir)/ruby/config.h
+bug_reporter.o: $(hdrdir)/ruby.h
+bug_reporter.o: $(hdrdir)/ruby/internal/anyargs.h
+bug_reporter.o: $(hdrdir)/ruby/internal/arithmetic.h
+bug_reporter.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+bug_reporter.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+bug_reporter.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+bug_reporter.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+bug_reporter.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+bug_reporter.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+bug_reporter.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+bug_reporter.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+bug_reporter.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+bug_reporter.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+bug_reporter.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+bug_reporter.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+bug_reporter.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+bug_reporter.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+bug_reporter.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+bug_reporter.o: $(hdrdir)/ruby/internal/assume.h
+bug_reporter.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+bug_reporter.o: $(hdrdir)/ruby/internal/attr/artificial.h
+bug_reporter.o: $(hdrdir)/ruby/internal/attr/cold.h
+bug_reporter.o: $(hdrdir)/ruby/internal/attr/const.h
+bug_reporter.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+bug_reporter.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+bug_reporter.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+bug_reporter.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+bug_reporter.o: $(hdrdir)/ruby/internal/attr/error.h
+bug_reporter.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+bug_reporter.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+bug_reporter.o: $(hdrdir)/ruby/internal/attr/format.h
+bug_reporter.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+bug_reporter.o: $(hdrdir)/ruby/internal/attr/noalias.h
+bug_reporter.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+bug_reporter.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+bug_reporter.o: $(hdrdir)/ruby/internal/attr/noinline.h
+bug_reporter.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+bug_reporter.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+bug_reporter.o: $(hdrdir)/ruby/internal/attr/pure.h
+bug_reporter.o: $(hdrdir)/ruby/internal/attr/restrict.h
+bug_reporter.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+bug_reporter.o: $(hdrdir)/ruby/internal/attr/warning.h
+bug_reporter.o: $(hdrdir)/ruby/internal/attr/weakref.h
+bug_reporter.o: $(hdrdir)/ruby/internal/cast.h
+bug_reporter.o: $(hdrdir)/ruby/internal/compiler_is.h
+bug_reporter.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+bug_reporter.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+bug_reporter.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+bug_reporter.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+bug_reporter.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+bug_reporter.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+bug_reporter.o: $(hdrdir)/ruby/internal/compiler_since.h
+bug_reporter.o: $(hdrdir)/ruby/internal/config.h
+bug_reporter.o: $(hdrdir)/ruby/internal/constant_p.h
+bug_reporter.o: $(hdrdir)/ruby/internal/core.h
+bug_reporter.o: $(hdrdir)/ruby/internal/core/rarray.h
+bug_reporter.o: $(hdrdir)/ruby/internal/core/rbasic.h
+bug_reporter.o: $(hdrdir)/ruby/internal/core/rbignum.h
+bug_reporter.o: $(hdrdir)/ruby/internal/core/rclass.h
+bug_reporter.o: $(hdrdir)/ruby/internal/core/rdata.h
+bug_reporter.o: $(hdrdir)/ruby/internal/core/rfile.h
+bug_reporter.o: $(hdrdir)/ruby/internal/core/rhash.h
+bug_reporter.o: $(hdrdir)/ruby/internal/core/robject.h
+bug_reporter.o: $(hdrdir)/ruby/internal/core/rregexp.h
+bug_reporter.o: $(hdrdir)/ruby/internal/core/rstring.h
+bug_reporter.o: $(hdrdir)/ruby/internal/core/rstruct.h
+bug_reporter.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+bug_reporter.o: $(hdrdir)/ruby/internal/ctype.h
+bug_reporter.o: $(hdrdir)/ruby/internal/dllexport.h
+bug_reporter.o: $(hdrdir)/ruby/internal/dosish.h
+bug_reporter.o: $(hdrdir)/ruby/internal/error.h
+bug_reporter.o: $(hdrdir)/ruby/internal/eval.h
+bug_reporter.o: $(hdrdir)/ruby/internal/event.h
+bug_reporter.o: $(hdrdir)/ruby/internal/fl_type.h
+bug_reporter.o: $(hdrdir)/ruby/internal/gc.h
+bug_reporter.o: $(hdrdir)/ruby/internal/glob.h
+bug_reporter.o: $(hdrdir)/ruby/internal/globals.h
+bug_reporter.o: $(hdrdir)/ruby/internal/has/attribute.h
+bug_reporter.o: $(hdrdir)/ruby/internal/has/builtin.h
+bug_reporter.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+bug_reporter.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+bug_reporter.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+bug_reporter.o: $(hdrdir)/ruby/internal/has/extension.h
+bug_reporter.o: $(hdrdir)/ruby/internal/has/feature.h
+bug_reporter.o: $(hdrdir)/ruby/internal/has/warning.h
+bug_reporter.o: $(hdrdir)/ruby/internal/intern/array.h
+bug_reporter.o: $(hdrdir)/ruby/internal/intern/bignum.h
+bug_reporter.o: $(hdrdir)/ruby/internal/intern/class.h
+bug_reporter.o: $(hdrdir)/ruby/internal/intern/compar.h
+bug_reporter.o: $(hdrdir)/ruby/internal/intern/complex.h
+bug_reporter.o: $(hdrdir)/ruby/internal/intern/cont.h
+bug_reporter.o: $(hdrdir)/ruby/internal/intern/dir.h
+bug_reporter.o: $(hdrdir)/ruby/internal/intern/enum.h
+bug_reporter.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+bug_reporter.o: $(hdrdir)/ruby/internal/intern/error.h
+bug_reporter.o: $(hdrdir)/ruby/internal/intern/eval.h
+bug_reporter.o: $(hdrdir)/ruby/internal/intern/file.h
+bug_reporter.o: $(hdrdir)/ruby/internal/intern/gc.h
+bug_reporter.o: $(hdrdir)/ruby/internal/intern/hash.h
+bug_reporter.o: $(hdrdir)/ruby/internal/intern/io.h
+bug_reporter.o: $(hdrdir)/ruby/internal/intern/load.h
+bug_reporter.o: $(hdrdir)/ruby/internal/intern/marshal.h
+bug_reporter.o: $(hdrdir)/ruby/internal/intern/numeric.h
+bug_reporter.o: $(hdrdir)/ruby/internal/intern/object.h
+bug_reporter.o: $(hdrdir)/ruby/internal/intern/parse.h
+bug_reporter.o: $(hdrdir)/ruby/internal/intern/proc.h
+bug_reporter.o: $(hdrdir)/ruby/internal/intern/process.h
+bug_reporter.o: $(hdrdir)/ruby/internal/intern/random.h
+bug_reporter.o: $(hdrdir)/ruby/internal/intern/range.h
+bug_reporter.o: $(hdrdir)/ruby/internal/intern/rational.h
+bug_reporter.o: $(hdrdir)/ruby/internal/intern/re.h
+bug_reporter.o: $(hdrdir)/ruby/internal/intern/ruby.h
+bug_reporter.o: $(hdrdir)/ruby/internal/intern/select.h
+bug_reporter.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+bug_reporter.o: $(hdrdir)/ruby/internal/intern/signal.h
+bug_reporter.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+bug_reporter.o: $(hdrdir)/ruby/internal/intern/string.h
+bug_reporter.o: $(hdrdir)/ruby/internal/intern/struct.h
+bug_reporter.o: $(hdrdir)/ruby/internal/intern/thread.h
+bug_reporter.o: $(hdrdir)/ruby/internal/intern/time.h
+bug_reporter.o: $(hdrdir)/ruby/internal/intern/variable.h
+bug_reporter.o: $(hdrdir)/ruby/internal/intern/vm.h
+bug_reporter.o: $(hdrdir)/ruby/internal/interpreter.h
+bug_reporter.o: $(hdrdir)/ruby/internal/iterator.h
+bug_reporter.o: $(hdrdir)/ruby/internal/memory.h
+bug_reporter.o: $(hdrdir)/ruby/internal/method.h
+bug_reporter.o: $(hdrdir)/ruby/internal/module.h
+bug_reporter.o: $(hdrdir)/ruby/internal/newobj.h
+bug_reporter.o: $(hdrdir)/ruby/internal/rgengc.h
+bug_reporter.o: $(hdrdir)/ruby/internal/scan_args.h
+bug_reporter.o: $(hdrdir)/ruby/internal/special_consts.h
+bug_reporter.o: $(hdrdir)/ruby/internal/static_assert.h
+bug_reporter.o: $(hdrdir)/ruby/internal/stdalign.h
+bug_reporter.o: $(hdrdir)/ruby/internal/stdbool.h
+bug_reporter.o: $(hdrdir)/ruby/internal/symbol.h
+bug_reporter.o: $(hdrdir)/ruby/internal/token_paste.h
+bug_reporter.o: $(hdrdir)/ruby/internal/value.h
+bug_reporter.o: $(hdrdir)/ruby/internal/value_type.h
+bug_reporter.o: $(hdrdir)/ruby/internal/variable.h
+bug_reporter.o: $(hdrdir)/ruby/internal/warning_push.h
+bug_reporter.o: $(hdrdir)/ruby/internal/xmalloc.h
+bug_reporter.o: $(hdrdir)/ruby/assert.h
+bug_reporter.o: $(hdrdir)/ruby/backward.h
+bug_reporter.o: $(hdrdir)/ruby/backward/2/assume.h
+bug_reporter.o: $(hdrdir)/ruby/backward/2/attributes.h
+bug_reporter.o: $(hdrdir)/ruby/backward/2/bool.h
+bug_reporter.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+bug_reporter.o: $(hdrdir)/ruby/backward/2/inttypes.h
+bug_reporter.o: $(hdrdir)/ruby/backward/2/limits.h
+bug_reporter.o: $(hdrdir)/ruby/backward/2/long_long.h
+bug_reporter.o: $(hdrdir)/ruby/backward/2/stdalign.h
+bug_reporter.o: $(hdrdir)/ruby/backward/2/stdarg.h
+bug_reporter.o: $(hdrdir)/ruby/defines.h
+bug_reporter.o: $(hdrdir)/ruby/intern.h
+bug_reporter.o: $(hdrdir)/ruby/missing.h
+bug_reporter.o: $(hdrdir)/ruby/ruby.h
+bug_reporter.o: $(hdrdir)/ruby/st.h
+bug_reporter.o: $(hdrdir)/ruby/subst.h
+bug_reporter.o: bug_reporter.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/class/depend b/ext/-test-/class/depend
new file mode 100644
index 0000000000..95199c5cf4
--- /dev/null
+++ b/ext/-test-/class/depend
@@ -0,0 +1,323 @@
+# AUTOGENERATED DEPENDENCIES START
+class2name.o: $(RUBY_EXTCONF_H)
+class2name.o: $(arch_hdrdir)/ruby/config.h
+class2name.o: $(hdrdir)/ruby/internal/anyargs.h
+class2name.o: $(hdrdir)/ruby/internal/arithmetic.h
+class2name.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+class2name.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+class2name.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+class2name.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+class2name.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+class2name.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+class2name.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+class2name.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+class2name.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+class2name.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+class2name.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+class2name.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+class2name.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+class2name.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+class2name.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+class2name.o: $(hdrdir)/ruby/internal/assume.h
+class2name.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+class2name.o: $(hdrdir)/ruby/internal/attr/artificial.h
+class2name.o: $(hdrdir)/ruby/internal/attr/cold.h
+class2name.o: $(hdrdir)/ruby/internal/attr/const.h
+class2name.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+class2name.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+class2name.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+class2name.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+class2name.o: $(hdrdir)/ruby/internal/attr/error.h
+class2name.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+class2name.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+class2name.o: $(hdrdir)/ruby/internal/attr/format.h
+class2name.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+class2name.o: $(hdrdir)/ruby/internal/attr/noalias.h
+class2name.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+class2name.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+class2name.o: $(hdrdir)/ruby/internal/attr/noinline.h
+class2name.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+class2name.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+class2name.o: $(hdrdir)/ruby/internal/attr/pure.h
+class2name.o: $(hdrdir)/ruby/internal/attr/restrict.h
+class2name.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+class2name.o: $(hdrdir)/ruby/internal/attr/warning.h
+class2name.o: $(hdrdir)/ruby/internal/attr/weakref.h
+class2name.o: $(hdrdir)/ruby/internal/cast.h
+class2name.o: $(hdrdir)/ruby/internal/compiler_is.h
+class2name.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+class2name.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+class2name.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+class2name.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+class2name.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+class2name.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+class2name.o: $(hdrdir)/ruby/internal/compiler_since.h
+class2name.o: $(hdrdir)/ruby/internal/config.h
+class2name.o: $(hdrdir)/ruby/internal/constant_p.h
+class2name.o: $(hdrdir)/ruby/internal/core.h
+class2name.o: $(hdrdir)/ruby/internal/core/rarray.h
+class2name.o: $(hdrdir)/ruby/internal/core/rbasic.h
+class2name.o: $(hdrdir)/ruby/internal/core/rbignum.h
+class2name.o: $(hdrdir)/ruby/internal/core/rclass.h
+class2name.o: $(hdrdir)/ruby/internal/core/rdata.h
+class2name.o: $(hdrdir)/ruby/internal/core/rfile.h
+class2name.o: $(hdrdir)/ruby/internal/core/rhash.h
+class2name.o: $(hdrdir)/ruby/internal/core/robject.h
+class2name.o: $(hdrdir)/ruby/internal/core/rregexp.h
+class2name.o: $(hdrdir)/ruby/internal/core/rstring.h
+class2name.o: $(hdrdir)/ruby/internal/core/rstruct.h
+class2name.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+class2name.o: $(hdrdir)/ruby/internal/ctype.h
+class2name.o: $(hdrdir)/ruby/internal/dllexport.h
+class2name.o: $(hdrdir)/ruby/internal/dosish.h
+class2name.o: $(hdrdir)/ruby/internal/error.h
+class2name.o: $(hdrdir)/ruby/internal/eval.h
+class2name.o: $(hdrdir)/ruby/internal/event.h
+class2name.o: $(hdrdir)/ruby/internal/fl_type.h
+class2name.o: $(hdrdir)/ruby/internal/gc.h
+class2name.o: $(hdrdir)/ruby/internal/glob.h
+class2name.o: $(hdrdir)/ruby/internal/globals.h
+class2name.o: $(hdrdir)/ruby/internal/has/attribute.h
+class2name.o: $(hdrdir)/ruby/internal/has/builtin.h
+class2name.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+class2name.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+class2name.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+class2name.o: $(hdrdir)/ruby/internal/has/extension.h
+class2name.o: $(hdrdir)/ruby/internal/has/feature.h
+class2name.o: $(hdrdir)/ruby/internal/has/warning.h
+class2name.o: $(hdrdir)/ruby/internal/intern/array.h
+class2name.o: $(hdrdir)/ruby/internal/intern/bignum.h
+class2name.o: $(hdrdir)/ruby/internal/intern/class.h
+class2name.o: $(hdrdir)/ruby/internal/intern/compar.h
+class2name.o: $(hdrdir)/ruby/internal/intern/complex.h
+class2name.o: $(hdrdir)/ruby/internal/intern/cont.h
+class2name.o: $(hdrdir)/ruby/internal/intern/dir.h
+class2name.o: $(hdrdir)/ruby/internal/intern/enum.h
+class2name.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+class2name.o: $(hdrdir)/ruby/internal/intern/error.h
+class2name.o: $(hdrdir)/ruby/internal/intern/eval.h
+class2name.o: $(hdrdir)/ruby/internal/intern/file.h
+class2name.o: $(hdrdir)/ruby/internal/intern/gc.h
+class2name.o: $(hdrdir)/ruby/internal/intern/hash.h
+class2name.o: $(hdrdir)/ruby/internal/intern/io.h
+class2name.o: $(hdrdir)/ruby/internal/intern/load.h
+class2name.o: $(hdrdir)/ruby/internal/intern/marshal.h
+class2name.o: $(hdrdir)/ruby/internal/intern/numeric.h
+class2name.o: $(hdrdir)/ruby/internal/intern/object.h
+class2name.o: $(hdrdir)/ruby/internal/intern/parse.h
+class2name.o: $(hdrdir)/ruby/internal/intern/proc.h
+class2name.o: $(hdrdir)/ruby/internal/intern/process.h
+class2name.o: $(hdrdir)/ruby/internal/intern/random.h
+class2name.o: $(hdrdir)/ruby/internal/intern/range.h
+class2name.o: $(hdrdir)/ruby/internal/intern/rational.h
+class2name.o: $(hdrdir)/ruby/internal/intern/re.h
+class2name.o: $(hdrdir)/ruby/internal/intern/ruby.h
+class2name.o: $(hdrdir)/ruby/internal/intern/select.h
+class2name.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+class2name.o: $(hdrdir)/ruby/internal/intern/signal.h
+class2name.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+class2name.o: $(hdrdir)/ruby/internal/intern/string.h
+class2name.o: $(hdrdir)/ruby/internal/intern/struct.h
+class2name.o: $(hdrdir)/ruby/internal/intern/thread.h
+class2name.o: $(hdrdir)/ruby/internal/intern/time.h
+class2name.o: $(hdrdir)/ruby/internal/intern/variable.h
+class2name.o: $(hdrdir)/ruby/internal/intern/vm.h
+class2name.o: $(hdrdir)/ruby/internal/interpreter.h
+class2name.o: $(hdrdir)/ruby/internal/iterator.h
+class2name.o: $(hdrdir)/ruby/internal/memory.h
+class2name.o: $(hdrdir)/ruby/internal/method.h
+class2name.o: $(hdrdir)/ruby/internal/module.h
+class2name.o: $(hdrdir)/ruby/internal/newobj.h
+class2name.o: $(hdrdir)/ruby/internal/rgengc.h
+class2name.o: $(hdrdir)/ruby/internal/scan_args.h
+class2name.o: $(hdrdir)/ruby/internal/special_consts.h
+class2name.o: $(hdrdir)/ruby/internal/static_assert.h
+class2name.o: $(hdrdir)/ruby/internal/stdalign.h
+class2name.o: $(hdrdir)/ruby/internal/stdbool.h
+class2name.o: $(hdrdir)/ruby/internal/symbol.h
+class2name.o: $(hdrdir)/ruby/internal/token_paste.h
+class2name.o: $(hdrdir)/ruby/internal/value.h
+class2name.o: $(hdrdir)/ruby/internal/value_type.h
+class2name.o: $(hdrdir)/ruby/internal/variable.h
+class2name.o: $(hdrdir)/ruby/internal/warning_push.h
+class2name.o: $(hdrdir)/ruby/internal/xmalloc.h
+class2name.o: $(hdrdir)/ruby/assert.h
+class2name.o: $(hdrdir)/ruby/backward.h
+class2name.o: $(hdrdir)/ruby/backward/2/assume.h
+class2name.o: $(hdrdir)/ruby/backward/2/attributes.h
+class2name.o: $(hdrdir)/ruby/backward/2/bool.h
+class2name.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+class2name.o: $(hdrdir)/ruby/backward/2/inttypes.h
+class2name.o: $(hdrdir)/ruby/backward/2/limits.h
+class2name.o: $(hdrdir)/ruby/backward/2/long_long.h
+class2name.o: $(hdrdir)/ruby/backward/2/stdalign.h
+class2name.o: $(hdrdir)/ruby/backward/2/stdarg.h
+class2name.o: $(hdrdir)/ruby/defines.h
+class2name.o: $(hdrdir)/ruby/intern.h
+class2name.o: $(hdrdir)/ruby/missing.h
+class2name.o: $(hdrdir)/ruby/ruby.h
+class2name.o: $(hdrdir)/ruby/st.h
+class2name.o: $(hdrdir)/ruby/subst.h
+class2name.o: class2name.c
+init.o: $(RUBY_EXTCONF_H)
+init.o: $(arch_hdrdir)/ruby/config.h
+init.o: $(hdrdir)/ruby.h
+init.o: $(hdrdir)/ruby/internal/anyargs.h
+init.o: $(hdrdir)/ruby/internal/arithmetic.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+init.o: $(hdrdir)/ruby/internal/assume.h
+init.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+init.o: $(hdrdir)/ruby/internal/attr/artificial.h
+init.o: $(hdrdir)/ruby/internal/attr/cold.h
+init.o: $(hdrdir)/ruby/internal/attr/const.h
+init.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+init.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+init.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+init.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+init.o: $(hdrdir)/ruby/internal/attr/error.h
+init.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+init.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+init.o: $(hdrdir)/ruby/internal/attr/format.h
+init.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+init.o: $(hdrdir)/ruby/internal/attr/noalias.h
+init.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+init.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+init.o: $(hdrdir)/ruby/internal/attr/noinline.h
+init.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+init.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+init.o: $(hdrdir)/ruby/internal/attr/pure.h
+init.o: $(hdrdir)/ruby/internal/attr/restrict.h
+init.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+init.o: $(hdrdir)/ruby/internal/attr/warning.h
+init.o: $(hdrdir)/ruby/internal/attr/weakref.h
+init.o: $(hdrdir)/ruby/internal/cast.h
+init.o: $(hdrdir)/ruby/internal/compiler_is.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+init.o: $(hdrdir)/ruby/internal/compiler_since.h
+init.o: $(hdrdir)/ruby/internal/config.h
+init.o: $(hdrdir)/ruby/internal/constant_p.h
+init.o: $(hdrdir)/ruby/internal/core.h
+init.o: $(hdrdir)/ruby/internal/core/rarray.h
+init.o: $(hdrdir)/ruby/internal/core/rbasic.h
+init.o: $(hdrdir)/ruby/internal/core/rbignum.h
+init.o: $(hdrdir)/ruby/internal/core/rclass.h
+init.o: $(hdrdir)/ruby/internal/core/rdata.h
+init.o: $(hdrdir)/ruby/internal/core/rfile.h
+init.o: $(hdrdir)/ruby/internal/core/rhash.h
+init.o: $(hdrdir)/ruby/internal/core/robject.h
+init.o: $(hdrdir)/ruby/internal/core/rregexp.h
+init.o: $(hdrdir)/ruby/internal/core/rstring.h
+init.o: $(hdrdir)/ruby/internal/core/rstruct.h
+init.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+init.o: $(hdrdir)/ruby/internal/ctype.h
+init.o: $(hdrdir)/ruby/internal/dllexport.h
+init.o: $(hdrdir)/ruby/internal/dosish.h
+init.o: $(hdrdir)/ruby/internal/error.h
+init.o: $(hdrdir)/ruby/internal/eval.h
+init.o: $(hdrdir)/ruby/internal/event.h
+init.o: $(hdrdir)/ruby/internal/fl_type.h
+init.o: $(hdrdir)/ruby/internal/gc.h
+init.o: $(hdrdir)/ruby/internal/glob.h
+init.o: $(hdrdir)/ruby/internal/globals.h
+init.o: $(hdrdir)/ruby/internal/has/attribute.h
+init.o: $(hdrdir)/ruby/internal/has/builtin.h
+init.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/extension.h
+init.o: $(hdrdir)/ruby/internal/has/feature.h
+init.o: $(hdrdir)/ruby/internal/has/warning.h
+init.o: $(hdrdir)/ruby/internal/intern/array.h
+init.o: $(hdrdir)/ruby/internal/intern/bignum.h
+init.o: $(hdrdir)/ruby/internal/intern/class.h
+init.o: $(hdrdir)/ruby/internal/intern/compar.h
+init.o: $(hdrdir)/ruby/internal/intern/complex.h
+init.o: $(hdrdir)/ruby/internal/intern/cont.h
+init.o: $(hdrdir)/ruby/internal/intern/dir.h
+init.o: $(hdrdir)/ruby/internal/intern/enum.h
+init.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+init.o: $(hdrdir)/ruby/internal/intern/error.h
+init.o: $(hdrdir)/ruby/internal/intern/eval.h
+init.o: $(hdrdir)/ruby/internal/intern/file.h
+init.o: $(hdrdir)/ruby/internal/intern/gc.h
+init.o: $(hdrdir)/ruby/internal/intern/hash.h
+init.o: $(hdrdir)/ruby/internal/intern/io.h
+init.o: $(hdrdir)/ruby/internal/intern/load.h
+init.o: $(hdrdir)/ruby/internal/intern/marshal.h
+init.o: $(hdrdir)/ruby/internal/intern/numeric.h
+init.o: $(hdrdir)/ruby/internal/intern/object.h
+init.o: $(hdrdir)/ruby/internal/intern/parse.h
+init.o: $(hdrdir)/ruby/internal/intern/proc.h
+init.o: $(hdrdir)/ruby/internal/intern/process.h
+init.o: $(hdrdir)/ruby/internal/intern/random.h
+init.o: $(hdrdir)/ruby/internal/intern/range.h
+init.o: $(hdrdir)/ruby/internal/intern/rational.h
+init.o: $(hdrdir)/ruby/internal/intern/re.h
+init.o: $(hdrdir)/ruby/internal/intern/ruby.h
+init.o: $(hdrdir)/ruby/internal/intern/select.h
+init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+init.o: $(hdrdir)/ruby/internal/intern/signal.h
+init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+init.o: $(hdrdir)/ruby/internal/intern/string.h
+init.o: $(hdrdir)/ruby/internal/intern/struct.h
+init.o: $(hdrdir)/ruby/internal/intern/thread.h
+init.o: $(hdrdir)/ruby/internal/intern/time.h
+init.o: $(hdrdir)/ruby/internal/intern/variable.h
+init.o: $(hdrdir)/ruby/internal/intern/vm.h
+init.o: $(hdrdir)/ruby/internal/interpreter.h
+init.o: $(hdrdir)/ruby/internal/iterator.h
+init.o: $(hdrdir)/ruby/internal/memory.h
+init.o: $(hdrdir)/ruby/internal/method.h
+init.o: $(hdrdir)/ruby/internal/module.h
+init.o: $(hdrdir)/ruby/internal/newobj.h
+init.o: $(hdrdir)/ruby/internal/rgengc.h
+init.o: $(hdrdir)/ruby/internal/scan_args.h
+init.o: $(hdrdir)/ruby/internal/special_consts.h
+init.o: $(hdrdir)/ruby/internal/static_assert.h
+init.o: $(hdrdir)/ruby/internal/stdalign.h
+init.o: $(hdrdir)/ruby/internal/stdbool.h
+init.o: $(hdrdir)/ruby/internal/symbol.h
+init.o: $(hdrdir)/ruby/internal/token_paste.h
+init.o: $(hdrdir)/ruby/internal/value.h
+init.o: $(hdrdir)/ruby/internal/value_type.h
+init.o: $(hdrdir)/ruby/internal/variable.h
+init.o: $(hdrdir)/ruby/internal/warning_push.h
+init.o: $(hdrdir)/ruby/internal/xmalloc.h
+init.o: $(hdrdir)/ruby/assert.h
+init.o: $(hdrdir)/ruby/backward.h
+init.o: $(hdrdir)/ruby/backward/2/assume.h
+init.o: $(hdrdir)/ruby/backward/2/attributes.h
+init.o: $(hdrdir)/ruby/backward/2/bool.h
+init.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+init.o: $(hdrdir)/ruby/backward/2/inttypes.h
+init.o: $(hdrdir)/ruby/backward/2/limits.h
+init.o: $(hdrdir)/ruby/backward/2/long_long.h
+init.o: $(hdrdir)/ruby/backward/2/stdalign.h
+init.o: $(hdrdir)/ruby/backward/2/stdarg.h
+init.o: $(hdrdir)/ruby/defines.h
+init.o: $(hdrdir)/ruby/intern.h
+init.o: $(hdrdir)/ruby/missing.h
+init.o: $(hdrdir)/ruby/ruby.h
+init.o: $(hdrdir)/ruby/st.h
+init.o: $(hdrdir)/ruby/subst.h
+init.o: init.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/cxxanyargs/cxxanyargs.cpp b/ext/-test-/cxxanyargs/cxxanyargs.cpp
new file mode 100644
index 0000000000..eded13e2ee
--- /dev/null
+++ b/ext/-test-/cxxanyargs/cxxanyargs.cpp
@@ -0,0 +1,961 @@
+#include <ruby/ruby.h>
+
+#if 0 // Warnings expected, should just suppress them
+
+#elif defined(_MSC_VER)
+#pragma warning(disable : 4996)
+
+#elif defined(__INTEL_COMPILER)
+#pragma warning(disable : 1786)
+
+#elif defined(__clang__)
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+
+#elif defined(__GNUC__)
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
+#elif defined(__SUNPRO_CC)
+#pragma error_messages (off,symdeprecated)
+
+#else
+// :FIXME: improve here for your compiler.
+
+#endif
+
+namespace test_rb_define_virtual_variable {
+    VALUE
+    getter(ID, VALUE *data)
+    {
+        return *data;
+    }
+
+    void
+    setter(VALUE val, ID, VALUE *data)
+    {
+        *data = val;
+    }
+
+    VALUE
+    test(VALUE self)
+    {
+        rb_define_virtual_variable("test",
+            RUBY_METHOD_FUNC(getter),
+            reinterpret_cast<void(*)(ANYARGS)>(setter)); // old
+        rb_define_virtual_variable("test", getter, setter); // new
+
+#ifdef HAVE_NULLPTR
+        rb_define_virtual_variable("test", nullptr, reinterpret_cast<void(*)(ANYARGS)>(setter));
+        rb_define_virtual_variable("test", nullptr, setter);
+
+        rb_define_virtual_variable("test", RUBY_METHOD_FUNC(getter), nullptr);
+        rb_define_virtual_variable("test", getter, nullptr);
+
+        // It doesn't make any sense for both function pointers be nullptr at
+        // the same time.
+#endif
+
+        return self;
+    }
+}
+
+struct test_rb_define_hooked_variable {
+    static VALUE v;
+
+    static VALUE
+    getter(ID, VALUE *data)
+    {
+        return *data;
+    }
+
+    static void
+    setter(VALUE val, ID, VALUE *data)
+    {
+        *data = val;
+    }
+
+    static VALUE
+    test(VALUE self)
+    {
+        rb_define_hooked_variable("test", &v,
+            RUBY_METHOD_FUNC(getter),
+            reinterpret_cast<void(*)(ANYARGS)>(setter)); // old
+        rb_define_hooked_variable("test", &v, getter, setter); // new
+
+#ifdef HAVE_NULLPTR
+        rb_define_hooked_variable("test", &v, nullptr, reinterpret_cast<void(*)(ANYARGS)>(setter));
+        rb_define_hooked_variable("test", &v, nullptr, setter);
+
+        rb_define_hooked_variable("test", &v, RUBY_METHOD_FUNC(getter), nullptr);
+        rb_define_hooked_variable("test", &v, getter, nullptr);
+
+        // It doesn't make any sense for both function pointers be nullptr at
+        // the same time.
+#endif
+
+        return self;
+    }
+};
+VALUE test_rb_define_hooked_variable::v = Qundef;
+
+namespace test_rb_iterate {
+    VALUE
+    iter(VALUE self)
+    {
+        return rb_funcall(self, rb_intern("yield"), 0);
+    }
+
+    VALUE
+    block(RB_BLOCK_CALL_FUNC_ARGLIST(arg, param))
+    {
+        return rb_funcall(arg, rb_intern("=="), 1, param);
+    }
+
+    VALUE
+    test(VALUE self)
+    {
+#ifdef HAVE_NULLPTR
+        rb_iterate(iter, self, nullptr, self);
+#endif
+
+        rb_iterate(iter, self, RUBY_METHOD_FUNC(block), self); // old
+        return rb_iterate(iter, self, block, self); // new
+    }
+}
+
+namespace test_rb_block_call {
+    VALUE
+    block(RB_BLOCK_CALL_FUNC_ARGLIST(arg, param))
+    {
+        return rb_funcall(arg, rb_intern("=="), 1, param);
+    }
+
+    VALUE
+    test(VALUE self)
+    {
+        const ID mid = rb_intern("each");
+        const VALUE argv[] = { Qundef };
+
+#ifdef HAVE_NULLPTR
+        rb_block_call(self, mid, 0, argv, nullptr, self);
+#endif
+
+        rb_block_call(self, mid, 0, argv, RUBY_METHOD_FUNC(block), self); // old
+        return rb_block_call(self, mid, 0, argv, block, self); // new
+    }
+}
+
+namespace test_rb_rescue {
+    VALUE
+    begin(VALUE arg)
+    {
+        return arg;
+    }
+
+    VALUE
+    rescue(VALUE arg, VALUE exc)
+    {
+        return exc;
+    }
+
+    VALUE
+    test(VALUE self)
+    {
+#ifdef HAVE_NULLPTR
+        rb_rescue(RUBY_METHOD_FUNC(begin), self, nullptr, self);
+        rb_rescue(begin, self, nullptr, self);
+#endif
+
+        rb_rescue(RUBY_METHOD_FUNC(begin), self, RUBY_METHOD_FUNC(rescue), self); // old
+        return rb_rescue(begin, self, rescue, self); // new
+    }
+}
+
+namespace test_rb_rescue2 {
+    VALUE
+    begin(VALUE arg)
+    {
+        return arg;
+    }
+
+    VALUE
+    rescue(VALUE arg, VALUE exc)
+    {
+        return exc;
+    }
+
+    VALUE
+    test(VALUE self)
+    {
+#ifdef HAVE_NULLPTR
+        rb_rescue2(RUBY_METHOD_FUNC(begin), self, nullptr, self, rb_eStandardError, rb_eFatal, (VALUE)0);
+        rb_rescue2(begin, self, nullptr, self, rb_eStandardError, rb_eFatal, (VALUE)0);
+#endif
+
+        rb_rescue2(RUBY_METHOD_FUNC(begin), self, RUBY_METHOD_FUNC(rescue), self,
+                   rb_eStandardError, rb_eFatal, (VALUE)0); // old
+        return rb_rescue2(begin, self, rescue, self, rb_eStandardError, rb_eFatal, (VALUE)0); // new
+    }
+}
+
+namespace test_rb_ensure {
+    VALUE
+    begin(VALUE arg)
+    {
+        return arg;
+    }
+
+    VALUE
+    ensure(VALUE arg)
+    {
+        return arg;
+    }
+
+    VALUE
+    test(VALUE self)
+    {
+#ifdef HAVE_NULLPTR
+        rb_ensure(RUBY_METHOD_FUNC(begin), self, nullptr, self);
+        rb_ensure(begin, self, nullptr, self);
+#endif
+
+        rb_ensure(RUBY_METHOD_FUNC(begin), self, RUBY_METHOD_FUNC(ensure), self); // old
+        return rb_ensure(begin, self, ensure, self); // new
+    }
+}
+
+namespace test_rb_catch {
+    VALUE
+    catcher(RB_BLOCK_CALL_FUNC_ARGLIST(arg, param))
+    {
+        return arg;
+    }
+
+    VALUE
+    test(VALUE self)
+    {
+        static const char *zero = 0;
+
+#ifdef HAVE_NULLPTR
+        // It doesn't make any sense at all to pass nullptr as a catcher.
+#endif
+
+        rb_catch(zero, RUBY_METHOD_FUNC(catcher), self); // old
+        return rb_catch(zero, catcher, self); // new
+    }
+}
+
+namespace test_rb_catch_obj {
+    VALUE
+    catcher(RB_BLOCK_CALL_FUNC_ARGLIST(arg, param))
+    {
+        return arg;
+    }
+
+    VALUE
+    test(VALUE self)
+    {
+#ifdef HAVE_NULLPTR
+        // It doesn't make any sense at all to pass nullptr as a catcher.
+#endif
+
+        rb_catch_obj(self, RUBY_METHOD_FUNC(catcher), self); // old
+        return rb_catch_obj(self, catcher, self); // new
+    }
+}
+
+namespace test_rb_fiber_new {
+    VALUE
+    fiber(RB_BLOCK_CALL_FUNC_ARGLIST(arg, param))
+    {
+        return arg;
+    }
+
+    VALUE
+    test(VALUE self)
+    {
+#ifdef HAVE_NULLPTR
+        // It doesn't make any sense at all to pass nullptr as a fiber.
+#endif
+
+        rb_fiber_new(RUBY_METHOD_FUNC(fiber), self); // old
+        return rb_fiber_new(fiber, self); // new
+    }
+}
+
+namespace test_rb_proc_new {
+    VALUE
+    proc(RB_BLOCK_CALL_FUNC_ARGLIST(arg, param))
+    {
+        return arg;
+    }
+
+    VALUE
+    test(VALUE self)
+    {
+#ifdef HAVE_NULLPTR
+        // It doesn't make any sense at all to pass nullptr as a proc.
+#endif
+
+        rb_fiber_new(RUBY_METHOD_FUNC(proc), self); // old
+        return rb_fiber_new(proc, self); // new
+    }
+}
+
+struct test_rb_thread_create {
+    static VALUE v;
+
+    static VALUE
+    thread(void *ptr)
+    {
+        const VALUE *w = reinterpret_cast<const VALUE*>(ptr);
+        return *w;
+    }
+
+    static VALUE
+    test(VALUE self)
+    {
+        v = self;
+
+#ifdef HAVE_NULLPTR
+        // It doesn't make any sense at all to pass nullptr as a thread.
+#endif
+
+        rb_thread_create(RUBY_METHOD_FUNC(thread), &v); // old
+        return rb_thread_create(thread, &v); // new
+    }
+};
+VALUE test_rb_thread_create::v = Qundef;
+
+namespace test_st_foreach {
+    static int
+    iter(st_data_t, st_data_t, st_data_t)
+    {
+        return ST_CONTINUE;
+    }
+
+    VALUE
+    test(VALUE self)
+    {
+        st_data_t data = 0;
+        st_table *st = st_init_numtable();
+
+#ifdef HAVE_NULLPTR
+        // It doesn't make any sense at all to pass nullptr as an iterator.
+#endif
+
+        st_foreach(st, reinterpret_cast<int(*)(ANYARGS)>(iter), data); // old
+        st_foreach(st, iter, data); // new
+        return self;
+    }
+}
+
+namespace test_st_foreach_check {
+    static int
+    iter(st_data_t, st_data_t, st_data_t, int x)
+    {
+        return x ? ST_STOP : ST_CONTINUE;
+    }
+
+    VALUE
+    test(VALUE self)
+    {
+        st_data_t data = 0;
+        st_table *st = st_init_numtable();
+
+#ifdef HAVE_NULLPTR
+        // It doesn't make any sense at all to pass nullptr as an iterator.
+#endif
+
+        st_foreach_check(st, reinterpret_cast<int(*)(ANYARGS)>(iter), data, data); // old
+        st_foreach_check(st, iter, data, data); // new
+        return self;
+    }
+}
+
+namespace test_st_foreach_safe {
+    static int
+    iter(st_data_t, st_data_t, st_data_t)
+    {
+        return ST_CONTINUE;
+    }
+
+    VALUE
+    test(VALUE self)
+    {
+        st_data_t data = 0;
+        st_table *st = st_init_numtable();
+
+#ifdef HAVE_NULLPTR
+        // It doesn't make any sense at all to pass nullptr as an iterator.
+#endif
+
+        st_foreach_safe(st, reinterpret_cast<int(*)(ANYARGS)>(iter), data); // old
+        st_foreach_safe(st, iter, data); // new
+        return self;
+    }
+}
+
+namespace test_rb_hash_foreach {
+    static int
+    iter(VALUE, VALUE, VALUE)
+    {
+        return ST_CONTINUE;
+    }
+
+    VALUE
+    test(VALUE self)
+    {
+        VALUE h = rb_hash_new();
+
+#ifdef HAVE_NULLPTR
+        // It doesn't make any sense at all to pass nullptr as an iterator.
+#endif
+
+        rb_hash_foreach(h, reinterpret_cast<int(*)(ANYARGS)>(iter), self); // old
+        rb_hash_foreach(h, iter, self); // new
+        return self;
+    }
+}
+
+namespace test_rb_ivar_foreach {
+    static int
+    iter(VALUE, VALUE, VALUE)
+    {
+        return ST_CONTINUE;
+    }
+
+    VALUE
+    test(VALUE self)
+    {
+#ifdef HAVE_NULLPTR
+        // It doesn't make any sense at all to pass nullptr as an iterator.
+#endif
+
+        rb_ivar_foreach(self, reinterpret_cast<int(*)(ANYARGS)>(iter), self); // old
+        rb_ivar_foreach(self, iter, self); // new
+        return self;
+    }
+}
+
+namespace test_rb_define_method {
+    static VALUE
+    m1(VALUE, VALUE)
+    {
+        return Qnil;
+    }
+
+    static VALUE
+    m2(VALUE, VALUE, VALUE)
+    {
+        return Qnil;
+    }
+
+    static VALUE
+    ma(VALUE, VALUE)
+    {
+        return Qnil;
+    }
+
+    static VALUE
+    mv(int, VALUE*, VALUE)
+    {
+        return Qnil;
+    }
+
+    static VALUE
+    mc(int, const VALUE*, VALUE)
+    {
+        return Qnil;
+    }
+
+    VALUE
+    test(VALUE self)
+    {
+        // No cast
+        rb_define_method(self, "m1", m1, 1);
+        rb_define_method(self, "m2", m2, 2);
+        rb_define_method(self, "ma", ma, -2);
+        rb_define_method(self, "mv", mv, -1);
+        rb_define_method(self, "mc", mc, -1);
+
+        // Cast by RUBY_METHOD_FUNC
+        rb_define_method(self, "m1", RUBY_METHOD_FUNC(m1), 1);
+        rb_define_method(self, "m2", RUBY_METHOD_FUNC(m2), 2);
+        rb_define_method(self, "ma", RUBY_METHOD_FUNC(ma), -2);
+        rb_define_method(self, "mv", RUBY_METHOD_FUNC(mv), -1);
+        rb_define_method(self, "mc", RUBY_METHOD_FUNC(mc), -1);
+
+        // Explicit cast instead of RUBY_METHOD_FUNC
+        rb_define_method(self, "m1", (VALUE (*)(...))(m1), 1);
+        rb_define_method(self, "m2", (VALUE (*)(...))(m2), 2);
+        rb_define_method(self, "ma", (VALUE (*)(...))(ma), -2);
+        rb_define_method(self, "mv", (VALUE (*)(...))(mv), -1);
+        rb_define_method(self, "mc", (VALUE (*)(...))(mc), -1);
+
+        // rb_f_notimplement
+        rb_define_method(self, "m1", rb_f_notimplement, 1);
+        rb_define_method(self, "m2", rb_f_notimplement, 2);
+        rb_define_method(self, "ma", rb_f_notimplement, -2);
+        rb_define_method(self, "mv", rb_f_notimplement, -1);
+        rb_define_method(self, "mc", rb_f_notimplement, -1);
+
+#ifdef HAVE_NULLPTR
+        // It doesn't make any sense at all to pass nullptr as a method.
+#endif
+
+        return self;
+    }
+}
+
+namespace test_rb_define_method_id {
+    static VALUE
+    m1(VALUE, VALUE)
+    {
+        return Qnil;
+    }
+
+    static VALUE
+    m2(VALUE, VALUE, VALUE)
+    {
+        return Qnil;
+    }
+
+    static VALUE
+    ma(VALUE, VALUE)
+    {
+        return Qnil;
+    }
+
+    static VALUE
+    mv(int, VALUE*, VALUE)
+    {
+        return Qnil;
+    }
+
+    static VALUE
+    mc(int, const VALUE*, VALUE)
+    {
+        return Qnil;
+    }
+
+    VALUE
+    test(VALUE self)
+    {
+        // No cast
+        rb_define_method_id(self, rb_intern("m1"), m1, 1);
+        rb_define_method_id(self, rb_intern("m2"), m2, 2);
+        rb_define_method_id(self, rb_intern("ma"), ma, -2);
+        rb_define_method_id(self, rb_intern("mv"), mv, -1);
+        rb_define_method_id(self, rb_intern("mc"), mc, -1);
+
+        // Cast by RUBY_METHOD_FUNC
+        rb_define_method_id(self, rb_intern("m1"), RUBY_METHOD_FUNC(m1), 1);
+        rb_define_method_id(self, rb_intern("m2"), RUBY_METHOD_FUNC(m2), 2);
+        rb_define_method_id(self, rb_intern("ma"), RUBY_METHOD_FUNC(ma), -2);
+        rb_define_method_id(self, rb_intern("mv"), RUBY_METHOD_FUNC(mv), -1);
+        rb_define_method_id(self, rb_intern("mc"), RUBY_METHOD_FUNC(mc), -1);
+
+        // Explicit cast instead of RUBY_METHOD_FUNC
+        rb_define_method_id(self, rb_intern("m1"), (VALUE (*)(...))(m1), 1);
+        rb_define_method_id(self, rb_intern("m2"), (VALUE (*)(...))(m2), 2);
+        rb_define_method_id(self, rb_intern("ma"), (VALUE (*)(...))(ma), -2);
+        rb_define_method_id(self, rb_intern("mv"), (VALUE (*)(...))(mv), -1);
+        rb_define_method_id(self, rb_intern("mc"), (VALUE (*)(...))(mc), -1);
+
+        // rb_f_notimplement
+        rb_define_method_id(self, rb_intern("m1"), rb_f_notimplement, 1);
+        rb_define_method_id(self, rb_intern("m2"), rb_f_notimplement, 2);
+        rb_define_method_id(self, rb_intern("ma"), rb_f_notimplement, -2);
+        rb_define_method_id(self, rb_intern("mv"), rb_f_notimplement, -1);
+        rb_define_method_id(self, rb_intern("mc"), rb_f_notimplement, -1);
+
+#ifdef HAVE_NULLPTR
+        // It doesn't make any sense at all to pass nullptr as a method.
+#endif
+
+        return self;
+    }
+}
+
+namespace test_rb_define_module_function {
+    static VALUE
+    m1(VALUE, VALUE)
+    {
+        return Qnil;
+    }
+
+    static VALUE
+    m2(VALUE, VALUE, VALUE)
+    {
+        return Qnil;
+    }
+
+    static VALUE
+    ma(VALUE, VALUE)
+    {
+        return Qnil;
+    }
+
+    static VALUE
+    mv(int, VALUE*, VALUE)
+    {
+        return Qnil;
+    }
+
+    static VALUE
+    mc(int, const VALUE*, VALUE)
+    {
+        return Qnil;
+    }
+
+    VALUE
+    test(VALUE self)
+    {
+        // No cast
+        rb_define_module_function(self, "m1", m1, 1);
+        rb_define_module_function(self, "m2", m2, 2);
+        rb_define_module_function(self, "ma", ma, -2);
+        rb_define_module_function(self, "mv", mv, -1);
+        rb_define_module_function(self, "mc", mc, -1);
+
+        // Cast by RUBY_METHOD_FUNC
+        rb_define_module_function(self, "m1", RUBY_METHOD_FUNC(m1), 1);
+        rb_define_module_function(self, "m2", RUBY_METHOD_FUNC(m2), 2);
+        rb_define_module_function(self, "ma", RUBY_METHOD_FUNC(ma), -2);
+        rb_define_module_function(self, "mv", RUBY_METHOD_FUNC(mv), -1);
+        rb_define_module_function(self, "mc", RUBY_METHOD_FUNC(mc), -1);
+
+        // Explicit cast instead of RUBY_METHOD_FUNC
+        rb_define_module_function(self, "m1", (VALUE (*)(...))(m1), 1);
+        rb_define_module_function(self, "m2", (VALUE (*)(...))(m2), 2);
+        rb_define_module_function(self, "ma", (VALUE (*)(...))(ma), -2);
+        rb_define_module_function(self, "mv", (VALUE (*)(...))(mv), -1);
+        rb_define_module_function(self, "mc", (VALUE (*)(...))(mc), -1);
+
+        // rb_f_notimplement
+        rb_define_module_function(self, "m1", rb_f_notimplement, 1);
+        rb_define_module_function(self, "m2", rb_f_notimplement, 2);
+        rb_define_module_function(self, "ma", rb_f_notimplement, -2);
+        rb_define_module_function(self, "mv", rb_f_notimplement, -1);
+        rb_define_module_function(self, "mc", rb_f_notimplement, -1);
+
+#ifdef HAVE_NULLPTR
+        // It doesn't make any sense at all to pass nullptr as a method.
+#endif
+
+        return self;
+    }
+}
+
+namespace test_rb_define_singleton_method {
+    static VALUE
+    m1(VALUE, VALUE)
+    {
+        return Qnil;
+    }
+
+    static VALUE
+    m2(VALUE, VALUE, VALUE)
+    {
+        return Qnil;
+    }
+
+    static VALUE
+    ma(VALUE, VALUE)
+    {
+        return Qnil;
+    }
+
+    static VALUE
+    mv(int, VALUE*, VALUE)
+    {
+        return Qnil;
+    }
+
+    static VALUE
+    mc(int, const VALUE*, VALUE)
+    {
+        return Qnil;
+    }
+
+    VALUE
+    test(VALUE self)
+    {
+        // No cast
+        rb_define_singleton_method(self, "m1", m1, 1);
+        rb_define_singleton_method(self, "m2", m2, 2);
+        rb_define_singleton_method(self, "ma", ma, -2);
+        rb_define_singleton_method(self, "mv", mv, -1);
+        rb_define_singleton_method(self, "mc", mc, -1);
+
+        // Cast by RUBY_METHOD_FUNC
+        rb_define_singleton_method(self, "m1", RUBY_METHOD_FUNC(m1), 1);
+        rb_define_singleton_method(self, "m2", RUBY_METHOD_FUNC(m2), 2);
+        rb_define_singleton_method(self, "ma", RUBY_METHOD_FUNC(ma), -2);
+        rb_define_singleton_method(self, "mv", RUBY_METHOD_FUNC(mv), -1);
+        rb_define_singleton_method(self, "mc", RUBY_METHOD_FUNC(mc), -1);
+
+        // Explicit cast instead of RUBY_METHOD_FUNC
+        rb_define_singleton_method(self, "m1", (VALUE (*)(...))(m1), 1);
+        rb_define_singleton_method(self, "m2", (VALUE (*)(...))(m2), 2);
+        rb_define_singleton_method(self, "ma", (VALUE (*)(...))(ma), -2);
+        rb_define_singleton_method(self, "mv", (VALUE (*)(...))(mv), -1);
+        rb_define_singleton_method(self, "mc", (VALUE (*)(...))(mc), -1);
+
+        // rb_f_notimplement
+        rb_define_singleton_method(self, "m1", rb_f_notimplement, 1);
+        rb_define_singleton_method(self, "m2", rb_f_notimplement, 2);
+        rb_define_singleton_method(self, "ma", rb_f_notimplement, -2);
+        rb_define_singleton_method(self, "mv", rb_f_notimplement, -1);
+        rb_define_singleton_method(self, "mc", rb_f_notimplement, -1);
+
+#ifdef HAVE_NULLPTR
+        // It doesn't make any sense at all to pass nullptr as a method.
+#endif
+
+        return self;
+    }
+}
+
+namespace test_rb_define_protected_method {
+    static VALUE
+    m1(VALUE, VALUE)
+    {
+        return Qnil;
+    }
+
+    static VALUE
+    m2(VALUE, VALUE, VALUE)
+    {
+        return Qnil;
+    }
+
+    static VALUE
+    ma(VALUE, VALUE)
+    {
+        return Qnil;
+    }
+
+    static VALUE
+    mv(int, VALUE*, VALUE)
+    {
+        return Qnil;
+    }
+
+    static VALUE
+    mc(int, const VALUE*, VALUE)
+    {
+        return Qnil;
+    }
+
+    VALUE
+    test(VALUE self)
+    {
+        // No cast
+        rb_define_protected_method(self, "m1", m1, 1);
+        rb_define_protected_method(self, "m2", m2, 2);
+        rb_define_protected_method(self, "ma", ma, -2);
+        rb_define_protected_method(self, "mv", mv, -1);
+        rb_define_protected_method(self, "mc", mc, -1);
+
+        // Cast by RUBY_METHOD_FUNC
+        rb_define_protected_method(self, "m1", RUBY_METHOD_FUNC(m1), 1);
+        rb_define_protected_method(self, "m2", RUBY_METHOD_FUNC(m2), 2);
+        rb_define_protected_method(self, "ma", RUBY_METHOD_FUNC(ma), -2);
+        rb_define_protected_method(self, "mv", RUBY_METHOD_FUNC(mv), -1);
+        rb_define_protected_method(self, "mc", RUBY_METHOD_FUNC(mc), -1);
+
+        // Explicit cast instead of RUBY_METHOD_FUNC
+        rb_define_protected_method(self, "m1", (VALUE (*)(...))(m1), 1);
+        rb_define_protected_method(self, "m2", (VALUE (*)(...))(m2), 2);
+        rb_define_protected_method(self, "ma", (VALUE (*)(...))(ma), -2);
+        rb_define_protected_method(self, "mv", (VALUE (*)(...))(mv), -1);
+        rb_define_protected_method(self, "mc", (VALUE (*)(...))(mc), -1);
+
+        // rb_f_notimplement
+        rb_define_protected_method(self, "m1", rb_f_notimplement, 1);
+        rb_define_protected_method(self, "m2", rb_f_notimplement, 2);
+        rb_define_protected_method(self, "ma", rb_f_notimplement, -2);
+        rb_define_protected_method(self, "mv", rb_f_notimplement, -1);
+        rb_define_protected_method(self, "mc", rb_f_notimplement, -1);
+
+#ifdef HAVE_NULLPTR
+        // It doesn't make any sense at all to pass nullptr as a method.
+#endif
+
+        return self;
+    }
+}
+
+namespace test_rb_define_private_method {
+    static VALUE
+    m1(VALUE, VALUE)
+    {
+        return Qnil;
+    }
+
+    static VALUE
+    m2(VALUE, VALUE, VALUE)
+    {
+        return Qnil;
+    }
+
+    static VALUE
+    ma(VALUE, VALUE)
+    {
+        return Qnil;
+    }
+
+    static VALUE
+    mv(int, VALUE*, VALUE)
+    {
+        return Qnil;
+    }
+
+    static VALUE
+    mc(int, const VALUE*, VALUE)
+    {
+        return Qnil;
+    }
+
+    VALUE
+    test(VALUE self)
+    {
+        // No cast
+        rb_define_private_method(self, "m1", m1, 1);
+        rb_define_private_method(self, "m2", m2, 2);
+        rb_define_private_method(self, "ma", ma, -2);
+        rb_define_private_method(self, "mv", mv, -1);
+        rb_define_private_method(self, "mc", mc, -1);
+
+        // Cast by RUBY_METHOD_FUNC
+        rb_define_private_method(self, "m1", RUBY_METHOD_FUNC(m1), 1);
+        rb_define_private_method(self, "m2", RUBY_METHOD_FUNC(m2), 2);
+        rb_define_private_method(self, "ma", RUBY_METHOD_FUNC(ma), -2);
+        rb_define_private_method(self, "mv", RUBY_METHOD_FUNC(mv), -1);
+        rb_define_private_method(self, "mc", RUBY_METHOD_FUNC(mc), -1);
+
+        // Explicit cast instead of RUBY_METHOD_FUNC
+        rb_define_private_method(self, "m1", (VALUE (*)(...))(m1), 1);
+        rb_define_private_method(self, "m2", (VALUE (*)(...))(m2), 2);
+        rb_define_private_method(self, "ma", (VALUE (*)(...))(ma), -2);
+        rb_define_private_method(self, "mv", (VALUE (*)(...))(mv), -1);
+        rb_define_private_method(self, "mc", (VALUE (*)(...))(mc), -1);
+
+        // rb_f_notimplement
+        rb_define_private_method(self, "m1", rb_f_notimplement, 1);
+        rb_define_private_method(self, "m2", rb_f_notimplement, 2);
+        rb_define_private_method(self, "ma", rb_f_notimplement, -2);
+        rb_define_private_method(self, "mv", rb_f_notimplement, -1);
+        rb_define_private_method(self, "mc", rb_f_notimplement, -1);
+
+#ifdef HAVE_NULLPTR
+        // It doesn't make any sense at all to pass nullptr as a method.
+#endif
+
+        return self;
+    }
+}
+
+namespace test_rb_define_global_function {
+    static VALUE
+    m1(VALUE, VALUE)
+    {
+        return Qnil;
+    }
+
+    static VALUE
+    m2(VALUE, VALUE, VALUE)
+    {
+        return Qnil;
+    }
+
+    static VALUE
+    ma(VALUE, VALUE)
+    {
+        return Qnil;
+    }
+
+    static VALUE
+    mv(int, VALUE*, VALUE)
+    {
+        return Qnil;
+    }
+
+    static VALUE
+    mc(int, const VALUE*, VALUE)
+    {
+        return Qnil;
+    }
+
+    VALUE
+    test(VALUE self)
+    {
+        // No cast
+        rb_define_global_function("m1", m1, 1);
+        rb_define_global_function("m2", m2, 2);
+        rb_define_global_function("ma", ma, -2);
+        rb_define_global_function("mv", mv, -1);
+        rb_define_global_function("mc", mc, -1);
+
+        // Cast by RUBY_METHOD_FUNC
+        rb_define_global_function("m1", RUBY_METHOD_FUNC(m1), 1);
+        rb_define_global_function("m2", RUBY_METHOD_FUNC(m2), 2);
+        rb_define_global_function("ma", RUBY_METHOD_FUNC(ma), -2);
+        rb_define_global_function("mv", RUBY_METHOD_FUNC(mv), -1);
+        rb_define_global_function("mc", RUBY_METHOD_FUNC(mc), -1);
+
+        // Explicit cast instead of RUBY_METHOD_FUNC
+        rb_define_global_function("m1", (VALUE (*)(...))(m1), 1);
+        rb_define_global_function("m2", (VALUE (*)(...))(m2), 2);
+        rb_define_global_function("ma", (VALUE (*)(...))(ma), -2);
+        rb_define_global_function("mv", (VALUE (*)(...))(mv), -1);
+        rb_define_global_function("mc", (VALUE (*)(...))(mc), -1);
+
+        // rb_f_notimplement
+        rb_define_global_function("m1", rb_f_notimplement, 1);
+        rb_define_global_function("m2", rb_f_notimplement, 2);
+        rb_define_global_function("ma", rb_f_notimplement, -2);
+        rb_define_global_function("mv", rb_f_notimplement, -1);
+        rb_define_global_function("mc", rb_f_notimplement, -1);
+
+#ifdef HAVE_NULLPTR
+        // It doesn't make any sense at all to pass nullptr as a method.
+#endif
+
+        return self;
+    }
+}
+
+extern "C" void
+Init_cxxanyargs(void)
+{
+    VALUE b = rb_define_module("Bug");
+#define test(sym) \
+    rb_define_module_function(b, #sym, RUBY_METHOD_FUNC(test_ ## sym::test), 0)
+
+    test(rb_define_virtual_variable);
+    test(rb_define_hooked_variable);
+    test(rb_iterate);
+    test(rb_block_call);
+    test(rb_rescue);
+    test(rb_rescue2);
+    test(rb_ensure);
+    test(rb_catch);
+    test(rb_catch_obj);
+    test(rb_fiber_new);
+    test(rb_proc_new);
+    test(rb_thread_create);
+    test(st_foreach);
+    test(st_foreach_check);
+    test(st_foreach_safe);
+    test(rb_hash_foreach);
+    test(rb_ivar_foreach);
+    test(rb_define_method);
+    test(rb_define_method_id);
+    test(rb_define_module_function);
+    test(rb_define_singleton_method);
+    test(rb_define_protected_method);
+    test(rb_define_private_method);
+    test(rb_define_global_function);
+}
diff --git a/ext/-test-/cxxanyargs/depend b/ext/-test-/cxxanyargs/depend
new file mode 100644
index 0000000000..ca821409a2
--- /dev/null
+++ b/ext/-test-/cxxanyargs/depend
@@ -0,0 +1,25 @@
+$(TARGET_SO) $(STATIC_LIB): $(FAILURES:.cpp=.failed)
+
+.SUFFIXES: .failed
+
+.cpp.failed:
+	$(Q)$(RUBY) -rfileutils \
+	  -e "t = ARGV.shift" \
+	  -e "err = IO.popen(ARGV, err:[:child, :out], &:read)" \
+	  -e "abort err unless /rb_define_method/ =~ err.b" \
+	  -e "File.write(t, err)" $@ $(MAKE) $(*F).o
+
+# AUTOGENERATED DEPENDENCIES START
+cxxanyargs.o: $(RUBY_EXTCONF_H)
+cxxanyargs.o: $(arch_hdrdir)/ruby/config.h
+cxxanyargs.o: $(hdrdir)/ruby/assert.h
+cxxanyargs.o: $(hdrdir)/ruby/backward.h
+cxxanyargs.o: $(hdrdir)/ruby/backward/cxxanyargs.hpp
+cxxanyargs.o: $(hdrdir)/ruby/defines.h
+cxxanyargs.o: $(hdrdir)/ruby/intern.h
+cxxanyargs.o: $(hdrdir)/ruby/missing.h
+cxxanyargs.o: $(hdrdir)/ruby/ruby.h
+cxxanyargs.o: $(hdrdir)/ruby/st.h
+cxxanyargs.o: $(hdrdir)/ruby/subst.h
+cxxanyargs.o: cxxanyargs.cpp
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/cxxanyargs/extconf.rb b/ext/-test-/cxxanyargs/extconf.rb
new file mode 100644
index 0000000000..d1d2469209
--- /dev/null
+++ b/ext/-test-/cxxanyargs/extconf.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: false
+
+cxx = MakeMakefile["C++"]
+
+# #### have_devel hack ####
+# cxx.try_compile tries to detect compilers, but the try_compile below is
+# trying to detect a compiler in a different way.  We need to prevent the
+# default detection routine.
+
+cxx.instance_variable_set(:'@have_devel', true)
+
+ok = cxx.try_link(<<~'begin', "") do |x|
+  #include "ruby/config.h"
+
+  namespace {
+      typedef int conftest1[SIZEOF_LONG == sizeof(long) ? 1 : -1];
+      typedef int conftest2[SIZEOF_VOIDP == sizeof(void*) ? 1 : -1];
+  }
+
+  int
+  main(int argc, const char** argv)
+  {
+      return !!argv[argc];
+  }
+begin
+  # We are wiping ruby.h from the source because that header file is the
+  # subject we are going to test in this extension library.
+  x.sub! %<#include "ruby.h">, ''
+end
+
+cxx.instance_variable_set(:'@have_devel', ok)
+
+if ok
+  $srcs = %w[cxxanyargs.cpp]
+  failures = Dir.glob($srcdir + "/failure*.cpp").map {|n| File.basename(n)}
+  $cleanfiles << "$(FAILURES:.cpp=.failed)"
+  create_makefile("-test-/cxxanyargs") do |mk|
+    mk << "FAILURES #{['=', failures].join(' ')}\n"
+    mk << ".IGNORE: $(FAILURES:.cpp=.o)\n" unless $mswin
+    mk
+  end
+end
diff --git a/ext/-test-/cxxanyargs/failure.cpp b/ext/-test-/cxxanyargs/failure.cpp
new file mode 100644
index 0000000000..039beb1633
--- /dev/null
+++ b/ext/-test-/cxxanyargs/failure.cpp
@@ -0,0 +1,13 @@
+#include <ruby/ruby.h>
+
+static VALUE
+func_arg1(VALUE self, VALUE arg1)
+{
+    return arg1;
+}
+
+extern "C" void
+Init_failure(void)
+{
+    rb_define_method(rb_cObject, "arg1", func_arg1, 0);
+}
diff --git a/ext/-test-/cxxanyargs/failurem1.cpp b/ext/-test-/cxxanyargs/failurem1.cpp
new file mode 100644
index 0000000000..e58a0f4e0d
--- /dev/null
+++ b/ext/-test-/cxxanyargs/failurem1.cpp
@@ -0,0 +1,13 @@
+#include <ruby/ruby.h>
+
+static VALUE
+func_argm1(int argc, VALUE *argv, VALUE self)
+{
+    return argc > 0 ? argv[0] : Qnil;
+}
+
+extern "C" void
+Init_failure(void)
+{
+    rb_define_method(rb_cObject, "argm1", func_argm1, 0);
+}
diff --git a/ext/-test-/debug/depend b/ext/-test-/debug/depend
index 392677239a..dad22d46de 100644
--- a/ext/-test-/debug/depend
+++ b/ext/-test-/debug/depend
@@ -1,18 +1,318 @@
 # AUTOGENERATED DEPENDENCIES START
 init.o: $(RUBY_EXTCONF_H)
 init.o: $(arch_hdrdir)/ruby/config.h
+init.o: $(hdrdir)/ruby.h
+init.o: $(hdrdir)/ruby/internal/anyargs.h
+init.o: $(hdrdir)/ruby/internal/arithmetic.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+init.o: $(hdrdir)/ruby/internal/assume.h
+init.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+init.o: $(hdrdir)/ruby/internal/attr/artificial.h
+init.o: $(hdrdir)/ruby/internal/attr/cold.h
+init.o: $(hdrdir)/ruby/internal/attr/const.h
+init.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+init.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+init.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+init.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+init.o: $(hdrdir)/ruby/internal/attr/error.h
+init.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+init.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+init.o: $(hdrdir)/ruby/internal/attr/format.h
+init.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+init.o: $(hdrdir)/ruby/internal/attr/noalias.h
+init.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+init.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+init.o: $(hdrdir)/ruby/internal/attr/noinline.h
+init.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+init.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+init.o: $(hdrdir)/ruby/internal/attr/pure.h
+init.o: $(hdrdir)/ruby/internal/attr/restrict.h
+init.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+init.o: $(hdrdir)/ruby/internal/attr/warning.h
+init.o: $(hdrdir)/ruby/internal/attr/weakref.h
+init.o: $(hdrdir)/ruby/internal/cast.h
+init.o: $(hdrdir)/ruby/internal/compiler_is.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+init.o: $(hdrdir)/ruby/internal/compiler_since.h
+init.o: $(hdrdir)/ruby/internal/config.h
+init.o: $(hdrdir)/ruby/internal/constant_p.h
+init.o: $(hdrdir)/ruby/internal/core.h
+init.o: $(hdrdir)/ruby/internal/core/rarray.h
+init.o: $(hdrdir)/ruby/internal/core/rbasic.h
+init.o: $(hdrdir)/ruby/internal/core/rbignum.h
+init.o: $(hdrdir)/ruby/internal/core/rclass.h
+init.o: $(hdrdir)/ruby/internal/core/rdata.h
+init.o: $(hdrdir)/ruby/internal/core/rfile.h
+init.o: $(hdrdir)/ruby/internal/core/rhash.h
+init.o: $(hdrdir)/ruby/internal/core/robject.h
+init.o: $(hdrdir)/ruby/internal/core/rregexp.h
+init.o: $(hdrdir)/ruby/internal/core/rstring.h
+init.o: $(hdrdir)/ruby/internal/core/rstruct.h
+init.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+init.o: $(hdrdir)/ruby/internal/ctype.h
+init.o: $(hdrdir)/ruby/internal/dllexport.h
+init.o: $(hdrdir)/ruby/internal/dosish.h
+init.o: $(hdrdir)/ruby/internal/error.h
+init.o: $(hdrdir)/ruby/internal/eval.h
+init.o: $(hdrdir)/ruby/internal/event.h
+init.o: $(hdrdir)/ruby/internal/fl_type.h
+init.o: $(hdrdir)/ruby/internal/gc.h
+init.o: $(hdrdir)/ruby/internal/glob.h
+init.o: $(hdrdir)/ruby/internal/globals.h
+init.o: $(hdrdir)/ruby/internal/has/attribute.h
+init.o: $(hdrdir)/ruby/internal/has/builtin.h
+init.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/extension.h
+init.o: $(hdrdir)/ruby/internal/has/feature.h
+init.o: $(hdrdir)/ruby/internal/has/warning.h
+init.o: $(hdrdir)/ruby/internal/intern/array.h
+init.o: $(hdrdir)/ruby/internal/intern/bignum.h
+init.o: $(hdrdir)/ruby/internal/intern/class.h
+init.o: $(hdrdir)/ruby/internal/intern/compar.h
+init.o: $(hdrdir)/ruby/internal/intern/complex.h
+init.o: $(hdrdir)/ruby/internal/intern/cont.h
+init.o: $(hdrdir)/ruby/internal/intern/dir.h
+init.o: $(hdrdir)/ruby/internal/intern/enum.h
+init.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+init.o: $(hdrdir)/ruby/internal/intern/error.h
+init.o: $(hdrdir)/ruby/internal/intern/eval.h
+init.o: $(hdrdir)/ruby/internal/intern/file.h
+init.o: $(hdrdir)/ruby/internal/intern/gc.h
+init.o: $(hdrdir)/ruby/internal/intern/hash.h
+init.o: $(hdrdir)/ruby/internal/intern/io.h
+init.o: $(hdrdir)/ruby/internal/intern/load.h
+init.o: $(hdrdir)/ruby/internal/intern/marshal.h
+init.o: $(hdrdir)/ruby/internal/intern/numeric.h
+init.o: $(hdrdir)/ruby/internal/intern/object.h
+init.o: $(hdrdir)/ruby/internal/intern/parse.h
+init.o: $(hdrdir)/ruby/internal/intern/proc.h
+init.o: $(hdrdir)/ruby/internal/intern/process.h
+init.o: $(hdrdir)/ruby/internal/intern/random.h
+init.o: $(hdrdir)/ruby/internal/intern/range.h
+init.o: $(hdrdir)/ruby/internal/intern/rational.h
+init.o: $(hdrdir)/ruby/internal/intern/re.h
+init.o: $(hdrdir)/ruby/internal/intern/ruby.h
+init.o: $(hdrdir)/ruby/internal/intern/select.h
+init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+init.o: $(hdrdir)/ruby/internal/intern/signal.h
+init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+init.o: $(hdrdir)/ruby/internal/intern/string.h
+init.o: $(hdrdir)/ruby/internal/intern/struct.h
+init.o: $(hdrdir)/ruby/internal/intern/thread.h
+init.o: $(hdrdir)/ruby/internal/intern/time.h
+init.o: $(hdrdir)/ruby/internal/intern/variable.h
+init.o: $(hdrdir)/ruby/internal/intern/vm.h
+init.o: $(hdrdir)/ruby/internal/interpreter.h
+init.o: $(hdrdir)/ruby/internal/iterator.h
+init.o: $(hdrdir)/ruby/internal/memory.h
+init.o: $(hdrdir)/ruby/internal/method.h
+init.o: $(hdrdir)/ruby/internal/module.h
+init.o: $(hdrdir)/ruby/internal/newobj.h
+init.o: $(hdrdir)/ruby/internal/rgengc.h
+init.o: $(hdrdir)/ruby/internal/scan_args.h
+init.o: $(hdrdir)/ruby/internal/special_consts.h
+init.o: $(hdrdir)/ruby/internal/static_assert.h
+init.o: $(hdrdir)/ruby/internal/stdalign.h
+init.o: $(hdrdir)/ruby/internal/stdbool.h
+init.o: $(hdrdir)/ruby/internal/symbol.h
+init.o: $(hdrdir)/ruby/internal/token_paste.h
+init.o: $(hdrdir)/ruby/internal/value.h
+init.o: $(hdrdir)/ruby/internal/value_type.h
+init.o: $(hdrdir)/ruby/internal/variable.h
+init.o: $(hdrdir)/ruby/internal/warning_push.h
+init.o: $(hdrdir)/ruby/internal/xmalloc.h
+init.o: $(hdrdir)/ruby/assert.h
 init.o: $(hdrdir)/ruby/backward.h
+init.o: $(hdrdir)/ruby/backward/2/assume.h
+init.o: $(hdrdir)/ruby/backward/2/attributes.h
+init.o: $(hdrdir)/ruby/backward/2/bool.h
+init.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+init.o: $(hdrdir)/ruby/backward/2/inttypes.h
+init.o: $(hdrdir)/ruby/backward/2/limits.h
+init.o: $(hdrdir)/ruby/backward/2/long_long.h
+init.o: $(hdrdir)/ruby/backward/2/stdalign.h
+init.o: $(hdrdir)/ruby/backward/2/stdarg.h
 init.o: $(hdrdir)/ruby/defines.h
 init.o: $(hdrdir)/ruby/intern.h
 init.o: $(hdrdir)/ruby/missing.h
 init.o: $(hdrdir)/ruby/ruby.h
 init.o: $(hdrdir)/ruby/st.h
 init.o: $(hdrdir)/ruby/subst.h
-init.o: $(top_srcdir)/include/ruby.h
 init.o: init.c
 inspector.o: $(RUBY_EXTCONF_H)
 inspector.o: $(arch_hdrdir)/ruby/config.h
+inspector.o: $(hdrdir)/ruby/internal/anyargs.h
+inspector.o: $(hdrdir)/ruby/internal/arithmetic.h
+inspector.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+inspector.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+inspector.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+inspector.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+inspector.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+inspector.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+inspector.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+inspector.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+inspector.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+inspector.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+inspector.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+inspector.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+inspector.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+inspector.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+inspector.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+inspector.o: $(hdrdir)/ruby/internal/assume.h
+inspector.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+inspector.o: $(hdrdir)/ruby/internal/attr/artificial.h
+inspector.o: $(hdrdir)/ruby/internal/attr/cold.h
+inspector.o: $(hdrdir)/ruby/internal/attr/const.h
+inspector.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+inspector.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+inspector.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+inspector.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+inspector.o: $(hdrdir)/ruby/internal/attr/error.h
+inspector.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+inspector.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+inspector.o: $(hdrdir)/ruby/internal/attr/format.h
+inspector.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+inspector.o: $(hdrdir)/ruby/internal/attr/noalias.h
+inspector.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+inspector.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+inspector.o: $(hdrdir)/ruby/internal/attr/noinline.h
+inspector.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+inspector.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+inspector.o: $(hdrdir)/ruby/internal/attr/pure.h
+inspector.o: $(hdrdir)/ruby/internal/attr/restrict.h
+inspector.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+inspector.o: $(hdrdir)/ruby/internal/attr/warning.h
+inspector.o: $(hdrdir)/ruby/internal/attr/weakref.h
+inspector.o: $(hdrdir)/ruby/internal/cast.h
+inspector.o: $(hdrdir)/ruby/internal/compiler_is.h
+inspector.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+inspector.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+inspector.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+inspector.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+inspector.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+inspector.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+inspector.o: $(hdrdir)/ruby/internal/compiler_since.h
+inspector.o: $(hdrdir)/ruby/internal/config.h
+inspector.o: $(hdrdir)/ruby/internal/constant_p.h
+inspector.o: $(hdrdir)/ruby/internal/core.h
+inspector.o: $(hdrdir)/ruby/internal/core/rarray.h
+inspector.o: $(hdrdir)/ruby/internal/core/rbasic.h
+inspector.o: $(hdrdir)/ruby/internal/core/rbignum.h
+inspector.o: $(hdrdir)/ruby/internal/core/rclass.h
+inspector.o: $(hdrdir)/ruby/internal/core/rdata.h
+inspector.o: $(hdrdir)/ruby/internal/core/rfile.h
+inspector.o: $(hdrdir)/ruby/internal/core/rhash.h
+inspector.o: $(hdrdir)/ruby/internal/core/robject.h
+inspector.o: $(hdrdir)/ruby/internal/core/rregexp.h
+inspector.o: $(hdrdir)/ruby/internal/core/rstring.h
+inspector.o: $(hdrdir)/ruby/internal/core/rstruct.h
+inspector.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+inspector.o: $(hdrdir)/ruby/internal/ctype.h
+inspector.o: $(hdrdir)/ruby/internal/dllexport.h
+inspector.o: $(hdrdir)/ruby/internal/dosish.h
+inspector.o: $(hdrdir)/ruby/internal/error.h
+inspector.o: $(hdrdir)/ruby/internal/eval.h
+inspector.o: $(hdrdir)/ruby/internal/event.h
+inspector.o: $(hdrdir)/ruby/internal/fl_type.h
+inspector.o: $(hdrdir)/ruby/internal/gc.h
+inspector.o: $(hdrdir)/ruby/internal/glob.h
+inspector.o: $(hdrdir)/ruby/internal/globals.h
+inspector.o: $(hdrdir)/ruby/internal/has/attribute.h
+inspector.o: $(hdrdir)/ruby/internal/has/builtin.h
+inspector.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+inspector.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+inspector.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+inspector.o: $(hdrdir)/ruby/internal/has/extension.h
+inspector.o: $(hdrdir)/ruby/internal/has/feature.h
+inspector.o: $(hdrdir)/ruby/internal/has/warning.h
+inspector.o: $(hdrdir)/ruby/internal/intern/array.h
+inspector.o: $(hdrdir)/ruby/internal/intern/bignum.h
+inspector.o: $(hdrdir)/ruby/internal/intern/class.h
+inspector.o: $(hdrdir)/ruby/internal/intern/compar.h
+inspector.o: $(hdrdir)/ruby/internal/intern/complex.h
+inspector.o: $(hdrdir)/ruby/internal/intern/cont.h
+inspector.o: $(hdrdir)/ruby/internal/intern/dir.h
+inspector.o: $(hdrdir)/ruby/internal/intern/enum.h
+inspector.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+inspector.o: $(hdrdir)/ruby/internal/intern/error.h
+inspector.o: $(hdrdir)/ruby/internal/intern/eval.h
+inspector.o: $(hdrdir)/ruby/internal/intern/file.h
+inspector.o: $(hdrdir)/ruby/internal/intern/gc.h
+inspector.o: $(hdrdir)/ruby/internal/intern/hash.h
+inspector.o: $(hdrdir)/ruby/internal/intern/io.h
+inspector.o: $(hdrdir)/ruby/internal/intern/load.h
+inspector.o: $(hdrdir)/ruby/internal/intern/marshal.h
+inspector.o: $(hdrdir)/ruby/internal/intern/numeric.h
+inspector.o: $(hdrdir)/ruby/internal/intern/object.h
+inspector.o: $(hdrdir)/ruby/internal/intern/parse.h
+inspector.o: $(hdrdir)/ruby/internal/intern/proc.h
+inspector.o: $(hdrdir)/ruby/internal/intern/process.h
+inspector.o: $(hdrdir)/ruby/internal/intern/random.h
+inspector.o: $(hdrdir)/ruby/internal/intern/range.h
+inspector.o: $(hdrdir)/ruby/internal/intern/rational.h
+inspector.o: $(hdrdir)/ruby/internal/intern/re.h
+inspector.o: $(hdrdir)/ruby/internal/intern/ruby.h
+inspector.o: $(hdrdir)/ruby/internal/intern/select.h
+inspector.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+inspector.o: $(hdrdir)/ruby/internal/intern/signal.h
+inspector.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+inspector.o: $(hdrdir)/ruby/internal/intern/string.h
+inspector.o: $(hdrdir)/ruby/internal/intern/struct.h
+inspector.o: $(hdrdir)/ruby/internal/intern/thread.h
+inspector.o: $(hdrdir)/ruby/internal/intern/time.h
+inspector.o: $(hdrdir)/ruby/internal/intern/variable.h
+inspector.o: $(hdrdir)/ruby/internal/intern/vm.h
+inspector.o: $(hdrdir)/ruby/internal/interpreter.h
+inspector.o: $(hdrdir)/ruby/internal/iterator.h
+inspector.o: $(hdrdir)/ruby/internal/memory.h
+inspector.o: $(hdrdir)/ruby/internal/method.h
+inspector.o: $(hdrdir)/ruby/internal/module.h
+inspector.o: $(hdrdir)/ruby/internal/newobj.h
+inspector.o: $(hdrdir)/ruby/internal/rgengc.h
+inspector.o: $(hdrdir)/ruby/internal/scan_args.h
+inspector.o: $(hdrdir)/ruby/internal/special_consts.h
+inspector.o: $(hdrdir)/ruby/internal/static_assert.h
+inspector.o: $(hdrdir)/ruby/internal/stdalign.h
+inspector.o: $(hdrdir)/ruby/internal/stdbool.h
+inspector.o: $(hdrdir)/ruby/internal/symbol.h
+inspector.o: $(hdrdir)/ruby/internal/token_paste.h
+inspector.o: $(hdrdir)/ruby/internal/value.h
+inspector.o: $(hdrdir)/ruby/internal/value_type.h
+inspector.o: $(hdrdir)/ruby/internal/variable.h
+inspector.o: $(hdrdir)/ruby/internal/warning_push.h
+inspector.o: $(hdrdir)/ruby/internal/xmalloc.h
+inspector.o: $(hdrdir)/ruby/assert.h
 inspector.o: $(hdrdir)/ruby/backward.h
+inspector.o: $(hdrdir)/ruby/backward/2/assume.h
+inspector.o: $(hdrdir)/ruby/backward/2/attributes.h
+inspector.o: $(hdrdir)/ruby/backward/2/bool.h
+inspector.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+inspector.o: $(hdrdir)/ruby/backward/2/inttypes.h
+inspector.o: $(hdrdir)/ruby/backward/2/limits.h
+inspector.o: $(hdrdir)/ruby/backward/2/long_long.h
+inspector.o: $(hdrdir)/ruby/backward/2/stdalign.h
+inspector.o: $(hdrdir)/ruby/backward/2/stdarg.h
 inspector.o: $(hdrdir)/ruby/debug.h
 inspector.o: $(hdrdir)/ruby/defines.h
 inspector.o: $(hdrdir)/ruby/intern.h
@@ -23,7 +323,157 @@ inspector.o: $(hdrdir)/ruby/subst.h
 inspector.o: inspector.c
 profile_frames.o: $(RUBY_EXTCONF_H)
 profile_frames.o: $(arch_hdrdir)/ruby/config.h
+profile_frames.o: $(hdrdir)/ruby/internal/anyargs.h
+profile_frames.o: $(hdrdir)/ruby/internal/arithmetic.h
+profile_frames.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+profile_frames.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+profile_frames.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+profile_frames.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+profile_frames.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+profile_frames.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+profile_frames.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+profile_frames.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+profile_frames.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+profile_frames.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+profile_frames.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+profile_frames.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+profile_frames.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+profile_frames.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+profile_frames.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+profile_frames.o: $(hdrdir)/ruby/internal/assume.h
+profile_frames.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+profile_frames.o: $(hdrdir)/ruby/internal/attr/artificial.h
+profile_frames.o: $(hdrdir)/ruby/internal/attr/cold.h
+profile_frames.o: $(hdrdir)/ruby/internal/attr/const.h
+profile_frames.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+profile_frames.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+profile_frames.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+profile_frames.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+profile_frames.o: $(hdrdir)/ruby/internal/attr/error.h
+profile_frames.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+profile_frames.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+profile_frames.o: $(hdrdir)/ruby/internal/attr/format.h
+profile_frames.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+profile_frames.o: $(hdrdir)/ruby/internal/attr/noalias.h
+profile_frames.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+profile_frames.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+profile_frames.o: $(hdrdir)/ruby/internal/attr/noinline.h
+profile_frames.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+profile_frames.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+profile_frames.o: $(hdrdir)/ruby/internal/attr/pure.h
+profile_frames.o: $(hdrdir)/ruby/internal/attr/restrict.h
+profile_frames.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+profile_frames.o: $(hdrdir)/ruby/internal/attr/warning.h
+profile_frames.o: $(hdrdir)/ruby/internal/attr/weakref.h
+profile_frames.o: $(hdrdir)/ruby/internal/cast.h
+profile_frames.o: $(hdrdir)/ruby/internal/compiler_is.h
+profile_frames.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+profile_frames.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+profile_frames.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+profile_frames.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+profile_frames.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+profile_frames.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+profile_frames.o: $(hdrdir)/ruby/internal/compiler_since.h
+profile_frames.o: $(hdrdir)/ruby/internal/config.h
+profile_frames.o: $(hdrdir)/ruby/internal/constant_p.h
+profile_frames.o: $(hdrdir)/ruby/internal/core.h
+profile_frames.o: $(hdrdir)/ruby/internal/core/rarray.h
+profile_frames.o: $(hdrdir)/ruby/internal/core/rbasic.h
+profile_frames.o: $(hdrdir)/ruby/internal/core/rbignum.h
+profile_frames.o: $(hdrdir)/ruby/internal/core/rclass.h
+profile_frames.o: $(hdrdir)/ruby/internal/core/rdata.h
+profile_frames.o: $(hdrdir)/ruby/internal/core/rfile.h
+profile_frames.o: $(hdrdir)/ruby/internal/core/rhash.h
+profile_frames.o: $(hdrdir)/ruby/internal/core/robject.h
+profile_frames.o: $(hdrdir)/ruby/internal/core/rregexp.h
+profile_frames.o: $(hdrdir)/ruby/internal/core/rstring.h
+profile_frames.o: $(hdrdir)/ruby/internal/core/rstruct.h
+profile_frames.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+profile_frames.o: $(hdrdir)/ruby/internal/ctype.h
+profile_frames.o: $(hdrdir)/ruby/internal/dllexport.h
+profile_frames.o: $(hdrdir)/ruby/internal/dosish.h
+profile_frames.o: $(hdrdir)/ruby/internal/error.h
+profile_frames.o: $(hdrdir)/ruby/internal/eval.h
+profile_frames.o: $(hdrdir)/ruby/internal/event.h
+profile_frames.o: $(hdrdir)/ruby/internal/fl_type.h
+profile_frames.o: $(hdrdir)/ruby/internal/gc.h
+profile_frames.o: $(hdrdir)/ruby/internal/glob.h
+profile_frames.o: $(hdrdir)/ruby/internal/globals.h
+profile_frames.o: $(hdrdir)/ruby/internal/has/attribute.h
+profile_frames.o: $(hdrdir)/ruby/internal/has/builtin.h
+profile_frames.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+profile_frames.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+profile_frames.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+profile_frames.o: $(hdrdir)/ruby/internal/has/extension.h
+profile_frames.o: $(hdrdir)/ruby/internal/has/feature.h
+profile_frames.o: $(hdrdir)/ruby/internal/has/warning.h
+profile_frames.o: $(hdrdir)/ruby/internal/intern/array.h
+profile_frames.o: $(hdrdir)/ruby/internal/intern/bignum.h
+profile_frames.o: $(hdrdir)/ruby/internal/intern/class.h
+profile_frames.o: $(hdrdir)/ruby/internal/intern/compar.h
+profile_frames.o: $(hdrdir)/ruby/internal/intern/complex.h
+profile_frames.o: $(hdrdir)/ruby/internal/intern/cont.h
+profile_frames.o: $(hdrdir)/ruby/internal/intern/dir.h
+profile_frames.o: $(hdrdir)/ruby/internal/intern/enum.h
+profile_frames.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+profile_frames.o: $(hdrdir)/ruby/internal/intern/error.h
+profile_frames.o: $(hdrdir)/ruby/internal/intern/eval.h
+profile_frames.o: $(hdrdir)/ruby/internal/intern/file.h
+profile_frames.o: $(hdrdir)/ruby/internal/intern/gc.h
+profile_frames.o: $(hdrdir)/ruby/internal/intern/hash.h
+profile_frames.o: $(hdrdir)/ruby/internal/intern/io.h
+profile_frames.o: $(hdrdir)/ruby/internal/intern/load.h
+profile_frames.o: $(hdrdir)/ruby/internal/intern/marshal.h
+profile_frames.o: $(hdrdir)/ruby/internal/intern/numeric.h
+profile_frames.o: $(hdrdir)/ruby/internal/intern/object.h
+profile_frames.o: $(hdrdir)/ruby/internal/intern/parse.h
+profile_frames.o: $(hdrdir)/ruby/internal/intern/proc.h
+profile_frames.o: $(hdrdir)/ruby/internal/intern/process.h
+profile_frames.o: $(hdrdir)/ruby/internal/intern/random.h
+profile_frames.o: $(hdrdir)/ruby/internal/intern/range.h
+profile_frames.o: $(hdrdir)/ruby/internal/intern/rational.h
+profile_frames.o: $(hdrdir)/ruby/internal/intern/re.h
+profile_frames.o: $(hdrdir)/ruby/internal/intern/ruby.h
+profile_frames.o: $(hdrdir)/ruby/internal/intern/select.h
+profile_frames.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+profile_frames.o: $(hdrdir)/ruby/internal/intern/signal.h
+profile_frames.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+profile_frames.o: $(hdrdir)/ruby/internal/intern/string.h
+profile_frames.o: $(hdrdir)/ruby/internal/intern/struct.h
+profile_frames.o: $(hdrdir)/ruby/internal/intern/thread.h
+profile_frames.o: $(hdrdir)/ruby/internal/intern/time.h
+profile_frames.o: $(hdrdir)/ruby/internal/intern/variable.h
+profile_frames.o: $(hdrdir)/ruby/internal/intern/vm.h
+profile_frames.o: $(hdrdir)/ruby/internal/interpreter.h
+profile_frames.o: $(hdrdir)/ruby/internal/iterator.h
+profile_frames.o: $(hdrdir)/ruby/internal/memory.h
+profile_frames.o: $(hdrdir)/ruby/internal/method.h
+profile_frames.o: $(hdrdir)/ruby/internal/module.h
+profile_frames.o: $(hdrdir)/ruby/internal/newobj.h
+profile_frames.o: $(hdrdir)/ruby/internal/rgengc.h
+profile_frames.o: $(hdrdir)/ruby/internal/scan_args.h
+profile_frames.o: $(hdrdir)/ruby/internal/special_consts.h
+profile_frames.o: $(hdrdir)/ruby/internal/static_assert.h
+profile_frames.o: $(hdrdir)/ruby/internal/stdalign.h
+profile_frames.o: $(hdrdir)/ruby/internal/stdbool.h
+profile_frames.o: $(hdrdir)/ruby/internal/symbol.h
+profile_frames.o: $(hdrdir)/ruby/internal/token_paste.h
+profile_frames.o: $(hdrdir)/ruby/internal/value.h
+profile_frames.o: $(hdrdir)/ruby/internal/value_type.h
+profile_frames.o: $(hdrdir)/ruby/internal/variable.h
+profile_frames.o: $(hdrdir)/ruby/internal/warning_push.h
+profile_frames.o: $(hdrdir)/ruby/internal/xmalloc.h
+profile_frames.o: $(hdrdir)/ruby/assert.h
 profile_frames.o: $(hdrdir)/ruby/backward.h
+profile_frames.o: $(hdrdir)/ruby/backward/2/assume.h
+profile_frames.o: $(hdrdir)/ruby/backward/2/attributes.h
+profile_frames.o: $(hdrdir)/ruby/backward/2/bool.h
+profile_frames.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+profile_frames.o: $(hdrdir)/ruby/backward/2/inttypes.h
+profile_frames.o: $(hdrdir)/ruby/backward/2/limits.h
+profile_frames.o: $(hdrdir)/ruby/backward/2/long_long.h
+profile_frames.o: $(hdrdir)/ruby/backward/2/stdalign.h
+profile_frames.o: $(hdrdir)/ruby/backward/2/stdarg.h
 profile_frames.o: $(hdrdir)/ruby/debug.h
 profile_frames.o: $(hdrdir)/ruby/defines.h
 profile_frames.o: $(hdrdir)/ruby/intern.h
diff --git a/ext/-test-/dln/empty/depend b/ext/-test-/dln/empty/depend
new file mode 100644
index 0000000000..99151fa055
--- /dev/null
+++ b/ext/-test-/dln/empty/depend
@@ -0,0 +1,3 @@
+# AUTOGENERATED DEPENDENCIES START
+empty.o: empty.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/enumerator_kw/depend b/ext/-test-/enumerator_kw/depend
new file mode 100644
index 0000000000..4597e34027
--- /dev/null
+++ b/ext/-test-/enumerator_kw/depend
@@ -0,0 +1,163 @@
+# AUTOGENERATED DEPENDENCIES START
+enumerator_kw.o: $(RUBY_EXTCONF_H)
+enumerator_kw.o: $(arch_hdrdir)/ruby/config.h
+enumerator_kw.o: $(hdrdir)/ruby.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/anyargs.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/arithmetic.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/assume.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/attr/artificial.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/attr/cold.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/attr/const.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/attr/error.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/attr/format.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/attr/noalias.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/attr/noinline.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/attr/pure.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/attr/restrict.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/attr/warning.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/attr/weakref.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/cast.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/compiler_is.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/compiler_since.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/config.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/constant_p.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/core.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/core/rarray.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/core/rbasic.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/core/rbignum.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/core/rclass.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/core/rdata.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/core/rfile.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/core/rhash.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/core/robject.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/core/rregexp.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/core/rstring.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/core/rstruct.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/ctype.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/dllexport.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/dosish.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/error.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/eval.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/event.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/fl_type.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/gc.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/glob.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/globals.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/has/attribute.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/has/builtin.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/has/extension.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/has/feature.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/has/warning.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/intern/array.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/intern/bignum.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/intern/class.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/intern/compar.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/intern/complex.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/intern/cont.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/intern/dir.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/intern/enum.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/intern/error.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/intern/eval.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/intern/file.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/intern/gc.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/intern/hash.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/intern/io.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/intern/load.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/intern/marshal.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/intern/numeric.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/intern/object.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/intern/parse.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/intern/proc.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/intern/process.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/intern/random.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/intern/range.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/intern/rational.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/intern/re.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/intern/ruby.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/intern/select.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/intern/signal.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/intern/string.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/intern/struct.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/intern/thread.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/intern/time.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/intern/variable.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/intern/vm.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/interpreter.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/iterator.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/memory.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/method.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/module.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/newobj.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/rgengc.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/scan_args.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/special_consts.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/static_assert.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/stdalign.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/stdbool.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/symbol.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/token_paste.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/value.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/value_type.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/variable.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/warning_push.h
+enumerator_kw.o: $(hdrdir)/ruby/internal/xmalloc.h
+enumerator_kw.o: $(hdrdir)/ruby/assert.h
+enumerator_kw.o: $(hdrdir)/ruby/backward.h
+enumerator_kw.o: $(hdrdir)/ruby/backward/2/assume.h
+enumerator_kw.o: $(hdrdir)/ruby/backward/2/attributes.h
+enumerator_kw.o: $(hdrdir)/ruby/backward/2/bool.h
+enumerator_kw.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+enumerator_kw.o: $(hdrdir)/ruby/backward/2/inttypes.h
+enumerator_kw.o: $(hdrdir)/ruby/backward/2/limits.h
+enumerator_kw.o: $(hdrdir)/ruby/backward/2/long_long.h
+enumerator_kw.o: $(hdrdir)/ruby/backward/2/stdalign.h
+enumerator_kw.o: $(hdrdir)/ruby/backward/2/stdarg.h
+enumerator_kw.o: $(hdrdir)/ruby/defines.h
+enumerator_kw.o: $(hdrdir)/ruby/intern.h
+enumerator_kw.o: $(hdrdir)/ruby/missing.h
+enumerator_kw.o: $(hdrdir)/ruby/ruby.h
+enumerator_kw.o: $(hdrdir)/ruby/st.h
+enumerator_kw.o: $(hdrdir)/ruby/subst.h
+enumerator_kw.o: enumerator_kw.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/enumerator_kw/enumerator_kw.c b/ext/-test-/enumerator_kw/enumerator_kw.c
new file mode 100644
index 0000000000..947d2b37e6
--- /dev/null
+++ b/ext/-test-/enumerator_kw/enumerator_kw.c
@@ -0,0 +1,21 @@
+#include <ruby.h>
+
+static VALUE
+enumerator_kw(int argc, VALUE *argv, VALUE self)
+{
+    VALUE opt, enum_args[4];
+    enum_args[0] = Qnil;
+    enum_args[1] = Qnil;
+    rb_scan_args(argc, argv, "01*:", enum_args, enum_args+1, &opt);
+    enum_args[3] = self;
+    enum_args[2] = opt;
+    RETURN_SIZED_ENUMERATOR_KW(self, 4, enum_args, 0, RB_NO_KEYWORDS);
+    return rb_yield_values_kw(4, enum_args, RB_NO_KEYWORDS);
+}
+
+void
+Init_enumerator_kw(void) {
+    VALUE module = rb_define_module("Bug");
+    module = rb_define_module_under(module, "EnumeratorKw");
+    rb_define_method(module, "m", enumerator_kw, -1);
+}
diff --git a/ext/-test-/enumerator_kw/extconf.rb b/ext/-test-/enumerator_kw/extconf.rb
new file mode 100644
index 0000000000..ab2be73fa8
--- /dev/null
+++ b/ext/-test-/enumerator_kw/extconf.rb
@@ -0,0 +1 @@
+create_makefile("-test-/enumerator_kw")
diff --git a/ext/-test-/exception/depend b/ext/-test-/exception/depend
index 6d3f6e75f3..47f1ac6a6a 100644
--- a/ext/-test-/exception/depend
+++ b/ext/-test-/exception/depend
@@ -1,7 +1,157 @@
 # AUTOGENERATED DEPENDENCIES START
 dataerror.o: $(RUBY_EXTCONF_H)
 dataerror.o: $(arch_hdrdir)/ruby/config.h
+dataerror.o: $(hdrdir)/ruby/internal/anyargs.h
+dataerror.o: $(hdrdir)/ruby/internal/arithmetic.h
+dataerror.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+dataerror.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+dataerror.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+dataerror.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+dataerror.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+dataerror.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+dataerror.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+dataerror.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+dataerror.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+dataerror.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+dataerror.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+dataerror.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+dataerror.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+dataerror.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+dataerror.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+dataerror.o: $(hdrdir)/ruby/internal/assume.h
+dataerror.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+dataerror.o: $(hdrdir)/ruby/internal/attr/artificial.h
+dataerror.o: $(hdrdir)/ruby/internal/attr/cold.h
+dataerror.o: $(hdrdir)/ruby/internal/attr/const.h
+dataerror.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+dataerror.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+dataerror.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+dataerror.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+dataerror.o: $(hdrdir)/ruby/internal/attr/error.h
+dataerror.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+dataerror.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+dataerror.o: $(hdrdir)/ruby/internal/attr/format.h
+dataerror.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+dataerror.o: $(hdrdir)/ruby/internal/attr/noalias.h
+dataerror.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+dataerror.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+dataerror.o: $(hdrdir)/ruby/internal/attr/noinline.h
+dataerror.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+dataerror.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+dataerror.o: $(hdrdir)/ruby/internal/attr/pure.h
+dataerror.o: $(hdrdir)/ruby/internal/attr/restrict.h
+dataerror.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+dataerror.o: $(hdrdir)/ruby/internal/attr/warning.h
+dataerror.o: $(hdrdir)/ruby/internal/attr/weakref.h
+dataerror.o: $(hdrdir)/ruby/internal/cast.h
+dataerror.o: $(hdrdir)/ruby/internal/compiler_is.h
+dataerror.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+dataerror.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+dataerror.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+dataerror.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+dataerror.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+dataerror.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+dataerror.o: $(hdrdir)/ruby/internal/compiler_since.h
+dataerror.o: $(hdrdir)/ruby/internal/config.h
+dataerror.o: $(hdrdir)/ruby/internal/constant_p.h
+dataerror.o: $(hdrdir)/ruby/internal/core.h
+dataerror.o: $(hdrdir)/ruby/internal/core/rarray.h
+dataerror.o: $(hdrdir)/ruby/internal/core/rbasic.h
+dataerror.o: $(hdrdir)/ruby/internal/core/rbignum.h
+dataerror.o: $(hdrdir)/ruby/internal/core/rclass.h
+dataerror.o: $(hdrdir)/ruby/internal/core/rdata.h
+dataerror.o: $(hdrdir)/ruby/internal/core/rfile.h
+dataerror.o: $(hdrdir)/ruby/internal/core/rhash.h
+dataerror.o: $(hdrdir)/ruby/internal/core/robject.h
+dataerror.o: $(hdrdir)/ruby/internal/core/rregexp.h
+dataerror.o: $(hdrdir)/ruby/internal/core/rstring.h
+dataerror.o: $(hdrdir)/ruby/internal/core/rstruct.h
+dataerror.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+dataerror.o: $(hdrdir)/ruby/internal/ctype.h
+dataerror.o: $(hdrdir)/ruby/internal/dllexport.h
+dataerror.o: $(hdrdir)/ruby/internal/dosish.h
+dataerror.o: $(hdrdir)/ruby/internal/error.h
+dataerror.o: $(hdrdir)/ruby/internal/eval.h
+dataerror.o: $(hdrdir)/ruby/internal/event.h
+dataerror.o: $(hdrdir)/ruby/internal/fl_type.h
+dataerror.o: $(hdrdir)/ruby/internal/gc.h
+dataerror.o: $(hdrdir)/ruby/internal/glob.h
+dataerror.o: $(hdrdir)/ruby/internal/globals.h
+dataerror.o: $(hdrdir)/ruby/internal/has/attribute.h
+dataerror.o: $(hdrdir)/ruby/internal/has/builtin.h
+dataerror.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+dataerror.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+dataerror.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+dataerror.o: $(hdrdir)/ruby/internal/has/extension.h
+dataerror.o: $(hdrdir)/ruby/internal/has/feature.h
+dataerror.o: $(hdrdir)/ruby/internal/has/warning.h
+dataerror.o: $(hdrdir)/ruby/internal/intern/array.h
+dataerror.o: $(hdrdir)/ruby/internal/intern/bignum.h
+dataerror.o: $(hdrdir)/ruby/internal/intern/class.h
+dataerror.o: $(hdrdir)/ruby/internal/intern/compar.h
+dataerror.o: $(hdrdir)/ruby/internal/intern/complex.h
+dataerror.o: $(hdrdir)/ruby/internal/intern/cont.h
+dataerror.o: $(hdrdir)/ruby/internal/intern/dir.h
+dataerror.o: $(hdrdir)/ruby/internal/intern/enum.h
+dataerror.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+dataerror.o: $(hdrdir)/ruby/internal/intern/error.h
+dataerror.o: $(hdrdir)/ruby/internal/intern/eval.h
+dataerror.o: $(hdrdir)/ruby/internal/intern/file.h
+dataerror.o: $(hdrdir)/ruby/internal/intern/gc.h
+dataerror.o: $(hdrdir)/ruby/internal/intern/hash.h
+dataerror.o: $(hdrdir)/ruby/internal/intern/io.h
+dataerror.o: $(hdrdir)/ruby/internal/intern/load.h
+dataerror.o: $(hdrdir)/ruby/internal/intern/marshal.h
+dataerror.o: $(hdrdir)/ruby/internal/intern/numeric.h
+dataerror.o: $(hdrdir)/ruby/internal/intern/object.h
+dataerror.o: $(hdrdir)/ruby/internal/intern/parse.h
+dataerror.o: $(hdrdir)/ruby/internal/intern/proc.h
+dataerror.o: $(hdrdir)/ruby/internal/intern/process.h
+dataerror.o: $(hdrdir)/ruby/internal/intern/random.h
+dataerror.o: $(hdrdir)/ruby/internal/intern/range.h
+dataerror.o: $(hdrdir)/ruby/internal/intern/rational.h
+dataerror.o: $(hdrdir)/ruby/internal/intern/re.h
+dataerror.o: $(hdrdir)/ruby/internal/intern/ruby.h
+dataerror.o: $(hdrdir)/ruby/internal/intern/select.h
+dataerror.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+dataerror.o: $(hdrdir)/ruby/internal/intern/signal.h
+dataerror.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+dataerror.o: $(hdrdir)/ruby/internal/intern/string.h
+dataerror.o: $(hdrdir)/ruby/internal/intern/struct.h
+dataerror.o: $(hdrdir)/ruby/internal/intern/thread.h
+dataerror.o: $(hdrdir)/ruby/internal/intern/time.h
+dataerror.o: $(hdrdir)/ruby/internal/intern/variable.h
+dataerror.o: $(hdrdir)/ruby/internal/intern/vm.h
+dataerror.o: $(hdrdir)/ruby/internal/interpreter.h
+dataerror.o: $(hdrdir)/ruby/internal/iterator.h
+dataerror.o: $(hdrdir)/ruby/internal/memory.h
+dataerror.o: $(hdrdir)/ruby/internal/method.h
+dataerror.o: $(hdrdir)/ruby/internal/module.h
+dataerror.o: $(hdrdir)/ruby/internal/newobj.h
+dataerror.o: $(hdrdir)/ruby/internal/rgengc.h
+dataerror.o: $(hdrdir)/ruby/internal/scan_args.h
+dataerror.o: $(hdrdir)/ruby/internal/special_consts.h
+dataerror.o: $(hdrdir)/ruby/internal/static_assert.h
+dataerror.o: $(hdrdir)/ruby/internal/stdalign.h
+dataerror.o: $(hdrdir)/ruby/internal/stdbool.h
+dataerror.o: $(hdrdir)/ruby/internal/symbol.h
+dataerror.o: $(hdrdir)/ruby/internal/token_paste.h
+dataerror.o: $(hdrdir)/ruby/internal/value.h
+dataerror.o: $(hdrdir)/ruby/internal/value_type.h
+dataerror.o: $(hdrdir)/ruby/internal/variable.h
+dataerror.o: $(hdrdir)/ruby/internal/warning_push.h
+dataerror.o: $(hdrdir)/ruby/internal/xmalloc.h
+dataerror.o: $(hdrdir)/ruby/assert.h
 dataerror.o: $(hdrdir)/ruby/backward.h
+dataerror.o: $(hdrdir)/ruby/backward/2/assume.h
+dataerror.o: $(hdrdir)/ruby/backward/2/attributes.h
+dataerror.o: $(hdrdir)/ruby/backward/2/bool.h
+dataerror.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+dataerror.o: $(hdrdir)/ruby/backward/2/inttypes.h
+dataerror.o: $(hdrdir)/ruby/backward/2/limits.h
+dataerror.o: $(hdrdir)/ruby/backward/2/long_long.h
+dataerror.o: $(hdrdir)/ruby/backward/2/stdalign.h
+dataerror.o: $(hdrdir)/ruby/backward/2/stdarg.h
 dataerror.o: $(hdrdir)/ruby/defines.h
 dataerror.o: $(hdrdir)/ruby/intern.h
 dataerror.o: $(hdrdir)/ruby/missing.h
@@ -11,37 +161,488 @@ dataerror.o: $(hdrdir)/ruby/subst.h
 dataerror.o: dataerror.c
 enc_raise.o: $(RUBY_EXTCONF_H)
 enc_raise.o: $(arch_hdrdir)/ruby/config.h
+enc_raise.o: $(hdrdir)/ruby.h
+enc_raise.o: $(hdrdir)/ruby/internal/anyargs.h
+enc_raise.o: $(hdrdir)/ruby/internal/arithmetic.h
+enc_raise.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+enc_raise.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+enc_raise.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+enc_raise.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+enc_raise.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+enc_raise.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+enc_raise.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+enc_raise.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+enc_raise.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+enc_raise.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+enc_raise.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+enc_raise.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+enc_raise.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+enc_raise.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+enc_raise.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+enc_raise.o: $(hdrdir)/ruby/internal/assume.h
+enc_raise.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+enc_raise.o: $(hdrdir)/ruby/internal/attr/artificial.h
+enc_raise.o: $(hdrdir)/ruby/internal/attr/cold.h
+enc_raise.o: $(hdrdir)/ruby/internal/attr/const.h
+enc_raise.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+enc_raise.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+enc_raise.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+enc_raise.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+enc_raise.o: $(hdrdir)/ruby/internal/attr/error.h
+enc_raise.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+enc_raise.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+enc_raise.o: $(hdrdir)/ruby/internal/attr/format.h
+enc_raise.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+enc_raise.o: $(hdrdir)/ruby/internal/attr/noalias.h
+enc_raise.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+enc_raise.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+enc_raise.o: $(hdrdir)/ruby/internal/attr/noinline.h
+enc_raise.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+enc_raise.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+enc_raise.o: $(hdrdir)/ruby/internal/attr/pure.h
+enc_raise.o: $(hdrdir)/ruby/internal/attr/restrict.h
+enc_raise.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+enc_raise.o: $(hdrdir)/ruby/internal/attr/warning.h
+enc_raise.o: $(hdrdir)/ruby/internal/attr/weakref.h
+enc_raise.o: $(hdrdir)/ruby/internal/cast.h
+enc_raise.o: $(hdrdir)/ruby/internal/compiler_is.h
+enc_raise.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+enc_raise.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+enc_raise.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+enc_raise.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+enc_raise.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+enc_raise.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+enc_raise.o: $(hdrdir)/ruby/internal/compiler_since.h
+enc_raise.o: $(hdrdir)/ruby/internal/config.h
+enc_raise.o: $(hdrdir)/ruby/internal/constant_p.h
+enc_raise.o: $(hdrdir)/ruby/internal/core.h
+enc_raise.o: $(hdrdir)/ruby/internal/core/rarray.h
+enc_raise.o: $(hdrdir)/ruby/internal/core/rbasic.h
+enc_raise.o: $(hdrdir)/ruby/internal/core/rbignum.h
+enc_raise.o: $(hdrdir)/ruby/internal/core/rclass.h
+enc_raise.o: $(hdrdir)/ruby/internal/core/rdata.h
+enc_raise.o: $(hdrdir)/ruby/internal/core/rfile.h
+enc_raise.o: $(hdrdir)/ruby/internal/core/rhash.h
+enc_raise.o: $(hdrdir)/ruby/internal/core/robject.h
+enc_raise.o: $(hdrdir)/ruby/internal/core/rregexp.h
+enc_raise.o: $(hdrdir)/ruby/internal/core/rstring.h
+enc_raise.o: $(hdrdir)/ruby/internal/core/rstruct.h
+enc_raise.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+enc_raise.o: $(hdrdir)/ruby/internal/ctype.h
+enc_raise.o: $(hdrdir)/ruby/internal/dllexport.h
+enc_raise.o: $(hdrdir)/ruby/internal/dosish.h
+enc_raise.o: $(hdrdir)/ruby/internal/error.h
+enc_raise.o: $(hdrdir)/ruby/internal/eval.h
+enc_raise.o: $(hdrdir)/ruby/internal/event.h
+enc_raise.o: $(hdrdir)/ruby/internal/fl_type.h
+enc_raise.o: $(hdrdir)/ruby/internal/gc.h
+enc_raise.o: $(hdrdir)/ruby/internal/glob.h
+enc_raise.o: $(hdrdir)/ruby/internal/globals.h
+enc_raise.o: $(hdrdir)/ruby/internal/has/attribute.h
+enc_raise.o: $(hdrdir)/ruby/internal/has/builtin.h
+enc_raise.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+enc_raise.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+enc_raise.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+enc_raise.o: $(hdrdir)/ruby/internal/has/extension.h
+enc_raise.o: $(hdrdir)/ruby/internal/has/feature.h
+enc_raise.o: $(hdrdir)/ruby/internal/has/warning.h
+enc_raise.o: $(hdrdir)/ruby/internal/intern/array.h
+enc_raise.o: $(hdrdir)/ruby/internal/intern/bignum.h
+enc_raise.o: $(hdrdir)/ruby/internal/intern/class.h
+enc_raise.o: $(hdrdir)/ruby/internal/intern/compar.h
+enc_raise.o: $(hdrdir)/ruby/internal/intern/complex.h
+enc_raise.o: $(hdrdir)/ruby/internal/intern/cont.h
+enc_raise.o: $(hdrdir)/ruby/internal/intern/dir.h
+enc_raise.o: $(hdrdir)/ruby/internal/intern/enum.h
+enc_raise.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+enc_raise.o: $(hdrdir)/ruby/internal/intern/error.h
+enc_raise.o: $(hdrdir)/ruby/internal/intern/eval.h
+enc_raise.o: $(hdrdir)/ruby/internal/intern/file.h
+enc_raise.o: $(hdrdir)/ruby/internal/intern/gc.h
+enc_raise.o: $(hdrdir)/ruby/internal/intern/hash.h
+enc_raise.o: $(hdrdir)/ruby/internal/intern/io.h
+enc_raise.o: $(hdrdir)/ruby/internal/intern/load.h
+enc_raise.o: $(hdrdir)/ruby/internal/intern/marshal.h
+enc_raise.o: $(hdrdir)/ruby/internal/intern/numeric.h
+enc_raise.o: $(hdrdir)/ruby/internal/intern/object.h
+enc_raise.o: $(hdrdir)/ruby/internal/intern/parse.h
+enc_raise.o: $(hdrdir)/ruby/internal/intern/proc.h
+enc_raise.o: $(hdrdir)/ruby/internal/intern/process.h
+enc_raise.o: $(hdrdir)/ruby/internal/intern/random.h
+enc_raise.o: $(hdrdir)/ruby/internal/intern/range.h
+enc_raise.o: $(hdrdir)/ruby/internal/intern/rational.h
+enc_raise.o: $(hdrdir)/ruby/internal/intern/re.h
+enc_raise.o: $(hdrdir)/ruby/internal/intern/ruby.h
+enc_raise.o: $(hdrdir)/ruby/internal/intern/select.h
+enc_raise.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+enc_raise.o: $(hdrdir)/ruby/internal/intern/signal.h
+enc_raise.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+enc_raise.o: $(hdrdir)/ruby/internal/intern/string.h
+enc_raise.o: $(hdrdir)/ruby/internal/intern/struct.h
+enc_raise.o: $(hdrdir)/ruby/internal/intern/thread.h
+enc_raise.o: $(hdrdir)/ruby/internal/intern/time.h
+enc_raise.o: $(hdrdir)/ruby/internal/intern/variable.h
+enc_raise.o: $(hdrdir)/ruby/internal/intern/vm.h
+enc_raise.o: $(hdrdir)/ruby/internal/interpreter.h
+enc_raise.o: $(hdrdir)/ruby/internal/iterator.h
+enc_raise.o: $(hdrdir)/ruby/internal/memory.h
+enc_raise.o: $(hdrdir)/ruby/internal/method.h
+enc_raise.o: $(hdrdir)/ruby/internal/module.h
+enc_raise.o: $(hdrdir)/ruby/internal/newobj.h
+enc_raise.o: $(hdrdir)/ruby/internal/rgengc.h
+enc_raise.o: $(hdrdir)/ruby/internal/scan_args.h
+enc_raise.o: $(hdrdir)/ruby/internal/special_consts.h
+enc_raise.o: $(hdrdir)/ruby/internal/static_assert.h
+enc_raise.o: $(hdrdir)/ruby/internal/stdalign.h
+enc_raise.o: $(hdrdir)/ruby/internal/stdbool.h
+enc_raise.o: $(hdrdir)/ruby/internal/symbol.h
+enc_raise.o: $(hdrdir)/ruby/internal/token_paste.h
+enc_raise.o: $(hdrdir)/ruby/internal/value.h
+enc_raise.o: $(hdrdir)/ruby/internal/value_type.h
+enc_raise.o: $(hdrdir)/ruby/internal/variable.h
+enc_raise.o: $(hdrdir)/ruby/internal/warning_push.h
+enc_raise.o: $(hdrdir)/ruby/internal/xmalloc.h
+enc_raise.o: $(hdrdir)/ruby/assert.h
 enc_raise.o: $(hdrdir)/ruby/backward.h
+enc_raise.o: $(hdrdir)/ruby/backward/2/assume.h
+enc_raise.o: $(hdrdir)/ruby/backward/2/attributes.h
+enc_raise.o: $(hdrdir)/ruby/backward/2/bool.h
+enc_raise.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+enc_raise.o: $(hdrdir)/ruby/backward/2/inttypes.h
+enc_raise.o: $(hdrdir)/ruby/backward/2/limits.h
+enc_raise.o: $(hdrdir)/ruby/backward/2/long_long.h
+enc_raise.o: $(hdrdir)/ruby/backward/2/stdalign.h
+enc_raise.o: $(hdrdir)/ruby/backward/2/stdarg.h
 enc_raise.o: $(hdrdir)/ruby/defines.h
 enc_raise.o: $(hdrdir)/ruby/encoding.h
 enc_raise.o: $(hdrdir)/ruby/intern.h
 enc_raise.o: $(hdrdir)/ruby/missing.h
+enc_raise.o: $(hdrdir)/ruby/onigmo.h
 enc_raise.o: $(hdrdir)/ruby/oniguruma.h
 enc_raise.o: $(hdrdir)/ruby/ruby.h
 enc_raise.o: $(hdrdir)/ruby/st.h
 enc_raise.o: $(hdrdir)/ruby/subst.h
-enc_raise.o: $(top_srcdir)/include/ruby.h
 enc_raise.o: enc_raise.c
 ensured.o: $(RUBY_EXTCONF_H)
 ensured.o: $(arch_hdrdir)/ruby/config.h
+ensured.o: $(hdrdir)/ruby.h
+ensured.o: $(hdrdir)/ruby/internal/anyargs.h
+ensured.o: $(hdrdir)/ruby/internal/arithmetic.h
+ensured.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+ensured.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+ensured.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+ensured.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+ensured.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+ensured.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+ensured.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+ensured.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+ensured.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+ensured.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+ensured.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+ensured.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+ensured.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+ensured.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+ensured.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+ensured.o: $(hdrdir)/ruby/internal/assume.h
+ensured.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+ensured.o: $(hdrdir)/ruby/internal/attr/artificial.h
+ensured.o: $(hdrdir)/ruby/internal/attr/cold.h
+ensured.o: $(hdrdir)/ruby/internal/attr/const.h
+ensured.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+ensured.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+ensured.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+ensured.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+ensured.o: $(hdrdir)/ruby/internal/attr/error.h
+ensured.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+ensured.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+ensured.o: $(hdrdir)/ruby/internal/attr/format.h
+ensured.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+ensured.o: $(hdrdir)/ruby/internal/attr/noalias.h
+ensured.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+ensured.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+ensured.o: $(hdrdir)/ruby/internal/attr/noinline.h
+ensured.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+ensured.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+ensured.o: $(hdrdir)/ruby/internal/attr/pure.h
+ensured.o: $(hdrdir)/ruby/internal/attr/restrict.h
+ensured.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+ensured.o: $(hdrdir)/ruby/internal/attr/warning.h
+ensured.o: $(hdrdir)/ruby/internal/attr/weakref.h
+ensured.o: $(hdrdir)/ruby/internal/cast.h
+ensured.o: $(hdrdir)/ruby/internal/compiler_is.h
+ensured.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+ensured.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+ensured.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+ensured.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+ensured.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+ensured.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+ensured.o: $(hdrdir)/ruby/internal/compiler_since.h
+ensured.o: $(hdrdir)/ruby/internal/config.h
+ensured.o: $(hdrdir)/ruby/internal/constant_p.h
+ensured.o: $(hdrdir)/ruby/internal/core.h
+ensured.o: $(hdrdir)/ruby/internal/core/rarray.h
+ensured.o: $(hdrdir)/ruby/internal/core/rbasic.h
+ensured.o: $(hdrdir)/ruby/internal/core/rbignum.h
+ensured.o: $(hdrdir)/ruby/internal/core/rclass.h
+ensured.o: $(hdrdir)/ruby/internal/core/rdata.h
+ensured.o: $(hdrdir)/ruby/internal/core/rfile.h
+ensured.o: $(hdrdir)/ruby/internal/core/rhash.h
+ensured.o: $(hdrdir)/ruby/internal/core/robject.h
+ensured.o: $(hdrdir)/ruby/internal/core/rregexp.h
+ensured.o: $(hdrdir)/ruby/internal/core/rstring.h
+ensured.o: $(hdrdir)/ruby/internal/core/rstruct.h
+ensured.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+ensured.o: $(hdrdir)/ruby/internal/ctype.h
+ensured.o: $(hdrdir)/ruby/internal/dllexport.h
+ensured.o: $(hdrdir)/ruby/internal/dosish.h
+ensured.o: $(hdrdir)/ruby/internal/error.h
+ensured.o: $(hdrdir)/ruby/internal/eval.h
+ensured.o: $(hdrdir)/ruby/internal/event.h
+ensured.o: $(hdrdir)/ruby/internal/fl_type.h
+ensured.o: $(hdrdir)/ruby/internal/gc.h
+ensured.o: $(hdrdir)/ruby/internal/glob.h
+ensured.o: $(hdrdir)/ruby/internal/globals.h
+ensured.o: $(hdrdir)/ruby/internal/has/attribute.h
+ensured.o: $(hdrdir)/ruby/internal/has/builtin.h
+ensured.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+ensured.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+ensured.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+ensured.o: $(hdrdir)/ruby/internal/has/extension.h
+ensured.o: $(hdrdir)/ruby/internal/has/feature.h
+ensured.o: $(hdrdir)/ruby/internal/has/warning.h
+ensured.o: $(hdrdir)/ruby/internal/intern/array.h
+ensured.o: $(hdrdir)/ruby/internal/intern/bignum.h
+ensured.o: $(hdrdir)/ruby/internal/intern/class.h
+ensured.o: $(hdrdir)/ruby/internal/intern/compar.h
+ensured.o: $(hdrdir)/ruby/internal/intern/complex.h
+ensured.o: $(hdrdir)/ruby/internal/intern/cont.h
+ensured.o: $(hdrdir)/ruby/internal/intern/dir.h
+ensured.o: $(hdrdir)/ruby/internal/intern/enum.h
+ensured.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+ensured.o: $(hdrdir)/ruby/internal/intern/error.h
+ensured.o: $(hdrdir)/ruby/internal/intern/eval.h
+ensured.o: $(hdrdir)/ruby/internal/intern/file.h
+ensured.o: $(hdrdir)/ruby/internal/intern/gc.h
+ensured.o: $(hdrdir)/ruby/internal/intern/hash.h
+ensured.o: $(hdrdir)/ruby/internal/intern/io.h
+ensured.o: $(hdrdir)/ruby/internal/intern/load.h
+ensured.o: $(hdrdir)/ruby/internal/intern/marshal.h
+ensured.o: $(hdrdir)/ruby/internal/intern/numeric.h
+ensured.o: $(hdrdir)/ruby/internal/intern/object.h
+ensured.o: $(hdrdir)/ruby/internal/intern/parse.h
+ensured.o: $(hdrdir)/ruby/internal/intern/proc.h
+ensured.o: $(hdrdir)/ruby/internal/intern/process.h
+ensured.o: $(hdrdir)/ruby/internal/intern/random.h
+ensured.o: $(hdrdir)/ruby/internal/intern/range.h
+ensured.o: $(hdrdir)/ruby/internal/intern/rational.h
+ensured.o: $(hdrdir)/ruby/internal/intern/re.h
+ensured.o: $(hdrdir)/ruby/internal/intern/ruby.h
+ensured.o: $(hdrdir)/ruby/internal/intern/select.h
+ensured.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ensured.o: $(hdrdir)/ruby/internal/intern/signal.h
+ensured.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+ensured.o: $(hdrdir)/ruby/internal/intern/string.h
+ensured.o: $(hdrdir)/ruby/internal/intern/struct.h
+ensured.o: $(hdrdir)/ruby/internal/intern/thread.h
+ensured.o: $(hdrdir)/ruby/internal/intern/time.h
+ensured.o: $(hdrdir)/ruby/internal/intern/variable.h
+ensured.o: $(hdrdir)/ruby/internal/intern/vm.h
+ensured.o: $(hdrdir)/ruby/internal/interpreter.h
+ensured.o: $(hdrdir)/ruby/internal/iterator.h
+ensured.o: $(hdrdir)/ruby/internal/memory.h
+ensured.o: $(hdrdir)/ruby/internal/method.h
+ensured.o: $(hdrdir)/ruby/internal/module.h
+ensured.o: $(hdrdir)/ruby/internal/newobj.h
+ensured.o: $(hdrdir)/ruby/internal/rgengc.h
+ensured.o: $(hdrdir)/ruby/internal/scan_args.h
+ensured.o: $(hdrdir)/ruby/internal/special_consts.h
+ensured.o: $(hdrdir)/ruby/internal/static_assert.h
+ensured.o: $(hdrdir)/ruby/internal/stdalign.h
+ensured.o: $(hdrdir)/ruby/internal/stdbool.h
+ensured.o: $(hdrdir)/ruby/internal/symbol.h
+ensured.o: $(hdrdir)/ruby/internal/token_paste.h
+ensured.o: $(hdrdir)/ruby/internal/value.h
+ensured.o: $(hdrdir)/ruby/internal/value_type.h
+ensured.o: $(hdrdir)/ruby/internal/variable.h
+ensured.o: $(hdrdir)/ruby/internal/warning_push.h
+ensured.o: $(hdrdir)/ruby/internal/xmalloc.h
+ensured.o: $(hdrdir)/ruby/assert.h
 ensured.o: $(hdrdir)/ruby/backward.h
+ensured.o: $(hdrdir)/ruby/backward/2/assume.h
+ensured.o: $(hdrdir)/ruby/backward/2/attributes.h
+ensured.o: $(hdrdir)/ruby/backward/2/bool.h
+ensured.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+ensured.o: $(hdrdir)/ruby/backward/2/inttypes.h
+ensured.o: $(hdrdir)/ruby/backward/2/limits.h
+ensured.o: $(hdrdir)/ruby/backward/2/long_long.h
+ensured.o: $(hdrdir)/ruby/backward/2/stdalign.h
+ensured.o: $(hdrdir)/ruby/backward/2/stdarg.h
 ensured.o: $(hdrdir)/ruby/defines.h
 ensured.o: $(hdrdir)/ruby/intern.h
 ensured.o: $(hdrdir)/ruby/missing.h
 ensured.o: $(hdrdir)/ruby/ruby.h
 ensured.o: $(hdrdir)/ruby/st.h
 ensured.o: $(hdrdir)/ruby/subst.h
-ensured.o: $(top_srcdir)/include/ruby.h
 ensured.o: ensured.c
 init.o: $(RUBY_EXTCONF_H)
 init.o: $(arch_hdrdir)/ruby/config.h
+init.o: $(hdrdir)/ruby.h
+init.o: $(hdrdir)/ruby/internal/anyargs.h
+init.o: $(hdrdir)/ruby/internal/arithmetic.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+init.o: $(hdrdir)/ruby/internal/assume.h
+init.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+init.o: $(hdrdir)/ruby/internal/attr/artificial.h
+init.o: $(hdrdir)/ruby/internal/attr/cold.h
+init.o: $(hdrdir)/ruby/internal/attr/const.h
+init.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+init.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+init.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+init.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+init.o: $(hdrdir)/ruby/internal/attr/error.h
+init.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+init.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+init.o: $(hdrdir)/ruby/internal/attr/format.h
+init.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+init.o: $(hdrdir)/ruby/internal/attr/noalias.h
+init.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+init.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+init.o: $(hdrdir)/ruby/internal/attr/noinline.h
+init.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+init.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+init.o: $(hdrdir)/ruby/internal/attr/pure.h
+init.o: $(hdrdir)/ruby/internal/attr/restrict.h
+init.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+init.o: $(hdrdir)/ruby/internal/attr/warning.h
+init.o: $(hdrdir)/ruby/internal/attr/weakref.h
+init.o: $(hdrdir)/ruby/internal/cast.h
+init.o: $(hdrdir)/ruby/internal/compiler_is.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+init.o: $(hdrdir)/ruby/internal/compiler_since.h
+init.o: $(hdrdir)/ruby/internal/config.h
+init.o: $(hdrdir)/ruby/internal/constant_p.h
+init.o: $(hdrdir)/ruby/internal/core.h
+init.o: $(hdrdir)/ruby/internal/core/rarray.h
+init.o: $(hdrdir)/ruby/internal/core/rbasic.h
+init.o: $(hdrdir)/ruby/internal/core/rbignum.h
+init.o: $(hdrdir)/ruby/internal/core/rclass.h
+init.o: $(hdrdir)/ruby/internal/core/rdata.h
+init.o: $(hdrdir)/ruby/internal/core/rfile.h
+init.o: $(hdrdir)/ruby/internal/core/rhash.h
+init.o: $(hdrdir)/ruby/internal/core/robject.h
+init.o: $(hdrdir)/ruby/internal/core/rregexp.h
+init.o: $(hdrdir)/ruby/internal/core/rstring.h
+init.o: $(hdrdir)/ruby/internal/core/rstruct.h
+init.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+init.o: $(hdrdir)/ruby/internal/ctype.h
+init.o: $(hdrdir)/ruby/internal/dllexport.h
+init.o: $(hdrdir)/ruby/internal/dosish.h
+init.o: $(hdrdir)/ruby/internal/error.h
+init.o: $(hdrdir)/ruby/internal/eval.h
+init.o: $(hdrdir)/ruby/internal/event.h
+init.o: $(hdrdir)/ruby/internal/fl_type.h
+init.o: $(hdrdir)/ruby/internal/gc.h
+init.o: $(hdrdir)/ruby/internal/glob.h
+init.o: $(hdrdir)/ruby/internal/globals.h
+init.o: $(hdrdir)/ruby/internal/has/attribute.h
+init.o: $(hdrdir)/ruby/internal/has/builtin.h
+init.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/extension.h
+init.o: $(hdrdir)/ruby/internal/has/feature.h
+init.o: $(hdrdir)/ruby/internal/has/warning.h
+init.o: $(hdrdir)/ruby/internal/intern/array.h
+init.o: $(hdrdir)/ruby/internal/intern/bignum.h
+init.o: $(hdrdir)/ruby/internal/intern/class.h
+init.o: $(hdrdir)/ruby/internal/intern/compar.h
+init.o: $(hdrdir)/ruby/internal/intern/complex.h
+init.o: $(hdrdir)/ruby/internal/intern/cont.h
+init.o: $(hdrdir)/ruby/internal/intern/dir.h
+init.o: $(hdrdir)/ruby/internal/intern/enum.h
+init.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+init.o: $(hdrdir)/ruby/internal/intern/error.h
+init.o: $(hdrdir)/ruby/internal/intern/eval.h
+init.o: $(hdrdir)/ruby/internal/intern/file.h
+init.o: $(hdrdir)/ruby/internal/intern/gc.h
+init.o: $(hdrdir)/ruby/internal/intern/hash.h
+init.o: $(hdrdir)/ruby/internal/intern/io.h
+init.o: $(hdrdir)/ruby/internal/intern/load.h
+init.o: $(hdrdir)/ruby/internal/intern/marshal.h
+init.o: $(hdrdir)/ruby/internal/intern/numeric.h
+init.o: $(hdrdir)/ruby/internal/intern/object.h
+init.o: $(hdrdir)/ruby/internal/intern/parse.h
+init.o: $(hdrdir)/ruby/internal/intern/proc.h
+init.o: $(hdrdir)/ruby/internal/intern/process.h
+init.o: $(hdrdir)/ruby/internal/intern/random.h
+init.o: $(hdrdir)/ruby/internal/intern/range.h
+init.o: $(hdrdir)/ruby/internal/intern/rational.h
+init.o: $(hdrdir)/ruby/internal/intern/re.h
+init.o: $(hdrdir)/ruby/internal/intern/ruby.h
+init.o: $(hdrdir)/ruby/internal/intern/select.h
+init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+init.o: $(hdrdir)/ruby/internal/intern/signal.h
+init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+init.o: $(hdrdir)/ruby/internal/intern/string.h
+init.o: $(hdrdir)/ruby/internal/intern/struct.h
+init.o: $(hdrdir)/ruby/internal/intern/thread.h
+init.o: $(hdrdir)/ruby/internal/intern/time.h
+init.o: $(hdrdir)/ruby/internal/intern/variable.h
+init.o: $(hdrdir)/ruby/internal/intern/vm.h
+init.o: $(hdrdir)/ruby/internal/interpreter.h
+init.o: $(hdrdir)/ruby/internal/iterator.h
+init.o: $(hdrdir)/ruby/internal/memory.h
+init.o: $(hdrdir)/ruby/internal/method.h
+init.o: $(hdrdir)/ruby/internal/module.h
+init.o: $(hdrdir)/ruby/internal/newobj.h
+init.o: $(hdrdir)/ruby/internal/rgengc.h
+init.o: $(hdrdir)/ruby/internal/scan_args.h
+init.o: $(hdrdir)/ruby/internal/special_consts.h
+init.o: $(hdrdir)/ruby/internal/static_assert.h
+init.o: $(hdrdir)/ruby/internal/stdalign.h
+init.o: $(hdrdir)/ruby/internal/stdbool.h
+init.o: $(hdrdir)/ruby/internal/symbol.h
+init.o: $(hdrdir)/ruby/internal/token_paste.h
+init.o: $(hdrdir)/ruby/internal/value.h
+init.o: $(hdrdir)/ruby/internal/value_type.h
+init.o: $(hdrdir)/ruby/internal/variable.h
+init.o: $(hdrdir)/ruby/internal/warning_push.h
+init.o: $(hdrdir)/ruby/internal/xmalloc.h
+init.o: $(hdrdir)/ruby/assert.h
 init.o: $(hdrdir)/ruby/backward.h
+init.o: $(hdrdir)/ruby/backward/2/assume.h
+init.o: $(hdrdir)/ruby/backward/2/attributes.h
+init.o: $(hdrdir)/ruby/backward/2/bool.h
+init.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+init.o: $(hdrdir)/ruby/backward/2/inttypes.h
+init.o: $(hdrdir)/ruby/backward/2/limits.h
+init.o: $(hdrdir)/ruby/backward/2/long_long.h
+init.o: $(hdrdir)/ruby/backward/2/stdalign.h
+init.o: $(hdrdir)/ruby/backward/2/stdarg.h
 init.o: $(hdrdir)/ruby/defines.h
 init.o: $(hdrdir)/ruby/intern.h
 init.o: $(hdrdir)/ruby/missing.h
 init.o: $(hdrdir)/ruby/ruby.h
 init.o: $(hdrdir)/ruby/st.h
 init.o: $(hdrdir)/ruby/subst.h
-init.o: $(top_srcdir)/include/ruby.h
 init.o: init.c
 # AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/exception/enc_raise.c b/ext/-test-/exception/enc_raise.c
index dc8a42cf3f..68d7b4ebc1 100644
--- a/ext/-test-/exception/enc_raise.c
+++ b/ext/-test-/exception/enc_raise.c
@@ -5,7 +5,7 @@ static VALUE
 enc_raise(VALUE exc, VALUE encoding, VALUE mesg)
 {
     rb_enc_raise(rb_to_encoding(encoding), exc, "%s", StringValueCStr(mesg));
-    UNREACHABLE;
+    UNREACHABLE_RETURN(Qnil);
 }
 
 void
diff --git a/ext/-test-/exception/ensured.c b/ext/-test-/exception/ensured.c
index 365e1f4f79..7dcc9b78ef 100644
--- a/ext/-test-/exception/ensured.c
+++ b/ext/-test-/exception/ensured.c
@@ -18,8 +18,22 @@ ensured(VALUE module, VALUE object)
     return rb_ensure(begin, object, ensure, object);
 }
 
+static VALUE
+exc_raise(VALUE exc)
+{
+    rb_exc_raise(exc);
+    return Qnil;
+}
+
+static VALUE
+ensure_raise(VALUE module, VALUE object, VALUE exc)
+{
+    return rb_ensure(rb_yield, object, exc_raise, exc);
+}
+
 void
 Init_ensured(VALUE klass)
 {
     rb_define_module_function(klass, "ensured", ensured, 1);
+    rb_define_module_function(klass, "ensure_raise", ensure_raise, 2);
 }
diff --git a/ext/-test-/fatal/depend b/ext/-test-/fatal/depend
new file mode 100644
index 0000000000..bb2e61a51f
--- /dev/null
+++ b/ext/-test-/fatal/depend
@@ -0,0 +1,163 @@
+# AUTOGENERATED DEPENDENCIES START
+rb_fatal.o: $(RUBY_EXTCONF_H)
+rb_fatal.o: $(arch_hdrdir)/ruby/config.h
+rb_fatal.o: $(hdrdir)/ruby.h
+rb_fatal.o: $(hdrdir)/ruby/internal/anyargs.h
+rb_fatal.o: $(hdrdir)/ruby/internal/arithmetic.h
+rb_fatal.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+rb_fatal.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+rb_fatal.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+rb_fatal.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+rb_fatal.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+rb_fatal.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+rb_fatal.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+rb_fatal.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+rb_fatal.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+rb_fatal.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+rb_fatal.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+rb_fatal.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+rb_fatal.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+rb_fatal.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+rb_fatal.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+rb_fatal.o: $(hdrdir)/ruby/internal/assume.h
+rb_fatal.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+rb_fatal.o: $(hdrdir)/ruby/internal/attr/artificial.h
+rb_fatal.o: $(hdrdir)/ruby/internal/attr/cold.h
+rb_fatal.o: $(hdrdir)/ruby/internal/attr/const.h
+rb_fatal.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+rb_fatal.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+rb_fatal.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+rb_fatal.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+rb_fatal.o: $(hdrdir)/ruby/internal/attr/error.h
+rb_fatal.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+rb_fatal.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+rb_fatal.o: $(hdrdir)/ruby/internal/attr/format.h
+rb_fatal.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+rb_fatal.o: $(hdrdir)/ruby/internal/attr/noalias.h
+rb_fatal.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+rb_fatal.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+rb_fatal.o: $(hdrdir)/ruby/internal/attr/noinline.h
+rb_fatal.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+rb_fatal.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+rb_fatal.o: $(hdrdir)/ruby/internal/attr/pure.h
+rb_fatal.o: $(hdrdir)/ruby/internal/attr/restrict.h
+rb_fatal.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+rb_fatal.o: $(hdrdir)/ruby/internal/attr/warning.h
+rb_fatal.o: $(hdrdir)/ruby/internal/attr/weakref.h
+rb_fatal.o: $(hdrdir)/ruby/internal/cast.h
+rb_fatal.o: $(hdrdir)/ruby/internal/compiler_is.h
+rb_fatal.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+rb_fatal.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+rb_fatal.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+rb_fatal.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+rb_fatal.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+rb_fatal.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+rb_fatal.o: $(hdrdir)/ruby/internal/compiler_since.h
+rb_fatal.o: $(hdrdir)/ruby/internal/config.h
+rb_fatal.o: $(hdrdir)/ruby/internal/constant_p.h
+rb_fatal.o: $(hdrdir)/ruby/internal/core.h
+rb_fatal.o: $(hdrdir)/ruby/internal/core/rarray.h
+rb_fatal.o: $(hdrdir)/ruby/internal/core/rbasic.h
+rb_fatal.o: $(hdrdir)/ruby/internal/core/rbignum.h
+rb_fatal.o: $(hdrdir)/ruby/internal/core/rclass.h
+rb_fatal.o: $(hdrdir)/ruby/internal/core/rdata.h
+rb_fatal.o: $(hdrdir)/ruby/internal/core/rfile.h
+rb_fatal.o: $(hdrdir)/ruby/internal/core/rhash.h
+rb_fatal.o: $(hdrdir)/ruby/internal/core/robject.h
+rb_fatal.o: $(hdrdir)/ruby/internal/core/rregexp.h
+rb_fatal.o: $(hdrdir)/ruby/internal/core/rstring.h
+rb_fatal.o: $(hdrdir)/ruby/internal/core/rstruct.h
+rb_fatal.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+rb_fatal.o: $(hdrdir)/ruby/internal/ctype.h
+rb_fatal.o: $(hdrdir)/ruby/internal/dllexport.h
+rb_fatal.o: $(hdrdir)/ruby/internal/dosish.h
+rb_fatal.o: $(hdrdir)/ruby/internal/error.h
+rb_fatal.o: $(hdrdir)/ruby/internal/eval.h
+rb_fatal.o: $(hdrdir)/ruby/internal/event.h
+rb_fatal.o: $(hdrdir)/ruby/internal/fl_type.h
+rb_fatal.o: $(hdrdir)/ruby/internal/gc.h
+rb_fatal.o: $(hdrdir)/ruby/internal/glob.h
+rb_fatal.o: $(hdrdir)/ruby/internal/globals.h
+rb_fatal.o: $(hdrdir)/ruby/internal/has/attribute.h
+rb_fatal.o: $(hdrdir)/ruby/internal/has/builtin.h
+rb_fatal.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+rb_fatal.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+rb_fatal.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+rb_fatal.o: $(hdrdir)/ruby/internal/has/extension.h
+rb_fatal.o: $(hdrdir)/ruby/internal/has/feature.h
+rb_fatal.o: $(hdrdir)/ruby/internal/has/warning.h
+rb_fatal.o: $(hdrdir)/ruby/internal/intern/array.h
+rb_fatal.o: $(hdrdir)/ruby/internal/intern/bignum.h
+rb_fatal.o: $(hdrdir)/ruby/internal/intern/class.h
+rb_fatal.o: $(hdrdir)/ruby/internal/intern/compar.h
+rb_fatal.o: $(hdrdir)/ruby/internal/intern/complex.h
+rb_fatal.o: $(hdrdir)/ruby/internal/intern/cont.h
+rb_fatal.o: $(hdrdir)/ruby/internal/intern/dir.h
+rb_fatal.o: $(hdrdir)/ruby/internal/intern/enum.h
+rb_fatal.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+rb_fatal.o: $(hdrdir)/ruby/internal/intern/error.h
+rb_fatal.o: $(hdrdir)/ruby/internal/intern/eval.h
+rb_fatal.o: $(hdrdir)/ruby/internal/intern/file.h
+rb_fatal.o: $(hdrdir)/ruby/internal/intern/gc.h
+rb_fatal.o: $(hdrdir)/ruby/internal/intern/hash.h
+rb_fatal.o: $(hdrdir)/ruby/internal/intern/io.h
+rb_fatal.o: $(hdrdir)/ruby/internal/intern/load.h
+rb_fatal.o: $(hdrdir)/ruby/internal/intern/marshal.h
+rb_fatal.o: $(hdrdir)/ruby/internal/intern/numeric.h
+rb_fatal.o: $(hdrdir)/ruby/internal/intern/object.h
+rb_fatal.o: $(hdrdir)/ruby/internal/intern/parse.h
+rb_fatal.o: $(hdrdir)/ruby/internal/intern/proc.h
+rb_fatal.o: $(hdrdir)/ruby/internal/intern/process.h
+rb_fatal.o: $(hdrdir)/ruby/internal/intern/random.h
+rb_fatal.o: $(hdrdir)/ruby/internal/intern/range.h
+rb_fatal.o: $(hdrdir)/ruby/internal/intern/rational.h
+rb_fatal.o: $(hdrdir)/ruby/internal/intern/re.h
+rb_fatal.o: $(hdrdir)/ruby/internal/intern/ruby.h
+rb_fatal.o: $(hdrdir)/ruby/internal/intern/select.h
+rb_fatal.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+rb_fatal.o: $(hdrdir)/ruby/internal/intern/signal.h
+rb_fatal.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+rb_fatal.o: $(hdrdir)/ruby/internal/intern/string.h
+rb_fatal.o: $(hdrdir)/ruby/internal/intern/struct.h
+rb_fatal.o: $(hdrdir)/ruby/internal/intern/thread.h
+rb_fatal.o: $(hdrdir)/ruby/internal/intern/time.h
+rb_fatal.o: $(hdrdir)/ruby/internal/intern/variable.h
+rb_fatal.o: $(hdrdir)/ruby/internal/intern/vm.h
+rb_fatal.o: $(hdrdir)/ruby/internal/interpreter.h
+rb_fatal.o: $(hdrdir)/ruby/internal/iterator.h
+rb_fatal.o: $(hdrdir)/ruby/internal/memory.h
+rb_fatal.o: $(hdrdir)/ruby/internal/method.h
+rb_fatal.o: $(hdrdir)/ruby/internal/module.h
+rb_fatal.o: $(hdrdir)/ruby/internal/newobj.h
+rb_fatal.o: $(hdrdir)/ruby/internal/rgengc.h
+rb_fatal.o: $(hdrdir)/ruby/internal/scan_args.h
+rb_fatal.o: $(hdrdir)/ruby/internal/special_consts.h
+rb_fatal.o: $(hdrdir)/ruby/internal/static_assert.h
+rb_fatal.o: $(hdrdir)/ruby/internal/stdalign.h
+rb_fatal.o: $(hdrdir)/ruby/internal/stdbool.h
+rb_fatal.o: $(hdrdir)/ruby/internal/symbol.h
+rb_fatal.o: $(hdrdir)/ruby/internal/token_paste.h
+rb_fatal.o: $(hdrdir)/ruby/internal/value.h
+rb_fatal.o: $(hdrdir)/ruby/internal/value_type.h
+rb_fatal.o: $(hdrdir)/ruby/internal/variable.h
+rb_fatal.o: $(hdrdir)/ruby/internal/warning_push.h
+rb_fatal.o: $(hdrdir)/ruby/internal/xmalloc.h
+rb_fatal.o: $(hdrdir)/ruby/assert.h
+rb_fatal.o: $(hdrdir)/ruby/backward.h
+rb_fatal.o: $(hdrdir)/ruby/backward/2/assume.h
+rb_fatal.o: $(hdrdir)/ruby/backward/2/attributes.h
+rb_fatal.o: $(hdrdir)/ruby/backward/2/bool.h
+rb_fatal.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+rb_fatal.o: $(hdrdir)/ruby/backward/2/inttypes.h
+rb_fatal.o: $(hdrdir)/ruby/backward/2/limits.h
+rb_fatal.o: $(hdrdir)/ruby/backward/2/long_long.h
+rb_fatal.o: $(hdrdir)/ruby/backward/2/stdalign.h
+rb_fatal.o: $(hdrdir)/ruby/backward/2/stdarg.h
+rb_fatal.o: $(hdrdir)/ruby/defines.h
+rb_fatal.o: $(hdrdir)/ruby/intern.h
+rb_fatal.o: $(hdrdir)/ruby/missing.h
+rb_fatal.o: $(hdrdir)/ruby/ruby.h
+rb_fatal.o: $(hdrdir)/ruby/st.h
+rb_fatal.o: $(hdrdir)/ruby/subst.h
+rb_fatal.o: rb_fatal.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/file/depend b/ext/-test-/file/depend
index fb22843b72..12b0bbd825 100644
--- a/ext/-test-/file/depend
+++ b/ext/-test-/file/depend
@@ -1,12 +1,163 @@
 # AUTOGENERATED DEPENDENCIES START
 fs.o: $(RUBY_EXTCONF_H)
 fs.o: $(arch_hdrdir)/ruby/config.h
+fs.o: $(hdrdir)/ruby/internal/anyargs.h
+fs.o: $(hdrdir)/ruby/internal/arithmetic.h
+fs.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+fs.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+fs.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+fs.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+fs.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+fs.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+fs.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+fs.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+fs.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+fs.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+fs.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+fs.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+fs.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+fs.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+fs.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+fs.o: $(hdrdir)/ruby/internal/assume.h
+fs.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+fs.o: $(hdrdir)/ruby/internal/attr/artificial.h
+fs.o: $(hdrdir)/ruby/internal/attr/cold.h
+fs.o: $(hdrdir)/ruby/internal/attr/const.h
+fs.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+fs.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+fs.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+fs.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+fs.o: $(hdrdir)/ruby/internal/attr/error.h
+fs.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+fs.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+fs.o: $(hdrdir)/ruby/internal/attr/format.h
+fs.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+fs.o: $(hdrdir)/ruby/internal/attr/noalias.h
+fs.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+fs.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+fs.o: $(hdrdir)/ruby/internal/attr/noinline.h
+fs.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+fs.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+fs.o: $(hdrdir)/ruby/internal/attr/pure.h
+fs.o: $(hdrdir)/ruby/internal/attr/restrict.h
+fs.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+fs.o: $(hdrdir)/ruby/internal/attr/warning.h
+fs.o: $(hdrdir)/ruby/internal/attr/weakref.h
+fs.o: $(hdrdir)/ruby/internal/cast.h
+fs.o: $(hdrdir)/ruby/internal/compiler_is.h
+fs.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+fs.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+fs.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+fs.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+fs.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+fs.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+fs.o: $(hdrdir)/ruby/internal/compiler_since.h
+fs.o: $(hdrdir)/ruby/internal/config.h
+fs.o: $(hdrdir)/ruby/internal/constant_p.h
+fs.o: $(hdrdir)/ruby/internal/core.h
+fs.o: $(hdrdir)/ruby/internal/core/rarray.h
+fs.o: $(hdrdir)/ruby/internal/core/rbasic.h
+fs.o: $(hdrdir)/ruby/internal/core/rbignum.h
+fs.o: $(hdrdir)/ruby/internal/core/rclass.h
+fs.o: $(hdrdir)/ruby/internal/core/rdata.h
+fs.o: $(hdrdir)/ruby/internal/core/rfile.h
+fs.o: $(hdrdir)/ruby/internal/core/rhash.h
+fs.o: $(hdrdir)/ruby/internal/core/robject.h
+fs.o: $(hdrdir)/ruby/internal/core/rregexp.h
+fs.o: $(hdrdir)/ruby/internal/core/rstring.h
+fs.o: $(hdrdir)/ruby/internal/core/rstruct.h
+fs.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+fs.o: $(hdrdir)/ruby/internal/ctype.h
+fs.o: $(hdrdir)/ruby/internal/dllexport.h
+fs.o: $(hdrdir)/ruby/internal/dosish.h
+fs.o: $(hdrdir)/ruby/internal/error.h
+fs.o: $(hdrdir)/ruby/internal/eval.h
+fs.o: $(hdrdir)/ruby/internal/event.h
+fs.o: $(hdrdir)/ruby/internal/fl_type.h
+fs.o: $(hdrdir)/ruby/internal/gc.h
+fs.o: $(hdrdir)/ruby/internal/glob.h
+fs.o: $(hdrdir)/ruby/internal/globals.h
+fs.o: $(hdrdir)/ruby/internal/has/attribute.h
+fs.o: $(hdrdir)/ruby/internal/has/builtin.h
+fs.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+fs.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+fs.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+fs.o: $(hdrdir)/ruby/internal/has/extension.h
+fs.o: $(hdrdir)/ruby/internal/has/feature.h
+fs.o: $(hdrdir)/ruby/internal/has/warning.h
+fs.o: $(hdrdir)/ruby/internal/intern/array.h
+fs.o: $(hdrdir)/ruby/internal/intern/bignum.h
+fs.o: $(hdrdir)/ruby/internal/intern/class.h
+fs.o: $(hdrdir)/ruby/internal/intern/compar.h
+fs.o: $(hdrdir)/ruby/internal/intern/complex.h
+fs.o: $(hdrdir)/ruby/internal/intern/cont.h
+fs.o: $(hdrdir)/ruby/internal/intern/dir.h
+fs.o: $(hdrdir)/ruby/internal/intern/enum.h
+fs.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+fs.o: $(hdrdir)/ruby/internal/intern/error.h
+fs.o: $(hdrdir)/ruby/internal/intern/eval.h
+fs.o: $(hdrdir)/ruby/internal/intern/file.h
+fs.o: $(hdrdir)/ruby/internal/intern/gc.h
+fs.o: $(hdrdir)/ruby/internal/intern/hash.h
+fs.o: $(hdrdir)/ruby/internal/intern/io.h
+fs.o: $(hdrdir)/ruby/internal/intern/load.h
+fs.o: $(hdrdir)/ruby/internal/intern/marshal.h
+fs.o: $(hdrdir)/ruby/internal/intern/numeric.h
+fs.o: $(hdrdir)/ruby/internal/intern/object.h
+fs.o: $(hdrdir)/ruby/internal/intern/parse.h
+fs.o: $(hdrdir)/ruby/internal/intern/proc.h
+fs.o: $(hdrdir)/ruby/internal/intern/process.h
+fs.o: $(hdrdir)/ruby/internal/intern/random.h
+fs.o: $(hdrdir)/ruby/internal/intern/range.h
+fs.o: $(hdrdir)/ruby/internal/intern/rational.h
+fs.o: $(hdrdir)/ruby/internal/intern/re.h
+fs.o: $(hdrdir)/ruby/internal/intern/ruby.h
+fs.o: $(hdrdir)/ruby/internal/intern/select.h
+fs.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+fs.o: $(hdrdir)/ruby/internal/intern/signal.h
+fs.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+fs.o: $(hdrdir)/ruby/internal/intern/string.h
+fs.o: $(hdrdir)/ruby/internal/intern/struct.h
+fs.o: $(hdrdir)/ruby/internal/intern/thread.h
+fs.o: $(hdrdir)/ruby/internal/intern/time.h
+fs.o: $(hdrdir)/ruby/internal/intern/variable.h
+fs.o: $(hdrdir)/ruby/internal/intern/vm.h
+fs.o: $(hdrdir)/ruby/internal/interpreter.h
+fs.o: $(hdrdir)/ruby/internal/iterator.h
+fs.o: $(hdrdir)/ruby/internal/memory.h
+fs.o: $(hdrdir)/ruby/internal/method.h
+fs.o: $(hdrdir)/ruby/internal/module.h
+fs.o: $(hdrdir)/ruby/internal/newobj.h
+fs.o: $(hdrdir)/ruby/internal/rgengc.h
+fs.o: $(hdrdir)/ruby/internal/scan_args.h
+fs.o: $(hdrdir)/ruby/internal/special_consts.h
+fs.o: $(hdrdir)/ruby/internal/static_assert.h
+fs.o: $(hdrdir)/ruby/internal/stdalign.h
+fs.o: $(hdrdir)/ruby/internal/stdbool.h
+fs.o: $(hdrdir)/ruby/internal/symbol.h
+fs.o: $(hdrdir)/ruby/internal/token_paste.h
+fs.o: $(hdrdir)/ruby/internal/value.h
+fs.o: $(hdrdir)/ruby/internal/value_type.h
+fs.o: $(hdrdir)/ruby/internal/variable.h
+fs.o: $(hdrdir)/ruby/internal/warning_push.h
+fs.o: $(hdrdir)/ruby/internal/xmalloc.h
+fs.o: $(hdrdir)/ruby/assert.h
 fs.o: $(hdrdir)/ruby/backward.h
+fs.o: $(hdrdir)/ruby/backward/2/assume.h
+fs.o: $(hdrdir)/ruby/backward/2/attributes.h
+fs.o: $(hdrdir)/ruby/backward/2/bool.h
+fs.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+fs.o: $(hdrdir)/ruby/backward/2/inttypes.h
+fs.o: $(hdrdir)/ruby/backward/2/limits.h
+fs.o: $(hdrdir)/ruby/backward/2/long_long.h
+fs.o: $(hdrdir)/ruby/backward/2/stdalign.h
+fs.o: $(hdrdir)/ruby/backward/2/stdarg.h
 fs.o: $(hdrdir)/ruby/defines.h
 fs.o: $(hdrdir)/ruby/encoding.h
 fs.o: $(hdrdir)/ruby/intern.h
 fs.o: $(hdrdir)/ruby/io.h
 fs.o: $(hdrdir)/ruby/missing.h
+fs.o: $(hdrdir)/ruby/onigmo.h
 fs.o: $(hdrdir)/ruby/oniguruma.h
 fs.o: $(hdrdir)/ruby/ruby.h
 fs.o: $(hdrdir)/ruby/st.h
@@ -14,23 +165,324 @@ fs.o: $(hdrdir)/ruby/subst.h
 fs.o: fs.c
 init.o: $(RUBY_EXTCONF_H)
 init.o: $(arch_hdrdir)/ruby/config.h
+init.o: $(hdrdir)/ruby.h
+init.o: $(hdrdir)/ruby/internal/anyargs.h
+init.o: $(hdrdir)/ruby/internal/arithmetic.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+init.o: $(hdrdir)/ruby/internal/assume.h
+init.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+init.o: $(hdrdir)/ruby/internal/attr/artificial.h
+init.o: $(hdrdir)/ruby/internal/attr/cold.h
+init.o: $(hdrdir)/ruby/internal/attr/const.h
+init.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+init.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+init.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+init.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+init.o: $(hdrdir)/ruby/internal/attr/error.h
+init.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+init.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+init.o: $(hdrdir)/ruby/internal/attr/format.h
+init.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+init.o: $(hdrdir)/ruby/internal/attr/noalias.h
+init.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+init.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+init.o: $(hdrdir)/ruby/internal/attr/noinline.h
+init.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+init.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+init.o: $(hdrdir)/ruby/internal/attr/pure.h
+init.o: $(hdrdir)/ruby/internal/attr/restrict.h
+init.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+init.o: $(hdrdir)/ruby/internal/attr/warning.h
+init.o: $(hdrdir)/ruby/internal/attr/weakref.h
+init.o: $(hdrdir)/ruby/internal/cast.h
+init.o: $(hdrdir)/ruby/internal/compiler_is.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+init.o: $(hdrdir)/ruby/internal/compiler_since.h
+init.o: $(hdrdir)/ruby/internal/config.h
+init.o: $(hdrdir)/ruby/internal/constant_p.h
+init.o: $(hdrdir)/ruby/internal/core.h
+init.o: $(hdrdir)/ruby/internal/core/rarray.h
+init.o: $(hdrdir)/ruby/internal/core/rbasic.h
+init.o: $(hdrdir)/ruby/internal/core/rbignum.h
+init.o: $(hdrdir)/ruby/internal/core/rclass.h
+init.o: $(hdrdir)/ruby/internal/core/rdata.h
+init.o: $(hdrdir)/ruby/internal/core/rfile.h
+init.o: $(hdrdir)/ruby/internal/core/rhash.h
+init.o: $(hdrdir)/ruby/internal/core/robject.h
+init.o: $(hdrdir)/ruby/internal/core/rregexp.h
+init.o: $(hdrdir)/ruby/internal/core/rstring.h
+init.o: $(hdrdir)/ruby/internal/core/rstruct.h
+init.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+init.o: $(hdrdir)/ruby/internal/ctype.h
+init.o: $(hdrdir)/ruby/internal/dllexport.h
+init.o: $(hdrdir)/ruby/internal/dosish.h
+init.o: $(hdrdir)/ruby/internal/error.h
+init.o: $(hdrdir)/ruby/internal/eval.h
+init.o: $(hdrdir)/ruby/internal/event.h
+init.o: $(hdrdir)/ruby/internal/fl_type.h
+init.o: $(hdrdir)/ruby/internal/gc.h
+init.o: $(hdrdir)/ruby/internal/glob.h
+init.o: $(hdrdir)/ruby/internal/globals.h
+init.o: $(hdrdir)/ruby/internal/has/attribute.h
+init.o: $(hdrdir)/ruby/internal/has/builtin.h
+init.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/extension.h
+init.o: $(hdrdir)/ruby/internal/has/feature.h
+init.o: $(hdrdir)/ruby/internal/has/warning.h
+init.o: $(hdrdir)/ruby/internal/intern/array.h
+init.o: $(hdrdir)/ruby/internal/intern/bignum.h
+init.o: $(hdrdir)/ruby/internal/intern/class.h
+init.o: $(hdrdir)/ruby/internal/intern/compar.h
+init.o: $(hdrdir)/ruby/internal/intern/complex.h
+init.o: $(hdrdir)/ruby/internal/intern/cont.h
+init.o: $(hdrdir)/ruby/internal/intern/dir.h
+init.o: $(hdrdir)/ruby/internal/intern/enum.h
+init.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+init.o: $(hdrdir)/ruby/internal/intern/error.h
+init.o: $(hdrdir)/ruby/internal/intern/eval.h
+init.o: $(hdrdir)/ruby/internal/intern/file.h
+init.o: $(hdrdir)/ruby/internal/intern/gc.h
+init.o: $(hdrdir)/ruby/internal/intern/hash.h
+init.o: $(hdrdir)/ruby/internal/intern/io.h
+init.o: $(hdrdir)/ruby/internal/intern/load.h
+init.o: $(hdrdir)/ruby/internal/intern/marshal.h
+init.o: $(hdrdir)/ruby/internal/intern/numeric.h
+init.o: $(hdrdir)/ruby/internal/intern/object.h
+init.o: $(hdrdir)/ruby/internal/intern/parse.h
+init.o: $(hdrdir)/ruby/internal/intern/proc.h
+init.o: $(hdrdir)/ruby/internal/intern/process.h
+init.o: $(hdrdir)/ruby/internal/intern/random.h
+init.o: $(hdrdir)/ruby/internal/intern/range.h
+init.o: $(hdrdir)/ruby/internal/intern/rational.h
+init.o: $(hdrdir)/ruby/internal/intern/re.h
+init.o: $(hdrdir)/ruby/internal/intern/ruby.h
+init.o: $(hdrdir)/ruby/internal/intern/select.h
+init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+init.o: $(hdrdir)/ruby/internal/intern/signal.h
+init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+init.o: $(hdrdir)/ruby/internal/intern/string.h
+init.o: $(hdrdir)/ruby/internal/intern/struct.h
+init.o: $(hdrdir)/ruby/internal/intern/thread.h
+init.o: $(hdrdir)/ruby/internal/intern/time.h
+init.o: $(hdrdir)/ruby/internal/intern/variable.h
+init.o: $(hdrdir)/ruby/internal/intern/vm.h
+init.o: $(hdrdir)/ruby/internal/interpreter.h
+init.o: $(hdrdir)/ruby/internal/iterator.h
+init.o: $(hdrdir)/ruby/internal/memory.h
+init.o: $(hdrdir)/ruby/internal/method.h
+init.o: $(hdrdir)/ruby/internal/module.h
+init.o: $(hdrdir)/ruby/internal/newobj.h
+init.o: $(hdrdir)/ruby/internal/rgengc.h
+init.o: $(hdrdir)/ruby/internal/scan_args.h
+init.o: $(hdrdir)/ruby/internal/special_consts.h
+init.o: $(hdrdir)/ruby/internal/static_assert.h
+init.o: $(hdrdir)/ruby/internal/stdalign.h
+init.o: $(hdrdir)/ruby/internal/stdbool.h
+init.o: $(hdrdir)/ruby/internal/symbol.h
+init.o: $(hdrdir)/ruby/internal/token_paste.h
+init.o: $(hdrdir)/ruby/internal/value.h
+init.o: $(hdrdir)/ruby/internal/value_type.h
+init.o: $(hdrdir)/ruby/internal/variable.h
+init.o: $(hdrdir)/ruby/internal/warning_push.h
+init.o: $(hdrdir)/ruby/internal/xmalloc.h
+init.o: $(hdrdir)/ruby/assert.h
 init.o: $(hdrdir)/ruby/backward.h
+init.o: $(hdrdir)/ruby/backward/2/assume.h
+init.o: $(hdrdir)/ruby/backward/2/attributes.h
+init.o: $(hdrdir)/ruby/backward/2/bool.h
+init.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+init.o: $(hdrdir)/ruby/backward/2/inttypes.h
+init.o: $(hdrdir)/ruby/backward/2/limits.h
+init.o: $(hdrdir)/ruby/backward/2/long_long.h
+init.o: $(hdrdir)/ruby/backward/2/stdalign.h
+init.o: $(hdrdir)/ruby/backward/2/stdarg.h
 init.o: $(hdrdir)/ruby/defines.h
 init.o: $(hdrdir)/ruby/intern.h
 init.o: $(hdrdir)/ruby/missing.h
 init.o: $(hdrdir)/ruby/ruby.h
 init.o: $(hdrdir)/ruby/st.h
 init.o: $(hdrdir)/ruby/subst.h
-init.o: $(top_srcdir)/include/ruby.h
 init.o: init.c
 stat.o: $(RUBY_EXTCONF_H)
 stat.o: $(arch_hdrdir)/ruby/config.h
+stat.o: $(hdrdir)/ruby/internal/anyargs.h
+stat.o: $(hdrdir)/ruby/internal/arithmetic.h
+stat.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+stat.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+stat.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+stat.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+stat.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+stat.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+stat.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+stat.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+stat.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+stat.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+stat.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+stat.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+stat.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+stat.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+stat.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+stat.o: $(hdrdir)/ruby/internal/assume.h
+stat.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+stat.o: $(hdrdir)/ruby/internal/attr/artificial.h
+stat.o: $(hdrdir)/ruby/internal/attr/cold.h
+stat.o: $(hdrdir)/ruby/internal/attr/const.h
+stat.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+stat.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+stat.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+stat.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+stat.o: $(hdrdir)/ruby/internal/attr/error.h
+stat.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+stat.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+stat.o: $(hdrdir)/ruby/internal/attr/format.h
+stat.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+stat.o: $(hdrdir)/ruby/internal/attr/noalias.h
+stat.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+stat.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+stat.o: $(hdrdir)/ruby/internal/attr/noinline.h
+stat.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+stat.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+stat.o: $(hdrdir)/ruby/internal/attr/pure.h
+stat.o: $(hdrdir)/ruby/internal/attr/restrict.h
+stat.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+stat.o: $(hdrdir)/ruby/internal/attr/warning.h
+stat.o: $(hdrdir)/ruby/internal/attr/weakref.h
+stat.o: $(hdrdir)/ruby/internal/cast.h
+stat.o: $(hdrdir)/ruby/internal/compiler_is.h
+stat.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+stat.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+stat.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+stat.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+stat.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+stat.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+stat.o: $(hdrdir)/ruby/internal/compiler_since.h
+stat.o: $(hdrdir)/ruby/internal/config.h
+stat.o: $(hdrdir)/ruby/internal/constant_p.h
+stat.o: $(hdrdir)/ruby/internal/core.h
+stat.o: $(hdrdir)/ruby/internal/core/rarray.h
+stat.o: $(hdrdir)/ruby/internal/core/rbasic.h
+stat.o: $(hdrdir)/ruby/internal/core/rbignum.h
+stat.o: $(hdrdir)/ruby/internal/core/rclass.h
+stat.o: $(hdrdir)/ruby/internal/core/rdata.h
+stat.o: $(hdrdir)/ruby/internal/core/rfile.h
+stat.o: $(hdrdir)/ruby/internal/core/rhash.h
+stat.o: $(hdrdir)/ruby/internal/core/robject.h
+stat.o: $(hdrdir)/ruby/internal/core/rregexp.h
+stat.o: $(hdrdir)/ruby/internal/core/rstring.h
+stat.o: $(hdrdir)/ruby/internal/core/rstruct.h
+stat.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+stat.o: $(hdrdir)/ruby/internal/ctype.h
+stat.o: $(hdrdir)/ruby/internal/dllexport.h
+stat.o: $(hdrdir)/ruby/internal/dosish.h
+stat.o: $(hdrdir)/ruby/internal/error.h
+stat.o: $(hdrdir)/ruby/internal/eval.h
+stat.o: $(hdrdir)/ruby/internal/event.h
+stat.o: $(hdrdir)/ruby/internal/fl_type.h
+stat.o: $(hdrdir)/ruby/internal/gc.h
+stat.o: $(hdrdir)/ruby/internal/glob.h
+stat.o: $(hdrdir)/ruby/internal/globals.h
+stat.o: $(hdrdir)/ruby/internal/has/attribute.h
+stat.o: $(hdrdir)/ruby/internal/has/builtin.h
+stat.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+stat.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+stat.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+stat.o: $(hdrdir)/ruby/internal/has/extension.h
+stat.o: $(hdrdir)/ruby/internal/has/feature.h
+stat.o: $(hdrdir)/ruby/internal/has/warning.h
+stat.o: $(hdrdir)/ruby/internal/intern/array.h
+stat.o: $(hdrdir)/ruby/internal/intern/bignum.h
+stat.o: $(hdrdir)/ruby/internal/intern/class.h
+stat.o: $(hdrdir)/ruby/internal/intern/compar.h
+stat.o: $(hdrdir)/ruby/internal/intern/complex.h
+stat.o: $(hdrdir)/ruby/internal/intern/cont.h
+stat.o: $(hdrdir)/ruby/internal/intern/dir.h
+stat.o: $(hdrdir)/ruby/internal/intern/enum.h
+stat.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+stat.o: $(hdrdir)/ruby/internal/intern/error.h
+stat.o: $(hdrdir)/ruby/internal/intern/eval.h
+stat.o: $(hdrdir)/ruby/internal/intern/file.h
+stat.o: $(hdrdir)/ruby/internal/intern/gc.h
+stat.o: $(hdrdir)/ruby/internal/intern/hash.h
+stat.o: $(hdrdir)/ruby/internal/intern/io.h
+stat.o: $(hdrdir)/ruby/internal/intern/load.h
+stat.o: $(hdrdir)/ruby/internal/intern/marshal.h
+stat.o: $(hdrdir)/ruby/internal/intern/numeric.h
+stat.o: $(hdrdir)/ruby/internal/intern/object.h
+stat.o: $(hdrdir)/ruby/internal/intern/parse.h
+stat.o: $(hdrdir)/ruby/internal/intern/proc.h
+stat.o: $(hdrdir)/ruby/internal/intern/process.h
+stat.o: $(hdrdir)/ruby/internal/intern/random.h
+stat.o: $(hdrdir)/ruby/internal/intern/range.h
+stat.o: $(hdrdir)/ruby/internal/intern/rational.h
+stat.o: $(hdrdir)/ruby/internal/intern/re.h
+stat.o: $(hdrdir)/ruby/internal/intern/ruby.h
+stat.o: $(hdrdir)/ruby/internal/intern/select.h
+stat.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+stat.o: $(hdrdir)/ruby/internal/intern/signal.h
+stat.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+stat.o: $(hdrdir)/ruby/internal/intern/string.h
+stat.o: $(hdrdir)/ruby/internal/intern/struct.h
+stat.o: $(hdrdir)/ruby/internal/intern/thread.h
+stat.o: $(hdrdir)/ruby/internal/intern/time.h
+stat.o: $(hdrdir)/ruby/internal/intern/variable.h
+stat.o: $(hdrdir)/ruby/internal/intern/vm.h
+stat.o: $(hdrdir)/ruby/internal/interpreter.h
+stat.o: $(hdrdir)/ruby/internal/iterator.h
+stat.o: $(hdrdir)/ruby/internal/memory.h
+stat.o: $(hdrdir)/ruby/internal/method.h
+stat.o: $(hdrdir)/ruby/internal/module.h
+stat.o: $(hdrdir)/ruby/internal/newobj.h
+stat.o: $(hdrdir)/ruby/internal/rgengc.h
+stat.o: $(hdrdir)/ruby/internal/scan_args.h
+stat.o: $(hdrdir)/ruby/internal/special_consts.h
+stat.o: $(hdrdir)/ruby/internal/static_assert.h
+stat.o: $(hdrdir)/ruby/internal/stdalign.h
+stat.o: $(hdrdir)/ruby/internal/stdbool.h
+stat.o: $(hdrdir)/ruby/internal/symbol.h
+stat.o: $(hdrdir)/ruby/internal/token_paste.h
+stat.o: $(hdrdir)/ruby/internal/value.h
+stat.o: $(hdrdir)/ruby/internal/value_type.h
+stat.o: $(hdrdir)/ruby/internal/variable.h
+stat.o: $(hdrdir)/ruby/internal/warning_push.h
+stat.o: $(hdrdir)/ruby/internal/xmalloc.h
+stat.o: $(hdrdir)/ruby/assert.h
 stat.o: $(hdrdir)/ruby/backward.h
+stat.o: $(hdrdir)/ruby/backward/2/assume.h
+stat.o: $(hdrdir)/ruby/backward/2/attributes.h
+stat.o: $(hdrdir)/ruby/backward/2/bool.h
+stat.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+stat.o: $(hdrdir)/ruby/backward/2/inttypes.h
+stat.o: $(hdrdir)/ruby/backward/2/limits.h
+stat.o: $(hdrdir)/ruby/backward/2/long_long.h
+stat.o: $(hdrdir)/ruby/backward/2/stdalign.h
+stat.o: $(hdrdir)/ruby/backward/2/stdarg.h
 stat.o: $(hdrdir)/ruby/defines.h
 stat.o: $(hdrdir)/ruby/encoding.h
 stat.o: $(hdrdir)/ruby/intern.h
 stat.o: $(hdrdir)/ruby/io.h
 stat.o: $(hdrdir)/ruby/missing.h
+stat.o: $(hdrdir)/ruby/onigmo.h
 stat.o: $(hdrdir)/ruby/oniguruma.h
 stat.o: $(hdrdir)/ruby/ruby.h
 stat.o: $(hdrdir)/ruby/st.h
diff --git a/ext/-test-/file/extconf.rb b/ext/-test-/file/extconf.rb
index 321c173f4c..9027ed1c3e 100644
--- a/ext/-test-/file/extconf.rb
+++ b/ext/-test-/file/extconf.rb
@@ -5,6 +5,7 @@ headers = %w[sys/param.h sys/mount.h sys/vfs.h].select {|h| have_header(h)}
 if have_type("struct statfs", headers)
   have_struct_member("struct statfs", "f_fstypename", headers)
   have_struct_member("struct statfs", "f_type", headers)
+  have_struct_member("struct statfs", "f_flags", headers)
 end
 
 headers = %w[sys/statvfs.h].select {|h| have_header(h)}
diff --git a/ext/-test-/file/fs.c b/ext/-test-/file/fs.c
index d3fa5350e5..63d2356d76 100644
--- a/ext/-test-/file/fs.c
+++ b/ext/-test-/file/fs.c
@@ -36,6 +36,12 @@ typedef struct statvfs statfs_t;
 # if defined HAVE_STRUCT_STATVFS_F_TYPE
 #   define HAVE_STRUCT_STATFS_T_F_TYPE 1
 # endif
+#elif defined(HAVE_STRUCT_STATFS_F_TYPE) /* Linux */
+typedef struct statfs statfs_t;
+# define STATFS(f, s) statfs((f), (s))
+# if defined HAVE_STRUCT_STATFS_F_TYPE
+#   define HAVE_STRUCT_STATFS_T_F_TYPE 1
+# endif
 #endif
 
 VALUE
@@ -72,9 +78,34 @@ get_fsname(VALUE self, VALUE str)
     return Qnil;
 }
 
+VALUE
+get_noatime_p(VALUE self, VALUE str)
+{
+#ifdef STATFS
+    statfs_t st;
+    FilePathValue(str);
+    str = rb_str_encode_ospath(str);
+    if (STATFS(StringValueCStr(str), &st) == -1) {
+       rb_sys_fail_str(str);
+    }
+# ifdef HAVE_STRUCT_STATFS_F_FLAGS
+#  ifdef MNT_STRICTATIME
+    if (!(st.f_flags & MNT_STRICTATIME)) return Qtrue;
+#  endif
+#  ifdef MNT_NOATIME
+    return st.f_flags & MNT_NOATIME ? Qtrue : Qfalse;
+#  elif defined(ST_NOATIME)
+    return st.f_flags & ST_NOATIME ? Qtrue : Qfalse;
+#  endif
+# endif
+#endif
+    return Qnil;
+}
+
 void
 Init_fs(VALUE module)
 {
     VALUE fs = rb_define_module_under(module, "Fs");
     rb_define_module_function(fs, "fsname", get_fsname, 1);
+    rb_define_module_function(fs, "noatime?", get_noatime_p, 1);
 }
diff --git a/ext/-test-/float/depend b/ext/-test-/float/depend
index dff14550f7..066f008783 100644
--- a/ext/-test-/float/depend
+++ b/ext/-test-/float/depend
@@ -1,3 +1,328 @@
-$(OBJS): $(HDRS) $(ruby_headers)
-
+# for FreeBSD make
 nextafter.o: nextafter.c $(top_srcdir)/missing/nextafter.c
+
+# AUTOGENERATED DEPENDENCIES START
+init.o: $(RUBY_EXTCONF_H)
+init.o: $(arch_hdrdir)/ruby/config.h
+init.o: $(hdrdir)/ruby.h
+init.o: $(hdrdir)/ruby/internal/anyargs.h
+init.o: $(hdrdir)/ruby/internal/arithmetic.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+init.o: $(hdrdir)/ruby/internal/assume.h
+init.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+init.o: $(hdrdir)/ruby/internal/attr/artificial.h
+init.o: $(hdrdir)/ruby/internal/attr/cold.h
+init.o: $(hdrdir)/ruby/internal/attr/const.h
+init.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+init.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+init.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+init.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+init.o: $(hdrdir)/ruby/internal/attr/error.h
+init.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+init.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+init.o: $(hdrdir)/ruby/internal/attr/format.h
+init.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+init.o: $(hdrdir)/ruby/internal/attr/noalias.h
+init.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+init.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+init.o: $(hdrdir)/ruby/internal/attr/noinline.h
+init.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+init.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+init.o: $(hdrdir)/ruby/internal/attr/pure.h
+init.o: $(hdrdir)/ruby/internal/attr/restrict.h
+init.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+init.o: $(hdrdir)/ruby/internal/attr/warning.h
+init.o: $(hdrdir)/ruby/internal/attr/weakref.h
+init.o: $(hdrdir)/ruby/internal/cast.h
+init.o: $(hdrdir)/ruby/internal/compiler_is.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+init.o: $(hdrdir)/ruby/internal/compiler_since.h
+init.o: $(hdrdir)/ruby/internal/config.h
+init.o: $(hdrdir)/ruby/internal/constant_p.h
+init.o: $(hdrdir)/ruby/internal/core.h
+init.o: $(hdrdir)/ruby/internal/core/rarray.h
+init.o: $(hdrdir)/ruby/internal/core/rbasic.h
+init.o: $(hdrdir)/ruby/internal/core/rbignum.h
+init.o: $(hdrdir)/ruby/internal/core/rclass.h
+init.o: $(hdrdir)/ruby/internal/core/rdata.h
+init.o: $(hdrdir)/ruby/internal/core/rfile.h
+init.o: $(hdrdir)/ruby/internal/core/rhash.h
+init.o: $(hdrdir)/ruby/internal/core/robject.h
+init.o: $(hdrdir)/ruby/internal/core/rregexp.h
+init.o: $(hdrdir)/ruby/internal/core/rstring.h
+init.o: $(hdrdir)/ruby/internal/core/rstruct.h
+init.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+init.o: $(hdrdir)/ruby/internal/ctype.h
+init.o: $(hdrdir)/ruby/internal/dllexport.h
+init.o: $(hdrdir)/ruby/internal/dosish.h
+init.o: $(hdrdir)/ruby/internal/error.h
+init.o: $(hdrdir)/ruby/internal/eval.h
+init.o: $(hdrdir)/ruby/internal/event.h
+init.o: $(hdrdir)/ruby/internal/fl_type.h
+init.o: $(hdrdir)/ruby/internal/gc.h
+init.o: $(hdrdir)/ruby/internal/glob.h
+init.o: $(hdrdir)/ruby/internal/globals.h
+init.o: $(hdrdir)/ruby/internal/has/attribute.h
+init.o: $(hdrdir)/ruby/internal/has/builtin.h
+init.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/extension.h
+init.o: $(hdrdir)/ruby/internal/has/feature.h
+init.o: $(hdrdir)/ruby/internal/has/warning.h
+init.o: $(hdrdir)/ruby/internal/intern/array.h
+init.o: $(hdrdir)/ruby/internal/intern/bignum.h
+init.o: $(hdrdir)/ruby/internal/intern/class.h
+init.o: $(hdrdir)/ruby/internal/intern/compar.h
+init.o: $(hdrdir)/ruby/internal/intern/complex.h
+init.o: $(hdrdir)/ruby/internal/intern/cont.h
+init.o: $(hdrdir)/ruby/internal/intern/dir.h
+init.o: $(hdrdir)/ruby/internal/intern/enum.h
+init.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+init.o: $(hdrdir)/ruby/internal/intern/error.h
+init.o: $(hdrdir)/ruby/internal/intern/eval.h
+init.o: $(hdrdir)/ruby/internal/intern/file.h
+init.o: $(hdrdir)/ruby/internal/intern/gc.h
+init.o: $(hdrdir)/ruby/internal/intern/hash.h
+init.o: $(hdrdir)/ruby/internal/intern/io.h
+init.o: $(hdrdir)/ruby/internal/intern/load.h
+init.o: $(hdrdir)/ruby/internal/intern/marshal.h
+init.o: $(hdrdir)/ruby/internal/intern/numeric.h
+init.o: $(hdrdir)/ruby/internal/intern/object.h
+init.o: $(hdrdir)/ruby/internal/intern/parse.h
+init.o: $(hdrdir)/ruby/internal/intern/proc.h
+init.o: $(hdrdir)/ruby/internal/intern/process.h
+init.o: $(hdrdir)/ruby/internal/intern/random.h
+init.o: $(hdrdir)/ruby/internal/intern/range.h
+init.o: $(hdrdir)/ruby/internal/intern/rational.h
+init.o: $(hdrdir)/ruby/internal/intern/re.h
+init.o: $(hdrdir)/ruby/internal/intern/ruby.h
+init.o: $(hdrdir)/ruby/internal/intern/select.h
+init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+init.o: $(hdrdir)/ruby/internal/intern/signal.h
+init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+init.o: $(hdrdir)/ruby/internal/intern/string.h
+init.o: $(hdrdir)/ruby/internal/intern/struct.h
+init.o: $(hdrdir)/ruby/internal/intern/thread.h
+init.o: $(hdrdir)/ruby/internal/intern/time.h
+init.o: $(hdrdir)/ruby/internal/intern/variable.h
+init.o: $(hdrdir)/ruby/internal/intern/vm.h
+init.o: $(hdrdir)/ruby/internal/interpreter.h
+init.o: $(hdrdir)/ruby/internal/iterator.h
+init.o: $(hdrdir)/ruby/internal/memory.h
+init.o: $(hdrdir)/ruby/internal/method.h
+init.o: $(hdrdir)/ruby/internal/module.h
+init.o: $(hdrdir)/ruby/internal/newobj.h
+init.o: $(hdrdir)/ruby/internal/rgengc.h
+init.o: $(hdrdir)/ruby/internal/scan_args.h
+init.o: $(hdrdir)/ruby/internal/special_consts.h
+init.o: $(hdrdir)/ruby/internal/static_assert.h
+init.o: $(hdrdir)/ruby/internal/stdalign.h
+init.o: $(hdrdir)/ruby/internal/stdbool.h
+init.o: $(hdrdir)/ruby/internal/symbol.h
+init.o: $(hdrdir)/ruby/internal/token_paste.h
+init.o: $(hdrdir)/ruby/internal/value.h
+init.o: $(hdrdir)/ruby/internal/value_type.h
+init.o: $(hdrdir)/ruby/internal/variable.h
+init.o: $(hdrdir)/ruby/internal/warning_push.h
+init.o: $(hdrdir)/ruby/internal/xmalloc.h
+init.o: $(hdrdir)/ruby/assert.h
+init.o: $(hdrdir)/ruby/backward.h
+init.o: $(hdrdir)/ruby/backward/2/assume.h
+init.o: $(hdrdir)/ruby/backward/2/attributes.h
+init.o: $(hdrdir)/ruby/backward/2/bool.h
+init.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+init.o: $(hdrdir)/ruby/backward/2/inttypes.h
+init.o: $(hdrdir)/ruby/backward/2/limits.h
+init.o: $(hdrdir)/ruby/backward/2/long_long.h
+init.o: $(hdrdir)/ruby/backward/2/stdalign.h
+init.o: $(hdrdir)/ruby/backward/2/stdarg.h
+init.o: $(hdrdir)/ruby/defines.h
+init.o: $(hdrdir)/ruby/intern.h
+init.o: $(hdrdir)/ruby/missing.h
+init.o: $(hdrdir)/ruby/ruby.h
+init.o: $(hdrdir)/ruby/st.h
+init.o: $(hdrdir)/ruby/subst.h
+init.o: init.c
+nextafter.o: $(RUBY_EXTCONF_H)
+nextafter.o: $(arch_hdrdir)/ruby/config.h
+nextafter.o: $(hdrdir)/ruby.h
+nextafter.o: $(hdrdir)/ruby/internal/anyargs.h
+nextafter.o: $(hdrdir)/ruby/internal/arithmetic.h
+nextafter.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+nextafter.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+nextafter.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+nextafter.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+nextafter.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+nextafter.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+nextafter.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+nextafter.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+nextafter.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+nextafter.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+nextafter.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+nextafter.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+nextafter.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+nextafter.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+nextafter.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+nextafter.o: $(hdrdir)/ruby/internal/assume.h
+nextafter.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+nextafter.o: $(hdrdir)/ruby/internal/attr/artificial.h
+nextafter.o: $(hdrdir)/ruby/internal/attr/cold.h
+nextafter.o: $(hdrdir)/ruby/internal/attr/const.h
+nextafter.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+nextafter.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+nextafter.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+nextafter.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+nextafter.o: $(hdrdir)/ruby/internal/attr/error.h
+nextafter.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+nextafter.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+nextafter.o: $(hdrdir)/ruby/internal/attr/format.h
+nextafter.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+nextafter.o: $(hdrdir)/ruby/internal/attr/noalias.h
+nextafter.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+nextafter.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+nextafter.o: $(hdrdir)/ruby/internal/attr/noinline.h
+nextafter.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+nextafter.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+nextafter.o: $(hdrdir)/ruby/internal/attr/pure.h
+nextafter.o: $(hdrdir)/ruby/internal/attr/restrict.h
+nextafter.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+nextafter.o: $(hdrdir)/ruby/internal/attr/warning.h
+nextafter.o: $(hdrdir)/ruby/internal/attr/weakref.h
+nextafter.o: $(hdrdir)/ruby/internal/cast.h
+nextafter.o: $(hdrdir)/ruby/internal/compiler_is.h
+nextafter.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+nextafter.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+nextafter.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+nextafter.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+nextafter.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+nextafter.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+nextafter.o: $(hdrdir)/ruby/internal/compiler_since.h
+nextafter.o: $(hdrdir)/ruby/internal/config.h
+nextafter.o: $(hdrdir)/ruby/internal/constant_p.h
+nextafter.o: $(hdrdir)/ruby/internal/core.h
+nextafter.o: $(hdrdir)/ruby/internal/core/rarray.h
+nextafter.o: $(hdrdir)/ruby/internal/core/rbasic.h
+nextafter.o: $(hdrdir)/ruby/internal/core/rbignum.h
+nextafter.o: $(hdrdir)/ruby/internal/core/rclass.h
+nextafter.o: $(hdrdir)/ruby/internal/core/rdata.h
+nextafter.o: $(hdrdir)/ruby/internal/core/rfile.h
+nextafter.o: $(hdrdir)/ruby/internal/core/rhash.h
+nextafter.o: $(hdrdir)/ruby/internal/core/robject.h
+nextafter.o: $(hdrdir)/ruby/internal/core/rregexp.h
+nextafter.o: $(hdrdir)/ruby/internal/core/rstring.h
+nextafter.o: $(hdrdir)/ruby/internal/core/rstruct.h
+nextafter.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+nextafter.o: $(hdrdir)/ruby/internal/ctype.h
+nextafter.o: $(hdrdir)/ruby/internal/dllexport.h
+nextafter.o: $(hdrdir)/ruby/internal/dosish.h
+nextafter.o: $(hdrdir)/ruby/internal/error.h
+nextafter.o: $(hdrdir)/ruby/internal/eval.h
+nextafter.o: $(hdrdir)/ruby/internal/event.h
+nextafter.o: $(hdrdir)/ruby/internal/fl_type.h
+nextafter.o: $(hdrdir)/ruby/internal/gc.h
+nextafter.o: $(hdrdir)/ruby/internal/glob.h
+nextafter.o: $(hdrdir)/ruby/internal/globals.h
+nextafter.o: $(hdrdir)/ruby/internal/has/attribute.h
+nextafter.o: $(hdrdir)/ruby/internal/has/builtin.h
+nextafter.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+nextafter.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+nextafter.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+nextafter.o: $(hdrdir)/ruby/internal/has/extension.h
+nextafter.o: $(hdrdir)/ruby/internal/has/feature.h
+nextafter.o: $(hdrdir)/ruby/internal/has/warning.h
+nextafter.o: $(hdrdir)/ruby/internal/intern/array.h
+nextafter.o: $(hdrdir)/ruby/internal/intern/bignum.h
+nextafter.o: $(hdrdir)/ruby/internal/intern/class.h
+nextafter.o: $(hdrdir)/ruby/internal/intern/compar.h
+nextafter.o: $(hdrdir)/ruby/internal/intern/complex.h
+nextafter.o: $(hdrdir)/ruby/internal/intern/cont.h
+nextafter.o: $(hdrdir)/ruby/internal/intern/dir.h
+nextafter.o: $(hdrdir)/ruby/internal/intern/enum.h
+nextafter.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+nextafter.o: $(hdrdir)/ruby/internal/intern/error.h
+nextafter.o: $(hdrdir)/ruby/internal/intern/eval.h
+nextafter.o: $(hdrdir)/ruby/internal/intern/file.h
+nextafter.o: $(hdrdir)/ruby/internal/intern/gc.h
+nextafter.o: $(hdrdir)/ruby/internal/intern/hash.h
+nextafter.o: $(hdrdir)/ruby/internal/intern/io.h
+nextafter.o: $(hdrdir)/ruby/internal/intern/load.h
+nextafter.o: $(hdrdir)/ruby/internal/intern/marshal.h
+nextafter.o: $(hdrdir)/ruby/internal/intern/numeric.h
+nextafter.o: $(hdrdir)/ruby/internal/intern/object.h
+nextafter.o: $(hdrdir)/ruby/internal/intern/parse.h
+nextafter.o: $(hdrdir)/ruby/internal/intern/proc.h
+nextafter.o: $(hdrdir)/ruby/internal/intern/process.h
+nextafter.o: $(hdrdir)/ruby/internal/intern/random.h
+nextafter.o: $(hdrdir)/ruby/internal/intern/range.h
+nextafter.o: $(hdrdir)/ruby/internal/intern/rational.h
+nextafter.o: $(hdrdir)/ruby/internal/intern/re.h
+nextafter.o: $(hdrdir)/ruby/internal/intern/ruby.h
+nextafter.o: $(hdrdir)/ruby/internal/intern/select.h
+nextafter.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+nextafter.o: $(hdrdir)/ruby/internal/intern/signal.h
+nextafter.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+nextafter.o: $(hdrdir)/ruby/internal/intern/string.h
+nextafter.o: $(hdrdir)/ruby/internal/intern/struct.h
+nextafter.o: $(hdrdir)/ruby/internal/intern/thread.h
+nextafter.o: $(hdrdir)/ruby/internal/intern/time.h
+nextafter.o: $(hdrdir)/ruby/internal/intern/variable.h
+nextafter.o: $(hdrdir)/ruby/internal/intern/vm.h
+nextafter.o: $(hdrdir)/ruby/internal/interpreter.h
+nextafter.o: $(hdrdir)/ruby/internal/iterator.h
+nextafter.o: $(hdrdir)/ruby/internal/memory.h
+nextafter.o: $(hdrdir)/ruby/internal/method.h
+nextafter.o: $(hdrdir)/ruby/internal/module.h
+nextafter.o: $(hdrdir)/ruby/internal/newobj.h
+nextafter.o: $(hdrdir)/ruby/internal/rgengc.h
+nextafter.o: $(hdrdir)/ruby/internal/scan_args.h
+nextafter.o: $(hdrdir)/ruby/internal/special_consts.h
+nextafter.o: $(hdrdir)/ruby/internal/static_assert.h
+nextafter.o: $(hdrdir)/ruby/internal/stdalign.h
+nextafter.o: $(hdrdir)/ruby/internal/stdbool.h
+nextafter.o: $(hdrdir)/ruby/internal/symbol.h
+nextafter.o: $(hdrdir)/ruby/internal/token_paste.h
+nextafter.o: $(hdrdir)/ruby/internal/value.h
+nextafter.o: $(hdrdir)/ruby/internal/value_type.h
+nextafter.o: $(hdrdir)/ruby/internal/variable.h
+nextafter.o: $(hdrdir)/ruby/internal/warning_push.h
+nextafter.o: $(hdrdir)/ruby/internal/xmalloc.h
+nextafter.o: $(hdrdir)/ruby/assert.h
+nextafter.o: $(hdrdir)/ruby/backward.h
+nextafter.o: $(hdrdir)/ruby/backward/2/assume.h
+nextafter.o: $(hdrdir)/ruby/backward/2/attributes.h
+nextafter.o: $(hdrdir)/ruby/backward/2/bool.h
+nextafter.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+nextafter.o: $(hdrdir)/ruby/backward/2/inttypes.h
+nextafter.o: $(hdrdir)/ruby/backward/2/limits.h
+nextafter.o: $(hdrdir)/ruby/backward/2/long_long.h
+nextafter.o: $(hdrdir)/ruby/backward/2/stdalign.h
+nextafter.o: $(hdrdir)/ruby/backward/2/stdarg.h
+nextafter.o: $(hdrdir)/ruby/defines.h
+nextafter.o: $(hdrdir)/ruby/intern.h
+nextafter.o: $(hdrdir)/ruby/missing.h
+nextafter.o: $(hdrdir)/ruby/ruby.h
+nextafter.o: $(hdrdir)/ruby/st.h
+nextafter.o: $(hdrdir)/ruby/subst.h
+nextafter.o: $(top_srcdir)/missing/nextafter.c
+nextafter.o: nextafter.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/funcall/depend b/ext/-test-/funcall/depend
new file mode 100644
index 0000000000..1fdf867fac
--- /dev/null
+++ b/ext/-test-/funcall/depend
@@ -0,0 +1,163 @@
+# AUTOGENERATED DEPENDENCIES START
+funcall.o: $(RUBY_EXTCONF_H)
+funcall.o: $(arch_hdrdir)/ruby/config.h
+funcall.o: $(hdrdir)/ruby.h
+funcall.o: $(hdrdir)/ruby/internal/anyargs.h
+funcall.o: $(hdrdir)/ruby/internal/arithmetic.h
+funcall.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+funcall.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+funcall.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+funcall.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+funcall.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+funcall.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+funcall.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+funcall.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+funcall.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+funcall.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+funcall.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+funcall.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+funcall.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+funcall.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+funcall.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+funcall.o: $(hdrdir)/ruby/internal/assume.h
+funcall.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+funcall.o: $(hdrdir)/ruby/internal/attr/artificial.h
+funcall.o: $(hdrdir)/ruby/internal/attr/cold.h
+funcall.o: $(hdrdir)/ruby/internal/attr/const.h
+funcall.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+funcall.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+funcall.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+funcall.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+funcall.o: $(hdrdir)/ruby/internal/attr/error.h
+funcall.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+funcall.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+funcall.o: $(hdrdir)/ruby/internal/attr/format.h
+funcall.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+funcall.o: $(hdrdir)/ruby/internal/attr/noalias.h
+funcall.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+funcall.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+funcall.o: $(hdrdir)/ruby/internal/attr/noinline.h
+funcall.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+funcall.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+funcall.o: $(hdrdir)/ruby/internal/attr/pure.h
+funcall.o: $(hdrdir)/ruby/internal/attr/restrict.h
+funcall.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+funcall.o: $(hdrdir)/ruby/internal/attr/warning.h
+funcall.o: $(hdrdir)/ruby/internal/attr/weakref.h
+funcall.o: $(hdrdir)/ruby/internal/cast.h
+funcall.o: $(hdrdir)/ruby/internal/compiler_is.h
+funcall.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+funcall.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+funcall.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+funcall.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+funcall.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+funcall.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+funcall.o: $(hdrdir)/ruby/internal/compiler_since.h
+funcall.o: $(hdrdir)/ruby/internal/config.h
+funcall.o: $(hdrdir)/ruby/internal/constant_p.h
+funcall.o: $(hdrdir)/ruby/internal/core.h
+funcall.o: $(hdrdir)/ruby/internal/core/rarray.h
+funcall.o: $(hdrdir)/ruby/internal/core/rbasic.h
+funcall.o: $(hdrdir)/ruby/internal/core/rbignum.h
+funcall.o: $(hdrdir)/ruby/internal/core/rclass.h
+funcall.o: $(hdrdir)/ruby/internal/core/rdata.h
+funcall.o: $(hdrdir)/ruby/internal/core/rfile.h
+funcall.o: $(hdrdir)/ruby/internal/core/rhash.h
+funcall.o: $(hdrdir)/ruby/internal/core/robject.h
+funcall.o: $(hdrdir)/ruby/internal/core/rregexp.h
+funcall.o: $(hdrdir)/ruby/internal/core/rstring.h
+funcall.o: $(hdrdir)/ruby/internal/core/rstruct.h
+funcall.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+funcall.o: $(hdrdir)/ruby/internal/ctype.h
+funcall.o: $(hdrdir)/ruby/internal/dllexport.h
+funcall.o: $(hdrdir)/ruby/internal/dosish.h
+funcall.o: $(hdrdir)/ruby/internal/error.h
+funcall.o: $(hdrdir)/ruby/internal/eval.h
+funcall.o: $(hdrdir)/ruby/internal/event.h
+funcall.o: $(hdrdir)/ruby/internal/fl_type.h
+funcall.o: $(hdrdir)/ruby/internal/gc.h
+funcall.o: $(hdrdir)/ruby/internal/glob.h
+funcall.o: $(hdrdir)/ruby/internal/globals.h
+funcall.o: $(hdrdir)/ruby/internal/has/attribute.h
+funcall.o: $(hdrdir)/ruby/internal/has/builtin.h
+funcall.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+funcall.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+funcall.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+funcall.o: $(hdrdir)/ruby/internal/has/extension.h
+funcall.o: $(hdrdir)/ruby/internal/has/feature.h
+funcall.o: $(hdrdir)/ruby/internal/has/warning.h
+funcall.o: $(hdrdir)/ruby/internal/intern/array.h
+funcall.o: $(hdrdir)/ruby/internal/intern/bignum.h
+funcall.o: $(hdrdir)/ruby/internal/intern/class.h
+funcall.o: $(hdrdir)/ruby/internal/intern/compar.h
+funcall.o: $(hdrdir)/ruby/internal/intern/complex.h
+funcall.o: $(hdrdir)/ruby/internal/intern/cont.h
+funcall.o: $(hdrdir)/ruby/internal/intern/dir.h
+funcall.o: $(hdrdir)/ruby/internal/intern/enum.h
+funcall.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+funcall.o: $(hdrdir)/ruby/internal/intern/error.h
+funcall.o: $(hdrdir)/ruby/internal/intern/eval.h
+funcall.o: $(hdrdir)/ruby/internal/intern/file.h
+funcall.o: $(hdrdir)/ruby/internal/intern/gc.h
+funcall.o: $(hdrdir)/ruby/internal/intern/hash.h
+funcall.o: $(hdrdir)/ruby/internal/intern/io.h
+funcall.o: $(hdrdir)/ruby/internal/intern/load.h
+funcall.o: $(hdrdir)/ruby/internal/intern/marshal.h
+funcall.o: $(hdrdir)/ruby/internal/intern/numeric.h
+funcall.o: $(hdrdir)/ruby/internal/intern/object.h
+funcall.o: $(hdrdir)/ruby/internal/intern/parse.h
+funcall.o: $(hdrdir)/ruby/internal/intern/proc.h
+funcall.o: $(hdrdir)/ruby/internal/intern/process.h
+funcall.o: $(hdrdir)/ruby/internal/intern/random.h
+funcall.o: $(hdrdir)/ruby/internal/intern/range.h
+funcall.o: $(hdrdir)/ruby/internal/intern/rational.h
+funcall.o: $(hdrdir)/ruby/internal/intern/re.h
+funcall.o: $(hdrdir)/ruby/internal/intern/ruby.h
+funcall.o: $(hdrdir)/ruby/internal/intern/select.h
+funcall.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+funcall.o: $(hdrdir)/ruby/internal/intern/signal.h
+funcall.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+funcall.o: $(hdrdir)/ruby/internal/intern/string.h
+funcall.o: $(hdrdir)/ruby/internal/intern/struct.h
+funcall.o: $(hdrdir)/ruby/internal/intern/thread.h
+funcall.o: $(hdrdir)/ruby/internal/intern/time.h
+funcall.o: $(hdrdir)/ruby/internal/intern/variable.h
+funcall.o: $(hdrdir)/ruby/internal/intern/vm.h
+funcall.o: $(hdrdir)/ruby/internal/interpreter.h
+funcall.o: $(hdrdir)/ruby/internal/iterator.h
+funcall.o: $(hdrdir)/ruby/internal/memory.h
+funcall.o: $(hdrdir)/ruby/internal/method.h
+funcall.o: $(hdrdir)/ruby/internal/module.h
+funcall.o: $(hdrdir)/ruby/internal/newobj.h
+funcall.o: $(hdrdir)/ruby/internal/rgengc.h
+funcall.o: $(hdrdir)/ruby/internal/scan_args.h
+funcall.o: $(hdrdir)/ruby/internal/special_consts.h
+funcall.o: $(hdrdir)/ruby/internal/static_assert.h
+funcall.o: $(hdrdir)/ruby/internal/stdalign.h
+funcall.o: $(hdrdir)/ruby/internal/stdbool.h
+funcall.o: $(hdrdir)/ruby/internal/symbol.h
+funcall.o: $(hdrdir)/ruby/internal/token_paste.h
+funcall.o: $(hdrdir)/ruby/internal/value.h
+funcall.o: $(hdrdir)/ruby/internal/value_type.h
+funcall.o: $(hdrdir)/ruby/internal/variable.h
+funcall.o: $(hdrdir)/ruby/internal/warning_push.h
+funcall.o: $(hdrdir)/ruby/internal/xmalloc.h
+funcall.o: $(hdrdir)/ruby/assert.h
+funcall.o: $(hdrdir)/ruby/backward.h
+funcall.o: $(hdrdir)/ruby/backward/2/assume.h
+funcall.o: $(hdrdir)/ruby/backward/2/attributes.h
+funcall.o: $(hdrdir)/ruby/backward/2/bool.h
+funcall.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+funcall.o: $(hdrdir)/ruby/backward/2/inttypes.h
+funcall.o: $(hdrdir)/ruby/backward/2/limits.h
+funcall.o: $(hdrdir)/ruby/backward/2/long_long.h
+funcall.o: $(hdrdir)/ruby/backward/2/stdalign.h
+funcall.o: $(hdrdir)/ruby/backward/2/stdarg.h
+funcall.o: $(hdrdir)/ruby/defines.h
+funcall.o: $(hdrdir)/ruby/intern.h
+funcall.o: $(hdrdir)/ruby/missing.h
+funcall.o: $(hdrdir)/ruby/ruby.h
+funcall.o: $(hdrdir)/ruby/st.h
+funcall.o: $(hdrdir)/ruby/subst.h
+funcall.o: funcall.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/funcall/funcall.c b/ext/-test-/funcall/funcall.c
new file mode 100644
index 0000000000..43521bf2e9
--- /dev/null
+++ b/ext/-test-/funcall/funcall.c
@@ -0,0 +1,72 @@
+#include "ruby.h"
+
+static VALUE
+with_funcall2(int argc, VALUE *argv, VALUE self)
+{
+    return rb_funcallv(self, rb_intern("target"), argc, argv);
+}
+
+static VALUE
+with_funcall_passing_block(int argc, VALUE *argv, VALUE self)
+{
+    return rb_funcall_passing_block(self, rb_intern("target"), argc, argv);
+}
+
+static VALUE
+with_funcall_passing_block_kw(int argc, VALUE *argv, VALUE self)
+{
+    return rb_funcall_passing_block_kw(self, rb_intern("target"), argc-1, argv+1, FIX2INT(argv[0]));
+}
+
+static VALUE
+with_funcallv_public_kw(int argc, VALUE *argv, VALUE self)
+{
+    return rb_funcallv_public_kw(argv[0], SYM2ID(argv[1]), argc-3, argv+3, FIX2INT(argv[2]));
+}
+
+static VALUE
+with_yield_splat_kw(int argc, VALUE *argv, VALUE self)
+{
+    return rb_yield_splat_kw(argv[1], FIX2INT(argv[0]));
+}
+
+static VALUE
+extra_args_name(VALUE self)
+{
+    /*
+     * at least clang 5.x gets tripped by the extra 0 arg
+     * [ruby-core:85266] [Bug #14425]
+     */
+    return rb_funcall(self, rb_intern("name"), 0, 0);
+}
+
+void
+Init_funcall(void)
+{
+    VALUE cTestFuncall = rb_path2class("TestFuncall");
+    VALUE cRelay = rb_define_module_under(cTestFuncall, "Relay");
+
+    rb_define_singleton_method(cRelay,
+			       "with_funcall2",
+			       with_funcall2,
+			       -1);
+    rb_define_singleton_method(cRelay,
+                               "with_funcall_passing_block_kw",
+                               with_funcall_passing_block_kw,
+                               -1);
+    rb_define_singleton_method(cRelay,
+			       "with_funcall_passing_block",
+			       with_funcall_passing_block,
+			       -1);
+    rb_define_singleton_method(cRelay,
+                               "with_funcallv_public_kw",
+                               with_funcallv_public_kw,
+                               -1);
+    rb_define_singleton_method(cRelay,
+                               "with_yield_splat_kw",
+                               with_yield_splat_kw,
+                               -1);
+    rb_define_singleton_method(cTestFuncall, "extra_args_name",
+                                extra_args_name,
+                                0);
+}
diff --git a/ext/-test-/funcall/passing_block.c b/ext/-test-/funcall/passing_block.c
deleted file mode 100644
index 0200f80369..0000000000
--- a/ext/-test-/funcall/passing_block.c
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "ruby.h"
-
-VALUE rb_funcall_passing_block(VALUE, ID, int, const VALUE*);
-
-static VALUE
-with_funcall2(int argc, VALUE *argv, VALUE self)
-{
-    return rb_funcall2(self, rb_intern("target"), argc, argv);
-}
-
-static VALUE
-with_funcall_passing_block(int argc, VALUE *argv, VALUE self)
-{
-    return rb_funcall_passing_block(self, rb_intern("target"), argc, argv);
-}
-
-void
-Init_funcall(void)
-{
-    VALUE cRelay = rb_path2class("TestFuncall::Relay");
-
-    rb_define_singleton_method(cRelay,
-			       "with_funcall2",
-			       with_funcall2,
-			       -1);
-    rb_define_singleton_method(cRelay,
-			       "with_funcall_passing_block",
-			       with_funcall_passing_block,
-			       -1);
-}
diff --git a/ext/-test-/gvl/call_without_gvl/call_without_gvl.c b/ext/-test-/gvl/call_without_gvl/call_without_gvl.c
index f3071d5768..d77c2f323e 100644
--- a/ext/-test-/gvl/call_without_gvl/call_without_gvl.c
+++ b/ext/-test-/gvl/call_without_gvl/call_without_gvl.c
@@ -27,8 +27,50 @@ thread_runnable_sleep(VALUE thread, VALUE timeout)
     return thread;
 }
 
+struct loop_ctl {
+    int notify_fd;
+    volatile int stop;
+};
+
+static void *
+do_loop(void *p)
+{
+    struct loop_ctl *ctl = p;
+
+    /* tell the waiting process they can interrupt us, now */
+    ssize_t err = write(ctl->notify_fd, "", 1);
+    if (err == -1) rb_bug("write error");
+
+    while (!ctl->stop) {
+        struct timeval tv = { 0, 10000 };
+        select(0, NULL, NULL, NULL, &tv);
+    }
+    return 0;
+}
+
+static void
+stop_set(void *p)
+{
+    struct loop_ctl *ctl = p;
+
+    ctl->stop = 1;
+}
+
+static VALUE
+thread_ubf_async_safe(VALUE thread, VALUE notify_fd)
+{
+    struct loop_ctl ctl;
+
+    ctl.notify_fd = NUM2INT(notify_fd);
+    ctl.stop = 0;
+
+    rb_nogvl(do_loop, &ctl, stop_set, &ctl, RB_NOGVL_UBF_ASYNC_SAFE);
+    return thread;
+}
+
 void
 Init_call_without_gvl(void)
 {
     rb_define_method(rb_cThread, "__runnable_sleep__", thread_runnable_sleep, 1);
+    rb_define_method(rb_cThread, "__ubf_async_safe__", thread_ubf_async_safe, 1);
 }
diff --git a/ext/-test-/gvl/call_without_gvl/depend b/ext/-test-/gvl/call_without_gvl/depend
new file mode 100644
index 0000000000..8b606d2eb4
--- /dev/null
+++ b/ext/-test-/gvl/call_without_gvl/depend
@@ -0,0 +1,163 @@
+# AUTOGENERATED DEPENDENCIES START
+call_without_gvl.o: $(RUBY_EXTCONF_H)
+call_without_gvl.o: $(arch_hdrdir)/ruby/config.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/anyargs.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/arithmetic.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/assume.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/attr/artificial.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/attr/cold.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/attr/const.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/attr/error.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/attr/format.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/attr/noalias.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/attr/noinline.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/attr/pure.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/attr/restrict.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/attr/warning.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/attr/weakref.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/cast.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/compiler_is.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/compiler_since.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/config.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/constant_p.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/core.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/core/rarray.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/core/rbasic.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/core/rbignum.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/core/rclass.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/core/rdata.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/core/rfile.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/core/rhash.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/core/robject.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/core/rregexp.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/core/rstring.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/core/rstruct.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/ctype.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/dllexport.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/dosish.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/error.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/eval.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/event.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/fl_type.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/gc.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/glob.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/globals.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/has/attribute.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/has/builtin.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/has/extension.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/has/feature.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/has/warning.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/intern/array.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/intern/bignum.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/intern/class.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/intern/compar.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/intern/complex.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/intern/cont.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/intern/dir.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/intern/enum.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/intern/error.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/intern/eval.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/intern/file.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/intern/gc.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/intern/hash.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/intern/io.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/intern/load.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/intern/marshal.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/intern/numeric.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/intern/object.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/intern/parse.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/intern/proc.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/intern/process.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/intern/random.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/intern/range.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/intern/rational.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/intern/re.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/intern/ruby.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/intern/select.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/intern/signal.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/intern/string.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/intern/struct.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/intern/thread.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/intern/time.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/intern/variable.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/intern/vm.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/interpreter.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/iterator.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/memory.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/method.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/module.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/newobj.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/rgengc.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/scan_args.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/special_consts.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/static_assert.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/stdalign.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/stdbool.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/symbol.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/token_paste.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/value.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/value_type.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/variable.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/warning_push.h
+call_without_gvl.o: $(hdrdir)/ruby/internal/xmalloc.h
+call_without_gvl.o: $(hdrdir)/ruby/assert.h
+call_without_gvl.o: $(hdrdir)/ruby/backward.h
+call_without_gvl.o: $(hdrdir)/ruby/backward/2/assume.h
+call_without_gvl.o: $(hdrdir)/ruby/backward/2/attributes.h
+call_without_gvl.o: $(hdrdir)/ruby/backward/2/bool.h
+call_without_gvl.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+call_without_gvl.o: $(hdrdir)/ruby/backward/2/inttypes.h
+call_without_gvl.o: $(hdrdir)/ruby/backward/2/limits.h
+call_without_gvl.o: $(hdrdir)/ruby/backward/2/long_long.h
+call_without_gvl.o: $(hdrdir)/ruby/backward/2/stdalign.h
+call_without_gvl.o: $(hdrdir)/ruby/backward/2/stdarg.h
+call_without_gvl.o: $(hdrdir)/ruby/defines.h
+call_without_gvl.o: $(hdrdir)/ruby/intern.h
+call_without_gvl.o: $(hdrdir)/ruby/missing.h
+call_without_gvl.o: $(hdrdir)/ruby/ruby.h
+call_without_gvl.o: $(hdrdir)/ruby/st.h
+call_without_gvl.o: $(hdrdir)/ruby/subst.h
+call_without_gvl.o: $(hdrdir)/ruby/thread.h
+call_without_gvl.o: call_without_gvl.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/hash/depend b/ext/-test-/hash/depend
new file mode 100644
index 0000000000..f4ea9ae5c3
--- /dev/null
+++ b/ext/-test-/hash/depend
@@ -0,0 +1,324 @@
+# AUTOGENERATED DEPENDENCIES START
+delete.o: $(RUBY_EXTCONF_H)
+delete.o: $(arch_hdrdir)/ruby/config.h
+delete.o: $(hdrdir)/ruby.h
+delete.o: $(hdrdir)/ruby/internal/anyargs.h
+delete.o: $(hdrdir)/ruby/internal/arithmetic.h
+delete.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+delete.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+delete.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+delete.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+delete.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+delete.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+delete.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+delete.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+delete.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+delete.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+delete.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+delete.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+delete.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+delete.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+delete.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+delete.o: $(hdrdir)/ruby/internal/assume.h
+delete.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+delete.o: $(hdrdir)/ruby/internal/attr/artificial.h
+delete.o: $(hdrdir)/ruby/internal/attr/cold.h
+delete.o: $(hdrdir)/ruby/internal/attr/const.h
+delete.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+delete.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+delete.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+delete.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+delete.o: $(hdrdir)/ruby/internal/attr/error.h
+delete.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+delete.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+delete.o: $(hdrdir)/ruby/internal/attr/format.h
+delete.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+delete.o: $(hdrdir)/ruby/internal/attr/noalias.h
+delete.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+delete.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+delete.o: $(hdrdir)/ruby/internal/attr/noinline.h
+delete.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+delete.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+delete.o: $(hdrdir)/ruby/internal/attr/pure.h
+delete.o: $(hdrdir)/ruby/internal/attr/restrict.h
+delete.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+delete.o: $(hdrdir)/ruby/internal/attr/warning.h
+delete.o: $(hdrdir)/ruby/internal/attr/weakref.h
+delete.o: $(hdrdir)/ruby/internal/cast.h
+delete.o: $(hdrdir)/ruby/internal/compiler_is.h
+delete.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+delete.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+delete.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+delete.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+delete.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+delete.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+delete.o: $(hdrdir)/ruby/internal/compiler_since.h
+delete.o: $(hdrdir)/ruby/internal/config.h
+delete.o: $(hdrdir)/ruby/internal/constant_p.h
+delete.o: $(hdrdir)/ruby/internal/core.h
+delete.o: $(hdrdir)/ruby/internal/core/rarray.h
+delete.o: $(hdrdir)/ruby/internal/core/rbasic.h
+delete.o: $(hdrdir)/ruby/internal/core/rbignum.h
+delete.o: $(hdrdir)/ruby/internal/core/rclass.h
+delete.o: $(hdrdir)/ruby/internal/core/rdata.h
+delete.o: $(hdrdir)/ruby/internal/core/rfile.h
+delete.o: $(hdrdir)/ruby/internal/core/rhash.h
+delete.o: $(hdrdir)/ruby/internal/core/robject.h
+delete.o: $(hdrdir)/ruby/internal/core/rregexp.h
+delete.o: $(hdrdir)/ruby/internal/core/rstring.h
+delete.o: $(hdrdir)/ruby/internal/core/rstruct.h
+delete.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+delete.o: $(hdrdir)/ruby/internal/ctype.h
+delete.o: $(hdrdir)/ruby/internal/dllexport.h
+delete.o: $(hdrdir)/ruby/internal/dosish.h
+delete.o: $(hdrdir)/ruby/internal/error.h
+delete.o: $(hdrdir)/ruby/internal/eval.h
+delete.o: $(hdrdir)/ruby/internal/event.h
+delete.o: $(hdrdir)/ruby/internal/fl_type.h
+delete.o: $(hdrdir)/ruby/internal/gc.h
+delete.o: $(hdrdir)/ruby/internal/glob.h
+delete.o: $(hdrdir)/ruby/internal/globals.h
+delete.o: $(hdrdir)/ruby/internal/has/attribute.h
+delete.o: $(hdrdir)/ruby/internal/has/builtin.h
+delete.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+delete.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+delete.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+delete.o: $(hdrdir)/ruby/internal/has/extension.h
+delete.o: $(hdrdir)/ruby/internal/has/feature.h
+delete.o: $(hdrdir)/ruby/internal/has/warning.h
+delete.o: $(hdrdir)/ruby/internal/intern/array.h
+delete.o: $(hdrdir)/ruby/internal/intern/bignum.h
+delete.o: $(hdrdir)/ruby/internal/intern/class.h
+delete.o: $(hdrdir)/ruby/internal/intern/compar.h
+delete.o: $(hdrdir)/ruby/internal/intern/complex.h
+delete.o: $(hdrdir)/ruby/internal/intern/cont.h
+delete.o: $(hdrdir)/ruby/internal/intern/dir.h
+delete.o: $(hdrdir)/ruby/internal/intern/enum.h
+delete.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+delete.o: $(hdrdir)/ruby/internal/intern/error.h
+delete.o: $(hdrdir)/ruby/internal/intern/eval.h
+delete.o: $(hdrdir)/ruby/internal/intern/file.h
+delete.o: $(hdrdir)/ruby/internal/intern/gc.h
+delete.o: $(hdrdir)/ruby/internal/intern/hash.h
+delete.o: $(hdrdir)/ruby/internal/intern/io.h
+delete.o: $(hdrdir)/ruby/internal/intern/load.h
+delete.o: $(hdrdir)/ruby/internal/intern/marshal.h
+delete.o: $(hdrdir)/ruby/internal/intern/numeric.h
+delete.o: $(hdrdir)/ruby/internal/intern/object.h
+delete.o: $(hdrdir)/ruby/internal/intern/parse.h
+delete.o: $(hdrdir)/ruby/internal/intern/proc.h
+delete.o: $(hdrdir)/ruby/internal/intern/process.h
+delete.o: $(hdrdir)/ruby/internal/intern/random.h
+delete.o: $(hdrdir)/ruby/internal/intern/range.h
+delete.o: $(hdrdir)/ruby/internal/intern/rational.h
+delete.o: $(hdrdir)/ruby/internal/intern/re.h
+delete.o: $(hdrdir)/ruby/internal/intern/ruby.h
+delete.o: $(hdrdir)/ruby/internal/intern/select.h
+delete.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+delete.o: $(hdrdir)/ruby/internal/intern/signal.h
+delete.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+delete.o: $(hdrdir)/ruby/internal/intern/string.h
+delete.o: $(hdrdir)/ruby/internal/intern/struct.h
+delete.o: $(hdrdir)/ruby/internal/intern/thread.h
+delete.o: $(hdrdir)/ruby/internal/intern/time.h
+delete.o: $(hdrdir)/ruby/internal/intern/variable.h
+delete.o: $(hdrdir)/ruby/internal/intern/vm.h
+delete.o: $(hdrdir)/ruby/internal/interpreter.h
+delete.o: $(hdrdir)/ruby/internal/iterator.h
+delete.o: $(hdrdir)/ruby/internal/memory.h
+delete.o: $(hdrdir)/ruby/internal/method.h
+delete.o: $(hdrdir)/ruby/internal/module.h
+delete.o: $(hdrdir)/ruby/internal/newobj.h
+delete.o: $(hdrdir)/ruby/internal/rgengc.h
+delete.o: $(hdrdir)/ruby/internal/scan_args.h
+delete.o: $(hdrdir)/ruby/internal/special_consts.h
+delete.o: $(hdrdir)/ruby/internal/static_assert.h
+delete.o: $(hdrdir)/ruby/internal/stdalign.h
+delete.o: $(hdrdir)/ruby/internal/stdbool.h
+delete.o: $(hdrdir)/ruby/internal/symbol.h
+delete.o: $(hdrdir)/ruby/internal/token_paste.h
+delete.o: $(hdrdir)/ruby/internal/value.h
+delete.o: $(hdrdir)/ruby/internal/value_type.h
+delete.o: $(hdrdir)/ruby/internal/variable.h
+delete.o: $(hdrdir)/ruby/internal/warning_push.h
+delete.o: $(hdrdir)/ruby/internal/xmalloc.h
+delete.o: $(hdrdir)/ruby/assert.h
+delete.o: $(hdrdir)/ruby/backward.h
+delete.o: $(hdrdir)/ruby/backward/2/assume.h
+delete.o: $(hdrdir)/ruby/backward/2/attributes.h
+delete.o: $(hdrdir)/ruby/backward/2/bool.h
+delete.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+delete.o: $(hdrdir)/ruby/backward/2/inttypes.h
+delete.o: $(hdrdir)/ruby/backward/2/limits.h
+delete.o: $(hdrdir)/ruby/backward/2/long_long.h
+delete.o: $(hdrdir)/ruby/backward/2/stdalign.h
+delete.o: $(hdrdir)/ruby/backward/2/stdarg.h
+delete.o: $(hdrdir)/ruby/defines.h
+delete.o: $(hdrdir)/ruby/intern.h
+delete.o: $(hdrdir)/ruby/missing.h
+delete.o: $(hdrdir)/ruby/ruby.h
+delete.o: $(hdrdir)/ruby/st.h
+delete.o: $(hdrdir)/ruby/subst.h
+delete.o: delete.c
+init.o: $(RUBY_EXTCONF_H)
+init.o: $(arch_hdrdir)/ruby/config.h
+init.o: $(hdrdir)/ruby.h
+init.o: $(hdrdir)/ruby/internal/anyargs.h
+init.o: $(hdrdir)/ruby/internal/arithmetic.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+init.o: $(hdrdir)/ruby/internal/assume.h
+init.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+init.o: $(hdrdir)/ruby/internal/attr/artificial.h
+init.o: $(hdrdir)/ruby/internal/attr/cold.h
+init.o: $(hdrdir)/ruby/internal/attr/const.h
+init.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+init.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+init.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+init.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+init.o: $(hdrdir)/ruby/internal/attr/error.h
+init.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+init.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+init.o: $(hdrdir)/ruby/internal/attr/format.h
+init.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+init.o: $(hdrdir)/ruby/internal/attr/noalias.h
+init.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+init.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+init.o: $(hdrdir)/ruby/internal/attr/noinline.h
+init.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+init.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+init.o: $(hdrdir)/ruby/internal/attr/pure.h
+init.o: $(hdrdir)/ruby/internal/attr/restrict.h
+init.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+init.o: $(hdrdir)/ruby/internal/attr/warning.h
+init.o: $(hdrdir)/ruby/internal/attr/weakref.h
+init.o: $(hdrdir)/ruby/internal/cast.h
+init.o: $(hdrdir)/ruby/internal/compiler_is.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+init.o: $(hdrdir)/ruby/internal/compiler_since.h
+init.o: $(hdrdir)/ruby/internal/config.h
+init.o: $(hdrdir)/ruby/internal/constant_p.h
+init.o: $(hdrdir)/ruby/internal/core.h
+init.o: $(hdrdir)/ruby/internal/core/rarray.h
+init.o: $(hdrdir)/ruby/internal/core/rbasic.h
+init.o: $(hdrdir)/ruby/internal/core/rbignum.h
+init.o: $(hdrdir)/ruby/internal/core/rclass.h
+init.o: $(hdrdir)/ruby/internal/core/rdata.h
+init.o: $(hdrdir)/ruby/internal/core/rfile.h
+init.o: $(hdrdir)/ruby/internal/core/rhash.h
+init.o: $(hdrdir)/ruby/internal/core/robject.h
+init.o: $(hdrdir)/ruby/internal/core/rregexp.h
+init.o: $(hdrdir)/ruby/internal/core/rstring.h
+init.o: $(hdrdir)/ruby/internal/core/rstruct.h
+init.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+init.o: $(hdrdir)/ruby/internal/ctype.h
+init.o: $(hdrdir)/ruby/internal/dllexport.h
+init.o: $(hdrdir)/ruby/internal/dosish.h
+init.o: $(hdrdir)/ruby/internal/error.h
+init.o: $(hdrdir)/ruby/internal/eval.h
+init.o: $(hdrdir)/ruby/internal/event.h
+init.o: $(hdrdir)/ruby/internal/fl_type.h
+init.o: $(hdrdir)/ruby/internal/gc.h
+init.o: $(hdrdir)/ruby/internal/glob.h
+init.o: $(hdrdir)/ruby/internal/globals.h
+init.o: $(hdrdir)/ruby/internal/has/attribute.h
+init.o: $(hdrdir)/ruby/internal/has/builtin.h
+init.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/extension.h
+init.o: $(hdrdir)/ruby/internal/has/feature.h
+init.o: $(hdrdir)/ruby/internal/has/warning.h
+init.o: $(hdrdir)/ruby/internal/intern/array.h
+init.o: $(hdrdir)/ruby/internal/intern/bignum.h
+init.o: $(hdrdir)/ruby/internal/intern/class.h
+init.o: $(hdrdir)/ruby/internal/intern/compar.h
+init.o: $(hdrdir)/ruby/internal/intern/complex.h
+init.o: $(hdrdir)/ruby/internal/intern/cont.h
+init.o: $(hdrdir)/ruby/internal/intern/dir.h
+init.o: $(hdrdir)/ruby/internal/intern/enum.h
+init.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+init.o: $(hdrdir)/ruby/internal/intern/error.h
+init.o: $(hdrdir)/ruby/internal/intern/eval.h
+init.o: $(hdrdir)/ruby/internal/intern/file.h
+init.o: $(hdrdir)/ruby/internal/intern/gc.h
+init.o: $(hdrdir)/ruby/internal/intern/hash.h
+init.o: $(hdrdir)/ruby/internal/intern/io.h
+init.o: $(hdrdir)/ruby/internal/intern/load.h
+init.o: $(hdrdir)/ruby/internal/intern/marshal.h
+init.o: $(hdrdir)/ruby/internal/intern/numeric.h
+init.o: $(hdrdir)/ruby/internal/intern/object.h
+init.o: $(hdrdir)/ruby/internal/intern/parse.h
+init.o: $(hdrdir)/ruby/internal/intern/proc.h
+init.o: $(hdrdir)/ruby/internal/intern/process.h
+init.o: $(hdrdir)/ruby/internal/intern/random.h
+init.o: $(hdrdir)/ruby/internal/intern/range.h
+init.o: $(hdrdir)/ruby/internal/intern/rational.h
+init.o: $(hdrdir)/ruby/internal/intern/re.h
+init.o: $(hdrdir)/ruby/internal/intern/ruby.h
+init.o: $(hdrdir)/ruby/internal/intern/select.h
+init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+init.o: $(hdrdir)/ruby/internal/intern/signal.h
+init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+init.o: $(hdrdir)/ruby/internal/intern/string.h
+init.o: $(hdrdir)/ruby/internal/intern/struct.h
+init.o: $(hdrdir)/ruby/internal/intern/thread.h
+init.o: $(hdrdir)/ruby/internal/intern/time.h
+init.o: $(hdrdir)/ruby/internal/intern/variable.h
+init.o: $(hdrdir)/ruby/internal/intern/vm.h
+init.o: $(hdrdir)/ruby/internal/interpreter.h
+init.o: $(hdrdir)/ruby/internal/iterator.h
+init.o: $(hdrdir)/ruby/internal/memory.h
+init.o: $(hdrdir)/ruby/internal/method.h
+init.o: $(hdrdir)/ruby/internal/module.h
+init.o: $(hdrdir)/ruby/internal/newobj.h
+init.o: $(hdrdir)/ruby/internal/rgengc.h
+init.o: $(hdrdir)/ruby/internal/scan_args.h
+init.o: $(hdrdir)/ruby/internal/special_consts.h
+init.o: $(hdrdir)/ruby/internal/static_assert.h
+init.o: $(hdrdir)/ruby/internal/stdalign.h
+init.o: $(hdrdir)/ruby/internal/stdbool.h
+init.o: $(hdrdir)/ruby/internal/symbol.h
+init.o: $(hdrdir)/ruby/internal/token_paste.h
+init.o: $(hdrdir)/ruby/internal/value.h
+init.o: $(hdrdir)/ruby/internal/value_type.h
+init.o: $(hdrdir)/ruby/internal/variable.h
+init.o: $(hdrdir)/ruby/internal/warning_push.h
+init.o: $(hdrdir)/ruby/internal/xmalloc.h
+init.o: $(hdrdir)/ruby/assert.h
+init.o: $(hdrdir)/ruby/backward.h
+init.o: $(hdrdir)/ruby/backward/2/assume.h
+init.o: $(hdrdir)/ruby/backward/2/attributes.h
+init.o: $(hdrdir)/ruby/backward/2/bool.h
+init.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+init.o: $(hdrdir)/ruby/backward/2/inttypes.h
+init.o: $(hdrdir)/ruby/backward/2/limits.h
+init.o: $(hdrdir)/ruby/backward/2/long_long.h
+init.o: $(hdrdir)/ruby/backward/2/stdalign.h
+init.o: $(hdrdir)/ruby/backward/2/stdarg.h
+init.o: $(hdrdir)/ruby/defines.h
+init.o: $(hdrdir)/ruby/intern.h
+init.o: $(hdrdir)/ruby/missing.h
+init.o: $(hdrdir)/ruby/ruby.h
+init.o: $(hdrdir)/ruby/st.h
+init.o: $(hdrdir)/ruby/subst.h
+init.o: init.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/integer/core_ext.c b/ext/-test-/integer/core_ext.c
index 6d64cdb0c2..2062fa3afa 100644
--- a/ext/-test-/integer/core_ext.c
+++ b/ext/-test-/integer/core_ext.c
@@ -1,4 +1,4 @@
-#include "internal.h"
+#include "internal/numeric.h"
 
 static VALUE
 int_bignum_p(VALUE self)
@@ -20,10 +20,17 @@ rb_int_to_bignum(VALUE x)
     return x;
 }
 
+static VALUE
+positive_pow(VALUE x, VALUE y)
+{
+    return rb_int_positive_pow(NUM2LONG(x), NUM2ULONG(y));
+}
+
 void
 Init_core_ext(VALUE klass)
 {
     rb_define_method(rb_cInteger, "bignum?", int_bignum_p, 0);
     rb_define_method(rb_cInteger, "fixnum?", int_fixnum_p, 0);
     rb_define_method(rb_cInteger, "to_bignum", rb_int_to_bignum, 0);
+    rb_define_method(rb_cInteger, "positive_pow", positive_pow, 1);
 }
diff --git a/ext/-test-/integer/depend b/ext/-test-/integer/depend
new file mode 100644
index 0000000000..c68651d07c
--- /dev/null
+++ b/ext/-test-/integer/depend
@@ -0,0 +1,494 @@
+# AUTOGENERATED DEPENDENCIES START
+core_ext.o: $(RUBY_EXTCONF_H)
+core_ext.o: $(arch_hdrdir)/ruby/config.h
+core_ext.o: $(hdrdir)/ruby.h
+core_ext.o: $(hdrdir)/ruby/internal/anyargs.h
+core_ext.o: $(hdrdir)/ruby/internal/arithmetic.h
+core_ext.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+core_ext.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+core_ext.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+core_ext.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+core_ext.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+core_ext.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+core_ext.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+core_ext.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+core_ext.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+core_ext.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+core_ext.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+core_ext.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+core_ext.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+core_ext.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+core_ext.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+core_ext.o: $(hdrdir)/ruby/internal/assume.h
+core_ext.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+core_ext.o: $(hdrdir)/ruby/internal/attr/artificial.h
+core_ext.o: $(hdrdir)/ruby/internal/attr/cold.h
+core_ext.o: $(hdrdir)/ruby/internal/attr/const.h
+core_ext.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+core_ext.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+core_ext.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+core_ext.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+core_ext.o: $(hdrdir)/ruby/internal/attr/error.h
+core_ext.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+core_ext.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+core_ext.o: $(hdrdir)/ruby/internal/attr/format.h
+core_ext.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+core_ext.o: $(hdrdir)/ruby/internal/attr/noalias.h
+core_ext.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+core_ext.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+core_ext.o: $(hdrdir)/ruby/internal/attr/noinline.h
+core_ext.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+core_ext.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+core_ext.o: $(hdrdir)/ruby/internal/attr/pure.h
+core_ext.o: $(hdrdir)/ruby/internal/attr/restrict.h
+core_ext.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+core_ext.o: $(hdrdir)/ruby/internal/attr/warning.h
+core_ext.o: $(hdrdir)/ruby/internal/attr/weakref.h
+core_ext.o: $(hdrdir)/ruby/internal/cast.h
+core_ext.o: $(hdrdir)/ruby/internal/compiler_is.h
+core_ext.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+core_ext.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+core_ext.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+core_ext.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+core_ext.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+core_ext.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+core_ext.o: $(hdrdir)/ruby/internal/compiler_since.h
+core_ext.o: $(hdrdir)/ruby/internal/config.h
+core_ext.o: $(hdrdir)/ruby/internal/constant_p.h
+core_ext.o: $(hdrdir)/ruby/internal/core.h
+core_ext.o: $(hdrdir)/ruby/internal/core/rarray.h
+core_ext.o: $(hdrdir)/ruby/internal/core/rbasic.h
+core_ext.o: $(hdrdir)/ruby/internal/core/rbignum.h
+core_ext.o: $(hdrdir)/ruby/internal/core/rclass.h
+core_ext.o: $(hdrdir)/ruby/internal/core/rdata.h
+core_ext.o: $(hdrdir)/ruby/internal/core/rfile.h
+core_ext.o: $(hdrdir)/ruby/internal/core/rhash.h
+core_ext.o: $(hdrdir)/ruby/internal/core/robject.h
+core_ext.o: $(hdrdir)/ruby/internal/core/rregexp.h
+core_ext.o: $(hdrdir)/ruby/internal/core/rstring.h
+core_ext.o: $(hdrdir)/ruby/internal/core/rstruct.h
+core_ext.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+core_ext.o: $(hdrdir)/ruby/internal/ctype.h
+core_ext.o: $(hdrdir)/ruby/internal/dllexport.h
+core_ext.o: $(hdrdir)/ruby/internal/dosish.h
+core_ext.o: $(hdrdir)/ruby/internal/error.h
+core_ext.o: $(hdrdir)/ruby/internal/eval.h
+core_ext.o: $(hdrdir)/ruby/internal/event.h
+core_ext.o: $(hdrdir)/ruby/internal/fl_type.h
+core_ext.o: $(hdrdir)/ruby/internal/gc.h
+core_ext.o: $(hdrdir)/ruby/internal/glob.h
+core_ext.o: $(hdrdir)/ruby/internal/globals.h
+core_ext.o: $(hdrdir)/ruby/internal/has/attribute.h
+core_ext.o: $(hdrdir)/ruby/internal/has/builtin.h
+core_ext.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+core_ext.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+core_ext.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+core_ext.o: $(hdrdir)/ruby/internal/has/extension.h
+core_ext.o: $(hdrdir)/ruby/internal/has/feature.h
+core_ext.o: $(hdrdir)/ruby/internal/has/warning.h
+core_ext.o: $(hdrdir)/ruby/internal/intern/array.h
+core_ext.o: $(hdrdir)/ruby/internal/intern/bignum.h
+core_ext.o: $(hdrdir)/ruby/internal/intern/class.h
+core_ext.o: $(hdrdir)/ruby/internal/intern/compar.h
+core_ext.o: $(hdrdir)/ruby/internal/intern/complex.h
+core_ext.o: $(hdrdir)/ruby/internal/intern/cont.h
+core_ext.o: $(hdrdir)/ruby/internal/intern/dir.h
+core_ext.o: $(hdrdir)/ruby/internal/intern/enum.h
+core_ext.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+core_ext.o: $(hdrdir)/ruby/internal/intern/error.h
+core_ext.o: $(hdrdir)/ruby/internal/intern/eval.h
+core_ext.o: $(hdrdir)/ruby/internal/intern/file.h
+core_ext.o: $(hdrdir)/ruby/internal/intern/gc.h
+core_ext.o: $(hdrdir)/ruby/internal/intern/hash.h
+core_ext.o: $(hdrdir)/ruby/internal/intern/io.h
+core_ext.o: $(hdrdir)/ruby/internal/intern/load.h
+core_ext.o: $(hdrdir)/ruby/internal/intern/marshal.h
+core_ext.o: $(hdrdir)/ruby/internal/intern/numeric.h
+core_ext.o: $(hdrdir)/ruby/internal/intern/object.h
+core_ext.o: $(hdrdir)/ruby/internal/intern/parse.h
+core_ext.o: $(hdrdir)/ruby/internal/intern/proc.h
+core_ext.o: $(hdrdir)/ruby/internal/intern/process.h
+core_ext.o: $(hdrdir)/ruby/internal/intern/random.h
+core_ext.o: $(hdrdir)/ruby/internal/intern/range.h
+core_ext.o: $(hdrdir)/ruby/internal/intern/rational.h
+core_ext.o: $(hdrdir)/ruby/internal/intern/re.h
+core_ext.o: $(hdrdir)/ruby/internal/intern/ruby.h
+core_ext.o: $(hdrdir)/ruby/internal/intern/select.h
+core_ext.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+core_ext.o: $(hdrdir)/ruby/internal/intern/signal.h
+core_ext.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+core_ext.o: $(hdrdir)/ruby/internal/intern/string.h
+core_ext.o: $(hdrdir)/ruby/internal/intern/struct.h
+core_ext.o: $(hdrdir)/ruby/internal/intern/thread.h
+core_ext.o: $(hdrdir)/ruby/internal/intern/time.h
+core_ext.o: $(hdrdir)/ruby/internal/intern/variable.h
+core_ext.o: $(hdrdir)/ruby/internal/intern/vm.h
+core_ext.o: $(hdrdir)/ruby/internal/interpreter.h
+core_ext.o: $(hdrdir)/ruby/internal/iterator.h
+core_ext.o: $(hdrdir)/ruby/internal/memory.h
+core_ext.o: $(hdrdir)/ruby/internal/method.h
+core_ext.o: $(hdrdir)/ruby/internal/module.h
+core_ext.o: $(hdrdir)/ruby/internal/newobj.h
+core_ext.o: $(hdrdir)/ruby/internal/rgengc.h
+core_ext.o: $(hdrdir)/ruby/internal/scan_args.h
+core_ext.o: $(hdrdir)/ruby/internal/special_consts.h
+core_ext.o: $(hdrdir)/ruby/internal/static_assert.h
+core_ext.o: $(hdrdir)/ruby/internal/stdalign.h
+core_ext.o: $(hdrdir)/ruby/internal/stdbool.h
+core_ext.o: $(hdrdir)/ruby/internal/symbol.h
+core_ext.o: $(hdrdir)/ruby/internal/token_paste.h
+core_ext.o: $(hdrdir)/ruby/internal/value.h
+core_ext.o: $(hdrdir)/ruby/internal/value_type.h
+core_ext.o: $(hdrdir)/ruby/internal/variable.h
+core_ext.o: $(hdrdir)/ruby/internal/warning_push.h
+core_ext.o: $(hdrdir)/ruby/internal/xmalloc.h
+core_ext.o: $(hdrdir)/ruby/assert.h
+core_ext.o: $(hdrdir)/ruby/backward.h
+core_ext.o: $(hdrdir)/ruby/backward/2/assume.h
+core_ext.o: $(hdrdir)/ruby/backward/2/attributes.h
+core_ext.o: $(hdrdir)/ruby/backward/2/bool.h
+core_ext.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+core_ext.o: $(hdrdir)/ruby/backward/2/inttypes.h
+core_ext.o: $(hdrdir)/ruby/backward/2/limits.h
+core_ext.o: $(hdrdir)/ruby/backward/2/long_long.h
+core_ext.o: $(hdrdir)/ruby/backward/2/stdalign.h
+core_ext.o: $(hdrdir)/ruby/backward/2/stdarg.h
+core_ext.o: $(hdrdir)/ruby/defines.h
+core_ext.o: $(hdrdir)/ruby/intern.h
+core_ext.o: $(hdrdir)/ruby/missing.h
+core_ext.o: $(hdrdir)/ruby/ruby.h
+core_ext.o: $(hdrdir)/ruby/st.h
+core_ext.o: $(hdrdir)/ruby/subst.h
+core_ext.o: $(top_srcdir)/internal.h
+core_ext.o: $(top_srcdir)/internal/bignum.h
+core_ext.o: $(top_srcdir)/internal/bits.h
+core_ext.o: $(top_srcdir)/internal/compilers.h
+core_ext.o: $(top_srcdir)/internal/fixnum.h
+core_ext.o: $(top_srcdir)/internal/numeric.h
+core_ext.o: $(top_srcdir)/internal/serial.h
+core_ext.o: $(top_srcdir)/internal/static_assert.h
+core_ext.o: $(top_srcdir)/internal/vm.h
+core_ext.o: core_ext.c
+init.o: $(RUBY_EXTCONF_H)
+init.o: $(arch_hdrdir)/ruby/config.h
+init.o: $(hdrdir)/ruby.h
+init.o: $(hdrdir)/ruby/internal/anyargs.h
+init.o: $(hdrdir)/ruby/internal/arithmetic.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+init.o: $(hdrdir)/ruby/internal/assume.h
+init.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+init.o: $(hdrdir)/ruby/internal/attr/artificial.h
+init.o: $(hdrdir)/ruby/internal/attr/cold.h
+init.o: $(hdrdir)/ruby/internal/attr/const.h
+init.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+init.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+init.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+init.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+init.o: $(hdrdir)/ruby/internal/attr/error.h
+init.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+init.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+init.o: $(hdrdir)/ruby/internal/attr/format.h
+init.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+init.o: $(hdrdir)/ruby/internal/attr/noalias.h
+init.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+init.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+init.o: $(hdrdir)/ruby/internal/attr/noinline.h
+init.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+init.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+init.o: $(hdrdir)/ruby/internal/attr/pure.h
+init.o: $(hdrdir)/ruby/internal/attr/restrict.h
+init.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+init.o: $(hdrdir)/ruby/internal/attr/warning.h
+init.o: $(hdrdir)/ruby/internal/attr/weakref.h
+init.o: $(hdrdir)/ruby/internal/cast.h
+init.o: $(hdrdir)/ruby/internal/compiler_is.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+init.o: $(hdrdir)/ruby/internal/compiler_since.h
+init.o: $(hdrdir)/ruby/internal/config.h
+init.o: $(hdrdir)/ruby/internal/constant_p.h
+init.o: $(hdrdir)/ruby/internal/core.h
+init.o: $(hdrdir)/ruby/internal/core/rarray.h
+init.o: $(hdrdir)/ruby/internal/core/rbasic.h
+init.o: $(hdrdir)/ruby/internal/core/rbignum.h
+init.o: $(hdrdir)/ruby/internal/core/rclass.h
+init.o: $(hdrdir)/ruby/internal/core/rdata.h
+init.o: $(hdrdir)/ruby/internal/core/rfile.h
+init.o: $(hdrdir)/ruby/internal/core/rhash.h
+init.o: $(hdrdir)/ruby/internal/core/robject.h
+init.o: $(hdrdir)/ruby/internal/core/rregexp.h
+init.o: $(hdrdir)/ruby/internal/core/rstring.h
+init.o: $(hdrdir)/ruby/internal/core/rstruct.h
+init.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+init.o: $(hdrdir)/ruby/internal/ctype.h
+init.o: $(hdrdir)/ruby/internal/dllexport.h
+init.o: $(hdrdir)/ruby/internal/dosish.h
+init.o: $(hdrdir)/ruby/internal/error.h
+init.o: $(hdrdir)/ruby/internal/eval.h
+init.o: $(hdrdir)/ruby/internal/event.h
+init.o: $(hdrdir)/ruby/internal/fl_type.h
+init.o: $(hdrdir)/ruby/internal/gc.h
+init.o: $(hdrdir)/ruby/internal/glob.h
+init.o: $(hdrdir)/ruby/internal/globals.h
+init.o: $(hdrdir)/ruby/internal/has/attribute.h
+init.o: $(hdrdir)/ruby/internal/has/builtin.h
+init.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/extension.h
+init.o: $(hdrdir)/ruby/internal/has/feature.h
+init.o: $(hdrdir)/ruby/internal/has/warning.h
+init.o: $(hdrdir)/ruby/internal/intern/array.h
+init.o: $(hdrdir)/ruby/internal/intern/bignum.h
+init.o: $(hdrdir)/ruby/internal/intern/class.h
+init.o: $(hdrdir)/ruby/internal/intern/compar.h
+init.o: $(hdrdir)/ruby/internal/intern/complex.h
+init.o: $(hdrdir)/ruby/internal/intern/cont.h
+init.o: $(hdrdir)/ruby/internal/intern/dir.h
+init.o: $(hdrdir)/ruby/internal/intern/enum.h
+init.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+init.o: $(hdrdir)/ruby/internal/intern/error.h
+init.o: $(hdrdir)/ruby/internal/intern/eval.h
+init.o: $(hdrdir)/ruby/internal/intern/file.h
+init.o: $(hdrdir)/ruby/internal/intern/gc.h
+init.o: $(hdrdir)/ruby/internal/intern/hash.h
+init.o: $(hdrdir)/ruby/internal/intern/io.h
+init.o: $(hdrdir)/ruby/internal/intern/load.h
+init.o: $(hdrdir)/ruby/internal/intern/marshal.h
+init.o: $(hdrdir)/ruby/internal/intern/numeric.h
+init.o: $(hdrdir)/ruby/internal/intern/object.h
+init.o: $(hdrdir)/ruby/internal/intern/parse.h
+init.o: $(hdrdir)/ruby/internal/intern/proc.h
+init.o: $(hdrdir)/ruby/internal/intern/process.h
+init.o: $(hdrdir)/ruby/internal/intern/random.h
+init.o: $(hdrdir)/ruby/internal/intern/range.h
+init.o: $(hdrdir)/ruby/internal/intern/rational.h
+init.o: $(hdrdir)/ruby/internal/intern/re.h
+init.o: $(hdrdir)/ruby/internal/intern/ruby.h
+init.o: $(hdrdir)/ruby/internal/intern/select.h
+init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+init.o: $(hdrdir)/ruby/internal/intern/signal.h
+init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+init.o: $(hdrdir)/ruby/internal/intern/string.h
+init.o: $(hdrdir)/ruby/internal/intern/struct.h
+init.o: $(hdrdir)/ruby/internal/intern/thread.h
+init.o: $(hdrdir)/ruby/internal/intern/time.h
+init.o: $(hdrdir)/ruby/internal/intern/variable.h
+init.o: $(hdrdir)/ruby/internal/intern/vm.h
+init.o: $(hdrdir)/ruby/internal/interpreter.h
+init.o: $(hdrdir)/ruby/internal/iterator.h
+init.o: $(hdrdir)/ruby/internal/memory.h
+init.o: $(hdrdir)/ruby/internal/method.h
+init.o: $(hdrdir)/ruby/internal/module.h
+init.o: $(hdrdir)/ruby/internal/newobj.h
+init.o: $(hdrdir)/ruby/internal/rgengc.h
+init.o: $(hdrdir)/ruby/internal/scan_args.h
+init.o: $(hdrdir)/ruby/internal/special_consts.h
+init.o: $(hdrdir)/ruby/internal/static_assert.h
+init.o: $(hdrdir)/ruby/internal/stdalign.h
+init.o: $(hdrdir)/ruby/internal/stdbool.h
+init.o: $(hdrdir)/ruby/internal/symbol.h
+init.o: $(hdrdir)/ruby/internal/token_paste.h
+init.o: $(hdrdir)/ruby/internal/value.h
+init.o: $(hdrdir)/ruby/internal/value_type.h
+init.o: $(hdrdir)/ruby/internal/variable.h
+init.o: $(hdrdir)/ruby/internal/warning_push.h
+init.o: $(hdrdir)/ruby/internal/xmalloc.h
+init.o: $(hdrdir)/ruby/assert.h
+init.o: $(hdrdir)/ruby/backward.h
+init.o: $(hdrdir)/ruby/backward/2/assume.h
+init.o: $(hdrdir)/ruby/backward/2/attributes.h
+init.o: $(hdrdir)/ruby/backward/2/bool.h
+init.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+init.o: $(hdrdir)/ruby/backward/2/inttypes.h
+init.o: $(hdrdir)/ruby/backward/2/limits.h
+init.o: $(hdrdir)/ruby/backward/2/long_long.h
+init.o: $(hdrdir)/ruby/backward/2/stdalign.h
+init.o: $(hdrdir)/ruby/backward/2/stdarg.h
+init.o: $(hdrdir)/ruby/defines.h
+init.o: $(hdrdir)/ruby/intern.h
+init.o: $(hdrdir)/ruby/missing.h
+init.o: $(hdrdir)/ruby/ruby.h
+init.o: $(hdrdir)/ruby/st.h
+init.o: $(hdrdir)/ruby/subst.h
+init.o: init.c
+my_integer.o: $(RUBY_EXTCONF_H)
+my_integer.o: $(arch_hdrdir)/ruby/config.h
+my_integer.o: $(hdrdir)/ruby.h
+my_integer.o: $(hdrdir)/ruby/internal/anyargs.h
+my_integer.o: $(hdrdir)/ruby/internal/arithmetic.h
+my_integer.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+my_integer.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+my_integer.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+my_integer.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+my_integer.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+my_integer.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+my_integer.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+my_integer.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+my_integer.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+my_integer.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+my_integer.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+my_integer.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+my_integer.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+my_integer.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+my_integer.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+my_integer.o: $(hdrdir)/ruby/internal/assume.h
+my_integer.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+my_integer.o: $(hdrdir)/ruby/internal/attr/artificial.h
+my_integer.o: $(hdrdir)/ruby/internal/attr/cold.h
+my_integer.o: $(hdrdir)/ruby/internal/attr/const.h
+my_integer.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+my_integer.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+my_integer.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+my_integer.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+my_integer.o: $(hdrdir)/ruby/internal/attr/error.h
+my_integer.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+my_integer.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+my_integer.o: $(hdrdir)/ruby/internal/attr/format.h
+my_integer.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+my_integer.o: $(hdrdir)/ruby/internal/attr/noalias.h
+my_integer.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+my_integer.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+my_integer.o: $(hdrdir)/ruby/internal/attr/noinline.h
+my_integer.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+my_integer.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+my_integer.o: $(hdrdir)/ruby/internal/attr/pure.h
+my_integer.o: $(hdrdir)/ruby/internal/attr/restrict.h
+my_integer.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+my_integer.o: $(hdrdir)/ruby/internal/attr/warning.h
+my_integer.o: $(hdrdir)/ruby/internal/attr/weakref.h
+my_integer.o: $(hdrdir)/ruby/internal/cast.h
+my_integer.o: $(hdrdir)/ruby/internal/compiler_is.h
+my_integer.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+my_integer.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+my_integer.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+my_integer.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+my_integer.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+my_integer.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+my_integer.o: $(hdrdir)/ruby/internal/compiler_since.h
+my_integer.o: $(hdrdir)/ruby/internal/config.h
+my_integer.o: $(hdrdir)/ruby/internal/constant_p.h
+my_integer.o: $(hdrdir)/ruby/internal/core.h
+my_integer.o: $(hdrdir)/ruby/internal/core/rarray.h
+my_integer.o: $(hdrdir)/ruby/internal/core/rbasic.h
+my_integer.o: $(hdrdir)/ruby/internal/core/rbignum.h
+my_integer.o: $(hdrdir)/ruby/internal/core/rclass.h
+my_integer.o: $(hdrdir)/ruby/internal/core/rdata.h
+my_integer.o: $(hdrdir)/ruby/internal/core/rfile.h
+my_integer.o: $(hdrdir)/ruby/internal/core/rhash.h
+my_integer.o: $(hdrdir)/ruby/internal/core/robject.h
+my_integer.o: $(hdrdir)/ruby/internal/core/rregexp.h
+my_integer.o: $(hdrdir)/ruby/internal/core/rstring.h
+my_integer.o: $(hdrdir)/ruby/internal/core/rstruct.h
+my_integer.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+my_integer.o: $(hdrdir)/ruby/internal/ctype.h
+my_integer.o: $(hdrdir)/ruby/internal/dllexport.h
+my_integer.o: $(hdrdir)/ruby/internal/dosish.h
+my_integer.o: $(hdrdir)/ruby/internal/error.h
+my_integer.o: $(hdrdir)/ruby/internal/eval.h
+my_integer.o: $(hdrdir)/ruby/internal/event.h
+my_integer.o: $(hdrdir)/ruby/internal/fl_type.h
+my_integer.o: $(hdrdir)/ruby/internal/gc.h
+my_integer.o: $(hdrdir)/ruby/internal/glob.h
+my_integer.o: $(hdrdir)/ruby/internal/globals.h
+my_integer.o: $(hdrdir)/ruby/internal/has/attribute.h
+my_integer.o: $(hdrdir)/ruby/internal/has/builtin.h
+my_integer.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+my_integer.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+my_integer.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+my_integer.o: $(hdrdir)/ruby/internal/has/extension.h
+my_integer.o: $(hdrdir)/ruby/internal/has/feature.h
+my_integer.o: $(hdrdir)/ruby/internal/has/warning.h
+my_integer.o: $(hdrdir)/ruby/internal/intern/array.h
+my_integer.o: $(hdrdir)/ruby/internal/intern/bignum.h
+my_integer.o: $(hdrdir)/ruby/internal/intern/class.h
+my_integer.o: $(hdrdir)/ruby/internal/intern/compar.h
+my_integer.o: $(hdrdir)/ruby/internal/intern/complex.h
+my_integer.o: $(hdrdir)/ruby/internal/intern/cont.h
+my_integer.o: $(hdrdir)/ruby/internal/intern/dir.h
+my_integer.o: $(hdrdir)/ruby/internal/intern/enum.h
+my_integer.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+my_integer.o: $(hdrdir)/ruby/internal/intern/error.h
+my_integer.o: $(hdrdir)/ruby/internal/intern/eval.h
+my_integer.o: $(hdrdir)/ruby/internal/intern/file.h
+my_integer.o: $(hdrdir)/ruby/internal/intern/gc.h
+my_integer.o: $(hdrdir)/ruby/internal/intern/hash.h
+my_integer.o: $(hdrdir)/ruby/internal/intern/io.h
+my_integer.o: $(hdrdir)/ruby/internal/intern/load.h
+my_integer.o: $(hdrdir)/ruby/internal/intern/marshal.h
+my_integer.o: $(hdrdir)/ruby/internal/intern/numeric.h
+my_integer.o: $(hdrdir)/ruby/internal/intern/object.h
+my_integer.o: $(hdrdir)/ruby/internal/intern/parse.h
+my_integer.o: $(hdrdir)/ruby/internal/intern/proc.h
+my_integer.o: $(hdrdir)/ruby/internal/intern/process.h
+my_integer.o: $(hdrdir)/ruby/internal/intern/random.h
+my_integer.o: $(hdrdir)/ruby/internal/intern/range.h
+my_integer.o: $(hdrdir)/ruby/internal/intern/rational.h
+my_integer.o: $(hdrdir)/ruby/internal/intern/re.h
+my_integer.o: $(hdrdir)/ruby/internal/intern/ruby.h
+my_integer.o: $(hdrdir)/ruby/internal/intern/select.h
+my_integer.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+my_integer.o: $(hdrdir)/ruby/internal/intern/signal.h
+my_integer.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+my_integer.o: $(hdrdir)/ruby/internal/intern/string.h
+my_integer.o: $(hdrdir)/ruby/internal/intern/struct.h
+my_integer.o: $(hdrdir)/ruby/internal/intern/thread.h
+my_integer.o: $(hdrdir)/ruby/internal/intern/time.h
+my_integer.o: $(hdrdir)/ruby/internal/intern/variable.h
+my_integer.o: $(hdrdir)/ruby/internal/intern/vm.h
+my_integer.o: $(hdrdir)/ruby/internal/interpreter.h
+my_integer.o: $(hdrdir)/ruby/internal/iterator.h
+my_integer.o: $(hdrdir)/ruby/internal/memory.h
+my_integer.o: $(hdrdir)/ruby/internal/method.h
+my_integer.o: $(hdrdir)/ruby/internal/module.h
+my_integer.o: $(hdrdir)/ruby/internal/newobj.h
+my_integer.o: $(hdrdir)/ruby/internal/rgengc.h
+my_integer.o: $(hdrdir)/ruby/internal/scan_args.h
+my_integer.o: $(hdrdir)/ruby/internal/special_consts.h
+my_integer.o: $(hdrdir)/ruby/internal/static_assert.h
+my_integer.o: $(hdrdir)/ruby/internal/stdalign.h
+my_integer.o: $(hdrdir)/ruby/internal/stdbool.h
+my_integer.o: $(hdrdir)/ruby/internal/symbol.h
+my_integer.o: $(hdrdir)/ruby/internal/token_paste.h
+my_integer.o: $(hdrdir)/ruby/internal/value.h
+my_integer.o: $(hdrdir)/ruby/internal/value_type.h
+my_integer.o: $(hdrdir)/ruby/internal/variable.h
+my_integer.o: $(hdrdir)/ruby/internal/warning_push.h
+my_integer.o: $(hdrdir)/ruby/internal/xmalloc.h
+my_integer.o: $(hdrdir)/ruby/assert.h
+my_integer.o: $(hdrdir)/ruby/backward.h
+my_integer.o: $(hdrdir)/ruby/backward/2/assume.h
+my_integer.o: $(hdrdir)/ruby/backward/2/attributes.h
+my_integer.o: $(hdrdir)/ruby/backward/2/bool.h
+my_integer.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+my_integer.o: $(hdrdir)/ruby/backward/2/inttypes.h
+my_integer.o: $(hdrdir)/ruby/backward/2/limits.h
+my_integer.o: $(hdrdir)/ruby/backward/2/long_long.h
+my_integer.o: $(hdrdir)/ruby/backward/2/stdalign.h
+my_integer.o: $(hdrdir)/ruby/backward/2/stdarg.h
+my_integer.o: $(hdrdir)/ruby/defines.h
+my_integer.o: $(hdrdir)/ruby/intern.h
+my_integer.o: $(hdrdir)/ruby/missing.h
+my_integer.o: $(hdrdir)/ruby/ruby.h
+my_integer.o: $(hdrdir)/ruby/st.h
+my_integer.o: $(hdrdir)/ruby/subst.h
+my_integer.o: my_integer.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/iseq_load/depend b/ext/-test-/iseq_load/depend
new file mode 100644
index 0000000000..007790a02e
--- /dev/null
+++ b/ext/-test-/iseq_load/depend
@@ -0,0 +1,163 @@
+# AUTOGENERATED DEPENDENCIES START
+iseq_load.o: $(RUBY_EXTCONF_H)
+iseq_load.o: $(arch_hdrdir)/ruby/config.h
+iseq_load.o: $(hdrdir)/ruby.h
+iseq_load.o: $(hdrdir)/ruby/internal/anyargs.h
+iseq_load.o: $(hdrdir)/ruby/internal/arithmetic.h
+iseq_load.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+iseq_load.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+iseq_load.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+iseq_load.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+iseq_load.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+iseq_load.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+iseq_load.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+iseq_load.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+iseq_load.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+iseq_load.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+iseq_load.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+iseq_load.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+iseq_load.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+iseq_load.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+iseq_load.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+iseq_load.o: $(hdrdir)/ruby/internal/assume.h
+iseq_load.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+iseq_load.o: $(hdrdir)/ruby/internal/attr/artificial.h
+iseq_load.o: $(hdrdir)/ruby/internal/attr/cold.h
+iseq_load.o: $(hdrdir)/ruby/internal/attr/const.h
+iseq_load.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+iseq_load.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+iseq_load.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+iseq_load.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+iseq_load.o: $(hdrdir)/ruby/internal/attr/error.h
+iseq_load.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+iseq_load.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+iseq_load.o: $(hdrdir)/ruby/internal/attr/format.h
+iseq_load.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+iseq_load.o: $(hdrdir)/ruby/internal/attr/noalias.h
+iseq_load.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+iseq_load.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+iseq_load.o: $(hdrdir)/ruby/internal/attr/noinline.h
+iseq_load.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+iseq_load.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+iseq_load.o: $(hdrdir)/ruby/internal/attr/pure.h
+iseq_load.o: $(hdrdir)/ruby/internal/attr/restrict.h
+iseq_load.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+iseq_load.o: $(hdrdir)/ruby/internal/attr/warning.h
+iseq_load.o: $(hdrdir)/ruby/internal/attr/weakref.h
+iseq_load.o: $(hdrdir)/ruby/internal/cast.h
+iseq_load.o: $(hdrdir)/ruby/internal/compiler_is.h
+iseq_load.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+iseq_load.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+iseq_load.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+iseq_load.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+iseq_load.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+iseq_load.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+iseq_load.o: $(hdrdir)/ruby/internal/compiler_since.h
+iseq_load.o: $(hdrdir)/ruby/internal/config.h
+iseq_load.o: $(hdrdir)/ruby/internal/constant_p.h
+iseq_load.o: $(hdrdir)/ruby/internal/core.h
+iseq_load.o: $(hdrdir)/ruby/internal/core/rarray.h
+iseq_load.o: $(hdrdir)/ruby/internal/core/rbasic.h
+iseq_load.o: $(hdrdir)/ruby/internal/core/rbignum.h
+iseq_load.o: $(hdrdir)/ruby/internal/core/rclass.h
+iseq_load.o: $(hdrdir)/ruby/internal/core/rdata.h
+iseq_load.o: $(hdrdir)/ruby/internal/core/rfile.h
+iseq_load.o: $(hdrdir)/ruby/internal/core/rhash.h
+iseq_load.o: $(hdrdir)/ruby/internal/core/robject.h
+iseq_load.o: $(hdrdir)/ruby/internal/core/rregexp.h
+iseq_load.o: $(hdrdir)/ruby/internal/core/rstring.h
+iseq_load.o: $(hdrdir)/ruby/internal/core/rstruct.h
+iseq_load.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+iseq_load.o: $(hdrdir)/ruby/internal/ctype.h
+iseq_load.o: $(hdrdir)/ruby/internal/dllexport.h
+iseq_load.o: $(hdrdir)/ruby/internal/dosish.h
+iseq_load.o: $(hdrdir)/ruby/internal/error.h
+iseq_load.o: $(hdrdir)/ruby/internal/eval.h
+iseq_load.o: $(hdrdir)/ruby/internal/event.h
+iseq_load.o: $(hdrdir)/ruby/internal/fl_type.h
+iseq_load.o: $(hdrdir)/ruby/internal/gc.h
+iseq_load.o: $(hdrdir)/ruby/internal/glob.h
+iseq_load.o: $(hdrdir)/ruby/internal/globals.h
+iseq_load.o: $(hdrdir)/ruby/internal/has/attribute.h
+iseq_load.o: $(hdrdir)/ruby/internal/has/builtin.h
+iseq_load.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+iseq_load.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+iseq_load.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+iseq_load.o: $(hdrdir)/ruby/internal/has/extension.h
+iseq_load.o: $(hdrdir)/ruby/internal/has/feature.h
+iseq_load.o: $(hdrdir)/ruby/internal/has/warning.h
+iseq_load.o: $(hdrdir)/ruby/internal/intern/array.h
+iseq_load.o: $(hdrdir)/ruby/internal/intern/bignum.h
+iseq_load.o: $(hdrdir)/ruby/internal/intern/class.h
+iseq_load.o: $(hdrdir)/ruby/internal/intern/compar.h
+iseq_load.o: $(hdrdir)/ruby/internal/intern/complex.h
+iseq_load.o: $(hdrdir)/ruby/internal/intern/cont.h
+iseq_load.o: $(hdrdir)/ruby/internal/intern/dir.h
+iseq_load.o: $(hdrdir)/ruby/internal/intern/enum.h
+iseq_load.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+iseq_load.o: $(hdrdir)/ruby/internal/intern/error.h
+iseq_load.o: $(hdrdir)/ruby/internal/intern/eval.h
+iseq_load.o: $(hdrdir)/ruby/internal/intern/file.h
+iseq_load.o: $(hdrdir)/ruby/internal/intern/gc.h
+iseq_load.o: $(hdrdir)/ruby/internal/intern/hash.h
+iseq_load.o: $(hdrdir)/ruby/internal/intern/io.h
+iseq_load.o: $(hdrdir)/ruby/internal/intern/load.h
+iseq_load.o: $(hdrdir)/ruby/internal/intern/marshal.h
+iseq_load.o: $(hdrdir)/ruby/internal/intern/numeric.h
+iseq_load.o: $(hdrdir)/ruby/internal/intern/object.h
+iseq_load.o: $(hdrdir)/ruby/internal/intern/parse.h
+iseq_load.o: $(hdrdir)/ruby/internal/intern/proc.h
+iseq_load.o: $(hdrdir)/ruby/internal/intern/process.h
+iseq_load.o: $(hdrdir)/ruby/internal/intern/random.h
+iseq_load.o: $(hdrdir)/ruby/internal/intern/range.h
+iseq_load.o: $(hdrdir)/ruby/internal/intern/rational.h
+iseq_load.o: $(hdrdir)/ruby/internal/intern/re.h
+iseq_load.o: $(hdrdir)/ruby/internal/intern/ruby.h
+iseq_load.o: $(hdrdir)/ruby/internal/intern/select.h
+iseq_load.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+iseq_load.o: $(hdrdir)/ruby/internal/intern/signal.h
+iseq_load.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+iseq_load.o: $(hdrdir)/ruby/internal/intern/string.h
+iseq_load.o: $(hdrdir)/ruby/internal/intern/struct.h
+iseq_load.o: $(hdrdir)/ruby/internal/intern/thread.h
+iseq_load.o: $(hdrdir)/ruby/internal/intern/time.h
+iseq_load.o: $(hdrdir)/ruby/internal/intern/variable.h
+iseq_load.o: $(hdrdir)/ruby/internal/intern/vm.h
+iseq_load.o: $(hdrdir)/ruby/internal/interpreter.h
+iseq_load.o: $(hdrdir)/ruby/internal/iterator.h
+iseq_load.o: $(hdrdir)/ruby/internal/memory.h
+iseq_load.o: $(hdrdir)/ruby/internal/method.h
+iseq_load.o: $(hdrdir)/ruby/internal/module.h
+iseq_load.o: $(hdrdir)/ruby/internal/newobj.h
+iseq_load.o: $(hdrdir)/ruby/internal/rgengc.h
+iseq_load.o: $(hdrdir)/ruby/internal/scan_args.h
+iseq_load.o: $(hdrdir)/ruby/internal/special_consts.h
+iseq_load.o: $(hdrdir)/ruby/internal/static_assert.h
+iseq_load.o: $(hdrdir)/ruby/internal/stdalign.h
+iseq_load.o: $(hdrdir)/ruby/internal/stdbool.h
+iseq_load.o: $(hdrdir)/ruby/internal/symbol.h
+iseq_load.o: $(hdrdir)/ruby/internal/token_paste.h
+iseq_load.o: $(hdrdir)/ruby/internal/value.h
+iseq_load.o: $(hdrdir)/ruby/internal/value_type.h
+iseq_load.o: $(hdrdir)/ruby/internal/variable.h
+iseq_load.o: $(hdrdir)/ruby/internal/warning_push.h
+iseq_load.o: $(hdrdir)/ruby/internal/xmalloc.h
+iseq_load.o: $(hdrdir)/ruby/assert.h
+iseq_load.o: $(hdrdir)/ruby/backward.h
+iseq_load.o: $(hdrdir)/ruby/backward/2/assume.h
+iseq_load.o: $(hdrdir)/ruby/backward/2/attributes.h
+iseq_load.o: $(hdrdir)/ruby/backward/2/bool.h
+iseq_load.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+iseq_load.o: $(hdrdir)/ruby/backward/2/inttypes.h
+iseq_load.o: $(hdrdir)/ruby/backward/2/limits.h
+iseq_load.o: $(hdrdir)/ruby/backward/2/long_long.h
+iseq_load.o: $(hdrdir)/ruby/backward/2/stdalign.h
+iseq_load.o: $(hdrdir)/ruby/backward/2/stdarg.h
+iseq_load.o: $(hdrdir)/ruby/defines.h
+iseq_load.o: $(hdrdir)/ruby/intern.h
+iseq_load.o: $(hdrdir)/ruby/missing.h
+iseq_load.o: $(hdrdir)/ruby/ruby.h
+iseq_load.o: $(hdrdir)/ruby/st.h
+iseq_load.o: $(hdrdir)/ruby/subst.h
+iseq_load.o: iseq_load.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/iter/break.c b/ext/-test-/iter/break.c
index 66ed26a9b8..4d43c5d0cf 100644
--- a/ext/-test-/iter/break.c
+++ b/ext/-test-/iter/break.c
@@ -5,7 +5,7 @@ iter_break(VALUE self)
 {
     rb_iter_break();
 
-    UNREACHABLE;
+    UNREACHABLE_RETURN(Qnil);
 }
 
 static VALUE
@@ -13,7 +13,7 @@ iter_break_value(VALUE self, VALUE val)
 {
     rb_iter_break_value(val);
 
-    UNREACHABLE;
+    UNREACHABLE_RETURN(Qnil);
 }
 
 void
diff --git a/ext/-test-/iter/depend b/ext/-test-/iter/depend
new file mode 100644
index 0000000000..d00638e78f
--- /dev/null
+++ b/ext/-test-/iter/depend
@@ -0,0 +1,485 @@
+# AUTOGENERATED DEPENDENCIES START
+break.o: $(RUBY_EXTCONF_H)
+break.o: $(arch_hdrdir)/ruby/config.h
+break.o: $(hdrdir)/ruby.h
+break.o: $(hdrdir)/ruby/internal/anyargs.h
+break.o: $(hdrdir)/ruby/internal/arithmetic.h
+break.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+break.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+break.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+break.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+break.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+break.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+break.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+break.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+break.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+break.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+break.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+break.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+break.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+break.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+break.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+break.o: $(hdrdir)/ruby/internal/assume.h
+break.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+break.o: $(hdrdir)/ruby/internal/attr/artificial.h
+break.o: $(hdrdir)/ruby/internal/attr/cold.h
+break.o: $(hdrdir)/ruby/internal/attr/const.h
+break.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+break.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+break.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+break.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+break.o: $(hdrdir)/ruby/internal/attr/error.h
+break.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+break.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+break.o: $(hdrdir)/ruby/internal/attr/format.h
+break.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+break.o: $(hdrdir)/ruby/internal/attr/noalias.h
+break.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+break.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+break.o: $(hdrdir)/ruby/internal/attr/noinline.h
+break.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+break.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+break.o: $(hdrdir)/ruby/internal/attr/pure.h
+break.o: $(hdrdir)/ruby/internal/attr/restrict.h
+break.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+break.o: $(hdrdir)/ruby/internal/attr/warning.h
+break.o: $(hdrdir)/ruby/internal/attr/weakref.h
+break.o: $(hdrdir)/ruby/internal/cast.h
+break.o: $(hdrdir)/ruby/internal/compiler_is.h
+break.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+break.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+break.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+break.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+break.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+break.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+break.o: $(hdrdir)/ruby/internal/compiler_since.h
+break.o: $(hdrdir)/ruby/internal/config.h
+break.o: $(hdrdir)/ruby/internal/constant_p.h
+break.o: $(hdrdir)/ruby/internal/core.h
+break.o: $(hdrdir)/ruby/internal/core/rarray.h
+break.o: $(hdrdir)/ruby/internal/core/rbasic.h
+break.o: $(hdrdir)/ruby/internal/core/rbignum.h
+break.o: $(hdrdir)/ruby/internal/core/rclass.h
+break.o: $(hdrdir)/ruby/internal/core/rdata.h
+break.o: $(hdrdir)/ruby/internal/core/rfile.h
+break.o: $(hdrdir)/ruby/internal/core/rhash.h
+break.o: $(hdrdir)/ruby/internal/core/robject.h
+break.o: $(hdrdir)/ruby/internal/core/rregexp.h
+break.o: $(hdrdir)/ruby/internal/core/rstring.h
+break.o: $(hdrdir)/ruby/internal/core/rstruct.h
+break.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+break.o: $(hdrdir)/ruby/internal/ctype.h
+break.o: $(hdrdir)/ruby/internal/dllexport.h
+break.o: $(hdrdir)/ruby/internal/dosish.h
+break.o: $(hdrdir)/ruby/internal/error.h
+break.o: $(hdrdir)/ruby/internal/eval.h
+break.o: $(hdrdir)/ruby/internal/event.h
+break.o: $(hdrdir)/ruby/internal/fl_type.h
+break.o: $(hdrdir)/ruby/internal/gc.h
+break.o: $(hdrdir)/ruby/internal/glob.h
+break.o: $(hdrdir)/ruby/internal/globals.h
+break.o: $(hdrdir)/ruby/internal/has/attribute.h
+break.o: $(hdrdir)/ruby/internal/has/builtin.h
+break.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+break.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+break.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+break.o: $(hdrdir)/ruby/internal/has/extension.h
+break.o: $(hdrdir)/ruby/internal/has/feature.h
+break.o: $(hdrdir)/ruby/internal/has/warning.h
+break.o: $(hdrdir)/ruby/internal/intern/array.h
+break.o: $(hdrdir)/ruby/internal/intern/bignum.h
+break.o: $(hdrdir)/ruby/internal/intern/class.h
+break.o: $(hdrdir)/ruby/internal/intern/compar.h
+break.o: $(hdrdir)/ruby/internal/intern/complex.h
+break.o: $(hdrdir)/ruby/internal/intern/cont.h
+break.o: $(hdrdir)/ruby/internal/intern/dir.h
+break.o: $(hdrdir)/ruby/internal/intern/enum.h
+break.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+break.o: $(hdrdir)/ruby/internal/intern/error.h
+break.o: $(hdrdir)/ruby/internal/intern/eval.h
+break.o: $(hdrdir)/ruby/internal/intern/file.h
+break.o: $(hdrdir)/ruby/internal/intern/gc.h
+break.o: $(hdrdir)/ruby/internal/intern/hash.h
+break.o: $(hdrdir)/ruby/internal/intern/io.h
+break.o: $(hdrdir)/ruby/internal/intern/load.h
+break.o: $(hdrdir)/ruby/internal/intern/marshal.h
+break.o: $(hdrdir)/ruby/internal/intern/numeric.h
+break.o: $(hdrdir)/ruby/internal/intern/object.h
+break.o: $(hdrdir)/ruby/internal/intern/parse.h
+break.o: $(hdrdir)/ruby/internal/intern/proc.h
+break.o: $(hdrdir)/ruby/internal/intern/process.h
+break.o: $(hdrdir)/ruby/internal/intern/random.h
+break.o: $(hdrdir)/ruby/internal/intern/range.h
+break.o: $(hdrdir)/ruby/internal/intern/rational.h
+break.o: $(hdrdir)/ruby/internal/intern/re.h
+break.o: $(hdrdir)/ruby/internal/intern/ruby.h
+break.o: $(hdrdir)/ruby/internal/intern/select.h
+break.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+break.o: $(hdrdir)/ruby/internal/intern/signal.h
+break.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+break.o: $(hdrdir)/ruby/internal/intern/string.h
+break.o: $(hdrdir)/ruby/internal/intern/struct.h
+break.o: $(hdrdir)/ruby/internal/intern/thread.h
+break.o: $(hdrdir)/ruby/internal/intern/time.h
+break.o: $(hdrdir)/ruby/internal/intern/variable.h
+break.o: $(hdrdir)/ruby/internal/intern/vm.h
+break.o: $(hdrdir)/ruby/internal/interpreter.h
+break.o: $(hdrdir)/ruby/internal/iterator.h
+break.o: $(hdrdir)/ruby/internal/memory.h
+break.o: $(hdrdir)/ruby/internal/method.h
+break.o: $(hdrdir)/ruby/internal/module.h
+break.o: $(hdrdir)/ruby/internal/newobj.h
+break.o: $(hdrdir)/ruby/internal/rgengc.h
+break.o: $(hdrdir)/ruby/internal/scan_args.h
+break.o: $(hdrdir)/ruby/internal/special_consts.h
+break.o: $(hdrdir)/ruby/internal/static_assert.h
+break.o: $(hdrdir)/ruby/internal/stdalign.h
+break.o: $(hdrdir)/ruby/internal/stdbool.h
+break.o: $(hdrdir)/ruby/internal/symbol.h
+break.o: $(hdrdir)/ruby/internal/token_paste.h
+break.o: $(hdrdir)/ruby/internal/value.h
+break.o: $(hdrdir)/ruby/internal/value_type.h
+break.o: $(hdrdir)/ruby/internal/variable.h
+break.o: $(hdrdir)/ruby/internal/warning_push.h
+break.o: $(hdrdir)/ruby/internal/xmalloc.h
+break.o: $(hdrdir)/ruby/assert.h
+break.o: $(hdrdir)/ruby/backward.h
+break.o: $(hdrdir)/ruby/backward/2/assume.h
+break.o: $(hdrdir)/ruby/backward/2/attributes.h
+break.o: $(hdrdir)/ruby/backward/2/bool.h
+break.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+break.o: $(hdrdir)/ruby/backward/2/inttypes.h
+break.o: $(hdrdir)/ruby/backward/2/limits.h
+break.o: $(hdrdir)/ruby/backward/2/long_long.h
+break.o: $(hdrdir)/ruby/backward/2/stdalign.h
+break.o: $(hdrdir)/ruby/backward/2/stdarg.h
+break.o: $(hdrdir)/ruby/defines.h
+break.o: $(hdrdir)/ruby/intern.h
+break.o: $(hdrdir)/ruby/missing.h
+break.o: $(hdrdir)/ruby/ruby.h
+break.o: $(hdrdir)/ruby/st.h
+break.o: $(hdrdir)/ruby/subst.h
+break.o: break.c
+init.o: $(RUBY_EXTCONF_H)
+init.o: $(arch_hdrdir)/ruby/config.h
+init.o: $(hdrdir)/ruby.h
+init.o: $(hdrdir)/ruby/internal/anyargs.h
+init.o: $(hdrdir)/ruby/internal/arithmetic.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+init.o: $(hdrdir)/ruby/internal/assume.h
+init.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+init.o: $(hdrdir)/ruby/internal/attr/artificial.h
+init.o: $(hdrdir)/ruby/internal/attr/cold.h
+init.o: $(hdrdir)/ruby/internal/attr/const.h
+init.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+init.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+init.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+init.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+init.o: $(hdrdir)/ruby/internal/attr/error.h
+init.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+init.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+init.o: $(hdrdir)/ruby/internal/attr/format.h
+init.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+init.o: $(hdrdir)/ruby/internal/attr/noalias.h
+init.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+init.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+init.o: $(hdrdir)/ruby/internal/attr/noinline.h
+init.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+init.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+init.o: $(hdrdir)/ruby/internal/attr/pure.h
+init.o: $(hdrdir)/ruby/internal/attr/restrict.h
+init.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+init.o: $(hdrdir)/ruby/internal/attr/warning.h
+init.o: $(hdrdir)/ruby/internal/attr/weakref.h
+init.o: $(hdrdir)/ruby/internal/cast.h
+init.o: $(hdrdir)/ruby/internal/compiler_is.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+init.o: $(hdrdir)/ruby/internal/compiler_since.h
+init.o: $(hdrdir)/ruby/internal/config.h
+init.o: $(hdrdir)/ruby/internal/constant_p.h
+init.o: $(hdrdir)/ruby/internal/core.h
+init.o: $(hdrdir)/ruby/internal/core/rarray.h
+init.o: $(hdrdir)/ruby/internal/core/rbasic.h
+init.o: $(hdrdir)/ruby/internal/core/rbignum.h
+init.o: $(hdrdir)/ruby/internal/core/rclass.h
+init.o: $(hdrdir)/ruby/internal/core/rdata.h
+init.o: $(hdrdir)/ruby/internal/core/rfile.h
+init.o: $(hdrdir)/ruby/internal/core/rhash.h
+init.o: $(hdrdir)/ruby/internal/core/robject.h
+init.o: $(hdrdir)/ruby/internal/core/rregexp.h
+init.o: $(hdrdir)/ruby/internal/core/rstring.h
+init.o: $(hdrdir)/ruby/internal/core/rstruct.h
+init.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+init.o: $(hdrdir)/ruby/internal/ctype.h
+init.o: $(hdrdir)/ruby/internal/dllexport.h
+init.o: $(hdrdir)/ruby/internal/dosish.h
+init.o: $(hdrdir)/ruby/internal/error.h
+init.o: $(hdrdir)/ruby/internal/eval.h
+init.o: $(hdrdir)/ruby/internal/event.h
+init.o: $(hdrdir)/ruby/internal/fl_type.h
+init.o: $(hdrdir)/ruby/internal/gc.h
+init.o: $(hdrdir)/ruby/internal/glob.h
+init.o: $(hdrdir)/ruby/internal/globals.h
+init.o: $(hdrdir)/ruby/internal/has/attribute.h
+init.o: $(hdrdir)/ruby/internal/has/builtin.h
+init.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/extension.h
+init.o: $(hdrdir)/ruby/internal/has/feature.h
+init.o: $(hdrdir)/ruby/internal/has/warning.h
+init.o: $(hdrdir)/ruby/internal/intern/array.h
+init.o: $(hdrdir)/ruby/internal/intern/bignum.h
+init.o: $(hdrdir)/ruby/internal/intern/class.h
+init.o: $(hdrdir)/ruby/internal/intern/compar.h
+init.o: $(hdrdir)/ruby/internal/intern/complex.h
+init.o: $(hdrdir)/ruby/internal/intern/cont.h
+init.o: $(hdrdir)/ruby/internal/intern/dir.h
+init.o: $(hdrdir)/ruby/internal/intern/enum.h
+init.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+init.o: $(hdrdir)/ruby/internal/intern/error.h
+init.o: $(hdrdir)/ruby/internal/intern/eval.h
+init.o: $(hdrdir)/ruby/internal/intern/file.h
+init.o: $(hdrdir)/ruby/internal/intern/gc.h
+init.o: $(hdrdir)/ruby/internal/intern/hash.h
+init.o: $(hdrdir)/ruby/internal/intern/io.h
+init.o: $(hdrdir)/ruby/internal/intern/load.h
+init.o: $(hdrdir)/ruby/internal/intern/marshal.h
+init.o: $(hdrdir)/ruby/internal/intern/numeric.h
+init.o: $(hdrdir)/ruby/internal/intern/object.h
+init.o: $(hdrdir)/ruby/internal/intern/parse.h
+init.o: $(hdrdir)/ruby/internal/intern/proc.h
+init.o: $(hdrdir)/ruby/internal/intern/process.h
+init.o: $(hdrdir)/ruby/internal/intern/random.h
+init.o: $(hdrdir)/ruby/internal/intern/range.h
+init.o: $(hdrdir)/ruby/internal/intern/rational.h
+init.o: $(hdrdir)/ruby/internal/intern/re.h
+init.o: $(hdrdir)/ruby/internal/intern/ruby.h
+init.o: $(hdrdir)/ruby/internal/intern/select.h
+init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+init.o: $(hdrdir)/ruby/internal/intern/signal.h
+init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+init.o: $(hdrdir)/ruby/internal/intern/string.h
+init.o: $(hdrdir)/ruby/internal/intern/struct.h
+init.o: $(hdrdir)/ruby/internal/intern/thread.h
+init.o: $(hdrdir)/ruby/internal/intern/time.h
+init.o: $(hdrdir)/ruby/internal/intern/variable.h
+init.o: $(hdrdir)/ruby/internal/intern/vm.h
+init.o: $(hdrdir)/ruby/internal/interpreter.h
+init.o: $(hdrdir)/ruby/internal/iterator.h
+init.o: $(hdrdir)/ruby/internal/memory.h
+init.o: $(hdrdir)/ruby/internal/method.h
+init.o: $(hdrdir)/ruby/internal/module.h
+init.o: $(hdrdir)/ruby/internal/newobj.h
+init.o: $(hdrdir)/ruby/internal/rgengc.h
+init.o: $(hdrdir)/ruby/internal/scan_args.h
+init.o: $(hdrdir)/ruby/internal/special_consts.h
+init.o: $(hdrdir)/ruby/internal/static_assert.h
+init.o: $(hdrdir)/ruby/internal/stdalign.h
+init.o: $(hdrdir)/ruby/internal/stdbool.h
+init.o: $(hdrdir)/ruby/internal/symbol.h
+init.o: $(hdrdir)/ruby/internal/token_paste.h
+init.o: $(hdrdir)/ruby/internal/value.h
+init.o: $(hdrdir)/ruby/internal/value_type.h
+init.o: $(hdrdir)/ruby/internal/variable.h
+init.o: $(hdrdir)/ruby/internal/warning_push.h
+init.o: $(hdrdir)/ruby/internal/xmalloc.h
+init.o: $(hdrdir)/ruby/assert.h
+init.o: $(hdrdir)/ruby/backward.h
+init.o: $(hdrdir)/ruby/backward/2/assume.h
+init.o: $(hdrdir)/ruby/backward/2/attributes.h
+init.o: $(hdrdir)/ruby/backward/2/bool.h
+init.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+init.o: $(hdrdir)/ruby/backward/2/inttypes.h
+init.o: $(hdrdir)/ruby/backward/2/limits.h
+init.o: $(hdrdir)/ruby/backward/2/long_long.h
+init.o: $(hdrdir)/ruby/backward/2/stdalign.h
+init.o: $(hdrdir)/ruby/backward/2/stdarg.h
+init.o: $(hdrdir)/ruby/defines.h
+init.o: $(hdrdir)/ruby/intern.h
+init.o: $(hdrdir)/ruby/missing.h
+init.o: $(hdrdir)/ruby/ruby.h
+init.o: $(hdrdir)/ruby/st.h
+init.o: $(hdrdir)/ruby/subst.h
+init.o: init.c
+yield.o: $(RUBY_EXTCONF_H)
+yield.o: $(arch_hdrdir)/ruby/config.h
+yield.o: $(hdrdir)/ruby.h
+yield.o: $(hdrdir)/ruby/internal/anyargs.h
+yield.o: $(hdrdir)/ruby/internal/arithmetic.h
+yield.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+yield.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+yield.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+yield.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+yield.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+yield.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+yield.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+yield.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+yield.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+yield.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+yield.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+yield.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+yield.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+yield.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+yield.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+yield.o: $(hdrdir)/ruby/internal/assume.h
+yield.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+yield.o: $(hdrdir)/ruby/internal/attr/artificial.h
+yield.o: $(hdrdir)/ruby/internal/attr/cold.h
+yield.o: $(hdrdir)/ruby/internal/attr/const.h
+yield.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+yield.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+yield.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+yield.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+yield.o: $(hdrdir)/ruby/internal/attr/error.h
+yield.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+yield.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+yield.o: $(hdrdir)/ruby/internal/attr/format.h
+yield.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+yield.o: $(hdrdir)/ruby/internal/attr/noalias.h
+yield.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+yield.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+yield.o: $(hdrdir)/ruby/internal/attr/noinline.h
+yield.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+yield.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+yield.o: $(hdrdir)/ruby/internal/attr/pure.h
+yield.o: $(hdrdir)/ruby/internal/attr/restrict.h
+yield.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+yield.o: $(hdrdir)/ruby/internal/attr/warning.h
+yield.o: $(hdrdir)/ruby/internal/attr/weakref.h
+yield.o: $(hdrdir)/ruby/internal/cast.h
+yield.o: $(hdrdir)/ruby/internal/compiler_is.h
+yield.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+yield.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+yield.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+yield.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+yield.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+yield.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+yield.o: $(hdrdir)/ruby/internal/compiler_since.h
+yield.o: $(hdrdir)/ruby/internal/config.h
+yield.o: $(hdrdir)/ruby/internal/constant_p.h
+yield.o: $(hdrdir)/ruby/internal/core.h
+yield.o: $(hdrdir)/ruby/internal/core/rarray.h
+yield.o: $(hdrdir)/ruby/internal/core/rbasic.h
+yield.o: $(hdrdir)/ruby/internal/core/rbignum.h
+yield.o: $(hdrdir)/ruby/internal/core/rclass.h
+yield.o: $(hdrdir)/ruby/internal/core/rdata.h
+yield.o: $(hdrdir)/ruby/internal/core/rfile.h
+yield.o: $(hdrdir)/ruby/internal/core/rhash.h
+yield.o: $(hdrdir)/ruby/internal/core/robject.h
+yield.o: $(hdrdir)/ruby/internal/core/rregexp.h
+yield.o: $(hdrdir)/ruby/internal/core/rstring.h
+yield.o: $(hdrdir)/ruby/internal/core/rstruct.h
+yield.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+yield.o: $(hdrdir)/ruby/internal/ctype.h
+yield.o: $(hdrdir)/ruby/internal/dllexport.h
+yield.o: $(hdrdir)/ruby/internal/dosish.h
+yield.o: $(hdrdir)/ruby/internal/error.h
+yield.o: $(hdrdir)/ruby/internal/eval.h
+yield.o: $(hdrdir)/ruby/internal/event.h
+yield.o: $(hdrdir)/ruby/internal/fl_type.h
+yield.o: $(hdrdir)/ruby/internal/gc.h
+yield.o: $(hdrdir)/ruby/internal/glob.h
+yield.o: $(hdrdir)/ruby/internal/globals.h
+yield.o: $(hdrdir)/ruby/internal/has/attribute.h
+yield.o: $(hdrdir)/ruby/internal/has/builtin.h
+yield.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+yield.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+yield.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+yield.o: $(hdrdir)/ruby/internal/has/extension.h
+yield.o: $(hdrdir)/ruby/internal/has/feature.h
+yield.o: $(hdrdir)/ruby/internal/has/warning.h
+yield.o: $(hdrdir)/ruby/internal/intern/array.h
+yield.o: $(hdrdir)/ruby/internal/intern/bignum.h
+yield.o: $(hdrdir)/ruby/internal/intern/class.h
+yield.o: $(hdrdir)/ruby/internal/intern/compar.h
+yield.o: $(hdrdir)/ruby/internal/intern/complex.h
+yield.o: $(hdrdir)/ruby/internal/intern/cont.h
+yield.o: $(hdrdir)/ruby/internal/intern/dir.h
+yield.o: $(hdrdir)/ruby/internal/intern/enum.h
+yield.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+yield.o: $(hdrdir)/ruby/internal/intern/error.h
+yield.o: $(hdrdir)/ruby/internal/intern/eval.h
+yield.o: $(hdrdir)/ruby/internal/intern/file.h
+yield.o: $(hdrdir)/ruby/internal/intern/gc.h
+yield.o: $(hdrdir)/ruby/internal/intern/hash.h
+yield.o: $(hdrdir)/ruby/internal/intern/io.h
+yield.o: $(hdrdir)/ruby/internal/intern/load.h
+yield.o: $(hdrdir)/ruby/internal/intern/marshal.h
+yield.o: $(hdrdir)/ruby/internal/intern/numeric.h
+yield.o: $(hdrdir)/ruby/internal/intern/object.h
+yield.o: $(hdrdir)/ruby/internal/intern/parse.h
+yield.o: $(hdrdir)/ruby/internal/intern/proc.h
+yield.o: $(hdrdir)/ruby/internal/intern/process.h
+yield.o: $(hdrdir)/ruby/internal/intern/random.h
+yield.o: $(hdrdir)/ruby/internal/intern/range.h
+yield.o: $(hdrdir)/ruby/internal/intern/rational.h
+yield.o: $(hdrdir)/ruby/internal/intern/re.h
+yield.o: $(hdrdir)/ruby/internal/intern/ruby.h
+yield.o: $(hdrdir)/ruby/internal/intern/select.h
+yield.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+yield.o: $(hdrdir)/ruby/internal/intern/signal.h
+yield.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+yield.o: $(hdrdir)/ruby/internal/intern/string.h
+yield.o: $(hdrdir)/ruby/internal/intern/struct.h
+yield.o: $(hdrdir)/ruby/internal/intern/thread.h
+yield.o: $(hdrdir)/ruby/internal/intern/time.h
+yield.o: $(hdrdir)/ruby/internal/intern/variable.h
+yield.o: $(hdrdir)/ruby/internal/intern/vm.h
+yield.o: $(hdrdir)/ruby/internal/interpreter.h
+yield.o: $(hdrdir)/ruby/internal/iterator.h
+yield.o: $(hdrdir)/ruby/internal/memory.h
+yield.o: $(hdrdir)/ruby/internal/method.h
+yield.o: $(hdrdir)/ruby/internal/module.h
+yield.o: $(hdrdir)/ruby/internal/newobj.h
+yield.o: $(hdrdir)/ruby/internal/rgengc.h
+yield.o: $(hdrdir)/ruby/internal/scan_args.h
+yield.o: $(hdrdir)/ruby/internal/special_consts.h
+yield.o: $(hdrdir)/ruby/internal/static_assert.h
+yield.o: $(hdrdir)/ruby/internal/stdalign.h
+yield.o: $(hdrdir)/ruby/internal/stdbool.h
+yield.o: $(hdrdir)/ruby/internal/symbol.h
+yield.o: $(hdrdir)/ruby/internal/token_paste.h
+yield.o: $(hdrdir)/ruby/internal/value.h
+yield.o: $(hdrdir)/ruby/internal/value_type.h
+yield.o: $(hdrdir)/ruby/internal/variable.h
+yield.o: $(hdrdir)/ruby/internal/warning_push.h
+yield.o: $(hdrdir)/ruby/internal/xmalloc.h
+yield.o: $(hdrdir)/ruby/assert.h
+yield.o: $(hdrdir)/ruby/backward.h
+yield.o: $(hdrdir)/ruby/backward/2/assume.h
+yield.o: $(hdrdir)/ruby/backward/2/attributes.h
+yield.o: $(hdrdir)/ruby/backward/2/bool.h
+yield.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+yield.o: $(hdrdir)/ruby/backward/2/inttypes.h
+yield.o: $(hdrdir)/ruby/backward/2/limits.h
+yield.o: $(hdrdir)/ruby/backward/2/long_long.h
+yield.o: $(hdrdir)/ruby/backward/2/stdalign.h
+yield.o: $(hdrdir)/ruby/backward/2/stdarg.h
+yield.o: $(hdrdir)/ruby/defines.h
+yield.o: $(hdrdir)/ruby/intern.h
+yield.o: $(hdrdir)/ruby/missing.h
+yield.o: $(hdrdir)/ruby/ruby.h
+yield.o: $(hdrdir)/ruby/st.h
+yield.o: $(hdrdir)/ruby/subst.h
+yield.o: yield.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/iter/yield.c b/ext/-test-/iter/yield.c
index 3cd408a928..0f6f3e87eb 100644
--- a/ext/-test-/iter/yield.c
+++ b/ext/-test-/iter/yield.c
@@ -4,7 +4,7 @@ static VALUE
 yield_block(int argc, VALUE *argv, VALUE self)
 {
     rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
-    return rb_block_call(self, rb_to_id(argv[0]), argc-1, argv+1, rb_yield_block, 0);
+    return rb_block_call_kw(self, rb_to_id(argv[0]), argc-1, argv+1, rb_yield_block, 0, RB_PASS_CALLED_KEYWORDS);
 }
 
 void
diff --git a/ext/-test-/load/dot.dot/depend b/ext/-test-/load/dot.dot/depend
new file mode 100644
index 0000000000..a0445e288b
--- /dev/null
+++ b/ext/-test-/load/dot.dot/depend
@@ -0,0 +1,3 @@
+# AUTOGENERATED DEPENDENCIES START
+dot.dot.o: dot.dot.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/load/protect/depend b/ext/-test-/load/protect/depend
new file mode 100644
index 0000000000..99c02e1f25
--- /dev/null
+++ b/ext/-test-/load/protect/depend
@@ -0,0 +1,163 @@
+# AUTOGENERATED DEPENDENCIES START
+protect.o: $(RUBY_EXTCONF_H)
+protect.o: $(arch_hdrdir)/ruby/config.h
+protect.o: $(hdrdir)/ruby.h
+protect.o: $(hdrdir)/ruby/internal/anyargs.h
+protect.o: $(hdrdir)/ruby/internal/arithmetic.h
+protect.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+protect.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+protect.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+protect.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+protect.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+protect.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+protect.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+protect.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+protect.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+protect.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+protect.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+protect.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+protect.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+protect.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+protect.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+protect.o: $(hdrdir)/ruby/internal/assume.h
+protect.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+protect.o: $(hdrdir)/ruby/internal/attr/artificial.h
+protect.o: $(hdrdir)/ruby/internal/attr/cold.h
+protect.o: $(hdrdir)/ruby/internal/attr/const.h
+protect.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+protect.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+protect.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+protect.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+protect.o: $(hdrdir)/ruby/internal/attr/error.h
+protect.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+protect.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+protect.o: $(hdrdir)/ruby/internal/attr/format.h
+protect.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+protect.o: $(hdrdir)/ruby/internal/attr/noalias.h
+protect.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+protect.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+protect.o: $(hdrdir)/ruby/internal/attr/noinline.h
+protect.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+protect.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+protect.o: $(hdrdir)/ruby/internal/attr/pure.h
+protect.o: $(hdrdir)/ruby/internal/attr/restrict.h
+protect.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+protect.o: $(hdrdir)/ruby/internal/attr/warning.h
+protect.o: $(hdrdir)/ruby/internal/attr/weakref.h
+protect.o: $(hdrdir)/ruby/internal/cast.h
+protect.o: $(hdrdir)/ruby/internal/compiler_is.h
+protect.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+protect.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+protect.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+protect.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+protect.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+protect.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+protect.o: $(hdrdir)/ruby/internal/compiler_since.h
+protect.o: $(hdrdir)/ruby/internal/config.h
+protect.o: $(hdrdir)/ruby/internal/constant_p.h
+protect.o: $(hdrdir)/ruby/internal/core.h
+protect.o: $(hdrdir)/ruby/internal/core/rarray.h
+protect.o: $(hdrdir)/ruby/internal/core/rbasic.h
+protect.o: $(hdrdir)/ruby/internal/core/rbignum.h
+protect.o: $(hdrdir)/ruby/internal/core/rclass.h
+protect.o: $(hdrdir)/ruby/internal/core/rdata.h
+protect.o: $(hdrdir)/ruby/internal/core/rfile.h
+protect.o: $(hdrdir)/ruby/internal/core/rhash.h
+protect.o: $(hdrdir)/ruby/internal/core/robject.h
+protect.o: $(hdrdir)/ruby/internal/core/rregexp.h
+protect.o: $(hdrdir)/ruby/internal/core/rstring.h
+protect.o: $(hdrdir)/ruby/internal/core/rstruct.h
+protect.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+protect.o: $(hdrdir)/ruby/internal/ctype.h
+protect.o: $(hdrdir)/ruby/internal/dllexport.h
+protect.o: $(hdrdir)/ruby/internal/dosish.h
+protect.o: $(hdrdir)/ruby/internal/error.h
+protect.o: $(hdrdir)/ruby/internal/eval.h
+protect.o: $(hdrdir)/ruby/internal/event.h
+protect.o: $(hdrdir)/ruby/internal/fl_type.h
+protect.o: $(hdrdir)/ruby/internal/gc.h
+protect.o: $(hdrdir)/ruby/internal/glob.h
+protect.o: $(hdrdir)/ruby/internal/globals.h
+protect.o: $(hdrdir)/ruby/internal/has/attribute.h
+protect.o: $(hdrdir)/ruby/internal/has/builtin.h
+protect.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+protect.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+protect.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+protect.o: $(hdrdir)/ruby/internal/has/extension.h
+protect.o: $(hdrdir)/ruby/internal/has/feature.h
+protect.o: $(hdrdir)/ruby/internal/has/warning.h
+protect.o: $(hdrdir)/ruby/internal/intern/array.h
+protect.o: $(hdrdir)/ruby/internal/intern/bignum.h
+protect.o: $(hdrdir)/ruby/internal/intern/class.h
+protect.o: $(hdrdir)/ruby/internal/intern/compar.h
+protect.o: $(hdrdir)/ruby/internal/intern/complex.h
+protect.o: $(hdrdir)/ruby/internal/intern/cont.h
+protect.o: $(hdrdir)/ruby/internal/intern/dir.h
+protect.o: $(hdrdir)/ruby/internal/intern/enum.h
+protect.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+protect.o: $(hdrdir)/ruby/internal/intern/error.h
+protect.o: $(hdrdir)/ruby/internal/intern/eval.h
+protect.o: $(hdrdir)/ruby/internal/intern/file.h
+protect.o: $(hdrdir)/ruby/internal/intern/gc.h
+protect.o: $(hdrdir)/ruby/internal/intern/hash.h
+protect.o: $(hdrdir)/ruby/internal/intern/io.h
+protect.o: $(hdrdir)/ruby/internal/intern/load.h
+protect.o: $(hdrdir)/ruby/internal/intern/marshal.h
+protect.o: $(hdrdir)/ruby/internal/intern/numeric.h
+protect.o: $(hdrdir)/ruby/internal/intern/object.h
+protect.o: $(hdrdir)/ruby/internal/intern/parse.h
+protect.o: $(hdrdir)/ruby/internal/intern/proc.h
+protect.o: $(hdrdir)/ruby/internal/intern/process.h
+protect.o: $(hdrdir)/ruby/internal/intern/random.h
+protect.o: $(hdrdir)/ruby/internal/intern/range.h
+protect.o: $(hdrdir)/ruby/internal/intern/rational.h
+protect.o: $(hdrdir)/ruby/internal/intern/re.h
+protect.o: $(hdrdir)/ruby/internal/intern/ruby.h
+protect.o: $(hdrdir)/ruby/internal/intern/select.h
+protect.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+protect.o: $(hdrdir)/ruby/internal/intern/signal.h
+protect.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+protect.o: $(hdrdir)/ruby/internal/intern/string.h
+protect.o: $(hdrdir)/ruby/internal/intern/struct.h
+protect.o: $(hdrdir)/ruby/internal/intern/thread.h
+protect.o: $(hdrdir)/ruby/internal/intern/time.h
+protect.o: $(hdrdir)/ruby/internal/intern/variable.h
+protect.o: $(hdrdir)/ruby/internal/intern/vm.h
+protect.o: $(hdrdir)/ruby/internal/interpreter.h
+protect.o: $(hdrdir)/ruby/internal/iterator.h
+protect.o: $(hdrdir)/ruby/internal/memory.h
+protect.o: $(hdrdir)/ruby/internal/method.h
+protect.o: $(hdrdir)/ruby/internal/module.h
+protect.o: $(hdrdir)/ruby/internal/newobj.h
+protect.o: $(hdrdir)/ruby/internal/rgengc.h
+protect.o: $(hdrdir)/ruby/internal/scan_args.h
+protect.o: $(hdrdir)/ruby/internal/special_consts.h
+protect.o: $(hdrdir)/ruby/internal/static_assert.h
+protect.o: $(hdrdir)/ruby/internal/stdalign.h
+protect.o: $(hdrdir)/ruby/internal/stdbool.h
+protect.o: $(hdrdir)/ruby/internal/symbol.h
+protect.o: $(hdrdir)/ruby/internal/token_paste.h
+protect.o: $(hdrdir)/ruby/internal/value.h
+protect.o: $(hdrdir)/ruby/internal/value_type.h
+protect.o: $(hdrdir)/ruby/internal/variable.h
+protect.o: $(hdrdir)/ruby/internal/warning_push.h
+protect.o: $(hdrdir)/ruby/internal/xmalloc.h
+protect.o: $(hdrdir)/ruby/assert.h
+protect.o: $(hdrdir)/ruby/backward.h
+protect.o: $(hdrdir)/ruby/backward/2/assume.h
+protect.o: $(hdrdir)/ruby/backward/2/attributes.h
+protect.o: $(hdrdir)/ruby/backward/2/bool.h
+protect.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+protect.o: $(hdrdir)/ruby/backward/2/inttypes.h
+protect.o: $(hdrdir)/ruby/backward/2/limits.h
+protect.o: $(hdrdir)/ruby/backward/2/long_long.h
+protect.o: $(hdrdir)/ruby/backward/2/stdalign.h
+protect.o: $(hdrdir)/ruby/backward/2/stdarg.h
+protect.o: $(hdrdir)/ruby/defines.h
+protect.o: $(hdrdir)/ruby/intern.h
+protect.o: $(hdrdir)/ruby/missing.h
+protect.o: $(hdrdir)/ruby/ruby.h
+protect.o: $(hdrdir)/ruby/st.h
+protect.o: $(hdrdir)/ruby/subst.h
+protect.o: protect.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/load/protect/extconf.rb b/ext/-test-/load/protect/extconf.rb
new file mode 100644
index 0000000000..83c080de9c
--- /dev/null
+++ b/ext/-test-/load/protect/extconf.rb
@@ -0,0 +1 @@
+create_makefile('-test-/load/protect')
diff --git a/ext/-test-/load/protect/protect.c b/ext/-test-/load/protect/protect.c
new file mode 100644
index 0000000000..ccfbbb9ea0
--- /dev/null
+++ b/ext/-test-/load/protect/protect.c
@@ -0,0 +1,19 @@
+#include <ruby.h>
+
+static VALUE
+load_protect(int argc, VALUE *argv, VALUE self)
+{
+    int state;
+    VALUE path, wrap;
+    rb_scan_args(argc, argv, "11", &path, &wrap);
+    rb_load_protect(path, RTEST(wrap), &state);
+    if (state) rb_jump_tag(state);
+    return Qnil;
+}
+
+void
+Init_protect(void)
+{
+    VALUE mod = rb_define_module("Bug");
+    rb_define_singleton_method(mod, "load_protect", load_protect, -1);
+}
diff --git a/ext/-test-/marshal/compat/depend b/ext/-test-/marshal/compat/depend
new file mode 100644
index 0000000000..017a555852
--- /dev/null
+++ b/ext/-test-/marshal/compat/depend
@@ -0,0 +1,163 @@
+# AUTOGENERATED DEPENDENCIES START
+usrcompat.o: $(RUBY_EXTCONF_H)
+usrcompat.o: $(arch_hdrdir)/ruby/config.h
+usrcompat.o: $(hdrdir)/ruby.h
+usrcompat.o: $(hdrdir)/ruby/internal/anyargs.h
+usrcompat.o: $(hdrdir)/ruby/internal/arithmetic.h
+usrcompat.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+usrcompat.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+usrcompat.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+usrcompat.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+usrcompat.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+usrcompat.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+usrcompat.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+usrcompat.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+usrcompat.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+usrcompat.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+usrcompat.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+usrcompat.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+usrcompat.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+usrcompat.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+usrcompat.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+usrcompat.o: $(hdrdir)/ruby/internal/assume.h
+usrcompat.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+usrcompat.o: $(hdrdir)/ruby/internal/attr/artificial.h
+usrcompat.o: $(hdrdir)/ruby/internal/attr/cold.h
+usrcompat.o: $(hdrdir)/ruby/internal/attr/const.h
+usrcompat.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+usrcompat.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+usrcompat.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+usrcompat.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+usrcompat.o: $(hdrdir)/ruby/internal/attr/error.h
+usrcompat.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+usrcompat.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+usrcompat.o: $(hdrdir)/ruby/internal/attr/format.h
+usrcompat.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+usrcompat.o: $(hdrdir)/ruby/internal/attr/noalias.h
+usrcompat.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+usrcompat.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+usrcompat.o: $(hdrdir)/ruby/internal/attr/noinline.h
+usrcompat.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+usrcompat.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+usrcompat.o: $(hdrdir)/ruby/internal/attr/pure.h
+usrcompat.o: $(hdrdir)/ruby/internal/attr/restrict.h
+usrcompat.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+usrcompat.o: $(hdrdir)/ruby/internal/attr/warning.h
+usrcompat.o: $(hdrdir)/ruby/internal/attr/weakref.h
+usrcompat.o: $(hdrdir)/ruby/internal/cast.h
+usrcompat.o: $(hdrdir)/ruby/internal/compiler_is.h
+usrcompat.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+usrcompat.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+usrcompat.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+usrcompat.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+usrcompat.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+usrcompat.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+usrcompat.o: $(hdrdir)/ruby/internal/compiler_since.h
+usrcompat.o: $(hdrdir)/ruby/internal/config.h
+usrcompat.o: $(hdrdir)/ruby/internal/constant_p.h
+usrcompat.o: $(hdrdir)/ruby/internal/core.h
+usrcompat.o: $(hdrdir)/ruby/internal/core/rarray.h
+usrcompat.o: $(hdrdir)/ruby/internal/core/rbasic.h
+usrcompat.o: $(hdrdir)/ruby/internal/core/rbignum.h
+usrcompat.o: $(hdrdir)/ruby/internal/core/rclass.h
+usrcompat.o: $(hdrdir)/ruby/internal/core/rdata.h
+usrcompat.o: $(hdrdir)/ruby/internal/core/rfile.h
+usrcompat.o: $(hdrdir)/ruby/internal/core/rhash.h
+usrcompat.o: $(hdrdir)/ruby/internal/core/robject.h
+usrcompat.o: $(hdrdir)/ruby/internal/core/rregexp.h
+usrcompat.o: $(hdrdir)/ruby/internal/core/rstring.h
+usrcompat.o: $(hdrdir)/ruby/internal/core/rstruct.h
+usrcompat.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+usrcompat.o: $(hdrdir)/ruby/internal/ctype.h
+usrcompat.o: $(hdrdir)/ruby/internal/dllexport.h
+usrcompat.o: $(hdrdir)/ruby/internal/dosish.h
+usrcompat.o: $(hdrdir)/ruby/internal/error.h
+usrcompat.o: $(hdrdir)/ruby/internal/eval.h
+usrcompat.o: $(hdrdir)/ruby/internal/event.h
+usrcompat.o: $(hdrdir)/ruby/internal/fl_type.h
+usrcompat.o: $(hdrdir)/ruby/internal/gc.h
+usrcompat.o: $(hdrdir)/ruby/internal/glob.h
+usrcompat.o: $(hdrdir)/ruby/internal/globals.h
+usrcompat.o: $(hdrdir)/ruby/internal/has/attribute.h
+usrcompat.o: $(hdrdir)/ruby/internal/has/builtin.h
+usrcompat.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+usrcompat.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+usrcompat.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+usrcompat.o: $(hdrdir)/ruby/internal/has/extension.h
+usrcompat.o: $(hdrdir)/ruby/internal/has/feature.h
+usrcompat.o: $(hdrdir)/ruby/internal/has/warning.h
+usrcompat.o: $(hdrdir)/ruby/internal/intern/array.h
+usrcompat.o: $(hdrdir)/ruby/internal/intern/bignum.h
+usrcompat.o: $(hdrdir)/ruby/internal/intern/class.h
+usrcompat.o: $(hdrdir)/ruby/internal/intern/compar.h
+usrcompat.o: $(hdrdir)/ruby/internal/intern/complex.h
+usrcompat.o: $(hdrdir)/ruby/internal/intern/cont.h
+usrcompat.o: $(hdrdir)/ruby/internal/intern/dir.h
+usrcompat.o: $(hdrdir)/ruby/internal/intern/enum.h
+usrcompat.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+usrcompat.o: $(hdrdir)/ruby/internal/intern/error.h
+usrcompat.o: $(hdrdir)/ruby/internal/intern/eval.h
+usrcompat.o: $(hdrdir)/ruby/internal/intern/file.h
+usrcompat.o: $(hdrdir)/ruby/internal/intern/gc.h
+usrcompat.o: $(hdrdir)/ruby/internal/intern/hash.h
+usrcompat.o: $(hdrdir)/ruby/internal/intern/io.h
+usrcompat.o: $(hdrdir)/ruby/internal/intern/load.h
+usrcompat.o: $(hdrdir)/ruby/internal/intern/marshal.h
+usrcompat.o: $(hdrdir)/ruby/internal/intern/numeric.h
+usrcompat.o: $(hdrdir)/ruby/internal/intern/object.h
+usrcompat.o: $(hdrdir)/ruby/internal/intern/parse.h
+usrcompat.o: $(hdrdir)/ruby/internal/intern/proc.h
+usrcompat.o: $(hdrdir)/ruby/internal/intern/process.h
+usrcompat.o: $(hdrdir)/ruby/internal/intern/random.h
+usrcompat.o: $(hdrdir)/ruby/internal/intern/range.h
+usrcompat.o: $(hdrdir)/ruby/internal/intern/rational.h
+usrcompat.o: $(hdrdir)/ruby/internal/intern/re.h
+usrcompat.o: $(hdrdir)/ruby/internal/intern/ruby.h
+usrcompat.o: $(hdrdir)/ruby/internal/intern/select.h
+usrcompat.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+usrcompat.o: $(hdrdir)/ruby/internal/intern/signal.h
+usrcompat.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+usrcompat.o: $(hdrdir)/ruby/internal/intern/string.h
+usrcompat.o: $(hdrdir)/ruby/internal/intern/struct.h
+usrcompat.o: $(hdrdir)/ruby/internal/intern/thread.h
+usrcompat.o: $(hdrdir)/ruby/internal/intern/time.h
+usrcompat.o: $(hdrdir)/ruby/internal/intern/variable.h
+usrcompat.o: $(hdrdir)/ruby/internal/intern/vm.h
+usrcompat.o: $(hdrdir)/ruby/internal/interpreter.h
+usrcompat.o: $(hdrdir)/ruby/internal/iterator.h
+usrcompat.o: $(hdrdir)/ruby/internal/memory.h
+usrcompat.o: $(hdrdir)/ruby/internal/method.h
+usrcompat.o: $(hdrdir)/ruby/internal/module.h
+usrcompat.o: $(hdrdir)/ruby/internal/newobj.h
+usrcompat.o: $(hdrdir)/ruby/internal/rgengc.h
+usrcompat.o: $(hdrdir)/ruby/internal/scan_args.h
+usrcompat.o: $(hdrdir)/ruby/internal/special_consts.h
+usrcompat.o: $(hdrdir)/ruby/internal/static_assert.h
+usrcompat.o: $(hdrdir)/ruby/internal/stdalign.h
+usrcompat.o: $(hdrdir)/ruby/internal/stdbool.h
+usrcompat.o: $(hdrdir)/ruby/internal/symbol.h
+usrcompat.o: $(hdrdir)/ruby/internal/token_paste.h
+usrcompat.o: $(hdrdir)/ruby/internal/value.h
+usrcompat.o: $(hdrdir)/ruby/internal/value_type.h
+usrcompat.o: $(hdrdir)/ruby/internal/variable.h
+usrcompat.o: $(hdrdir)/ruby/internal/warning_push.h
+usrcompat.o: $(hdrdir)/ruby/internal/xmalloc.h
+usrcompat.o: $(hdrdir)/ruby/assert.h
+usrcompat.o: $(hdrdir)/ruby/backward.h
+usrcompat.o: $(hdrdir)/ruby/backward/2/assume.h
+usrcompat.o: $(hdrdir)/ruby/backward/2/attributes.h
+usrcompat.o: $(hdrdir)/ruby/backward/2/bool.h
+usrcompat.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+usrcompat.o: $(hdrdir)/ruby/backward/2/inttypes.h
+usrcompat.o: $(hdrdir)/ruby/backward/2/limits.h
+usrcompat.o: $(hdrdir)/ruby/backward/2/long_long.h
+usrcompat.o: $(hdrdir)/ruby/backward/2/stdalign.h
+usrcompat.o: $(hdrdir)/ruby/backward/2/stdarg.h
+usrcompat.o: $(hdrdir)/ruby/defines.h
+usrcompat.o: $(hdrdir)/ruby/intern.h
+usrcompat.o: $(hdrdir)/ruby/missing.h
+usrcompat.o: $(hdrdir)/ruby/ruby.h
+usrcompat.o: $(hdrdir)/ruby/st.h
+usrcompat.o: $(hdrdir)/ruby/subst.h
+usrcompat.o: usrcompat.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/marshal/internal_ivar/depend b/ext/-test-/marshal/internal_ivar/depend
new file mode 100644
index 0000000000..73b76c9080
--- /dev/null
+++ b/ext/-test-/marshal/internal_ivar/depend
@@ -0,0 +1,163 @@
+# AUTOGENERATED DEPENDENCIES START
+internal_ivar.o: $(RUBY_EXTCONF_H)
+internal_ivar.o: $(arch_hdrdir)/ruby/config.h
+internal_ivar.o: $(hdrdir)/ruby.h
+internal_ivar.o: $(hdrdir)/ruby/internal/anyargs.h
+internal_ivar.o: $(hdrdir)/ruby/internal/arithmetic.h
+internal_ivar.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+internal_ivar.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+internal_ivar.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+internal_ivar.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+internal_ivar.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+internal_ivar.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+internal_ivar.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+internal_ivar.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+internal_ivar.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+internal_ivar.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+internal_ivar.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+internal_ivar.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+internal_ivar.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+internal_ivar.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+internal_ivar.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+internal_ivar.o: $(hdrdir)/ruby/internal/assume.h
+internal_ivar.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+internal_ivar.o: $(hdrdir)/ruby/internal/attr/artificial.h
+internal_ivar.o: $(hdrdir)/ruby/internal/attr/cold.h
+internal_ivar.o: $(hdrdir)/ruby/internal/attr/const.h
+internal_ivar.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+internal_ivar.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+internal_ivar.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+internal_ivar.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+internal_ivar.o: $(hdrdir)/ruby/internal/attr/error.h
+internal_ivar.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+internal_ivar.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+internal_ivar.o: $(hdrdir)/ruby/internal/attr/format.h
+internal_ivar.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+internal_ivar.o: $(hdrdir)/ruby/internal/attr/noalias.h
+internal_ivar.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+internal_ivar.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+internal_ivar.o: $(hdrdir)/ruby/internal/attr/noinline.h
+internal_ivar.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+internal_ivar.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+internal_ivar.o: $(hdrdir)/ruby/internal/attr/pure.h
+internal_ivar.o: $(hdrdir)/ruby/internal/attr/restrict.h
+internal_ivar.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+internal_ivar.o: $(hdrdir)/ruby/internal/attr/warning.h
+internal_ivar.o: $(hdrdir)/ruby/internal/attr/weakref.h
+internal_ivar.o: $(hdrdir)/ruby/internal/cast.h
+internal_ivar.o: $(hdrdir)/ruby/internal/compiler_is.h
+internal_ivar.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+internal_ivar.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+internal_ivar.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+internal_ivar.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+internal_ivar.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+internal_ivar.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+internal_ivar.o: $(hdrdir)/ruby/internal/compiler_since.h
+internal_ivar.o: $(hdrdir)/ruby/internal/config.h
+internal_ivar.o: $(hdrdir)/ruby/internal/constant_p.h
+internal_ivar.o: $(hdrdir)/ruby/internal/core.h
+internal_ivar.o: $(hdrdir)/ruby/internal/core/rarray.h
+internal_ivar.o: $(hdrdir)/ruby/internal/core/rbasic.h
+internal_ivar.o: $(hdrdir)/ruby/internal/core/rbignum.h
+internal_ivar.o: $(hdrdir)/ruby/internal/core/rclass.h
+internal_ivar.o: $(hdrdir)/ruby/internal/core/rdata.h
+internal_ivar.o: $(hdrdir)/ruby/internal/core/rfile.h
+internal_ivar.o: $(hdrdir)/ruby/internal/core/rhash.h
+internal_ivar.o: $(hdrdir)/ruby/internal/core/robject.h
+internal_ivar.o: $(hdrdir)/ruby/internal/core/rregexp.h
+internal_ivar.o: $(hdrdir)/ruby/internal/core/rstring.h
+internal_ivar.o: $(hdrdir)/ruby/internal/core/rstruct.h
+internal_ivar.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+internal_ivar.o: $(hdrdir)/ruby/internal/ctype.h
+internal_ivar.o: $(hdrdir)/ruby/internal/dllexport.h
+internal_ivar.o: $(hdrdir)/ruby/internal/dosish.h
+internal_ivar.o: $(hdrdir)/ruby/internal/error.h
+internal_ivar.o: $(hdrdir)/ruby/internal/eval.h
+internal_ivar.o: $(hdrdir)/ruby/internal/event.h
+internal_ivar.o: $(hdrdir)/ruby/internal/fl_type.h
+internal_ivar.o: $(hdrdir)/ruby/internal/gc.h
+internal_ivar.o: $(hdrdir)/ruby/internal/glob.h
+internal_ivar.o: $(hdrdir)/ruby/internal/globals.h
+internal_ivar.o: $(hdrdir)/ruby/internal/has/attribute.h
+internal_ivar.o: $(hdrdir)/ruby/internal/has/builtin.h
+internal_ivar.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+internal_ivar.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+internal_ivar.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+internal_ivar.o: $(hdrdir)/ruby/internal/has/extension.h
+internal_ivar.o: $(hdrdir)/ruby/internal/has/feature.h
+internal_ivar.o: $(hdrdir)/ruby/internal/has/warning.h
+internal_ivar.o: $(hdrdir)/ruby/internal/intern/array.h
+internal_ivar.o: $(hdrdir)/ruby/internal/intern/bignum.h
+internal_ivar.o: $(hdrdir)/ruby/internal/intern/class.h
+internal_ivar.o: $(hdrdir)/ruby/internal/intern/compar.h
+internal_ivar.o: $(hdrdir)/ruby/internal/intern/complex.h
+internal_ivar.o: $(hdrdir)/ruby/internal/intern/cont.h
+internal_ivar.o: $(hdrdir)/ruby/internal/intern/dir.h
+internal_ivar.o: $(hdrdir)/ruby/internal/intern/enum.h
+internal_ivar.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+internal_ivar.o: $(hdrdir)/ruby/internal/intern/error.h
+internal_ivar.o: $(hdrdir)/ruby/internal/intern/eval.h
+internal_ivar.o: $(hdrdir)/ruby/internal/intern/file.h
+internal_ivar.o: $(hdrdir)/ruby/internal/intern/gc.h
+internal_ivar.o: $(hdrdir)/ruby/internal/intern/hash.h
+internal_ivar.o: $(hdrdir)/ruby/internal/intern/io.h
+internal_ivar.o: $(hdrdir)/ruby/internal/intern/load.h
+internal_ivar.o: $(hdrdir)/ruby/internal/intern/marshal.h
+internal_ivar.o: $(hdrdir)/ruby/internal/intern/numeric.h
+internal_ivar.o: $(hdrdir)/ruby/internal/intern/object.h
+internal_ivar.o: $(hdrdir)/ruby/internal/intern/parse.h
+internal_ivar.o: $(hdrdir)/ruby/internal/intern/proc.h
+internal_ivar.o: $(hdrdir)/ruby/internal/intern/process.h
+internal_ivar.o: $(hdrdir)/ruby/internal/intern/random.h
+internal_ivar.o: $(hdrdir)/ruby/internal/intern/range.h
+internal_ivar.o: $(hdrdir)/ruby/internal/intern/rational.h
+internal_ivar.o: $(hdrdir)/ruby/internal/intern/re.h
+internal_ivar.o: $(hdrdir)/ruby/internal/intern/ruby.h
+internal_ivar.o: $(hdrdir)/ruby/internal/intern/select.h
+internal_ivar.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+internal_ivar.o: $(hdrdir)/ruby/internal/intern/signal.h
+internal_ivar.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+internal_ivar.o: $(hdrdir)/ruby/internal/intern/string.h
+internal_ivar.o: $(hdrdir)/ruby/internal/intern/struct.h
+internal_ivar.o: $(hdrdir)/ruby/internal/intern/thread.h
+internal_ivar.o: $(hdrdir)/ruby/internal/intern/time.h
+internal_ivar.o: $(hdrdir)/ruby/internal/intern/variable.h
+internal_ivar.o: $(hdrdir)/ruby/internal/intern/vm.h
+internal_ivar.o: $(hdrdir)/ruby/internal/interpreter.h
+internal_ivar.o: $(hdrdir)/ruby/internal/iterator.h
+internal_ivar.o: $(hdrdir)/ruby/internal/memory.h
+internal_ivar.o: $(hdrdir)/ruby/internal/method.h
+internal_ivar.o: $(hdrdir)/ruby/internal/module.h
+internal_ivar.o: $(hdrdir)/ruby/internal/newobj.h
+internal_ivar.o: $(hdrdir)/ruby/internal/rgengc.h
+internal_ivar.o: $(hdrdir)/ruby/internal/scan_args.h
+internal_ivar.o: $(hdrdir)/ruby/internal/special_consts.h
+internal_ivar.o: $(hdrdir)/ruby/internal/static_assert.h
+internal_ivar.o: $(hdrdir)/ruby/internal/stdalign.h
+internal_ivar.o: $(hdrdir)/ruby/internal/stdbool.h
+internal_ivar.o: $(hdrdir)/ruby/internal/symbol.h
+internal_ivar.o: $(hdrdir)/ruby/internal/token_paste.h
+internal_ivar.o: $(hdrdir)/ruby/internal/value.h
+internal_ivar.o: $(hdrdir)/ruby/internal/value_type.h
+internal_ivar.o: $(hdrdir)/ruby/internal/variable.h
+internal_ivar.o: $(hdrdir)/ruby/internal/warning_push.h
+internal_ivar.o: $(hdrdir)/ruby/internal/xmalloc.h
+internal_ivar.o: $(hdrdir)/ruby/assert.h
+internal_ivar.o: $(hdrdir)/ruby/backward.h
+internal_ivar.o: $(hdrdir)/ruby/backward/2/assume.h
+internal_ivar.o: $(hdrdir)/ruby/backward/2/attributes.h
+internal_ivar.o: $(hdrdir)/ruby/backward/2/bool.h
+internal_ivar.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+internal_ivar.o: $(hdrdir)/ruby/backward/2/inttypes.h
+internal_ivar.o: $(hdrdir)/ruby/backward/2/limits.h
+internal_ivar.o: $(hdrdir)/ruby/backward/2/long_long.h
+internal_ivar.o: $(hdrdir)/ruby/backward/2/stdalign.h
+internal_ivar.o: $(hdrdir)/ruby/backward/2/stdarg.h
+internal_ivar.o: $(hdrdir)/ruby/defines.h
+internal_ivar.o: $(hdrdir)/ruby/intern.h
+internal_ivar.o: $(hdrdir)/ruby/missing.h
+internal_ivar.o: $(hdrdir)/ruby/ruby.h
+internal_ivar.o: $(hdrdir)/ruby/st.h
+internal_ivar.o: $(hdrdir)/ruby/subst.h
+internal_ivar.o: internal_ivar.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/marshal/internal_ivar/internal_ivar.c b/ext/-test-/marshal/internal_ivar/internal_ivar.c
index 299da27f23..de0cf711aa 100644
--- a/ext/-test-/marshal/internal_ivar/internal_ivar.c
+++ b/ext/-test-/marshal/internal_ivar/internal_ivar.c
@@ -1,12 +1,13 @@
 #include <ruby.h>
 
-static ID id_normal_ivar, id_internal_ivar;
+static ID id_normal_ivar, id_internal_ivar, id_encoding_short;
 
 static VALUE
-init(VALUE self, VALUE arg1, VALUE arg2)
+init(VALUE self, VALUE arg1, VALUE arg2, VALUE arg3)
 {
     rb_ivar_set(self, id_normal_ivar, arg1);
     rb_ivar_set(self, id_internal_ivar, arg2);
+    rb_ivar_set(self, id_encoding_short, arg3);
     return self;
 }
 
@@ -22,6 +23,12 @@ get_internal(VALUE self)
     return rb_attr_get(self, id_internal_ivar);
 }
 
+static VALUE
+get_encoding_short(VALUE self)
+{
+    return rb_attr_get(self, id_encoding_short);
+}
+
 void
 Init_internal_ivar(void)
 {
@@ -33,7 +40,9 @@ Init_internal_ivar(void)
     /* leave id_internal_ivar being 0 */
     id_internal_ivar = rb_make_internal_id();
 #endif
-    rb_define_method(newclass, "initialize", init, 2);
+    id_encoding_short = rb_intern_const("E");
+    rb_define_method(newclass, "initialize", init, 3);
     rb_define_method(newclass, "normal", get_normal, 0);
     rb_define_method(newclass, "internal", get_internal, 0);
+    rb_define_method(newclass, "encoding_short", get_encoding_short, 0);
 }
diff --git a/ext/-test-/marshal/usr/depend b/ext/-test-/marshal/usr/depend
new file mode 100644
index 0000000000..bf96e44d02
--- /dev/null
+++ b/ext/-test-/marshal/usr/depend
@@ -0,0 +1,163 @@
+# AUTOGENERATED DEPENDENCIES START
+usrmarshal.o: $(RUBY_EXTCONF_H)
+usrmarshal.o: $(arch_hdrdir)/ruby/config.h
+usrmarshal.o: $(hdrdir)/ruby.h
+usrmarshal.o: $(hdrdir)/ruby/internal/anyargs.h
+usrmarshal.o: $(hdrdir)/ruby/internal/arithmetic.h
+usrmarshal.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+usrmarshal.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+usrmarshal.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+usrmarshal.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+usrmarshal.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+usrmarshal.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+usrmarshal.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+usrmarshal.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+usrmarshal.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+usrmarshal.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+usrmarshal.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+usrmarshal.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+usrmarshal.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+usrmarshal.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+usrmarshal.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+usrmarshal.o: $(hdrdir)/ruby/internal/assume.h
+usrmarshal.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+usrmarshal.o: $(hdrdir)/ruby/internal/attr/artificial.h
+usrmarshal.o: $(hdrdir)/ruby/internal/attr/cold.h
+usrmarshal.o: $(hdrdir)/ruby/internal/attr/const.h
+usrmarshal.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+usrmarshal.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+usrmarshal.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+usrmarshal.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+usrmarshal.o: $(hdrdir)/ruby/internal/attr/error.h
+usrmarshal.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+usrmarshal.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+usrmarshal.o: $(hdrdir)/ruby/internal/attr/format.h
+usrmarshal.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+usrmarshal.o: $(hdrdir)/ruby/internal/attr/noalias.h
+usrmarshal.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+usrmarshal.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+usrmarshal.o: $(hdrdir)/ruby/internal/attr/noinline.h
+usrmarshal.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+usrmarshal.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+usrmarshal.o: $(hdrdir)/ruby/internal/attr/pure.h
+usrmarshal.o: $(hdrdir)/ruby/internal/attr/restrict.h
+usrmarshal.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+usrmarshal.o: $(hdrdir)/ruby/internal/attr/warning.h
+usrmarshal.o: $(hdrdir)/ruby/internal/attr/weakref.h
+usrmarshal.o: $(hdrdir)/ruby/internal/cast.h
+usrmarshal.o: $(hdrdir)/ruby/internal/compiler_is.h
+usrmarshal.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+usrmarshal.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+usrmarshal.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+usrmarshal.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+usrmarshal.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+usrmarshal.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+usrmarshal.o: $(hdrdir)/ruby/internal/compiler_since.h
+usrmarshal.o: $(hdrdir)/ruby/internal/config.h
+usrmarshal.o: $(hdrdir)/ruby/internal/constant_p.h
+usrmarshal.o: $(hdrdir)/ruby/internal/core.h
+usrmarshal.o: $(hdrdir)/ruby/internal/core/rarray.h
+usrmarshal.o: $(hdrdir)/ruby/internal/core/rbasic.h
+usrmarshal.o: $(hdrdir)/ruby/internal/core/rbignum.h
+usrmarshal.o: $(hdrdir)/ruby/internal/core/rclass.h
+usrmarshal.o: $(hdrdir)/ruby/internal/core/rdata.h
+usrmarshal.o: $(hdrdir)/ruby/internal/core/rfile.h
+usrmarshal.o: $(hdrdir)/ruby/internal/core/rhash.h
+usrmarshal.o: $(hdrdir)/ruby/internal/core/robject.h
+usrmarshal.o: $(hdrdir)/ruby/internal/core/rregexp.h
+usrmarshal.o: $(hdrdir)/ruby/internal/core/rstring.h
+usrmarshal.o: $(hdrdir)/ruby/internal/core/rstruct.h
+usrmarshal.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+usrmarshal.o: $(hdrdir)/ruby/internal/ctype.h
+usrmarshal.o: $(hdrdir)/ruby/internal/dllexport.h
+usrmarshal.o: $(hdrdir)/ruby/internal/dosish.h
+usrmarshal.o: $(hdrdir)/ruby/internal/error.h
+usrmarshal.o: $(hdrdir)/ruby/internal/eval.h
+usrmarshal.o: $(hdrdir)/ruby/internal/event.h
+usrmarshal.o: $(hdrdir)/ruby/internal/fl_type.h
+usrmarshal.o: $(hdrdir)/ruby/internal/gc.h
+usrmarshal.o: $(hdrdir)/ruby/internal/glob.h
+usrmarshal.o: $(hdrdir)/ruby/internal/globals.h
+usrmarshal.o: $(hdrdir)/ruby/internal/has/attribute.h
+usrmarshal.o: $(hdrdir)/ruby/internal/has/builtin.h
+usrmarshal.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+usrmarshal.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+usrmarshal.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+usrmarshal.o: $(hdrdir)/ruby/internal/has/extension.h
+usrmarshal.o: $(hdrdir)/ruby/internal/has/feature.h
+usrmarshal.o: $(hdrdir)/ruby/internal/has/warning.h
+usrmarshal.o: $(hdrdir)/ruby/internal/intern/array.h
+usrmarshal.o: $(hdrdir)/ruby/internal/intern/bignum.h
+usrmarshal.o: $(hdrdir)/ruby/internal/intern/class.h
+usrmarshal.o: $(hdrdir)/ruby/internal/intern/compar.h
+usrmarshal.o: $(hdrdir)/ruby/internal/intern/complex.h
+usrmarshal.o: $(hdrdir)/ruby/internal/intern/cont.h
+usrmarshal.o: $(hdrdir)/ruby/internal/intern/dir.h
+usrmarshal.o: $(hdrdir)/ruby/internal/intern/enum.h
+usrmarshal.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+usrmarshal.o: $(hdrdir)/ruby/internal/intern/error.h
+usrmarshal.o: $(hdrdir)/ruby/internal/intern/eval.h
+usrmarshal.o: $(hdrdir)/ruby/internal/intern/file.h
+usrmarshal.o: $(hdrdir)/ruby/internal/intern/gc.h
+usrmarshal.o: $(hdrdir)/ruby/internal/intern/hash.h
+usrmarshal.o: $(hdrdir)/ruby/internal/intern/io.h
+usrmarshal.o: $(hdrdir)/ruby/internal/intern/load.h
+usrmarshal.o: $(hdrdir)/ruby/internal/intern/marshal.h
+usrmarshal.o: $(hdrdir)/ruby/internal/intern/numeric.h
+usrmarshal.o: $(hdrdir)/ruby/internal/intern/object.h
+usrmarshal.o: $(hdrdir)/ruby/internal/intern/parse.h
+usrmarshal.o: $(hdrdir)/ruby/internal/intern/proc.h
+usrmarshal.o: $(hdrdir)/ruby/internal/intern/process.h
+usrmarshal.o: $(hdrdir)/ruby/internal/intern/random.h
+usrmarshal.o: $(hdrdir)/ruby/internal/intern/range.h
+usrmarshal.o: $(hdrdir)/ruby/internal/intern/rational.h
+usrmarshal.o: $(hdrdir)/ruby/internal/intern/re.h
+usrmarshal.o: $(hdrdir)/ruby/internal/intern/ruby.h
+usrmarshal.o: $(hdrdir)/ruby/internal/intern/select.h
+usrmarshal.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+usrmarshal.o: $(hdrdir)/ruby/internal/intern/signal.h
+usrmarshal.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+usrmarshal.o: $(hdrdir)/ruby/internal/intern/string.h
+usrmarshal.o: $(hdrdir)/ruby/internal/intern/struct.h
+usrmarshal.o: $(hdrdir)/ruby/internal/intern/thread.h
+usrmarshal.o: $(hdrdir)/ruby/internal/intern/time.h
+usrmarshal.o: $(hdrdir)/ruby/internal/intern/variable.h
+usrmarshal.o: $(hdrdir)/ruby/internal/intern/vm.h
+usrmarshal.o: $(hdrdir)/ruby/internal/interpreter.h
+usrmarshal.o: $(hdrdir)/ruby/internal/iterator.h
+usrmarshal.o: $(hdrdir)/ruby/internal/memory.h
+usrmarshal.o: $(hdrdir)/ruby/internal/method.h
+usrmarshal.o: $(hdrdir)/ruby/internal/module.h
+usrmarshal.o: $(hdrdir)/ruby/internal/newobj.h
+usrmarshal.o: $(hdrdir)/ruby/internal/rgengc.h
+usrmarshal.o: $(hdrdir)/ruby/internal/scan_args.h
+usrmarshal.o: $(hdrdir)/ruby/internal/special_consts.h
+usrmarshal.o: $(hdrdir)/ruby/internal/static_assert.h
+usrmarshal.o: $(hdrdir)/ruby/internal/stdalign.h
+usrmarshal.o: $(hdrdir)/ruby/internal/stdbool.h
+usrmarshal.o: $(hdrdir)/ruby/internal/symbol.h
+usrmarshal.o: $(hdrdir)/ruby/internal/token_paste.h
+usrmarshal.o: $(hdrdir)/ruby/internal/value.h
+usrmarshal.o: $(hdrdir)/ruby/internal/value_type.h
+usrmarshal.o: $(hdrdir)/ruby/internal/variable.h
+usrmarshal.o: $(hdrdir)/ruby/internal/warning_push.h
+usrmarshal.o: $(hdrdir)/ruby/internal/xmalloc.h
+usrmarshal.o: $(hdrdir)/ruby/assert.h
+usrmarshal.o: $(hdrdir)/ruby/backward.h
+usrmarshal.o: $(hdrdir)/ruby/backward/2/assume.h
+usrmarshal.o: $(hdrdir)/ruby/backward/2/attributes.h
+usrmarshal.o: $(hdrdir)/ruby/backward/2/bool.h
+usrmarshal.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+usrmarshal.o: $(hdrdir)/ruby/backward/2/inttypes.h
+usrmarshal.o: $(hdrdir)/ruby/backward/2/limits.h
+usrmarshal.o: $(hdrdir)/ruby/backward/2/long_long.h
+usrmarshal.o: $(hdrdir)/ruby/backward/2/stdalign.h
+usrmarshal.o: $(hdrdir)/ruby/backward/2/stdarg.h
+usrmarshal.o: $(hdrdir)/ruby/defines.h
+usrmarshal.o: $(hdrdir)/ruby/intern.h
+usrmarshal.o: $(hdrdir)/ruby/missing.h
+usrmarshal.o: $(hdrdir)/ruby/ruby.h
+usrmarshal.o: $(hdrdir)/ruby/st.h
+usrmarshal.o: $(hdrdir)/ruby/subst.h
+usrmarshal.o: usrmarshal.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/memory_status/depend b/ext/-test-/memory_status/depend
new file mode 100644
index 0000000000..96a7821451
--- /dev/null
+++ b/ext/-test-/memory_status/depend
@@ -0,0 +1,163 @@
+# AUTOGENERATED DEPENDENCIES START
+memory_status.o: $(RUBY_EXTCONF_H)
+memory_status.o: $(arch_hdrdir)/ruby/config.h
+memory_status.o: $(hdrdir)/ruby.h
+memory_status.o: $(hdrdir)/ruby/assert.h
+memory_status.o: $(hdrdir)/ruby/backward.h
+memory_status.o: $(hdrdir)/ruby/backward/2/assume.h
+memory_status.o: $(hdrdir)/ruby/backward/2/attributes.h
+memory_status.o: $(hdrdir)/ruby/backward/2/bool.h
+memory_status.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+memory_status.o: $(hdrdir)/ruby/backward/2/inttypes.h
+memory_status.o: $(hdrdir)/ruby/backward/2/limits.h
+memory_status.o: $(hdrdir)/ruby/backward/2/long_long.h
+memory_status.o: $(hdrdir)/ruby/backward/2/stdalign.h
+memory_status.o: $(hdrdir)/ruby/backward/2/stdarg.h
+memory_status.o: $(hdrdir)/ruby/defines.h
+memory_status.o: $(hdrdir)/ruby/intern.h
+memory_status.o: $(hdrdir)/ruby/internal/anyargs.h
+memory_status.o: $(hdrdir)/ruby/internal/arithmetic.h
+memory_status.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+memory_status.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+memory_status.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+memory_status.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+memory_status.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+memory_status.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+memory_status.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+memory_status.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+memory_status.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+memory_status.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+memory_status.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+memory_status.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+memory_status.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+memory_status.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+memory_status.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+memory_status.o: $(hdrdir)/ruby/internal/assume.h
+memory_status.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+memory_status.o: $(hdrdir)/ruby/internal/attr/artificial.h
+memory_status.o: $(hdrdir)/ruby/internal/attr/cold.h
+memory_status.o: $(hdrdir)/ruby/internal/attr/const.h
+memory_status.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+memory_status.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+memory_status.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+memory_status.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+memory_status.o: $(hdrdir)/ruby/internal/attr/error.h
+memory_status.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+memory_status.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+memory_status.o: $(hdrdir)/ruby/internal/attr/format.h
+memory_status.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+memory_status.o: $(hdrdir)/ruby/internal/attr/noalias.h
+memory_status.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+memory_status.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+memory_status.o: $(hdrdir)/ruby/internal/attr/noinline.h
+memory_status.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+memory_status.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+memory_status.o: $(hdrdir)/ruby/internal/attr/pure.h
+memory_status.o: $(hdrdir)/ruby/internal/attr/restrict.h
+memory_status.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+memory_status.o: $(hdrdir)/ruby/internal/attr/warning.h
+memory_status.o: $(hdrdir)/ruby/internal/attr/weakref.h
+memory_status.o: $(hdrdir)/ruby/internal/cast.h
+memory_status.o: $(hdrdir)/ruby/internal/compiler_is.h
+memory_status.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+memory_status.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+memory_status.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+memory_status.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+memory_status.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+memory_status.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+memory_status.o: $(hdrdir)/ruby/internal/compiler_since.h
+memory_status.o: $(hdrdir)/ruby/internal/config.h
+memory_status.o: $(hdrdir)/ruby/internal/constant_p.h
+memory_status.o: $(hdrdir)/ruby/internal/core.h
+memory_status.o: $(hdrdir)/ruby/internal/core/rarray.h
+memory_status.o: $(hdrdir)/ruby/internal/core/rbasic.h
+memory_status.o: $(hdrdir)/ruby/internal/core/rbignum.h
+memory_status.o: $(hdrdir)/ruby/internal/core/rclass.h
+memory_status.o: $(hdrdir)/ruby/internal/core/rdata.h
+memory_status.o: $(hdrdir)/ruby/internal/core/rfile.h
+memory_status.o: $(hdrdir)/ruby/internal/core/rhash.h
+memory_status.o: $(hdrdir)/ruby/internal/core/robject.h
+memory_status.o: $(hdrdir)/ruby/internal/core/rregexp.h
+memory_status.o: $(hdrdir)/ruby/internal/core/rstring.h
+memory_status.o: $(hdrdir)/ruby/internal/core/rstruct.h
+memory_status.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+memory_status.o: $(hdrdir)/ruby/internal/ctype.h
+memory_status.o: $(hdrdir)/ruby/internal/dllexport.h
+memory_status.o: $(hdrdir)/ruby/internal/dosish.h
+memory_status.o: $(hdrdir)/ruby/internal/error.h
+memory_status.o: $(hdrdir)/ruby/internal/eval.h
+memory_status.o: $(hdrdir)/ruby/internal/event.h
+memory_status.o: $(hdrdir)/ruby/internal/fl_type.h
+memory_status.o: $(hdrdir)/ruby/internal/gc.h
+memory_status.o: $(hdrdir)/ruby/internal/glob.h
+memory_status.o: $(hdrdir)/ruby/internal/globals.h
+memory_status.o: $(hdrdir)/ruby/internal/has/attribute.h
+memory_status.o: $(hdrdir)/ruby/internal/has/builtin.h
+memory_status.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+memory_status.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+memory_status.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+memory_status.o: $(hdrdir)/ruby/internal/has/extension.h
+memory_status.o: $(hdrdir)/ruby/internal/has/feature.h
+memory_status.o: $(hdrdir)/ruby/internal/has/warning.h
+memory_status.o: $(hdrdir)/ruby/internal/intern/array.h
+memory_status.o: $(hdrdir)/ruby/internal/intern/bignum.h
+memory_status.o: $(hdrdir)/ruby/internal/intern/class.h
+memory_status.o: $(hdrdir)/ruby/internal/intern/compar.h
+memory_status.o: $(hdrdir)/ruby/internal/intern/complex.h
+memory_status.o: $(hdrdir)/ruby/internal/intern/cont.h
+memory_status.o: $(hdrdir)/ruby/internal/intern/dir.h
+memory_status.o: $(hdrdir)/ruby/internal/intern/enum.h
+memory_status.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+memory_status.o: $(hdrdir)/ruby/internal/intern/error.h
+memory_status.o: $(hdrdir)/ruby/internal/intern/eval.h
+memory_status.o: $(hdrdir)/ruby/internal/intern/file.h
+memory_status.o: $(hdrdir)/ruby/internal/intern/gc.h
+memory_status.o: $(hdrdir)/ruby/internal/intern/hash.h
+memory_status.o: $(hdrdir)/ruby/internal/intern/io.h
+memory_status.o: $(hdrdir)/ruby/internal/intern/load.h
+memory_status.o: $(hdrdir)/ruby/internal/intern/marshal.h
+memory_status.o: $(hdrdir)/ruby/internal/intern/numeric.h
+memory_status.o: $(hdrdir)/ruby/internal/intern/object.h
+memory_status.o: $(hdrdir)/ruby/internal/intern/parse.h
+memory_status.o: $(hdrdir)/ruby/internal/intern/proc.h
+memory_status.o: $(hdrdir)/ruby/internal/intern/process.h
+memory_status.o: $(hdrdir)/ruby/internal/intern/random.h
+memory_status.o: $(hdrdir)/ruby/internal/intern/range.h
+memory_status.o: $(hdrdir)/ruby/internal/intern/rational.h
+memory_status.o: $(hdrdir)/ruby/internal/intern/re.h
+memory_status.o: $(hdrdir)/ruby/internal/intern/ruby.h
+memory_status.o: $(hdrdir)/ruby/internal/intern/select.h
+memory_status.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+memory_status.o: $(hdrdir)/ruby/internal/intern/signal.h
+memory_status.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+memory_status.o: $(hdrdir)/ruby/internal/intern/string.h
+memory_status.o: $(hdrdir)/ruby/internal/intern/struct.h
+memory_status.o: $(hdrdir)/ruby/internal/intern/thread.h
+memory_status.o: $(hdrdir)/ruby/internal/intern/time.h
+memory_status.o: $(hdrdir)/ruby/internal/intern/variable.h
+memory_status.o: $(hdrdir)/ruby/internal/intern/vm.h
+memory_status.o: $(hdrdir)/ruby/internal/interpreter.h
+memory_status.o: $(hdrdir)/ruby/internal/iterator.h
+memory_status.o: $(hdrdir)/ruby/internal/memory.h
+memory_status.o: $(hdrdir)/ruby/internal/method.h
+memory_status.o: $(hdrdir)/ruby/internal/module.h
+memory_status.o: $(hdrdir)/ruby/internal/newobj.h
+memory_status.o: $(hdrdir)/ruby/internal/rgengc.h
+memory_status.o: $(hdrdir)/ruby/internal/scan_args.h
+memory_status.o: $(hdrdir)/ruby/internal/special_consts.h
+memory_status.o: $(hdrdir)/ruby/internal/static_assert.h
+memory_status.o: $(hdrdir)/ruby/internal/stdalign.h
+memory_status.o: $(hdrdir)/ruby/internal/stdbool.h
+memory_status.o: $(hdrdir)/ruby/internal/symbol.h
+memory_status.o: $(hdrdir)/ruby/internal/token_paste.h
+memory_status.o: $(hdrdir)/ruby/internal/value.h
+memory_status.o: $(hdrdir)/ruby/internal/value_type.h
+memory_status.o: $(hdrdir)/ruby/internal/variable.h
+memory_status.o: $(hdrdir)/ruby/internal/warning_push.h
+memory_status.o: $(hdrdir)/ruby/internal/xmalloc.h
+memory_status.o: $(hdrdir)/ruby/missing.h
+memory_status.o: $(hdrdir)/ruby/ruby.h
+memory_status.o: $(hdrdir)/ruby/st.h
+memory_status.o: $(hdrdir)/ruby/subst.h
+memory_status.o: memory_status.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/memory_status/extconf.rb b/ext/-test-/memory_status/extconf.rb
new file mode 100644
index 0000000000..1c1096d8f4
--- /dev/null
+++ b/ext/-test-/memory_status/extconf.rb
@@ -0,0 +1,12 @@
+case RUBY_PLATFORM
+when /darwin/
+  ok = true
+when /mswin/, /mingw/
+  func = "GetProcessMemoryInfo(0, 0, 0)"
+  hdr = "psapi.h"
+  ok = have_func(func, hdr) || have_library("psapi", func, hdr)
+end
+
+if ok
+  create_makefile("-test-/memory_status")
+end
diff --git a/ext/-test-/memory_status/memory_status.c b/ext/-test-/memory_status/memory_status.c
new file mode 100644
index 0000000000..5775fa56f3
--- /dev/null
+++ b/ext/-test-/memory_status/memory_status.c
@@ -0,0 +1,69 @@
+#include "ruby.h"
+#ifdef __APPLE__
+# include <mach/mach.h>
+# include <mach/message.h>
+# include <mach/kern_return.h>
+# include <mach/task_info.h>
+#elif defined _WIN32
+# include <psapi.h>
+#endif
+
+static VALUE cMemoryStatus;
+
+static VALUE
+read_status(VALUE self)
+{
+    VALUE size = INT2FIX(0);
+#if defined __APPLE__
+    VALUE rss;
+    kern_return_t error;
+# if defined MACH_TASK_BASIC_INFO
+    const task_flavor_t flavor = MACH_TASK_BASIC_INFO;
+    mach_msg_type_number_t out_count = MACH_TASK_BASIC_INFO_COUNT;
+    mach_task_basic_info_data_t taskinfo;
+# else
+    const task_flavor_t flavor = TASK_BASIC_INFO;
+    mach_msg_type_number_t out_count = TASK_BASIC_INFO_COUNT;
+    task_basic_info_data_t taskinfo;
+# endif
+
+    taskinfo.virtual_size = 0;
+    taskinfo.resident_size = 0;
+    error = task_info(mach_task_self(), flavor,
+		      (task_info_t)&taskinfo, &out_count);
+    if (error != KERN_SUCCESS) return Qnil;
+#ifndef ULL2NUM
+/* "long long" does not exist here, use size_t instead.  */
+#define ULL2NUM SIZET2NUM
+#endif
+    size = ULL2NUM(taskinfo.virtual_size);
+    rss = ULL2NUM(taskinfo.resident_size);
+    rb_struct_aset(self, INT2FIX(1), rss);
+#elif defined _WIN32
+    VALUE peak;
+    PROCESS_MEMORY_COUNTERS c;
+    c.cb = sizeof(c);
+    if (!GetProcessMemoryInfo(GetCurrentProcess(), &c, c.cb))
+	return Qnil;
+    size = SIZET2NUM(c.PagefileUsage);
+    peak = SIZET2NUM(c.PeakWorkingSetSize);
+    rb_struct_aset(self, INT2FIX(1), peak);
+#endif
+    rb_struct_aset(self, INT2FIX(0), size);
+    return self;
+}
+
+void
+Init_memory_status(void)
+{
+    VALUE mMemory = rb_define_module("Memory");
+    cMemoryStatus =
+	rb_struct_define_under(mMemory, "Status", "size",
+#if defined __APPLE__
+			       "rss",
+#elif defined _WIN32
+			       "peak",
+#endif
+			       (char *)NULL);
+    rb_define_method(cMemoryStatus, "_update", read_status, 0);
+}
diff --git a/ext/-test-/memory_view/depend b/ext/-test-/memory_view/depend
new file mode 100644
index 0000000000..bcbd98d41f
--- /dev/null
+++ b/ext/-test-/memory_view/depend
@@ -0,0 +1,164 @@
+# AUTOGENERATED DEPENDENCIES START
+memory_view.o: $(RUBY_EXTCONF_H)
+memory_view.o: $(arch_hdrdir)/ruby/config.h
+memory_view.o: $(hdrdir)/ruby.h
+memory_view.o: $(hdrdir)/ruby/assert.h
+memory_view.o: $(hdrdir)/ruby/backward.h
+memory_view.o: $(hdrdir)/ruby/backward/2/assume.h
+memory_view.o: $(hdrdir)/ruby/backward/2/attributes.h
+memory_view.o: $(hdrdir)/ruby/backward/2/bool.h
+memory_view.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+memory_view.o: $(hdrdir)/ruby/backward/2/inttypes.h
+memory_view.o: $(hdrdir)/ruby/backward/2/limits.h
+memory_view.o: $(hdrdir)/ruby/backward/2/long_long.h
+memory_view.o: $(hdrdir)/ruby/backward/2/stdalign.h
+memory_view.o: $(hdrdir)/ruby/backward/2/stdarg.h
+memory_view.o: $(hdrdir)/ruby/defines.h
+memory_view.o: $(hdrdir)/ruby/intern.h
+memory_view.o: $(hdrdir)/ruby/internal/anyargs.h
+memory_view.o: $(hdrdir)/ruby/internal/arithmetic.h
+memory_view.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+memory_view.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+memory_view.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+memory_view.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+memory_view.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+memory_view.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+memory_view.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+memory_view.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+memory_view.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+memory_view.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+memory_view.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+memory_view.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+memory_view.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+memory_view.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+memory_view.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+memory_view.o: $(hdrdir)/ruby/internal/assume.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/artificial.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/cold.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/const.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/error.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/format.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/noalias.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/noinline.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/pure.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/restrict.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/warning.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/weakref.h
+memory_view.o: $(hdrdir)/ruby/internal/cast.h
+memory_view.o: $(hdrdir)/ruby/internal/compiler_is.h
+memory_view.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+memory_view.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+memory_view.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+memory_view.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+memory_view.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+memory_view.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+memory_view.o: $(hdrdir)/ruby/internal/compiler_since.h
+memory_view.o: $(hdrdir)/ruby/internal/config.h
+memory_view.o: $(hdrdir)/ruby/internal/constant_p.h
+memory_view.o: $(hdrdir)/ruby/internal/core.h
+memory_view.o: $(hdrdir)/ruby/internal/core/rarray.h
+memory_view.o: $(hdrdir)/ruby/internal/core/rbasic.h
+memory_view.o: $(hdrdir)/ruby/internal/core/rbignum.h
+memory_view.o: $(hdrdir)/ruby/internal/core/rclass.h
+memory_view.o: $(hdrdir)/ruby/internal/core/rdata.h
+memory_view.o: $(hdrdir)/ruby/internal/core/rfile.h
+memory_view.o: $(hdrdir)/ruby/internal/core/rhash.h
+memory_view.o: $(hdrdir)/ruby/internal/core/robject.h
+memory_view.o: $(hdrdir)/ruby/internal/core/rregexp.h
+memory_view.o: $(hdrdir)/ruby/internal/core/rstring.h
+memory_view.o: $(hdrdir)/ruby/internal/core/rstruct.h
+memory_view.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+memory_view.o: $(hdrdir)/ruby/internal/ctype.h
+memory_view.o: $(hdrdir)/ruby/internal/dllexport.h
+memory_view.o: $(hdrdir)/ruby/internal/dosish.h
+memory_view.o: $(hdrdir)/ruby/internal/error.h
+memory_view.o: $(hdrdir)/ruby/internal/eval.h
+memory_view.o: $(hdrdir)/ruby/internal/event.h
+memory_view.o: $(hdrdir)/ruby/internal/fl_type.h
+memory_view.o: $(hdrdir)/ruby/internal/gc.h
+memory_view.o: $(hdrdir)/ruby/internal/glob.h
+memory_view.o: $(hdrdir)/ruby/internal/globals.h
+memory_view.o: $(hdrdir)/ruby/internal/has/attribute.h
+memory_view.o: $(hdrdir)/ruby/internal/has/builtin.h
+memory_view.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+memory_view.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+memory_view.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+memory_view.o: $(hdrdir)/ruby/internal/has/extension.h
+memory_view.o: $(hdrdir)/ruby/internal/has/feature.h
+memory_view.o: $(hdrdir)/ruby/internal/has/warning.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/array.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/bignum.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/class.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/compar.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/complex.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/cont.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/dir.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/enum.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/error.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/eval.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/file.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/gc.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/hash.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/io.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/load.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/marshal.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/numeric.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/object.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/parse.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/proc.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/process.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/random.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/range.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/rational.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/re.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/ruby.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/select.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/signal.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/string.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/struct.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/thread.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/time.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/variable.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/vm.h
+memory_view.o: $(hdrdir)/ruby/internal/interpreter.h
+memory_view.o: $(hdrdir)/ruby/internal/iterator.h
+memory_view.o: $(hdrdir)/ruby/internal/memory.h
+memory_view.o: $(hdrdir)/ruby/internal/method.h
+memory_view.o: $(hdrdir)/ruby/internal/module.h
+memory_view.o: $(hdrdir)/ruby/internal/newobj.h
+memory_view.o: $(hdrdir)/ruby/internal/rgengc.h
+memory_view.o: $(hdrdir)/ruby/internal/scan_args.h
+memory_view.o: $(hdrdir)/ruby/internal/special_consts.h
+memory_view.o: $(hdrdir)/ruby/internal/static_assert.h
+memory_view.o: $(hdrdir)/ruby/internal/stdalign.h
+memory_view.o: $(hdrdir)/ruby/internal/stdbool.h
+memory_view.o: $(hdrdir)/ruby/internal/symbol.h
+memory_view.o: $(hdrdir)/ruby/internal/token_paste.h
+memory_view.o: $(hdrdir)/ruby/internal/value.h
+memory_view.o: $(hdrdir)/ruby/internal/value_type.h
+memory_view.o: $(hdrdir)/ruby/internal/variable.h
+memory_view.o: $(hdrdir)/ruby/internal/warning_push.h
+memory_view.o: $(hdrdir)/ruby/internal/xmalloc.h
+memory_view.o: $(hdrdir)/ruby/memory_view.h
+memory_view.o: $(hdrdir)/ruby/missing.h
+memory_view.o: $(hdrdir)/ruby/ruby.h
+memory_view.o: $(hdrdir)/ruby/st.h
+memory_view.o: $(hdrdir)/ruby/subst.h
+memory_view.o: memory_view.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/memory_view/extconf.rb b/ext/-test-/memory_view/extconf.rb
new file mode 100644
index 0000000000..d786b15db9
--- /dev/null
+++ b/ext/-test-/memory_view/extconf.rb
@@ -0,0 +1,3 @@
+# frozen_string_literal: false
+require_relative "../auto_ext.rb"
+auto_ext(inc: true)
diff --git a/ext/-test-/memory_view/memory_view.c b/ext/-test-/memory_view/memory_view.c
new file mode 100644
index 0000000000..3156dd3101
--- /dev/null
+++ b/ext/-test-/memory_view/memory_view.c
@@ -0,0 +1,446 @@
+#include "ruby.h"
+#include "ruby/memory_view.h"
+
+#define STRUCT_ALIGNOF(T, result) do { \
+    (result) = RUBY_ALIGNOF(T); \
+} while(0)
+
+static ID id_str;
+static VALUE sym_format;
+static VALUE sym_native_size_p;
+static VALUE sym_offset;
+static VALUE sym_size;
+static VALUE sym_repeat;
+static VALUE sym_obj;
+static VALUE sym_byte_size;
+static VALUE sym_readonly;
+static VALUE sym_format;
+static VALUE sym_item_size;
+static VALUE sym_ndim;
+static VALUE sym_shape;
+static VALUE sym_strides;
+static VALUE sym_sub_offsets;
+static VALUE sym_endianness;
+static VALUE sym_little_endian;
+static VALUE sym_big_endian;
+
+static bool
+exportable_string_get_memory_view(VALUE obj, rb_memory_view_t *view, int flags)
+{
+    VALUE str = rb_ivar_get(obj, id_str);
+    rb_memory_view_init_as_byte_array(view, obj, RSTRING_PTR(str), RSTRING_LEN(str), true);
+    return true;
+}
+
+static bool
+exportable_string_memory_view_available_p(VALUE obj)
+{
+    VALUE str = rb_ivar_get(obj, id_str);
+    return !NIL_P(str);
+}
+
+static const rb_memory_view_entry_t exportable_string_memory_view_entry = {
+    exportable_string_get_memory_view,
+    NULL,
+    exportable_string_memory_view_available_p
+};
+
+static VALUE
+memory_view_available_p(VALUE mod, VALUE obj)
+{
+    return rb_memory_view_available_p(obj) ? Qtrue : Qfalse;
+}
+
+static VALUE
+memory_view_register(VALUE mod, VALUE obj)
+{
+    return rb_memory_view_register(obj, &exportable_string_memory_view_entry) ? Qtrue : Qfalse;
+}
+
+static VALUE
+memory_view_item_size_from_format(VALUE mod, VALUE format)
+{
+    const char *c_str = NULL;
+    if (!NIL_P(format))
+        c_str = StringValueCStr(format);
+    const char *err = NULL;
+    ssize_t item_size = rb_memory_view_item_size_from_format(c_str, &err);
+    if (!err)
+        return rb_assoc_new(SSIZET2NUM(item_size), Qnil);
+    else
+        return rb_assoc_new(SSIZET2NUM(item_size), rb_str_new_cstr(err));
+}
+
+static VALUE
+memory_view_parse_item_format(VALUE mod, VALUE format)
+{
+    const char *c_str = NULL;
+    if (!NIL_P(format))
+        c_str = StringValueCStr(format);
+    const char *err = NULL;
+
+    rb_memory_view_item_component_t *members;
+    size_t n_members;
+    ssize_t item_size = rb_memory_view_parse_item_format(c_str, &members, &n_members, &err);
+
+    VALUE result = rb_ary_new_capa(3);
+    rb_ary_push(result, SSIZET2NUM(item_size));
+
+    if (!err) {
+        VALUE ary = rb_ary_new_capa((long)n_members);
+        size_t i;
+        for (i = 0; i < n_members; ++i) {
+            VALUE member = rb_hash_new();
+            rb_hash_aset(member, sym_format, rb_str_new(&members[i].format, 1));
+            rb_hash_aset(member, sym_native_size_p, members[i].native_size_p ? Qtrue : Qfalse);
+            rb_hash_aset(member, sym_endianness, members[i].little_endian_p ? sym_little_endian : sym_big_endian);
+            rb_hash_aset(member, sym_offset, SSIZET2NUM(members[i].offset));
+            rb_hash_aset(member, sym_size, SSIZET2NUM(members[i].size));
+            rb_hash_aset(member, sym_repeat, SSIZET2NUM(members[i].repeat));
+            rb_ary_push(ary, member);
+        }
+        xfree(members);
+        rb_ary_push(result, ary);
+        rb_ary_push(result, Qnil);
+    }
+    else {
+        rb_ary_push(result, Qnil); // members
+        rb_ary_push(result, rb_str_new_cstr(err));
+    }
+
+    return result;
+}
+
+static VALUE
+memory_view_get_memory_view_info(VALUE mod, VALUE obj)
+{
+    rb_memory_view_t view;
+
+    if (!rb_memory_view_get(obj, &view, 0)) {
+        return Qnil;
+    }
+
+    VALUE hash = rb_hash_new();
+    rb_hash_aset(hash, sym_obj, view.obj);
+    rb_hash_aset(hash, sym_byte_size, SSIZET2NUM(view.byte_size));
+    rb_hash_aset(hash, sym_readonly, view.readonly ? Qtrue : Qfalse);
+    rb_hash_aset(hash, sym_format, view.format ? rb_str_new_cstr(view.format) : Qnil);
+    rb_hash_aset(hash, sym_item_size, SSIZET2NUM(view.item_size));
+    rb_hash_aset(hash, sym_ndim, SSIZET2NUM(view.ndim));
+
+    if (view.shape) {
+        VALUE shape = rb_ary_new_capa(view.ndim);
+        rb_hash_aset(hash, sym_shape, shape);
+    }
+    else {
+        rb_hash_aset(hash, sym_shape, Qnil);
+    }
+
+    if (view.strides) {
+        VALUE strides = rb_ary_new_capa(view.ndim);
+        rb_hash_aset(hash, sym_strides, strides);
+    }
+    else {
+        rb_hash_aset(hash, sym_strides, Qnil);
+    }
+
+    if (view.sub_offsets) {
+        VALUE sub_offsets = rb_ary_new_capa(view.ndim);
+        rb_hash_aset(hash, sym_sub_offsets, sub_offsets);
+    }
+    else {
+        rb_hash_aset(hash, sym_sub_offsets, Qnil);
+    }
+
+    rb_memory_view_release(&view);
+
+    return hash;
+}
+
+static VALUE
+memory_view_fill_contiguous_strides(VALUE mod, VALUE ndim_v, VALUE item_size_v, VALUE shape_v, VALUE row_major_p)
+{
+    ssize_t i, ndim = NUM2SSIZET(ndim_v);
+
+    Check_Type(shape_v, T_ARRAY);
+    ssize_t *shape = ALLOC_N(ssize_t, ndim);
+    for (i = 0; i < ndim; ++i) {
+        shape[i] = NUM2SSIZET(RARRAY_AREF(shape_v, i));
+    }
+
+    ssize_t *strides = ALLOC_N(ssize_t, ndim);
+    rb_memory_view_fill_contiguous_strides(ndim, NUM2SSIZET(item_size_v), shape, RTEST(row_major_p), strides);
+
+    VALUE result = rb_ary_new_capa(ndim);
+    for (i = 0; i < ndim; ++i) {
+        rb_ary_push(result, SSIZET2NUM(strides[i]));
+    }
+
+    xfree(strides);
+    xfree(shape);
+
+    return result;
+}
+
+static VALUE
+memory_view_get_ref_count(VALUE obj)
+{
+    extern VALUE rb_memory_view_exported_object_registry;
+    extern const rb_data_type_t rb_memory_view_exported_object_registry_data_type;
+
+    if (rb_memory_view_exported_object_registry == Qundef) {
+        return Qnil;
+    }
+
+    st_table *table;
+    TypedData_Get_Struct(rb_memory_view_exported_object_registry, st_table,
+                         &rb_memory_view_exported_object_registry_data_type,
+                         table);
+
+    st_data_t count;
+    if (st_lookup(table, (st_data_t)obj, &count)) {
+        return ULL2NUM(count);
+    }
+
+    return Qnil;
+}
+
+static VALUE
+memory_view_ref_count_while_exporting_i(VALUE obj, long n)
+{
+    if (n == 0) {
+        return memory_view_get_ref_count(obj);
+    }
+
+    rb_memory_view_t view;
+    if (!rb_memory_view_get(obj, &view, 0)) {
+        return Qnil;
+    }
+
+    VALUE ref_count = memory_view_ref_count_while_exporting_i(obj, n-1);
+    rb_memory_view_release(&view);
+
+    return ref_count;
+}
+
+static VALUE
+memory_view_ref_count_while_exporting(VALUE mod, VALUE obj, VALUE n)
+{
+    Check_Type(n, T_FIXNUM);
+    return memory_view_ref_count_while_exporting_i(obj, FIX2LONG(n));
+}
+
+static VALUE
+memory_view_extract_item_members(VALUE mod, VALUE str, VALUE format)
+{
+    StringValue(str);
+    StringValue(format);
+
+    rb_memory_view_item_component_t *members;
+    size_t n_members;
+    const char *err = NULL;
+    (void)rb_memory_view_parse_item_format(RSTRING_PTR(format), &members, &n_members, &err);
+    if (err != NULL) {
+        rb_raise(rb_eArgError, "Unable to parse item format");
+    }
+
+    VALUE item = rb_memory_view_extract_item_members(RSTRING_PTR(str), members, n_members);
+    xfree(members);
+
+    return item;
+}
+
+static VALUE
+expstr_initialize(VALUE obj, VALUE s)
+{
+    if (!NIL_P(s)) {
+        Check_Type(s, T_STRING);
+    }
+    rb_ivar_set(obj, id_str, s);
+    return Qnil;
+}
+
+static bool
+mdview_get_memory_view(VALUE obj, rb_memory_view_t *view, int flags)
+{
+    VALUE buf_v = rb_ivar_get(obj, id_str);
+    VALUE format_v = rb_ivar_get(obj, SYM2ID(sym_format));
+    VALUE shape_v = rb_ivar_get(obj, SYM2ID(sym_shape));
+    VALUE strides_v = rb_ivar_get(obj, SYM2ID(sym_strides));
+
+    const char *err;
+    const ssize_t item_size = rb_memory_view_item_size_from_format(RSTRING_PTR(format_v), &err);
+    if (item_size < 0) {
+        return false;
+    }
+
+    ssize_t ndim = RARRAY_LEN(shape_v);
+    if (!NIL_P(strides_v) && RARRAY_LEN(strides_v) != ndim) {
+        rb_raise(rb_eArgError, "strides has an invalid dimension");
+    }
+
+    ssize_t *shape = ALLOC_N(ssize_t, ndim);
+    ssize_t *strides = ALLOC_N(ssize_t, ndim);
+    ssize_t i;
+    if (!NIL_P(strides_v)) {
+        for (i = 0; i < ndim; ++i) {
+            shape[i] = NUM2SSIZET(RARRAY_AREF(shape_v, i));
+            strides[i] = NUM2SSIZET(RARRAY_AREF(strides_v, i));
+        }
+    }
+    else {
+        for (i = 0; i < ndim; ++i) {
+            shape[i] = NUM2SSIZET(RARRAY_AREF(shape_v, i));
+        }
+
+        i = ndim - 1;
+        strides[i] = item_size;
+        for (; i > 0; --i) {
+            strides[i-1] = strides[i] * shape[i];
+        }
+    }
+
+    rb_memory_view_init_as_byte_array(view, obj, RSTRING_PTR(buf_v), RSTRING_LEN(buf_v), true);
+    view->format = RSTRING_PTR(format_v);
+    view->item_size = item_size;
+    view->ndim = ndim;
+    view->shape = shape;
+    view->strides = strides;
+    view->sub_offsets = NULL;
+
+    return true;
+}
+
+static bool
+mdview_release_memory_view(VALUE obj, rb_memory_view_t *view)
+{
+    if (view->shape) xfree((void *)view->shape);
+    if (view->strides) xfree((void *)view->strides);
+
+    return true;
+}
+
+static bool
+mdview_memory_view_available_p(VALUE obj)
+{
+    return true;
+}
+
+static const rb_memory_view_entry_t mdview_memory_view_entry = {
+    mdview_get_memory_view,
+    mdview_release_memory_view,
+    mdview_memory_view_available_p
+};
+
+static VALUE
+mdview_initialize(VALUE obj, VALUE buf, VALUE format, VALUE shape, VALUE strides)
+{
+    Check_Type(buf, T_STRING);
+    StringValue(format);
+    Check_Type(shape, T_ARRAY);
+    if (!NIL_P(strides)) Check_Type(strides, T_ARRAY);
+
+    rb_ivar_set(obj, id_str, buf);
+    rb_ivar_set(obj, SYM2ID(sym_format), format);
+    rb_ivar_set(obj, SYM2ID(sym_shape), shape);
+    rb_ivar_set(obj, SYM2ID(sym_strides), strides);
+    return Qnil;
+}
+
+static VALUE
+mdview_aref(VALUE obj, VALUE indices_v)
+{
+    Check_Type(indices_v, T_ARRAY);
+
+    rb_memory_view_t view;
+    if (!rb_memory_view_get(obj, &view, 0)) {
+        rb_raise(rb_eRuntimeError, "rb_memory_view_get: failed");
+    }
+
+    if (RARRAY_LEN(indices_v) != view.ndim) {
+        rb_raise(rb_eKeyError, "Indices has an invalid dimension");
+    }
+
+    VALUE buf_indices;
+    ssize_t *indices = ALLOCV_N(ssize_t, buf_indices, view.ndim);
+
+    ssize_t i;
+    for (i = 0; i < view.ndim; ++i) {
+        indices[i] = NUM2SSIZET(RARRAY_AREF(indices_v, i));
+    }
+
+    VALUE result = rb_memory_view_get_item(&view, indices);
+    ALLOCV_END(buf_indices);
+    rb_memory_view_release(&view);
+
+    return result;
+}
+
+void
+Init_memory_view(void)
+{
+    rb_ext_ractor_safe(true);
+    VALUE mMemoryViewTestUtils = rb_define_module("MemoryViewTestUtils");
+
+    rb_define_module_function(mMemoryViewTestUtils, "available?", memory_view_available_p, 1);
+    rb_define_module_function(mMemoryViewTestUtils, "register", memory_view_register, 1);
+    rb_define_module_function(mMemoryViewTestUtils, "item_size_from_format", memory_view_item_size_from_format, 1);
+    rb_define_module_function(mMemoryViewTestUtils, "parse_item_format", memory_view_parse_item_format, 1);
+    rb_define_module_function(mMemoryViewTestUtils, "get_memory_view_info", memory_view_get_memory_view_info, 1);
+    rb_define_module_function(mMemoryViewTestUtils, "fill_contiguous_strides", memory_view_fill_contiguous_strides, 4);
+    rb_define_module_function(mMemoryViewTestUtils, "ref_count_while_exporting", memory_view_ref_count_while_exporting, 2);
+    rb_define_module_function(mMemoryViewTestUtils, "extract_item_members", memory_view_extract_item_members, 2);
+
+    VALUE cExportableString = rb_define_class_under(mMemoryViewTestUtils, "ExportableString", rb_cObject);
+    rb_define_method(cExportableString, "initialize", expstr_initialize, 1);
+    rb_memory_view_register(cExportableString, &exportable_string_memory_view_entry);
+
+    VALUE cMDView = rb_define_class_under(mMemoryViewTestUtils, "MultiDimensionalView", rb_cObject);
+    rb_define_method(cMDView, "initialize", mdview_initialize, 4);
+    rb_define_method(cMDView, "[]", mdview_aref, 1);
+    rb_memory_view_register(cMDView, &mdview_memory_view_entry);
+
+    id_str = rb_intern_const("__str__");
+    sym_format = ID2SYM(rb_intern_const("format"));
+    sym_native_size_p = ID2SYM(rb_intern_const("native_size_p"));
+    sym_offset = ID2SYM(rb_intern_const("offset"));
+    sym_size = ID2SYM(rb_intern_const("size"));
+    sym_repeat = ID2SYM(rb_intern_const("repeat"));
+    sym_obj = ID2SYM(rb_intern_const("obj"));
+    sym_byte_size = ID2SYM(rb_intern_const("byte_size"));
+    sym_readonly = ID2SYM(rb_intern_const("readonly"));
+    sym_format = ID2SYM(rb_intern_const("format"));
+    sym_item_size = ID2SYM(rb_intern_const("item_size"));
+    sym_ndim = ID2SYM(rb_intern_const("ndim"));
+    sym_shape = ID2SYM(rb_intern_const("shape"));
+    sym_strides = ID2SYM(rb_intern_const("strides"));
+    sym_sub_offsets = ID2SYM(rb_intern_const("sub_offsets"));
+    sym_endianness = ID2SYM(rb_intern_const("endianness"));
+    sym_little_endian = ID2SYM(rb_intern_const("little_endian"));
+    sym_big_endian = ID2SYM(rb_intern_const("big_endian"));
+
+#ifdef WORDS_BIGENDIAN
+    rb_const_set(mMemoryViewTestUtils, rb_intern_const("NATIVE_ENDIAN"), sym_big_endian);
+#else
+    rb_const_set(mMemoryViewTestUtils, rb_intern_const("NATIVE_ENDIAN"), sym_little_endian);
+#endif
+
+#define DEF_ALIGNMENT_CONST(type, TYPE) do { \
+    int alignment; \
+    STRUCT_ALIGNOF(type, alignment); \
+    rb_const_set(mMemoryViewTestUtils, rb_intern_const(#TYPE "_ALIGNMENT"), INT2FIX(alignment)); \
+} while(0)
+
+    DEF_ALIGNMENT_CONST(short, SHORT);
+    DEF_ALIGNMENT_CONST(int, INT);
+    DEF_ALIGNMENT_CONST(long, LONG);
+    DEF_ALIGNMENT_CONST(LONG_LONG, LONG_LONG);
+    DEF_ALIGNMENT_CONST(int16_t, INT16);
+    DEF_ALIGNMENT_CONST(int32_t, INT32);
+    DEF_ALIGNMENT_CONST(int64_t, INT64);
+    DEF_ALIGNMENT_CONST(intptr_t, INTPTR);
+    DEF_ALIGNMENT_CONST(float, FLOAT);
+    DEF_ALIGNMENT_CONST(double, DOUBLE);
+
+#undef DEF_ALIGNMENT_CONST
+}
diff --git a/ext/-test-/method/depend b/ext/-test-/method/depend
new file mode 100644
index 0000000000..7fdf2bc929
--- /dev/null
+++ b/ext/-test-/method/depend
@@ -0,0 +1,324 @@
+# AUTOGENERATED DEPENDENCIES START
+arity.o: $(RUBY_EXTCONF_H)
+arity.o: $(arch_hdrdir)/ruby/config.h
+arity.o: $(hdrdir)/ruby.h
+arity.o: $(hdrdir)/ruby/internal/anyargs.h
+arity.o: $(hdrdir)/ruby/internal/arithmetic.h
+arity.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+arity.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+arity.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+arity.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+arity.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+arity.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+arity.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+arity.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+arity.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+arity.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+arity.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+arity.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+arity.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+arity.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+arity.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+arity.o: $(hdrdir)/ruby/internal/assume.h
+arity.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+arity.o: $(hdrdir)/ruby/internal/attr/artificial.h
+arity.o: $(hdrdir)/ruby/internal/attr/cold.h
+arity.o: $(hdrdir)/ruby/internal/attr/const.h
+arity.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+arity.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+arity.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+arity.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+arity.o: $(hdrdir)/ruby/internal/attr/error.h
+arity.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+arity.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+arity.o: $(hdrdir)/ruby/internal/attr/format.h
+arity.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+arity.o: $(hdrdir)/ruby/internal/attr/noalias.h
+arity.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+arity.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+arity.o: $(hdrdir)/ruby/internal/attr/noinline.h
+arity.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+arity.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+arity.o: $(hdrdir)/ruby/internal/attr/pure.h
+arity.o: $(hdrdir)/ruby/internal/attr/restrict.h
+arity.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+arity.o: $(hdrdir)/ruby/internal/attr/warning.h
+arity.o: $(hdrdir)/ruby/internal/attr/weakref.h
+arity.o: $(hdrdir)/ruby/internal/cast.h
+arity.o: $(hdrdir)/ruby/internal/compiler_is.h
+arity.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+arity.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+arity.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+arity.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+arity.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+arity.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+arity.o: $(hdrdir)/ruby/internal/compiler_since.h
+arity.o: $(hdrdir)/ruby/internal/config.h
+arity.o: $(hdrdir)/ruby/internal/constant_p.h
+arity.o: $(hdrdir)/ruby/internal/core.h
+arity.o: $(hdrdir)/ruby/internal/core/rarray.h
+arity.o: $(hdrdir)/ruby/internal/core/rbasic.h
+arity.o: $(hdrdir)/ruby/internal/core/rbignum.h
+arity.o: $(hdrdir)/ruby/internal/core/rclass.h
+arity.o: $(hdrdir)/ruby/internal/core/rdata.h
+arity.o: $(hdrdir)/ruby/internal/core/rfile.h
+arity.o: $(hdrdir)/ruby/internal/core/rhash.h
+arity.o: $(hdrdir)/ruby/internal/core/robject.h
+arity.o: $(hdrdir)/ruby/internal/core/rregexp.h
+arity.o: $(hdrdir)/ruby/internal/core/rstring.h
+arity.o: $(hdrdir)/ruby/internal/core/rstruct.h
+arity.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+arity.o: $(hdrdir)/ruby/internal/ctype.h
+arity.o: $(hdrdir)/ruby/internal/dllexport.h
+arity.o: $(hdrdir)/ruby/internal/dosish.h
+arity.o: $(hdrdir)/ruby/internal/error.h
+arity.o: $(hdrdir)/ruby/internal/eval.h
+arity.o: $(hdrdir)/ruby/internal/event.h
+arity.o: $(hdrdir)/ruby/internal/fl_type.h
+arity.o: $(hdrdir)/ruby/internal/gc.h
+arity.o: $(hdrdir)/ruby/internal/glob.h
+arity.o: $(hdrdir)/ruby/internal/globals.h
+arity.o: $(hdrdir)/ruby/internal/has/attribute.h
+arity.o: $(hdrdir)/ruby/internal/has/builtin.h
+arity.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+arity.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+arity.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+arity.o: $(hdrdir)/ruby/internal/has/extension.h
+arity.o: $(hdrdir)/ruby/internal/has/feature.h
+arity.o: $(hdrdir)/ruby/internal/has/warning.h
+arity.o: $(hdrdir)/ruby/internal/intern/array.h
+arity.o: $(hdrdir)/ruby/internal/intern/bignum.h
+arity.o: $(hdrdir)/ruby/internal/intern/class.h
+arity.o: $(hdrdir)/ruby/internal/intern/compar.h
+arity.o: $(hdrdir)/ruby/internal/intern/complex.h
+arity.o: $(hdrdir)/ruby/internal/intern/cont.h
+arity.o: $(hdrdir)/ruby/internal/intern/dir.h
+arity.o: $(hdrdir)/ruby/internal/intern/enum.h
+arity.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+arity.o: $(hdrdir)/ruby/internal/intern/error.h
+arity.o: $(hdrdir)/ruby/internal/intern/eval.h
+arity.o: $(hdrdir)/ruby/internal/intern/file.h
+arity.o: $(hdrdir)/ruby/internal/intern/gc.h
+arity.o: $(hdrdir)/ruby/internal/intern/hash.h
+arity.o: $(hdrdir)/ruby/internal/intern/io.h
+arity.o: $(hdrdir)/ruby/internal/intern/load.h
+arity.o: $(hdrdir)/ruby/internal/intern/marshal.h
+arity.o: $(hdrdir)/ruby/internal/intern/numeric.h
+arity.o: $(hdrdir)/ruby/internal/intern/object.h
+arity.o: $(hdrdir)/ruby/internal/intern/parse.h
+arity.o: $(hdrdir)/ruby/internal/intern/proc.h
+arity.o: $(hdrdir)/ruby/internal/intern/process.h
+arity.o: $(hdrdir)/ruby/internal/intern/random.h
+arity.o: $(hdrdir)/ruby/internal/intern/range.h
+arity.o: $(hdrdir)/ruby/internal/intern/rational.h
+arity.o: $(hdrdir)/ruby/internal/intern/re.h
+arity.o: $(hdrdir)/ruby/internal/intern/ruby.h
+arity.o: $(hdrdir)/ruby/internal/intern/select.h
+arity.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+arity.o: $(hdrdir)/ruby/internal/intern/signal.h
+arity.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+arity.o: $(hdrdir)/ruby/internal/intern/string.h
+arity.o: $(hdrdir)/ruby/internal/intern/struct.h
+arity.o: $(hdrdir)/ruby/internal/intern/thread.h
+arity.o: $(hdrdir)/ruby/internal/intern/time.h
+arity.o: $(hdrdir)/ruby/internal/intern/variable.h
+arity.o: $(hdrdir)/ruby/internal/intern/vm.h
+arity.o: $(hdrdir)/ruby/internal/interpreter.h
+arity.o: $(hdrdir)/ruby/internal/iterator.h
+arity.o: $(hdrdir)/ruby/internal/memory.h
+arity.o: $(hdrdir)/ruby/internal/method.h
+arity.o: $(hdrdir)/ruby/internal/module.h
+arity.o: $(hdrdir)/ruby/internal/newobj.h
+arity.o: $(hdrdir)/ruby/internal/rgengc.h
+arity.o: $(hdrdir)/ruby/internal/scan_args.h
+arity.o: $(hdrdir)/ruby/internal/special_consts.h
+arity.o: $(hdrdir)/ruby/internal/static_assert.h
+arity.o: $(hdrdir)/ruby/internal/stdalign.h
+arity.o: $(hdrdir)/ruby/internal/stdbool.h
+arity.o: $(hdrdir)/ruby/internal/symbol.h
+arity.o: $(hdrdir)/ruby/internal/token_paste.h
+arity.o: $(hdrdir)/ruby/internal/value.h
+arity.o: $(hdrdir)/ruby/internal/value_type.h
+arity.o: $(hdrdir)/ruby/internal/variable.h
+arity.o: $(hdrdir)/ruby/internal/warning_push.h
+arity.o: $(hdrdir)/ruby/internal/xmalloc.h
+arity.o: $(hdrdir)/ruby/assert.h
+arity.o: $(hdrdir)/ruby/backward.h
+arity.o: $(hdrdir)/ruby/backward/2/assume.h
+arity.o: $(hdrdir)/ruby/backward/2/attributes.h
+arity.o: $(hdrdir)/ruby/backward/2/bool.h
+arity.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+arity.o: $(hdrdir)/ruby/backward/2/inttypes.h
+arity.o: $(hdrdir)/ruby/backward/2/limits.h
+arity.o: $(hdrdir)/ruby/backward/2/long_long.h
+arity.o: $(hdrdir)/ruby/backward/2/stdalign.h
+arity.o: $(hdrdir)/ruby/backward/2/stdarg.h
+arity.o: $(hdrdir)/ruby/defines.h
+arity.o: $(hdrdir)/ruby/intern.h
+arity.o: $(hdrdir)/ruby/missing.h
+arity.o: $(hdrdir)/ruby/ruby.h
+arity.o: $(hdrdir)/ruby/st.h
+arity.o: $(hdrdir)/ruby/subst.h
+arity.o: arity.c
+init.o: $(RUBY_EXTCONF_H)
+init.o: $(arch_hdrdir)/ruby/config.h
+init.o: $(hdrdir)/ruby.h
+init.o: $(hdrdir)/ruby/internal/anyargs.h
+init.o: $(hdrdir)/ruby/internal/arithmetic.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+init.o: $(hdrdir)/ruby/internal/assume.h
+init.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+init.o: $(hdrdir)/ruby/internal/attr/artificial.h
+init.o: $(hdrdir)/ruby/internal/attr/cold.h
+init.o: $(hdrdir)/ruby/internal/attr/const.h
+init.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+init.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+init.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+init.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+init.o: $(hdrdir)/ruby/internal/attr/error.h
+init.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+init.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+init.o: $(hdrdir)/ruby/internal/attr/format.h
+init.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+init.o: $(hdrdir)/ruby/internal/attr/noalias.h
+init.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+init.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+init.o: $(hdrdir)/ruby/internal/attr/noinline.h
+init.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+init.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+init.o: $(hdrdir)/ruby/internal/attr/pure.h
+init.o: $(hdrdir)/ruby/internal/attr/restrict.h
+init.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+init.o: $(hdrdir)/ruby/internal/attr/warning.h
+init.o: $(hdrdir)/ruby/internal/attr/weakref.h
+init.o: $(hdrdir)/ruby/internal/cast.h
+init.o: $(hdrdir)/ruby/internal/compiler_is.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+init.o: $(hdrdir)/ruby/internal/compiler_since.h
+init.o: $(hdrdir)/ruby/internal/config.h
+init.o: $(hdrdir)/ruby/internal/constant_p.h
+init.o: $(hdrdir)/ruby/internal/core.h
+init.o: $(hdrdir)/ruby/internal/core/rarray.h
+init.o: $(hdrdir)/ruby/internal/core/rbasic.h
+init.o: $(hdrdir)/ruby/internal/core/rbignum.h
+init.o: $(hdrdir)/ruby/internal/core/rclass.h
+init.o: $(hdrdir)/ruby/internal/core/rdata.h
+init.o: $(hdrdir)/ruby/internal/core/rfile.h
+init.o: $(hdrdir)/ruby/internal/core/rhash.h
+init.o: $(hdrdir)/ruby/internal/core/robject.h
+init.o: $(hdrdir)/ruby/internal/core/rregexp.h
+init.o: $(hdrdir)/ruby/internal/core/rstring.h
+init.o: $(hdrdir)/ruby/internal/core/rstruct.h
+init.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+init.o: $(hdrdir)/ruby/internal/ctype.h
+init.o: $(hdrdir)/ruby/internal/dllexport.h
+init.o: $(hdrdir)/ruby/internal/dosish.h
+init.o: $(hdrdir)/ruby/internal/error.h
+init.o: $(hdrdir)/ruby/internal/eval.h
+init.o: $(hdrdir)/ruby/internal/event.h
+init.o: $(hdrdir)/ruby/internal/fl_type.h
+init.o: $(hdrdir)/ruby/internal/gc.h
+init.o: $(hdrdir)/ruby/internal/glob.h
+init.o: $(hdrdir)/ruby/internal/globals.h
+init.o: $(hdrdir)/ruby/internal/has/attribute.h
+init.o: $(hdrdir)/ruby/internal/has/builtin.h
+init.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/extension.h
+init.o: $(hdrdir)/ruby/internal/has/feature.h
+init.o: $(hdrdir)/ruby/internal/has/warning.h
+init.o: $(hdrdir)/ruby/internal/intern/array.h
+init.o: $(hdrdir)/ruby/internal/intern/bignum.h
+init.o: $(hdrdir)/ruby/internal/intern/class.h
+init.o: $(hdrdir)/ruby/internal/intern/compar.h
+init.o: $(hdrdir)/ruby/internal/intern/complex.h
+init.o: $(hdrdir)/ruby/internal/intern/cont.h
+init.o: $(hdrdir)/ruby/internal/intern/dir.h
+init.o: $(hdrdir)/ruby/internal/intern/enum.h
+init.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+init.o: $(hdrdir)/ruby/internal/intern/error.h
+init.o: $(hdrdir)/ruby/internal/intern/eval.h
+init.o: $(hdrdir)/ruby/internal/intern/file.h
+init.o: $(hdrdir)/ruby/internal/intern/gc.h
+init.o: $(hdrdir)/ruby/internal/intern/hash.h
+init.o: $(hdrdir)/ruby/internal/intern/io.h
+init.o: $(hdrdir)/ruby/internal/intern/load.h
+init.o: $(hdrdir)/ruby/internal/intern/marshal.h
+init.o: $(hdrdir)/ruby/internal/intern/numeric.h
+init.o: $(hdrdir)/ruby/internal/intern/object.h
+init.o: $(hdrdir)/ruby/internal/intern/parse.h
+init.o: $(hdrdir)/ruby/internal/intern/proc.h
+init.o: $(hdrdir)/ruby/internal/intern/process.h
+init.o: $(hdrdir)/ruby/internal/intern/random.h
+init.o: $(hdrdir)/ruby/internal/intern/range.h
+init.o: $(hdrdir)/ruby/internal/intern/rational.h
+init.o: $(hdrdir)/ruby/internal/intern/re.h
+init.o: $(hdrdir)/ruby/internal/intern/ruby.h
+init.o: $(hdrdir)/ruby/internal/intern/select.h
+init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+init.o: $(hdrdir)/ruby/internal/intern/signal.h
+init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+init.o: $(hdrdir)/ruby/internal/intern/string.h
+init.o: $(hdrdir)/ruby/internal/intern/struct.h
+init.o: $(hdrdir)/ruby/internal/intern/thread.h
+init.o: $(hdrdir)/ruby/internal/intern/time.h
+init.o: $(hdrdir)/ruby/internal/intern/variable.h
+init.o: $(hdrdir)/ruby/internal/intern/vm.h
+init.o: $(hdrdir)/ruby/internal/interpreter.h
+init.o: $(hdrdir)/ruby/internal/iterator.h
+init.o: $(hdrdir)/ruby/internal/memory.h
+init.o: $(hdrdir)/ruby/internal/method.h
+init.o: $(hdrdir)/ruby/internal/module.h
+init.o: $(hdrdir)/ruby/internal/newobj.h
+init.o: $(hdrdir)/ruby/internal/rgengc.h
+init.o: $(hdrdir)/ruby/internal/scan_args.h
+init.o: $(hdrdir)/ruby/internal/special_consts.h
+init.o: $(hdrdir)/ruby/internal/static_assert.h
+init.o: $(hdrdir)/ruby/internal/stdalign.h
+init.o: $(hdrdir)/ruby/internal/stdbool.h
+init.o: $(hdrdir)/ruby/internal/symbol.h
+init.o: $(hdrdir)/ruby/internal/token_paste.h
+init.o: $(hdrdir)/ruby/internal/value.h
+init.o: $(hdrdir)/ruby/internal/value_type.h
+init.o: $(hdrdir)/ruby/internal/variable.h
+init.o: $(hdrdir)/ruby/internal/warning_push.h
+init.o: $(hdrdir)/ruby/internal/xmalloc.h
+init.o: $(hdrdir)/ruby/assert.h
+init.o: $(hdrdir)/ruby/backward.h
+init.o: $(hdrdir)/ruby/backward/2/assume.h
+init.o: $(hdrdir)/ruby/backward/2/attributes.h
+init.o: $(hdrdir)/ruby/backward/2/bool.h
+init.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+init.o: $(hdrdir)/ruby/backward/2/inttypes.h
+init.o: $(hdrdir)/ruby/backward/2/limits.h
+init.o: $(hdrdir)/ruby/backward/2/long_long.h
+init.o: $(hdrdir)/ruby/backward/2/stdalign.h
+init.o: $(hdrdir)/ruby/backward/2/stdarg.h
+init.o: $(hdrdir)/ruby/defines.h
+init.o: $(hdrdir)/ruby/intern.h
+init.o: $(hdrdir)/ruby/missing.h
+init.o: $(hdrdir)/ruby/ruby.h
+init.o: $(hdrdir)/ruby/st.h
+init.o: $(hdrdir)/ruby/subst.h
+init.o: init.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/notimplement/bug.c b/ext/-test-/notimplement/bug.c
index 34731bc2e6..82e243a81d 100644
--- a/ext/-test-/notimplement/bug.c
+++ b/ext/-test-/notimplement/bug.c
@@ -4,13 +4,15 @@ static VALUE
 bug_funcall(int argc, VALUE *argv, VALUE self)
 {
     if (argc < 1) rb_raise(rb_eArgError, "not enough argument");
-    return rb_funcall2(self, rb_to_id(*argv), argc-1, argv+1);
+    return rb_funcallv(self, rb_to_id(*argv), argc-1, argv+1);
 }
 
 void
 Init_notimplement(void)
 {
     VALUE mBug = rb_define_module("Bug");
+    VALUE klass = rb_define_class_under(mBug, "NotImplement", rb_cObject);
     rb_define_module_function(mBug, "funcall", bug_funcall, -1);
     rb_define_module_function(mBug, "notimplement", rb_f_notimplement, -1);
+    rb_define_method(klass, "notimplement", rb_f_notimplement, -1);
 }
diff --git a/ext/-test-/notimplement/depend b/ext/-test-/notimplement/depend
new file mode 100644
index 0000000000..a21935558d
--- /dev/null
+++ b/ext/-test-/notimplement/depend
@@ -0,0 +1,163 @@
+# AUTOGENERATED DEPENDENCIES START
+bug.o: $(RUBY_EXTCONF_H)
+bug.o: $(arch_hdrdir)/ruby/config.h
+bug.o: $(hdrdir)/ruby.h
+bug.o: $(hdrdir)/ruby/internal/anyargs.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+bug.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+bug.o: $(hdrdir)/ruby/internal/assume.h
+bug.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+bug.o: $(hdrdir)/ruby/internal/attr/artificial.h
+bug.o: $(hdrdir)/ruby/internal/attr/cold.h
+bug.o: $(hdrdir)/ruby/internal/attr/const.h
+bug.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+bug.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+bug.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+bug.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+bug.o: $(hdrdir)/ruby/internal/attr/error.h
+bug.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+bug.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+bug.o: $(hdrdir)/ruby/internal/attr/format.h
+bug.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+bug.o: $(hdrdir)/ruby/internal/attr/noalias.h
+bug.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+bug.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+bug.o: $(hdrdir)/ruby/internal/attr/noinline.h
+bug.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+bug.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+bug.o: $(hdrdir)/ruby/internal/attr/pure.h
+bug.o: $(hdrdir)/ruby/internal/attr/restrict.h
+bug.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+bug.o: $(hdrdir)/ruby/internal/attr/warning.h
+bug.o: $(hdrdir)/ruby/internal/attr/weakref.h
+bug.o: $(hdrdir)/ruby/internal/cast.h
+bug.o: $(hdrdir)/ruby/internal/compiler_is.h
+bug.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+bug.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+bug.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+bug.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+bug.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+bug.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+bug.o: $(hdrdir)/ruby/internal/compiler_since.h
+bug.o: $(hdrdir)/ruby/internal/config.h
+bug.o: $(hdrdir)/ruby/internal/constant_p.h
+bug.o: $(hdrdir)/ruby/internal/core.h
+bug.o: $(hdrdir)/ruby/internal/core/rarray.h
+bug.o: $(hdrdir)/ruby/internal/core/rbasic.h
+bug.o: $(hdrdir)/ruby/internal/core/rbignum.h
+bug.o: $(hdrdir)/ruby/internal/core/rclass.h
+bug.o: $(hdrdir)/ruby/internal/core/rdata.h
+bug.o: $(hdrdir)/ruby/internal/core/rfile.h
+bug.o: $(hdrdir)/ruby/internal/core/rhash.h
+bug.o: $(hdrdir)/ruby/internal/core/robject.h
+bug.o: $(hdrdir)/ruby/internal/core/rregexp.h
+bug.o: $(hdrdir)/ruby/internal/core/rstring.h
+bug.o: $(hdrdir)/ruby/internal/core/rstruct.h
+bug.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+bug.o: $(hdrdir)/ruby/internal/ctype.h
+bug.o: $(hdrdir)/ruby/internal/dllexport.h
+bug.o: $(hdrdir)/ruby/internal/dosish.h
+bug.o: $(hdrdir)/ruby/internal/error.h
+bug.o: $(hdrdir)/ruby/internal/eval.h
+bug.o: $(hdrdir)/ruby/internal/event.h
+bug.o: $(hdrdir)/ruby/internal/fl_type.h
+bug.o: $(hdrdir)/ruby/internal/gc.h
+bug.o: $(hdrdir)/ruby/internal/glob.h
+bug.o: $(hdrdir)/ruby/internal/globals.h
+bug.o: $(hdrdir)/ruby/internal/has/attribute.h
+bug.o: $(hdrdir)/ruby/internal/has/builtin.h
+bug.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+bug.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+bug.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+bug.o: $(hdrdir)/ruby/internal/has/extension.h
+bug.o: $(hdrdir)/ruby/internal/has/feature.h
+bug.o: $(hdrdir)/ruby/internal/has/warning.h
+bug.o: $(hdrdir)/ruby/internal/intern/array.h
+bug.o: $(hdrdir)/ruby/internal/intern/bignum.h
+bug.o: $(hdrdir)/ruby/internal/intern/class.h
+bug.o: $(hdrdir)/ruby/internal/intern/compar.h
+bug.o: $(hdrdir)/ruby/internal/intern/complex.h
+bug.o: $(hdrdir)/ruby/internal/intern/cont.h
+bug.o: $(hdrdir)/ruby/internal/intern/dir.h
+bug.o: $(hdrdir)/ruby/internal/intern/enum.h
+bug.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+bug.o: $(hdrdir)/ruby/internal/intern/error.h
+bug.o: $(hdrdir)/ruby/internal/intern/eval.h
+bug.o: $(hdrdir)/ruby/internal/intern/file.h
+bug.o: $(hdrdir)/ruby/internal/intern/gc.h
+bug.o: $(hdrdir)/ruby/internal/intern/hash.h
+bug.o: $(hdrdir)/ruby/internal/intern/io.h
+bug.o: $(hdrdir)/ruby/internal/intern/load.h
+bug.o: $(hdrdir)/ruby/internal/intern/marshal.h
+bug.o: $(hdrdir)/ruby/internal/intern/numeric.h
+bug.o: $(hdrdir)/ruby/internal/intern/object.h
+bug.o: $(hdrdir)/ruby/internal/intern/parse.h
+bug.o: $(hdrdir)/ruby/internal/intern/proc.h
+bug.o: $(hdrdir)/ruby/internal/intern/process.h
+bug.o: $(hdrdir)/ruby/internal/intern/random.h
+bug.o: $(hdrdir)/ruby/internal/intern/range.h
+bug.o: $(hdrdir)/ruby/internal/intern/rational.h
+bug.o: $(hdrdir)/ruby/internal/intern/re.h
+bug.o: $(hdrdir)/ruby/internal/intern/ruby.h
+bug.o: $(hdrdir)/ruby/internal/intern/select.h
+bug.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+bug.o: $(hdrdir)/ruby/internal/intern/signal.h
+bug.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+bug.o: $(hdrdir)/ruby/internal/intern/string.h
+bug.o: $(hdrdir)/ruby/internal/intern/struct.h
+bug.o: $(hdrdir)/ruby/internal/intern/thread.h
+bug.o: $(hdrdir)/ruby/internal/intern/time.h
+bug.o: $(hdrdir)/ruby/internal/intern/variable.h
+bug.o: $(hdrdir)/ruby/internal/intern/vm.h
+bug.o: $(hdrdir)/ruby/internal/interpreter.h
+bug.o: $(hdrdir)/ruby/internal/iterator.h
+bug.o: $(hdrdir)/ruby/internal/memory.h
+bug.o: $(hdrdir)/ruby/internal/method.h
+bug.o: $(hdrdir)/ruby/internal/module.h
+bug.o: $(hdrdir)/ruby/internal/newobj.h
+bug.o: $(hdrdir)/ruby/internal/rgengc.h
+bug.o: $(hdrdir)/ruby/internal/scan_args.h
+bug.o: $(hdrdir)/ruby/internal/special_consts.h
+bug.o: $(hdrdir)/ruby/internal/static_assert.h
+bug.o: $(hdrdir)/ruby/internal/stdalign.h
+bug.o: $(hdrdir)/ruby/internal/stdbool.h
+bug.o: $(hdrdir)/ruby/internal/symbol.h
+bug.o: $(hdrdir)/ruby/internal/token_paste.h
+bug.o: $(hdrdir)/ruby/internal/value.h
+bug.o: $(hdrdir)/ruby/internal/value_type.h
+bug.o: $(hdrdir)/ruby/internal/variable.h
+bug.o: $(hdrdir)/ruby/internal/warning_push.h
+bug.o: $(hdrdir)/ruby/internal/xmalloc.h
+bug.o: $(hdrdir)/ruby/assert.h
+bug.o: $(hdrdir)/ruby/backward.h
+bug.o: $(hdrdir)/ruby/backward/2/assume.h
+bug.o: $(hdrdir)/ruby/backward/2/attributes.h
+bug.o: $(hdrdir)/ruby/backward/2/bool.h
+bug.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+bug.o: $(hdrdir)/ruby/backward/2/inttypes.h
+bug.o: $(hdrdir)/ruby/backward/2/limits.h
+bug.o: $(hdrdir)/ruby/backward/2/long_long.h
+bug.o: $(hdrdir)/ruby/backward/2/stdalign.h
+bug.o: $(hdrdir)/ruby/backward/2/stdarg.h
+bug.o: $(hdrdir)/ruby/defines.h
+bug.o: $(hdrdir)/ruby/intern.h
+bug.o: $(hdrdir)/ruby/missing.h
+bug.o: $(hdrdir)/ruby/ruby.h
+bug.o: $(hdrdir)/ruby/st.h
+bug.o: $(hdrdir)/ruby/subst.h
+bug.o: bug.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/num2int/depend b/ext/-test-/num2int/depend
new file mode 100644
index 0000000000..4b455d12f6
--- /dev/null
+++ b/ext/-test-/num2int/depend
@@ -0,0 +1,163 @@
+# AUTOGENERATED DEPENDENCIES START
+num2int.o: $(RUBY_EXTCONF_H)
+num2int.o: $(arch_hdrdir)/ruby/config.h
+num2int.o: $(hdrdir)/ruby.h
+num2int.o: $(hdrdir)/ruby/internal/anyargs.h
+num2int.o: $(hdrdir)/ruby/internal/arithmetic.h
+num2int.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+num2int.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+num2int.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+num2int.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+num2int.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+num2int.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+num2int.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+num2int.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+num2int.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+num2int.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+num2int.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+num2int.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+num2int.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+num2int.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+num2int.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+num2int.o: $(hdrdir)/ruby/internal/assume.h
+num2int.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+num2int.o: $(hdrdir)/ruby/internal/attr/artificial.h
+num2int.o: $(hdrdir)/ruby/internal/attr/cold.h
+num2int.o: $(hdrdir)/ruby/internal/attr/const.h
+num2int.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+num2int.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+num2int.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+num2int.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+num2int.o: $(hdrdir)/ruby/internal/attr/error.h
+num2int.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+num2int.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+num2int.o: $(hdrdir)/ruby/internal/attr/format.h
+num2int.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+num2int.o: $(hdrdir)/ruby/internal/attr/noalias.h
+num2int.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+num2int.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+num2int.o: $(hdrdir)/ruby/internal/attr/noinline.h
+num2int.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+num2int.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+num2int.o: $(hdrdir)/ruby/internal/attr/pure.h
+num2int.o: $(hdrdir)/ruby/internal/attr/restrict.h
+num2int.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+num2int.o: $(hdrdir)/ruby/internal/attr/warning.h
+num2int.o: $(hdrdir)/ruby/internal/attr/weakref.h
+num2int.o: $(hdrdir)/ruby/internal/cast.h
+num2int.o: $(hdrdir)/ruby/internal/compiler_is.h
+num2int.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+num2int.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+num2int.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+num2int.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+num2int.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+num2int.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+num2int.o: $(hdrdir)/ruby/internal/compiler_since.h
+num2int.o: $(hdrdir)/ruby/internal/config.h
+num2int.o: $(hdrdir)/ruby/internal/constant_p.h
+num2int.o: $(hdrdir)/ruby/internal/core.h
+num2int.o: $(hdrdir)/ruby/internal/core/rarray.h
+num2int.o: $(hdrdir)/ruby/internal/core/rbasic.h
+num2int.o: $(hdrdir)/ruby/internal/core/rbignum.h
+num2int.o: $(hdrdir)/ruby/internal/core/rclass.h
+num2int.o: $(hdrdir)/ruby/internal/core/rdata.h
+num2int.o: $(hdrdir)/ruby/internal/core/rfile.h
+num2int.o: $(hdrdir)/ruby/internal/core/rhash.h
+num2int.o: $(hdrdir)/ruby/internal/core/robject.h
+num2int.o: $(hdrdir)/ruby/internal/core/rregexp.h
+num2int.o: $(hdrdir)/ruby/internal/core/rstring.h
+num2int.o: $(hdrdir)/ruby/internal/core/rstruct.h
+num2int.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+num2int.o: $(hdrdir)/ruby/internal/ctype.h
+num2int.o: $(hdrdir)/ruby/internal/dllexport.h
+num2int.o: $(hdrdir)/ruby/internal/dosish.h
+num2int.o: $(hdrdir)/ruby/internal/error.h
+num2int.o: $(hdrdir)/ruby/internal/eval.h
+num2int.o: $(hdrdir)/ruby/internal/event.h
+num2int.o: $(hdrdir)/ruby/internal/fl_type.h
+num2int.o: $(hdrdir)/ruby/internal/gc.h
+num2int.o: $(hdrdir)/ruby/internal/glob.h
+num2int.o: $(hdrdir)/ruby/internal/globals.h
+num2int.o: $(hdrdir)/ruby/internal/has/attribute.h
+num2int.o: $(hdrdir)/ruby/internal/has/builtin.h
+num2int.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+num2int.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+num2int.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+num2int.o: $(hdrdir)/ruby/internal/has/extension.h
+num2int.o: $(hdrdir)/ruby/internal/has/feature.h
+num2int.o: $(hdrdir)/ruby/internal/has/warning.h
+num2int.o: $(hdrdir)/ruby/internal/intern/array.h
+num2int.o: $(hdrdir)/ruby/internal/intern/bignum.h
+num2int.o: $(hdrdir)/ruby/internal/intern/class.h
+num2int.o: $(hdrdir)/ruby/internal/intern/compar.h
+num2int.o: $(hdrdir)/ruby/internal/intern/complex.h
+num2int.o: $(hdrdir)/ruby/internal/intern/cont.h
+num2int.o: $(hdrdir)/ruby/internal/intern/dir.h
+num2int.o: $(hdrdir)/ruby/internal/intern/enum.h
+num2int.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+num2int.o: $(hdrdir)/ruby/internal/intern/error.h
+num2int.o: $(hdrdir)/ruby/internal/intern/eval.h
+num2int.o: $(hdrdir)/ruby/internal/intern/file.h
+num2int.o: $(hdrdir)/ruby/internal/intern/gc.h
+num2int.o: $(hdrdir)/ruby/internal/intern/hash.h
+num2int.o: $(hdrdir)/ruby/internal/intern/io.h
+num2int.o: $(hdrdir)/ruby/internal/intern/load.h
+num2int.o: $(hdrdir)/ruby/internal/intern/marshal.h
+num2int.o: $(hdrdir)/ruby/internal/intern/numeric.h
+num2int.o: $(hdrdir)/ruby/internal/intern/object.h
+num2int.o: $(hdrdir)/ruby/internal/intern/parse.h
+num2int.o: $(hdrdir)/ruby/internal/intern/proc.h
+num2int.o: $(hdrdir)/ruby/internal/intern/process.h
+num2int.o: $(hdrdir)/ruby/internal/intern/random.h
+num2int.o: $(hdrdir)/ruby/internal/intern/range.h
+num2int.o: $(hdrdir)/ruby/internal/intern/rational.h
+num2int.o: $(hdrdir)/ruby/internal/intern/re.h
+num2int.o: $(hdrdir)/ruby/internal/intern/ruby.h
+num2int.o: $(hdrdir)/ruby/internal/intern/select.h
+num2int.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+num2int.o: $(hdrdir)/ruby/internal/intern/signal.h
+num2int.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+num2int.o: $(hdrdir)/ruby/internal/intern/string.h
+num2int.o: $(hdrdir)/ruby/internal/intern/struct.h
+num2int.o: $(hdrdir)/ruby/internal/intern/thread.h
+num2int.o: $(hdrdir)/ruby/internal/intern/time.h
+num2int.o: $(hdrdir)/ruby/internal/intern/variable.h
+num2int.o: $(hdrdir)/ruby/internal/intern/vm.h
+num2int.o: $(hdrdir)/ruby/internal/interpreter.h
+num2int.o: $(hdrdir)/ruby/internal/iterator.h
+num2int.o: $(hdrdir)/ruby/internal/memory.h
+num2int.o: $(hdrdir)/ruby/internal/method.h
+num2int.o: $(hdrdir)/ruby/internal/module.h
+num2int.o: $(hdrdir)/ruby/internal/newobj.h
+num2int.o: $(hdrdir)/ruby/internal/rgengc.h
+num2int.o: $(hdrdir)/ruby/internal/scan_args.h
+num2int.o: $(hdrdir)/ruby/internal/special_consts.h
+num2int.o: $(hdrdir)/ruby/internal/static_assert.h
+num2int.o: $(hdrdir)/ruby/internal/stdalign.h
+num2int.o: $(hdrdir)/ruby/internal/stdbool.h
+num2int.o: $(hdrdir)/ruby/internal/symbol.h
+num2int.o: $(hdrdir)/ruby/internal/token_paste.h
+num2int.o: $(hdrdir)/ruby/internal/value.h
+num2int.o: $(hdrdir)/ruby/internal/value_type.h
+num2int.o: $(hdrdir)/ruby/internal/variable.h
+num2int.o: $(hdrdir)/ruby/internal/warning_push.h
+num2int.o: $(hdrdir)/ruby/internal/xmalloc.h
+num2int.o: $(hdrdir)/ruby/assert.h
+num2int.o: $(hdrdir)/ruby/backward.h
+num2int.o: $(hdrdir)/ruby/backward/2/assume.h
+num2int.o: $(hdrdir)/ruby/backward/2/attributes.h
+num2int.o: $(hdrdir)/ruby/backward/2/bool.h
+num2int.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+num2int.o: $(hdrdir)/ruby/backward/2/inttypes.h
+num2int.o: $(hdrdir)/ruby/backward/2/limits.h
+num2int.o: $(hdrdir)/ruby/backward/2/long_long.h
+num2int.o: $(hdrdir)/ruby/backward/2/stdalign.h
+num2int.o: $(hdrdir)/ruby/backward/2/stdarg.h
+num2int.o: $(hdrdir)/ruby/defines.h
+num2int.o: $(hdrdir)/ruby/intern.h
+num2int.o: $(hdrdir)/ruby/missing.h
+num2int.o: $(hdrdir)/ruby/ruby.h
+num2int.o: $(hdrdir)/ruby/st.h
+num2int.o: $(hdrdir)/ruby/subst.h
+num2int.o: num2int.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/path_to_class/depend b/ext/-test-/path_to_class/depend
new file mode 100644
index 0000000000..b51619b905
--- /dev/null
+++ b/ext/-test-/path_to_class/depend
@@ -0,0 +1,163 @@
+# AUTOGENERATED DEPENDENCIES START
+path_to_class.o: $(RUBY_EXTCONF_H)
+path_to_class.o: $(arch_hdrdir)/ruby/config.h
+path_to_class.o: $(hdrdir)/ruby.h
+path_to_class.o: $(hdrdir)/ruby/internal/anyargs.h
+path_to_class.o: $(hdrdir)/ruby/internal/arithmetic.h
+path_to_class.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+path_to_class.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+path_to_class.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+path_to_class.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+path_to_class.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+path_to_class.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+path_to_class.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+path_to_class.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+path_to_class.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+path_to_class.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+path_to_class.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+path_to_class.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+path_to_class.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+path_to_class.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+path_to_class.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+path_to_class.o: $(hdrdir)/ruby/internal/assume.h
+path_to_class.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+path_to_class.o: $(hdrdir)/ruby/internal/attr/artificial.h
+path_to_class.o: $(hdrdir)/ruby/internal/attr/cold.h
+path_to_class.o: $(hdrdir)/ruby/internal/attr/const.h
+path_to_class.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+path_to_class.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+path_to_class.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+path_to_class.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+path_to_class.o: $(hdrdir)/ruby/internal/attr/error.h
+path_to_class.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+path_to_class.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+path_to_class.o: $(hdrdir)/ruby/internal/attr/format.h
+path_to_class.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+path_to_class.o: $(hdrdir)/ruby/internal/attr/noalias.h
+path_to_class.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+path_to_class.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+path_to_class.o: $(hdrdir)/ruby/internal/attr/noinline.h
+path_to_class.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+path_to_class.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+path_to_class.o: $(hdrdir)/ruby/internal/attr/pure.h
+path_to_class.o: $(hdrdir)/ruby/internal/attr/restrict.h
+path_to_class.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+path_to_class.o: $(hdrdir)/ruby/internal/attr/warning.h
+path_to_class.o: $(hdrdir)/ruby/internal/attr/weakref.h
+path_to_class.o: $(hdrdir)/ruby/internal/cast.h
+path_to_class.o: $(hdrdir)/ruby/internal/compiler_is.h
+path_to_class.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+path_to_class.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+path_to_class.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+path_to_class.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+path_to_class.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+path_to_class.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+path_to_class.o: $(hdrdir)/ruby/internal/compiler_since.h
+path_to_class.o: $(hdrdir)/ruby/internal/config.h
+path_to_class.o: $(hdrdir)/ruby/internal/constant_p.h
+path_to_class.o: $(hdrdir)/ruby/internal/core.h
+path_to_class.o: $(hdrdir)/ruby/internal/core/rarray.h
+path_to_class.o: $(hdrdir)/ruby/internal/core/rbasic.h
+path_to_class.o: $(hdrdir)/ruby/internal/core/rbignum.h
+path_to_class.o: $(hdrdir)/ruby/internal/core/rclass.h
+path_to_class.o: $(hdrdir)/ruby/internal/core/rdata.h
+path_to_class.o: $(hdrdir)/ruby/internal/core/rfile.h
+path_to_class.o: $(hdrdir)/ruby/internal/core/rhash.h
+path_to_class.o: $(hdrdir)/ruby/internal/core/robject.h
+path_to_class.o: $(hdrdir)/ruby/internal/core/rregexp.h
+path_to_class.o: $(hdrdir)/ruby/internal/core/rstring.h
+path_to_class.o: $(hdrdir)/ruby/internal/core/rstruct.h
+path_to_class.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+path_to_class.o: $(hdrdir)/ruby/internal/ctype.h
+path_to_class.o: $(hdrdir)/ruby/internal/dllexport.h
+path_to_class.o: $(hdrdir)/ruby/internal/dosish.h
+path_to_class.o: $(hdrdir)/ruby/internal/error.h
+path_to_class.o: $(hdrdir)/ruby/internal/eval.h
+path_to_class.o: $(hdrdir)/ruby/internal/event.h
+path_to_class.o: $(hdrdir)/ruby/internal/fl_type.h
+path_to_class.o: $(hdrdir)/ruby/internal/gc.h
+path_to_class.o: $(hdrdir)/ruby/internal/glob.h
+path_to_class.o: $(hdrdir)/ruby/internal/globals.h
+path_to_class.o: $(hdrdir)/ruby/internal/has/attribute.h
+path_to_class.o: $(hdrdir)/ruby/internal/has/builtin.h
+path_to_class.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+path_to_class.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+path_to_class.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+path_to_class.o: $(hdrdir)/ruby/internal/has/extension.h
+path_to_class.o: $(hdrdir)/ruby/internal/has/feature.h
+path_to_class.o: $(hdrdir)/ruby/internal/has/warning.h
+path_to_class.o: $(hdrdir)/ruby/internal/intern/array.h
+path_to_class.o: $(hdrdir)/ruby/internal/intern/bignum.h
+path_to_class.o: $(hdrdir)/ruby/internal/intern/class.h
+path_to_class.o: $(hdrdir)/ruby/internal/intern/compar.h
+path_to_class.o: $(hdrdir)/ruby/internal/intern/complex.h
+path_to_class.o: $(hdrdir)/ruby/internal/intern/cont.h
+path_to_class.o: $(hdrdir)/ruby/internal/intern/dir.h
+path_to_class.o: $(hdrdir)/ruby/internal/intern/enum.h
+path_to_class.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+path_to_class.o: $(hdrdir)/ruby/internal/intern/error.h
+path_to_class.o: $(hdrdir)/ruby/internal/intern/eval.h
+path_to_class.o: $(hdrdir)/ruby/internal/intern/file.h
+path_to_class.o: $(hdrdir)/ruby/internal/intern/gc.h
+path_to_class.o: $(hdrdir)/ruby/internal/intern/hash.h
+path_to_class.o: $(hdrdir)/ruby/internal/intern/io.h
+path_to_class.o: $(hdrdir)/ruby/internal/intern/load.h
+path_to_class.o: $(hdrdir)/ruby/internal/intern/marshal.h
+path_to_class.o: $(hdrdir)/ruby/internal/intern/numeric.h
+path_to_class.o: $(hdrdir)/ruby/internal/intern/object.h
+path_to_class.o: $(hdrdir)/ruby/internal/intern/parse.h
+path_to_class.o: $(hdrdir)/ruby/internal/intern/proc.h
+path_to_class.o: $(hdrdir)/ruby/internal/intern/process.h
+path_to_class.o: $(hdrdir)/ruby/internal/intern/random.h
+path_to_class.o: $(hdrdir)/ruby/internal/intern/range.h
+path_to_class.o: $(hdrdir)/ruby/internal/intern/rational.h
+path_to_class.o: $(hdrdir)/ruby/internal/intern/re.h
+path_to_class.o: $(hdrdir)/ruby/internal/intern/ruby.h
+path_to_class.o: $(hdrdir)/ruby/internal/intern/select.h
+path_to_class.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+path_to_class.o: $(hdrdir)/ruby/internal/intern/signal.h
+path_to_class.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+path_to_class.o: $(hdrdir)/ruby/internal/intern/string.h
+path_to_class.o: $(hdrdir)/ruby/internal/intern/struct.h
+path_to_class.o: $(hdrdir)/ruby/internal/intern/thread.h
+path_to_class.o: $(hdrdir)/ruby/internal/intern/time.h
+path_to_class.o: $(hdrdir)/ruby/internal/intern/variable.h
+path_to_class.o: $(hdrdir)/ruby/internal/intern/vm.h
+path_to_class.o: $(hdrdir)/ruby/internal/interpreter.h
+path_to_class.o: $(hdrdir)/ruby/internal/iterator.h
+path_to_class.o: $(hdrdir)/ruby/internal/memory.h
+path_to_class.o: $(hdrdir)/ruby/internal/method.h
+path_to_class.o: $(hdrdir)/ruby/internal/module.h
+path_to_class.o: $(hdrdir)/ruby/internal/newobj.h
+path_to_class.o: $(hdrdir)/ruby/internal/rgengc.h
+path_to_class.o: $(hdrdir)/ruby/internal/scan_args.h
+path_to_class.o: $(hdrdir)/ruby/internal/special_consts.h
+path_to_class.o: $(hdrdir)/ruby/internal/static_assert.h
+path_to_class.o: $(hdrdir)/ruby/internal/stdalign.h
+path_to_class.o: $(hdrdir)/ruby/internal/stdbool.h
+path_to_class.o: $(hdrdir)/ruby/internal/symbol.h
+path_to_class.o: $(hdrdir)/ruby/internal/token_paste.h
+path_to_class.o: $(hdrdir)/ruby/internal/value.h
+path_to_class.o: $(hdrdir)/ruby/internal/value_type.h
+path_to_class.o: $(hdrdir)/ruby/internal/variable.h
+path_to_class.o: $(hdrdir)/ruby/internal/warning_push.h
+path_to_class.o: $(hdrdir)/ruby/internal/xmalloc.h
+path_to_class.o: $(hdrdir)/ruby/assert.h
+path_to_class.o: $(hdrdir)/ruby/backward.h
+path_to_class.o: $(hdrdir)/ruby/backward/2/assume.h
+path_to_class.o: $(hdrdir)/ruby/backward/2/attributes.h
+path_to_class.o: $(hdrdir)/ruby/backward/2/bool.h
+path_to_class.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+path_to_class.o: $(hdrdir)/ruby/backward/2/inttypes.h
+path_to_class.o: $(hdrdir)/ruby/backward/2/limits.h
+path_to_class.o: $(hdrdir)/ruby/backward/2/long_long.h
+path_to_class.o: $(hdrdir)/ruby/backward/2/stdalign.h
+path_to_class.o: $(hdrdir)/ruby/backward/2/stdarg.h
+path_to_class.o: $(hdrdir)/ruby/defines.h
+path_to_class.o: $(hdrdir)/ruby/intern.h
+path_to_class.o: $(hdrdir)/ruby/missing.h
+path_to_class.o: $(hdrdir)/ruby/ruby.h
+path_to_class.o: $(hdrdir)/ruby/st.h
+path_to_class.o: $(hdrdir)/ruby/subst.h
+path_to_class.o: path_to_class.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/popen_deadlock/depend b/ext/-test-/popen_deadlock/depend
new file mode 100644
index 0000000000..316e2c6e04
--- /dev/null
+++ b/ext/-test-/popen_deadlock/depend
@@ -0,0 +1,163 @@
+# AUTOGENERATED DEPENDENCIES START
+infinite_loop_dlsym.o: $(RUBY_EXTCONF_H)
+infinite_loop_dlsym.o: $(arch_hdrdir)/ruby/config.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/anyargs.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/arithmetic.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/assume.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/attr/artificial.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/attr/cold.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/attr/const.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/attr/error.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/attr/format.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/attr/noalias.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/attr/noinline.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/attr/pure.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/attr/restrict.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/attr/warning.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/attr/weakref.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/cast.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/compiler_is.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/compiler_since.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/config.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/constant_p.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/core.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/core/rarray.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/core/rbasic.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/core/rbignum.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/core/rclass.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/core/rdata.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/core/rfile.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/core/rhash.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/core/robject.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/core/rregexp.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/core/rstring.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/core/rstruct.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/ctype.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/dllexport.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/dosish.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/error.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/eval.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/event.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/fl_type.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/gc.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/glob.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/globals.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/has/attribute.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/has/builtin.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/has/extension.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/has/feature.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/has/warning.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/array.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/bignum.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/class.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/compar.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/complex.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/cont.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/dir.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/enum.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/error.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/eval.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/file.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/gc.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/hash.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/io.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/load.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/marshal.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/numeric.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/object.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/parse.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/proc.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/process.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/random.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/range.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/rational.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/re.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/ruby.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/select.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/signal.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/string.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/struct.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/thread.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/time.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/variable.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/intern/vm.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/interpreter.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/iterator.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/memory.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/method.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/module.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/newobj.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/rgengc.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/scan_args.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/special_consts.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/static_assert.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/stdalign.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/stdbool.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/symbol.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/token_paste.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/value.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/value_type.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/variable.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/warning_push.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/internal/xmalloc.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/assert.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/backward.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/backward/2/assume.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/backward/2/attributes.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/backward/2/bool.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/backward/2/inttypes.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/backward/2/limits.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/backward/2/long_long.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/backward/2/stdalign.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/backward/2/stdarg.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/defines.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/intern.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/missing.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/ruby.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/st.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/subst.h
+infinite_loop_dlsym.o: $(hdrdir)/ruby/thread.h
+infinite_loop_dlsym.o: infinite_loop_dlsym.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/popen_deadlock/extconf.rb b/ext/-test-/popen_deadlock/extconf.rb
index 24a7d79931..6b6ee7a6b8 100644
--- a/ext/-test-/popen_deadlock/extconf.rb
+++ b/ext/-test-/popen_deadlock/extconf.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: false
 case RUBY_PLATFORM
 when /solaris/i, /linux/i
+  $LDFLAGS << " -ldl"
   create_makefile("-test-/popen_deadlock/infinite_loop_dlsym")
 end
diff --git a/ext/-test-/postponed_job/depend b/ext/-test-/postponed_job/depend
index d672e53f00..c76cf39089 100644
--- a/ext/-test-/postponed_job/depend
+++ b/ext/-test-/postponed_job/depend
@@ -1 +1,164 @@
-postponed_job.o: $(HDRS) $(ruby_headers) $(hdrdir)/ruby/debug.h
+# AUTOGENERATED DEPENDENCIES START
+postponed_job.o: $(RUBY_EXTCONF_H)
+postponed_job.o: $(arch_hdrdir)/ruby/config.h
+postponed_job.o: $(hdrdir)/ruby.h
+postponed_job.o: $(hdrdir)/ruby/internal/anyargs.h
+postponed_job.o: $(hdrdir)/ruby/internal/arithmetic.h
+postponed_job.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+postponed_job.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+postponed_job.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+postponed_job.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+postponed_job.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+postponed_job.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+postponed_job.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+postponed_job.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+postponed_job.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+postponed_job.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+postponed_job.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+postponed_job.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+postponed_job.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+postponed_job.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+postponed_job.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+postponed_job.o: $(hdrdir)/ruby/internal/assume.h
+postponed_job.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+postponed_job.o: $(hdrdir)/ruby/internal/attr/artificial.h
+postponed_job.o: $(hdrdir)/ruby/internal/attr/cold.h
+postponed_job.o: $(hdrdir)/ruby/internal/attr/const.h
+postponed_job.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+postponed_job.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+postponed_job.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+postponed_job.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+postponed_job.o: $(hdrdir)/ruby/internal/attr/error.h
+postponed_job.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+postponed_job.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+postponed_job.o: $(hdrdir)/ruby/internal/attr/format.h
+postponed_job.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+postponed_job.o: $(hdrdir)/ruby/internal/attr/noalias.h
+postponed_job.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+postponed_job.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+postponed_job.o: $(hdrdir)/ruby/internal/attr/noinline.h
+postponed_job.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+postponed_job.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+postponed_job.o: $(hdrdir)/ruby/internal/attr/pure.h
+postponed_job.o: $(hdrdir)/ruby/internal/attr/restrict.h
+postponed_job.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+postponed_job.o: $(hdrdir)/ruby/internal/attr/warning.h
+postponed_job.o: $(hdrdir)/ruby/internal/attr/weakref.h
+postponed_job.o: $(hdrdir)/ruby/internal/cast.h
+postponed_job.o: $(hdrdir)/ruby/internal/compiler_is.h
+postponed_job.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+postponed_job.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+postponed_job.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+postponed_job.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+postponed_job.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+postponed_job.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+postponed_job.o: $(hdrdir)/ruby/internal/compiler_since.h
+postponed_job.o: $(hdrdir)/ruby/internal/config.h
+postponed_job.o: $(hdrdir)/ruby/internal/constant_p.h
+postponed_job.o: $(hdrdir)/ruby/internal/core.h
+postponed_job.o: $(hdrdir)/ruby/internal/core/rarray.h
+postponed_job.o: $(hdrdir)/ruby/internal/core/rbasic.h
+postponed_job.o: $(hdrdir)/ruby/internal/core/rbignum.h
+postponed_job.o: $(hdrdir)/ruby/internal/core/rclass.h
+postponed_job.o: $(hdrdir)/ruby/internal/core/rdata.h
+postponed_job.o: $(hdrdir)/ruby/internal/core/rfile.h
+postponed_job.o: $(hdrdir)/ruby/internal/core/rhash.h
+postponed_job.o: $(hdrdir)/ruby/internal/core/robject.h
+postponed_job.o: $(hdrdir)/ruby/internal/core/rregexp.h
+postponed_job.o: $(hdrdir)/ruby/internal/core/rstring.h
+postponed_job.o: $(hdrdir)/ruby/internal/core/rstruct.h
+postponed_job.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+postponed_job.o: $(hdrdir)/ruby/internal/ctype.h
+postponed_job.o: $(hdrdir)/ruby/internal/dllexport.h
+postponed_job.o: $(hdrdir)/ruby/internal/dosish.h
+postponed_job.o: $(hdrdir)/ruby/internal/error.h
+postponed_job.o: $(hdrdir)/ruby/internal/eval.h
+postponed_job.o: $(hdrdir)/ruby/internal/event.h
+postponed_job.o: $(hdrdir)/ruby/internal/fl_type.h
+postponed_job.o: $(hdrdir)/ruby/internal/gc.h
+postponed_job.o: $(hdrdir)/ruby/internal/glob.h
+postponed_job.o: $(hdrdir)/ruby/internal/globals.h
+postponed_job.o: $(hdrdir)/ruby/internal/has/attribute.h
+postponed_job.o: $(hdrdir)/ruby/internal/has/builtin.h
+postponed_job.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+postponed_job.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+postponed_job.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+postponed_job.o: $(hdrdir)/ruby/internal/has/extension.h
+postponed_job.o: $(hdrdir)/ruby/internal/has/feature.h
+postponed_job.o: $(hdrdir)/ruby/internal/has/warning.h
+postponed_job.o: $(hdrdir)/ruby/internal/intern/array.h
+postponed_job.o: $(hdrdir)/ruby/internal/intern/bignum.h
+postponed_job.o: $(hdrdir)/ruby/internal/intern/class.h
+postponed_job.o: $(hdrdir)/ruby/internal/intern/compar.h
+postponed_job.o: $(hdrdir)/ruby/internal/intern/complex.h
+postponed_job.o: $(hdrdir)/ruby/internal/intern/cont.h
+postponed_job.o: $(hdrdir)/ruby/internal/intern/dir.h
+postponed_job.o: $(hdrdir)/ruby/internal/intern/enum.h
+postponed_job.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+postponed_job.o: $(hdrdir)/ruby/internal/intern/error.h
+postponed_job.o: $(hdrdir)/ruby/internal/intern/eval.h
+postponed_job.o: $(hdrdir)/ruby/internal/intern/file.h
+postponed_job.o: $(hdrdir)/ruby/internal/intern/gc.h
+postponed_job.o: $(hdrdir)/ruby/internal/intern/hash.h
+postponed_job.o: $(hdrdir)/ruby/internal/intern/io.h
+postponed_job.o: $(hdrdir)/ruby/internal/intern/load.h
+postponed_job.o: $(hdrdir)/ruby/internal/intern/marshal.h
+postponed_job.o: $(hdrdir)/ruby/internal/intern/numeric.h
+postponed_job.o: $(hdrdir)/ruby/internal/intern/object.h
+postponed_job.o: $(hdrdir)/ruby/internal/intern/parse.h
+postponed_job.o: $(hdrdir)/ruby/internal/intern/proc.h
+postponed_job.o: $(hdrdir)/ruby/internal/intern/process.h
+postponed_job.o: $(hdrdir)/ruby/internal/intern/random.h
+postponed_job.o: $(hdrdir)/ruby/internal/intern/range.h
+postponed_job.o: $(hdrdir)/ruby/internal/intern/rational.h
+postponed_job.o: $(hdrdir)/ruby/internal/intern/re.h
+postponed_job.o: $(hdrdir)/ruby/internal/intern/ruby.h
+postponed_job.o: $(hdrdir)/ruby/internal/intern/select.h
+postponed_job.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+postponed_job.o: $(hdrdir)/ruby/internal/intern/signal.h
+postponed_job.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+postponed_job.o: $(hdrdir)/ruby/internal/intern/string.h
+postponed_job.o: $(hdrdir)/ruby/internal/intern/struct.h
+postponed_job.o: $(hdrdir)/ruby/internal/intern/thread.h
+postponed_job.o: $(hdrdir)/ruby/internal/intern/time.h
+postponed_job.o: $(hdrdir)/ruby/internal/intern/variable.h
+postponed_job.o: $(hdrdir)/ruby/internal/intern/vm.h
+postponed_job.o: $(hdrdir)/ruby/internal/interpreter.h
+postponed_job.o: $(hdrdir)/ruby/internal/iterator.h
+postponed_job.o: $(hdrdir)/ruby/internal/memory.h
+postponed_job.o: $(hdrdir)/ruby/internal/method.h
+postponed_job.o: $(hdrdir)/ruby/internal/module.h
+postponed_job.o: $(hdrdir)/ruby/internal/newobj.h
+postponed_job.o: $(hdrdir)/ruby/internal/rgengc.h
+postponed_job.o: $(hdrdir)/ruby/internal/scan_args.h
+postponed_job.o: $(hdrdir)/ruby/internal/special_consts.h
+postponed_job.o: $(hdrdir)/ruby/internal/static_assert.h
+postponed_job.o: $(hdrdir)/ruby/internal/stdalign.h
+postponed_job.o: $(hdrdir)/ruby/internal/stdbool.h
+postponed_job.o: $(hdrdir)/ruby/internal/symbol.h
+postponed_job.o: $(hdrdir)/ruby/internal/token_paste.h
+postponed_job.o: $(hdrdir)/ruby/internal/value.h
+postponed_job.o: $(hdrdir)/ruby/internal/value_type.h
+postponed_job.o: $(hdrdir)/ruby/internal/variable.h
+postponed_job.o: $(hdrdir)/ruby/internal/warning_push.h
+postponed_job.o: $(hdrdir)/ruby/internal/xmalloc.h
+postponed_job.o: $(hdrdir)/ruby/assert.h
+postponed_job.o: $(hdrdir)/ruby/backward.h
+postponed_job.o: $(hdrdir)/ruby/backward/2/assume.h
+postponed_job.o: $(hdrdir)/ruby/backward/2/attributes.h
+postponed_job.o: $(hdrdir)/ruby/backward/2/bool.h
+postponed_job.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+postponed_job.o: $(hdrdir)/ruby/backward/2/inttypes.h
+postponed_job.o: $(hdrdir)/ruby/backward/2/limits.h
+postponed_job.o: $(hdrdir)/ruby/backward/2/long_long.h
+postponed_job.o: $(hdrdir)/ruby/backward/2/stdalign.h
+postponed_job.o: $(hdrdir)/ruby/backward/2/stdarg.h
+postponed_job.o: $(hdrdir)/ruby/debug.h
+postponed_job.o: $(hdrdir)/ruby/defines.h
+postponed_job.o: $(hdrdir)/ruby/intern.h
+postponed_job.o: $(hdrdir)/ruby/missing.h
+postponed_job.o: $(hdrdir)/ruby/ruby.h
+postponed_job.o: $(hdrdir)/ruby/st.h
+postponed_job.o: $(hdrdir)/ruby/subst.h
+postponed_job.o: postponed_job.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/postponed_job/postponed_job.c b/ext/-test-/postponed_job/postponed_job.c
index 157230e33b..fa57bef6f5 100644
--- a/ext/-test-/postponed_job/postponed_job.c
+++ b/ext/-test-/postponed_job/postponed_job.c
@@ -1,19 +1,28 @@
 #include "ruby.h"
 #include "ruby/debug.h"
 
+static int counter;
+
 static void
 pjob_callback(void *data)
 {
     VALUE ary = (VALUE)data;
     Check_Type(ary, T_ARRAY);
 
-    rb_ary_replace(ary, rb_funcall(Qnil, rb_intern("caller"), 0));
+    rb_ary_push(ary, INT2FIX(counter));
 }
 
 static VALUE
 pjob_register(VALUE self, VALUE obj)
 {
+    counter = 0;
     rb_postponed_job_register(0, pjob_callback, (void *)obj);
+    rb_gc_start();
+    counter++;
+    rb_gc_start();
+    counter++;
+    rb_gc_start();
+    counter++;
     return self;
 }
 
@@ -38,10 +47,45 @@ pjob_register_one(VALUE self, VALUE obj)
 static VALUE
 pjob_call_direct(VALUE self, VALUE obj)
 {
+    counter = 0;
     pjob_callback((void *)obj);
+    rb_gc_start();
+    counter++;
+    rb_gc_start();
+    counter++;
+    rb_gc_start();
+    counter++;
     return self;
 }
 
+#ifdef HAVE_PTHREAD_H
+#include <pthread.h>
+
+static void *
+pjob_register_in_c_thread_i(void *obj)
+{
+    rb_postponed_job_register_one(0, pjob_one_callback, (void *)obj);
+    rb_postponed_job_register_one(0, pjob_one_callback, (void *)obj);
+    rb_postponed_job_register_one(0, pjob_one_callback, (void *)obj);
+    return NULL;
+}
+
+static VALUE
+pjob_register_in_c_thread(VALUE self, VALUE obj)
+{
+    pthread_t thread;
+    if (pthread_create(&thread, NULL, pjob_register_in_c_thread_i, (void *)obj)) {
+        return Qfalse;
+    }
+
+    if (pthread_join(thread, NULL)) {
+        return Qfalse;
+    }
+
+    return Qtrue;
+}
+#endif
+
 void
 Init_postponed_job(VALUE self)
 {
@@ -49,5 +93,8 @@ Init_postponed_job(VALUE self)
     rb_define_module_function(mBug, "postponed_job_register", pjob_register, 1);
     rb_define_module_function(mBug, "postponed_job_register_one", pjob_register_one, 1);
     rb_define_module_function(mBug, "postponed_job_call_direct", pjob_call_direct, 1);
+#ifdef HAVE_PTHREAD_H
+    rb_define_module_function(mBug, "postponed_job_register_in_c_thread", pjob_register_in_c_thread, 1);
+#endif
 }
 
diff --git a/ext/-test-/printf/depend b/ext/-test-/printf/depend
index 79b6c53f50..5f42702eaf 100644
--- a/ext/-test-/printf/depend
+++ b/ext/-test-/printf/depend
@@ -1,3 +1,166 @@
-$(OBJS): $(HDRS) $(ruby_headers) \
-  $(hdrdir)/ruby/encoding.h \
-  $(hdrdir)/ruby/oniguruma.h
+# AUTOGENERATED DEPENDENCIES START
+printf.o: $(RUBY_EXTCONF_H)
+printf.o: $(arch_hdrdir)/ruby/config.h
+printf.o: $(hdrdir)/ruby.h
+printf.o: $(hdrdir)/ruby/internal/anyargs.h
+printf.o: $(hdrdir)/ruby/internal/arithmetic.h
+printf.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+printf.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+printf.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+printf.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+printf.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+printf.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+printf.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+printf.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+printf.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+printf.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+printf.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+printf.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+printf.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+printf.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+printf.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+printf.o: $(hdrdir)/ruby/internal/assume.h
+printf.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+printf.o: $(hdrdir)/ruby/internal/attr/artificial.h
+printf.o: $(hdrdir)/ruby/internal/attr/cold.h
+printf.o: $(hdrdir)/ruby/internal/attr/const.h
+printf.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+printf.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+printf.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+printf.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+printf.o: $(hdrdir)/ruby/internal/attr/error.h
+printf.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+printf.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+printf.o: $(hdrdir)/ruby/internal/attr/format.h
+printf.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+printf.o: $(hdrdir)/ruby/internal/attr/noalias.h
+printf.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+printf.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+printf.o: $(hdrdir)/ruby/internal/attr/noinline.h
+printf.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+printf.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+printf.o: $(hdrdir)/ruby/internal/attr/pure.h
+printf.o: $(hdrdir)/ruby/internal/attr/restrict.h
+printf.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+printf.o: $(hdrdir)/ruby/internal/attr/warning.h
+printf.o: $(hdrdir)/ruby/internal/attr/weakref.h
+printf.o: $(hdrdir)/ruby/internal/cast.h
+printf.o: $(hdrdir)/ruby/internal/compiler_is.h
+printf.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+printf.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+printf.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+printf.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+printf.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+printf.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+printf.o: $(hdrdir)/ruby/internal/compiler_since.h
+printf.o: $(hdrdir)/ruby/internal/config.h
+printf.o: $(hdrdir)/ruby/internal/constant_p.h
+printf.o: $(hdrdir)/ruby/internal/core.h
+printf.o: $(hdrdir)/ruby/internal/core/rarray.h
+printf.o: $(hdrdir)/ruby/internal/core/rbasic.h
+printf.o: $(hdrdir)/ruby/internal/core/rbignum.h
+printf.o: $(hdrdir)/ruby/internal/core/rclass.h
+printf.o: $(hdrdir)/ruby/internal/core/rdata.h
+printf.o: $(hdrdir)/ruby/internal/core/rfile.h
+printf.o: $(hdrdir)/ruby/internal/core/rhash.h
+printf.o: $(hdrdir)/ruby/internal/core/robject.h
+printf.o: $(hdrdir)/ruby/internal/core/rregexp.h
+printf.o: $(hdrdir)/ruby/internal/core/rstring.h
+printf.o: $(hdrdir)/ruby/internal/core/rstruct.h
+printf.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+printf.o: $(hdrdir)/ruby/internal/ctype.h
+printf.o: $(hdrdir)/ruby/internal/dllexport.h
+printf.o: $(hdrdir)/ruby/internal/dosish.h
+printf.o: $(hdrdir)/ruby/internal/error.h
+printf.o: $(hdrdir)/ruby/internal/eval.h
+printf.o: $(hdrdir)/ruby/internal/event.h
+printf.o: $(hdrdir)/ruby/internal/fl_type.h
+printf.o: $(hdrdir)/ruby/internal/gc.h
+printf.o: $(hdrdir)/ruby/internal/glob.h
+printf.o: $(hdrdir)/ruby/internal/globals.h
+printf.o: $(hdrdir)/ruby/internal/has/attribute.h
+printf.o: $(hdrdir)/ruby/internal/has/builtin.h
+printf.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+printf.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+printf.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+printf.o: $(hdrdir)/ruby/internal/has/extension.h
+printf.o: $(hdrdir)/ruby/internal/has/feature.h
+printf.o: $(hdrdir)/ruby/internal/has/warning.h
+printf.o: $(hdrdir)/ruby/internal/intern/array.h
+printf.o: $(hdrdir)/ruby/internal/intern/bignum.h
+printf.o: $(hdrdir)/ruby/internal/intern/class.h
+printf.o: $(hdrdir)/ruby/internal/intern/compar.h
+printf.o: $(hdrdir)/ruby/internal/intern/complex.h
+printf.o: $(hdrdir)/ruby/internal/intern/cont.h
+printf.o: $(hdrdir)/ruby/internal/intern/dir.h
+printf.o: $(hdrdir)/ruby/internal/intern/enum.h
+printf.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+printf.o: $(hdrdir)/ruby/internal/intern/error.h
+printf.o: $(hdrdir)/ruby/internal/intern/eval.h
+printf.o: $(hdrdir)/ruby/internal/intern/file.h
+printf.o: $(hdrdir)/ruby/internal/intern/gc.h
+printf.o: $(hdrdir)/ruby/internal/intern/hash.h
+printf.o: $(hdrdir)/ruby/internal/intern/io.h
+printf.o: $(hdrdir)/ruby/internal/intern/load.h
+printf.o: $(hdrdir)/ruby/internal/intern/marshal.h
+printf.o: $(hdrdir)/ruby/internal/intern/numeric.h
+printf.o: $(hdrdir)/ruby/internal/intern/object.h
+printf.o: $(hdrdir)/ruby/internal/intern/parse.h
+printf.o: $(hdrdir)/ruby/internal/intern/proc.h
+printf.o: $(hdrdir)/ruby/internal/intern/process.h
+printf.o: $(hdrdir)/ruby/internal/intern/random.h
+printf.o: $(hdrdir)/ruby/internal/intern/range.h
+printf.o: $(hdrdir)/ruby/internal/intern/rational.h
+printf.o: $(hdrdir)/ruby/internal/intern/re.h
+printf.o: $(hdrdir)/ruby/internal/intern/ruby.h
+printf.o: $(hdrdir)/ruby/internal/intern/select.h
+printf.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+printf.o: $(hdrdir)/ruby/internal/intern/signal.h
+printf.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+printf.o: $(hdrdir)/ruby/internal/intern/string.h
+printf.o: $(hdrdir)/ruby/internal/intern/struct.h
+printf.o: $(hdrdir)/ruby/internal/intern/thread.h
+printf.o: $(hdrdir)/ruby/internal/intern/time.h
+printf.o: $(hdrdir)/ruby/internal/intern/variable.h
+printf.o: $(hdrdir)/ruby/internal/intern/vm.h
+printf.o: $(hdrdir)/ruby/internal/interpreter.h
+printf.o: $(hdrdir)/ruby/internal/iterator.h
+printf.o: $(hdrdir)/ruby/internal/memory.h
+printf.o: $(hdrdir)/ruby/internal/method.h
+printf.o: $(hdrdir)/ruby/internal/module.h
+printf.o: $(hdrdir)/ruby/internal/newobj.h
+printf.o: $(hdrdir)/ruby/internal/rgengc.h
+printf.o: $(hdrdir)/ruby/internal/scan_args.h
+printf.o: $(hdrdir)/ruby/internal/special_consts.h
+printf.o: $(hdrdir)/ruby/internal/static_assert.h
+printf.o: $(hdrdir)/ruby/internal/stdalign.h
+printf.o: $(hdrdir)/ruby/internal/stdbool.h
+printf.o: $(hdrdir)/ruby/internal/symbol.h
+printf.o: $(hdrdir)/ruby/internal/token_paste.h
+printf.o: $(hdrdir)/ruby/internal/value.h
+printf.o: $(hdrdir)/ruby/internal/value_type.h
+printf.o: $(hdrdir)/ruby/internal/variable.h
+printf.o: $(hdrdir)/ruby/internal/warning_push.h
+printf.o: $(hdrdir)/ruby/internal/xmalloc.h
+printf.o: $(hdrdir)/ruby/assert.h
+printf.o: $(hdrdir)/ruby/backward.h
+printf.o: $(hdrdir)/ruby/backward/2/assume.h
+printf.o: $(hdrdir)/ruby/backward/2/attributes.h
+printf.o: $(hdrdir)/ruby/backward/2/bool.h
+printf.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+printf.o: $(hdrdir)/ruby/backward/2/inttypes.h
+printf.o: $(hdrdir)/ruby/backward/2/limits.h
+printf.o: $(hdrdir)/ruby/backward/2/long_long.h
+printf.o: $(hdrdir)/ruby/backward/2/stdalign.h
+printf.o: $(hdrdir)/ruby/backward/2/stdarg.h
+printf.o: $(hdrdir)/ruby/defines.h
+printf.o: $(hdrdir)/ruby/encoding.h
+printf.o: $(hdrdir)/ruby/intern.h
+printf.o: $(hdrdir)/ruby/missing.h
+printf.o: $(hdrdir)/ruby/onigmo.h
+printf.o: $(hdrdir)/ruby/oniguruma.h
+printf.o: $(hdrdir)/ruby/ruby.h
+printf.o: $(hdrdir)/ruby/st.h
+printf.o: $(hdrdir)/ruby/subst.h
+printf.o: printf.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/printf/printf.c b/ext/-test-/printf/printf.c
index 666f5592e5..e793bb7a48 100644
--- a/ext/-test-/printf/printf.c
+++ b/ext/-test-/printf/printf.c
@@ -90,6 +90,13 @@ printf_test_call(int argc, VALUE *argv, VALUE self)
     return rb_assoc_new(result, rb_usascii_str_new_cstr(format));
 }
 
+static VALUE
+snprintf_count(VALUE self, VALUE str)
+{
+    int n = ruby_snprintf(NULL, 0, "%s", StringValueCStr(str));
+    return INT2FIX(n);
+}
+
 void
 Init_printf(void)
 {
@@ -98,4 +105,5 @@ Init_printf(void)
     rb_define_singleton_method(m, "v", printf_test_v, 1);
     rb_define_singleton_method(m, "q", printf_test_q, 1);
     rb_define_singleton_method(m, "call", printf_test_call, -1);
+    rb_define_singleton_method(m, "sncount", snprintf_count, 1);
 }
diff --git a/ext/-test-/proc/depend b/ext/-test-/proc/depend
new file mode 100644
index 0000000000..b72257f5e2
--- /dev/null
+++ b/ext/-test-/proc/depend
@@ -0,0 +1,485 @@
+# AUTOGENERATED DEPENDENCIES START
+init.o: $(RUBY_EXTCONF_H)
+init.o: $(arch_hdrdir)/ruby/config.h
+init.o: $(hdrdir)/ruby.h
+init.o: $(hdrdir)/ruby/internal/anyargs.h
+init.o: $(hdrdir)/ruby/internal/arithmetic.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+init.o: $(hdrdir)/ruby/internal/assume.h
+init.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+init.o: $(hdrdir)/ruby/internal/attr/artificial.h
+init.o: $(hdrdir)/ruby/internal/attr/cold.h
+init.o: $(hdrdir)/ruby/internal/attr/const.h
+init.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+init.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+init.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+init.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+init.o: $(hdrdir)/ruby/internal/attr/error.h
+init.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+init.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+init.o: $(hdrdir)/ruby/internal/attr/format.h
+init.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+init.o: $(hdrdir)/ruby/internal/attr/noalias.h
+init.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+init.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+init.o: $(hdrdir)/ruby/internal/attr/noinline.h
+init.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+init.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+init.o: $(hdrdir)/ruby/internal/attr/pure.h
+init.o: $(hdrdir)/ruby/internal/attr/restrict.h
+init.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+init.o: $(hdrdir)/ruby/internal/attr/warning.h
+init.o: $(hdrdir)/ruby/internal/attr/weakref.h
+init.o: $(hdrdir)/ruby/internal/cast.h
+init.o: $(hdrdir)/ruby/internal/compiler_is.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+init.o: $(hdrdir)/ruby/internal/compiler_since.h
+init.o: $(hdrdir)/ruby/internal/config.h
+init.o: $(hdrdir)/ruby/internal/constant_p.h
+init.o: $(hdrdir)/ruby/internal/core.h
+init.o: $(hdrdir)/ruby/internal/core/rarray.h
+init.o: $(hdrdir)/ruby/internal/core/rbasic.h
+init.o: $(hdrdir)/ruby/internal/core/rbignum.h
+init.o: $(hdrdir)/ruby/internal/core/rclass.h
+init.o: $(hdrdir)/ruby/internal/core/rdata.h
+init.o: $(hdrdir)/ruby/internal/core/rfile.h
+init.o: $(hdrdir)/ruby/internal/core/rhash.h
+init.o: $(hdrdir)/ruby/internal/core/robject.h
+init.o: $(hdrdir)/ruby/internal/core/rregexp.h
+init.o: $(hdrdir)/ruby/internal/core/rstring.h
+init.o: $(hdrdir)/ruby/internal/core/rstruct.h
+init.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+init.o: $(hdrdir)/ruby/internal/ctype.h
+init.o: $(hdrdir)/ruby/internal/dllexport.h
+init.o: $(hdrdir)/ruby/internal/dosish.h
+init.o: $(hdrdir)/ruby/internal/error.h
+init.o: $(hdrdir)/ruby/internal/eval.h
+init.o: $(hdrdir)/ruby/internal/event.h
+init.o: $(hdrdir)/ruby/internal/fl_type.h
+init.o: $(hdrdir)/ruby/internal/gc.h
+init.o: $(hdrdir)/ruby/internal/glob.h
+init.o: $(hdrdir)/ruby/internal/globals.h
+init.o: $(hdrdir)/ruby/internal/has/attribute.h
+init.o: $(hdrdir)/ruby/internal/has/builtin.h
+init.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/extension.h
+init.o: $(hdrdir)/ruby/internal/has/feature.h
+init.o: $(hdrdir)/ruby/internal/has/warning.h
+init.o: $(hdrdir)/ruby/internal/intern/array.h
+init.o: $(hdrdir)/ruby/internal/intern/bignum.h
+init.o: $(hdrdir)/ruby/internal/intern/class.h
+init.o: $(hdrdir)/ruby/internal/intern/compar.h
+init.o: $(hdrdir)/ruby/internal/intern/complex.h
+init.o: $(hdrdir)/ruby/internal/intern/cont.h
+init.o: $(hdrdir)/ruby/internal/intern/dir.h
+init.o: $(hdrdir)/ruby/internal/intern/enum.h
+init.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+init.o: $(hdrdir)/ruby/internal/intern/error.h
+init.o: $(hdrdir)/ruby/internal/intern/eval.h
+init.o: $(hdrdir)/ruby/internal/intern/file.h
+init.o: $(hdrdir)/ruby/internal/intern/gc.h
+init.o: $(hdrdir)/ruby/internal/intern/hash.h
+init.o: $(hdrdir)/ruby/internal/intern/io.h
+init.o: $(hdrdir)/ruby/internal/intern/load.h
+init.o: $(hdrdir)/ruby/internal/intern/marshal.h
+init.o: $(hdrdir)/ruby/internal/intern/numeric.h
+init.o: $(hdrdir)/ruby/internal/intern/object.h
+init.o: $(hdrdir)/ruby/internal/intern/parse.h
+init.o: $(hdrdir)/ruby/internal/intern/proc.h
+init.o: $(hdrdir)/ruby/internal/intern/process.h
+init.o: $(hdrdir)/ruby/internal/intern/random.h
+init.o: $(hdrdir)/ruby/internal/intern/range.h
+init.o: $(hdrdir)/ruby/internal/intern/rational.h
+init.o: $(hdrdir)/ruby/internal/intern/re.h
+init.o: $(hdrdir)/ruby/internal/intern/ruby.h
+init.o: $(hdrdir)/ruby/internal/intern/select.h
+init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+init.o: $(hdrdir)/ruby/internal/intern/signal.h
+init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+init.o: $(hdrdir)/ruby/internal/intern/string.h
+init.o: $(hdrdir)/ruby/internal/intern/struct.h
+init.o: $(hdrdir)/ruby/internal/intern/thread.h
+init.o: $(hdrdir)/ruby/internal/intern/time.h
+init.o: $(hdrdir)/ruby/internal/intern/variable.h
+init.o: $(hdrdir)/ruby/internal/intern/vm.h
+init.o: $(hdrdir)/ruby/internal/interpreter.h
+init.o: $(hdrdir)/ruby/internal/iterator.h
+init.o: $(hdrdir)/ruby/internal/memory.h
+init.o: $(hdrdir)/ruby/internal/method.h
+init.o: $(hdrdir)/ruby/internal/module.h
+init.o: $(hdrdir)/ruby/internal/newobj.h
+init.o: $(hdrdir)/ruby/internal/rgengc.h
+init.o: $(hdrdir)/ruby/internal/scan_args.h
+init.o: $(hdrdir)/ruby/internal/special_consts.h
+init.o: $(hdrdir)/ruby/internal/static_assert.h
+init.o: $(hdrdir)/ruby/internal/stdalign.h
+init.o: $(hdrdir)/ruby/internal/stdbool.h
+init.o: $(hdrdir)/ruby/internal/symbol.h
+init.o: $(hdrdir)/ruby/internal/token_paste.h
+init.o: $(hdrdir)/ruby/internal/value.h
+init.o: $(hdrdir)/ruby/internal/value_type.h
+init.o: $(hdrdir)/ruby/internal/variable.h
+init.o: $(hdrdir)/ruby/internal/warning_push.h
+init.o: $(hdrdir)/ruby/internal/xmalloc.h
+init.o: $(hdrdir)/ruby/assert.h
+init.o: $(hdrdir)/ruby/backward.h
+init.o: $(hdrdir)/ruby/backward/2/assume.h
+init.o: $(hdrdir)/ruby/backward/2/attributes.h
+init.o: $(hdrdir)/ruby/backward/2/bool.h
+init.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+init.o: $(hdrdir)/ruby/backward/2/inttypes.h
+init.o: $(hdrdir)/ruby/backward/2/limits.h
+init.o: $(hdrdir)/ruby/backward/2/long_long.h
+init.o: $(hdrdir)/ruby/backward/2/stdalign.h
+init.o: $(hdrdir)/ruby/backward/2/stdarg.h
+init.o: $(hdrdir)/ruby/defines.h
+init.o: $(hdrdir)/ruby/intern.h
+init.o: $(hdrdir)/ruby/missing.h
+init.o: $(hdrdir)/ruby/ruby.h
+init.o: $(hdrdir)/ruby/st.h
+init.o: $(hdrdir)/ruby/subst.h
+init.o: init.c
+receiver.o: $(RUBY_EXTCONF_H)
+receiver.o: $(arch_hdrdir)/ruby/config.h
+receiver.o: $(hdrdir)/ruby.h
+receiver.o: $(hdrdir)/ruby/internal/anyargs.h
+receiver.o: $(hdrdir)/ruby/internal/arithmetic.h
+receiver.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+receiver.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+receiver.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+receiver.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+receiver.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+receiver.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+receiver.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+receiver.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+receiver.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+receiver.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+receiver.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+receiver.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+receiver.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+receiver.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+receiver.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+receiver.o: $(hdrdir)/ruby/internal/assume.h
+receiver.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+receiver.o: $(hdrdir)/ruby/internal/attr/artificial.h
+receiver.o: $(hdrdir)/ruby/internal/attr/cold.h
+receiver.o: $(hdrdir)/ruby/internal/attr/const.h
+receiver.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+receiver.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+receiver.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+receiver.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+receiver.o: $(hdrdir)/ruby/internal/attr/error.h
+receiver.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+receiver.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+receiver.o: $(hdrdir)/ruby/internal/attr/format.h
+receiver.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+receiver.o: $(hdrdir)/ruby/internal/attr/noalias.h
+receiver.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+receiver.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+receiver.o: $(hdrdir)/ruby/internal/attr/noinline.h
+receiver.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+receiver.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+receiver.o: $(hdrdir)/ruby/internal/attr/pure.h
+receiver.o: $(hdrdir)/ruby/internal/attr/restrict.h
+receiver.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+receiver.o: $(hdrdir)/ruby/internal/attr/warning.h
+receiver.o: $(hdrdir)/ruby/internal/attr/weakref.h
+receiver.o: $(hdrdir)/ruby/internal/cast.h
+receiver.o: $(hdrdir)/ruby/internal/compiler_is.h
+receiver.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+receiver.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+receiver.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+receiver.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+receiver.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+receiver.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+receiver.o: $(hdrdir)/ruby/internal/compiler_since.h
+receiver.o: $(hdrdir)/ruby/internal/config.h
+receiver.o: $(hdrdir)/ruby/internal/constant_p.h
+receiver.o: $(hdrdir)/ruby/internal/core.h
+receiver.o: $(hdrdir)/ruby/internal/core/rarray.h
+receiver.o: $(hdrdir)/ruby/internal/core/rbasic.h
+receiver.o: $(hdrdir)/ruby/internal/core/rbignum.h
+receiver.o: $(hdrdir)/ruby/internal/core/rclass.h
+receiver.o: $(hdrdir)/ruby/internal/core/rdata.h
+receiver.o: $(hdrdir)/ruby/internal/core/rfile.h
+receiver.o: $(hdrdir)/ruby/internal/core/rhash.h
+receiver.o: $(hdrdir)/ruby/internal/core/robject.h
+receiver.o: $(hdrdir)/ruby/internal/core/rregexp.h
+receiver.o: $(hdrdir)/ruby/internal/core/rstring.h
+receiver.o: $(hdrdir)/ruby/internal/core/rstruct.h
+receiver.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+receiver.o: $(hdrdir)/ruby/internal/ctype.h
+receiver.o: $(hdrdir)/ruby/internal/dllexport.h
+receiver.o: $(hdrdir)/ruby/internal/dosish.h
+receiver.o: $(hdrdir)/ruby/internal/error.h
+receiver.o: $(hdrdir)/ruby/internal/eval.h
+receiver.o: $(hdrdir)/ruby/internal/event.h
+receiver.o: $(hdrdir)/ruby/internal/fl_type.h
+receiver.o: $(hdrdir)/ruby/internal/gc.h
+receiver.o: $(hdrdir)/ruby/internal/glob.h
+receiver.o: $(hdrdir)/ruby/internal/globals.h
+receiver.o: $(hdrdir)/ruby/internal/has/attribute.h
+receiver.o: $(hdrdir)/ruby/internal/has/builtin.h
+receiver.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+receiver.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+receiver.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+receiver.o: $(hdrdir)/ruby/internal/has/extension.h
+receiver.o: $(hdrdir)/ruby/internal/has/feature.h
+receiver.o: $(hdrdir)/ruby/internal/has/warning.h
+receiver.o: $(hdrdir)/ruby/internal/intern/array.h
+receiver.o: $(hdrdir)/ruby/internal/intern/bignum.h
+receiver.o: $(hdrdir)/ruby/internal/intern/class.h
+receiver.o: $(hdrdir)/ruby/internal/intern/compar.h
+receiver.o: $(hdrdir)/ruby/internal/intern/complex.h
+receiver.o: $(hdrdir)/ruby/internal/intern/cont.h
+receiver.o: $(hdrdir)/ruby/internal/intern/dir.h
+receiver.o: $(hdrdir)/ruby/internal/intern/enum.h
+receiver.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+receiver.o: $(hdrdir)/ruby/internal/intern/error.h
+receiver.o: $(hdrdir)/ruby/internal/intern/eval.h
+receiver.o: $(hdrdir)/ruby/internal/intern/file.h
+receiver.o: $(hdrdir)/ruby/internal/intern/gc.h
+receiver.o: $(hdrdir)/ruby/internal/intern/hash.h
+receiver.o: $(hdrdir)/ruby/internal/intern/io.h
+receiver.o: $(hdrdir)/ruby/internal/intern/load.h
+receiver.o: $(hdrdir)/ruby/internal/intern/marshal.h
+receiver.o: $(hdrdir)/ruby/internal/intern/numeric.h
+receiver.o: $(hdrdir)/ruby/internal/intern/object.h
+receiver.o: $(hdrdir)/ruby/internal/intern/parse.h
+receiver.o: $(hdrdir)/ruby/internal/intern/proc.h
+receiver.o: $(hdrdir)/ruby/internal/intern/process.h
+receiver.o: $(hdrdir)/ruby/internal/intern/random.h
+receiver.o: $(hdrdir)/ruby/internal/intern/range.h
+receiver.o: $(hdrdir)/ruby/internal/intern/rational.h
+receiver.o: $(hdrdir)/ruby/internal/intern/re.h
+receiver.o: $(hdrdir)/ruby/internal/intern/ruby.h
+receiver.o: $(hdrdir)/ruby/internal/intern/select.h
+receiver.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+receiver.o: $(hdrdir)/ruby/internal/intern/signal.h
+receiver.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+receiver.o: $(hdrdir)/ruby/internal/intern/string.h
+receiver.o: $(hdrdir)/ruby/internal/intern/struct.h
+receiver.o: $(hdrdir)/ruby/internal/intern/thread.h
+receiver.o: $(hdrdir)/ruby/internal/intern/time.h
+receiver.o: $(hdrdir)/ruby/internal/intern/variable.h
+receiver.o: $(hdrdir)/ruby/internal/intern/vm.h
+receiver.o: $(hdrdir)/ruby/internal/interpreter.h
+receiver.o: $(hdrdir)/ruby/internal/iterator.h
+receiver.o: $(hdrdir)/ruby/internal/memory.h
+receiver.o: $(hdrdir)/ruby/internal/method.h
+receiver.o: $(hdrdir)/ruby/internal/module.h
+receiver.o: $(hdrdir)/ruby/internal/newobj.h
+receiver.o: $(hdrdir)/ruby/internal/rgengc.h
+receiver.o: $(hdrdir)/ruby/internal/scan_args.h
+receiver.o: $(hdrdir)/ruby/internal/special_consts.h
+receiver.o: $(hdrdir)/ruby/internal/static_assert.h
+receiver.o: $(hdrdir)/ruby/internal/stdalign.h
+receiver.o: $(hdrdir)/ruby/internal/stdbool.h
+receiver.o: $(hdrdir)/ruby/internal/symbol.h
+receiver.o: $(hdrdir)/ruby/internal/token_paste.h
+receiver.o: $(hdrdir)/ruby/internal/value.h
+receiver.o: $(hdrdir)/ruby/internal/value_type.h
+receiver.o: $(hdrdir)/ruby/internal/variable.h
+receiver.o: $(hdrdir)/ruby/internal/warning_push.h
+receiver.o: $(hdrdir)/ruby/internal/xmalloc.h
+receiver.o: $(hdrdir)/ruby/assert.h
+receiver.o: $(hdrdir)/ruby/backward.h
+receiver.o: $(hdrdir)/ruby/backward/2/assume.h
+receiver.o: $(hdrdir)/ruby/backward/2/attributes.h
+receiver.o: $(hdrdir)/ruby/backward/2/bool.h
+receiver.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+receiver.o: $(hdrdir)/ruby/backward/2/inttypes.h
+receiver.o: $(hdrdir)/ruby/backward/2/limits.h
+receiver.o: $(hdrdir)/ruby/backward/2/long_long.h
+receiver.o: $(hdrdir)/ruby/backward/2/stdalign.h
+receiver.o: $(hdrdir)/ruby/backward/2/stdarg.h
+receiver.o: $(hdrdir)/ruby/defines.h
+receiver.o: $(hdrdir)/ruby/intern.h
+receiver.o: $(hdrdir)/ruby/missing.h
+receiver.o: $(hdrdir)/ruby/ruby.h
+receiver.o: $(hdrdir)/ruby/st.h
+receiver.o: $(hdrdir)/ruby/subst.h
+receiver.o: receiver.c
+super.o: $(RUBY_EXTCONF_H)
+super.o: $(arch_hdrdir)/ruby/config.h
+super.o: $(hdrdir)/ruby.h
+super.o: $(hdrdir)/ruby/internal/anyargs.h
+super.o: $(hdrdir)/ruby/internal/arithmetic.h
+super.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+super.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+super.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+super.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+super.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+super.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+super.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+super.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+super.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+super.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+super.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+super.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+super.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+super.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+super.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+super.o: $(hdrdir)/ruby/internal/assume.h
+super.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+super.o: $(hdrdir)/ruby/internal/attr/artificial.h
+super.o: $(hdrdir)/ruby/internal/attr/cold.h
+super.o: $(hdrdir)/ruby/internal/attr/const.h
+super.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+super.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+super.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+super.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+super.o: $(hdrdir)/ruby/internal/attr/error.h
+super.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+super.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+super.o: $(hdrdir)/ruby/internal/attr/format.h
+super.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+super.o: $(hdrdir)/ruby/internal/attr/noalias.h
+super.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+super.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+super.o: $(hdrdir)/ruby/internal/attr/noinline.h
+super.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+super.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+super.o: $(hdrdir)/ruby/internal/attr/pure.h
+super.o: $(hdrdir)/ruby/internal/attr/restrict.h
+super.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+super.o: $(hdrdir)/ruby/internal/attr/warning.h
+super.o: $(hdrdir)/ruby/internal/attr/weakref.h
+super.o: $(hdrdir)/ruby/internal/cast.h
+super.o: $(hdrdir)/ruby/internal/compiler_is.h
+super.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+super.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+super.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+super.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+super.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+super.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+super.o: $(hdrdir)/ruby/internal/compiler_since.h
+super.o: $(hdrdir)/ruby/internal/config.h
+super.o: $(hdrdir)/ruby/internal/constant_p.h
+super.o: $(hdrdir)/ruby/internal/core.h
+super.o: $(hdrdir)/ruby/internal/core/rarray.h
+super.o: $(hdrdir)/ruby/internal/core/rbasic.h
+super.o: $(hdrdir)/ruby/internal/core/rbignum.h
+super.o: $(hdrdir)/ruby/internal/core/rclass.h
+super.o: $(hdrdir)/ruby/internal/core/rdata.h
+super.o: $(hdrdir)/ruby/internal/core/rfile.h
+super.o: $(hdrdir)/ruby/internal/core/rhash.h
+super.o: $(hdrdir)/ruby/internal/core/robject.h
+super.o: $(hdrdir)/ruby/internal/core/rregexp.h
+super.o: $(hdrdir)/ruby/internal/core/rstring.h
+super.o: $(hdrdir)/ruby/internal/core/rstruct.h
+super.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+super.o: $(hdrdir)/ruby/internal/ctype.h
+super.o: $(hdrdir)/ruby/internal/dllexport.h
+super.o: $(hdrdir)/ruby/internal/dosish.h
+super.o: $(hdrdir)/ruby/internal/error.h
+super.o: $(hdrdir)/ruby/internal/eval.h
+super.o: $(hdrdir)/ruby/internal/event.h
+super.o: $(hdrdir)/ruby/internal/fl_type.h
+super.o: $(hdrdir)/ruby/internal/gc.h
+super.o: $(hdrdir)/ruby/internal/glob.h
+super.o: $(hdrdir)/ruby/internal/globals.h
+super.o: $(hdrdir)/ruby/internal/has/attribute.h
+super.o: $(hdrdir)/ruby/internal/has/builtin.h
+super.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+super.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+super.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+super.o: $(hdrdir)/ruby/internal/has/extension.h
+super.o: $(hdrdir)/ruby/internal/has/feature.h
+super.o: $(hdrdir)/ruby/internal/has/warning.h
+super.o: $(hdrdir)/ruby/internal/intern/array.h
+super.o: $(hdrdir)/ruby/internal/intern/bignum.h
+super.o: $(hdrdir)/ruby/internal/intern/class.h
+super.o: $(hdrdir)/ruby/internal/intern/compar.h
+super.o: $(hdrdir)/ruby/internal/intern/complex.h
+super.o: $(hdrdir)/ruby/internal/intern/cont.h
+super.o: $(hdrdir)/ruby/internal/intern/dir.h
+super.o: $(hdrdir)/ruby/internal/intern/enum.h
+super.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+super.o: $(hdrdir)/ruby/internal/intern/error.h
+super.o: $(hdrdir)/ruby/internal/intern/eval.h
+super.o: $(hdrdir)/ruby/internal/intern/file.h
+super.o: $(hdrdir)/ruby/internal/intern/gc.h
+super.o: $(hdrdir)/ruby/internal/intern/hash.h
+super.o: $(hdrdir)/ruby/internal/intern/io.h
+super.o: $(hdrdir)/ruby/internal/intern/load.h
+super.o: $(hdrdir)/ruby/internal/intern/marshal.h
+super.o: $(hdrdir)/ruby/internal/intern/numeric.h
+super.o: $(hdrdir)/ruby/internal/intern/object.h
+super.o: $(hdrdir)/ruby/internal/intern/parse.h
+super.o: $(hdrdir)/ruby/internal/intern/proc.h
+super.o: $(hdrdir)/ruby/internal/intern/process.h
+super.o: $(hdrdir)/ruby/internal/intern/random.h
+super.o: $(hdrdir)/ruby/internal/intern/range.h
+super.o: $(hdrdir)/ruby/internal/intern/rational.h
+super.o: $(hdrdir)/ruby/internal/intern/re.h
+super.o: $(hdrdir)/ruby/internal/intern/ruby.h
+super.o: $(hdrdir)/ruby/internal/intern/select.h
+super.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+super.o: $(hdrdir)/ruby/internal/intern/signal.h
+super.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+super.o: $(hdrdir)/ruby/internal/intern/string.h
+super.o: $(hdrdir)/ruby/internal/intern/struct.h
+super.o: $(hdrdir)/ruby/internal/intern/thread.h
+super.o: $(hdrdir)/ruby/internal/intern/time.h
+super.o: $(hdrdir)/ruby/internal/intern/variable.h
+super.o: $(hdrdir)/ruby/internal/intern/vm.h
+super.o: $(hdrdir)/ruby/internal/interpreter.h
+super.o: $(hdrdir)/ruby/internal/iterator.h
+super.o: $(hdrdir)/ruby/internal/memory.h
+super.o: $(hdrdir)/ruby/internal/method.h
+super.o: $(hdrdir)/ruby/internal/module.h
+super.o: $(hdrdir)/ruby/internal/newobj.h
+super.o: $(hdrdir)/ruby/internal/rgengc.h
+super.o: $(hdrdir)/ruby/internal/scan_args.h
+super.o: $(hdrdir)/ruby/internal/special_consts.h
+super.o: $(hdrdir)/ruby/internal/static_assert.h
+super.o: $(hdrdir)/ruby/internal/stdalign.h
+super.o: $(hdrdir)/ruby/internal/stdbool.h
+super.o: $(hdrdir)/ruby/internal/symbol.h
+super.o: $(hdrdir)/ruby/internal/token_paste.h
+super.o: $(hdrdir)/ruby/internal/value.h
+super.o: $(hdrdir)/ruby/internal/value_type.h
+super.o: $(hdrdir)/ruby/internal/variable.h
+super.o: $(hdrdir)/ruby/internal/warning_push.h
+super.o: $(hdrdir)/ruby/internal/xmalloc.h
+super.o: $(hdrdir)/ruby/assert.h
+super.o: $(hdrdir)/ruby/backward.h
+super.o: $(hdrdir)/ruby/backward/2/assume.h
+super.o: $(hdrdir)/ruby/backward/2/attributes.h
+super.o: $(hdrdir)/ruby/backward/2/bool.h
+super.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+super.o: $(hdrdir)/ruby/backward/2/inttypes.h
+super.o: $(hdrdir)/ruby/backward/2/limits.h
+super.o: $(hdrdir)/ruby/backward/2/long_long.h
+super.o: $(hdrdir)/ruby/backward/2/stdalign.h
+super.o: $(hdrdir)/ruby/backward/2/stdarg.h
+super.o: $(hdrdir)/ruby/defines.h
+super.o: $(hdrdir)/ruby/intern.h
+super.o: $(hdrdir)/ruby/missing.h
+super.o: $(hdrdir)/ruby/ruby.h
+super.o: $(hdrdir)/ruby/st.h
+super.o: $(hdrdir)/ruby/subst.h
+super.o: super.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/random/depend b/ext/-test-/random/depend
new file mode 100644
index 0000000000..4b4997d340
--- /dev/null
+++ b/ext/-test-/random/depend
@@ -0,0 +1,328 @@
+# AUTOGENERATED DEPENDENCIES START
+init.o: $(RUBY_EXTCONF_H)
+init.o: $(arch_hdrdir)/ruby/config.h
+init.o: $(hdrdir)/ruby.h
+init.o: $(hdrdir)/ruby/assert.h
+init.o: $(hdrdir)/ruby/backward.h
+init.o: $(hdrdir)/ruby/backward/2/assume.h
+init.o: $(hdrdir)/ruby/backward/2/attributes.h
+init.o: $(hdrdir)/ruby/backward/2/bool.h
+init.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+init.o: $(hdrdir)/ruby/backward/2/inttypes.h
+init.o: $(hdrdir)/ruby/backward/2/limits.h
+init.o: $(hdrdir)/ruby/backward/2/long_long.h
+init.o: $(hdrdir)/ruby/backward/2/r_cast.h
+init.o: $(hdrdir)/ruby/backward/2/rmodule.h
+init.o: $(hdrdir)/ruby/backward/2/stdalign.h
+init.o: $(hdrdir)/ruby/backward/2/stdarg.h
+init.o: $(hdrdir)/ruby/defines.h
+init.o: $(hdrdir)/ruby/intern.h
+init.o: $(hdrdir)/ruby/internal/anyargs.h
+init.o: $(hdrdir)/ruby/internal/arithmetic.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+init.o: $(hdrdir)/ruby/internal/assume.h
+init.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+init.o: $(hdrdir)/ruby/internal/attr/artificial.h
+init.o: $(hdrdir)/ruby/internal/attr/cold.h
+init.o: $(hdrdir)/ruby/internal/attr/const.h
+init.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+init.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+init.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+init.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+init.o: $(hdrdir)/ruby/internal/attr/error.h
+init.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+init.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+init.o: $(hdrdir)/ruby/internal/attr/format.h
+init.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+init.o: $(hdrdir)/ruby/internal/attr/noalias.h
+init.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+init.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+init.o: $(hdrdir)/ruby/internal/attr/noinline.h
+init.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+init.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+init.o: $(hdrdir)/ruby/internal/attr/pure.h
+init.o: $(hdrdir)/ruby/internal/attr/restrict.h
+init.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+init.o: $(hdrdir)/ruby/internal/attr/warning.h
+init.o: $(hdrdir)/ruby/internal/attr/weakref.h
+init.o: $(hdrdir)/ruby/internal/cast.h
+init.o: $(hdrdir)/ruby/internal/compiler_is.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+init.o: $(hdrdir)/ruby/internal/compiler_since.h
+init.o: $(hdrdir)/ruby/internal/config.h
+init.o: $(hdrdir)/ruby/internal/constant_p.h
+init.o: $(hdrdir)/ruby/internal/core.h
+init.o: $(hdrdir)/ruby/internal/core/rarray.h
+init.o: $(hdrdir)/ruby/internal/core/rbasic.h
+init.o: $(hdrdir)/ruby/internal/core/rbignum.h
+init.o: $(hdrdir)/ruby/internal/core/rclass.h
+init.o: $(hdrdir)/ruby/internal/core/rdata.h
+init.o: $(hdrdir)/ruby/internal/core/rfile.h
+init.o: $(hdrdir)/ruby/internal/core/rhash.h
+init.o: $(hdrdir)/ruby/internal/core/robject.h
+init.o: $(hdrdir)/ruby/internal/core/rregexp.h
+init.o: $(hdrdir)/ruby/internal/core/rstring.h
+init.o: $(hdrdir)/ruby/internal/core/rstruct.h
+init.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+init.o: $(hdrdir)/ruby/internal/ctype.h
+init.o: $(hdrdir)/ruby/internal/dllexport.h
+init.o: $(hdrdir)/ruby/internal/dosish.h
+init.o: $(hdrdir)/ruby/internal/error.h
+init.o: $(hdrdir)/ruby/internal/eval.h
+init.o: $(hdrdir)/ruby/internal/event.h
+init.o: $(hdrdir)/ruby/internal/fl_type.h
+init.o: $(hdrdir)/ruby/internal/gc.h
+init.o: $(hdrdir)/ruby/internal/glob.h
+init.o: $(hdrdir)/ruby/internal/globals.h
+init.o: $(hdrdir)/ruby/internal/has/attribute.h
+init.o: $(hdrdir)/ruby/internal/has/builtin.h
+init.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/extension.h
+init.o: $(hdrdir)/ruby/internal/has/feature.h
+init.o: $(hdrdir)/ruby/internal/has/warning.h
+init.o: $(hdrdir)/ruby/internal/intern/array.h
+init.o: $(hdrdir)/ruby/internal/intern/bignum.h
+init.o: $(hdrdir)/ruby/internal/intern/class.h
+init.o: $(hdrdir)/ruby/internal/intern/compar.h
+init.o: $(hdrdir)/ruby/internal/intern/complex.h
+init.o: $(hdrdir)/ruby/internal/intern/cont.h
+init.o: $(hdrdir)/ruby/internal/intern/dir.h
+init.o: $(hdrdir)/ruby/internal/intern/enum.h
+init.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+init.o: $(hdrdir)/ruby/internal/intern/error.h
+init.o: $(hdrdir)/ruby/internal/intern/eval.h
+init.o: $(hdrdir)/ruby/internal/intern/file.h
+init.o: $(hdrdir)/ruby/internal/intern/gc.h
+init.o: $(hdrdir)/ruby/internal/intern/hash.h
+init.o: $(hdrdir)/ruby/internal/intern/io.h
+init.o: $(hdrdir)/ruby/internal/intern/load.h
+init.o: $(hdrdir)/ruby/internal/intern/marshal.h
+init.o: $(hdrdir)/ruby/internal/intern/numeric.h
+init.o: $(hdrdir)/ruby/internal/intern/object.h
+init.o: $(hdrdir)/ruby/internal/intern/parse.h
+init.o: $(hdrdir)/ruby/internal/intern/proc.h
+init.o: $(hdrdir)/ruby/internal/intern/process.h
+init.o: $(hdrdir)/ruby/internal/intern/random.h
+init.o: $(hdrdir)/ruby/internal/intern/range.h
+init.o: $(hdrdir)/ruby/internal/intern/rational.h
+init.o: $(hdrdir)/ruby/internal/intern/re.h
+init.o: $(hdrdir)/ruby/internal/intern/ruby.h
+init.o: $(hdrdir)/ruby/internal/intern/select.h
+init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+init.o: $(hdrdir)/ruby/internal/intern/signal.h
+init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+init.o: $(hdrdir)/ruby/internal/intern/string.h
+init.o: $(hdrdir)/ruby/internal/intern/struct.h
+init.o: $(hdrdir)/ruby/internal/intern/thread.h
+init.o: $(hdrdir)/ruby/internal/intern/time.h
+init.o: $(hdrdir)/ruby/internal/intern/variable.h
+init.o: $(hdrdir)/ruby/internal/intern/vm.h
+init.o: $(hdrdir)/ruby/internal/interpreter.h
+init.o: $(hdrdir)/ruby/internal/iterator.h
+init.o: $(hdrdir)/ruby/internal/memory.h
+init.o: $(hdrdir)/ruby/internal/method.h
+init.o: $(hdrdir)/ruby/internal/module.h
+init.o: $(hdrdir)/ruby/internal/newobj.h
+init.o: $(hdrdir)/ruby/internal/rgengc.h
+init.o: $(hdrdir)/ruby/internal/scan_args.h
+init.o: $(hdrdir)/ruby/internal/special_consts.h
+init.o: $(hdrdir)/ruby/internal/static_assert.h
+init.o: $(hdrdir)/ruby/internal/stdalign.h
+init.o: $(hdrdir)/ruby/internal/stdbool.h
+init.o: $(hdrdir)/ruby/internal/symbol.h
+init.o: $(hdrdir)/ruby/internal/token_paste.h
+init.o: $(hdrdir)/ruby/internal/value.h
+init.o: $(hdrdir)/ruby/internal/value_type.h
+init.o: $(hdrdir)/ruby/internal/variable.h
+init.o: $(hdrdir)/ruby/internal/warning_push.h
+init.o: $(hdrdir)/ruby/internal/xmalloc.h
+init.o: $(hdrdir)/ruby/missing.h
+init.o: $(hdrdir)/ruby/ruby.h
+init.o: $(hdrdir)/ruby/st.h
+init.o: $(hdrdir)/ruby/subst.h
+init.o: init.c
+loop.o: $(RUBY_EXTCONF_H)
+loop.o: $(arch_hdrdir)/ruby/config.h
+loop.o: $(hdrdir)/ruby/assert.h
+loop.o: $(hdrdir)/ruby/backward.h
+loop.o: $(hdrdir)/ruby/backward/2/assume.h
+loop.o: $(hdrdir)/ruby/backward/2/attributes.h
+loop.o: $(hdrdir)/ruby/backward/2/bool.h
+loop.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+loop.o: $(hdrdir)/ruby/backward/2/inttypes.h
+loop.o: $(hdrdir)/ruby/backward/2/limits.h
+loop.o: $(hdrdir)/ruby/backward/2/long_long.h
+loop.o: $(hdrdir)/ruby/backward/2/r_cast.h
+loop.o: $(hdrdir)/ruby/backward/2/rmodule.h
+loop.o: $(hdrdir)/ruby/backward/2/stdalign.h
+loop.o: $(hdrdir)/ruby/backward/2/stdarg.h
+loop.o: $(hdrdir)/ruby/defines.h
+loop.o: $(hdrdir)/ruby/intern.h
+loop.o: $(hdrdir)/ruby/internal/anyargs.h
+loop.o: $(hdrdir)/ruby/internal/arithmetic.h
+loop.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+loop.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+loop.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+loop.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+loop.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+loop.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+loop.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+loop.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+loop.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+loop.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+loop.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+loop.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+loop.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+loop.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+loop.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+loop.o: $(hdrdir)/ruby/internal/assume.h
+loop.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+loop.o: $(hdrdir)/ruby/internal/attr/artificial.h
+loop.o: $(hdrdir)/ruby/internal/attr/cold.h
+loop.o: $(hdrdir)/ruby/internal/attr/const.h
+loop.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+loop.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+loop.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+loop.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+loop.o: $(hdrdir)/ruby/internal/attr/error.h
+loop.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+loop.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+loop.o: $(hdrdir)/ruby/internal/attr/format.h
+loop.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+loop.o: $(hdrdir)/ruby/internal/attr/noalias.h
+loop.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+loop.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+loop.o: $(hdrdir)/ruby/internal/attr/noinline.h
+loop.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+loop.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+loop.o: $(hdrdir)/ruby/internal/attr/pure.h
+loop.o: $(hdrdir)/ruby/internal/attr/restrict.h
+loop.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+loop.o: $(hdrdir)/ruby/internal/attr/warning.h
+loop.o: $(hdrdir)/ruby/internal/attr/weakref.h
+loop.o: $(hdrdir)/ruby/internal/cast.h
+loop.o: $(hdrdir)/ruby/internal/compiler_is.h
+loop.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+loop.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+loop.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+loop.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+loop.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+loop.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+loop.o: $(hdrdir)/ruby/internal/compiler_since.h
+loop.o: $(hdrdir)/ruby/internal/config.h
+loop.o: $(hdrdir)/ruby/internal/constant_p.h
+loop.o: $(hdrdir)/ruby/internal/core.h
+loop.o: $(hdrdir)/ruby/internal/core/rarray.h
+loop.o: $(hdrdir)/ruby/internal/core/rbasic.h
+loop.o: $(hdrdir)/ruby/internal/core/rbignum.h
+loop.o: $(hdrdir)/ruby/internal/core/rclass.h
+loop.o: $(hdrdir)/ruby/internal/core/rdata.h
+loop.o: $(hdrdir)/ruby/internal/core/rfile.h
+loop.o: $(hdrdir)/ruby/internal/core/rhash.h
+loop.o: $(hdrdir)/ruby/internal/core/robject.h
+loop.o: $(hdrdir)/ruby/internal/core/rregexp.h
+loop.o: $(hdrdir)/ruby/internal/core/rstring.h
+loop.o: $(hdrdir)/ruby/internal/core/rstruct.h
+loop.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+loop.o: $(hdrdir)/ruby/internal/ctype.h
+loop.o: $(hdrdir)/ruby/internal/dllexport.h
+loop.o: $(hdrdir)/ruby/internal/dosish.h
+loop.o: $(hdrdir)/ruby/internal/error.h
+loop.o: $(hdrdir)/ruby/internal/eval.h
+loop.o: $(hdrdir)/ruby/internal/event.h
+loop.o: $(hdrdir)/ruby/internal/fl_type.h
+loop.o: $(hdrdir)/ruby/internal/gc.h
+loop.o: $(hdrdir)/ruby/internal/glob.h
+loop.o: $(hdrdir)/ruby/internal/globals.h
+loop.o: $(hdrdir)/ruby/internal/has/attribute.h
+loop.o: $(hdrdir)/ruby/internal/has/builtin.h
+loop.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+loop.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+loop.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+loop.o: $(hdrdir)/ruby/internal/has/extension.h
+loop.o: $(hdrdir)/ruby/internal/has/feature.h
+loop.o: $(hdrdir)/ruby/internal/has/warning.h
+loop.o: $(hdrdir)/ruby/internal/intern/array.h
+loop.o: $(hdrdir)/ruby/internal/intern/bignum.h
+loop.o: $(hdrdir)/ruby/internal/intern/class.h
+loop.o: $(hdrdir)/ruby/internal/intern/compar.h
+loop.o: $(hdrdir)/ruby/internal/intern/complex.h
+loop.o: $(hdrdir)/ruby/internal/intern/cont.h
+loop.o: $(hdrdir)/ruby/internal/intern/dir.h
+loop.o: $(hdrdir)/ruby/internal/intern/enum.h
+loop.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+loop.o: $(hdrdir)/ruby/internal/intern/error.h
+loop.o: $(hdrdir)/ruby/internal/intern/eval.h
+loop.o: $(hdrdir)/ruby/internal/intern/file.h
+loop.o: $(hdrdir)/ruby/internal/intern/gc.h
+loop.o: $(hdrdir)/ruby/internal/intern/hash.h
+loop.o: $(hdrdir)/ruby/internal/intern/io.h
+loop.o: $(hdrdir)/ruby/internal/intern/load.h
+loop.o: $(hdrdir)/ruby/internal/intern/marshal.h
+loop.o: $(hdrdir)/ruby/internal/intern/numeric.h
+loop.o: $(hdrdir)/ruby/internal/intern/object.h
+loop.o: $(hdrdir)/ruby/internal/intern/parse.h
+loop.o: $(hdrdir)/ruby/internal/intern/proc.h
+loop.o: $(hdrdir)/ruby/internal/intern/process.h
+loop.o: $(hdrdir)/ruby/internal/intern/random.h
+loop.o: $(hdrdir)/ruby/internal/intern/range.h
+loop.o: $(hdrdir)/ruby/internal/intern/rational.h
+loop.o: $(hdrdir)/ruby/internal/intern/re.h
+loop.o: $(hdrdir)/ruby/internal/intern/ruby.h
+loop.o: $(hdrdir)/ruby/internal/intern/select.h
+loop.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+loop.o: $(hdrdir)/ruby/internal/intern/signal.h
+loop.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+loop.o: $(hdrdir)/ruby/internal/intern/string.h
+loop.o: $(hdrdir)/ruby/internal/intern/struct.h
+loop.o: $(hdrdir)/ruby/internal/intern/thread.h
+loop.o: $(hdrdir)/ruby/internal/intern/time.h
+loop.o: $(hdrdir)/ruby/internal/intern/variable.h
+loop.o: $(hdrdir)/ruby/internal/intern/vm.h
+loop.o: $(hdrdir)/ruby/internal/interpreter.h
+loop.o: $(hdrdir)/ruby/internal/iterator.h
+loop.o: $(hdrdir)/ruby/internal/memory.h
+loop.o: $(hdrdir)/ruby/internal/method.h
+loop.o: $(hdrdir)/ruby/internal/module.h
+loop.o: $(hdrdir)/ruby/internal/newobj.h
+loop.o: $(hdrdir)/ruby/internal/rgengc.h
+loop.o: $(hdrdir)/ruby/internal/scan_args.h
+loop.o: $(hdrdir)/ruby/internal/special_consts.h
+loop.o: $(hdrdir)/ruby/internal/static_assert.h
+loop.o: $(hdrdir)/ruby/internal/stdalign.h
+loop.o: $(hdrdir)/ruby/internal/stdbool.h
+loop.o: $(hdrdir)/ruby/internal/symbol.h
+loop.o: $(hdrdir)/ruby/internal/token_paste.h
+loop.o: $(hdrdir)/ruby/internal/value.h
+loop.o: $(hdrdir)/ruby/internal/value_type.h
+loop.o: $(hdrdir)/ruby/internal/variable.h
+loop.o: $(hdrdir)/ruby/internal/warning_push.h
+loop.o: $(hdrdir)/ruby/internal/xmalloc.h
+loop.o: $(hdrdir)/ruby/missing.h
+loop.o: $(hdrdir)/ruby/random.h
+loop.o: $(hdrdir)/ruby/ruby.h
+loop.o: $(hdrdir)/ruby/st.h
+loop.o: $(hdrdir)/ruby/subst.h
+loop.o: loop.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/random/extconf.rb b/ext/-test-/random/extconf.rb
new file mode 100644
index 0000000000..d786b15db9
--- /dev/null
+++ b/ext/-test-/random/extconf.rb
@@ -0,0 +1,3 @@
+# frozen_string_literal: false
+require_relative "../auto_ext.rb"
+auto_ext(inc: true)
diff --git a/ext/-test-/random/init.c b/ext/-test-/random/init.c
new file mode 100644
index 0000000000..320cba0ad6
--- /dev/null
+++ b/ext/-test-/random/init.c
@@ -0,0 +1,11 @@
+#include "ruby.h"
+
+#define init(n) {void Init_random_##n(VALUE mod, VALUE base); Init_random_##n(mod, base);}
+
+void
+Init_random(void)
+{
+    VALUE base = rb_const_get(rb_cRandom, rb_intern_const("Base"));
+    VALUE mod = rb_define_module_under(rb_define_module("Bug"), "Random");
+    TEST_INIT_FUNCS(init);
+}
diff --git a/ext/-test-/random/loop.c b/ext/-test-/random/loop.c
new file mode 100644
index 0000000000..0572096403
--- /dev/null
+++ b/ext/-test-/random/loop.c
@@ -0,0 +1,110 @@
+#include "ruby/random.h"
+
+static const uint32_t max_seeds = 1024;
+
+typedef struct {
+    rb_random_t base;
+    uint32_t num, idx, *buf;
+} rand_loop_t;
+
+RB_RANDOM_INTERFACE_DECLARE_WITH_REAL(loop);
+static const rb_random_interface_t random_loop_if = {
+    32,
+    RB_RANDOM_INTERFACE_DEFINE_WITH_REAL(loop)
+};
+
+static size_t
+random_loop_memsize(const void *ptr)
+{
+    const rand_loop_t *r = ptr;
+    return sizeof(*r) + r->num * sizeof(r->buf[0]);
+}
+
+static rb_random_data_type_t random_loop_type = {
+    "random/loop",
+    {
+        rb_random_mark,
+        RUBY_TYPED_DEFAULT_FREE,
+        random_loop_memsize,
+    },
+    RB_RANDOM_PARENT,
+    (void *)&random_loop_if,
+    RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+
+static VALUE
+loop_alloc(VALUE klass)
+{
+    rand_loop_t *rnd;
+    VALUE obj = TypedData_Make_Struct(klass, rand_loop_t, &random_loop_type, rnd);
+    rb_random_base_init(&rnd->base);
+    return obj;
+}
+
+static void
+loop_init(rb_random_t *rnd, const uint32_t *buf, size_t len)
+{
+    rand_loop_t *r = (rand_loop_t *)rnd;
+
+    if (len > max_seeds) len = max_seeds;
+
+    REALLOC_N(r->buf, uint32_t, len);
+    MEMCPY(r->buf, buf, uint32_t, (r->num = (uint32_t)len));
+}
+
+static void
+loop_get_bytes(rb_random_t *rnd, void *p, size_t n)
+{
+    uint8_t *buf = p;
+    while (n > 0) {
+        uint32_t x = loop_get_int32(rnd);
+        switch (n % 4) {
+          case 0:
+            *buf++ = (uint8_t)x;
+            n--;
+            /* FALLTHROUGH */
+          case 3:
+            *buf++ = (uint8_t)x;
+            n--;
+            /* FALLTHROUGH */
+          case 2:
+            *buf++ = (uint8_t)x;
+            n--;
+            /* FALLTHROUGH */
+          case 1:
+            *buf++ = (uint8_t)x;
+            n--;
+        }
+    }
+}
+
+static uint32_t
+loop_get_int32(rb_random_t *rnd)
+{
+    rand_loop_t *r = (rand_loop_t *)rnd;
+    if (r->idx < r->num) {
+        uint32_t x = r->buf[r->idx++];
+        if (r->idx >= r->num) r->idx = 0;
+        return x;
+    }
+    else if (r->num) {
+        return r->buf[r->idx = 0];
+    }
+    return 0;
+}
+
+static double
+loop_get_real(rb_random_t *rnd, int excl)
+{
+    uint32_t a = loop_get_int32(rnd);
+    return ldexp(a, -16);
+}
+
+void
+Init_random_loop(VALUE mod, VALUE base)
+{
+    VALUE c = rb_define_class_under(mod, "Loop", base);
+    rb_define_alloc_func(c, loop_alloc);
+    RB_RANDOM_DATA_INIT_PARENT(random_loop_type);
+}
diff --git a/ext/-test-/rational/depend b/ext/-test-/rational/depend
index a0ee797b31..c2ebddd093 100644
--- a/ext/-test-/rational/depend
+++ b/ext/-test-/rational/depend
@@ -5,17 +5,176 @@ rat.o: rat.c $(top_srcdir)/internal.h
 # AUTOGENERATED DEPENDENCIES START
 rat.o: $(RUBY_EXTCONF_H)
 rat.o: $(arch_hdrdir)/ruby/config.h
+rat.o: $(hdrdir)/ruby.h
+rat.o: $(hdrdir)/ruby/internal/anyargs.h
+rat.o: $(hdrdir)/ruby/internal/arithmetic.h
+rat.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+rat.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+rat.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+rat.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+rat.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+rat.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+rat.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+rat.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+rat.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+rat.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+rat.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+rat.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+rat.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+rat.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+rat.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+rat.o: $(hdrdir)/ruby/internal/assume.h
+rat.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+rat.o: $(hdrdir)/ruby/internal/attr/artificial.h
+rat.o: $(hdrdir)/ruby/internal/attr/cold.h
+rat.o: $(hdrdir)/ruby/internal/attr/const.h
+rat.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+rat.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+rat.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+rat.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+rat.o: $(hdrdir)/ruby/internal/attr/error.h
+rat.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+rat.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+rat.o: $(hdrdir)/ruby/internal/attr/format.h
+rat.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+rat.o: $(hdrdir)/ruby/internal/attr/noalias.h
+rat.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+rat.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+rat.o: $(hdrdir)/ruby/internal/attr/noinline.h
+rat.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+rat.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+rat.o: $(hdrdir)/ruby/internal/attr/pure.h
+rat.o: $(hdrdir)/ruby/internal/attr/restrict.h
+rat.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+rat.o: $(hdrdir)/ruby/internal/attr/warning.h
+rat.o: $(hdrdir)/ruby/internal/attr/weakref.h
+rat.o: $(hdrdir)/ruby/internal/cast.h
+rat.o: $(hdrdir)/ruby/internal/compiler_is.h
+rat.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+rat.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+rat.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+rat.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+rat.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+rat.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+rat.o: $(hdrdir)/ruby/internal/compiler_since.h
+rat.o: $(hdrdir)/ruby/internal/config.h
+rat.o: $(hdrdir)/ruby/internal/constant_p.h
+rat.o: $(hdrdir)/ruby/internal/core.h
+rat.o: $(hdrdir)/ruby/internal/core/rarray.h
+rat.o: $(hdrdir)/ruby/internal/core/rbasic.h
+rat.o: $(hdrdir)/ruby/internal/core/rbignum.h
+rat.o: $(hdrdir)/ruby/internal/core/rclass.h
+rat.o: $(hdrdir)/ruby/internal/core/rdata.h
+rat.o: $(hdrdir)/ruby/internal/core/rfile.h
+rat.o: $(hdrdir)/ruby/internal/core/rhash.h
+rat.o: $(hdrdir)/ruby/internal/core/robject.h
+rat.o: $(hdrdir)/ruby/internal/core/rregexp.h
+rat.o: $(hdrdir)/ruby/internal/core/rstring.h
+rat.o: $(hdrdir)/ruby/internal/core/rstruct.h
+rat.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+rat.o: $(hdrdir)/ruby/internal/ctype.h
+rat.o: $(hdrdir)/ruby/internal/dllexport.h
+rat.o: $(hdrdir)/ruby/internal/dosish.h
+rat.o: $(hdrdir)/ruby/internal/error.h
+rat.o: $(hdrdir)/ruby/internal/eval.h
+rat.o: $(hdrdir)/ruby/internal/event.h
+rat.o: $(hdrdir)/ruby/internal/fl_type.h
+rat.o: $(hdrdir)/ruby/internal/gc.h
+rat.o: $(hdrdir)/ruby/internal/glob.h
+rat.o: $(hdrdir)/ruby/internal/globals.h
+rat.o: $(hdrdir)/ruby/internal/has/attribute.h
+rat.o: $(hdrdir)/ruby/internal/has/builtin.h
+rat.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+rat.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+rat.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+rat.o: $(hdrdir)/ruby/internal/has/extension.h
+rat.o: $(hdrdir)/ruby/internal/has/feature.h
+rat.o: $(hdrdir)/ruby/internal/has/warning.h
+rat.o: $(hdrdir)/ruby/internal/intern/array.h
+rat.o: $(hdrdir)/ruby/internal/intern/bignum.h
+rat.o: $(hdrdir)/ruby/internal/intern/class.h
+rat.o: $(hdrdir)/ruby/internal/intern/compar.h
+rat.o: $(hdrdir)/ruby/internal/intern/complex.h
+rat.o: $(hdrdir)/ruby/internal/intern/cont.h
+rat.o: $(hdrdir)/ruby/internal/intern/dir.h
+rat.o: $(hdrdir)/ruby/internal/intern/enum.h
+rat.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+rat.o: $(hdrdir)/ruby/internal/intern/error.h
+rat.o: $(hdrdir)/ruby/internal/intern/eval.h
+rat.o: $(hdrdir)/ruby/internal/intern/file.h
+rat.o: $(hdrdir)/ruby/internal/intern/gc.h
+rat.o: $(hdrdir)/ruby/internal/intern/hash.h
+rat.o: $(hdrdir)/ruby/internal/intern/io.h
+rat.o: $(hdrdir)/ruby/internal/intern/load.h
+rat.o: $(hdrdir)/ruby/internal/intern/marshal.h
+rat.o: $(hdrdir)/ruby/internal/intern/numeric.h
+rat.o: $(hdrdir)/ruby/internal/intern/object.h
+rat.o: $(hdrdir)/ruby/internal/intern/parse.h
+rat.o: $(hdrdir)/ruby/internal/intern/proc.h
+rat.o: $(hdrdir)/ruby/internal/intern/process.h
+rat.o: $(hdrdir)/ruby/internal/intern/random.h
+rat.o: $(hdrdir)/ruby/internal/intern/range.h
+rat.o: $(hdrdir)/ruby/internal/intern/rational.h
+rat.o: $(hdrdir)/ruby/internal/intern/re.h
+rat.o: $(hdrdir)/ruby/internal/intern/ruby.h
+rat.o: $(hdrdir)/ruby/internal/intern/select.h
+rat.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+rat.o: $(hdrdir)/ruby/internal/intern/signal.h
+rat.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+rat.o: $(hdrdir)/ruby/internal/intern/string.h
+rat.o: $(hdrdir)/ruby/internal/intern/struct.h
+rat.o: $(hdrdir)/ruby/internal/intern/thread.h
+rat.o: $(hdrdir)/ruby/internal/intern/time.h
+rat.o: $(hdrdir)/ruby/internal/intern/variable.h
+rat.o: $(hdrdir)/ruby/internal/intern/vm.h
+rat.o: $(hdrdir)/ruby/internal/interpreter.h
+rat.o: $(hdrdir)/ruby/internal/iterator.h
+rat.o: $(hdrdir)/ruby/internal/memory.h
+rat.o: $(hdrdir)/ruby/internal/method.h
+rat.o: $(hdrdir)/ruby/internal/module.h
+rat.o: $(hdrdir)/ruby/internal/newobj.h
+rat.o: $(hdrdir)/ruby/internal/rgengc.h
+rat.o: $(hdrdir)/ruby/internal/scan_args.h
+rat.o: $(hdrdir)/ruby/internal/special_consts.h
+rat.o: $(hdrdir)/ruby/internal/static_assert.h
+rat.o: $(hdrdir)/ruby/internal/stdalign.h
+rat.o: $(hdrdir)/ruby/internal/stdbool.h
+rat.o: $(hdrdir)/ruby/internal/symbol.h
+rat.o: $(hdrdir)/ruby/internal/token_paste.h
+rat.o: $(hdrdir)/ruby/internal/value.h
+rat.o: $(hdrdir)/ruby/internal/value_type.h
+rat.o: $(hdrdir)/ruby/internal/variable.h
+rat.o: $(hdrdir)/ruby/internal/warning_push.h
+rat.o: $(hdrdir)/ruby/internal/xmalloc.h
+rat.o: $(hdrdir)/ruby/assert.h
 rat.o: $(hdrdir)/ruby/backward.h
+rat.o: $(hdrdir)/ruby/backward/2/assume.h
+rat.o: $(hdrdir)/ruby/backward/2/attributes.h
+rat.o: $(hdrdir)/ruby/backward/2/bool.h
+rat.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+rat.o: $(hdrdir)/ruby/backward/2/inttypes.h
+rat.o: $(hdrdir)/ruby/backward/2/limits.h
+rat.o: $(hdrdir)/ruby/backward/2/long_long.h
+rat.o: $(hdrdir)/ruby/backward/2/stdalign.h
+rat.o: $(hdrdir)/ruby/backward/2/stdarg.h
 rat.o: $(hdrdir)/ruby/defines.h
-rat.o: $(hdrdir)/ruby/encoding.h
 rat.o: $(hdrdir)/ruby/intern.h
-rat.o: $(hdrdir)/ruby/io.h
 rat.o: $(hdrdir)/ruby/missing.h
-rat.o: $(hdrdir)/ruby/oniguruma.h
 rat.o: $(hdrdir)/ruby/ruby.h
 rat.o: $(hdrdir)/ruby/st.h
 rat.o: $(hdrdir)/ruby/subst.h
-rat.o: $(top_srcdir)/include/ruby.h
 rat.o: $(top_srcdir)/internal.h
+rat.o: $(top_srcdir)/internal/bignum.h
+rat.o: $(top_srcdir)/internal/bits.h
+rat.o: $(top_srcdir)/internal/compilers.h
+rat.o: $(top_srcdir)/internal/fixnum.h
+rat.o: $(top_srcdir)/internal/gc.h
+rat.o: $(top_srcdir)/internal/numeric.h
+rat.o: $(top_srcdir)/internal/rational.h
+rat.o: $(top_srcdir)/internal/serial.h
+rat.o: $(top_srcdir)/internal/static_assert.h
+rat.o: $(top_srcdir)/internal/vm.h
+rat.o: $(top_srcdir)/internal/warnings.h
+rat.o: $(top_srcdir)/ruby_assert.h
 rat.o: rat.c
 # AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/rational/rat.c b/ext/-test-/rational/rat.c
index 772546fca8..b1ffbda144 100644
--- a/ext/-test-/rational/rat.c
+++ b/ext/-test-/rational/rat.c
@@ -1,4 +1,4 @@
-#include "internal.h"
+#include "internal/rational.h"
 
 #if defined(HAVE_LIBGMP) && defined(HAVE_GMP_H)
 static VALUE
@@ -29,9 +29,17 @@ gcd_gmp(VALUE x, VALUE y)
 #define gcd_gmp rb_f_notimplement
 #endif
 
+static VALUE
+s_rational_raw(VALUE klass, VALUE x, VALUE y)
+{
+    return rb_rational_raw(x, y);
+}
+
 void
 Init_rational(VALUE klass)
 {
     rb_define_method(rb_cInteger, "gcd_normal", gcd_normal, 1);
     rb_define_method(rb_cInteger, "gcd_gmp", gcd_gmp, 1);
+
+    rb_define_singleton_method(rb_cRational, "raw", s_rational_raw, 2);
 }
diff --git a/ext/-test-/rb_call_super_kw/depend b/ext/-test-/rb_call_super_kw/depend
new file mode 100644
index 0000000000..314e69fd0e
--- /dev/null
+++ b/ext/-test-/rb_call_super_kw/depend
@@ -0,0 +1,163 @@
+# AUTOGENERATED DEPENDENCIES START
+rb_call_super_kw.o: $(RUBY_EXTCONF_H)
+rb_call_super_kw.o: $(arch_hdrdir)/ruby/config.h
+rb_call_super_kw.o: $(hdrdir)/ruby.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/anyargs.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/arithmetic.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/assume.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/attr/artificial.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/attr/cold.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/attr/const.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/attr/error.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/attr/format.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/attr/noalias.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/attr/noinline.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/attr/pure.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/attr/restrict.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/attr/warning.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/attr/weakref.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/cast.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/compiler_is.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/compiler_since.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/config.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/constant_p.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/core.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/core/rarray.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/core/rbasic.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/core/rbignum.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/core/rclass.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/core/rdata.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/core/rfile.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/core/rhash.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/core/robject.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/core/rregexp.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/core/rstring.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/core/rstruct.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/ctype.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/dllexport.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/dosish.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/error.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/eval.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/event.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/fl_type.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/gc.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/glob.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/globals.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/has/attribute.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/has/builtin.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/has/extension.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/has/feature.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/has/warning.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/array.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/bignum.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/class.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/compar.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/complex.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/cont.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/dir.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/enum.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/error.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/eval.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/file.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/gc.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/hash.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/io.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/load.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/marshal.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/numeric.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/object.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/parse.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/proc.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/process.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/random.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/range.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/rational.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/re.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/ruby.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/select.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/signal.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/string.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/struct.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/thread.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/time.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/variable.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/intern/vm.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/interpreter.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/iterator.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/memory.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/method.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/module.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/newobj.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/rgengc.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/scan_args.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/special_consts.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/static_assert.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/stdalign.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/stdbool.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/symbol.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/token_paste.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/value.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/value_type.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/variable.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/warning_push.h
+rb_call_super_kw.o: $(hdrdir)/ruby/internal/xmalloc.h
+rb_call_super_kw.o: $(hdrdir)/ruby/assert.h
+rb_call_super_kw.o: $(hdrdir)/ruby/backward.h
+rb_call_super_kw.o: $(hdrdir)/ruby/backward/2/assume.h
+rb_call_super_kw.o: $(hdrdir)/ruby/backward/2/attributes.h
+rb_call_super_kw.o: $(hdrdir)/ruby/backward/2/bool.h
+rb_call_super_kw.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+rb_call_super_kw.o: $(hdrdir)/ruby/backward/2/inttypes.h
+rb_call_super_kw.o: $(hdrdir)/ruby/backward/2/limits.h
+rb_call_super_kw.o: $(hdrdir)/ruby/backward/2/long_long.h
+rb_call_super_kw.o: $(hdrdir)/ruby/backward/2/stdalign.h
+rb_call_super_kw.o: $(hdrdir)/ruby/backward/2/stdarg.h
+rb_call_super_kw.o: $(hdrdir)/ruby/defines.h
+rb_call_super_kw.o: $(hdrdir)/ruby/intern.h
+rb_call_super_kw.o: $(hdrdir)/ruby/missing.h
+rb_call_super_kw.o: $(hdrdir)/ruby/ruby.h
+rb_call_super_kw.o: $(hdrdir)/ruby/st.h
+rb_call_super_kw.o: $(hdrdir)/ruby/subst.h
+rb_call_super_kw.o: rb_call_super_kw.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/rb_call_super_kw/extconf.rb b/ext/-test-/rb_call_super_kw/extconf.rb
new file mode 100644
index 0000000000..c6a5c720d7
--- /dev/null
+++ b/ext/-test-/rb_call_super_kw/extconf.rb
@@ -0,0 +1 @@
+create_makefile("-test-/rb_call_super_kw")
diff --git a/ext/-test-/rb_call_super_kw/rb_call_super_kw.c b/ext/-test-/rb_call_super_kw/rb_call_super_kw.c
new file mode 100644
index 0000000000..7f094545d2
--- /dev/null
+++ b/ext/-test-/rb_call_super_kw/rb_call_super_kw.c
@@ -0,0 +1,14 @@
+#include <ruby.h>
+
+static VALUE
+rb_call_super_kw_m(int argc, VALUE *argv, VALUE self)
+{
+    return rb_call_super_kw(argc, argv, RB_PASS_CALLED_KEYWORDS);
+}
+
+void
+Init_rb_call_super_kw(void) {
+    VALUE module = rb_define_module("Bug");
+    module = rb_define_module_under(module, "RbCallSuperKw");
+    rb_define_method(module, "m", rb_call_super_kw_m, -1);
+}
diff --git a/ext/-test-/recursion/depend b/ext/-test-/recursion/depend
new file mode 100644
index 0000000000..c760e99c41
--- /dev/null
+++ b/ext/-test-/recursion/depend
@@ -0,0 +1,163 @@
+# AUTOGENERATED DEPENDENCIES START
+recursion.o: $(RUBY_EXTCONF_H)
+recursion.o: $(arch_hdrdir)/ruby/config.h
+recursion.o: $(hdrdir)/ruby.h
+recursion.o: $(hdrdir)/ruby/internal/anyargs.h
+recursion.o: $(hdrdir)/ruby/internal/arithmetic.h
+recursion.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+recursion.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+recursion.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+recursion.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+recursion.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+recursion.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+recursion.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+recursion.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+recursion.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+recursion.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+recursion.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+recursion.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+recursion.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+recursion.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+recursion.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+recursion.o: $(hdrdir)/ruby/internal/assume.h
+recursion.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+recursion.o: $(hdrdir)/ruby/internal/attr/artificial.h
+recursion.o: $(hdrdir)/ruby/internal/attr/cold.h
+recursion.o: $(hdrdir)/ruby/internal/attr/const.h
+recursion.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+recursion.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+recursion.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+recursion.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+recursion.o: $(hdrdir)/ruby/internal/attr/error.h
+recursion.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+recursion.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+recursion.o: $(hdrdir)/ruby/internal/attr/format.h
+recursion.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+recursion.o: $(hdrdir)/ruby/internal/attr/noalias.h
+recursion.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+recursion.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+recursion.o: $(hdrdir)/ruby/internal/attr/noinline.h
+recursion.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+recursion.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+recursion.o: $(hdrdir)/ruby/internal/attr/pure.h
+recursion.o: $(hdrdir)/ruby/internal/attr/restrict.h
+recursion.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+recursion.o: $(hdrdir)/ruby/internal/attr/warning.h
+recursion.o: $(hdrdir)/ruby/internal/attr/weakref.h
+recursion.o: $(hdrdir)/ruby/internal/cast.h
+recursion.o: $(hdrdir)/ruby/internal/compiler_is.h
+recursion.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+recursion.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+recursion.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+recursion.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+recursion.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+recursion.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+recursion.o: $(hdrdir)/ruby/internal/compiler_since.h
+recursion.o: $(hdrdir)/ruby/internal/config.h
+recursion.o: $(hdrdir)/ruby/internal/constant_p.h
+recursion.o: $(hdrdir)/ruby/internal/core.h
+recursion.o: $(hdrdir)/ruby/internal/core/rarray.h
+recursion.o: $(hdrdir)/ruby/internal/core/rbasic.h
+recursion.o: $(hdrdir)/ruby/internal/core/rbignum.h
+recursion.o: $(hdrdir)/ruby/internal/core/rclass.h
+recursion.o: $(hdrdir)/ruby/internal/core/rdata.h
+recursion.o: $(hdrdir)/ruby/internal/core/rfile.h
+recursion.o: $(hdrdir)/ruby/internal/core/rhash.h
+recursion.o: $(hdrdir)/ruby/internal/core/robject.h
+recursion.o: $(hdrdir)/ruby/internal/core/rregexp.h
+recursion.o: $(hdrdir)/ruby/internal/core/rstring.h
+recursion.o: $(hdrdir)/ruby/internal/core/rstruct.h
+recursion.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+recursion.o: $(hdrdir)/ruby/internal/ctype.h
+recursion.o: $(hdrdir)/ruby/internal/dllexport.h
+recursion.o: $(hdrdir)/ruby/internal/dosish.h
+recursion.o: $(hdrdir)/ruby/internal/error.h
+recursion.o: $(hdrdir)/ruby/internal/eval.h
+recursion.o: $(hdrdir)/ruby/internal/event.h
+recursion.o: $(hdrdir)/ruby/internal/fl_type.h
+recursion.o: $(hdrdir)/ruby/internal/gc.h
+recursion.o: $(hdrdir)/ruby/internal/glob.h
+recursion.o: $(hdrdir)/ruby/internal/globals.h
+recursion.o: $(hdrdir)/ruby/internal/has/attribute.h
+recursion.o: $(hdrdir)/ruby/internal/has/builtin.h
+recursion.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+recursion.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+recursion.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+recursion.o: $(hdrdir)/ruby/internal/has/extension.h
+recursion.o: $(hdrdir)/ruby/internal/has/feature.h
+recursion.o: $(hdrdir)/ruby/internal/has/warning.h
+recursion.o: $(hdrdir)/ruby/internal/intern/array.h
+recursion.o: $(hdrdir)/ruby/internal/intern/bignum.h
+recursion.o: $(hdrdir)/ruby/internal/intern/class.h
+recursion.o: $(hdrdir)/ruby/internal/intern/compar.h
+recursion.o: $(hdrdir)/ruby/internal/intern/complex.h
+recursion.o: $(hdrdir)/ruby/internal/intern/cont.h
+recursion.o: $(hdrdir)/ruby/internal/intern/dir.h
+recursion.o: $(hdrdir)/ruby/internal/intern/enum.h
+recursion.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+recursion.o: $(hdrdir)/ruby/internal/intern/error.h
+recursion.o: $(hdrdir)/ruby/internal/intern/eval.h
+recursion.o: $(hdrdir)/ruby/internal/intern/file.h
+recursion.o: $(hdrdir)/ruby/internal/intern/gc.h
+recursion.o: $(hdrdir)/ruby/internal/intern/hash.h
+recursion.o: $(hdrdir)/ruby/internal/intern/io.h
+recursion.o: $(hdrdir)/ruby/internal/intern/load.h
+recursion.o: $(hdrdir)/ruby/internal/intern/marshal.h
+recursion.o: $(hdrdir)/ruby/internal/intern/numeric.h
+recursion.o: $(hdrdir)/ruby/internal/intern/object.h
+recursion.o: $(hdrdir)/ruby/internal/intern/parse.h
+recursion.o: $(hdrdir)/ruby/internal/intern/proc.h
+recursion.o: $(hdrdir)/ruby/internal/intern/process.h
+recursion.o: $(hdrdir)/ruby/internal/intern/random.h
+recursion.o: $(hdrdir)/ruby/internal/intern/range.h
+recursion.o: $(hdrdir)/ruby/internal/intern/rational.h
+recursion.o: $(hdrdir)/ruby/internal/intern/re.h
+recursion.o: $(hdrdir)/ruby/internal/intern/ruby.h
+recursion.o: $(hdrdir)/ruby/internal/intern/select.h
+recursion.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+recursion.o: $(hdrdir)/ruby/internal/intern/signal.h
+recursion.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+recursion.o: $(hdrdir)/ruby/internal/intern/string.h
+recursion.o: $(hdrdir)/ruby/internal/intern/struct.h
+recursion.o: $(hdrdir)/ruby/internal/intern/thread.h
+recursion.o: $(hdrdir)/ruby/internal/intern/time.h
+recursion.o: $(hdrdir)/ruby/internal/intern/variable.h
+recursion.o: $(hdrdir)/ruby/internal/intern/vm.h
+recursion.o: $(hdrdir)/ruby/internal/interpreter.h
+recursion.o: $(hdrdir)/ruby/internal/iterator.h
+recursion.o: $(hdrdir)/ruby/internal/memory.h
+recursion.o: $(hdrdir)/ruby/internal/method.h
+recursion.o: $(hdrdir)/ruby/internal/module.h
+recursion.o: $(hdrdir)/ruby/internal/newobj.h
+recursion.o: $(hdrdir)/ruby/internal/rgengc.h
+recursion.o: $(hdrdir)/ruby/internal/scan_args.h
+recursion.o: $(hdrdir)/ruby/internal/special_consts.h
+recursion.o: $(hdrdir)/ruby/internal/static_assert.h
+recursion.o: $(hdrdir)/ruby/internal/stdalign.h
+recursion.o: $(hdrdir)/ruby/internal/stdbool.h
+recursion.o: $(hdrdir)/ruby/internal/symbol.h
+recursion.o: $(hdrdir)/ruby/internal/token_paste.h
+recursion.o: $(hdrdir)/ruby/internal/value.h
+recursion.o: $(hdrdir)/ruby/internal/value_type.h
+recursion.o: $(hdrdir)/ruby/internal/variable.h
+recursion.o: $(hdrdir)/ruby/internal/warning_push.h
+recursion.o: $(hdrdir)/ruby/internal/xmalloc.h
+recursion.o: $(hdrdir)/ruby/assert.h
+recursion.o: $(hdrdir)/ruby/backward.h
+recursion.o: $(hdrdir)/ruby/backward/2/assume.h
+recursion.o: $(hdrdir)/ruby/backward/2/attributes.h
+recursion.o: $(hdrdir)/ruby/backward/2/bool.h
+recursion.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+recursion.o: $(hdrdir)/ruby/backward/2/inttypes.h
+recursion.o: $(hdrdir)/ruby/backward/2/limits.h
+recursion.o: $(hdrdir)/ruby/backward/2/long_long.h
+recursion.o: $(hdrdir)/ruby/backward/2/stdalign.h
+recursion.o: $(hdrdir)/ruby/backward/2/stdarg.h
+recursion.o: $(hdrdir)/ruby/defines.h
+recursion.o: $(hdrdir)/ruby/intern.h
+recursion.o: $(hdrdir)/ruby/missing.h
+recursion.o: $(hdrdir)/ruby/ruby.h
+recursion.o: $(hdrdir)/ruby/st.h
+recursion.o: $(hdrdir)/ruby/subst.h
+recursion.o: recursion.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/regexp/depend b/ext/-test-/regexp/depend
new file mode 100644
index 0000000000..1b00ccd568
--- /dev/null
+++ b/ext/-test-/regexp/depend
@@ -0,0 +1,325 @@
+# AUTOGENERATED DEPENDENCIES START
+init.o: $(RUBY_EXTCONF_H)
+init.o: $(arch_hdrdir)/ruby/config.h
+init.o: $(hdrdir)/ruby.h
+init.o: $(hdrdir)/ruby/internal/anyargs.h
+init.o: $(hdrdir)/ruby/internal/arithmetic.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+init.o: $(hdrdir)/ruby/internal/assume.h
+init.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+init.o: $(hdrdir)/ruby/internal/attr/artificial.h
+init.o: $(hdrdir)/ruby/internal/attr/cold.h
+init.o: $(hdrdir)/ruby/internal/attr/const.h
+init.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+init.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+init.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+init.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+init.o: $(hdrdir)/ruby/internal/attr/error.h
+init.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+init.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+init.o: $(hdrdir)/ruby/internal/attr/format.h
+init.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+init.o: $(hdrdir)/ruby/internal/attr/noalias.h
+init.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+init.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+init.o: $(hdrdir)/ruby/internal/attr/noinline.h
+init.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+init.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+init.o: $(hdrdir)/ruby/internal/attr/pure.h
+init.o: $(hdrdir)/ruby/internal/attr/restrict.h
+init.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+init.o: $(hdrdir)/ruby/internal/attr/warning.h
+init.o: $(hdrdir)/ruby/internal/attr/weakref.h
+init.o: $(hdrdir)/ruby/internal/cast.h
+init.o: $(hdrdir)/ruby/internal/compiler_is.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+init.o: $(hdrdir)/ruby/internal/compiler_since.h
+init.o: $(hdrdir)/ruby/internal/config.h
+init.o: $(hdrdir)/ruby/internal/constant_p.h
+init.o: $(hdrdir)/ruby/internal/core.h
+init.o: $(hdrdir)/ruby/internal/core/rarray.h
+init.o: $(hdrdir)/ruby/internal/core/rbasic.h
+init.o: $(hdrdir)/ruby/internal/core/rbignum.h
+init.o: $(hdrdir)/ruby/internal/core/rclass.h
+init.o: $(hdrdir)/ruby/internal/core/rdata.h
+init.o: $(hdrdir)/ruby/internal/core/rfile.h
+init.o: $(hdrdir)/ruby/internal/core/rhash.h
+init.o: $(hdrdir)/ruby/internal/core/robject.h
+init.o: $(hdrdir)/ruby/internal/core/rregexp.h
+init.o: $(hdrdir)/ruby/internal/core/rstring.h
+init.o: $(hdrdir)/ruby/internal/core/rstruct.h
+init.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+init.o: $(hdrdir)/ruby/internal/ctype.h
+init.o: $(hdrdir)/ruby/internal/dllexport.h
+init.o: $(hdrdir)/ruby/internal/dosish.h
+init.o: $(hdrdir)/ruby/internal/error.h
+init.o: $(hdrdir)/ruby/internal/eval.h
+init.o: $(hdrdir)/ruby/internal/event.h
+init.o: $(hdrdir)/ruby/internal/fl_type.h
+init.o: $(hdrdir)/ruby/internal/gc.h
+init.o: $(hdrdir)/ruby/internal/glob.h
+init.o: $(hdrdir)/ruby/internal/globals.h
+init.o: $(hdrdir)/ruby/internal/has/attribute.h
+init.o: $(hdrdir)/ruby/internal/has/builtin.h
+init.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/extension.h
+init.o: $(hdrdir)/ruby/internal/has/feature.h
+init.o: $(hdrdir)/ruby/internal/has/warning.h
+init.o: $(hdrdir)/ruby/internal/intern/array.h
+init.o: $(hdrdir)/ruby/internal/intern/bignum.h
+init.o: $(hdrdir)/ruby/internal/intern/class.h
+init.o: $(hdrdir)/ruby/internal/intern/compar.h
+init.o: $(hdrdir)/ruby/internal/intern/complex.h
+init.o: $(hdrdir)/ruby/internal/intern/cont.h
+init.o: $(hdrdir)/ruby/internal/intern/dir.h
+init.o: $(hdrdir)/ruby/internal/intern/enum.h
+init.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+init.o: $(hdrdir)/ruby/internal/intern/error.h
+init.o: $(hdrdir)/ruby/internal/intern/eval.h
+init.o: $(hdrdir)/ruby/internal/intern/file.h
+init.o: $(hdrdir)/ruby/internal/intern/gc.h
+init.o: $(hdrdir)/ruby/internal/intern/hash.h
+init.o: $(hdrdir)/ruby/internal/intern/io.h
+init.o: $(hdrdir)/ruby/internal/intern/load.h
+init.o: $(hdrdir)/ruby/internal/intern/marshal.h
+init.o: $(hdrdir)/ruby/internal/intern/numeric.h
+init.o: $(hdrdir)/ruby/internal/intern/object.h
+init.o: $(hdrdir)/ruby/internal/intern/parse.h
+init.o: $(hdrdir)/ruby/internal/intern/proc.h
+init.o: $(hdrdir)/ruby/internal/intern/process.h
+init.o: $(hdrdir)/ruby/internal/intern/random.h
+init.o: $(hdrdir)/ruby/internal/intern/range.h
+init.o: $(hdrdir)/ruby/internal/intern/rational.h
+init.o: $(hdrdir)/ruby/internal/intern/re.h
+init.o: $(hdrdir)/ruby/internal/intern/ruby.h
+init.o: $(hdrdir)/ruby/internal/intern/select.h
+init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+init.o: $(hdrdir)/ruby/internal/intern/signal.h
+init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+init.o: $(hdrdir)/ruby/internal/intern/string.h
+init.o: $(hdrdir)/ruby/internal/intern/struct.h
+init.o: $(hdrdir)/ruby/internal/intern/thread.h
+init.o: $(hdrdir)/ruby/internal/intern/time.h
+init.o: $(hdrdir)/ruby/internal/intern/variable.h
+init.o: $(hdrdir)/ruby/internal/intern/vm.h
+init.o: $(hdrdir)/ruby/internal/interpreter.h
+init.o: $(hdrdir)/ruby/internal/iterator.h
+init.o: $(hdrdir)/ruby/internal/memory.h
+init.o: $(hdrdir)/ruby/internal/method.h
+init.o: $(hdrdir)/ruby/internal/module.h
+init.o: $(hdrdir)/ruby/internal/newobj.h
+init.o: $(hdrdir)/ruby/internal/rgengc.h
+init.o: $(hdrdir)/ruby/internal/scan_args.h
+init.o: $(hdrdir)/ruby/internal/special_consts.h
+init.o: $(hdrdir)/ruby/internal/static_assert.h
+init.o: $(hdrdir)/ruby/internal/stdalign.h
+init.o: $(hdrdir)/ruby/internal/stdbool.h
+init.o: $(hdrdir)/ruby/internal/symbol.h
+init.o: $(hdrdir)/ruby/internal/token_paste.h
+init.o: $(hdrdir)/ruby/internal/value.h
+init.o: $(hdrdir)/ruby/internal/value_type.h
+init.o: $(hdrdir)/ruby/internal/variable.h
+init.o: $(hdrdir)/ruby/internal/warning_push.h
+init.o: $(hdrdir)/ruby/internal/xmalloc.h
+init.o: $(hdrdir)/ruby/assert.h
+init.o: $(hdrdir)/ruby/backward.h
+init.o: $(hdrdir)/ruby/backward/2/assume.h
+init.o: $(hdrdir)/ruby/backward/2/attributes.h
+init.o: $(hdrdir)/ruby/backward/2/bool.h
+init.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+init.o: $(hdrdir)/ruby/backward/2/inttypes.h
+init.o: $(hdrdir)/ruby/backward/2/limits.h
+init.o: $(hdrdir)/ruby/backward/2/long_long.h
+init.o: $(hdrdir)/ruby/backward/2/stdalign.h
+init.o: $(hdrdir)/ruby/backward/2/stdarg.h
+init.o: $(hdrdir)/ruby/defines.h
+init.o: $(hdrdir)/ruby/intern.h
+init.o: $(hdrdir)/ruby/missing.h
+init.o: $(hdrdir)/ruby/ruby.h
+init.o: $(hdrdir)/ruby/st.h
+init.o: $(hdrdir)/ruby/subst.h
+init.o: init.c
+parse_depth_limit.o: $(RUBY_EXTCONF_H)
+parse_depth_limit.o: $(arch_hdrdir)/ruby/config.h
+parse_depth_limit.o: $(hdrdir)/ruby.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/anyargs.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/arithmetic.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/assume.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/attr/artificial.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/attr/cold.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/attr/const.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/attr/error.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/attr/format.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/attr/noalias.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/attr/noinline.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/attr/pure.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/attr/restrict.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/attr/warning.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/attr/weakref.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/cast.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/compiler_is.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/compiler_since.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/config.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/constant_p.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/core.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/core/rarray.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/core/rbasic.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/core/rbignum.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/core/rclass.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/core/rdata.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/core/rfile.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/core/rhash.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/core/robject.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/core/rregexp.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/core/rstring.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/core/rstruct.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/ctype.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/dllexport.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/dosish.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/error.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/eval.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/event.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/fl_type.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/gc.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/glob.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/globals.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/has/attribute.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/has/builtin.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/has/extension.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/has/feature.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/has/warning.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/array.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/bignum.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/class.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/compar.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/complex.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/cont.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/dir.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/enum.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/error.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/eval.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/file.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/gc.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/hash.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/io.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/load.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/marshal.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/numeric.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/object.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/parse.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/proc.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/process.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/random.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/range.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/rational.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/re.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/ruby.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/select.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/signal.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/string.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/struct.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/thread.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/time.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/variable.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/intern/vm.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/interpreter.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/iterator.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/memory.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/method.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/module.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/newobj.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/rgengc.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/scan_args.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/special_consts.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/static_assert.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/stdalign.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/stdbool.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/symbol.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/token_paste.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/value.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/value_type.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/variable.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/warning_push.h
+parse_depth_limit.o: $(hdrdir)/ruby/internal/xmalloc.h
+parse_depth_limit.o: $(hdrdir)/ruby/assert.h
+parse_depth_limit.o: $(hdrdir)/ruby/backward.h
+parse_depth_limit.o: $(hdrdir)/ruby/backward/2/assume.h
+parse_depth_limit.o: $(hdrdir)/ruby/backward/2/attributes.h
+parse_depth_limit.o: $(hdrdir)/ruby/backward/2/bool.h
+parse_depth_limit.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+parse_depth_limit.o: $(hdrdir)/ruby/backward/2/inttypes.h
+parse_depth_limit.o: $(hdrdir)/ruby/backward/2/limits.h
+parse_depth_limit.o: $(hdrdir)/ruby/backward/2/long_long.h
+parse_depth_limit.o: $(hdrdir)/ruby/backward/2/stdalign.h
+parse_depth_limit.o: $(hdrdir)/ruby/backward/2/stdarg.h
+parse_depth_limit.o: $(hdrdir)/ruby/defines.h
+parse_depth_limit.o: $(hdrdir)/ruby/intern.h
+parse_depth_limit.o: $(hdrdir)/ruby/missing.h
+parse_depth_limit.o: $(hdrdir)/ruby/onigmo.h
+parse_depth_limit.o: $(hdrdir)/ruby/ruby.h
+parse_depth_limit.o: $(hdrdir)/ruby/st.h
+parse_depth_limit.o: $(hdrdir)/ruby/subst.h
+parse_depth_limit.o: parse_depth_limit.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/regexp/extconf.rb b/ext/-test-/regexp/extconf.rb
new file mode 100644
index 0000000000..ca51178a18
--- /dev/null
+++ b/ext/-test-/regexp/extconf.rb
@@ -0,0 +1,3 @@
+# frozen_string_literal: false
+require_relative "../auto_ext.rb"
+auto_ext
diff --git a/ext/-test-/regexp/init.c b/ext/-test-/regexp/init.c
new file mode 100644
index 0000000000..906abe940f
--- /dev/null
+++ b/ext/-test-/regexp/init.c
@@ -0,0 +1,11 @@
+#include "ruby.h"
+
+#define init(n) {void Init_##n(VALUE klass); Init_##n(klass);}
+
+void
+Init_regexp(void)
+{
+    VALUE mBug = rb_define_module("Bug");
+    VALUE klass = rb_define_class_under(mBug, "Regexp", rb_cRegexp);
+    TEST_INIT_FUNCS(init);
+}
diff --git a/ext/-test-/regexp/parse_depth_limit.c b/ext/-test-/regexp/parse_depth_limit.c
new file mode 100644
index 0000000000..8e08a5c789
--- /dev/null
+++ b/ext/-test-/regexp/parse_depth_limit.c
@@ -0,0 +1,23 @@
+#include <ruby.h>
+#include <ruby/onigmo.h>
+
+static VALUE
+get_parse_depth_limit(VALUE self)
+{
+    unsigned int depth = onig_get_parse_depth_limit();
+    return UINT2NUM(depth);
+}
+
+static VALUE
+set_parse_depth_limit(VALUE self, VALUE depth)
+{
+    onig_set_parse_depth_limit(NUM2UINT(depth));
+    return depth;
+}
+
+void
+Init_parse_depth_limit(VALUE klass)
+{
+    rb_define_singleton_method(klass, "parse_depth_limit", get_parse_depth_limit, 0);
+    rb_define_singleton_method(klass, "parse_depth_limit=", set_parse_depth_limit, 1);
+}
diff --git a/ext/-test-/scan_args/depend b/ext/-test-/scan_args/depend
new file mode 100644
index 0000000000..91bd8419d0
--- /dev/null
+++ b/ext/-test-/scan_args/depend
@@ -0,0 +1,163 @@
+# AUTOGENERATED DEPENDENCIES START
+scan_args.o: $(RUBY_EXTCONF_H)
+scan_args.o: $(arch_hdrdir)/ruby/config.h
+scan_args.o: $(hdrdir)/ruby.h
+scan_args.o: $(hdrdir)/ruby/internal/anyargs.h
+scan_args.o: $(hdrdir)/ruby/internal/arithmetic.h
+scan_args.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+scan_args.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+scan_args.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+scan_args.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+scan_args.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+scan_args.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+scan_args.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+scan_args.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+scan_args.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+scan_args.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+scan_args.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+scan_args.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+scan_args.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+scan_args.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+scan_args.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+scan_args.o: $(hdrdir)/ruby/internal/assume.h
+scan_args.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+scan_args.o: $(hdrdir)/ruby/internal/attr/artificial.h
+scan_args.o: $(hdrdir)/ruby/internal/attr/cold.h
+scan_args.o: $(hdrdir)/ruby/internal/attr/const.h
+scan_args.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+scan_args.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+scan_args.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+scan_args.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+scan_args.o: $(hdrdir)/ruby/internal/attr/error.h
+scan_args.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+scan_args.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+scan_args.o: $(hdrdir)/ruby/internal/attr/format.h
+scan_args.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+scan_args.o: $(hdrdir)/ruby/internal/attr/noalias.h
+scan_args.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+scan_args.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+scan_args.o: $(hdrdir)/ruby/internal/attr/noinline.h
+scan_args.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+scan_args.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+scan_args.o: $(hdrdir)/ruby/internal/attr/pure.h
+scan_args.o: $(hdrdir)/ruby/internal/attr/restrict.h
+scan_args.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+scan_args.o: $(hdrdir)/ruby/internal/attr/warning.h
+scan_args.o: $(hdrdir)/ruby/internal/attr/weakref.h
+scan_args.o: $(hdrdir)/ruby/internal/cast.h
+scan_args.o: $(hdrdir)/ruby/internal/compiler_is.h
+scan_args.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+scan_args.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+scan_args.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+scan_args.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+scan_args.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+scan_args.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+scan_args.o: $(hdrdir)/ruby/internal/compiler_since.h
+scan_args.o: $(hdrdir)/ruby/internal/config.h
+scan_args.o: $(hdrdir)/ruby/internal/constant_p.h
+scan_args.o: $(hdrdir)/ruby/internal/core.h
+scan_args.o: $(hdrdir)/ruby/internal/core/rarray.h
+scan_args.o: $(hdrdir)/ruby/internal/core/rbasic.h
+scan_args.o: $(hdrdir)/ruby/internal/core/rbignum.h
+scan_args.o: $(hdrdir)/ruby/internal/core/rclass.h
+scan_args.o: $(hdrdir)/ruby/internal/core/rdata.h
+scan_args.o: $(hdrdir)/ruby/internal/core/rfile.h
+scan_args.o: $(hdrdir)/ruby/internal/core/rhash.h
+scan_args.o: $(hdrdir)/ruby/internal/core/robject.h
+scan_args.o: $(hdrdir)/ruby/internal/core/rregexp.h
+scan_args.o: $(hdrdir)/ruby/internal/core/rstring.h
+scan_args.o: $(hdrdir)/ruby/internal/core/rstruct.h
+scan_args.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+scan_args.o: $(hdrdir)/ruby/internal/ctype.h
+scan_args.o: $(hdrdir)/ruby/internal/dllexport.h
+scan_args.o: $(hdrdir)/ruby/internal/dosish.h
+scan_args.o: $(hdrdir)/ruby/internal/error.h
+scan_args.o: $(hdrdir)/ruby/internal/eval.h
+scan_args.o: $(hdrdir)/ruby/internal/event.h
+scan_args.o: $(hdrdir)/ruby/internal/fl_type.h
+scan_args.o: $(hdrdir)/ruby/internal/gc.h
+scan_args.o: $(hdrdir)/ruby/internal/glob.h
+scan_args.o: $(hdrdir)/ruby/internal/globals.h
+scan_args.o: $(hdrdir)/ruby/internal/has/attribute.h
+scan_args.o: $(hdrdir)/ruby/internal/has/builtin.h
+scan_args.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+scan_args.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+scan_args.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+scan_args.o: $(hdrdir)/ruby/internal/has/extension.h
+scan_args.o: $(hdrdir)/ruby/internal/has/feature.h
+scan_args.o: $(hdrdir)/ruby/internal/has/warning.h
+scan_args.o: $(hdrdir)/ruby/internal/intern/array.h
+scan_args.o: $(hdrdir)/ruby/internal/intern/bignum.h
+scan_args.o: $(hdrdir)/ruby/internal/intern/class.h
+scan_args.o: $(hdrdir)/ruby/internal/intern/compar.h
+scan_args.o: $(hdrdir)/ruby/internal/intern/complex.h
+scan_args.o: $(hdrdir)/ruby/internal/intern/cont.h
+scan_args.o: $(hdrdir)/ruby/internal/intern/dir.h
+scan_args.o: $(hdrdir)/ruby/internal/intern/enum.h
+scan_args.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+scan_args.o: $(hdrdir)/ruby/internal/intern/error.h
+scan_args.o: $(hdrdir)/ruby/internal/intern/eval.h
+scan_args.o: $(hdrdir)/ruby/internal/intern/file.h
+scan_args.o: $(hdrdir)/ruby/internal/intern/gc.h
+scan_args.o: $(hdrdir)/ruby/internal/intern/hash.h
+scan_args.o: $(hdrdir)/ruby/internal/intern/io.h
+scan_args.o: $(hdrdir)/ruby/internal/intern/load.h
+scan_args.o: $(hdrdir)/ruby/internal/intern/marshal.h
+scan_args.o: $(hdrdir)/ruby/internal/intern/numeric.h
+scan_args.o: $(hdrdir)/ruby/internal/intern/object.h
+scan_args.o: $(hdrdir)/ruby/internal/intern/parse.h
+scan_args.o: $(hdrdir)/ruby/internal/intern/proc.h
+scan_args.o: $(hdrdir)/ruby/internal/intern/process.h
+scan_args.o: $(hdrdir)/ruby/internal/intern/random.h
+scan_args.o: $(hdrdir)/ruby/internal/intern/range.h
+scan_args.o: $(hdrdir)/ruby/internal/intern/rational.h
+scan_args.o: $(hdrdir)/ruby/internal/intern/re.h
+scan_args.o: $(hdrdir)/ruby/internal/intern/ruby.h
+scan_args.o: $(hdrdir)/ruby/internal/intern/select.h
+scan_args.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+scan_args.o: $(hdrdir)/ruby/internal/intern/signal.h
+scan_args.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+scan_args.o: $(hdrdir)/ruby/internal/intern/string.h
+scan_args.o: $(hdrdir)/ruby/internal/intern/struct.h
+scan_args.o: $(hdrdir)/ruby/internal/intern/thread.h
+scan_args.o: $(hdrdir)/ruby/internal/intern/time.h
+scan_args.o: $(hdrdir)/ruby/internal/intern/variable.h
+scan_args.o: $(hdrdir)/ruby/internal/intern/vm.h
+scan_args.o: $(hdrdir)/ruby/internal/interpreter.h
+scan_args.o: $(hdrdir)/ruby/internal/iterator.h
+scan_args.o: $(hdrdir)/ruby/internal/memory.h
+scan_args.o: $(hdrdir)/ruby/internal/method.h
+scan_args.o: $(hdrdir)/ruby/internal/module.h
+scan_args.o: $(hdrdir)/ruby/internal/newobj.h
+scan_args.o: $(hdrdir)/ruby/internal/rgengc.h
+scan_args.o: $(hdrdir)/ruby/internal/scan_args.h
+scan_args.o: $(hdrdir)/ruby/internal/special_consts.h
+scan_args.o: $(hdrdir)/ruby/internal/static_assert.h
+scan_args.o: $(hdrdir)/ruby/internal/stdalign.h
+scan_args.o: $(hdrdir)/ruby/internal/stdbool.h
+scan_args.o: $(hdrdir)/ruby/internal/symbol.h
+scan_args.o: $(hdrdir)/ruby/internal/token_paste.h
+scan_args.o: $(hdrdir)/ruby/internal/value.h
+scan_args.o: $(hdrdir)/ruby/internal/value_type.h
+scan_args.o: $(hdrdir)/ruby/internal/variable.h
+scan_args.o: $(hdrdir)/ruby/internal/warning_push.h
+scan_args.o: $(hdrdir)/ruby/internal/xmalloc.h
+scan_args.o: $(hdrdir)/ruby/assert.h
+scan_args.o: $(hdrdir)/ruby/backward.h
+scan_args.o: $(hdrdir)/ruby/backward/2/assume.h
+scan_args.o: $(hdrdir)/ruby/backward/2/attributes.h
+scan_args.o: $(hdrdir)/ruby/backward/2/bool.h
+scan_args.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+scan_args.o: $(hdrdir)/ruby/backward/2/inttypes.h
+scan_args.o: $(hdrdir)/ruby/backward/2/limits.h
+scan_args.o: $(hdrdir)/ruby/backward/2/long_long.h
+scan_args.o: $(hdrdir)/ruby/backward/2/stdalign.h
+scan_args.o: $(hdrdir)/ruby/backward/2/stdarg.h
+scan_args.o: $(hdrdir)/ruby/defines.h
+scan_args.o: $(hdrdir)/ruby/intern.h
+scan_args.o: $(hdrdir)/ruby/missing.h
+scan_args.o: $(hdrdir)/ruby/ruby.h
+scan_args.o: $(hdrdir)/ruby/st.h
+scan_args.o: $(hdrdir)/ruby/subst.h
+scan_args.o: scan_args.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/scan_args/extconf.rb b/ext/-test-/scan_args/extconf.rb
new file mode 100644
index 0000000000..6cae9c2779
--- /dev/null
+++ b/ext/-test-/scan_args/extconf.rb
@@ -0,0 +1 @@
+create_makefile("-test-/scan_args")
diff --git a/ext/-test-/scan_args/scan_args.c b/ext/-test-/scan_args/scan_args.c
new file mode 100644
index 0000000000..8696aad3c7
--- /dev/null
+++ b/ext/-test-/scan_args/scan_args.c
@@ -0,0 +1,305 @@
+#include <ruby.h>
+
+#ifndef numberof
+#define numberof(array) (int)(sizeof(array) / sizeof((array)[0]))
+#endif
+
+static VALUE
+scan_args_lead(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[2];
+    int n = rb_scan_args(argc, argv, "1", args+1);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_opt(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[2];
+    int n = rb_scan_args(argc, argv, "01", args+1);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_lead_opt(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[3];
+    int n = rb_scan_args(argc, argv, "11", args+1, args+2);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+/* var */
+static VALUE
+scan_args_var(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[2];
+    int n = rb_scan_args(argc, argv, "*", args+1);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_lead_var(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[3];
+    int n = rb_scan_args(argc, argv, "1*", args+1, args+2);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_opt_var(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[3];
+    int n = rb_scan_args(argc, argv, "01*", args+1, args+2);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_lead_opt_var(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[4];
+    int n = rb_scan_args(argc, argv, "11*", args+1, args+2, args+3);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+/* trail */
+static VALUE
+scan_args_opt_trail(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[3];
+    int n = rb_scan_args(argc, argv, "011", args+1, args+2);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_lead_opt_trail(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[4];
+    int n = rb_scan_args(argc, argv, "111", args+1, args+2, args+3);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_var_trail(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[3];
+    int n = rb_scan_args(argc, argv, "*1", args+1, args+2);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_lead_var_trail(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[4];
+    int n = rb_scan_args(argc, argv, "1*1", args+1, args+2, args+3);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_opt_var_trail(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[4];
+    int n = rb_scan_args(argc, argv, "01*1", args+1, args+2, args+3);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_lead_opt_var_trail(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[5];
+    int n = rb_scan_args(argc, argv, "11*1", args+1, args+2, args+3, args+4);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+/* hash */
+static VALUE
+scan_args_hash(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[2];
+    int n = rb_scan_args(argc, argv, ":", args+1);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_lead_hash(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[3];
+    int n = rb_scan_args(argc, argv, "1:", args+1, args+2);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_opt_hash(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[3];
+    int n = rb_scan_args(argc, argv, "01:", args+1, args+2);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_lead_opt_hash(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[4];
+    int n = rb_scan_args(argc, argv, "11:", args+1, args+2, args+3);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_var_hash(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[3];
+    int n = rb_scan_args(argc, argv, "*:", args+1, args+2);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_lead_var_hash(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[4];
+    int n = rb_scan_args(argc, argv, "1*:", args+1, args+2, args+3);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_opt_var_hash(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[4];
+    int n = rb_scan_args(argc, argv, "01*:", args+1, args+2, args+3);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_lead_opt_var_hash(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[5];
+    int n = rb_scan_args(argc, argv, "11*:", args+1, args+2, args+3, args+4);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_opt_trail_hash(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[4];
+    int n = rb_scan_args(argc, argv, "011:", args+1, args+2, args+3);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_lead_opt_trail_hash(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[5];
+    int n = rb_scan_args(argc, argv, "111:", args+1, args+2, args+3, args+4);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_var_trail_hash(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[4];
+    int n = rb_scan_args(argc, argv, "*1:", args+1, args+2, args+3);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_lead_var_trail_hash(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[5];
+    int n = rb_scan_args(argc, argv, "1*1:", args+1, args+2, args+3, args+4);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_opt_var_trail_hash(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[5];
+    int n = rb_scan_args(argc, argv, "01*1:", args+1, args+2, args+3, args+4);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_lead_opt_var_trail_hash(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[6];
+    int n = rb_scan_args(argc, argv, "11*1:", args+1, args+2, args+3, args+4, args+5);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_k_lead_opt_hash(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[4];
+    int n = rb_scan_args_kw(RB_SCAN_ARGS_KEYWORDS, argc, argv, "11:", args+1, args+2, args+3);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+static VALUE
+scan_args_n_lead_opt_hash(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[4];
+    int n = rb_scan_args_kw(RB_SCAN_ARGS_LAST_HASH_KEYWORDS, argc, argv, "11:", args+1, args+2, args+3);
+    args[0] = INT2NUM(n);
+    return rb_ary_new_from_values(numberof(args), args);
+}
+
+void
+Init_scan_args(void)
+{
+    VALUE module = rb_define_module("Bug");
+    module = rb_define_module_under(module, "ScanArgs");
+    rb_define_singleton_method(module, "lead", scan_args_lead, -1);
+    rb_define_singleton_method(module, "opt", scan_args_opt, -1);
+    rb_define_singleton_method(module, "lead_opt", scan_args_lead_opt, -1);
+    rb_define_singleton_method(module, "var", scan_args_var, -1);
+    rb_define_singleton_method(module, "lead_var", scan_args_lead_var, -1);
+    rb_define_singleton_method(module, "opt_var", scan_args_opt_var, -1);
+    rb_define_singleton_method(module, "lead_opt_var", scan_args_lead_opt_var, -1);
+    rb_define_singleton_method(module, "opt_trail", scan_args_opt_trail, -1);
+    rb_define_singleton_method(module, "lead_opt_trail", scan_args_lead_opt_trail, -1);
+    rb_define_singleton_method(module, "var_trail", scan_args_var_trail, -1);
+    rb_define_singleton_method(module, "lead_var_trail", scan_args_lead_var_trail, -1);
+    rb_define_singleton_method(module, "opt_var_trail", scan_args_opt_var_trail, -1);
+    rb_define_singleton_method(module, "lead_opt_var_trail", scan_args_lead_opt_var_trail, -1);
+    rb_define_singleton_method(module, "hash", scan_args_hash, -1);
+    rb_define_singleton_method(module, "lead_hash", scan_args_lead_hash, -1);
+    rb_define_singleton_method(module, "opt_hash", scan_args_opt_hash, -1);
+    rb_define_singleton_method(module, "lead_opt_hash", scan_args_lead_opt_hash, -1);
+    rb_define_singleton_method(module, "var_hash", scan_args_var_hash, -1);
+    rb_define_singleton_method(module, "lead_var_hash", scan_args_lead_var_hash, -1);
+    rb_define_singleton_method(module, "opt_var_hash", scan_args_opt_var_hash, -1);
+    rb_define_singleton_method(module, "lead_opt_var_hash", scan_args_lead_opt_var_hash, -1);
+    rb_define_singleton_method(module, "opt_trail_hash", scan_args_opt_trail_hash, -1);
+    rb_define_singleton_method(module, "lead_opt_trail_hash", scan_args_lead_opt_trail_hash, -1);
+    rb_define_singleton_method(module, "var_trail_hash", scan_args_var_trail_hash, -1);
+    rb_define_singleton_method(module, "lead_var_trail_hash", scan_args_lead_var_trail_hash, -1);
+    rb_define_singleton_method(module, "opt_var_trail_hash", scan_args_opt_var_trail_hash, -1);
+    rb_define_singleton_method(module, "lead_opt_var_trail_hash", scan_args_lead_opt_var_trail_hash, -1);
+    rb_define_singleton_method(module, "k_lead_opt_hash", scan_args_k_lead_opt_hash, -1);
+    rb_define_singleton_method(module, "n_lead_opt_hash", scan_args_n_lead_opt_hash, -1);
+}
diff --git a/ext/-test-/st/foreach/depend b/ext/-test-/st/foreach/depend
new file mode 100644
index 0000000000..25381871f0
--- /dev/null
+++ b/ext/-test-/st/foreach/depend
@@ -0,0 +1,163 @@
+# AUTOGENERATED DEPENDENCIES START
+foreach.o: $(RUBY_EXTCONF_H)
+foreach.o: $(arch_hdrdir)/ruby/config.h
+foreach.o: $(hdrdir)/ruby.h
+foreach.o: $(hdrdir)/ruby/internal/anyargs.h
+foreach.o: $(hdrdir)/ruby/internal/arithmetic.h
+foreach.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+foreach.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+foreach.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+foreach.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+foreach.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+foreach.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+foreach.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+foreach.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+foreach.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+foreach.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+foreach.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+foreach.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+foreach.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+foreach.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+foreach.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+foreach.o: $(hdrdir)/ruby/internal/assume.h
+foreach.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+foreach.o: $(hdrdir)/ruby/internal/attr/artificial.h
+foreach.o: $(hdrdir)/ruby/internal/attr/cold.h
+foreach.o: $(hdrdir)/ruby/internal/attr/const.h
+foreach.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+foreach.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+foreach.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+foreach.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+foreach.o: $(hdrdir)/ruby/internal/attr/error.h
+foreach.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+foreach.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+foreach.o: $(hdrdir)/ruby/internal/attr/format.h
+foreach.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+foreach.o: $(hdrdir)/ruby/internal/attr/noalias.h
+foreach.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+foreach.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+foreach.o: $(hdrdir)/ruby/internal/attr/noinline.h
+foreach.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+foreach.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+foreach.o: $(hdrdir)/ruby/internal/attr/pure.h
+foreach.o: $(hdrdir)/ruby/internal/attr/restrict.h
+foreach.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+foreach.o: $(hdrdir)/ruby/internal/attr/warning.h
+foreach.o: $(hdrdir)/ruby/internal/attr/weakref.h
+foreach.o: $(hdrdir)/ruby/internal/cast.h
+foreach.o: $(hdrdir)/ruby/internal/compiler_is.h
+foreach.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+foreach.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+foreach.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+foreach.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+foreach.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+foreach.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+foreach.o: $(hdrdir)/ruby/internal/compiler_since.h
+foreach.o: $(hdrdir)/ruby/internal/config.h
+foreach.o: $(hdrdir)/ruby/internal/constant_p.h
+foreach.o: $(hdrdir)/ruby/internal/core.h
+foreach.o: $(hdrdir)/ruby/internal/core/rarray.h
+foreach.o: $(hdrdir)/ruby/internal/core/rbasic.h
+foreach.o: $(hdrdir)/ruby/internal/core/rbignum.h
+foreach.o: $(hdrdir)/ruby/internal/core/rclass.h
+foreach.o: $(hdrdir)/ruby/internal/core/rdata.h
+foreach.o: $(hdrdir)/ruby/internal/core/rfile.h
+foreach.o: $(hdrdir)/ruby/internal/core/rhash.h
+foreach.o: $(hdrdir)/ruby/internal/core/robject.h
+foreach.o: $(hdrdir)/ruby/internal/core/rregexp.h
+foreach.o: $(hdrdir)/ruby/internal/core/rstring.h
+foreach.o: $(hdrdir)/ruby/internal/core/rstruct.h
+foreach.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+foreach.o: $(hdrdir)/ruby/internal/ctype.h
+foreach.o: $(hdrdir)/ruby/internal/dllexport.h
+foreach.o: $(hdrdir)/ruby/internal/dosish.h
+foreach.o: $(hdrdir)/ruby/internal/error.h
+foreach.o: $(hdrdir)/ruby/internal/eval.h
+foreach.o: $(hdrdir)/ruby/internal/event.h
+foreach.o: $(hdrdir)/ruby/internal/fl_type.h
+foreach.o: $(hdrdir)/ruby/internal/gc.h
+foreach.o: $(hdrdir)/ruby/internal/glob.h
+foreach.o: $(hdrdir)/ruby/internal/globals.h
+foreach.o: $(hdrdir)/ruby/internal/has/attribute.h
+foreach.o: $(hdrdir)/ruby/internal/has/builtin.h
+foreach.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+foreach.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+foreach.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+foreach.o: $(hdrdir)/ruby/internal/has/extension.h
+foreach.o: $(hdrdir)/ruby/internal/has/feature.h
+foreach.o: $(hdrdir)/ruby/internal/has/warning.h
+foreach.o: $(hdrdir)/ruby/internal/intern/array.h
+foreach.o: $(hdrdir)/ruby/internal/intern/bignum.h
+foreach.o: $(hdrdir)/ruby/internal/intern/class.h
+foreach.o: $(hdrdir)/ruby/internal/intern/compar.h
+foreach.o: $(hdrdir)/ruby/internal/intern/complex.h
+foreach.o: $(hdrdir)/ruby/internal/intern/cont.h
+foreach.o: $(hdrdir)/ruby/internal/intern/dir.h
+foreach.o: $(hdrdir)/ruby/internal/intern/enum.h
+foreach.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+foreach.o: $(hdrdir)/ruby/internal/intern/error.h
+foreach.o: $(hdrdir)/ruby/internal/intern/eval.h
+foreach.o: $(hdrdir)/ruby/internal/intern/file.h
+foreach.o: $(hdrdir)/ruby/internal/intern/gc.h
+foreach.o: $(hdrdir)/ruby/internal/intern/hash.h
+foreach.o: $(hdrdir)/ruby/internal/intern/io.h
+foreach.o: $(hdrdir)/ruby/internal/intern/load.h
+foreach.o: $(hdrdir)/ruby/internal/intern/marshal.h
+foreach.o: $(hdrdir)/ruby/internal/intern/numeric.h
+foreach.o: $(hdrdir)/ruby/internal/intern/object.h
+foreach.o: $(hdrdir)/ruby/internal/intern/parse.h
+foreach.o: $(hdrdir)/ruby/internal/intern/proc.h
+foreach.o: $(hdrdir)/ruby/internal/intern/process.h
+foreach.o: $(hdrdir)/ruby/internal/intern/random.h
+foreach.o: $(hdrdir)/ruby/internal/intern/range.h
+foreach.o: $(hdrdir)/ruby/internal/intern/rational.h
+foreach.o: $(hdrdir)/ruby/internal/intern/re.h
+foreach.o: $(hdrdir)/ruby/internal/intern/ruby.h
+foreach.o: $(hdrdir)/ruby/internal/intern/select.h
+foreach.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+foreach.o: $(hdrdir)/ruby/internal/intern/signal.h
+foreach.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+foreach.o: $(hdrdir)/ruby/internal/intern/string.h
+foreach.o: $(hdrdir)/ruby/internal/intern/struct.h
+foreach.o: $(hdrdir)/ruby/internal/intern/thread.h
+foreach.o: $(hdrdir)/ruby/internal/intern/time.h
+foreach.o: $(hdrdir)/ruby/internal/intern/variable.h
+foreach.o: $(hdrdir)/ruby/internal/intern/vm.h
+foreach.o: $(hdrdir)/ruby/internal/interpreter.h
+foreach.o: $(hdrdir)/ruby/internal/iterator.h
+foreach.o: $(hdrdir)/ruby/internal/memory.h
+foreach.o: $(hdrdir)/ruby/internal/method.h
+foreach.o: $(hdrdir)/ruby/internal/module.h
+foreach.o: $(hdrdir)/ruby/internal/newobj.h
+foreach.o: $(hdrdir)/ruby/internal/rgengc.h
+foreach.o: $(hdrdir)/ruby/internal/scan_args.h
+foreach.o: $(hdrdir)/ruby/internal/special_consts.h
+foreach.o: $(hdrdir)/ruby/internal/static_assert.h
+foreach.o: $(hdrdir)/ruby/internal/stdalign.h
+foreach.o: $(hdrdir)/ruby/internal/stdbool.h
+foreach.o: $(hdrdir)/ruby/internal/symbol.h
+foreach.o: $(hdrdir)/ruby/internal/token_paste.h
+foreach.o: $(hdrdir)/ruby/internal/value.h
+foreach.o: $(hdrdir)/ruby/internal/value_type.h
+foreach.o: $(hdrdir)/ruby/internal/variable.h
+foreach.o: $(hdrdir)/ruby/internal/warning_push.h
+foreach.o: $(hdrdir)/ruby/internal/xmalloc.h
+foreach.o: $(hdrdir)/ruby/assert.h
+foreach.o: $(hdrdir)/ruby/backward.h
+foreach.o: $(hdrdir)/ruby/backward/2/assume.h
+foreach.o: $(hdrdir)/ruby/backward/2/attributes.h
+foreach.o: $(hdrdir)/ruby/backward/2/bool.h
+foreach.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+foreach.o: $(hdrdir)/ruby/backward/2/inttypes.h
+foreach.o: $(hdrdir)/ruby/backward/2/limits.h
+foreach.o: $(hdrdir)/ruby/backward/2/long_long.h
+foreach.o: $(hdrdir)/ruby/backward/2/stdalign.h
+foreach.o: $(hdrdir)/ruby/backward/2/stdarg.h
+foreach.o: $(hdrdir)/ruby/defines.h
+foreach.o: $(hdrdir)/ruby/intern.h
+foreach.o: $(hdrdir)/ruby/missing.h
+foreach.o: $(hdrdir)/ruby/ruby.h
+foreach.o: $(hdrdir)/ruby/st.h
+foreach.o: $(hdrdir)/ruby/subst.h
+foreach.o: foreach.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/st/foreach/foreach.c b/ext/-test-/st/foreach/foreach.c
index 1e0fd515c9..27ac18046f 100644
--- a/ext/-test-/st/foreach/foreach.c
+++ b/ext/-test-/st/foreach/foreach.c
@@ -14,13 +14,13 @@ force_unpack_check(struct checker *c, st_data_t key, st_data_t val)
     if (c->nr == 0) {
 	st_data_t i;
 
-	if (!c->tbl->entries_packed) rb_bug("should be packed\n");
+	if (c->tbl->bins != NULL) rb_bug("should be packed\n");
 
 	/* force unpacking during iteration: */
 	for (i = 1; i < expect_size; i++)
 	    st_add_direct(c->tbl, i, i);
 
-	if (c->tbl->entries_packed) rb_bug("should be unpacked\n");
+	if (c->tbl->bins == NULL) rb_bug("should be unpacked\n");
     }
 
     if (key != c->nr) {
@@ -84,7 +84,7 @@ unp_fec(VALUE self, VALUE test)
 
     st_add_direct(tbl, 0, 0);
 
-    if (!tbl->entries_packed) rb_bug("should still be packed\n");
+    if (tbl->bins != NULL) rb_bug("should still be packed\n");
 
     st_foreach_check(tbl, unp_fec_i, (st_data_t)&c, -1);
 
@@ -98,7 +98,7 @@ unp_fec(VALUE self, VALUE test)
 		(VALUE)c.nr, (VALUE)expect_size);
     }
 
-    if (tbl->entries_packed) rb_bug("should be unpacked\n");
+    if (tbl->bins == NULL) rb_bug("should be unpacked\n");
 
     st_free_table(tbl);
 
@@ -106,7 +106,7 @@ unp_fec(VALUE self, VALUE test)
 }
 
 static int
-unp_fe_i(st_data_t key, st_data_t val, st_data_t args, int error)
+unp_fe_i(st_data_t key, st_data_t val, st_data_t args)
 {
     struct checker *c = (struct checker *)args;
 
@@ -145,7 +145,7 @@ unp_fe(VALUE self, VALUE test)
 
     st_add_direct(tbl, 0, 0);
 
-    if (!tbl->entries_packed) rb_bug("should still be packed\n");
+    if (tbl->bins != NULL) rb_bug("should still be packed\n");
 
     st_foreach(tbl, unp_fe_i, (st_data_t)&c);
 
@@ -159,7 +159,7 @@ unp_fe(VALUE self, VALUE test)
 		(VALUE)c.nr, (VALUE)expect_size);
     }
 
-    if (tbl->entries_packed) rb_bug("should be unpacked\n");
+    if (tbl->bins == NULL) rb_bug("should be unpacked\n");
 
     st_free_table(tbl);
 
diff --git a/ext/-test-/st/numhash/depend b/ext/-test-/st/numhash/depend
new file mode 100644
index 0000000000..8e0560e018
--- /dev/null
+++ b/ext/-test-/st/numhash/depend
@@ -0,0 +1,163 @@
+# AUTOGENERATED DEPENDENCIES START
+numhash.o: $(RUBY_EXTCONF_H)
+numhash.o: $(arch_hdrdir)/ruby/config.h
+numhash.o: $(hdrdir)/ruby.h
+numhash.o: $(hdrdir)/ruby/internal/anyargs.h
+numhash.o: $(hdrdir)/ruby/internal/arithmetic.h
+numhash.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+numhash.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+numhash.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+numhash.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+numhash.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+numhash.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+numhash.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+numhash.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+numhash.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+numhash.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+numhash.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+numhash.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+numhash.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+numhash.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+numhash.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+numhash.o: $(hdrdir)/ruby/internal/assume.h
+numhash.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+numhash.o: $(hdrdir)/ruby/internal/attr/artificial.h
+numhash.o: $(hdrdir)/ruby/internal/attr/cold.h
+numhash.o: $(hdrdir)/ruby/internal/attr/const.h
+numhash.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+numhash.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+numhash.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+numhash.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+numhash.o: $(hdrdir)/ruby/internal/attr/error.h
+numhash.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+numhash.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+numhash.o: $(hdrdir)/ruby/internal/attr/format.h
+numhash.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+numhash.o: $(hdrdir)/ruby/internal/attr/noalias.h
+numhash.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+numhash.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+numhash.o: $(hdrdir)/ruby/internal/attr/noinline.h
+numhash.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+numhash.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+numhash.o: $(hdrdir)/ruby/internal/attr/pure.h
+numhash.o: $(hdrdir)/ruby/internal/attr/restrict.h
+numhash.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+numhash.o: $(hdrdir)/ruby/internal/attr/warning.h
+numhash.o: $(hdrdir)/ruby/internal/attr/weakref.h
+numhash.o: $(hdrdir)/ruby/internal/cast.h
+numhash.o: $(hdrdir)/ruby/internal/compiler_is.h
+numhash.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+numhash.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+numhash.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+numhash.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+numhash.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+numhash.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+numhash.o: $(hdrdir)/ruby/internal/compiler_since.h
+numhash.o: $(hdrdir)/ruby/internal/config.h
+numhash.o: $(hdrdir)/ruby/internal/constant_p.h
+numhash.o: $(hdrdir)/ruby/internal/core.h
+numhash.o: $(hdrdir)/ruby/internal/core/rarray.h
+numhash.o: $(hdrdir)/ruby/internal/core/rbasic.h
+numhash.o: $(hdrdir)/ruby/internal/core/rbignum.h
+numhash.o: $(hdrdir)/ruby/internal/core/rclass.h
+numhash.o: $(hdrdir)/ruby/internal/core/rdata.h
+numhash.o: $(hdrdir)/ruby/internal/core/rfile.h
+numhash.o: $(hdrdir)/ruby/internal/core/rhash.h
+numhash.o: $(hdrdir)/ruby/internal/core/robject.h
+numhash.o: $(hdrdir)/ruby/internal/core/rregexp.h
+numhash.o: $(hdrdir)/ruby/internal/core/rstring.h
+numhash.o: $(hdrdir)/ruby/internal/core/rstruct.h
+numhash.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+numhash.o: $(hdrdir)/ruby/internal/ctype.h
+numhash.o: $(hdrdir)/ruby/internal/dllexport.h
+numhash.o: $(hdrdir)/ruby/internal/dosish.h
+numhash.o: $(hdrdir)/ruby/internal/error.h
+numhash.o: $(hdrdir)/ruby/internal/eval.h
+numhash.o: $(hdrdir)/ruby/internal/event.h
+numhash.o: $(hdrdir)/ruby/internal/fl_type.h
+numhash.o: $(hdrdir)/ruby/internal/gc.h
+numhash.o: $(hdrdir)/ruby/internal/glob.h
+numhash.o: $(hdrdir)/ruby/internal/globals.h
+numhash.o: $(hdrdir)/ruby/internal/has/attribute.h
+numhash.o: $(hdrdir)/ruby/internal/has/builtin.h
+numhash.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+numhash.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+numhash.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+numhash.o: $(hdrdir)/ruby/internal/has/extension.h
+numhash.o: $(hdrdir)/ruby/internal/has/feature.h
+numhash.o: $(hdrdir)/ruby/internal/has/warning.h
+numhash.o: $(hdrdir)/ruby/internal/intern/array.h
+numhash.o: $(hdrdir)/ruby/internal/intern/bignum.h
+numhash.o: $(hdrdir)/ruby/internal/intern/class.h
+numhash.o: $(hdrdir)/ruby/internal/intern/compar.h
+numhash.o: $(hdrdir)/ruby/internal/intern/complex.h
+numhash.o: $(hdrdir)/ruby/internal/intern/cont.h
+numhash.o: $(hdrdir)/ruby/internal/intern/dir.h
+numhash.o: $(hdrdir)/ruby/internal/intern/enum.h
+numhash.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+numhash.o: $(hdrdir)/ruby/internal/intern/error.h
+numhash.o: $(hdrdir)/ruby/internal/intern/eval.h
+numhash.o: $(hdrdir)/ruby/internal/intern/file.h
+numhash.o: $(hdrdir)/ruby/internal/intern/gc.h
+numhash.o: $(hdrdir)/ruby/internal/intern/hash.h
+numhash.o: $(hdrdir)/ruby/internal/intern/io.h
+numhash.o: $(hdrdir)/ruby/internal/intern/load.h
+numhash.o: $(hdrdir)/ruby/internal/intern/marshal.h
+numhash.o: $(hdrdir)/ruby/internal/intern/numeric.h
+numhash.o: $(hdrdir)/ruby/internal/intern/object.h
+numhash.o: $(hdrdir)/ruby/internal/intern/parse.h
+numhash.o: $(hdrdir)/ruby/internal/intern/proc.h
+numhash.o: $(hdrdir)/ruby/internal/intern/process.h
+numhash.o: $(hdrdir)/ruby/internal/intern/random.h
+numhash.o: $(hdrdir)/ruby/internal/intern/range.h
+numhash.o: $(hdrdir)/ruby/internal/intern/rational.h
+numhash.o: $(hdrdir)/ruby/internal/intern/re.h
+numhash.o: $(hdrdir)/ruby/internal/intern/ruby.h
+numhash.o: $(hdrdir)/ruby/internal/intern/select.h
+numhash.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+numhash.o: $(hdrdir)/ruby/internal/intern/signal.h
+numhash.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+numhash.o: $(hdrdir)/ruby/internal/intern/string.h
+numhash.o: $(hdrdir)/ruby/internal/intern/struct.h
+numhash.o: $(hdrdir)/ruby/internal/intern/thread.h
+numhash.o: $(hdrdir)/ruby/internal/intern/time.h
+numhash.o: $(hdrdir)/ruby/internal/intern/variable.h
+numhash.o: $(hdrdir)/ruby/internal/intern/vm.h
+numhash.o: $(hdrdir)/ruby/internal/interpreter.h
+numhash.o: $(hdrdir)/ruby/internal/iterator.h
+numhash.o: $(hdrdir)/ruby/internal/memory.h
+numhash.o: $(hdrdir)/ruby/internal/method.h
+numhash.o: $(hdrdir)/ruby/internal/module.h
+numhash.o: $(hdrdir)/ruby/internal/newobj.h
+numhash.o: $(hdrdir)/ruby/internal/rgengc.h
+numhash.o: $(hdrdir)/ruby/internal/scan_args.h
+numhash.o: $(hdrdir)/ruby/internal/special_consts.h
+numhash.o: $(hdrdir)/ruby/internal/static_assert.h
+numhash.o: $(hdrdir)/ruby/internal/stdalign.h
+numhash.o: $(hdrdir)/ruby/internal/stdbool.h
+numhash.o: $(hdrdir)/ruby/internal/symbol.h
+numhash.o: $(hdrdir)/ruby/internal/token_paste.h
+numhash.o: $(hdrdir)/ruby/internal/value.h
+numhash.o: $(hdrdir)/ruby/internal/value_type.h
+numhash.o: $(hdrdir)/ruby/internal/variable.h
+numhash.o: $(hdrdir)/ruby/internal/warning_push.h
+numhash.o: $(hdrdir)/ruby/internal/xmalloc.h
+numhash.o: $(hdrdir)/ruby/assert.h
+numhash.o: $(hdrdir)/ruby/backward.h
+numhash.o: $(hdrdir)/ruby/backward/2/assume.h
+numhash.o: $(hdrdir)/ruby/backward/2/attributes.h
+numhash.o: $(hdrdir)/ruby/backward/2/bool.h
+numhash.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+numhash.o: $(hdrdir)/ruby/backward/2/inttypes.h
+numhash.o: $(hdrdir)/ruby/backward/2/limits.h
+numhash.o: $(hdrdir)/ruby/backward/2/long_long.h
+numhash.o: $(hdrdir)/ruby/backward/2/stdalign.h
+numhash.o: $(hdrdir)/ruby/backward/2/stdarg.h
+numhash.o: $(hdrdir)/ruby/defines.h
+numhash.o: $(hdrdir)/ruby/intern.h
+numhash.o: $(hdrdir)/ruby/missing.h
+numhash.o: $(hdrdir)/ruby/ruby.h
+numhash.o: $(hdrdir)/ruby/st.h
+numhash.o: $(hdrdir)/ruby/subst.h
+numhash.o: numhash.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/st/numhash/numhash.c b/ext/-test-/st/numhash/numhash.c
index fc35f476cd..aa8015e86c 100644
--- a/ext/-test-/st/numhash/numhash.c
+++ b/ext/-test-/st/numhash/numhash.c
@@ -57,7 +57,7 @@ numhash_aset(VALUE self, VALUE key, VALUE data)
 }
 
 static int
-numhash_i(st_data_t key, st_data_t value, st_data_t arg)
+numhash_i(st_data_t key, st_data_t value, st_data_t arg, int _)
 {
     VALUE ret;
     ret = rb_yield_values(3, (VALUE)key, (VALUE)value, (VALUE)arg);
@@ -125,7 +125,7 @@ numhash_delete_safe(VALUE self, VALUE key)
 void
 Init_numhash(void)
 {
-    VALUE st = rb_define_class_under(rb_define_module("Bug"), "StNumHash", rb_cData);
+    VALUE st = rb_define_class_under(rb_define_module("Bug"), "StNumHash", rb_cObject);
     rb_define_alloc_func(st, numhash_alloc);
     rb_define_method(st, "initialize", numhash_init, 0);
     rb_define_method(st, "[]", numhash_aref, 1);
@@ -135,4 +135,3 @@ Init_numhash(void)
     rb_define_method(st, "size", numhash_size, 0);
     rb_define_method(st, "delete_safe", numhash_delete_safe, 1);
 }
-
diff --git a/ext/-test-/st/update/depend b/ext/-test-/st/update/depend
new file mode 100644
index 0000000000..c11a5b14a7
--- /dev/null
+++ b/ext/-test-/st/update/depend
@@ -0,0 +1,163 @@
+# AUTOGENERATED DEPENDENCIES START
+update.o: $(RUBY_EXTCONF_H)
+update.o: $(arch_hdrdir)/ruby/config.h
+update.o: $(hdrdir)/ruby.h
+update.o: $(hdrdir)/ruby/internal/anyargs.h
+update.o: $(hdrdir)/ruby/internal/arithmetic.h
+update.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+update.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+update.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+update.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+update.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+update.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+update.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+update.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+update.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+update.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+update.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+update.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+update.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+update.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+update.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+update.o: $(hdrdir)/ruby/internal/assume.h
+update.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+update.o: $(hdrdir)/ruby/internal/attr/artificial.h
+update.o: $(hdrdir)/ruby/internal/attr/cold.h
+update.o: $(hdrdir)/ruby/internal/attr/const.h
+update.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+update.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+update.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+update.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+update.o: $(hdrdir)/ruby/internal/attr/error.h
+update.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+update.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+update.o: $(hdrdir)/ruby/internal/attr/format.h
+update.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+update.o: $(hdrdir)/ruby/internal/attr/noalias.h
+update.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+update.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+update.o: $(hdrdir)/ruby/internal/attr/noinline.h
+update.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+update.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+update.o: $(hdrdir)/ruby/internal/attr/pure.h
+update.o: $(hdrdir)/ruby/internal/attr/restrict.h
+update.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+update.o: $(hdrdir)/ruby/internal/attr/warning.h
+update.o: $(hdrdir)/ruby/internal/attr/weakref.h
+update.o: $(hdrdir)/ruby/internal/cast.h
+update.o: $(hdrdir)/ruby/internal/compiler_is.h
+update.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+update.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+update.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+update.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+update.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+update.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+update.o: $(hdrdir)/ruby/internal/compiler_since.h
+update.o: $(hdrdir)/ruby/internal/config.h
+update.o: $(hdrdir)/ruby/internal/constant_p.h
+update.o: $(hdrdir)/ruby/internal/core.h
+update.o: $(hdrdir)/ruby/internal/core/rarray.h
+update.o: $(hdrdir)/ruby/internal/core/rbasic.h
+update.o: $(hdrdir)/ruby/internal/core/rbignum.h
+update.o: $(hdrdir)/ruby/internal/core/rclass.h
+update.o: $(hdrdir)/ruby/internal/core/rdata.h
+update.o: $(hdrdir)/ruby/internal/core/rfile.h
+update.o: $(hdrdir)/ruby/internal/core/rhash.h
+update.o: $(hdrdir)/ruby/internal/core/robject.h
+update.o: $(hdrdir)/ruby/internal/core/rregexp.h
+update.o: $(hdrdir)/ruby/internal/core/rstring.h
+update.o: $(hdrdir)/ruby/internal/core/rstruct.h
+update.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+update.o: $(hdrdir)/ruby/internal/ctype.h
+update.o: $(hdrdir)/ruby/internal/dllexport.h
+update.o: $(hdrdir)/ruby/internal/dosish.h
+update.o: $(hdrdir)/ruby/internal/error.h
+update.o: $(hdrdir)/ruby/internal/eval.h
+update.o: $(hdrdir)/ruby/internal/event.h
+update.o: $(hdrdir)/ruby/internal/fl_type.h
+update.o: $(hdrdir)/ruby/internal/gc.h
+update.o: $(hdrdir)/ruby/internal/glob.h
+update.o: $(hdrdir)/ruby/internal/globals.h
+update.o: $(hdrdir)/ruby/internal/has/attribute.h
+update.o: $(hdrdir)/ruby/internal/has/builtin.h
+update.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+update.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+update.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+update.o: $(hdrdir)/ruby/internal/has/extension.h
+update.o: $(hdrdir)/ruby/internal/has/feature.h
+update.o: $(hdrdir)/ruby/internal/has/warning.h
+update.o: $(hdrdir)/ruby/internal/intern/array.h
+update.o: $(hdrdir)/ruby/internal/intern/bignum.h
+update.o: $(hdrdir)/ruby/internal/intern/class.h
+update.o: $(hdrdir)/ruby/internal/intern/compar.h
+update.o: $(hdrdir)/ruby/internal/intern/complex.h
+update.o: $(hdrdir)/ruby/internal/intern/cont.h
+update.o: $(hdrdir)/ruby/internal/intern/dir.h
+update.o: $(hdrdir)/ruby/internal/intern/enum.h
+update.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+update.o: $(hdrdir)/ruby/internal/intern/error.h
+update.o: $(hdrdir)/ruby/internal/intern/eval.h
+update.o: $(hdrdir)/ruby/internal/intern/file.h
+update.o: $(hdrdir)/ruby/internal/intern/gc.h
+update.o: $(hdrdir)/ruby/internal/intern/hash.h
+update.o: $(hdrdir)/ruby/internal/intern/io.h
+update.o: $(hdrdir)/ruby/internal/intern/load.h
+update.o: $(hdrdir)/ruby/internal/intern/marshal.h
+update.o: $(hdrdir)/ruby/internal/intern/numeric.h
+update.o: $(hdrdir)/ruby/internal/intern/object.h
+update.o: $(hdrdir)/ruby/internal/intern/parse.h
+update.o: $(hdrdir)/ruby/internal/intern/proc.h
+update.o: $(hdrdir)/ruby/internal/intern/process.h
+update.o: $(hdrdir)/ruby/internal/intern/random.h
+update.o: $(hdrdir)/ruby/internal/intern/range.h
+update.o: $(hdrdir)/ruby/internal/intern/rational.h
+update.o: $(hdrdir)/ruby/internal/intern/re.h
+update.o: $(hdrdir)/ruby/internal/intern/ruby.h
+update.o: $(hdrdir)/ruby/internal/intern/select.h
+update.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+update.o: $(hdrdir)/ruby/internal/intern/signal.h
+update.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+update.o: $(hdrdir)/ruby/internal/intern/string.h
+update.o: $(hdrdir)/ruby/internal/intern/struct.h
+update.o: $(hdrdir)/ruby/internal/intern/thread.h
+update.o: $(hdrdir)/ruby/internal/intern/time.h
+update.o: $(hdrdir)/ruby/internal/intern/variable.h
+update.o: $(hdrdir)/ruby/internal/intern/vm.h
+update.o: $(hdrdir)/ruby/internal/interpreter.h
+update.o: $(hdrdir)/ruby/internal/iterator.h
+update.o: $(hdrdir)/ruby/internal/memory.h
+update.o: $(hdrdir)/ruby/internal/method.h
+update.o: $(hdrdir)/ruby/internal/module.h
+update.o: $(hdrdir)/ruby/internal/newobj.h
+update.o: $(hdrdir)/ruby/internal/rgengc.h
+update.o: $(hdrdir)/ruby/internal/scan_args.h
+update.o: $(hdrdir)/ruby/internal/special_consts.h
+update.o: $(hdrdir)/ruby/internal/static_assert.h
+update.o: $(hdrdir)/ruby/internal/stdalign.h
+update.o: $(hdrdir)/ruby/internal/stdbool.h
+update.o: $(hdrdir)/ruby/internal/symbol.h
+update.o: $(hdrdir)/ruby/internal/token_paste.h
+update.o: $(hdrdir)/ruby/internal/value.h
+update.o: $(hdrdir)/ruby/internal/value_type.h
+update.o: $(hdrdir)/ruby/internal/variable.h
+update.o: $(hdrdir)/ruby/internal/warning_push.h
+update.o: $(hdrdir)/ruby/internal/xmalloc.h
+update.o: $(hdrdir)/ruby/assert.h
+update.o: $(hdrdir)/ruby/backward.h
+update.o: $(hdrdir)/ruby/backward/2/assume.h
+update.o: $(hdrdir)/ruby/backward/2/attributes.h
+update.o: $(hdrdir)/ruby/backward/2/bool.h
+update.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+update.o: $(hdrdir)/ruby/backward/2/inttypes.h
+update.o: $(hdrdir)/ruby/backward/2/limits.h
+update.o: $(hdrdir)/ruby/backward/2/long_long.h
+update.o: $(hdrdir)/ruby/backward/2/stdalign.h
+update.o: $(hdrdir)/ruby/backward/2/stdarg.h
+update.o: $(hdrdir)/ruby/defines.h
+update.o: $(hdrdir)/ruby/intern.h
+update.o: $(hdrdir)/ruby/missing.h
+update.o: $(hdrdir)/ruby/ruby.h
+update.o: $(hdrdir)/ruby/st.h
+update.o: $(hdrdir)/ruby/subst.h
+update.o: update.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/string/capacity.c b/ext/-test-/string/capacity.c
index ba7fb85e9e..cb8d2c2b3a 100644
--- a/ext/-test-/string/capacity.c
+++ b/ext/-test-/string/capacity.c
@@ -1,5 +1,5 @@
 #include "ruby.h"
-#include "internal.h"
+#include "internal/string.h"
 
 static VALUE
 bug_str_capacity(VALUE klass, VALUE str)
@@ -11,7 +11,7 @@ bug_str_capacity(VALUE klass, VALUE str)
 }
 
 void
-Init_capacity(VALUE klass)
+Init_string_capacity(VALUE klass)
 {
     rb_define_singleton_method(klass, "capacity", bug_str_capacity, 1);
 }
diff --git a/ext/-test-/string/coderange.c b/ext/-test-/string/coderange.c
index b93172d72d..bc998ca372 100644
--- a/ext/-test-/string/coderange.c
+++ b/ext/-test-/string/coderange.c
@@ -17,7 +17,7 @@ coderange_int2sym(int coderange)
 	return sym_broken;
     }
     rb_bug("wrong condition of coderange");
-    UNREACHABLE;
+    UNREACHABLE_RETURN(Qnil);
 }
 
 /* return coderange without scan */
@@ -36,12 +36,12 @@ str_coderange_scan(VALUE str)
 }
 
 void
-Init_coderange(VALUE klass)
+Init_string_coderange(VALUE klass)
 {
-    sym_7bit = ID2SYM(rb_intern("7bit"));
-    sym_valid = ID2SYM(rb_intern("valid"));
-    sym_unknown = ID2SYM(rb_intern("unknown"));
-    sym_broken = ID2SYM(rb_intern("broken"));
+    sym_7bit = ID2SYM(rb_intern_const("7bit"));
+    sym_valid = ID2SYM(rb_intern_const("valid"));
+    sym_unknown = ID2SYM(rb_intern_const("unknown"));
+    sym_broken = ID2SYM(rb_intern_const("broken"));
     rb_define_method(klass, "coderange", str_coderange, 0);
     rb_define_method(klass, "coderange_scan", str_coderange_scan, 0);
 }
diff --git a/ext/-test-/string/cstr.c b/ext/-test-/string/cstr.c
index fc47d5206f..4f837998d7 100644
--- a/ext/-test-/string/cstr.c
+++ b/ext/-test-/string/cstr.c
@@ -1,4 +1,6 @@
 #include "internal.h"
+#include "internal/string.h"
+#include "ruby/encoding.h"
 
 static VALUE
 bug_str_cstr_term(VALUE str)
@@ -131,7 +133,7 @@ bug_str_s_rb_str_new_frozen(VALUE self, VALUE str)
 }
 
 void
-Init_cstr(VALUE klass)
+Init_string_cstr(VALUE klass)
 {
     rb_define_method(klass, "cstr_term", bug_str_cstr_term, 0);
     rb_define_method(klass, "cstr_unterm", bug_str_cstr_unterm, 1);
diff --git a/ext/-test-/string/depend b/ext/-test-/string/depend
index e3ce4b6e9c..7db4465bf9 100644
--- a/ext/-test-/string/depend
+++ b/ext/-test-/string/depend
@@ -1,26 +1,329 @@
 # AUTOGENERATED DEPENDENCIES START
 capacity.o: $(RUBY_EXTCONF_H)
 capacity.o: $(arch_hdrdir)/ruby/config.h
+capacity.o: $(hdrdir)/ruby.h
+capacity.o: $(hdrdir)/ruby/assert.h
 capacity.o: $(hdrdir)/ruby/backward.h
+capacity.o: $(hdrdir)/ruby/backward/2/assume.h
+capacity.o: $(hdrdir)/ruby/backward/2/attributes.h
+capacity.o: $(hdrdir)/ruby/backward/2/bool.h
+capacity.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+capacity.o: $(hdrdir)/ruby/backward/2/inttypes.h
+capacity.o: $(hdrdir)/ruby/backward/2/limits.h
+capacity.o: $(hdrdir)/ruby/backward/2/long_long.h
+capacity.o: $(hdrdir)/ruby/backward/2/stdalign.h
+capacity.o: $(hdrdir)/ruby/backward/2/stdarg.h
 capacity.o: $(hdrdir)/ruby/defines.h
 capacity.o: $(hdrdir)/ruby/encoding.h
 capacity.o: $(hdrdir)/ruby/intern.h
-capacity.o: $(hdrdir)/ruby/io.h
+capacity.o: $(hdrdir)/ruby/internal/anyargs.h
+capacity.o: $(hdrdir)/ruby/internal/arithmetic.h
+capacity.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+capacity.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+capacity.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+capacity.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+capacity.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+capacity.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+capacity.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+capacity.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+capacity.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+capacity.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+capacity.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+capacity.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+capacity.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+capacity.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+capacity.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+capacity.o: $(hdrdir)/ruby/internal/assume.h
+capacity.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+capacity.o: $(hdrdir)/ruby/internal/attr/artificial.h
+capacity.o: $(hdrdir)/ruby/internal/attr/cold.h
+capacity.o: $(hdrdir)/ruby/internal/attr/const.h
+capacity.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+capacity.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+capacity.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+capacity.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+capacity.o: $(hdrdir)/ruby/internal/attr/error.h
+capacity.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+capacity.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+capacity.o: $(hdrdir)/ruby/internal/attr/format.h
+capacity.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+capacity.o: $(hdrdir)/ruby/internal/attr/noalias.h
+capacity.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+capacity.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+capacity.o: $(hdrdir)/ruby/internal/attr/noinline.h
+capacity.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+capacity.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+capacity.o: $(hdrdir)/ruby/internal/attr/pure.h
+capacity.o: $(hdrdir)/ruby/internal/attr/restrict.h
+capacity.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+capacity.o: $(hdrdir)/ruby/internal/attr/warning.h
+capacity.o: $(hdrdir)/ruby/internal/attr/weakref.h
+capacity.o: $(hdrdir)/ruby/internal/cast.h
+capacity.o: $(hdrdir)/ruby/internal/compiler_is.h
+capacity.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+capacity.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+capacity.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+capacity.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+capacity.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+capacity.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+capacity.o: $(hdrdir)/ruby/internal/compiler_since.h
+capacity.o: $(hdrdir)/ruby/internal/config.h
+capacity.o: $(hdrdir)/ruby/internal/constant_p.h
+capacity.o: $(hdrdir)/ruby/internal/core.h
+capacity.o: $(hdrdir)/ruby/internal/core/rarray.h
+capacity.o: $(hdrdir)/ruby/internal/core/rbasic.h
+capacity.o: $(hdrdir)/ruby/internal/core/rbignum.h
+capacity.o: $(hdrdir)/ruby/internal/core/rclass.h
+capacity.o: $(hdrdir)/ruby/internal/core/rdata.h
+capacity.o: $(hdrdir)/ruby/internal/core/rfile.h
+capacity.o: $(hdrdir)/ruby/internal/core/rhash.h
+capacity.o: $(hdrdir)/ruby/internal/core/robject.h
+capacity.o: $(hdrdir)/ruby/internal/core/rregexp.h
+capacity.o: $(hdrdir)/ruby/internal/core/rstring.h
+capacity.o: $(hdrdir)/ruby/internal/core/rstruct.h
+capacity.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+capacity.o: $(hdrdir)/ruby/internal/ctype.h
+capacity.o: $(hdrdir)/ruby/internal/dllexport.h
+capacity.o: $(hdrdir)/ruby/internal/dosish.h
+capacity.o: $(hdrdir)/ruby/internal/error.h
+capacity.o: $(hdrdir)/ruby/internal/eval.h
+capacity.o: $(hdrdir)/ruby/internal/event.h
+capacity.o: $(hdrdir)/ruby/internal/fl_type.h
+capacity.o: $(hdrdir)/ruby/internal/gc.h
+capacity.o: $(hdrdir)/ruby/internal/glob.h
+capacity.o: $(hdrdir)/ruby/internal/globals.h
+capacity.o: $(hdrdir)/ruby/internal/has/attribute.h
+capacity.o: $(hdrdir)/ruby/internal/has/builtin.h
+capacity.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+capacity.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+capacity.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+capacity.o: $(hdrdir)/ruby/internal/has/extension.h
+capacity.o: $(hdrdir)/ruby/internal/has/feature.h
+capacity.o: $(hdrdir)/ruby/internal/has/warning.h
+capacity.o: $(hdrdir)/ruby/internal/intern/array.h
+capacity.o: $(hdrdir)/ruby/internal/intern/bignum.h
+capacity.o: $(hdrdir)/ruby/internal/intern/class.h
+capacity.o: $(hdrdir)/ruby/internal/intern/compar.h
+capacity.o: $(hdrdir)/ruby/internal/intern/complex.h
+capacity.o: $(hdrdir)/ruby/internal/intern/cont.h
+capacity.o: $(hdrdir)/ruby/internal/intern/dir.h
+capacity.o: $(hdrdir)/ruby/internal/intern/enum.h
+capacity.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+capacity.o: $(hdrdir)/ruby/internal/intern/error.h
+capacity.o: $(hdrdir)/ruby/internal/intern/eval.h
+capacity.o: $(hdrdir)/ruby/internal/intern/file.h
+capacity.o: $(hdrdir)/ruby/internal/intern/gc.h
+capacity.o: $(hdrdir)/ruby/internal/intern/hash.h
+capacity.o: $(hdrdir)/ruby/internal/intern/io.h
+capacity.o: $(hdrdir)/ruby/internal/intern/load.h
+capacity.o: $(hdrdir)/ruby/internal/intern/marshal.h
+capacity.o: $(hdrdir)/ruby/internal/intern/numeric.h
+capacity.o: $(hdrdir)/ruby/internal/intern/object.h
+capacity.o: $(hdrdir)/ruby/internal/intern/parse.h
+capacity.o: $(hdrdir)/ruby/internal/intern/proc.h
+capacity.o: $(hdrdir)/ruby/internal/intern/process.h
+capacity.o: $(hdrdir)/ruby/internal/intern/random.h
+capacity.o: $(hdrdir)/ruby/internal/intern/range.h
+capacity.o: $(hdrdir)/ruby/internal/intern/rational.h
+capacity.o: $(hdrdir)/ruby/internal/intern/re.h
+capacity.o: $(hdrdir)/ruby/internal/intern/ruby.h
+capacity.o: $(hdrdir)/ruby/internal/intern/select.h
+capacity.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+capacity.o: $(hdrdir)/ruby/internal/intern/signal.h
+capacity.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+capacity.o: $(hdrdir)/ruby/internal/intern/string.h
+capacity.o: $(hdrdir)/ruby/internal/intern/struct.h
+capacity.o: $(hdrdir)/ruby/internal/intern/thread.h
+capacity.o: $(hdrdir)/ruby/internal/intern/time.h
+capacity.o: $(hdrdir)/ruby/internal/intern/variable.h
+capacity.o: $(hdrdir)/ruby/internal/intern/vm.h
+capacity.o: $(hdrdir)/ruby/internal/interpreter.h
+capacity.o: $(hdrdir)/ruby/internal/iterator.h
+capacity.o: $(hdrdir)/ruby/internal/memory.h
+capacity.o: $(hdrdir)/ruby/internal/method.h
+capacity.o: $(hdrdir)/ruby/internal/module.h
+capacity.o: $(hdrdir)/ruby/internal/newobj.h
+capacity.o: $(hdrdir)/ruby/internal/rgengc.h
+capacity.o: $(hdrdir)/ruby/internal/scan_args.h
+capacity.o: $(hdrdir)/ruby/internal/special_consts.h
+capacity.o: $(hdrdir)/ruby/internal/static_assert.h
+capacity.o: $(hdrdir)/ruby/internal/stdalign.h
+capacity.o: $(hdrdir)/ruby/internal/stdbool.h
+capacity.o: $(hdrdir)/ruby/internal/symbol.h
+capacity.o: $(hdrdir)/ruby/internal/token_paste.h
+capacity.o: $(hdrdir)/ruby/internal/value.h
+capacity.o: $(hdrdir)/ruby/internal/value_type.h
+capacity.o: $(hdrdir)/ruby/internal/variable.h
+capacity.o: $(hdrdir)/ruby/internal/warning_push.h
+capacity.o: $(hdrdir)/ruby/internal/xmalloc.h
 capacity.o: $(hdrdir)/ruby/missing.h
+capacity.o: $(hdrdir)/ruby/onigmo.h
 capacity.o: $(hdrdir)/ruby/oniguruma.h
 capacity.o: $(hdrdir)/ruby/ruby.h
 capacity.o: $(hdrdir)/ruby/st.h
 capacity.o: $(hdrdir)/ruby/subst.h
-capacity.o: $(top_srcdir)/include/ruby.h
 capacity.o: $(top_srcdir)/internal.h
+capacity.o: $(top_srcdir)/internal/compilers.h
+capacity.o: $(top_srcdir)/internal/string.h
 capacity.o: capacity.c
 coderange.o: $(RUBY_EXTCONF_H)
 coderange.o: $(arch_hdrdir)/ruby/config.h
+coderange.o: $(hdrdir)/ruby/assert.h
 coderange.o: $(hdrdir)/ruby/backward.h
+coderange.o: $(hdrdir)/ruby/backward/2/assume.h
+coderange.o: $(hdrdir)/ruby/backward/2/attributes.h
+coderange.o: $(hdrdir)/ruby/backward/2/bool.h
+coderange.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+coderange.o: $(hdrdir)/ruby/backward/2/inttypes.h
+coderange.o: $(hdrdir)/ruby/backward/2/limits.h
+coderange.o: $(hdrdir)/ruby/backward/2/long_long.h
+coderange.o: $(hdrdir)/ruby/backward/2/stdalign.h
+coderange.o: $(hdrdir)/ruby/backward/2/stdarg.h
 coderange.o: $(hdrdir)/ruby/defines.h
 coderange.o: $(hdrdir)/ruby/encoding.h
 coderange.o: $(hdrdir)/ruby/intern.h
+coderange.o: $(hdrdir)/ruby/internal/anyargs.h
+coderange.o: $(hdrdir)/ruby/internal/arithmetic.h
+coderange.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+coderange.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+coderange.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+coderange.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+coderange.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+coderange.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+coderange.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+coderange.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+coderange.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+coderange.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+coderange.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+coderange.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+coderange.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+coderange.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+coderange.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+coderange.o: $(hdrdir)/ruby/internal/assume.h
+coderange.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+coderange.o: $(hdrdir)/ruby/internal/attr/artificial.h
+coderange.o: $(hdrdir)/ruby/internal/attr/cold.h
+coderange.o: $(hdrdir)/ruby/internal/attr/const.h
+coderange.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+coderange.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+coderange.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+coderange.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+coderange.o: $(hdrdir)/ruby/internal/attr/error.h
+coderange.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+coderange.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+coderange.o: $(hdrdir)/ruby/internal/attr/format.h
+coderange.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+coderange.o: $(hdrdir)/ruby/internal/attr/noalias.h
+coderange.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+coderange.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+coderange.o: $(hdrdir)/ruby/internal/attr/noinline.h
+coderange.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+coderange.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+coderange.o: $(hdrdir)/ruby/internal/attr/pure.h
+coderange.o: $(hdrdir)/ruby/internal/attr/restrict.h
+coderange.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+coderange.o: $(hdrdir)/ruby/internal/attr/warning.h
+coderange.o: $(hdrdir)/ruby/internal/attr/weakref.h
+coderange.o: $(hdrdir)/ruby/internal/cast.h
+coderange.o: $(hdrdir)/ruby/internal/compiler_is.h
+coderange.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+coderange.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+coderange.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+coderange.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+coderange.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+coderange.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+coderange.o: $(hdrdir)/ruby/internal/compiler_since.h
+coderange.o: $(hdrdir)/ruby/internal/config.h
+coderange.o: $(hdrdir)/ruby/internal/constant_p.h
+coderange.o: $(hdrdir)/ruby/internal/core.h
+coderange.o: $(hdrdir)/ruby/internal/core/rarray.h
+coderange.o: $(hdrdir)/ruby/internal/core/rbasic.h
+coderange.o: $(hdrdir)/ruby/internal/core/rbignum.h
+coderange.o: $(hdrdir)/ruby/internal/core/rclass.h
+coderange.o: $(hdrdir)/ruby/internal/core/rdata.h
+coderange.o: $(hdrdir)/ruby/internal/core/rfile.h
+coderange.o: $(hdrdir)/ruby/internal/core/rhash.h
+coderange.o: $(hdrdir)/ruby/internal/core/robject.h
+coderange.o: $(hdrdir)/ruby/internal/core/rregexp.h
+coderange.o: $(hdrdir)/ruby/internal/core/rstring.h
+coderange.o: $(hdrdir)/ruby/internal/core/rstruct.h
+coderange.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+coderange.o: $(hdrdir)/ruby/internal/ctype.h
+coderange.o: $(hdrdir)/ruby/internal/dllexport.h
+coderange.o: $(hdrdir)/ruby/internal/dosish.h
+coderange.o: $(hdrdir)/ruby/internal/error.h
+coderange.o: $(hdrdir)/ruby/internal/eval.h
+coderange.o: $(hdrdir)/ruby/internal/event.h
+coderange.o: $(hdrdir)/ruby/internal/fl_type.h
+coderange.o: $(hdrdir)/ruby/internal/gc.h
+coderange.o: $(hdrdir)/ruby/internal/glob.h
+coderange.o: $(hdrdir)/ruby/internal/globals.h
+coderange.o: $(hdrdir)/ruby/internal/has/attribute.h
+coderange.o: $(hdrdir)/ruby/internal/has/builtin.h
+coderange.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+coderange.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+coderange.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+coderange.o: $(hdrdir)/ruby/internal/has/extension.h
+coderange.o: $(hdrdir)/ruby/internal/has/feature.h
+coderange.o: $(hdrdir)/ruby/internal/has/warning.h
+coderange.o: $(hdrdir)/ruby/internal/intern/array.h
+coderange.o: $(hdrdir)/ruby/internal/intern/bignum.h
+coderange.o: $(hdrdir)/ruby/internal/intern/class.h
+coderange.o: $(hdrdir)/ruby/internal/intern/compar.h
+coderange.o: $(hdrdir)/ruby/internal/intern/complex.h
+coderange.o: $(hdrdir)/ruby/internal/intern/cont.h
+coderange.o: $(hdrdir)/ruby/internal/intern/dir.h
+coderange.o: $(hdrdir)/ruby/internal/intern/enum.h
+coderange.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+coderange.o: $(hdrdir)/ruby/internal/intern/error.h
+coderange.o: $(hdrdir)/ruby/internal/intern/eval.h
+coderange.o: $(hdrdir)/ruby/internal/intern/file.h
+coderange.o: $(hdrdir)/ruby/internal/intern/gc.h
+coderange.o: $(hdrdir)/ruby/internal/intern/hash.h
+coderange.o: $(hdrdir)/ruby/internal/intern/io.h
+coderange.o: $(hdrdir)/ruby/internal/intern/load.h
+coderange.o: $(hdrdir)/ruby/internal/intern/marshal.h
+coderange.o: $(hdrdir)/ruby/internal/intern/numeric.h
+coderange.o: $(hdrdir)/ruby/internal/intern/object.h
+coderange.o: $(hdrdir)/ruby/internal/intern/parse.h
+coderange.o: $(hdrdir)/ruby/internal/intern/proc.h
+coderange.o: $(hdrdir)/ruby/internal/intern/process.h
+coderange.o: $(hdrdir)/ruby/internal/intern/random.h
+coderange.o: $(hdrdir)/ruby/internal/intern/range.h
+coderange.o: $(hdrdir)/ruby/internal/intern/rational.h
+coderange.o: $(hdrdir)/ruby/internal/intern/re.h
+coderange.o: $(hdrdir)/ruby/internal/intern/ruby.h
+coderange.o: $(hdrdir)/ruby/internal/intern/select.h
+coderange.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+coderange.o: $(hdrdir)/ruby/internal/intern/signal.h
+coderange.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+coderange.o: $(hdrdir)/ruby/internal/intern/string.h
+coderange.o: $(hdrdir)/ruby/internal/intern/struct.h
+coderange.o: $(hdrdir)/ruby/internal/intern/thread.h
+coderange.o: $(hdrdir)/ruby/internal/intern/time.h
+coderange.o: $(hdrdir)/ruby/internal/intern/variable.h
+coderange.o: $(hdrdir)/ruby/internal/intern/vm.h
+coderange.o: $(hdrdir)/ruby/internal/interpreter.h
+coderange.o: $(hdrdir)/ruby/internal/iterator.h
+coderange.o: $(hdrdir)/ruby/internal/memory.h
+coderange.o: $(hdrdir)/ruby/internal/method.h
+coderange.o: $(hdrdir)/ruby/internal/module.h
+coderange.o: $(hdrdir)/ruby/internal/newobj.h
+coderange.o: $(hdrdir)/ruby/internal/rgengc.h
+coderange.o: $(hdrdir)/ruby/internal/scan_args.h
+coderange.o: $(hdrdir)/ruby/internal/special_consts.h
+coderange.o: $(hdrdir)/ruby/internal/static_assert.h
+coderange.o: $(hdrdir)/ruby/internal/stdalign.h
+coderange.o: $(hdrdir)/ruby/internal/stdbool.h
+coderange.o: $(hdrdir)/ruby/internal/symbol.h
+coderange.o: $(hdrdir)/ruby/internal/token_paste.h
+coderange.o: $(hdrdir)/ruby/internal/value.h
+coderange.o: $(hdrdir)/ruby/internal/value_type.h
+coderange.o: $(hdrdir)/ruby/internal/variable.h
+coderange.o: $(hdrdir)/ruby/internal/warning_push.h
+coderange.o: $(hdrdir)/ruby/internal/xmalloc.h
 coderange.o: $(hdrdir)/ruby/missing.h
+coderange.o: $(hdrdir)/ruby/onigmo.h
 coderange.o: $(hdrdir)/ruby/oniguruma.h
 coderange.o: $(hdrdir)/ruby/ruby.h
 coderange.o: $(hdrdir)/ruby/st.h
@@ -28,50 +331,655 @@ coderange.o: $(hdrdir)/ruby/subst.h
 coderange.o: coderange.c
 cstr.o: $(RUBY_EXTCONF_H)
 cstr.o: $(arch_hdrdir)/ruby/config.h
+cstr.o: $(hdrdir)/ruby.h
+cstr.o: $(hdrdir)/ruby/assert.h
 cstr.o: $(hdrdir)/ruby/backward.h
+cstr.o: $(hdrdir)/ruby/backward/2/assume.h
+cstr.o: $(hdrdir)/ruby/backward/2/attributes.h
+cstr.o: $(hdrdir)/ruby/backward/2/bool.h
+cstr.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+cstr.o: $(hdrdir)/ruby/backward/2/inttypes.h
+cstr.o: $(hdrdir)/ruby/backward/2/limits.h
+cstr.o: $(hdrdir)/ruby/backward/2/long_long.h
+cstr.o: $(hdrdir)/ruby/backward/2/stdalign.h
+cstr.o: $(hdrdir)/ruby/backward/2/stdarg.h
 cstr.o: $(hdrdir)/ruby/defines.h
 cstr.o: $(hdrdir)/ruby/encoding.h
 cstr.o: $(hdrdir)/ruby/intern.h
-cstr.o: $(hdrdir)/ruby/io.h
+cstr.o: $(hdrdir)/ruby/internal/anyargs.h
+cstr.o: $(hdrdir)/ruby/internal/arithmetic.h
+cstr.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+cstr.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+cstr.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+cstr.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+cstr.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+cstr.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+cstr.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+cstr.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+cstr.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+cstr.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+cstr.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+cstr.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+cstr.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+cstr.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+cstr.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+cstr.o: $(hdrdir)/ruby/internal/assume.h
+cstr.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+cstr.o: $(hdrdir)/ruby/internal/attr/artificial.h
+cstr.o: $(hdrdir)/ruby/internal/attr/cold.h
+cstr.o: $(hdrdir)/ruby/internal/attr/const.h
+cstr.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+cstr.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+cstr.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+cstr.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+cstr.o: $(hdrdir)/ruby/internal/attr/error.h
+cstr.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+cstr.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+cstr.o: $(hdrdir)/ruby/internal/attr/format.h
+cstr.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+cstr.o: $(hdrdir)/ruby/internal/attr/noalias.h
+cstr.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+cstr.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+cstr.o: $(hdrdir)/ruby/internal/attr/noinline.h
+cstr.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+cstr.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+cstr.o: $(hdrdir)/ruby/internal/attr/pure.h
+cstr.o: $(hdrdir)/ruby/internal/attr/restrict.h
+cstr.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+cstr.o: $(hdrdir)/ruby/internal/attr/warning.h
+cstr.o: $(hdrdir)/ruby/internal/attr/weakref.h
+cstr.o: $(hdrdir)/ruby/internal/cast.h
+cstr.o: $(hdrdir)/ruby/internal/compiler_is.h
+cstr.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+cstr.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+cstr.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+cstr.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+cstr.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+cstr.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+cstr.o: $(hdrdir)/ruby/internal/compiler_since.h
+cstr.o: $(hdrdir)/ruby/internal/config.h
+cstr.o: $(hdrdir)/ruby/internal/constant_p.h
+cstr.o: $(hdrdir)/ruby/internal/core.h
+cstr.o: $(hdrdir)/ruby/internal/core/rarray.h
+cstr.o: $(hdrdir)/ruby/internal/core/rbasic.h
+cstr.o: $(hdrdir)/ruby/internal/core/rbignum.h
+cstr.o: $(hdrdir)/ruby/internal/core/rclass.h
+cstr.o: $(hdrdir)/ruby/internal/core/rdata.h
+cstr.o: $(hdrdir)/ruby/internal/core/rfile.h
+cstr.o: $(hdrdir)/ruby/internal/core/rhash.h
+cstr.o: $(hdrdir)/ruby/internal/core/robject.h
+cstr.o: $(hdrdir)/ruby/internal/core/rregexp.h
+cstr.o: $(hdrdir)/ruby/internal/core/rstring.h
+cstr.o: $(hdrdir)/ruby/internal/core/rstruct.h
+cstr.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+cstr.o: $(hdrdir)/ruby/internal/ctype.h
+cstr.o: $(hdrdir)/ruby/internal/dllexport.h
+cstr.o: $(hdrdir)/ruby/internal/dosish.h
+cstr.o: $(hdrdir)/ruby/internal/error.h
+cstr.o: $(hdrdir)/ruby/internal/eval.h
+cstr.o: $(hdrdir)/ruby/internal/event.h
+cstr.o: $(hdrdir)/ruby/internal/fl_type.h
+cstr.o: $(hdrdir)/ruby/internal/gc.h
+cstr.o: $(hdrdir)/ruby/internal/glob.h
+cstr.o: $(hdrdir)/ruby/internal/globals.h
+cstr.o: $(hdrdir)/ruby/internal/has/attribute.h
+cstr.o: $(hdrdir)/ruby/internal/has/builtin.h
+cstr.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+cstr.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+cstr.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+cstr.o: $(hdrdir)/ruby/internal/has/extension.h
+cstr.o: $(hdrdir)/ruby/internal/has/feature.h
+cstr.o: $(hdrdir)/ruby/internal/has/warning.h
+cstr.o: $(hdrdir)/ruby/internal/intern/array.h
+cstr.o: $(hdrdir)/ruby/internal/intern/bignum.h
+cstr.o: $(hdrdir)/ruby/internal/intern/class.h
+cstr.o: $(hdrdir)/ruby/internal/intern/compar.h
+cstr.o: $(hdrdir)/ruby/internal/intern/complex.h
+cstr.o: $(hdrdir)/ruby/internal/intern/cont.h
+cstr.o: $(hdrdir)/ruby/internal/intern/dir.h
+cstr.o: $(hdrdir)/ruby/internal/intern/enum.h
+cstr.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+cstr.o: $(hdrdir)/ruby/internal/intern/error.h
+cstr.o: $(hdrdir)/ruby/internal/intern/eval.h
+cstr.o: $(hdrdir)/ruby/internal/intern/file.h
+cstr.o: $(hdrdir)/ruby/internal/intern/gc.h
+cstr.o: $(hdrdir)/ruby/internal/intern/hash.h
+cstr.o: $(hdrdir)/ruby/internal/intern/io.h
+cstr.o: $(hdrdir)/ruby/internal/intern/load.h
+cstr.o: $(hdrdir)/ruby/internal/intern/marshal.h
+cstr.o: $(hdrdir)/ruby/internal/intern/numeric.h
+cstr.o: $(hdrdir)/ruby/internal/intern/object.h
+cstr.o: $(hdrdir)/ruby/internal/intern/parse.h
+cstr.o: $(hdrdir)/ruby/internal/intern/proc.h
+cstr.o: $(hdrdir)/ruby/internal/intern/process.h
+cstr.o: $(hdrdir)/ruby/internal/intern/random.h
+cstr.o: $(hdrdir)/ruby/internal/intern/range.h
+cstr.o: $(hdrdir)/ruby/internal/intern/rational.h
+cstr.o: $(hdrdir)/ruby/internal/intern/re.h
+cstr.o: $(hdrdir)/ruby/internal/intern/ruby.h
+cstr.o: $(hdrdir)/ruby/internal/intern/select.h
+cstr.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+cstr.o: $(hdrdir)/ruby/internal/intern/signal.h
+cstr.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+cstr.o: $(hdrdir)/ruby/internal/intern/string.h
+cstr.o: $(hdrdir)/ruby/internal/intern/struct.h
+cstr.o: $(hdrdir)/ruby/internal/intern/thread.h
+cstr.o: $(hdrdir)/ruby/internal/intern/time.h
+cstr.o: $(hdrdir)/ruby/internal/intern/variable.h
+cstr.o: $(hdrdir)/ruby/internal/intern/vm.h
+cstr.o: $(hdrdir)/ruby/internal/interpreter.h
+cstr.o: $(hdrdir)/ruby/internal/iterator.h
+cstr.o: $(hdrdir)/ruby/internal/memory.h
+cstr.o: $(hdrdir)/ruby/internal/method.h
+cstr.o: $(hdrdir)/ruby/internal/module.h
+cstr.o: $(hdrdir)/ruby/internal/newobj.h
+cstr.o: $(hdrdir)/ruby/internal/rgengc.h
+cstr.o: $(hdrdir)/ruby/internal/scan_args.h
+cstr.o: $(hdrdir)/ruby/internal/special_consts.h
+cstr.o: $(hdrdir)/ruby/internal/static_assert.h
+cstr.o: $(hdrdir)/ruby/internal/stdalign.h
+cstr.o: $(hdrdir)/ruby/internal/stdbool.h
+cstr.o: $(hdrdir)/ruby/internal/symbol.h
+cstr.o: $(hdrdir)/ruby/internal/token_paste.h
+cstr.o: $(hdrdir)/ruby/internal/value.h
+cstr.o: $(hdrdir)/ruby/internal/value_type.h
+cstr.o: $(hdrdir)/ruby/internal/variable.h
+cstr.o: $(hdrdir)/ruby/internal/warning_push.h
+cstr.o: $(hdrdir)/ruby/internal/xmalloc.h
 cstr.o: $(hdrdir)/ruby/missing.h
+cstr.o: $(hdrdir)/ruby/onigmo.h
 cstr.o: $(hdrdir)/ruby/oniguruma.h
 cstr.o: $(hdrdir)/ruby/ruby.h
 cstr.o: $(hdrdir)/ruby/st.h
 cstr.o: $(hdrdir)/ruby/subst.h
-cstr.o: $(top_srcdir)/include/ruby.h
 cstr.o: $(top_srcdir)/internal.h
+cstr.o: $(top_srcdir)/internal/compilers.h
+cstr.o: $(top_srcdir)/internal/error.h
+cstr.o: $(top_srcdir)/internal/string.h
 cstr.o: cstr.c
 ellipsize.o: $(RUBY_EXTCONF_H)
 ellipsize.o: $(arch_hdrdir)/ruby/config.h
+ellipsize.o: $(hdrdir)/ruby.h
+ellipsize.o: $(hdrdir)/ruby/assert.h
 ellipsize.o: $(hdrdir)/ruby/backward.h
+ellipsize.o: $(hdrdir)/ruby/backward/2/assume.h
+ellipsize.o: $(hdrdir)/ruby/backward/2/attributes.h
+ellipsize.o: $(hdrdir)/ruby/backward/2/bool.h
+ellipsize.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+ellipsize.o: $(hdrdir)/ruby/backward/2/inttypes.h
+ellipsize.o: $(hdrdir)/ruby/backward/2/limits.h
+ellipsize.o: $(hdrdir)/ruby/backward/2/long_long.h
+ellipsize.o: $(hdrdir)/ruby/backward/2/stdalign.h
+ellipsize.o: $(hdrdir)/ruby/backward/2/stdarg.h
 ellipsize.o: $(hdrdir)/ruby/defines.h
 ellipsize.o: $(hdrdir)/ruby/intern.h
+ellipsize.o: $(hdrdir)/ruby/internal/anyargs.h
+ellipsize.o: $(hdrdir)/ruby/internal/arithmetic.h
+ellipsize.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+ellipsize.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+ellipsize.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+ellipsize.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+ellipsize.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+ellipsize.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+ellipsize.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+ellipsize.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+ellipsize.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+ellipsize.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+ellipsize.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+ellipsize.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+ellipsize.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+ellipsize.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+ellipsize.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+ellipsize.o: $(hdrdir)/ruby/internal/assume.h
+ellipsize.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+ellipsize.o: $(hdrdir)/ruby/internal/attr/artificial.h
+ellipsize.o: $(hdrdir)/ruby/internal/attr/cold.h
+ellipsize.o: $(hdrdir)/ruby/internal/attr/const.h
+ellipsize.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+ellipsize.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+ellipsize.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+ellipsize.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+ellipsize.o: $(hdrdir)/ruby/internal/attr/error.h
+ellipsize.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+ellipsize.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+ellipsize.o: $(hdrdir)/ruby/internal/attr/format.h
+ellipsize.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+ellipsize.o: $(hdrdir)/ruby/internal/attr/noalias.h
+ellipsize.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+ellipsize.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+ellipsize.o: $(hdrdir)/ruby/internal/attr/noinline.h
+ellipsize.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+ellipsize.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+ellipsize.o: $(hdrdir)/ruby/internal/attr/pure.h
+ellipsize.o: $(hdrdir)/ruby/internal/attr/restrict.h
+ellipsize.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+ellipsize.o: $(hdrdir)/ruby/internal/attr/warning.h
+ellipsize.o: $(hdrdir)/ruby/internal/attr/weakref.h
+ellipsize.o: $(hdrdir)/ruby/internal/cast.h
+ellipsize.o: $(hdrdir)/ruby/internal/compiler_is.h
+ellipsize.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+ellipsize.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+ellipsize.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+ellipsize.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+ellipsize.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+ellipsize.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+ellipsize.o: $(hdrdir)/ruby/internal/compiler_since.h
+ellipsize.o: $(hdrdir)/ruby/internal/config.h
+ellipsize.o: $(hdrdir)/ruby/internal/constant_p.h
+ellipsize.o: $(hdrdir)/ruby/internal/core.h
+ellipsize.o: $(hdrdir)/ruby/internal/core/rarray.h
+ellipsize.o: $(hdrdir)/ruby/internal/core/rbasic.h
+ellipsize.o: $(hdrdir)/ruby/internal/core/rbignum.h
+ellipsize.o: $(hdrdir)/ruby/internal/core/rclass.h
+ellipsize.o: $(hdrdir)/ruby/internal/core/rdata.h
+ellipsize.o: $(hdrdir)/ruby/internal/core/rfile.h
+ellipsize.o: $(hdrdir)/ruby/internal/core/rhash.h
+ellipsize.o: $(hdrdir)/ruby/internal/core/robject.h
+ellipsize.o: $(hdrdir)/ruby/internal/core/rregexp.h
+ellipsize.o: $(hdrdir)/ruby/internal/core/rstring.h
+ellipsize.o: $(hdrdir)/ruby/internal/core/rstruct.h
+ellipsize.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+ellipsize.o: $(hdrdir)/ruby/internal/ctype.h
+ellipsize.o: $(hdrdir)/ruby/internal/dllexport.h
+ellipsize.o: $(hdrdir)/ruby/internal/dosish.h
+ellipsize.o: $(hdrdir)/ruby/internal/error.h
+ellipsize.o: $(hdrdir)/ruby/internal/eval.h
+ellipsize.o: $(hdrdir)/ruby/internal/event.h
+ellipsize.o: $(hdrdir)/ruby/internal/fl_type.h
+ellipsize.o: $(hdrdir)/ruby/internal/gc.h
+ellipsize.o: $(hdrdir)/ruby/internal/glob.h
+ellipsize.o: $(hdrdir)/ruby/internal/globals.h
+ellipsize.o: $(hdrdir)/ruby/internal/has/attribute.h
+ellipsize.o: $(hdrdir)/ruby/internal/has/builtin.h
+ellipsize.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+ellipsize.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+ellipsize.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+ellipsize.o: $(hdrdir)/ruby/internal/has/extension.h
+ellipsize.o: $(hdrdir)/ruby/internal/has/feature.h
+ellipsize.o: $(hdrdir)/ruby/internal/has/warning.h
+ellipsize.o: $(hdrdir)/ruby/internal/intern/array.h
+ellipsize.o: $(hdrdir)/ruby/internal/intern/bignum.h
+ellipsize.o: $(hdrdir)/ruby/internal/intern/class.h
+ellipsize.o: $(hdrdir)/ruby/internal/intern/compar.h
+ellipsize.o: $(hdrdir)/ruby/internal/intern/complex.h
+ellipsize.o: $(hdrdir)/ruby/internal/intern/cont.h
+ellipsize.o: $(hdrdir)/ruby/internal/intern/dir.h
+ellipsize.o: $(hdrdir)/ruby/internal/intern/enum.h
+ellipsize.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+ellipsize.o: $(hdrdir)/ruby/internal/intern/error.h
+ellipsize.o: $(hdrdir)/ruby/internal/intern/eval.h
+ellipsize.o: $(hdrdir)/ruby/internal/intern/file.h
+ellipsize.o: $(hdrdir)/ruby/internal/intern/gc.h
+ellipsize.o: $(hdrdir)/ruby/internal/intern/hash.h
+ellipsize.o: $(hdrdir)/ruby/internal/intern/io.h
+ellipsize.o: $(hdrdir)/ruby/internal/intern/load.h
+ellipsize.o: $(hdrdir)/ruby/internal/intern/marshal.h
+ellipsize.o: $(hdrdir)/ruby/internal/intern/numeric.h
+ellipsize.o: $(hdrdir)/ruby/internal/intern/object.h
+ellipsize.o: $(hdrdir)/ruby/internal/intern/parse.h
+ellipsize.o: $(hdrdir)/ruby/internal/intern/proc.h
+ellipsize.o: $(hdrdir)/ruby/internal/intern/process.h
+ellipsize.o: $(hdrdir)/ruby/internal/intern/random.h
+ellipsize.o: $(hdrdir)/ruby/internal/intern/range.h
+ellipsize.o: $(hdrdir)/ruby/internal/intern/rational.h
+ellipsize.o: $(hdrdir)/ruby/internal/intern/re.h
+ellipsize.o: $(hdrdir)/ruby/internal/intern/ruby.h
+ellipsize.o: $(hdrdir)/ruby/internal/intern/select.h
+ellipsize.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ellipsize.o: $(hdrdir)/ruby/internal/intern/signal.h
+ellipsize.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+ellipsize.o: $(hdrdir)/ruby/internal/intern/string.h
+ellipsize.o: $(hdrdir)/ruby/internal/intern/struct.h
+ellipsize.o: $(hdrdir)/ruby/internal/intern/thread.h
+ellipsize.o: $(hdrdir)/ruby/internal/intern/time.h
+ellipsize.o: $(hdrdir)/ruby/internal/intern/variable.h
+ellipsize.o: $(hdrdir)/ruby/internal/intern/vm.h
+ellipsize.o: $(hdrdir)/ruby/internal/interpreter.h
+ellipsize.o: $(hdrdir)/ruby/internal/iterator.h
+ellipsize.o: $(hdrdir)/ruby/internal/memory.h
+ellipsize.o: $(hdrdir)/ruby/internal/method.h
+ellipsize.o: $(hdrdir)/ruby/internal/module.h
+ellipsize.o: $(hdrdir)/ruby/internal/newobj.h
+ellipsize.o: $(hdrdir)/ruby/internal/rgengc.h
+ellipsize.o: $(hdrdir)/ruby/internal/scan_args.h
+ellipsize.o: $(hdrdir)/ruby/internal/special_consts.h
+ellipsize.o: $(hdrdir)/ruby/internal/static_assert.h
+ellipsize.o: $(hdrdir)/ruby/internal/stdalign.h
+ellipsize.o: $(hdrdir)/ruby/internal/stdbool.h
+ellipsize.o: $(hdrdir)/ruby/internal/symbol.h
+ellipsize.o: $(hdrdir)/ruby/internal/token_paste.h
+ellipsize.o: $(hdrdir)/ruby/internal/value.h
+ellipsize.o: $(hdrdir)/ruby/internal/value_type.h
+ellipsize.o: $(hdrdir)/ruby/internal/variable.h
+ellipsize.o: $(hdrdir)/ruby/internal/warning_push.h
+ellipsize.o: $(hdrdir)/ruby/internal/xmalloc.h
 ellipsize.o: $(hdrdir)/ruby/missing.h
 ellipsize.o: $(hdrdir)/ruby/ruby.h
 ellipsize.o: $(hdrdir)/ruby/st.h
 ellipsize.o: $(hdrdir)/ruby/subst.h
-ellipsize.o: $(top_srcdir)/include/ruby.h
 ellipsize.o: ellipsize.c
 enc_associate.o: $(RUBY_EXTCONF_H)
 enc_associate.o: $(arch_hdrdir)/ruby/config.h
+enc_associate.o: $(hdrdir)/ruby.h
+enc_associate.o: $(hdrdir)/ruby/assert.h
 enc_associate.o: $(hdrdir)/ruby/backward.h
+enc_associate.o: $(hdrdir)/ruby/backward/2/assume.h
+enc_associate.o: $(hdrdir)/ruby/backward/2/attributes.h
+enc_associate.o: $(hdrdir)/ruby/backward/2/bool.h
+enc_associate.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+enc_associate.o: $(hdrdir)/ruby/backward/2/inttypes.h
+enc_associate.o: $(hdrdir)/ruby/backward/2/limits.h
+enc_associate.o: $(hdrdir)/ruby/backward/2/long_long.h
+enc_associate.o: $(hdrdir)/ruby/backward/2/stdalign.h
+enc_associate.o: $(hdrdir)/ruby/backward/2/stdarg.h
 enc_associate.o: $(hdrdir)/ruby/defines.h
 enc_associate.o: $(hdrdir)/ruby/encoding.h
 enc_associate.o: $(hdrdir)/ruby/intern.h
+enc_associate.o: $(hdrdir)/ruby/internal/anyargs.h
+enc_associate.o: $(hdrdir)/ruby/internal/arithmetic.h
+enc_associate.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+enc_associate.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+enc_associate.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+enc_associate.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+enc_associate.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+enc_associate.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+enc_associate.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+enc_associate.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+enc_associate.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+enc_associate.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+enc_associate.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+enc_associate.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+enc_associate.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+enc_associate.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+enc_associate.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+enc_associate.o: $(hdrdir)/ruby/internal/assume.h
+enc_associate.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+enc_associate.o: $(hdrdir)/ruby/internal/attr/artificial.h
+enc_associate.o: $(hdrdir)/ruby/internal/attr/cold.h
+enc_associate.o: $(hdrdir)/ruby/internal/attr/const.h
+enc_associate.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+enc_associate.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+enc_associate.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+enc_associate.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+enc_associate.o: $(hdrdir)/ruby/internal/attr/error.h
+enc_associate.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+enc_associate.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+enc_associate.o: $(hdrdir)/ruby/internal/attr/format.h
+enc_associate.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+enc_associate.o: $(hdrdir)/ruby/internal/attr/noalias.h
+enc_associate.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+enc_associate.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+enc_associate.o: $(hdrdir)/ruby/internal/attr/noinline.h
+enc_associate.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+enc_associate.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+enc_associate.o: $(hdrdir)/ruby/internal/attr/pure.h
+enc_associate.o: $(hdrdir)/ruby/internal/attr/restrict.h
+enc_associate.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+enc_associate.o: $(hdrdir)/ruby/internal/attr/warning.h
+enc_associate.o: $(hdrdir)/ruby/internal/attr/weakref.h
+enc_associate.o: $(hdrdir)/ruby/internal/cast.h
+enc_associate.o: $(hdrdir)/ruby/internal/compiler_is.h
+enc_associate.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+enc_associate.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+enc_associate.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+enc_associate.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+enc_associate.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+enc_associate.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+enc_associate.o: $(hdrdir)/ruby/internal/compiler_since.h
+enc_associate.o: $(hdrdir)/ruby/internal/config.h
+enc_associate.o: $(hdrdir)/ruby/internal/constant_p.h
+enc_associate.o: $(hdrdir)/ruby/internal/core.h
+enc_associate.o: $(hdrdir)/ruby/internal/core/rarray.h
+enc_associate.o: $(hdrdir)/ruby/internal/core/rbasic.h
+enc_associate.o: $(hdrdir)/ruby/internal/core/rbignum.h
+enc_associate.o: $(hdrdir)/ruby/internal/core/rclass.h
+enc_associate.o: $(hdrdir)/ruby/internal/core/rdata.h
+enc_associate.o: $(hdrdir)/ruby/internal/core/rfile.h
+enc_associate.o: $(hdrdir)/ruby/internal/core/rhash.h
+enc_associate.o: $(hdrdir)/ruby/internal/core/robject.h
+enc_associate.o: $(hdrdir)/ruby/internal/core/rregexp.h
+enc_associate.o: $(hdrdir)/ruby/internal/core/rstring.h
+enc_associate.o: $(hdrdir)/ruby/internal/core/rstruct.h
+enc_associate.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+enc_associate.o: $(hdrdir)/ruby/internal/ctype.h
+enc_associate.o: $(hdrdir)/ruby/internal/dllexport.h
+enc_associate.o: $(hdrdir)/ruby/internal/dosish.h
+enc_associate.o: $(hdrdir)/ruby/internal/error.h
+enc_associate.o: $(hdrdir)/ruby/internal/eval.h
+enc_associate.o: $(hdrdir)/ruby/internal/event.h
+enc_associate.o: $(hdrdir)/ruby/internal/fl_type.h
+enc_associate.o: $(hdrdir)/ruby/internal/gc.h
+enc_associate.o: $(hdrdir)/ruby/internal/glob.h
+enc_associate.o: $(hdrdir)/ruby/internal/globals.h
+enc_associate.o: $(hdrdir)/ruby/internal/has/attribute.h
+enc_associate.o: $(hdrdir)/ruby/internal/has/builtin.h
+enc_associate.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+enc_associate.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+enc_associate.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+enc_associate.o: $(hdrdir)/ruby/internal/has/extension.h
+enc_associate.o: $(hdrdir)/ruby/internal/has/feature.h
+enc_associate.o: $(hdrdir)/ruby/internal/has/warning.h
+enc_associate.o: $(hdrdir)/ruby/internal/intern/array.h
+enc_associate.o: $(hdrdir)/ruby/internal/intern/bignum.h
+enc_associate.o: $(hdrdir)/ruby/internal/intern/class.h
+enc_associate.o: $(hdrdir)/ruby/internal/intern/compar.h
+enc_associate.o: $(hdrdir)/ruby/internal/intern/complex.h
+enc_associate.o: $(hdrdir)/ruby/internal/intern/cont.h
+enc_associate.o: $(hdrdir)/ruby/internal/intern/dir.h
+enc_associate.o: $(hdrdir)/ruby/internal/intern/enum.h
+enc_associate.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+enc_associate.o: $(hdrdir)/ruby/internal/intern/error.h
+enc_associate.o: $(hdrdir)/ruby/internal/intern/eval.h
+enc_associate.o: $(hdrdir)/ruby/internal/intern/file.h
+enc_associate.o: $(hdrdir)/ruby/internal/intern/gc.h
+enc_associate.o: $(hdrdir)/ruby/internal/intern/hash.h
+enc_associate.o: $(hdrdir)/ruby/internal/intern/io.h
+enc_associate.o: $(hdrdir)/ruby/internal/intern/load.h
+enc_associate.o: $(hdrdir)/ruby/internal/intern/marshal.h
+enc_associate.o: $(hdrdir)/ruby/internal/intern/numeric.h
+enc_associate.o: $(hdrdir)/ruby/internal/intern/object.h
+enc_associate.o: $(hdrdir)/ruby/internal/intern/parse.h
+enc_associate.o: $(hdrdir)/ruby/internal/intern/proc.h
+enc_associate.o: $(hdrdir)/ruby/internal/intern/process.h
+enc_associate.o: $(hdrdir)/ruby/internal/intern/random.h
+enc_associate.o: $(hdrdir)/ruby/internal/intern/range.h
+enc_associate.o: $(hdrdir)/ruby/internal/intern/rational.h
+enc_associate.o: $(hdrdir)/ruby/internal/intern/re.h
+enc_associate.o: $(hdrdir)/ruby/internal/intern/ruby.h
+enc_associate.o: $(hdrdir)/ruby/internal/intern/select.h
+enc_associate.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+enc_associate.o: $(hdrdir)/ruby/internal/intern/signal.h
+enc_associate.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+enc_associate.o: $(hdrdir)/ruby/internal/intern/string.h
+enc_associate.o: $(hdrdir)/ruby/internal/intern/struct.h
+enc_associate.o: $(hdrdir)/ruby/internal/intern/thread.h
+enc_associate.o: $(hdrdir)/ruby/internal/intern/time.h
+enc_associate.o: $(hdrdir)/ruby/internal/intern/variable.h
+enc_associate.o: $(hdrdir)/ruby/internal/intern/vm.h
+enc_associate.o: $(hdrdir)/ruby/internal/interpreter.h
+enc_associate.o: $(hdrdir)/ruby/internal/iterator.h
+enc_associate.o: $(hdrdir)/ruby/internal/memory.h
+enc_associate.o: $(hdrdir)/ruby/internal/method.h
+enc_associate.o: $(hdrdir)/ruby/internal/module.h
+enc_associate.o: $(hdrdir)/ruby/internal/newobj.h
+enc_associate.o: $(hdrdir)/ruby/internal/rgengc.h
+enc_associate.o: $(hdrdir)/ruby/internal/scan_args.h
+enc_associate.o: $(hdrdir)/ruby/internal/special_consts.h
+enc_associate.o: $(hdrdir)/ruby/internal/static_assert.h
+enc_associate.o: $(hdrdir)/ruby/internal/stdalign.h
+enc_associate.o: $(hdrdir)/ruby/internal/stdbool.h
+enc_associate.o: $(hdrdir)/ruby/internal/symbol.h
+enc_associate.o: $(hdrdir)/ruby/internal/token_paste.h
+enc_associate.o: $(hdrdir)/ruby/internal/value.h
+enc_associate.o: $(hdrdir)/ruby/internal/value_type.h
+enc_associate.o: $(hdrdir)/ruby/internal/variable.h
+enc_associate.o: $(hdrdir)/ruby/internal/warning_push.h
+enc_associate.o: $(hdrdir)/ruby/internal/xmalloc.h
 enc_associate.o: $(hdrdir)/ruby/missing.h
+enc_associate.o: $(hdrdir)/ruby/onigmo.h
 enc_associate.o: $(hdrdir)/ruby/oniguruma.h
 enc_associate.o: $(hdrdir)/ruby/ruby.h
 enc_associate.o: $(hdrdir)/ruby/st.h
 enc_associate.o: $(hdrdir)/ruby/subst.h
-enc_associate.o: $(top_srcdir)/include/ruby.h
 enc_associate.o: enc_associate.c
 enc_str_buf_cat.o: $(RUBY_EXTCONF_H)
 enc_str_buf_cat.o: $(arch_hdrdir)/ruby/config.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/assert.h
 enc_str_buf_cat.o: $(hdrdir)/ruby/backward.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/backward/2/assume.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/backward/2/attributes.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/backward/2/bool.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/backward/2/inttypes.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/backward/2/limits.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/backward/2/long_long.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/backward/2/stdalign.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/backward/2/stdarg.h
 enc_str_buf_cat.o: $(hdrdir)/ruby/defines.h
 enc_str_buf_cat.o: $(hdrdir)/ruby/encoding.h
 enc_str_buf_cat.o: $(hdrdir)/ruby/intern.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/anyargs.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/arithmetic.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/assume.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/attr/artificial.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/attr/cold.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/attr/const.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/attr/error.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/attr/format.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/attr/noalias.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/attr/noinline.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/attr/pure.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/attr/restrict.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/attr/warning.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/attr/weakref.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/cast.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/compiler_is.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/compiler_since.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/config.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/constant_p.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/core.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/core/rarray.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/core/rbasic.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/core/rbignum.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/core/rclass.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/core/rdata.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/core/rfile.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/core/rhash.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/core/robject.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/core/rregexp.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/core/rstring.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/core/rstruct.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/ctype.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/dllexport.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/dosish.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/error.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/eval.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/event.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/fl_type.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/gc.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/glob.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/globals.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/has/attribute.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/has/builtin.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/has/extension.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/has/feature.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/has/warning.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/array.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/bignum.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/class.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/compar.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/complex.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/cont.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/dir.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/enum.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/error.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/eval.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/file.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/gc.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/hash.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/io.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/load.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/marshal.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/numeric.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/object.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/parse.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/proc.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/process.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/random.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/range.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/rational.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/re.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/ruby.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/select.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/signal.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/string.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/struct.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/thread.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/time.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/variable.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/intern/vm.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/interpreter.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/iterator.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/memory.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/method.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/module.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/newobj.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/rgengc.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/scan_args.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/special_consts.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/static_assert.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/stdalign.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/stdbool.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/symbol.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/token_paste.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/value.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/value_type.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/variable.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/warning_push.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/internal/xmalloc.h
 enc_str_buf_cat.o: $(hdrdir)/ruby/missing.h
+enc_str_buf_cat.o: $(hdrdir)/ruby/onigmo.h
 enc_str_buf_cat.o: $(hdrdir)/ruby/oniguruma.h
 enc_str_buf_cat.o: $(hdrdir)/ruby/ruby.h
 enc_str_buf_cat.o: $(hdrdir)/ruby/st.h
@@ -79,86 +987,1627 @@ enc_str_buf_cat.o: $(hdrdir)/ruby/subst.h
 enc_str_buf_cat.o: enc_str_buf_cat.c
 fstring.o: $(RUBY_EXTCONF_H)
 fstring.o: $(arch_hdrdir)/ruby/config.h
+fstring.o: $(hdrdir)/ruby.h
+fstring.o: $(hdrdir)/ruby/assert.h
 fstring.o: $(hdrdir)/ruby/backward.h
+fstring.o: $(hdrdir)/ruby/backward/2/assume.h
+fstring.o: $(hdrdir)/ruby/backward/2/attributes.h
+fstring.o: $(hdrdir)/ruby/backward/2/bool.h
+fstring.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+fstring.o: $(hdrdir)/ruby/backward/2/inttypes.h
+fstring.o: $(hdrdir)/ruby/backward/2/limits.h
+fstring.o: $(hdrdir)/ruby/backward/2/long_long.h
+fstring.o: $(hdrdir)/ruby/backward/2/stdalign.h
+fstring.o: $(hdrdir)/ruby/backward/2/stdarg.h
 fstring.o: $(hdrdir)/ruby/defines.h
+fstring.o: $(hdrdir)/ruby/encoding.h
 fstring.o: $(hdrdir)/ruby/intern.h
+fstring.o: $(hdrdir)/ruby/internal/anyargs.h
+fstring.o: $(hdrdir)/ruby/internal/arithmetic.h
+fstring.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+fstring.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+fstring.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+fstring.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+fstring.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+fstring.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+fstring.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+fstring.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+fstring.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+fstring.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+fstring.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+fstring.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+fstring.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+fstring.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+fstring.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+fstring.o: $(hdrdir)/ruby/internal/assume.h
+fstring.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+fstring.o: $(hdrdir)/ruby/internal/attr/artificial.h
+fstring.o: $(hdrdir)/ruby/internal/attr/cold.h
+fstring.o: $(hdrdir)/ruby/internal/attr/const.h
+fstring.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+fstring.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+fstring.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+fstring.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+fstring.o: $(hdrdir)/ruby/internal/attr/error.h
+fstring.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+fstring.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+fstring.o: $(hdrdir)/ruby/internal/attr/format.h
+fstring.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+fstring.o: $(hdrdir)/ruby/internal/attr/noalias.h
+fstring.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+fstring.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+fstring.o: $(hdrdir)/ruby/internal/attr/noinline.h
+fstring.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+fstring.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+fstring.o: $(hdrdir)/ruby/internal/attr/pure.h
+fstring.o: $(hdrdir)/ruby/internal/attr/restrict.h
+fstring.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+fstring.o: $(hdrdir)/ruby/internal/attr/warning.h
+fstring.o: $(hdrdir)/ruby/internal/attr/weakref.h
+fstring.o: $(hdrdir)/ruby/internal/cast.h
+fstring.o: $(hdrdir)/ruby/internal/compiler_is.h
+fstring.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+fstring.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+fstring.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+fstring.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+fstring.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+fstring.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+fstring.o: $(hdrdir)/ruby/internal/compiler_since.h
+fstring.o: $(hdrdir)/ruby/internal/config.h
+fstring.o: $(hdrdir)/ruby/internal/constant_p.h
+fstring.o: $(hdrdir)/ruby/internal/core.h
+fstring.o: $(hdrdir)/ruby/internal/core/rarray.h
+fstring.o: $(hdrdir)/ruby/internal/core/rbasic.h
+fstring.o: $(hdrdir)/ruby/internal/core/rbignum.h
+fstring.o: $(hdrdir)/ruby/internal/core/rclass.h
+fstring.o: $(hdrdir)/ruby/internal/core/rdata.h
+fstring.o: $(hdrdir)/ruby/internal/core/rfile.h
+fstring.o: $(hdrdir)/ruby/internal/core/rhash.h
+fstring.o: $(hdrdir)/ruby/internal/core/robject.h
+fstring.o: $(hdrdir)/ruby/internal/core/rregexp.h
+fstring.o: $(hdrdir)/ruby/internal/core/rstring.h
+fstring.o: $(hdrdir)/ruby/internal/core/rstruct.h
+fstring.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+fstring.o: $(hdrdir)/ruby/internal/ctype.h
+fstring.o: $(hdrdir)/ruby/internal/dllexport.h
+fstring.o: $(hdrdir)/ruby/internal/dosish.h
+fstring.o: $(hdrdir)/ruby/internal/error.h
+fstring.o: $(hdrdir)/ruby/internal/eval.h
+fstring.o: $(hdrdir)/ruby/internal/event.h
+fstring.o: $(hdrdir)/ruby/internal/fl_type.h
+fstring.o: $(hdrdir)/ruby/internal/gc.h
+fstring.o: $(hdrdir)/ruby/internal/glob.h
+fstring.o: $(hdrdir)/ruby/internal/globals.h
+fstring.o: $(hdrdir)/ruby/internal/has/attribute.h
+fstring.o: $(hdrdir)/ruby/internal/has/builtin.h
+fstring.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+fstring.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+fstring.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+fstring.o: $(hdrdir)/ruby/internal/has/extension.h
+fstring.o: $(hdrdir)/ruby/internal/has/feature.h
+fstring.o: $(hdrdir)/ruby/internal/has/warning.h
+fstring.o: $(hdrdir)/ruby/internal/intern/array.h
+fstring.o: $(hdrdir)/ruby/internal/intern/bignum.h
+fstring.o: $(hdrdir)/ruby/internal/intern/class.h
+fstring.o: $(hdrdir)/ruby/internal/intern/compar.h
+fstring.o: $(hdrdir)/ruby/internal/intern/complex.h
+fstring.o: $(hdrdir)/ruby/internal/intern/cont.h
+fstring.o: $(hdrdir)/ruby/internal/intern/dir.h
+fstring.o: $(hdrdir)/ruby/internal/intern/enum.h
+fstring.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+fstring.o: $(hdrdir)/ruby/internal/intern/error.h
+fstring.o: $(hdrdir)/ruby/internal/intern/eval.h
+fstring.o: $(hdrdir)/ruby/internal/intern/file.h
+fstring.o: $(hdrdir)/ruby/internal/intern/gc.h
+fstring.o: $(hdrdir)/ruby/internal/intern/hash.h
+fstring.o: $(hdrdir)/ruby/internal/intern/io.h
+fstring.o: $(hdrdir)/ruby/internal/intern/load.h
+fstring.o: $(hdrdir)/ruby/internal/intern/marshal.h
+fstring.o: $(hdrdir)/ruby/internal/intern/numeric.h
+fstring.o: $(hdrdir)/ruby/internal/intern/object.h
+fstring.o: $(hdrdir)/ruby/internal/intern/parse.h
+fstring.o: $(hdrdir)/ruby/internal/intern/proc.h
+fstring.o: $(hdrdir)/ruby/internal/intern/process.h
+fstring.o: $(hdrdir)/ruby/internal/intern/random.h
+fstring.o: $(hdrdir)/ruby/internal/intern/range.h
+fstring.o: $(hdrdir)/ruby/internal/intern/rational.h
+fstring.o: $(hdrdir)/ruby/internal/intern/re.h
+fstring.o: $(hdrdir)/ruby/internal/intern/ruby.h
+fstring.o: $(hdrdir)/ruby/internal/intern/select.h
+fstring.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+fstring.o: $(hdrdir)/ruby/internal/intern/signal.h
+fstring.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+fstring.o: $(hdrdir)/ruby/internal/intern/string.h
+fstring.o: $(hdrdir)/ruby/internal/intern/struct.h
+fstring.o: $(hdrdir)/ruby/internal/intern/thread.h
+fstring.o: $(hdrdir)/ruby/internal/intern/time.h
+fstring.o: $(hdrdir)/ruby/internal/intern/variable.h
+fstring.o: $(hdrdir)/ruby/internal/intern/vm.h
+fstring.o: $(hdrdir)/ruby/internal/interpreter.h
+fstring.o: $(hdrdir)/ruby/internal/iterator.h
+fstring.o: $(hdrdir)/ruby/internal/memory.h
+fstring.o: $(hdrdir)/ruby/internal/method.h
+fstring.o: $(hdrdir)/ruby/internal/module.h
+fstring.o: $(hdrdir)/ruby/internal/newobj.h
+fstring.o: $(hdrdir)/ruby/internal/rgengc.h
+fstring.o: $(hdrdir)/ruby/internal/scan_args.h
+fstring.o: $(hdrdir)/ruby/internal/special_consts.h
+fstring.o: $(hdrdir)/ruby/internal/static_assert.h
+fstring.o: $(hdrdir)/ruby/internal/stdalign.h
+fstring.o: $(hdrdir)/ruby/internal/stdbool.h
+fstring.o: $(hdrdir)/ruby/internal/symbol.h
+fstring.o: $(hdrdir)/ruby/internal/token_paste.h
+fstring.o: $(hdrdir)/ruby/internal/value.h
+fstring.o: $(hdrdir)/ruby/internal/value_type.h
+fstring.o: $(hdrdir)/ruby/internal/variable.h
+fstring.o: $(hdrdir)/ruby/internal/warning_push.h
+fstring.o: $(hdrdir)/ruby/internal/xmalloc.h
 fstring.o: $(hdrdir)/ruby/missing.h
+fstring.o: $(hdrdir)/ruby/onigmo.h
+fstring.o: $(hdrdir)/ruby/oniguruma.h
 fstring.o: $(hdrdir)/ruby/ruby.h
 fstring.o: $(hdrdir)/ruby/st.h
 fstring.o: $(hdrdir)/ruby/subst.h
-fstring.o: $(top_srcdir)/include/ruby.h
 fstring.o: fstring.c
 init.o: $(RUBY_EXTCONF_H)
 init.o: $(arch_hdrdir)/ruby/config.h
+init.o: $(hdrdir)/ruby.h
+init.o: $(hdrdir)/ruby/assert.h
 init.o: $(hdrdir)/ruby/backward.h
+init.o: $(hdrdir)/ruby/backward/2/assume.h
+init.o: $(hdrdir)/ruby/backward/2/attributes.h
+init.o: $(hdrdir)/ruby/backward/2/bool.h
+init.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+init.o: $(hdrdir)/ruby/backward/2/inttypes.h
+init.o: $(hdrdir)/ruby/backward/2/limits.h
+init.o: $(hdrdir)/ruby/backward/2/long_long.h
+init.o: $(hdrdir)/ruby/backward/2/stdalign.h
+init.o: $(hdrdir)/ruby/backward/2/stdarg.h
 init.o: $(hdrdir)/ruby/defines.h
 init.o: $(hdrdir)/ruby/intern.h
+init.o: $(hdrdir)/ruby/internal/anyargs.h
+init.o: $(hdrdir)/ruby/internal/arithmetic.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+init.o: $(hdrdir)/ruby/internal/assume.h
+init.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+init.o: $(hdrdir)/ruby/internal/attr/artificial.h
+init.o: $(hdrdir)/ruby/internal/attr/cold.h
+init.o: $(hdrdir)/ruby/internal/attr/const.h
+init.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+init.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+init.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+init.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+init.o: $(hdrdir)/ruby/internal/attr/error.h
+init.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+init.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+init.o: $(hdrdir)/ruby/internal/attr/format.h
+init.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+init.o: $(hdrdir)/ruby/internal/attr/noalias.h
+init.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+init.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+init.o: $(hdrdir)/ruby/internal/attr/noinline.h
+init.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+init.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+init.o: $(hdrdir)/ruby/internal/attr/pure.h
+init.o: $(hdrdir)/ruby/internal/attr/restrict.h
+init.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+init.o: $(hdrdir)/ruby/internal/attr/warning.h
+init.o: $(hdrdir)/ruby/internal/attr/weakref.h
+init.o: $(hdrdir)/ruby/internal/cast.h
+init.o: $(hdrdir)/ruby/internal/compiler_is.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+init.o: $(hdrdir)/ruby/internal/compiler_since.h
+init.o: $(hdrdir)/ruby/internal/config.h
+init.o: $(hdrdir)/ruby/internal/constant_p.h
+init.o: $(hdrdir)/ruby/internal/core.h
+init.o: $(hdrdir)/ruby/internal/core/rarray.h
+init.o: $(hdrdir)/ruby/internal/core/rbasic.h
+init.o: $(hdrdir)/ruby/internal/core/rbignum.h
+init.o: $(hdrdir)/ruby/internal/core/rclass.h
+init.o: $(hdrdir)/ruby/internal/core/rdata.h
+init.o: $(hdrdir)/ruby/internal/core/rfile.h
+init.o: $(hdrdir)/ruby/internal/core/rhash.h
+init.o: $(hdrdir)/ruby/internal/core/robject.h
+init.o: $(hdrdir)/ruby/internal/core/rregexp.h
+init.o: $(hdrdir)/ruby/internal/core/rstring.h
+init.o: $(hdrdir)/ruby/internal/core/rstruct.h
+init.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+init.o: $(hdrdir)/ruby/internal/ctype.h
+init.o: $(hdrdir)/ruby/internal/dllexport.h
+init.o: $(hdrdir)/ruby/internal/dosish.h
+init.o: $(hdrdir)/ruby/internal/error.h
+init.o: $(hdrdir)/ruby/internal/eval.h
+init.o: $(hdrdir)/ruby/internal/event.h
+init.o: $(hdrdir)/ruby/internal/fl_type.h
+init.o: $(hdrdir)/ruby/internal/gc.h
+init.o: $(hdrdir)/ruby/internal/glob.h
+init.o: $(hdrdir)/ruby/internal/globals.h
+init.o: $(hdrdir)/ruby/internal/has/attribute.h
+init.o: $(hdrdir)/ruby/internal/has/builtin.h
+init.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/extension.h
+init.o: $(hdrdir)/ruby/internal/has/feature.h
+init.o: $(hdrdir)/ruby/internal/has/warning.h
+init.o: $(hdrdir)/ruby/internal/intern/array.h
+init.o: $(hdrdir)/ruby/internal/intern/bignum.h
+init.o: $(hdrdir)/ruby/internal/intern/class.h
+init.o: $(hdrdir)/ruby/internal/intern/compar.h
+init.o: $(hdrdir)/ruby/internal/intern/complex.h
+init.o: $(hdrdir)/ruby/internal/intern/cont.h
+init.o: $(hdrdir)/ruby/internal/intern/dir.h
+init.o: $(hdrdir)/ruby/internal/intern/enum.h
+init.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+init.o: $(hdrdir)/ruby/internal/intern/error.h
+init.o: $(hdrdir)/ruby/internal/intern/eval.h
+init.o: $(hdrdir)/ruby/internal/intern/file.h
+init.o: $(hdrdir)/ruby/internal/intern/gc.h
+init.o: $(hdrdir)/ruby/internal/intern/hash.h
+init.o: $(hdrdir)/ruby/internal/intern/io.h
+init.o: $(hdrdir)/ruby/internal/intern/load.h
+init.o: $(hdrdir)/ruby/internal/intern/marshal.h
+init.o: $(hdrdir)/ruby/internal/intern/numeric.h
+init.o: $(hdrdir)/ruby/internal/intern/object.h
+init.o: $(hdrdir)/ruby/internal/intern/parse.h
+init.o: $(hdrdir)/ruby/internal/intern/proc.h
+init.o: $(hdrdir)/ruby/internal/intern/process.h
+init.o: $(hdrdir)/ruby/internal/intern/random.h
+init.o: $(hdrdir)/ruby/internal/intern/range.h
+init.o: $(hdrdir)/ruby/internal/intern/rational.h
+init.o: $(hdrdir)/ruby/internal/intern/re.h
+init.o: $(hdrdir)/ruby/internal/intern/ruby.h
+init.o: $(hdrdir)/ruby/internal/intern/select.h
+init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+init.o: $(hdrdir)/ruby/internal/intern/signal.h
+init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+init.o: $(hdrdir)/ruby/internal/intern/string.h
+init.o: $(hdrdir)/ruby/internal/intern/struct.h
+init.o: $(hdrdir)/ruby/internal/intern/thread.h
+init.o: $(hdrdir)/ruby/internal/intern/time.h
+init.o: $(hdrdir)/ruby/internal/intern/variable.h
+init.o: $(hdrdir)/ruby/internal/intern/vm.h
+init.o: $(hdrdir)/ruby/internal/interpreter.h
+init.o: $(hdrdir)/ruby/internal/iterator.h
+init.o: $(hdrdir)/ruby/internal/memory.h
+init.o: $(hdrdir)/ruby/internal/method.h
+init.o: $(hdrdir)/ruby/internal/module.h
+init.o: $(hdrdir)/ruby/internal/newobj.h
+init.o: $(hdrdir)/ruby/internal/rgengc.h
+init.o: $(hdrdir)/ruby/internal/scan_args.h
+init.o: $(hdrdir)/ruby/internal/special_consts.h
+init.o: $(hdrdir)/ruby/internal/static_assert.h
+init.o: $(hdrdir)/ruby/internal/stdalign.h
+init.o: $(hdrdir)/ruby/internal/stdbool.h
+init.o: $(hdrdir)/ruby/internal/symbol.h
+init.o: $(hdrdir)/ruby/internal/token_paste.h
+init.o: $(hdrdir)/ruby/internal/value.h
+init.o: $(hdrdir)/ruby/internal/value_type.h
+init.o: $(hdrdir)/ruby/internal/variable.h
+init.o: $(hdrdir)/ruby/internal/warning_push.h
+init.o: $(hdrdir)/ruby/internal/xmalloc.h
 init.o: $(hdrdir)/ruby/missing.h
 init.o: $(hdrdir)/ruby/ruby.h
 init.o: $(hdrdir)/ruby/st.h
 init.o: $(hdrdir)/ruby/subst.h
-init.o: $(top_srcdir)/include/ruby.h
 init.o: init.c
 modify.o: $(RUBY_EXTCONF_H)
 modify.o: $(arch_hdrdir)/ruby/config.h
+modify.o: $(hdrdir)/ruby.h
+modify.o: $(hdrdir)/ruby/assert.h
 modify.o: $(hdrdir)/ruby/backward.h
+modify.o: $(hdrdir)/ruby/backward/2/assume.h
+modify.o: $(hdrdir)/ruby/backward/2/attributes.h
+modify.o: $(hdrdir)/ruby/backward/2/bool.h
+modify.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+modify.o: $(hdrdir)/ruby/backward/2/inttypes.h
+modify.o: $(hdrdir)/ruby/backward/2/limits.h
+modify.o: $(hdrdir)/ruby/backward/2/long_long.h
+modify.o: $(hdrdir)/ruby/backward/2/stdalign.h
+modify.o: $(hdrdir)/ruby/backward/2/stdarg.h
 modify.o: $(hdrdir)/ruby/defines.h
 modify.o: $(hdrdir)/ruby/intern.h
+modify.o: $(hdrdir)/ruby/internal/anyargs.h
+modify.o: $(hdrdir)/ruby/internal/arithmetic.h
+modify.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+modify.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+modify.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+modify.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+modify.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+modify.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+modify.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+modify.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+modify.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+modify.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+modify.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+modify.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+modify.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+modify.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+modify.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+modify.o: $(hdrdir)/ruby/internal/assume.h
+modify.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+modify.o: $(hdrdir)/ruby/internal/attr/artificial.h
+modify.o: $(hdrdir)/ruby/internal/attr/cold.h
+modify.o: $(hdrdir)/ruby/internal/attr/const.h
+modify.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+modify.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+modify.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+modify.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+modify.o: $(hdrdir)/ruby/internal/attr/error.h
+modify.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+modify.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+modify.o: $(hdrdir)/ruby/internal/attr/format.h
+modify.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+modify.o: $(hdrdir)/ruby/internal/attr/noalias.h
+modify.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+modify.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+modify.o: $(hdrdir)/ruby/internal/attr/noinline.h
+modify.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+modify.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+modify.o: $(hdrdir)/ruby/internal/attr/pure.h
+modify.o: $(hdrdir)/ruby/internal/attr/restrict.h
+modify.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+modify.o: $(hdrdir)/ruby/internal/attr/warning.h
+modify.o: $(hdrdir)/ruby/internal/attr/weakref.h
+modify.o: $(hdrdir)/ruby/internal/cast.h
+modify.o: $(hdrdir)/ruby/internal/compiler_is.h
+modify.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+modify.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+modify.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+modify.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+modify.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+modify.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+modify.o: $(hdrdir)/ruby/internal/compiler_since.h
+modify.o: $(hdrdir)/ruby/internal/config.h
+modify.o: $(hdrdir)/ruby/internal/constant_p.h
+modify.o: $(hdrdir)/ruby/internal/core.h
+modify.o: $(hdrdir)/ruby/internal/core/rarray.h
+modify.o: $(hdrdir)/ruby/internal/core/rbasic.h
+modify.o: $(hdrdir)/ruby/internal/core/rbignum.h
+modify.o: $(hdrdir)/ruby/internal/core/rclass.h
+modify.o: $(hdrdir)/ruby/internal/core/rdata.h
+modify.o: $(hdrdir)/ruby/internal/core/rfile.h
+modify.o: $(hdrdir)/ruby/internal/core/rhash.h
+modify.o: $(hdrdir)/ruby/internal/core/robject.h
+modify.o: $(hdrdir)/ruby/internal/core/rregexp.h
+modify.o: $(hdrdir)/ruby/internal/core/rstring.h
+modify.o: $(hdrdir)/ruby/internal/core/rstruct.h
+modify.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+modify.o: $(hdrdir)/ruby/internal/ctype.h
+modify.o: $(hdrdir)/ruby/internal/dllexport.h
+modify.o: $(hdrdir)/ruby/internal/dosish.h
+modify.o: $(hdrdir)/ruby/internal/error.h
+modify.o: $(hdrdir)/ruby/internal/eval.h
+modify.o: $(hdrdir)/ruby/internal/event.h
+modify.o: $(hdrdir)/ruby/internal/fl_type.h
+modify.o: $(hdrdir)/ruby/internal/gc.h
+modify.o: $(hdrdir)/ruby/internal/glob.h
+modify.o: $(hdrdir)/ruby/internal/globals.h
+modify.o: $(hdrdir)/ruby/internal/has/attribute.h
+modify.o: $(hdrdir)/ruby/internal/has/builtin.h
+modify.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+modify.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+modify.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+modify.o: $(hdrdir)/ruby/internal/has/extension.h
+modify.o: $(hdrdir)/ruby/internal/has/feature.h
+modify.o: $(hdrdir)/ruby/internal/has/warning.h
+modify.o: $(hdrdir)/ruby/internal/intern/array.h
+modify.o: $(hdrdir)/ruby/internal/intern/bignum.h
+modify.o: $(hdrdir)/ruby/internal/intern/class.h
+modify.o: $(hdrdir)/ruby/internal/intern/compar.h
+modify.o: $(hdrdir)/ruby/internal/intern/complex.h
+modify.o: $(hdrdir)/ruby/internal/intern/cont.h
+modify.o: $(hdrdir)/ruby/internal/intern/dir.h
+modify.o: $(hdrdir)/ruby/internal/intern/enum.h
+modify.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+modify.o: $(hdrdir)/ruby/internal/intern/error.h
+modify.o: $(hdrdir)/ruby/internal/intern/eval.h
+modify.o: $(hdrdir)/ruby/internal/intern/file.h
+modify.o: $(hdrdir)/ruby/internal/intern/gc.h
+modify.o: $(hdrdir)/ruby/internal/intern/hash.h
+modify.o: $(hdrdir)/ruby/internal/intern/io.h
+modify.o: $(hdrdir)/ruby/internal/intern/load.h
+modify.o: $(hdrdir)/ruby/internal/intern/marshal.h
+modify.o: $(hdrdir)/ruby/internal/intern/numeric.h
+modify.o: $(hdrdir)/ruby/internal/intern/object.h
+modify.o: $(hdrdir)/ruby/internal/intern/parse.h
+modify.o: $(hdrdir)/ruby/internal/intern/proc.h
+modify.o: $(hdrdir)/ruby/internal/intern/process.h
+modify.o: $(hdrdir)/ruby/internal/intern/random.h
+modify.o: $(hdrdir)/ruby/internal/intern/range.h
+modify.o: $(hdrdir)/ruby/internal/intern/rational.h
+modify.o: $(hdrdir)/ruby/internal/intern/re.h
+modify.o: $(hdrdir)/ruby/internal/intern/ruby.h
+modify.o: $(hdrdir)/ruby/internal/intern/select.h
+modify.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+modify.o: $(hdrdir)/ruby/internal/intern/signal.h
+modify.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+modify.o: $(hdrdir)/ruby/internal/intern/string.h
+modify.o: $(hdrdir)/ruby/internal/intern/struct.h
+modify.o: $(hdrdir)/ruby/internal/intern/thread.h
+modify.o: $(hdrdir)/ruby/internal/intern/time.h
+modify.o: $(hdrdir)/ruby/internal/intern/variable.h
+modify.o: $(hdrdir)/ruby/internal/intern/vm.h
+modify.o: $(hdrdir)/ruby/internal/interpreter.h
+modify.o: $(hdrdir)/ruby/internal/iterator.h
+modify.o: $(hdrdir)/ruby/internal/memory.h
+modify.o: $(hdrdir)/ruby/internal/method.h
+modify.o: $(hdrdir)/ruby/internal/module.h
+modify.o: $(hdrdir)/ruby/internal/newobj.h
+modify.o: $(hdrdir)/ruby/internal/rgengc.h
+modify.o: $(hdrdir)/ruby/internal/scan_args.h
+modify.o: $(hdrdir)/ruby/internal/special_consts.h
+modify.o: $(hdrdir)/ruby/internal/static_assert.h
+modify.o: $(hdrdir)/ruby/internal/stdalign.h
+modify.o: $(hdrdir)/ruby/internal/stdbool.h
+modify.o: $(hdrdir)/ruby/internal/symbol.h
+modify.o: $(hdrdir)/ruby/internal/token_paste.h
+modify.o: $(hdrdir)/ruby/internal/value.h
+modify.o: $(hdrdir)/ruby/internal/value_type.h
+modify.o: $(hdrdir)/ruby/internal/variable.h
+modify.o: $(hdrdir)/ruby/internal/warning_push.h
+modify.o: $(hdrdir)/ruby/internal/xmalloc.h
 modify.o: $(hdrdir)/ruby/missing.h
 modify.o: $(hdrdir)/ruby/ruby.h
 modify.o: $(hdrdir)/ruby/st.h
 modify.o: $(hdrdir)/ruby/subst.h
-modify.o: $(top_srcdir)/include/ruby.h
 modify.o: modify.c
+new.o: $(RUBY_EXTCONF_H)
+new.o: $(arch_hdrdir)/ruby/config.h
+new.o: $(hdrdir)/ruby.h
+new.o: $(hdrdir)/ruby/assert.h
+new.o: $(hdrdir)/ruby/backward.h
+new.o: $(hdrdir)/ruby/backward/2/assume.h
+new.o: $(hdrdir)/ruby/backward/2/attributes.h
+new.o: $(hdrdir)/ruby/backward/2/bool.h
+new.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+new.o: $(hdrdir)/ruby/backward/2/inttypes.h
+new.o: $(hdrdir)/ruby/backward/2/limits.h
+new.o: $(hdrdir)/ruby/backward/2/long_long.h
+new.o: $(hdrdir)/ruby/backward/2/stdalign.h
+new.o: $(hdrdir)/ruby/backward/2/stdarg.h
+new.o: $(hdrdir)/ruby/defines.h
+new.o: $(hdrdir)/ruby/encoding.h
+new.o: $(hdrdir)/ruby/intern.h
+new.o: $(hdrdir)/ruby/internal/anyargs.h
+new.o: $(hdrdir)/ruby/internal/arithmetic.h
+new.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+new.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+new.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+new.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+new.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+new.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+new.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+new.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+new.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+new.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+new.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+new.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+new.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+new.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+new.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+new.o: $(hdrdir)/ruby/internal/assume.h
+new.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+new.o: $(hdrdir)/ruby/internal/attr/artificial.h
+new.o: $(hdrdir)/ruby/internal/attr/cold.h
+new.o: $(hdrdir)/ruby/internal/attr/const.h
+new.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+new.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+new.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+new.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+new.o: $(hdrdir)/ruby/internal/attr/error.h
+new.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+new.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+new.o: $(hdrdir)/ruby/internal/attr/format.h
+new.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+new.o: $(hdrdir)/ruby/internal/attr/noalias.h
+new.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+new.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+new.o: $(hdrdir)/ruby/internal/attr/noinline.h
+new.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+new.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+new.o: $(hdrdir)/ruby/internal/attr/pure.h
+new.o: $(hdrdir)/ruby/internal/attr/restrict.h
+new.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+new.o: $(hdrdir)/ruby/internal/attr/warning.h
+new.o: $(hdrdir)/ruby/internal/attr/weakref.h
+new.o: $(hdrdir)/ruby/internal/cast.h
+new.o: $(hdrdir)/ruby/internal/compiler_is.h
+new.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+new.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+new.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+new.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+new.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+new.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+new.o: $(hdrdir)/ruby/internal/compiler_since.h
+new.o: $(hdrdir)/ruby/internal/config.h
+new.o: $(hdrdir)/ruby/internal/constant_p.h
+new.o: $(hdrdir)/ruby/internal/core.h
+new.o: $(hdrdir)/ruby/internal/core/rarray.h
+new.o: $(hdrdir)/ruby/internal/core/rbasic.h
+new.o: $(hdrdir)/ruby/internal/core/rbignum.h
+new.o: $(hdrdir)/ruby/internal/core/rclass.h
+new.o: $(hdrdir)/ruby/internal/core/rdata.h
+new.o: $(hdrdir)/ruby/internal/core/rfile.h
+new.o: $(hdrdir)/ruby/internal/core/rhash.h
+new.o: $(hdrdir)/ruby/internal/core/robject.h
+new.o: $(hdrdir)/ruby/internal/core/rregexp.h
+new.o: $(hdrdir)/ruby/internal/core/rstring.h
+new.o: $(hdrdir)/ruby/internal/core/rstruct.h
+new.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+new.o: $(hdrdir)/ruby/internal/ctype.h
+new.o: $(hdrdir)/ruby/internal/dllexport.h
+new.o: $(hdrdir)/ruby/internal/dosish.h
+new.o: $(hdrdir)/ruby/internal/error.h
+new.o: $(hdrdir)/ruby/internal/eval.h
+new.o: $(hdrdir)/ruby/internal/event.h
+new.o: $(hdrdir)/ruby/internal/fl_type.h
+new.o: $(hdrdir)/ruby/internal/gc.h
+new.o: $(hdrdir)/ruby/internal/glob.h
+new.o: $(hdrdir)/ruby/internal/globals.h
+new.o: $(hdrdir)/ruby/internal/has/attribute.h
+new.o: $(hdrdir)/ruby/internal/has/builtin.h
+new.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+new.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+new.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+new.o: $(hdrdir)/ruby/internal/has/extension.h
+new.o: $(hdrdir)/ruby/internal/has/feature.h
+new.o: $(hdrdir)/ruby/internal/has/warning.h
+new.o: $(hdrdir)/ruby/internal/intern/array.h
+new.o: $(hdrdir)/ruby/internal/intern/bignum.h
+new.o: $(hdrdir)/ruby/internal/intern/class.h
+new.o: $(hdrdir)/ruby/internal/intern/compar.h
+new.o: $(hdrdir)/ruby/internal/intern/complex.h
+new.o: $(hdrdir)/ruby/internal/intern/cont.h
+new.o: $(hdrdir)/ruby/internal/intern/dir.h
+new.o: $(hdrdir)/ruby/internal/intern/enum.h
+new.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+new.o: $(hdrdir)/ruby/internal/intern/error.h
+new.o: $(hdrdir)/ruby/internal/intern/eval.h
+new.o: $(hdrdir)/ruby/internal/intern/file.h
+new.o: $(hdrdir)/ruby/internal/intern/gc.h
+new.o: $(hdrdir)/ruby/internal/intern/hash.h
+new.o: $(hdrdir)/ruby/internal/intern/io.h
+new.o: $(hdrdir)/ruby/internal/intern/load.h
+new.o: $(hdrdir)/ruby/internal/intern/marshal.h
+new.o: $(hdrdir)/ruby/internal/intern/numeric.h
+new.o: $(hdrdir)/ruby/internal/intern/object.h
+new.o: $(hdrdir)/ruby/internal/intern/parse.h
+new.o: $(hdrdir)/ruby/internal/intern/proc.h
+new.o: $(hdrdir)/ruby/internal/intern/process.h
+new.o: $(hdrdir)/ruby/internal/intern/random.h
+new.o: $(hdrdir)/ruby/internal/intern/range.h
+new.o: $(hdrdir)/ruby/internal/intern/rational.h
+new.o: $(hdrdir)/ruby/internal/intern/re.h
+new.o: $(hdrdir)/ruby/internal/intern/ruby.h
+new.o: $(hdrdir)/ruby/internal/intern/select.h
+new.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+new.o: $(hdrdir)/ruby/internal/intern/signal.h
+new.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+new.o: $(hdrdir)/ruby/internal/intern/string.h
+new.o: $(hdrdir)/ruby/internal/intern/struct.h
+new.o: $(hdrdir)/ruby/internal/intern/thread.h
+new.o: $(hdrdir)/ruby/internal/intern/time.h
+new.o: $(hdrdir)/ruby/internal/intern/variable.h
+new.o: $(hdrdir)/ruby/internal/intern/vm.h
+new.o: $(hdrdir)/ruby/internal/interpreter.h
+new.o: $(hdrdir)/ruby/internal/iterator.h
+new.o: $(hdrdir)/ruby/internal/memory.h
+new.o: $(hdrdir)/ruby/internal/method.h
+new.o: $(hdrdir)/ruby/internal/module.h
+new.o: $(hdrdir)/ruby/internal/newobj.h
+new.o: $(hdrdir)/ruby/internal/rgengc.h
+new.o: $(hdrdir)/ruby/internal/scan_args.h
+new.o: $(hdrdir)/ruby/internal/special_consts.h
+new.o: $(hdrdir)/ruby/internal/static_assert.h
+new.o: $(hdrdir)/ruby/internal/stdalign.h
+new.o: $(hdrdir)/ruby/internal/stdbool.h
+new.o: $(hdrdir)/ruby/internal/symbol.h
+new.o: $(hdrdir)/ruby/internal/token_paste.h
+new.o: $(hdrdir)/ruby/internal/value.h
+new.o: $(hdrdir)/ruby/internal/value_type.h
+new.o: $(hdrdir)/ruby/internal/variable.h
+new.o: $(hdrdir)/ruby/internal/warning_push.h
+new.o: $(hdrdir)/ruby/internal/xmalloc.h
+new.o: $(hdrdir)/ruby/missing.h
+new.o: $(hdrdir)/ruby/onigmo.h
+new.o: $(hdrdir)/ruby/oniguruma.h
+new.o: $(hdrdir)/ruby/ruby.h
+new.o: $(hdrdir)/ruby/st.h
+new.o: $(hdrdir)/ruby/subst.h
+new.o: new.c
 nofree.o: $(RUBY_EXTCONF_H)
 nofree.o: $(arch_hdrdir)/ruby/config.h
+nofree.o: $(hdrdir)/ruby.h
+nofree.o: $(hdrdir)/ruby/assert.h
 nofree.o: $(hdrdir)/ruby/backward.h
+nofree.o: $(hdrdir)/ruby/backward/2/assume.h
+nofree.o: $(hdrdir)/ruby/backward/2/attributes.h
+nofree.o: $(hdrdir)/ruby/backward/2/bool.h
+nofree.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+nofree.o: $(hdrdir)/ruby/backward/2/inttypes.h
+nofree.o: $(hdrdir)/ruby/backward/2/limits.h
+nofree.o: $(hdrdir)/ruby/backward/2/long_long.h
+nofree.o: $(hdrdir)/ruby/backward/2/stdalign.h
+nofree.o: $(hdrdir)/ruby/backward/2/stdarg.h
 nofree.o: $(hdrdir)/ruby/defines.h
 nofree.o: $(hdrdir)/ruby/intern.h
+nofree.o: $(hdrdir)/ruby/internal/anyargs.h
+nofree.o: $(hdrdir)/ruby/internal/arithmetic.h
+nofree.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+nofree.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+nofree.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+nofree.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+nofree.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+nofree.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+nofree.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+nofree.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+nofree.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+nofree.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+nofree.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+nofree.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+nofree.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+nofree.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+nofree.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+nofree.o: $(hdrdir)/ruby/internal/assume.h
+nofree.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+nofree.o: $(hdrdir)/ruby/internal/attr/artificial.h
+nofree.o: $(hdrdir)/ruby/internal/attr/cold.h
+nofree.o: $(hdrdir)/ruby/internal/attr/const.h
+nofree.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+nofree.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+nofree.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+nofree.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+nofree.o: $(hdrdir)/ruby/internal/attr/error.h
+nofree.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+nofree.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+nofree.o: $(hdrdir)/ruby/internal/attr/format.h
+nofree.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+nofree.o: $(hdrdir)/ruby/internal/attr/noalias.h
+nofree.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+nofree.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+nofree.o: $(hdrdir)/ruby/internal/attr/noinline.h
+nofree.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+nofree.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+nofree.o: $(hdrdir)/ruby/internal/attr/pure.h
+nofree.o: $(hdrdir)/ruby/internal/attr/restrict.h
+nofree.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+nofree.o: $(hdrdir)/ruby/internal/attr/warning.h
+nofree.o: $(hdrdir)/ruby/internal/attr/weakref.h
+nofree.o: $(hdrdir)/ruby/internal/cast.h
+nofree.o: $(hdrdir)/ruby/internal/compiler_is.h
+nofree.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+nofree.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+nofree.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+nofree.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+nofree.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+nofree.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+nofree.o: $(hdrdir)/ruby/internal/compiler_since.h
+nofree.o: $(hdrdir)/ruby/internal/config.h
+nofree.o: $(hdrdir)/ruby/internal/constant_p.h
+nofree.o: $(hdrdir)/ruby/internal/core.h
+nofree.o: $(hdrdir)/ruby/internal/core/rarray.h
+nofree.o: $(hdrdir)/ruby/internal/core/rbasic.h
+nofree.o: $(hdrdir)/ruby/internal/core/rbignum.h
+nofree.o: $(hdrdir)/ruby/internal/core/rclass.h
+nofree.o: $(hdrdir)/ruby/internal/core/rdata.h
+nofree.o: $(hdrdir)/ruby/internal/core/rfile.h
+nofree.o: $(hdrdir)/ruby/internal/core/rhash.h
+nofree.o: $(hdrdir)/ruby/internal/core/robject.h
+nofree.o: $(hdrdir)/ruby/internal/core/rregexp.h
+nofree.o: $(hdrdir)/ruby/internal/core/rstring.h
+nofree.o: $(hdrdir)/ruby/internal/core/rstruct.h
+nofree.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+nofree.o: $(hdrdir)/ruby/internal/ctype.h
+nofree.o: $(hdrdir)/ruby/internal/dllexport.h
+nofree.o: $(hdrdir)/ruby/internal/dosish.h
+nofree.o: $(hdrdir)/ruby/internal/error.h
+nofree.o: $(hdrdir)/ruby/internal/eval.h
+nofree.o: $(hdrdir)/ruby/internal/event.h
+nofree.o: $(hdrdir)/ruby/internal/fl_type.h
+nofree.o: $(hdrdir)/ruby/internal/gc.h
+nofree.o: $(hdrdir)/ruby/internal/glob.h
+nofree.o: $(hdrdir)/ruby/internal/globals.h
+nofree.o: $(hdrdir)/ruby/internal/has/attribute.h
+nofree.o: $(hdrdir)/ruby/internal/has/builtin.h
+nofree.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+nofree.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+nofree.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+nofree.o: $(hdrdir)/ruby/internal/has/extension.h
+nofree.o: $(hdrdir)/ruby/internal/has/feature.h
+nofree.o: $(hdrdir)/ruby/internal/has/warning.h
+nofree.o: $(hdrdir)/ruby/internal/intern/array.h
+nofree.o: $(hdrdir)/ruby/internal/intern/bignum.h
+nofree.o: $(hdrdir)/ruby/internal/intern/class.h
+nofree.o: $(hdrdir)/ruby/internal/intern/compar.h
+nofree.o: $(hdrdir)/ruby/internal/intern/complex.h
+nofree.o: $(hdrdir)/ruby/internal/intern/cont.h
+nofree.o: $(hdrdir)/ruby/internal/intern/dir.h
+nofree.o: $(hdrdir)/ruby/internal/intern/enum.h
+nofree.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+nofree.o: $(hdrdir)/ruby/internal/intern/error.h
+nofree.o: $(hdrdir)/ruby/internal/intern/eval.h
+nofree.o: $(hdrdir)/ruby/internal/intern/file.h
+nofree.o: $(hdrdir)/ruby/internal/intern/gc.h
+nofree.o: $(hdrdir)/ruby/internal/intern/hash.h
+nofree.o: $(hdrdir)/ruby/internal/intern/io.h
+nofree.o: $(hdrdir)/ruby/internal/intern/load.h
+nofree.o: $(hdrdir)/ruby/internal/intern/marshal.h
+nofree.o: $(hdrdir)/ruby/internal/intern/numeric.h
+nofree.o: $(hdrdir)/ruby/internal/intern/object.h
+nofree.o: $(hdrdir)/ruby/internal/intern/parse.h
+nofree.o: $(hdrdir)/ruby/internal/intern/proc.h
+nofree.o: $(hdrdir)/ruby/internal/intern/process.h
+nofree.o: $(hdrdir)/ruby/internal/intern/random.h
+nofree.o: $(hdrdir)/ruby/internal/intern/range.h
+nofree.o: $(hdrdir)/ruby/internal/intern/rational.h
+nofree.o: $(hdrdir)/ruby/internal/intern/re.h
+nofree.o: $(hdrdir)/ruby/internal/intern/ruby.h
+nofree.o: $(hdrdir)/ruby/internal/intern/select.h
+nofree.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+nofree.o: $(hdrdir)/ruby/internal/intern/signal.h
+nofree.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+nofree.o: $(hdrdir)/ruby/internal/intern/string.h
+nofree.o: $(hdrdir)/ruby/internal/intern/struct.h
+nofree.o: $(hdrdir)/ruby/internal/intern/thread.h
+nofree.o: $(hdrdir)/ruby/internal/intern/time.h
+nofree.o: $(hdrdir)/ruby/internal/intern/variable.h
+nofree.o: $(hdrdir)/ruby/internal/intern/vm.h
+nofree.o: $(hdrdir)/ruby/internal/interpreter.h
+nofree.o: $(hdrdir)/ruby/internal/iterator.h
+nofree.o: $(hdrdir)/ruby/internal/memory.h
+nofree.o: $(hdrdir)/ruby/internal/method.h
+nofree.o: $(hdrdir)/ruby/internal/module.h
+nofree.o: $(hdrdir)/ruby/internal/newobj.h
+nofree.o: $(hdrdir)/ruby/internal/rgengc.h
+nofree.o: $(hdrdir)/ruby/internal/scan_args.h
+nofree.o: $(hdrdir)/ruby/internal/special_consts.h
+nofree.o: $(hdrdir)/ruby/internal/static_assert.h
+nofree.o: $(hdrdir)/ruby/internal/stdalign.h
+nofree.o: $(hdrdir)/ruby/internal/stdbool.h
+nofree.o: $(hdrdir)/ruby/internal/symbol.h
+nofree.o: $(hdrdir)/ruby/internal/token_paste.h
+nofree.o: $(hdrdir)/ruby/internal/value.h
+nofree.o: $(hdrdir)/ruby/internal/value_type.h
+nofree.o: $(hdrdir)/ruby/internal/variable.h
+nofree.o: $(hdrdir)/ruby/internal/warning_push.h
+nofree.o: $(hdrdir)/ruby/internal/xmalloc.h
 nofree.o: $(hdrdir)/ruby/missing.h
 nofree.o: $(hdrdir)/ruby/ruby.h
 nofree.o: $(hdrdir)/ruby/st.h
 nofree.o: $(hdrdir)/ruby/subst.h
-nofree.o: $(top_srcdir)/include/ruby.h
 nofree.o: nofree.c
 normalize.o: $(RUBY_EXTCONF_H)
 normalize.o: $(arch_hdrdir)/ruby/config.h
+normalize.o: $(hdrdir)/ruby.h
+normalize.o: $(hdrdir)/ruby/assert.h
 normalize.o: $(hdrdir)/ruby/backward.h
+normalize.o: $(hdrdir)/ruby/backward/2/assume.h
+normalize.o: $(hdrdir)/ruby/backward/2/attributes.h
+normalize.o: $(hdrdir)/ruby/backward/2/bool.h
+normalize.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+normalize.o: $(hdrdir)/ruby/backward/2/inttypes.h
+normalize.o: $(hdrdir)/ruby/backward/2/limits.h
+normalize.o: $(hdrdir)/ruby/backward/2/long_long.h
+normalize.o: $(hdrdir)/ruby/backward/2/stdalign.h
+normalize.o: $(hdrdir)/ruby/backward/2/stdarg.h
 normalize.o: $(hdrdir)/ruby/defines.h
 normalize.o: $(hdrdir)/ruby/encoding.h
 normalize.o: $(hdrdir)/ruby/intern.h
-normalize.o: $(hdrdir)/ruby/io.h
+normalize.o: $(hdrdir)/ruby/internal/anyargs.h
+normalize.o: $(hdrdir)/ruby/internal/arithmetic.h
+normalize.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+normalize.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+normalize.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+normalize.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+normalize.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+normalize.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+normalize.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+normalize.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+normalize.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+normalize.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+normalize.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+normalize.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+normalize.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+normalize.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+normalize.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+normalize.o: $(hdrdir)/ruby/internal/assume.h
+normalize.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+normalize.o: $(hdrdir)/ruby/internal/attr/artificial.h
+normalize.o: $(hdrdir)/ruby/internal/attr/cold.h
+normalize.o: $(hdrdir)/ruby/internal/attr/const.h
+normalize.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+normalize.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+normalize.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+normalize.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+normalize.o: $(hdrdir)/ruby/internal/attr/error.h
+normalize.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+normalize.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+normalize.o: $(hdrdir)/ruby/internal/attr/format.h
+normalize.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+normalize.o: $(hdrdir)/ruby/internal/attr/noalias.h
+normalize.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+normalize.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+normalize.o: $(hdrdir)/ruby/internal/attr/noinline.h
+normalize.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+normalize.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+normalize.o: $(hdrdir)/ruby/internal/attr/pure.h
+normalize.o: $(hdrdir)/ruby/internal/attr/restrict.h
+normalize.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+normalize.o: $(hdrdir)/ruby/internal/attr/warning.h
+normalize.o: $(hdrdir)/ruby/internal/attr/weakref.h
+normalize.o: $(hdrdir)/ruby/internal/cast.h
+normalize.o: $(hdrdir)/ruby/internal/compiler_is.h
+normalize.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+normalize.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+normalize.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+normalize.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+normalize.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+normalize.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+normalize.o: $(hdrdir)/ruby/internal/compiler_since.h
+normalize.o: $(hdrdir)/ruby/internal/config.h
+normalize.o: $(hdrdir)/ruby/internal/constant_p.h
+normalize.o: $(hdrdir)/ruby/internal/core.h
+normalize.o: $(hdrdir)/ruby/internal/core/rarray.h
+normalize.o: $(hdrdir)/ruby/internal/core/rbasic.h
+normalize.o: $(hdrdir)/ruby/internal/core/rbignum.h
+normalize.o: $(hdrdir)/ruby/internal/core/rclass.h
+normalize.o: $(hdrdir)/ruby/internal/core/rdata.h
+normalize.o: $(hdrdir)/ruby/internal/core/rfile.h
+normalize.o: $(hdrdir)/ruby/internal/core/rhash.h
+normalize.o: $(hdrdir)/ruby/internal/core/robject.h
+normalize.o: $(hdrdir)/ruby/internal/core/rregexp.h
+normalize.o: $(hdrdir)/ruby/internal/core/rstring.h
+normalize.o: $(hdrdir)/ruby/internal/core/rstruct.h
+normalize.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+normalize.o: $(hdrdir)/ruby/internal/ctype.h
+normalize.o: $(hdrdir)/ruby/internal/dllexport.h
+normalize.o: $(hdrdir)/ruby/internal/dosish.h
+normalize.o: $(hdrdir)/ruby/internal/error.h
+normalize.o: $(hdrdir)/ruby/internal/eval.h
+normalize.o: $(hdrdir)/ruby/internal/event.h
+normalize.o: $(hdrdir)/ruby/internal/fl_type.h
+normalize.o: $(hdrdir)/ruby/internal/gc.h
+normalize.o: $(hdrdir)/ruby/internal/glob.h
+normalize.o: $(hdrdir)/ruby/internal/globals.h
+normalize.o: $(hdrdir)/ruby/internal/has/attribute.h
+normalize.o: $(hdrdir)/ruby/internal/has/builtin.h
+normalize.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+normalize.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+normalize.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+normalize.o: $(hdrdir)/ruby/internal/has/extension.h
+normalize.o: $(hdrdir)/ruby/internal/has/feature.h
+normalize.o: $(hdrdir)/ruby/internal/has/warning.h
+normalize.o: $(hdrdir)/ruby/internal/intern/array.h
+normalize.o: $(hdrdir)/ruby/internal/intern/bignum.h
+normalize.o: $(hdrdir)/ruby/internal/intern/class.h
+normalize.o: $(hdrdir)/ruby/internal/intern/compar.h
+normalize.o: $(hdrdir)/ruby/internal/intern/complex.h
+normalize.o: $(hdrdir)/ruby/internal/intern/cont.h
+normalize.o: $(hdrdir)/ruby/internal/intern/dir.h
+normalize.o: $(hdrdir)/ruby/internal/intern/enum.h
+normalize.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+normalize.o: $(hdrdir)/ruby/internal/intern/error.h
+normalize.o: $(hdrdir)/ruby/internal/intern/eval.h
+normalize.o: $(hdrdir)/ruby/internal/intern/file.h
+normalize.o: $(hdrdir)/ruby/internal/intern/gc.h
+normalize.o: $(hdrdir)/ruby/internal/intern/hash.h
+normalize.o: $(hdrdir)/ruby/internal/intern/io.h
+normalize.o: $(hdrdir)/ruby/internal/intern/load.h
+normalize.o: $(hdrdir)/ruby/internal/intern/marshal.h
+normalize.o: $(hdrdir)/ruby/internal/intern/numeric.h
+normalize.o: $(hdrdir)/ruby/internal/intern/object.h
+normalize.o: $(hdrdir)/ruby/internal/intern/parse.h
+normalize.o: $(hdrdir)/ruby/internal/intern/proc.h
+normalize.o: $(hdrdir)/ruby/internal/intern/process.h
+normalize.o: $(hdrdir)/ruby/internal/intern/random.h
+normalize.o: $(hdrdir)/ruby/internal/intern/range.h
+normalize.o: $(hdrdir)/ruby/internal/intern/rational.h
+normalize.o: $(hdrdir)/ruby/internal/intern/re.h
+normalize.o: $(hdrdir)/ruby/internal/intern/ruby.h
+normalize.o: $(hdrdir)/ruby/internal/intern/select.h
+normalize.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+normalize.o: $(hdrdir)/ruby/internal/intern/signal.h
+normalize.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+normalize.o: $(hdrdir)/ruby/internal/intern/string.h
+normalize.o: $(hdrdir)/ruby/internal/intern/struct.h
+normalize.o: $(hdrdir)/ruby/internal/intern/thread.h
+normalize.o: $(hdrdir)/ruby/internal/intern/time.h
+normalize.o: $(hdrdir)/ruby/internal/intern/variable.h
+normalize.o: $(hdrdir)/ruby/internal/intern/vm.h
+normalize.o: $(hdrdir)/ruby/internal/interpreter.h
+normalize.o: $(hdrdir)/ruby/internal/iterator.h
+normalize.o: $(hdrdir)/ruby/internal/memory.h
+normalize.o: $(hdrdir)/ruby/internal/method.h
+normalize.o: $(hdrdir)/ruby/internal/module.h
+normalize.o: $(hdrdir)/ruby/internal/newobj.h
+normalize.o: $(hdrdir)/ruby/internal/rgengc.h
+normalize.o: $(hdrdir)/ruby/internal/scan_args.h
+normalize.o: $(hdrdir)/ruby/internal/special_consts.h
+normalize.o: $(hdrdir)/ruby/internal/static_assert.h
+normalize.o: $(hdrdir)/ruby/internal/stdalign.h
+normalize.o: $(hdrdir)/ruby/internal/stdbool.h
+normalize.o: $(hdrdir)/ruby/internal/symbol.h
+normalize.o: $(hdrdir)/ruby/internal/token_paste.h
+normalize.o: $(hdrdir)/ruby/internal/value.h
+normalize.o: $(hdrdir)/ruby/internal/value_type.h
+normalize.o: $(hdrdir)/ruby/internal/variable.h
+normalize.o: $(hdrdir)/ruby/internal/warning_push.h
+normalize.o: $(hdrdir)/ruby/internal/xmalloc.h
 normalize.o: $(hdrdir)/ruby/missing.h
+normalize.o: $(hdrdir)/ruby/onigmo.h
 normalize.o: $(hdrdir)/ruby/oniguruma.h
 normalize.o: $(hdrdir)/ruby/ruby.h
 normalize.o: $(hdrdir)/ruby/st.h
 normalize.o: $(hdrdir)/ruby/subst.h
-normalize.o: $(top_srcdir)/include/ruby.h
 normalize.o: $(top_srcdir)/internal.h
+normalize.o: $(top_srcdir)/internal/file.h
 normalize.o: normalize.c
 qsort.o: $(RUBY_EXTCONF_H)
 qsort.o: $(arch_hdrdir)/ruby/config.h
+qsort.o: $(hdrdir)/ruby.h
+qsort.o: $(hdrdir)/ruby/assert.h
 qsort.o: $(hdrdir)/ruby/backward.h
+qsort.o: $(hdrdir)/ruby/backward/2/assume.h
+qsort.o: $(hdrdir)/ruby/backward/2/attributes.h
+qsort.o: $(hdrdir)/ruby/backward/2/bool.h
+qsort.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+qsort.o: $(hdrdir)/ruby/backward/2/inttypes.h
+qsort.o: $(hdrdir)/ruby/backward/2/limits.h
+qsort.o: $(hdrdir)/ruby/backward/2/long_long.h
+qsort.o: $(hdrdir)/ruby/backward/2/stdalign.h
+qsort.o: $(hdrdir)/ruby/backward/2/stdarg.h
 qsort.o: $(hdrdir)/ruby/defines.h
 qsort.o: $(hdrdir)/ruby/encoding.h
 qsort.o: $(hdrdir)/ruby/intern.h
+qsort.o: $(hdrdir)/ruby/internal/anyargs.h
+qsort.o: $(hdrdir)/ruby/internal/arithmetic.h
+qsort.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+qsort.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+qsort.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+qsort.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+qsort.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+qsort.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+qsort.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+qsort.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+qsort.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+qsort.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+qsort.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+qsort.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+qsort.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+qsort.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+qsort.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+qsort.o: $(hdrdir)/ruby/internal/assume.h
+qsort.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+qsort.o: $(hdrdir)/ruby/internal/attr/artificial.h
+qsort.o: $(hdrdir)/ruby/internal/attr/cold.h
+qsort.o: $(hdrdir)/ruby/internal/attr/const.h
+qsort.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+qsort.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+qsort.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+qsort.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+qsort.o: $(hdrdir)/ruby/internal/attr/error.h
+qsort.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+qsort.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+qsort.o: $(hdrdir)/ruby/internal/attr/format.h
+qsort.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+qsort.o: $(hdrdir)/ruby/internal/attr/noalias.h
+qsort.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+qsort.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+qsort.o: $(hdrdir)/ruby/internal/attr/noinline.h
+qsort.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+qsort.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+qsort.o: $(hdrdir)/ruby/internal/attr/pure.h
+qsort.o: $(hdrdir)/ruby/internal/attr/restrict.h
+qsort.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+qsort.o: $(hdrdir)/ruby/internal/attr/warning.h
+qsort.o: $(hdrdir)/ruby/internal/attr/weakref.h
+qsort.o: $(hdrdir)/ruby/internal/cast.h
+qsort.o: $(hdrdir)/ruby/internal/compiler_is.h
+qsort.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+qsort.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+qsort.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+qsort.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+qsort.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+qsort.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+qsort.o: $(hdrdir)/ruby/internal/compiler_since.h
+qsort.o: $(hdrdir)/ruby/internal/config.h
+qsort.o: $(hdrdir)/ruby/internal/constant_p.h
+qsort.o: $(hdrdir)/ruby/internal/core.h
+qsort.o: $(hdrdir)/ruby/internal/core/rarray.h
+qsort.o: $(hdrdir)/ruby/internal/core/rbasic.h
+qsort.o: $(hdrdir)/ruby/internal/core/rbignum.h
+qsort.o: $(hdrdir)/ruby/internal/core/rclass.h
+qsort.o: $(hdrdir)/ruby/internal/core/rdata.h
+qsort.o: $(hdrdir)/ruby/internal/core/rfile.h
+qsort.o: $(hdrdir)/ruby/internal/core/rhash.h
+qsort.o: $(hdrdir)/ruby/internal/core/robject.h
+qsort.o: $(hdrdir)/ruby/internal/core/rregexp.h
+qsort.o: $(hdrdir)/ruby/internal/core/rstring.h
+qsort.o: $(hdrdir)/ruby/internal/core/rstruct.h
+qsort.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+qsort.o: $(hdrdir)/ruby/internal/ctype.h
+qsort.o: $(hdrdir)/ruby/internal/dllexport.h
+qsort.o: $(hdrdir)/ruby/internal/dosish.h
+qsort.o: $(hdrdir)/ruby/internal/error.h
+qsort.o: $(hdrdir)/ruby/internal/eval.h
+qsort.o: $(hdrdir)/ruby/internal/event.h
+qsort.o: $(hdrdir)/ruby/internal/fl_type.h
+qsort.o: $(hdrdir)/ruby/internal/gc.h
+qsort.o: $(hdrdir)/ruby/internal/glob.h
+qsort.o: $(hdrdir)/ruby/internal/globals.h
+qsort.o: $(hdrdir)/ruby/internal/has/attribute.h
+qsort.o: $(hdrdir)/ruby/internal/has/builtin.h
+qsort.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+qsort.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+qsort.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+qsort.o: $(hdrdir)/ruby/internal/has/extension.h
+qsort.o: $(hdrdir)/ruby/internal/has/feature.h
+qsort.o: $(hdrdir)/ruby/internal/has/warning.h
+qsort.o: $(hdrdir)/ruby/internal/intern/array.h
+qsort.o: $(hdrdir)/ruby/internal/intern/bignum.h
+qsort.o: $(hdrdir)/ruby/internal/intern/class.h
+qsort.o: $(hdrdir)/ruby/internal/intern/compar.h
+qsort.o: $(hdrdir)/ruby/internal/intern/complex.h
+qsort.o: $(hdrdir)/ruby/internal/intern/cont.h
+qsort.o: $(hdrdir)/ruby/internal/intern/dir.h
+qsort.o: $(hdrdir)/ruby/internal/intern/enum.h
+qsort.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+qsort.o: $(hdrdir)/ruby/internal/intern/error.h
+qsort.o: $(hdrdir)/ruby/internal/intern/eval.h
+qsort.o: $(hdrdir)/ruby/internal/intern/file.h
+qsort.o: $(hdrdir)/ruby/internal/intern/gc.h
+qsort.o: $(hdrdir)/ruby/internal/intern/hash.h
+qsort.o: $(hdrdir)/ruby/internal/intern/io.h
+qsort.o: $(hdrdir)/ruby/internal/intern/load.h
+qsort.o: $(hdrdir)/ruby/internal/intern/marshal.h
+qsort.o: $(hdrdir)/ruby/internal/intern/numeric.h
+qsort.o: $(hdrdir)/ruby/internal/intern/object.h
+qsort.o: $(hdrdir)/ruby/internal/intern/parse.h
+qsort.o: $(hdrdir)/ruby/internal/intern/proc.h
+qsort.o: $(hdrdir)/ruby/internal/intern/process.h
+qsort.o: $(hdrdir)/ruby/internal/intern/random.h
+qsort.o: $(hdrdir)/ruby/internal/intern/range.h
+qsort.o: $(hdrdir)/ruby/internal/intern/rational.h
+qsort.o: $(hdrdir)/ruby/internal/intern/re.h
+qsort.o: $(hdrdir)/ruby/internal/intern/ruby.h
+qsort.o: $(hdrdir)/ruby/internal/intern/select.h
+qsort.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+qsort.o: $(hdrdir)/ruby/internal/intern/signal.h
+qsort.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+qsort.o: $(hdrdir)/ruby/internal/intern/string.h
+qsort.o: $(hdrdir)/ruby/internal/intern/struct.h
+qsort.o: $(hdrdir)/ruby/internal/intern/thread.h
+qsort.o: $(hdrdir)/ruby/internal/intern/time.h
+qsort.o: $(hdrdir)/ruby/internal/intern/variable.h
+qsort.o: $(hdrdir)/ruby/internal/intern/vm.h
+qsort.o: $(hdrdir)/ruby/internal/interpreter.h
+qsort.o: $(hdrdir)/ruby/internal/iterator.h
+qsort.o: $(hdrdir)/ruby/internal/memory.h
+qsort.o: $(hdrdir)/ruby/internal/method.h
+qsort.o: $(hdrdir)/ruby/internal/module.h
+qsort.o: $(hdrdir)/ruby/internal/newobj.h
+qsort.o: $(hdrdir)/ruby/internal/rgengc.h
+qsort.o: $(hdrdir)/ruby/internal/scan_args.h
+qsort.o: $(hdrdir)/ruby/internal/special_consts.h
+qsort.o: $(hdrdir)/ruby/internal/static_assert.h
+qsort.o: $(hdrdir)/ruby/internal/stdalign.h
+qsort.o: $(hdrdir)/ruby/internal/stdbool.h
+qsort.o: $(hdrdir)/ruby/internal/symbol.h
+qsort.o: $(hdrdir)/ruby/internal/token_paste.h
+qsort.o: $(hdrdir)/ruby/internal/value.h
+qsort.o: $(hdrdir)/ruby/internal/value_type.h
+qsort.o: $(hdrdir)/ruby/internal/variable.h
+qsort.o: $(hdrdir)/ruby/internal/warning_push.h
+qsort.o: $(hdrdir)/ruby/internal/xmalloc.h
 qsort.o: $(hdrdir)/ruby/missing.h
+qsort.o: $(hdrdir)/ruby/onigmo.h
 qsort.o: $(hdrdir)/ruby/oniguruma.h
 qsort.o: $(hdrdir)/ruby/ruby.h
 qsort.o: $(hdrdir)/ruby/st.h
 qsort.o: $(hdrdir)/ruby/subst.h
 qsort.o: $(hdrdir)/ruby/util.h
-qsort.o: $(top_srcdir)/include/ruby.h
 qsort.o: qsort.c
+rb_interned_str.o: $(RUBY_EXTCONF_H)
+rb_interned_str.o: $(arch_hdrdir)/ruby/config.h
+rb_interned_str.o: $(hdrdir)/ruby.h
+rb_interned_str.o: $(hdrdir)/ruby/assert.h
+rb_interned_str.o: $(hdrdir)/ruby/backward.h
+rb_interned_str.o: $(hdrdir)/ruby/backward/2/assume.h
+rb_interned_str.o: $(hdrdir)/ruby/backward/2/attributes.h
+rb_interned_str.o: $(hdrdir)/ruby/backward/2/bool.h
+rb_interned_str.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+rb_interned_str.o: $(hdrdir)/ruby/backward/2/inttypes.h
+rb_interned_str.o: $(hdrdir)/ruby/backward/2/limits.h
+rb_interned_str.o: $(hdrdir)/ruby/backward/2/long_long.h
+rb_interned_str.o: $(hdrdir)/ruby/backward/2/stdalign.h
+rb_interned_str.o: $(hdrdir)/ruby/backward/2/stdarg.h
+rb_interned_str.o: $(hdrdir)/ruby/defines.h
+rb_interned_str.o: $(hdrdir)/ruby/intern.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/anyargs.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/arithmetic.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/assume.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/attr/artificial.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/attr/cold.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/attr/const.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/attr/error.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/attr/format.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/attr/noalias.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/attr/noinline.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/attr/pure.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/attr/restrict.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/attr/warning.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/attr/weakref.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/cast.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/compiler_is.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/compiler_since.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/config.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/constant_p.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/core.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/core/rarray.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/core/rbasic.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/core/rbignum.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/core/rclass.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/core/rdata.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/core/rfile.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/core/rhash.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/core/robject.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/core/rregexp.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/core/rstring.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/core/rstruct.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/ctype.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/dllexport.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/dosish.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/error.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/eval.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/event.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/fl_type.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/gc.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/glob.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/globals.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/has/attribute.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/has/builtin.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/has/extension.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/has/feature.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/has/warning.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/intern/array.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/intern/bignum.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/intern/class.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/intern/compar.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/intern/complex.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/intern/cont.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/intern/dir.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/intern/enum.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/intern/error.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/intern/eval.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/intern/file.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/intern/gc.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/intern/hash.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/intern/io.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/intern/load.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/intern/marshal.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/intern/numeric.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/intern/object.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/intern/parse.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/intern/proc.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/intern/process.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/intern/random.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/intern/range.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/intern/rational.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/intern/re.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/intern/ruby.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/intern/select.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/intern/signal.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/intern/string.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/intern/struct.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/intern/thread.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/intern/time.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/intern/variable.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/intern/vm.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/interpreter.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/iterator.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/memory.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/method.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/module.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/newobj.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/rgengc.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/scan_args.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/special_consts.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/static_assert.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/stdalign.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/stdbool.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/symbol.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/token_paste.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/value.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/value_type.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/variable.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/warning_push.h
+rb_interned_str.o: $(hdrdir)/ruby/internal/xmalloc.h
+rb_interned_str.o: $(hdrdir)/ruby/missing.h
+rb_interned_str.o: $(hdrdir)/ruby/ruby.h
+rb_interned_str.o: $(hdrdir)/ruby/st.h
+rb_interned_str.o: $(hdrdir)/ruby/subst.h
+rb_interned_str.o: rb_interned_str.c
+rb_str_dup.o: $(RUBY_EXTCONF_H)
+rb_str_dup.o: $(arch_hdrdir)/ruby/config.h
+rb_str_dup.o: $(hdrdir)/ruby.h
+rb_str_dup.o: $(hdrdir)/ruby/assert.h
+rb_str_dup.o: $(hdrdir)/ruby/backward.h
+rb_str_dup.o: $(hdrdir)/ruby/backward/2/assume.h
+rb_str_dup.o: $(hdrdir)/ruby/backward/2/attributes.h
+rb_str_dup.o: $(hdrdir)/ruby/backward/2/bool.h
+rb_str_dup.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+rb_str_dup.o: $(hdrdir)/ruby/backward/2/inttypes.h
+rb_str_dup.o: $(hdrdir)/ruby/backward/2/limits.h
+rb_str_dup.o: $(hdrdir)/ruby/backward/2/long_long.h
+rb_str_dup.o: $(hdrdir)/ruby/backward/2/stdalign.h
+rb_str_dup.o: $(hdrdir)/ruby/backward/2/stdarg.h
+rb_str_dup.o: $(hdrdir)/ruby/defines.h
+rb_str_dup.o: $(hdrdir)/ruby/intern.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/anyargs.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/arithmetic.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/assume.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/attr/artificial.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/attr/cold.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/attr/const.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/attr/error.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/attr/format.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/attr/noalias.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/attr/noinline.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/attr/pure.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/attr/restrict.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/attr/warning.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/attr/weakref.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/cast.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/compiler_is.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/compiler_since.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/config.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/constant_p.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/core.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/core/rarray.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/core/rbasic.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/core/rbignum.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/core/rclass.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/core/rdata.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/core/rfile.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/core/rhash.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/core/robject.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/core/rregexp.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/core/rstring.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/core/rstruct.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/ctype.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/dllexport.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/dosish.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/error.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/eval.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/event.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/fl_type.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/gc.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/glob.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/globals.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/has/attribute.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/has/builtin.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/has/extension.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/has/feature.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/has/warning.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/intern/array.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/intern/bignum.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/intern/class.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/intern/compar.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/intern/complex.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/intern/cont.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/intern/dir.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/intern/enum.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/intern/error.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/intern/eval.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/intern/file.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/intern/gc.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/intern/hash.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/intern/io.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/intern/load.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/intern/marshal.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/intern/numeric.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/intern/object.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/intern/parse.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/intern/proc.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/intern/process.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/intern/random.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/intern/range.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/intern/rational.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/intern/re.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/intern/ruby.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/intern/select.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/intern/signal.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/intern/string.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/intern/struct.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/intern/thread.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/intern/time.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/intern/variable.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/intern/vm.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/interpreter.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/iterator.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/memory.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/method.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/module.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/newobj.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/rgengc.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/scan_args.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/special_consts.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/static_assert.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/stdalign.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/stdbool.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/symbol.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/token_paste.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/value.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/value_type.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/variable.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/warning_push.h
+rb_str_dup.o: $(hdrdir)/ruby/internal/xmalloc.h
+rb_str_dup.o: $(hdrdir)/ruby/missing.h
+rb_str_dup.o: $(hdrdir)/ruby/ruby.h
+rb_str_dup.o: $(hdrdir)/ruby/st.h
+rb_str_dup.o: $(hdrdir)/ruby/subst.h
+rb_str_dup.o: rb_str_dup.c
 set_len.o: $(RUBY_EXTCONF_H)
 set_len.o: $(arch_hdrdir)/ruby/config.h
+set_len.o: $(hdrdir)/ruby.h
+set_len.o: $(hdrdir)/ruby/assert.h
 set_len.o: $(hdrdir)/ruby/backward.h
+set_len.o: $(hdrdir)/ruby/backward/2/assume.h
+set_len.o: $(hdrdir)/ruby/backward/2/attributes.h
+set_len.o: $(hdrdir)/ruby/backward/2/bool.h
+set_len.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+set_len.o: $(hdrdir)/ruby/backward/2/inttypes.h
+set_len.o: $(hdrdir)/ruby/backward/2/limits.h
+set_len.o: $(hdrdir)/ruby/backward/2/long_long.h
+set_len.o: $(hdrdir)/ruby/backward/2/stdalign.h
+set_len.o: $(hdrdir)/ruby/backward/2/stdarg.h
 set_len.o: $(hdrdir)/ruby/defines.h
 set_len.o: $(hdrdir)/ruby/intern.h
+set_len.o: $(hdrdir)/ruby/internal/anyargs.h
+set_len.o: $(hdrdir)/ruby/internal/arithmetic.h
+set_len.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+set_len.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+set_len.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+set_len.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+set_len.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+set_len.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+set_len.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+set_len.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+set_len.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+set_len.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+set_len.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+set_len.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+set_len.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+set_len.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+set_len.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+set_len.o: $(hdrdir)/ruby/internal/assume.h
+set_len.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+set_len.o: $(hdrdir)/ruby/internal/attr/artificial.h
+set_len.o: $(hdrdir)/ruby/internal/attr/cold.h
+set_len.o: $(hdrdir)/ruby/internal/attr/const.h
+set_len.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+set_len.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+set_len.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+set_len.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+set_len.o: $(hdrdir)/ruby/internal/attr/error.h
+set_len.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+set_len.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+set_len.o: $(hdrdir)/ruby/internal/attr/format.h
+set_len.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+set_len.o: $(hdrdir)/ruby/internal/attr/noalias.h
+set_len.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+set_len.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+set_len.o: $(hdrdir)/ruby/internal/attr/noinline.h
+set_len.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+set_len.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+set_len.o: $(hdrdir)/ruby/internal/attr/pure.h
+set_len.o: $(hdrdir)/ruby/internal/attr/restrict.h
+set_len.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+set_len.o: $(hdrdir)/ruby/internal/attr/warning.h
+set_len.o: $(hdrdir)/ruby/internal/attr/weakref.h
+set_len.o: $(hdrdir)/ruby/internal/cast.h
+set_len.o: $(hdrdir)/ruby/internal/compiler_is.h
+set_len.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+set_len.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+set_len.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+set_len.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+set_len.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+set_len.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+set_len.o: $(hdrdir)/ruby/internal/compiler_since.h
+set_len.o: $(hdrdir)/ruby/internal/config.h
+set_len.o: $(hdrdir)/ruby/internal/constant_p.h
+set_len.o: $(hdrdir)/ruby/internal/core.h
+set_len.o: $(hdrdir)/ruby/internal/core/rarray.h
+set_len.o: $(hdrdir)/ruby/internal/core/rbasic.h
+set_len.o: $(hdrdir)/ruby/internal/core/rbignum.h
+set_len.o: $(hdrdir)/ruby/internal/core/rclass.h
+set_len.o: $(hdrdir)/ruby/internal/core/rdata.h
+set_len.o: $(hdrdir)/ruby/internal/core/rfile.h
+set_len.o: $(hdrdir)/ruby/internal/core/rhash.h
+set_len.o: $(hdrdir)/ruby/internal/core/robject.h
+set_len.o: $(hdrdir)/ruby/internal/core/rregexp.h
+set_len.o: $(hdrdir)/ruby/internal/core/rstring.h
+set_len.o: $(hdrdir)/ruby/internal/core/rstruct.h
+set_len.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+set_len.o: $(hdrdir)/ruby/internal/ctype.h
+set_len.o: $(hdrdir)/ruby/internal/dllexport.h
+set_len.o: $(hdrdir)/ruby/internal/dosish.h
+set_len.o: $(hdrdir)/ruby/internal/error.h
+set_len.o: $(hdrdir)/ruby/internal/eval.h
+set_len.o: $(hdrdir)/ruby/internal/event.h
+set_len.o: $(hdrdir)/ruby/internal/fl_type.h
+set_len.o: $(hdrdir)/ruby/internal/gc.h
+set_len.o: $(hdrdir)/ruby/internal/glob.h
+set_len.o: $(hdrdir)/ruby/internal/globals.h
+set_len.o: $(hdrdir)/ruby/internal/has/attribute.h
+set_len.o: $(hdrdir)/ruby/internal/has/builtin.h
+set_len.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+set_len.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+set_len.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+set_len.o: $(hdrdir)/ruby/internal/has/extension.h
+set_len.o: $(hdrdir)/ruby/internal/has/feature.h
+set_len.o: $(hdrdir)/ruby/internal/has/warning.h
+set_len.o: $(hdrdir)/ruby/internal/intern/array.h
+set_len.o: $(hdrdir)/ruby/internal/intern/bignum.h
+set_len.o: $(hdrdir)/ruby/internal/intern/class.h
+set_len.o: $(hdrdir)/ruby/internal/intern/compar.h
+set_len.o: $(hdrdir)/ruby/internal/intern/complex.h
+set_len.o: $(hdrdir)/ruby/internal/intern/cont.h
+set_len.o: $(hdrdir)/ruby/internal/intern/dir.h
+set_len.o: $(hdrdir)/ruby/internal/intern/enum.h
+set_len.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+set_len.o: $(hdrdir)/ruby/internal/intern/error.h
+set_len.o: $(hdrdir)/ruby/internal/intern/eval.h
+set_len.o: $(hdrdir)/ruby/internal/intern/file.h
+set_len.o: $(hdrdir)/ruby/internal/intern/gc.h
+set_len.o: $(hdrdir)/ruby/internal/intern/hash.h
+set_len.o: $(hdrdir)/ruby/internal/intern/io.h
+set_len.o: $(hdrdir)/ruby/internal/intern/load.h
+set_len.o: $(hdrdir)/ruby/internal/intern/marshal.h
+set_len.o: $(hdrdir)/ruby/internal/intern/numeric.h
+set_len.o: $(hdrdir)/ruby/internal/intern/object.h
+set_len.o: $(hdrdir)/ruby/internal/intern/parse.h
+set_len.o: $(hdrdir)/ruby/internal/intern/proc.h
+set_len.o: $(hdrdir)/ruby/internal/intern/process.h
+set_len.o: $(hdrdir)/ruby/internal/intern/random.h
+set_len.o: $(hdrdir)/ruby/internal/intern/range.h
+set_len.o: $(hdrdir)/ruby/internal/intern/rational.h
+set_len.o: $(hdrdir)/ruby/internal/intern/re.h
+set_len.o: $(hdrdir)/ruby/internal/intern/ruby.h
+set_len.o: $(hdrdir)/ruby/internal/intern/select.h
+set_len.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+set_len.o: $(hdrdir)/ruby/internal/intern/signal.h
+set_len.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+set_len.o: $(hdrdir)/ruby/internal/intern/string.h
+set_len.o: $(hdrdir)/ruby/internal/intern/struct.h
+set_len.o: $(hdrdir)/ruby/internal/intern/thread.h
+set_len.o: $(hdrdir)/ruby/internal/intern/time.h
+set_len.o: $(hdrdir)/ruby/internal/intern/variable.h
+set_len.o: $(hdrdir)/ruby/internal/intern/vm.h
+set_len.o: $(hdrdir)/ruby/internal/interpreter.h
+set_len.o: $(hdrdir)/ruby/internal/iterator.h
+set_len.o: $(hdrdir)/ruby/internal/memory.h
+set_len.o: $(hdrdir)/ruby/internal/method.h
+set_len.o: $(hdrdir)/ruby/internal/module.h
+set_len.o: $(hdrdir)/ruby/internal/newobj.h
+set_len.o: $(hdrdir)/ruby/internal/rgengc.h
+set_len.o: $(hdrdir)/ruby/internal/scan_args.h
+set_len.o: $(hdrdir)/ruby/internal/special_consts.h
+set_len.o: $(hdrdir)/ruby/internal/static_assert.h
+set_len.o: $(hdrdir)/ruby/internal/stdalign.h
+set_len.o: $(hdrdir)/ruby/internal/stdbool.h
+set_len.o: $(hdrdir)/ruby/internal/symbol.h
+set_len.o: $(hdrdir)/ruby/internal/token_paste.h
+set_len.o: $(hdrdir)/ruby/internal/value.h
+set_len.o: $(hdrdir)/ruby/internal/value_type.h
+set_len.o: $(hdrdir)/ruby/internal/variable.h
+set_len.o: $(hdrdir)/ruby/internal/warning_push.h
+set_len.o: $(hdrdir)/ruby/internal/xmalloc.h
 set_len.o: $(hdrdir)/ruby/missing.h
 set_len.o: $(hdrdir)/ruby/ruby.h
 set_len.o: $(hdrdir)/ruby/st.h
 set_len.o: $(hdrdir)/ruby/subst.h
-set_len.o: $(top_srcdir)/include/ruby.h
 set_len.o: set_len.c
 # AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/string/ellipsize.c b/ext/-test-/string/ellipsize.c
index 0451519492..6034408724 100644
--- a/ext/-test-/string/ellipsize.c
+++ b/ext/-test-/string/ellipsize.c
@@ -7,7 +7,7 @@ bug_str_ellipsize(VALUE str, VALUE len)
 }
 
 void
-Init_ellipsize(VALUE klass)
+Init_string_ellipsize(VALUE klass)
 {
     rb_define_method(klass, "ellipsize", bug_str_ellipsize, 1);
 }
diff --git a/ext/-test-/string/enc_associate.c b/ext/-test-/string/enc_associate.c
index 53811620a0..594d8a43a4 100644
--- a/ext/-test-/string/enc_associate.c
+++ b/ext/-test-/string/enc_associate.c
@@ -15,7 +15,7 @@ bug_str_encoding_index(VALUE self, VALUE str)
 }
 
 void
-Init_enc_associate(VALUE klass)
+Init_string_enc_associate(VALUE klass)
 {
     rb_define_method(klass, "associate_encoding!", bug_str_enc_associate, 1);
     rb_define_singleton_method(klass, "encoding_index", bug_str_encoding_index, 1);
diff --git a/ext/-test-/string/enc_str_buf_cat.c b/ext/-test-/string/enc_str_buf_cat.c
index 5d583c65dc..4c1b262e1e 100644
--- a/ext/-test-/string/enc_str_buf_cat.c
+++ b/ext/-test-/string/enc_str_buf_cat.c
@@ -7,8 +7,22 @@ enc_str_buf_cat(VALUE str, VALUE str2)
     return rb_enc_str_buf_cat(str, RSTRING_PTR(str2), RSTRING_LEN(str2), rb_enc_get(str2));
 }
 
+static VALUE
+str_conv_enc_opts(VALUE str, VALUE from, VALUE to, VALUE ecflags, VALUE ecopts)
+{
+    rb_encoding *from_enc = NIL_P(from) ? NULL : rb_to_encoding(from);
+    rb_encoding *to_enc = NIL_P(to) ? NULL : rb_to_encoding(to);
+    int flags = NUM2INT(ecflags);
+    if (!NIL_P(ecopts)) {
+        Check_Type(ecopts, T_HASH);
+        OBJ_FREEZE(ecopts);
+    }
+    return rb_str_conv_enc_opts(str, from_enc, to_enc, flags, ecopts);
+}
+
 void
-Init_enc_str_buf_cat(VALUE klass)
+Init_string_enc_str_buf_cat(VALUE klass)
 {
     rb_define_method(klass, "enc_str_buf_cat", enc_str_buf_cat, 1);
+    rb_define_method(klass, "str_conv_enc_opts", str_conv_enc_opts, 4);
 }
diff --git a/ext/-test-/string/fstring.c b/ext/-test-/string/fstring.c
index b65c98ce6d..2374319fe3 100644
--- a/ext/-test-/string/fstring.c
+++ b/ext/-test-/string/fstring.c
@@ -1,4 +1,5 @@
 #include "ruby.h"
+#include "ruby/encoding.h"
 
 VALUE rb_fstring(VALUE str);
 
@@ -8,8 +9,22 @@ bug_s_fstring(VALUE self, VALUE str)
     return rb_fstring(str);
 }
 
+VALUE
+bug_s_rb_enc_interned_str(VALUE self, VALUE encoding)
+{
+    return rb_enc_interned_str("foo", 3, RDATA(encoding)->data);
+}
+
+VALUE
+bug_s_rb_enc_str_new(VALUE self, VALUE encoding)
+{
+    return rb_enc_str_new("foo", 3, RDATA(encoding)->data);
+}
+
 void
-Init_fstring(VALUE klass)
+Init_string_fstring(VALUE klass)
 {
     rb_define_singleton_method(klass, "fstring", bug_s_fstring, 1);
+    rb_define_singleton_method(klass, "rb_enc_interned_str", bug_s_rb_enc_interned_str, 1);
+    rb_define_singleton_method(klass, "rb_enc_str_new", bug_s_rb_enc_str_new, 1);
 }
diff --git a/ext/-test-/string/init.c b/ext/-test-/string/init.c
index 0b3e4a6ff2..a74245c8d7 100644
--- a/ext/-test-/string/init.c
+++ b/ext/-test-/string/init.c
@@ -1,6 +1,6 @@
 #include "ruby.h"
 
-#define init(n) {void Init_##n(VALUE klass); Init_##n(klass);}
+#define init(n) {void Init_string_##n(VALUE klass); Init_string_##n(klass);}
 
 void
 Init_string(void)
diff --git a/ext/-test-/string/modify.c b/ext/-test-/string/modify.c
index ddd2efd8f0..945febc7e3 100644
--- a/ext/-test-/string/modify.c
+++ b/ext/-test-/string/modify.c
@@ -15,7 +15,7 @@ bug_str_modify_expand(VALUE str, VALUE expand)
 }
 
 void
-Init_modify(VALUE klass)
+Init_string_modify(VALUE klass)
 {
     rb_define_method(klass, "modify!", bug_str_modify, 0);
     rb_define_method(klass, "modify_expand!", bug_str_modify_expand, 1);
diff --git a/ext/-test-/string/new.c b/ext/-test-/string/new.c
new file mode 100644
index 0000000000..60625b8300
--- /dev/null
+++ b/ext/-test-/string/new.c
@@ -0,0 +1,21 @@
+#include "ruby.h"
+#include "ruby/encoding.h"
+
+static VALUE
+bug_str_buf_new(VALUE self, VALUE len)
+{
+    return rb_str_buf_new(NUM2LONG(len));
+}
+
+static VALUE
+bug_external_str_new(VALUE self, VALUE len, VALUE enc)
+{
+    return rb_external_str_new_with_enc(NULL, NUM2LONG(len), rb_to_encoding(enc));
+}
+
+void
+Init_string_new(VALUE klass)
+{
+    rb_define_singleton_method(klass, "buf_new", bug_str_buf_new, 1);
+    rb_define_singleton_method(klass, "external_new", bug_external_str_new, 2);
+}
diff --git a/ext/-test-/string/nofree.c b/ext/-test-/string/nofree.c
index d3d8071ff9..fdf810c741 100644
--- a/ext/-test-/string/nofree.c
+++ b/ext/-test-/string/nofree.c
@@ -7,7 +7,7 @@ bug_str_nofree(VALUE self)
 }
 
 void
-Init_nofree(VALUE klass)
+Init_string_nofree(VALUE klass)
 {
     rb_define_singleton_method(klass, "nofree", bug_str_nofree, 0);
 }
diff --git a/ext/-test-/string/normalize.c b/ext/-test-/string/normalize.c
index 2e16a4616f..a069288ee8 100644
--- a/ext/-test-/string/normalize.c
+++ b/ext/-test-/string/normalize.c
@@ -1,4 +1,4 @@
-#include "internal.h"
+#include "internal/file.h"
 
 #ifdef __APPLE__
 static VALUE
@@ -11,7 +11,7 @@ normalize_ospath(VALUE str)
 #endif
 
 void
-Init_normalize(VALUE klass)
+Init_string_normalize(VALUE klass)
 {
     rb_define_method(klass, "normalize_ospath", normalize_ospath, 0);
 }
diff --git a/ext/-test-/string/qsort.c b/ext/-test-/string/qsort.c
index 0b34936d38..fb7ea3d8cb 100644
--- a/ext/-test-/string/qsort.c
+++ b/ext/-test-/string/qsort.c
@@ -55,7 +55,7 @@ bug_str_qsort_bang(int argc, VALUE *argv, VALUE str)
 }
 
 void
-Init_qsort(VALUE klass)
+Init_string_qsort(VALUE klass)
 {
     rb_define_method(klass, "qsort!", bug_str_qsort_bang, -1);
 }
diff --git a/ext/-test-/string/rb_interned_str.c b/ext/-test-/string/rb_interned_str.c
new file mode 100644
index 0000000000..47643ec249
--- /dev/null
+++ b/ext/-test-/string/rb_interned_str.c
@@ -0,0 +1,14 @@
+#include "ruby.h"
+
+static VALUE
+bug_rb_interned_str_dup(VALUE self, VALUE str)
+{
+    Check_Type(str, T_STRING);
+    return rb_interned_str(RSTRING_PTR(str), RSTRING_LEN(str));
+}
+
+void
+Init_string_rb_interned_str(VALUE klass)
+{
+    rb_define_singleton_method(klass, "rb_interned_str_dup", bug_rb_interned_str_dup, 1);
+}
diff --git a/ext/-test-/string/rb_str_dup.c b/ext/-test-/string/rb_str_dup.c
new file mode 100644
index 0000000000..a0bd65820f
--- /dev/null
+++ b/ext/-test-/string/rb_str_dup.c
@@ -0,0 +1,35 @@
+#include "ruby.h"
+
+VALUE rb_str_dup(VALUE str);
+
+static VALUE
+bug_rb_str_dup(VALUE self, VALUE str)
+{
+    rb_check_type(str, T_STRING);
+    return rb_str_dup(str);
+}
+
+static VALUE
+bug_shared_string_p(VALUE self, VALUE str)
+{
+    rb_check_type(str, T_STRING);
+    return RB_FL_TEST(str, RUBY_ELTS_SHARED) && RB_FL_TEST(str, RSTRING_NOEMBED) ? Qtrue : Qfalse;
+}
+
+static VALUE
+bug_sharing_with_shared_p(VALUE self, VALUE str)
+{
+    rb_check_type(str, T_STRING);
+    if (bug_shared_string_p(self, str)) {
+        return bug_shared_string_p(self, RSTRING(str)->as.heap.aux.shared);
+    }
+    return Qfalse;
+}
+
+void
+Init_string_rb_str_dup(VALUE klass)
+{
+    rb_define_singleton_method(klass, "rb_str_dup", bug_rb_str_dup, 1);
+    rb_define_singleton_method(klass, "shared_string?", bug_shared_string_p, 1);
+    rb_define_singleton_method(klass, "sharing_with_shared?", bug_sharing_with_shared_p, 1);
+}
diff --git a/ext/-test-/string/set_len.c b/ext/-test-/string/set_len.c
index 3c7d19d778..219cea404c 100644
--- a/ext/-test-/string/set_len.c
+++ b/ext/-test-/string/set_len.c
@@ -8,7 +8,7 @@ bug_str_set_len(VALUE str, VALUE len)
 }
 
 void
-Init_set_len(VALUE klass)
+Init_string_set_len(VALUE klass)
 {
     rb_define_method(klass, "set_len", bug_str_set_len, 1);
 }
diff --git a/ext/-test-/struct/depend b/ext/-test-/struct/depend
new file mode 100644
index 0000000000..166fff21d9
--- /dev/null
+++ b/ext/-test-/struct/depend
@@ -0,0 +1,646 @@
+# AUTOGENERATED DEPENDENCIES START
+duplicate.o: $(RUBY_EXTCONF_H)
+duplicate.o: $(arch_hdrdir)/ruby/config.h
+duplicate.o: $(hdrdir)/ruby.h
+duplicate.o: $(hdrdir)/ruby/internal/anyargs.h
+duplicate.o: $(hdrdir)/ruby/internal/arithmetic.h
+duplicate.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+duplicate.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+duplicate.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+duplicate.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+duplicate.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+duplicate.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+duplicate.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+duplicate.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+duplicate.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+duplicate.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+duplicate.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+duplicate.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+duplicate.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+duplicate.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+duplicate.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+duplicate.o: $(hdrdir)/ruby/internal/assume.h
+duplicate.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+duplicate.o: $(hdrdir)/ruby/internal/attr/artificial.h
+duplicate.o: $(hdrdir)/ruby/internal/attr/cold.h
+duplicate.o: $(hdrdir)/ruby/internal/attr/const.h
+duplicate.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+duplicate.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+duplicate.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+duplicate.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+duplicate.o: $(hdrdir)/ruby/internal/attr/error.h
+duplicate.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+duplicate.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+duplicate.o: $(hdrdir)/ruby/internal/attr/format.h
+duplicate.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+duplicate.o: $(hdrdir)/ruby/internal/attr/noalias.h
+duplicate.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+duplicate.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+duplicate.o: $(hdrdir)/ruby/internal/attr/noinline.h
+duplicate.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+duplicate.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+duplicate.o: $(hdrdir)/ruby/internal/attr/pure.h
+duplicate.o: $(hdrdir)/ruby/internal/attr/restrict.h
+duplicate.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+duplicate.o: $(hdrdir)/ruby/internal/attr/warning.h
+duplicate.o: $(hdrdir)/ruby/internal/attr/weakref.h
+duplicate.o: $(hdrdir)/ruby/internal/cast.h
+duplicate.o: $(hdrdir)/ruby/internal/compiler_is.h
+duplicate.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+duplicate.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+duplicate.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+duplicate.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+duplicate.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+duplicate.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+duplicate.o: $(hdrdir)/ruby/internal/compiler_since.h
+duplicate.o: $(hdrdir)/ruby/internal/config.h
+duplicate.o: $(hdrdir)/ruby/internal/constant_p.h
+duplicate.o: $(hdrdir)/ruby/internal/core.h
+duplicate.o: $(hdrdir)/ruby/internal/core/rarray.h
+duplicate.o: $(hdrdir)/ruby/internal/core/rbasic.h
+duplicate.o: $(hdrdir)/ruby/internal/core/rbignum.h
+duplicate.o: $(hdrdir)/ruby/internal/core/rclass.h
+duplicate.o: $(hdrdir)/ruby/internal/core/rdata.h
+duplicate.o: $(hdrdir)/ruby/internal/core/rfile.h
+duplicate.o: $(hdrdir)/ruby/internal/core/rhash.h
+duplicate.o: $(hdrdir)/ruby/internal/core/robject.h
+duplicate.o: $(hdrdir)/ruby/internal/core/rregexp.h
+duplicate.o: $(hdrdir)/ruby/internal/core/rstring.h
+duplicate.o: $(hdrdir)/ruby/internal/core/rstruct.h
+duplicate.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+duplicate.o: $(hdrdir)/ruby/internal/ctype.h
+duplicate.o: $(hdrdir)/ruby/internal/dllexport.h
+duplicate.o: $(hdrdir)/ruby/internal/dosish.h
+duplicate.o: $(hdrdir)/ruby/internal/error.h
+duplicate.o: $(hdrdir)/ruby/internal/eval.h
+duplicate.o: $(hdrdir)/ruby/internal/event.h
+duplicate.o: $(hdrdir)/ruby/internal/fl_type.h
+duplicate.o: $(hdrdir)/ruby/internal/gc.h
+duplicate.o: $(hdrdir)/ruby/internal/glob.h
+duplicate.o: $(hdrdir)/ruby/internal/globals.h
+duplicate.o: $(hdrdir)/ruby/internal/has/attribute.h
+duplicate.o: $(hdrdir)/ruby/internal/has/builtin.h
+duplicate.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+duplicate.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+duplicate.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+duplicate.o: $(hdrdir)/ruby/internal/has/extension.h
+duplicate.o: $(hdrdir)/ruby/internal/has/feature.h
+duplicate.o: $(hdrdir)/ruby/internal/has/warning.h
+duplicate.o: $(hdrdir)/ruby/internal/intern/array.h
+duplicate.o: $(hdrdir)/ruby/internal/intern/bignum.h
+duplicate.o: $(hdrdir)/ruby/internal/intern/class.h
+duplicate.o: $(hdrdir)/ruby/internal/intern/compar.h
+duplicate.o: $(hdrdir)/ruby/internal/intern/complex.h
+duplicate.o: $(hdrdir)/ruby/internal/intern/cont.h
+duplicate.o: $(hdrdir)/ruby/internal/intern/dir.h
+duplicate.o: $(hdrdir)/ruby/internal/intern/enum.h
+duplicate.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+duplicate.o: $(hdrdir)/ruby/internal/intern/error.h
+duplicate.o: $(hdrdir)/ruby/internal/intern/eval.h
+duplicate.o: $(hdrdir)/ruby/internal/intern/file.h
+duplicate.o: $(hdrdir)/ruby/internal/intern/gc.h
+duplicate.o: $(hdrdir)/ruby/internal/intern/hash.h
+duplicate.o: $(hdrdir)/ruby/internal/intern/io.h
+duplicate.o: $(hdrdir)/ruby/internal/intern/load.h
+duplicate.o: $(hdrdir)/ruby/internal/intern/marshal.h
+duplicate.o: $(hdrdir)/ruby/internal/intern/numeric.h
+duplicate.o: $(hdrdir)/ruby/internal/intern/object.h
+duplicate.o: $(hdrdir)/ruby/internal/intern/parse.h
+duplicate.o: $(hdrdir)/ruby/internal/intern/proc.h
+duplicate.o: $(hdrdir)/ruby/internal/intern/process.h
+duplicate.o: $(hdrdir)/ruby/internal/intern/random.h
+duplicate.o: $(hdrdir)/ruby/internal/intern/range.h
+duplicate.o: $(hdrdir)/ruby/internal/intern/rational.h
+duplicate.o: $(hdrdir)/ruby/internal/intern/re.h
+duplicate.o: $(hdrdir)/ruby/internal/intern/ruby.h
+duplicate.o: $(hdrdir)/ruby/internal/intern/select.h
+duplicate.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+duplicate.o: $(hdrdir)/ruby/internal/intern/signal.h
+duplicate.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+duplicate.o: $(hdrdir)/ruby/internal/intern/string.h
+duplicate.o: $(hdrdir)/ruby/internal/intern/struct.h
+duplicate.o: $(hdrdir)/ruby/internal/intern/thread.h
+duplicate.o: $(hdrdir)/ruby/internal/intern/time.h
+duplicate.o: $(hdrdir)/ruby/internal/intern/variable.h
+duplicate.o: $(hdrdir)/ruby/internal/intern/vm.h
+duplicate.o: $(hdrdir)/ruby/internal/interpreter.h
+duplicate.o: $(hdrdir)/ruby/internal/iterator.h
+duplicate.o: $(hdrdir)/ruby/internal/memory.h
+duplicate.o: $(hdrdir)/ruby/internal/method.h
+duplicate.o: $(hdrdir)/ruby/internal/module.h
+duplicate.o: $(hdrdir)/ruby/internal/newobj.h
+duplicate.o: $(hdrdir)/ruby/internal/rgengc.h
+duplicate.o: $(hdrdir)/ruby/internal/scan_args.h
+duplicate.o: $(hdrdir)/ruby/internal/special_consts.h
+duplicate.o: $(hdrdir)/ruby/internal/static_assert.h
+duplicate.o: $(hdrdir)/ruby/internal/stdalign.h
+duplicate.o: $(hdrdir)/ruby/internal/stdbool.h
+duplicate.o: $(hdrdir)/ruby/internal/symbol.h
+duplicate.o: $(hdrdir)/ruby/internal/token_paste.h
+duplicate.o: $(hdrdir)/ruby/internal/value.h
+duplicate.o: $(hdrdir)/ruby/internal/value_type.h
+duplicate.o: $(hdrdir)/ruby/internal/variable.h
+duplicate.o: $(hdrdir)/ruby/internal/warning_push.h
+duplicate.o: $(hdrdir)/ruby/internal/xmalloc.h
+duplicate.o: $(hdrdir)/ruby/assert.h
+duplicate.o: $(hdrdir)/ruby/backward.h
+duplicate.o: $(hdrdir)/ruby/backward/2/assume.h
+duplicate.o: $(hdrdir)/ruby/backward/2/attributes.h
+duplicate.o: $(hdrdir)/ruby/backward/2/bool.h
+duplicate.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+duplicate.o: $(hdrdir)/ruby/backward/2/inttypes.h
+duplicate.o: $(hdrdir)/ruby/backward/2/limits.h
+duplicate.o: $(hdrdir)/ruby/backward/2/long_long.h
+duplicate.o: $(hdrdir)/ruby/backward/2/stdalign.h
+duplicate.o: $(hdrdir)/ruby/backward/2/stdarg.h
+duplicate.o: $(hdrdir)/ruby/defines.h
+duplicate.o: $(hdrdir)/ruby/intern.h
+duplicate.o: $(hdrdir)/ruby/missing.h
+duplicate.o: $(hdrdir)/ruby/ruby.h
+duplicate.o: $(hdrdir)/ruby/st.h
+duplicate.o: $(hdrdir)/ruby/subst.h
+duplicate.o: duplicate.c
+init.o: $(RUBY_EXTCONF_H)
+init.o: $(arch_hdrdir)/ruby/config.h
+init.o: $(hdrdir)/ruby.h
+init.o: $(hdrdir)/ruby/internal/anyargs.h
+init.o: $(hdrdir)/ruby/internal/arithmetic.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+init.o: $(hdrdir)/ruby/internal/assume.h
+init.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+init.o: $(hdrdir)/ruby/internal/attr/artificial.h
+init.o: $(hdrdir)/ruby/internal/attr/cold.h
+init.o: $(hdrdir)/ruby/internal/attr/const.h
+init.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+init.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+init.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+init.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+init.o: $(hdrdir)/ruby/internal/attr/error.h
+init.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+init.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+init.o: $(hdrdir)/ruby/internal/attr/format.h
+init.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+init.o: $(hdrdir)/ruby/internal/attr/noalias.h
+init.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+init.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+init.o: $(hdrdir)/ruby/internal/attr/noinline.h
+init.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+init.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+init.o: $(hdrdir)/ruby/internal/attr/pure.h
+init.o: $(hdrdir)/ruby/internal/attr/restrict.h
+init.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+init.o: $(hdrdir)/ruby/internal/attr/warning.h
+init.o: $(hdrdir)/ruby/internal/attr/weakref.h
+init.o: $(hdrdir)/ruby/internal/cast.h
+init.o: $(hdrdir)/ruby/internal/compiler_is.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+init.o: $(hdrdir)/ruby/internal/compiler_since.h
+init.o: $(hdrdir)/ruby/internal/config.h
+init.o: $(hdrdir)/ruby/internal/constant_p.h
+init.o: $(hdrdir)/ruby/internal/core.h
+init.o: $(hdrdir)/ruby/internal/core/rarray.h
+init.o: $(hdrdir)/ruby/internal/core/rbasic.h
+init.o: $(hdrdir)/ruby/internal/core/rbignum.h
+init.o: $(hdrdir)/ruby/internal/core/rclass.h
+init.o: $(hdrdir)/ruby/internal/core/rdata.h
+init.o: $(hdrdir)/ruby/internal/core/rfile.h
+init.o: $(hdrdir)/ruby/internal/core/rhash.h
+init.o: $(hdrdir)/ruby/internal/core/robject.h
+init.o: $(hdrdir)/ruby/internal/core/rregexp.h
+init.o: $(hdrdir)/ruby/internal/core/rstring.h
+init.o: $(hdrdir)/ruby/internal/core/rstruct.h
+init.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+init.o: $(hdrdir)/ruby/internal/ctype.h
+init.o: $(hdrdir)/ruby/internal/dllexport.h
+init.o: $(hdrdir)/ruby/internal/dosish.h
+init.o: $(hdrdir)/ruby/internal/error.h
+init.o: $(hdrdir)/ruby/internal/eval.h
+init.o: $(hdrdir)/ruby/internal/event.h
+init.o: $(hdrdir)/ruby/internal/fl_type.h
+init.o: $(hdrdir)/ruby/internal/gc.h
+init.o: $(hdrdir)/ruby/internal/glob.h
+init.o: $(hdrdir)/ruby/internal/globals.h
+init.o: $(hdrdir)/ruby/internal/has/attribute.h
+init.o: $(hdrdir)/ruby/internal/has/builtin.h
+init.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/extension.h
+init.o: $(hdrdir)/ruby/internal/has/feature.h
+init.o: $(hdrdir)/ruby/internal/has/warning.h
+init.o: $(hdrdir)/ruby/internal/intern/array.h
+init.o: $(hdrdir)/ruby/internal/intern/bignum.h
+init.o: $(hdrdir)/ruby/internal/intern/class.h
+init.o: $(hdrdir)/ruby/internal/intern/compar.h
+init.o: $(hdrdir)/ruby/internal/intern/complex.h
+init.o: $(hdrdir)/ruby/internal/intern/cont.h
+init.o: $(hdrdir)/ruby/internal/intern/dir.h
+init.o: $(hdrdir)/ruby/internal/intern/enum.h
+init.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+init.o: $(hdrdir)/ruby/internal/intern/error.h
+init.o: $(hdrdir)/ruby/internal/intern/eval.h
+init.o: $(hdrdir)/ruby/internal/intern/file.h
+init.o: $(hdrdir)/ruby/internal/intern/gc.h
+init.o: $(hdrdir)/ruby/internal/intern/hash.h
+init.o: $(hdrdir)/ruby/internal/intern/io.h
+init.o: $(hdrdir)/ruby/internal/intern/load.h
+init.o: $(hdrdir)/ruby/internal/intern/marshal.h
+init.o: $(hdrdir)/ruby/internal/intern/numeric.h
+init.o: $(hdrdir)/ruby/internal/intern/object.h
+init.o: $(hdrdir)/ruby/internal/intern/parse.h
+init.o: $(hdrdir)/ruby/internal/intern/proc.h
+init.o: $(hdrdir)/ruby/internal/intern/process.h
+init.o: $(hdrdir)/ruby/internal/intern/random.h
+init.o: $(hdrdir)/ruby/internal/intern/range.h
+init.o: $(hdrdir)/ruby/internal/intern/rational.h
+init.o: $(hdrdir)/ruby/internal/intern/re.h
+init.o: $(hdrdir)/ruby/internal/intern/ruby.h
+init.o: $(hdrdir)/ruby/internal/intern/select.h
+init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+init.o: $(hdrdir)/ruby/internal/intern/signal.h
+init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+init.o: $(hdrdir)/ruby/internal/intern/string.h
+init.o: $(hdrdir)/ruby/internal/intern/struct.h
+init.o: $(hdrdir)/ruby/internal/intern/thread.h
+init.o: $(hdrdir)/ruby/internal/intern/time.h
+init.o: $(hdrdir)/ruby/internal/intern/variable.h
+init.o: $(hdrdir)/ruby/internal/intern/vm.h
+init.o: $(hdrdir)/ruby/internal/interpreter.h
+init.o: $(hdrdir)/ruby/internal/iterator.h
+init.o: $(hdrdir)/ruby/internal/memory.h
+init.o: $(hdrdir)/ruby/internal/method.h
+init.o: $(hdrdir)/ruby/internal/module.h
+init.o: $(hdrdir)/ruby/internal/newobj.h
+init.o: $(hdrdir)/ruby/internal/rgengc.h
+init.o: $(hdrdir)/ruby/internal/scan_args.h
+init.o: $(hdrdir)/ruby/internal/special_consts.h
+init.o: $(hdrdir)/ruby/internal/static_assert.h
+init.o: $(hdrdir)/ruby/internal/stdalign.h
+init.o: $(hdrdir)/ruby/internal/stdbool.h
+init.o: $(hdrdir)/ruby/internal/symbol.h
+init.o: $(hdrdir)/ruby/internal/token_paste.h
+init.o: $(hdrdir)/ruby/internal/value.h
+init.o: $(hdrdir)/ruby/internal/value_type.h
+init.o: $(hdrdir)/ruby/internal/variable.h
+init.o: $(hdrdir)/ruby/internal/warning_push.h
+init.o: $(hdrdir)/ruby/internal/xmalloc.h
+init.o: $(hdrdir)/ruby/assert.h
+init.o: $(hdrdir)/ruby/backward.h
+init.o: $(hdrdir)/ruby/backward/2/assume.h
+init.o: $(hdrdir)/ruby/backward/2/attributes.h
+init.o: $(hdrdir)/ruby/backward/2/bool.h
+init.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+init.o: $(hdrdir)/ruby/backward/2/inttypes.h
+init.o: $(hdrdir)/ruby/backward/2/limits.h
+init.o: $(hdrdir)/ruby/backward/2/long_long.h
+init.o: $(hdrdir)/ruby/backward/2/stdalign.h
+init.o: $(hdrdir)/ruby/backward/2/stdarg.h
+init.o: $(hdrdir)/ruby/defines.h
+init.o: $(hdrdir)/ruby/intern.h
+init.o: $(hdrdir)/ruby/missing.h
+init.o: $(hdrdir)/ruby/ruby.h
+init.o: $(hdrdir)/ruby/st.h
+init.o: $(hdrdir)/ruby/subst.h
+init.o: init.c
+len.o: $(RUBY_EXTCONF_H)
+len.o: $(arch_hdrdir)/ruby/config.h
+len.o: $(hdrdir)/ruby.h
+len.o: $(hdrdir)/ruby/internal/anyargs.h
+len.o: $(hdrdir)/ruby/internal/arithmetic.h
+len.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+len.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+len.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+len.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+len.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+len.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+len.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+len.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+len.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+len.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+len.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+len.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+len.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+len.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+len.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+len.o: $(hdrdir)/ruby/internal/assume.h
+len.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+len.o: $(hdrdir)/ruby/internal/attr/artificial.h
+len.o: $(hdrdir)/ruby/internal/attr/cold.h
+len.o: $(hdrdir)/ruby/internal/attr/const.h
+len.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+len.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+len.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+len.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+len.o: $(hdrdir)/ruby/internal/attr/error.h
+len.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+len.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+len.o: $(hdrdir)/ruby/internal/attr/format.h
+len.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+len.o: $(hdrdir)/ruby/internal/attr/noalias.h
+len.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+len.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+len.o: $(hdrdir)/ruby/internal/attr/noinline.h
+len.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+len.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+len.o: $(hdrdir)/ruby/internal/attr/pure.h
+len.o: $(hdrdir)/ruby/internal/attr/restrict.h
+len.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+len.o: $(hdrdir)/ruby/internal/attr/warning.h
+len.o: $(hdrdir)/ruby/internal/attr/weakref.h
+len.o: $(hdrdir)/ruby/internal/cast.h
+len.o: $(hdrdir)/ruby/internal/compiler_is.h
+len.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+len.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+len.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+len.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+len.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+len.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+len.o: $(hdrdir)/ruby/internal/compiler_since.h
+len.o: $(hdrdir)/ruby/internal/config.h
+len.o: $(hdrdir)/ruby/internal/constant_p.h
+len.o: $(hdrdir)/ruby/internal/core.h
+len.o: $(hdrdir)/ruby/internal/core/rarray.h
+len.o: $(hdrdir)/ruby/internal/core/rbasic.h
+len.o: $(hdrdir)/ruby/internal/core/rbignum.h
+len.o: $(hdrdir)/ruby/internal/core/rclass.h
+len.o: $(hdrdir)/ruby/internal/core/rdata.h
+len.o: $(hdrdir)/ruby/internal/core/rfile.h
+len.o: $(hdrdir)/ruby/internal/core/rhash.h
+len.o: $(hdrdir)/ruby/internal/core/robject.h
+len.o: $(hdrdir)/ruby/internal/core/rregexp.h
+len.o: $(hdrdir)/ruby/internal/core/rstring.h
+len.o: $(hdrdir)/ruby/internal/core/rstruct.h
+len.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+len.o: $(hdrdir)/ruby/internal/ctype.h
+len.o: $(hdrdir)/ruby/internal/dllexport.h
+len.o: $(hdrdir)/ruby/internal/dosish.h
+len.o: $(hdrdir)/ruby/internal/error.h
+len.o: $(hdrdir)/ruby/internal/eval.h
+len.o: $(hdrdir)/ruby/internal/event.h
+len.o: $(hdrdir)/ruby/internal/fl_type.h
+len.o: $(hdrdir)/ruby/internal/gc.h
+len.o: $(hdrdir)/ruby/internal/glob.h
+len.o: $(hdrdir)/ruby/internal/globals.h
+len.o: $(hdrdir)/ruby/internal/has/attribute.h
+len.o: $(hdrdir)/ruby/internal/has/builtin.h
+len.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+len.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+len.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+len.o: $(hdrdir)/ruby/internal/has/extension.h
+len.o: $(hdrdir)/ruby/internal/has/feature.h
+len.o: $(hdrdir)/ruby/internal/has/warning.h
+len.o: $(hdrdir)/ruby/internal/intern/array.h
+len.o: $(hdrdir)/ruby/internal/intern/bignum.h
+len.o: $(hdrdir)/ruby/internal/intern/class.h
+len.o: $(hdrdir)/ruby/internal/intern/compar.h
+len.o: $(hdrdir)/ruby/internal/intern/complex.h
+len.o: $(hdrdir)/ruby/internal/intern/cont.h
+len.o: $(hdrdir)/ruby/internal/intern/dir.h
+len.o: $(hdrdir)/ruby/internal/intern/enum.h
+len.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+len.o: $(hdrdir)/ruby/internal/intern/error.h
+len.o: $(hdrdir)/ruby/internal/intern/eval.h
+len.o: $(hdrdir)/ruby/internal/intern/file.h
+len.o: $(hdrdir)/ruby/internal/intern/gc.h
+len.o: $(hdrdir)/ruby/internal/intern/hash.h
+len.o: $(hdrdir)/ruby/internal/intern/io.h
+len.o: $(hdrdir)/ruby/internal/intern/load.h
+len.o: $(hdrdir)/ruby/internal/intern/marshal.h
+len.o: $(hdrdir)/ruby/internal/intern/numeric.h
+len.o: $(hdrdir)/ruby/internal/intern/object.h
+len.o: $(hdrdir)/ruby/internal/intern/parse.h
+len.o: $(hdrdir)/ruby/internal/intern/proc.h
+len.o: $(hdrdir)/ruby/internal/intern/process.h
+len.o: $(hdrdir)/ruby/internal/intern/random.h
+len.o: $(hdrdir)/ruby/internal/intern/range.h
+len.o: $(hdrdir)/ruby/internal/intern/rational.h
+len.o: $(hdrdir)/ruby/internal/intern/re.h
+len.o: $(hdrdir)/ruby/internal/intern/ruby.h
+len.o: $(hdrdir)/ruby/internal/intern/select.h
+len.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+len.o: $(hdrdir)/ruby/internal/intern/signal.h
+len.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+len.o: $(hdrdir)/ruby/internal/intern/string.h
+len.o: $(hdrdir)/ruby/internal/intern/struct.h
+len.o: $(hdrdir)/ruby/internal/intern/thread.h
+len.o: $(hdrdir)/ruby/internal/intern/time.h
+len.o: $(hdrdir)/ruby/internal/intern/variable.h
+len.o: $(hdrdir)/ruby/internal/intern/vm.h
+len.o: $(hdrdir)/ruby/internal/interpreter.h
+len.o: $(hdrdir)/ruby/internal/iterator.h
+len.o: $(hdrdir)/ruby/internal/memory.h
+len.o: $(hdrdir)/ruby/internal/method.h
+len.o: $(hdrdir)/ruby/internal/module.h
+len.o: $(hdrdir)/ruby/internal/newobj.h
+len.o: $(hdrdir)/ruby/internal/rgengc.h
+len.o: $(hdrdir)/ruby/internal/scan_args.h
+len.o: $(hdrdir)/ruby/internal/special_consts.h
+len.o: $(hdrdir)/ruby/internal/static_assert.h
+len.o: $(hdrdir)/ruby/internal/stdalign.h
+len.o: $(hdrdir)/ruby/internal/stdbool.h
+len.o: $(hdrdir)/ruby/internal/symbol.h
+len.o: $(hdrdir)/ruby/internal/token_paste.h
+len.o: $(hdrdir)/ruby/internal/value.h
+len.o: $(hdrdir)/ruby/internal/value_type.h
+len.o: $(hdrdir)/ruby/internal/variable.h
+len.o: $(hdrdir)/ruby/internal/warning_push.h
+len.o: $(hdrdir)/ruby/internal/xmalloc.h
+len.o: $(hdrdir)/ruby/assert.h
+len.o: $(hdrdir)/ruby/backward.h
+len.o: $(hdrdir)/ruby/backward/2/assume.h
+len.o: $(hdrdir)/ruby/backward/2/attributes.h
+len.o: $(hdrdir)/ruby/backward/2/bool.h
+len.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+len.o: $(hdrdir)/ruby/backward/2/inttypes.h
+len.o: $(hdrdir)/ruby/backward/2/limits.h
+len.o: $(hdrdir)/ruby/backward/2/long_long.h
+len.o: $(hdrdir)/ruby/backward/2/stdalign.h
+len.o: $(hdrdir)/ruby/backward/2/stdarg.h
+len.o: $(hdrdir)/ruby/defines.h
+len.o: $(hdrdir)/ruby/intern.h
+len.o: $(hdrdir)/ruby/missing.h
+len.o: $(hdrdir)/ruby/ruby.h
+len.o: $(hdrdir)/ruby/st.h
+len.o: $(hdrdir)/ruby/subst.h
+len.o: len.c
+member.o: $(RUBY_EXTCONF_H)
+member.o: $(arch_hdrdir)/ruby/config.h
+member.o: $(hdrdir)/ruby.h
+member.o: $(hdrdir)/ruby/internal/anyargs.h
+member.o: $(hdrdir)/ruby/internal/arithmetic.h
+member.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+member.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+member.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+member.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+member.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+member.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+member.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+member.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+member.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+member.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+member.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+member.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+member.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+member.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+member.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+member.o: $(hdrdir)/ruby/internal/assume.h
+member.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+member.o: $(hdrdir)/ruby/internal/attr/artificial.h
+member.o: $(hdrdir)/ruby/internal/attr/cold.h
+member.o: $(hdrdir)/ruby/internal/attr/const.h
+member.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+member.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+member.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+member.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+member.o: $(hdrdir)/ruby/internal/attr/error.h
+member.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+member.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+member.o: $(hdrdir)/ruby/internal/attr/format.h
+member.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+member.o: $(hdrdir)/ruby/internal/attr/noalias.h
+member.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+member.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+member.o: $(hdrdir)/ruby/internal/attr/noinline.h
+member.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+member.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+member.o: $(hdrdir)/ruby/internal/attr/pure.h
+member.o: $(hdrdir)/ruby/internal/attr/restrict.h
+member.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+member.o: $(hdrdir)/ruby/internal/attr/warning.h
+member.o: $(hdrdir)/ruby/internal/attr/weakref.h
+member.o: $(hdrdir)/ruby/internal/cast.h
+member.o: $(hdrdir)/ruby/internal/compiler_is.h
+member.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+member.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+member.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+member.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+member.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+member.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+member.o: $(hdrdir)/ruby/internal/compiler_since.h
+member.o: $(hdrdir)/ruby/internal/config.h
+member.o: $(hdrdir)/ruby/internal/constant_p.h
+member.o: $(hdrdir)/ruby/internal/core.h
+member.o: $(hdrdir)/ruby/internal/core/rarray.h
+member.o: $(hdrdir)/ruby/internal/core/rbasic.h
+member.o: $(hdrdir)/ruby/internal/core/rbignum.h
+member.o: $(hdrdir)/ruby/internal/core/rclass.h
+member.o: $(hdrdir)/ruby/internal/core/rdata.h
+member.o: $(hdrdir)/ruby/internal/core/rfile.h
+member.o: $(hdrdir)/ruby/internal/core/rhash.h
+member.o: $(hdrdir)/ruby/internal/core/robject.h
+member.o: $(hdrdir)/ruby/internal/core/rregexp.h
+member.o: $(hdrdir)/ruby/internal/core/rstring.h
+member.o: $(hdrdir)/ruby/internal/core/rstruct.h
+member.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+member.o: $(hdrdir)/ruby/internal/ctype.h
+member.o: $(hdrdir)/ruby/internal/dllexport.h
+member.o: $(hdrdir)/ruby/internal/dosish.h
+member.o: $(hdrdir)/ruby/internal/error.h
+member.o: $(hdrdir)/ruby/internal/eval.h
+member.o: $(hdrdir)/ruby/internal/event.h
+member.o: $(hdrdir)/ruby/internal/fl_type.h
+member.o: $(hdrdir)/ruby/internal/gc.h
+member.o: $(hdrdir)/ruby/internal/glob.h
+member.o: $(hdrdir)/ruby/internal/globals.h
+member.o: $(hdrdir)/ruby/internal/has/attribute.h
+member.o: $(hdrdir)/ruby/internal/has/builtin.h
+member.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+member.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+member.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+member.o: $(hdrdir)/ruby/internal/has/extension.h
+member.o: $(hdrdir)/ruby/internal/has/feature.h
+member.o: $(hdrdir)/ruby/internal/has/warning.h
+member.o: $(hdrdir)/ruby/internal/intern/array.h
+member.o: $(hdrdir)/ruby/internal/intern/bignum.h
+member.o: $(hdrdir)/ruby/internal/intern/class.h
+member.o: $(hdrdir)/ruby/internal/intern/compar.h
+member.o: $(hdrdir)/ruby/internal/intern/complex.h
+member.o: $(hdrdir)/ruby/internal/intern/cont.h
+member.o: $(hdrdir)/ruby/internal/intern/dir.h
+member.o: $(hdrdir)/ruby/internal/intern/enum.h
+member.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+member.o: $(hdrdir)/ruby/internal/intern/error.h
+member.o: $(hdrdir)/ruby/internal/intern/eval.h
+member.o: $(hdrdir)/ruby/internal/intern/file.h
+member.o: $(hdrdir)/ruby/internal/intern/gc.h
+member.o: $(hdrdir)/ruby/internal/intern/hash.h
+member.o: $(hdrdir)/ruby/internal/intern/io.h
+member.o: $(hdrdir)/ruby/internal/intern/load.h
+member.o: $(hdrdir)/ruby/internal/intern/marshal.h
+member.o: $(hdrdir)/ruby/internal/intern/numeric.h
+member.o: $(hdrdir)/ruby/internal/intern/object.h
+member.o: $(hdrdir)/ruby/internal/intern/parse.h
+member.o: $(hdrdir)/ruby/internal/intern/proc.h
+member.o: $(hdrdir)/ruby/internal/intern/process.h
+member.o: $(hdrdir)/ruby/internal/intern/random.h
+member.o: $(hdrdir)/ruby/internal/intern/range.h
+member.o: $(hdrdir)/ruby/internal/intern/rational.h
+member.o: $(hdrdir)/ruby/internal/intern/re.h
+member.o: $(hdrdir)/ruby/internal/intern/ruby.h
+member.o: $(hdrdir)/ruby/internal/intern/select.h
+member.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+member.o: $(hdrdir)/ruby/internal/intern/signal.h
+member.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+member.o: $(hdrdir)/ruby/internal/intern/string.h
+member.o: $(hdrdir)/ruby/internal/intern/struct.h
+member.o: $(hdrdir)/ruby/internal/intern/thread.h
+member.o: $(hdrdir)/ruby/internal/intern/time.h
+member.o: $(hdrdir)/ruby/internal/intern/variable.h
+member.o: $(hdrdir)/ruby/internal/intern/vm.h
+member.o: $(hdrdir)/ruby/internal/interpreter.h
+member.o: $(hdrdir)/ruby/internal/iterator.h
+member.o: $(hdrdir)/ruby/internal/memory.h
+member.o: $(hdrdir)/ruby/internal/method.h
+member.o: $(hdrdir)/ruby/internal/module.h
+member.o: $(hdrdir)/ruby/internal/newobj.h
+member.o: $(hdrdir)/ruby/internal/rgengc.h
+member.o: $(hdrdir)/ruby/internal/scan_args.h
+member.o: $(hdrdir)/ruby/internal/special_consts.h
+member.o: $(hdrdir)/ruby/internal/static_assert.h
+member.o: $(hdrdir)/ruby/internal/stdalign.h
+member.o: $(hdrdir)/ruby/internal/stdbool.h
+member.o: $(hdrdir)/ruby/internal/symbol.h
+member.o: $(hdrdir)/ruby/internal/token_paste.h
+member.o: $(hdrdir)/ruby/internal/value.h
+member.o: $(hdrdir)/ruby/internal/value_type.h
+member.o: $(hdrdir)/ruby/internal/variable.h
+member.o: $(hdrdir)/ruby/internal/warning_push.h
+member.o: $(hdrdir)/ruby/internal/xmalloc.h
+member.o: $(hdrdir)/ruby/assert.h
+member.o: $(hdrdir)/ruby/backward.h
+member.o: $(hdrdir)/ruby/backward/2/assume.h
+member.o: $(hdrdir)/ruby/backward/2/attributes.h
+member.o: $(hdrdir)/ruby/backward/2/bool.h
+member.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+member.o: $(hdrdir)/ruby/backward/2/inttypes.h
+member.o: $(hdrdir)/ruby/backward/2/limits.h
+member.o: $(hdrdir)/ruby/backward/2/long_long.h
+member.o: $(hdrdir)/ruby/backward/2/stdalign.h
+member.o: $(hdrdir)/ruby/backward/2/stdarg.h
+member.o: $(hdrdir)/ruby/defines.h
+member.o: $(hdrdir)/ruby/intern.h
+member.o: $(hdrdir)/ruby/missing.h
+member.o: $(hdrdir)/ruby/ruby.h
+member.o: $(hdrdir)/ruby/st.h
+member.o: $(hdrdir)/ruby/subst.h
+member.o: member.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/struct/len.c b/ext/-test-/struct/len.c
new file mode 100644
index 0000000000..6153c720b2
--- /dev/null
+++ b/ext/-test-/struct/len.c
@@ -0,0 +1,13 @@
+#include "ruby.h"
+
+static VALUE
+bug_struct_len(VALUE obj)
+{
+    return LONG2NUM(RSTRUCT_LEN(obj));
+}
+
+void
+Init_len(VALUE klass)
+{
+    rb_define_method(klass, "rstruct_len", bug_struct_len, 0);
+}
diff --git a/ext/-test-/symbol/depend b/ext/-test-/symbol/depend
new file mode 100644
index 0000000000..22d8ca5d23
--- /dev/null
+++ b/ext/-test-/symbol/depend
@@ -0,0 +1,324 @@
+# AUTOGENERATED DEPENDENCIES START
+init.o: $(RUBY_EXTCONF_H)
+init.o: $(arch_hdrdir)/ruby/config.h
+init.o: $(hdrdir)/ruby.h
+init.o: $(hdrdir)/ruby/internal/anyargs.h
+init.o: $(hdrdir)/ruby/internal/arithmetic.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+init.o: $(hdrdir)/ruby/internal/assume.h
+init.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+init.o: $(hdrdir)/ruby/internal/attr/artificial.h
+init.o: $(hdrdir)/ruby/internal/attr/cold.h
+init.o: $(hdrdir)/ruby/internal/attr/const.h
+init.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+init.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+init.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+init.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+init.o: $(hdrdir)/ruby/internal/attr/error.h
+init.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+init.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+init.o: $(hdrdir)/ruby/internal/attr/format.h
+init.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+init.o: $(hdrdir)/ruby/internal/attr/noalias.h
+init.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+init.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+init.o: $(hdrdir)/ruby/internal/attr/noinline.h
+init.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+init.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+init.o: $(hdrdir)/ruby/internal/attr/pure.h
+init.o: $(hdrdir)/ruby/internal/attr/restrict.h
+init.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+init.o: $(hdrdir)/ruby/internal/attr/warning.h
+init.o: $(hdrdir)/ruby/internal/attr/weakref.h
+init.o: $(hdrdir)/ruby/internal/cast.h
+init.o: $(hdrdir)/ruby/internal/compiler_is.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+init.o: $(hdrdir)/ruby/internal/compiler_since.h
+init.o: $(hdrdir)/ruby/internal/config.h
+init.o: $(hdrdir)/ruby/internal/constant_p.h
+init.o: $(hdrdir)/ruby/internal/core.h
+init.o: $(hdrdir)/ruby/internal/core/rarray.h
+init.o: $(hdrdir)/ruby/internal/core/rbasic.h
+init.o: $(hdrdir)/ruby/internal/core/rbignum.h
+init.o: $(hdrdir)/ruby/internal/core/rclass.h
+init.o: $(hdrdir)/ruby/internal/core/rdata.h
+init.o: $(hdrdir)/ruby/internal/core/rfile.h
+init.o: $(hdrdir)/ruby/internal/core/rhash.h
+init.o: $(hdrdir)/ruby/internal/core/robject.h
+init.o: $(hdrdir)/ruby/internal/core/rregexp.h
+init.o: $(hdrdir)/ruby/internal/core/rstring.h
+init.o: $(hdrdir)/ruby/internal/core/rstruct.h
+init.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+init.o: $(hdrdir)/ruby/internal/ctype.h
+init.o: $(hdrdir)/ruby/internal/dllexport.h
+init.o: $(hdrdir)/ruby/internal/dosish.h
+init.o: $(hdrdir)/ruby/internal/error.h
+init.o: $(hdrdir)/ruby/internal/eval.h
+init.o: $(hdrdir)/ruby/internal/event.h
+init.o: $(hdrdir)/ruby/internal/fl_type.h
+init.o: $(hdrdir)/ruby/internal/gc.h
+init.o: $(hdrdir)/ruby/internal/glob.h
+init.o: $(hdrdir)/ruby/internal/globals.h
+init.o: $(hdrdir)/ruby/internal/has/attribute.h
+init.o: $(hdrdir)/ruby/internal/has/builtin.h
+init.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/extension.h
+init.o: $(hdrdir)/ruby/internal/has/feature.h
+init.o: $(hdrdir)/ruby/internal/has/warning.h
+init.o: $(hdrdir)/ruby/internal/intern/array.h
+init.o: $(hdrdir)/ruby/internal/intern/bignum.h
+init.o: $(hdrdir)/ruby/internal/intern/class.h
+init.o: $(hdrdir)/ruby/internal/intern/compar.h
+init.o: $(hdrdir)/ruby/internal/intern/complex.h
+init.o: $(hdrdir)/ruby/internal/intern/cont.h
+init.o: $(hdrdir)/ruby/internal/intern/dir.h
+init.o: $(hdrdir)/ruby/internal/intern/enum.h
+init.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+init.o: $(hdrdir)/ruby/internal/intern/error.h
+init.o: $(hdrdir)/ruby/internal/intern/eval.h
+init.o: $(hdrdir)/ruby/internal/intern/file.h
+init.o: $(hdrdir)/ruby/internal/intern/gc.h
+init.o: $(hdrdir)/ruby/internal/intern/hash.h
+init.o: $(hdrdir)/ruby/internal/intern/io.h
+init.o: $(hdrdir)/ruby/internal/intern/load.h
+init.o: $(hdrdir)/ruby/internal/intern/marshal.h
+init.o: $(hdrdir)/ruby/internal/intern/numeric.h
+init.o: $(hdrdir)/ruby/internal/intern/object.h
+init.o: $(hdrdir)/ruby/internal/intern/parse.h
+init.o: $(hdrdir)/ruby/internal/intern/proc.h
+init.o: $(hdrdir)/ruby/internal/intern/process.h
+init.o: $(hdrdir)/ruby/internal/intern/random.h
+init.o: $(hdrdir)/ruby/internal/intern/range.h
+init.o: $(hdrdir)/ruby/internal/intern/rational.h
+init.o: $(hdrdir)/ruby/internal/intern/re.h
+init.o: $(hdrdir)/ruby/internal/intern/ruby.h
+init.o: $(hdrdir)/ruby/internal/intern/select.h
+init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+init.o: $(hdrdir)/ruby/internal/intern/signal.h
+init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+init.o: $(hdrdir)/ruby/internal/intern/string.h
+init.o: $(hdrdir)/ruby/internal/intern/struct.h
+init.o: $(hdrdir)/ruby/internal/intern/thread.h
+init.o: $(hdrdir)/ruby/internal/intern/time.h
+init.o: $(hdrdir)/ruby/internal/intern/variable.h
+init.o: $(hdrdir)/ruby/internal/intern/vm.h
+init.o: $(hdrdir)/ruby/internal/interpreter.h
+init.o: $(hdrdir)/ruby/internal/iterator.h
+init.o: $(hdrdir)/ruby/internal/memory.h
+init.o: $(hdrdir)/ruby/internal/method.h
+init.o: $(hdrdir)/ruby/internal/module.h
+init.o: $(hdrdir)/ruby/internal/newobj.h
+init.o: $(hdrdir)/ruby/internal/rgengc.h
+init.o: $(hdrdir)/ruby/internal/scan_args.h
+init.o: $(hdrdir)/ruby/internal/special_consts.h
+init.o: $(hdrdir)/ruby/internal/static_assert.h
+init.o: $(hdrdir)/ruby/internal/stdalign.h
+init.o: $(hdrdir)/ruby/internal/stdbool.h
+init.o: $(hdrdir)/ruby/internal/symbol.h
+init.o: $(hdrdir)/ruby/internal/token_paste.h
+init.o: $(hdrdir)/ruby/internal/value.h
+init.o: $(hdrdir)/ruby/internal/value_type.h
+init.o: $(hdrdir)/ruby/internal/variable.h
+init.o: $(hdrdir)/ruby/internal/warning_push.h
+init.o: $(hdrdir)/ruby/internal/xmalloc.h
+init.o: $(hdrdir)/ruby/assert.h
+init.o: $(hdrdir)/ruby/backward.h
+init.o: $(hdrdir)/ruby/backward/2/assume.h
+init.o: $(hdrdir)/ruby/backward/2/attributes.h
+init.o: $(hdrdir)/ruby/backward/2/bool.h
+init.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+init.o: $(hdrdir)/ruby/backward/2/inttypes.h
+init.o: $(hdrdir)/ruby/backward/2/limits.h
+init.o: $(hdrdir)/ruby/backward/2/long_long.h
+init.o: $(hdrdir)/ruby/backward/2/stdalign.h
+init.o: $(hdrdir)/ruby/backward/2/stdarg.h
+init.o: $(hdrdir)/ruby/defines.h
+init.o: $(hdrdir)/ruby/intern.h
+init.o: $(hdrdir)/ruby/missing.h
+init.o: $(hdrdir)/ruby/ruby.h
+init.o: $(hdrdir)/ruby/st.h
+init.o: $(hdrdir)/ruby/subst.h
+init.o: init.c
+type.o: $(RUBY_EXTCONF_H)
+type.o: $(arch_hdrdir)/ruby/config.h
+type.o: $(hdrdir)/ruby.h
+type.o: $(hdrdir)/ruby/internal/anyargs.h
+type.o: $(hdrdir)/ruby/internal/arithmetic.h
+type.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+type.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+type.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+type.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+type.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+type.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+type.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+type.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+type.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+type.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+type.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+type.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+type.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+type.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+type.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+type.o: $(hdrdir)/ruby/internal/assume.h
+type.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+type.o: $(hdrdir)/ruby/internal/attr/artificial.h
+type.o: $(hdrdir)/ruby/internal/attr/cold.h
+type.o: $(hdrdir)/ruby/internal/attr/const.h
+type.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+type.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+type.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+type.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+type.o: $(hdrdir)/ruby/internal/attr/error.h
+type.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+type.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+type.o: $(hdrdir)/ruby/internal/attr/format.h
+type.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+type.o: $(hdrdir)/ruby/internal/attr/noalias.h
+type.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+type.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+type.o: $(hdrdir)/ruby/internal/attr/noinline.h
+type.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+type.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+type.o: $(hdrdir)/ruby/internal/attr/pure.h
+type.o: $(hdrdir)/ruby/internal/attr/restrict.h
+type.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+type.o: $(hdrdir)/ruby/internal/attr/warning.h
+type.o: $(hdrdir)/ruby/internal/attr/weakref.h
+type.o: $(hdrdir)/ruby/internal/cast.h
+type.o: $(hdrdir)/ruby/internal/compiler_is.h
+type.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+type.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+type.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+type.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+type.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+type.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+type.o: $(hdrdir)/ruby/internal/compiler_since.h
+type.o: $(hdrdir)/ruby/internal/config.h
+type.o: $(hdrdir)/ruby/internal/constant_p.h
+type.o: $(hdrdir)/ruby/internal/core.h
+type.o: $(hdrdir)/ruby/internal/core/rarray.h
+type.o: $(hdrdir)/ruby/internal/core/rbasic.h
+type.o: $(hdrdir)/ruby/internal/core/rbignum.h
+type.o: $(hdrdir)/ruby/internal/core/rclass.h
+type.o: $(hdrdir)/ruby/internal/core/rdata.h
+type.o: $(hdrdir)/ruby/internal/core/rfile.h
+type.o: $(hdrdir)/ruby/internal/core/rhash.h
+type.o: $(hdrdir)/ruby/internal/core/robject.h
+type.o: $(hdrdir)/ruby/internal/core/rregexp.h
+type.o: $(hdrdir)/ruby/internal/core/rstring.h
+type.o: $(hdrdir)/ruby/internal/core/rstruct.h
+type.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+type.o: $(hdrdir)/ruby/internal/ctype.h
+type.o: $(hdrdir)/ruby/internal/dllexport.h
+type.o: $(hdrdir)/ruby/internal/dosish.h
+type.o: $(hdrdir)/ruby/internal/error.h
+type.o: $(hdrdir)/ruby/internal/eval.h
+type.o: $(hdrdir)/ruby/internal/event.h
+type.o: $(hdrdir)/ruby/internal/fl_type.h
+type.o: $(hdrdir)/ruby/internal/gc.h
+type.o: $(hdrdir)/ruby/internal/glob.h
+type.o: $(hdrdir)/ruby/internal/globals.h
+type.o: $(hdrdir)/ruby/internal/has/attribute.h
+type.o: $(hdrdir)/ruby/internal/has/builtin.h
+type.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+type.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+type.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+type.o: $(hdrdir)/ruby/internal/has/extension.h
+type.o: $(hdrdir)/ruby/internal/has/feature.h
+type.o: $(hdrdir)/ruby/internal/has/warning.h
+type.o: $(hdrdir)/ruby/internal/intern/array.h
+type.o: $(hdrdir)/ruby/internal/intern/bignum.h
+type.o: $(hdrdir)/ruby/internal/intern/class.h
+type.o: $(hdrdir)/ruby/internal/intern/compar.h
+type.o: $(hdrdir)/ruby/internal/intern/complex.h
+type.o: $(hdrdir)/ruby/internal/intern/cont.h
+type.o: $(hdrdir)/ruby/internal/intern/dir.h
+type.o: $(hdrdir)/ruby/internal/intern/enum.h
+type.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+type.o: $(hdrdir)/ruby/internal/intern/error.h
+type.o: $(hdrdir)/ruby/internal/intern/eval.h
+type.o: $(hdrdir)/ruby/internal/intern/file.h
+type.o: $(hdrdir)/ruby/internal/intern/gc.h
+type.o: $(hdrdir)/ruby/internal/intern/hash.h
+type.o: $(hdrdir)/ruby/internal/intern/io.h
+type.o: $(hdrdir)/ruby/internal/intern/load.h
+type.o: $(hdrdir)/ruby/internal/intern/marshal.h
+type.o: $(hdrdir)/ruby/internal/intern/numeric.h
+type.o: $(hdrdir)/ruby/internal/intern/object.h
+type.o: $(hdrdir)/ruby/internal/intern/parse.h
+type.o: $(hdrdir)/ruby/internal/intern/proc.h
+type.o: $(hdrdir)/ruby/internal/intern/process.h
+type.o: $(hdrdir)/ruby/internal/intern/random.h
+type.o: $(hdrdir)/ruby/internal/intern/range.h
+type.o: $(hdrdir)/ruby/internal/intern/rational.h
+type.o: $(hdrdir)/ruby/internal/intern/re.h
+type.o: $(hdrdir)/ruby/internal/intern/ruby.h
+type.o: $(hdrdir)/ruby/internal/intern/select.h
+type.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+type.o: $(hdrdir)/ruby/internal/intern/signal.h
+type.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+type.o: $(hdrdir)/ruby/internal/intern/string.h
+type.o: $(hdrdir)/ruby/internal/intern/struct.h
+type.o: $(hdrdir)/ruby/internal/intern/thread.h
+type.o: $(hdrdir)/ruby/internal/intern/time.h
+type.o: $(hdrdir)/ruby/internal/intern/variable.h
+type.o: $(hdrdir)/ruby/internal/intern/vm.h
+type.o: $(hdrdir)/ruby/internal/interpreter.h
+type.o: $(hdrdir)/ruby/internal/iterator.h
+type.o: $(hdrdir)/ruby/internal/memory.h
+type.o: $(hdrdir)/ruby/internal/method.h
+type.o: $(hdrdir)/ruby/internal/module.h
+type.o: $(hdrdir)/ruby/internal/newobj.h
+type.o: $(hdrdir)/ruby/internal/rgengc.h
+type.o: $(hdrdir)/ruby/internal/scan_args.h
+type.o: $(hdrdir)/ruby/internal/special_consts.h
+type.o: $(hdrdir)/ruby/internal/static_assert.h
+type.o: $(hdrdir)/ruby/internal/stdalign.h
+type.o: $(hdrdir)/ruby/internal/stdbool.h
+type.o: $(hdrdir)/ruby/internal/symbol.h
+type.o: $(hdrdir)/ruby/internal/token_paste.h
+type.o: $(hdrdir)/ruby/internal/value.h
+type.o: $(hdrdir)/ruby/internal/value_type.h
+type.o: $(hdrdir)/ruby/internal/variable.h
+type.o: $(hdrdir)/ruby/internal/warning_push.h
+type.o: $(hdrdir)/ruby/internal/xmalloc.h
+type.o: $(hdrdir)/ruby/assert.h
+type.o: $(hdrdir)/ruby/backward.h
+type.o: $(hdrdir)/ruby/backward/2/assume.h
+type.o: $(hdrdir)/ruby/backward/2/attributes.h
+type.o: $(hdrdir)/ruby/backward/2/bool.h
+type.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+type.o: $(hdrdir)/ruby/backward/2/inttypes.h
+type.o: $(hdrdir)/ruby/backward/2/limits.h
+type.o: $(hdrdir)/ruby/backward/2/long_long.h
+type.o: $(hdrdir)/ruby/backward/2/stdalign.h
+type.o: $(hdrdir)/ruby/backward/2/stdarg.h
+type.o: $(hdrdir)/ruby/defines.h
+type.o: $(hdrdir)/ruby/intern.h
+type.o: $(hdrdir)/ruby/missing.h
+type.o: $(hdrdir)/ruby/ruby.h
+type.o: $(hdrdir)/ruby/st.h
+type.o: $(hdrdir)/ruby/subst.h
+type.o: type.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/symbol/init.c b/ext/-test-/symbol/init.c
index 9e42e1a38b..4038701ac9 100644
--- a/ext/-test-/symbol/init.c
+++ b/ext/-test-/symbol/init.c
@@ -11,7 +11,20 @@ sym_find(VALUE dummy, VALUE sym)
 static VALUE
 sym_pinneddown_p(VALUE dummy, VALUE sym)
 {
-    return rb_check_id(&sym) ? Qtrue : Qfalse;
+    ID id = rb_check_id(&sym);
+    if (!id) return Qnil;
+#ifdef ULL2NUM
+    return ULL2NUM(id);
+#else
+    return ULONG2NUM(id);
+#endif
+}
+
+static VALUE
+sym_iv_get(VALUE dummy, VALUE obj, VALUE name)
+{
+    const char *n = StringValueCStr(name);
+    return rb_iv_get(obj, n);
 }
 
 void
@@ -21,5 +34,6 @@ Init_symbol(void)
     VALUE klass = rb_define_class_under(mBug, "Symbol", rb_cSymbol);
     rb_define_singleton_method(klass, "find", sym_find, 1);
     rb_define_singleton_method(klass, "pinneddown?", sym_pinneddown_p, 1);
+    rb_define_singleton_method(klass, "iv_get", sym_iv_get, 2);
     TEST_INIT_FUNCS(init);
 }
diff --git a/ext/-test-/thread_fd_close/depend b/ext/-test-/thread_fd_close/depend
new file mode 100644
index 0000000000..b04bfe7deb
--- /dev/null
+++ b/ext/-test-/thread_fd_close/depend
@@ -0,0 +1,162 @@
+# AUTOGENERATED DEPENDENCIES START
+thread_fd_close.o: $(RUBY_EXTCONF_H)
+thread_fd_close.o: $(arch_hdrdir)/ruby/config.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/anyargs.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/arithmetic.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/assume.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/attr/artificial.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/attr/cold.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/attr/const.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/attr/error.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/attr/format.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/attr/noalias.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/attr/noinline.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/attr/pure.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/attr/restrict.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/attr/warning.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/attr/weakref.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/cast.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/compiler_is.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/compiler_since.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/config.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/constant_p.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/core.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/core/rarray.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/core/rbasic.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/core/rbignum.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/core/rclass.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/core/rdata.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/core/rfile.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/core/rhash.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/core/robject.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/core/rregexp.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/core/rstring.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/core/rstruct.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/ctype.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/dllexport.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/dosish.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/error.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/eval.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/event.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/fl_type.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/gc.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/glob.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/globals.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/has/attribute.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/has/builtin.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/has/extension.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/has/feature.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/has/warning.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/intern/array.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/intern/bignum.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/intern/class.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/intern/compar.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/intern/complex.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/intern/cont.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/intern/dir.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/intern/enum.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/intern/error.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/intern/eval.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/intern/file.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/intern/gc.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/intern/hash.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/intern/io.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/intern/load.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/intern/marshal.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/intern/numeric.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/intern/object.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/intern/parse.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/intern/proc.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/intern/process.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/intern/random.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/intern/range.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/intern/rational.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/intern/re.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/intern/ruby.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/intern/select.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/intern/signal.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/intern/string.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/intern/struct.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/intern/thread.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/intern/time.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/intern/variable.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/intern/vm.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/interpreter.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/iterator.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/memory.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/method.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/module.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/newobj.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/rgengc.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/scan_args.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/special_consts.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/static_assert.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/stdalign.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/stdbool.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/symbol.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/token_paste.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/value.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/value_type.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/variable.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/warning_push.h
+thread_fd_close.o: $(hdrdir)/ruby/internal/xmalloc.h
+thread_fd_close.o: $(hdrdir)/ruby/assert.h
+thread_fd_close.o: $(hdrdir)/ruby/backward.h
+thread_fd_close.o: $(hdrdir)/ruby/backward/2/assume.h
+thread_fd_close.o: $(hdrdir)/ruby/backward/2/attributes.h
+thread_fd_close.o: $(hdrdir)/ruby/backward/2/bool.h
+thread_fd_close.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+thread_fd_close.o: $(hdrdir)/ruby/backward/2/inttypes.h
+thread_fd_close.o: $(hdrdir)/ruby/backward/2/limits.h
+thread_fd_close.o: $(hdrdir)/ruby/backward/2/long_long.h
+thread_fd_close.o: $(hdrdir)/ruby/backward/2/stdalign.h
+thread_fd_close.o: $(hdrdir)/ruby/backward/2/stdarg.h
+thread_fd_close.o: $(hdrdir)/ruby/defines.h
+thread_fd_close.o: $(hdrdir)/ruby/intern.h
+thread_fd_close.o: $(hdrdir)/ruby/missing.h
+thread_fd_close.o: $(hdrdir)/ruby/ruby.h
+thread_fd_close.o: $(hdrdir)/ruby/st.h
+thread_fd_close.o: $(hdrdir)/ruby/subst.h
+thread_fd_close.o: thread_fd_close.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/thread_fd_close/extconf.rb b/ext/-test-/thread_fd_close/extconf.rb
new file mode 100644
index 0000000000..0d9694539c
--- /dev/null
+++ b/ext/-test-/thread_fd_close/extconf.rb
@@ -0,0 +1,2 @@
+# frozen_string_literal: true
+create_makefile('-test-/thread_fd_close')
diff --git a/ext/-test-/thread_fd_close/thread_fd_close.c b/ext/-test-/thread_fd_close/thread_fd_close.c
new file mode 100644
index 0000000000..4fd967c5b3
--- /dev/null
+++ b/ext/-test-/thread_fd_close/thread_fd_close.c
@@ -0,0 +1,14 @@
+#include "ruby/ruby.h"
+
+static VALUE
+thread_fd_close(VALUE ign, VALUE fd)
+{
+    rb_thread_fd_close(NUM2INT(fd));
+    return Qnil;
+}
+
+void
+Init_thread_fd_close(void)
+{
+    rb_define_singleton_method(rb_cIO, "thread_fd_close", thread_fd_close, 1);
+}
diff --git a/ext/-test-/time/depend b/ext/-test-/time/depend
new file mode 100644
index 0000000000..a3f1ea235b
--- /dev/null
+++ b/ext/-test-/time/depend
@@ -0,0 +1,489 @@
+# AUTOGENERATED DEPENDENCIES START
+init.o: $(RUBY_EXTCONF_H)
+init.o: $(arch_hdrdir)/ruby/config.h
+init.o: $(hdrdir)/ruby.h
+init.o: $(hdrdir)/ruby/internal/anyargs.h
+init.o: $(hdrdir)/ruby/internal/arithmetic.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+init.o: $(hdrdir)/ruby/internal/assume.h
+init.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+init.o: $(hdrdir)/ruby/internal/attr/artificial.h
+init.o: $(hdrdir)/ruby/internal/attr/cold.h
+init.o: $(hdrdir)/ruby/internal/attr/const.h
+init.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+init.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+init.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+init.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+init.o: $(hdrdir)/ruby/internal/attr/error.h
+init.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+init.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+init.o: $(hdrdir)/ruby/internal/attr/format.h
+init.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+init.o: $(hdrdir)/ruby/internal/attr/noalias.h
+init.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+init.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+init.o: $(hdrdir)/ruby/internal/attr/noinline.h
+init.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+init.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+init.o: $(hdrdir)/ruby/internal/attr/pure.h
+init.o: $(hdrdir)/ruby/internal/attr/restrict.h
+init.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+init.o: $(hdrdir)/ruby/internal/attr/warning.h
+init.o: $(hdrdir)/ruby/internal/attr/weakref.h
+init.o: $(hdrdir)/ruby/internal/cast.h
+init.o: $(hdrdir)/ruby/internal/compiler_is.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+init.o: $(hdrdir)/ruby/internal/compiler_since.h
+init.o: $(hdrdir)/ruby/internal/config.h
+init.o: $(hdrdir)/ruby/internal/constant_p.h
+init.o: $(hdrdir)/ruby/internal/core.h
+init.o: $(hdrdir)/ruby/internal/core/rarray.h
+init.o: $(hdrdir)/ruby/internal/core/rbasic.h
+init.o: $(hdrdir)/ruby/internal/core/rbignum.h
+init.o: $(hdrdir)/ruby/internal/core/rclass.h
+init.o: $(hdrdir)/ruby/internal/core/rdata.h
+init.o: $(hdrdir)/ruby/internal/core/rfile.h
+init.o: $(hdrdir)/ruby/internal/core/rhash.h
+init.o: $(hdrdir)/ruby/internal/core/robject.h
+init.o: $(hdrdir)/ruby/internal/core/rregexp.h
+init.o: $(hdrdir)/ruby/internal/core/rstring.h
+init.o: $(hdrdir)/ruby/internal/core/rstruct.h
+init.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+init.o: $(hdrdir)/ruby/internal/ctype.h
+init.o: $(hdrdir)/ruby/internal/dllexport.h
+init.o: $(hdrdir)/ruby/internal/dosish.h
+init.o: $(hdrdir)/ruby/internal/error.h
+init.o: $(hdrdir)/ruby/internal/eval.h
+init.o: $(hdrdir)/ruby/internal/event.h
+init.o: $(hdrdir)/ruby/internal/fl_type.h
+init.o: $(hdrdir)/ruby/internal/gc.h
+init.o: $(hdrdir)/ruby/internal/glob.h
+init.o: $(hdrdir)/ruby/internal/globals.h
+init.o: $(hdrdir)/ruby/internal/has/attribute.h
+init.o: $(hdrdir)/ruby/internal/has/builtin.h
+init.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/extension.h
+init.o: $(hdrdir)/ruby/internal/has/feature.h
+init.o: $(hdrdir)/ruby/internal/has/warning.h
+init.o: $(hdrdir)/ruby/internal/intern/array.h
+init.o: $(hdrdir)/ruby/internal/intern/bignum.h
+init.o: $(hdrdir)/ruby/internal/intern/class.h
+init.o: $(hdrdir)/ruby/internal/intern/compar.h
+init.o: $(hdrdir)/ruby/internal/intern/complex.h
+init.o: $(hdrdir)/ruby/internal/intern/cont.h
+init.o: $(hdrdir)/ruby/internal/intern/dir.h
+init.o: $(hdrdir)/ruby/internal/intern/enum.h
+init.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+init.o: $(hdrdir)/ruby/internal/intern/error.h
+init.o: $(hdrdir)/ruby/internal/intern/eval.h
+init.o: $(hdrdir)/ruby/internal/intern/file.h
+init.o: $(hdrdir)/ruby/internal/intern/gc.h
+init.o: $(hdrdir)/ruby/internal/intern/hash.h
+init.o: $(hdrdir)/ruby/internal/intern/io.h
+init.o: $(hdrdir)/ruby/internal/intern/load.h
+init.o: $(hdrdir)/ruby/internal/intern/marshal.h
+init.o: $(hdrdir)/ruby/internal/intern/numeric.h
+init.o: $(hdrdir)/ruby/internal/intern/object.h
+init.o: $(hdrdir)/ruby/internal/intern/parse.h
+init.o: $(hdrdir)/ruby/internal/intern/proc.h
+init.o: $(hdrdir)/ruby/internal/intern/process.h
+init.o: $(hdrdir)/ruby/internal/intern/random.h
+init.o: $(hdrdir)/ruby/internal/intern/range.h
+init.o: $(hdrdir)/ruby/internal/intern/rational.h
+init.o: $(hdrdir)/ruby/internal/intern/re.h
+init.o: $(hdrdir)/ruby/internal/intern/ruby.h
+init.o: $(hdrdir)/ruby/internal/intern/select.h
+init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+init.o: $(hdrdir)/ruby/internal/intern/signal.h
+init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+init.o: $(hdrdir)/ruby/internal/intern/string.h
+init.o: $(hdrdir)/ruby/internal/intern/struct.h
+init.o: $(hdrdir)/ruby/internal/intern/thread.h
+init.o: $(hdrdir)/ruby/internal/intern/time.h
+init.o: $(hdrdir)/ruby/internal/intern/variable.h
+init.o: $(hdrdir)/ruby/internal/intern/vm.h
+init.o: $(hdrdir)/ruby/internal/interpreter.h
+init.o: $(hdrdir)/ruby/internal/iterator.h
+init.o: $(hdrdir)/ruby/internal/memory.h
+init.o: $(hdrdir)/ruby/internal/method.h
+init.o: $(hdrdir)/ruby/internal/module.h
+init.o: $(hdrdir)/ruby/internal/newobj.h
+init.o: $(hdrdir)/ruby/internal/rgengc.h
+init.o: $(hdrdir)/ruby/internal/scan_args.h
+init.o: $(hdrdir)/ruby/internal/special_consts.h
+init.o: $(hdrdir)/ruby/internal/static_assert.h
+init.o: $(hdrdir)/ruby/internal/stdalign.h
+init.o: $(hdrdir)/ruby/internal/stdbool.h
+init.o: $(hdrdir)/ruby/internal/symbol.h
+init.o: $(hdrdir)/ruby/internal/token_paste.h
+init.o: $(hdrdir)/ruby/internal/value.h
+init.o: $(hdrdir)/ruby/internal/value_type.h
+init.o: $(hdrdir)/ruby/internal/variable.h
+init.o: $(hdrdir)/ruby/internal/warning_push.h
+init.o: $(hdrdir)/ruby/internal/xmalloc.h
+init.o: $(hdrdir)/ruby/assert.h
+init.o: $(hdrdir)/ruby/backward.h
+init.o: $(hdrdir)/ruby/backward/2/assume.h
+init.o: $(hdrdir)/ruby/backward/2/attributes.h
+init.o: $(hdrdir)/ruby/backward/2/bool.h
+init.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+init.o: $(hdrdir)/ruby/backward/2/inttypes.h
+init.o: $(hdrdir)/ruby/backward/2/limits.h
+init.o: $(hdrdir)/ruby/backward/2/long_long.h
+init.o: $(hdrdir)/ruby/backward/2/stdalign.h
+init.o: $(hdrdir)/ruby/backward/2/stdarg.h
+init.o: $(hdrdir)/ruby/defines.h
+init.o: $(hdrdir)/ruby/intern.h
+init.o: $(hdrdir)/ruby/missing.h
+init.o: $(hdrdir)/ruby/ruby.h
+init.o: $(hdrdir)/ruby/st.h
+init.o: $(hdrdir)/ruby/subst.h
+init.o: init.c
+leap_second.o: $(RUBY_EXTCONF_H)
+leap_second.o: $(arch_hdrdir)/ruby/config.h
+leap_second.o: $(hdrdir)/ruby.h
+leap_second.o: $(hdrdir)/ruby/internal/anyargs.h
+leap_second.o: $(hdrdir)/ruby/internal/arithmetic.h
+leap_second.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+leap_second.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+leap_second.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+leap_second.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+leap_second.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+leap_second.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+leap_second.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+leap_second.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+leap_second.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+leap_second.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+leap_second.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+leap_second.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+leap_second.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+leap_second.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+leap_second.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+leap_second.o: $(hdrdir)/ruby/internal/assume.h
+leap_second.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+leap_second.o: $(hdrdir)/ruby/internal/attr/artificial.h
+leap_second.o: $(hdrdir)/ruby/internal/attr/cold.h
+leap_second.o: $(hdrdir)/ruby/internal/attr/const.h
+leap_second.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+leap_second.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+leap_second.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+leap_second.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+leap_second.o: $(hdrdir)/ruby/internal/attr/error.h
+leap_second.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+leap_second.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+leap_second.o: $(hdrdir)/ruby/internal/attr/format.h
+leap_second.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+leap_second.o: $(hdrdir)/ruby/internal/attr/noalias.h
+leap_second.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+leap_second.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+leap_second.o: $(hdrdir)/ruby/internal/attr/noinline.h
+leap_second.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+leap_second.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+leap_second.o: $(hdrdir)/ruby/internal/attr/pure.h
+leap_second.o: $(hdrdir)/ruby/internal/attr/restrict.h
+leap_second.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+leap_second.o: $(hdrdir)/ruby/internal/attr/warning.h
+leap_second.o: $(hdrdir)/ruby/internal/attr/weakref.h
+leap_second.o: $(hdrdir)/ruby/internal/cast.h
+leap_second.o: $(hdrdir)/ruby/internal/compiler_is.h
+leap_second.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+leap_second.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+leap_second.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+leap_second.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+leap_second.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+leap_second.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+leap_second.o: $(hdrdir)/ruby/internal/compiler_since.h
+leap_second.o: $(hdrdir)/ruby/internal/config.h
+leap_second.o: $(hdrdir)/ruby/internal/constant_p.h
+leap_second.o: $(hdrdir)/ruby/internal/core.h
+leap_second.o: $(hdrdir)/ruby/internal/core/rarray.h
+leap_second.o: $(hdrdir)/ruby/internal/core/rbasic.h
+leap_second.o: $(hdrdir)/ruby/internal/core/rbignum.h
+leap_second.o: $(hdrdir)/ruby/internal/core/rclass.h
+leap_second.o: $(hdrdir)/ruby/internal/core/rdata.h
+leap_second.o: $(hdrdir)/ruby/internal/core/rfile.h
+leap_second.o: $(hdrdir)/ruby/internal/core/rhash.h
+leap_second.o: $(hdrdir)/ruby/internal/core/robject.h
+leap_second.o: $(hdrdir)/ruby/internal/core/rregexp.h
+leap_second.o: $(hdrdir)/ruby/internal/core/rstring.h
+leap_second.o: $(hdrdir)/ruby/internal/core/rstruct.h
+leap_second.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+leap_second.o: $(hdrdir)/ruby/internal/ctype.h
+leap_second.o: $(hdrdir)/ruby/internal/dllexport.h
+leap_second.o: $(hdrdir)/ruby/internal/dosish.h
+leap_second.o: $(hdrdir)/ruby/internal/error.h
+leap_second.o: $(hdrdir)/ruby/internal/eval.h
+leap_second.o: $(hdrdir)/ruby/internal/event.h
+leap_second.o: $(hdrdir)/ruby/internal/fl_type.h
+leap_second.o: $(hdrdir)/ruby/internal/gc.h
+leap_second.o: $(hdrdir)/ruby/internal/glob.h
+leap_second.o: $(hdrdir)/ruby/internal/globals.h
+leap_second.o: $(hdrdir)/ruby/internal/has/attribute.h
+leap_second.o: $(hdrdir)/ruby/internal/has/builtin.h
+leap_second.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+leap_second.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+leap_second.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+leap_second.o: $(hdrdir)/ruby/internal/has/extension.h
+leap_second.o: $(hdrdir)/ruby/internal/has/feature.h
+leap_second.o: $(hdrdir)/ruby/internal/has/warning.h
+leap_second.o: $(hdrdir)/ruby/internal/intern/array.h
+leap_second.o: $(hdrdir)/ruby/internal/intern/bignum.h
+leap_second.o: $(hdrdir)/ruby/internal/intern/class.h
+leap_second.o: $(hdrdir)/ruby/internal/intern/compar.h
+leap_second.o: $(hdrdir)/ruby/internal/intern/complex.h
+leap_second.o: $(hdrdir)/ruby/internal/intern/cont.h
+leap_second.o: $(hdrdir)/ruby/internal/intern/dir.h
+leap_second.o: $(hdrdir)/ruby/internal/intern/enum.h
+leap_second.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+leap_second.o: $(hdrdir)/ruby/internal/intern/error.h
+leap_second.o: $(hdrdir)/ruby/internal/intern/eval.h
+leap_second.o: $(hdrdir)/ruby/internal/intern/file.h
+leap_second.o: $(hdrdir)/ruby/internal/intern/gc.h
+leap_second.o: $(hdrdir)/ruby/internal/intern/hash.h
+leap_second.o: $(hdrdir)/ruby/internal/intern/io.h
+leap_second.o: $(hdrdir)/ruby/internal/intern/load.h
+leap_second.o: $(hdrdir)/ruby/internal/intern/marshal.h
+leap_second.o: $(hdrdir)/ruby/internal/intern/numeric.h
+leap_second.o: $(hdrdir)/ruby/internal/intern/object.h
+leap_second.o: $(hdrdir)/ruby/internal/intern/parse.h
+leap_second.o: $(hdrdir)/ruby/internal/intern/proc.h
+leap_second.o: $(hdrdir)/ruby/internal/intern/process.h
+leap_second.o: $(hdrdir)/ruby/internal/intern/random.h
+leap_second.o: $(hdrdir)/ruby/internal/intern/range.h
+leap_second.o: $(hdrdir)/ruby/internal/intern/rational.h
+leap_second.o: $(hdrdir)/ruby/internal/intern/re.h
+leap_second.o: $(hdrdir)/ruby/internal/intern/ruby.h
+leap_second.o: $(hdrdir)/ruby/internal/intern/select.h
+leap_second.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+leap_second.o: $(hdrdir)/ruby/internal/intern/signal.h
+leap_second.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+leap_second.o: $(hdrdir)/ruby/internal/intern/string.h
+leap_second.o: $(hdrdir)/ruby/internal/intern/struct.h
+leap_second.o: $(hdrdir)/ruby/internal/intern/thread.h
+leap_second.o: $(hdrdir)/ruby/internal/intern/time.h
+leap_second.o: $(hdrdir)/ruby/internal/intern/variable.h
+leap_second.o: $(hdrdir)/ruby/internal/intern/vm.h
+leap_second.o: $(hdrdir)/ruby/internal/interpreter.h
+leap_second.o: $(hdrdir)/ruby/internal/iterator.h
+leap_second.o: $(hdrdir)/ruby/internal/memory.h
+leap_second.o: $(hdrdir)/ruby/internal/method.h
+leap_second.o: $(hdrdir)/ruby/internal/module.h
+leap_second.o: $(hdrdir)/ruby/internal/newobj.h
+leap_second.o: $(hdrdir)/ruby/internal/rgengc.h
+leap_second.o: $(hdrdir)/ruby/internal/scan_args.h
+leap_second.o: $(hdrdir)/ruby/internal/special_consts.h
+leap_second.o: $(hdrdir)/ruby/internal/static_assert.h
+leap_second.o: $(hdrdir)/ruby/internal/stdalign.h
+leap_second.o: $(hdrdir)/ruby/internal/stdbool.h
+leap_second.o: $(hdrdir)/ruby/internal/symbol.h
+leap_second.o: $(hdrdir)/ruby/internal/token_paste.h
+leap_second.o: $(hdrdir)/ruby/internal/value.h
+leap_second.o: $(hdrdir)/ruby/internal/value_type.h
+leap_second.o: $(hdrdir)/ruby/internal/variable.h
+leap_second.o: $(hdrdir)/ruby/internal/warning_push.h
+leap_second.o: $(hdrdir)/ruby/internal/xmalloc.h
+leap_second.o: $(hdrdir)/ruby/assert.h
+leap_second.o: $(hdrdir)/ruby/backward.h
+leap_second.o: $(hdrdir)/ruby/backward/2/assume.h
+leap_second.o: $(hdrdir)/ruby/backward/2/attributes.h
+leap_second.o: $(hdrdir)/ruby/backward/2/bool.h
+leap_second.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+leap_second.o: $(hdrdir)/ruby/backward/2/inttypes.h
+leap_second.o: $(hdrdir)/ruby/backward/2/limits.h
+leap_second.o: $(hdrdir)/ruby/backward/2/long_long.h
+leap_second.o: $(hdrdir)/ruby/backward/2/stdalign.h
+leap_second.o: $(hdrdir)/ruby/backward/2/stdarg.h
+leap_second.o: $(hdrdir)/ruby/defines.h
+leap_second.o: $(hdrdir)/ruby/intern.h
+leap_second.o: $(hdrdir)/ruby/missing.h
+leap_second.o: $(hdrdir)/ruby/ruby.h
+leap_second.o: $(hdrdir)/ruby/st.h
+leap_second.o: $(hdrdir)/ruby/subst.h
+leap_second.o: $(top_srcdir)/internal/bits.h
+leap_second.o: $(top_srcdir)/internal/compilers.h
+leap_second.o: $(top_srcdir)/internal/static_assert.h
+leap_second.o: $(top_srcdir)/internal/time.h
+leap_second.o: leap_second.c
+new.o: $(RUBY_EXTCONF_H)
+new.o: $(arch_hdrdir)/ruby/config.h
+new.o: $(hdrdir)/ruby.h
+new.o: $(hdrdir)/ruby/internal/anyargs.h
+new.o: $(hdrdir)/ruby/internal/arithmetic.h
+new.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+new.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+new.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+new.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+new.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+new.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+new.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+new.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+new.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+new.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+new.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+new.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+new.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+new.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+new.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+new.o: $(hdrdir)/ruby/internal/assume.h
+new.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+new.o: $(hdrdir)/ruby/internal/attr/artificial.h
+new.o: $(hdrdir)/ruby/internal/attr/cold.h
+new.o: $(hdrdir)/ruby/internal/attr/const.h
+new.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+new.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+new.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+new.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+new.o: $(hdrdir)/ruby/internal/attr/error.h
+new.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+new.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+new.o: $(hdrdir)/ruby/internal/attr/format.h
+new.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+new.o: $(hdrdir)/ruby/internal/attr/noalias.h
+new.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+new.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+new.o: $(hdrdir)/ruby/internal/attr/noinline.h
+new.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+new.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+new.o: $(hdrdir)/ruby/internal/attr/pure.h
+new.o: $(hdrdir)/ruby/internal/attr/restrict.h
+new.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+new.o: $(hdrdir)/ruby/internal/attr/warning.h
+new.o: $(hdrdir)/ruby/internal/attr/weakref.h
+new.o: $(hdrdir)/ruby/internal/cast.h
+new.o: $(hdrdir)/ruby/internal/compiler_is.h
+new.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+new.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+new.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+new.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+new.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+new.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+new.o: $(hdrdir)/ruby/internal/compiler_since.h
+new.o: $(hdrdir)/ruby/internal/config.h
+new.o: $(hdrdir)/ruby/internal/constant_p.h
+new.o: $(hdrdir)/ruby/internal/core.h
+new.o: $(hdrdir)/ruby/internal/core/rarray.h
+new.o: $(hdrdir)/ruby/internal/core/rbasic.h
+new.o: $(hdrdir)/ruby/internal/core/rbignum.h
+new.o: $(hdrdir)/ruby/internal/core/rclass.h
+new.o: $(hdrdir)/ruby/internal/core/rdata.h
+new.o: $(hdrdir)/ruby/internal/core/rfile.h
+new.o: $(hdrdir)/ruby/internal/core/rhash.h
+new.o: $(hdrdir)/ruby/internal/core/robject.h
+new.o: $(hdrdir)/ruby/internal/core/rregexp.h
+new.o: $(hdrdir)/ruby/internal/core/rstring.h
+new.o: $(hdrdir)/ruby/internal/core/rstruct.h
+new.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+new.o: $(hdrdir)/ruby/internal/ctype.h
+new.o: $(hdrdir)/ruby/internal/dllexport.h
+new.o: $(hdrdir)/ruby/internal/dosish.h
+new.o: $(hdrdir)/ruby/internal/error.h
+new.o: $(hdrdir)/ruby/internal/eval.h
+new.o: $(hdrdir)/ruby/internal/event.h
+new.o: $(hdrdir)/ruby/internal/fl_type.h
+new.o: $(hdrdir)/ruby/internal/gc.h
+new.o: $(hdrdir)/ruby/internal/glob.h
+new.o: $(hdrdir)/ruby/internal/globals.h
+new.o: $(hdrdir)/ruby/internal/has/attribute.h
+new.o: $(hdrdir)/ruby/internal/has/builtin.h
+new.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+new.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+new.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+new.o: $(hdrdir)/ruby/internal/has/extension.h
+new.o: $(hdrdir)/ruby/internal/has/feature.h
+new.o: $(hdrdir)/ruby/internal/has/warning.h
+new.o: $(hdrdir)/ruby/internal/intern/array.h
+new.o: $(hdrdir)/ruby/internal/intern/bignum.h
+new.o: $(hdrdir)/ruby/internal/intern/class.h
+new.o: $(hdrdir)/ruby/internal/intern/compar.h
+new.o: $(hdrdir)/ruby/internal/intern/complex.h
+new.o: $(hdrdir)/ruby/internal/intern/cont.h
+new.o: $(hdrdir)/ruby/internal/intern/dir.h
+new.o: $(hdrdir)/ruby/internal/intern/enum.h
+new.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+new.o: $(hdrdir)/ruby/internal/intern/error.h
+new.o: $(hdrdir)/ruby/internal/intern/eval.h
+new.o: $(hdrdir)/ruby/internal/intern/file.h
+new.o: $(hdrdir)/ruby/internal/intern/gc.h
+new.o: $(hdrdir)/ruby/internal/intern/hash.h
+new.o: $(hdrdir)/ruby/internal/intern/io.h
+new.o: $(hdrdir)/ruby/internal/intern/load.h
+new.o: $(hdrdir)/ruby/internal/intern/marshal.h
+new.o: $(hdrdir)/ruby/internal/intern/numeric.h
+new.o: $(hdrdir)/ruby/internal/intern/object.h
+new.o: $(hdrdir)/ruby/internal/intern/parse.h
+new.o: $(hdrdir)/ruby/internal/intern/proc.h
+new.o: $(hdrdir)/ruby/internal/intern/process.h
+new.o: $(hdrdir)/ruby/internal/intern/random.h
+new.o: $(hdrdir)/ruby/internal/intern/range.h
+new.o: $(hdrdir)/ruby/internal/intern/rational.h
+new.o: $(hdrdir)/ruby/internal/intern/re.h
+new.o: $(hdrdir)/ruby/internal/intern/ruby.h
+new.o: $(hdrdir)/ruby/internal/intern/select.h
+new.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+new.o: $(hdrdir)/ruby/internal/intern/signal.h
+new.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+new.o: $(hdrdir)/ruby/internal/intern/string.h
+new.o: $(hdrdir)/ruby/internal/intern/struct.h
+new.o: $(hdrdir)/ruby/internal/intern/thread.h
+new.o: $(hdrdir)/ruby/internal/intern/time.h
+new.o: $(hdrdir)/ruby/internal/intern/variable.h
+new.o: $(hdrdir)/ruby/internal/intern/vm.h
+new.o: $(hdrdir)/ruby/internal/interpreter.h
+new.o: $(hdrdir)/ruby/internal/iterator.h
+new.o: $(hdrdir)/ruby/internal/memory.h
+new.o: $(hdrdir)/ruby/internal/method.h
+new.o: $(hdrdir)/ruby/internal/module.h
+new.o: $(hdrdir)/ruby/internal/newobj.h
+new.o: $(hdrdir)/ruby/internal/rgengc.h
+new.o: $(hdrdir)/ruby/internal/scan_args.h
+new.o: $(hdrdir)/ruby/internal/special_consts.h
+new.o: $(hdrdir)/ruby/internal/static_assert.h
+new.o: $(hdrdir)/ruby/internal/stdalign.h
+new.o: $(hdrdir)/ruby/internal/stdbool.h
+new.o: $(hdrdir)/ruby/internal/symbol.h
+new.o: $(hdrdir)/ruby/internal/token_paste.h
+new.o: $(hdrdir)/ruby/internal/value.h
+new.o: $(hdrdir)/ruby/internal/value_type.h
+new.o: $(hdrdir)/ruby/internal/variable.h
+new.o: $(hdrdir)/ruby/internal/warning_push.h
+new.o: $(hdrdir)/ruby/internal/xmalloc.h
+new.o: $(hdrdir)/ruby/assert.h
+new.o: $(hdrdir)/ruby/backward.h
+new.o: $(hdrdir)/ruby/backward/2/assume.h
+new.o: $(hdrdir)/ruby/backward/2/attributes.h
+new.o: $(hdrdir)/ruby/backward/2/bool.h
+new.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+new.o: $(hdrdir)/ruby/backward/2/inttypes.h
+new.o: $(hdrdir)/ruby/backward/2/limits.h
+new.o: $(hdrdir)/ruby/backward/2/long_long.h
+new.o: $(hdrdir)/ruby/backward/2/stdalign.h
+new.o: $(hdrdir)/ruby/backward/2/stdarg.h
+new.o: $(hdrdir)/ruby/defines.h
+new.o: $(hdrdir)/ruby/intern.h
+new.o: $(hdrdir)/ruby/missing.h
+new.o: $(hdrdir)/ruby/ruby.h
+new.o: $(hdrdir)/ruby/st.h
+new.o: $(hdrdir)/ruby/subst.h
+new.o: new.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/time/init.c b/ext/-test-/time/init.c
index 01a20b8b3d..91f8bf825b 100644
--- a/ext/-test-/time/init.c
+++ b/ext/-test-/time/init.c
@@ -1,6 +1,6 @@
 #include "ruby.h"
 
-#define init(n) {void Init_##n(VALUE klass); Init_##n(klass);}
+#define init(n) {void Init_time_##n(VALUE klass); Init_time_##n(klass);}
 
 void
 Init_time(void)
diff --git a/ext/-test-/time/leap_second.c b/ext/-test-/time/leap_second.c
new file mode 100644
index 0000000000..ccf38194f0
--- /dev/null
+++ b/ext/-test-/time/leap_second.c
@@ -0,0 +1,14 @@
+#include "internal/time.h"
+
+static VALUE
+bug_time_s_reset_leap_second_info(VALUE klass)
+{
+    ruby_reset_leap_second_info();
+    return Qnil;
+}
+
+void
+Init_time_leap_second(VALUE klass)
+{
+    rb_define_singleton_method(klass, "reset_leap_second_info", bug_time_s_reset_leap_second_info, 0);
+}
diff --git a/ext/-test-/time/new.c b/ext/-test-/time/new.c
index 0f71a5542b..6f894417b6 100644
--- a/ext/-test-/time/new.c
+++ b/ext/-test-/time/new.c
@@ -26,7 +26,7 @@ bug_time_s_timespec_now(VALUE klass)
 }
 
 void
-Init_new(VALUE klass)
+Init_time_new(VALUE klass)
 {
     rb_define_singleton_method(klass, "nano_new", bug_time_s_nano_new, 2);
     rb_define_singleton_method(klass, "timespec_new", bug_time_s_timespec_new, 3);
diff --git a/ext/-test-/tracepoint/depend b/ext/-test-/tracepoint/depend
index 5b2b2f7369..ba409e88fe 100644
--- a/ext/-test-/tracepoint/depend
+++ b/ext/-test-/tracepoint/depend
@@ -1,7 +1,157 @@
 # AUTOGENERATED DEPENDENCIES START
 gc_hook.o: $(RUBY_EXTCONF_H)
 gc_hook.o: $(arch_hdrdir)/ruby/config.h
+gc_hook.o: $(hdrdir)/ruby/internal/anyargs.h
+gc_hook.o: $(hdrdir)/ruby/internal/arithmetic.h
+gc_hook.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+gc_hook.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+gc_hook.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+gc_hook.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+gc_hook.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+gc_hook.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+gc_hook.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+gc_hook.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+gc_hook.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+gc_hook.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+gc_hook.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+gc_hook.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+gc_hook.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+gc_hook.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+gc_hook.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+gc_hook.o: $(hdrdir)/ruby/internal/assume.h
+gc_hook.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+gc_hook.o: $(hdrdir)/ruby/internal/attr/artificial.h
+gc_hook.o: $(hdrdir)/ruby/internal/attr/cold.h
+gc_hook.o: $(hdrdir)/ruby/internal/attr/const.h
+gc_hook.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+gc_hook.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+gc_hook.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+gc_hook.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+gc_hook.o: $(hdrdir)/ruby/internal/attr/error.h
+gc_hook.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+gc_hook.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+gc_hook.o: $(hdrdir)/ruby/internal/attr/format.h
+gc_hook.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+gc_hook.o: $(hdrdir)/ruby/internal/attr/noalias.h
+gc_hook.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+gc_hook.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+gc_hook.o: $(hdrdir)/ruby/internal/attr/noinline.h
+gc_hook.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+gc_hook.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+gc_hook.o: $(hdrdir)/ruby/internal/attr/pure.h
+gc_hook.o: $(hdrdir)/ruby/internal/attr/restrict.h
+gc_hook.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+gc_hook.o: $(hdrdir)/ruby/internal/attr/warning.h
+gc_hook.o: $(hdrdir)/ruby/internal/attr/weakref.h
+gc_hook.o: $(hdrdir)/ruby/internal/cast.h
+gc_hook.o: $(hdrdir)/ruby/internal/compiler_is.h
+gc_hook.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+gc_hook.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+gc_hook.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+gc_hook.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+gc_hook.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+gc_hook.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+gc_hook.o: $(hdrdir)/ruby/internal/compiler_since.h
+gc_hook.o: $(hdrdir)/ruby/internal/config.h
+gc_hook.o: $(hdrdir)/ruby/internal/constant_p.h
+gc_hook.o: $(hdrdir)/ruby/internal/core.h
+gc_hook.o: $(hdrdir)/ruby/internal/core/rarray.h
+gc_hook.o: $(hdrdir)/ruby/internal/core/rbasic.h
+gc_hook.o: $(hdrdir)/ruby/internal/core/rbignum.h
+gc_hook.o: $(hdrdir)/ruby/internal/core/rclass.h
+gc_hook.o: $(hdrdir)/ruby/internal/core/rdata.h
+gc_hook.o: $(hdrdir)/ruby/internal/core/rfile.h
+gc_hook.o: $(hdrdir)/ruby/internal/core/rhash.h
+gc_hook.o: $(hdrdir)/ruby/internal/core/robject.h
+gc_hook.o: $(hdrdir)/ruby/internal/core/rregexp.h
+gc_hook.o: $(hdrdir)/ruby/internal/core/rstring.h
+gc_hook.o: $(hdrdir)/ruby/internal/core/rstruct.h
+gc_hook.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+gc_hook.o: $(hdrdir)/ruby/internal/ctype.h
+gc_hook.o: $(hdrdir)/ruby/internal/dllexport.h
+gc_hook.o: $(hdrdir)/ruby/internal/dosish.h
+gc_hook.o: $(hdrdir)/ruby/internal/error.h
+gc_hook.o: $(hdrdir)/ruby/internal/eval.h
+gc_hook.o: $(hdrdir)/ruby/internal/event.h
+gc_hook.o: $(hdrdir)/ruby/internal/fl_type.h
+gc_hook.o: $(hdrdir)/ruby/internal/gc.h
+gc_hook.o: $(hdrdir)/ruby/internal/glob.h
+gc_hook.o: $(hdrdir)/ruby/internal/globals.h
+gc_hook.o: $(hdrdir)/ruby/internal/has/attribute.h
+gc_hook.o: $(hdrdir)/ruby/internal/has/builtin.h
+gc_hook.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+gc_hook.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+gc_hook.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+gc_hook.o: $(hdrdir)/ruby/internal/has/extension.h
+gc_hook.o: $(hdrdir)/ruby/internal/has/feature.h
+gc_hook.o: $(hdrdir)/ruby/internal/has/warning.h
+gc_hook.o: $(hdrdir)/ruby/internal/intern/array.h
+gc_hook.o: $(hdrdir)/ruby/internal/intern/bignum.h
+gc_hook.o: $(hdrdir)/ruby/internal/intern/class.h
+gc_hook.o: $(hdrdir)/ruby/internal/intern/compar.h
+gc_hook.o: $(hdrdir)/ruby/internal/intern/complex.h
+gc_hook.o: $(hdrdir)/ruby/internal/intern/cont.h
+gc_hook.o: $(hdrdir)/ruby/internal/intern/dir.h
+gc_hook.o: $(hdrdir)/ruby/internal/intern/enum.h
+gc_hook.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+gc_hook.o: $(hdrdir)/ruby/internal/intern/error.h
+gc_hook.o: $(hdrdir)/ruby/internal/intern/eval.h
+gc_hook.o: $(hdrdir)/ruby/internal/intern/file.h
+gc_hook.o: $(hdrdir)/ruby/internal/intern/gc.h
+gc_hook.o: $(hdrdir)/ruby/internal/intern/hash.h
+gc_hook.o: $(hdrdir)/ruby/internal/intern/io.h
+gc_hook.o: $(hdrdir)/ruby/internal/intern/load.h
+gc_hook.o: $(hdrdir)/ruby/internal/intern/marshal.h
+gc_hook.o: $(hdrdir)/ruby/internal/intern/numeric.h
+gc_hook.o: $(hdrdir)/ruby/internal/intern/object.h
+gc_hook.o: $(hdrdir)/ruby/internal/intern/parse.h
+gc_hook.o: $(hdrdir)/ruby/internal/intern/proc.h
+gc_hook.o: $(hdrdir)/ruby/internal/intern/process.h
+gc_hook.o: $(hdrdir)/ruby/internal/intern/random.h
+gc_hook.o: $(hdrdir)/ruby/internal/intern/range.h
+gc_hook.o: $(hdrdir)/ruby/internal/intern/rational.h
+gc_hook.o: $(hdrdir)/ruby/internal/intern/re.h
+gc_hook.o: $(hdrdir)/ruby/internal/intern/ruby.h
+gc_hook.o: $(hdrdir)/ruby/internal/intern/select.h
+gc_hook.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+gc_hook.o: $(hdrdir)/ruby/internal/intern/signal.h
+gc_hook.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+gc_hook.o: $(hdrdir)/ruby/internal/intern/string.h
+gc_hook.o: $(hdrdir)/ruby/internal/intern/struct.h
+gc_hook.o: $(hdrdir)/ruby/internal/intern/thread.h
+gc_hook.o: $(hdrdir)/ruby/internal/intern/time.h
+gc_hook.o: $(hdrdir)/ruby/internal/intern/variable.h
+gc_hook.o: $(hdrdir)/ruby/internal/intern/vm.h
+gc_hook.o: $(hdrdir)/ruby/internal/interpreter.h
+gc_hook.o: $(hdrdir)/ruby/internal/iterator.h
+gc_hook.o: $(hdrdir)/ruby/internal/memory.h
+gc_hook.o: $(hdrdir)/ruby/internal/method.h
+gc_hook.o: $(hdrdir)/ruby/internal/module.h
+gc_hook.o: $(hdrdir)/ruby/internal/newobj.h
+gc_hook.o: $(hdrdir)/ruby/internal/rgengc.h
+gc_hook.o: $(hdrdir)/ruby/internal/scan_args.h
+gc_hook.o: $(hdrdir)/ruby/internal/special_consts.h
+gc_hook.o: $(hdrdir)/ruby/internal/static_assert.h
+gc_hook.o: $(hdrdir)/ruby/internal/stdalign.h
+gc_hook.o: $(hdrdir)/ruby/internal/stdbool.h
+gc_hook.o: $(hdrdir)/ruby/internal/symbol.h
+gc_hook.o: $(hdrdir)/ruby/internal/token_paste.h
+gc_hook.o: $(hdrdir)/ruby/internal/value.h
+gc_hook.o: $(hdrdir)/ruby/internal/value_type.h
+gc_hook.o: $(hdrdir)/ruby/internal/variable.h
+gc_hook.o: $(hdrdir)/ruby/internal/warning_push.h
+gc_hook.o: $(hdrdir)/ruby/internal/xmalloc.h
+gc_hook.o: $(hdrdir)/ruby/assert.h
 gc_hook.o: $(hdrdir)/ruby/backward.h
+gc_hook.o: $(hdrdir)/ruby/backward/2/assume.h
+gc_hook.o: $(hdrdir)/ruby/backward/2/attributes.h
+gc_hook.o: $(hdrdir)/ruby/backward/2/bool.h
+gc_hook.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+gc_hook.o: $(hdrdir)/ruby/backward/2/inttypes.h
+gc_hook.o: $(hdrdir)/ruby/backward/2/limits.h
+gc_hook.o: $(hdrdir)/ruby/backward/2/long_long.h
+gc_hook.o: $(hdrdir)/ruby/backward/2/stdalign.h
+gc_hook.o: $(hdrdir)/ruby/backward/2/stdarg.h
 gc_hook.o: $(hdrdir)/ruby/debug.h
 gc_hook.o: $(hdrdir)/ruby/defines.h
 gc_hook.o: $(hdrdir)/ruby/intern.h
@@ -12,7 +162,157 @@ gc_hook.o: $(hdrdir)/ruby/subst.h
 gc_hook.o: gc_hook.c
 tracepoint.o: $(RUBY_EXTCONF_H)
 tracepoint.o: $(arch_hdrdir)/ruby/config.h
+tracepoint.o: $(hdrdir)/ruby/internal/anyargs.h
+tracepoint.o: $(hdrdir)/ruby/internal/arithmetic.h
+tracepoint.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+tracepoint.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+tracepoint.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+tracepoint.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+tracepoint.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+tracepoint.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+tracepoint.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+tracepoint.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+tracepoint.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+tracepoint.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+tracepoint.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+tracepoint.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+tracepoint.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+tracepoint.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+tracepoint.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+tracepoint.o: $(hdrdir)/ruby/internal/assume.h
+tracepoint.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+tracepoint.o: $(hdrdir)/ruby/internal/attr/artificial.h
+tracepoint.o: $(hdrdir)/ruby/internal/attr/cold.h
+tracepoint.o: $(hdrdir)/ruby/internal/attr/const.h
+tracepoint.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+tracepoint.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+tracepoint.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+tracepoint.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+tracepoint.o: $(hdrdir)/ruby/internal/attr/error.h
+tracepoint.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+tracepoint.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+tracepoint.o: $(hdrdir)/ruby/internal/attr/format.h
+tracepoint.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+tracepoint.o: $(hdrdir)/ruby/internal/attr/noalias.h
+tracepoint.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+tracepoint.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+tracepoint.o: $(hdrdir)/ruby/internal/attr/noinline.h
+tracepoint.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+tracepoint.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+tracepoint.o: $(hdrdir)/ruby/internal/attr/pure.h
+tracepoint.o: $(hdrdir)/ruby/internal/attr/restrict.h
+tracepoint.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+tracepoint.o: $(hdrdir)/ruby/internal/attr/warning.h
+tracepoint.o: $(hdrdir)/ruby/internal/attr/weakref.h
+tracepoint.o: $(hdrdir)/ruby/internal/cast.h
+tracepoint.o: $(hdrdir)/ruby/internal/compiler_is.h
+tracepoint.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+tracepoint.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+tracepoint.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+tracepoint.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+tracepoint.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+tracepoint.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+tracepoint.o: $(hdrdir)/ruby/internal/compiler_since.h
+tracepoint.o: $(hdrdir)/ruby/internal/config.h
+tracepoint.o: $(hdrdir)/ruby/internal/constant_p.h
+tracepoint.o: $(hdrdir)/ruby/internal/core.h
+tracepoint.o: $(hdrdir)/ruby/internal/core/rarray.h
+tracepoint.o: $(hdrdir)/ruby/internal/core/rbasic.h
+tracepoint.o: $(hdrdir)/ruby/internal/core/rbignum.h
+tracepoint.o: $(hdrdir)/ruby/internal/core/rclass.h
+tracepoint.o: $(hdrdir)/ruby/internal/core/rdata.h
+tracepoint.o: $(hdrdir)/ruby/internal/core/rfile.h
+tracepoint.o: $(hdrdir)/ruby/internal/core/rhash.h
+tracepoint.o: $(hdrdir)/ruby/internal/core/robject.h
+tracepoint.o: $(hdrdir)/ruby/internal/core/rregexp.h
+tracepoint.o: $(hdrdir)/ruby/internal/core/rstring.h
+tracepoint.o: $(hdrdir)/ruby/internal/core/rstruct.h
+tracepoint.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+tracepoint.o: $(hdrdir)/ruby/internal/ctype.h
+tracepoint.o: $(hdrdir)/ruby/internal/dllexport.h
+tracepoint.o: $(hdrdir)/ruby/internal/dosish.h
+tracepoint.o: $(hdrdir)/ruby/internal/error.h
+tracepoint.o: $(hdrdir)/ruby/internal/eval.h
+tracepoint.o: $(hdrdir)/ruby/internal/event.h
+tracepoint.o: $(hdrdir)/ruby/internal/fl_type.h
+tracepoint.o: $(hdrdir)/ruby/internal/gc.h
+tracepoint.o: $(hdrdir)/ruby/internal/glob.h
+tracepoint.o: $(hdrdir)/ruby/internal/globals.h
+tracepoint.o: $(hdrdir)/ruby/internal/has/attribute.h
+tracepoint.o: $(hdrdir)/ruby/internal/has/builtin.h
+tracepoint.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+tracepoint.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+tracepoint.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+tracepoint.o: $(hdrdir)/ruby/internal/has/extension.h
+tracepoint.o: $(hdrdir)/ruby/internal/has/feature.h
+tracepoint.o: $(hdrdir)/ruby/internal/has/warning.h
+tracepoint.o: $(hdrdir)/ruby/internal/intern/array.h
+tracepoint.o: $(hdrdir)/ruby/internal/intern/bignum.h
+tracepoint.o: $(hdrdir)/ruby/internal/intern/class.h
+tracepoint.o: $(hdrdir)/ruby/internal/intern/compar.h
+tracepoint.o: $(hdrdir)/ruby/internal/intern/complex.h
+tracepoint.o: $(hdrdir)/ruby/internal/intern/cont.h
+tracepoint.o: $(hdrdir)/ruby/internal/intern/dir.h
+tracepoint.o: $(hdrdir)/ruby/internal/intern/enum.h
+tracepoint.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+tracepoint.o: $(hdrdir)/ruby/internal/intern/error.h
+tracepoint.o: $(hdrdir)/ruby/internal/intern/eval.h
+tracepoint.o: $(hdrdir)/ruby/internal/intern/file.h
+tracepoint.o: $(hdrdir)/ruby/internal/intern/gc.h
+tracepoint.o: $(hdrdir)/ruby/internal/intern/hash.h
+tracepoint.o: $(hdrdir)/ruby/internal/intern/io.h
+tracepoint.o: $(hdrdir)/ruby/internal/intern/load.h
+tracepoint.o: $(hdrdir)/ruby/internal/intern/marshal.h
+tracepoint.o: $(hdrdir)/ruby/internal/intern/numeric.h
+tracepoint.o: $(hdrdir)/ruby/internal/intern/object.h
+tracepoint.o: $(hdrdir)/ruby/internal/intern/parse.h
+tracepoint.o: $(hdrdir)/ruby/internal/intern/proc.h
+tracepoint.o: $(hdrdir)/ruby/internal/intern/process.h
+tracepoint.o: $(hdrdir)/ruby/internal/intern/random.h
+tracepoint.o: $(hdrdir)/ruby/internal/intern/range.h
+tracepoint.o: $(hdrdir)/ruby/internal/intern/rational.h
+tracepoint.o: $(hdrdir)/ruby/internal/intern/re.h
+tracepoint.o: $(hdrdir)/ruby/internal/intern/ruby.h
+tracepoint.o: $(hdrdir)/ruby/internal/intern/select.h
+tracepoint.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+tracepoint.o: $(hdrdir)/ruby/internal/intern/signal.h
+tracepoint.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+tracepoint.o: $(hdrdir)/ruby/internal/intern/string.h
+tracepoint.o: $(hdrdir)/ruby/internal/intern/struct.h
+tracepoint.o: $(hdrdir)/ruby/internal/intern/thread.h
+tracepoint.o: $(hdrdir)/ruby/internal/intern/time.h
+tracepoint.o: $(hdrdir)/ruby/internal/intern/variable.h
+tracepoint.o: $(hdrdir)/ruby/internal/intern/vm.h
+tracepoint.o: $(hdrdir)/ruby/internal/interpreter.h
+tracepoint.o: $(hdrdir)/ruby/internal/iterator.h
+tracepoint.o: $(hdrdir)/ruby/internal/memory.h
+tracepoint.o: $(hdrdir)/ruby/internal/method.h
+tracepoint.o: $(hdrdir)/ruby/internal/module.h
+tracepoint.o: $(hdrdir)/ruby/internal/newobj.h
+tracepoint.o: $(hdrdir)/ruby/internal/rgengc.h
+tracepoint.o: $(hdrdir)/ruby/internal/scan_args.h
+tracepoint.o: $(hdrdir)/ruby/internal/special_consts.h
+tracepoint.o: $(hdrdir)/ruby/internal/static_assert.h
+tracepoint.o: $(hdrdir)/ruby/internal/stdalign.h
+tracepoint.o: $(hdrdir)/ruby/internal/stdbool.h
+tracepoint.o: $(hdrdir)/ruby/internal/symbol.h
+tracepoint.o: $(hdrdir)/ruby/internal/token_paste.h
+tracepoint.o: $(hdrdir)/ruby/internal/value.h
+tracepoint.o: $(hdrdir)/ruby/internal/value_type.h
+tracepoint.o: $(hdrdir)/ruby/internal/variable.h
+tracepoint.o: $(hdrdir)/ruby/internal/warning_push.h
+tracepoint.o: $(hdrdir)/ruby/internal/xmalloc.h
+tracepoint.o: $(hdrdir)/ruby/assert.h
 tracepoint.o: $(hdrdir)/ruby/backward.h
+tracepoint.o: $(hdrdir)/ruby/backward/2/assume.h
+tracepoint.o: $(hdrdir)/ruby/backward/2/attributes.h
+tracepoint.o: $(hdrdir)/ruby/backward/2/bool.h
+tracepoint.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+tracepoint.o: $(hdrdir)/ruby/backward/2/inttypes.h
+tracepoint.o: $(hdrdir)/ruby/backward/2/limits.h
+tracepoint.o: $(hdrdir)/ruby/backward/2/long_long.h
+tracepoint.o: $(hdrdir)/ruby/backward/2/stdalign.h
+tracepoint.o: $(hdrdir)/ruby/backward/2/stdarg.h
 tracepoint.o: $(hdrdir)/ruby/debug.h
 tracepoint.o: $(hdrdir)/ruby/defines.h
 tracepoint.o: $(hdrdir)/ruby/intern.h
diff --git a/ext/-test-/tracepoint/gc_hook.c b/ext/-test-/tracepoint/gc_hook.c
index 6d8485ecb1..5fd46fa518 100644
--- a/ext/-test-/tracepoint/gc_hook.c
+++ b/ext/-test-/tracepoint/gc_hook.c
@@ -4,7 +4,7 @@
 static int invoking; /* TODO: should not be global variable */
 
 static VALUE
-invoke_proc_ensure(void *dmy)
+invoke_proc_ensure(VALUE _)
 {
     invoking = 0;
     return Qnil;
@@ -42,14 +42,12 @@ set_gc_hook(VALUE module, VALUE proc, rb_event_flag_t event, const char *tp_str,
 {
     VALUE tpval;
     ID tp_key = rb_intern(tp_str);
-    ID proc_key = rb_intern(proc_str);
 
     /* disable previous keys */
     if (rb_ivar_defined(module, tp_key) != 0 &&
 	RTEST(tpval = rb_ivar_get(module, tp_key))) {
 	rb_tracepoint_disable(tpval);
 	rb_ivar_set(module, tp_key, Qnil);
-	rb_ivar_set(module, proc_key, Qnil);
     }
 
     if (RTEST(proc)) {
@@ -59,7 +57,6 @@ set_gc_hook(VALUE module, VALUE proc, rb_event_flag_t event, const char *tp_str,
 
 	tpval = rb_tracepoint_new(0, event, gc_start_end_i, (void *)proc);
 	rb_ivar_set(module, tp_key, tpval);
-	rb_ivar_set(module, proc_key, proc); /* GC guard */
 	rb_tracepoint_enable(tpval);
     }
 
@@ -73,8 +70,16 @@ set_after_gc_start(VALUE module, VALUE proc)
 		       "__set_after_gc_start_tpval__", "__set_after_gc_start_proc__");
 }
 
+static VALUE
+start_after_gc_exit(VALUE module, VALUE proc)
+{
+    return set_gc_hook(module, proc, RUBY_INTERNAL_EVENT_GC_EXIT,
+                       "__set_after_gc_exit_tpval__", "__set_after_gc_exit_proc__");
+}
+
 void
 Init_gc_hook(VALUE module)
 {
     rb_define_module_function(module, "after_gc_start_hook=", set_after_gc_start, 1);
+    rb_define_module_function(module, "after_gc_exit_hook=", start_after_gc_exit, 1);
 }
diff --git a/ext/-test-/typeddata/depend b/ext/-test-/typeddata/depend
new file mode 100644
index 0000000000..8fe35a8192
--- /dev/null
+++ b/ext/-test-/typeddata/depend
@@ -0,0 +1,163 @@
+# AUTOGENERATED DEPENDENCIES START
+typeddata.o: $(RUBY_EXTCONF_H)
+typeddata.o: $(arch_hdrdir)/ruby/config.h
+typeddata.o: $(hdrdir)/ruby.h
+typeddata.o: $(hdrdir)/ruby/internal/anyargs.h
+typeddata.o: $(hdrdir)/ruby/internal/arithmetic.h
+typeddata.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+typeddata.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+typeddata.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+typeddata.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+typeddata.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+typeddata.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+typeddata.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+typeddata.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+typeddata.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+typeddata.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+typeddata.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+typeddata.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+typeddata.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+typeddata.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+typeddata.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+typeddata.o: $(hdrdir)/ruby/internal/assume.h
+typeddata.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+typeddata.o: $(hdrdir)/ruby/internal/attr/artificial.h
+typeddata.o: $(hdrdir)/ruby/internal/attr/cold.h
+typeddata.o: $(hdrdir)/ruby/internal/attr/const.h
+typeddata.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+typeddata.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+typeddata.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+typeddata.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+typeddata.o: $(hdrdir)/ruby/internal/attr/error.h
+typeddata.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+typeddata.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+typeddata.o: $(hdrdir)/ruby/internal/attr/format.h
+typeddata.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+typeddata.o: $(hdrdir)/ruby/internal/attr/noalias.h
+typeddata.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+typeddata.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+typeddata.o: $(hdrdir)/ruby/internal/attr/noinline.h
+typeddata.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+typeddata.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+typeddata.o: $(hdrdir)/ruby/internal/attr/pure.h
+typeddata.o: $(hdrdir)/ruby/internal/attr/restrict.h
+typeddata.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+typeddata.o: $(hdrdir)/ruby/internal/attr/warning.h
+typeddata.o: $(hdrdir)/ruby/internal/attr/weakref.h
+typeddata.o: $(hdrdir)/ruby/internal/cast.h
+typeddata.o: $(hdrdir)/ruby/internal/compiler_is.h
+typeddata.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+typeddata.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+typeddata.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+typeddata.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+typeddata.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+typeddata.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+typeddata.o: $(hdrdir)/ruby/internal/compiler_since.h
+typeddata.o: $(hdrdir)/ruby/internal/config.h
+typeddata.o: $(hdrdir)/ruby/internal/constant_p.h
+typeddata.o: $(hdrdir)/ruby/internal/core.h
+typeddata.o: $(hdrdir)/ruby/internal/core/rarray.h
+typeddata.o: $(hdrdir)/ruby/internal/core/rbasic.h
+typeddata.o: $(hdrdir)/ruby/internal/core/rbignum.h
+typeddata.o: $(hdrdir)/ruby/internal/core/rclass.h
+typeddata.o: $(hdrdir)/ruby/internal/core/rdata.h
+typeddata.o: $(hdrdir)/ruby/internal/core/rfile.h
+typeddata.o: $(hdrdir)/ruby/internal/core/rhash.h
+typeddata.o: $(hdrdir)/ruby/internal/core/robject.h
+typeddata.o: $(hdrdir)/ruby/internal/core/rregexp.h
+typeddata.o: $(hdrdir)/ruby/internal/core/rstring.h
+typeddata.o: $(hdrdir)/ruby/internal/core/rstruct.h
+typeddata.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+typeddata.o: $(hdrdir)/ruby/internal/ctype.h
+typeddata.o: $(hdrdir)/ruby/internal/dllexport.h
+typeddata.o: $(hdrdir)/ruby/internal/dosish.h
+typeddata.o: $(hdrdir)/ruby/internal/error.h
+typeddata.o: $(hdrdir)/ruby/internal/eval.h
+typeddata.o: $(hdrdir)/ruby/internal/event.h
+typeddata.o: $(hdrdir)/ruby/internal/fl_type.h
+typeddata.o: $(hdrdir)/ruby/internal/gc.h
+typeddata.o: $(hdrdir)/ruby/internal/glob.h
+typeddata.o: $(hdrdir)/ruby/internal/globals.h
+typeddata.o: $(hdrdir)/ruby/internal/has/attribute.h
+typeddata.o: $(hdrdir)/ruby/internal/has/builtin.h
+typeddata.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+typeddata.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+typeddata.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+typeddata.o: $(hdrdir)/ruby/internal/has/extension.h
+typeddata.o: $(hdrdir)/ruby/internal/has/feature.h
+typeddata.o: $(hdrdir)/ruby/internal/has/warning.h
+typeddata.o: $(hdrdir)/ruby/internal/intern/array.h
+typeddata.o: $(hdrdir)/ruby/internal/intern/bignum.h
+typeddata.o: $(hdrdir)/ruby/internal/intern/class.h
+typeddata.o: $(hdrdir)/ruby/internal/intern/compar.h
+typeddata.o: $(hdrdir)/ruby/internal/intern/complex.h
+typeddata.o: $(hdrdir)/ruby/internal/intern/cont.h
+typeddata.o: $(hdrdir)/ruby/internal/intern/dir.h
+typeddata.o: $(hdrdir)/ruby/internal/intern/enum.h
+typeddata.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+typeddata.o: $(hdrdir)/ruby/internal/intern/error.h
+typeddata.o: $(hdrdir)/ruby/internal/intern/eval.h
+typeddata.o: $(hdrdir)/ruby/internal/intern/file.h
+typeddata.o: $(hdrdir)/ruby/internal/intern/gc.h
+typeddata.o: $(hdrdir)/ruby/internal/intern/hash.h
+typeddata.o: $(hdrdir)/ruby/internal/intern/io.h
+typeddata.o: $(hdrdir)/ruby/internal/intern/load.h
+typeddata.o: $(hdrdir)/ruby/internal/intern/marshal.h
+typeddata.o: $(hdrdir)/ruby/internal/intern/numeric.h
+typeddata.o: $(hdrdir)/ruby/internal/intern/object.h
+typeddata.o: $(hdrdir)/ruby/internal/intern/parse.h
+typeddata.o: $(hdrdir)/ruby/internal/intern/proc.h
+typeddata.o: $(hdrdir)/ruby/internal/intern/process.h
+typeddata.o: $(hdrdir)/ruby/internal/intern/random.h
+typeddata.o: $(hdrdir)/ruby/internal/intern/range.h
+typeddata.o: $(hdrdir)/ruby/internal/intern/rational.h
+typeddata.o: $(hdrdir)/ruby/internal/intern/re.h
+typeddata.o: $(hdrdir)/ruby/internal/intern/ruby.h
+typeddata.o: $(hdrdir)/ruby/internal/intern/select.h
+typeddata.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+typeddata.o: $(hdrdir)/ruby/internal/intern/signal.h
+typeddata.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+typeddata.o: $(hdrdir)/ruby/internal/intern/string.h
+typeddata.o: $(hdrdir)/ruby/internal/intern/struct.h
+typeddata.o: $(hdrdir)/ruby/internal/intern/thread.h
+typeddata.o: $(hdrdir)/ruby/internal/intern/time.h
+typeddata.o: $(hdrdir)/ruby/internal/intern/variable.h
+typeddata.o: $(hdrdir)/ruby/internal/intern/vm.h
+typeddata.o: $(hdrdir)/ruby/internal/interpreter.h
+typeddata.o: $(hdrdir)/ruby/internal/iterator.h
+typeddata.o: $(hdrdir)/ruby/internal/memory.h
+typeddata.o: $(hdrdir)/ruby/internal/method.h
+typeddata.o: $(hdrdir)/ruby/internal/module.h
+typeddata.o: $(hdrdir)/ruby/internal/newobj.h
+typeddata.o: $(hdrdir)/ruby/internal/rgengc.h
+typeddata.o: $(hdrdir)/ruby/internal/scan_args.h
+typeddata.o: $(hdrdir)/ruby/internal/special_consts.h
+typeddata.o: $(hdrdir)/ruby/internal/static_assert.h
+typeddata.o: $(hdrdir)/ruby/internal/stdalign.h
+typeddata.o: $(hdrdir)/ruby/internal/stdbool.h
+typeddata.o: $(hdrdir)/ruby/internal/symbol.h
+typeddata.o: $(hdrdir)/ruby/internal/token_paste.h
+typeddata.o: $(hdrdir)/ruby/internal/value.h
+typeddata.o: $(hdrdir)/ruby/internal/value_type.h
+typeddata.o: $(hdrdir)/ruby/internal/variable.h
+typeddata.o: $(hdrdir)/ruby/internal/warning_push.h
+typeddata.o: $(hdrdir)/ruby/internal/xmalloc.h
+typeddata.o: $(hdrdir)/ruby/assert.h
+typeddata.o: $(hdrdir)/ruby/backward.h
+typeddata.o: $(hdrdir)/ruby/backward/2/assume.h
+typeddata.o: $(hdrdir)/ruby/backward/2/attributes.h
+typeddata.o: $(hdrdir)/ruby/backward/2/bool.h
+typeddata.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+typeddata.o: $(hdrdir)/ruby/backward/2/inttypes.h
+typeddata.o: $(hdrdir)/ruby/backward/2/limits.h
+typeddata.o: $(hdrdir)/ruby/backward/2/long_long.h
+typeddata.o: $(hdrdir)/ruby/backward/2/stdalign.h
+typeddata.o: $(hdrdir)/ruby/backward/2/stdarg.h
+typeddata.o: $(hdrdir)/ruby/defines.h
+typeddata.o: $(hdrdir)/ruby/intern.h
+typeddata.o: $(hdrdir)/ruby/missing.h
+typeddata.o: $(hdrdir)/ruby/ruby.h
+typeddata.o: $(hdrdir)/ruby/st.h
+typeddata.o: $(hdrdir)/ruby/subst.h
+typeddata.o: typeddata.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/typeddata/typeddata.c b/ext/-test-/typeddata/typeddata.c
index 1c5d677713..2adfd56ae8 100644
--- a/ext/-test-/typeddata/typeddata.c
+++ b/ext/-test-/typeddata/typeddata.c
@@ -2,19 +2,43 @@
 
 static const rb_data_type_t test_data = {
     "typed_data",
+    {0, ruby_xfree, 0},
+    NULL, NULL,
+    0/* deferred free */,
 };
 
 static VALUE
+test_alloc(VALUE klass)
+{
+    char *p;
+    return TypedData_Make_Struct(klass, char, &test_data, p);
+}
+
+static VALUE
 test_check(VALUE self, VALUE obj)
 {
     rb_check_typeddata(obj, &test_data);
     return obj;
 }
 
+static VALUE
+test_make(VALUE klass, VALUE num)
+{
+    unsigned long i, n = NUM2UINT(num);
+
+    for (i = 0; i < n; i++) {
+	test_alloc(klass);
+    }
+
+    return Qnil;
+}
+
 void
 Init_typeddata(void)
 {
     VALUE mBug = rb_define_module("Bug");
-    VALUE klass = rb_define_class_under(mBug, "TypedData", rb_cData);
+    VALUE klass = rb_define_class_under(mBug, "TypedData", rb_cObject);
+    rb_define_alloc_func(klass, test_alloc);
     rb_define_singleton_method(klass, "check", test_check, 1);
+    rb_define_singleton_method(klass, "make", test_make, 1);
 }
diff --git a/ext/-test-/vm/depend b/ext/-test-/vm/depend
new file mode 100644
index 0000000000..5800c3b464
--- /dev/null
+++ b/ext/-test-/vm/depend
@@ -0,0 +1,163 @@
+# AUTOGENERATED DEPENDENCIES START
+at_exit.o: $(RUBY_EXTCONF_H)
+at_exit.o: $(arch_hdrdir)/ruby/config.h
+at_exit.o: $(hdrdir)/ruby/internal/anyargs.h
+at_exit.o: $(hdrdir)/ruby/internal/arithmetic.h
+at_exit.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+at_exit.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+at_exit.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+at_exit.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+at_exit.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+at_exit.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+at_exit.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+at_exit.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+at_exit.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+at_exit.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+at_exit.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+at_exit.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+at_exit.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+at_exit.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+at_exit.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+at_exit.o: $(hdrdir)/ruby/internal/assume.h
+at_exit.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+at_exit.o: $(hdrdir)/ruby/internal/attr/artificial.h
+at_exit.o: $(hdrdir)/ruby/internal/attr/cold.h
+at_exit.o: $(hdrdir)/ruby/internal/attr/const.h
+at_exit.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+at_exit.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+at_exit.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+at_exit.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+at_exit.o: $(hdrdir)/ruby/internal/attr/error.h
+at_exit.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+at_exit.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+at_exit.o: $(hdrdir)/ruby/internal/attr/format.h
+at_exit.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+at_exit.o: $(hdrdir)/ruby/internal/attr/noalias.h
+at_exit.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+at_exit.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+at_exit.o: $(hdrdir)/ruby/internal/attr/noinline.h
+at_exit.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+at_exit.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+at_exit.o: $(hdrdir)/ruby/internal/attr/pure.h
+at_exit.o: $(hdrdir)/ruby/internal/attr/restrict.h
+at_exit.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+at_exit.o: $(hdrdir)/ruby/internal/attr/warning.h
+at_exit.o: $(hdrdir)/ruby/internal/attr/weakref.h
+at_exit.o: $(hdrdir)/ruby/internal/cast.h
+at_exit.o: $(hdrdir)/ruby/internal/compiler_is.h
+at_exit.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+at_exit.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+at_exit.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+at_exit.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+at_exit.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+at_exit.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+at_exit.o: $(hdrdir)/ruby/internal/compiler_since.h
+at_exit.o: $(hdrdir)/ruby/internal/config.h
+at_exit.o: $(hdrdir)/ruby/internal/constant_p.h
+at_exit.o: $(hdrdir)/ruby/internal/core.h
+at_exit.o: $(hdrdir)/ruby/internal/core/rarray.h
+at_exit.o: $(hdrdir)/ruby/internal/core/rbasic.h
+at_exit.o: $(hdrdir)/ruby/internal/core/rbignum.h
+at_exit.o: $(hdrdir)/ruby/internal/core/rclass.h
+at_exit.o: $(hdrdir)/ruby/internal/core/rdata.h
+at_exit.o: $(hdrdir)/ruby/internal/core/rfile.h
+at_exit.o: $(hdrdir)/ruby/internal/core/rhash.h
+at_exit.o: $(hdrdir)/ruby/internal/core/robject.h
+at_exit.o: $(hdrdir)/ruby/internal/core/rregexp.h
+at_exit.o: $(hdrdir)/ruby/internal/core/rstring.h
+at_exit.o: $(hdrdir)/ruby/internal/core/rstruct.h
+at_exit.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+at_exit.o: $(hdrdir)/ruby/internal/ctype.h
+at_exit.o: $(hdrdir)/ruby/internal/dllexport.h
+at_exit.o: $(hdrdir)/ruby/internal/dosish.h
+at_exit.o: $(hdrdir)/ruby/internal/error.h
+at_exit.o: $(hdrdir)/ruby/internal/eval.h
+at_exit.o: $(hdrdir)/ruby/internal/event.h
+at_exit.o: $(hdrdir)/ruby/internal/fl_type.h
+at_exit.o: $(hdrdir)/ruby/internal/gc.h
+at_exit.o: $(hdrdir)/ruby/internal/glob.h
+at_exit.o: $(hdrdir)/ruby/internal/globals.h
+at_exit.o: $(hdrdir)/ruby/internal/has/attribute.h
+at_exit.o: $(hdrdir)/ruby/internal/has/builtin.h
+at_exit.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+at_exit.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+at_exit.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+at_exit.o: $(hdrdir)/ruby/internal/has/extension.h
+at_exit.o: $(hdrdir)/ruby/internal/has/feature.h
+at_exit.o: $(hdrdir)/ruby/internal/has/warning.h
+at_exit.o: $(hdrdir)/ruby/internal/intern/array.h
+at_exit.o: $(hdrdir)/ruby/internal/intern/bignum.h
+at_exit.o: $(hdrdir)/ruby/internal/intern/class.h
+at_exit.o: $(hdrdir)/ruby/internal/intern/compar.h
+at_exit.o: $(hdrdir)/ruby/internal/intern/complex.h
+at_exit.o: $(hdrdir)/ruby/internal/intern/cont.h
+at_exit.o: $(hdrdir)/ruby/internal/intern/dir.h
+at_exit.o: $(hdrdir)/ruby/internal/intern/enum.h
+at_exit.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+at_exit.o: $(hdrdir)/ruby/internal/intern/error.h
+at_exit.o: $(hdrdir)/ruby/internal/intern/eval.h
+at_exit.o: $(hdrdir)/ruby/internal/intern/file.h
+at_exit.o: $(hdrdir)/ruby/internal/intern/gc.h
+at_exit.o: $(hdrdir)/ruby/internal/intern/hash.h
+at_exit.o: $(hdrdir)/ruby/internal/intern/io.h
+at_exit.o: $(hdrdir)/ruby/internal/intern/load.h
+at_exit.o: $(hdrdir)/ruby/internal/intern/marshal.h
+at_exit.o: $(hdrdir)/ruby/internal/intern/numeric.h
+at_exit.o: $(hdrdir)/ruby/internal/intern/object.h
+at_exit.o: $(hdrdir)/ruby/internal/intern/parse.h
+at_exit.o: $(hdrdir)/ruby/internal/intern/proc.h
+at_exit.o: $(hdrdir)/ruby/internal/intern/process.h
+at_exit.o: $(hdrdir)/ruby/internal/intern/random.h
+at_exit.o: $(hdrdir)/ruby/internal/intern/range.h
+at_exit.o: $(hdrdir)/ruby/internal/intern/rational.h
+at_exit.o: $(hdrdir)/ruby/internal/intern/re.h
+at_exit.o: $(hdrdir)/ruby/internal/intern/ruby.h
+at_exit.o: $(hdrdir)/ruby/internal/intern/select.h
+at_exit.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+at_exit.o: $(hdrdir)/ruby/internal/intern/signal.h
+at_exit.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+at_exit.o: $(hdrdir)/ruby/internal/intern/string.h
+at_exit.o: $(hdrdir)/ruby/internal/intern/struct.h
+at_exit.o: $(hdrdir)/ruby/internal/intern/thread.h
+at_exit.o: $(hdrdir)/ruby/internal/intern/time.h
+at_exit.o: $(hdrdir)/ruby/internal/intern/variable.h
+at_exit.o: $(hdrdir)/ruby/internal/intern/vm.h
+at_exit.o: $(hdrdir)/ruby/internal/interpreter.h
+at_exit.o: $(hdrdir)/ruby/internal/iterator.h
+at_exit.o: $(hdrdir)/ruby/internal/memory.h
+at_exit.o: $(hdrdir)/ruby/internal/method.h
+at_exit.o: $(hdrdir)/ruby/internal/module.h
+at_exit.o: $(hdrdir)/ruby/internal/newobj.h
+at_exit.o: $(hdrdir)/ruby/internal/rgengc.h
+at_exit.o: $(hdrdir)/ruby/internal/scan_args.h
+at_exit.o: $(hdrdir)/ruby/internal/special_consts.h
+at_exit.o: $(hdrdir)/ruby/internal/static_assert.h
+at_exit.o: $(hdrdir)/ruby/internal/stdalign.h
+at_exit.o: $(hdrdir)/ruby/internal/stdbool.h
+at_exit.o: $(hdrdir)/ruby/internal/symbol.h
+at_exit.o: $(hdrdir)/ruby/internal/token_paste.h
+at_exit.o: $(hdrdir)/ruby/internal/value.h
+at_exit.o: $(hdrdir)/ruby/internal/value_type.h
+at_exit.o: $(hdrdir)/ruby/internal/variable.h
+at_exit.o: $(hdrdir)/ruby/internal/warning_push.h
+at_exit.o: $(hdrdir)/ruby/internal/xmalloc.h
+at_exit.o: $(hdrdir)/ruby/assert.h
+at_exit.o: $(hdrdir)/ruby/backward.h
+at_exit.o: $(hdrdir)/ruby/backward/2/assume.h
+at_exit.o: $(hdrdir)/ruby/backward/2/attributes.h
+at_exit.o: $(hdrdir)/ruby/backward/2/bool.h
+at_exit.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+at_exit.o: $(hdrdir)/ruby/backward/2/inttypes.h
+at_exit.o: $(hdrdir)/ruby/backward/2/limits.h
+at_exit.o: $(hdrdir)/ruby/backward/2/long_long.h
+at_exit.o: $(hdrdir)/ruby/backward/2/stdalign.h
+at_exit.o: $(hdrdir)/ruby/backward/2/stdarg.h
+at_exit.o: $(hdrdir)/ruby/defines.h
+at_exit.o: $(hdrdir)/ruby/intern.h
+at_exit.o: $(hdrdir)/ruby/missing.h
+at_exit.o: $(hdrdir)/ruby/ruby.h
+at_exit.o: $(hdrdir)/ruby/st.h
+at_exit.o: $(hdrdir)/ruby/subst.h
+at_exit.o: $(hdrdir)/ruby/vm.h
+at_exit.o: at_exit.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/wait_for_single_fd/depend b/ext/-test-/wait_for_single_fd/depend
index 949c427685..641e144017 100644
--- a/ext/-test-/wait_for_single_fd/depend
+++ b/ext/-test-/wait_for_single_fd/depend
@@ -1,12 +1,163 @@
 # AUTOGENERATED DEPENDENCIES START
 wait_for_single_fd.o: $(RUBY_EXTCONF_H)
 wait_for_single_fd.o: $(arch_hdrdir)/ruby/config.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/anyargs.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/arithmetic.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/assume.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/attr/artificial.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/attr/cold.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/attr/const.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/attr/error.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/attr/format.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/attr/noalias.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/attr/noinline.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/attr/pure.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/attr/restrict.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/attr/warning.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/attr/weakref.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/cast.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/compiler_is.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/compiler_since.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/config.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/constant_p.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/core.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/core/rarray.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/core/rbasic.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/core/rbignum.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/core/rclass.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/core/rdata.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/core/rfile.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/core/rhash.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/core/robject.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/core/rregexp.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/core/rstring.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/core/rstruct.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/ctype.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/dllexport.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/dosish.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/error.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/eval.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/event.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/fl_type.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/gc.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/glob.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/globals.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/has/attribute.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/has/builtin.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/has/extension.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/has/feature.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/has/warning.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/intern/array.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/intern/bignum.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/intern/class.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/intern/compar.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/intern/complex.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/intern/cont.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/intern/dir.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/intern/enum.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/intern/error.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/intern/eval.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/intern/file.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/intern/gc.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/intern/hash.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/intern/io.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/intern/load.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/intern/marshal.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/intern/numeric.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/intern/object.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/intern/parse.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/intern/proc.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/intern/process.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/intern/random.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/intern/range.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/intern/rational.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/intern/re.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/intern/ruby.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/intern/select.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/intern/signal.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/intern/string.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/intern/struct.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/intern/thread.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/intern/time.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/intern/variable.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/intern/vm.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/interpreter.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/iterator.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/memory.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/method.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/module.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/newobj.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/rgengc.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/scan_args.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/special_consts.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/static_assert.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/stdalign.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/stdbool.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/symbol.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/token_paste.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/value.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/value_type.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/variable.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/warning_push.h
+wait_for_single_fd.o: $(hdrdir)/ruby/internal/xmalloc.h
+wait_for_single_fd.o: $(hdrdir)/ruby/assert.h
 wait_for_single_fd.o: $(hdrdir)/ruby/backward.h
+wait_for_single_fd.o: $(hdrdir)/ruby/backward/2/assume.h
+wait_for_single_fd.o: $(hdrdir)/ruby/backward/2/attributes.h
+wait_for_single_fd.o: $(hdrdir)/ruby/backward/2/bool.h
+wait_for_single_fd.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+wait_for_single_fd.o: $(hdrdir)/ruby/backward/2/inttypes.h
+wait_for_single_fd.o: $(hdrdir)/ruby/backward/2/limits.h
+wait_for_single_fd.o: $(hdrdir)/ruby/backward/2/long_long.h
+wait_for_single_fd.o: $(hdrdir)/ruby/backward/2/stdalign.h
+wait_for_single_fd.o: $(hdrdir)/ruby/backward/2/stdarg.h
 wait_for_single_fd.o: $(hdrdir)/ruby/defines.h
 wait_for_single_fd.o: $(hdrdir)/ruby/encoding.h
 wait_for_single_fd.o: $(hdrdir)/ruby/intern.h
 wait_for_single_fd.o: $(hdrdir)/ruby/io.h
 wait_for_single_fd.o: $(hdrdir)/ruby/missing.h
+wait_for_single_fd.o: $(hdrdir)/ruby/onigmo.h
 wait_for_single_fd.o: $(hdrdir)/ruby/oniguruma.h
 wait_for_single_fd.o: $(hdrdir)/ruby/ruby.h
 wait_for_single_fd.o: $(hdrdir)/ruby/st.h
diff --git a/ext/-test-/wait_for_single_fd/extconf.rb b/ext/-test-/wait_for_single_fd/extconf.rb
index 931662c040..c27100fb42 100644
--- a/ext/-test-/wait_for_single_fd/extconf.rb
+++ b/ext/-test-/wait_for_single_fd/extconf.rb
@@ -1,2 +1,8 @@
 # frozen_string_literal: false
+case RUBY_PLATFORM when /mingw/ then
+  # skip
+else
+  headers = %w(sys/types.h sys/time.h sys/event.h).select { |h| have_header(h) }
+  have_func('kqueue', headers)
+end
 create_makefile("-test-/wait_for_single_fd")
diff --git a/ext/-test-/wait_for_single_fd/wait_for_single_fd.c b/ext/-test-/wait_for_single_fd/wait_for_single_fd.c
index d406724a3f..b8a33979bc 100644
--- a/ext/-test-/wait_for_single_fd/wait_for_single_fd.c
+++ b/ext/-test-/wait_for_single_fd/wait_for_single_fd.c
@@ -19,6 +19,67 @@ wait_for_single_fd(VALUE ign, VALUE fd, VALUE events, VALUE timeout)
     return INT2NUM(rc);
 }
 
+#ifdef HAVE_KQUEUE
+/* ensure rb_wait_for_single_fd works on kqueue descriptors */
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/event.h>
+static VALUE
+kqueue_test_wait(VALUE klass)
+{
+    int kqfd = -1;
+    int p[2] = { -1, -1 };
+    struct timeval tv = { 0, 0 };
+    const struct timespec ts = { 1, 0 };
+    struct kevent kev;
+    const char *msg;
+    VALUE ret = Qfalse;
+    int e = 0;
+    int n;
+
+    msg = "pipe";
+    if (rb_cloexec_pipe(p) < 0) goto err;
+
+    msg = "kqueue";
+    kqfd = kqueue();
+    if (kqfd < 0) goto err;
+
+    n = rb_wait_for_single_fd(kqfd, RB_WAITFD_IN, &tv);
+    if (n != 0) {
+        msg = "spurious wakeup";
+        errno = 0;
+        goto err;
+    }
+
+    msg = "write";
+    if (write(p[1], "", 1) < 0) goto err;
+
+    EV_SET(&kev, p[0], EVFILT_READ, EV_ADD, 0, 0, 0);
+
+    msg = "kevent";
+    n = kevent(kqfd, &kev, 1, &kev, 1, &ts);
+    if (n < 0) goto err;
+    msg = NULL;
+    if (n == 1) {
+        n = rb_wait_for_single_fd(kqfd, RB_WAITFD_IN, &tv);
+        ret = INT2NUM(n);
+    }
+    else {
+        rb_warn("kevent did not return readiness");
+    }
+err:
+    if (msg) e = errno;
+    if (p[0] >= 0) close(p[0]);
+    if (p[1] >= 0) close(p[1]);
+    if (kqfd >= 0) close(kqfd);
+    if (msg) {
+        if (e) rb_syserr_fail(e, msg);
+        rb_raise(rb_eRuntimeError, "%s", msg);
+    }
+    return ret;
+}
+#endif /* HAVE_KQUEUE */
+
 void
 Init_wait_for_single_fd(void)
 {
@@ -27,4 +88,7 @@ Init_wait_for_single_fd(void)
     rb_define_const(rb_cObject, "RB_WAITFD_PRI", INT2NUM(RB_WAITFD_PRI));
     rb_define_singleton_method(rb_cIO, "wait_for_single_fd",
                                wait_for_single_fd, 3);
+#ifdef HAVE_KQUEUE
+    rb_define_singleton_method(rb_cIO, "kqueue_test_wait", kqueue_test_wait, 0);
+#endif
 }
diff --git a/ext/-test-/win32/console/attribute.c b/ext/-test-/win32/console/attribute.c
index 6d706fbfe7..a5f80fcaff 100644
--- a/ext/-test-/win32/console/attribute.c
+++ b/ext/-test-/win32/console/attribute.c
@@ -61,4 +61,9 @@ Init_attribute(VALUE m)
     rb_define_const(m, "BACKGROUND_GREEN", INT2FIX(BACKGROUND_GREEN));
     rb_define_const(m, "BACKGROUND_RED", INT2FIX(BACKGROUND_RED));
     rb_define_const(m, "BACKGROUND_INTENSITY", INT2FIX(BACKGROUND_INTENSITY));
+
+#ifndef COMMON_LVB_REVERSE_VIDEO
+#define COMMON_LVB_REVERSE_VIDEO 0x4000
+#endif
+    rb_define_const(m, "REVERSE_VIDEO", INT2FIX(COMMON_LVB_REVERSE_VIDEO));
 }
diff --git a/ext/-test-/win32/dln/depend b/ext/-test-/win32/dln/depend
index 712fefa29a..c3f14db4f7 100644
--- a/ext/-test-/win32/dln/depend
+++ b/ext/-test-/win32/dln/depend
@@ -1,8 +1,8 @@
 $(TARGET_SO): $(DLNTESTLIB)
 
-$(DLNTESTLIB): $(topdir)/dlntest.dll
+$(DLNTESTLIB): dlntest.dll
 
-$(topdir)/dlntest.dll: libdlntest.o libdlntest.def
+dlntest.dll: libdlntest.o libdlntest.def
 	$(ECHO) linking shared-object $(@F)
 	-$(Q)$(RM) $@
 	-$(Q)$(MAKEDIRS) $(@D)
diff --git a/ext/-test-/win32/dln/extconf.rb b/ext/-test-/win32/dln/extconf.rb
index 55c2d16d1e..d72b6a868c 100644
--- a/ext/-test-/win32/dln/extconf.rb
+++ b/ext/-test-/win32/dln/extconf.rb
@@ -4,7 +4,7 @@ if $mingw or $mswin
   $LOCAL_LIBS << " #{dlntestlib}"
   $srcs = ["dlntest.c"]
   $objs = ["dlntest.o"]
-  testdll = "$(topdir)/dlntest.dll"
+  testdll = "dlntest.dll"
   $cleanfiles << testdll
   $cleanfiles << "dlntest.#{$LIBEXT}"
   config_string('cleanobjs') {|t| $cleanfiles.concat(t.gsub(/\$\*/, 'dlntest').split)}
@@ -13,8 +13,8 @@ if $mingw or $mswin
     m << "\n""DLNTESTLIB = #{dlntestlib}\n"
     if $mingw
       m << "\n"
-      m << "$(topdir)/dlntest.dll: DEFFILE := $(srcdir)/libdlntest.def\n"
-      m << "$(topdir)/dlntest.dll: DLDFLAGS += -Wl,--out-implib,$(DLNTESTLIB)\n"
+      m << "dlntest.dll: DEFFILE := $(srcdir)/libdlntest.def\n"
+      m << "dlntest.dll: DLDFLAGS += -Wl,--out-implib,$(DLNTESTLIB)\n"
     end
     m
   end
diff --git a/ext/.document b/ext/.document
index 2e6fc78879..aeb40c60fb 100644
--- a/ext/.document
+++ b/ext/.document
@@ -2,9 +2,15 @@
 
 bigdecimal/bigdecimal.c
 bigdecimal/lib
+cgi/escape/escape.c
 continuation/continuation.c
 coverage/coverage.c
+coverage/lib
 date/date_core.c
+date/date_parse.c
+date/date_strftime.c
+date/date_strptime.c
+date/lib
 dbm/dbm.c
 digest/bubblebabble/bubblebabble.c
 digest/digest.c
@@ -13,12 +19,7 @@ digest/md5/md5init.c
 digest/rmd160/rmd160init.c
 digest/sha1/sha1init.c
 digest/sha2/sha2init.c
-dl/cfunc.c
-dl/cptr.c
-dl/dl.c
-dl/handle.c
-dl/lib
-dl/win32/lib
+digest/sha2/lib
 etc/etc.c
 fcntl/fcntl.c
 fiber/fiber.c
@@ -26,25 +27,26 @@ fiddle/closure.c
 fiddle/conversions.c
 fiddle/fiddle.c
 fiddle/function.c
+fiddle/pinned.c
 fiddle/pointer.c
 fiddle/handle.c
 fiddle/lib
-fiddle/win32/lib
 gdbm/gdbm.c
 io/console/console.c
+io/console/lib
 io/nonblock/nonblock.c
-io/wait/lib
 io/wait/wait.c
-json/ext/generator/generator.c
-json/ext/parser/parser.c
+json/generator/generator.c
 json/lib
-mathn/complex/complex.c
-mathn/rational/rational.c
+json/parser/parser.c
+monitor/lib
+monitor/monitor.c
 nkf/lib
 nkf/nkf.c
 objspace/objspace.c
 objspace/objspace_dump.c
 objspace/object_tracing.c
+objspace/lib
 openssl/lib
 openssl/ossl.c
 openssl/ossl_asn1.c
@@ -55,10 +57,10 @@ openssl/ossl_config.c
 openssl/ossl_digest.c
 openssl/ossl_engine.c
 openssl/ossl_hmac.c
+openssl/ossl_kdf.c
 openssl/ossl_ns_spki.c
 openssl/ossl_ocsp.c
 openssl/ossl_pkcs12.c
-openssl/ossl_pkcs5.c
 openssl/ossl_pkcs7.c
 openssl/ossl_pkey.c
 openssl/ossl_pkey_dh.c
@@ -68,6 +70,7 @@ openssl/ossl_pkey_rsa.c
 openssl/ossl_rand.c
 openssl/ossl_ssl.c
 openssl/ossl_ssl_session.c
+openssl/ossl_ts.c
 openssl/ossl_x509.c
 openssl/ossl_x509attr.c
 openssl/ossl_x509cert.c
@@ -79,25 +82,25 @@ openssl/ossl_x509revoked.c
 openssl/ossl_x509store.c
 pathname/lib
 pathname/pathname.c
-psych/emitter.c
 psych/lib
-psych/parser.c
 psych/psych.c
-psych/to_ruby.c
-psych/yaml_tree.c
+psych/psych_emitter.c
+psych/psych_parser.c
+psych/psych_to_ruby.c
+psych/psych_yaml_tree.c
 pty/lib
 pty/pty.c
 racc/cparse/cparse.c
+rbconfig/sizeof/*.c
 readline/readline.c
 ripper/lib
-ripper/ripper.c
-sdbm/init.c
 socket
 stringio/stringio.c
 strscan/strscan.c
 syslog/syslog.c
 syslog/lib
-thread/thread.c
+win32/lib
+win32/resolv/*.c
 win32ole/lib
 win32ole/*.c
 zlib/zlib.c
diff --git a/ext/Setup b/ext/Setup
index c8996be79c..0376e2fc6c 100644
--- a/ext/Setup
+++ b/ext/Setup
@@ -23,8 +23,6 @@
 #json
 #json/generator
 #json/parser
-#mathn/complex
-#mathn/rational
 #nkf
 #objspace
 #openssl
@@ -35,13 +33,10 @@
 #rbconfig/sizeof
 #readline
 #ripper
-#sdbm
 #socket
 #stringio
 #strscan
 #syslog
-#tk
-#tk/tkutil
 #win32
 #win32ole
 #zlib
diff --git a/ext/Setup.atheos b/ext/Setup.atheos
index 5e39de8e15..3f6263b1e2 100644
--- a/ext/Setup.atheos
+++ b/ext/Setup.atheos
@@ -20,11 +20,9 @@ pty
 racc/parse
 readline
 ripper
-sdbm
 socket
 stringio
 strscan
 syslog
-#tk
 #win32ole
 zlib
diff --git a/ext/Setup.nacl b/ext/Setup.nacl
deleted file mode 100644
index f205e367c6..0000000000
--- a/ext/Setup.nacl
+++ /dev/null
@@ -1,46 +0,0 @@
-# #option nodynamic
-#
-# #Win32API
-# bigdecimal
-# cgi/escape
-# continuation
-# coverage
-# date
-# #dbm
-# digest/bubblebabble
-# digest
-# digest/md5
-# digest/rmd160
-# digest/sha1
-# digest/sha2
-# etc
-# fcntl
-# fiber
-# #fiddle
-# #gdbm
-# #iconv
-# io/console
-# io/nonblock
-# io/wait
-# #json
-# json/generator
-# json/parser
-# mathn/complex
-# mathn/rational
-# nkf
-# objspace
-# #openssl
-# pathname
-# #psych
-# #pty
-# racc/cparse
-# #readline
-# ripper
-# #sdbm
-# #socket
-# stringio
-# strscan
-# #syslog
-# #tk
-# #tk/tkutil
-# #zlib
diff --git a/ext/Setup.nt b/ext/Setup.nt
index 4812893eef..dc36aa8688 100644
--- a/ext/Setup.nt
+++ b/ext/Setup.nt
@@ -21,11 +21,9 @@ nkf
 racc/cparse
 #readline
 #ripper
-sdbm
 socket
 stringio
 strscan
 #syslog
-#tk
 win32ole
 #zlib
diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c
index b1c887c756..7fdf40126e 100644
--- a/ext/bigdecimal/bigdecimal.c
+++ b/ext/bigdecimal/bigdecimal.c
@@ -14,6 +14,7 @@
 #include "ruby/util.h"
 
 #ifndef BIGDECIMAL_DEBUG
+# undef NDEBUG
 # define NDEBUG
 #endif
 #include <assert.h>
@@ -24,7 +25,6 @@
 #include <string.h>
 #include <errno.h>
 #include <math.h>
-#include "math.h"
 
 #ifdef HAVE_IEEEFP_H
 #include <ieeefp.h>
@@ -62,6 +62,7 @@ static ID id_ceil;
 static ID id_floor;
 static ID id_to_r;
 static ID id_eq;
+static ID id_half;
 
 /* MACRO's to guard objects from GC by keeping them in stack */
 #define ENTER(n) volatile VALUE RB_UNUSED_VAR(vStack[n]);int iStack=0
@@ -76,7 +77,7 @@ static ID id_eq;
 #define BASE1 (BASE/10)
 
 #ifndef DBLE_FIG
-#define DBLE_FIG (DBL_DIG+1)    /* figure of double */
+#define DBLE_FIG rmpd_double_figures()    /* figure of double */
 #endif
 
 #ifndef RRATIONAL_ZERO_P
@@ -109,7 +110,7 @@ rb_rational_num(VALUE rat)
 #ifdef HAVE_TYPE_STRUCT_RRATIONAL
     return RRATIONAL(rat)->num;
 #else
-    return rb_funcall(rat, rb_intern("numerator"));
+    return rb_funcall(rat, rb_intern("numerator"), 0);
 #endif
 }
 #endif
@@ -121,31 +122,44 @@ rb_rational_den(VALUE rat)
 #ifdef HAVE_TYPE_STRUCT_RRATIONAL
     return RRATIONAL(rat)->den;
 #else
-    return rb_funcall(rat, rb_intern("denominator"));
+    return rb_funcall(rat, rb_intern("denominator"), 0);
 #endif
 }
 #endif
 
+#ifndef HAVE_RB_COMPLEX_REAL
+static inline VALUE
+rb_complex_real(VALUE cmp)
+{
+#ifdef HAVE_TYPE_STRUCT_RCOMPLEX
+  return RCOMPLEX(cmp)->real;
+#else
+  return rb_funcall(cmp, rb_intern("real"), 0);
+#endif
+}
+#endif
+
+#ifndef HAVE_RB_COMPLEX_IMAG
+static inline VALUE
+rb_complex_imag(VALUE cmp)
+{
+#ifdef HAVE_TYPE_STRUCT_RCOMPLEX
+  return RCOMPLEX(cmp)->imag;
+#else
+  return rb_funcall(cmp, rb_intern("imag"), 0);
+#endif
+}
+#endif
+
+#define BIGDECIMAL_POSITIVE_P(bd) ((bd)->sign > 0)
+#define BIGDECIMAL_NEGATIVE_P(bd) ((bd)->sign < 0)
+
 /*
  * ================== Ruby Interface part ==========================
  */
 #define DoSomeOne(x,y,f) rb_num_coerce_bin(x,y,f)
 
 /*
- * Returns the BigDecimal version number.
- */
-static VALUE
-BigDecimal_version(VALUE self)
-{
-    /*
-     * 1.0.0: Ruby 1.8.0
-     * 1.0.1: Ruby 1.8.1
-     * 1.1.0: Ruby 1.9.3
-    */
-    return rb_str_new2("1.1.0");
-}
-
-/*
  *   VP routines used in BigDecimal part
  */
 static unsigned short VpGetException(void);
@@ -175,11 +189,16 @@ BigDecimal_memsize(const void *ptr)
     return (sizeof(*pv) + pv->MaxPrec * sizeof(BDIGIT));
 }
 
+#ifndef HAVE_RB_EXT_RACTOR_SAFE
+#   undef RUBY_TYPED_FROZEN_SHAREABLE
+#   define RUBY_TYPED_FROZEN_SHAREABLE 0
+#endif
+
 static const rb_data_type_t BigDecimal_data_type = {
     "BigDecimal",
     { 0, BigDecimal_delete, BigDecimal_memsize, },
 #ifdef RUBY_TYPED_FREE_IMMEDIATELY
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_FROZEN_SHAREABLE
 #endif
 };
 
@@ -227,6 +246,7 @@ static inline VALUE BigDecimal_div2(VALUE, VALUE, VALUE);
 static Real*
 GetVpValueWithPrec(VALUE v, long prec, int must)
 {
+    ENTER(1);
     Real *pv;
     VALUE num, bg;
     char szD[128];
@@ -237,12 +257,11 @@ again:
     switch(TYPE(v)) {
       case T_FLOAT:
 	if (prec < 0) goto unable_to_coerce_without_prec;
-	if (prec > DBL_DIG+1) goto SomeOneMayDoIt;
+	if (prec > (long)DBLE_FIG) goto SomeOneMayDoIt;
 	d = RFLOAT_VALUE(v);
 	if (!isfinite(d)) {
-	    pv = VpCreateRbObject(prec, NULL);
-	    pv->sign = isnan(d) ? VP_SIGN_NaN :
-		d > 0 ? VP_SIGN_POSITIVE_INFINITE : VP_SIGN_NEGATIVE_FINITE;
+	    pv = VpCreateRbObject(1, NULL);
+	    VpDtoV(pv, d);
 	    return pv;
 	}
 	if (d != 0.0) {
@@ -285,13 +304,14 @@ again:
 
 #ifdef ENABLE_NUMERIC_STRING
       case T_STRING:
-	SafeStringValue(v);
-	return VpCreateRbObject(strlen(RSTRING_PTR(v)) + VpBaseFig() + 1,
+	StringValueCStr(v);
+	return VpCreateRbObject(RSTRING_LEN(v) + VpBaseFig() + 1,
 				RSTRING_PTR(v));
 #endif /* ENABLE_NUMERIC_STRING */
 
       case T_BIGNUM:
 	bg = rb_big2str(v, 10);
+	PUSH(bg);
 	return VpCreateRbObject(strlen(RSTRING_PTR(bg)) + VpBaseFig() + 1,
 				RSTRING_PTR(bg));
       default:
@@ -332,15 +352,20 @@ BigDecimal_double_fig(VALUE self)
     return INT2FIX(VpDblFig());
 }
 
-/* call-seq:
- * precs
+/*  call-seq:
+ *     big_decimal.precs  ->  array
  *
- * Returns an Array of two Integer values.
+ *  Returns an Array of two Integer values that represent platform-dependent
+ *  internal storage properties.
  *
- * The first value is the current number of significant digits in the
- * BigDecimal. The second value is the maximum number of significant digits
- * for the BigDecimal.
+ *  This method is deprecated and will be removed in the future.
+ *  Instead, use BigDecimal#n_significant_digits for obtaining the number of
+ *  significant digits in scientific notation, and BigDecimal#precision for
+ *  obtaining the number of digits in decimal notation.
+ *
+ *     BigDecimal('5').precs #=> [9, 18]
  */
+
 static VALUE
 BigDecimal_prec(VALUE self)
 {
@@ -348,13 +373,110 @@ BigDecimal_prec(VALUE self)
     Real *p;
     VALUE obj;
 
+    rb_category_warn(RB_WARN_CATEGORY_DEPRECATED,
+                     "BigDecimal#precs is deprecated and will be removed in the future; "
+                     "use BigDecimal#precision instead.");
+
     GUARD_OBJ(p, GetVpValue(self, 1));
-    obj = rb_assoc_new(INT2NUM(p->Prec*VpBaseFig()),
-		       INT2NUM(p->MaxPrec*VpBaseFig()));
+    obj = rb_assoc_new(SIZET2NUM(p->Prec*VpBaseFig()),
+		       SIZET2NUM(p->MaxPrec*VpBaseFig()));
     return obj;
 }
 
 /*
+ * call-seq:
+ *   big_decimal.precision  ->  intreger
+ *
+ * Returns the number of decimal digits in this number.
+ *
+ * Example:
+ *
+ *   BigDecimal("0").precision  # => 0
+ *   BigDecimal("1").precision  # => 1
+ *   BigDecimal("-1e20").precision  # => 21
+ *   BigDecimal("1e-20").precision  # => 20
+ *   BigDecimal("Infinity").precision  # => 0
+ *   BigDecimal("-Infinity").precision  # => 0
+ *   BigDecimal("NaN").precision  # => 0
+ */
+static VALUE
+BigDecimal_precision(VALUE self)
+{
+    ENTER(1);
+
+    Real *p;
+    GUARD_OBJ(p, GetVpValue(self, 1));
+
+    /*
+     * The most significant digit is frac[0], and the least significant digit is frac[Prec-1].
+     * When the exponent is zero, the decimal point is located just before frac[0].
+     * When the exponent is negative, the decimal point moves to leftward.
+     * Conversely, when the exponent is positive, the decimal point moves to rightward.
+     *
+     *    | frac[0] frac[1] frac[2] . frac[3] frac[4] ... frac[Prec-1]
+     *    |------------------------> exponent == 3
+     */
+
+    ssize_t ex = p->exponent;
+    ssize_t precision = 0;
+    if (ex < 0) {
+        precision = (-ex + 1) * BASE_FIG;  /* 1 is for p->frac[0] */
+        ex = 0;
+    }
+    else if (p->Prec > 0) {
+        BDIGIT x = p->frac[0];
+        for (precision = 0; x > 0; x /= 10) {
+            ++precision;
+        }
+    }
+
+    if (ex > (ssize_t)p->Prec) {
+        precision += (ex - 1) * BASE_FIG;
+    }
+    else if (p->Prec > 0) {
+        ssize_t n = (ssize_t)p->Prec - 1;
+        while (n > 0 && p->frac[n] == 0) --n;
+
+        precision += n * BASE_FIG;
+
+        if (ex < (ssize_t)p->Prec) {
+            BDIGIT x = p->frac[n];
+            for (; x > 0 && x % 10 == 0; x /= 10) {
+                --precision;
+            }
+        }
+    }
+
+    return SSIZET2NUM(precision);
+}
+
+static VALUE
+BigDecimal_n_significant_digits(VALUE self)
+{
+    ENTER(1);
+
+    Real *p;
+    GUARD_OBJ(p, GetVpValue(self, 1));
+
+    ssize_t n = p->Prec;
+    while (n > 0 && p->frac[n-1] == 0) --n;
+    if (n <= 0) {
+        return INT2FIX(0);
+    }
+
+    int nlz, ntz;
+
+    BDIGIT x = p->frac[0];
+    for (nlz = BASE_FIG; x > 0; x /= 10) --nlz;
+
+    x = p->frac[n-1];
+    for (ntz = 0; x > 0 && x % 10 == 0; x /= 10) ++ntz;
+
+    ssize_t n_digits = BASE_FIG * n - nlz - ntz;
+    return SSIZET2NUM(n_digits);
+}
+
+/*
  * call-seq: hash
  *
  * Creates a hash for this BigDecimal.
@@ -376,7 +498,7 @@ BigDecimal_hash(VALUE self)
 	hash ^= rb_memhash(p->frac, sizeof(BDIGIT)*p->Prec);
 	hash += p->exponent;
     }
-    return INT2FIX(hash);
+    return ST2FIX(hash);
 }
 
 /*
@@ -384,10 +506,10 @@ BigDecimal_hash(VALUE self)
  *
  * Method used to provide marshalling support.
  *
- *      inf = BigDecimal.new('Infinity')
- *        #=> #<BigDecimal:1e16fa8,'Infinity',9(9)>
+ *      inf = BigDecimal('Infinity')
+ *        #=> Infinity
  *      BigDecimal._load(inf._dump)
- *        #=> #<BigDecimal:1df8dc8,'Infinity',9(9)>
+ *        #=> Infinity
  *
  * See the Marshal module.
  */
@@ -422,8 +544,7 @@ BigDecimal_load(VALUE self, VALUE str)
     unsigned char ch;
     unsigned long m=0;
 
-    SafeStringValue(str);
-    pch = (unsigned char *)RSTRING_PTR(str);
+    pch = (unsigned char *)StringValueCStr(str);
     /* First get max prec */
     while((*pch) != (unsigned char)'\0' && (ch = *pch++) != (unsigned char)':') {
         if(!ISDIGIT(ch)) {
@@ -441,6 +562,55 @@ BigDecimal_load(VALUE self, VALUE str)
 }
 
 static unsigned short
+check_rounding_mode_option(VALUE const opts)
+{
+    VALUE mode;
+    char const *s;
+    long l;
+
+    assert(RB_TYPE_P(opts, T_HASH));
+
+    if (NIL_P(opts))
+        goto noopt;
+
+    mode = rb_hash_lookup2(opts, ID2SYM(id_half), Qundef);
+    if (mode == Qundef || NIL_P(mode))
+        goto noopt;
+
+    if (SYMBOL_P(mode))
+        mode = rb_sym2str(mode);
+    else if (!RB_TYPE_P(mode, T_STRING)) {
+	VALUE str_mode = rb_check_string_type(mode);
+	if (NIL_P(str_mode)) goto invalid;
+	mode = str_mode;
+    }
+    s = RSTRING_PTR(mode);
+    l = RSTRING_LEN(mode);
+    switch (l) {
+      case 2:
+        if (strncasecmp(s, "up", 2) == 0)
+            return VP_ROUND_HALF_UP;
+        break;
+      case 4:
+        if (strncasecmp(s, "even", 4) == 0)
+            return VP_ROUND_HALF_EVEN;
+        else if (strncasecmp(s, "down", 4) == 0)
+            return VP_ROUND_HALF_DOWN;
+        break;
+      default:
+        break;
+    }
+  invalid:
+    if (NIL_P(mode))
+	rb_raise(rb_eArgError, "invalid rounding mode: nil");
+    else
+	rb_raise(rb_eArgError, "invalid rounding mode: %"PRIsVALUE, mode);
+
+  noopt:
+    return VpGetRoundMode();
+}
+
+static unsigned short
 check_rounding_mode(VALUE const v)
 {
     unsigned short sw;
@@ -562,7 +732,7 @@ BigDecimal_mode(int argc, VALUE *argv, VALUE self)
 	fo = VpSetRoundMode(sw);
 	return INT2FIX(fo);
     }
-    rb_raise(rb_eTypeError, "first argument for BigDecimal#mode invalid");
+    rb_raise(rb_eTypeError, "first argument for BigDecimal.mode invalid");
     return Qnil;
 }
 
@@ -588,12 +758,12 @@ GetAddSubPrec(Real *a, Real *b)
 }
 
 static SIGNED_VALUE
-GetPositiveInt(VALUE v)
+GetPrecisionInt(VALUE v)
 {
     SIGNED_VALUE n;
     n = NUM2INT(v);
     if (n < 0) {
-	rb_raise(rb_eArgError, "argument must be positive");
+	rb_raise(rb_eArgError, "negative precision");
     }
     return n;
 }
@@ -602,9 +772,10 @@ VP_EXPORT Real *
 VpNewRbClass(size_t mx, const char *str, VALUE klass)
 {
     VALUE obj = TypedData_Wrap_Struct(klass, &BigDecimal_data_type, 0);
-    Real *pv = VpAlloc(mx,str);
+    Real *pv = VpAlloc(mx, str, 1, 1);
     RTYPEDDATA_DATA(obj) = pv;
     pv->obj = obj;
+    RB_OBJ_FREEZE(obj);
     return pv;
 }
 
@@ -680,9 +851,9 @@ BigDecimal_check_num(Real *p)
 
 static VALUE BigDecimal_split(VALUE self);
 
-/* Returns the value as an integer (Fixnum or Bignum).
+/* Returns the value as an Integer.
  *
- * If the BigNumber is infinity or NaN, raises FloatDomainError.
+ * If the BigDecimal is infinity or NaN, raises FloatDomainError.
  */
 static VALUE
 BigDecimal_to_i(VALUE self)
@@ -707,7 +878,7 @@ BigDecimal_to_i(VALUE self)
 	VALUE ret;
 	ssize_t dpower = e - (ssize_t)RSTRING_LEN(digits);
 
-	if (VpGetSign(p) < 0) {
+	if (BIGDECIMAL_NEGATIVE_P(p)) {
 	    numerator = rb_funcall(numerator, '*', 1, INT2FIX(-1));
 	}
 	if (dpower < 0) {
@@ -762,17 +933,17 @@ BigDecimal_to_f(VALUE self)
 
 overflow:
     VpException(VP_EXCEPTION_OVERFLOW, "BigDecimal to Float conversion", 0);
-    if (p->sign >= 0)
-	return rb_float_new(VpGetDoublePosInf());
-    else
+    if (BIGDECIMAL_NEGATIVE_P(p))
 	return rb_float_new(VpGetDoubleNegInf());
+    else
+	return rb_float_new(VpGetDoublePosInf());
 
 underflow:
     VpException(VP_EXCEPTION_UNDERFLOW, "BigDecimal to Float conversion", 0);
-    if (p->sign >= 0)
-	return rb_float_new(0.0);
-    else
+    if (BIGDECIMAL_NEGATIVE_P(p))
 	return rb_float_new(-0.0);
+    else
+	return rb_float_new(0.0);
 }
 
 
@@ -818,7 +989,7 @@ BigDecimal_to_r(VALUE self)
  * be coerced into a BigDecimal value.
  *
  * e.g.
- *   a = BigDecimal.new("1.0")
+ *   a = BigDecimal("1.0")
  *   b = a / 2.0 #=> 0.5
  *
  * Note that coercing a String to a BigDecimal is not supported by default;
@@ -832,7 +1003,7 @@ BigDecimal_coerce(VALUE self, VALUE other)
     Real *b;
 
     if (RB_TYPE_P(other, T_FLOAT)) {
-	GUARD_OBJ(b, GetVpValueWithPrec(other, DBL_DIG+1, 1));
+	GUARD_OBJ(b, GetVpValueWithPrec(other, DBLE_FIG, 1));
 	obj = rb_assoc_new(ToValue(b), self);
     }
     else {
@@ -850,13 +1021,14 @@ BigDecimal_coerce(VALUE self, VALUE other)
 }
 
 /*
- * call-seq: +@
+ * call-seq:
+ *    +big_decimal  ->  big_decimal
  *
  * Return self.
  *
- * e.g.
- *   b = +a  # b == a
+ *     +BigDecimal('5')  #=> 0.5e1
  */
+
 static VALUE
 BigDecimal_uplus(VALUE self)
 {
@@ -889,7 +1061,7 @@ BigDecimal_add(VALUE self, VALUE r)
 
     GUARD_OBJ(a, GetVpValue(self, 1));
     if (RB_TYPE_P(r, T_FLOAT)) {
-	b = GetVpValueWithPrec(r, DBL_DIG+1, 1);
+	b = GetVpValueWithPrec(r, DBLE_FIG, 1);
     }
     else if (RB_TYPE_P(r, T_RATIONAL)) {
 	b = GetVpValueWithPrec(r, a->Prec*VpBaseFig(), 1);
@@ -947,7 +1119,7 @@ BigDecimal_sub(VALUE self, VALUE r)
 
     GUARD_OBJ(a, GetVpValue(self,1));
     if (RB_TYPE_P(r, T_FLOAT)) {
-	b = GetVpValueWithPrec(r, DBL_DIG+1, 1);
+	b = GetVpValueWithPrec(r, DBLE_FIG, 1);
     }
     else if (RB_TYPE_P(r, T_RATIONAL)) {
 	b = GetVpValueWithPrec(r, a->Prec*VpBaseFig(), 1);
@@ -997,7 +1169,7 @@ BigDecimalCmp(VALUE self, VALUE r,char op)
 	break;
 
     case T_FLOAT:
-	GUARD_OBJ(b, GetVpValueWithPrec(r, DBL_DIG+1, 0));
+	GUARD_OBJ(b, GetVpValueWithPrec(r, DBLE_FIG, 0));
 	break;
 
     case T_RATIONAL:
@@ -1106,7 +1278,7 @@ BigDecimal_comp(VALUE self, VALUE r)
  *
  * Values may be coerced to perform the comparison:
  *
- *   BigDecimal.new('1.0') == 1.0  #=> true
+ *   BigDecimal('1.0') == 1.0  #=> true
  */
 static VALUE
 BigDecimal_eq(VALUE self, VALUE r)
@@ -1167,14 +1339,14 @@ BigDecimal_ge(VALUE self, VALUE r)
 }
 
 /*
- * call-seq: -@
+ *  call-seq:
+ *     -big_decimal  ->  big_decimal
  *
- * Return the negation of self.
+ *  Return the negation of self.
  *
- * e.g.
- *   b = -a
- *   b == a * -1
+ *    -BigDecimal('5')  #=> -0.5e1
  */
+
 static VALUE
 BigDecimal_neg(VALUE self)
 {
@@ -1210,7 +1382,7 @@ BigDecimal_mult(VALUE self, VALUE r)
 
     GUARD_OBJ(a, GetVpValue(self, 1));
     if (RB_TYPE_P(r, T_FLOAT)) {
-	b = GetVpValueWithPrec(r, DBL_DIG+1, 1);
+        b = GetVpValueWithPrec(r, DBLE_FIG, 1);
     }
     else if (RB_TYPE_P(r, T_RATIONAL)) {
 	b = GetVpValueWithPrec(r, a->Prec*VpBaseFig(), 1);
@@ -1238,7 +1410,7 @@ BigDecimal_divide(Real **c, Real **res, Real **div, VALUE self, VALUE r)
 
     GUARD_OBJ(a, GetVpValue(self, 1));
     if (RB_TYPE_P(r, T_FLOAT)) {
-	b = GetVpValueWithPrec(r, DBL_DIG+1, 1);
+        b = GetVpValueWithPrec(r, DBLE_FIG, 1);
     }
     else if (RB_TYPE_P(r, T_RATIONAL)) {
 	b = GetVpValueWithPrec(r, a->Prec*VpBaseFig(), 1);
@@ -1262,25 +1434,14 @@ BigDecimal_divide(Real **c, Real **res, Real **div, VALUE self, VALUE r)
     return Qnil;
 }
 
- /* call-seq:
-  * div(value, digits)
-  * quo(value)
-  *
-  * Divide by the specified value.
-  *
-  * e.g.
-  *   c = a.div(b,n)
-  *
-  * digits:: If specified and less than the number of significant digits of the
-  *          result, the result is rounded to that number of digits, according
-  *          to BigDecimal.mode.
-  *
-  * If digits is 0, the result is the same as the / operator. If not, the
-  * result is an integer BigDecimal, by analogy with Float#div.
-  *
-  * The alias quo is provided since <code>div(value, 0)</code> is the same as
-  * computing the quotient; see BigDecimal#divmod.
-  */
+/* call-seq:
+ *   a / b       -> bigdecimal
+ *   quo(value)  -> bigdecimal
+ *
+ * Divide by the specified value.
+ *
+ * See BigDecimal#div.
+ */
 static VALUE
 BigDecimal_div(VALUE self, VALUE r)
 /* For c = self/r: with round operation */
@@ -1315,7 +1476,7 @@ BigDecimal_DoDivmod(VALUE self, VALUE r, Real **div, Real **mod)
 
     GUARD_OBJ(a, GetVpValue(self, 1));
     if (RB_TYPE_P(r, T_FLOAT)) {
-	b = GetVpValueWithPrec(r, DBL_DIG+1, 1);
+	b = GetVpValueWithPrec(r, DBLE_FIG, 1);
     }
     else if (RB_TYPE_P(r, T_RATIONAL)) {
 	b = GetVpValueWithPrec(r, a->Prec*VpBaseFig(), 1);
@@ -1416,7 +1577,7 @@ BigDecimal_divremain(VALUE self, VALUE r, Real **dv, Real **rv)
 
     GUARD_OBJ(a, GetVpValue(self, 1));
     if (RB_TYPE_P(r, T_FLOAT)) {
-	b = GetVpValueWithPrec(r, DBL_DIG+1, 1);
+	b = GetVpValueWithPrec(r, DBLE_FIG, 1);
     }
     else if (RB_TYPE_P(r, T_RATIONAL)) {
 	b = GetVpValueWithPrec(r, a->Prec*VpBaseFig(), 1);
@@ -1479,8 +1640,8 @@ BigDecimal_remainder(VALUE self, VALUE r) /* remainder */
  *
  *   require 'bigdecimal'
  *
- *   a = BigDecimal.new("42")
- *   b = BigDecimal.new("9")
+ *   a = BigDecimal("42")
+ *   b = BigDecimal("9")
  *
  *   q, m = a.divmod(b)
  *
@@ -1523,7 +1684,7 @@ BigDecimal_div2(VALUE self, VALUE b, VALUE n)
     }
 
     /* div in BigDecimal sense */
-    ix = GetPositiveInt(n);
+    ix = GetPrecisionInt(n);
     if (ix == 0) {
         return BigDecimal_div(self, b);
     }
@@ -1533,7 +1694,7 @@ BigDecimal_div2(VALUE self, VALUE b, VALUE n)
         size_t mx = ix + VpBaseFig()*2;
         size_t pl = VpSetPrecLimit(0);
 
-        GUARD_OBJ(cv, VpCreateRbObject(mx, "0"));
+        GUARD_OBJ(cv, VpCreateRbObject(mx + VpBaseFig(), "0"));
         GUARD_OBJ(av, GetVpValue(self, 1));
         GUARD_OBJ(bv, GetVpValue(b, 1));
         mx = av->Prec + bv->Prec + 2;
@@ -1546,6 +1707,37 @@ BigDecimal_div2(VALUE self, VALUE b, VALUE n)
     }
 }
 
+ /*
+  * Document-method: BigDecimal#div
+  *
+  * call-seq:
+  *   div(value, digits)  -> bigdecimal or integer
+  *
+  * Divide by the specified value.
+  *
+  * digits:: If specified and less than the number of significant digits of the
+  *          result, the result is rounded to that number of digits, according
+  *          to BigDecimal.mode.
+  *
+  *          If digits is 0, the result is the same as for the / operator
+  *          or #quo.
+  *
+  *          If digits is not specified, the result is an integer,
+  *          by analogy with Float#div; see also BigDecimal#divmod.
+  *
+  * Examples:
+  *
+  *   a = BigDecimal("4")
+  *   b = BigDecimal("3")
+  *
+  *   a.div(b, 3)  # => 0.133e1
+  *
+  *   a.div(b, 0)  # => 0.1333333333333333333e1
+  *   a / b        # => 0.1333333333333333333e1
+  *   a.quo(b)     # => 0.1333333333333333333e1
+  *
+  *   a.div(b)     # => 1
+  */
 static VALUE
 BigDecimal_div3(int argc, VALUE *argv, VALUE self)
 {
@@ -1561,7 +1753,7 @@ BigDecimal_add2(VALUE self, VALUE b, VALUE n)
 {
     ENTER(2);
     Real *cv;
-    SIGNED_VALUE mx = GetPositiveInt(n);
+    SIGNED_VALUE mx = GetPrecisionInt(n);
     if (mx == 0) return BigDecimal_add(self, b);
     else {
 	size_t pl = VpSetPrecLimit(0);
@@ -1591,7 +1783,7 @@ BigDecimal_sub2(VALUE self, VALUE b, VALUE n)
 {
     ENTER(2);
     Real *cv;
-    SIGNED_VALUE mx = GetPositiveInt(n);
+    SIGNED_VALUE mx = GetPrecisionInt(n);
     if (mx == 0) return BigDecimal_sub(self, b);
     else {
 	size_t pl = VpSetPrecLimit(0);
@@ -1609,7 +1801,7 @@ BigDecimal_mult2(VALUE self, VALUE b, VALUE n)
 {
     ENTER(2);
     Real *cv;
-    SIGNED_VALUE mx = GetPositiveInt(n);
+    SIGNED_VALUE mx = GetPrecisionInt(n);
     if (mx == 0) return BigDecimal_mult(self, b);
     else {
 	size_t pl = VpSetPrecLimit(0);
@@ -1621,11 +1813,16 @@ BigDecimal_mult2(VALUE self, VALUE b, VALUE n)
     }
 }
 
-/* Returns the absolute value, as a BigDecimal.
+/*
+ *  call-seq:
+ *     big_decimal.abs  ->  big_decimal
  *
- *   BigDecimal('5').abs #=> 5
- *   BigDecimal('-3').abs #=> 3
+ *  Returns the absolute value, as a BigDecimal.
+ *
+ *     BigDecimal('5').abs  #=> 0.5e1
+ *     BigDecimal('-3').abs #=> 0.3e1
  */
+
 static VALUE
 BigDecimal_abs(VALUE self)
 {
@@ -1658,7 +1855,7 @@ BigDecimal_sqrt(VALUE self, VALUE nFig)
     GUARD_OBJ(a, GetVpValue(self, 1));
     mx = a->Prec * (VpBaseFig() + 1);
 
-    n = GetPositiveInt(nFig) + VpDblFig() + BASE_FIG;
+    n = GetPrecisionInt(nFig) + VpDblFig() + BASE_FIG;
     if (mx <= n) mx = n;
     GUARD_OBJ(c, VpCreateRbObject(mx, "0"));
     VpSqrt(c, a);
@@ -1685,20 +1882,23 @@ BigDecimal_fix(VALUE self)
  * round(n, mode)
  *
  * Round to the nearest integer (by default), returning the result as a
- * BigDecimal.
+ * BigDecimal if n is specified, or as an Integer if it isn't.
  *
  *	BigDecimal('3.14159').round #=> 3
  *	BigDecimal('8.7').round #=> 9
  *	BigDecimal('-9.9').round #=> -10
  *
+ *	BigDecimal('3.14159').round(2).class.name #=> "BigDecimal"
+ *	BigDecimal('3.14159').round.class.name #=> "Integer"
+ *
  * If n is specified and positive, the fractional part of the result has no
  * more than that many digits.
  *
  * If n is specified and negative, at least that many digits to the left of the
- * decimal point will be 0 in the result.
+ * decimal point will be 0 in the result, and return value will be an Integer.
  *
  *	BigDecimal('3.14159').round(3) #=> 3.142
- *	BigDecimal('13345.234').round(-2) #=> 13300.0
+ *	BigDecimal('13345.234').round(-2) #=> 13300
  *
  * The value of the optional mode argument can be used to determine how
  * rounding is performed; see BigDecimal.mode.
@@ -1711,6 +1911,7 @@ BigDecimal_round(int argc, VALUE *argv, VALUE self)
     int    iLoc = 0;
     VALUE  vLoc;
     VALUE  vRound;
+    int    round_to_int = 0;
     size_t mx, pl;
 
     unsigned short sw = VpGetRoundMode();
@@ -1718,13 +1919,25 @@ BigDecimal_round(int argc, VALUE *argv, VALUE self)
     switch (rb_scan_args(argc, argv, "02", &vLoc, &vRound)) {
       case 0:
 	iLoc = 0;
+        round_to_int = 1;
 	break;
       case 1:
-	iLoc = NUM2INT(vLoc);
+        if (RB_TYPE_P(vLoc, T_HASH)) {
+	    sw = check_rounding_mode_option(vLoc);
+	}
+	else {
+	    iLoc = NUM2INT(vLoc);
+            if (iLoc < 1) round_to_int = 1;
+	}
 	break;
       case 2:
 	iLoc = NUM2INT(vLoc);
-	sw = check_rounding_mode(vRound);
+	if (RB_TYPE_P(vRound, T_HASH)) {
+	    sw = check_rounding_mode_option(vRound);
+	}
+	else {
+	    sw = check_rounding_mode(vRound);
+	}
 	break;
       default:
 	break;
@@ -1736,7 +1949,7 @@ BigDecimal_round(int argc, VALUE *argv, VALUE self)
     GUARD_OBJ(c, VpCreateRbObject(mx, "0"));
     VpSetPrecLimit(pl);
     VpActiveRound(c, a, sw, iLoc);
-    if (argc == 0) {
+    if (round_to_int) {
 	return BigDecimal_to_i(ToValue(c));
     }
     return ToValue(c);
@@ -1918,34 +2131,34 @@ BigDecimal_ceil(int argc, VALUE *argv, VALUE self)
  *
  * Examples:
  *
- *   BigDecimal.new('-123.45678901234567890').to_s('5F')
+ *   BigDecimal('-123.45678901234567890').to_s('5F')
  *     #=> '-123.45678 90123 45678 9'
  *
- *   BigDecimal.new('123.45678901234567890').to_s('+8F')
+ *   BigDecimal('123.45678901234567890').to_s('+8F')
  *     #=> '+123.45678901 23456789'
  *
- *   BigDecimal.new('123.45678901234567890').to_s(' F')
+ *   BigDecimal('123.45678901234567890').to_s(' F')
  *     #=> ' 123.4567890123456789'
  */
 static VALUE
 BigDecimal_to_s(int argc, VALUE *argv, VALUE self)
 {
     ENTER(5);
-    int   fmt = 0;   /* 0:E format */
-    int   fPlus = 0; /* =0:default,=1: set ' ' before digits ,set '+' before digits. */
+    int   fmt = 0;   /* 0: E format, 1: F format */
+    int   fPlus = 0; /* 0: default, 1: set ' ' before digits, 2: set '+' before digits. */
     Real  *vp;
     volatile VALUE str;
     char  *psz;
     char   ch;
     size_t nc, mc = 0;
+    SIGNED_VALUE m;
     VALUE  f;
 
     GUARD_OBJ(vp, GetVpValue(self, 1));
 
     if (rb_scan_args(argc, argv, "01", &f) == 1) {
 	if (RB_TYPE_P(f, T_STRING)) {
-	    SafeStringValue(f);
-	    psz = RSTRING_PTR(f);
+	    psz = StringValueCStr(f);
 	    if (*psz == ' ') {
 		fPlus = 1;
 		psz++;
@@ -1968,7 +2181,11 @@ BigDecimal_to_s(int argc, VALUE *argv, VALUE self)
 	    }
 	}
 	else {
-	    mc = (size_t)GetPositiveInt(f);
+	    m = NUM2INT(f);
+	    if (m <= 0) {
+		rb_raise(rb_eArgError, "argument must be positive");
+	    }
+	    mc = (size_t)m;
 	}
     }
     if (fmt) {
@@ -1981,7 +2198,7 @@ BigDecimal_to_s(int argc, VALUE *argv, VALUE self)
 	nc += (nc + mc - 1) / mc + 1;
     }
 
-    str = rb_str_new(0, nc);
+    str = rb_usascii_str_new(0, nc);
     psz = RSTRING_PTR(str);
 
     if (fmt) {
@@ -2046,7 +2263,7 @@ BigDecimal_split(VALUE self)
     rb_ary_push(obj, str);
     rb_str_resize(str, strlen(psz1));
     rb_ary_push(obj, INT2FIX(10));
-    rb_ary_push(obj, INT2NUM(e));
+    rb_ary_push(obj, SSIZET2NUM(e));
     return obj;
 }
 
@@ -2059,41 +2276,29 @@ static VALUE
 BigDecimal_exponent(VALUE self)
 {
     ssize_t e = VpExponent10(GetVpValue(self, 1));
-    return INT2NUM(e);
+    return SSIZET2NUM(e);
 }
 
-/* Returns debugging information about the value as a string of comma-separated
- * values in angle brackets with a leading #:
- *
- *   BigDecimal.new("1234.5678").inspect
- *     #=> "#<BigDecimal:b7ea1130,'0.12345678E4',8(12)>"
+/* Returns a string representation of self.
  *
- * The first part is the address, the second is the value as a string, and
- * the final part ss(mm) is the current number of significant digits and the
- * maximum number of significant digits, respectively.
+ *   BigDecimal("1234.5678").inspect
+ *     #=> "0.12345678e4"
  */
 static VALUE
 BigDecimal_inspect(VALUE self)
 {
     ENTER(5);
     Real *vp;
-    volatile VALUE obj;
+    volatile VALUE str;
     size_t nc;
-    char *psz, *tmp;
 
     GUARD_OBJ(vp, GetVpValue(self, 1));
     nc = VpNumOfChars(vp, "E");
-    nc += (nc + 9) / 10;
-
-    obj = rb_str_new(0, nc+256);
-    psz = RSTRING_PTR(obj);
-    sprintf(psz, "#<BigDecimal:%"PRIxVALUE",'", self);
-    tmp = psz + strlen(psz);
-    VpToString(vp, tmp, 10, 0);
-    tmp += strlen(tmp);
-    sprintf(tmp, "',%"PRIuSIZE"(%"PRIuSIZE")>", VpPrec(vp)*VpBaseFig(), VpMaxPrec(vp)*VpBaseFig());
-    rb_str_resize(obj, strlen(psz));
-    return obj;
+
+    str = rb_str_new(0, nc);
+    VpToString(vp, RSTRING_PTR(str), 0, 0);
+    rb_str_resize(str, strlen(RSTRING_PTR(str)));
+    return str;
 }
 
 static VALUE BigMath_s_exp(VALUE, VALUE, VALUE);
@@ -2239,7 +2444,7 @@ BigDecimal_power(int argc, VALUE*argv, VALUE self)
     n = NIL_P(prec) ? (ssize_t)(x->Prec*VpBaseFig()) : NUM2SSIZET(prec);
 
     if (VpIsNaN(x)) {
-	y = VpCreateRbObject(n, "0#");
+	y = VpCreateRbObject(n, "0");
 	RB_GC_GUARD(y->obj);
 	VpSetNaN(y);
 	return ToValue(y);
@@ -2264,7 +2469,10 @@ BigDecimal_power(int argc, VALUE*argv, VALUE self)
 	    }
 	    goto retry;
 	}
-	exp = GetVpValueWithPrec(vexp, DBL_DIG+1, 1);
+        if (NIL_P(prec)) {
+            n += DBLE_FIG;
+        }
+        exp = GetVpValueWithPrec(vexp, DBLE_FIG, 1);
 	break;
 
       case T_RATIONAL:
@@ -2279,6 +2487,9 @@ BigDecimal_power(int argc, VALUE*argv, VALUE self)
 	    goto retry;
 	}
 	exp = GetVpValueWithPrec(vexp, n, 1);
+        if (NIL_P(prec)) {
+            n += n;
+        }
 	break;
 
       case T_DATA:
@@ -2289,6 +2500,10 @@ BigDecimal_power(int argc, VALUE*argv, VALUE self)
 		vexp = BigDecimal_to_i(vexp);
 		goto retry;
 	    }
+            if (NIL_P(prec)) {
+                GUARD_OBJ(y, GetVpValue(vexp, 1));
+                n += y->Prec*VpBaseFig();
+            }
 	    exp = DATA_PTR(vexp);
 	    break;
 	}
@@ -2303,7 +2518,7 @@ BigDecimal_power(int argc, VALUE*argv, VALUE self)
 	if (is_negative(vexp)) {
 	    y = VpCreateRbObject(n, "#0");
 	    RB_GC_GUARD(y->obj);
-	    if (VpGetSign(x) < 0) {
+	    if (BIGDECIMAL_NEGATIVE_P(x)) {
 		if (is_integer(vexp)) {
 		    if (is_even(vexp)) {
 			/* (-0) ** (-even_integer)  -> Infinity */
@@ -2342,7 +2557,7 @@ BigDecimal_power(int argc, VALUE*argv, VALUE self)
 
     if (VpIsInf(x)) {
 	if (is_negative(vexp)) {
-	    if (VpGetSign(x) < 0) {
+	    if (BIGDECIMAL_NEGATIVE_P(x)) {
 		if (is_integer(vexp)) {
 		    if (is_even(vexp)) {
 			/* (-Infinity) ** (-even_integer) -> +0 */
@@ -2363,8 +2578,8 @@ BigDecimal_power(int argc, VALUE*argv, VALUE self)
 	    }
 	}
 	else {
-	    y = VpCreateRbObject(n, "0#");
-	    if (VpGetSign(x) < 0) {
+	    y = VpCreateRbObject(n, "0");
+	    if (BIGDECIMAL_NEGATIVE_P(x)) {
 		if (is_integer(vexp)) {
 		    if (is_even(vexp)) {
 			VpSetPosInf(y);
@@ -2396,7 +2611,7 @@ BigDecimal_power(int argc, VALUE*argv, VALUE self)
 	}
 	else if (RTEST(rb_funcall(abs_value, '<', 1, INT2FIX(1)))) {
 	    if (is_negative(vexp)) {
-		y = VpCreateRbObject(n, "0#");
+		y = VpCreateRbObject(n, "0");
 		if (is_even(vexp)) {
 		    VpSetInf(y, VpGetSign(x));
 		}
@@ -2405,7 +2620,7 @@ BigDecimal_power(int argc, VALUE*argv, VALUE self)
 		}
 		return ToValue(y);
 	    }
-	    else if (VpGetSign(x) < 0 && is_even(vexp)) {
+	    else if (BIGDECIMAL_NEGATIVE_P(x) && is_even(vexp)) {
 		return ToValue(VpCreateRbObject(n, "-0"));
 	    }
 	    else {
@@ -2414,7 +2629,7 @@ BigDecimal_power(int argc, VALUE*argv, VALUE self)
 	}
 	else {
 	    if (is_positive(vexp)) {
-		y = VpCreateRbObject(n, "0#");
+		y = VpCreateRbObject(n, "0");
 		if (is_even(vexp)) {
 		    VpSetInf(y, VpGetSign(x));
 		}
@@ -2423,7 +2638,7 @@ BigDecimal_power(int argc, VALUE*argv, VALUE self)
 		}
 		return ToValue(y);
 	    }
-	    else if (VpGetSign(x) < 0 && is_even(vexp)) {
+	    else if (BIGDECIMAL_NEGATIVE_P(x) && is_even(vexp)) {
 		return ToValue(VpCreateRbObject(n, "-0"));
 	    }
 	    else {
@@ -2464,95 +2679,97 @@ BigDecimal_power_op(VALUE self, VALUE exp)
     return BigDecimal_power(1, &exp, self);
 }
 
-static VALUE
-BigDecimal_s_allocate(VALUE klass)
-{
-    return VpNewRbClass(0, NULL, klass)->obj;
-}
-
-static Real *BigDecimal_new(int argc, VALUE *argv);
-
-/* call-seq:
- *   new(initial, digits)
- *
- * Create a new BigDecimal object.
- *
- * initial:: The initial value, as an Integer, a Float, a Rational,
- *           a BigDecimal, or a String.
- *
- *           If it is a String, spaces are ignored and unrecognized characters
- *           terminate the value.
- *
- * digits:: The number of significant digits, as a Fixnum. If omitted or 0,
- *          the number of significant digits is determined from the initial
- *          value.
- *
- * The actual number of significant digits used in computation is usually
- * larger than the specified number.
- *
- * ==== Exceptions
- *
- * TypeError:: If the +initial+ type is neither Fixnum, Bignum, Float,
- *             Rational, nor BigDecimal, this exception is raised.
- *
- * TypeError:: If the +digits+ is not a Fixnum, this exception is raised.
- *
- * ArgumentError:: If +initial+ is a Float, and the +digits+ is larger than
- *                 Float::DIG + 1, this exception is raised.
+/* :nodoc:
  *
- * ArgumentError:: If the +initial+ is a Float or Rational, and the +digits+
- *                 value is omitted, this exception is raised.
+ * private method for dup and clone the provided BigDecimal +other+
  */
 static VALUE
-BigDecimal_initialize(int argc, VALUE *argv, VALUE self)
+BigDecimal_initialize_copy(VALUE self, VALUE other)
 {
-    ENTER(1);
     Real *pv = rb_check_typeddata(self, &BigDecimal_data_type);
-    Real *x;
+    Real *x = rb_check_typeddata(other, &BigDecimal_data_type);
 
-    GUARD_OBJ(x, BigDecimal_new(argc, argv));
-    if (ToValue(x)) {
-	pv = VpCopy(pv, x);
-    }
-    else {
-	VpFree(pv);
-	pv = x;
+    if (self != other) {
+	DATA_PTR(self) = VpCopy(pv, x);
     }
-    DATA_PTR(self) = pv;
-    pv->obj = self;
     return self;
 }
 
-/* :nodoc:
- *
- * private method to dup and clone the provided BigDecimal +other+
- */
 static VALUE
-BigDecimal_initialize_copy(VALUE self, VALUE other)
+BigDecimal_clone(VALUE self)
 {
-    Real *pv = rb_check_typeddata(self, &BigDecimal_data_type);
-    Real *x = rb_check_typeddata(other, &BigDecimal_data_type);
+  return self;
+}
 
-    if (self != other) {
-	DATA_PTR(self) = VpCopy(pv, x);
+#ifdef HAVE_RB_OPTS_EXCEPTION_P
+int rb_opts_exception_p(VALUE opts, int default_value);
+#define opts_exception_p(opts) rb_opts_exception_p((opts), 1)
+#else
+static int
+opts_exception_p(VALUE opts)
+{
+    static ID kwds[1];
+    VALUE exception;
+    if (!kwds[0]) {
+        kwds[0] = rb_intern_const("exception");
     }
-    return self;
+    if (!rb_get_kwargs(opts, kwds, 0, 1, &exception)) return 1;
+    switch (exception) {
+      case Qtrue: case Qfalse:
+        break;
+      default:
+        rb_raise(rb_eArgError, "true or false is expected as exception: %+"PRIsVALUE,
+                 exception);
+    }
+    return exception != Qfalse;
 }
+#endif
 
 static Real *
-BigDecimal_new(int argc, VALUE *argv)
+VpNewVarArg(int argc, VALUE *argv)
 {
     size_t mf;
+    VALUE  opts = Qnil;
     VALUE  nFig;
     VALUE  iniValue;
+    double d;
+    int    exc;
 
-    if (rb_scan_args(argc, argv, "11", &iniValue, &nFig) == 1) {
+    argc = rb_scan_args(argc, argv, "11:", &iniValue, &nFig, &opts);
+    exc = opts_exception_p(opts);
+
+    if (argc == 1) {
         mf = 0;
     }
     else {
-        mf = GetPositiveInt(nFig);
+        /* expand GetPrecisionInt for exception suppression */
+        ssize_t n = NUM2INT(nFig);
+        if (n < 0) {
+            if (!exc) {
+                return NULL;
+            }
+            rb_raise(rb_eArgError, "negative precision");
+        }
+        mf = (size_t)n;
+    }
+
+    if (SPECIAL_CONST_P(iniValue)) {
+        switch (iniValue) {
+          case Qnil:
+            if (!exc) return NULL;
+            rb_raise(rb_eTypeError, "can't convert nil into BigDecimal");
+          case Qtrue:
+            if (!exc) return NULL;
+            rb_raise(rb_eTypeError, "can't convert true into BigDecimal");
+          case Qfalse:
+            if (!exc) return NULL;
+            rb_raise(rb_eTypeError, "can't convert false into BigDecimal");
+          default:
+            break;
+        }
     }
 
+  retry:
     switch (TYPE(iniValue)) {
       case T_DATA:
 	if (is_kind_of_BigDecimal(iniValue)) {
@@ -2566,42 +2783,126 @@ BigDecimal_new(int argc, VALUE *argv)
 	return GetVpValue(iniValue, 1);
 
       case T_FLOAT:
-	if (mf > DBL_DIG+1) {
+        d = RFLOAT_VALUE(iniValue);
+        if (!isfinite(d)) {
+            Real *pv = VpCreateRbObject(1, NULL);
+            VpDtoV(pv, d);
+            return pv;
+        }
+	if (mf > DBLE_FIG) {
+            if (!exc) {
+                return NULL;
+            }
 	    rb_raise(rb_eArgError, "precision too large.");
 	}
 	/* fall through */
       case T_RATIONAL:
 	if (NIL_P(nFig)) {
+            if (!exc) {
+                return NULL;
+            }
 	    rb_raise(rb_eArgError,
 		     "can't omit precision for a %"PRIsVALUE".",
 		     RB_OBJ_CLASSNAME(iniValue));
 	}
 	return GetVpValueWithPrec(iniValue, mf, 1);
 
+      case T_COMPLEX:
+        {
+            VALUE im;
+            im = rb_complex_imag(iniValue);
+            if (!is_zero(im)) {
+                rb_raise(rb_eArgError,
+                         "Unable to make a BigDecimal from non-zero imaginary number");
+            }
+            iniValue = rb_complex_real(iniValue);
+            goto retry;
+        }
+
       case T_STRING:
 	/* fall through */
       default:
 	break;
     }
+    /* TODO: support to_d */
+    if (!exc) {
+        iniValue = rb_check_convert_type(iniValue, T_STRING, "String", "to_str");
+        if (NIL_P(iniValue)) return NULL;
+    }
     StringValueCStr(iniValue);
-    return VpAlloc(mf, RSTRING_PTR(iniValue));
+    return VpAlloc(mf, RSTRING_PTR(iniValue), 1, exc);
 }
 
-/* See also BigDecimal.new */
+/* call-seq:
+ *   BigDecimal(initial, digits, exception: true)
+ *
+ * Create a new BigDecimal object.
+ *
+ * initial:: The initial value, as an Integer, a Float, a Rational,
+ *           a BigDecimal, or a String.
+ *
+ *           If it is a String, spaces are ignored and unrecognized characters
+ *           terminate the value.
+ *
+ * digits:: The number of significant digits, as an Integer. If omitted or 0,
+ *          the number of significant digits is determined from the initial
+ *          value.
+ *
+ *          The actual number of significant digits used in computation is
+ *          usually larger than the specified number.
+ *
+ * exception:: Whether an exception should be raised on invalid arguments.
+ *             +true+ by default, if passed +false+, just returns +nil+
+ *             for invalid.
+ *
+ *
+ * ==== Exceptions
+ *
+ * TypeError:: If the +initial+ type is neither Integer, Float,
+ *             Rational, nor BigDecimal, this exception is raised.
+ *
+ * TypeError:: If the +digits+ is not an Integer, this exception is raised.
+ *
+ * ArgumentError:: If +initial+ is a Float, and the +digits+ is larger than
+ *                 Float::DIG + 1, this exception is raised.
+ *
+ * ArgumentError:: If the +initial+ is a Float or Rational, and the +digits+
+ *                 value is omitted, this exception is raised.
+ */
 static VALUE
-BigDecimal_global_new(int argc, VALUE *argv, VALUE self)
+f_BigDecimal(int argc, VALUE *argv, VALUE self)
 {
     ENTER(1);
     Real *pv;
     VALUE obj;
 
+    if (argc > 0 && CLASS_OF(argv[0]) == rb_cBigDecimal) {
+        if (argc == 1 || (argc == 2 && RB_TYPE_P(argv[1], T_HASH))) return argv[0];
+    }
     obj = TypedData_Wrap_Struct(rb_cBigDecimal, &BigDecimal_data_type, 0);
-    GUARD_OBJ(pv, BigDecimal_new(argc, argv));
+    pv = VpNewVarArg(argc, argv);
+    if (pv == NULL) return Qnil;
+    SAVE(pv);
     if (ToValue(pv)) pv = VpCopy(NULL, pv);
     RTYPEDDATA_DATA(obj) = pv;
+    RB_OBJ_FREEZE(obj);
     return pv->obj = obj;
 }
 
+static VALUE
+BigDecimal_s_interpret_loosely(VALUE klass, VALUE str)
+{
+    ENTER(1);
+    char const *c_str;
+    Real *pv;
+
+    c_str = StringValueCStr(str);
+    GUARD_OBJ(pv, VpAlloc(0, c_str, 0, 1));
+    pv->obj = TypedData_Wrap_Struct(klass, &BigDecimal_data_type, pv);
+    RB_OBJ_FREEZE(pv->obj);
+    return pv->obj;
+}
+
  /* call-seq:
   * BigDecimal.limit(digits)
   *
@@ -2618,7 +2919,7 @@ static VALUE
 BigDecimal_limit(int argc, VALUE *argv, VALUE self)
 {
     VALUE  nFig;
-    VALUE  nCur = INT2NUM(VpGetPrecLimit());
+    VALUE  nCur = SIZET2NUM(VpGetPrecLimit());
 
     if (rb_scan_args(argc, argv, "01", &nFig) == 1) {
 	int nf;
@@ -2664,9 +2965,9 @@ BigDecimal_sign(VALUE self)
  *       BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, false)
  *       BigDecimal.mode(BigDecimal::EXCEPTION_NaN, false)
  *
- *       BigDecimal.new(BigDecimal('Infinity'))
- *       BigDecimal.new(BigDecimal('-Infinity'))
- *       BigDecimal(BigDecimal.new('NaN'))
+ *       BigDecimal(BigDecimal('Infinity'))
+ *       BigDecimal(BigDecimal('-Infinity'))
+ *       BigDecimal(BigDecimal('NaN'))
  *     end
  *
  * For use with the BigDecimal::EXCEPTION_*
@@ -2760,13 +3061,13 @@ BigMath_s_exp(VALUE klass, VALUE x, VALUE vprec)
 	rb_raise(rb_eArgError, "Zero or negative precision for exp");
     }
 
-    /* TODO: the following switch statement is almostly the same as one in the
+    /* TODO: the following switch statement is almost same as one in the
      *       BigDecimalCmp function. */
     switch (TYPE(x)) {
       case T_DATA:
 	if (!is_kind_of_BigDecimal(x)) break;
 	vx = DATA_PTR(x);
-	negative = VpGetSign(vx) < 0;
+	negative = BIGDECIMAL_NEGATIVE_P(vx);
 	infinite = VpIsPosInf(vx) || VpIsNegInf(vx);
 	nan = VpIsNaN(vx);
 	break;
@@ -2783,7 +3084,7 @@ BigMath_s_exp(VALUE klass, VALUE x, VALUE vprec)
 	infinite = isinf(flo);
 	nan = isnan(flo);
 	if (!infinite && !nan) {
-	    vx = GetVpValueWithPrec(x, DBL_DIG+1, 0);
+	    vx = GetVpValueWithPrec(x, DBLE_FIG, 0);
 	}
 	break;
 
@@ -2819,8 +3120,12 @@ BigMath_s_exp(VALUE klass, VALUE x, VALUE vprec)
     x = vx->obj;
 
     n = prec + rmpd_double_figures();
-    negative = VpGetSign(vx) < 0;
+    negative = BIGDECIMAL_NEGATIVE_P(vx);
     if (negative) {
+        VALUE x_zero = INT2NUM(1);
+        VALUE x_copy = f_BigDecimal(1, &x_zero, klass);
+        x = BigDecimal_initialize_copy(x_copy, x);
+        vx = DATA_PTR(x);
 	VpSetSign(vx, 1);
     }
 
@@ -2898,14 +3203,14 @@ BigMath_s_log(VALUE klass, VALUE x, VALUE vprec)
 	rb_raise(rb_eArgError, "Zero or negative precision for exp");
     }
 
-    /* TODO: the following switch statement is almostly the same as one in the
+    /* TODO: the following switch statement is almost same as one in the
      *       BigDecimalCmp function. */
     switch (TYPE(x)) {
       case T_DATA:
 	  if (!is_kind_of_BigDecimal(x)) break;
 	  vx = DATA_PTR(x);
 	  zero = VpIsZero(vx);
-	  negative = VpGetSign(vx) < 0;
+	  negative = BIGDECIMAL_NEGATIVE_P(vx);
 	  infinite = VpIsPosInf(vx) || VpIsNegInf(vx);
 	  nan = VpIsNaN(vx);
 	  break;
@@ -2932,7 +3237,7 @@ get_vp_value:
 	infinite = isinf(flo);
 	nan = isnan(flo);
 	if (!zero && !negative && !infinite && !nan) {
-	    vx = GetVpValueWithPrec(x, DBL_DIG+1, 1);
+	    vx = GetVpValueWithPrec(x, DBLE_FIG, 1);
 	}
 	break;
 
@@ -3053,15 +3358,15 @@ get_vp_value:
  *
  *   require 'bigdecimal'
  *
- *   sum = BigDecimal.new("0")
+ *   sum = BigDecimal("0")
  *   10_000.times do
- *     sum = sum + BigDecimal.new("0.0001")
+ *     sum = sum + BigDecimal("0.0001")
  *   end
  *   print sum #=> 0.1E1
  *
  * Similarly:
  *
- *	(BigDecimal.new("1.2") - BigDecimal("1.0")) == BigDecimal("0.2") #=> true
+ *	(BigDecimal("1.2") - BigDecimal("1.0")) == BigDecimal("0.2") #=> true
  *
  *	(1.2 - 1.0) == 0.2 #=> false
  *
@@ -3075,8 +3380,8 @@ get_vp_value:
  * BigDecimal sometimes needs to return infinity, for example if you divide
  * a value by zero.
  *
- *	BigDecimal.new("1.0") / BigDecimal.new("0.0")  #=> Infinity
- *	BigDecimal.new("-1.0") / BigDecimal.new("0.0")  #=> -Infinity
+ *	BigDecimal("1.0") / BigDecimal("0.0")  #=> Infinity
+ *	BigDecimal("-1.0") / BigDecimal("0.0")  #=> -Infinity
  *
  * You can represent infinite numbers to BigDecimal using the strings
  * <code>'Infinity'</code>, <code>'+Infinity'</code> and
@@ -3089,13 +3394,13 @@ get_vp_value:
  *
  * Example:
  *
- *	BigDecimal.new("0.0") / BigDecimal.new("0.0") #=> NaN
+ *	BigDecimal("0.0") / BigDecimal("0.0") #=> NaN
  *
  * You can also create undefined values.
  *
  * NaN is never considered to be the same as any other value, even NaN itself:
  *
- *	n = BigDecimal.new('NaN')
+ *	n = BigDecimal('NaN')
  *	n == 0.0 #=> false
  *	n == n #=> false
  *
@@ -3108,11 +3413,11 @@ get_vp_value:
  * If the value which is too small to be represented is negative, a BigDecimal
  * value of negative zero is returned.
  *
- *	BigDecimal.new("1.0") / BigDecimal.new("-Infinity") #=> -0.0
+ *	BigDecimal("1.0") / BigDecimal("-Infinity") #=> -0.0
  *
  * If the value is positive, a value of positive zero is returned.
  *
- *	BigDecimal.new("1.0") / BigDecimal.new("Infinity") #=> 0.0
+ *	BigDecimal("1.0") / BigDecimal("Infinity") #=> 0.0
  *
  * (See BigDecimal.mode for how to specify limits of precision.)
  *
@@ -3122,13 +3427,25 @@ get_vp_value:
  * Note also that in mathematics, there is no particular concept of negative
  * or positive zero; true mathematical zero has no sign.
  *
+ * == bigdecimal/util
+ *
+ * When you require +bigdecimal/util+, the #to_d method will be
+ * available on BigDecimal and the native Integer, Float, Rational,
+ * and String classes:
+ *
+ *	require 'bigdecimal/util'
+ *
+ *      42.to_d         # => 0.42e2
+ *      0.5.to_d        # => 0.5e0
+ *      (2/3r).to_d(3)  # => 0.667e0
+ *      "0.5".to_d      # => 0.5e0
+ *
  * == License
  *
  * Copyright (C) 2002 by Shigeo Kobayashi <shigeo@tinyforest.gr.jp>.
  *
- * You may distribute under the terms of either the GNU General Public
- * License or the Artistic License, as specified in the README file
- * of the BigDecimal distribution.
+ * BigDecimal is released under the Ruby and 2-clause BSD licenses.
+ * See LICENSE.txt for details.
  *
  * Maintained by mrkn <mrkn@mrkn.jp> and ruby-core members.
  *
@@ -3138,6 +3455,9 @@ get_vp_value:
 void
 Init_bigdecimal(void)
 {
+#ifdef HAVE_RB_EXT_RACTOR_SAFE
+    rb_ext_ractor_safe(true);
+#endif
     VALUE arg;
 
     id_BigDecimal_exception_mode = rb_intern_const("BigDecimal.exception_mode");
@@ -3149,17 +3469,18 @@ Init_bigdecimal(void)
 
     /* Class and method registration */
     rb_cBigDecimal = rb_define_class("BigDecimal", rb_cNumeric);
-    rb_define_alloc_func(rb_cBigDecimal, BigDecimal_s_allocate);
 
     /* Global function */
-    rb_define_global_function("BigDecimal", BigDecimal_global_new, -1);
+    rb_define_global_function("BigDecimal", f_BigDecimal, -1);
 
     /* Class methods */
+    rb_undef_alloc_func(rb_cBigDecimal);
+    rb_undef_method(CLASS_OF(rb_cBigDecimal), "new");
+    rb_define_singleton_method(rb_cBigDecimal, "interpret_loosely", BigDecimal_s_interpret_loosely, 1);
     rb_define_singleton_method(rb_cBigDecimal, "mode", BigDecimal_mode, -1);
     rb_define_singleton_method(rb_cBigDecimal, "limit", BigDecimal_limit, -1);
     rb_define_singleton_method(rb_cBigDecimal, "double_fig", BigDecimal_double_fig, 0);
     rb_define_singleton_method(rb_cBigDecimal, "_load", BigDecimal_load, 1);
-    rb_define_singleton_method(rb_cBigDecimal, "ver", BigDecimal_version, 0);
 
     rb_define_singleton_method(rb_cBigDecimal, "save_exception_mode", BigDecimal_save_exception_mode, 0);
     rb_define_singleton_method(rb_cBigDecimal, "save_rounding_mode", BigDecimal_save_rounding_mode, 0);
@@ -3167,6 +3488,14 @@ Init_bigdecimal(void)
 
     /* Constants definition */
 
+#ifndef RUBY_BIGDECIMAL_VERSION
+# error RUBY_BIGDECIMAL_VERSION is not defined
+#endif
+    /*
+     * The version of bigdecimal library
+     */
+    rb_define_const(rb_cBigDecimal, "VERSION", rb_str_new2(RUBY_BIGDECIMAL_VERSION));
+
     /*
      * Base value used in internal calculations.  On a 32 bit system, BASE
      * is 10000, indicating that calculation is done in groups of 4 digits.
@@ -3209,7 +3538,7 @@ Init_bigdecimal(void)
     rb_define_const(rb_cBigDecimal, "EXCEPTION_OVERFLOW", INT2FIX(VP_EXCEPTION_OVERFLOW));
 
     /*
-     * 0x01: Determines what happens when a division by zero is performed.
+     * 0x10: Determines what happens when a division by zero is performed.
      * See BigDecimal.mode.
      */
     rb_define_const(rb_cBigDecimal, "EXCEPTION_ZERODIVIDE", INT2FIX(VP_EXCEPTION_ZERODIVIDE));
@@ -3271,16 +3600,16 @@ Init_bigdecimal(void)
 
     arg = rb_str_new2("+Infinity");
     /* Positive infinity value. */
-    rb_define_const(rb_cBigDecimal, "INFINITY", BigDecimal_global_new(1, &arg, rb_cBigDecimal));
+    rb_define_const(rb_cBigDecimal, "INFINITY", f_BigDecimal(1, &arg, rb_cBigDecimal));
     arg = rb_str_new2("NaN");
     /* 'Not a Number' value. */
-    rb_define_const(rb_cBigDecimal, "NAN", BigDecimal_global_new(1, &arg, rb_cBigDecimal));
+    rb_define_const(rb_cBigDecimal, "NAN", f_BigDecimal(1, &arg, rb_cBigDecimal));
 
 
     /* instance methods */
-    rb_define_method(rb_cBigDecimal, "initialize", BigDecimal_initialize, -1);
-    rb_define_method(rb_cBigDecimal, "initialize_copy", BigDecimal_initialize_copy, 1);
     rb_define_method(rb_cBigDecimal, "precs", BigDecimal_prec, 0);
+    rb_define_method(rb_cBigDecimal, "precision", BigDecimal_precision, 0);
+    rb_define_method(rb_cBigDecimal, "n_significant_digits", BigDecimal_n_significant_digits, 0);
 
     rb_define_method(rb_cBigDecimal, "add", BigDecimal_add2, 2);
     rb_define_method(rb_cBigDecimal, "sub", BigDecimal_sub2, 2);
@@ -3303,7 +3632,8 @@ Init_bigdecimal(void)
     rb_define_method(rb_cBigDecimal, "modulo", BigDecimal_mod, 1);
     rb_define_method(rb_cBigDecimal, "remainder", BigDecimal_remainder, 1);
     rb_define_method(rb_cBigDecimal, "divmod", BigDecimal_divmod, 1);
-    /* rb_define_method(rb_cBigDecimal, "dup", BigDecimal_dup, 0); */
+    rb_define_method(rb_cBigDecimal, "clone", BigDecimal_clone, 0);
+    rb_define_method(rb_cBigDecimal, "dup", BigDecimal_clone, 0);
     rb_define_method(rb_cBigDecimal, "to_f", BigDecimal_to_f, 0);
     rb_define_method(rb_cBigDecimal, "abs", BigDecimal_abs, 0);
     rb_define_method(rb_cBigDecimal, "sqrt", BigDecimal_sqrt, 1);
@@ -3351,6 +3681,7 @@ Init_bigdecimal(void)
     id_floor = rb_intern_const("floor");
     id_to_r = rb_intern_const("to_r");
     id_eq = rb_intern_const("==");
+    id_half = rb_intern_const("half");
 }
 
 /*
@@ -3378,7 +3709,14 @@ static Real *VpPt5;        /* constant 0.5 */
 #define MemCmp(x,y,z) memcmp(x,y,z)
 #define StrCmp(x,y)   strcmp(x,y)
 
-static int VpIsDefOP(Real *c,Real *a,Real *b,int sw);
+enum op_sw {
+    OP_SW_ADD = 1,  /* + */
+    OP_SW_SUB,      /* - */
+    OP_SW_MULT,     /* * */
+    OP_SW_DIV       /* / */
+};
+
+static int VpIsDefOP(Real *c, Real *a, Real *b, enum op_sw sw);
 static int AddExponent(Real *a, SIGNED_VALUE n);
 static BDIGIT VpAddAbs(Real *a,Real *b,Real *c);
 static BDIGIT VpSubAbs(Real *a,Real *b,Real *c);
@@ -3388,6 +3726,9 @@ static void VpFormatSt(char *psz, size_t fFmt);
 static int VpRdup(Real *m, size_t ind_m);
 
 #ifdef BIGDECIMAL_DEBUG
+# ifdef HAVE_RB_EXT_RACTOR_SAFE
+#  error Need to make rewiting gnAlloc atomic
+# endif
 static int gnAlloc = 0; /* Memory allocation counter */
 #endif /* BIGDECIMAL_DEBUG */
 
@@ -3405,7 +3746,7 @@ VpMemAlloc(size_t mb)
     return p;
 }
 
-    VP_EXPORT void *
+VP_EXPORT void *
 VpMemRealloc(void *ptr, size_t mb)
 {
     void *p = xrealloc(ptr, mb);
@@ -3423,12 +3764,12 @@ VpFree(Real *pv)
 #ifdef BIGDECIMAL_DEBUG
 	gnAlloc--; /* Decrement allocation count */
 	if (gnAlloc == 0) {
-	    printf(" *************** All memories allocated freed ****************");
-	    getchar();
+	    printf(" *************** All memories allocated freed ****************\n");
+	    /*getchar();*/
 	}
 	if (gnAlloc <  0) {
 	    printf(" ??????????? Too many memory free calls(%d) ?????????????\n", gnAlloc);
-	    getchar();
+	    /*getchar();*/
 	}
 #endif /* BIGDECIMAL_DEBUG */
     }
@@ -3568,13 +3909,7 @@ VpSetRoundMode(unsigned short n)
  *    (to let the compiler know they may be changed in outside
  *    (... but not actually..)).
  */
-volatile const double gZero_ABCED9B1_CE73__00400511F31D = 0.0;
 volatile const double gOne_ABCED9B4_CE73__00400511F31D  = 1.0;
-static double
-Zero(void)
-{
-    return gZero_ABCED9B1_CE73__00400511F31D;
-}
 
 static double
 One(void)
@@ -3599,25 +3934,19 @@ One(void)
 VP_EXPORT double
 VpGetDoubleNaN(void) /* Returns the value of NaN */
 {
-    static double fNaN = 0.0;
-    if (fNaN == 0.0) fNaN = Zero()/Zero();
-    return fNaN;
+    return nan("");
 }
 
 VP_EXPORT double
 VpGetDoublePosInf(void) /* Returns the value of +Infinity */
 {
-    static double fInf = 0.0;
-    if (fInf == 0.0) fInf = One()/Zero();
-    return fInf;
+    return HUGE_VAL;
 }
 
 VP_EXPORT double
 VpGetDoubleNegInf(void) /* Returns the value of -Infinity */
 {
-    static double fInf = 0.0;
-    if (fInf == 0.0) fInf = -(One()/Zero());
-    return fInf;
+    return -HUGE_VAL;
 }
 
 VP_EXPORT double
@@ -3665,7 +3994,7 @@ VpException(unsigned short f, const char *str,int always)
 /* Throw exception or returns 0,when resulting c is Inf or NaN */
 /*  sw=1:+ 2:- 3:* 4:/ */
 static int
-VpIsDefOP(Real *c,Real *a,Real *b,int sw)
+VpIsDefOP(Real *c, Real *a, Real *b, enum op_sw sw)
 {
     if (VpIsNaN(a) || VpIsNaN(b)) {
 	/* at least a or b is NaN */
@@ -3676,7 +4005,7 @@ VpIsDefOP(Real *c,Real *a,Real *b,int sw)
     if (VpIsInf(a)) {
 	if (VpIsInf(b)) {
 	    switch(sw) {
-	      case 1: /* + */
+	      case OP_SW_ADD: /* + */
 		if (VpGetSign(a) == VpGetSign(b)) {
 		    VpSetInf(c, VpGetSign(a));
 		    goto Inf;
@@ -3685,7 +4014,7 @@ VpIsDefOP(Real *c,Real *a,Real *b,int sw)
 		    VpSetNaN(c);
 		    goto NaN;
 		}
-	      case 2: /* - */
+	      case OP_SW_SUB: /* - */
 		if (VpGetSign(a) != VpGetSign(b)) {
 		    VpSetInf(c, VpGetSign(a));
 		    goto Inf;
@@ -3694,12 +4023,10 @@ VpIsDefOP(Real *c,Real *a,Real *b,int sw)
 		    VpSetNaN(c);
 		    goto NaN;
 		}
-		break;
-	      case 3: /* * */
+	      case OP_SW_MULT: /* * */
 		VpSetInf(c, VpGetSign(a)*VpGetSign(b));
 		goto Inf;
-		break;
-	      case 4: /* / */
+	      case OP_SW_DIV: /* / */
 		VpSetNaN(c);
 		goto NaN;
 	    }
@@ -3708,18 +4035,18 @@ VpIsDefOP(Real *c,Real *a,Real *b,int sw)
 	}
 	/* Inf op Finite */
 	switch(sw) {
-	  case 1: /* + */
-	  case 2: /* - */
+	  case OP_SW_ADD: /* + */
+	  case OP_SW_SUB: /* - */
 	    VpSetInf(c, VpGetSign(a));
 	    break;
-	  case 3: /* * */
+	  case OP_SW_MULT: /* * */
 	    if (VpIsZero(b)) {
 		VpSetNaN(c);
 		goto NaN;
 	    }
 	    VpSetInf(c, VpGetSign(a)*VpGetSign(b));
 	    break;
-	  case 4: /* / */
+	  case OP_SW_DIV: /* / */
 	    VpSetInf(c, VpGetSign(a)*VpGetSign(b));
 	}
 	goto Inf;
@@ -3727,20 +4054,20 @@ VpIsDefOP(Real *c,Real *a,Real *b,int sw)
 
     if (VpIsInf(b)) {
 	switch(sw) {
-	  case 1: /* + */
+	  case OP_SW_ADD: /* + */
 	    VpSetInf(c, VpGetSign(b));
 	    break;
-	  case 2: /* - */
+	  case OP_SW_SUB: /* - */
 	    VpSetInf(c, -VpGetSign(b));
 	    break;
-	  case 3: /* * */
+	  case OP_SW_MULT: /* * */
 	    if (VpIsZero(a)) {
 		VpSetNaN(c);
 		goto NaN;
 	    }
 	    VpSetInf(c, VpGetSign(a)*VpGetSign(b));
 	    break;
-	  case 4: /* / */
+	  case OP_SW_DIV: /* / */
 	    VpSetZero(c, VpGetSign(a)*VpGetSign(b));
 	}
 	goto Inf;
@@ -3748,7 +4075,13 @@ VpIsDefOP(Real *c,Real *a,Real *b,int sw)
     return 1; /* Results OK */
 
 Inf:
-    return VpException(VP_EXCEPTION_INFINITY, "Computation results to 'Infinity'", 0);
+    if (VpIsPosInf(c)) {
+	return VpException(VP_EXCEPTION_INFINITY, "Computation results to 'Infinity'", 0);
+    }
+    else {
+	return VpException(VP_EXCEPTION_INFINITY, "Computation results to '-Infinity'", 0);
+    }
+
 NaN:
     return VpException(VP_EXCEPTION_NaN, "Computation results to 'NaN'", 0);
 }
@@ -3802,20 +4135,17 @@ VpNumOfChars(Real *vp,const char *pszFmt)
  *   by one BDIGIT word in the computer used.
  *
  * [Returns]
- * 1+DBL_DIG   ... OK
+ *   DBLE_FIG   ... OK
  */
 VP_EXPORT size_t
 VpInit(BDIGIT BaseVal)
 {
     /* Setup +/- Inf  NaN -0 */
-    VpGetDoubleNaN();
-    VpGetDoublePosInf();
-    VpGetDoubleNegInf();
     VpGetDoubleNegZero();
 
     /* Allocates Vp constants. */
-    VpConstOne = VpAlloc(1UL, "1");
-    VpPt5 = VpAlloc(1UL, ".5");
+    VpConstOne = VpAlloc(1UL, "1", 1, 1);
+    VpPt5 = VpAlloc(1UL, ".5", 1, 1);
 
 #ifdef BIGDECIMAL_DEBUG
     gnAlloc = 0;
@@ -3824,11 +4154,11 @@ VpInit(BDIGIT BaseVal)
 #ifdef BIGDECIMAL_DEBUG
     if (gfDebug) {
 	printf("VpInit: BaseVal   = %"PRIuBDIGIT"\n", BaseVal);
-	printf("  BASE   = %"PRIuBDIGIT"\n", BASE);
-	printf("  HALF_BASE = %"PRIuBDIGIT"\n", HALF_BASE);
-	printf("  BASE1  = %"PRIuBDIGIT"\n", BASE1);
-	printf("  BASE_FIG  = %u\n", BASE_FIG);
-	printf("  DBLE_FIG  = %d\n", DBLE_FIG);
+	printf("\tBASE      = %"PRIuBDIGIT"\n", BASE);
+	printf("\tHALF_BASE = %"PRIuBDIGIT"\n", HALF_BASE);
+	printf("\tBASE1     = %"PRIuBDIGIT"\n", BASE1);
+	printf("\tBASE_FIG  = %u\n", BASE_FIG);
+	printf("\tDBLE_FIG  = %d\n", DBLE_FIG);
     }
 #endif /* BIGDECIMAL_DEBUG */
 
@@ -3879,6 +4209,52 @@ overflow:
     return VpException(VP_EXCEPTION_OVERFLOW, "Exponent overflow", 0);
 }
 
+Real *
+rmpd_parse_special_string(const char *str)
+{
+    static const struct {
+        const char *str;
+        size_t len;
+        int sign;
+    } table[] = {
+        { SZ_INF,  sizeof(SZ_INF)  - 1, VP_SIGN_POSITIVE_INFINITE },
+        { SZ_PINF, sizeof(SZ_PINF) - 1, VP_SIGN_POSITIVE_INFINITE },
+        { SZ_NINF, sizeof(SZ_NINF) - 1, VP_SIGN_NEGATIVE_INFINITE },
+        { SZ_NaN,  sizeof(SZ_NaN)  - 1, VP_SIGN_NaN               }
+    };
+    static const size_t table_length = sizeof(table) / sizeof(table[0]);
+    size_t i;
+
+    for (i = 0; i < table_length; ++i) {
+        const char *p;
+        if (strncmp(str, table[i].str, table[i].len) != 0) {
+            continue;
+        }
+
+        p = str + table[i].len;
+        while (*p && ISSPACE(*p)) ++p;
+        if (*p == '\0') {
+            Real *vp = VpAllocReal(1);
+            vp->MaxPrec = 1;
+            switch (table[i].sign) {
+              default:
+                UNREACHABLE; break;
+              case VP_SIGN_POSITIVE_INFINITE:
+                VpSetPosInf(vp);
+                return vp;
+              case VP_SIGN_NEGATIVE_INFINITE:
+                VpSetNegInf(vp);
+                return vp;
+              case VP_SIGN_NaN:
+                VpSetNaN(vp);
+                return vp;
+            }
+        }
+    }
+
+    return NULL;
+}
+
 /*
  * Allocates variable.
  * [Input]
@@ -3893,9 +4269,10 @@ overflow:
  *   NULL be returned if memory allocation is failed,or any error.
  */
 VP_EXPORT Real *
-VpAlloc(size_t mx, const char *szVal)
+VpAlloc(size_t mx, const char *szVal, int strict_p, int exc)
 {
-    size_t i, ni, ipn, ipf, nf, ipe, ne, nalloc;
+    const char *orig_szVal = szVal;
+    size_t i, j, ni, ipf, nf, ipe, ne, dot_seen, exp_seen, nalloc;
     char v, *psz;
     int  sign=1;
     Real *vp = NULL;
@@ -3906,133 +4283,208 @@ VpAlloc(size_t mx, const char *szVal)
     if (mx == 0) ++mx;
 
     if (szVal) {
-	while (ISSPACE(*szVal)) szVal++;
-	if (*szVal != '#') {
-	    if (mf) {
-		mf = (mf + BASE_FIG - 1) / BASE_FIG + 2; /* Needs 1 more for div */
-		if (mx > mf) {
-		    mx = mf;
-		}
-	    }
-	}
-	else {
-	    ++szVal;
-	}
+        /* Skipping leading spaces */
+        while (ISSPACE(*szVal)) szVal++;
+
+        /* Processing the leading one `#` */
+        if (*szVal != '#') {
+            if (mf) {
+                mf = (mf + BASE_FIG - 1) / BASE_FIG + 2; /* Needs 1 more for div */
+                if (mx > mf) {
+                    mx = mf;
+                }
+            }
+        }
+        else {
+            ++szVal;
+        }
     }
     else {
-	/* necessary to be able to store */
-	/* at least mx digits. */
-	/* szVal==NULL ==> allocate zero value. */
-	vp = VpAllocReal(mx);
-	/* xmalloc() alway returns(or throw interruption) */
-	vp->MaxPrec = mx;    /* set max precision */
-	VpSetZero(vp, 1);    /* initialize vp to zero. */
-	return vp;
-    }
-
-    /* Skip all '_' after digit: 2006-6-30 */
-    ni = 0;
+      return_zero:
+        /* necessary to be able to store */
+        /* at least mx digits. */
+        /* szVal==NULL ==> allocate zero value. */
+        vp = VpAllocReal(mx);
+        /* xmalloc() always returns(or throw interruption) */
+        vp->MaxPrec = mx;    /* set max precision */
+        VpSetZero(vp, 1);    /* initialize vp to zero. */
+        return vp;
+    }
+
+    /* Check on Inf & NaN */
+    if ((vp = rmpd_parse_special_string(szVal)) != NULL) {
+        return vp;
+    }
+
+    /* Scanning digits */
+
+    /* A buffer for keeping scanned digits */
     buf = rb_str_tmp_new(strlen(szVal) + 1);
     psz = RSTRING_PTR(buf);
-    i   = 0;
-    ipn = 0;
-    while ((psz[i] = szVal[ipn]) != 0) {
-	if (ISDIGIT(psz[i])) ++ni;
-	if (psz[i] == '_') {
-	    if (ni > 0) {
-		ipn++;
-		continue;
-	    }
-	    psz[i] = 0;
-	    break;
-	}
-	++i;
-	++ipn;
+
+    /* cursor: i for psz, and j for szVal */
+    i = j = 0;
+
+    /* Scanning: sign part */
+    v = psz[i] = szVal[j];
+    if ((v == '-') || (v == '+')) {
+        sign = -(v == '-');
+        ++i;
+        ++j;
     }
-    /* Skip trailing spaces */
-    while (--i > 0) {
-	if (ISSPACE(psz[i])) psz[i] = 0;
-	else break;
+
+    /* Scanning: integer part */
+    ni  = 0; /* number of digits in the integer part */
+    while ((v = psz[i] = szVal[j]) != '\0') {
+        if (!strict_p && ISSPACE(v)) {
+            v = psz[i] = '\0';
+            break;
+        }
+        if (v == '_') {
+            if (ni > 0) {
+                v = szVal[j+1];
+                if (v == '\0' || ISSPACE(v) || ISDIGIT(v)) {
+                    ++j;
+                    continue;
+                }
+                if (!strict_p) {
+                    v = psz[i] = '\0';
+                    break;
+                }
+            }
+            goto invalid_value;
+        }
+        if (!ISDIGIT(v)) {
+            break;
+        }
+        ++ni;
+        ++i;
+        ++j;
+    }
+
+    /* Scanning: fractional part */
+    nf  = 0; /* number of digits in the fractional part */
+    ne  = 0; /* number of digits in the exponential part */
+    ipf = 0; /* index of the beginning of the fractional part */
+    ipe = 0; /* index of the beginning of the exponential part */
+    dot_seen = 0;
+    exp_seen = 0;
+
+    if (v != '\0') {
+        /* Scanning fractional part */
+        if ((psz[i] = szVal[j]) == '.') {
+            dot_seen = 1;
+            ++i;
+            ++j;
+            ipf = i;
+            while ((v = psz[i] = szVal[j]) != '\0') {
+                if (!strict_p && ISSPACE(v)) {
+                    v = psz[i] = '\0';
+                    break;
+                }
+                if (v == '_') {
+                    if (nf > 0 && ISDIGIT(szVal[j+1])) {
+                        ++j;
+                        continue;
+                    }
+                    if (!strict_p) {
+                        v = psz[i] = '\0';
+                        if (nf == 0) {
+                            dot_seen = 0;
+                        }
+                        break;
+                    }
+                    goto invalid_value;
+                }
+                if (!ISDIGIT(v)) break;
+                ++i;
+                ++j;
+                ++nf;
+            }
+        }
+
+        /* Scanning exponential part */
+        if (v != '\0') {
+            switch ((psz[i] = szVal[j])) {
+                case '\0':
+                    break;
+                case 'e': case 'E':
+                case 'd': case 'D':
+                    exp_seen = 1;
+                    ++i;
+                    ++j;
+                    ipe = i;
+                    v = psz[i] = szVal[j];
+                    if ((v == '-') || (v == '+')) {
+                        ++i;
+                        ++j;
+                    }
+                    while ((v = psz[i] = szVal[j]) != '\0') {
+                        if (!strict_p && ISSPACE(v)) {
+                            v = psz[i] = '\0';
+                            break;
+                        }
+                        if (v == '_') {
+                            if (ne > 0 && ISDIGIT(szVal[j+1])) {
+                                ++j;
+                                continue;
+                            }
+                            if (!strict_p) {
+                                v = psz[i] = '\0';
+                                if (ne == 0) {
+                                    exp_seen = 0;
+                                }
+                                break;
+                            }
+                            goto invalid_value;
+                        }
+                        if (!ISDIGIT(v)) break;
+                        ++i;
+                        ++j;
+                        ++ne;
+                    }
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        if (v != '\0') {
+            /* Scanning trailing spaces */
+            while (ISSPACE(szVal[j])) ++j;
+
+            /* Invalid character */
+            if (szVal[j] && strict_p) {
+                goto invalid_value;
+            }
+        }
     }
-    szVal = psz;
 
-    /* Check on Inf & NaN */
-    if (StrCmp(szVal, SZ_PINF) == 0 || StrCmp(szVal, SZ_INF) == 0 ) {
-	vp = VpAllocReal(1);
-	vp->MaxPrec = 1;    /* set max precision */
-	VpSetPosInf(vp);
-	return vp;
-    }
-    if (StrCmp(szVal, SZ_NINF) == 0) {
-	vp = VpAllocReal(1);
-	vp->MaxPrec = 1;    /* set max precision */
-	VpSetNegInf(vp);
-	return vp;
-    }
-    if (StrCmp(szVal, SZ_NaN) == 0) {
-	vp = VpAllocReal(1);
-	vp->MaxPrec = 1;    /* set max precision */
-	VpSetNaN(vp);
-	return vp;
-    }
-
-    /* check on number szVal[] */
-    ipn = i = 0;
-    if      (szVal[i] == '-') { sign=-1; ++i; }
-    else if (szVal[i] == '+')            ++i;
-    /* Skip digits */
-    ni = 0;            /* digits in mantissa */
-    while ((v = szVal[i]) != 0) {
-	if (!ISDIGIT(v)) break;
-	++i;
-	++ni;
-    }
-    nf  = 0;
-    ipf = 0;
-    ipe = 0;
-    ne  = 0;
-    if (v) {
-	/* other than digit nor \0 */
-	if (szVal[i] == '.') {    /* xxx. */
-	    ++i;
-	    ipf = i;
-	    while ((v = szVal[i]) != 0) {    /* get fraction part. */
-		if (!ISDIGIT(v)) break;
-		++i;
-		++nf;
-	    }
-	}
-	ipe = 0;        /* Exponent */
+    psz[i] = '\0';
 
-	switch (szVal[i]) {
-	  case '\0':
-	    break;
-	  case 'e': case 'E':
-	  case 'd': case 'D':
-	    ++i;
-	    ipe = i;
-	    v = szVal[i];
-	    if ((v == '-') || (v == '+')) ++i;
-	    while ((v=szVal[i]) != 0) {
-		if (!ISDIGIT(v)) break;
-		++i;
-		++ne;
-	    }
-	    break;
-	  default:
-	    break;
-	}
+    if (strict_p && (((ni == 0 || dot_seen) && nf == 0) || (exp_seen && ne == 0))) {
+        VALUE str;
+      invalid_value:
+        if (!strict_p) {
+            goto return_zero;
+        }
+        if (!exc) {
+            return NULL;
+        }
+        str = rb_str_new2(orig_szVal);
+        rb_raise(rb_eArgError, "invalid value for BigDecimal(): \"%"PRIsVALUE"\"", str);
     }
+
     nalloc = (ni + nf + BASE_FIG - 1) / BASE_FIG + 1;    /* set effective allocation  */
     /* units for szVal[]  */
     if (mx == 0) mx = 1;
     nalloc = Max(nalloc, mx);
     mx = nalloc;
     vp = VpAllocReal(mx);
-    /* xmalloc() alway returns(or throw interruption) */
+    /* xmalloc() always returns(or throw interruption) */
     vp->MaxPrec = mx;        /* set max precision */
     VpSetZero(vp, sign);
-    VpCtoV(vp, &szVal[ipn], ni, &szVal[ipf], nf, &szVal[ipe], ne);
+    VpCtoV(vp, psz, ni, psz + ipf, nf, psz + ipe, ne);
     rb_str_resize(buf, 0);
     return vp;
 }
@@ -4090,7 +4542,7 @@ VpAsgn(Real *c, Real *a, int isw)
 
 /*
  *   c = a + b  when operation =  1 or 2
- *  = a - b  when operation = -1 or -2.
+ *   c = a - b  when operation = -1 or -2.
  *   Returns number of significant digits of c
  */
 VP_EXPORT size_t
@@ -4109,7 +4561,7 @@ VpAddSub(Real *c, Real *a, Real *b, int operation)
     }
 #endif /* BIGDECIMAL_DEBUG */
 
-    if (!VpIsDefOP(c, a, b, (operation > 0) ? 1 : 2)) return 0; /* No significant digits */
+    if (!VpIsDefOP(c, a, b, (operation > 0) ? OP_SW_ADD : OP_SW_SUB)) return 0; /* No significant digits */
 
     /* check if a or b is zero  */
     if (VpIsZero(a)) {
@@ -4223,7 +4675,7 @@ end_if:
 }
 
 /*
- * Addition of two variable precisional variables
+ * Addition of two values with variable precision
  * a and b assuming abs(a)>abs(b).
  *   c = abs(a) + abs(b) ; where |a|>=|b|
  */
@@ -4565,7 +5017,7 @@ VpMult(Real *c, Real *a, Real *b)
     }
 #endif /* BIGDECIMAL_DEBUG */
 
-    if (!VpIsDefOP(c, a, b, 3)) return 0; /* No significant digit */
+    if (!VpIsDefOP(c, a, b, OP_SW_MULT)) return 0; /* No significant digit */
 
     if (VpIsZero(a) || VpIsZero(b)) {
 	/* at least a or b is zero */
@@ -4595,7 +5047,7 @@ VpMult(Real *c, Real *a, Real *b)
 
     if (MxIndC < MxIndAB) {    /* The Max. prec. of c < Prec(a)+Prec(b) */
 	w = c;
-	c = VpAlloc((size_t)((MxIndAB + 1) * BASE_FIG), "#0");
+	c = VpAlloc((size_t)((MxIndAB + 1) * BASE_FIG), "#0", 1, 1);
 	MxIndC = MxIndAB;
     }
 
@@ -4677,7 +5129,7 @@ Exit:
 /*
  *   c = a / b,  remainder = r
  */
-    VP_EXPORT size_t
+VP_EXPORT size_t
 VpDivd(Real *c, Real *r, Real *a, Real *b)
 {
     size_t word_a, word_b, word_c, word_r;
@@ -4695,14 +5147,14 @@ VpDivd(Real *c, Real *r, Real *a, Real *b)
 #endif /*BIGDECIMAL_DEBUG */
 
     VpSetNaN(r);
-    if (!VpIsDefOP(c, a, b, 4)) goto Exit;
+    if (!VpIsDefOP(c, a, b, OP_SW_DIV)) goto Exit;
     if (VpIsZero(a) && VpIsZero(b)) {
 	VpSetNaN(c);
-	return VpException(VP_EXCEPTION_NaN, "(VpDivd) 0/0 not defined(NaN)", 0);
+	return VpException(VP_EXCEPTION_NaN, "Computation results to 'NaN'", 0);
     }
     if (VpIsZero(b)) {
 	VpSetInf(c, VpGetSign(a) * VpGetSign(b));
-	return VpException(VP_EXCEPTION_ZERODIVIDE, "(VpDivd) Divide by zero", 0);
+	return VpException(VP_EXCEPTION_ZERODIVIDE, "Divide by zero", 0);
     }
     if (VpIsZero(a)) {
 	/* numerator a is zero  */
@@ -4982,7 +5434,7 @@ VpComp(Real *a, Real *b)
 	goto Exit;
     }
 
-    /* a and b have same exponent, then compare significand. */
+    /* a and b have same exponent, then compare their significand. */
     mx = (a->Prec < b->Prec) ? a->Prec : b->Prec;
     ind = 0;
     while (ind < mx) {
@@ -5023,7 +5475,7 @@ Exit:
  *      %  ... VP variable. To print '%', use '%%'.
  *      \n ... new line
  *      \b ... backspace
- *           ... tab
+ *      \t ... tab
  *     Note: % must not appear more than once
  *    a  ... VP variable to be printed
  */
@@ -5034,24 +5486,6 @@ VPrint(FILE *fp, const char *cntl_chr, Real *a)
     size_t i, j, nc, nd, ZeroSup, sep = 10;
     BDIGIT m, e, nn;
 
-    /* Check if NaN & Inf. */
-    if (VpIsNaN(a)) {
-	fprintf(fp, SZ_NaN);
-	return 8;
-    }
-    if (VpIsPosInf(a)) {
-	fprintf(fp, SZ_INF);
-	return 8;
-    }
-    if (VpIsNegInf(a)) {
-	fprintf(fp, SZ_NINF);
-	return 9;
-    }
-    if (VpIsZero(a)) {
-	fprintf(fp, "0.0");
-	return 3;
-    }
-
     j = 0;
     nd = nc = 0;        /*  nd : number of digits in fraction part(every 10 digits, */
     /*    nd<=10). */
@@ -5060,8 +5494,20 @@ VPrint(FILE *fp, const char *cntl_chr, Real *a)
     while (*(cntl_chr + j)) {
 	if (*(cntl_chr + j) == '%' && *(cntl_chr + j + 1) != '%') {
 	    nc = 0;
-	    if (!VpIsZero(a)) {
-		if (VpGetSign(a) < 0) {
+	    if (VpIsNaN(a)) {
+		fprintf(fp, SZ_NaN);
+		nc += 8;
+	    }
+	    else if (VpIsPosInf(a)) {
+		fprintf(fp, SZ_INF);
+		nc += 8;
+	    }
+	    else if (VpIsNegInf(a)) {
+		fprintf(fp, SZ_NINF);
+		nc += 9;
+	    }
+	    else if (!VpIsZero(a)) {
+		if (BIGDECIMAL_NEGATIVE_P(a)) {
 		    fprintf(fp, "-");
 		    ++nc;
 		}
@@ -5150,7 +5596,7 @@ VpFormatSt(char *psz, size_t fFmt)
 	if (!ch) break;
 	if (ISSPACE(ch) || ch=='-' || ch=='+') continue;
 	if (ch == '.') { nf = 0; continue; }
-	if (ch == 'E') break;
+	if (ch == 'E' || ch == 'e') break;
 
 	if (++nf > fFmt) {
 	    memmove(psz + i + 1, psz + i, ie - i + 1);
@@ -5199,7 +5645,7 @@ VpSzMantissa(Real *a,char *psz)
 
     ZeroSup = 1;        /* Flag not to print the leading zeros as 0.00xxxxEnn */
     if (!VpIsZero(a)) {
-	if (VpGetSign(a) < 0) *psz++ = '-';
+	if (BIGDECIMAL_NEGATIVE_P(a)) *psz++ = '-';
 	n = a->Prec;
 	for (i = 0; i < n; ++i) {
 	    m = BASE1;
@@ -5227,7 +5673,7 @@ VpSzMantissa(Real *a,char *psz)
 
 VP_EXPORT int
 VpToSpecialString(Real *a,char *psz,int fPlus)
-    /* fPlus =0:default, =1: set ' ' before digits , =2: set '+' before digits. */
+/* fPlus = 0: default, 1: set ' ' before digits, 2: set '+' before digits. */
 {
     if (VpIsNaN(a)) {
 	sprintf(psz,SZ_NaN);
@@ -5262,7 +5708,7 @@ VpToSpecialString(Real *a,char *psz,int fPlus)
 
 VP_EXPORT void
 VpToString(Real *a, char *psz, size_t fFmt, int fPlus)
-/* fPlus =0:default, =1: set ' ' before digits , =2:set '+' before digits. */
+/* fPlus = 0: default, 1: set ' ' before digits, 2: set '+' before digits. */
 {
     size_t i, n, ZeroSup;
     BDIGIT shift, m, e, nn;
@@ -5273,7 +5719,7 @@ VpToString(Real *a, char *psz, size_t fFmt, int fPlus)
 
     ZeroSup = 1;    /* Flag not to print the leading zeros as 0.00xxxxEnn */
 
-    if (VpGetSign(a) < 0) *psz++ = '-';
+    if (BIGDECIMAL_NEGATIVE_P(a)) *psz++ = '-';
     else if (fPlus == 1)  *psz++ = ' ';
     else if (fPlus == 2)  *psz++ = '+';
 
@@ -5304,13 +5750,13 @@ VpToString(Real *a, char *psz, size_t fFmt, int fPlus)
     while (psz[-1] == '0') {
 	*(--psz) = 0;
     }
-    sprintf(psz, "E%"PRIdSIZE, ex);
+    sprintf(psz, "e%"PRIdSIZE, ex);
     if (fFmt) VpFormatSt(pszSav, fFmt);
 }
 
 VP_EXPORT void
 VpToFString(Real *a, char *psz, size_t fFmt, int fPlus)
-/* fPlus =0:default,=1: set ' ' before digits ,set '+' before digits. */
+/* fPlus = 0: default, 1: set ' ' before digits, 2: set '+' before digits. */
 {
     size_t i, n;
     BDIGIT m, e, nn;
@@ -5319,7 +5765,7 @@ VpToFString(Real *a, char *psz, size_t fFmt, int fPlus)
 
     if (VpToSpecialString(a, psz, fPlus)) return;
 
-    if (VpGetSign(a) < 0) *psz++ = '-';
+    if (BIGDECIMAL_NEGATIVE_P(a)) *psz++ = '-';
     else if (fPlus == 1)  *psz++ = ' ';
     else if (fPlus == 2)  *psz++ = '+';
 
@@ -5741,21 +6187,22 @@ VpSqrt(Real *y, Real *x)
     ssize_t nr;
     double val;
 
-    /* Zero, NaN or Infinity ? */
-    if (!VpHasVal(x)) {
-	if (VpIsZero(x) || VpGetSign(x) > 0) {
-	    VpAsgn(y,x,1);
-	    goto Exit;
-	}
-	VpSetNaN(y);
-	return VpException(VP_EXCEPTION_OP, "(VpSqrt) SQRT(NaN or negative value)", 0);
+    /* Zero or +Infinity ? */
+    if (VpIsZero(x) || VpIsPosInf(x)) {
+	VpAsgn(y,x,1);
 	goto Exit;
     }
 
     /* Negative ? */
-    if (VpGetSign(x) < 0) {
+    if (BIGDECIMAL_NEGATIVE_P(x)) {
+	VpSetNaN(y);
+	return VpException(VP_EXCEPTION_OP, "sqrt of negative value", 0);
+    }
+
+    /* NaN ? */
+    if (VpIsNaN(x)) {
 	VpSetNaN(y);
-	return VpException(VP_EXCEPTION_OP, "(VpSqrt) SQRT(negative value)", 0);
+	return VpException(VP_EXCEPTION_OP, "sqrt of 'NaN'(Not a Number)", 0);
     }
 
     /* One ? */
@@ -5768,8 +6215,8 @@ VpSqrt(Real *y, Real *x)
     if (x->MaxPrec > (size_t)n) n = (ssize_t)x->MaxPrec;
 
     /* allocate temporally variables  */
-    f = VpAlloc(y->MaxPrec * (BASE_FIG + 2), "#1");
-    r = VpAlloc((n + n) * (BASE_FIG + 2), "#1");
+    f = VpAlloc(y->MaxPrec * (BASE_FIG + 2), "#1", 1, 1);
+    r = VpAlloc((n + n) * (BASE_FIG + 2), "#1", 1, 1);
 
     nr = 0;
     y_prec = y->MaxPrec;
@@ -5834,17 +6281,12 @@ Exit:
 }
 
 /*
- *
- * nf: digit position for operation.
- *
- */
-VP_EXPORT int
-VpMidRound(Real *y, unsigned short f, ssize_t nf)
-/*
  * Round relatively from the decimal point.
  *    f: rounding mode
  *   nf: digit location to round from the decimal point.
  */
+VP_EXPORT int
+VpMidRound(Real *y, unsigned short f, ssize_t nf)
 {
     /* fracf: any positive digit under rounding position? */
     /* fracf_1further: any positive digits under one further than the rounding position? */
@@ -5946,10 +6388,10 @@ VpMidRound(Real *y, unsigned short f, ssize_t nf)
 	if (v > 5 || (v == 5 && fracf_1further)) ++div;
 	break;
       case VP_ROUND_CEIL:
-	if (fracf && (VpGetSign(y) > 0)) ++div;
+	if (fracf && BIGDECIMAL_POSITIVE_P(y)) ++div;
 	break;
       case VP_ROUND_FLOOR:
-	if (fracf && (VpGetSign(y) < 0)) ++div;
+	if (fracf && BIGDECIMAL_NEGATIVE_P(y)) ++div;
 	break;
       case VP_ROUND_HALF_EVEN: /* Banker's rounding */
 	if (v > 5) ++div;
@@ -6068,10 +6510,10 @@ VpInternalRound(Real *c, size_t ixDigit, BDIGIT vPrev, BDIGIT v)
 	if (v >= 6) f = 1;
 	break;
       case VP_ROUND_CEIL:
-	if (v && (VpGetSign(c) > 0)) f = 1;
+	if (v && BIGDECIMAL_POSITIVE_P(c)) f = 1;
 	break;
       case VP_ROUND_FLOOR:
-	if (v && (VpGetSign(c) < 0)) f = 1;
+	if (v && BIGDECIMAL_NEGATIVE_P(c)) f = 1;
 	break;
       case VP_ROUND_HALF_EVEN:  /* Banker's rounding */
 	/* as per VP_ROUND_HALF_DOWN, because this is the last digit of precision,
@@ -6208,7 +6650,7 @@ VpPower(Real *y, Real *x, SIGNED_VALUE n)
     if (x->exponent == 1 && x->Prec == 1 && x->frac[0] == 1) {
 	/* abs(x) = 1 */
 	VpSetOne(y);
-	if (VpGetSign(x) > 0) goto Exit;
+	if (BIGDECIMAL_POSITIVE_P(x)) goto Exit;
 	if ((n % 2) == 0) goto Exit;
 	VpSetSign(y, -1);
 	goto Exit;
@@ -6226,8 +6668,8 @@ VpPower(Real *y, Real *x, SIGNED_VALUE n)
 
     /* Allocate working variables  */
 
-    w1 = VpAlloc((y->MaxPrec + 2) * BASE_FIG, "#0");
-    w2 = VpAlloc((w1->MaxPrec * 2 + 1) * BASE_FIG, "#0");
+    w1 = VpAlloc((y->MaxPrec + 2) * BASE_FIG, "#0", 1, 1);
+    w2 = VpAlloc((w1->MaxPrec * 2 + 1) * BASE_FIG, "#0", 1, 1);
     /* calculation start */
 
     VpAsgn(y, x, 1);
diff --git a/ext/bigdecimal/bigdecimal.gemspec b/ext/bigdecimal/bigdecimal.gemspec
index 1666325d45..7e5388d8e0 100644
--- a/ext/bigdecimal/bigdecimal.gemspec
+++ b/ext/bigdecimal/bigdecimal.gemspec
@@ -1,23 +1,25 @@
-# -*- ruby -*-
-_VERSION = "1.2.8"
-date = %w$Date::                           $[1]
+# coding: utf-8
+
+bigdecimal_version = '3.0.0'
 
 Gem::Specification.new do |s|
-  s.name = "bigdecimal"
-  s.version = _VERSION
-  s.date = date
-  s.license = 'ruby'
-  s.summary = "Arbitrary-precision decimal floating-point number library."
-  s.homepage = "http://www.ruby-lang.org"
-  s.email = "mrkn@mrkn.jp"
-  s.description = "This library provides arbitrary-precision decimal floating-point number class."
-  s.authors = ["Kenta Murata", "Zachary Scott", "Shigeo Kobayashi"]
-  s.require_path = %[lib]
-  s.files = %w[
+  s.name          = "bigdecimal"
+  s.version       = bigdecimal_version
+  s.authors       = ["Kenta Murata", "Zachary Scott", "Shigeo Kobayashi"]
+  s.email         = ["mrkn@mrkn.jp"]
+
+  s.summary       = "Arbitrary-precision decimal floating-point number library."
+  s.description   = "This library provides arbitrary-precision decimal floating-point number class."
+  s.homepage      = "https://github.com/ruby/bigdecimal"
+  s.license       = "Ruby"
+
+  s.require_paths = %w[lib]
+  s.extensions    = %w[ext/bigdecimal/extconf.rb]
+  s.files         = %w[
     bigdecimal.gemspec
-    bigdecimal.c
-    bigdecimal.h
-    depend extconf.rb
+    ext/bigdecimal/bigdecimal.c
+    ext/bigdecimal/bigdecimal.h
+    lib/bigdecimal.rb
     lib/bigdecimal/jacobian.rb
     lib/bigdecimal/ludcmp.rb
     lib/bigdecimal/math.rb
@@ -27,5 +29,11 @@ Gem::Specification.new do |s|
     sample/nlsolve.rb
     sample/pi.rb
   ]
-  s.extensions = %w[extconf.rb]
+
+  s.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+
+  s.add_development_dependency "rake", ">= 12.3.3"
+  s.add_development_dependency "rake-compiler", ">= 0.9"
+  s.add_development_dependency "minitest", "< 5.0.0"
+  s.add_development_dependency "pry"
 end
diff --git a/ext/bigdecimal/bigdecimal.h b/ext/bigdecimal/bigdecimal.h
index f85c3e55ad..28f3363b3c 100644
--- a/ext/bigdecimal/bigdecimal.h
+++ b/ext/bigdecimal/bigdecimal.h
@@ -9,6 +9,8 @@
 #ifndef  RUBY_BIG_DECIMAL_H
 #define  RUBY_BIG_DECIMAL_H 1
 
+#define RUBY_NO_OLD_COMPATIBILITY
+
 #include "ruby/ruby.h"
 #include <float.h>
 
@@ -90,6 +92,62 @@ llabs(LONG_LONG const x)
 }
 #endif
 
+#ifndef HAVE_FINITE
+static int
+finite(double)
+{
+    return !isnan(n) && !isinf(n);
+}
+#endif
+
+#ifndef isfinite
+# ifndef HAVE_ISFINITE
+#  define HAVE_ISFINITE 1
+#  define isfinite(x) finite(x)
+# endif
+#endif
+
+#ifndef FIX_CONST_VALUE_PTR
+# if defined(__fcc__) || defined(__fcc_version) || \
+    defined(__FCC__) || defined(__FCC_VERSION)
+/* workaround for old version of Fujitsu C Compiler (fcc) */
+#  define FIX_CONST_VALUE_PTR(x) ((const VALUE *)(x))
+# else
+#  define FIX_CONST_VALUE_PTR(x) (x)
+# endif
+#endif
+
+#ifndef HAVE_RB_ARRAY_CONST_PTR
+static inline const VALUE *
+rb_array_const_ptr(VALUE a)
+{
+    return FIX_CONST_VALUE_PTR((RBASIC(a)->flags & RARRAY_EMBED_FLAG) ?
+	RARRAY(a)->as.ary : RARRAY(a)->as.heap.ptr);
+}
+#endif
+
+#ifndef RARRAY_CONST_PTR
+# define RARRAY_CONST_PTR(a) rb_array_const_ptr(a)
+#endif
+
+#ifndef RARRAY_AREF
+# define RARRAY_AREF(a, i) (RARRAY_CONST_PTR(a)[i])
+#endif
+
+#ifndef HAVE_RB_SYM2STR
+static inline VALUE
+rb_sym2str(VALUE sym)
+{
+    return rb_id2str(SYM2ID(sym));
+}
+#endif
+
+#ifndef ST2FIX
+# undef RB_ST2FIX
+# define RB_ST2FIX(h) LONG2FIX((long)(h))
+# define ST2FIX(h) RB_ST2FIX(h)
+#endif
+
 #ifdef vabs
 # undef vabs
 #endif
@@ -101,6 +159,10 @@ llabs(LONG_LONG const x)
 # define vabs llabs
 #endif
 
+#if !defined(HAVE_RB_CATEGORY_WARN) || !defined(HAVE_CONST_RB_WARN_CATEGORY_DEPRECATED)
+#   define rb_category_warn(category, ...) rb_warn(__VA_ARGS__)
+#endif
+
 extern VALUE rb_cBigDecimal;
 
 #if 0 || SIZEOF_BDIGITS >= 16
@@ -169,7 +231,9 @@ extern VALUE rb_cBigDecimal;
 #define VP_SIGN_POSITIVE_INFINITE  3 /* Positive infinite number */
 #define VP_SIGN_NEGATIVE_INFINITE -3 /* Negative infinite number */
 
-#ifdef __GNUC__
+#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
+#define	FLEXIBLE_ARRAY_SIZE /* */
+#elif defined(__GNUC__) && !defined(__STRICT_ANSI__)
 #define	FLEXIBLE_ARRAY_SIZE 0
 #else
 #define	FLEXIBLE_ARRAY_SIZE 1
@@ -182,11 +246,11 @@ extern VALUE rb_cBigDecimal;
 typedef struct {
     VALUE  obj;     /* Back pointer(VALUE) for Ruby object.     */
     size_t MaxPrec; /* Maximum precision size                   */
-                    /* This is the actual size of pfrac[]       */
+                    /* This is the actual size of frac[]        */
                     /*(frac[0] to frac[MaxPrec] are available). */
     size_t Prec;    /* Current precision size.                  */
-                    /* This indicates how much the.             */
-                    /* the array frac[] is actually used.       */
+                    /* This indicates how much the              */
+                    /* array frac[] is actually used.           */
     SIGNED_VALUE exponent; /* Exponent part.                    */
     short  sign;    /* Attributes of the value.                 */
                     /*
@@ -248,7 +312,7 @@ VP_EXPORT size_t VpInit(BDIGIT BaseVal);
 VP_EXPORT void *VpMemAlloc(size_t mb);
 VP_EXPORT void *VpMemRealloc(void *ptr, size_t mb);
 VP_EXPORT void VpFree(Real *pv);
-VP_EXPORT Real *VpAlloc(size_t mx, const char *szVal);
+VP_EXPORT Real *VpAlloc(size_t mx, const char *szVal, int strict_p, int exc);
 VP_EXPORT size_t VpAsgn(Real *c, Real *a, int isw);
 VP_EXPORT size_t VpAddSub(Real *c,Real *a,Real *b,int operation);
 VP_EXPORT size_t VpMult(Real *c,Real *a,Real *b);
diff --git a/ext/bigdecimal/depend b/ext/bigdecimal/depend
index 3ab229f2b6..d607a71dfe 100644
--- a/ext/bigdecimal/depend
+++ b/ext/bigdecimal/depend
@@ -1,7 +1,159 @@
+extconf.h: $(srcdir)/$(GEMSPEC)
+Makefile: $(BIGDECIMAL_RB)
+
 # AUTOGENERATED DEPENDENCIES START
 bigdecimal.o: $(RUBY_EXTCONF_H)
 bigdecimal.o: $(arch_hdrdir)/ruby/config.h
-bigdecimal.o: $(hdrdir)/ruby/backward.h
+bigdecimal.o: $(hdrdir)/ruby/internal/anyargs.h
+bigdecimal.o: $(hdrdir)/ruby/internal/arithmetic.h
+bigdecimal.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+bigdecimal.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+bigdecimal.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+bigdecimal.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+bigdecimal.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+bigdecimal.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+bigdecimal.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+bigdecimal.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+bigdecimal.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+bigdecimal.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+bigdecimal.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+bigdecimal.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+bigdecimal.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+bigdecimal.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+bigdecimal.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+bigdecimal.o: $(hdrdir)/ruby/internal/assume.h
+bigdecimal.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+bigdecimal.o: $(hdrdir)/ruby/internal/attr/artificial.h
+bigdecimal.o: $(hdrdir)/ruby/internal/attr/cold.h
+bigdecimal.o: $(hdrdir)/ruby/internal/attr/const.h
+bigdecimal.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+bigdecimal.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+bigdecimal.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+bigdecimal.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+bigdecimal.o: $(hdrdir)/ruby/internal/attr/error.h
+bigdecimal.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+bigdecimal.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+bigdecimal.o: $(hdrdir)/ruby/internal/attr/format.h
+bigdecimal.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+bigdecimal.o: $(hdrdir)/ruby/internal/attr/noalias.h
+bigdecimal.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+bigdecimal.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+bigdecimal.o: $(hdrdir)/ruby/internal/attr/noinline.h
+bigdecimal.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+bigdecimal.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+bigdecimal.o: $(hdrdir)/ruby/internal/attr/pure.h
+bigdecimal.o: $(hdrdir)/ruby/internal/attr/restrict.h
+bigdecimal.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+bigdecimal.o: $(hdrdir)/ruby/internal/attr/warning.h
+bigdecimal.o: $(hdrdir)/ruby/internal/attr/weakref.h
+bigdecimal.o: $(hdrdir)/ruby/internal/cast.h
+bigdecimal.o: $(hdrdir)/ruby/internal/compiler_is.h
+bigdecimal.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+bigdecimal.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+bigdecimal.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+bigdecimal.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+bigdecimal.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+bigdecimal.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+bigdecimal.o: $(hdrdir)/ruby/internal/compiler_since.h
+bigdecimal.o: $(hdrdir)/ruby/internal/config.h
+bigdecimal.o: $(hdrdir)/ruby/internal/constant_p.h
+bigdecimal.o: $(hdrdir)/ruby/internal/core.h
+bigdecimal.o: $(hdrdir)/ruby/internal/core/rarray.h
+bigdecimal.o: $(hdrdir)/ruby/internal/core/rbasic.h
+bigdecimal.o: $(hdrdir)/ruby/internal/core/rbignum.h
+bigdecimal.o: $(hdrdir)/ruby/internal/core/rclass.h
+bigdecimal.o: $(hdrdir)/ruby/internal/core/rdata.h
+bigdecimal.o: $(hdrdir)/ruby/internal/core/rfile.h
+bigdecimal.o: $(hdrdir)/ruby/internal/core/rhash.h
+bigdecimal.o: $(hdrdir)/ruby/internal/core/robject.h
+bigdecimal.o: $(hdrdir)/ruby/internal/core/rregexp.h
+bigdecimal.o: $(hdrdir)/ruby/internal/core/rstring.h
+bigdecimal.o: $(hdrdir)/ruby/internal/core/rstruct.h
+bigdecimal.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+bigdecimal.o: $(hdrdir)/ruby/internal/ctype.h
+bigdecimal.o: $(hdrdir)/ruby/internal/dllexport.h
+bigdecimal.o: $(hdrdir)/ruby/internal/dosish.h
+bigdecimal.o: $(hdrdir)/ruby/internal/error.h
+bigdecimal.o: $(hdrdir)/ruby/internal/eval.h
+bigdecimal.o: $(hdrdir)/ruby/internal/event.h
+bigdecimal.o: $(hdrdir)/ruby/internal/fl_type.h
+bigdecimal.o: $(hdrdir)/ruby/internal/gc.h
+bigdecimal.o: $(hdrdir)/ruby/internal/glob.h
+bigdecimal.o: $(hdrdir)/ruby/internal/globals.h
+bigdecimal.o: $(hdrdir)/ruby/internal/has/attribute.h
+bigdecimal.o: $(hdrdir)/ruby/internal/has/builtin.h
+bigdecimal.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+bigdecimal.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+bigdecimal.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+bigdecimal.o: $(hdrdir)/ruby/internal/has/extension.h
+bigdecimal.o: $(hdrdir)/ruby/internal/has/feature.h
+bigdecimal.o: $(hdrdir)/ruby/internal/has/warning.h
+bigdecimal.o: $(hdrdir)/ruby/internal/intern/array.h
+bigdecimal.o: $(hdrdir)/ruby/internal/intern/bignum.h
+bigdecimal.o: $(hdrdir)/ruby/internal/intern/class.h
+bigdecimal.o: $(hdrdir)/ruby/internal/intern/compar.h
+bigdecimal.o: $(hdrdir)/ruby/internal/intern/complex.h
+bigdecimal.o: $(hdrdir)/ruby/internal/intern/cont.h
+bigdecimal.o: $(hdrdir)/ruby/internal/intern/dir.h
+bigdecimal.o: $(hdrdir)/ruby/internal/intern/enum.h
+bigdecimal.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+bigdecimal.o: $(hdrdir)/ruby/internal/intern/error.h
+bigdecimal.o: $(hdrdir)/ruby/internal/intern/eval.h
+bigdecimal.o: $(hdrdir)/ruby/internal/intern/file.h
+bigdecimal.o: $(hdrdir)/ruby/internal/intern/gc.h
+bigdecimal.o: $(hdrdir)/ruby/internal/intern/hash.h
+bigdecimal.o: $(hdrdir)/ruby/internal/intern/io.h
+bigdecimal.o: $(hdrdir)/ruby/internal/intern/load.h
+bigdecimal.o: $(hdrdir)/ruby/internal/intern/marshal.h
+bigdecimal.o: $(hdrdir)/ruby/internal/intern/numeric.h
+bigdecimal.o: $(hdrdir)/ruby/internal/intern/object.h
+bigdecimal.o: $(hdrdir)/ruby/internal/intern/parse.h
+bigdecimal.o: $(hdrdir)/ruby/internal/intern/proc.h
+bigdecimal.o: $(hdrdir)/ruby/internal/intern/process.h
+bigdecimal.o: $(hdrdir)/ruby/internal/intern/random.h
+bigdecimal.o: $(hdrdir)/ruby/internal/intern/range.h
+bigdecimal.o: $(hdrdir)/ruby/internal/intern/rational.h
+bigdecimal.o: $(hdrdir)/ruby/internal/intern/re.h
+bigdecimal.o: $(hdrdir)/ruby/internal/intern/ruby.h
+bigdecimal.o: $(hdrdir)/ruby/internal/intern/select.h
+bigdecimal.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+bigdecimal.o: $(hdrdir)/ruby/internal/intern/signal.h
+bigdecimal.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+bigdecimal.o: $(hdrdir)/ruby/internal/intern/string.h
+bigdecimal.o: $(hdrdir)/ruby/internal/intern/struct.h
+bigdecimal.o: $(hdrdir)/ruby/internal/intern/thread.h
+bigdecimal.o: $(hdrdir)/ruby/internal/intern/time.h
+bigdecimal.o: $(hdrdir)/ruby/internal/intern/variable.h
+bigdecimal.o: $(hdrdir)/ruby/internal/intern/vm.h
+bigdecimal.o: $(hdrdir)/ruby/internal/interpreter.h
+bigdecimal.o: $(hdrdir)/ruby/internal/iterator.h
+bigdecimal.o: $(hdrdir)/ruby/internal/memory.h
+bigdecimal.o: $(hdrdir)/ruby/internal/method.h
+bigdecimal.o: $(hdrdir)/ruby/internal/module.h
+bigdecimal.o: $(hdrdir)/ruby/internal/newobj.h
+bigdecimal.o: $(hdrdir)/ruby/internal/rgengc.h
+bigdecimal.o: $(hdrdir)/ruby/internal/scan_args.h
+bigdecimal.o: $(hdrdir)/ruby/internal/special_consts.h
+bigdecimal.o: $(hdrdir)/ruby/internal/static_assert.h
+bigdecimal.o: $(hdrdir)/ruby/internal/stdalign.h
+bigdecimal.o: $(hdrdir)/ruby/internal/stdbool.h
+bigdecimal.o: $(hdrdir)/ruby/internal/symbol.h
+bigdecimal.o: $(hdrdir)/ruby/internal/token_paste.h
+bigdecimal.o: $(hdrdir)/ruby/internal/value.h
+bigdecimal.o: $(hdrdir)/ruby/internal/value_type.h
+bigdecimal.o: $(hdrdir)/ruby/internal/variable.h
+bigdecimal.o: $(hdrdir)/ruby/internal/warning_push.h
+bigdecimal.o: $(hdrdir)/ruby/internal/xmalloc.h
+bigdecimal.o: $(hdrdir)/ruby/assert.h
+bigdecimal.o: $(hdrdir)/ruby/backward/2/assume.h
+bigdecimal.o: $(hdrdir)/ruby/backward/2/attributes.h
+bigdecimal.o: $(hdrdir)/ruby/backward/2/bool.h
+bigdecimal.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+bigdecimal.o: $(hdrdir)/ruby/backward/2/inttypes.h
+bigdecimal.o: $(hdrdir)/ruby/backward/2/limits.h
+bigdecimal.o: $(hdrdir)/ruby/backward/2/long_long.h
+bigdecimal.o: $(hdrdir)/ruby/backward/2/stdalign.h
+bigdecimal.o: $(hdrdir)/ruby/backward/2/stdarg.h
 bigdecimal.o: $(hdrdir)/ruby/defines.h
 bigdecimal.o: $(hdrdir)/ruby/intern.h
 bigdecimal.o: $(hdrdir)/ruby/missing.h
diff --git a/ext/bigdecimal/extconf.rb b/ext/bigdecimal/extconf.rb
index 3799e685bc..63123e2892 100644
--- a/ext/bigdecimal/extconf.rb
+++ b/ext/bigdecimal/extconf.rb
@@ -1,11 +1,57 @@
 # frozen_string_literal: false
 require 'mkmf'
 
+def check_bigdecimal_version(gemspec_path)
+  message "checking RUBY_BIGDECIMAL_VERSION... "
+
+  bigdecimal_version =
+    IO.readlines(gemspec_path)
+      .grep(/\Abigdecimal_version\s+=\s+/)[0][/\'([^\']+)\'/, 1]
+
+  version_components = bigdecimal_version.split('.')
+  bigdecimal_version = version_components[0, 3].join('.')
+  bigdecimal_version << "-#{version_components[3]}" if version_components[3]
+  $defs << %Q[-DRUBY_BIGDECIMAL_VERSION=\\"#{bigdecimal_version}\\"]
+
+  message "#{bigdecimal_version}\n"
+end
+
+gemspec_name = gemspec_path = nil
+unless ['', '../../'].any? {|dir|
+         gemspec_name = "#{dir}bigdecimal.gemspec"
+         gemspec_path = File.expand_path("../#{gemspec_name}", __FILE__)
+         File.file?(gemspec_path)
+       }
+  $stderr.puts "Unable to find bigdecimal.gemspec"
+  abort
+end
+
+check_bigdecimal_version(gemspec_path)
+
 have_func("labs", "stdlib.h")
 have_func("llabs", "stdlib.h")
+have_func("finite", "math.h")
+have_func("isfinite", "math.h")
 
 have_type("struct RRational", "ruby.h")
 have_func("rb_rational_num", "ruby.h")
 have_func("rb_rational_den", "ruby.h")
+have_type("struct RComplex", "ruby.h")
+have_func("rb_complex_real", "ruby.h")
+have_func("rb_complex_imag", "ruby.h")
+have_func("rb_array_const_ptr", "ruby.h")
+have_func("rb_sym2str", "ruby.h")
+have_func("rb_opts_exception_p", "ruby.h")
+have_func("rb_category_warn", "ruby.h")
+have_const("RB_WARN_CATEGORY_DEPRECATED", "ruby.h")
+
+if File.file?(File.expand_path('../lib/bigdecimal.rb', __FILE__))
+  bigdecimal_rb = "$(srcdir)/lib/bigdecimal.rb"
+else
+  bigdecimal_rb = "$(srcdir)/../../lib/bigdecimal.rb"
+end
 
-create_makefile('bigdecimal')
+create_makefile('bigdecimal') {|mf|
+  mf << "GEMSPEC = #{gemspec_name}\n"
+  mf << "BIGDECIMAL_RB = #{bigdecimal_rb}\n"
+}
diff --git a/ext/bigdecimal/lib/bigdecimal.rb b/ext/bigdecimal/lib/bigdecimal.rb
new file mode 100644
index 0000000000..8fd2587c84
--- /dev/null
+++ b/ext/bigdecimal/lib/bigdecimal.rb
@@ -0,0 +1 @@
+require 'bigdecimal.so'
diff --git a/ext/bigdecimal/lib/bigdecimal/jacobian.rb b/ext/bigdecimal/lib/bigdecimal/jacobian.rb
index 9cad06c09b..5e29304299 100644
--- a/ext/bigdecimal/lib/bigdecimal/jacobian.rb
+++ b/ext/bigdecimal/lib/bigdecimal/jacobian.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: false
-#
+
+require 'bigdecimal'
+
 # require 'bigdecimal/jacobian'
 #
 # Provides methods to compute the Jacobian matrix of a set of equations at a
diff --git a/ext/bigdecimal/lib/bigdecimal/math.rb b/ext/bigdecimal/lib/bigdecimal/math.rb
index 3ddde6a9a0..0b9d0648bb 100644
--- a/ext/bigdecimal/lib/bigdecimal/math.rb
+++ b/ext/bigdecimal/lib/bigdecimal/math.rb
@@ -26,7 +26,7 @@ require 'bigdecimal'
 #   include BigMath
 #
 #   a = BigDecimal((PI(100)/2).to_s)
-#   puts sin(a,100) # => 0.10000000000000000000......E1
+#   puts sin(a,100) # => 0.99999999999999999999......e0
 #
 module BigMath
   module_function
@@ -37,8 +37,8 @@ module BigMath
   # Computes the square root of +decimal+ to the specified number of digits of
   # precision, +numeric+.
   #
-  #   BigMath.sqrt(BigDecimal.new('2'), 16).to_s
-  #   #=> "0.1414213562373095048801688724E1"
+  #   BigMath.sqrt(BigDecimal('2'), 16).to_s
+  #   #=> "0.1414213562373095048801688724e1"
   #
   def sqrt(x, prec)
     x.sqrt(prec)
@@ -53,7 +53,7 @@ module BigMath
   # If +decimal+ is Infinity or NaN, returns NaN.
   #
   #   BigMath.sin(BigMath.PI(5)/4, 5).to_s
-  #   #=> "0.70710678118654752440082036563292800375E0"
+  #   #=> "0.70710678118654752440082036563292800375e0"
   #
   def sin(x, prec)
     raise ArgumentError, "Zero or negative precision for sin" if prec <= 0
@@ -97,7 +97,7 @@ module BigMath
   # If +decimal+ is Infinity or NaN, returns NaN.
   #
   #   BigMath.cos(BigMath.PI(4), 16).to_s
-  #   #=> "-0.999999999999999999999999999999856613163740061349E0"
+  #   #=> "-0.999999999999999999999999999999856613163740061349e0"
   #
   def cos(x, prec)
     raise ArgumentError, "Zero or negative precision for cos" if prec <= 0
@@ -140,8 +140,8 @@ module BigMath
   #
   # If +decimal+ is NaN, returns NaN.
   #
-  #   BigMath.atan(BigDecimal.new('-1'), 16).to_s
-  #   #=> "-0.785398163397448309615660845819878471907514682065E0"
+  #   BigMath.atan(BigDecimal('-1'), 16).to_s
+  #   #=> "-0.785398163397448309615660845819878471907514682065e0"
   #
   def atan(x, prec)
     raise ArgumentError, "Zero or negative precision for atan" if prec <= 0
@@ -178,7 +178,7 @@ module BigMath
   # +numeric+.
   #
   #   BigMath.PI(10).to_s
-  #   #=> "0.3141592653589793238462643388813853786957412E1"
+  #   #=> "0.3141592653589793238462643388813853786957412e1"
   #
   def PI(prec)
     raise ArgumentError, "Zero or negative precision for PI" if prec <= 0
@@ -223,7 +223,7 @@ module BigMath
   # digits of precision, +numeric+.
   #
   #   BigMath.E(10).to_s
-  #   #=> "0.271828182845904523536028752390026306410273E1"
+  #   #=> "0.271828182845904523536028752390026306410273e1"
   #
   def E(prec)
     raise ArgumentError, "Zero or negative precision for E" if prec <= 0
diff --git a/ext/bigdecimal/lib/bigdecimal/util.rb b/ext/bigdecimal/lib/bigdecimal/util.rb
index 0c4e486c00..00a3e967bd 100644
--- a/ext/bigdecimal/lib/bigdecimal/util.rb
+++ b/ext/bigdecimal/lib/bigdecimal/util.rb
@@ -1,72 +1,76 @@
 # frozen_string_literal: false
-# BigDecimal extends the native Integer class to provide the #to_d method.
 #
-# When you require the BigDecimal library in your application, this methodwill
-# be available on Integer objects.
+#--
+# bigdecimal/util extends various native classes to provide the #to_d method,
+# and provides BigDecimal#to_d and BigDecimal#to_digits.
+#++
+
+require 'bigdecimal'
+
 class Integer < Numeric
   # call-seq:
   #     int.to_d  -> bigdecimal
   #
-  # Convert +int+ to a BigDecimal and return it.
+  # Returns the value of +int+ as a BigDecimal.
   #
   #     require 'bigdecimal'
   #     require 'bigdecimal/util'
   #
-  #     42.to_d
-  #     # => #<BigDecimal:1008ef070,'0.42E2',9(36)>
+  #     42.to_d   # => 0.42e2
+  #
+  # See also BigDecimal::new.
   #
   def to_d
     BigDecimal(self)
   end
 end
 
-# BigDecimal extends the native Float class to provide the #to_d method.
-#
-# When you require BigDecimal in your application, this method will be
-# available on Float objects.
+
 class Float < Numeric
   # call-seq:
-  #     flt.to_d  -> bigdecimal
+  #     float.to_d             -> bigdecimal
+  #     float.to_d(precision)  -> bigdecimal
   #
-  # Convert +flt+ to a BigDecimal and return it.
+  # Returns the value of +float+ as a BigDecimal.
+  # The +precision+ parameter is used to determine the number of
+  # significant digits for the result (the default is Float::DIG).
   #
   #     require 'bigdecimal'
   #     require 'bigdecimal/util'
   #
-  #     0.5.to_d
-  #     # => #<BigDecimal:1dc69e0,'0.5E0',9(18)>
+  #     0.5.to_d         # => 0.5e0
+  #     1.234.to_d(2)    # => 0.12e1
+  #
+  # See also BigDecimal::new.
   #
-  def to_d(precision=nil)
-    BigDecimal(self, precision || Float::DIG)
+  def to_d(precision=Float::DIG+1)
+    BigDecimal(self, precision)
   end
 end
 
-# BigDecimal extends the native String class to provide the #to_d method.
-#
-# When you require BigDecimal in your application, this method will be
-# available on String objects.
+
 class String
   # call-seq:
-  #     string.to_d  -> bigdecimal
+  #     str.to_d  -> bigdecimal
   #
-  # Convert +string+ to a BigDecimal and return it.
+  # Returns the result of interpreting leading characters in +str+
+  # as a BigDecimal.
   #
   #     require 'bigdecimal'
   #     require 'bigdecimal/util'
   #
-  #     "0.5".to_d
-  #     # => #<BigDecimal:1dc69e0,'0.5E0',9(18)>
+  #     "0.5".to_d             # => 0.5e0
+  #     "123.45e1".to_d        # => 0.12345e4
+  #     "45.67 degrees".to_d   # => 0.4567e2
+  #
+  # See also BigDecimal::new.
   #
   def to_d
-    BigDecimal(self)
+    BigDecimal.interpret_loosely(self)
   end
 end
 
-# BigDecimal extends the native Numeric class to provide the #to_digits and
-# #to_d methods.
-#
-# When you require BigDecimal in your application, this method will be
-# available on BigDecimal objects.
+
 class BigDecimal < Numeric
   # call-seq:
   #     a.to_digits -> string
@@ -74,12 +78,11 @@ class BigDecimal < Numeric
   # Converts a BigDecimal to a String of the form "nnnnnn.mmm".
   # This method is deprecated; use BigDecimal#to_s("F") instead.
   #
-  #     require 'bigdecimal'
   #     require 'bigdecimal/util'
   #
-  #     d = BigDecimal.new("3.14")
-  #     d.to_digits
-  #     # => "3.14"
+  #     d = BigDecimal("3.14")
+  #     d.to_digits                  # => "3.14"
+  #
   def to_digits
     if self.nan? || self.infinite? || self.zero?
       self.to_s
@@ -94,35 +97,85 @@ class BigDecimal < Numeric
   #     a.to_d -> bigdecimal
   #
   # Returns self.
+  #
+  #     require 'bigdecimal/util'
+  #
+  #     d = BigDecimal("3.14")
+  #     d.to_d                       # => 0.314e1
+  #
   def to_d
     self
   end
 end
 
-# BigDecimal extends the native Rational class to provide the #to_d method.
-#
-# When you require BigDecimal in your application, this method will be
-# available on Rational objects.
+
 class Rational < Numeric
   # call-seq:
-  #   r.to_d(precision)   -> bigdecimal
+  #     rat.to_d(precision)  -> bigdecimal
   #
-  # Converts a Rational to a BigDecimal.
+  # Returns the value as a BigDecimal.
   #
-  # The required +precision+ parameter is used to determine the amount of
-  # significant digits for the result. See BigDecimal#div for more information,
-  # as it is used along with the #denominator and the +precision+ for
-  # parameters.
+  # The required +precision+ parameter is used to determine the number of
+  # significant digits for the result.
+  #
+  #     require 'bigdecimal'
+  #     require 'bigdecimal/util'
+  #
+  #     Rational(22, 7).to_d(3)   # => 0.314e1
+  #
+  # See also BigDecimal::new.
   #
-  #   r = (22/7.0).to_r
-  #   # => (7077085128725065/2251799813685248)
-  #   r.to_d(3)
-  #   # => #<BigDecimal:1a44d08,'0.314E1',18(36)>
   def to_d(precision)
-    if precision <= 0
-      raise ArgumentError, "negative precision"
+    BigDecimal(self, precision)
+  end
+end
+
+
+class Complex < Numeric
+  # call-seq:
+  #     cmp.to_d             -> bigdecimal
+  #     cmp.to_d(precision)  -> bigdecimal
+  #
+  # Returns the value as a BigDecimal.
+  #
+  # The +precision+ parameter is required for a rational complex number.
+  # This parameter is used to determine the number of significant digits
+  # for the result.
+  #
+  #     require 'bigdecimal'
+  #     require 'bigdecimal/util'
+  #
+  #     Complex(0.1234567, 0).to_d(4)   # => 0.1235e0
+  #     Complex(Rational(22, 7), 0).to_d(3)   # => 0.314e1
+  #
+  # See also BigDecimal::new.
+  #
+  def to_d(*args)
+    BigDecimal(self) unless self.imag.zero? # to raise eerror
+
+    if args.length == 0
+      case self.real
+      when Rational
+        BigDecimal(self.real) # to raise error
+      end
     end
-    num = self.numerator
-    BigDecimal(num).div(self.denominator, precision)
+    self.real.to_d(*args)
+  end
+end
+
+
+class NilClass
+  # call-seq:
+  #     nil.to_d -> bigdecimal
+  #
+  # Returns nil represented as a BigDecimal.
+  #
+  #     require 'bigdecimal'
+  #     require 'bigdecimal/util'
+  #
+  #     nil.to_d   # => 0.0
+  #
+  def to_d
+    BigDecimal(0)
   end
 end
diff --git a/ext/bigdecimal/sample/linear.rb b/ext/bigdecimal/sample/linear.rb
index 3b23269f8a..516c2473be 100644
--- a/ext/bigdecimal/sample/linear.rb
+++ b/ext/bigdecimal/sample/linear.rb
@@ -28,8 +28,8 @@ def rd_order(na)
 end
 
 na   = ARGV.size
-zero = BigDecimal.new("0.0")
-one  = BigDecimal.new("1.0")
+zero = BigDecimal("0.0")
+one  = BigDecimal("1.0")
 
 while (n=rd_order(na))>0
   a = []
@@ -37,27 +37,28 @@ while (n=rd_order(na))>0
   b = []
   if na <= 0
      # Read data from console.
-     printf("\nEnter coefficient matrix element A[i,j]\n");
+     printf("\nEnter coefficient matrix element A[i,j]\n")
      for i in 0...n do
        for j in 0...n do
          printf("A[%d,%d]? ",i,j); s = ARGF.gets
-         a  << BigDecimal.new(s);
-         as << BigDecimal.new(s);
+         a  << BigDecimal(s)
+         as << BigDecimal(s)
        end
-       printf("Contatant vector element b[%d] ? ",i); b << BigDecimal.new(ARGF.gets);
+       printf("Contatant vector element b[%d] ? ",i)
+       b << BigDecimal(ARGF.gets)
      end
   else
      # Read data from specified file.
-     printf("Coefficient matrix and constant vector.\n");
+     printf("Coefficient matrix and constant vector.\n")
      for i in 0...n do
        s = ARGF.gets
        printf("%d) %s",i,s)
        s = s.split
        for j in 0...n do
-         a  << BigDecimal.new(s[j]);
-         as << BigDecimal.new(s[j]);
+         a  << BigDecimal(s[j])
+         as << BigDecimal(s[j])
        end
-       b << BigDecimal.new(s[n]);
+       b << BigDecimal(s[n])
      end
   end
   x = lusolve(a,b,ludecomp(a,n,zero,one),zero)
diff --git a/ext/bigdecimal/sample/nlsolve.rb b/ext/bigdecimal/sample/nlsolve.rb
index b1dd08e0a3..c2227dac73 100644
--- a/ext/bigdecimal/sample/nlsolve.rb
+++ b/ext/bigdecimal/sample/nlsolve.rb
@@ -12,11 +12,11 @@ include Newton
 
 class Function # :nodoc: all
   def initialize()
-    @zero = BigDecimal.new("0.0")
-    @one  = BigDecimal.new("1.0")
-    @two  = BigDecimal.new("2.0")
-    @ten  = BigDecimal.new("10.0")
-    @eps  = BigDecimal.new("1.0e-16")
+    @zero = BigDecimal("0.0")
+    @one  = BigDecimal("1.0")
+    @two  = BigDecimal("2.0")
+    @ten  = BigDecimal("10.0")
+    @eps  = BigDecimal("1.0e-16")
   end
   def zero;@zero;end
   def one ;@one ;end
diff --git a/ext/cgi/escape/depend b/ext/cgi/escape/depend
new file mode 100644
index 0000000000..fc3875d151
--- /dev/null
+++ b/ext/cgi/escape/depend
@@ -0,0 +1,166 @@
+# AUTOGENERATED DEPENDENCIES START
+escape.o: $(RUBY_EXTCONF_H)
+escape.o: $(arch_hdrdir)/ruby/config.h
+escape.o: $(hdrdir)/ruby.h
+escape.o: $(hdrdir)/ruby/internal/anyargs.h
+escape.o: $(hdrdir)/ruby/internal/arithmetic.h
+escape.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+escape.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+escape.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+escape.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+escape.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+escape.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+escape.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+escape.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+escape.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+escape.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+escape.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+escape.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+escape.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+escape.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+escape.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+escape.o: $(hdrdir)/ruby/internal/assume.h
+escape.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+escape.o: $(hdrdir)/ruby/internal/attr/artificial.h
+escape.o: $(hdrdir)/ruby/internal/attr/cold.h
+escape.o: $(hdrdir)/ruby/internal/attr/const.h
+escape.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+escape.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+escape.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+escape.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+escape.o: $(hdrdir)/ruby/internal/attr/error.h
+escape.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+escape.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+escape.o: $(hdrdir)/ruby/internal/attr/format.h
+escape.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+escape.o: $(hdrdir)/ruby/internal/attr/noalias.h
+escape.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+escape.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+escape.o: $(hdrdir)/ruby/internal/attr/noinline.h
+escape.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+escape.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+escape.o: $(hdrdir)/ruby/internal/attr/pure.h
+escape.o: $(hdrdir)/ruby/internal/attr/restrict.h
+escape.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+escape.o: $(hdrdir)/ruby/internal/attr/warning.h
+escape.o: $(hdrdir)/ruby/internal/attr/weakref.h
+escape.o: $(hdrdir)/ruby/internal/cast.h
+escape.o: $(hdrdir)/ruby/internal/compiler_is.h
+escape.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+escape.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+escape.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+escape.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+escape.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+escape.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+escape.o: $(hdrdir)/ruby/internal/compiler_since.h
+escape.o: $(hdrdir)/ruby/internal/config.h
+escape.o: $(hdrdir)/ruby/internal/constant_p.h
+escape.o: $(hdrdir)/ruby/internal/core.h
+escape.o: $(hdrdir)/ruby/internal/core/rarray.h
+escape.o: $(hdrdir)/ruby/internal/core/rbasic.h
+escape.o: $(hdrdir)/ruby/internal/core/rbignum.h
+escape.o: $(hdrdir)/ruby/internal/core/rclass.h
+escape.o: $(hdrdir)/ruby/internal/core/rdata.h
+escape.o: $(hdrdir)/ruby/internal/core/rfile.h
+escape.o: $(hdrdir)/ruby/internal/core/rhash.h
+escape.o: $(hdrdir)/ruby/internal/core/robject.h
+escape.o: $(hdrdir)/ruby/internal/core/rregexp.h
+escape.o: $(hdrdir)/ruby/internal/core/rstring.h
+escape.o: $(hdrdir)/ruby/internal/core/rstruct.h
+escape.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+escape.o: $(hdrdir)/ruby/internal/ctype.h
+escape.o: $(hdrdir)/ruby/internal/dllexport.h
+escape.o: $(hdrdir)/ruby/internal/dosish.h
+escape.o: $(hdrdir)/ruby/internal/error.h
+escape.o: $(hdrdir)/ruby/internal/eval.h
+escape.o: $(hdrdir)/ruby/internal/event.h
+escape.o: $(hdrdir)/ruby/internal/fl_type.h
+escape.o: $(hdrdir)/ruby/internal/gc.h
+escape.o: $(hdrdir)/ruby/internal/glob.h
+escape.o: $(hdrdir)/ruby/internal/globals.h
+escape.o: $(hdrdir)/ruby/internal/has/attribute.h
+escape.o: $(hdrdir)/ruby/internal/has/builtin.h
+escape.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+escape.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+escape.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+escape.o: $(hdrdir)/ruby/internal/has/extension.h
+escape.o: $(hdrdir)/ruby/internal/has/feature.h
+escape.o: $(hdrdir)/ruby/internal/has/warning.h
+escape.o: $(hdrdir)/ruby/internal/intern/array.h
+escape.o: $(hdrdir)/ruby/internal/intern/bignum.h
+escape.o: $(hdrdir)/ruby/internal/intern/class.h
+escape.o: $(hdrdir)/ruby/internal/intern/compar.h
+escape.o: $(hdrdir)/ruby/internal/intern/complex.h
+escape.o: $(hdrdir)/ruby/internal/intern/cont.h
+escape.o: $(hdrdir)/ruby/internal/intern/dir.h
+escape.o: $(hdrdir)/ruby/internal/intern/enum.h
+escape.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+escape.o: $(hdrdir)/ruby/internal/intern/error.h
+escape.o: $(hdrdir)/ruby/internal/intern/eval.h
+escape.o: $(hdrdir)/ruby/internal/intern/file.h
+escape.o: $(hdrdir)/ruby/internal/intern/gc.h
+escape.o: $(hdrdir)/ruby/internal/intern/hash.h
+escape.o: $(hdrdir)/ruby/internal/intern/io.h
+escape.o: $(hdrdir)/ruby/internal/intern/load.h
+escape.o: $(hdrdir)/ruby/internal/intern/marshal.h
+escape.o: $(hdrdir)/ruby/internal/intern/numeric.h
+escape.o: $(hdrdir)/ruby/internal/intern/object.h
+escape.o: $(hdrdir)/ruby/internal/intern/parse.h
+escape.o: $(hdrdir)/ruby/internal/intern/proc.h
+escape.o: $(hdrdir)/ruby/internal/intern/process.h
+escape.o: $(hdrdir)/ruby/internal/intern/random.h
+escape.o: $(hdrdir)/ruby/internal/intern/range.h
+escape.o: $(hdrdir)/ruby/internal/intern/rational.h
+escape.o: $(hdrdir)/ruby/internal/intern/re.h
+escape.o: $(hdrdir)/ruby/internal/intern/ruby.h
+escape.o: $(hdrdir)/ruby/internal/intern/select.h
+escape.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+escape.o: $(hdrdir)/ruby/internal/intern/signal.h
+escape.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+escape.o: $(hdrdir)/ruby/internal/intern/string.h
+escape.o: $(hdrdir)/ruby/internal/intern/struct.h
+escape.o: $(hdrdir)/ruby/internal/intern/thread.h
+escape.o: $(hdrdir)/ruby/internal/intern/time.h
+escape.o: $(hdrdir)/ruby/internal/intern/variable.h
+escape.o: $(hdrdir)/ruby/internal/intern/vm.h
+escape.o: $(hdrdir)/ruby/internal/interpreter.h
+escape.o: $(hdrdir)/ruby/internal/iterator.h
+escape.o: $(hdrdir)/ruby/internal/memory.h
+escape.o: $(hdrdir)/ruby/internal/method.h
+escape.o: $(hdrdir)/ruby/internal/module.h
+escape.o: $(hdrdir)/ruby/internal/newobj.h
+escape.o: $(hdrdir)/ruby/internal/rgengc.h
+escape.o: $(hdrdir)/ruby/internal/scan_args.h
+escape.o: $(hdrdir)/ruby/internal/special_consts.h
+escape.o: $(hdrdir)/ruby/internal/static_assert.h
+escape.o: $(hdrdir)/ruby/internal/stdalign.h
+escape.o: $(hdrdir)/ruby/internal/stdbool.h
+escape.o: $(hdrdir)/ruby/internal/symbol.h
+escape.o: $(hdrdir)/ruby/internal/token_paste.h
+escape.o: $(hdrdir)/ruby/internal/value.h
+escape.o: $(hdrdir)/ruby/internal/value_type.h
+escape.o: $(hdrdir)/ruby/internal/variable.h
+escape.o: $(hdrdir)/ruby/internal/warning_push.h
+escape.o: $(hdrdir)/ruby/internal/xmalloc.h
+escape.o: $(hdrdir)/ruby/assert.h
+escape.o: $(hdrdir)/ruby/backward.h
+escape.o: $(hdrdir)/ruby/backward/2/assume.h
+escape.o: $(hdrdir)/ruby/backward/2/attributes.h
+escape.o: $(hdrdir)/ruby/backward/2/bool.h
+escape.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+escape.o: $(hdrdir)/ruby/backward/2/inttypes.h
+escape.o: $(hdrdir)/ruby/backward/2/limits.h
+escape.o: $(hdrdir)/ruby/backward/2/long_long.h
+escape.o: $(hdrdir)/ruby/backward/2/stdalign.h
+escape.o: $(hdrdir)/ruby/backward/2/stdarg.h
+escape.o: $(hdrdir)/ruby/defines.h
+escape.o: $(hdrdir)/ruby/encoding.h
+escape.o: $(hdrdir)/ruby/intern.h
+escape.o: $(hdrdir)/ruby/missing.h
+escape.o: $(hdrdir)/ruby/onigmo.h
+escape.o: $(hdrdir)/ruby/oniguruma.h
+escape.o: $(hdrdir)/ruby/ruby.h
+escape.o: $(hdrdir)/ruby/st.h
+escape.o: $(hdrdir)/ruby/subst.h
+escape.o: escape.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/cgi/escape/escape.c b/ext/cgi/escape/escape.c
index 75278a5399..809f95ef4c 100644
--- a/ext/cgi/escape/escape.c
+++ b/ext/cgi/escape/escape.c
@@ -9,74 +9,61 @@ RUBY_EXTERN const signed char ruby_digit36_to_number_table[];
 #define char_to_number(c) ruby_digit36_to_number_table[(unsigned char)(c)]
 
 static VALUE rb_cCGI, rb_mUtil, rb_mEscape;
-
-static void
-html_escaped_cat(VALUE str, char c)
-{
-    switch (c) {
-      case '\'':
-	rb_str_cat_cstr(str, "&#39;");
-	break;
-      case '&':
-	rb_str_cat_cstr(str, "&amp;");
-	break;
-      case '"':
-	rb_str_cat_cstr(str, "&quot;");
-	break;
-      case '<':
-	rb_str_cat_cstr(str, "&lt;");
-	break;
-      case '>':
-	rb_str_cat_cstr(str, "&gt;");
-	break;
-    }
-}
+static ID id_accept_charset;
+
+#define HTML_ESCAPE_MAX_LEN 6
+
+static const struct {
+    uint8_t len;
+    char str[HTML_ESCAPE_MAX_LEN+1];
+} html_escape_table[UCHAR_MAX+1] = {
+#define HTML_ESCAPE(c, str) [c] = {rb_strlen_lit(str), str}
+    HTML_ESCAPE('\'', "&#39;"),
+    HTML_ESCAPE('&', "&amp;"),
+    HTML_ESCAPE('"', "&quot;"),
+    HTML_ESCAPE('<', "&lt;"),
+    HTML_ESCAPE('>', "&gt;"),
+#undef HTML_ESCAPE
+};
 
 static inline void
 preserve_original_state(VALUE orig, VALUE dest)
 {
     rb_enc_associate(dest, rb_enc_get(orig));
-
-    RB_OBJ_INFECT_RAW(dest, orig);
 }
 
 static VALUE
 optimized_escape_html(VALUE str)
 {
-    long i, len, beg = 0;
-    VALUE dest = 0;
-    const char *cstr;
-
-    len  = RSTRING_LEN(str);
-    cstr = RSTRING_PTR(str);
-
-    for (i = 0; i < len; i++) {
-	switch (cstr[i]) {
-	  case '\'':
-	  case '&':
-	  case '"':
-	  case '<':
-	  case '>':
-	    if (!dest) {
-		dest = rb_str_buf_new(len);
-	    }
-
-	    rb_str_cat(dest, cstr + beg, i - beg);
-	    beg = i + 1;
-
-	    html_escaped_cat(dest, cstr[i]);
-	    break;
-	}
+    VALUE vbuf;
+    typedef char escape_buf[HTML_ESCAPE_MAX_LEN];
+    char *buf = *ALLOCV_N(escape_buf, vbuf, RSTRING_LEN(str));
+    const char *cstr = RSTRING_PTR(str);
+    const char *end = cstr + RSTRING_LEN(str);
+
+    char *dest = buf;
+    while (cstr < end) {
+        const unsigned char c = *cstr++;
+        uint8_t len = html_escape_table[c].len;
+        if (len) {
+            memcpy(dest, html_escape_table[c].str, len);
+            dest += len;
+        }
+        else {
+            *dest++ = c;
+        }
     }
 
-    if (dest) {
-	rb_str_cat(dest, cstr + beg, len - beg);
-	preserve_original_state(str, dest);
-	return dest;
+    VALUE escaped;
+    if (RSTRING_LEN(str) < (dest - buf)) {
+        escaped = rb_str_new(buf, dest - buf);
+        preserve_original_state(str, escaped);
     }
     else {
-	return rb_str_dup(str);
+        escaped = rb_str_dup(str);
     }
+    ALLOCV_END(vbuf);
+    return escaped;
 }
 
 static VALUE
@@ -104,40 +91,38 @@ optimized_unescape_html(VALUE str)
 	plen = i - beg;
 	if (++i >= len) break;
 	c = (unsigned char)cstr[i];
+#define MATCH(s) (len - i >= (int)rb_strlen_lit(s) && \
+		  memcmp(&cstr[i], s, rb_strlen_lit(s)) == 0 && \
+		  (i += rb_strlen_lit(s) - 1, 1))
 	switch (c) {
 	  case 'a':
 	    ++i;
-	    if (len - i >= 4 && memcmp(&cstr[i], "pos;", 4) == 0) {
+	    if (MATCH("pos;")) {
 		c = '\'';
-		i += 3;
 	    }
-	    else if (len - i >= 3 && memcmp(&cstr[i], "mp;", 3) == 0) {
+	    else if (MATCH("mp;")) {
 		c = '&';
-		i += 2;
 	    }
 	    else continue;
 	    break;
 	  case 'q':
 	    ++i;
-	    if (len - i >= 4 && memcmp(&cstr[i], "uot;", 4) == 0) {
+	    if (MATCH("uot;")) {
 		c = '"';
-		i += 3;
 	    }
 	    else continue;
 	    break;
 	  case 'g':
 	    ++i;
-	    if (len - i >= 2 && memcmp(&cstr[i], "t;", 2) == 0) {
+	    if (MATCH("t;")) {
 		c = '>';
-		i += 1;
 	    }
 	    else continue;
 	    break;
 	  case 'l':
 	    ++i;
-	    if (len - i >= 2 && memcmp(&cstr[i], "t;", 2) == 0) {
+	    if (MATCH("t;")) {
 		c = '<';
-		i += 1;
 	    }
 	    else continue;
 	    break;
@@ -186,7 +171,7 @@ optimized_unescape_html(VALUE str)
     }
 }
 
-static int
+static unsigned char
 url_unreserved_char(unsigned char c)
 {
     switch (c) {
@@ -197,7 +182,7 @@ url_unreserved_char(unsigned char c)
       case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': case 'G': case 'H': case 'I': case 'J':
       case 'K': case 'L': case 'M': case 'N': case 'O': case 'P': case 'Q': case 'R': case 'S': case 'T':
       case 'U': case 'V': case 'W': case 'X': case 'Y': case 'Z':
-      case '-': case '.': case '_':
+      case '-': case '.': case '_': case '~':
         return 1;
       default:
         break;
@@ -253,7 +238,8 @@ optimized_unescape(VALUE str, VALUE encoding)
     long i, len, beg = 0;
     VALUE dest = 0;
     const char *cstr;
-    int cr, origenc, encidx = rb_to_encoding_index(encoding);
+    rb_encoding *enc = rb_to_encoding(encoding);
+    int cr, origenc, encidx = rb_enc_to_index(enc);
 
     len  = RSTRING_LEN(str);
     cstr = RSTRING_PTR(str);
@@ -374,7 +360,7 @@ accept_charset(int argc, VALUE *argv, VALUE self)
 {
     if (argc > 0)
 	return argv[0];
-    return rb_cvar_get(CLASS_OF(self), rb_intern("@@accept_charset"));
+    return rb_cvar_get(CLASS_OF(self), id_accept_charset);
 }
 
 /*
@@ -403,6 +389,17 @@ cgiesc_unescape(int argc, VALUE *argv, VALUE self)
 void
 Init_escape(void)
 {
+#ifdef HAVE_RB_EXT_RACTOR_SAFE
+    rb_ext_ractor_safe(true);
+#endif
+
+    id_accept_charset = rb_intern_const("@@accept_charset");
+    InitVM(escape);
+}
+
+void
+InitVM_escape(void)
+{
     rb_cCGI    = rb_define_class("CGI", rb_cObject);
     rb_mEscape = rb_define_module_under(rb_cCGI, "Escape");
     rb_mUtil   = rb_define_module_under(rb_cCGI, "Util");
diff --git a/ext/continuation/depend b/ext/continuation/depend
new file mode 100644
index 0000000000..6e9e4f0122
--- /dev/null
+++ b/ext/continuation/depend
@@ -0,0 +1,162 @@
+# AUTOGENERATED DEPENDENCIES START
+continuation.o: $(RUBY_EXTCONF_H)
+continuation.o: $(arch_hdrdir)/ruby/config.h
+continuation.o: $(hdrdir)/ruby/internal/anyargs.h
+continuation.o: $(hdrdir)/ruby/internal/arithmetic.h
+continuation.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+continuation.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+continuation.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+continuation.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+continuation.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+continuation.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+continuation.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+continuation.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+continuation.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+continuation.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+continuation.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+continuation.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+continuation.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+continuation.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+continuation.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+continuation.o: $(hdrdir)/ruby/internal/assume.h
+continuation.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+continuation.o: $(hdrdir)/ruby/internal/attr/artificial.h
+continuation.o: $(hdrdir)/ruby/internal/attr/cold.h
+continuation.o: $(hdrdir)/ruby/internal/attr/const.h
+continuation.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+continuation.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+continuation.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+continuation.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+continuation.o: $(hdrdir)/ruby/internal/attr/error.h
+continuation.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+continuation.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+continuation.o: $(hdrdir)/ruby/internal/attr/format.h
+continuation.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+continuation.o: $(hdrdir)/ruby/internal/attr/noalias.h
+continuation.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+continuation.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+continuation.o: $(hdrdir)/ruby/internal/attr/noinline.h
+continuation.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+continuation.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+continuation.o: $(hdrdir)/ruby/internal/attr/pure.h
+continuation.o: $(hdrdir)/ruby/internal/attr/restrict.h
+continuation.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+continuation.o: $(hdrdir)/ruby/internal/attr/warning.h
+continuation.o: $(hdrdir)/ruby/internal/attr/weakref.h
+continuation.o: $(hdrdir)/ruby/internal/cast.h
+continuation.o: $(hdrdir)/ruby/internal/compiler_is.h
+continuation.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+continuation.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+continuation.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+continuation.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+continuation.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+continuation.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+continuation.o: $(hdrdir)/ruby/internal/compiler_since.h
+continuation.o: $(hdrdir)/ruby/internal/config.h
+continuation.o: $(hdrdir)/ruby/internal/constant_p.h
+continuation.o: $(hdrdir)/ruby/internal/core.h
+continuation.o: $(hdrdir)/ruby/internal/core/rarray.h
+continuation.o: $(hdrdir)/ruby/internal/core/rbasic.h
+continuation.o: $(hdrdir)/ruby/internal/core/rbignum.h
+continuation.o: $(hdrdir)/ruby/internal/core/rclass.h
+continuation.o: $(hdrdir)/ruby/internal/core/rdata.h
+continuation.o: $(hdrdir)/ruby/internal/core/rfile.h
+continuation.o: $(hdrdir)/ruby/internal/core/rhash.h
+continuation.o: $(hdrdir)/ruby/internal/core/robject.h
+continuation.o: $(hdrdir)/ruby/internal/core/rregexp.h
+continuation.o: $(hdrdir)/ruby/internal/core/rstring.h
+continuation.o: $(hdrdir)/ruby/internal/core/rstruct.h
+continuation.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+continuation.o: $(hdrdir)/ruby/internal/ctype.h
+continuation.o: $(hdrdir)/ruby/internal/dllexport.h
+continuation.o: $(hdrdir)/ruby/internal/dosish.h
+continuation.o: $(hdrdir)/ruby/internal/error.h
+continuation.o: $(hdrdir)/ruby/internal/eval.h
+continuation.o: $(hdrdir)/ruby/internal/event.h
+continuation.o: $(hdrdir)/ruby/internal/fl_type.h
+continuation.o: $(hdrdir)/ruby/internal/gc.h
+continuation.o: $(hdrdir)/ruby/internal/glob.h
+continuation.o: $(hdrdir)/ruby/internal/globals.h
+continuation.o: $(hdrdir)/ruby/internal/has/attribute.h
+continuation.o: $(hdrdir)/ruby/internal/has/builtin.h
+continuation.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+continuation.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+continuation.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+continuation.o: $(hdrdir)/ruby/internal/has/extension.h
+continuation.o: $(hdrdir)/ruby/internal/has/feature.h
+continuation.o: $(hdrdir)/ruby/internal/has/warning.h
+continuation.o: $(hdrdir)/ruby/internal/intern/array.h
+continuation.o: $(hdrdir)/ruby/internal/intern/bignum.h
+continuation.o: $(hdrdir)/ruby/internal/intern/class.h
+continuation.o: $(hdrdir)/ruby/internal/intern/compar.h
+continuation.o: $(hdrdir)/ruby/internal/intern/complex.h
+continuation.o: $(hdrdir)/ruby/internal/intern/cont.h
+continuation.o: $(hdrdir)/ruby/internal/intern/dir.h
+continuation.o: $(hdrdir)/ruby/internal/intern/enum.h
+continuation.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+continuation.o: $(hdrdir)/ruby/internal/intern/error.h
+continuation.o: $(hdrdir)/ruby/internal/intern/eval.h
+continuation.o: $(hdrdir)/ruby/internal/intern/file.h
+continuation.o: $(hdrdir)/ruby/internal/intern/gc.h
+continuation.o: $(hdrdir)/ruby/internal/intern/hash.h
+continuation.o: $(hdrdir)/ruby/internal/intern/io.h
+continuation.o: $(hdrdir)/ruby/internal/intern/load.h
+continuation.o: $(hdrdir)/ruby/internal/intern/marshal.h
+continuation.o: $(hdrdir)/ruby/internal/intern/numeric.h
+continuation.o: $(hdrdir)/ruby/internal/intern/object.h
+continuation.o: $(hdrdir)/ruby/internal/intern/parse.h
+continuation.o: $(hdrdir)/ruby/internal/intern/proc.h
+continuation.o: $(hdrdir)/ruby/internal/intern/process.h
+continuation.o: $(hdrdir)/ruby/internal/intern/random.h
+continuation.o: $(hdrdir)/ruby/internal/intern/range.h
+continuation.o: $(hdrdir)/ruby/internal/intern/rational.h
+continuation.o: $(hdrdir)/ruby/internal/intern/re.h
+continuation.o: $(hdrdir)/ruby/internal/intern/ruby.h
+continuation.o: $(hdrdir)/ruby/internal/intern/select.h
+continuation.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+continuation.o: $(hdrdir)/ruby/internal/intern/signal.h
+continuation.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+continuation.o: $(hdrdir)/ruby/internal/intern/string.h
+continuation.o: $(hdrdir)/ruby/internal/intern/struct.h
+continuation.o: $(hdrdir)/ruby/internal/intern/thread.h
+continuation.o: $(hdrdir)/ruby/internal/intern/time.h
+continuation.o: $(hdrdir)/ruby/internal/intern/variable.h
+continuation.o: $(hdrdir)/ruby/internal/intern/vm.h
+continuation.o: $(hdrdir)/ruby/internal/interpreter.h
+continuation.o: $(hdrdir)/ruby/internal/iterator.h
+continuation.o: $(hdrdir)/ruby/internal/memory.h
+continuation.o: $(hdrdir)/ruby/internal/method.h
+continuation.o: $(hdrdir)/ruby/internal/module.h
+continuation.o: $(hdrdir)/ruby/internal/newobj.h
+continuation.o: $(hdrdir)/ruby/internal/rgengc.h
+continuation.o: $(hdrdir)/ruby/internal/scan_args.h
+continuation.o: $(hdrdir)/ruby/internal/special_consts.h
+continuation.o: $(hdrdir)/ruby/internal/static_assert.h
+continuation.o: $(hdrdir)/ruby/internal/stdalign.h
+continuation.o: $(hdrdir)/ruby/internal/stdbool.h
+continuation.o: $(hdrdir)/ruby/internal/symbol.h
+continuation.o: $(hdrdir)/ruby/internal/token_paste.h
+continuation.o: $(hdrdir)/ruby/internal/value.h
+continuation.o: $(hdrdir)/ruby/internal/value_type.h
+continuation.o: $(hdrdir)/ruby/internal/variable.h
+continuation.o: $(hdrdir)/ruby/internal/warning_push.h
+continuation.o: $(hdrdir)/ruby/internal/xmalloc.h
+continuation.o: $(hdrdir)/ruby/assert.h
+continuation.o: $(hdrdir)/ruby/backward.h
+continuation.o: $(hdrdir)/ruby/backward/2/assume.h
+continuation.o: $(hdrdir)/ruby/backward/2/attributes.h
+continuation.o: $(hdrdir)/ruby/backward/2/bool.h
+continuation.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+continuation.o: $(hdrdir)/ruby/backward/2/inttypes.h
+continuation.o: $(hdrdir)/ruby/backward/2/limits.h
+continuation.o: $(hdrdir)/ruby/backward/2/long_long.h
+continuation.o: $(hdrdir)/ruby/backward/2/stdalign.h
+continuation.o: $(hdrdir)/ruby/backward/2/stdarg.h
+continuation.o: $(hdrdir)/ruby/defines.h
+continuation.o: $(hdrdir)/ruby/intern.h
+continuation.o: $(hdrdir)/ruby/missing.h
+continuation.o: $(hdrdir)/ruby/ruby.h
+continuation.o: $(hdrdir)/ruby/st.h
+continuation.o: $(hdrdir)/ruby/subst.h
+continuation.o: continuation.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/coverage/coverage.c b/ext/coverage/coverage.c
index 9a9011a7da..0af5579ffc 100644
--- a/ext/coverage/coverage.c
+++ b/ext/coverage/coverage.c
@@ -8,9 +8,16 @@
 
 ************************************************/
 
+#include "gc.h"
+#include "internal/hash.h"
+#include "internal/thread.h"
+#include "internal/sanitizers.h"
 #include "ruby.h"
 #include "vm_core.h"
 
+static int current_mode;
+static VALUE me2counter = Qnil;
+
 /*
  * call-seq:
  *    Coverage.start  => nil
@@ -18,25 +25,217 @@
  * Enables coverage measurement.
  */
 static VALUE
-rb_coverage_start(VALUE klass)
+rb_coverage_start(int argc, VALUE *argv, VALUE klass)
 {
-    VALUE coverages = rb_get_coverages();
+    VALUE coverages, opt;
+    int mode;
+
+    rb_scan_args(argc, argv, "01", &opt);
+
+    if (argc == 0) {
+	mode = 0; /* compatible mode */
+    }
+    else if (opt == ID2SYM(rb_intern("all"))) {
+	mode = COVERAGE_TARGET_LINES | COVERAGE_TARGET_BRANCHES | COVERAGE_TARGET_METHODS;
+    }
+    else {
+	mode = 0;
+	opt = rb_convert_type(opt, T_HASH, "Hash", "to_hash");
+
+	if (RTEST(rb_hash_lookup(opt, ID2SYM(rb_intern("lines")))))
+	    mode |= COVERAGE_TARGET_LINES;
+	if (RTEST(rb_hash_lookup(opt, ID2SYM(rb_intern("branches")))))
+	    mode |= COVERAGE_TARGET_BRANCHES;
+	if (RTEST(rb_hash_lookup(opt, ID2SYM(rb_intern("methods")))))
+	    mode |= COVERAGE_TARGET_METHODS;
+        if (RTEST(rb_hash_lookup(opt, ID2SYM(rb_intern("oneshot_lines"))))) {
+            if (mode & COVERAGE_TARGET_LINES)
+                rb_raise(rb_eRuntimeError, "cannot enable lines and oneshot_lines simultaneously");
+            mode |= COVERAGE_TARGET_LINES;
+            mode |= COVERAGE_TARGET_ONESHOT_LINES;
+        }
+    }
+
+    if (mode & COVERAGE_TARGET_METHODS) {
+        me2counter = rb_ident_hash_new();
+    }
+    else {
+	me2counter = Qnil;
+    }
+
+    coverages = rb_get_coverages();
     if (!RTEST(coverages)) {
 	coverages = rb_hash_new();
 	rb_obj_hide(coverages);
-	rb_set_coverages(coverages);
+	current_mode = mode;
+	if (mode == 0) mode = COVERAGE_TARGET_LINES;
+	rb_set_coverages(coverages, mode, me2counter);
+    }
+    else if (current_mode != mode) {
+	rb_raise(rb_eRuntimeError, "cannot change the measuring target during coverage measurement");
     }
     return Qnil;
 }
 
+struct branch_coverage_result_builder
+{
+    int id;
+    VALUE result;
+    VALUE children;
+    VALUE counters;
+};
+
+static int
+branch_coverage_ii(VALUE _key, VALUE branch, VALUE v)
+{
+    struct branch_coverage_result_builder *b = (struct branch_coverage_result_builder *) v;
+
+    VALUE target_label = RARRAY_AREF(branch, 0);
+    VALUE target_first_lineno = RARRAY_AREF(branch, 1);
+    VALUE target_first_column = RARRAY_AREF(branch, 2);
+    VALUE target_last_lineno = RARRAY_AREF(branch, 3);
+    VALUE target_last_column = RARRAY_AREF(branch, 4);
+    long counter_idx = FIX2LONG(RARRAY_AREF(branch, 5));
+    rb_hash_aset(b->children, rb_ary_new_from_args(6, target_label, LONG2FIX(b->id++), target_first_lineno, target_first_column, target_last_lineno, target_last_column), RARRAY_AREF(b->counters, counter_idx));
+
+    return ST_CONTINUE;
+}
+
+static int
+branch_coverage_i(VALUE _key, VALUE branch_base, VALUE v)
+{
+    struct branch_coverage_result_builder *b = (struct branch_coverage_result_builder *) v;
+
+    VALUE base_type = RARRAY_AREF(branch_base, 0);
+    VALUE base_first_lineno = RARRAY_AREF(branch_base, 1);
+    VALUE base_first_column = RARRAY_AREF(branch_base, 2);
+    VALUE base_last_lineno = RARRAY_AREF(branch_base, 3);
+    VALUE base_last_column = RARRAY_AREF(branch_base, 4);
+    VALUE branches = RARRAY_AREF(branch_base, 5);
+    VALUE children = rb_hash_new();
+    rb_hash_aset(b->result, rb_ary_new_from_args(6, base_type, LONG2FIX(b->id++), base_first_lineno, base_first_column, base_last_lineno, base_last_column), children);
+    b->children = children;
+    rb_hash_foreach(branches, branch_coverage_ii, v);
+
+    return ST_CONTINUE;
+}
+
+static VALUE
+branch_coverage(VALUE branches)
+{
+    VALUE structure = RARRAY_AREF(branches, 0);
+
+    struct branch_coverage_result_builder b;
+    b.id = 0;
+    b.result = rb_hash_new();
+    b.counters = RARRAY_AREF(branches, 1);
+
+    rb_hash_foreach(structure, branch_coverage_i, (VALUE)&b);
+
+    return b.result;
+}
+
+static int
+method_coverage_i(void *vstart, void *vend, size_t stride, void *data)
+{
+    /*
+     * ObjectSpace.each_object(Module){|mod|
+     *   mod.instance_methods.each{|mid|
+     *     m = mod.instance_method(mid)
+     *     if loc = m.source_location
+     *       p [m.name, loc, $g_method_cov_counts[m]]
+     *     end
+     *   }
+     * }
+     */
+    VALUE ncoverages = *(VALUE*)data, v;
+
+    for (v = (VALUE)vstart; v != (VALUE)vend; v += stride) {
+        void *poisoned = asan_poisoned_object_p(v);
+        asan_unpoison_object(v, false);
+
+	if (RB_TYPE_P(v, T_IMEMO) && imemo_type(v) == imemo_ment) {
+	    const rb_method_entry_t *me = (rb_method_entry_t *) v;
+	    VALUE path, first_lineno, first_column, last_lineno, last_column;
+	    VALUE data[5], ncoverage, methods;
+	    VALUE methods_id = ID2SYM(rb_intern("methods"));
+	    VALUE klass;
+	    const rb_method_entry_t *me2 = rb_resolve_me_location(me, data);
+	    if (me != me2) continue;
+	    klass = me->owner;
+	    if (RB_TYPE_P(klass, T_ICLASS)) {
+		rb_bug("T_ICLASS");
+	    }
+	    path = data[0];
+	    first_lineno = data[1];
+	    first_column = data[2];
+	    last_lineno = data[3];
+	    last_column = data[4];
+	    if (FIX2LONG(first_lineno) <= 0) continue;
+	    ncoverage = rb_hash_aref(ncoverages, path);
+	    if (NIL_P(ncoverage)) continue;
+	    methods = rb_hash_aref(ncoverage, methods_id);
+
+	    {
+		VALUE method_id = ID2SYM(me->def->original_id);
+		VALUE rcount = rb_hash_aref(me2counter, (VALUE) me);
+		VALUE key = rb_ary_new_from_args(6, klass, method_id, first_lineno, first_column, last_lineno, last_column);
+		VALUE rcount2 = rb_hash_aref(methods, key);
+
+		if (NIL_P(rcount)) rcount = LONG2FIX(0);
+		if (NIL_P(rcount2)) rcount2 = LONG2FIX(0);
+		if (!POSFIXABLE(FIX2LONG(rcount) + FIX2LONG(rcount2))) {
+		    rcount = LONG2FIX(FIXNUM_MAX);
+		}
+		else {
+		    rcount = LONG2FIX(FIX2LONG(rcount) + FIX2LONG(rcount2));
+		}
+		rb_hash_aset(methods, key, rcount);
+	    }
+	}
+
+        if (poisoned) {
+            asan_poison_object(v);
+        }
+    }
+    return 0;
+}
+
 static int
 coverage_peek_result_i(st_data_t key, st_data_t val, st_data_t h)
 {
     VALUE path = (VALUE)key;
     VALUE coverage = (VALUE)val;
     VALUE coverages = (VALUE)h;
-    coverage = rb_ary_dup(coverage);
-    rb_ary_freeze(coverage);
+    if (current_mode == 0) {
+	/* compatible mode */
+	VALUE lines = rb_ary_dup(RARRAY_AREF(coverage, COVERAGE_INDEX_LINES));
+	rb_ary_freeze(lines);
+	coverage = lines;
+    }
+    else {
+	VALUE h = rb_hash_new();
+
+	if (current_mode & COVERAGE_TARGET_LINES) {
+	    VALUE lines = RARRAY_AREF(coverage, COVERAGE_INDEX_LINES);
+            const char *kw = (current_mode & COVERAGE_TARGET_ONESHOT_LINES) ? "oneshot_lines" : "lines";
+	    lines = rb_ary_dup(lines);
+	    rb_ary_freeze(lines);
+            rb_hash_aset(h, ID2SYM(rb_intern(kw)), lines);
+	}
+
+	if (current_mode & COVERAGE_TARGET_BRANCHES) {
+	    VALUE branches = RARRAY_AREF(coverage, COVERAGE_INDEX_BRANCHES);
+	    rb_hash_aset(h, ID2SYM(rb_intern("branches")), branch_coverage(branches));
+	}
+
+	if (current_mode & COVERAGE_TARGET_METHODS) {
+	    rb_hash_aset(h, ID2SYM(rb_intern("methods")), rb_hash_new());
+	}
+
+	coverage = h;
+    }
+
     rb_hash_aset(coverages, path, coverage);
     return ST_CONTINUE;
 }
@@ -46,6 +245,12 @@ coverage_peek_result_i(st_data_t key, st_data_t val, st_data_t h)
  *     Coverage.peek_result  => hash
  *
  * Returns a hash that contains filename as key and coverage array as value.
+ * This is the same as `Coverage.result(stop: false, clear: false)`.
+ *
+ *   {
+ *     "file.rb" => [1, 2, nil],
+ *     ...
+ *   }
  */
 static VALUE
 rb_coverage_peek_result(VALUE klass)
@@ -55,26 +260,79 @@ rb_coverage_peek_result(VALUE klass)
     if (!RTEST(coverages)) {
 	rb_raise(rb_eRuntimeError, "coverage measurement is not enabled");
     }
-    st_foreach(RHASH_TBL(coverages), coverage_peek_result_i, ncoverages);
+    OBJ_WB_UNPROTECT(coverages);
+    st_foreach(RHASH_TBL_RAW(coverages), coverage_peek_result_i, ncoverages);
+
+    if (current_mode & COVERAGE_TARGET_METHODS) {
+	rb_objspace_each_objects(method_coverage_i, &ncoverages);
+    }
+
     rb_hash_freeze(ncoverages);
     return ncoverages;
 }
 
+
+static int
+clear_me2counter_i(VALUE key, VALUE value, VALUE unused)
+{
+    rb_hash_aset(me2counter, key, INT2FIX(0));
+    return ST_CONTINUE;
+}
+
 /*
  *  call-seq:
- *     Coverage.result  => hash
+ *     Coverage.result(stop: true, clear: true)  => hash
  *
- * Returns a hash that contains filename as key and coverage array as value
- * and disables coverage measurement.
+ * Returns a hash that contains filename as key and coverage array as value.
+ * If +clear+ is true, it clears the counters to zero.
+ * If +stop+ is true, it disables coverage measurement.
  */
 static VALUE
-rb_coverage_result(VALUE klass)
+rb_coverage_result(int argc, VALUE *argv, VALUE klass)
 {
-    VALUE ncoverages = rb_coverage_peek_result(klass);
-    rb_reset_coverages();
+    VALUE ncoverages;
+    VALUE opt;
+    int stop = 1, clear = 1;
+
+    rb_scan_args(argc, argv, "01", &opt);
+
+    if (argc == 1) {
+        opt = rb_convert_type(opt, T_HASH, "Hash", "to_hash");
+        stop = RTEST(rb_hash_lookup(opt, ID2SYM(rb_intern("stop"))));
+        clear = RTEST(rb_hash_lookup(opt, ID2SYM(rb_intern("clear"))));
+    }
+
+    ncoverages = rb_coverage_peek_result(klass);
+    if (stop && !clear) {
+        rb_warn("stop implies clear");
+        clear = 1;
+    }
+    if (clear) {
+        rb_clear_coverages();
+        if (!NIL_P(me2counter)) rb_hash_foreach(me2counter, clear_me2counter_i, Qnil);
+    }
+    if (stop) {
+        rb_reset_coverages();
+        me2counter = Qnil;
+    }
     return ncoverages;
 }
 
+
+/*
+ *  call-seq:
+ *     Coverage.running?  => bool
+ *
+ * Returns true if coverage stats are currently being collected (after
+ * Coverage.start call, but before Coverage.result call)
+ */
+static VALUE
+rb_coverage_running(VALUE klass)
+{
+    VALUE coverages = rb_get_coverages();
+    return RTEST(coverages) ? Qtrue : Qfalse;
+}
+
 /* Coverage provides coverage measurement feature for Ruby.
  * This feature is experimental, so these APIs may be changed in future.
  *
@@ -88,7 +346,7 @@ rb_coverage_result(VALUE klass)
  *    number of line execution by the interpreter. A +nil+ value means
  *    coverage is disabled for this line (lines like +else+ and +end+).
  *
- * = Example
+ * = Examples
  *
  *   [foo.rb]
  *   s = 0
@@ -107,12 +365,124 @@ rb_coverage_result(VALUE klass)
  *   Coverage.start
  *   require "foo.rb"
  *   p Coverage.result  #=> {"foo.rb"=>[1, 1, 10, nil, nil, 1, 1, nil, 0, nil]}
+ *
+ * == Lines Coverage
+ *
+ * If a coverage mode is not explicitly specified when starting coverage, lines
+ * coverage is what will run. It reports the number of line executions for each
+ * line.
+ *
+ *   require "coverage"
+ *   Coverage.start(lines: true)
+ *   require "foo.rb"
+ *   p Coverage.result #=> {"foo.rb"=>{:lines=>[1, 1, 10, nil, nil, 1, 1, nil, 0, nil]}}
+ *
+ * The value of the lines coverage result is an array containing how many times
+ * each line was executed. Order in this array is important. For example, the
+ * first item in this array, at index 0, reports how many times line 1 of this
+ * file was executed while coverage was run (which, in this example, is one
+ * time).
+ *
+ * A +nil+ value means coverage is disabled for this line (lines like +else+
+ * and +end+).
+ *
+ * == Oneshot Lines Coverage
+ *
+ * Oneshot lines coverage tracks and reports on the executed lines while
+ * coverage is running. It will not report how many times a line was executed,
+ * only that it was executed.
+ *
+ *   require "coverage"
+ *   Coverage.start(oneshot_lines: true)
+ *   require "foo.rb"
+ *   p Coverage.result #=> {"foo.rb"=>{:oneshot_lines=>[1, 2, 3, 6, 7]}}
+ *
+ * The value of the oneshot lines coverage result is an array containing the
+ * line numbers that were executed.
+ *
+ * == Branches Coverage
+ *
+ * Branches coverage reports how many times each branch within each conditional
+ * was executed.
+ *
+ *   require "coverage"
+ *   Coverage.start(branches: true)
+ *   require "foo.rb"
+ *   p Coverage.result #=> {"foo.rb"=>{:branches=>{[:if, 0, 6, 0, 10, 3]=>{[:then, 1, 7, 2, 7, 7]=>1, [:else, 2, 9, 2, 9, 7]=>0}}}}
+ *
+ * Each entry within the branches hash is a conditional, the value of which is
+ * another hash where each entry is a branch in that conditional. The values
+ * are the number of times the method was executed, and the keys are identifying
+ * information about the branch.
+ *
+ * The information that makes up each key identifying branches or conditionals
+ * is the following, from left to right:
+ *
+ * 1. A label for the type of branch or conditional.
+ * 2. A unique identifier.
+ * 3. The starting line number it appears on in the file.
+ * 4. The starting column number it appears on in the file.
+ * 5. The ending line number it appears on in the file.
+ * 6. The ending column number it appears on in the file.
+ *
+ * == Methods Coverage
+ *
+ * Methods coverage reports how many times each method was executed.
+ *
+ *   [foo_method.rb]
+ *   class Greeter
+ *     def greet
+ *       "welcome!"
+ *     end
+ *   end
+ *
+ *   def hello
+ *     "Hi"
+ *   end
+ *
+ *   hello()
+ *   Greeter.new.greet()
+ *   [EOF]
+ *
+ *   require "coverage"
+ *   Coverage.start(methods: true)
+ *   require "foo_method.rb"
+ *   p Coverage.result #=> {"foo_method.rb"=>{:methods=>{[Object, :hello, 7, 0, 9, 3]=>1, [Greeter, :greet, 2, 2, 4, 5]=>1}}}
+ *
+ * Each entry within the methods hash represents a method. The values in this
+ * hash are the number of times the method was executed, and the keys are
+ * identifying information about the method.
+ *
+ * The information that makes up each key identifying a method is the following,
+ * from left to right:
+ *
+ * 1. The class.
+ * 2. The method name.
+ * 3. The starting line number the method appears on in the file.
+ * 4. The starting column number the method appears on in the file.
+ * 5. The ending line number the method appears on in the file.
+ * 6. The ending column number the method appears on in the file.
+ *
+ * == All Coverage Modes
+ *
+ * You can also run all modes of coverage simultaneously with this shortcut.
+ * Note that running all coverage modes does not run both lines and oneshot
+ * lines. Those modes cannot be run simultaneously. Lines coverage is run in
+ * this case, because you can still use it to determine whether or not a line
+ * was executed.
+ *
+ *   require "coverage"
+ *   Coverage.start(:all)
+ *   require "foo.rb"
+ *   p Coverage.result #=> {"foo.rb"=>{:lines=>[1, 1, 10, nil, nil, 1, 1, nil, 0, nil], :branches=>{[:if, 0, 6, 0, 10, 3]=>{[:then, 1, 7, 2, 7, 7]=>1, [:else, 2, 9, 2, 9, 7]=>0}}, :methods=>{}}}
  */
 void
 Init_coverage(void)
 {
     VALUE 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);
+    rb_define_module_function(rb_mCoverage, "start", rb_coverage_start, -1);
+    rb_define_module_function(rb_mCoverage, "result", rb_coverage_result, -1);
     rb_define_module_function(rb_mCoverage, "peek_result", rb_coverage_peek_result, 0);
+    rb_define_module_function(rb_mCoverage, "running?", rb_coverage_running, 0);
+    rb_global_variable(&me2counter);
 }
diff --git a/ext/coverage/depend b/ext/coverage/depend
index 860893b06f..650b480b9b 100644
--- a/ext/coverage/depend
+++ b/ext/coverage/depend
@@ -1,25 +1,162 @@
-$(OBJS): $(HDRS) $(ruby_headers) \
-  $(top_srcdir)/vm_core.h \
-  $(top_srcdir)/node.h \
-  $(top_srcdir)/vm_debug.h \
-  $(top_srcdir)/vm_opts.h \
-  {$(VPATH)}id.h \
-  $(top_srcdir)/method.h \
-  $(top_srcdir)/ruby_atomic.h \
-  $(top_srcdir)/thread_pthread.h \
-  $(top_srcdir)/internal.h \
-  $(top_srcdir)/include/ruby/thread_native.h
-
 # AUTOGENERATED DEPENDENCIES START
 coverage.o: $(RUBY_EXTCONF_H)
 coverage.o: $(arch_hdrdir)/ruby/config.h
+coverage.o: $(hdrdir)/ruby.h
+coverage.o: $(hdrdir)/ruby/assert.h
+coverage.o: $(hdrdir)/ruby/atomic.h
 coverage.o: $(hdrdir)/ruby/backward.h
+coverage.o: $(hdrdir)/ruby/backward/2/assume.h
+coverage.o: $(hdrdir)/ruby/backward/2/attributes.h
+coverage.o: $(hdrdir)/ruby/backward/2/bool.h
+coverage.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+coverage.o: $(hdrdir)/ruby/backward/2/inttypes.h
+coverage.o: $(hdrdir)/ruby/backward/2/limits.h
+coverage.o: $(hdrdir)/ruby/backward/2/long_long.h
+coverage.o: $(hdrdir)/ruby/backward/2/stdalign.h
+coverage.o: $(hdrdir)/ruby/backward/2/stdarg.h
 coverage.o: $(hdrdir)/ruby/defines.h
-coverage.o: $(hdrdir)/ruby/encoding.h
 coverage.o: $(hdrdir)/ruby/intern.h
-coverage.o: $(hdrdir)/ruby/io.h
+coverage.o: $(hdrdir)/ruby/internal/anyargs.h
+coverage.o: $(hdrdir)/ruby/internal/arithmetic.h
+coverage.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+coverage.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+coverage.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+coverage.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+coverage.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+coverage.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+coverage.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+coverage.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+coverage.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+coverage.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+coverage.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+coverage.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+coverage.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+coverage.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+coverage.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+coverage.o: $(hdrdir)/ruby/internal/assume.h
+coverage.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+coverage.o: $(hdrdir)/ruby/internal/attr/artificial.h
+coverage.o: $(hdrdir)/ruby/internal/attr/cold.h
+coverage.o: $(hdrdir)/ruby/internal/attr/const.h
+coverage.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+coverage.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+coverage.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+coverage.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+coverage.o: $(hdrdir)/ruby/internal/attr/error.h
+coverage.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+coverage.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+coverage.o: $(hdrdir)/ruby/internal/attr/format.h
+coverage.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+coverage.o: $(hdrdir)/ruby/internal/attr/noalias.h
+coverage.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+coverage.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+coverage.o: $(hdrdir)/ruby/internal/attr/noinline.h
+coverage.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+coverage.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+coverage.o: $(hdrdir)/ruby/internal/attr/pure.h
+coverage.o: $(hdrdir)/ruby/internal/attr/restrict.h
+coverage.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+coverage.o: $(hdrdir)/ruby/internal/attr/warning.h
+coverage.o: $(hdrdir)/ruby/internal/attr/weakref.h
+coverage.o: $(hdrdir)/ruby/internal/cast.h
+coverage.o: $(hdrdir)/ruby/internal/compiler_is.h
+coverage.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+coverage.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+coverage.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+coverage.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+coverage.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+coverage.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+coverage.o: $(hdrdir)/ruby/internal/compiler_since.h
+coverage.o: $(hdrdir)/ruby/internal/config.h
+coverage.o: $(hdrdir)/ruby/internal/constant_p.h
+coverage.o: $(hdrdir)/ruby/internal/core.h
+coverage.o: $(hdrdir)/ruby/internal/core/rarray.h
+coverage.o: $(hdrdir)/ruby/internal/core/rbasic.h
+coverage.o: $(hdrdir)/ruby/internal/core/rbignum.h
+coverage.o: $(hdrdir)/ruby/internal/core/rclass.h
+coverage.o: $(hdrdir)/ruby/internal/core/rdata.h
+coverage.o: $(hdrdir)/ruby/internal/core/rfile.h
+coverage.o: $(hdrdir)/ruby/internal/core/rhash.h
+coverage.o: $(hdrdir)/ruby/internal/core/robject.h
+coverage.o: $(hdrdir)/ruby/internal/core/rregexp.h
+coverage.o: $(hdrdir)/ruby/internal/core/rstring.h
+coverage.o: $(hdrdir)/ruby/internal/core/rstruct.h
+coverage.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+coverage.o: $(hdrdir)/ruby/internal/ctype.h
+coverage.o: $(hdrdir)/ruby/internal/dllexport.h
+coverage.o: $(hdrdir)/ruby/internal/dosish.h
+coverage.o: $(hdrdir)/ruby/internal/error.h
+coverage.o: $(hdrdir)/ruby/internal/eval.h
+coverage.o: $(hdrdir)/ruby/internal/event.h
+coverage.o: $(hdrdir)/ruby/internal/fl_type.h
+coverage.o: $(hdrdir)/ruby/internal/gc.h
+coverage.o: $(hdrdir)/ruby/internal/glob.h
+coverage.o: $(hdrdir)/ruby/internal/globals.h
+coverage.o: $(hdrdir)/ruby/internal/has/attribute.h
+coverage.o: $(hdrdir)/ruby/internal/has/builtin.h
+coverage.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+coverage.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+coverage.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+coverage.o: $(hdrdir)/ruby/internal/has/extension.h
+coverage.o: $(hdrdir)/ruby/internal/has/feature.h
+coverage.o: $(hdrdir)/ruby/internal/has/warning.h
+coverage.o: $(hdrdir)/ruby/internal/intern/array.h
+coverage.o: $(hdrdir)/ruby/internal/intern/bignum.h
+coverage.o: $(hdrdir)/ruby/internal/intern/class.h
+coverage.o: $(hdrdir)/ruby/internal/intern/compar.h
+coverage.o: $(hdrdir)/ruby/internal/intern/complex.h
+coverage.o: $(hdrdir)/ruby/internal/intern/cont.h
+coverage.o: $(hdrdir)/ruby/internal/intern/dir.h
+coverage.o: $(hdrdir)/ruby/internal/intern/enum.h
+coverage.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+coverage.o: $(hdrdir)/ruby/internal/intern/error.h
+coverage.o: $(hdrdir)/ruby/internal/intern/eval.h
+coverage.o: $(hdrdir)/ruby/internal/intern/file.h
+coverage.o: $(hdrdir)/ruby/internal/intern/gc.h
+coverage.o: $(hdrdir)/ruby/internal/intern/hash.h
+coverage.o: $(hdrdir)/ruby/internal/intern/io.h
+coverage.o: $(hdrdir)/ruby/internal/intern/load.h
+coverage.o: $(hdrdir)/ruby/internal/intern/marshal.h
+coverage.o: $(hdrdir)/ruby/internal/intern/numeric.h
+coverage.o: $(hdrdir)/ruby/internal/intern/object.h
+coverage.o: $(hdrdir)/ruby/internal/intern/parse.h
+coverage.o: $(hdrdir)/ruby/internal/intern/proc.h
+coverage.o: $(hdrdir)/ruby/internal/intern/process.h
+coverage.o: $(hdrdir)/ruby/internal/intern/random.h
+coverage.o: $(hdrdir)/ruby/internal/intern/range.h
+coverage.o: $(hdrdir)/ruby/internal/intern/rational.h
+coverage.o: $(hdrdir)/ruby/internal/intern/re.h
+coverage.o: $(hdrdir)/ruby/internal/intern/ruby.h
+coverage.o: $(hdrdir)/ruby/internal/intern/select.h
+coverage.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+coverage.o: $(hdrdir)/ruby/internal/intern/signal.h
+coverage.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+coverage.o: $(hdrdir)/ruby/internal/intern/string.h
+coverage.o: $(hdrdir)/ruby/internal/intern/struct.h
+coverage.o: $(hdrdir)/ruby/internal/intern/thread.h
+coverage.o: $(hdrdir)/ruby/internal/intern/time.h
+coverage.o: $(hdrdir)/ruby/internal/intern/variable.h
+coverage.o: $(hdrdir)/ruby/internal/intern/vm.h
+coverage.o: $(hdrdir)/ruby/internal/interpreter.h
+coverage.o: $(hdrdir)/ruby/internal/iterator.h
+coverage.o: $(hdrdir)/ruby/internal/memory.h
+coverage.o: $(hdrdir)/ruby/internal/method.h
+coverage.o: $(hdrdir)/ruby/internal/module.h
+coverage.o: $(hdrdir)/ruby/internal/newobj.h
+coverage.o: $(hdrdir)/ruby/internal/rgengc.h
+coverage.o: $(hdrdir)/ruby/internal/scan_args.h
+coverage.o: $(hdrdir)/ruby/internal/special_consts.h
+coverage.o: $(hdrdir)/ruby/internal/static_assert.h
+coverage.o: $(hdrdir)/ruby/internal/stdalign.h
+coverage.o: $(hdrdir)/ruby/internal/stdbool.h
+coverage.o: $(hdrdir)/ruby/internal/symbol.h
+coverage.o: $(hdrdir)/ruby/internal/token_paste.h
+coverage.o: $(hdrdir)/ruby/internal/value.h
+coverage.o: $(hdrdir)/ruby/internal/value_type.h
+coverage.o: $(hdrdir)/ruby/internal/variable.h
+coverage.o: $(hdrdir)/ruby/internal/warning_push.h
+coverage.o: $(hdrdir)/ruby/internal/xmalloc.h
 coverage.o: $(hdrdir)/ruby/missing.h
-coverage.o: $(hdrdir)/ruby/oniguruma.h
 coverage.o: $(hdrdir)/ruby/ruby.h
 coverage.o: $(hdrdir)/ruby/st.h
 coverage.o: $(hdrdir)/ruby/subst.h
@@ -28,15 +165,25 @@ coverage.o: $(top_srcdir)/ccan/check_type/check_type.h
 coverage.o: $(top_srcdir)/ccan/container_of/container_of.h
 coverage.o: $(top_srcdir)/ccan/list/list.h
 coverage.o: $(top_srcdir)/ccan/str/str.h
-coverage.o: $(top_srcdir)/include/ruby.h
+coverage.o: $(top_srcdir)/gc.h
 coverage.o: $(top_srcdir)/internal.h
+coverage.o: $(top_srcdir)/internal/array.h
+coverage.o: $(top_srcdir)/internal/compilers.h
+coverage.o: $(top_srcdir)/internal/gc.h
+coverage.o: $(top_srcdir)/internal/hash.h
+coverage.o: $(top_srcdir)/internal/imemo.h
+coverage.o: $(top_srcdir)/internal/sanitizers.h
+coverage.o: $(top_srcdir)/internal/serial.h
+coverage.o: $(top_srcdir)/internal/static_assert.h
+coverage.o: $(top_srcdir)/internal/thread.h
+coverage.o: $(top_srcdir)/internal/vm.h
+coverage.o: $(top_srcdir)/internal/warnings.h
 coverage.o: $(top_srcdir)/method.h
 coverage.o: $(top_srcdir)/node.h
 coverage.o: $(top_srcdir)/ruby_assert.h
 coverage.o: $(top_srcdir)/ruby_atomic.h
 coverage.o: $(top_srcdir)/thread_pthread.h
 coverage.o: $(top_srcdir)/vm_core.h
-coverage.o: $(top_srcdir)/vm_debug.h
 coverage.o: $(top_srcdir)/vm_opts.h
 coverage.o: coverage.c
 coverage.o: {$(VPATH)}id.h
diff --git a/ext/coverage/lib/coverage.rb b/ext/coverage/lib/coverage.rb
new file mode 100644
index 0000000000..f1923ef366
--- /dev/null
+++ b/ext/coverage/lib/coverage.rb
@@ -0,0 +1,14 @@
+require "coverage.so"
+
+module Coverage
+  def self.line_stub(file)
+    lines = File.foreach(file).map { nil }
+    iseqs = [RubyVM::InstructionSequence.compile_file(file)]
+    until iseqs.empty?
+      iseq = iseqs.pop
+      iseq.trace_points.each {|n, type| lines[n - 1] = 0 if type == :line }
+      iseq.each_child {|child| iseqs << child }
+    end
+    lines
+  end
+end
diff --git a/ext/date/date.gemspec b/ext/date/date.gemspec
new file mode 100644
index 0000000000..cf07696976
--- /dev/null
+++ b/ext/date/date.gemspec
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+version = File.foreach(File.expand_path("../lib/date.rb", __FILE__)).find do |line|
+  /^\s*VERSION\s*=\s*["'](.*)["']/ =~ line and break $1
+end
+
+Gem::Specification.new do |s|
+  s.name = "date"
+  s.version = version
+  s.summary = "A subclass of Object includes Comparable module for handling dates."
+  s.description = "A subclass of Object includes Comparable module for handling dates."
+
+  s.require_path = %w{lib}
+  s.files = [
+    "lib/date.rb", "ext/date/date_core.c", "ext/date/date_parse.c", "ext/date/date_strftime.c",
+    "ext/date/date_strptime.c", "ext/date/date_tmx.h", "ext/date/extconf.rb", "ext/date/prereq.mk",
+    "ext/date/zonetab.h", "ext/date/zonetab.list"
+  ]
+  s.extensions = "ext/date/extconf.rb"
+  s.required_ruby_version = ">= 2.4.0"
+
+  s.authors = ["Tadayoshi Funaba"]
+  s.email = [nil]
+  s.homepage = "https://github.com/ruby/date"
+  s.licenses = ["Ruby", "BSD-2-Clause"]
+end
diff --git a/ext/date/date_core.c b/ext/date/date_core.c
index 12240d7457..66ec0aa92a 100644
--- a/ext/date/date_core.c
+++ b/ext/date/date_core.c
@@ -11,6 +11,7 @@
 #include <sys/time.h>
 #endif
 
+#undef NDEBUG
 #define NDEBUG
 #include <assert.h>
 
@@ -22,6 +23,7 @@
 
 static ID id_cmp, id_le_p, id_ge_p, id_eqeq_p;
 static VALUE cDate, cDateTime;
+static VALUE eDateError;
 static VALUE half_days_in_day, day_in_nanoseconds;
 static double positive_inf, negative_inf;
 
@@ -51,18 +53,31 @@ static double positive_inf, negative_inf;
 #define f_add3(x,y,z) f_add(f_add(x, y), z)
 #define f_sub3(x,y,z) f_sub(f_sub(x, y), z)
 
-inline static VALUE
+#define f_frozen_ary(...) rb_obj_freeze(rb_ary_new3(__VA_ARGS__))
+
+static VALUE date_initialize(int argc, VALUE *argv, VALUE self);
+static VALUE datetime_initialize(int argc, VALUE *argv, VALUE self);
+
+#define RETURN_FALSE_UNLESS_NUMERIC(obj) if(!RTEST(rb_obj_is_kind_of((obj), rb_cNumeric))) return Qfalse
+inline static void
+check_numeric(VALUE obj, const char* field) {
+    if(!RTEST(rb_obj_is_kind_of(obj, rb_cNumeric))) {
+        rb_raise(rb_eTypeError, "invalid %s (not numeric)", field);
+    }
+}
+
+inline static int
 f_cmp(VALUE x, VALUE y)
 {
     if (FIXNUM_P(x) && FIXNUM_P(y)) {
 	long c = FIX2LONG(x) - FIX2LONG(y);
 	if (c > 0)
-	    c = 1;
+	    return 1;
 	else if (c < 0)
-	    c = -1;
-	return INT2FIX(c);
+	    return -1;
+	return 0;
     }
-    return rb_funcall(x, id_cmp, 1, y);
+    return rb_cmpint(rb_funcallv(x, id_cmp, 1, &y), x, y);
 }
 
 inline static VALUE
@@ -94,7 +109,7 @@ f_ge_p(VALUE x, VALUE y)
 {
     if (FIXNUM_P(x) && FIXNUM_P(y))
 	return f_boolcast(FIX2LONG(x) >= FIX2LONG(y));
-    return rb_funcall(x, rb_intern(">="), 1, y);
+    return rb_funcall(x, id_ge_p, 1, y);
 }
 
 inline static VALUE
@@ -102,7 +117,7 @@ f_eqeq_p(VALUE x, VALUE y)
 {
     if (FIXNUM_P(x) && FIXNUM_P(y))
 	return f_boolcast(FIX2LONG(x) == FIX2LONG(y));
-    return rb_funcall(x, rb_intern("=="), 1, y);
+    return rb_funcall(x, id_eqeq_p, 1, y);
 }
 
 inline static VALUE
@@ -236,11 +251,8 @@ f_negative_p(VALUE x)
 struct SimpleDateData
 {
     unsigned flags;
-    VALUE nth;	/* not always canonicalized */
     int jd;	/* as utc */
-    /* df is zero */
-    /* sf is zero */
-    /* of is zero */
+    VALUE nth;	/* not always canonicalized */
     date_sg_t sg;  /* 2298874..2426355 or -/+oo -- at most 22 bits */
     /* decoded as utc=local */
     int year;	/* truncated */
@@ -259,11 +271,8 @@ struct SimpleDateData
 struct ComplexDateData
 {
     unsigned flags;
-    VALUE nth;	/* not always canonicalized */
     int jd; 	/* as utc */
-    int df;	/* as utc, in secs */
-    VALUE sf;	/* in nano secs */
-    int of;	/* in secs */
+    VALUE nth;	/* not always canonicalized */
     date_sg_t sg;  /* 2298874..2426355 or -/+oo -- at most 22 bits */
     /* decoded as local */
     int year;	/* truncated */
@@ -277,6 +286,9 @@ struct ComplexDateData
     /* packed civil */
     unsigned pc;
 #endif
+    int df;	/* as utc, in secs */
+    int of;	/* in secs */
+    VALUE sf;	/* in nano secs */
 };
 
 union DateData {
@@ -315,31 +327,31 @@ canon(VALUE x)
 
 #ifndef USE_PACK
 #define set_to_simple(obj, x, _nth, _jd ,_sg, _year, _mon, _mday, _flags) \
-{\
+do {\
     RB_OBJ_WRITE((obj), &(x)->nth, canon(_nth)); \
     (x)->jd = _jd;\
     (x)->sg = (date_sg_t)(_sg);\
     (x)->year = _year;\
     (x)->mon = _mon;\
     (x)->mday = _mday;\
-    (x)->flags = _flags;\
-}
+    (x)->flags = (_flags) & ~COMPLEX_DAT;\
+} while (0)
 #else
 #define set_to_simple(obj, x, _nth, _jd ,_sg, _year, _mon, _mday, _flags) \
-{\
+do {\
     RB_OBJ_WRITE((obj), &(x)->nth, canon(_nth)); \
     (x)->jd = _jd;\
     (x)->sg = (date_sg_t)(_sg);\
     (x)->year = _year;\
     (x)->pc = PACK2(_mon, _mday);\
-    (x)->flags = _flags;\
-}
+    (x)->flags = (_flags) & ~COMPLEX_DAT;\
+} while (0)
 #endif
 
 #ifndef USE_PACK
 #define set_to_complex(obj, x, _nth, _jd ,_df, _sf, _of, _sg,\
 _year, _mon, _mday, _hour, _min, _sec, _flags) \
-{\
+do {\
     RB_OBJ_WRITE((obj), &(x)->nth, canon(_nth));\
     (x)->jd = _jd;\
     (x)->df = _df;\
@@ -352,12 +364,12 @@ _year, _mon, _mday, _hour, _min, _sec, _flags) \
     (x)->hour = _hour;\
     (x)->min = _min;\
     (x)->sec = _sec;\
-    (x)->flags = _flags;\
-}
+    (x)->flags = (_flags) | COMPLEX_DAT;\
+} while (0)
 #else
 #define set_to_complex(obj, x, _nth, _jd ,_df, _sf, _of, _sg,\
 _year, _mon, _mday, _hour, _min, _sec, _flags) \
-{\
+do {\
     RB_OBJ_WRITE((obj), &(x)->nth, canon(_nth));\
     (x)->jd = _jd;\
     (x)->df = _df;\
@@ -366,13 +378,13 @@ _year, _mon, _mday, _hour, _min, _sec, _flags) \
     (x)->sg = (date_sg_t)(_sg);\
     (x)->year = _year;\
     (x)->pc = PACK5(_mon, _mday, _hour, _min, _sec);\
-    (x)->flags = _flags;\
-}
+    (x)->flags = (_flags) | COMPLEX_DAT;\
+} while (0)
 #endif
 
 #ifndef USE_PACK
 #define copy_simple_to_complex(obj, x, y) \
-{\
+do {\
     RB_OBJ_WRITE((obj), &(x)->nth, (y)->nth);\
     (x)->jd = (y)->jd;\
     (x)->df = 0;\
@@ -386,10 +398,10 @@ _year, _mon, _mday, _hour, _min, _sec, _flags) \
     (x)->min = 0;\
     (x)->sec = 0;\
     (x)->flags = (y)->flags;\
-}
+} while (0)
 #else
 #define copy_simple_to_complex(obj, x, y) \
-{\
+do {\
     RB_OBJ_WRITE((obj), &(x)->nth, (y)->nth);\
     (x)->jd = (y)->jd;\
     (x)->df = 0;\
@@ -399,12 +411,12 @@ _year, _mon, _mday, _hour, _min, _sec, _flags) \
     (x)->year = (y)->year;\
     (x)->pc = PACK5(EX_MON((y)->pc), EX_MDAY((y)->pc), 0, 0, 0);\
     (x)->flags = (y)->flags;\
-}
+} while (0)
 #endif
 
 #ifndef USE_PACK
 #define copy_complex_to_simple(obj, x, y) \
-{\
+do {\
     RB_OBJ_WRITE((obj), &(x)->nth, (y)->nth);\
     (x)->jd = (y)->jd;\
     (x)->sg = (date_sg_t)((y)->sg);\
@@ -412,17 +424,17 @@ _year, _mon, _mday, _hour, _min, _sec, _flags) \
     (x)->mon = (y)->mon;\
     (x)->mday = (y)->mday;\
     (x)->flags = (y)->flags;\
-}
+} while (0)
 #else
 #define copy_complex_to_simple(obj, x, y) \
-{\
+do {\
     RB_OBJ_WRITE((obj), &(x)->nth, (y)->nth);\
     (x)->jd = (y)->jd;\
     (x)->sg = (date_sg_t)((y)->sg);\
     (x)->year = (y)->year;\
     (x)->pc = PACK2(EX_MON((y)->pc), EX_MDAY((y)->pc));\
     (x)->flags = (y)->flags;\
-}
+} while (0)
 #endif
 
 /* base */
@@ -1109,7 +1121,7 @@ m_virtual_sg(union DateData *x)
 }
 
 #define canonicalize_jd(_nth, _jd) \
-{\
+do {\
     if (_jd < 0) {\
 	_nth = f_sub(_nth, INT2FIX(1));\
 	_jd += CM_PERIOD;\
@@ -1118,7 +1130,7 @@ m_virtual_sg(union DateData *x)
 	_nth = f_add(_nth, INT2FIX(1));\
 	_jd -= CM_PERIOD;\
     }\
-}
+} while (0)
 
 inline static void
 canonicalize_s_jd(VALUE obj, union DateData *x)
@@ -1928,13 +1940,13 @@ m_sec(union DateData *x)
 }
 
 #define decode_offset(of,s,h,m)\
-{\
+do {\
     int a;\
     s = (of < 0) ? '-' : '+';\
     a = (of < 0) ? -of : of;\
     h = a / HOUR_IN_SECONDS;\
     m = a % HOUR_IN_SECONDS / MINUTE_IN_SECONDS;\
-}
+} while (0)
 
 static VALUE
 of2str(int of)
@@ -2333,6 +2345,9 @@ VALUE date_zone_to_diff(VALUE);
 static int
 offset_to_sec(VALUE vof, int *rof)
 {
+    int try_rational = 1;
+
+  again:
     switch (TYPE(vof)) {
       case T_FIXNUM:
 	{
@@ -2359,10 +2374,11 @@ offset_to_sec(VALUE vof, int *rof)
       default:
 	expect_numeric(vof);
 	vof = f_to_r(vof);
-#ifdef CANONICALIZATION_FOR_MATHN
-	if (!k_rational_p(vof))
-	    return offset_to_sec(vof, rof);
-#endif
+	if (!k_rational_p(vof)) {
+	    if (!try_rational) Check_Type(vof, T_RATIONAL);
+	    try_rational = 0;
+	    goto again;
+	}
 	/* fall through */
       case T_RATIONAL:
 	{
@@ -2371,17 +2387,10 @@ offset_to_sec(VALUE vof, int *rof)
 
 	    vs = day_to_sec(vof);
 
-#ifdef CANONICALIZATION_FOR_MATHN
 	    if (!k_rational_p(vs)) {
-		if (!FIXNUM_P(vs))
-		    return 0;
-		n = FIX2LONG(vs);
-		if (n < -DAY_IN_SECONDS || n > DAY_IN_SECONDS)
-		    return 0;
-		*rof = (int)n;
-		return 1;
+		vn = vs;
+		goto rounded;
 	    }
-#endif
 	    vn = rb_rational_num(vs);
 	    vd = rb_rational_den(vs);
 
@@ -2391,6 +2400,7 @@ offset_to_sec(VALUE vof, int *rof)
 		vn = f_round(vs);
 		if (!f_eqeq_p(vn, vs))
 		    rb_warning("fraction of offset is ignored");
+	      rounded:
 		if (!FIXNUM_P(vn))
 		    return 0;
 		n = FIX2LONG(vn);
@@ -2420,12 +2430,12 @@ offset_to_sec(VALUE vof, int *rof)
 /* date */
 
 #define valid_sg(sg) \
-{\
+do {\
     if (!c_valid_start_p(sg)) {\
 	sg = 0;\
 	rb_warning("invalid start is ignored");\
     }\
-}
+} while (0)
 
 static VALUE
 valid_jd_sub(int argc, VALUE *argv, VALUE klass, int need_jd)
@@ -2462,7 +2472,7 @@ date_s__valid_jd_p(int argc, VALUE *argv, VALUE klass)
  *
  *    Date.valid_jd?(2451944)		#=> true
  *
- * See also jd.
+ * See also ::jd.
  */
 static VALUE
 date_s_valid_jd_p(int argc, VALUE *argv, VALUE klass)
@@ -2472,6 +2482,7 @@ date_s_valid_jd_p(int argc, VALUE *argv, VALUE klass)
 
     rb_scan_args(argc, argv, "11", &vjd, &vsg);
 
+    RETURN_FALSE_UNLESS_NUMERIC(vjd);
     argv2[0] = vjd;
     if (argc < 2)
 	argv2[1] = INT2FIX(DEFAULT_SG);
@@ -2547,11 +2558,14 @@ date_s__valid_civil_p(int argc, VALUE *argv, VALUE klass)
  *    Date.valid_date?(year, month, mday[, start=Date::ITALY])   ->  bool
  *
  * Returns true if the given calendar date is valid, and false if not.
+ * Valid in this context is whether the arguments passed to this
+ * method would be accepted by ::new.
  *
  *    Date.valid_date?(2001,2,3)	#=> true
  *    Date.valid_date?(2001,2,29)	#=> false
+ *    Date.valid_date?(2001,2,-1)	#=> true
  *
- * See also jd and civil.
+ * See also ::jd and ::civil.
  */
 static VALUE
 date_s_valid_civil_p(int argc, VALUE *argv, VALUE klass)
@@ -2561,6 +2575,9 @@ date_s_valid_civil_p(int argc, VALUE *argv, VALUE klass)
 
     rb_scan_args(argc, argv, "31", &vy, &vm, &vd, &vsg);
 
+    RETURN_FALSE_UNLESS_NUMERIC(vy);
+    RETURN_FALSE_UNLESS_NUMERIC(vm);
+    RETURN_FALSE_UNLESS_NUMERIC(vd);
     argv2[0] = vy;
     argv2[1] = vm;
     argv2[2] = vd;
@@ -2632,7 +2649,7 @@ date_s__valid_ordinal_p(int argc, VALUE *argv, VALUE klass)
  *    Date.valid_ordinal?(2001,34)	#=> true
  *    Date.valid_ordinal?(2001,366)	#=> false
  *
- * See also jd and ordinal.
+ * See also ::jd and ::ordinal.
  */
 static VALUE
 date_s_valid_ordinal_p(int argc, VALUE *argv, VALUE klass)
@@ -2642,6 +2659,8 @@ date_s_valid_ordinal_p(int argc, VALUE *argv, VALUE klass)
 
     rb_scan_args(argc, argv, "21", &vy, &vd, &vsg);
 
+    RETURN_FALSE_UNLESS_NUMERIC(vy);
+    RETURN_FALSE_UNLESS_NUMERIC(vd);
     argv2[0] = vy;
     argv2[1] = vd;
     if (argc < 3)
@@ -2714,7 +2733,7 @@ date_s__valid_commercial_p(int argc, VALUE *argv, VALUE klass)
  *    Date.valid_commercial?(2001,5,6)	#=> true
  *    Date.valid_commercial?(2001,5,8)	#=> false
  *
- * See also jd and commercial.
+ * See also ::jd and ::commercial.
  */
 static VALUE
 date_s_valid_commercial_p(int argc, VALUE *argv, VALUE klass)
@@ -2724,6 +2743,9 @@ date_s_valid_commercial_p(int argc, VALUE *argv, VALUE klass)
 
     rb_scan_args(argc, argv, "31", &vy, &vw, &vd, &vsg);
 
+    RETURN_FALSE_UNLESS_NUMERIC(vy);
+    RETURN_FALSE_UNLESS_NUMERIC(vw);
+    RETURN_FALSE_UNLESS_NUMERIC(vd);
     argv2[0] = vy;
     argv2[1] = vw;
     argv2[2] = vd;
@@ -2905,6 +2927,7 @@ date_s_julian_leap_p(VALUE klass, VALUE y)
     VALUE nth;
     int ry;
 
+    check_numeric(y, "year");
     decode_year(y, +1, &nth, &ry);
     return f_boolcast(c_julian_leap_p(ry));
 }
@@ -2926,6 +2949,7 @@ date_s_gregorian_leap_p(VALUE klass, VALUE y)
     VALUE nth;
     int ry;
 
+    check_numeric(y, "year");
     decode_year(y, -1, &nth, &ry);
     return f_boolcast(c_gregorian_leap_p(ry));
 }
@@ -2949,11 +2973,15 @@ d_lite_memsize(const void *ptr)
     return complex_dat_p(dat) ? sizeof(struct ComplexDateData) : sizeof(struct SimpleDateData);
 }
 
+#ifndef HAVE_RB_EXT_RACTOR_SAFE
+#   define RUBY_TYPED_FROZEN_SHAREABLE 0
+#endif
+
 static const rb_data_type_t d_lite_type = {
     "Date",
     {d_lite_gc_mark, RUBY_TYPED_DEFAULT_FREE, d_lite_memsize,},
     0, 0,
-    RUBY_TYPED_FREE_IMMEDIATELY|RUBY_TYPED_WB_PROTECTED,
+    RUBY_TYPED_FREE_IMMEDIATELY|RUBY_TYPED_WB_PROTECTED|RUBY_TYPED_FROZEN_SHAREABLE,
 };
 
 inline static VALUE
@@ -2968,7 +2996,7 @@ d_simple_new_internal(VALUE klass,
 
     obj = TypedData_Make_Struct(klass, struct SimpleDateData,
 				&d_lite_type, dat);
-    set_to_simple(obj, dat, nth, jd, sg, y, m, d, flags & ~COMPLEX_DAT);
+    set_to_simple(obj, dat, nth, jd, sg, y, m, d, flags);
 
     assert(have_jd_p(dat) || have_civil_p(dat));
 
@@ -2990,7 +3018,7 @@ d_complex_new_internal(VALUE klass,
     obj = TypedData_Make_Struct(klass, struct ComplexDateData,
 				&d_lite_type, dat);
     set_to_complex(obj, dat, nth, jd, df, sf, of, sg,
-		   y, m, d, h, min, s, flags | COMPLEX_DAT);
+		   y, m, d, h, min, s, flags);
 
     assert(have_jd_p(dat) || have_civil_p(dat));
     assert(have_df_p(dat) || have_time_p(dat));
@@ -3049,7 +3077,7 @@ old_to_new(VALUE ajd, VALUE of, VALUE sg,
     *rsg = NUM2DBL(sg);
 
     if (*rdf < 0 || *rdf >= DAY_IN_SECONDS)
-	rb_raise(rb_eArgError, "invalid day fraction");
+	rb_raise(eDateError, "invalid day fraction");
 
     if (f_lt_p(*rsf, INT2FIX(0)) ||
 	f_ge_p(*rsf, INT2FIX(SECOND_IN_NANOSECONDS)))
@@ -3207,47 +3235,47 @@ s_trunc(VALUE s, VALUE *fr)
 }
 
 #define num2num_with_frac(s,n) \
-{\
+do {\
     s = s##_trunc(v##s, &fr);\
     if (f_nonzero_p(fr)) {\
 	if (argc > n)\
-	    rb_raise(rb_eArgError, "invalid fraction");\
+	    rb_raise(eDateError, "invalid fraction");\
 	fr2 = fr;\
     }\
-}
+} while (0)
 
 #define num2int_with_frac(s,n) \
-{\
+do {\
     s = NUM2INT(s##_trunc(v##s, &fr));\
     if (f_nonzero_p(fr)) {\
 	if (argc > n)\
-	    rb_raise(rb_eArgError, "invalid fraction");\
+	    rb_raise(eDateError, "invalid fraction");\
 	fr2 = fr;\
     }\
-}
+} while (0)
 
 #define canon24oc() \
-{\
+do {\
     if (rh == 24) {\
 	rh = 0;\
 	fr2 = f_add(fr2, INT2FIX(1));\
     }\
-}
+} while (0)
 
 #define add_frac() \
-{\
+do {\
     if (f_nonzero_p(fr2))\
 	ret = d_lite_plus(ret, fr2);\
-}
+} while (0)
 
 #define val2sg(vsg,dsg) \
-{\
+do {\
     dsg = NUM2DBL(vsg);\
     if (!c_valid_start_p(dsg)) {\
 	dsg = DEFAULT_SG;\
 	rb_warning("invalid start is ignored");\
     }\
-}
+} while (0)
 
 static VALUE d_lite_plus(VALUE, VALUE);
 
@@ -3262,7 +3290,7 @@ static VALUE d_lite_plus(VALUE, VALUE);
  *    Date.jd(2451945)		#=> #<Date: 2001-02-04 ...>
  *    Date.jd(0)		#=> #<Date: -4712-01-01 ...>
  *
- * See also new.
+ * See also ::new.
  */
 static VALUE
 date_s_jd(int argc, VALUE *argv, VALUE klass)
@@ -3280,6 +3308,7 @@ date_s_jd(int argc, VALUE *argv, VALUE klass)
       case 2:
 	val2sg(vsg, sg);
       case 1:
+        check_numeric(vjd, "jd");
 	num2num_with_frac(jd, positive_inf);
     }
 
@@ -3312,7 +3341,7 @@ date_s_jd(int argc, VALUE *argv, VALUE klass)
  *    Date.ordinal(2001,34)	#=> #<Date: 2001-02-03 ...>
  *    Date.ordinal(2001,-1)	#=> #<Date: 2001-12-31 ...>
  *
- * See also jd and new.
+ * See also ::jd and ::new.
  */
 static VALUE
 date_s_ordinal(int argc, VALUE *argv, VALUE klass)
@@ -3332,8 +3361,10 @@ date_s_ordinal(int argc, VALUE *argv, VALUE klass)
       case 3:
 	val2sg(vsg, sg);
       case 2:
+        check_numeric(vd, "yday");
 	num2int_with_frac(d, positive_inf);
       case 1:
+        check_numeric(vy, "year");
 	y = vy;
     }
 
@@ -3345,7 +3376,7 @@ date_s_ordinal(int argc, VALUE *argv, VALUE klass)
 			     &nth, &ry,
 			     &rd, &rjd,
 			     &ns))
-	    rb_raise(rb_eArgError, "invalid date");
+	    rb_raise(eDateError, "invalid date");
 
 	ret = d_simple_new_internal(klass,
 				     nth, rjd,
@@ -3380,14 +3411,25 @@ date_s_ordinal(int argc, VALUE *argv, VALUE klass)
  *    Date.new(2001,2,3)	#=> #<Date: 2001-02-03 ...>
  *    Date.new(2001,2,-1)	#=> #<Date: 2001-02-28 ...>
  *
- * See also jd.
+ * See also ::jd.
  */
 static VALUE
 date_s_civil(int argc, VALUE *argv, VALUE klass)
 {
+    return date_initialize(argc, argv, d_lite_s_alloc_simple(klass));
+}
+
+static VALUE
+date_initialize(int argc, VALUE *argv, VALUE self)
+{
     VALUE vy, vm, vd, vsg, y, fr, fr2, ret;
     int m, d;
     double sg;
+    struct SimpleDateData *dat = rb_check_typeddata(self, &d_lite_type);
+
+    if (!simple_dat_p(dat)) {
+	rb_raise(rb_eTypeError, "Date expected");
+    }
 
     rb_scan_args(argc, argv, "04", &vy, &vm, &vd, &vsg);
 
@@ -3401,10 +3443,13 @@ date_s_civil(int argc, VALUE *argv, VALUE klass)
       case 4:
 	val2sg(vsg, sg);
       case 3:
+        check_numeric(vd, "day");
 	num2int_with_frac(d, positive_inf);
       case 2:
+        check_numeric(vm, "month");
 	m = NUM2INT(vm);
       case 1:
+        check_numeric(vy, "year");
 	y = vy;
     }
 
@@ -3415,13 +3460,9 @@ date_s_civil(int argc, VALUE *argv, VALUE klass)
 	if (!valid_gregorian_p(y, m, d,
 			       &nth, &ry,
 			       &rm, &rd))
-	    rb_raise(rb_eArgError, "invalid date");
+	    rb_raise(eDateError, "invalid date");
 
-	ret = d_simple_new_internal(klass,
-				    nth, 0,
-				    sg,
-				    ry, rm, rd,
-				    HAVE_CIVIL);
+	set_to_simple(self, dat, nth, 0, sg, ry, rm, rd, HAVE_CIVIL);
     }
     else {
 	VALUE nth;
@@ -3431,14 +3472,11 @@ date_s_civil(int argc, VALUE *argv, VALUE klass)
 			   &nth, &ry,
 			   &rm, &rd, &rjd,
 			   &ns))
-	    rb_raise(rb_eArgError, "invalid date");
+	    rb_raise(eDateError, "invalid date");
 
-	ret = d_simple_new_internal(klass,
-				    nth, rjd,
-				    sg,
-				    ry, rm, rd,
-				    HAVE_JD | HAVE_CIVIL);
+	set_to_simple(self, dat, nth, rjd, sg, ry, rm, rd, HAVE_JD | HAVE_CIVIL);
     }
+    ret = self;
     add_frac();
     return ret;
 }
@@ -3457,7 +3495,7 @@ date_s_civil(int argc, VALUE *argv, VALUE klass)
  *    Date.commercial(2002)	#=> #<Date: 2001-12-31 ...>
  *    Date.commercial(2001,5,6)	#=> #<Date: 2001-02-03 ...>
  *
- * See also jd and new.
+ * See also ::jd and ::new.
  */
 static VALUE
 date_s_commercial(int argc, VALUE *argv, VALUE klass)
@@ -3478,10 +3516,13 @@ date_s_commercial(int argc, VALUE *argv, VALUE klass)
       case 4:
 	val2sg(vsg, sg);
       case 3:
+        check_numeric(vd, "cwday");
 	num2int_with_frac(d, positive_inf);
       case 2:
+        check_numeric(vw, "cweek");
 	w = NUM2INT(vw);
       case 1:
+        check_numeric(vy, "year");
 	y = vy;
     }
 
@@ -3493,7 +3534,7 @@ date_s_commercial(int argc, VALUE *argv, VALUE klass)
 				&nth, &ry,
 				&rw, &rd, &rjd,
 				&ns))
-	    rb_raise(rb_eArgError, "invalid date");
+	    rb_raise(eDateError, "invalid date");
 
 	ret = d_simple_new_internal(klass,
 				    nth, rjd,
@@ -3543,7 +3584,7 @@ date_s_weeknum(int argc, VALUE *argv, VALUE klass)
 			     &nth, &ry,
 			     &rw, &rd, &rjd,
 			     &ns))
-	    rb_raise(rb_eArgError, "invalid date");
+	    rb_raise(eDateError, "invalid date");
 
 	ret = d_simple_new_internal(klass,
 				    nth, rjd,
@@ -3592,7 +3633,7 @@ date_s_nth_kday(int argc, VALUE *argv, VALUE klass)
 			      &nth, &ry,
 			      &rm, &rn, &rk, &rjd,
 			      &ns))
-	    rb_raise(rb_eArgError, "invalid date");
+	    rb_raise(eDateError, "invalid date");
 
 	ret = d_simple_new_internal(klass,
 				    nth, rjd,
@@ -3631,9 +3672,9 @@ static void set_sg(union DateData *, double);
  * call-seq:
  *    Date.today([start=Date::ITALY])  ->  date
  *
- *    Date.today		#=> #<Date: 2011-06-11 ..>
- *
  * Creates a date object denoting the present day.
+ *
+ *    Date.today   #=> #<Date: 2011-06-11 ...>
  */
 static VALUE
 date_s_today(int argc, VALUE *argv, VALUE klass)
@@ -3679,16 +3720,18 @@ date_s_today(int argc, VALUE *argv, VALUE klass)
 #define ref_hash0(k) rb_hash_aref(hash, k)
 #define del_hash0(k) rb_hash_delete(hash, k)
 
-#define set_hash(k,v) rb_hash_aset(hash, ID2SYM(rb_intern(k)), v)
-#define ref_hash(k) rb_hash_aref(hash, ID2SYM(rb_intern(k)))
-#define del_hash(k) rb_hash_delete(hash, ID2SYM(rb_intern(k)))
+#define sym(x) ID2SYM(rb_intern(x""))
+
+#define set_hash(k,v) set_hash0(sym(k), v)
+#define ref_hash(k) ref_hash0(sym(k))
+#define del_hash(k) del_hash0(sym(k))
 
 static VALUE
 rt_rewrite_frags(VALUE hash)
 {
     VALUE seconds;
 
-    seconds = ref_hash("seconds");
+    seconds = del_hash("seconds");
     if (!NIL_P(seconds)) {
 	VALUE offset, d, h, min, s, fr;
 
@@ -3713,13 +3756,10 @@ rt_rewrite_frags(VALUE hash)
 	set_hash("min", min);
 	set_hash("sec", s);
 	set_hash("sec_fraction", fr);
-	del_hash("seconds");
     }
     return hash;
 }
 
-#define sym(x) ID2SYM(rb_intern(x))
-
 static VALUE d_lite_year(VALUE);
 static VALUE d_lite_wday(VALUE);
 static VALUE d_lite_jd(VALUE);
@@ -3733,89 +3773,89 @@ rt_complete_frags(VALUE klass, VALUE hash)
     VALUE k, a, d;
 
     if (NIL_P(tab)) {
-	tab = rb_ary_new3(11,
-			  rb_ary_new3(2,
+	tab = f_frozen_ary(11,
+			  f_frozen_ary(2,
 				      sym("time"),
-				      rb_ary_new3(3,
+				      f_frozen_ary(3,
 						  sym("hour"),
 						  sym("min"),
 						  sym("sec"))),
-			  rb_ary_new3(2,
+			  f_frozen_ary(2,
 				      Qnil,
-				      rb_ary_new3(1,
+				      f_frozen_ary(1,
 						  sym("jd"))),
-			  rb_ary_new3(2,
+			  f_frozen_ary(2,
 				      sym("ordinal"),
-				      rb_ary_new3(5,
+				      f_frozen_ary(5,
 						  sym("year"),
 						  sym("yday"),
 						  sym("hour"),
 						  sym("min"),
 						  sym("sec"))),
-			  rb_ary_new3(2,
+			  f_frozen_ary(2,
 				      sym("civil"),
-				      rb_ary_new3(6,
+				      f_frozen_ary(6,
 						  sym("year"),
 						  sym("mon"),
 						  sym("mday"),
 						  sym("hour"),
 						  sym("min"),
 						  sym("sec"))),
-			  rb_ary_new3(2,
+			  f_frozen_ary(2,
 				      sym("commercial"),
-				      rb_ary_new3(6,
+				      f_frozen_ary(6,
 						  sym("cwyear"),
 						  sym("cweek"),
 						  sym("cwday"),
 						  sym("hour"),
 						  sym("min"),
 						  sym("sec"))),
-			  rb_ary_new3(2,
+			  f_frozen_ary(2,
 				      sym("wday"),
-				      rb_ary_new3(4,
+				      f_frozen_ary(4,
 						  sym("wday"),
 						  sym("hour"),
 						  sym("min"),
 						  sym("sec"))),
-			  rb_ary_new3(2,
+			  f_frozen_ary(2,
 				      sym("wnum0"),
-				      rb_ary_new3(6,
+				      f_frozen_ary(6,
 						  sym("year"),
 						  sym("wnum0"),
 						  sym("wday"),
 						  sym("hour"),
 						  sym("min"),
 						  sym("sec"))),
-			  rb_ary_new3(2,
+			  f_frozen_ary(2,
 				      sym("wnum1"),
-				      rb_ary_new3(6,
+				      f_frozen_ary(6,
 						  sym("year"),
 						  sym("wnum1"),
 						  sym("wday"),
 						  sym("hour"),
 						  sym("min"),
 						  sym("sec"))),
-			  rb_ary_new3(2,
+			  f_frozen_ary(2,
 				      Qnil,
-				      rb_ary_new3(6,
+				      f_frozen_ary(6,
 						  sym("cwyear"),
 						  sym("cweek"),
 						  sym("wday"),
 						  sym("hour"),
 						  sym("min"),
 						  sym("sec"))),
-			  rb_ary_new3(2,
+			  f_frozen_ary(2,
 				      Qnil,
-				      rb_ary_new3(6,
+				      f_frozen_ary(6,
 						  sym("year"),
 						  sym("wnum0"),
 						  sym("cwday"),
 						  sym("hour"),
 						  sym("min"),
 						  sym("sec"))),
-			  rb_ary_new3(2,
+			  f_frozen_ary(2,
 				      Qnil,
-				      rb_ary_new3(6,
+				      f_frozen_ary(6,
 						  sym("year"),
 						  sym("wnum1"),
 						  sym("cwday"),
@@ -4140,7 +4180,7 @@ d_new_by_frags(VALUE klass, VALUE hash, VALUE sg)
     }
 
     if (NIL_P(hash))
-	rb_raise(rb_eArgError, "invalid date");
+	rb_raise(eDateError, "invalid date");
 
     if (NIL_P(ref_hash("jd")) &&
 	NIL_P(ref_hash("yday")) &&
@@ -4157,7 +4197,7 @@ d_new_by_frags(VALUE klass, VALUE hash, VALUE sg)
     }
 
     if (NIL_P(jd))
-	rb_raise(rb_eArgError, "invalid date");
+	rb_raise(eDateError, "invalid date");
     {
 	VALUE nth;
 	int rjd;
@@ -4212,12 +4252,10 @@ date_s__strptime_internal(int argc, VALUE *argv, VALUE klass,
 
 	if (!NIL_P(zone)) {
 	    rb_enc_copy(zone, vstr);
-	    OBJ_INFECT(zone, vstr);
 	    set_hash("zone", zone);
 	}
 	if (!NIL_P(left)) {
 	    rb_enc_copy(left, vstr);
-	    OBJ_INFECT(left, vstr);
 	    set_hash("leftover", left);
 	}
     }
@@ -4236,7 +4274,7 @@ date_s__strptime_internal(int argc, VALUE *argv, VALUE klass,
  *    Date._strptime('2001-02-03', '%Y-%m-%d')
  *				#=> {:year=>2001, :mon=>2, :mday=>3}
  *
- *  See also strptime(3) and strftime.
+ * See also strptime(3) and #strftime.
  */
 static VALUE
 date_s__strptime(int argc, VALUE *argv, VALUE klass)
@@ -4246,7 +4284,7 @@ date_s__strptime(int argc, VALUE *argv, VALUE klass)
 
 /*
  * call-seq:
- *    Date.strptime([string='-4712-01-01'[, format='%F'[, start=ITALY]]])  ->  date
+ *    Date.strptime([string='-4712-01-01'[, format='%F'[, start=Date::ITALY]]])  ->  date
  *
  * Parses the given representation of date and time with the given
  * template, and creates a date object.  strptime does not support
@@ -4260,7 +4298,7 @@ date_s__strptime(int argc, VALUE *argv, VALUE klass)
  *    Date.strptime('2001 05 6', '%Y %W %u')	#=> #<Date: 2001-02-03 ...>
  *    Date.strptime('sat3feb01', '%a%d%b%y')	#=> #<Date: 2001-02-03 ...>
  *
- * See also strptime(3) and strftime.
+ * See also strptime(3) and #strftime.
  */
 static VALUE
 date_s_strptime(int argc, VALUE *argv, VALUE klass)
@@ -4290,12 +4328,40 @@ date_s_strptime(int argc, VALUE *argv, VALUE klass)
 
 VALUE date__parse(VALUE str, VALUE comp);
 
+static size_t
+get_limit(VALUE opt)
+{
+    if (!NIL_P(opt)) {
+        VALUE limit = rb_hash_aref(opt, ID2SYM(rb_intern("limit")));
+        if (NIL_P(limit)) return SIZE_MAX;
+        return NUM2SIZET(limit);
+    }
+    return 128;
+}
+
+static void
+check_limit(VALUE str, VALUE opt)
+{
+    if (NIL_P(str)) return;
+    if (SYMBOL_P(str)) str = rb_sym2str(str);
+
+    StringValue(str);
+    size_t slen = RSTRING_LEN(str);
+    size_t limit = get_limit(opt);
+    if (slen > limit) {
+	rb_raise(rb_eArgError,
+		 "string length (%"PRI_SIZE_PREFIX"u) exceeds the limit %"PRI_SIZE_PREFIX"u", slen, limit);
+    }
+}
+
 static VALUE
 date_s__parse_internal(int argc, VALUE *argv, VALUE klass)
 {
-    VALUE vstr, vcomp, hash;
+    VALUE vstr, vcomp, hash, opt;
 
-    rb_scan_args(argc, argv, "11", &vstr, &vcomp);
+    rb_scan_args(argc, argv, "11:", &vstr, &vcomp, &opt);
+    if (!NIL_P(opt)) argc--;
+    check_limit(vstr, opt);
     StringValue(vstr);
     if (!rb_enc_str_asciicompat_p(vstr))
 	rb_raise(rb_eArgError,
@@ -4305,32 +4371,30 @@ date_s__parse_internal(int argc, VALUE *argv, VALUE klass)
 
     hash = date__parse(vstr, vcomp);
 
-    {
-	VALUE zone = ref_hash("zone");
-
-	if (!NIL_P(zone)) {
-	    rb_enc_copy(zone, vstr);
-	    OBJ_INFECT(zone, vstr);
-	    set_hash("zone", zone);
-	}
-    }
-
     return hash;
 }
 
 /*
  * call-seq:
- *    Date._parse(string[, comp=true])  ->  hash
+ *    Date._parse(string[, comp=true], limit: 128)  ->  hash
  *
  * Parses the given representation of date and time, and returns a
- * hash of parsed elements.  This method does not function as a
- * validator.
+ * hash of parsed elements.
+ *
+ * This method **does not** function as a validator.  If the input
+ * string does not match valid formats strictly, you may get a cryptic
+ * result.  Should consider to use `Date._strptime` or
+ * `DateTime._strptime` instead of this method as possible.
  *
  * If the optional second argument is true and the detected year is in
  * the range "00" to "99", considers the year a 2-digit form and makes
  * it full.
  *
  *    Date._parse('2001-02-03')	#=> {:year=>2001, :mon=>2, :mday=>3}
+ *
+ * Raise an ArgumentError when the string length is longer than _limit_.
+ * You can stop this check by passing `limit: nil`, but note that
+ * it may take a long time to parse.
  */
 static VALUE
 date_s__parse(int argc, VALUE *argv, VALUE klass)
@@ -4340,10 +4404,15 @@ date_s__parse(int argc, VALUE *argv, VALUE klass)
 
 /*
  * call-seq:
- *    Date.parse(string='-4712-01-01'[, comp=true[, start=ITALY]])  ->  date
+ *    Date.parse(string='-4712-01-01'[, comp=true[, start=Date::ITALY]], limit: 128)  ->  date
  *
  * Parses the given representation of date and time, and creates a
- * date object.  This method does not function as a validator.
+ * date object.
+ *
+ * This method **does not** function as a validator.  If the input
+ * string does not match valid formats strictly, you may get a cryptic
+ * result.  Should consider to use `Date.strptime` instead of this
+ * method as possible.
  *
  * If the optional second argument is true and the detected year is in
  * the range "00" to "99", considers the year a 2-digit form and makes
@@ -4352,13 +4421,18 @@ date_s__parse(int argc, VALUE *argv, VALUE klass)
  *    Date.parse('2001-02-03')		#=> #<Date: 2001-02-03 ...>
  *    Date.parse('20010203')		#=> #<Date: 2001-02-03 ...>
  *    Date.parse('3rd Feb 2001')	#=> #<Date: 2001-02-03 ...>
+ *
+ * Raise an ArgumentError when the string length is longer than _limit_.
+ * You can stop this check by passing `limit: nil`, but note that
+ * it may take a long time to parse.
  */
 static VALUE
 date_s_parse(int argc, VALUE *argv, VALUE klass)
 {
-    VALUE str, comp, sg;
+    VALUE str, comp, sg, opt;
 
-    rb_scan_args(argc, argv, "03", &str, &comp, &sg);
+    rb_scan_args(argc, argv, "03:", &str, &comp, &sg, &opt);
+    if (!NIL_P(opt)) argc--;
 
     switch (argc) {
       case 0:
@@ -4370,11 +4444,12 @@ date_s_parse(int argc, VALUE *argv, VALUE klass)
     }
 
     {
-	VALUE argv2[2], hash;
-
-	argv2[0] = str;
-	argv2[1] = comp;
-	hash = date_s__parse(2, argv2, klass);
+        int argc2 = 2;
+	VALUE argv2[3];
+        argv2[0] = str;
+        argv2[1] = comp;
+        if (!NIL_P(opt)) argv2[argc2++] = opt;
+	VALUE hash = date_s__parse(argc2, argv2, klass);
 	return d_new_by_frags(klass, hash, sg);
     }
 }
@@ -4388,19 +4463,28 @@ VALUE date__jisx0301(VALUE);
 
 /*
  * call-seq:
- *    Date._iso8601(string)  ->  hash
+ *    Date._iso8601(string, limit: 128)  ->  hash
  *
  * Returns a hash of parsed elements.
+ *
+ * Raise an ArgumentError when the string length is longer than _limit_.
+ * You can stop this check by passing `limit: nil`, but note that
+ * it may take a long time to parse.
  */
 static VALUE
-date_s__iso8601(VALUE klass, VALUE str)
+date_s__iso8601(int argc, VALUE *argv, VALUE klass)
 {
+    VALUE str, opt;
+
+    rb_scan_args(argc, argv, "1:", &str, &opt);
+    check_limit(str, opt);
+
     return date__iso8601(str);
 }
 
 /*
  * call-seq:
- *    Date.iso8601(string='-4712-01-01'[, start=ITALY])  ->  date
+ *    Date.iso8601(string='-4712-01-01'[, start=Date::ITALY], limit: 128)  ->  date
  *
  * Creates a new Date object by parsing from a string according to
  * some typical ISO 8601 formats.
@@ -4408,13 +4492,18 @@ date_s__iso8601(VALUE klass, VALUE str)
  *    Date.iso8601('2001-02-03')	#=> #<Date: 2001-02-03 ...>
  *    Date.iso8601('20010203')		#=> #<Date: 2001-02-03 ...>
  *    Date.iso8601('2001-W05-6')	#=> #<Date: 2001-02-03 ...>
+ *
+ * Raise an ArgumentError when the string length is longer than _limit_.
+ * You can stop this check by passing `limit: nil`, but note that
+ * it may take a long time to parse.
  */
 static VALUE
 date_s_iso8601(int argc, VALUE *argv, VALUE klass)
 {
-    VALUE str, sg;
+    VALUE str, sg, opt;
 
-    rb_scan_args(argc, argv, "02", &str, &sg);
+    rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
+    if (!NIL_P(opt)) argc--;
 
     switch (argc) {
       case 0:
@@ -4424,38 +4513,56 @@ date_s_iso8601(int argc, VALUE *argv, VALUE klass)
     }
 
     {
-	VALUE hash = date_s__iso8601(klass, str);
+        int argc2 = 1;
+        VALUE argv2[2];
+        argv2[0] = str;
+        if (!NIL_P(opt)) argv2[argc2++] = opt;
+	VALUE hash = date_s__iso8601(argc2, argv2, klass);
 	return d_new_by_frags(klass, hash, sg);
     }
 }
 
 /*
  * call-seq:
- *    Date._rfc3339(string)  ->  hash
+ *    Date._rfc3339(string, limit: 128)  ->  hash
  *
  * Returns a hash of parsed elements.
+ *
+ * Raise an ArgumentError when the string length is longer than _limit_.
+ * You can stop this check by passing `limit: nil`, but note that
+ * it may take a long time to parse.
  */
 static VALUE
-date_s__rfc3339(VALUE klass, VALUE str)
+date_s__rfc3339(int argc, VALUE *argv, VALUE klass)
 {
+    VALUE str, opt;
+
+    rb_scan_args(argc, argv, "1:", &str, &opt);
+    check_limit(str, opt);
+
     return date__rfc3339(str);
 }
 
 /*
  * call-seq:
- *    Date.rfc3339(string='-4712-01-01T00:00:00+00:00'[, start=ITALY])  ->  date
+ *    Date.rfc3339(string='-4712-01-01T00:00:00+00:00'[, start=Date::ITALY], limit: 128)  ->  date
  *
  * Creates a new Date object by parsing from a string according to
  * some typical RFC 3339 formats.
  *
  *    Date.rfc3339('2001-02-03T04:05:06+07:00')	#=> #<Date: 2001-02-03 ...>
+ *
+ * Raise an ArgumentError when the string length is longer than _limit_.
+ * You can stop this check by passing `limit: nil`, but note that
+ * it may take a long time to parse.
  */
 static VALUE
 date_s_rfc3339(int argc, VALUE *argv, VALUE klass)
 {
-    VALUE str, sg;
+    VALUE str, sg, opt;
 
-    rb_scan_args(argc, argv, "02", &str, &sg);
+    rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
+    if (!NIL_P(opt)) argc--;
 
     switch (argc) {
       case 0:
@@ -4465,38 +4572,56 @@ date_s_rfc3339(int argc, VALUE *argv, VALUE klass)
     }
 
     {
-	VALUE hash = date_s__rfc3339(klass, str);
+        int argc2 = 1;
+        VALUE argv2[2];
+        argv2[0] = str;
+        if (!NIL_P(opt)) argv2[argc2++] = opt;
+	VALUE hash = date_s__rfc3339(argc2, argv2, klass);
 	return d_new_by_frags(klass, hash, sg);
     }
 }
 
 /*
  * call-seq:
- *    Date._xmlschema(string)  ->  hash
+ *    Date._xmlschema(string, limit: 128)  ->  hash
  *
  * Returns a hash of parsed elements.
+ *
+ * Raise an ArgumentError when the string length is longer than _limit_.
+ * You can stop this check by passing `limit: nil`, but note that
+ * it may take a long time to parse.
  */
 static VALUE
-date_s__xmlschema(VALUE klass, VALUE str)
+date_s__xmlschema(int argc, VALUE *argv, VALUE klass)
 {
+    VALUE str, opt;
+
+    rb_scan_args(argc, argv, "1:", &str, &opt);
+    check_limit(str, opt);
+
     return date__xmlschema(str);
 }
 
 /*
  * call-seq:
- *    Date.xmlschema(string='-4712-01-01'[, start=ITALY])  ->  date
+ *    Date.xmlschema(string='-4712-01-01'[, start=Date::ITALY], limit: 128)  ->  date
  *
  * Creates a new Date object by parsing from a string according to
  * some typical XML Schema formats.
  *
  *    Date.xmlschema('2001-02-03')	#=> #<Date: 2001-02-03 ...>
+ *
+ * Raise an ArgumentError when the string length is longer than _limit_.
+ * You can stop this check by passing `limit: nil`, but note that
+ * it may take a long time to parse.
  */
 static VALUE
 date_s_xmlschema(int argc, VALUE *argv, VALUE klass)
 {
-    VALUE str, sg;
+    VALUE str, sg, opt;
 
-    rb_scan_args(argc, argv, "02", &str, &sg);
+    rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
+    if (!NIL_P(opt)) argc--;
 
     switch (argc) {
       case 0:
@@ -4506,41 +4631,58 @@ date_s_xmlschema(int argc, VALUE *argv, VALUE klass)
     }
 
     {
-	VALUE hash = date_s__xmlschema(klass, str);
+        int argc2 = 1;
+        VALUE argv2[2];
+        argv2[0] = str;
+        if (!NIL_P(opt)) argv2[argc2++] = opt;
+	VALUE hash = date_s__xmlschema(argc2, argv2, klass);
 	return d_new_by_frags(klass, hash, sg);
     }
 }
 
 /*
  * call-seq:
- *    Date._rfc2822(string)  ->  hash
- *    Date._rfc822(string)   ->  hash
+ *    Date._rfc2822(string, limit: 128)  ->  hash
+ *    Date._rfc822(string, limit: 128)   ->  hash
  *
  * Returns a hash of parsed elements.
+ *
+ * Raise an ArgumentError when the string length is longer than _limit_.
+ * You can stop this check by passing `limit: nil`, but note that
+ * it may take a long time to parse.
  */
 static VALUE
-date_s__rfc2822(VALUE klass, VALUE str)
+date_s__rfc2822(int argc, VALUE *argv, VALUE klass)
 {
+    VALUE str, opt;
+
+    rb_scan_args(argc, argv, "1:", &str, &opt);
+    check_limit(str, opt);
+
     return date__rfc2822(str);
 }
 
 /*
  * call-seq:
- *    Date.rfc2822(string='Mon, 1 Jan -4712 00:00:00 +0000'[, start=ITALY])  ->  date
- *    Date.rfc822(string='Mon, 1 Jan -4712 00:00:00 +0000'[, start=ITALY])   ->  date
+ *    Date.rfc2822(string='Mon, 1 Jan -4712 00:00:00 +0000'[, start=Date::ITALY], limit: 128)  ->  date
+ *    Date.rfc822(string='Mon, 1 Jan -4712 00:00:00 +0000'[, start=Date::ITALY], limit: 128)   ->  date
  *
  * Creates a new Date object by parsing from a string according to
  * some typical RFC 2822 formats.
  *
  *    Date.rfc2822('Sat, 3 Feb 2001 00:00:00 +0000')
  *						#=> #<Date: 2001-02-03 ...>
+ *
+ * Raise an ArgumentError when the string length is longer than _limit_.
+ * You can stop this check by passing `limit: nil`, but note that
+ * it may take a long time to parse.
  */
 static VALUE
 date_s_rfc2822(int argc, VALUE *argv, VALUE klass)
 {
-    VALUE str, sg;
+    VALUE str, sg, opt;
 
-    rb_scan_args(argc, argv, "02", &str, &sg);
+    rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
 
     switch (argc) {
       case 0:
@@ -4550,39 +4692,56 @@ date_s_rfc2822(int argc, VALUE *argv, VALUE klass)
     }
 
     {
-	VALUE hash = date_s__rfc2822(klass, str);
+        int argc2 = 1;
+        VALUE argv2[2];
+        argv2[0] = str;
+        if (!NIL_P(opt)) argv2[argc2++] = opt;
+	VALUE hash = date_s__rfc2822(argc2, argv2, klass);
 	return d_new_by_frags(klass, hash, sg);
     }
 }
 
 /*
  * call-seq:
- *    Date._httpdate(string)  ->  hash
+ *    Date._httpdate(string, limit: 128)  ->  hash
  *
  * Returns a hash of parsed elements.
+ *
+ * Raise an ArgumentError when the string length is longer than _limit_.
+ * You can stop this check by passing `limit: nil`, but note that
+ * it may take a long time to parse.
  */
 static VALUE
-date_s__httpdate(VALUE klass, VALUE str)
+date_s__httpdate(int argc, VALUE *argv, VALUE klass)
 {
+    VALUE str, opt;
+
+    rb_scan_args(argc, argv, "1:", &str, &opt);
+    check_limit(str, opt);
+
     return date__httpdate(str);
 }
 
 /*
  * call-seq:
- *    Date.httpdate(string='Mon, 01 Jan -4712 00:00:00 GMT'[, start=ITALY])  ->  date
+ *    Date.httpdate(string='Mon, 01 Jan -4712 00:00:00 GMT'[, start=Date::ITALY], limit: 128)  ->  date
  *
  * Creates a new Date object by parsing from a string according to
  * some RFC 2616 format.
  *
  *    Date.httpdate('Sat, 03 Feb 2001 00:00:00 GMT')
  *						#=> #<Date: 2001-02-03 ...>
+ *
+ * Raise an ArgumentError when the string length is longer than _limit_.
+ * You can stop this check by passing `limit: nil`, but note that
+ * it may take a long time to parse.
  */
 static VALUE
 date_s_httpdate(int argc, VALUE *argv, VALUE klass)
 {
-    VALUE str, sg;
+    VALUE str, sg, opt;
 
-    rb_scan_args(argc, argv, "02", &str, &sg);
+    rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
 
     switch (argc) {
       case 0:
@@ -4592,38 +4751,60 @@ date_s_httpdate(int argc, VALUE *argv, VALUE klass)
     }
 
     {
-	VALUE hash = date_s__httpdate(klass, str);
+        int argc2 = 1;
+        VALUE argv2[2];
+        argv2[0] = str;
+        if (!NIL_P(opt)) argv2[argc2++] = opt;
+	VALUE hash = date_s__httpdate(argc2, argv2, klass);
 	return d_new_by_frags(klass, hash, sg);
     }
 }
 
 /*
  * call-seq:
- *    Date._jisx0301(string)  ->  hash
+ *    Date._jisx0301(string, limit: 128)  ->  hash
  *
  * Returns a hash of parsed elements.
+ *
+ * Raise an ArgumentError when the string length is longer than _limit_.
+ * You can stop this check by passing `limit: nil`, but note that
+ * it may take a long time to parse.
  */
 static VALUE
-date_s__jisx0301(VALUE klass, VALUE str)
+date_s__jisx0301(int argc, VALUE *argv, VALUE klass)
 {
+    VALUE str, opt;
+
+    rb_scan_args(argc, argv, "1:", &str, &opt);
+    check_limit(str, opt);
+
     return date__jisx0301(str);
 }
 
 /*
  * call-seq:
- *    Date.jisx0301(string='-4712-01-01'[, start=ITALY])  ->  date
+ *    Date.jisx0301(string='-4712-01-01'[, start=Date::ITALY], limit: 128)  ->  date
  *
  * Creates a new Date object by parsing from a string according to
  * some typical JIS X 0301 formats.
  *
  *    Date.jisx0301('H13.02.03')		#=> #<Date: 2001-02-03 ...>
+ *
+ * For no-era year, legacy format, Heisei is assumed.
+ *
+ *    Date.jisx0301('13.02.03') 		#=> #<Date: 2001-02-03 ...>
+ *
+ * Raise an ArgumentError when the string length is longer than _limit_.
+ * You can stop this check by passing `limit: nil`, but note that
+ * it may take a long time to parse.
  */
 static VALUE
 date_s_jisx0301(int argc, VALUE *argv, VALUE klass)
 {
-    VALUE str, sg;
+    VALUE str, sg, opt;
 
-    rb_scan_args(argc, argv, "02", &str, &sg);
+    rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
+    if (!NIL_P(opt)) argc--;
 
     switch (argc) {
       case 0:
@@ -4633,7 +4814,11 @@ date_s_jisx0301(int argc, VALUE *argv, VALUE klass)
     }
 
     {
-	VALUE hash = date_s__jisx0301(klass, str);
+        int argc2 = 1;
+        VALUE argv2[2];
+        argv2[0] = str;
+        if (!NIL_P(opt)) argv2[argc2++] = opt;
+	VALUE hash = date_s__jisx0301(argc2, argv2, klass);
 	return d_new_by_frags(klass, hash, sg);
     }
 }
@@ -4691,14 +4876,14 @@ dup_obj_as_complex(VALUE self)
 }
 
 #define val2off(vof,iof) \
-{\
+do {\
     if (!offset_to_sec(vof, &iof)) {\
 	iof = 0;\
 	rb_warning("invalid offset is ignored");\
     }\
-}
+} while (0)
 
-#ifndef NDEBUG
+#if 0
 static VALUE
 d_lite_initialize(int argc, VALUE *argv, VALUE self)
 {
@@ -4707,7 +4892,6 @@ d_lite_initialize(int argc, VALUE *argv, VALUE self)
     double sg;
 
     rb_check_frozen(self);
-    rb_check_trusted(self);
 
     rb_scan_args(argc, argv, "05", &vjd, &vdf, &vsf, &vof, &vsg);
 
@@ -4726,11 +4910,11 @@ d_lite_initialize(int argc, VALUE *argv, VALUE self)
 	sf = vsf;
 	if (f_lt_p(sf, INT2FIX(0)) ||
 	    f_ge_p(sf, INT2FIX(SECOND_IN_NANOSECONDS)))
-	    rb_raise(rb_eArgError, "invalid second fraction");
+	    rb_raise(eDateError, "invalid second fraction");
       case 2:
 	df = NUM2INT(vdf);
 	if (df < 0 || df >= DAY_IN_SECONDS)
-	    rb_raise(rb_eArgError, "invalid day fraction");
+	    rb_raise(eDateError, "invalid day fraction");
       case 1:
 	jd = vjd;
     }
@@ -4751,7 +4935,7 @@ d_lite_initialize(int argc, VALUE *argv, VALUE self)
 			 "cannot load complex into simple");
 
 	    set_to_complex(self, &dat->c, nth, rjd, df, sf, of, sg,
-			   0, 0, 0, 0, 0, 0, HAVE_JD | HAVE_DF | COMPLEX_DAT);
+			   0, 0, 0, 0, 0, 0, HAVE_JD | HAVE_DF);
 	}
     }
     return self;
@@ -4763,15 +4947,34 @@ static VALUE
 d_lite_initialize_copy(VALUE copy, VALUE date)
 {
     rb_check_frozen(copy);
-    rb_check_trusted(copy);
 
     if (copy == date)
 	return copy;
     {
 	get_d2(copy, date);
 	if (simple_dat_p(bdat)) {
-	    adat->s = bdat->s;
-	    adat->s.flags &= ~COMPLEX_DAT;
+	    if (simple_dat_p(adat)) {
+		adat->s = bdat->s;
+	    }
+	    else {
+		adat->c.flags = bdat->s.flags | COMPLEX_DAT;
+		adat->c.nth = bdat->s.nth;
+		adat->c.jd = bdat->s.jd;
+		adat->c.df = 0;
+		adat->c.sf = INT2FIX(0);
+		adat->c.of = 0;
+		adat->c.sg = bdat->s.sg;
+		adat->c.year = bdat->s.year;
+#ifndef USE_PACK
+		adat->c.mon = bdat->s.mon;
+		adat->c.mday = bdat->s.mday;
+		adat->c.hour = bdat->s.hour;
+		adat->c.min = bdat->s.min;
+		adat->c.sec = bdat->s.sec;
+#else
+		adat->c.pc = bdat->s.pc;
+#endif
+	    }
 	}
 	else {
 	    if (!complex_dat_p(adat))
@@ -4779,7 +4982,6 @@ d_lite_initialize_copy(VALUE copy, VALUE date)
 			 "cannot load complex into simple");
 
 	    adat->c = bdat->c;
-	    adat->c.flags |= COMPLEX_DAT;
 	}
     }
     return copy;
@@ -5380,7 +5582,7 @@ dup_obj_with_new_start(VALUE obj, double sg)
  * call-seq:
  *    d.new_start([start=Date::ITALY])  ->  date
  *
- * Duplicates self and resets its the day of calendar reform.
+ * Duplicates self and resets its day of calendar reform.
  *
  *    d = Date.new(1582,10,15)
  *    d.new_start(Date::JULIAN)		#=> #<Date: 1582-10-05 ...>
@@ -5498,9 +5700,9 @@ d_lite_new_offset(int argc, VALUE *argv, VALUE self)
  * call-seq:
  *    d + other  ->  date
  *
- * Returns a date object pointing other days after self.  The other
- * should be a numeric value.  If the other is flonum, assumes its
- * precision is at most nanosecond.
+ * Returns a date object pointing +other+ days after self.  The other
+ * should be a numeric value.  If the other is a fractional number,
+ * assumes its precision is at most nanosecond.
  *
  *    Date.new(2001,2,3) + 1	#=> #<Date: 2001-02-04 ...>
  *    DateTime.new(2001,2,3) + Rational(1,2)
@@ -5513,8 +5715,10 @@ d_lite_new_offset(int argc, VALUE *argv, VALUE self)
 static VALUE
 d_lite_plus(VALUE self, VALUE other)
 {
+    int try_rational = 1;
     get_d1(self);
 
+  again:
     switch (TYPE(other)) {
       case T_FIXNUM:
 	{
@@ -5724,18 +5928,21 @@ d_lite_plus(VALUE self, VALUE other)
       default:
 	expect_numeric(other);
 	other = f_to_r(other);
-#ifdef CANONICALIZATION_FOR_MATHN
-	if (!k_rational_p(other))
-	    return d_lite_plus(self, other);
-#endif
+	if (!k_rational_p(other)) {
+	    if (!try_rational) Check_Type(other, T_RATIONAL);
+	    try_rational = 0;
+	    goto again;
+	}
 	/* fall through */
       case T_RATIONAL:
 	{
 	    VALUE nth, sf, t;
 	    int jd, df, s;
 
-	    if (wholenum_p(other))
-		return d_lite_plus(self, rb_rational_num(other));
+	    if (wholenum_p(other)) {
+		other = rb_rational_num(other);
+		goto again;
+	    }
 
 	    if (f_positive_p(other))
 		s = +1;
@@ -5883,8 +6090,8 @@ minus_dd(VALUE self, VALUE other)
  *
  * Returns the difference between the two dates if the other is a date
  * object.  If the other is a numeric value, returns a date object
- * pointing other days before self.  If the other is flonum, assumes
- * its precision is at most nanosecond.
+ * pointing +other+ days before self.  If the other is a fractional number,
+ * assumes its precision is at most nanosecond.
  *
  *     Date.new(2001,2,3) - 1	#=> #<Date: 2001-02-02 ...>
  *     DateTime.new(2001,2,3) - Rational(1,2)
@@ -5965,12 +6172,24 @@ d_lite_next(VALUE self)
  * call-seq:
  *    d >> n  ->  date
  *
- * Returns a date object pointing n months after self.  The n should
- * be a numeric value.
+ * Returns a date object pointing +n+ months after self.
+ * The argument +n+ should be a numeric value.
+ *
+ *    Date.new(2001,2,3)  >>  1   #=> #<Date: 2001-03-03 ...>
+ *    Date.new(2001,2,3)  >> -2   #=> #<Date: 2000-12-03 ...>
+ *
+ * When the same day does not exist for the corresponding month,
+ * the last day of the month is used instead:
+ *
+ *    Date.new(2001,1,28) >> 1   #=> #<Date: 2001-02-28 ...>
+ *    Date.new(2001,1,31) >> 1   #=> #<Date: 2001-02-28 ...>
  *
- *    Date.new(2001,2,3) >> 1	#=> #<Date: 2001-03-03 ...>
- *    Date.new(2001,1,31) >> 1	#=> #<Date: 2001-02-28 ...>
- *    Date.new(2001,2,3) >> -2	#=> #<Date: 2000-12-03 ...>
+ * This also results in the following, possibly unexpected, behavior:
+ *
+ *    Date.new(2001,1,31) >> 2         #=> #<Date: 2001-03-31 ...>
+ *    Date.new(2001,1,31) >> 1 >> 1    #=> #<Date: 2001-03-28 ...>
+ *
+ *    Date.new(2001,1,31) >> 1 >> -1   #=> #<Date: 2001-01-28 ...>
  */
 static VALUE
 d_lite_rshift(VALUE self, VALUE other)
@@ -6005,7 +6224,7 @@ d_lite_rshift(VALUE self, VALUE other)
 			  &rm, &rd, &rjd, &ns))
 	    break;
 	if (--d < 1)
-	    rb_raise(rb_eArgError, "invalid date");
+	    rb_raise(eDateError, "invalid date");
     }
     encode_jd(nth, rjd, &rjd2);
     return d_lite_plus(self, f_sub(rjd2, m_real_local_jd(dat)));
@@ -6015,12 +6234,24 @@ d_lite_rshift(VALUE self, VALUE other)
  * call-seq:
  *    d << n  ->  date
  *
- * Returns a date object pointing n months before self.  The n should
- * be a numeric value.
+ * Returns a date object pointing +n+ months before self.
+ * The argument +n+ should be a numeric value.
+ *
+ *    Date.new(2001,2,3)  <<  1   #=> #<Date: 2001-01-03 ...>
+ *    Date.new(2001,2,3)  << -2   #=> #<Date: 2001-04-03 ...>
  *
- *    Date.new(2001,2,3) << 1	#=> #<Date: 2001-01-03 ...>
- *    Date.new(2001,1,31) << 11	#=> #<Date: 2000-02-29 ...>
- *    Date.new(2001,2,3) << -1	#=> #<Date: 2001-03-03 ...>
+ * When the same day does not exist for the corresponding month,
+ * the last day of the month is used instead:
+ *
+ *    Date.new(2001,3,28) << 1   #=> #<Date: 2001-02-28 ...>
+ *    Date.new(2001,3,31) << 1   #=> #<Date: 2001-02-28 ...>
+ *
+ * This also results in the following, possibly unexpected, behavior:
+ *
+ *    Date.new(2001,3,31) << 2         #=> #<Date: 2001-01-31 ...>
+ *    Date.new(2001,3,31) << 1 << 1    #=> #<Date: 2001-01-28 ...>
+ *
+ *    Date.new(2001,3,31) << 1 << -1   #=> #<Date: 2001-03-28 ...>
  */
 static VALUE
 d_lite_lshift(VALUE self, VALUE other)
@@ -6033,7 +6264,9 @@ d_lite_lshift(VALUE self, VALUE other)
  * call-seq:
  *    d.next_month([n=1])  ->  date
  *
- * This method is equivalent to d >> n
+ * This method is equivalent to d >> n.
+ *
+ * See Date#>> for examples.
  */
 static VALUE
 d_lite_next_month(int argc, VALUE *argv, VALUE self)
@@ -6050,7 +6283,9 @@ d_lite_next_month(int argc, VALUE *argv, VALUE self)
  * call-seq:
  *    d.prev_month([n=1])  ->  date
  *
- * This method is equivalent to d << n
+ * This method is equivalent to d << n.
+ *
+ * See Date#<< for examples.
  */
 static VALUE
 d_lite_prev_month(int argc, VALUE *argv, VALUE self)
@@ -6067,7 +6302,13 @@ d_lite_prev_month(int argc, VALUE *argv, VALUE self)
  * call-seq:
  *    d.next_year([n=1])  ->  date
  *
- * This method is equivalent to d >> (n * 12)
+ * This method is equivalent to d >> (n * 12).
+ *
+ *    Date.new(2001,2,3).next_year      #=> #<Date: 2002-02-03 ...>
+ *    Date.new(2008,2,29).next_year     #=> #<Date: 2009-02-28 ...>
+ *    Date.new(2008,2,29).next_year(4)  #=> #<Date: 2012-02-29 ...>
+ *
+ * See also Date#>>.
  */
 static VALUE
 d_lite_next_year(int argc, VALUE *argv, VALUE self)
@@ -6084,7 +6325,13 @@ d_lite_next_year(int argc, VALUE *argv, VALUE self)
  * call-seq:
  *    d.prev_year([n=1])  ->  date
  *
- * This method is equivalent to d << (n * 12)
+ * This method is equivalent to d << (n * 12).
+ *
+ *    Date.new(2001,2,3).prev_year      #=> #<Date: 2000-02-03 ...>
+ *    Date.new(2008,2,29).prev_year     #=> #<Date: 2007-02-28 ...>
+ *    Date.new(2008,2,29).prev_year(4)  #=> #<Date: 2004-02-29 ...>
+ *
+ * See also Date#<<.
  */
 static VALUE
 d_lite_prev_year(int argc, VALUE *argv, VALUE self)
@@ -6114,6 +6361,7 @@ static VALUE
 d_lite_step(int argc, VALUE *argv, VALUE self)
 {
     VALUE limit, step, date;
+    int c;
 
     rb_scan_args(argc, argv, "11", &limit, &step);
 
@@ -6128,25 +6376,22 @@ d_lite_step(int argc, VALUE *argv, VALUE self)
     RETURN_ENUMERATOR(self, argc, argv);
 
     date = self;
-    switch (FIX2INT(f_cmp(step, INT2FIX(0)))) {
-      case -1:
+    c = f_cmp(step, INT2FIX(0));
+    if (c < 0) {
 	while (FIX2INT(d_lite_cmp(date, limit)) >= 0) {
 	    rb_yield(date);
 	    date = d_lite_plus(date, step);
 	}
-	break;
-      case 0:
+    }
+    else if (c == 0) {
 	while (1)
 	    rb_yield(date);
-	break;
-      case 1:
+    }
+    else /* if (c > 0) */ {
 	while (FIX2INT(d_lite_cmp(date, limit)) <= 0) {
 	    rb_yield(date);
 	    date = d_lite_plus(date, step);
 	}
-	break;
-      default:
-	abort();
     }
     return self;
 }
@@ -6201,10 +6446,10 @@ cmp_gen(VALUE self, VALUE other)
     get_d1(self);
 
     if (k_numeric_p(other))
-	return f_cmp(m_ajd(dat), other);
+	return INT2FIX(f_cmp(m_ajd(dat), other));
     else if (k_date_p(other))
-	return f_cmp(m_ajd(dat), f_ajd(other));
-    return rb_num_coerce_cmp(self, other, rb_intern("<=>"));
+	return INT2FIX(f_cmp(m_ajd(dat), f_ajd(other)));
+    return rb_num_coerce_cmp(self, other, id_cmp);
 }
 
 static VALUE
@@ -6272,11 +6517,11 @@ cmp_dd(VALUE self, VALUE other)
  * should be a date object or a numeric value as an astronomical
  * Julian day number.
  *
- *    Date.new(2001,2,3) <=> Date.new(2001,2,4)	#=> -1
- *    Date.new(2001,2,3) <=> Date.new(2001,2,3)	#=> 0
- *    Date.new(2001,2,3) <=> Date.new(2001,2,2)	#=> 1
- *    Date.new(2001,2,3) <=> Object.new		#=> nil
- *    Date.new(2001,2,3) <=> Rational(4903887,2)#=> 0
+ *    Date.new(2001,2,3) <=> Date.new(2001,2,4)   #=> -1
+ *    Date.new(2001,2,3) <=> Date.new(2001,2,3)   #=> 0
+ *    Date.new(2001,2,3) <=> Date.new(2001,2,2)   #=> 1
+ *    Date.new(2001,2,3) <=> Object.new           #=> nil
+ *    Date.new(2001,2,3) <=> Rational(4903887,2)  #=> 0
  *
  * See also Comparable.
  */
@@ -6333,7 +6578,7 @@ equal_gen(VALUE self, VALUE other)
 	return f_eqeq_p(m_real_local_jd(dat), other);
     else if (k_date_p(other))
 	return f_eqeq_p(m_real_local_jd(dat), f_jd(other));
-    return rb_num_coerce_cmp(self, other, rb_intern("=="));
+    return rb_num_coerce_cmp(self, other, id_eqeq_p);
 }
 
 /*
@@ -6404,7 +6649,7 @@ d_lite_hash(VALUE self)
     h[2] = m_df(dat);
     h[3] = m_sf(dat);
     v = rb_memhash(h, sizeof(h));
-    return LONG2FIX(v);
+    return ST2FIX(v);
 }
 
 #include "date_tmx.h"
@@ -6416,8 +6661,8 @@ static VALUE strftimev(const char *, VALUE,
  * call-seq:
  *    d.to_s  ->  string
  *
- * Returns a string in an ISO 8601 format (This method doesn't use the
- * expanded representations).
+ * Returns a string in an ISO 8601 format. (This method doesn't use the
+ * expanded representations.)
  *
  *     Date.new(2001,2,3).to_s	#=> "2001-02-03"
  */
@@ -6431,7 +6676,7 @@ d_lite_to_s(VALUE self)
 static VALUE
 mk_inspect_raw(union DateData *x, VALUE klass)
 {
-    char flags[5];
+    char flags[6];
 
     flags[0] = (x->flags & COMPLEX_DAT) ? 'C' : 'S';
     flags[1] = (x->flags & HAVE_JD)     ? 'j' : '-';
@@ -6503,9 +6748,9 @@ mk_inspect(union DateData *x, VALUE klass, VALUE to_s)
  * Returns the value as a string for inspection.
  *
  *    Date.new(2001,2,3).inspect
- *		#=> "#<Date: 2001-02-03 ((2451944j,0s,0n),+0s,2299161j)>"
+ *		#=> "#<Date: 2001-02-03>"
  *    DateTime.new(2001,2,3,4,5,6,'-7').inspect
- *		#=> "#<DateTime: 2001-02-03T04:05:06-07:00 ((2451944j,39906s,0n),-25200s,2299161j)>"
+ *		#=> "#<DateTime: 2001-02-03T04:05:06-07:00>"
  */
 static VALUE
 d_lite_inspect(VALUE self)
@@ -6597,7 +6842,9 @@ tmx_m_of(union DateData *x)
 static char *
 tmx_m_zone(union DateData *x)
 {
-    return RSTRING_PTR(m_zone(x));
+    VALUE zone = m_zone(x);
+    /* TODO: fix potential dangling pointer */
+    return RSTRING_PTR(zone);
 }
 
 static const struct tmx_funcs tmx_funcs = {
@@ -6672,7 +6919,6 @@ date_strftime_internal(int argc, VALUE *argv, VALUE self,
 	    if (p > fmt) rb_str_cat(str, fmt, p - fmt);
 	}
 	rb_enc_copy(str, vfmt);
-	OBJ_INFECT(str, vfmt);
 	return str;
     }
     else
@@ -6681,7 +6927,6 @@ date_strftime_internal(int argc, VALUE *argv, VALUE self,
     str = rb_str_new(buf, len);
     if (buf != buffer) xfree(buf);
     rb_enc_copy(str, vfmt);
-    OBJ_INFECT(str, vfmt);
     return str;
 }
 
@@ -6691,13 +6936,13 @@ date_strftime_internal(int argc, VALUE *argv, VALUE self,
  *
  * Formats date according to the directives in the given format
  * string.
- * The directives begins with a percent (%) character.
+ * The directives begin with a percent (%) character.
  * Any text not listed as a directive will be passed through to the
  * output string.
  *
- * The directive consists of a percent (%) character,
- * zero or more flags, optional minimum field width,
- * optional modifier and a conversion specifier
+ * A directive consists of a percent (%) character,
+ * zero or more flags, an optional minimum field width,
+ * an optional modifier, and a conversion specifier
  * as follows.
  *
  *    %<flags><width><modifier><conversion>
@@ -6747,7 +6992,7 @@ date_strftime_internal(int argc, VALUE *argv, VALUE self,
  *
  *      %M - Minute of the hour (00..59)
  *
- *      %S - Second of the minute (00..59)
+ *      %S - Second of the minute (00..60)
  *
  *      %L - Millisecond of the second (000..999)
  *      %N - Fractional seconds digits, default is 9 digits (nanosecond)
@@ -6762,7 +7007,7 @@ date_strftime_internal(int argc, VALUE *argv, VALUE self,
  *              %::z - hour, minute and second offset from UTC (e.g. +09:00:00)
  *              %:::z - hour, minute and second offset from UTC
  *                                                (e.g. +09, +09:30, +09:30:30)
- *      %Z - Time zone abbreviation name or something similar information.
+ *      %Z - Equivalent to %:z (e.g. +09:00)
  *
  *    Weekday:
  *      %A - The full weekday name (``Sunday'')
@@ -6807,11 +7052,12 @@ date_strftime_internal(int argc, VALUE *argv, VALUE self,
  *      %T - 24-hour time (%H:%M:%S)
  *      %+ - date(1) (%a %b %e %H:%M:%S %Z %Y)
  *
- * This method is similar to strftime() function defined in ISO C and POSIX.
+ * This method is similar to the strftime() function defined in ISO C
+ * and POSIX.
  * Several directives (%a, %A, %b, %B, %c, %p, %r, %x, %X, %E*, %O* and %Z)
  * are locale dependent in the function.
- * However this method is locale independent.
- * So, the result may differ even if a same format string is used in other
+ * However, this method is locale independent.
+ * So, the result may differ even if the same format string is used in other
  * systems such as C.
  * It is good practice to avoid %x and %X because there are corresponding
  * locale independent representations, %D and %T.
@@ -6859,7 +7105,7 @@ date_strftime_internal(int argc, VALUE *argv, VALUE self,
  *    %GW%V%uT%H%M%z   => 2007W471T0837-0600        Week date and local time and difference from UTC (basic)
  *    %G-W%V-%uT%R%:z  => 2007-W47-1T08:37-06:00    Week date and local time and difference from UTC (extended)
  *
- * See also strftime(3) and strptime.
+ * See also strftime(3) and ::strptime.
  */
 static VALUE
 d_lite_strftime(int argc, VALUE *argv, VALUE self)
@@ -6979,10 +7225,14 @@ jisx0301_date_format(char *fmt, size_t size, VALUE jd, VALUE y)
 	    c = 'S';
 	    s = 1925;
 	}
-	else {
+	else if (d < 2458605) {
 	    c = 'H';
 	    s = 1988;
 	}
+	else {
+	    c = 'R';
+	    s = 2018;
+	}
 	snprintf(fmt, size, "%c%02ld" ".%%m.%%d", c, FIX2INT(y) - s);
 	return fmt;
     }
@@ -7060,10 +7310,13 @@ d_lite_marshal_dump(VALUE self)
 static VALUE
 d_lite_marshal_load(VALUE self, VALUE a)
 {
+    VALUE nth, sf;
+    int jd, df, of;
+    double sg;
+
     get_d1(self);
 
     rb_check_frozen(self);
-    rb_check_trusted(self);
 
     if (!RB_TYPE_P(a, T_ARRAY))
 	rb_raise(rb_eTypeError, "expected an array");
@@ -7072,63 +7325,33 @@ d_lite_marshal_load(VALUE self, VALUE a)
       case 2: /* 1.6.x */
       case 3: /* 1.8.x, 1.9.2 */
 	{
-	    VALUE ajd, of, sg, nth, sf;
-	    int jd, df, rof;
-	    double rsg;
-
+	    VALUE ajd, vof, vsg;
 
 	    if  (RARRAY_LEN(a) == 2) {
 		ajd = f_sub(RARRAY_AREF(a, 0), half_days_in_day);
-		of = INT2FIX(0);
-		sg = RARRAY_AREF(a, 1);
-		if (!k_numeric_p(sg))
-		    sg = DBL2NUM(RTEST(sg) ? GREGORIAN : JULIAN);
+		vof = INT2FIX(0);
+		vsg = RARRAY_AREF(a, 1);
+		if (!k_numeric_p(vsg))
+		    vsg = DBL2NUM(RTEST(vsg) ? GREGORIAN : JULIAN);
 	    }
 	    else {
 		ajd = RARRAY_AREF(a, 0);
-		of = RARRAY_AREF(a, 1);
-		sg = RARRAY_AREF(a, 2);
+		vof = RARRAY_AREF(a, 1);
+		vsg = RARRAY_AREF(a, 2);
 	    }
 
-	    old_to_new(ajd, of, sg,
-		       &nth, &jd, &df, &sf, &rof, &rsg);
-
-	    if (!df && f_zero_p(sf) && !rof) {
-		set_to_simple(self, &dat->s, nth, jd, rsg, 0, 0, 0, HAVE_JD);
-	    } else {
-		if (!complex_dat_p(dat))
-		    rb_raise(rb_eArgError,
-			     "cannot load complex into simple");
-
-		set_to_complex(self, &dat->c, nth, jd, df, sf, rof, rsg,
-			       0, 0, 0, 0, 0, 0,
-			       HAVE_JD | HAVE_DF | COMPLEX_DAT);
-	    }
+	    old_to_new(ajd, vof, vsg,
+		       &nth, &jd, &df, &sf, &of, &sg);
 	}
 	break;
       case 6:
 	{
-	    VALUE nth, sf;
-	    int jd, df, of;
-	    double sg;
-
 	    nth = RARRAY_AREF(a, 0);
 	    jd = NUM2INT(RARRAY_AREF(a, 1));
 	    df = NUM2INT(RARRAY_AREF(a, 2));
 	    sf = RARRAY_AREF(a, 3);
 	    of = NUM2INT(RARRAY_AREF(a, 4));
 	    sg = NUM2DBL(RARRAY_AREF(a, 5));
-	    if (!df && f_zero_p(sf) && !of) {
-		set_to_simple(self, &dat->s, nth, jd, sg, 0, 0, 0, HAVE_JD);
-	    } else {
-		if (!complex_dat_p(dat))
-		    rb_raise(rb_eArgError,
-			     "cannot load complex into simple");
-
-		set_to_complex(self, &dat->c, nth, jd, df, sf, of, sg,
-			       0, 0, 0, 0, 0, 0,
-			       HAVE_JD | HAVE_DF | COMPLEX_DAT);
-	    }
 	}
 	break;
       default:
@@ -7136,6 +7359,21 @@ d_lite_marshal_load(VALUE self, VALUE a)
 	break;
     }
 
+    if (simple_dat_p(dat)) {
+	if (df || !f_zero_p(sf) || of) {
+	    /* loading a fractional date; promote to complex */
+	    dat = ruby_xrealloc(dat, sizeof(struct ComplexDateData));
+	    RTYPEDDATA(self)->data = dat;
+	    goto complex_data;
+	}
+	set_to_simple(self, &dat->s, nth, jd, sg, 0, 0, 0, HAVE_JD);
+    } else {
+      complex_data:
+	set_to_complex(self, &dat->c, nth, jd, df, sf, of, sg,
+		       0, 0, 0, 0, 0, 0,
+		       HAVE_JD | HAVE_DF);
+    }
+
     if (FL_TEST(a, FL_EXIVAR)) {
 	rb_copy_generic_ivar(self, a);
 	FL_SET(self, FL_EXIVAR);
@@ -7161,7 +7399,7 @@ date_s__load(VALUE klass, VALUE s)
  * call-seq:
  *    DateTime.jd([jd=0[, hour=0[, minute=0[, second=0[, offset=0[, start=Date::ITALY]]]]]])  ->  datetime
  *
- * Creates a datetime object denoting the given chronological Julian
+ * Creates a DateTime object denoting the given chronological Julian
  * day number.
  *
  *    DateTime.jd(2451944)	#=> #<DateTime: 2001-02-03T00:00:00+00:00 ...>
@@ -7191,12 +7429,16 @@ datetime_s_jd(int argc, VALUE *argv, VALUE klass)
       case 5:
 	val2off(vof, rof);
       case 4:
+        check_numeric(vs, "second");
 	num2int_with_frac(s, positive_inf);
       case 3:
+        check_numeric(vmin, "minute");
 	num2int_with_frac(min, 3);
       case 2:
+        check_numeric(vh, "hour");
 	num2int_with_frac(h, 2);
       case 1:
+        check_numeric(vjd, "jd");
 	num2num_with_frac(jd, 1);
     }
 
@@ -7205,7 +7447,7 @@ datetime_s_jd(int argc, VALUE *argv, VALUE klass)
 	int rh, rmin, rs, rjd, rjd2;
 
 	if (!c_valid_time_p(h, min, s, &rh, &rmin, &rs))
-	    rb_raise(rb_eArgError, "invalid date");
+	    rb_raise(eDateError, "invalid date");
 	canon24oc();
 
 	decode_jd(jd, &nth, &rjd);
@@ -7229,7 +7471,7 @@ datetime_s_jd(int argc, VALUE *argv, VALUE klass)
  * call-seq:
  *    DateTime.ordinal([year=-4712[, yday=1[, hour=0[, minute=0[, second=0[, offset=0[, start=Date::ITALY]]]]]]])  ->  datetime
  *
- * Creates a date-time object denoting the given ordinal date.
+ * Creates a DateTime object denoting the given ordinal date.
  *
  *    DateTime.ordinal(2001,34)	#=> #<DateTime: 2001-02-03T00:00:00+00:00 ...>
  *    DateTime.ordinal(2001,34,4,5,6,'+7')
@@ -7260,14 +7502,19 @@ datetime_s_ordinal(int argc, VALUE *argv, VALUE klass)
       case 6:
 	val2off(vof, rof);
       case 5:
+        check_numeric(vs, "second");
 	num2int_with_frac(s, positive_inf);
       case 4:
+        check_numeric(vmin, "minute");
 	num2int_with_frac(min, 4);
       case 3:
+        check_numeric(vh, "hour");
 	num2int_with_frac(h, 3);
       case 2:
+        check_numeric(vd, "yday");
 	num2int_with_frac(d, 2);
       case 1:
+        check_numeric(vy, "year");
 	y = vy;
     }
 
@@ -7279,9 +7526,9 @@ datetime_s_ordinal(int argc, VALUE *argv, VALUE klass)
 			     &nth, &ry,
 			     &rd, &rjd,
 			     &ns))
-	    rb_raise(rb_eArgError, "invalid date");
+	    rb_raise(eDateError, "invalid date");
 	if (!c_valid_time_p(h, min, s, &rh, &rmin, &rs))
-	    rb_raise(rb_eArgError, "invalid date");
+	    rb_raise(eDateError, "invalid date");
 	canon24oc();
 
 	rjd2 = jd_local_to_utc(rjd,
@@ -7305,7 +7552,7 @@ datetime_s_ordinal(int argc, VALUE *argv, VALUE klass)
  *    DateTime.civil([year=-4712[, month=1[, mday=1[, hour=0[, minute=0[, second=0[, offset=0[, start=Date::ITALY]]]]]]]])  ->  datetime
  *    DateTime.new([year=-4712[, month=1[, mday=1[, hour=0[, minute=0[, second=0[, offset=0[, start=Date::ITALY]]]]]]]])    ->  datetime
  *
- * Creates a date-time object denoting the given calendar date.
+ * Creates a DateTime object denoting the given calendar date.
  *
  *    DateTime.new(2001,2,3)	#=> #<DateTime: 2001-02-03T00:00:00+00:00 ...>
  *    DateTime.new(2001,2,3,4,5,6,'+7')
@@ -7316,9 +7563,20 @@ datetime_s_ordinal(int argc, VALUE *argv, VALUE klass)
 static VALUE
 datetime_s_civil(int argc, VALUE *argv, VALUE klass)
 {
+    return datetime_initialize(argc, argv, d_lite_s_alloc_complex(klass));
+}
+
+static VALUE
+datetime_initialize(int argc, VALUE *argv, VALUE self)
+{
     VALUE vy, vm, vd, vh, vmin, vs, vof, vsg, y, fr, fr2, ret;
     int m, d, h, min, s, rof;
     double sg;
+    struct ComplexDateData *dat = rb_check_typeddata(self, &d_lite_type);
+
+    if (!complex_dat_p(dat)) {
+	rb_raise(rb_eTypeError, "DateTime expected");
+    }
 
     rb_scan_args(argc, argv, "08", &vy, &vm, &vd, &vh, &vmin, &vs, &vof, &vsg);
 
@@ -7337,16 +7595,22 @@ datetime_s_civil(int argc, VALUE *argv, VALUE klass)
       case 7:
 	val2off(vof, rof);
       case 6:
+        check_numeric(vs, "second");
 	num2int_with_frac(s, positive_inf);
       case 5:
+        check_numeric(vmin, "minute");
 	num2int_with_frac(min, 5);
       case 4:
+        check_numeric(vh, "hour");
 	num2int_with_frac(h, 4);
       case 3:
+        check_numeric(vd, "day");
 	num2int_with_frac(d, 3);
       case 2:
+        check_numeric(vm, "month");
 	m = NUM2INT(vm);
       case 1:
+        check_numeric(vy, "year");
 	y = vy;
     }
 
@@ -7357,18 +7621,18 @@ datetime_s_civil(int argc, VALUE *argv, VALUE klass)
 	if (!valid_gregorian_p(y, m, d,
 			       &nth, &ry,
 			       &rm, &rd))
-	    rb_raise(rb_eArgError, "invalid date");
+	    rb_raise(eDateError, "invalid date");
 	if (!c_valid_time_p(h, min, s, &rh, &rmin, &rs))
-	    rb_raise(rb_eArgError, "invalid date");
+	    rb_raise(eDateError, "invalid date");
 	canon24oc();
 
-	ret = d_complex_new_internal(klass,
-				     nth, 0,
-				     0, INT2FIX(0),
-				     rof, sg,
-				     ry, rm, rd,
-				     rh, rmin, rs,
-				     HAVE_CIVIL | HAVE_TIME);
+	set_to_complex(self, dat,
+		       nth, 0,
+		       0, INT2FIX(0),
+		       rof, sg,
+		       ry, rm, rd,
+		       rh, rmin, rs,
+		       HAVE_CIVIL | HAVE_TIME);
     }
     else {
 	VALUE nth;
@@ -7378,23 +7642,24 @@ datetime_s_civil(int argc, VALUE *argv, VALUE klass)
 			   &nth, &ry,
 			   &rm, &rd, &rjd,
 			   &ns))
-	    rb_raise(rb_eArgError, "invalid date");
+	    rb_raise(eDateError, "invalid date");
 	if (!c_valid_time_p(h, min, s, &rh, &rmin, &rs))
-	    rb_raise(rb_eArgError, "invalid date");
+	    rb_raise(eDateError, "invalid date");
 	canon24oc();
 
 	rjd2 = jd_local_to_utc(rjd,
 			       time_to_df(rh, rmin, rs),
 			       rof);
 
-	ret = d_complex_new_internal(klass,
-				     nth, rjd2,
-				     0, INT2FIX(0),
-				     rof, sg,
-				     ry, rm, rd,
-				     rh, rmin, rs,
-				     HAVE_JD | HAVE_CIVIL | HAVE_TIME);
+	set_to_complex(self, dat,
+		       nth, rjd2,
+		       0, INT2FIX(0),
+		       rof, sg,
+		       ry, rm, rd,
+		       rh, rmin, rs,
+		       HAVE_JD | HAVE_CIVIL | HAVE_TIME);
     }
+    ret = self;
     add_frac();
     return ret;
 }
@@ -7403,7 +7668,7 @@ datetime_s_civil(int argc, VALUE *argv, VALUE klass)
  * call-seq:
  *    DateTime.commercial([cwyear=-4712[, cweek=1[, cwday=1[, hour=0[, minute=0[, second=0[, offset=0[, start=Date::ITALY]]]]]]]])  ->  datetime
  *
- * Creates a date-time object denoting the given week date.
+ * Creates a DateTime object denoting the given week date.
  *
  *    DateTime.commercial(2001)	#=> #<DateTime: 2001-01-01T00:00:00+00:00 ...>
  *    DateTime.commercial(2002)	#=> #<DateTime: 2001-12-31T00:00:00+00:00 ...>
@@ -7434,16 +7699,22 @@ datetime_s_commercial(int argc, VALUE *argv, VALUE klass)
       case 7:
 	val2off(vof, rof);
       case 6:
+        check_numeric(vs, "second");
 	num2int_with_frac(s, positive_inf);
       case 5:
+        check_numeric(vmin, "minute");
 	num2int_with_frac(min, 5);
       case 4:
+        check_numeric(vh, "hour");
 	num2int_with_frac(h, 4);
       case 3:
+        check_numeric(vd, "cwday");
 	num2int_with_frac(d, 3);
       case 2:
+        check_numeric(vw, "cweek");
 	w = NUM2INT(vw);
       case 1:
+        check_numeric(vy, "year");
 	y = vy;
     }
 
@@ -7455,9 +7726,9 @@ datetime_s_commercial(int argc, VALUE *argv, VALUE klass)
 				&nth, &ry,
 				&rw, &rd, &rjd,
 				&ns))
-	    rb_raise(rb_eArgError, "invalid date");
+	    rb_raise(eDateError, "invalid date");
 	if (!c_valid_time_p(h, min, s, &rh, &rmin, &rs))
-	    rb_raise(rb_eArgError, "invalid date");
+	    rb_raise(eDateError, "invalid date");
 	canon24oc();
 
 	rjd2 = jd_local_to_utc(rjd,
@@ -7526,9 +7797,9 @@ datetime_s_weeknum(int argc, VALUE *argv, VALUE klass)
 			     &nth, &ry,
 			     &rw, &rd, &rjd,
 			     &ns))
-	    rb_raise(rb_eArgError, "invalid date");
+	    rb_raise(eDateError, "invalid date");
 	if (!c_valid_time_p(h, min, s, &rh, &rmin, &rs))
-	    rb_raise(rb_eArgError, "invalid date");
+	    rb_raise(eDateError, "invalid date");
 	canon24oc();
 
 	rjd2 = jd_local_to_utc(rjd,
@@ -7595,9 +7866,9 @@ datetime_s_nth_kday(int argc, VALUE *argv, VALUE klass)
 			      &nth, &ry,
 			      &rm, &rn, &rk, &rjd,
 			      &ns))
-	    rb_raise(rb_eArgError, "invalid date");
+	    rb_raise(eDateError, "invalid date");
 	if (!c_valid_time_p(h, min, s, &rh, &rmin, &rs))
-	    rb_raise(rb_eArgError, "invalid date");
+	    rb_raise(eDateError, "invalid date");
 	canon24oc();
 
 	rjd2 = jd_local_to_utc(rjd,
@@ -7620,7 +7891,7 @@ datetime_s_nth_kday(int argc, VALUE *argv, VALUE klass)
  * call-seq:
  *    DateTime.now([start=Date::ITALY])  ->  datetime
  *
- * Creates a date-time object denoting the present time.
+ * Creates a DateTime object denoting the present time.
  *
  *    DateTime.now		#=> #<DateTime: 2011-06-11T21:20:44+09:00 ...>
  */
@@ -7669,8 +7940,8 @@ datetime_s_now(int argc, VALUE *argv, VALUE klass)
 	s = 59;
 #ifdef HAVE_STRUCT_TM_TM_GMTOFF
     of = tm.tm_gmtoff;
-#elif defined(HAVE_VAR_TIMEZONE)
-#ifdef HAVE_VAR_ALTZONE
+#elif defined(HAVE_TIMEZONE)
+#ifdef HAVE_ALTZONE
     of = (long)-((tm.tm_isdst > 0) ? altzone : timezone);
 #else
     of = (long)-timezone;
@@ -7740,7 +8011,7 @@ dt_new_by_frags(VALUE klass, VALUE hash, VALUE sg)
     }
 
     if (NIL_P(hash))
-	rb_raise(rb_eArgError, "invalid date");
+	rb_raise(eDateError, "invalid date");
 
     if (NIL_P(ref_hash("jd")) &&
 	NIL_P(ref_hash("yday")) &&
@@ -7767,7 +8038,7 @@ dt_new_by_frags(VALUE klass, VALUE hash, VALUE sg)
     }
 
     if (NIL_P(jd))
-	rb_raise(rb_eArgError, "invalid date");
+	rb_raise(eDateError, "invalid date");
 
     {
 	int rh, rmin, rs;
@@ -7776,7 +8047,7 @@ dt_new_by_frags(VALUE klass, VALUE hash, VALUE sg)
 			    NUM2INT(ref_hash("min")),
 			    NUM2INT(ref_hash("sec")),
 			    &rh, &rmin, &rs))
-	    rb_raise(rb_eArgError, "invalid date");
+	    rb_raise(eDateError, "invalid date");
 
 	df = time_to_df(rh, rmin, rs);
     }
@@ -7823,7 +8094,7 @@ dt_new_by_frags(VALUE klass, VALUE hash, VALUE sg)
  * template, and returns a hash of parsed elements.  _strptime does
  * not support specification of flags and width unlike strftime.
  *
- *  See also strptime(3) and strftime.
+ * See also strptime(3) and #strftime.
  */
 static VALUE
 datetime_s__strptime(int argc, VALUE *argv, VALUE klass)
@@ -7833,10 +8104,10 @@ datetime_s__strptime(int argc, VALUE *argv, VALUE klass)
 
 /*
  * call-seq:
- *    DateTime.strptime([string='-4712-01-01T00:00:00+00:00'[, format='%FT%T%z'[ ,start=ITALY]]])  ->  datetime
+ *    DateTime.strptime([string='-4712-01-01T00:00:00+00:00'[, format='%FT%T%z'[ ,start=Date::ITALY]]])  ->  datetime
  *
  * Parses the given representation of date and time with the given
- * template, and creates a date object.  strptime does not support
+ * template, and creates a DateTime object.  strptime does not support
  * specification of flags and width unlike strftime.
  *
  *    DateTime.strptime('2001-02-03T04:05:06+07:00', '%Y-%m-%dT%H:%M:%S%z')
@@ -7856,7 +8127,7 @@ datetime_s__strptime(int argc, VALUE *argv, VALUE klass)
  *    DateTime.strptime('sat3feb014pm+7', '%a%d%b%y%H%p%z')
  *				#=> #<DateTime: 2001-02-03T16:00:00+07:00 ...>
  *
- * See also strptime(3) and strftime.
+ * See also strptime(3) and #strftime.
  */
 static VALUE
 datetime_s_strptime(int argc, VALUE *argv, VALUE klass)
@@ -7886,10 +8157,15 @@ datetime_s_strptime(int argc, VALUE *argv, VALUE klass)
 
 /*
  * call-seq:
- *    DateTime.parse(string='-4712-01-01T00:00:00+00:00'[, comp=true[, start=ITALY]])  ->  datetime
+ *    DateTime.parse(string='-4712-01-01T00:00:00+00:00'[, comp=true[, start=Date::ITALY]], limit: 128)  ->  datetime
  *
  * Parses the given representation of date and time, and creates a
- * date object.  This method does not function as a validator.
+ * DateTime object.
+ *
+ * This method **does not** function as a validator.  If the input
+ * string does not match valid formats strictly, you may get a cryptic
+ * result.  Should consider to use `DateTime.strptime` instead of this
+ * method as possible.
  *
  * If the optional second argument is true and the detected year is in
  * the range "00" to "99", makes it full.
@@ -7900,13 +8176,18 @@ datetime_s_strptime(int argc, VALUE *argv, VALUE klass)
  *				#=> #<DateTime: 2001-02-03T04:05:06+07:00 ...>
  *    DateTime.parse('3rd Feb 2001 04:05:06 PM')
  *				#=> #<DateTime: 2001-02-03T16:05:06+00:00 ...>
+ *
+ * Raise an ArgumentError when the string length is longer than _limit_.
+ * You can stop this check by passing `limit: nil`, but note that
+ * it may take a long time to parse.
  */
 static VALUE
 datetime_s_parse(int argc, VALUE *argv, VALUE klass)
 {
-    VALUE str, comp, sg;
+    VALUE str, comp, sg, opt;
 
-    rb_scan_args(argc, argv, "03", &str, &comp, &sg);
+    rb_scan_args(argc, argv, "03:", &str, &comp, &sg, &opt);
+    if (!NIL_P(opt)) argc--;
 
     switch (argc) {
       case 0:
@@ -7918,20 +8199,22 @@ datetime_s_parse(int argc, VALUE *argv, VALUE klass)
     }
 
     {
-	VALUE argv2[2], hash;
-
-	argv2[0] = str;
-	argv2[1] = comp;
-	hash = date_s__parse(2, argv2, klass);
+        int argc2 = 2;
+        VALUE argv2[3];
+        argv2[0] = str;
+        argv2[1] = comp;
+        argv2[2] = opt;
+        if (!NIL_P(opt)) argc2++;
+	VALUE hash = date_s__parse(argc2, argv2, klass);
 	return dt_new_by_frags(klass, hash, sg);
     }
 }
 
 /*
  * call-seq:
- *    DateTime.iso8601(string='-4712-01-01T00:00:00+00:00'[, start=ITALY])  ->  datetime
+ *    DateTime.iso8601(string='-4712-01-01T00:00:00+00:00'[, start=Date::ITALY], limit: 128)  ->  datetime
  *
- * Creates a new Date object by parsing from a string according to
+ * Creates a new DateTime object by parsing from a string according to
  * some typical ISO 8601 formats.
  *
  *    DateTime.iso8601('2001-02-03T04:05:06+07:00')
@@ -7940,13 +8223,18 @@ datetime_s_parse(int argc, VALUE *argv, VALUE klass)
  *				#=> #<DateTime: 2001-02-03T04:05:06+07:00 ...>
  *    DateTime.iso8601('2001-W05-6T04:05:06+07:00')
  *				#=> #<DateTime: 2001-02-03T04:05:06+07:00 ...>
+ *
+ * Raise an ArgumentError when the string length is longer than _limit_.
+ * You can stop this check by passing `limit: nil`, but note that
+ * it may take a long time to parse.
  */
 static VALUE
 datetime_s_iso8601(int argc, VALUE *argv, VALUE klass)
 {
-    VALUE str, sg;
+    VALUE str, sg, opt;
 
-    rb_scan_args(argc, argv, "02", &str, &sg);
+    rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
+    if (!NIL_P(opt)) argc--;
 
     switch (argc) {
       case 0:
@@ -7956,27 +8244,37 @@ datetime_s_iso8601(int argc, VALUE *argv, VALUE klass)
     }
 
     {
-	VALUE hash = date_s__iso8601(klass, str);
+        int argc2 = 1;
+        VALUE argv2[2];
+        argv2[0] = str;
+        argv2[1] = opt;
+        if (!NIL_P(opt)) argc2--;
+	VALUE hash = date_s__iso8601(argc2, argv2, klass);
 	return dt_new_by_frags(klass, hash, sg);
     }
 }
 
 /*
  * call-seq:
- *    DateTime.rfc3339(string='-4712-01-01T00:00:00+00:00'[, start=ITALY])  ->  datetime
+ *    DateTime.rfc3339(string='-4712-01-01T00:00:00+00:00'[, start=Date::ITALY], limit: 128)  ->  datetime
  *
- * Creates a new Date object by parsing from a string according to
+ * Creates a new DateTime object by parsing from a string according to
  * some typical RFC 3339 formats.
  *
  *    DateTime.rfc3339('2001-02-03T04:05:06+07:00')
  *				#=> #<DateTime: 2001-02-03T04:05:06+07:00 ...>
+ *
+ * Raise an ArgumentError when the string length is longer than _limit_.
+ * You can stop this check by passing `limit: nil`, but note that
+ * it may take a long time to parse.
  */
 static VALUE
 datetime_s_rfc3339(int argc, VALUE *argv, VALUE klass)
 {
-    VALUE str, sg;
+    VALUE str, sg, opt;
 
-    rb_scan_args(argc, argv, "02", &str, &sg);
+    rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
+    if (!NIL_P(opt)) argc--;
 
     switch (argc) {
       case 0:
@@ -7986,27 +8284,37 @@ datetime_s_rfc3339(int argc, VALUE *argv, VALUE klass)
     }
 
     {
-	VALUE hash = date_s__rfc3339(klass, str);
+        int argc2 = 1;
+        VALUE argv2[2];
+        argv2[0] = str;
+        argv2[1] = opt;
+        if (!NIL_P(opt)) argc2++;
+	VALUE hash = date_s__rfc3339(argc2, argv2, klass);
 	return dt_new_by_frags(klass, hash, sg);
     }
 }
 
 /*
  * call-seq:
- *    DateTime.xmlschema(string='-4712-01-01T00:00:00+00:00'[, start=ITALY])  ->  datetime
+ *    DateTime.xmlschema(string='-4712-01-01T00:00:00+00:00'[, start=Date::ITALY], limit: 128)  ->  datetime
  *
- * Creates a new Date object by parsing from a string according to
+ * Creates a new DateTime object by parsing from a string according to
  * some typical XML Schema formats.
  *
  *    DateTime.xmlschema('2001-02-03T04:05:06+07:00')
  *				#=> #<DateTime: 2001-02-03T04:05:06+07:00 ...>
+ *
+ * Raise an ArgumentError when the string length is longer than _limit_.
+ * You can stop this check by passing `limit: nil`, but note that
+ * it may take a long time to parse.
  */
 static VALUE
 datetime_s_xmlschema(int argc, VALUE *argv, VALUE klass)
 {
-    VALUE str, sg;
+    VALUE str, sg, opt;
 
-    rb_scan_args(argc, argv, "02", &str, &sg);
+    rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
+    if (!NIL_P(opt)) argc--;
 
     switch (argc) {
       case 0:
@@ -8016,28 +8324,38 @@ datetime_s_xmlschema(int argc, VALUE *argv, VALUE klass)
     }
 
     {
-	VALUE hash = date_s__xmlschema(klass, str);
+        int argc2 = 1;
+        VALUE argv2[2];
+        argv2[0] = str;
+        argv2[1] = opt;
+        if (!NIL_P(opt)) argc2++;
+	VALUE hash = date_s__xmlschema(argc2, argv2, klass);
 	return dt_new_by_frags(klass, hash, sg);
     }
 }
 
 /*
  * call-seq:
- *    DateTime.rfc2822(string='Mon, 1 Jan -4712 00:00:00 +0000'[, start=ITALY])  ->  datetime
- *    DateTime.rfc822(string='Mon, 1 Jan -4712 00:00:00 +0000'[, start=ITALY])   ->  datetime
+ *    DateTime.rfc2822(string='Mon, 1 Jan -4712 00:00:00 +0000'[, start=Date::ITALY], limit: 128)  ->  datetime
+ *    DateTime.rfc822(string='Mon, 1 Jan -4712 00:00:00 +0000'[, start=Date::ITALY], limit: 128)   ->  datetime
  *
- * Creates a new Date object by parsing from a string according to
+ * Creates a new DateTime object by parsing from a string according to
  * some typical RFC 2822 formats.
  *
  *     DateTime.rfc2822('Sat, 3 Feb 2001 04:05:06 +0700')
  *				#=> #<DateTime: 2001-02-03T04:05:06+07:00 ...>
+ *
+ * Raise an ArgumentError when the string length is longer than _limit_.
+ * You can stop this check by passing `limit: nil`, but note that
+ * it may take a long time to parse.
  */
 static VALUE
 datetime_s_rfc2822(int argc, VALUE *argv, VALUE klass)
 {
-    VALUE str, sg;
+    VALUE str, sg, opt;
 
-    rb_scan_args(argc, argv, "02", &str, &sg);
+    rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
+    if (!NIL_P(opt)) argc--;
 
     switch (argc) {
       case 0:
@@ -8047,27 +8365,37 @@ datetime_s_rfc2822(int argc, VALUE *argv, VALUE klass)
     }
 
     {
-	VALUE hash = date_s__rfc2822(klass, str);
+        int argc2 = 1;
+        VALUE argv2[2];
+        argv2[0] = str;
+        argv2[1] = opt;
+        if (!NIL_P(opt)) argc2++;
+	VALUE hash = date_s__rfc2822(argc2, argv2, klass);
 	return dt_new_by_frags(klass, hash, sg);
     }
 }
 
 /*
  * call-seq:
- *    DateTime.httpdate(string='Mon, 01 Jan -4712 00:00:00 GMT'[, start=ITALY])  ->  datetime
+ *    DateTime.httpdate(string='Mon, 01 Jan -4712 00:00:00 GMT'[, start=Date::ITALY])  ->  datetime
  *
- * Creates a new Date object by parsing from a string according to
+ * Creates a new DateTime object by parsing from a string according to
  * some RFC 2616 format.
  *
  *    DateTime.httpdate('Sat, 03 Feb 2001 04:05:06 GMT')
  *				#=> #<DateTime: 2001-02-03T04:05:06+00:00 ...>
+ *
+ * Raise an ArgumentError when the string length is longer than _limit_.
+ * You can stop this check by passing `limit: nil`, but note that
+ * it may take a long time to parse.
  */
 static VALUE
 datetime_s_httpdate(int argc, VALUE *argv, VALUE klass)
 {
-    VALUE str, sg;
+    VALUE str, sg, opt;
 
-    rb_scan_args(argc, argv, "02", &str, &sg);
+    rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
+    if (!NIL_P(opt)) argc--;
 
     switch (argc) {
       case 0:
@@ -8077,27 +8405,42 @@ datetime_s_httpdate(int argc, VALUE *argv, VALUE klass)
     }
 
     {
-	VALUE hash = date_s__httpdate(klass, str);
+        int argc2 = 1;
+        VALUE argv2[2];
+        argv2[0] = str;
+        argv2[1] = opt;
+        if (!NIL_P(opt)) argc2++;
+	VALUE hash = date_s__httpdate(argc2, argv2, klass);
 	return dt_new_by_frags(klass, hash, sg);
     }
 }
 
 /*
  * call-seq:
- *    DateTime.jisx0301(string='-4712-01-01T00:00:00+00:00'[, start=ITALY])  ->  datetime
+ *    DateTime.jisx0301(string='-4712-01-01T00:00:00+00:00'[, start=Date::ITALY], limit: 128)  ->  datetime
  *
- * Creates a new Date object by parsing from a string according to
+ * Creates a new DateTime object by parsing from a string according to
  * some typical JIS X 0301 formats.
  *
  *    DateTime.jisx0301('H13.02.03T04:05:06+07:00')
  *				#=> #<DateTime: 2001-02-03T04:05:06+07:00 ...>
+ *
+ * For no-era year, legacy format, Heisei is assumed.
+ *
+ *    DateTime.jisx0301('13.02.03T04:05:06+07:00')
+ *				#=> #<DateTime: 2001-02-03T04:05:06+07:00 ...>
+ *
+ * Raise an ArgumentError when the string length is longer than _limit_.
+ * You can stop this check by passing `limit: nil`, but note that
+ * it may take a long time to parse.
  */
 static VALUE
 datetime_s_jisx0301(int argc, VALUE *argv, VALUE klass)
 {
-    VALUE str, sg;
+    VALUE str, sg, opt;
 
-    rb_scan_args(argc, argv, "02", &str, &sg);
+    rb_scan_args(argc, argv, "02:", &str, &sg, &opt);
+    if (!NIL_P(opt)) argc--;
 
     switch (argc) {
       case 0:
@@ -8107,7 +8450,12 @@ datetime_s_jisx0301(int argc, VALUE *argv, VALUE klass)
     }
 
     {
-	VALUE hash = date_s__jisx0301(klass, str);
+        int argc2 = 1;
+        VALUE argv2[2];
+        argv2[0] = str;
+        argv2[1] = opt;
+        if (!NIL_P(opt)) argc2++;
+	VALUE hash = date_s__jisx0301(argc2, argv2, klass);
 	return dt_new_by_frags(klass, hash, sg);
     }
 }
@@ -8116,8 +8464,8 @@ datetime_s_jisx0301(int argc, VALUE *argv, VALUE klass)
  * call-seq:
  *    dt.to_s  ->  string
  *
- * Returns a string in an ISO 8601 format (This method doesn't use the
- * expanded representations).
+ * Returns a string in an ISO 8601 format. (This method doesn't use the
+ * expanded representations.)
  *
  *     DateTime.new(2001,2,3,4,5,6,'-7').to_s
  *				#=> "2001-02-03T04:05:06-07:00"
@@ -8134,13 +8482,13 @@ dt_lite_to_s(VALUE self)
  *
  * Formats date according to the directives in the given format
  * string.
- * The directives begins with a percent (%) character.
+ * The directives begin with a percent (%) character.
  * Any text not listed as a directive will be passed through to the
  * output string.
  *
- * The directive consists of a percent (%) character,
- * zero or more flags, optional minimum field width,
- * optional modifier and a conversion specifier
+ * A directive consists of a percent (%) character,
+ * zero or more flags, an optional minimum field width,
+ * an optional modifier, and a conversion specifier
  * as follows.
  *
  *    %<flags><width><modifier><conversion>
@@ -8155,7 +8503,7 @@ dt_lite_to_s(VALUE self)
  *
  * The minimum field width specifies the minimum width.
  *
- * The modifier is "E" and "O".
+ * The modifiers are "E" and "O".
  * They are ignored.
  *
  * Format directives:
@@ -8191,7 +8539,7 @@ dt_lite_to_s(VALUE self)
  *
  *      %M - Minute of the hour (00..59)
  *
- *      %S - Second of the minute (00..59)
+ *      %S - Second of the minute (00..60)
  *
  *      %L - Millisecond of the second (000..999)
  *      %N - Fractional seconds digits, default is 9 digits (nanosecond)
@@ -8206,7 +8554,7 @@ dt_lite_to_s(VALUE self)
  *              %::z - hour, minute and second offset from UTC (e.g. +09:00:00)
  *              %:::z - hour, minute and second offset from UTC
  *                                                (e.g. +09, +09:30, +09:30:30)
- *      %Z - Time zone abbreviation name or something similar information.
+ *      %Z - Equivalent to %:z (e.g. +09:00)
  *
  *    Weekday:
  *      %A - The full weekday name (``Sunday'')
@@ -8251,11 +8599,12 @@ dt_lite_to_s(VALUE self)
  *      %T - 24-hour time (%H:%M:%S)
  *      %+ - date(1) (%a %b %e %H:%M:%S %Z %Y)
  *
- * This method is similar to strftime() function defined in ISO C and POSIX.
+ * This method is similar to the strftime() function defined in ISO C
+ * and POSIX.
  * Several directives (%a, %A, %b, %B, %c, %p, %r, %x, %X, %E*, %O* and %Z)
  * are locale dependent in the function.
- * However this method is locale independent.
- * So, the result may differ even if a same format string is used in other
+ * However, this method is locale independent.
+ * So, the result may differ even if the same format string is used in other
  * systems such as C.
  * It is good practice to avoid %x and %X because there are corresponding
  * locale independent representations, %D and %T.
@@ -8303,7 +8652,7 @@ dt_lite_to_s(VALUE self)
  *    %GW%V%uT%H%M%z   => 2007W471T0837-0600        Week date and local time and difference from UTC (basic)
  *    %G-W%V-%uT%R%:z  => 2007-W47-1T08:37-06:00    Week date and local time and difference from UTC (extended)
  *
- * See also strftime(3) and strptime.
+ * See also strftime(3) and ::strptime.
  */
 static VALUE
 dt_lite_strftime(int argc, VALUE *argv, VALUE self)
@@ -8333,8 +8682,8 @@ iso8601_timediv(VALUE self, long n)
  *    dt.iso8601([n=0])    ->  string
  *    dt.xmlschema([n=0])  ->  string
  *
- * This method is equivalent to strftime('%FT%T').  The optional
- * argument n is length of fractional seconds.
+ * This method is equivalent to strftime('%FT%T%:z').
+ * The optional argument +n+ is the number of digits for fractional seconds.
  *
  *    DateTime.parse('2001-02-03T04:05:06.123456789+07:00').iso8601(9)
  *				#=> "2001-02-03T04:05:06.123456789+07:00"
@@ -8356,8 +8705,8 @@ dt_lite_iso8601(int argc, VALUE *argv, VALUE self)
  * call-seq:
  *    dt.rfc3339([n=0])  ->  string
  *
- * This method is equivalent to strftime('%FT%T').  The optional
- * argument n is length of fractional seconds.
+ * This method is equivalent to strftime('%FT%T%:z').
+ * The optional argument +n+ is the number of digits for fractional seconds.
  *
  *    DateTime.parse('2001-02-03T04:05:06.123456789+07:00').rfc3339(9)
  *				#=> "2001-02-03T04:05:06.123456789+07:00"
@@ -8372,8 +8721,8 @@ dt_lite_rfc3339(int argc, VALUE *argv, VALUE self)
  * call-seq:
  *    dt.jisx0301([n=0])  ->  string
  *
- * Returns a string in a JIS X 0301 format.  The optional argument n
- * is length of fractional seconds.
+ * Returns a string in a JIS X 0301 format.
+ * The optional argument +n+ is the number of digits for fractional seconds.
  *
  *    DateTime.parse('2001-02-03T04:05:06.123456789+07:00').jisx0301(9)
  *				#=> "H13.02.03T04:05:06.123456789+07:00"
@@ -8484,17 +8833,24 @@ time_to_datetime(VALUE self)
  * call-seq:
  *    d.to_time  ->  time
  *
- * Returns a Time object which denotes self.
+ * Returns a Time object which denotes self. If self is a julian date,
+ * convert it to a gregorian date before converting it to Time.
  */
 static VALUE
 date_to_time(VALUE self)
 {
-    get_d1(self);
+    get_d1a(self);
+
+    if (m_julian_p(adat)) {
+        VALUE tmp = d_lite_gregorian(self);
+        get_d1b(tmp);
+        adat = bdat;
+    }
 
     return f_local3(rb_cTime,
-		    m_real_year(dat),
-		    INT2FIX(m_mon(dat)),
-		    INT2FIX(m_mday(dat)));
+        m_real_year(adat),
+        INT2FIX(m_mon(adat)),
+        INT2FIX(m_mday(adat)));
 }
 
 /*
@@ -8603,7 +8959,7 @@ datetime_to_date(VALUE self)
 	VALUE new = d_lite_s_alloc_simple(cDate);
 	{
 	    get_d1b(new);
-	    copy_complex_to_simple(new, &bdat->s, &adat->c)
+	    copy_complex_to_simple(new, &bdat->s, &adat->c);
 	    bdat->s.jd = m_local_jd(adat);
 	    bdat->s.flags &= ~(HAVE_DF | HAVE_TIME | COMPLEX_DAT);
 	    return new;
@@ -8968,18 +9324,22 @@ mk_ary_of_str(long len, const char *a[])
     return o;
 }
 
+static VALUE
+d_lite_zero(VALUE x)
+{
+    return INT2FIX(0);
+}
+
 void
 Init_date_core(void)
 {
-#undef rb_intern
-#define rb_intern(str) rb_intern_const(str)
-
-    assert(fprintf(stderr, "assert() is now active\n"));
-
-    id_cmp = rb_intern("<=>");
-    id_le_p = rb_intern("<=");
-    id_ge_p = rb_intern(">=");
-    id_eqeq_p = rb_intern("==");
+    #ifdef HAVE_RB_EXT_RACTOR_SAFE
+	RB_EXT_RACTOR_SAFE(true);
+    #endif
+    id_cmp = rb_intern_const("<=>");
+    id_le_p = rb_intern_const("<=");
+    id_ge_p = rb_intern_const(">=");
+    id_eqeq_p = rb_intern_const("==");
 
     half_days_in_day = rb_rational_new2(INT2FIX(1), INT2FIX(2));
 
@@ -9003,13 +9363,13 @@ Init_date_core(void)
     /*
      * date and datetime class - Tadayoshi Funaba 1998-2011
      *
-     * 'date' provides two classes Date and DateTime.
+     * 'date' provides two classes: Date and DateTime.
      *
-     * == Terms and definitions
+     * == Terms and Definitions
      *
      * Some terms and definitions are based on ISO 8601 and JIS X 0301.
      *
-     * === calendar date
+     * === Calendar Date
      *
      * The calendar date is a particular day of a calendar year,
      * identified by its ordinal number within a calendar month within
@@ -9017,14 +9377,14 @@ Init_date_core(void)
      *
      * In those classes, this is so-called "civil".
      *
-     * === ordinal date
+     * === Ordinal Date
      *
      * The ordinal date is a particular day of a calendar year identified
      * by its ordinal number within the year.
      *
      * In those classes, this is so-called "ordinal".
      *
-     * === week date
+     * === Week Date
      *
      * The week date is a date identified by calendar week and day numbers.
      *
@@ -9034,15 +9394,15 @@ Init_date_core(void)
      * includes the first Thursday of that year. In the Gregorian
      * calendar, this is equivalent to the week which includes January 4.
      *
-     * In those classes, this so-called "commercial".
+     * In those classes, this is so-called "commercial".
      *
-     * === julian day number
+     * === Julian Day Number
      *
-     * The Julian day number is in elapsed days since noon (Greenwich mean
-     * time) on January 1, 4713 BCE (in the Julian calendar).
+     * The Julian day number is in elapsed days since noon (Greenwich Mean
+     * Time) on January 1, 4713 BCE (in the Julian calendar).
      *
-     * In this document, the astronomical Julian day number is same as the
-     * original Julian day number. And the chronological Julian day
+     * In this document, the astronomical Julian day number is the same as
+     * the original Julian day number. And the chronological Julian day
      * number is a variation of the Julian day number. Its days begin at
      * midnight on local time.
      *
@@ -9052,14 +9412,14 @@ Init_date_core(void)
      *
      * In those classes, those are so-called "ajd" and "jd".
      *
-     * === modified julian day number
+     * === Modified Julian Day Number
      *
      * The modified Julian day number is in elapsed days since midnight
-     * (Coordinated universal time) on November 17, 1858 CE (in the
+     * (Coordinated Universal Time) on November 17, 1858 CE (in the
      * Gregorian calendar).
      *
      * In this document, the astronomical modified Julian day number is
-     * same as the original modified Julian day number. And the
+     * the same as the original modified Julian day number. And the
      * chronological modified Julian day number is a variation of the
      * modified Julian day number. Its days begin at midnight on local
      * time.
@@ -9068,16 +9428,16 @@ Init_date_core(void)
      * appears, it just refers to "chronological modified Julian day
      * number", not the original.
      *
-     * In those classes, this is so-called "mjd".
+     * In those classes, those are so-called "amjd" and "mjd".
      *
      * == Date
      *
-     * A subclass of Object that includes Comparable module and easily handles
-     * date.
+     * A subclass of Object that includes the Comparable module and
+     * easily handles date.
      *
-     * Date object is created with Date::new, Date::jd, Date::ordinal,
+     * A Date object is created with Date::new, Date::jd, Date::ordinal,
      * Date::commercial, Date::parse, Date::strptime, Date::today,
-     * Time#to_date or etc.
+     * Time#to_date, etc.
      *
      *     require 'date'
      *
@@ -9098,7 +9458,7 @@ Init_date_core(void)
      *
      * All date objects are immutable; hence cannot modify themselves.
      *
-     * The concept of this date object can be represented as a tuple
+     * The concept of a date object can be represented as a tuple
      * of the day count, the offset and the day of calendar reform.
      *
      * The day count denotes the absolute position of a temporal
@@ -9113,10 +9473,11 @@ Init_date_core(void)
      * The offset in this class is usually zero, and cannot be
      * specified directly.
      *
-     * An optional argument the day of calendar reform (start) as a
-     * Julian day number, which should be 2298874 to 2426355 or -/+oo.
-     * The default value is Date::ITALY (2299161=1582-10-15).  See
-     * also sample/cal.rb.
+     * A Date object can be created with an optional argument,
+     * the day of calendar reform as a Julian day number, which
+     * should be 2298874 to 2426355 or negative/positive infinity.
+     * The default value is +Date::ITALY+ (2299161=1582-10-15).
+     * See also sample/cal.rb.
      *
      *     $ ruby sample/cal.rb -c it 10 1582
      *         October 1582
@@ -9133,7 +9494,7 @@ Init_date_core(void)
      *     17 18 19 20 21 22 23
      *     24 25 26 27 28 29 30
      *
-     * Date object has various methods. See each reference.
+     * A Date object has various methods. See each reference.
      *
      *     d = Date.parse('3rd Feb 2001')
      *					#=> #<Date: 2001-02-03 ...>
@@ -9146,6 +9507,7 @@ Init_date_core(void)
      *
      */
     cDate = rb_define_class("Date", rb_cObject);
+    eDateError = rb_define_class_under(cDate, "Error", rb_eArgError);
 
     rb_include_module(cDate, rb_mComparable);
 
@@ -9181,32 +9543,31 @@ Init_date_core(void)
     rb_define_const(cDate, "ENGLAND", INT2FIX(ENGLAND));
 
     /* The Julian day number of the day of calendar reform for the
-     * proleptic Julian calendar
+     * proleptic Julian calendar.
      */
     rb_define_const(cDate, "JULIAN", DBL2NUM(JULIAN));
 
     /* The Julian day number of the day of calendar reform for the
-     * proleptic Gregorian calendar
+     * proleptic Gregorian calendar.
      */
     rb_define_const(cDate, "GREGORIAN", DBL2NUM(GREGORIAN));
 
-    rb_define_alloc_func(cDate, d_lite_s_alloc);
+    rb_define_alloc_func(cDate, d_lite_s_alloc_simple);
 
 #ifndef NDEBUG
-#define de_define_private_method rb_define_private_method
-    de_define_private_method(CLASS_OF(cDate), "_valid_jd?",
+    rb_define_private_method(CLASS_OF(cDate), "_valid_jd?",
 			     date_s__valid_jd_p, -1);
-    de_define_private_method(CLASS_OF(cDate), "_valid_ordinal?",
+    rb_define_private_method(CLASS_OF(cDate), "_valid_ordinal?",
 			     date_s__valid_ordinal_p, -1);
-    de_define_private_method(CLASS_OF(cDate), "_valid_civil?",
+    rb_define_private_method(CLASS_OF(cDate), "_valid_civil?",
 			     date_s__valid_civil_p, -1);
-    de_define_private_method(CLASS_OF(cDate), "_valid_date?",
+    rb_define_private_method(CLASS_OF(cDate), "_valid_date?",
 			     date_s__valid_civil_p, -1);
-    de_define_private_method(CLASS_OF(cDate), "_valid_commercial?",
+    rb_define_private_method(CLASS_OF(cDate), "_valid_commercial?",
 			     date_s__valid_commercial_p, -1);
-    de_define_private_method(CLASS_OF(cDate), "_valid_weeknum?",
+    rb_define_private_method(CLASS_OF(cDate), "_valid_weeknum?",
 			     date_s__valid_weeknum_p, -1);
-    de_define_private_method(CLASS_OF(cDate), "_valid_nth_kday?",
+    rb_define_private_method(CLASS_OF(cDate), "_valid_nth_kday?",
 			     date_s__valid_nth_kday_p, -1);
 #endif
 
@@ -9219,11 +9580,11 @@ Init_date_core(void)
 			       date_s_valid_commercial_p, -1);
 
 #ifndef NDEBUG
-    de_define_private_method(CLASS_OF(cDate), "valid_weeknum?",
+    rb_define_private_method(CLASS_OF(cDate), "valid_weeknum?",
 			     date_s_valid_weeknum_p, -1);
-    de_define_private_method(CLASS_OF(cDate), "valid_nth_kday?",
+    rb_define_private_method(CLASS_OF(cDate), "valid_nth_kday?",
 			     date_s_valid_nth_kday_p, -1);
-    de_define_private_method(CLASS_OF(cDate), "zone_to_diff",
+    rb_define_private_method(CLASS_OF(cDate), "zone_to_diff",
 			     date_s_zone_to_diff, 1);
 #endif
 
@@ -9234,21 +9595,18 @@ Init_date_core(void)
 			       date_s_gregorian_leap_p, 1);
 
 #ifndef NDEBUG
-#define de_define_singleton_method rb_define_singleton_method
-#define de_define_alias rb_define_alias
-    de_define_singleton_method(cDate, "new!", date_s_new_bang, -1);
-    de_define_alias(rb_singleton_class(cDate), "new_l!", "new");
+    rb_define_singleton_method(cDate, "new!", date_s_new_bang, -1);
+    rb_define_alias(rb_singleton_class(cDate), "new_l!", "new");
 #endif
 
     rb_define_singleton_method(cDate, "jd", date_s_jd, -1);
     rb_define_singleton_method(cDate, "ordinal", date_s_ordinal, -1);
     rb_define_singleton_method(cDate, "civil", date_s_civil, -1);
-    rb_define_singleton_method(cDate, "new", date_s_civil, -1);
     rb_define_singleton_method(cDate, "commercial", date_s_commercial, -1);
 
 #ifndef NDEBUG
-    de_define_singleton_method(cDate, "weeknum", date_s_weeknum, -1);
-    de_define_singleton_method(cDate, "nth_kday", date_s_nth_kday, -1);
+    rb_define_singleton_method(cDate, "weeknum", date_s_weeknum, -1);
+    rb_define_singleton_method(cDate, "nth_kday", date_s_nth_kday, -1);
 #endif
 
     rb_define_singleton_method(cDate, "today", date_s_today, -1);
@@ -9256,29 +9614,26 @@ Init_date_core(void)
     rb_define_singleton_method(cDate, "strptime", date_s_strptime, -1);
     rb_define_singleton_method(cDate, "_parse", date_s__parse, -1);
     rb_define_singleton_method(cDate, "parse", date_s_parse, -1);
-    rb_define_singleton_method(cDate, "_iso8601", date_s__iso8601, 1);
+    rb_define_singleton_method(cDate, "_iso8601", date_s__iso8601, -1);
     rb_define_singleton_method(cDate, "iso8601", date_s_iso8601, -1);
-    rb_define_singleton_method(cDate, "_rfc3339", date_s__rfc3339, 1);
+    rb_define_singleton_method(cDate, "_rfc3339", date_s__rfc3339, -1);
     rb_define_singleton_method(cDate, "rfc3339", date_s_rfc3339, -1);
-    rb_define_singleton_method(cDate, "_xmlschema", date_s__xmlschema, 1);
+    rb_define_singleton_method(cDate, "_xmlschema", date_s__xmlschema, -1);
     rb_define_singleton_method(cDate, "xmlschema", date_s_xmlschema, -1);
-    rb_define_singleton_method(cDate, "_rfc2822", date_s__rfc2822, 1);
-    rb_define_singleton_method(cDate, "_rfc822", date_s__rfc2822, 1);
+    rb_define_singleton_method(cDate, "_rfc2822", date_s__rfc2822, -1);
+    rb_define_singleton_method(cDate, "_rfc822", date_s__rfc2822, -1);
     rb_define_singleton_method(cDate, "rfc2822", date_s_rfc2822, -1);
     rb_define_singleton_method(cDate, "rfc822", date_s_rfc2822, -1);
-    rb_define_singleton_method(cDate, "_httpdate", date_s__httpdate, 1);
+    rb_define_singleton_method(cDate, "_httpdate", date_s__httpdate, -1);
     rb_define_singleton_method(cDate, "httpdate", date_s_httpdate, -1);
-    rb_define_singleton_method(cDate, "_jisx0301", date_s__jisx0301, 1);
+    rb_define_singleton_method(cDate, "_jisx0301", date_s__jisx0301, -1);
     rb_define_singleton_method(cDate, "jisx0301", date_s_jisx0301, -1);
 
-#ifndef NDEBUG
-#define de_define_method rb_define_method
-    de_define_method(cDate, "initialize", d_lite_initialize, -1);
-#endif
+    rb_define_method(cDate, "initialize", date_initialize, -1);
     rb_define_method(cDate, "initialize_copy", d_lite_initialize_copy, 1);
 
 #ifndef NDEBUG
-    de_define_method(cDate, "fill", d_lite_fill, 0);
+    rb_define_method(cDate, "fill", d_lite_fill, 0);
 #endif
 
     rb_define_method(cDate, "ajd", d_lite_ajd, 0);
@@ -9300,8 +9655,8 @@ Init_date_core(void)
     rb_define_method(cDate, "cwday", d_lite_cwday, 0);
 
 #ifndef NDEBUG
-    de_define_private_method(cDate, "wnum0", d_lite_wnum0, 0);
-    de_define_private_method(cDate, "wnum1", d_lite_wnum1, 0);
+    rb_define_private_method(cDate, "wnum0", d_lite_wnum0, 0);
+    rb_define_private_method(cDate, "wnum1", d_lite_wnum1, 0);
 #endif
 
     rb_define_method(cDate, "wday", d_lite_wday, 0);
@@ -9315,18 +9670,14 @@ Init_date_core(void)
     rb_define_method(cDate, "saturday?", d_lite_saturday_p, 0);
 
 #ifndef NDEBUG
-    de_define_method(cDate, "nth_kday?", d_lite_nth_kday_p, 2);
+    rb_define_method(cDate, "nth_kday?", d_lite_nth_kday_p, 2);
 #endif
 
-    rb_define_private_method(cDate, "hour", d_lite_hour, 0);
-    rb_define_private_method(cDate, "min", d_lite_min, 0);
-    rb_define_private_method(cDate, "minute", d_lite_min, 0);
-    rb_define_private_method(cDate, "sec", d_lite_sec, 0);
-    rb_define_private_method(cDate, "second", d_lite_sec, 0);
-    rb_define_private_method(cDate, "sec_fraction", d_lite_sec_fraction, 0);
-    rb_define_private_method(cDate, "second_fraction", d_lite_sec_fraction, 0);
-    rb_define_private_method(cDate, "offset", d_lite_offset, 0);
-    rb_define_private_method(cDate, "zone", d_lite_zone, 0);
+    rb_define_private_method(cDate, "hour", d_lite_zero, 0);
+    rb_define_private_method(cDate, "min", d_lite_zero, 0);
+    rb_define_private_method(cDate, "minute", d_lite_zero, 0);
+    rb_define_private_method(cDate, "sec", d_lite_zero, 0);
+    rb_define_private_method(cDate, "second", d_lite_zero, 0);
 
     rb_define_method(cDate, "julian?", d_lite_julian_p, 0);
     rb_define_method(cDate, "gregorian?", d_lite_gregorian_p, 0);
@@ -9339,8 +9690,6 @@ Init_date_core(void)
     rb_define_method(cDate, "julian", d_lite_julian, 0);
     rb_define_method(cDate, "gregorian", d_lite_gregorian, 0);
 
-    rb_define_private_method(cDate, "new_offset", d_lite_new_offset, -1);
-
     rb_define_method(cDate, "+", d_lite_plus, 1);
     rb_define_method(cDate, "-", d_lite_minus, 1);
 
@@ -9368,7 +9717,7 @@ Init_date_core(void)
 
     rb_define_method(cDate, "to_s", d_lite_to_s, 0);
 #ifndef NDEBUG
-    de_define_method(cDate, "inspect_raw", d_lite_inspect_raw, 0);
+    rb_define_method(cDate, "inspect_raw", d_lite_inspect_raw, 0);
 #endif
     rb_define_method(cDate, "inspect", d_lite_inspect, 0);
 
@@ -9385,7 +9734,7 @@ Init_date_core(void)
     rb_define_method(cDate, "jisx0301", d_lite_jisx0301, 0);
 
 #ifndef NDEBUG
-    de_define_method(cDate, "marshal_dump_old", d_lite_marshal_dump_old, 0);
+    rb_define_method(cDate, "marshal_dump_old", d_lite_marshal_dump_old, 0);
 #endif
     rb_define_method(cDate, "marshal_dump", d_lite_marshal_dump, 0);
     rb_define_method(cDate, "marshal_load", d_lite_marshal_load, 1);
@@ -9394,48 +9743,51 @@ Init_date_core(void)
     /*
      * == DateTime
      *
-     * A subclass of Date that easily handles date, hour, minute, second and
-     * offset.
+     * A subclass of Date that easily handles date, hour, minute, second,
+     * and offset.
+     *
+     * DateTime class is considered deprecated. Use Time class.
      *
      * DateTime does not consider any leap seconds, does not track
      * any summer time rules.
      *
-     * DateTime object is created with DateTime::new, DateTime::jd,
+     * A DateTime object is created with DateTime::new, DateTime::jd,
      * DateTime::ordinal, DateTime::commercial, DateTime::parse,
-     * DateTime::strptime, DateTime::now, Time#to_datetime or etc.
+     * DateTime::strptime, DateTime::now, Time#to_datetime, etc.
      *
      *     require 'date'
      *
      *     DateTime.new(2001,2,3,4,5,6)
      *                         #=> #<DateTime: 2001-02-03T04:05:06+00:00 ...>
      *
-     * The last element of day, hour, minute or second can be
+     * The last element of day, hour, minute, or second can be a
      * fractional number. The fractional number's precision is assumed
      * at most nanosecond.
      *
      *     DateTime.new(2001,2,3.5)
      *                         #=> #<DateTime: 2001-02-03T12:00:00+00:00 ...>
      *
-     * An optional argument the offset indicates the difference
+     * An optional argument, the offset, indicates the difference
      * between the local time and UTC. For example, <tt>Rational(3,24)</tt>
      * represents ahead of 3 hours of UTC, <tt>Rational(-5,24)</tt> represents
      * behind of 5 hours of UTC. The offset should be -1 to +1, and
      * its precision is assumed at most second. The default value is
-     * zero(equals to UTC).
+     * zero (equals to UTC).
      *
      *     DateTime.new(2001,2,3,4,5,6,Rational(3,24))
      *                         #=> #<DateTime: 2001-02-03T04:05:06+03:00 ...>
      *
-     * also accepts string form.
+     * The offset also accepts string form:
      *
      *     DateTime.new(2001,2,3,4,5,6,'+03:00')
      *                         #=> #<DateTime: 2001-02-03T04:05:06+03:00 ...>
      *
-     * An optional argument the day of calendar reform (start) denotes
+     * An optional argument, the day of calendar reform (+start+), denotes
      * a Julian day number, which should be 2298874 to 2426355 or
-     * -/+oo.  The default value is +Date::ITALY+ (2299161=1582-10-15).
+     * negative/positive infinity.
+     * The default value is +Date::ITALY+ (2299161=1582-10-15).
      *
-     * DateTime object has various methods. See each reference.
+     * A DateTime object has various methods. See each reference.
      *
      *     d = DateTime.parse('3rd Feb 2001 04:05:06+03:30')
      *                         #=> #<DateTime: 2001-02-03T04:05:06+03:30 ...>
@@ -9456,28 +9808,28 @@ Init_date_core(void)
      * === When should you use DateTime and when should you use Time?
      *
      * It's a common misconception that
-     * {William Shakespeare}[http://en.wikipedia.org/wiki/William_Shakespeare]
+     * {William Shakespeare}[https://en.wikipedia.org/wiki/William_Shakespeare]
      * and
-     * {Miguel de Cervantes}[http://en.wikipedia.org/wiki/Miguel_de_Cervantes]
+     * {Miguel de Cervantes}[https://en.wikipedia.org/wiki/Miguel_de_Cervantes]
      * died on the same day in history -
      * so much so that UNESCO named April 23 as
-     * {World Book Day because of this fact}[http://en.wikipedia.org/wiki/World_Book_Day].
-     * However because England hadn't yet adopted
-     * {Gregorian Calendar Reform}[http://en.wikipedia.org/wiki/Gregorian_calendar#Gregorian_reform]
-     * (and wouldn't until {1752}[http://en.wikipedia.org/wiki/Calendar_(New_Style)_Act_1750])
+     * {World Book Day because of this fact}[https://en.wikipedia.org/wiki/World_Book_Day].
+     * However, because England hadn't yet adopted the
+     * {Gregorian Calendar Reform}[https://en.wikipedia.org/wiki/Gregorian_calendar#Gregorian_reform]
+     * (and wouldn't until {1752}[https://en.wikipedia.org/wiki/Calendar_(New_Style)_Act_1750])
      * their deaths are actually 10 days apart.
      * Since Ruby's Time class implements a
-     * {proleptic Gregorian calendar}[http://en.wikipedia.org/wiki/Proleptic_Gregorian_calendar]
-     * and has no concept of calendar reform then there's no way
-     * to express this. This is where DateTime steps in:
+     * {proleptic Gregorian calendar}[https://en.wikipedia.org/wiki/Proleptic_Gregorian_calendar]
+     * and has no concept of calendar reform there's no way
+     * to express this with Time objects. This is where DateTime steps in:
      *
      *     shakespeare = DateTime.iso8601('1616-04-23', Date::ENGLAND)
      *      #=> Tue, 23 Apr 1616 00:00:00 +0000
      *     cervantes = DateTime.iso8601('1616-04-23', Date::ITALY)
      *      #=> Sat, 23 Apr 1616 00:00:00 +0000
      *
-     * Already you can see something's weird - the days of the week
-     * are different, taking this further:
+     * Already you can see something is weird - the days of the week
+     * are different. Taking this further:
      *
      *     cervantes == shakespeare
      *      #=> false
@@ -9511,7 +9863,7 @@ Init_date_core(void)
      *      #=> Fri, 04 May 1753 00:00:00 +0000
      *
      * As you can see, if we're accurately tracking the number of
-     * {solar years}[http://en.wikipedia.org/wiki/Tropical_year]
+     * {solar years}[https://en.wikipedia.org/wiki/Tropical_year]
      * since Shakespeare's birthday then the correct anniversary date
      * would be the 4th May and not the 23rd April.
      *
@@ -9523,14 +9875,15 @@ Init_date_core(void)
      * making the same mistakes as UNESCO. If you also have to deal
      * with timezones then best of luck - just bear in mind that
      * you'll probably be dealing with
-     * {local solar times}[http://en.wikipedia.org/wiki/Solar_time],
+     * {local solar times}[https://en.wikipedia.org/wiki/Solar_time],
      * since it wasn't until the 19th century that the introduction
      * of the railways necessitated the need for
-     * {Standard Time}[http://en.wikipedia.org/wiki/Standard_time#Great_Britain]
+     * {Standard Time}[https://en.wikipedia.org/wiki/Standard_time#Great_Britain]
      * and eventually timezones.
      */
 
     cDateTime = rb_define_class("DateTime", cDate);
+    rb_define_alloc_func(cDateTime, d_lite_s_alloc_complex);
 
     rb_define_singleton_method(cDateTime, "jd", datetime_s_jd, -1);
     rb_define_singleton_method(cDateTime, "ordinal", datetime_s_ordinal, -1);
@@ -9540,9 +9893,9 @@ Init_date_core(void)
 			       datetime_s_commercial, -1);
 
 #ifndef NDEBUG
-    de_define_singleton_method(cDateTime, "weeknum",
+    rb_define_singleton_method(cDateTime, "weeknum",
 			       datetime_s_weeknum, -1);
-    de_define_singleton_method(cDateTime, "nth_kday",
+    rb_define_singleton_method(cDateTime, "nth_kday",
 			       datetime_s_nth_kday, -1);
 #endif
 
@@ -9570,19 +9923,16 @@ Init_date_core(void)
     rb_define_singleton_method(cDateTime, "jisx0301",
 			       datetime_s_jisx0301, -1);
 
-#define f_public(m,s) rb_funcall(m, rb_intern("public"), 1,\
-				 ID2SYM(rb_intern(s)))
-
-    f_public(cDateTime, "hour");
-    f_public(cDateTime, "min");
-    f_public(cDateTime, "minute");
-    f_public(cDateTime, "sec");
-    f_public(cDateTime, "second");
-    f_public(cDateTime, "sec_fraction");
-    f_public(cDateTime, "second_fraction");
-    f_public(cDateTime, "offset");
-    f_public(cDateTime, "zone");
-    f_public(cDateTime, "new_offset");
+    rb_define_method(cDateTime, "hour", d_lite_hour, 0);
+    rb_define_method(cDateTime, "min", d_lite_min, 0);
+    rb_define_method(cDateTime, "minute", d_lite_min, 0);
+    rb_define_method(cDateTime, "sec", d_lite_sec, 0);
+    rb_define_method(cDateTime, "second", d_lite_sec, 0);
+    rb_define_method(cDateTime, "sec_fraction", d_lite_sec_fraction, 0);
+    rb_define_method(cDateTime, "second_fraction", d_lite_sec_fraction, 0);
+    rb_define_method(cDateTime, "offset", d_lite_offset, 0);
+    rb_define_method(cDateTime, "zone", d_lite_zone, 0);
+    rb_define_method(cDateTime, "new_offset", d_lite_new_offset, -1);
 
     rb_define_method(cDateTime, "to_s", dt_lite_to_s, 0);
 
@@ -9610,15 +9960,15 @@ Init_date_core(void)
 #ifndef NDEBUG
     /* tests */
 
-    de_define_singleton_method(cDate, "test_civil", date_s_test_civil, 0);
-    de_define_singleton_method(cDate, "test_ordinal", date_s_test_ordinal, 0);
-    de_define_singleton_method(cDate, "test_commercial",
+    rb_define_singleton_method(cDate, "test_civil", date_s_test_civil, 0);
+    rb_define_singleton_method(cDate, "test_ordinal", date_s_test_ordinal, 0);
+    rb_define_singleton_method(cDate, "test_commercial",
 			       date_s_test_commercial, 0);
-    de_define_singleton_method(cDate, "test_weeknum", date_s_test_weeknum, 0);
-    de_define_singleton_method(cDate, "test_nth_kday", date_s_test_nth_kday, 0);
-    de_define_singleton_method(cDate, "test_unit_conv",
+    rb_define_singleton_method(cDate, "test_weeknum", date_s_test_weeknum, 0);
+    rb_define_singleton_method(cDate, "test_nth_kday", date_s_test_nth_kday, 0);
+    rb_define_singleton_method(cDate, "test_unit_conv",
 			       date_s_test_unit_conv, 0);
-    de_define_singleton_method(cDate, "test_all", date_s_test_all, 0);
+    rb_define_singleton_method(cDate, "test_all", date_s_test_all, 0);
 #endif
 }
 
diff --git a/ext/date/date_parse.c b/ext/date/date_parse.c
index efb414e2ee..5fa036ed72 100644
--- a/ext/date/date_parse.c
+++ b/ext/date/date_parse.c
@@ -7,6 +7,9 @@
 #include "ruby/re.h"
 #include <ctype.h>
 
+RUBY_EXTERN VALUE rb_int_positive_pow(long x, unsigned long y);
+RUBY_EXTERN unsigned long ruby_scan_digits(const char *str, ssize_t len, int base, size_t *retlen, int *overflow);
+
 /* #define TIGHT_PARSER */
 
 #define sizeof_array(o) (sizeof o / sizeof o[0])
@@ -37,9 +40,9 @@
 #define f_sub_bang(s,r,x) rb_funcall(s, rb_intern("sub!"), 2, r, x)
 #define f_gsub_bang(s,r,x) rb_funcall(s, rb_intern("gsub!"), 2, r, x)
 
-#define set_hash(k,v) rb_hash_aset(hash, ID2SYM(rb_intern(k)), v)
-#define ref_hash(k) rb_hash_aref(hash, ID2SYM(rb_intern(k)))
-#define del_hash(k) rb_hash_delete(hash, ID2SYM(rb_intern(k)))
+#define set_hash(k,v) rb_hash_aset(hash, ID2SYM(rb_intern(k"")), v)
+#define ref_hash(k) rb_hash_aref(hash, ID2SYM(rb_intern(k"")))
+#define del_hash(k) rb_hash_delete(hash, ID2SYM(rb_intern(k"")))
 
 #define cstr2num(s) rb_cstr_to_inum(s, 10, 0)
 #define str2num(s) rb_str_to_inum(s, 10, 0)
@@ -63,7 +66,13 @@ static const char abbr_months[][4] = {
 #define asubt_string() rb_str_new("\024", 1)
 #endif
 
-#define DECDIGIT "0123456789"
+static size_t
+digit_span(const char *s, const char *e)
+{
+    size_t i = 0;
+    while (s + i < e && isdigit((unsigned char)s[i])) i++;
+    return i;
+}
 
 static void
 s3e(VALUE hash, VALUE y, VALUE m, VALUE d, int bc)
@@ -89,7 +98,7 @@ s3e(VALUE hash, VALUE y, VALUE m, VALUE d, int bc)
 	    y = d;
 	    d = Qnil;
 	}
-	if (!NIL_P(d) && *RSTRING_PTR(d) == '\'') {
+	if (!NIL_P(d) && RSTRING_LEN(d) > 0 && *RSTRING_PTR(d) == '\'') {
 	    y = d;
 	    d = Qnil;
 	}
@@ -100,17 +109,20 @@ s3e(VALUE hash, VALUE y, VALUE m, VALUE d, int bc)
 	size_t l;
 
 	s = RSTRING_PTR(y);
-	while (!issign((unsigned char)*s) && !isdigit((unsigned char)*s))
+	ep = RSTRING_END(y);
+	while (s < ep && !issign(*s) && !isdigit((unsigned char)*s))
 	    s++;
+	if (s >= ep) goto no_date;
 	bp = s;
 	if (issign((unsigned char)*s))
 	    s++;
-	l = strspn(s, DECDIGIT);
+	l = digit_span(s, ep);
 	ep = s + l;
 	if (*ep) {
 	    y = d;
 	    d = rb_str_new(bp, ep - bp);
 	}
+      no_date:;
     }
 
     if (!NIL_P(m)) {
@@ -149,8 +161,10 @@ s3e(VALUE hash, VALUE y, VALUE m, VALUE d, int bc)
 	VALUE iy;
 
 	s = RSTRING_PTR(y);
-	while (!issign((unsigned char)*s) && !isdigit((unsigned char)*s))
+	ep = RSTRING_END(y);
+	while (s < ep && !issign(*s) && !isdigit((unsigned char)*s))
 	    s++;
+	if (s >= ep) goto no_year;
 	bp = s;
 	if (issign(*s)) {
 	    s++;
@@ -158,7 +172,7 @@ s3e(VALUE hash, VALUE y, VALUE m, VALUE d, int bc)
 	}
 	if (sign)
 	    c = Qfalse;
-	l = strspn(s, DECDIGIT);
+	l = digit_span(s, ep);
 	ep = s + l;
 	if (l > 2)
 	    c = Qfalse;
@@ -172,6 +186,7 @@ s3e(VALUE hash, VALUE y, VALUE m, VALUE d, int bc)
 	    ALLOCV_END(vbuf);
 	}
 	set_hash("year", iy);
+      no_year:;
     }
 
     if (bc)
@@ -183,10 +198,12 @@ s3e(VALUE hash, VALUE y, VALUE m, VALUE d, int bc)
 	VALUE im;
 
 	s = RSTRING_PTR(m);
-	while (!isdigit((unsigned char)*s))
+	ep = RSTRING_END(m);
+	while (s < ep && !isdigit((unsigned char)*s))
 	    s++;
+	if (s >= ep) goto no_month;
 	bp = s;
-	l = strspn(s, DECDIGIT);
+	l = digit_span(s, ep);
 	ep = s + l;
 	{
 	    char *buf;
@@ -198,6 +215,7 @@ s3e(VALUE hash, VALUE y, VALUE m, VALUE d, int bc)
 	    ALLOCV_END(vbuf);
 	}
 	set_hash("mon", im);
+      no_month:;
     }
 
     if (!NIL_P(d)) {
@@ -206,10 +224,12 @@ s3e(VALUE hash, VALUE y, VALUE m, VALUE d, int bc)
 	VALUE id;
 
 	s = RSTRING_PTR(d);
-	while (!isdigit((unsigned char)*s))
+	ep = RSTRING_END(d);
+	while (s < ep && !isdigit((unsigned char)*s))
 	    s++;
+	if (s >= ep) goto no_mday;
 	bp = s;
-	l = strspn(s, DECDIGIT);
+	l = digit_span(s, ep);
 	ep = s + l;
 	{
 	    char *buf;
@@ -221,6 +241,7 @@ s3e(VALUE hash, VALUE y, VALUE m, VALUE d, int bc)
 	    ALLOCV_END(vbuf);
 	}
 	set_hash("mday", id);
+      no_mday:;
     }
 
     if (!NIL_P(c))
@@ -255,23 +276,24 @@ regcomp(const char *source, long len, int opt)
     VALUE pat;
 
     pat = rb_reg_new(source, len, opt);
+    rb_obj_freeze(pat);
     rb_gc_register_mark_object(pat);
     return pat;
 }
 
 #define REGCOMP(pat,opt) \
-{ \
+do { \
     if (NIL_P(pat)) \
 	pat = regcomp(pat##_source, sizeof pat##_source - 1, opt); \
-}
+} while (0)
 
 #define REGCOMP_0(pat) REGCOMP(pat, 0)
 #define REGCOMP_I(pat) REGCOMP(pat, ONIG_OPTION_IGNORECASE)
 
 #define MATCH(s,p,c) \
-{ \
+do { \
     return match(s, p, hash, c); \
-}
+} while (0)
 
 static int
 match(VALUE str, VALUE pat, VALUE hash, int (*cb)(VALUE, VALUE))
@@ -311,106 +333,120 @@ subx(VALUE str, VALUE rep, VALUE pat, VALUE hash, int (*cb)(VALUE, VALUE))
 }
 
 #define SUBS(s,p,c) \
-{ \
+do { \
     return subx(s, asp_string(), p, hash, c); \
-}
+} while (0)
 
 #ifdef TIGHT_PARSER
 #define SUBA(s,p,c) \
-{ \
+do { \
     return subx(s, asuba_string(), p, hash, c); \
-}
+} while (0)
 
 #define SUBB(s,p,c) \
-{ \
+do { \
     return subx(s, asubb_string(), p, hash, c); \
-}
+} while (0)
 
 #define SUBW(s,p,c) \
-{ \
+do { \
     return subx(s, asubw_string(), p, hash, c); \
-}
+} while (0)
 
 #define SUBT(s,p,c) \
-{ \
+do { \
     return subx(s, asubt_string(), p, hash, c); \
-}
+} while (0)
 #endif
 
 #include "zonetab.h"
 
-VALUE
-date_zone_to_diff(VALUE str)
+static int
+str_end_with_word(const char *s, long l, const char *w)
 {
-    VALUE offset = Qnil;
-    VALUE vbuf = 0;
-
-    long l, i;
-    char *s, *dest, *d;
-    int sp = 1;
-
-    l = RSTRING_LEN(str);
-    s = RSTRING_PTR(str);
-
-    dest = d = ALLOCV_N(char, vbuf, l + 1);
+    int n = (int)strlen(w);
+    if (l <= n || !isspace((unsigned char)s[l - n - 1])) return 0;
+    if (strncasecmp(&s[l - n], w, n)) return 0;
+    do ++n; while (l > n && isspace((unsigned char)s[l - n - 1]));
+    return n;
+}
 
-    for (i = 0; i < l; i++) {
-	if (isspace((unsigned char)s[i]) || s[i] == '\0') {
-	    if (!sp)
-		*d++ = ' ';
-	    sp = 1;
+static long
+shrunk_size(const char *s, long l)
+{
+    long i, ni;
+    int sp = 0;
+    for (i = ni = 0; i < l; ++i) {
+	if (!isspace((unsigned char)s[i])) {
+	    if (sp) ni++;
+	    sp = 0;
+	    ni++;
 	}
 	else {
-	    if (isalpha((unsigned char)s[i]))
-		*d++ = tolower((unsigned char)s[i]);
-	    else
-		*d++ = s[i];
-	    sp = 0;
+	    sp = 1;
 	}
     }
-    if (d > dest) {
-	if (*(d - 1) == ' ')
-	    --d;
-	*d = '\0';
-    }
-    str = rb_str_new2(dest);
-    {
-#define STD " standard time"
-#define DST " daylight time"
-	char *ss, *ds;
-	long sl, dl;
-	int dst = 0;
-
-	sl = RSTRING_LEN(str) - (sizeof STD - 1);
-	ss = RSTRING_PTR(str) + sl;
-	dl = RSTRING_LEN(str) - (sizeof DST - 1);
-	ds = RSTRING_PTR(str) + dl;
+    return ni < l ? ni : 0;
+}
 
-	if (sl >= 0 && strcmp(ss, STD) == 0) {
-	    str = rb_str_new(RSTRING_PTR(str), sl);
-	}
-	else if (dl >= 0 && strcmp(ds, DST) == 0) {
-	    str = rb_str_new(RSTRING_PTR(str), dl);
-	    dst = 1;
+static long
+shrink_space(char *d, const char *s, long l)
+{
+    long i, ni;
+    int sp = 0;
+    for (i = ni = 0; i < l; ++i) {
+	if (!isspace((unsigned char)s[i])) {
+	    if (sp) d[ni++] = ' ';
+	    sp = 0;
+	    d[ni++] = s[i];
 	}
-#undef STD
-#undef DST
 	else {
-#define DST " dst"
-	    char *ds;
-	    long dl;
+	    sp = 1;
+	}
+    }
+    return ni;
+}
 
-	    dl = RSTRING_LEN(str) - (sizeof DST - 1);
-	    ds = RSTRING_PTR(str) + dl;
+VALUE
+date_zone_to_diff(VALUE str)
+{
+    VALUE offset = Qnil;
+    VALUE vbuf = 0;
+    long l = RSTRING_LEN(str);
+    const char *s = RSTRING_PTR(str);
+
+    {
+	int dst = 0;
+	int w;
 
-	    if (dl >= 0 && strcmp(ds, DST) == 0) {
-		str = rb_str_new(RSTRING_PTR(str), dl);
+	if ((w = str_end_with_word(s, l, "time")) > 0) {
+	    int wtime = w;
+	    l -= w;
+	    if ((w = str_end_with_word(s, l, "standard")) > 0) {
+		l -= w;
+	    }
+	    else if ((w = str_end_with_word(s, l, "daylight")) > 0) {
+		l -= w;
 		dst = 1;
 	    }
-#undef DST
+	    else {
+		l += wtime;
+	    }
+	}
+	else if ((w = str_end_with_word(s, l, "dst")) > 0) {
+	    l -= w;
+	    dst = 1;
 	}
 	{
-	    const struct zone *z = zonetab(RSTRING_PTR(str), (unsigned int)RSTRING_LEN(str));
+	    long sl = shrunk_size(s, l);
+	    if (sl > 0 && sl <= MAX_WORD_LENGTH) {
+		char *d = ALLOCV_N(char, vbuf, sl);
+		l = shrink_space(d, s, l);
+		s = d;
+	    }
+	}
+	if (l > 0 && l <= MAX_WORD_LENGTH) {
+	    const struct zone *z = zonetab(s, (unsigned int)l);
 	    if (z) {
 		int d = z->offset;
 		if (dst)
@@ -420,100 +456,60 @@ date_zone_to_diff(VALUE str)
 	    }
 	}
 	{
-	    char *s, *p;
-	    VALUE sign;
-	    VALUE hour = Qnil, min = Qnil, sec = Qnil;
-	    VALUE str_orig;
+	    char *p;
+	    int sign = 0;
+	    long hour = 0, min = 0, sec = 0;
 
-	    s = RSTRING_PTR(str);
-	    str_orig = str;
-
-	    if (strncmp(s, "gmt", 3) == 0 ||
-		strncmp(s, "utc", 3) == 0)
+	    if (l > 3 &&
+		(strncasecmp(s, "gmt", 3) == 0 ||
+		 strncasecmp(s, "utc", 3) == 0)) {
 		s += 3;
+		l -= 3;
+	    }
 	    if (issign(*s)) {
-		sign = rb_str_new(s, 1);
+		sign = *s == '-';
 		s++;
+		l--;
 
-		str = rb_str_new2(s);
-
-		if ((p = strchr(s, ':')) != NULL) {
-		    hour = rb_str_new(s, p - s);
+		hour = STRTOUL(s, &p, 10);
+		if (*p == ':') {
 		    s = ++p;
-		    if ((p = strchr(s, ':')) != NULL) {
-			min = rb_str_new(s, p - s);
+		    min = STRTOUL(s, &p, 10);
+		    if (*p == ':') {
 			s = ++p;
-			if ((p = strchr(s, ':')) != NULL) {
-			    sec = rb_str_new(s, p - s);
-			}
-			else
-			    sec = rb_str_new2(s);
+			sec = STRTOUL(s, &p, 10);
 		    }
-		    else
-			min = rb_str_new2(s);
-		    RB_GC_GUARD(str_orig);
 		    goto num;
 		}
-		if (strpbrk(RSTRING_PTR(str), ",.")) {
-		    VALUE astr = 0;
-		    char *a, *b;
-
-		    a = ALLOCV_N(char, astr, RSTRING_LEN(str) + 1);
-		    strcpy(a, RSTRING_PTR(str));
-		    b = strpbrk(a, ",.");
-		    *b = '\0';
-		    b++;
-
-		    hour = cstr2num(a);
-		    min = f_mul(rb_rational_new2
-				(cstr2num(b),
-				 f_expt(INT2FIX(10),
-					LONG2NUM((long)strlen(b)))),
-				INT2FIX(60));
-		    ALLOCV_END(astr);
-		    goto num;
-		}
-		{
-		    const char *cs = RSTRING_PTR(str);
-		    long cl = RSTRING_LEN(str);
-
-		    if (cl % 2) {
-			if (cl >= 1)
-			    hour = rb_str_new(&cs[0], 1);
-			if (cl >= 3)
-			    min  = rb_str_new(&cs[1], 2);
-			if (cl >= 5)
-			    sec  = rb_str_new(&cs[3], 2);
-		    }
-		    else {
-			if (cl >= 2)
-			    hour = rb_str_new(&cs[0], 2);
-			if (cl >= 4)
-			    min  = rb_str_new(&cs[2], 2);
-			if (cl >= 6)
-			    sec  = rb_str_new(&cs[4], 2);
+		if (*p == ',' || *p == '.') {
+		    char *e = 0;
+		    p++;
+		    min = STRTOUL(p, &e, 10) * 3600;
+		    if (sign) {
+			hour = -hour;
+			min = -min;
 		    }
+		    offset = rb_rational_new(INT2FIX(min),
+					     rb_int_positive_pow(10, (int)(e - p)));
+		    offset = f_add(INT2FIX(hour * 3600), offset);
+		    goto ok;
+		}
+		else if (l > 2) {
+		    size_t n;
+		    int ov;
+
+		    if (l >= 1)
+			hour = ruby_scan_digits(&s[0], 2 - l % 2, 10, &n, &ov);
+		    if (l >= 3)
+			min  = ruby_scan_digits(&s[2 - l % 2], 2, 10, &n, &ov);
+		    if (l >= 5)
+			sec  = ruby_scan_digits(&s[4 - l % 2], 2, 10, &n, &ov);
 		    goto num;
 		}
 	      num:
-		if (NIL_P(hour))
-		    offset = INT2FIX(0);
-		else {
-		    if (RB_TYPE_P(hour, T_STRING))
-			hour = str2num(hour);
-		    offset = f_mul(hour, INT2FIX(3600));
-		}
-		if (!NIL_P(min)) {
-		    if (RB_TYPE_P(min, T_STRING))
-			min = str2num(min);
-		    offset = f_add(offset, f_mul(min, INT2FIX(60)));
-		}
-		if (!NIL_P(sec))
-		    offset = f_add(offset, str2num(sec));
-		if (!NIL_P(sign) &&
-		    RSTRING_LEN(sign) == 1 &&
-		    *RSTRING_PTR(sign) == '-')
-		    offset = f_negate(offset);
+		sec += min * 60 + hour * 3600;
+		if (sign) sec = -sec;
+		offset = INT2FIX(sec);
 	    }
 	}
     }
@@ -753,16 +749,14 @@ parse_era(VALUE str, VALUE hash)
 static int
 check_year_width(VALUE y)
 {
-    char *s;
-    size_t l;
+    const char *s;
+    long l;
 
+    l = RSTRING_LEN(y);
+    if (l < 2) return 0;
     s = RSTRING_PTR(y);
-    l = strcspn(s, DECDIGIT);
-    s += l;
-    l = strspn(s, DECDIGIT);
-    if (l != 2)
-	return 0;
-    return 1;
+    if (!isdigit((unsigned char)s[1])) return 0;
+    return (l == 2 || !isdigit((unsigned char)s[2]));
 }
 
 static int
@@ -1243,6 +1237,9 @@ parse_iso2(VALUE str, VALUE hash)
     return 1;
 }
 
+#define JISX0301_ERA_INITIALS "mtshr"
+#define JISX0301_DEFAULT_ERA 'H' /* obsolete */
+
 static int
 gengo(int c)
 {
@@ -1253,6 +1250,7 @@ gengo(int c)
       case 'T': case 't': e = 1911; break;
       case 'S': case 's': e = 1925; break;
       case 'H': case 'h': e = 1988; break;
+      case 'R': case 'r': e = 2018; break;
       default:  e = 0; break;
     }
     return e;
@@ -1283,11 +1281,11 @@ parse_jis(VALUE str, VALUE hash)
 {
     static const char pat_source[] =
 #ifndef TIGHT_PARSER
-	"\\b([mtsh])(\\d+)\\.(\\d+)\\.(\\d+)"
+        "\\b([" JISX0301_ERA_INITIALS "])(\\d+)\\.(\\d+)\\.(\\d+)"
 #else
 	BOS
 	FPW_COM FPT_COM
-	"([mtsh])(\\d+)\\.(\\d+)\\.(\\d+)"
+        "([" JISX0301_ERA_INITIALS "])(\\d+)\\.(\\d+)\\.(\\d+)"
 	TEE_FPT COM_FPW
 	EOS
 #endif
@@ -1890,30 +1888,26 @@ parse_ddd_cb(VALUE m, VALUE hash)
 	set_hash("zone", s5);
 
 	if (*cs5 == '[') {
-	    VALUE vbuf = 0;
-	    char *buf = ALLOCV_N(char, vbuf, l5 + 1);
-	    char *s1, *s2, *s3;
+            const char *s1, *s2;
 	    VALUE zone;
 
-	    memcpy(buf, cs5, l5);
-	    buf[l5 - 1] = '\0';
-
-	    s1 = buf + 1;
-	    s2 = strchr(buf, ':');
+            l5 -= 2;
+            s1 = cs5 + 1;
+            s2 = memchr(s1, ':', l5);
 	    if (s2) {
-		*s2 = '\0';
 		s2++;
+                zone = rb_str_subseq(s5, s2 - cs5, l5 - (s2 - s1));
+                s5 = rb_str_subseq(s5, 1, s2 - s1);
 	    }
-	    if (s2)
-		s3 = s2;
-	    else
-		s3 = s1;
-	    zone = rb_str_new2(s3);
+            else {
+                zone = rb_str_subseq(s5, 1, l5);
+                if (isdigit((unsigned char)*s1))
+                    s5 = rb_str_append(rb_str_new_cstr("+"), zone);
+                else
+                    s5 = zone;
+            }
 	    set_hash("zone", zone);
-	    if (isdigit((unsigned char)*s1))
-		*--s1 = '+';
-	    set_hash("offset", date_zone_to_diff(rb_str_new2(s1)));
-	    ALLOCV_END(vbuf);
+            set_hash("offset", date_zone_to_diff(s5));
 	}
 	RB_GC_GUARD(s5);
     }
@@ -2206,7 +2200,7 @@ date__parse(VALUE str, VALUE comp)
 #endif
 
     {
-	if (RTEST(ref_hash("_bc"))) {
+        if (RTEST(del_hash("_bc"))) {
 	    VALUE y;
 
 	    y = ref_hash("cwyear");
@@ -2221,7 +2215,7 @@ date__parse(VALUE str, VALUE comp)
 	    }
 	}
 
-	if (RTEST(ref_hash("_comp"))) {
+        if (RTEST(del_hash("_comp"))) {
 	    VALUE y;
 
 	    y = ref_hash("cwyear");
@@ -2244,9 +2238,6 @@ date__parse(VALUE str, VALUE comp)
 
     }
 
-    del_hash("_bc");
-    del_hash("_comp");
-
     {
 	VALUE zone = ref_hash("zone");
 	if (!NIL_P(zone) && NIL_P(ref_hash("offset")))
@@ -2296,8 +2287,8 @@ iso8601_ext_datetime_cb(VALUE m, VALUE hash)
 	    s[i] = rb_reg_nth_match(i, m);
     }
 
-    if (!NIL_P(s[3])) {
-	set_hash("mday", str2num(s[3]));
+    if (!NIL_P(s[1])) {
+	if (!NIL_P(s[3])) set_hash("mday", str2num(s[3]));
 	if (strcmp(RSTRING_PTR(s[1]), "-") != 0) {
 	    y = str2num(s[1]);
 	    if (RSTRING_LEN(s[1]) < 4)
@@ -2354,7 +2345,7 @@ static int
 iso8601_ext_datetime(VALUE str, VALUE hash)
 {
     static const char pat_source[] =
-	"\\A\\s*(?:([-+]?\\d{2,}|-)-(\\d{2})?-(\\d{2})|"
+	"\\A\\s*(?:([-+]?\\d{2,}|-)-(\\d{2})?(?:-(\\d{2}))?|"
 		"([-+]?\\d{2,})?-(\\d{3})|"
 		"(\\d{4}|\\d{2})?-w(\\d{2})-(\\d)|"
 		"-w-(\\d))"
@@ -2985,7 +2976,7 @@ jisx0301_cb(VALUE m, VALUE hash)
 	    s[i] = rb_reg_nth_match(i, m);
     }
 
-    ep = gengo(NIL_P(s[1]) ? 'h' : *RSTRING_PTR(s[1]));
+    ep = gengo(NIL_P(s[1]) ? JISX0301_DEFAULT_ERA : *RSTRING_PTR(s[1]));
     set_hash("year", f_add(str2num(s[2]), INT2FIX(ep)));
     set_hash("mon", str2num(s[3]));
     set_hash("mday", str2num(s[4]));
@@ -3010,7 +3001,7 @@ static int
 jisx0301(VALUE str, VALUE hash)
 {
     static const char pat_source[] =
-	"\\A\\s*([mtsh])?(\\d{2})\\.(\\d{2})\\.(\\d{2})"
+        "\\A\\s*([" JISX0301_ERA_INITIALS "])?(\\d{2})\\.(\\d{2})\\.(\\d{2})"
 	"(?:t"
 	"(?:(\\d{2}):(\\d{2})(?::(\\d{2})(?:[,.](\\d*))?)?"
 	"(z|[-+]\\d{2}(?::?\\d{2})?)?)?)?\\s*\\z";
diff --git a/ext/date/date_strptime.c b/ext/date/date_strptime.c
index 4f93219317..7b06a31471 100644
--- a/ext/date/date_strptime.c
+++ b/ext/date/date_strptime.c
@@ -79,14 +79,17 @@ read_digits(const char *s, VALUE *n, size_t width)
 {
     size_t l;
 
-    l = strspn(s, "0123456789");
+    if (!width)
+        return 0;
+
+    l = 0;
+    while (ISDIGIT(s[l])) {
+        if (++l == width) break;
+    }
 
     if (l == 0)
 	return 0;
 
-    if (width < l)
-	l = width;
-
     if ((4 * l * sizeof(char)) <= (sizeof(long)*CHAR_BIT)) {
 	const char *os = s;
 	long v;
@@ -113,26 +116,26 @@ read_digits(const char *s, VALUE *n, size_t width)
     }
 }
 
-#define set_hash(k,v) rb_hash_aset(hash, ID2SYM(rb_intern(k)), v)
-#define ref_hash(k) rb_hash_aref(hash, ID2SYM(rb_intern(k)))
-#define del_hash(k) rb_hash_delete(hash, ID2SYM(rb_intern(k)))
+#define set_hash(k,v) rb_hash_aset(hash, ID2SYM(rb_intern(k"")), v)
+#define ref_hash(k) rb_hash_aref(hash, ID2SYM(rb_intern(k"")))
+#define del_hash(k) rb_hash_delete(hash, ID2SYM(rb_intern(k"")))
 
 #define fail() \
-{ \
+do { \
     set_hash("_fail", Qtrue); \
     return 0; \
-}
+} while (0)
 
 #define fail_p() (!NIL_P(ref_hash("_fail")))
 
 #define READ_DIGITS(n,w) \
-{ \
+do { \
     size_t l; \
     l = read_digits(&str[si], &n, w); \
     if (l == 0) \
 	fail();	\
     si += l; \
-}
+} while (0)
 
 #define READ_DIGITS_MAX(n) READ_DIGITS(n, LONG_MAX)
 
@@ -147,14 +150,14 @@ valid_range_p(VALUE v, int a, int b)
 }
 
 #define recur(fmt) \
-{ \
+do { \
     size_t l; \
     l = date__strptime_internal(&str[si], slen - si, \
 				fmt, sizeof fmt - 1, hash); \
     if (fail_p()) \
 	return 0; \
     si += l; \
-}
+} while (0)
 
 VALUE date_zone_to_diff(VALUE);
 
@@ -237,9 +240,9 @@ date__strptime_internal(const char *str, size_t slen,
 		    VALUE n;
 
 		    if (NUM_PATTERN_P())
-			READ_DIGITS(n, 2)
+			READ_DIGITS(n, 2);
 		    else
-			READ_DIGITS_MAX(n)
+			READ_DIGITS_MAX(n);
 		    set_hash("_cent", n);
 		    goto matched;
 		}
@@ -278,9 +281,9 @@ date__strptime_internal(const char *str, size_t slen,
 		    VALUE n;
 
 		    if (NUM_PATTERN_P())
-			READ_DIGITS(n, 4)
+			READ_DIGITS(n, 4);
 		    else
-			READ_DIGITS_MAX(n)
+			READ_DIGITS_MAX(n);
 		    set_hash("cwyear", n);
 		    goto matched;
 		}
@@ -358,9 +361,9 @@ date__strptime_internal(const char *str, size_t slen,
 		    }
 		    osi = si;
 		    if (NUM_PATTERN_P())
-			READ_DIGITS(n, c == 'L' ? 3 : 9)
+			READ_DIGITS(n, c == 'L' ? 3 : 9);
 		    else
-			READ_DIGITS_MAX(n)
+			READ_DIGITS_MAX(n);
 		    if (sign == -1)
 			n = f_negate(n);
 		    set_hash("sec_fraction",
@@ -426,9 +429,7 @@ date__strptime_internal(const char *str, size_t slen,
 		    if (sign == -1)
 			n = f_negate(n);
 		    set_hash("seconds",
-			     rb_rational_new2(n,
-					      f_expt(INT2FIX(10),
-						     INT2FIX(3))));
+			     rb_rational_new2(n, INT2FIX(1000)));
 		    goto matched;
 		}
 
@@ -529,24 +530,24 @@ date__strptime_internal(const char *str, size_t slen,
 		goto matched;
 
 	      case 'Y':
-		  {
-		      VALUE n;
-		      int sign = 1;
-
-		      if (issign(str[si])) {
-			  if (str[si] == '-')
-			      sign = -1;
-			  si++;
-		      }
-		      if (NUM_PATTERN_P())
-			  READ_DIGITS(n, 4)
-		      else
-			  READ_DIGITS_MAX(n)
+		{
+		    VALUE n;
+		    int sign = 1;
+
+		    if (issign(str[si])) {
+			if (str[si] == '-')
+			    sign = -1;
+			si++;
+		    }
+		    if (NUM_PATTERN_P())
+			READ_DIGITS(n, 4);
+		    else
+			READ_DIGITS_MAX(n);
 		    if (sign == -1)
 			n = f_negate(n);
-		      set_hash("year", n);
-		      goto matched;
-		  }
+		    set_hash("year", n);
+		    goto matched;
+		}
 
 	      case 'y':
 		{
@@ -580,6 +581,7 @@ date__strptime_internal(const char *str, size_t slen,
 		    if (NIL_P(pat)) {
 			pat = rb_reg_new(pat_source, sizeof pat_source - 1,
 					 ONIG_OPTION_IGNORECASE);
+			rb_obj_freeze(pat);
 			rb_gc_register_mark_object(pat);
 		    }
 
@@ -668,7 +670,7 @@ date__strptime(const char *str, size_t slen,
     if (fail_p())
 	return Qnil;
 
-    cent = ref_hash("_cent");
+    cent = del_hash("_cent");
     if (!NIL_P(cent)) {
 	VALUE year;
 
@@ -678,10 +680,9 @@ date__strptime(const char *str, size_t slen,
 	year = ref_hash("year");
 	if (!NIL_P(year))
 	    set_hash("year", f_add(year, f_mul(cent, INT2FIX(100))));
-	del_hash("_cent");
     }
 
-    merid = ref_hash("_merid");
+    merid = del_hash("_merid");
     if (!NIL_P(merid)) {
 	VALUE hour;
 
@@ -690,7 +691,6 @@ date__strptime(const char *str, size_t slen,
 	    hour = f_mod(hour, INT2FIX(12));
 	    set_hash("hour", f_add(hour, merid));
 	}
-	del_hash("_merid");
     }
 
     return hash;
diff --git a/ext/date/depend b/ext/date/depend
index ddc6ee357a..c686530c70 100644
--- a/ext/date/depend
+++ b/ext/date/depend
@@ -1,38 +1,492 @@
 # AUTOGENERATED DEPENDENCIES START
 date_core.o: $(RUBY_EXTCONF_H)
 date_core.o: $(arch_hdrdir)/ruby/config.h
+date_core.o: $(hdrdir)/ruby.h
+date_core.o: $(hdrdir)/ruby/internal/anyargs.h
+date_core.o: $(hdrdir)/ruby/internal/arithmetic.h
+date_core.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+date_core.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+date_core.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+date_core.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+date_core.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+date_core.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+date_core.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+date_core.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+date_core.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+date_core.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+date_core.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+date_core.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+date_core.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+date_core.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+date_core.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+date_core.o: $(hdrdir)/ruby/internal/assume.h
+date_core.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+date_core.o: $(hdrdir)/ruby/internal/attr/artificial.h
+date_core.o: $(hdrdir)/ruby/internal/attr/cold.h
+date_core.o: $(hdrdir)/ruby/internal/attr/const.h
+date_core.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+date_core.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+date_core.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+date_core.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+date_core.o: $(hdrdir)/ruby/internal/attr/error.h
+date_core.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+date_core.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+date_core.o: $(hdrdir)/ruby/internal/attr/format.h
+date_core.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+date_core.o: $(hdrdir)/ruby/internal/attr/noalias.h
+date_core.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+date_core.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+date_core.o: $(hdrdir)/ruby/internal/attr/noinline.h
+date_core.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+date_core.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+date_core.o: $(hdrdir)/ruby/internal/attr/pure.h
+date_core.o: $(hdrdir)/ruby/internal/attr/restrict.h
+date_core.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+date_core.o: $(hdrdir)/ruby/internal/attr/warning.h
+date_core.o: $(hdrdir)/ruby/internal/attr/weakref.h
+date_core.o: $(hdrdir)/ruby/internal/cast.h
+date_core.o: $(hdrdir)/ruby/internal/compiler_is.h
+date_core.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+date_core.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+date_core.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+date_core.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+date_core.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+date_core.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+date_core.o: $(hdrdir)/ruby/internal/compiler_since.h
+date_core.o: $(hdrdir)/ruby/internal/config.h
+date_core.o: $(hdrdir)/ruby/internal/constant_p.h
+date_core.o: $(hdrdir)/ruby/internal/core.h
+date_core.o: $(hdrdir)/ruby/internal/core/rarray.h
+date_core.o: $(hdrdir)/ruby/internal/core/rbasic.h
+date_core.o: $(hdrdir)/ruby/internal/core/rbignum.h
+date_core.o: $(hdrdir)/ruby/internal/core/rclass.h
+date_core.o: $(hdrdir)/ruby/internal/core/rdata.h
+date_core.o: $(hdrdir)/ruby/internal/core/rfile.h
+date_core.o: $(hdrdir)/ruby/internal/core/rhash.h
+date_core.o: $(hdrdir)/ruby/internal/core/robject.h
+date_core.o: $(hdrdir)/ruby/internal/core/rregexp.h
+date_core.o: $(hdrdir)/ruby/internal/core/rstring.h
+date_core.o: $(hdrdir)/ruby/internal/core/rstruct.h
+date_core.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+date_core.o: $(hdrdir)/ruby/internal/ctype.h
+date_core.o: $(hdrdir)/ruby/internal/dllexport.h
+date_core.o: $(hdrdir)/ruby/internal/dosish.h
+date_core.o: $(hdrdir)/ruby/internal/error.h
+date_core.o: $(hdrdir)/ruby/internal/eval.h
+date_core.o: $(hdrdir)/ruby/internal/event.h
+date_core.o: $(hdrdir)/ruby/internal/fl_type.h
+date_core.o: $(hdrdir)/ruby/internal/gc.h
+date_core.o: $(hdrdir)/ruby/internal/glob.h
+date_core.o: $(hdrdir)/ruby/internal/globals.h
+date_core.o: $(hdrdir)/ruby/internal/has/attribute.h
+date_core.o: $(hdrdir)/ruby/internal/has/builtin.h
+date_core.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+date_core.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+date_core.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+date_core.o: $(hdrdir)/ruby/internal/has/extension.h
+date_core.o: $(hdrdir)/ruby/internal/has/feature.h
+date_core.o: $(hdrdir)/ruby/internal/has/warning.h
+date_core.o: $(hdrdir)/ruby/internal/intern/array.h
+date_core.o: $(hdrdir)/ruby/internal/intern/bignum.h
+date_core.o: $(hdrdir)/ruby/internal/intern/class.h
+date_core.o: $(hdrdir)/ruby/internal/intern/compar.h
+date_core.o: $(hdrdir)/ruby/internal/intern/complex.h
+date_core.o: $(hdrdir)/ruby/internal/intern/cont.h
+date_core.o: $(hdrdir)/ruby/internal/intern/dir.h
+date_core.o: $(hdrdir)/ruby/internal/intern/enum.h
+date_core.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+date_core.o: $(hdrdir)/ruby/internal/intern/error.h
+date_core.o: $(hdrdir)/ruby/internal/intern/eval.h
+date_core.o: $(hdrdir)/ruby/internal/intern/file.h
+date_core.o: $(hdrdir)/ruby/internal/intern/gc.h
+date_core.o: $(hdrdir)/ruby/internal/intern/hash.h
+date_core.o: $(hdrdir)/ruby/internal/intern/io.h
+date_core.o: $(hdrdir)/ruby/internal/intern/load.h
+date_core.o: $(hdrdir)/ruby/internal/intern/marshal.h
+date_core.o: $(hdrdir)/ruby/internal/intern/numeric.h
+date_core.o: $(hdrdir)/ruby/internal/intern/object.h
+date_core.o: $(hdrdir)/ruby/internal/intern/parse.h
+date_core.o: $(hdrdir)/ruby/internal/intern/proc.h
+date_core.o: $(hdrdir)/ruby/internal/intern/process.h
+date_core.o: $(hdrdir)/ruby/internal/intern/random.h
+date_core.o: $(hdrdir)/ruby/internal/intern/range.h
+date_core.o: $(hdrdir)/ruby/internal/intern/rational.h
+date_core.o: $(hdrdir)/ruby/internal/intern/re.h
+date_core.o: $(hdrdir)/ruby/internal/intern/ruby.h
+date_core.o: $(hdrdir)/ruby/internal/intern/select.h
+date_core.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+date_core.o: $(hdrdir)/ruby/internal/intern/signal.h
+date_core.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+date_core.o: $(hdrdir)/ruby/internal/intern/string.h
+date_core.o: $(hdrdir)/ruby/internal/intern/struct.h
+date_core.o: $(hdrdir)/ruby/internal/intern/thread.h
+date_core.o: $(hdrdir)/ruby/internal/intern/time.h
+date_core.o: $(hdrdir)/ruby/internal/intern/variable.h
+date_core.o: $(hdrdir)/ruby/internal/intern/vm.h
+date_core.o: $(hdrdir)/ruby/internal/interpreter.h
+date_core.o: $(hdrdir)/ruby/internal/iterator.h
+date_core.o: $(hdrdir)/ruby/internal/memory.h
+date_core.o: $(hdrdir)/ruby/internal/method.h
+date_core.o: $(hdrdir)/ruby/internal/module.h
+date_core.o: $(hdrdir)/ruby/internal/newobj.h
+date_core.o: $(hdrdir)/ruby/internal/rgengc.h
+date_core.o: $(hdrdir)/ruby/internal/scan_args.h
+date_core.o: $(hdrdir)/ruby/internal/special_consts.h
+date_core.o: $(hdrdir)/ruby/internal/static_assert.h
+date_core.o: $(hdrdir)/ruby/internal/stdalign.h
+date_core.o: $(hdrdir)/ruby/internal/stdbool.h
+date_core.o: $(hdrdir)/ruby/internal/symbol.h
+date_core.o: $(hdrdir)/ruby/internal/token_paste.h
+date_core.o: $(hdrdir)/ruby/internal/value.h
+date_core.o: $(hdrdir)/ruby/internal/value_type.h
+date_core.o: $(hdrdir)/ruby/internal/variable.h
+date_core.o: $(hdrdir)/ruby/internal/warning_push.h
+date_core.o: $(hdrdir)/ruby/internal/xmalloc.h
+date_core.o: $(hdrdir)/ruby/assert.h
 date_core.o: $(hdrdir)/ruby/backward.h
+date_core.o: $(hdrdir)/ruby/backward/2/assume.h
+date_core.o: $(hdrdir)/ruby/backward/2/attributes.h
+date_core.o: $(hdrdir)/ruby/backward/2/bool.h
+date_core.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+date_core.o: $(hdrdir)/ruby/backward/2/inttypes.h
+date_core.o: $(hdrdir)/ruby/backward/2/limits.h
+date_core.o: $(hdrdir)/ruby/backward/2/long_long.h
+date_core.o: $(hdrdir)/ruby/backward/2/stdalign.h
+date_core.o: $(hdrdir)/ruby/backward/2/stdarg.h
 date_core.o: $(hdrdir)/ruby/defines.h
 date_core.o: $(hdrdir)/ruby/encoding.h
 date_core.o: $(hdrdir)/ruby/intern.h
 date_core.o: $(hdrdir)/ruby/missing.h
+date_core.o: $(hdrdir)/ruby/onigmo.h
 date_core.o: $(hdrdir)/ruby/oniguruma.h
 date_core.o: $(hdrdir)/ruby/ruby.h
 date_core.o: $(hdrdir)/ruby/st.h
 date_core.o: $(hdrdir)/ruby/subst.h
 date_core.o: $(hdrdir)/ruby/util.h
-date_core.o: $(top_srcdir)/include/ruby.h
 date_core.o: date_core.c
 date_core.o: date_tmx.h
 date_parse.o: $(RUBY_EXTCONF_H)
 date_parse.o: $(arch_hdrdir)/ruby/config.h
+date_parse.o: $(hdrdir)/ruby.h
+date_parse.o: $(hdrdir)/ruby/internal/anyargs.h
+date_parse.o: $(hdrdir)/ruby/internal/arithmetic.h
+date_parse.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+date_parse.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+date_parse.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+date_parse.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+date_parse.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+date_parse.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+date_parse.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+date_parse.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+date_parse.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+date_parse.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+date_parse.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+date_parse.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+date_parse.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+date_parse.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+date_parse.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+date_parse.o: $(hdrdir)/ruby/internal/assume.h
+date_parse.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+date_parse.o: $(hdrdir)/ruby/internal/attr/artificial.h
+date_parse.o: $(hdrdir)/ruby/internal/attr/cold.h
+date_parse.o: $(hdrdir)/ruby/internal/attr/const.h
+date_parse.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+date_parse.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+date_parse.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+date_parse.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+date_parse.o: $(hdrdir)/ruby/internal/attr/error.h
+date_parse.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+date_parse.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+date_parse.o: $(hdrdir)/ruby/internal/attr/format.h
+date_parse.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+date_parse.o: $(hdrdir)/ruby/internal/attr/noalias.h
+date_parse.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+date_parse.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+date_parse.o: $(hdrdir)/ruby/internal/attr/noinline.h
+date_parse.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+date_parse.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+date_parse.o: $(hdrdir)/ruby/internal/attr/pure.h
+date_parse.o: $(hdrdir)/ruby/internal/attr/restrict.h
+date_parse.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+date_parse.o: $(hdrdir)/ruby/internal/attr/warning.h
+date_parse.o: $(hdrdir)/ruby/internal/attr/weakref.h
+date_parse.o: $(hdrdir)/ruby/internal/cast.h
+date_parse.o: $(hdrdir)/ruby/internal/compiler_is.h
+date_parse.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+date_parse.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+date_parse.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+date_parse.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+date_parse.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+date_parse.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+date_parse.o: $(hdrdir)/ruby/internal/compiler_since.h
+date_parse.o: $(hdrdir)/ruby/internal/config.h
+date_parse.o: $(hdrdir)/ruby/internal/constant_p.h
+date_parse.o: $(hdrdir)/ruby/internal/core.h
+date_parse.o: $(hdrdir)/ruby/internal/core/rarray.h
+date_parse.o: $(hdrdir)/ruby/internal/core/rbasic.h
+date_parse.o: $(hdrdir)/ruby/internal/core/rbignum.h
+date_parse.o: $(hdrdir)/ruby/internal/core/rclass.h
+date_parse.o: $(hdrdir)/ruby/internal/core/rdata.h
+date_parse.o: $(hdrdir)/ruby/internal/core/rfile.h
+date_parse.o: $(hdrdir)/ruby/internal/core/rhash.h
+date_parse.o: $(hdrdir)/ruby/internal/core/rmatch.h
+date_parse.o: $(hdrdir)/ruby/internal/core/robject.h
+date_parse.o: $(hdrdir)/ruby/internal/core/rregexp.h
+date_parse.o: $(hdrdir)/ruby/internal/core/rstring.h
+date_parse.o: $(hdrdir)/ruby/internal/core/rstruct.h
+date_parse.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+date_parse.o: $(hdrdir)/ruby/internal/ctype.h
+date_parse.o: $(hdrdir)/ruby/internal/dllexport.h
+date_parse.o: $(hdrdir)/ruby/internal/dosish.h
+date_parse.o: $(hdrdir)/ruby/internal/error.h
+date_parse.o: $(hdrdir)/ruby/internal/eval.h
+date_parse.o: $(hdrdir)/ruby/internal/event.h
+date_parse.o: $(hdrdir)/ruby/internal/fl_type.h
+date_parse.o: $(hdrdir)/ruby/internal/gc.h
+date_parse.o: $(hdrdir)/ruby/internal/glob.h
+date_parse.o: $(hdrdir)/ruby/internal/globals.h
+date_parse.o: $(hdrdir)/ruby/internal/has/attribute.h
+date_parse.o: $(hdrdir)/ruby/internal/has/builtin.h
+date_parse.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+date_parse.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+date_parse.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+date_parse.o: $(hdrdir)/ruby/internal/has/extension.h
+date_parse.o: $(hdrdir)/ruby/internal/has/feature.h
+date_parse.o: $(hdrdir)/ruby/internal/has/warning.h
+date_parse.o: $(hdrdir)/ruby/internal/intern/array.h
+date_parse.o: $(hdrdir)/ruby/internal/intern/bignum.h
+date_parse.o: $(hdrdir)/ruby/internal/intern/class.h
+date_parse.o: $(hdrdir)/ruby/internal/intern/compar.h
+date_parse.o: $(hdrdir)/ruby/internal/intern/complex.h
+date_parse.o: $(hdrdir)/ruby/internal/intern/cont.h
+date_parse.o: $(hdrdir)/ruby/internal/intern/dir.h
+date_parse.o: $(hdrdir)/ruby/internal/intern/enum.h
+date_parse.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+date_parse.o: $(hdrdir)/ruby/internal/intern/error.h
+date_parse.o: $(hdrdir)/ruby/internal/intern/eval.h
+date_parse.o: $(hdrdir)/ruby/internal/intern/file.h
+date_parse.o: $(hdrdir)/ruby/internal/intern/gc.h
+date_parse.o: $(hdrdir)/ruby/internal/intern/hash.h
+date_parse.o: $(hdrdir)/ruby/internal/intern/io.h
+date_parse.o: $(hdrdir)/ruby/internal/intern/load.h
+date_parse.o: $(hdrdir)/ruby/internal/intern/marshal.h
+date_parse.o: $(hdrdir)/ruby/internal/intern/numeric.h
+date_parse.o: $(hdrdir)/ruby/internal/intern/object.h
+date_parse.o: $(hdrdir)/ruby/internal/intern/parse.h
+date_parse.o: $(hdrdir)/ruby/internal/intern/proc.h
+date_parse.o: $(hdrdir)/ruby/internal/intern/process.h
+date_parse.o: $(hdrdir)/ruby/internal/intern/random.h
+date_parse.o: $(hdrdir)/ruby/internal/intern/range.h
+date_parse.o: $(hdrdir)/ruby/internal/intern/rational.h
+date_parse.o: $(hdrdir)/ruby/internal/intern/re.h
+date_parse.o: $(hdrdir)/ruby/internal/intern/ruby.h
+date_parse.o: $(hdrdir)/ruby/internal/intern/select.h
+date_parse.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+date_parse.o: $(hdrdir)/ruby/internal/intern/signal.h
+date_parse.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+date_parse.o: $(hdrdir)/ruby/internal/intern/string.h
+date_parse.o: $(hdrdir)/ruby/internal/intern/struct.h
+date_parse.o: $(hdrdir)/ruby/internal/intern/thread.h
+date_parse.o: $(hdrdir)/ruby/internal/intern/time.h
+date_parse.o: $(hdrdir)/ruby/internal/intern/variable.h
+date_parse.o: $(hdrdir)/ruby/internal/intern/vm.h
+date_parse.o: $(hdrdir)/ruby/internal/interpreter.h
+date_parse.o: $(hdrdir)/ruby/internal/iterator.h
+date_parse.o: $(hdrdir)/ruby/internal/memory.h
+date_parse.o: $(hdrdir)/ruby/internal/method.h
+date_parse.o: $(hdrdir)/ruby/internal/module.h
+date_parse.o: $(hdrdir)/ruby/internal/newobj.h
+date_parse.o: $(hdrdir)/ruby/internal/rgengc.h
+date_parse.o: $(hdrdir)/ruby/internal/scan_args.h
+date_parse.o: $(hdrdir)/ruby/internal/special_consts.h
+date_parse.o: $(hdrdir)/ruby/internal/static_assert.h
+date_parse.o: $(hdrdir)/ruby/internal/stdalign.h
+date_parse.o: $(hdrdir)/ruby/internal/stdbool.h
+date_parse.o: $(hdrdir)/ruby/internal/symbol.h
+date_parse.o: $(hdrdir)/ruby/internal/token_paste.h
+date_parse.o: $(hdrdir)/ruby/internal/value.h
+date_parse.o: $(hdrdir)/ruby/internal/value_type.h
+date_parse.o: $(hdrdir)/ruby/internal/variable.h
+date_parse.o: $(hdrdir)/ruby/internal/warning_push.h
+date_parse.o: $(hdrdir)/ruby/internal/xmalloc.h
+date_parse.o: $(hdrdir)/ruby/assert.h
 date_parse.o: $(hdrdir)/ruby/backward.h
+date_parse.o: $(hdrdir)/ruby/backward/2/assume.h
+date_parse.o: $(hdrdir)/ruby/backward/2/attributes.h
+date_parse.o: $(hdrdir)/ruby/backward/2/bool.h
+date_parse.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+date_parse.o: $(hdrdir)/ruby/backward/2/inttypes.h
+date_parse.o: $(hdrdir)/ruby/backward/2/limits.h
+date_parse.o: $(hdrdir)/ruby/backward/2/long_long.h
+date_parse.o: $(hdrdir)/ruby/backward/2/stdalign.h
+date_parse.o: $(hdrdir)/ruby/backward/2/stdarg.h
 date_parse.o: $(hdrdir)/ruby/defines.h
 date_parse.o: $(hdrdir)/ruby/encoding.h
 date_parse.o: $(hdrdir)/ruby/intern.h
 date_parse.o: $(hdrdir)/ruby/missing.h
+date_parse.o: $(hdrdir)/ruby/onigmo.h
 date_parse.o: $(hdrdir)/ruby/oniguruma.h
 date_parse.o: $(hdrdir)/ruby/re.h
 date_parse.o: $(hdrdir)/ruby/regex.h
 date_parse.o: $(hdrdir)/ruby/ruby.h
 date_parse.o: $(hdrdir)/ruby/st.h
 date_parse.o: $(hdrdir)/ruby/subst.h
-date_parse.o: $(top_srcdir)/include/ruby.h
 date_parse.o: date_parse.c
 date_parse.o: zonetab.h
+date_parse.o: zonetab.list
 date_strftime.o: $(RUBY_EXTCONF_H)
 date_strftime.o: $(arch_hdrdir)/ruby/config.h
+date_strftime.o: $(hdrdir)/ruby/internal/anyargs.h
+date_strftime.o: $(hdrdir)/ruby/internal/arithmetic.h
+date_strftime.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+date_strftime.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+date_strftime.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+date_strftime.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+date_strftime.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+date_strftime.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+date_strftime.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+date_strftime.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+date_strftime.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+date_strftime.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+date_strftime.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+date_strftime.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+date_strftime.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+date_strftime.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+date_strftime.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+date_strftime.o: $(hdrdir)/ruby/internal/assume.h
+date_strftime.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+date_strftime.o: $(hdrdir)/ruby/internal/attr/artificial.h
+date_strftime.o: $(hdrdir)/ruby/internal/attr/cold.h
+date_strftime.o: $(hdrdir)/ruby/internal/attr/const.h
+date_strftime.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+date_strftime.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+date_strftime.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+date_strftime.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+date_strftime.o: $(hdrdir)/ruby/internal/attr/error.h
+date_strftime.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+date_strftime.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+date_strftime.o: $(hdrdir)/ruby/internal/attr/format.h
+date_strftime.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+date_strftime.o: $(hdrdir)/ruby/internal/attr/noalias.h
+date_strftime.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+date_strftime.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+date_strftime.o: $(hdrdir)/ruby/internal/attr/noinline.h
+date_strftime.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+date_strftime.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+date_strftime.o: $(hdrdir)/ruby/internal/attr/pure.h
+date_strftime.o: $(hdrdir)/ruby/internal/attr/restrict.h
+date_strftime.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+date_strftime.o: $(hdrdir)/ruby/internal/attr/warning.h
+date_strftime.o: $(hdrdir)/ruby/internal/attr/weakref.h
+date_strftime.o: $(hdrdir)/ruby/internal/cast.h
+date_strftime.o: $(hdrdir)/ruby/internal/compiler_is.h
+date_strftime.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+date_strftime.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+date_strftime.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+date_strftime.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+date_strftime.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+date_strftime.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+date_strftime.o: $(hdrdir)/ruby/internal/compiler_since.h
+date_strftime.o: $(hdrdir)/ruby/internal/config.h
+date_strftime.o: $(hdrdir)/ruby/internal/constant_p.h
+date_strftime.o: $(hdrdir)/ruby/internal/core.h
+date_strftime.o: $(hdrdir)/ruby/internal/core/rarray.h
+date_strftime.o: $(hdrdir)/ruby/internal/core/rbasic.h
+date_strftime.o: $(hdrdir)/ruby/internal/core/rbignum.h
+date_strftime.o: $(hdrdir)/ruby/internal/core/rclass.h
+date_strftime.o: $(hdrdir)/ruby/internal/core/rdata.h
+date_strftime.o: $(hdrdir)/ruby/internal/core/rfile.h
+date_strftime.o: $(hdrdir)/ruby/internal/core/rhash.h
+date_strftime.o: $(hdrdir)/ruby/internal/core/robject.h
+date_strftime.o: $(hdrdir)/ruby/internal/core/rregexp.h
+date_strftime.o: $(hdrdir)/ruby/internal/core/rstring.h
+date_strftime.o: $(hdrdir)/ruby/internal/core/rstruct.h
+date_strftime.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+date_strftime.o: $(hdrdir)/ruby/internal/ctype.h
+date_strftime.o: $(hdrdir)/ruby/internal/dllexport.h
+date_strftime.o: $(hdrdir)/ruby/internal/dosish.h
+date_strftime.o: $(hdrdir)/ruby/internal/error.h
+date_strftime.o: $(hdrdir)/ruby/internal/eval.h
+date_strftime.o: $(hdrdir)/ruby/internal/event.h
+date_strftime.o: $(hdrdir)/ruby/internal/fl_type.h
+date_strftime.o: $(hdrdir)/ruby/internal/gc.h
+date_strftime.o: $(hdrdir)/ruby/internal/glob.h
+date_strftime.o: $(hdrdir)/ruby/internal/globals.h
+date_strftime.o: $(hdrdir)/ruby/internal/has/attribute.h
+date_strftime.o: $(hdrdir)/ruby/internal/has/builtin.h
+date_strftime.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+date_strftime.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+date_strftime.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+date_strftime.o: $(hdrdir)/ruby/internal/has/extension.h
+date_strftime.o: $(hdrdir)/ruby/internal/has/feature.h
+date_strftime.o: $(hdrdir)/ruby/internal/has/warning.h
+date_strftime.o: $(hdrdir)/ruby/internal/intern/array.h
+date_strftime.o: $(hdrdir)/ruby/internal/intern/bignum.h
+date_strftime.o: $(hdrdir)/ruby/internal/intern/class.h
+date_strftime.o: $(hdrdir)/ruby/internal/intern/compar.h
+date_strftime.o: $(hdrdir)/ruby/internal/intern/complex.h
+date_strftime.o: $(hdrdir)/ruby/internal/intern/cont.h
+date_strftime.o: $(hdrdir)/ruby/internal/intern/dir.h
+date_strftime.o: $(hdrdir)/ruby/internal/intern/enum.h
+date_strftime.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+date_strftime.o: $(hdrdir)/ruby/internal/intern/error.h
+date_strftime.o: $(hdrdir)/ruby/internal/intern/eval.h
+date_strftime.o: $(hdrdir)/ruby/internal/intern/file.h
+date_strftime.o: $(hdrdir)/ruby/internal/intern/gc.h
+date_strftime.o: $(hdrdir)/ruby/internal/intern/hash.h
+date_strftime.o: $(hdrdir)/ruby/internal/intern/io.h
+date_strftime.o: $(hdrdir)/ruby/internal/intern/load.h
+date_strftime.o: $(hdrdir)/ruby/internal/intern/marshal.h
+date_strftime.o: $(hdrdir)/ruby/internal/intern/numeric.h
+date_strftime.o: $(hdrdir)/ruby/internal/intern/object.h
+date_strftime.o: $(hdrdir)/ruby/internal/intern/parse.h
+date_strftime.o: $(hdrdir)/ruby/internal/intern/proc.h
+date_strftime.o: $(hdrdir)/ruby/internal/intern/process.h
+date_strftime.o: $(hdrdir)/ruby/internal/intern/random.h
+date_strftime.o: $(hdrdir)/ruby/internal/intern/range.h
+date_strftime.o: $(hdrdir)/ruby/internal/intern/rational.h
+date_strftime.o: $(hdrdir)/ruby/internal/intern/re.h
+date_strftime.o: $(hdrdir)/ruby/internal/intern/ruby.h
+date_strftime.o: $(hdrdir)/ruby/internal/intern/select.h
+date_strftime.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+date_strftime.o: $(hdrdir)/ruby/internal/intern/signal.h
+date_strftime.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+date_strftime.o: $(hdrdir)/ruby/internal/intern/string.h
+date_strftime.o: $(hdrdir)/ruby/internal/intern/struct.h
+date_strftime.o: $(hdrdir)/ruby/internal/intern/thread.h
+date_strftime.o: $(hdrdir)/ruby/internal/intern/time.h
+date_strftime.o: $(hdrdir)/ruby/internal/intern/variable.h
+date_strftime.o: $(hdrdir)/ruby/internal/intern/vm.h
+date_strftime.o: $(hdrdir)/ruby/internal/interpreter.h
+date_strftime.o: $(hdrdir)/ruby/internal/iterator.h
+date_strftime.o: $(hdrdir)/ruby/internal/memory.h
+date_strftime.o: $(hdrdir)/ruby/internal/method.h
+date_strftime.o: $(hdrdir)/ruby/internal/module.h
+date_strftime.o: $(hdrdir)/ruby/internal/newobj.h
+date_strftime.o: $(hdrdir)/ruby/internal/rgengc.h
+date_strftime.o: $(hdrdir)/ruby/internal/scan_args.h
+date_strftime.o: $(hdrdir)/ruby/internal/special_consts.h
+date_strftime.o: $(hdrdir)/ruby/internal/static_assert.h
+date_strftime.o: $(hdrdir)/ruby/internal/stdalign.h
+date_strftime.o: $(hdrdir)/ruby/internal/stdbool.h
+date_strftime.o: $(hdrdir)/ruby/internal/symbol.h
+date_strftime.o: $(hdrdir)/ruby/internal/token_paste.h
+date_strftime.o: $(hdrdir)/ruby/internal/value.h
+date_strftime.o: $(hdrdir)/ruby/internal/value_type.h
+date_strftime.o: $(hdrdir)/ruby/internal/variable.h
+date_strftime.o: $(hdrdir)/ruby/internal/warning_push.h
+date_strftime.o: $(hdrdir)/ruby/internal/xmalloc.h
+date_strftime.o: $(hdrdir)/ruby/assert.h
 date_strftime.o: $(hdrdir)/ruby/backward.h
+date_strftime.o: $(hdrdir)/ruby/backward/2/assume.h
+date_strftime.o: $(hdrdir)/ruby/backward/2/attributes.h
+date_strftime.o: $(hdrdir)/ruby/backward/2/bool.h
+date_strftime.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+date_strftime.o: $(hdrdir)/ruby/backward/2/inttypes.h
+date_strftime.o: $(hdrdir)/ruby/backward/2/limits.h
+date_strftime.o: $(hdrdir)/ruby/backward/2/long_long.h
+date_strftime.o: $(hdrdir)/ruby/backward/2/stdalign.h
+date_strftime.o: $(hdrdir)/ruby/backward/2/stdarg.h
 date_strftime.o: $(hdrdir)/ruby/defines.h
 date_strftime.o: $(hdrdir)/ruby/intern.h
 date_strftime.o: $(hdrdir)/ruby/missing.h
@@ -43,17 +497,169 @@ date_strftime.o: date_strftime.c
 date_strftime.o: date_tmx.h
 date_strptime.o: $(RUBY_EXTCONF_H)
 date_strptime.o: $(arch_hdrdir)/ruby/config.h
+date_strptime.o: $(hdrdir)/ruby.h
+date_strptime.o: $(hdrdir)/ruby/internal/anyargs.h
+date_strptime.o: $(hdrdir)/ruby/internal/arithmetic.h
+date_strptime.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+date_strptime.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+date_strptime.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+date_strptime.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+date_strptime.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+date_strptime.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+date_strptime.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+date_strptime.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+date_strptime.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+date_strptime.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+date_strptime.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+date_strptime.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+date_strptime.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+date_strptime.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+date_strptime.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+date_strptime.o: $(hdrdir)/ruby/internal/assume.h
+date_strptime.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+date_strptime.o: $(hdrdir)/ruby/internal/attr/artificial.h
+date_strptime.o: $(hdrdir)/ruby/internal/attr/cold.h
+date_strptime.o: $(hdrdir)/ruby/internal/attr/const.h
+date_strptime.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+date_strptime.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+date_strptime.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+date_strptime.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+date_strptime.o: $(hdrdir)/ruby/internal/attr/error.h
+date_strptime.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+date_strptime.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+date_strptime.o: $(hdrdir)/ruby/internal/attr/format.h
+date_strptime.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+date_strptime.o: $(hdrdir)/ruby/internal/attr/noalias.h
+date_strptime.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+date_strptime.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+date_strptime.o: $(hdrdir)/ruby/internal/attr/noinline.h
+date_strptime.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+date_strptime.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+date_strptime.o: $(hdrdir)/ruby/internal/attr/pure.h
+date_strptime.o: $(hdrdir)/ruby/internal/attr/restrict.h
+date_strptime.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+date_strptime.o: $(hdrdir)/ruby/internal/attr/warning.h
+date_strptime.o: $(hdrdir)/ruby/internal/attr/weakref.h
+date_strptime.o: $(hdrdir)/ruby/internal/cast.h
+date_strptime.o: $(hdrdir)/ruby/internal/compiler_is.h
+date_strptime.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+date_strptime.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+date_strptime.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+date_strptime.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+date_strptime.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+date_strptime.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+date_strptime.o: $(hdrdir)/ruby/internal/compiler_since.h
+date_strptime.o: $(hdrdir)/ruby/internal/config.h
+date_strptime.o: $(hdrdir)/ruby/internal/constant_p.h
+date_strptime.o: $(hdrdir)/ruby/internal/core.h
+date_strptime.o: $(hdrdir)/ruby/internal/core/rarray.h
+date_strptime.o: $(hdrdir)/ruby/internal/core/rbasic.h
+date_strptime.o: $(hdrdir)/ruby/internal/core/rbignum.h
+date_strptime.o: $(hdrdir)/ruby/internal/core/rclass.h
+date_strptime.o: $(hdrdir)/ruby/internal/core/rdata.h
+date_strptime.o: $(hdrdir)/ruby/internal/core/rfile.h
+date_strptime.o: $(hdrdir)/ruby/internal/core/rhash.h
+date_strptime.o: $(hdrdir)/ruby/internal/core/rmatch.h
+date_strptime.o: $(hdrdir)/ruby/internal/core/robject.h
+date_strptime.o: $(hdrdir)/ruby/internal/core/rregexp.h
+date_strptime.o: $(hdrdir)/ruby/internal/core/rstring.h
+date_strptime.o: $(hdrdir)/ruby/internal/core/rstruct.h
+date_strptime.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+date_strptime.o: $(hdrdir)/ruby/internal/ctype.h
+date_strptime.o: $(hdrdir)/ruby/internal/dllexport.h
+date_strptime.o: $(hdrdir)/ruby/internal/dosish.h
+date_strptime.o: $(hdrdir)/ruby/internal/error.h
+date_strptime.o: $(hdrdir)/ruby/internal/eval.h
+date_strptime.o: $(hdrdir)/ruby/internal/event.h
+date_strptime.o: $(hdrdir)/ruby/internal/fl_type.h
+date_strptime.o: $(hdrdir)/ruby/internal/gc.h
+date_strptime.o: $(hdrdir)/ruby/internal/glob.h
+date_strptime.o: $(hdrdir)/ruby/internal/globals.h
+date_strptime.o: $(hdrdir)/ruby/internal/has/attribute.h
+date_strptime.o: $(hdrdir)/ruby/internal/has/builtin.h
+date_strptime.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+date_strptime.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+date_strptime.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+date_strptime.o: $(hdrdir)/ruby/internal/has/extension.h
+date_strptime.o: $(hdrdir)/ruby/internal/has/feature.h
+date_strptime.o: $(hdrdir)/ruby/internal/has/warning.h
+date_strptime.o: $(hdrdir)/ruby/internal/intern/array.h
+date_strptime.o: $(hdrdir)/ruby/internal/intern/bignum.h
+date_strptime.o: $(hdrdir)/ruby/internal/intern/class.h
+date_strptime.o: $(hdrdir)/ruby/internal/intern/compar.h
+date_strptime.o: $(hdrdir)/ruby/internal/intern/complex.h
+date_strptime.o: $(hdrdir)/ruby/internal/intern/cont.h
+date_strptime.o: $(hdrdir)/ruby/internal/intern/dir.h
+date_strptime.o: $(hdrdir)/ruby/internal/intern/enum.h
+date_strptime.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+date_strptime.o: $(hdrdir)/ruby/internal/intern/error.h
+date_strptime.o: $(hdrdir)/ruby/internal/intern/eval.h
+date_strptime.o: $(hdrdir)/ruby/internal/intern/file.h
+date_strptime.o: $(hdrdir)/ruby/internal/intern/gc.h
+date_strptime.o: $(hdrdir)/ruby/internal/intern/hash.h
+date_strptime.o: $(hdrdir)/ruby/internal/intern/io.h
+date_strptime.o: $(hdrdir)/ruby/internal/intern/load.h
+date_strptime.o: $(hdrdir)/ruby/internal/intern/marshal.h
+date_strptime.o: $(hdrdir)/ruby/internal/intern/numeric.h
+date_strptime.o: $(hdrdir)/ruby/internal/intern/object.h
+date_strptime.o: $(hdrdir)/ruby/internal/intern/parse.h
+date_strptime.o: $(hdrdir)/ruby/internal/intern/proc.h
+date_strptime.o: $(hdrdir)/ruby/internal/intern/process.h
+date_strptime.o: $(hdrdir)/ruby/internal/intern/random.h
+date_strptime.o: $(hdrdir)/ruby/internal/intern/range.h
+date_strptime.o: $(hdrdir)/ruby/internal/intern/rational.h
+date_strptime.o: $(hdrdir)/ruby/internal/intern/re.h
+date_strptime.o: $(hdrdir)/ruby/internal/intern/ruby.h
+date_strptime.o: $(hdrdir)/ruby/internal/intern/select.h
+date_strptime.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+date_strptime.o: $(hdrdir)/ruby/internal/intern/signal.h
+date_strptime.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+date_strptime.o: $(hdrdir)/ruby/internal/intern/string.h
+date_strptime.o: $(hdrdir)/ruby/internal/intern/struct.h
+date_strptime.o: $(hdrdir)/ruby/internal/intern/thread.h
+date_strptime.o: $(hdrdir)/ruby/internal/intern/time.h
+date_strptime.o: $(hdrdir)/ruby/internal/intern/variable.h
+date_strptime.o: $(hdrdir)/ruby/internal/intern/vm.h
+date_strptime.o: $(hdrdir)/ruby/internal/interpreter.h
+date_strptime.o: $(hdrdir)/ruby/internal/iterator.h
+date_strptime.o: $(hdrdir)/ruby/internal/memory.h
+date_strptime.o: $(hdrdir)/ruby/internal/method.h
+date_strptime.o: $(hdrdir)/ruby/internal/module.h
+date_strptime.o: $(hdrdir)/ruby/internal/newobj.h
+date_strptime.o: $(hdrdir)/ruby/internal/rgengc.h
+date_strptime.o: $(hdrdir)/ruby/internal/scan_args.h
+date_strptime.o: $(hdrdir)/ruby/internal/special_consts.h
+date_strptime.o: $(hdrdir)/ruby/internal/static_assert.h
+date_strptime.o: $(hdrdir)/ruby/internal/stdalign.h
+date_strptime.o: $(hdrdir)/ruby/internal/stdbool.h
+date_strptime.o: $(hdrdir)/ruby/internal/symbol.h
+date_strptime.o: $(hdrdir)/ruby/internal/token_paste.h
+date_strptime.o: $(hdrdir)/ruby/internal/value.h
+date_strptime.o: $(hdrdir)/ruby/internal/value_type.h
+date_strptime.o: $(hdrdir)/ruby/internal/variable.h
+date_strptime.o: $(hdrdir)/ruby/internal/warning_push.h
+date_strptime.o: $(hdrdir)/ruby/internal/xmalloc.h
+date_strptime.o: $(hdrdir)/ruby/assert.h
 date_strptime.o: $(hdrdir)/ruby/backward.h
+date_strptime.o: $(hdrdir)/ruby/backward/2/assume.h
+date_strptime.o: $(hdrdir)/ruby/backward/2/attributes.h
+date_strptime.o: $(hdrdir)/ruby/backward/2/bool.h
+date_strptime.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+date_strptime.o: $(hdrdir)/ruby/backward/2/inttypes.h
+date_strptime.o: $(hdrdir)/ruby/backward/2/limits.h
+date_strptime.o: $(hdrdir)/ruby/backward/2/long_long.h
+date_strptime.o: $(hdrdir)/ruby/backward/2/stdalign.h
+date_strptime.o: $(hdrdir)/ruby/backward/2/stdarg.h
 date_strptime.o: $(hdrdir)/ruby/defines.h
 date_strptime.o: $(hdrdir)/ruby/encoding.h
 date_strptime.o: $(hdrdir)/ruby/intern.h
 date_strptime.o: $(hdrdir)/ruby/missing.h
+date_strptime.o: $(hdrdir)/ruby/onigmo.h
 date_strptime.o: $(hdrdir)/ruby/oniguruma.h
 date_strptime.o: $(hdrdir)/ruby/re.h
 date_strptime.o: $(hdrdir)/ruby/regex.h
 date_strptime.o: $(hdrdir)/ruby/ruby.h
 date_strptime.o: $(hdrdir)/ruby/st.h
 date_strptime.o: $(hdrdir)/ruby/subst.h
-date_strptime.o: $(top_srcdir)/include/ruby.h
 date_strptime.o: date_strptime.c
 # AUTOGENERATED DEPENDENCIES END
diff --git a/ext/date/extconf.rb b/ext/date/extconf.rb
index e8596952de..8938df13b3 100644
--- a/ext/date/extconf.rb
+++ b/ext/date/extconf.rb
@@ -1,4 +1,9 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'mkmf'
+
 config_string("strict_warnflags") {|w| $warnflags += " #{w}"}
+
+have_var("timezone", "time.h")
+have_var("altzone", "time.h")
+
 create_makefile('date_core')
diff --git a/ext/date/lib/date.rb b/ext/date/lib/date.rb
index 48ce6316bd..0a49076ab6 100644
--- a/ext/date/lib/date.rb
+++ b/ext/date/lib/date.rb
@@ -1,13 +1,16 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 # date.rb: Written by Tadayoshi Funaba 1998-2011
 
 require 'date_core'
 
 class Date
+  VERSION = '3.1.3' # :nodoc:
 
-  class Infinity < Numeric # :nodoc:
+  def infinite?
+    false
+  end
 
-    include Comparable
+  class Infinity < Numeric # :nodoc:
 
     def initialize(d=1) @d = d <=> 0 end
 
@@ -15,17 +18,17 @@ class Date
 
     protected :d
 
-    def zero? () false end
-    def finite? () false end
-    def infinite? () d.nonzero? end
-    def nan? () d.zero? end
+    def zero?() false end
+    def finite?() false end
+    def infinite?() d.nonzero? end
+    def nan?() d.zero? end
 
     def abs() self.class.new end
 
-    def -@ () self.class.new(-d) end
-    def +@ () self.class.new(+d) end
+    def -@() self.class.new(-d) end
+    def +@() self.class.new(+d) end
 
-    def <=> (other)
+    def <=>(other)
       case other
       when Infinity; return d <=> other.d
       when Numeric; return d
diff --git a/ext/date/prereq.mk b/ext/date/prereq.mk
index e9ee35adc6..eb71e55e71 100644
--- a/ext/date/prereq.mk
+++ b/ext/date/prereq.mk
@@ -1,8 +1,12 @@
 .SUFFIXES: .list
 
 .list.h:
-	gperf -E -C -P -p -j1 -i 1 -g -o -t -N $(*F) $< \
-	| sed 's/(int)(long)&((\(struct stringpool_t\) *\*)0)->\(stringpool_[a-z0-9]*\)/offsetof(\1, \2)/g' \
+	gperf --ignore-case -C -c -P -p -j1 -i 1 -g -o -t -N $(*F) $< \
+	| sed -f $(top_srcdir)/tool/gperf.sed \
 	> $(@F)
 
 zonetab.h: zonetab.list
+
+.PHONY: update-zonetab
+update-zonetab:
+	$(RUBY) -C $(srcdir) update-abbr
diff --git a/ext/date/update-abbr b/ext/date/update-abbr
new file mode 100644
index 0000000000..7fe9734e6d
--- /dev/null
+++ b/ext/date/update-abbr
@@ -0,0 +1,52 @@
+# -*- mode: ruby -*-
+require 'nokogiri'
+require 'open-uri'
+
+doc = Nokogiri::HTML(URI.open(ARGV[0] || 'https://www.timeanddate.com/time/zones/'))
+
+h = {}
+
+doc.css('#tz-abb tbody tr').each do |tr|
+  tds = tr.css('td')
+  abbr = tds[0].text.strip.downcase
+  offset = tds[3].text.strip.gsub(/UTC\s*/, '')
+  next if offset.include?('/') # skip ambiguous timezones
+  next if offset.empty?
+
+
+  hour, min = offset.split(':', 2)
+  offset = (Integer(hour) * 60 + (Integer(min || 0)))*60
+  if h.has_key?(abbr)
+    h[abbr] = false
+  else
+    h[abbr] = offset
+  end
+end
+
+h.delete_if{|_,v| !v}
+
+lines = File.readlines('zonetab.list')
+lines.map! do |l|
+  if (sep = /^%%/ =~ l)...(sep = /^%%/ =~ l) and !sep
+    z, o = l.split(/,\s*/, 2)
+    o.strip!
+    if ho = h.delete(z) and ho != eval(o)
+      warn "offset of #{z}: #{o} -> #{ho}"
+      l = l.sub(/,\s*\K.*/) {
+        if o.include?("*")
+          o1, o2 = ho.abs.divmod(3600)
+          o1 = "#{o1}*3600"
+          o1 = "(#{o1}+#{o2})" if o2 != 0
+          ho < 0 ? "-#{o1}" : o1
+        else
+          ho.to_s
+        end
+      }
+    end
+  end
+  l
+end
+
+lines.insert(-2, h.sort.map{|k,v| "#{k},#{v}\n"})
+lines.flatten!
+File.write('zonetab.list', lines.join)
diff --git a/ext/date/zonetab.h b/ext/date/zonetab.h
index 1497eb5f65..379f78e1b8 100644
--- a/ext/date/zonetab.h
+++ b/ext/date/zonetab.h
@@ -1,6 +1,6 @@
-/* C code produced by gperf version 3.0.4 */
-/* Command-line: gperf -E -C -P -p -j1 -i 1 -g -o -t -N zonetab zonetab.list  */
-/* Computed positions: -k'1-4,$' */
+/* ANSI-C code produced by gperf version 3.1 */
+/* Command-line: gperf --ignore-case -C -c -P -p -j1 -i 1 -g -o -t -N zonetab zonetab.list  */
+/* Computed positions: -k'1-4,9' */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
       && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
@@ -26,9 +26,10 @@
       && ('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>."
+#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gperf@gnu.org>."
 #endif
 
+#define gperf_offsetof(s, n) (short)offsetof(struct s##_t, s##_str##n)
 #line 1 "zonetab.list"
 
 struct zone {
@@ -38,865 +39,1524 @@ struct zone {
 static const struct zone *zonetab();
 #line 9 "zonetab.list"
 struct zone;
-/* maximum key range = 434, duplicates = 0 */
 
-#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__cplusplus) || defined(__GNUC_STDC_INLINE__)
-inline
-#elif defined(__GNUC__)
+#define TOTAL_KEYWORDS 316
+#define MIN_WORD_LENGTH 1
+#define MAX_WORD_LENGTH 17
+#define MIN_HASH_VALUE 2
+#define MAX_HASH_VALUE 619
+/* maximum key range = 618, duplicates = 0 */
+
+#ifndef GPERF_DOWNCASE
+#define GPERF_DOWNCASE 1
+static unsigned char gperf_downcase[256] =
+  {
+      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,  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,  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, 189, 190, 191, 192, 193, 194,
+    195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
+    210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
+    225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+    240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
+    255
+  };
+#endif
+
+#ifndef GPERF_CASE_STRNCMP
+#define GPERF_CASE_STRNCMP 1
+static int
+gperf_case_strncmp (register const char *s1, register const char *s2, register size_t n)
+{
+  for (; n > 0;)
+    {
+      unsigned char c1 = gperf_downcase[(unsigned char)*s1++];
+      unsigned char c2 = gperf_downcase[(unsigned char)*s2++];
+      if (c1 != 0 && c1 == c2)
+        {
+          n--;
+          continue;
+        }
+      return (int)c1 - (int)c2;
+    }
+  return 0;
+}
+#endif
+
+#ifdef __GNUC__
 __inline
+#else
+#ifdef __cplusplus
+inline
+#endif
 #endif
 static unsigned int
-hash (str, len)
-     register const char *str;
-     register unsigned int len;
+hash (register const char *str, register size_t len)
 {
   static const unsigned short asso_values[] =
     {
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439,  19, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439,   2,   4, 439, 439, 439,
-      439, 439,   8,   6,   3, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439,   7,  63,  53,
-        2,   4,  32, 110,  88,  78,  90,  68,  47, 108,
-       10,  73,  81, 124,   3,   1,   4,  77, 116,  88,
-       15,  96,  45,   5, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620,  17, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620,   3,   2, 620, 620, 620,
+      620, 620,  70,   8,   3, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620,  39, 176, 207,  70, 168,
+        1,   5,  18,  74, 218,   2, 117, 130,  48,  88,
+      125, 225,  92,   1,   1,  12,  54,  30,  36,  13,
+       48, 168, 263,  59, 114, 166, 109,  39, 176, 207,
+       70, 168,   1,   5,  18,  74, 218,   2, 117, 130,
+       48,  88, 125, 225,  92,   1,   1,  12,  54,  30,
+       36,  13,  48, 168, 263,  59, 114, 166, 109,  27,
+      104,   1,   9,   4, 309, 190, 188, 177, 255, 108,
+        2, 341,   3, 620, 620, 620, 620, 620, 620,  12,
+       54,  30,  36,  13,  48, 168, 263,  59, 114, 166,
+      109,  27, 104,   1,   9,   4, 309, 190, 188, 177,
+      255, 108,   2, 341,   3, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+      620, 620, 620, 620, 620, 620, 620, 620
     };
-  register int hval = len;
+  register unsigned int hval = (unsigned int)len;
 
   switch (hval)
     {
       default:
+        hval += asso_values[(unsigned char)str[8]];
+      /*FALLTHROUGH*/
+      case 8:
+      case 7:
+      case 6:
+      case 5:
+      case 4:
         hval += asso_values[(unsigned char)str[3]];
       /*FALLTHROUGH*/
       case 3:
         hval += asso_values[(unsigned char)str[2]];
       /*FALLTHROUGH*/
       case 2:
-        hval += asso_values[(unsigned char)str[1]];
+        hval += asso_values[(unsigned char)str[1]+6];
       /*FALLTHROUGH*/
       case 1:
-        hval += asso_values[(unsigned char)str[0]+1];
+        hval += asso_values[(unsigned char)str[0]+52];
         break;
     }
-  return hval + asso_values[(unsigned char)str[len - 1]];
+  return (unsigned int)hval;
 }
 
 struct stringpool_t
   {
-    char stringpool_str5[sizeof("r")];
-    char stringpool_str6[sizeof("s")];
-    char stringpool_str7[sizeof("d")];
-    char stringpool_str14[sizeof("cst")];
-    char stringpool_str15[sizeof("cdt")];
-    char stringpool_str16[sizeof("sst")];
-    char stringpool_str17[sizeof("cet")];
-    char stringpool_str18[sizeof("msd")];
-    char stringpool_str19[sizeof("cest")];
-    char stringpool_str20[sizeof("cat")];
-    char stringpool_str22[sizeof("mst")];
-    char stringpool_str23[sizeof("mdt")];
-    char stringpool_str24[sizeof("sast")];
-    char stringpool_str25[sizeof("met")];
-    char stringpool_str27[sizeof("mest")];
-    char stringpool_str30[sizeof("wet")];
-    char stringpool_str31[sizeof("dateline")];
-    char stringpool_str32[sizeof("west")];
-    char stringpool_str33[sizeof("wat")];
-    char stringpool_str35[sizeof("wast")];
-    char stringpool_str36[sizeof("wadt")];
-    char stringpool_str37[sizeof("e")];
-    char stringpool_str38[sizeof("central europe")];
-    char stringpool_str39[sizeof("central asia")];
-    char stringpool_str40[sizeof("west asia")];
-    char stringpool_str41[sizeof("cen. australia")];
-    char stringpool_str42[sizeof("central america")];
-    char stringpool_str44[sizeof("est")];
-    char stringpool_str45[sizeof("edt")];
-    char stringpool_str46[sizeof("central european")];
-    char stringpool_str47[sizeof("eet")];
-    char stringpool_str48[sizeof("se asia")];
-    char stringpool_str49[sizeof("eest")];
-    char stringpool_str50[sizeof("eat")];
-    char stringpool_str51[sizeof("z")];
-    char stringpool_str52[sizeof("east")];
-    char stringpool_str53[sizeof("eadt")];
-    char stringpool_str54[sizeof("sa eastern")];
-    char stringpool_str55[sizeof("w. europe")];
-    char stringpool_str56[sizeof("c")];
-    char stringpool_str57[sizeof("yst")];
-    char stringpool_str58[sizeof("ydt")];
-    char stringpool_str59[sizeof("kst")];
-    char stringpool_str60[sizeof("clt")];
-    char stringpool_str61[sizeof("eastern")];
-    char stringpool_str62[sizeof("clst")];
-    char stringpool_str63[sizeof("bt")];
-    char stringpool_str64[sizeof("w. australia")];
-    char stringpool_str65[sizeof("bst")];
-    char stringpool_str66[sizeof("cct")];
-    char stringpool_str67[sizeof("brt")];
-    char stringpool_str69[sizeof("brst")];
-    char stringpool_str71[sizeof("a")];
-    char stringpool_str72[sizeof("e. europe")];
-    char stringpool_str73[sizeof("at")];
-    char stringpool_str74[sizeof("central")];
-    char stringpool_str75[sizeof("ast")];
-    char stringpool_str76[sizeof("adt")];
-    char stringpool_str77[sizeof("art")];
-    char stringpool_str78[sizeof("e. africa")];
-    char stringpool_str79[sizeof("e. south america")];
-    char stringpool_str80[sizeof("jst")];
-    char stringpool_str81[sizeof("e. australia")];
-    char stringpool_str82[sizeof("t")];
-    char stringpool_str83[sizeof("nt")];
-    char stringpool_str84[sizeof("n")];
-    char stringpool_str85[sizeof("nst")];
-    char stringpool_str86[sizeof("ndt")];
-    char stringpool_str87[sizeof("canada central")];
-    char stringpool_str88[sizeof("central pacific")];
-    char stringpool_str89[sizeof("west pacific")];
-    char stringpool_str90[sizeof("hst")];
-    char stringpool_str91[sizeof("hdt")];
-    char stringpool_str93[sizeof("malay peninsula")];
-    char stringpool_str95[sizeof("zp6")];
-    char stringpool_str97[sizeof("russian")];
-    char stringpool_str98[sizeof("hast")];
-    char stringpool_str99[sizeof("hadt")];
-    char stringpool_str100[sizeof("gst")];
-    char stringpool_str101[sizeof("zp5")];
-    char stringpool_str102[sizeof("ist")];
-    char stringpool_str103[sizeof("swt")];
-    char stringpool_str104[sizeof("w")];
-    char stringpool_str105[sizeof("zp4")];
-    char stringpool_str107[sizeof("mez")];
-    char stringpool_str108[sizeof("cape verde")];
-    char stringpool_str109[sizeof("mesz")];
-    char stringpool_str110[sizeof("greenland")];
-    char stringpool_str112[sizeof("x")];
-    char stringpool_str114[sizeof("mewt")];
-    char stringpool_str115[sizeof("w. central africa")];
-    char stringpool_str116[sizeof("k")];
-    char stringpool_str117[sizeof("b")];
-    char stringpool_str119[sizeof("m")];
-    char stringpool_str120[sizeof("sri lanka")];
-    char stringpool_str122[sizeof("fst")];
-    char stringpool_str124[sizeof("iran")];
-    char stringpool_str125[sizeof("sgt")];
-    char stringpool_str126[sizeof("ut")];
-    char stringpool_str128[sizeof("q")];
-    char stringpool_str129[sizeof("nzt")];
-    char stringpool_str131[sizeof("nzst")];
-    char stringpool_str132[sizeof("nzdt")];
-    char stringpool_str133[sizeof("myanmar")];
-    char stringpool_str135[sizeof("alaskan")];
-    char stringpool_str136[sizeof("pst")];
-    char stringpool_str137[sizeof("pdt")];
-    char stringpool_str138[sizeof("sa western")];
-    char stringpool_str139[sizeof("korea")];
-    char stringpool_str142[sizeof("y")];
-    char stringpool_str143[sizeof("f")];
-    char stringpool_str144[sizeof("akst")];
-    char stringpool_str145[sizeof("akdt")];
-    char stringpool_str148[sizeof("caucasus")];
-    char stringpool_str150[sizeof("msk")];
-    char stringpool_str151[sizeof("idle")];
-    char stringpool_str153[sizeof("arabian")];
-    char stringpool_str155[sizeof("o")];
-    char stringpool_str156[sizeof("l")];
-    char stringpool_str157[sizeof("mid-atlantic")];
-    char stringpool_str160[sizeof("us eastern")];
-    char stringpool_str164[sizeof("ahst")];
-    char stringpool_str167[sizeof("h")];
-    char stringpool_str168[sizeof("fle")];
-    char stringpool_str169[sizeof("i")];
-    char stringpool_str170[sizeof("north asia")];
-    char stringpool_str171[sizeof("n. central asia")];
-    char stringpool_str172[sizeof("north asia east")];
-    char stringpool_str174[sizeof("sa pacific")];
-    char stringpool_str177[sizeof("south africa")];
-    char stringpool_str181[sizeof("aus eastern")];
-    char stringpool_str182[sizeof("atlantic")];
-    char stringpool_str186[sizeof("mexico")];
-    char stringpool_str188[sizeof("mountain")];
-    char stringpool_str190[sizeof("china")];
-    char stringpool_str191[sizeof("azores")];
-    char stringpool_str192[sizeof("india")];
-    char stringpool_str194[sizeof("u")];
-    char stringpool_str195[sizeof("arabic")];
-    char stringpool_str196[sizeof("greenwich")];
-    char stringpool_str197[sizeof("new zealand")];
-    char stringpool_str198[sizeof("hawaiian")];
-    char stringpool_str199[sizeof("g")];
-    char stringpool_str200[sizeof("romance")];
-    char stringpool_str203[sizeof("arab")];
-    char stringpool_str204[sizeof("samoa")];
-    char stringpool_str205[sizeof("v")];
-    char stringpool_str206[sizeof("p")];
-    char stringpool_str207[sizeof("gmt")];
-    char stringpool_str208[sizeof("tasmania")];
-    char stringpool_str209[sizeof("fwt")];
-    char stringpool_str211[sizeof("newfoundland")];
-    char stringpool_str217[sizeof("nepal")];
-    char stringpool_str218[sizeof("aus central")];
-    char stringpool_str221[sizeof("gtb")];
-    char stringpool_str223[sizeof("vladivostok")];
-    char stringpool_str229[sizeof("utc")];
-    char stringpool_str233[sizeof("ekaterinburg")];
-    char stringpool_str265[sizeof("us mountain")];
-    char stringpool_str269[sizeof("jerusalem")];
-    char stringpool_str272[sizeof("yakutsk")];
-    char stringpool_str279[sizeof("pacific sa")];
-    char stringpool_str282[sizeof("tonga")];
-    char stringpool_str314[sizeof("afghanistan")];
-    char stringpool_str319[sizeof("idlw")];
-    char stringpool_str322[sizeof("pacific")];
-    char stringpool_str327[sizeof("taipei")];
-    char stringpool_str328[sizeof("egypt")];
-    char stringpool_str392[sizeof("tokyo")];
-    char stringpool_str438[sizeof("fiji")];
+    char stringpool_str2[sizeof("o")];
+    char stringpool_str3[sizeof("x")];
+    char stringpool_str4[sizeof("z")];
+    char stringpool_str5[sizeof("q")];
+    char stringpool_str8[sizeof("omst")];
+    char stringpool_str9[sizeof("omsst")];
+    char stringpool_str10[sizeof("p")];
+    char stringpool_str13[sizeof("a")];
+    char stringpool_str14[sizeof("e")];
+    char stringpool_str15[sizeof("pet")];
+    char stringpool_str16[sizeof("pmst")];
+    char stringpool_str17[sizeof("pett")];
+    char stringpool_str18[sizeof("petst")];
+    char stringpool_str19[sizeof("eet")];
+    char stringpool_str20[sizeof("aest")];
+    char stringpool_str21[sizeof("eest")];
+    char stringpool_str22[sizeof("eat")];
+    char stringpool_str24[sizeof("east")];
+    char stringpool_str25[sizeof("easst")];
+    char stringpool_str26[sizeof("pst")];
+    char stringpool_str27[sizeof("eastern")];
+    char stringpool_str28[sizeof("m")];
+    char stringpool_str29[sizeof("ast")];
+    char stringpool_str30[sizeof("est")];
+    char stringpool_str31[sizeof("c")];
+    char stringpool_str32[sizeof("mmt")];
+    char stringpool_str33[sizeof("met")];
+    char stringpool_str35[sizeof("mest")];
+    char stringpool_str36[sizeof("cet")];
+    char stringpool_str37[sizeof("d")];
+    char stringpool_str38[sizeof("cest")];
+    char stringpool_str39[sizeof("cat")];
+    char stringpool_str41[sizeof("cast")];
+    char stringpool_str42[sizeof("magt")];
+    char stringpool_str43[sizeof("magst")];
+    char stringpool_str44[sizeof("mst")];
+    char stringpool_str45[sizeof("msk")];
+    char stringpool_str46[sizeof("cot")];
+    char stringpool_str47[sizeof("cst")];
+    char stringpool_str48[sizeof("aqtt")];
+    char stringpool_str49[sizeof("f")];
+    char stringpool_str52[sizeof("art")];
+    char stringpool_str53[sizeof("fnt")];
+    char stringpool_str54[sizeof("fet")];
+    char stringpool_str55[sizeof("b")];
+    char stringpool_str57[sizeof("anat")];
+    char stringpool_str58[sizeof("anast")];
+    char stringpool_str59[sizeof("bnt")];
+    char stringpool_str60[sizeof("i")];
+    char stringpool_str61[sizeof("pht")];
+    char stringpool_str62[sizeof("at")];
+    char stringpool_str63[sizeof("zp6")];
+    char stringpool_str64[sizeof("mewt")];
+    char stringpool_str65[sizeof("fst")];
+    char stringpool_str66[sizeof("ahst")];
+    char stringpool_str67[sizeof("mawt")];
+    char stringpool_str68[sizeof("zp5")];
+    char stringpool_str70[sizeof("bot")];
+    char stringpool_str71[sizeof("bst")];
+    char stringpool_str72[sizeof("pwt")];
+    char stringpool_str74[sizeof("pont")];
+    char stringpool_str75[sizeof("iot")];
+    char stringpool_str76[sizeof("ist")];
+    char stringpool_str77[sizeof("awst")];
+    char stringpool_str79[sizeof("mht")];
+    char stringpool_str80[sizeof("mez")];
+    char stringpool_str81[sizeof("orat")];
+    char stringpool_str82[sizeof("mesz")];
+    char stringpool_str84[sizeof("chst")];
+    char stringpool_str85[sizeof("pmdt")];
+    char stringpool_str88[sizeof("central")];
+    char stringpool_str89[sizeof("aedt")];
+    char stringpool_str90[sizeof("act")];
+    char stringpool_str91[sizeof("ect")];
+    char stringpool_str92[sizeof("acst")];
+    char stringpool_str93[sizeof("eadt")];
+    char stringpool_str94[sizeof("brt")];
+    char stringpool_str95[sizeof("chut")];
+    char stringpool_str96[sizeof("brst")];
+    char stringpool_str97[sizeof("cen. australia")];
+    char stringpool_str100[sizeof("davt")];
+    char stringpool_str101[sizeof("irst")];
+    char stringpool_str102[sizeof("irkt")];
+    char stringpool_str103[sizeof("irkst")];
+    char stringpool_str104[sizeof("bt")];
+    char stringpool_str105[sizeof("n")];
+    char stringpool_str106[sizeof("btt")];
+    char stringpool_str107[sizeof("mountain")];
+    char stringpool_str108[sizeof("cct")];
+    char stringpool_str109[sizeof("w")];
+    char stringpool_str110[sizeof("l")];
+    char stringpool_str111[sizeof("fwt")];
+    char stringpool_str113[sizeof("msd")];
+    char stringpool_str114[sizeof("wet")];
+    char stringpool_str116[sizeof("west")];
+    char stringpool_str117[sizeof("wat")];
+    char stringpool_str119[sizeof("wast")];
+    char stringpool_str120[sizeof("wakt")];
+    char stringpool_str121[sizeof("nst")];
+    char stringpool_str122[sizeof("acwst")];
+    char stringpool_str123[sizeof("chast")];
+    char stringpool_str124[sizeof("cist")];
+    char stringpool_str125[sizeof("azt")];
+    char stringpool_str126[sizeof("clt")];
+    char stringpool_str127[sizeof("azst")];
+    char stringpool_str128[sizeof("clst")];
+    char stringpool_str129[sizeof("mart")];
+    char stringpool_str130[sizeof("zp4")];
+    char stringpool_str131[sizeof("jst")];
+    char stringpool_str132[sizeof("central asia")];
+    char stringpool_str133[sizeof("aft")];
+    char stringpool_str134[sizeof("e. south america")];
+    char stringpool_str135[sizeof("central america")];
+    char stringpool_str137[sizeof("ict")];
+    char stringpool_str143[sizeof("pgt")];
+    char stringpool_str144[sizeof("nrt")];
+    char stringpool_str145[sizeof("mexico")];
+    char stringpool_str146[sizeof("awdt")];
+    char stringpool_str147[sizeof("egt")];
+    char stringpool_str148[sizeof("cxt")];
+    char stringpool_str149[sizeof("egst")];
+    char stringpool_str150[sizeof("phot")];
+    char stringpool_str151[sizeof("alaskan")];
+    char stringpool_str154[sizeof("nt")];
+    char stringpool_str158[sizeof("wt")];
+    char stringpool_str160[sizeof("west asia")];
+    char stringpool_str161[sizeof("acdt")];
+    char stringpool_str162[sizeof("npt")];
+    char stringpool_str163[sizeof("lhst")];
+    char stringpool_str164[sizeof("afghanistan")];
+    char stringpool_str167[sizeof("k")];
+    char stringpool_str169[sizeof("g")];
+    char stringpool_str170[sizeof("irdt")];
+    char stringpool_str171[sizeof("chot")];
+    char stringpool_str172[sizeof("chost")];
+    char stringpool_str173[sizeof("gmt")];
+    char stringpool_str174[sizeof("get")];
+    char stringpool_str175[sizeof("novt")];
+    char stringpool_str176[sizeof("novst")];
+    char stringpool_str177[sizeof("fjt")];
+    char stringpool_str178[sizeof("u")];
+    char stringpool_str179[sizeof("fjst")];
+    char stringpool_str181[sizeof("pyst")];
+    char stringpool_str182[sizeof("nct")];
+    char stringpool_str183[sizeof("kst")];
+    char stringpool_str184[sizeof("kost")];
+    char stringpool_str185[sizeof("gst")];
+    char stringpool_str186[sizeof("iran")];
+    char stringpool_str187[sizeof("e. africa")];
+    char stringpool_str188[sizeof("wadt")];
+    char stringpool_str189[sizeof("t")];
+    char stringpool_str190[sizeof("e. australia")];
+    char stringpool_str191[sizeof("s")];
+    char stringpool_str192[sizeof("chadt")];
+    char stringpool_str193[sizeof("tmt")];
+    char stringpool_str194[sizeof("cidst")];
+    char stringpool_str195[sizeof("aoe")];
+    char stringpool_str197[sizeof("myt")];
+    char stringpool_str198[sizeof("west pacific")];
+    char stringpool_str199[sizeof("mut")];
+    char stringpool_str200[sizeof("wit")];
+    char stringpool_str201[sizeof("sast")];
+    char stringpool_str202[sizeof("sakt")];
+    char stringpool_str203[sizeof("new zealand")];
+    char stringpool_str204[sizeof("tot")];
+    char stringpool_str205[sizeof("china")];
+    char stringpool_str206[sizeof("tost")];
+    char stringpool_str207[sizeof("sst")];
+    char stringpool_str209[sizeof("india")];
+    char stringpool_str211[sizeof("warst")];
+    char stringpool_str212[sizeof("sbt")];
+    char stringpool_str214[sizeof("azot")];
+    char stringpool_str215[sizeof("azost")];
+    char stringpool_str216[sizeof("taht")];
+    char stringpool_str217[sizeof("nzt")];
+    char stringpool_str218[sizeof("dateline")];
+    char stringpool_str219[sizeof("nzst")];
+    char stringpool_str220[sizeof("tokyo")];
+    char stringpool_str221[sizeof("central pacific")];
+    char stringpool_str223[sizeof("qyzt")];
+    char stringpool_str224[sizeof("atlantic")];
+    char stringpool_str225[sizeof("nft")];
+    char stringpool_str227[sizeof("ut")];
+    char stringpool_str228[sizeof("trt")];
+    char stringpool_str229[sizeof("wft")];
+    char stringpool_str230[sizeof("srt")];
+    char stringpool_str231[sizeof("pdt")];
+    char stringpool_str232[sizeof("lhdt")];
+    char stringpool_str234[sizeof("adt")];
+    char stringpool_str235[sizeof("edt")];
+    char stringpool_str238[sizeof("pkt")];
+    char stringpool_str239[sizeof("almt")];
+    char stringpool_str240[sizeof("wita")];
+    char stringpool_str242[sizeof("wgt")];
+    char stringpool_str243[sizeof("akst")];
+    char stringpool_str244[sizeof("wgst")];
+    char stringpool_str246[sizeof("krat")];
+    char stringpool_str247[sizeof("krast")];
+    char stringpool_str248[sizeof("mid-atlantic")];
+    char stringpool_str249[sizeof("mdt")];
+    char stringpool_str250[sizeof("lint")];
+    char stringpool_str251[sizeof("malay peninsula")];
+    char stringpool_str252[sizeof("cdt")];
+    char stringpool_str253[sizeof("swt")];
+    char stringpool_str255[sizeof("se asia")];
+    char stringpool_str256[sizeof("v")];
+    char stringpool_str258[sizeof("tonga")];
+    char stringpool_str259[sizeof("ckt")];
+    char stringpool_str261[sizeof("vet")];
+    char stringpool_str262[sizeof("caucasus")];
+    char stringpool_str263[sizeof("central europe")];
+    char stringpool_str264[sizeof("h")];
+    char stringpool_str265[sizeof("central european")];
+    char stringpool_str266[sizeof("newfoundland")];
+    char stringpool_str267[sizeof("arab")];
+    char stringpool_str268[sizeof("sct")];
+    char stringpool_str269[sizeof("arabic")];
+    char stringpool_str270[sizeof("arabian")];
+    char stringpool_str271[sizeof("ddut")];
+    char stringpool_str273[sizeof("vost")];
+    char stringpool_str274[sizeof("hast")];
+    char stringpool_str275[sizeof("nepal")];
+    char stringpool_str276[sizeof("nut")];
+    char stringpool_str277[sizeof("fkt")];
+    char stringpool_str279[sizeof("fkst")];
+    char stringpool_str280[sizeof("hst")];
+    char stringpool_str281[sizeof("idt")];
+    char stringpool_str284[sizeof("tlt")];
+    char stringpool_str285[sizeof("w. australia")];
+    char stringpool_str286[sizeof("egypt")];
+    char stringpool_str287[sizeof("myanmar")];
+    char stringpool_str288[sizeof("nzdt")];
+    char stringpool_str289[sizeof("gft")];
+    char stringpool_str290[sizeof("uzt")];
+    char stringpool_str293[sizeof("north asia")];
+    char stringpool_str294[sizeof("mvt")];
+    char stringpool_str295[sizeof("galt")];
+    char stringpool_str296[sizeof("nfdt")];
+    char stringpool_str297[sizeof("cvt")];
+    char stringpool_str298[sizeof("north asia east")];
+    char stringpool_str300[sizeof("kgt")];
+    char stringpool_str301[sizeof("aus central")];
+    char stringpool_str302[sizeof("pacific")];
+    char stringpool_str304[sizeof("canada central")];
+    char stringpool_str306[sizeof("pacific sa")];
+    char stringpool_str307[sizeof("azores")];
+    char stringpool_str308[sizeof("gamt")];
+    char stringpool_str309[sizeof("tft")];
+    char stringpool_str310[sizeof("r")];
+    char stringpool_str311[sizeof("fle")];
+    char stringpool_str312[sizeof("akdt")];
+    char stringpool_str313[sizeof("ulat")];
+    char stringpool_str314[sizeof("ulast")];
+    char stringpool_str315[sizeof("ret")];
+    char stringpool_str317[sizeof("tjt")];
+    char stringpool_str319[sizeof("south africa")];
+    char stringpool_str324[sizeof("sgt")];
+    char stringpool_str326[sizeof("ndt")];
+    char stringpool_str327[sizeof("rott")];
+    char stringpool_str330[sizeof("samt")];
+    char stringpool_str332[sizeof("tasmania")];
+    char stringpool_str334[sizeof("hovt")];
+    char stringpool_str335[sizeof("hovst")];
+    char stringpool_str338[sizeof("gyt")];
+    char stringpool_str342[sizeof("y")];
+    char stringpool_str343[sizeof("hadt")];
+    char stringpool_str344[sizeof("sa western")];
+    char stringpool_str345[sizeof("hawaiian")];
+    char stringpool_str347[sizeof("uyt")];
+    char stringpool_str349[sizeof("uyst")];
+    char stringpool_str350[sizeof("yekt")];
+    char stringpool_str351[sizeof("yekst")];
+    char stringpool_str352[sizeof("kuyt")];
+    char stringpool_str353[sizeof("yakt")];
+    char stringpool_str354[sizeof("yakst")];
+    char stringpool_str358[sizeof("yst")];
+    char stringpool_str359[sizeof("jerusalem")];
+    char stringpool_str365[sizeof("sri lanka")];
+    char stringpool_str367[sizeof("yakutsk")];
+    char stringpool_str375[sizeof("wib")];
+    char stringpool_str377[sizeof("aus eastern")];
+    char stringpool_str378[sizeof("gilt")];
+    char stringpool_str387[sizeof("us mountain")];
+    char stringpool_str391[sizeof("vlat")];
+    char stringpool_str392[sizeof("vlast")];
+    char stringpool_str395[sizeof("gtb")];
+    char stringpool_str398[sizeof("taipei")];
+    char stringpool_str399[sizeof("sret")];
+    char stringpool_str408[sizeof("cape verde")];
+    char stringpool_str417[sizeof("tkt")];
+    char stringpool_str418[sizeof("samoa")];
+    char stringpool_str421[sizeof("sa pacific")];
+    char stringpool_str427[sizeof("vut")];
+    char stringpool_str428[sizeof("idlw")];
+    char stringpool_str432[sizeof("fiji")];
+    char stringpool_str435[sizeof("utc")];
+    char stringpool_str443[sizeof("korea")];
+    char stringpool_str445[sizeof("e. europe")];
+    char stringpool_str449[sizeof("syot")];
+    char stringpool_str452[sizeof("n. central asia")];
+    char stringpool_str455[sizeof("tvt")];
+    char stringpool_str458[sizeof("w. central africa")];
+    char stringpool_str466[sizeof("ekaterinburg")];
+    char stringpool_str468[sizeof("vladivostok")];
+    char stringpool_str476[sizeof("yapt")];
+    char stringpool_str477[sizeof("us eastern")];
+    char stringpool_str482[sizeof("sa eastern")];
+    char stringpool_str485[sizeof("hdt")];
+    char stringpool_str486[sizeof("russian")];
+    char stringpool_str492[sizeof("hkt")];
+    char stringpool_str497[sizeof("romance")];
+    char stringpool_str540[sizeof("w. europe")];
+    char stringpool_str563[sizeof("ydt")];
+    char stringpool_str566[sizeof("idle")];
+    char stringpool_str567[sizeof("greenwich")];
+    char stringpool_str619[sizeof("greenland")];
   };
 static const struct stringpool_t stringpool_contents =
   {
-    "r",
-    "s",
-    "d",
-    "cst",
-    "cdt",
-    "sst",
-    "cet",
-    "msd",
-    "cest",
-    "cat",
-    "mst",
-    "mdt",
-    "sast",
-    "met",
-    "mest",
-    "wet",
-    "dateline",
-    "west",
-    "wat",
-    "wast",
-    "wadt",
+    "o",
+    "x",
+    "z",
+    "q",
+    "omst",
+    "omsst",
+    "p",
+    "a",
     "e",
-    "central europe",
-    "central asia",
-    "west asia",
-    "cen. australia",
-    "central america",
-    "est",
-    "edt",
-    "central european",
+    "pet",
+    "pmst",
+    "pett",
+    "petst",
     "eet",
-    "se asia",
+    "aest",
     "eest",
     "eat",
-    "z",
     "east",
-    "eadt",
-    "sa eastern",
-    "w. europe",
-    "c",
-    "yst",
-    "ydt",
-    "kst",
-    "clt",
+    "easst",
+    "pst",
     "eastern",
-    "clst",
-    "bt",
-    "w. australia",
-    "bst",
-    "cct",
-    "brt",
-    "brst",
-    "a",
-    "e. europe",
-    "at",
-    "central",
+    "m",
     "ast",
-    "adt",
+    "est",
+    "c",
+    "mmt",
+    "met",
+    "mest",
+    "cet",
+    "d",
+    "cest",
+    "cat",
+    "cast",
+    "magt",
+    "magst",
+    "mst",
+    "msk",
+    "cot",
+    "cst",
+    "aqtt",
+    "f",
     "art",
-    "e. africa",
-    "e. south america",
-    "jst",
-    "e. australia",
-    "t",
-    "nt",
-    "n",
-    "nst",
-    "ndt",
-    "canada central",
-    "central pacific",
-    "west pacific",
-    "hst",
-    "hdt",
-    "malay peninsula",
+    "fnt",
+    "fet",
+    "b",
+    "anat",
+    "anast",
+    "bnt",
+    "i",
+    "pht",
+    "at",
     "zp6",
-    "russian",
-    "hast",
-    "hadt",
-    "gst",
+    "mewt",
+    "fst",
+    "ahst",
+    "mawt",
     "zp5",
+    "bot",
+    "bst",
+    "pwt",
+    "pont",
+    "iot",
     "ist",
-    "swt",
-    "w",
-    "zp4",
+    "awst",
+    "mht",
     "mez",
-    "cape verde",
+    "orat",
     "mesz",
-    "greenland",
-    "x",
-    "mewt",
-    "w. central africa",
+    "chst",
+    "pmdt",
+    "central",
+    "aedt",
+    "act",
+    "ect",
+    "acst",
+    "eadt",
+    "brt",
+    "chut",
+    "brst",
+    "cen. australia",
+    "davt",
+    "irst",
+    "irkt",
+    "irkst",
+    "bt",
+    "n",
+    "btt",
+    "mountain",
+    "cct",
+    "w",
+    "l",
+    "fwt",
+    "msd",
+    "wet",
+    "west",
+    "wat",
+    "wast",
+    "wakt",
+    "nst",
+    "acwst",
+    "chast",
+    "cist",
+    "azt",
+    "clt",
+    "azst",
+    "clst",
+    "mart",
+    "zp4",
+    "jst",
+    "central asia",
+    "aft",
+    "e. south america",
+    "central america",
+    "ict",
+    "pgt",
+    "nrt",
+    "mexico",
+    "awdt",
+    "egt",
+    "cxt",
+    "egst",
+    "phot",
+    "alaskan",
+    "nt",
+    "wt",
+    "west asia",
+    "acdt",
+    "npt",
+    "lhst",
+    "afghanistan",
     "k",
-    "b",
-    "m",
-    "sri lanka",
-    "fst",
+    "g",
+    "irdt",
+    "chot",
+    "chost",
+    "gmt",
+    "get",
+    "novt",
+    "novst",
+    "fjt",
+    "u",
+    "fjst",
+    "pyst",
+    "nct",
+    "kst",
+    "kost",
+    "gst",
     "iran",
-    "sgt",
-    "ut",
-    "q",
+    "e. africa",
+    "wadt",
+    "t",
+    "e. australia",
+    "s",
+    "chadt",
+    "tmt",
+    "cidst",
+    "aoe",
+    "myt",
+    "west pacific",
+    "mut",
+    "wit",
+    "sast",
+    "sakt",
+    "new zealand",
+    "tot",
+    "china",
+    "tost",
+    "sst",
+    "india",
+    "warst",
+    "sbt",
+    "azot",
+    "azost",
+    "taht",
     "nzt",
+    "dateline",
     "nzst",
-    "nzdt",
-    "myanmar",
-    "alaskan",
-    "pst",
+    "tokyo",
+    "central pacific",
+    "qyzt",
+    "atlantic",
+    "nft",
+    "ut",
+    "trt",
+    "wft",
+    "srt",
     "pdt",
-    "sa western",
-    "korea",
-    "y",
-    "f",
+    "lhdt",
+    "adt",
+    "edt",
+    "pkt",
+    "almt",
+    "wita",
+    "wgt",
     "akst",
-    "akdt",
-    "caucasus",
-    "msk",
-    "idle",
-    "arabian",
-    "o",
-    "l",
+    "wgst",
+    "krat",
+    "krast",
     "mid-atlantic",
-    "us eastern",
-    "ahst",
+    "mdt",
+    "lint",
+    "malay peninsula",
+    "cdt",
+    "swt",
+    "se asia",
+    "v",
+    "tonga",
+    "ckt",
+    "vet",
+    "caucasus",
+    "central europe",
     "h",
-    "fle",
-    "i",
+    "central european",
+    "newfoundland",
+    "arab",
+    "sct",
+    "arabic",
+    "arabian",
+    "ddut",
+    "vost",
+    "hast",
+    "nepal",
+    "nut",
+    "fkt",
+    "fkst",
+    "hst",
+    "idt",
+    "tlt",
+    "w. australia",
+    "egypt",
+    "myanmar",
+    "nzdt",
+    "gft",
+    "uzt",
     "north asia",
-    "n. central asia",
+    "mvt",
+    "galt",
+    "nfdt",
+    "cvt",
     "north asia east",
-    "sa pacific",
-    "south africa",
-    "aus eastern",
-    "atlantic",
-    "mexico",
-    "mountain",
-    "china",
+    "kgt",
+    "aus central",
+    "pacific",
+    "canada central",
+    "pacific sa",
     "azores",
-    "india",
-    "u",
-    "arabic",
-    "greenwich",
-    "new zealand",
-    "hawaiian",
-    "g",
-    "romance",
-    "arab",
-    "samoa",
-    "v",
-    "p",
-    "gmt",
+    "gamt",
+    "tft",
+    "r",
+    "fle",
+    "akdt",
+    "ulat",
+    "ulast",
+    "ret",
+    "tjt",
+    "south africa",
+    "sgt",
+    "ndt",
+    "rott",
+    "samt",
     "tasmania",
-    "fwt",
-    "newfoundland",
-    "nepal",
-    "aus central",
-    "gtb",
-    "vladivostok",
-    "utc",
-    "ekaterinburg",
-    "us mountain",
+    "hovt",
+    "hovst",
+    "gyt",
+    "y",
+    "hadt",
+    "sa western",
+    "hawaiian",
+    "uyt",
+    "uyst",
+    "yekt",
+    "yekst",
+    "kuyt",
+    "yakt",
+    "yakst",
+    "yst",
     "jerusalem",
+    "sri lanka",
     "yakutsk",
-    "pacific sa",
-    "tonga",
-    "afghanistan",
-    "idlw",
-    "pacific",
+    "wib",
+    "aus eastern",
+    "gilt",
+    "us mountain",
+    "vlat",
+    "vlast",
+    "gtb",
     "taipei",
-    "egypt",
-    "tokyo",
-    "fiji"
+    "sret",
+    "cape verde",
+    "tkt",
+    "samoa",
+    "sa pacific",
+    "vut",
+    "idlw",
+    "fiji",
+    "utc",
+    "korea",
+    "e. europe",
+    "syot",
+    "n. central asia",
+    "tvt",
+    "w. central africa",
+    "ekaterinburg",
+    "vladivostok",
+    "yapt",
+    "us eastern",
+    "sa eastern",
+    "hdt",
+    "russian",
+    "hkt",
+    "romance",
+    "w. europe",
+    "ydt",
+    "idle",
+    "greenwich",
+    "greenland"
   };
 #define stringpool ((const char *) &stringpool_contents)
-#ifdef __GNUC__
-__inline
-#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
-__attribute__ ((__gnu_inline__))
-#endif
-#endif
 const struct zone *
-zonetab (str, len)
-     register const char *str;
-     register unsigned int len;
+zonetab (register const char *str, register size_t len)
 {
-  enum
-    {
-      TOTAL_KEYWORDS = 170,
-      MIN_WORD_LENGTH = 1,
-      MAX_WORD_LENGTH = 17,
-      MIN_HASH_VALUE = 5,
-      MAX_HASH_VALUE = 438
-    };
-
   static const struct zone wordlist[] =
     {
-      {-1}, {-1}, {-1}, {-1}, {-1},
-#line 37 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str5),   -5*3600},
-#line 38 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str6),   -6*3600},
-#line 24 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str7),    4*3600},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 15 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str14), -6*3600},
-#line 16 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str15), -5*3600},
-#line 85 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str16),  2*3600},
-#line 71 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str17),  1*3600},
-#line 90 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str18),  4*3600},
-#line 79 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str19), 2*3600},
-#line 65 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str20),-10*3600},
-      {-1},
-#line 17 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str22), -7*3600},
-#line 18 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str23), -6*3600},
-#line 84 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str24), 2*3600},
-#line 73 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str25),  1*3600},
-      {-1},
-#line 82 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str27), 2*3600},
       {-1}, {-1},
-#line 47 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str30),  0*3600},
-#line 128 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str31),               -43200},
-#line 78 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str32), 1*3600},
-#line 77 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str33),  1*3600},
-      {-1},
-#line 95 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str35), 7*3600},
-#line 98 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str36), 8*3600},
+#line 34 "zonetab.list"
+      {gperf_offsetof(stringpool, 2),   -2*3600},
+#line 43 "zonetab.list"
+      {gperf_offsetof(stringpool, 3),  -11*3600},
+#line 45 "zonetab.list"
+      {gperf_offsetof(stringpool, 4),    0*3600},
+#line 36 "zonetab.list"
+      {gperf_offsetof(stringpool, 5),   -4*3600},
+      {-1}, {-1},
+#line 269 "zonetab.list"
+      {gperf_offsetof(stringpool, 8),21600},
+#line 268 "zonetab.list"
+      {gperf_offsetof(stringpool, 9),25200},
+#line 35 "zonetab.list"
+      {gperf_offsetof(stringpool, 10),   -3*3600},
+      {-1}, {-1},
+#line 21 "zonetab.list"
+      {gperf_offsetof(stringpool, 13),    1*3600},
 #line 25 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str37),    5*3600},
-#line 123 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str38),           3600},
-#line 122 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str39),            21600},
-#line 178 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str40),               18000},
-#line 120 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str41),          34200},
-#line 121 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str42),        -21600},
-      {-1},
-#line 13 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str44), -5*3600},
-#line 14 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str45), -4*3600},
-#line 124 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str46),         3600},
+      {gperf_offsetof(stringpool, 14),    5*3600},
+#line 271 "zonetab.list"
+      {gperf_offsetof(stringpool, 15),-18000},
+#line 279 "zonetab.list"
+      {gperf_offsetof(stringpool, 16),-10800},
+#line 273 "zonetab.list"
+      {gperf_offsetof(stringpool, 17),43200},
+#line 272 "zonetab.list"
+      {gperf_offsetof(stringpool, 18),43200},
 #line 80 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str47),  2*3600},
-#line 164 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str48),                 25200},
+      {gperf_offsetof(stringpool, 19),  2*3600},
+#line 186 "zonetab.list"
+      {gperf_offsetof(stringpool, 20),36000},
 #line 88 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str49), 3*3600},
+      {gperf_offsetof(stringpool, 21), 3*3600},
 #line 87 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str50),  3*3600},
-#line 45 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str51),    0*3600},
+      {gperf_offsetof(stringpool, 22),  3*3600},
+      {-1},
 #line 101 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str52),10*3600},
-#line 103 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str53),11*3600},
-#line 160 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str54),             -10800},
-#line 177 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str55),                3600},
-#line 23 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str56),    3*3600},
-#line 63 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str57), -9*3600},
-#line 59 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str58), -8*3600},
-#line 100 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str59),  9*3600},
-#line 57 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str60), -4*3600},
+      {gperf_offsetof(stringpool, 24),10*3600},
+#line 217 "zonetab.list"
+      {gperf_offsetof(stringpool, 25),-18000},
+#line 19 "zonetab.list"
+      {gperf_offsetof(stringpool, 26), -8*3600},
 #line 133 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str61),                -18000},
-#line 54 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str62),-3*3600},
-#line 86 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str63),   3*3600},
-#line 175 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str64),            28800},
-#line 70 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str65),  1*3600},
-#line 96 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str66),  8*3600},
-#line 53 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str67), -3*3600},
+      {gperf_offsetof(stringpool, 27),                -18000},
+#line 32 "zonetab.list"
+      {gperf_offsetof(stringpool, 28),   12*3600},
+#line 56 "zonetab.list"
+      {gperf_offsetof(stringpool, 29), -4*3600},
+#line 13 "zonetab.list"
+      {gperf_offsetof(stringpool, 30), -5*3600},
+#line 23 "zonetab.list"
+      {gperf_offsetof(stringpool, 31),    3*3600},
+#line 256 "zonetab.list"
+      {gperf_offsetof(stringpool, 32),23400},
+#line 73 "zonetab.list"
+      {gperf_offsetof(stringpool, 33),  1*3600},
       {-1},
-#line 49 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str69),-2*3600},
+#line 82 "zonetab.list"
+      {gperf_offsetof(stringpool, 35), 2*3600},
+#line 71 "zonetab.list"
+      {gperf_offsetof(stringpool, 36),  1*3600},
+#line 24 "zonetab.list"
+      {gperf_offsetof(stringpool, 37),    4*3600},
+#line 79 "zonetab.list"
+      {gperf_offsetof(stringpool, 38), 2*3600},
+#line 65 "zonetab.list"
+      {gperf_offsetof(stringpool, 39),-10*3600},
       {-1},
-#line 21 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str71),    1*3600},
-#line 131 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str72),                7200},
-#line 48 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str73),  -2*3600},
-#line 126 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str74),                -21600},
-#line 56 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str75), -4*3600},
-#line 52 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str76), -3*3600},
+#line 202 "zonetab.list"
+      {gperf_offsetof(stringpool, 41),28800},
+#line 252 "zonetab.list"
+      {gperf_offsetof(stringpool, 42),39600},
+#line 251 "zonetab.list"
+      {gperf_offsetof(stringpool, 43),43200},
+#line 17 "zonetab.list"
+      {gperf_offsetof(stringpool, 44), -7*3600},
+#line 89 "zonetab.list"
+      {gperf_offsetof(stringpool, 45),  3*3600},
+#line 212 "zonetab.list"
+      {gperf_offsetof(stringpool, 46),-18000},
+#line 15 "zonetab.list"
+      {gperf_offsetof(stringpool, 47), -6*3600},
+#line 192 "zonetab.list"
+      {gperf_offsetof(stringpool, 48),18000},
+#line 26 "zonetab.list"
+      {gperf_offsetof(stringpool, 49),    6*3600},
+      {-1}, {-1},
 #line 51 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str77), -3*3600},
-#line 129 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str78),               10800},
-#line 132 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str79),       -10800},
-#line 99 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str80),  9*3600},
-#line 130 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str81),            36000},
-#line 39 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str82),   -7*3600},
-#line 68 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str83),  -11*3600},
-#line 33 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str84),   -1*3600},
-#line 55 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str85), -(3*3600+1800)},
-#line 50 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str86), -(2*3600+1800)},
-#line 117 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str87),         -21600},
-#line 125 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str88),         39600},
-#line 179 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str89),            36000},
-#line 67 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str90),-10*3600},
-#line 62 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str91), -9*3600},
-      {-1},
-#line 165 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str93),         28800},
+      {gperf_offsetof(stringpool, 52), -3*3600},
+#line 226 "zonetab.list"
+      {gperf_offsetof(stringpool, 53),-7200},
+#line 221 "zonetab.list"
+      {gperf_offsetof(stringpool, 54),10800},
+#line 22 "zonetab.list"
+      {gperf_offsetof(stringpool, 55),    2*3600},
       {-1},
+#line 190 "zonetab.list"
+      {gperf_offsetof(stringpool, 57),43200},
+#line 189 "zonetab.list"
+      {gperf_offsetof(stringpool, 58),43200},
+#line 199 "zonetab.list"
+      {gperf_offsetof(stringpool, 59),28800},
+#line 29 "zonetab.list"
+      {gperf_offsetof(stringpool, 60),    9*3600},
+#line 276 "zonetab.list"
+      {gperf_offsetof(stringpool, 61),28800},
+#line 48 "zonetab.list"
+      {gperf_offsetof(stringpool, 62),  -2*3600},
 #line 94 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str95),  6*3600},
-      {-1},
-#line 159 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str97),                 10800},
-#line 66 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str98),-10*3600},
-#line 61 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str99),-9*3600},
-#line 102 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str100), 10*3600},
+      {gperf_offsetof(stringpool, 63),  6*3600},
+#line 74 "zonetab.list"
+      {gperf_offsetof(stringpool, 64), 1*3600},
+#line 81 "zonetab.list"
+      {gperf_offsetof(stringpool, 65),  2*3600},
+#line 64 "zonetab.list"
+      {gperf_offsetof(stringpool, 66),-10*3600},
+#line 254 "zonetab.list"
+      {gperf_offsetof(stringpool, 67),18000},
 #line 92 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str101),  5*3600},
+      {gperf_offsetof(stringpool, 68),  5*3600},
+      {-1},
+#line 200 "zonetab.list"
+      {gperf_offsetof(stringpool, 70),-14400},
+#line 70 "zonetab.list"
+      {gperf_offsetof(stringpool, 71),  1*3600},
+#line 281 "zonetab.list"
+      {gperf_offsetof(stringpool, 72),32400},
+      {-1},
+#line 280 "zonetab.list"
+      {gperf_offsetof(stringpool, 74),39600},
+#line 238 "zonetab.list"
+      {gperf_offsetof(stringpool, 75),21600},
 #line 93 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str102),  (5*3600+1800)},
-#line 76 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str103),  1*3600},
-#line 42 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str104),  -10*3600},
-#line 91 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str105),  4*3600},
+      {gperf_offsetof(stringpool, 76),  (5*3600+1800)},
+#line 194 "zonetab.list"
+      {gperf_offsetof(stringpool, 77),28800},
       {-1},
+#line 255 "zonetab.list"
+      {gperf_offsetof(stringpool, 79),43200},
 #line 75 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str107),  1*3600},
-#line 118 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str108),              -3600},
+      {gperf_offsetof(stringpool, 80),  1*3600},
+#line 270 "zonetab.list"
+      {gperf_offsetof(stringpool, 81),18000},
 #line 83 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str109), 2*3600},
-#line 138 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str110),              -10800},
+      {gperf_offsetof(stringpool, 82), 2*3600},
       {-1},
-#line 43 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str112),  -11*3600},
+#line 207 "zonetab.list"
+      {gperf_offsetof(stringpool, 84),36000},
+#line 278 "zonetab.list"
+      {gperf_offsetof(stringpool, 85),-7200},
+      {-1}, {-1},
+#line 126 "zonetab.list"
+      {gperf_offsetof(stringpool, 88),                -21600},
+#line 185 "zonetab.list"
+      {gperf_offsetof(stringpool, 89),39600},
+#line 183 "zonetab.list"
+      {gperf_offsetof(stringpool, 90),-18000},
+#line 218 "zonetab.list"
+      {gperf_offsetof(stringpool, 91),-18000},
+#line 182 "zonetab.list"
+      {gperf_offsetof(stringpool, 92),34200},
+#line 103 "zonetab.list"
+      {gperf_offsetof(stringpool, 93),11*3600},
+#line 53 "zonetab.list"
+      {gperf_offsetof(stringpool, 94), -3*3600},
+#line 208 "zonetab.list"
+      {gperf_offsetof(stringpool, 95),36000},
+#line 49 "zonetab.list"
+      {gperf_offsetof(stringpool, 96),-2*3600},
+#line 120 "zonetab.list"
+      {gperf_offsetof(stringpool, 97),          34200},
+      {-1}, {-1},
+#line 215 "zonetab.list"
+      {gperf_offsetof(stringpool, 100),25200},
+#line 242 "zonetab.list"
+      {gperf_offsetof(stringpool, 101),12600},
+#line 241 "zonetab.list"
+      {gperf_offsetof(stringpool, 102),28800},
+#line 240 "zonetab.list"
+      {gperf_offsetof(stringpool, 103),32400},
+#line 86 "zonetab.list"
+      {gperf_offsetof(stringpool, 104),   3*3600},
+#line 33 "zonetab.list"
+      {gperf_offsetof(stringpool, 105),   -1*3600},
+#line 201 "zonetab.list"
+      {gperf_offsetof(stringpool, 106),21600},
+#line 148 "zonetab.list"
+      {gperf_offsetof(stringpool, 107),               -25200},
+#line 96 "zonetab.list"
+      {gperf_offsetof(stringpool, 108),  8*3600},
+#line 42 "zonetab.list"
+      {gperf_offsetof(stringpool, 109),  -10*3600},
+#line 31 "zonetab.list"
+      {gperf_offsetof(stringpool, 110),   11*3600},
+#line 72 "zonetab.list"
+      {gperf_offsetof(stringpool, 111),  1*3600},
       {-1},
-#line 74 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str114), 1*3600},
-#line 176 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str115),        3600},
-#line 30 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str116),   10*3600},
-#line 22 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str117),    2*3600},
+#line 90 "zonetab.list"
+      {gperf_offsetof(stringpool, 113),  4*3600},
+#line 47 "zonetab.list"
+      {gperf_offsetof(stringpool, 114),  0*3600},
       {-1},
-#line 32 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str119),   12*3600},
-#line 167 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str120),               21600},
+#line 78 "zonetab.list"
+      {gperf_offsetof(stringpool, 116), 1*3600},
+#line 77 "zonetab.list"
+      {gperf_offsetof(stringpool, 117),  1*3600},
       {-1},
-#line 81 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str122),  2*3600},
+#line 95 "zonetab.list"
+      {gperf_offsetof(stringpool, 119), 7*3600},
+#line 313 "zonetab.list"
+      {gperf_offsetof(stringpool, 120),43200},
+#line 55 "zonetab.list"
+      {gperf_offsetof(stringpool, 121), -(3*3600+1800)},
+#line 184 "zonetab.list"
+      {gperf_offsetof(stringpool, 122),31500},
+#line 204 "zonetab.list"
+      {gperf_offsetof(stringpool, 123),45900},
+#line 210 "zonetab.list"
+      {gperf_offsetof(stringpool, 124),-18000},
+#line 198 "zonetab.list"
+      {gperf_offsetof(stringpool, 125),14400},
+#line 57 "zonetab.list"
+      {gperf_offsetof(stringpool, 126), -4*3600},
+#line 197 "zonetab.list"
+      {gperf_offsetof(stringpool, 127),18000},
+#line 54 "zonetab.list"
+      {gperf_offsetof(stringpool, 128),-3*3600},
+#line 253 "zonetab.list"
+      {gperf_offsetof(stringpool, 129),-30600},
+#line 91 "zonetab.list"
+      {gperf_offsetof(stringpool, 130),  4*3600},
+#line 99 "zonetab.list"
+      {gperf_offsetof(stringpool, 131),  9*3600},
+#line 122 "zonetab.list"
+      {gperf_offsetof(stringpool, 132),            21600},
+#line 187 "zonetab.list"
+      {gperf_offsetof(stringpool, 133),16200},
+#line 132 "zonetab.list"
+      {gperf_offsetof(stringpool, 134),       -10800},
+#line 121 "zonetab.list"
+      {gperf_offsetof(stringpool, 135),        -21600},
+      {-1},
+#line 236 "zonetab.list"
+      {gperf_offsetof(stringpool, 137),25200},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+#line 274 "zonetab.list"
+      {gperf_offsetof(stringpool, 143),36000},
+#line 266 "zonetab.list"
+      {gperf_offsetof(stringpool, 144),43200},
+#line 146 "zonetab.list"
+      {gperf_offsetof(stringpool, 145),                 -21600},
+#line 193 "zonetab.list"
+      {gperf_offsetof(stringpool, 146),32400},
+#line 220 "zonetab.list"
+      {gperf_offsetof(stringpool, 147),-3600},
+#line 214 "zonetab.list"
+      {gperf_offsetof(stringpool, 148),25200},
+#line 219 "zonetab.list"
+      {gperf_offsetof(stringpool, 149),0},
+#line 275 "zonetab.list"
+      {gperf_offsetof(stringpool, 150),46800},
+#line 109 "zonetab.list"
+      {gperf_offsetof(stringpool, 151),                -32400},
+      {-1}, {-1},
+#line 68 "zonetab.list"
+      {gperf_offsetof(stringpool, 154),  -11*3600},
+      {-1}, {-1}, {-1},
+#line 321 "zonetab.list"
+      {gperf_offsetof(stringpool, 158),0},
       {-1},
+#line 178 "zonetab.list"
+      {gperf_offsetof(stringpool, 160),               18000},
+#line 181 "zonetab.list"
+      {gperf_offsetof(stringpool, 161),37800},
+#line 265 "zonetab.list"
+      {gperf_offsetof(stringpool, 162),20700},
+#line 249 "zonetab.list"
+      {gperf_offsetof(stringpool, 163),37800},
+#line 108 "zonetab.list"
+      {gperf_offsetof(stringpool, 164),             16200},
+      {-1}, {-1},
+#line 30 "zonetab.list"
+      {gperf_offsetof(stringpool, 167),   10*3600},
+      {-1},
+#line 27 "zonetab.list"
+      {gperf_offsetof(stringpool, 169),    7*3600},
+#line 239 "zonetab.list"
+      {gperf_offsetof(stringpool, 170),16200},
+#line 206 "zonetab.list"
+      {gperf_offsetof(stringpool, 171),28800},
+#line 205 "zonetab.list"
+      {gperf_offsetof(stringpool, 172),32400},
+#line 12 "zonetab.list"
+      {gperf_offsetof(stringpool, 173),  0*3600},
+#line 229 "zonetab.list"
+      {gperf_offsetof(stringpool, 174),14400},
+#line 264 "zonetab.list"
+      {gperf_offsetof(stringpool, 175),25200},
+#line 263 "zonetab.list"
+      {gperf_offsetof(stringpool, 176),25200},
+#line 223 "zonetab.list"
+      {gperf_offsetof(stringpool, 177),43200},
+#line 40 "zonetab.list"
+      {gperf_offsetof(stringpool, 178),   -8*3600},
+#line 222 "zonetab.list"
+      {gperf_offsetof(stringpool, 179),46800},
+      {-1},
+#line 282 "zonetab.list"
+      {gperf_offsetof(stringpool, 181),-10800},
+#line 260 "zonetab.list"
+      {gperf_offsetof(stringpool, 182),39600},
+#line 100 "zonetab.list"
+      {gperf_offsetof(stringpool, 183),  9*3600},
+#line 244 "zonetab.list"
+      {gperf_offsetof(stringpool, 184),39600},
+#line 102 "zonetab.list"
+      {gperf_offsetof(stringpool, 185), 10*3600},
 #line 143 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str124),                    12600},
-#line 97 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str125),  8*3600},
-#line 11 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str126),   0*3600},
+      {gperf_offsetof(stringpool, 186),                    12600},
+#line 129 "zonetab.list"
+      {gperf_offsetof(stringpool, 187),               10800},
+#line 98 "zonetab.list"
+      {gperf_offsetof(stringpool, 188), 8*3600},
+#line 39 "zonetab.list"
+      {gperf_offsetof(stringpool, 189),   -7*3600},
+#line 130 "zonetab.list"
+      {gperf_offsetof(stringpool, 190),            36000},
+#line 38 "zonetab.list"
+      {gperf_offsetof(stringpool, 191),   -6*3600},
+#line 203 "zonetab.list"
+      {gperf_offsetof(stringpool, 192),49500},
+#line 298 "zonetab.list"
+      {gperf_offsetof(stringpool, 193),18000},
+#line 209 "zonetab.list"
+      {gperf_offsetof(stringpool, 194),-14400},
+#line 191 "zonetab.list"
+      {gperf_offsetof(stringpool, 195),-43200},
       {-1},
-#line 36 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str128),   -4*3600},
-#line 106 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str129), 12*3600},
+#line 259 "zonetab.list"
+      {gperf_offsetof(stringpool, 197),28800},
+#line 179 "zonetab.list"
+      {gperf_offsetof(stringpool, 198),            36000},
+#line 257 "zonetab.list"
+      {gperf_offsetof(stringpool, 199),14400},
+#line 319 "zonetab.list"
+      {gperf_offsetof(stringpool, 200),32400},
+#line 84 "zonetab.list"
+      {gperf_offsetof(stringpool, 201), 2*3600},
+#line 286 "zonetab.list"
+      {gperf_offsetof(stringpool, 202),39600},
+#line 152 "zonetab.list"
+      {gperf_offsetof(stringpool, 203),             43200},
+#line 300 "zonetab.list"
+      {gperf_offsetof(stringpool, 204),46800},
+#line 127 "zonetab.list"
+      {gperf_offsetof(stringpool, 205),                   28800},
+#line 299 "zonetab.list"
+      {gperf_offsetof(stringpool, 206),50400},
+#line 85 "zonetab.list"
+      {gperf_offsetof(stringpool, 207),  2*3600},
+      {-1},
+#line 142 "zonetab.list"
+      {gperf_offsetof(stringpool, 209),                   19800},
       {-1},
+#line 314 "zonetab.list"
+      {gperf_offsetof(stringpool, 211),-10800},
+#line 288 "zonetab.list"
+      {gperf_offsetof(stringpool, 212),39600},
+      {-1},
+#line 196 "zonetab.list"
+      {gperf_offsetof(stringpool, 214),-3600},
+#line 195 "zonetab.list"
+      {gperf_offsetof(stringpool, 215),0},
+#line 293 "zonetab.list"
+      {gperf_offsetof(stringpool, 216),-36000},
+#line 106 "zonetab.list"
+      {gperf_offsetof(stringpool, 217), 12*3600},
+#line 128 "zonetab.list"
+      {gperf_offsetof(stringpool, 218),               -43200},
 #line 105 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str131),12*3600},
-#line 107 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str132),13*3600},
-#line 149 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str133),                 23400},
+      {gperf_offsetof(stringpool, 219),12*3600},
+#line 170 "zonetab.list"
+      {gperf_offsetof(stringpool, 220),                   32400},
+#line 125 "zonetab.list"
+      {gperf_offsetof(stringpool, 221),         39600},
       {-1},
-#line 109 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str135),                -32400},
-#line 19 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str136), -8*3600},
+#line 283 "zonetab.list"
+      {gperf_offsetof(stringpool, 223),21600},
+#line 113 "zonetab.list"
+      {gperf_offsetof(stringpool, 224),               -14400},
+#line 262 "zonetab.list"
+      {gperf_offsetof(stringpool, 225),39600},
+      {-1},
+#line 11 "zonetab.list"
+      {gperf_offsetof(stringpool, 227),   0*3600},
+#line 301 "zonetab.list"
+      {gperf_offsetof(stringpool, 228),10800},
+#line 315 "zonetab.list"
+      {gperf_offsetof(stringpool, 229),43200},
+#line 291 "zonetab.list"
+      {gperf_offsetof(stringpool, 230),-10800},
 #line 20 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str137), -7*3600},
-#line 162 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str138),             -14400},
-#line 145 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str139),                   32400},
+      {gperf_offsetof(stringpool, 231), -7*3600},
+#line 248 "zonetab.list"
+      {gperf_offsetof(stringpool, 232),39600},
+      {-1},
+#line 52 "zonetab.list"
+      {gperf_offsetof(stringpool, 234), -3*3600},
+#line 14 "zonetab.list"
+      {gperf_offsetof(stringpool, 235), -4*3600},
       {-1}, {-1},
-#line 44 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str142),  -12*3600},
-#line 26 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str143),    6*3600},
+#line 277 "zonetab.list"
+      {gperf_offsetof(stringpool, 238),18000},
+#line 188 "zonetab.list"
+      {gperf_offsetof(stringpool, 239),21600},
+#line 320 "zonetab.list"
+      {gperf_offsetof(stringpool, 240),28800},
+      {-1},
+#line 317 "zonetab.list"
+      {gperf_offsetof(stringpool, 242),-10800},
 #line 60 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str144),-9*3600},
-#line 58 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str145),-8*3600},
-      {-1}, {-1},
-#line 119 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str148),                14400},
+      {gperf_offsetof(stringpool, 243),-9*3600},
+#line 316 "zonetab.list"
+      {gperf_offsetof(stringpool, 244),-7200},
       {-1},
-#line 89 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str150),  3*3600},
-#line 104 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str151),12*3600},
+#line 246 "zonetab.list"
+      {gperf_offsetof(stringpool, 246),25200},
+#line 245 "zonetab.list"
+      {gperf_offsetof(stringpool, 247),28800},
+#line 147 "zonetab.list"
+      {gperf_offsetof(stringpool, 248),            -7200},
+#line 18 "zonetab.list"
+      {gperf_offsetof(stringpool, 249), -6*3600},
+#line 250 "zonetab.list"
+      {gperf_offsetof(stringpool, 250),50400},
+#line 165 "zonetab.list"
+      {gperf_offsetof(stringpool, 251),         28800},
+#line 16 "zonetab.list"
+      {gperf_offsetof(stringpool, 252), -5*3600},
+#line 76 "zonetab.list"
+      {gperf_offsetof(stringpool, 253),  1*3600},
+      {-1},
+#line 164 "zonetab.list"
+      {gperf_offsetof(stringpool, 255),                 25200},
+#line 41 "zonetab.list"
+      {gperf_offsetof(stringpool, 256),   -9*3600},
       {-1},
+#line 171 "zonetab.list"
+      {gperf_offsetof(stringpool, 258),                   46800},
+#line 211 "zonetab.list"
+      {gperf_offsetof(stringpool, 259),-36000},
+      {-1},
+#line 308 "zonetab.list"
+      {gperf_offsetof(stringpool, 261),-14400},
+#line 119 "zonetab.list"
+      {gperf_offsetof(stringpool, 262),                14400},
+#line 123 "zonetab.list"
+      {gperf_offsetof(stringpool, 263),           3600},
+#line 28 "zonetab.list"
+      {gperf_offsetof(stringpool, 264),    8*3600},
+#line 124 "zonetab.list"
+      {gperf_offsetof(stringpool, 265),         3600},
+#line 153 "zonetab.list"
+      {gperf_offsetof(stringpool, 266),           -12600},
+#line 110 "zonetab.list"
+      {gperf_offsetof(stringpool, 267),                    10800},
+#line 289 "zonetab.list"
+      {gperf_offsetof(stringpool, 268),14400},
+#line 112 "zonetab.list"
+      {gperf_offsetof(stringpool, 269),                  10800},
 #line 111 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str153),                 14400},
+      {gperf_offsetof(stringpool, 270),                 14400},
+#line 216 "zonetab.list"
+      {gperf_offsetof(stringpool, 271),36000},
       {-1},
-#line 34 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str155),   -2*3600},
-#line 31 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str156),   11*3600},
-#line 147 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str157),            -7200},
+#line 311 "zonetab.list"
+      {gperf_offsetof(stringpool, 273),21600},
+#line 66 "zonetab.list"
+      {gperf_offsetof(stringpool, 274),-10*3600},
+#line 151 "zonetab.list"
+      {gperf_offsetof(stringpool, 275),                   20700},
+#line 267 "zonetab.list"
+      {gperf_offsetof(stringpool, 276),-39600},
+#line 225 "zonetab.list"
+      {gperf_offsetof(stringpool, 277),-14400},
+      {-1},
+#line 224 "zonetab.list"
+      {gperf_offsetof(stringpool, 279),-10800},
+#line 67 "zonetab.list"
+      {gperf_offsetof(stringpool, 280),-10*3600},
+#line 237 "zonetab.list"
+      {gperf_offsetof(stringpool, 281),10800},
       {-1}, {-1},
-#line 172 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str160),             -18000},
-      {-1}, {-1}, {-1},
-#line 64 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str164),-10*3600},
+#line 297 "zonetab.list"
+      {gperf_offsetof(stringpool, 284),32400},
+#line 175 "zonetab.list"
+      {gperf_offsetof(stringpool, 285),            28800},
+#line 134 "zonetab.list"
+      {gperf_offsetof(stringpool, 286),                    7200},
+#line 149 "zonetab.list"
+      {gperf_offsetof(stringpool, 287),                 23400},
+#line 107 "zonetab.list"
+      {gperf_offsetof(stringpool, 288),13*3600},
+#line 230 "zonetab.list"
+      {gperf_offsetof(stringpool, 289),-10800},
+#line 307 "zonetab.list"
+      {gperf_offsetof(stringpool, 290),18000},
       {-1}, {-1},
-#line 28 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str167),    8*3600},
-#line 137 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str168),                      7200},
-#line 29 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str169),    9*3600},
 #line 155 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str170),              25200},
-#line 150 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str171),         21600},
+      {gperf_offsetof(stringpool, 293),              25200},
+#line 258 "zonetab.list"
+      {gperf_offsetof(stringpool, 294),18000},
+#line 227 "zonetab.list"
+      {gperf_offsetof(stringpool, 295),-21600},
+#line 261 "zonetab.list"
+      {gperf_offsetof(stringpool, 296),43200},
+#line 213 "zonetab.list"
+      {gperf_offsetof(stringpool, 297),-3600},
 #line 154 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str172),         28800},
+      {gperf_offsetof(stringpool, 298),         28800},
       {-1},
-#line 161 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str174),             -18000},
-      {-1}, {-1},
-#line 166 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str177),             7200},
-      {-1}, {-1}, {-1},
-#line 115 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str181),             36000},
-#line 113 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str182),               -14400},
-      {-1}, {-1}, {-1},
-#line 146 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str186),                 -21600},
+#line 243 "zonetab.list"
+      {gperf_offsetof(stringpool, 300),21600},
+#line 114 "zonetab.list"
+      {gperf_offsetof(stringpool, 301),             34200},
+#line 157 "zonetab.list"
+      {gperf_offsetof(stringpool, 302),                -28800},
       {-1},
-#line 148 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str188),               -25200},
+#line 117 "zonetab.list"
+      {gperf_offsetof(stringpool, 304),         -21600},
       {-1},
-#line 127 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str190),                   28800},
+#line 156 "zonetab.list"
+      {gperf_offsetof(stringpool, 306),             -14400},
 #line 116 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str191),                  -3600},
-#line 142 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str192),                   19800},
+      {gperf_offsetof(stringpool, 307),                  -3600},
+#line 228 "zonetab.list"
+      {gperf_offsetof(stringpool, 308),-32400},
+#line 294 "zonetab.list"
+      {gperf_offsetof(stringpool, 309),18000},
+#line 37 "zonetab.list"
+      {gperf_offsetof(stringpool, 310),   -5*3600},
+#line 137 "zonetab.list"
+      {gperf_offsetof(stringpool, 311),                      7200},
+#line 58 "zonetab.list"
+      {gperf_offsetof(stringpool, 312),-8*3600},
+#line 304 "zonetab.list"
+      {gperf_offsetof(stringpool, 313),28800},
+#line 303 "zonetab.list"
+      {gperf_offsetof(stringpool, 314),32400},
+#line 284 "zonetab.list"
+      {gperf_offsetof(stringpool, 315),14400},
       {-1},
-#line 40 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str194),   -8*3600},
-#line 112 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str195),                  10800},
-#line 139 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str196),                   0},
-#line 152 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str197),             43200},
-#line 141 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str198),               -36000},
-#line 27 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str199),    7*3600},
-#line 158 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str200),                  3600},
+#line 295 "zonetab.list"
+      {gperf_offsetof(stringpool, 317),18000},
+      {-1},
+#line 166 "zonetab.list"
+      {gperf_offsetof(stringpool, 319),             7200},
+      {-1}, {-1}, {-1}, {-1},
+#line 97 "zonetab.list"
+      {gperf_offsetof(stringpool, 324),  8*3600},
+      {-1},
+#line 50 "zonetab.list"
+      {gperf_offsetof(stringpool, 326), -(2*3600+1800)},
+#line 285 "zonetab.list"
+      {gperf_offsetof(stringpool, 327),-10800},
       {-1}, {-1},
-#line 110 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str203),                    10800},
-#line 163 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str204),                  -39600},
-#line 41 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str205),   -9*3600},
-#line 35 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str206),   -3*3600},
-#line 12 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str207),  0*3600},
+#line 287 "zonetab.list"
+      {gperf_offsetof(stringpool, 330),14400},
+      {-1},
 #line 169 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str208),                36000},
-#line 72 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str209),  1*3600},
+      {gperf_offsetof(stringpool, 332),                36000},
       {-1},
-#line 153 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str211),           -12600},
+#line 235 "zonetab.list"
+      {gperf_offsetof(stringpool, 334),25200},
+#line 234 "zonetab.list"
+      {gperf_offsetof(stringpool, 335),28800},
+      {-1}, {-1},
+#line 232 "zonetab.list"
+      {gperf_offsetof(stringpool, 338),-14400},
+      {-1}, {-1}, {-1},
+#line 44 "zonetab.list"
+      {gperf_offsetof(stringpool, 342),  -12*3600},
+#line 61 "zonetab.list"
+      {gperf_offsetof(stringpool, 343),-9*3600},
+#line 162 "zonetab.list"
+      {gperf_offsetof(stringpool, 344),             -14400},
+#line 141 "zonetab.list"
+      {gperf_offsetof(stringpool, 345),               -36000},
+      {-1},
+#line 306 "zonetab.list"
+      {gperf_offsetof(stringpool, 347),-10800},
+      {-1},
+#line 305 "zonetab.list"
+      {gperf_offsetof(stringpool, 349),-7200},
+#line 326 "zonetab.list"
+      {gperf_offsetof(stringpool, 350),18000},
+#line 325 "zonetab.list"
+      {gperf_offsetof(stringpool, 351),21600},
+#line 247 "zonetab.list"
+      {gperf_offsetof(stringpool, 352),14400},
+#line 323 "zonetab.list"
+      {gperf_offsetof(stringpool, 353),32400},
+#line 322 "zonetab.list"
+      {gperf_offsetof(stringpool, 354),36000},
+      {-1}, {-1}, {-1},
+#line 63 "zonetab.list"
+      {gperf_offsetof(stringpool, 358), -9*3600},
+#line 144 "zonetab.list"
+      {gperf_offsetof(stringpool, 359),                7200},
       {-1}, {-1}, {-1}, {-1}, {-1},
-#line 151 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str217),                   20700},
-#line 114 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str218),             34200},
+#line 167 "zonetab.list"
+      {gperf_offsetof(stringpool, 365),               21600},
+      {-1},
+#line 180 "zonetab.list"
+      {gperf_offsetof(stringpool, 367),                 32400},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 318 "zonetab.list"
+      {gperf_offsetof(stringpool, 375),25200},
+      {-1},
+#line 115 "zonetab.list"
+      {gperf_offsetof(stringpool, 377),             36000},
+#line 231 "zonetab.list"
+      {gperf_offsetof(stringpool, 378),43200},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 173 "zonetab.list"
+      {gperf_offsetof(stringpool, 387),            -25200},
+      {-1}, {-1}, {-1},
+#line 310 "zonetab.list"
+      {gperf_offsetof(stringpool, 391),36000},
+#line 309 "zonetab.list"
+      {gperf_offsetof(stringpool, 392),39600},
       {-1}, {-1},
 #line 140 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str221),                      7200},
-      {-1},
-#line 174 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str223),             36000},
+      {gperf_offsetof(stringpool, 395),                      7200},
+      {-1}, {-1},
+#line 168 "zonetab.list"
+      {gperf_offsetof(stringpool, 398),                  28800},
+#line 290 "zonetab.list"
+      {gperf_offsetof(stringpool, 399),39600},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 118 "zonetab.list"
+      {gperf_offsetof(stringpool, 408),              -3600},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 296 "zonetab.list"
+      {gperf_offsetof(stringpool, 417),46800},
+#line 163 "zonetab.list"
+      {gperf_offsetof(stringpool, 418),                  -39600},
+      {-1}, {-1},
+#line 161 "zonetab.list"
+      {gperf_offsetof(stringpool, 421),             -18000},
       {-1}, {-1}, {-1}, {-1}, {-1},
-#line 46 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str229),  0*3600},
+#line 312 "zonetab.list"
+      {gperf_offsetof(stringpool, 427),39600},
+#line 69 "zonetab.list"
+      {gperf_offsetof(stringpool, 428),-12*3600},
       {-1}, {-1}, {-1},
-#line 135 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str233),            18000},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-#line 173 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str265),            -25200},
+#line 136 "zonetab.list"
+      {gperf_offsetof(stringpool, 432),                    43200},
+      {-1}, {-1},
+#line 46 "zonetab.list"
+      {gperf_offsetof(stringpool, 435),  0*3600},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 145 "zonetab.list"
+      {gperf_offsetof(stringpool, 443),                   32400},
+      {-1},
+#line 131 "zonetab.list"
+      {gperf_offsetof(stringpool, 445),                7200},
       {-1}, {-1}, {-1},
-#line 144 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str269),                7200},
+#line 292 "zonetab.list"
+      {gperf_offsetof(stringpool, 449),10800},
       {-1}, {-1},
-#line 180 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str272),                 32400},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 156 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str279),             -14400},
+#line 150 "zonetab.list"
+      {gperf_offsetof(stringpool, 452),         21600},
       {-1}, {-1},
-#line 171 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str282),                   46800},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-#line 108 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str314),             16200},
+#line 302 "zonetab.list"
+      {gperf_offsetof(stringpool, 455),43200},
+      {-1}, {-1},
+#line 176 "zonetab.list"
+      {gperf_offsetof(stringpool, 458),        3600},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 135 "zonetab.list"
+      {gperf_offsetof(stringpool, 466),            18000},
+      {-1},
+#line 174 "zonetab.list"
+      {gperf_offsetof(stringpool, 468),             36000},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 324 "zonetab.list"
+      {gperf_offsetof(stringpool, 476),36000},
+#line 172 "zonetab.list"
+      {gperf_offsetof(stringpool, 477),             -18000},
       {-1}, {-1}, {-1}, {-1},
-#line 69 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str319),-12*3600},
+#line 160 "zonetab.list"
+      {gperf_offsetof(stringpool, 482),             -10800},
       {-1}, {-1},
-#line 157 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str322),                -28800},
+#line 62 "zonetab.list"
+      {gperf_offsetof(stringpool, 485), -9*3600},
+#line 159 "zonetab.list"
+      {gperf_offsetof(stringpool, 486),                 10800},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+#line 233 "zonetab.list"
+      {gperf_offsetof(stringpool, 492),28800},
       {-1}, {-1}, {-1}, {-1},
-#line 168 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str327),                  28800},
-#line 134 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str328),                    7200},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 158 "zonetab.list"
+      {gperf_offsetof(stringpool, 497),                  3600},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 177 "zonetab.list"
+      {gperf_offsetof(stringpool, 540),                3600},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 170 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str392),                   32400},
+      {-1}, {-1}, {-1}, {-1},
+#line 59 "zonetab.list"
+      {gperf_offsetof(stringpool, 563), -8*3600},
+      {-1}, {-1},
+#line 104 "zonetab.list"
+      {gperf_offsetof(stringpool, 566),12*3600},
+#line 139 "zonetab.list"
+      {gperf_offsetof(stringpool, 567),                   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},
-#line 136 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str438),                    43200}
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#line 138 "zonetab.list"
+      {gperf_offsetof(stringpool, 619),              -10800}
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
     {
-      register int key = hash (str, len);
+      register unsigned int key = hash (str, len);
 
-      if (key <= MAX_HASH_VALUE && key >= 0)
+      if (key <= MAX_HASH_VALUE)
         {
           register int o = wordlist[key].name;
           if (o >= 0)
             {
               register const char *s = o + stringpool;
 
-              if (*str == *s && !strcmp (str + 1, s + 1))
+              if ((((unsigned char)*str ^ (unsigned char)*s) & ~32) == 0 && !gperf_case_strncmp (str, s, len) && s[len] == '\0')
                 return &wordlist[key];
             }
         }
     }
   return 0;
 }
-#line 181 "zonetab.list"
+#line 327 "zonetab.list"
 
diff --git a/ext/date/zonetab.list b/ext/date/zonetab.list
index 3a4d121d2e..d2f902d2d5 100644
--- a/ext/date/zonetab.list
+++ b/ext/date/zonetab.list
@@ -47,12 +47,12 @@ utc,  0*3600
 wet,  0*3600
 at,  -2*3600
 brst,-2*3600
-ndt, -(2*3600+1800)
+ndt, -(1*3600+1800)
 art, -3*3600
 adt, -3*3600
 brt, -3*3600
 clst,-3*3600
-nst, -(3*3600+1800)
+nst, -(2*3600+1800)
 ast, -4*3600
 clt, -4*3600
 akdt,-8*3600
@@ -62,7 +62,7 @@ hadt,-9*3600
 hdt, -9*3600
 yst, -9*3600
 ahst,-10*3600
-cat,-10*3600
+cat,2*3600
 hast,-10*3600
 hst,-10*3600
 nt,  -11*3600
@@ -82,7 +82,7 @@ fst,  2*3600
 mest, 2*3600
 mesz, 2*3600
 sast, 2*3600
-sst,  2*3600
+sst,  -11*3600
 bt,   3*3600
 eat,  3*3600
 eest, 3*3600
@@ -92,13 +92,13 @@ zp4,  4*3600
 zp5,  5*3600
 ist,  (5*3600+1800)
 zp6,  6*3600
-wast, 7*3600
-cct,  8*3600
+wast, 2*3600
+cct,  (6*3600+1800)
 sgt,  8*3600
 wadt, 8*3600
 jst,  9*3600
 kst,  9*3600
-east,10*3600
+east,-6*3600
 gst, 10*3600
 eadt,11*3600
 idle,12*3600
@@ -178,4 +178,150 @@ w. europe,                3600
 west asia,               18000
 west pacific,            36000
 yakutsk,                 32400
+acdt,37800
+acst,34200
+act,-18000
+acwst,31500
+aedt,39600
+aest,36000
+aft,16200
+almt,21600
+anast,43200
+anat,43200
+aoe,-43200
+aqtt,18000
+awdt,32400
+awst,28800
+azost,0
+azot,-3600
+azst,18000
+azt,14400
+bnt,28800
+bot,-14400
+btt,21600
+cast,28800
+chadt,49500
+chast,45900
+chost,32400
+chot,28800
+chst,36000
+chut,36000
+cidst,-14400
+cist,-18000
+ckt,-36000
+cot,-18000
+cvt,-3600
+cxt,25200
+davt,25200
+ddut,36000
+easst,-18000
+ect,-18000
+egst,0
+egt,-3600
+fet,10800
+fjst,46800
+fjt,43200
+fkst,-10800
+fkt,-14400
+fnt,-7200
+galt,-21600
+gamt,-32400
+get,14400
+gft,-10800
+gilt,43200
+gyt,-14400
+hkt,28800
+hovst,28800
+hovt,25200
+ict,25200
+idt,10800
+iot,21600
+irdt,16200
+irkst,32400
+irkt,28800
+irst,12600
+kgt,21600
+kost,39600
+krast,28800
+krat,25200
+kuyt,14400
+lhdt,39600
+lhst,37800
+lint,50400
+magst,43200
+magt,39600
+mart,-30600
+mawt,18000
+mht,43200
+mmt,23400
+mut,14400
+mvt,18000
+myt,28800
+nct,39600
+nfdt,43200
+nft,39600
+novst,25200
+novt,25200
+npt,20700
+nrt,43200
+nut,-39600
+omsst,25200
+omst,21600
+orat,18000
+pet,-18000
+petst,43200
+pett,43200
+pgt,36000
+phot,46800
+pht,28800
+pkt,18000
+pmdt,-7200
+pmst,-10800
+pont,39600
+pwt,32400
+pyst,-10800
+qyzt,21600
+ret,14400
+rott,-10800
+sakt,39600
+samt,14400
+sbt,39600
+sct,14400
+sret,39600
+srt,-10800
+syot,10800
+taht,-36000
+tft,18000
+tjt,18000
+tkt,46800
+tlt,32400
+tmt,18000
+tost,50400
+tot,46800
+trt,10800
+tvt,43200
+ulast,32400
+ulat,28800
+uyst,-7200
+uyt,-10800
+uzt,18000
+vet,-14400
+vlast,39600
+vlat,36000
+vost,21600
+vut,39600
+wakt,43200
+warst,-10800
+wft,43200
+wgst,-7200
+wgt,-10800
+wib,25200
+wit,32400
+wita,28800
+wt,0
+yakst,36000
+yakt,32400
+yapt,36000
+yekst,21600
+yekt,18000
 %%
diff --git a/ext/dbm/dbm.c b/ext/dbm/dbm.c
index 07044d6f9f..de7536651c 100644
--- a/ext/dbm/dbm.c
+++ b/ext/dbm/dbm.c
@@ -24,7 +24,7 @@
 #define DSIZE_TYPE TYPEOF_DATUM_DSIZE
 #if SIZEOF_DATUM_DSIZE > SIZEOF_INT
 # define RSTRING_DSIZE(s) RSTRING_LEN(s)
-# define TOO_LONG(n) 0
+# define TOO_LONG(n) ((void)(n),0)
 #else
 # define RSTRING_DSIZE(s) RSTRING_LENINT(s)
 # define TOO_LONG(n) ((long)(+(DSIZE_TYPE)(n)) != (n))
@@ -39,6 +39,8 @@ struct dbmdata {
     DBM *di_dbm;
 };
 
+NORETURN(static void closed_dbm(void));
+
 static void
 closed_dbm(void)
 {
@@ -47,7 +49,6 @@ closed_dbm(void)
 
 #define GetDBM(obj, dbmp) do {\
     TypedData_Get_Struct((obj), struct dbmdata, &dbm_type, (dbmp));\
-    if ((dbmp) == 0) closed_dbm();\
     if ((dbmp)->di_dbm == 0) closed_dbm();\
 } while (0)
 
@@ -60,21 +61,18 @@ static void
 free_dbm(void *ptr)
 {
     struct dbmdata *dbmp = ptr;
-    if (dbmp) {
-	if (dbmp->di_dbm) dbm_close(dbmp->di_dbm);
-	xfree(dbmp);
-    }
+    if (dbmp->di_dbm)
+	dbm_close(dbmp->di_dbm);
+    xfree(dbmp);
 }
 
 static size_t
 memsize_dbm(const void *ptr)
 {
-    size_t size = 0;
     const struct dbmdata *dbmp = ptr;
-    if (dbmp) {
-	size += sizeof(*dbmp);
-	if (dbmp->di_dbm) size += DBM_SIZEOF_DBM;
-    }
+    size_t size = sizeof(*dbmp);
+    if (dbmp->di_dbm)
+	size += DBM_SIZEOF_DBM;
     return size;
 }
 
@@ -115,8 +113,6 @@ fdbm_closed(VALUE obj)
     struct dbmdata *dbmp;
 
     TypedData_Get_Struct(obj, struct dbmdata, &dbm_type, dbmp);
-    if (dbmp == 0)
-	return Qtrue;
     if (dbmp->di_dbm == 0)
 	return Qtrue;
 
@@ -126,7 +122,9 @@ fdbm_closed(VALUE obj)
 static VALUE
 fdbm_alloc(VALUE klass)
 {
-    return TypedData_Wrap_Struct(klass, &dbm_type, 0);
+    struct dbmdata *dbmp;
+
+    return TypedData_Make_Struct(klass, struct dbmdata, &dbm_type, dbmp);
 }
 
 /*
@@ -150,6 +148,7 @@ fdbm_initialize(int argc, VALUE *argv, VALUE obj)
     struct dbmdata *dbmp;
     int mode, flags = 0;
 
+    TypedData_Get_Struct(obj, struct dbmdata, &dbm_type, dbmp);
     if (rb_scan_args(argc, argv, "12", &file, &vmode, &vflags) == 1) {
 	mode = 0666;		/* default value */
     }
@@ -191,24 +190,24 @@ fdbm_initialize(int argc, VALUE *argv, VALUE obj)
     }
 
     if (dbm) {
-    /*
-     * History of dbm_pagfno() and dbm_dirfno() in ndbm and its compatibles.
-     * (dbm_pagfno() and dbm_dirfno() is not standardized.)
-     *
-     * 1986: 4.3BSD provides ndbm.
-     *       It provides dbm_pagfno() and dbm_dirfno() as macros.
-     * 1991: gdbm-1.5 provides them as functions.
-     *       They returns a same descriptor.
-     *       (Earlier releases may have the functions too.)
-     * 1991: Net/2 provides Berkeley DB.
-     *       It doesn't provide dbm_pagfno() and dbm_dirfno().
-     * 1992: 4.4BSD Alpha provides Berkeley DB with dbm_dirfno() as a function.
-     *       dbm_pagfno() is a macro as DBM_PAGFNO_NOT_AVAILABLE.
-     * 1997: Berkeley DB 2.0 is released by Sleepycat Software, Inc.
-     *       It defines dbm_pagfno() and dbm_dirfno() as macros.
-     * 2011: gdbm-1.9 creates a separate dir file.
-     *       dbm_pagfno() and dbm_dirfno() returns different descriptors.
-     */
+	/*
+	 * History of dbm_pagfno() and dbm_dirfno() in ndbm and its compatibles.
+	 * (dbm_pagfno() and dbm_dirfno() is not standardized.)
+	 *
+	 * 1986: 4.3BSD provides ndbm.
+	 *       It provides dbm_pagfno() and dbm_dirfno() as macros.
+	 * 1991: gdbm-1.5 provides them as functions.
+	 *       They returns a same descriptor.
+	 *       (Earlier releases may have the functions too.)
+	 * 1991: Net/2 provides Berkeley DB.
+	 *       It doesn't provide dbm_pagfno() and dbm_dirfno().
+	 * 1992: 4.4BSD Alpha provides Berkeley DB with dbm_dirfno() as a function.
+	 *       dbm_pagfno() is a macro as DBM_PAGFNO_NOT_AVAILABLE.
+	 * 1997: Berkeley DB 2.0 is released by Sleepycat Software, Inc.
+	 *       It defines dbm_pagfno() and dbm_dirfno() as macros.
+	 * 2011: gdbm-1.9 creates a separate dir file.
+	 *       dbm_pagfno() and dbm_dirfno() returns different descriptors.
+	 */
 #if defined(HAVE_DBM_PAGFNO)
         rb_fd_fix_cloexec(dbm_pagfno(dbm));
 #endif
@@ -217,8 +216,8 @@ fdbm_initialize(int argc, VALUE *argv, VALUE obj)
 #endif
 
 #if defined(RUBYDBM_DB_HEADER) && defined(HAVE_TYPE_DBC)
-    /* Disable Berkeley DB error messages such as:
-     * DB->put: attempt to modify a read-only database */
+	/* Disable Berkeley DB error messages such as:
+	 * DB->put: attempt to modify a read-only database */
         ((DBC*)dbm)->dbp->set_errfile(((DBC*)dbm)->dbp, NULL);
 #endif
     }
@@ -228,8 +227,8 @@ fdbm_initialize(int argc, VALUE *argv, VALUE obj)
 	rb_sys_fail_str(file);
     }
 
-    dbmp = ALLOC(struct dbmdata);
-    DATA_PTR(obj) = dbmp;
+    if (dbmp->di_dbm)
+	dbm_close(dbmp->di_dbm);
     dbmp->di_dbm = dbm;
     dbmp->di_size = -1;
 
@@ -280,12 +279,11 @@ fdbm_fetch(VALUE obj, VALUE keystr, VALUE ifnone)
       not_found:
 	if (NIL_P(ifnone) && rb_block_given_p()) {
 	    keystr = rb_str_dup(keystr);
-	    OBJ_TAINT(keystr);
 	    return rb_yield(keystr);
 	}
 	return ifnone;
     }
-    return rb_tainted_str_new(value.dptr, value.dsize);
+    return rb_str_new(value.dptr, value.dsize);
 }
 
 /*
@@ -339,15 +337,13 @@ fdbm_key(VALUE obj, VALUE valstr)
     ExportStringValue(valstr);
     len = RSTRING_LEN(valstr);
     if (TOO_LONG(len)) return Qnil;
-    val.dptr = RSTRING_PTR(valstr);
-    val.dsize = (DSIZE_TYPE)len;
 
     GetDBM2(obj, dbmp, dbm);
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
 	if ((long)val.dsize == RSTRING_LEN(valstr) &&
 	    memcmp(val.dptr, RSTRING_PTR(valstr), val.dsize) == 0) {
-	    return rb_tainted_str_new(key.dptr, key.dsize);
+	    return rb_str_new(key.dptr, key.dsize);
 	}
     }
     return Qnil;
@@ -380,8 +376,8 @@ fdbm_select(VALUE obj)
     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));
+	assoc = rb_assoc_new(rb_str_new(key.dptr, key.dsize),
+			     rb_str_new(val.dptr, val.dsize));
 	v = rb_yield(assoc);
 	if (RTEST(v)) {
 	    rb_ary_push(new, assoc);
@@ -449,7 +445,7 @@ fdbm_delete(VALUE obj, VALUE keystr)
     }
 
     /* need to save value before dbm_delete() */
-    valstr = rb_tainted_str_new(value.dptr, value.dsize);
+    valstr = rb_str_new(value.dptr, value.dsize);
 
     if (dbm_delete(dbm, key)) {
 	dbmp->di_size = -1;
@@ -484,8 +480,8 @@ fdbm_shift(VALUE obj)
     key = dbm_firstkey(dbm);
     if (!key.dptr) return Qnil;
     val = dbm_fetch(dbm, key);
-    keystr = rb_tainted_str_new(key.dptr, key.dsize);
-    valstr = rb_tainted_str_new(val.dptr, val.dsize);
+    keystr = rb_str_new(key.dptr, key.dsize);
+    valstr = rb_str_new(val.dptr, val.dsize);
     dbm_delete(dbm, key);
 
     return rb_assoc_new(keystr, valstr);
@@ -517,9 +513,9 @@ fdbm_delete_if(VALUE obj)
 
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
-	keystr = rb_tainted_str_new(key.dptr, key.dsize);
+	keystr = rb_str_new(key.dptr, key.dsize);
 	OBJ_FREEZE(keystr);
-	valstr = rb_tainted_str_new(val.dptr, val.dsize);
+	valstr = rb_str_new(val.dptr, val.dsize);
         ret = rb_protect(rb_yield, rb_assoc_new(rb_str_dup(keystr), valstr), &status);
         if (status != 0) break;
 	if (RTEST(ret)) rb_ary_push(ary, keystr);
@@ -586,8 +582,8 @@ fdbm_invert(VALUE obj)
     GetDBM2(obj, dbmp, dbm);
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
-	keystr = rb_tainted_str_new(key.dptr, key.dsize);
-	valstr = rb_tainted_str_new(val.dptr, val.dsize);
+	keystr = rb_str_new(key.dptr, key.dsize);
+	valstr = rb_str_new(val.dptr, val.dsize);
 	rb_hash_aset(hash, valstr, keystr);
     }
     return hash;
@@ -747,7 +743,7 @@ fdbm_each_value(VALUE obj)
     GetDBM2(obj, dbmp, dbm);
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
-	rb_yield(rb_tainted_str_new(val.dptr, val.dsize));
+	rb_yield(rb_str_new(val.dptr, val.dsize));
 	GetDBM2(obj, dbmp, dbm);
     }
     return obj;
@@ -770,7 +766,7 @@ fdbm_each_key(VALUE obj)
 
     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));
+	rb_yield(rb_str_new(key.dptr, key.dsize));
 	GetDBM2(obj, dbmp, dbm);
     }
     return obj;
@@ -797,8 +793,8 @@ fdbm_each_pair(VALUE obj)
 
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
-	keystr = rb_tainted_str_new(key.dptr, key.dsize);
-	valstr = rb_tainted_str_new(val.dptr, val.dsize);
+	keystr = rb_str_new(key.dptr, key.dsize);
+	valstr = rb_str_new(val.dptr, val.dsize);
 	rb_yield(rb_assoc_new(keystr, valstr));
 	GetDBM2(obj, dbmp, dbm);
     }
@@ -824,7 +820,7 @@ fdbm_keys(VALUE obj)
 
     ary = rb_ary_new();
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
-	rb_ary_push(ary, rb_tainted_str_new(key.dptr, key.dsize));
+	rb_ary_push(ary, rb_str_new(key.dptr, key.dsize));
     }
 
     return ary;
@@ -848,7 +844,7 @@ fdbm_values(VALUE obj)
     ary = rb_ary_new();
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
-	rb_ary_push(ary, rb_tainted_str_new(val.dptr, val.dsize));
+	rb_ary_push(ary, rb_str_new(val.dptr, val.dsize));
     }
 
     return ary;
@@ -934,8 +930,8 @@ fdbm_to_a(VALUE obj)
     ary = rb_ary_new();
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
-	rb_ary_push(ary, rb_assoc_new(rb_tainted_str_new(key.dptr, key.dsize),
-				      rb_tainted_str_new(val.dptr, val.dsize)));
+	rb_ary_push(ary, rb_assoc_new(rb_str_new(key.dptr, key.dsize),
+				      rb_str_new(val.dptr, val.dsize)));
     }
 
     return ary;
@@ -960,8 +956,8 @@ fdbm_to_hash(VALUE obj)
     hash = rb_hash_new();
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
-	rb_hash_aset(hash, rb_tainted_str_new(key.dptr, key.dsize),
-		           rb_tainted_str_new(val.dptr, val.dsize));
+	rb_hash_aset(hash, rb_str_new(key.dptr, key.dsize),
+		           rb_str_new(val.dptr, val.dsize));
     }
 
     return hash;
@@ -984,7 +980,7 @@ fdbm_reject(VALUE obj)
  * == Introduction
  *
  * The DBM class provides a wrapper to a Unix-style
- * {dbm}[http://en.wikipedia.org/wiki/Dbm] or Database Manager library.
+ * {dbm}[https://en.wikipedia.org/wiki/Dbm] or Database Manager library.
  *
  * Dbm databases do not have tables or columns; they are simple key-value
  * data stores, like a Ruby Hash except not resident in RAM. Keys and values
@@ -996,8 +992,8 @@ fdbm_reject(VALUE obj)
  * - The original ndbm library is released in 4.3BSD.
  *   It is based on dbm library in Unix Version 7 but has different API to
  *   support multiple databases in a process.
- * - {Berkeley DB}[http://en.wikipedia.org/wiki/Berkeley_DB] versions
- *   1 thru 5, also known as BDB and Sleepycat DB, now owned by Oracle
+ * - {Berkeley DB}[https://en.wikipedia.org/wiki/Berkeley_DB] versions
+ *   1 thru 6, also known as BDB and Sleepycat DB, now owned by Oracle
  *   Corporation.
  * - Berkeley DB 1.x, still found in 4.4BSD derivatives (FreeBSD, OpenBSD, etc).
  * - {gdbm}[http://www.gnu.org/software/gdbm/], the GNU implementation of dbm.
diff --git a/ext/dbm/dbm.gemspec b/ext/dbm/dbm.gemspec
new file mode 100644
index 0000000000..0ff036f712
--- /dev/null
+++ b/ext/dbm/dbm.gemspec
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+Gem::Specification.new do |s|
+  s.name = "dbm"
+  s.version = '1.1.0'
+  s.summary = "Provides a wrapper for the UNIX-style Database Manager Library"
+  s.description = "Provides a wrapper for the UNIX-style Database Manager Library"
+
+  s.require_path = %w{lib}
+  s.files = %w{ext/dbm/extconf.rb ext/dbm/dbm.c}
+  s.extensions = %w{ext/dbm/extconf.rb}
+  s.required_ruby_version = ">= 2.3.0"
+
+  s.authors = ["Yukihiro Matsumoto"]
+  s.email = ["matz@ruby-lang.org"]
+  s.homepage = "https://github.com/ruby/dbm"
+  s.licenses = ["Ruby", "BSD-2-Clause"]
+
+  s.add_development_dependency "rake-compiler"
+  s.add_development_dependency "test-unit"
+  s.metadata["msys2_mingw_dependencies"] = "gdbm"
+end
diff --git a/ext/dbm/depend b/ext/dbm/depend
new file mode 100644
index 0000000000..414bb58a0e
--- /dev/null
+++ b/ext/dbm/depend
@@ -0,0 +1,163 @@
+# AUTOGENERATED DEPENDENCIES START
+dbm.o: $(RUBY_EXTCONF_H)
+dbm.o: $(arch_hdrdir)/ruby/config.h
+dbm.o: $(hdrdir)/ruby.h
+dbm.o: $(hdrdir)/ruby/internal/anyargs.h
+dbm.o: $(hdrdir)/ruby/internal/arithmetic.h
+dbm.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+dbm.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+dbm.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+dbm.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+dbm.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+dbm.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+dbm.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+dbm.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+dbm.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+dbm.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+dbm.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+dbm.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+dbm.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+dbm.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+dbm.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+dbm.o: $(hdrdir)/ruby/internal/assume.h
+dbm.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+dbm.o: $(hdrdir)/ruby/internal/attr/artificial.h
+dbm.o: $(hdrdir)/ruby/internal/attr/cold.h
+dbm.o: $(hdrdir)/ruby/internal/attr/const.h
+dbm.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+dbm.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+dbm.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+dbm.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+dbm.o: $(hdrdir)/ruby/internal/attr/error.h
+dbm.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+dbm.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+dbm.o: $(hdrdir)/ruby/internal/attr/format.h
+dbm.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+dbm.o: $(hdrdir)/ruby/internal/attr/noalias.h
+dbm.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+dbm.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+dbm.o: $(hdrdir)/ruby/internal/attr/noinline.h
+dbm.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+dbm.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+dbm.o: $(hdrdir)/ruby/internal/attr/pure.h
+dbm.o: $(hdrdir)/ruby/internal/attr/restrict.h
+dbm.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+dbm.o: $(hdrdir)/ruby/internal/attr/warning.h
+dbm.o: $(hdrdir)/ruby/internal/attr/weakref.h
+dbm.o: $(hdrdir)/ruby/internal/cast.h
+dbm.o: $(hdrdir)/ruby/internal/compiler_is.h
+dbm.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+dbm.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+dbm.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+dbm.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+dbm.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+dbm.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+dbm.o: $(hdrdir)/ruby/internal/compiler_since.h
+dbm.o: $(hdrdir)/ruby/internal/config.h
+dbm.o: $(hdrdir)/ruby/internal/constant_p.h
+dbm.o: $(hdrdir)/ruby/internal/core.h
+dbm.o: $(hdrdir)/ruby/internal/core/rarray.h
+dbm.o: $(hdrdir)/ruby/internal/core/rbasic.h
+dbm.o: $(hdrdir)/ruby/internal/core/rbignum.h
+dbm.o: $(hdrdir)/ruby/internal/core/rclass.h
+dbm.o: $(hdrdir)/ruby/internal/core/rdata.h
+dbm.o: $(hdrdir)/ruby/internal/core/rfile.h
+dbm.o: $(hdrdir)/ruby/internal/core/rhash.h
+dbm.o: $(hdrdir)/ruby/internal/core/robject.h
+dbm.o: $(hdrdir)/ruby/internal/core/rregexp.h
+dbm.o: $(hdrdir)/ruby/internal/core/rstring.h
+dbm.o: $(hdrdir)/ruby/internal/core/rstruct.h
+dbm.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+dbm.o: $(hdrdir)/ruby/internal/ctype.h
+dbm.o: $(hdrdir)/ruby/internal/dllexport.h
+dbm.o: $(hdrdir)/ruby/internal/dosish.h
+dbm.o: $(hdrdir)/ruby/internal/error.h
+dbm.o: $(hdrdir)/ruby/internal/eval.h
+dbm.o: $(hdrdir)/ruby/internal/event.h
+dbm.o: $(hdrdir)/ruby/internal/fl_type.h
+dbm.o: $(hdrdir)/ruby/internal/gc.h
+dbm.o: $(hdrdir)/ruby/internal/glob.h
+dbm.o: $(hdrdir)/ruby/internal/globals.h
+dbm.o: $(hdrdir)/ruby/internal/has/attribute.h
+dbm.o: $(hdrdir)/ruby/internal/has/builtin.h
+dbm.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+dbm.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+dbm.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+dbm.o: $(hdrdir)/ruby/internal/has/extension.h
+dbm.o: $(hdrdir)/ruby/internal/has/feature.h
+dbm.o: $(hdrdir)/ruby/internal/has/warning.h
+dbm.o: $(hdrdir)/ruby/internal/intern/array.h
+dbm.o: $(hdrdir)/ruby/internal/intern/bignum.h
+dbm.o: $(hdrdir)/ruby/internal/intern/class.h
+dbm.o: $(hdrdir)/ruby/internal/intern/compar.h
+dbm.o: $(hdrdir)/ruby/internal/intern/complex.h
+dbm.o: $(hdrdir)/ruby/internal/intern/cont.h
+dbm.o: $(hdrdir)/ruby/internal/intern/dir.h
+dbm.o: $(hdrdir)/ruby/internal/intern/enum.h
+dbm.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+dbm.o: $(hdrdir)/ruby/internal/intern/error.h
+dbm.o: $(hdrdir)/ruby/internal/intern/eval.h
+dbm.o: $(hdrdir)/ruby/internal/intern/file.h
+dbm.o: $(hdrdir)/ruby/internal/intern/gc.h
+dbm.o: $(hdrdir)/ruby/internal/intern/hash.h
+dbm.o: $(hdrdir)/ruby/internal/intern/io.h
+dbm.o: $(hdrdir)/ruby/internal/intern/load.h
+dbm.o: $(hdrdir)/ruby/internal/intern/marshal.h
+dbm.o: $(hdrdir)/ruby/internal/intern/numeric.h
+dbm.o: $(hdrdir)/ruby/internal/intern/object.h
+dbm.o: $(hdrdir)/ruby/internal/intern/parse.h
+dbm.o: $(hdrdir)/ruby/internal/intern/proc.h
+dbm.o: $(hdrdir)/ruby/internal/intern/process.h
+dbm.o: $(hdrdir)/ruby/internal/intern/random.h
+dbm.o: $(hdrdir)/ruby/internal/intern/range.h
+dbm.o: $(hdrdir)/ruby/internal/intern/rational.h
+dbm.o: $(hdrdir)/ruby/internal/intern/re.h
+dbm.o: $(hdrdir)/ruby/internal/intern/ruby.h
+dbm.o: $(hdrdir)/ruby/internal/intern/select.h
+dbm.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+dbm.o: $(hdrdir)/ruby/internal/intern/signal.h
+dbm.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+dbm.o: $(hdrdir)/ruby/internal/intern/string.h
+dbm.o: $(hdrdir)/ruby/internal/intern/struct.h
+dbm.o: $(hdrdir)/ruby/internal/intern/thread.h
+dbm.o: $(hdrdir)/ruby/internal/intern/time.h
+dbm.o: $(hdrdir)/ruby/internal/intern/variable.h
+dbm.o: $(hdrdir)/ruby/internal/intern/vm.h
+dbm.o: $(hdrdir)/ruby/internal/interpreter.h
+dbm.o: $(hdrdir)/ruby/internal/iterator.h
+dbm.o: $(hdrdir)/ruby/internal/memory.h
+dbm.o: $(hdrdir)/ruby/internal/method.h
+dbm.o: $(hdrdir)/ruby/internal/module.h
+dbm.o: $(hdrdir)/ruby/internal/newobj.h
+dbm.o: $(hdrdir)/ruby/internal/rgengc.h
+dbm.o: $(hdrdir)/ruby/internal/scan_args.h
+dbm.o: $(hdrdir)/ruby/internal/special_consts.h
+dbm.o: $(hdrdir)/ruby/internal/static_assert.h
+dbm.o: $(hdrdir)/ruby/internal/stdalign.h
+dbm.o: $(hdrdir)/ruby/internal/stdbool.h
+dbm.o: $(hdrdir)/ruby/internal/symbol.h
+dbm.o: $(hdrdir)/ruby/internal/token_paste.h
+dbm.o: $(hdrdir)/ruby/internal/value.h
+dbm.o: $(hdrdir)/ruby/internal/value_type.h
+dbm.o: $(hdrdir)/ruby/internal/variable.h
+dbm.o: $(hdrdir)/ruby/internal/warning_push.h
+dbm.o: $(hdrdir)/ruby/internal/xmalloc.h
+dbm.o: $(hdrdir)/ruby/assert.h
+dbm.o: $(hdrdir)/ruby/backward.h
+dbm.o: $(hdrdir)/ruby/backward/2/assume.h
+dbm.o: $(hdrdir)/ruby/backward/2/attributes.h
+dbm.o: $(hdrdir)/ruby/backward/2/bool.h
+dbm.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+dbm.o: $(hdrdir)/ruby/backward/2/inttypes.h
+dbm.o: $(hdrdir)/ruby/backward/2/limits.h
+dbm.o: $(hdrdir)/ruby/backward/2/long_long.h
+dbm.o: $(hdrdir)/ruby/backward/2/stdalign.h
+dbm.o: $(hdrdir)/ruby/backward/2/stdarg.h
+dbm.o: $(hdrdir)/ruby/defines.h
+dbm.o: $(hdrdir)/ruby/intern.h
+dbm.o: $(hdrdir)/ruby/missing.h
+dbm.o: $(hdrdir)/ruby/ruby.h
+dbm.o: $(hdrdir)/ruby/st.h
+dbm.o: $(hdrdir)/ruby/subst.h
+dbm.o: dbm.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/dbm/extconf.rb b/ext/dbm/extconf.rb
index 04f751d776..c9a5518bf6 100644
--- a/ext/dbm/extconf.rb
+++ b/ext/dbm/extconf.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 # configure option:
 #   --with-dbm-type=COMMA-SEPARATED-NDBM-TYPES
 #
@@ -7,6 +7,7 @@
 #   db          Berkeley DB (libdb)
 #   db2         Berkeley DB (libdb2)
 #   db1         Berkeley DB (libdb1)
+#   db6         Berkeley DB (libdb6)
 #   db5         Berkeley DB (libdb5)
 #   db4         Berkeley DB (libdb4)
 #   db3         Berkeley DB (libdb3)
@@ -23,7 +24,7 @@ dir_config("dbm")
 if dblib = with_config("dbm-type", nil)
   dblib = dblib.split(/[ ,]+/)
 else
-  dblib = %w(libc db db2 db1 db5 db4 db3 gdbm_compat gdbm qdbm)
+  dblib = %w(libc db db2 db1 db6 db5 db4 db3 gdbm_compat gdbm qdbm)
 end
 
 headers = {
@@ -34,6 +35,7 @@ headers = {
   "db3" => ["db3/db.h", "db3.h", "db.h"],
   "db4" => ["db4/db.h", "db4.h", "db.h"],
   "db5" => ["db5/db.h", "db5.h", "db.h"],
+  "db6" => ["db6/db.h", "db6.h", "db.h"],
   "gdbm_compat" => ["gdbm-ndbm.h", "gdbm/ndbm.h", "ndbm.h"], # GDBM since 1.8.1
   "gdbm" => ["gdbm-ndbm.h", "gdbm/ndbm.h", "ndbm.h"], # GDBM until 1.8.0
   "qdbm" => ["qdbm/relic.h", "relic.h"],
@@ -131,7 +133,7 @@ def headers.db_check2(db, hdr)
   hsearch = nil
 
   case db
-  when /^db[2-5]?$/
+  when /^db[2-6]?$/
     hsearch = "-DDB_DBM_HSEARCH"
   when "gdbm_compat"
     have_library("gdbm") or return false
diff --git a/ext/digest/bubblebabble/bubblebabble.c b/ext/digest/bubblebabble/bubblebabble.c
index 4b8263de5a..6557e43c9d 100644
--- a/ext/digest/bubblebabble/bubblebabble.c
+++ b/ext/digest/bubblebabble/bubblebabble.c
@@ -101,7 +101,7 @@ rb_digest_s_bubblebabble(VALUE klass, VALUE str)
 static VALUE
 rb_digest_class_s_bubblebabble(int argc, VALUE *argv, VALUE klass)
 {
-    return bubblebabble_str_new(rb_funcall2(klass, id_digest, argc, argv));
+    return bubblebabble_str_new(rb_funcallv(klass, id_digest, argc, argv));
 }
 
 /* Document-method: Digest::Instance#bubblebabble
@@ -124,6 +124,7 @@ rb_digest_instance_bubblebabble(VALUE self)
 void
 Init_bubblebabble(void)
 {
+#undef rb_intern
     VALUE rb_mDigest, rb_mDigest_Instance, rb_cDigest_Class;
 
     rb_require("digest");
diff --git a/ext/digest/bubblebabble/depend b/ext/digest/bubblebabble/depend
index c0550f3180..6dcd5fe55c 100644
--- a/ext/digest/bubblebabble/depend
+++ b/ext/digest/bubblebabble/depend
@@ -1,14 +1,164 @@
 # AUTOGENERATED DEPENDENCIES START
 bubblebabble.o: $(RUBY_EXTCONF_H)
 bubblebabble.o: $(arch_hdrdir)/ruby/config.h
+bubblebabble.o: $(hdrdir)/ruby.h
+bubblebabble.o: $(hdrdir)/ruby/internal/anyargs.h
+bubblebabble.o: $(hdrdir)/ruby/internal/arithmetic.h
+bubblebabble.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+bubblebabble.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+bubblebabble.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+bubblebabble.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+bubblebabble.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+bubblebabble.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+bubblebabble.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+bubblebabble.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+bubblebabble.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+bubblebabble.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+bubblebabble.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+bubblebabble.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+bubblebabble.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+bubblebabble.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+bubblebabble.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+bubblebabble.o: $(hdrdir)/ruby/internal/assume.h
+bubblebabble.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+bubblebabble.o: $(hdrdir)/ruby/internal/attr/artificial.h
+bubblebabble.o: $(hdrdir)/ruby/internal/attr/cold.h
+bubblebabble.o: $(hdrdir)/ruby/internal/attr/const.h
+bubblebabble.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+bubblebabble.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+bubblebabble.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+bubblebabble.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+bubblebabble.o: $(hdrdir)/ruby/internal/attr/error.h
+bubblebabble.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+bubblebabble.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+bubblebabble.o: $(hdrdir)/ruby/internal/attr/format.h
+bubblebabble.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+bubblebabble.o: $(hdrdir)/ruby/internal/attr/noalias.h
+bubblebabble.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+bubblebabble.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+bubblebabble.o: $(hdrdir)/ruby/internal/attr/noinline.h
+bubblebabble.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+bubblebabble.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+bubblebabble.o: $(hdrdir)/ruby/internal/attr/pure.h
+bubblebabble.o: $(hdrdir)/ruby/internal/attr/restrict.h
+bubblebabble.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+bubblebabble.o: $(hdrdir)/ruby/internal/attr/warning.h
+bubblebabble.o: $(hdrdir)/ruby/internal/attr/weakref.h
+bubblebabble.o: $(hdrdir)/ruby/internal/cast.h
+bubblebabble.o: $(hdrdir)/ruby/internal/compiler_is.h
+bubblebabble.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+bubblebabble.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+bubblebabble.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+bubblebabble.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+bubblebabble.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+bubblebabble.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+bubblebabble.o: $(hdrdir)/ruby/internal/compiler_since.h
+bubblebabble.o: $(hdrdir)/ruby/internal/config.h
+bubblebabble.o: $(hdrdir)/ruby/internal/constant_p.h
+bubblebabble.o: $(hdrdir)/ruby/internal/core.h
+bubblebabble.o: $(hdrdir)/ruby/internal/core/rarray.h
+bubblebabble.o: $(hdrdir)/ruby/internal/core/rbasic.h
+bubblebabble.o: $(hdrdir)/ruby/internal/core/rbignum.h
+bubblebabble.o: $(hdrdir)/ruby/internal/core/rclass.h
+bubblebabble.o: $(hdrdir)/ruby/internal/core/rdata.h
+bubblebabble.o: $(hdrdir)/ruby/internal/core/rfile.h
+bubblebabble.o: $(hdrdir)/ruby/internal/core/rhash.h
+bubblebabble.o: $(hdrdir)/ruby/internal/core/robject.h
+bubblebabble.o: $(hdrdir)/ruby/internal/core/rregexp.h
+bubblebabble.o: $(hdrdir)/ruby/internal/core/rstring.h
+bubblebabble.o: $(hdrdir)/ruby/internal/core/rstruct.h
+bubblebabble.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+bubblebabble.o: $(hdrdir)/ruby/internal/ctype.h
+bubblebabble.o: $(hdrdir)/ruby/internal/dllexport.h
+bubblebabble.o: $(hdrdir)/ruby/internal/dosish.h
+bubblebabble.o: $(hdrdir)/ruby/internal/error.h
+bubblebabble.o: $(hdrdir)/ruby/internal/eval.h
+bubblebabble.o: $(hdrdir)/ruby/internal/event.h
+bubblebabble.o: $(hdrdir)/ruby/internal/fl_type.h
+bubblebabble.o: $(hdrdir)/ruby/internal/gc.h
+bubblebabble.o: $(hdrdir)/ruby/internal/glob.h
+bubblebabble.o: $(hdrdir)/ruby/internal/globals.h
+bubblebabble.o: $(hdrdir)/ruby/internal/has/attribute.h
+bubblebabble.o: $(hdrdir)/ruby/internal/has/builtin.h
+bubblebabble.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+bubblebabble.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+bubblebabble.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+bubblebabble.o: $(hdrdir)/ruby/internal/has/extension.h
+bubblebabble.o: $(hdrdir)/ruby/internal/has/feature.h
+bubblebabble.o: $(hdrdir)/ruby/internal/has/warning.h
+bubblebabble.o: $(hdrdir)/ruby/internal/intern/array.h
+bubblebabble.o: $(hdrdir)/ruby/internal/intern/bignum.h
+bubblebabble.o: $(hdrdir)/ruby/internal/intern/class.h
+bubblebabble.o: $(hdrdir)/ruby/internal/intern/compar.h
+bubblebabble.o: $(hdrdir)/ruby/internal/intern/complex.h
+bubblebabble.o: $(hdrdir)/ruby/internal/intern/cont.h
+bubblebabble.o: $(hdrdir)/ruby/internal/intern/dir.h
+bubblebabble.o: $(hdrdir)/ruby/internal/intern/enum.h
+bubblebabble.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+bubblebabble.o: $(hdrdir)/ruby/internal/intern/error.h
+bubblebabble.o: $(hdrdir)/ruby/internal/intern/eval.h
+bubblebabble.o: $(hdrdir)/ruby/internal/intern/file.h
+bubblebabble.o: $(hdrdir)/ruby/internal/intern/gc.h
+bubblebabble.o: $(hdrdir)/ruby/internal/intern/hash.h
+bubblebabble.o: $(hdrdir)/ruby/internal/intern/io.h
+bubblebabble.o: $(hdrdir)/ruby/internal/intern/load.h
+bubblebabble.o: $(hdrdir)/ruby/internal/intern/marshal.h
+bubblebabble.o: $(hdrdir)/ruby/internal/intern/numeric.h
+bubblebabble.o: $(hdrdir)/ruby/internal/intern/object.h
+bubblebabble.o: $(hdrdir)/ruby/internal/intern/parse.h
+bubblebabble.o: $(hdrdir)/ruby/internal/intern/proc.h
+bubblebabble.o: $(hdrdir)/ruby/internal/intern/process.h
+bubblebabble.o: $(hdrdir)/ruby/internal/intern/random.h
+bubblebabble.o: $(hdrdir)/ruby/internal/intern/range.h
+bubblebabble.o: $(hdrdir)/ruby/internal/intern/rational.h
+bubblebabble.o: $(hdrdir)/ruby/internal/intern/re.h
+bubblebabble.o: $(hdrdir)/ruby/internal/intern/ruby.h
+bubblebabble.o: $(hdrdir)/ruby/internal/intern/select.h
+bubblebabble.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+bubblebabble.o: $(hdrdir)/ruby/internal/intern/signal.h
+bubblebabble.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+bubblebabble.o: $(hdrdir)/ruby/internal/intern/string.h
+bubblebabble.o: $(hdrdir)/ruby/internal/intern/struct.h
+bubblebabble.o: $(hdrdir)/ruby/internal/intern/thread.h
+bubblebabble.o: $(hdrdir)/ruby/internal/intern/time.h
+bubblebabble.o: $(hdrdir)/ruby/internal/intern/variable.h
+bubblebabble.o: $(hdrdir)/ruby/internal/intern/vm.h
+bubblebabble.o: $(hdrdir)/ruby/internal/interpreter.h
+bubblebabble.o: $(hdrdir)/ruby/internal/iterator.h
+bubblebabble.o: $(hdrdir)/ruby/internal/memory.h
+bubblebabble.o: $(hdrdir)/ruby/internal/method.h
+bubblebabble.o: $(hdrdir)/ruby/internal/module.h
+bubblebabble.o: $(hdrdir)/ruby/internal/newobj.h
+bubblebabble.o: $(hdrdir)/ruby/internal/rgengc.h
+bubblebabble.o: $(hdrdir)/ruby/internal/scan_args.h
+bubblebabble.o: $(hdrdir)/ruby/internal/special_consts.h
+bubblebabble.o: $(hdrdir)/ruby/internal/static_assert.h
+bubblebabble.o: $(hdrdir)/ruby/internal/stdalign.h
+bubblebabble.o: $(hdrdir)/ruby/internal/stdbool.h
+bubblebabble.o: $(hdrdir)/ruby/internal/symbol.h
+bubblebabble.o: $(hdrdir)/ruby/internal/token_paste.h
+bubblebabble.o: $(hdrdir)/ruby/internal/value.h
+bubblebabble.o: $(hdrdir)/ruby/internal/value_type.h
+bubblebabble.o: $(hdrdir)/ruby/internal/variable.h
+bubblebabble.o: $(hdrdir)/ruby/internal/warning_push.h
+bubblebabble.o: $(hdrdir)/ruby/internal/xmalloc.h
+bubblebabble.o: $(hdrdir)/ruby/assert.h
 bubblebabble.o: $(hdrdir)/ruby/backward.h
+bubblebabble.o: $(hdrdir)/ruby/backward/2/assume.h
+bubblebabble.o: $(hdrdir)/ruby/backward/2/attributes.h
+bubblebabble.o: $(hdrdir)/ruby/backward/2/bool.h
+bubblebabble.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+bubblebabble.o: $(hdrdir)/ruby/backward/2/inttypes.h
+bubblebabble.o: $(hdrdir)/ruby/backward/2/limits.h
+bubblebabble.o: $(hdrdir)/ruby/backward/2/long_long.h
+bubblebabble.o: $(hdrdir)/ruby/backward/2/stdalign.h
+bubblebabble.o: $(hdrdir)/ruby/backward/2/stdarg.h
 bubblebabble.o: $(hdrdir)/ruby/defines.h
 bubblebabble.o: $(hdrdir)/ruby/intern.h
 bubblebabble.o: $(hdrdir)/ruby/missing.h
 bubblebabble.o: $(hdrdir)/ruby/ruby.h
 bubblebabble.o: $(hdrdir)/ruby/st.h
 bubblebabble.o: $(hdrdir)/ruby/subst.h
-bubblebabble.o: $(top_srcdir)/ext/digest/digest.h
-bubblebabble.o: $(top_srcdir)/include/ruby.h
+bubblebabble.o: $(srcdir)/../digest.h
 bubblebabble.o: bubblebabble.c
 # AUTOGENERATED DEPENDENCIES END
diff --git a/ext/digest/depend b/ext/digest/depend
index 8e3b4691e8..ac01d970dc 100644
--- a/ext/digest/depend
+++ b/ext/digest/depend
@@ -1,14 +1,164 @@
 # AUTOGENERATED DEPENDENCIES START
 digest.o: $(RUBY_EXTCONF_H)
 digest.o: $(arch_hdrdir)/ruby/config.h
+digest.o: $(hdrdir)/ruby.h
+digest.o: $(hdrdir)/ruby/internal/anyargs.h
+digest.o: $(hdrdir)/ruby/internal/arithmetic.h
+digest.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+digest.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+digest.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+digest.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+digest.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+digest.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+digest.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+digest.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+digest.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+digest.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+digest.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+digest.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+digest.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+digest.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+digest.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+digest.o: $(hdrdir)/ruby/internal/assume.h
+digest.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+digest.o: $(hdrdir)/ruby/internal/attr/artificial.h
+digest.o: $(hdrdir)/ruby/internal/attr/cold.h
+digest.o: $(hdrdir)/ruby/internal/attr/const.h
+digest.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+digest.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+digest.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+digest.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+digest.o: $(hdrdir)/ruby/internal/attr/error.h
+digest.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+digest.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+digest.o: $(hdrdir)/ruby/internal/attr/format.h
+digest.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+digest.o: $(hdrdir)/ruby/internal/attr/noalias.h
+digest.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+digest.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+digest.o: $(hdrdir)/ruby/internal/attr/noinline.h
+digest.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+digest.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+digest.o: $(hdrdir)/ruby/internal/attr/pure.h
+digest.o: $(hdrdir)/ruby/internal/attr/restrict.h
+digest.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+digest.o: $(hdrdir)/ruby/internal/attr/warning.h
+digest.o: $(hdrdir)/ruby/internal/attr/weakref.h
+digest.o: $(hdrdir)/ruby/internal/cast.h
+digest.o: $(hdrdir)/ruby/internal/compiler_is.h
+digest.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+digest.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+digest.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+digest.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+digest.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+digest.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+digest.o: $(hdrdir)/ruby/internal/compiler_since.h
+digest.o: $(hdrdir)/ruby/internal/config.h
+digest.o: $(hdrdir)/ruby/internal/constant_p.h
+digest.o: $(hdrdir)/ruby/internal/core.h
+digest.o: $(hdrdir)/ruby/internal/core/rarray.h
+digest.o: $(hdrdir)/ruby/internal/core/rbasic.h
+digest.o: $(hdrdir)/ruby/internal/core/rbignum.h
+digest.o: $(hdrdir)/ruby/internal/core/rclass.h
+digest.o: $(hdrdir)/ruby/internal/core/rdata.h
+digest.o: $(hdrdir)/ruby/internal/core/rfile.h
+digest.o: $(hdrdir)/ruby/internal/core/rhash.h
+digest.o: $(hdrdir)/ruby/internal/core/robject.h
+digest.o: $(hdrdir)/ruby/internal/core/rregexp.h
+digest.o: $(hdrdir)/ruby/internal/core/rstring.h
+digest.o: $(hdrdir)/ruby/internal/core/rstruct.h
+digest.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+digest.o: $(hdrdir)/ruby/internal/ctype.h
+digest.o: $(hdrdir)/ruby/internal/dllexport.h
+digest.o: $(hdrdir)/ruby/internal/dosish.h
+digest.o: $(hdrdir)/ruby/internal/error.h
+digest.o: $(hdrdir)/ruby/internal/eval.h
+digest.o: $(hdrdir)/ruby/internal/event.h
+digest.o: $(hdrdir)/ruby/internal/fl_type.h
+digest.o: $(hdrdir)/ruby/internal/gc.h
+digest.o: $(hdrdir)/ruby/internal/glob.h
+digest.o: $(hdrdir)/ruby/internal/globals.h
+digest.o: $(hdrdir)/ruby/internal/has/attribute.h
+digest.o: $(hdrdir)/ruby/internal/has/builtin.h
+digest.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+digest.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+digest.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+digest.o: $(hdrdir)/ruby/internal/has/extension.h
+digest.o: $(hdrdir)/ruby/internal/has/feature.h
+digest.o: $(hdrdir)/ruby/internal/has/warning.h
+digest.o: $(hdrdir)/ruby/internal/intern/array.h
+digest.o: $(hdrdir)/ruby/internal/intern/bignum.h
+digest.o: $(hdrdir)/ruby/internal/intern/class.h
+digest.o: $(hdrdir)/ruby/internal/intern/compar.h
+digest.o: $(hdrdir)/ruby/internal/intern/complex.h
+digest.o: $(hdrdir)/ruby/internal/intern/cont.h
+digest.o: $(hdrdir)/ruby/internal/intern/dir.h
+digest.o: $(hdrdir)/ruby/internal/intern/enum.h
+digest.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+digest.o: $(hdrdir)/ruby/internal/intern/error.h
+digest.o: $(hdrdir)/ruby/internal/intern/eval.h
+digest.o: $(hdrdir)/ruby/internal/intern/file.h
+digest.o: $(hdrdir)/ruby/internal/intern/gc.h
+digest.o: $(hdrdir)/ruby/internal/intern/hash.h
+digest.o: $(hdrdir)/ruby/internal/intern/io.h
+digest.o: $(hdrdir)/ruby/internal/intern/load.h
+digest.o: $(hdrdir)/ruby/internal/intern/marshal.h
+digest.o: $(hdrdir)/ruby/internal/intern/numeric.h
+digest.o: $(hdrdir)/ruby/internal/intern/object.h
+digest.o: $(hdrdir)/ruby/internal/intern/parse.h
+digest.o: $(hdrdir)/ruby/internal/intern/proc.h
+digest.o: $(hdrdir)/ruby/internal/intern/process.h
+digest.o: $(hdrdir)/ruby/internal/intern/random.h
+digest.o: $(hdrdir)/ruby/internal/intern/range.h
+digest.o: $(hdrdir)/ruby/internal/intern/rational.h
+digest.o: $(hdrdir)/ruby/internal/intern/re.h
+digest.o: $(hdrdir)/ruby/internal/intern/ruby.h
+digest.o: $(hdrdir)/ruby/internal/intern/select.h
+digest.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+digest.o: $(hdrdir)/ruby/internal/intern/signal.h
+digest.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+digest.o: $(hdrdir)/ruby/internal/intern/string.h
+digest.o: $(hdrdir)/ruby/internal/intern/struct.h
+digest.o: $(hdrdir)/ruby/internal/intern/thread.h
+digest.o: $(hdrdir)/ruby/internal/intern/time.h
+digest.o: $(hdrdir)/ruby/internal/intern/variable.h
+digest.o: $(hdrdir)/ruby/internal/intern/vm.h
+digest.o: $(hdrdir)/ruby/internal/interpreter.h
+digest.o: $(hdrdir)/ruby/internal/iterator.h
+digest.o: $(hdrdir)/ruby/internal/memory.h
+digest.o: $(hdrdir)/ruby/internal/method.h
+digest.o: $(hdrdir)/ruby/internal/module.h
+digest.o: $(hdrdir)/ruby/internal/newobj.h
+digest.o: $(hdrdir)/ruby/internal/rgengc.h
+digest.o: $(hdrdir)/ruby/internal/scan_args.h
+digest.o: $(hdrdir)/ruby/internal/special_consts.h
+digest.o: $(hdrdir)/ruby/internal/static_assert.h
+digest.o: $(hdrdir)/ruby/internal/stdalign.h
+digest.o: $(hdrdir)/ruby/internal/stdbool.h
+digest.o: $(hdrdir)/ruby/internal/symbol.h
+digest.o: $(hdrdir)/ruby/internal/token_paste.h
+digest.o: $(hdrdir)/ruby/internal/value.h
+digest.o: $(hdrdir)/ruby/internal/value_type.h
+digest.o: $(hdrdir)/ruby/internal/variable.h
+digest.o: $(hdrdir)/ruby/internal/warning_push.h
+digest.o: $(hdrdir)/ruby/internal/xmalloc.h
+digest.o: $(hdrdir)/ruby/assert.h
 digest.o: $(hdrdir)/ruby/backward.h
+digest.o: $(hdrdir)/ruby/backward/2/assume.h
+digest.o: $(hdrdir)/ruby/backward/2/attributes.h
+digest.o: $(hdrdir)/ruby/backward/2/bool.h
+digest.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+digest.o: $(hdrdir)/ruby/backward/2/inttypes.h
+digest.o: $(hdrdir)/ruby/backward/2/limits.h
+digest.o: $(hdrdir)/ruby/backward/2/long_long.h
+digest.o: $(hdrdir)/ruby/backward/2/stdalign.h
+digest.o: $(hdrdir)/ruby/backward/2/stdarg.h
 digest.o: $(hdrdir)/ruby/defines.h
 digest.o: $(hdrdir)/ruby/intern.h
 digest.o: $(hdrdir)/ruby/missing.h
 digest.o: $(hdrdir)/ruby/ruby.h
 digest.o: $(hdrdir)/ruby/st.h
 digest.o: $(hdrdir)/ruby/subst.h
-digest.o: $(top_srcdir)/include/ruby.h
 digest.o: digest.c
 digest.o: digest.h
 # AUTOGENERATED DEPENDENCIES END
diff --git a/ext/digest/digest.c b/ext/digest/digest.c
index a02eb12cd6..83f4ee42fc 100644
--- a/ext/digest/digest.c
+++ b/ext/digest/digest.c
@@ -77,8 +77,8 @@ RUBY_EXTERN void Init_digest_base(void);
  *
  * Different digest algorithms (or hash functions) are available:
  *
- * HMAC::
- *   See FIPS PUB 198 The Keyed-Hash Message Authentication Code (HMAC).
+ * MD5::
+ *  See RFC 1321 The MD5 Message-Digest Algorithm
  * RIPEMD-160::
  *   As Digest::RMD160.
  *   See http://homes.esat.kuleuven.be/~bosselae/ripemd160.html.
@@ -406,7 +406,7 @@ rb_digest_instance_digest_length(VALUE self)
 
     /* never blindly assume that #digest() returns a string */
     StringValue(digest);
-    return INT2NUM(RSTRING_LEN(digest));
+    return LONG2NUM(RSTRING_LEN(digest));
 }
 
 /*
@@ -486,7 +486,7 @@ rb_digest_class_s_digest(int argc, VALUE *argv, VALUE klass)
 static VALUE
 rb_digest_class_s_hexdigest(int argc, VALUE *argv, VALUE klass)
 {
-    return hexencode_str_new(rb_funcall2(klass, id_digest, argc, argv));
+    return hexencode_str_new(rb_funcallv(klass, id_digest, argc, argv));
 }
 
 /* :nodoc: */
@@ -501,6 +501,40 @@ rb_digest_class_init(VALUE self)
  *
  * This abstract class provides a common interface to message digest
  * implementation classes written in C.
+ *
+ * ==Write a Digest subclass in C
+ * Digest::Base provides a common interface to message digest
+ * classes written in C. These classes must provide a struct
+ * of type rb_digest_metadata_t:
+ *  typedef int (*rb_digest_hash_init_func_t)(void *);
+ *  typedef void (*rb_digest_hash_update_func_t)(void *, unsigned char *, size_t);
+ *  typedef int (*rb_digest_hash_finish_func_t)(void *, unsigned char *);
+ *
+ *  typedef struct {
+ *    int api_version;
+ *    size_t digest_len;
+ *    size_t block_len;
+ *    size_t ctx_size;
+ *    rb_digest_hash_init_func_t init_func;
+ *    rb_digest_hash_update_func_t update_func;
+ *    rb_digest_hash_finish_func_t finish_func;
+ *  } rb_digest_metadata_t;
+ *
+ * This structure must be set as an instance variable named +metadata+
+ * (without the +@+ in front of the name). By example:
+ *   static const rb_digest_metadata_t sha1 = {
+ *      RUBY_DIGEST_API_VERSION,
+ *      SHA1_DIGEST_LENGTH,
+ *      SHA1_BLOCK_LENGTH,
+ *      sizeof(SHA1_CTX),
+ *      (rb_digest_hash_init_func_t)SHA1_Init,
+ *      (rb_digest_hash_update_func_t)SHA1_Update,
+ *      (rb_digest_hash_finish_func_t)SHA1_Finish,
+ *  };
+ *
+ *
+ *  rb_ivar_set(cDigest_SHA1, rb_intern("metadata"),
+ *		Data_Wrap_Struct(0, 0, 0, (void *)&sha1));
  */
 
 static rb_digest_metadata_t *
@@ -520,10 +554,22 @@ get_digest_base_metadata(VALUE klass)
     if (NIL_P(p))
         rb_raise(rb_eRuntimeError, "Digest::Base cannot be directly inherited in Ruby");
 
+    if (!RB_TYPE_P(obj, T_DATA) || RTYPEDDATA_P(obj)) {
+      wrong:
+        if (p == klass)
+            rb_raise(rb_eTypeError, "%"PRIsVALUE"::metadata is not initialized properly",
+                     klass);
+        else
+            rb_raise(rb_eTypeError, "%"PRIsVALUE"(%"PRIsVALUE")::metadata is not initialized properly",
+                     klass, p);
+    }
+
 #undef RUBY_UNTYPED_DATA_WARNING
 #define RUBY_UNTYPED_DATA_WARNING 0
     Data_Get_Struct(obj, rb_digest_metadata_t, algo);
 
+    if (!algo) goto wrong;
+
     switch (algo->api_version) {
       case 3:
         break;
@@ -539,6 +585,12 @@ get_digest_base_metadata(VALUE klass)
     return algo;
 }
 
+static rb_digest_metadata_t *
+get_digest_obj_metadata(VALUE obj)
+{
+    return get_digest_base_metadata(rb_obj_class(obj));
+}
+
 static const rb_data_type_t digest_type = {
     "digest",
     {0, RUBY_TYPED_DEFAULT_FREE, 0,},
@@ -585,8 +637,8 @@ rb_digest_base_copy(VALUE copy, VALUE obj)
 
     rb_check_frozen(copy);
 
-    algo = get_digest_base_metadata(rb_obj_class(copy));
-    if (algo != get_digest_base_metadata(rb_obj_class(obj)))
+    algo = get_digest_obj_metadata(copy);
+    if (algo != get_digest_obj_metadata(obj))
 	rb_raise(rb_eTypeError, "different algorithms");
 
     TypedData_Get_Struct(obj, void, &digest_type, pctx1);
@@ -596,14 +648,18 @@ rb_digest_base_copy(VALUE copy, VALUE obj)
     return copy;
 }
 
-/* :nodoc: */
+/*
+ * call-seq: digest_base.reset -> digest_base
+ *
+ * Reset the digest to its initial state and return +self+.
+ */
 static VALUE
 rb_digest_base_reset(VALUE self)
 {
     rb_digest_metadata_t *algo;
     void *pctx;
 
-    algo = get_digest_base_metadata(rb_obj_class(self));
+    algo = get_digest_obj_metadata(self);
 
     TypedData_Get_Struct(self, void, &digest_type, pctx);
 
@@ -612,14 +668,20 @@ rb_digest_base_reset(VALUE self)
     return self;
 }
 
-/* :nodoc: */
+/*
+ * call-seq:
+ *   digest_base.update(string) -> digest_base
+ *   digest_base << string -> digest_base
+ *
+ * Update the digest using given _string_ and return +self+.
+ */
 static VALUE
 rb_digest_base_update(VALUE self, VALUE str)
 {
     rb_digest_metadata_t *algo;
     void *pctx;
 
-    algo = get_digest_base_metadata(rb_obj_class(self));
+    algo = get_digest_obj_metadata(self);
 
     TypedData_Get_Struct(self, void, &digest_type, pctx);
 
@@ -638,7 +700,7 @@ rb_digest_base_finish(VALUE self)
     void *pctx;
     VALUE str;
 
-    algo = get_digest_base_metadata(rb_obj_class(self));
+    algo = get_digest_obj_metadata(self);
 
     TypedData_Get_Struct(self, void, &digest_type, pctx);
 
@@ -651,43 +713,62 @@ rb_digest_base_finish(VALUE self)
     return str;
 }
 
-/* :nodoc: */
+/*
+ * call-seq: digest_base.digest_length -> Integer
+ *
+ * Return the length of the hash value in bytes.
+ */
 static VALUE
 rb_digest_base_digest_length(VALUE self)
 {
     rb_digest_metadata_t *algo;
 
-    algo = get_digest_base_metadata(rb_obj_class(self));
+    algo = get_digest_obj_metadata(self);
 
-    return INT2NUM(algo->digest_len);
+    return SIZET2NUM(algo->digest_len);
 }
 
-/* :nodoc: */
+/*
+ * call-seq: digest_base.block_length -> Integer
+ *
+ * Return the block length of the digest in bytes.
+ */
 static VALUE
 rb_digest_base_block_length(VALUE self)
 {
     rb_digest_metadata_t *algo;
 
-    algo = get_digest_base_metadata(rb_obj_class(self));
+    algo = get_digest_obj_metadata(self);
 
-    return INT2NUM(algo->block_len);
+    return SIZET2NUM(algo->block_len);
 }
 
 void
 Init_digest(void)
 {
+#undef rb_intern
     id_reset           = rb_intern("reset");
     id_update          = rb_intern("update");
     id_finish          = rb_intern("finish");
     id_digest          = rb_intern("digest");
     id_hexdigest       = rb_intern("hexdigest");
     id_digest_length   = rb_intern("digest_length");
+    id_metadata        = rb_id_metadata();
+    InitVM(digest);
+}
 
+void
+InitVM_digest(void)
+{
     /*
      * module Digest
      */
     rb_mDigest = rb_define_module("Digest");
 
+#ifdef HAVE_RB_EXT_RACTOR_SAFE
+    rb_ext_ractor_safe(true);
+#endif
+
     /* module functions */
     rb_define_module_function(rb_mDigest, "hexencode", rb_digest_s_hexencode, 1);
 
@@ -729,8 +810,6 @@ Init_digest(void)
     rb_define_singleton_method(rb_cDigest_Class, "digest", rb_digest_class_s_digest, -1);
     rb_define_singleton_method(rb_cDigest_Class, "hexdigest", rb_digest_class_s_hexdigest, -1);
 
-    id_metadata = rb_intern("metadata");
-
     /* class Digest::Base < Digest::Class */
     rb_cDigest_Base = rb_define_class_under(rb_mDigest, "Base", rb_cDigest_Class);
 
diff --git a/ext/digest/digest.gemspec b/ext/digest/digest.gemspec
new file mode 100644
index 0000000000..6f3bf8b05f
--- /dev/null
+++ b/ext/digest/digest.gemspec
@@ -0,0 +1,47 @@
+# coding: utf-8
+# frozen_string_literal: true
+
+Gem::Specification.new do |spec|
+  spec.name          = "digest"
+  spec.version       = "3.0.0"
+  spec.authors       = ["Akinori MUSHA"]
+  spec.email         = ["knu@idaemons.org"]
+
+  spec.summary       = %q{Provides a framework for message digest libraries.}
+  spec.description   = %q{Provides a framework for message digest libraries.}
+  spec.homepage      = "https://github.com/ruby/digest"
+  spec.licenses      = ["Ruby", "BSD-2-Clause"]
+
+  spec.files         = [
+    "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "bin/console", "bin/setup", "digest.gemspec",
+    "ext/digest/bubblebabble/bubblebabble.c", "ext/digest/bubblebabble/extconf.rb", "ext/digest/defs.h",
+    "ext/digest/digest.c", "ext/digest/digest.h", "ext/digest/digest_conf.rb", "ext/digest/extconf.rb",
+    "ext/digest/md5/extconf.rb", "ext/digest/md5/md5.c", "ext/digest/md5/md5.h", "ext/digest/md5/md5cc.h",
+    "ext/digest/md5/md5init.c", "ext/digest/rmd160/extconf.rb", "ext/digest/rmd160/rmd160.c",
+    "ext/digest/rmd160/rmd160.h", "ext/digest/rmd160/rmd160init.c", "ext/digest/sha1/extconf.rb",
+    "ext/digest/sha1/sha1.c", "ext/digest/sha1/sha1.h", "ext/digest/sha1/sha1cc.h",
+    "ext/digest/sha1/sha1init.c", "ext/digest/sha2/extconf.rb", "ext/digest/sha2/lib/sha2.rb",
+    "ext/digest/sha2/sha2.c", "ext/digest/sha2/sha2.h", "ext/digest/sha2/sha2cc.h",
+    "ext/digest/sha2/sha2init.c", "ext/digest/test.sh", "ext/openssl/deprecation.rb",
+    "lib/digest.rb"
+  ]
+
+  spec.required_ruby_version = ">= 2.3.0"
+
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+  spec.extensions    = %w[
+    ext/digest/extconf.rb
+    ext/digest/bubblebabble/extconf.rb
+    ext/digest/md5/extconf.rb
+    ext/digest/rmd160/extconf.rb
+    ext/digest/sha1/extconf.rb
+    ext/digest/sha2/extconf.rb
+  ]
+  spec.metadata["msys2_mingw_dependencies"] = "openssl"
+
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rake-compiler"
+end
diff --git a/ext/digest/digest.h b/ext/digest/digest.h
index 30359ad348..0d4f0e7cc2 100644
--- a/ext/digest/digest.h
+++ b/ext/digest/digest.h
@@ -49,3 +49,24 @@ rb_digest_##name##_finish(void *ctx, unsigned char *ptr) \
 { \
     return name##_Final(ptr, ctx); \
 }
+
+static inline VALUE
+rb_digest_namespace(void)
+{
+    rb_require("digest");
+    return rb_path2class("Digest");
+}
+
+static inline ID
+rb_id_metadata(void)
+{
+    return rb_intern_const("metadata");
+}
+
+static inline VALUE
+rb_digest_make_metadata(const rb_digest_metadata_t *meta)
+{
+#undef RUBY_UNTYPED_DATA_WARNING
+#define RUBY_UNTYPED_DATA_WARNING 0
+    return rb_obj_freeze(Data_Wrap_Struct(0, 0, 0, (void *)meta));
+}
diff --git a/ext/digest/digest_conf.rb b/ext/digest/digest_conf.rb
index 432652852f..1b929d8732 100644
--- a/ext/digest/digest_conf.rb
+++ b/ext/digest/digest_conf.rb
@@ -1,29 +1,16 @@
 # frozen_string_literal: false
-def digest_conf(name, hdr = name, funcs = nil, types = nil)
+
+def digest_conf(name)
   unless with_config("bundled-#{name}")
     cc = with_config("common-digest")
     if cc == true or /\b#{name}\b/ =~ cc
       if File.exist?("#$srcdir/#{name}cc.h") and
         have_header("CommonCrypto/CommonDigest.h")
         $defs << "-D#{name.upcase}_USE_COMMONDIGEST"
+        $headers << "#{name}cc.h"
         return :commondigest
       end
     end
-
-    dir_config("openssl")
-    pkg_config("openssl")
-    require File.expand_path('../../openssl/deprecation', __FILE__)
-    if have_library("crypto")
-      funcs ||= name.upcase
-      funcs = Array(funcs)
-      types ||= funcs
-      hdr = "openssl/#{hdr}.h"
-      if funcs.all? {|func| OpenSSL.check_func("#{func}_Transform", hdr)} &&
-         types.all? {|type| have_type("#{type}_CTX", hdr)}
-        $defs << "-D#{name.upcase}_USE_OPENSSL"
-        return :ossl
-      end
-    end
   end
   $objs << "#{name}.#{$OBJEXT}"
   return
diff --git a/ext/digest/lib/digest.rb b/ext/digest/lib/digest.rb
index d6daf36f80..ba0637af32 100644
--- a/ext/digest/lib/digest.rb
+++ b/ext/digest/lib/digest.rb
@@ -3,7 +3,7 @@ require 'digest.so'
 
 module Digest
   # A mutex for Digest().
-  REQUIRE_MUTEX = Mutex.new
+  REQUIRE_MUTEX = Thread::Mutex.new
 
   def self.const_missing(name) # :nodoc:
     case name
diff --git a/ext/digest/md5/depend b/ext/digest/md5/depend
index 58829918e4..987ebcc12d 100644
--- a/ext/digest/md5/depend
+++ b/ext/digest/md5/depend
@@ -1,19 +1,332 @@
 md5.o: md5.c md5.h $(srcdir)/../defs.h
+md5init.o: $(LOCAL_HDRS)
 
 # AUTOGENERATED DEPENDENCIES START
+md5.o: $(RUBY_EXTCONF_H)
+md5.o: $(arch_hdrdir)/ruby/config.h
+md5.o: $(hdrdir)/ruby.h
+md5.o: $(hdrdir)/ruby/assert.h
+md5.o: $(hdrdir)/ruby/backward.h
+md5.o: $(hdrdir)/ruby/backward/2/assume.h
+md5.o: $(hdrdir)/ruby/backward/2/attributes.h
+md5.o: $(hdrdir)/ruby/backward/2/bool.h
+md5.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+md5.o: $(hdrdir)/ruby/backward/2/inttypes.h
+md5.o: $(hdrdir)/ruby/backward/2/limits.h
+md5.o: $(hdrdir)/ruby/backward/2/long_long.h
+md5.o: $(hdrdir)/ruby/backward/2/stdalign.h
+md5.o: $(hdrdir)/ruby/backward/2/stdarg.h
+md5.o: $(hdrdir)/ruby/defines.h
+md5.o: $(hdrdir)/ruby/intern.h
+md5.o: $(hdrdir)/ruby/internal/anyargs.h
+md5.o: $(hdrdir)/ruby/internal/arithmetic.h
+md5.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+md5.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+md5.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+md5.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+md5.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+md5.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+md5.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+md5.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+md5.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+md5.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+md5.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+md5.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+md5.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+md5.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+md5.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+md5.o: $(hdrdir)/ruby/internal/assume.h
+md5.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+md5.o: $(hdrdir)/ruby/internal/attr/artificial.h
+md5.o: $(hdrdir)/ruby/internal/attr/cold.h
+md5.o: $(hdrdir)/ruby/internal/attr/const.h
+md5.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+md5.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+md5.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+md5.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+md5.o: $(hdrdir)/ruby/internal/attr/error.h
+md5.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+md5.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+md5.o: $(hdrdir)/ruby/internal/attr/format.h
+md5.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+md5.o: $(hdrdir)/ruby/internal/attr/noalias.h
+md5.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+md5.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+md5.o: $(hdrdir)/ruby/internal/attr/noinline.h
+md5.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+md5.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+md5.o: $(hdrdir)/ruby/internal/attr/pure.h
+md5.o: $(hdrdir)/ruby/internal/attr/restrict.h
+md5.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+md5.o: $(hdrdir)/ruby/internal/attr/warning.h
+md5.o: $(hdrdir)/ruby/internal/attr/weakref.h
+md5.o: $(hdrdir)/ruby/internal/cast.h
+md5.o: $(hdrdir)/ruby/internal/compiler_is.h
+md5.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+md5.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+md5.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+md5.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+md5.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+md5.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+md5.o: $(hdrdir)/ruby/internal/compiler_since.h
+md5.o: $(hdrdir)/ruby/internal/config.h
+md5.o: $(hdrdir)/ruby/internal/constant_p.h
+md5.o: $(hdrdir)/ruby/internal/core.h
+md5.o: $(hdrdir)/ruby/internal/core/rarray.h
+md5.o: $(hdrdir)/ruby/internal/core/rbasic.h
+md5.o: $(hdrdir)/ruby/internal/core/rbignum.h
+md5.o: $(hdrdir)/ruby/internal/core/rclass.h
+md5.o: $(hdrdir)/ruby/internal/core/rdata.h
+md5.o: $(hdrdir)/ruby/internal/core/rfile.h
+md5.o: $(hdrdir)/ruby/internal/core/rhash.h
+md5.o: $(hdrdir)/ruby/internal/core/robject.h
+md5.o: $(hdrdir)/ruby/internal/core/rregexp.h
+md5.o: $(hdrdir)/ruby/internal/core/rstring.h
+md5.o: $(hdrdir)/ruby/internal/core/rstruct.h
+md5.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+md5.o: $(hdrdir)/ruby/internal/ctype.h
+md5.o: $(hdrdir)/ruby/internal/dllexport.h
+md5.o: $(hdrdir)/ruby/internal/dosish.h
+md5.o: $(hdrdir)/ruby/internal/error.h
+md5.o: $(hdrdir)/ruby/internal/eval.h
+md5.o: $(hdrdir)/ruby/internal/event.h
+md5.o: $(hdrdir)/ruby/internal/fl_type.h
+md5.o: $(hdrdir)/ruby/internal/gc.h
+md5.o: $(hdrdir)/ruby/internal/glob.h
+md5.o: $(hdrdir)/ruby/internal/globals.h
+md5.o: $(hdrdir)/ruby/internal/has/attribute.h
+md5.o: $(hdrdir)/ruby/internal/has/builtin.h
+md5.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+md5.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+md5.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+md5.o: $(hdrdir)/ruby/internal/has/extension.h
+md5.o: $(hdrdir)/ruby/internal/has/feature.h
+md5.o: $(hdrdir)/ruby/internal/has/warning.h
+md5.o: $(hdrdir)/ruby/internal/intern/array.h
+md5.o: $(hdrdir)/ruby/internal/intern/bignum.h
+md5.o: $(hdrdir)/ruby/internal/intern/class.h
+md5.o: $(hdrdir)/ruby/internal/intern/compar.h
+md5.o: $(hdrdir)/ruby/internal/intern/complex.h
+md5.o: $(hdrdir)/ruby/internal/intern/cont.h
+md5.o: $(hdrdir)/ruby/internal/intern/dir.h
+md5.o: $(hdrdir)/ruby/internal/intern/enum.h
+md5.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+md5.o: $(hdrdir)/ruby/internal/intern/error.h
+md5.o: $(hdrdir)/ruby/internal/intern/eval.h
+md5.o: $(hdrdir)/ruby/internal/intern/file.h
+md5.o: $(hdrdir)/ruby/internal/intern/gc.h
+md5.o: $(hdrdir)/ruby/internal/intern/hash.h
+md5.o: $(hdrdir)/ruby/internal/intern/io.h
+md5.o: $(hdrdir)/ruby/internal/intern/load.h
+md5.o: $(hdrdir)/ruby/internal/intern/marshal.h
+md5.o: $(hdrdir)/ruby/internal/intern/numeric.h
+md5.o: $(hdrdir)/ruby/internal/intern/object.h
+md5.o: $(hdrdir)/ruby/internal/intern/parse.h
+md5.o: $(hdrdir)/ruby/internal/intern/proc.h
+md5.o: $(hdrdir)/ruby/internal/intern/process.h
+md5.o: $(hdrdir)/ruby/internal/intern/random.h
+md5.o: $(hdrdir)/ruby/internal/intern/range.h
+md5.o: $(hdrdir)/ruby/internal/intern/rational.h
+md5.o: $(hdrdir)/ruby/internal/intern/re.h
+md5.o: $(hdrdir)/ruby/internal/intern/ruby.h
+md5.o: $(hdrdir)/ruby/internal/intern/select.h
+md5.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+md5.o: $(hdrdir)/ruby/internal/intern/signal.h
+md5.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+md5.o: $(hdrdir)/ruby/internal/intern/string.h
+md5.o: $(hdrdir)/ruby/internal/intern/struct.h
+md5.o: $(hdrdir)/ruby/internal/intern/thread.h
+md5.o: $(hdrdir)/ruby/internal/intern/time.h
+md5.o: $(hdrdir)/ruby/internal/intern/variable.h
+md5.o: $(hdrdir)/ruby/internal/intern/vm.h
+md5.o: $(hdrdir)/ruby/internal/interpreter.h
+md5.o: $(hdrdir)/ruby/internal/iterator.h
+md5.o: $(hdrdir)/ruby/internal/memory.h
+md5.o: $(hdrdir)/ruby/internal/method.h
+md5.o: $(hdrdir)/ruby/internal/module.h
+md5.o: $(hdrdir)/ruby/internal/newobj.h
+md5.o: $(hdrdir)/ruby/internal/rgengc.h
+md5.o: $(hdrdir)/ruby/internal/scan_args.h
+md5.o: $(hdrdir)/ruby/internal/special_consts.h
+md5.o: $(hdrdir)/ruby/internal/static_assert.h
+md5.o: $(hdrdir)/ruby/internal/stdalign.h
+md5.o: $(hdrdir)/ruby/internal/stdbool.h
+md5.o: $(hdrdir)/ruby/internal/symbol.h
+md5.o: $(hdrdir)/ruby/internal/token_paste.h
+md5.o: $(hdrdir)/ruby/internal/value.h
+md5.o: $(hdrdir)/ruby/internal/value_type.h
+md5.o: $(hdrdir)/ruby/internal/variable.h
+md5.o: $(hdrdir)/ruby/internal/warning_push.h
+md5.o: $(hdrdir)/ruby/internal/xmalloc.h
+md5.o: $(hdrdir)/ruby/missing.h
+md5.o: $(hdrdir)/ruby/ruby.h
+md5.o: $(hdrdir)/ruby/st.h
+md5.o: $(hdrdir)/ruby/subst.h
+md5.o: $(srcdir)/../defs.h
+md5.o: md5.c
+md5.o: md5.h
 md5init.o: $(RUBY_EXTCONF_H)
 md5init.o: $(arch_hdrdir)/ruby/config.h
+md5init.o: $(hdrdir)/ruby.h
+md5init.o: $(hdrdir)/ruby/assert.h
 md5init.o: $(hdrdir)/ruby/backward.h
+md5init.o: $(hdrdir)/ruby/backward/2/assume.h
+md5init.o: $(hdrdir)/ruby/backward/2/attributes.h
+md5init.o: $(hdrdir)/ruby/backward/2/bool.h
+md5init.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+md5init.o: $(hdrdir)/ruby/backward/2/inttypes.h
+md5init.o: $(hdrdir)/ruby/backward/2/limits.h
+md5init.o: $(hdrdir)/ruby/backward/2/long_long.h
+md5init.o: $(hdrdir)/ruby/backward/2/stdalign.h
+md5init.o: $(hdrdir)/ruby/backward/2/stdarg.h
 md5init.o: $(hdrdir)/ruby/defines.h
 md5init.o: $(hdrdir)/ruby/intern.h
+md5init.o: $(hdrdir)/ruby/internal/anyargs.h
+md5init.o: $(hdrdir)/ruby/internal/arithmetic.h
+md5init.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+md5init.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+md5init.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+md5init.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+md5init.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+md5init.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+md5init.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+md5init.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+md5init.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+md5init.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+md5init.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+md5init.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+md5init.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+md5init.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+md5init.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+md5init.o: $(hdrdir)/ruby/internal/assume.h
+md5init.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+md5init.o: $(hdrdir)/ruby/internal/attr/artificial.h
+md5init.o: $(hdrdir)/ruby/internal/attr/cold.h
+md5init.o: $(hdrdir)/ruby/internal/attr/const.h
+md5init.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+md5init.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+md5init.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+md5init.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+md5init.o: $(hdrdir)/ruby/internal/attr/error.h
+md5init.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+md5init.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+md5init.o: $(hdrdir)/ruby/internal/attr/format.h
+md5init.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+md5init.o: $(hdrdir)/ruby/internal/attr/noalias.h
+md5init.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+md5init.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+md5init.o: $(hdrdir)/ruby/internal/attr/noinline.h
+md5init.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+md5init.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+md5init.o: $(hdrdir)/ruby/internal/attr/pure.h
+md5init.o: $(hdrdir)/ruby/internal/attr/restrict.h
+md5init.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+md5init.o: $(hdrdir)/ruby/internal/attr/warning.h
+md5init.o: $(hdrdir)/ruby/internal/attr/weakref.h
+md5init.o: $(hdrdir)/ruby/internal/cast.h
+md5init.o: $(hdrdir)/ruby/internal/compiler_is.h
+md5init.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+md5init.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+md5init.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+md5init.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+md5init.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+md5init.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+md5init.o: $(hdrdir)/ruby/internal/compiler_since.h
+md5init.o: $(hdrdir)/ruby/internal/config.h
+md5init.o: $(hdrdir)/ruby/internal/constant_p.h
+md5init.o: $(hdrdir)/ruby/internal/core.h
+md5init.o: $(hdrdir)/ruby/internal/core/rarray.h
+md5init.o: $(hdrdir)/ruby/internal/core/rbasic.h
+md5init.o: $(hdrdir)/ruby/internal/core/rbignum.h
+md5init.o: $(hdrdir)/ruby/internal/core/rclass.h
+md5init.o: $(hdrdir)/ruby/internal/core/rdata.h
+md5init.o: $(hdrdir)/ruby/internal/core/rfile.h
+md5init.o: $(hdrdir)/ruby/internal/core/rhash.h
+md5init.o: $(hdrdir)/ruby/internal/core/robject.h
+md5init.o: $(hdrdir)/ruby/internal/core/rregexp.h
+md5init.o: $(hdrdir)/ruby/internal/core/rstring.h
+md5init.o: $(hdrdir)/ruby/internal/core/rstruct.h
+md5init.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+md5init.o: $(hdrdir)/ruby/internal/ctype.h
+md5init.o: $(hdrdir)/ruby/internal/dllexport.h
+md5init.o: $(hdrdir)/ruby/internal/dosish.h
+md5init.o: $(hdrdir)/ruby/internal/error.h
+md5init.o: $(hdrdir)/ruby/internal/eval.h
+md5init.o: $(hdrdir)/ruby/internal/event.h
+md5init.o: $(hdrdir)/ruby/internal/fl_type.h
+md5init.o: $(hdrdir)/ruby/internal/gc.h
+md5init.o: $(hdrdir)/ruby/internal/glob.h
+md5init.o: $(hdrdir)/ruby/internal/globals.h
+md5init.o: $(hdrdir)/ruby/internal/has/attribute.h
+md5init.o: $(hdrdir)/ruby/internal/has/builtin.h
+md5init.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+md5init.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+md5init.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+md5init.o: $(hdrdir)/ruby/internal/has/extension.h
+md5init.o: $(hdrdir)/ruby/internal/has/feature.h
+md5init.o: $(hdrdir)/ruby/internal/has/warning.h
+md5init.o: $(hdrdir)/ruby/internal/intern/array.h
+md5init.o: $(hdrdir)/ruby/internal/intern/bignum.h
+md5init.o: $(hdrdir)/ruby/internal/intern/class.h
+md5init.o: $(hdrdir)/ruby/internal/intern/compar.h
+md5init.o: $(hdrdir)/ruby/internal/intern/complex.h
+md5init.o: $(hdrdir)/ruby/internal/intern/cont.h
+md5init.o: $(hdrdir)/ruby/internal/intern/dir.h
+md5init.o: $(hdrdir)/ruby/internal/intern/enum.h
+md5init.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+md5init.o: $(hdrdir)/ruby/internal/intern/error.h
+md5init.o: $(hdrdir)/ruby/internal/intern/eval.h
+md5init.o: $(hdrdir)/ruby/internal/intern/file.h
+md5init.o: $(hdrdir)/ruby/internal/intern/gc.h
+md5init.o: $(hdrdir)/ruby/internal/intern/hash.h
+md5init.o: $(hdrdir)/ruby/internal/intern/io.h
+md5init.o: $(hdrdir)/ruby/internal/intern/load.h
+md5init.o: $(hdrdir)/ruby/internal/intern/marshal.h
+md5init.o: $(hdrdir)/ruby/internal/intern/numeric.h
+md5init.o: $(hdrdir)/ruby/internal/intern/object.h
+md5init.o: $(hdrdir)/ruby/internal/intern/parse.h
+md5init.o: $(hdrdir)/ruby/internal/intern/proc.h
+md5init.o: $(hdrdir)/ruby/internal/intern/process.h
+md5init.o: $(hdrdir)/ruby/internal/intern/random.h
+md5init.o: $(hdrdir)/ruby/internal/intern/range.h
+md5init.o: $(hdrdir)/ruby/internal/intern/rational.h
+md5init.o: $(hdrdir)/ruby/internal/intern/re.h
+md5init.o: $(hdrdir)/ruby/internal/intern/ruby.h
+md5init.o: $(hdrdir)/ruby/internal/intern/select.h
+md5init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+md5init.o: $(hdrdir)/ruby/internal/intern/signal.h
+md5init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+md5init.o: $(hdrdir)/ruby/internal/intern/string.h
+md5init.o: $(hdrdir)/ruby/internal/intern/struct.h
+md5init.o: $(hdrdir)/ruby/internal/intern/thread.h
+md5init.o: $(hdrdir)/ruby/internal/intern/time.h
+md5init.o: $(hdrdir)/ruby/internal/intern/variable.h
+md5init.o: $(hdrdir)/ruby/internal/intern/vm.h
+md5init.o: $(hdrdir)/ruby/internal/interpreter.h
+md5init.o: $(hdrdir)/ruby/internal/iterator.h
+md5init.o: $(hdrdir)/ruby/internal/memory.h
+md5init.o: $(hdrdir)/ruby/internal/method.h
+md5init.o: $(hdrdir)/ruby/internal/module.h
+md5init.o: $(hdrdir)/ruby/internal/newobj.h
+md5init.o: $(hdrdir)/ruby/internal/rgengc.h
+md5init.o: $(hdrdir)/ruby/internal/scan_args.h
+md5init.o: $(hdrdir)/ruby/internal/special_consts.h
+md5init.o: $(hdrdir)/ruby/internal/static_assert.h
+md5init.o: $(hdrdir)/ruby/internal/stdalign.h
+md5init.o: $(hdrdir)/ruby/internal/stdbool.h
+md5init.o: $(hdrdir)/ruby/internal/symbol.h
+md5init.o: $(hdrdir)/ruby/internal/token_paste.h
+md5init.o: $(hdrdir)/ruby/internal/value.h
+md5init.o: $(hdrdir)/ruby/internal/value_type.h
+md5init.o: $(hdrdir)/ruby/internal/variable.h
+md5init.o: $(hdrdir)/ruby/internal/warning_push.h
+md5init.o: $(hdrdir)/ruby/internal/xmalloc.h
 md5init.o: $(hdrdir)/ruby/missing.h
 md5init.o: $(hdrdir)/ruby/ruby.h
 md5init.o: $(hdrdir)/ruby/st.h
 md5init.o: $(hdrdir)/ruby/subst.h
-md5init.o: $(top_srcdir)/ext/digest/digest.h
-md5init.o: $(top_srcdir)/include/ruby.h
+md5init.o: $(srcdir)/../defs.h
+md5init.o: $(srcdir)/../digest.h
+md5init.o: md5.h
 md5init.o: md5init.c
-md5init.o: md5ossl.h
-md5ossl.o: md5ossl.c
-md5ossl.o: md5ossl.h
 # AUTOGENERATED DEPENDENCIES END
diff --git a/ext/digest/md5/md5cc.h b/ext/digest/md5/md5cc.h
index 63a7ae9d67..e34d7d5c11 100644
--- a/ext/digest/md5/md5cc.h
+++ b/ext/digest/md5/md5cc.h
@@ -1,10 +1,17 @@
 #define COMMON_DIGEST_FOR_OPENSSL 1
 #include <CommonCrypto/CommonDigest.h>
 
+#ifdef __clang__
+# pragma clang diagnostic ignored "-Wdeprecated-declarations"
+/* Suppress deprecation warnings of MD5 from Xcode 11.1 */
+/* Although we know MD5 is deprecated too, provide just for backward
+ * compatibility, as well as Apple does. */
+#endif
+
 #define MD5_BLOCK_LENGTH	CC_MD5_BLOCK_BYTES
 
-static DEFINE_UPDATE_FUNC_FOR_UINT(MD5);
-static DEFINE_FINISH_FUNC_FROM_FINAL(MD5);
+static DEFINE_UPDATE_FUNC_FOR_UINT(MD5)
+static DEFINE_FINISH_FUNC_FROM_FINAL(MD5)
 
 #undef MD5_Update
 #undef MD5_Finish
diff --git a/ext/digest/md5/md5init.c b/ext/digest/md5/md5init.c
index a6afedef69..52cba78bf1 100644
--- a/ext/digest/md5/md5init.c
+++ b/ext/digest/md5/md5init.c
@@ -3,9 +3,7 @@
 
 #include <ruby/ruby.h>
 #include "../digest.h"
-#if defined(MD5_USE_OPENSSL)
-#include "md5ossl.h"
-#elif defined(MD5_USE_COMMONDIGEST)
+#if defined(MD5_USE_COMMONDIGEST)
 #include "md5cc.h"
 #else
 #include "md5.h"
@@ -22,27 +20,42 @@ static const rb_digest_metadata_t md5 = {
 };
 
 /*
+ * Document-class: Digest::MD5 < Digest::Base
  * A class for calculating message digests using the MD5
  * Message-Digest Algorithm by RSA Data Security, Inc., described in
  * RFC1321.
+ *
+ * MD5 calculates a digest of 128 bits (16 bytes).
+ *
+ * == Examples
+ *  require 'digest'
+ *
+ *  # Compute a complete digest
+ *  Digest::MD5.hexdigest 'abc'      #=> "90015098..."
+ *
+ *  # Compute digest by chunks
+ *  md5 = Digest::MD5.new               # =>#<Digest::MD5>
+ *  md5.update "ab"
+ *  md5 << "c"                           # alias for #update
+ *  md5.hexdigest                        # => "90015098..."
+ *
+ *  # Use the same object to compute another digest
+ *  md5.reset
+ *  md5 << "message"
+ *  md5.hexdigest                        # => "78e73102..."
  */
 void
 Init_md5(void)
 {
     VALUE mDigest, cDigest_Base, cDigest_MD5;
 
-    rb_require("digest");
-
 #if 0
     mDigest = rb_define_module("Digest"); /* let rdoc know */
 #endif
-    mDigest = rb_path2class("Digest");
+    mDigest = rb_digest_namespace();
     cDigest_Base = rb_path2class("Digest::Base");
 
     cDigest_MD5 = rb_define_class_under(mDigest, "MD5", cDigest_Base);
 
-#undef RUBY_UNTYPED_DATA_WARNING
-#define RUBY_UNTYPED_DATA_WARNING 0
-    rb_iv_set(cDigest_MD5, "metadata",
-	      Data_Wrap_Struct(0, 0, 0, (void *)&md5));
+    rb_iv_set(cDigest_MD5, "metadata", rb_digest_make_metadata(&md5));
 }
diff --git a/ext/digest/md5/md5ossl.h b/ext/digest/md5/md5ossl.h
deleted file mode 100644
index 2e9347ed94..0000000000
--- a/ext/digest/md5/md5ossl.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* $Id$ */
-
-#ifndef MD5OSSL_H_INCLUDED
-#define MD5OSSL_H_INCLUDED
-
-#include <stddef.h>
-#include <openssl/md5.h>
-
-#define MD5_BLOCK_LENGTH	MD5_CBLOCK
-
-static DEFINE_FINISH_FUNC_FROM_FINAL(MD5);
-#undef MD5_Finish
-#define MD5_Finish rb_digest_MD5_finish
-
-#endif
diff --git a/ext/digest/rmd160/depend b/ext/digest/rmd160/depend
index 2a5b279047..ce5dcdb871 100644
--- a/ext/digest/rmd160/depend
+++ b/ext/digest/rmd160/depend
@@ -1,29 +1,332 @@
-rmd160.o: rmd160.c rmd160.h $(srcdir)/../defs.h $(HDRS) $(ruby_headers)
+rmd160.o: rmd160.c rmd160.h $(srcdir)/../defs.h
+rmd160init.o: $(LOCAL_HDRS)
 
 # AUTOGENERATED DEPENDENCIES START
+rmd160.o: $(RUBY_EXTCONF_H)
+rmd160.o: $(arch_hdrdir)/ruby/config.h
+rmd160.o: $(hdrdir)/ruby.h
+rmd160.o: $(hdrdir)/ruby/assert.h
+rmd160.o: $(hdrdir)/ruby/backward.h
+rmd160.o: $(hdrdir)/ruby/backward/2/assume.h
+rmd160.o: $(hdrdir)/ruby/backward/2/attributes.h
+rmd160.o: $(hdrdir)/ruby/backward/2/bool.h
+rmd160.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+rmd160.o: $(hdrdir)/ruby/backward/2/inttypes.h
+rmd160.o: $(hdrdir)/ruby/backward/2/limits.h
+rmd160.o: $(hdrdir)/ruby/backward/2/long_long.h
+rmd160.o: $(hdrdir)/ruby/backward/2/stdalign.h
+rmd160.o: $(hdrdir)/ruby/backward/2/stdarg.h
+rmd160.o: $(hdrdir)/ruby/defines.h
+rmd160.o: $(hdrdir)/ruby/intern.h
+rmd160.o: $(hdrdir)/ruby/internal/anyargs.h
+rmd160.o: $(hdrdir)/ruby/internal/arithmetic.h
+rmd160.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+rmd160.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+rmd160.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+rmd160.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+rmd160.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+rmd160.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+rmd160.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+rmd160.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+rmd160.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+rmd160.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+rmd160.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+rmd160.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+rmd160.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+rmd160.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+rmd160.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+rmd160.o: $(hdrdir)/ruby/internal/assume.h
+rmd160.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+rmd160.o: $(hdrdir)/ruby/internal/attr/artificial.h
+rmd160.o: $(hdrdir)/ruby/internal/attr/cold.h
+rmd160.o: $(hdrdir)/ruby/internal/attr/const.h
+rmd160.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+rmd160.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+rmd160.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+rmd160.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+rmd160.o: $(hdrdir)/ruby/internal/attr/error.h
+rmd160.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+rmd160.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+rmd160.o: $(hdrdir)/ruby/internal/attr/format.h
+rmd160.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+rmd160.o: $(hdrdir)/ruby/internal/attr/noalias.h
+rmd160.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+rmd160.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+rmd160.o: $(hdrdir)/ruby/internal/attr/noinline.h
+rmd160.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+rmd160.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+rmd160.o: $(hdrdir)/ruby/internal/attr/pure.h
+rmd160.o: $(hdrdir)/ruby/internal/attr/restrict.h
+rmd160.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+rmd160.o: $(hdrdir)/ruby/internal/attr/warning.h
+rmd160.o: $(hdrdir)/ruby/internal/attr/weakref.h
+rmd160.o: $(hdrdir)/ruby/internal/cast.h
+rmd160.o: $(hdrdir)/ruby/internal/compiler_is.h
+rmd160.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+rmd160.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+rmd160.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+rmd160.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+rmd160.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+rmd160.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+rmd160.o: $(hdrdir)/ruby/internal/compiler_since.h
+rmd160.o: $(hdrdir)/ruby/internal/config.h
+rmd160.o: $(hdrdir)/ruby/internal/constant_p.h
+rmd160.o: $(hdrdir)/ruby/internal/core.h
+rmd160.o: $(hdrdir)/ruby/internal/core/rarray.h
+rmd160.o: $(hdrdir)/ruby/internal/core/rbasic.h
+rmd160.o: $(hdrdir)/ruby/internal/core/rbignum.h
+rmd160.o: $(hdrdir)/ruby/internal/core/rclass.h
+rmd160.o: $(hdrdir)/ruby/internal/core/rdata.h
+rmd160.o: $(hdrdir)/ruby/internal/core/rfile.h
+rmd160.o: $(hdrdir)/ruby/internal/core/rhash.h
+rmd160.o: $(hdrdir)/ruby/internal/core/robject.h
+rmd160.o: $(hdrdir)/ruby/internal/core/rregexp.h
+rmd160.o: $(hdrdir)/ruby/internal/core/rstring.h
+rmd160.o: $(hdrdir)/ruby/internal/core/rstruct.h
+rmd160.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+rmd160.o: $(hdrdir)/ruby/internal/ctype.h
+rmd160.o: $(hdrdir)/ruby/internal/dllexport.h
+rmd160.o: $(hdrdir)/ruby/internal/dosish.h
+rmd160.o: $(hdrdir)/ruby/internal/error.h
+rmd160.o: $(hdrdir)/ruby/internal/eval.h
+rmd160.o: $(hdrdir)/ruby/internal/event.h
+rmd160.o: $(hdrdir)/ruby/internal/fl_type.h
+rmd160.o: $(hdrdir)/ruby/internal/gc.h
+rmd160.o: $(hdrdir)/ruby/internal/glob.h
+rmd160.o: $(hdrdir)/ruby/internal/globals.h
+rmd160.o: $(hdrdir)/ruby/internal/has/attribute.h
+rmd160.o: $(hdrdir)/ruby/internal/has/builtin.h
+rmd160.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+rmd160.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+rmd160.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+rmd160.o: $(hdrdir)/ruby/internal/has/extension.h
+rmd160.o: $(hdrdir)/ruby/internal/has/feature.h
+rmd160.o: $(hdrdir)/ruby/internal/has/warning.h
+rmd160.o: $(hdrdir)/ruby/internal/intern/array.h
+rmd160.o: $(hdrdir)/ruby/internal/intern/bignum.h
+rmd160.o: $(hdrdir)/ruby/internal/intern/class.h
+rmd160.o: $(hdrdir)/ruby/internal/intern/compar.h
+rmd160.o: $(hdrdir)/ruby/internal/intern/complex.h
+rmd160.o: $(hdrdir)/ruby/internal/intern/cont.h
+rmd160.o: $(hdrdir)/ruby/internal/intern/dir.h
+rmd160.o: $(hdrdir)/ruby/internal/intern/enum.h
+rmd160.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+rmd160.o: $(hdrdir)/ruby/internal/intern/error.h
+rmd160.o: $(hdrdir)/ruby/internal/intern/eval.h
+rmd160.o: $(hdrdir)/ruby/internal/intern/file.h
+rmd160.o: $(hdrdir)/ruby/internal/intern/gc.h
+rmd160.o: $(hdrdir)/ruby/internal/intern/hash.h
+rmd160.o: $(hdrdir)/ruby/internal/intern/io.h
+rmd160.o: $(hdrdir)/ruby/internal/intern/load.h
+rmd160.o: $(hdrdir)/ruby/internal/intern/marshal.h
+rmd160.o: $(hdrdir)/ruby/internal/intern/numeric.h
+rmd160.o: $(hdrdir)/ruby/internal/intern/object.h
+rmd160.o: $(hdrdir)/ruby/internal/intern/parse.h
+rmd160.o: $(hdrdir)/ruby/internal/intern/proc.h
+rmd160.o: $(hdrdir)/ruby/internal/intern/process.h
+rmd160.o: $(hdrdir)/ruby/internal/intern/random.h
+rmd160.o: $(hdrdir)/ruby/internal/intern/range.h
+rmd160.o: $(hdrdir)/ruby/internal/intern/rational.h
+rmd160.o: $(hdrdir)/ruby/internal/intern/re.h
+rmd160.o: $(hdrdir)/ruby/internal/intern/ruby.h
+rmd160.o: $(hdrdir)/ruby/internal/intern/select.h
+rmd160.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+rmd160.o: $(hdrdir)/ruby/internal/intern/signal.h
+rmd160.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+rmd160.o: $(hdrdir)/ruby/internal/intern/string.h
+rmd160.o: $(hdrdir)/ruby/internal/intern/struct.h
+rmd160.o: $(hdrdir)/ruby/internal/intern/thread.h
+rmd160.o: $(hdrdir)/ruby/internal/intern/time.h
+rmd160.o: $(hdrdir)/ruby/internal/intern/variable.h
+rmd160.o: $(hdrdir)/ruby/internal/intern/vm.h
+rmd160.o: $(hdrdir)/ruby/internal/interpreter.h
+rmd160.o: $(hdrdir)/ruby/internal/iterator.h
+rmd160.o: $(hdrdir)/ruby/internal/memory.h
+rmd160.o: $(hdrdir)/ruby/internal/method.h
+rmd160.o: $(hdrdir)/ruby/internal/module.h
+rmd160.o: $(hdrdir)/ruby/internal/newobj.h
+rmd160.o: $(hdrdir)/ruby/internal/rgengc.h
+rmd160.o: $(hdrdir)/ruby/internal/scan_args.h
+rmd160.o: $(hdrdir)/ruby/internal/special_consts.h
+rmd160.o: $(hdrdir)/ruby/internal/static_assert.h
+rmd160.o: $(hdrdir)/ruby/internal/stdalign.h
+rmd160.o: $(hdrdir)/ruby/internal/stdbool.h
+rmd160.o: $(hdrdir)/ruby/internal/symbol.h
+rmd160.o: $(hdrdir)/ruby/internal/token_paste.h
+rmd160.o: $(hdrdir)/ruby/internal/value.h
+rmd160.o: $(hdrdir)/ruby/internal/value_type.h
+rmd160.o: $(hdrdir)/ruby/internal/variable.h
+rmd160.o: $(hdrdir)/ruby/internal/warning_push.h
+rmd160.o: $(hdrdir)/ruby/internal/xmalloc.h
+rmd160.o: $(hdrdir)/ruby/missing.h
+rmd160.o: $(hdrdir)/ruby/ruby.h
+rmd160.o: $(hdrdir)/ruby/st.h
+rmd160.o: $(hdrdir)/ruby/subst.h
+rmd160.o: $(srcdir)/../defs.h
+rmd160.o: rmd160.c
+rmd160.o: rmd160.h
 rmd160init.o: $(RUBY_EXTCONF_H)
 rmd160init.o: $(arch_hdrdir)/ruby/config.h
+rmd160init.o: $(hdrdir)/ruby.h
+rmd160init.o: $(hdrdir)/ruby/assert.h
 rmd160init.o: $(hdrdir)/ruby/backward.h
+rmd160init.o: $(hdrdir)/ruby/backward/2/assume.h
+rmd160init.o: $(hdrdir)/ruby/backward/2/attributes.h
+rmd160init.o: $(hdrdir)/ruby/backward/2/bool.h
+rmd160init.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+rmd160init.o: $(hdrdir)/ruby/backward/2/inttypes.h
+rmd160init.o: $(hdrdir)/ruby/backward/2/limits.h
+rmd160init.o: $(hdrdir)/ruby/backward/2/long_long.h
+rmd160init.o: $(hdrdir)/ruby/backward/2/stdalign.h
+rmd160init.o: $(hdrdir)/ruby/backward/2/stdarg.h
 rmd160init.o: $(hdrdir)/ruby/defines.h
 rmd160init.o: $(hdrdir)/ruby/intern.h
+rmd160init.o: $(hdrdir)/ruby/internal/anyargs.h
+rmd160init.o: $(hdrdir)/ruby/internal/arithmetic.h
+rmd160init.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+rmd160init.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+rmd160init.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+rmd160init.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+rmd160init.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+rmd160init.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+rmd160init.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+rmd160init.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+rmd160init.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+rmd160init.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+rmd160init.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+rmd160init.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+rmd160init.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+rmd160init.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+rmd160init.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+rmd160init.o: $(hdrdir)/ruby/internal/assume.h
+rmd160init.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+rmd160init.o: $(hdrdir)/ruby/internal/attr/artificial.h
+rmd160init.o: $(hdrdir)/ruby/internal/attr/cold.h
+rmd160init.o: $(hdrdir)/ruby/internal/attr/const.h
+rmd160init.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+rmd160init.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+rmd160init.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+rmd160init.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+rmd160init.o: $(hdrdir)/ruby/internal/attr/error.h
+rmd160init.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+rmd160init.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+rmd160init.o: $(hdrdir)/ruby/internal/attr/format.h
+rmd160init.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+rmd160init.o: $(hdrdir)/ruby/internal/attr/noalias.h
+rmd160init.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+rmd160init.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+rmd160init.o: $(hdrdir)/ruby/internal/attr/noinline.h
+rmd160init.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+rmd160init.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+rmd160init.o: $(hdrdir)/ruby/internal/attr/pure.h
+rmd160init.o: $(hdrdir)/ruby/internal/attr/restrict.h
+rmd160init.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+rmd160init.o: $(hdrdir)/ruby/internal/attr/warning.h
+rmd160init.o: $(hdrdir)/ruby/internal/attr/weakref.h
+rmd160init.o: $(hdrdir)/ruby/internal/cast.h
+rmd160init.o: $(hdrdir)/ruby/internal/compiler_is.h
+rmd160init.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+rmd160init.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+rmd160init.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+rmd160init.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+rmd160init.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+rmd160init.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+rmd160init.o: $(hdrdir)/ruby/internal/compiler_since.h
+rmd160init.o: $(hdrdir)/ruby/internal/config.h
+rmd160init.o: $(hdrdir)/ruby/internal/constant_p.h
+rmd160init.o: $(hdrdir)/ruby/internal/core.h
+rmd160init.o: $(hdrdir)/ruby/internal/core/rarray.h
+rmd160init.o: $(hdrdir)/ruby/internal/core/rbasic.h
+rmd160init.o: $(hdrdir)/ruby/internal/core/rbignum.h
+rmd160init.o: $(hdrdir)/ruby/internal/core/rclass.h
+rmd160init.o: $(hdrdir)/ruby/internal/core/rdata.h
+rmd160init.o: $(hdrdir)/ruby/internal/core/rfile.h
+rmd160init.o: $(hdrdir)/ruby/internal/core/rhash.h
+rmd160init.o: $(hdrdir)/ruby/internal/core/robject.h
+rmd160init.o: $(hdrdir)/ruby/internal/core/rregexp.h
+rmd160init.o: $(hdrdir)/ruby/internal/core/rstring.h
+rmd160init.o: $(hdrdir)/ruby/internal/core/rstruct.h
+rmd160init.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+rmd160init.o: $(hdrdir)/ruby/internal/ctype.h
+rmd160init.o: $(hdrdir)/ruby/internal/dllexport.h
+rmd160init.o: $(hdrdir)/ruby/internal/dosish.h
+rmd160init.o: $(hdrdir)/ruby/internal/error.h
+rmd160init.o: $(hdrdir)/ruby/internal/eval.h
+rmd160init.o: $(hdrdir)/ruby/internal/event.h
+rmd160init.o: $(hdrdir)/ruby/internal/fl_type.h
+rmd160init.o: $(hdrdir)/ruby/internal/gc.h
+rmd160init.o: $(hdrdir)/ruby/internal/glob.h
+rmd160init.o: $(hdrdir)/ruby/internal/globals.h
+rmd160init.o: $(hdrdir)/ruby/internal/has/attribute.h
+rmd160init.o: $(hdrdir)/ruby/internal/has/builtin.h
+rmd160init.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+rmd160init.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+rmd160init.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+rmd160init.o: $(hdrdir)/ruby/internal/has/extension.h
+rmd160init.o: $(hdrdir)/ruby/internal/has/feature.h
+rmd160init.o: $(hdrdir)/ruby/internal/has/warning.h
+rmd160init.o: $(hdrdir)/ruby/internal/intern/array.h
+rmd160init.o: $(hdrdir)/ruby/internal/intern/bignum.h
+rmd160init.o: $(hdrdir)/ruby/internal/intern/class.h
+rmd160init.o: $(hdrdir)/ruby/internal/intern/compar.h
+rmd160init.o: $(hdrdir)/ruby/internal/intern/complex.h
+rmd160init.o: $(hdrdir)/ruby/internal/intern/cont.h
+rmd160init.o: $(hdrdir)/ruby/internal/intern/dir.h
+rmd160init.o: $(hdrdir)/ruby/internal/intern/enum.h
+rmd160init.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+rmd160init.o: $(hdrdir)/ruby/internal/intern/error.h
+rmd160init.o: $(hdrdir)/ruby/internal/intern/eval.h
+rmd160init.o: $(hdrdir)/ruby/internal/intern/file.h
+rmd160init.o: $(hdrdir)/ruby/internal/intern/gc.h
+rmd160init.o: $(hdrdir)/ruby/internal/intern/hash.h
+rmd160init.o: $(hdrdir)/ruby/internal/intern/io.h
+rmd160init.o: $(hdrdir)/ruby/internal/intern/load.h
+rmd160init.o: $(hdrdir)/ruby/internal/intern/marshal.h
+rmd160init.o: $(hdrdir)/ruby/internal/intern/numeric.h
+rmd160init.o: $(hdrdir)/ruby/internal/intern/object.h
+rmd160init.o: $(hdrdir)/ruby/internal/intern/parse.h
+rmd160init.o: $(hdrdir)/ruby/internal/intern/proc.h
+rmd160init.o: $(hdrdir)/ruby/internal/intern/process.h
+rmd160init.o: $(hdrdir)/ruby/internal/intern/random.h
+rmd160init.o: $(hdrdir)/ruby/internal/intern/range.h
+rmd160init.o: $(hdrdir)/ruby/internal/intern/rational.h
+rmd160init.o: $(hdrdir)/ruby/internal/intern/re.h
+rmd160init.o: $(hdrdir)/ruby/internal/intern/ruby.h
+rmd160init.o: $(hdrdir)/ruby/internal/intern/select.h
+rmd160init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+rmd160init.o: $(hdrdir)/ruby/internal/intern/signal.h
+rmd160init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+rmd160init.o: $(hdrdir)/ruby/internal/intern/string.h
+rmd160init.o: $(hdrdir)/ruby/internal/intern/struct.h
+rmd160init.o: $(hdrdir)/ruby/internal/intern/thread.h
+rmd160init.o: $(hdrdir)/ruby/internal/intern/time.h
+rmd160init.o: $(hdrdir)/ruby/internal/intern/variable.h
+rmd160init.o: $(hdrdir)/ruby/internal/intern/vm.h
+rmd160init.o: $(hdrdir)/ruby/internal/interpreter.h
+rmd160init.o: $(hdrdir)/ruby/internal/iterator.h
+rmd160init.o: $(hdrdir)/ruby/internal/memory.h
+rmd160init.o: $(hdrdir)/ruby/internal/method.h
+rmd160init.o: $(hdrdir)/ruby/internal/module.h
+rmd160init.o: $(hdrdir)/ruby/internal/newobj.h
+rmd160init.o: $(hdrdir)/ruby/internal/rgengc.h
+rmd160init.o: $(hdrdir)/ruby/internal/scan_args.h
+rmd160init.o: $(hdrdir)/ruby/internal/special_consts.h
+rmd160init.o: $(hdrdir)/ruby/internal/static_assert.h
+rmd160init.o: $(hdrdir)/ruby/internal/stdalign.h
+rmd160init.o: $(hdrdir)/ruby/internal/stdbool.h
+rmd160init.o: $(hdrdir)/ruby/internal/symbol.h
+rmd160init.o: $(hdrdir)/ruby/internal/token_paste.h
+rmd160init.o: $(hdrdir)/ruby/internal/value.h
+rmd160init.o: $(hdrdir)/ruby/internal/value_type.h
+rmd160init.o: $(hdrdir)/ruby/internal/variable.h
+rmd160init.o: $(hdrdir)/ruby/internal/warning_push.h
+rmd160init.o: $(hdrdir)/ruby/internal/xmalloc.h
 rmd160init.o: $(hdrdir)/ruby/missing.h
 rmd160init.o: $(hdrdir)/ruby/ruby.h
 rmd160init.o: $(hdrdir)/ruby/st.h
 rmd160init.o: $(hdrdir)/ruby/subst.h
-rmd160init.o: $(top_srcdir)/ext/digest/digest.h
-rmd160init.o: $(top_srcdir)/include/ruby.h
+rmd160init.o: $(srcdir)/../defs.h
+rmd160init.o: $(srcdir)/../digest.h
+rmd160init.o: rmd160.h
 rmd160init.o: rmd160init.c
-rmd160init.o: rmd160ossl.h
-rmd160ossl.o: $(RUBY_EXTCONF_H)
-rmd160ossl.o: $(arch_hdrdir)/ruby/config.h
-rmd160ossl.o: $(hdrdir)/ruby/defines.h
-rmd160ossl.o: $(hdrdir)/ruby/intern.h
-rmd160ossl.o: $(hdrdir)/ruby/missing.h
-rmd160ossl.o: $(hdrdir)/ruby/ruby.h
-rmd160ossl.o: $(hdrdir)/ruby/st.h
-rmd160ossl.o: $(hdrdir)/ruby/subst.h
-rmd160ossl.o: $(top_srcdir)/ext/digest/defs.h
-rmd160ossl.o: $(top_srcdir)/include/ruby.h
-rmd160ossl.o: rmd160ossl.c
-rmd160ossl.o: rmd160ossl.h
 # AUTOGENERATED DEPENDENCIES END
diff --git a/ext/digest/rmd160/extconf.rb b/ext/digest/rmd160/extconf.rb
index a02ba56169..ffa70ee803 100644
--- a/ext/digest/rmd160/extconf.rb
+++ b/ext/digest/rmd160/extconf.rb
@@ -10,7 +10,7 @@ $defs << "-DNDEBUG" << "-DHAVE_CONFIG_H"
 
 $objs = [ "rmd160init.#{$OBJEXT}" ]
 
-digest_conf("rmd160", "ripemd", "RIPEMD160")
+digest_conf("rmd160")
 
 have_header("sys/cdefs.h")
 
diff --git a/ext/digest/rmd160/rmd160init.c b/ext/digest/rmd160/rmd160init.c
index c1e753cc11..2ae81ec4d6 100644
--- a/ext/digest/rmd160/rmd160init.c
+++ b/ext/digest/rmd160/rmd160init.c
@@ -3,11 +3,7 @@
 
 #include <ruby/ruby.h>
 #include "../digest.h"
-#if defined(RMD160_USE_OPENSSL)
-#include "rmd160ossl.h"
-#else
 #include "rmd160.h"
-#endif
 
 static const rb_digest_metadata_t rmd160 = {
     RUBY_DIGEST_API_VERSION,
@@ -20,27 +16,42 @@ static const rb_digest_metadata_t rmd160 = {
 };
 
 /*
+ * Document-class: Digest::RMD160 < Digest::Base
  * A class for calculating message digests using RIPEMD-160
  * cryptographic hash function, designed by Hans Dobbertin, Antoon
  * Bosselaers, and Bart Preneel.
+ *
+ * RMD160 calculates a digest of 160 bits (20 bytes).
+ *
+ * == Examples
+ *  require 'digest'
+ *
+ *  # Compute a complete digest
+ *  Digest::RMD160.hexdigest 'abc'      #=> "8eb208f7..."
+ *
+ *  # Compute digest by chunks
+ *  rmd160 = Digest::RMD160.new               # =>#<Digest::RMD160>
+ *  rmd160.update "ab"
+ *  rmd160 << "c"                           # alias for #update
+ *  rmd160.hexdigest                        # => "8eb208f7..."
+ *
+ *  # Use the same object to compute another digest
+ *  rmd160.reset
+ *  rmd160 << "message"
+ *  rmd160.hexdigest                        # => "1dddbe1b..."
  */
 void
 Init_rmd160(void)
 {
     VALUE mDigest, cDigest_Base, cDigest_RMD160;
 
-    rb_require("digest");
-
 #if 0
     mDigest = rb_define_module("Digest"); /* let rdoc know */
 #endif
-    mDigest = rb_path2class("Digest");
+    mDigest = rb_digest_namespace();
     cDigest_Base = rb_path2class("Digest::Base");
 
     cDigest_RMD160 = rb_define_class_under(mDigest, "RMD160", cDigest_Base);
 
-#undef RUBY_UNTYPED_DATA_WARNING
-#define RUBY_UNTYPED_DATA_WARNING 0
-    rb_iv_set(cDigest_RMD160, "metadata",
-	      Data_Wrap_Struct(0, 0, 0, (void *)&rmd160));
+    rb_iv_set(cDigest_RMD160, "metadata", rb_digest_make_metadata(&rmd160));
 }
diff --git a/ext/digest/rmd160/rmd160ossl.h b/ext/digest/rmd160/rmd160ossl.h
deleted file mode 100644
index e6bf5ea8d0..0000000000
--- a/ext/digest/rmd160/rmd160ossl.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$ */
-
-#ifndef RMD160OSSL_H_INCLUDED
-#define RMD160OSSL_H_INCLUDED
-
-#include <stddef.h>
-#include <openssl/ripemd.h>
-
-#define RMD160_CTX	RIPEMD160_CTX
-
-#define RMD160_Init	RIPEMD160_Init
-#define RMD160_Update	RIPEMD160_Update
-
-#define RMD160_BLOCK_LENGTH		RIPEMD160_CBLOCK
-#define RMD160_DIGEST_LENGTH		RIPEMD160_DIGEST_LENGTH
-
-static DEFINE_FINISH_FUNC_FROM_FINAL(RIPEMD160)
-#define RMD160_Finish rb_digest_RIPEMD160_finish
-
-#endif
diff --git a/ext/digest/sha1/depend b/ext/digest/sha1/depend
index b67f9ae6bb..3daf84a137 100644
--- a/ext/digest/sha1/depend
+++ b/ext/digest/sha1/depend
@@ -1,29 +1,332 @@
 sha1.o: sha1.c sha1.h $(srcdir)/../defs.h
+sha1init.o: $(LOCAL_HDRS)
 
 # AUTOGENERATED DEPENDENCIES START
+sha1.o: $(RUBY_EXTCONF_H)
+sha1.o: $(arch_hdrdir)/ruby/config.h
+sha1.o: $(hdrdir)/ruby.h
+sha1.o: $(hdrdir)/ruby/assert.h
+sha1.o: $(hdrdir)/ruby/backward.h
+sha1.o: $(hdrdir)/ruby/backward/2/assume.h
+sha1.o: $(hdrdir)/ruby/backward/2/attributes.h
+sha1.o: $(hdrdir)/ruby/backward/2/bool.h
+sha1.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+sha1.o: $(hdrdir)/ruby/backward/2/inttypes.h
+sha1.o: $(hdrdir)/ruby/backward/2/limits.h
+sha1.o: $(hdrdir)/ruby/backward/2/long_long.h
+sha1.o: $(hdrdir)/ruby/backward/2/stdalign.h
+sha1.o: $(hdrdir)/ruby/backward/2/stdarg.h
+sha1.o: $(hdrdir)/ruby/defines.h
+sha1.o: $(hdrdir)/ruby/intern.h
+sha1.o: $(hdrdir)/ruby/internal/anyargs.h
+sha1.o: $(hdrdir)/ruby/internal/arithmetic.h
+sha1.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+sha1.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+sha1.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+sha1.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+sha1.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+sha1.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+sha1.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+sha1.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+sha1.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+sha1.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+sha1.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+sha1.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+sha1.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+sha1.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+sha1.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+sha1.o: $(hdrdir)/ruby/internal/assume.h
+sha1.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+sha1.o: $(hdrdir)/ruby/internal/attr/artificial.h
+sha1.o: $(hdrdir)/ruby/internal/attr/cold.h
+sha1.o: $(hdrdir)/ruby/internal/attr/const.h
+sha1.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+sha1.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+sha1.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+sha1.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+sha1.o: $(hdrdir)/ruby/internal/attr/error.h
+sha1.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+sha1.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+sha1.o: $(hdrdir)/ruby/internal/attr/format.h
+sha1.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+sha1.o: $(hdrdir)/ruby/internal/attr/noalias.h
+sha1.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+sha1.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+sha1.o: $(hdrdir)/ruby/internal/attr/noinline.h
+sha1.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+sha1.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+sha1.o: $(hdrdir)/ruby/internal/attr/pure.h
+sha1.o: $(hdrdir)/ruby/internal/attr/restrict.h
+sha1.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+sha1.o: $(hdrdir)/ruby/internal/attr/warning.h
+sha1.o: $(hdrdir)/ruby/internal/attr/weakref.h
+sha1.o: $(hdrdir)/ruby/internal/cast.h
+sha1.o: $(hdrdir)/ruby/internal/compiler_is.h
+sha1.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+sha1.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+sha1.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+sha1.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+sha1.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+sha1.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+sha1.o: $(hdrdir)/ruby/internal/compiler_since.h
+sha1.o: $(hdrdir)/ruby/internal/config.h
+sha1.o: $(hdrdir)/ruby/internal/constant_p.h
+sha1.o: $(hdrdir)/ruby/internal/core.h
+sha1.o: $(hdrdir)/ruby/internal/core/rarray.h
+sha1.o: $(hdrdir)/ruby/internal/core/rbasic.h
+sha1.o: $(hdrdir)/ruby/internal/core/rbignum.h
+sha1.o: $(hdrdir)/ruby/internal/core/rclass.h
+sha1.o: $(hdrdir)/ruby/internal/core/rdata.h
+sha1.o: $(hdrdir)/ruby/internal/core/rfile.h
+sha1.o: $(hdrdir)/ruby/internal/core/rhash.h
+sha1.o: $(hdrdir)/ruby/internal/core/robject.h
+sha1.o: $(hdrdir)/ruby/internal/core/rregexp.h
+sha1.o: $(hdrdir)/ruby/internal/core/rstring.h
+sha1.o: $(hdrdir)/ruby/internal/core/rstruct.h
+sha1.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+sha1.o: $(hdrdir)/ruby/internal/ctype.h
+sha1.o: $(hdrdir)/ruby/internal/dllexport.h
+sha1.o: $(hdrdir)/ruby/internal/dosish.h
+sha1.o: $(hdrdir)/ruby/internal/error.h
+sha1.o: $(hdrdir)/ruby/internal/eval.h
+sha1.o: $(hdrdir)/ruby/internal/event.h
+sha1.o: $(hdrdir)/ruby/internal/fl_type.h
+sha1.o: $(hdrdir)/ruby/internal/gc.h
+sha1.o: $(hdrdir)/ruby/internal/glob.h
+sha1.o: $(hdrdir)/ruby/internal/globals.h
+sha1.o: $(hdrdir)/ruby/internal/has/attribute.h
+sha1.o: $(hdrdir)/ruby/internal/has/builtin.h
+sha1.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+sha1.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+sha1.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+sha1.o: $(hdrdir)/ruby/internal/has/extension.h
+sha1.o: $(hdrdir)/ruby/internal/has/feature.h
+sha1.o: $(hdrdir)/ruby/internal/has/warning.h
+sha1.o: $(hdrdir)/ruby/internal/intern/array.h
+sha1.o: $(hdrdir)/ruby/internal/intern/bignum.h
+sha1.o: $(hdrdir)/ruby/internal/intern/class.h
+sha1.o: $(hdrdir)/ruby/internal/intern/compar.h
+sha1.o: $(hdrdir)/ruby/internal/intern/complex.h
+sha1.o: $(hdrdir)/ruby/internal/intern/cont.h
+sha1.o: $(hdrdir)/ruby/internal/intern/dir.h
+sha1.o: $(hdrdir)/ruby/internal/intern/enum.h
+sha1.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+sha1.o: $(hdrdir)/ruby/internal/intern/error.h
+sha1.o: $(hdrdir)/ruby/internal/intern/eval.h
+sha1.o: $(hdrdir)/ruby/internal/intern/file.h
+sha1.o: $(hdrdir)/ruby/internal/intern/gc.h
+sha1.o: $(hdrdir)/ruby/internal/intern/hash.h
+sha1.o: $(hdrdir)/ruby/internal/intern/io.h
+sha1.o: $(hdrdir)/ruby/internal/intern/load.h
+sha1.o: $(hdrdir)/ruby/internal/intern/marshal.h
+sha1.o: $(hdrdir)/ruby/internal/intern/numeric.h
+sha1.o: $(hdrdir)/ruby/internal/intern/object.h
+sha1.o: $(hdrdir)/ruby/internal/intern/parse.h
+sha1.o: $(hdrdir)/ruby/internal/intern/proc.h
+sha1.o: $(hdrdir)/ruby/internal/intern/process.h
+sha1.o: $(hdrdir)/ruby/internal/intern/random.h
+sha1.o: $(hdrdir)/ruby/internal/intern/range.h
+sha1.o: $(hdrdir)/ruby/internal/intern/rational.h
+sha1.o: $(hdrdir)/ruby/internal/intern/re.h
+sha1.o: $(hdrdir)/ruby/internal/intern/ruby.h
+sha1.o: $(hdrdir)/ruby/internal/intern/select.h
+sha1.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+sha1.o: $(hdrdir)/ruby/internal/intern/signal.h
+sha1.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+sha1.o: $(hdrdir)/ruby/internal/intern/string.h
+sha1.o: $(hdrdir)/ruby/internal/intern/struct.h
+sha1.o: $(hdrdir)/ruby/internal/intern/thread.h
+sha1.o: $(hdrdir)/ruby/internal/intern/time.h
+sha1.o: $(hdrdir)/ruby/internal/intern/variable.h
+sha1.o: $(hdrdir)/ruby/internal/intern/vm.h
+sha1.o: $(hdrdir)/ruby/internal/interpreter.h
+sha1.o: $(hdrdir)/ruby/internal/iterator.h
+sha1.o: $(hdrdir)/ruby/internal/memory.h
+sha1.o: $(hdrdir)/ruby/internal/method.h
+sha1.o: $(hdrdir)/ruby/internal/module.h
+sha1.o: $(hdrdir)/ruby/internal/newobj.h
+sha1.o: $(hdrdir)/ruby/internal/rgengc.h
+sha1.o: $(hdrdir)/ruby/internal/scan_args.h
+sha1.o: $(hdrdir)/ruby/internal/special_consts.h
+sha1.o: $(hdrdir)/ruby/internal/static_assert.h
+sha1.o: $(hdrdir)/ruby/internal/stdalign.h
+sha1.o: $(hdrdir)/ruby/internal/stdbool.h
+sha1.o: $(hdrdir)/ruby/internal/symbol.h
+sha1.o: $(hdrdir)/ruby/internal/token_paste.h
+sha1.o: $(hdrdir)/ruby/internal/value.h
+sha1.o: $(hdrdir)/ruby/internal/value_type.h
+sha1.o: $(hdrdir)/ruby/internal/variable.h
+sha1.o: $(hdrdir)/ruby/internal/warning_push.h
+sha1.o: $(hdrdir)/ruby/internal/xmalloc.h
+sha1.o: $(hdrdir)/ruby/missing.h
+sha1.o: $(hdrdir)/ruby/ruby.h
+sha1.o: $(hdrdir)/ruby/st.h
+sha1.o: $(hdrdir)/ruby/subst.h
+sha1.o: $(srcdir)/../defs.h
+sha1.o: sha1.c
+sha1.o: sha1.h
 sha1init.o: $(RUBY_EXTCONF_H)
 sha1init.o: $(arch_hdrdir)/ruby/config.h
+sha1init.o: $(hdrdir)/ruby.h
+sha1init.o: $(hdrdir)/ruby/assert.h
 sha1init.o: $(hdrdir)/ruby/backward.h
+sha1init.o: $(hdrdir)/ruby/backward/2/assume.h
+sha1init.o: $(hdrdir)/ruby/backward/2/attributes.h
+sha1init.o: $(hdrdir)/ruby/backward/2/bool.h
+sha1init.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+sha1init.o: $(hdrdir)/ruby/backward/2/inttypes.h
+sha1init.o: $(hdrdir)/ruby/backward/2/limits.h
+sha1init.o: $(hdrdir)/ruby/backward/2/long_long.h
+sha1init.o: $(hdrdir)/ruby/backward/2/stdalign.h
+sha1init.o: $(hdrdir)/ruby/backward/2/stdarg.h
 sha1init.o: $(hdrdir)/ruby/defines.h
 sha1init.o: $(hdrdir)/ruby/intern.h
+sha1init.o: $(hdrdir)/ruby/internal/anyargs.h
+sha1init.o: $(hdrdir)/ruby/internal/arithmetic.h
+sha1init.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+sha1init.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+sha1init.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+sha1init.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+sha1init.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+sha1init.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+sha1init.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+sha1init.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+sha1init.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+sha1init.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+sha1init.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+sha1init.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+sha1init.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+sha1init.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+sha1init.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+sha1init.o: $(hdrdir)/ruby/internal/assume.h
+sha1init.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+sha1init.o: $(hdrdir)/ruby/internal/attr/artificial.h
+sha1init.o: $(hdrdir)/ruby/internal/attr/cold.h
+sha1init.o: $(hdrdir)/ruby/internal/attr/const.h
+sha1init.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+sha1init.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+sha1init.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+sha1init.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+sha1init.o: $(hdrdir)/ruby/internal/attr/error.h
+sha1init.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+sha1init.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+sha1init.o: $(hdrdir)/ruby/internal/attr/format.h
+sha1init.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+sha1init.o: $(hdrdir)/ruby/internal/attr/noalias.h
+sha1init.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+sha1init.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+sha1init.o: $(hdrdir)/ruby/internal/attr/noinline.h
+sha1init.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+sha1init.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+sha1init.o: $(hdrdir)/ruby/internal/attr/pure.h
+sha1init.o: $(hdrdir)/ruby/internal/attr/restrict.h
+sha1init.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+sha1init.o: $(hdrdir)/ruby/internal/attr/warning.h
+sha1init.o: $(hdrdir)/ruby/internal/attr/weakref.h
+sha1init.o: $(hdrdir)/ruby/internal/cast.h
+sha1init.o: $(hdrdir)/ruby/internal/compiler_is.h
+sha1init.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+sha1init.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+sha1init.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+sha1init.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+sha1init.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+sha1init.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+sha1init.o: $(hdrdir)/ruby/internal/compiler_since.h
+sha1init.o: $(hdrdir)/ruby/internal/config.h
+sha1init.o: $(hdrdir)/ruby/internal/constant_p.h
+sha1init.o: $(hdrdir)/ruby/internal/core.h
+sha1init.o: $(hdrdir)/ruby/internal/core/rarray.h
+sha1init.o: $(hdrdir)/ruby/internal/core/rbasic.h
+sha1init.o: $(hdrdir)/ruby/internal/core/rbignum.h
+sha1init.o: $(hdrdir)/ruby/internal/core/rclass.h
+sha1init.o: $(hdrdir)/ruby/internal/core/rdata.h
+sha1init.o: $(hdrdir)/ruby/internal/core/rfile.h
+sha1init.o: $(hdrdir)/ruby/internal/core/rhash.h
+sha1init.o: $(hdrdir)/ruby/internal/core/robject.h
+sha1init.o: $(hdrdir)/ruby/internal/core/rregexp.h
+sha1init.o: $(hdrdir)/ruby/internal/core/rstring.h
+sha1init.o: $(hdrdir)/ruby/internal/core/rstruct.h
+sha1init.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+sha1init.o: $(hdrdir)/ruby/internal/ctype.h
+sha1init.o: $(hdrdir)/ruby/internal/dllexport.h
+sha1init.o: $(hdrdir)/ruby/internal/dosish.h
+sha1init.o: $(hdrdir)/ruby/internal/error.h
+sha1init.o: $(hdrdir)/ruby/internal/eval.h
+sha1init.o: $(hdrdir)/ruby/internal/event.h
+sha1init.o: $(hdrdir)/ruby/internal/fl_type.h
+sha1init.o: $(hdrdir)/ruby/internal/gc.h
+sha1init.o: $(hdrdir)/ruby/internal/glob.h
+sha1init.o: $(hdrdir)/ruby/internal/globals.h
+sha1init.o: $(hdrdir)/ruby/internal/has/attribute.h
+sha1init.o: $(hdrdir)/ruby/internal/has/builtin.h
+sha1init.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+sha1init.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+sha1init.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+sha1init.o: $(hdrdir)/ruby/internal/has/extension.h
+sha1init.o: $(hdrdir)/ruby/internal/has/feature.h
+sha1init.o: $(hdrdir)/ruby/internal/has/warning.h
+sha1init.o: $(hdrdir)/ruby/internal/intern/array.h
+sha1init.o: $(hdrdir)/ruby/internal/intern/bignum.h
+sha1init.o: $(hdrdir)/ruby/internal/intern/class.h
+sha1init.o: $(hdrdir)/ruby/internal/intern/compar.h
+sha1init.o: $(hdrdir)/ruby/internal/intern/complex.h
+sha1init.o: $(hdrdir)/ruby/internal/intern/cont.h
+sha1init.o: $(hdrdir)/ruby/internal/intern/dir.h
+sha1init.o: $(hdrdir)/ruby/internal/intern/enum.h
+sha1init.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+sha1init.o: $(hdrdir)/ruby/internal/intern/error.h
+sha1init.o: $(hdrdir)/ruby/internal/intern/eval.h
+sha1init.o: $(hdrdir)/ruby/internal/intern/file.h
+sha1init.o: $(hdrdir)/ruby/internal/intern/gc.h
+sha1init.o: $(hdrdir)/ruby/internal/intern/hash.h
+sha1init.o: $(hdrdir)/ruby/internal/intern/io.h
+sha1init.o: $(hdrdir)/ruby/internal/intern/load.h
+sha1init.o: $(hdrdir)/ruby/internal/intern/marshal.h
+sha1init.o: $(hdrdir)/ruby/internal/intern/numeric.h
+sha1init.o: $(hdrdir)/ruby/internal/intern/object.h
+sha1init.o: $(hdrdir)/ruby/internal/intern/parse.h
+sha1init.o: $(hdrdir)/ruby/internal/intern/proc.h
+sha1init.o: $(hdrdir)/ruby/internal/intern/process.h
+sha1init.o: $(hdrdir)/ruby/internal/intern/random.h
+sha1init.o: $(hdrdir)/ruby/internal/intern/range.h
+sha1init.o: $(hdrdir)/ruby/internal/intern/rational.h
+sha1init.o: $(hdrdir)/ruby/internal/intern/re.h
+sha1init.o: $(hdrdir)/ruby/internal/intern/ruby.h
+sha1init.o: $(hdrdir)/ruby/internal/intern/select.h
+sha1init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+sha1init.o: $(hdrdir)/ruby/internal/intern/signal.h
+sha1init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+sha1init.o: $(hdrdir)/ruby/internal/intern/string.h
+sha1init.o: $(hdrdir)/ruby/internal/intern/struct.h
+sha1init.o: $(hdrdir)/ruby/internal/intern/thread.h
+sha1init.o: $(hdrdir)/ruby/internal/intern/time.h
+sha1init.o: $(hdrdir)/ruby/internal/intern/variable.h
+sha1init.o: $(hdrdir)/ruby/internal/intern/vm.h
+sha1init.o: $(hdrdir)/ruby/internal/interpreter.h
+sha1init.o: $(hdrdir)/ruby/internal/iterator.h
+sha1init.o: $(hdrdir)/ruby/internal/memory.h
+sha1init.o: $(hdrdir)/ruby/internal/method.h
+sha1init.o: $(hdrdir)/ruby/internal/module.h
+sha1init.o: $(hdrdir)/ruby/internal/newobj.h
+sha1init.o: $(hdrdir)/ruby/internal/rgengc.h
+sha1init.o: $(hdrdir)/ruby/internal/scan_args.h
+sha1init.o: $(hdrdir)/ruby/internal/special_consts.h
+sha1init.o: $(hdrdir)/ruby/internal/static_assert.h
+sha1init.o: $(hdrdir)/ruby/internal/stdalign.h
+sha1init.o: $(hdrdir)/ruby/internal/stdbool.h
+sha1init.o: $(hdrdir)/ruby/internal/symbol.h
+sha1init.o: $(hdrdir)/ruby/internal/token_paste.h
+sha1init.o: $(hdrdir)/ruby/internal/value.h
+sha1init.o: $(hdrdir)/ruby/internal/value_type.h
+sha1init.o: $(hdrdir)/ruby/internal/variable.h
+sha1init.o: $(hdrdir)/ruby/internal/warning_push.h
+sha1init.o: $(hdrdir)/ruby/internal/xmalloc.h
 sha1init.o: $(hdrdir)/ruby/missing.h
 sha1init.o: $(hdrdir)/ruby/ruby.h
 sha1init.o: $(hdrdir)/ruby/st.h
 sha1init.o: $(hdrdir)/ruby/subst.h
-sha1init.o: $(top_srcdir)/ext/digest/digest.h
-sha1init.o: $(top_srcdir)/include/ruby.h
+sha1init.o: $(srcdir)/../defs.h
+sha1init.o: $(srcdir)/../digest.h
+sha1init.o: sha1.h
 sha1init.o: sha1init.c
-sha1init.o: sha1ossl.h
-sha1ossl.o: $(RUBY_EXTCONF_H)
-sha1ossl.o: $(arch_hdrdir)/ruby/config.h
-sha1ossl.o: $(hdrdir)/ruby/defines.h
-sha1ossl.o: $(hdrdir)/ruby/intern.h
-sha1ossl.o: $(hdrdir)/ruby/missing.h
-sha1ossl.o: $(hdrdir)/ruby/ruby.h
-sha1ossl.o: $(hdrdir)/ruby/st.h
-sha1ossl.o: $(hdrdir)/ruby/subst.h
-sha1ossl.o: $(top_srcdir)/ext/digest/defs.h
-sha1ossl.o: $(top_srcdir)/include/ruby.h
-sha1ossl.o: sha1ossl.c
-sha1ossl.o: sha1ossl.h
 # AUTOGENERATED DEPENDENCIES END
diff --git a/ext/digest/sha1/extconf.rb b/ext/digest/sha1/extconf.rb
index 0ff4158bef..1e94ba3ef9 100644
--- a/ext/digest/sha1/extconf.rb
+++ b/ext/digest/sha1/extconf.rb
@@ -10,7 +10,7 @@ $defs << "-DHAVE_CONFIG_H"
 
 $objs = [ "sha1init.#{$OBJEXT}" ]
 
-digest_conf("sha1", "sha", nil, %w[SHA])
+digest_conf("sha1")
 
 have_header("sys/cdefs.h")
 
diff --git a/ext/digest/sha1/sha1cc.h b/ext/digest/sha1/sha1cc.h
index 1376c49ec7..2ed8d646ab 100644
--- a/ext/digest/sha1/sha1cc.h
+++ b/ext/digest/sha1/sha1cc.h
@@ -5,8 +5,8 @@
 #define SHA1_DIGEST_LENGTH	CC_SHA1_DIGEST_LENGTH
 #define SHA1_CTX		CC_SHA1_CTX
 
-static DEFINE_UPDATE_FUNC_FOR_UINT(SHA1);
-static DEFINE_FINISH_FUNC_FROM_FINAL(SHA1);
+static DEFINE_UPDATE_FUNC_FOR_UINT(SHA1)
+static DEFINE_FINISH_FUNC_FROM_FINAL(SHA1)
 
 #undef SHA1_Update
 #undef SHA1_Finish
diff --git a/ext/digest/sha1/sha1init.c b/ext/digest/sha1/sha1init.c
index 1f8b89e276..f7047bc6d3 100644
--- a/ext/digest/sha1/sha1init.c
+++ b/ext/digest/sha1/sha1init.c
@@ -3,9 +3,7 @@
 
 #include <ruby/ruby.h>
 #include "../digest.h"
-#if defined(SHA1_USE_OPENSSL)
-#include "sha1ossl.h"
-#elif defined(SHA1_USE_COMMONDIGEST)
+#if defined(SHA1_USE_COMMONDIGEST)
 #include "sha1cc.h"
 #else
 #include "sha1.h"
@@ -22,27 +20,44 @@ static const rb_digest_metadata_t sha1 = {
 };
 
 /*
+ * Document-class: Digest::SHA1 < Digest::Base
  * A class for calculating message digests using the SHA-1 Secure Hash
  * Algorithm by NIST (the US' National Institute of Standards and
  * Technology), described in FIPS PUB 180-1.
+ *
+ * See Digest::Instance for digest API.
+ *
+ * SHA-1 calculates a digest of 160 bits (20 bytes).
+ *
+ * == Examples
+ *  require 'digest'
+ *
+ *  # Compute a complete digest
+ *  Digest::SHA1.hexdigest 'abc'      #=> "a9993e36..."
+ *
+ *  # Compute digest by chunks
+ *  sha1 = Digest::SHA1.new               # =>#<Digest::SHA1>
+ *  sha1.update "ab"
+ *  sha1 << "c"                           # alias for #update
+ *  sha1.hexdigest                        # => "a9993e36..."
+ *
+ *  # Use the same object to compute another digest
+ *  sha1.reset
+ *  sha1 << "message"
+ *  sha1.hexdigest                        # => "6f9b9af3..."
  */
 void
 Init_sha1(void)
 {
     VALUE mDigest, cDigest_Base, cDigest_SHA1;
 
-    rb_require("digest");
-
 #if 0
     mDigest = rb_define_module("Digest"); /* let rdoc know */
 #endif
-    mDigest = rb_path2class("Digest");
+    mDigest = rb_digest_namespace();
     cDigest_Base = rb_path2class("Digest::Base");
 
     cDigest_SHA1 = rb_define_class_under(mDigest, "SHA1", cDigest_Base);
 
-#undef RUBY_UNTYPED_DATA_WARNING
-#define RUBY_UNTYPED_DATA_WARNING 0
-    rb_iv_set(cDigest_SHA1, "metadata",
-	      Data_Wrap_Struct(0, 0, 0, (void *)&sha1));
+    rb_iv_set(cDigest_SHA1, "metadata", rb_digest_make_metadata(&sha1));
 }
diff --git a/ext/digest/sha1/sha1ossl.h b/ext/digest/sha1/sha1ossl.h
deleted file mode 100644
index 80580b6460..0000000000
--- a/ext/digest/sha1/sha1ossl.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* $Id$ */
-
-#ifndef SHA1OSSL_H_INCLUDED
-#define SHA1OSSL_H_INCLUDED
-
-#include <stddef.h>
-#include <openssl/sha.h>
-
-#define SHA1_CTX	SHA_CTX
-
-#ifdef SHA_BLOCK_LENGTH
-#define SHA1_BLOCK_LENGTH	SHA_BLOCK_LENGTH
-#else
-#define SHA1_BLOCK_LENGTH	SHA_CBLOCK
-#endif
-#define SHA1_DIGEST_LENGTH	SHA_DIGEST_LENGTH
-
-static DEFINE_FINISH_FUNC_FROM_FINAL(SHA1);
-#undef SHA1_Finish
-#define SHA1_Finish rb_digest_SHA1_finish
-
-#endif
diff --git a/ext/digest/sha2/depend b/ext/digest/sha2/depend
index 0a0bca2081..d8d265c1ef 100644
--- a/ext/digest/sha2/depend
+++ b/ext/digest/sha2/depend
@@ -1,29 +1,331 @@
-sha2.o: sha2.c sha2.h $(srcdir)/../defs.h $(HDRS) $(ruby_headers)
+sha2.o: sha2.c sha2.h $(srcdir)/../defs.h
+sha2init.o: $(LOCAL_HDRS)
 
 # AUTOGENERATED DEPENDENCIES START
+sha2.o: $(RUBY_EXTCONF_H)
+sha2.o: $(arch_hdrdir)/ruby/config.h
+sha2.o: $(hdrdir)/ruby.h
+sha2.o: $(hdrdir)/ruby/assert.h
+sha2.o: $(hdrdir)/ruby/backward.h
+sha2.o: $(hdrdir)/ruby/backward/2/assume.h
+sha2.o: $(hdrdir)/ruby/backward/2/attributes.h
+sha2.o: $(hdrdir)/ruby/backward/2/bool.h
+sha2.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+sha2.o: $(hdrdir)/ruby/backward/2/inttypes.h
+sha2.o: $(hdrdir)/ruby/backward/2/limits.h
+sha2.o: $(hdrdir)/ruby/backward/2/long_long.h
+sha2.o: $(hdrdir)/ruby/backward/2/stdalign.h
+sha2.o: $(hdrdir)/ruby/backward/2/stdarg.h
+sha2.o: $(hdrdir)/ruby/defines.h
+sha2.o: $(hdrdir)/ruby/intern.h
+sha2.o: $(hdrdir)/ruby/internal/anyargs.h
+sha2.o: $(hdrdir)/ruby/internal/arithmetic.h
+sha2.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+sha2.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+sha2.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+sha2.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+sha2.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+sha2.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+sha2.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+sha2.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+sha2.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+sha2.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+sha2.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+sha2.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+sha2.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+sha2.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+sha2.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+sha2.o: $(hdrdir)/ruby/internal/assume.h
+sha2.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+sha2.o: $(hdrdir)/ruby/internal/attr/artificial.h
+sha2.o: $(hdrdir)/ruby/internal/attr/cold.h
+sha2.o: $(hdrdir)/ruby/internal/attr/const.h
+sha2.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+sha2.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+sha2.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+sha2.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+sha2.o: $(hdrdir)/ruby/internal/attr/error.h
+sha2.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+sha2.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+sha2.o: $(hdrdir)/ruby/internal/attr/format.h
+sha2.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+sha2.o: $(hdrdir)/ruby/internal/attr/noalias.h
+sha2.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+sha2.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+sha2.o: $(hdrdir)/ruby/internal/attr/noinline.h
+sha2.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+sha2.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+sha2.o: $(hdrdir)/ruby/internal/attr/pure.h
+sha2.o: $(hdrdir)/ruby/internal/attr/restrict.h
+sha2.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+sha2.o: $(hdrdir)/ruby/internal/attr/warning.h
+sha2.o: $(hdrdir)/ruby/internal/attr/weakref.h
+sha2.o: $(hdrdir)/ruby/internal/cast.h
+sha2.o: $(hdrdir)/ruby/internal/compiler_is.h
+sha2.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+sha2.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+sha2.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+sha2.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+sha2.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+sha2.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+sha2.o: $(hdrdir)/ruby/internal/compiler_since.h
+sha2.o: $(hdrdir)/ruby/internal/config.h
+sha2.o: $(hdrdir)/ruby/internal/constant_p.h
+sha2.o: $(hdrdir)/ruby/internal/core.h
+sha2.o: $(hdrdir)/ruby/internal/core/rarray.h
+sha2.o: $(hdrdir)/ruby/internal/core/rbasic.h
+sha2.o: $(hdrdir)/ruby/internal/core/rbignum.h
+sha2.o: $(hdrdir)/ruby/internal/core/rclass.h
+sha2.o: $(hdrdir)/ruby/internal/core/rdata.h
+sha2.o: $(hdrdir)/ruby/internal/core/rfile.h
+sha2.o: $(hdrdir)/ruby/internal/core/rhash.h
+sha2.o: $(hdrdir)/ruby/internal/core/robject.h
+sha2.o: $(hdrdir)/ruby/internal/core/rregexp.h
+sha2.o: $(hdrdir)/ruby/internal/core/rstring.h
+sha2.o: $(hdrdir)/ruby/internal/core/rstruct.h
+sha2.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+sha2.o: $(hdrdir)/ruby/internal/ctype.h
+sha2.o: $(hdrdir)/ruby/internal/dllexport.h
+sha2.o: $(hdrdir)/ruby/internal/dosish.h
+sha2.o: $(hdrdir)/ruby/internal/error.h
+sha2.o: $(hdrdir)/ruby/internal/eval.h
+sha2.o: $(hdrdir)/ruby/internal/event.h
+sha2.o: $(hdrdir)/ruby/internal/fl_type.h
+sha2.o: $(hdrdir)/ruby/internal/gc.h
+sha2.o: $(hdrdir)/ruby/internal/glob.h
+sha2.o: $(hdrdir)/ruby/internal/globals.h
+sha2.o: $(hdrdir)/ruby/internal/has/attribute.h
+sha2.o: $(hdrdir)/ruby/internal/has/builtin.h
+sha2.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+sha2.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+sha2.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+sha2.o: $(hdrdir)/ruby/internal/has/extension.h
+sha2.o: $(hdrdir)/ruby/internal/has/feature.h
+sha2.o: $(hdrdir)/ruby/internal/has/warning.h
+sha2.o: $(hdrdir)/ruby/internal/intern/array.h
+sha2.o: $(hdrdir)/ruby/internal/intern/bignum.h
+sha2.o: $(hdrdir)/ruby/internal/intern/class.h
+sha2.o: $(hdrdir)/ruby/internal/intern/compar.h
+sha2.o: $(hdrdir)/ruby/internal/intern/complex.h
+sha2.o: $(hdrdir)/ruby/internal/intern/cont.h
+sha2.o: $(hdrdir)/ruby/internal/intern/dir.h
+sha2.o: $(hdrdir)/ruby/internal/intern/enum.h
+sha2.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+sha2.o: $(hdrdir)/ruby/internal/intern/error.h
+sha2.o: $(hdrdir)/ruby/internal/intern/eval.h
+sha2.o: $(hdrdir)/ruby/internal/intern/file.h
+sha2.o: $(hdrdir)/ruby/internal/intern/gc.h
+sha2.o: $(hdrdir)/ruby/internal/intern/hash.h
+sha2.o: $(hdrdir)/ruby/internal/intern/io.h
+sha2.o: $(hdrdir)/ruby/internal/intern/load.h
+sha2.o: $(hdrdir)/ruby/internal/intern/marshal.h
+sha2.o: $(hdrdir)/ruby/internal/intern/numeric.h
+sha2.o: $(hdrdir)/ruby/internal/intern/object.h
+sha2.o: $(hdrdir)/ruby/internal/intern/parse.h
+sha2.o: $(hdrdir)/ruby/internal/intern/proc.h
+sha2.o: $(hdrdir)/ruby/internal/intern/process.h
+sha2.o: $(hdrdir)/ruby/internal/intern/random.h
+sha2.o: $(hdrdir)/ruby/internal/intern/range.h
+sha2.o: $(hdrdir)/ruby/internal/intern/rational.h
+sha2.o: $(hdrdir)/ruby/internal/intern/re.h
+sha2.o: $(hdrdir)/ruby/internal/intern/ruby.h
+sha2.o: $(hdrdir)/ruby/internal/intern/select.h
+sha2.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+sha2.o: $(hdrdir)/ruby/internal/intern/signal.h
+sha2.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+sha2.o: $(hdrdir)/ruby/internal/intern/string.h
+sha2.o: $(hdrdir)/ruby/internal/intern/struct.h
+sha2.o: $(hdrdir)/ruby/internal/intern/thread.h
+sha2.o: $(hdrdir)/ruby/internal/intern/time.h
+sha2.o: $(hdrdir)/ruby/internal/intern/variable.h
+sha2.o: $(hdrdir)/ruby/internal/intern/vm.h
+sha2.o: $(hdrdir)/ruby/internal/interpreter.h
+sha2.o: $(hdrdir)/ruby/internal/iterator.h
+sha2.o: $(hdrdir)/ruby/internal/memory.h
+sha2.o: $(hdrdir)/ruby/internal/method.h
+sha2.o: $(hdrdir)/ruby/internal/module.h
+sha2.o: $(hdrdir)/ruby/internal/newobj.h
+sha2.o: $(hdrdir)/ruby/internal/rgengc.h
+sha2.o: $(hdrdir)/ruby/internal/scan_args.h
+sha2.o: $(hdrdir)/ruby/internal/special_consts.h
+sha2.o: $(hdrdir)/ruby/internal/static_assert.h
+sha2.o: $(hdrdir)/ruby/internal/stdalign.h
+sha2.o: $(hdrdir)/ruby/internal/stdbool.h
+sha2.o: $(hdrdir)/ruby/internal/symbol.h
+sha2.o: $(hdrdir)/ruby/internal/token_paste.h
+sha2.o: $(hdrdir)/ruby/internal/value.h
+sha2.o: $(hdrdir)/ruby/internal/value_type.h
+sha2.o: $(hdrdir)/ruby/internal/variable.h
+sha2.o: $(hdrdir)/ruby/internal/warning_push.h
+sha2.o: $(hdrdir)/ruby/internal/xmalloc.h
+sha2.o: $(hdrdir)/ruby/missing.h
+sha2.o: $(hdrdir)/ruby/ruby.h
+sha2.o: $(hdrdir)/ruby/st.h
+sha2.o: $(hdrdir)/ruby/subst.h
+sha2.o: $(srcdir)/../defs.h
+sha2.o: sha2.c
+sha2.o: sha2.h
 sha2init.o: $(RUBY_EXTCONF_H)
 sha2init.o: $(arch_hdrdir)/ruby/config.h
+sha2init.o: $(hdrdir)/ruby.h
+sha2init.o: $(hdrdir)/ruby/assert.h
 sha2init.o: $(hdrdir)/ruby/backward.h
+sha2init.o: $(hdrdir)/ruby/backward/2/assume.h
+sha2init.o: $(hdrdir)/ruby/backward/2/attributes.h
+sha2init.o: $(hdrdir)/ruby/backward/2/bool.h
+sha2init.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+sha2init.o: $(hdrdir)/ruby/backward/2/inttypes.h
+sha2init.o: $(hdrdir)/ruby/backward/2/limits.h
+sha2init.o: $(hdrdir)/ruby/backward/2/long_long.h
+sha2init.o: $(hdrdir)/ruby/backward/2/stdalign.h
+sha2init.o: $(hdrdir)/ruby/backward/2/stdarg.h
 sha2init.o: $(hdrdir)/ruby/defines.h
 sha2init.o: $(hdrdir)/ruby/intern.h
+sha2init.o: $(hdrdir)/ruby/internal/anyargs.h
+sha2init.o: $(hdrdir)/ruby/internal/arithmetic.h
+sha2init.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+sha2init.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+sha2init.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+sha2init.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+sha2init.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+sha2init.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+sha2init.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+sha2init.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+sha2init.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+sha2init.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+sha2init.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+sha2init.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+sha2init.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+sha2init.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+sha2init.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+sha2init.o: $(hdrdir)/ruby/internal/assume.h
+sha2init.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+sha2init.o: $(hdrdir)/ruby/internal/attr/artificial.h
+sha2init.o: $(hdrdir)/ruby/internal/attr/cold.h
+sha2init.o: $(hdrdir)/ruby/internal/attr/const.h
+sha2init.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+sha2init.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+sha2init.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+sha2init.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+sha2init.o: $(hdrdir)/ruby/internal/attr/error.h
+sha2init.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+sha2init.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+sha2init.o: $(hdrdir)/ruby/internal/attr/format.h
+sha2init.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+sha2init.o: $(hdrdir)/ruby/internal/attr/noalias.h
+sha2init.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+sha2init.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+sha2init.o: $(hdrdir)/ruby/internal/attr/noinline.h
+sha2init.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+sha2init.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+sha2init.o: $(hdrdir)/ruby/internal/attr/pure.h
+sha2init.o: $(hdrdir)/ruby/internal/attr/restrict.h
+sha2init.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+sha2init.o: $(hdrdir)/ruby/internal/attr/warning.h
+sha2init.o: $(hdrdir)/ruby/internal/attr/weakref.h
+sha2init.o: $(hdrdir)/ruby/internal/cast.h
+sha2init.o: $(hdrdir)/ruby/internal/compiler_is.h
+sha2init.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+sha2init.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+sha2init.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+sha2init.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+sha2init.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+sha2init.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+sha2init.o: $(hdrdir)/ruby/internal/compiler_since.h
+sha2init.o: $(hdrdir)/ruby/internal/config.h
+sha2init.o: $(hdrdir)/ruby/internal/constant_p.h
+sha2init.o: $(hdrdir)/ruby/internal/core.h
+sha2init.o: $(hdrdir)/ruby/internal/core/rarray.h
+sha2init.o: $(hdrdir)/ruby/internal/core/rbasic.h
+sha2init.o: $(hdrdir)/ruby/internal/core/rbignum.h
+sha2init.o: $(hdrdir)/ruby/internal/core/rclass.h
+sha2init.o: $(hdrdir)/ruby/internal/core/rdata.h
+sha2init.o: $(hdrdir)/ruby/internal/core/rfile.h
+sha2init.o: $(hdrdir)/ruby/internal/core/rhash.h
+sha2init.o: $(hdrdir)/ruby/internal/core/robject.h
+sha2init.o: $(hdrdir)/ruby/internal/core/rregexp.h
+sha2init.o: $(hdrdir)/ruby/internal/core/rstring.h
+sha2init.o: $(hdrdir)/ruby/internal/core/rstruct.h
+sha2init.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+sha2init.o: $(hdrdir)/ruby/internal/ctype.h
+sha2init.o: $(hdrdir)/ruby/internal/dllexport.h
+sha2init.o: $(hdrdir)/ruby/internal/dosish.h
+sha2init.o: $(hdrdir)/ruby/internal/error.h
+sha2init.o: $(hdrdir)/ruby/internal/eval.h
+sha2init.o: $(hdrdir)/ruby/internal/event.h
+sha2init.o: $(hdrdir)/ruby/internal/fl_type.h
+sha2init.o: $(hdrdir)/ruby/internal/gc.h
+sha2init.o: $(hdrdir)/ruby/internal/glob.h
+sha2init.o: $(hdrdir)/ruby/internal/globals.h
+sha2init.o: $(hdrdir)/ruby/internal/has/attribute.h
+sha2init.o: $(hdrdir)/ruby/internal/has/builtin.h
+sha2init.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+sha2init.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+sha2init.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+sha2init.o: $(hdrdir)/ruby/internal/has/extension.h
+sha2init.o: $(hdrdir)/ruby/internal/has/feature.h
+sha2init.o: $(hdrdir)/ruby/internal/has/warning.h
+sha2init.o: $(hdrdir)/ruby/internal/intern/array.h
+sha2init.o: $(hdrdir)/ruby/internal/intern/bignum.h
+sha2init.o: $(hdrdir)/ruby/internal/intern/class.h
+sha2init.o: $(hdrdir)/ruby/internal/intern/compar.h
+sha2init.o: $(hdrdir)/ruby/internal/intern/complex.h
+sha2init.o: $(hdrdir)/ruby/internal/intern/cont.h
+sha2init.o: $(hdrdir)/ruby/internal/intern/dir.h
+sha2init.o: $(hdrdir)/ruby/internal/intern/enum.h
+sha2init.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+sha2init.o: $(hdrdir)/ruby/internal/intern/error.h
+sha2init.o: $(hdrdir)/ruby/internal/intern/eval.h
+sha2init.o: $(hdrdir)/ruby/internal/intern/file.h
+sha2init.o: $(hdrdir)/ruby/internal/intern/gc.h
+sha2init.o: $(hdrdir)/ruby/internal/intern/hash.h
+sha2init.o: $(hdrdir)/ruby/internal/intern/io.h
+sha2init.o: $(hdrdir)/ruby/internal/intern/load.h
+sha2init.o: $(hdrdir)/ruby/internal/intern/marshal.h
+sha2init.o: $(hdrdir)/ruby/internal/intern/numeric.h
+sha2init.o: $(hdrdir)/ruby/internal/intern/object.h
+sha2init.o: $(hdrdir)/ruby/internal/intern/parse.h
+sha2init.o: $(hdrdir)/ruby/internal/intern/proc.h
+sha2init.o: $(hdrdir)/ruby/internal/intern/process.h
+sha2init.o: $(hdrdir)/ruby/internal/intern/random.h
+sha2init.o: $(hdrdir)/ruby/internal/intern/range.h
+sha2init.o: $(hdrdir)/ruby/internal/intern/rational.h
+sha2init.o: $(hdrdir)/ruby/internal/intern/re.h
+sha2init.o: $(hdrdir)/ruby/internal/intern/ruby.h
+sha2init.o: $(hdrdir)/ruby/internal/intern/select.h
+sha2init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+sha2init.o: $(hdrdir)/ruby/internal/intern/signal.h
+sha2init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+sha2init.o: $(hdrdir)/ruby/internal/intern/string.h
+sha2init.o: $(hdrdir)/ruby/internal/intern/struct.h
+sha2init.o: $(hdrdir)/ruby/internal/intern/thread.h
+sha2init.o: $(hdrdir)/ruby/internal/intern/time.h
+sha2init.o: $(hdrdir)/ruby/internal/intern/variable.h
+sha2init.o: $(hdrdir)/ruby/internal/intern/vm.h
+sha2init.o: $(hdrdir)/ruby/internal/interpreter.h
+sha2init.o: $(hdrdir)/ruby/internal/iterator.h
+sha2init.o: $(hdrdir)/ruby/internal/memory.h
+sha2init.o: $(hdrdir)/ruby/internal/method.h
+sha2init.o: $(hdrdir)/ruby/internal/module.h
+sha2init.o: $(hdrdir)/ruby/internal/newobj.h
+sha2init.o: $(hdrdir)/ruby/internal/rgengc.h
+sha2init.o: $(hdrdir)/ruby/internal/scan_args.h
+sha2init.o: $(hdrdir)/ruby/internal/special_consts.h
+sha2init.o: $(hdrdir)/ruby/internal/static_assert.h
+sha2init.o: $(hdrdir)/ruby/internal/stdalign.h
+sha2init.o: $(hdrdir)/ruby/internal/stdbool.h
+sha2init.o: $(hdrdir)/ruby/internal/symbol.h
+sha2init.o: $(hdrdir)/ruby/internal/token_paste.h
+sha2init.o: $(hdrdir)/ruby/internal/value.h
+sha2init.o: $(hdrdir)/ruby/internal/value_type.h
+sha2init.o: $(hdrdir)/ruby/internal/variable.h
+sha2init.o: $(hdrdir)/ruby/internal/warning_push.h
+sha2init.o: $(hdrdir)/ruby/internal/xmalloc.h
 sha2init.o: $(hdrdir)/ruby/missing.h
 sha2init.o: $(hdrdir)/ruby/ruby.h
 sha2init.o: $(hdrdir)/ruby/st.h
 sha2init.o: $(hdrdir)/ruby/subst.h
-sha2init.o: $(top_srcdir)/ext/digest/digest.h
-sha2init.o: $(top_srcdir)/include/ruby.h
+sha2init.o: $(srcdir)/../digest.h
+sha2init.o: sha2.h
 sha2init.o: sha2init.c
-sha2init.o: sha2ossl.h
-sha2ossl.o: $(RUBY_EXTCONF_H)
-sha2ossl.o: $(arch_hdrdir)/ruby/config.h
-sha2ossl.o: $(hdrdir)/ruby/defines.h
-sha2ossl.o: $(hdrdir)/ruby/intern.h
-sha2ossl.o: $(hdrdir)/ruby/missing.h
-sha2ossl.o: $(hdrdir)/ruby/ruby.h
-sha2ossl.o: $(hdrdir)/ruby/st.h
-sha2ossl.o: $(hdrdir)/ruby/subst.h
-sha2ossl.o: $(top_srcdir)/ext/digest/defs.h
-sha2ossl.o: $(top_srcdir)/include/ruby.h
-sha2ossl.o: sha2ossl.c
-sha2ossl.o: sha2ossl.h
 # AUTOGENERATED DEPENDENCIES END
diff --git a/ext/digest/sha2/extconf.rb b/ext/digest/sha2/extconf.rb
index 5c7f76c7f3..8bf28111b6 100644
--- a/ext/digest/sha2/extconf.rb
+++ b/ext/digest/sha2/extconf.rb
@@ -10,7 +10,7 @@ $defs << "-DHAVE_CONFIG_H"
 
 $objs = [ "sha2init.#{$OBJEXT}" ]
 
-unless digest_conf("sha2", "sha", %w[SHA256 SHA512])
+unless digest_conf("sha2")
   have_type("u_int8_t")
 end
 
diff --git a/ext/digest/sha2/lib/sha2.rb b/ext/digest/sha2/lib/sha2.rb
index 58ff9f5cf0..61a0734850 100644
--- a/ext/digest/sha2/lib/sha2.rb
+++ b/ext/digest/sha2/lib/sha2.rb
@@ -17,11 +17,45 @@ module Digest
   #
   # A meta digest provider class for SHA256, SHA384 and SHA512.
   #
+  # FIPS 180-2 describes SHA2 family of digest algorithms. It defines
+  # three algorithms:
+  # * one which works on chunks of 512 bits and returns a 256-bit
+  #   digest (SHA256),
+  # * one which works on chunks of 1024 bits and returns a 384-bit
+  #   digest (SHA384),
+  # * and one which works on chunks of 1024 bits and returns a 512-bit
+  #   digest (SHA512).
+  #
+  # ==Examples
+  #  require 'digest'
+  #
+  #  # Compute a complete digest
+  #  Digest::SHA2.hexdigest 'abc'          # => "ba7816bf8..."
+  #  Digest::SHA2.new(256).hexdigest 'abc' # => "ba7816bf8..."
+  #  Digest::SHA256.hexdigest 'abc'        # => "ba7816bf8..."
+  #
+  #  Digest::SHA2.new(384).hexdigest 'abc' # => "cb00753f4..."
+  #  Digest::SHA384.hexdigest 'abc'        # => "cb00753f4..."
+  #
+  #  Digest::SHA2.new(512).hexdigest 'abc' # => "ddaf35a19..."
+  #  Digest::SHA512.hexdigest 'abc'        # => "ddaf35a19..."
+  #
+  #  # Compute digest by chunks
+  #  sha2 = Digest::SHA2.new               # =>#<Digest::SHA2:256>
+  #  sha2.update "ab"
+  #  sha2 << "c"                           # alias for #update
+  #  sha2.hexdigest                        # => "ba7816bf8..."
+  #
+  #  # Use the same object to compute another digest
+  #  sha2.reset
+  #  sha2 << "message"
+  #  sha2.hexdigest                        # => "ab530a13e..."
+  #
   class SHA2 < Digest::Class
     # call-seq:
     #   Digest::SHA2.new(bitlen = 256) -> digest_obj
     #
-    # Creates a new SHA2 hash object with a given bit length.
+    # Create a new SHA2 hash object with a given bit length.
     #
     # Valid bit lengths are 256, 384 and 512.
     def initialize(bitlen = 256)
@@ -41,7 +75,7 @@ module Digest
     # call-seq:
     #   digest_obj.reset -> digest_obj
     #
-    # Resets the digest to the initial state and returns self.
+    # Reset the digest to the initial state and return self.
     def reset
       @sha2.reset
       self
@@ -51,7 +85,7 @@ module Digest
     #   digest_obj.update(string) -> digest_obj
     #   digest_obj << string -> digest_obj
     #
-    # Updates the digest using a given _string_ and returns self.
+    # Update the digest using a given _string_ and return self.
     def update(str)
       @sha2.update(str)
       self
@@ -67,7 +101,7 @@ module Digest
     # call-seq:
     #   digest_obj.block_length -> Integer
     #
-    # Returns the block length of the digest in bytes.
+    # Return the block length of the digest in bytes.
     #
     #   Digest::SHA256.new.block_length * 8
     #   # => 512
@@ -82,7 +116,7 @@ module Digest
     # call-seq:
     #   digest_obj.digest_length -> Integer
     #
-    # Returns the length of the hash value of the digest in bytes.
+    # Return the length of the hash value (the digest) in bytes.
     #
     #   Digest::SHA256.new.digest_length * 8
     #   # => 256
diff --git a/ext/digest/sha2/sha2cc.h b/ext/digest/sha2/sha2cc.h
index 49d463088f..3f99604465 100644
--- a/ext/digest/sha2/sha2cc.h
+++ b/ext/digest/sha2/sha2cc.h
@@ -7,12 +7,12 @@
 
 #define SHA384_CTX		CC_SHA512_CTX
 
-static DEFINE_UPDATE_FUNC_FOR_UINT(SHA256);
-static DEFINE_FINISH_FUNC_FROM_FINAL(SHA256);
-static DEFINE_UPDATE_FUNC_FOR_UINT(SHA384);
-static DEFINE_FINISH_FUNC_FROM_FINAL(SHA384);
-static DEFINE_UPDATE_FUNC_FOR_UINT(SHA512);
-static DEFINE_FINISH_FUNC_FROM_FINAL(SHA512);
+static DEFINE_UPDATE_FUNC_FOR_UINT(SHA256)
+static DEFINE_FINISH_FUNC_FROM_FINAL(SHA256)
+static DEFINE_UPDATE_FUNC_FOR_UINT(SHA384)
+static DEFINE_FINISH_FUNC_FROM_FINAL(SHA384)
+static DEFINE_UPDATE_FUNC_FOR_UINT(SHA512)
+static DEFINE_FINISH_FUNC_FROM_FINAL(SHA512)
 
 
 #undef SHA256_Update
diff --git a/ext/digest/sha2/sha2init.c b/ext/digest/sha2/sha2init.c
index 9fd8ece7fe..6ed275eb71 100644
--- a/ext/digest/sha2/sha2init.c
+++ b/ext/digest/sha2/sha2init.c
@@ -3,9 +3,7 @@
 
 #include <ruby/ruby.h>
 #include "../digest.h"
-#if defined(SHA2_USE_OPENSSL)
-#include "sha2ossl.h"
-#elif defined(SHA2_USE_COMMONDIGEST)
+#if defined(SHA2_USE_COMMONDIGEST)
 #include "sha2cc.h"
 #else
 #include "sha2.h"
@@ -35,27 +33,21 @@ void
 Init_sha2(void)
 {
     VALUE mDigest, cDigest_Base;
-    ID id_metadata;
+    ID id_metadata = rb_id_metadata();
 
 #define DECLARE_ALGO_CLASS(bitlen) \
     VALUE cDigest_SHA##bitlen;
 
     FOREACH_BITLEN(DECLARE_ALGO_CLASS)
 
-    rb_require("digest");
-
-    id_metadata = rb_intern_const("metadata");
-
-    mDigest = rb_path2class("Digest");
+    mDigest = rb_digest_namespace();
     cDigest_Base = rb_path2class("Digest::Base");
 
 #define DEFINE_ALGO_CLASS(bitlen) \
     cDigest_SHA##bitlen = rb_define_class_under(mDigest, "SHA" #bitlen, cDigest_Base); \
 \
     rb_ivar_set(cDigest_SHA##bitlen, id_metadata, \
-		Data_Wrap_Struct(0, 0, 0, (void *)&sha##bitlen));
+		rb_digest_make_metadata(&sha##bitlen));
 
-#undef RUBY_UNTYPED_DATA_WARNING
-#define RUBY_UNTYPED_DATA_WARNING 0
     FOREACH_BITLEN(DEFINE_ALGO_CLASS)
 }
diff --git a/ext/digest/sha2/sha2ossl.h b/ext/digest/sha2/sha2ossl.h
deleted file mode 100644
index f7258ee64a..0000000000
--- a/ext/digest/sha2/sha2ossl.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef SHA2OSSL_H_INCLUDED
-#define SHA2OSSL_H_INCLUDED
-
-#include <stddef.h>
-#include <openssl/sha.h>
-
-#define SHA256_BLOCK_LENGTH	SHA256_CBLOCK
-#define SHA384_BLOCK_LENGTH	SHA512_CBLOCK
-#define SHA512_BLOCK_LENGTH	SHA512_CBLOCK
-
-#ifndef __DragonFly__
-#define SHA384_Final SHA512_Final
-#endif
-
-typedef SHA512_CTX SHA384_CTX;
-
-#undef SHA256_Finish
-#undef SHA384_Finish
-#undef SHA512_Finish
-#define SHA256_Finish rb_digest_SHA256_finish
-#define SHA384_Finish rb_digest_SHA384_finish
-#define SHA512_Finish rb_digest_SHA512_finish
-static DEFINE_FINISH_FUNC_FROM_FINAL(SHA256);
-static DEFINE_FINISH_FUNC_FROM_FINAL(SHA384);
-static DEFINE_FINISH_FUNC_FROM_FINAL(SHA512);
-
-#endif
diff --git a/ext/etc/depend b/ext/etc/depend
index a73a18465a..67d9be582f 100644
--- a/ext/etc/depend
+++ b/ext/etc/depend
@@ -1,9 +1,173 @@
-etc.o : etc.c constdefs.h $(HDRS) $(ruby_headers) \
-  $(hdrdir)/ruby/io.h \
-  $(hdrdir)/ruby/encoding.h \
-  $(hdrdir)/ruby/oniguruma.h
-
 constdefs.h : $(srcdir)/mkconstants.rb
 	@echo "generating constant definitions"
 	@$(RUBY) $(srcdir)/mkconstants.rb -o constdefs.h
 
+# AUTOGENERATED DEPENDENCIES START
+etc.o: $(RUBY_EXTCONF_H)
+etc.o: $(arch_hdrdir)/ruby/config.h
+etc.o: $(hdrdir)/ruby.h
+etc.o: $(hdrdir)/ruby/assert.h
+etc.o: $(hdrdir)/ruby/atomic.h
+etc.o: $(hdrdir)/ruby/backward.h
+etc.o: $(hdrdir)/ruby/backward/2/assume.h
+etc.o: $(hdrdir)/ruby/backward/2/attributes.h
+etc.o: $(hdrdir)/ruby/backward/2/bool.h
+etc.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+etc.o: $(hdrdir)/ruby/backward/2/inttypes.h
+etc.o: $(hdrdir)/ruby/backward/2/limits.h
+etc.o: $(hdrdir)/ruby/backward/2/long_long.h
+etc.o: $(hdrdir)/ruby/backward/2/stdalign.h
+etc.o: $(hdrdir)/ruby/backward/2/stdarg.h
+etc.o: $(hdrdir)/ruby/defines.h
+etc.o: $(hdrdir)/ruby/encoding.h
+etc.o: $(hdrdir)/ruby/intern.h
+etc.o: $(hdrdir)/ruby/internal/anyargs.h
+etc.o: $(hdrdir)/ruby/internal/arithmetic.h
+etc.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+etc.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+etc.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+etc.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+etc.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+etc.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+etc.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+etc.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+etc.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+etc.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+etc.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+etc.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+etc.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+etc.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+etc.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+etc.o: $(hdrdir)/ruby/internal/assume.h
+etc.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+etc.o: $(hdrdir)/ruby/internal/attr/artificial.h
+etc.o: $(hdrdir)/ruby/internal/attr/cold.h
+etc.o: $(hdrdir)/ruby/internal/attr/const.h
+etc.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+etc.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+etc.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+etc.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+etc.o: $(hdrdir)/ruby/internal/attr/error.h
+etc.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+etc.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+etc.o: $(hdrdir)/ruby/internal/attr/format.h
+etc.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+etc.o: $(hdrdir)/ruby/internal/attr/noalias.h
+etc.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+etc.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+etc.o: $(hdrdir)/ruby/internal/attr/noinline.h
+etc.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+etc.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+etc.o: $(hdrdir)/ruby/internal/attr/pure.h
+etc.o: $(hdrdir)/ruby/internal/attr/restrict.h
+etc.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+etc.o: $(hdrdir)/ruby/internal/attr/warning.h
+etc.o: $(hdrdir)/ruby/internal/attr/weakref.h
+etc.o: $(hdrdir)/ruby/internal/cast.h
+etc.o: $(hdrdir)/ruby/internal/compiler_is.h
+etc.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+etc.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+etc.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+etc.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+etc.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+etc.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+etc.o: $(hdrdir)/ruby/internal/compiler_since.h
+etc.o: $(hdrdir)/ruby/internal/config.h
+etc.o: $(hdrdir)/ruby/internal/constant_p.h
+etc.o: $(hdrdir)/ruby/internal/core.h
+etc.o: $(hdrdir)/ruby/internal/core/rarray.h
+etc.o: $(hdrdir)/ruby/internal/core/rbasic.h
+etc.o: $(hdrdir)/ruby/internal/core/rbignum.h
+etc.o: $(hdrdir)/ruby/internal/core/rclass.h
+etc.o: $(hdrdir)/ruby/internal/core/rdata.h
+etc.o: $(hdrdir)/ruby/internal/core/rfile.h
+etc.o: $(hdrdir)/ruby/internal/core/rhash.h
+etc.o: $(hdrdir)/ruby/internal/core/robject.h
+etc.o: $(hdrdir)/ruby/internal/core/rregexp.h
+etc.o: $(hdrdir)/ruby/internal/core/rstring.h
+etc.o: $(hdrdir)/ruby/internal/core/rstruct.h
+etc.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+etc.o: $(hdrdir)/ruby/internal/ctype.h
+etc.o: $(hdrdir)/ruby/internal/dllexport.h
+etc.o: $(hdrdir)/ruby/internal/dosish.h
+etc.o: $(hdrdir)/ruby/internal/error.h
+etc.o: $(hdrdir)/ruby/internal/eval.h
+etc.o: $(hdrdir)/ruby/internal/event.h
+etc.o: $(hdrdir)/ruby/internal/fl_type.h
+etc.o: $(hdrdir)/ruby/internal/gc.h
+etc.o: $(hdrdir)/ruby/internal/glob.h
+etc.o: $(hdrdir)/ruby/internal/globals.h
+etc.o: $(hdrdir)/ruby/internal/has/attribute.h
+etc.o: $(hdrdir)/ruby/internal/has/builtin.h
+etc.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+etc.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+etc.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+etc.o: $(hdrdir)/ruby/internal/has/extension.h
+etc.o: $(hdrdir)/ruby/internal/has/feature.h
+etc.o: $(hdrdir)/ruby/internal/has/warning.h
+etc.o: $(hdrdir)/ruby/internal/intern/array.h
+etc.o: $(hdrdir)/ruby/internal/intern/bignum.h
+etc.o: $(hdrdir)/ruby/internal/intern/class.h
+etc.o: $(hdrdir)/ruby/internal/intern/compar.h
+etc.o: $(hdrdir)/ruby/internal/intern/complex.h
+etc.o: $(hdrdir)/ruby/internal/intern/cont.h
+etc.o: $(hdrdir)/ruby/internal/intern/dir.h
+etc.o: $(hdrdir)/ruby/internal/intern/enum.h
+etc.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+etc.o: $(hdrdir)/ruby/internal/intern/error.h
+etc.o: $(hdrdir)/ruby/internal/intern/eval.h
+etc.o: $(hdrdir)/ruby/internal/intern/file.h
+etc.o: $(hdrdir)/ruby/internal/intern/gc.h
+etc.o: $(hdrdir)/ruby/internal/intern/hash.h
+etc.o: $(hdrdir)/ruby/internal/intern/io.h
+etc.o: $(hdrdir)/ruby/internal/intern/load.h
+etc.o: $(hdrdir)/ruby/internal/intern/marshal.h
+etc.o: $(hdrdir)/ruby/internal/intern/numeric.h
+etc.o: $(hdrdir)/ruby/internal/intern/object.h
+etc.o: $(hdrdir)/ruby/internal/intern/parse.h
+etc.o: $(hdrdir)/ruby/internal/intern/proc.h
+etc.o: $(hdrdir)/ruby/internal/intern/process.h
+etc.o: $(hdrdir)/ruby/internal/intern/random.h
+etc.o: $(hdrdir)/ruby/internal/intern/range.h
+etc.o: $(hdrdir)/ruby/internal/intern/rational.h
+etc.o: $(hdrdir)/ruby/internal/intern/re.h
+etc.o: $(hdrdir)/ruby/internal/intern/ruby.h
+etc.o: $(hdrdir)/ruby/internal/intern/select.h
+etc.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+etc.o: $(hdrdir)/ruby/internal/intern/signal.h
+etc.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+etc.o: $(hdrdir)/ruby/internal/intern/string.h
+etc.o: $(hdrdir)/ruby/internal/intern/struct.h
+etc.o: $(hdrdir)/ruby/internal/intern/thread.h
+etc.o: $(hdrdir)/ruby/internal/intern/time.h
+etc.o: $(hdrdir)/ruby/internal/intern/variable.h
+etc.o: $(hdrdir)/ruby/internal/intern/vm.h
+etc.o: $(hdrdir)/ruby/internal/interpreter.h
+etc.o: $(hdrdir)/ruby/internal/iterator.h
+etc.o: $(hdrdir)/ruby/internal/memory.h
+etc.o: $(hdrdir)/ruby/internal/method.h
+etc.o: $(hdrdir)/ruby/internal/module.h
+etc.o: $(hdrdir)/ruby/internal/newobj.h
+etc.o: $(hdrdir)/ruby/internal/rgengc.h
+etc.o: $(hdrdir)/ruby/internal/scan_args.h
+etc.o: $(hdrdir)/ruby/internal/special_consts.h
+etc.o: $(hdrdir)/ruby/internal/static_assert.h
+etc.o: $(hdrdir)/ruby/internal/stdalign.h
+etc.o: $(hdrdir)/ruby/internal/stdbool.h
+etc.o: $(hdrdir)/ruby/internal/symbol.h
+etc.o: $(hdrdir)/ruby/internal/token_paste.h
+etc.o: $(hdrdir)/ruby/internal/value.h
+etc.o: $(hdrdir)/ruby/internal/value_type.h
+etc.o: $(hdrdir)/ruby/internal/variable.h
+etc.o: $(hdrdir)/ruby/internal/warning_push.h
+etc.o: $(hdrdir)/ruby/internal/xmalloc.h
+etc.o: $(hdrdir)/ruby/io.h
+etc.o: $(hdrdir)/ruby/missing.h
+etc.o: $(hdrdir)/ruby/onigmo.h
+etc.o: $(hdrdir)/ruby/oniguruma.h
+etc.o: $(hdrdir)/ruby/ruby.h
+etc.o: $(hdrdir)/ruby/st.h
+etc.o: $(hdrdir)/ruby/subst.h
+etc.o: constdefs.h
+etc.o: etc.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/etc/etc.c b/ext/etc/etc.c
index 0d2d9af7cb..737d295abc 100644
--- a/ext/etc/etc.c
+++ b/ext/etc/etc.c
@@ -52,8 +52,33 @@ char *getenv();
 #endif
 char *getlogin();
 
+#define RUBY_ETC_VERSION "1.3.0"
+
+#ifdef HAVE_RB_DEPRECATE_CONSTANT
+void rb_deprecate_constant(VALUE mod, const char *name);
+#else
+# define rb_deprecate_constant(mod,name) ((void)(mod),(void)(name))
+#endif
+
 #include "constdefs.h"
 
+#ifdef HAVE_RUBY_ATOMIC_H
+# include "ruby/atomic.h"
+#else
+typedef int rb_atomic_t;
+# define RUBY_ATOMIC_CAS(var, oldval, newval) \
+    ((var) == (oldval) ? ((var) = (newval), (oldval)) : (var))
+# define RUBY_ATOMIC_EXCHANGE(var, newval) \
+    atomic_exchange(&var, newval)
+static inline rb_atomic_t
+atomic_exchange(volatile rb_atomic_t *var, rb_atomic_t newval)
+{
+    rb_atomic_t oldval = *var;
+    *var = newval;
+    return oldval;
+}
+#endif
+
 /* call-seq:
  *	getlogin	->  String
  *
@@ -98,7 +123,7 @@ static VALUE
 safe_setup_str(const char *str)
 {
     if (str == 0) str = "";
-    return rb_tainted_str_new2(str);
+    return rb_str_new2(str);
 }
 
 static VALUE
@@ -117,6 +142,12 @@ safe_setup_filesystem_str(const char *str)
 #endif
 
 #ifdef HAVE_GETPWENT
+# ifdef __APPLE__
+#   define PW_TIME2VAL(t) INT2NUM((int)(t))
+# else
+#   define PW_TIME2VAL(t) TIMET2NUM(t)
+# endif
+
 static VALUE
 setup_passwd(struct passwd *pwd)
 {
@@ -134,7 +165,7 @@ setup_passwd(struct passwd *pwd)
 			 safe_setup_filesystem_str(pwd->pw_dir),
 			 safe_setup_filesystem_str(pwd->pw_shell),
 #ifdef HAVE_STRUCT_PASSWD_PW_CHANGE
-			 INT2NUM(pwd->pw_change),
+			 PW_TIME2VAL(pwd->pw_change),
 #endif
 #ifdef HAVE_STRUCT_PASSWD_PW_QUOTA
 			 INT2NUM(pwd->pw_quota),
@@ -149,7 +180,7 @@ setup_passwd(struct passwd *pwd)
 			 safe_setup_locale_str(pwd->pw_comment),
 #endif
 #ifdef HAVE_STRUCT_PASSWD_PW_EXPIRE
-			 INT2NUM(pwd->pw_expire),
+			 PW_TIME2VAL(pwd->pw_expire),
 #endif
 			 0		/*dummy*/
 	);
@@ -215,9 +246,9 @@ etc_getpwnam(VALUE obj, VALUE nam)
 {
 #ifdef HAVE_GETPWENT
     struct passwd *pwd;
+    const char *p = StringValueCStr(nam);
 
-    SafeStringValue(nam);
-    pwd = getpwnam(RSTRING_PTR(nam));
+    pwd = getpwnam(p);
     if (pwd == 0) rb_raise(rb_eArgError, "can't find user for %"PRIsVALUE, nam);
     return setup_passwd(pwd);
 #else
@@ -226,17 +257,19 @@ etc_getpwnam(VALUE obj, VALUE nam)
 }
 
 #ifdef HAVE_GETPWENT
-static int passwd_blocking = 0;
+static rb_atomic_t passwd_blocking;
 static VALUE
-passwd_ensure(void)
+passwd_ensure(VALUE _)
 {
     endpwent();
-    passwd_blocking = (int)Qfalse;
+    if (RUBY_ATOMIC_EXCHANGE(passwd_blocking, 0) != 1) {
+	rb_raise(rb_eRuntimeError, "unexpected passwd_blocking");
+    }
     return Qnil;
 }
 
 static VALUE
-passwd_iterate(void)
+passwd_iterate(VALUE _)
 {
     struct passwd *pw;
 
@@ -250,10 +283,9 @@ passwd_iterate(void)
 static void
 each_passwd(void)
 {
-    if (passwd_blocking) {
+    if (RUBY_ATOMIC_CAS(passwd_blocking, 0, 1)) {
 	rb_raise(rb_eRuntimeError, "parallel passwd iteration");
     }
-    passwd_blocking = (int)Qtrue;
     rb_ensure(passwd_iterate, 0, passwd_ensure, 0);
 }
 #endif
@@ -458,9 +490,9 @@ etc_getgrnam(VALUE obj, VALUE nam)
 {
 #ifdef HAVE_GETGRENT
     struct group *grp;
+    const char *p = StringValueCStr(nam);
 
-    SafeStringValue(nam);
-    grp = getgrnam(RSTRING_PTR(nam));
+    grp = getgrnam(p);
     if (grp == 0) rb_raise(rb_eArgError, "can't find group for %"PRIsVALUE, nam);
     return setup_group(grp);
 #else
@@ -469,18 +501,20 @@ etc_getgrnam(VALUE obj, VALUE nam)
 }
 
 #ifdef HAVE_GETGRENT
-static int group_blocking = 0;
+static rb_atomic_t group_blocking;
 static VALUE
-group_ensure(void)
+group_ensure(VALUE _)
 {
     endgrent();
-    group_blocking = (int)Qfalse;
+    if (RUBY_ATOMIC_EXCHANGE(group_blocking, 0) != 1) {
+	rb_raise(rb_eRuntimeError, "unexpected group_blocking");
+    }
     return Qnil;
 }
 
 
 static VALUE
-group_iterate(void)
+group_iterate(VALUE _)
 {
     struct group *pw;
 
@@ -494,10 +528,9 @@ group_iterate(void)
 static void
 each_group(void)
 {
-    if (group_blocking) {
+    if (RUBY_ATOMIC_CAS(group_blocking, 0, 1)) {
 	rb_raise(rb_eRuntimeError, "parallel group iteration");
     }
-    group_blocking = (int)Qtrue;
     rb_ensure(group_iterate, 0, group_ensure, 0);
 }
 #endif
@@ -625,8 +658,9 @@ VALUE rb_w32_conv_from_wchar(const WCHAR *wstr, rb_encoding *enc);
  * Returns system configuration directory.
  *
  * This is typically "/etc", but is modified by the prefix used when Ruby was
- * compiled. For example, if Ruby is built and installed in /usr/local, returns
- * "/usr/local/etc".
+ * compiled. For example, if Ruby is built and installed in /usr/local,
+ * returns "/usr/local/etc" on other platforms than Windows.
+ * On Windows, this always returns the directory provided by the system.
  */
 static VALUE
 etc_sysconfdir(VALUE obj)
@@ -642,7 +676,7 @@ etc_sysconfdir(VALUE obj)
  * Returns system temporary directory; typically "/tmp".
  */
 static VALUE
-etc_systmpdir(void)
+etc_systmpdir(VALUE _)
 {
     VALUE tmpdir;
 #ifdef _WIN32
@@ -674,7 +708,10 @@ etc_systmpdir(void)
     }
 # endif
 #endif
+#ifndef RB_PASS_KEYWORDS
+    /* untaint on Ruby < 2.7 */
     FL_UNSET(tmpdir, FL_TAINT);
+#endif
     return tmpdir;
 }
 
@@ -751,9 +788,6 @@ etc_uname(VALUE obj)
 # ifndef PROCESSOR_ARCHITECTURE_AMD64
 #   define PROCESSOR_ARCHITECTURE_AMD64 9
 # endif
-# ifndef PROCESSOR_ARCHITECTURE_IA64
-#   define PROCESSOR_ARCHITECTURE_IA64 6
-# endif
 # ifndef PROCESSOR_ARCHITECTURE_INTEL
 #   define PROCESSOR_ARCHITECTURE_INTEL 0
 # endif
@@ -765,9 +799,6 @@ etc_uname(VALUE obj)
       case PROCESSOR_ARCHITECTURE_ARM:
 	mach = "ARM";
 	break;
-      case PROCESSOR_ARCHITECTURE_IA64:
-	mach = "IA64";
-	break;
       case PROCESSOR_ARCHITECTURE_INTEL:
 	mach = "x86";
 	break;
@@ -926,11 +957,13 @@ io_pathconf(VALUE io, VALUE arg)
 static int
 etc_nprocessors_affin(void)
 {
-    cpu_set_t *cpuset;
+    cpu_set_t *cpuset, cpuset_buff[1024 / sizeof(cpu_set_t)];
     size_t size;
     int ret;
     int n;
 
+    CPU_ZERO_S(sizeof(cpuset_buff), cpuset_buff);
+
     /*
      * XXX:
      * man page says CPU_ALLOC takes number of cpus. But it is not accurate
@@ -949,13 +982,12 @@ etc_nprocessors_affin(void)
      */
     for (n=64; n <= 16384; n *= 2) {
 	size = CPU_ALLOC_SIZE(n);
-	if (size >= 1024) {
+	if (size >= sizeof(cpuset_buff)) {
 	    cpuset = xcalloc(1, size);
 	    if (!cpuset)
 		return -1;
 	} else {
-	    cpuset = alloca(size);
-	    CPU_ZERO_S(size, cpuset);
+	    cpuset = cpuset_buff;
 	}
 
 	ret = sched_getaffinity(0, size, cpuset);
@@ -964,10 +996,10 @@ etc_nprocessors_affin(void)
 	    ret = CPU_COUNT_S(size, cpuset);
 	}
 
-	if (size >= 1024) {
+	if (size >= sizeof(cpuset_buff)) {
 	    xfree(cpuset);
 	}
-	if (ret > 0) {
+	if (ret > 0 || errno != EINVAL) {
 	    return ret;
 	}
     }
@@ -1012,7 +1044,7 @@ etc_nprocessors(VALUE obj)
 
     ncpus = etc_nprocessors_affin();
     if (ncpus != -1) {
-       return INT2NUM(ncpus);
+	return INT2NUM(ncpus);
     }
     /* fallback to _SC_NPROCESSORS_ONLN */
 #endif
@@ -1064,7 +1096,11 @@ Init_etc(void)
 {
     VALUE mEtc;
 
+    #ifdef HAVE_RB_EXT_RACTOR_SAFE
+	RB_EXT_RACTOR_SAFE(true);
+    #endif
     mEtc = rb_define_module("Etc");
+    rb_define_const(mEtc, "VERSION", rb_str_new_cstr(RUBY_ETC_VERSION));
     init_constants(mEtc);
 
     rb_define_module_function(mEtc, "getlogin", etc_getlogin, 0);
@@ -1164,9 +1200,9 @@ Init_etc(void)
     rb_define_const(mEtc, "Passwd", sPasswd);
 #endif
     rb_define_const(rb_cStruct, "Passwd", sPasswd); /* deprecated name */
+    rb_deprecate_constant(rb_cStruct, "Passwd");
     rb_extend_object(sPasswd, rb_mEnumerable);
     rb_define_singleton_method(sPasswd, "each", etc_each_passwd, 0);
-
 #ifdef HAVE_GETGRENT
     sGroup = rb_struct_define_under(mEtc, "Group", "name",
 #ifdef HAVE_STRUCT_GROUP_GR_PASSWD
@@ -1199,6 +1235,7 @@ Init_etc(void)
     rb_define_const(mEtc, "Group", sGroup);
 #endif
     rb_define_const(rb_cStruct, "Group", sGroup); /* deprecated name */
+    rb_deprecate_constant(rb_cStruct, "Group");
     rb_extend_object(sGroup, rb_mEnumerable);
     rb_define_singleton_method(sGroup, "each", etc_each_group, 0);
 #endif
diff --git a/ext/etc/etc.gemspec b/ext/etc/etc.gemspec
new file mode 100644
index 0000000000..7d687e3b99
--- /dev/null
+++ b/ext/etc/etc.gemspec
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+version = ["", "ext/etc/"].find do |dir|
+  begin
+    break File.open(File.expand_path("../#{dir}/etc.c", __FILE__)) do |f|
+      f.gets "\n#define RUBY_ETC_VERSION "
+      f.gets[/"(.+)"/, 1]
+    end
+  rescue
+    next
+  end
+end
+
+Gem::Specification.new do |spec|
+  spec.name          = "etc"
+  spec.version       = version
+  spec.authors       = ["Yukihiro Matsumoto"]
+  spec.email         = ["matz@ruby-lang.org"]
+
+  spec.summary       = %q{Provides access to information typically stored in UNIX /etc directory.}
+  spec.description   = spec.summary
+  spec.homepage      = "https://github.com/ruby/etc"
+  spec.licenses      = ["Ruby", "BSD-2-Clause"]
+
+  spec.files         = %w[
+    LICENSE.txt
+    README.md
+    ext/etc/constdefs.h
+    ext/etc/etc.c
+    ext/etc/extconf.rb
+    ext/etc/mkconstants.rb
+    test/etc/test_etc.rb
+  ]
+  spec.bindir        = "exe"
+  spec.require_paths = ["lib"]
+  spec.extensions    = %w{ext/etc/extconf.rb}
+
+  spec.required_ruby_version = ">= 2.3.0"
+
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rake-compiler"
+  spec.add_development_dependency "test-unit"
+end
diff --git a/ext/etc/extconf.rb b/ext/etc/extconf.rb
index 11bc9458c0..6e7810a5e8 100644
--- a/ext/etc/extconf.rb
+++ b/ext/etc/extconf.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'mkmf'
 
 headers = []
@@ -12,8 +12,10 @@ have_func("uname((struct utsname *)NULL)", headers)
 have_func("getlogin")
 have_func("getpwent")
 have_func("getgrent")
-sysconfdir = RbConfig.expand(RbConfig::CONFIG["sysconfdir"].dup, "prefix"=>"", "DESTDIR"=>"")
-$defs.push("-DSYSCONFDIR=#{Shellwords.escape(sysconfdir.dump)}")
+if (sysconfdir = RbConfig::CONFIG["sysconfdir"] and
+    !RbConfig.expand(sysconfdir.dup, "prefix"=>"", "DESTDIR"=>"").empty?)
+  $defs.push("-DSYSCONFDIR=#{Shellwords.escape(sysconfdir.dump)}")
+end
 
 have_func("sysconf")
 have_func("confstr")
@@ -39,6 +41,14 @@ 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')
 
+# for https://github.com/ruby/etc
+srcdir = File.expand_path("..", __FILE__)
+if !File.exist?("#{srcdir}/depend")
+  %x[#{RbConfig.ruby} #{srcdir}/mkconstants.rb -o #{srcdir}/constdefs.h]
+end
+
+have_func('rb_deprecate_constant(Qnil, "None")')
+
 $distcleanfiles << "constdefs.h"
 
 create_makefile("etc")
diff --git a/ext/etc/mkconstants.rb b/ext/etc/mkconstants.rb
index 0c4d17e6f9..a752d64519 100644
--- a/ext/etc/mkconstants.rb
+++ b/ext/etc/mkconstants.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'optparse'
 require 'erb'
 
@@ -66,7 +66,15 @@ def each_name(pat)
   }
 end
 
-ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_const_decls")
+erb_new = lambda do |src, safe, trim|
+  if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+
+    ERB.new(src, trim_mode: trim)
+  else
+    ERB.new(src, safe, trim)
+  end
+end
+
+erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_const_decls")
 % each_const {|name, default_value|
 #if !defined(<%=name%>)
 # if defined(HAVE_CONST_<%=name.upcase%>)
@@ -80,7 +88,7 @@ ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_const_decls")
 % }
 EOS
 
-ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_const_defs")
+erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_const_defs")
 % each_const {|name, default_value|
 #if defined(<%=name%>)
 %   if comment = COMMENTS[name]
@@ -91,13 +99,13 @@ ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_const_defs")
 % }
 EOS
 
-header_result = ERB.new(<<'EOS', nil, '%').result(binding)
+header_result = erb_new.call(<<'EOS', nil, '%').result(binding)
 /* autogenerated file */
 
 <%= gen_const_decls %>
 EOS
 
-result = ERB.new(<<'EOS', nil, '%').result(binding)
+result = erb_new.call(<<'EOS', nil, '%').result(binding)
 /* autogenerated file */
 
 #ifdef HAVE_LONG_LONG
diff --git a/ext/extmk.rb b/ext/extmk.rb
index 3fe1115273..97f1ad9c39 100755
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -6,27 +6,22 @@
 $extension = nil
 $extstatic = nil
 $force_static = nil
-$install = nil
 $destdir = nil
 $dryrun = false
-$clean = nil
 $nodynamic = nil
-$extinit = nil
 $extobjs = []
 $extflags = ""
 $extlibs = nil
 $extpath = nil
-$ignore = nil
 $message = nil
 $command_output = nil
-$configure_only = false
+$subconfigure = false
 
 $progname = $0
 alias $PROGRAM_NAME $0
 alias $0 $progname
 
 $extlist = []
-$compiled = {}
 
 DUMMY_SIGNATURE = "***DUMMY MAKEFILE***"
 
@@ -50,10 +45,6 @@ elsif !File.chardev?(@null = "/dev/null")
   @null = "nul"
 end
 
-def sysquote(x)
-  @quote ? x.quote : x
-end
-
 def verbose?
   $mflags.defined?("V") == "1"
 end
@@ -85,6 +76,7 @@ def extract_makefile(makefile, keep = true)
   m = File.read(makefile)
   s = m[/^CLEANFILES[ \t]*=[ \t](.*)/, 1] and $cleanfiles = s.split
   s = m[/^DISTCLEANFILES[ \t]*=[ \t](.*)/, 1] and $distcleanfiles = s.split
+  s = m[/^EXTSO[ \t]*=[ \t](.*)/, 1] and $extso = s.split
   if !(target = m[/^TARGET[ \t]*=[ \t]*(\S*)/, 1])
     return keep
   end
@@ -110,7 +102,7 @@ def extract_makefile(makefile, keep = true)
   srcs = Dir[File.join($srcdir, "*.{#{SRC_EXT.join(%q{,})}}")].map {|fn| File.basename(fn)}.sort
   if !srcs.empty?
     old_srcs = m[/^ORIG_SRCS[ \t]*=[ \t](.*)/, 1] or return false
-    old_srcs.split.sort == srcs or return false
+    (old_srcs.split - srcs).empty? or return false
   end
   $target = target
   $extconf_h = m[/^RUBY_EXTCONF_H[ \t]*=[ \t]*(\S+)/, 1]
@@ -129,24 +121,20 @@ def extract_makefile(makefile, keep = true)
   end
   $objs = (m[/^OBJS[ \t]*=[ \t](.*)/, 1] || "").split
   $srcs = (m[/^SRCS[ \t]*=[ \t](.*)/, 1] || "").split
+  $headers = (m[/^LOCAL_HDRS[ \t]*=[ \t](.*)/, 1] || "").split
   $LOCAL_LIBS = m[/^LOCAL_LIBS[ \t]*=[ \t]*(.*)/, 1] || ""
   $LIBPATH = Shellwords.shellwords(m[/^libpath[ \t]*=[ \t]*(.*)/, 1] || "") - %w[$(libdir) $(topdir)]
   true
 end
 
-def extmake(target)
-  unless $configure_only || verbose?
-    print "#{$message} #{target}\n"
-    $stdout.flush
-  end
-
+def extmake(target, basedir = 'ext', maybestatic = true)
   FileUtils.mkpath target unless File.directory?(target)
   begin
     # don't build if parent library isn't build
     parent = true
     d = target
     until (d = File.dirname(d)) == '.'
-      if File.exist?("#{$top_srcdir}/ext/#{d}/extconf.rb")
+      if File.exist?("#{$top_srcdir}/#{basedir}/#{d}/extconf.rb")
         parent = (/^all:\s*install/ =~ IO.read("#{d}/Makefile") rescue false)
         break
       end
@@ -164,16 +152,16 @@ def extmake(target)
     $topdir = prefix + $topdir
     $target = target
     $mdir = target
-    $srcdir = File.join($top_srcdir, "ext", $mdir)
+    $srcdir = File.join($top_srcdir, basedir, $mdir)
     $preload = nil
     $objs = []
     $srcs = []
-    $compiled[target] = false
+    $extso = []
     makefile = "./Makefile"
     static = $static
     $static = nil if noinstall = File.fnmatch?("-*", target)
     ok = parent && File.exist?(makefile)
-    if parent && !$ignore
+    if parent
       rbconfig0 = RbConfig::CONFIG
       mkconfig0 = CONFIG
       rbconfig = {
@@ -183,7 +171,7 @@ def extmake(target)
       }
       mkconfig = {
 	"hdrdir" => ($hdrdir == top_srcdir) ? top_srcdir : "$(top_srcdir)/include",
-	"srcdir" => "$(top_srcdir)/ext/#{$mdir}",
+	"srcdir" => "$(top_srcdir)/#{basedir}/#{$mdir}",
 	"topdir" => $topdir,
       }
       rbconfig0.each_pair {|key, val| rbconfig[key] ||= val.dup}
@@ -209,14 +197,12 @@ def extmake(target)
 	    [conf, "#{$srcdir}/depend"].any? {|f| modified?(f, [t])})
         then
 	  ok = false
-          if $configure_only
-            if verbose?
-              print "#{conf}\n" if conf
-            else
-              print "#{$message} #{target}\n"
-            end
-            $stdout.flush
+          if verbose?
+            print "#{conf}\n" if conf
+          else
+            print "#{$message} #{target}\n"
           end
+          $stdout.flush
           init_mkmf
 	  Logging::logfile 'mkmf.log'
 	  rm_f makefile
@@ -236,7 +222,6 @@ def extmake(target)
       rescue SystemExit
 	# ignore
       rescue => error
-        lineno = error.backtrace_locations[0].lineno
         ok = false
       ensure
 	rm_f "conftest*"
@@ -244,48 +229,35 @@ def extmake(target)
       end
     end
     ok &&= File.open(makefile){|f| s = f.gets and !s[DUMMY_SIGNATURE]}
-    ok = yield(ok) if block_given?
     unless ok
+      mf = ["# #{DUMMY_SIGNATURE}\n", *dummy_makefile(CONFIG["srcdir"])].join("")
       atomic_write_open(makefile) do |f|
-        f.puts "# " + DUMMY_SIGNATURE
-	f.print(*dummy_makefile(CONFIG["srcdir"]))
+        f.print(mf)
       end
 
       return true if !error and target.start_with?("-")
 
-      if parent
-        message = "Failed to configure #{target}. It will not be installed."
-      else
-        message = "Skipped to configure #{target}. Its parent is not configured."
-      end
-      if Logging.log_opened?
-        Logging::message(error.to_s) if error
-        Logging::message(message)
+      message = nil
+      if error
+        loc = error.backtrace_locations[0]
+        message = "#{loc.absolute_path}:#{loc.lineno}: #{error.message}"
+        if Logging.log_opened?
+          Logging::message("#{message}\n\t#{error.backtrace.join("\n\t")}\n")
+        end
       end
-      message = error.message if error
 
-      return parent ? [conf, lineno||0, message] : true
+      return [parent, message]
     end
-    args = sysquote($mflags)
+    args = $mflags
     unless $destdir.to_s.empty? or $mflags.defined?("DESTDIR")
-      args += [sysquote("DESTDIR=" + relative_from($destdir, "../"+prefix))]
+      args += ["DESTDIR=" + relative_from($destdir, "../"+prefix)]
     end
     if $static and ok and !$objs.empty? and !noinstall
-      args += ["static"] unless $clean
-      $extlist.push [$static, target, $target, $preload]
+      args += ["static"]
+      $extlist.push [(maybestatic ? $static : false), target, $target, $preload]
     end
     FileUtils.rm_f(old_cleanfiles - $distcleanfiles - $cleanfiles)
     FileUtils.rm_f(old_objs - $objs)
-    unless $configure_only or system($make, *args)
-      $ignore or $continue or return false
-    end
-    $compiled[target] = true
-    if $clean
-      FileUtils.rm_f("mkmf.log")
-      if $clean != true
-	FileUtils.rm_f([makefile, $extconf_h || "extconf.h"])
-      end
-    end
     if $static
       $extflags ||= ""
       $extlibs ||= []
@@ -327,10 +299,6 @@ def extmake(target)
   true
 end
 
-def compiled?(target)
-  $compiled[target]
-end
-
 def parse_args()
   $mflags = []
   $makeflags = [] # for make command to build ruby, so quoted
@@ -385,6 +353,7 @@ def parse_args()
     $optparser.warn(e)
     abort $optparser.to_s
   end
+  $command_output or abort "--command-output option is mandatory"
 
   $destdir ||= ''
 
@@ -420,18 +389,10 @@ parse_args()
 if target = ARGV.shift and /^[a-z-]+$/ =~ target
   $mflags.push(target)
   case target
-  when /^(dist|real)?(clean)$/
-    target = $2
-    $ignore ||= true
-    $clean = $1 ? $1[0] : true
-  when /^install\b/
-    $install = true
-    $ignore ||= true
-    $mflags.unshift("INSTALL_PROG=install -c -p -m 0755",
-                    "INSTALL_DATA=install -c -p -m 0644",
-                    "MAKEDIRS=mkdir -p") if $dryrun
+  when /^(dist|real)?(clean)$/, /^install\b/
+    abort "#{target} is obsolete"
   when /configure/
-    $configure_only = true
+    $subconfigure = !ARGV.empty?
   end
 end
 unless $message
@@ -447,16 +408,22 @@ if CROSS_COMPILING
   $ruby = $mflags.defined?("MINIRUBY") || CONFIG['MINIRUBY']
 elsif sep = config_string('BUILD_FILE_SEPARATOR')
   $ruby = "$(topdir:/=#{sep})#{sep}miniruby" + EXEEXT
-else
+elsif CONFIG['EXTSTATIC']
   $ruby = '$(topdir)/miniruby' + EXEEXT
+else
+  $ruby = '$(topdir)/ruby' + EXEEXT
 end
-$ruby << " -I'$(topdir)'"
+$ruby = [$ruby]
+$ruby << "-I'$(topdir)'"
 unless CROSS_COMPILING
-  $ruby << " -I'$(top_srcdir)/lib'"
-  $ruby << " -I'$(extout)/$(arch)' -I'$(extout)/common'" if $extout
+  $ruby << "-I'$(top_srcdir)/lib'"
+  $ruby << "-I'$(extout)/$(arch)'" << "-I'$(extout)/common'" if $extout
   ENV["RUBYLIB"] = "-"
 end
+topruby = $ruby
+$ruby = topruby.join(' ')
 $mflags << "ruby=#$ruby"
+$builtruby = '$(topdir)/miniruby' + EXEEXT # Must be an executable path
 
 MTIMES = [__FILE__, 'rbconfig.rb', srcdir+'/lib/mkmf.rb'].collect {|f| File.mtime(f)}
 
@@ -495,7 +462,17 @@ for dir in ["ext", File::join($top_srcdir, "ext")]
   end
 end unless $extstatic
 
-ext_prefix = "#{$top_srcdir}/ext"
+@gemname = nil
+if ARGV[0]
+  ext_prefix, exts = ARGV.shift.split('/', 2)
+  $extension = [exts] if exts
+  if ext_prefix == 'gems'
+    @gemname = exts
+  elsif exts
+    $static_ext.delete_if {|t, *| !File.fnmatch(t, exts)}
+  end
+end
+ext_prefix = "#{$top_srcdir}/#{ext_prefix || 'ext'}"
 exts = $static_ext.sort_by {|t, i| i}.collect {|t, i| t}
 default_exclude_exts =
   case
@@ -506,6 +483,7 @@ default_exclude_exts =
   else
     %w'*win32*'
   end
+mandatory_exts = {}
 withes, withouts = [["--with", nil], ["--without", default_exclude_exts]].collect {|w, d|
   if !(w = %w[-extensions -ext].collect {|o|arg_config(w+o)}).any?
     d ? proc {|c1| d.any?(&c1)} : proc {true}
@@ -513,48 +491,90 @@ withes, withouts = [["--with", nil], ["--without", default_exclude_exts]].collec
     proc {true}
   else
     w = w.collect {|o| o.split(/,/)}.flatten
-    w.collect! {|o| o == '+' ? d : o}.flatten! if d
+    w.collect! {|o| o == '+' ? d : o}.flatten!
     proc {|c1| w.any?(&c1)}
   end
 }
 cond = proc {|ext, *|
-  cond1 = proc {|n| File.fnmatch(n, ext)}
-  withes.call(cond1) and !withouts.call(cond1)
+  withes.call(proc {|n|
+                !n or (mandatory_exts[ext] = true if File.fnmatch(n, ext))
+              }) and
+    !withouts.call(proc {|n| File.fnmatch(n, ext)})
 }
 ($extension || %w[*]).each do |e|
   e = e.sub(/\A(?:\.\/)+/, '')
-  exts |= Dir.glob("#{ext_prefix}/#{e}/**/extconf.rb").collect {|d|
+  incl, excl = Dir.glob("#{ext_prefix}/#{e}/**/extconf.rb").collect {|d|
     d = File.dirname(d)
     d.slice!(0, ext_prefix.length + 1)
     d
-  }.find_all {|ext|
+  }.partition {|ext|
     with_config(ext, &cond)
-  }.sort
+  }
+  incl.sort!
+  excl.sort!.collect! {|d| d+"/"}
+  nil while incl.reject! {|d| excl << d+"/" if excl.any? {|x| d.start_with?(x)}}
+  exts |= incl
   if $LIBRUBYARG_SHARED.empty? and CONFIG["EXTSTATIC"] == "static"
     exts.delete_if {|d| File.fnmatch?("-*", d)}
   end
 end
+ext_prefix = File.basename(ext_prefix)
 
-if $extout
-  extout = RbConfig.expand("#{$extout}", RbConfig::CONFIG.merge("topdir"=>$topdir))
-  unless $ignore
-    FileUtils.mkpath(extout)
+extend Module.new {
+  def timestamp_file(name, target_prefix = nil)
+    if @gemname and name == '$(TARGET_SO_DIR)'
+      name = "$(arch)/gems/#{@gemname}#{target_prefix}"
+    end
+    super.sub(%r[/\.extout\.(?:-\.)?], '/.')
   end
-end
+
+  def configuration(srcdir)
+    super << "EXTSO #{['=', $extso].join(' ')}\n"
+  end
+
+  def create_makefile(*args, &block)
+    return super unless @gemname
+    super(*args) do |conf|
+      conf.find do |s|
+        s.sub!(/^(TARGET_SO_DIR *= *)\$\(RUBYARCHDIR\)/) {
+          "TARGET_GEM_DIR = $(extout)/gems/$(arch)/#{@gemname}\n"\
+          "#{$1}$(TARGET_GEM_DIR)$(target_prefix)"
+        }
+      end
+      conf.any? {|s| /^TARGET *= *\S/ =~ s} and conf << %{
+
+# default target
+all:
+
+build_complete = $(TARGET_GEM_DIR)/gem.build_complete
+install-so: build_complete
+build_complete: $(build_complete)
+$(build_complete): $(TARGET_SO)
+	$(Q) $(TOUCH) $@
+
+clean-so::
+	-$(Q)$(RM) $(build_complete)
+}
+      conf
+    end
+  end
+}
 
 dir = Dir.pwd
-FileUtils::makedirs('ext')
-Dir::chdir('ext')
+FileUtils::makedirs(ext_prefix)
+Dir::chdir(ext_prefix)
 
 hdrdir = $hdrdir
 $hdrdir = ($top_srcdir = relative_from(srcdir, $topdir = "..")) + "/include"
+extso = []
 fails = []
 exts.each do |d|
   $static = $force_static ? true : $static_ext[d]
 
-  if $ignore or !$nodynamic or $static
-    result = extmake(d) or abort
-    fails << result unless result == true
+  if !$nodynamic or $static
+    result = extmake(d, ext_prefix, !@gemname) or abort
+    extso |= $extso
+    fails << [d, result] unless result == true
   end
 end
 
@@ -567,36 +587,18 @@ extinit = Struct.new(:c, :o) {
     super("#{src}.c", "#{src}.#{$OBJEXT}")
   end
 }.new("extinit")
-if $ignore
-  FileUtils.rm_f(extinit.to_a) if $clean
-  Dir.chdir ".."
-  if $clean
-    Dir.rmdir('ext') rescue nil
-    if $extout
-      FileUtils.rm_rf([extout+"/common", extout+"/include/ruby", extout+"/rdoc"])
-      FileUtils.rm_rf(extout+"/"+CONFIG["arch"])
-      if $clean != true
-	FileUtils.rm_rf(extout+"/include/"+CONFIG["arch"])
-	FileUtils.rm_f($mflags.defined?("INSTALLED_LIST")||ENV["INSTALLED_LIST"]||".installed.list")
-	Dir.rmdir(extout+"/include") rescue nil
-	Dir.rmdir(extout) rescue nil
-      end
-    end
-  end
-  exit
-end
 
-$extinit ||= ""
 $extobjs ||= []
 $extpath ||= []
 $extflags ||= ""
 $extlibs ||= []
+extinits = []
 unless $extlist.empty?
-  $extinit << "\n" unless $extinit.empty?
   list = $extlist.dup
   built = []
   while e = list.shift
-    _, target, feature, required = e
+    static, target, feature, required = e
+    next unless static
     if required and !(required -= built).empty?
       l = list.size
       if (while l > 0; break true if required.include?(list[l-=1][1]) end)
@@ -605,27 +607,11 @@ unless $extlist.empty?
       next
     end
     base = File.basename(feature)
-    $extinit << "    init(Init_#{base}, \"#{feature}.so\");\n"
+    extinits << feature
     $extobjs << format("ext/%s/%s.%s", target, base, $LIBEXT)
     built << target
   end
 
-  src = %{\
-#include "ruby/ruby.h"
-
-#define init(func, name) {	\\
-    extern 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}
-  end
-
   $extpath.delete("$(topdir)")
   $extflags = libpathflag($extpath) << " " << $extflags.strip
   conf = [
@@ -635,7 +621,7 @@ void Init_ext(void)\n{\n#$extinit}
   ].map {|n, v|
     "#{n}=#{v}" if v &&= v[/\S(?:.*\S)?/]
   }.compact
-  puts(*conf)
+  puts(*conf) unless $subconfigure
   $stdout.flush
   $mflags.concat(conf)
   $makeflags.concat(conf)
@@ -657,22 +643,11 @@ unless $destdir.to_s.empty?
 end
 $makeflags.uniq!
 
-if $nmake == ?b
-  unless (vars = $mflags.grep(/\A\w+=/n)).empty?
-    open(mkf = "libruby.mk", "wb") do |tmf|
-      tmf.puts("!include Makefile")
-      tmf.puts
-      tmf.puts(*vars.map {|v| v.sub(/\=/, " = ")})
-      tmf.puts("PRE_LIBRUBY_UPDATE = del #{mkf}")
-    end
-    $mflags.unshift("-f#{mkf}")
-    vars.each {|flag| flag.sub!(/\A/, "-D")}
-  end
-end
 $mflags.unshift("topdir=#$topdir")
 ENV.delete("RUBYOPT")
-if $configure_only and $command_output
-  exts.map! {|d| "ext/#{d}/."}
+exts.map! {|d| "#{ext_prefix}/#{d}/."}
+FileUtils.makedirs(File.dirname($command_output))
+begin
   atomic_write_open($command_output) do |mf|
     mf.puts "V = 0"
     mf.puts "Q1 = $(V:1=)"
@@ -697,10 +672,14 @@ if $configure_only and $command_output
       puts
     end
 
+    mf.macro "ruby", topruby
+    mf.macro "RUBY", ["$(ruby)"]
     mf.macro "extensions", exts
     mf.macro "EXTOBJS", $extlist.empty? ? ["dmyext.#{$OBJEXT}"] : ["ext/extinit.#{$OBJEXT}", *$extobjs]
     mf.macro "EXTLIBS", $extlibs
+    mf.macro "EXTSO", extso
     mf.macro "EXTLDFLAGS", $extflags.split
+    mf.macro "EXTINITS", extinits
     submakeopts = []
     if enable_config("shared", $enable_shared)
       submakeopts << 'DLDOBJS="$(EXTOBJS) $(EXTENCS)"'
@@ -712,9 +691,12 @@ if $configure_only and $command_output
       submakeopts << 'EXTLIBS="$(EXTLIBS)"'
     end
     submakeopts << 'EXTLDFLAGS="$(EXTLDFLAGS)"'
+    submakeopts << 'EXTINITS="$(EXTINITS)"'
     submakeopts << 'UPDATE_LIBRARIES="$(UPDATE_LIBRARIES)"'
     submakeopts << 'SHOWFLAGS='
     mf.macro "SUBMAKEOPTS", submakeopts
+    mf.macro "NOTE_MESG", %w[$(RUBY) $(top_srcdir)/tool/lib/colorize.rb skip]
+    mf.macro "NOTE_NAME", %w[$(RUBY) $(top_srcdir)/tool/lib/colorize.rb fail]
     mf.puts
     targets = %w[all install static install-so install-rb clean distclean realclean]
     targets.each do |tgt|
@@ -736,7 +718,7 @@ if $configure_only and $command_output
       mf.puts "#{tgt}:\n\t#{submake} $@"
     end
     mf.puts "libencs:\n\t$(Q)$(MAKE) -f enc.mk V=$(V) $@"
-    mf.puts "ext/extinit.#{$OBJEXT}:\n\t$(Q)$(MAKE) $(MFLAGS) V=$(V) $@" if $static
+    mf.puts "ext/extinit.#{$OBJEXT}:\n\t$(Q)$(MAKE) $(MFLAGS) V=$(V) EXTINITS=\"$(EXTINITS)\" $@" if $static
     mf.puts
     if $gnumake == "yes"
       submake = "$(MAKE) -C $(@D)"
@@ -747,48 +729,49 @@ if $configure_only and $command_output
     end
     targets.each do |tgt|
       exts.each do |d|
-        mf.puts "#{d[0..-2]}#{tgt}:\n\t$(Q)#{submake} $(MFLAGS) V=$(V) $(@F)"
+        d = d[0..-2]
+        t = "#{d}#{tgt}"
+        if  /^(dist|real)?clean$/ =~ tgt
+          deps = exts.select {|e|e.start_with?(d)}.map {|e|"#{e[0..-2]}#{tgt}"} - [t]
+          pd = ' ' + deps.join(' ') unless deps.empty?
+        else
+          pext = File.dirname(d)
+          pd = " #{pext}/#{tgt}" if exts.include?("#{pext}/.")
+        end
+        mf.puts "#{t}:#{pd}\n\t$(Q)#{submake} $(MFLAGS) V=$(V) $(@F)"
       end
     end
+    mf.puts "\n""extso:\n"
+    mf.puts "\t@echo EXTSO=$(EXTSO)"
+
     mf.puts "\n""note:\n"
     unless fails.empty?
-      mf.puts %Q<\t@echo "*** Following extensions failed to configure:">
-      fails.each do |d, n, e|
-        d = "#{d}:#{n}:"
-        if e
-          d << " " << e
+      abandon = false
+      mf.puts "note: note-body\n"
+      mf.puts "note-body:: note-header\n"
+      mf.puts "note-header:\n"
+      mf.puts %Q<\t@$(NOTE_MESG) "*** Following extensions are not compiled:">
+      mf.puts "note-body:: note-header\n"
+      fails.each do |ext, (parent, err)|
+        abandon ||= mandatory_exts[ext]
+        mf.puts %Q<\t@$(NOTE_NAME) "#{ext}:">
+        if parent
+          mf.puts %Q<\t@echo "\tCould not be configured. It will not be installed.">
+          err and err.scan(/.+/) do |ee|
+            mf.puts %Q<\t@echo "\t#{ee.gsub(/["`$^]/, '\\\\\\&')}">
+          end
+          mf.puts %Q<\t@echo "\tCheck #{ext_prefix}/#{ext}/mkmf.log for more details.">
+        else
+          mf.puts %Q<\t@echo "\tSkipped because its parent was not configured.">
         end
-        mf.puts %Q<\t@echo "#{d}">
       end
-      mf.puts %Q<\t@echo "*** Fix the problems, then remove these directories and try again if you want.">
-    end
-
-  end
-elsif $command_output
-  message = "making #{rubies.join(', ')}"
-  message = "echo #{message}"
-  $mflags.concat(rubies)
-  $makeflags.concat(rubies)
-  cmd = $makeflags.map {|ss|ss.sub(/.*[$(){};\s].*/, %q['\&'])}.join(' ')
-  open($command_output, 'wb') do |ff|
-    case $command_output
-    when /\.sh\z/
-      ff.puts message, "rm -f \"$0\"; exec \"$@\" #{cmd}"
-    when /\.bat\z/
-      ["@echo off", message, "%* #{cmd}", "del %0 & exit %ERRORLEVEL%"].each do |ss|
-        ff.print ss, "\r\n"
+      mf.puts "note:\n"
+      mf.puts %Q<\t@$(NOTE_MESG) "*** Fix the problems, then remove these directories and try again if you want.">
+      if abandon
+        mf.puts "\t""@exit 1"
       end
-    else
-      ff.puts cmd
     end
-    ff.chmod(0755)
   end
-elsif !$configure_only
-  message = "making #{rubies.join(', ')}"
-  puts message
-  $stdout.flush
-  $mflags.concat(rubies)
-  system($make, *sysquote($mflags)) or exit($?.exitstatus)
 end
 # :startdoc:
 
diff --git a/ext/fcntl/depend b/ext/fcntl/depend
new file mode 100644
index 0000000000..cdaa3aa582
--- /dev/null
+++ b/ext/fcntl/depend
@@ -0,0 +1,163 @@
+# AUTOGENERATED DEPENDENCIES START
+fcntl.o: $(RUBY_EXTCONF_H)
+fcntl.o: $(arch_hdrdir)/ruby/config.h
+fcntl.o: $(hdrdir)/ruby.h
+fcntl.o: $(hdrdir)/ruby/internal/anyargs.h
+fcntl.o: $(hdrdir)/ruby/internal/arithmetic.h
+fcntl.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+fcntl.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+fcntl.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+fcntl.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+fcntl.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+fcntl.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+fcntl.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+fcntl.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+fcntl.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+fcntl.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+fcntl.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+fcntl.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+fcntl.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+fcntl.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+fcntl.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+fcntl.o: $(hdrdir)/ruby/internal/assume.h
+fcntl.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+fcntl.o: $(hdrdir)/ruby/internal/attr/artificial.h
+fcntl.o: $(hdrdir)/ruby/internal/attr/cold.h
+fcntl.o: $(hdrdir)/ruby/internal/attr/const.h
+fcntl.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+fcntl.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+fcntl.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+fcntl.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+fcntl.o: $(hdrdir)/ruby/internal/attr/error.h
+fcntl.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+fcntl.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+fcntl.o: $(hdrdir)/ruby/internal/attr/format.h
+fcntl.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+fcntl.o: $(hdrdir)/ruby/internal/attr/noalias.h
+fcntl.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+fcntl.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+fcntl.o: $(hdrdir)/ruby/internal/attr/noinline.h
+fcntl.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+fcntl.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+fcntl.o: $(hdrdir)/ruby/internal/attr/pure.h
+fcntl.o: $(hdrdir)/ruby/internal/attr/restrict.h
+fcntl.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+fcntl.o: $(hdrdir)/ruby/internal/attr/warning.h
+fcntl.o: $(hdrdir)/ruby/internal/attr/weakref.h
+fcntl.o: $(hdrdir)/ruby/internal/cast.h
+fcntl.o: $(hdrdir)/ruby/internal/compiler_is.h
+fcntl.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+fcntl.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+fcntl.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+fcntl.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+fcntl.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+fcntl.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+fcntl.o: $(hdrdir)/ruby/internal/compiler_since.h
+fcntl.o: $(hdrdir)/ruby/internal/config.h
+fcntl.o: $(hdrdir)/ruby/internal/constant_p.h
+fcntl.o: $(hdrdir)/ruby/internal/core.h
+fcntl.o: $(hdrdir)/ruby/internal/core/rarray.h
+fcntl.o: $(hdrdir)/ruby/internal/core/rbasic.h
+fcntl.o: $(hdrdir)/ruby/internal/core/rbignum.h
+fcntl.o: $(hdrdir)/ruby/internal/core/rclass.h
+fcntl.o: $(hdrdir)/ruby/internal/core/rdata.h
+fcntl.o: $(hdrdir)/ruby/internal/core/rfile.h
+fcntl.o: $(hdrdir)/ruby/internal/core/rhash.h
+fcntl.o: $(hdrdir)/ruby/internal/core/robject.h
+fcntl.o: $(hdrdir)/ruby/internal/core/rregexp.h
+fcntl.o: $(hdrdir)/ruby/internal/core/rstring.h
+fcntl.o: $(hdrdir)/ruby/internal/core/rstruct.h
+fcntl.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+fcntl.o: $(hdrdir)/ruby/internal/ctype.h
+fcntl.o: $(hdrdir)/ruby/internal/dllexport.h
+fcntl.o: $(hdrdir)/ruby/internal/dosish.h
+fcntl.o: $(hdrdir)/ruby/internal/error.h
+fcntl.o: $(hdrdir)/ruby/internal/eval.h
+fcntl.o: $(hdrdir)/ruby/internal/event.h
+fcntl.o: $(hdrdir)/ruby/internal/fl_type.h
+fcntl.o: $(hdrdir)/ruby/internal/gc.h
+fcntl.o: $(hdrdir)/ruby/internal/glob.h
+fcntl.o: $(hdrdir)/ruby/internal/globals.h
+fcntl.o: $(hdrdir)/ruby/internal/has/attribute.h
+fcntl.o: $(hdrdir)/ruby/internal/has/builtin.h
+fcntl.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+fcntl.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+fcntl.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+fcntl.o: $(hdrdir)/ruby/internal/has/extension.h
+fcntl.o: $(hdrdir)/ruby/internal/has/feature.h
+fcntl.o: $(hdrdir)/ruby/internal/has/warning.h
+fcntl.o: $(hdrdir)/ruby/internal/intern/array.h
+fcntl.o: $(hdrdir)/ruby/internal/intern/bignum.h
+fcntl.o: $(hdrdir)/ruby/internal/intern/class.h
+fcntl.o: $(hdrdir)/ruby/internal/intern/compar.h
+fcntl.o: $(hdrdir)/ruby/internal/intern/complex.h
+fcntl.o: $(hdrdir)/ruby/internal/intern/cont.h
+fcntl.o: $(hdrdir)/ruby/internal/intern/dir.h
+fcntl.o: $(hdrdir)/ruby/internal/intern/enum.h
+fcntl.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+fcntl.o: $(hdrdir)/ruby/internal/intern/error.h
+fcntl.o: $(hdrdir)/ruby/internal/intern/eval.h
+fcntl.o: $(hdrdir)/ruby/internal/intern/file.h
+fcntl.o: $(hdrdir)/ruby/internal/intern/gc.h
+fcntl.o: $(hdrdir)/ruby/internal/intern/hash.h
+fcntl.o: $(hdrdir)/ruby/internal/intern/io.h
+fcntl.o: $(hdrdir)/ruby/internal/intern/load.h
+fcntl.o: $(hdrdir)/ruby/internal/intern/marshal.h
+fcntl.o: $(hdrdir)/ruby/internal/intern/numeric.h
+fcntl.o: $(hdrdir)/ruby/internal/intern/object.h
+fcntl.o: $(hdrdir)/ruby/internal/intern/parse.h
+fcntl.o: $(hdrdir)/ruby/internal/intern/proc.h
+fcntl.o: $(hdrdir)/ruby/internal/intern/process.h
+fcntl.o: $(hdrdir)/ruby/internal/intern/random.h
+fcntl.o: $(hdrdir)/ruby/internal/intern/range.h
+fcntl.o: $(hdrdir)/ruby/internal/intern/rational.h
+fcntl.o: $(hdrdir)/ruby/internal/intern/re.h
+fcntl.o: $(hdrdir)/ruby/internal/intern/ruby.h
+fcntl.o: $(hdrdir)/ruby/internal/intern/select.h
+fcntl.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+fcntl.o: $(hdrdir)/ruby/internal/intern/signal.h
+fcntl.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+fcntl.o: $(hdrdir)/ruby/internal/intern/string.h
+fcntl.o: $(hdrdir)/ruby/internal/intern/struct.h
+fcntl.o: $(hdrdir)/ruby/internal/intern/thread.h
+fcntl.o: $(hdrdir)/ruby/internal/intern/time.h
+fcntl.o: $(hdrdir)/ruby/internal/intern/variable.h
+fcntl.o: $(hdrdir)/ruby/internal/intern/vm.h
+fcntl.o: $(hdrdir)/ruby/internal/interpreter.h
+fcntl.o: $(hdrdir)/ruby/internal/iterator.h
+fcntl.o: $(hdrdir)/ruby/internal/memory.h
+fcntl.o: $(hdrdir)/ruby/internal/method.h
+fcntl.o: $(hdrdir)/ruby/internal/module.h
+fcntl.o: $(hdrdir)/ruby/internal/newobj.h
+fcntl.o: $(hdrdir)/ruby/internal/rgengc.h
+fcntl.o: $(hdrdir)/ruby/internal/scan_args.h
+fcntl.o: $(hdrdir)/ruby/internal/special_consts.h
+fcntl.o: $(hdrdir)/ruby/internal/static_assert.h
+fcntl.o: $(hdrdir)/ruby/internal/stdalign.h
+fcntl.o: $(hdrdir)/ruby/internal/stdbool.h
+fcntl.o: $(hdrdir)/ruby/internal/symbol.h
+fcntl.o: $(hdrdir)/ruby/internal/token_paste.h
+fcntl.o: $(hdrdir)/ruby/internal/value.h
+fcntl.o: $(hdrdir)/ruby/internal/value_type.h
+fcntl.o: $(hdrdir)/ruby/internal/variable.h
+fcntl.o: $(hdrdir)/ruby/internal/warning_push.h
+fcntl.o: $(hdrdir)/ruby/internal/xmalloc.h
+fcntl.o: $(hdrdir)/ruby/assert.h
+fcntl.o: $(hdrdir)/ruby/backward.h
+fcntl.o: $(hdrdir)/ruby/backward/2/assume.h
+fcntl.o: $(hdrdir)/ruby/backward/2/attributes.h
+fcntl.o: $(hdrdir)/ruby/backward/2/bool.h
+fcntl.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+fcntl.o: $(hdrdir)/ruby/backward/2/inttypes.h
+fcntl.o: $(hdrdir)/ruby/backward/2/limits.h
+fcntl.o: $(hdrdir)/ruby/backward/2/long_long.h
+fcntl.o: $(hdrdir)/ruby/backward/2/stdalign.h
+fcntl.o: $(hdrdir)/ruby/backward/2/stdarg.h
+fcntl.o: $(hdrdir)/ruby/defines.h
+fcntl.o: $(hdrdir)/ruby/intern.h
+fcntl.o: $(hdrdir)/ruby/missing.h
+fcntl.o: $(hdrdir)/ruby/ruby.h
+fcntl.o: $(hdrdir)/ruby/st.h
+fcntl.o: $(hdrdir)/ruby/subst.h
+fcntl.o: fcntl.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/fcntl/extconf.rb b/ext/fcntl/extconf.rb
index 35371ebe18..6998f77483 100644
--- a/ext/fcntl/extconf.rb
+++ b/ext/fcntl/extconf.rb
@@ -1,3 +1,3 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'mkmf'
 create_makefile('fcntl')
diff --git a/ext/fcntl/fcntl.c b/ext/fcntl/fcntl.c
index 62780b78c0..ee42d2abe5 100644
--- a/ext/fcntl/fcntl.c
+++ b/ext/fcntl/fcntl.c
@@ -68,7 +68,7 @@ Init_fcntl(void)
 #ifdef F_DUPFD
     /* Document-const: F_DUPFD
      *
-     * Duplicate a file descriptor to the mimimum unused file descriptor
+     * Duplicate a file descriptor to the minimum unused file descriptor
      * greater than or equal to the argument.
      *
      * The close-on-exec flag of the duplicated file descriptor is set.
@@ -159,6 +159,20 @@ Init_fcntl(void)
      */
     rb_define_const(mFcntl, "F_WRLCK", INT2NUM(F_WRLCK));
 #endif
+#ifdef F_SETPIPE_SZ
+    /* Document-const: F_SETPIPE_SZ
+     *
+     * Change the capacity of the pipe referred to by fd to be at least arg bytes.
+     */
+    rb_define_const(mFcntl, "F_SETPIPE_SZ", INT2NUM(F_SETPIPE_SZ));
+#endif
+#ifdef F_GETPIPE_SZ
+    /* Document-const: F_GETPIPE_SZ
+     *
+     * Return (as the function result) the capacity of the pipe referred to by fd.
+     */
+    rb_define_const(mFcntl, "F_GETPIPE_SZ", INT2NUM(F_GETPIPE_SZ));
+#endif
 #ifdef O_CREAT
     /* Document-const: O_CREAT
      *
diff --git a/ext/fcntl/fcntl.gemspec b/ext/fcntl/fcntl.gemspec
new file mode 100644
index 0000000000..048e101aa5
--- /dev/null
+++ b/ext/fcntl/fcntl.gemspec
@@ -0,0 +1,21 @@
+# coding: utf-8
+# frozen_string_literal: true
+
+Gem::Specification.new do |spec|
+  spec.name          = "fcntl"
+  spec.version       = "1.0.1"
+  spec.authors       = ["Yukihiro Matsumoto"]
+  spec.email         = ["matz@ruby-lang.org"]
+
+  spec.summary       = "Loads constants defined in the OS fcntl.h C header file"
+  spec.description   = "Loads constants defined in the OS fcntl.h C header file"
+  spec.homepage      = "https://github.com/ruby/fcntl"
+  spec.licenses      = ["Ruby", "BSD-2-Clause"]
+
+  spec.files         = ["ext/fcntl/extconf.rb", "ext/fcntl/fcntl.c"]
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+  spec.extensions    = "ext/fcntl/extconf.rb"
+  spec.required_ruby_version = ">= 2.3.0"
+end
diff --git a/ext/fiber/depend b/ext/fiber/depend
new file mode 100644
index 0000000000..675263b95c
--- /dev/null
+++ b/ext/fiber/depend
@@ -0,0 +1,3 @@
+# AUTOGENERATED DEPENDENCIES START
+fiber.o: fiber.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/fiddle/closure.c b/ext/fiddle/closure.c
index f19091b29b..3679e5c9ad 100644
--- a/ext/fiddle/closure.c
+++ b/ext/fiddle/closure.c
@@ -1,6 +1,7 @@
 #include <fiddle.h>
 #include <ruby/thread.h>
-#include "internal.h" /* rb_thread_has_gvl_p */
+
+int ruby_thread_has_gvl_p(void); /* from internal.h */
 
 VALUE cFiddleClosure;
 
@@ -12,11 +13,12 @@ typedef struct {
     ffi_type **argv;
 } fiddle_closure;
 
-#if defined(USE_FFI_CLOSURE_ALLOC)
-#elif defined(__OpenBSD__) || defined(__APPLE__) || defined(__linux__)
+#if defined(__OpenBSD__)
 # define USE_FFI_CLOSURE_ALLOC 0
-#elif defined(RUBY_LIBFFI_MODVERSION) && RUBY_LIBFFI_MODVERSION < 3000005 && \
-	(defined(__i386__) || defined(__x86_64__) || defined(_M_IX86) || defined(_M_AMD64))
+#endif
+
+#if defined(USE_FFI_CLOSURE_ALLOC)
+#elif !defined(HAVE_FFI_CLOSURE_ALLOC)
 # define USE_FFI_CLOSURE_ALLOC 0
 #else
 # define USE_FFI_CLOSURE_ALLOC 1
@@ -128,6 +130,10 @@ with_gvl_callback(void *ptr)
 	    rb_ary_push(params, ULL2NUM(*(unsigned LONG_LONG *)x->args[i]));
 	    break;
 #endif
+	  case TYPE_CONST_STRING:
+	    rb_ary_push(params,
+                        rb_str_new_cstr(*((const char **)(x->args[i]))));
+	    break;
 	  default:
 	    rb_raise(rb_eRuntimeError, "closure args: %d", type);
         }
@@ -173,6 +179,10 @@ with_gvl_callback(void *ptr)
 	*(unsigned LONG_LONG *)x->resp = NUM2ULL(ret);
 	break;
 #endif
+      case TYPE_CONST_STRING:
+        /* Dangerous. Callback must keep reference of the String. */
+        *((const char **)(x->resp)) = StringValueCStr(ret);
+        break;
       default:
 	rb_raise(rb_eRuntimeError, "closure retval: %d", type);
     }
@@ -219,6 +229,7 @@ initialize(int rbargc, VALUE argv[], VALUE self)
 {
     VALUE ret;
     VALUE args;
+    VALUE normalized_args;
     VALUE abi;
     fiddle_closure * cl;
     ffi_cif * cif;
@@ -237,21 +248,26 @@ initialize(int rbargc, VALUE argv[], VALUE self)
 
     cl->argv = (ffi_type **)xcalloc(argc + 1, sizeof(ffi_type *));
 
+    normalized_args = rb_ary_new_capa(argc);
     for (i = 0; i < argc; i++) {
-        int type = NUM2INT(RARRAY_AREF(args, i));
-        cl->argv[i] = INT2FFI_TYPE(type);
+        VALUE arg = rb_fiddle_type_ensure(RARRAY_AREF(args, i));
+        rb_ary_push(normalized_args, arg);
+        cl->argv[i] = rb_fiddle_int_to_ffi_type(NUM2INT(arg));
     }
     cl->argv[argc] = NULL;
 
+    ret = rb_fiddle_type_ensure(ret);
     rb_iv_set(self, "@ctype", ret);
-    rb_iv_set(self, "@args", args);
+    rb_iv_set(self, "@args", normalized_args);
 
     cif = &cl->cif;
     pcl = cl->pcl;
 
-    result = ffi_prep_cif(cif, NUM2INT(abi), argc,
-                INT2FFI_TYPE(NUM2INT(ret)),
-		cl->argv);
+    result = ffi_prep_cif(cif,
+                          NUM2INT(abi),
+                          argc,
+                          rb_fiddle_int_to_ffi_type(NUM2INT(ret)),
+                          cl->argv);
 
     if (FFI_OK != result)
 	rb_raise(rb_eRuntimeError, "error prepping CIF %d", result);
diff --git a/ext/fiddle/conversions.c b/ext/fiddle/conversions.c
index d40ddc1f38..6e0ce36378 100644
--- a/ext/fiddle/conversions.c
+++ b/ext/fiddle/conversions.c
@@ -1,7 +1,159 @@
 #include <fiddle.h>
 
+VALUE
+rb_fiddle_type_ensure(VALUE type)
+{
+    VALUE original_type = type;
+
+    if (!RB_SYMBOL_P(type)) {
+        VALUE type_string = rb_check_string_type(type);
+        if (!NIL_P(type_string)) {
+            type = rb_to_symbol(type_string);
+        }
+    }
+
+    if (RB_SYMBOL_P(type)) {
+        ID type_id = rb_sym2id(type);
+        ID void_id;
+        ID voidp_id;
+        ID char_id;
+        ID short_id;
+        ID int_id;
+        ID long_id;
+#ifdef TYPE_LONG_LONG
+        ID long_long_id;
+#endif
+#ifdef TYPE_INT8_T
+        ID int8_t_id;
+#endif
+#ifdef TYPE_INT16_T
+        ID int16_t_id;
+#endif
+#ifdef TYPE_INT32_T
+        ID int32_t_id;
+#endif
+#ifdef TYPE_INT64_T
+        ID int64_t_id;
+#endif
+        ID float_id;
+        ID double_id;
+        ID variadic_id;
+        ID const_string_id;
+        ID size_t_id;
+        ID ssize_t_id;
+        ID ptrdiff_t_id;
+        ID intptr_t_id;
+        ID uintptr_t_id;
+        RUBY_CONST_ID(void_id, "void");
+        RUBY_CONST_ID(voidp_id, "voidp");
+        RUBY_CONST_ID(char_id, "char");
+        RUBY_CONST_ID(short_id, "short");
+        RUBY_CONST_ID(int_id, "int");
+        RUBY_CONST_ID(long_id, "long");
+#ifdef TYPE_LONG_LONG
+        RUBY_CONST_ID(long_long_id, "long_long");
+#endif
+#ifdef TYPE_INT8_T
+        RUBY_CONST_ID(int8_t_id, "int8_t");
+#endif
+#ifdef TYPE_INT16_T
+        RUBY_CONST_ID(int16_t_id, "int16_t");
+#endif
+#ifdef TYPE_INT32_T
+        RUBY_CONST_ID(int32_t_id, "int32_t");
+#endif
+#ifdef TYPE_INT64_T
+        RUBY_CONST_ID(int64_t_id, "int64_t");
+#endif
+        RUBY_CONST_ID(float_id, "float");
+        RUBY_CONST_ID(double_id, "double");
+        RUBY_CONST_ID(variadic_id, "variadic");
+        RUBY_CONST_ID(const_string_id, "const_string");
+        RUBY_CONST_ID(size_t_id, "size_t");
+        RUBY_CONST_ID(ssize_t_id, "ssize_t");
+        RUBY_CONST_ID(ptrdiff_t_id, "ptrdiff_t");
+        RUBY_CONST_ID(intptr_t_id, "intptr_t");
+        RUBY_CONST_ID(uintptr_t_id, "uintptr_t");
+        if (type_id == void_id) {
+            return INT2NUM(TYPE_VOID);
+        }
+        else if (type_id == voidp_id) {
+            return INT2NUM(TYPE_VOIDP);
+        }
+        else if (type_id == char_id) {
+            return INT2NUM(TYPE_CHAR);
+        }
+        else if (type_id == short_id) {
+            return INT2NUM(TYPE_SHORT);
+        }
+        else if (type_id == int_id) {
+            return INT2NUM(TYPE_INT);
+        }
+        else if (type_id == long_id) {
+            return INT2NUM(TYPE_LONG);
+        }
+#ifdef TYPE_LONG_LONG
+        else if (type_id == long_long_id) {
+            return INT2NUM(TYPE_LONG_LONG);
+        }
+#endif
+#ifdef TYPE_INT8_T
+        else if (type_id == int8_t_id) {
+            return INT2NUM(TYPE_INT8_T);
+        }
+#endif
+#ifdef TYPE_INT16_T
+        else if (type_id == int16_t_id) {
+            return INT2NUM(TYPE_INT16_T);
+        }
+#endif
+#ifdef TYPE_INT32_T
+        else if (type_id == int32_t_id) {
+            return INT2NUM(TYPE_INT32_T);
+        }
+#endif
+#ifdef TYPE_INT64_T
+        else if (type_id == int64_t_id) {
+            return INT2NUM(TYPE_INT64_T);
+        }
+#endif
+        else if (type_id == float_id) {
+            return INT2NUM(TYPE_FLOAT);
+        }
+        else if (type_id == double_id) {
+            return INT2NUM(TYPE_DOUBLE);
+        }
+        else if (type_id == variadic_id) {
+            return INT2NUM(TYPE_VARIADIC);
+        }
+        else if (type_id == const_string_id) {
+            return INT2NUM(TYPE_CONST_STRING);
+        }
+        else if (type_id == size_t_id) {
+            return INT2NUM(TYPE_SIZE_T);
+        }
+        else if (type_id == ssize_t_id) {
+            return INT2NUM(TYPE_SSIZE_T);
+        }
+        else if (type_id == ptrdiff_t_id) {
+            return INT2NUM(TYPE_PTRDIFF_T);
+        }
+        else if (type_id == intptr_t_id) {
+            return INT2NUM(TYPE_INTPTR_T);
+        }
+        else if (type_id == uintptr_t_id) {
+            return INT2NUM(TYPE_UINTPTR_T);
+        }
+        else {
+            type = original_type;
+        }
+    }
+
+    return rb_to_int(type);
+}
+
 ffi_type *
-int_to_ffi_type(int type)
+rb_fiddle_int_to_ffi_type(int type)
 {
     int signed_p = 1;
 
@@ -33,66 +185,90 @@ int_to_ffi_type(int type)
 	return &ffi_type_float;
       case TYPE_DOUBLE:
 	return &ffi_type_double;
+      case TYPE_CONST_STRING:
+	return &ffi_type_pointer;
       default:
 	rb_raise(rb_eRuntimeError, "unknown type %d", type);
     }
     return &ffi_type_pointer;
 }
 
+ffi_type *
+int_to_ffi_type(int type)
+{
+    return rb_fiddle_int_to_ffi_type(type);
+}
+
 void
-value_to_generic(int type, VALUE src, fiddle_generic * dst)
+rb_fiddle_value_to_generic(int type, VALUE *src, fiddle_generic *dst)
 {
     switch (type) {
       case TYPE_VOID:
 	break;
       case TYPE_VOIDP:
-	dst->pointer = NUM2PTR(rb_Integer(src));
+	dst->pointer = NUM2PTR(rb_Integer(*src));
 	break;
       case TYPE_CHAR:
-	dst->schar = (signed char)NUM2INT(src);
+	dst->schar = (signed char)NUM2INT(*src);
 	break;
       case -TYPE_CHAR:
-	dst->uchar = (unsigned char)NUM2UINT(src);
+	dst->uchar = (unsigned char)NUM2UINT(*src);
 	break;
       case TYPE_SHORT:
-	dst->sshort = (unsigned short)NUM2INT(src);
+	dst->sshort = (unsigned short)NUM2INT(*src);
 	break;
       case -TYPE_SHORT:
-	dst->sshort = (signed short)NUM2UINT(src);
+	dst->sshort = (signed short)NUM2UINT(*src);
 	break;
       case TYPE_INT:
-	dst->sint = NUM2INT(src);
+	dst->sint = NUM2INT(*src);
 	break;
       case -TYPE_INT:
-	dst->uint = NUM2UINT(src);
+	dst->uint = NUM2UINT(*src);
 	break;
       case TYPE_LONG:
-	dst->slong = NUM2LONG(src);
+	dst->slong = NUM2LONG(*src);
 	break;
       case -TYPE_LONG:
-	dst->ulong = NUM2ULONG(src);
+	dst->ulong = NUM2ULONG(*src);
 	break;
 #if HAVE_LONG_LONG
       case TYPE_LONG_LONG:
-	dst->slong_long = NUM2LL(src);
+	dst->slong_long = NUM2LL(*src);
 	break;
       case -TYPE_LONG_LONG:
-	dst->ulong_long = NUM2ULL(src);
+	dst->ulong_long = NUM2ULL(*src);
 	break;
 #endif
       case TYPE_FLOAT:
-	dst->ffloat = (float)NUM2DBL(src);
+	dst->ffloat = (float)NUM2DBL(*src);
 	break;
       case TYPE_DOUBLE:
-	dst->ddouble = NUM2DBL(src);
+	dst->ddouble = NUM2DBL(*src);
+	break;
+      case TYPE_CONST_STRING:
+        if (NIL_P(*src)) {
+            dst->pointer = NULL;
+        }
+        else {
+            dst->pointer = rb_string_value_cstr(src);
+        }
 	break;
       default:
 	rb_raise(rb_eRuntimeError, "unknown type %d", type);
     }
 }
 
+void
+value_to_generic(int type, VALUE src, fiddle_generic *dst)
+{
+    /* src isn't safe from GC when type is TYPE_CONST_STRING and src
+     * isn't String. */
+    rb_fiddle_value_to_generic(type, &src, dst);
+}
+
 VALUE
-generic_to_value(VALUE rettype, fiddle_generic retval)
+rb_fiddle_generic_to_value(VALUE rettype, fiddle_generic retval)
 {
     int type = NUM2INT(rettype);
     VALUE cPointer;
@@ -131,6 +307,13 @@ generic_to_value(VALUE rettype, fiddle_generic retval)
 	return rb_float_new(retval.ffloat);
       case TYPE_DOUBLE:
 	return rb_float_new(retval.ddouble);
+      case TYPE_CONST_STRING:
+        if (retval.pointer) {
+            return rb_str_new_cstr(retval.pointer);
+        }
+        else {
+            return Qnil;
+        }
       default:
 	rb_raise(rb_eRuntimeError, "unknown type %d", type);
     }
@@ -138,4 +321,10 @@ generic_to_value(VALUE rettype, fiddle_generic retval)
     UNREACHABLE;
 }
 
+VALUE
+generic_to_value(VALUE rettype, fiddle_generic retval)
+{
+    return rb_fiddle_generic_to_value(rettype, retval);
+}
+
 /* vim: set noet sw=4 sts=4 */
diff --git a/ext/fiddle/conversions.h b/ext/fiddle/conversions.h
index cbc610bad2..c7c12a9234 100644
--- a/ext/fiddle/conversions.h
+++ b/ext/fiddle/conversions.h
@@ -24,13 +24,22 @@ typedef union
     void * pointer;        /* ffi_type_pointer */
 } fiddle_generic;
 
+VALUE rb_fiddle_type_ensure(VALUE type);
+ffi_type * rb_fiddle_int_to_ffi_type(int type);
+void rb_fiddle_value_to_generic(int type, VALUE *src, fiddle_generic *dst);
+VALUE rb_fiddle_generic_to_value(VALUE rettype, fiddle_generic retval);
+
+/* Deprecated. Use rb_fiddle_*() version. */
 ffi_type * int_to_ffi_type(int type);
-void value_to_generic(int type, VALUE src, fiddle_generic * dst);
+void value_to_generic(int type, VALUE src, fiddle_generic *dst);
 VALUE generic_to_value(VALUE rettype, fiddle_generic retval);
 
-#define VALUE2GENERIC(_type, _src, _dst) value_to_generic((_type), (_src), (_dst))
-#define INT2FFI_TYPE(_type) int_to_ffi_type(_type)
-#define GENERIC2VALUE(_type, _retval) generic_to_value((_type), (_retval))
+#define VALUE2GENERIC(_type, _src, _dst)        \
+    rb_fiddle_value_to_generic((_type), &(_src), (_dst))
+#define INT2FFI_TYPE(_type)                     \
+    rb_fiddle_int_to_ffi_type(_type)
+#define GENERIC2VALUE(_type, _retval)           \
+    rb_fiddle_generic_to_value((_type), (_retval))
 
 #if SIZEOF_VOIDP == SIZEOF_LONG
 # define PTR2NUM(x)   (LONG2NUM((long)(x)))
diff --git a/ext/fiddle/depend b/ext/fiddle/depend
index bf264a18eb..6afc09dd67 100644
--- a/ext/fiddle/depend
+++ b/ext/fiddle/depend
@@ -6,13 +6,6 @@ CONFIGURE_LIBFFI = \
 		CC="$(CC)" CFLAGS="$(LIBFFI_CFLAGS)" \
 		LD="$(LD)" LDFLAGS="$(LIBFFI_LDFLAGS)"
 
-$(OBJS): $(HDRS) $(ruby_headers) \
-  $(hdrdir)/ruby/io.h \
-  $(hdrdir)/ruby/encoding.h \
-  $(hdrdir)/ruby/oniguruma.h \
-  $(hdrdir)/ruby/thread.h \
-  $(top_srcdir)/internal.h
-
 $(STATIC_LIB) $(RUBYARCHDIR)/$(DLLIB) $(DLLIB): $(LIBFFI_A)
 
 $(OBJS): $(FFI_H)
@@ -32,18 +25,20 @@ $(LIBFFI_DIR)/Makefile:
 	$(Q) $(MAKEDIRS) $(LIBFFI_DIR)
 	$(Q) $(CONFIGURE_LIBFFI)
 
-build-libffi: $(LIBFFI_A)
 build-libffi $(LIBFFI_A):
-	$(Q) $(SUBMAKE_LIBFFI)
+	$(Q) $(SUBMAKE_PRE) $(MAKE) $(SUBMAKE_ARG)
 
+clean-none:
 clean-libffi:
-	$(Q) $(SUBMAKE_LIBFFI) clean
+	$(Q) $(SUBMAKE_PRE) $(MAKE) $(SUBMAKE_ARG) clean
 
+distclean-none:
 distclean-libffi:
-	$(Q) $(SUBMAKE_LIBFFI) distclean
+	$(Q) $(SUBMAKE_PRE) $(MAKE) $(SUBMAKE_ARG) distclean
 	$(Q) $(RM) $(LIBFFI_DIR)/local.exp
 	$(Q) $(RUBY) -rfileutils -e "FileUtils.rmdir(Dir.glob(ARGV[0]+'/**/{,.*/}'), :parents=>true)" $(LIBFFI_DIR)
 
+realclean-none:
 realclean-libffi:
 	$(Q) $(RMALL) $(LIBFFI_DIR)
 
@@ -55,3 +50,1334 @@ distclean: distclean-$(LIBFFI_CLEAN)
 realclean: realclean-$(LIBFFI_CLEAN)
 
 .PHONY: configure configure-libffi
+
+# AUTOGENERATED DEPENDENCIES START
+closure.o: $(RUBY_EXTCONF_H)
+closure.o: $(arch_hdrdir)/ruby/config.h
+closure.o: $(hdrdir)/ruby.h
+closure.o: $(hdrdir)/ruby/assert.h
+closure.o: $(hdrdir)/ruby/backward.h
+closure.o: $(hdrdir)/ruby/backward/2/assume.h
+closure.o: $(hdrdir)/ruby/backward/2/attributes.h
+closure.o: $(hdrdir)/ruby/backward/2/bool.h
+closure.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+closure.o: $(hdrdir)/ruby/backward/2/inttypes.h
+closure.o: $(hdrdir)/ruby/backward/2/limits.h
+closure.o: $(hdrdir)/ruby/backward/2/long_long.h
+closure.o: $(hdrdir)/ruby/backward/2/stdalign.h
+closure.o: $(hdrdir)/ruby/backward/2/stdarg.h
+closure.o: $(hdrdir)/ruby/defines.h
+closure.o: $(hdrdir)/ruby/intern.h
+closure.o: $(hdrdir)/ruby/internal/anyargs.h
+closure.o: $(hdrdir)/ruby/internal/arithmetic.h
+closure.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+closure.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+closure.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+closure.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+closure.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+closure.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+closure.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+closure.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+closure.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+closure.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+closure.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+closure.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+closure.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+closure.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+closure.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+closure.o: $(hdrdir)/ruby/internal/assume.h
+closure.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+closure.o: $(hdrdir)/ruby/internal/attr/artificial.h
+closure.o: $(hdrdir)/ruby/internal/attr/cold.h
+closure.o: $(hdrdir)/ruby/internal/attr/const.h
+closure.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+closure.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+closure.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+closure.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+closure.o: $(hdrdir)/ruby/internal/attr/error.h
+closure.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+closure.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+closure.o: $(hdrdir)/ruby/internal/attr/format.h
+closure.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+closure.o: $(hdrdir)/ruby/internal/attr/noalias.h
+closure.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+closure.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+closure.o: $(hdrdir)/ruby/internal/attr/noinline.h
+closure.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+closure.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+closure.o: $(hdrdir)/ruby/internal/attr/pure.h
+closure.o: $(hdrdir)/ruby/internal/attr/restrict.h
+closure.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+closure.o: $(hdrdir)/ruby/internal/attr/warning.h
+closure.o: $(hdrdir)/ruby/internal/attr/weakref.h
+closure.o: $(hdrdir)/ruby/internal/cast.h
+closure.o: $(hdrdir)/ruby/internal/compiler_is.h
+closure.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+closure.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+closure.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+closure.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+closure.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+closure.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+closure.o: $(hdrdir)/ruby/internal/compiler_since.h
+closure.o: $(hdrdir)/ruby/internal/config.h
+closure.o: $(hdrdir)/ruby/internal/constant_p.h
+closure.o: $(hdrdir)/ruby/internal/core.h
+closure.o: $(hdrdir)/ruby/internal/core/rarray.h
+closure.o: $(hdrdir)/ruby/internal/core/rbasic.h
+closure.o: $(hdrdir)/ruby/internal/core/rbignum.h
+closure.o: $(hdrdir)/ruby/internal/core/rclass.h
+closure.o: $(hdrdir)/ruby/internal/core/rdata.h
+closure.o: $(hdrdir)/ruby/internal/core/rfile.h
+closure.o: $(hdrdir)/ruby/internal/core/rhash.h
+closure.o: $(hdrdir)/ruby/internal/core/robject.h
+closure.o: $(hdrdir)/ruby/internal/core/rregexp.h
+closure.o: $(hdrdir)/ruby/internal/core/rstring.h
+closure.o: $(hdrdir)/ruby/internal/core/rstruct.h
+closure.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+closure.o: $(hdrdir)/ruby/internal/ctype.h
+closure.o: $(hdrdir)/ruby/internal/dllexport.h
+closure.o: $(hdrdir)/ruby/internal/dosish.h
+closure.o: $(hdrdir)/ruby/internal/error.h
+closure.o: $(hdrdir)/ruby/internal/eval.h
+closure.o: $(hdrdir)/ruby/internal/event.h
+closure.o: $(hdrdir)/ruby/internal/fl_type.h
+closure.o: $(hdrdir)/ruby/internal/gc.h
+closure.o: $(hdrdir)/ruby/internal/glob.h
+closure.o: $(hdrdir)/ruby/internal/globals.h
+closure.o: $(hdrdir)/ruby/internal/has/attribute.h
+closure.o: $(hdrdir)/ruby/internal/has/builtin.h
+closure.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+closure.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+closure.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+closure.o: $(hdrdir)/ruby/internal/has/extension.h
+closure.o: $(hdrdir)/ruby/internal/has/feature.h
+closure.o: $(hdrdir)/ruby/internal/has/warning.h
+closure.o: $(hdrdir)/ruby/internal/intern/array.h
+closure.o: $(hdrdir)/ruby/internal/intern/bignum.h
+closure.o: $(hdrdir)/ruby/internal/intern/class.h
+closure.o: $(hdrdir)/ruby/internal/intern/compar.h
+closure.o: $(hdrdir)/ruby/internal/intern/complex.h
+closure.o: $(hdrdir)/ruby/internal/intern/cont.h
+closure.o: $(hdrdir)/ruby/internal/intern/dir.h
+closure.o: $(hdrdir)/ruby/internal/intern/enum.h
+closure.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+closure.o: $(hdrdir)/ruby/internal/intern/error.h
+closure.o: $(hdrdir)/ruby/internal/intern/eval.h
+closure.o: $(hdrdir)/ruby/internal/intern/file.h
+closure.o: $(hdrdir)/ruby/internal/intern/gc.h
+closure.o: $(hdrdir)/ruby/internal/intern/hash.h
+closure.o: $(hdrdir)/ruby/internal/intern/io.h
+closure.o: $(hdrdir)/ruby/internal/intern/load.h
+closure.o: $(hdrdir)/ruby/internal/intern/marshal.h
+closure.o: $(hdrdir)/ruby/internal/intern/numeric.h
+closure.o: $(hdrdir)/ruby/internal/intern/object.h
+closure.o: $(hdrdir)/ruby/internal/intern/parse.h
+closure.o: $(hdrdir)/ruby/internal/intern/proc.h
+closure.o: $(hdrdir)/ruby/internal/intern/process.h
+closure.o: $(hdrdir)/ruby/internal/intern/random.h
+closure.o: $(hdrdir)/ruby/internal/intern/range.h
+closure.o: $(hdrdir)/ruby/internal/intern/rational.h
+closure.o: $(hdrdir)/ruby/internal/intern/re.h
+closure.o: $(hdrdir)/ruby/internal/intern/ruby.h
+closure.o: $(hdrdir)/ruby/internal/intern/select.h
+closure.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+closure.o: $(hdrdir)/ruby/internal/intern/signal.h
+closure.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+closure.o: $(hdrdir)/ruby/internal/intern/string.h
+closure.o: $(hdrdir)/ruby/internal/intern/struct.h
+closure.o: $(hdrdir)/ruby/internal/intern/thread.h
+closure.o: $(hdrdir)/ruby/internal/intern/time.h
+closure.o: $(hdrdir)/ruby/internal/intern/variable.h
+closure.o: $(hdrdir)/ruby/internal/intern/vm.h
+closure.o: $(hdrdir)/ruby/internal/interpreter.h
+closure.o: $(hdrdir)/ruby/internal/iterator.h
+closure.o: $(hdrdir)/ruby/internal/memory.h
+closure.o: $(hdrdir)/ruby/internal/method.h
+closure.o: $(hdrdir)/ruby/internal/module.h
+closure.o: $(hdrdir)/ruby/internal/newobj.h
+closure.o: $(hdrdir)/ruby/internal/rgengc.h
+closure.o: $(hdrdir)/ruby/internal/scan_args.h
+closure.o: $(hdrdir)/ruby/internal/special_consts.h
+closure.o: $(hdrdir)/ruby/internal/static_assert.h
+closure.o: $(hdrdir)/ruby/internal/stdalign.h
+closure.o: $(hdrdir)/ruby/internal/stdbool.h
+closure.o: $(hdrdir)/ruby/internal/symbol.h
+closure.o: $(hdrdir)/ruby/internal/token_paste.h
+closure.o: $(hdrdir)/ruby/internal/value.h
+closure.o: $(hdrdir)/ruby/internal/value_type.h
+closure.o: $(hdrdir)/ruby/internal/variable.h
+closure.o: $(hdrdir)/ruby/internal/warning_push.h
+closure.o: $(hdrdir)/ruby/internal/xmalloc.h
+closure.o: $(hdrdir)/ruby/missing.h
+closure.o: $(hdrdir)/ruby/ruby.h
+closure.o: $(hdrdir)/ruby/st.h
+closure.o: $(hdrdir)/ruby/subst.h
+closure.o: $(hdrdir)/ruby/thread.h
+closure.o: closure.c
+closure.o: closure.h
+closure.o: conversions.h
+closure.o: fiddle.h
+closure.o: function.h
+conversions.o: $(RUBY_EXTCONF_H)
+conversions.o: $(arch_hdrdir)/ruby/config.h
+conversions.o: $(hdrdir)/ruby.h
+conversions.o: $(hdrdir)/ruby/assert.h
+conversions.o: $(hdrdir)/ruby/backward.h
+conversions.o: $(hdrdir)/ruby/backward/2/assume.h
+conversions.o: $(hdrdir)/ruby/backward/2/attributes.h
+conversions.o: $(hdrdir)/ruby/backward/2/bool.h
+conversions.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+conversions.o: $(hdrdir)/ruby/backward/2/inttypes.h
+conversions.o: $(hdrdir)/ruby/backward/2/limits.h
+conversions.o: $(hdrdir)/ruby/backward/2/long_long.h
+conversions.o: $(hdrdir)/ruby/backward/2/stdalign.h
+conversions.o: $(hdrdir)/ruby/backward/2/stdarg.h
+conversions.o: $(hdrdir)/ruby/defines.h
+conversions.o: $(hdrdir)/ruby/intern.h
+conversions.o: $(hdrdir)/ruby/internal/anyargs.h
+conversions.o: $(hdrdir)/ruby/internal/arithmetic.h
+conversions.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+conversions.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+conversions.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+conversions.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+conversions.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+conversions.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+conversions.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+conversions.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+conversions.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+conversions.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+conversions.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+conversions.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+conversions.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+conversions.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+conversions.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+conversions.o: $(hdrdir)/ruby/internal/assume.h
+conversions.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+conversions.o: $(hdrdir)/ruby/internal/attr/artificial.h
+conversions.o: $(hdrdir)/ruby/internal/attr/cold.h
+conversions.o: $(hdrdir)/ruby/internal/attr/const.h
+conversions.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+conversions.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+conversions.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+conversions.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+conversions.o: $(hdrdir)/ruby/internal/attr/error.h
+conversions.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+conversions.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+conversions.o: $(hdrdir)/ruby/internal/attr/format.h
+conversions.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+conversions.o: $(hdrdir)/ruby/internal/attr/noalias.h
+conversions.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+conversions.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+conversions.o: $(hdrdir)/ruby/internal/attr/noinline.h
+conversions.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+conversions.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+conversions.o: $(hdrdir)/ruby/internal/attr/pure.h
+conversions.o: $(hdrdir)/ruby/internal/attr/restrict.h
+conversions.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+conversions.o: $(hdrdir)/ruby/internal/attr/warning.h
+conversions.o: $(hdrdir)/ruby/internal/attr/weakref.h
+conversions.o: $(hdrdir)/ruby/internal/cast.h
+conversions.o: $(hdrdir)/ruby/internal/compiler_is.h
+conversions.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+conversions.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+conversions.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+conversions.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+conversions.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+conversions.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+conversions.o: $(hdrdir)/ruby/internal/compiler_since.h
+conversions.o: $(hdrdir)/ruby/internal/config.h
+conversions.o: $(hdrdir)/ruby/internal/constant_p.h
+conversions.o: $(hdrdir)/ruby/internal/core.h
+conversions.o: $(hdrdir)/ruby/internal/core/rarray.h
+conversions.o: $(hdrdir)/ruby/internal/core/rbasic.h
+conversions.o: $(hdrdir)/ruby/internal/core/rbignum.h
+conversions.o: $(hdrdir)/ruby/internal/core/rclass.h
+conversions.o: $(hdrdir)/ruby/internal/core/rdata.h
+conversions.o: $(hdrdir)/ruby/internal/core/rfile.h
+conversions.o: $(hdrdir)/ruby/internal/core/rhash.h
+conversions.o: $(hdrdir)/ruby/internal/core/robject.h
+conversions.o: $(hdrdir)/ruby/internal/core/rregexp.h
+conversions.o: $(hdrdir)/ruby/internal/core/rstring.h
+conversions.o: $(hdrdir)/ruby/internal/core/rstruct.h
+conversions.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+conversions.o: $(hdrdir)/ruby/internal/ctype.h
+conversions.o: $(hdrdir)/ruby/internal/dllexport.h
+conversions.o: $(hdrdir)/ruby/internal/dosish.h
+conversions.o: $(hdrdir)/ruby/internal/error.h
+conversions.o: $(hdrdir)/ruby/internal/eval.h
+conversions.o: $(hdrdir)/ruby/internal/event.h
+conversions.o: $(hdrdir)/ruby/internal/fl_type.h
+conversions.o: $(hdrdir)/ruby/internal/gc.h
+conversions.o: $(hdrdir)/ruby/internal/glob.h
+conversions.o: $(hdrdir)/ruby/internal/globals.h
+conversions.o: $(hdrdir)/ruby/internal/has/attribute.h
+conversions.o: $(hdrdir)/ruby/internal/has/builtin.h
+conversions.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+conversions.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+conversions.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+conversions.o: $(hdrdir)/ruby/internal/has/extension.h
+conversions.o: $(hdrdir)/ruby/internal/has/feature.h
+conversions.o: $(hdrdir)/ruby/internal/has/warning.h
+conversions.o: $(hdrdir)/ruby/internal/intern/array.h
+conversions.o: $(hdrdir)/ruby/internal/intern/bignum.h
+conversions.o: $(hdrdir)/ruby/internal/intern/class.h
+conversions.o: $(hdrdir)/ruby/internal/intern/compar.h
+conversions.o: $(hdrdir)/ruby/internal/intern/complex.h
+conversions.o: $(hdrdir)/ruby/internal/intern/cont.h
+conversions.o: $(hdrdir)/ruby/internal/intern/dir.h
+conversions.o: $(hdrdir)/ruby/internal/intern/enum.h
+conversions.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+conversions.o: $(hdrdir)/ruby/internal/intern/error.h
+conversions.o: $(hdrdir)/ruby/internal/intern/eval.h
+conversions.o: $(hdrdir)/ruby/internal/intern/file.h
+conversions.o: $(hdrdir)/ruby/internal/intern/gc.h
+conversions.o: $(hdrdir)/ruby/internal/intern/hash.h
+conversions.o: $(hdrdir)/ruby/internal/intern/io.h
+conversions.o: $(hdrdir)/ruby/internal/intern/load.h
+conversions.o: $(hdrdir)/ruby/internal/intern/marshal.h
+conversions.o: $(hdrdir)/ruby/internal/intern/numeric.h
+conversions.o: $(hdrdir)/ruby/internal/intern/object.h
+conversions.o: $(hdrdir)/ruby/internal/intern/parse.h
+conversions.o: $(hdrdir)/ruby/internal/intern/proc.h
+conversions.o: $(hdrdir)/ruby/internal/intern/process.h
+conversions.o: $(hdrdir)/ruby/internal/intern/random.h
+conversions.o: $(hdrdir)/ruby/internal/intern/range.h
+conversions.o: $(hdrdir)/ruby/internal/intern/rational.h
+conversions.o: $(hdrdir)/ruby/internal/intern/re.h
+conversions.o: $(hdrdir)/ruby/internal/intern/ruby.h
+conversions.o: $(hdrdir)/ruby/internal/intern/select.h
+conversions.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+conversions.o: $(hdrdir)/ruby/internal/intern/signal.h
+conversions.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+conversions.o: $(hdrdir)/ruby/internal/intern/string.h
+conversions.o: $(hdrdir)/ruby/internal/intern/struct.h
+conversions.o: $(hdrdir)/ruby/internal/intern/thread.h
+conversions.o: $(hdrdir)/ruby/internal/intern/time.h
+conversions.o: $(hdrdir)/ruby/internal/intern/variable.h
+conversions.o: $(hdrdir)/ruby/internal/intern/vm.h
+conversions.o: $(hdrdir)/ruby/internal/interpreter.h
+conversions.o: $(hdrdir)/ruby/internal/iterator.h
+conversions.o: $(hdrdir)/ruby/internal/memory.h
+conversions.o: $(hdrdir)/ruby/internal/method.h
+conversions.o: $(hdrdir)/ruby/internal/module.h
+conversions.o: $(hdrdir)/ruby/internal/newobj.h
+conversions.o: $(hdrdir)/ruby/internal/rgengc.h
+conversions.o: $(hdrdir)/ruby/internal/scan_args.h
+conversions.o: $(hdrdir)/ruby/internal/special_consts.h
+conversions.o: $(hdrdir)/ruby/internal/static_assert.h
+conversions.o: $(hdrdir)/ruby/internal/stdalign.h
+conversions.o: $(hdrdir)/ruby/internal/stdbool.h
+conversions.o: $(hdrdir)/ruby/internal/symbol.h
+conversions.o: $(hdrdir)/ruby/internal/token_paste.h
+conversions.o: $(hdrdir)/ruby/internal/value.h
+conversions.o: $(hdrdir)/ruby/internal/value_type.h
+conversions.o: $(hdrdir)/ruby/internal/variable.h
+conversions.o: $(hdrdir)/ruby/internal/warning_push.h
+conversions.o: $(hdrdir)/ruby/internal/xmalloc.h
+conversions.o: $(hdrdir)/ruby/missing.h
+conversions.o: $(hdrdir)/ruby/ruby.h
+conversions.o: $(hdrdir)/ruby/st.h
+conversions.o: $(hdrdir)/ruby/subst.h
+conversions.o: closure.h
+conversions.o: conversions.c
+conversions.o: conversions.h
+conversions.o: fiddle.h
+conversions.o: function.h
+fiddle.o: $(RUBY_EXTCONF_H)
+fiddle.o: $(arch_hdrdir)/ruby/config.h
+fiddle.o: $(hdrdir)/ruby.h
+fiddle.o: $(hdrdir)/ruby/assert.h
+fiddle.o: $(hdrdir)/ruby/backward.h
+fiddle.o: $(hdrdir)/ruby/backward/2/assume.h
+fiddle.o: $(hdrdir)/ruby/backward/2/attributes.h
+fiddle.o: $(hdrdir)/ruby/backward/2/bool.h
+fiddle.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+fiddle.o: $(hdrdir)/ruby/backward/2/inttypes.h
+fiddle.o: $(hdrdir)/ruby/backward/2/limits.h
+fiddle.o: $(hdrdir)/ruby/backward/2/long_long.h
+fiddle.o: $(hdrdir)/ruby/backward/2/stdalign.h
+fiddle.o: $(hdrdir)/ruby/backward/2/stdarg.h
+fiddle.o: $(hdrdir)/ruby/defines.h
+fiddle.o: $(hdrdir)/ruby/intern.h
+fiddle.o: $(hdrdir)/ruby/internal/anyargs.h
+fiddle.o: $(hdrdir)/ruby/internal/arithmetic.h
+fiddle.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+fiddle.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+fiddle.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+fiddle.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+fiddle.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+fiddle.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+fiddle.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+fiddle.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+fiddle.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+fiddle.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+fiddle.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+fiddle.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+fiddle.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+fiddle.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+fiddle.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+fiddle.o: $(hdrdir)/ruby/internal/assume.h
+fiddle.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+fiddle.o: $(hdrdir)/ruby/internal/attr/artificial.h
+fiddle.o: $(hdrdir)/ruby/internal/attr/cold.h
+fiddle.o: $(hdrdir)/ruby/internal/attr/const.h
+fiddle.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+fiddle.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+fiddle.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+fiddle.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+fiddle.o: $(hdrdir)/ruby/internal/attr/error.h
+fiddle.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+fiddle.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+fiddle.o: $(hdrdir)/ruby/internal/attr/format.h
+fiddle.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+fiddle.o: $(hdrdir)/ruby/internal/attr/noalias.h
+fiddle.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+fiddle.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+fiddle.o: $(hdrdir)/ruby/internal/attr/noinline.h
+fiddle.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+fiddle.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+fiddle.o: $(hdrdir)/ruby/internal/attr/pure.h
+fiddle.o: $(hdrdir)/ruby/internal/attr/restrict.h
+fiddle.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+fiddle.o: $(hdrdir)/ruby/internal/attr/warning.h
+fiddle.o: $(hdrdir)/ruby/internal/attr/weakref.h
+fiddle.o: $(hdrdir)/ruby/internal/cast.h
+fiddle.o: $(hdrdir)/ruby/internal/compiler_is.h
+fiddle.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+fiddle.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+fiddle.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+fiddle.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+fiddle.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+fiddle.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+fiddle.o: $(hdrdir)/ruby/internal/compiler_since.h
+fiddle.o: $(hdrdir)/ruby/internal/config.h
+fiddle.o: $(hdrdir)/ruby/internal/constant_p.h
+fiddle.o: $(hdrdir)/ruby/internal/core.h
+fiddle.o: $(hdrdir)/ruby/internal/core/rarray.h
+fiddle.o: $(hdrdir)/ruby/internal/core/rbasic.h
+fiddle.o: $(hdrdir)/ruby/internal/core/rbignum.h
+fiddle.o: $(hdrdir)/ruby/internal/core/rclass.h
+fiddle.o: $(hdrdir)/ruby/internal/core/rdata.h
+fiddle.o: $(hdrdir)/ruby/internal/core/rfile.h
+fiddle.o: $(hdrdir)/ruby/internal/core/rhash.h
+fiddle.o: $(hdrdir)/ruby/internal/core/robject.h
+fiddle.o: $(hdrdir)/ruby/internal/core/rregexp.h
+fiddle.o: $(hdrdir)/ruby/internal/core/rstring.h
+fiddle.o: $(hdrdir)/ruby/internal/core/rstruct.h
+fiddle.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+fiddle.o: $(hdrdir)/ruby/internal/ctype.h
+fiddle.o: $(hdrdir)/ruby/internal/dllexport.h
+fiddle.o: $(hdrdir)/ruby/internal/dosish.h
+fiddle.o: $(hdrdir)/ruby/internal/error.h
+fiddle.o: $(hdrdir)/ruby/internal/eval.h
+fiddle.o: $(hdrdir)/ruby/internal/event.h
+fiddle.o: $(hdrdir)/ruby/internal/fl_type.h
+fiddle.o: $(hdrdir)/ruby/internal/gc.h
+fiddle.o: $(hdrdir)/ruby/internal/glob.h
+fiddle.o: $(hdrdir)/ruby/internal/globals.h
+fiddle.o: $(hdrdir)/ruby/internal/has/attribute.h
+fiddle.o: $(hdrdir)/ruby/internal/has/builtin.h
+fiddle.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+fiddle.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+fiddle.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+fiddle.o: $(hdrdir)/ruby/internal/has/extension.h
+fiddle.o: $(hdrdir)/ruby/internal/has/feature.h
+fiddle.o: $(hdrdir)/ruby/internal/has/warning.h
+fiddle.o: $(hdrdir)/ruby/internal/intern/array.h
+fiddle.o: $(hdrdir)/ruby/internal/intern/bignum.h
+fiddle.o: $(hdrdir)/ruby/internal/intern/class.h
+fiddle.o: $(hdrdir)/ruby/internal/intern/compar.h
+fiddle.o: $(hdrdir)/ruby/internal/intern/complex.h
+fiddle.o: $(hdrdir)/ruby/internal/intern/cont.h
+fiddle.o: $(hdrdir)/ruby/internal/intern/dir.h
+fiddle.o: $(hdrdir)/ruby/internal/intern/enum.h
+fiddle.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+fiddle.o: $(hdrdir)/ruby/internal/intern/error.h
+fiddle.o: $(hdrdir)/ruby/internal/intern/eval.h
+fiddle.o: $(hdrdir)/ruby/internal/intern/file.h
+fiddle.o: $(hdrdir)/ruby/internal/intern/gc.h
+fiddle.o: $(hdrdir)/ruby/internal/intern/hash.h
+fiddle.o: $(hdrdir)/ruby/internal/intern/io.h
+fiddle.o: $(hdrdir)/ruby/internal/intern/load.h
+fiddle.o: $(hdrdir)/ruby/internal/intern/marshal.h
+fiddle.o: $(hdrdir)/ruby/internal/intern/numeric.h
+fiddle.o: $(hdrdir)/ruby/internal/intern/object.h
+fiddle.o: $(hdrdir)/ruby/internal/intern/parse.h
+fiddle.o: $(hdrdir)/ruby/internal/intern/proc.h
+fiddle.o: $(hdrdir)/ruby/internal/intern/process.h
+fiddle.o: $(hdrdir)/ruby/internal/intern/random.h
+fiddle.o: $(hdrdir)/ruby/internal/intern/range.h
+fiddle.o: $(hdrdir)/ruby/internal/intern/rational.h
+fiddle.o: $(hdrdir)/ruby/internal/intern/re.h
+fiddle.o: $(hdrdir)/ruby/internal/intern/ruby.h
+fiddle.o: $(hdrdir)/ruby/internal/intern/select.h
+fiddle.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+fiddle.o: $(hdrdir)/ruby/internal/intern/signal.h
+fiddle.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+fiddle.o: $(hdrdir)/ruby/internal/intern/string.h
+fiddle.o: $(hdrdir)/ruby/internal/intern/struct.h
+fiddle.o: $(hdrdir)/ruby/internal/intern/thread.h
+fiddle.o: $(hdrdir)/ruby/internal/intern/time.h
+fiddle.o: $(hdrdir)/ruby/internal/intern/variable.h
+fiddle.o: $(hdrdir)/ruby/internal/intern/vm.h
+fiddle.o: $(hdrdir)/ruby/internal/interpreter.h
+fiddle.o: $(hdrdir)/ruby/internal/iterator.h
+fiddle.o: $(hdrdir)/ruby/internal/memory.h
+fiddle.o: $(hdrdir)/ruby/internal/method.h
+fiddle.o: $(hdrdir)/ruby/internal/module.h
+fiddle.o: $(hdrdir)/ruby/internal/newobj.h
+fiddle.o: $(hdrdir)/ruby/internal/rgengc.h
+fiddle.o: $(hdrdir)/ruby/internal/scan_args.h
+fiddle.o: $(hdrdir)/ruby/internal/special_consts.h
+fiddle.o: $(hdrdir)/ruby/internal/static_assert.h
+fiddle.o: $(hdrdir)/ruby/internal/stdalign.h
+fiddle.o: $(hdrdir)/ruby/internal/stdbool.h
+fiddle.o: $(hdrdir)/ruby/internal/symbol.h
+fiddle.o: $(hdrdir)/ruby/internal/token_paste.h
+fiddle.o: $(hdrdir)/ruby/internal/value.h
+fiddle.o: $(hdrdir)/ruby/internal/value_type.h
+fiddle.o: $(hdrdir)/ruby/internal/variable.h
+fiddle.o: $(hdrdir)/ruby/internal/warning_push.h
+fiddle.o: $(hdrdir)/ruby/internal/xmalloc.h
+fiddle.o: $(hdrdir)/ruby/missing.h
+fiddle.o: $(hdrdir)/ruby/ruby.h
+fiddle.o: $(hdrdir)/ruby/st.h
+fiddle.o: $(hdrdir)/ruby/subst.h
+fiddle.o: closure.h
+fiddle.o: conversions.h
+fiddle.o: fiddle.c
+fiddle.o: fiddle.h
+fiddle.o: function.h
+function.o: $(RUBY_EXTCONF_H)
+function.o: $(arch_hdrdir)/ruby/config.h
+function.o: $(hdrdir)/ruby.h
+function.o: $(hdrdir)/ruby/assert.h
+function.o: $(hdrdir)/ruby/backward.h
+function.o: $(hdrdir)/ruby/backward/2/assume.h
+function.o: $(hdrdir)/ruby/backward/2/attributes.h
+function.o: $(hdrdir)/ruby/backward/2/bool.h
+function.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+function.o: $(hdrdir)/ruby/backward/2/inttypes.h
+function.o: $(hdrdir)/ruby/backward/2/limits.h
+function.o: $(hdrdir)/ruby/backward/2/long_long.h
+function.o: $(hdrdir)/ruby/backward/2/stdalign.h
+function.o: $(hdrdir)/ruby/backward/2/stdarg.h
+function.o: $(hdrdir)/ruby/defines.h
+function.o: $(hdrdir)/ruby/intern.h
+function.o: $(hdrdir)/ruby/internal/anyargs.h
+function.o: $(hdrdir)/ruby/internal/arithmetic.h
+function.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+function.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+function.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+function.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+function.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+function.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+function.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+function.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+function.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+function.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+function.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+function.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+function.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+function.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+function.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+function.o: $(hdrdir)/ruby/internal/assume.h
+function.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+function.o: $(hdrdir)/ruby/internal/attr/artificial.h
+function.o: $(hdrdir)/ruby/internal/attr/cold.h
+function.o: $(hdrdir)/ruby/internal/attr/const.h
+function.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+function.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+function.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+function.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+function.o: $(hdrdir)/ruby/internal/attr/error.h
+function.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+function.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+function.o: $(hdrdir)/ruby/internal/attr/format.h
+function.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+function.o: $(hdrdir)/ruby/internal/attr/noalias.h
+function.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+function.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+function.o: $(hdrdir)/ruby/internal/attr/noinline.h
+function.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+function.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+function.o: $(hdrdir)/ruby/internal/attr/pure.h
+function.o: $(hdrdir)/ruby/internal/attr/restrict.h
+function.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+function.o: $(hdrdir)/ruby/internal/attr/warning.h
+function.o: $(hdrdir)/ruby/internal/attr/weakref.h
+function.o: $(hdrdir)/ruby/internal/cast.h
+function.o: $(hdrdir)/ruby/internal/compiler_is.h
+function.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+function.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+function.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+function.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+function.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+function.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+function.o: $(hdrdir)/ruby/internal/compiler_since.h
+function.o: $(hdrdir)/ruby/internal/config.h
+function.o: $(hdrdir)/ruby/internal/constant_p.h
+function.o: $(hdrdir)/ruby/internal/core.h
+function.o: $(hdrdir)/ruby/internal/core/rarray.h
+function.o: $(hdrdir)/ruby/internal/core/rbasic.h
+function.o: $(hdrdir)/ruby/internal/core/rbignum.h
+function.o: $(hdrdir)/ruby/internal/core/rclass.h
+function.o: $(hdrdir)/ruby/internal/core/rdata.h
+function.o: $(hdrdir)/ruby/internal/core/rfile.h
+function.o: $(hdrdir)/ruby/internal/core/rhash.h
+function.o: $(hdrdir)/ruby/internal/core/robject.h
+function.o: $(hdrdir)/ruby/internal/core/rregexp.h
+function.o: $(hdrdir)/ruby/internal/core/rstring.h
+function.o: $(hdrdir)/ruby/internal/core/rstruct.h
+function.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+function.o: $(hdrdir)/ruby/internal/ctype.h
+function.o: $(hdrdir)/ruby/internal/dllexport.h
+function.o: $(hdrdir)/ruby/internal/dosish.h
+function.o: $(hdrdir)/ruby/internal/error.h
+function.o: $(hdrdir)/ruby/internal/eval.h
+function.o: $(hdrdir)/ruby/internal/event.h
+function.o: $(hdrdir)/ruby/internal/fl_type.h
+function.o: $(hdrdir)/ruby/internal/gc.h
+function.o: $(hdrdir)/ruby/internal/glob.h
+function.o: $(hdrdir)/ruby/internal/globals.h
+function.o: $(hdrdir)/ruby/internal/has/attribute.h
+function.o: $(hdrdir)/ruby/internal/has/builtin.h
+function.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+function.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+function.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+function.o: $(hdrdir)/ruby/internal/has/extension.h
+function.o: $(hdrdir)/ruby/internal/has/feature.h
+function.o: $(hdrdir)/ruby/internal/has/warning.h
+function.o: $(hdrdir)/ruby/internal/intern/array.h
+function.o: $(hdrdir)/ruby/internal/intern/bignum.h
+function.o: $(hdrdir)/ruby/internal/intern/class.h
+function.o: $(hdrdir)/ruby/internal/intern/compar.h
+function.o: $(hdrdir)/ruby/internal/intern/complex.h
+function.o: $(hdrdir)/ruby/internal/intern/cont.h
+function.o: $(hdrdir)/ruby/internal/intern/dir.h
+function.o: $(hdrdir)/ruby/internal/intern/enum.h
+function.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+function.o: $(hdrdir)/ruby/internal/intern/error.h
+function.o: $(hdrdir)/ruby/internal/intern/eval.h
+function.o: $(hdrdir)/ruby/internal/intern/file.h
+function.o: $(hdrdir)/ruby/internal/intern/gc.h
+function.o: $(hdrdir)/ruby/internal/intern/hash.h
+function.o: $(hdrdir)/ruby/internal/intern/io.h
+function.o: $(hdrdir)/ruby/internal/intern/load.h
+function.o: $(hdrdir)/ruby/internal/intern/marshal.h
+function.o: $(hdrdir)/ruby/internal/intern/numeric.h
+function.o: $(hdrdir)/ruby/internal/intern/object.h
+function.o: $(hdrdir)/ruby/internal/intern/parse.h
+function.o: $(hdrdir)/ruby/internal/intern/proc.h
+function.o: $(hdrdir)/ruby/internal/intern/process.h
+function.o: $(hdrdir)/ruby/internal/intern/random.h
+function.o: $(hdrdir)/ruby/internal/intern/range.h
+function.o: $(hdrdir)/ruby/internal/intern/rational.h
+function.o: $(hdrdir)/ruby/internal/intern/re.h
+function.o: $(hdrdir)/ruby/internal/intern/ruby.h
+function.o: $(hdrdir)/ruby/internal/intern/select.h
+function.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+function.o: $(hdrdir)/ruby/internal/intern/signal.h
+function.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+function.o: $(hdrdir)/ruby/internal/intern/string.h
+function.o: $(hdrdir)/ruby/internal/intern/struct.h
+function.o: $(hdrdir)/ruby/internal/intern/thread.h
+function.o: $(hdrdir)/ruby/internal/intern/time.h
+function.o: $(hdrdir)/ruby/internal/intern/variable.h
+function.o: $(hdrdir)/ruby/internal/intern/vm.h
+function.o: $(hdrdir)/ruby/internal/interpreter.h
+function.o: $(hdrdir)/ruby/internal/iterator.h
+function.o: $(hdrdir)/ruby/internal/memory.h
+function.o: $(hdrdir)/ruby/internal/method.h
+function.o: $(hdrdir)/ruby/internal/module.h
+function.o: $(hdrdir)/ruby/internal/newobj.h
+function.o: $(hdrdir)/ruby/internal/rgengc.h
+function.o: $(hdrdir)/ruby/internal/scan_args.h
+function.o: $(hdrdir)/ruby/internal/special_consts.h
+function.o: $(hdrdir)/ruby/internal/static_assert.h
+function.o: $(hdrdir)/ruby/internal/stdalign.h
+function.o: $(hdrdir)/ruby/internal/stdbool.h
+function.o: $(hdrdir)/ruby/internal/symbol.h
+function.o: $(hdrdir)/ruby/internal/token_paste.h
+function.o: $(hdrdir)/ruby/internal/value.h
+function.o: $(hdrdir)/ruby/internal/value_type.h
+function.o: $(hdrdir)/ruby/internal/variable.h
+function.o: $(hdrdir)/ruby/internal/warning_push.h
+function.o: $(hdrdir)/ruby/internal/xmalloc.h
+function.o: $(hdrdir)/ruby/missing.h
+function.o: $(hdrdir)/ruby/ruby.h
+function.o: $(hdrdir)/ruby/st.h
+function.o: $(hdrdir)/ruby/subst.h
+function.o: $(hdrdir)/ruby/thread.h
+function.o: closure.h
+function.o: conversions.h
+function.o: fiddle.h
+function.o: function.c
+function.o: function.h
+handle.o: $(RUBY_EXTCONF_H)
+handle.o: $(arch_hdrdir)/ruby/config.h
+handle.o: $(hdrdir)/ruby.h
+handle.o: $(hdrdir)/ruby/assert.h
+handle.o: $(hdrdir)/ruby/backward.h
+handle.o: $(hdrdir)/ruby/backward/2/assume.h
+handle.o: $(hdrdir)/ruby/backward/2/attributes.h
+handle.o: $(hdrdir)/ruby/backward/2/bool.h
+handle.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+handle.o: $(hdrdir)/ruby/backward/2/inttypes.h
+handle.o: $(hdrdir)/ruby/backward/2/limits.h
+handle.o: $(hdrdir)/ruby/backward/2/long_long.h
+handle.o: $(hdrdir)/ruby/backward/2/stdalign.h
+handle.o: $(hdrdir)/ruby/backward/2/stdarg.h
+handle.o: $(hdrdir)/ruby/defines.h
+handle.o: $(hdrdir)/ruby/intern.h
+handle.o: $(hdrdir)/ruby/internal/anyargs.h
+handle.o: $(hdrdir)/ruby/internal/arithmetic.h
+handle.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+handle.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+handle.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+handle.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+handle.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+handle.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+handle.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+handle.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+handle.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+handle.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+handle.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+handle.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+handle.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+handle.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+handle.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+handle.o: $(hdrdir)/ruby/internal/assume.h
+handle.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+handle.o: $(hdrdir)/ruby/internal/attr/artificial.h
+handle.o: $(hdrdir)/ruby/internal/attr/cold.h
+handle.o: $(hdrdir)/ruby/internal/attr/const.h
+handle.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+handle.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+handle.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+handle.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+handle.o: $(hdrdir)/ruby/internal/attr/error.h
+handle.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+handle.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+handle.o: $(hdrdir)/ruby/internal/attr/format.h
+handle.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+handle.o: $(hdrdir)/ruby/internal/attr/noalias.h
+handle.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+handle.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+handle.o: $(hdrdir)/ruby/internal/attr/noinline.h
+handle.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+handle.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+handle.o: $(hdrdir)/ruby/internal/attr/pure.h
+handle.o: $(hdrdir)/ruby/internal/attr/restrict.h
+handle.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+handle.o: $(hdrdir)/ruby/internal/attr/warning.h
+handle.o: $(hdrdir)/ruby/internal/attr/weakref.h
+handle.o: $(hdrdir)/ruby/internal/cast.h
+handle.o: $(hdrdir)/ruby/internal/compiler_is.h
+handle.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+handle.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+handle.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+handle.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+handle.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+handle.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+handle.o: $(hdrdir)/ruby/internal/compiler_since.h
+handle.o: $(hdrdir)/ruby/internal/config.h
+handle.o: $(hdrdir)/ruby/internal/constant_p.h
+handle.o: $(hdrdir)/ruby/internal/core.h
+handle.o: $(hdrdir)/ruby/internal/core/rarray.h
+handle.o: $(hdrdir)/ruby/internal/core/rbasic.h
+handle.o: $(hdrdir)/ruby/internal/core/rbignum.h
+handle.o: $(hdrdir)/ruby/internal/core/rclass.h
+handle.o: $(hdrdir)/ruby/internal/core/rdata.h
+handle.o: $(hdrdir)/ruby/internal/core/rfile.h
+handle.o: $(hdrdir)/ruby/internal/core/rhash.h
+handle.o: $(hdrdir)/ruby/internal/core/robject.h
+handle.o: $(hdrdir)/ruby/internal/core/rregexp.h
+handle.o: $(hdrdir)/ruby/internal/core/rstring.h
+handle.o: $(hdrdir)/ruby/internal/core/rstruct.h
+handle.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+handle.o: $(hdrdir)/ruby/internal/ctype.h
+handle.o: $(hdrdir)/ruby/internal/dllexport.h
+handle.o: $(hdrdir)/ruby/internal/dosish.h
+handle.o: $(hdrdir)/ruby/internal/error.h
+handle.o: $(hdrdir)/ruby/internal/eval.h
+handle.o: $(hdrdir)/ruby/internal/event.h
+handle.o: $(hdrdir)/ruby/internal/fl_type.h
+handle.o: $(hdrdir)/ruby/internal/gc.h
+handle.o: $(hdrdir)/ruby/internal/glob.h
+handle.o: $(hdrdir)/ruby/internal/globals.h
+handle.o: $(hdrdir)/ruby/internal/has/attribute.h
+handle.o: $(hdrdir)/ruby/internal/has/builtin.h
+handle.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+handle.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+handle.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+handle.o: $(hdrdir)/ruby/internal/has/extension.h
+handle.o: $(hdrdir)/ruby/internal/has/feature.h
+handle.o: $(hdrdir)/ruby/internal/has/warning.h
+handle.o: $(hdrdir)/ruby/internal/intern/array.h
+handle.o: $(hdrdir)/ruby/internal/intern/bignum.h
+handle.o: $(hdrdir)/ruby/internal/intern/class.h
+handle.o: $(hdrdir)/ruby/internal/intern/compar.h
+handle.o: $(hdrdir)/ruby/internal/intern/complex.h
+handle.o: $(hdrdir)/ruby/internal/intern/cont.h
+handle.o: $(hdrdir)/ruby/internal/intern/dir.h
+handle.o: $(hdrdir)/ruby/internal/intern/enum.h
+handle.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+handle.o: $(hdrdir)/ruby/internal/intern/error.h
+handle.o: $(hdrdir)/ruby/internal/intern/eval.h
+handle.o: $(hdrdir)/ruby/internal/intern/file.h
+handle.o: $(hdrdir)/ruby/internal/intern/gc.h
+handle.o: $(hdrdir)/ruby/internal/intern/hash.h
+handle.o: $(hdrdir)/ruby/internal/intern/io.h
+handle.o: $(hdrdir)/ruby/internal/intern/load.h
+handle.o: $(hdrdir)/ruby/internal/intern/marshal.h
+handle.o: $(hdrdir)/ruby/internal/intern/numeric.h
+handle.o: $(hdrdir)/ruby/internal/intern/object.h
+handle.o: $(hdrdir)/ruby/internal/intern/parse.h
+handle.o: $(hdrdir)/ruby/internal/intern/proc.h
+handle.o: $(hdrdir)/ruby/internal/intern/process.h
+handle.o: $(hdrdir)/ruby/internal/intern/random.h
+handle.o: $(hdrdir)/ruby/internal/intern/range.h
+handle.o: $(hdrdir)/ruby/internal/intern/rational.h
+handle.o: $(hdrdir)/ruby/internal/intern/re.h
+handle.o: $(hdrdir)/ruby/internal/intern/ruby.h
+handle.o: $(hdrdir)/ruby/internal/intern/select.h
+handle.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+handle.o: $(hdrdir)/ruby/internal/intern/signal.h
+handle.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+handle.o: $(hdrdir)/ruby/internal/intern/string.h
+handle.o: $(hdrdir)/ruby/internal/intern/struct.h
+handle.o: $(hdrdir)/ruby/internal/intern/thread.h
+handle.o: $(hdrdir)/ruby/internal/intern/time.h
+handle.o: $(hdrdir)/ruby/internal/intern/variable.h
+handle.o: $(hdrdir)/ruby/internal/intern/vm.h
+handle.o: $(hdrdir)/ruby/internal/interpreter.h
+handle.o: $(hdrdir)/ruby/internal/iterator.h
+handle.o: $(hdrdir)/ruby/internal/memory.h
+handle.o: $(hdrdir)/ruby/internal/method.h
+handle.o: $(hdrdir)/ruby/internal/module.h
+handle.o: $(hdrdir)/ruby/internal/newobj.h
+handle.o: $(hdrdir)/ruby/internal/rgengc.h
+handle.o: $(hdrdir)/ruby/internal/scan_args.h
+handle.o: $(hdrdir)/ruby/internal/special_consts.h
+handle.o: $(hdrdir)/ruby/internal/static_assert.h
+handle.o: $(hdrdir)/ruby/internal/stdalign.h
+handle.o: $(hdrdir)/ruby/internal/stdbool.h
+handle.o: $(hdrdir)/ruby/internal/symbol.h
+handle.o: $(hdrdir)/ruby/internal/token_paste.h
+handle.o: $(hdrdir)/ruby/internal/value.h
+handle.o: $(hdrdir)/ruby/internal/value_type.h
+handle.o: $(hdrdir)/ruby/internal/variable.h
+handle.o: $(hdrdir)/ruby/internal/warning_push.h
+handle.o: $(hdrdir)/ruby/internal/xmalloc.h
+handle.o: $(hdrdir)/ruby/missing.h
+handle.o: $(hdrdir)/ruby/ruby.h
+handle.o: $(hdrdir)/ruby/st.h
+handle.o: $(hdrdir)/ruby/subst.h
+handle.o: closure.h
+handle.o: conversions.h
+handle.o: fiddle.h
+handle.o: function.h
+handle.o: handle.c
+memory_view.o: $(RUBY_EXTCONF_H)
+memory_view.o: $(arch_hdrdir)/ruby/config.h
+memory_view.o: $(hdrdir)/ruby.h
+memory_view.o: $(hdrdir)/ruby/assert.h
+memory_view.o: $(hdrdir)/ruby/backward.h
+memory_view.o: $(hdrdir)/ruby/backward/2/assume.h
+memory_view.o: $(hdrdir)/ruby/backward/2/attributes.h
+memory_view.o: $(hdrdir)/ruby/backward/2/bool.h
+memory_view.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+memory_view.o: $(hdrdir)/ruby/backward/2/inttypes.h
+memory_view.o: $(hdrdir)/ruby/backward/2/limits.h
+memory_view.o: $(hdrdir)/ruby/backward/2/long_long.h
+memory_view.o: $(hdrdir)/ruby/backward/2/stdalign.h
+memory_view.o: $(hdrdir)/ruby/backward/2/stdarg.h
+memory_view.o: $(hdrdir)/ruby/defines.h
+memory_view.o: $(hdrdir)/ruby/intern.h
+memory_view.o: $(hdrdir)/ruby/internal/anyargs.h
+memory_view.o: $(hdrdir)/ruby/internal/arithmetic.h
+memory_view.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+memory_view.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+memory_view.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+memory_view.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+memory_view.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+memory_view.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+memory_view.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+memory_view.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+memory_view.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+memory_view.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+memory_view.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+memory_view.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+memory_view.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+memory_view.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+memory_view.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+memory_view.o: $(hdrdir)/ruby/internal/assume.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/artificial.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/cold.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/const.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/error.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/format.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/noalias.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/noinline.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/pure.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/restrict.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/warning.h
+memory_view.o: $(hdrdir)/ruby/internal/attr/weakref.h
+memory_view.o: $(hdrdir)/ruby/internal/cast.h
+memory_view.o: $(hdrdir)/ruby/internal/compiler_is.h
+memory_view.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+memory_view.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+memory_view.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+memory_view.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+memory_view.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+memory_view.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+memory_view.o: $(hdrdir)/ruby/internal/compiler_since.h
+memory_view.o: $(hdrdir)/ruby/internal/config.h
+memory_view.o: $(hdrdir)/ruby/internal/constant_p.h
+memory_view.o: $(hdrdir)/ruby/internal/core.h
+memory_view.o: $(hdrdir)/ruby/internal/core/rarray.h
+memory_view.o: $(hdrdir)/ruby/internal/core/rbasic.h
+memory_view.o: $(hdrdir)/ruby/internal/core/rbignum.h
+memory_view.o: $(hdrdir)/ruby/internal/core/rclass.h
+memory_view.o: $(hdrdir)/ruby/internal/core/rdata.h
+memory_view.o: $(hdrdir)/ruby/internal/core/rfile.h
+memory_view.o: $(hdrdir)/ruby/internal/core/rhash.h
+memory_view.o: $(hdrdir)/ruby/internal/core/robject.h
+memory_view.o: $(hdrdir)/ruby/internal/core/rregexp.h
+memory_view.o: $(hdrdir)/ruby/internal/core/rstring.h
+memory_view.o: $(hdrdir)/ruby/internal/core/rstruct.h
+memory_view.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+memory_view.o: $(hdrdir)/ruby/internal/ctype.h
+memory_view.o: $(hdrdir)/ruby/internal/dllexport.h
+memory_view.o: $(hdrdir)/ruby/internal/dosish.h
+memory_view.o: $(hdrdir)/ruby/internal/error.h
+memory_view.o: $(hdrdir)/ruby/internal/eval.h
+memory_view.o: $(hdrdir)/ruby/internal/event.h
+memory_view.o: $(hdrdir)/ruby/internal/fl_type.h
+memory_view.o: $(hdrdir)/ruby/internal/gc.h
+memory_view.o: $(hdrdir)/ruby/internal/glob.h
+memory_view.o: $(hdrdir)/ruby/internal/globals.h
+memory_view.o: $(hdrdir)/ruby/internal/has/attribute.h
+memory_view.o: $(hdrdir)/ruby/internal/has/builtin.h
+memory_view.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+memory_view.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+memory_view.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+memory_view.o: $(hdrdir)/ruby/internal/has/extension.h
+memory_view.o: $(hdrdir)/ruby/internal/has/feature.h
+memory_view.o: $(hdrdir)/ruby/internal/has/warning.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/array.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/bignum.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/class.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/compar.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/complex.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/cont.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/dir.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/enum.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/error.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/eval.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/file.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/gc.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/hash.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/io.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/load.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/marshal.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/numeric.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/object.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/parse.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/proc.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/process.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/random.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/range.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/rational.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/re.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/ruby.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/select.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/signal.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/string.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/struct.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/thread.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/time.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/variable.h
+memory_view.o: $(hdrdir)/ruby/internal/intern/vm.h
+memory_view.o: $(hdrdir)/ruby/internal/interpreter.h
+memory_view.o: $(hdrdir)/ruby/internal/iterator.h
+memory_view.o: $(hdrdir)/ruby/internal/memory.h
+memory_view.o: $(hdrdir)/ruby/internal/method.h
+memory_view.o: $(hdrdir)/ruby/internal/module.h
+memory_view.o: $(hdrdir)/ruby/internal/newobj.h
+memory_view.o: $(hdrdir)/ruby/internal/rgengc.h
+memory_view.o: $(hdrdir)/ruby/internal/scan_args.h
+memory_view.o: $(hdrdir)/ruby/internal/special_consts.h
+memory_view.o: $(hdrdir)/ruby/internal/static_assert.h
+memory_view.o: $(hdrdir)/ruby/internal/stdalign.h
+memory_view.o: $(hdrdir)/ruby/internal/stdbool.h
+memory_view.o: $(hdrdir)/ruby/internal/symbol.h
+memory_view.o: $(hdrdir)/ruby/internal/token_paste.h
+memory_view.o: $(hdrdir)/ruby/internal/value.h
+memory_view.o: $(hdrdir)/ruby/internal/value_type.h
+memory_view.o: $(hdrdir)/ruby/internal/variable.h
+memory_view.o: $(hdrdir)/ruby/internal/warning_push.h
+memory_view.o: $(hdrdir)/ruby/internal/xmalloc.h
+memory_view.o: $(hdrdir)/ruby/memory_view.h
+memory_view.o: $(hdrdir)/ruby/missing.h
+memory_view.o: $(hdrdir)/ruby/ruby.h
+memory_view.o: $(hdrdir)/ruby/st.h
+memory_view.o: $(hdrdir)/ruby/subst.h
+memory_view.o: closure.h
+memory_view.o: conversions.h
+memory_view.o: fiddle.h
+memory_view.o: function.h
+memory_view.o: memory_view.c
+pinned.o: $(RUBY_EXTCONF_H)
+pinned.o: $(arch_hdrdir)/ruby/config.h
+pinned.o: $(hdrdir)/ruby.h
+pinned.o: $(hdrdir)/ruby/assert.h
+pinned.o: $(hdrdir)/ruby/backward.h
+pinned.o: $(hdrdir)/ruby/backward/2/assume.h
+pinned.o: $(hdrdir)/ruby/backward/2/attributes.h
+pinned.o: $(hdrdir)/ruby/backward/2/bool.h
+pinned.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+pinned.o: $(hdrdir)/ruby/backward/2/inttypes.h
+pinned.o: $(hdrdir)/ruby/backward/2/limits.h
+pinned.o: $(hdrdir)/ruby/backward/2/long_long.h
+pinned.o: $(hdrdir)/ruby/backward/2/stdalign.h
+pinned.o: $(hdrdir)/ruby/backward/2/stdarg.h
+pinned.o: $(hdrdir)/ruby/defines.h
+pinned.o: $(hdrdir)/ruby/intern.h
+pinned.o: $(hdrdir)/ruby/internal/anyargs.h
+pinned.o: $(hdrdir)/ruby/internal/arithmetic.h
+pinned.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+pinned.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+pinned.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+pinned.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+pinned.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+pinned.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+pinned.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+pinned.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+pinned.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+pinned.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+pinned.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+pinned.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+pinned.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+pinned.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+pinned.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+pinned.o: $(hdrdir)/ruby/internal/assume.h
+pinned.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+pinned.o: $(hdrdir)/ruby/internal/attr/artificial.h
+pinned.o: $(hdrdir)/ruby/internal/attr/cold.h
+pinned.o: $(hdrdir)/ruby/internal/attr/const.h
+pinned.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+pinned.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+pinned.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+pinned.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+pinned.o: $(hdrdir)/ruby/internal/attr/error.h
+pinned.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+pinned.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+pinned.o: $(hdrdir)/ruby/internal/attr/format.h
+pinned.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+pinned.o: $(hdrdir)/ruby/internal/attr/noalias.h
+pinned.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+pinned.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+pinned.o: $(hdrdir)/ruby/internal/attr/noinline.h
+pinned.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+pinned.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+pinned.o: $(hdrdir)/ruby/internal/attr/pure.h
+pinned.o: $(hdrdir)/ruby/internal/attr/restrict.h
+pinned.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+pinned.o: $(hdrdir)/ruby/internal/attr/warning.h
+pinned.o: $(hdrdir)/ruby/internal/attr/weakref.h
+pinned.o: $(hdrdir)/ruby/internal/cast.h
+pinned.o: $(hdrdir)/ruby/internal/compiler_is.h
+pinned.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+pinned.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+pinned.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+pinned.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+pinned.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+pinned.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+pinned.o: $(hdrdir)/ruby/internal/compiler_since.h
+pinned.o: $(hdrdir)/ruby/internal/config.h
+pinned.o: $(hdrdir)/ruby/internal/constant_p.h
+pinned.o: $(hdrdir)/ruby/internal/core.h
+pinned.o: $(hdrdir)/ruby/internal/core/rarray.h
+pinned.o: $(hdrdir)/ruby/internal/core/rbasic.h
+pinned.o: $(hdrdir)/ruby/internal/core/rbignum.h
+pinned.o: $(hdrdir)/ruby/internal/core/rclass.h
+pinned.o: $(hdrdir)/ruby/internal/core/rdata.h
+pinned.o: $(hdrdir)/ruby/internal/core/rfile.h
+pinned.o: $(hdrdir)/ruby/internal/core/rhash.h
+pinned.o: $(hdrdir)/ruby/internal/core/robject.h
+pinned.o: $(hdrdir)/ruby/internal/core/rregexp.h
+pinned.o: $(hdrdir)/ruby/internal/core/rstring.h
+pinned.o: $(hdrdir)/ruby/internal/core/rstruct.h
+pinned.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+pinned.o: $(hdrdir)/ruby/internal/ctype.h
+pinned.o: $(hdrdir)/ruby/internal/dllexport.h
+pinned.o: $(hdrdir)/ruby/internal/dosish.h
+pinned.o: $(hdrdir)/ruby/internal/error.h
+pinned.o: $(hdrdir)/ruby/internal/eval.h
+pinned.o: $(hdrdir)/ruby/internal/event.h
+pinned.o: $(hdrdir)/ruby/internal/fl_type.h
+pinned.o: $(hdrdir)/ruby/internal/gc.h
+pinned.o: $(hdrdir)/ruby/internal/glob.h
+pinned.o: $(hdrdir)/ruby/internal/globals.h
+pinned.o: $(hdrdir)/ruby/internal/has/attribute.h
+pinned.o: $(hdrdir)/ruby/internal/has/builtin.h
+pinned.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+pinned.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+pinned.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+pinned.o: $(hdrdir)/ruby/internal/has/extension.h
+pinned.o: $(hdrdir)/ruby/internal/has/feature.h
+pinned.o: $(hdrdir)/ruby/internal/has/warning.h
+pinned.o: $(hdrdir)/ruby/internal/intern/array.h
+pinned.o: $(hdrdir)/ruby/internal/intern/bignum.h
+pinned.o: $(hdrdir)/ruby/internal/intern/class.h
+pinned.o: $(hdrdir)/ruby/internal/intern/compar.h
+pinned.o: $(hdrdir)/ruby/internal/intern/complex.h
+pinned.o: $(hdrdir)/ruby/internal/intern/cont.h
+pinned.o: $(hdrdir)/ruby/internal/intern/dir.h
+pinned.o: $(hdrdir)/ruby/internal/intern/enum.h
+pinned.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+pinned.o: $(hdrdir)/ruby/internal/intern/error.h
+pinned.o: $(hdrdir)/ruby/internal/intern/eval.h
+pinned.o: $(hdrdir)/ruby/internal/intern/file.h
+pinned.o: $(hdrdir)/ruby/internal/intern/gc.h
+pinned.o: $(hdrdir)/ruby/internal/intern/hash.h
+pinned.o: $(hdrdir)/ruby/internal/intern/io.h
+pinned.o: $(hdrdir)/ruby/internal/intern/load.h
+pinned.o: $(hdrdir)/ruby/internal/intern/marshal.h
+pinned.o: $(hdrdir)/ruby/internal/intern/numeric.h
+pinned.o: $(hdrdir)/ruby/internal/intern/object.h
+pinned.o: $(hdrdir)/ruby/internal/intern/parse.h
+pinned.o: $(hdrdir)/ruby/internal/intern/proc.h
+pinned.o: $(hdrdir)/ruby/internal/intern/process.h
+pinned.o: $(hdrdir)/ruby/internal/intern/random.h
+pinned.o: $(hdrdir)/ruby/internal/intern/range.h
+pinned.o: $(hdrdir)/ruby/internal/intern/rational.h
+pinned.o: $(hdrdir)/ruby/internal/intern/re.h
+pinned.o: $(hdrdir)/ruby/internal/intern/ruby.h
+pinned.o: $(hdrdir)/ruby/internal/intern/select.h
+pinned.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+pinned.o: $(hdrdir)/ruby/internal/intern/signal.h
+pinned.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+pinned.o: $(hdrdir)/ruby/internal/intern/string.h
+pinned.o: $(hdrdir)/ruby/internal/intern/struct.h
+pinned.o: $(hdrdir)/ruby/internal/intern/thread.h
+pinned.o: $(hdrdir)/ruby/internal/intern/time.h
+pinned.o: $(hdrdir)/ruby/internal/intern/variable.h
+pinned.o: $(hdrdir)/ruby/internal/intern/vm.h
+pinned.o: $(hdrdir)/ruby/internal/interpreter.h
+pinned.o: $(hdrdir)/ruby/internal/iterator.h
+pinned.o: $(hdrdir)/ruby/internal/memory.h
+pinned.o: $(hdrdir)/ruby/internal/method.h
+pinned.o: $(hdrdir)/ruby/internal/module.h
+pinned.o: $(hdrdir)/ruby/internal/newobj.h
+pinned.o: $(hdrdir)/ruby/internal/rgengc.h
+pinned.o: $(hdrdir)/ruby/internal/scan_args.h
+pinned.o: $(hdrdir)/ruby/internal/special_consts.h
+pinned.o: $(hdrdir)/ruby/internal/static_assert.h
+pinned.o: $(hdrdir)/ruby/internal/stdalign.h
+pinned.o: $(hdrdir)/ruby/internal/stdbool.h
+pinned.o: $(hdrdir)/ruby/internal/symbol.h
+pinned.o: $(hdrdir)/ruby/internal/token_paste.h
+pinned.o: $(hdrdir)/ruby/internal/value.h
+pinned.o: $(hdrdir)/ruby/internal/value_type.h
+pinned.o: $(hdrdir)/ruby/internal/variable.h
+pinned.o: $(hdrdir)/ruby/internal/warning_push.h
+pinned.o: $(hdrdir)/ruby/internal/xmalloc.h
+pinned.o: $(hdrdir)/ruby/missing.h
+pinned.o: $(hdrdir)/ruby/ruby.h
+pinned.o: $(hdrdir)/ruby/st.h
+pinned.o: $(hdrdir)/ruby/subst.h
+pinned.o: closure.h
+pinned.o: conversions.h
+pinned.o: fiddle.h
+pinned.o: function.h
+pinned.o: pinned.c
+pointer.o: $(RUBY_EXTCONF_H)
+pointer.o: $(arch_hdrdir)/ruby/config.h
+pointer.o: $(hdrdir)/ruby.h
+pointer.o: $(hdrdir)/ruby/assert.h
+pointer.o: $(hdrdir)/ruby/backward.h
+pointer.o: $(hdrdir)/ruby/backward/2/assume.h
+pointer.o: $(hdrdir)/ruby/backward/2/attributes.h
+pointer.o: $(hdrdir)/ruby/backward/2/bool.h
+pointer.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+pointer.o: $(hdrdir)/ruby/backward/2/inttypes.h
+pointer.o: $(hdrdir)/ruby/backward/2/limits.h
+pointer.o: $(hdrdir)/ruby/backward/2/long_long.h
+pointer.o: $(hdrdir)/ruby/backward/2/stdalign.h
+pointer.o: $(hdrdir)/ruby/backward/2/stdarg.h
+pointer.o: $(hdrdir)/ruby/defines.h
+pointer.o: $(hdrdir)/ruby/encoding.h
+pointer.o: $(hdrdir)/ruby/intern.h
+pointer.o: $(hdrdir)/ruby/internal/anyargs.h
+pointer.o: $(hdrdir)/ruby/internal/arithmetic.h
+pointer.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+pointer.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+pointer.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+pointer.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+pointer.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+pointer.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+pointer.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+pointer.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+pointer.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+pointer.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+pointer.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+pointer.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+pointer.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+pointer.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+pointer.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+pointer.o: $(hdrdir)/ruby/internal/assume.h
+pointer.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+pointer.o: $(hdrdir)/ruby/internal/attr/artificial.h
+pointer.o: $(hdrdir)/ruby/internal/attr/cold.h
+pointer.o: $(hdrdir)/ruby/internal/attr/const.h
+pointer.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+pointer.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+pointer.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+pointer.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+pointer.o: $(hdrdir)/ruby/internal/attr/error.h
+pointer.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+pointer.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+pointer.o: $(hdrdir)/ruby/internal/attr/format.h
+pointer.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+pointer.o: $(hdrdir)/ruby/internal/attr/noalias.h
+pointer.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+pointer.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+pointer.o: $(hdrdir)/ruby/internal/attr/noinline.h
+pointer.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+pointer.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+pointer.o: $(hdrdir)/ruby/internal/attr/pure.h
+pointer.o: $(hdrdir)/ruby/internal/attr/restrict.h
+pointer.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+pointer.o: $(hdrdir)/ruby/internal/attr/warning.h
+pointer.o: $(hdrdir)/ruby/internal/attr/weakref.h
+pointer.o: $(hdrdir)/ruby/internal/cast.h
+pointer.o: $(hdrdir)/ruby/internal/compiler_is.h
+pointer.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+pointer.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+pointer.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+pointer.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+pointer.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+pointer.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+pointer.o: $(hdrdir)/ruby/internal/compiler_since.h
+pointer.o: $(hdrdir)/ruby/internal/config.h
+pointer.o: $(hdrdir)/ruby/internal/constant_p.h
+pointer.o: $(hdrdir)/ruby/internal/core.h
+pointer.o: $(hdrdir)/ruby/internal/core/rarray.h
+pointer.o: $(hdrdir)/ruby/internal/core/rbasic.h
+pointer.o: $(hdrdir)/ruby/internal/core/rbignum.h
+pointer.o: $(hdrdir)/ruby/internal/core/rclass.h
+pointer.o: $(hdrdir)/ruby/internal/core/rdata.h
+pointer.o: $(hdrdir)/ruby/internal/core/rfile.h
+pointer.o: $(hdrdir)/ruby/internal/core/rhash.h
+pointer.o: $(hdrdir)/ruby/internal/core/robject.h
+pointer.o: $(hdrdir)/ruby/internal/core/rregexp.h
+pointer.o: $(hdrdir)/ruby/internal/core/rstring.h
+pointer.o: $(hdrdir)/ruby/internal/core/rstruct.h
+pointer.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+pointer.o: $(hdrdir)/ruby/internal/ctype.h
+pointer.o: $(hdrdir)/ruby/internal/dllexport.h
+pointer.o: $(hdrdir)/ruby/internal/dosish.h
+pointer.o: $(hdrdir)/ruby/internal/error.h
+pointer.o: $(hdrdir)/ruby/internal/eval.h
+pointer.o: $(hdrdir)/ruby/internal/event.h
+pointer.o: $(hdrdir)/ruby/internal/fl_type.h
+pointer.o: $(hdrdir)/ruby/internal/gc.h
+pointer.o: $(hdrdir)/ruby/internal/glob.h
+pointer.o: $(hdrdir)/ruby/internal/globals.h
+pointer.o: $(hdrdir)/ruby/internal/has/attribute.h
+pointer.o: $(hdrdir)/ruby/internal/has/builtin.h
+pointer.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+pointer.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+pointer.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+pointer.o: $(hdrdir)/ruby/internal/has/extension.h
+pointer.o: $(hdrdir)/ruby/internal/has/feature.h
+pointer.o: $(hdrdir)/ruby/internal/has/warning.h
+pointer.o: $(hdrdir)/ruby/internal/intern/array.h
+pointer.o: $(hdrdir)/ruby/internal/intern/bignum.h
+pointer.o: $(hdrdir)/ruby/internal/intern/class.h
+pointer.o: $(hdrdir)/ruby/internal/intern/compar.h
+pointer.o: $(hdrdir)/ruby/internal/intern/complex.h
+pointer.o: $(hdrdir)/ruby/internal/intern/cont.h
+pointer.o: $(hdrdir)/ruby/internal/intern/dir.h
+pointer.o: $(hdrdir)/ruby/internal/intern/enum.h
+pointer.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+pointer.o: $(hdrdir)/ruby/internal/intern/error.h
+pointer.o: $(hdrdir)/ruby/internal/intern/eval.h
+pointer.o: $(hdrdir)/ruby/internal/intern/file.h
+pointer.o: $(hdrdir)/ruby/internal/intern/gc.h
+pointer.o: $(hdrdir)/ruby/internal/intern/hash.h
+pointer.o: $(hdrdir)/ruby/internal/intern/io.h
+pointer.o: $(hdrdir)/ruby/internal/intern/load.h
+pointer.o: $(hdrdir)/ruby/internal/intern/marshal.h
+pointer.o: $(hdrdir)/ruby/internal/intern/numeric.h
+pointer.o: $(hdrdir)/ruby/internal/intern/object.h
+pointer.o: $(hdrdir)/ruby/internal/intern/parse.h
+pointer.o: $(hdrdir)/ruby/internal/intern/proc.h
+pointer.o: $(hdrdir)/ruby/internal/intern/process.h
+pointer.o: $(hdrdir)/ruby/internal/intern/random.h
+pointer.o: $(hdrdir)/ruby/internal/intern/range.h
+pointer.o: $(hdrdir)/ruby/internal/intern/rational.h
+pointer.o: $(hdrdir)/ruby/internal/intern/re.h
+pointer.o: $(hdrdir)/ruby/internal/intern/ruby.h
+pointer.o: $(hdrdir)/ruby/internal/intern/select.h
+pointer.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+pointer.o: $(hdrdir)/ruby/internal/intern/signal.h
+pointer.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+pointer.o: $(hdrdir)/ruby/internal/intern/string.h
+pointer.o: $(hdrdir)/ruby/internal/intern/struct.h
+pointer.o: $(hdrdir)/ruby/internal/intern/thread.h
+pointer.o: $(hdrdir)/ruby/internal/intern/time.h
+pointer.o: $(hdrdir)/ruby/internal/intern/variable.h
+pointer.o: $(hdrdir)/ruby/internal/intern/vm.h
+pointer.o: $(hdrdir)/ruby/internal/interpreter.h
+pointer.o: $(hdrdir)/ruby/internal/iterator.h
+pointer.o: $(hdrdir)/ruby/internal/memory.h
+pointer.o: $(hdrdir)/ruby/internal/method.h
+pointer.o: $(hdrdir)/ruby/internal/module.h
+pointer.o: $(hdrdir)/ruby/internal/newobj.h
+pointer.o: $(hdrdir)/ruby/internal/rgengc.h
+pointer.o: $(hdrdir)/ruby/internal/scan_args.h
+pointer.o: $(hdrdir)/ruby/internal/special_consts.h
+pointer.o: $(hdrdir)/ruby/internal/static_assert.h
+pointer.o: $(hdrdir)/ruby/internal/stdalign.h
+pointer.o: $(hdrdir)/ruby/internal/stdbool.h
+pointer.o: $(hdrdir)/ruby/internal/symbol.h
+pointer.o: $(hdrdir)/ruby/internal/token_paste.h
+pointer.o: $(hdrdir)/ruby/internal/value.h
+pointer.o: $(hdrdir)/ruby/internal/value_type.h
+pointer.o: $(hdrdir)/ruby/internal/variable.h
+pointer.o: $(hdrdir)/ruby/internal/warning_push.h
+pointer.o: $(hdrdir)/ruby/internal/xmalloc.h
+pointer.o: $(hdrdir)/ruby/io.h
+pointer.o: $(hdrdir)/ruby/memory_view.h
+pointer.o: $(hdrdir)/ruby/missing.h
+pointer.o: $(hdrdir)/ruby/onigmo.h
+pointer.o: $(hdrdir)/ruby/oniguruma.h
+pointer.o: $(hdrdir)/ruby/ruby.h
+pointer.o: $(hdrdir)/ruby/st.h
+pointer.o: $(hdrdir)/ruby/subst.h
+pointer.o: closure.h
+pointer.o: conversions.h
+pointer.o: fiddle.h
+pointer.o: function.h
+pointer.o: pointer.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/fiddle/extconf.rb b/ext/fiddle/extconf.rb
index 0359355193..6ca685317e 100644
--- a/ext/fiddle/extconf.rb
+++ b/ext/fiddle/extconf.rb
@@ -1,52 +1,113 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'mkmf'
 
 # :stopdoc:
 
+def gcc?
+  RbConfig::CONFIG["GCC"] == "yes"
+end
+
+def disable_optimization_build_flag(flags)
+  if gcc?
+    expanded_flags = RbConfig.expand(flags.dup)
+    optimization_option_pattern = /(^|\s)?-O\d(\s|$)?/
+    if optimization_option_pattern.match?(expanded_flags)
+      expanded_flags.gsub(optimization_option_pattern, '\\1-Og\\2')
+    else
+      flags + " -Og"
+    end
+  else
+    flags
+  end
+end
+
+def enable_debug_build_flag(flags)
+  if gcc?
+    expanded_flags = RbConfig.expand(flags.dup)
+    debug_option_pattern = /(^|\s)-g(?:gdb)?\d?(\s|$)/
+    if debug_option_pattern.match?(expanded_flags)
+      expanded_flags.gsub(debug_option_pattern, '\\1-ggdb3\\2')
+    else
+      flags + " -ggdb3"
+    end
+  else
+    flags
+  end
+end
+
+checking_for(checking_message("--enable-debug-build option")) do
+  enable_debug_build = enable_config("debug-build", false)
+  if enable_debug_build
+    $CFLAGS = disable_optimization_build_flag($CFLAGS)
+    $CFLAGS = enable_debug_build_flag($CFLAGS)
+  end
+  enable_debug_build
+end
+
+libffi_version = nil
+have_libffi = false
 bundle = enable_config('bundled-libffi')
-if ! bundle
+unless bundle
   dir_config 'libffi'
 
-  pkg_config("libffi") and
-    ver = pkg_config("libffi", "modversion")
+  if pkg_config("libffi")
+    libffi_version = pkg_config("libffi", "modversion")
+  end
 
+  have_ffi_header = false
   if have_header(ffi_header = 'ffi.h')
-    true
+    have_ffi_header = true
   elsif have_header(ffi_header = 'ffi/ffi.h')
-    $defs.push(format('-DUSE_HEADER_HACKS'))
-    true
-  end and (have_library('ffi') || have_library('libffi'))
-end or
-begin
-  ver = bundle != false &&
-        Dir.glob("#{$srcdir}/libffi-*/")
-        .map {|n| File.basename(n)}
-        .max_by {|n| n.scan(/\d+/).map(&:to_i)}
-  unless ver
+    $defs.push('-DUSE_HEADER_HACKS')
+    have_ffi_header = true
+  end
+  if have_ffi_header && (have_library('ffi') || have_library('libffi'))
+    have_libffi = true
+  end
+end
+
+unless have_libffi
+  # for https://github.com/ruby/fiddle
+  extlibs_rb = File.expand_path("../../bin/extlibs.rb", $srcdir)
+  if bundle && File.exist?(extlibs_rb)
+    require "fileutils"
+    require_relative "../../bin/extlibs"
+    extlibs = ExtLibs.new
+    cache_dir = File.expand_path("../../tmp/.download_cache", $srcdir)
+    ext_dir = File.expand_path("../../ext", $srcdir)
+    Dir.glob("#{$srcdir}/libffi-*/").each{|dir| FileUtils.rm_rf(dir)}
+    extlibs.run(["--cache=#{cache_dir}", ext_dir])
+  end
+  if bundle != false
+    libffi_package_name = Dir.glob("#{$srcdir}/libffi-*/")
+                            .map {|n| File.basename(n)}
+                            .max_by {|n| n.scan(/\d+/).map(&:to_i)}
+  end
+  unless libffi_package_name
     raise "missing libffi. Please install libffi."
   end
 
-  srcdir = "#{$srcdir}/#{ver}"
+  libffi_srcdir = "#{$srcdir}/#{libffi_package_name}"
   ffi_header = 'ffi.h'
   libffi = Struct.new(*%I[dir srcdir builddir include lib a cflags ldflags opt arch]).new
-  libffi.dir = ver
+  libffi.dir = libffi_package_name
   if $srcdir == "."
-    libffi.builddir = "#{ver}/#{RUBY_PLATFORM}"
+    libffi.builddir = libffi_package_name
     libffi.srcdir = "."
   else
     libffi.builddir = libffi.dir
-    libffi.srcdir = relative_from(srcdir, "..")
+    libffi.srcdir = relative_from(libffi_srcdir, "..")
   end
   libffi.include = "#{libffi.builddir}/include"
   libffi.lib = "#{libffi.builddir}/.libs"
   libffi.a = "#{libffi.lib}/libffi_convenience.#{$LIBEXT}"
   nowarn = CONFIG.merge("warnflags"=>"")
-  libffi.cflags = RbConfig.expand("$(CFLAGS)", nowarn)
-  ver = ver[/libffi-(.*)/, 1]
+  libffi.cflags = RbConfig.expand("$(CFLAGS)".dup, nowarn)
+  libffi_version = libffi_package_name[/libffi-(.*)/, 1]
 
   FileUtils.mkdir_p(libffi.dir)
   libffi.opt = CONFIG['configure_args'][/'(-C)'/, 1]
-  libffi.ldflags = RbConfig.expand("$(LDFLAGS) #{libpathflag([relative_from($topdir, "..")])} #{$LIBRUBYARG}")
+  libffi.ldflags = RbConfig.expand("$(LDFLAGS) #{libpathflag([relative_from($topdir, "..")])} #{$LIBRUBYARG}".dup)
   libffi.arch = RbConfig::CONFIG['host']
   if $mswin
     unless find_executable(as = /x64/ =~ libffi.arch ? "ml64" : "ml")
@@ -71,13 +132,12 @@ begin
   args.concat %W[
     --srcdir=#{libffi.srcdir}
     --host=#{libffi.arch}
-    --enable-builddir=#{RUBY_PLATFORM}
   ]
   args << ($enable_shared || !$static ? '--enable-shared' : '--enable-static')
   args << libffi.opt if libffi.opt
   args.concat %W[
       CC=#{cc} CFLAGS=#{libffi.cflags}
-      CXX=#{cxx} CXXFLAGS=#{RbConfig.expand("$(CXXFLAGS)", nowarn)}
+      CXX=#{cxx} CXXFLAGS=#{RbConfig.expand("$(CXXFLAGS)".dup, nowarn)}
       LD=#{ld} LDFLAGS=#{libffi.ldflags}
   ]
 
@@ -88,7 +148,7 @@ begin
       begin
         IO.copy_stream(libffi.dir + "/config.log", Logging.instance_variable_get(:@logfile))
       rescue SystemCallError => e
-        Logfile.message("%s\n", e.message)
+        Logging.message("%s\n", e.message)
       end
       raise "failed to configure libffi. Please install libffi."
     end
@@ -97,15 +157,33 @@ begin
     FileUtils.rm_f("#{libffi.include}/ffitarget.h")
   end
   unless File.file?("#{libffi.include}/ffitarget.h")
-    FileUtils.cp("#{srcdir}/src/x86/ffitarget.h", libffi.include, preserve: true)
+    FileUtils.cp("#{libffi_srcdir}/src/x86/ffitarget.h", libffi.include, preserve: true)
   end
   $INCFLAGS << " -I" << libffi.include
 end
 
-if ver
-  ver = ver.gsub(/-rc\d+/, '') # If ver contains rc version, just ignored.
-  ver = (ver.split('.') + [0,0])[0,3]
-  $defs.push(%{-DRUBY_LIBFFI_MODVERSION=#{ '%d%03d%03d' % ver }})
+if libffi_version
+  # If libffi_version contains rc version, just ignored.
+  libffi_version = libffi_version.gsub(/-rc\d+/, '')
+  libffi_version = (libffi_version.split('.').map(&:to_i) + [0,0])[0,3]
+  $defs.push(%{-DRUBY_LIBFFI_MODVERSION=#{ '%d%03d%03d' % libffi_version }})
+  warn "libffi_version: #{libffi_version.join('.')}"
+end
+
+case
+when $mswin, $mingw, (libffi_version && (libffi_version <=> [3, 2]) >= 0)
+  $defs << "-DUSE_FFI_CLOSURE_ALLOC=1"
+when (libffi_version && (libffi_version <=> [3, 2]) < 0)
+else
+  have_func('ffi_closure_alloc', ffi_header)
+end
+
+if libffi_version
+  if (libffi_version <=> [3, 0, 11]) >= 0
+    $defs << "-DHAVE_FFI_PREP_CIF_VAR"
+  end
+else
+  have_func('ffi_prep_cif_var', ffi_header)
 end
 
 have_header 'sys/mman.h'
@@ -122,6 +200,8 @@ elsif have_header "windows.h"
   %w{ LoadLibrary FreeLibrary GetProcAddress }.each do |func|
     abort "missing function #{func}" unless have_func(func)
   end
+
+  have_library "ws2_32"
 end
 
 have_const('FFI_STDCALL', ffi_header)
@@ -132,26 +212,31 @@ types.each do |type, signed|
   if /^\#define\s+SIZEOF_#{type}\s+(SIZEOF_(.+)|\d+)/ =~ config
     if size = $2 and size != 'VOIDP'
       size = types.fetch(size) {size}
-      $defs << format("-DTYPE_%s=TYPE_%s", signed||type, size)
+      $defs << "-DTYPE_#{signed||type}=TYPE_#{size}"
     end
     if signed
       check_signedness(type.downcase, "stddef.h")
     end
+  else
+    check_signedness(type.downcase, "stddef.h")
   end
 end
 
+if have_header("ruby/memory_view.h")
+  have_type("rb_memory_view_t", ["ruby/memory_view.h"])
+end
+
 if libffi
   $LOCAL_LIBS.prepend("./#{libffi.a} ").strip! # to exts.mk
   $INCFLAGS.gsub!(/-I#{libffi.dir}/, '-I$(LIBFFI_DIR)')
 end
-$INCFLAGS << " -I$(top_srcdir)"
 create_makefile 'fiddle' do |conf|
   if !libffi
     next conf << "LIBFFI_CLEAN = none\n"
   elsif $gnumake && !$nmake
-    submake = "$(MAKE) -C $(LIBFFI_DIR)\n"
+    submake_arg = "-C $(LIBFFI_DIR)\n"
   else
-    submake = "cd $(LIBFFI_DIR) && \\\n\t\t" << "#{config_string("exec")} $(MAKE)".strip
+    submake_pre = "cd $(LIBFFI_DIR) && #{config_string("exec")}".strip
   end
   if $nmake
     cmd = "$(RUBY) -C $(LIBFFI_DIR) #{libffi_config} --srcdir=$(LIBFFI_SRCDIR)"
@@ -170,7 +255,8 @@ create_makefile 'fiddle' do |conf|
    LIBFFI_CFLAGS = #{libffi.cflags}
    LIBFFI_LDFLAGS = #{libffi.ldflags}
    FFI_H = $(LIBFFI_DIR)/include/ffi.h
-   SUBMAKE_LIBFFI = #{submake}
+   SUBMAKE_PRE = #{submake_pre}
+   SUBMAKE_ARG = #{submake_arg}
    LIBFFI_CLEAN = libffi
   MK
 end
diff --git a/ext/fiddle/extlibs b/ext/fiddle/extlibs
index 7d5fda5247..68dac46a95 100644
--- a/ext/fiddle/extlibs
+++ b/ext/fiddle/extlibs
@@ -1,2 +1,13 @@
-ftp://sourceware.org/pub/libffi/libffi-3.2.1.tar.gz md5:83b89587607e3eb65c70d361f13bab43
-	win32/libffi-3.2.1-mswin.patch -p0
+ver = 3.2.1
+pkg = libffi-$(ver)
+
+https://ftp.osuosl.org/pub/blfs/conglomeration/libffi/$(pkg).tar.gz \
+  md5:83b89587607e3eb65c70d361f13bab43 \
+  sha512:980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483 \
+  #
+	win32/$(pkg)-mswin.patch -p0
+
+$(pkg)/config.guess -> /tool/config.guess
+$(pkg)/config.sub -> /tool/config.sub
+
+! chdir: $(pkg)| autoconf || exit 0
diff --git a/ext/fiddle/fiddle.c b/ext/fiddle/fiddle.c
index 9f3d1537d6..dd819a298c 100644
--- a/ext/fiddle/fiddle.c
+++ b/ext/fiddle/fiddle.c
@@ -1,41 +1,15 @@
 #include <fiddle.h>
 
 VALUE mFiddle;
+VALUE rb_eFiddleDLError;
 VALUE rb_eFiddleError;
 
-#ifndef TYPE_SSIZE_T
-# if SIZEOF_SIZE_T == SIZEOF_INT
-#   define TYPE_SSIZE_T TYPE_INT
-# elif SIZEOF_SIZE_T == SIZEOF_LONG
-#   define TYPE_SSIZE_T TYPE_LONG
-# elif defined HAVE_LONG_LONG && SIZEOF_SIZE_T == SIZEOF_LONG_LONG
-#   define TYPE_SSIZE_T TYPE_LONG_LONG
-# endif
-#endif
-#define TYPE_SIZE_T (-1*SIGNEDNESS_OF_SIZE_T*TYPE_SSIZE_T)
-
-#ifndef TYPE_PTRDIFF_T
-# if SIZEOF_PTRDIFF_T == SIZEOF_INT
-#   define TYPE_PTRDIFF_T TYPE_INT
-# elif SIZEOF_PTRDIFF_T == SIZEOF_LONG
-#   define TYPE_PTRDIFF_T TYPE_LONG
-# elif defined HAVE_LONG_LONG && SIZEOF_PTRDIFF_T == SIZEOF_LONG_LONG
-#   define TYPE_PTRDIFF_T TYPE_LONG_LONG
-# endif
-#endif
+void Init_fiddle_pointer(void);
+void Init_fiddle_pinned(void);
 
-#ifndef TYPE_INTPTR_T
-# if SIZEOF_INTPTR_T == SIZEOF_INT
-#   define TYPE_INTPTR_T TYPE_INT
-# elif SIZEOF_INTPTR_T == SIZEOF_LONG
-#   define TYPE_INTPTR_T TYPE_LONG
-# elif defined HAVE_LONG_LONG && SIZEOF_INTPTR_T == SIZEOF_LONG_LONG
-#   define TYPE_INTPTR_T TYPE_LONG_LONG
-# endif
+#ifdef FIDDLE_MEMORY_VIEW
+void Init_fiddle_memory_view(void);
 #endif
-#define TYPE_UINTPTR_T (-TYPE_INTPTR_T)
-
-void Init_fiddle_pointer(void);
 
 /*
  * call-seq: Fiddle.malloc(size)
@@ -47,8 +21,7 @@ static VALUE
 rb_fiddle_malloc(VALUE self, VALUE size)
 {
     void *ptr;
-
-    ptr = (void*)ruby_xmalloc(NUM2SIZET(size));
+    ptr = (void*)ruby_xcalloc(1, NUM2SIZET(size));
     return PTR2NUM(ptr);
 }
 
@@ -164,11 +137,32 @@ Init_fiddle(void)
     mFiddle = rb_define_module("Fiddle");
 
     /*
+     * Document-class: Fiddle::Error
+     *
+     * Generic error class for Fiddle
+     */
+    rb_eFiddleError = rb_define_class_under(mFiddle, "Error", rb_eStandardError);
+
+    /*
+     * Ruby installed by RubyInstaller for Windows always require
+     * bundled Fiddle because ruby_installer/runtime/dll_directory.rb
+     * requires Fiddle. It's used by
+     * rubygems/defaults/operating_system.rb. It means that the
+     * bundled Fiddle is always required on initialization.
+     *
+     * We just remove existing Fiddle::DLError here to override
+     * the bundled Fiddle.
+     */
+    if (rb_const_defined(mFiddle, rb_intern("DLError"))) {
+        rb_const_remove(mFiddle, rb_intern("DLError"));
+    }
+
+    /*
      * Document-class: Fiddle::DLError
      *
      * standard dynamic load exception
      */
-    rb_eFiddleError = rb_define_class_under(mFiddle, "DLError", rb_eStandardError);
+    rb_eFiddleDLError = rb_define_class_under(mFiddle, "DLError", rb_eFiddleError);
 
     /* Document-const: TYPE_VOID
      *
@@ -214,6 +208,38 @@ Init_fiddle(void)
     rb_define_const(mFiddle, "TYPE_LONG_LONG", INT2NUM(TYPE_LONG_LONG));
 #endif
 
+#ifdef TYPE_INT8_T
+    /* Document-const: TYPE_INT8_T
+     *
+     * C type - int8_t
+     */
+    rb_define_const(mFiddle, "TYPE_INT8_T",    INT2NUM(TYPE_INT8_T));
+#endif
+
+#ifdef TYPE_INT16_T
+    /* Document-const: TYPE_INT16_T
+     *
+     * C type - int16_t
+     */
+    rb_define_const(mFiddle, "TYPE_INT16_T",   INT2NUM(TYPE_INT16_T));
+#endif
+
+#ifdef TYPE_INT32_T
+    /* Document-const: TYPE_INT32_T
+     *
+     * C type - int32_t
+     */
+    rb_define_const(mFiddle, "TYPE_INT32_T",   INT2NUM(TYPE_INT32_T));
+#endif
+
+#ifdef TYPE_INT64_T
+    /* Document-const: TYPE_INT64_T
+     *
+     * C type - int64_t
+     */
+    rb_define_const(mFiddle, "TYPE_INT64_T",   INT2NUM(TYPE_INT64_T));
+#endif
+
     /* Document-const: TYPE_FLOAT
      *
      * C type - float
@@ -226,6 +252,20 @@ Init_fiddle(void)
      */
     rb_define_const(mFiddle, "TYPE_DOUBLE",    INT2NUM(TYPE_DOUBLE));
 
+#ifdef HAVE_FFI_PREP_CIF_VAR
+    /* Document-const: TYPE_VARIADIC
+     *
+     * C type - ...
+     */
+    rb_define_const(mFiddle, "TYPE_VARIADIC",  INT2NUM(TYPE_VARIADIC));
+#endif
+
+    /* Document-const: TYPE_CONST_STRING
+     *
+     * C type - const char* ('\0' terminated const char*)
+     */
+    rb_define_const(mFiddle, "TYPE_CONST_STRING",  INT2NUM(TYPE_CONST_STRING));
+
     /* Document-const: TYPE_SIZE_T
      *
      * C type - size_t
@@ -294,6 +334,30 @@ Init_fiddle(void)
     rb_define_const(mFiddle, "ALIGN_LONG_LONG",  INT2NUM(ALIGN_LONG_LONG));
 #endif
 
+    /* Document-const: ALIGN_INT8_T
+     *
+     * The alignment size of a int8_t
+     */
+    rb_define_const(mFiddle, "ALIGN_INT8_T",  INT2NUM(ALIGN_INT8_T));
+
+    /* Document-const: ALIGN_INT16_T
+     *
+     * The alignment size of a int16_t
+     */
+    rb_define_const(mFiddle, "ALIGN_INT16_T", INT2NUM(ALIGN_INT16_T));
+
+    /* Document-const: ALIGN_INT32_T
+     *
+     * The alignment size of a int32_t
+     */
+    rb_define_const(mFiddle, "ALIGN_INT32_T", INT2NUM(ALIGN_INT32_T));
+
+    /* Document-const: ALIGN_INT64_T
+     *
+     * The alignment size of a int64_t
+     */
+    rb_define_const(mFiddle, "ALIGN_INT64_T", INT2NUM(ALIGN_INT64_T));
+
     /* Document-const: ALIGN_FLOAT
      *
      * The alignment size of a float
@@ -384,6 +448,30 @@ Init_fiddle(void)
     rb_define_const(mFiddle, "SIZEOF_LONG_LONG",  INT2NUM(sizeof(LONG_LONG)));
 #endif
 
+    /* Document-const: SIZEOF_INT8_T
+     *
+     * size of a int8_t
+     */
+    rb_define_const(mFiddle, "SIZEOF_INT8_T",  INT2NUM(sizeof(int8_t)));
+
+    /* Document-const: SIZEOF_INT16_T
+     *
+     * size of a int16_t
+     */
+    rb_define_const(mFiddle, "SIZEOF_INT16_T", INT2NUM(sizeof(int16_t)));
+
+    /* Document-const: SIZEOF_INT32_T
+     *
+     * size of a int32_t
+     */
+    rb_define_const(mFiddle, "SIZEOF_INT32_T", INT2NUM(sizeof(int32_t)));
+
+    /* Document-const: SIZEOF_INT64_T
+     *
+     * size of a int64_t
+     */
+    rb_define_const(mFiddle, "SIZEOF_INT64_T", INT2NUM(sizeof(int64_t)));
+
     /* Document-const: SIZEOF_FLOAT
      *
      * size of a float
@@ -426,6 +514,12 @@ Init_fiddle(void)
      */
     rb_define_const(mFiddle, "SIZEOF_UINTPTR_T",  INT2NUM(sizeof(uintptr_t)));
 
+    /* Document-const: SIZEOF_CONST_STRING
+     *
+     * size of a const char*
+     */
+    rb_define_const(mFiddle, "SIZEOF_CONST_STRING", INT2NUM(sizeof(const char*)));
+
     /* Document-const: RUBY_FREE
      *
      * Address of the ruby_xfree() function
@@ -450,5 +544,10 @@ Init_fiddle(void)
     Init_fiddle_closure();
     Init_fiddle_handle();
     Init_fiddle_pointer();
+    Init_fiddle_pinned();
+
+#ifdef FIDDLE_MEMORY_VIEW
+    Init_fiddle_memory_view();
+#endif
 }
 /* vim: set noet sws=4 sw=4: */
diff --git a/ext/fiddle/fiddle.gemspec b/ext/fiddle/fiddle.gemspec
new file mode 100644
index 0000000000..a47f795f59
--- /dev/null
+++ b/ext/fiddle/fiddle.gemspec
@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+version_module = Module.new do
+  version_rb = File.join(__dir__, "lib/fiddle/version.rb")
+  module_eval(File.read(version_rb), version_rb, __LINE__)
+end
+
+Gem::Specification.new do |spec|
+  spec.name          = "fiddle"
+  spec.version       = version_module::Fiddle::VERSION
+  spec.authors       = ["Aaron Patterson", "SHIBATA Hiroshi"]
+  spec.email         = ["aaron@tenderlovemaking.com", "hsbt@ruby-lang.org"]
+
+  spec.summary       = %q{A libffi wrapper for Ruby.}
+  spec.description   = %q{A libffi wrapper for Ruby.}
+  spec.homepage      = "https://github.com/ruby/fiddle"
+  spec.licenses      = ["Ruby", "BSD-2-Clause"]
+
+  spec.files         = [
+    "LICENSE.txt",
+    "README.md",
+    "Rakefile",
+    "bin/downloader.rb",
+    "bin/extlibs.rb",
+    "ext/fiddle/closure.c",
+    "ext/fiddle/closure.h",
+    "ext/fiddle/conversions.c",
+    "ext/fiddle/conversions.h",
+    "ext/fiddle/depend",
+    "ext/fiddle/extconf.rb",
+    "ext/fiddle/extlibs",
+    "ext/fiddle/fiddle.c",
+    "ext/fiddle/fiddle.h",
+    "ext/fiddle/function.c",
+    "ext/fiddle/function.h",
+    "ext/fiddle/handle.c",
+    "ext/fiddle/memory_view.c",
+    "ext/fiddle/pinned.c",
+    "ext/fiddle/pointer.c",
+    "ext/fiddle/win32/fficonfig.h",
+    "ext/fiddle/win32/libffi-3.2.1-mswin.patch",
+    "ext/fiddle/win32/libffi-config.rb",
+    "ext/fiddle/win32/libffi.mk.tmpl",
+    "fiddle.gemspec",
+    "lib/fiddle.rb",
+    "lib/fiddle/closure.rb",
+    "lib/fiddle/cparser.rb",
+    "lib/fiddle/function.rb",
+    "lib/fiddle/import.rb",
+    "lib/fiddle/pack.rb",
+    "lib/fiddle/struct.rb",
+    "lib/fiddle/types.rb",
+    "lib/fiddle/value.rb",
+    "lib/fiddle/version.rb",
+  ]
+  spec.require_paths = ["lib"]
+  spec.extensions = ["ext/fiddle/extconf.rb"]
+
+  spec.required_ruby_version = ">= 2.3.0"
+
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rake-compiler"
+
+  spec.metadata["msys2_mingw_dependencies"] = "libffi"
+end
diff --git a/ext/fiddle/fiddle.h b/ext/fiddle/fiddle.h
index d2583c1cbf..dbad910d07 100644
--- a/ext/fiddle/fiddle.h
+++ b/ext/fiddle/fiddle.h
@@ -58,38 +58,38 @@
 # error "CHAR_BIT not supported"
 #endif
 
-# if SIZEOF_SHORT == 2
-#  define ffi_type_ushort ffi_type_uint16
-#  define ffi_type_sshort ffi_type_sint16
-# elif SIZEOF_SHORT == 4
-#  define ffi_type_ushort ffi_type_uint32
-#  define ffi_type_sshort ffi_type_sint32
-# else
-#  error "short size not supported"
-# endif
+#if SIZEOF_SHORT == 2
+# define ffi_type_ushort ffi_type_uint16
+# define ffi_type_sshort ffi_type_sint16
+#elif SIZEOF_SHORT == 4
+# define ffi_type_ushort ffi_type_uint32
+# define ffi_type_sshort ffi_type_sint32
+#else
+# error "short size not supported"
+#endif
 
-# if SIZEOF_INT == 2
-#  define ffi_type_uint	ffi_type_uint16
-#  define ffi_type_sint	ffi_type_sint16
-# elif SIZEOF_INT == 4
-#  define ffi_type_uint	ffi_type_uint32
-#  define ffi_type_sint	ffi_type_sint32
-# elif SIZEOF_INT == 8
-#  define ffi_type_uint	ffi_type_uint64
-#  define ffi_type_sint	ffi_type_sint64
-# else
-#  error "int size not supported"
-# endif
+#if SIZEOF_INT == 2
+# define ffi_type_uint	ffi_type_uint16
+# define ffi_type_sint	ffi_type_sint16
+#elif SIZEOF_INT == 4
+# define ffi_type_uint	ffi_type_uint32
+# define ffi_type_sint	ffi_type_sint32
+#elif SIZEOF_INT == 8
+# define ffi_type_uint	ffi_type_uint64
+# define ffi_type_sint	ffi_type_sint64
+#else
+# error "int size not supported"
+#endif
 
-# if SIZEOF_LONG == 4
-#  define ffi_type_ulong ffi_type_uint32
-#  define ffi_type_slong ffi_type_sint32
-# elif SIZEOF_LONG == 8
-#  define ffi_type_ulong ffi_type_uint64
-#  define ffi_type_slong ffi_type_sint64
-# else
-#  error "long size not supported"
-# endif
+#if SIZEOF_LONG == 4
+# define ffi_type_ulong ffi_type_uint32
+# define ffi_type_slong ffi_type_sint32
+#elif SIZEOF_LONG == 8
+# define ffi_type_ulong ffi_type_uint64
+# define ffi_type_slong ffi_type_sint64
+#else
+# error "long size not supported"
+#endif
 
 #if HAVE_LONG_LONG
 # if SIZEOF_LONG_LONG == 8
@@ -115,12 +115,67 @@
 #endif
 #define TYPE_FLOAT 7
 #define TYPE_DOUBLE 8
+#define TYPE_VARIADIC 9
+#define TYPE_CONST_STRING 10
+
+#define TYPE_INT8_T TYPE_CHAR
+#if SIZEOF_SHORT == 2
+# define TYPE_INT16_T TYPE_SHORT
+#elif SIZEOF_INT == 2
+# define TYPE_INT16_T TYPE_INT
+#endif
+#if SIZEOF_SHORT == 4
+# define TYPE_INT32_T TYPE_SHORT
+#elif SIZEOF_INT == 4
+# define TYPE_INT32_T TYPE_INT
+#elif SIZEOF_LONG == 4
+# define TYPE_INT32_T TYPE_LONG
+#endif
+#if SIZEOF_INT == 8
+# define TYPE_INT64_T TYPE_INT
+#elif SIZEOF_LONG == 8
+# define TYPE_INT64_T TYPE_LONG
+#elif defined(TYPE_LONG_LONG)
+# define TYPE_INT64_T TYPE_LONG_LONG
+#endif
+
+#ifndef TYPE_SSIZE_T
+# if SIZEOF_SIZE_T == SIZEOF_INT
+#   define TYPE_SSIZE_T TYPE_INT
+# elif SIZEOF_SIZE_T == SIZEOF_LONG
+#   define TYPE_SSIZE_T TYPE_LONG
+# elif defined HAVE_LONG_LONG && SIZEOF_SIZE_T == SIZEOF_LONG_LONG
+#   define TYPE_SSIZE_T TYPE_LONG_LONG
+# endif
+#endif
+#define TYPE_SIZE_T (-1*SIGNEDNESS_OF_SIZE_T*TYPE_SSIZE_T)
+
+#ifndef TYPE_PTRDIFF_T
+# if SIZEOF_PTRDIFF_T == SIZEOF_INT
+#   define TYPE_PTRDIFF_T TYPE_INT
+# elif SIZEOF_PTRDIFF_T == SIZEOF_LONG
+#   define TYPE_PTRDIFF_T TYPE_LONG
+# elif defined HAVE_LONG_LONG && SIZEOF_PTRDIFF_T == SIZEOF_LONG_LONG
+#   define TYPE_PTRDIFF_T TYPE_LONG_LONG
+# endif
+#endif
+
+#ifndef TYPE_INTPTR_T
+# if SIZEOF_INTPTR_T == SIZEOF_INT
+#   define TYPE_INTPTR_T TYPE_INT
+# elif SIZEOF_INTPTR_T == SIZEOF_LONG
+#   define TYPE_INTPTR_T TYPE_LONG
+# elif defined HAVE_LONG_LONG && SIZEOF_INTPTR_T == SIZEOF_LONG_LONG
+#   define TYPE_INTPTR_T TYPE_LONG_LONG
+# endif
+#endif
+#define TYPE_UINTPTR_T (-TYPE_INTPTR_T)
 
 #define ALIGN_OF(type) offsetof(struct {char align_c; type align_x;}, align_x)
 
 #define ALIGN_VOIDP  ALIGN_OF(void*)
-#define ALIGN_SHORT  ALIGN_OF(short)
 #define ALIGN_CHAR   ALIGN_OF(char)
+#define ALIGN_SHORT  ALIGN_OF(short)
 #define ALIGN_INT    ALIGN_OF(int)
 #define ALIGN_LONG   ALIGN_OF(long)
 #if HAVE_LONG_LONG
@@ -129,8 +184,17 @@
 #define ALIGN_FLOAT  ALIGN_OF(float)
 #define ALIGN_DOUBLE ALIGN_OF(double)
 
+#define ALIGN_INT8_T  ALIGN_OF(int8_t)
+#define ALIGN_INT16_T ALIGN_OF(int16_t)
+#define ALIGN_INT32_T ALIGN_OF(int32_t)
+#define ALIGN_INT64_T ALIGN_OF(int64_t)
+
+#ifdef HAVE_TYPE_RB_MEMORY_VIEW_T
+# define FIDDLE_MEMORY_VIEW
+#endif
+
 extern VALUE mFiddle;
-extern VALUE rb_eFiddleError;
+extern VALUE rb_eFiddleDLError;
 
 VALUE rb_fiddle_new_function(VALUE address, VALUE arg_types, VALUE ret_type);
 
diff --git a/ext/fiddle/function.c b/ext/fiddle/function.c
index 8e280567db..d15a54bfa6 100644
--- a/ext/fiddle/function.c
+++ b/ext/fiddle/function.c
@@ -1,6 +1,8 @@
 #include <fiddle.h>
 #include <ruby/thread.h>
 
+#include <stdbool.h>
+
 #ifdef PRIsVALUE
 # define RB_OBJ_CLASSNAME(obj) rb_obj_class(obj)
 # define RB_OBJ_STRING(obj) (obj)
@@ -19,21 +21,21 @@ VALUE cFiddleFunction;
 #define Check_Max_Args_Long(name, len) \
     Check_Max_Args_(name, len, "l")
 #define Check_Max_Args_(name, len, fmt) \
-    if ((size_t)(len) < MAX_ARGS) { \
-	/* OK */ \
-    } \
-    else { \
-	rb_raise(rb_eTypeError, \
-		 name" is so large that it can cause integer overflow (%"fmt"d)", \
-		 (len)); \
-    }
+    do { \
+        if ((size_t)(len) >= MAX_ARGS) { \
+            rb_raise(rb_eTypeError, \
+                     "%s is so large " \
+                     "that it can cause integer overflow (%"fmt"d)", \
+                     (name), (len)); \
+        } \
+    } while (0)
 
 static void
 deallocate(void *p)
 {
-    ffi_cif *ptr = p;
-    if (ptr->arg_types) xfree(ptr->arg_types);
-    xfree(ptr);
+    ffi_cif *cif = p;
+    if (cif->arg_types) xfree(cif->arg_types);
+    xfree(cif);
 }
 
 static size_t
@@ -75,72 +77,114 @@ rb_fiddle_new_function(VALUE address, VALUE arg_types, VALUE ret_type)
     return rb_class_new_instance(3, argv, cFiddleFunction);
 }
 
-static int
-parse_keyword_arg_i(VALUE key, VALUE value, VALUE self)
+static VALUE
+normalize_argument_types(const char *name,
+                         VALUE arg_types,
+                         bool *is_variadic)
 {
-    if (key == ID2SYM(rb_intern("name"))) {
-	rb_iv_set(self, "@name", value);
-    } else {
-	rb_raise(rb_eArgError, "unknown keyword: %"PRIsVALUE,
-		 RB_OBJ_STRING(key));
+    VALUE normalized_arg_types;
+    int i;
+    int n_arg_types;
+    *is_variadic = false;
+
+    Check_Type(arg_types, T_ARRAY);
+    n_arg_types = RARRAY_LENINT(arg_types);
+    Check_Max_Args(name, n_arg_types);
+
+    normalized_arg_types = rb_ary_new_capa(n_arg_types);
+    for (i = 0; i < n_arg_types; i++) {
+        VALUE arg_type = RARRAY_AREF(arg_types, i);
+        int c_arg_type;
+        arg_type = rb_fiddle_type_ensure(arg_type);
+        c_arg_type = NUM2INT(arg_type);
+        if (c_arg_type == TYPE_VARIADIC) {
+            if (i != n_arg_types - 1) {
+                rb_raise(rb_eArgError,
+                         "Fiddle::TYPE_VARIADIC must be the last argument type: "
+                         "%"PRIsVALUE,
+                         arg_types);
+            }
+            *is_variadic = true;
+            break;
+        }
+        else {
+            (void)INT2FFI_TYPE(c_arg_type); /* raise */
+        }
+        rb_ary_push(normalized_arg_types, INT2FIX(c_arg_type));
     }
-    return ST_CONTINUE;
+
+    /* freeze to prevent inconsistency at calling #to_int later */
+    OBJ_FREEZE(normalized_arg_types);
+    return normalized_arg_types;
 }
 
 static VALUE
 initialize(int argc, VALUE argv[], VALUE self)
 {
     ffi_cif * cif;
-    ffi_type **arg_types, *rtype;
-    ffi_status result;
-    VALUE ptr, args, ret_type, abi, kwds, ary;
-    int i, len;
-    int nabi;
+    VALUE ptr, arg_types, ret_type, abi, kwargs;
+    VALUE name = Qnil;
+    VALUE need_gvl = Qfalse;
+    int c_ret_type;
+    bool is_variadic = false;
+    ffi_abi c_ffi_abi;
     void *cfunc;
 
-    rb_scan_args(argc, argv, "31:", &ptr, &args, &ret_type, &abi, &kwds);
+    rb_scan_args(argc, argv, "31:", &ptr, &arg_types, &ret_type, &abi, &kwargs);
+    rb_iv_set(self, "@closure", ptr);
+
+    if (!NIL_P(kwargs)) {
+        enum {
+            kw_name,
+            kw_need_gvl,
+            kw_max_,
+        };
+        static ID kw[kw_max_];
+        VALUE args[kw_max_];
+        if (!kw[0]) {
+            kw[kw_name] = rb_intern_const("name");
+            kw[kw_need_gvl] = rb_intern_const("need_gvl");
+        }
+        rb_get_kwargs(kwargs, kw, 0, kw_max_, args);
+        if (args[kw_name] != Qundef) {
+            name = args[kw_name];
+        }
+        if (args[kw_need_gvl] != Qundef) {
+            need_gvl = args[kw_need_gvl];
+        }
+    }
+    rb_iv_set(self, "@name", name);
+    rb_iv_set(self, "@need_gvl", need_gvl);
+
     ptr = rb_Integer(ptr);
     cfunc = NUM2PTR(ptr);
     PTR2NUM(cfunc);
-    nabi = NIL_P(abi) ? FFI_DEFAULT_ABI : NUM2INT(abi);
-    abi = INT2FIX(nabi);
-    i = NUM2INT(ret_type);
-    rtype = INT2FFI_TYPE(i);
-    ret_type = INT2FIX(i);
-
-    Check_Type(args, T_ARRAY);
-    len = RARRAY_LENINT(args);
-    Check_Max_Args("args", len);
-    ary = rb_ary_subseq(args, 0, len);
-    for (i = 0; i < RARRAY_LEN(args); i++) {
-	VALUE a = RARRAY_PTR(args)[i];
-	int type = NUM2INT(a);
-	(void)INT2FFI_TYPE(type); /* raise */
-	if (INT2FIX(type) != a) rb_ary_store(ary, i, INT2FIX(type));
+    c_ffi_abi = NIL_P(abi) ? FFI_DEFAULT_ABI : NUM2INT(abi);
+    abi = INT2FIX(c_ffi_abi);
+    ret_type = rb_fiddle_type_ensure(ret_type);
+    c_ret_type = NUM2INT(ret_type);
+    (void)INT2FFI_TYPE(c_ret_type); /* raise */
+    ret_type = INT2FIX(c_ret_type);
+
+    arg_types = normalize_argument_types("argument types",
+                                         arg_types,
+                                         &is_variadic);
+#ifndef HAVE_FFI_PREP_CIF_VAR
+    if (is_variadic) {
+        rb_raise(rb_eNotImpError,
+                 "ffi_prep_cif_var() is required in libffi "
+                 "for variadic arguments");
     }
-    OBJ_FREEZE(ary);
+#endif
 
     rb_iv_set(self, "@ptr", ptr);
-    rb_iv_set(self, "@args", args);
+    rb_iv_set(self, "@argument_types", arg_types);
     rb_iv_set(self, "@return_type", ret_type);
     rb_iv_set(self, "@abi", abi);
-
-    if (!NIL_P(kwds)) rb_hash_foreach(kwds, parse_keyword_arg_i, self);
+    rb_iv_set(self, "@is_variadic", is_variadic ? Qtrue : Qfalse);
 
     TypedData_Get_Struct(self, ffi_cif, &function_data_type, cif);
-
-    arg_types = xcalloc(len + 1, sizeof(ffi_type *));
-
-    for (i = 0; i < RARRAY_LEN(args); i++) {
-	int type = NUM2INT(RARRAY_AREF(args, i));
-	arg_types[i] = INT2FFI_TYPE(type);
-    }
-    arg_types[len] = NULL;
-
-    result = ffi_prep_cif(cif, nabi, len, rtype, arg_types);
-
-    if (result)
-	rb_raise(rb_eRuntimeError, "error creating CIF %d", result);
+    cif->arg_types = NULL;
 
     return self;
 }
@@ -167,61 +211,181 @@ function_call(int argc, VALUE argv[], VALUE self)
 {
     struct nogvl_ffi_call_args args = { 0 };
     fiddle_generic *generic_args;
-    VALUE cfunc, types, cPointer;
+    VALUE cfunc;
+    VALUE abi;
+    VALUE arg_types;
+    VALUE cPointer;
+    VALUE is_variadic;
+    VALUE need_gvl;
+    int n_arg_types;
+    int n_fixed_args = 0;
+    int n_call_args = 0;
     int i;
+    int i_call;
+    VALUE converted_args = Qnil;
     VALUE alloc_buffer = 0;
 
     cfunc    = rb_iv_get(self, "@ptr");
-    types    = rb_iv_get(self, "@args");
+    abi      = rb_iv_get(self, "@abi");
+    arg_types = rb_iv_get(self, "@argument_types");
     cPointer = rb_const_get(mFiddle, rb_intern("Pointer"));
-
-    Check_Max_Args("number of arguments", argc);
-    if (argc != (i = RARRAY_LENINT(types))) {
-	rb_error_arity(argc, i, i);
+    is_variadic = rb_iv_get(self, "@is_variadic");
+    need_gvl = rb_iv_get(self, "@need_gvl");
+
+    n_arg_types = RARRAY_LENINT(arg_types);
+    n_fixed_args = n_arg_types;
+    if (RTEST(is_variadic)) {
+        if (argc < n_arg_types) {
+            rb_error_arity(argc, n_arg_types, UNLIMITED_ARGUMENTS);
+        }
+        if (((argc - n_arg_types) % 2) != 0) {
+            rb_raise(rb_eArgError,
+                     "variadic arguments must be type and value pairs: "
+                     "%"PRIsVALUE,
+                     rb_ary_new_from_values(argc, argv));
+        }
+        n_call_args = n_arg_types + ((argc - n_arg_types) / 2);
     }
+    else {
+        if (argc != n_arg_types) {
+            rb_error_arity(argc, n_arg_types, n_arg_types);
+        }
+        n_call_args = n_arg_types;
+    }
+    Check_Max_Args("the number of arguments", n_call_args);
 
     TypedData_Get_Struct(self, ffi_cif, &function_data_type, args.cif);
 
-    if (rb_safe_level() >= 1) {
-	for (i = 0; i < argc; i++) {
-	    VALUE src = argv[i];
-	    if (OBJ_TAINTED(src)) {
-		rb_raise(rb_eSecurityError, "tainted parameter not allowed");
-	    }
-	}
+    if (is_variadic && args.cif->arg_types) {
+        xfree(args.cif->arg_types);
+        args.cif->arg_types = NULL;
+    }
+
+    if (!args.cif->arg_types) {
+        VALUE fixed_arg_types = arg_types;
+        VALUE return_type;
+        int c_return_type;
+        ffi_type *ffi_return_type;
+        ffi_type **ffi_arg_types;
+        ffi_status result;
+
+        arg_types = rb_ary_dup(fixed_arg_types);
+        for (i = n_fixed_args; i < argc; i += 2) {
+          VALUE arg_type = argv[i];
+          int c_arg_type;
+          arg_type = rb_fiddle_type_ensure(arg_type);
+          c_arg_type = NUM2INT(arg_type);
+          (void)INT2FFI_TYPE(c_arg_type); /* raise */
+          rb_ary_push(arg_types, INT2FIX(c_arg_type));
+        }
+
+        return_type = rb_iv_get(self, "@return_type");
+        c_return_type = FIX2INT(return_type);
+        ffi_return_type = INT2FFI_TYPE(c_return_type);
+
+        ffi_arg_types = xcalloc(n_call_args + 1, sizeof(ffi_type *));
+        for (i_call = 0; i_call < n_call_args; i_call++) {
+            VALUE arg_type;
+            int c_arg_type;
+            arg_type = RARRAY_AREF(arg_types, i_call);
+            c_arg_type = FIX2INT(arg_type);
+            ffi_arg_types[i_call] = INT2FFI_TYPE(c_arg_type);
+        }
+        ffi_arg_types[i_call] = NULL;
+
+        if (is_variadic) {
+#ifdef HAVE_FFI_PREP_CIF_VAR
+            result = ffi_prep_cif_var(args.cif,
+                                      FIX2INT(abi),
+                                      n_fixed_args,
+                                      n_call_args,
+                                      ffi_return_type,
+                                      ffi_arg_types);
+#else
+            /* This code is never used because ffi_prep_cif_var()
+             * availability check is done in #initialize. */
+            result = FFI_BAD_TYPEDEF;
+#endif
+        }
+        else {
+            result = ffi_prep_cif(args.cif,
+                                  FIX2INT(abi),
+                                  n_call_args,
+                                  ffi_return_type,
+                                  ffi_arg_types);
+        }
+        if (result != FFI_OK) {
+            xfree(ffi_arg_types);
+            args.cif->arg_types = NULL;
+            rb_raise(rb_eRuntimeError, "error creating CIF %d", result);
+        }
     }
 
     generic_args = ALLOCV(alloc_buffer,
-	(size_t)(argc + 1) * sizeof(void *) + (size_t)argc * sizeof(fiddle_generic));
+                          sizeof(fiddle_generic) * n_call_args +
+                          sizeof(void *) * (n_call_args + 1));
     args.values = (void **)((char *)generic_args +
-			    (size_t)argc * sizeof(fiddle_generic));
-
-    for (i = 0; i < argc; i++) {
-	VALUE type = RARRAY_AREF(types, i);
-	VALUE src = argv[i];
-	int argtype = FIX2INT(type);
-
-	if (argtype == TYPE_VOIDP) {
-	    if(NIL_P(src)) {
-		src = INT2FIX(0);
-	    } else if(cPointer != CLASS_OF(src)) {
-		src = rb_funcall(cPointer, rb_intern("[]"), 1, src);
-	    }
-	    src = rb_Integer(src);
-	}
-
-	VALUE2GENERIC(argtype, src, &generic_args[i]);
-	args.values[i] = (void *)&generic_args[i];
+                            sizeof(fiddle_generic) * n_call_args);
+
+    for (i = 0, i_call = 0;
+         i < argc && i_call < n_call_args;
+         i++, i_call++) {
+        VALUE arg_type;
+        int c_arg_type;
+        VALUE original_src;
+        VALUE src;
+        arg_type = RARRAY_AREF(arg_types, i_call);
+        c_arg_type = FIX2INT(arg_type);
+        if (i >= n_fixed_args) {
+            i++;
+        }
+        src = argv[i];
+
+        if (c_arg_type == TYPE_VOIDP) {
+            if (NIL_P(src)) {
+                src = INT2FIX(0);
+            }
+            else if (cPointer != CLASS_OF(src)) {
+                src = rb_funcall(cPointer, rb_intern("[]"), 1, src);
+                if (NIL_P(converted_args)) {
+                    converted_args = rb_ary_new();
+                }
+                rb_ary_push(converted_args, src);
+            }
+            src = rb_Integer(src);
+        }
+
+        original_src = src;
+        VALUE2GENERIC(c_arg_type, src, &generic_args[i_call]);
+        if (src != original_src) {
+            if (NIL_P(converted_args)) {
+                converted_args = rb_ary_new();
+            }
+            rb_ary_push(converted_args, src);
+        }
+        args.values[i_call] = (void *)&generic_args[i_call];
     }
-    args.values[argc] = NULL;
-    args.fn = NUM2PTR(cfunc);
+    args.values[i_call] = NULL;
+    args.fn = (void(*)(void))NUM2PTR(cfunc);
 
-    (void)rb_thread_call_without_gvl(nogvl_ffi_call, &args, 0, 0);
+    if (RTEST(need_gvl)) {
+        ffi_call(args.cif, args.fn, &(args.retval), args.values);
+    }
+    else {
+        (void)rb_thread_call_without_gvl(nogvl_ffi_call, &args, 0, 0);
+    }
 
-    rb_funcall(mFiddle, rb_intern("last_error="), 1, INT2NUM(errno));
+    {
+        int errno_keep = errno;
 #if defined(_WIN32)
-    rb_funcall(mFiddle, rb_intern("win32_last_error="), 1, INT2NUM(errno));
+        int socket_error = WSAGetLastError();
+        rb_funcall(mFiddle, rb_intern("win32_last_error="), 1,
+                   INT2NUM(errno_keep));
+        rb_funcall(mFiddle, rb_intern("win32_last_socket_error="), 1,
+                   INT2NUM(socket_error));
 #endif
+        rb_funcall(mFiddle, rb_intern("last_error="), 1, INT2NUM(errno_keep));
+    }
 
     ALLOCV_END(alloc_buffer);
 
@@ -294,6 +458,10 @@ Init_fiddle_function(void)
      * Caller must ensure the underlying function is called in a
      * thread-safe manner if running in a multi-threaded process.
      *
+     * Note that it is not thread-safe to use this method to
+     * directly or indirectly call many Ruby C-extension APIs unless
+     * you don't pass +need_gvl: true+ to Fiddle::Function#new.
+     *
      * For an example see Fiddle::Function
      *
      */
@@ -301,13 +469,20 @@ Init_fiddle_function(void)
 
     /*
      * Document-method: new
-     * call-seq: new(ptr, args, ret_type, abi = DEFAULT)
+     * call-seq: new(ptr,
+     *               args,
+     *               ret_type,
+     *               abi = DEFAULT,
+     *               name: nil,
+     *               need_gvl: false)
      *
      * Constructs a Function object.
      * * +ptr+ is a referenced function, of a Fiddle::Handle
      * * +args+ is an Array of arguments, passed to the +ptr+ function
      * * +ret_type+ is the return type of the function
      * * +abi+ is the ABI of the function
+     * * +name+ is the name of the function
+     * * +need_gvl+ is whether GVL is needed to call the function
      *
      */
     rb_define_method(cFiddleFunction, "initialize", initialize, -1);
diff --git a/ext/fiddle/handle.c b/ext/fiddle/handle.c
index e727ccfd00..c1b2db557a 100644
--- a/ext/fiddle/handle.c
+++ b/ext/fiddle/handle.c
@@ -1,8 +1,6 @@
 #include <ruby.h>
 #include <fiddle.h>
 
-#define SafeStringValueCStr(v) (rb_check_safe_obj(rb_string_value(&v)), StringValueCStr(v))
-
 VALUE rb_cHandle;
 
 struct dl_handle {
@@ -76,14 +74,14 @@ rb_fiddle_handle_close(VALUE self)
 	/* Check dlclose for successful return value */
 	if(ret) {
 #if defined(HAVE_DLERROR)
-	    rb_raise(rb_eFiddleError, "%s", dlerror());
+	    rb_raise(rb_eFiddleDLError, "%s", dlerror());
 #else
-	    rb_raise(rb_eFiddleError, "could not close handle");
+	    rb_raise(rb_eFiddleDLError, "could not close handle");
 #endif
 	}
 	return INT2NUM(ret);
     }
-    rb_raise(rb_eFiddleError, "dlclose() called too many times");
+    rb_raise(rb_eFiddleDLError, "dlclose() called too many times");
 
     UNREACHABLE;
 }
@@ -145,11 +143,11 @@ rb_fiddle_handle_initialize(int argc, VALUE argv[], VALUE self)
 	cflag = RTLD_LAZY | RTLD_GLOBAL;
 	break;
       case 1:
-	clib = NIL_P(lib) ? NULL : SafeStringValueCStr(lib);
+	clib = NIL_P(lib) ? NULL : StringValueCStr(lib);
 	cflag = RTLD_LAZY | RTLD_GLOBAL;
 	break;
       case 2:
-	clib = NIL_P(lib) ? NULL : SafeStringValueCStr(lib);
+	clib = NIL_P(lib) ? NULL : StringValueCStr(lib);
 	cflag = NUM2INT(flag);
 	break;
       default:
@@ -179,12 +177,12 @@ rb_fiddle_handle_initialize(int argc, VALUE argv[], VALUE self)
 	ptr = dlopen(clib, cflag);
 #if defined(HAVE_DLERROR)
     if( !ptr && (err = dlerror()) ){
-	rb_raise(rb_eFiddleError, "%s", err);
+	rb_raise(rb_eFiddleDLError, "%s", err);
     }
 #else
     if( !ptr ){
 	err = dlerror();
-	rb_raise(rb_eFiddleError, "%s", err);
+	rb_raise(rb_eFiddleDLError, "%s", err);
     }
 #endif
     TypedData_Get_Struct(self, struct dl_handle, &fiddle_handle_data_type, fiddle_handle);
@@ -280,7 +278,7 @@ rb_fiddle_handle_sym(VALUE self, VALUE sym)
 
     TypedData_Get_Struct(self, struct dl_handle, &fiddle_handle_data_type, fiddle_handle);
     if( ! fiddle_handle->open ){
-	rb_raise(rb_eFiddleError, "closed handle");
+	rb_raise(rb_eFiddleDLError, "closed handle");
     }
 
     return fiddle_handle_sym(fiddle_handle->ptr, sym);
@@ -319,7 +317,7 @@ fiddle_handle_sym(void *handle, VALUE symbol)
 # define CHECK_DLERROR
 #endif
     void (*func)();
-    const char *name = SafeStringValueCStr(symbol);
+    const char *name = StringValueCStr(symbol);
 
 #ifdef HAVE_DLERROR
     dlerror();
@@ -368,7 +366,7 @@ fiddle_handle_sym(void *handle, VALUE symbol)
     }
 #endif
     if( !func ){
-	rb_raise(rb_eFiddleError, "unknown symbol \"%"PRIsVALUE"\"", symbol);
+	rb_raise(rb_eFiddleDLError, "unknown symbol \"%"PRIsVALUE"\"", symbol);
     }
 
     return PTR2NUM(func);
diff --git a/ext/fiddle/lib/fiddle.rb b/ext/fiddle/lib/fiddle.rb
index 5208eb9328..4512989310 100644
--- a/ext/fiddle/lib/fiddle.rb
+++ b/ext/fiddle/lib/fiddle.rb
@@ -1,7 +1,9 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
+
 require 'fiddle.so'
-require 'fiddle/function'
 require 'fiddle/closure'
+require 'fiddle/function'
+require 'fiddle/version'
 
 module Fiddle
   if WINDOWS
@@ -15,6 +17,18 @@ module Fiddle
     def self.win32_last_error= error
       Thread.current[:__FIDDLE_WIN32_LAST_ERROR__] = error
     end
+
+    # Returns the last win32 socket +Error+ of the current executing
+    # +Thread+ or nil if none
+    def self.win32_last_socket_error
+      Thread.current[:__FIDDLE_WIN32_LAST_SOCKET_ERROR__]
+    end
+
+    # Sets the last win32 socket +Error+ of the current executing
+    # +Thread+ to +error+
+    def self.win32_last_socket_error= error
+      Thread.current[:__FIDDLE_WIN32_LAST_SOCKET_ERROR__] = error
+    end
   end
 
   # Returns the last +Error+ of the current executing +Thread+ or nil if none
diff --git a/ext/fiddle/lib/fiddle/closure.rb b/ext/fiddle/lib/fiddle/closure.rb
index 0b9adbb60a..c865a63c20 100644
--- a/ext/fiddle/lib/fiddle/closure.rb
+++ b/ext/fiddle/lib/fiddle/closure.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Fiddle
   class Closure
 
diff --git a/ext/fiddle/lib/fiddle/cparser.rb b/ext/fiddle/lib/fiddle/cparser.rb
index 6b9da9fa7c..93a05513c9 100644
--- a/ext/fiddle/lib/fiddle/cparser.rb
+++ b/ext/fiddle/lib/fiddle/cparser.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Fiddle
   # A mixin that provides methods for parsing C struct and prototype signatures.
   #
@@ -21,6 +21,7 @@ module Fiddle
     # Parses a C struct's members
     #
     # Example:
+    #   require 'fiddle/import'
     #
     #   include Fiddle::CParser
     #     #=> Object
@@ -34,12 +35,37 @@ module Fiddle
     def parse_struct_signature(signature, tymap=nil)
       if signature.is_a?(String)
         signature = split_arguments(signature, /[,;]/)
+      elsif signature.is_a?(Hash)
+        signature = [signature]
       end
       mems = []
       tys  = []
       signature.each{|msig|
-        msig = compact(msig)
+        msig = compact(msig) if msig.is_a?(String)
         case msig
+        when Hash
+          msig.each do |struct_name, struct_signature|
+            struct_name = struct_name.to_s if struct_name.is_a?(Symbol)
+            struct_name = compact(struct_name)
+            struct_count = nil
+            if struct_name =~ /^([\w\*\s]+)\[(\d+)\]$/
+              struct_count = $2.to_i
+              struct_name = $1
+            end
+            if struct_signature.respond_to?(:entity_class)
+              struct_type = struct_signature
+            else
+              parsed_struct = parse_struct_signature(struct_signature, tymap)
+              struct_type = CStructBuilder.create(CStruct, *parsed_struct)
+            end
+            if struct_count
+              ty = [struct_type, struct_count]
+            else
+              ty = struct_type
+            end
+            mems.push([struct_name, struct_type.members])
+            tys.push(ty)
+          end
         when /^[\w\*\s]+[\*\s](\w+)$/
           mems.push($1)
           tys.push(parse_ctype(msig, tymap))
@@ -66,6 +92,7 @@ module Fiddle
     # be looked up.
     #
     # Example:
+    #   require 'fiddle/import'
     #
     #   include Fiddle::CParser
     #     #=> Object
@@ -102,6 +129,7 @@ module Fiddle
     # value will be the C type to be looked up.
     #
     # Example:
+    #   require 'fiddle/import'
     #
     #   include Fiddle::CParser
     #     #=> Object
@@ -120,55 +148,97 @@ module Fiddle
     #
     def parse_ctype(ty, tymap=nil)
       tymap ||= {}
-      case ty
-      when Array
+      if ty.is_a?(Array)
         return [parse_ctype(ty[0], tymap), ty[1]]
+      end
+      ty = ty.gsub(/\Aconst\s+/, "")
+      case ty
       when 'void'
         return TYPE_VOID
-      when /^(?:(?:signed\s+)?long\s+long(?:\s+int\s+)?|int64_t)(?:\s+\w+)?$/
-        if( defined?(TYPE_LONG_LONG) )
-          return TYPE_LONG_LONG
-        else
+      when /\A(?:(?:signed\s+)?long\s+long(?:\s+int\s+)?|int64_t)(?:\s+\w+)?\z/
+        unless Fiddle.const_defined?(:TYPE_LONG_LONG)
           raise(RuntimeError, "unsupported type: #{ty}")
         end
-      when /^(?:unsigned\s+long\s+long(?:\s+int\s+)?|uint64_t)(?:\s+\w+)?$/
-        if( defined?(TYPE_LONG_LONG) )
-          return -TYPE_LONG_LONG
-        else
+        return TYPE_LONG_LONG
+      when /\A(?:unsigned\s+long\s+long(?:\s+int\s+)?|uint64_t)(?:\s+\w+)?\z/
+        unless Fiddle.const_defined?(:TYPE_LONG_LONG)
           raise(RuntimeError, "unsupported type: #{ty}")
         end
-      when /^(?:signed\s+)?long(?:\s+int\s+)?(?:\s+\w+)?$/
+        return -TYPE_LONG_LONG
+      when /\A(?:signed\s+)?long(?:\s+int\s+)?(?:\s+\w+)?\z/
         return TYPE_LONG
-      when /^unsigned\s+long(?:\s+int\s+)?(?:\s+\w+)?$/
+      when /\Aunsigned\s+long(?:\s+int\s+)?(?:\s+\w+)?\z/
         return -TYPE_LONG
-      when /^(?:signed\s+)?int(?:\s+\w+)?$/
+      when /\A(?:signed\s+)?int(?:\s+\w+)?\z/
         return TYPE_INT
-      when /^(?:unsigned\s+int|uint)(?:\s+\w+)?$/
+      when /\A(?:unsigned\s+int|uint)(?:\s+\w+)?\z/
         return -TYPE_INT
-      when /^(?:signed\s+)?short(?:\s+int\s+)?(?:\s+\w+)?$/
+      when /\A(?:signed\s+)?short(?:\s+int\s+)?(?:\s+\w+)?\z/
         return TYPE_SHORT
-      when /^unsigned\s+short(?:\s+int\s+)?(?:\s+\w+)?$/
+      when /\Aunsigned\s+short(?:\s+int\s+)?(?:\s+\w+)?\z/
         return -TYPE_SHORT
-      when /^(?:signed\s+)?char(?:\s+\w+)?$/
+      when /\A(?:signed\s+)?char(?:\s+\w+)?\z/
         return TYPE_CHAR
-      when /^unsigned\s+char(?:\s+\w+)?$/
+      when /\Aunsigned\s+char(?:\s+\w+)?\z/
         return  -TYPE_CHAR
-      when /^float(?:\s+\w+)?$/
+      when /\Aint8_t(?:\s+\w+)?\z/
+        unless Fiddle.const_defined?(:TYPE_INT8_T)
+          raise(RuntimeError, "unsupported type: #{ty}")
+        end
+        return TYPE_INT8_T
+      when /\Auint8_t(?:\s+\w+)?\z/
+        unless Fiddle.const_defined?(:TYPE_INT8_T)
+          raise(RuntimeError, "unsupported type: #{ty}")
+        end
+        return -TYPE_INT8_T
+      when /\Aint16_t(?:\s+\w+)?\z/
+        unless Fiddle.const_defined?(:TYPE_INT16_T)
+          raise(RuntimeError, "unsupported type: #{ty}")
+        end
+        return TYPE_INT16_T
+      when /\Auint16_t(?:\s+\w+)?\z/
+        unless Fiddle.const_defined?(:TYPE_INT16_T)
+          raise(RuntimeError, "unsupported type: #{ty}")
+        end
+        return -TYPE_INT16_T
+      when /\Aint32_t(?:\s+\w+)?\z/
+        unless Fiddle.const_defined?(:TYPE_INT32_T)
+          raise(RuntimeError, "unsupported type: #{ty}")
+        end
+        return TYPE_INT32_T
+      when /\Auint32_t(?:\s+\w+)?\z/
+        unless Fiddle.const_defined?(:TYPE_INT32_T)
+          raise(RuntimeError, "unsupported type: #{ty}")
+        end
+        return -TYPE_INT32_T
+      when /\Aint64_t(?:\s+\w+)?\z/
+        unless Fiddle.const_defined?(:TYPE_INT64_T)
+          raise(RuntimeError, "unsupported type: #{ty}")
+        end
+        return TYPE_INT64_T
+      when /\Auint64_t(?:\s+\w+)?\z/
+        unless Fiddle.const_defined?(:TYPE_INT64_T)
+          raise(RuntimeError, "unsupported type: #{ty}")
+        end
+        return -TYPE_INT64_T
+      when /\Afloat(?:\s+\w+)?\z/
         return TYPE_FLOAT
-      when /^double(?:\s+\w+)?$/
+      when /\Adouble(?:\s+\w+)?\z/
         return TYPE_DOUBLE
-      when /^size_t(?:\s+\w+)?$/
+      when /\Asize_t(?:\s+\w+)?\z/
         return TYPE_SIZE_T
-      when /^ssize_t(?:\s+\w+)?$/
+      when /\Assize_t(?:\s+\w+)?\z/
         return TYPE_SSIZE_T
-      when /^ptrdiff_t(?:\s+\w+)?$/
+      when /\Aptrdiff_t(?:\s+\w+)?\z/
         return TYPE_PTRDIFF_T
-      when /^intptr_t(?:\s+\w+)?$/
+      when /\Aintptr_t(?:\s+\w+)?\z/
         return TYPE_INTPTR_T
-      when /^uintptr_t(?:\s+\w+)?$/
+      when /\Auintptr_t(?:\s+\w+)?\z/
         return TYPE_UINTPTR_T
       when /\*/, /\[[\s\d]*\]/
         return TYPE_VOIDP
+      when "..."
+        return TYPE_VARIADIC
       else
         ty = ty.split(' ', 2)[0]
         if( tymap[ty] )
@@ -183,7 +253,7 @@ module Fiddle
 
     def split_arguments(arguments, sep=',')
       return [] if arguments.strip == 'void'
-      arguments.scan(/([\w\*\s]+\(\*\w*\)\(.*?\)|[\w\*\s\[\]]+)(?:#{sep}\s*|$)/).collect {|m| m[0]}
+      arguments.scan(/([\w\*\s]+\(\*\w*\)\(.*?\)|[\w\*\s\[\]]+|\.\.\.)(?:#{sep}\s*|\z)/).collect {|m| m[0]}
     end
 
     def compact(signature)
diff --git a/ext/fiddle/lib/fiddle/function.rb b/ext/fiddle/lib/fiddle/function.rb
index fcd90dfd26..0f9913adeb 100644
--- a/ext/fiddle/lib/fiddle/function.rb
+++ b/ext/fiddle/lib/fiddle/function.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Fiddle
   class Function
     # The ABI of the Function.
@@ -10,6 +10,11 @@ module Fiddle
     # The name of this function
     attr_reader :name
 
+    # Whether GVL is needed to call this function
+    def need_gvl?
+      @need_gvl
+    end
+
     # The integer memory location of this function
     def to_i
       ptr.to_i
diff --git a/ext/fiddle/lib/fiddle/import.rb b/ext/fiddle/lib/fiddle/import.rb
index 09429f6631..09ffcef544 100644
--- a/ext/fiddle/lib/fiddle/import.rb
+++ b/ext/fiddle/lib/fiddle/import.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'fiddle'
 require 'fiddle/struct'
 require 'fiddle/cparser'
@@ -83,11 +83,7 @@ module Fiddle
         when Importer
           lib.handlers
         else
-          begin
-            Fiddle.dlopen(lib)
-          rescue DLError
-            raise(DLError, "can't load #{lib}")
-          end
+          Fiddle.dlopen(lib)
         end
       }.flatten()
       @handler = CompositeHandler.new(handles)
@@ -115,16 +111,21 @@ module Fiddle
           return SIZEOF_INT
         when TYPE_LONG
           return SIZEOF_LONG
-        when TYPE_LONG_LONG
-          return SIZEOF_LONG_LONG
         when TYPE_FLOAT
           return SIZEOF_FLOAT
         when TYPE_DOUBLE
           return SIZEOF_DOUBLE
         when TYPE_VOIDP
           return SIZEOF_VOIDP
+        when TYPE_CONST_STRING
+          return SIZEOF_CONST_STRING
         else
-          raise(DLError, "unknown type: #{ty}")
+          if defined?(TYPE_LONG_LONG) and
+            ty == TYPE_LONG_LONG
+            return SIZEOF_LONG_LONG
+          else
+            raise(DLError, "unknown type: #{ty}")
+          end
         end
       when Class
         if( ty.instance_methods().include?(:to_ptr) )
@@ -154,7 +155,8 @@ module Fiddle
     # :stopdoc:
     CALL_TYPE_TO_ABI = Hash.new { |h, k|
       raise RuntimeError, "unsupported call type: #{k}"
-    }.merge({ :stdcall => (Function::STDCALL rescue Function::DEFAULT),
+    }.merge({ :stdcall => Function.const_defined?(:STDCALL) ? Function::STDCALL :
+                          Function::DEFAULT,
               :cdecl   => Function::DEFAULT,
               nil      => Function::DEFAULT
             }).freeze
diff --git a/ext/fiddle/lib/fiddle/pack.rb b/ext/fiddle/lib/fiddle/pack.rb
index 6301068450..22eccedb76 100644
--- a/ext/fiddle/lib/fiddle/pack.rb
+++ b/ext/fiddle/lib/fiddle/pack.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'fiddle'
 
 module Fiddle
@@ -18,7 +18,7 @@ module Fiddle
     }
 
     PACK_MAP = {
-      TYPE_VOIDP => ((SIZEOF_VOIDP == SIZEOF_LONG_LONG) ? "q" : "l!"),
+      TYPE_VOIDP => "l!",
       TYPE_CHAR  => "c",
       TYPE_SHORT => "s!",
       TYPE_INT   => "i!",
@@ -48,6 +48,7 @@ module Fiddle
       ALIGN_MAP[TYPE_LONG_LONG] = ALIGN_MAP[-TYPE_LONG_LONG] = ALIGN_LONG_LONG
       PACK_MAP[TYPE_LONG_LONG] = PACK_MAP[-TYPE_LONG_LONG] = "q"
       SIZE_MAP[TYPE_LONG_LONG] = SIZE_MAP[-TYPE_LONG_LONG] = SIZEOF_LONG_LONG
+      PACK_MAP[TYPE_VOIDP] = "q" if SIZEOF_LONG_LONG == SIZEOF_VOIDP
     end
 
     def align(addr, align)
@@ -80,10 +81,13 @@ module Fiddle
       case SIZEOF_VOIDP
       when SIZEOF_LONG
         ary.pack(@template)
-      when SIZEOF_LONG_LONG
-        ary.pack(@template)
       else
-        raise(RuntimeError, "sizeof(void*)?")
+        if defined?(TYPE_LONG_LONG) and
+          SIZEOF_VOIDP == SIZEOF_LONG_LONG
+          ary.pack(@template)
+        else
+          raise(RuntimeError, "sizeof(void*)?")
+        end
       end
     end
 
@@ -91,17 +95,20 @@ module Fiddle
       case SIZEOF_VOIDP
       when SIZEOF_LONG
         ary.join().unpack(@template)
-      when SIZEOF_LONG_LONG
-        ary.join().unpack(@template)
       else
-        raise(RuntimeError, "sizeof(void*)?")
+        if defined?(TYPE_LONG_LONG) and
+          SIZEOF_VOIDP == SIZEOF_LONG_LONG
+          ary.join().unpack(@template)
+        else
+          raise(RuntimeError, "sizeof(void*)?")
+        end
       end
     end
 
     private
 
     def parse_types(types)
-      @template = ""
+      @template = "".dup
       addr     = 0
       types.each{|t|
         orig_addr = addr
diff --git a/ext/fiddle/lib/fiddle/struct.rb b/ext/fiddle/lib/fiddle/struct.rb
index 233a987269..a766eba83b 100644
--- a/ext/fiddle/lib/fiddle/struct.rb
+++ b/ext/fiddle/lib/fiddle/struct.rb
@@ -1,18 +1,75 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'fiddle'
 require 'fiddle/value'
 require 'fiddle/pack'
 
 module Fiddle
-  # C struct shell
+  # A base class for objects representing a C structure
   class CStruct
+    include Enumerable
+
     # accessor to Fiddle::CStructEntity
     def CStruct.entity_class
       CStructEntity
     end
+
+    def each
+      return enum_for(__function__) unless block_given?
+
+      self.class.members.each do |name,|
+        yield(self[name])
+      end
+    end
+
+    def each_pair
+      return enum_for(__function__) unless block_given?
+
+      self.class.members.each do |name,|
+        yield(name, self[name])
+      end
+    end
+
+    def to_h
+      hash = {}
+      each_pair do |name, value|
+        hash[name] = unstruct(value)
+      end
+      hash
+    end
+
+    def replace(another)
+      if another.nil?
+        self.class.members.each do |name,|
+          self[name] = nil
+        end
+      elsif another.respond_to?(:each_pair)
+        another.each_pair do |name, value|
+          self[name] = value
+        end
+      else
+        another.each do |name, value|
+          self[name] = value
+        end
+      end
+      self
+    end
+
+    private
+    def unstruct(value)
+      case value
+      when CStruct
+        value.to_h
+      when Array
+        value.collect do |v|
+          unstruct(v)
+        end
+      else
+        value
+      end
+    end
   end
 
-  # C union shell
+  # A base class for objects representing a C union
   class CUnion
     # accessor to Fiddle::CUnionEntity
     def CUnion.entity_class
@@ -20,6 +77,41 @@ module Fiddle
     end
   end
 
+  # Wrapper for arrays within a struct
+  class StructArray < Array
+    include ValueUtil
+
+    def initialize(ptr, type, initial_values)
+      @ptr = ptr
+      @type = type
+      @is_struct = @type.respond_to?(:entity_class)
+      if @is_struct
+        super(initial_values)
+      else
+        @size = Fiddle::PackInfo::SIZE_MAP[type]
+        @pack_format = Fiddle::PackInfo::PACK_MAP[type]
+        super(initial_values.collect { |v| unsigned_value(v, type) })
+      end
+    end
+
+    def to_ptr
+      @ptr
+    end
+
+    def []=(index, value)
+      if index < 0 || index >= size
+        raise IndexError, 'index %d outside of array bounds 0...%d' % [index, size]
+      end
+
+      if @is_struct
+        self[index].replace(value)
+      else
+        to_ptr[index * @size, @size] = [value].pack(@pack_format)
+        super(index, value)
+      end
+    end
+  end
+
   # Used to construct C classes (CUnion, CStruct, etc)
   #
   # Fiddle::Importer#struct and Fiddle::Importer#union wrap this functionality in an
@@ -35,7 +127,7 @@ module Fiddle
     # Fiddle::Importer#struct and Fiddle::Importer#union wrap this functionality in an
     # easy-to-use manner.
     #
-    # Example:
+    # Examples:
     #
     #   require 'fiddle/struct'
     #   require 'fiddle/cparser'
@@ -46,47 +138,98 @@ module Fiddle
     #
     #   MyStruct = Fiddle::CStructBuilder.create(Fiddle::CUnion, types, members)
     #
-    #   obj = MyStruct.allocate
+    #   MyStruct.malloc(Fiddle::RUBY_FREE) do |obj|
+    #     ...
+    #   end
+    #
+    #   obj = MyStruct.malloc(Fiddle::RUBY_FREE)
+    #   begin
+    #     ...
+    #   ensure
+    #     obj.call_free
+    #   end
+    #
+    #   obj = MyStruct.malloc
+    #   begin
+    #     ...
+    #   ensure
+    #     Fiddle.free obj.to_ptr
+    #   end
     #
     def create(klass, types, members)
       new_class = Class.new(klass){
-        define_method(:initialize){|addr|
-          @entity = klass.entity_class.new(addr, types)
+        define_method(:initialize){|addr, func = nil|
+          if addr.is_a?(self.class.entity_class)
+            @entity = addr
+          else
+            @entity = self.class.entity_class.new(addr, types, func)
+          end
           @entity.assign_names(members)
         }
+        define_method(:[]) { |*args| @entity.send(:[], *args) }
+        define_method(:[]=) { |*args| @entity.send(:[]=, *args) }
         define_method(:to_ptr){ @entity }
         define_method(:to_i){ @entity.to_i }
+        define_singleton_method(:types) { types }
+        define_singleton_method(:members) { members }
         members.each{|name|
+          name = name[0] if name.is_a?(Array) # name is a nested struct
+          next if method_defined?(name)
           define_method(name){ @entity[name] }
           define_method(name + "="){|val| @entity[name] = val }
         }
-      }
-      size = klass.entity_class.size(types)
-      new_class.module_eval(<<-EOS, __FILE__, __LINE__+1)
-        def new_class.size()
-          #{size}
+        entity_class = klass.entity_class
+        alignment = entity_class.alignment(types)
+        size = entity_class.size(types)
+        define_singleton_method(:alignment) { alignment }
+        define_singleton_method(:size) { size }
+        define_singleton_method(:malloc) do |func=nil, &block|
+          if block
+            entity_class.malloc(types, func, size) do |entity|
+              block.call(new(entity))
+            end
+          else
+            new(entity_class.malloc(types, func, size))
+          end
         end
-        def new_class.malloc()
-          addr = Fiddle.malloc(#{size})
-          new(addr)
-        end
-      EOS
+      }
       return new_class
     end
     module_function :create
   end
 
-  # A C struct wrapper
+  # A pointer to a C structure
   class CStructEntity < Fiddle::Pointer
     include PackInfo
     include ValueUtil
 
+    def CStructEntity.alignment(types)
+      max = 1
+      types.each do |type, count = 1|
+        if type.respond_to?(:entity_class)
+          n = type.alignment
+        else
+          n = ALIGN_MAP[type]
+        end
+        max = n if n > max
+      end
+      max
+    end
+
     # Allocates a C struct with the +types+ provided.
     #
-    # When the instance is garbage collected, the C function +func+ is called.
-    def CStructEntity.malloc(types, func = nil)
-      addr = Fiddle.malloc(CStructEntity.size(types))
-      CStructEntity.new(addr, types, func)
+    # See Fiddle::Pointer.malloc for memory management issues.
+    def CStructEntity.malloc(types, func = nil, size = size(types), &block)
+      if block_given?
+        super(size, func) do |struct|
+          struct.set_ctypes types
+          yield struct
+        end
+      else
+        struct = super(size, func)
+        struct.set_ctypes types
+        struct
+      end
     end
 
     # Returns the offset for the packed sizes for the given +types+.
@@ -102,9 +245,15 @@ module Fiddle
       max_align = types.map { |type, count = 1|
         last_offset = offset
 
-        align = PackInfo::ALIGN_MAP[type]
+        if type.respond_to?(:entity_class)
+          align = type.alignment
+          type_size = type.size
+        else
+          align = PackInfo::ALIGN_MAP[type]
+          type_size = PackInfo::SIZE_MAP[type]
+        end
         offset = PackInfo.align(last_offset, align) +
-                 (PackInfo::SIZE_MAP[type] * count)
+                 (type_size * count)
 
         align
       }.max
@@ -118,13 +267,37 @@ module Fiddle
     #
     # See also Fiddle::Pointer.new
     def initialize(addr, types, func = nil)
+      if func && addr.is_a?(Pointer) && addr.free
+        raise ArgumentError, 'free function specified on both underlying struct Pointer and when creating a CStructEntity - who do you want to free this?'
+      end
       set_ctypes(types)
       super(addr, @size, func)
     end
 
     # Set the names of the +members+ in this C struct
     def assign_names(members)
-      @members = members
+      @members = []
+      @nested_structs = {}
+      members.each_with_index do |member, index|
+        if member.is_a?(Array) # nested struct
+          member_name = member[0]
+          struct_type, struct_count = @ctypes[index]
+          if struct_count.nil?
+            struct = struct_type.new(to_i + @offset[index])
+          else
+            structs = struct_count.times.map do |i|
+              struct_type.new(to_i + @offset[index] + i * struct_type.size)
+            end
+            struct = StructArray.new(to_i + @offset[index],
+                                     struct_type,
+                                     structs)
+          end
+          @nested_structs[member_name] = struct
+        else
+          member_name = member
+        end
+        @members << member_name
+      end
     end
 
     # Calculates the offsets and sizes for the given +types+ in the struct.
@@ -135,12 +308,18 @@ module Fiddle
 
       max_align = types.map { |type, count = 1|
         orig_offset = offset
-        align = ALIGN_MAP[type]
+        if type.respond_to?(:entity_class)
+          align = type.alignment
+          type_size = type.size
+        else
+          align = ALIGN_MAP[type]
+          type_size = SIZE_MAP[type]
+        end
         offset = PackInfo.align(orig_offset, align)
 
         @offset << offset
 
-        offset += (SIZE_MAP[type] * count)
+        offset += (type_size * count)
 
         align
       }.max
@@ -148,15 +327,34 @@ module Fiddle
       @size = PackInfo.align(offset, max_align)
     end
 
-    # Fetch struct member +name+
-    def [](name)
+    # Fetch struct member +name+ if only one argument is specified. If two
+    # arguments are specified, the first is an offset and the second is a
+    # length and this method returns the string of +length+ bytes beginning at
+    # +offset+.
+    #
+    # Examples:
+    #
+    #     my_struct = struct(['int id']).malloc
+    #     my_struct.id = 1
+    #     my_struct['id'] # => 1
+    #     my_struct[0, 4] # => "\x01\x00\x00\x00".b
+    #
+    def [](*args)
+      return super(*args) if args.size > 1
+      name = args[0]
       idx = @members.index(name)
       if( idx.nil? )
         raise(ArgumentError, "no such member: #{name}")
       end
       ty = @ctypes[idx]
       if( ty.is_a?(Array) )
-        r = super(@offset[idx], SIZE_MAP[ty[0]] * ty[1])
+        if ty.first.respond_to?(:entity_class)
+          return @nested_structs[name]
+        else
+          r = super(@offset[idx], SIZE_MAP[ty[0]] * ty[1])
+        end
+      elsif ty.respond_to?(:entity_class)
+        return @nested_structs[name]
       else
         r = super(@offset[idx], SIZE_MAP[ty.abs])
       end
@@ -176,14 +374,44 @@ module Fiddle
       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])}
+        return StructArray.new(self + @offset[idx], ty[0], val)
       else
         return val
       end
     end
 
-    # Set struct member +name+, to value +val+
-    def []=(name, val)
+    # Set struct member +name+, to value +val+. If more arguments are
+    # specified, writes the string of bytes to the memory at the given
+    # +offset+ and +length+.
+    #
+    # Examples:
+    #
+    #     my_struct = struct(['int id']).malloc
+    #     my_struct['id'] = 1
+    #     my_struct[0, 4] = "\x01\x00\x00\x00".b
+    #     my_struct.id # => 1
+    #
+    def []=(*args)
+      return super(*args) if args.size > 2
+      name, val = *args
+      name = name.to_s if name.is_a?(Symbol)
+      nested_struct = @nested_structs[name]
+      if nested_struct
+        if nested_struct.is_a?(StructArray)
+          if val.nil?
+            nested_struct.each do |s|
+              s.replace(nil)
+            end
+          else
+            val.each_with_index do |v, i|
+              nested_struct[i] = v
+            end
+          end
+        else
+          nested_struct.replace(val)
+        end
+        return val
+      end
       idx = @members.index(name)
       if( idx.nil? )
         raise(ArgumentError, "no such member: #{name}")
@@ -202,23 +430,16 @@ module Fiddle
       end
     end
 
+    undef_method :size=
     def to_s() # :nodoc:
       super(@size)
     end
   end
 
-  # A C union wrapper
+  # A pointer to a C union
   class CUnionEntity < CStructEntity
     include PackInfo
 
-    # Allocates a C union the +types+ provided.
-    #
-    # When the instance is garbage collected, the C function +func+ is called.
-    def CUnionEntity.malloc(types, func=nil)
-      addr = Fiddle.malloc(CUnionEntity.size(types))
-      CUnionEntity.new(addr, types, func)
-    end
-
     # Returns the size needed for the union with the given +types+.
     #
     #   Fiddle::CUnionEntity.size(
@@ -228,7 +449,11 @@ module Fiddle
     #       Fiddle::TYPE_VOIDP ]) #=> 8
     def CUnionEntity.size(types)
       types.map { |type, count = 1|
-        PackInfo::SIZE_MAP[type] * count
+        if type.respond_to?(:entity_class)
+          type.size * count
+        else
+          PackInfo::SIZE_MAP[type] * count
+        end
       }.max
     end
 
@@ -241,4 +466,3 @@ module Fiddle
     end
   end
 end
-
diff --git a/ext/fiddle/lib/fiddle/types.rb b/ext/fiddle/lib/fiddle/types.rb
index 8a72635a69..7baf31ec9e 100644
--- a/ext/fiddle/lib/fiddle/types.rb
+++ b/ext/fiddle/lib/fiddle/types.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Fiddle
   # Adds Windows type aliases to the including class for use with
   # Fiddle::Importer.
@@ -27,28 +27,29 @@ module Fiddle
   # * WORD
   module Win32Types
     def included(m) # :nodoc:
+      # https://docs.microsoft.com/en-us/windows/win32/winprog/windows-data-types
       m.module_eval{
-        typealias "DWORD", "unsigned long"
-        typealias "PDWORD", "unsigned long *"
-        typealias "DWORD32", "unsigned long"
-        typealias "DWORD64", "unsigned long long"
-        typealias "WORD", "unsigned short"
-        typealias "PWORD", "unsigned short *"
+        typealias "ATOM", "WORD"
         typealias "BOOL", "int"
-        typealias "ATOM", "int"
         typealias "BYTE", "unsigned char"
-        typealias "PBYTE", "unsigned char *"
+        typealias "DWORD", "unsigned long"
+        typealias "DWORD32", "uint32_t"
+        typealias "DWORD64", "uint64_t"
+        typealias "HANDLE", "PVOID"
+        typealias "HDC", "HANDLE"
+        typealias "HINSTANCE", "HANDLE"
+        typealias "HWND", "HANDLE"
+        typealias "LPCSTR", "const char *"
+        typealias "LPSTR", "char *"
+        typealias "PBYTE", "BYTE *"
+        typealias "PDWORD", "DWORD *"
+        typealias "PHANDLE", "HANDLE *"
+        typealias "PVOID", "void *"
+        typealias "PWORD", "WORD *"
+        typealias "UCHAR", "unsigned char"
         typealias "UINT", "unsigned int"
         typealias "ULONG", "unsigned long"
-        typealias "UCHAR", "unsigned char"
-        typealias "HANDLE", "uintptr_t"
-        typealias "PHANDLE", "void*"
-        typealias "PVOID", "void*"
-        typealias "LPCSTR", "char*"
-        typealias "LPSTR", "char*"
-        typealias "HINSTANCE", "unsigned int"
-        typealias "HDC", "unsigned int"
-        typealias "HWND", "unsigned int"
+        typealias "WORD", "unsigned short"
       }
     end
     module_function :included
diff --git a/ext/fiddle/lib/fiddle/value.rb b/ext/fiddle/lib/fiddle/value.rb
index ac318cf2c4..01fec1c206 100644
--- a/ext/fiddle/lib/fiddle/value.rb
+++ b/ext/fiddle/lib/fiddle/value.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'fiddle'
 
 module Fiddle
@@ -13,10 +13,13 @@ module Fiddle
         [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
+        if defined?(TYPE_LONG_LONG) and
+          ty.abs == TYPE_LONG_LONG
+          [val].pack("q").unpack("Q")[0]
+        else
+          val
+        end
       end
     end
 
@@ -30,10 +33,13 @@ module Fiddle
         [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
+        if defined?(TYPE_LONG_LONG) and
+          ty.abs == TYPE_LONG_LONG
+          [val].pack("Q").unpack("q")[0]
+        else
+          val
+        end
       end
     end
 
@@ -75,10 +81,13 @@ module Fiddle
           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*)?")
+            if defined?(SIZEOF_LONG_LONG) and
+              SIZEOF_VOIDP == SIZEOF_LONG_LONG
+              return [arg].pack("p").unpack("q")[0]
+            else
+              raise(RuntimeError, "sizeof(void*)?")
+            end
           end
         end
       when Float, Integer
diff --git a/ext/fiddle/lib/fiddle/version.rb b/ext/fiddle/lib/fiddle/version.rb
new file mode 100644
index 0000000000..a699371ee4
--- /dev/null
+++ b/ext/fiddle/lib/fiddle/version.rb
@@ -0,0 +1,3 @@
+module Fiddle
+  VERSION = "1.0.8"
+end
diff --git a/ext/fiddle/memory_view.c b/ext/fiddle/memory_view.c
new file mode 100644
index 0000000000..172b1f18fc
--- /dev/null
+++ b/ext/fiddle/memory_view.c
@@ -0,0 +1,254 @@
+#include <stdbool.h>
+#include <ruby/ruby.h>
+
+#ifdef HAVE_RUBY_MEMORY_VIEW_H
+# include <ruby/memory_view.h>
+#endif
+
+#if SIZEOF_INTPTR_T == SIZEOF_LONG_LONG
+#   define INTPTR2NUM LL2NUM
+#   define UINTPTR2NUM ULL2NUM
+#elif SIZEOF_INTPTR_T == SIZEOF_LONG
+#   define INTPTR2NUM LONG2NUM
+#   define UINTPTR2NUM ULONG2NUM
+#else
+#   define INTPTR2NUM INT2NUM
+#   define UINTPTR2NUM UINT2NUM
+#endif
+
+#include <fiddle.h>
+
+#ifdef FIDDLE_MEMORY_VIEW
+VALUE rb_cMemoryView = Qnil;
+
+struct memview_data {
+    rb_memory_view_t view;
+    rb_memory_view_item_component_t *members;
+    size_t n_members;
+};
+
+static void
+fiddle_memview_mark(void *ptr)
+{
+    const struct memview_data *data = ptr;
+    rb_gc_mark(data->view.obj);
+}
+
+static void
+fiddle_memview_free(void *ptr)
+{
+    struct memview_data *data = ptr;
+    rb_memory_view_release(&data->view);
+    if (data->members)
+        xfree(data->members);
+    xfree(ptr);
+}
+
+static size_t
+fiddle_memview_memsize(const void *ptr)
+{
+    const struct memview_data *data = ptr;
+    return sizeof(*data) + sizeof(rb_memory_view_item_component_t)*data->n_members + (size_t)data->view.byte_size;
+}
+
+static const rb_data_type_t fiddle_memview_data_type = {
+    "fiddle/memory_view",
+    {fiddle_memview_mark, fiddle_memview_free, fiddle_memview_memsize,},
+};
+
+static VALUE
+rb_fiddle_memview_s_allocate(VALUE klass)
+{
+    struct memview_data *data;
+    VALUE obj = TypedData_Make_Struct(klass, struct memview_data, &fiddle_memview_data_type, data);
+    data->view.obj = Qnil;
+    data->members = NULL;
+    data->n_members = 0;
+    return obj;
+}
+
+static VALUE
+rb_fiddle_memview_initialize(VALUE obj, VALUE target)
+{
+    struct memview_data *data;
+    TypedData_Get_Struct(obj, struct memview_data, &fiddle_memview_data_type, data);
+
+    if (!rb_memory_view_get(target, &data->view, 0)) {
+        rb_raise(rb_eArgError, "Unable to get a memory view from %+"PRIsVALUE, target);
+    }
+
+    return Qnil;
+}
+
+static VALUE
+rb_fiddle_memview_get_obj(VALUE obj)
+{
+    struct memview_data *data;
+    TypedData_Get_Struct(obj, struct memview_data, &fiddle_memview_data_type, data);
+
+    return data->view.obj;
+}
+
+static VALUE
+rb_fiddle_memview_get_byte_size(VALUE obj)
+{
+    struct memview_data *data;
+    TypedData_Get_Struct(obj, struct memview_data, &fiddle_memview_data_type, data);
+
+    if (NIL_P(data->view.obj)) return Qnil;
+    return SSIZET2NUM(data->view.byte_size);
+}
+
+static VALUE
+rb_fiddle_memview_get_readonly(VALUE obj)
+{
+    struct memview_data *data;
+    TypedData_Get_Struct(obj, struct memview_data, &fiddle_memview_data_type, data);
+
+    if (NIL_P(data->view.obj)) return Qnil;
+    return data->view.readonly ? Qtrue : Qfalse;
+}
+
+static VALUE
+rb_fiddle_memview_get_format(VALUE obj)
+{
+    struct memview_data *data;
+    TypedData_Get_Struct(obj, struct memview_data, &fiddle_memview_data_type, data);
+
+    if (NIL_P(data->view.obj)) return Qnil;
+    return data->view.format == NULL ? Qnil : rb_str_new_cstr(data->view.format);
+}
+
+static VALUE
+rb_fiddle_memview_get_item_size(VALUE obj)
+{
+    struct memview_data *data;
+    TypedData_Get_Struct(obj, struct memview_data, &fiddle_memview_data_type, data);
+
+    if (NIL_P(data->view.obj)) return Qnil;
+    return SSIZET2NUM(data->view.item_size);
+}
+
+static VALUE
+rb_fiddle_memview_get_ndim(VALUE obj)
+{
+    struct memview_data *data;
+    TypedData_Get_Struct(obj, struct memview_data, &fiddle_memview_data_type, data);
+
+    if (NIL_P(data->view.obj)) return Qnil;
+    return SSIZET2NUM(data->view.ndim);
+}
+
+static VALUE
+rb_fiddle_memview_get_shape(VALUE obj)
+{
+    struct memview_data *data;
+    TypedData_Get_Struct(obj, struct memview_data, &fiddle_memview_data_type, data);
+
+    if (NIL_P(data->view.obj)) return Qnil;
+    if (data->view.shape == NULL) return Qnil;
+
+    const ssize_t ndim = data->view.ndim;
+    VALUE shape = rb_ary_new_capa(ndim);
+    ssize_t i;
+    for (i = 0; i < ndim; ++i) {
+        rb_ary_push(shape, SSIZET2NUM(data->view.shape[i]));
+    }
+    return shape;
+}
+
+static VALUE
+rb_fiddle_memview_get_strides(VALUE obj)
+{
+    struct memview_data *data;
+    TypedData_Get_Struct(obj, struct memview_data, &fiddle_memview_data_type, data);
+
+    if (NIL_P(data->view.obj)) return Qnil;
+    if (data->view.strides == NULL) return Qnil;
+
+    const ssize_t ndim = data->view.ndim;
+    VALUE strides = rb_ary_new_capa(ndim);
+    ssize_t i;
+    for (i = 0; i < ndim; ++i) {
+        rb_ary_push(strides, SSIZET2NUM(data->view.strides[i]));
+    }
+    return strides;
+}
+
+static VALUE
+rb_fiddle_memview_get_sub_offsets(VALUE obj)
+{
+    struct memview_data *data;
+    TypedData_Get_Struct(obj, struct memview_data, &fiddle_memview_data_type, data);
+
+    if (NIL_P(data->view.obj)) return Qnil;
+    if (data->view.sub_offsets == NULL) return Qnil;
+
+    const ssize_t ndim = data->view.ndim;
+    VALUE sub_offsets = rb_ary_new_capa(ndim);
+    ssize_t i;
+    for (i = 0; i < ndim; ++i) {
+        rb_ary_push(sub_offsets, SSIZET2NUM(data->view.sub_offsets[i]));
+    }
+    return sub_offsets;
+}
+
+static VALUE
+rb_fiddle_memview_aref(int argc, VALUE *argv, VALUE obj)
+{
+    struct memview_data *data;
+    TypedData_Get_Struct(obj, struct memview_data, &fiddle_memview_data_type, data);
+
+    if (NIL_P(data->view.obj)) return Qnil;
+
+    const ssize_t ndim = data->view.ndim;
+    if (argc != ndim) {
+        rb_raise(rb_eIndexError, "wrong number of index (%d for %"PRIdSIZE")", argc, ndim);
+    }
+
+    VALUE indices_v = 0;
+    ssize_t *indices = ALLOCV_N(ssize_t, indices_v, ndim);
+
+    ssize_t i;
+    for (i = 0; i < ndim; ++i) {
+        ssize_t x = NUM2SSIZET(argv[i]);
+        indices[i] = x;
+    }
+
+    uint8_t *ptr = rb_memory_view_get_item_pointer(&data->view, indices);
+    ALLOCV_END(indices_v);
+
+    if (data->view.format == NULL) {
+        return INT2FIX(*ptr);
+    }
+
+    if (!data->members) {
+        const char *err;
+        if (rb_memory_view_parse_item_format(data->view.format, &data->members, &data->n_members, &err) < 0) {
+            rb_raise(rb_eRuntimeError, "Unable to recognize item format at %"PRIdSIZE" in \"%s\"",
+                     err - data->view.format, data->view.format);
+        }
+    }
+
+    return rb_memory_view_extract_item_members(ptr, data->members, data->n_members);
+}
+
+void
+Init_fiddle_memory_view(void)
+{
+    rb_cMemoryView = rb_define_class_under(mFiddle, "MemoryView", rb_cObject);
+    rb_define_alloc_func(rb_cMemoryView, rb_fiddle_memview_s_allocate);
+    rb_define_method(rb_cMemoryView, "initialize", rb_fiddle_memview_initialize, 1);
+    rb_define_method(rb_cMemoryView, "obj", rb_fiddle_memview_get_obj, 0);
+    rb_define_method(rb_cMemoryView, "byte_size", rb_fiddle_memview_get_byte_size, 0);
+    rb_define_method(rb_cMemoryView, "readonly?", rb_fiddle_memview_get_readonly, 0);
+    rb_define_method(rb_cMemoryView, "format", rb_fiddle_memview_get_format, 0);
+    rb_define_method(rb_cMemoryView, "item_size", rb_fiddle_memview_get_item_size, 0);
+    rb_define_method(rb_cMemoryView, "ndim", rb_fiddle_memview_get_ndim, 0);
+    rb_define_method(rb_cMemoryView, "shape", rb_fiddle_memview_get_shape, 0);
+    rb_define_method(rb_cMemoryView, "strides", rb_fiddle_memview_get_strides, 0);
+    rb_define_method(rb_cMemoryView, "sub_offsets", rb_fiddle_memview_get_sub_offsets, 0);
+    rb_define_method(rb_cMemoryView, "[]", rb_fiddle_memview_aref, -1);
+}
+
+#endif /* FIDDLE_MEMORY_VIEW */
diff --git a/ext/fiddle/pinned.c b/ext/fiddle/pinned.c
new file mode 100644
index 0000000000..019a3020e2
--- /dev/null
+++ b/ext/fiddle/pinned.c
@@ -0,0 +1,123 @@
+#include <fiddle.h>
+
+VALUE rb_cPinned;
+VALUE rb_eFiddleClearedReferenceError;
+
+struct pinned_data {
+    VALUE ptr;
+};
+
+static void
+pinned_mark(void *ptr)
+{
+    struct pinned_data *data = (struct pinned_data*)ptr;
+    /* Ensure reference is pinned */
+    if (data->ptr) {
+        rb_gc_mark(data->ptr);
+    }
+}
+
+static size_t
+pinned_memsize(const void *ptr)
+{
+    return sizeof(struct pinned_data);
+}
+
+static const rb_data_type_t pinned_data_type = {
+    "fiddle/pinned",
+    {pinned_mark, xfree, pinned_memsize, },
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED
+};
+
+static VALUE
+allocate(VALUE klass)
+{
+    struct pinned_data *data;
+    VALUE obj = TypedData_Make_Struct(klass, struct pinned_data, &pinned_data_type, data);
+    data->ptr = 0;
+    return obj;
+}
+
+/*
+ * call-seq:
+ *    Fiddle::Pinned.new(object)      => pinned_object
+ *
+ * Create a new pinned object reference.  The Fiddle::Pinned instance will
+ * prevent the GC from moving +object+.
+ */
+static VALUE
+initialize(VALUE self, VALUE ref)
+{
+    struct pinned_data *data;
+    TypedData_Get_Struct(self, struct pinned_data, &pinned_data_type, data);
+    RB_OBJ_WRITE(self, &data->ptr, ref);
+    return self;
+}
+
+/*
+ * call-seq: ref
+ *
+ * Return the object that this pinned instance references.
+ */
+static VALUE
+ref(VALUE self)
+{
+    struct pinned_data *data;
+    TypedData_Get_Struct(self, struct pinned_data, &pinned_data_type, data);
+    if (data->ptr) {
+      return data->ptr;
+    } else {
+      rb_raise(rb_eFiddleClearedReferenceError, "`ref` called on a cleared object");
+    }
+}
+
+/*
+ * call-seq: clear
+ *
+ * Clear the reference to the object this is pinning.
+ */
+static VALUE
+clear(VALUE self)
+{
+    struct pinned_data *data;
+    TypedData_Get_Struct(self, struct pinned_data, &pinned_data_type, data);
+    data->ptr = 0;
+    return self;
+}
+
+/*
+ * call-seq: cleared?
+ *
+ * Returns true if the reference has been cleared, otherwise returns false.
+ */
+static VALUE
+cleared_p(VALUE self)
+{
+    struct pinned_data *data;
+    TypedData_Get_Struct(self, struct pinned_data, &pinned_data_type, data);
+    if (data->ptr) {
+        return Qfalse;
+    } else {
+        return Qtrue;
+    }
+}
+
+extern VALUE rb_eFiddleError;
+
+void
+Init_fiddle_pinned(void)
+{
+    rb_cPinned = rb_define_class_under(mFiddle, "Pinned", rb_cObject);
+    rb_define_alloc_func(rb_cPinned, allocate);
+    rb_define_method(rb_cPinned, "initialize", initialize, 1);
+    rb_define_method(rb_cPinned, "ref", ref, 0);
+    rb_define_method(rb_cPinned, "clear", clear, 0);
+    rb_define_method(rb_cPinned, "cleared?", cleared_p, 0);
+
+    /*
+     * Document-class: Fiddle::ClearedReferenceError
+     *
+     * Cleared reference exception
+     */
+    rb_eFiddleClearedReferenceError = rb_define_class_under(mFiddle, "ClearedReferenceError", rb_eFiddleError);
+}
diff --git a/ext/fiddle/pointer.c b/ext/fiddle/pointer.c
index 932bc576c5..c5fb442aec 100644
--- a/ext/fiddle/pointer.c
+++ b/ext/fiddle/pointer.c
@@ -2,8 +2,14 @@
  * $Id$
  */
 
+#include <stdbool.h>
 #include <ruby/ruby.h>
 #include <ruby/io.h>
+
+#ifdef HAVE_RUBY_MEMORY_VIEW_H
+# include <ruby/memory_view.h>
+#endif
+
 #include <ctype.h>
 #include <fiddle.h>
 
@@ -24,6 +30,7 @@ struct ptr_data {
     void *ptr;
     long size;
     freefunc_t free;
+    bool freed;
     VALUE wrap[2];
 };
 
@@ -57,14 +64,19 @@ fiddle_ptr_mark(void *ptr)
 }
 
 static void
-fiddle_ptr_free(void *ptr)
+fiddle_ptr_free_ptr(void *ptr)
 {
     struct ptr_data *data = ptr;
-    if (data->ptr) {
-	if (data->free) {
-	    (*(data->free))(data->ptr);
-	}
+    if (data->ptr && data->free && !data->freed) {
+	data->freed = true;
+	(*(data->free))(data->ptr);
     }
+}
+
+static void
+fiddle_ptr_free(void *ptr)
+{
+    fiddle_ptr_free_ptr(ptr);
     xfree(ptr);
 }
 
@@ -80,6 +92,38 @@ static const rb_data_type_t fiddle_ptr_data_type = {
     {fiddle_ptr_mark, fiddle_ptr_free, fiddle_ptr_memsize,},
 };
 
+#ifdef FIDDLE_MEMORY_VIEW
+static struct ptr_data *
+fiddle_ptr_check_memory_view(VALUE obj)
+{
+    struct ptr_data *data;
+    TypedData_Get_Struct(obj, struct ptr_data, &fiddle_ptr_data_type, data);
+    if (data->ptr == NULL || data->size == 0) return NULL;
+    return data;
+}
+
+static bool
+fiddle_ptr_memory_view_available_p(VALUE obj)
+{
+    return fiddle_ptr_check_memory_view(obj) != NULL;
+}
+
+static bool
+fiddle_ptr_get_memory_view(VALUE obj, rb_memory_view_t *view, int flags)
+{
+    struct ptr_data *data = fiddle_ptr_check_memory_view(obj);
+    rb_memory_view_init_as_byte_array(view, obj, data->ptr, data->size, true);
+
+    return true;
+}
+
+static const rb_memory_view_entry_t fiddle_ptr_memory_view_entry = {
+    fiddle_ptr_get_memory_view,
+    NULL,
+    fiddle_ptr_memory_view_available_p
+};
+#endif
+
 static VALUE
 rb_fiddle_ptr_new2(VALUE klass, void *ptr, long size, freefunc_t func)
 {
@@ -89,8 +133,8 @@ rb_fiddle_ptr_new2(VALUE klass, void *ptr, long size, freefunc_t func)
     val = TypedData_Make_Struct(klass, struct ptr_data, &fiddle_ptr_data_type, data);
     data->ptr = ptr;
     data->free = func;
+    data->freed = false;
     data->size = size;
-    OBJ_TAINT(val);
 
     return val;
 }
@@ -102,13 +146,13 @@ rb_fiddle_ptr_new(void *ptr, long size, freefunc_t func)
 }
 
 static VALUE
-rb_fiddle_ptr_malloc(long size, freefunc_t func)
+rb_fiddle_ptr_malloc(VALUE klass, long size, freefunc_t func)
 {
     void *ptr;
 
     ptr = ruby_xmalloc((size_t)size);
     memset(ptr,0,(size_t)size);
-    return rb_fiddle_ptr_new(ptr, size, func);
+    return rb_fiddle_ptr_new2(klass, ptr, size, func);
 }
 
 static void *
@@ -141,6 +185,7 @@ rb_fiddle_ptr_s_allocate(VALUE klass)
     data->ptr = 0;
     data->size = 0;
     data->free = 0;
+    data->freed = false;
 
     return obj;
 }
@@ -192,16 +237,53 @@ rb_fiddle_ptr_initialize(int argc, VALUE argv[], VALUE self)
     return Qnil;
 }
 
+static VALUE
+rb_fiddle_ptr_call_free(VALUE self);
+
 /*
  * call-seq:
- *
  *    Fiddle::Pointer.malloc(size, freefunc = nil)  => fiddle pointer instance
+ *    Fiddle::Pointer.malloc(size, freefunc) { |pointer| ... } => ...
+ *
+ * == Examples
+ *
+ *    # Automatically freeing the pointer when the block is exited - recommended
+ *    Fiddle::Pointer.malloc(size, Fiddle::RUBY_FREE) do |pointer|
+ *      ...
+ *    end
+ *
+ *    # Manually freeing but relying on the garbage collector otherwise
+ *    pointer = Fiddle::Pointer.malloc(size, Fiddle::RUBY_FREE)
+ *    ...
+ *    pointer.call_free
+ *
+ *    # Relying on the garbage collector - may lead to unlimited memory allocated before freeing any, but safe
+ *    pointer = Fiddle::Pointer.malloc(size, Fiddle::RUBY_FREE)
+ *    ...
+ *
+ *    # Only manually freeing
+ *    pointer = Fiddle::Pointer.malloc(size)
+ *    begin
+ *      ...
+ *    ensure
+ *      Fiddle.free pointer
+ *    end
+ *
+ *    # No free function and no call to free - the native memory will leak if the pointer is garbage collected
+ *    pointer = Fiddle::Pointer.malloc(size)
+ *    ...
  *
  * Allocate +size+ bytes of memory and associate it with an optional
- * +freefunc+ that will be called when the pointer is garbage collected.
+ * +freefunc+.
+ *
+ * If a block is supplied, the pointer will be yielded to the block instead of
+ * being returned, and the return value of the block will be returned. A
+ * +freefunc+ must be supplied if a block is.
  *
- * +freefunc+ must be an address pointing to a function or an instance of
- * Fiddle::Function
+ * If a +freefunc+ is supplied it will be called once, when the pointer is
+ * garbage collected or when the block is left if a block is supplied or
+ * when the user calls +call_free+, whichever happens first. +freefunc+ must be
+ * an address pointing to a function or an instance of +Fiddle::Function+.
  */
 static VALUE
 rb_fiddle_ptr_s_malloc(int argc, VALUE argv[], VALUE klass)
@@ -223,10 +305,17 @@ rb_fiddle_ptr_s_malloc(int argc, VALUE argv[], VALUE klass)
 	rb_bug("rb_fiddle_ptr_s_malloc");
     }
 
-    obj = rb_fiddle_ptr_malloc(s,f);
+    obj = rb_fiddle_ptr_malloc(klass, s,f);
     if (wrap) RPTR_DATA(obj)->wrap[1] = wrap;
 
-    return obj;
+    if (rb_block_given_p()) {
+        if (!f) {
+            rb_raise(rb_eArgError, "a free function must be supplied to Fiddle::Pointer.malloc when it is called with a block");
+        }
+        return rb_ensure(rb_yield, obj, rb_fiddle_ptr_call_free, obj);
+    } else {
+        return obj;
+    }
 }
 
 /*
@@ -352,6 +441,34 @@ rb_fiddle_ptr_free_get(VALUE self)
 }
 
 /*
+ * call-seq: call_free => nil
+ *
+ * Call the free function for this pointer. Calling more than once will do
+ * nothing. Does nothing if there is no free function attached.
+ */
+static VALUE
+rb_fiddle_ptr_call_free(VALUE self)
+{
+    struct ptr_data *pdata;
+    TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, pdata);
+    fiddle_ptr_free_ptr(pdata);
+    return Qnil;
+}
+
+/*
+ * call-seq: freed? => bool
+ *
+ * Returns if the free function for this pointer has been called.
+ */
+static VALUE
+rb_fiddle_ptr_freed_p(VALUE self)
+{
+    struct ptr_data *pdata;
+    TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, pdata);
+    return pdata->freed ? Qtrue : Qfalse;
+}
+
+/*
  * call-seq:
  *
  *    ptr.to_s        => string
@@ -376,11 +493,11 @@ rb_fiddle_ptr_to_s(int argc, VALUE argv[], VALUE self)
     TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, data);
     switch (rb_scan_args(argc, argv, "01", &arg1)) {
       case 0:
-	val = rb_tainted_str_new2((char*)(data->ptr));
+	val = rb_str_new2((char*)(data->ptr));
 	break;
       case 1:
 	len = NUM2INT(arg1);
-	val = rb_tainted_str_new((char*)(data->ptr), len);
+	val = rb_str_new((char*)(data->ptr), len);
 	break;
       default:
 	rb_bug("rb_fiddle_ptr_to_s");
@@ -414,11 +531,11 @@ rb_fiddle_ptr_to_str(int argc, VALUE argv[], VALUE self)
     TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, data);
     switch (rb_scan_args(argc, argv, "01", &arg1)) {
       case 0:
-	val = rb_tainted_str_new((char*)(data->ptr),data->size);
+	val = rb_str_new((char*)(data->ptr),data->size);
 	break;
       case 1:
 	len = NUM2INT(arg1);
-	val = rb_tainted_str_new((char*)(data->ptr), len);
+	val = rb_str_new((char*)(data->ptr), len);
 	break;
       default:
 	rb_bug("rb_fiddle_ptr_to_str");
@@ -440,7 +557,7 @@ rb_fiddle_ptr_inspect(VALUE self)
 
     TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, data);
     return rb_sprintf("#<%"PRIsVALUE":%p ptr=%p size=%ld free=%p>",
-		      RB_OBJ_CLASSNAME(self), data, data->ptr, data->size, data->free);
+		      RB_OBJ_CLASSNAME(self), (void *)data, data->ptr, data->size, (void *)data->free);
 }
 
 /*
@@ -542,7 +659,7 @@ rb_fiddle_ptr_aref(int argc, VALUE argv[], VALUE self)
     struct ptr_data *data;
 
     TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, data);
-    if (!data->ptr) rb_raise(rb_eFiddleError, "NULL pointer dereference");
+    if (!data->ptr) rb_raise(rb_eFiddleDLError, "NULL pointer dereference");
     switch( rb_scan_args(argc, argv, "11", &arg0, &arg1) ){
       case 1:
 	offset = NUM2ULONG(arg0);
@@ -551,7 +668,7 @@ rb_fiddle_ptr_aref(int argc, VALUE argv[], VALUE self)
       case 2:
 	offset = NUM2ULONG(arg0);
 	len    = NUM2ULONG(arg1);
-	retval = rb_tainted_str_new((char *)data->ptr + offset, len);
+	retval = rb_str_new((char *)data->ptr + offset, len);
 	break;
       default:
 	rb_bug("rb_fiddle_ptr_aref()");
@@ -580,7 +697,7 @@ rb_fiddle_ptr_aset(int argc, VALUE argv[], VALUE self)
     struct ptr_data *data;
 
     TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, data);
-    if (!data->ptr) rb_raise(rb_eFiddleError, "NULL pointer dereference");
+    if (!data->ptr) rb_raise(rb_eFiddleDLError, "NULL pointer dereference");
     switch( rb_scan_args(argc, argv, "21", &arg0, &arg1, &arg2) ){
       case 2:
 	offset = NUM2ULONG(arg0);
@@ -661,7 +778,7 @@ rb_fiddle_ptr_s_to_ptr(VALUE self, VALUE val)
 	    wrap = 0;
 	}
 	else{
-	    rb_raise(rb_eFiddleError, "to_ptr should return a Fiddle::Pointer object");
+	    rb_raise(rb_eFiddleDLError, "to_ptr should return a Fiddle::Pointer object");
 	}
     }
     else{
@@ -669,7 +786,6 @@ rb_fiddle_ptr_s_to_ptr(VALUE self, VALUE val)
 	if (num == val) wrap = 0;
 	ptr = rb_fiddle_ptr_new(NUM2PTR(num), 0, NULL);
     }
-    OBJ_INFECT(ptr, val);
     if (wrap) RPTR_DATA(ptr)->wrap[0] = wrap;
     return ptr;
 }
@@ -677,6 +793,7 @@ rb_fiddle_ptr_s_to_ptr(VALUE self, VALUE val)
 void
 Init_fiddle_pointer(void)
 {
+#undef rb_intern
     id_to_ptr = rb_intern("to_ptr");
 
     /* Document-class: Fiddle::Pointer
@@ -692,6 +809,8 @@ Init_fiddle_pointer(void)
     rb_define_method(rb_cPointer, "initialize", rb_fiddle_ptr_initialize, -1);
     rb_define_method(rb_cPointer, "free=", rb_fiddle_ptr_free_set, 1);
     rb_define_method(rb_cPointer, "free",  rb_fiddle_ptr_free_get, 0);
+    rb_define_method(rb_cPointer, "call_free",  rb_fiddle_ptr_call_free, 0);
+    rb_define_method(rb_cPointer, "freed?",  rb_fiddle_ptr_freed_p, 0);
     rb_define_method(rb_cPointer, "to_i",  rb_fiddle_ptr_to_i, 0);
     rb_define_method(rb_cPointer, "to_int",  rb_fiddle_ptr_to_i, 0);
     rb_define_method(rb_cPointer, "to_value",  rb_fiddle_ptr_to_value, 0);
@@ -713,6 +832,10 @@ Init_fiddle_pointer(void)
     rb_define_method(rb_cPointer, "size", rb_fiddle_ptr_size_get, 0);
     rb_define_method(rb_cPointer, "size=", rb_fiddle_ptr_size_set, 1);
 
+#ifdef FIDDLE_MEMORY_VIEW
+    rb_memory_view_register(rb_cPointer, &fiddle_ptr_memory_view_entry);
+#endif
+
     /*  Document-const: NULL
      *
      * A NULL pointer
diff --git a/ext/fiddle/win32/fficonfig.h b/ext/fiddle/win32/fficonfig.h
index 776808159c..776808159c 100755..100644
--- a/ext/fiddle/win32/fficonfig.h
+++ b/ext/fiddle/win32/fficonfig.h
diff --git a/ext/fiddle/win32/libffi-config.rb b/ext/fiddle/win32/libffi-config.rb
index 7a32a91517..985fc29d36 100755
--- a/ext/fiddle/win32/libffi-config.rb
+++ b/ext/fiddle/win32/libffi-config.rb
@@ -1,5 +1,5 @@
 #!/usr/bin/ruby
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'fileutils'
 
 basedir = File.dirname(__FILE__)
@@ -32,7 +32,7 @@ IO.foreach("#{srcdir}/configure.ac") do |line|
   end
 end
 
-builddir = srcdir == "." ? enable['builddir'] : "."
+builddir = srcdir == "." ? (enable['builddir'] || ".") : "."
 conf['TARGET'] = /^x64/ =~ host ? "X86_WIN64" : "X86_WIN32"
 
 FileUtils.mkdir_p([builddir, "#{builddir}/include", "#{builddir}/src/x86"])
diff --git a/ext/fiddle/win32/libffi.mk.tmpl b/ext/fiddle/win32/libffi.mk.tmpl
index 2a16e8efec..2a16e8efec 100755..100644
--- a/ext/fiddle/win32/libffi.mk.tmpl
+++ b/ext/fiddle/win32/libffi.mk.tmpl
diff --git a/ext/gdbm/depend b/ext/gdbm/depend
new file mode 100644
index 0000000000..c3730c0953
--- /dev/null
+++ b/ext/gdbm/depend
@@ -0,0 +1,163 @@
+# AUTOGENERATED DEPENDENCIES START
+gdbm.o: $(RUBY_EXTCONF_H)
+gdbm.o: $(arch_hdrdir)/ruby/config.h
+gdbm.o: $(hdrdir)/ruby.h
+gdbm.o: $(hdrdir)/ruby/internal/anyargs.h
+gdbm.o: $(hdrdir)/ruby/internal/arithmetic.h
+gdbm.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+gdbm.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+gdbm.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+gdbm.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+gdbm.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+gdbm.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+gdbm.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+gdbm.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+gdbm.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+gdbm.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+gdbm.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+gdbm.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+gdbm.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+gdbm.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+gdbm.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+gdbm.o: $(hdrdir)/ruby/internal/assume.h
+gdbm.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+gdbm.o: $(hdrdir)/ruby/internal/attr/artificial.h
+gdbm.o: $(hdrdir)/ruby/internal/attr/cold.h
+gdbm.o: $(hdrdir)/ruby/internal/attr/const.h
+gdbm.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+gdbm.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+gdbm.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+gdbm.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+gdbm.o: $(hdrdir)/ruby/internal/attr/error.h
+gdbm.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+gdbm.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+gdbm.o: $(hdrdir)/ruby/internal/attr/format.h
+gdbm.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+gdbm.o: $(hdrdir)/ruby/internal/attr/noalias.h
+gdbm.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+gdbm.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+gdbm.o: $(hdrdir)/ruby/internal/attr/noinline.h
+gdbm.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+gdbm.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+gdbm.o: $(hdrdir)/ruby/internal/attr/pure.h
+gdbm.o: $(hdrdir)/ruby/internal/attr/restrict.h
+gdbm.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+gdbm.o: $(hdrdir)/ruby/internal/attr/warning.h
+gdbm.o: $(hdrdir)/ruby/internal/attr/weakref.h
+gdbm.o: $(hdrdir)/ruby/internal/cast.h
+gdbm.o: $(hdrdir)/ruby/internal/compiler_is.h
+gdbm.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+gdbm.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+gdbm.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+gdbm.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+gdbm.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+gdbm.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+gdbm.o: $(hdrdir)/ruby/internal/compiler_since.h
+gdbm.o: $(hdrdir)/ruby/internal/config.h
+gdbm.o: $(hdrdir)/ruby/internal/constant_p.h
+gdbm.o: $(hdrdir)/ruby/internal/core.h
+gdbm.o: $(hdrdir)/ruby/internal/core/rarray.h
+gdbm.o: $(hdrdir)/ruby/internal/core/rbasic.h
+gdbm.o: $(hdrdir)/ruby/internal/core/rbignum.h
+gdbm.o: $(hdrdir)/ruby/internal/core/rclass.h
+gdbm.o: $(hdrdir)/ruby/internal/core/rdata.h
+gdbm.o: $(hdrdir)/ruby/internal/core/rfile.h
+gdbm.o: $(hdrdir)/ruby/internal/core/rhash.h
+gdbm.o: $(hdrdir)/ruby/internal/core/robject.h
+gdbm.o: $(hdrdir)/ruby/internal/core/rregexp.h
+gdbm.o: $(hdrdir)/ruby/internal/core/rstring.h
+gdbm.o: $(hdrdir)/ruby/internal/core/rstruct.h
+gdbm.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+gdbm.o: $(hdrdir)/ruby/internal/ctype.h
+gdbm.o: $(hdrdir)/ruby/internal/dllexport.h
+gdbm.o: $(hdrdir)/ruby/internal/dosish.h
+gdbm.o: $(hdrdir)/ruby/internal/error.h
+gdbm.o: $(hdrdir)/ruby/internal/eval.h
+gdbm.o: $(hdrdir)/ruby/internal/event.h
+gdbm.o: $(hdrdir)/ruby/internal/fl_type.h
+gdbm.o: $(hdrdir)/ruby/internal/gc.h
+gdbm.o: $(hdrdir)/ruby/internal/glob.h
+gdbm.o: $(hdrdir)/ruby/internal/globals.h
+gdbm.o: $(hdrdir)/ruby/internal/has/attribute.h
+gdbm.o: $(hdrdir)/ruby/internal/has/builtin.h
+gdbm.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+gdbm.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+gdbm.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+gdbm.o: $(hdrdir)/ruby/internal/has/extension.h
+gdbm.o: $(hdrdir)/ruby/internal/has/feature.h
+gdbm.o: $(hdrdir)/ruby/internal/has/warning.h
+gdbm.o: $(hdrdir)/ruby/internal/intern/array.h
+gdbm.o: $(hdrdir)/ruby/internal/intern/bignum.h
+gdbm.o: $(hdrdir)/ruby/internal/intern/class.h
+gdbm.o: $(hdrdir)/ruby/internal/intern/compar.h
+gdbm.o: $(hdrdir)/ruby/internal/intern/complex.h
+gdbm.o: $(hdrdir)/ruby/internal/intern/cont.h
+gdbm.o: $(hdrdir)/ruby/internal/intern/dir.h
+gdbm.o: $(hdrdir)/ruby/internal/intern/enum.h
+gdbm.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+gdbm.o: $(hdrdir)/ruby/internal/intern/error.h
+gdbm.o: $(hdrdir)/ruby/internal/intern/eval.h
+gdbm.o: $(hdrdir)/ruby/internal/intern/file.h
+gdbm.o: $(hdrdir)/ruby/internal/intern/gc.h
+gdbm.o: $(hdrdir)/ruby/internal/intern/hash.h
+gdbm.o: $(hdrdir)/ruby/internal/intern/io.h
+gdbm.o: $(hdrdir)/ruby/internal/intern/load.h
+gdbm.o: $(hdrdir)/ruby/internal/intern/marshal.h
+gdbm.o: $(hdrdir)/ruby/internal/intern/numeric.h
+gdbm.o: $(hdrdir)/ruby/internal/intern/object.h
+gdbm.o: $(hdrdir)/ruby/internal/intern/parse.h
+gdbm.o: $(hdrdir)/ruby/internal/intern/proc.h
+gdbm.o: $(hdrdir)/ruby/internal/intern/process.h
+gdbm.o: $(hdrdir)/ruby/internal/intern/random.h
+gdbm.o: $(hdrdir)/ruby/internal/intern/range.h
+gdbm.o: $(hdrdir)/ruby/internal/intern/rational.h
+gdbm.o: $(hdrdir)/ruby/internal/intern/re.h
+gdbm.o: $(hdrdir)/ruby/internal/intern/ruby.h
+gdbm.o: $(hdrdir)/ruby/internal/intern/select.h
+gdbm.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+gdbm.o: $(hdrdir)/ruby/internal/intern/signal.h
+gdbm.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+gdbm.o: $(hdrdir)/ruby/internal/intern/string.h
+gdbm.o: $(hdrdir)/ruby/internal/intern/struct.h
+gdbm.o: $(hdrdir)/ruby/internal/intern/thread.h
+gdbm.o: $(hdrdir)/ruby/internal/intern/time.h
+gdbm.o: $(hdrdir)/ruby/internal/intern/variable.h
+gdbm.o: $(hdrdir)/ruby/internal/intern/vm.h
+gdbm.o: $(hdrdir)/ruby/internal/interpreter.h
+gdbm.o: $(hdrdir)/ruby/internal/iterator.h
+gdbm.o: $(hdrdir)/ruby/internal/memory.h
+gdbm.o: $(hdrdir)/ruby/internal/method.h
+gdbm.o: $(hdrdir)/ruby/internal/module.h
+gdbm.o: $(hdrdir)/ruby/internal/newobj.h
+gdbm.o: $(hdrdir)/ruby/internal/rgengc.h
+gdbm.o: $(hdrdir)/ruby/internal/scan_args.h
+gdbm.o: $(hdrdir)/ruby/internal/special_consts.h
+gdbm.o: $(hdrdir)/ruby/internal/static_assert.h
+gdbm.o: $(hdrdir)/ruby/internal/stdalign.h
+gdbm.o: $(hdrdir)/ruby/internal/stdbool.h
+gdbm.o: $(hdrdir)/ruby/internal/symbol.h
+gdbm.o: $(hdrdir)/ruby/internal/token_paste.h
+gdbm.o: $(hdrdir)/ruby/internal/value.h
+gdbm.o: $(hdrdir)/ruby/internal/value_type.h
+gdbm.o: $(hdrdir)/ruby/internal/variable.h
+gdbm.o: $(hdrdir)/ruby/internal/warning_push.h
+gdbm.o: $(hdrdir)/ruby/internal/xmalloc.h
+gdbm.o: $(hdrdir)/ruby/assert.h
+gdbm.o: $(hdrdir)/ruby/backward.h
+gdbm.o: $(hdrdir)/ruby/backward/2/assume.h
+gdbm.o: $(hdrdir)/ruby/backward/2/attributes.h
+gdbm.o: $(hdrdir)/ruby/backward/2/bool.h
+gdbm.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+gdbm.o: $(hdrdir)/ruby/backward/2/inttypes.h
+gdbm.o: $(hdrdir)/ruby/backward/2/limits.h
+gdbm.o: $(hdrdir)/ruby/backward/2/long_long.h
+gdbm.o: $(hdrdir)/ruby/backward/2/stdalign.h
+gdbm.o: $(hdrdir)/ruby/backward/2/stdarg.h
+gdbm.o: $(hdrdir)/ruby/defines.h
+gdbm.o: $(hdrdir)/ruby/intern.h
+gdbm.o: $(hdrdir)/ruby/missing.h
+gdbm.o: $(hdrdir)/ruby/ruby.h
+gdbm.o: $(hdrdir)/ruby/st.h
+gdbm.o: $(hdrdir)/ruby/subst.h
+gdbm.o: gdbm.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/gdbm/gdbm.c b/ext/gdbm/gdbm.c
index 709f466cd8..4a6377b685 100644
--- a/ext/gdbm/gdbm.c
+++ b/ext/gdbm/gdbm.c
@@ -83,6 +83,10 @@ static VALUE rb_cGDBM, rb_eGDBMError, rb_eGDBMFatalError;
 
 #define MY_BLOCK_SIZE (2048)
 #define MY_FATAL_FUNC rb_gdbm_fatal
+
+NORETURN(static void rb_gdbm_fatal(const char *msg));
+NORETURN(static void closed_dbm(void));
+
 static void
 rb_gdbm_fatal(const char *msg)
 {
@@ -102,7 +106,6 @@ closed_dbm(void)
 
 #define GetDBM(obj, dbmp) do {\
     TypedData_Get_Struct((obj), struct dbmdata, &dbm_type, (dbmp));\
-    if ((dbmp) == 0) closed_dbm();\
     if ((dbmp)->di_dbm == 0) closed_dbm();\
 } while (0)
 
@@ -115,21 +118,18 @@ static void
 free_dbm(void *ptr)
 {
     struct dbmdata *dbmp = ptr;
-    if (dbmp) {
-        if (dbmp->di_dbm) gdbm_close(dbmp->di_dbm);
-        xfree(dbmp);
-    }
+    if (dbmp->di_dbm)
+	gdbm_close(dbmp->di_dbm);
+    xfree(dbmp);
 }
 
 static size_t
 memsize_dbm(const void *ptr)
 {
-    size_t size = 0;
     const struct dbmdata *dbmp = ptr;
-    if (dbmp) {
-	size += sizeof(*dbmp);
-	if (dbmp->di_dbm) size += DBM_SIZEOF_DBM;
-    }
+    size_t size = sizeof(*dbmp);
+    if (dbmp->di_dbm)
+	size += DBM_SIZEOF_DBM;
     return size;
 }
 
@@ -170,8 +170,6 @@ fgdbm_closed(VALUE obj)
     struct dbmdata *dbmp;
 
     TypedData_Get_Struct(obj, struct dbmdata, &dbm_type, dbmp);
-    if (dbmp == 0)
-        return Qtrue;
     if (dbmp->di_dbm == 0)
         return Qtrue;
 
@@ -181,7 +179,9 @@ fgdbm_closed(VALUE obj)
 static VALUE
 fgdbm_s_alloc(VALUE klass)
 {
-    return TypedData_Wrap_Struct(klass, &dbm_type, 0);
+    struct dbmdata *dbmp;
+
+    return TypedData_Make_Struct(klass, struct dbmdata, &dbm_type, dbmp);
 }
 
 /*
@@ -215,6 +215,7 @@ fgdbm_initialize(int argc, VALUE *argv, VALUE obj)
     struct dbmdata *dbmp;
     int mode, flags = 0;
 
+    TypedData_Get_Struct(obj, struct dbmdata, &dbm_type, dbmp);
     if (rb_scan_args(argc, argv, "12", &file, &vmode, &vflags) == 1) {
         mode = 0666;            /* default value */
     }
@@ -228,7 +229,7 @@ fgdbm_initialize(int argc, VALUE *argv, VALUE obj)
     if (!NIL_P(vflags))
         flags = NUM2INT(vflags);
 
-    SafeStringValue(file);
+    FilePathValue(file);
 
 #ifdef GDBM_CLOEXEC
     /* GDBM_CLOEXEC is available since gdbm 1.10. */
@@ -268,9 +269,8 @@ fgdbm_initialize(int argc, VALUE *argv, VALUE obj)
             rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
     }
 
-    dbmp = ALLOC(struct dbmdata);
-    free_dbm(DATA_PTR(obj));
-    DATA_PTR(obj) = dbmp;
+    if (dbmp->di_dbm)
+	gdbm_close(dbmp->di_dbm);
     dbmp->di_dbm = dbm;
     dbmp->di_size = -1;
 
@@ -324,7 +324,6 @@ rb_gdbm_fetch(GDBM_FILE dbm, datum key)
 
     str = rb_str_new(val.dptr, val.dsize);
     free(val.dptr);
-    OBJ_TAINT(str);
     return str;
 }
 
@@ -334,7 +333,7 @@ rb_gdbm_fetch2(GDBM_FILE dbm, VALUE keystr)
     datum key;
     long len;
 
-    StringValue(keystr);
+    ExportStringValue(keystr);
     len = RSTRING_LEN(keystr);
     if (TOO_LONG(len)) return Qnil;
     key.dptr = RSTRING_PTR(keystr);
@@ -365,7 +364,6 @@ rb_gdbm_firstkey(GDBM_FILE dbm)
 
     str = rb_str_new(key.dptr, key.dsize);
     free(key.dptr);
-    OBJ_TAINT(str);
     return str;
 }
 
@@ -386,7 +384,6 @@ rb_gdbm_nextkey(GDBM_FILE dbm, VALUE keystr)
 
     str = rb_str_new(key2.dptr, key2.dsize);
     free(key2.dptr);
-    OBJ_TAINT(str);
     return str;
 }
 
@@ -450,7 +447,7 @@ fgdbm_key(VALUE obj, VALUE valstr)
     GDBM_FILE dbm;
     VALUE keystr, valstr2;
 
-    StringValue(valstr);
+    ExportStringValue(valstr);
     GetDBM2(obj, dbmp, dbm);
     for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
          keystr = rb_gdbm_nextkey(dbm, keystr)) {
@@ -538,7 +535,7 @@ rb_gdbm_delete(VALUE obj, VALUE keystr)
     long len;
 
     rb_gdbm_modify(obj);
-    StringValue(keystr);
+    ExportStringValue(keystr);
     len = RSTRING_LEN(keystr);
     if (TOO_LONG(len)) return Qnil;
     key.dptr = RSTRING_PTR(keystr);
@@ -725,8 +722,8 @@ fgdbm_store(VALUE obj, VALUE keystr, VALUE valstr)
     GDBM_FILE dbm;
 
     rb_gdbm_modify(obj);
-    StringValue(keystr);
-    StringValue(valstr);
+    ExportStringValue(keystr);
+    ExportStringValue(valstr);
 
     key.dptr = RSTRING_PTR(keystr);
     key.dsize = RSTRING_LENINT(keystr);
@@ -991,7 +988,7 @@ fgdbm_has_key(VALUE obj, VALUE keystr)
     GDBM_FILE dbm;
     long len;
 
-    StringValue(keystr);
+    ExportStringValue(keystr);
     len = RSTRING_LENINT(keystr);
     if (TOO_LONG(len)) return Qfalse;
     key.dptr = RSTRING_PTR(keystr);
@@ -1018,7 +1015,7 @@ fgdbm_has_value(VALUE obj, VALUE valstr)
     GDBM_FILE dbm;
     VALUE keystr, valstr2;
 
-    StringValue(valstr);
+    ExportStringValue(valstr);
     GetDBM2(obj, dbmp, dbm);
     for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
          keystr = rb_gdbm_nextkey(dbm, keystr)) {
diff --git a/ext/gdbm/gdbm.gemspec b/ext/gdbm/gdbm.gemspec
new file mode 100644
index 0000000000..3ecb3121fe
--- /dev/null
+++ b/ext/gdbm/gdbm.gemspec
@@ -0,0 +1,21 @@
+# coding: utf-8
+# frozen_string_literal: true
+
+Gem::Specification.new do |spec|
+  spec.name          = "gdbm"
+  spec.version       = "2.1.0"
+  spec.authors       = ["Yukihiro Matsumoto"]
+  spec.email         = ["matz@ruby-lang.org"]
+
+  spec.summary       = "Ruby extension for GNU dbm."
+  spec.description   = "Ruby extension for GNU dbm."
+  spec.homepage      = "https://github.com/ruby/gdbm"
+  spec.licenses      = ["Ruby", "BSD-2-Clause"]
+
+  spec.files         = ["ext/gdbm/extconf.rb", "ext/gdbm/gdbm.c"]
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+  spec.extensions    = ["ext/gdbm/extconf.rb"]
+  spec.required_ruby_version = ">= 2.3.0"
+end
diff --git a/ext/io/console/console.c b/ext/io/console/console.c
index dbbfbb7463..2e2467036d 100644
--- a/ext/io/console/console.c
+++ b/ext/io/console/console.c
@@ -1,9 +1,10 @@
-/* -*- c-file-style: "ruby" -*- */
+/* -*- c-file-style: "ruby"; indent-tabs-mode: t -*- */
 /*
  * console IO module
  */
 #include "ruby.h"
 #include "ruby/io.h"
+#include "ruby/thread.h"
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -14,12 +15,6 @@
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif
-#ifndef RARRAY_CONST_PTR
-# define RARRAY_CONST_PTR(ary) RARRAY_PTR(ary)
-#endif
-#ifndef HAVE_RB_FUNCALLV
-# define rb_funcallv rb_funcall2
-#endif
 
 #if defined HAVE_TERMIOS_H
 # include <termios.h>
@@ -28,7 +23,7 @@ typedef struct termios conmode;
 static int
 setattr(int fd, conmode *t)
 {
-    while (tcsetattr(fd, TCSAFLUSH, t)) {
+    while (tcsetattr(fd, TCSANOW, t)) {
 	if (errno != EINTR) return 0;
     }
     return 1;
@@ -54,6 +49,7 @@ typedef struct sgttyb conmode;
 # endif
 #elif defined _WIN32
 #include <winioctl.h>
+#include <conio.h>
 typedef DWORD conmode;
 
 #define LAST_ERROR rb_w32_map_errno(GetLastError())
@@ -79,11 +75,17 @@ getattr(int fd, conmode *t)
 #define SET_LAST_ERROR (0)
 #endif
 
-static ID id_getc, id_console, id_close, id_min, id_time;
+static ID id_getc, id_console, id_close, id_min, id_time, id_intr;
 #if ENABLE_IO_GETPASS
-static ID id_gets;
+static ID id_gets, id_chomp_bang;
 #endif
 
+#ifdef HAVE_RB_SCHEDULER_TIMEOUT
+extern VALUE rb_scheduler_timeout(struct timeval *timeout);
+#endif
+
+#define sys_fail_fptr(fptr) rb_sys_fail_str((fptr)->pathv)
+
 #ifndef HAVE_RB_F_SEND
 static ID id___send__;
 
@@ -103,27 +105,40 @@ rb_f_send(int argc, VALUE *argv, VALUE recv)
 }
 #endif
 
-#ifndef HAVE_RB_SYM2STR
-# define rb_sym2str(sym) rb_id2str(SYM2ID(sym))
-#endif
-
 typedef struct {
     int vmin;
     int vtime;
+    int intr;
 } rawmode_arg_t;
 
 static rawmode_arg_t *
-rawmode_opt(int argc, VALUE *argv, rawmode_arg_t *opts)
+rawmode_opt(int *argcp, VALUE *argv, int min_argc, int max_argc, rawmode_arg_t *opts)
 {
+    int argc = *argcp;
     rawmode_arg_t *optp = NULL;
-    VALUE vopts;
-    rb_scan_args(argc, argv, "0:", &vopts);
+    VALUE vopts = Qnil;
+#ifdef RB_SCAN_ARGS_PASS_CALLED_KEYWORDS
+    argc = rb_scan_args(argc, argv, "*:", NULL, &vopts);
+#else
+    if (argc > min_argc)  {
+	vopts = rb_check_hash_type(argv[argc-1]);
+	if (!NIL_P(vopts)) {
+	    argv[argc-1] = vopts;
+	    vopts = rb_extract_keywords(&argv[argc-1]);
+	    if (!argv[argc-1]) *argcp = --argc;
+	    if (!vopts) vopts = Qnil;
+	}
+    }
+#endif
+    rb_check_arity(argc, min_argc, max_argc);
     if (!NIL_P(vopts)) {
 	VALUE vmin = rb_hash_aref(vopts, ID2SYM(id_min));
 	VALUE vtime = rb_hash_aref(vopts, ID2SYM(id_time));
+	VALUE intr = rb_hash_aref(vopts, ID2SYM(id_intr));
 	/* default values by `stty raw` */
 	opts->vmin = 1;
 	opts->vtime = 0;
+	opts->intr = 0;
 	if (!NIL_P(vmin)) {
 	    opts->vmin = NUM2INT(vmin);
 	    optp = opts;
@@ -134,6 +149,21 @@ rawmode_opt(int argc, VALUE *argv, rawmode_arg_t *opts)
 	    opts->vtime = NUM2INT(vtime);
 	    optp = opts;
 	}
+	switch (intr) {
+	  case Qtrue:
+	    opts->intr = 1;
+	    optp = opts;
+	    break;
+	  case Qfalse:
+	    opts->intr = 0;
+	    optp = opts;
+	    break;
+	  case Qnil:
+	    break;
+	  default:
+	    rb_raise(rb_eArgError, "true or false expected as intr: %"PRIsVALUE,
+		     intr);
+	}
     }
     return optp;
 }
@@ -145,24 +175,36 @@ set_rawmode(conmode *t, void *arg)
     cfmakeraw(t);
     t->c_lflag &= ~(ECHOE|ECHOK);
 #elif defined HAVE_TERMIOS_H || defined HAVE_TERMIO_H
-    t->c_iflag &= ~(IGNBRK|BRKINT|PARMRK|ISTRIP|INLCR|IGNCR|ICRNL|IXON);
+    t->c_iflag &= ~(IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK|ISTRIP|INLCR|IGNCR|ICRNL|IXON|IXOFF|IXANY|IMAXBEL);
     t->c_oflag &= ~OPOST;
-    t->c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|ICANON|ISIG|IEXTEN);
+    t->c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|ICANON|ISIG|IEXTEN|XCASE);
     t->c_cflag &= ~(CSIZE|PARENB);
     t->c_cflag |= CS8;
+    t->c_cc[VMIN] = 1;
+    t->c_cc[VTIME] = 0;
 #elif defined HAVE_SGTTY_H
     t->sg_flags &= ~ECHO;
     t->sg_flags |= RAW;
 #elif defined _WIN32
     *t = 0;
 #endif
-#if defined HAVE_TERMIOS_H || defined HAVE_TERMIO_H
     if (arg) {
 	const rawmode_arg_t *r = arg;
+#ifdef VMIN
 	if (r->vmin >= 0) t->c_cc[VMIN] = r->vmin;
+#endif
+#ifdef VTIME
 	if (r->vtime >= 0) t->c_cc[VTIME] = r->vtime;
-    }
 #endif
+#ifdef ISIG
+	if (r->intr) {
+	    t->c_iflag |= BRKINT;
+	    t->c_lflag |= ISIG;
+	    t->c_oflag |= OPOST;
+	}
+#endif
+	(void)r;
+    }
 }
 
 static void
@@ -242,7 +284,7 @@ get_write_fd(const rb_io_t *fptr)
 #define FD_PER_IO 2
 
 static VALUE
-ttymode(VALUE io, VALUE (*func)(VALUE), void (*setter)(conmode *, void *), void *arg)
+ttymode(VALUE io, VALUE (*func)(VALUE), VALUE farg, void (*setter)(conmode *, void *), void *arg)
 {
     rb_io_t *fptr;
     int status = -1;
@@ -273,7 +315,7 @@ ttymode(VALUE io, VALUE (*func)(VALUE), void (*setter)(conmode *, void *), void
 	}
     }
     if (status == 0) {
-	result = rb_protect(func, io, &status);
+	result = rb_protect(func, farg, &status);
     }
     GetOpenFile(io, fptr);
     if (fd[0] != -1 && fd[0] == GetReadFD(fptr)) {
@@ -297,32 +339,70 @@ ttymode(VALUE io, VALUE (*func)(VALUE), void (*setter)(conmode *, void *), void
     return result;
 }
 
+#if !defined _WIN32
+struct ttymode_callback_args {
+    VALUE (*func)(VALUE, VALUE);
+    VALUE io;
+    VALUE farg;
+};
+
+static VALUE
+ttymode_callback(VALUE args)
+{
+    struct ttymode_callback_args *argp = (struct ttymode_callback_args *)args;
+    return argp->func(argp->io, argp->farg);
+}
+
+static VALUE
+ttymode_with_io(VALUE io, VALUE (*func)(VALUE, VALUE), VALUE farg, void (*setter)(conmode *, void *), void *arg)
+{
+    struct ttymode_callback_args cargs;
+    cargs.func = func;
+    cargs.io = io;
+    cargs.farg = farg;
+    return ttymode(io, ttymode_callback, (VALUE)&cargs, setter, arg);
+}
+#endif
+
 /*
  * call-seq:
- *   io.raw(min: nil, time: nil) {|io| }
+ *   io.raw(min: nil, time: nil, intr: nil) {|io| }
  *
- * Yields +self+ within raw mode.
+ * Yields +self+ within raw mode, and returns the result of the block.
  *
  *   STDIN.raw(&:gets)
  *
  * will read and return a line without echo back and line editing.
  *
+ * The parameter +min+ specifies the minimum number of bytes that
+ * should be received when a read operation is performed. (default: 1)
+ *
+ * The parameter +time+ specifies the timeout in _seconds_ with a
+ * precision of 1/10 of a second. (default: 0)
+ *
+ * If the parameter +intr+ is +true+, enables break, interrupt, quit,
+ * and suspend special characters.
+ *
+ * Refer to the manual page of termios for further details.
+ *
  * You must require 'io/console' to use this method.
  */
 static VALUE
 console_raw(int argc, VALUE *argv, VALUE io)
 {
-    rawmode_arg_t opts, *optp = rawmode_opt(argc, argv, &opts);
-    return ttymode(io, rb_yield, set_rawmode, optp);
+    rawmode_arg_t opts, *optp = rawmode_opt(&argc, argv, 0, 0, &opts);
+    return ttymode(io, rb_yield, io, set_rawmode, optp);
 }
 
 /*
  * call-seq:
- *   io.raw!(min: nil, time: nil)
+ *   io.raw!(min: nil, time: nil, intr: nil) -> io
+ *
+ * Enables raw mode, and returns +io+.
  *
- * Enables raw mode.
+ * If the terminal mode needs to be back, use <code>io.raw { ... }</code>.
  *
- * If the terminal mode needs to be back, use io.raw { ... }.
+ * See IO#raw for details on the parameters.
  *
  * You must require 'io/console' to use this method.
  */
@@ -332,13 +412,13 @@ console_set_raw(int argc, VALUE *argv, VALUE io)
     conmode t;
     rb_io_t *fptr;
     int fd;
-    rawmode_arg_t opts, *optp = rawmode_opt(argc, argv, &opts);
+    rawmode_arg_t opts, *optp = rawmode_opt(&argc, argv, 0, 0, &opts);
 
     GetOpenFile(io, fptr);
     fd = GetReadFD(fptr);
-    if (!getattr(fd, &t)) rb_sys_fail(0);
+    if (!getattr(fd, &t)) sys_fail_fptr(fptr);
     set_rawmode(&t, optp);
-    if (!setattr(fd, &t)) rb_sys_fail(0);
+    if (!setattr(fd, &t)) sys_fail_fptr(fptr);
     return io;
 }
 
@@ -357,7 +437,7 @@ console_set_raw(int argc, VALUE *argv, VALUE io)
 static VALUE
 console_cooked(VALUE io)
 {
-    return ttymode(io, rb_yield, set_cookedmode, NULL);
+    return ttymode(io, rb_yield, io, set_cookedmode, NULL);
 }
 
 /*
@@ -379,31 +459,126 @@ console_set_cooked(VALUE io)
 
     GetOpenFile(io, fptr);
     fd = GetReadFD(fptr);
-    if (!getattr(fd, &t)) rb_sys_fail(0);
+    if (!getattr(fd, &t)) sys_fail_fptr(fptr);
     set_cookedmode(&t, NULL);
-    if (!setattr(fd, &t)) rb_sys_fail(0);
+    if (!setattr(fd, &t)) sys_fail_fptr(fptr);
     return io;
 }
 
+#ifndef _WIN32
 static VALUE
 getc_call(VALUE io)
 {
     return rb_funcallv(io, id_getc, 0, 0);
 }
+#else
+static void *
+nogvl_getch(void *p)
+{
+    int len = 0;
+    wint_t *buf = p, c = _getwch();
+
+    switch (c) {
+      case WEOF:
+	break;
+      case 0x00:
+      case 0xe0:
+	buf[len++] = c;
+	c = _getwch();
+	/* fall through */
+      default:
+	buf[len++] = c;
+	break;
+    }
+    return (void *)(VALUE)len;
+}
+#endif
 
 /*
  * call-seq:
- *   io.getch(min: nil, time: nil)       -> char
+ *   io.getch(min: nil, time: nil, intr: nil) -> char
  *
  * Reads and returns a character in raw mode.
  *
+ * See IO#raw for details on the parameters.
+ *
  * You must require 'io/console' to use this method.
  */
 static VALUE
 console_getch(int argc, VALUE *argv, VALUE io)
 {
-    rawmode_arg_t opts, *optp = rawmode_opt(argc, argv, &opts);
-    return ttymode(io, getc_call, set_rawmode, optp);
+    rawmode_arg_t opts, *optp = rawmode_opt(&argc, argv, 0, 0, &opts);
+#ifndef _WIN32
+    return ttymode(io, getc_call, io, set_rawmode, optp);
+#else
+    rb_io_t *fptr;
+    VALUE str;
+    wint_t c;
+    int len;
+    char buf[8];
+    wint_t wbuf[2];
+# ifndef HAVE_RB_IO_WAIT
+    struct timeval *to = NULL, tv;
+# else
+    VALUE timeout = Qnil;
+# endif
+
+    GetOpenFile(io, fptr);
+    if (optp) {
+	if (optp->vtime) {
+# ifndef HAVE_RB_IO_WAIT
+	    to = &tv;
+# else
+	    struct timeval tv;
+# endif
+	    tv.tv_sec = optp->vtime / 10;
+	    tv.tv_usec = (optp->vtime % 10) * 100000;
+# ifdef HAVE_RB_IO_WAIT
+	    timeout = rb_scheduler_timeout(&tv);
+# endif
+	}
+	switch (optp->vmin) {
+	  case 1: /* default */
+	    break;
+	  case 0: /* return nil when timed out */
+	    if (optp->vtime) break;
+	    /* fallthru */
+	  default:
+	    rb_warning("min option larger than 1 ignored");
+	}
+	if (optp->intr) {
+# ifndef HAVE_RB_IO_WAIT
+	    int w = rb_wait_for_single_fd(fptr->fd, RB_WAITFD_IN, to);
+	    if (w < 0) rb_eof_error();
+	    if (!(w & RB_WAITFD_IN)) return Qnil;
+# else
+	    VALUE result = rb_io_wait(io, RUBY_IO_READABLE, timeout);
+	    if (result == Qfalse) return Qnil;
+# endif
+	}
+	else if (optp->vtime) {
+	    rb_warning("Non-zero vtime option ignored if intr flag is unset");
+	}
+    }
+    len = (int)(VALUE)rb_thread_call_without_gvl(nogvl_getch, wbuf, RUBY_UBF_IO, 0);
+    switch (len) {
+      case 0:
+	return Qnil;
+      case 2:
+	buf[0] = (char)wbuf[0];
+	c = wbuf[1];
+	len = 1;
+	do {
+	    buf[len++] = (unsigned char)c;
+	} while ((c >>= CHAR_BIT) && len < (int)sizeof(buf));
+	return rb_str_new(buf, len);
+      default:
+	c = wbuf[0];
+	len = rb_uv_to_utf8(buf, c);
+	str = rb_utf8_str_new(buf, len);
+	return rb_str_conv_enc(str, NULL, rb_default_external_encoding());
+    }
+#endif
 }
 
 /*
@@ -421,7 +596,7 @@ console_getch(int argc, VALUE *argv, VALUE io)
 static VALUE
 console_noecho(VALUE io)
 {
-    return ttymode(io, rb_yield, set_noecho, NULL);
+    return ttymode(io, rb_yield, io, set_noecho, NULL);
 }
 
 /*
@@ -443,12 +618,12 @@ console_set_echo(VALUE io, VALUE f)
 
     GetOpenFile(io, fptr);
     fd = GetReadFD(fptr);
-    if (!getattr(fd, &t)) rb_sys_fail(0);
+    if (!getattr(fd, &t)) sys_fail_fptr(fptr);
     if (RTEST(f))
 	set_echo(&t, NULL);
     else
 	set_noecho(&t, NULL);
-    if (!setattr(fd, &t)) rb_sys_fail(0);
+    if (!setattr(fd, &t)) sys_fail_fptr(fptr);
     return io;
 }
 
@@ -469,10 +644,119 @@ console_echo_p(VALUE io)
 
     GetOpenFile(io, fptr);
     fd = GetReadFD(fptr);
-    if (!getattr(fd, &t)) rb_sys_fail(0);
+    if (!getattr(fd, &t)) sys_fail_fptr(fptr);
     return echo_p(&t) ? Qtrue : Qfalse;
 }
 
+static const rb_data_type_t conmode_type = {
+    "console-mode",
+    {0, RUBY_TYPED_DEFAULT_FREE,},
+    0, 0,
+    RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
+};
+static VALUE cConmode;
+
+static VALUE
+conmode_alloc(VALUE klass)
+{
+    return rb_data_typed_object_zalloc(klass, sizeof(conmode), &conmode_type);
+}
+
+static VALUE
+conmode_new(VALUE klass, const conmode *t)
+{
+    VALUE obj = conmode_alloc(klass);
+    *(conmode *)DATA_PTR(obj) = *t;
+    return obj;
+}
+
+static VALUE
+conmode_init_copy(VALUE obj, VALUE obj2)
+{
+    conmode *t = rb_check_typeddata(obj, &conmode_type);
+    conmode *t2 = rb_check_typeddata(obj2, &conmode_type);
+    *t = *t2;
+    return obj;
+}
+
+static VALUE
+conmode_set_echo(VALUE obj, VALUE f)
+{
+    conmode *t = rb_check_typeddata(obj, &conmode_type);
+    if (RTEST(f))
+	set_echo(t, NULL);
+    else
+	set_noecho(t, NULL);
+    return obj;
+}
+
+static VALUE
+conmode_set_raw(int argc, VALUE *argv, VALUE obj)
+{
+    conmode *t = rb_check_typeddata(obj, &conmode_type);
+    rawmode_arg_t opts, *optp = rawmode_opt(&argc, argv, 0, 0, &opts);
+
+    set_rawmode(t, optp);
+    return obj;
+}
+
+static VALUE
+conmode_raw_new(int argc, VALUE *argv, VALUE obj)
+{
+    conmode *r = rb_check_typeddata(obj, &conmode_type);
+    conmode t = *r;
+    rawmode_arg_t opts, *optp = rawmode_opt(&argc, argv, 0, 0, &opts);
+
+    set_rawmode(&t, optp);
+    return conmode_new(rb_obj_class(obj), &t);
+}
+
+/*
+ * call-seq:
+ *   io.console_mode       -> mode
+ *
+ * Returns a data represents the current console mode.
+ *
+ * You must require 'io/console' to use this method.
+ */
+static VALUE
+console_conmode_get(VALUE io)
+{
+    conmode t;
+    rb_io_t *fptr;
+    int fd;
+
+    GetOpenFile(io, fptr);
+    fd = GetReadFD(fptr);
+    if (!getattr(fd, &t)) sys_fail_fptr(fptr);
+
+    return conmode_new(cConmode, &t);
+}
+
+/*
+ * call-seq:
+ *   io.console_mode = mode
+ *
+ * Sets the console mode to +mode+.
+ *
+ * You must require 'io/console' to use this method.
+ */
+static VALUE
+console_conmode_set(VALUE io, VALUE mode)
+{
+    conmode *t, r;
+    rb_io_t *fptr;
+    int fd;
+
+    TypedData_Get_Struct(mode, conmode, &conmode_type, t);
+    r = *t;
+    GetOpenFile(io, fptr);
+    fd = GetReadFD(fptr);
+    if (!setattr(fd, &r)) sys_fail_fptr(fptr);
+
+    return mode;
+}
+
 #if defined TIOCGWINSZ
 typedef struct winsize rb_console_size_t;
 #define getwinsize(fd, buf) (ioctl((fd), TIOCGWINSZ, (buf)) == 0)
@@ -510,7 +794,7 @@ console_winsize(VALUE io)
 
     GetOpenFile(io, fptr);
     fd = GetWriteFD(fptr);
-    if (!getwinsize(fd, &ws)) rb_sys_fail(0);
+    if (!getwinsize(fd, &ws)) sys_fail_fptr(fptr);
     return rb_assoc_new(INT2NUM(winsize_row(&ws)), INT2NUM(winsize_col(&ws)));
 }
 
@@ -531,16 +815,23 @@ console_set_winsize(VALUE io, VALUE size)
 #if defined _WIN32
     HANDLE wh;
     int newrow, newcol;
+    BOOL ret;
 #endif
     VALUE row, col, xpixel, ypixel;
     const VALUE *sz;
     int fd;
+    long sizelen;
 
     GetOpenFile(io, fptr);
     size = rb_Array(size);
-    rb_check_arity(RARRAY_LENINT(size), 2, 4);
+    if ((sizelen = RARRAY_LEN(size)) != 2 && sizelen != 4) {
+	rb_raise(rb_eArgError,
+		 "wrong number of arguments (given %ld, expected 2 or 4)",
+		 sizelen);
+    }
     sz = RARRAY_CONST_PTR(size);
-    row = sz[0], col = sz[1], xpixel = sz[2], ypixel = sz[3];
+    row = sz[0], col = sz[1], xpixel = ypixel = Qnil;
+    if (sizelen == 4) xpixel = sz[2], ypixel = sz[3];
     fd = GetWriteFD(fptr);
 #if defined TIOCSWINSZ
     ws.ws_row = ws.ws_col = ws.ws_xpixel = ws.ws_ypixel = 0;
@@ -550,7 +841,7 @@ console_set_winsize(VALUE io, VALUE size)
     SET(xpixel);
     SET(ypixel);
 #undef SET
-    if (!setwinsize(fd, &ws)) rb_sys_fail(0);
+    if (!setwinsize(fd, &ws)) sys_fail_fptr(fptr);
 #elif defined _WIN32
     wh = (HANDLE)rb_w32_get_osfhandle(fd);
 #define SET(m) new##m = NIL_P(m) ? 0 : (unsigned short)NUM2UINT(m)
@@ -562,17 +853,21 @@ console_set_winsize(VALUE io, VALUE size)
     if (!GetConsoleScreenBufferInfo(wh, &ws)) {
 	rb_syserr_fail(LAST_ERROR, "GetConsoleScreenBufferInfo");
     }
-    if ((ws.dwSize.X < newcol && (ws.dwSize.X = newcol, 1)) ||
-	(ws.dwSize.Y < newrow && (ws.dwSize.Y = newrow, 1))) {
-	if (!SetConsoleScreenBufferSize(wh, ws.dwSize)) {
-	    rb_syserr_fail(LAST_ERROR, "SetConsoleScreenBufferInfo");
-	}
-    }
+    ws.dwSize.X = newcol;
+    ret = SetConsoleScreenBufferSize(wh, ws.dwSize);
     ws.srWindow.Left = 0;
     ws.srWindow.Top = 0;
-    ws.srWindow.Right = newcol;
-    ws.srWindow.Bottom = newrow;
-    if (!SetConsoleWindowInfo(wh, FALSE, &ws.srWindow)) {
+    ws.srWindow.Right = newcol-1;
+    ws.srWindow.Bottom = newrow-1;
+    if (!SetConsoleWindowInfo(wh, TRUE, &ws.srWindow)) {
+	rb_syserr_fail(LAST_ERROR, "SetConsoleWindowInfo");
+    }
+    /* retry when shrinking buffer after shrunk window */
+    if (!ret && !SetConsoleScreenBufferSize(wh, ws.dwSize)) {
+	rb_syserr_fail(LAST_ERROR, "SetConsoleScreenBufferInfo");
+    }
+    /* remove scrollbar if possible */
+    if (!SetConsoleWindowInfo(wh, TRUE, &ws.srWindow)) {
 	rb_syserr_fail(LAST_ERROR, "SetConsoleWindowInfo");
     }
 #endif
@@ -580,6 +875,30 @@ console_set_winsize(VALUE io, VALUE size)
 }
 #endif
 
+#ifdef _WIN32
+static VALUE
+console_check_winsize_changed(VALUE io)
+{
+    rb_io_t *fptr;
+    HANDLE h;
+    DWORD num;
+
+    GetOpenFile(io, fptr);
+    h = (HANDLE)rb_w32_get_osfhandle(GetReadFD(fptr));
+    while (GetNumberOfConsoleInputEvents(h, &num) && num > 0) {
+	INPUT_RECORD rec;
+	if (ReadConsoleInput(h, &rec, 1, &num)) {
+	    if (rec.EventType == WINDOW_BUFFER_SIZE_EVENT) {
+		rb_yield(Qnil);
+	    }
+	}
+    }
+    return io;
+}
+#else
+#define console_check_winsize_changed rb_f_notimplement
+#endif
+
 /*
  * call-seq:
  *   io.iflush
@@ -597,7 +916,7 @@ console_iflush(VALUE io)
     GetOpenFile(io, fptr);
     fd = GetReadFD(fptr);
 #if defined HAVE_TERMIOS_H || defined HAVE_TERMIO_H
-    if (tcflush(fd, TCIFLUSH)) rb_sys_fail(0);
+    if (tcflush(fd, TCIFLUSH)) sys_fail_fptr(fptr);
 #endif
     (void)fd;
     return io;
@@ -620,7 +939,7 @@ console_oflush(VALUE io)
     GetOpenFile(io, fptr);
     fd = GetWriteFD(fptr);
 #if defined HAVE_TERMIOS_H || defined HAVE_TERMIO_H
-    if (tcflush(fd, TCOFLUSH)) rb_sys_fail(0);
+    if (tcflush(fd, TCOFLUSH)) sys_fail_fptr(fptr);
 #endif
     (void)fd;
     return io;
@@ -647,11 +966,11 @@ console_ioflush(VALUE io)
     fd1 = GetReadFD(fptr);
     fd2 = GetWriteFD(fptr);
     if (fd2 != -1 && fd1 != fd2) {
-	if (tcflush(fd1, TCIFLUSH)) rb_sys_fail(0);
-	if (tcflush(fd2, TCOFLUSH)) rb_sys_fail(0);
+	if (tcflush(fd1, TCIFLUSH)) sys_fail_fptr(fptr);
+	if (tcflush(fd2, TCOFLUSH)) sys_fail_fptr(fptr);
     }
     else {
-	if (tcflush(fd1, TCIOFLUSH)) rb_sys_fail(0);
+	if (tcflush(fd1, TCIOFLUSH)) sys_fail_fptr(fptr);
     }
 #endif
     return io;
@@ -670,14 +989,29 @@ console_beep(VALUE io)
     MessageBeep(0);
 #else
     if (write(fd, "\a", 1) < 0)
-	rb_sys_fail(0);
+	sys_fail_fptr(fptr);
 #endif
     return io;
 }
 
+static int
+mode_in_range(VALUE val, int high, const char *modename)
+{
+    int mode;
+    if (NIL_P(val)) return 0;
+    if (!RB_INTEGER_TYPE_P(val)) {
+      wrong_value:
+	rb_raise(rb_eArgError, "wrong %s mode: %"PRIsVALUE, modename, val);
+    }
+    if ((mode = NUM2INT(val)) < 0 || mode > high) {
+	goto wrong_value;
+    }
+    return mode;
+}
+
 #if defined _WIN32
 static VALUE
-console_goto(VALUE io, VALUE x, VALUE y)
+console_goto(VALUE io, VALUE y, VALUE x)
 {
     rb_io_t *fptr;
     int fd;
@@ -705,15 +1039,159 @@ console_cursor_pos(VALUE io)
     if (!GetConsoleScreenBufferInfo((HANDLE)rb_w32_get_osfhandle(fd), &ws)) {
 	rb_syserr_fail(LAST_ERROR, 0);
     }
-    return rb_assoc_new(UINT2NUM(ws.dwCursorPosition.X), UINT2NUM(ws.dwCursorPosition.Y));
+    return rb_assoc_new(UINT2NUM(ws.dwCursorPosition.Y), UINT2NUM(ws.dwCursorPosition.X));
 }
 
 static VALUE
-console_cursor_set(VALUE io, VALUE cpos)
+console_move(VALUE io, int y, int x)
 {
-    cpos = rb_convert_type(cpos, T_ARRAY, "Array", "to_ary");
-    if (RARRAY_LEN(cpos) != 2) rb_raise(rb_eArgError, "expected 2D coordinate");
-    return console_goto(io, RARRAY_AREF(cpos, 0), RARRAY_AREF(cpos, 1));
+    rb_io_t *fptr;
+    HANDLE h;
+    rb_console_size_t ws;
+    COORD *pos = &ws.dwCursorPosition;
+
+    GetOpenFile(io, fptr);
+    h = (HANDLE)rb_w32_get_osfhandle(GetWriteFD(fptr));
+    if (!GetConsoleScreenBufferInfo(h, &ws)) {
+	rb_syserr_fail(LAST_ERROR, 0);
+    }
+    pos->X += x;
+    pos->Y += y;
+    if (!SetConsoleCursorPosition(h, *pos)) {
+	rb_syserr_fail(LAST_ERROR, 0);
+    }
+    return io;
+}
+
+static VALUE
+console_goto_column(VALUE io, VALUE val)
+{
+    rb_io_t *fptr;
+    HANDLE h;
+    rb_console_size_t ws;
+    COORD *pos = &ws.dwCursorPosition;
+
+    GetOpenFile(io, fptr);
+    h = (HANDLE)rb_w32_get_osfhandle(GetWriteFD(fptr));
+    if (!GetConsoleScreenBufferInfo(h, &ws)) {
+	rb_syserr_fail(LAST_ERROR, 0);
+    }
+    pos->X = NUM2INT(val);
+    if (!SetConsoleCursorPosition(h, *pos)) {
+	rb_syserr_fail(LAST_ERROR, 0);
+    }
+    return io;
+}
+
+static void
+constat_clear(HANDLE handle, WORD attr, DWORD len, COORD pos)
+{
+    DWORD written;
+
+    FillConsoleOutputAttribute(handle, attr, len, pos, &written);
+    FillConsoleOutputCharacterW(handle, L' ', len, pos, &written);
+}
+
+static VALUE
+console_erase_line(VALUE io, VALUE val)
+{
+    rb_io_t *fptr;
+    HANDLE h;
+    rb_console_size_t ws;
+    COORD *pos = &ws.dwCursorPosition;
+    DWORD w;
+    int mode = mode_in_range(val, 2, "line erase");
+
+    GetOpenFile(io, fptr);
+    h = (HANDLE)rb_w32_get_osfhandle(GetWriteFD(fptr));
+    if (!GetConsoleScreenBufferInfo(h, &ws)) {
+	rb_syserr_fail(LAST_ERROR, 0);
+    }
+    w = winsize_col(&ws);
+    switch (mode) {
+      case 0:			/* after cursor */
+	w -= pos->X;
+	break;
+      case 1:			/* before *and* cursor */
+	w = pos->X + 1;
+	pos->X = 0;
+	break;
+      case 2:			/* entire line */
+	pos->X = 0;
+	break;
+    }
+    constat_clear(h, ws.wAttributes, w, *pos);
+    return io;
+}
+
+static VALUE
+console_erase_screen(VALUE io, VALUE val)
+{
+    rb_io_t *fptr;
+    HANDLE h;
+    rb_console_size_t ws;
+    COORD *pos = &ws.dwCursorPosition;
+    DWORD w;
+    int mode = mode_in_range(val, 3, "screen erase");
+
+    GetOpenFile(io, fptr);
+    h = (HANDLE)rb_w32_get_osfhandle(GetWriteFD(fptr));
+    if (!GetConsoleScreenBufferInfo(h, &ws)) {
+	rb_syserr_fail(LAST_ERROR, 0);
+    }
+    w = winsize_col(&ws);
+    switch (mode) {
+      case 0:	/* erase after cursor */
+	w = (w * (ws.srWindow.Bottom - pos->Y + 1) - pos->X);
+	break;
+      case 1:	/* erase before *and* cursor */
+	w = (w * (pos->Y - ws.srWindow.Top) + pos->X + 1);
+	pos->X = 0;
+	pos->Y = ws.srWindow.Top;
+	break;
+      case 2:	/* erase entire screen */
+	w = (w * winsize_row(&ws));
+	pos->X = 0;
+	pos->Y = ws.srWindow.Top;
+	break;
+      case 3:	/* erase entire screen */
+	w = (w * ws.dwSize.Y);
+	pos->X = 0;
+	pos->Y = 0;
+	break;
+    }
+    constat_clear(h, ws.wAttributes, w, *pos);
+    return io;
+}
+
+static VALUE
+console_scroll(VALUE io, int line)
+{
+    rb_io_t *fptr;
+    HANDLE h;
+    rb_console_size_t ws;
+
+    GetOpenFile(io, fptr);
+    h = (HANDLE)rb_w32_get_osfhandle(GetWriteFD(fptr));
+    if (!GetConsoleScreenBufferInfo(h, &ws)) {
+	rb_syserr_fail(LAST_ERROR, 0);
+    }
+    if (line) {
+	SMALL_RECT scroll;
+	COORD destination;
+	CHAR_INFO fill;
+	scroll.Left = 0;
+	scroll.Top = line > 0 ? line : 0;
+	scroll.Right = winsize_col(&ws) - 1;
+	scroll.Bottom = winsize_row(&ws) - 1 + (line < 0 ? line : 0);
+	destination.X = 0;
+	destination.Y = line < 0 ? -line : 0;
+	fill.Char.UnicodeChar = L' ';
+	fill.Attributes = ws.wAttributes;
+
+	ScrollConsoleScreenBuffer(h, &scroll, NULL, destination, &fill);
+    }
+    return io;
 }
 
 #include "win32_vk.inc"
@@ -744,12 +1222,210 @@ console_key_pressed_p(VALUE io, VALUE k)
     return GetKeyState(vk) & 0x80 ? Qtrue : Qfalse;
 }
 #else
-# define console_goto rb_f_notimplement
-# define console_cursor_pos rb_f_notimplement
-# define console_cursor_set rb_f_notimplement
+struct query_args {
+    char qstr[6];
+    unsigned char opt;
+};
+
+static int
+direct_query(VALUE io, const struct query_args *query)
+{
+    if (RB_TYPE_P(io, T_FILE)) {
+	rb_io_t *fptr;
+	VALUE wio;
+	GetOpenFile(io, fptr);
+	wio = fptr->tied_io_for_writing;
+	if (wio) {
+	    VALUE s = rb_str_new_cstr(query->qstr);
+	    rb_io_write(wio, s);
+	    rb_io_flush(wio);
+	    return 1;
+	}
+	if (write(fptr->fd, query->qstr, strlen(query->qstr)) != -1) {
+	    return 1;
+	}
+	if (fptr->fd == 0 &&
+	    write(1, query->qstr, strlen(query->qstr)) != -1) {
+	    return 1;
+	}
+    }
+    return 0;
+}
+
+static VALUE
+read_vt_response(VALUE io, VALUE query)
+{
+    struct query_args *qargs = (struct query_args *)query;
+    VALUE result, b;
+    int opt = 0;
+    int num = 0;
+    if (qargs) {
+	opt = qargs->opt;
+	if (!direct_query(io, qargs)) return Qnil;
+    }
+    if (rb_io_getbyte(io) != INT2FIX(0x1b)) return Qnil;
+    if (rb_io_getbyte(io) != INT2FIX('[')) return Qnil;
+    result = rb_ary_new();
+    while (!NIL_P(b = rb_io_getbyte(io))) {
+	int c = NUM2UINT(b);
+	if (c == ';') {
+	    rb_ary_push(result, INT2NUM(num));
+	    num = 0;
+	}
+	else if (ISDIGIT(c)) {
+	    num = num * 10 + c - '0';
+	}
+	else if (opt && c == opt) {
+	    opt = 0;
+	}
+	else {
+	    char last = (char)c;
+	    rb_ary_push(result, INT2NUM(num));
+	    b = rb_str_new(&last, 1);
+	    break;
+	}
+    }
+    return rb_ary_push(result, b);
+}
+
+static VALUE
+console_vt_response(int argc, VALUE *argv, VALUE io, const struct query_args *qargs)
+{
+    rawmode_arg_t opts, *optp = rawmode_opt(&argc, argv, 0, 1, &opts);
+    VALUE query = (VALUE)qargs;
+    VALUE ret = ttymode_with_io(io, read_vt_response, query, set_rawmode, optp);
+    return ret;
+}
+
+static VALUE
+console_cursor_pos(VALUE io)
+{
+    static const struct query_args query = {"\033[6n", 0};
+    VALUE resp = console_vt_response(0, 0, io, &query);
+    VALUE row, column, term;
+    unsigned int r, c;
+    if (!RB_TYPE_P(resp, T_ARRAY) || RARRAY_LEN(resp) != 3) return Qnil;
+    term = RARRAY_AREF(resp, 2);
+    if (!RB_TYPE_P(term, T_STRING) || RSTRING_LEN(term) != 1) return Qnil;
+    if (RSTRING_PTR(term)[0] != 'R') return Qnil;
+    row = RARRAY_AREF(resp, 0);
+    column = RARRAY_AREF(resp, 1);
+    rb_ary_resize(resp, 2);
+    r = NUM2UINT(row) - 1;
+    c = NUM2UINT(column) - 1;
+    RARRAY_ASET(resp, 0, INT2NUM(r));
+    RARRAY_ASET(resp, 1, INT2NUM(c));
+    return resp;
+}
+
+static VALUE
+console_goto(VALUE io, VALUE y, VALUE x)
+{
+    rb_io_write(io, rb_sprintf("\x1b[%d;%dH", NUM2UINT(y)+1, NUM2UINT(x)+1));
+    return io;
+}
+
+static VALUE
+console_move(VALUE io, int y, int x)
+{
+    if (x || y) {
+	VALUE s = rb_str_new_cstr("");
+	if (y) rb_str_catf(s, "\x1b[%d%c", y < 0 ? -y : y, y < 0 ? 'A' : 'B');
+	if (x) rb_str_catf(s, "\x1b[%d%c", x < 0 ? -x : x, x < 0 ? 'D' : 'C');
+	rb_io_write(io, s);
+	rb_io_flush(io);
+    }
+    return io;
+}
+
+static VALUE
+console_goto_column(VALUE io, VALUE val)
+{
+    rb_io_write(io, rb_sprintf("\x1b[%dG", NUM2UINT(val)+1));
+    return io;
+}
+
+static VALUE
+console_erase_line(VALUE io, VALUE val)
+{
+    int mode = mode_in_range(val, 2, "line erase");
+    rb_io_write(io, rb_sprintf("\x1b[%dK", mode));
+    return io;
+}
+
+static VALUE
+console_erase_screen(VALUE io, VALUE val)
+{
+    int mode = mode_in_range(val, 3, "screen erase");
+    rb_io_write(io, rb_sprintf("\x1b[%dJ", mode));
+    return io;
+}
+
+static VALUE
+console_scroll(VALUE io, int line)
+{
+    if (line) {
+	VALUE s = rb_sprintf("\x1b[%d%c", line < 0 ? -line : line,
+			     line < 0 ? 'T' : 'S');
+	rb_io_write(io, s);
+    }
+    return io;
+}
 # define console_key_pressed_p rb_f_notimplement
 #endif
 
+static VALUE
+console_cursor_set(VALUE io, VALUE cpos)
+{
+    cpos = rb_convert_type(cpos, T_ARRAY, "Array", "to_ary");
+    if (RARRAY_LEN(cpos) != 2) rb_raise(rb_eArgError, "expected 2D coordinate");
+    return console_goto(io, RARRAY_AREF(cpos, 0), RARRAY_AREF(cpos, 1));
+}
+
+static VALUE
+console_cursor_up(VALUE io, VALUE val)
+{
+    return console_move(io, -NUM2INT(val), 0);
+}
+
+static VALUE
+console_cursor_down(VALUE io, VALUE val)
+{
+    return console_move(io, +NUM2INT(val), 0);
+}
+
+static VALUE
+console_cursor_left(VALUE io, VALUE val)
+{
+    return console_move(io, 0, -NUM2INT(val));
+}
+
+static VALUE
+console_cursor_right(VALUE io, VALUE val)
+{
+    return console_move(io, 0, +NUM2INT(val));
+}
+
+static VALUE
+console_scroll_forward(VALUE io, VALUE val)
+{
+    return console_scroll(io, +NUM2INT(val));
+}
+
+static VALUE
+console_scroll_backward(VALUE io, VALUE val)
+{
+    return console_scroll(io, -NUM2INT(val));
+}
+
+static VALUE
+console_clear_screen(VALUE io)
+{
+    console_erase_screen(io, INT2FIX(2));
+    console_goto(io, INT2FIX(0), INT2FIX(0));
+    return io;
+}
+
 /*
  * call-seq:
  *   IO.console      -> #<File:/dev/tty>
@@ -849,7 +1525,7 @@ console_dev(int argc, VALUE *argv, VALUE klass)
 
 /*
  * call-seq:
- *   io.getch(min: nil, time: nil)       -> char
+ *   io.getch(min: nil, time: nil, intr: nil) -> char
  *
  * See IO#getch.
  */
@@ -869,7 +1545,7 @@ puts_call(VALUE io)
 static VALUE
 getpass_call(VALUE io)
 {
-    return ttymode(io, rb_io_gets, set_noecho, NULL);
+    return ttymode(io, rb_io_gets, io, set_noecho, NULL);
 }
 
 static void
@@ -878,7 +1554,6 @@ prompt(int argc, VALUE *argv, VALUE io)
     if (argc > 0 && !NIL_P(argv[0])) {
 	VALUE str = argv[0];
 	StringValueCStr(str);
-	rb_check_safe_obj(str);
 	rb_io_write(io, str);
     }
 }
@@ -887,7 +1562,7 @@ static VALUE
 str_chomp(VALUE str)
 {
     if (!NIL_P(str)) {
-	str = rb_funcallv(str, rb_intern("chomp!"), 0, 0);
+	rb_funcallv(str, id_chomp_bang, 0, 0);
     }
     return str;
 }
@@ -899,6 +1574,10 @@ str_chomp(VALUE str)
  * Reads and returns a line without echo back.
  * Prints +prompt+ unless it is +nil+.
  *
+ * The newline character that terminates the
+ * read line is removed from the returned string,
+ * see String#chomp!.
+ *
  * You must require 'io/console' to use this method.
  */
 static VALUE
@@ -943,11 +1622,13 @@ Init_console(void)
     id_getc = rb_intern("getc");
 #if ENABLE_IO_GETPASS
     id_gets = rb_intern("gets");
+    id_chomp_bang = rb_intern("chomp!");
 #endif
     id_console = rb_intern("console");
     id_close = rb_intern("close");
     id_min = rb_intern("min");
     id_time = rb_intern("time");
+    id_intr = rb_intern("intr");
 #ifndef HAVE_RB_F_SEND
     id___send__ = rb_intern("__send__");
 #endif
@@ -964,6 +1645,8 @@ InitVM_console(void)
     rb_define_method(rb_cIO, "getch", console_getch, -1);
     rb_define_method(rb_cIO, "echo=", console_set_echo, 1);
     rb_define_method(rb_cIO, "echo?", console_echo_p, 0);
+    rb_define_method(rb_cIO, "console_mode", console_conmode_get, 0);
+    rb_define_method(rb_cIO, "console_mode=", console_conmode_set, 1);
     rb_define_method(rb_cIO, "noecho", console_noecho, 0);
     rb_define_method(rb_cIO, "winsize", console_winsize, 0);
     rb_define_method(rb_cIO, "winsize=", console_set_winsize, 1);
@@ -974,7 +1657,18 @@ InitVM_console(void)
     rb_define_method(rb_cIO, "goto", console_goto, 2);
     rb_define_method(rb_cIO, "cursor", console_cursor_pos, 0);
     rb_define_method(rb_cIO, "cursor=", console_cursor_set, 1);
+    rb_define_method(rb_cIO, "cursor_up", console_cursor_up, 1);
+    rb_define_method(rb_cIO, "cursor_down", console_cursor_down, 1);
+    rb_define_method(rb_cIO, "cursor_left", console_cursor_left, 1);
+    rb_define_method(rb_cIO, "cursor_right", console_cursor_right, 1);
+    rb_define_method(rb_cIO, "goto_column", console_goto_column, 1);
+    rb_define_method(rb_cIO, "erase_line", console_erase_line, 1);
+    rb_define_method(rb_cIO, "erase_screen", console_erase_screen, 1);
+    rb_define_method(rb_cIO, "scroll_forward", console_scroll_forward, 1);
+    rb_define_method(rb_cIO, "scroll_backward", console_scroll_backward, 1);
+    rb_define_method(rb_cIO, "clear_screen", console_clear_screen, 0);
     rb_define_method(rb_cIO, "pressed?", console_key_pressed_p, 1);
+    rb_define_method(rb_cIO, "check_winsize_changed", console_check_winsize_changed, 0);
 #if ENABLE_IO_GETPASS
     rb_define_method(rb_cIO, "getpass", console_getpass, -1);
 #endif
@@ -986,4 +1680,15 @@ InitVM_console(void)
 	rb_define_method(mReadable, "getpass", io_getpass, -1);
 #endif
     }
+    {
+	/* :stopdoc: */
+        cConmode = rb_define_class_under(rb_cIO, "ConsoleMode", rb_cObject);
+        rb_define_alloc_func(cConmode, conmode_alloc);
+        rb_undef_method(cConmode, "initialize");
+        rb_define_method(cConmode, "initialize_copy", conmode_init_copy, 1);
+        rb_define_method(cConmode, "echo=", conmode_set_echo, 1);
+        rb_define_method(cConmode, "raw!", conmode_set_raw, -1);
+        rb_define_method(cConmode, "raw", conmode_raw_new, -1);
+	/* :startdoc: */
+    }
 }
diff --git a/ext/io/console/depend b/ext/io/console/depend
index 40eacd21e1..43c280d8ff 100644
--- a/ext/io/console/depend
+++ b/ext/io/console/depend
@@ -1,8 +1,171 @@
-$(OBJS): $(HDRS) $(ruby_headers) \
-  $(VK_HEADER) \
-  $(hdrdir)/ruby/io.h \
-  $(hdrdir)/ruby/encoding.h \
-  $(hdrdir)/ruby/oniguruma.h
+# AUTOGENERATED DEPENDENCIES START
+console.o: $(RUBY_EXTCONF_H)
+console.o: $(arch_hdrdir)/ruby/config.h
+console.o: $(hdrdir)/ruby.h
+console.o: $(hdrdir)/ruby/internal/anyargs.h
+console.o: $(hdrdir)/ruby/internal/arithmetic.h
+console.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+console.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+console.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+console.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+console.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+console.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+console.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+console.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+console.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+console.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+console.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+console.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+console.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+console.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+console.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+console.o: $(hdrdir)/ruby/internal/assume.h
+console.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+console.o: $(hdrdir)/ruby/internal/attr/artificial.h
+console.o: $(hdrdir)/ruby/internal/attr/cold.h
+console.o: $(hdrdir)/ruby/internal/attr/const.h
+console.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+console.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+console.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+console.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+console.o: $(hdrdir)/ruby/internal/attr/error.h
+console.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+console.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+console.o: $(hdrdir)/ruby/internal/attr/format.h
+console.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+console.o: $(hdrdir)/ruby/internal/attr/noalias.h
+console.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+console.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+console.o: $(hdrdir)/ruby/internal/attr/noinline.h
+console.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+console.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+console.o: $(hdrdir)/ruby/internal/attr/pure.h
+console.o: $(hdrdir)/ruby/internal/attr/restrict.h
+console.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+console.o: $(hdrdir)/ruby/internal/attr/warning.h
+console.o: $(hdrdir)/ruby/internal/attr/weakref.h
+console.o: $(hdrdir)/ruby/internal/cast.h
+console.o: $(hdrdir)/ruby/internal/compiler_is.h
+console.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+console.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+console.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+console.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+console.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+console.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+console.o: $(hdrdir)/ruby/internal/compiler_since.h
+console.o: $(hdrdir)/ruby/internal/config.h
+console.o: $(hdrdir)/ruby/internal/constant_p.h
+console.o: $(hdrdir)/ruby/internal/core.h
+console.o: $(hdrdir)/ruby/internal/core/rarray.h
+console.o: $(hdrdir)/ruby/internal/core/rbasic.h
+console.o: $(hdrdir)/ruby/internal/core/rbignum.h
+console.o: $(hdrdir)/ruby/internal/core/rclass.h
+console.o: $(hdrdir)/ruby/internal/core/rdata.h
+console.o: $(hdrdir)/ruby/internal/core/rfile.h
+console.o: $(hdrdir)/ruby/internal/core/rhash.h
+console.o: $(hdrdir)/ruby/internal/core/robject.h
+console.o: $(hdrdir)/ruby/internal/core/rregexp.h
+console.o: $(hdrdir)/ruby/internal/core/rstring.h
+console.o: $(hdrdir)/ruby/internal/core/rstruct.h
+console.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+console.o: $(hdrdir)/ruby/internal/ctype.h
+console.o: $(hdrdir)/ruby/internal/dllexport.h
+console.o: $(hdrdir)/ruby/internal/dosish.h
+console.o: $(hdrdir)/ruby/internal/error.h
+console.o: $(hdrdir)/ruby/internal/eval.h
+console.o: $(hdrdir)/ruby/internal/event.h
+console.o: $(hdrdir)/ruby/internal/fl_type.h
+console.o: $(hdrdir)/ruby/internal/gc.h
+console.o: $(hdrdir)/ruby/internal/glob.h
+console.o: $(hdrdir)/ruby/internal/globals.h
+console.o: $(hdrdir)/ruby/internal/has/attribute.h
+console.o: $(hdrdir)/ruby/internal/has/builtin.h
+console.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+console.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+console.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+console.o: $(hdrdir)/ruby/internal/has/extension.h
+console.o: $(hdrdir)/ruby/internal/has/feature.h
+console.o: $(hdrdir)/ruby/internal/has/warning.h
+console.o: $(hdrdir)/ruby/internal/intern/array.h
+console.o: $(hdrdir)/ruby/internal/intern/bignum.h
+console.o: $(hdrdir)/ruby/internal/intern/class.h
+console.o: $(hdrdir)/ruby/internal/intern/compar.h
+console.o: $(hdrdir)/ruby/internal/intern/complex.h
+console.o: $(hdrdir)/ruby/internal/intern/cont.h
+console.o: $(hdrdir)/ruby/internal/intern/dir.h
+console.o: $(hdrdir)/ruby/internal/intern/enum.h
+console.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+console.o: $(hdrdir)/ruby/internal/intern/error.h
+console.o: $(hdrdir)/ruby/internal/intern/eval.h
+console.o: $(hdrdir)/ruby/internal/intern/file.h
+console.o: $(hdrdir)/ruby/internal/intern/gc.h
+console.o: $(hdrdir)/ruby/internal/intern/hash.h
+console.o: $(hdrdir)/ruby/internal/intern/io.h
+console.o: $(hdrdir)/ruby/internal/intern/load.h
+console.o: $(hdrdir)/ruby/internal/intern/marshal.h
+console.o: $(hdrdir)/ruby/internal/intern/numeric.h
+console.o: $(hdrdir)/ruby/internal/intern/object.h
+console.o: $(hdrdir)/ruby/internal/intern/parse.h
+console.o: $(hdrdir)/ruby/internal/intern/proc.h
+console.o: $(hdrdir)/ruby/internal/intern/process.h
+console.o: $(hdrdir)/ruby/internal/intern/random.h
+console.o: $(hdrdir)/ruby/internal/intern/range.h
+console.o: $(hdrdir)/ruby/internal/intern/rational.h
+console.o: $(hdrdir)/ruby/internal/intern/re.h
+console.o: $(hdrdir)/ruby/internal/intern/ruby.h
+console.o: $(hdrdir)/ruby/internal/intern/select.h
+console.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+console.o: $(hdrdir)/ruby/internal/intern/signal.h
+console.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+console.o: $(hdrdir)/ruby/internal/intern/string.h
+console.o: $(hdrdir)/ruby/internal/intern/struct.h
+console.o: $(hdrdir)/ruby/internal/intern/thread.h
+console.o: $(hdrdir)/ruby/internal/intern/time.h
+console.o: $(hdrdir)/ruby/internal/intern/variable.h
+console.o: $(hdrdir)/ruby/internal/intern/vm.h
+console.o: $(hdrdir)/ruby/internal/interpreter.h
+console.o: $(hdrdir)/ruby/internal/iterator.h
+console.o: $(hdrdir)/ruby/internal/memory.h
+console.o: $(hdrdir)/ruby/internal/method.h
+console.o: $(hdrdir)/ruby/internal/module.h
+console.o: $(hdrdir)/ruby/internal/newobj.h
+console.o: $(hdrdir)/ruby/internal/rgengc.h
+console.o: $(hdrdir)/ruby/internal/scan_args.h
+console.o: $(hdrdir)/ruby/internal/special_consts.h
+console.o: $(hdrdir)/ruby/internal/static_assert.h
+console.o: $(hdrdir)/ruby/internal/stdalign.h
+console.o: $(hdrdir)/ruby/internal/stdbool.h
+console.o: $(hdrdir)/ruby/internal/symbol.h
+console.o: $(hdrdir)/ruby/internal/token_paste.h
+console.o: $(hdrdir)/ruby/internal/value.h
+console.o: $(hdrdir)/ruby/internal/value_type.h
+console.o: $(hdrdir)/ruby/internal/variable.h
+console.o: $(hdrdir)/ruby/internal/warning_push.h
+console.o: $(hdrdir)/ruby/internal/xmalloc.h
+console.o: $(hdrdir)/ruby/assert.h
+console.o: $(hdrdir)/ruby/backward.h
+console.o: $(hdrdir)/ruby/backward/2/assume.h
+console.o: $(hdrdir)/ruby/backward/2/attributes.h
+console.o: $(hdrdir)/ruby/backward/2/bool.h
+console.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+console.o: $(hdrdir)/ruby/backward/2/inttypes.h
+console.o: $(hdrdir)/ruby/backward/2/limits.h
+console.o: $(hdrdir)/ruby/backward/2/long_long.h
+console.o: $(hdrdir)/ruby/backward/2/stdalign.h
+console.o: $(hdrdir)/ruby/backward/2/stdarg.h
+console.o: $(hdrdir)/ruby/defines.h
+console.o: $(hdrdir)/ruby/encoding.h
+console.o: $(hdrdir)/ruby/intern.h
+console.o: $(hdrdir)/ruby/io.h
+console.o: $(hdrdir)/ruby/missing.h
+console.o: $(hdrdir)/ruby/onigmo.h
+console.o: $(hdrdir)/ruby/oniguruma.h
+console.o: $(hdrdir)/ruby/ruby.h
+console.o: $(hdrdir)/ruby/st.h
+console.o: $(hdrdir)/ruby/subst.h
+console.o: $(hdrdir)/ruby/thread.h
+console.o: console.c
+# AUTOGENERATED DEPENDENCIES END
 
 win32_vk.inc: win32_vk.list
 
@@ -14,7 +177,7 @@ win32_vk.inc: win32_vk.list
 	-e   'puts(%[#ifndef #{n}\n# define #{n} UNDEFINED_VK\n#endif])' \
 	$< && \
 	gperf --ignore-case -E -C -P -p -j1 -i 1 -g -o -t -K ofs -N console_win32_vk -k* $< \
-	| sed 's/(int)(long)&((\(struct stringpool_t\) *\*)0)->\(stringpool_[a-z0-9]*\)/offsetof(\1, \2)/g' \
+	| sed -f $(top_srcdir)/tool/gperf.sed \
 	) > $(@F)
 
 .SUFFIXES: .chksum .list .inc
diff --git a/ext/io/console/extconf.rb b/ext/io/console/extconf.rb
index be536dff9f..3efdd6e092 100644
--- a/ext/io/console/extconf.rb
+++ b/ext/io/console/extconf.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 require 'mkmf'
 
-ok = true
+ok = true if RUBY_ENGINE == "ruby"
 hdr = nil
 case
 when macro_defined?("_WIN32", "")
@@ -14,16 +14,23 @@ when have_header(hdr = "sgtty.h")
   %w"stty gtty".each {|f| have_func(f, hdr)}
 else
   ok = false
-end
-if ok
+end if ok
+case ok
+when true
   have_header("sys/ioctl.h") if hdr
-  have_func("rb_funcallv")
-  have_func("rb_sym2str")
   # rb_check_hash_type: 1.9.3
   # rb_io_get_write_io: 1.9.1
   # rb_cloexec_open: 2.0.0
+  # rb_funcallv: 2.1.0
+  # RARRAY_CONST_PTR: 2.1.0
+  # rb_sym2str: 2.2.0
+  if have_func("rb_scheduler_timeout")
+    have_func("rb_io_wait")
+  end
   $defs << "-D""ENABLE_IO_GETPASS=1"
   create_makefile("io/console") {|conf|
     conf << "\n""VK_HEADER = #{vk_header}\n"
   }
+when nil
+  File.write("Makefile", dummy_makefile($srcdir).join(""))
 end
diff --git a/ext/io/console/io-console.gemspec b/ext/io/console/io-console.gemspec
index d7414bb706..8a0df83b2c 100644
--- a/ext/io/console/io-console.gemspec
+++ b/ext/io/console/io-console.gemspec
@@ -1,21 +1,25 @@
 # -*- ruby -*-
-_VERSION = "0.4.6"
-date = %w$Date::                           $[1]
+_VERSION = "0.5.7"
 
 Gem::Specification.new do |s|
   s.name = "io-console"
   s.version = _VERSION
-  s.date = date
   s.summary = "Console interface"
   s.email = "nobu@ruby-lang.org"
   s.description = "add console capabilities to IO instances."
-  s.required_ruby_version = ">= 2.0.0"
-  s.homepage = "http://www.ruby-lang.org"
+  s.required_ruby_version = ">= 2.4.0"
+  s.homepage = "https://github.com/ruby/io-console"
+  s.metadata["source_code_url"] = s.homepage
   s.authors = ["Nobu Nakada"]
   s.require_path = %[lib]
-  s.files = %w[console.c depend extconf.rb lib/console/size.rb win32_vk.inc]
-  s.extensions = %w[extconf.rb]
-  s.license = "BSD-2-Clause"
-  s.cert_chain  = %w[certs/nobu.pem]
-  s.signing_key = File.expand_path("~/.ssh/gem-private_key.pem") if $0 =~ /gem\z/
+  s.files = %w[
+    LICENSE.txt
+    README.md
+    ext/io/console/console.c
+    ext/io/console/extconf.rb
+    ext/io/console/win32_vk.inc
+    lib/io/console/size.rb
+  ]
+  s.extensions = %w[ext/io/console/extconf.rb]
+  s.licenses = ["Ruby", "BSD-2-Clause"]
 end
diff --git a/ext/io/console/lib/console/size.rb b/ext/io/console/lib/console/size.rb
index f17206dfcf..14b9a74b22 100644
--- a/ext/io/console/lib/console/size.rb
+++ b/ext/io/console/lib/console/size.rb
@@ -10,7 +10,7 @@ end
 begin
   require 'io/console'
 rescue LoadError
-  class IO
+  class << IO
     alias console_size default_console_size
   end
 else
diff --git a/ext/io/console/win32_vk.inc b/ext/io/console/win32_vk.inc
index a098158e27..cbec7bef15 100644
--- a/ext/io/console/win32_vk.inc
+++ b/ext/io/console/win32_vk.inc
@@ -479,7 +479,7 @@
 #ifndef VK_OEM_CLEAR
 # define VK_OEM_CLEAR UNDEFINED_VK
 #endif
-/* C code produced by gperf version 3.0.4 */
+/* ANSI-C code produced by gperf version 3.1 */
 /* Command-line: gperf --ignore-case -E -C -P -p -j1 -i 1 -g -o -t -K ofs -N console_win32_vk -k'*' win32_vk.list  */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
@@ -506,13 +506,14 @@
       && ('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>."
+#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gperf@gnu.org>."
 #endif
 
+#define gperf_offsetof(s, n) (short)offsetof(struct s##_t, s##_str##n)
 #line 1 "win32_vk.list"
 
 struct vktable {short ofs; unsigned short vk;};
-static const struct vktable *console_win32_vk(const char *, unsigned int);
+static const struct vktable *console_win32_vk(/*const char *, unsigned int*/);
 #line 5 "win32_vk.list"
 struct vktable;
 /* maximum key range = 245, duplicates = 0 */
@@ -545,9 +546,7 @@ static unsigned char gperf_downcase[256] =
 #ifndef GPERF_CASE_STRCMP
 #define GPERF_CASE_STRCMP 1
 static int
-gperf_case_strcmp (s1, s2)
-     register const char *s1;
-     register const char *s2;
+gperf_case_strcmp (register const char *s1, register const char *s2)
 {
   for (;;)
     {
@@ -560,15 +559,15 @@ gperf_case_strcmp (s1, s2)
 }
 #endif
 
-#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__cplusplus) || defined(__GNUC_STDC_INLINE__)
-inline
-#elif defined(__GNUC__)
+#ifdef __GNUC__
 __inline
+#else
+#ifdef __cplusplus
+inline
+#endif
 #endif
 static unsigned int
-hash (str, len)
-     register const char *str;
-     register unsigned int len;
+hash (register const char *str, register size_t len)
 {
   static const unsigned short asso_values[] =
     {
@@ -599,7 +598,7 @@ hash (str, len)
       257, 257, 257, 257, 257, 257, 257, 257, 257, 257,
       257, 257, 257, 257, 257, 257, 257, 257
     };
-  register int hval = len;
+  register unsigned int hval = (unsigned int)len;
 
   switch (hval)
     {
@@ -661,7 +660,7 @@ hash (str, len)
         hval += asso_values[(unsigned char)str[0]];
         break;
     }
-  return hval;
+  return (unsigned int)hval;
 }
 
 struct stringpool_t
@@ -991,16 +990,8 @@ static const struct stringpool_t stringpool_contents =
     "DIVIDE"
   };
 #define stringpool ((const char *) &stringpool_contents)
-#ifdef __GNUC__
-__inline
-#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
-__attribute__ ((__gnu_inline__))
-#endif
-#endif
 const struct vktable *
-console_win32_vk (str, len)
-     register const char *str;
-     register unsigned int len;
+console_win32_vk (register const char *str, register size_t len)
 {
   enum
     {
@@ -1016,375 +1007,375 @@ console_win32_vk (str, len)
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1},
 #line 40 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str12), VK_UP},
+      {gperf_offsetof(stringpool, 12), VK_UP},
 #line 52 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str13), VK_APPS},
+      {gperf_offsetof(stringpool, 13), VK_APPS},
 #line 159 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str14), VK_CRSEL},
+      {gperf_offsetof(stringpool, 14), VK_CRSEL},
 #line 34 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str15), VK_SPACE},
+      {gperf_offsetof(stringpool, 15), VK_SPACE},
 #line 95 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str16), VK_SCROLL},
+      {gperf_offsetof(stringpool, 16), VK_SCROLL},
 #line 29 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str17), VK_ESCAPE},
+      {gperf_offsetof(stringpool, 17), VK_ESCAPE},
 #line 9 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str18), VK_CANCEL},
+      {gperf_offsetof(stringpool, 18), VK_CANCEL},
 #line 32 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str19), VK_ACCEPT},
+      {gperf_offsetof(stringpool, 19), VK_ACCEPT},
 #line 66 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str20), VK_SEPARATOR},
+      {gperf_offsetof(stringpool, 20), VK_SEPARATOR},
 #line 43 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str21), VK_SELECT},
+      {gperf_offsetof(stringpool, 21), VK_SELECT},
 #line 18 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str22), VK_CONTROL},
+      {gperf_offsetof(stringpool, 22), VK_CONTROL},
 #line 166 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str23), VK_OEM_CLEAR},
+      {gperf_offsetof(stringpool, 23), VK_OEM_CLEAR},
 #line 145 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str24), VK_OEM_RESET},
+      {gperf_offsetof(stringpool, 24), VK_OEM_RESET},
 #line 155 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str25), VK_OEM_AUTO},
+      {gperf_offsetof(stringpool, 25), VK_OEM_AUTO},
 #line 151 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str26), VK_OEM_CUSEL},
+      {gperf_offsetof(stringpool, 26), VK_OEM_CUSEL},
       {-1},
 #line 22 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str28), VK_KANA},
+      {gperf_offsetof(stringpool, 28), VK_KANA},
 #line 127 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str29), VK_OEM_PLUS},
+      {gperf_offsetof(stringpool, 29), VK_OEM_PLUS},
 #line 35 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str30), VK_PRIOR},
+      {gperf_offsetof(stringpool, 30), VK_PRIOR},
 #line 152 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str31), VK_OEM_ATTN},
+      {gperf_offsetof(stringpool, 31), VK_OEM_ATTN},
 #line 20 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str32), VK_PAUSE},
+      {gperf_offsetof(stringpool, 32), VK_PAUSE},
 #line 13 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str33), VK_BACK},
+      {gperf_offsetof(stringpool, 33), VK_BACK},
 #line 144 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str34), VK_PACKET},
+      {gperf_offsetof(stringpool, 34), VK_PACKET},
 #line 105 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str35), VK_RCONTROL},
+      {gperf_offsetof(stringpool, 35), VK_RCONTROL},
 #line 104 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str36), VK_LCONTROL},
+      {gperf_offsetof(stringpool, 36), VK_LCONTROL},
 #line 37 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str37), VK_END},
+      {gperf_offsetof(stringpool, 37), VK_END},
 #line 38 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str38), VK_HOME},
+      {gperf_offsetof(stringpool, 38), VK_HOME},
 #line 44 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str39), VK_PRINT},
+      {gperf_offsetof(stringpool, 39), VK_PRINT},
 #line 94 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str40), VK_NUMLOCK},
+      {gperf_offsetof(stringpool, 40), VK_NUMLOCK},
 #line 39 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str41), VK_LEFT},
+      {gperf_offsetof(stringpool, 41), VK_LEFT},
 #line 25 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str42), VK_JUNJA},
+      {gperf_offsetof(stringpool, 42), VK_JUNJA},
 #line 19 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str43), VK_MENU},
+      {gperf_offsetof(stringpool, 43), VK_MENU},
 #line 150 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str44), VK_OEM_WSCTRL},
+      {gperf_offsetof(stringpool, 44), VK_OEM_WSCTRL},
 #line 156 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str45), VK_OEM_ENLW},
+      {gperf_offsetof(stringpool, 45), VK_OEM_ENLW},
 #line 36 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str46), VK_NEXT},
+      {gperf_offsetof(stringpool, 46), VK_NEXT},
 #line 51 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str47), VK_RWIN},
+      {gperf_offsetof(stringpool, 47), VK_RWIN},
 #line 50 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str48), VK_LWIN},
+      {gperf_offsetof(stringpool, 48), VK_LWIN},
 #line 21 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str49), VK_CAPITAL},
+      {gperf_offsetof(stringpool, 49), VK_CAPITAL},
 #line 49 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str50), VK_HELP},
+      {gperf_offsetof(stringpool, 50), VK_HELP},
 #line 164 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str51), VK_NONAME},
+      {gperf_offsetof(stringpool, 51), VK_NONAME},
 #line 8 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str52), VK_RBUTTON},
+      {gperf_offsetof(stringpool, 52), VK_RBUTTON},
 #line 7 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str53), VK_LBUTTON},
+      {gperf_offsetof(stringpool, 53), VK_LBUTTON},
 #line 96 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str54), VK_OEM_NEC_EQUAL},
+      {gperf_offsetof(stringpool, 54), VK_OEM_NEC_EQUAL},
       {-1},
 #line 47 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str56), VK_INSERT},
+      {gperf_offsetof(stringpool, 56), VK_INSERT},
 #line 27 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str57), VK_HANJA},
+      {gperf_offsetof(stringpool, 57), VK_HANJA},
       {-1}, {-1},
 #line 46 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str60), VK_SNAPSHOT},
+      {gperf_offsetof(stringpool, 60), VK_SNAPSHOT},
 #line 158 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str61), VK_ATTN},
+      {gperf_offsetof(stringpool, 61), VK_ATTN},
 #line 14 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str62), VK_TAB},
+      {gperf_offsetof(stringpool, 62), VK_TAB},
 #line 157 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str63), VK_OEM_BACKTAB},
+      {gperf_offsetof(stringpool, 63), VK_OEM_BACKTAB},
 #line 143 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str64), VK_ICO_CLEAR},
+      {gperf_offsetof(stringpool, 64), VK_ICO_CLEAR},
 #line 30 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str65), VK_CONVERT},
+      {gperf_offsetof(stringpool, 65), VK_CONVERT},
 #line 16 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str66), VK_RETURN},
+      {gperf_offsetof(stringpool, 66), VK_RETURN},
 #line 146 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str67), VK_OEM_JUMP},
+      {gperf_offsetof(stringpool, 67), VK_OEM_JUMP},
       {-1}, {-1}, {-1},
 #line 111 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str71), VK_BROWSER_STOP},
+      {gperf_offsetof(stringpool, 71), VK_BROWSER_STOP},
 #line 26 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str72), VK_FINAL},
+      {gperf_offsetof(stringpool, 72), VK_FINAL},
 #line 163 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str73), VK_ZOOM},
+      {gperf_offsetof(stringpool, 73), VK_ZOOM},
 #line 28 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str74), VK_KANJI},
+      {gperf_offsetof(stringpool, 74), VK_KANJI},
 #line 48 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str75), VK_DELETE},
+      {gperf_offsetof(stringpool, 75), VK_DELETE},
 #line 128 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str76), VK_OEM_COMMA},
+      {gperf_offsetof(stringpool, 76), VK_OEM_COMMA},
 #line 67 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str77), VK_SUBTRACT},
+      {gperf_offsetof(stringpool, 77), VK_SUBTRACT},
       {-1},
 #line 10 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str79), VK_MBUTTON},
+      {gperf_offsetof(stringpool, 79), VK_MBUTTON},
 #line 78 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str80), VK_F9},
+      {gperf_offsetof(stringpool, 80), VK_F9},
 #line 17 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str81), VK_SHIFT},
+      {gperf_offsetof(stringpool, 81), VK_SHIFT},
 #line 103 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str82), VK_RSHIFT},
+      {gperf_offsetof(stringpool, 82), VK_RSHIFT},
 #line 102 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str83), VK_LSHIFT},
+      {gperf_offsetof(stringpool, 83), VK_LSHIFT},
 #line 65 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str84), VK_ADD},
+      {gperf_offsetof(stringpool, 84), VK_ADD},
 #line 31 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str85), VK_NONCONVERT},
+      {gperf_offsetof(stringpool, 85), VK_NONCONVERT},
 #line 160 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str86), VK_EXSEL},
+      {gperf_offsetof(stringpool, 86), VK_EXSEL},
 #line 126 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str87), VK_OEM_1},
+      {gperf_offsetof(stringpool, 87), VK_OEM_1},
 #line 138 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str88), VK_OEM_AX},
+      {gperf_offsetof(stringpool, 88), VK_OEM_AX},
 #line 108 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str89), VK_BROWSER_BACK},
+      {gperf_offsetof(stringpool, 89), VK_BROWSER_BACK},
 #line 137 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str90), VK_OEM_8},
+      {gperf_offsetof(stringpool, 90), VK_OEM_8},
 #line 129 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str91), VK_OEM_MINUS},
+      {gperf_offsetof(stringpool, 91), VK_OEM_MINUS},
 #line 162 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str92), VK_PLAY},
+      {gperf_offsetof(stringpool, 92), VK_PLAY},
 #line 131 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str93), VK_OEM_2},
+      {gperf_offsetof(stringpool, 93), VK_OEM_2},
 #line 15 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str94), VK_CLEAR},
+      {gperf_offsetof(stringpool, 94), VK_CLEAR},
 #line 99 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str95), VK_OEM_FJ_TOUROKU},
+      {gperf_offsetof(stringpool, 95), VK_OEM_FJ_TOUROKU},
 #line 147 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str96), VK_OEM_PA1},
+      {gperf_offsetof(stringpool, 96), VK_OEM_PA1},
 #line 140 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str97), VK_ICO_HELP},
+      {gperf_offsetof(stringpool, 97), VK_ICO_HELP},
 #line 112 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str98), VK_BROWSER_SEARCH},
+      {gperf_offsetof(stringpool, 98), VK_BROWSER_SEARCH},
 #line 53 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str99), VK_SLEEP},
+      {gperf_offsetof(stringpool, 99), VK_SLEEP},
       {-1},
 #line 70 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str101), VK_F1},
+      {gperf_offsetof(stringpool, 101), VK_F1},
 #line 148 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str102), VK_OEM_PA2},
+      {gperf_offsetof(stringpool, 102), VK_OEM_PA2},
 #line 154 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str103), VK_OEM_COPY},
+      {gperf_offsetof(stringpool, 103), VK_OEM_COPY},
 #line 77 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str104), VK_F8},
+      {gperf_offsetof(stringpool, 104), VK_F8},
 #line 88 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str105), VK_F19},
+      {gperf_offsetof(stringpool, 105), VK_F19},
 #line 41 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str106), VK_RIGHT},
+      {gperf_offsetof(stringpool, 106), VK_RIGHT},
 #line 71 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str107), VK_F2},
+      {gperf_offsetof(stringpool, 107), VK_F2},
 #line 135 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str108), VK_OEM_6},
+      {gperf_offsetof(stringpool, 108), VK_OEM_6},
 #line 87 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str109), VK_F18},
+      {gperf_offsetof(stringpool, 109), VK_F18},
       {-1},
 #line 117 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str111), VK_VOLUME_UP},
+      {gperf_offsetof(stringpool, 111), VK_VOLUME_UP},
       {-1}, {-1},
 #line 120 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str114), VK_MEDIA_STOP},
+      {gperf_offsetof(stringpool, 114), VK_MEDIA_STOP},
 #line 130 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str115), VK_OEM_PERIOD},
+      {gperf_offsetof(stringpool, 115), VK_OEM_PERIOD},
       {-1},
 #line 161 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str117), VK_EREOF},
+      {gperf_offsetof(stringpool, 117), VK_EREOF},
       {-1}, {-1}, {-1},
 #line 114 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str121), VK_BROWSER_HOME},
+      {gperf_offsetof(stringpool, 121), VK_BROWSER_HOME},
 #line 75 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str122), VK_F6},
+      {gperf_offsetof(stringpool, 122), VK_F6},
       {-1},
 #line 110 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str124), VK_BROWSER_REFRESH},
+      {gperf_offsetof(stringpool, 124), VK_BROWSER_REFRESH},
       {-1},
 #line 165 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str126), VK_PA1},
+      {gperf_offsetof(stringpool, 126), VK_PA1},
 #line 142 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str127), VK_PROCESSKEY},
+      {gperf_offsetof(stringpool, 127), VK_PROCESSKEY},
 #line 68 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str128), VK_DECIMAL},
+      {gperf_offsetof(stringpool, 128), VK_DECIMAL},
 #line 132 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str129), VK_OEM_3},
+      {gperf_offsetof(stringpool, 129), VK_OEM_3},
 #line 107 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str130), VK_RMENU},
+      {gperf_offsetof(stringpool, 130), VK_RMENU},
 #line 106 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str131), VK_LMENU},
+      {gperf_offsetof(stringpool, 131), VK_LMENU},
 #line 98 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str132), VK_OEM_FJ_MASSHOU},
+      {gperf_offsetof(stringpool, 132), VK_OEM_FJ_MASSHOU},
 #line 54 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str133), VK_NUMPAD0},
+      {gperf_offsetof(stringpool, 133), VK_NUMPAD0},
 #line 24 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str134), VK_HANGUL},
+      {gperf_offsetof(stringpool, 134), VK_HANGUL},
 #line 63 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str135), VK_NUMPAD9},
+      {gperf_offsetof(stringpool, 135), VK_NUMPAD9},
 #line 23 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str136), VK_HANGEUL},
+      {gperf_offsetof(stringpool, 136), VK_HANGEUL},
 #line 134 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str137), VK_OEM_5},
+      {gperf_offsetof(stringpool, 137), VK_OEM_5},
 #line 149 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str138), VK_OEM_PA3},
+      {gperf_offsetof(stringpool, 138), VK_OEM_PA3},
 #line 115 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str139), VK_VOLUME_MUTE},
+      {gperf_offsetof(stringpool, 139), VK_VOLUME_MUTE},
 #line 133 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str140), VK_OEM_4},
+      {gperf_offsetof(stringpool, 140), VK_OEM_4},
 #line 122 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str141), VK_LAUNCH_MAIL},
+      {gperf_offsetof(stringpool, 141), VK_LAUNCH_MAIL},
 #line 97 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str142), VK_OEM_FJ_JISHO},
+      {gperf_offsetof(stringpool, 142), VK_OEM_FJ_JISHO},
 #line 72 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str143), VK_F3},
+      {gperf_offsetof(stringpool, 143), VK_F3},
 #line 101 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str144), VK_OEM_FJ_ROYA},
+      {gperf_offsetof(stringpool, 144), VK_OEM_FJ_ROYA},
 #line 100 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str145), VK_OEM_FJ_LOYA},
+      {gperf_offsetof(stringpool, 145), VK_OEM_FJ_LOYA},
       {-1},
 #line 42 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str147), VK_DOWN},
+      {gperf_offsetof(stringpool, 147), VK_DOWN},
       {-1},
 #line 153 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str149), VK_OEM_FINISH},
+      {gperf_offsetof(stringpool, 149), VK_OEM_FINISH},
       {-1},
 #line 74 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str151), VK_F5},
+      {gperf_offsetof(stringpool, 151), VK_F5},
       {-1},
 #line 136 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str153), VK_OEM_7},
+      {gperf_offsetof(stringpool, 153), VK_OEM_7},
 #line 73 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str154), VK_F4},
+      {gperf_offsetof(stringpool, 154), VK_F4},
 #line 86 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str155), VK_F17},
+      {gperf_offsetof(stringpool, 155), VK_F17},
 #line 55 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str156), VK_NUMPAD1},
+      {gperf_offsetof(stringpool, 156), VK_NUMPAD1},
 #line 141 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str157), VK_ICO_00},
+      {gperf_offsetof(stringpool, 157), VK_ICO_00},
       {-1},
 #line 62 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str159), VK_NUMPAD8},
+      {gperf_offsetof(stringpool, 159), VK_NUMPAD8},
       {-1}, {-1},
 #line 56 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str162), VK_NUMPAD2},
+      {gperf_offsetof(stringpool, 162), VK_NUMPAD2},
       {-1},
 #line 124 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str164), VK_LAUNCH_APP1},
+      {gperf_offsetof(stringpool, 164), VK_LAUNCH_APP1},
 #line 109 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str165), VK_BROWSER_FORWARD},
+      {gperf_offsetof(stringpool, 165), VK_BROWSER_FORWARD},
       {-1},
 #line 76 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str167), VK_F7},
+      {gperf_offsetof(stringpool, 167), VK_F7},
       {-1}, {-1},
 #line 125 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str170), VK_LAUNCH_APP2},
+      {gperf_offsetof(stringpool, 170), VK_LAUNCH_APP2},
 #line 64 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str171), VK_MULTIPLY},
+      {gperf_offsetof(stringpool, 171), VK_MULTIPLY},
       {-1}, {-1},
 #line 45 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str174), VK_EXECUTE},
+      {gperf_offsetof(stringpool, 174), VK_EXECUTE},
       {-1},
 #line 113 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str176), VK_BROWSER_FAVORITES},
+      {gperf_offsetof(stringpool, 176), VK_BROWSER_FAVORITES},
 #line 60 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str177), VK_NUMPAD6},
+      {gperf_offsetof(stringpool, 177), VK_NUMPAD6},
       {-1},
 #line 85 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str179), VK_F16},
+      {gperf_offsetof(stringpool, 179), VK_F16},
       {-1}, {-1},
 #line 79 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str182), VK_F10},
+      {gperf_offsetof(stringpool, 182), VK_F10},
       {-1}, {-1},
 #line 116 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str185), VK_VOLUME_DOWN},
+      {gperf_offsetof(stringpool, 185), VK_VOLUME_DOWN},
       {-1}, {-1},
 #line 89 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str188), VK_F20},
+      {gperf_offsetof(stringpool, 188), VK_F20},
 #line 119 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str189), VK_MEDIA_PREV_TRACK},
+      {gperf_offsetof(stringpool, 189), VK_MEDIA_PREV_TRACK},
       {-1},
 #line 33 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str191), VK_MODECHANGE},
+      {gperf_offsetof(stringpool, 191), VK_MODECHANGE},
       {-1}, {-1}, {-1}, {-1}, {-1},
 #line 83 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str197), VK_F14},
+      {gperf_offsetof(stringpool, 197), VK_F14},
 #line 57 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str198), VK_NUMPAD3},
+      {gperf_offsetof(stringpool, 198), VK_NUMPAD3},
 #line 11 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str199), VK_XBUTTON1},
+      {gperf_offsetof(stringpool, 199), VK_XBUTTON1},
       {-1}, {-1}, {-1},
 #line 93 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str203), VK_F24},
+      {gperf_offsetof(stringpool, 203), VK_F24},
       {-1},
 #line 12 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str205), VK_XBUTTON2},
+      {gperf_offsetof(stringpool, 205), VK_XBUTTON2},
 #line 59 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str206), VK_NUMPAD5},
+      {gperf_offsetof(stringpool, 206), VK_NUMPAD5},
       {-1}, {-1},
 #line 58 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str209), VK_NUMPAD4},
+      {gperf_offsetof(stringpool, 209), VK_NUMPAD4},
       {-1}, {-1}, {-1}, {-1}, {-1},
 #line 121 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str215), VK_MEDIA_PLAY_PAUSE},
+      {gperf_offsetof(stringpool, 215), VK_MEDIA_PLAY_PAUSE},
       {-1},
 #line 123 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str217), VK_LAUNCH_MEDIA_SELECT},
+      {gperf_offsetof(stringpool, 217), VK_LAUNCH_MEDIA_SELECT},
 #line 80 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str218), VK_F11},
+      {gperf_offsetof(stringpool, 218), VK_F11},
       {-1},
 #line 139 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str220), VK_OEM_102},
+      {gperf_offsetof(stringpool, 220), VK_OEM_102},
 #line 118 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str221), VK_MEDIA_NEXT_TRACK},
+      {gperf_offsetof(stringpool, 221), VK_MEDIA_NEXT_TRACK},
 #line 61 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str222), VK_NUMPAD7},
+      {gperf_offsetof(stringpool, 222), VK_NUMPAD7},
       {-1},
 #line 90 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str224), VK_F21},
+      {gperf_offsetof(stringpool, 224), VK_F21},
       {-1},
 #line 82 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str226), VK_F13},
+      {gperf_offsetof(stringpool, 226), VK_F13},
       {-1}, {-1},
 #line 81 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str229), VK_F12},
+      {gperf_offsetof(stringpool, 229), VK_F12},
       {-1}, {-1},
 #line 92 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str232), VK_F23},
+      {gperf_offsetof(stringpool, 232), VK_F23},
       {-1}, {-1},
 #line 91 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str235), VK_F22},
+      {gperf_offsetof(stringpool, 235), VK_F22},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
 #line 84 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str242), VK_F15},
+      {gperf_offsetof(stringpool, 242), VK_F15},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1},
 #line 69 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str256), VK_DIVIDE}
+      {gperf_offsetof(stringpool, 256), VK_DIVIDE}
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
     {
-      register int key = hash (str, len);
+      register unsigned int key = hash (str, len);
 
-      if (key <= MAX_HASH_VALUE && key >= 0)
+      if (key <= MAX_HASH_VALUE)
         {
           register int o = wordlist[key].ofs;
           if (o >= 0)
diff --git a/ext/io/console/win32_vk.list b/ext/io/console/win32_vk.list
index 28bc9545ec..7909a4d1f0 100644
--- a/ext/io/console/win32_vk.list
+++ b/ext/io/console/win32_vk.list
@@ -1,6 +1,6 @@
 %{
 struct vktable {short ofs; unsigned short vk;};
-static const struct vktable *console_win32_vk(const char *, unsigned int);
+static const struct vktable *console_win32_vk(/*!ANSI{*/const char *, unsigned int/*}!ANSI*/);
 %}
 struct vktable
 %%
diff --git a/ext/io/nonblock/depend b/ext/io/nonblock/depend
index e786dc71d2..673f4161a7 100644
--- a/ext/io/nonblock/depend
+++ b/ext/io/nonblock/depend
@@ -1,4 +1,167 @@
-$(OBJS): $(HDRS) $(ruby_headers) \
-  $(hdrdir)/ruby/io.h \
-  $(hdrdir)/ruby/encoding.h \
-  $(hdrdir)/ruby/oniguruma.h
+# AUTOGENERATED DEPENDENCIES START
+nonblock.o: $(RUBY_EXTCONF_H)
+nonblock.o: $(arch_hdrdir)/ruby/config.h
+nonblock.o: $(hdrdir)/ruby.h
+nonblock.o: $(hdrdir)/ruby/internal/anyargs.h
+nonblock.o: $(hdrdir)/ruby/internal/arithmetic.h
+nonblock.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+nonblock.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+nonblock.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+nonblock.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+nonblock.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+nonblock.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+nonblock.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+nonblock.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+nonblock.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+nonblock.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+nonblock.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+nonblock.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+nonblock.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+nonblock.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+nonblock.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+nonblock.o: $(hdrdir)/ruby/internal/assume.h
+nonblock.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+nonblock.o: $(hdrdir)/ruby/internal/attr/artificial.h
+nonblock.o: $(hdrdir)/ruby/internal/attr/cold.h
+nonblock.o: $(hdrdir)/ruby/internal/attr/const.h
+nonblock.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+nonblock.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+nonblock.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+nonblock.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+nonblock.o: $(hdrdir)/ruby/internal/attr/error.h
+nonblock.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+nonblock.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+nonblock.o: $(hdrdir)/ruby/internal/attr/format.h
+nonblock.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+nonblock.o: $(hdrdir)/ruby/internal/attr/noalias.h
+nonblock.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+nonblock.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+nonblock.o: $(hdrdir)/ruby/internal/attr/noinline.h
+nonblock.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+nonblock.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+nonblock.o: $(hdrdir)/ruby/internal/attr/pure.h
+nonblock.o: $(hdrdir)/ruby/internal/attr/restrict.h
+nonblock.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+nonblock.o: $(hdrdir)/ruby/internal/attr/warning.h
+nonblock.o: $(hdrdir)/ruby/internal/attr/weakref.h
+nonblock.o: $(hdrdir)/ruby/internal/cast.h
+nonblock.o: $(hdrdir)/ruby/internal/compiler_is.h
+nonblock.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+nonblock.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+nonblock.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+nonblock.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+nonblock.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+nonblock.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+nonblock.o: $(hdrdir)/ruby/internal/compiler_since.h
+nonblock.o: $(hdrdir)/ruby/internal/config.h
+nonblock.o: $(hdrdir)/ruby/internal/constant_p.h
+nonblock.o: $(hdrdir)/ruby/internal/core.h
+nonblock.o: $(hdrdir)/ruby/internal/core/rarray.h
+nonblock.o: $(hdrdir)/ruby/internal/core/rbasic.h
+nonblock.o: $(hdrdir)/ruby/internal/core/rbignum.h
+nonblock.o: $(hdrdir)/ruby/internal/core/rclass.h
+nonblock.o: $(hdrdir)/ruby/internal/core/rdata.h
+nonblock.o: $(hdrdir)/ruby/internal/core/rfile.h
+nonblock.o: $(hdrdir)/ruby/internal/core/rhash.h
+nonblock.o: $(hdrdir)/ruby/internal/core/robject.h
+nonblock.o: $(hdrdir)/ruby/internal/core/rregexp.h
+nonblock.o: $(hdrdir)/ruby/internal/core/rstring.h
+nonblock.o: $(hdrdir)/ruby/internal/core/rstruct.h
+nonblock.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+nonblock.o: $(hdrdir)/ruby/internal/ctype.h
+nonblock.o: $(hdrdir)/ruby/internal/dllexport.h
+nonblock.o: $(hdrdir)/ruby/internal/dosish.h
+nonblock.o: $(hdrdir)/ruby/internal/error.h
+nonblock.o: $(hdrdir)/ruby/internal/eval.h
+nonblock.o: $(hdrdir)/ruby/internal/event.h
+nonblock.o: $(hdrdir)/ruby/internal/fl_type.h
+nonblock.o: $(hdrdir)/ruby/internal/gc.h
+nonblock.o: $(hdrdir)/ruby/internal/glob.h
+nonblock.o: $(hdrdir)/ruby/internal/globals.h
+nonblock.o: $(hdrdir)/ruby/internal/has/attribute.h
+nonblock.o: $(hdrdir)/ruby/internal/has/builtin.h
+nonblock.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+nonblock.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+nonblock.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+nonblock.o: $(hdrdir)/ruby/internal/has/extension.h
+nonblock.o: $(hdrdir)/ruby/internal/has/feature.h
+nonblock.o: $(hdrdir)/ruby/internal/has/warning.h
+nonblock.o: $(hdrdir)/ruby/internal/intern/array.h
+nonblock.o: $(hdrdir)/ruby/internal/intern/bignum.h
+nonblock.o: $(hdrdir)/ruby/internal/intern/class.h
+nonblock.o: $(hdrdir)/ruby/internal/intern/compar.h
+nonblock.o: $(hdrdir)/ruby/internal/intern/complex.h
+nonblock.o: $(hdrdir)/ruby/internal/intern/cont.h
+nonblock.o: $(hdrdir)/ruby/internal/intern/dir.h
+nonblock.o: $(hdrdir)/ruby/internal/intern/enum.h
+nonblock.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+nonblock.o: $(hdrdir)/ruby/internal/intern/error.h
+nonblock.o: $(hdrdir)/ruby/internal/intern/eval.h
+nonblock.o: $(hdrdir)/ruby/internal/intern/file.h
+nonblock.o: $(hdrdir)/ruby/internal/intern/gc.h
+nonblock.o: $(hdrdir)/ruby/internal/intern/hash.h
+nonblock.o: $(hdrdir)/ruby/internal/intern/io.h
+nonblock.o: $(hdrdir)/ruby/internal/intern/load.h
+nonblock.o: $(hdrdir)/ruby/internal/intern/marshal.h
+nonblock.o: $(hdrdir)/ruby/internal/intern/numeric.h
+nonblock.o: $(hdrdir)/ruby/internal/intern/object.h
+nonblock.o: $(hdrdir)/ruby/internal/intern/parse.h
+nonblock.o: $(hdrdir)/ruby/internal/intern/proc.h
+nonblock.o: $(hdrdir)/ruby/internal/intern/process.h
+nonblock.o: $(hdrdir)/ruby/internal/intern/random.h
+nonblock.o: $(hdrdir)/ruby/internal/intern/range.h
+nonblock.o: $(hdrdir)/ruby/internal/intern/rational.h
+nonblock.o: $(hdrdir)/ruby/internal/intern/re.h
+nonblock.o: $(hdrdir)/ruby/internal/intern/ruby.h
+nonblock.o: $(hdrdir)/ruby/internal/intern/select.h
+nonblock.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+nonblock.o: $(hdrdir)/ruby/internal/intern/signal.h
+nonblock.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+nonblock.o: $(hdrdir)/ruby/internal/intern/string.h
+nonblock.o: $(hdrdir)/ruby/internal/intern/struct.h
+nonblock.o: $(hdrdir)/ruby/internal/intern/thread.h
+nonblock.o: $(hdrdir)/ruby/internal/intern/time.h
+nonblock.o: $(hdrdir)/ruby/internal/intern/variable.h
+nonblock.o: $(hdrdir)/ruby/internal/intern/vm.h
+nonblock.o: $(hdrdir)/ruby/internal/interpreter.h
+nonblock.o: $(hdrdir)/ruby/internal/iterator.h
+nonblock.o: $(hdrdir)/ruby/internal/memory.h
+nonblock.o: $(hdrdir)/ruby/internal/method.h
+nonblock.o: $(hdrdir)/ruby/internal/module.h
+nonblock.o: $(hdrdir)/ruby/internal/newobj.h
+nonblock.o: $(hdrdir)/ruby/internal/rgengc.h
+nonblock.o: $(hdrdir)/ruby/internal/scan_args.h
+nonblock.o: $(hdrdir)/ruby/internal/special_consts.h
+nonblock.o: $(hdrdir)/ruby/internal/static_assert.h
+nonblock.o: $(hdrdir)/ruby/internal/stdalign.h
+nonblock.o: $(hdrdir)/ruby/internal/stdbool.h
+nonblock.o: $(hdrdir)/ruby/internal/symbol.h
+nonblock.o: $(hdrdir)/ruby/internal/token_paste.h
+nonblock.o: $(hdrdir)/ruby/internal/value.h
+nonblock.o: $(hdrdir)/ruby/internal/value_type.h
+nonblock.o: $(hdrdir)/ruby/internal/variable.h
+nonblock.o: $(hdrdir)/ruby/internal/warning_push.h
+nonblock.o: $(hdrdir)/ruby/internal/xmalloc.h
+nonblock.o: $(hdrdir)/ruby/assert.h
+nonblock.o: $(hdrdir)/ruby/backward.h
+nonblock.o: $(hdrdir)/ruby/backward/2/assume.h
+nonblock.o: $(hdrdir)/ruby/backward/2/attributes.h
+nonblock.o: $(hdrdir)/ruby/backward/2/bool.h
+nonblock.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+nonblock.o: $(hdrdir)/ruby/backward/2/inttypes.h
+nonblock.o: $(hdrdir)/ruby/backward/2/limits.h
+nonblock.o: $(hdrdir)/ruby/backward/2/long_long.h
+nonblock.o: $(hdrdir)/ruby/backward/2/stdalign.h
+nonblock.o: $(hdrdir)/ruby/backward/2/stdarg.h
+nonblock.o: $(hdrdir)/ruby/defines.h
+nonblock.o: $(hdrdir)/ruby/encoding.h
+nonblock.o: $(hdrdir)/ruby/intern.h
+nonblock.o: $(hdrdir)/ruby/io.h
+nonblock.o: $(hdrdir)/ruby/missing.h
+nonblock.o: $(hdrdir)/ruby/onigmo.h
+nonblock.o: $(hdrdir)/ruby/oniguruma.h
+nonblock.o: $(hdrdir)/ruby/ruby.h
+nonblock.o: $(hdrdir)/ruby/st.h
+nonblock.o: $(hdrdir)/ruby/subst.h
+nonblock.o: nonblock.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/io/nonblock/io-nonblock.gemspec b/ext/io/nonblock/io-nonblock.gemspec
new file mode 100644
index 0000000000..34d736650b
--- /dev/null
+++ b/ext/io/nonblock/io-nonblock.gemspec
@@ -0,0 +1,25 @@
+Gem::Specification.new do |spec|
+  spec.name          = "io-nonblock"
+  spec.version       = "0.1.0"
+  spec.authors       = ["Nobu Nakada"]
+  spec.email         = ["nobu@ruby-lang.org"]
+
+  spec.summary       = %q{Enables non-blocking mode with IO class}
+  spec.description   = %q{Enables non-blocking mode with IO class}
+  spec.homepage      = "https://github.com/ruby/io-nonblock"
+  spec.licenses      = ["Ruby", "BSD-2-Clause"]
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    %x[git ls-files -z].split("\x0").reject do |f|
+      f.match(%r{\A(?:test|spec|features)/|\A\.(?:git|travis)})
+    end
+  end
+  spec.extensions    = %w[ext/io/nonblock/extconf.rb]
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+end
diff --git a/ext/io/nonblock/nonblock.c b/ext/io/nonblock/nonblock.c
index 2509329f6c..1c0bdc68e7 100644
--- a/ext/io/nonblock/nonblock.c
+++ b/ext/io/nonblock/nonblock.c
@@ -1,6 +1,6 @@
 /**********************************************************************
 
-  io/wait.c -
+  io/nonblock.c -
 
   $Author$
   created at: Tue Jul 14 21:53:18 2009
diff --git a/ext/io/wait/depend b/ext/io/wait/depend
index e786dc71d2..af227a8f19 100644
--- a/ext/io/wait/depend
+++ b/ext/io/wait/depend
@@ -1,4 +1,167 @@
-$(OBJS): $(HDRS) $(ruby_headers) \
-  $(hdrdir)/ruby/io.h \
-  $(hdrdir)/ruby/encoding.h \
-  $(hdrdir)/ruby/oniguruma.h
+# AUTOGENERATED DEPENDENCIES START
+wait.o: $(RUBY_EXTCONF_H)
+wait.o: $(arch_hdrdir)/ruby/config.h
+wait.o: $(hdrdir)/ruby.h
+wait.o: $(hdrdir)/ruby/internal/anyargs.h
+wait.o: $(hdrdir)/ruby/internal/arithmetic.h
+wait.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+wait.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+wait.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+wait.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+wait.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+wait.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+wait.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+wait.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+wait.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+wait.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+wait.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+wait.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+wait.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+wait.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+wait.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+wait.o: $(hdrdir)/ruby/internal/assume.h
+wait.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+wait.o: $(hdrdir)/ruby/internal/attr/artificial.h
+wait.o: $(hdrdir)/ruby/internal/attr/cold.h
+wait.o: $(hdrdir)/ruby/internal/attr/const.h
+wait.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+wait.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+wait.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+wait.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+wait.o: $(hdrdir)/ruby/internal/attr/error.h
+wait.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+wait.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+wait.o: $(hdrdir)/ruby/internal/attr/format.h
+wait.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+wait.o: $(hdrdir)/ruby/internal/attr/noalias.h
+wait.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+wait.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+wait.o: $(hdrdir)/ruby/internal/attr/noinline.h
+wait.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+wait.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+wait.o: $(hdrdir)/ruby/internal/attr/pure.h
+wait.o: $(hdrdir)/ruby/internal/attr/restrict.h
+wait.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+wait.o: $(hdrdir)/ruby/internal/attr/warning.h
+wait.o: $(hdrdir)/ruby/internal/attr/weakref.h
+wait.o: $(hdrdir)/ruby/internal/cast.h
+wait.o: $(hdrdir)/ruby/internal/compiler_is.h
+wait.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+wait.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+wait.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+wait.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+wait.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+wait.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+wait.o: $(hdrdir)/ruby/internal/compiler_since.h
+wait.o: $(hdrdir)/ruby/internal/config.h
+wait.o: $(hdrdir)/ruby/internal/constant_p.h
+wait.o: $(hdrdir)/ruby/internal/core.h
+wait.o: $(hdrdir)/ruby/internal/core/rarray.h
+wait.o: $(hdrdir)/ruby/internal/core/rbasic.h
+wait.o: $(hdrdir)/ruby/internal/core/rbignum.h
+wait.o: $(hdrdir)/ruby/internal/core/rclass.h
+wait.o: $(hdrdir)/ruby/internal/core/rdata.h
+wait.o: $(hdrdir)/ruby/internal/core/rfile.h
+wait.o: $(hdrdir)/ruby/internal/core/rhash.h
+wait.o: $(hdrdir)/ruby/internal/core/robject.h
+wait.o: $(hdrdir)/ruby/internal/core/rregexp.h
+wait.o: $(hdrdir)/ruby/internal/core/rstring.h
+wait.o: $(hdrdir)/ruby/internal/core/rstruct.h
+wait.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+wait.o: $(hdrdir)/ruby/internal/ctype.h
+wait.o: $(hdrdir)/ruby/internal/dllexport.h
+wait.o: $(hdrdir)/ruby/internal/dosish.h
+wait.o: $(hdrdir)/ruby/internal/error.h
+wait.o: $(hdrdir)/ruby/internal/eval.h
+wait.o: $(hdrdir)/ruby/internal/event.h
+wait.o: $(hdrdir)/ruby/internal/fl_type.h
+wait.o: $(hdrdir)/ruby/internal/gc.h
+wait.o: $(hdrdir)/ruby/internal/glob.h
+wait.o: $(hdrdir)/ruby/internal/globals.h
+wait.o: $(hdrdir)/ruby/internal/has/attribute.h
+wait.o: $(hdrdir)/ruby/internal/has/builtin.h
+wait.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+wait.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+wait.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+wait.o: $(hdrdir)/ruby/internal/has/extension.h
+wait.o: $(hdrdir)/ruby/internal/has/feature.h
+wait.o: $(hdrdir)/ruby/internal/has/warning.h
+wait.o: $(hdrdir)/ruby/internal/intern/array.h
+wait.o: $(hdrdir)/ruby/internal/intern/bignum.h
+wait.o: $(hdrdir)/ruby/internal/intern/class.h
+wait.o: $(hdrdir)/ruby/internal/intern/compar.h
+wait.o: $(hdrdir)/ruby/internal/intern/complex.h
+wait.o: $(hdrdir)/ruby/internal/intern/cont.h
+wait.o: $(hdrdir)/ruby/internal/intern/dir.h
+wait.o: $(hdrdir)/ruby/internal/intern/enum.h
+wait.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+wait.o: $(hdrdir)/ruby/internal/intern/error.h
+wait.o: $(hdrdir)/ruby/internal/intern/eval.h
+wait.o: $(hdrdir)/ruby/internal/intern/file.h
+wait.o: $(hdrdir)/ruby/internal/intern/gc.h
+wait.o: $(hdrdir)/ruby/internal/intern/hash.h
+wait.o: $(hdrdir)/ruby/internal/intern/io.h
+wait.o: $(hdrdir)/ruby/internal/intern/load.h
+wait.o: $(hdrdir)/ruby/internal/intern/marshal.h
+wait.o: $(hdrdir)/ruby/internal/intern/numeric.h
+wait.o: $(hdrdir)/ruby/internal/intern/object.h
+wait.o: $(hdrdir)/ruby/internal/intern/parse.h
+wait.o: $(hdrdir)/ruby/internal/intern/proc.h
+wait.o: $(hdrdir)/ruby/internal/intern/process.h
+wait.o: $(hdrdir)/ruby/internal/intern/random.h
+wait.o: $(hdrdir)/ruby/internal/intern/range.h
+wait.o: $(hdrdir)/ruby/internal/intern/rational.h
+wait.o: $(hdrdir)/ruby/internal/intern/re.h
+wait.o: $(hdrdir)/ruby/internal/intern/ruby.h
+wait.o: $(hdrdir)/ruby/internal/intern/select.h
+wait.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+wait.o: $(hdrdir)/ruby/internal/intern/signal.h
+wait.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+wait.o: $(hdrdir)/ruby/internal/intern/string.h
+wait.o: $(hdrdir)/ruby/internal/intern/struct.h
+wait.o: $(hdrdir)/ruby/internal/intern/thread.h
+wait.o: $(hdrdir)/ruby/internal/intern/time.h
+wait.o: $(hdrdir)/ruby/internal/intern/variable.h
+wait.o: $(hdrdir)/ruby/internal/intern/vm.h
+wait.o: $(hdrdir)/ruby/internal/interpreter.h
+wait.o: $(hdrdir)/ruby/internal/iterator.h
+wait.o: $(hdrdir)/ruby/internal/memory.h
+wait.o: $(hdrdir)/ruby/internal/method.h
+wait.o: $(hdrdir)/ruby/internal/module.h
+wait.o: $(hdrdir)/ruby/internal/newobj.h
+wait.o: $(hdrdir)/ruby/internal/rgengc.h
+wait.o: $(hdrdir)/ruby/internal/scan_args.h
+wait.o: $(hdrdir)/ruby/internal/special_consts.h
+wait.o: $(hdrdir)/ruby/internal/static_assert.h
+wait.o: $(hdrdir)/ruby/internal/stdalign.h
+wait.o: $(hdrdir)/ruby/internal/stdbool.h
+wait.o: $(hdrdir)/ruby/internal/symbol.h
+wait.o: $(hdrdir)/ruby/internal/token_paste.h
+wait.o: $(hdrdir)/ruby/internal/value.h
+wait.o: $(hdrdir)/ruby/internal/value_type.h
+wait.o: $(hdrdir)/ruby/internal/variable.h
+wait.o: $(hdrdir)/ruby/internal/warning_push.h
+wait.o: $(hdrdir)/ruby/internal/xmalloc.h
+wait.o: $(hdrdir)/ruby/assert.h
+wait.o: $(hdrdir)/ruby/backward.h
+wait.o: $(hdrdir)/ruby/backward/2/assume.h
+wait.o: $(hdrdir)/ruby/backward/2/attributes.h
+wait.o: $(hdrdir)/ruby/backward/2/bool.h
+wait.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+wait.o: $(hdrdir)/ruby/backward/2/inttypes.h
+wait.o: $(hdrdir)/ruby/backward/2/limits.h
+wait.o: $(hdrdir)/ruby/backward/2/long_long.h
+wait.o: $(hdrdir)/ruby/backward/2/stdalign.h
+wait.o: $(hdrdir)/ruby/backward/2/stdarg.h
+wait.o: $(hdrdir)/ruby/defines.h
+wait.o: $(hdrdir)/ruby/encoding.h
+wait.o: $(hdrdir)/ruby/intern.h
+wait.o: $(hdrdir)/ruby/io.h
+wait.o: $(hdrdir)/ruby/missing.h
+wait.o: $(hdrdir)/ruby/onigmo.h
+wait.o: $(hdrdir)/ruby/oniguruma.h
+wait.o: $(hdrdir)/ruby/ruby.h
+wait.o: $(hdrdir)/ruby/st.h
+wait.o: $(hdrdir)/ruby/subst.h
+wait.o: wait.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/io/wait/io-wait.gemspec b/ext/io/wait/io-wait.gemspec
new file mode 100644
index 0000000000..ec23699def
--- /dev/null
+++ b/ext/io/wait/io-wait.gemspec
@@ -0,0 +1,27 @@
+_VERSION = "0.2.0"
+
+Gem::Specification.new do |spec|
+  spec.name          = "io-wait"
+  spec.version       = _VERSION
+  spec.authors       = ["Nobu Nakada"]
+  spec.email         = ["nobu@ruby-lang.org"]
+
+  spec.summary       = %q{Waits until IO is readable or writable without blocking.}
+  spec.description   = %q{Waits until IO is readable or writable without blocking.}
+  spec.homepage      = "https://github.com/ruby/io-wait"
+  spec.licenses      = ["Ruby", "BSD-2-Clause"]
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.0.0")
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z`.split("\x0").reject do |f|
+      f.match(%r{\A(?:test|spec|features)/|\A\.(?:git|travis)})
+    end
+  end
+  spec.extensions    = %w[ext/io/wait/extconf.rb]
+  spec.bindir        = "exe"
+  spec.executables   = []
+  spec.require_paths = ["lib"]
+end
diff --git a/ext/io/wait/wait.c b/ext/io/wait/wait.c
index f7a7508eeb..512e4f6a80 100644
--- a/ext/io/wait/wait.c
+++ b/ext/io/wait/wait.c
@@ -1,3 +1,4 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: t -*- */
 /**********************************************************************
 
   io/wait.c -
@@ -39,35 +40,6 @@
 #define FIONREAD_POSSIBLE_P(fd) ((void)(fd),Qtrue)
 #endif
 
-static VALUE io_ready_p _((VALUE io));
-static VALUE io_wait_readable _((int argc, VALUE *argv, VALUE io));
-static VALUE io_wait_writable _((int argc, VALUE *argv, VALUE io));
-void Init_wait _((void));
-
-static struct timeval *
-get_timeout(int argc, VALUE *argv, struct timeval *timerec)
-{
-    VALUE timeout = Qnil;
-    rb_check_arity(argc, 0, 1);
-    if (!argc || NIL_P(timeout = argv[0])) {
-	return NULL;
-    }
-    else {
-	*timerec = rb_time_interval(timeout);
-	return timerec;
-    }
-}
-
-static int
-wait_for_single_fd(rb_io_t *fptr, int events, struct timeval *tv)
-{
-    int i = rb_wait_for_single_fd(fptr->fd, events, tv);
-    if (i < 0)
-	rb_sys_fail(0);
-    rb_io_check_closed(fptr);
-    return (i & events);
-}
-
 /*
  * call-seq:
  *   io.nread -> int
@@ -79,13 +51,12 @@ wait_for_single_fd(rb_io_t *fptr, int events, struct timeval *tv)
 static VALUE
 io_nread(VALUE io)
 {
-    rb_io_t *fptr;
-    int len;
+    rb_io_t *fptr = NULL;
     ioctl_arg n;
 
     GetOpenFile(io, fptr);
     rb_io_check_readable(fptr);
-    len = rb_io_read_pending(fptr);
+    int len = rb_io_read_pending(fptr);
     if (len > 0) return INT2FIX(len);
     if (!FIONREAD_POSSIBLE_P(fptr->fd)) return INT2FIX(0);
     if (ioctl(fptr->fd, FIONREAD, &n)) return INT2FIX(0);
@@ -93,77 +64,114 @@ io_nread(VALUE io)
     return INT2FIX(0);
 }
 
+static VALUE
+io_wait_event(VALUE io, int event, VALUE timeout)
+{
+    VALUE result = rb_io_wait(io, RB_INT2NUM(event), timeout);
+
+    if (!RB_TEST(result)) {
+	return Qnil;
+    }
+
+    int mask = RB_NUM2INT(result);
+
+    if (mask & event) {
+	return io;
+    }
+    else {
+	return Qfalse;
+    }
+}
+
 /*
  * call-seq:
- *   io.ready? -> true, false or nil
+ *   io.ready? -> true or false
  *
- * Returns true if input available without blocking, or false.
- * Returns nil if no information available.
+ * Returns +true+ if input available without blocking, or +false+.
  */
 
 static VALUE
 io_ready_p(VALUE io)
 {
     rb_io_t *fptr;
-    struct timeval tv = {0, 0};
 
     GetOpenFile(io, fptr);
     rb_io_check_readable(fptr);
     if (rb_io_read_pending(fptr)) return Qtrue;
-    if (wait_for_single_fd(fptr, RB_WAITFD_IN, &tv))
-	return Qtrue;
-    return Qfalse;
+
+    return io_wait_event(io, RUBY_IO_READABLE, RB_INT2NUM(0));
 }
 
 /*
  * call-seq:
- *   io.wait_readable          -> IO, true or nil
- *   io.wait_readable(timeout) -> IO, true or nil
+ *   io.wait_readable          -> true or false
+ *   io.wait_readable(timeout) -> true or false
  *
- * Waits until IO is readable without blocking and returns +self+, or
- * +nil+ when times out.
+ * Waits until IO is readable and returns +true+, or
+ * +false+ when times out.
  * Returns +true+ immediately when buffered data is available.
  */
 
 static VALUE
 io_wait_readable(int argc, VALUE *argv, VALUE io)
 {
-    rb_io_t *fptr;
-    struct timeval timerec;
-    struct timeval *tv;
+    rb_io_t *fptr = NULL;
 
-    GetOpenFile(io, fptr);
+    RB_IO_POINTER(io, fptr);
     rb_io_check_readable(fptr);
-    tv = get_timeout(argc, argv, &timerec);
+
     if (rb_io_read_pending(fptr)) return Qtrue;
-    if (wait_for_single_fd(fptr, RB_WAITFD_IN, tv)) {
-	return io;
-    }
-    return Qnil;
+
+    rb_check_arity(argc, 0, 1);
+    VALUE timeout = (argc == 1 ? argv[0] : Qnil);
+
+    return io_wait_event(io, RUBY_IO_READABLE, timeout);
 }
 
 /*
  * call-seq:
- *   io.wait_writable          -> IO
- *   io.wait_writable(timeout) -> IO or nil
+ *   io.wait_writable          -> true or false
+ *   io.wait_writable(timeout) -> true or false
  *
- * Waits until IO is writable without blocking and returns +self+ or
- * +nil+ when times out.
+ * Waits until IO is writable and returns +true+ or
+ * +false+ when times out.
  */
 static VALUE
 io_wait_writable(int argc, VALUE *argv, VALUE io)
 {
-    rb_io_t *fptr;
-    struct timeval timerec;
-    struct timeval *tv;
+    rb_io_t *fptr = NULL;
 
-    GetOpenFile(io, fptr);
+    RB_IO_POINTER(io, fptr);
     rb_io_check_writable(fptr);
-    tv = get_timeout(argc, argv, &timerec);
-    if (wait_for_single_fd(fptr, RB_WAITFD_OUT, tv)) {
-	return io;
-    }
-    return Qnil;
+
+    rb_check_arity(argc, 0, 1);
+    VALUE timeout = (argc == 1 ? argv[0] : Qnil);
+
+    return io_wait_event(io, RUBY_IO_WRITABLE, timeout);
+}
+
+/*
+ * call-seq:
+ *   io.wait_priority          -> true or false
+ *   io.wait_priority(timeout) -> true or false
+ *
+ * Waits until IO is priority and returns +true+ or
+ * +false+ when times out.
+ */
+static VALUE
+io_wait_priority(int argc, VALUE *argv, VALUE io)
+{
+    rb_io_t *fptr = NULL;
+
+    RB_IO_POINTER(io, fptr);
+    rb_io_check_readable(fptr);
+
+    if (rb_io_read_pending(fptr)) return Qtrue;
+
+    rb_check_arity(argc, 0, 1);
+    VALUE timeout = argc == 1 ? argv[0] : Qnil;
+
+    return io_wait_event(io, RUBY_IO_PRIORITY, timeout);
 }
 
 static int
@@ -202,41 +210,60 @@ wait_mode_sym(VALUE mode)
 
 /*
  * call-seq:
- *   io.wait(timeout = nil, mode = :read) -> IO, true or nil
+ *   io.wait(events, timeout) -> event mask or false.
+ *   io.wait(timeout = nil, mode = :read) -> event mask or false.
+ *
+ * Waits until the IO becomes ready for the specified events and returns the
+ * subset of events that become ready, or +false+ when times out.
+ *
+ * The events can be a bit mask of +IO::READABLE+, +IO::WRITABLE+ or
+ * +IO::PRIORITY+.
  *
- * Waits until IO is readable or writable without blocking and returns
- * +self+, or +nil+ when times out.
  * Returns +true+ immediately when buffered data is available.
+ *
  * Optional parameter +mode+ is one of +:read+, +:write+, or
  * +:read_write+.
  */
 
 static VALUE
-io_wait_readwrite(int argc, VALUE *argv, VALUE io)
+io_wait(int argc, VALUE *argv, VALUE io)
 {
-    rb_io_t *fptr;
-    struct timeval timerec;
-    struct timeval *tv = NULL;
-    int event = 0;
-    int i;
+    VALUE timeout = Qundef;
+    rb_io_event_t events = 0;
 
-    GetOpenFile(io, fptr);
-    for (i = 0; i < argc; ++i) {
-	if (SYMBOL_P(argv[i])) {
-	    event |= wait_mode_sym(argv[i]);
+    if (argc != 2 || (RB_SYMBOL_P(argv[0]) || RB_SYMBOL_P(argv[1]))) {
+	for (int i = 0; i < argc; i += 1) {
+	    if (RB_SYMBOL_P(argv[i])) {
+		events |= wait_mode_sym(argv[i]);
+	    }
+	    else if (timeout == Qundef) {
+		rb_time_interval(timeout = argv[i]);
+	    }
+	    else {
+		rb_raise(rb_eArgError, "timeout given more than once");
+	    }
 	}
-	else {
-	    *(tv = &timerec) = rb_time_interval(argv[i]);
+	if (timeout == Qundef) timeout = Qnil;
+    }
+    else /* argc == 2 */ {
+	events = RB_NUM2UINT(argv[0]);
+	timeout = argv[1];
+    }
+
+    if (events == 0) {
+	events = RUBY_IO_READABLE;
+    }
+
+    if (events & RUBY_IO_READABLE) {
+	rb_io_t *fptr = NULL;
+	RB_IO_POINTER(io, fptr);
+
+	if (rb_io_read_pending(fptr)) {
+	    return Qtrue;
 	}
     }
-    /* rb_time_interval() and might_mode() might convert the argument */
-    rb_io_check_closed(fptr);
-    if (!event) event = RB_WAITFD_IN;
-    if ((event & RB_WAITFD_IN) && rb_io_read_pending(fptr))
-	return Qtrue;
-    if (wait_for_single_fd(fptr, event, tv))
-	return io;
-    return Qnil;
+
+    return io_wait_event(io, events, timeout);
 }
 
 /*
@@ -246,9 +273,16 @@ io_wait_readwrite(int argc, VALUE *argv, VALUE io)
 void
 Init_wait(void)
 {
+#ifdef HAVE_RB_EXT_RACTOR_SAFE
+    RB_EXT_RACTOR_SAFE(true);
+#endif
+
     rb_define_method(rb_cIO, "nread", io_nread, 0);
     rb_define_method(rb_cIO, "ready?", io_ready_p, 0);
-    rb_define_method(rb_cIO, "wait", io_wait_readwrite, -1);
+
+    rb_define_method(rb_cIO, "wait", io_wait, -1);
+
     rb_define_method(rb_cIO, "wait_readable", io_wait_readable, -1);
     rb_define_method(rb_cIO, "wait_writable", io_wait_writable, -1);
+    rb_define_method(rb_cIO, "wait_priority", io_wait_priority, -1);
 }
diff --git a/ext/json/VERSION b/ext/json/VERSION
new file mode 100644
index 0000000000..73462a5a13
--- /dev/null
+++ b/ext/json/VERSION
@@ -0,0 +1 @@
+2.5.1
diff --git a/ext/json/depend b/ext/json/depend
new file mode 100644
index 0000000000..0301ce074c
--- /dev/null
+++ b/ext/json/depend
@@ -0,0 +1,2 @@
+# AUTOGENERATED DEPENDENCIES START
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/json/extconf.rb b/ext/json/extconf.rb
index ad1ef9ba82..8a99b6a5c8 100644
--- a/ext/json/extconf.rb
+++ b/ext/json/extconf.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require 'mkmf'
-create_makefile('json')
 
+create_makefile('json')
diff --git a/ext/json/fbuffer/fbuffer.h b/ext/json/fbuffer/fbuffer.h
index 5a0a27cda5..dc8f406b5b 100644
--- a/ext/json/fbuffer/fbuffer.h
+++ b/ext/json/fbuffer/fbuffer.h
@@ -12,9 +12,6 @@
 #define RFLOAT_VALUE(val) (RFLOAT(val)->value)
 #endif
 
-#ifndef RARRAY_PTR
-#define RARRAY_PTR(ARRAY) RARRAY(ARRAY)->ptr
-#endif
 #ifndef RARRAY_LEN
 #define RARRAY_LEN(ARRAY) RARRAY(ARRAY)->len
 #endif
diff --git a/ext/json/generator/depend b/ext/json/generator/depend
index 556259c1c8..89e43dbfab 100644
--- a/ext/json/generator/depend
+++ b/ext/json/generator/depend
@@ -4,19 +4,171 @@ generator.o: generator.c generator.h $(srcdir)/../fbuffer/fbuffer.h
 # AUTOGENERATED DEPENDENCIES START
 generator.o: $(RUBY_EXTCONF_H)
 generator.o: $(arch_hdrdir)/ruby/config.h
+generator.o: $(hdrdir)/ruby.h
+generator.o: $(hdrdir)/ruby/internal/anyargs.h
+generator.o: $(hdrdir)/ruby/internal/arithmetic.h
+generator.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+generator.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+generator.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+generator.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+generator.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+generator.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+generator.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+generator.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+generator.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+generator.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+generator.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+generator.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+generator.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+generator.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+generator.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+generator.o: $(hdrdir)/ruby/internal/assume.h
+generator.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+generator.o: $(hdrdir)/ruby/internal/attr/artificial.h
+generator.o: $(hdrdir)/ruby/internal/attr/cold.h
+generator.o: $(hdrdir)/ruby/internal/attr/const.h
+generator.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+generator.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+generator.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+generator.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+generator.o: $(hdrdir)/ruby/internal/attr/error.h
+generator.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+generator.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+generator.o: $(hdrdir)/ruby/internal/attr/format.h
+generator.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+generator.o: $(hdrdir)/ruby/internal/attr/noalias.h
+generator.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+generator.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+generator.o: $(hdrdir)/ruby/internal/attr/noinline.h
+generator.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+generator.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+generator.o: $(hdrdir)/ruby/internal/attr/pure.h
+generator.o: $(hdrdir)/ruby/internal/attr/restrict.h
+generator.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+generator.o: $(hdrdir)/ruby/internal/attr/warning.h
+generator.o: $(hdrdir)/ruby/internal/attr/weakref.h
+generator.o: $(hdrdir)/ruby/internal/cast.h
+generator.o: $(hdrdir)/ruby/internal/compiler_is.h
+generator.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+generator.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+generator.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+generator.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+generator.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+generator.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+generator.o: $(hdrdir)/ruby/internal/compiler_since.h
+generator.o: $(hdrdir)/ruby/internal/config.h
+generator.o: $(hdrdir)/ruby/internal/constant_p.h
+generator.o: $(hdrdir)/ruby/internal/core.h
+generator.o: $(hdrdir)/ruby/internal/core/rarray.h
+generator.o: $(hdrdir)/ruby/internal/core/rbasic.h
+generator.o: $(hdrdir)/ruby/internal/core/rbignum.h
+generator.o: $(hdrdir)/ruby/internal/core/rclass.h
+generator.o: $(hdrdir)/ruby/internal/core/rdata.h
+generator.o: $(hdrdir)/ruby/internal/core/rfile.h
+generator.o: $(hdrdir)/ruby/internal/core/rhash.h
+generator.o: $(hdrdir)/ruby/internal/core/rmatch.h
+generator.o: $(hdrdir)/ruby/internal/core/robject.h
+generator.o: $(hdrdir)/ruby/internal/core/rregexp.h
+generator.o: $(hdrdir)/ruby/internal/core/rstring.h
+generator.o: $(hdrdir)/ruby/internal/core/rstruct.h
+generator.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+generator.o: $(hdrdir)/ruby/internal/ctype.h
+generator.o: $(hdrdir)/ruby/internal/dllexport.h
+generator.o: $(hdrdir)/ruby/internal/dosish.h
+generator.o: $(hdrdir)/ruby/internal/error.h
+generator.o: $(hdrdir)/ruby/internal/eval.h
+generator.o: $(hdrdir)/ruby/internal/event.h
+generator.o: $(hdrdir)/ruby/internal/fl_type.h
+generator.o: $(hdrdir)/ruby/internal/gc.h
+generator.o: $(hdrdir)/ruby/internal/glob.h
+generator.o: $(hdrdir)/ruby/internal/globals.h
+generator.o: $(hdrdir)/ruby/internal/has/attribute.h
+generator.o: $(hdrdir)/ruby/internal/has/builtin.h
+generator.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+generator.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+generator.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+generator.o: $(hdrdir)/ruby/internal/has/extension.h
+generator.o: $(hdrdir)/ruby/internal/has/feature.h
+generator.o: $(hdrdir)/ruby/internal/has/warning.h
+generator.o: $(hdrdir)/ruby/internal/intern/array.h
+generator.o: $(hdrdir)/ruby/internal/intern/bignum.h
+generator.o: $(hdrdir)/ruby/internal/intern/class.h
+generator.o: $(hdrdir)/ruby/internal/intern/compar.h
+generator.o: $(hdrdir)/ruby/internal/intern/complex.h
+generator.o: $(hdrdir)/ruby/internal/intern/cont.h
+generator.o: $(hdrdir)/ruby/internal/intern/dir.h
+generator.o: $(hdrdir)/ruby/internal/intern/enum.h
+generator.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+generator.o: $(hdrdir)/ruby/internal/intern/error.h
+generator.o: $(hdrdir)/ruby/internal/intern/eval.h
+generator.o: $(hdrdir)/ruby/internal/intern/file.h
+generator.o: $(hdrdir)/ruby/internal/intern/gc.h
+generator.o: $(hdrdir)/ruby/internal/intern/hash.h
+generator.o: $(hdrdir)/ruby/internal/intern/io.h
+generator.o: $(hdrdir)/ruby/internal/intern/load.h
+generator.o: $(hdrdir)/ruby/internal/intern/marshal.h
+generator.o: $(hdrdir)/ruby/internal/intern/numeric.h
+generator.o: $(hdrdir)/ruby/internal/intern/object.h
+generator.o: $(hdrdir)/ruby/internal/intern/parse.h
+generator.o: $(hdrdir)/ruby/internal/intern/proc.h
+generator.o: $(hdrdir)/ruby/internal/intern/process.h
+generator.o: $(hdrdir)/ruby/internal/intern/random.h
+generator.o: $(hdrdir)/ruby/internal/intern/range.h
+generator.o: $(hdrdir)/ruby/internal/intern/rational.h
+generator.o: $(hdrdir)/ruby/internal/intern/re.h
+generator.o: $(hdrdir)/ruby/internal/intern/ruby.h
+generator.o: $(hdrdir)/ruby/internal/intern/select.h
+generator.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+generator.o: $(hdrdir)/ruby/internal/intern/signal.h
+generator.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+generator.o: $(hdrdir)/ruby/internal/intern/string.h
+generator.o: $(hdrdir)/ruby/internal/intern/struct.h
+generator.o: $(hdrdir)/ruby/internal/intern/thread.h
+generator.o: $(hdrdir)/ruby/internal/intern/time.h
+generator.o: $(hdrdir)/ruby/internal/intern/variable.h
+generator.o: $(hdrdir)/ruby/internal/intern/vm.h
+generator.o: $(hdrdir)/ruby/internal/interpreter.h
+generator.o: $(hdrdir)/ruby/internal/iterator.h
+generator.o: $(hdrdir)/ruby/internal/memory.h
+generator.o: $(hdrdir)/ruby/internal/method.h
+generator.o: $(hdrdir)/ruby/internal/module.h
+generator.o: $(hdrdir)/ruby/internal/newobj.h
+generator.o: $(hdrdir)/ruby/internal/rgengc.h
+generator.o: $(hdrdir)/ruby/internal/scan_args.h
+generator.o: $(hdrdir)/ruby/internal/special_consts.h
+generator.o: $(hdrdir)/ruby/internal/static_assert.h
+generator.o: $(hdrdir)/ruby/internal/stdalign.h
+generator.o: $(hdrdir)/ruby/internal/stdbool.h
+generator.o: $(hdrdir)/ruby/internal/symbol.h
+generator.o: $(hdrdir)/ruby/internal/token_paste.h
+generator.o: $(hdrdir)/ruby/internal/value.h
+generator.o: $(hdrdir)/ruby/internal/value_type.h
+generator.o: $(hdrdir)/ruby/internal/variable.h
+generator.o: $(hdrdir)/ruby/internal/warning_push.h
+generator.o: $(hdrdir)/ruby/internal/xmalloc.h
+generator.o: $(hdrdir)/ruby/assert.h
 generator.o: $(hdrdir)/ruby/backward.h
+generator.o: $(hdrdir)/ruby/backward/2/assume.h
+generator.o: $(hdrdir)/ruby/backward/2/attributes.h
+generator.o: $(hdrdir)/ruby/backward/2/bool.h
+generator.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+generator.o: $(hdrdir)/ruby/backward/2/inttypes.h
+generator.o: $(hdrdir)/ruby/backward/2/limits.h
+generator.o: $(hdrdir)/ruby/backward/2/long_long.h
+generator.o: $(hdrdir)/ruby/backward/2/stdalign.h
+generator.o: $(hdrdir)/ruby/backward/2/stdarg.h
 generator.o: $(hdrdir)/ruby/defines.h
 generator.o: $(hdrdir)/ruby/encoding.h
 generator.o: $(hdrdir)/ruby/intern.h
 generator.o: $(hdrdir)/ruby/missing.h
+generator.o: $(hdrdir)/ruby/onigmo.h
 generator.o: $(hdrdir)/ruby/oniguruma.h
 generator.o: $(hdrdir)/ruby/re.h
 generator.o: $(hdrdir)/ruby/regex.h
 generator.o: $(hdrdir)/ruby/ruby.h
 generator.o: $(hdrdir)/ruby/st.h
 generator.o: $(hdrdir)/ruby/subst.h
-generator.o: $(top_srcdir)/ext/json/fbuffer/fbuffer.h
-generator.o: $(top_srcdir)/include/ruby.h
+generator.o: $(srcdir)/../fbuffer/fbuffer.h
 generator.o: generator.c
 generator.o: generator.h
 # AUTOGENERATED DEPENDENCIES END
diff --git a/ext/json/generator/extconf.rb b/ext/json/generator/extconf.rb
index fd5c4a7f49..8627c5f4bd 100644
--- a/ext/json/generator/extconf.rb
+++ b/ext/json/generator/extconf.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require 'mkmf'
 
 $defs << "-DJSON_GENERATOR"
diff --git a/ext/json/generator/generator.c b/ext/json/generator/generator.c
index faa4fdf011..407c1af4a6 100644
--- a/ext/json/generator/generator.c
+++ b/ext/json/generator/generator.c
@@ -15,14 +15,13 @@ static VALUE mJSON, mExt, mGenerator, cState, mGeneratorMethods, mObject,
 #endif
              mFloat, mString, mString_Extend,
              mTrueClass, mFalseClass, mNilClass, eGeneratorError,
-             eNestingError, CRegexp_MULTILINE, CJSON_SAFE_STATE_PROTOTYPE,
-             i_SAFE_STATE_PROTOTYPE;
+             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_max_nesting, i_allow_nan, i_ascii_only,
-          i_quirks_mode, i_pack, i_unpack, i_create_id, i_extend, i_key_p,
+          i_pack, i_unpack, i_create_id, i_extend, i_key_p,
           i_aref, i_send, i_respond_to_p, i_match, i_keys, i_depth,
-          i_buffer_initial_length, i_dup;
+          i_buffer_initial_length, i_dup, i_escape_slash;
 
 /*
  * Copyright 2001-2004 Unicode, Inc.
@@ -130,7 +129,7 @@ static void unicode_escape_to_buffer(FBuffer *buffer, char buf[6], UTF16
 
 /* Converts string to a JSON string in FBuffer buffer, where all but the ASCII
  * and control characters are JSON escaped. */
-static void convert_UTF8_to_JSON_ASCII(FBuffer *buffer, VALUE string)
+static void convert_UTF8_to_JSON_ASCII(FBuffer *buffer, VALUE string, char escape_slash)
 {
     const UTF8 *source = (UTF8 *) RSTRING_PTR(string);
     const UTF8 *sourceEnd = source + RSTRING_LEN(string);
@@ -180,6 +179,11 @@ static void convert_UTF8_to_JSON_ASCII(FBuffer *buffer, VALUE string)
                         case '"':
                             fbuffer_append(buffer, "\\\"", 2);
                             break;
+                        case '/':
+                            if(escape_slash) {
+                                fbuffer_append(buffer, "\\/", 2);
+                                break;
+                            }
                         default:
                             fbuffer_append_char(buffer, (char)ch);
                             break;
@@ -222,13 +226,14 @@ static void convert_UTF8_to_JSON_ASCII(FBuffer *buffer, VALUE string)
             unicode_escape_to_buffer(buffer, buf, (UTF16)((ch & halfMask) + UNI_SUR_LOW_START));
         }
     }
+    RB_GC_GUARD(string);
 }
 
 /* Converts string to a JSON string in FBuffer buffer, where only the
  * characters required by the JSON standard are JSON escaped. The remaining
  * characters (should be UTF8) are just passed through and appended to the
  * result. */
-static void convert_UTF8_to_JSON(FBuffer *buffer, VALUE string)
+static void convert_UTF8_to_JSON(FBuffer *buffer, VALUE string, char escape_slash)
 {
     const char *ptr = RSTRING_PTR(string), *p;
     unsigned long len = RSTRING_LEN(string), start = 0, end = 0;
@@ -236,6 +241,7 @@ static void convert_UTF8_to_JSON(FBuffer *buffer, VALUE string)
     int escape_len;
     unsigned char c;
     char buf[6] = { '\\', 'u' };
+    int ascii_only = rb_enc_str_asciionly_p(string);
 
     for (start = 0, end = 0; end < len;) {
         p = ptr + end;
@@ -278,16 +284,25 @@ static void convert_UTF8_to_JSON(FBuffer *buffer, VALUE string)
                     escape =  "\\\"";
                     escape_len = 2;
                     break;
+                case '/':
+                    if(escape_slash) {
+                        escape = "\\/";
+                        escape_len = 2;
+                        break;
+                    }
                 default:
                     {
-                        unsigned short clen = trailingBytesForUTF8[c] + 1;
-                        if (end + clen > len) {
-                            rb_raise(rb_path2class("JSON::GeneratorError"),
-                                    "partial character in source, but hit end");
-                        }
-                        if (!isLegalUTF8((UTF8 *) p, clen)) {
-                            rb_raise(rb_path2class("JSON::GeneratorError"),
-                                    "source sequence is illegal/malformed utf-8");
+                        unsigned short clen = 1;
+                        if (!ascii_only) {
+                            clen += trailingBytesForUTF8[c];
+                            if (end + clen > len) {
+                                rb_raise(rb_path2class("JSON::GeneratorError"),
+                                        "partial character in source, but hit end");
+                            }
+                            if (!isLegalUTF8((UTF8 *) p, clen)) {
+                                rb_raise(rb_path2class("JSON::GeneratorError"),
+                                        "source sequence is illegal/malformed utf-8");
+                            }
                         }
                         end += clen;
                     }
@@ -307,7 +322,7 @@ static char *fstrndup(const char *ptr, unsigned long len) {
   char *result;
   if (len <= 0) return NULL;
   result = ALLOC_N(char, len);
-  memccpy(result, ptr, 0, len);
+  memcpy(result, ptr, len);
   return result;
 }
 
@@ -323,6 +338,76 @@ static char *fstrndup(const char *ptr, unsigned long len) {
  *
  */
 
+/* Explanation of the following: that's the only way to not pollute
+ * standard library's docs with GeneratorMethods::<ClassName> which
+ * are uninformative and take a large place in a list of classes
+ */
+
+/*
+ * Document-module: JSON::Ext::Generator::GeneratorMethods
+ * :nodoc:
+ */
+
+/*
+ * Document-module: JSON::Ext::Generator::GeneratorMethods::Array
+ * :nodoc:
+ */
+
+/*
+ * Document-module: JSON::Ext::Generator::GeneratorMethods::Bignum
+ * :nodoc:
+ */
+
+/*
+ * Document-module: JSON::Ext::Generator::GeneratorMethods::FalseClass
+ * :nodoc:
+ */
+
+/*
+ * Document-module: JSON::Ext::Generator::GeneratorMethods::Fixnum
+ * :nodoc:
+ */
+
+/*
+ * Document-module: JSON::Ext::Generator::GeneratorMethods::Float
+ * :nodoc:
+ */
+
+/*
+ * Document-module: JSON::Ext::Generator::GeneratorMethods::Hash
+ * :nodoc:
+ */
+
+/*
+ * Document-module: JSON::Ext::Generator::GeneratorMethods::Integer
+ * :nodoc:
+ */
+
+/*
+ * Document-module: JSON::Ext::Generator::GeneratorMethods::NilClass
+ * :nodoc:
+ */
+
+/*
+ * Document-module: JSON::Ext::Generator::GeneratorMethods::Object
+ * :nodoc:
+ */
+
+/*
+ * Document-module: JSON::Ext::Generator::GeneratorMethods::String
+ * :nodoc:
+ */
+
+/*
+ * Document-module: JSON::Ext::Generator::GeneratorMethods::String::Extend
+ * :nodoc:
+ */
+
+/*
+ * Document-module: JSON::Ext::Generator::GeneratorMethods::TrueClass
+ * :nodoc:
+ */
+
 /*
  * call-seq: to_json(state = nil)
  *
@@ -534,13 +619,18 @@ static size_t State_memsize(const void *ptr)
     return size;
 }
 
+#ifndef HAVE_RB_EXT_RACTOR_SAFE
+#   undef RUBY_TYPED_FROZEN_SHAREABLE
+#   define RUBY_TYPED_FROZEN_SHAREABLE 0
+#endif
+
 #ifdef NEW_TYPEDDATA_WRAPPER
 static const rb_data_type_t JSON_Generator_State_type = {
     "JSON/Generator/State",
     {NULL, State_free, State_memsize,},
 #ifdef RUBY_TYPED_FREE_IMMEDIATELY
     0, 0,
-    RUBY_TYPED_FREE_IMMEDIATELY,
+    RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_FROZEN_SHAREABLE,
 #endif
 };
 #endif
@@ -641,8 +731,8 @@ static VALUE cState_configure(VALUE self, VALUE opts)
     state->allow_nan = RTEST(tmp);
     tmp = rb_hash_aref(opts, ID2SYM(i_ascii_only));
     state->ascii_only = RTEST(tmp);
-    tmp = rb_hash_aref(opts, ID2SYM(i_quirks_mode));
-    state->quirks_mode = RTEST(tmp);
+    tmp = rb_hash_aref(opts, ID2SYM(i_escape_slash));
+    state->escape_slash = RTEST(tmp);
     return self;
 }
 
@@ -676,8 +766,8 @@ static VALUE cState_to_h(VALUE self)
     rb_hash_aset(result, ID2SYM(i_array_nl), rb_str_new(state->array_nl, state->array_nl_len));
     rb_hash_aset(result, ID2SYM(i_allow_nan), state->allow_nan ? Qtrue : Qfalse);
     rb_hash_aset(result, ID2SYM(i_ascii_only), state->ascii_only ? Qtrue : Qfalse);
-    rb_hash_aset(result, ID2SYM(i_quirks_mode), state->quirks_mode ? Qtrue : Qfalse);
     rb_hash_aset(result, ID2SYM(i_max_nesting), LONG2FIX(state->max_nesting));
+    rb_hash_aset(result, ID2SYM(i_escape_slash), state->escape_slash ? Qtrue : Qfalse);
     rb_hash_aset(result, ID2SYM(i_depth), LONG2FIX(state->depth));
     rb_hash_aset(result, ID2SYM(i_buffer_initial_length), LONG2FIX(state->buffer_initial_length));
     return result;
@@ -694,7 +784,7 @@ static VALUE cState_aref(VALUE self, VALUE name)
     if (RTEST(rb_funcall(self, i_respond_to_p, 1, name))) {
         return rb_funcall(self, i_send, 1, name);
     } else {
-        return rb_ivar_get(self, rb_intern_str(rb_str_concat(rb_str_new2("@"), name)));
+        return rb_attr_get(self, rb_intern_str(rb_str_concat(rb_str_new2("@"), name)));
     }
 }
 
@@ -717,43 +807,83 @@ static VALUE cState_aset(VALUE self, VALUE name, VALUE value)
     return Qnil;
 }
 
-static void generate_json_object(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj)
+struct hash_foreach_arg {
+    FBuffer *buffer;
+    JSON_Generator_State *state;
+    VALUE Vstate;
+    int iter;
+};
+
+static int
+json_object_i(VALUE key, VALUE val, VALUE _arg)
 {
+    struct hash_foreach_arg *arg = (struct hash_foreach_arg *)_arg;
+    FBuffer *buffer = arg->buffer;
+    JSON_Generator_State *state = arg->state;
+    VALUE Vstate = arg->Vstate;
+
     char *object_nl = state->object_nl;
     long object_nl_len = state->object_nl_len;
     char *indent = state->indent;
     long indent_len = state->indent_len;
-    long max_nesting = state->max_nesting;
     char *delim = FBUFFER_PTR(state->object_delim);
     long delim_len = FBUFFER_LEN(state->object_delim);
     char *delim2 = FBUFFER_PTR(state->object_delim2);
     long delim2_len = FBUFFER_LEN(state->object_delim2);
+    long depth = state->depth;
+    int j;
+    VALUE klass, key_to_s;
+
+    if (arg->iter > 0) fbuffer_append(buffer, delim, delim_len);
+    if (object_nl) {
+        fbuffer_append(buffer, object_nl, object_nl_len);
+    }
+    if (indent) {
+        for (j = 0; j < depth; j++) {
+            fbuffer_append(buffer, indent, indent_len);
+        }
+    }
+
+    klass = CLASS_OF(key);
+    if (klass == rb_cString) {
+        key_to_s = key;
+    } else if (klass == rb_cSymbol) {
+        key_to_s = rb_id2str(SYM2ID(key));
+    } else {
+        key_to_s = rb_funcall(key, i_to_s, 0);
+    }
+    Check_Type(key_to_s, T_STRING);
+    generate_json(buffer, Vstate, state, key_to_s);
+    fbuffer_append(buffer, delim2, delim2_len);
+    generate_json(buffer, Vstate, state, val);
+
+    arg->iter++;
+    return ST_CONTINUE;
+}
+
+static void generate_json_object(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj)
+{
+    char *object_nl = state->object_nl;
+    long object_nl_len = state->object_nl_len;
+    char *indent = state->indent;
+    long indent_len = state->indent_len;
+    long max_nesting = state->max_nesting;
     long depth = ++state->depth;
-    int i, j;
-    VALUE key, key_to_s, keys;
+    int j;
+    struct hash_foreach_arg arg;
+
     if (max_nesting != 0 && depth > max_nesting) {
         fbuffer_free(buffer);
         rb_raise(eNestingError, "nesting of %ld is too deep", --state->depth);
     }
     fbuffer_append_char(buffer, '{');
-    keys = rb_funcall(obj, i_keys, 0);
-    for(i = 0; i < RARRAY_LEN(keys); i++) {
-        if (i > 0) fbuffer_append(buffer, delim, delim_len);
-        if (object_nl) {
-            fbuffer_append(buffer, object_nl, object_nl_len);
-        }
-        if (indent) {
-            for (j = 0; j < depth; j++) {
-                fbuffer_append(buffer, indent, indent_len);
-            }
-        }
-        key = rb_ary_entry(keys, i);
-        key_to_s = rb_funcall(key, i_to_s, 0);
-        Check_Type(key_to_s, T_STRING);
-        generate_json(buffer, Vstate, state, key_to_s);
-        fbuffer_append(buffer, delim2, delim2_len);
-        generate_json(buffer, Vstate, state, rb_hash_aref(obj, key));
-    }
+
+    arg.buffer = buffer;
+    arg.state = state;
+    arg.Vstate = Vstate;
+    arg.iter = 0;
+    rb_hash_foreach(obj, json_object_i, (VALUE)&arg);
+
     depth = --state->depth;
     if (object_nl) {
         fbuffer_append(buffer, object_nl, object_nl_len);
@@ -804,16 +934,27 @@ static void generate_json_array(FBuffer *buffer, VALUE Vstate, JSON_Generator_St
     fbuffer_append_char(buffer, ']');
 }
 
+#ifdef HAVE_RUBY_ENCODING_H
+static int enc_utf8_compatible_p(rb_encoding *enc)
+{
+    if (enc == rb_usascii_encoding()) return 1;
+    if (enc == rb_utf8_encoding()) return 1;
+    return 0;
+}
+#endif
+
 static void generate_json_string(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj)
 {
     fbuffer_append_char(buffer, '"');
 #ifdef HAVE_RUBY_ENCODING_H
-    obj = rb_funcall(obj, i_encode, 1, CEncoding_UTF_8);
+    if (!enc_utf8_compatible_p(rb_enc_get(obj))) {
+        obj = rb_str_encode(obj, CEncoding_UTF_8, 0, Qnil);
+    }
 #endif
     if (state->ascii_only) {
-        convert_UTF8_to_JSON_ASCII(buffer, obj);
+        convert_UTF8_to_JSON_ASCII(buffer, obj, state->escape_slash);
     } else {
-        convert_UTF8_to_JSON(buffer, obj);
+        convert_UTF8_to_JSON(buffer, obj, state->escape_slash);
     }
     fbuffer_append_char(buffer, '"');
 }
@@ -853,7 +994,6 @@ static void generate_json_integer(FBuffer *buffer, VALUE Vstate, JSON_Generator_
         generate_json_bignum(buffer, Vstate, state, obj);
 }
 #endif
-
 static void generate_json_float(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj)
 {
     double value = RFLOAT_VALUE(obj);
@@ -944,21 +1084,6 @@ static VALUE cState_partial_generate(VALUE self, VALUE obj)
 }
 
 /*
- * This function returns true if string is either a JSON array or JSON object.
- * It might suffer from false positives, e. g. syntactically incorrect JSON in
- * the string or certain UTF-8 characters on the right hand side.
- */
-static int isArrayOrObject(VALUE string)
-{
-    long string_len = RSTRING_LEN(string);
-    char *p = RSTRING_PTR(string), *q = p + string_len - 1;
-    if (string_len < 2) return 0;
-    for (; p < q && isspace((unsigned char)*p); p++);
-    for (; q > p && isspace((unsigned char)*q); q--);
-    return (*p == '[' && *q == ']') || (*p == '{' && *q == '}');
-}
-
-/*
  * call-seq: generate(obj)
  *
  * Generates a valid JSON document from object +obj+ and returns the
@@ -969,9 +1094,7 @@ static VALUE cState_generate(VALUE self, VALUE obj)
 {
     VALUE result = cState_partial_generate(self, obj);
     GET_STATE(self);
-    if (!state->quirks_mode && !isArrayOrObject(result)) {
-        rb_raise(eGeneratorError, "only generation of JSON objects or arrays allowed");
-    }
+    (void)state;
     return result;
 }
 
@@ -990,8 +1113,8 @@ static VALUE cState_generate(VALUE self, VALUE obj)
  * * *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.
- * * *quirks_mode*: Enables quirks_mode for parser, that is for example
- *   generating single JSON values instead of documents is possible.
+ * * *ascii_only*: true if only ASCII characters should be generated. This
+ *   option defaults to false.
  * * *buffer_initial_length*: sets the initial length of the generator's
  *   internal buffer.
  */
@@ -1047,10 +1170,7 @@ static VALUE cState_from_state_s(VALUE self, VALUE opts)
     } else if (rb_obj_is_kind_of(opts, rb_cHash)) {
         return rb_funcall(self, i_new, 1, opts);
     } else {
-        if (NIL_P(CJSON_SAFE_STATE_PROTOTYPE)) {
-            CJSON_SAFE_STATE_PROTOTYPE = rb_const_get(mJSON, i_SAFE_STATE_PROTOTYPE);
-        }
-        return rb_funcall(CJSON_SAFE_STATE_PROTOTYPE, i_dup, 0);
+        return rb_class_new_instance(0, NULL, cState);
     }
 }
 
@@ -1084,7 +1204,7 @@ static VALUE cState_indent_set(VALUE self, VALUE indent)
         }
     } else {
         if (state->indent) ruby_xfree(state->indent);
-        state->indent = strdup(RSTRING_PTR(indent));
+        state->indent = fstrndup(RSTRING_PTR(indent), len);
         state->indent_len = len;
     }
     return Qnil;
@@ -1122,7 +1242,7 @@ static VALUE cState_space_set(VALUE self, VALUE space)
         }
     } else {
         if (state->space) ruby_xfree(state->space);
-        state->space = strdup(RSTRING_PTR(space));
+        state->space = fstrndup(RSTRING_PTR(space), len);
         state->space_len = len;
     }
     return Qnil;
@@ -1158,7 +1278,7 @@ static VALUE cState_space_before_set(VALUE self, VALUE space_before)
         }
     } else {
         if (state->space_before) ruby_xfree(state->space_before);
-        state->space_before = strdup(RSTRING_PTR(space_before));
+        state->space_before = fstrndup(RSTRING_PTR(space_before), len);
         state->space_before_len = len;
     }
     return Qnil;
@@ -1195,7 +1315,7 @@ static VALUE cState_object_nl_set(VALUE self, VALUE object_nl)
         }
     } else {
         if (state->object_nl) ruby_xfree(state->object_nl);
-        state->object_nl = strdup(RSTRING_PTR(object_nl));
+        state->object_nl = fstrndup(RSTRING_PTR(object_nl), len);
         state->object_nl_len = len;
     }
     return Qnil;
@@ -1230,7 +1350,7 @@ static VALUE cState_array_nl_set(VALUE self, VALUE array_nl)
         }
     } else {
         if (state->array_nl) ruby_xfree(state->array_nl);
-        state->array_nl = strdup(RSTRING_PTR(array_nl));
+        state->array_nl = fstrndup(RSTRING_PTR(array_nl), len);
         state->array_nl_len = len;
     }
     return Qnil;
@@ -1275,50 +1395,52 @@ static VALUE cState_max_nesting_set(VALUE self, VALUE depth)
 }
 
 /*
- * call-seq: allow_nan?
+ * call-seq: escape_slash
  *
- * Returns true, if NaN, Infinity, and -Infinity should be generated, otherwise
- * returns false.
+ * If this boolean is true, the forward slashes will be escaped in
+ * the json output.
  */
-static VALUE cState_allow_nan_p(VALUE self)
+static VALUE cState_escape_slash(VALUE self)
 {
     GET_STATE(self);
-    return state->allow_nan ? Qtrue : Qfalse;
+    return state->escape_slash ? Qtrue : Qfalse;
 }
 
 /*
- * call-seq: ascii_only?
+ * call-seq: escape_slash=(depth)
  *
- * Returns true, if NaN, Infinity, and -Infinity should be generated, otherwise
- * returns false.
+ * This sets whether or not the forward slashes will be escaped in
+ * the json output.
  */
-static VALUE cState_ascii_only_p(VALUE self)
+static VALUE cState_escape_slash_set(VALUE self, VALUE enable)
 {
     GET_STATE(self);
-    return state->ascii_only ? Qtrue : Qfalse;
+    state->escape_slash = RTEST(enable);
+    return Qnil;
 }
 
 /*
- * call-seq: quirks_mode?
+ * call-seq: allow_nan?
  *
- * Returns true, if quirks mode is enabled. Otherwise returns false.
+ * Returns true, if NaN, Infinity, and -Infinity should be generated, otherwise
+ * returns false.
  */
-static VALUE cState_quirks_mode_p(VALUE self)
+static VALUE cState_allow_nan_p(VALUE self)
 {
     GET_STATE(self);
-    return state->quirks_mode ? Qtrue : Qfalse;
+    return state->allow_nan ? Qtrue : Qfalse;
 }
 
 /*
- * call-seq: quirks_mode=(enable)
+ * call-seq: ascii_only?
  *
- * If set to true, enables the quirks_mode mode.
+ * Returns true, if only ASCII characters should be generated. Otherwise
+ * returns false.
  */
-static VALUE cState_quirks_mode_set(VALUE self, VALUE enable)
+static VALUE cState_ascii_only_p(VALUE self)
 {
     GET_STATE(self);
-    state->quirks_mode = RTEST(enable);
-    return Qnil;
+    return state->ascii_only ? Qtrue : Qfalse;
 }
 
 /*
@@ -1380,6 +1502,11 @@ static VALUE cState_buffer_initial_length_set(VALUE self, VALUE buffer_initial_l
  */
 void Init_generator(void)
 {
+#ifdef HAVE_RB_EXT_RACTOR_SAFE
+    rb_ext_ractor_safe(true);
+#endif
+
+#undef rb_intern
     rb_require("json/common");
 
     mJSON = rb_define_module("JSON");
@@ -1388,6 +1515,8 @@ void Init_generator(void)
 
     eGeneratorError = rb_path2class("JSON::GeneratorError");
     eNestingError = rb_path2class("JSON::NestingError");
+    rb_gc_register_mark_object(eGeneratorError);
+    rb_gc_register_mark_object(eNestingError);
 
     cState = rb_define_class_under(mGenerator, "State", rb_cObject);
     rb_define_alloc_func(cState, cState_s_allocate);
@@ -1406,12 +1535,12 @@ void Init_generator(void)
     rb_define_method(cState, "array_nl=", cState_array_nl_set, 1);
     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, "escape_slash", cState_escape_slash, 0);
+    rb_define_method(cState, "escape_slash?", cState_escape_slash, 0);
+    rb_define_method(cState, "escape_slash=", cState_escape_slash_set, 1);
     rb_define_method(cState, "check_circular?", cState_check_circular_p, 0);
     rb_define_method(cState, "allow_nan?", cState_allow_nan_p, 0);
     rb_define_method(cState, "ascii_only?", cState_ascii_only_p, 0);
-    rb_define_method(cState, "quirks_mode?", cState_quirks_mode_p, 0);
-    rb_define_method(cState, "quirks_mode", cState_quirks_mode_p, 0);
-    rb_define_method(cState, "quirks_mode=", cState_quirks_mode_set, 1);
     rb_define_method(cState, "depth", cState_depth, 0);
     rb_define_method(cState, "depth=", cState_depth_set, 1);
     rb_define_method(cState, "buffer_initial_length", cState_buffer_initial_length, 0);
@@ -1456,7 +1585,6 @@ void Init_generator(void)
     mNilClass = rb_define_module_under(mGeneratorMethods, "NilClass");
     rb_define_method(mNilClass, "to_json", mNilClass_to_json, -1);
 
-    CRegexp_MULTILINE = rb_const_get(rb_cRegexp, rb_intern("MULTILINE"));
     i_to_s = rb_intern("to_s");
     i_to_json = rb_intern("to_json");
     i_new = rb_intern("new");
@@ -1466,9 +1594,9 @@ void Init_generator(void)
     i_object_nl = rb_intern("object_nl");
     i_array_nl = rb_intern("array_nl");
     i_max_nesting = rb_intern("max_nesting");
+    i_escape_slash = rb_intern("escape_slash");
     i_allow_nan = rb_intern("allow_nan");
     i_ascii_only = rb_intern("ascii_only");
-    i_quirks_mode = rb_intern("quirks_mode");
     i_depth = rb_intern("depth");
     i_buffer_initial_length = rb_intern("buffer_initial_length");
     i_pack = rb_intern("pack");
@@ -1487,6 +1615,4 @@ void Init_generator(void)
     i_encoding = rb_intern("encoding");
     i_encode = rb_intern("encode");
 #endif
-    i_SAFE_STATE_PROTOTYPE = rb_intern("SAFE_STATE_PROTOTYPE");
-    CJSON_SAFE_STATE_PROTOTYPE = Qnil;
 }
diff --git a/ext/json/generator/generator.h b/ext/json/generator/generator.h
index eb4557ff55..3ebd622554 100644
--- a/ext/json/generator/generator.h
+++ b/ext/json/generator/generator.h
@@ -1,7 +1,6 @@
 #ifndef _GENERATOR_H_
 #define _GENERATOR_H_
 
-#include <string.h>
 #include <math.h>
 #include <ctype.h>
 
@@ -50,8 +49,8 @@ static const UTF32 halfMask = 0x3FFUL;
 static unsigned char isLegalUTF8(const UTF8 *source, unsigned long length);
 static void unicode_escape(char *buf, UTF16 character);
 static void unicode_escape_to_buffer(FBuffer *buffer, char buf[6], UTF16 character);
-static void convert_UTF8_to_JSON_ASCII(FBuffer *buffer, VALUE string);
-static void convert_UTF8_to_JSON(FBuffer *buffer, VALUE string);
+static void convert_UTF8_to_JSON_ASCII(FBuffer *buffer, VALUE string, char escape_slash);
+static void convert_UTF8_to_JSON(FBuffer *buffer, VALUE string, char escape_slash);
 static char *fstrndup(const char *ptr, unsigned long len);
 
 /* ruby api and some helpers */
@@ -73,7 +72,7 @@ typedef struct JSON_Generator_StateStruct {
     long max_nesting;
     char allow_nan;
     char ascii_only;
-    char quirks_mode;
+    char escape_slash;
     long depth;
     long buffer_initial_length;
 } JSON_Generator_State;
@@ -152,6 +151,8 @@ static VALUE cState_allow_nan_p(VALUE self);
 static VALUE cState_ascii_only_p(VALUE self);
 static VALUE cState_depth(VALUE self);
 static VALUE cState_depth_set(VALUE self, VALUE depth);
+static VALUE cState_escape_slash(VALUE self);
+static VALUE cState_escape_slash_set(VALUE self, VALUE depth);
 static FBuffer *cState_prepare_buffer(VALUE self);
 #ifndef ZALLOC
 #define ZALLOC(type) ((type *)ruby_zalloc(sizeof(type)))
diff --git a/ext/json/json.gemspec b/ext/json/json.gemspec
index 9fb6fa155a..d5f0a4de1d 100644
--- a/ext/json/json.gemspec
+++ b/ext/json/json.gemspec
@@ -1,7 +1,73 @@
+# -*- encoding: utf-8 -*-
+
 Gem::Specification.new do |s|
   s.name = "json"
-  s.version = "1.8.3"
-  s.summary = "This json is bundled with Ruby"
-  s.executables = []
-  s.files = ["json.rb", "json/add/bigdecimal.rb", "json/add/complex.rb", "json/add/core.rb", "json/add/date.rb", "json/add/date_time.rb", "json/add/exception.rb", "json/add/ostruct.rb", "json/add/range.rb", "json/add/rational.rb", "json/add/regexp.rb", "json/add/struct.rb", "json/add/symbol.rb", "json/add/time.rb", "json/common.rb", "json/ext.rb", "json/ext/generator.bundle", "json/ext/parser.bundle", "json/generic_object.rb", "json/version.rb"]
+  s.version = File.read(File.expand_path('../VERSION', __FILE__)).chomp
+
+  s.summary = "JSON Implementation for Ruby"
+  s.description = "This is a JSON implementation as a Ruby extension in C."
+  s.licenses = ["Ruby"]
+  s.authors = ["Florian Frank"]
+  s.email = "flori@ping.de"
+
+  s.extensions = ["ext/json/ext/generator/extconf.rb", "ext/json/ext/parser/extconf.rb", "ext/json/extconf.rb"]
+  s.extra_rdoc_files = ["README.md"]
+  s.rdoc_options = ["--title", "JSON implementation for Ruby", "--main", "README.md"]
+  s.files = [
+    "CHANGES.md",
+    "Gemfile",
+    "LICENSE",
+    "README.md",
+    "VERSION",
+    "ext/json/ext/fbuffer/fbuffer.h",
+    "ext/json/ext/generator/depend",
+    "ext/json/ext/generator/extconf.rb",
+    "ext/json/ext/generator/generator.c",
+    "ext/json/ext/generator/generator.h",
+    "ext/json/ext/parser/depend",
+    "ext/json/ext/parser/extconf.rb",
+    "ext/json/ext/parser/parser.c",
+    "ext/json/ext/parser/parser.h",
+    "ext/json/ext/parser/parser.rl",
+    "ext/json/extconf.rb",
+    "json.gemspec",
+    "lib/json.rb",
+    "lib/json/add/bigdecimal.rb",
+    "lib/json/add/complex.rb",
+    "lib/json/add/core.rb",
+    "lib/json/add/date.rb",
+    "lib/json/add/date_time.rb",
+    "lib/json/add/exception.rb",
+    "lib/json/add/ostruct.rb",
+    "lib/json/add/range.rb",
+    "lib/json/add/rational.rb",
+    "lib/json/add/regexp.rb",
+    "lib/json/add/set.rb",
+    "lib/json/add/struct.rb",
+    "lib/json/add/symbol.rb",
+    "lib/json/add/time.rb",
+    "lib/json/common.rb",
+    "lib/json/ext.rb",
+    "lib/json/ext/.keep",
+    "lib/json/generic_object.rb",
+    "lib/json/pure.rb",
+    "lib/json/pure/generator.rb",
+    "lib/json/pure/parser.rb",
+    "lib/json/version.rb",
+  ] + Dir["tests/**/*"]
+  s.homepage = "http://flori.github.com/json"
+  s.metadata = {
+    'bug_tracker_uri'   => 'https://github.com/flori/json/issues',
+    'changelog_uri'     => 'https://github.com/flori/json/blob/master/CHANGES.md',
+    'documentation_uri' => 'http://flori.github.io/json/doc/index.html',
+    'homepage_uri'      => 'http://flori.github.io/json/',
+    'source_code_uri'   => 'https://github.com/flori/json',
+    'wiki_uri'          => 'https://github.com/flori/json/wiki'
+  }
+
+  s.required_ruby_version = Gem::Requirement.new(">= 2.0")
+  s.test_files = ["tests/test_helper.rb"]
+
+  s.add_development_dependency "rake"
+  s.add_development_dependency "test-unit"
 end
diff --git a/ext/json/lib/json.rb b/ext/json/lib/json.rb
index 61bb8fae0e..aeb9774ee9 100644
--- a/ext/json/lib/json.rb
+++ b/ext/json/lib/json.rb
@@ -1,56 +1,576 @@
-# frozen_string_literal: false
+#frozen_string_literal: false
 require 'json/common'
 
 ##
-# = JavaScript Object Notation (JSON)
+# = JavaScript \Object Notation (\JSON)
 #
-# JSON is a lightweight data-interchange format. It is easy for us
-# humans to read and write. Plus, equally simple for machines to generate or parse.
-# JSON is completely language agnostic, making it the ideal interchange format.
+# \JSON is a lightweight data-interchange format.
 #
-# Built on two universally available structures:
-#   1. A collection of name/value pairs. Often referred to as an _object_, hash table, record, struct, keyed list, or associative array.
-#   2. An ordered list of values. More commonly called an _array_, vector, sequence or list.
+# A \JSON value is one of the following:
+# - Double-quoted text:  <tt>"foo"</tt>.
+# - Number:  +1+, +1.0+, +2.0e2+.
+# - Boolean:  +true+, +false+.
+# - Null: +null+.
+# - \Array: an ordered list of values, enclosed by square brackets:
+#     ["foo", 1, 1.0, 2.0e2, true, false, null]
 #
-# To read more about JSON visit: http://json.org
+# - \Object: a collection of name/value pairs, enclosed by curly braces;
+#   each name is double-quoted text;
+#   the values may be any \JSON values:
+#     {"a": "foo", "b": 1, "c": 1.0, "d": 2.0e2, "e": true, "f": false, "g": null}
 #
-# == Parsing JSON
+# A \JSON array or object may contain nested arrays, objects, and scalars
+# to any depth:
+#   {"foo": {"bar": 1, "baz": 2}, "bat": [0, 1, 2]}
+#   [{"foo": 0, "bar": 1}, ["baz", 2]]
 #
-# To parse a JSON string received by another application or generated within
-# your existing application:
+# == Using \Module \JSON
 #
+# To make module \JSON available in your code, begin with:
 #   require 'json'
 #
-#   my_hash = JSON.parse('{"hello": "goodbye"}')
-#   puts my_hash["hello"] => "goodbye"
+# All examples here assume that this has been done.
 #
-# Notice the extra quotes <tt>''</tt> around the hash notation. Ruby expects
-# the argument to be a string and can't convert objects like a hash or array.
+# === Parsing \JSON
 #
-# Ruby converts your string into a hash
+# You can parse a \String containing \JSON data using
+# either of two methods:
+# - <tt>JSON.parse(source, opts)</tt>
+# - <tt>JSON.parse!(source, opts)</tt>
 #
-# == Generating JSON
+# where
+# - +source+ is a Ruby object.
+# - +opts+ is a \Hash object containing options
+#   that control both input allowed and output formatting.
 #
-# Creating a JSON string for communication or serialization is
-# just as simple.
+# The difference between the two methods
+# is that JSON.parse! omits some checks
+# and may not be safe for some +source+ data;
+# use it only for data from trusted sources.
+# Use the safer method JSON.parse for less trusted sources.
 #
-#   require 'json'
+# ==== Parsing \JSON Arrays
 #
-#   my_hash = {:hello => "goodbye"}
-#   puts JSON.generate(my_hash) => "{\"hello\":\"goodbye\"}"
+# When +source+ is a \JSON array, JSON.parse by default returns a Ruby \Array:
+#   json = '["foo", 1, 1.0, 2.0e2, true, false, null]'
+#   ruby = JSON.parse(json)
+#   ruby # => ["foo", 1, 1.0, 200.0, true, false, nil]
+#   ruby.class # => Array
 #
-# Or an alternative way:
+# The \JSON array may contain nested arrays, objects, and scalars
+# to any depth:
+#   json = '[{"foo": 0, "bar": 1}, ["baz", 2]]'
+#   JSON.parse(json) # => [{"foo"=>0, "bar"=>1}, ["baz", 2]]
 #
-#   require 'json'
-#   puts {:hello => "goodbye"}.to_json => "{\"hello\":\"goodbye\"}"
+# ==== Parsing \JSON \Objects
+#
+# When the source is a \JSON object, JSON.parse by default returns a Ruby \Hash:
+#   json = '{"a": "foo", "b": 1, "c": 1.0, "d": 2.0e2, "e": true, "f": false, "g": null}'
+#   ruby = JSON.parse(json)
+#   ruby # => {"a"=>"foo", "b"=>1, "c"=>1.0, "d"=>200.0, "e"=>true, "f"=>false, "g"=>nil}
+#   ruby.class # => Hash
+#
+# The \JSON object may contain nested arrays, objects, and scalars
+# to any depth:
+#   json = '{"foo": {"bar": 1, "baz": 2}, "bat": [0, 1, 2]}'
+#   JSON.parse(json) # => {"foo"=>{"bar"=>1, "baz"=>2}, "bat"=>[0, 1, 2]}
+#
+# ==== Parsing \JSON Scalars
+#
+# When the source is a \JSON scalar (not an array or object),
+# JSON.parse returns a Ruby scalar.
+#
+# \String:
+#   ruby = JSON.parse('"foo"')
+#   ruby # => 'foo'
+#   ruby.class # => String
+# \Integer:
+#   ruby = JSON.parse('1')
+#   ruby # => 1
+#   ruby.class # => Integer
+# \Float:
+#   ruby = JSON.parse('1.0')
+#   ruby # => 1.0
+#   ruby.class # => Float
+#   ruby = JSON.parse('2.0e2')
+#   ruby # => 200
+#   ruby.class # => Float
+# Boolean:
+#   ruby = JSON.parse('true')
+#   ruby # => true
+#   ruby.class # => TrueClass
+#   ruby = JSON.parse('false')
+#   ruby # => false
+#   ruby.class # => FalseClass
+# Null:
+#   ruby = JSON.parse('null')
+#   ruby # => nil
+#   ruby.class # => NilClass
+#
+# ==== Parsing Options
+#
+# ====== Input Options
+#
+# Option +max_nesting+ (\Integer) specifies the maximum nesting depth allowed;
+# defaults to +100+; specify +false+ to disable depth checking.
+#
+# With the default, +false+:
+#   source = '[0, [1, [2, [3]]]]'
+#   ruby = JSON.parse(source)
+#   ruby # => [0, [1, [2, [3]]]]
+# Too deep:
+#   # Raises JSON::NestingError (nesting of 2 is too deep):
+#   JSON.parse(source, {max_nesting: 1})
+# Bad value:
+#   # Raises TypeError (wrong argument type Symbol (expected Fixnum)):
+#   JSON.parse(source, {max_nesting: :foo})
+#
+# ---
+#
+# Option +allow_nan+ (boolean) specifies whether to allow
+# NaN, Infinity, and MinusInfinity in +source+;
+# defaults to +false+.
+#
+# With the default, +false+:
+#   # Raises JSON::ParserError (225: unexpected token at '[NaN]'):
+#   JSON.parse('[NaN]')
+#   # Raises JSON::ParserError (232: unexpected token at '[Infinity]'):
+#   JSON.parse('[Infinity]')
+#   # Raises JSON::ParserError (248: unexpected token at '[-Infinity]'):
+#   JSON.parse('[-Infinity]')
+# Allow:
+#   source = '[NaN, Infinity, -Infinity]'
+#   ruby = JSON.parse(source, {allow_nan: true})
+#   ruby # => [NaN, Infinity, -Infinity]
+#
+# ====== Output Options
+#
+# Option +symbolize_names+ (boolean) specifies whether returned \Hash keys
+# should be Symbols;
+# defaults to +false+ (use Strings).
+#
+# With the default, +false+:
+#   source = '{"a": "foo", "b": 1.0, "c": true, "d": false, "e": null}'
+#   ruby = JSON.parse(source)
+#   ruby # => {"a"=>"foo", "b"=>1.0, "c"=>true, "d"=>false, "e"=>nil}
+# Use Symbols:
+#   ruby = JSON.parse(source, {symbolize_names: true})
+#   ruby # => {:a=>"foo", :b=>1.0, :c=>true, :d=>false, :e=>nil}
+#
+# ---
+#
+# Option +object_class+ (\Class) specifies the Ruby class to be used
+# for each \JSON object;
+# defaults to \Hash.
+#
+# With the default, \Hash:
+#   source = '{"a": "foo", "b": 1.0, "c": true, "d": false, "e": null}'
+#   ruby = JSON.parse(source)
+#   ruby.class # => Hash
+# Use class \OpenStruct:
+#   ruby = JSON.parse(source, {object_class: OpenStruct})
+#   ruby # => #<OpenStruct a="foo", b=1.0, c=true, d=false, e=nil>
+#
+# ---
+#
+# Option +array_class+ (\Class) specifies the Ruby class to be used
+# for each \JSON array;
+# defaults to \Array.
+#
+# With the default, \Array:
+#   source = '["foo", 1.0, true, false, null]'
+#   ruby = JSON.parse(source)
+#   ruby.class # => Array
+# Use class \Set:
+#   ruby = JSON.parse(source, {array_class: Set})
+#   ruby # => #<Set: {"foo", 1.0, true, false, nil}>
+#
+# ---
+#
+# Option +create_additions+ (boolean) specifies whether to use \JSON additions in parsing.
+# See {\JSON Additions}[#module-JSON-label-JSON+Additions].
+#
+# === Generating \JSON
+#
+# To generate a Ruby \String containing \JSON data,
+# use method <tt>JSON.generate(source, opts)</tt>, where
+# - +source+ is a Ruby object.
+# - +opts+ is a \Hash object containing options
+#   that control both input allowed and output formatting.
+#
+# ==== Generating \JSON from Arrays
+#
+# When the source is a Ruby \Array, JSON.generate returns
+# a \String containing a \JSON array:
+#   ruby = [0, 's', :foo]
+#   json = JSON.generate(ruby)
+#   json # => '[0,"s","foo"]'
+#
+# The Ruby \Array array may contain nested arrays, hashes, and scalars
+# to any depth:
+#   ruby = [0, [1, 2], {foo: 3, bar: 4}]
+#   json = JSON.generate(ruby)
+#   json # => '[0,[1,2],{"foo":3,"bar":4}]'
+#
+# ==== Generating \JSON from Hashes
+#
+# When the source is a Ruby \Hash, JSON.generate returns
+# a \String containing a \JSON object:
+#   ruby = {foo: 0, bar: 's', baz: :bat}
+#   json = JSON.generate(ruby)
+#   json # => '{"foo":0,"bar":"s","baz":"bat"}'
+#
+# The Ruby \Hash array may contain nested arrays, hashes, and scalars
+# to any depth:
+#   ruby = {foo: [0, 1], bar: {baz: 2, bat: 3}, bam: :bad}
+#   json = JSON.generate(ruby)
+#   json # => '{"foo":[0,1],"bar":{"baz":2,"bat":3},"bam":"bad"}'
+#
+# ==== Generating \JSON from Other Objects
+#
+# When the source is neither an \Array nor a \Hash,
+# the generated \JSON data depends on the class of the source.
+#
+# When the source is a Ruby \Integer or \Float, JSON.generate returns
+# a \String containing a \JSON number:
+#   JSON.generate(42) # => '42'
+#   JSON.generate(0.42) # => '0.42'
+#
+# When the source is a Ruby \String, JSON.generate returns
+# a \String containing a \JSON string (with double-quotes):
+#   JSON.generate('A string') # => '"A string"'
+#
+# When the source is +true+, +false+ or +nil+, JSON.generate returns
+# a \String containing the corresponding \JSON token:
+#   JSON.generate(true) # => 'true'
+#   JSON.generate(false) # => 'false'
+#   JSON.generate(nil) # => 'null'
+#
+# When the source is none of the above, JSON.generate returns
+# a \String containing a \JSON string representation of the source:
+#   JSON.generate(:foo) # => '"foo"'
+#   JSON.generate(Complex(0, 0)) # => '"0+0i"'
+#   JSON.generate(Dir.new('.')) # => '"#<Dir>"'
+#
+# ==== Generating Options
+#
+# ====== Input Options
 #
-# <tt>JSON.generate</tt> only allows objects or arrays to be converted
-# to JSON syntax. <tt>to_json</tt>, however, accepts many Ruby classes
-# even though it acts only as a method for serialization:
+# Option +allow_nan+ (boolean) specifies whether
+# +NaN+, +Infinity+, and <tt>-Infinity</tt> may be generated;
+# defaults to +false+.
 #
+# With the default, +false+:
+#   # Raises JSON::GeneratorError (920: NaN not allowed in JSON):
+#   JSON.generate(JSON::NaN)
+#   # Raises JSON::GeneratorError (917: Infinity not allowed in JSON):
+#   JSON.generate(JSON::Infinity)
+#   # Raises JSON::GeneratorError (917: -Infinity not allowed in JSON):
+#   JSON.generate(JSON::MinusInfinity)
+#
+# Allow:
+#   ruby = [Float::NaN, Float::Infinity, Float::MinusInfinity]
+#   JSON.generate(ruby, allow_nan: true) # => '[NaN,Infinity,-Infinity]'
+#
+# ---
+#
+# Option +max_nesting+ (\Integer) specifies the maximum nesting depth
+# in +obj+; defaults to +100+.
+#
+# With the default, +100+:
+#   obj = [[[[[[0]]]]]]
+#   JSON.generate(obj) # => '[[[[[[0]]]]]]'
+#
+# Too deep:
+#   # Raises JSON::NestingError (nesting of 2 is too deep):
+#   JSON.generate(obj, max_nesting: 2)
+#
+# ====== Output Options
+#
+# The default formatting options generate the most compact
+# \JSON data, all on one line and with no whitespace.
+#
+# You can use these formatting options to generate
+# \JSON data in a more open format, using whitespace.
+# See also JSON.pretty_generate.
+#
+# - Option +array_nl+ (\String) specifies a string (usually a newline)
+#   to be inserted after each \JSON array; defaults to the empty \String, <tt>''</tt>.
+# - Option +object_nl+ (\String) specifies a string (usually a newline)
+#   to be inserted after each \JSON object; defaults to the empty \String, <tt>''</tt>.
+# - Option +indent+ (\String) specifies the string (usually spaces) to be
+#   used for indentation; defaults to the empty \String, <tt>''</tt>;
+#   defaults to the empty \String, <tt>''</tt>;
+#   has no effect unless options +array_nl+ or +object_nl+ specify newlines.
+# - Option +space+ (\String) specifies a string (usually a space) to be
+#   inserted after the colon in each \JSON object's pair;
+#   defaults to the empty \String, <tt>''</tt>.
+# - Option +space_before+ (\String) specifies a string (usually a space) to be
+#   inserted before the colon in each \JSON object's pair;
+#   defaults to the empty \String, <tt>''</tt>.
+#
+# In this example, +obj+ is used first to generate the shortest
+# \JSON data (no whitespace), then again with all formatting options
+# specified:
+#
+#   obj = {foo: [:bar, :baz], bat: {bam: 0, bad: 1}}
+#   json = JSON.generate(obj)
+#   puts 'Compact:', json
+#   opts = {
+#     array_nl: "\n",
+#     object_nl: "\n",
+#     indent: '  ',
+#     space_before: ' ',
+#     space: ' '
+#   }
+#   puts 'Open:', JSON.generate(obj, opts)
+#
+# Output:
+#   Compact:
+#   {"foo":["bar","baz"],"bat":{"bam":0,"bad":1}}
+#   Open:
+#   {
+#     "foo" : [
+#       "bar",
+#       "baz"
+#   ],
+#     "bat" : {
+#       "bam" : 0,
+#       "bad" : 1
+#     }
+#   }
+#
+# == \JSON Additions
+#
+# When you "round trip" a non-\String object from Ruby to \JSON and back,
+# you have a new \String, instead of the object you began with:
+#   ruby0 = Range.new(0, 2)
+#   json = JSON.generate(ruby0)
+#   json # => '0..2"'
+#   ruby1 = JSON.parse(json)
+#   ruby1 # => '0..2'
+#   ruby1.class # => String
+#
+# You can use \JSON _additions_ to preserve the original object.
+# The addition is an extension of a ruby class, so that:
+# - \JSON.generate stores more information in the \JSON string.
+# - \JSON.parse, called with option +create_additions+,
+#   uses that information to create a proper Ruby object.
+#
+# This example shows a \Range being generated into \JSON
+# and parsed back into Ruby, both without and with
+# the addition for \Range:
+#   ruby = Range.new(0, 2)
+#   # This passage does not use the addition for Range.
+#   json0 = JSON.generate(ruby)
+#   ruby0 = JSON.parse(json0)
+#   # This passage uses the addition for Range.
+#   require 'json/add/range'
+#   json1 = JSON.generate(ruby)
+#   ruby1 = JSON.parse(json1, create_additions: true)
+#   # Make a nice display.
+#   display = <<EOT
+#   Generated JSON:
+#     Without addition:  #{json0} (#{json0.class})
+#     With addition:     #{json1} (#{json1.class})
+#   Parsed JSON:
+#     Without addition:  #{ruby0.inspect} (#{ruby0.class})
+#     With addition:     #{ruby1.inspect} (#{ruby1.class})
+#   EOT
+#   puts display
+#
+# This output shows the different results:
+#   Generated JSON:
+#     Without addition:  "0..2" (String)
+#     With addition:     {"json_class":"Range","a":[0,2,false]} (String)
+#   Parsed JSON:
+#     Without addition:  "0..2" (String)
+#     With addition:     0..2 (Range)
+#
+# The \JSON module includes additions for certain classes.
+# You can also craft custom additions.
+# See {Custom \JSON Additions}[#module-JSON-label-Custom+JSON+Additions].
+#
+# === Built-in Additions
+#
+# The \JSON module includes additions for certain classes.
+# To use an addition, +require+ its source:
+# - BigDecimal: <tt>require 'json/add/bigdecimal'</tt>
+# - Complex: <tt>require 'json/add/complex'</tt>
+# - Date: <tt>require 'json/add/date'</tt>
+# - DateTime: <tt>require 'json/add/date_time'</tt>
+# - Exception: <tt>require 'json/add/exception'</tt>
+# - OpenStruct: <tt>require 'json/add/ostruct'</tt>
+# - Range: <tt>require 'json/add/range'</tt>
+# - Rational: <tt>require 'json/add/rational'</tt>
+# - Regexp: <tt>require 'json/add/regexp'</tt>
+# - Set: <tt>require 'json/add/set'</tt>
+# - Struct: <tt>require 'json/add/struct'</tt>
+# - Symbol: <tt>require 'json/add/symbol'</tt>
+# - Time: <tt>require 'json/add/time'</tt>
+#
+# To reduce punctuation clutter, the examples below
+# show the generated \JSON via +puts+, rather than the usual +inspect+,
+#
+# \BigDecimal:
+#   require 'json/add/bigdecimal'
+#   ruby0 = BigDecimal(0) # 0.0
+#   json = JSON.generate(ruby0) # {"json_class":"BigDecimal","b":"27:0.0"}
+#   ruby1 = JSON.parse(json, create_additions: true) # 0.0
+#   ruby1.class # => BigDecimal
+#
+# \Complex:
+#   require 'json/add/complex'
+#   ruby0 = Complex(1+0i) # 1+0i
+#   json = JSON.generate(ruby0) # {"json_class":"Complex","r":1,"i":0}
+#   ruby1 = JSON.parse(json, create_additions: true) # 1+0i
+#   ruby1.class # Complex
+#
+# \Date:
+#   require 'json/add/date'
+#   ruby0 = Date.today # 2020-05-02
+#   json = JSON.generate(ruby0) # {"json_class":"Date","y":2020,"m":5,"d":2,"sg":2299161.0}
+#   ruby1 = JSON.parse(json, create_additions: true) # 2020-05-02
+#   ruby1.class # Date
+#
+# \DateTime:
+#   require 'json/add/date_time'
+#   ruby0 = DateTime.now # 2020-05-02T10:38:13-05:00
+#   json = JSON.generate(ruby0) # {"json_class":"DateTime","y":2020,"m":5,"d":2,"H":10,"M":38,"S":13,"of":"-5/24","sg":2299161.0}
+#   ruby1 = JSON.parse(json, create_additions: true) # 2020-05-02T10:38:13-05:00
+#   ruby1.class # DateTime
+#
+# \Exception (and its subclasses including \RuntimeError):
+#   require 'json/add/exception'
+#   ruby0 = Exception.new('A message') # A message
+#   json = JSON.generate(ruby0) # {"json_class":"Exception","m":"A message","b":null}
+#   ruby1 = JSON.parse(json, create_additions: true) # A message
+#   ruby1.class # Exception
+#   ruby0 = RuntimeError.new('Another message') # Another message
+#   json = JSON.generate(ruby0) # {"json_class":"RuntimeError","m":"Another message","b":null}
+#   ruby1 = JSON.parse(json, create_additions: true) # Another message
+#   ruby1.class # RuntimeError
+#
+# \OpenStruct:
+#   require 'json/add/ostruct'
+#   ruby0 = OpenStruct.new(name: 'Matz', language: 'Ruby') # #<OpenStruct name="Matz", language="Ruby">
+#   json = JSON.generate(ruby0) # {"json_class":"OpenStruct","t":{"name":"Matz","language":"Ruby"}}
+#   ruby1 = JSON.parse(json, create_additions: true) # #<OpenStruct name="Matz", language="Ruby">
+#   ruby1.class # OpenStruct
+#
+# \Range:
+#   require 'json/add/range'
+#   ruby0 = Range.new(0, 2) # 0..2
+#   json = JSON.generate(ruby0) # {"json_class":"Range","a":[0,2,false]}
+#   ruby1 = JSON.parse(json, create_additions: true) # 0..2
+#   ruby1.class # Range
+#
+# \Rational:
+#   require 'json/add/rational'
+#   ruby0 = Rational(1, 3) # 1/3
+#   json = JSON.generate(ruby0) # {"json_class":"Rational","n":1,"d":3}
+#   ruby1 = JSON.parse(json, create_additions: true) # 1/3
+#   ruby1.class # Rational
+#
+# \Regexp:
+#   require 'json/add/regexp'
+#   ruby0 = Regexp.new('foo') # (?-mix:foo)
+#   json = JSON.generate(ruby0) # {"json_class":"Regexp","o":0,"s":"foo"}
+#   ruby1 = JSON.parse(json, create_additions: true) # (?-mix:foo)
+#   ruby1.class # Regexp
+#
+# \Set:
+#   require 'json/add/set'
+#   ruby0 = Set.new([0, 1, 2]) # #<Set: {0, 1, 2}>
+#   json = JSON.generate(ruby0) # {"json_class":"Set","a":[0,1,2]}
+#   ruby1 = JSON.parse(json, create_additions: true) # #<Set: {0, 1, 2}>
+#   ruby1.class # Set
+#
+# \Struct:
+#   require 'json/add/struct'
+#   Customer = Struct.new(:name, :address) # Customer
+#   ruby0 = Customer.new("Dave", "123 Main") # #<struct Customer name="Dave", address="123 Main">
+#   json = JSON.generate(ruby0) # {"json_class":"Customer","v":["Dave","123 Main"]}
+#   ruby1 = JSON.parse(json, create_additions: true) # #<struct Customer name="Dave", address="123 Main">
+#   ruby1.class # Customer
+  #
+# \Symbol:
+#   require 'json/add/symbol'
+#   ruby0 = :foo # foo
+#   json = JSON.generate(ruby0) # {"json_class":"Symbol","s":"foo"}
+#   ruby1 = JSON.parse(json, create_additions: true) # foo
+#   ruby1.class # Symbol
+#
+# \Time:
+#   require 'json/add/time'
+#   ruby0 = Time.now # 2020-05-02 11:28:26 -0500
+#   json = JSON.generate(ruby0) # {"json_class":"Time","s":1588436906,"n":840560000}
+#   ruby1 = JSON.parse(json, create_additions: true) # 2020-05-02 11:28:26 -0500
+#   ruby1.class # Time
+#
+#
+# === Custom \JSON Additions
+#
+# In addition to the \JSON additions provided,
+# you can craft \JSON additions of your own,
+# either for Ruby built-in classes or for user-defined classes.
+#
+# Here's a user-defined class +Foo+:
+#   class Foo
+#     attr_accessor :bar, :baz
+#     def initialize(bar, baz)
+#       self.bar = bar
+#       self.baz = baz
+#     end
+#   end
+#
+# Here's the \JSON addition for it:
+#   # Extend class Foo with JSON addition.
+#   class Foo
+#     # Serialize Foo object with its class name and arguments
+#     def to_json(*args)
+#       {
+#         JSON.create_id  => self.class.name,
+#         'a'             => [ bar, baz ]
+#       }.to_json(*args)
+#     end
+#     # Deserialize JSON string by constructing new Foo object with arguments.
+#     def self.json_create(object)
+#       new(*object['a'])
+#     end
+#   end
+#
+# Demonstration:
 #   require 'json'
+#   # This Foo object has no custom addition.
+#   foo0 = Foo.new(0, 1)
+#   json0 = JSON.generate(foo0)
+#   obj0 = JSON.parse(json0)
+#   # Lood the custom addition.
+#   require_relative 'foo_addition'
+#   # This foo has the custom addition.
+#   foo1 = Foo.new(0, 1)
+#   json1 = JSON.generate(foo1)
+#   obj1 = JSON.parse(json1, create_additions: true)
+#   #   Make a nice display.
+#   display = <<EOT
+#   Generated JSON:
+#     Without custom addition:  #{json0} (#{json0.class})
+#     With custom addition:     #{json1} (#{json1.class})
+#   Parsed JSON:
+#     Without custom addition:  #{obj0.inspect} (#{obj0.class})
+#     With custom addition:     #{obj1.inspect} (#{obj1.class})
+#   EOT
+#   puts display
+#
+# Output:
 #
-#   1.to_json => "1"
+#   Generated JSON:
+#     Without custom addition:  "#<Foo:0x0000000006534e80>" (String)
+#     With custom addition:     {"json_class":"Foo","a":[0,1]} (String)
+#   Parsed JSON:
+#     Without custom addition:  "#<Foo:0x0000000006534e80>" (String)
+#     With custom addition:     #<Foo:0x0000000006473bb8 @bar=0, @baz=1> (Foo)
 #
 module JSON
   require 'json/version'
diff --git a/ext/json/lib/json/add/bigdecimal.rb b/ext/json/lib/json/add/bigdecimal.rb
index a7646860a2..c8b4f567cb 100644
--- a/ext/json/lib/json/add/bigdecimal.rb
+++ b/ext/json/lib/json/add/bigdecimal.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
@@ -23,7 +23,7 @@ class BigDecimal
   end
 
   # return the JSON value
-  def to_json(*)
-    as_json.to_json
+  def to_json(*args)
+    as_json.to_json(*args)
   end
 end
diff --git a/ext/json/lib/json/add/complex.rb b/ext/json/lib/json/add/complex.rb
index 65d388b48a..e63e29fd22 100644
--- a/ext/json/lib/json/add/complex.rb
+++ b/ext/json/lib/json/add/complex.rb
@@ -1,8 +1,7 @@
-# frozen_string_literal: false
+#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
-defined?(::Complex) or require 'complex'
 
 class Complex
 
@@ -23,7 +22,7 @@ class Complex
   end
 
   # Stores class name (Complex) along with real value <tt>r</tt> and imaginary value <tt>i</tt> as JSON string
-  def to_json(*)
-    as_json.to_json
+  def to_json(*args)
+    as_json.to_json(*args)
   end
 end
diff --git a/ext/json/lib/json/add/core.rb b/ext/json/lib/json/add/core.rb
index 93b2bff424..bfb017c460 100644
--- a/ext/json/lib/json/add/core.rb
+++ b/ext/json/lib/json/add/core.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+#frozen_string_literal: false
 # This file requires the implementations of ruby core's custom objects for
 # serialisation/deserialisation.
 
diff --git a/ext/json/lib/json/add/date.rb b/ext/json/lib/json/add/date.rb
index b58af76e10..25523561a5 100644
--- a/ext/json/lib/json/add/date.rb
+++ b/ext/json/lib/json/add/date.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
diff --git a/ext/json/lib/json/add/date_time.rb b/ext/json/lib/json/add/date_time.rb
index f794eb3d7d..38b0e86ab8 100644
--- a/ext/json/lib/json/add/date_time.rb
+++ b/ext/json/lib/json/add/date_time.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
diff --git a/ext/json/lib/json/add/exception.rb b/ext/json/lib/json/add/exception.rb
index caac713c6a..a107e5b3c4 100644
--- a/ext/json/lib/json/add/exception.rb
+++ b/ext/json/lib/json/add/exception.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
diff --git a/ext/json/lib/json/add/ostruct.rb b/ext/json/lib/json/add/ostruct.rb
index 1f9ce7b3b4..686cf0025d 100644
--- a/ext/json/lib/json/add/ostruct.rb
+++ b/ext/json/lib/json/add/ostruct.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
@@ -7,7 +7,7 @@ require 'ostruct'
 class OpenStruct
 
   # Deserializes JSON string by constructing new Struct object with values
-  # <tt>v</tt> serialized by <tt>to_json</tt>.
+  # <tt>t</tt> serialized by <tt>to_json</tt>.
   def self.json_create(object)
     new(object['t'] || object[:t])
   end
@@ -23,7 +23,7 @@ class OpenStruct
     }
   end
 
-  # Stores class name (OpenStruct) with this struct's values <tt>v</tt> as a
+  # Stores class name (OpenStruct) with this struct's values <tt>t</tt> as a
   # JSON string.
   def to_json(*args)
     as_json.to_json(*args)
diff --git a/ext/json/lib/json/add/range.rb b/ext/json/lib/json/add/range.rb
index 3ef20150bf..93529fb1c4 100644
--- a/ext/json/lib/json/add/range.rb
+++ b/ext/json/lib/json/add/range.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
diff --git a/ext/json/lib/json/add/rational.rb b/ext/json/lib/json/add/rational.rb
index e83a532775..f776226046 100644
--- a/ext/json/lib/json/add/rational.rb
+++ b/ext/json/lib/json/add/rational.rb
@@ -1,8 +1,7 @@
-# frozen_string_literal: false
+#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
-defined?(::Rational) or require 'rational'
 
 class Rational
   # Deserializes JSON string by converting numerator value <tt>n</tt>,
@@ -22,7 +21,7 @@ class Rational
   end
 
   # Stores class name (Rational) along with numerator value <tt>n</tt> and denominator value <tt>d</tt> as JSON string
-  def to_json(*)
-    as_json.to_json
+  def to_json(*args)
+    as_json.to_json(*args)
   end
 end
diff --git a/ext/json/lib/json/add/regexp.rb b/ext/json/lib/json/add/regexp.rb
index 41b260f307..39d69fede7 100644
--- a/ext/json/lib/json/add/regexp.rb
+++ b/ext/json/lib/json/add/regexp.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
@@ -24,7 +24,7 @@ class Regexp
 
   # Stores class name (Regexp) with options <tt>o</tt> and source <tt>s</tt>
   # (Regexp or String) as JSON string
-  def to_json(*)
-    as_json.to_json
+  def to_json(*args)
+    as_json.to_json(*args)
   end
 end
diff --git a/ext/json/lib/json/add/set.rb b/ext/json/lib/json/add/set.rb
new file mode 100644
index 0000000000..71e2a0ac8b
--- /dev/null
+++ b/ext/json/lib/json/add/set.rb
@@ -0,0 +1,29 @@
+unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
+  require 'json'
+end
+defined?(::Set) or require 'set'
+
+class Set
+  # Import a JSON Marshalled object.
+  #
+  # method used for JSON marshalling support.
+  def self.json_create(object)
+    new object['a']
+  end
+
+  # Marshal the object to JSON.
+  #
+  # method used for JSON marshalling support.
+  def as_json(*)
+    {
+      JSON.create_id => self.class.name,
+      'a'            => to_a,
+    }
+  end
+
+  # return the JSON value
+  def to_json(*args)
+    as_json.to_json(*args)
+  end
+end
+
diff --git a/ext/json/lib/json/add/struct.rb b/ext/json/lib/json/add/struct.rb
index d08d88237a..e8395ed42f 100644
--- a/ext/json/lib/json/add/struct.rb
+++ b/ext/json/lib/json/add/struct.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
diff --git a/ext/json/lib/json/add/symbol.rb b/ext/json/lib/json/add/symbol.rb
index 31b56a294f..74b13a423f 100644
--- a/ext/json/lib/json/add/symbol.rb
+++ b/ext/json/lib/json/add/symbol.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
diff --git a/ext/json/lib/json/add/time.rb b/ext/json/lib/json/add/time.rb
index 80b6434f17..b73acc4086 100644
--- a/ext/json/lib/json/add/time.rb
+++ b/ext/json/lib/json/add/time.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
diff --git a/ext/json/lib/json/common.rb b/ext/json/lib/json/common.rb
index 020615fc1d..ea46896fcc 100644
--- a/ext/json/lib/json/common.rb
+++ b/ext/json/lib/json/common.rb
@@ -1,15 +1,20 @@
-# frozen_string_literal: false
+#frozen_string_literal: false
 require 'json/version'
 require 'json/generic_object'
 
 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.
+    # :call-seq:
+    #   JSON[object] -> new_array or new_string
     #
-    # The _opts_ argument is passed through to generate/parse respectively. See
-    # generate and parse for their documentation.
+    # If +object+ is a \String,
+    # calls JSON.parse with +object+ and +opts+ (see method #parse):
+    #   json = '[0, 1, null]'
+    #   JSON[json]# => [0, 1, nil]
+    #
+    # Otherwise, calls JSON.generate with +object+ and +opts+ (see method #generate):
+    #   ruby = [0, 1, nil]
+    #   JSON[ruby] # => '[0,1,null]'
     def [](object, opts = {})
       if object.respond_to? :to_str
         JSON.parse(object.to_str, opts)
@@ -19,13 +24,14 @@ module JSON
     end
 
     # Returns the JSON parser class that is used by JSON. This is either
-    # JSON::Ext::Parser or JSON::Pure::Parser.
+    # JSON::Ext::Parser or JSON::Pure::Parser:
+    #   JSON.parser # => JSON::Ext::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 JSON.const_defined_in?(self, :Parser)
+      remove_const :Parser if const_defined?(:Parser, false)
       const_set :Parser, parser
     end
 
@@ -36,8 +42,8 @@ module JSON
     def deep_const_get(path) # :nodoc:
       path.to_s.split(/::/).inject(Object) do |p, c|
         case
-        when c.empty?                     then p
-        when JSON.const_defined_in?(p, c) then p.const_get(c)
+        when c.empty?                  then p
+        when p.const_defined?(c, true) then p.const_get(c)
         else
           begin
             p.const_missing(c)
@@ -65,37 +71,61 @@ module JSON
       end
       self.state = generator::State
       const_set :State, self.state
-      const_set :SAFE_STATE_PROTOTYPE, State.new
-      const_set :FAST_STATE_PROTOTYPE, State.new(
+      const_set :SAFE_STATE_PROTOTYPE, State.new # for JRuby
+      const_set :FAST_STATE_PROTOTYPE, create_fast_state
+      const_set :PRETTY_STATE_PROTOTYPE, create_pretty_state
+    ensure
+      $VERBOSE = old
+    end
+
+    def create_fast_state
+      State.new(
         :indent         => '',
         :space          => '',
         :object_nl      => "",
         :array_nl       => "",
         :max_nesting    => false
       )
-      const_set :PRETTY_STATE_PROTOTYPE, State.new(
+    end
+
+    def create_pretty_state
+      State.new(
         :indent         => '  ',
         :space          => ' ',
         :object_nl      => "\n",
         :array_nl       => "\n"
       )
-    ensure
-      $VERBOSE = old
     end
 
     # Returns the JSON generator module that is used by JSON. This is
-    # either JSON::Ext::Generator or JSON::Pure::Generator.
+    # either JSON::Ext::Generator or JSON::Pure::Generator:
+    #   JSON.generator # => JSON::Ext::Generator
     attr_reader :generator
 
-    # Returns the JSON generator state class that is used by JSON. This is
-    # either JSON::Ext::Generator::State or JSON::Pure::Generator::State.
+    # Sets or Returns the JSON generator state class that is used by JSON. This is
+    # either JSON::Ext::Generator::State or JSON::Pure::Generator::State:
+    #   JSON.state # => JSON::Ext::Generator::State
     attr_accessor :state
+  end
 
-    # This is create identifier, which is used to decide if the _json_create_
-    # hook of a class should be called. It defaults to 'json_class'.
-    attr_accessor :create_id
+  DEFAULT_CREATE_ID = 'json_class'.freeze
+  private_constant :DEFAULT_CREATE_ID
+
+  CREATE_ID_TLS_KEY = "JSON.create_id".freeze
+  private_constant :CREATE_ID_TLS_KEY
+
+  # Sets create identifier, which is used to decide if the _json_create_
+  # hook of a class should be called; initial value is +json_class+:
+  #   JSON.create_id # => 'json_class'
+  def self.create_id=(new_value)
+    Thread.current[CREATE_ID_TLS_KEY] = new_value.dup.freeze
+  end
+
+  # Returns the current create identifier.
+  # See also JSON.create_id=.
+  def self.create_id
+    Thread.current[CREATE_ID_TLS_KEY] || DEFAULT_CREATE_ID
   end
-  self.create_id = 'json_class'
 
   NaN           = 0.0/0
 
@@ -126,7 +156,7 @@ module JSON
   # This exception is raised if a generator or unparser error occurs.
   class GeneratorError < JSONError; end
   # For backwards compatibility
-  UnparserError = GeneratorError
+  UnparserError = GeneratorError # :nodoc:
 
   # This exception is raised if the required unicode support is missing on the
   # system. Usually this means that the iconv library is not installed.
@@ -134,82 +164,140 @@ module JSON
 
   module_function
 
-  # Parse the JSON document _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 100.
-  # * *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.
-  # * *symbolize_names*: If set to true, returns symbols for the names
-  #   (keys) in a JSON object. Otherwise strings are returned. Strings are
-  #   the default.
-  # * *create_additions*: If set to false, the Parser doesn't create
-  #   additions even if a matching class and create_id was found. This option
-  #   defaults to false.
-  # * *object_class*: Defaults to Hash
-  # * *array_class*: Defaults to Array
+  # :call-seq:
+  #   JSON.parse(source, opts) -> object
+  #
+  # Returns the Ruby objects created by parsing the given +source+.
+  #
+  # Argument +source+ contains the \String to be parsed.
+  #
+  # Argument +opts+, if given, contains a \Hash of options for the parsing.
+  # See {Parsing Options}[#module-JSON-label-Parsing+Options].
+  #
+  # ---
+  #
+  # When +source+ is a \JSON array, returns a Ruby \Array:
+  #   source = '["foo", 1.0, true, false, null]'
+  #   ruby = JSON.parse(source)
+  #   ruby # => ["foo", 1.0, true, false, nil]
+  #   ruby.class # => Array
+  #
+  # When +source+ is a \JSON object, returns a Ruby \Hash:
+  #   source = '{"a": "foo", "b": 1.0, "c": true, "d": false, "e": null}'
+  #   ruby = JSON.parse(source)
+  #   ruby # => {"a"=>"foo", "b"=>1.0, "c"=>true, "d"=>false, "e"=>nil}
+  #   ruby.class # => Hash
+  #
+  # For examples of parsing for all \JSON data types, see
+  # {Parsing \JSON}[#module-JSON-label-Parsing+JSON].
+  #
+  # Parses nested JSON objects:
+  #   source = <<-EOT
+  #   {
+  #   "name": "Dave",
+  #     "age" :40,
+  #     "hats": [
+  #       "Cattleman's",
+  #       "Panama",
+  #       "Tophat"
+  #     ]
+  #   }
+  #   EOT
+  #   ruby = JSON.parse(source)
+  #   ruby # => {"name"=>"Dave", "age"=>40, "hats"=>["Cattleman's", "Panama", "Tophat"]}
+  #
+  # ---
+  #
+  # Raises an exception if +source+ is not valid JSON:
+  #   # Raises JSON::ParserError (783: unexpected token at ''):
+  #   JSON.parse('')
+  #
   def parse(source, opts = {})
-    Parser.new(source, opts).parse
+    Parser.new(source, **(opts||{})).parse
   end
 
-  # Parse the JSON document _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_ documents.
-  #
-  # _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 matching class and create_id was found. This option
-  #   defaults to false.
+  # :call-seq:
+  #   JSON.parse!(source, opts) -> object
+  #
+  # Calls
+  #   parse(source, opts)
+  # with +source+ and possibly modified +opts+.
+  #
+  # Differences from JSON.parse:
+  # - Option +max_nesting+, if not provided, defaults to +false+,
+  #   which disables checking for nesting depth.
+  # - Option +allow_nan+, if not provided, defaults to +true+.
   def parse!(source, opts = {})
     opts = {
       :max_nesting  => false,
       :allow_nan    => true
-    }.update(opts)
-    Parser.new(source, opts).parse
+    }.merge(opts)
+    Parser.new(source, **(opts||{})).parse
+  end
+
+  # :call-seq:
+  #   JSON.load_file(path, opts={}) -> object
+  #
+  # Calls:
+  #   parse(File.read(path), opts)
+  #
+  # See method #parse.
+  def load_file(filespec, opts = {})
+    parse(File.read(filespec), opts)
   end
 
-  # Generate a JSON document from the Ruby data structure _obj_ 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: ''),
-  # * *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 100.
-  #
-  # 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 pretty output.
+  # :call-seq:
+  #   JSON.load_file!(path, opts = {})
+  #
+  # Calls:
+  #   JSON.parse!(File.read(path, opts))
+  #
+  # See method #parse!
+  def load_file!(filespec, opts = {})
+    parse!(File.read(filespec), opts)
+  end
+
+  # :call-seq:
+  #   JSON.generate(obj, opts = nil) -> new_string
+  #
+  # Returns a \String containing the generated \JSON data.
+  #
+  # See also JSON.fast_generate, JSON.pretty_generate.
+  #
+  # Argument +obj+ is the Ruby object to be converted to \JSON.
+  #
+  # Argument +opts+, if given, contains a \Hash of options for the generation.
+  # See {Generating Options}[#module-JSON-label-Generating+Options].
+  #
+  # ---
+  #
+  # When +obj+ is an \Array, returns a \String containing a \JSON array:
+  #   obj = ["foo", 1.0, true, false, nil]
+  #   json = JSON.generate(obj)
+  #   json # => '["foo",1.0,true,false,null]'
+  #
+  # When +obj+ is a \Hash, returns a \String containing a \JSON object:
+  #   obj = {foo: 0, bar: 's', baz: :bat}
+  #   json = JSON.generate(obj)
+  #   json # => '{"foo":0,"bar":"s","baz":"bat"}'
+  #
+  # For examples of generating from other Ruby objects, see
+  # {Generating \JSON from Other Objects}[#module-JSON-label-Generating+JSON+from+Other+Objects].
+  #
+  # ---
+  #
+  # Raises an exception if any formatting option is not a \String.
+  #
+  # Raises an exception if +obj+ contains circular references:
+  #   a = []; b = []; a.push(b); b.push(a)
+  #   # Raises JSON::NestingError (nesting of 100 is too deep):
+  #   JSON.generate(a)
+  #
   def generate(obj, opts = nil)
     if State === opts
       state, opts = opts, nil
     else
-      state = SAFE_STATE_PROTOTYPE.dup
+      state = State.new
     end
     if opts
       if opts.respond_to? :to_hash
@@ -231,16 +319,24 @@ module JSON
   module_function :unparse
   # :startdoc:
 
-  # Generate a JSON document from the Ruby data structure _obj_ and return it.
-  # This method disables the checks for circles in Ruby objects.
+  # :call-seq:
+  #   JSON.fast_generate(obj, opts) -> new_string
   #
-  # *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.
+  # Arguments +obj+ and +opts+ here are the same as
+  # arguments +obj+ and +opts+ in JSON.generate.
+  #
+  # By default, generates \JSON data without checking
+  # for circular references in +obj+ (option +max_nesting+ set to +false+, disabled).
+  #
+  # Raises an exception if +obj+ contains circular references:
+  #   a = []; b = []; a.push(b); b.push(a)
+  #   # Raises SystemStackError (stack level too deep):
+  #   JSON.fast_generate(a)
   def fast_generate(obj, opts = nil)
     if State === opts
       state, opts = opts, nil
     else
-      state = FAST_STATE_PROTOTYPE.dup
+      state = JSON.create_fast_state
     end
     if opts
       if opts.respond_to? :to_hash
@@ -261,17 +357,41 @@ module JSON
   module_function :fast_unparse
   # :startdoc:
 
-  # Generate a JSON document from the Ruby data structure _obj_ and return it.
-  # The returned document is a prettier form of the document returned by
-  # #unparse.
+  # :call-seq:
+  #   JSON.pretty_generate(obj, opts = nil) -> new_string
+  #
+  # Arguments +obj+ and +opts+ here are the same as
+  # arguments +obj+ and +opts+ in JSON.generate.
+  #
+  # Default options are:
+  #   {
+  #     indent: '  ',   # Two spaces
+  #     space: ' ',     # One space
+  #     array_nl: "\n", # Newline
+  #     object_nl: "\n" # Newline
+  #   }
+  #
+  # Example:
+  #   obj = {foo: [:bar, :baz], bat: {bam: 0, bad: 1}}
+  #   json = JSON.pretty_generate(obj)
+  #   puts json
+  # Output:
+  #   {
+  #     "foo": [
+  #       "bar",
+  #       "baz"
+  #     ],
+  #     "bat": {
+  #       "bam": 0,
+  #       "bad": 1
+  #     }
+  #   }
   #
-  # 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)
     if State === opts
       state, opts = opts, nil
     else
-      state = PRETTY_STATE_PROTOTYPE.dup
+      state = JSON.create_pretty_state
     end
     if opts
       if opts.respond_to? :to_hash
@@ -293,33 +413,147 @@ module JSON
   # :startdoc:
 
   class << self
-    # The global default options for the JSON.load method:
-    #  :max_nesting: false
-    #  :allow_nan:   true
-    #  :quirks_mode: true
+    # Sets or returns default options for the JSON.load method.
+    # Initially:
+    #   opts = JSON.load_default_options
+    #   opts # => {:max_nesting=>false, :allow_nan=>true, :allow_blank=>true, :create_additions=>true}
     attr_accessor :load_default_options
   end
   self.load_default_options = {
     :max_nesting      => false,
     :allow_nan        => true,
-    :quirks_mode      => true,
+    :allow_blank       => true,
     :create_additions => true,
   }
 
-  # 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. To modify the
-  # default options pass in the optional _options_ argument as well.
+  # :call-seq:
+  #   JSON.load(source, proc = nil, options = {}) -> object
+  #
+  # Returns the Ruby objects created by parsing the given +source+.
+  #
+  # - Argument +source+ must be, or be convertible to, a \String:
+  #   - If +source+ responds to instance method +to_str+,
+  #     <tt>source.to_str</tt> becomes the source.
+  #   - If +source+ responds to instance method +to_io+,
+  #     <tt>source.to_io.read</tt> becomes the source.
+  #   - If +source+ responds to instance method +read+,
+  #     <tt>source.read</tt> becomes the source.
+  #   - If both of the following are true, source becomes the \String <tt>'null'</tt>:
+  #     - Option +allow_blank+ specifies a truthy value.
+  #     - The source, as defined above, is +nil+ or the empty \String <tt>''</tt>.
+  #   - Otherwise, +source+ remains the source.
+  # - Argument +proc+, if given, must be a \Proc that accepts one argument.
+  #   It will be called recursively with each result (depth-first order).
+  #   See details below.
+  #   BEWARE: This method is meant to serialise data from trusted user input,
+  #   like from your own database server or clients under your control, it could
+  #   be dangerous to allow untrusted users to pass JSON sources into it.
+  # - Argument +opts+, if given, contains a \Hash of options for the parsing.
+  #   See {Parsing Options}[#module-JSON-label-Parsing+Options].
+  #   The default options can be changed via method JSON.load_default_options=.
+  #
+  # ---
+  #
+  # When no +proc+ is given, modifies +source+ as above and returns the result of
+  # <tt>parse(source, opts)</tt>;  see #parse.
   #
-  # BEWARE: This method is meant to serialise data from trusted user input,
-  # like from your own database server or clients under your control, it could
-  # be dangerous to allow untrusted users to pass JSON sources into it. The
-  # default options for the parser can be changed via the load_default_options
-  # method.
+  # Source for following examples:
+  #   source = <<-EOT
+  #   {
+  #   "name": "Dave",
+  #     "age" :40,
+  #     "hats": [
+  #       "Cattleman's",
+  #       "Panama",
+  #       "Tophat"
+  #     ]
+  #   }
+  #   EOT
+  #
+  # Load a \String:
+  #   ruby = JSON.load(source)
+  #   ruby # => {"name"=>"Dave", "age"=>40, "hats"=>["Cattleman's", "Panama", "Tophat"]}
+  #
+  # Load an \IO object:
+  #   require 'stringio'
+  #   object = JSON.load(StringIO.new(source))
+  #   object # => {"name"=>"Dave", "age"=>40, "hats"=>["Cattleman's", "Panama", "Tophat"]}
+  #
+  # Load a \File object:
+  #   path = 't.json'
+  #   File.write(path, source)
+  #   File.open(path) do |file|
+  #     JSON.load(file)
+  #   end # => {"name"=>"Dave", "age"=>40, "hats"=>["Cattleman's", "Panama", "Tophat"]}
+  #
+  # ---
+  #
+  # When +proc+ is given:
+  # - Modifies +source+ as above.
+  # - Gets the +result+ from calling <tt>parse(source, opts)</tt>.
+  # - Recursively calls <tt>proc(result)</tt>.
+  # - Returns the final result.
+  #
+  # Example:
+  #   require 'json'
+  #
+  #   # Some classes for the example.
+  #   class Base
+  #     def initialize(attributes)
+  #       @attributes = attributes
+  #     end
+  #   end
+  #   class User    < Base; end
+  #   class Account < Base; end
+  #   class Admin   < Base; end
+  #   # The JSON source.
+  #   json = <<-EOF
+  #   {
+  #     "users": [
+  #         {"type": "User", "username": "jane", "email": "jane@example.com"},
+  #         {"type": "User", "username": "john", "email": "john@example.com"}
+  #     ],
+  #     "accounts": [
+  #         {"account": {"type": "Account", "paid": true, "account_id": "1234"}},
+  #         {"account": {"type": "Account", "paid": false, "account_id": "1235"}}
+  #     ],
+  #     "admins": {"type": "Admin", "password": "0wn3d"}
+  #   }
+  #   EOF
+  #   # Deserializer method.
+  #   def deserialize_obj(obj, safe_types = %w(User Account Admin))
+  #     type = obj.is_a?(Hash) && obj["type"]
+  #     safe_types.include?(type) ? Object.const_get(type).new(obj) : obj
+  #   end
+  #   # Call to JSON.load
+  #   ruby = JSON.load(json, proc {|obj|
+  #     case obj
+  #     when Hash
+  #       obj.each {|k, v| obj[k] = deserialize_obj v }
+  #     when Array
+  #       obj.map! {|v| deserialize_obj v }
+  #     end
+  #   })
+  #   pp ruby
+  # Output:
+  #   {"users"=>
+  #      [#<User:0x00000000064c4c98
+  #        @attributes=
+  #          {"type"=>"User", "username"=>"jane", "email"=>"jane@example.com"}>,
+  #        #<User:0x00000000064c4bd0
+  #        @attributes=
+  #          {"type"=>"User", "username"=>"john", "email"=>"john@example.com"}>],
+  #    "accounts"=>
+  #      [{"account"=>
+  #          #<Account:0x00000000064c4928
+  #          @attributes={"type"=>"Account", "paid"=>true, "account_id"=>"1234"}>},
+  #       {"account"=>
+  #          #<Account:0x00000000064c4680
+  #          @attributes={"type"=>"Account", "paid"=>false, "account_id"=>"1235"}>}],
+  #    "admins"=>
+  #      #<Admin:0x00000000064c41f8
+  #      @attributes={"type"=>"Admin", "password"=>"0wn3d"}>}
   #
-  # This method is part of the implementation of the load/dump interface of
-  # Marshal and YAML.
   def load(source, proc = nil, options = {})
     opts = load_default_options.merge options
     if source.respond_to? :to_str
@@ -329,7 +563,7 @@ module JSON
     elsif source.respond_to?(:read)
       source = source.read
     end
-    if opts[:quirks_mode] && (source.nil? || source.empty?)
+    if opts[:allow_blank] && (source.nil? || source.empty?)
       source = 'null'
     end
     result = parse(source, opts)
@@ -338,7 +572,7 @@ module JSON
   end
 
   # Recursively calls passed _Proc_ if the parsed data structure is an _Array_ or _Hash_
-  def recurse_proc(result, &proc)
+  def recurse_proc(result, &proc) # :nodoc:
     case result
     when Array
       result.each { |x| recurse_proc x, &proc }
@@ -355,33 +589,45 @@ module JSON
   module_function :restore
 
   class << self
-    # The global default options for the JSON.dump method:
-    #  :max_nesting: false
-    #  :allow_nan:   true
-    #  :quirks_mode: true
+    # Sets or returns the default options for the JSON.dump method.
+    # Initially:
+    #   opts = JSON.dump_default_options
+    #   opts # => {:max_nesting=>false, :allow_nan=>true, :escape_slash=>false}
     attr_accessor :dump_default_options
   end
   self.dump_default_options = {
     :max_nesting => false,
     :allow_nan   => true,
-    :quirks_mode => true,
+    :escape_slash => false,
   }
 
-  # Dumps _obj_ as a JSON string, i.e. calls generate on the object and returns
-  # the result.
+  # :call-seq:
+  #   JSON.dump(obj, io = nil, limit = nil)
+  #
+  # Dumps +obj+ as a \JSON string, i.e. calls generate on the object and returns the result.
+  #
+  # The default options can be changed via method JSON.dump_default_options.
   #
-  # If anIO (an IO-like object or an object that responds to the write method)
-  # was given, the resulting JSON is written to it.
+  # - Argument +io+, if given, should respond to method +write+;
+  #   the \JSON \String is written to +io+, and +io+ is returned.
+  #   If +io+ is not given, the \JSON \String is returned.
+  # - Argument +limit+, if given, is passed to JSON.generate as option +max_nesting+.
   #
-  # 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.
+  # ---
   #
-  # The default options for the generator can be changed via the
-  # dump_default_options method.
+  # When argument +io+ is not given, returns the \JSON \String generated from +obj+:
+  #   obj = {foo: [0, 1], bar: {baz: 2, bat: 3}, bam: :bad}
+  #   json = JSON.dump(obj)
+  #   json # => "{\"foo\":[0,1],\"bar\":{\"baz\":2,\"bat\":3},\"bam\":\"bad\"}"
   #
-  # This method is part of the implementation of the load/dump interface of
-  # Marshal and YAML.
+  # When argument +io+ is given, writes the \JSON \String to +io+ and returns +io+:
+  #   path = 't.json'
+  #   File.open(path, 'w') do |file|
+  #     JSON.dump(obj, file)
+  #   end # => #<File:t.json (closed)>
+  #   puts File.read(path)
+  # Output:
+  #   {"foo":[0,1],"bar":{"baz":2,"bat":3},"bam":"bad"}
   def dump(obj, anIO = nil, limit = nil)
     if anIO and limit.nil?
       anIO = anIO.to_io if anIO.respond_to?(:to_io)
@@ -403,37 +649,9 @@ module JSON
     raise ArgumentError, "exceed depth limit"
   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
-
-  # Shortcut for iconv.
-  if ::String.method_defined?(:encode)
-    # Encodes string using Ruby's _String.encode_
-    def self.iconv(to, from, string)
-      string.encode(to, from)
-    end
-  else
-    require 'iconv'
-    # Encodes string using _iconv_ library
-    def self.iconv(to, from, string)
-      Iconv.conv(to, from, string)
-    end
-  end
-
-  if ::Object.method(:const_defined?).arity == 1
-    def self.const_defined_in?(modul, constant)
-      modul.const_defined?(constant)
-    end
-  else
-    def self.const_defined_in?(modul, constant)
-      modul.const_defined?(constant, false)
-    end
+  # Encodes string using String.encode.
+  def self.iconv(to, from, string)
+    string.encode(to, from)
   end
 end
 
diff --git a/ext/json/lib/json/ext.rb b/ext/json/lib/json/ext.rb
index 2486f084cd..7264a857fa 100644
--- a/ext/json/lib/json/ext.rb
+++ b/ext/json/lib/json/ext.rb
@@ -1,10 +1,3 @@
-# frozen_string_literal: false
-if ENV['SIMPLECOV_COVERAGE'].to_i == 1
-  require 'simplecov'
-  SimpleCov.start do
-    add_filter "/tests/"
-  end
-end
 require 'json/common'
 
 module JSON
diff --git a/ext/json/lib/json/generic_object.rb b/ext/json/lib/json/generic_object.rb
index 2241f6c7ce..108309db26 100644
--- a/ext/json/lib/json/generic_object.rb
+++ b/ext/json/lib/json/generic_object.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+#frozen_string_literal: false
 require 'ostruct'
 
 module JSON
@@ -48,6 +48,14 @@ module JSON
       table
     end
 
+    def [](name)
+      __send__(name)
+    end unless method_defined?(:[])
+
+    def []=(name, value)
+      __send__("#{name}=", value)
+    end unless method_defined?(:[]=)
+
     def |(other)
       self.class[other.to_hash.merge(to_hash)]
     end
diff --git a/ext/json/lib/json/version.rb b/ext/json/lib/json/version.rb
index b5748334b9..7a72272bd0 100644
--- a/ext/json/lib/json/version.rb
+++ b/ext/json/lib/json/version.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 module JSON
   # JSON version
-  VERSION         = '1.8.3'
+  VERSION         = '2.5.1'
   VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:
diff --git a/ext/json/parser/depend b/ext/json/parser/depend
index 927cd892bf..23d704ac85 100644
--- a/ext/json/parser/depend
+++ b/ext/json/parser/depend
@@ -4,17 +4,168 @@ parser.o: parser.c parser.h $(srcdir)/../fbuffer/fbuffer.h
 # AUTOGENERATED DEPENDENCIES START
 parser.o: $(RUBY_EXTCONF_H)
 parser.o: $(arch_hdrdir)/ruby/config.h
+parser.o: $(hdrdir)/ruby.h
+parser.o: $(hdrdir)/ruby/internal/anyargs.h
+parser.o: $(hdrdir)/ruby/internal/arithmetic.h
+parser.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+parser.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+parser.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+parser.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+parser.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+parser.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+parser.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+parser.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+parser.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+parser.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+parser.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+parser.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+parser.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+parser.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+parser.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+parser.o: $(hdrdir)/ruby/internal/assume.h
+parser.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+parser.o: $(hdrdir)/ruby/internal/attr/artificial.h
+parser.o: $(hdrdir)/ruby/internal/attr/cold.h
+parser.o: $(hdrdir)/ruby/internal/attr/const.h
+parser.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+parser.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+parser.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+parser.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+parser.o: $(hdrdir)/ruby/internal/attr/error.h
+parser.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+parser.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+parser.o: $(hdrdir)/ruby/internal/attr/format.h
+parser.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+parser.o: $(hdrdir)/ruby/internal/attr/noalias.h
+parser.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+parser.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+parser.o: $(hdrdir)/ruby/internal/attr/noinline.h
+parser.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+parser.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+parser.o: $(hdrdir)/ruby/internal/attr/pure.h
+parser.o: $(hdrdir)/ruby/internal/attr/restrict.h
+parser.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+parser.o: $(hdrdir)/ruby/internal/attr/warning.h
+parser.o: $(hdrdir)/ruby/internal/attr/weakref.h
+parser.o: $(hdrdir)/ruby/internal/cast.h
+parser.o: $(hdrdir)/ruby/internal/compiler_is.h
+parser.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+parser.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+parser.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+parser.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+parser.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+parser.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+parser.o: $(hdrdir)/ruby/internal/compiler_since.h
+parser.o: $(hdrdir)/ruby/internal/config.h
+parser.o: $(hdrdir)/ruby/internal/constant_p.h
+parser.o: $(hdrdir)/ruby/internal/core.h
+parser.o: $(hdrdir)/ruby/internal/core/rarray.h
+parser.o: $(hdrdir)/ruby/internal/core/rbasic.h
+parser.o: $(hdrdir)/ruby/internal/core/rbignum.h
+parser.o: $(hdrdir)/ruby/internal/core/rclass.h
+parser.o: $(hdrdir)/ruby/internal/core/rdata.h
+parser.o: $(hdrdir)/ruby/internal/core/rfile.h
+parser.o: $(hdrdir)/ruby/internal/core/rhash.h
+parser.o: $(hdrdir)/ruby/internal/core/robject.h
+parser.o: $(hdrdir)/ruby/internal/core/rregexp.h
+parser.o: $(hdrdir)/ruby/internal/core/rstring.h
+parser.o: $(hdrdir)/ruby/internal/core/rstruct.h
+parser.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+parser.o: $(hdrdir)/ruby/internal/ctype.h
+parser.o: $(hdrdir)/ruby/internal/dllexport.h
+parser.o: $(hdrdir)/ruby/internal/dosish.h
+parser.o: $(hdrdir)/ruby/internal/error.h
+parser.o: $(hdrdir)/ruby/internal/eval.h
+parser.o: $(hdrdir)/ruby/internal/event.h
+parser.o: $(hdrdir)/ruby/internal/fl_type.h
+parser.o: $(hdrdir)/ruby/internal/gc.h
+parser.o: $(hdrdir)/ruby/internal/glob.h
+parser.o: $(hdrdir)/ruby/internal/globals.h
+parser.o: $(hdrdir)/ruby/internal/has/attribute.h
+parser.o: $(hdrdir)/ruby/internal/has/builtin.h
+parser.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+parser.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+parser.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+parser.o: $(hdrdir)/ruby/internal/has/extension.h
+parser.o: $(hdrdir)/ruby/internal/has/feature.h
+parser.o: $(hdrdir)/ruby/internal/has/warning.h
+parser.o: $(hdrdir)/ruby/internal/intern/array.h
+parser.o: $(hdrdir)/ruby/internal/intern/bignum.h
+parser.o: $(hdrdir)/ruby/internal/intern/class.h
+parser.o: $(hdrdir)/ruby/internal/intern/compar.h
+parser.o: $(hdrdir)/ruby/internal/intern/complex.h
+parser.o: $(hdrdir)/ruby/internal/intern/cont.h
+parser.o: $(hdrdir)/ruby/internal/intern/dir.h
+parser.o: $(hdrdir)/ruby/internal/intern/enum.h
+parser.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+parser.o: $(hdrdir)/ruby/internal/intern/error.h
+parser.o: $(hdrdir)/ruby/internal/intern/eval.h
+parser.o: $(hdrdir)/ruby/internal/intern/file.h
+parser.o: $(hdrdir)/ruby/internal/intern/gc.h
+parser.o: $(hdrdir)/ruby/internal/intern/hash.h
+parser.o: $(hdrdir)/ruby/internal/intern/io.h
+parser.o: $(hdrdir)/ruby/internal/intern/load.h
+parser.o: $(hdrdir)/ruby/internal/intern/marshal.h
+parser.o: $(hdrdir)/ruby/internal/intern/numeric.h
+parser.o: $(hdrdir)/ruby/internal/intern/object.h
+parser.o: $(hdrdir)/ruby/internal/intern/parse.h
+parser.o: $(hdrdir)/ruby/internal/intern/proc.h
+parser.o: $(hdrdir)/ruby/internal/intern/process.h
+parser.o: $(hdrdir)/ruby/internal/intern/random.h
+parser.o: $(hdrdir)/ruby/internal/intern/range.h
+parser.o: $(hdrdir)/ruby/internal/intern/rational.h
+parser.o: $(hdrdir)/ruby/internal/intern/re.h
+parser.o: $(hdrdir)/ruby/internal/intern/ruby.h
+parser.o: $(hdrdir)/ruby/internal/intern/select.h
+parser.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+parser.o: $(hdrdir)/ruby/internal/intern/signal.h
+parser.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+parser.o: $(hdrdir)/ruby/internal/intern/string.h
+parser.o: $(hdrdir)/ruby/internal/intern/struct.h
+parser.o: $(hdrdir)/ruby/internal/intern/thread.h
+parser.o: $(hdrdir)/ruby/internal/intern/time.h
+parser.o: $(hdrdir)/ruby/internal/intern/variable.h
+parser.o: $(hdrdir)/ruby/internal/intern/vm.h
+parser.o: $(hdrdir)/ruby/internal/interpreter.h
+parser.o: $(hdrdir)/ruby/internal/iterator.h
+parser.o: $(hdrdir)/ruby/internal/memory.h
+parser.o: $(hdrdir)/ruby/internal/method.h
+parser.o: $(hdrdir)/ruby/internal/module.h
+parser.o: $(hdrdir)/ruby/internal/newobj.h
+parser.o: $(hdrdir)/ruby/internal/rgengc.h
+parser.o: $(hdrdir)/ruby/internal/scan_args.h
+parser.o: $(hdrdir)/ruby/internal/special_consts.h
+parser.o: $(hdrdir)/ruby/internal/static_assert.h
+parser.o: $(hdrdir)/ruby/internal/stdalign.h
+parser.o: $(hdrdir)/ruby/internal/stdbool.h
+parser.o: $(hdrdir)/ruby/internal/symbol.h
+parser.o: $(hdrdir)/ruby/internal/token_paste.h
+parser.o: $(hdrdir)/ruby/internal/value.h
+parser.o: $(hdrdir)/ruby/internal/value_type.h
+parser.o: $(hdrdir)/ruby/internal/variable.h
+parser.o: $(hdrdir)/ruby/internal/warning_push.h
+parser.o: $(hdrdir)/ruby/internal/xmalloc.h
+parser.o: $(hdrdir)/ruby/assert.h
 parser.o: $(hdrdir)/ruby/backward.h
+parser.o: $(hdrdir)/ruby/backward/2/assume.h
+parser.o: $(hdrdir)/ruby/backward/2/attributes.h
+parser.o: $(hdrdir)/ruby/backward/2/bool.h
+parser.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+parser.o: $(hdrdir)/ruby/backward/2/inttypes.h
+parser.o: $(hdrdir)/ruby/backward/2/limits.h
+parser.o: $(hdrdir)/ruby/backward/2/long_long.h
+parser.o: $(hdrdir)/ruby/backward/2/stdalign.h
+parser.o: $(hdrdir)/ruby/backward/2/stdarg.h
 parser.o: $(hdrdir)/ruby/defines.h
 parser.o: $(hdrdir)/ruby/encoding.h
 parser.o: $(hdrdir)/ruby/intern.h
 parser.o: $(hdrdir)/ruby/missing.h
+parser.o: $(hdrdir)/ruby/onigmo.h
 parser.o: $(hdrdir)/ruby/oniguruma.h
 parser.o: $(hdrdir)/ruby/ruby.h
 parser.o: $(hdrdir)/ruby/st.h
 parser.o: $(hdrdir)/ruby/subst.h
-parser.o: $(top_srcdir)/ext/json/fbuffer/fbuffer.h
-parser.o: $(top_srcdir)/include/ruby.h
+parser.o: $(srcdir)/../fbuffer/fbuffer.h
 parser.o: parser.c
 parser.o: parser.h
 parser.o: parser.rl
diff --git a/ext/json/parser/extconf.rb b/ext/json/parser/extconf.rb
index f7360d46b2..f832b56a61 100644
--- a/ext/json/parser/extconf.rb
+++ b/ext/json/parser/extconf.rb
@@ -3,4 +3,29 @@ require 'mkmf'
 
 have_func("rb_enc_raise", "ruby.h")
 
+# checking if String#-@ (str_uminus) dedupes... '
+begin
+  a = -(%w(t e s t).join)
+  b = -(%w(t e s t).join)
+  if a.equal?(b)
+    $CFLAGS << ' -DSTR_UMINUS_DEDUPE=1 '
+  else
+    $CFLAGS << ' -DSTR_UMINUS_DEDUPE=0 '
+  end
+rescue NoMethodError
+  $CFLAGS << ' -DSTR_UMINUS_DEDUPE=0 '
+end
+
+# checking if String#-@ (str_uminus) directly interns frozen strings... '
+begin
+  s = rand.to_s.freeze
+  if (-s).equal?(s) && (-s.dup).equal?(s)
+    $CFLAGS << ' -DSTR_UMINUS_DEDUPE_FROZEN=1 '
+  else
+    $CFLAGS << ' -DSTR_UMINUS_DEDUPE_FROZEN=0 '
+  end
+rescue NoMethodError
+  $CFLAGS << ' -DSTR_UMINUS_DEDUPE_FROZEN=0 '
+end
+
 create_makefile 'json/ext/parser'
diff --git a/ext/json/parser/parser.c b/ext/json/parser/parser.c
index 773605cf7c..29b5674d96 100644
--- a/ext/json/parser/parser.c
+++ b/ext/json/parser/parser.c
@@ -1,10 +1,10 @@
-
+/* This file is automatically generated from parser.rl by using ragel */
 #line 1 "parser.rl"
 #include "../fbuffer/fbuffer.h"
 #include "parser.h"
 
 #if defined HAVE_RUBY_ENCODING_H
-# define EXC_ENCODING UTF_8,
+# define EXC_ENCODING rb_utf8_encoding(),
 # ifndef HAVE_RB_ENC_RAISE
 static void
 enc_raise(rb_encoding *enc, VALUE exc, const char *fmt, ...)
@@ -27,7 +27,7 @@ enc_raise(rb_encoding *enc, VALUE exc, const char *fmt, ...)
 
 /* unicode */
 
-static const char digit_values[256] = {
+static const signed char digit_values[256] = {
     -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
     -1, -1, -1, -1, -1, -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, 2, 3, 4, 5, 6, 7, 8, 9, -1,
@@ -46,7 +46,7 @@ static const char digit_values[256] = {
 
 static UTF32 unescape_unicode(const unsigned char *p)
 {
-    char b;
+    signed char b;
     UTF32 result = 0;
     b = digit_values[p[0]];
     if (b < 0) return UNI_REPLACEMENT_CHAR;
@@ -89,26 +89,21 @@ static int convert_UTF32_to_UTF8(char *buf, UTF32 ch)
     return len;
 }
 
-#ifdef HAVE_RUBY_ENCODING_H
-static rb_encoding *UTF_8, *UTF_16BE, *UTF_16LE, *UTF_32BE, *UTF_32LE;
-#else
-static ID i_iconv;
-#endif
-
 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, i_symbolize_names, i_quirks_mode,
-          i_object_class, i_array_class, i_key_p, i_deep_const_get, i_match,
-          i_match_string, i_aset, i_aref, i_leftshift;
+          i_chr, i_max_nesting, i_allow_nan, i_symbolize_names,
+          i_object_class, i_array_class, i_decimal_class, i_key_p,
+          i_deep_const_get, i_match, i_match_string, i_aset, i_aref,
+          i_leftshift, i_new, i_try_convert, i_freeze, i_uminus;
 
 
-#line 130 "parser.rl"
+#line 126 "parser.rl"
 
 
 
-#line 112 "parser.c"
+#line 108 "parser.c"
 enum {JSON_object_start = 1};
 enum {JSON_object_first_final = 27};
 enum {JSON_object_error = 0};
@@ -116,30 +111,30 @@ enum {JSON_object_error = 0};
 enum {JSON_object_en_main = 1};
 
 
-#line 171 "parser.rl"
+#line 168 "parser.rl"
 
 
-static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *result)
+static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *result, int current_nesting)
 {
     int cs = EVIL;
     VALUE last_name = Qnil;
     VALUE object_class = json->object_class;
 
-    if (json->max_nesting && json->current_nesting > json->max_nesting) {
-        rb_raise(eNestingError, "nesting of %d is too deep", json->current_nesting);
+    if (json->max_nesting && current_nesting > json->max_nesting) {
+        rb_raise(eNestingError, "nesting of %d is too deep", current_nesting);
     }
 
     *result = NIL_P(object_class) ? rb_hash_new() : rb_class_new_instance(0, 0, object_class);
 
 
-#line 136 "parser.c"
+#line 132 "parser.c"
 	{
 	cs = JSON_object_start;
 	}
 
-#line 186 "parser.rl"
+#line 183 "parser.rl"
 
-#line 143 "parser.c"
+#line 139 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -167,7 +162,7 @@ case 2:
 		goto st2;
 	goto st0;
 tr2:
-#line 153 "parser.rl"
+#line 150 "parser.rl"
 	{
         char *np;
         json->parsing_name = 1;
@@ -180,7 +175,7 @@ st3:
 	if ( ++p == pe )
 		goto _test_eof3;
 case 3:
-#line 184 "parser.c"
+#line 180 "parser.c"
 	switch( (*p) ) {
 		case 13: goto st3;
 		case 32: goto st3;
@@ -247,14 +242,15 @@ case 8:
 		goto st8;
 	goto st0;
 tr11:
-#line 138 "parser.rl"
+#line 134 "parser.rl"
 	{
         VALUE v = Qnil;
-        char *np = JSON_parse_value(json, p, pe, &v);
+        char *np = JSON_parse_value(json, p, pe, &v, current_nesting);
         if (np == NULL) {
             p--; {p++; cs = 9; goto _out;}
         } else {
             if (NIL_P(json->object_class)) {
+                OBJ_FREEZE(last_name);
                 rb_hash_aset(*result, last_name, v);
             } else {
                 rb_funcall(*result, i_aset, 2, last_name, v);
@@ -267,7 +263,7 @@ st9:
 	if ( ++p == pe )
 		goto _test_eof9;
 case 9:
-#line 271 "parser.c"
+#line 268 "parser.c"
 	switch( (*p) ) {
 		case 13: goto st9;
 		case 32: goto st9;
@@ -356,14 +352,14 @@ case 18:
 		goto st9;
 	goto st18;
 tr4:
-#line 161 "parser.rl"
+#line 158 "parser.rl"
 	{ p--; {p++; cs = 27; goto _out;} }
 	goto st27;
 st27:
 	if ( ++p == pe )
 		goto _test_eof27;
 case 27:
-#line 367 "parser.c"
+#line 364 "parser.c"
 	goto st0;
 st19:
 	if ( ++p == pe )
@@ -461,7 +457,7 @@ case 26:
 	_out: {}
 	}
 
-#line 187 "parser.rl"
+#line 184 "parser.rl"
 
     if (cs >= JSON_object_first_final) {
         if (json->create_additions) {
@@ -486,69 +482,78 @@ case 26:
 
 
 
-#line 490 "parser.c"
+#line 487 "parser.c"
 enum {JSON_value_start = 1};
-enum {JSON_value_first_final = 21};
+enum {JSON_value_first_final = 29};
 enum {JSON_value_error = 0};
 
 enum {JSON_value_en_main = 1};
 
 
-#line 291 "parser.rl"
+#line 284 "parser.rl"
 
 
-static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *result)
+static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *result, int current_nesting)
 {
     int cs = EVIL;
 
 
-#line 506 "parser.c"
+#line 503 "parser.c"
 	{
 	cs = JSON_value_start;
 	}
 
-#line 298 "parser.rl"
+#line 291 "parser.rl"
 
-#line 513 "parser.c"
+#line 510 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
 	switch ( cs )
 	{
+st1:
+	if ( ++p == pe )
+		goto _test_eof1;
 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;
+		case 13: goto st1;
+		case 32: goto st1;
+		case 34: goto tr2;
+		case 45: goto tr3;
+		case 47: goto st6;
+		case 73: goto st10;
+		case 78: goto st17;
+		case 91: goto tr7;
+		case 102: goto st19;
+		case 110: goto st23;
+		case 116: goto st26;
+		case 123: goto tr11;
 	}
-	if ( 48 <= (*p) && (*p) <= 57 )
-		goto tr2;
+	if ( (*p) > 10 ) {
+		if ( 48 <= (*p) && (*p) <= 57 )
+			goto tr3;
+	} else if ( (*p) >= 9 )
+		goto st1;
 	goto st0;
 st0:
 cs = 0;
 	goto _out;
-tr0:
-#line 239 "parser.rl"
+tr2:
+#line 236 "parser.rl"
 	{
         char *np = JSON_parse_string(json, p, pe, result);
-        if (np == NULL) { p--; {p++; cs = 21; goto _out;} } else {p = (( np))-1;}
+        if (np == NULL) { p--; {p++; cs = 29; goto _out;} } else {p = (( np))-1;}
     }
-	goto st21;
-tr2:
-#line 244 "parser.rl"
+	goto st29;
+tr3:
+#line 241 "parser.rl"
 	{
         char *np;
-        if(pe > p + 9 - json->quirks_mode && !strncmp(MinusInfinity, p, 9)) {
+        if(pe > p + 8 && !strncmp(MinusInfinity, p, 9)) {
             if (json->allow_nan) {
                 *result = CMinusInfinity;
                 {p = (( p + 10))-1;}
-                p--; {p++; cs = 21; goto _out;}
+                p--; {p++; cs = 29; goto _out;}
             } else {
                 rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p);
             }
@@ -557,31 +562,27 @@ tr2:
         if (np != NULL) {p = (( np))-1;}
         np = JSON_parse_integer(json, p, pe, result);
         if (np != NULL) {p = (( np))-1;}
-        p--; {p++; cs = 21; goto _out;}
+        p--; {p++; cs = 29; goto _out;}
     }
-	goto st21;
-tr5:
-#line 262 "parser.rl"
+	goto st29;
+tr7:
+#line 259 "parser.rl"
 	{
         char *np;
-        json->current_nesting++;
-        np = JSON_parse_array(json, p, pe, result);
-        json->current_nesting--;
-        if (np == NULL) { p--; {p++; cs = 21; goto _out;} } else {p = (( np))-1;}
+        np = JSON_parse_array(json, p, pe, result, current_nesting + 1);
+        if (np == NULL) { p--; {p++; cs = 29; goto _out;} } else {p = (( np))-1;}
     }
-	goto st21;
-tr9:
-#line 270 "parser.rl"
+	goto st29;
+tr11:
+#line 265 "parser.rl"
 	{
         char *np;
-        json->current_nesting++;
-        np =  JSON_parse_object(json, p, pe, result);
-        json->current_nesting--;
-        if (np == NULL) { p--; {p++; cs = 21; goto _out;} } else {p = (( np))-1;}
+        np =  JSON_parse_object(json, p, pe, result, current_nesting + 1);
+        if (np == NULL) { p--; {p++; cs = 29; goto _out;} } else {p = (( np))-1;}
     }
-	goto st21;
-tr16:
-#line 232 "parser.rl"
+	goto st29;
+tr25:
+#line 229 "parser.rl"
 	{
         if (json->allow_nan) {
             *result = CInfinity;
@@ -589,9 +590,9 @@ tr16:
             rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p - 8);
         }
     }
-	goto st21;
-tr18:
-#line 225 "parser.rl"
+	goto st29;
+tr27:
+#line 222 "parser.rl"
 	{
         if (json->allow_nan) {
             *result = CNaN;
@@ -599,168 +600,240 @@ tr18:
             rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p - 2);
         }
     }
-	goto st21;
-tr22:
-#line 219 "parser.rl"
+	goto st29;
+tr31:
+#line 216 "parser.rl"
 	{
         *result = Qfalse;
     }
-	goto st21;
-tr25:
-#line 216 "parser.rl"
+	goto st29;
+tr34:
+#line 213 "parser.rl"
 	{
         *result = Qnil;
     }
-	goto st21;
-tr28:
-#line 222 "parser.rl"
+	goto st29;
+tr37:
+#line 219 "parser.rl"
 	{
         *result = Qtrue;
     }
-	goto st21;
-st21:
-	if ( ++p == pe )
-		goto _test_eof21;
-case 21:
-#line 278 "parser.rl"
-	{ p--; {p++; cs = 21; goto _out;} }
-#line 628 "parser.c"
+	goto st29;
+st29:
+	if ( ++p == pe )
+		goto _test_eof29;
+case 29:
+#line 271 "parser.rl"
+	{ p--; {p++; cs = 29; goto _out;} }
+#line 630 "parser.c"
+	switch( (*p) ) {
+		case 13: goto st29;
+		case 32: goto st29;
+		case 47: goto st2;
+	}
+	if ( 9 <= (*p) && (*p) <= 10 )
+		goto st29;
 	goto st0;
 st2:
 	if ( ++p == pe )
 		goto _test_eof2;
 case 2:
-	if ( (*p) == 110 )
-		goto st3;
+	switch( (*p) ) {
+		case 42: goto st3;
+		case 47: goto st5;
+	}
 	goto st0;
 st3:
 	if ( ++p == pe )
 		goto _test_eof3;
 case 3:
-	if ( (*p) == 102 )
+	if ( (*p) == 42 )
 		goto st4;
-	goto st0;
+	goto st3;
 st4:
 	if ( ++p == pe )
 		goto _test_eof4;
 case 4:
-	if ( (*p) == 105 )
-		goto st5;
-	goto st0;
+	switch( (*p) ) {
+		case 42: goto st4;
+		case 47: goto st29;
+	}
+	goto st3;
 st5:
 	if ( ++p == pe )
 		goto _test_eof5;
 case 5:
-	if ( (*p) == 110 )
-		goto st6;
-	goto st0;
+	if ( (*p) == 10 )
+		goto st29;
+	goto st5;
 st6:
 	if ( ++p == pe )
 		goto _test_eof6;
 case 6:
-	if ( (*p) == 105 )
-		goto st7;
+	switch( (*p) ) {
+		case 42: goto st7;
+		case 47: goto st9;
+	}
 	goto st0;
 st7:
 	if ( ++p == pe )
 		goto _test_eof7;
 case 7:
-	if ( (*p) == 116 )
+	if ( (*p) == 42 )
 		goto st8;
-	goto st0;
+	goto st7;
 st8:
 	if ( ++p == pe )
 		goto _test_eof8;
 case 8:
-	if ( (*p) == 121 )
-		goto tr16;
-	goto st0;
+	switch( (*p) ) {
+		case 42: goto st8;
+		case 47: goto st1;
+	}
+	goto st7;
 st9:
 	if ( ++p == pe )
 		goto _test_eof9;
 case 9:
-	if ( (*p) == 97 )
-		goto st10;
-	goto st0;
+	if ( (*p) == 10 )
+		goto st1;
+	goto st9;
 st10:
 	if ( ++p == pe )
 		goto _test_eof10;
 case 10:
-	if ( (*p) == 78 )
-		goto tr18;
+	if ( (*p) == 110 )
+		goto st11;
 	goto st0;
 st11:
 	if ( ++p == pe )
 		goto _test_eof11;
 case 11:
-	if ( (*p) == 97 )
+	if ( (*p) == 102 )
 		goto st12;
 	goto st0;
 st12:
 	if ( ++p == pe )
 		goto _test_eof12;
 case 12:
-	if ( (*p) == 108 )
+	if ( (*p) == 105 )
 		goto st13;
 	goto st0;
 st13:
 	if ( ++p == pe )
 		goto _test_eof13;
 case 13:
-	if ( (*p) == 115 )
+	if ( (*p) == 110 )
 		goto st14;
 	goto st0;
 st14:
 	if ( ++p == pe )
 		goto _test_eof14;
 case 14:
-	if ( (*p) == 101 )
-		goto tr22;
+	if ( (*p) == 105 )
+		goto st15;
 	goto st0;
 st15:
 	if ( ++p == pe )
 		goto _test_eof15;
 case 15:
-	if ( (*p) == 117 )
+	if ( (*p) == 116 )
 		goto st16;
 	goto st0;
 st16:
 	if ( ++p == pe )
 		goto _test_eof16;
 case 16:
-	if ( (*p) == 108 )
-		goto st17;
+	if ( (*p) == 121 )
+		goto tr25;
 	goto st0;
 st17:
 	if ( ++p == pe )
 		goto _test_eof17;
 case 17:
-	if ( (*p) == 108 )
-		goto tr25;
+	if ( (*p) == 97 )
+		goto st18;
 	goto st0;
 st18:
 	if ( ++p == pe )
 		goto _test_eof18;
 case 18:
-	if ( (*p) == 114 )
-		goto st19;
+	if ( (*p) == 78 )
+		goto tr27;
 	goto st0;
 st19:
 	if ( ++p == pe )
 		goto _test_eof19;
 case 19:
-	if ( (*p) == 117 )
+	if ( (*p) == 97 )
 		goto st20;
 	goto st0;
 st20:
 	if ( ++p == pe )
 		goto _test_eof20;
 case 20:
+	if ( (*p) == 108 )
+		goto st21;
+	goto st0;
+st21:
+	if ( ++p == pe )
+		goto _test_eof21;
+case 21:
+	if ( (*p) == 115 )
+		goto st22;
+	goto st0;
+st22:
+	if ( ++p == pe )
+		goto _test_eof22;
+case 22:
 	if ( (*p) == 101 )
-		goto tr28;
+		goto tr31;
+	goto st0;
+st23:
+	if ( ++p == pe )
+		goto _test_eof23;
+case 23:
+	if ( (*p) == 117 )
+		goto st24;
+	goto st0;
+st24:
+	if ( ++p == pe )
+		goto _test_eof24;
+case 24:
+	if ( (*p) == 108 )
+		goto st25;
+	goto st0;
+st25:
+	if ( ++p == pe )
+		goto _test_eof25;
+case 25:
+	if ( (*p) == 108 )
+		goto tr34;
+	goto st0;
+st26:
+	if ( ++p == pe )
+		goto _test_eof26;
+case 26:
+	if ( (*p) == 114 )
+		goto st27;
+	goto st0;
+st27:
+	if ( ++p == pe )
+		goto _test_eof27;
+case 27:
+	if ( (*p) == 117 )
+		goto st28;
+	goto st0;
+st28:
+	if ( ++p == pe )
+		goto _test_eof28;
+case 28:
+	if ( (*p) == 101 )
+		goto tr37;
 	goto st0;
 	}
-	_test_eof21: cs = 21; goto _test_eof;
+	_test_eof1: cs = 1; goto _test_eof;
+	_test_eof29: cs = 29; goto _test_eof;
 	_test_eof2: cs = 2; goto _test_eof;
 	_test_eof3: cs = 3; goto _test_eof;
 	_test_eof4: cs = 4; goto _test_eof;
@@ -780,12 +853,24 @@ case 20:
 	_test_eof18: cs = 18; goto _test_eof;
 	_test_eof19: cs = 19; goto _test_eof;
 	_test_eof20: cs = 20; goto _test_eof;
+	_test_eof21: cs = 21; goto _test_eof;
+	_test_eof22: cs = 22; goto _test_eof;
+	_test_eof23: cs = 23; goto _test_eof;
+	_test_eof24: cs = 24; goto _test_eof;
+	_test_eof25: cs = 25; goto _test_eof;
+	_test_eof26: cs = 26; goto _test_eof;
+	_test_eof27: cs = 27; goto _test_eof;
+	_test_eof28: cs = 28; goto _test_eof;
 
 	_test_eof: {}
 	_out: {}
 	}
 
-#line 299 "parser.rl"
+#line 292 "parser.rl"
+
+    if (json->freeze) {
+        OBJ_FREEZE(*result);
+    }
 
     if (cs >= JSON_value_first_final) {
         return p;
@@ -795,7 +880,7 @@ case 20:
 }
 
 
-#line 799 "parser.c"
+#line 885 "parser.c"
 enum {JSON_integer_start = 1};
 enum {JSON_integer_first_final = 3};
 enum {JSON_integer_error = 0};
@@ -803,7 +888,7 @@ enum {JSON_integer_error = 0};
 enum {JSON_integer_en_main = 1};
 
 
-#line 315 "parser.rl"
+#line 312 "parser.rl"
 
 
 static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *result)
@@ -811,15 +896,15 @@ static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *res
     int cs = EVIL;
 
 
-#line 815 "parser.c"
+#line 901 "parser.c"
 	{
 	cs = JSON_integer_start;
 	}
 
-#line 322 "parser.rl"
+#line 319 "parser.rl"
     json->memo = p;
 
-#line 823 "parser.c"
+#line 909 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -853,14 +938,14 @@ case 3:
 		goto st0;
 	goto tr4;
 tr4:
-#line 312 "parser.rl"
+#line 309 "parser.rl"
 	{ p--; {p++; cs = 4; goto _out;} }
 	goto st4;
 st4:
 	if ( ++p == pe )
 		goto _test_eof4;
 case 4:
-#line 864 "parser.c"
+#line 950 "parser.c"
 	goto st0;
 st5:
 	if ( ++p == pe )
@@ -879,7 +964,7 @@ case 5:
 	_out: {}
 	}
 
-#line 324 "parser.rl"
+#line 321 "parser.rl"
 
     if (cs >= JSON_integer_first_final) {
         long len = p - json->memo;
@@ -894,7 +979,7 @@ case 5:
 }
 
 
-#line 898 "parser.c"
+#line 984 "parser.c"
 enum {JSON_float_start = 1};
 enum {JSON_float_first_final = 8};
 enum {JSON_float_error = 0};
@@ -902,7 +987,7 @@ enum {JSON_float_error = 0};
 enum {JSON_float_en_main = 1};
 
 
-#line 349 "parser.rl"
+#line 346 "parser.rl"
 
 
 static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *result)
@@ -910,15 +995,15 @@ static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *resul
     int cs = EVIL;
 
 
-#line 914 "parser.c"
+#line 1013 "parser.c"
 	{
 	cs = JSON_float_start;
 	}
 
-#line 356 "parser.rl"
+#line 366 "parser.rl"
     json->memo = p;
 
-#line 922 "parser.c"
+#line 1021 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -976,14 +1061,14 @@ case 8:
 		goto st0;
 	goto tr9;
 tr9:
-#line 343 "parser.rl"
+#line 340 "parser.rl"
 	{ p--; {p++; cs = 9; goto _out;} }
 	goto st9;
 st9:
 	if ( ++p == pe )
 		goto _test_eof9;
 case 9:
-#line 987 "parser.c"
+#line 1086 "parser.c"
 	goto st0;
 st5:
 	if ( ++p == pe )
@@ -1044,14 +1129,49 @@ case 7:
 	_out: {}
 	}
 
-#line 358 "parser.rl"
+#line 368 "parser.rl"
 
     if (cs >= JSON_float_first_final) {
+        VALUE mod = Qnil;
+        ID method_id = 0;
+        if (rb_respond_to(json->decimal_class, i_try_convert)) {
+            mod = json->decimal_class;
+            method_id = i_try_convert;
+        } else if (rb_respond_to(json->decimal_class, i_new)) {
+            mod = json->decimal_class;
+            method_id = i_new;
+        } else if (RB_TYPE_P(json->decimal_class, T_CLASS)) {
+            VALUE name = rb_class_name(json->decimal_class);
+            const char *name_cstr = RSTRING_PTR(name);
+            const char *last_colon = strrchr(name_cstr, ':');
+            if (last_colon) {
+                const char *mod_path_end = last_colon - 1;
+                VALUE mod_path = rb_str_substr(name, 0, mod_path_end - name_cstr);
+                mod = rb_path_to_class(mod_path);
+
+                const char *method_name_beg = last_colon + 1;
+                long before_len = method_name_beg - name_cstr;
+                long len = RSTRING_LEN(name) - before_len;
+                VALUE method_name = rb_str_substr(name, before_len, len);
+                method_id = SYM2ID(rb_str_intern(method_name));
+            } else {
+                mod = rb_mKernel;
+                method_id = SYM2ID(rb_str_intern(name));
+            }
+        }
+
         long len = p - json->memo;
         fbuffer_clear(json->fbuffer);
         fbuffer_append(json->fbuffer, json->memo, len);
         fbuffer_append_char(json->fbuffer, '\0');
-        *result = rb_float_new(rb_cstr_to_dbl(FBUFFER_PTR(json->fbuffer), 1));
+
+        if (method_id) {
+            VALUE text = rb_str_new2(FBUFFER_PTR(json->fbuffer));
+            *result = rb_funcallv(mod, method_id, 1, &text);
+        } else {
+            *result = DBL2NUM(rb_cstr_to_dbl(FBUFFER_PTR(json->fbuffer), 1));
+        }
+
         return p + 1;
     } else {
         return NULL;
@@ -1060,7 +1180,7 @@ case 7:
 
 
 
-#line 1064 "parser.c"
+#line 1173 "parser.c"
 enum {JSON_array_start = 1};
 enum {JSON_array_first_final = 17};
 enum {JSON_array_error = 0};
@@ -1068,28 +1188,28 @@ enum {JSON_array_error = 0};
 enum {JSON_array_en_main = 1};
 
 
-#line 401 "parser.rl"
+#line 421 "parser.rl"
 
 
-static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *result)
+static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *result, int current_nesting)
 {
     int cs = EVIL;
     VALUE array_class = json->array_class;
 
-    if (json->max_nesting && json->current_nesting > json->max_nesting) {
-        rb_raise(eNestingError, "nesting of %d is too deep", json->current_nesting);
+    if (json->max_nesting && current_nesting > json->max_nesting) {
+        rb_raise(eNestingError, "nesting of %d is too deep", current_nesting);
     }
     *result = NIL_P(array_class) ? rb_ary_new() : rb_class_new_instance(0, 0, array_class);
 
 
-#line 1086 "parser.c"
+#line 1195 "parser.c"
 	{
 	cs = JSON_array_start;
 	}
 
-#line 414 "parser.rl"
+#line 434 "parser.rl"
 
-#line 1093 "parser.c"
+#line 1202 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -1128,10 +1248,10 @@ case 2:
 		goto st2;
 	goto st0;
 tr2:
-#line 378 "parser.rl"
+#line 398 "parser.rl"
 	{
         VALUE v = Qnil;
-        char *np = JSON_parse_value(json, p, pe, &v);
+        char *np = JSON_parse_value(json, p, pe, &v, current_nesting);
         if (np == NULL) {
             p--; {p++; cs = 3; goto _out;}
         } else {
@@ -1148,7 +1268,7 @@ st3:
 	if ( ++p == pe )
 		goto _test_eof3;
 case 3:
-#line 1152 "parser.c"
+#line 1261 "parser.c"
 	switch( (*p) ) {
 		case 13: goto st3;
 		case 32: goto st3;
@@ -1248,14 +1368,14 @@ case 12:
 		goto st3;
 	goto st12;
 tr4:
-#line 393 "parser.rl"
+#line 413 "parser.rl"
 	{ p--; {p++; cs = 17; goto _out;} }
 	goto st17;
 st17:
 	if ( ++p == pe )
 		goto _test_eof17;
 case 17:
-#line 1259 "parser.c"
+#line 1368 "parser.c"
 	goto st0;
 st13:
 	if ( ++p == pe )
@@ -1311,7 +1431,7 @@ case 16:
 	_out: {}
 	}
 
-#line 415 "parser.rl"
+#line 435 "parser.rl"
 
     if(cs >= JSON_array_first_final) {
         return p + 1;
@@ -1356,13 +1476,21 @@ static VALUE json_string_unescape(VALUE result, char *string, char *stringEnd)
                     break;
                 case 'u':
                     if (pe > stringEnd - 4) {
-                        return Qnil;
+                      rb_enc_raise(
+                        EXC_ENCODING eParserError,
+                        "%u: incomplete unicode character escape sequence at '%s'", __LINE__, p
+                      );
                     } else {
                         UTF32 ch = unescape_unicode((unsigned char *) ++pe);
                         pe += 3;
                         if (UNI_SUR_HIGH_START == (ch & 0xFC00)) {
                             pe++;
-                            if (pe > stringEnd - 6) return Qnil;
+                            if (pe > stringEnd - 6) {
+                              rb_enc_raise(
+                                EXC_ENCODING eParserError,
+                                "%u: incomplete surrogate pair at '%s'", __LINE__, p
+                                );
+                            }
                             if (pe[0] == '\\' && pe[1] == 'u') {
                                 UTF32 sur = unescape_unicode((unsigned char *) pe + 2);
                                 ch = (((ch & 0x3F) << 10) | ((((ch >> 6) & 0xF) + 1) << 16)
@@ -1392,7 +1520,7 @@ static VALUE json_string_unescape(VALUE result, char *string, char *stringEnd)
 }
 
 
-#line 1396 "parser.c"
+#line 1513 "parser.c"
 enum {JSON_string_start = 1};
 enum {JSON_string_first_final = 8};
 enum {JSON_string_error = 0};
@@ -1400,7 +1528,7 @@ enum {JSON_string_error = 0};
 enum {JSON_string_en_main = 1};
 
 
-#line 514 "parser.rl"
+#line 542 "parser.rl"
 
 
 static int
@@ -1422,15 +1550,15 @@ static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *resu
 
     *result = rb_str_buf_new(0);
 
-#line 1426 "parser.c"
+#line 1543 "parser.c"
 	{
 	cs = JSON_string_start;
 	}
 
-#line 535 "parser.rl"
+#line 563 "parser.rl"
     json->memo = p;
 
-#line 1434 "parser.c"
+#line 1551 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -1451,11 +1579,11 @@ case 2:
 		case 34: goto tr2;
 		case 92: goto st3;
 	}
-	if ( 0 <= (*p) && (*p) <= 31 )
+	if ( 0 <= (signed char)(*p) && (*p) <= 31 )
 		goto st0;
 	goto st2;
 tr2:
-#line 500 "parser.rl"
+#line 528 "parser.rl"
 	{
         *result = json_string_unescape(*result, json->memo + 1, p);
         if (NIL_P(*result)) {
@@ -1466,14 +1594,14 @@ tr2:
             {p = (( p + 1))-1;}
         }
     }
-#line 511 "parser.rl"
+#line 539 "parser.rl"
 	{ p--; {p++; cs = 8; goto _out;} }
 	goto st8;
 st8:
 	if ( ++p == pe )
 		goto _test_eof8;
 case 8:
-#line 1477 "parser.c"
+#line 1594 "parser.c"
 	goto st0;
 st3:
 	if ( ++p == pe )
@@ -1481,7 +1609,7 @@ st3:
 case 3:
 	if ( (*p) == 117 )
 		goto st4;
-	if ( 0 <= (*p) && (*p) <= 31 )
+	if ( 0 <= (signed char)(*p) && (*p) <= 31 )
 		goto st0;
 	goto st2;
 st4:
@@ -1549,7 +1677,7 @@ case 7:
 	_out: {}
 	}
 
-#line 537 "parser.rl"
+#line 565 "parser.rl"
 
     if (json->create_additions && RTEST(match_string = json->match_string)) {
           VALUE klass;
@@ -1564,6 +1692,23 @@ case 7:
 
     if (json->symbolize_names && json->parsing_name) {
       *result = rb_str_intern(*result);
+    } else if (RB_TYPE_P(*result, T_STRING)) {
+# if STR_UMINUS_DEDUPE_FROZEN
+      if (json->freeze) {
+        // Starting from MRI 2.8 it is preferable to freeze the string
+        // before deduplication so that it can be interned directly
+        // otherwise it would be duplicated first which is wasteful.
+        *result = rb_funcall(rb_str_freeze(*result), i_uminus, 0);
+      }
+# elif STR_UMINUS_DEDUPE
+      if (json->freeze) {
+        // MRI 2.5 and older do not deduplicate strings that are already
+        // frozen.
+        *result = rb_funcall(*result, i_uminus, 0);
+      }
+# else
+      rb_str_resize(*result, RSTRING_LEN(*result));
+# endif
     }
     if (cs >= JSON_string_first_final) {
         return p + 1;
@@ -1586,41 +1731,16 @@ case 7:
 
 static VALUE convert_encoding(VALUE source)
 {
-    const char *ptr = RSTRING_PTR(source);
-    long len = RSTRING_LEN(source);
-    if (len < 2) {
-        rb_raise(eParserError, "A JSON text must at least contain two octets!");
-    }
 #ifdef HAVE_RUBY_ENCODING_H
-    {
-        rb_encoding *enc = rb_enc_get(source);
-        if (enc == rb_ascii8bit_encoding()) {
-            if (len >= 4 &&  ptr[0] == 0 && ptr[1] == 0 && ptr[2] == 0) {
-                source = rb_str_conv_enc(source, UTF_32BE, rb_utf8_encoding());
-            } else if (len >= 4 && ptr[0] == 0 && ptr[2] == 0) {
-                source = rb_str_conv_enc(source, UTF_16BE, rb_utf8_encoding());
-            } else if (len >= 4 && ptr[1] == 0 && ptr[2] == 0 && ptr[3] == 0) {
-                source = rb_str_conv_enc(source, UTF_32LE, rb_utf8_encoding());
-            } else if (len >= 4 && ptr[1] == 0 && ptr[3] == 0) {
-                source = rb_str_conv_enc(source, UTF_16LE, rb_utf8_encoding());
-            } else {
-                source = rb_str_dup(source);
-                FORCE_UTF8(source);
-            }
-        } else {
-            source = rb_str_conv_enc(source, NULL, rb_utf8_encoding());
-        }
-    }
-#else
-    if (len >= 4 &&  ptr[0] == 0 && ptr[1] == 0 && ptr[2] == 0) {
-      source = rb_funcall(mJSON, i_iconv, 3, rb_str_new2("utf-8"), rb_str_new2("utf-32be"), source);
-    } else if (len >= 4 && ptr[0] == 0 && ptr[2] == 0) {
-      source = rb_funcall(mJSON, i_iconv, 3, rb_str_new2("utf-8"), rb_str_new2("utf-16be"), source);
-    } else if (len >= 4 && ptr[1] == 0 && ptr[2] == 0 && ptr[3] == 0) {
-      source = rb_funcall(mJSON, i_iconv, 3, rb_str_new2("utf-8"), rb_str_new2("utf-32le"), source);
-    } else if (len >= 4 && ptr[1] == 0 && ptr[3] == 0) {
-      source = rb_funcall(mJSON, i_iconv, 3, rb_str_new2("utf-8"), rb_str_new2("utf-16le"), source);
+  rb_encoding *enc = rb_enc_get(source);
+  if (enc == rb_ascii8bit_encoding()) {
+    if (OBJ_FROZEN(source)) {
+      source = rb_str_dup(source);
     }
+    FORCE_UTF8(source);
+  } else {
+    source = rb_str_conv_enc(source, rb_enc_get(source), rb_utf8_encoding());
+  }
 #endif
     return source;
 }
@@ -1643,8 +1763,9 @@ static VALUE convert_encoding(VALUE source)
  *   defiance of RFC 4627 to be parsed by the Parser. This option defaults to
  *   false.
  * * *symbolize_names*: If set to true, returns symbols for the names
- *   (keys) in a JSON object. Otherwise strings are returned, which is also
- *   the default.
+ *   (keys) in a JSON object. Otherwise strings are returned, which is
+ *   also the default. It's not possible to use this option in
+ *   conjunction with the *create_additions* option.
  * * *create_additions*: If set to false, the Parser doesn't create
  *   additions even if a matching class and create_id was found. This option
  *   defaults to false.
@@ -1695,12 +1816,11 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
             } else {
                 json->symbolize_names = 0;
             }
-            tmp = ID2SYM(i_quirks_mode);
+            tmp = ID2SYM(i_freeze);
             if (option_given_p(opts, tmp)) {
-                VALUE quirks_mode = rb_hash_aref(opts, tmp);
-                json->quirks_mode = RTEST(quirks_mode) ? 1 : 0;
+                json->freeze = RTEST(rb_hash_aref(opts, tmp)) ? 1 : 0;
             } else {
-                json->quirks_mode = 0;
+                json->freeze = 0;
             }
             tmp = ID2SYM(i_create_additions);
             if (option_given_p(opts, tmp)) {
@@ -1708,6 +1828,11 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
             } else {
                 json->create_additions = 0;
             }
+            if (json->symbolize_names && json->create_additions) {
+              rb_raise(rb_eArgError,
+                "options :symbolize_names and :create_additions cannot be "
+                " used in conjunction");
+            }
             tmp = ID2SYM(i_create_id);
             if (option_given_p(opts, tmp)) {
                 json->create_id = rb_hash_aref(opts, tmp);
@@ -1726,6 +1851,12 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
             } else {
                 json->array_class = Qnil;
             }
+            tmp = ID2SYM(i_decimal_class);
+            if (option_given_p(opts, tmp)) {
+                json->decimal_class = rb_hash_aref(opts, tmp);
+            } else {
+                json->decimal_class = Qnil;
+            }
             tmp = ID2SYM(i_match_string);
             if (option_given_p(opts, tmp)) {
                 VALUE match_string = rb_hash_aref(opts, tmp);
@@ -1739,16 +1870,14 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
     } else {
         json->max_nesting = 100;
         json->allow_nan = 0;
-        json->create_additions = 1;
+        json->create_additions = 0;
         json->create_id = rb_funcall(mJSON, i_create_id, 0);
         json->object_class = Qnil;
         json->array_class = Qnil;
+        json->decimal_class = Qnil;
     }
+    source = convert_encoding(StringValue(source));
     StringValue(source);
-    if (!json->quirks_mode) {
-	source = convert_encoding(source);
-    }
-    json->current_nesting = 0;
     json->len = RSTRING_LEN(source);
     json->source = RSTRING_PTR(source);;
     json->Vsource = source;
@@ -1756,7 +1885,7 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 
-#line 1760 "parser.c"
+#line 1878 "parser.c"
 enum {JSON_start = 1};
 enum {JSON_first_final = 10};
 enum {JSON_error = 0};
@@ -1764,201 +1893,33 @@ enum {JSON_error = 0};
 enum {JSON_en_main = 1};
 
 
-#line 767 "parser.rl"
+#line 786 "parser.rl"
 
 
-static VALUE cParser_parse_strict(VALUE 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_PARSER;
+  char *p, *pe;
+  int cs = EVIL;
+  VALUE result = Qnil;
+  GET_PARSER;
 
 
-#line 1779 "parser.c"
+#line 1903 "parser.c"
 	{
 	cs = JSON_start;
 	}
 
-#line 777 "parser.rl"
-    p = json->source;
-    pe = p + json->len;
+#line 802 "parser.rl"
+  p = json->source;
+  pe = p + json->len;
 
-#line 1788 "parser.c"
-	{
-	if ( p == pe )
-		goto _test_eof;
-	switch ( cs )
-	{
-st1:
-	if ( ++p == pe )
-		goto _test_eof1;
-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:
-cs = 0;
-	goto _out;
-st2:
-	if ( ++p == pe )
-		goto _test_eof2;
-case 2:
-	switch( (*p) ) {
-		case 42: goto st3;
-		case 47: goto st5;
-	}
-	goto st0;
-st3:
-	if ( ++p == pe )
-		goto _test_eof3;
-case 3:
-	if ( (*p) == 42 )
-		goto st4;
-	goto st3;
-st4:
-	if ( ++p == pe )
-		goto _test_eof4;
-case 4:
-	switch( (*p) ) {
-		case 42: goto st4;
-		case 47: goto st1;
-	}
-	goto st3;
-st5:
-	if ( ++p == pe )
-		goto _test_eof5;
-case 5:
-	if ( (*p) == 10 )
-		goto st1;
-	goto st5;
-tr3:
-#line 756 "parser.rl"
-	{
-        char *np;
-        json->current_nesting = 1;
-        np = JSON_parse_array(json, p, pe, &result);
-        if (np == NULL) { p--; {p++; cs = 10; goto _out;} } else {p = (( np))-1;}
-    }
-	goto st10;
-tr4:
-#line 749 "parser.rl"
-	{
-        char *np;
-        json->current_nesting = 1;
-        np = JSON_parse_object(json, p, pe, &result);
-        if (np == NULL) { p--; {p++; cs = 10; goto _out;} } else {p = (( np))-1;}
-    }
-	goto st10;
-st10:
-	if ( ++p == pe )
-		goto _test_eof10;
-case 10:
-#line 1865 "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 _test_eof6;
-case 6:
-	switch( (*p) ) {
-		case 42: goto st7;
-		case 47: goto st9;
-	}
-	goto st0;
-st7:
-	if ( ++p == pe )
-		goto _test_eof7;
-case 7:
-	if ( (*p) == 42 )
-		goto st8;
-	goto st7;
-st8:
-	if ( ++p == pe )
-		goto _test_eof8;
-case 8:
-	switch( (*p) ) {
-		case 42: goto st8;
-		case 47: goto st10;
-	}
-	goto st7;
-st9:
-	if ( ++p == pe )
-		goto _test_eof9;
-case 9:
-	if ( (*p) == 10 )
-		goto st10;
-	goto st9;
-	}
-	_test_eof1: cs = 1; goto _test_eof;
-	_test_eof2: cs = 2; goto _test_eof;
-	_test_eof3: cs = 3; goto _test_eof;
-	_test_eof4: cs = 4; goto _test_eof;
-	_test_eof5: cs = 5; goto _test_eof;
-	_test_eof10: cs = 10; goto _test_eof;
-	_test_eof6: cs = 6; goto _test_eof;
-	_test_eof7: cs = 7; goto _test_eof;
-	_test_eof8: cs = 8; goto _test_eof;
-	_test_eof9: cs = 9; goto _test_eof;
-
-	_test_eof: {}
-	_out: {}
-	}
-
-#line 780 "parser.rl"
-
-    if (cs >= JSON_first_final && p == pe) {
-        return result;
-    } else {
-        rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p);
-        return Qnil;
-    }
-}
-
-
-
-#line 1934 "parser.c"
-enum {JSON_quirks_mode_start = 1};
-enum {JSON_quirks_mode_first_final = 10};
-enum {JSON_quirks_mode_error = 0};
-
-enum {JSON_quirks_mode_en_main = 1};
-
-
-#line 805 "parser.rl"
-
-
-static VALUE cParser_parse_quirks_mode(VALUE self)
-{
-    char *p, *pe;
-    int cs = EVIL;
-    VALUE result = Qnil;
-    GET_PARSER;
-
-
-#line 1953 "parser.c"
-	{
-	cs = JSON_quirks_mode_start;
-	}
-
-#line 815 "parser.rl"
-    p = json->source;
-    pe = p + json->len;
-
-#line 1962 "parser.c"
+#line 1912 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -1992,9 +1953,9 @@ st0:
 cs = 0;
 	goto _out;
 tr2:
-#line 797 "parser.rl"
+#line 778 "parser.rl"
 	{
-        char *np = JSON_parse_value(json, p, pe, &result);
+        char *np = JSON_parse_value(json, p, pe, &result, 0);
         if (np == NULL) { p--; {p++; cs = 10; goto _out;} } else {p = (( np))-1;}
     }
 	goto st10;
@@ -2002,7 +1963,7 @@ st10:
 	if ( ++p == pe )
 		goto _test_eof10;
 case 10:
-#line 2006 "parser.c"
+#line 1956 "parser.c"
 	switch( (*p) ) {
 		case 13: goto st10;
 		case 32: goto st10;
@@ -2091,30 +2052,13 @@ case 9:
 	_out: {}
 	}
 
-#line 818 "parser.rl"
-
-    if (cs >= JSON_quirks_mode_first_final && p == pe) {
-        return result;
-    } else {
-        rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p);
-        return Qnil;
-    }
-}
-
-/*
- * call-seq: parse()
- *
- *  Parses the current JSON text _source_ and returns the complete data
- *  structure as a result.
- */
-static VALUE cParser_parse(VALUE self)
-{
-  GET_PARSER;
+#line 805 "parser.rl"
 
-  if (json->quirks_mode) {
-    return cParser_parse_quirks_mode(self);
+  if (cs >= JSON_first_final && p == pe) {
+    return result;
   } else {
-    return cParser_parse_strict(self);
+    rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p);
+    return Qnil;
   }
 }
 
@@ -2125,6 +2069,7 @@ static void JSON_mark(void *ptr)
     rb_gc_mark_maybe(json->create_id);
     rb_gc_mark_maybe(json->object_class);
     rb_gc_mark_maybe(json->array_class);
+    rb_gc_mark_maybe(json->decimal_class);
     rb_gc_mark_maybe(json->match_string);
 }
 
@@ -2172,35 +2117,34 @@ static VALUE cParser_source(VALUE self)
     return rb_str_dup(json->Vsource);
 }
 
-/*
- * call-seq: quirks_mode?()
- *
- * Returns a true, if this parser is in quirks_mode, false otherwise.
- */
-static VALUE cParser_quirks_mode_p(VALUE self)
-{
-    GET_PARSER;
-    return json->quirks_mode ? Qtrue : Qfalse;
-}
-
-
 void Init_parser(void)
 {
+#ifdef HAVE_RB_EXT_RACTOR_SAFE
+    rb_ext_ractor_safe(true);
+#endif
+
+#undef rb_intern
     rb_require("json/common");
     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_gc_register_mark_object(eParserError);
+    rb_gc_register_mark_object(eNestingError);
     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);
-    rb_define_method(cParser, "quirks_mode?", cParser_quirks_mode_p, 0);
 
     CNaN = rb_const_get(mJSON, rb_intern("NaN"));
+    rb_gc_register_mark_object(CNaN);
+
     CInfinity = rb_const_get(mJSON, rb_intern("Infinity"));
+    rb_gc_register_mark_object(CInfinity);
+
     CMinusInfinity = rb_const_get(mJSON, rb_intern("MinusInfinity"));
+    rb_gc_register_mark_object(CMinusInfinity);
 
     i_json_creatable_p = rb_intern("json_creatable?");
     i_json_create = rb_intern("json_create");
@@ -2210,9 +2154,9 @@ void Init_parser(void)
     i_max_nesting = rb_intern("max_nesting");
     i_allow_nan = rb_intern("allow_nan");
     i_symbolize_names = rb_intern("symbolize_names");
-    i_quirks_mode = rb_intern("quirks_mode");
     i_object_class = rb_intern("object_class");
     i_array_class = rb_intern("array_class");
+    i_decimal_class = rb_intern("decimal_class");
     i_match = rb_intern("match");
     i_match_string = rb_intern("match_string");
     i_key_p = rb_intern("key?");
@@ -2220,15 +2164,10 @@ void Init_parser(void)
     i_aset = rb_intern("[]=");
     i_aref = rb_intern("[]");
     i_leftshift = rb_intern("<<");
-#ifdef HAVE_RUBY_ENCODING_H
-    UTF_8 = rb_utf8_encoding();
-    UTF_16BE = rb_enc_find("utf-16be");
-    UTF_16LE = rb_enc_find("utf-16le");
-    UTF_32BE = rb_enc_find("utf-32be");
-    UTF_32LE = rb_enc_find("utf-32le");
-#else
-    i_iconv = rb_intern("iconv");
-#endif
+    i_new = rb_intern("new");
+    i_try_convert = rb_intern("try_convert");
+    i_freeze = rb_intern("freeze");
+    i_uminus = rb_intern("-@");
 }
 
 /*
diff --git a/ext/json/parser/parser.h b/ext/json/parser/parser.h
index abcc2571f1..e3eb920cc6 100644
--- a/ext/json/parser/parser.h
+++ b/ext/json/parser/parser.h
@@ -34,13 +34,13 @@ typedef struct JSON_ParserStruct {
     char *memo;
     VALUE create_id;
     int max_nesting;
-    int current_nesting;
     int allow_nan;
     int parsing_name;
     int symbolize_names;
-    int quirks_mode;
+    int freeze;
     VALUE object_class;
     VALUE array_class;
+    VALUE decimal_class;
     int create_additions;
     VALUE match_string;
     FBuffer *fbuffer;
@@ -58,11 +58,11 @@ typedef struct JSON_ParserStruct {
 
 static UTF32 unescape_unicode(const unsigned char *p);
 static int convert_UTF32_to_UTF8(char *buf, UTF32 ch);
-static char *JSON_parse_object(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_object(JSON_Parser *json, char *p, char *pe, VALUE *result, int current_nesting);
+static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *result, int current_nesting);
 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);
-static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *result);
+static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *result, int current_nesting);
 static VALUE json_string_unescape(VALUE result, char *string, char *stringEnd);
 static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *result);
 static VALUE convert_encoding(VALUE source);
diff --git a/ext/json/parser/parser.rl b/ext/json/parser/parser.rl
index 2fa0caee7a..1da70c544c 100644
--- a/ext/json/parser/parser.rl
+++ b/ext/json/parser/parser.rl
@@ -2,7 +2,7 @@
 #include "parser.h"
 
 #if defined HAVE_RUBY_ENCODING_H
-# define EXC_ENCODING UTF_8,
+# define EXC_ENCODING rb_utf8_encoding(),
 # ifndef HAVE_RB_ENC_RAISE
 static void
 enc_raise(rb_encoding *enc, VALUE exc, const char *fmt, ...)
@@ -25,7 +25,7 @@ enc_raise(rb_encoding *enc, VALUE exc, const char *fmt, ...)
 
 /* unicode */
 
-static const char digit_values[256] = {
+static const signed char digit_values[256] = {
     -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
     -1, -1, -1, -1, -1, -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, 2, 3, 4, 5, 6, 7, 8, 9, -1,
@@ -44,7 +44,7 @@ static const char digit_values[256] = {
 
 static UTF32 unescape_unicode(const unsigned char *p)
 {
-    char b;
+    signed char b;
     UTF32 result = 0;
     b = digit_values[p[0]];
     if (b < 0) return UNI_REPLACEMENT_CHAR;
@@ -87,19 +87,14 @@ static int convert_UTF32_to_UTF8(char *buf, UTF32 ch)
     return len;
 }
 
-#ifdef HAVE_RUBY_ENCODING_H
-static rb_encoding *UTF_8, *UTF_16BE, *UTF_16LE, *UTF_32BE, *UTF_32LE;
-#else
-static ID i_iconv;
-#endif
-
 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, i_symbolize_names, i_quirks_mode,
-          i_object_class, i_array_class, i_key_p, i_deep_const_get, i_match,
-          i_match_string, i_aset, i_aref, i_leftshift;
+          i_chr, i_max_nesting, i_allow_nan, i_symbolize_names,
+          i_object_class, i_array_class, i_decimal_class, i_key_p,
+          i_deep_const_get, i_match, i_match_string, i_aset, i_aref,
+          i_leftshift, i_new, i_try_convert, i_freeze, i_uminus;
 
 %%{
     machine JSON_common;
@@ -137,11 +132,12 @@ static ID i_json_creatable_p, i_json_create, i_create_id, i_create_additions,
 
     action parse_value {
         VALUE v = Qnil;
-        char *np = JSON_parse_value(json, fpc, pe, &v);
+        char *np = JSON_parse_value(json, fpc, pe, &v, current_nesting);
         if (np == NULL) {
             fhold; fbreak;
         } else {
             if (NIL_P(json->object_class)) {
+                OBJ_FREEZE(last_name);
                 rb_hash_aset(*result, last_name, v);
             } else {
                 rb_funcall(*result, i_aset, 2, last_name, v);
@@ -170,14 +166,14 @@ static ID i_json_creatable_p, i_json_create, i_create_id, i_create_additions,
     ) @exit;
 }%%
 
-static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *result)
+static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *result, int current_nesting)
 {
     int cs = EVIL;
     VALUE last_name = Qnil;
     VALUE object_class = json->object_class;
 
-    if (json->max_nesting && json->current_nesting > json->max_nesting) {
-        rb_raise(eNestingError, "nesting of %d is too deep", json->current_nesting);
+    if (json->max_nesting && current_nesting > json->max_nesting) {
+        rb_raise(eNestingError, "nesting of %d is too deep", current_nesting);
     }
 
     *result = NIL_P(object_class) ? rb_hash_new() : rb_class_new_instance(0, 0, object_class);
@@ -243,7 +239,7 @@ static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *resu
 
     action parse_number {
         char *np;
-        if(pe > fpc + 9 - json->quirks_mode && !strncmp(MinusInfinity, fpc, 9)) {
+        if(pe > fpc + 8 && !strncmp(MinusInfinity, fpc, 9)) {
             if (json->allow_nan) {
                 *result = CMinusInfinity;
                 fexec p + 10;
@@ -261,23 +257,19 @@ static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *resu
 
     action parse_array {
         char *np;
-        json->current_nesting++;
-        np = JSON_parse_array(json, fpc, pe, result);
-        json->current_nesting--;
+        np = JSON_parse_array(json, fpc, pe, result, current_nesting + 1);
         if (np == NULL) { fhold; fbreak; } else fexec np;
     }
 
     action parse_object {
         char *np;
-        json->current_nesting++;
-        np =  JSON_parse_object(json, fpc, pe, result);
-        json->current_nesting--;
+        np =  JSON_parse_object(json, fpc, pe, result, current_nesting + 1);
         if (np == NULL) { fhold; fbreak; } else fexec np;
     }
 
     action exit { fhold; fbreak; }
 
-main := (
+main := ignore* (
               Vnull @parse_null |
               Vfalse @parse_false |
               Vtrue @parse_true |
@@ -287,16 +279,20 @@ main := (
               begin_string >parse_string |
               begin_array >parse_array |
               begin_object >parse_object
-        ) %*exit;
+        ) ignore* %*exit;
 }%%
 
-static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *result)
+static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *result, int current_nesting)
 {
     int cs = EVIL;
 
     %% write init;
     %% write exec;
 
+    if (json->freeze) {
+        OBJ_FREEZE(*result);
+    }
+
     if (cs >= JSON_value_first_final) {
         return p;
     } else {
@@ -357,11 +353,46 @@ static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *resul
     %% write exec;
 
     if (cs >= JSON_float_first_final) {
+        VALUE mod = Qnil;
+        ID method_id = 0;
+        if (rb_respond_to(json->decimal_class, i_try_convert)) {
+            mod = json->decimal_class;
+            method_id = i_try_convert;
+        } else if (rb_respond_to(json->decimal_class, i_new)) {
+            mod = json->decimal_class;
+            method_id = i_new;
+        } else if (RB_TYPE_P(json->decimal_class, T_CLASS)) {
+            VALUE name = rb_class_name(json->decimal_class);
+            const char *name_cstr = RSTRING_PTR(name);
+            const char *last_colon = strrchr(name_cstr, ':');
+            if (last_colon) {
+                const char *mod_path_end = last_colon - 1;
+                VALUE mod_path = rb_str_substr(name, 0, mod_path_end - name_cstr);
+                mod = rb_path_to_class(mod_path);
+
+                const char *method_name_beg = last_colon + 1;
+                long before_len = method_name_beg - name_cstr;
+                long len = RSTRING_LEN(name) - before_len;
+                VALUE method_name = rb_str_substr(name, before_len, len);
+                method_id = SYM2ID(rb_str_intern(method_name));
+            } else {
+                mod = rb_mKernel;
+                method_id = SYM2ID(rb_str_intern(name));
+            }
+        }
+
         long len = p - json->memo;
         fbuffer_clear(json->fbuffer);
         fbuffer_append(json->fbuffer, json->memo, len);
         fbuffer_append_char(json->fbuffer, '\0');
-        *result = rb_float_new(rb_cstr_to_dbl(FBUFFER_PTR(json->fbuffer), 1));
+
+        if (method_id) {
+            VALUE text = rb_str_new2(FBUFFER_PTR(json->fbuffer));
+            *result = rb_funcallv(mod, method_id, 1, &text);
+        } else {
+            *result = DBL2NUM(rb_cstr_to_dbl(FBUFFER_PTR(json->fbuffer), 1));
+        }
+
         return p + 1;
     } else {
         return NULL;
@@ -377,7 +408,7 @@ static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *resul
 
     action parse_value {
         VALUE v = Qnil;
-        char *np = JSON_parse_value(json, fpc, pe, &v);
+        char *np = JSON_parse_value(json, fpc, pe, &v, current_nesting);
         if (np == NULL) {
             fhold; fbreak;
         } else {
@@ -400,13 +431,13 @@ static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *resul
           end_array @exit;
 }%%
 
-static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *result)
+static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *result, int current_nesting)
 {
     int cs = EVIL;
     VALUE array_class = json->array_class;
 
-    if (json->max_nesting && json->current_nesting > json->max_nesting) {
-        rb_raise(eNestingError, "nesting of %d is too deep", json->current_nesting);
+    if (json->max_nesting && current_nesting > json->max_nesting) {
+        rb_raise(eNestingError, "nesting of %d is too deep", current_nesting);
     }
     *result = NIL_P(array_class) ? rb_ary_new() : rb_class_new_instance(0, 0, array_class);
 
@@ -456,13 +487,21 @@ static VALUE json_string_unescape(VALUE result, char *string, char *stringEnd)
                     break;
                 case 'u':
                     if (pe > stringEnd - 4) {
-                        return Qnil;
+                      rb_enc_raise(
+                        EXC_ENCODING eParserError,
+                        "%u: incomplete unicode character escape sequence at '%s'", __LINE__, p
+                      );
                     } else {
                         UTF32 ch = unescape_unicode((unsigned char *) ++pe);
                         pe += 3;
                         if (UNI_SUR_HIGH_START == (ch & 0xFC00)) {
                             pe++;
-                            if (pe > stringEnd - 6) return Qnil;
+                            if (pe > stringEnd - 6) {
+                              rb_enc_raise(
+                                EXC_ENCODING eParserError,
+                                "%u: incomplete surrogate pair at '%s'", __LINE__, p
+                                );
+                            }
                             if (pe[0] == '\\' && pe[1] == 'u') {
                                 UTF32 sur = unescape_unicode((unsigned char *) pe + 2);
                                 ch = (((ch & 0x3F) << 10) | ((((ch >> 6) & 0xF) + 1) << 16)
@@ -548,6 +587,23 @@ static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *resu
 
     if (json->symbolize_names && json->parsing_name) {
       *result = rb_str_intern(*result);
+    } else if (RB_TYPE_P(*result, T_STRING)) {
+# if STR_UMINUS_DEDUPE_FROZEN
+      if (json->freeze) {
+        // Starting from MRI 2.8 it is preferable to freeze the string
+        // before deduplication so that it can be interned directly
+        // otherwise it would be duplicated first which is wasteful.
+        *result = rb_funcall(rb_str_freeze(*result), i_uminus, 0);
+      }
+# elif STR_UMINUS_DEDUPE
+      if (json->freeze) {
+        // MRI 2.5 and older do not deduplicate strings that are already
+        // frozen.
+        *result = rb_funcall(*result, i_uminus, 0);
+      }
+# else
+      rb_str_resize(*result, RSTRING_LEN(*result));
+# endif
     }
     if (cs >= JSON_string_first_final) {
         return p + 1;
@@ -570,41 +626,16 @@ static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *resu
 
 static VALUE convert_encoding(VALUE source)
 {
-    const char *ptr = RSTRING_PTR(source);
-    long len = RSTRING_LEN(source);
-    if (len < 2) {
-        rb_raise(eParserError, "A JSON text must at least contain two octets!");
-    }
 #ifdef HAVE_RUBY_ENCODING_H
-    {
-        rb_encoding *enc = rb_enc_get(source);
-        if (enc == rb_ascii8bit_encoding()) {
-            if (len >= 4 &&  ptr[0] == 0 && ptr[1] == 0 && ptr[2] == 0) {
-                source = rb_str_conv_enc(source, UTF_32BE, rb_utf8_encoding());
-            } else if (len >= 4 && ptr[0] == 0 && ptr[2] == 0) {
-                source = rb_str_conv_enc(source, UTF_16BE, rb_utf8_encoding());
-            } else if (len >= 4 && ptr[1] == 0 && ptr[2] == 0 && ptr[3] == 0) {
-                source = rb_str_conv_enc(source, UTF_32LE, rb_utf8_encoding());
-            } else if (len >= 4 && ptr[1] == 0 && ptr[3] == 0) {
-                source = rb_str_conv_enc(source, UTF_16LE, rb_utf8_encoding());
-            } else {
-                source = rb_str_dup(source);
-                FORCE_UTF8(source);
-            }
-        } else {
-            source = rb_str_conv_enc(source, NULL, rb_utf8_encoding());
-        }
-    }
-#else
-    if (len >= 4 &&  ptr[0] == 0 && ptr[1] == 0 && ptr[2] == 0) {
-      source = rb_funcall(mJSON, i_iconv, 3, rb_str_new2("utf-8"), rb_str_new2("utf-32be"), source);
-    } else if (len >= 4 && ptr[0] == 0 && ptr[2] == 0) {
-      source = rb_funcall(mJSON, i_iconv, 3, rb_str_new2("utf-8"), rb_str_new2("utf-16be"), source);
-    } else if (len >= 4 && ptr[1] == 0 && ptr[2] == 0 && ptr[3] == 0) {
-      source = rb_funcall(mJSON, i_iconv, 3, rb_str_new2("utf-8"), rb_str_new2("utf-32le"), source);
-    } else if (len >= 4 && ptr[1] == 0 && ptr[3] == 0) {
-      source = rb_funcall(mJSON, i_iconv, 3, rb_str_new2("utf-8"), rb_str_new2("utf-16le"), source);
+  rb_encoding *enc = rb_enc_get(source);
+  if (enc == rb_ascii8bit_encoding()) {
+    if (OBJ_FROZEN(source)) {
+      source = rb_str_dup(source);
     }
+    FORCE_UTF8(source);
+  } else {
+    source = rb_str_conv_enc(source, rb_enc_get(source), rb_utf8_encoding());
+  }
 #endif
     return source;
 }
@@ -627,8 +658,9 @@ static VALUE convert_encoding(VALUE source)
  *   defiance of RFC 4627 to be parsed by the Parser. This option defaults to
  *   false.
  * * *symbolize_names*: If set to true, returns symbols for the names
- *   (keys) in a JSON object. Otherwise strings are returned, which is also
- *   the default.
+ *   (keys) in a JSON object. Otherwise strings are returned, which is
+ *   also the default. It's not possible to use this option in
+ *   conjunction with the *create_additions* option.
  * * *create_additions*: If set to false, the Parser doesn't create
  *   additions even if a matching class and create_id was found. This option
  *   defaults to false.
@@ -679,12 +711,11 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
             } else {
                 json->symbolize_names = 0;
             }
-            tmp = ID2SYM(i_quirks_mode);
+            tmp = ID2SYM(i_freeze);
             if (option_given_p(opts, tmp)) {
-                VALUE quirks_mode = rb_hash_aref(opts, tmp);
-                json->quirks_mode = RTEST(quirks_mode) ? 1 : 0;
+                json->freeze = RTEST(rb_hash_aref(opts, tmp)) ? 1 : 0;
             } else {
-                json->quirks_mode = 0;
+                json->freeze = 0;
             }
             tmp = ID2SYM(i_create_additions);
             if (option_given_p(opts, tmp)) {
@@ -692,6 +723,11 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
             } else {
                 json->create_additions = 0;
             }
+            if (json->symbolize_names && json->create_additions) {
+              rb_raise(rb_eArgError,
+                "options :symbolize_names and :create_additions cannot be "
+                " used in conjunction");
+            }
             tmp = ID2SYM(i_create_id);
             if (option_given_p(opts, tmp)) {
                 json->create_id = rb_hash_aref(opts, tmp);
@@ -710,6 +746,12 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
             } else {
                 json->array_class = Qnil;
             }
+            tmp = ID2SYM(i_decimal_class);
+            if (option_given_p(opts, tmp)) {
+                json->decimal_class = rb_hash_aref(opts, tmp);
+            } else {
+                json->decimal_class = Qnil;
+            }
             tmp = ID2SYM(i_match_string);
             if (option_given_p(opts, tmp)) {
                 VALUE match_string = rb_hash_aref(opts, tmp);
@@ -723,16 +765,14 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
     } else {
         json->max_nesting = 100;
         json->allow_nan = 0;
-        json->create_additions = 1;
+        json->create_additions = 0;
         json->create_id = rb_funcall(mJSON, i_create_id, 0);
         json->object_class = Qnil;
         json->array_class = Qnil;
+        json->decimal_class = Qnil;
     }
+    source = convert_encoding(StringValue(source));
     StringValue(source);
-    if (!json->quirks_mode) {
-	source = convert_encoding(source);
-    }
-    json->current_nesting = 0;
     json->len = RSTRING_LEN(source);
     json->source = RSTRING_PTR(source);;
     json->Vsource = source;
@@ -746,56 +786,8 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
 
     include JSON_common;
 
-    action parse_object {
-        char *np;
-        json->current_nesting = 1;
-        np = JSON_parse_object(json, fpc, pe, &result);
-        if (np == NULL) { fhold; fbreak; } else fexec np;
-    }
-
-    action parse_array {
-        char *np;
-        json->current_nesting = 1;
-        np = JSON_parse_array(json, fpc, pe, &result);
-        if (np == NULL) { fhold; fbreak; } else fexec np;
-    }
-
-    main := ignore* (
-            begin_object >parse_object |
-            begin_array >parse_array
-            ) ignore*;
-}%%
-
-static VALUE cParser_parse_strict(VALUE self)
-{
-    char *p, *pe;
-    int cs = EVIL;
-    VALUE result = Qnil;
-    GET_PARSER;
-
-    %% write init;
-    p = json->source;
-    pe = p + json->len;
-    %% write exec;
-
-    if (cs >= JSON_first_final && p == pe) {
-        return result;
-    } else {
-        rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p);
-        return Qnil;
-    }
-}
-
-
-%%{
-    machine JSON_quirks_mode;
-
-    write data;
-
-    include JSON_common;
-
     action parse_value {
-        char *np = JSON_parse_value(json, fpc, pe, &result);
+        char *np = JSON_parse_value(json, fpc, pe, &result, 0);
         if (np == NULL) { fhold; fbreak; } else fexec np;
     }
 
@@ -804,26 +796,6 @@ static VALUE cParser_parse_strict(VALUE self)
             ) ignore*;
 }%%
 
-static VALUE cParser_parse_quirks_mode(VALUE self)
-{
-    char *p, *pe;
-    int cs = EVIL;
-    VALUE result = Qnil;
-    GET_PARSER;
-
-    %% write init;
-    p = json->source;
-    pe = p + json->len;
-    %% write exec;
-
-    if (cs >= JSON_quirks_mode_first_final && p == pe) {
-        return result;
-    } else {
-        rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p);
-        return Qnil;
-    }
-}
-
 /*
  * call-seq: parse()
  *
@@ -832,12 +804,21 @@ static VALUE cParser_parse_quirks_mode(VALUE self)
  */
 static VALUE cParser_parse(VALUE self)
 {
+  char *p, *pe;
+  int cs = EVIL;
+  VALUE result = Qnil;
   GET_PARSER;
 
-  if (json->quirks_mode) {
-    return cParser_parse_quirks_mode(self);
+  %% write init;
+  p = json->source;
+  pe = p + json->len;
+  %% write exec;
+
+  if (cs >= JSON_first_final && p == pe) {
+    return result;
   } else {
-    return cParser_parse_strict(self);
+    rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p);
+    return Qnil;
   }
 }
 
@@ -848,6 +829,7 @@ static void JSON_mark(void *ptr)
     rb_gc_mark_maybe(json->create_id);
     rb_gc_mark_maybe(json->object_class);
     rb_gc_mark_maybe(json->array_class);
+    rb_gc_mark_maybe(json->decimal_class);
     rb_gc_mark_maybe(json->match_string);
 }
 
@@ -895,35 +877,34 @@ static VALUE cParser_source(VALUE self)
     return rb_str_dup(json->Vsource);
 }
 
-/*
- * call-seq: quirks_mode?()
- *
- * Returns a true, if this parser is in quirks_mode, false otherwise.
- */
-static VALUE cParser_quirks_mode_p(VALUE self)
-{
-    GET_PARSER;
-    return json->quirks_mode ? Qtrue : Qfalse;
-}
-
-
 void Init_parser(void)
 {
+#ifdef HAVE_RB_EXT_RACTOR_SAFE
+    rb_ext_ractor_safe(true);
+#endif
+
+#undef rb_intern
     rb_require("json/common");
     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_gc_register_mark_object(eParserError);
+    rb_gc_register_mark_object(eNestingError);
     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);
-    rb_define_method(cParser, "quirks_mode?", cParser_quirks_mode_p, 0);
 
     CNaN = rb_const_get(mJSON, rb_intern("NaN"));
+    rb_gc_register_mark_object(CNaN);
+
     CInfinity = rb_const_get(mJSON, rb_intern("Infinity"));
+    rb_gc_register_mark_object(CInfinity);
+
     CMinusInfinity = rb_const_get(mJSON, rb_intern("MinusInfinity"));
+    rb_gc_register_mark_object(CMinusInfinity);
 
     i_json_creatable_p = rb_intern("json_creatable?");
     i_json_create = rb_intern("json_create");
@@ -933,9 +914,9 @@ void Init_parser(void)
     i_max_nesting = rb_intern("max_nesting");
     i_allow_nan = rb_intern("allow_nan");
     i_symbolize_names = rb_intern("symbolize_names");
-    i_quirks_mode = rb_intern("quirks_mode");
     i_object_class = rb_intern("object_class");
     i_array_class = rb_intern("array_class");
+    i_decimal_class = rb_intern("decimal_class");
     i_match = rb_intern("match");
     i_match_string = rb_intern("match_string");
     i_key_p = rb_intern("key?");
@@ -943,15 +924,10 @@ void Init_parser(void)
     i_aset = rb_intern("[]=");
     i_aref = rb_intern("[]");
     i_leftshift = rb_intern("<<");
-#ifdef HAVE_RUBY_ENCODING_H
-    UTF_8 = rb_utf8_encoding();
-    UTF_16BE = rb_enc_find("utf-16be");
-    UTF_16LE = rb_enc_find("utf-16le");
-    UTF_32BE = rb_enc_find("utf-32be");
-    UTF_32LE = rb_enc_find("utf-32le");
-#else
-    i_iconv = rb_intern("iconv");
-#endif
+    i_new = rb_intern("new");
+    i_try_convert = rb_intern("try_convert");
+    i_freeze = rb_intern("freeze");
+    i_uminus = rb_intern("-@");
 }
 
 /*
diff --git a/ext/json/parser/prereq.mk b/ext/json/parser/prereq.mk
index be7bcb4319..9111431ab8 100644
--- a/ext/json/parser/prereq.mk
+++ b/ext/json/parser/prereq.mk
@@ -5,6 +5,8 @@ RAGEL = ragel
 .rl.c:
 	$(RAGEL) -G2 $<
 	$(BASERUBY) -pli -e '$$_.sub!(/[ \t]+$$/, "")' \
-	-e '$$_.sub!(/^static const int (JSON_.*=.*);$$/, "enum {\\1};")' $@
+	-e '$$_.sub!(/^static const int (JSON_.*=.*);$$/, "enum {\\1};")' \
+	-e '$$_.sub!(/0 <= \(\*p\) && \(\*p\) <= 31/, "0 <= (signed char)(*p) && (*p) <= 31")' \
+	-e '$$_ = "/* This file is automatically generated from parser.rl by using ragel */" + $$_ if $$. == 1' $@
 
 parser.c:
diff --git a/ext/mathn/complex/complex.c b/ext/mathn/complex/complex.c
deleted file mode 100644
index dce494959f..0000000000
--- a/ext/mathn/complex/complex.c
+++ /dev/null
@@ -1,7 +0,0 @@
-extern void nucomp_canonicalization(int);
-
-void
-Init_complex(void)
-{
-    nucomp_canonicalization(1);
-}
diff --git a/ext/mathn/complex/extconf.rb b/ext/mathn/complex/extconf.rb
deleted file mode 100644
index a3f45ac4fc..0000000000
--- a/ext/mathn/complex/extconf.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-# frozen_string_literal: false
-require "mkmf"
-
-create_makefile "mathn/complex"
diff --git a/ext/mathn/rational/extconf.rb b/ext/mathn/rational/extconf.rb
deleted file mode 100644
index 4e4cc5f621..0000000000
--- a/ext/mathn/rational/extconf.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-# frozen_string_literal: false
-require "mkmf"
-
-create_makefile "mathn/rational"
diff --git a/ext/mathn/rational/rational.c b/ext/mathn/rational/rational.c
deleted file mode 100644
index 2ac5999946..0000000000
--- a/ext/mathn/rational/rational.c
+++ /dev/null
@@ -1,7 +0,0 @@
-extern void nurat_canonicalization(int);
-
-void
-Init_rational(void)
-{
-    nurat_canonicalization(1);
-}
diff --git a/ext/monitor/depend b/ext/monitor/depend
new file mode 100644
index 0000000000..fe9ec68806
--- /dev/null
+++ b/ext/monitor/depend
@@ -0,0 +1,162 @@
+# AUTOGENERATED DEPENDENCIES START
+monitor.o: $(RUBY_EXTCONF_H)
+monitor.o: $(arch_hdrdir)/ruby/config.h
+monitor.o: $(hdrdir)/ruby/internal/anyargs.h
+monitor.o: $(hdrdir)/ruby/internal/arithmetic.h
+monitor.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+monitor.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+monitor.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+monitor.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+monitor.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+monitor.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+monitor.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+monitor.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+monitor.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+monitor.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+monitor.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+monitor.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+monitor.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+monitor.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+monitor.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+monitor.o: $(hdrdir)/ruby/internal/assume.h
+monitor.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+monitor.o: $(hdrdir)/ruby/internal/attr/artificial.h
+monitor.o: $(hdrdir)/ruby/internal/attr/cold.h
+monitor.o: $(hdrdir)/ruby/internal/attr/const.h
+monitor.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+monitor.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+monitor.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+monitor.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+monitor.o: $(hdrdir)/ruby/internal/attr/error.h
+monitor.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+monitor.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+monitor.o: $(hdrdir)/ruby/internal/attr/format.h
+monitor.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+monitor.o: $(hdrdir)/ruby/internal/attr/noalias.h
+monitor.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+monitor.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+monitor.o: $(hdrdir)/ruby/internal/attr/noinline.h
+monitor.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+monitor.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+monitor.o: $(hdrdir)/ruby/internal/attr/pure.h
+monitor.o: $(hdrdir)/ruby/internal/attr/restrict.h
+monitor.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+monitor.o: $(hdrdir)/ruby/internal/attr/warning.h
+monitor.o: $(hdrdir)/ruby/internal/attr/weakref.h
+monitor.o: $(hdrdir)/ruby/internal/cast.h
+monitor.o: $(hdrdir)/ruby/internal/compiler_is.h
+monitor.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+monitor.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+monitor.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+monitor.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+monitor.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+monitor.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+monitor.o: $(hdrdir)/ruby/internal/compiler_since.h
+monitor.o: $(hdrdir)/ruby/internal/config.h
+monitor.o: $(hdrdir)/ruby/internal/constant_p.h
+monitor.o: $(hdrdir)/ruby/internal/core.h
+monitor.o: $(hdrdir)/ruby/internal/core/rarray.h
+monitor.o: $(hdrdir)/ruby/internal/core/rbasic.h
+monitor.o: $(hdrdir)/ruby/internal/core/rbignum.h
+monitor.o: $(hdrdir)/ruby/internal/core/rclass.h
+monitor.o: $(hdrdir)/ruby/internal/core/rdata.h
+monitor.o: $(hdrdir)/ruby/internal/core/rfile.h
+monitor.o: $(hdrdir)/ruby/internal/core/rhash.h
+monitor.o: $(hdrdir)/ruby/internal/core/robject.h
+monitor.o: $(hdrdir)/ruby/internal/core/rregexp.h
+monitor.o: $(hdrdir)/ruby/internal/core/rstring.h
+monitor.o: $(hdrdir)/ruby/internal/core/rstruct.h
+monitor.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+monitor.o: $(hdrdir)/ruby/internal/ctype.h
+monitor.o: $(hdrdir)/ruby/internal/dllexport.h
+monitor.o: $(hdrdir)/ruby/internal/dosish.h
+monitor.o: $(hdrdir)/ruby/internal/error.h
+monitor.o: $(hdrdir)/ruby/internal/eval.h
+monitor.o: $(hdrdir)/ruby/internal/event.h
+monitor.o: $(hdrdir)/ruby/internal/fl_type.h
+monitor.o: $(hdrdir)/ruby/internal/gc.h
+monitor.o: $(hdrdir)/ruby/internal/glob.h
+monitor.o: $(hdrdir)/ruby/internal/globals.h
+monitor.o: $(hdrdir)/ruby/internal/has/attribute.h
+monitor.o: $(hdrdir)/ruby/internal/has/builtin.h
+monitor.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+monitor.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+monitor.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+monitor.o: $(hdrdir)/ruby/internal/has/extension.h
+monitor.o: $(hdrdir)/ruby/internal/has/feature.h
+monitor.o: $(hdrdir)/ruby/internal/has/warning.h
+monitor.o: $(hdrdir)/ruby/internal/intern/array.h
+monitor.o: $(hdrdir)/ruby/internal/intern/bignum.h
+monitor.o: $(hdrdir)/ruby/internal/intern/class.h
+monitor.o: $(hdrdir)/ruby/internal/intern/compar.h
+monitor.o: $(hdrdir)/ruby/internal/intern/complex.h
+monitor.o: $(hdrdir)/ruby/internal/intern/cont.h
+monitor.o: $(hdrdir)/ruby/internal/intern/dir.h
+monitor.o: $(hdrdir)/ruby/internal/intern/enum.h
+monitor.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+monitor.o: $(hdrdir)/ruby/internal/intern/error.h
+monitor.o: $(hdrdir)/ruby/internal/intern/eval.h
+monitor.o: $(hdrdir)/ruby/internal/intern/file.h
+monitor.o: $(hdrdir)/ruby/internal/intern/gc.h
+monitor.o: $(hdrdir)/ruby/internal/intern/hash.h
+monitor.o: $(hdrdir)/ruby/internal/intern/io.h
+monitor.o: $(hdrdir)/ruby/internal/intern/load.h
+monitor.o: $(hdrdir)/ruby/internal/intern/marshal.h
+monitor.o: $(hdrdir)/ruby/internal/intern/numeric.h
+monitor.o: $(hdrdir)/ruby/internal/intern/object.h
+monitor.o: $(hdrdir)/ruby/internal/intern/parse.h
+monitor.o: $(hdrdir)/ruby/internal/intern/proc.h
+monitor.o: $(hdrdir)/ruby/internal/intern/process.h
+monitor.o: $(hdrdir)/ruby/internal/intern/random.h
+monitor.o: $(hdrdir)/ruby/internal/intern/range.h
+monitor.o: $(hdrdir)/ruby/internal/intern/rational.h
+monitor.o: $(hdrdir)/ruby/internal/intern/re.h
+monitor.o: $(hdrdir)/ruby/internal/intern/ruby.h
+monitor.o: $(hdrdir)/ruby/internal/intern/select.h
+monitor.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+monitor.o: $(hdrdir)/ruby/internal/intern/signal.h
+monitor.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+monitor.o: $(hdrdir)/ruby/internal/intern/string.h
+monitor.o: $(hdrdir)/ruby/internal/intern/struct.h
+monitor.o: $(hdrdir)/ruby/internal/intern/thread.h
+monitor.o: $(hdrdir)/ruby/internal/intern/time.h
+monitor.o: $(hdrdir)/ruby/internal/intern/variable.h
+monitor.o: $(hdrdir)/ruby/internal/intern/vm.h
+monitor.o: $(hdrdir)/ruby/internal/interpreter.h
+monitor.o: $(hdrdir)/ruby/internal/iterator.h
+monitor.o: $(hdrdir)/ruby/internal/memory.h
+monitor.o: $(hdrdir)/ruby/internal/method.h
+monitor.o: $(hdrdir)/ruby/internal/module.h
+monitor.o: $(hdrdir)/ruby/internal/newobj.h
+monitor.o: $(hdrdir)/ruby/internal/rgengc.h
+monitor.o: $(hdrdir)/ruby/internal/scan_args.h
+monitor.o: $(hdrdir)/ruby/internal/special_consts.h
+monitor.o: $(hdrdir)/ruby/internal/static_assert.h
+monitor.o: $(hdrdir)/ruby/internal/stdalign.h
+monitor.o: $(hdrdir)/ruby/internal/stdbool.h
+monitor.o: $(hdrdir)/ruby/internal/symbol.h
+monitor.o: $(hdrdir)/ruby/internal/token_paste.h
+monitor.o: $(hdrdir)/ruby/internal/value.h
+monitor.o: $(hdrdir)/ruby/internal/value_type.h
+monitor.o: $(hdrdir)/ruby/internal/variable.h
+monitor.o: $(hdrdir)/ruby/internal/warning_push.h
+monitor.o: $(hdrdir)/ruby/internal/xmalloc.h
+monitor.o: $(hdrdir)/ruby/assert.h
+monitor.o: $(hdrdir)/ruby/backward.h
+monitor.o: $(hdrdir)/ruby/backward/2/assume.h
+monitor.o: $(hdrdir)/ruby/backward/2/attributes.h
+monitor.o: $(hdrdir)/ruby/backward/2/bool.h
+monitor.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+monitor.o: $(hdrdir)/ruby/backward/2/inttypes.h
+monitor.o: $(hdrdir)/ruby/backward/2/limits.h
+monitor.o: $(hdrdir)/ruby/backward/2/long_long.h
+monitor.o: $(hdrdir)/ruby/backward/2/stdalign.h
+monitor.o: $(hdrdir)/ruby/backward/2/stdarg.h
+monitor.o: $(hdrdir)/ruby/defines.h
+monitor.o: $(hdrdir)/ruby/intern.h
+monitor.o: $(hdrdir)/ruby/missing.h
+monitor.o: $(hdrdir)/ruby/ruby.h
+monitor.o: $(hdrdir)/ruby/st.h
+monitor.o: $(hdrdir)/ruby/subst.h
+monitor.o: monitor.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/monitor/extconf.rb b/ext/monitor/extconf.rb
new file mode 100644
index 0000000000..78c53fa0c5
--- /dev/null
+++ b/ext/monitor/extconf.rb
@@ -0,0 +1,2 @@
+require 'mkmf'
+create_makefile('monitor')
diff --git a/ext/monitor/lib/monitor.rb b/ext/monitor/lib/monitor.rb
new file mode 100644
index 0000000000..11c5ac17d9
--- /dev/null
+++ b/ext/monitor/lib/monitor.rb
@@ -0,0 +1,284 @@
+# frozen_string_literal: false
+# = monitor.rb
+#
+# Copyright (C) 2001  Shugo Maeda <shugo@ruby-lang.org>
+#
+# This library is distributed under the terms of the Ruby license.
+# You can freely distribute/modify this library.
+#
+
+#
+# In concurrent programming, a monitor is an object or module intended to be
+# used safely by more than one thread.  The defining characteristic of a
+# monitor is that its methods are executed with mutual exclusion.  That is, at
+# each point in time, at most one thread may be executing any of its methods.
+# This mutual exclusion greatly simplifies reasoning about the implementation
+# of monitors compared to reasoning about parallel code that updates a data
+# structure.
+#
+# You can read more about the general principles on the Wikipedia page for
+# Monitors[https://en.wikipedia.org/wiki/Monitor_%28synchronization%29]
+#
+# == Examples
+#
+# === Simple object.extend
+#
+#   require 'monitor.rb'
+#
+#   buf = []
+#   buf.extend(MonitorMixin)
+#   empty_cond = buf.new_cond
+#
+#   # consumer
+#   Thread.start do
+#     loop do
+#       buf.synchronize do
+#         empty_cond.wait_while { buf.empty? }
+#         print buf.shift
+#       end
+#     end
+#   end
+#
+#   # producer
+#   while line = ARGF.gets
+#     buf.synchronize do
+#       buf.push(line)
+#       empty_cond.signal
+#     end
+#   end
+#
+# The consumer thread waits for the producer thread to push a line to buf
+# while <tt>buf.empty?</tt>.  The producer thread (main thread) reads a
+# line from ARGF and pushes it into buf then calls <tt>empty_cond.signal</tt>
+# to notify the consumer thread of new data.
+#
+# === Simple Class include
+#
+#   require 'monitor'
+#
+#   class SynchronizedArray < Array
+#
+#     include MonitorMixin
+#
+#     def initialize(*args)
+#       super(*args)
+#     end
+#
+#     alias :old_shift :shift
+#     alias :old_unshift :unshift
+#
+#     def shift(n=1)
+#       self.synchronize do
+#         self.old_shift(n)
+#       end
+#     end
+#
+#     def unshift(item)
+#       self.synchronize do
+#         self.old_unshift(item)
+#       end
+#     end
+#
+#     # other methods ...
+#   end
+#
+# +SynchronizedArray+ implements an Array with synchronized access to items.
+# This Class is implemented as subclass of Array which includes the
+# MonitorMixin module.
+#
+
+require 'monitor.so'
+
+module MonitorMixin
+  #
+  # FIXME: This isn't documented in Nutshell.
+  #
+  # Since MonitorMixin.new_cond returns a ConditionVariable, and the example
+  # above calls while_wait and signal, this class should be documented.
+  #
+  class ConditionVariable
+    #
+    # Releases the lock held in the associated monitor and waits; reacquires the lock on wakeup.
+    #
+    # If +timeout+ is given, this method returns after +timeout+ seconds passed,
+    # even if no other thread doesn't signal.
+    #
+    def wait(timeout = nil)
+      @monitor.mon_check_owner
+      @monitor.wait_for_cond(@cond, timeout)
+    end
+
+    #
+    # Calls wait repeatedly while the given block yields a truthy value.
+    #
+    def wait_while
+      while yield
+        wait
+      end
+    end
+
+    #
+    # Calls wait repeatedly until the given block yields a truthy value.
+    #
+    def wait_until
+      until yield
+        wait
+      end
+    end
+
+    #
+    # Wakes up the first thread in line waiting for this lock.
+    #
+    def signal
+      @monitor.mon_check_owner
+      @cond.signal
+    end
+
+    #
+    # Wakes up all threads waiting for this lock.
+    #
+    def broadcast
+      @monitor.mon_check_owner
+      @cond.broadcast
+    end
+
+    private
+
+    def initialize(monitor)
+      @monitor = monitor
+      @cond = Thread::ConditionVariable.new
+    end
+  end
+
+  def self.extend_object(obj)
+    super(obj)
+    obj.__send__(:mon_initialize)
+  end
+
+  #
+  # Attempts to enter exclusive section.  Returns +false+ if lock fails.
+  #
+  def mon_try_enter
+    @mon_data.try_enter
+  end
+  # For backward compatibility
+  alias try_mon_enter mon_try_enter
+
+  #
+  # Enters exclusive section.
+  #
+  def mon_enter
+    @mon_data.enter
+  end
+
+  #
+  # Leaves exclusive section.
+  #
+  def mon_exit
+    mon_check_owner
+    @mon_data.exit
+  end
+
+  #
+  # Returns true if this monitor is locked by any thread
+  #
+  def mon_locked?
+    @mon_data.mon_locked?
+  end
+
+  #
+  # Returns true if this monitor is locked by current thread.
+  #
+  def mon_owned?
+    @mon_data.mon_owned?
+  end
+
+  #
+  # Enters exclusive section and executes the block.  Leaves the exclusive
+  # section automatically when the block exits.  See example under
+  # +MonitorMixin+.
+  #
+  def mon_synchronize(&b)
+    @mon_data.synchronize(&b)
+  end
+  alias synchronize mon_synchronize
+
+  #
+  # Creates a new MonitorMixin::ConditionVariable associated with the
+  # Monitor object.
+  #
+  def new_cond
+    unless defined?(@mon_data)
+      mon_initialize
+      @mon_initialized_by_new_cond = true
+    end
+    return ConditionVariable.new(@mon_data)
+  end
+
+  private
+
+  # Use <tt>extend MonitorMixin</tt> or <tt>include MonitorMixin</tt> instead
+  # of this constructor.  Have look at the examples above to understand how to
+  # use this module.
+  def initialize(...)
+    super
+    mon_initialize
+  end
+
+  # Initializes the MonitorMixin after being included in a class or when an
+  # object has been extended with the MonitorMixin
+  def mon_initialize
+    if defined?(@mon_data)
+      if defined?(@mon_initialized_by_new_cond)
+        return # already initialized.
+      elsif @mon_data_owner_object_id == self.object_id
+        raise ThreadError, "already initialized"
+      end
+    end
+    @mon_data = ::Monitor.new
+    @mon_data_owner_object_id = self.object_id
+  end
+
+  def mon_check_owner
+    @mon_data.mon_check_owner
+  end
+end
+
+# Use the Monitor class when you want to have a lock object for blocks with
+# mutual exclusion.
+#
+#   require 'monitor'
+#
+#   lock = Monitor.new
+#   lock.synchronize do
+#     # exclusive access
+#   end
+#
+class Monitor
+  def new_cond
+    ::MonitorMixin::ConditionVariable.new(self)
+  end
+
+  # for compatibility
+  alias try_mon_enter try_enter
+  alias mon_try_enter try_enter
+  alias mon_enter enter
+  alias mon_exit exit
+  alias mon_synchronize synchronize
+end
+
+# Documentation comments:
+#  - All documentation comes from Nutshell.
+#  - MonitorMixin.new_cond appears in the example, but is not documented in
+#    Nutshell.
+#  - All the internals (internal modules Accessible and Initializable, class
+#    ConditionVariable) appear in RDoc.  It might be good to hide them, by
+#    making them private, or marking them :nodoc:, etc.
+#  - RDoc doesn't recognise aliases, so we have mon_synchronize documented, but
+#    not synchronize.
+#  - mon_owner is in Nutshell, but appears as an accessor in a separate module
+#    here, so is hard/impossible to RDoc.  Some other useful accessors
+#    (mon_count and some queue stuff) are also in this module, and don't appear
+#    directly in the RDoc output.
+#  - in short, it may be worth changing the code layout in this file to make the
+#    documentation easier
diff --git a/ext/monitor/monitor.c b/ext/monitor/monitor.c
new file mode 100644
index 0000000000..a3efe96bb3
--- /dev/null
+++ b/ext/monitor/monitor.c
@@ -0,0 +1,225 @@
+#include "ruby/ruby.h"
+
+/* Thread::Monitor */
+
+struct rb_monitor {
+    long count;
+    const VALUE owner;
+    const VALUE mutex;
+};
+
+static void
+monitor_mark(void *ptr)
+{
+    struct rb_monitor *mc = ptr;
+    rb_gc_mark(mc->owner);
+    rb_gc_mark(mc->mutex);
+}
+
+static size_t
+monitor_memsize(const void *ptr)
+{
+    return sizeof(struct rb_monitor);
+}
+
+static const rb_data_type_t monitor_data_type = {
+    "monitor",
+    {monitor_mark, RUBY_TYPED_DEFAULT_FREE, monitor_memsize,},
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY|RUBY_TYPED_WB_PROTECTED
+};
+
+static VALUE
+monitor_alloc(VALUE klass)
+{
+    struct rb_monitor *mc;
+    VALUE obj;
+
+    obj = TypedData_Make_Struct(klass, struct rb_monitor, &monitor_data_type, mc);
+    RB_OBJ_WRITE(obj, &mc->mutex, rb_mutex_new());
+    RB_OBJ_WRITE(obj, &mc->owner, Qnil);
+    mc->count = 0;
+
+    return obj;
+}
+
+static struct rb_monitor *
+monitor_ptr(VALUE monitor)
+{
+    struct rb_monitor *mc;
+    TypedData_Get_Struct(monitor, struct rb_monitor, &monitor_data_type, mc);
+    return mc;
+}
+
+static int
+mc_owner_p(struct rb_monitor *mc)
+{
+    return mc->owner == rb_fiber_current();
+}
+
+static VALUE
+monitor_try_enter(VALUE monitor)
+{
+    struct rb_monitor *mc = monitor_ptr(monitor);
+
+    if (!mc_owner_p(mc)) {
+        if (!rb_mutex_trylock(mc->mutex)) {
+            return Qfalse;
+        }
+        RB_OBJ_WRITE(monitor, &mc->owner, rb_fiber_current());
+        mc->count = 0;
+    }
+    mc->count += 1;
+    return Qtrue;
+}
+
+static VALUE
+monitor_enter(VALUE monitor)
+{
+    struct rb_monitor *mc = monitor_ptr(monitor);
+    if (!mc_owner_p(mc)) {
+        rb_mutex_lock(mc->mutex);
+        RB_OBJ_WRITE(monitor, &mc->owner, rb_fiber_current());
+        mc->count = 0;
+    }
+    mc->count++;
+    return Qnil;
+}
+
+static VALUE
+monitor_check_owner(VALUE monitor)
+{
+    struct rb_monitor *mc = monitor_ptr(monitor);
+    if (!mc_owner_p(mc)) {
+        rb_raise(rb_eThreadError, "current fiber not owner");
+    }
+    return Qnil;
+}
+
+static VALUE
+monitor_exit(VALUE monitor)
+{
+    monitor_check_owner(monitor);
+
+    struct rb_monitor *mc = monitor_ptr(monitor);
+
+    if (mc->count <= 0) rb_bug("monitor_exit: count:%d\n", (int)mc->count);
+    mc->count--;
+
+    if (mc->count == 0) {
+        RB_OBJ_WRITE(monitor, &mc->owner, Qnil);
+        rb_mutex_unlock(mc->mutex);
+    }
+    return Qnil;
+}
+
+static VALUE
+monitor_locked_p(VALUE monitor)
+{
+    struct rb_monitor *mc = monitor_ptr(monitor);
+    return rb_mutex_locked_p(mc->mutex);
+}
+
+static VALUE
+monitor_owned_p(VALUE monitor)
+{
+    struct rb_monitor *mc = monitor_ptr(monitor);
+    return (rb_mutex_locked_p(mc->mutex) && mc_owner_p(mc)) ? Qtrue : Qfalse;
+}
+
+static VALUE
+monitor_exit_for_cond(VALUE monitor)
+{
+    struct rb_monitor *mc = monitor_ptr(monitor);
+    long cnt = mc->count;
+    RB_OBJ_WRITE(monitor, &mc->owner, Qnil);
+    mc->count = 0;
+    return LONG2NUM(cnt);
+}
+
+struct wait_for_cond_data {
+    VALUE monitor;
+    VALUE cond;
+    VALUE timeout;
+    VALUE count;
+};
+
+static VALUE
+monitor_wait_for_cond_body(VALUE v)
+{
+    struct wait_for_cond_data *data = (struct wait_for_cond_data *)v;
+    struct rb_monitor *mc = monitor_ptr(data->monitor);
+    // cond.wait(monitor.mutex, timeout)
+    rb_funcall(data->cond, rb_intern("wait"), 2, mc->mutex, data->timeout);
+    return Qtrue;
+}
+
+static VALUE
+monitor_enter_for_cond(VALUE v)
+{
+    // assert(rb_mutex_owned_p(mc->mutex) == Qtrue)
+    // but rb_mutex_owned_p is not exported...
+
+    struct wait_for_cond_data *data = (struct wait_for_cond_data *)v;
+    struct rb_monitor *mc = monitor_ptr(data->monitor);
+    RB_OBJ_WRITE(data->monitor, &mc->owner, rb_fiber_current());
+    mc->count = NUM2LONG(data->count);
+    return Qnil;
+}
+
+static VALUE
+monitor_wait_for_cond(VALUE monitor, VALUE cond, VALUE timeout)
+{
+    VALUE count = monitor_exit_for_cond(monitor);
+    struct wait_for_cond_data data = {
+        monitor,
+        cond,
+        timeout,
+        count,
+    };
+
+    return rb_ensure(monitor_wait_for_cond_body, (VALUE)&data,
+                     monitor_enter_for_cond, (VALUE)&data);
+}
+
+static VALUE
+monitor_sync_body(VALUE monitor)
+{
+    return rb_yield_values(0);
+}
+
+static VALUE
+monitor_sync_ensure(VALUE monitor)
+{
+    return monitor_exit(monitor);
+}
+
+static VALUE
+monitor_synchronize(VALUE monitor)
+{
+    monitor_enter(monitor);
+    return rb_ensure(monitor_sync_body, monitor, monitor_sync_ensure, monitor);
+}
+
+void
+Init_monitor(void)
+{
+#ifdef HAVE_RB_EXT_RACTOR_SAFE
+    rb_ext_ractor_safe(true);
+#endif
+
+    VALUE rb_cMonitor = rb_define_class("Monitor", rb_cObject);
+    rb_define_alloc_func(rb_cMonitor, monitor_alloc);
+
+    rb_define_method(rb_cMonitor, "try_enter", monitor_try_enter, 0);
+    rb_define_method(rb_cMonitor, "enter", monitor_enter, 0);
+    rb_define_method(rb_cMonitor, "exit", monitor_exit, 0);
+    rb_define_method(rb_cMonitor, "synchronize", monitor_synchronize, 0);
+
+    /* internal methods for MonitorMixin */
+    rb_define_method(rb_cMonitor, "mon_locked?", monitor_locked_p, 0);
+    rb_define_method(rb_cMonitor, "mon_check_owner", monitor_check_owner, 0);
+    rb_define_method(rb_cMonitor, "mon_owned?", monitor_owned_p, 0);
+
+    /* internal methods for MonitorMixin::ConditionalVariable */
+    rb_define_method(rb_cMonitor, "wait_for_cond", monitor_wait_for_cond, 2);
+}
diff --git a/ext/nkf/depend b/ext/nkf/depend
index dfda9c0597..caaee22ea4 100644
--- a/ext/nkf/depend
+++ b/ext/nkf/depend
@@ -5,11 +5,162 @@ nkf.o: nkf.c
 # AUTOGENERATED DEPENDENCIES START
 nkf.o: $(RUBY_EXTCONF_H)
 nkf.o: $(arch_hdrdir)/ruby/config.h
+nkf.o: $(hdrdir)/ruby/internal/anyargs.h
+nkf.o: $(hdrdir)/ruby/internal/arithmetic.h
+nkf.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+nkf.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+nkf.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+nkf.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+nkf.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+nkf.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+nkf.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+nkf.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+nkf.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+nkf.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+nkf.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+nkf.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+nkf.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+nkf.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+nkf.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+nkf.o: $(hdrdir)/ruby/internal/assume.h
+nkf.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+nkf.o: $(hdrdir)/ruby/internal/attr/artificial.h
+nkf.o: $(hdrdir)/ruby/internal/attr/cold.h
+nkf.o: $(hdrdir)/ruby/internal/attr/const.h
+nkf.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+nkf.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+nkf.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+nkf.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+nkf.o: $(hdrdir)/ruby/internal/attr/error.h
+nkf.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+nkf.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+nkf.o: $(hdrdir)/ruby/internal/attr/format.h
+nkf.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+nkf.o: $(hdrdir)/ruby/internal/attr/noalias.h
+nkf.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+nkf.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+nkf.o: $(hdrdir)/ruby/internal/attr/noinline.h
+nkf.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+nkf.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+nkf.o: $(hdrdir)/ruby/internal/attr/pure.h
+nkf.o: $(hdrdir)/ruby/internal/attr/restrict.h
+nkf.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+nkf.o: $(hdrdir)/ruby/internal/attr/warning.h
+nkf.o: $(hdrdir)/ruby/internal/attr/weakref.h
+nkf.o: $(hdrdir)/ruby/internal/cast.h
+nkf.o: $(hdrdir)/ruby/internal/compiler_is.h
+nkf.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+nkf.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+nkf.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+nkf.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+nkf.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+nkf.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+nkf.o: $(hdrdir)/ruby/internal/compiler_since.h
+nkf.o: $(hdrdir)/ruby/internal/config.h
+nkf.o: $(hdrdir)/ruby/internal/constant_p.h
+nkf.o: $(hdrdir)/ruby/internal/core.h
+nkf.o: $(hdrdir)/ruby/internal/core/rarray.h
+nkf.o: $(hdrdir)/ruby/internal/core/rbasic.h
+nkf.o: $(hdrdir)/ruby/internal/core/rbignum.h
+nkf.o: $(hdrdir)/ruby/internal/core/rclass.h
+nkf.o: $(hdrdir)/ruby/internal/core/rdata.h
+nkf.o: $(hdrdir)/ruby/internal/core/rfile.h
+nkf.o: $(hdrdir)/ruby/internal/core/rhash.h
+nkf.o: $(hdrdir)/ruby/internal/core/robject.h
+nkf.o: $(hdrdir)/ruby/internal/core/rregexp.h
+nkf.o: $(hdrdir)/ruby/internal/core/rstring.h
+nkf.o: $(hdrdir)/ruby/internal/core/rstruct.h
+nkf.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+nkf.o: $(hdrdir)/ruby/internal/ctype.h
+nkf.o: $(hdrdir)/ruby/internal/dllexport.h
+nkf.o: $(hdrdir)/ruby/internal/dosish.h
+nkf.o: $(hdrdir)/ruby/internal/error.h
+nkf.o: $(hdrdir)/ruby/internal/eval.h
+nkf.o: $(hdrdir)/ruby/internal/event.h
+nkf.o: $(hdrdir)/ruby/internal/fl_type.h
+nkf.o: $(hdrdir)/ruby/internal/gc.h
+nkf.o: $(hdrdir)/ruby/internal/glob.h
+nkf.o: $(hdrdir)/ruby/internal/globals.h
+nkf.o: $(hdrdir)/ruby/internal/has/attribute.h
+nkf.o: $(hdrdir)/ruby/internal/has/builtin.h
+nkf.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+nkf.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+nkf.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+nkf.o: $(hdrdir)/ruby/internal/has/extension.h
+nkf.o: $(hdrdir)/ruby/internal/has/feature.h
+nkf.o: $(hdrdir)/ruby/internal/has/warning.h
+nkf.o: $(hdrdir)/ruby/internal/intern/array.h
+nkf.o: $(hdrdir)/ruby/internal/intern/bignum.h
+nkf.o: $(hdrdir)/ruby/internal/intern/class.h
+nkf.o: $(hdrdir)/ruby/internal/intern/compar.h
+nkf.o: $(hdrdir)/ruby/internal/intern/complex.h
+nkf.o: $(hdrdir)/ruby/internal/intern/cont.h
+nkf.o: $(hdrdir)/ruby/internal/intern/dir.h
+nkf.o: $(hdrdir)/ruby/internal/intern/enum.h
+nkf.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+nkf.o: $(hdrdir)/ruby/internal/intern/error.h
+nkf.o: $(hdrdir)/ruby/internal/intern/eval.h
+nkf.o: $(hdrdir)/ruby/internal/intern/file.h
+nkf.o: $(hdrdir)/ruby/internal/intern/gc.h
+nkf.o: $(hdrdir)/ruby/internal/intern/hash.h
+nkf.o: $(hdrdir)/ruby/internal/intern/io.h
+nkf.o: $(hdrdir)/ruby/internal/intern/load.h
+nkf.o: $(hdrdir)/ruby/internal/intern/marshal.h
+nkf.o: $(hdrdir)/ruby/internal/intern/numeric.h
+nkf.o: $(hdrdir)/ruby/internal/intern/object.h
+nkf.o: $(hdrdir)/ruby/internal/intern/parse.h
+nkf.o: $(hdrdir)/ruby/internal/intern/proc.h
+nkf.o: $(hdrdir)/ruby/internal/intern/process.h
+nkf.o: $(hdrdir)/ruby/internal/intern/random.h
+nkf.o: $(hdrdir)/ruby/internal/intern/range.h
+nkf.o: $(hdrdir)/ruby/internal/intern/rational.h
+nkf.o: $(hdrdir)/ruby/internal/intern/re.h
+nkf.o: $(hdrdir)/ruby/internal/intern/ruby.h
+nkf.o: $(hdrdir)/ruby/internal/intern/select.h
+nkf.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+nkf.o: $(hdrdir)/ruby/internal/intern/signal.h
+nkf.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+nkf.o: $(hdrdir)/ruby/internal/intern/string.h
+nkf.o: $(hdrdir)/ruby/internal/intern/struct.h
+nkf.o: $(hdrdir)/ruby/internal/intern/thread.h
+nkf.o: $(hdrdir)/ruby/internal/intern/time.h
+nkf.o: $(hdrdir)/ruby/internal/intern/variable.h
+nkf.o: $(hdrdir)/ruby/internal/intern/vm.h
+nkf.o: $(hdrdir)/ruby/internal/interpreter.h
+nkf.o: $(hdrdir)/ruby/internal/iterator.h
+nkf.o: $(hdrdir)/ruby/internal/memory.h
+nkf.o: $(hdrdir)/ruby/internal/method.h
+nkf.o: $(hdrdir)/ruby/internal/module.h
+nkf.o: $(hdrdir)/ruby/internal/newobj.h
+nkf.o: $(hdrdir)/ruby/internal/rgengc.h
+nkf.o: $(hdrdir)/ruby/internal/scan_args.h
+nkf.o: $(hdrdir)/ruby/internal/special_consts.h
+nkf.o: $(hdrdir)/ruby/internal/static_assert.h
+nkf.o: $(hdrdir)/ruby/internal/stdalign.h
+nkf.o: $(hdrdir)/ruby/internal/stdbool.h
+nkf.o: $(hdrdir)/ruby/internal/symbol.h
+nkf.o: $(hdrdir)/ruby/internal/token_paste.h
+nkf.o: $(hdrdir)/ruby/internal/value.h
+nkf.o: $(hdrdir)/ruby/internal/value_type.h
+nkf.o: $(hdrdir)/ruby/internal/variable.h
+nkf.o: $(hdrdir)/ruby/internal/warning_push.h
+nkf.o: $(hdrdir)/ruby/internal/xmalloc.h
+nkf.o: $(hdrdir)/ruby/assert.h
 nkf.o: $(hdrdir)/ruby/backward.h
+nkf.o: $(hdrdir)/ruby/backward/2/assume.h
+nkf.o: $(hdrdir)/ruby/backward/2/attributes.h
+nkf.o: $(hdrdir)/ruby/backward/2/bool.h
+nkf.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+nkf.o: $(hdrdir)/ruby/backward/2/inttypes.h
+nkf.o: $(hdrdir)/ruby/backward/2/limits.h
+nkf.o: $(hdrdir)/ruby/backward/2/long_long.h
+nkf.o: $(hdrdir)/ruby/backward/2/stdalign.h
+nkf.o: $(hdrdir)/ruby/backward/2/stdarg.h
 nkf.o: $(hdrdir)/ruby/defines.h
 nkf.o: $(hdrdir)/ruby/encoding.h
 nkf.o: $(hdrdir)/ruby/intern.h
 nkf.o: $(hdrdir)/ruby/missing.h
+nkf.o: $(hdrdir)/ruby/onigmo.h
 nkf.o: $(hdrdir)/ruby/oniguruma.h
 nkf.o: $(hdrdir)/ruby/ruby.h
 nkf.o: $(hdrdir)/ruby/st.h
diff --git a/ext/nkf/nkf-utf8/nkf.c b/ext/nkf/nkf-utf8/nkf.c
index b58c437d3c..cc438a50d6 100644
--- a/ext/nkf/nkf-utf8/nkf.c
+++ b/ext/nkf/nkf-utf8/nkf.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1987, Fujitsu LTD. (Itaru ICHIKAWA).
- * Copyright (c) 1996-2013, The nkf Project.
+ * Copyright (c) 1996-2018, The nkf Project.
  *
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -20,11 +20,11 @@
  *
  * 3. This notice may not be removed or altered from any source distribution.
  */
-#define NKF_VERSION "2.1.4"
-#define NKF_RELEASE_DATE "2015-12-12"
+#define NKF_VERSION "2.1.5"
+#define NKF_RELEASE_DATE "2018-12-15"
 #define COPY_RIGHT \
     "Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa).\n" \
-    "Copyright (C) 1996-2015, The nkf Project."
+    "Copyright (C) 1996-2018, The nkf Project."
 
 #include "config.h"
 #include "nkf.h"
@@ -1111,18 +1111,26 @@ 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));
+        int high = (c >> 10) + NKF_INT32_C(0xD7C0);   /* high surrogate */
+        int low = (c & 0x3FF) + NKF_INT32_C(0xDC00); /* low surrogate */
+	(*oconv)(0, 'u');
+	(*oconv)(0, bin2hex(high>>12));
+	(*oconv)(0, bin2hex(high>> 8));
+	(*oconv)(0, bin2hex(high>> 4));
+	(*oconv)(0, bin2hex(high    ));
+	(*oconv)(0, '\\');
+	(*oconv)(0, 'u');
+	(*oconv)(0, bin2hex(low>>12));
+	(*oconv)(0, bin2hex(low>> 8));
+	(*oconv)(0, bin2hex(low>> 4));
+	(*oconv)(0, bin2hex(low    ));
     }else{
 	(*oconv)(0, 'u');
+	(*oconv)(0, bin2hex(c>>12));
+	(*oconv)(0, bin2hex(c>> 8));
+	(*oconv)(0, bin2hex(c>> 4));
+	(*oconv)(0, bin2hex(c    ));
     }
-    (*oconv)(0, bin2hex(c>>12));
-    (*oconv)(0, bin2hex(c>> 8));
-    (*oconv)(0, bin2hex(c>> 4));
-    (*oconv)(0, bin2hex(c    ));
     return;
 }
 
@@ -1947,12 +1955,17 @@ unicode_to_jis_common(nkf_char c2, nkf_char c1, nkf_char c0, nkf_char *p2, nkf_c
 	ret = unicode_to_jis_common2(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)) {
-	nkf_char s2, s1;
-	if (e2s_conv(*p2, *p1, &s2, &s1) == 0) {
-	    s2e_conv(s2, s1, p2, p1);
-	}else{
-	    ret = 1;
+    if (!ret&& is_eucg3(*p2)) {
+	if (cp932inv_f) {
+	    if (encode_fallback) ret = 1;
+	}
+	else {
+	    nkf_char s2, s1;
+	    if (e2s_conv(*p2, *p1, &s2, &s1) == 0) {
+		s2e_conv(s2, s1, p2, p1);
+	    }else{
+		ret = 1;
+	    }
 	}
     }
 #endif
diff --git a/ext/nkf/nkf-utf8/utf8tbl.c b/ext/nkf/nkf-utf8/utf8tbl.c
index 3821c59468..a31e4e7805 100644
--- a/ext/nkf/nkf-utf8/utf8tbl.c
+++ b/ext/nkf/nkf-utf8/utf8tbl.c
@@ -5445,7 +5445,7 @@ static const unsigned short utf8_to_euc_E4BB_x0213[] = {
  0xB047, 0x2E28, 0xB049, 0x4265, 0x4E61, 0x304A,      0,      0,
  0xB04A,      0,      0, 0xA13B,      0, 0x5041, 0x323E, 0xB04B,
  0x3644, 0xA13D, 0x4367, 0xB04D,      0, 0xA13E, 0x376F, 0x5043,
-      0,      0,      0, 0x4724, 0xF42F, 0x2E29, 0xB050, 0x2E2A,
+      0,      0,      0, 0x4724,      0, 0x2E29, 0xB050, 0x2E2A,
 };
 static const unsigned short utf8_to_euc_E4BC[] = {
  0xB052, 0x346B, 0xB053, 0xB054,      0,      0,      0,      0,
@@ -5465,7 +5465,7 @@ static const unsigned short utf8_to_euc_E4BC_x0213[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0, 0xB05D, 0x476C,
  0x5046, 0xB05E,      0, 0xB060, 0x483C, 0xB061, 0x4E62, 0xA142,
- 0x3F2D, 0xB063, 0x3B47, 0xB064, 0x3B77, 0x3240, 0xA143,      0,
+ 0x3F2D,      0, 0x3B47, 0xB064, 0x3B77, 0x3240, 0xA143,      0,
 };
 static const unsigned short utf8_to_euc_E4BD[] = {
  0xB066,      0, 0xB067, 0x4451,      0,      0, 0x4322, 0x504A,
@@ -5519,13 +5519,13 @@ static const unsigned short utf8_to_euc_E4BF[] = {
 };
 static const unsigned short utf8_to_euc_E4BF_x0213[] = {
  0xB136, 0xB137, 0x3738, 0x4225, 0x3264, 0xA152, 0xB139,      0,
- 0xB13A, 0x2E39, 0x3D53, 0xA153, 0xB13D, 0xB13E, 0x5059, 0xA154,
+ 0xB13A, 0x2E39, 0x3D53, 0xA153, 0xB13D,      0, 0x5059, 0xA154,
  0x505E, 0x505C, 0xA155,      0, 0x5057,      0,      0, 0x422F,
  0x505A,      0, 0x505D, 0x505B, 0xB141, 0x4A5D,      0, 0x5058,
  0x2E3A, 0x3F2E, 0xB143, 0x4B73, 0x505F, 0x5060, 0xA14F,      0,
       0,      0,      0,      0,      0,      0, 0x3D24, 0x506D,
  0xB144, 0x2E21, 0xA157, 0x4750,      0, 0x4936, 0x5068,      0,
- 0x4A70,      0, 0x3236,      0, 0xB146, 0xB147, 0x506C, 0xB148,
+ 0x4A70,      0, 0x3236,      0, 0xB146, 0xB147, 0x506C,      0,
 };
 static const unsigned short utf8_to_euc_E580[] = {
  0xB149, 0xB14A,      0,      0, 0xB14B, 0x5066, 0x506F, 0xB14C,
@@ -5601,10 +5601,10 @@ static const unsigned short utf8_to_euc_E583_x0213[] = {
  0xB232,      0, 0x5124, 0xB233, 0xA174, 0x364F,      0, 0xA175,
       0, 0x5121, 0x5122,      0, 0x2E45, 0x462F, 0xA178, 0x417C,
  0x2E47, 0x3623,      0, 0xB239, 0xA17A, 0x4B4D, 0x5125,      0,
- 0xB23B, 0xA17B, 0x4E3D,      0, 0xB23C, 0xB23D, 0x5126, 0xB23E,
+      0, 0xA17B, 0x4E3D,      0, 0xB23C, 0xB23D, 0x5126, 0xB23E,
       0, 0xA17C, 0xB23F, 0x5129, 0xB240, 0x5127, 0x2E48, 0x414E,
  0xB242, 0xA17D,      0,      0,      0, 0x5128, 0x512A, 0xB244,
-      0, 0xB245, 0x2E46, 0xA176, 0xF430, 0x512C, 0xB246,      0,
+      0, 0xB245, 0x2E46, 0xA176,      0, 0x512C, 0xB246,      0,
       0, 0x512B, 0xB247, 0x4A48,      0,      0, 0xB248,      0,
 };
 static const unsigned short utf8_to_euc_E584[] = {
@@ -5642,7 +5642,7 @@ static const unsigned short utf8_to_euc_E585_x0213[] = {
  0x4068, 0x3877, 0x2E4F, 0x396E, 0x513C, 0x4C48, 0x4546, 0xB267,
  0x3B79,      0, 0x513B, 0xB268, 0x513D, 0x2E51,      0, 0x2E52,
  0xB26B,      0, 0x455E,      0, 0x3375,      0,      0, 0xB26C,
- 0xA326,      0, 0x513E,      0, 0xB26D, 0x467E, 0xB26E,      0,
+ 0xA326,      0, 0x513E,      0,      0, 0x467E, 0xB26E,      0,
  0x4134, 0x5140, 0x5141, 0x482C, 0x3878, 0x4F3B, 0x5142,      0,
       0, 0x3626,      0, 0xA328,      0, 0x4A3C, 0x4236, 0x3671,
  0x4535,      0,      0, 0xF474, 0x3773,      0, 0xB26F,      0,
@@ -5665,7 +5665,7 @@ static const unsigned short utf8_to_euc_E586_x0213[] = {
  0x3427, 0xB276, 0x514F, 0xA32D, 0x514D, 0x4C3D, 0x514E,      0,
  0x495A, 0x5150, 0x5151, 0x5152, 0x455F, 0xA32E,      0,      0,
  0x5156, 0x5154, 0x5155, 0x5153, 0x3A63, 0x5157, 0x4C6A, 0x4E64,
- 0xB279,      0, 0xB27A,      0, 0xA330, 0x5158, 0xB27C, 0xB27D,
+ 0xB279,      0, 0xB27A,      0, 0xA330, 0x5158,      0, 0xB27D,
 };
 static const unsigned short utf8_to_euc_E587[] = {
       0,      0, 0xB27E,      0, 0x4028, 0x5159, 0x3D5A,      0,
@@ -5683,7 +5683,7 @@ static const unsigned short utf8_to_euc_E587_x0213[] = {
       0, 0xB323, 0xB324, 0xB325,      0, 0xB326, 0x5245,      0,
  0xB327,      0,      0, 0x515B, 0x7425, 0x3645, 0x2E57,      0,
  0x515C, 0x4B5E, 0x2E58,      0,      0, 0xB32A, 0x3D68, 0x427C,
-      0, 0x515E, 0x4664,      0, 0xF431, 0x515F, 0x2E59,      0,
+      0, 0x515E, 0x4664,      0,      0, 0x515F, 0x2E59,      0,
  0x5160, 0x332E, 0xB32C, 0xA333, 0xA334, 0x5161, 0x3627, 0xB32F,
  0x464C, 0x317A, 0x3D50,      0,      0, 0x4821, 0x5162,      0,
 };
@@ -5741,7 +5741,7 @@ static const unsigned short utf8_to_euc_E58A_x0213[] = {
  0xB34D,      0, 0xA33E, 0x3344, 0xA33D, 0xB34F,      0, 0x3760,
  0x517C, 0x4E2D, 0xB350,      0, 0xB351, 0x5178,      0,      0,
       0, 0x517D, 0x517A, 0x2E61, 0x5179, 0xB353, 0xB354, 0xB355,
- 0xA340,      0, 0xB357, 0x4E4F, 0xB358,      0,      0, 0x3879,
+ 0xA340,      0, 0xB357, 0x4E4F,      0,      0,      0, 0x3879,
  0x3243,      0,      0, 0x4E74, 0xA342, 0xB35A, 0xA343, 0xB35C,
       0, 0x3D75, 0x4558, 0x3965, 0x5222, 0x5223,      0, 0xA344,
  0xB35E, 0x4E65,      0,      0, 0x4F2B, 0x5225, 0xB35F, 0xB360,
@@ -5758,7 +5758,7 @@ static const unsigned short utf8_to_euc_E58B[] = {
  0x5230, 0x5231, 0x3C5B,      0,      0,      0, 0x387B, 0x4C5E,
 };
 static const unsigned short utf8_to_euc_E58B_x0213[] = {
- 0xB365, 0x5226,      0, 0x4B56, 0xB366, 0x443C, 0xB367, 0x4D26,
+      0, 0x5226,      0, 0x4B56, 0xB366, 0x443C, 0xB367, 0x4D26,
  0x2E62, 0x4A59, 0xA347,      0, 0x2E64, 0x5227,      0, 0xB36A,
  0x2E65, 0xA349, 0x7055,      0, 0xB36C, 0x4630, 0x2E66, 0x5228,
  0x342A, 0x4C33,      0, 0x2E67, 0xB36F, 0x3E21, 0x5229, 0x4A67,
@@ -5804,7 +5804,7 @@ static const unsigned short utf8_to_euc_E58D_x0213[] = {
  0x4331, 0xB439, 0x476E, 0xB43A, 0x4B4E,      0, 0x5246,      0,
  0x406A, 0x2E6F,      0, 0x2E70,      0, 0xB43D, 0x3735, 0xA354,
       0, 0x5247,      0,      0, 0xA355, 0xB43F, 0x5248, 0x312C,
- 0x3075, 0x346D, 0xB440, 0x4228, 0x3551, 0x4D71,      0, 0x524B,
+ 0x3075, 0x346D,      0, 0x4228, 0x3551, 0x4D71,      0, 0x524B,
  0x3237, 0xB441, 0xA356, 0x524A,      0, 0x2E71, 0xB442, 0x362A,
 };
 static const unsigned short utf8_to_euc_E58E[] = {
@@ -5841,7 +5841,7 @@ static const unsigned short utf8_to_euc_E58F_x0213[] = {
  0xA35B,      0, 0x3B32, 0x5254,      0, 0xB458,      0,      0,
  0x4B74, 0x3A35, 0x355A, 0x4D27, 0x4150, 0x483F, 0x3C7D, 0xB459,
       0,      0, 0xB45A, 0xB45B, 0x3D47, 0xA35F, 0x3C68, 0x3C75,
-      0, 0x3D76, 0xA360, 0x4840,      0, 0xB45E, 0xB45F, 0x5257,
+      0, 0x3D76, 0xA360, 0x4840,      0,      0, 0xB45F, 0x5257,
  0xB460, 0x3143, 0x4151, 0x387D, 0x3845, 0x3667, 0xB461, 0xB462,
  0x525B, 0x4321, 0x427E, 0x362B, 0x3E24, 0x525C, 0x525A, 0x3244,
  0x4266, 0x3C38, 0x3B4B, 0x3126, 0xA362, 0xA363, 0x3370, 0x3966,
@@ -6121,8 +6121,8 @@ static const unsigned short utf8_to_euc_E59D_x0213[] = {
  0x542E,      0, 0x3A64,      0,      0, 0xA45F, 0xA460, 0x3651,
       0,      0, 0x4B37,      0, 0xA461, 0xA462, 0x542C, 0x542F,
  0x3A41, 0x3923, 0xB740,      0,      0,      0,      0,      0,
-      0, 0xF436,      0,      0,      0,      0,      0,      0,
-      0, 0x5433, 0xB741,      0, 0x3A25, 0xB742, 0x4333, 0xB743,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0x5433, 0xB741,      0, 0x3A25,      0, 0x4333, 0xB743,
  0xA464, 0x5430, 0x445A, 0xB745,      0, 0xB746, 0xB747, 0xA465,
  0x2F47, 0xB74A,      0, 0xA466, 0xA467, 0xA468,      0, 0x2F48,
       0, 0xB74F, 0xB750, 0xA469, 0x2F49,      0, 0xB753, 0x5434,
@@ -6224,7 +6224,7 @@ static const unsigned short utf8_to_euc_E5A2_x0213[] = {
       0,      0,      0,      0, 0x4446, 0xA52F, 0x2F5D, 0x5452,
  0xB848, 0xB849, 0xB84A,      0,      0,      0, 0xB84B,      0,
  0x4B4F, 0x2F5F, 0xA530, 0x5453,      0,      0, 0x5458,      0,
-      0, 0xA531, 0xB84E, 0x4A2F,      0,      0,      0,      0,
+      0, 0xA531,      0, 0x4A2F,      0,      0,      0,      0,
  0x5457, 0x5451, 0x5454, 0x5456, 0xB850,      0, 0x3A26,      0,
 };
 static const unsigned short utf8_to_euc_E5A3[] = {
@@ -6280,9 +6280,9 @@ static const unsigned short utf8_to_euc_E5A5[] = {
 static const unsigned short utf8_to_euc_E5A5_x0213[] = {
       0,      0,      0, 0xB872, 0x3162,      0, 0xA542, 0x3471,
  0x4660, 0x4A74,      0,      0,      0,      0, 0x5477, 0x4155,
- 0x5476, 0x3740, 0xB874, 0xB875, 0x4B5B, 0x5475,      0, 0x4565,
+ 0x5476, 0x3740, 0xB874,      0, 0x4B5B, 0x5475,      0, 0x4565,
  0x5479, 0xB876, 0x5478, 0xA545,      0, 0x2F69, 0xB879, 0xA546,
- 0x547B, 0xB87B, 0x547A, 0xB87C,      0, 0x317C,      0, 0x547C,
+ 0x547B, 0xB87B, 0x547A,      0,      0, 0x317C,      0, 0x547C,
  0x3E29, 0x547E, 0x4325, 0xB87D, 0x547D, 0x2F6A, 0x4A33, 0xB921,
       0,      0, 0xB922, 0x3D77, 0x455B, 0xA548, 0xA549,      0,
  0x5521, 0xB925,      0, 0xB926, 0xA54A, 0x3925,      0,      0,
@@ -6305,7 +6305,7 @@ static const unsigned short utf8_to_euc_E5A6_x0213[] = {
       0,      0,      0, 0x5526, 0x2F6D, 0x4245,      0, 0xB930,
  0x4B38,      0,      0,      0, 0x454A, 0xB931, 0xA54C, 0xB933,
  0xB934,      0, 0x5527, 0xB935,      0,      0,      0, 0xB936,
-      0, 0x4B65, 0xB937, 0x3A4A, 0xA54D,      0, 0x3E2A,      0,
+      0, 0x4B65,      0, 0x3A4A, 0xA54D,      0, 0x3E2A,      0,
 };
 static const unsigned short utf8_to_euc_E5A7[] = {
       0, 0xB939,      0, 0xB93A, 0xB93B,      0, 0x5528,      0,
@@ -6564,7 +6564,7 @@ static const unsigned short utf8_to_euc_E5B3_x0213[] = {
       0, 0x5635,      0,      0,      0, 0xBB3C,      0,      0,
  0x463D, 0x362E,      0,      0,      0,      0,      0,      0,
  0x3265, 0x5636, 0x563B,      0,      0, 0x5639, 0xBB3E, 0x4A77,
- 0x4A76, 0xBB3F, 0xBB40,      0, 0x4F6D, 0xF43B, 0x4567,      0,
+ 0x4A76, 0xBB3F, 0xBB40,      0, 0x4F6D,      0, 0x4567,      0,
       0,      0, 0x5638, 0x3D54,      0, 0x5637,      0,      0,
 };
 static const unsigned short utf8_to_euc_E5B4[] = {
@@ -6640,7 +6640,7 @@ static const unsigned short utf8_to_euc_E5B7[] = {
 static const unsigned short utf8_to_euc_E5B7_x0213[] = {
       0,      0,      0, 0xBB76,      0,      0,      0, 0xBB77,
       0, 0x565A,      0, 0x4F7D, 0x3460, 0x565B, 0xBB7A,      0,
- 0xBB79, 0xA868, 0x565D, 0x565C,      0,      0, 0x565E, 0xA869,
+      0, 0xA868, 0x565D, 0x565C,      0,      0, 0x565E, 0xA869,
  0xA86A, 0xBB7C,      0, 0x565F,      0, 0x406E, 0x3D23,      0,
  0xA86B, 0x3D64, 0x7428, 0x4163, 0xA86D, 0x3929, 0x3A38, 0x392A,
  0x3570, 0xA86E,      0, 0x5660,      0,      0, 0x3A39,      0,
@@ -6742,7 +6742,7 @@ static const unsigned short utf8_to_euc_E5BC_x0213[] = {
  0xAC2D, 0x5732, 0x4A40, 0x5735, 0x5021, 0x5031, 0xAC2E, 0x3C30,
  0x4675, 0x5736,      0, 0x355D, 0x4424, 0x307A, 0x5737, 0x4A26,
  0x3930, 0xBC61,      0, 0x4350, 0xAC2F, 0x7434, 0xAC31, 0x446F,
-      0, 0xBC64, 0xBC65, 0x7435, 0xBC67, 0x4C6F, 0x3839, 0x384C,
+      0,      0, 0xBC65, 0x7435, 0xBC67, 0x4C6F, 0x3839, 0x384C,
  0xBC68, 0x5738,      0, 0xBC69, 0xBC6A, 0x5739, 0xBC6B, 0x573F,
  0xBC6C, 0x3C65,      0,      0, 0x7436, 0x4425, 0x7437, 0x362F,
  0x573A,      0,      0, 0xBC6F, 0x492B, 0x7438, 0x4346, 0xBC71,
@@ -6841,7 +6841,7 @@ static const unsigned short utf8_to_euc_E681_x0213[] = {
  0xBD5E, 0x576C, 0x5776, 0x5774,      0,      0, 0x5771, 0x744F,
  0xBD60, 0xBD61, 0x5770, 0x4E78, 0xAC4B, 0x5772,      0,      0,
  0x3632, 0xBD63, 0x3931,      0, 0xBD64, 0x3D7A, 0xBD65, 0xBD66,
-      0, 0x5779, 0x576B,      0,      0, 0xBD67,      0, 0x576F,
+      0, 0x5779, 0x576B,      0,      0,      0,      0, 0x576F,
  0x575F, 0xBD68, 0x327A, 0x5773, 0x5775, 0x4351,      0, 0xBD69,
  0x3A28, 0x3238, 0x576D, 0x5778, 0x5777, 0x3633,      0, 0x4229,
  0x3366, 0xBD6A,      0,      0,      0, 0x3743,      0, 0x576E,
@@ -6858,7 +6858,7 @@ static const unsigned short utf8_to_euc_E682[] = {
  0x5829,      0,      0, 0xBE21, 0x4569, 0x582E, 0xBE22,      0,
 };
 static const unsigned short utf8_to_euc_E682_x0213[] = {
-      0, 0x577A, 0xBD6D, 0x577D, 0x5821, 0xF43F, 0xBD6E,      0,
+      0, 0x577A, 0xBD6D, 0x577D, 0x5821,      0, 0xBD6E,      0,
  0xBD6F, 0x3C3D, 0xAC4D, 0x5827, 0x4470, 0x577B, 0xBD71,      0,
       0, 0xBD72, 0x5825, 0xBD73, 0x3279, 0xAC4E, 0x5823, 0x5824,
  0xBD75,      0, 0x577E, 0x5822,      0, 0x7451, 0x7452, 0x3867,
@@ -6881,7 +6881,7 @@ static const unsigned short utf8_to_euc_E683_x0213[] = {
       0,      0, 0xBE23,      0, 0xBE24, 0x3E70, 0x582F, 0x4657,
  0xAC54, 0xBE26, 0xBE27, 0x7453,      0,      0, 0xBE29, 0xBE2A,
       0, 0x4F47,      0, 0x582B, 0x7454, 0x7455,      0,      0,
- 0x5831, 0xAC55, 0x397B, 0xAC56, 0x404B, 0x7456, 0xBE30, 0x3054,
+ 0x5831, 0xAC55, 0x397B, 0xAC56, 0x404B, 0x7456,      0, 0x3054,
  0x582A, 0x5828, 0xBE31, 0x415A,      0, 0xBE32,      0, 0x577C,
  0x3B34,      0,      0,      0,      0,      0, 0xAC57,      0,
  0x4246, 0x583D, 0xAC58, 0x415B, 0x5838, 0xAC59, 0x5835, 0x5836,
@@ -6900,9 +6900,9 @@ static const unsigned short utf8_to_euc_E684[] = {
 static const unsigned short utf8_to_euc_E684_x0213[] = {
  0x5837, 0x3D25, 0xBE38, 0x583A,      0,      0, 0x5834, 0xBE39,
  0x4C7C, 0x4C7B, 0xBE3A,      0, 0xBE3B, 0x583E, 0x583F, 0x3055,
- 0xAC5A, 0xBE3D, 0xAC5B, 0xAC5C, 0xBE40, 0x5833, 0xBE41, 0xBE42,
+ 0xAC5A,      0, 0xAC5B, 0xAC5C, 0xBE40, 0x5833, 0xBE41, 0xBE42,
       0, 0xAC5D, 0x3672, 0x3026, 0x7458,      0, 0xAC5E, 0x3436,
- 0xF440, 0x583B, 0xBE46,      0,      0,      0,      0, 0x5843,
+      0, 0x583B, 0xBE46,      0,      0,      0,      0, 0x5843,
  0x5842,      0, 0xBE47, 0x7459, 0x5847,      0,      0,      0,
  0x745A, 0xBE4A,      0,      0, 0x5848, 0xBE4B, 0xBE4C, 0x745B,
       0, 0xBE4E, 0xAC5F,      0, 0x5846, 0x5849, 0x5841, 0x5845,
@@ -6980,7 +6980,7 @@ static const unsigned short utf8_to_euc_E688[] = {
 static const unsigned short utf8_to_euc_E688_x0213[] = {
  0x5878, 0xBF24,      0, 0xBF25, 0xBF26,      0,      0, 0xBF27,
  0x5879, 0x587A, 0x4A6A,      0, 0x587C, 0x587B, 0x3D3F,      0,
- 0x402E, 0x3266, 0x327C, 0xBF28, 0x587D, 0xAC73, 0x303F,      0,
+ 0x402E, 0x3266, 0x327C,      0, 0x587D, 0xAC73, 0x303F,      0,
       0,      0, 0x404C, 0x587E, 0xBF2A, 0x6C43, 0x5921, 0x3761,
  0xBF2B, 0x5922, 0x7462, 0xAC74,      0,      0, 0x406F, 0xBF2E,
       0, 0xAC75, 0x5923, 0xBF30,      0,      0, 0x5924, 0x353A,
@@ -7239,7 +7239,7 @@ static const unsigned short utf8_to_euc_E695[] = {
 };
 static const unsigned short utf8_to_euc_E695_x0213[] = {
       0,      0,      0, 0xC14A, 0xAD62, 0x384E,      0, 0xC14B,
- 0x5A43, 0xC14C,      0,      0,      0, 0x5A46, 0xF441, 0x4952,
+ 0x5A43, 0xC14C,      0,      0,      0, 0x5A46,      0, 0x4952,
  0xC14D, 0x355F, 0xC14E,      0, 0xAD63, 0x5A45, 0x5A44, 0x4754,
  0x5A47, 0x3635,      0,      0,      0, 0x5A49, 0x5A48, 0xC150,
  0xC151,      0, 0x343A, 0x3B36,      0,      0, 0x4658, 0x7529,
@@ -7303,9 +7303,9 @@ static const unsigned short utf8_to_euc_E698_x0213[] = {
       0, 0xC17A, 0xC17B, 0x3057, 0x404E, 0x752E, 0xC17D,      0,
       0,      0,      0,      0, 0x5A66, 0xC17E, 0x752F, 0x4031,
  0x3147, 0xAD77, 0x7531, 0xC224, 0x7532, 0x3D55, 0xC226, 0x4B66,
- 0x3A72, 0xC227, 0xAD78, 0x7533, 0xC22A, 0x3E3C, 0xC22B, 0x4027,
+ 0x3A72, 0xC227, 0xAD78, 0x7533, 0xC22A, 0x3E3C,      0, 0x4027,
  0x7534, 0x7535,      0, 0x7536, 0x5A65, 0x5A63, 0x5A64, 0xC230,
-      0, 0xC22F, 0x7530, 0xF442, 0x436B,      0,      0, 0x5B26,
+      0, 0xC22F, 0x7530,      0, 0x436B,      0,      0, 0x5B26,
 };
 static const unsigned short utf8_to_euc_E699[] = {
  0xC231, 0x5A6A, 0x3B7E, 0x3938, 0x5A68, 0xC232, 0xC233,      0,
@@ -7379,7 +7379,7 @@ static const unsigned short utf8_to_euc_E69C[] = {
 };
 static const unsigned short utf8_to_euc_E69C_x0213[] = {
  0x3A47, 0xAE37,      0, 0x5072,      0, 0xAE38,      0, 0xC26F,
- 0x376E, 0x4D2D,      0, 0x4A7E,      0, 0x497E, 0xC270, 0x5B2C,
+ 0x376E, 0x4D2D,      0, 0x4A7E,      0, 0x497E,      0, 0x5B2C,
       0,      0, 0xAE39, 0x754D, 0x3A73, 0x443F, 0x5B2D, 0x4F2F,
       0, 0xAE3B,      0, 0x4B3E, 0xC273, 0x442B, 0x5B2E, 0x347C,
  0xC274,      0, 0xC275,      0,      0,      0, 0x5B2F, 0x5B30,
@@ -7682,7 +7682,7 @@ static const unsigned short utf8_to_euc_E6AB_x0213[] = {
  0xC54D, 0xC54C,      0,      0, 0xC54E,      0,      0,      0,
  0xAF66, 0x5D2A,      0, 0x4F26, 0xAF65, 0xC551, 0xC552,      0,
       0,      0, 0x5D2D, 0x367B, 0xAF67, 0xAF68, 0x5D29, 0x5D2B,
-      0,      0, 0xF44A,      0, 0x7638,      0,      0, 0x7639,
+      0,      0,      0,      0, 0x7638,      0,      0, 0x7639,
  0x4827,      0, 0x5D2E,      0, 0xAF6B,      0,      0,      0,
  0xC558, 0xAF6C, 0xAF6D, 0xAF6E,      0,      0,      0,      0,
       0,      0, 0x5D32, 0x5D2F, 0xC55B, 0xAF6F,      0,      0,
@@ -7803,7 +7803,7 @@ static const unsigned short utf8_to_euc_E6B1_x0213[] = {
  0x3C2E,      0, 0xC65C,      0, 0xC65D, 0x5D68,      0, 0x3440,
       0, 0x7651, 0x3178, 0xEE37, 0x7652, 0x4672, 0x5D67, 0x393E,
  0x4353,      0, 0x5D69,      0,      0,      0,      0, 0xEE4F,
- 0x5D71,      0, 0x5D6A, 0xC661,      0, 0xEE38,      0, 0xC663,
+ 0x5D71,      0, 0x5D6A, 0xC661,      0, 0xEE38,      0,      0,
  0x4241,      0, 0x3562, 0x5D72, 0x7654,      0, 0x7655,      0,
  0xC666, 0xC667, 0x3768, 0xC668,      0, 0x3525, 0x5D70,      0,
 };
@@ -7883,7 +7883,7 @@ static const unsigned short utf8_to_euc_E6B5_x0213[] = {
       0,      0,      0,      0,      0,      0,      0, 0xC73D,
  0x7667, 0x5E36, 0x5E34, 0xEE52, 0x494D,      0, 0xEE53, 0xC73F,
  0xEE54, 0xC740,      0, 0x5E31, 0x5E33, 0x7668, 0x313A, 0xC742,
-      0, 0x3940, 0x4F32,      0, 0x333D,      0, 0x4962, 0xC743,
+      0, 0x3940, 0x4F32,      0, 0x333D,      0, 0x4962,      0,
  0xEE55,      0,      0,      0, 0x4D61,      0,      0, 0x3324,
  0x3F3B, 0x5E35,      0,      0, 0xC745,      0,      0,      0,
 };
@@ -7900,7 +7900,7 @@ static const unsigned short utf8_to_euc_E6B6[] = {
 static const unsigned short utf8_to_euc_E6B6_x0213[] = {
  0xEE56, 0xEE57, 0x766A,      0,      0, 0x5E3A,      0, 0x766B,
  0x3E43, 0x766C, 0xEE58,      0, 0x4D30, 0xEE59, 0x5E37,      0,
-      0, 0xEE5A, 0xC749, 0x5E32, 0x766D, 0x5E38, 0xC74B, 0xC74C,
+      0, 0xEE5A, 0xC749, 0x5E32, 0x766D, 0x5E38,      0, 0xC74C,
  0xEE5B, 0x4E5E,      0, 0x4573, 0x4642,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0, 0x766E, 0xEE61, 0x766F,      0, 0xEE62, 0x3336,
@@ -7924,8 +7924,8 @@ static const unsigned short utf8_to_euc_E6B7_x0213[] = {
  0x4571, 0x5E4A, 0x7673, 0x7674,      0, 0x7675, 0x5E44, 0xEE6A,
  0xC75E, 0x4338, 0xC75F,      0, 0x5E4B, 0xC760, 0x5E40,      0,
  0x5E46, 0xEE6B, 0x5E4D, 0x307C, 0x5E43,      0, 0x5E4E, 0xC762,
- 0xC763, 0x3F3C, 0xF44C, 0x3D5F, 0xC764, 0x4A25, 0xEE6C, 0x3A2E,
- 0xF44B, 0x5E3B, 0x5E49, 0x453A, 0x7676,      0,      0,      0,
+ 0xC763, 0x3F3C,      0, 0x3D5F, 0xC764, 0x4A25, 0xEE6C, 0x3A2E,
+      0, 0x5E3B, 0x5E49, 0x453A, 0x7676,      0,      0,      0,
 };
 static const unsigned short utf8_to_euc_E6B8[] = {
  0xC767,      0,      0,      0, 0xC768, 0x4036,      0, 0x3369,
@@ -7945,7 +7945,7 @@ static const unsigned short utf8_to_euc_E6B8_x0213[] = {
  0x3574, 0x454F, 0xEE6F, 0x5E56, 0x5E5F, 0x302F, 0x3132, 0xEE70,
       0, 0x3239,      0, 0x5E58, 0x422C, 0x5E4F, 0x5E51, 0x3941,
       0,      0, 0xEE72,      0, 0x7678,      0, 0xEE6D,      0,
- 0x5E62, 0xC76E, 0x5E5D, 0xC76F, 0xEE73,      0, 0x5E55,      0,
+ 0x5E62,      0, 0x5E5D, 0xC76F, 0xEE73,      0, 0x5E55,      0,
 };
 static const unsigned short utf8_to_euc_E6B9[] = {
       0,      0,      0, 0x5E5C, 0xC771, 0xC772,      0,      0,
@@ -8342,7 +8342,7 @@ static const unsigned short utf8_to_euc_E78C_x0213[] = {
       0,      0, 0x6049, 0xCB26,      0, 0xCB27,      0,      0,
       0,      0, 0xF046, 0xCB29,      0,      0, 0x604B, 0x6048,
  0xF047, 0xF048,      0, 0x4C54, 0x604A, 0x604C, 0xCB2C, 0x4E44,
-      0,      0, 0xCB2D,      0, 0xCB2E, 0x6050,      0, 0x776D,
+      0,      0, 0xCB2D,      0,      0, 0x6050,      0, 0x776D,
  0x776E, 0x604F, 0x4376, 0x472D, 0xF04B,      0, 0x3825, 0x604E,
       0, 0xF04C, 0xCB33, 0xF04D, 0x604D, 0xCB34, 0x4D31, 0x4D32,
       0, 0xF04A, 0xCB35, 0xCB36,      0, 0xF04E, 0x6051, 0x316E,
@@ -8385,7 +8385,7 @@ static const unsigned short utf8_to_euc_E78E_x0213[] = {
  0x7775,      0, 0x7776,      0,      0, 0xF05F, 0x7777,      0,
  0xF060, 0x3461, 0xCB5F, 0x7778,      0, 0xCB61,      0,      0,
       0,      0, 0x4E68, 0x605E,      0, 0xF061,      0, 0xF062,
-      0, 0xF063,      0, 0x6060, 0xF064, 0xCB66,      0, 0xF065,
+      0, 0xF063,      0, 0x6060, 0xF064,      0,      0, 0xF065,
 };
 static const unsigned short utf8_to_euc_E78F[] = {
  0x6061,      0, 0x3251,      0,      0, 0xCB68, 0xCB69,      0,
@@ -8400,11 +8400,11 @@ static const unsigned short utf8_to_euc_E78F[] = {
 static const unsigned short utf8_to_euc_E78F_x0213[] = {
  0x6061,      0, 0x3251,      0,      0, 0xF066, 0xCB69,      0,
  0x605D, 0x7779, 0x3B39, 0xF067, 0xCB6C, 0x4441, 0x605F, 0x777A,
-      0,      0, 0xCB6E, 0xCB6F,      0,      0, 0x777B,      0,
+      0,      0,      0, 0xCB6F,      0,      0, 0x777B,      0,
       0, 0x777C,      0,      0,      0, 0xCB72, 0x6064,      0,
  0x3C6E, 0xF068,      0, 0x777D,      0, 0x6062, 0xCB75, 0xF069,
       0, 0x777E, 0x373E,      0,      0, 0x4849, 0x6063,      0,
-      0, 0x607E,      0,      0, 0xCB78, 0xCB79,      0, 0xCB7A,
+      0, 0x607E,      0,      0, 0xCB78,      0,      0, 0xCB7A,
  0x6069, 0xF06A, 0xF06C, 0xCB7D,      0, 0xCB7E, 0x383D, 0xCC21,
 };
 static const unsigned short utf8_to_euc_E790[] = {
@@ -8423,7 +8423,7 @@ static const unsigned short utf8_to_euc_E790_x0213[] = {
       0, 0xCC27,      0, 0xF06B,      0,      0,      0,      0,
       0,      0, 0x7823, 0x7824,      0,      0,      0,      0,
       0,      0, 0x4276,      0, 0xF06E, 0x6068, 0x7826,      0,
- 0x7827, 0xCC2D, 0x7828, 0x7829, 0x782A, 0xCC31, 0x782B, 0x782C,
+ 0x7827,      0, 0x7828, 0x7829, 0x782A, 0xCC31, 0x782B, 0x782C,
  0x782D, 0xF06F, 0x606A, 0x4E56, 0x3657, 0x487C, 0x474A,      0,
       0, 0xF070, 0x606B,      0,      0,      0,      0, 0x606D,
 };
@@ -8618,7 +8618,7 @@ static const unsigned short utf8_to_euc_E79A[] = {
  0x6230, 0x6231, 0x6232,      0,      0, 0xCE48,      0, 0x3B2E,
 };
 static const unsigned short utf8_to_euc_E79A_x0213[] = {
- 0x6225, 0x7860, 0xF451, 0x6226, 0x452A, 0xCE36, 0x3327, 0x3944,
+ 0x6225, 0x7860,      0, 0x6226, 0x452A, 0xCE36, 0x3327, 0x3944,
  0x6227,      0,      0, 0x6228, 0xCE37, 0xCE38, 0x6229,      0,
  0x3B29,      0,      0, 0x622B,      0, 0xF16E, 0x622A,      0,
       0, 0x622C, 0x622D, 0x7861, 0xF16F, 0x7862, 0x7863, 0xCE3D,
@@ -8765,7 +8765,7 @@ static const unsigned short utf8_to_euc_E7A1_x0213[] = {
  0xCF66, 0xCF67,      0, 0xCF68, 0xF246,      0,      0,      0,
  0x7925,      0, 0xF247, 0x4E32, 0x3945,      0, 0x7926, 0x3827,
       0,      0, 0x4823,      0, 0x626D,      0,      0,      0,
-      0,      0, 0xCF6D,      0, 0x626F,      0, 0xCF6E,      0,
+      0,      0,      0,      0, 0x626F,      0, 0xCF6E,      0,
 };
 static const unsigned short utf8_to_euc_E7A2[] = {
       0, 0x386B,      0,      0,      0,      0, 0x626E, 0x4476,
@@ -9322,7 +9322,7 @@ static const unsigned short utf8_to_euc_E7BE_x0213[] = {
  0x6633,      0, 0x4D53, 0xD526, 0x6635, 0xD527, 0x487E, 0xD528,
  0xF473, 0x7A3B,      0,      0, 0x6636,      0, 0xF476, 0x7A3C,
       0,      0, 0x6639,      0, 0xF477, 0x6638, 0x6637,      0,
-      0, 0xD52E, 0xD52F, 0x663A, 0x3732,      0, 0xD530,      0,
+      0,      0, 0xD52F, 0x663A, 0x3732,      0, 0xD530,      0,
  0x4122, 0x3541, 0xD531,      0,      0, 0xF478, 0x663E, 0x663B,
       0,      0, 0x663C,      0, 0xD533,      0, 0x663F,      0,
  0x6640, 0x663D,      0,      0, 0xD534, 0x3129,      0, 0x7A3D,
@@ -9664,7 +9664,7 @@ static const unsigned short utf8_to_euc_E88F_x0213[] = {
  0x6845,      0,      0,      0, 0x3A5A, 0xF63E,      0, 0x4551,
  0x684A, 0x7B22,      0,      0,      0, 0xF63F,      0,      0,
  0xD83F, 0x4A6E, 0x7B23, 0x6841,      0,      0,      0, 0x325A,
- 0x3856, 0x4929, 0x684B,      0, 0x683F,      0, 0xD841, 0x6848,
+ 0x3856, 0x4929, 0x684B,      0, 0x683F,      0,      0, 0x6848,
  0xD842, 0xF640,      0, 0x6852, 0xD844, 0x6843,      0,      0,
 };
 static const unsigned short utf8_to_euc_E890[] = {
@@ -9783,7 +9783,7 @@ static const unsigned short utf8_to_euc_E895_x0213[] = {
  0xD943, 0xF670, 0xD945, 0xF671,      0, 0x6924, 0xD947, 0x4979,
  0x687D, 0x7B38, 0x6856,      0, 0xD949, 0xD94A, 0xF672, 0xD94C,
  0xD94D, 0xF673, 0xF674, 0x687C, 0x7B39,      0,      0,      0,
- 0x4F4F, 0x4622, 0x4973, 0xD951,      0, 0x692B,      0, 0xF66C,
+ 0x4F4F, 0x4622, 0x4973,      0,      0, 0x692B,      0, 0xF66C,
       0,      0,      0,      0,      0,      0,      0, 0x6931,
       0, 0xD953, 0x7B3C, 0xF676,      0, 0xF677, 0x6932, 0xF678,
 };
@@ -9998,7 +9998,7 @@ static const unsigned short utf8_to_euc_E8A0[] = {
       0, 0x6A45, 0xDC21, 0x6A47, 0xDC22,      0,      0,      0,
 };
 static const unsigned short utf8_to_euc_E8A0_x0213[] = {
-      0, 0xF77A,      0, 0xF77B,      0, 0x6A24, 0x7B63, 0xF464,
+      0, 0xF77A,      0, 0xF77B,      0, 0x6A24, 0x7B63,      0,
       0, 0xDB6B, 0x7B64, 0xF77C,      0, 0x6A38, 0x6A3C, 0x6A37,
  0x7B65, 0x6A3E, 0xDB70, 0xF77D, 0x7B66, 0x6A40, 0x6A3F,      0,
  0xDB73, 0xDB6F, 0xDB74, 0xDB75, 0xDB76,      0, 0xDB77, 0x7B67,
@@ -10260,7 +10260,7 @@ static const unsigned short utf8_to_euc_E8AD[] = {
 static const unsigned short utf8_to_euc_E8AD_x0213[] = {
       0, 0x6B76, 0xDE44, 0xF86A, 0xDE46, 0xDE47, 0x7C31,      0,
  0xDE49, 0x6B7A,      0,      0, 0x6B77, 0xDE4E, 0x6B79, 0x6B78,
-      0, 0xF86C, 0xDE4A, 0xDE4B, 0x7C32,      0, 0x6B7B,      0,
+      0, 0xF86C, 0xDE4A,      0, 0x7C32,      0, 0x6B7B,      0,
  0x3C31, 0x7C33, 0x6B7D, 0x6B7C, 0x4968,      0, 0xF86D, 0x6C21,
       0,      0,      0, 0xDE50,      0,      0, 0x3759,      0,
       0, 0x7C34,      0, 0x6B7E, 0x6C22, 0xDE51,      0, 0x6C23,
@@ -10404,7 +10404,7 @@ static const unsigned short utf8_to_euc_E8B5_x0213[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0, 0x4056, 0xDF46, 0x3C4F, 0x6C5F,
       0, 0xDF47,      0, 0x3352, 0xF935, 0x6C60, 0xDF49,      0,
- 0x4176, 0x6C61,      0, 0x6C62, 0x496B,      0, 0xF468, 0x352F,
+ 0x4176, 0x6C61,      0, 0x6C62, 0x496B,      0,      0, 0x352F,
       0,      0,      0,      0,      0,      0,      0, 0xDF4A,
 };
 static const unsigned short utf8_to_euc_E8B6[] = {
@@ -10519,7 +10519,7 @@ static const unsigned short utf8_to_euc_E8BB[] = {
 };
 static const unsigned short utf8_to_euc_E8BB_x0213[] = {
  0x7C4A, 0xE055,      0, 0xE056, 0xE057, 0x6D40, 0x6D3D, 0xE058,
- 0x6D41,      0, 0x3C56, 0x6D42, 0x3530, 0x3733,      0, 0xE059,
+ 0x6D41,      0, 0x3C56, 0x6D42, 0x3530, 0x3733,      0,      0,
       0, 0xF95A, 0x382E,      0, 0xF95B,      0,      0,      0,
       0,      0,      0, 0x6D43, 0xE05C,      0,      0, 0x4670,
       0,      0, 0x453E, 0x6D44,      0,      0,      0,      0,
@@ -10642,7 +10642,7 @@ static const unsigned short utf8_to_euc_E981_x0213[] = {
       0, 0x6E26, 0x4D37, 0x313F, 0xE15D, 0x4A57, 0x3261, 0x6E21,
  0x6E22, 0x6E23, 0x6E24, 0x463B, 0x4323, 0x3063, 0x6E28,      0,
  0x6E29, 0x7423,      0, 0xE15E, 0x423D, 0xF97D, 0x6E2A,      0,
- 0x3173, 0x414C, 0xE160, 0x382F,      0, 0x4D5A, 0xE161, 0xE162,
+ 0x3173, 0x414C, 0xE160, 0x382F,      0, 0x4D5A, 0xE161,      0,
  0x6E2B, 0x452C,      0,      0, 0xE163, 0x4178, 0x3C57, 0x6E2C,
  0xE164,      0, 0x6E2F,      0, 0xE165, 0x3D65, 0x6E2D, 0x412B,
  0x412A, 0xE166, 0x3064,      0, 0x4E4B, 0x6E31,      0, 0x4872,
@@ -10761,7 +10761,7 @@ static const unsigned short utf8_to_euc_E987_x0213[] = {
  0x6E56, 0x6E57, 0xE321, 0xFA4C, 0xFA4D, 0xE323, 0x4850, 0x3A53,
  0x3C61, 0x6E58,      0, 0x6E59, 0x4E24, 0x3D45, 0x4C6E, 0x4E4C,
  0x6E5A, 0x3662,      0, 0xE324, 0xE325,      0, 0x6E5B, 0x7C7C,
- 0x4523, 0xE327, 0xFA4E, 0x6E5E, 0x3378, 0x3F4B, 0xE329, 0x6E5C,
+ 0x4523, 0xE327, 0xFA4E, 0x6E5E, 0x3378, 0x3F4B,      0, 0x6E5C,
       0, 0x6E5D,      0, 0x4460, 0x7C7E, 0x7D21, 0x4B55, 0x367C,
       0, 0xE32C, 0xE32D,      0, 0xFA51, 0x7D22, 0xFA52, 0xE331,
  0xE332, 0x7D23,      0,      0,      0, 0x6E60, 0x6E61, 0xE334,
@@ -10778,7 +10778,7 @@ static const unsigned short utf8_to_euc_E988[] = {
  0xE353, 0xE354, 0xE355,      0, 0xE356,      0, 0xE357, 0x6E6F,
 };
 static const unsigned short utf8_to_euc_E988_x0213[] = {
- 0xE338, 0xFA53,      0,      0, 0xE33A, 0xE33B, 0xE33C, 0x7D24,
+ 0xE338, 0xFA53,      0,      0, 0xE33A, 0xE33B,      0, 0x7D24,
       0, 0xE33E, 0xFA54,      0, 0xE340, 0x465F, 0x3343,      0,
  0x7D25, 0x6E67, 0xE342, 0xE343, 0x6E64, 0x6E66, 0xFA55, 0xFA56,
  0xE345,      0,      0,      0, 0xE346, 0xE347, 0x6E62,      0,
@@ -10804,7 +10804,7 @@ static const unsigned short utf8_to_euc_E989_x0213[] = {
  0xE362, 0xFA5F, 0x6E76, 0x3174, 0xE364, 0xE365, 0x6E68,      0,
  0xFA60, 0xFA61, 0x482D,      0, 0x6E6C, 0xFA62, 0x3E60, 0xFA63,
  0xFA64, 0xE36B,      0,      0,      0,      0, 0xE36C, 0xE36D,
- 0xE36E, 0x395B,      0,      0,      0, 0xE36F, 0xE370, 0xE371,
+ 0xE36E, 0x395B,      0,      0,      0, 0xE36F, 0xE370,      0,
  0x7D2D, 0xE373,      0, 0xE374, 0xFA67, 0xFA68, 0x4B48, 0xFA69,
 };
 static const unsigned short utf8_to_euc_E98A[] = {
@@ -10840,7 +10840,7 @@ static const unsigned short utf8_to_euc_E98B[] = {
 static const unsigned short utf8_to_euc_E98B_x0213[] = {
  0xFA75, 0xE433, 0x7D2F, 0xE435,      0, 0xE436, 0xFA76, 0xE438,
  0xE439,      0,      0, 0x7D30, 0x7D31, 0xE43C, 0xFA77, 0x6E77,
- 0xFA78,      0, 0x4B2F, 0x7D32,      0, 0xE440,      0, 0xFA79,
+ 0xFA78,      0, 0x4B2F, 0x7D32,      0,      0,      0, 0xFA79,
  0xE442, 0xFA7A,      0,      0, 0xE444, 0xE445,      0, 0xE446,
  0x7D33, 0xE448,      0, 0xE449, 0x3D7B, 0xFA7B,      0, 0xFA7C,
  0xE44C, 0x6E7A, 0x4A5F,      0, 0xE44D, 0x3154, 0xE44E,      0,
@@ -10902,7 +10902,7 @@ static const unsigned short utf8_to_euc_E98E_x0213[] = {
  0xFB38,      0, 0xE528, 0xFB39, 0x3379, 0xE52A,      0, 0xFB3A,
       0,      0, 0xE52C,      0, 0x6F30, 0xE52D, 0x3A3F, 0x4179,
  0xE52E,      0, 0x444A, 0x7D40,      0,      0, 0xFB3B,      0,
-      0, 0xFB35,      0, 0x7D41, 0xE533,      0, 0xE534, 0x333B,
+      0, 0xFB35,      0, 0x7D41,      0,      0, 0xE534, 0x333B,
  0xE535, 0xE53B,      0, 0xE536, 0x6F2E, 0x6F2F, 0x4443,      0,
  0x6F2D,      0,      0,      0, 0xE537, 0xE538, 0xE539,      0,
       0, 0x6F31, 0x7D42,      0,      0,      0,      0,      0,
@@ -10925,7 +10925,7 @@ static const unsigned short utf8_to_euc_E98F_x0213[] = {
       0, 0x3640, 0xFB43,      0, 0x6F3B, 0x6F35, 0xE54C, 0xFB44,
  0x6F34,      0,      0,      0,      0,      0,      0,      0,
       0, 0xFB3F,      0,      0,      0, 0xFB3C,      0, 0xE54F,
- 0xE550, 0xE54E, 0xE551, 0xFB49,      0, 0x7D47,      0,      0,
+      0, 0xE54E, 0xE551, 0xFB49,      0, 0x7D47,      0,      0,
 };
 static const unsigned short utf8_to_euc_E990[] = {
       0, 0xE554, 0xE555, 0x6F3F, 0xE556,      0,      0, 0x6F40,
@@ -10944,7 +10944,7 @@ static const unsigned short utf8_to_euc_E990_x0213[] = {
  0x3E62, 0x462A, 0x6F3C,      0,      0,      0,      0, 0xE55F,
       0, 0x6F45,      0,      0,      0,      0,      0,      0,
       0,      0,      0, 0x6F43,      0,      0, 0xE560, 0xE561,
-      0, 0xE562, 0xFB4A, 0x7D48, 0xFB4B, 0x6F44, 0x6F42,      0,
+      0,      0, 0xFB4A, 0x7D48, 0xFB4B, 0x6F44, 0x6F42,      0,
  0x4278,      0, 0x6F46, 0xFB4C,      0, 0xE568,      0, 0xE567,
 };
 static const unsigned short utf8_to_euc_E991[] = {
@@ -10959,7 +10959,7 @@ static const unsigned short utf8_to_euc_E991[] = {
 };
 static const unsigned short utf8_to_euc_E991_x0213[] = {
       0, 0x6F47,      0, 0xE569, 0x6F49, 0xFB4D,      0,      0,
- 0xE56B,      0, 0x7D49,      0, 0xE56D,      0,      0,      0,
+      0,      0, 0x7D49,      0, 0xE56D,      0,      0,      0,
       0, 0x3455, 0x6F48, 0x4C7A,      0, 0xE56E,      0,      0,
       0, 0xE56F, 0x6F54, 0x6F4A, 0xE570,      0, 0x6F4D, 0xE571,
  0x6F4B, 0xE572, 0x6F4C, 0x7D4A,      0,      0,      0,      0,
@@ -11010,7 +11010,7 @@ static const unsigned short utf8_to_euc_E996[] = {
 static const unsigned short utf8_to_euc_E996_x0213[] = {
  0x4C67,      0, 0x6F59, 0x412E, 0xE622,      0, 0xFB54, 0x6F5A,
  0xE623, 0x4A44, 0x6F5B, 0x332B, 0xFB55, 0xFB56, 0x7D4E, 0x313C,
-      0, 0x3457, 0xF471, 0x3456, 0x6F5C,      0, 0x6F5D,      0,
+      0, 0x3457,      0, 0x3456, 0x6F5C,      0, 0x6F5D,      0,
  0x6F5E, 0x6F5F,      0,      0,      0, 0xE627, 0xE628, 0x7D4F,
  0x6F60, 0xE62A, 0x3458, 0x3355, 0x395E, 0x4836, 0x7D50, 0x6F62,
  0x6F61, 0x7D51,      0, 0xFB58, 0x7D52, 0x6F63,      0,      0,
@@ -11148,9 +11148,9 @@ static const unsigned short utf8_to_euc_E99D[] = {
  0xE73E, 0x7058, 0x705C, 0xE73F, 0x705A, 0xE740,      0, 0xE741,
 };
 static const unsigned short utf8_to_euc_E99D_x0213[] = {
-      0, 0xFB7A, 0x704E, 0xE72E, 0x704B,      0, 0x704C, 0xFB7B,
+      0, 0xFB7A, 0x704E,      0, 0x704B,      0, 0x704C, 0xFB7B,
  0x704D, 0x704F, 0xE72F,      0,      0, 0x7D68, 0x7D69, 0x7D6A,
-      0, 0xF476, 0x4044,      0,      0, 0xFB7C, 0x4C77, 0xFB7D,
+      0,      0, 0x4044,      0,      0, 0xFB7C, 0x4C77, 0xFB7D,
  0xE734, 0x4045, 0x7D6B, 0xFB7E, 0x7050,      0, 0x4873,      0,
  0x7051, 0x7353, 0x4C4C, 0xE737, 0x7052,      0, 0x7053, 0xE738,
  0x7054, 0x3357, 0xFC21, 0x7056,      0, 0x3F59, 0x7D6C,      0,
@@ -11292,7 +11292,7 @@ static const unsigned short utf8_to_euc_E9A4_x0213[] = {
  0xFC54, 0x712E, 0x4D5C,      0, 0x3142,      0,      0,      0,
  0x3B41, 0xE853, 0x712F, 0x326E, 0x7130, 0xE854, 0xFC57, 0xFC58,
  0x7131,      0, 0xFC5A, 0xFC5B, 0xFC5C, 0x7133, 0x7134, 0xE85A,
- 0x7136, 0x7132, 0xE85B,      0, 0x7135,      0, 0xE85C, 0xE85D,
+ 0x7136, 0x7132, 0xE85B,      0, 0x7135,      0, 0xE85C,      0,
  0x345B,      0,      0, 0xE85E, 0x7137,      0, 0x7138,      0,
       0, 0xFC5E, 0xFC5F, 0xFC60, 0xE862, 0xE863,      0,      0,
       0, 0xE864, 0xFC61, 0xFC62, 0xFC63, 0x7139, 0x713A,      0,
@@ -11431,7 +11431,7 @@ static const unsigned short utf8_to_euc_E9AB_x0213[] = {
  0x716F, 0x7E36,      0, 0x7E37, 0x3F71,      0, 0xFD2D,      0,
  0xE965,      0,      0,      0,      0,      0, 0x7E38, 0x7170,
  0xFD2E, 0x7171, 0xFD2F, 0x7172, 0x7173, 0xFD30, 0x7E39, 0xE96B,
- 0x3962, 0xF47B,      0, 0xE96C, 0xFD32,      0, 0x7174, 0x7175,
+ 0x3962,      0,      0, 0xE96C, 0xFD32,      0, 0x7174, 0x7175,
  0xFD33,      0, 0x7176, 0x7177, 0xE96F, 0xFD34, 0x7178, 0xE971,
       0, 0xFD35, 0x4831, 0x717A, 0xE973, 0x4926, 0x717B, 0x7179,
       0, 0x717D, 0xE974, 0xE975, 0x717C, 0xE976,      0, 0x717E,
@@ -11495,7 +11495,7 @@ static const unsigned short utf8_to_euc_E9AE_x0213[] = {
  0x723E,      0,      0,      0,      0,      0, 0xFD48, 0x7E49,
  0x723F, 0xEA63, 0x4B6E, 0x3B2D, 0xFD49, 0x3A7A, 0x412F,      0,
  0xEA65, 0xFD4A, 0xFD4D,      0, 0x7240,      0,      0, 0xEA68,
- 0xFD4E, 0x7243,      0, 0xEA6A, 0xEA6B,      0, 0xFD4F, 0xEA6D,
+ 0xFD4E, 0x7243,      0,      0, 0xEA6B,      0, 0xFD4F, 0xEA6D,
 };
 static const unsigned short utf8_to_euc_E9AF[] = {
  0x7241, 0xEA6E,      0,      0,      0,      0, 0x7244, 0xEA6F,
@@ -11859,11 +11859,11 @@ static const unsigned short utf8_to_euc_EFA8[] = {
 };
 static const unsigned short utf8_to_euc_EFA8_x0213[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0xF434, 0x2F4B,
- 0x2F57, 0x4F72, 0xF444, 0xAE79, 0x757A, 0x775A, 0x776F, 0xF453,
- 0xF455, 0x793C, 0x793D, 0x7941, 0xF45A, 0xF45B, 0xF45E, 0x7B3A,
- 0xF738, 0xF745, 0x7C2E, 0xF469, 0xF96E, 0xF46B, 0x7C6A, 0xF46F,
- 0xF470, 0xF473, 0xF477, 0xF478, 0xF479, 0xF47D,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0x2F4B,
+ 0x2F57, 0x4F72,      0, 0xAE79, 0x757A, 0x775A, 0x776F,      0,
+      0, 0x793C, 0x793D, 0x7941,      0,      0,      0, 0x7B3A,
+ 0xF738, 0xF745, 0x7C2E,      0, 0xF96E,      0, 0x7C6A,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
  0x2E38, 0x2E49, 0x2E50, 0x2E63, 0x2E68, 0x2E6E, 0x2F2C, 0x2F2F,
  0x2F36, 0x2F5A, 0x2F5E, 0x4F61, 0x4F62, 0x7450, 0x745C, 0x745E,
 };
@@ -11957,6 +11957,16 @@ 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 utf8_to_euc_EFBF_x0213[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0x2131,      0, 0x216F,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
 static const unsigned short *const utf8_to_euc_E1_x0213[] = {
                 0,                0,                0,                0,
                 0,                0,                0,                0,
@@ -12405,7 +12415,7 @@ static const unsigned short *const utf8_to_euc_EF_x0213[] = {
                 0,                0,                0,                0,
                 0,                0,                0,                0,
                 0, utf8_to_euc_EFB9_x0213,                0,                0,
- utf8_to_euc_EFBC_x0213, utf8_to_euc_EFBD_x0213, utf8_to_euc_EFBE, utf8_to_euc_EFBF,
+ utf8_to_euc_EFBC_x0213, utf8_to_euc_EFBD_x0213, utf8_to_euc_EFBE, utf8_to_euc_EFBF_x0213,
 };
 const unsigned short *const utf8_to_euc_2bytes[] = {
               0,              0,              0,              0,
diff --git a/ext/nkf/nkf.c b/ext/nkf/nkf.c
index 9613a925ce..37717e4799 100644
--- a/ext/nkf/nkf.c
+++ b/ext/nkf/nkf.c
@@ -137,8 +137,7 @@ rb_nkf_convert(VALUE obj, VALUE opt, VALUE src)
 {
     VALUE tmp;
     reinit();
-    StringValue(opt);
-    nkf_split_options(RSTRING_PTR(opt));
+    nkf_split_options(StringValueCStr(opt));
     if (!output_encoding) rb_raise(rb_eArgError, "no output encoding given");
 
     switch (nkf_enc_to_index(output_encoding)) {
@@ -153,8 +152,7 @@ rb_nkf_convert(VALUE obj, VALUE opt, VALUE src)
     incsize = INCSIZE;
 
     input_ctr = 0;
-    StringValue(src);
-    input = (unsigned char *)RSTRING_PTR(src);
+    input = (unsigned char *)StringValuePtr(src);
     i_len = RSTRING_LENINT(src);
     tmp = rb_str_new(0, i_len*3 + 10);
 
@@ -170,7 +168,6 @@ rb_nkf_convert(VALUE obj, VALUE opt, VALUE src)
     /* use _result_ end */
 
     rb_str_set_len(tmp, output_ctr);
-    OBJ_INFECT(tmp, src);
 
     if (mimeout_f)
 	rb_enc_associate(tmp, rb_usascii_encoding());
@@ -195,8 +192,7 @@ rb_nkf_guess(VALUE obj, VALUE src)
     reinit();
 
     input_ctr = 0;
-    StringValue(src);
-    input = (unsigned char *)RSTRING_PTR(src);
+    input = (unsigned char *)StringValuePtr(src);
     i_len = RSTRING_LENINT(src);
 
     guess_f = TRUE;
diff --git a/ext/nkf/nkf.gemspec b/ext/nkf/nkf.gemspec
new file mode 100644
index 0000000000..23f1dcdbaf
--- /dev/null
+++ b/ext/nkf/nkf.gemspec
@@ -0,0 +1,24 @@
+Gem::Specification.new do |spec|
+  spec.name          = "nkf"
+  spec.version       = "0.1.0"
+  spec.authors       = ["NARUSE Yui"]
+  spec.email         = ["naruse@airemix.jp"]
+
+  spec.summary       = %q{Ruby extension for Network Kanji Filter}
+  spec.description   = %q{Ruby extension for Network Kanji Filter}
+  spec.homepage      = "https://github.com/ruby/nkf"
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.licenses      = ["Ruby", "BSD-2-Clause"]
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+end
diff --git a/ext/objspace/depend b/ext/objspace/depend
index dc3009fc50..d3a702007e 100644
--- a/ext/objspace/depend
+++ b/ext/objspace/depend
@@ -1,29 +1,333 @@
 # AUTOGENERATED DEPENDENCIES START
 object_tracing.o: $(RUBY_EXTCONF_H)
 object_tracing.o: $(arch_hdrdir)/ruby/config.h
+object_tracing.o: $(hdrdir)/ruby.h
+object_tracing.o: $(hdrdir)/ruby/assert.h
 object_tracing.o: $(hdrdir)/ruby/backward.h
+object_tracing.o: $(hdrdir)/ruby/backward/2/assume.h
+object_tracing.o: $(hdrdir)/ruby/backward/2/attributes.h
+object_tracing.o: $(hdrdir)/ruby/backward/2/bool.h
+object_tracing.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+object_tracing.o: $(hdrdir)/ruby/backward/2/inttypes.h
+object_tracing.o: $(hdrdir)/ruby/backward/2/limits.h
+object_tracing.o: $(hdrdir)/ruby/backward/2/long_long.h
+object_tracing.o: $(hdrdir)/ruby/backward/2/r_cast.h
+object_tracing.o: $(hdrdir)/ruby/backward/2/rmodule.h
+object_tracing.o: $(hdrdir)/ruby/backward/2/stdalign.h
+object_tracing.o: $(hdrdir)/ruby/backward/2/stdarg.h
 object_tracing.o: $(hdrdir)/ruby/debug.h
 object_tracing.o: $(hdrdir)/ruby/defines.h
-object_tracing.o: $(hdrdir)/ruby/encoding.h
 object_tracing.o: $(hdrdir)/ruby/intern.h
-object_tracing.o: $(hdrdir)/ruby/io.h
+object_tracing.o: $(hdrdir)/ruby/internal/anyargs.h
+object_tracing.o: $(hdrdir)/ruby/internal/arithmetic.h
+object_tracing.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+object_tracing.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+object_tracing.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+object_tracing.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+object_tracing.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+object_tracing.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+object_tracing.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+object_tracing.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+object_tracing.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+object_tracing.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+object_tracing.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+object_tracing.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+object_tracing.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+object_tracing.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+object_tracing.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+object_tracing.o: $(hdrdir)/ruby/internal/assume.h
+object_tracing.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+object_tracing.o: $(hdrdir)/ruby/internal/attr/artificial.h
+object_tracing.o: $(hdrdir)/ruby/internal/attr/cold.h
+object_tracing.o: $(hdrdir)/ruby/internal/attr/const.h
+object_tracing.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+object_tracing.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+object_tracing.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+object_tracing.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+object_tracing.o: $(hdrdir)/ruby/internal/attr/error.h
+object_tracing.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+object_tracing.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+object_tracing.o: $(hdrdir)/ruby/internal/attr/format.h
+object_tracing.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+object_tracing.o: $(hdrdir)/ruby/internal/attr/noalias.h
+object_tracing.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+object_tracing.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+object_tracing.o: $(hdrdir)/ruby/internal/attr/noinline.h
+object_tracing.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+object_tracing.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+object_tracing.o: $(hdrdir)/ruby/internal/attr/pure.h
+object_tracing.o: $(hdrdir)/ruby/internal/attr/restrict.h
+object_tracing.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+object_tracing.o: $(hdrdir)/ruby/internal/attr/warning.h
+object_tracing.o: $(hdrdir)/ruby/internal/attr/weakref.h
+object_tracing.o: $(hdrdir)/ruby/internal/cast.h
+object_tracing.o: $(hdrdir)/ruby/internal/compiler_is.h
+object_tracing.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+object_tracing.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+object_tracing.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+object_tracing.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+object_tracing.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+object_tracing.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+object_tracing.o: $(hdrdir)/ruby/internal/compiler_since.h
+object_tracing.o: $(hdrdir)/ruby/internal/config.h
+object_tracing.o: $(hdrdir)/ruby/internal/constant_p.h
+object_tracing.o: $(hdrdir)/ruby/internal/core.h
+object_tracing.o: $(hdrdir)/ruby/internal/core/rarray.h
+object_tracing.o: $(hdrdir)/ruby/internal/core/rbasic.h
+object_tracing.o: $(hdrdir)/ruby/internal/core/rbignum.h
+object_tracing.o: $(hdrdir)/ruby/internal/core/rclass.h
+object_tracing.o: $(hdrdir)/ruby/internal/core/rdata.h
+object_tracing.o: $(hdrdir)/ruby/internal/core/rfile.h
+object_tracing.o: $(hdrdir)/ruby/internal/core/rhash.h
+object_tracing.o: $(hdrdir)/ruby/internal/core/robject.h
+object_tracing.o: $(hdrdir)/ruby/internal/core/rregexp.h
+object_tracing.o: $(hdrdir)/ruby/internal/core/rstring.h
+object_tracing.o: $(hdrdir)/ruby/internal/core/rstruct.h
+object_tracing.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+object_tracing.o: $(hdrdir)/ruby/internal/ctype.h
+object_tracing.o: $(hdrdir)/ruby/internal/dllexport.h
+object_tracing.o: $(hdrdir)/ruby/internal/dosish.h
+object_tracing.o: $(hdrdir)/ruby/internal/error.h
+object_tracing.o: $(hdrdir)/ruby/internal/eval.h
+object_tracing.o: $(hdrdir)/ruby/internal/event.h
+object_tracing.o: $(hdrdir)/ruby/internal/fl_type.h
+object_tracing.o: $(hdrdir)/ruby/internal/gc.h
+object_tracing.o: $(hdrdir)/ruby/internal/glob.h
+object_tracing.o: $(hdrdir)/ruby/internal/globals.h
+object_tracing.o: $(hdrdir)/ruby/internal/has/attribute.h
+object_tracing.o: $(hdrdir)/ruby/internal/has/builtin.h
+object_tracing.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+object_tracing.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+object_tracing.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+object_tracing.o: $(hdrdir)/ruby/internal/has/extension.h
+object_tracing.o: $(hdrdir)/ruby/internal/has/feature.h
+object_tracing.o: $(hdrdir)/ruby/internal/has/warning.h
+object_tracing.o: $(hdrdir)/ruby/internal/intern/array.h
+object_tracing.o: $(hdrdir)/ruby/internal/intern/bignum.h
+object_tracing.o: $(hdrdir)/ruby/internal/intern/class.h
+object_tracing.o: $(hdrdir)/ruby/internal/intern/compar.h
+object_tracing.o: $(hdrdir)/ruby/internal/intern/complex.h
+object_tracing.o: $(hdrdir)/ruby/internal/intern/cont.h
+object_tracing.o: $(hdrdir)/ruby/internal/intern/dir.h
+object_tracing.o: $(hdrdir)/ruby/internal/intern/enum.h
+object_tracing.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+object_tracing.o: $(hdrdir)/ruby/internal/intern/error.h
+object_tracing.o: $(hdrdir)/ruby/internal/intern/eval.h
+object_tracing.o: $(hdrdir)/ruby/internal/intern/file.h
+object_tracing.o: $(hdrdir)/ruby/internal/intern/gc.h
+object_tracing.o: $(hdrdir)/ruby/internal/intern/hash.h
+object_tracing.o: $(hdrdir)/ruby/internal/intern/io.h
+object_tracing.o: $(hdrdir)/ruby/internal/intern/load.h
+object_tracing.o: $(hdrdir)/ruby/internal/intern/marshal.h
+object_tracing.o: $(hdrdir)/ruby/internal/intern/numeric.h
+object_tracing.o: $(hdrdir)/ruby/internal/intern/object.h
+object_tracing.o: $(hdrdir)/ruby/internal/intern/parse.h
+object_tracing.o: $(hdrdir)/ruby/internal/intern/proc.h
+object_tracing.o: $(hdrdir)/ruby/internal/intern/process.h
+object_tracing.o: $(hdrdir)/ruby/internal/intern/random.h
+object_tracing.o: $(hdrdir)/ruby/internal/intern/range.h
+object_tracing.o: $(hdrdir)/ruby/internal/intern/rational.h
+object_tracing.o: $(hdrdir)/ruby/internal/intern/re.h
+object_tracing.o: $(hdrdir)/ruby/internal/intern/ruby.h
+object_tracing.o: $(hdrdir)/ruby/internal/intern/select.h
+object_tracing.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+object_tracing.o: $(hdrdir)/ruby/internal/intern/signal.h
+object_tracing.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+object_tracing.o: $(hdrdir)/ruby/internal/intern/string.h
+object_tracing.o: $(hdrdir)/ruby/internal/intern/struct.h
+object_tracing.o: $(hdrdir)/ruby/internal/intern/thread.h
+object_tracing.o: $(hdrdir)/ruby/internal/intern/time.h
+object_tracing.o: $(hdrdir)/ruby/internal/intern/variable.h
+object_tracing.o: $(hdrdir)/ruby/internal/intern/vm.h
+object_tracing.o: $(hdrdir)/ruby/internal/interpreter.h
+object_tracing.o: $(hdrdir)/ruby/internal/iterator.h
+object_tracing.o: $(hdrdir)/ruby/internal/memory.h
+object_tracing.o: $(hdrdir)/ruby/internal/method.h
+object_tracing.o: $(hdrdir)/ruby/internal/module.h
+object_tracing.o: $(hdrdir)/ruby/internal/newobj.h
+object_tracing.o: $(hdrdir)/ruby/internal/rgengc.h
+object_tracing.o: $(hdrdir)/ruby/internal/scan_args.h
+object_tracing.o: $(hdrdir)/ruby/internal/special_consts.h
+object_tracing.o: $(hdrdir)/ruby/internal/static_assert.h
+object_tracing.o: $(hdrdir)/ruby/internal/stdalign.h
+object_tracing.o: $(hdrdir)/ruby/internal/stdbool.h
+object_tracing.o: $(hdrdir)/ruby/internal/symbol.h
+object_tracing.o: $(hdrdir)/ruby/internal/token_paste.h
+object_tracing.o: $(hdrdir)/ruby/internal/value.h
+object_tracing.o: $(hdrdir)/ruby/internal/value_type.h
+object_tracing.o: $(hdrdir)/ruby/internal/variable.h
+object_tracing.o: $(hdrdir)/ruby/internal/warning_push.h
+object_tracing.o: $(hdrdir)/ruby/internal/xmalloc.h
 object_tracing.o: $(hdrdir)/ruby/missing.h
-object_tracing.o: $(hdrdir)/ruby/oniguruma.h
 object_tracing.o: $(hdrdir)/ruby/ruby.h
 object_tracing.o: $(hdrdir)/ruby/st.h
 object_tracing.o: $(hdrdir)/ruby/subst.h
-object_tracing.o: $(top_srcdir)/include/ruby.h
 object_tracing.o: $(top_srcdir)/internal.h
 object_tracing.o: object_tracing.c
 object_tracing.o: objspace.h
 objspace.o: $(RUBY_EXTCONF_H)
 objspace.o: $(arch_hdrdir)/ruby/config.h
+objspace.o: $(hdrdir)/ruby.h
+objspace.o: $(hdrdir)/ruby/assert.h
 objspace.o: $(hdrdir)/ruby/backward.h
+objspace.o: $(hdrdir)/ruby/backward/2/assume.h
+objspace.o: $(hdrdir)/ruby/backward/2/attributes.h
+objspace.o: $(hdrdir)/ruby/backward/2/bool.h
+objspace.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+objspace.o: $(hdrdir)/ruby/backward/2/inttypes.h
+objspace.o: $(hdrdir)/ruby/backward/2/limits.h
+objspace.o: $(hdrdir)/ruby/backward/2/long_long.h
+objspace.o: $(hdrdir)/ruby/backward/2/r_cast.h
+objspace.o: $(hdrdir)/ruby/backward/2/rmodule.h
+objspace.o: $(hdrdir)/ruby/backward/2/stdalign.h
+objspace.o: $(hdrdir)/ruby/backward/2/stdarg.h
 objspace.o: $(hdrdir)/ruby/defines.h
 objspace.o: $(hdrdir)/ruby/encoding.h
 objspace.o: $(hdrdir)/ruby/intern.h
+objspace.o: $(hdrdir)/ruby/internal/anyargs.h
+objspace.o: $(hdrdir)/ruby/internal/arithmetic.h
+objspace.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+objspace.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+objspace.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+objspace.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+objspace.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+objspace.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+objspace.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+objspace.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+objspace.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+objspace.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+objspace.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+objspace.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+objspace.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+objspace.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+objspace.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+objspace.o: $(hdrdir)/ruby/internal/assume.h
+objspace.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+objspace.o: $(hdrdir)/ruby/internal/attr/artificial.h
+objspace.o: $(hdrdir)/ruby/internal/attr/cold.h
+objspace.o: $(hdrdir)/ruby/internal/attr/const.h
+objspace.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+objspace.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+objspace.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+objspace.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+objspace.o: $(hdrdir)/ruby/internal/attr/error.h
+objspace.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+objspace.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+objspace.o: $(hdrdir)/ruby/internal/attr/format.h
+objspace.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+objspace.o: $(hdrdir)/ruby/internal/attr/noalias.h
+objspace.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+objspace.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+objspace.o: $(hdrdir)/ruby/internal/attr/noinline.h
+objspace.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+objspace.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+objspace.o: $(hdrdir)/ruby/internal/attr/pure.h
+objspace.o: $(hdrdir)/ruby/internal/attr/restrict.h
+objspace.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+objspace.o: $(hdrdir)/ruby/internal/attr/warning.h
+objspace.o: $(hdrdir)/ruby/internal/attr/weakref.h
+objspace.o: $(hdrdir)/ruby/internal/cast.h
+objspace.o: $(hdrdir)/ruby/internal/compiler_is.h
+objspace.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+objspace.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+objspace.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+objspace.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+objspace.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+objspace.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+objspace.o: $(hdrdir)/ruby/internal/compiler_since.h
+objspace.o: $(hdrdir)/ruby/internal/config.h
+objspace.o: $(hdrdir)/ruby/internal/constant_p.h
+objspace.o: $(hdrdir)/ruby/internal/core.h
+objspace.o: $(hdrdir)/ruby/internal/core/rarray.h
+objspace.o: $(hdrdir)/ruby/internal/core/rbasic.h
+objspace.o: $(hdrdir)/ruby/internal/core/rbignum.h
+objspace.o: $(hdrdir)/ruby/internal/core/rclass.h
+objspace.o: $(hdrdir)/ruby/internal/core/rdata.h
+objspace.o: $(hdrdir)/ruby/internal/core/rfile.h
+objspace.o: $(hdrdir)/ruby/internal/core/rhash.h
+objspace.o: $(hdrdir)/ruby/internal/core/rmatch.h
+objspace.o: $(hdrdir)/ruby/internal/core/robject.h
+objspace.o: $(hdrdir)/ruby/internal/core/rregexp.h
+objspace.o: $(hdrdir)/ruby/internal/core/rstring.h
+objspace.o: $(hdrdir)/ruby/internal/core/rstruct.h
+objspace.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+objspace.o: $(hdrdir)/ruby/internal/ctype.h
+objspace.o: $(hdrdir)/ruby/internal/dllexport.h
+objspace.o: $(hdrdir)/ruby/internal/dosish.h
+objspace.o: $(hdrdir)/ruby/internal/error.h
+objspace.o: $(hdrdir)/ruby/internal/eval.h
+objspace.o: $(hdrdir)/ruby/internal/event.h
+objspace.o: $(hdrdir)/ruby/internal/fl_type.h
+objspace.o: $(hdrdir)/ruby/internal/gc.h
+objspace.o: $(hdrdir)/ruby/internal/glob.h
+objspace.o: $(hdrdir)/ruby/internal/globals.h
+objspace.o: $(hdrdir)/ruby/internal/has/attribute.h
+objspace.o: $(hdrdir)/ruby/internal/has/builtin.h
+objspace.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+objspace.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+objspace.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+objspace.o: $(hdrdir)/ruby/internal/has/extension.h
+objspace.o: $(hdrdir)/ruby/internal/has/feature.h
+objspace.o: $(hdrdir)/ruby/internal/has/warning.h
+objspace.o: $(hdrdir)/ruby/internal/intern/array.h
+objspace.o: $(hdrdir)/ruby/internal/intern/bignum.h
+objspace.o: $(hdrdir)/ruby/internal/intern/class.h
+objspace.o: $(hdrdir)/ruby/internal/intern/compar.h
+objspace.o: $(hdrdir)/ruby/internal/intern/complex.h
+objspace.o: $(hdrdir)/ruby/internal/intern/cont.h
+objspace.o: $(hdrdir)/ruby/internal/intern/dir.h
+objspace.o: $(hdrdir)/ruby/internal/intern/enum.h
+objspace.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+objspace.o: $(hdrdir)/ruby/internal/intern/error.h
+objspace.o: $(hdrdir)/ruby/internal/intern/eval.h
+objspace.o: $(hdrdir)/ruby/internal/intern/file.h
+objspace.o: $(hdrdir)/ruby/internal/intern/gc.h
+objspace.o: $(hdrdir)/ruby/internal/intern/hash.h
+objspace.o: $(hdrdir)/ruby/internal/intern/io.h
+objspace.o: $(hdrdir)/ruby/internal/intern/load.h
+objspace.o: $(hdrdir)/ruby/internal/intern/marshal.h
+objspace.o: $(hdrdir)/ruby/internal/intern/numeric.h
+objspace.o: $(hdrdir)/ruby/internal/intern/object.h
+objspace.o: $(hdrdir)/ruby/internal/intern/parse.h
+objspace.o: $(hdrdir)/ruby/internal/intern/proc.h
+objspace.o: $(hdrdir)/ruby/internal/intern/process.h
+objspace.o: $(hdrdir)/ruby/internal/intern/random.h
+objspace.o: $(hdrdir)/ruby/internal/intern/range.h
+objspace.o: $(hdrdir)/ruby/internal/intern/rational.h
+objspace.o: $(hdrdir)/ruby/internal/intern/re.h
+objspace.o: $(hdrdir)/ruby/internal/intern/ruby.h
+objspace.o: $(hdrdir)/ruby/internal/intern/select.h
+objspace.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+objspace.o: $(hdrdir)/ruby/internal/intern/signal.h
+objspace.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+objspace.o: $(hdrdir)/ruby/internal/intern/string.h
+objspace.o: $(hdrdir)/ruby/internal/intern/struct.h
+objspace.o: $(hdrdir)/ruby/internal/intern/thread.h
+objspace.o: $(hdrdir)/ruby/internal/intern/time.h
+objspace.o: $(hdrdir)/ruby/internal/intern/variable.h
+objspace.o: $(hdrdir)/ruby/internal/intern/vm.h
+objspace.o: $(hdrdir)/ruby/internal/interpreter.h
+objspace.o: $(hdrdir)/ruby/internal/iterator.h
+objspace.o: $(hdrdir)/ruby/internal/memory.h
+objspace.o: $(hdrdir)/ruby/internal/method.h
+objspace.o: $(hdrdir)/ruby/internal/module.h
+objspace.o: $(hdrdir)/ruby/internal/newobj.h
+objspace.o: $(hdrdir)/ruby/internal/rgengc.h
+objspace.o: $(hdrdir)/ruby/internal/scan_args.h
+objspace.o: $(hdrdir)/ruby/internal/special_consts.h
+objspace.o: $(hdrdir)/ruby/internal/static_assert.h
+objspace.o: $(hdrdir)/ruby/internal/stdalign.h
+objspace.o: $(hdrdir)/ruby/internal/stdbool.h
+objspace.o: $(hdrdir)/ruby/internal/symbol.h
+objspace.o: $(hdrdir)/ruby/internal/token_paste.h
+objspace.o: $(hdrdir)/ruby/internal/value.h
+objspace.o: $(hdrdir)/ruby/internal/value_type.h
+objspace.o: $(hdrdir)/ruby/internal/variable.h
+objspace.o: $(hdrdir)/ruby/internal/warning_push.h
+objspace.o: $(hdrdir)/ruby/internal/xmalloc.h
 objspace.o: $(hdrdir)/ruby/io.h
 objspace.o: $(hdrdir)/ruby/missing.h
+objspace.o: $(hdrdir)/ruby/onigmo.h
 objspace.o: $(hdrdir)/ruby/oniguruma.h
 objspace.o: $(hdrdir)/ruby/re.h
 objspace.o: $(hdrdir)/ruby/regex.h
@@ -31,40 +335,215 @@ objspace.o: $(hdrdir)/ruby/ruby.h
 objspace.o: $(hdrdir)/ruby/st.h
 objspace.o: $(hdrdir)/ruby/subst.h
 objspace.o: $(top_srcdir)/gc.h
-objspace.o: $(top_srcdir)/include/ruby.h
+objspace.o: $(top_srcdir)/id_table.h
 objspace.o: $(top_srcdir)/internal.h
+objspace.o: $(top_srcdir)/internal/array.h
+objspace.o: $(top_srcdir)/internal/class.h
+objspace.o: $(top_srcdir)/internal/compilers.h
+objspace.o: $(top_srcdir)/internal/gc.h
+objspace.o: $(top_srcdir)/internal/hash.h
+objspace.o: $(top_srcdir)/internal/imemo.h
+objspace.o: $(top_srcdir)/internal/sanitizers.h
+objspace.o: $(top_srcdir)/internal/serial.h
+objspace.o: $(top_srcdir)/internal/static_assert.h
+objspace.o: $(top_srcdir)/internal/warnings.h
 objspace.o: $(top_srcdir)/node.h
 objspace.o: $(top_srcdir)/symbol.h
 objspace.o: objspace.c
 objspace.o: {$(VPATH)}id.h
 objspace_dump.o: $(RUBY_EXTCONF_H)
 objspace_dump.o: $(arch_hdrdir)/ruby/config.h
+objspace_dump.o: $(hdrdir)/ruby.h
+objspace_dump.o: $(hdrdir)/ruby/assert.h
+objspace_dump.o: $(hdrdir)/ruby/atomic.h
 objspace_dump.o: $(hdrdir)/ruby/backward.h
+objspace_dump.o: $(hdrdir)/ruby/backward/2/assume.h
+objspace_dump.o: $(hdrdir)/ruby/backward/2/attributes.h
+objspace_dump.o: $(hdrdir)/ruby/backward/2/bool.h
+objspace_dump.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+objspace_dump.o: $(hdrdir)/ruby/backward/2/inttypes.h
+objspace_dump.o: $(hdrdir)/ruby/backward/2/limits.h
+objspace_dump.o: $(hdrdir)/ruby/backward/2/long_long.h
+objspace_dump.o: $(hdrdir)/ruby/backward/2/r_cast.h
+objspace_dump.o: $(hdrdir)/ruby/backward/2/rmodule.h
+objspace_dump.o: $(hdrdir)/ruby/backward/2/stdalign.h
+objspace_dump.o: $(hdrdir)/ruby/backward/2/stdarg.h
 objspace_dump.o: $(hdrdir)/ruby/debug.h
 objspace_dump.o: $(hdrdir)/ruby/defines.h
 objspace_dump.o: $(hdrdir)/ruby/encoding.h
 objspace_dump.o: $(hdrdir)/ruby/intern.h
+objspace_dump.o: $(hdrdir)/ruby/internal/anyargs.h
+objspace_dump.o: $(hdrdir)/ruby/internal/arithmetic.h
+objspace_dump.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+objspace_dump.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+objspace_dump.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+objspace_dump.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+objspace_dump.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+objspace_dump.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+objspace_dump.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+objspace_dump.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+objspace_dump.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+objspace_dump.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+objspace_dump.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+objspace_dump.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+objspace_dump.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+objspace_dump.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+objspace_dump.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+objspace_dump.o: $(hdrdir)/ruby/internal/assume.h
+objspace_dump.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+objspace_dump.o: $(hdrdir)/ruby/internal/attr/artificial.h
+objspace_dump.o: $(hdrdir)/ruby/internal/attr/cold.h
+objspace_dump.o: $(hdrdir)/ruby/internal/attr/const.h
+objspace_dump.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+objspace_dump.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+objspace_dump.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+objspace_dump.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+objspace_dump.o: $(hdrdir)/ruby/internal/attr/error.h
+objspace_dump.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+objspace_dump.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+objspace_dump.o: $(hdrdir)/ruby/internal/attr/format.h
+objspace_dump.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+objspace_dump.o: $(hdrdir)/ruby/internal/attr/noalias.h
+objspace_dump.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+objspace_dump.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+objspace_dump.o: $(hdrdir)/ruby/internal/attr/noinline.h
+objspace_dump.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+objspace_dump.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+objspace_dump.o: $(hdrdir)/ruby/internal/attr/pure.h
+objspace_dump.o: $(hdrdir)/ruby/internal/attr/restrict.h
+objspace_dump.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+objspace_dump.o: $(hdrdir)/ruby/internal/attr/warning.h
+objspace_dump.o: $(hdrdir)/ruby/internal/attr/weakref.h
+objspace_dump.o: $(hdrdir)/ruby/internal/cast.h
+objspace_dump.o: $(hdrdir)/ruby/internal/compiler_is.h
+objspace_dump.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+objspace_dump.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+objspace_dump.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+objspace_dump.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+objspace_dump.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+objspace_dump.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+objspace_dump.o: $(hdrdir)/ruby/internal/compiler_since.h
+objspace_dump.o: $(hdrdir)/ruby/internal/config.h
+objspace_dump.o: $(hdrdir)/ruby/internal/constant_p.h
+objspace_dump.o: $(hdrdir)/ruby/internal/core.h
+objspace_dump.o: $(hdrdir)/ruby/internal/core/rarray.h
+objspace_dump.o: $(hdrdir)/ruby/internal/core/rbasic.h
+objspace_dump.o: $(hdrdir)/ruby/internal/core/rbignum.h
+objspace_dump.o: $(hdrdir)/ruby/internal/core/rclass.h
+objspace_dump.o: $(hdrdir)/ruby/internal/core/rdata.h
+objspace_dump.o: $(hdrdir)/ruby/internal/core/rfile.h
+objspace_dump.o: $(hdrdir)/ruby/internal/core/rhash.h
+objspace_dump.o: $(hdrdir)/ruby/internal/core/robject.h
+objspace_dump.o: $(hdrdir)/ruby/internal/core/rregexp.h
+objspace_dump.o: $(hdrdir)/ruby/internal/core/rstring.h
+objspace_dump.o: $(hdrdir)/ruby/internal/core/rstruct.h
+objspace_dump.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+objspace_dump.o: $(hdrdir)/ruby/internal/ctype.h
+objspace_dump.o: $(hdrdir)/ruby/internal/dllexport.h
+objspace_dump.o: $(hdrdir)/ruby/internal/dosish.h
+objspace_dump.o: $(hdrdir)/ruby/internal/error.h
+objspace_dump.o: $(hdrdir)/ruby/internal/eval.h
+objspace_dump.o: $(hdrdir)/ruby/internal/event.h
+objspace_dump.o: $(hdrdir)/ruby/internal/fl_type.h
+objspace_dump.o: $(hdrdir)/ruby/internal/gc.h
+objspace_dump.o: $(hdrdir)/ruby/internal/glob.h
+objspace_dump.o: $(hdrdir)/ruby/internal/globals.h
+objspace_dump.o: $(hdrdir)/ruby/internal/has/attribute.h
+objspace_dump.o: $(hdrdir)/ruby/internal/has/builtin.h
+objspace_dump.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+objspace_dump.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+objspace_dump.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+objspace_dump.o: $(hdrdir)/ruby/internal/has/extension.h
+objspace_dump.o: $(hdrdir)/ruby/internal/has/feature.h
+objspace_dump.o: $(hdrdir)/ruby/internal/has/warning.h
+objspace_dump.o: $(hdrdir)/ruby/internal/intern/array.h
+objspace_dump.o: $(hdrdir)/ruby/internal/intern/bignum.h
+objspace_dump.o: $(hdrdir)/ruby/internal/intern/class.h
+objspace_dump.o: $(hdrdir)/ruby/internal/intern/compar.h
+objspace_dump.o: $(hdrdir)/ruby/internal/intern/complex.h
+objspace_dump.o: $(hdrdir)/ruby/internal/intern/cont.h
+objspace_dump.o: $(hdrdir)/ruby/internal/intern/dir.h
+objspace_dump.o: $(hdrdir)/ruby/internal/intern/enum.h
+objspace_dump.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+objspace_dump.o: $(hdrdir)/ruby/internal/intern/error.h
+objspace_dump.o: $(hdrdir)/ruby/internal/intern/eval.h
+objspace_dump.o: $(hdrdir)/ruby/internal/intern/file.h
+objspace_dump.o: $(hdrdir)/ruby/internal/intern/gc.h
+objspace_dump.o: $(hdrdir)/ruby/internal/intern/hash.h
+objspace_dump.o: $(hdrdir)/ruby/internal/intern/io.h
+objspace_dump.o: $(hdrdir)/ruby/internal/intern/load.h
+objspace_dump.o: $(hdrdir)/ruby/internal/intern/marshal.h
+objspace_dump.o: $(hdrdir)/ruby/internal/intern/numeric.h
+objspace_dump.o: $(hdrdir)/ruby/internal/intern/object.h
+objspace_dump.o: $(hdrdir)/ruby/internal/intern/parse.h
+objspace_dump.o: $(hdrdir)/ruby/internal/intern/proc.h
+objspace_dump.o: $(hdrdir)/ruby/internal/intern/process.h
+objspace_dump.o: $(hdrdir)/ruby/internal/intern/random.h
+objspace_dump.o: $(hdrdir)/ruby/internal/intern/range.h
+objspace_dump.o: $(hdrdir)/ruby/internal/intern/rational.h
+objspace_dump.o: $(hdrdir)/ruby/internal/intern/re.h
+objspace_dump.o: $(hdrdir)/ruby/internal/intern/ruby.h
+objspace_dump.o: $(hdrdir)/ruby/internal/intern/select.h
+objspace_dump.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+objspace_dump.o: $(hdrdir)/ruby/internal/intern/signal.h
+objspace_dump.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+objspace_dump.o: $(hdrdir)/ruby/internal/intern/string.h
+objspace_dump.o: $(hdrdir)/ruby/internal/intern/struct.h
+objspace_dump.o: $(hdrdir)/ruby/internal/intern/thread.h
+objspace_dump.o: $(hdrdir)/ruby/internal/intern/time.h
+objspace_dump.o: $(hdrdir)/ruby/internal/intern/variable.h
+objspace_dump.o: $(hdrdir)/ruby/internal/intern/vm.h
+objspace_dump.o: $(hdrdir)/ruby/internal/interpreter.h
+objspace_dump.o: $(hdrdir)/ruby/internal/iterator.h
+objspace_dump.o: $(hdrdir)/ruby/internal/memory.h
+objspace_dump.o: $(hdrdir)/ruby/internal/method.h
+objspace_dump.o: $(hdrdir)/ruby/internal/module.h
+objspace_dump.o: $(hdrdir)/ruby/internal/newobj.h
+objspace_dump.o: $(hdrdir)/ruby/internal/rgengc.h
+objspace_dump.o: $(hdrdir)/ruby/internal/scan_args.h
+objspace_dump.o: $(hdrdir)/ruby/internal/special_consts.h
+objspace_dump.o: $(hdrdir)/ruby/internal/static_assert.h
+objspace_dump.o: $(hdrdir)/ruby/internal/stdalign.h
+objspace_dump.o: $(hdrdir)/ruby/internal/stdbool.h
+objspace_dump.o: $(hdrdir)/ruby/internal/symbol.h
+objspace_dump.o: $(hdrdir)/ruby/internal/token_paste.h
+objspace_dump.o: $(hdrdir)/ruby/internal/value.h
+objspace_dump.o: $(hdrdir)/ruby/internal/value_type.h
+objspace_dump.o: $(hdrdir)/ruby/internal/variable.h
+objspace_dump.o: $(hdrdir)/ruby/internal/warning_push.h
+objspace_dump.o: $(hdrdir)/ruby/internal/xmalloc.h
 objspace_dump.o: $(hdrdir)/ruby/io.h
 objspace_dump.o: $(hdrdir)/ruby/missing.h
+objspace_dump.o: $(hdrdir)/ruby/onigmo.h
 objspace_dump.o: $(hdrdir)/ruby/oniguruma.h
 objspace_dump.o: $(hdrdir)/ruby/ruby.h
 objspace_dump.o: $(hdrdir)/ruby/st.h
 objspace_dump.o: $(hdrdir)/ruby/subst.h
 objspace_dump.o: $(hdrdir)/ruby/thread_native.h
+objspace_dump.o: $(hdrdir)/ruby/util.h
 objspace_dump.o: $(top_srcdir)/ccan/check_type/check_type.h
 objspace_dump.o: $(top_srcdir)/ccan/container_of/container_of.h
 objspace_dump.o: $(top_srcdir)/ccan/list/list.h
 objspace_dump.o: $(top_srcdir)/ccan/str/str.h
 objspace_dump.o: $(top_srcdir)/gc.h
-objspace_dump.o: $(top_srcdir)/include/ruby.h
 objspace_dump.o: $(top_srcdir)/internal.h
+objspace_dump.o: $(top_srcdir)/internal/array.h
+objspace_dump.o: $(top_srcdir)/internal/compilers.h
+objspace_dump.o: $(top_srcdir)/internal/gc.h
+objspace_dump.o: $(top_srcdir)/internal/hash.h
+objspace_dump.o: $(top_srcdir)/internal/imemo.h
+objspace_dump.o: $(top_srcdir)/internal/sanitizers.h
+objspace_dump.o: $(top_srcdir)/internal/serial.h
+objspace_dump.o: $(top_srcdir)/internal/static_assert.h
+objspace_dump.o: $(top_srcdir)/internal/string.h
+objspace_dump.o: $(top_srcdir)/internal/vm.h
+objspace_dump.o: $(top_srcdir)/internal/warnings.h
 objspace_dump.o: $(top_srcdir)/method.h
 objspace_dump.o: $(top_srcdir)/node.h
 objspace_dump.o: $(top_srcdir)/ruby_assert.h
 objspace_dump.o: $(top_srcdir)/ruby_atomic.h
 objspace_dump.o: $(top_srcdir)/thread_pthread.h
 objspace_dump.o: $(top_srcdir)/vm_core.h
-objspace_dump.o: $(top_srcdir)/vm_debug.h
 objspace_dump.o: $(top_srcdir)/vm_opts.h
 objspace_dump.o: objspace.h
 objspace_dump.o: objspace_dump.c
diff --git a/ext/objspace/extconf.rb b/ext/objspace/extconf.rb
index adb8ef9169..d0c2dbd02b 100644
--- a/ext/objspace/extconf.rb
+++ b/ext/objspace/extconf.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 $INCFLAGS << " -I$(topdir) -I$(top_srcdir)"
 $VPATH << '$(topdir)' << '$(top_srcdir)' # for id.h.
 create_makefile('objspace')
diff --git a/ext/objspace/lib/objspace.rb b/ext/objspace/lib/objspace.rb
new file mode 100644
index 0000000000..0298b0646c
--- /dev/null
+++ b/ext/objspace/lib/objspace.rb
@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+require 'objspace.so'
+
+module ObjectSpace
+  class << self
+    private :_dump
+    private :_dump_all
+  end
+
+  module_function
+
+  # call-seq:
+  #   ObjectSpace.dump(obj[, output: :string]) # => "{ ... }"
+  #   ObjectSpace.dump(obj, output: :file)     # => #<File:/tmp/rubyobj20131125-88733-1xkfmpv.json>
+  #   ObjectSpace.dump(obj, output: :stdout)   # => nil
+  #
+  # Dump the contents of a ruby object as JSON.
+  #
+  # This method is only expected to work with C Ruby.
+  # This is an experimental method and is subject to change.
+  # In particular, the function signature and output format are
+  # not guaranteed to be compatible in future versions of ruby.
+  def dump(obj, output: :string)
+    out = case output
+    when :file, nil
+      require 'tempfile'
+      Tempfile.create(%w(rubyobj .json))
+    when :stdout
+      STDOUT
+    when :string
+      +''
+    when IO
+      output
+    else
+      raise ArgumentError, "wrong output option: #{output.inspect}"
+    end
+
+    ret = _dump(obj, out)
+    return nil if output == :stdout
+    ret
+  end
+
+
+  #  call-seq:
+  #    ObjectSpace.dump_all([output: :file]) # => #<File:/tmp/rubyheap20131125-88469-laoj3v.json>
+  #    ObjectSpace.dump_all(output: :stdout) # => nil
+  #    ObjectSpace.dump_all(output: :string) # => "{...}\n{...}\n..."
+  #    ObjectSpace.dump_all(output:
+  #      File.open('heap.json','w'))         # => #<File:heap.json>
+  #    ObjectSpace.dump_all(output: :string,
+  #      since: 42)                          # => "{...}\n{...}\n..."
+  #
+  #  Dump the contents of the ruby heap as JSON.
+  #
+  #  _since_ must be a non-negative integer or +nil+.
+  #
+  #  If _since_ is a positive integer, only objects of that generation and
+  #  newer generations are dumped. The current generation can be accessed using
+  #  GC::count.
+  #
+  #  Objects that were allocated without object allocation tracing enabled
+  #  are ignored. See ::trace_object_allocations for more information and
+  #  examples.
+  #
+  #  If _since_ is omitted or is +nil+, all objects are dumped.
+  #
+  #  This method is only expected to work with C Ruby.
+  #  This is an experimental method and is subject to change.
+  #  In particular, the function signature and output format are
+  #  not guaranteed to be compatible in future versions of ruby.
+  def dump_all(output: :file, full: false, since: nil)
+    out = case output
+    when :file, nil
+      require 'tempfile'
+      Tempfile.create(%w(rubyheap .json))
+    when :stdout
+      STDOUT
+    when :string
+      +''
+    when IO
+      output
+    else
+      raise ArgumentError, "wrong output option: #{output.inspect}"
+    end
+
+    ret = _dump_all(out, full, since)
+    return nil if output == :stdout
+    ret
+  end
+end
diff --git a/ext/objspace/object_tracing.c b/ext/objspace/object_tracing.c
index 3a7f54427d..66d6baa491 100644
--- a/ext/objspace/object_tracing.c
+++ b/ext/objspace/object_tracing.c
@@ -39,7 +39,8 @@ make_unique_str(st_table *tbl, const char *str, long len)
 
 	if (st_lookup(tbl, (st_data_t)str, &n)) {
 	    st_insert(tbl, (st_data_t)str, n+1);
-	    st_get_key(tbl, (st_data_t)str, (st_data_t *)&result);
+	    st_get_key(tbl, (st_data_t)str, &n);
+	    result = (char *)n;
 	}
 	else {
 	    result = (char *)ruby_xmalloc(len+1);
@@ -59,8 +60,9 @@ delete_unique_str(st_table *tbl, const char *str)
 
 	st_lookup(tbl, (st_data_t)str, &n);
 	if (n == 1) {
-	    st_delete(tbl, (st_data_t *)&str, 0);
-	    ruby_xfree((char *)str);
+	    n = (st_data_t)str;
+	    st_delete(tbl, &n, 0);
+	    ruby_xfree((char *)n);
 	}
 	else {
 	    st_insert(tbl, (st_data_t)str, n-1);
@@ -82,8 +84,10 @@ newobj_i(VALUE tpval, void *data)
     const char *path_cstr = RTEST(path) ? make_unique_str(arg->str_table, RSTRING_PTR(path), RSTRING_LEN(path)) : 0;
     VALUE class_path = (RTEST(klass) && !OBJ_FROZEN(klass)) ? rb_class_path_cached(klass) : Qnil;
     const char *class_path_cstr = RTEST(class_path) ? make_unique_str(arg->str_table, RSTRING_PTR(class_path), RSTRING_LEN(class_path)) : 0;
+    st_data_t v;
 
-    if (st_lookup(arg->object_table, (st_data_t)obj, (st_data_t *)&info)) {
+    if (st_lookup(arg->object_table, (st_data_t)obj, &v)) {
+	info = (struct allocation_info *)v;
 	if (arg->keep_remains) {
 	    if (info->living) {
 		/* do nothing. there is possibility to keep living if FREEOBJ events while suppressing tracing */
@@ -113,15 +117,19 @@ freeobj_i(VALUE tpval, void *data)
 {
     struct traceobj_arg *arg = (struct traceobj_arg *)data;
     rb_trace_arg_t *tparg = rb_tracearg_from_tracepoint(tpval);
-    VALUE obj = rb_tracearg_object(tparg);
+    st_data_t obj = (st_data_t)rb_tracearg_object(tparg);
+    st_data_t v;
     struct allocation_info *info;
 
-    if (st_lookup(arg->object_table, (st_data_t)obj, (st_data_t *)&info)) {
-	if (arg->keep_remains) {
+    if (arg->keep_remains) {
+	if (st_lookup(arg->object_table, obj, &v)) {
+	    info = (struct allocation_info *)v;
 	    info->living = 0;
 	}
-	else {
-	    st_delete(arg->object_table, (st_data_t *)&obj, (st_data_t *)&info);
+    }
+    else {
+	if (st_delete(arg->object_table, &obj, &v)) {
+	    info = (struct allocation_info *)v;
 	    delete_unique_str(arg->str_table, info->path);
 	    delete_unique_str(arg->str_table, info->class_path);
 	    ruby_xfree(info);
@@ -130,19 +138,94 @@ freeobj_i(VALUE tpval, void *data)
 }
 
 static int
-free_keys_i(st_data_t key, st_data_t value, void *data)
+free_keys_i(st_data_t key, st_data_t value, st_data_t data)
 {
     ruby_xfree((void *)key);
     return ST_CONTINUE;
 }
 
 static int
-free_values_i(st_data_t key, st_data_t value, void *data)
+free_values_i(st_data_t key, st_data_t value, st_data_t data)
 {
     ruby_xfree((void *)value);
     return ST_CONTINUE;
 }
 
+static void
+allocation_info_tracer_mark(void *ptr)
+{
+    struct traceobj_arg *trace_arg = (struct traceobj_arg *)ptr;
+    rb_gc_mark(trace_arg->newobj_trace);
+    rb_gc_mark(trace_arg->freeobj_trace);
+}
+
+static void
+allocation_info_tracer_free(void *ptr)
+{
+    struct traceobj_arg *arg = (struct traceobj_arg *)ptr;
+    /* clear tables */
+    st_foreach(arg->object_table, free_values_i, 0);
+    st_free_table(arg->object_table);
+    st_foreach(arg->str_table, free_keys_i, 0);
+    st_free_table(arg->str_table);
+    xfree(arg);
+}
+
+static size_t
+allocation_info_tracer_memsize(const void *ptr)
+{
+    size_t size;
+    struct traceobj_arg *trace_arg = (struct traceobj_arg *)ptr;
+    size = sizeof(*trace_arg);
+    size += st_memsize(trace_arg->object_table);
+    size += st_memsize(trace_arg->str_table);
+    return size;
+}
+
+static int
+hash_foreach_should_replace_key(st_data_t key, st_data_t value, st_data_t argp, int error)
+{
+    VALUE allocated_object;
+
+    allocated_object = (VALUE)value;
+    if (allocated_object != rb_gc_location(allocated_object)) {
+        return ST_REPLACE;
+    }
+
+    return ST_CONTINUE;
+}
+
+static int
+hash_replace_key(st_data_t *key, st_data_t *value, st_data_t argp, int existing)
+{
+    *key = rb_gc_location((VALUE)*key);
+
+    return ST_CONTINUE;
+}
+
+static void
+allocation_info_tracer_compact(void *ptr)
+{
+    struct traceobj_arg *trace_arg = (struct traceobj_arg *)ptr;
+
+    if (trace_arg->object_table &&
+            st_foreach_with_replace(trace_arg->object_table, hash_foreach_should_replace_key, hash_replace_key, 0)) {
+        rb_raise(rb_eRuntimeError, "hash modified during iteration");
+    }
+}
+
+static const rb_data_type_t allocation_info_tracer_type = {
+    "ObjectTracing/allocation_info_tracer",
+    {
+        allocation_info_tracer_mark,
+        allocation_info_tracer_free, /* Never called because global */
+        allocation_info_tracer_memsize,
+        allocation_info_tracer_compact,
+    },
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+static VALUE traceobj_arg;
 static struct traceobj_arg *tmp_trace_arg; /* TODO: Do not use global variables */
 static int tmp_keep_remains;               /* TODO: Do not use global variables */
 
@@ -150,7 +233,9 @@ static struct traceobj_arg *
 get_traceobj_arg(void)
 {
     if (tmp_trace_arg == 0) {
-	tmp_trace_arg = ALLOC_N(struct traceobj_arg, 1);
+        VALUE obj = TypedData_Make_Struct(rb_cObject, struct traceobj_arg, &allocation_info_tracer_type, tmp_trace_arg);
+        traceobj_arg = obj;
+        rb_gc_register_mark_object(traceobj_arg);
 	tmp_trace_arg->running = 0;
 	tmp_trace_arg->keep_remains = tmp_keep_remains;
 	tmp_trace_arg->newobj_trace = 0;
@@ -206,10 +291,12 @@ trace_object_allocations_stop(VALUE self)
     }
 
     if (arg->running == 0) {
-	rb_tracepoint_disable(arg->newobj_trace);
-	rb_tracepoint_disable(arg->freeobj_trace);
-	arg->newobj_trace = 0;
-	arg->freeobj_trace = 0;
+        if (arg->newobj_trace != 0) {
+            rb_tracepoint_disable(arg->newobj_trace);
+        }
+        if (arg->freeobj_trace != 0) {
+            rb_tracepoint_disable(arg->freeobj_trace);
+        }
     }
 
     return Qnil;
@@ -321,9 +408,9 @@ static struct allocation_info *
 lookup_allocation_info(VALUE obj)
 {
     if (tmp_trace_arg) {
- 	struct allocation_info *info;
-	if (st_lookup(tmp_trace_arg->object_table, obj, (st_data_t *)&info)) {
-	    return info;
+	st_data_t info;
+	if (st_lookup(tmp_trace_arg->object_table, obj, &info)) {
+	    return (struct allocation_info *)info;
 	}
     }
     return NULL;
@@ -356,7 +443,7 @@ allocation_sourcefile(VALUE self, VALUE obj)
 }
 
 /*
- * call-seq: allocation_sourceline(object) -> string
+ * call-seq: allocation_sourceline(object) -> integer
  *
  * Returns the original line from source for from the given +object+.
  *
@@ -439,7 +526,7 @@ allocation_method_id(VALUE self, VALUE obj)
 }
 
 /*
- * call-seq: allocation_generation(object) -> Fixnum
+ * call-seq: allocation_generation(object) -> integer or nil
  *
  * Returns garbage collector generation for the given +object+.
  *
diff --git a/ext/objspace/objspace.c b/ext/objspace/objspace.c
index eff9d0c7f8..3fa4fd279b 100644
--- a/ext/objspace/objspace.c
+++ b/ext/objspace/objspace.c
@@ -12,19 +12,28 @@
 
 **********************************************************************/
 
+#include "gc.h"
 #include "internal.h"
-#include <ruby/st.h>
-#include <ruby/io.h>
-#include <ruby/re.h>
+#include "internal/class.h"
+#include "internal/compilers.h"
+#include "internal/hash.h"
+#include "internal/imemo.h"
+#include "internal/sanitizers.h"
 #include "node.h"
-#include "gc.h"
+#include "ruby/io.h"
+#include "ruby/re.h"
+#include "ruby/st.h"
 #include "symbol.h"
 
+#undef rb_funcall
+
+#include "ruby/ruby.h"
+
 /*
  *  call-seq:
  *    ObjectSpace.memsize_of(obj) -> Integer
  *
- *  Return consuming memory size of obj.
+ *  Return consuming memory size of obj in bytes.
  *
  *  Note that the return size is incomplete.  You need to deal with this
  *  information as only a *HINT*. Especially, the size of +T_DATA+ may not be
@@ -33,7 +42,7 @@
  *  This method is only expected to work with C Ruby.
  *
  *  From Ruby 2.2, memsize_of(obj) returns a memory size includes
-  * sizeof(RVALUE).
+ *  sizeof(RVALUE).
  */
 
 static VALUE
@@ -47,37 +56,68 @@ struct total_data {
     VALUE klass;
 };
 
+static void
+total_i(VALUE v, void *ptr)
+{
+    struct total_data *data = (struct total_data *)ptr;
+
+    switch (BUILTIN_TYPE(v)) {
+      case T_NONE:
+      case T_IMEMO:
+      case T_ICLASS:
+      case T_NODE:
+      case T_ZOMBIE:
+          return;
+      default:
+          if (data->klass == 0 || rb_obj_is_kind_of(v, data->klass)) {
+              data->total += rb_obj_memsize_of(v);
+          }
+    }
+}
+
+typedef void (*each_obj_with_flags)(VALUE, void*);
+
+struct obj_itr {
+    each_obj_with_flags cb;
+    void *data;
+};
+
 static int
-total_i(void *vstart, void *vend, size_t stride, void *ptr)
+heap_iter(void *vstart, void *vend, size_t stride, void *ptr)
 {
+    struct obj_itr * ctx = (struct obj_itr *)ptr;
     VALUE v;
-    struct total_data *data = (struct total_data *)ptr;
 
     for (v = (VALUE)vstart; v != (VALUE)vend; v += stride) {
-	if (RBASIC(v)->flags) {
-	    switch (BUILTIN_TYPE(v)) {
-	      case T_NONE:
-	      case T_IMEMO:
-	      case T_ICLASS:
-	      case T_NODE:
-	      case T_ZOMBIE:
-		continue;
-	      default:
-		if (data->klass == 0 || rb_obj_is_kind_of(v, data->klass)) {
-		    data->total += rb_obj_memsize_of(v);
-		}
-	    }
-	}
+        void *poisoned = asan_poisoned_object_p(v);
+        asan_unpoison_object(v, false);
+
+        if (RBASIC(v)->flags) {
+            (*ctx->cb)(v, ctx->data);
+        }
+
+        if (poisoned) {
+            asan_poison_object(v);
+        }
     }
 
     return 0;
 }
 
+static void
+each_object_with_flags(each_obj_with_flags cb, void *ctx)
+{
+    struct obj_itr data;
+    data.cb = cb;
+    data.data = ctx;
+    rb_objspace_each_objects(heap_iter, &data);
+}
+
 /*
  *  call-seq:
  *    ObjectSpace.memsize_of_all([klass]) -> Integer
  *
- *  Return consuming memory size of all living objects.
+ *  Return consuming memory size of all living objects in bytes.
  *
  *  If +klass+ (should be Class object) is given, return the total memory size
  *  of instances of the given class.
@@ -110,7 +150,7 @@ memsize_of_all_m(int argc, VALUE *argv, VALUE self)
 	rb_scan_args(argc, argv, "01", &data.klass);
     }
 
-    rb_objspace_each_objects(total_i, &data);
+    each_object_with_flags(total_i, &data);
     return SIZET2NUM(data.total);
 }
 
@@ -137,24 +177,18 @@ setup_hash(int argc, VALUE *argv)
         hash = rb_hash_new();
     }
     else if (!RHASH_EMPTY_P(hash)) {
-        st_foreach(RHASH_TBL(hash), set_zero_i, hash);
+        /* WB: no new reference */
+        st_foreach(RHASH_TBL_RAW(hash), set_zero_i, hash);
     }
 
     return hash;
 }
 
-static int
-cos_i(void *vstart, void *vend, size_t stride, void *data)
+static void
+cos_i(VALUE v, void *data)
 {
     size_t *counts = (size_t *)data;
-    VALUE v = (VALUE)vstart;
-
-    for (;v != (VALUE)vend; v += stride) {
-	if (RBASIC(v)->flags) {
-	    counts[BUILTIN_TYPE(v)] += rb_obj_memsize_of(v);
-	}
-    }
-    return 0;
+    counts[BUILTIN_TYPE(v)] += rb_obj_memsize_of(v);
 }
 
 static VALUE
@@ -188,6 +222,7 @@ type2sym(enum ruby_value_type i)
 	CASE_TYPE(T_IMEMO);
 	CASE_TYPE(T_NODE);
 	CASE_TYPE(T_ICLASS);
+        CASE_TYPE(T_MOVED);
 	CASE_TYPE(T_ZOMBIE);
 #undef CASE_TYPE
       default: rb_bug("type2sym: unknown type (%d)", i);
@@ -203,7 +238,7 @@ type2sym(enum ruby_value_type i)
  *
  *  Note that this information is incomplete.  You need to deal with
  *  this information as only a *HINT*.  Especially, total size of
- *  T_DATA may not right size.
+ *  T_DATA may be wrong.
  *
  *  It returns a hash as:
  *    {:TOTAL=>1461154, :T_CLASS=>158280, :T_MODULE=>20672, :T_STRING=>527249, ...}
@@ -230,14 +265,7 @@ count_objects_size(int argc, VALUE *argv, VALUE os)
 	counts[i] = 0;
     }
 
-    rb_objspace_each_objects(cos_i, &counts[0]);
-
-    if (hash == Qnil) {
-        hash = rb_hash_new();
-    }
-    else if (!RHASH_EMPTY_P(hash)) {
-        st_foreach(RHASH_TBL(hash), set_zero_i, hash);
-    }
+    each_object_with_flags(cos_i, &counts[0]);
 
     for (i = 0; i <= T_MASK; i++) {
 	if (counts[i]) {
@@ -255,25 +283,20 @@ struct dynamic_symbol_counts {
     size_t immortal;
 };
 
-static int
-cs_i(void *vstart, void *vend, size_t stride, void *n)
+static void
+cs_i(VALUE v, void *n)
 {
     struct dynamic_symbol_counts *counts = (struct dynamic_symbol_counts *)n;
-    VALUE v = (VALUE)vstart;
 
-    for (; v != (VALUE)vend; v += stride) {
-	if (RBASIC(v)->flags && BUILTIN_TYPE(v) == T_SYMBOL) {
-	    ID id = RSYMBOL(v)->id;
-	    if ((id & ~ID_SCOPE_MASK) == 0) {
-		counts->mortal++;
-	    }
-	    else {
-		counts->immortal++;
-	    }
-	}
+    if (BUILTIN_TYPE(v) == T_SYMBOL) {
+        ID id = RSYMBOL(v)->id;
+        if ((id & ~ID_SCOPE_MASK) == 0) {
+            counts->mortal++;
+        }
+        else {
+            counts->immortal++;
+        }
     }
-
-    return 0;
 }
 
 size_t rb_sym_immortal_count(void);
@@ -311,14 +334,7 @@ count_symbols(int argc, VALUE *argv, VALUE os)
     VALUE hash = setup_hash(argc, argv);
 
     size_t immortal_symbols = rb_sym_immortal_count();
-    rb_objspace_each_objects(cs_i, &dynamic_counts);
-
-    if (hash == Qnil) {
-        hash = rb_hash_new();
-    }
-    else if (!RHASH_EMPTY_P(hash)) {
-        st_foreach(RHASH_TBL(hash), set_zero_i, hash);
-    }
+    each_object_with_flags(cs_i, &dynamic_counts);
 
     rb_hash_aset(hash, ID2SYM(rb_intern("mortal_dynamic_symbol")),   SIZET2NUM(dynamic_counts.mortal));
     rb_hash_aset(hash, ID2SYM(rb_intern("immortal_dynamic_symbol")), SIZET2NUM(dynamic_counts.immortal));
@@ -328,20 +344,15 @@ count_symbols(int argc, VALUE *argv, VALUE os)
     return hash;
 }
 
-static int
-cn_i(void *vstart, void *vend, size_t stride, void *n)
+static void
+cn_i(VALUE v, void *n)
 {
     size_t *nodes = (size_t *)n;
-    VALUE v = (VALUE)vstart;
 
-    for (; v != (VALUE)vend; v += stride) {
-	if (RBASIC(v)->flags && BUILTIN_TYPE(v) == T_NODE) {
-	    size_t s = nd_type((NODE *)v);
-	    nodes[s]++;
-	}
+    if (BUILTIN_TYPE(v) == T_NODE) {
+        size_t s = nd_type((NODE *)v);
+        nodes[s]++;
     }
-
-    return 0;
 }
 
 /*
@@ -371,37 +382,34 @@ static VALUE
 count_nodes(int argc, VALUE *argv, VALUE os)
 {
     size_t nodes[NODE_LAST+1];
-    size_t i;
+    enum node_type i;
     VALUE hash = setup_hash(argc, argv);
 
     for (i = 0; i <= NODE_LAST; i++) {
 	nodes[i] = 0;
     }
 
-    rb_objspace_each_objects(cn_i, &nodes[0]);
-
-    if (hash == Qnil) {
-        hash = rb_hash_new();
-    }
-    else if (!RHASH_EMPTY_P(hash)) {
-        st_foreach(RHASH_TBL(hash), set_zero_i, hash);
-    }
+    each_object_with_flags(cn_i, &nodes[0]);
 
     for (i=0; i<NODE_LAST; i++) {
 	if (nodes[i] != 0) {
 	    VALUE node;
 	    switch (i) {
-#define COUNT_NODE(n) case n: node = ID2SYM(rb_intern(#n)); break;
+#define COUNT_NODE(n) case n: node = ID2SYM(rb_intern(#n)); goto set
 		COUNT_NODE(NODE_SCOPE);
 		COUNT_NODE(NODE_BLOCK);
 		COUNT_NODE(NODE_IF);
+		COUNT_NODE(NODE_UNLESS);
 		COUNT_NODE(NODE_CASE);
+		COUNT_NODE(NODE_CASE2);
+		COUNT_NODE(NODE_CASE3);
 		COUNT_NODE(NODE_WHEN);
-		COUNT_NODE(NODE_OPT_N);
+		COUNT_NODE(NODE_IN);
 		COUNT_NODE(NODE_WHILE);
 		COUNT_NODE(NODE_UNTIL);
 		COUNT_NODE(NODE_ITER);
 		COUNT_NODE(NODE_FOR);
+		COUNT_NODE(NODE_FOR_MASGN);
 		COUNT_NODE(NODE_BREAK);
 		COUNT_NODE(NODE_NEXT);
 		COUNT_NODE(NODE_REDO);
@@ -418,22 +426,22 @@ count_nodes(int argc, VALUE *argv, VALUE os)
 		COUNT_NODE(NODE_DASGN_CURR);
 		COUNT_NODE(NODE_GASGN);
 		COUNT_NODE(NODE_IASGN);
-		COUNT_NODE(NODE_IASGN2);
 		COUNT_NODE(NODE_CDECL);
 		COUNT_NODE(NODE_CVASGN);
-		COUNT_NODE(NODE_CVDECL);
 		COUNT_NODE(NODE_OP_ASGN1);
 		COUNT_NODE(NODE_OP_ASGN2);
 		COUNT_NODE(NODE_OP_ASGN_AND);
 		COUNT_NODE(NODE_OP_ASGN_OR);
 		COUNT_NODE(NODE_OP_CDECL);
 		COUNT_NODE(NODE_CALL);
+		COUNT_NODE(NODE_OPCALL);
 		COUNT_NODE(NODE_FCALL);
 		COUNT_NODE(NODE_VCALL);
+		COUNT_NODE(NODE_QCALL);
 		COUNT_NODE(NODE_SUPER);
 		COUNT_NODE(NODE_ZSUPER);
-		COUNT_NODE(NODE_ARRAY);
-		COUNT_NODE(NODE_ZARRAY);
+		COUNT_NODE(NODE_LIST);
+		COUNT_NODE(NODE_ZLIST);
 		COUNT_NODE(NODE_VALUES);
 		COUNT_NODE(NODE_HASH);
 		COUNT_NODE(NODE_RETURN);
@@ -456,7 +464,7 @@ count_nodes(int argc, VALUE *argv, VALUE os)
 		COUNT_NODE(NODE_DXSTR);
 		COUNT_NODE(NODE_EVSTR);
 		COUNT_NODE(NODE_DREGX);
-		COUNT_NODE(NODE_DREGX_ONCE);
+		COUNT_NODE(NODE_ONCE);
 		COUNT_NODE(NODE_ARGS);
 		COUNT_NODE(NODE_ARGS_AUX);
 		COUNT_NODE(NODE_OPT_ARG);
@@ -465,8 +473,6 @@ count_nodes(int argc, VALUE *argv, VALUE os)
 		COUNT_NODE(NODE_ARGSCAT);
 		COUNT_NODE(NODE_ARGSPUSH);
 		COUNT_NODE(NODE_SPLAT);
-		COUNT_NODE(NODE_TO_ARY);
-		COUNT_NODE(NODE_BLOCK_ARG);
 		COUNT_NODE(NODE_BLOCK_PASS);
 		COUNT_NODE(NODE_DEFN);
 		COUNT_NODE(NODE_DEFS);
@@ -489,51 +495,48 @@ count_nodes(int argc, VALUE *argv, VALUE os)
 		COUNT_NODE(NODE_ERRINFO);
 		COUNT_NODE(NODE_DEFINED);
 		COUNT_NODE(NODE_POSTEXE);
-		COUNT_NODE(NODE_ALLOCA);
-		COUNT_NODE(NODE_BMETHOD);
 		COUNT_NODE(NODE_DSYM);
 		COUNT_NODE(NODE_ATTRASGN);
-		COUNT_NODE(NODE_PRELUDE);
 		COUNT_NODE(NODE_LAMBDA);
+		COUNT_NODE(NODE_ARYPTN);
+		COUNT_NODE(NODE_FNDPTN);
+		COUNT_NODE(NODE_HSHPTN);
 #undef COUNT_NODE
-	      default: node = INT2FIX(i);
+	      case NODE_LAST: break;
 	    }
+	    UNREACHABLE;
+	  set:
 	    rb_hash_aset(hash, node, SIZET2NUM(nodes[i]));
 	}
     }
     return hash;
 }
 
-static int
-cto_i(void *vstart, void *vend, size_t stride, void *data)
+static void
+cto_i(VALUE v, void *data)
 {
     VALUE hash = (VALUE)data;
-    VALUE v = (VALUE)vstart;
 
-    for (; v != (VALUE)vend; v += stride) {
-	if (RBASIC(v)->flags && BUILTIN_TYPE(v) == T_DATA) {
-	    VALUE counter;
-	    VALUE key = RBASIC(v)->klass;
+    if (BUILTIN_TYPE(v) == T_DATA) {
+        VALUE counter;
+        VALUE key = RBASIC(v)->klass;
 
-	    if (key == 0) {
-		const char *name = rb_objspace_data_type_name(v);
-		if (name == 0) name = "unknown";
-		key = ID2SYM(rb_intern(name));
-	    }
+        if (key == 0) {
+            const char *name = rb_objspace_data_type_name(v);
+            if (name == 0) name = "unknown";
+            key = ID2SYM(rb_intern(name));
+        }
 
-	    counter = rb_hash_aref(hash, key);
-	    if (NIL_P(counter)) {
-		counter = INT2FIX(1);
-	    }
-	    else {
-		counter = INT2FIX(FIX2INT(counter) + 1);
-	    }
+        counter = rb_hash_aref(hash, key);
+        if (NIL_P(counter)) {
+            counter = INT2FIX(1);
+        }
+        else {
+            counter = INT2FIX(FIX2INT(counter) + 1);
+        }
 
-	    rb_hash_aset(hash, key, counter);
-	}
+        rb_hash_aset(hash, key, counter);
     }
-
-    return 0;
 }
 
 /*
@@ -572,37 +575,32 @@ static VALUE
 count_tdata_objects(int argc, VALUE *argv, VALUE self)
 {
     VALUE hash = setup_hash(argc, argv);
-    rb_objspace_each_objects(cto_i, (void *)hash);
+    each_object_with_flags(cto_i, (void *)hash);
     return hash;
 }
 
-static ID imemo_type_ids[imemo_mask+1];
+static ID imemo_type_ids[IMEMO_MASK+1];
 
-static int
-count_imemo_objects_i(void *vstart, void *vend, size_t stride, void *data)
+static void
+count_imemo_objects_i(VALUE v, void *data)
 {
     VALUE hash = (VALUE)data;
-    VALUE v = (VALUE)vstart;
 
-    for (; v != (VALUE)vend; v += stride) {
-	if (RBASIC(v)->flags && BUILTIN_TYPE(v) == T_IMEMO) {
-	    VALUE counter;
-	    VALUE key = ID2SYM(imemo_type_ids[imemo_type(v)]);
+    if (BUILTIN_TYPE(v) == T_IMEMO) {
+        VALUE counter;
+        VALUE key = ID2SYM(imemo_type_ids[imemo_type(v)]);
 
-	    counter = rb_hash_aref(hash, key);
+        counter = rb_hash_aref(hash, key);
 
-	    if (NIL_P(counter)) {
-		counter = INT2FIX(1);
-	    }
-	    else {
-		counter = INT2FIX(FIX2INT(counter) + 1);
-	    }
+        if (NIL_P(counter)) {
+            counter = INT2FIX(1);
+        }
+        else {
+            counter = INT2FIX(FIX2INT(counter) + 1);
+        }
 
-	    rb_hash_aset(hash, key, counter);
-	}
+        rb_hash_aset(hash, key, counter);
     }
-
-    return 0;
 }
 
 /*
@@ -639,7 +637,7 @@ count_imemo_objects(int argc, VALUE *argv, VALUE self)
     VALUE hash = setup_hash(argc, argv);
 
     if (imemo_type_ids[0] == 0) {
-	imemo_type_ids[0] = rb_intern("imemo_none");
+        imemo_type_ids[0] = rb_intern("imemo_env");
 	imemo_type_ids[1] = rb_intern("imemo_cref");
 	imemo_type_ids[2] = rb_intern("imemo_svar");
 	imemo_type_ids[3] = rb_intern("imemo_throw_data");
@@ -647,9 +645,15 @@ count_imemo_objects(int argc, VALUE *argv, VALUE self)
 	imemo_type_ids[5] = rb_intern("imemo_memo");
 	imemo_type_ids[6] = rb_intern("imemo_ment");
 	imemo_type_ids[7] = rb_intern("imemo_iseq");
+	imemo_type_ids[8] = rb_intern("imemo_tmpbuf");
+        imemo_type_ids[9] = rb_intern("imemo_ast");
+        imemo_type_ids[10] = rb_intern("imemo_parser_strterm");
+        imemo_type_ids[11] = rb_intern("imemo_callinfo");
+        imemo_type_ids[12] = rb_intern("imemo_callcache");
+        imemo_type_ids[13] = rb_intern("imemo_constcache");
     }
 
-    rb_objspace_each_objects(count_imemo_objects_i, (void *)hash);
+    each_object_with_flags(count_imemo_objects_i, (void *)hash);
 
     return hash;
 }
@@ -673,12 +677,12 @@ static const rb_data_type_t iow_data_type = {
     0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
-static VALUE rb_mInternalObjectWrapper;
+static VALUE rb_cInternalObjectWrapper;
 
 static VALUE
 iow_newobj(VALUE obj)
 {
-    return TypedData_Wrap_Struct(rb_mInternalObjectWrapper, &iow_data_type, (void *)obj);
+    return TypedData_Wrap_Struct(rb_cInternalObjectWrapper, &iow_data_type, (void *)obj);
 }
 
 /* Returns the type of the internal object. */
@@ -708,7 +712,7 @@ iow_internal_object_id(VALUE self)
 }
 
 struct rof_data {
-    st_table *refs;
+    VALUE refs;
     VALUE internals;
 };
 
@@ -724,7 +728,7 @@ reachable_object_from_i(VALUE obj, void *data_ptr)
 	    val = iow_newobj(obj);
 	    rb_ary_push(data->internals, val);
 	}
-	st_insert(data->refs, key, val);
+	rb_hash_aset(data->refs, key, val);
     }
 }
 
@@ -782,20 +786,18 @@ static VALUE
 reachable_objects_from(VALUE self, VALUE obj)
 {
     if (rb_objspace_markable_object_p(obj)) {
-	VALUE ret = rb_ary_new();
 	struct rof_data data;
 
 	if (rb_typeddata_is_kind_of(obj, &iow_data_type)) {
 	    obj = (VALUE)DATA_PTR(obj);
 	}
 
-	data.refs = st_init_numtable();
+	data.refs = rb_ident_hash_new();
 	data.internals = rb_ary_new();
 
 	rb_objspace_reachable_objects_from(obj, reachable_object_from_i, &data);
 
-	st_foreach(data.refs, collect_values, (st_data_t)ret);
-	return ret;
+        return rb_funcall(data.refs, rb_intern("values"), 0);
     }
     else {
 	return Qnil;
@@ -844,7 +846,7 @@ static int
 collect_values_of_values(VALUE category, VALUE category_objects, VALUE categories)
 {
     VALUE ary = rb_ary_new();
-    st_foreach(rb_hash_tbl(category_objects), collect_values, ary);
+    rb_hash_foreach(category_objects, collect_values, ary);
     rb_hash_aset(categories, category, ary);
     return ST_CONTINUE;
 }
@@ -874,7 +876,8 @@ wrap_klass_iow(VALUE klass)
     if (!RTEST(klass)) {
 	return Qnil;
     }
-    else if (RB_TYPE_P(klass, T_ICLASS)) {
+    else if (RB_TYPE_P(klass, T_ICLASS) ||
+             CLASS_OF(klass) == Qfalse /* hidden object */) {
 	return iow_newobj(klass);
     }
     else {
@@ -900,8 +903,13 @@ objspace_internal_class_of(VALUE self, VALUE obj)
 	obj = (VALUE)DATA_PTR(obj);
     }
 
-    klass = CLASS_OF(obj);
-    return wrap_klass_iow(klass);
+    if (RB_TYPE_P(obj, T_IMEMO)) {
+        return Qnil;
+    }
+    else {
+        klass = CLASS_OF(obj);
+        return wrap_klass_iow(klass);
+    }
 }
 
 /*
@@ -922,7 +930,7 @@ objspace_internal_super_of(VALUE self, VALUE obj)
 	obj = (VALUE)DATA_PTR(obj);
     }
 
-    switch (TYPE(obj)) {
+    switch (OBJ_BUILTIN_TYPE(obj)) {
       case T_MODULE:
       case T_CLASS:
       case T_ICLASS:
@@ -956,6 +964,7 @@ void Init_objspace_dump(VALUE rb_mObjSpace);
 void
 Init_objspace(void)
 {
+#undef rb_intern
     VALUE rb_mObjSpace;
 #if 0
     rb_mObjSpace = rb_define_module("ObjectSpace"); /* let rdoc know */
@@ -986,10 +995,11 @@ Init_objspace(void)
      *
      * You can use the #type method to check the type of the internal object.
      */
-    rb_mInternalObjectWrapper = rb_define_class_under(rb_mObjSpace, "InternalObjectWrapper", rb_cObject);
-    rb_define_method(rb_mInternalObjectWrapper, "type", iow_type, 0);
-    rb_define_method(rb_mInternalObjectWrapper, "inspect", iow_inspect, 0);
-    rb_define_method(rb_mInternalObjectWrapper, "internal_object_id", iow_internal_object_id, 0);
+    rb_cInternalObjectWrapper = rb_define_class_under(rb_mObjSpace, "InternalObjectWrapper", rb_cObject);
+    rb_undef_alloc_func(rb_cInternalObjectWrapper);
+    rb_define_method(rb_cInternalObjectWrapper, "type", iow_type, 0);
+    rb_define_method(rb_cInternalObjectWrapper, "inspect", iow_inspect, 0);
+    rb_define_method(rb_cInternalObjectWrapper, "internal_object_id", iow_internal_object_id, 0);
 
     Init_object_tracing(rb_mObjSpace);
     Init_objspace_dump(rb_mObjSpace);
diff --git a/ext/objspace/objspace_dump.c b/ext/objspace/objspace_dump.c
index 47aaaf2e3a..544d11e254 100644
--- a/ext/objspace/objspace_dump.c
+++ b/ext/objspace/objspace_dump.c
@@ -12,41 +12,169 @@
 
 **********************************************************************/
 
+#include "gc.h"
 #include "internal.h"
+#include "internal/hash.h"
+#include "internal/string.h"
+#include "internal/sanitizers.h"
+#include "node.h"
+#include "objspace.h"
 #include "ruby/debug.h"
+#include "ruby/util.h"
 #include "ruby/io.h"
-#include "gc.h"
-#include "node.h"
 #include "vm_core.h"
-#include "objspace.h"
 
-static VALUE sym_output, sym_stdout, sym_string, sym_file;
+RUBY_EXTERN const char ruby_hexdigits[];
+
+#define BUFFER_CAPACITY 4096
 
 struct dump_config {
     VALUE type;
-    FILE *stream;
+    VALUE stream;
     VALUE string;
-    int roots;
     const char *root_category;
     VALUE cur_obj;
     VALUE cur_obj_klass;
     size_t cur_obj_references;
+    unsigned int roots: 1;
+    unsigned int full_heap: 1;
+    unsigned int partial_dump;
+    size_t since;
+    unsigned long buffer_len;
+    char buffer[BUFFER_CAPACITY];
 };
 
-PRINTF_ARGS(static void dump_append(struct dump_config *, const char *, ...), 2, 3);
 static void
-dump_append(struct dump_config *dc, const char *format, ...)
+dump_flush(struct dump_config *dc)
+{
+    if (dc->buffer_len) {
+        if (dc->stream) {
+            size_t written = rb_io_bufwrite(dc->stream, dc->buffer, dc->buffer_len);
+            if (written < dc->buffer_len) {
+                MEMMOVE(dc->buffer, dc->buffer + written, char, dc->buffer_len - written);
+                dc->buffer_len -= written;
+                return;
+            }
+        }
+        else if (dc->string) {
+            rb_str_cat(dc->string, dc->buffer, dc->buffer_len);
+        }
+        dc->buffer_len = 0;
+    }
+}
+
+static inline void
+buffer_ensure_capa(struct dump_config *dc, unsigned long requested)
+{
+    RUBY_ASSERT(requested <= BUFFER_CAPACITY);
+    if (requested + dc->buffer_len >= BUFFER_CAPACITY) {
+        dump_flush(dc);
+        if (requested + dc->buffer_len >= BUFFER_CAPACITY) {
+            rb_raise(rb_eIOError, "full buffer");
+        }
+    }
+}
+
+static void buffer_append(struct dump_config *dc, const char *cstr, unsigned long len)
+{
+    if (LIKELY(len > 0)) {
+        buffer_ensure_capa(dc, len);
+        MEMCPY(dc->buffer + dc->buffer_len, cstr, char, len);
+        dc->buffer_len += len;
+    }
+}
+
+# define dump_append(dc, str) buffer_append(dc, (str), (long)strlen(str))
+
+static void
+dump_append_ld(struct dump_config *dc, const long number)
+{
+    const int width = DECIMAL_SIZE_OF_BITS(sizeof(number) * CHAR_BIT - 1) + 2;
+    buffer_ensure_capa(dc, width);
+    unsigned long required = snprintf(dc->buffer + dc->buffer_len, width, "%ld", number);
+    RUBY_ASSERT(required <= width);
+    dc->buffer_len += required;
+}
+
+static void
+dump_append_lu(struct dump_config *dc, const unsigned long number)
 {
-    va_list vl;
-    va_start(vl, format);
+    const int width = DECIMAL_SIZE_OF_BITS(sizeof(number) * CHAR_BIT) + 1;
+    buffer_ensure_capa(dc, width);
+    unsigned long required = snprintf(dc->buffer + dc->buffer_len, width, "%lu", number);
+    RUBY_ASSERT(required <= width);
+    dc->buffer_len += required;
+}
 
-    if (dc->stream) {
-	vfprintf(dc->stream, format, vl);
+static void
+dump_append_g(struct dump_config *dc, const double number)
+{
+    unsigned long capa_left = BUFFER_CAPACITY - dc->buffer_len;
+    unsigned long required = snprintf(dc->buffer + dc->buffer_len, capa_left, "%#g", number);
+
+    if (required >= capa_left) {
+        buffer_ensure_capa(dc, required);
+        capa_left = BUFFER_CAPACITY - dc->buffer_len;
+        snprintf(dc->buffer + dc->buffer_len, capa_left, "%#g", number);
     }
-    else if (dc->string)
-	rb_str_vcatf(dc->string, format, vl);
+    dc->buffer_len += required;
+}
+
+static void
+dump_append_d(struct dump_config *dc, const int number)
+{
+    const int width = DECIMAL_SIZE_OF_BITS(sizeof(number) * CHAR_BIT - 1) + 2;
+    buffer_ensure_capa(dc, width);
+    unsigned long required = snprintf(dc->buffer + dc->buffer_len, width, "%d", number);
+    RUBY_ASSERT(required <= width);
+    dc->buffer_len += required;
+}
 
-    va_end(vl);
+static void
+dump_append_sizet(struct dump_config *dc, const size_t number)
+{
+    const int width = DECIMAL_SIZE_OF_BITS(sizeof(number) * CHAR_BIT) + 1;
+    buffer_ensure_capa(dc, width);
+    unsigned long required = snprintf(dc->buffer + dc->buffer_len, width, "%"PRIuSIZE, number);
+    RUBY_ASSERT(required <= width);
+    dc->buffer_len += required;
+}
+
+static void
+dump_append_c(struct dump_config *dc, char c)
+{
+    if (c <= 0x1f) {
+        const int width = (sizeof(c) * CHAR_BIT / 4) + 5;
+        buffer_ensure_capa(dc, width);
+        unsigned long required = snprintf(dc->buffer + dc->buffer_len, width, "\\u00%02x", c);
+        RUBY_ASSERT(required <= width);
+        dc->buffer_len += required;
+    }
+    else {
+        buffer_ensure_capa(dc, 1);
+        dc->buffer[dc->buffer_len] = c;
+        dc->buffer_len++;
+    }
+}
+
+static void
+dump_append_ref(struct dump_config *dc, VALUE ref)
+{
+    RUBY_ASSERT(ref > 0);
+
+    char buffer[((sizeof(VALUE) * CHAR_BIT + 3) / 4) + 4];
+    char *buffer_start, *buffer_end;
+
+    buffer_start = buffer_end = &buffer[sizeof(buffer)];
+    *--buffer_start = '"';
+    while (ref) {
+        *--buffer_start = ruby_hexdigits[ref & 0xF];
+        ref >>= 4;
+    }
+    *--buffer_start = 'x';
+    *--buffer_start = '0';
+    *--buffer_start = '"';
+    buffer_append(dc, buffer_start, buffer_end - buffer_start);
 }
 
 static void
@@ -58,35 +186,37 @@ dump_append_string_value(struct dump_config *dc, VALUE obj)
 
     dump_append(dc, "\"");
     for (i = 0, value = RSTRING_PTR(obj); i < RSTRING_LEN(obj); i++) {
-	switch ((c = value[i])) {
-	  case '\\':
-	  case '"':
-	    dump_append(dc, "\\%c", c);
-	    break;
-	  case '\0':
-	    dump_append(dc, "\\u0000");
-	    break;
-	  case '\b':
-	    dump_append(dc, "\\b");
-	    break;
-	  case '\t':
-	    dump_append(dc, "\\t");
-	    break;
-	  case '\f':
-	    dump_append(dc, "\\f");
-	    break;
-	  case '\n':
-	    dump_append(dc, "\\n");
-	    break;
-	  case '\r':
-	    dump_append(dc, "\\r");
-	    break;
-	  default:
-	    if (c <= 0x1f)
-		dump_append(dc, "\\u%04d", c);
-	    else
-		dump_append(dc, "%c", c);
-	}
+        switch ((c = value[i])) {
+          case '\\':
+            dump_append(dc, "\\\\");
+            break;
+          case '"':
+            dump_append(dc, "\\\"");
+            break;
+          case '\0':
+            dump_append(dc, "\\u0000");
+            break;
+          case '\b':
+            dump_append(dc, "\\b");
+            break;
+          case '\t':
+            dump_append(dc, "\\t");
+            break;
+          case '\f':
+            dump_append(dc, "\\f");
+            break;
+          case '\n':
+            dump_append(dc, "\\n");
+            break;
+          case '\r':
+            dump_append(dc, "\\r");
+            break;
+          case '\177':
+            dump_append(dc, "\\u007f");
+            break;
+          default:
+            dump_append_c(dc, c);
+        }
     }
     dump_append(dc, "\"");
 }
@@ -103,7 +233,7 @@ static inline const char *
 obj_type(VALUE obj)
 {
     switch (BUILTIN_TYPE(obj)) {
-#define CASE_TYPE(type) case T_##type: return #type; break
+#define CASE_TYPE(type) case T_##type: return #type
 	CASE_TYPE(NONE);
 	CASE_TYPE(NIL);
 	CASE_TYPE(OBJECT);
@@ -131,6 +261,7 @@ obj_type(VALUE obj)
 	CASE_TYPE(NODE);
 	CASE_TYPE(ZOMBIE);
 #undef CASE_TYPE
+      default: break;
     }
     return "UNKNOWN";
 }
@@ -139,25 +270,25 @@ static void
 dump_append_special_const(struct dump_config *dc, VALUE value)
 {
     if (value == Qtrue) {
-	dump_append(dc, "true");
+        dump_append(dc, "true");
     }
     else if (value == Qfalse) {
-	dump_append(dc, "false");
+        dump_append(dc, "false");
     }
     else if (value == Qnil) {
-	dump_append(dc, "null");
+        dump_append(dc, "null");
     }
     else if (FIXNUM_P(value)) {
-	dump_append(dc, "%ld", FIX2LONG(value));
+        dump_append_ld(dc, FIX2LONG(value));
     }
     else if (FLONUM_P(value)) {
-	dump_append(dc, "%#g", RFLOAT_VALUE(value));
+        dump_append_g(dc, RFLOAT_VALUE(value));
     }
     else if (SYMBOL_P(value)) {
-	dump_append_symbol_value(dc, value);
+        dump_append_symbol_value(dc, value);
     }
     else {
-	dump_append(dc, "{}");
+        dump_append(dc, "{}");
     }
 }
 
@@ -167,12 +298,16 @@ reachable_object_i(VALUE ref, void *data)
     struct dump_config *dc = (struct dump_config *)data;
 
     if (dc->cur_obj_klass == ref)
-	return;
+        return;
 
-    if (dc->cur_obj_references == 0)
-	dump_append(dc, ", \"references\":[\"%p\"", (void *)ref);
-    else
-	dump_append(dc, ", \"%p\"", (void *)ref);
+    if (dc->cur_obj_references == 0) {
+        dump_append(dc, ", \"references\":[");
+        dump_append_ref(dc, ref);
+    }
+    else {
+        dump_append(dc, ", ");
+        dump_append_ref(dc, ref);
+    }
 
     dc->cur_obj_references++;
 }
@@ -180,145 +315,197 @@ reachable_object_i(VALUE ref, void *data)
 static void
 dump_append_string_content(struct dump_config *dc, VALUE obj)
 {
-    dump_append(dc, ", \"bytesize\":%ld", RSTRING_LEN(obj));
-    if (!STR_EMBED_P(obj) && !STR_SHARED_P(obj) && (long)rb_str_capacity(obj) != RSTRING_LEN(obj))
-	dump_append(dc, ", \"capacity\":%"PRIdSIZE, rb_str_capacity(obj));
+    dump_append(dc, ", \"bytesize\":");
+    dump_append_ld(dc, RSTRING_LEN(obj));
+    if (!STR_EMBED_P(obj) && !STR_SHARED_P(obj) && (long)rb_str_capacity(obj) != RSTRING_LEN(obj)) {
+        dump_append(dc, ", \"capacity\":");
+        dump_append_sizet(dc, rb_str_capacity(obj));
+    }
 
     if (is_ascii_string(obj)) {
-	dump_append(dc, ", \"value\":");
-	dump_append_string_value(dc, obj);
+        dump_append(dc, ", \"value\":");
+        dump_append_string_value(dc, obj);
     }
 }
 
 static void
-dump_object(VALUE obj, struct dump_config *dc, int part)
+dump_object(VALUE obj, struct dump_config *dc)
 {
     size_t memsize;
-    struct allocation_info *ainfo;
+    struct allocation_info *ainfo = objspace_lookup_allocation_info(obj);
     rb_io_t *fptr;
     ID flags[RB_OBJ_GC_FLAGS_MAX];
     size_t n, i;
 
     if (SPECIAL_CONST_P(obj)) {
-	dump_append_special_const(dc, obj);
-	return;
+        dump_append_special_const(dc, obj);
+        return;
     }
 
     dc->cur_obj = obj;
     dc->cur_obj_references = 0;
     dc->cur_obj_klass = BUILTIN_TYPE(obj) == T_NODE ? 0 : RBASIC_CLASS(obj);
 
+    if (dc->partial_dump && (!ainfo || ainfo->generation < dc->since)) {
+        return;
+    }
+
     if (dc->cur_obj == dc->string)
-	return;
+        return;
+
+    dump_append(dc, "{\"address\":");
+    dump_append_ref(dc, obj);
 
-    if (part)
-	dump_append(dc, "\"%p\":{", (void *)obj);
-    else
-	dump_append(dc, "{\"address\":\"%p\", ", (void *)obj);
-    dump_append(dc, "\"type\":\"%s\"", obj_type(obj));
+    dump_append(dc, ", \"type\":\"");
+    dump_append(dc, obj_type(obj));
+    dump_append(dc, "\"");
 
-    if (dc->cur_obj_klass)
-	dump_append(dc, ", \"class\":\"%p\"", (void *)dc->cur_obj_klass);
+    if (dc->cur_obj_klass) {
+        dump_append(dc, ", \"class\":");
+        dump_append_ref(dc, dc->cur_obj_klass);
+    }
     if (rb_obj_frozen_p(obj))
-	dump_append(dc, ", \"frozen\":true");
+        dump_append(dc, ", \"frozen\":true");
 
     switch (BUILTIN_TYPE(obj)) {
-      case T_NODE:
-	dump_append(dc, ", \"node_type\":\"%s\"", ruby_node_name(nd_type(obj)));
-	break;
+      case T_NONE:
+        dump_append(dc, "}\n");
+        return;
+
+      case T_IMEMO:
+        dump_append(dc, ", \"imemo_type\":\"");
+        dump_append(dc, rb_imemo_name(imemo_type(obj)));
+        dump_append(dc, "\"");
+        break;
 
       case T_SYMBOL:
-	dump_append_string_content(dc, rb_sym2str(obj));
-	break;
+        dump_append_string_content(dc, rb_sym2str(obj));
+        break;
 
       case T_STRING:
-	if (STR_EMBED_P(obj))
-	    dump_append(dc, ", \"embedded\":true");
-	if (is_broken_string(obj))
-	    dump_append(dc, ", \"broken\":true");
-	if (FL_TEST(obj, RSTRING_FSTR))
-	    dump_append(dc, ", \"fstring\":true");
-	if (STR_SHARED_P(obj))
-	    dump_append(dc, ", \"shared\":true");
-	else
-	    dump_append_string_content(dc, obj);
-
-	if (!ENCODING_IS_ASCII8BIT(obj))
-	    dump_append(dc, ", \"encoding\":\"%s\"", rb_enc_name(rb_enc_from_index(ENCODING_GET(obj))));
-	break;
+        if (STR_EMBED_P(obj))
+            dump_append(dc, ", \"embedded\":true");
+        if (is_broken_string(obj))
+            dump_append(dc, ", \"broken\":true");
+        if (FL_TEST(obj, RSTRING_FSTR))
+            dump_append(dc, ", \"fstring\":true");
+        if (STR_SHARED_P(obj))
+            dump_append(dc, ", \"shared\":true");
+        else
+            dump_append_string_content(dc, obj);
+
+        if (!ENCODING_IS_ASCII8BIT(obj)) {
+            dump_append(dc, ", \"encoding\":\"");
+            dump_append(dc, rb_enc_name(rb_enc_from_index(ENCODING_GET(obj))));
+            dump_append(dc, "\"");
+        }
+        break;
 
       case T_HASH:
-	dump_append(dc, ", \"size\":%"PRIdSIZE, (size_t)RHASH_SIZE(obj));
-	if (FL_TEST(obj, HASH_PROC_DEFAULT))
-	    dump_append(dc, ", \"default\":\"%p\"", (void *)RHASH_IFNONE(obj));
-	break;
+        dump_append(dc, ", \"size\":");
+        dump_append_sizet(dc, (size_t)RHASH_SIZE(obj));
+        if (FL_TEST(obj, RHASH_PROC_DEFAULT)) {
+            dump_append(dc, ", \"default\":");
+            dump_append_ref(dc, RHASH_IFNONE(obj));
+        }
+        break;
 
       case T_ARRAY:
-	dump_append(dc, ", \"length\":%ld", RARRAY_LEN(obj));
-	if (RARRAY_LEN(obj) > 0 && FL_TEST(obj, ELTS_SHARED))
-	    dump_append(dc, ", \"shared\":true");
-	if (RARRAY_LEN(obj) > 0 && FL_TEST(obj, RARRAY_EMBED_FLAG))
-	    dump_append(dc, ", \"embedded\":true");
-	break;
+        dump_append(dc, ", \"length\":");
+        dump_append_ld(dc, RARRAY_LEN(obj));
+        if (RARRAY_LEN(obj) > 0 && FL_TEST(obj, ELTS_SHARED))
+            dump_append(dc, ", \"shared\":true");
+        if (RARRAY_LEN(obj) > 0 && FL_TEST(obj, RARRAY_EMBED_FLAG))
+            dump_append(dc, ", \"embedded\":true");
+        break;
 
       case T_CLASS:
       case T_MODULE:
-	if (dc->cur_obj_klass)
-	    dump_append(dc, ", \"name\":\"%s\"", rb_class2name(obj));
-	break;
+        if (dc->cur_obj_klass) {
+            VALUE mod_name = rb_mod_name(obj);
+            if (!NIL_P(mod_name)) {
+                dump_append(dc, ", \"name\":\"");
+                dump_append(dc, RSTRING_PTR(mod_name));
+                dump_append(dc, "\"");
+            }
+        }
+        break;
 
       case T_DATA:
-	if (RTYPEDDATA_P(obj))
-	    dump_append(dc, ", \"struct\":\"%s\"", RTYPEDDATA_TYPE(obj)->wrap_struct_name);
-	break;
+        if (RTYPEDDATA_P(obj)) {
+            dump_append(dc, ", \"struct\":\"");
+            dump_append(dc, RTYPEDDATA_TYPE(obj)->wrap_struct_name);
+            dump_append(dc, "\"");
+        }
+        break;
 
       case T_FLOAT:
-	dump_append(dc, ", \"value\":\"%g\"", RFLOAT_VALUE(obj));
-	break;
+        dump_append(dc, ", \"value\":\"");
+        dump_append_g(dc, RFLOAT_VALUE(obj));
+        dump_append(dc, "\"");
+        break;
 
       case T_OBJECT:
-	dump_append(dc, ", \"ivars\":%u", ROBJECT_NUMIV(obj));
-	break;
+        dump_append(dc, ", \"ivars\":");
+        dump_append_lu(dc, ROBJECT_NUMIV(obj));
+        break;
 
       case T_FILE:
-	fptr = RFILE(obj)->fptr;
-	if (fptr)
-	    dump_append(dc, ", \"fd\":%d", fptr->fd);
-	break;
+        fptr = RFILE(obj)->fptr;
+        if (fptr) {
+            dump_append(dc, ", \"fd\":");
+            dump_append_d(dc, fptr->fd);
+        }
+        break;
 
       case T_ZOMBIE:
-	dump_append(dc, "}");
-	dc->roots++;
-	return;
+          dump_append(dc, "}\n");
+          return;
+
+      default:
+        break;
     }
 
     rb_objspace_reachable_objects_from(obj, reachable_object_i, dc);
     if (dc->cur_obj_references > 0)
-	dump_append(dc, "]");
-
-    if ((ainfo = objspace_lookup_allocation_info(obj))) {
-	dump_append(dc, ", \"file\":\"%s\", \"line\":%lu", ainfo->path, ainfo->line);
-	if (RTEST(ainfo->mid)) {
-	    VALUE m = rb_sym2str(ainfo->mid);
-	    dump_append(dc, ", \"method\":\"%s\"", RSTRING_PTR(m));
-	}
-	dump_append(dc, ", \"generation\":%"PRIuSIZE, ainfo->generation);
+        dump_append(dc, "]");
+
+    if (ainfo) {
+        if (ainfo->path) {
+            dump_append(dc, ", \"file\":\"");
+            dump_append(dc, ainfo->path);
+            dump_append(dc, "\"");
+        }
+        if (ainfo->line) {
+            dump_append(dc, ", \"line\":");
+            dump_append_lu(dc, ainfo->line);
+        }
+        if (RTEST(ainfo->mid)) {
+            VALUE m = rb_sym2str(ainfo->mid);
+            dump_append(dc, ", \"method\":");
+            dump_append_string_value(dc, m);
+        }
+        dump_append(dc, ", \"generation\":");
+        dump_append_sizet(dc, ainfo->generation);
     }
 
-    if ((memsize = rb_obj_memsize_of(obj)) > 0)
-	dump_append(dc, ", \"memsize\":%"PRIuSIZE, memsize);
+    if ((memsize = rb_obj_memsize_of(obj)) > 0) {
+        dump_append(dc, ", \"memsize\":");
+        dump_append_sizet(dc, memsize);
+    }
 
     if ((n = rb_obj_gc_flags(obj, flags, sizeof(flags))) > 0) {
-	dump_append(dc, ", \"flags\":{");
-	for (i=0; i<n; i++) {
-	    dump_append(dc, "\"%s\":true", rb_id2name(flags[i]));
-	    if (i != n-1) dump_append(dc, ", ");
-	}
-	dump_append(dc, "}");
+        dump_append(dc, ", \"flags\":{");
+        for (i=0; i<n; i++) {
+            dump_append(dc, "\"");
+            dump_append(dc, rb_id2name(flags[i]));
+            dump_append(dc, "\":true");
+            if (i != n-1) dump_append(dc, ", ");
+        }
+        dump_append(dc, "}");
     }
 
-    dump_append(dc, "}");
-    dc->roots++;
+    dump_append(dc, "}\n");
 }
 
 static int
@@ -327,10 +514,15 @@ heap_i(void *vstart, void *vend, size_t stride, void *data)
     struct dump_config *dc = (struct dump_config *)data;
     VALUE v = (VALUE)vstart;
     for (; v != (VALUE)vend; v += stride) {
-	if (RBASIC(v)->flags && v != dc->string) {
-	    if (dc->roots++) dump_append(dc, ",\n");
-	    dump_object(v, dc, 1);
-	}
+        void *ptr = asan_poisoned_object_p(v);
+        asan_unpoison_object(v, false);
+
+	if (dc->full_heap || RBASIC(v)->flags)
+	    dump_object(v, dc);
+
+        if (ptr) {
+            asan_poison_object(v);
+        }
     }
     return 0;
 }
@@ -341,153 +533,101 @@ root_obj_i(const char *category, VALUE obj, void *data)
     struct dump_config *dc = (struct dump_config *)data;
 
     if (dc->root_category != NULL && category != dc->root_category)
-	dump_append(dc, "]},\n");
+        dump_append(dc, "]}\n");
     if (dc->root_category == NULL || category != dc->root_category) {
-	dump_append(dc, "\"%p\":", (void *)obj);
-	dump_append(dc, "{\"type\":\"ROOT\", \"root\":\"%s\", \"references\":[\"%p\"", category, (void *)obj);
+        dump_append(dc, "{\"type\":\"ROOT\", \"root\":\"");
+        dump_append(dc, category);
+        dump_append(dc, "\", \"references\":[");
+        dump_append_ref(dc, obj);
+    }
+    else {
+        dump_append(dc, ", ");
+        dump_append_ref(dc, obj);
     }
-    else
-	dump_append(dc, ", \"%p\"", (void *)obj);
 
     dc->root_category = category;
-    dc->roots++;
+    dc->roots = 1;
 }
 
-static VALUE
-dump_output(struct dump_config *dc, VALUE opts, VALUE output, const char *filename)
+static void
+dump_output(struct dump_config *dc, VALUE output, VALUE full, VALUE since)
 {
-    VALUE tmp;
 
-    if (RTEST(opts))
-	output = rb_hash_aref(opts, sym_output);
+    dc->full_heap = 0;
+    dc->buffer_len = 0;
 
-    if (output == sym_stdout) {
-	dc->stream = stdout;
-	dc->string = Qnil;
-    }
-    else if (output == sym_file) {
-	rb_io_t *fptr;
-	rb_require("tempfile");
-	tmp = rb_assoc_new(rb_str_new_cstr(filename), rb_str_new_cstr(".json"));
-	tmp = rb_funcallv(rb_path2class("Tempfile"), rb_intern("create"), 1, &tmp);
-      io:
-	dc->string = rb_io_get_write_io(tmp);
-	rb_io_flush(dc->string);
-	GetOpenFile(dc->string, fptr);
-	dc->stream = rb_io_stdio_file(fptr);
-    }
-    else if (output == sym_string) {
-	dc->string = rb_str_new_cstr("");
+    if (TYPE(output) == T_STRING) {
+        dc->stream = Qfalse;
+        dc->string = output;
+    } else {
+        dc->stream = output;
+        dc->string = Qfalse;
     }
-    else if (!NIL_P(tmp = rb_io_check_io(output))) {
-	output = sym_file;
-	goto io;
+
+    if (full == Qtrue) {
+        dc->full_heap = 1;
     }
-    else {
-	rb_raise(rb_eArgError, "wrong output option: %"PRIsVALUE, output);
+
+    if (RTEST(since)) {
+        dc->partial_dump = 1;
+        dc->since = NUM2SIZET(since);
+    } else {
+        dc->partial_dump = 0;
     }
-    return output;
 }
 
 static VALUE
-dump_result(struct dump_config *dc, VALUE output)
+dump_result(struct dump_config *dc)
 {
-    if (output == sym_string) {
-	return rb_str_resurrect(dc->string);
-    }
-    else if (output == sym_file) {
-	rb_io_flush(dc->string);
-	return dc->string;
-    }
-    else {
-	return Qnil;
+    dump_flush(dc);
+
+    if (dc->string) {
+        return dc->string;
+    } else {
+        rb_io_flush(dc->stream);
+        return dc->stream;
     }
 }
 
-/*
- *  call-seq:
- *    ObjectSpace.dump(obj[, output: :string]) # => "{ ... }"
- *    ObjectSpace.dump(obj, output: :file)     # => #<File:/tmp/rubyobj20131125-88733-1xkfmpv.json>
- *    ObjectSpace.dump(obj, output: :stdout)   # => nil
- *
- *  Dump the contents of a ruby object as JSON.
- *
- *  This method is only expected to work with C Ruby.
- *  This is an experimental method and is subject to change.
- *  In particular, the function signature and output format are
- *  not guaranteed to be compatible in future versions of ruby.
- */
-
 static VALUE
-objspace_dump(int argc, VALUE *argv, VALUE os)
+objspace_dump(VALUE os, VALUE obj, VALUE output)
 {
-    static const char filename[] = "rubyobj";
-    VALUE obj = Qnil, opts = Qnil, output;
     struct dump_config dc = {0,};
+    dump_output(&dc, output, Qnil, Qnil);
 
-    rb_scan_args(argc, argv, "1:", &obj, &opts);
-
-    output = dump_output(&dc, opts, sym_string, filename);
-
-    dump_object(obj, &dc, 0);
-    if (dc.roots) dump_append(&dc, "\n");
+    dump_object(obj, &dc);
 
-    return dump_result(&dc, output);
+    return dump_result(&dc);
 }
 
-/*
- *  call-seq:
- *    ObjectSpace.dump_all([output: :file]) # => #<File:/tmp/rubyheap20131125-88469-laoj3v.json>
- *    ObjectSpace.dump_all(output: :stdout) # => nil
- *    ObjectSpace.dump_all(output: :string) # => "{...}\n{...}\n..."
- *    ObjectSpace.dump_all(output:
- *      File.open('heap.json','w'))         # => #<File:heap.json>
- *
- *  Dump the contents of the ruby heap as JSON.
- *
- *  This method is only expected to work with C Ruby.
- *  This is an experimental method and is subject to change.
- *  In particular, the function signature and output format are
- *  not guaranteed to be compatible in future versions of ruby.
- */
-
 static VALUE
-objspace_dump_all(int argc, VALUE *argv, VALUE os)
+objspace_dump_all(VALUE os, VALUE output, VALUE full, VALUE since)
 {
-    static const char filename[] = "rubyheap";
-    VALUE opts = Qnil, output;
     struct dump_config dc = {0,};
+    dump_output(&dc, output, full, since);
 
-    rb_scan_args(argc, argv, "0:", &opts);
-
-    output = dump_output(&dc, opts, sym_file, filename);
-
-    dump_append(&dc, "{\n");
-    /* dump roots */
-    rb_objspace_reachable_objects_from_root(root_obj_i, &dc);
-    if (dc.roots) dump_append(&dc, "]}");
+    if (!dc.partial_dump || dc.since == 0) {
+        /* dump roots */
+        rb_objspace_reachable_objects_from_root(root_obj_i, &dc);
+        if (dc.roots) dump_append(&dc, "]}\n");
+    }
 
     /* dump all objects */
     rb_objspace_each_objects(heap_i, &dc);
-    dump_append(&dc, "\n}");
 
-    return dump_result(&dc, output);
+    return dump_result(&dc);
 }
 
 void
 Init_objspace_dump(VALUE rb_mObjSpace)
 {
+#undef rb_intern
 #if 0
     rb_mObjSpace = rb_define_module("ObjectSpace"); /* let rdoc know */
 #endif
 
-    rb_define_module_function(rb_mObjSpace, "dump", objspace_dump, -1);
-    rb_define_module_function(rb_mObjSpace, "dump_all", objspace_dump_all, -1);
-
-    sym_output = ID2SYM(rb_intern("output"));
-    sym_stdout = ID2SYM(rb_intern("stdout"));
-    sym_string = ID2SYM(rb_intern("string"));
-    sym_file   = ID2SYM(rb_intern("file"));
+    rb_define_module_function(rb_mObjSpace, "_dump", objspace_dump, 2);
+    rb_define_module_function(rb_mObjSpace, "_dump_all", objspace_dump_all, 3);
 
     /* force create static IDs */
     rb_obj_gc_flags(rb_mObjSpace, 0, 0);
diff --git a/ext/openssl/History.md b/ext/openssl/History.md
new file mode 100644
index 0000000000..60b9dd8825
--- /dev/null
+++ b/ext/openssl/History.md
@@ -0,0 +1,485 @@
+Version 2.2.2
+=============
+
+Merged changes in 2.1.4.
+
+
+Version 2.2.1
+=============
+
+Merged changes in 2.1.3. Additionally, the following issues are fixed by this
+release.
+
+Bug fixes
+---------
+
+* Fix crash in `OpenSSL::Timestamp::{Request,Response,TokenInfo}.new` when
+  invalid arguments are given.
+  [[GitHub #407]](https://github.com/ruby/openssl/pull/407)
+* Fix `OpenSSL::Timestamp::Factory#create_timestamp` with LibreSSL on platforms
+  where `time_t` has a different size from `long`.
+  [[GitHub #454]](https://github.com/ruby/openssl/pull/454)
+
+
+Version 2.2.0
+=============
+
+Compatibility notes
+-------------------
+
+* Remove unsupported MDC2, DSS, DSS1, and SHA algorithms.
+* Remove `OpenSSL::PKCS7::SignerInfo#name` alias for `#issuer`.
+  [[GitHub #266]](https://github.com/ruby/openssl/pull/266)
+* Deprecate `OpenSSL::Config#add_value` and `#[]=` for future removal.
+  [[GitHub #322]](https://github.com/ruby/openssl/pull/322)
+
+
+Notable changes
+---------------
+
+* Change default `OpenSSL::SSL::SSLServer#listen` backlog argument from
+  5 to `Socket::SOMAXCONN`.
+  [[GitHub #286]](https://github.com/ruby/openssl/issues/286)
+* Make `OpenSSL::HMAC#==` use a timing safe string comparison.
+  [[GitHub #284]](https://github.com/ruby/openssl/pull/284)
+* Add support for SHA3 and BLAKE digests.
+  [[GitHub #282]](https://github.com/ruby/openssl/pull/282)
+* Add `OpenSSL::SSL::SSLSocket.open` for opening a `TCPSocket` and
+  returning an `OpenSSL::SSL::SSLSocket` for it.
+  [[GitHub #225]](https://github.com/ruby/openssl/issues/225)
+* Support marshalling of `OpenSSL::X509` and `OpenSSL::PKey` objects.
+  [[GitHub #281]](https://github.com/ruby/openssl/pull/281)
+  [[GitHub #363]](https://github.com/ruby/openssl/pull/363)
+* Add `OpenSSL.secure_compare` for timing safe string comparison for
+  strings of possibly unequal length.
+  [[GitHub #280]](https://github.com/ruby/openssl/pull/280)
+* Add `OpenSSL.fixed_length_secure_compare` for timing safe string
+  comparison for strings of equal length.
+  [[GitHub #269]](https://github.com/ruby/openssl/pull/269)
+* Add `OpenSSL::SSL::SSLSocket#{finished_message,peer_finished_message}`
+  for last finished message sent and received.
+  [[GitHub #250]](https://github.com/ruby/openssl/pull/250)
+* Add `OpenSSL::Timestamp` module for handing timestamp requests and
+  responses.
+  [[GitHub #204]](https://github.com/ruby/openssl/pull/204)
+* Add helper methods for `OpenSSL::X509::Certificate`:
+  `find_extension`, `subject_key_identifier`,
+  `authority_key_identifier`, `crl_uris`, `ca_issuer_uris` and
+  `ocsp_uris`, and for `OpenSSL::X509::CRL`:
+  `find_extension` and `subject_key_identifier`.
+  [[GitHub #260]](https://github.com/ruby/openssl/pull/260)
+  [[GitHub #275]](https://github.com/ruby/openssl/pull/275)
+  [[GitHub #293]](https://github.com/ruby/openssl/pull/293)
+* Add `OpenSSL::ECPoint#add` for performing elliptic curve point addition.
+  [[GitHub #261]](https://github.com/ruby/openssl/pull/261)
+* Make `OpenSSL::PKey::RSA#{export,to_der}` check `key`, `factors`, and
+  `crt_params` to do proper private key serialization.
+  [[GitHub #258]](https://github.com/ruby/openssl/pull/258)
+* Add `OpenSSL::SSL::{SSLSocket,SSLServer}#fileno`, returning the
+  underlying socket file descriptor number.
+  [[GitHub #247]](https://github.com/ruby/openssl/pull/247)
+* Support client certificates with TLS 1.3, and support post-handshake
+  authentication with OpenSSL 1.1.1+.
+  [[GitHub #239]](https://github.com/ruby/openssl/pull/239)
+* Add `OpenSSL::ASN1::ObjectId#==` for equality testing.
+* Add `OpenSSL::X509::Extension#value_der` for the raw value of
+  the extension.
+  [[GitHub #234]](https://github.com/ruby/openssl/pull/234)
+* Significantly reduce allocated memory in `OpenSSL::Buffering#do_write`.
+  [[GitHub #212]](https://github.com/ruby/openssl/pull/212)
+* Ensure all valid IPv6 addresses are considered valid as elements
+  of subjectAlternativeName in certificates.
+  [[GitHub #185]](https://github.com/ruby/openssl/pull/185)
+* Allow recipient's certificate to be omitted in PCKS7#decrypt.
+  [[GitHub #183]](https://github.com/ruby/openssl/pull/183)
+* Add support for reading keys in PKCS #8 format and export via instance methods
+  added to `OpenSSL::PKey` classes: `private_to_der`, `private_to_pem`,
+  `public_to_der` and `public_to_pem`.
+  [[GitHub #297]](https://github.com/ruby/openssl/pull/297)
+
+
+Version 2.1.4
+=============
+
+Bug fixes
+---------
+
+* Do not use pkg-config if --with-openssl-dir option is specified.
+ [[GitHub #486]](https://github.com/ruby/openssl/pull/486)
+
+
+Version 2.1.3
+=============
+
+Bug fixes
+---------
+
+* Fix deprecation warnings on Ruby 3.0.
+* Add ".include" directive support in `OpenSSL::Config`.
+  [[GitHub #216]](https://github.com/ruby/openssl/pull/216)
+* Fix handling of IPv6 address SANs.
+  [[GitHub #185]](https://github.com/ruby/openssl/pull/185)
+* Hostname verification failure with `OpenSSL::SSL::SSLContext#verify_hostname=`
+  sets a proper error code.
+  [[GitHub #350]](https://github.com/ruby/openssl/pull/350)
+* Fix crash with `OpenSSL::BN.new(nil, 2)`.
+  [[Bug #15760]](https://bugs.ruby-lang.org/issues/15760)
+* `OpenSSL::SSL::SSLSocket#sys{read,write}` prevent internal string buffers from
+  being modified by another thread.
+  [[GitHub #453]](https://github.com/ruby/openssl/pull/453)
+* Fix misuse of input record separator in `OpenSSL::Buffering` where it was
+  for output.
+* Fix wrong interger casting in `OpenSSL::PKey::EC#dsa_verify_asn1`.
+  [[GitHub #460]](https://github.com/ruby/openssl/pull/460)
+* `extconf.rb` explicitly checks that OpenSSL's version number is 1.0.1 or
+  newer but also less than 3.0. Ruby/OpenSSL v2.1.x and v2.2.x will not support
+  OpenSSL 3.0 API.
+  [[GitHub #458]](https://github.com/ruby/openssl/pull/458)
+* Activate `digest` gem correctly. `digest` library could go into an
+  inconsistent state if there are multiple versions of `digest` is installed
+  and `openssl` is `require`d before `digest`.
+  [[GitHub #463]](https://github.com/ruby/openssl/pull/463)
+* Fix GC.compact compatibility.
+  [[GitHub #464]](https://github.com/ruby/openssl/issues/464)
+  [[GitHub #465]](https://github.com/ruby/openssl/pull/465)
+
+
+Version 2.1.2
+=============
+
+Merged changes in 2.0.9.
+
+
+Version 2.1.1
+=============
+
+Merged changes in 2.0.8.
+
+
+Version 2.1.0
+=============
+
+Notable changes
+---------------
+
+* Support for OpenSSL versions before 1.0.1 and LibreSSL versions before 2.5
+  is removed.
+  [[GitHub #86]](https://github.com/ruby/openssl/pull/86)
+* OpenSSL::BN#negative?, #+@, and #-@ are added.
+* OpenSSL::SSL::SSLSocket#connect raises a more informative exception when
+  certificate verification fails.
+  [[GitHub #99]](https://github.com/ruby/openssl/pull/99)
+* OpenSSL::KDF module is newly added. In addition to PBKDF2-HMAC that has moved
+  from OpenSSL::PKCS5, scrypt and HKDF are supported.
+  [[GitHub #109]](https://github.com/ruby/openssl/pull/109)
+  [[GitHub #173]](https://github.com/ruby/openssl/pull/173)
+* OpenSSL.fips_mode is added. We had the setter, but not the getter.
+  [[GitHub #125]](https://github.com/ruby/openssl/pull/125)
+* OpenSSL::OCSP::Request#signed? is added.
+* OpenSSL::ASN1 handles the indefinite length form better. OpenSSL::ASN1.decode
+  no longer wrongly treats the end-of-contents octets as part of the content.
+  OpenSSL::ASN1::ASN1Data#infinite_length is renamed to #indefinite_length.
+  [[GitHub #98]](https://github.com/ruby/openssl/pull/98)
+* OpenSSL::X509::Name#add_entry now accepts two additional keyword arguments
+  'loc' and 'set'.
+  [[GitHub #94]](https://github.com/ruby/openssl/issues/94)
+* OpenSSL::SSL::SSLContext#min_version= and #max_version= are added to replace
+  #ssl_version= that was built on top of the deprecated OpenSSL C API. Use of
+  that method and the constant OpenSSL::SSL::SSLContext::METHODS is now
+  deprecated.
+  [[GitHub #142]](https://github.com/ruby/openssl/pull/142)
+* OpenSSL::X509::Name#to_utf8 is added.
+  [[GitHub #26]](https://github.com/ruby/openssl/issues/26)
+  [[GitHub #143]](https://github.com/ruby/openssl/pull/143)
+* OpenSSL::X509::{Extension,Attribute,Certificate,CRL,Revoked,Request} can be
+  compared with == operator.
+  [[GitHub #161]](https://github.com/ruby/openssl/pull/161)
+* TLS Fallback Signaling Cipher Suite Value (SCSV) support is added.
+  [[GitHub #165]](https://github.com/ruby/openssl/pull/165)
+* Build failure with OpenSSL 1.1 built with no-deprecated is fixed.
+  [[GitHub #160]](https://github.com/ruby/openssl/pull/160)
+* OpenSSL::Buffering#write accepts an arbitrary number of arguments.
+  [[Feature #9323]](https://bugs.ruby-lang.org/issues/9323)
+  [[GitHub #162]](https://github.com/ruby/openssl/pull/162)
+* OpenSSL::PKey::RSA#sign_pss and #verify_pss are added. They perform RSA-PSS
+  signature and verification.
+  [[GitHub #75]](https://github.com/ruby/openssl/issues/75)
+  [[GitHub #76]](https://github.com/ruby/openssl/pull/76)
+  [[GitHub #169]](https://github.com/ruby/openssl/pull/169)
+* OpenSSL::SSL::SSLContext#add_certificate is added.
+  [[GitHub #167]](https://github.com/ruby/openssl/pull/167)
+* OpenSSL::PKey::EC::Point#to_octet_string is added.
+  OpenSSL::PKey::EC::Point.new can now take String as the second argument.
+  [[GitHub #177]](https://github.com/ruby/openssl/pull/177)
+
+
+Version 2.0.9
+=============
+
+Security fixes
+--------------
+
+* OpenSSL::X509::Name#<=> could incorrectly return 0 (= equal) for non-equal
+  objects. CVE-2018-16395 is assigned for this issue.
+  https://hackerone.com/reports/387250
+
+Bug fixes
+---------
+
+* Fixed OpenSSL::PKey::*.{new,generate} immediately aborting if the thread is
+  interrupted.
+  [[Bug #14882]](https://bugs.ruby-lang.org/issues/14882)
+  [[GitHub #205]](https://github.com/ruby/openssl/pull/205)
+* Fixed OpenSSL::X509::Name#to_s failing with OpenSSL::X509::NameError if
+  called against an empty instance.
+  [[GitHub #200]](https://github.com/ruby/openssl/issues/200)
+  [[GitHub #211]](https://github.com/ruby/openssl/pull/211)
+
+
+Version 2.0.8
+=============
+
+Bug fixes
+---------
+
+* OpenSSL::Cipher#pkcs5_keyivgen raises an error when a negative iteration
+  count is given.
+  [[GitHub #184]](https://github.com/ruby/openssl/pull/184)
+* Fixed build with LibreSSL 2.7.
+  [[GitHub #192]](https://github.com/ruby/openssl/issues/192)
+  [[GitHub #193]](https://github.com/ruby/openssl/pull/193)
+
+
+Version 2.0.7
+=============
+
+Bug fixes
+---------
+
+* OpenSSL::Cipher#auth_data= could segfault if called against a non-AEAD cipher.
+  [[Bug #14024]](https://bugs.ruby-lang.org/issues/14024)
+* OpenSSL::X509::Certificate#public_key= (and similar methods) could segfault
+  when an instance of OpenSSL::PKey::PKey with no public key components is
+  passed.
+  [[Bug #14087]](https://bugs.ruby-lang.org/issues/14087)
+  [[GitHub #168]](https://github.com/ruby/openssl/pull/168)
+
+
+Version 2.0.6
+=============
+
+Bug fixes
+---------
+
+* The session_remove_cb set to an OpenSSL::SSL::SSLContext is no longer called
+  during GC.
+* A possible deadlock in OpenSSL::SSL::SSLSocket#sysread is fixed.
+  [[GitHub #139]](https://github.com/ruby/openssl/pull/139)
+* OpenSSL::BN#hash could return an unnormalized fixnum value on Windows.
+  [[Bug #13877]](https://bugs.ruby-lang.org/issues/13877)
+* OpenSSL::SSL::SSLSocket#sysread and #sysread_nonblock set the length of the
+  destination buffer String to 0 on error.
+  [[GitHub #153]](https://github.com/ruby/openssl/pull/153)
+* Possible deadlock is fixed. This happened only when built with older versions
+  of OpenSSL (before 1.1.0) or LibreSSL.
+  [[GitHub #155]](https://github.com/ruby/openssl/pull/155)
+
+
+Version 2.0.5
+=============
+
+Bug fixes
+---------
+
+* Reading a PEM/DER-encoded private key or certificate from an IO object did
+  not work properly on mswin platforms.
+  [[ruby/openssl#128]](https://github.com/ruby/openssl/issues/128)
+* Broken length check in the PEM passphrase callback is fixed.
+* It failed to compile when OpenSSL is configured without TLS 1.0 support.
+
+
+Version 2.0.4
+=============
+
+Bug fixes
+---------
+
+* It now compiles with LibreSSL without renaming on Windows (mswin).
+* A workaround for the error queue leak of X509_load_cert_crl_file() that
+  causes random errors is added.
+  [[Bug #11033]](https://bugs.ruby-lang.org/issues/11033)
+
+
+Version 2.0.3
+=============
+
+Bug fixes
+---------
+
+* OpenSSL::ASN1::Constructive#each which was broken by 2.0.0 is fixed.
+  [[ruby/openssl#96]](https://github.com/ruby/openssl/pull/96)
+* Fixed build with static OpenSSL libraries on Windows.
+  [[Bug #13080]](https://bugs.ruby-lang.org/issues/13080)
+* OpenSSL::X509::Name#eql? which was broken by 2.0.0 is fixed.
+
+
+Version 2.0.2
+=============
+
+Bug fixes
+---------
+
+* Fix build with early 0.9.8 series which did not have SSL_CTX_clear_options().
+  [ruby-core:78693]
+
+
+Version 2.0.1
+=============
+
+Bug fixes
+---------
+
+* A GC issue around OpenSSL::BN is fixed.
+  [[ruby/openssl#87]](https://github.com/ruby/openssl/issues/87)
+* OpenSSL::ASN1 now parses BER encoding of GeneralizedTime without seconds.
+  [[ruby/openssl#88]](https://github.com/ruby/openssl/pull/88)
+
+
+Version 2.0.0
+=============
+
+This is the first release of openssl gem, formerly a standard library of Ruby,
+ext/openssl. This is the successor of the version included in Ruby 2.3.
+
+Compatibility notes
+-------------------
+
+* Support for OpenSSL version 0.9.6 and 0.9.7 is completely removed. openssl gem
+  still works with OpenSSL 0.9.8, but users are strongly encouraged to upgrade
+  to at least 1.0.1, as OpenSSL < 1.0.1 will not receive any security fixes from
+  the OpenSSL development team.
+
+Supported platforms
+-------------------
+
+* OpenSSL 1.0.0, 1.0.1, 1.0.2, 1.1.0
+* OpenSSL < 0.9.8 is no longer supported.
+* LibreSSL 2.3, 2.4, 2.5
+* Ruby 2.3, 2.4
+
+Notable changes
+---------------
+
+* Add support for OpenSSL 1.1.0.
+  [[Feature #12324]](https://bugs.ruby-lang.org/issues/12324)
+* Add support for LibreSSL
+
+* OpenSSL::Cipher
+
+  - OpenSSL::Cipher#key= and #iv= reject too long inputs. They used to truncate
+    silently. [[Bug #12561]](https://bugs.ruby-lang.org/issues/12561)
+
+  - OpenSSL::Cipher#iv_len= is added. It allows changing IV (nonce) length if
+    using AEAD ciphers.
+    [[Bug #8667]](https://bugs.ruby-lang.org/issues/8667),
+    [[Bug #10420]](https://bugs.ruby-lang.org/issues/10420),
+    [[GH ruby/ruby#569]](https://github.com/ruby/ruby/pull/569),
+    [[GH ruby/openssl#58]](https://github.com/ruby/openssl/pull/58)
+
+  - OpenSSL::Cipher#auth_tag_len= is added. This sets the authentication tag
+    length to be generated by an AEAD cipher.
+
+* OpenSSL::OCSP
+
+  - Accessor methods are added to OpenSSL::OCSP::CertificateId.
+    [[Feature #7181]](https://bugs.ruby-lang.org/issues/7181)
+
+  - OpenSSL::OCSP::Request and BasicResponse can be signed with non-SHA-1 hash
+    algorithm. [[Feature #11552]](https://bugs.ruby-lang.org/issues/11552)
+
+  - OpenSSL::OCSP::CertificateId and BasicResponse can be encoded into DER.
+
+  - A new class OpenSSL::OCSP::SingleResponse is added for convenience.
+
+  - OpenSSL::OCSP::BasicResponse#add_status accepts absolute times. They used to
+    accept only relative seconds from the current time.
+
+* OpenSSL::PKey
+
+  - OpenSSL::PKey::EC follows the general PKey interface.
+    [[Bug #6567]](https://bugs.ruby-lang.org/issues/6567)
+
+  - OpenSSL::PKey.read raises OpenSSL::PKey::PKeyError instead of ArgumentError
+    for consistency with OpenSSL::PKey::{DH,DSA,RSA,EC}#new.
+    [[Bug #11774]](https://bugs.ruby-lang.org/issues/11774),
+    [[GH ruby/openssl#55]](https://github.com/ruby/openssl/pull/55)
+
+  - OpenSSL::PKey::EC::Group retrieved by OpenSSL::PKey::EC#group is no longer
+    linked with the EC key. Modifications to the EC::Group have no effect on the
+    key. [[GH ruby/openssl#71]](https://github.com/ruby/openssl/pull/71)
+
+  - OpenSSL::PKey::EC::Point#to_bn allows specifying the point conversion form
+    by the optional argument.
+
+* OpenSSL::SSL
+
+  - OpenSSL::SSL::SSLSocket#tmp_key is added. A client can call it after the
+    connection is established to retrieve the ephemeral key.
+    [[GH ruby/ruby#1318]](https://github.com/ruby/ruby/pull/1318)
+
+  - The automatic ephemeral ECDH curve selection is enabled by default when
+    built with OpenSSL >= 1.0.2 or LibreSSL.
+
+  - OpenSSL::SSL::SSLContext#security_level= is added. You can set the "security
+    level" of the SSL context. This is effective only when built with OpenSSL
+    1.1.0.
+
+  - A new option 'verify_hostname' is added to OpenSSL::SSL::SSLContext. When it
+    is enabled, and the SNI hostname is also set, the hostname verification on
+    the server certificate is automatically performed. It is now enabled by
+    OpenSSL::SSL::SSLContext#set_params.
+    [[GH ruby/openssl#60]](https://github.com/ruby/openssl/pull/60)
+
+Removals
+--------
+
+* OpenSSL::Engine
+
+  - OpenSSL::Engine.cleanup does nothing when built with OpenSSL 1.1.0.
+
+* OpenSSL::SSL
+
+  - OpenSSL::PKey::DH::DEFAULT_512 is removed. Hence servers no longer use
+    512-bit DH group by default. It is considered too weak nowadays.
+    [[Bug #11968]](https://bugs.ruby-lang.org/issues/11968),
+    [[GH ruby/ruby#1196]](https://github.com/ruby/ruby/pull/1196)
+
+  - RC4 cipher suites are removed from OpenSSL::SSL::SSLContext::DEFAULT_PARAMS.
+    RC4 is now considered to be weak.
+    [[GH ruby/openssl#50]](https://github.com/ruby/openssl/pull/50)
+
+Deprecations
+------------
+
+* OpenSSL::PKey
+
+  - OpenSSL::PKey::RSA#n=, #e=, #d=, #p=, #q=, #dmp1=, #dmq1=, #iqmp=,
+    OpenSSL::PKey::DSA#p=, #q=, #g=, #priv_key=, #pub_key=,
+    OpenSSL::PKey::DH#p=, #g=, #priv_key= and #pub_key= are deprecated. They are
+    disabled when built with OpenSSL 1.1.0, due to its API change. Instead,
+    OpenSSL::PKey::RSA#set_key, #set_factors, #set_crt_params,
+    OpenSSL::PKey::DSA#set_pqg, #set_key, OpenSSL::PKey::DH#set_pqg and #set_key
+    are added.
+
+* OpenSSL::Random
+
+  - OpenSSL::Random.pseudo_bytes is deprecated, and not defined when built with
+    OpenSSL 1.1.0. Use OpenSSL::Random.random_bytes instead.
+
+* OpenSSL::SSL
+
+  - OpenSSL::SSL::SSLContext#tmp_ecdh_callback is deprecated, as the underlying
+    API SSL_CTX_set_tmp_ecdh_callback() is removed in OpenSSL 1.1.0. It was
+    first added in Ruby 2.3.0. To specify the curve to be used in ephemeral
+    ECDH, use OpenSSL::SSL::SSLContext#ecdh_curves=. The automatic curve
+    selection is also now enabled by default when built with a capable OpenSSL.
diff --git a/ext/openssl/depend b/ext/openssl/depend
index 204f3dff26..92825ba0e9 100644
--- a/ext/openssl/depend
+++ b/ext/openssl/depend
@@ -1,22 +1,174 @@
 # AUTOGENERATED DEPENDENCIES START
 openssl_missing.o: $(RUBY_EXTCONF_H)
+openssl_missing.o: $(arch_hdrdir)/ruby/config.h
 openssl_missing.o: openssl_missing.c
 openssl_missing.o: openssl_missing.h
 ossl.o: $(RUBY_EXTCONF_H)
 ossl.o: $(arch_hdrdir)/ruby/config.h
+ossl.o: $(hdrdir)/ruby.h
+ossl.o: $(hdrdir)/ruby/assert.h
 ossl.o: $(hdrdir)/ruby/backward.h
+ossl.o: $(hdrdir)/ruby/backward/2/assume.h
+ossl.o: $(hdrdir)/ruby/backward/2/attributes.h
+ossl.o: $(hdrdir)/ruby/backward/2/bool.h
+ossl.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+ossl.o: $(hdrdir)/ruby/backward/2/inttypes.h
+ossl.o: $(hdrdir)/ruby/backward/2/limits.h
+ossl.o: $(hdrdir)/ruby/backward/2/long_long.h
+ossl.o: $(hdrdir)/ruby/backward/2/stdalign.h
+ossl.o: $(hdrdir)/ruby/backward/2/stdarg.h
 ossl.o: $(hdrdir)/ruby/defines.h
 ossl.o: $(hdrdir)/ruby/encoding.h
 ossl.o: $(hdrdir)/ruby/intern.h
+ossl.o: $(hdrdir)/ruby/internal/anyargs.h
+ossl.o: $(hdrdir)/ruby/internal/arithmetic.h
+ossl.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+ossl.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+ossl.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+ossl.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+ossl.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+ossl.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+ossl.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+ossl.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+ossl.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+ossl.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+ossl.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+ossl.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+ossl.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+ossl.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+ossl.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+ossl.o: $(hdrdir)/ruby/internal/assume.h
+ossl.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+ossl.o: $(hdrdir)/ruby/internal/attr/artificial.h
+ossl.o: $(hdrdir)/ruby/internal/attr/cold.h
+ossl.o: $(hdrdir)/ruby/internal/attr/const.h
+ossl.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+ossl.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+ossl.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+ossl.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+ossl.o: $(hdrdir)/ruby/internal/attr/error.h
+ossl.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+ossl.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+ossl.o: $(hdrdir)/ruby/internal/attr/format.h
+ossl.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+ossl.o: $(hdrdir)/ruby/internal/attr/noalias.h
+ossl.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+ossl.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+ossl.o: $(hdrdir)/ruby/internal/attr/noinline.h
+ossl.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+ossl.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+ossl.o: $(hdrdir)/ruby/internal/attr/pure.h
+ossl.o: $(hdrdir)/ruby/internal/attr/restrict.h
+ossl.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+ossl.o: $(hdrdir)/ruby/internal/attr/warning.h
+ossl.o: $(hdrdir)/ruby/internal/attr/weakref.h
+ossl.o: $(hdrdir)/ruby/internal/cast.h
+ossl.o: $(hdrdir)/ruby/internal/compiler_is.h
+ossl.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+ossl.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+ossl.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+ossl.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+ossl.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+ossl.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+ossl.o: $(hdrdir)/ruby/internal/compiler_since.h
+ossl.o: $(hdrdir)/ruby/internal/config.h
+ossl.o: $(hdrdir)/ruby/internal/constant_p.h
+ossl.o: $(hdrdir)/ruby/internal/core.h
+ossl.o: $(hdrdir)/ruby/internal/core/rarray.h
+ossl.o: $(hdrdir)/ruby/internal/core/rbasic.h
+ossl.o: $(hdrdir)/ruby/internal/core/rbignum.h
+ossl.o: $(hdrdir)/ruby/internal/core/rclass.h
+ossl.o: $(hdrdir)/ruby/internal/core/rdata.h
+ossl.o: $(hdrdir)/ruby/internal/core/rfile.h
+ossl.o: $(hdrdir)/ruby/internal/core/rhash.h
+ossl.o: $(hdrdir)/ruby/internal/core/robject.h
+ossl.o: $(hdrdir)/ruby/internal/core/rregexp.h
+ossl.o: $(hdrdir)/ruby/internal/core/rstring.h
+ossl.o: $(hdrdir)/ruby/internal/core/rstruct.h
+ossl.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+ossl.o: $(hdrdir)/ruby/internal/ctype.h
+ossl.o: $(hdrdir)/ruby/internal/dllexport.h
+ossl.o: $(hdrdir)/ruby/internal/dosish.h
+ossl.o: $(hdrdir)/ruby/internal/error.h
+ossl.o: $(hdrdir)/ruby/internal/eval.h
+ossl.o: $(hdrdir)/ruby/internal/event.h
+ossl.o: $(hdrdir)/ruby/internal/fl_type.h
+ossl.o: $(hdrdir)/ruby/internal/gc.h
+ossl.o: $(hdrdir)/ruby/internal/glob.h
+ossl.o: $(hdrdir)/ruby/internal/globals.h
+ossl.o: $(hdrdir)/ruby/internal/has/attribute.h
+ossl.o: $(hdrdir)/ruby/internal/has/builtin.h
+ossl.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+ossl.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+ossl.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+ossl.o: $(hdrdir)/ruby/internal/has/extension.h
+ossl.o: $(hdrdir)/ruby/internal/has/feature.h
+ossl.o: $(hdrdir)/ruby/internal/has/warning.h
+ossl.o: $(hdrdir)/ruby/internal/intern/array.h
+ossl.o: $(hdrdir)/ruby/internal/intern/bignum.h
+ossl.o: $(hdrdir)/ruby/internal/intern/class.h
+ossl.o: $(hdrdir)/ruby/internal/intern/compar.h
+ossl.o: $(hdrdir)/ruby/internal/intern/complex.h
+ossl.o: $(hdrdir)/ruby/internal/intern/cont.h
+ossl.o: $(hdrdir)/ruby/internal/intern/dir.h
+ossl.o: $(hdrdir)/ruby/internal/intern/enum.h
+ossl.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+ossl.o: $(hdrdir)/ruby/internal/intern/error.h
+ossl.o: $(hdrdir)/ruby/internal/intern/eval.h
+ossl.o: $(hdrdir)/ruby/internal/intern/file.h
+ossl.o: $(hdrdir)/ruby/internal/intern/gc.h
+ossl.o: $(hdrdir)/ruby/internal/intern/hash.h
+ossl.o: $(hdrdir)/ruby/internal/intern/io.h
+ossl.o: $(hdrdir)/ruby/internal/intern/load.h
+ossl.o: $(hdrdir)/ruby/internal/intern/marshal.h
+ossl.o: $(hdrdir)/ruby/internal/intern/numeric.h
+ossl.o: $(hdrdir)/ruby/internal/intern/object.h
+ossl.o: $(hdrdir)/ruby/internal/intern/parse.h
+ossl.o: $(hdrdir)/ruby/internal/intern/proc.h
+ossl.o: $(hdrdir)/ruby/internal/intern/process.h
+ossl.o: $(hdrdir)/ruby/internal/intern/random.h
+ossl.o: $(hdrdir)/ruby/internal/intern/range.h
+ossl.o: $(hdrdir)/ruby/internal/intern/rational.h
+ossl.o: $(hdrdir)/ruby/internal/intern/re.h
+ossl.o: $(hdrdir)/ruby/internal/intern/ruby.h
+ossl.o: $(hdrdir)/ruby/internal/intern/select.h
+ossl.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl.o: $(hdrdir)/ruby/internal/intern/signal.h
+ossl.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+ossl.o: $(hdrdir)/ruby/internal/intern/string.h
+ossl.o: $(hdrdir)/ruby/internal/intern/struct.h
+ossl.o: $(hdrdir)/ruby/internal/intern/thread.h
+ossl.o: $(hdrdir)/ruby/internal/intern/time.h
+ossl.o: $(hdrdir)/ruby/internal/intern/variable.h
+ossl.o: $(hdrdir)/ruby/internal/intern/vm.h
+ossl.o: $(hdrdir)/ruby/internal/interpreter.h
+ossl.o: $(hdrdir)/ruby/internal/iterator.h
+ossl.o: $(hdrdir)/ruby/internal/memory.h
+ossl.o: $(hdrdir)/ruby/internal/method.h
+ossl.o: $(hdrdir)/ruby/internal/module.h
+ossl.o: $(hdrdir)/ruby/internal/newobj.h
+ossl.o: $(hdrdir)/ruby/internal/rgengc.h
+ossl.o: $(hdrdir)/ruby/internal/scan_args.h
+ossl.o: $(hdrdir)/ruby/internal/special_consts.h
+ossl.o: $(hdrdir)/ruby/internal/static_assert.h
+ossl.o: $(hdrdir)/ruby/internal/stdalign.h
+ossl.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl.o: $(hdrdir)/ruby/internal/symbol.h
+ossl.o: $(hdrdir)/ruby/internal/token_paste.h
+ossl.o: $(hdrdir)/ruby/internal/value.h
+ossl.o: $(hdrdir)/ruby/internal/value_type.h
+ossl.o: $(hdrdir)/ruby/internal/variable.h
+ossl.o: $(hdrdir)/ruby/internal/warning_push.h
+ossl.o: $(hdrdir)/ruby/internal/xmalloc.h
 ossl.o: $(hdrdir)/ruby/io.h
 ossl.o: $(hdrdir)/ruby/missing.h
+ossl.o: $(hdrdir)/ruby/onigmo.h
 ossl.o: $(hdrdir)/ruby/oniguruma.h
 ossl.o: $(hdrdir)/ruby/ruby.h
 ossl.o: $(hdrdir)/ruby/st.h
 ossl.o: $(hdrdir)/ruby/subst.h
 ossl.o: $(hdrdir)/ruby/thread.h
 ossl.o: $(hdrdir)/ruby/thread_native.h
-ossl.o: $(top_srcdir)/include/ruby.h
 ossl.o: openssl_missing.h
 ossl.o: ossl.c
 ossl.o: ossl.h
@@ -28,31 +180,182 @@ ossl.o: ossl_config.h
 ossl.o: ossl_digest.h
 ossl.o: ossl_engine.h
 ossl.o: ossl_hmac.h
+ossl.o: ossl_kdf.h
 ossl.o: ossl_ns_spki.h
 ossl.o: ossl_ocsp.h
 ossl.o: ossl_pkcs12.h
-ossl.o: ossl_pkcs5.h
 ossl.o: ossl_pkcs7.h
 ossl.o: ossl_pkey.h
 ossl.o: ossl_rand.h
 ossl.o: ossl_ssl.h
-ossl.o: ossl_version.h
+ossl.o: ossl_ts.h
 ossl.o: ossl_x509.h
 ossl.o: ruby_missing.h
 ossl_asn1.o: $(RUBY_EXTCONF_H)
 ossl_asn1.o: $(arch_hdrdir)/ruby/config.h
+ossl_asn1.o: $(hdrdir)/ruby.h
+ossl_asn1.o: $(hdrdir)/ruby/assert.h
 ossl_asn1.o: $(hdrdir)/ruby/backward.h
+ossl_asn1.o: $(hdrdir)/ruby/backward/2/assume.h
+ossl_asn1.o: $(hdrdir)/ruby/backward/2/attributes.h
+ossl_asn1.o: $(hdrdir)/ruby/backward/2/bool.h
+ossl_asn1.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+ossl_asn1.o: $(hdrdir)/ruby/backward/2/inttypes.h
+ossl_asn1.o: $(hdrdir)/ruby/backward/2/limits.h
+ossl_asn1.o: $(hdrdir)/ruby/backward/2/long_long.h
+ossl_asn1.o: $(hdrdir)/ruby/backward/2/stdalign.h
+ossl_asn1.o: $(hdrdir)/ruby/backward/2/stdarg.h
 ossl_asn1.o: $(hdrdir)/ruby/defines.h
 ossl_asn1.o: $(hdrdir)/ruby/encoding.h
 ossl_asn1.o: $(hdrdir)/ruby/intern.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/anyargs.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/arithmetic.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/assume.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/attr/artificial.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/attr/cold.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/attr/const.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/attr/error.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/attr/format.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/attr/noalias.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/attr/noinline.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/attr/pure.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/attr/restrict.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/attr/warning.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/attr/weakref.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/cast.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/compiler_is.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/compiler_since.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/config.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/constant_p.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/core.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/core/rarray.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/core/rbasic.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/core/rbignum.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/core/rclass.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/core/rdata.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/core/rfile.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/core/rhash.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/core/robject.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/core/rregexp.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/core/rstring.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/core/rstruct.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/ctype.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/dllexport.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/dosish.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/error.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/eval.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/event.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/fl_type.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/gc.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/glob.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/globals.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/has/attribute.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/has/builtin.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/has/extension.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/has/feature.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/has/warning.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/intern/array.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/intern/bignum.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/intern/class.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/intern/compar.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/intern/complex.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/intern/cont.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/intern/dir.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/intern/enum.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/intern/error.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/intern/eval.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/intern/file.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/intern/gc.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/intern/hash.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/intern/io.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/intern/load.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/intern/marshal.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/intern/numeric.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/intern/object.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/intern/parse.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/intern/proc.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/intern/process.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/intern/random.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/intern/range.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/intern/rational.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/intern/re.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/intern/ruby.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/intern/select.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/intern/signal.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/intern/string.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/intern/struct.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/intern/thread.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/intern/time.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/intern/variable.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/intern/vm.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/interpreter.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/iterator.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/memory.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/method.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/module.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/newobj.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/rgengc.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/scan_args.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/special_consts.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/static_assert.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/stdalign.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/symbol.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/token_paste.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/value.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/value_type.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/variable.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/warning_push.h
+ossl_asn1.o: $(hdrdir)/ruby/internal/xmalloc.h
 ossl_asn1.o: $(hdrdir)/ruby/io.h
 ossl_asn1.o: $(hdrdir)/ruby/missing.h
+ossl_asn1.o: $(hdrdir)/ruby/onigmo.h
 ossl_asn1.o: $(hdrdir)/ruby/oniguruma.h
 ossl_asn1.o: $(hdrdir)/ruby/ruby.h
 ossl_asn1.o: $(hdrdir)/ruby/st.h
 ossl_asn1.o: $(hdrdir)/ruby/subst.h
 ossl_asn1.o: $(hdrdir)/ruby/thread.h
-ossl_asn1.o: $(top_srcdir)/include/ruby.h
 ossl_asn1.o: openssl_missing.h
 ossl_asn1.o: ossl.h
 ossl_asn1.o: ossl_asn1.c
@@ -64,31 +367,182 @@ ossl_asn1.o: ossl_config.h
 ossl_asn1.o: ossl_digest.h
 ossl_asn1.o: ossl_engine.h
 ossl_asn1.o: ossl_hmac.h
+ossl_asn1.o: ossl_kdf.h
 ossl_asn1.o: ossl_ns_spki.h
 ossl_asn1.o: ossl_ocsp.h
 ossl_asn1.o: ossl_pkcs12.h
-ossl_asn1.o: ossl_pkcs5.h
 ossl_asn1.o: ossl_pkcs7.h
 ossl_asn1.o: ossl_pkey.h
 ossl_asn1.o: ossl_rand.h
 ossl_asn1.o: ossl_ssl.h
-ossl_asn1.o: ossl_version.h
+ossl_asn1.o: ossl_ts.h
 ossl_asn1.o: ossl_x509.h
 ossl_asn1.o: ruby_missing.h
 ossl_bio.o: $(RUBY_EXTCONF_H)
 ossl_bio.o: $(arch_hdrdir)/ruby/config.h
+ossl_bio.o: $(hdrdir)/ruby.h
+ossl_bio.o: $(hdrdir)/ruby/assert.h
 ossl_bio.o: $(hdrdir)/ruby/backward.h
+ossl_bio.o: $(hdrdir)/ruby/backward/2/assume.h
+ossl_bio.o: $(hdrdir)/ruby/backward/2/attributes.h
+ossl_bio.o: $(hdrdir)/ruby/backward/2/bool.h
+ossl_bio.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+ossl_bio.o: $(hdrdir)/ruby/backward/2/inttypes.h
+ossl_bio.o: $(hdrdir)/ruby/backward/2/limits.h
+ossl_bio.o: $(hdrdir)/ruby/backward/2/long_long.h
+ossl_bio.o: $(hdrdir)/ruby/backward/2/stdalign.h
+ossl_bio.o: $(hdrdir)/ruby/backward/2/stdarg.h
 ossl_bio.o: $(hdrdir)/ruby/defines.h
 ossl_bio.o: $(hdrdir)/ruby/encoding.h
 ossl_bio.o: $(hdrdir)/ruby/intern.h
+ossl_bio.o: $(hdrdir)/ruby/internal/anyargs.h
+ossl_bio.o: $(hdrdir)/ruby/internal/arithmetic.h
+ossl_bio.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+ossl_bio.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+ossl_bio.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+ossl_bio.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+ossl_bio.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+ossl_bio.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+ossl_bio.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+ossl_bio.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+ossl_bio.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+ossl_bio.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+ossl_bio.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+ossl_bio.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+ossl_bio.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+ossl_bio.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+ossl_bio.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+ossl_bio.o: $(hdrdir)/ruby/internal/assume.h
+ossl_bio.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+ossl_bio.o: $(hdrdir)/ruby/internal/attr/artificial.h
+ossl_bio.o: $(hdrdir)/ruby/internal/attr/cold.h
+ossl_bio.o: $(hdrdir)/ruby/internal/attr/const.h
+ossl_bio.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+ossl_bio.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+ossl_bio.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+ossl_bio.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+ossl_bio.o: $(hdrdir)/ruby/internal/attr/error.h
+ossl_bio.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+ossl_bio.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+ossl_bio.o: $(hdrdir)/ruby/internal/attr/format.h
+ossl_bio.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+ossl_bio.o: $(hdrdir)/ruby/internal/attr/noalias.h
+ossl_bio.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+ossl_bio.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+ossl_bio.o: $(hdrdir)/ruby/internal/attr/noinline.h
+ossl_bio.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+ossl_bio.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+ossl_bio.o: $(hdrdir)/ruby/internal/attr/pure.h
+ossl_bio.o: $(hdrdir)/ruby/internal/attr/restrict.h
+ossl_bio.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+ossl_bio.o: $(hdrdir)/ruby/internal/attr/warning.h
+ossl_bio.o: $(hdrdir)/ruby/internal/attr/weakref.h
+ossl_bio.o: $(hdrdir)/ruby/internal/cast.h
+ossl_bio.o: $(hdrdir)/ruby/internal/compiler_is.h
+ossl_bio.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+ossl_bio.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+ossl_bio.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+ossl_bio.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+ossl_bio.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+ossl_bio.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+ossl_bio.o: $(hdrdir)/ruby/internal/compiler_since.h
+ossl_bio.o: $(hdrdir)/ruby/internal/config.h
+ossl_bio.o: $(hdrdir)/ruby/internal/constant_p.h
+ossl_bio.o: $(hdrdir)/ruby/internal/core.h
+ossl_bio.o: $(hdrdir)/ruby/internal/core/rarray.h
+ossl_bio.o: $(hdrdir)/ruby/internal/core/rbasic.h
+ossl_bio.o: $(hdrdir)/ruby/internal/core/rbignum.h
+ossl_bio.o: $(hdrdir)/ruby/internal/core/rclass.h
+ossl_bio.o: $(hdrdir)/ruby/internal/core/rdata.h
+ossl_bio.o: $(hdrdir)/ruby/internal/core/rfile.h
+ossl_bio.o: $(hdrdir)/ruby/internal/core/rhash.h
+ossl_bio.o: $(hdrdir)/ruby/internal/core/robject.h
+ossl_bio.o: $(hdrdir)/ruby/internal/core/rregexp.h
+ossl_bio.o: $(hdrdir)/ruby/internal/core/rstring.h
+ossl_bio.o: $(hdrdir)/ruby/internal/core/rstruct.h
+ossl_bio.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+ossl_bio.o: $(hdrdir)/ruby/internal/ctype.h
+ossl_bio.o: $(hdrdir)/ruby/internal/dllexport.h
+ossl_bio.o: $(hdrdir)/ruby/internal/dosish.h
+ossl_bio.o: $(hdrdir)/ruby/internal/error.h
+ossl_bio.o: $(hdrdir)/ruby/internal/eval.h
+ossl_bio.o: $(hdrdir)/ruby/internal/event.h
+ossl_bio.o: $(hdrdir)/ruby/internal/fl_type.h
+ossl_bio.o: $(hdrdir)/ruby/internal/gc.h
+ossl_bio.o: $(hdrdir)/ruby/internal/glob.h
+ossl_bio.o: $(hdrdir)/ruby/internal/globals.h
+ossl_bio.o: $(hdrdir)/ruby/internal/has/attribute.h
+ossl_bio.o: $(hdrdir)/ruby/internal/has/builtin.h
+ossl_bio.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+ossl_bio.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+ossl_bio.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+ossl_bio.o: $(hdrdir)/ruby/internal/has/extension.h
+ossl_bio.o: $(hdrdir)/ruby/internal/has/feature.h
+ossl_bio.o: $(hdrdir)/ruby/internal/has/warning.h
+ossl_bio.o: $(hdrdir)/ruby/internal/intern/array.h
+ossl_bio.o: $(hdrdir)/ruby/internal/intern/bignum.h
+ossl_bio.o: $(hdrdir)/ruby/internal/intern/class.h
+ossl_bio.o: $(hdrdir)/ruby/internal/intern/compar.h
+ossl_bio.o: $(hdrdir)/ruby/internal/intern/complex.h
+ossl_bio.o: $(hdrdir)/ruby/internal/intern/cont.h
+ossl_bio.o: $(hdrdir)/ruby/internal/intern/dir.h
+ossl_bio.o: $(hdrdir)/ruby/internal/intern/enum.h
+ossl_bio.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+ossl_bio.o: $(hdrdir)/ruby/internal/intern/error.h
+ossl_bio.o: $(hdrdir)/ruby/internal/intern/eval.h
+ossl_bio.o: $(hdrdir)/ruby/internal/intern/file.h
+ossl_bio.o: $(hdrdir)/ruby/internal/intern/gc.h
+ossl_bio.o: $(hdrdir)/ruby/internal/intern/hash.h
+ossl_bio.o: $(hdrdir)/ruby/internal/intern/io.h
+ossl_bio.o: $(hdrdir)/ruby/internal/intern/load.h
+ossl_bio.o: $(hdrdir)/ruby/internal/intern/marshal.h
+ossl_bio.o: $(hdrdir)/ruby/internal/intern/numeric.h
+ossl_bio.o: $(hdrdir)/ruby/internal/intern/object.h
+ossl_bio.o: $(hdrdir)/ruby/internal/intern/parse.h
+ossl_bio.o: $(hdrdir)/ruby/internal/intern/proc.h
+ossl_bio.o: $(hdrdir)/ruby/internal/intern/process.h
+ossl_bio.o: $(hdrdir)/ruby/internal/intern/random.h
+ossl_bio.o: $(hdrdir)/ruby/internal/intern/range.h
+ossl_bio.o: $(hdrdir)/ruby/internal/intern/rational.h
+ossl_bio.o: $(hdrdir)/ruby/internal/intern/re.h
+ossl_bio.o: $(hdrdir)/ruby/internal/intern/ruby.h
+ossl_bio.o: $(hdrdir)/ruby/internal/intern/select.h
+ossl_bio.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_bio.o: $(hdrdir)/ruby/internal/intern/signal.h
+ossl_bio.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+ossl_bio.o: $(hdrdir)/ruby/internal/intern/string.h
+ossl_bio.o: $(hdrdir)/ruby/internal/intern/struct.h
+ossl_bio.o: $(hdrdir)/ruby/internal/intern/thread.h
+ossl_bio.o: $(hdrdir)/ruby/internal/intern/time.h
+ossl_bio.o: $(hdrdir)/ruby/internal/intern/variable.h
+ossl_bio.o: $(hdrdir)/ruby/internal/intern/vm.h
+ossl_bio.o: $(hdrdir)/ruby/internal/interpreter.h
+ossl_bio.o: $(hdrdir)/ruby/internal/iterator.h
+ossl_bio.o: $(hdrdir)/ruby/internal/memory.h
+ossl_bio.o: $(hdrdir)/ruby/internal/method.h
+ossl_bio.o: $(hdrdir)/ruby/internal/module.h
+ossl_bio.o: $(hdrdir)/ruby/internal/newobj.h
+ossl_bio.o: $(hdrdir)/ruby/internal/rgengc.h
+ossl_bio.o: $(hdrdir)/ruby/internal/scan_args.h
+ossl_bio.o: $(hdrdir)/ruby/internal/special_consts.h
+ossl_bio.o: $(hdrdir)/ruby/internal/static_assert.h
+ossl_bio.o: $(hdrdir)/ruby/internal/stdalign.h
+ossl_bio.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_bio.o: $(hdrdir)/ruby/internal/symbol.h
+ossl_bio.o: $(hdrdir)/ruby/internal/token_paste.h
+ossl_bio.o: $(hdrdir)/ruby/internal/value.h
+ossl_bio.o: $(hdrdir)/ruby/internal/value_type.h
+ossl_bio.o: $(hdrdir)/ruby/internal/variable.h
+ossl_bio.o: $(hdrdir)/ruby/internal/warning_push.h
+ossl_bio.o: $(hdrdir)/ruby/internal/xmalloc.h
 ossl_bio.o: $(hdrdir)/ruby/io.h
 ossl_bio.o: $(hdrdir)/ruby/missing.h
+ossl_bio.o: $(hdrdir)/ruby/onigmo.h
 ossl_bio.o: $(hdrdir)/ruby/oniguruma.h
 ossl_bio.o: $(hdrdir)/ruby/ruby.h
 ossl_bio.o: $(hdrdir)/ruby/st.h
 ossl_bio.o: $(hdrdir)/ruby/subst.h
 ossl_bio.o: $(hdrdir)/ruby/thread.h
-ossl_bio.o: $(top_srcdir)/include/ruby.h
 ossl_bio.o: openssl_missing.h
 ossl_bio.o: ossl.h
 ossl_bio.o: ossl_asn1.h
@@ -100,31 +554,183 @@ ossl_bio.o: ossl_config.h
 ossl_bio.o: ossl_digest.h
 ossl_bio.o: ossl_engine.h
 ossl_bio.o: ossl_hmac.h
+ossl_bio.o: ossl_kdf.h
 ossl_bio.o: ossl_ns_spki.h
 ossl_bio.o: ossl_ocsp.h
 ossl_bio.o: ossl_pkcs12.h
-ossl_bio.o: ossl_pkcs5.h
 ossl_bio.o: ossl_pkcs7.h
 ossl_bio.o: ossl_pkey.h
 ossl_bio.o: ossl_rand.h
 ossl_bio.o: ossl_ssl.h
-ossl_bio.o: ossl_version.h
+ossl_bio.o: ossl_ts.h
 ossl_bio.o: ossl_x509.h
 ossl_bio.o: ruby_missing.h
 ossl_bn.o: $(RUBY_EXTCONF_H)
 ossl_bn.o: $(arch_hdrdir)/ruby/config.h
+ossl_bn.o: $(hdrdir)/ruby.h
+ossl_bn.o: $(hdrdir)/ruby/assert.h
 ossl_bn.o: $(hdrdir)/ruby/backward.h
+ossl_bn.o: $(hdrdir)/ruby/backward/2/assume.h
+ossl_bn.o: $(hdrdir)/ruby/backward/2/attributes.h
+ossl_bn.o: $(hdrdir)/ruby/backward/2/bool.h
+ossl_bn.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+ossl_bn.o: $(hdrdir)/ruby/backward/2/inttypes.h
+ossl_bn.o: $(hdrdir)/ruby/backward/2/limits.h
+ossl_bn.o: $(hdrdir)/ruby/backward/2/long_long.h
+ossl_bn.o: $(hdrdir)/ruby/backward/2/stdalign.h
+ossl_bn.o: $(hdrdir)/ruby/backward/2/stdarg.h
 ossl_bn.o: $(hdrdir)/ruby/defines.h
 ossl_bn.o: $(hdrdir)/ruby/encoding.h
 ossl_bn.o: $(hdrdir)/ruby/intern.h
+ossl_bn.o: $(hdrdir)/ruby/internal/anyargs.h
+ossl_bn.o: $(hdrdir)/ruby/internal/arithmetic.h
+ossl_bn.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+ossl_bn.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+ossl_bn.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+ossl_bn.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+ossl_bn.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+ossl_bn.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+ossl_bn.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+ossl_bn.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+ossl_bn.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+ossl_bn.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+ossl_bn.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+ossl_bn.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+ossl_bn.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+ossl_bn.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+ossl_bn.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+ossl_bn.o: $(hdrdir)/ruby/internal/assume.h
+ossl_bn.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+ossl_bn.o: $(hdrdir)/ruby/internal/attr/artificial.h
+ossl_bn.o: $(hdrdir)/ruby/internal/attr/cold.h
+ossl_bn.o: $(hdrdir)/ruby/internal/attr/const.h
+ossl_bn.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+ossl_bn.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+ossl_bn.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+ossl_bn.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+ossl_bn.o: $(hdrdir)/ruby/internal/attr/error.h
+ossl_bn.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+ossl_bn.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+ossl_bn.o: $(hdrdir)/ruby/internal/attr/format.h
+ossl_bn.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+ossl_bn.o: $(hdrdir)/ruby/internal/attr/noalias.h
+ossl_bn.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+ossl_bn.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+ossl_bn.o: $(hdrdir)/ruby/internal/attr/noinline.h
+ossl_bn.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+ossl_bn.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+ossl_bn.o: $(hdrdir)/ruby/internal/attr/pure.h
+ossl_bn.o: $(hdrdir)/ruby/internal/attr/restrict.h
+ossl_bn.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+ossl_bn.o: $(hdrdir)/ruby/internal/attr/warning.h
+ossl_bn.o: $(hdrdir)/ruby/internal/attr/weakref.h
+ossl_bn.o: $(hdrdir)/ruby/internal/cast.h
+ossl_bn.o: $(hdrdir)/ruby/internal/compiler_is.h
+ossl_bn.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+ossl_bn.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+ossl_bn.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+ossl_bn.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+ossl_bn.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+ossl_bn.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+ossl_bn.o: $(hdrdir)/ruby/internal/compiler_since.h
+ossl_bn.o: $(hdrdir)/ruby/internal/config.h
+ossl_bn.o: $(hdrdir)/ruby/internal/constant_p.h
+ossl_bn.o: $(hdrdir)/ruby/internal/core.h
+ossl_bn.o: $(hdrdir)/ruby/internal/core/rarray.h
+ossl_bn.o: $(hdrdir)/ruby/internal/core/rbasic.h
+ossl_bn.o: $(hdrdir)/ruby/internal/core/rbignum.h
+ossl_bn.o: $(hdrdir)/ruby/internal/core/rclass.h
+ossl_bn.o: $(hdrdir)/ruby/internal/core/rdata.h
+ossl_bn.o: $(hdrdir)/ruby/internal/core/rfile.h
+ossl_bn.o: $(hdrdir)/ruby/internal/core/rhash.h
+ossl_bn.o: $(hdrdir)/ruby/internal/core/robject.h
+ossl_bn.o: $(hdrdir)/ruby/internal/core/rregexp.h
+ossl_bn.o: $(hdrdir)/ruby/internal/core/rstring.h
+ossl_bn.o: $(hdrdir)/ruby/internal/core/rstruct.h
+ossl_bn.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+ossl_bn.o: $(hdrdir)/ruby/internal/ctype.h
+ossl_bn.o: $(hdrdir)/ruby/internal/dllexport.h
+ossl_bn.o: $(hdrdir)/ruby/internal/dosish.h
+ossl_bn.o: $(hdrdir)/ruby/internal/error.h
+ossl_bn.o: $(hdrdir)/ruby/internal/eval.h
+ossl_bn.o: $(hdrdir)/ruby/internal/event.h
+ossl_bn.o: $(hdrdir)/ruby/internal/fl_type.h
+ossl_bn.o: $(hdrdir)/ruby/internal/gc.h
+ossl_bn.o: $(hdrdir)/ruby/internal/glob.h
+ossl_bn.o: $(hdrdir)/ruby/internal/globals.h
+ossl_bn.o: $(hdrdir)/ruby/internal/has/attribute.h
+ossl_bn.o: $(hdrdir)/ruby/internal/has/builtin.h
+ossl_bn.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+ossl_bn.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+ossl_bn.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+ossl_bn.o: $(hdrdir)/ruby/internal/has/extension.h
+ossl_bn.o: $(hdrdir)/ruby/internal/has/feature.h
+ossl_bn.o: $(hdrdir)/ruby/internal/has/warning.h
+ossl_bn.o: $(hdrdir)/ruby/internal/intern/array.h
+ossl_bn.o: $(hdrdir)/ruby/internal/intern/bignum.h
+ossl_bn.o: $(hdrdir)/ruby/internal/intern/class.h
+ossl_bn.o: $(hdrdir)/ruby/internal/intern/compar.h
+ossl_bn.o: $(hdrdir)/ruby/internal/intern/complex.h
+ossl_bn.o: $(hdrdir)/ruby/internal/intern/cont.h
+ossl_bn.o: $(hdrdir)/ruby/internal/intern/dir.h
+ossl_bn.o: $(hdrdir)/ruby/internal/intern/enum.h
+ossl_bn.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+ossl_bn.o: $(hdrdir)/ruby/internal/intern/error.h
+ossl_bn.o: $(hdrdir)/ruby/internal/intern/eval.h
+ossl_bn.o: $(hdrdir)/ruby/internal/intern/file.h
+ossl_bn.o: $(hdrdir)/ruby/internal/intern/gc.h
+ossl_bn.o: $(hdrdir)/ruby/internal/intern/hash.h
+ossl_bn.o: $(hdrdir)/ruby/internal/intern/io.h
+ossl_bn.o: $(hdrdir)/ruby/internal/intern/load.h
+ossl_bn.o: $(hdrdir)/ruby/internal/intern/marshal.h
+ossl_bn.o: $(hdrdir)/ruby/internal/intern/numeric.h
+ossl_bn.o: $(hdrdir)/ruby/internal/intern/object.h
+ossl_bn.o: $(hdrdir)/ruby/internal/intern/parse.h
+ossl_bn.o: $(hdrdir)/ruby/internal/intern/proc.h
+ossl_bn.o: $(hdrdir)/ruby/internal/intern/process.h
+ossl_bn.o: $(hdrdir)/ruby/internal/intern/random.h
+ossl_bn.o: $(hdrdir)/ruby/internal/intern/range.h
+ossl_bn.o: $(hdrdir)/ruby/internal/intern/rational.h
+ossl_bn.o: $(hdrdir)/ruby/internal/intern/re.h
+ossl_bn.o: $(hdrdir)/ruby/internal/intern/ruby.h
+ossl_bn.o: $(hdrdir)/ruby/internal/intern/select.h
+ossl_bn.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_bn.o: $(hdrdir)/ruby/internal/intern/signal.h
+ossl_bn.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+ossl_bn.o: $(hdrdir)/ruby/internal/intern/string.h
+ossl_bn.o: $(hdrdir)/ruby/internal/intern/struct.h
+ossl_bn.o: $(hdrdir)/ruby/internal/intern/thread.h
+ossl_bn.o: $(hdrdir)/ruby/internal/intern/time.h
+ossl_bn.o: $(hdrdir)/ruby/internal/intern/variable.h
+ossl_bn.o: $(hdrdir)/ruby/internal/intern/vm.h
+ossl_bn.o: $(hdrdir)/ruby/internal/interpreter.h
+ossl_bn.o: $(hdrdir)/ruby/internal/iterator.h
+ossl_bn.o: $(hdrdir)/ruby/internal/memory.h
+ossl_bn.o: $(hdrdir)/ruby/internal/method.h
+ossl_bn.o: $(hdrdir)/ruby/internal/module.h
+ossl_bn.o: $(hdrdir)/ruby/internal/newobj.h
+ossl_bn.o: $(hdrdir)/ruby/internal/rgengc.h
+ossl_bn.o: $(hdrdir)/ruby/internal/scan_args.h
+ossl_bn.o: $(hdrdir)/ruby/internal/special_consts.h
+ossl_bn.o: $(hdrdir)/ruby/internal/static_assert.h
+ossl_bn.o: $(hdrdir)/ruby/internal/stdalign.h
+ossl_bn.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_bn.o: $(hdrdir)/ruby/internal/symbol.h
+ossl_bn.o: $(hdrdir)/ruby/internal/token_paste.h
+ossl_bn.o: $(hdrdir)/ruby/internal/value.h
+ossl_bn.o: $(hdrdir)/ruby/internal/value_type.h
+ossl_bn.o: $(hdrdir)/ruby/internal/variable.h
+ossl_bn.o: $(hdrdir)/ruby/internal/warning_push.h
+ossl_bn.o: $(hdrdir)/ruby/internal/xmalloc.h
 ossl_bn.o: $(hdrdir)/ruby/io.h
 ossl_bn.o: $(hdrdir)/ruby/missing.h
+ossl_bn.o: $(hdrdir)/ruby/onigmo.h
 ossl_bn.o: $(hdrdir)/ruby/oniguruma.h
+ossl_bn.o: $(hdrdir)/ruby/ractor.h
 ossl_bn.o: $(hdrdir)/ruby/ruby.h
 ossl_bn.o: $(hdrdir)/ruby/st.h
 ossl_bn.o: $(hdrdir)/ruby/subst.h
 ossl_bn.o: $(hdrdir)/ruby/thread.h
-ossl_bn.o: $(top_srcdir)/include/ruby.h
 ossl_bn.o: openssl_missing.h
 ossl_bn.o: ossl.h
 ossl_bn.o: ossl_asn1.h
@@ -136,31 +742,182 @@ ossl_bn.o: ossl_config.h
 ossl_bn.o: ossl_digest.h
 ossl_bn.o: ossl_engine.h
 ossl_bn.o: ossl_hmac.h
+ossl_bn.o: ossl_kdf.h
 ossl_bn.o: ossl_ns_spki.h
 ossl_bn.o: ossl_ocsp.h
 ossl_bn.o: ossl_pkcs12.h
-ossl_bn.o: ossl_pkcs5.h
 ossl_bn.o: ossl_pkcs7.h
 ossl_bn.o: ossl_pkey.h
 ossl_bn.o: ossl_rand.h
 ossl_bn.o: ossl_ssl.h
-ossl_bn.o: ossl_version.h
+ossl_bn.o: ossl_ts.h
 ossl_bn.o: ossl_x509.h
 ossl_bn.o: ruby_missing.h
 ossl_cipher.o: $(RUBY_EXTCONF_H)
 ossl_cipher.o: $(arch_hdrdir)/ruby/config.h
+ossl_cipher.o: $(hdrdir)/ruby.h
+ossl_cipher.o: $(hdrdir)/ruby/assert.h
 ossl_cipher.o: $(hdrdir)/ruby/backward.h
+ossl_cipher.o: $(hdrdir)/ruby/backward/2/assume.h
+ossl_cipher.o: $(hdrdir)/ruby/backward/2/attributes.h
+ossl_cipher.o: $(hdrdir)/ruby/backward/2/bool.h
+ossl_cipher.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+ossl_cipher.o: $(hdrdir)/ruby/backward/2/inttypes.h
+ossl_cipher.o: $(hdrdir)/ruby/backward/2/limits.h
+ossl_cipher.o: $(hdrdir)/ruby/backward/2/long_long.h
+ossl_cipher.o: $(hdrdir)/ruby/backward/2/stdalign.h
+ossl_cipher.o: $(hdrdir)/ruby/backward/2/stdarg.h
 ossl_cipher.o: $(hdrdir)/ruby/defines.h
 ossl_cipher.o: $(hdrdir)/ruby/encoding.h
 ossl_cipher.o: $(hdrdir)/ruby/intern.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/anyargs.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/arithmetic.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/assume.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/attr/artificial.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/attr/cold.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/attr/const.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/attr/error.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/attr/format.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/attr/noalias.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/attr/noinline.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/attr/pure.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/attr/restrict.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/attr/warning.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/attr/weakref.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/cast.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/compiler_is.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/compiler_since.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/config.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/constant_p.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/core.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/core/rarray.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/core/rbasic.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/core/rbignum.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/core/rclass.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/core/rdata.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/core/rfile.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/core/rhash.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/core/robject.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/core/rregexp.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/core/rstring.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/core/rstruct.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/ctype.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/dllexport.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/dosish.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/error.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/eval.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/event.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/fl_type.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/gc.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/glob.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/globals.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/has/attribute.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/has/builtin.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/has/extension.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/has/feature.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/has/warning.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/intern/array.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/intern/bignum.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/intern/class.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/intern/compar.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/intern/complex.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/intern/cont.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/intern/dir.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/intern/enum.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/intern/error.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/intern/eval.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/intern/file.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/intern/gc.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/intern/hash.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/intern/io.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/intern/load.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/intern/marshal.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/intern/numeric.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/intern/object.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/intern/parse.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/intern/proc.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/intern/process.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/intern/random.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/intern/range.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/intern/rational.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/intern/re.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/intern/ruby.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/intern/select.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/intern/signal.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/intern/string.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/intern/struct.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/intern/thread.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/intern/time.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/intern/variable.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/intern/vm.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/interpreter.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/iterator.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/memory.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/method.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/module.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/newobj.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/rgengc.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/scan_args.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/special_consts.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/static_assert.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/stdalign.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/symbol.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/token_paste.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/value.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/value_type.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/variable.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/warning_push.h
+ossl_cipher.o: $(hdrdir)/ruby/internal/xmalloc.h
 ossl_cipher.o: $(hdrdir)/ruby/io.h
 ossl_cipher.o: $(hdrdir)/ruby/missing.h
+ossl_cipher.o: $(hdrdir)/ruby/onigmo.h
 ossl_cipher.o: $(hdrdir)/ruby/oniguruma.h
 ossl_cipher.o: $(hdrdir)/ruby/ruby.h
 ossl_cipher.o: $(hdrdir)/ruby/st.h
 ossl_cipher.o: $(hdrdir)/ruby/subst.h
 ossl_cipher.o: $(hdrdir)/ruby/thread.h
-ossl_cipher.o: $(top_srcdir)/include/ruby.h
 ossl_cipher.o: openssl_missing.h
 ossl_cipher.o: ossl.h
 ossl_cipher.o: ossl_asn1.h
@@ -172,31 +929,182 @@ ossl_cipher.o: ossl_config.h
 ossl_cipher.o: ossl_digest.h
 ossl_cipher.o: ossl_engine.h
 ossl_cipher.o: ossl_hmac.h
+ossl_cipher.o: ossl_kdf.h
 ossl_cipher.o: ossl_ns_spki.h
 ossl_cipher.o: ossl_ocsp.h
 ossl_cipher.o: ossl_pkcs12.h
-ossl_cipher.o: ossl_pkcs5.h
 ossl_cipher.o: ossl_pkcs7.h
 ossl_cipher.o: ossl_pkey.h
 ossl_cipher.o: ossl_rand.h
 ossl_cipher.o: ossl_ssl.h
-ossl_cipher.o: ossl_version.h
+ossl_cipher.o: ossl_ts.h
 ossl_cipher.o: ossl_x509.h
 ossl_cipher.o: ruby_missing.h
 ossl_config.o: $(RUBY_EXTCONF_H)
 ossl_config.o: $(arch_hdrdir)/ruby/config.h
+ossl_config.o: $(hdrdir)/ruby.h
+ossl_config.o: $(hdrdir)/ruby/assert.h
 ossl_config.o: $(hdrdir)/ruby/backward.h
+ossl_config.o: $(hdrdir)/ruby/backward/2/assume.h
+ossl_config.o: $(hdrdir)/ruby/backward/2/attributes.h
+ossl_config.o: $(hdrdir)/ruby/backward/2/bool.h
+ossl_config.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+ossl_config.o: $(hdrdir)/ruby/backward/2/inttypes.h
+ossl_config.o: $(hdrdir)/ruby/backward/2/limits.h
+ossl_config.o: $(hdrdir)/ruby/backward/2/long_long.h
+ossl_config.o: $(hdrdir)/ruby/backward/2/stdalign.h
+ossl_config.o: $(hdrdir)/ruby/backward/2/stdarg.h
 ossl_config.o: $(hdrdir)/ruby/defines.h
 ossl_config.o: $(hdrdir)/ruby/encoding.h
 ossl_config.o: $(hdrdir)/ruby/intern.h
+ossl_config.o: $(hdrdir)/ruby/internal/anyargs.h
+ossl_config.o: $(hdrdir)/ruby/internal/arithmetic.h
+ossl_config.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+ossl_config.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+ossl_config.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+ossl_config.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+ossl_config.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+ossl_config.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+ossl_config.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+ossl_config.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+ossl_config.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+ossl_config.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+ossl_config.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+ossl_config.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+ossl_config.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+ossl_config.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+ossl_config.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+ossl_config.o: $(hdrdir)/ruby/internal/assume.h
+ossl_config.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+ossl_config.o: $(hdrdir)/ruby/internal/attr/artificial.h
+ossl_config.o: $(hdrdir)/ruby/internal/attr/cold.h
+ossl_config.o: $(hdrdir)/ruby/internal/attr/const.h
+ossl_config.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+ossl_config.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+ossl_config.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+ossl_config.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+ossl_config.o: $(hdrdir)/ruby/internal/attr/error.h
+ossl_config.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+ossl_config.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+ossl_config.o: $(hdrdir)/ruby/internal/attr/format.h
+ossl_config.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+ossl_config.o: $(hdrdir)/ruby/internal/attr/noalias.h
+ossl_config.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+ossl_config.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+ossl_config.o: $(hdrdir)/ruby/internal/attr/noinline.h
+ossl_config.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+ossl_config.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+ossl_config.o: $(hdrdir)/ruby/internal/attr/pure.h
+ossl_config.o: $(hdrdir)/ruby/internal/attr/restrict.h
+ossl_config.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+ossl_config.o: $(hdrdir)/ruby/internal/attr/warning.h
+ossl_config.o: $(hdrdir)/ruby/internal/attr/weakref.h
+ossl_config.o: $(hdrdir)/ruby/internal/cast.h
+ossl_config.o: $(hdrdir)/ruby/internal/compiler_is.h
+ossl_config.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+ossl_config.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+ossl_config.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+ossl_config.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+ossl_config.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+ossl_config.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+ossl_config.o: $(hdrdir)/ruby/internal/compiler_since.h
+ossl_config.o: $(hdrdir)/ruby/internal/config.h
+ossl_config.o: $(hdrdir)/ruby/internal/constant_p.h
+ossl_config.o: $(hdrdir)/ruby/internal/core.h
+ossl_config.o: $(hdrdir)/ruby/internal/core/rarray.h
+ossl_config.o: $(hdrdir)/ruby/internal/core/rbasic.h
+ossl_config.o: $(hdrdir)/ruby/internal/core/rbignum.h
+ossl_config.o: $(hdrdir)/ruby/internal/core/rclass.h
+ossl_config.o: $(hdrdir)/ruby/internal/core/rdata.h
+ossl_config.o: $(hdrdir)/ruby/internal/core/rfile.h
+ossl_config.o: $(hdrdir)/ruby/internal/core/rhash.h
+ossl_config.o: $(hdrdir)/ruby/internal/core/robject.h
+ossl_config.o: $(hdrdir)/ruby/internal/core/rregexp.h
+ossl_config.o: $(hdrdir)/ruby/internal/core/rstring.h
+ossl_config.o: $(hdrdir)/ruby/internal/core/rstruct.h
+ossl_config.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+ossl_config.o: $(hdrdir)/ruby/internal/ctype.h
+ossl_config.o: $(hdrdir)/ruby/internal/dllexport.h
+ossl_config.o: $(hdrdir)/ruby/internal/dosish.h
+ossl_config.o: $(hdrdir)/ruby/internal/error.h
+ossl_config.o: $(hdrdir)/ruby/internal/eval.h
+ossl_config.o: $(hdrdir)/ruby/internal/event.h
+ossl_config.o: $(hdrdir)/ruby/internal/fl_type.h
+ossl_config.o: $(hdrdir)/ruby/internal/gc.h
+ossl_config.o: $(hdrdir)/ruby/internal/glob.h
+ossl_config.o: $(hdrdir)/ruby/internal/globals.h
+ossl_config.o: $(hdrdir)/ruby/internal/has/attribute.h
+ossl_config.o: $(hdrdir)/ruby/internal/has/builtin.h
+ossl_config.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+ossl_config.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+ossl_config.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+ossl_config.o: $(hdrdir)/ruby/internal/has/extension.h
+ossl_config.o: $(hdrdir)/ruby/internal/has/feature.h
+ossl_config.o: $(hdrdir)/ruby/internal/has/warning.h
+ossl_config.o: $(hdrdir)/ruby/internal/intern/array.h
+ossl_config.o: $(hdrdir)/ruby/internal/intern/bignum.h
+ossl_config.o: $(hdrdir)/ruby/internal/intern/class.h
+ossl_config.o: $(hdrdir)/ruby/internal/intern/compar.h
+ossl_config.o: $(hdrdir)/ruby/internal/intern/complex.h
+ossl_config.o: $(hdrdir)/ruby/internal/intern/cont.h
+ossl_config.o: $(hdrdir)/ruby/internal/intern/dir.h
+ossl_config.o: $(hdrdir)/ruby/internal/intern/enum.h
+ossl_config.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+ossl_config.o: $(hdrdir)/ruby/internal/intern/error.h
+ossl_config.o: $(hdrdir)/ruby/internal/intern/eval.h
+ossl_config.o: $(hdrdir)/ruby/internal/intern/file.h
+ossl_config.o: $(hdrdir)/ruby/internal/intern/gc.h
+ossl_config.o: $(hdrdir)/ruby/internal/intern/hash.h
+ossl_config.o: $(hdrdir)/ruby/internal/intern/io.h
+ossl_config.o: $(hdrdir)/ruby/internal/intern/load.h
+ossl_config.o: $(hdrdir)/ruby/internal/intern/marshal.h
+ossl_config.o: $(hdrdir)/ruby/internal/intern/numeric.h
+ossl_config.o: $(hdrdir)/ruby/internal/intern/object.h
+ossl_config.o: $(hdrdir)/ruby/internal/intern/parse.h
+ossl_config.o: $(hdrdir)/ruby/internal/intern/proc.h
+ossl_config.o: $(hdrdir)/ruby/internal/intern/process.h
+ossl_config.o: $(hdrdir)/ruby/internal/intern/random.h
+ossl_config.o: $(hdrdir)/ruby/internal/intern/range.h
+ossl_config.o: $(hdrdir)/ruby/internal/intern/rational.h
+ossl_config.o: $(hdrdir)/ruby/internal/intern/re.h
+ossl_config.o: $(hdrdir)/ruby/internal/intern/ruby.h
+ossl_config.o: $(hdrdir)/ruby/internal/intern/select.h
+ossl_config.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_config.o: $(hdrdir)/ruby/internal/intern/signal.h
+ossl_config.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+ossl_config.o: $(hdrdir)/ruby/internal/intern/string.h
+ossl_config.o: $(hdrdir)/ruby/internal/intern/struct.h
+ossl_config.o: $(hdrdir)/ruby/internal/intern/thread.h
+ossl_config.o: $(hdrdir)/ruby/internal/intern/time.h
+ossl_config.o: $(hdrdir)/ruby/internal/intern/variable.h
+ossl_config.o: $(hdrdir)/ruby/internal/intern/vm.h
+ossl_config.o: $(hdrdir)/ruby/internal/interpreter.h
+ossl_config.o: $(hdrdir)/ruby/internal/iterator.h
+ossl_config.o: $(hdrdir)/ruby/internal/memory.h
+ossl_config.o: $(hdrdir)/ruby/internal/method.h
+ossl_config.o: $(hdrdir)/ruby/internal/module.h
+ossl_config.o: $(hdrdir)/ruby/internal/newobj.h
+ossl_config.o: $(hdrdir)/ruby/internal/rgengc.h
+ossl_config.o: $(hdrdir)/ruby/internal/scan_args.h
+ossl_config.o: $(hdrdir)/ruby/internal/special_consts.h
+ossl_config.o: $(hdrdir)/ruby/internal/static_assert.h
+ossl_config.o: $(hdrdir)/ruby/internal/stdalign.h
+ossl_config.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_config.o: $(hdrdir)/ruby/internal/symbol.h
+ossl_config.o: $(hdrdir)/ruby/internal/token_paste.h
+ossl_config.o: $(hdrdir)/ruby/internal/value.h
+ossl_config.o: $(hdrdir)/ruby/internal/value_type.h
+ossl_config.o: $(hdrdir)/ruby/internal/variable.h
+ossl_config.o: $(hdrdir)/ruby/internal/warning_push.h
+ossl_config.o: $(hdrdir)/ruby/internal/xmalloc.h
 ossl_config.o: $(hdrdir)/ruby/io.h
 ossl_config.o: $(hdrdir)/ruby/missing.h
+ossl_config.o: $(hdrdir)/ruby/onigmo.h
 ossl_config.o: $(hdrdir)/ruby/oniguruma.h
 ossl_config.o: $(hdrdir)/ruby/ruby.h
 ossl_config.o: $(hdrdir)/ruby/st.h
 ossl_config.o: $(hdrdir)/ruby/subst.h
 ossl_config.o: $(hdrdir)/ruby/thread.h
-ossl_config.o: $(top_srcdir)/include/ruby.h
 ossl_config.o: openssl_missing.h
 ossl_config.o: ossl.h
 ossl_config.o: ossl_asn1.h
@@ -208,31 +1116,182 @@ ossl_config.o: ossl_config.h
 ossl_config.o: ossl_digest.h
 ossl_config.o: ossl_engine.h
 ossl_config.o: ossl_hmac.h
+ossl_config.o: ossl_kdf.h
 ossl_config.o: ossl_ns_spki.h
 ossl_config.o: ossl_ocsp.h
 ossl_config.o: ossl_pkcs12.h
-ossl_config.o: ossl_pkcs5.h
 ossl_config.o: ossl_pkcs7.h
 ossl_config.o: ossl_pkey.h
 ossl_config.o: ossl_rand.h
 ossl_config.o: ossl_ssl.h
-ossl_config.o: ossl_version.h
+ossl_config.o: ossl_ts.h
 ossl_config.o: ossl_x509.h
 ossl_config.o: ruby_missing.h
 ossl_digest.o: $(RUBY_EXTCONF_H)
 ossl_digest.o: $(arch_hdrdir)/ruby/config.h
+ossl_digest.o: $(hdrdir)/ruby.h
+ossl_digest.o: $(hdrdir)/ruby/assert.h
 ossl_digest.o: $(hdrdir)/ruby/backward.h
+ossl_digest.o: $(hdrdir)/ruby/backward/2/assume.h
+ossl_digest.o: $(hdrdir)/ruby/backward/2/attributes.h
+ossl_digest.o: $(hdrdir)/ruby/backward/2/bool.h
+ossl_digest.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+ossl_digest.o: $(hdrdir)/ruby/backward/2/inttypes.h
+ossl_digest.o: $(hdrdir)/ruby/backward/2/limits.h
+ossl_digest.o: $(hdrdir)/ruby/backward/2/long_long.h
+ossl_digest.o: $(hdrdir)/ruby/backward/2/stdalign.h
+ossl_digest.o: $(hdrdir)/ruby/backward/2/stdarg.h
 ossl_digest.o: $(hdrdir)/ruby/defines.h
 ossl_digest.o: $(hdrdir)/ruby/encoding.h
 ossl_digest.o: $(hdrdir)/ruby/intern.h
+ossl_digest.o: $(hdrdir)/ruby/internal/anyargs.h
+ossl_digest.o: $(hdrdir)/ruby/internal/arithmetic.h
+ossl_digest.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+ossl_digest.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+ossl_digest.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+ossl_digest.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+ossl_digest.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+ossl_digest.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+ossl_digest.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+ossl_digest.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+ossl_digest.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+ossl_digest.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+ossl_digest.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+ossl_digest.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+ossl_digest.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+ossl_digest.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+ossl_digest.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+ossl_digest.o: $(hdrdir)/ruby/internal/assume.h
+ossl_digest.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+ossl_digest.o: $(hdrdir)/ruby/internal/attr/artificial.h
+ossl_digest.o: $(hdrdir)/ruby/internal/attr/cold.h
+ossl_digest.o: $(hdrdir)/ruby/internal/attr/const.h
+ossl_digest.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+ossl_digest.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+ossl_digest.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+ossl_digest.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+ossl_digest.o: $(hdrdir)/ruby/internal/attr/error.h
+ossl_digest.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+ossl_digest.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+ossl_digest.o: $(hdrdir)/ruby/internal/attr/format.h
+ossl_digest.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+ossl_digest.o: $(hdrdir)/ruby/internal/attr/noalias.h
+ossl_digest.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+ossl_digest.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+ossl_digest.o: $(hdrdir)/ruby/internal/attr/noinline.h
+ossl_digest.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+ossl_digest.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+ossl_digest.o: $(hdrdir)/ruby/internal/attr/pure.h
+ossl_digest.o: $(hdrdir)/ruby/internal/attr/restrict.h
+ossl_digest.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+ossl_digest.o: $(hdrdir)/ruby/internal/attr/warning.h
+ossl_digest.o: $(hdrdir)/ruby/internal/attr/weakref.h
+ossl_digest.o: $(hdrdir)/ruby/internal/cast.h
+ossl_digest.o: $(hdrdir)/ruby/internal/compiler_is.h
+ossl_digest.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+ossl_digest.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+ossl_digest.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+ossl_digest.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+ossl_digest.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+ossl_digest.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+ossl_digest.o: $(hdrdir)/ruby/internal/compiler_since.h
+ossl_digest.o: $(hdrdir)/ruby/internal/config.h
+ossl_digest.o: $(hdrdir)/ruby/internal/constant_p.h
+ossl_digest.o: $(hdrdir)/ruby/internal/core.h
+ossl_digest.o: $(hdrdir)/ruby/internal/core/rarray.h
+ossl_digest.o: $(hdrdir)/ruby/internal/core/rbasic.h
+ossl_digest.o: $(hdrdir)/ruby/internal/core/rbignum.h
+ossl_digest.o: $(hdrdir)/ruby/internal/core/rclass.h
+ossl_digest.o: $(hdrdir)/ruby/internal/core/rdata.h
+ossl_digest.o: $(hdrdir)/ruby/internal/core/rfile.h
+ossl_digest.o: $(hdrdir)/ruby/internal/core/rhash.h
+ossl_digest.o: $(hdrdir)/ruby/internal/core/robject.h
+ossl_digest.o: $(hdrdir)/ruby/internal/core/rregexp.h
+ossl_digest.o: $(hdrdir)/ruby/internal/core/rstring.h
+ossl_digest.o: $(hdrdir)/ruby/internal/core/rstruct.h
+ossl_digest.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+ossl_digest.o: $(hdrdir)/ruby/internal/ctype.h
+ossl_digest.o: $(hdrdir)/ruby/internal/dllexport.h
+ossl_digest.o: $(hdrdir)/ruby/internal/dosish.h
+ossl_digest.o: $(hdrdir)/ruby/internal/error.h
+ossl_digest.o: $(hdrdir)/ruby/internal/eval.h
+ossl_digest.o: $(hdrdir)/ruby/internal/event.h
+ossl_digest.o: $(hdrdir)/ruby/internal/fl_type.h
+ossl_digest.o: $(hdrdir)/ruby/internal/gc.h
+ossl_digest.o: $(hdrdir)/ruby/internal/glob.h
+ossl_digest.o: $(hdrdir)/ruby/internal/globals.h
+ossl_digest.o: $(hdrdir)/ruby/internal/has/attribute.h
+ossl_digest.o: $(hdrdir)/ruby/internal/has/builtin.h
+ossl_digest.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+ossl_digest.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+ossl_digest.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+ossl_digest.o: $(hdrdir)/ruby/internal/has/extension.h
+ossl_digest.o: $(hdrdir)/ruby/internal/has/feature.h
+ossl_digest.o: $(hdrdir)/ruby/internal/has/warning.h
+ossl_digest.o: $(hdrdir)/ruby/internal/intern/array.h
+ossl_digest.o: $(hdrdir)/ruby/internal/intern/bignum.h
+ossl_digest.o: $(hdrdir)/ruby/internal/intern/class.h
+ossl_digest.o: $(hdrdir)/ruby/internal/intern/compar.h
+ossl_digest.o: $(hdrdir)/ruby/internal/intern/complex.h
+ossl_digest.o: $(hdrdir)/ruby/internal/intern/cont.h
+ossl_digest.o: $(hdrdir)/ruby/internal/intern/dir.h
+ossl_digest.o: $(hdrdir)/ruby/internal/intern/enum.h
+ossl_digest.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+ossl_digest.o: $(hdrdir)/ruby/internal/intern/error.h
+ossl_digest.o: $(hdrdir)/ruby/internal/intern/eval.h
+ossl_digest.o: $(hdrdir)/ruby/internal/intern/file.h
+ossl_digest.o: $(hdrdir)/ruby/internal/intern/gc.h
+ossl_digest.o: $(hdrdir)/ruby/internal/intern/hash.h
+ossl_digest.o: $(hdrdir)/ruby/internal/intern/io.h
+ossl_digest.o: $(hdrdir)/ruby/internal/intern/load.h
+ossl_digest.o: $(hdrdir)/ruby/internal/intern/marshal.h
+ossl_digest.o: $(hdrdir)/ruby/internal/intern/numeric.h
+ossl_digest.o: $(hdrdir)/ruby/internal/intern/object.h
+ossl_digest.o: $(hdrdir)/ruby/internal/intern/parse.h
+ossl_digest.o: $(hdrdir)/ruby/internal/intern/proc.h
+ossl_digest.o: $(hdrdir)/ruby/internal/intern/process.h
+ossl_digest.o: $(hdrdir)/ruby/internal/intern/random.h
+ossl_digest.o: $(hdrdir)/ruby/internal/intern/range.h
+ossl_digest.o: $(hdrdir)/ruby/internal/intern/rational.h
+ossl_digest.o: $(hdrdir)/ruby/internal/intern/re.h
+ossl_digest.o: $(hdrdir)/ruby/internal/intern/ruby.h
+ossl_digest.o: $(hdrdir)/ruby/internal/intern/select.h
+ossl_digest.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_digest.o: $(hdrdir)/ruby/internal/intern/signal.h
+ossl_digest.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+ossl_digest.o: $(hdrdir)/ruby/internal/intern/string.h
+ossl_digest.o: $(hdrdir)/ruby/internal/intern/struct.h
+ossl_digest.o: $(hdrdir)/ruby/internal/intern/thread.h
+ossl_digest.o: $(hdrdir)/ruby/internal/intern/time.h
+ossl_digest.o: $(hdrdir)/ruby/internal/intern/variable.h
+ossl_digest.o: $(hdrdir)/ruby/internal/intern/vm.h
+ossl_digest.o: $(hdrdir)/ruby/internal/interpreter.h
+ossl_digest.o: $(hdrdir)/ruby/internal/iterator.h
+ossl_digest.o: $(hdrdir)/ruby/internal/memory.h
+ossl_digest.o: $(hdrdir)/ruby/internal/method.h
+ossl_digest.o: $(hdrdir)/ruby/internal/module.h
+ossl_digest.o: $(hdrdir)/ruby/internal/newobj.h
+ossl_digest.o: $(hdrdir)/ruby/internal/rgengc.h
+ossl_digest.o: $(hdrdir)/ruby/internal/scan_args.h
+ossl_digest.o: $(hdrdir)/ruby/internal/special_consts.h
+ossl_digest.o: $(hdrdir)/ruby/internal/static_assert.h
+ossl_digest.o: $(hdrdir)/ruby/internal/stdalign.h
+ossl_digest.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_digest.o: $(hdrdir)/ruby/internal/symbol.h
+ossl_digest.o: $(hdrdir)/ruby/internal/token_paste.h
+ossl_digest.o: $(hdrdir)/ruby/internal/value.h
+ossl_digest.o: $(hdrdir)/ruby/internal/value_type.h
+ossl_digest.o: $(hdrdir)/ruby/internal/variable.h
+ossl_digest.o: $(hdrdir)/ruby/internal/warning_push.h
+ossl_digest.o: $(hdrdir)/ruby/internal/xmalloc.h
 ossl_digest.o: $(hdrdir)/ruby/io.h
 ossl_digest.o: $(hdrdir)/ruby/missing.h
+ossl_digest.o: $(hdrdir)/ruby/onigmo.h
 ossl_digest.o: $(hdrdir)/ruby/oniguruma.h
 ossl_digest.o: $(hdrdir)/ruby/ruby.h
 ossl_digest.o: $(hdrdir)/ruby/st.h
 ossl_digest.o: $(hdrdir)/ruby/subst.h
 ossl_digest.o: $(hdrdir)/ruby/thread.h
-ossl_digest.o: $(top_srcdir)/include/ruby.h
 ossl_digest.o: openssl_missing.h
 ossl_digest.o: ossl.h
 ossl_digest.o: ossl_asn1.h
@@ -244,31 +1303,182 @@ ossl_digest.o: ossl_digest.c
 ossl_digest.o: ossl_digest.h
 ossl_digest.o: ossl_engine.h
 ossl_digest.o: ossl_hmac.h
+ossl_digest.o: ossl_kdf.h
 ossl_digest.o: ossl_ns_spki.h
 ossl_digest.o: ossl_ocsp.h
 ossl_digest.o: ossl_pkcs12.h
-ossl_digest.o: ossl_pkcs5.h
 ossl_digest.o: ossl_pkcs7.h
 ossl_digest.o: ossl_pkey.h
 ossl_digest.o: ossl_rand.h
 ossl_digest.o: ossl_ssl.h
-ossl_digest.o: ossl_version.h
+ossl_digest.o: ossl_ts.h
 ossl_digest.o: ossl_x509.h
 ossl_digest.o: ruby_missing.h
 ossl_engine.o: $(RUBY_EXTCONF_H)
 ossl_engine.o: $(arch_hdrdir)/ruby/config.h
+ossl_engine.o: $(hdrdir)/ruby.h
+ossl_engine.o: $(hdrdir)/ruby/assert.h
 ossl_engine.o: $(hdrdir)/ruby/backward.h
+ossl_engine.o: $(hdrdir)/ruby/backward/2/assume.h
+ossl_engine.o: $(hdrdir)/ruby/backward/2/attributes.h
+ossl_engine.o: $(hdrdir)/ruby/backward/2/bool.h
+ossl_engine.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+ossl_engine.o: $(hdrdir)/ruby/backward/2/inttypes.h
+ossl_engine.o: $(hdrdir)/ruby/backward/2/limits.h
+ossl_engine.o: $(hdrdir)/ruby/backward/2/long_long.h
+ossl_engine.o: $(hdrdir)/ruby/backward/2/stdalign.h
+ossl_engine.o: $(hdrdir)/ruby/backward/2/stdarg.h
 ossl_engine.o: $(hdrdir)/ruby/defines.h
 ossl_engine.o: $(hdrdir)/ruby/encoding.h
 ossl_engine.o: $(hdrdir)/ruby/intern.h
+ossl_engine.o: $(hdrdir)/ruby/internal/anyargs.h
+ossl_engine.o: $(hdrdir)/ruby/internal/arithmetic.h
+ossl_engine.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+ossl_engine.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+ossl_engine.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+ossl_engine.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+ossl_engine.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+ossl_engine.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+ossl_engine.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+ossl_engine.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+ossl_engine.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+ossl_engine.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+ossl_engine.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+ossl_engine.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+ossl_engine.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+ossl_engine.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+ossl_engine.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+ossl_engine.o: $(hdrdir)/ruby/internal/assume.h
+ossl_engine.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+ossl_engine.o: $(hdrdir)/ruby/internal/attr/artificial.h
+ossl_engine.o: $(hdrdir)/ruby/internal/attr/cold.h
+ossl_engine.o: $(hdrdir)/ruby/internal/attr/const.h
+ossl_engine.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+ossl_engine.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+ossl_engine.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+ossl_engine.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+ossl_engine.o: $(hdrdir)/ruby/internal/attr/error.h
+ossl_engine.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+ossl_engine.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+ossl_engine.o: $(hdrdir)/ruby/internal/attr/format.h
+ossl_engine.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+ossl_engine.o: $(hdrdir)/ruby/internal/attr/noalias.h
+ossl_engine.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+ossl_engine.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+ossl_engine.o: $(hdrdir)/ruby/internal/attr/noinline.h
+ossl_engine.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+ossl_engine.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+ossl_engine.o: $(hdrdir)/ruby/internal/attr/pure.h
+ossl_engine.o: $(hdrdir)/ruby/internal/attr/restrict.h
+ossl_engine.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+ossl_engine.o: $(hdrdir)/ruby/internal/attr/warning.h
+ossl_engine.o: $(hdrdir)/ruby/internal/attr/weakref.h
+ossl_engine.o: $(hdrdir)/ruby/internal/cast.h
+ossl_engine.o: $(hdrdir)/ruby/internal/compiler_is.h
+ossl_engine.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+ossl_engine.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+ossl_engine.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+ossl_engine.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+ossl_engine.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+ossl_engine.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+ossl_engine.o: $(hdrdir)/ruby/internal/compiler_since.h
+ossl_engine.o: $(hdrdir)/ruby/internal/config.h
+ossl_engine.o: $(hdrdir)/ruby/internal/constant_p.h
+ossl_engine.o: $(hdrdir)/ruby/internal/core.h
+ossl_engine.o: $(hdrdir)/ruby/internal/core/rarray.h
+ossl_engine.o: $(hdrdir)/ruby/internal/core/rbasic.h
+ossl_engine.o: $(hdrdir)/ruby/internal/core/rbignum.h
+ossl_engine.o: $(hdrdir)/ruby/internal/core/rclass.h
+ossl_engine.o: $(hdrdir)/ruby/internal/core/rdata.h
+ossl_engine.o: $(hdrdir)/ruby/internal/core/rfile.h
+ossl_engine.o: $(hdrdir)/ruby/internal/core/rhash.h
+ossl_engine.o: $(hdrdir)/ruby/internal/core/robject.h
+ossl_engine.o: $(hdrdir)/ruby/internal/core/rregexp.h
+ossl_engine.o: $(hdrdir)/ruby/internal/core/rstring.h
+ossl_engine.o: $(hdrdir)/ruby/internal/core/rstruct.h
+ossl_engine.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+ossl_engine.o: $(hdrdir)/ruby/internal/ctype.h
+ossl_engine.o: $(hdrdir)/ruby/internal/dllexport.h
+ossl_engine.o: $(hdrdir)/ruby/internal/dosish.h
+ossl_engine.o: $(hdrdir)/ruby/internal/error.h
+ossl_engine.o: $(hdrdir)/ruby/internal/eval.h
+ossl_engine.o: $(hdrdir)/ruby/internal/event.h
+ossl_engine.o: $(hdrdir)/ruby/internal/fl_type.h
+ossl_engine.o: $(hdrdir)/ruby/internal/gc.h
+ossl_engine.o: $(hdrdir)/ruby/internal/glob.h
+ossl_engine.o: $(hdrdir)/ruby/internal/globals.h
+ossl_engine.o: $(hdrdir)/ruby/internal/has/attribute.h
+ossl_engine.o: $(hdrdir)/ruby/internal/has/builtin.h
+ossl_engine.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+ossl_engine.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+ossl_engine.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+ossl_engine.o: $(hdrdir)/ruby/internal/has/extension.h
+ossl_engine.o: $(hdrdir)/ruby/internal/has/feature.h
+ossl_engine.o: $(hdrdir)/ruby/internal/has/warning.h
+ossl_engine.o: $(hdrdir)/ruby/internal/intern/array.h
+ossl_engine.o: $(hdrdir)/ruby/internal/intern/bignum.h
+ossl_engine.o: $(hdrdir)/ruby/internal/intern/class.h
+ossl_engine.o: $(hdrdir)/ruby/internal/intern/compar.h
+ossl_engine.o: $(hdrdir)/ruby/internal/intern/complex.h
+ossl_engine.o: $(hdrdir)/ruby/internal/intern/cont.h
+ossl_engine.o: $(hdrdir)/ruby/internal/intern/dir.h
+ossl_engine.o: $(hdrdir)/ruby/internal/intern/enum.h
+ossl_engine.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+ossl_engine.o: $(hdrdir)/ruby/internal/intern/error.h
+ossl_engine.o: $(hdrdir)/ruby/internal/intern/eval.h
+ossl_engine.o: $(hdrdir)/ruby/internal/intern/file.h
+ossl_engine.o: $(hdrdir)/ruby/internal/intern/gc.h
+ossl_engine.o: $(hdrdir)/ruby/internal/intern/hash.h
+ossl_engine.o: $(hdrdir)/ruby/internal/intern/io.h
+ossl_engine.o: $(hdrdir)/ruby/internal/intern/load.h
+ossl_engine.o: $(hdrdir)/ruby/internal/intern/marshal.h
+ossl_engine.o: $(hdrdir)/ruby/internal/intern/numeric.h
+ossl_engine.o: $(hdrdir)/ruby/internal/intern/object.h
+ossl_engine.o: $(hdrdir)/ruby/internal/intern/parse.h
+ossl_engine.o: $(hdrdir)/ruby/internal/intern/proc.h
+ossl_engine.o: $(hdrdir)/ruby/internal/intern/process.h
+ossl_engine.o: $(hdrdir)/ruby/internal/intern/random.h
+ossl_engine.o: $(hdrdir)/ruby/internal/intern/range.h
+ossl_engine.o: $(hdrdir)/ruby/internal/intern/rational.h
+ossl_engine.o: $(hdrdir)/ruby/internal/intern/re.h
+ossl_engine.o: $(hdrdir)/ruby/internal/intern/ruby.h
+ossl_engine.o: $(hdrdir)/ruby/internal/intern/select.h
+ossl_engine.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_engine.o: $(hdrdir)/ruby/internal/intern/signal.h
+ossl_engine.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+ossl_engine.o: $(hdrdir)/ruby/internal/intern/string.h
+ossl_engine.o: $(hdrdir)/ruby/internal/intern/struct.h
+ossl_engine.o: $(hdrdir)/ruby/internal/intern/thread.h
+ossl_engine.o: $(hdrdir)/ruby/internal/intern/time.h
+ossl_engine.o: $(hdrdir)/ruby/internal/intern/variable.h
+ossl_engine.o: $(hdrdir)/ruby/internal/intern/vm.h
+ossl_engine.o: $(hdrdir)/ruby/internal/interpreter.h
+ossl_engine.o: $(hdrdir)/ruby/internal/iterator.h
+ossl_engine.o: $(hdrdir)/ruby/internal/memory.h
+ossl_engine.o: $(hdrdir)/ruby/internal/method.h
+ossl_engine.o: $(hdrdir)/ruby/internal/module.h
+ossl_engine.o: $(hdrdir)/ruby/internal/newobj.h
+ossl_engine.o: $(hdrdir)/ruby/internal/rgengc.h
+ossl_engine.o: $(hdrdir)/ruby/internal/scan_args.h
+ossl_engine.o: $(hdrdir)/ruby/internal/special_consts.h
+ossl_engine.o: $(hdrdir)/ruby/internal/static_assert.h
+ossl_engine.o: $(hdrdir)/ruby/internal/stdalign.h
+ossl_engine.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_engine.o: $(hdrdir)/ruby/internal/symbol.h
+ossl_engine.o: $(hdrdir)/ruby/internal/token_paste.h
+ossl_engine.o: $(hdrdir)/ruby/internal/value.h
+ossl_engine.o: $(hdrdir)/ruby/internal/value_type.h
+ossl_engine.o: $(hdrdir)/ruby/internal/variable.h
+ossl_engine.o: $(hdrdir)/ruby/internal/warning_push.h
+ossl_engine.o: $(hdrdir)/ruby/internal/xmalloc.h
 ossl_engine.o: $(hdrdir)/ruby/io.h
 ossl_engine.o: $(hdrdir)/ruby/missing.h
+ossl_engine.o: $(hdrdir)/ruby/onigmo.h
 ossl_engine.o: $(hdrdir)/ruby/oniguruma.h
 ossl_engine.o: $(hdrdir)/ruby/ruby.h
 ossl_engine.o: $(hdrdir)/ruby/st.h
 ossl_engine.o: $(hdrdir)/ruby/subst.h
 ossl_engine.o: $(hdrdir)/ruby/thread.h
-ossl_engine.o: $(top_srcdir)/include/ruby.h
 ossl_engine.o: openssl_missing.h
 ossl_engine.o: ossl.h
 ossl_engine.o: ossl_asn1.h
@@ -280,31 +1490,182 @@ ossl_engine.o: ossl_digest.h
 ossl_engine.o: ossl_engine.c
 ossl_engine.o: ossl_engine.h
 ossl_engine.o: ossl_hmac.h
+ossl_engine.o: ossl_kdf.h
 ossl_engine.o: ossl_ns_spki.h
 ossl_engine.o: ossl_ocsp.h
 ossl_engine.o: ossl_pkcs12.h
-ossl_engine.o: ossl_pkcs5.h
 ossl_engine.o: ossl_pkcs7.h
 ossl_engine.o: ossl_pkey.h
 ossl_engine.o: ossl_rand.h
 ossl_engine.o: ossl_ssl.h
-ossl_engine.o: ossl_version.h
+ossl_engine.o: ossl_ts.h
 ossl_engine.o: ossl_x509.h
 ossl_engine.o: ruby_missing.h
 ossl_hmac.o: $(RUBY_EXTCONF_H)
 ossl_hmac.o: $(arch_hdrdir)/ruby/config.h
+ossl_hmac.o: $(hdrdir)/ruby.h
+ossl_hmac.o: $(hdrdir)/ruby/assert.h
 ossl_hmac.o: $(hdrdir)/ruby/backward.h
+ossl_hmac.o: $(hdrdir)/ruby/backward/2/assume.h
+ossl_hmac.o: $(hdrdir)/ruby/backward/2/attributes.h
+ossl_hmac.o: $(hdrdir)/ruby/backward/2/bool.h
+ossl_hmac.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+ossl_hmac.o: $(hdrdir)/ruby/backward/2/inttypes.h
+ossl_hmac.o: $(hdrdir)/ruby/backward/2/limits.h
+ossl_hmac.o: $(hdrdir)/ruby/backward/2/long_long.h
+ossl_hmac.o: $(hdrdir)/ruby/backward/2/stdalign.h
+ossl_hmac.o: $(hdrdir)/ruby/backward/2/stdarg.h
 ossl_hmac.o: $(hdrdir)/ruby/defines.h
 ossl_hmac.o: $(hdrdir)/ruby/encoding.h
 ossl_hmac.o: $(hdrdir)/ruby/intern.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/anyargs.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/arithmetic.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/assume.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/attr/artificial.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/attr/cold.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/attr/const.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/attr/error.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/attr/format.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/attr/noalias.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/attr/noinline.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/attr/pure.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/attr/restrict.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/attr/warning.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/attr/weakref.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/cast.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/compiler_is.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/compiler_since.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/config.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/constant_p.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/core.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/core/rarray.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/core/rbasic.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/core/rbignum.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/core/rclass.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/core/rdata.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/core/rfile.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/core/rhash.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/core/robject.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/core/rregexp.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/core/rstring.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/core/rstruct.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/ctype.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/dllexport.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/dosish.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/error.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/eval.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/event.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/fl_type.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/gc.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/glob.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/globals.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/has/attribute.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/has/builtin.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/has/extension.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/has/feature.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/has/warning.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/intern/array.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/intern/bignum.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/intern/class.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/intern/compar.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/intern/complex.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/intern/cont.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/intern/dir.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/intern/enum.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/intern/error.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/intern/eval.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/intern/file.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/intern/gc.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/intern/hash.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/intern/io.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/intern/load.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/intern/marshal.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/intern/numeric.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/intern/object.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/intern/parse.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/intern/proc.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/intern/process.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/intern/random.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/intern/range.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/intern/rational.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/intern/re.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/intern/ruby.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/intern/select.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/intern/signal.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/intern/string.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/intern/struct.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/intern/thread.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/intern/time.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/intern/variable.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/intern/vm.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/interpreter.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/iterator.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/memory.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/method.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/module.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/newobj.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/rgengc.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/scan_args.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/special_consts.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/static_assert.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/stdalign.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/symbol.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/token_paste.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/value.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/value_type.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/variable.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/warning_push.h
+ossl_hmac.o: $(hdrdir)/ruby/internal/xmalloc.h
 ossl_hmac.o: $(hdrdir)/ruby/io.h
 ossl_hmac.o: $(hdrdir)/ruby/missing.h
+ossl_hmac.o: $(hdrdir)/ruby/onigmo.h
 ossl_hmac.o: $(hdrdir)/ruby/oniguruma.h
 ossl_hmac.o: $(hdrdir)/ruby/ruby.h
 ossl_hmac.o: $(hdrdir)/ruby/st.h
 ossl_hmac.o: $(hdrdir)/ruby/subst.h
 ossl_hmac.o: $(hdrdir)/ruby/thread.h
-ossl_hmac.o: $(top_srcdir)/include/ruby.h
 ossl_hmac.o: openssl_missing.h
 ossl_hmac.o: ossl.h
 ossl_hmac.o: ossl_asn1.h
@@ -316,31 +1677,369 @@ ossl_hmac.o: ossl_digest.h
 ossl_hmac.o: ossl_engine.h
 ossl_hmac.o: ossl_hmac.c
 ossl_hmac.o: ossl_hmac.h
+ossl_hmac.o: ossl_kdf.h
 ossl_hmac.o: ossl_ns_spki.h
 ossl_hmac.o: ossl_ocsp.h
 ossl_hmac.o: ossl_pkcs12.h
-ossl_hmac.o: ossl_pkcs5.h
 ossl_hmac.o: ossl_pkcs7.h
 ossl_hmac.o: ossl_pkey.h
 ossl_hmac.o: ossl_rand.h
 ossl_hmac.o: ossl_ssl.h
-ossl_hmac.o: ossl_version.h
+ossl_hmac.o: ossl_ts.h
 ossl_hmac.o: ossl_x509.h
 ossl_hmac.o: ruby_missing.h
+ossl_kdf.o: $(RUBY_EXTCONF_H)
+ossl_kdf.o: $(arch_hdrdir)/ruby/config.h
+ossl_kdf.o: $(hdrdir)/ruby.h
+ossl_kdf.o: $(hdrdir)/ruby/assert.h
+ossl_kdf.o: $(hdrdir)/ruby/backward.h
+ossl_kdf.o: $(hdrdir)/ruby/backward/2/assume.h
+ossl_kdf.o: $(hdrdir)/ruby/backward/2/attributes.h
+ossl_kdf.o: $(hdrdir)/ruby/backward/2/bool.h
+ossl_kdf.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+ossl_kdf.o: $(hdrdir)/ruby/backward/2/inttypes.h
+ossl_kdf.o: $(hdrdir)/ruby/backward/2/limits.h
+ossl_kdf.o: $(hdrdir)/ruby/backward/2/long_long.h
+ossl_kdf.o: $(hdrdir)/ruby/backward/2/stdalign.h
+ossl_kdf.o: $(hdrdir)/ruby/backward/2/stdarg.h
+ossl_kdf.o: $(hdrdir)/ruby/defines.h
+ossl_kdf.o: $(hdrdir)/ruby/encoding.h
+ossl_kdf.o: $(hdrdir)/ruby/intern.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/anyargs.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/arithmetic.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/assume.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/attr/artificial.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/attr/cold.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/attr/const.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/attr/error.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/attr/format.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/attr/noalias.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/attr/noinline.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/attr/pure.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/attr/restrict.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/attr/warning.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/attr/weakref.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/cast.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/compiler_is.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/compiler_since.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/config.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/constant_p.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/core.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/core/rarray.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/core/rbasic.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/core/rbignum.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/core/rclass.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/core/rdata.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/core/rfile.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/core/rhash.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/core/robject.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/core/rregexp.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/core/rstring.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/core/rstruct.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/ctype.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/dllexport.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/dosish.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/error.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/eval.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/event.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/fl_type.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/gc.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/glob.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/globals.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/has/attribute.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/has/builtin.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/has/extension.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/has/feature.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/has/warning.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/intern/array.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/intern/bignum.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/intern/class.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/intern/compar.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/intern/complex.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/intern/cont.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/intern/dir.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/intern/enum.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/intern/error.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/intern/eval.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/intern/file.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/intern/gc.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/intern/hash.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/intern/io.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/intern/load.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/intern/marshal.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/intern/numeric.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/intern/object.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/intern/parse.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/intern/proc.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/intern/process.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/intern/random.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/intern/range.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/intern/rational.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/intern/re.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/intern/ruby.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/intern/select.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/intern/signal.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/intern/string.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/intern/struct.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/intern/thread.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/intern/time.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/intern/variable.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/intern/vm.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/interpreter.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/iterator.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/memory.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/method.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/module.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/newobj.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/rgengc.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/scan_args.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/special_consts.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/static_assert.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/stdalign.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/symbol.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/token_paste.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/value.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/value_type.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/variable.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/warning_push.h
+ossl_kdf.o: $(hdrdir)/ruby/internal/xmalloc.h
+ossl_kdf.o: $(hdrdir)/ruby/io.h
+ossl_kdf.o: $(hdrdir)/ruby/missing.h
+ossl_kdf.o: $(hdrdir)/ruby/onigmo.h
+ossl_kdf.o: $(hdrdir)/ruby/oniguruma.h
+ossl_kdf.o: $(hdrdir)/ruby/ruby.h
+ossl_kdf.o: $(hdrdir)/ruby/st.h
+ossl_kdf.o: $(hdrdir)/ruby/subst.h
+ossl_kdf.o: $(hdrdir)/ruby/thread.h
+ossl_kdf.o: openssl_missing.h
+ossl_kdf.o: ossl.h
+ossl_kdf.o: ossl_asn1.h
+ossl_kdf.o: ossl_bio.h
+ossl_kdf.o: ossl_bn.h
+ossl_kdf.o: ossl_cipher.h
+ossl_kdf.o: ossl_config.h
+ossl_kdf.o: ossl_digest.h
+ossl_kdf.o: ossl_engine.h
+ossl_kdf.o: ossl_hmac.h
+ossl_kdf.o: ossl_kdf.c
+ossl_kdf.o: ossl_kdf.h
+ossl_kdf.o: ossl_ns_spki.h
+ossl_kdf.o: ossl_ocsp.h
+ossl_kdf.o: ossl_pkcs12.h
+ossl_kdf.o: ossl_pkcs7.h
+ossl_kdf.o: ossl_pkey.h
+ossl_kdf.o: ossl_rand.h
+ossl_kdf.o: ossl_ssl.h
+ossl_kdf.o: ossl_ts.h
+ossl_kdf.o: ossl_x509.h
+ossl_kdf.o: ruby_missing.h
 ossl_ns_spki.o: $(RUBY_EXTCONF_H)
 ossl_ns_spki.o: $(arch_hdrdir)/ruby/config.h
+ossl_ns_spki.o: $(hdrdir)/ruby.h
+ossl_ns_spki.o: $(hdrdir)/ruby/assert.h
 ossl_ns_spki.o: $(hdrdir)/ruby/backward.h
+ossl_ns_spki.o: $(hdrdir)/ruby/backward/2/assume.h
+ossl_ns_spki.o: $(hdrdir)/ruby/backward/2/attributes.h
+ossl_ns_spki.o: $(hdrdir)/ruby/backward/2/bool.h
+ossl_ns_spki.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+ossl_ns_spki.o: $(hdrdir)/ruby/backward/2/inttypes.h
+ossl_ns_spki.o: $(hdrdir)/ruby/backward/2/limits.h
+ossl_ns_spki.o: $(hdrdir)/ruby/backward/2/long_long.h
+ossl_ns_spki.o: $(hdrdir)/ruby/backward/2/stdalign.h
+ossl_ns_spki.o: $(hdrdir)/ruby/backward/2/stdarg.h
 ossl_ns_spki.o: $(hdrdir)/ruby/defines.h
 ossl_ns_spki.o: $(hdrdir)/ruby/encoding.h
 ossl_ns_spki.o: $(hdrdir)/ruby/intern.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/anyargs.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/arithmetic.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/assume.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/attr/artificial.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/attr/cold.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/attr/const.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/attr/error.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/attr/format.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/attr/noalias.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/attr/noinline.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/attr/pure.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/attr/restrict.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/attr/warning.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/attr/weakref.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/cast.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/compiler_is.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/compiler_since.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/config.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/constant_p.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/core.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/core/rarray.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/core/rbasic.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/core/rbignum.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/core/rclass.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/core/rdata.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/core/rfile.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/core/rhash.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/core/robject.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/core/rregexp.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/core/rstring.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/core/rstruct.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/ctype.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/dllexport.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/dosish.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/error.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/eval.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/event.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/fl_type.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/gc.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/glob.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/globals.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/has/attribute.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/has/builtin.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/has/extension.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/has/feature.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/has/warning.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/array.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/bignum.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/class.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/compar.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/complex.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/cont.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/dir.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/enum.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/error.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/eval.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/file.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/gc.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/hash.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/io.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/load.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/marshal.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/numeric.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/object.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/parse.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/proc.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/process.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/random.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/range.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/rational.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/re.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/ruby.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/select.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/signal.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/string.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/struct.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/thread.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/time.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/variable.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/intern/vm.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/interpreter.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/iterator.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/memory.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/method.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/module.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/newobj.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/rgengc.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/scan_args.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/special_consts.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/static_assert.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/stdalign.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/symbol.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/token_paste.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/value.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/value_type.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/variable.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/warning_push.h
+ossl_ns_spki.o: $(hdrdir)/ruby/internal/xmalloc.h
 ossl_ns_spki.o: $(hdrdir)/ruby/io.h
 ossl_ns_spki.o: $(hdrdir)/ruby/missing.h
+ossl_ns_spki.o: $(hdrdir)/ruby/onigmo.h
 ossl_ns_spki.o: $(hdrdir)/ruby/oniguruma.h
 ossl_ns_spki.o: $(hdrdir)/ruby/ruby.h
 ossl_ns_spki.o: $(hdrdir)/ruby/st.h
 ossl_ns_spki.o: $(hdrdir)/ruby/subst.h
 ossl_ns_spki.o: $(hdrdir)/ruby/thread.h
-ossl_ns_spki.o: $(top_srcdir)/include/ruby.h
 ossl_ns_spki.o: openssl_missing.h
 ossl_ns_spki.o: ossl.h
 ossl_ns_spki.o: ossl_asn1.h
@@ -351,32 +2050,183 @@ ossl_ns_spki.o: ossl_config.h
 ossl_ns_spki.o: ossl_digest.h
 ossl_ns_spki.o: ossl_engine.h
 ossl_ns_spki.o: ossl_hmac.h
+ossl_ns_spki.o: ossl_kdf.h
 ossl_ns_spki.o: ossl_ns_spki.c
 ossl_ns_spki.o: ossl_ns_spki.h
 ossl_ns_spki.o: ossl_ocsp.h
 ossl_ns_spki.o: ossl_pkcs12.h
-ossl_ns_spki.o: ossl_pkcs5.h
 ossl_ns_spki.o: ossl_pkcs7.h
 ossl_ns_spki.o: ossl_pkey.h
 ossl_ns_spki.o: ossl_rand.h
 ossl_ns_spki.o: ossl_ssl.h
-ossl_ns_spki.o: ossl_version.h
+ossl_ns_spki.o: ossl_ts.h
 ossl_ns_spki.o: ossl_x509.h
 ossl_ns_spki.o: ruby_missing.h
 ossl_ocsp.o: $(RUBY_EXTCONF_H)
 ossl_ocsp.o: $(arch_hdrdir)/ruby/config.h
+ossl_ocsp.o: $(hdrdir)/ruby.h
+ossl_ocsp.o: $(hdrdir)/ruby/assert.h
 ossl_ocsp.o: $(hdrdir)/ruby/backward.h
+ossl_ocsp.o: $(hdrdir)/ruby/backward/2/assume.h
+ossl_ocsp.o: $(hdrdir)/ruby/backward/2/attributes.h
+ossl_ocsp.o: $(hdrdir)/ruby/backward/2/bool.h
+ossl_ocsp.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+ossl_ocsp.o: $(hdrdir)/ruby/backward/2/inttypes.h
+ossl_ocsp.o: $(hdrdir)/ruby/backward/2/limits.h
+ossl_ocsp.o: $(hdrdir)/ruby/backward/2/long_long.h
+ossl_ocsp.o: $(hdrdir)/ruby/backward/2/stdalign.h
+ossl_ocsp.o: $(hdrdir)/ruby/backward/2/stdarg.h
 ossl_ocsp.o: $(hdrdir)/ruby/defines.h
 ossl_ocsp.o: $(hdrdir)/ruby/encoding.h
 ossl_ocsp.o: $(hdrdir)/ruby/intern.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/anyargs.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/arithmetic.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/assume.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/attr/artificial.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/attr/cold.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/attr/const.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/attr/error.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/attr/format.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/attr/noalias.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/attr/noinline.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/attr/pure.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/attr/restrict.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/attr/warning.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/attr/weakref.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/cast.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/compiler_is.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/compiler_since.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/config.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/constant_p.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/core.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/core/rarray.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/core/rbasic.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/core/rbignum.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/core/rclass.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/core/rdata.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/core/rfile.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/core/rhash.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/core/robject.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/core/rregexp.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/core/rstring.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/core/rstruct.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/ctype.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/dllexport.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/dosish.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/error.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/eval.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/event.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/fl_type.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/gc.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/glob.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/globals.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/has/attribute.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/has/builtin.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/has/extension.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/has/feature.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/has/warning.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/array.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/bignum.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/class.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/compar.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/complex.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/cont.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/dir.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/enum.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/error.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/eval.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/file.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/gc.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/hash.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/io.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/load.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/marshal.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/numeric.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/object.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/parse.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/proc.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/process.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/random.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/range.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/rational.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/re.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/ruby.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/select.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/signal.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/string.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/struct.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/thread.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/time.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/variable.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/intern/vm.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/interpreter.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/iterator.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/memory.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/method.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/module.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/newobj.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/rgengc.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/scan_args.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/special_consts.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/static_assert.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/stdalign.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/symbol.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/token_paste.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/value.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/value_type.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/variable.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/warning_push.h
+ossl_ocsp.o: $(hdrdir)/ruby/internal/xmalloc.h
 ossl_ocsp.o: $(hdrdir)/ruby/io.h
 ossl_ocsp.o: $(hdrdir)/ruby/missing.h
+ossl_ocsp.o: $(hdrdir)/ruby/onigmo.h
 ossl_ocsp.o: $(hdrdir)/ruby/oniguruma.h
 ossl_ocsp.o: $(hdrdir)/ruby/ruby.h
 ossl_ocsp.o: $(hdrdir)/ruby/st.h
 ossl_ocsp.o: $(hdrdir)/ruby/subst.h
 ossl_ocsp.o: $(hdrdir)/ruby/thread.h
-ossl_ocsp.o: $(top_srcdir)/include/ruby.h
 ossl_ocsp.o: openssl_missing.h
 ossl_ocsp.o: ossl.h
 ossl_ocsp.o: ossl_asn1.h
@@ -387,32 +2237,183 @@ ossl_ocsp.o: ossl_config.h
 ossl_ocsp.o: ossl_digest.h
 ossl_ocsp.o: ossl_engine.h
 ossl_ocsp.o: ossl_hmac.h
+ossl_ocsp.o: ossl_kdf.h
 ossl_ocsp.o: ossl_ns_spki.h
 ossl_ocsp.o: ossl_ocsp.c
 ossl_ocsp.o: ossl_ocsp.h
 ossl_ocsp.o: ossl_pkcs12.h
-ossl_ocsp.o: ossl_pkcs5.h
 ossl_ocsp.o: ossl_pkcs7.h
 ossl_ocsp.o: ossl_pkey.h
 ossl_ocsp.o: ossl_rand.h
 ossl_ocsp.o: ossl_ssl.h
-ossl_ocsp.o: ossl_version.h
+ossl_ocsp.o: ossl_ts.h
 ossl_ocsp.o: ossl_x509.h
 ossl_ocsp.o: ruby_missing.h
 ossl_pkcs12.o: $(RUBY_EXTCONF_H)
 ossl_pkcs12.o: $(arch_hdrdir)/ruby/config.h
+ossl_pkcs12.o: $(hdrdir)/ruby.h
+ossl_pkcs12.o: $(hdrdir)/ruby/assert.h
 ossl_pkcs12.o: $(hdrdir)/ruby/backward.h
+ossl_pkcs12.o: $(hdrdir)/ruby/backward/2/assume.h
+ossl_pkcs12.o: $(hdrdir)/ruby/backward/2/attributes.h
+ossl_pkcs12.o: $(hdrdir)/ruby/backward/2/bool.h
+ossl_pkcs12.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+ossl_pkcs12.o: $(hdrdir)/ruby/backward/2/inttypes.h
+ossl_pkcs12.o: $(hdrdir)/ruby/backward/2/limits.h
+ossl_pkcs12.o: $(hdrdir)/ruby/backward/2/long_long.h
+ossl_pkcs12.o: $(hdrdir)/ruby/backward/2/stdalign.h
+ossl_pkcs12.o: $(hdrdir)/ruby/backward/2/stdarg.h
 ossl_pkcs12.o: $(hdrdir)/ruby/defines.h
 ossl_pkcs12.o: $(hdrdir)/ruby/encoding.h
 ossl_pkcs12.o: $(hdrdir)/ruby/intern.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/anyargs.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/arithmetic.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/assume.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/attr/artificial.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/attr/cold.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/attr/const.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/attr/error.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/attr/format.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/attr/noalias.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/attr/noinline.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/attr/pure.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/attr/restrict.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/attr/warning.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/attr/weakref.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/cast.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/compiler_is.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/compiler_since.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/config.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/constant_p.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/core.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/core/rarray.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/core/rbasic.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/core/rbignum.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/core/rclass.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/core/rdata.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/core/rfile.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/core/rhash.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/core/robject.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/core/rregexp.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/core/rstring.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/core/rstruct.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/ctype.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/dllexport.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/dosish.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/error.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/eval.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/event.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/fl_type.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/gc.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/glob.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/globals.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/has/attribute.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/has/builtin.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/has/extension.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/has/feature.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/has/warning.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/array.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/bignum.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/class.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/compar.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/complex.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/cont.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/dir.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/enum.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/error.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/eval.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/file.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/gc.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/hash.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/io.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/load.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/marshal.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/numeric.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/object.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/parse.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/proc.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/process.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/random.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/range.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/rational.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/re.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/ruby.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/select.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/signal.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/string.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/struct.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/thread.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/time.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/variable.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/intern/vm.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/interpreter.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/iterator.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/memory.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/method.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/module.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/newobj.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/rgengc.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/scan_args.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/special_consts.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/static_assert.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/stdalign.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/symbol.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/token_paste.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/value.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/value_type.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/variable.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/warning_push.h
+ossl_pkcs12.o: $(hdrdir)/ruby/internal/xmalloc.h
 ossl_pkcs12.o: $(hdrdir)/ruby/io.h
 ossl_pkcs12.o: $(hdrdir)/ruby/missing.h
+ossl_pkcs12.o: $(hdrdir)/ruby/onigmo.h
 ossl_pkcs12.o: $(hdrdir)/ruby/oniguruma.h
 ossl_pkcs12.o: $(hdrdir)/ruby/ruby.h
 ossl_pkcs12.o: $(hdrdir)/ruby/st.h
 ossl_pkcs12.o: $(hdrdir)/ruby/subst.h
 ossl_pkcs12.o: $(hdrdir)/ruby/thread.h
-ossl_pkcs12.o: $(top_srcdir)/include/ruby.h
 ossl_pkcs12.o: openssl_missing.h
 ossl_pkcs12.o: ossl.h
 ossl_pkcs12.o: ossl_asn1.h
@@ -423,68 +2424,183 @@ ossl_pkcs12.o: ossl_config.h
 ossl_pkcs12.o: ossl_digest.h
 ossl_pkcs12.o: ossl_engine.h
 ossl_pkcs12.o: ossl_hmac.h
+ossl_pkcs12.o: ossl_kdf.h
 ossl_pkcs12.o: ossl_ns_spki.h
 ossl_pkcs12.o: ossl_ocsp.h
 ossl_pkcs12.o: ossl_pkcs12.c
 ossl_pkcs12.o: ossl_pkcs12.h
-ossl_pkcs12.o: ossl_pkcs5.h
 ossl_pkcs12.o: ossl_pkcs7.h
 ossl_pkcs12.o: ossl_pkey.h
 ossl_pkcs12.o: ossl_rand.h
 ossl_pkcs12.o: ossl_ssl.h
-ossl_pkcs12.o: ossl_version.h
+ossl_pkcs12.o: ossl_ts.h
 ossl_pkcs12.o: ossl_x509.h
 ossl_pkcs12.o: ruby_missing.h
-ossl_pkcs5.o: $(RUBY_EXTCONF_H)
-ossl_pkcs5.o: $(arch_hdrdir)/ruby/config.h
-ossl_pkcs5.o: $(hdrdir)/ruby/backward.h
-ossl_pkcs5.o: $(hdrdir)/ruby/defines.h
-ossl_pkcs5.o: $(hdrdir)/ruby/encoding.h
-ossl_pkcs5.o: $(hdrdir)/ruby/intern.h
-ossl_pkcs5.o: $(hdrdir)/ruby/io.h
-ossl_pkcs5.o: $(hdrdir)/ruby/missing.h
-ossl_pkcs5.o: $(hdrdir)/ruby/oniguruma.h
-ossl_pkcs5.o: $(hdrdir)/ruby/ruby.h
-ossl_pkcs5.o: $(hdrdir)/ruby/st.h
-ossl_pkcs5.o: $(hdrdir)/ruby/subst.h
-ossl_pkcs5.o: $(hdrdir)/ruby/thread.h
-ossl_pkcs5.o: $(top_srcdir)/include/ruby.h
-ossl_pkcs5.o: openssl_missing.h
-ossl_pkcs5.o: ossl.h
-ossl_pkcs5.o: ossl_asn1.h
-ossl_pkcs5.o: ossl_bio.h
-ossl_pkcs5.o: ossl_bn.h
-ossl_pkcs5.o: ossl_cipher.h
-ossl_pkcs5.o: ossl_config.h
-ossl_pkcs5.o: ossl_digest.h
-ossl_pkcs5.o: ossl_engine.h
-ossl_pkcs5.o: ossl_hmac.h
-ossl_pkcs5.o: ossl_ns_spki.h
-ossl_pkcs5.o: ossl_ocsp.h
-ossl_pkcs5.o: ossl_pkcs12.h
-ossl_pkcs5.o: ossl_pkcs5.c
-ossl_pkcs5.o: ossl_pkcs5.h
-ossl_pkcs5.o: ossl_pkcs7.h
-ossl_pkcs5.o: ossl_pkey.h
-ossl_pkcs5.o: ossl_rand.h
-ossl_pkcs5.o: ossl_ssl.h
-ossl_pkcs5.o: ossl_version.h
-ossl_pkcs5.o: ossl_x509.h
-ossl_pkcs5.o: ruby_missing.h
 ossl_pkcs7.o: $(RUBY_EXTCONF_H)
 ossl_pkcs7.o: $(arch_hdrdir)/ruby/config.h
+ossl_pkcs7.o: $(hdrdir)/ruby.h
+ossl_pkcs7.o: $(hdrdir)/ruby/assert.h
 ossl_pkcs7.o: $(hdrdir)/ruby/backward.h
+ossl_pkcs7.o: $(hdrdir)/ruby/backward/2/assume.h
+ossl_pkcs7.o: $(hdrdir)/ruby/backward/2/attributes.h
+ossl_pkcs7.o: $(hdrdir)/ruby/backward/2/bool.h
+ossl_pkcs7.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+ossl_pkcs7.o: $(hdrdir)/ruby/backward/2/inttypes.h
+ossl_pkcs7.o: $(hdrdir)/ruby/backward/2/limits.h
+ossl_pkcs7.o: $(hdrdir)/ruby/backward/2/long_long.h
+ossl_pkcs7.o: $(hdrdir)/ruby/backward/2/stdalign.h
+ossl_pkcs7.o: $(hdrdir)/ruby/backward/2/stdarg.h
 ossl_pkcs7.o: $(hdrdir)/ruby/defines.h
 ossl_pkcs7.o: $(hdrdir)/ruby/encoding.h
 ossl_pkcs7.o: $(hdrdir)/ruby/intern.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/anyargs.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/arithmetic.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/assume.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/attr/artificial.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/attr/cold.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/attr/const.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/attr/error.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/attr/format.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/attr/noalias.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/attr/noinline.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/attr/pure.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/attr/restrict.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/attr/warning.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/attr/weakref.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/cast.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/compiler_is.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/compiler_since.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/config.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/constant_p.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/core.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/core/rarray.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/core/rbasic.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/core/rbignum.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/core/rclass.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/core/rdata.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/core/rfile.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/core/rhash.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/core/robject.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/core/rregexp.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/core/rstring.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/core/rstruct.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/ctype.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/dllexport.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/dosish.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/error.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/eval.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/event.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/fl_type.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/gc.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/glob.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/globals.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/has/attribute.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/has/builtin.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/has/extension.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/has/feature.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/has/warning.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/array.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/bignum.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/class.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/compar.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/complex.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/cont.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/dir.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/enum.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/error.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/eval.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/file.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/gc.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/hash.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/io.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/load.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/marshal.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/numeric.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/object.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/parse.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/proc.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/process.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/random.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/range.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/rational.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/re.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/ruby.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/select.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/signal.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/string.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/struct.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/thread.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/time.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/variable.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/intern/vm.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/interpreter.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/iterator.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/memory.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/method.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/module.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/newobj.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/rgengc.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/scan_args.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/special_consts.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/static_assert.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/stdalign.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/symbol.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/token_paste.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/value.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/value_type.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/variable.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/warning_push.h
+ossl_pkcs7.o: $(hdrdir)/ruby/internal/xmalloc.h
 ossl_pkcs7.o: $(hdrdir)/ruby/io.h
 ossl_pkcs7.o: $(hdrdir)/ruby/missing.h
+ossl_pkcs7.o: $(hdrdir)/ruby/onigmo.h
 ossl_pkcs7.o: $(hdrdir)/ruby/oniguruma.h
 ossl_pkcs7.o: $(hdrdir)/ruby/ruby.h
 ossl_pkcs7.o: $(hdrdir)/ruby/st.h
 ossl_pkcs7.o: $(hdrdir)/ruby/subst.h
 ossl_pkcs7.o: $(hdrdir)/ruby/thread.h
-ossl_pkcs7.o: $(top_srcdir)/include/ruby.h
 ossl_pkcs7.o: openssl_missing.h
 ossl_pkcs7.o: ossl.h
 ossl_pkcs7.o: ossl_asn1.h
@@ -495,32 +2611,183 @@ ossl_pkcs7.o: ossl_config.h
 ossl_pkcs7.o: ossl_digest.h
 ossl_pkcs7.o: ossl_engine.h
 ossl_pkcs7.o: ossl_hmac.h
+ossl_pkcs7.o: ossl_kdf.h
 ossl_pkcs7.o: ossl_ns_spki.h
 ossl_pkcs7.o: ossl_ocsp.h
 ossl_pkcs7.o: ossl_pkcs12.h
-ossl_pkcs7.o: ossl_pkcs5.h
 ossl_pkcs7.o: ossl_pkcs7.c
 ossl_pkcs7.o: ossl_pkcs7.h
 ossl_pkcs7.o: ossl_pkey.h
 ossl_pkcs7.o: ossl_rand.h
 ossl_pkcs7.o: ossl_ssl.h
-ossl_pkcs7.o: ossl_version.h
+ossl_pkcs7.o: ossl_ts.h
 ossl_pkcs7.o: ossl_x509.h
 ossl_pkcs7.o: ruby_missing.h
 ossl_pkey.o: $(RUBY_EXTCONF_H)
 ossl_pkey.o: $(arch_hdrdir)/ruby/config.h
+ossl_pkey.o: $(hdrdir)/ruby.h
+ossl_pkey.o: $(hdrdir)/ruby/assert.h
 ossl_pkey.o: $(hdrdir)/ruby/backward.h
+ossl_pkey.o: $(hdrdir)/ruby/backward/2/assume.h
+ossl_pkey.o: $(hdrdir)/ruby/backward/2/attributes.h
+ossl_pkey.o: $(hdrdir)/ruby/backward/2/bool.h
+ossl_pkey.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+ossl_pkey.o: $(hdrdir)/ruby/backward/2/inttypes.h
+ossl_pkey.o: $(hdrdir)/ruby/backward/2/limits.h
+ossl_pkey.o: $(hdrdir)/ruby/backward/2/long_long.h
+ossl_pkey.o: $(hdrdir)/ruby/backward/2/stdalign.h
+ossl_pkey.o: $(hdrdir)/ruby/backward/2/stdarg.h
 ossl_pkey.o: $(hdrdir)/ruby/defines.h
 ossl_pkey.o: $(hdrdir)/ruby/encoding.h
 ossl_pkey.o: $(hdrdir)/ruby/intern.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/anyargs.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/arithmetic.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/assume.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/attr/artificial.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/attr/cold.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/attr/const.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/attr/error.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/attr/format.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/attr/noalias.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/attr/noinline.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/attr/pure.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/attr/restrict.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/attr/warning.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/attr/weakref.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/cast.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/compiler_is.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/compiler_since.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/config.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/constant_p.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/core.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/core/rarray.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/core/rbasic.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/core/rbignum.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/core/rclass.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/core/rdata.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/core/rfile.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/core/rhash.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/core/robject.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/core/rregexp.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/core/rstring.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/core/rstruct.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/ctype.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/dllexport.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/dosish.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/error.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/eval.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/event.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/fl_type.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/gc.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/glob.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/globals.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/has/attribute.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/has/builtin.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/has/extension.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/has/feature.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/has/warning.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/intern/array.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/intern/bignum.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/intern/class.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/intern/compar.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/intern/complex.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/intern/cont.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/intern/dir.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/intern/enum.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/intern/error.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/intern/eval.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/intern/file.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/intern/gc.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/intern/hash.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/intern/io.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/intern/load.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/intern/marshal.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/intern/numeric.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/intern/object.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/intern/parse.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/intern/proc.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/intern/process.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/intern/random.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/intern/range.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/intern/rational.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/intern/re.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/intern/ruby.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/intern/select.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/intern/signal.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/intern/string.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/intern/struct.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/intern/thread.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/intern/time.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/intern/variable.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/intern/vm.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/interpreter.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/iterator.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/memory.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/method.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/module.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/newobj.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/rgengc.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/scan_args.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/special_consts.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/static_assert.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/stdalign.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/symbol.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/token_paste.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/value.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/value_type.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/variable.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/warning_push.h
+ossl_pkey.o: $(hdrdir)/ruby/internal/xmalloc.h
 ossl_pkey.o: $(hdrdir)/ruby/io.h
 ossl_pkey.o: $(hdrdir)/ruby/missing.h
+ossl_pkey.o: $(hdrdir)/ruby/onigmo.h
 ossl_pkey.o: $(hdrdir)/ruby/oniguruma.h
 ossl_pkey.o: $(hdrdir)/ruby/ruby.h
 ossl_pkey.o: $(hdrdir)/ruby/st.h
 ossl_pkey.o: $(hdrdir)/ruby/subst.h
 ossl_pkey.o: $(hdrdir)/ruby/thread.h
-ossl_pkey.o: $(top_srcdir)/include/ruby.h
 ossl_pkey.o: openssl_missing.h
 ossl_pkey.o: ossl.h
 ossl_pkey.o: ossl_asn1.h
@@ -531,32 +2798,183 @@ ossl_pkey.o: ossl_config.h
 ossl_pkey.o: ossl_digest.h
 ossl_pkey.o: ossl_engine.h
 ossl_pkey.o: ossl_hmac.h
+ossl_pkey.o: ossl_kdf.h
 ossl_pkey.o: ossl_ns_spki.h
 ossl_pkey.o: ossl_ocsp.h
 ossl_pkey.o: ossl_pkcs12.h
-ossl_pkey.o: ossl_pkcs5.h
 ossl_pkey.o: ossl_pkcs7.h
 ossl_pkey.o: ossl_pkey.c
 ossl_pkey.o: ossl_pkey.h
 ossl_pkey.o: ossl_rand.h
 ossl_pkey.o: ossl_ssl.h
-ossl_pkey.o: ossl_version.h
+ossl_pkey.o: ossl_ts.h
 ossl_pkey.o: ossl_x509.h
 ossl_pkey.o: ruby_missing.h
 ossl_pkey_dh.o: $(RUBY_EXTCONF_H)
 ossl_pkey_dh.o: $(arch_hdrdir)/ruby/config.h
+ossl_pkey_dh.o: $(hdrdir)/ruby.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/assert.h
 ossl_pkey_dh.o: $(hdrdir)/ruby/backward.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/backward/2/assume.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/backward/2/attributes.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/backward/2/bool.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/backward/2/inttypes.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/backward/2/limits.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/backward/2/long_long.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/backward/2/stdalign.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/backward/2/stdarg.h
 ossl_pkey_dh.o: $(hdrdir)/ruby/defines.h
 ossl_pkey_dh.o: $(hdrdir)/ruby/encoding.h
 ossl_pkey_dh.o: $(hdrdir)/ruby/intern.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/anyargs.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/arithmetic.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/assume.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/attr/artificial.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/attr/cold.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/attr/const.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/attr/error.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/attr/format.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/attr/noalias.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/attr/noinline.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/attr/pure.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/attr/restrict.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/attr/warning.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/attr/weakref.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/cast.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/compiler_is.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/compiler_since.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/config.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/constant_p.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/core.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/core/rarray.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/core/rbasic.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/core/rbignum.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/core/rclass.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/core/rdata.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/core/rfile.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/core/rhash.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/core/robject.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/core/rregexp.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/core/rstring.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/core/rstruct.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/ctype.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/dllexport.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/dosish.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/error.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/eval.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/event.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/fl_type.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/gc.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/glob.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/globals.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/has/attribute.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/has/builtin.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/has/extension.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/has/feature.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/has/warning.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/array.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/bignum.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/class.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/compar.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/complex.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/cont.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/dir.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/enum.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/error.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/eval.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/file.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/gc.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/hash.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/io.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/load.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/marshal.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/numeric.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/object.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/parse.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/proc.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/process.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/random.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/range.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/rational.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/re.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/ruby.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/select.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/signal.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/string.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/struct.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/thread.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/time.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/variable.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/intern/vm.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/interpreter.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/iterator.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/memory.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/method.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/module.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/newobj.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/rgengc.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/scan_args.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/special_consts.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/static_assert.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/stdalign.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/symbol.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/token_paste.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/value.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/value_type.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/variable.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/warning_push.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/internal/xmalloc.h
 ossl_pkey_dh.o: $(hdrdir)/ruby/io.h
 ossl_pkey_dh.o: $(hdrdir)/ruby/missing.h
+ossl_pkey_dh.o: $(hdrdir)/ruby/onigmo.h
 ossl_pkey_dh.o: $(hdrdir)/ruby/oniguruma.h
 ossl_pkey_dh.o: $(hdrdir)/ruby/ruby.h
 ossl_pkey_dh.o: $(hdrdir)/ruby/st.h
 ossl_pkey_dh.o: $(hdrdir)/ruby/subst.h
 ossl_pkey_dh.o: $(hdrdir)/ruby/thread.h
-ossl_pkey_dh.o: $(top_srcdir)/include/ruby.h
 ossl_pkey_dh.o: openssl_missing.h
 ossl_pkey_dh.o: ossl.h
 ossl_pkey_dh.o: ossl_asn1.h
@@ -567,32 +2985,183 @@ ossl_pkey_dh.o: ossl_config.h
 ossl_pkey_dh.o: ossl_digest.h
 ossl_pkey_dh.o: ossl_engine.h
 ossl_pkey_dh.o: ossl_hmac.h
+ossl_pkey_dh.o: ossl_kdf.h
 ossl_pkey_dh.o: ossl_ns_spki.h
 ossl_pkey_dh.o: ossl_ocsp.h
 ossl_pkey_dh.o: ossl_pkcs12.h
-ossl_pkey_dh.o: ossl_pkcs5.h
 ossl_pkey_dh.o: ossl_pkcs7.h
 ossl_pkey_dh.o: ossl_pkey.h
 ossl_pkey_dh.o: ossl_pkey_dh.c
 ossl_pkey_dh.o: ossl_rand.h
 ossl_pkey_dh.o: ossl_ssl.h
-ossl_pkey_dh.o: ossl_version.h
+ossl_pkey_dh.o: ossl_ts.h
 ossl_pkey_dh.o: ossl_x509.h
 ossl_pkey_dh.o: ruby_missing.h
 ossl_pkey_dsa.o: $(RUBY_EXTCONF_H)
 ossl_pkey_dsa.o: $(arch_hdrdir)/ruby/config.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/assert.h
 ossl_pkey_dsa.o: $(hdrdir)/ruby/backward.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/backward/2/assume.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/backward/2/attributes.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/backward/2/bool.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/backward/2/inttypes.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/backward/2/limits.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/backward/2/long_long.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/backward/2/stdalign.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/backward/2/stdarg.h
 ossl_pkey_dsa.o: $(hdrdir)/ruby/defines.h
 ossl_pkey_dsa.o: $(hdrdir)/ruby/encoding.h
 ossl_pkey_dsa.o: $(hdrdir)/ruby/intern.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/anyargs.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/arithmetic.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/assume.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/attr/artificial.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/attr/cold.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/attr/const.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/attr/error.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/attr/format.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/attr/noalias.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/attr/noinline.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/attr/pure.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/attr/restrict.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/attr/warning.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/attr/weakref.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/cast.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/compiler_is.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/compiler_since.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/config.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/constant_p.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/core.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/core/rarray.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/core/rbasic.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/core/rbignum.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/core/rclass.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/core/rdata.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/core/rfile.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/core/rhash.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/core/robject.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/core/rregexp.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/core/rstring.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/core/rstruct.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/ctype.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/dllexport.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/dosish.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/error.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/eval.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/event.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/fl_type.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/gc.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/glob.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/globals.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/has/attribute.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/has/builtin.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/has/extension.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/has/feature.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/has/warning.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/array.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/bignum.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/class.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/compar.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/complex.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/cont.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/dir.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/enum.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/error.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/eval.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/file.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/gc.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/hash.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/io.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/load.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/marshal.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/numeric.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/object.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/parse.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/proc.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/process.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/random.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/range.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/rational.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/re.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/ruby.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/select.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/signal.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/string.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/struct.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/thread.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/time.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/variable.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/intern/vm.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/interpreter.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/iterator.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/memory.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/method.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/module.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/newobj.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/rgengc.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/scan_args.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/special_consts.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/static_assert.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/stdalign.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/symbol.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/token_paste.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/value.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/value_type.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/variable.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/warning_push.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/internal/xmalloc.h
 ossl_pkey_dsa.o: $(hdrdir)/ruby/io.h
 ossl_pkey_dsa.o: $(hdrdir)/ruby/missing.h
+ossl_pkey_dsa.o: $(hdrdir)/ruby/onigmo.h
 ossl_pkey_dsa.o: $(hdrdir)/ruby/oniguruma.h
 ossl_pkey_dsa.o: $(hdrdir)/ruby/ruby.h
 ossl_pkey_dsa.o: $(hdrdir)/ruby/st.h
 ossl_pkey_dsa.o: $(hdrdir)/ruby/subst.h
 ossl_pkey_dsa.o: $(hdrdir)/ruby/thread.h
-ossl_pkey_dsa.o: $(top_srcdir)/include/ruby.h
 ossl_pkey_dsa.o: openssl_missing.h
 ossl_pkey_dsa.o: ossl.h
 ossl_pkey_dsa.o: ossl_asn1.h
@@ -603,32 +3172,183 @@ ossl_pkey_dsa.o: ossl_config.h
 ossl_pkey_dsa.o: ossl_digest.h
 ossl_pkey_dsa.o: ossl_engine.h
 ossl_pkey_dsa.o: ossl_hmac.h
+ossl_pkey_dsa.o: ossl_kdf.h
 ossl_pkey_dsa.o: ossl_ns_spki.h
 ossl_pkey_dsa.o: ossl_ocsp.h
 ossl_pkey_dsa.o: ossl_pkcs12.h
-ossl_pkey_dsa.o: ossl_pkcs5.h
 ossl_pkey_dsa.o: ossl_pkcs7.h
 ossl_pkey_dsa.o: ossl_pkey.h
 ossl_pkey_dsa.o: ossl_pkey_dsa.c
 ossl_pkey_dsa.o: ossl_rand.h
 ossl_pkey_dsa.o: ossl_ssl.h
-ossl_pkey_dsa.o: ossl_version.h
+ossl_pkey_dsa.o: ossl_ts.h
 ossl_pkey_dsa.o: ossl_x509.h
 ossl_pkey_dsa.o: ruby_missing.h
 ossl_pkey_ec.o: $(RUBY_EXTCONF_H)
 ossl_pkey_ec.o: $(arch_hdrdir)/ruby/config.h
+ossl_pkey_ec.o: $(hdrdir)/ruby.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/assert.h
 ossl_pkey_ec.o: $(hdrdir)/ruby/backward.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/backward/2/assume.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/backward/2/attributes.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/backward/2/bool.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/backward/2/inttypes.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/backward/2/limits.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/backward/2/long_long.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/backward/2/stdalign.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/backward/2/stdarg.h
 ossl_pkey_ec.o: $(hdrdir)/ruby/defines.h
 ossl_pkey_ec.o: $(hdrdir)/ruby/encoding.h
 ossl_pkey_ec.o: $(hdrdir)/ruby/intern.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/anyargs.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/arithmetic.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/assume.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/attr/artificial.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/attr/cold.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/attr/const.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/attr/error.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/attr/format.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/attr/noalias.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/attr/noinline.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/attr/pure.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/attr/restrict.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/attr/warning.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/attr/weakref.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/cast.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/compiler_is.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/compiler_since.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/config.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/constant_p.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/core.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/core/rarray.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/core/rbasic.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/core/rbignum.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/core/rclass.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/core/rdata.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/core/rfile.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/core/rhash.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/core/robject.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/core/rregexp.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/core/rstring.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/core/rstruct.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/ctype.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/dllexport.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/dosish.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/error.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/eval.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/event.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/fl_type.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/gc.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/glob.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/globals.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/has/attribute.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/has/builtin.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/has/extension.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/has/feature.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/has/warning.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/array.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/bignum.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/class.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/compar.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/complex.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/cont.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/dir.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/enum.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/error.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/eval.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/file.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/gc.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/hash.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/io.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/load.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/marshal.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/numeric.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/object.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/parse.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/proc.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/process.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/random.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/range.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/rational.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/re.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/ruby.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/select.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/signal.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/string.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/struct.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/thread.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/time.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/variable.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/intern/vm.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/interpreter.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/iterator.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/memory.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/method.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/module.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/newobj.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/rgengc.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/scan_args.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/special_consts.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/static_assert.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/stdalign.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/symbol.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/token_paste.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/value.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/value_type.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/variable.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/warning_push.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/internal/xmalloc.h
 ossl_pkey_ec.o: $(hdrdir)/ruby/io.h
 ossl_pkey_ec.o: $(hdrdir)/ruby/missing.h
+ossl_pkey_ec.o: $(hdrdir)/ruby/onigmo.h
 ossl_pkey_ec.o: $(hdrdir)/ruby/oniguruma.h
 ossl_pkey_ec.o: $(hdrdir)/ruby/ruby.h
 ossl_pkey_ec.o: $(hdrdir)/ruby/st.h
 ossl_pkey_ec.o: $(hdrdir)/ruby/subst.h
 ossl_pkey_ec.o: $(hdrdir)/ruby/thread.h
-ossl_pkey_ec.o: $(top_srcdir)/include/ruby.h
 ossl_pkey_ec.o: openssl_missing.h
 ossl_pkey_ec.o: ossl.h
 ossl_pkey_ec.o: ossl_asn1.h
@@ -639,32 +3359,183 @@ ossl_pkey_ec.o: ossl_config.h
 ossl_pkey_ec.o: ossl_digest.h
 ossl_pkey_ec.o: ossl_engine.h
 ossl_pkey_ec.o: ossl_hmac.h
+ossl_pkey_ec.o: ossl_kdf.h
 ossl_pkey_ec.o: ossl_ns_spki.h
 ossl_pkey_ec.o: ossl_ocsp.h
 ossl_pkey_ec.o: ossl_pkcs12.h
-ossl_pkey_ec.o: ossl_pkcs5.h
 ossl_pkey_ec.o: ossl_pkcs7.h
 ossl_pkey_ec.o: ossl_pkey.h
 ossl_pkey_ec.o: ossl_pkey_ec.c
 ossl_pkey_ec.o: ossl_rand.h
 ossl_pkey_ec.o: ossl_ssl.h
-ossl_pkey_ec.o: ossl_version.h
+ossl_pkey_ec.o: ossl_ts.h
 ossl_pkey_ec.o: ossl_x509.h
 ossl_pkey_ec.o: ruby_missing.h
 ossl_pkey_rsa.o: $(RUBY_EXTCONF_H)
 ossl_pkey_rsa.o: $(arch_hdrdir)/ruby/config.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/assert.h
 ossl_pkey_rsa.o: $(hdrdir)/ruby/backward.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/backward/2/assume.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/backward/2/attributes.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/backward/2/bool.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/backward/2/inttypes.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/backward/2/limits.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/backward/2/long_long.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/backward/2/stdalign.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/backward/2/stdarg.h
 ossl_pkey_rsa.o: $(hdrdir)/ruby/defines.h
 ossl_pkey_rsa.o: $(hdrdir)/ruby/encoding.h
 ossl_pkey_rsa.o: $(hdrdir)/ruby/intern.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/anyargs.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/arithmetic.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/assume.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/attr/artificial.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/attr/cold.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/attr/const.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/attr/error.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/attr/format.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/attr/noalias.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/attr/noinline.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/attr/pure.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/attr/restrict.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/attr/warning.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/attr/weakref.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/cast.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/compiler_is.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/compiler_since.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/config.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/constant_p.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/core.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/core/rarray.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/core/rbasic.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/core/rbignum.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/core/rclass.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/core/rdata.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/core/rfile.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/core/rhash.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/core/robject.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/core/rregexp.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/core/rstring.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/core/rstruct.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/ctype.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/dllexport.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/dosish.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/error.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/eval.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/event.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/fl_type.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/gc.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/glob.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/globals.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/has/attribute.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/has/builtin.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/has/extension.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/has/feature.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/has/warning.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/array.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/bignum.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/class.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/compar.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/complex.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/cont.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/dir.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/enum.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/error.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/eval.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/file.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/gc.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/hash.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/io.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/load.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/marshal.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/numeric.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/object.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/parse.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/proc.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/process.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/random.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/range.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/rational.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/re.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/ruby.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/select.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/signal.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/string.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/struct.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/thread.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/time.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/variable.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/intern/vm.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/interpreter.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/iterator.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/memory.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/method.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/module.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/newobj.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/rgengc.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/scan_args.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/special_consts.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/static_assert.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/stdalign.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/symbol.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/token_paste.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/value.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/value_type.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/variable.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/warning_push.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/internal/xmalloc.h
 ossl_pkey_rsa.o: $(hdrdir)/ruby/io.h
 ossl_pkey_rsa.o: $(hdrdir)/ruby/missing.h
+ossl_pkey_rsa.o: $(hdrdir)/ruby/onigmo.h
 ossl_pkey_rsa.o: $(hdrdir)/ruby/oniguruma.h
 ossl_pkey_rsa.o: $(hdrdir)/ruby/ruby.h
 ossl_pkey_rsa.o: $(hdrdir)/ruby/st.h
 ossl_pkey_rsa.o: $(hdrdir)/ruby/subst.h
 ossl_pkey_rsa.o: $(hdrdir)/ruby/thread.h
-ossl_pkey_rsa.o: $(top_srcdir)/include/ruby.h
 ossl_pkey_rsa.o: openssl_missing.h
 ossl_pkey_rsa.o: ossl.h
 ossl_pkey_rsa.o: ossl_asn1.h
@@ -675,32 +3546,183 @@ ossl_pkey_rsa.o: ossl_config.h
 ossl_pkey_rsa.o: ossl_digest.h
 ossl_pkey_rsa.o: ossl_engine.h
 ossl_pkey_rsa.o: ossl_hmac.h
+ossl_pkey_rsa.o: ossl_kdf.h
 ossl_pkey_rsa.o: ossl_ns_spki.h
 ossl_pkey_rsa.o: ossl_ocsp.h
 ossl_pkey_rsa.o: ossl_pkcs12.h
-ossl_pkey_rsa.o: ossl_pkcs5.h
 ossl_pkey_rsa.o: ossl_pkcs7.h
 ossl_pkey_rsa.o: ossl_pkey.h
 ossl_pkey_rsa.o: ossl_pkey_rsa.c
 ossl_pkey_rsa.o: ossl_rand.h
 ossl_pkey_rsa.o: ossl_ssl.h
-ossl_pkey_rsa.o: ossl_version.h
+ossl_pkey_rsa.o: ossl_ts.h
 ossl_pkey_rsa.o: ossl_x509.h
 ossl_pkey_rsa.o: ruby_missing.h
 ossl_rand.o: $(RUBY_EXTCONF_H)
 ossl_rand.o: $(arch_hdrdir)/ruby/config.h
+ossl_rand.o: $(hdrdir)/ruby.h
+ossl_rand.o: $(hdrdir)/ruby/assert.h
 ossl_rand.o: $(hdrdir)/ruby/backward.h
+ossl_rand.o: $(hdrdir)/ruby/backward/2/assume.h
+ossl_rand.o: $(hdrdir)/ruby/backward/2/attributes.h
+ossl_rand.o: $(hdrdir)/ruby/backward/2/bool.h
+ossl_rand.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+ossl_rand.o: $(hdrdir)/ruby/backward/2/inttypes.h
+ossl_rand.o: $(hdrdir)/ruby/backward/2/limits.h
+ossl_rand.o: $(hdrdir)/ruby/backward/2/long_long.h
+ossl_rand.o: $(hdrdir)/ruby/backward/2/stdalign.h
+ossl_rand.o: $(hdrdir)/ruby/backward/2/stdarg.h
 ossl_rand.o: $(hdrdir)/ruby/defines.h
 ossl_rand.o: $(hdrdir)/ruby/encoding.h
 ossl_rand.o: $(hdrdir)/ruby/intern.h
+ossl_rand.o: $(hdrdir)/ruby/internal/anyargs.h
+ossl_rand.o: $(hdrdir)/ruby/internal/arithmetic.h
+ossl_rand.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+ossl_rand.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+ossl_rand.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+ossl_rand.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+ossl_rand.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+ossl_rand.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+ossl_rand.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+ossl_rand.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+ossl_rand.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+ossl_rand.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+ossl_rand.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+ossl_rand.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+ossl_rand.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+ossl_rand.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+ossl_rand.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+ossl_rand.o: $(hdrdir)/ruby/internal/assume.h
+ossl_rand.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+ossl_rand.o: $(hdrdir)/ruby/internal/attr/artificial.h
+ossl_rand.o: $(hdrdir)/ruby/internal/attr/cold.h
+ossl_rand.o: $(hdrdir)/ruby/internal/attr/const.h
+ossl_rand.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+ossl_rand.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+ossl_rand.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+ossl_rand.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+ossl_rand.o: $(hdrdir)/ruby/internal/attr/error.h
+ossl_rand.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+ossl_rand.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+ossl_rand.o: $(hdrdir)/ruby/internal/attr/format.h
+ossl_rand.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+ossl_rand.o: $(hdrdir)/ruby/internal/attr/noalias.h
+ossl_rand.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+ossl_rand.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+ossl_rand.o: $(hdrdir)/ruby/internal/attr/noinline.h
+ossl_rand.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+ossl_rand.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+ossl_rand.o: $(hdrdir)/ruby/internal/attr/pure.h
+ossl_rand.o: $(hdrdir)/ruby/internal/attr/restrict.h
+ossl_rand.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+ossl_rand.o: $(hdrdir)/ruby/internal/attr/warning.h
+ossl_rand.o: $(hdrdir)/ruby/internal/attr/weakref.h
+ossl_rand.o: $(hdrdir)/ruby/internal/cast.h
+ossl_rand.o: $(hdrdir)/ruby/internal/compiler_is.h
+ossl_rand.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+ossl_rand.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+ossl_rand.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+ossl_rand.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+ossl_rand.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+ossl_rand.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+ossl_rand.o: $(hdrdir)/ruby/internal/compiler_since.h
+ossl_rand.o: $(hdrdir)/ruby/internal/config.h
+ossl_rand.o: $(hdrdir)/ruby/internal/constant_p.h
+ossl_rand.o: $(hdrdir)/ruby/internal/core.h
+ossl_rand.o: $(hdrdir)/ruby/internal/core/rarray.h
+ossl_rand.o: $(hdrdir)/ruby/internal/core/rbasic.h
+ossl_rand.o: $(hdrdir)/ruby/internal/core/rbignum.h
+ossl_rand.o: $(hdrdir)/ruby/internal/core/rclass.h
+ossl_rand.o: $(hdrdir)/ruby/internal/core/rdata.h
+ossl_rand.o: $(hdrdir)/ruby/internal/core/rfile.h
+ossl_rand.o: $(hdrdir)/ruby/internal/core/rhash.h
+ossl_rand.o: $(hdrdir)/ruby/internal/core/robject.h
+ossl_rand.o: $(hdrdir)/ruby/internal/core/rregexp.h
+ossl_rand.o: $(hdrdir)/ruby/internal/core/rstring.h
+ossl_rand.o: $(hdrdir)/ruby/internal/core/rstruct.h
+ossl_rand.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+ossl_rand.o: $(hdrdir)/ruby/internal/ctype.h
+ossl_rand.o: $(hdrdir)/ruby/internal/dllexport.h
+ossl_rand.o: $(hdrdir)/ruby/internal/dosish.h
+ossl_rand.o: $(hdrdir)/ruby/internal/error.h
+ossl_rand.o: $(hdrdir)/ruby/internal/eval.h
+ossl_rand.o: $(hdrdir)/ruby/internal/event.h
+ossl_rand.o: $(hdrdir)/ruby/internal/fl_type.h
+ossl_rand.o: $(hdrdir)/ruby/internal/gc.h
+ossl_rand.o: $(hdrdir)/ruby/internal/glob.h
+ossl_rand.o: $(hdrdir)/ruby/internal/globals.h
+ossl_rand.o: $(hdrdir)/ruby/internal/has/attribute.h
+ossl_rand.o: $(hdrdir)/ruby/internal/has/builtin.h
+ossl_rand.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+ossl_rand.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+ossl_rand.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+ossl_rand.o: $(hdrdir)/ruby/internal/has/extension.h
+ossl_rand.o: $(hdrdir)/ruby/internal/has/feature.h
+ossl_rand.o: $(hdrdir)/ruby/internal/has/warning.h
+ossl_rand.o: $(hdrdir)/ruby/internal/intern/array.h
+ossl_rand.o: $(hdrdir)/ruby/internal/intern/bignum.h
+ossl_rand.o: $(hdrdir)/ruby/internal/intern/class.h
+ossl_rand.o: $(hdrdir)/ruby/internal/intern/compar.h
+ossl_rand.o: $(hdrdir)/ruby/internal/intern/complex.h
+ossl_rand.o: $(hdrdir)/ruby/internal/intern/cont.h
+ossl_rand.o: $(hdrdir)/ruby/internal/intern/dir.h
+ossl_rand.o: $(hdrdir)/ruby/internal/intern/enum.h
+ossl_rand.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+ossl_rand.o: $(hdrdir)/ruby/internal/intern/error.h
+ossl_rand.o: $(hdrdir)/ruby/internal/intern/eval.h
+ossl_rand.o: $(hdrdir)/ruby/internal/intern/file.h
+ossl_rand.o: $(hdrdir)/ruby/internal/intern/gc.h
+ossl_rand.o: $(hdrdir)/ruby/internal/intern/hash.h
+ossl_rand.o: $(hdrdir)/ruby/internal/intern/io.h
+ossl_rand.o: $(hdrdir)/ruby/internal/intern/load.h
+ossl_rand.o: $(hdrdir)/ruby/internal/intern/marshal.h
+ossl_rand.o: $(hdrdir)/ruby/internal/intern/numeric.h
+ossl_rand.o: $(hdrdir)/ruby/internal/intern/object.h
+ossl_rand.o: $(hdrdir)/ruby/internal/intern/parse.h
+ossl_rand.o: $(hdrdir)/ruby/internal/intern/proc.h
+ossl_rand.o: $(hdrdir)/ruby/internal/intern/process.h
+ossl_rand.o: $(hdrdir)/ruby/internal/intern/random.h
+ossl_rand.o: $(hdrdir)/ruby/internal/intern/range.h
+ossl_rand.o: $(hdrdir)/ruby/internal/intern/rational.h
+ossl_rand.o: $(hdrdir)/ruby/internal/intern/re.h
+ossl_rand.o: $(hdrdir)/ruby/internal/intern/ruby.h
+ossl_rand.o: $(hdrdir)/ruby/internal/intern/select.h
+ossl_rand.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_rand.o: $(hdrdir)/ruby/internal/intern/signal.h
+ossl_rand.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+ossl_rand.o: $(hdrdir)/ruby/internal/intern/string.h
+ossl_rand.o: $(hdrdir)/ruby/internal/intern/struct.h
+ossl_rand.o: $(hdrdir)/ruby/internal/intern/thread.h
+ossl_rand.o: $(hdrdir)/ruby/internal/intern/time.h
+ossl_rand.o: $(hdrdir)/ruby/internal/intern/variable.h
+ossl_rand.o: $(hdrdir)/ruby/internal/intern/vm.h
+ossl_rand.o: $(hdrdir)/ruby/internal/interpreter.h
+ossl_rand.o: $(hdrdir)/ruby/internal/iterator.h
+ossl_rand.o: $(hdrdir)/ruby/internal/memory.h
+ossl_rand.o: $(hdrdir)/ruby/internal/method.h
+ossl_rand.o: $(hdrdir)/ruby/internal/module.h
+ossl_rand.o: $(hdrdir)/ruby/internal/newobj.h
+ossl_rand.o: $(hdrdir)/ruby/internal/rgengc.h
+ossl_rand.o: $(hdrdir)/ruby/internal/scan_args.h
+ossl_rand.o: $(hdrdir)/ruby/internal/special_consts.h
+ossl_rand.o: $(hdrdir)/ruby/internal/static_assert.h
+ossl_rand.o: $(hdrdir)/ruby/internal/stdalign.h
+ossl_rand.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_rand.o: $(hdrdir)/ruby/internal/symbol.h
+ossl_rand.o: $(hdrdir)/ruby/internal/token_paste.h
+ossl_rand.o: $(hdrdir)/ruby/internal/value.h
+ossl_rand.o: $(hdrdir)/ruby/internal/value_type.h
+ossl_rand.o: $(hdrdir)/ruby/internal/variable.h
+ossl_rand.o: $(hdrdir)/ruby/internal/warning_push.h
+ossl_rand.o: $(hdrdir)/ruby/internal/xmalloc.h
 ossl_rand.o: $(hdrdir)/ruby/io.h
 ossl_rand.o: $(hdrdir)/ruby/missing.h
+ossl_rand.o: $(hdrdir)/ruby/onigmo.h
 ossl_rand.o: $(hdrdir)/ruby/oniguruma.h
 ossl_rand.o: $(hdrdir)/ruby/ruby.h
 ossl_rand.o: $(hdrdir)/ruby/st.h
 ossl_rand.o: $(hdrdir)/ruby/subst.h
 ossl_rand.o: $(hdrdir)/ruby/thread.h
-ossl_rand.o: $(top_srcdir)/include/ruby.h
 ossl_rand.o: openssl_missing.h
 ossl_rand.o: ossl.h
 ossl_rand.o: ossl_asn1.h
@@ -711,32 +3733,183 @@ ossl_rand.o: ossl_config.h
 ossl_rand.o: ossl_digest.h
 ossl_rand.o: ossl_engine.h
 ossl_rand.o: ossl_hmac.h
+ossl_rand.o: ossl_kdf.h
 ossl_rand.o: ossl_ns_spki.h
 ossl_rand.o: ossl_ocsp.h
 ossl_rand.o: ossl_pkcs12.h
-ossl_rand.o: ossl_pkcs5.h
 ossl_rand.o: ossl_pkcs7.h
 ossl_rand.o: ossl_pkey.h
 ossl_rand.o: ossl_rand.c
 ossl_rand.o: ossl_rand.h
 ossl_rand.o: ossl_ssl.h
-ossl_rand.o: ossl_version.h
+ossl_rand.o: ossl_ts.h
 ossl_rand.o: ossl_x509.h
 ossl_rand.o: ruby_missing.h
 ossl_ssl.o: $(RUBY_EXTCONF_H)
 ossl_ssl.o: $(arch_hdrdir)/ruby/config.h
+ossl_ssl.o: $(hdrdir)/ruby.h
+ossl_ssl.o: $(hdrdir)/ruby/assert.h
 ossl_ssl.o: $(hdrdir)/ruby/backward.h
+ossl_ssl.o: $(hdrdir)/ruby/backward/2/assume.h
+ossl_ssl.o: $(hdrdir)/ruby/backward/2/attributes.h
+ossl_ssl.o: $(hdrdir)/ruby/backward/2/bool.h
+ossl_ssl.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+ossl_ssl.o: $(hdrdir)/ruby/backward/2/inttypes.h
+ossl_ssl.o: $(hdrdir)/ruby/backward/2/limits.h
+ossl_ssl.o: $(hdrdir)/ruby/backward/2/long_long.h
+ossl_ssl.o: $(hdrdir)/ruby/backward/2/stdalign.h
+ossl_ssl.o: $(hdrdir)/ruby/backward/2/stdarg.h
 ossl_ssl.o: $(hdrdir)/ruby/defines.h
 ossl_ssl.o: $(hdrdir)/ruby/encoding.h
 ossl_ssl.o: $(hdrdir)/ruby/intern.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/anyargs.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/arithmetic.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/assume.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/attr/artificial.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/attr/cold.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/attr/const.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/attr/error.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/attr/format.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/attr/noalias.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/attr/noinline.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/attr/pure.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/attr/restrict.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/attr/warning.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/attr/weakref.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/cast.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/compiler_is.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/compiler_since.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/config.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/constant_p.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/core.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/core/rarray.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/core/rbasic.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/core/rbignum.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/core/rclass.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/core/rdata.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/core/rfile.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/core/rhash.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/core/robject.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/core/rregexp.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/core/rstring.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/core/rstruct.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/ctype.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/dllexport.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/dosish.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/error.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/eval.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/event.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/fl_type.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/gc.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/glob.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/globals.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/has/attribute.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/has/builtin.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/has/extension.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/has/feature.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/has/warning.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/intern/array.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/intern/bignum.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/intern/class.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/intern/compar.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/intern/complex.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/intern/cont.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/intern/dir.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/intern/enum.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/intern/error.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/intern/eval.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/intern/file.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/intern/gc.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/intern/hash.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/intern/io.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/intern/load.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/intern/marshal.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/intern/numeric.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/intern/object.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/intern/parse.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/intern/proc.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/intern/process.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/intern/random.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/intern/range.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/intern/rational.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/intern/re.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/intern/ruby.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/intern/select.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/intern/signal.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/intern/string.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/intern/struct.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/intern/thread.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/intern/time.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/intern/variable.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/intern/vm.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/interpreter.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/iterator.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/memory.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/method.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/module.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/newobj.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/rgengc.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/scan_args.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/special_consts.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/static_assert.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/stdalign.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/symbol.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/token_paste.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/value.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/value_type.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/variable.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/warning_push.h
+ossl_ssl.o: $(hdrdir)/ruby/internal/xmalloc.h
 ossl_ssl.o: $(hdrdir)/ruby/io.h
 ossl_ssl.o: $(hdrdir)/ruby/missing.h
+ossl_ssl.o: $(hdrdir)/ruby/onigmo.h
 ossl_ssl.o: $(hdrdir)/ruby/oniguruma.h
 ossl_ssl.o: $(hdrdir)/ruby/ruby.h
 ossl_ssl.o: $(hdrdir)/ruby/st.h
 ossl_ssl.o: $(hdrdir)/ruby/subst.h
 ossl_ssl.o: $(hdrdir)/ruby/thread.h
-ossl_ssl.o: $(top_srcdir)/include/ruby.h
 ossl_ssl.o: openssl_missing.h
 ossl_ssl.o: ossl.h
 ossl_ssl.o: ossl_asn1.h
@@ -747,32 +3920,183 @@ ossl_ssl.o: ossl_config.h
 ossl_ssl.o: ossl_digest.h
 ossl_ssl.o: ossl_engine.h
 ossl_ssl.o: ossl_hmac.h
+ossl_ssl.o: ossl_kdf.h
 ossl_ssl.o: ossl_ns_spki.h
 ossl_ssl.o: ossl_ocsp.h
 ossl_ssl.o: ossl_pkcs12.h
-ossl_ssl.o: ossl_pkcs5.h
 ossl_ssl.o: ossl_pkcs7.h
 ossl_ssl.o: ossl_pkey.h
 ossl_ssl.o: ossl_rand.h
 ossl_ssl.o: ossl_ssl.c
 ossl_ssl.o: ossl_ssl.h
-ossl_ssl.o: ossl_version.h
+ossl_ssl.o: ossl_ts.h
 ossl_ssl.o: ossl_x509.h
 ossl_ssl.o: ruby_missing.h
 ossl_ssl_session.o: $(RUBY_EXTCONF_H)
 ossl_ssl_session.o: $(arch_hdrdir)/ruby/config.h
+ossl_ssl_session.o: $(hdrdir)/ruby.h
+ossl_ssl_session.o: $(hdrdir)/ruby/assert.h
 ossl_ssl_session.o: $(hdrdir)/ruby/backward.h
+ossl_ssl_session.o: $(hdrdir)/ruby/backward/2/assume.h
+ossl_ssl_session.o: $(hdrdir)/ruby/backward/2/attributes.h
+ossl_ssl_session.o: $(hdrdir)/ruby/backward/2/bool.h
+ossl_ssl_session.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+ossl_ssl_session.o: $(hdrdir)/ruby/backward/2/inttypes.h
+ossl_ssl_session.o: $(hdrdir)/ruby/backward/2/limits.h
+ossl_ssl_session.o: $(hdrdir)/ruby/backward/2/long_long.h
+ossl_ssl_session.o: $(hdrdir)/ruby/backward/2/stdalign.h
+ossl_ssl_session.o: $(hdrdir)/ruby/backward/2/stdarg.h
 ossl_ssl_session.o: $(hdrdir)/ruby/defines.h
 ossl_ssl_session.o: $(hdrdir)/ruby/encoding.h
 ossl_ssl_session.o: $(hdrdir)/ruby/intern.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/anyargs.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/arithmetic.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/assume.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/attr/artificial.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/attr/cold.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/attr/const.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/attr/error.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/attr/format.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/attr/noalias.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/attr/noinline.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/attr/pure.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/attr/restrict.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/attr/warning.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/attr/weakref.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/cast.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/compiler_is.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/compiler_since.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/config.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/constant_p.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/core.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/core/rarray.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/core/rbasic.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/core/rbignum.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/core/rclass.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/core/rdata.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/core/rfile.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/core/rhash.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/core/robject.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/core/rregexp.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/core/rstring.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/core/rstruct.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/ctype.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/dllexport.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/dosish.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/error.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/eval.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/event.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/fl_type.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/gc.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/glob.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/globals.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/has/attribute.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/has/builtin.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/has/extension.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/has/feature.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/has/warning.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/array.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/bignum.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/class.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/compar.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/complex.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/cont.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/dir.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/enum.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/error.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/eval.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/file.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/gc.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/hash.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/io.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/load.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/marshal.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/numeric.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/object.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/parse.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/proc.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/process.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/random.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/range.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/rational.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/re.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/ruby.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/select.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/signal.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/string.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/struct.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/thread.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/time.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/variable.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/intern/vm.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/interpreter.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/iterator.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/memory.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/method.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/module.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/newobj.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/rgengc.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/scan_args.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/special_consts.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/static_assert.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/stdalign.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/symbol.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/token_paste.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/value.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/value_type.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/variable.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/warning_push.h
+ossl_ssl_session.o: $(hdrdir)/ruby/internal/xmalloc.h
 ossl_ssl_session.o: $(hdrdir)/ruby/io.h
 ossl_ssl_session.o: $(hdrdir)/ruby/missing.h
+ossl_ssl_session.o: $(hdrdir)/ruby/onigmo.h
 ossl_ssl_session.o: $(hdrdir)/ruby/oniguruma.h
 ossl_ssl_session.o: $(hdrdir)/ruby/ruby.h
 ossl_ssl_session.o: $(hdrdir)/ruby/st.h
 ossl_ssl_session.o: $(hdrdir)/ruby/subst.h
 ossl_ssl_session.o: $(hdrdir)/ruby/thread.h
-ossl_ssl_session.o: $(top_srcdir)/include/ruby.h
 ossl_ssl_session.o: openssl_missing.h
 ossl_ssl_session.o: ossl.h
 ossl_ssl_session.o: ossl_asn1.h
@@ -783,32 +4107,370 @@ ossl_ssl_session.o: ossl_config.h
 ossl_ssl_session.o: ossl_digest.h
 ossl_ssl_session.o: ossl_engine.h
 ossl_ssl_session.o: ossl_hmac.h
+ossl_ssl_session.o: ossl_kdf.h
 ossl_ssl_session.o: ossl_ns_spki.h
 ossl_ssl_session.o: ossl_ocsp.h
 ossl_ssl_session.o: ossl_pkcs12.h
-ossl_ssl_session.o: ossl_pkcs5.h
 ossl_ssl_session.o: ossl_pkcs7.h
 ossl_ssl_session.o: ossl_pkey.h
 ossl_ssl_session.o: ossl_rand.h
 ossl_ssl_session.o: ossl_ssl.h
 ossl_ssl_session.o: ossl_ssl_session.c
-ossl_ssl_session.o: ossl_version.h
+ossl_ssl_session.o: ossl_ts.h
 ossl_ssl_session.o: ossl_x509.h
 ossl_ssl_session.o: ruby_missing.h
+ossl_ts.o: $(RUBY_EXTCONF_H)
+ossl_ts.o: $(arch_hdrdir)/ruby/config.h
+ossl_ts.o: $(hdrdir)/ruby.h
+ossl_ts.o: $(hdrdir)/ruby/assert.h
+ossl_ts.o: $(hdrdir)/ruby/backward.h
+ossl_ts.o: $(hdrdir)/ruby/backward/2/assume.h
+ossl_ts.o: $(hdrdir)/ruby/backward/2/attributes.h
+ossl_ts.o: $(hdrdir)/ruby/backward/2/bool.h
+ossl_ts.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+ossl_ts.o: $(hdrdir)/ruby/backward/2/inttypes.h
+ossl_ts.o: $(hdrdir)/ruby/backward/2/limits.h
+ossl_ts.o: $(hdrdir)/ruby/backward/2/long_long.h
+ossl_ts.o: $(hdrdir)/ruby/backward/2/stdalign.h
+ossl_ts.o: $(hdrdir)/ruby/backward/2/stdarg.h
+ossl_ts.o: $(hdrdir)/ruby/defines.h
+ossl_ts.o: $(hdrdir)/ruby/encoding.h
+ossl_ts.o: $(hdrdir)/ruby/intern.h
+ossl_ts.o: $(hdrdir)/ruby/internal/anyargs.h
+ossl_ts.o: $(hdrdir)/ruby/internal/arithmetic.h
+ossl_ts.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+ossl_ts.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+ossl_ts.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+ossl_ts.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+ossl_ts.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+ossl_ts.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+ossl_ts.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+ossl_ts.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+ossl_ts.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+ossl_ts.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+ossl_ts.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+ossl_ts.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+ossl_ts.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+ossl_ts.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+ossl_ts.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+ossl_ts.o: $(hdrdir)/ruby/internal/assume.h
+ossl_ts.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+ossl_ts.o: $(hdrdir)/ruby/internal/attr/artificial.h
+ossl_ts.o: $(hdrdir)/ruby/internal/attr/cold.h
+ossl_ts.o: $(hdrdir)/ruby/internal/attr/const.h
+ossl_ts.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+ossl_ts.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+ossl_ts.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+ossl_ts.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+ossl_ts.o: $(hdrdir)/ruby/internal/attr/error.h
+ossl_ts.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+ossl_ts.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+ossl_ts.o: $(hdrdir)/ruby/internal/attr/format.h
+ossl_ts.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+ossl_ts.o: $(hdrdir)/ruby/internal/attr/noalias.h
+ossl_ts.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+ossl_ts.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+ossl_ts.o: $(hdrdir)/ruby/internal/attr/noinline.h
+ossl_ts.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+ossl_ts.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+ossl_ts.o: $(hdrdir)/ruby/internal/attr/pure.h
+ossl_ts.o: $(hdrdir)/ruby/internal/attr/restrict.h
+ossl_ts.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+ossl_ts.o: $(hdrdir)/ruby/internal/attr/warning.h
+ossl_ts.o: $(hdrdir)/ruby/internal/attr/weakref.h
+ossl_ts.o: $(hdrdir)/ruby/internal/cast.h
+ossl_ts.o: $(hdrdir)/ruby/internal/compiler_is.h
+ossl_ts.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+ossl_ts.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+ossl_ts.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+ossl_ts.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+ossl_ts.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+ossl_ts.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+ossl_ts.o: $(hdrdir)/ruby/internal/compiler_since.h
+ossl_ts.o: $(hdrdir)/ruby/internal/config.h
+ossl_ts.o: $(hdrdir)/ruby/internal/constant_p.h
+ossl_ts.o: $(hdrdir)/ruby/internal/core.h
+ossl_ts.o: $(hdrdir)/ruby/internal/core/rarray.h
+ossl_ts.o: $(hdrdir)/ruby/internal/core/rbasic.h
+ossl_ts.o: $(hdrdir)/ruby/internal/core/rbignum.h
+ossl_ts.o: $(hdrdir)/ruby/internal/core/rclass.h
+ossl_ts.o: $(hdrdir)/ruby/internal/core/rdata.h
+ossl_ts.o: $(hdrdir)/ruby/internal/core/rfile.h
+ossl_ts.o: $(hdrdir)/ruby/internal/core/rhash.h
+ossl_ts.o: $(hdrdir)/ruby/internal/core/robject.h
+ossl_ts.o: $(hdrdir)/ruby/internal/core/rregexp.h
+ossl_ts.o: $(hdrdir)/ruby/internal/core/rstring.h
+ossl_ts.o: $(hdrdir)/ruby/internal/core/rstruct.h
+ossl_ts.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+ossl_ts.o: $(hdrdir)/ruby/internal/ctype.h
+ossl_ts.o: $(hdrdir)/ruby/internal/dllexport.h
+ossl_ts.o: $(hdrdir)/ruby/internal/dosish.h
+ossl_ts.o: $(hdrdir)/ruby/internal/error.h
+ossl_ts.o: $(hdrdir)/ruby/internal/eval.h
+ossl_ts.o: $(hdrdir)/ruby/internal/event.h
+ossl_ts.o: $(hdrdir)/ruby/internal/fl_type.h
+ossl_ts.o: $(hdrdir)/ruby/internal/gc.h
+ossl_ts.o: $(hdrdir)/ruby/internal/glob.h
+ossl_ts.o: $(hdrdir)/ruby/internal/globals.h
+ossl_ts.o: $(hdrdir)/ruby/internal/has/attribute.h
+ossl_ts.o: $(hdrdir)/ruby/internal/has/builtin.h
+ossl_ts.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+ossl_ts.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+ossl_ts.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+ossl_ts.o: $(hdrdir)/ruby/internal/has/extension.h
+ossl_ts.o: $(hdrdir)/ruby/internal/has/feature.h
+ossl_ts.o: $(hdrdir)/ruby/internal/has/warning.h
+ossl_ts.o: $(hdrdir)/ruby/internal/intern/array.h
+ossl_ts.o: $(hdrdir)/ruby/internal/intern/bignum.h
+ossl_ts.o: $(hdrdir)/ruby/internal/intern/class.h
+ossl_ts.o: $(hdrdir)/ruby/internal/intern/compar.h
+ossl_ts.o: $(hdrdir)/ruby/internal/intern/complex.h
+ossl_ts.o: $(hdrdir)/ruby/internal/intern/cont.h
+ossl_ts.o: $(hdrdir)/ruby/internal/intern/dir.h
+ossl_ts.o: $(hdrdir)/ruby/internal/intern/enum.h
+ossl_ts.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+ossl_ts.o: $(hdrdir)/ruby/internal/intern/error.h
+ossl_ts.o: $(hdrdir)/ruby/internal/intern/eval.h
+ossl_ts.o: $(hdrdir)/ruby/internal/intern/file.h
+ossl_ts.o: $(hdrdir)/ruby/internal/intern/gc.h
+ossl_ts.o: $(hdrdir)/ruby/internal/intern/hash.h
+ossl_ts.o: $(hdrdir)/ruby/internal/intern/io.h
+ossl_ts.o: $(hdrdir)/ruby/internal/intern/load.h
+ossl_ts.o: $(hdrdir)/ruby/internal/intern/marshal.h
+ossl_ts.o: $(hdrdir)/ruby/internal/intern/numeric.h
+ossl_ts.o: $(hdrdir)/ruby/internal/intern/object.h
+ossl_ts.o: $(hdrdir)/ruby/internal/intern/parse.h
+ossl_ts.o: $(hdrdir)/ruby/internal/intern/proc.h
+ossl_ts.o: $(hdrdir)/ruby/internal/intern/process.h
+ossl_ts.o: $(hdrdir)/ruby/internal/intern/random.h
+ossl_ts.o: $(hdrdir)/ruby/internal/intern/range.h
+ossl_ts.o: $(hdrdir)/ruby/internal/intern/rational.h
+ossl_ts.o: $(hdrdir)/ruby/internal/intern/re.h
+ossl_ts.o: $(hdrdir)/ruby/internal/intern/ruby.h
+ossl_ts.o: $(hdrdir)/ruby/internal/intern/select.h
+ossl_ts.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_ts.o: $(hdrdir)/ruby/internal/intern/signal.h
+ossl_ts.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+ossl_ts.o: $(hdrdir)/ruby/internal/intern/string.h
+ossl_ts.o: $(hdrdir)/ruby/internal/intern/struct.h
+ossl_ts.o: $(hdrdir)/ruby/internal/intern/thread.h
+ossl_ts.o: $(hdrdir)/ruby/internal/intern/time.h
+ossl_ts.o: $(hdrdir)/ruby/internal/intern/variable.h
+ossl_ts.o: $(hdrdir)/ruby/internal/intern/vm.h
+ossl_ts.o: $(hdrdir)/ruby/internal/interpreter.h
+ossl_ts.o: $(hdrdir)/ruby/internal/iterator.h
+ossl_ts.o: $(hdrdir)/ruby/internal/memory.h
+ossl_ts.o: $(hdrdir)/ruby/internal/method.h
+ossl_ts.o: $(hdrdir)/ruby/internal/module.h
+ossl_ts.o: $(hdrdir)/ruby/internal/newobj.h
+ossl_ts.o: $(hdrdir)/ruby/internal/rgengc.h
+ossl_ts.o: $(hdrdir)/ruby/internal/scan_args.h
+ossl_ts.o: $(hdrdir)/ruby/internal/special_consts.h
+ossl_ts.o: $(hdrdir)/ruby/internal/static_assert.h
+ossl_ts.o: $(hdrdir)/ruby/internal/stdalign.h
+ossl_ts.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_ts.o: $(hdrdir)/ruby/internal/symbol.h
+ossl_ts.o: $(hdrdir)/ruby/internal/token_paste.h
+ossl_ts.o: $(hdrdir)/ruby/internal/value.h
+ossl_ts.o: $(hdrdir)/ruby/internal/value_type.h
+ossl_ts.o: $(hdrdir)/ruby/internal/variable.h
+ossl_ts.o: $(hdrdir)/ruby/internal/warning_push.h
+ossl_ts.o: $(hdrdir)/ruby/internal/xmalloc.h
+ossl_ts.o: $(hdrdir)/ruby/io.h
+ossl_ts.o: $(hdrdir)/ruby/missing.h
+ossl_ts.o: $(hdrdir)/ruby/onigmo.h
+ossl_ts.o: $(hdrdir)/ruby/oniguruma.h
+ossl_ts.o: $(hdrdir)/ruby/ruby.h
+ossl_ts.o: $(hdrdir)/ruby/st.h
+ossl_ts.o: $(hdrdir)/ruby/subst.h
+ossl_ts.o: $(hdrdir)/ruby/thread.h
+ossl_ts.o: openssl_missing.h
+ossl_ts.o: ossl.h
+ossl_ts.o: ossl_asn1.h
+ossl_ts.o: ossl_bio.h
+ossl_ts.o: ossl_bn.h
+ossl_ts.o: ossl_cipher.h
+ossl_ts.o: ossl_config.h
+ossl_ts.o: ossl_digest.h
+ossl_ts.o: ossl_engine.h
+ossl_ts.o: ossl_hmac.h
+ossl_ts.o: ossl_kdf.h
+ossl_ts.o: ossl_ns_spki.h
+ossl_ts.o: ossl_ocsp.h
+ossl_ts.o: ossl_pkcs12.h
+ossl_ts.o: ossl_pkcs7.h
+ossl_ts.o: ossl_pkey.h
+ossl_ts.o: ossl_rand.h
+ossl_ts.o: ossl_ssl.h
+ossl_ts.o: ossl_ts.c
+ossl_ts.o: ossl_ts.h
+ossl_ts.o: ossl_x509.h
+ossl_ts.o: ruby_missing.h
 ossl_x509.o: $(RUBY_EXTCONF_H)
 ossl_x509.o: $(arch_hdrdir)/ruby/config.h
+ossl_x509.o: $(hdrdir)/ruby.h
+ossl_x509.o: $(hdrdir)/ruby/assert.h
 ossl_x509.o: $(hdrdir)/ruby/backward.h
+ossl_x509.o: $(hdrdir)/ruby/backward/2/assume.h
+ossl_x509.o: $(hdrdir)/ruby/backward/2/attributes.h
+ossl_x509.o: $(hdrdir)/ruby/backward/2/bool.h
+ossl_x509.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+ossl_x509.o: $(hdrdir)/ruby/backward/2/inttypes.h
+ossl_x509.o: $(hdrdir)/ruby/backward/2/limits.h
+ossl_x509.o: $(hdrdir)/ruby/backward/2/long_long.h
+ossl_x509.o: $(hdrdir)/ruby/backward/2/stdalign.h
+ossl_x509.o: $(hdrdir)/ruby/backward/2/stdarg.h
 ossl_x509.o: $(hdrdir)/ruby/defines.h
 ossl_x509.o: $(hdrdir)/ruby/encoding.h
 ossl_x509.o: $(hdrdir)/ruby/intern.h
+ossl_x509.o: $(hdrdir)/ruby/internal/anyargs.h
+ossl_x509.o: $(hdrdir)/ruby/internal/arithmetic.h
+ossl_x509.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+ossl_x509.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+ossl_x509.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+ossl_x509.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+ossl_x509.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+ossl_x509.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+ossl_x509.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+ossl_x509.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+ossl_x509.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+ossl_x509.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+ossl_x509.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+ossl_x509.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+ossl_x509.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+ossl_x509.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+ossl_x509.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+ossl_x509.o: $(hdrdir)/ruby/internal/assume.h
+ossl_x509.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+ossl_x509.o: $(hdrdir)/ruby/internal/attr/artificial.h
+ossl_x509.o: $(hdrdir)/ruby/internal/attr/cold.h
+ossl_x509.o: $(hdrdir)/ruby/internal/attr/const.h
+ossl_x509.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+ossl_x509.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+ossl_x509.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+ossl_x509.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+ossl_x509.o: $(hdrdir)/ruby/internal/attr/error.h
+ossl_x509.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+ossl_x509.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+ossl_x509.o: $(hdrdir)/ruby/internal/attr/format.h
+ossl_x509.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+ossl_x509.o: $(hdrdir)/ruby/internal/attr/noalias.h
+ossl_x509.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+ossl_x509.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+ossl_x509.o: $(hdrdir)/ruby/internal/attr/noinline.h
+ossl_x509.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+ossl_x509.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+ossl_x509.o: $(hdrdir)/ruby/internal/attr/pure.h
+ossl_x509.o: $(hdrdir)/ruby/internal/attr/restrict.h
+ossl_x509.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+ossl_x509.o: $(hdrdir)/ruby/internal/attr/warning.h
+ossl_x509.o: $(hdrdir)/ruby/internal/attr/weakref.h
+ossl_x509.o: $(hdrdir)/ruby/internal/cast.h
+ossl_x509.o: $(hdrdir)/ruby/internal/compiler_is.h
+ossl_x509.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+ossl_x509.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+ossl_x509.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+ossl_x509.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+ossl_x509.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+ossl_x509.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+ossl_x509.o: $(hdrdir)/ruby/internal/compiler_since.h
+ossl_x509.o: $(hdrdir)/ruby/internal/config.h
+ossl_x509.o: $(hdrdir)/ruby/internal/constant_p.h
+ossl_x509.o: $(hdrdir)/ruby/internal/core.h
+ossl_x509.o: $(hdrdir)/ruby/internal/core/rarray.h
+ossl_x509.o: $(hdrdir)/ruby/internal/core/rbasic.h
+ossl_x509.o: $(hdrdir)/ruby/internal/core/rbignum.h
+ossl_x509.o: $(hdrdir)/ruby/internal/core/rclass.h
+ossl_x509.o: $(hdrdir)/ruby/internal/core/rdata.h
+ossl_x509.o: $(hdrdir)/ruby/internal/core/rfile.h
+ossl_x509.o: $(hdrdir)/ruby/internal/core/rhash.h
+ossl_x509.o: $(hdrdir)/ruby/internal/core/robject.h
+ossl_x509.o: $(hdrdir)/ruby/internal/core/rregexp.h
+ossl_x509.o: $(hdrdir)/ruby/internal/core/rstring.h
+ossl_x509.o: $(hdrdir)/ruby/internal/core/rstruct.h
+ossl_x509.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+ossl_x509.o: $(hdrdir)/ruby/internal/ctype.h
+ossl_x509.o: $(hdrdir)/ruby/internal/dllexport.h
+ossl_x509.o: $(hdrdir)/ruby/internal/dosish.h
+ossl_x509.o: $(hdrdir)/ruby/internal/error.h
+ossl_x509.o: $(hdrdir)/ruby/internal/eval.h
+ossl_x509.o: $(hdrdir)/ruby/internal/event.h
+ossl_x509.o: $(hdrdir)/ruby/internal/fl_type.h
+ossl_x509.o: $(hdrdir)/ruby/internal/gc.h
+ossl_x509.o: $(hdrdir)/ruby/internal/glob.h
+ossl_x509.o: $(hdrdir)/ruby/internal/globals.h
+ossl_x509.o: $(hdrdir)/ruby/internal/has/attribute.h
+ossl_x509.o: $(hdrdir)/ruby/internal/has/builtin.h
+ossl_x509.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+ossl_x509.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+ossl_x509.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+ossl_x509.o: $(hdrdir)/ruby/internal/has/extension.h
+ossl_x509.o: $(hdrdir)/ruby/internal/has/feature.h
+ossl_x509.o: $(hdrdir)/ruby/internal/has/warning.h
+ossl_x509.o: $(hdrdir)/ruby/internal/intern/array.h
+ossl_x509.o: $(hdrdir)/ruby/internal/intern/bignum.h
+ossl_x509.o: $(hdrdir)/ruby/internal/intern/class.h
+ossl_x509.o: $(hdrdir)/ruby/internal/intern/compar.h
+ossl_x509.o: $(hdrdir)/ruby/internal/intern/complex.h
+ossl_x509.o: $(hdrdir)/ruby/internal/intern/cont.h
+ossl_x509.o: $(hdrdir)/ruby/internal/intern/dir.h
+ossl_x509.o: $(hdrdir)/ruby/internal/intern/enum.h
+ossl_x509.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+ossl_x509.o: $(hdrdir)/ruby/internal/intern/error.h
+ossl_x509.o: $(hdrdir)/ruby/internal/intern/eval.h
+ossl_x509.o: $(hdrdir)/ruby/internal/intern/file.h
+ossl_x509.o: $(hdrdir)/ruby/internal/intern/gc.h
+ossl_x509.o: $(hdrdir)/ruby/internal/intern/hash.h
+ossl_x509.o: $(hdrdir)/ruby/internal/intern/io.h
+ossl_x509.o: $(hdrdir)/ruby/internal/intern/load.h
+ossl_x509.o: $(hdrdir)/ruby/internal/intern/marshal.h
+ossl_x509.o: $(hdrdir)/ruby/internal/intern/numeric.h
+ossl_x509.o: $(hdrdir)/ruby/internal/intern/object.h
+ossl_x509.o: $(hdrdir)/ruby/internal/intern/parse.h
+ossl_x509.o: $(hdrdir)/ruby/internal/intern/proc.h
+ossl_x509.o: $(hdrdir)/ruby/internal/intern/process.h
+ossl_x509.o: $(hdrdir)/ruby/internal/intern/random.h
+ossl_x509.o: $(hdrdir)/ruby/internal/intern/range.h
+ossl_x509.o: $(hdrdir)/ruby/internal/intern/rational.h
+ossl_x509.o: $(hdrdir)/ruby/internal/intern/re.h
+ossl_x509.o: $(hdrdir)/ruby/internal/intern/ruby.h
+ossl_x509.o: $(hdrdir)/ruby/internal/intern/select.h
+ossl_x509.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_x509.o: $(hdrdir)/ruby/internal/intern/signal.h
+ossl_x509.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+ossl_x509.o: $(hdrdir)/ruby/internal/intern/string.h
+ossl_x509.o: $(hdrdir)/ruby/internal/intern/struct.h
+ossl_x509.o: $(hdrdir)/ruby/internal/intern/thread.h
+ossl_x509.o: $(hdrdir)/ruby/internal/intern/time.h
+ossl_x509.o: $(hdrdir)/ruby/internal/intern/variable.h
+ossl_x509.o: $(hdrdir)/ruby/internal/intern/vm.h
+ossl_x509.o: $(hdrdir)/ruby/internal/interpreter.h
+ossl_x509.o: $(hdrdir)/ruby/internal/iterator.h
+ossl_x509.o: $(hdrdir)/ruby/internal/memory.h
+ossl_x509.o: $(hdrdir)/ruby/internal/method.h
+ossl_x509.o: $(hdrdir)/ruby/internal/module.h
+ossl_x509.o: $(hdrdir)/ruby/internal/newobj.h
+ossl_x509.o: $(hdrdir)/ruby/internal/rgengc.h
+ossl_x509.o: $(hdrdir)/ruby/internal/scan_args.h
+ossl_x509.o: $(hdrdir)/ruby/internal/special_consts.h
+ossl_x509.o: $(hdrdir)/ruby/internal/static_assert.h
+ossl_x509.o: $(hdrdir)/ruby/internal/stdalign.h
+ossl_x509.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_x509.o: $(hdrdir)/ruby/internal/symbol.h
+ossl_x509.o: $(hdrdir)/ruby/internal/token_paste.h
+ossl_x509.o: $(hdrdir)/ruby/internal/value.h
+ossl_x509.o: $(hdrdir)/ruby/internal/value_type.h
+ossl_x509.o: $(hdrdir)/ruby/internal/variable.h
+ossl_x509.o: $(hdrdir)/ruby/internal/warning_push.h
+ossl_x509.o: $(hdrdir)/ruby/internal/xmalloc.h
 ossl_x509.o: $(hdrdir)/ruby/io.h
 ossl_x509.o: $(hdrdir)/ruby/missing.h
+ossl_x509.o: $(hdrdir)/ruby/onigmo.h
 ossl_x509.o: $(hdrdir)/ruby/oniguruma.h
 ossl_x509.o: $(hdrdir)/ruby/ruby.h
 ossl_x509.o: $(hdrdir)/ruby/st.h
 ossl_x509.o: $(hdrdir)/ruby/subst.h
 ossl_x509.o: $(hdrdir)/ruby/thread.h
-ossl_x509.o: $(top_srcdir)/include/ruby.h
 ossl_x509.o: openssl_missing.h
 ossl_x509.o: ossl.h
 ossl_x509.o: ossl_asn1.h
@@ -819,32 +4481,183 @@ ossl_x509.o: ossl_config.h
 ossl_x509.o: ossl_digest.h
 ossl_x509.o: ossl_engine.h
 ossl_x509.o: ossl_hmac.h
+ossl_x509.o: ossl_kdf.h
 ossl_x509.o: ossl_ns_spki.h
 ossl_x509.o: ossl_ocsp.h
 ossl_x509.o: ossl_pkcs12.h
-ossl_x509.o: ossl_pkcs5.h
 ossl_x509.o: ossl_pkcs7.h
 ossl_x509.o: ossl_pkey.h
 ossl_x509.o: ossl_rand.h
 ossl_x509.o: ossl_ssl.h
-ossl_x509.o: ossl_version.h
+ossl_x509.o: ossl_ts.h
 ossl_x509.o: ossl_x509.c
 ossl_x509.o: ossl_x509.h
 ossl_x509.o: ruby_missing.h
 ossl_x509attr.o: $(RUBY_EXTCONF_H)
 ossl_x509attr.o: $(arch_hdrdir)/ruby/config.h
+ossl_x509attr.o: $(hdrdir)/ruby.h
+ossl_x509attr.o: $(hdrdir)/ruby/assert.h
 ossl_x509attr.o: $(hdrdir)/ruby/backward.h
+ossl_x509attr.o: $(hdrdir)/ruby/backward/2/assume.h
+ossl_x509attr.o: $(hdrdir)/ruby/backward/2/attributes.h
+ossl_x509attr.o: $(hdrdir)/ruby/backward/2/bool.h
+ossl_x509attr.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+ossl_x509attr.o: $(hdrdir)/ruby/backward/2/inttypes.h
+ossl_x509attr.o: $(hdrdir)/ruby/backward/2/limits.h
+ossl_x509attr.o: $(hdrdir)/ruby/backward/2/long_long.h
+ossl_x509attr.o: $(hdrdir)/ruby/backward/2/stdalign.h
+ossl_x509attr.o: $(hdrdir)/ruby/backward/2/stdarg.h
 ossl_x509attr.o: $(hdrdir)/ruby/defines.h
 ossl_x509attr.o: $(hdrdir)/ruby/encoding.h
 ossl_x509attr.o: $(hdrdir)/ruby/intern.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/anyargs.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/arithmetic.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/assume.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/attr/artificial.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/attr/cold.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/attr/const.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/attr/error.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/attr/format.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/attr/noalias.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/attr/noinline.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/attr/pure.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/attr/restrict.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/attr/warning.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/attr/weakref.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/cast.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/compiler_is.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/compiler_since.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/config.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/constant_p.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/core.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/core/rarray.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/core/rbasic.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/core/rbignum.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/core/rclass.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/core/rdata.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/core/rfile.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/core/rhash.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/core/robject.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/core/rregexp.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/core/rstring.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/core/rstruct.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/ctype.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/dllexport.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/dosish.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/error.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/eval.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/event.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/fl_type.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/gc.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/glob.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/globals.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/has/attribute.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/has/builtin.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/has/extension.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/has/feature.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/has/warning.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/array.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/bignum.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/class.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/compar.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/complex.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/cont.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/dir.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/enum.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/error.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/eval.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/file.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/gc.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/hash.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/io.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/load.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/marshal.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/numeric.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/object.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/parse.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/proc.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/process.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/random.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/range.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/rational.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/re.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/ruby.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/select.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/signal.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/string.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/struct.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/thread.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/time.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/variable.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/intern/vm.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/interpreter.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/iterator.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/memory.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/method.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/module.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/newobj.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/rgengc.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/scan_args.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/special_consts.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/static_assert.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/stdalign.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/symbol.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/token_paste.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/value.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/value_type.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/variable.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/warning_push.h
+ossl_x509attr.o: $(hdrdir)/ruby/internal/xmalloc.h
 ossl_x509attr.o: $(hdrdir)/ruby/io.h
 ossl_x509attr.o: $(hdrdir)/ruby/missing.h
+ossl_x509attr.o: $(hdrdir)/ruby/onigmo.h
 ossl_x509attr.o: $(hdrdir)/ruby/oniguruma.h
 ossl_x509attr.o: $(hdrdir)/ruby/ruby.h
 ossl_x509attr.o: $(hdrdir)/ruby/st.h
 ossl_x509attr.o: $(hdrdir)/ruby/subst.h
 ossl_x509attr.o: $(hdrdir)/ruby/thread.h
-ossl_x509attr.o: $(top_srcdir)/include/ruby.h
 ossl_x509attr.o: openssl_missing.h
 ossl_x509attr.o: ossl.h
 ossl_x509attr.o: ossl_asn1.h
@@ -855,32 +4668,183 @@ ossl_x509attr.o: ossl_config.h
 ossl_x509attr.o: ossl_digest.h
 ossl_x509attr.o: ossl_engine.h
 ossl_x509attr.o: ossl_hmac.h
+ossl_x509attr.o: ossl_kdf.h
 ossl_x509attr.o: ossl_ns_spki.h
 ossl_x509attr.o: ossl_ocsp.h
 ossl_x509attr.o: ossl_pkcs12.h
-ossl_x509attr.o: ossl_pkcs5.h
 ossl_x509attr.o: ossl_pkcs7.h
 ossl_x509attr.o: ossl_pkey.h
 ossl_x509attr.o: ossl_rand.h
 ossl_x509attr.o: ossl_ssl.h
-ossl_x509attr.o: ossl_version.h
+ossl_x509attr.o: ossl_ts.h
 ossl_x509attr.o: ossl_x509.h
 ossl_x509attr.o: ossl_x509attr.c
 ossl_x509attr.o: ruby_missing.h
 ossl_x509cert.o: $(RUBY_EXTCONF_H)
 ossl_x509cert.o: $(arch_hdrdir)/ruby/config.h
+ossl_x509cert.o: $(hdrdir)/ruby.h
+ossl_x509cert.o: $(hdrdir)/ruby/assert.h
 ossl_x509cert.o: $(hdrdir)/ruby/backward.h
+ossl_x509cert.o: $(hdrdir)/ruby/backward/2/assume.h
+ossl_x509cert.o: $(hdrdir)/ruby/backward/2/attributes.h
+ossl_x509cert.o: $(hdrdir)/ruby/backward/2/bool.h
+ossl_x509cert.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+ossl_x509cert.o: $(hdrdir)/ruby/backward/2/inttypes.h
+ossl_x509cert.o: $(hdrdir)/ruby/backward/2/limits.h
+ossl_x509cert.o: $(hdrdir)/ruby/backward/2/long_long.h
+ossl_x509cert.o: $(hdrdir)/ruby/backward/2/stdalign.h
+ossl_x509cert.o: $(hdrdir)/ruby/backward/2/stdarg.h
 ossl_x509cert.o: $(hdrdir)/ruby/defines.h
 ossl_x509cert.o: $(hdrdir)/ruby/encoding.h
 ossl_x509cert.o: $(hdrdir)/ruby/intern.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/anyargs.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/arithmetic.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/assume.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/attr/artificial.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/attr/cold.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/attr/const.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/attr/error.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/attr/format.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/attr/noalias.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/attr/noinline.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/attr/pure.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/attr/restrict.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/attr/warning.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/attr/weakref.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/cast.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/compiler_is.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/compiler_since.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/config.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/constant_p.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/core.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/core/rarray.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/core/rbasic.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/core/rbignum.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/core/rclass.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/core/rdata.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/core/rfile.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/core/rhash.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/core/robject.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/core/rregexp.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/core/rstring.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/core/rstruct.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/ctype.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/dllexport.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/dosish.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/error.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/eval.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/event.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/fl_type.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/gc.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/glob.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/globals.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/has/attribute.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/has/builtin.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/has/extension.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/has/feature.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/has/warning.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/array.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/bignum.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/class.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/compar.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/complex.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/cont.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/dir.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/enum.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/error.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/eval.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/file.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/gc.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/hash.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/io.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/load.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/marshal.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/numeric.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/object.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/parse.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/proc.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/process.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/random.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/range.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/rational.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/re.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/ruby.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/select.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/signal.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/string.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/struct.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/thread.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/time.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/variable.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/intern/vm.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/interpreter.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/iterator.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/memory.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/method.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/module.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/newobj.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/rgengc.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/scan_args.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/special_consts.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/static_assert.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/stdalign.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/symbol.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/token_paste.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/value.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/value_type.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/variable.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/warning_push.h
+ossl_x509cert.o: $(hdrdir)/ruby/internal/xmalloc.h
 ossl_x509cert.o: $(hdrdir)/ruby/io.h
 ossl_x509cert.o: $(hdrdir)/ruby/missing.h
+ossl_x509cert.o: $(hdrdir)/ruby/onigmo.h
 ossl_x509cert.o: $(hdrdir)/ruby/oniguruma.h
 ossl_x509cert.o: $(hdrdir)/ruby/ruby.h
 ossl_x509cert.o: $(hdrdir)/ruby/st.h
 ossl_x509cert.o: $(hdrdir)/ruby/subst.h
 ossl_x509cert.o: $(hdrdir)/ruby/thread.h
-ossl_x509cert.o: $(top_srcdir)/include/ruby.h
 ossl_x509cert.o: openssl_missing.h
 ossl_x509cert.o: ossl.h
 ossl_x509cert.o: ossl_asn1.h
@@ -891,32 +4855,183 @@ ossl_x509cert.o: ossl_config.h
 ossl_x509cert.o: ossl_digest.h
 ossl_x509cert.o: ossl_engine.h
 ossl_x509cert.o: ossl_hmac.h
+ossl_x509cert.o: ossl_kdf.h
 ossl_x509cert.o: ossl_ns_spki.h
 ossl_x509cert.o: ossl_ocsp.h
 ossl_x509cert.o: ossl_pkcs12.h
-ossl_x509cert.o: ossl_pkcs5.h
 ossl_x509cert.o: ossl_pkcs7.h
 ossl_x509cert.o: ossl_pkey.h
 ossl_x509cert.o: ossl_rand.h
 ossl_x509cert.o: ossl_ssl.h
-ossl_x509cert.o: ossl_version.h
+ossl_x509cert.o: ossl_ts.h
 ossl_x509cert.o: ossl_x509.h
 ossl_x509cert.o: ossl_x509cert.c
 ossl_x509cert.o: ruby_missing.h
 ossl_x509crl.o: $(RUBY_EXTCONF_H)
 ossl_x509crl.o: $(arch_hdrdir)/ruby/config.h
+ossl_x509crl.o: $(hdrdir)/ruby.h
+ossl_x509crl.o: $(hdrdir)/ruby/assert.h
 ossl_x509crl.o: $(hdrdir)/ruby/backward.h
+ossl_x509crl.o: $(hdrdir)/ruby/backward/2/assume.h
+ossl_x509crl.o: $(hdrdir)/ruby/backward/2/attributes.h
+ossl_x509crl.o: $(hdrdir)/ruby/backward/2/bool.h
+ossl_x509crl.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+ossl_x509crl.o: $(hdrdir)/ruby/backward/2/inttypes.h
+ossl_x509crl.o: $(hdrdir)/ruby/backward/2/limits.h
+ossl_x509crl.o: $(hdrdir)/ruby/backward/2/long_long.h
+ossl_x509crl.o: $(hdrdir)/ruby/backward/2/stdalign.h
+ossl_x509crl.o: $(hdrdir)/ruby/backward/2/stdarg.h
 ossl_x509crl.o: $(hdrdir)/ruby/defines.h
 ossl_x509crl.o: $(hdrdir)/ruby/encoding.h
 ossl_x509crl.o: $(hdrdir)/ruby/intern.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/anyargs.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/arithmetic.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/assume.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/attr/artificial.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/attr/cold.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/attr/const.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/attr/error.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/attr/format.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/attr/noalias.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/attr/noinline.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/attr/pure.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/attr/restrict.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/attr/warning.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/attr/weakref.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/cast.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/compiler_is.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/compiler_since.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/config.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/constant_p.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/core.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/core/rarray.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/core/rbasic.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/core/rbignum.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/core/rclass.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/core/rdata.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/core/rfile.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/core/rhash.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/core/robject.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/core/rregexp.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/core/rstring.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/core/rstruct.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/ctype.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/dllexport.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/dosish.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/error.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/eval.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/event.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/fl_type.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/gc.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/glob.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/globals.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/has/attribute.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/has/builtin.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/has/extension.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/has/feature.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/has/warning.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/array.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/bignum.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/class.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/compar.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/complex.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/cont.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/dir.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/enum.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/error.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/eval.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/file.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/gc.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/hash.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/io.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/load.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/marshal.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/numeric.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/object.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/parse.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/proc.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/process.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/random.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/range.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/rational.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/re.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/ruby.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/select.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/signal.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/string.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/struct.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/thread.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/time.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/variable.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/intern/vm.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/interpreter.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/iterator.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/memory.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/method.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/module.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/newobj.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/rgengc.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/scan_args.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/special_consts.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/static_assert.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/stdalign.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/symbol.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/token_paste.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/value.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/value_type.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/variable.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/warning_push.h
+ossl_x509crl.o: $(hdrdir)/ruby/internal/xmalloc.h
 ossl_x509crl.o: $(hdrdir)/ruby/io.h
 ossl_x509crl.o: $(hdrdir)/ruby/missing.h
+ossl_x509crl.o: $(hdrdir)/ruby/onigmo.h
 ossl_x509crl.o: $(hdrdir)/ruby/oniguruma.h
 ossl_x509crl.o: $(hdrdir)/ruby/ruby.h
 ossl_x509crl.o: $(hdrdir)/ruby/st.h
 ossl_x509crl.o: $(hdrdir)/ruby/subst.h
 ossl_x509crl.o: $(hdrdir)/ruby/thread.h
-ossl_x509crl.o: $(top_srcdir)/include/ruby.h
 ossl_x509crl.o: openssl_missing.h
 ossl_x509crl.o: ossl.h
 ossl_x509crl.o: ossl_asn1.h
@@ -927,32 +5042,183 @@ ossl_x509crl.o: ossl_config.h
 ossl_x509crl.o: ossl_digest.h
 ossl_x509crl.o: ossl_engine.h
 ossl_x509crl.o: ossl_hmac.h
+ossl_x509crl.o: ossl_kdf.h
 ossl_x509crl.o: ossl_ns_spki.h
 ossl_x509crl.o: ossl_ocsp.h
 ossl_x509crl.o: ossl_pkcs12.h
-ossl_x509crl.o: ossl_pkcs5.h
 ossl_x509crl.o: ossl_pkcs7.h
 ossl_x509crl.o: ossl_pkey.h
 ossl_x509crl.o: ossl_rand.h
 ossl_x509crl.o: ossl_ssl.h
-ossl_x509crl.o: ossl_version.h
+ossl_x509crl.o: ossl_ts.h
 ossl_x509crl.o: ossl_x509.h
 ossl_x509crl.o: ossl_x509crl.c
 ossl_x509crl.o: ruby_missing.h
 ossl_x509ext.o: $(RUBY_EXTCONF_H)
 ossl_x509ext.o: $(arch_hdrdir)/ruby/config.h
+ossl_x509ext.o: $(hdrdir)/ruby.h
+ossl_x509ext.o: $(hdrdir)/ruby/assert.h
 ossl_x509ext.o: $(hdrdir)/ruby/backward.h
+ossl_x509ext.o: $(hdrdir)/ruby/backward/2/assume.h
+ossl_x509ext.o: $(hdrdir)/ruby/backward/2/attributes.h
+ossl_x509ext.o: $(hdrdir)/ruby/backward/2/bool.h
+ossl_x509ext.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+ossl_x509ext.o: $(hdrdir)/ruby/backward/2/inttypes.h
+ossl_x509ext.o: $(hdrdir)/ruby/backward/2/limits.h
+ossl_x509ext.o: $(hdrdir)/ruby/backward/2/long_long.h
+ossl_x509ext.o: $(hdrdir)/ruby/backward/2/stdalign.h
+ossl_x509ext.o: $(hdrdir)/ruby/backward/2/stdarg.h
 ossl_x509ext.o: $(hdrdir)/ruby/defines.h
 ossl_x509ext.o: $(hdrdir)/ruby/encoding.h
 ossl_x509ext.o: $(hdrdir)/ruby/intern.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/anyargs.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/arithmetic.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/assume.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/attr/artificial.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/attr/cold.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/attr/const.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/attr/error.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/attr/format.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/attr/noalias.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/attr/noinline.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/attr/pure.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/attr/restrict.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/attr/warning.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/attr/weakref.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/cast.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/compiler_is.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/compiler_since.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/config.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/constant_p.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/core.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/core/rarray.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/core/rbasic.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/core/rbignum.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/core/rclass.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/core/rdata.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/core/rfile.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/core/rhash.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/core/robject.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/core/rregexp.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/core/rstring.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/core/rstruct.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/ctype.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/dllexport.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/dosish.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/error.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/eval.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/event.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/fl_type.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/gc.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/glob.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/globals.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/has/attribute.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/has/builtin.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/has/extension.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/has/feature.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/has/warning.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/array.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/bignum.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/class.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/compar.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/complex.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/cont.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/dir.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/enum.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/error.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/eval.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/file.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/gc.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/hash.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/io.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/load.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/marshal.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/numeric.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/object.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/parse.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/proc.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/process.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/random.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/range.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/rational.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/re.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/ruby.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/select.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/signal.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/string.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/struct.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/thread.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/time.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/variable.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/intern/vm.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/interpreter.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/iterator.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/memory.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/method.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/module.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/newobj.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/rgengc.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/scan_args.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/special_consts.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/static_assert.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/stdalign.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/symbol.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/token_paste.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/value.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/value_type.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/variable.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/warning_push.h
+ossl_x509ext.o: $(hdrdir)/ruby/internal/xmalloc.h
 ossl_x509ext.o: $(hdrdir)/ruby/io.h
 ossl_x509ext.o: $(hdrdir)/ruby/missing.h
+ossl_x509ext.o: $(hdrdir)/ruby/onigmo.h
 ossl_x509ext.o: $(hdrdir)/ruby/oniguruma.h
 ossl_x509ext.o: $(hdrdir)/ruby/ruby.h
 ossl_x509ext.o: $(hdrdir)/ruby/st.h
 ossl_x509ext.o: $(hdrdir)/ruby/subst.h
 ossl_x509ext.o: $(hdrdir)/ruby/thread.h
-ossl_x509ext.o: $(top_srcdir)/include/ruby.h
 ossl_x509ext.o: openssl_missing.h
 ossl_x509ext.o: ossl.h
 ossl_x509ext.o: ossl_asn1.h
@@ -963,32 +5229,183 @@ ossl_x509ext.o: ossl_config.h
 ossl_x509ext.o: ossl_digest.h
 ossl_x509ext.o: ossl_engine.h
 ossl_x509ext.o: ossl_hmac.h
+ossl_x509ext.o: ossl_kdf.h
 ossl_x509ext.o: ossl_ns_spki.h
 ossl_x509ext.o: ossl_ocsp.h
 ossl_x509ext.o: ossl_pkcs12.h
-ossl_x509ext.o: ossl_pkcs5.h
 ossl_x509ext.o: ossl_pkcs7.h
 ossl_x509ext.o: ossl_pkey.h
 ossl_x509ext.o: ossl_rand.h
 ossl_x509ext.o: ossl_ssl.h
-ossl_x509ext.o: ossl_version.h
+ossl_x509ext.o: ossl_ts.h
 ossl_x509ext.o: ossl_x509.h
 ossl_x509ext.o: ossl_x509ext.c
 ossl_x509ext.o: ruby_missing.h
 ossl_x509name.o: $(RUBY_EXTCONF_H)
 ossl_x509name.o: $(arch_hdrdir)/ruby/config.h
+ossl_x509name.o: $(hdrdir)/ruby.h
+ossl_x509name.o: $(hdrdir)/ruby/assert.h
 ossl_x509name.o: $(hdrdir)/ruby/backward.h
+ossl_x509name.o: $(hdrdir)/ruby/backward/2/assume.h
+ossl_x509name.o: $(hdrdir)/ruby/backward/2/attributes.h
+ossl_x509name.o: $(hdrdir)/ruby/backward/2/bool.h
+ossl_x509name.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+ossl_x509name.o: $(hdrdir)/ruby/backward/2/inttypes.h
+ossl_x509name.o: $(hdrdir)/ruby/backward/2/limits.h
+ossl_x509name.o: $(hdrdir)/ruby/backward/2/long_long.h
+ossl_x509name.o: $(hdrdir)/ruby/backward/2/stdalign.h
+ossl_x509name.o: $(hdrdir)/ruby/backward/2/stdarg.h
 ossl_x509name.o: $(hdrdir)/ruby/defines.h
 ossl_x509name.o: $(hdrdir)/ruby/encoding.h
 ossl_x509name.o: $(hdrdir)/ruby/intern.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/anyargs.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/arithmetic.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/assume.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/attr/artificial.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/attr/cold.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/attr/const.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/attr/error.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/attr/format.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/attr/noalias.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/attr/noinline.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/attr/pure.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/attr/restrict.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/attr/warning.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/attr/weakref.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/cast.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/compiler_is.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/compiler_since.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/config.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/constant_p.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/core.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/core/rarray.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/core/rbasic.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/core/rbignum.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/core/rclass.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/core/rdata.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/core/rfile.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/core/rhash.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/core/robject.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/core/rregexp.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/core/rstring.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/core/rstruct.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/ctype.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/dllexport.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/dosish.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/error.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/eval.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/event.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/fl_type.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/gc.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/glob.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/globals.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/has/attribute.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/has/builtin.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/has/extension.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/has/feature.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/has/warning.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/intern/array.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/intern/bignum.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/intern/class.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/intern/compar.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/intern/complex.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/intern/cont.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/intern/dir.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/intern/enum.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/intern/error.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/intern/eval.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/intern/file.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/intern/gc.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/intern/hash.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/intern/io.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/intern/load.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/intern/marshal.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/intern/numeric.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/intern/object.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/intern/parse.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/intern/proc.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/intern/process.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/intern/random.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/intern/range.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/intern/rational.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/intern/re.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/intern/ruby.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/intern/select.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/intern/signal.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/intern/string.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/intern/struct.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/intern/thread.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/intern/time.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/intern/variable.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/intern/vm.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/interpreter.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/iterator.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/memory.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/method.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/module.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/newobj.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/rgengc.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/scan_args.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/special_consts.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/static_assert.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/stdalign.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/symbol.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/token_paste.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/value.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/value_type.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/variable.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/warning_push.h
+ossl_x509name.o: $(hdrdir)/ruby/internal/xmalloc.h
 ossl_x509name.o: $(hdrdir)/ruby/io.h
 ossl_x509name.o: $(hdrdir)/ruby/missing.h
+ossl_x509name.o: $(hdrdir)/ruby/onigmo.h
 ossl_x509name.o: $(hdrdir)/ruby/oniguruma.h
 ossl_x509name.o: $(hdrdir)/ruby/ruby.h
 ossl_x509name.o: $(hdrdir)/ruby/st.h
 ossl_x509name.o: $(hdrdir)/ruby/subst.h
 ossl_x509name.o: $(hdrdir)/ruby/thread.h
-ossl_x509name.o: $(top_srcdir)/include/ruby.h
 ossl_x509name.o: openssl_missing.h
 ossl_x509name.o: ossl.h
 ossl_x509name.o: ossl_asn1.h
@@ -999,32 +5416,183 @@ ossl_x509name.o: ossl_config.h
 ossl_x509name.o: ossl_digest.h
 ossl_x509name.o: ossl_engine.h
 ossl_x509name.o: ossl_hmac.h
+ossl_x509name.o: ossl_kdf.h
 ossl_x509name.o: ossl_ns_spki.h
 ossl_x509name.o: ossl_ocsp.h
 ossl_x509name.o: ossl_pkcs12.h
-ossl_x509name.o: ossl_pkcs5.h
 ossl_x509name.o: ossl_pkcs7.h
 ossl_x509name.o: ossl_pkey.h
 ossl_x509name.o: ossl_rand.h
 ossl_x509name.o: ossl_ssl.h
-ossl_x509name.o: ossl_version.h
+ossl_x509name.o: ossl_ts.h
 ossl_x509name.o: ossl_x509.h
 ossl_x509name.o: ossl_x509name.c
 ossl_x509name.o: ruby_missing.h
 ossl_x509req.o: $(RUBY_EXTCONF_H)
 ossl_x509req.o: $(arch_hdrdir)/ruby/config.h
+ossl_x509req.o: $(hdrdir)/ruby.h
+ossl_x509req.o: $(hdrdir)/ruby/assert.h
 ossl_x509req.o: $(hdrdir)/ruby/backward.h
+ossl_x509req.o: $(hdrdir)/ruby/backward/2/assume.h
+ossl_x509req.o: $(hdrdir)/ruby/backward/2/attributes.h
+ossl_x509req.o: $(hdrdir)/ruby/backward/2/bool.h
+ossl_x509req.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+ossl_x509req.o: $(hdrdir)/ruby/backward/2/inttypes.h
+ossl_x509req.o: $(hdrdir)/ruby/backward/2/limits.h
+ossl_x509req.o: $(hdrdir)/ruby/backward/2/long_long.h
+ossl_x509req.o: $(hdrdir)/ruby/backward/2/stdalign.h
+ossl_x509req.o: $(hdrdir)/ruby/backward/2/stdarg.h
 ossl_x509req.o: $(hdrdir)/ruby/defines.h
 ossl_x509req.o: $(hdrdir)/ruby/encoding.h
 ossl_x509req.o: $(hdrdir)/ruby/intern.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/anyargs.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/arithmetic.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/assume.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/attr/artificial.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/attr/cold.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/attr/const.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/attr/error.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/attr/format.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/attr/noalias.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/attr/noinline.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/attr/pure.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/attr/restrict.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/attr/warning.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/attr/weakref.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/cast.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/compiler_is.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/compiler_since.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/config.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/constant_p.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/core.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/core/rarray.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/core/rbasic.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/core/rbignum.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/core/rclass.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/core/rdata.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/core/rfile.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/core/rhash.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/core/robject.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/core/rregexp.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/core/rstring.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/core/rstruct.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/ctype.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/dllexport.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/dosish.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/error.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/eval.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/event.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/fl_type.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/gc.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/glob.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/globals.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/has/attribute.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/has/builtin.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/has/extension.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/has/feature.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/has/warning.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/intern/array.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/intern/bignum.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/intern/class.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/intern/compar.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/intern/complex.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/intern/cont.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/intern/dir.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/intern/enum.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/intern/error.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/intern/eval.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/intern/file.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/intern/gc.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/intern/hash.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/intern/io.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/intern/load.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/intern/marshal.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/intern/numeric.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/intern/object.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/intern/parse.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/intern/proc.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/intern/process.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/intern/random.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/intern/range.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/intern/rational.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/intern/re.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/intern/ruby.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/intern/select.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/intern/signal.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/intern/string.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/intern/struct.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/intern/thread.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/intern/time.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/intern/variable.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/intern/vm.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/interpreter.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/iterator.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/memory.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/method.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/module.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/newobj.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/rgengc.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/scan_args.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/special_consts.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/static_assert.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/stdalign.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/symbol.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/token_paste.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/value.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/value_type.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/variable.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/warning_push.h
+ossl_x509req.o: $(hdrdir)/ruby/internal/xmalloc.h
 ossl_x509req.o: $(hdrdir)/ruby/io.h
 ossl_x509req.o: $(hdrdir)/ruby/missing.h
+ossl_x509req.o: $(hdrdir)/ruby/onigmo.h
 ossl_x509req.o: $(hdrdir)/ruby/oniguruma.h
 ossl_x509req.o: $(hdrdir)/ruby/ruby.h
 ossl_x509req.o: $(hdrdir)/ruby/st.h
 ossl_x509req.o: $(hdrdir)/ruby/subst.h
 ossl_x509req.o: $(hdrdir)/ruby/thread.h
-ossl_x509req.o: $(top_srcdir)/include/ruby.h
 ossl_x509req.o: openssl_missing.h
 ossl_x509req.o: ossl.h
 ossl_x509req.o: ossl_asn1.h
@@ -1035,32 +5603,183 @@ ossl_x509req.o: ossl_config.h
 ossl_x509req.o: ossl_digest.h
 ossl_x509req.o: ossl_engine.h
 ossl_x509req.o: ossl_hmac.h
+ossl_x509req.o: ossl_kdf.h
 ossl_x509req.o: ossl_ns_spki.h
 ossl_x509req.o: ossl_ocsp.h
 ossl_x509req.o: ossl_pkcs12.h
-ossl_x509req.o: ossl_pkcs5.h
 ossl_x509req.o: ossl_pkcs7.h
 ossl_x509req.o: ossl_pkey.h
 ossl_x509req.o: ossl_rand.h
 ossl_x509req.o: ossl_ssl.h
-ossl_x509req.o: ossl_version.h
+ossl_x509req.o: ossl_ts.h
 ossl_x509req.o: ossl_x509.h
 ossl_x509req.o: ossl_x509req.c
 ossl_x509req.o: ruby_missing.h
 ossl_x509revoked.o: $(RUBY_EXTCONF_H)
 ossl_x509revoked.o: $(arch_hdrdir)/ruby/config.h
+ossl_x509revoked.o: $(hdrdir)/ruby.h
+ossl_x509revoked.o: $(hdrdir)/ruby/assert.h
 ossl_x509revoked.o: $(hdrdir)/ruby/backward.h
+ossl_x509revoked.o: $(hdrdir)/ruby/backward/2/assume.h
+ossl_x509revoked.o: $(hdrdir)/ruby/backward/2/attributes.h
+ossl_x509revoked.o: $(hdrdir)/ruby/backward/2/bool.h
+ossl_x509revoked.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+ossl_x509revoked.o: $(hdrdir)/ruby/backward/2/inttypes.h
+ossl_x509revoked.o: $(hdrdir)/ruby/backward/2/limits.h
+ossl_x509revoked.o: $(hdrdir)/ruby/backward/2/long_long.h
+ossl_x509revoked.o: $(hdrdir)/ruby/backward/2/stdalign.h
+ossl_x509revoked.o: $(hdrdir)/ruby/backward/2/stdarg.h
 ossl_x509revoked.o: $(hdrdir)/ruby/defines.h
 ossl_x509revoked.o: $(hdrdir)/ruby/encoding.h
 ossl_x509revoked.o: $(hdrdir)/ruby/intern.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/anyargs.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/arithmetic.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/assume.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/attr/artificial.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/attr/cold.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/attr/const.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/attr/error.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/attr/format.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/attr/noalias.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/attr/noinline.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/attr/pure.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/attr/restrict.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/attr/warning.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/attr/weakref.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/cast.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/compiler_is.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/compiler_since.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/config.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/constant_p.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/core.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/core/rarray.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/core/rbasic.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/core/rbignum.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/core/rclass.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/core/rdata.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/core/rfile.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/core/rhash.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/core/robject.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/core/rregexp.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/core/rstring.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/core/rstruct.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/ctype.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/dllexport.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/dosish.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/error.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/eval.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/event.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/fl_type.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/gc.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/glob.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/globals.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/has/attribute.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/has/builtin.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/has/extension.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/has/feature.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/has/warning.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/array.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/bignum.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/class.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/compar.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/complex.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/cont.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/dir.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/enum.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/error.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/eval.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/file.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/gc.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/hash.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/io.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/load.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/marshal.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/numeric.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/object.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/parse.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/proc.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/process.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/random.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/range.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/rational.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/re.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/ruby.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/select.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/signal.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/string.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/struct.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/thread.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/time.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/variable.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/intern/vm.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/interpreter.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/iterator.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/memory.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/method.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/module.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/newobj.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/rgengc.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/scan_args.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/special_consts.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/static_assert.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/stdalign.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/symbol.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/token_paste.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/value.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/value_type.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/variable.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/warning_push.h
+ossl_x509revoked.o: $(hdrdir)/ruby/internal/xmalloc.h
 ossl_x509revoked.o: $(hdrdir)/ruby/io.h
 ossl_x509revoked.o: $(hdrdir)/ruby/missing.h
+ossl_x509revoked.o: $(hdrdir)/ruby/onigmo.h
 ossl_x509revoked.o: $(hdrdir)/ruby/oniguruma.h
 ossl_x509revoked.o: $(hdrdir)/ruby/ruby.h
 ossl_x509revoked.o: $(hdrdir)/ruby/st.h
 ossl_x509revoked.o: $(hdrdir)/ruby/subst.h
 ossl_x509revoked.o: $(hdrdir)/ruby/thread.h
-ossl_x509revoked.o: $(top_srcdir)/include/ruby.h
 ossl_x509revoked.o: openssl_missing.h
 ossl_x509revoked.o: ossl.h
 ossl_x509revoked.o: ossl_asn1.h
@@ -1071,32 +5790,183 @@ ossl_x509revoked.o: ossl_config.h
 ossl_x509revoked.o: ossl_digest.h
 ossl_x509revoked.o: ossl_engine.h
 ossl_x509revoked.o: ossl_hmac.h
+ossl_x509revoked.o: ossl_kdf.h
 ossl_x509revoked.o: ossl_ns_spki.h
 ossl_x509revoked.o: ossl_ocsp.h
 ossl_x509revoked.o: ossl_pkcs12.h
-ossl_x509revoked.o: ossl_pkcs5.h
 ossl_x509revoked.o: ossl_pkcs7.h
 ossl_x509revoked.o: ossl_pkey.h
 ossl_x509revoked.o: ossl_rand.h
 ossl_x509revoked.o: ossl_ssl.h
-ossl_x509revoked.o: ossl_version.h
+ossl_x509revoked.o: ossl_ts.h
 ossl_x509revoked.o: ossl_x509.h
 ossl_x509revoked.o: ossl_x509revoked.c
 ossl_x509revoked.o: ruby_missing.h
 ossl_x509store.o: $(RUBY_EXTCONF_H)
 ossl_x509store.o: $(arch_hdrdir)/ruby/config.h
+ossl_x509store.o: $(hdrdir)/ruby.h
+ossl_x509store.o: $(hdrdir)/ruby/assert.h
 ossl_x509store.o: $(hdrdir)/ruby/backward.h
+ossl_x509store.o: $(hdrdir)/ruby/backward/2/assume.h
+ossl_x509store.o: $(hdrdir)/ruby/backward/2/attributes.h
+ossl_x509store.o: $(hdrdir)/ruby/backward/2/bool.h
+ossl_x509store.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+ossl_x509store.o: $(hdrdir)/ruby/backward/2/inttypes.h
+ossl_x509store.o: $(hdrdir)/ruby/backward/2/limits.h
+ossl_x509store.o: $(hdrdir)/ruby/backward/2/long_long.h
+ossl_x509store.o: $(hdrdir)/ruby/backward/2/stdalign.h
+ossl_x509store.o: $(hdrdir)/ruby/backward/2/stdarg.h
 ossl_x509store.o: $(hdrdir)/ruby/defines.h
 ossl_x509store.o: $(hdrdir)/ruby/encoding.h
 ossl_x509store.o: $(hdrdir)/ruby/intern.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/anyargs.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/arithmetic.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/assume.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/attr/artificial.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/attr/cold.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/attr/const.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/attr/error.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/attr/format.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/attr/noalias.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/attr/noinline.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/attr/pure.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/attr/restrict.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/attr/warning.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/attr/weakref.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/cast.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/compiler_is.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/compiler_since.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/config.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/constant_p.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/core.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/core/rarray.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/core/rbasic.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/core/rbignum.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/core/rclass.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/core/rdata.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/core/rfile.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/core/rhash.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/core/robject.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/core/rregexp.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/core/rstring.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/core/rstruct.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/ctype.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/dllexport.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/dosish.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/error.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/eval.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/event.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/fl_type.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/gc.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/glob.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/globals.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/has/attribute.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/has/builtin.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/has/extension.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/has/feature.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/has/warning.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/intern/array.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/intern/bignum.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/intern/class.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/intern/compar.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/intern/complex.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/intern/cont.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/intern/dir.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/intern/enum.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/intern/error.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/intern/eval.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/intern/file.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/intern/gc.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/intern/hash.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/intern/io.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/intern/load.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/intern/marshal.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/intern/numeric.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/intern/object.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/intern/parse.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/intern/proc.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/intern/process.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/intern/random.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/intern/range.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/intern/rational.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/intern/re.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/intern/ruby.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/intern/select.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/intern/signal.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/intern/string.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/intern/struct.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/intern/thread.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/intern/time.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/intern/variable.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/intern/vm.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/interpreter.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/iterator.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/memory.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/method.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/module.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/newobj.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/rgengc.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/scan_args.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/special_consts.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/static_assert.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/stdalign.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/stdbool.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/symbol.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/token_paste.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/value.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/value_type.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/variable.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/warning_push.h
+ossl_x509store.o: $(hdrdir)/ruby/internal/xmalloc.h
 ossl_x509store.o: $(hdrdir)/ruby/io.h
 ossl_x509store.o: $(hdrdir)/ruby/missing.h
+ossl_x509store.o: $(hdrdir)/ruby/onigmo.h
 ossl_x509store.o: $(hdrdir)/ruby/oniguruma.h
 ossl_x509store.o: $(hdrdir)/ruby/ruby.h
 ossl_x509store.o: $(hdrdir)/ruby/st.h
 ossl_x509store.o: $(hdrdir)/ruby/subst.h
 ossl_x509store.o: $(hdrdir)/ruby/thread.h
-ossl_x509store.o: $(top_srcdir)/include/ruby.h
 ossl_x509store.o: openssl_missing.h
 ossl_x509store.o: ossl.h
 ossl_x509store.o: ossl_asn1.h
@@ -1107,15 +5977,15 @@ ossl_x509store.o: ossl_config.h
 ossl_x509store.o: ossl_digest.h
 ossl_x509store.o: ossl_engine.h
 ossl_x509store.o: ossl_hmac.h
+ossl_x509store.o: ossl_kdf.h
 ossl_x509store.o: ossl_ns_spki.h
 ossl_x509store.o: ossl_ocsp.h
 ossl_x509store.o: ossl_pkcs12.h
-ossl_x509store.o: ossl_pkcs5.h
 ossl_x509store.o: ossl_pkcs7.h
 ossl_x509store.o: ossl_pkey.h
 ossl_x509store.o: ossl_rand.h
 ossl_x509store.o: ossl_ssl.h
-ossl_x509store.o: ossl_version.h
+ossl_x509store.o: ossl_ts.h
 ossl_x509store.o: ossl_x509.h
 ossl_x509store.o: ossl_x509store.c
 ossl_x509store.o: ruby_missing.h
diff --git a/ext/openssl/deprecation.rb b/ext/openssl/deprecation.rb
deleted file mode 100644
index 7dfc87c1c6..0000000000
--- a/ext/openssl/deprecation.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# frozen_string_literal: false
-module OpenSSL
-  def self.deprecated_warning_flag
-    unless flag = (@deprecated_warning_flag ||= nil)
-      if try_compile("", flag = "-Werror=deprecated-declarations")
-        if with_config("broken-apple-openssl")
-          flag = "-Wno-deprecated-declarations"
-        end
-        $warnflags << " #{flag}"
-      else
-        flag = ""
-      end
-      @deprecated_warning_flag = flag
-    end
-    flag
-  end
-
-  def self.check_func(func, header)
-    have_func(func, header, deprecated_warning_flag)
-  end
-
-  def self.check_func_or_macro(func, header)
-    check_func(func, header) or
-      have_macro(func, header) && $defs.push("-DHAVE_#{func.upcase}")
-  end
-end
diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb
index ad92a287a6..0dc1a5eb43 100644
--- a/ext/openssl/extconf.rb
+++ b/ext/openssl/extconf.rb
@@ -1,5 +1,5 @@
 # -*- coding: us-ascii -*-
-# frozen_string_literal: false
+# frozen_string_literal: true
 =begin
 = Info
   'OpenSSL for Ruby 2' project
@@ -12,16 +12,12 @@
 =end
 
 require "mkmf"
-require File.expand_path('../deprecation', __FILE__)
 
-dir_config("openssl")
+dir_config_given = dir_config("openssl").any?
 dir_config("kerberos")
 
 Logging::message "=== OpenSSL for Ruby configurator ===\n"
 
-# Add -Werror=deprecated-declarations to $warnflags if available
-OpenSSL.deprecated_warning_flag
-
 ##
 # Adds -DOSSL_DEBUG for compilation and some more targets when GCC is used
 # To turn it on, use: --with-debug or --enable-debug
@@ -33,92 +29,120 @@ end
 Logging::message "=== Checking for system dependent stuff... ===\n"
 have_library("nsl", "t_open")
 have_library("socket", "socket")
-have_header("assert.h")
+if $mswin || $mingw
+  have_library("ws2_32")
+end
 
-Logging::message "=== Checking for required stuff... ===\n"
 if $mingw
-  have_library("wsock32")
-  have_library("gdi32")
+  append_cflags '-D_FORTIFY_SOURCE=2'
+  append_ldflags '-fstack-protector'
+  have_library 'ssp'
 end
 
-result = pkg_config("openssl") && have_header("openssl/ssl.h")
-unless result
-  result = have_header("openssl/ssl.h")
-  result &&= %w[crypto libeay32].any? {|lib| have_library(lib, "CRYPTO_malloc")}
-  result &&= %w[ssl ssleay32].any? {|lib| have_library(lib, "SSL_new")}
-  unless result
-    Logging::message "=== Checking for required stuff failed. ===\n"
-    Logging::message "Makefile wasn't created. Fix the errors above.\n"
-    exit 1
+def find_openssl_library
+  if $mswin || $mingw
+    # required for static OpenSSL libraries
+    have_library("gdi32") # OpenSSL <= 1.0.2 (for RAND_screen())
+    have_library("crypt32")
+  end
+
+  return false unless have_header("openssl/ssl.h")
+
+  ret = have_library("crypto", "CRYPTO_malloc") &&
+    have_library("ssl", "SSL_new")
+  return ret if ret
+
+  if $mswin
+    # OpenSSL >= 1.1.0: libcrypto.lib and libssl.lib.
+    if have_library("libcrypto", "CRYPTO_malloc") &&
+        have_library("libssl", "SSL_new")
+      return true
+    end
+
+    # OpenSSL <= 1.0.2: libeay32.lib and ssleay32.lib.
+    if have_library("libeay32", "CRYPTO_malloc") &&
+        have_library("ssleay32", "SSL_new")
+      return true
+    end
+
+    # LibreSSL: libcrypto-##.lib and libssl-##.lib, where ## is the ABI version
+    # number. We have to find the version number out by scanning libpath.
+    libpath = $LIBPATH.dup
+    libpath |= ENV["LIB"].split(File::PATH_SEPARATOR)
+    libpath.map! { |d| d.tr(File::ALT_SEPARATOR, File::SEPARATOR) }
+
+    ret = [
+      ["crypto", "CRYPTO_malloc"],
+      ["ssl", "SSL_new"]
+    ].all? do |base, func|
+      result = false
+      libs = ["lib#{base}-[0-9][0-9]", "lib#{base}-[0-9][0-9][0-9]"]
+      libs = Dir.glob(libs.map{|l| libpath.map{|d| File.join(d, l + ".*")}}.flatten).map{|path| File.basename(path, ".*")}.uniq
+      libs.each do |lib|
+        result = have_library(lib, func)
+        break if result
+      end
+      result
+    end
+    return ret if ret
   end
+  return false
 end
 
-result = checking_for("OpenSSL version is 0.9.8 or later") {
-  try_static_assert("OPENSSL_VERSION_NUMBER >= 0x00908000L", "openssl/opensslv.h")
-}
-unless result
-  raise "OpenSSL 0.9.8 or later required."
+Logging::message "=== Checking for required stuff... ===\n"
+pkg_config_found = !dir_config_given && pkg_config("openssl") && have_header("openssl/ssl.h")
+
+if !pkg_config_found && !find_openssl_library
+  Logging::message "=== Checking for required stuff failed. ===\n"
+  Logging::message "Makefile wasn't created. Fix the errors above.\n"
+  raise "OpenSSL library could not be found. You might want to use " \
+    "--with-openssl-dir=<dir> option to specify the prefix where OpenSSL " \
+    "is installed."
+end
+
+version_ok = if have_macro("LIBRESSL_VERSION_NUMBER", "openssl/opensslv.h")
+  is_libressl = true
+  checking_for("LibreSSL version >= 2.5.0") {
+    try_static_assert("LIBRESSL_VERSION_NUMBER >= 0x20500000L", "openssl/opensslv.h") }
+else
+  checking_for("OpenSSL version >= 1.0.1 and < 3.0.0") {
+    try_static_assert("OPENSSL_VERSION_NUMBER >= 0x10001000L", "openssl/opensslv.h") &&
+    !try_static_assert("OPENSSL_VERSION_MAJOR >= 3", "openssl/opensslv.h") }
+end
+unless version_ok
+  raise "OpenSSL >= 1.0.1, < 3.0.0 or LibreSSL >= 2.5.0 is required"
 end
 
-unless OpenSSL.check_func("SSL_library_init()", "openssl/ssl.h")
-  raise "Ignore OpenSSL broken by Apple.\nPlease use another openssl. (e.g. using `configure --with-openssl-dir=/path/to/openssl')"
+# Prevent wincrypt.h from being included, which defines conflicting macro with openssl/x509.h
+if is_libressl && ($mswin || $mingw)
+  $defs.push("-DNOCRYPT")
 end
 
 Logging::message "=== Checking for OpenSSL features... ===\n"
 # compile options
-
-# check OPENSSL_NO_{SSL2,SSL3_METHOD} macro: on some environment, these symbols
-# exist even if compiled with no-ssl2 or no-ssl3-method.
-unless have_macro("OPENSSL_NO_SSL2", "openssl/opensslconf.h")
-  have_func("SSLv2_method")
-end
-unless have_macro("OPENSSL_NO_SSL3_METHOD", "openssl/opensslconf.h")
-  have_func("SSLv3_method")
-end
-have_func("TLSv1_1_method")
-have_func("TLSv1_2_method")
 have_func("RAND_egd")
-engines = %w{builtin_engines openbsd_dev_crypto dynamic 4758cca aep atalla chil
-             cswift nuron sureware ubsec padlock capi gmp gost cryptodev aesni}
+engines = %w{dynamic 4758cca aep atalla chil
+             cswift nuron sureware ubsec padlock capi gmp gost cryptodev}
 engines.each { |name|
-  OpenSSL.check_func_or_macro("ENGINE_load_#{name}", "openssl/engine.h")
+  have_func("ENGINE_load_#{name}()", "openssl/engine.h")
 }
 
-# added in 0.9.8X
-have_func("EVP_CIPHER_CTX_new")
-have_func("EVP_CIPHER_CTX_free")
-
-# added in 1.0.0
-have_func("ASN1_TIME_adj")
-have_func("EVP_CIPHER_CTX_copy")
-have_func("EVP_PKEY_base_id")
-have_func("HMAC_CTX_copy")
-have_func("PKCS5_PBKDF2_HMAC")
-have_func("X509_NAME_hash_old")
-have_func("X509_STORE_CTX_get0_current_crl")
-have_func("X509_STORE_set_verify_cb")
-have_func("i2d_ASN1_SET_ANY")
-have_func("SSL_SESSION_cmp") # removed
-OpenSSL.check_func_or_macro("SSL_set_tlsext_host_name", "openssl/ssl.h")
-have_struct_member("CRYPTO_THREADID", "ptr", "openssl/crypto.h")
-
-# added in 1.0.1
-have_func("SSL_CTX_set_next_proto_select_cb")
-have_macro("EVP_CTRL_GCM_GET_TAG", ['openssl/evp.h']) && $defs.push("-DHAVE_AUTHENTICATED_ENCRYPTION")
-
 # added in 1.0.2
 have_func("EC_curve_nist2nid")
 have_func("X509_REVOKED_dup")
 have_func("X509_STORE_CTX_get0_store")
 have_func("SSL_CTX_set_alpn_select_cb")
-OpenSSL.check_func_or_macro("SSL_CTX_set1_curves_list", "openssl/ssl.h")
-OpenSSL.check_func_or_macro("SSL_CTX_set_ecdh_auto", "openssl/ssl.h")
-OpenSSL.check_func_or_macro("SSL_get_server_tmp_key", "openssl/ssl.h")
+have_func("SSL_CTX_set1_curves_list(NULL, NULL)", "openssl/ssl.h")
+have_func("SSL_CTX_set_ecdh_auto(NULL, 0)", "openssl/ssl.h")
+have_func("SSL_get_server_tmp_key(NULL, NULL)", "openssl/ssl.h")
 have_func("SSL_is_server")
 
 # added in 1.1.0
+if !have_struct_member("SSL", "ctx", "openssl/ssl.h") ||
+    try_static_assert("LIBRESSL_VERSION_NUMBER >= 0x2070000fL", "openssl/opensslv.h")
+  $defs.push("-DHAVE_OPAQUE_OPENSSL")
+end
 have_func("CRYPTO_lock") || $defs.push("-DHAVE_OPENSSL_110_THREADING_API")
-have_struct_member("SSL", "ctx", "openssl/ssl.h") || $defs.push("-DHAVE_OPAQUE_OPENSSL")
 have_func("BN_GENCB_new")
 have_func("BN_GENCB_free")
 have_func("BN_GENCB_get_arg")
@@ -126,9 +150,9 @@ have_func("EVP_MD_CTX_new")
 have_func("EVP_MD_CTX_free")
 have_func("HMAC_CTX_new")
 have_func("HMAC_CTX_free")
-OpenSSL.check_func("RAND_pseudo_bytes", "openssl/rand.h") # deprecated
 have_func("X509_STORE_get_ex_data")
 have_func("X509_STORE_set_ex_data")
+have_func("X509_STORE_get_ex_new_index")
 have_func("X509_CRL_get0_signature")
 have_func("X509_REQ_get0_signature")
 have_func("X509_REVOKED_get0_serialNumber")
@@ -144,14 +168,23 @@ have_func("X509_CRL_up_ref")
 have_func("X509_STORE_up_ref")
 have_func("SSL_SESSION_up_ref")
 have_func("EVP_PKEY_up_ref")
-OpenSSL.check_func_or_macro("SSL_CTX_set_tmp_ecdh_callback", "openssl/ssl.h") # removed
-OpenSSL.check_func_or_macro("SSL_CTX_set_min_proto_version", "openssl/ssl.h")
+have_func("SSL_CTX_set_tmp_ecdh_callback(NULL, NULL)", "openssl/ssl.h") # removed
+have_func("SSL_CTX_set_min_proto_version(NULL, 0)", "openssl/ssl.h")
 have_func("SSL_CTX_get_security_level")
+have_func("X509_get0_notBefore")
+have_func("SSL_SESSION_get_protocol_version")
+have_func("TS_STATUS_INFO_get0_status")
+have_func("TS_STATUS_INFO_get0_text")
+have_func("TS_STATUS_INFO_get0_failure_info")
+have_func("TS_VERIFY_CTS_set_certs")
+have_func("TS_VERIFY_CTX_set_store")
+have_func("TS_VERIFY_CTX_add_flags")
+have_func("TS_RESP_CTX_set_time_cb")
+have_func("EVP_PBE_scrypt")
+have_func("SSL_CTX_set_post_handshake_auth")
 
 Logging::message "=== Checking done. ===\n"
 
 create_header
-create_makefile("openssl") {|conf|
-  conf << "THREAD_MODEL = #{CONFIG["THREAD_MODEL"]}\n"
-}
+create_makefile("openssl")
 Logging::message "Done.\n"
diff --git a/ext/openssl/lib/openssl.rb b/ext/openssl/lib/openssl.rb
index 26d167a9b4..b047485785 100644
--- a/ext/openssl/lib/openssl.rb
+++ b/ext/openssl/lib/openssl.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 =begin
 = Info
   'OpenSSL for Ruby 2' project
@@ -12,10 +12,27 @@
 
 require 'openssl.so'
 
-require 'openssl/bn'
-require 'openssl/pkey'
-require 'openssl/cipher'
-require 'openssl/config'
-require 'openssl/digest'
-require 'openssl/x509'
-require 'openssl/ssl'
+require_relative 'openssl/bn'
+require_relative 'openssl/pkey'
+require_relative 'openssl/cipher'
+require_relative 'openssl/config'
+require_relative 'openssl/digest'
+require_relative 'openssl/hmac'
+require_relative 'openssl/x509'
+require_relative 'openssl/ssl'
+require_relative 'openssl/pkcs5'
+require_relative 'openssl/version'
+
+module OpenSSL
+  # call-seq:
+  #   OpenSSL.secure_compare(string, string) -> boolean
+  #
+  # Constant time memory comparison. Inputs are hashed using SHA-256 to mask
+  # the length of the secret. Returns +true+ if the strings are identical,
+  # +false+ otherwise.
+  def self.secure_compare(a, b)
+    hashed_a = OpenSSL::Digest.digest('SHA256', a)
+    hashed_b = OpenSSL::Digest.digest('SHA256', b)
+    OpenSSL.fixed_length_secure_compare(hashed_a, hashed_b) && a == b
+  end
+end
diff --git a/ext/openssl/lib/openssl/bn.rb b/ext/openssl/lib/openssl/bn.rb
index 6d6c96e42d..0a5e11b4c2 100644
--- a/ext/openssl/lib/openssl/bn.rb
+++ b/ext/openssl/lib/openssl/bn.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #--
 #
 # = Ruby-space definitions that completes C-space funcs for BN
@@ -27,8 +27,9 @@ module OpenSSL
 end # OpenSSL
 
 ##
+#--
 # Add double dispatch to Integer
-#
+#++
 class Integer
   # Casts an Integer as an OpenSSL::BN
   #
diff --git a/ext/openssl/lib/openssl/buffering.rb b/ext/openssl/lib/openssl/buffering.rb
index 61e1f43e00..32e04b4896 100644
--- a/ext/openssl/lib/openssl/buffering.rb
+++ b/ext/openssl/lib/openssl/buffering.rb
@@ -1,5 +1,5 @@
 # coding: binary
-# frozen_string_literal: false
+# frozen_string_literal: true
 #--
 #= Info
 #  'OpenSSL for Ruby 2' project
@@ -22,6 +22,29 @@
 module OpenSSL::Buffering
   include Enumerable
 
+  # A buffer which will retain binary encoding.
+  class Buffer < String
+    BINARY = Encoding::BINARY
+
+    def initialize
+      super
+
+      force_encoding(BINARY)
+    end
+
+    def << string
+      if string.encoding == BINARY
+        super(string)
+      else
+        super(string.b)
+      end
+
+      return self
+    end
+
+    alias concat <<
+  end
+
   ##
   # The "sync mode" of the SSLSocket.
   #
@@ -40,7 +63,7 @@ module OpenSSL::Buffering
   def initialize(*)
     super
     @eof = false
-    @rbuffer = ""
+    @rbuffer = Buffer.new
     @sync = @io.sync
   end
 
@@ -63,7 +86,7 @@ module OpenSSL::Buffering
   end
 
   ##
-  # Consumes +size+ bytes from the buffer
+  # Consumes _size_ bytes from the buffer
 
   def consume_rbuff(size=nil)
     if @rbuffer.empty?
@@ -79,7 +102,7 @@ module OpenSSL::Buffering
   public
 
   ##
-  # Reads +size+ bytes from the stream.  If +buf+ is provided it must
+  # Reads _size_ bytes from the stream.  If _buf_ is provided it must
   # reference a string which will receive the data.
   #
   # See IO#read for full details.
@@ -106,7 +129,7 @@ module OpenSSL::Buffering
   end
 
   ##
-  # Reads at most +maxlen+ bytes from the stream.  If +buf+ is provided it
+  # Reads at most _maxlen_ bytes from the stream.  If _buf_ is provided it
   # must reference a string which will receive the data.
   #
   # See IO#readpartial for full details.
@@ -136,7 +159,7 @@ module OpenSSL::Buffering
   end
 
   ##
-  # Reads at most +maxlen+ bytes in the non-blocking manner.
+  # Reads at most _maxlen_ bytes in the non-blocking manner.
   #
   # When no data can be read without blocking it raises
   # OpenSSL::SSL::SSLError extended by IO::WaitReadable or IO::WaitWritable.
@@ -163,6 +186,11 @@ module OpenSSL::Buffering
   # Note that one reason that read_nonblock writes to the underlying IO is
   # when the peer requests a new TLS/SSL handshake.  See openssl the FAQ for
   # more details.  http://www.openssl.org/support/faq.html
+  #
+  # By specifying a keyword argument _exception_ to +false+, you can indicate
+  # that read_nonblock should not raise an IO::Wait*able exception, but
+  # return the symbol +:wait_writable+ or +:wait_readable+ instead. At EOF,
+  # it will return +nil+ instead of raising EOFError.
 
   def read_nonblock(maxlen, buf=nil, exception: true)
     if maxlen == 0
@@ -185,11 +213,11 @@ module OpenSSL::Buffering
   end
 
   ##
-  # Reads the next "line+ from the stream.  Lines are separated by +eol+.  If
-  # +limit+ is provided the result will not be longer than the given number of
+  # Reads the next "line" from the stream.  Lines are separated by _eol_.  If
+  # _limit_ is provided the result will not be longer than the given number of
   # bytes.
   #
-  # +eol+ may be a String or Regexp.
+  # _eol_ may be a String or Regexp.
   #
   # Unlike IO#gets the line read will not be assigned to +$_+.
   #
@@ -215,7 +243,7 @@ module OpenSSL::Buffering
 
   ##
   # Executes the block for every line in the stream where lines are separated
-  # by +eol+.
+  # by _eol_.
   #
   # See also #gets
 
@@ -227,7 +255,7 @@ module OpenSSL::Buffering
   alias each_line each
 
   ##
-  # Reads lines from the stream which are separated by +eol+.
+  # Reads lines from the stream which are separated by _eol_.
   #
   # See also #gets
 
@@ -240,7 +268,7 @@ module OpenSSL::Buffering
   end
 
   ##
-  # Reads a line from the stream which is separated by +eol+.
+  # Reads a line from the stream which is separated by _eol_.
   #
   # Raises EOFError if at end of file.
 
@@ -276,7 +304,7 @@ module OpenSSL::Buffering
   end
 
   ##
-  # Pushes character +c+ back onto the stream such that a subsequent buffered
+  # Pushes character _c_ back onto the stream such that a subsequent buffered
   # character read will return it.
   #
   # Unlike IO#getc multiple bytes may be pushed back onto the stream.
@@ -303,44 +331,41 @@ module OpenSSL::Buffering
   private
 
   ##
-  # Writes +s+ to the buffer.  When the buffer is full or #sync is true the
+  # Writes _s_ to the buffer.  When the buffer is full or #sync is true the
   # buffer is flushed to the underlying socket.
 
   def do_write(s)
-    @wbuffer = "" unless defined? @wbuffer
+    @wbuffer = Buffer.new unless defined? @wbuffer
     @wbuffer << s
     @wbuffer.force_encoding(Encoding::BINARY)
     @sync ||= false
-    if @sync or @wbuffer.size > BLOCK_SIZE or idx = @wbuffer.rindex($/)
-      remain = idx ? idx + $/.size : @wbuffer.length
-      nwritten = 0
-      while remain > 0
-        str = @wbuffer[nwritten,remain]
+    if @sync or @wbuffer.size > BLOCK_SIZE
+      until @wbuffer.empty?
         begin
-          nwrote = syswrite(str)
+          nwrote = syswrite(@wbuffer)
         rescue Errno::EAGAIN
           retry
         end
-        remain -= nwrote
-        nwritten += nwrote
+        @wbuffer[0, nwrote] = ""
       end
-      @wbuffer[0,nwritten] = ""
     end
   end
 
   public
 
   ##
-  # Writes +s+ to the stream.  If the argument is not a string it will be
-  # converted using String#to_s.  Returns the number of bytes written.
+  # Writes _s_ to the stream.  If the argument is not a String it will be
+  # converted using +.to_s+ method.  Returns the number of bytes written.
 
-  def write(s)
-    do_write(s)
-    s.bytesize
+  def write(*s)
+    s.inject(0) do |written, str|
+      do_write(str)
+      written + str.bytesize
+    end
   end
 
   ##
-  # Writes +str+ in the non-blocking manner.
+  # Writes _s_ in the non-blocking manner.
   #
   # If there is buffered data, it is flushed first.  This may block.
   #
@@ -371,6 +396,10 @@ module OpenSSL::Buffering
   # Note that one reason that write_nonblock reads from the underlying IO
   # is when the peer requests a new TLS/SSL handshake.  See the openssl FAQ
   # for more details.  http://www.openssl.org/support/faq.html
+  #
+  # By specifying a keyword argument _exception_ to +false+, you can indicate
+  # that write_nonblock should not raise an IO::Wait*able exception, but
+  # return the symbol +:wait_writable+ or +:wait_readable+ instead.
 
   def write_nonblock(s, exception: true)
     flush
@@ -378,41 +407,39 @@ module OpenSSL::Buffering
   end
 
   ##
-  # Writes +s+ to the stream.  +s+ will be converted to a String using
-  # String#to_s.
+  # Writes _s_ to the stream.  _s_ will be converted to a String using
+  # +.to_s+ method.
 
-  def << (s)
+  def <<(s)
     do_write(s)
     self
   end
 
   ##
-  # Writes +args+ to the stream along with a record separator.
+  # Writes _args_ to the stream along with a record separator.
   #
   # See IO#puts for full details.
 
   def puts(*args)
-    s = ""
+    s = Buffer.new
     if args.empty?
       s << "\n"
     end
     args.each{|arg|
       s << arg.to_s
-      if $/ && /\n\z/ !~ s
-        s << "\n"
-      end
+      s.sub!(/(?<!\n)\z/, "\n")
     }
     do_write(s)
     nil
   end
 
   ##
-  # Writes +args+ to the stream.
+  # Writes _args_ to the stream.
   #
   # See IO#print for full details.
 
   def print(*args)
-    s = ""
+    s = Buffer.new
     args.each{ |arg| s << arg.to_s }
     do_write(s)
     nil
diff --git a/ext/openssl/lib/openssl/cipher.rb b/ext/openssl/lib/openssl/cipher.rb
index a69d5ac827..8ad8c35dd3 100644
--- a/ext/openssl/lib/openssl/cipher.rb
+++ b/ext/openssl/lib/openssl/cipher.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #--
 # = Ruby-space predefined Cipher subclasses
 #
@@ -18,7 +18,7 @@ module OpenSSL
       klass = Class.new(Cipher){
         define_method(:initialize){|*args|
           cipher_name = args.inject(name){|n, arg| "#{n}-#{arg}" }
-          super(cipher_name)
+          super(cipher_name.downcase)
         }
       }
       const_set(name, klass)
@@ -26,34 +26,42 @@ module OpenSSL
 
     %w(128 192 256).each{|keylen|
       klass = Class.new(Cipher){
-        define_method(:initialize){|mode|
-          mode ||= "CBC"
-          cipher_name = "AES-#{keylen}-#{mode}"
-          super(cipher_name)
+        define_method(:initialize){|mode = "CBC"|
+          super("aes-#{keylen}-#{mode}".downcase)
         }
       }
       const_set("AES#{keylen}", klass)
     }
 
-    # Generate, set, and return a random key.
-    # You must call cipher.encrypt or cipher.decrypt before calling this method.
+    # call-seq:
+    #   cipher.random_key -> key
+    #
+    # Generate a random key with OpenSSL::Random.random_bytes and sets it to
+    # the cipher, and returns it.
+    #
+    # You must call #encrypt or #decrypt before calling this method.
     def random_key
       str = OpenSSL::Random.random_bytes(self.key_len)
       self.key = str
-      return str
     end
 
-    # Generate, set, and return a random iv.
-    # You must call cipher.encrypt or cipher.decrypt before calling this method.
+    # call-seq:
+    #   cipher.random_iv -> iv
+    #
+    # Generate a random IV with OpenSSL::Random.random_bytes and sets it to the
+    # cipher, and returns it.
+    #
+    # You must call #encrypt or #decrypt before calling this method.
     def random_iv
       str = OpenSSL::Random.random_bytes(self.iv_len)
       self.iv = str
-      return str
     end
 
-    # This class is only provided for backwards compatibility.  Use OpenSSL::Cipher in the future.
-    class Cipher < Cipher
-      # add warning
-    end
+    # Deprecated.
+    #
+    # This class is only provided for backwards compatibility.
+    # Use OpenSSL::Cipher.
+    class Cipher < Cipher; end
+    deprecate_constant :Cipher
   end # Cipher
 end # OpenSSL
diff --git a/ext/openssl/lib/openssl/config.rb b/ext/openssl/lib/openssl/config.rb
index 8822545192..9a0b787420 100644
--- a/ext/openssl/lib/openssl/config.rb
+++ b/ext/openssl/lib/openssl/config.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 =begin
 = Ruby-space definitions that completes C-space funcs for Config
 
@@ -30,13 +30,14 @@ module OpenSSL
     class << self
 
       ##
-      # Parses a given +string+ as a blob that contains configuration for openssl.
+      # Parses a given _string_ as a blob that contains configuration for
+      # OpenSSL.
       #
       # If the source of the IO is a file, then consider using #parse_config.
       def parse(string)
         c = new()
         parse_config(StringIO.new(string)).each do |section, hash|
-          c[section] = hash
+          c.set_section(section, hash)
         end
         c
       end
@@ -46,15 +47,14 @@ module OpenSSL
       alias load new
 
       ##
-      # Parses the configuration data read from +io+, see also #parse.
+      # Parses the configuration data read from _io_, see also #parse.
       #
       # Raises a ConfigError on invalid configuration data.
       def parse_config(io)
         begin
           parse_config_lines(io)
-        rescue ConfigError => e
-          e.message.replace("error in line #{io.lineno}: " + e.message)
-          raise
+        rescue => error
+          raise ConfigError, "error in line #{io.lineno}: " + error.message
         end
       end
 
@@ -76,29 +76,44 @@ module OpenSSL
       def parse_config_lines(io)
         section = 'default'
         data = {section => {}}
-        while definition = get_definition(io)
+        io_stack = [io]
+        while definition = get_definition(io_stack)
           definition = clear_comments(definition)
           next if definition.empty?
-          if definition[0] == ?[
+          case definition
+          when /\A\[/
             if /\[([^\]]*)\]/ =~ definition
               section = $1.strip
               data[section] ||= {}
             else
               raise ConfigError, "missing close square bracket"
             end
-          else
-            if /\A([^:\s]*)(?:::([^:\s]*))?\s*=(.*)\z/ =~ definition
-              if $2
-                section = $1
-                key = $2
-              else
-                key = $1
+          when /\A\.include (\s*=\s*)?(.+)\z/
+            path = $2
+            if File.directory?(path)
+              files = Dir.glob(File.join(path, "*.{cnf,conf}"), File::FNM_EXTGLOB)
+            else
+              files = [path]
+            end
+
+            files.each do |filename|
+              begin
+                io_stack << StringIO.new(File.read(filename))
+              rescue
+                raise ConfigError, "could not include file '%s'" % filename
               end
-              value = unescape_value(data, section, $3)
-              (data[section] ||= {})[key] = value.strip
+            end
+          when /\A([^:\s]*)(?:::([^:\s]*))?\s*=(.*)\z/
+            if $2
+              section = $1
+              key = $2
             else
-              raise ConfigError, "missing equal sign"
+              key = $1
             end
+            value = unescape_value(data, section, $3)
+            (data[section] ||= {})[key] = value.strip
+          else
+            raise ConfigError, "missing equal sign"
           end
         end
         data
@@ -211,10 +226,10 @@ module OpenSSL
         scanned.join
       end
 
-      def get_definition(io)
-        if line = get_line(io)
+      def get_definition(io_stack)
+        if line = get_line(io_stack)
           while /[^\\]\\\z/ =~ line
-            if extra = get_line(io)
+            if extra = get_line(io_stack)
               line += extra
             else
               break
@@ -224,9 +239,12 @@ module OpenSSL
         end
       end
 
-      def get_line(io)
-        if line = io.gets
-          line.gsub(/[\r\n]*/, '')
+      def get_line(io_stack)
+        while io = io_stack.last
+          if line = io.gets
+            return line.gsub(/[\r\n]*/, '')
+          end
+          io_stack.pop
         end
       end
     end
@@ -236,7 +254,7 @@ module OpenSSL
     #
     # This can be used in contexts like OpenSSL::X509::ExtensionFactory.config=
     #
-    # If the optional +filename+ parameter is provided, then it is read in and
+    # If the optional _filename_ parameter is provided, then it is read in and
     # parsed via #parse_config.
     #
     # This can raise IO exceptions based on the access, or availability of the
@@ -248,14 +266,14 @@ module OpenSSL
       if filename
         File.open(filename.to_s) do |file|
           Config.parse_config(file).each do |section, hash|
-            self[section] = hash
+            set_section(section, hash)
           end
         end
       end
     end
 
     ##
-    # Gets the value of +key+ from the given +section+
+    # Gets the value of _key_ from the given _section_
     #
     # Given the following configurating file being loaded:
     #
@@ -265,8 +283,8 @@ module OpenSSL
     #     #=> [ default ]
     #     #   foo=bar
     #
-    # You can get a specific value from the config if you know the +section+
-    # and +key+ like so:
+    # You can get a specific value from the config if you know the _section_
+    # and _key_ like so:
     #
     #   config.get_value('default','foo')
     #     #=> "bar"
@@ -297,7 +315,9 @@ module OpenSSL
     end
 
     ##
-    # Set the target +key+ with a given +value+ under a specific +section+.
+    # *Deprecated in v2.2.0*. This method will be removed in a future release.
+    #
+    # Set the target _key_ with a given _value_ under a specific _section_.
     #
     # Given the following configurating file being loaded:
     #
@@ -307,7 +327,7 @@ module OpenSSL
     #     #=> [ default ]
     #     #   foo=bar
     #
-    # You can set the value of +foo+ under the +default+ section to a new
+    # You can set the value of _foo_ under the _default_ section to a new
     # value:
     #
     #   config.add_value('default', 'foo', 'buzz')
@@ -322,7 +342,7 @@ module OpenSSL
     end
 
     ##
-    # Get a specific +section+ from the current configuration
+    # Get a specific _section_ from the current configuration
     #
     # Given the following configurating file being loaded:
     #
@@ -351,7 +371,9 @@ module OpenSSL
     end
 
     ##
-    # Sets a specific +section+ name with a Hash +pairs+
+    # *Deprecated in v2.2.0*. This method will be removed in a future release.
+    #
+    # Sets a specific _section_ name with a Hash _pairs_.
     #
     # Given the following configuration being created:
     #
@@ -365,7 +387,7 @@ module OpenSSL
     #     #   baz=buz
     #
     # It's important to note that this will essentially merge any of the keys
-    # in +pairs+ with the existing +section+. For example:
+    # in _pairs_ with the existing _section_. For example:
     #
     #   config['default']
     #     #=> {"foo"=>"bar", "baz"=>"buz"}
@@ -376,9 +398,13 @@ module OpenSSL
     #
     def []=(section, pairs)
       check_modify
-      @data[section] ||= {}
+      set_section(section, pairs)
+    end
+
+    def set_section(section, pairs) # :nodoc:
+      hash = @data[section] ||= {}
       pairs.each do |key, value|
-        self.add_value(section, key, value)
+        hash[key] = value
       end
     end
 
@@ -463,6 +489,8 @@ module OpenSSL
     end
 
     def check_modify
+      warn "#{caller(2, 1)[0]}: warning: do not modify OpenSSL::Config; this " \
+        "method is deprecated and will be removed in a future release."
       raise TypeError.new("Insecure: can't modify OpenSSL config") if frozen?
     end
 
diff --git a/ext/openssl/lib/openssl/digest.rb b/ext/openssl/lib/openssl/digest.rb
index 1a236cc77d..2ff8398e44 100644
--- a/ext/openssl/lib/openssl/digest.rb
+++ b/ext/openssl/lib/openssl/digest.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #--
 # = Ruby-space predefined Digest subclasses
 #
@@ -15,15 +15,7 @@
 module OpenSSL
   class Digest
 
-    alg = %w(MD2 MD4 MD5 MDC2 RIPEMD160 SHA1)
-    if OPENSSL_VERSION_NUMBER < 0x10100000
-      alg += %w(DSS DSS1 SHA)
-    end
-    if OPENSSL_VERSION_NUMBER > 0x00908000
-      alg += %w(SHA224 SHA256 SHA384 SHA512)
-    end
-
-    # Return the +data+ hash computed with +name+ Digest. +name+ is either the
+    # Return the hash value computed with _name_ Digest. _name_ is either the
     # long name or short name of a supported digest algorithm.
     #
     # === Examples
@@ -32,40 +24,37 @@ module OpenSSL
     #
     # which is equivalent to:
     #
-    #   OpenSSL::Digest::SHA256.digest("abc")
+    #   OpenSSL::Digest.digest('SHA256', "abc")
 
     def self.digest(name, data)
       super(data, name)
     end
 
-    alg.each{|name|
+    %w(MD4 MD5 RIPEMD160 SHA1 SHA224 SHA256 SHA384 SHA512).each do |name|
       klass = Class.new(self) {
         define_method(:initialize, ->(data = nil) {super(name, data)})
       }
+
       singleton = (class << klass; self; end)
+
       singleton.class_eval{
-        define_method(:digest){|data| new.digest(data) }
-        define_method(:hexdigest){|data| new.hexdigest(data) }
+        define_method(:digest) {|data| new.digest(data)}
+        define_method(:hexdigest) {|data| new.hexdigest(data)}
       }
-      const_set(name, klass)
-    }
+
+      const_set(name.tr('-', '_'), klass)
+    end
 
     # Deprecated.
     #
     # This class is only provided for backwards compatibility.
-    class Digest < Digest # :nodoc:
-      # Deprecated.
-      #
-      # See OpenSSL::Digest.new
-      def initialize(*args)
-        warn('Digest::Digest is deprecated; use Digest')
-        super(*args)
-      end
-    end
+    # Use OpenSSL::Digest instead.
+    class Digest < Digest; end # :nodoc:
+    deprecate_constant :Digest
 
   end # Digest
 
-  # Returns a Digest subclass by +name+.
+  # Returns a Digest subclass by _name_
   #
   #   require 'openssl'
   #
diff --git a/ext/openssl/lib/openssl/hmac.rb b/ext/openssl/lib/openssl/hmac.rb
new file mode 100644
index 0000000000..3d4427611d
--- /dev/null
+++ b/ext/openssl/lib/openssl/hmac.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module OpenSSL
+  class HMAC
+    # Securely compare with another HMAC instance in constant time.
+    def ==(other)
+      return false unless HMAC === other
+      return false unless self.digest.bytesize == other.digest.bytesize
+
+      OpenSSL.fixed_length_secure_compare(self.digest, other.digest)
+    end
+  end
+end
diff --git a/ext/openssl/lib/openssl/marshal.rb b/ext/openssl/lib/openssl/marshal.rb
new file mode 100644
index 0000000000..af5647192a
--- /dev/null
+++ b/ext/openssl/lib/openssl/marshal.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+#--
+# = Ruby-space definitions to add DER (de)serialization to classes
+#
+# = Info
+# 'OpenSSL for Ruby 2' project
+# Copyright (C) 2002  Michal Rokos <m.rokos@sh.cvut.cz>
+# All rights reserved.
+#
+# = Licence
+# This program is licensed under the same licence as Ruby.
+# (See the file 'LICENCE'.)
+#++
+module OpenSSL
+  module Marshal
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      def _load(string)
+        new(string)
+      end
+    end
+
+    def _dump(_level)
+      to_der
+    end
+  end
+end
diff --git a/ext/openssl/lib/openssl/pkcs5.rb b/ext/openssl/lib/openssl/pkcs5.rb
new file mode 100644
index 0000000000..8dedc4beef
--- /dev/null
+++ b/ext/openssl/lib/openssl/pkcs5.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+#--
+# Ruby/OpenSSL Project
+# Copyright (C) 2017 Ruby/OpenSSL Project Authors
+#++
+
+module OpenSSL
+  module PKCS5
+    module_function
+
+    # OpenSSL::PKCS5.pbkdf2_hmac has been renamed to OpenSSL::KDF.pbkdf2_hmac.
+    # This method is provided for backwards compatibility.
+    def pbkdf2_hmac(pass, salt, iter, keylen, digest)
+      OpenSSL::KDF.pbkdf2_hmac(pass, salt: salt, iterations: iter,
+                               length: keylen, hash: digest)
+    end
+
+    def pbkdf2_hmac_sha1(pass, salt, iter, keylen)
+      pbkdf2_hmac(pass, salt, iter, keylen, "sha1")
+    end
+  end
+end
diff --git a/ext/openssl/lib/openssl/pkey.rb b/ext/openssl/lib/openssl/pkey.rb
index df126fd9f0..9cc3276356 100644
--- a/ext/openssl/lib/openssl/pkey.rb
+++ b/ext/openssl/lib/openssl/pkey.rb
@@ -1,41 +1,42 @@
-# frozen_string_literal: false
-module OpenSSL
-  module PKey
-    if defined?(OpenSSL::PKey::DH)
+# frozen_string_literal: true
+#--
+# Ruby/OpenSSL Project
+# Copyright (C) 2017 Ruby/OpenSSL Project Authors
+#++
 
-    class DH
-      DEFAULT_1024 = new <<-_end_of_pem_
------BEGIN DH PARAMETERS-----
-MIGHAoGBAJ0lOVy0VIr/JebWn0zDwY2h+rqITFOpdNr6ugsgvkDXuucdcChhYExJ
-AV/ZD2AWPbrTqV76mGRgJg4EddgT1zG0jq3rnFdMj2XzkBYx3BVvfR0Arnby0RHR
-T4h7KZ/2zmjvV+eF8kBUHBJAojUlzxKj4QeO2x20FP9X5xmNUXeDAgEC
------END DH PARAMETERS-----
-      _end_of_pem_
+require_relative 'marshal'
 
-      DEFAULT_2048 = new <<-_end_of_pem_
------BEGIN DH PARAMETERS-----
-MIIBCAKCAQEA7E6kBrYiyvmKAMzQ7i8WvwVk9Y/+f8S7sCTN712KkK3cqd1jhJDY
-JbrYeNV3kUIKhPxWHhObHKpD1R84UpL+s2b55+iMd6GmL7OYmNIT/FccKhTcveab
-VBmZT86BZKYyf45hUF9FOuUM9xPzuK3Vd8oJQvfYMCd7LPC0taAEljQLR4Edf8E6
-YoaOffgTf5qxiwkjnlVZQc3whgnEt9FpVMvQ9eknyeGB5KHfayAc3+hUAvI3/Cr3
-1bNveX5wInh5GDx1FGhKBZ+s1H+aedudCm7sCgRwv8lKWYGiHzObSma8A86KG+MD
-7Lo5JquQ3DlBodj3IDyPrxIv96lvRPFtAwIBAg==
------END DH PARAMETERS-----
-      _end_of_pem_
-    end
+module OpenSSL::PKey
+  class DH
+    include OpenSSL::Marshal
+  end
 
-    DEFAULT_TMP_DH_CALLBACK = lambda { |ctx, is_export, keylen|
-      warn "using default DH parameters." if $VERBOSE
-      case keylen
-      when 1024 then OpenSSL::PKey::DH::DEFAULT_1024
-      when 2048 then OpenSSL::PKey::DH::DEFAULT_2048
-      else
-        nil
-      end
-    }
+  class DSA
+    include OpenSSL::Marshal
+  end
 
-    else
-      DEFAULT_TMP_DH_CALLBACK = nil
+  if defined?(EC)
+  class EC
+    include OpenSSL::Marshal
+  end
+  class EC::Point
+    # :call-seq:
+    #    point.to_bn([conversion_form]) -> OpenSSL::BN
+    #
+    # Returns the octet string representation of the EC point as an instance of
+    # OpenSSL::BN.
+    #
+    # If _conversion_form_ is not given, the _point_conversion_form_ attribute
+    # set to the group is used.
+    #
+    # See #to_octet_string for more information.
+    def to_bn(conversion_form = group.point_conversion_form)
+      OpenSSL::BN.new(to_octet_string(conversion_form), 2)
     end
   end
+  end
+
+  class RSA
+    include OpenSSL::Marshal
+  end
 end
diff --git a/ext/openssl/lib/openssl/ssl.rb b/ext/openssl/lib/openssl/ssl.rb
index 00c3275319..8e12007383 100644
--- a/ext/openssl/lib/openssl/ssl.rb
+++ b/ext/openssl/lib/openssl/ssl.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 =begin
 = Info
   'OpenSSL for Ruby 2' project
@@ -12,70 +12,85 @@
 
 require "openssl/buffering"
 require "io/nonblock"
+require "ipaddr"
+require "socket"
 
 module OpenSSL
   module SSL
     class SSLContext
-      DEFAULT_PARAMS = {
-        :ssl_version => "SSLv23",
+      DEFAULT_PARAMS = { # :nodoc:
+        :min_version => OpenSSL::SSL::TLS1_VERSION,
         :verify_mode => OpenSSL::SSL::VERIFY_PEER,
-        :ciphers => %w{
-          ECDHE-ECDSA-AES128-GCM-SHA256
-          ECDHE-RSA-AES128-GCM-SHA256
-          ECDHE-ECDSA-AES256-GCM-SHA384
-          ECDHE-RSA-AES256-GCM-SHA384
-          DHE-RSA-AES128-GCM-SHA256
-          DHE-DSS-AES128-GCM-SHA256
-          DHE-RSA-AES256-GCM-SHA384
-          DHE-DSS-AES256-GCM-SHA384
-          ECDHE-ECDSA-AES128-SHA256
-          ECDHE-RSA-AES128-SHA256
-          ECDHE-ECDSA-AES128-SHA
-          ECDHE-RSA-AES128-SHA
-          ECDHE-ECDSA-AES256-SHA384
-          ECDHE-RSA-AES256-SHA384
-          ECDHE-ECDSA-AES256-SHA
-          ECDHE-RSA-AES256-SHA
-          DHE-RSA-AES128-SHA256
-          DHE-RSA-AES256-SHA256
-          DHE-RSA-AES128-SHA
-          DHE-RSA-AES256-SHA
-          DHE-DSS-AES128-SHA256
-          DHE-DSS-AES256-SHA256
-          DHE-DSS-AES128-SHA
-          DHE-DSS-AES256-SHA
-          AES128-GCM-SHA256
-          AES256-GCM-SHA384
-          AES128-SHA256
-          AES256-SHA256
-          AES128-SHA
-          AES256-SHA
-          ECDHE-ECDSA-RC4-SHA
-          ECDHE-RSA-RC4-SHA
-          RC4-SHA
-        }.join(":"),
+        :verify_hostname => true,
         :options => -> {
           opts = OpenSSL::SSL::OP_ALL
           opts &= ~OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS
-          opts |= OpenSSL::SSL::OP_NO_COMPRESSION if defined?(OpenSSL::SSL::OP_NO_COMPRESSION)
-          opts |= OpenSSL::SSL::OP_NO_SSLv2 | OpenSSL::SSL::OP_NO_SSLv3
+          opts |= OpenSSL::SSL::OP_NO_COMPRESSION
           opts
         }.call
       }
 
-      DEFAULT_CERT_STORE = OpenSSL::X509::Store.new
+      if defined?(OpenSSL::PKey::DH)
+        DEFAULT_2048 = OpenSSL::PKey::DH.new <<-_end_of_pem_
+-----BEGIN DH PARAMETERS-----
+MIIBCAKCAQEA7E6kBrYiyvmKAMzQ7i8WvwVk9Y/+f8S7sCTN712KkK3cqd1jhJDY
+JbrYeNV3kUIKhPxWHhObHKpD1R84UpL+s2b55+iMd6GmL7OYmNIT/FccKhTcveab
+VBmZT86BZKYyf45hUF9FOuUM9xPzuK3Vd8oJQvfYMCd7LPC0taAEljQLR4Edf8E6
+YoaOffgTf5qxiwkjnlVZQc3whgnEt9FpVMvQ9eknyeGB5KHfayAc3+hUAvI3/Cr3
+1bNveX5wInh5GDx1FGhKBZ+s1H+aedudCm7sCgRwv8lKWYGiHzObSma8A86KG+MD
+7Lo5JquQ3DlBodj3IDyPrxIv96lvRPFtAwIBAg==
+-----END DH PARAMETERS-----
+        _end_of_pem_
+        private_constant :DEFAULT_2048
+
+        DEFAULT_TMP_DH_CALLBACK = lambda { |ctx, is_export, keylen| # :nodoc:
+          warn "using default DH parameters." if $VERBOSE
+          DEFAULT_2048
+        }
+      end
+
+      if !(OpenSSL::OPENSSL_VERSION.start_with?("OpenSSL") &&
+           OpenSSL::OPENSSL_VERSION_NUMBER >= 0x10100000)
+        DEFAULT_PARAMS.merge!(
+          ciphers: %w{
+            ECDHE-ECDSA-AES128-GCM-SHA256
+            ECDHE-RSA-AES128-GCM-SHA256
+            ECDHE-ECDSA-AES256-GCM-SHA384
+            ECDHE-RSA-AES256-GCM-SHA384
+            DHE-RSA-AES128-GCM-SHA256
+            DHE-DSS-AES128-GCM-SHA256
+            DHE-RSA-AES256-GCM-SHA384
+            DHE-DSS-AES256-GCM-SHA384
+            ECDHE-ECDSA-AES128-SHA256
+            ECDHE-RSA-AES128-SHA256
+            ECDHE-ECDSA-AES128-SHA
+            ECDHE-RSA-AES128-SHA
+            ECDHE-ECDSA-AES256-SHA384
+            ECDHE-RSA-AES256-SHA384
+            ECDHE-ECDSA-AES256-SHA
+            ECDHE-RSA-AES256-SHA
+            DHE-RSA-AES128-SHA256
+            DHE-RSA-AES256-SHA256
+            DHE-RSA-AES128-SHA
+            DHE-RSA-AES256-SHA
+            DHE-DSS-AES128-SHA256
+            DHE-DSS-AES256-SHA256
+            DHE-DSS-AES128-SHA
+            DHE-DSS-AES256-SHA
+            AES128-GCM-SHA256
+            AES256-GCM-SHA384
+            AES128-SHA256
+            AES256-SHA256
+            AES128-SHA
+            AES256-SHA
+          }.join(":"),
+        )
+      end
+
+      DEFAULT_CERT_STORE = OpenSSL::X509::Store.new # :nodoc:
       DEFAULT_CERT_STORE.set_default_paths
       DEFAULT_CERT_STORE.flags = OpenSSL::X509::V_FLAG_CRL_CHECK_ALL
 
-      INIT_VARS = ["cert", "key", "client_ca", "ca_file", "ca_path",
-        "timeout", "verify_mode", "verify_depth", "renegotiation_cb",
-        "verify_callback", "cert_store", "extra_chain_cert",
-        "client_cert_cb", "session_id_context", "tmp_dh_callback",
-        "session_get_cb", "session_new_cb", "session_remove_cb",
-        "tmp_ecdh_callback", "servername_cb", "npn_protocols",
-        "alpn_protocols", "alpn_select_cb",
-        "npn_select_cb"].map { |x| "@#{x}" }
-
       # A callback invoked when DH parameters are required.
       #
       # The callback is invoked with the Session for the key exchange, an
@@ -87,38 +102,43 @@ module OpenSSL
 
       attr_accessor :tmp_dh_callback
 
-      if ExtConfig::HAVE_TLSEXT_HOST_NAME
-        # A callback invoked at connect time to distinguish between multiple
-        # server names.
-        #
-        # The callback is invoked with an SSLSocket and a server name.  The
-        # callback must return an SSLContext for the server name or nil.
-        attr_accessor :servername_cb
-      end
+      # A callback invoked at connect time to distinguish between multiple
+      # server names.
+      #
+      # The callback is invoked with an SSLSocket and a server name.  The
+      # callback must return an SSLContext for the server name or nil.
+      attr_accessor :servername_cb
 
       # call-seq:
-      #    SSLContext.new => ctx
-      #    SSLContext.new(:TLSv1) => ctx
-      #    SSLContext.new("SSLv23_client") => ctx
+      #    SSLContext.new           -> ctx
+      #    SSLContext.new(:TLSv1)   -> ctx
+      #    SSLContext.new("SSLv23") -> ctx
       #
-      # You can get a list of valid methods with OpenSSL::SSL::SSLContext::METHODS
+      # Creates a new SSL context.
+      #
+      # If an argument is given, #ssl_version= is called with the value. Note
+      # that this form is deprecated. New applications should use #min_version=
+      # and #max_version= as necessary.
       def initialize(version = nil)
-        INIT_VARS.each { |v| instance_variable_set v, nil }
-        self.options = self.options | OpenSSL::SSL::OP_ALL
-        return unless version
-        self.ssl_version = version
+        self.options |= OpenSSL::SSL::OP_ALL
+        self.ssl_version = version if version
       end
 
       ##
-      # Sets the parameters for this SSL context to the values in +params+.
-      # The keys in +params+ must be assignment methods on SSLContext.
+      # call-seq:
+      #   ctx.set_params(params = {}) -> params
+      #
+      # Sets saner defaults optimized for the use with HTTP-like protocols.
+      #
+      # If a Hash _params_ is given, the parameters are overridden with it.
+      # The keys in _params_ must be assignment methods on SSLContext.
       #
       # If the verify_mode is not VERIFY_NONE and ca_file, ca_path and
       # cert_store are not set then the system default certificate store is
       # used.
-
       def set_params(params={})
         params = DEFAULT_PARAMS.merge(params)
+        self.options = params.delete(:options) # set before min_version/max_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
@@ -127,9 +147,96 @@ module OpenSSL
         end
         return params
       end
+
+      # call-seq:
+      #    ctx.min_version = OpenSSL::SSL::TLS1_2_VERSION
+      #    ctx.min_version = :TLS1_2
+      #    ctx.min_version = nil
+      #
+      # Sets the lower bound on the supported SSL/TLS protocol version. The
+      # version may be specified by an integer constant named
+      # OpenSSL::SSL::*_VERSION, a Symbol, or +nil+ which means "any version".
+      #
+      # Be careful that you don't overwrite OpenSSL::SSL::OP_NO_{SSL,TLS}v*
+      # options by #options= once you have called #min_version= or
+      # #max_version=.
+      #
+      # === Example
+      #   ctx = OpenSSL::SSL::SSLContext.new
+      #   ctx.min_version = OpenSSL::SSL::TLS1_1_VERSION
+      #   ctx.max_version = OpenSSL::SSL::TLS1_2_VERSION
+      #
+      #   sock = OpenSSL::SSL::SSLSocket.new(tcp_sock, ctx)
+      #   sock.connect # Initiates a connection using either TLS 1.1 or TLS 1.2
+      def min_version=(version)
+        set_minmax_proto_version(version, @max_proto_version ||= nil)
+        @min_proto_version = version
+      end
+
+      # call-seq:
+      #    ctx.max_version = OpenSSL::SSL::TLS1_2_VERSION
+      #    ctx.max_version = :TLS1_2
+      #    ctx.max_version = nil
+      #
+      # Sets the upper bound of the supported SSL/TLS protocol version. See
+      # #min_version= for the possible values.
+      def max_version=(version)
+        set_minmax_proto_version(@min_proto_version ||= nil, version)
+        @max_proto_version = version
+      end
+
+      # call-seq:
+      #    ctx.ssl_version = :TLSv1
+      #    ctx.ssl_version = "SSLv23"
+      #
+      # Sets the SSL/TLS protocol version for the context. This forces
+      # connections to use only the specified protocol version. This is
+      # deprecated and only provided for backwards compatibility. Use
+      # #min_version= and #max_version= instead.
+      #
+      # === History
+      # As the name hints, this used to call the SSL_CTX_set_ssl_version()
+      # function which sets the SSL method used for connections created from
+      # the context. As of Ruby/OpenSSL 2.1, this accessor method is
+      # implemented to call #min_version= and #max_version= instead.
+      def ssl_version=(meth)
+        meth = meth.to_s if meth.is_a?(Symbol)
+        if /(?<type>_client|_server)\z/ =~ meth
+          meth = $`
+          if $VERBOSE
+            warn "#{caller(1, 1)[0]}: method type #{type.inspect} is ignored"
+          end
+        end
+        version = METHODS_MAP[meth.intern] or
+          raise ArgumentError, "unknown SSL method `%s'" % meth
+        set_minmax_proto_version(version, version)
+        @min_proto_version = @max_proto_version = version
+      end
+
+      METHODS_MAP = {
+        SSLv23: 0,
+        SSLv2: OpenSSL::SSL::SSL2_VERSION,
+        SSLv3: OpenSSL::SSL::SSL3_VERSION,
+        TLSv1: OpenSSL::SSL::TLS1_VERSION,
+        TLSv1_1: OpenSSL::SSL::TLS1_1_VERSION,
+        TLSv1_2: OpenSSL::SSL::TLS1_2_VERSION,
+      }.freeze
+      private_constant :METHODS_MAP
+
+      # The list of available SSL/TLS methods. This constant is only provided
+      # for backwards compatibility.
+      METHODS = METHODS_MAP.flat_map { |name,|
+        [name, :"#{name}_client", :"#{name}_server"]
+      }.freeze
+      deprecate_constant :METHODS
     end
 
     module SocketForwarder
+      # The file descriptor for the socket.
+      def fileno
+        to_io.fileno
+      end
+
       def addr
         to_io.addr
       end
@@ -172,11 +279,11 @@ module OpenSSL
             return true if verify_hostname(hostname, san.value)
           when 7 # iPAddress in GeneralName (RFC5280)
             should_verify_common_name = false
-            # follows GENERAL_NAME_print() in x509v3/v3_alt.c
-            if san.value.size == 4
-              return true if san.value.unpack('C*').join('.') == hostname
-            elsif san.value.size == 16
-              return true if san.value.unpack('n*').map { |e| sprintf("%X", e) }.join(':') == hostname
+            if san.value.size == 4 || san.value.size == 16
+              begin
+                return true if san.value == IPAddr.new(hostname).hton
+              rescue IPAddr::InvalidAddressError
+              end
             end
           end
         }
@@ -247,14 +354,19 @@ module OpenSSL
       include Buffering
       include SocketForwarder
 
-      if ExtConfig::HAVE_TLSEXT_HOST_NAME
-        attr_reader :hostname
-      end
+      attr_reader :hostname
 
-      attr_reader :io, :context
-      attr_accessor :sync_close
+      # The underlying IO object.
+      attr_reader :io
       alias :to_io :io
 
+      # The SSLContext object used in this connection.
+      attr_reader :context
+
+      # Whether to close the underlying socket as well, when the SSL/TLS
+      # connection is shut down. This defaults to +false+.
+      attr_accessor :sync_close
+
       # call-seq:
       #    ssl.sysclose => nil
       #
@@ -268,8 +380,10 @@ module OpenSSL
         io.close if sync_close
       end
 
-      ##
-      # Perform hostname verification after an SSL connection is established
+      # call-seq:
+      #   ssl.post_connection_check(hostname) -> true
+      #
+      # Perform hostname verification following RFC 6125.
       #
       # This method MUST be called after calling #connect to ensure that the
       # hostname of a remote peer has been verified.
@@ -277,7 +391,8 @@ module OpenSSL
         if peer_cert.nil?
           msg = "Peer verification enabled, but no certificate received."
           if using_anon_cipher?
-            msg += " Anonymous cipher suite #{cipher[0]} was negotiated. Anonymous suites must be disabled to use peer verification."
+            msg += " Anonymous cipher suite #{cipher[0]} was negotiated. " \
+                   "Anonymous suites must be disabled to use peer verification."
           end
           raise SSLError, msg
         end
@@ -288,6 +403,11 @@ module OpenSSL
         return true
       end
 
+      # call-seq:
+      #   ssl.session -> aSession
+      #
+      # Returns the SSLSession object currently used, or nil if the session is
+      # not established.
       def session
         SSL::Session.new(self)
       rescue SSL::Session::SessionError
@@ -307,7 +427,7 @@ module OpenSSL
       end
 
       def tmp_dh_callback
-        @context.tmp_dh_callback || OpenSSL::PKey::DEFAULT_TMP_DH_CALLBACK
+        @context.tmp_dh_callback || OpenSSL::SSL::SSLContext::DEFAULT_TMP_DH_CALLBACK
       end
 
       def tmp_ecdh_callback
@@ -321,6 +441,38 @@ module OpenSSL
       def session_get_cb
         @context.session_get_cb
       end
+
+      class << self
+
+        # call-seq:
+        #   open(remote_host, remote_port, local_host=nil, local_port=nil, context: nil)
+        #
+        # Creates a new instance of SSLSocket.
+        # _remote\_host_ and _remote\_port_ are used to open TCPSocket.
+        # If _local\_host_ and _local\_port_ are specified,
+        # then those parameters are used on the local end to establish the connection.
+        # If _context_ is provided,
+        # the SSL Sockets initial params will be taken from the context.
+        #
+        # === Examples
+        #
+        #   sock = OpenSSL::SSL::SSLSocket.open('localhost', 443)
+        #   sock.connect # Initiates a connection to localhost:443
+        #
+        # with SSLContext:
+        #
+        #   ctx = OpenSSL::SSL::SSLContext.new
+        #   sock = OpenSSL::SSL::SSLSocket.open('localhost', 443, context: ctx)
+        #   sock.connect # Initiates a connection to localhost:443 with SSLContext
+        def open(remote_host, remote_port, local_host=nil, local_port=nil, context: nil)
+          sock = ::TCPSocket.open(remote_host, remote_port, local_host, local_port)
+          if context.nil?
+            return OpenSSL::SSL::SSLSocket.new(sock)
+          else
+            return OpenSSL::SSL::SSLSocket.new(sock, context)
+          end
+        end
+      end
     end
 
     ##
@@ -331,8 +483,8 @@ module OpenSSL
       attr_accessor :start_immediately
 
       # Creates a new instance of SSLServer.
-      # * +srv+ is an instance of TCPServer.
-      # * +ctx+ is an instance of OpenSSL::SSL::SSLContext.
+      # * _srv_ is an instance of TCPServer.
+      # * _ctx_ is an instance of OpenSSL::SSL::SSLContext.
       def initialize(svr, ctx)
         @svr = svr
         @ctx = ctx
@@ -351,7 +503,7 @@ module OpenSSL
       end
 
       # See TCPServer#listen for details.
-      def listen(backlog=5)
+      def listen(backlog=Socket::SOMAXCONN)
         @svr.listen(backlog)
       end
 
diff --git a/ext/openssl/lib/openssl/version.rb b/ext/openssl/lib/openssl/version.rb
new file mode 100644
index 0000000000..89e052069e
--- /dev/null
+++ b/ext/openssl/lib/openssl/version.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module OpenSSL
+  VERSION = "2.2.2"
+end
diff --git a/ext/openssl/lib/openssl/x509.rb b/ext/openssl/lib/openssl/x509.rb
index aef3456e0f..6771b90c1a 100644
--- a/ext/openssl/lib/openssl/x509.rb
+++ b/ext/openssl/lib/openssl/x509.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #--
 # = Ruby-space definitions that completes C-space funcs for X509 and subclasses
 #
@@ -12,6 +12,8 @@
 # (See the file 'LICENCE'.)
 #++
 
+require_relative 'marshal'
+
 module OpenSSL
   module X509
     class ExtensionFactory
@@ -41,6 +43,13 @@ module OpenSSL
     end
 
     class Extension
+      include OpenSSL::Marshal
+
+      def ==(other)
+        return false unless Extension === other
+        to_der == other.to_der
+      end
+
       def to_s # "oid = critical, value"
         str = self.oid
         str << " = "
@@ -55,9 +64,146 @@ module OpenSSL
       def to_a
         [ self.oid, self.value, self.critical? ]
       end
+
+      module Helpers
+        def find_extension(oid)
+          extensions.find { |e| e.oid == oid }
+        end
+      end
+
+      module SubjectKeyIdentifier
+        include Helpers
+
+        # Get the subject's key identifier from the subjectKeyIdentifier
+        # exteension, as described in RFC5280 Section 4.2.1.2.
+        #
+        # Returns the binary String key identifier or nil or raises
+        # ASN1::ASN1Error.
+        def subject_key_identifier
+          ext = find_extension("subjectKeyIdentifier")
+          return nil if ext.nil?
+
+          ski_asn1 = ASN1.decode(ext.value_der)
+          if ext.critical? || ski_asn1.tag_class != :UNIVERSAL || ski_asn1.tag != ASN1::OCTET_STRING
+            raise ASN1::ASN1Error, "invalid extension"
+          end
+
+          ski_asn1.value
+        end
+      end
+
+      module AuthorityKeyIdentifier
+        include Helpers
+
+        # Get the issuing certificate's key identifier from the
+        # authorityKeyIdentifier extension, as described in RFC5280
+        # Section 4.2.1.1
+        #
+        # Returns the binary String keyIdentifier or nil or raises
+        # ASN1::ASN1Error.
+        def authority_key_identifier
+          ext = find_extension("authorityKeyIdentifier")
+          return nil if ext.nil?
+
+          aki_asn1 = ASN1.decode(ext.value_der)
+          if ext.critical? || aki_asn1.tag_class != :UNIVERSAL || aki_asn1.tag != ASN1::SEQUENCE
+            raise ASN1::ASN1Error, "invalid extension"
+          end
+
+          key_id = aki_asn1.value.find do |v|
+            v.tag_class == :CONTEXT_SPECIFIC && v.tag == 0
+          end
+
+          key_id.nil? ? nil : key_id.value
+        end
+      end
+
+      module CRLDistributionPoints
+        include Helpers
+
+        # Get the distributionPoint fullName URI from the certificate's CRL
+        # distribution points extension, as described in RFC5280 Section
+        # 4.2.1.13
+        #
+        # Returns an array of strings or nil or raises ASN1::ASN1Error.
+        def crl_uris
+          ext = find_extension("crlDistributionPoints")
+          return nil if ext.nil?
+
+          cdp_asn1 = ASN1.decode(ext.value_der)
+          if cdp_asn1.tag_class != :UNIVERSAL || cdp_asn1.tag != ASN1::SEQUENCE
+            raise ASN1::ASN1Error, "invalid extension"
+          end
+
+          crl_uris = cdp_asn1.map do |crl_distribution_point|
+            distribution_point = crl_distribution_point.value.find do |v|
+              v.tag_class == :CONTEXT_SPECIFIC && v.tag == 0
+            end
+            full_name = distribution_point&.value&.find do |v|
+              v.tag_class == :CONTEXT_SPECIFIC && v.tag == 0
+            end
+            full_name&.value&.find do |v|
+              v.tag_class == :CONTEXT_SPECIFIC && v.tag == 6 # uniformResourceIdentifier
+            end
+          end
+
+          crl_uris&.map(&:value)
+        end
+      end
+
+      module AuthorityInfoAccess
+        include Helpers
+
+        # Get the information and services for the issuer from the certificate's
+        # authority information access extension exteension, as described in RFC5280
+        # Section 4.2.2.1.
+        #
+        # Returns an array of strings or nil or raises ASN1::ASN1Error.
+        def ca_issuer_uris
+          aia_asn1 = parse_aia_asn1
+          return nil if aia_asn1.nil?
+
+          ca_issuer = aia_asn1.value.select do |authority_info_access|
+            authority_info_access.value.first.value == "caIssuers"
+          end
+
+          ca_issuer&.map(&:value)&.map(&:last)&.map(&:value)
+        end
+
+        # Get the URIs for OCSP from the certificate's authority information access
+        # extension exteension, as described in RFC5280 Section 4.2.2.1.
+        #
+        # Returns an array of strings or nil or raises ASN1::ASN1Error.
+        def ocsp_uris
+          aia_asn1 = parse_aia_asn1
+          return nil if aia_asn1.nil?
+
+          ocsp = aia_asn1.value.select do |authority_info_access|
+            authority_info_access.value.first.value == "OCSP"
+          end
+
+          ocsp&.map(&:value)&.map(&:last)&.map(&:value)
+        end
+
+        private
+
+          def parse_aia_asn1
+            ext = find_extension("authorityInfoAccess")
+            return nil if ext.nil?
+
+            aia_asn1 = ASN1.decode(ext.value_der)
+            if ext.critical? || aia_asn1.tag_class != :UNIVERSAL || aia_asn1.tag != ASN1::SEQUENCE
+              raise ASN1::ASN1Error, "invalid extension"
+            end
+
+            aia_asn1
+          end
+      end
     end
 
     class Name
+      include OpenSSL::Marshal
+
       module RFC2253DN
         Special = ',=+<>#;'
         HexChar = /[0-9a-fA-F]/
@@ -139,7 +285,13 @@ module OpenSSL
         end
 
         def parse_openssl(str, template=OBJECT_TYPE_TEMPLATE)
-          ary = str.scan(/\s*([^\/,]+)\s*/).collect{|i| i[0].split("=", 2) }
+          if str.start_with?("/")
+            # /A=B/C=D format
+            ary = str[1..-1].split("/").map { |i| i.split("=", 2) }
+          else
+            # Comma-separated
+            ary = str.split(",").map { |i| i.strip.split("=", 2) }
+          end
           self.new(ary, template)
         end
 
@@ -154,6 +306,15 @@ module OpenSSL
       end
     end
 
+    class Attribute
+      include OpenSSL::Marshal
+
+      def ==(other)
+        return false unless Attribute === other
+        to_der == other.to_der
+      end
+    end
+
     class StoreContext
       def cleanup
         warn "(#{caller.first}) OpenSSL::X509::StoreContext#cleanup is deprecated with no replacement" if $VERBOSE
@@ -161,6 +322,12 @@ module OpenSSL
     end
 
     class Certificate
+      include OpenSSL::Marshal
+      include Extension::SubjectKeyIdentifier
+      include Extension::AuthorityKeyIdentifier
+      include Extension::CRLDistributionPoints
+      include Extension::AuthorityInfoAccess
+
       def pretty_print(q)
         q.object_group(self) {
           q.breakable
@@ -172,5 +339,31 @@ module OpenSSL
         }
       end
     end
+
+    class CRL
+      include OpenSSL::Marshal
+      include Extension::AuthorityKeyIdentifier
+
+      def ==(other)
+        return false unless CRL === other
+        to_der == other.to_der
+      end
+    end
+
+    class Revoked
+      def ==(other)
+        return false unless Revoked === other
+        to_der == other.to_der
+      end
+    end
+
+    class Request
+      include OpenSSL::Marshal
+
+      def ==(other)
+        return false unless Request === other
+        to_der == other.to_der
+      end
+    end
   end
 end
diff --git a/ext/openssl/openssl.gemspec b/ext/openssl/openssl.gemspec
new file mode 100644
index 0000000000..c8e3cc3fc3
--- /dev/null
+++ b/ext/openssl/openssl.gemspec
@@ -0,0 +1,27 @@
+Gem::Specification.new do |spec|
+  spec.name          = "openssl"
+  spec.version       = "2.2.2"
+  spec.authors       = ["Martin Bosslet", "SHIBATA Hiroshi", "Zachary Scott", "Kazuki Yamaguchi"]
+  spec.email         = ["ruby-core@ruby-lang.org"]
+  spec.summary       = %q{OpenSSL provides SSL, TLS and general purpose cryptography.}
+  spec.description   = %q{It wraps the OpenSSL library.}
+  spec.homepage      = "https://github.com/ruby/openssl"
+  spec.license       = "Ruby"
+
+  spec.files         = Dir["lib/**/*.rb", "ext/**/*.{c,h,rb}", "*.md", "BSDL", "LICENSE.txt"]
+  spec.require_paths = ["lib"]
+  spec.extensions    = ["ext/openssl/extconf.rb"]
+
+  spec.extra_rdoc_files = Dir["*.md"]
+  spec.rdoc_options = ["--main", "README.md"]
+
+  spec.required_ruby_version = ">= 2.3.0"
+
+  spec.add_runtime_dependency "ipaddr"
+  spec.add_development_dependency "rake", ">= 11.2.0"
+  spec.add_development_dependency "rake-compiler"
+  spec.add_development_dependency "test-unit", "~> 3.0"
+  spec.add_development_dependency "rdoc"
+
+  spec.metadata["msys2_mingw_dependencies"] = "openssl"
+end
diff --git a/ext/openssl/openssl_missing.c b/ext/openssl/openssl_missing.c
index cb22647c86..b36ef0288e 100644
--- a/ext/openssl/openssl_missing.c
+++ b/ext/openssl/openssl_missing.c
@@ -20,73 +20,6 @@
 
 #include "openssl_missing.h"
 
-/* added in 0.9.8X */
-#if !defined(HAVE_EVP_CIPHER_CTX_NEW)
-EVP_CIPHER_CTX *
-EVP_CIPHER_CTX_new(void)
-{
-    EVP_CIPHER_CTX *ctx = OPENSSL_malloc(sizeof(EVP_CIPHER_CTX));
-    if (!ctx)
-	return NULL;
-    EVP_CIPHER_CTX_init(ctx);
-    return ctx;
-}
-#endif
-
-#if !defined(HAVE_EVP_CIPHER_CTX_FREE)
-void
-EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *ctx)
-{
-    if (ctx) {
-	EVP_CIPHER_CTX_cleanup(ctx);
-	OPENSSL_free(ctx);
-    }
-}
-#endif
-
-/* added in 1.0.0 */
-#if !defined(HAVE_EVP_CIPHER_CTX_COPY)
-/*
- * this function does not exist in OpenSSL yet... or ever?.
- * a future version may break this function.
- * tested on 0.9.7d.
- */
-int
-EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, const EVP_CIPHER_CTX *in)
-{
-    memcpy(out, in, sizeof(EVP_CIPHER_CTX));
-
-#if !defined(OPENSSL_NO_ENGINE)
-    if (in->engine) ENGINE_add(out->engine);
-    if (in->cipher_data) {
-	out->cipher_data = OPENSSL_malloc(in->cipher->ctx_size);
-	memcpy(out->cipher_data, in->cipher_data, in->cipher->ctx_size);
-    }
-#endif
-
-    return 1;
-}
-#endif
-
-#if !defined(OPENSSL_NO_HMAC)
-#if !defined(HAVE_HMAC_CTX_COPY)
-int
-HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in)
-{
-    if (!out || !in)
-	return 0;
-
-    memcpy(out, in, sizeof(HMAC_CTX));
-
-    EVP_MD_CTX_copy(&out->md_ctx, &in->md_ctx);
-    EVP_MD_CTX_copy(&out->i_ctx, &in->i_ctx);
-    EVP_MD_CTX_copy(&out->o_ctx, &in->o_ctx);
-
-    return 1;
-}
-#endif /* HAVE_HMAC_CTX_COPY */
-#endif /* NO_HMAC */
-
 /* added in 1.0.2 */
 #if !defined(OPENSSL_NO_EC)
 #if !defined(HAVE_EC_CURVE_NIST2NID)
@@ -112,7 +45,7 @@ static struct {
 };
 
 int
-EC_curve_nist2nid(const char *name)
+ossl_EC_curve_nist2nid(const char *name)
 {
     size_t i;
     for (i = 0; i < (sizeof(nist_curves) / sizeof(nist_curves[0])); i++) {
@@ -127,7 +60,7 @@ EC_curve_nist2nid(const char *name)
 /*** added in 1.1.0 ***/
 #if !defined(HAVE_HMAC_CTX_NEW)
 HMAC_CTX *
-HMAC_CTX_new(void)
+ossl_HMAC_CTX_new(void)
 {
     HMAC_CTX *ctx = OPENSSL_malloc(sizeof(HMAC_CTX));
     if (!ctx)
@@ -139,7 +72,7 @@ HMAC_CTX_new(void)
 
 #if !defined(HAVE_HMAC_CTX_FREE)
 void
-HMAC_CTX_free(HMAC_CTX *ctx)
+ossl_HMAC_CTX_free(HMAC_CTX *ctx)
 {
     if (ctx) {
 	HMAC_CTX_cleanup(ctx);
@@ -150,7 +83,8 @@ HMAC_CTX_free(HMAC_CTX *ctx)
 
 #if !defined(HAVE_X509_CRL_GET0_SIGNATURE)
 void
-X509_CRL_get0_signature(ASN1_BIT_STRING **psig, X509_ALGOR **palg, X509_CRL *crl)
+ossl_X509_CRL_get0_signature(const X509_CRL *crl, const ASN1_BIT_STRING **psig,
+			     const X509_ALGOR **palg)
 {
     if (psig != NULL)
 	*psig = crl->signature;
@@ -161,7 +95,8 @@ X509_CRL_get0_signature(ASN1_BIT_STRING **psig, X509_ALGOR **palg, X509_CRL *crl
 
 #if !defined(HAVE_X509_REQ_GET0_SIGNATURE)
 void
-X509_REQ_get0_signature(ASN1_BIT_STRING **psig, X509_ALGOR **palg, X509_REQ *req)
+ossl_X509_REQ_get0_signature(const X509_REQ *req, const ASN1_BIT_STRING **psig,
+			     const X509_ALGOR **palg)
 {
     if (psig != NULL)
 	*psig = req->signature;
diff --git a/ext/openssl/openssl_missing.h b/ext/openssl/openssl_missing.h
index 769c7c2d24..7d218f86f5 100644
--- a/ext/openssl/openssl_missing.h
+++ b/ext/openssl/openssl_missing.h
@@ -12,45 +12,11 @@
 
 #include "ruby/config.h"
 
-/* added in 0.9.8X */
-#if !defined(HAVE_EVP_CIPHER_CTX_NEW)
-EVP_CIPHER_CTX *EVP_CIPHER_CTX_new(void);
-#endif
-
-#if !defined(HAVE_EVP_CIPHER_CTX_FREE)
-void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *ctx);
-#endif
-
-/* added in 1.0.0 */
-#if !defined(HAVE_EVP_PKEY_BASE_ID)
-#  define EVP_PKEY_base_id(pkey) EVP_PKEY_type((pkey)->type)
-#endif
-
-#if !defined(HAVE_EVP_CIPHER_CTX_COPY)
-int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, const EVP_CIPHER_CTX *in);
-#endif
-
-#if !defined(HAVE_HMAC_CTX_COPY)
-int HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in);
-#endif
-
-#if !defined(HAVE_X509_STORE_CTX_GET0_CURRENT_CRL)
-#  define X509_STORE_CTX_get0_current_crl(x) ((x)->current_crl)
-#endif
-
-#if !defined(HAVE_X509_STORE_SET_VERIFY_CB)
-#  define X509_STORE_set_verify_cb X509_STORE_set_verify_cb_func
-#endif
-
-#if !defined(HAVE_I2D_ASN1_SET_ANY)
-#  define i2d_ASN1_SET_ANY(sk, x) i2d_ASN1_SET_OF_ASN1_TYPE((sk), (x), \
-		i2d_ASN1_TYPE, V_ASN1_SET, V_ASN1_UNIVERSAL, 0)
-#endif
-
 /* added in 1.0.2 */
 #if !defined(OPENSSL_NO_EC)
 #if !defined(HAVE_EC_CURVE_NIST2NID)
-int EC_curve_nist2nid(const char *);
+int ossl_EC_curve_nist2nid(const char *);
+#  define EC_curve_nist2nid ossl_EC_curve_nist2nid
 #endif
 #endif
 
@@ -89,11 +55,13 @@ int EC_curve_nist2nid(const char *);
 #endif
 
 #if !defined(HAVE_HMAC_CTX_NEW)
-HMAC_CTX *HMAC_CTX_new(void);
+HMAC_CTX *ossl_HMAC_CTX_new(void);
+#  define HMAC_CTX_new ossl_HMAC_CTX_new
 #endif
 
 #if !defined(HAVE_HMAC_CTX_FREE)
-void HMAC_CTX_free(HMAC_CTX *ctx);
+void ossl_HMAC_CTX_free(HMAC_CTX *);
+#  define HMAC_CTX_free ossl_HMAC_CTX_free
 #endif
 
 #if !defined(HAVE_X509_STORE_GET_EX_DATA)
@@ -104,17 +72,22 @@ void HMAC_CTX_free(HMAC_CTX *ctx);
 #if !defined(HAVE_X509_STORE_SET_EX_DATA)
 #  define X509_STORE_set_ex_data(x, idx, data) \
 	CRYPTO_set_ex_data(&(x)->ex_data, (idx), (data))
+#endif
+
+#if !defined(HAVE_X509_STORE_GET_EX_NEW_INDEX) && !defined(X509_STORE_get_ex_new_index)
 #  define X509_STORE_get_ex_new_index(l, p, newf, dupf, freef) \
 	CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_X509_STORE, (l), (p), \
 				(newf), (dupf), (freef))
 #endif
 
 #if !defined(HAVE_X509_CRL_GET0_SIGNATURE)
-void X509_CRL_get0_signature(ASN1_BIT_STRING **psig, X509_ALGOR **palg, X509_CRL *crl);
+void ossl_X509_CRL_get0_signature(const X509_CRL *, const ASN1_BIT_STRING **, const X509_ALGOR **);
+#  define X509_CRL_get0_signature ossl_X509_CRL_get0_signature
 #endif
 
 #if !defined(HAVE_X509_REQ_GET0_SIGNATURE)
-void X509_REQ_get0_signature(ASN1_BIT_STRING **psig, X509_ALGOR **palg, X509_REQ *req);
+void ossl_X509_REQ_get0_signature(const X509_REQ *, const ASN1_BIT_STRING **, const X509_ALGOR **);
+#  define X509_REQ_get0_signature ossl_X509_REQ_get0_signature
 #endif
 
 #if !defined(HAVE_X509_REVOKED_GET0_SERIALNUMBER)
@@ -174,12 +147,13 @@ void X509_REQ_get0_signature(ASN1_BIT_STRING **psig, X509_ALGOR **palg, X509_REQ
 	CRYPTO_add(&(x)->references, 1, CRYPTO_LOCK_EVP_PKEY);
 #endif
 
-#if !defined(HAVE_OPAQUE_OPENSSL)
+#if !defined(HAVE_OPAQUE_OPENSSL) && \
+    (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2070000fL)
 #define IMPL_PKEY_GETTER(_type, _name) \
 static inline _type *EVP_PKEY_get0_##_type(EVP_PKEY *pkey) { \
 	return pkey->pkey._name; }
 #define IMPL_KEY_ACCESSOR2(_type, _group, a1, a2, _fail_cond) \
-static inline void _type##_get0_##_group(_type *obj, const BIGNUM **a1, const BIGNUM **a2) { \
+static inline void _type##_get0_##_group(const _type *obj, const BIGNUM **a1, const BIGNUM **a2) { \
 	if (a1) *a1 = obj->a1; \
 	if (a2) *a2 = obj->a2; } \
 static inline int _type##_set0_##_group(_type *obj, BIGNUM *a1, BIGNUM *a2) { \
@@ -188,7 +162,7 @@ static inline int _type##_set0_##_group(_type *obj, BIGNUM *a1, BIGNUM *a2) { \
 	BN_clear_free(obj->a2); obj->a2 = a2; \
 	return 1; }
 #define IMPL_KEY_ACCESSOR3(_type, _group, a1, a2, a3, _fail_cond) \
-static inline void _type##_get0_##_group(_type *obj, const BIGNUM **a1, const BIGNUM **a2, const BIGNUM **a3) { \
+static inline void _type##_get0_##_group(const _type *obj, const BIGNUM **a1, const BIGNUM **a2, const BIGNUM **a3) { \
 	if (a1) *a1 = obj->a1; \
 	if (a2) *a2 = obj->a2; \
 	if (a3) *a3 = obj->a3; } \
@@ -215,7 +189,7 @@ IMPL_KEY_ACCESSOR3(DSA, pqg, p, q, g, (p == obj->p || q == obj->q || g == obj->g
 #if !defined(OPENSSL_NO_DH)
 IMPL_PKEY_GETTER(DH, dh)
 IMPL_KEY_ACCESSOR2(DH, key, pub_key, priv_key, (pub_key == obj->pub_key || (obj->priv_key && priv_key == obj->priv_key)))
-IMPL_KEY_ACCESSOR3(DH, pqg, p, q, g, (p == obj->p || obj->q && q == obj->q || g == obj->g))
+IMPL_KEY_ACCESSOR3(DH, pqg, p, q, g, (p == obj->p || (obj->q && q == obj->q) || g == obj->g))
 static inline ENGINE *DH_get0_engine(DH *dh) { return dh->engine; }
 #endif
 
@@ -228,9 +202,56 @@ IMPL_PKEY_GETTER(EC_KEY, ec)
 #undef IMPL_KEY_ACCESSOR3
 #endif /* HAVE_OPAQUE_OPENSSL */
 
-#if defined(HAVE_AUTHENTICATED_ENCRYPTION) && !defined(EVP_CTRL_AEAD_GET_TAG)
+#if !defined(EVP_CTRL_AEAD_GET_TAG)
 #  define EVP_CTRL_AEAD_GET_TAG EVP_CTRL_GCM_GET_TAG
 #  define EVP_CTRL_AEAD_SET_TAG EVP_CTRL_GCM_SET_TAG
+#  define EVP_CTRL_AEAD_SET_IVLEN EVP_CTRL_GCM_SET_IVLEN
+#endif
+
+#if !defined(HAVE_X509_GET0_NOTBEFORE)
+#  define X509_get0_notBefore(x) X509_get_notBefore(x)
+#  define X509_get0_notAfter(x) X509_get_notAfter(x)
+#  define X509_CRL_get0_lastUpdate(x) X509_CRL_get_lastUpdate(x)
+#  define X509_CRL_get0_nextUpdate(x) X509_CRL_get_nextUpdate(x)
+#  define X509_set1_notBefore(x, t) X509_set_notBefore(x, t)
+#  define X509_set1_notAfter(x, t) X509_set_notAfter(x, t)
+#  define X509_CRL_set1_lastUpdate(x, t) X509_CRL_set_lastUpdate(x, t)
+#  define X509_CRL_set1_nextUpdate(x, t) X509_CRL_set_nextUpdate(x, t)
+#endif
+
+#if !defined(HAVE_SSL_SESSION_GET_PROTOCOL_VERSION)
+#  define SSL_SESSION_get_protocol_version(s) ((s)->ssl_version)
+#endif
+
+#if !defined(HAVE_TS_STATUS_INFO_GET0_STATUS)
+#  define TS_STATUS_INFO_get0_status(a) ((a)->status)
+#endif
+
+#if !defined(HAVE_TS_STATUS_INFO_GET0_TEXT)
+#  define TS_STATUS_INFO_get0_text(a) ((a)->text)
+#endif
+
+#if !defined(HAVE_TS_STATUS_INFO_GET0_FAILURE_INFO)
+#  define TS_STATUS_INFO_get0_failure_info(a) ((a)->failure_info)
+#endif
+
+#if !defined(HAVE_TS_VERIFY_CTS_SET_CERTS)
+#  define TS_VERIFY_CTS_set_certs(ctx, crts) ((ctx)->certs=(crts))
+#endif
+
+#if !defined(HAVE_TS_VERIFY_CTX_SET_STORE)
+#  define TS_VERIFY_CTX_set_store(ctx, str) ((ctx)->store=(str))
+#endif
+
+#if !defined(HAVE_TS_VERIFY_CTX_ADD_FLAGS)
+#  define TS_VERIFY_CTX_add_flags(ctx, f) ((ctx)->flags |= (f))
+#endif
+
+#if !defined(HAVE_TS_RESP_CTX_SET_TIME_CB)
+#   define TS_RESP_CTX_set_time_cb(ctx, callback, dta) do { \
+        (ctx)->time_cb = (callback); \
+        (ctx)->time_cb_data = (dta); \
+    } while (0)
 #endif
 
 #endif /* _OSSL_OPENSSL_MISSING_H_ */
diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c
index 83baa7b63c..ce02efd983 100644
--- a/ext/openssl/ossl.c
+++ b/ext/openssl/ossl.c
@@ -9,40 +9,7 @@
  */
 #include "ossl.h"
 #include <stdarg.h> /* for ossl_raise */
-
-/*
- * String to HEXString conversion
- */
-int
-string2hex(const unsigned char *buf, int buf_len, char **hexbuf, int *hexbuf_len)
-{
-    static const char hex[]="0123456789abcdef";
-    int i, len;
-
-    if (buf_len < 0 || buf_len > INT_MAX / 2) { /* PARANOIA? */
-	return -1;
-    }
-    len = 2 * buf_len;
-    if (!hexbuf) { /* if no buf, return calculated len */
-	if (hexbuf_len) {
-	    *hexbuf_len = len;
-	}
-	return len;
-    }
-    if (!(*hexbuf = OPENSSL_malloc(len + 1))) {
-	return -1;
-    }
-    for (i = 0; i < buf_len; i++) {
-	(*hexbuf)[2 * i] = hex[((unsigned char)buf[i]) >> 4];
-	(*hexbuf)[2 * i + 1] = hex[buf[i] & 0x0f];
-    }
-    (*hexbuf)[2 * i] = '\0';
-
-    if (hexbuf_len) {
-	*hexbuf_len = len;
-    }
-    return len;
-}
+#include <ruby/thread_native.h> /* for OpenSSL < 1.1.0 locks */
 
 /*
  * Data Conversion
@@ -77,7 +44,7 @@ STACK_OF(type) *						\
 ossl_protect_##name##_ary2sk(VALUE ary, int *status)		\
 {								\
     return (STACK_OF(type)*)rb_protect(				\
-	    (VALUE(*)_((VALUE)))ossl_##name##_ary2sk0,		\
+	    (VALUE (*)(VALUE))ossl_##name##_ary2sk0,		\
 	    ary,						\
 	    status);						\
 }								\
@@ -97,7 +64,7 @@ OSSL_IMPL_ARY2SK(x509, X509, cX509Cert, DupX509CertPtr)
 
 #define OSSL_IMPL_SK2ARY(name, type)	        \
 VALUE						\
-ossl_##name##_sk2ary(STACK_OF(type) *sk)	\
+ossl_##name##_sk2ary(const STACK_OF(type) *sk)	\
 {						\
     type *t;					\
     int i, num;					\
@@ -125,35 +92,61 @@ OSSL_IMPL_SK2ARY(x509crl, X509_CRL)
 OSSL_IMPL_SK2ARY(x509name, X509_NAME)
 
 static VALUE
-ossl_str_new(int size)
+ossl_str_new_i(VALUE size)
 {
-    return rb_str_new(0, size);
+    return rb_str_new(NULL, (long)size);
+}
+
+VALUE
+ossl_str_new(const char *ptr, long len, int *pstate)
+{
+    VALUE str;
+    int state;
+
+    str = rb_protect(ossl_str_new_i, len, &state);
+    if (pstate)
+	*pstate = state;
+    if (state) {
+	if (!pstate)
+	    rb_set_errinfo(Qnil);
+	return Qnil;
+    }
+    if (ptr)
+	memcpy(RSTRING_PTR(str), ptr, len);
+    return str;
 }
 
 VALUE
 ossl_buf2str(char *buf, int len)
 {
     VALUE str;
-    int status = 0;
+    int state;
 
-    str = rb_protect((VALUE(*)_((VALUE)))ossl_str_new, len, &status);
-    if(!NIL_P(str)) memcpy(RSTRING_PTR(str), buf, len);
+    str = ossl_str_new(buf, len, &state);
     OPENSSL_free(buf);
-    if(status) rb_jump_tag(status);
-
+    if (state)
+	rb_jump_tag(state);
     return str;
 }
 
-/*
- * our default PEM callback
- */
+void
+ossl_bin2hex(unsigned char *in, char *out, size_t inlen)
+{
+    const char *hex = "0123456789abcdef";
+    size_t i;
+
+    assert(inlen <= LONG_MAX / 2);
+    for (i = 0; i < inlen; i++) {
+	unsigned char p = in[i];
+
+	out[i * 2 + 0] = hex[p >> 4];
+	out[i * 2 + 1] = hex[p & 0x0f];
+    }
+}
 
 /*
- * OpenSSL requires passwords for PEM-encoded files to be at least four
- * characters long. See crypto/pem/pem_lib.c (as of 1.0.2h)
+ * our default PEM callback
  */
-#define OSSL_MIN_PWD_LEN 4
-
 VALUE
 ossl_pem_passwd_value(VALUE pass)
 {
@@ -162,12 +155,10 @@ ossl_pem_passwd_value(VALUE pass)
 
     StringValue(pass);
 
-    if (RSTRING_LEN(pass) < OSSL_MIN_PWD_LEN)
-	ossl_raise(eOSSLError, "password must be at least %d bytes", OSSL_MIN_PWD_LEN);
     /* PEM_BUFSIZE is currently used as the second argument of pem_password_cb,
      * that is +max_len+ of ossl_pem_passwd_cb() */
     if (RSTRING_LEN(pass) > PEM_BUFSIZE)
-	ossl_raise(eOSSLError, "password must be shorter than %d bytes", PEM_BUFSIZE);
+	ossl_raise(eOSSLError, "password must not be longer than %d bytes", PEM_BUFSIZE);
 
     return pass;
 }
@@ -175,18 +166,18 @@ ossl_pem_passwd_value(VALUE pass)
 static VALUE
 ossl_pem_passwd_cb0(VALUE flag)
 {
-    VALUE pass;
-
-    pass = rb_yield(flag);
-    SafeStringValue(pass);
-
+    VALUE pass = rb_yield(flag);
+    if (NIL_P(pass))
+	return Qnil;
+    StringValue(pass);
     return pass;
 }
 
 int
 ossl_pem_passwd_cb(char *buf, int max_len, int flag, void *pwd_)
 {
-    int len, status;
+    long len;
+    int status;
     VALUE rflag, pass = (VALUE)pwd_;
 
     if (RTEST(pass)) {
@@ -194,10 +185,10 @@ ossl_pem_passwd_cb(char *buf, int max_len, int flag, void *pwd_)
 	 * work because it does not allow NUL characters and truncates to 1024
 	 * bytes silently if the input is over 1024 bytes */
 	if (RB_TYPE_P(pass, T_STRING)) {
-	    len = RSTRING_LENINT(pass);
-	    if (len >= OSSL_MIN_PWD_LEN && len <= max_len) {
+	    len = RSTRING_LEN(pass);
+	    if (len <= max_len) {
 		memcpy(buf, RSTRING_PTR(pass), len);
-		return len;
+		return (int)len;
 	    }
 	}
 	OSSL_Debug("passed data is not valid String???");
@@ -221,78 +212,17 @@ ossl_pem_passwd_cb(char *buf, int max_len, int flag, void *pwd_)
 	    rb_set_errinfo(Qnil);
 	    return -1;
 	}
-	len = RSTRING_LENINT(pass);
-	if (len < OSSL_MIN_PWD_LEN) {
-	    rb_warning("password must be at least %d bytes", OSSL_MIN_PWD_LEN);
-	    continue;
-	}
+	if (NIL_P(pass))
+	    return -1;
+	len = RSTRING_LEN(pass);
 	if (len > max_len) {
-	    rb_warning("password must be shorter than %d bytes", max_len);
+	    rb_warning("password must not be longer than %d bytes", max_len);
 	    continue;
 	}
 	memcpy(buf, RSTRING_PTR(pass), len);
 	break;
     }
-    return len;
-}
-
-/*
- * Verify callback
- */
-int ossl_store_ctx_ex_verify_cb_idx;
-int ossl_store_ex_verify_cb_idx;
-
-VALUE
-ossl_call_verify_cb_proc(struct ossl_verify_cb_args *args)
-{
-    return rb_funcall(args->proc, rb_intern("call"), 2,
-                      args->preverify_ok, args->store_ctx);
-}
-
-int
-ossl_verify_cb(int ok, X509_STORE_CTX *ctx)
-{
-    VALUE proc, rctx, ret;
-    struct ossl_verify_cb_args args;
-    int state = 0;
-
-    proc = (VALUE)X509_STORE_CTX_get_ex_data(ctx, ossl_store_ctx_ex_verify_cb_idx);
-    if (!proc)
-	proc = (VALUE)X509_STORE_get_ex_data(X509_STORE_CTX_get0_store(ctx), ossl_store_ex_verify_cb_idx);
-    if (!proc)
-	return ok;
-    if (!NIL_P(proc)) {
-	ret = Qfalse;
-	rctx = rb_protect((VALUE(*)(VALUE))ossl_x509stctx_new,
-			  (VALUE)ctx, &state);
-	if (state) {
-	    rb_set_errinfo(Qnil);
-	    rb_warn("StoreContext initialization failure");
-	}
-	else {
-	    args.proc = proc;
-	    args.preverify_ok = ok ? Qtrue : Qfalse;
-	    args.store_ctx = rctx;
-	    ret = rb_protect((VALUE(*)(VALUE))ossl_call_verify_cb_proc, (VALUE)&args, &state);
-	    if (state) {
-		rb_set_errinfo(Qnil);
-		rb_warn("exception in verify_callback is ignored");
-	    }
-	    ossl_x509stctx_clear_ptr(rctx);
-	}
-	if (ret == Qtrue) {
-	    X509_STORE_CTX_set_error(ctx, X509_V_OK);
-	    ok = 1;
-	}
-	else{
-	    if (X509_STORE_CTX_get_error(ctx) == X509_V_OK) {
-		X509_STORE_CTX_set_error(ctx, X509_V_ERR_CERT_REJECTED);
-	    }
-	    ok = 0;
-	}
-    }
-
-    return ok;
+    return (int)len;
 }
 
 /*
@@ -308,7 +238,7 @@ VALUE eOSSLError;
 /*
  * Convert to DER string
  */
-ID ossl_s_to_der;
+static ID ossl_s_to_der;
 
 VALUE
 ossl_to_der(VALUE obj)
@@ -336,18 +266,15 @@ static VALUE
 ossl_make_error(VALUE exc, const char *fmt, va_list args)
 {
     VALUE str = Qnil;
-    const char *msg;
-    long e;
+    unsigned long e;
 
-    e = ERR_peek_last_error();
     if (fmt) {
 	str = rb_vsprintf(fmt, args);
     }
+    e = ERR_peek_last_error();
     if (e) {
-	if (dOSSL == Qtrue) /* FULL INFO */
-	    msg = ERR_error_string(e, NULL);
-	else
-	    msg = ERR_reason_error_string(e);
+	const char *msg = ERR_reason_error_string(e);
+
 	if (NIL_P(str)) {
 	    if (msg) str = rb_str_new_cstr(msg);
 	}
@@ -355,8 +282,8 @@ ossl_make_error(VALUE exc, const char *fmt, va_list args)
 	    if (RSTRING_LEN(str)) rb_str_cat2(str, ": ");
 	    rb_str_cat2(str, msg ? msg : "(null)");
 	}
+	ossl_clear_error();
     }
-    ossl_clear_error();
 
     if (NIL_P(str)) str = rb_str_new(0, 0);
     return rb_exc_new3(exc, str);
@@ -373,27 +300,32 @@ ossl_raise(VALUE exc, const char *fmt, ...)
     rb_exc_raise(err);
 }
 
-VALUE
-ossl_exc_new(VALUE exc, const char *fmt, ...)
-{
-    va_list args;
-    VALUE err;
-    va_start(args, fmt);
-    err = ossl_make_error(exc, fmt, args);
-    va_end(args);
-    return err;
-}
-
 void
 ossl_clear_error(void)
 {
     if (dOSSL == Qtrue) {
-	long e;
-	while ((e = ERR_get_error())) {
-	    rb_warn("error on stack: %s", ERR_error_string(e, NULL));
+	unsigned long e;
+	const char *file, *data, *errstr;
+	int line, flags;
+
+	while ((e = ERR_get_error_line_data(&file, &line, &data, &flags))) {
+	    errstr = ERR_error_string(e, NULL);
+	    if (!errstr)
+		errstr = "(null)";
+
+	    if (flags & ERR_TXT_STRING) {
+		if (!data)
+		    data = "(null)";
+		rb_warn("error on stack: %s (%s)", errstr, data);
+	    }
+	    else {
+		rb_warn("error on stack: %s", errstr);
+	    }
 	}
     }
-    ERR_clear_error();
+    else {
+	ERR_clear_error();
+    }
 }
 
 /*
@@ -402,10 +334,11 @@ ossl_clear_error(void)
  *
  * See any remaining errors held in queue.
  *
- * Any errors you see here are probably due to a bug in ruby's OpenSSL implementation.
+ * Any errors you see here are probably due to a bug in Ruby's OpenSSL
+ * implementation.
  */
 VALUE
-ossl_get_errors(void)
+ossl_get_errors(VALUE _)
 {
     VALUE ary;
     long e;
@@ -453,29 +386,36 @@ ossl_debug_get(VALUE self)
  * call-seq:
  *   OpenSSL.debug = boolean -> boolean
  *
- * Turns on or off CRYPTO_MEM_CHECK.
- * Also shows some debugging message on stderr.
+ * Turns on or off debug mode. With debug mode, all erros added to the OpenSSL
+ * error queue will be printed to stderr.
  */
 static VALUE
 ossl_debug_set(VALUE self, VALUE val)
 {
-    VALUE old = dOSSL;
-    dOSSL = val;
-
-    if (old != dOSSL) {
-	if (dOSSL == Qtrue) {
-	    CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
-	    fprintf(stderr, "OSSL_DEBUG: IS NOW ON!\n");
-	} else if (old == Qtrue) {
-	    CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_OFF);
-	    fprintf(stderr, "OSSL_DEBUG: IS NOW OFF!\n");
-	}
-    }
+    dOSSL = RTEST(val) ? Qtrue : Qfalse;
+
     return val;
 }
 
 /*
  * call-seq:
+ *   OpenSSL.fips_mode -> true | false
+ */
+static VALUE
+ossl_fips_mode_get(VALUE self)
+{
+
+#ifdef OPENSSL_FIPS
+    VALUE enabled;
+    enabled = FIPS_mode() ? Qtrue : Qfalse;
+    return enabled;
+#else
+    return Qfalse;
+#endif
+}
+
+/*
+ * call-seq:
  *   OpenSSL.fips_mode = boolean -> boolean
  *
  * Turns FIPS mode on or off. Turning on FIPS mode will obviously only have an
@@ -483,9 +423,8 @@ ossl_debug_set(VALUE self, VALUE val)
  * so otherwise will result in an error.
  *
  * === Examples
- *
- * OpenSSL.fips_mode = true   # turn FIPS mode on
- * OpenSSL.fips_mode = false  # and off again
+ *   OpenSSL.fips_mode = true   # turn FIPS mode on
+ *   OpenSSL.fips_mode = false  # and off again
  */
 static VALUE
 ossl_fips_mode_set(VALUE self, VALUE enabled)
@@ -508,45 +447,126 @@ ossl_fips_mode_set(VALUE self, VALUE enabled)
 #endif
 }
 
+#if defined(OSSL_DEBUG)
+#if !defined(LIBRESSL_VERSION_NUMBER) && \
+    (OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(OPENSSL_NO_CRYPTO_MDEBUG) || \
+     defined(CRYPTO_malloc_debug_init))
+/*
+ * call-seq:
+ *   OpenSSL.mem_check_start -> nil
+ *
+ * Calls CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON). Starts tracking memory
+ * allocations. See also OpenSSL.print_mem_leaks.
+ *
+ * This is available only when built with a capable OpenSSL and --enable-debug
+ * configure option.
+ */
+static VALUE
+mem_check_start(VALUE self)
+{
+	CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
+	return Qnil;
+}
+
+/*
+ * call-seq:
+ *   OpenSSL.print_mem_leaks -> true | false
+ *
+ * For debugging the Ruby/OpenSSL library. Calls CRYPTO_mem_leaks_fp(stderr).
+ * Prints detected memory leaks to standard error. This cleans the global state
+ * up thus you cannot use any methods of the library after calling this.
+ *
+ * Returns +true+ if leaks detected, +false+ otherwise.
+ *
+ * This is available only when built with a capable OpenSSL and --enable-debug
+ * configure option.
+ *
+ * === Example
+ *   OpenSSL.mem_check_start
+ *   NOT_GCED = OpenSSL::PKey::RSA.new(256)
+ *
+ *   END {
+ *     GC.start
+ *     OpenSSL.print_mem_leaks # will print the leakage
+ *   }
+ */
+static VALUE
+print_mem_leaks(VALUE self)
+{
+#if OPENSSL_VERSION_NUMBER >= 0x10100000
+    int ret;
+#endif
+
+#ifndef HAVE_RB_EXT_RACTOR_SAFE
+    // for Ruby 2.x
+    void ossl_bn_ctx_free(void); // ossl_bn.c
+    ossl_bn_ctx_free();
+#endif
+
+#if OPENSSL_VERSION_NUMBER >= 0x10100000
+    ret = CRYPTO_mem_leaks_fp(stderr);
+    if (ret < 0)
+	ossl_raise(eOSSLError, "CRYPTO_mem_leaks_fp");
+    return ret ? Qfalse : Qtrue;
+#else
+    CRYPTO_mem_leaks_fp(stderr);
+    return Qnil;
+#endif
+}
+#endif
+#endif
+
 #if !defined(HAVE_OPENSSL_110_THREADING_API)
 /**
  * Stores locks needed for OpenSSL thread safety
  */
-#include "ruby/thread_native.h"
-static rb_nativethread_lock_t *ossl_locks;
+struct CRYPTO_dynlock_value {
+    rb_nativethread_lock_t lock;
+    rb_nativethread_id_t owner;
+    size_t count;
+};
 
 static void
-ossl_lock_unlock(int mode, rb_nativethread_lock_t *lock)
+ossl_lock_init(struct CRYPTO_dynlock_value *l)
 {
-    if (mode & CRYPTO_LOCK) {
-	rb_nativethread_lock_lock(lock);
-    } else {
-	rb_nativethread_lock_unlock(lock);
-    }
+    rb_nativethread_lock_initialize(&l->lock);
+    l->count = 0;
 }
 
 static void
-ossl_lock_callback(int mode, int type, const char *file, int line)
+ossl_lock_unlock(int mode, struct CRYPTO_dynlock_value *l)
 {
-    ossl_lock_unlock(mode, &ossl_locks[type]);
+    if (mode & CRYPTO_LOCK) {
+	/* TODO: rb_nativethread_id_t is not necessarily compared with ==. */
+	rb_nativethread_id_t tid = rb_nativethread_self();
+	if (l->count && l->owner == tid) {
+	    l->count++;
+	    return;
+	}
+	rb_nativethread_lock_lock(&l->lock);
+	l->owner = tid;
+	l->count = 1;
+    } else {
+	if (!--l->count)
+	    rb_nativethread_lock_unlock(&l->lock);
+    }
 }
 
-struct CRYPTO_dynlock_value {
-    rb_nativethread_lock_t lock;
-};
-
 static struct CRYPTO_dynlock_value *
 ossl_dyn_create_callback(const char *file, int line)
 {
-    struct CRYPTO_dynlock_value *dynlock = (struct CRYPTO_dynlock_value *)OPENSSL_malloc((int)sizeof(struct CRYPTO_dynlock_value));
-    rb_nativethread_lock_initialize(&dynlock->lock);
+    /* Do not use xmalloc() here, since it may raise NoMemoryError */
+    struct CRYPTO_dynlock_value *dynlock =
+	OPENSSL_malloc(sizeof(struct CRYPTO_dynlock_value));
+    if (dynlock)
+	ossl_lock_init(dynlock);
     return dynlock;
 }
 
 static void
 ossl_dyn_lock_callback(int mode, struct CRYPTO_dynlock_value *l, const char *file, int line)
 {
-    ossl_lock_unlock(mode, &l->lock);
+    ossl_lock_unlock(mode, l);
 }
 
 static void
@@ -556,41 +576,30 @@ ossl_dyn_destroy_callback(struct CRYPTO_dynlock_value *l, const char *file, int
     OPENSSL_free(l);
 }
 
-#ifdef HAVE_CRYPTO_THREADID_PTR
 static void ossl_threadid_func(CRYPTO_THREADID *id)
 {
     /* register native thread id */
     CRYPTO_THREADID_set_pointer(id, (void *)rb_nativethread_self());
 }
-#else
-static unsigned long ossl_thread_id(void)
+
+static struct CRYPTO_dynlock_value *ossl_locks;
+
+static void
+ossl_lock_callback(int mode, int type, const char *file, int line)
 {
-    /* before OpenSSL 1.0, this is 'unsigned long' */
-    return (unsigned long)rb_nativethread_self();
+    ossl_lock_unlock(mode, &ossl_locks[type]);
 }
-#endif
 
 static void Init_ossl_locks(void)
 {
     int i;
     int num_locks = CRYPTO_num_locks();
 
-    if ((unsigned)num_locks >= INT_MAX / (int)sizeof(VALUE)) {
-	rb_raise(rb_eRuntimeError, "CRYPTO_num_locks() is too big: %d", num_locks);
-    }
-    ossl_locks = (rb_nativethread_lock_t *) OPENSSL_malloc(num_locks * (int)sizeof(rb_nativethread_lock_t));
-    if (!ossl_locks) {
-	rb_raise(rb_eNoMemError, "CRYPTO_num_locks() is too big: %d", num_locks);
-    }
-    for (i = 0; i < num_locks; i++) {
-	rb_nativethread_lock_initialize(&ossl_locks[i]);
-    }
+    ossl_locks = ALLOC_N(struct CRYPTO_dynlock_value, num_locks);
+    for (i = 0; i < num_locks; i++)
+	ossl_lock_init(&ossl_locks[i]);
 
-#ifdef HAVE_CRYPTO_THREADID_PTR
     CRYPTO_THREADID_set_callback(ossl_threadid_func);
-#else
-    CRYPTO_set_id_callback(ossl_thread_id);
-#endif
     CRYPTO_set_locking_callback(ossl_lock_callback);
     CRYPTO_set_dynlock_create_callback(ossl_dyn_create_callback);
     CRYPTO_set_dynlock_lock_callback(ossl_dyn_lock_callback);
@@ -599,22 +608,37 @@ static void Init_ossl_locks(void)
 #endif /* !HAVE_OPENSSL_110_THREADING_API */
 
 /*
- * OpenSSL provides SSL, TLS and general purpose cryptography.  It wraps the
- * OpenSSL[http://www.openssl.org/] library.
- *
- * = Install
- *
- * OpenSSL comes bundled with the Standard Library of Ruby.
+ * call-seq:
+ *   OpenSSL.fixed_length_secure_compare(string, string) -> boolean
  *
- * This means the OpenSSL extension is compiled with Ruby and packaged on
- * build. During compile time, Ruby will need to link against the OpenSSL
- * library on your system. However, you cannot use openssl provided by Apple to
- * build standard library openssl.
+ * Constant time memory comparison for fixed length strings, such as results
+ * of HMAC calculations.
  *
- * If you use OSX, you should install another openssl and run ```./configure
- * --with-openssl-dir=/path/to/another-openssl```. For Homebrew user, run `brew
- * install openssl` and then ```./configure --with-openssl-dir=`brew --prefix
- * openssl` ```.
+ * Returns +true+ if the strings are identical, +false+ if they are of the same
+ * length but not identical. If the length is different, +ArgumentError+ is
+ * raised.
+ */
+static VALUE
+ossl_crypto_fixed_length_secure_compare(VALUE dummy, VALUE str1, VALUE str2)
+{
+    const unsigned char *p1 = (const unsigned char *)StringValuePtr(str1);
+    const unsigned char *p2 = (const unsigned char *)StringValuePtr(str2);
+    long len1 = RSTRING_LEN(str1);
+    long len2 = RSTRING_LEN(str2);
+
+    if (len1 != len2) {
+        ossl_raise(rb_eArgError, "inputs must be of equal length");
+    }
+
+    switch (CRYPTO_memcmp(p1, p2, len1)) {
+        case 0:	return Qtrue;
+        default: return Qfalse;
+    }
+}
+
+/*
+ * OpenSSL provides SSL, TLS and general purpose cryptography.  It wraps the
+ * OpenSSL[https://www.openssl.org/] library.
  *
  * = Examples
  *
@@ -643,7 +667,7 @@ static void Init_ossl_locks(void)
  * ahold of the key may use it unless it is encrypted.  In order to securely
  * export a key you may export it with a pass phrase.
  *
- *   cipher = OpenSSL::Cipher.new 'AES-128-CBC'
+ *   cipher = OpenSSL::Cipher.new 'AES-256-CBC'
  *   pass_phrase = 'my secure pass phrase goes here'
  *
  *   key_secure = key.export cipher, pass_phrase
@@ -660,10 +684,12 @@ static void Init_ossl_locks(void)
  *
  *   key2 = OpenSSL::PKey::RSA.new File.read 'private_key.pem'
  *   key2.public? # => true
+ *   key2.private? # => true
  *
  * or
  *
  *   key3 = OpenSSL::PKey::RSA.new File.read 'public_key.pem'
+ *   key3.public? # => true
  *   key3.private? # => false
  *
  * === Loading an Encrypted Key
@@ -716,16 +742,14 @@ static void Init_ossl_locks(void)
  * To sign a document, a cryptographically secure hash of the document is
  * computed first, which is then signed using the private key.
  *
- *   digest = OpenSSL::Digest::SHA256.new
- *   signature = key.sign digest, document
+ *   signature = key.sign 'SHA256', document
  *
  * To validate the signature, again a hash of the document is computed and
  * the signature is decrypted using the public key. The result is then
  * compared to the hash just computed, if they are equal the signature was
  * valid.
  *
- *   digest = OpenSSL::Digest::SHA256.new
- *   if key.verify digest, signature, document
+ *   if key.verify 'SHA256', signature, document
  *     puts 'Valid'
  *   else
  *     puts 'Invalid'
@@ -751,7 +775,7 @@ static void Init_ossl_locks(void)
  * using PBKDF2. PKCS #5 v2.0 recommends at least 8 bytes for the salt,
  * the number of iterations largely depends on the hardware being used.
  *
- *   cipher = OpenSSL::Cipher.new 'AES-128-CBC'
+ *   cipher = OpenSSL::Cipher.new 'AES-256-CBC'
  *   cipher.encrypt
  *   iv = cipher.random_iv
  *
@@ -759,7 +783,7 @@ static void Init_ossl_locks(void)
  *   salt = OpenSSL::Random.random_bytes 16
  *   iter = 20000
  *   key_len = cipher.key_len
- *   digest = OpenSSL::Digest::SHA256.new
+ *   digest = OpenSSL::Digest.new('SHA256')
  *
  *   key = OpenSSL::PKCS5.pbkdf2_hmac(pwd, salt, iter, key_len, digest)
  *   cipher.key = key
@@ -774,7 +798,7 @@ static void Init_ossl_locks(void)
  * Use the same steps as before to derive the symmetric AES key, this time
  * setting the Cipher up for decryption.
  *
- *   cipher = OpenSSL::Cipher.new 'AES-128-CBC'
+ *   cipher = OpenSSL::Cipher.new 'AES-256-CBC'
  *   cipher.decrypt
  *   cipher.iv = iv # the one generated with #random_iv
  *
@@ -782,7 +806,7 @@ static void Init_ossl_locks(void)
  *   salt = ... # the one generated above
  *   iter = 20000
  *   key_len = cipher.key_len
- *   digest = OpenSSL::Digest::SHA256.new
+ *   digest = OpenSSL::Digest.new('SHA256')
  *
  *   key = OpenSSL::PKCS5.pbkdf2_hmac(pwd, salt, iter, key_len, digest)
  *   cipher.key = key
@@ -809,7 +833,7 @@ static void Init_ossl_locks(void)
  *
  * First set up the cipher for encryption
  *
- *   encryptor = OpenSSL::Cipher.new 'AES-128-CBC'
+ *   encryptor = OpenSSL::Cipher.new 'AES-256-CBC'
  *   encryptor.encrypt
  *   encryptor.pkcs5_keyivgen pass_phrase, salt
  *
@@ -822,7 +846,7 @@ static void Init_ossl_locks(void)
  *
  * Use a new Cipher instance set up for decryption
  *
- *   decryptor = OpenSSL::Cipher.new 'AES-128-CBC'
+ *   decryptor = OpenSSL::Cipher.new 'AES-256-CBC'
  *   decryptor.decrypt
  *   decryptor.pkcs5_keyivgen pass_phrase, salt
  *
@@ -839,7 +863,7 @@ static void Init_ossl_locks(void)
  * signature.
  *
  *   key = OpenSSL::PKey::RSA.new 2048
- *   name = OpenSSL::X509::Name.parse 'CN=nobody/DC=example'
+ *   name = OpenSSL::X509::Name.parse '/CN=nobody/DC=example'
  *
  *   cert = OpenSSL::X509::Certificate.new
  *   cert.version = 2
@@ -878,7 +902,7 @@ static void Init_ossl_locks(void)
  * certificate.
  *
  *   cert.issuer = name
- *   cert.sign key, OpenSSL::Digest::SHA1.new
+ *   cert.sign key, OpenSSL::Digest.new('SHA1')
  *
  *   open 'certificate.pem', 'w' do |io| io.write cert.to_pem end
  *
@@ -910,7 +934,7 @@ static void Init_ossl_locks(void)
  *   ca_key = OpenSSL::PKey::RSA.new 2048
  *   pass_phrase = 'my secure pass phrase goes here'
  *
- *   cipher = OpenSSL::Cipher::Cipher.new 'AES-128-CBC'
+ *   cipher = OpenSSL::Cipher.new 'AES-256-CBC'
  *
  *   open 'ca_key.pem', 'w', 0400 do |io|
  *     io.write ca_key.export(cipher, pass_phrase)
@@ -921,7 +945,7 @@ static void Init_ossl_locks(void)
  * A CA certificate is created the same way we created a certificate above, but
  * with different extensions.
  *
- *   ca_name = OpenSSL::X509::Name.parse 'CN=ca/DC=example'
+ *   ca_name = OpenSSL::X509::Name.parse '/CN=ca/DC=example'
  *
  *   ca_cert = OpenSSL::X509::Certificate.new
  *   ca_cert.serial = 0
@@ -954,7 +978,7 @@ static void Init_ossl_locks(void)
  *
  * Root CA certificates are self-signed.
  *
- *   ca_cert.sign ca_key, OpenSSL::Digest::SHA1.new
+ *   ca_cert.sign ca_key, OpenSSL::Digest.new('SHA1')
  *
  * The CA certificate is saved to disk so it may be distributed to all the
  * users of the keys this CA will sign.
@@ -972,7 +996,7 @@ static void Init_ossl_locks(void)
  *   csr.version = 0
  *   csr.subject = name
  *   csr.public_key = key.public_key
- *   csr.sign key, OpenSSL::Digest::SHA1.new
+ *   csr.sign key, OpenSSL::Digest.new('SHA1')
  *
  * A CSR is saved to disk and sent to the CA for signing.
  *
@@ -1016,7 +1040,7 @@ static void Init_ossl_locks(void)
  *   csr_cert.add_extension \
  *     extension_factory.create_extension('subjectKeyIdentifier', 'hash')
  *
- *   csr_cert.sign ca_key, OpenSSL::Digest::SHA1.new
+ *   csr_cert.sign ca_key, OpenSSL::Digest.new('SHA1')
  *
  *   open 'csr_cert.pem', 'w' do |io|
  *     io.write csr_cert.to_pem
@@ -1063,15 +1087,21 @@ static void Init_ossl_locks(void)
  * SSLSocket#connect must be called to initiate the SSL handshake and start
  * encryption.  A key and certificate are not required for the client socket.
  *
+ * Note that SSLSocket#close doesn't close the underlying socket by default. Set
+ * SSLSocket#sync_close to true if you want.
+ *
  *   require 'socket'
  *
  *   tcp_socket = TCPSocket.new 'localhost', 5000
  *   ssl_client = OpenSSL::SSL::SSLSocket.new tcp_socket, context
+ *   ssl_client.sync_close = true
  *   ssl_client.connect
  *
  *   ssl_client.puts "hello server!"
  *   puts ssl_client.gets
  *
+ *   ssl_client.close # shutdown the TLS connection and close tcp_socket
+ *
  * === Peer Verification
  *
  * An unverified SSL connection does not provide much security.  For enhanced
@@ -1099,6 +1129,11 @@ static void Init_ossl_locks(void)
 void
 Init_openssl(void)
 {
+#if HAVE_RB_EXT_RACTOR_SAFE
+    rb_ext_ractor_safe(true);
+#endif
+
+#undef rb_intern
     /*
      * Init timezone info
      */
@@ -1109,25 +1144,14 @@ Init_openssl(void)
     /*
      * Init all digests, ciphers
      */
-    /* CRYPTO_malloc_init(); */
-    /* ENGINE_load_builtin_engines(); */
+#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000
+    if (!OPENSSL_init_ssl(0, NULL))
+        rb_raise(rb_eRuntimeError, "OPENSSL_init_ssl");
+#else
     OpenSSL_add_ssl_algorithms();
     OpenSSL_add_all_algorithms();
     ERR_load_crypto_strings();
     SSL_load_error_strings();
-
-    /*
-     * FIXME:
-     * On unload do:
-     */
-#if 0
-    CONF_modules_unload(1);
-    destroy_ui_method();
-    EVP_cleanup();
-    ENGINE_cleanup();
-    CRYPTO_cleanup_all_ex_data();
-    ERR_remove_state(0);
-    ERR_free_strings();
 #endif
 
     /*
@@ -1135,11 +1159,7 @@ Init_openssl(void)
      */
     mOSSL = rb_define_module("OpenSSL");
     rb_global_variable(&mOSSL);
-
-    /*
-     * OpenSSL ruby extension version
-     */
-    rb_define_const(mOSSL, "VERSION", rb_str_new2(OSSL_VERSION));
+    rb_define_singleton_method(mOSSL, "fixed_length_secure_compare", ossl_crypto_fixed_length_secure_compare, 2);
 
     /*
      * Version of OpenSSL the ruby OpenSSL extension was built with
@@ -1149,7 +1169,11 @@ Init_openssl(void)
     /*
      * Version of OpenSSL the ruby OpenSSL extension is running with
      */
+#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000
+    rb_define_const(mOSSL, "OPENSSL_LIBRARY_VERSION", rb_str_new2(OpenSSL_version(OPENSSL_VERSION)));
+#else
     rb_define_const(mOSSL, "OPENSSL_LIBRARY_VERSION", rb_str_new2(SSLeay_version(SSLEAY_VERSION)));
+#endif
 
     /*
      * Version number of OpenSSL the ruby OpenSSL extension was built with
@@ -1158,13 +1182,17 @@ Init_openssl(void)
     rb_define_const(mOSSL, "OPENSSL_VERSION_NUMBER", INT2NUM(OPENSSL_VERSION_NUMBER));
 
     /*
-     * Boolean indicating whether OpenSSL is FIPS-enabled or not
+     * Boolean indicating whether OpenSSL is FIPS-capable or not
      */
+    rb_define_const(mOSSL, "OPENSSL_FIPS",
 #ifdef OPENSSL_FIPS
-    rb_define_const(mOSSL, "OPENSSL_FIPS", Qtrue);
+		    Qtrue
 #else
-    rb_define_const(mOSSL, "OPENSSL_FIPS", Qfalse);
+		    Qfalse
 #endif
+		   );
+
+    rb_define_module_function(mOSSL, "fips_mode", ossl_fips_mode_get, 0);
     rb_define_module_function(mOSSL, "fips_mode=", ossl_fips_mode_set, 1);
 
     /*
@@ -1185,14 +1213,6 @@ Init_openssl(void)
     rb_define_module_function(mOSSL, "errors", ossl_get_errors, 0);
 
     /*
-     * Verify callback Proc index for ext-data
-     */
-    if ((ossl_store_ctx_ex_verify_cb_idx = X509_STORE_CTX_get_ex_new_index(0, (void *)"ossl_store_ctx_ex_verify_cb_idx", 0, 0, 0)) < 0)
-        ossl_raise(eOSSLError, "X509_STORE_CTX_get_ex_new_index");
-    if ((ossl_store_ex_verify_cb_idx = X509_STORE_get_ex_new_index(0, (void *)"ossl_store_ex_verify_cb_idx", 0, 0, 0)) < 0)
-        ossl_raise(eOSSLError, "X509_STORE_get_ex_new_index");
-
-    /*
      * Get ID of to_der
      */
     ossl_s_to_der = rb_intern("to_der");
@@ -1212,23 +1232,51 @@ Init_openssl(void)
     Init_ossl_ns_spki();
     Init_ossl_pkcs12();
     Init_ossl_pkcs7();
-    Init_ossl_pkcs5();
     Init_ossl_pkey();
     Init_ossl_rand();
     Init_ossl_ssl();
+#ifndef OPENSSL_NO_TS
+    Init_ossl_ts();
+#endif
     Init_ossl_x509();
     Init_ossl_ocsp();
     Init_ossl_engine();
     Init_ossl_asn1();
-}
+    Init_ossl_kdf();
 
 #if defined(OSSL_DEBUG)
-/*
- * Check if all symbols are OK with 'make LDSHARED=gcc all'
- */
-int
-main(int argc, char *argv[])
-{
-    return 0;
+    /*
+     * For debugging Ruby/OpenSSL. Enable only when built with --enable-debug
+     */
+#if !defined(LIBRESSL_VERSION_NUMBER) && \
+    (OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(OPENSSL_NO_CRYPTO_MDEBUG) || \
+     defined(CRYPTO_malloc_debug_init))
+    rb_define_module_function(mOSSL, "mem_check_start", mem_check_start, 0);
+    rb_define_module_function(mOSSL, "print_mem_leaks", print_mem_leaks, 0);
+
+#if defined(CRYPTO_malloc_debug_init) /* <= 1.0.2 */
+    CRYPTO_malloc_debug_init();
+#endif
+
+#if defined(V_CRYPTO_MDEBUG_ALL) /* <= 1.0.2 */
+    CRYPTO_set_mem_debug_options(V_CRYPTO_MDEBUG_ALL);
+#endif
+
+#if OPENSSL_VERSION_NUMBER < 0x10100000 /* <= 1.0.2 */
+    {
+	int i;
+	/*
+	 * See crypto/ex_data.c; call def_get_class() immediately to avoid
+	 * allocations. 15 is the maximum number that is used as the class index
+	 * in OpenSSL 1.0.2.
+	 */
+	for (i = 0; i <= 15; i++) {
+	    if (CRYPTO_get_ex_new_index(i, 0, (void *)"ossl-mdebug-dummy", 0, 0, 0) < 0)
+		rb_raise(rb_eRuntimeError, "CRYPTO_get_ex_new_index for "
+			 "class index %d failed", i);
+	}
+    }
+#endif
+#endif
+#endif
 }
-#endif /* OSSL_DEBUG */
diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h
index 2317fa8b5e..c20f506bda 100644
--- a/ext/openssl/ossl.h
+++ b/ext/openssl/ossl.h
@@ -12,37 +12,12 @@
 
 #include RUBY_EXTCONF_H
 
-#if 0
-  mOSSL = rb_define_module("OpenSSL");
-  mX509 = rb_define_module_under(mOSSL, "X509");
-#endif
-
-/*
-* OpenSSL has defined RFILE and Ruby has defined RFILE - so undef it!
-*/
-#if defined(RFILE) /*&& !defined(OSSL_DEBUG)*/
-#  undef RFILE
-#endif
+#include <assert.h>
 #include <ruby.h>
+#include <errno.h>
 #include <ruby/io.h>
 #include <ruby/thread.h>
-
 #include <openssl/opensslv.h>
-
-#ifdef HAVE_ASSERT_H
-#  include <assert.h>
-#else
-#  define assert(condition)
-#endif
-
-#if defined(_WIN32) && !defined(LIBRESSL_VERSION_NUMBER)
-#  include <openssl/e_os2.h>
-#  if !defined(OPENSSL_SYS_WIN32)
-#    define OPENSSL_SYS_WIN32 1
-#  endif
-#  include <winsock2.h>
-#endif
-#include <errno.h>
 #include <openssl/err.h>
 #include <openssl/asn1.h>
 #include <openssl/x509v3.h>
@@ -52,16 +27,21 @@
 #include <openssl/hmac.h>
 #include <openssl/rand.h>
 #include <openssl/conf.h>
-#include <openssl/conf_api.h>
-#if !defined(_WIN32)
-#  include <openssl/crypto.h>
+#ifndef OPENSSL_NO_TS
+  #include <openssl/ts.h>
 #endif
+#include <openssl/crypto.h>
 #if !defined(OPENSSL_NO_ENGINE)
 #  include <openssl/engine.h>
 #endif
 #if !defined(OPENSSL_NO_OCSP)
 #  include <openssl/ocsp.h>
 #endif
+#include <openssl/bn.h>
+#include <openssl/rsa.h>
+#include <openssl/dsa.h>
+#include <openssl/evp.h>
+#include <openssl/dh.h>
 
 /*
  * Common Module
@@ -83,41 +63,40 @@ extern VALUE eOSSLError;
   }\
 } while (0)
 
-#define OSSL_Check_Instance(obj, klass) do {\
-  if (!rb_obj_is_instance_of((obj), (klass))) {\
-    ossl_raise(rb_eTypeError, "wrong argument (%"PRIsVALUE")! (Expected instance of %"PRIsVALUE")",\
-               rb_obj_class(obj), (klass));\
-  }\
-} while (0)
-
-#define OSSL_Check_Same_Class(obj1, obj2) do {\
-  if (!rb_obj_is_instance_of((obj1), rb_obj_class(obj2))) {\
-    ossl_raise(rb_eTypeError, "wrong argument type");\
-  }\
-} while (0)
-
 /*
- * String to HEXString conversion
+ * Type conversions
  */
-int string2hex(const unsigned char *, int, char **, int *);
+#if !defined(NUM2UINT64T) /* in case Ruby starts to provide */
+#  if SIZEOF_LONG == 8
+#    define NUM2UINT64T(x) ((uint64_t)NUM2ULONG(x))
+#  elif defined(HAVE_LONG_LONG) && SIZEOF_LONG_LONG == 8
+#    define NUM2UINT64T(x) ((uint64_t)NUM2ULL(x))
+#  else
+#    error "unknown platform; no 64-bit width integer"
+#  endif
+#endif
 
 /*
  * Data Conversion
  */
-STACK_OF(X509) *ossl_x509_ary2sk0(VALUE);
 STACK_OF(X509) *ossl_x509_ary2sk(VALUE);
 STACK_OF(X509) *ossl_protect_x509_ary2sk(VALUE,int*);
-VALUE ossl_x509_sk2ary(STACK_OF(X509) *certs);
-VALUE ossl_x509crl_sk2ary(STACK_OF(X509_CRL) *crl);
-VALUE ossl_x509name_sk2ary(STACK_OF(X509_NAME) *names);
+VALUE ossl_x509_sk2ary(const STACK_OF(X509) *certs);
+VALUE ossl_x509crl_sk2ary(const STACK_OF(X509_CRL) *crl);
+VALUE ossl_x509name_sk2ary(const STACK_OF(X509_NAME) *names);
 VALUE ossl_buf2str(char *buf, int len);
+VALUE ossl_str_new(const char *, long, int *);
 #define ossl_str_adjust(str, p) \
 do{\
-    long len = RSTRING_LEN(str);\
     long newlen = (long)((p) - (unsigned char*)RSTRING_PTR(str));\
-    assert(newlen <= len);\
+    assert(newlen <= RSTRING_LEN(str));\
     rb_str_set_len((str), newlen);\
 }while(0)
+/*
+ * Convert binary string to hex string. The caller is responsible for
+ * ensuring out has (2 * len) bytes of capacity.
+ */
+void ossl_bin2hex(unsigned char *in, char *out, size_t len);
 
 /*
  * Our default PEM callback
@@ -142,31 +121,13 @@ int ossl_pem_passwd_cb(char *, int, int, void *);
 /*
  * ERRor messages
  */
-#define OSSL_ErrMsg() ERR_reason_error_string(ERR_get_error())
 NORETURN(void ossl_raise(VALUE, const char *, ...));
-VALUE ossl_exc_new(VALUE, const char *, ...);
 /* Clear OpenSSL error queue. If dOSSL is set, rb_warn() them. */
 void ossl_clear_error(void);
 
 /*
- * Verify callback
- */
-extern int ossl_store_ctx_ex_verify_cb_idx;
-extern int ossl_store_ex_verify_cb_idx;
-
-struct ossl_verify_cb_args {
-    VALUE proc;
-    VALUE preverify_ok;
-    VALUE store_ctx;
-};
-
-VALUE ossl_call_verify_cb_proc(struct ossl_verify_cb_args *);
-int ossl_verify_cb(int, X509_STORE_CTX *);
-
-/*
  * String to DER String
  */
-extern ID ossl_s_to_der;
 VALUE ossl_to_der(VALUE);
 VALUE ossl_to_der_if_possible(VALUE);
 
@@ -184,20 +145,9 @@ extern VALUE dOSSL;
   } \
 } while (0)
 
-#define OSSL_Warning(fmt, ...) do { \
-  OSSL_Debug((fmt), ##__VA_ARGS__); \
-  rb_warning((fmt), ##__VA_ARGS__); \
-} while (0)
-
-#define OSSL_Warn(fmt, ...) do { \
-  OSSL_Debug((fmt), ##__VA_ARGS__); \
-  rb_warn((fmt), ##__VA_ARGS__); \
-} while (0)
 #else
 void ossl_debug(const char *, ...);
 #define OSSL_Debug ossl_debug
-#define OSSL_Warning rb_warning
-#define OSSL_Warn rb_warn
 #endif
 
 /*
@@ -216,13 +166,15 @@ void ossl_debug(const char *, ...);
 #include "ossl_ocsp.h"
 #include "ossl_pkcs12.h"
 #include "ossl_pkcs7.h"
-#include "ossl_pkcs5.h"
 #include "ossl_pkey.h"
 #include "ossl_rand.h"
 #include "ossl_ssl.h"
-#include "ossl_version.h"
+#ifndef OPENSSL_NO_TS
+  #include "ossl_ts.h"
+#endif
 #include "ossl_x509.h"
 #include "ossl_engine.h"
+#include "ossl_kdf.h"
 
 void Init_openssl(void);
 
diff --git a/ext/openssl/ossl_asn1.c b/ext/openssl/ossl_asn1.c
index cbedd59efa..9eb1826f02 100644
--- a/ext/openssl/ossl_asn1.c
+++ b/ext/openssl/ossl_asn1.c
@@ -9,32 +9,20 @@
  */
 #include "ossl.h"
 
-#if defined(HAVE_SYS_TIME_H)
-#  include <sys/time.h>
-#elif !defined(NT) && !defined(_WIN32)
-struct timeval {
-    long tv_sec;	/* seconds */
-    long tv_usec;	/* and microseconds */
-};
-#endif
-
-static VALUE join_der(VALUE enumerable);
 static VALUE ossl_asn1_decode0(unsigned char **pp, long length, long *offset,
 			       int depth, int yield, long *num_read);
 static VALUE ossl_asn1_initialize(int argc, VALUE *argv, VALUE self);
-static VALUE ossl_asn1eoc_initialize(VALUE self);
 
 /*
  * DATE conversion
  */
 VALUE
-asn1time_to_time(ASN1_TIME *time)
+asn1time_to_time(const ASN1_TIME *time)
 {
     struct tm tm;
     VALUE argv[6];
     int count;
 
-    if (!time || !time->data) return Qnil;
     memset(&tm, 0, sizeof(struct tm));
 
     switch (time->type) {
@@ -56,9 +44,15 @@ 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,
-    		&tm.tm_mday, &tm.tm_hour, &tm.tm_min, &tm.tm_sec) != 6) {
-	    ossl_raise(rb_eTypeError, "bad GENERALIZEDTIME format" );
+	count = sscanf((const char *)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);
+	if (count == 5) {
+		tm.tm_sec = 0;
+	}
+	else if (count != 6) {
+		ossl_raise(rb_eTypeError, "bad GENERALIZEDTIME format: \"%s\"",
+			time->data);
 	}
 	break;
     default:
@@ -75,7 +69,6 @@ asn1time_to_time(ASN1_TIME *time)
     return rb_funcall2(rb_cTime, rb_intern("utc"), 6, argv);
 }
 
-#if defined(HAVE_ASN1_TIME_ADJ)
 void
 ossl_time_split(VALUE time, time_t *sec, int *days)
 {
@@ -91,84 +84,42 @@ ossl_time_split(VALUE time, time_t *sec, int *days)
 	*sec = NUM2TIMET(rb_funcall(num, rb_intern("%"), 1, INT2FIX(86400)));
     }
 }
-#else
-time_t
-time_to_time_t(VALUE time)
-{
-    return (time_t)NUM2TIMET(rb_Integer(time));
-}
-#endif
 
 /*
  * STRING conversion
  */
 VALUE
-asn1str_to_str(ASN1_STRING *str)
+asn1str_to_str(const ASN1_STRING *str)
 {
     return rb_str_new((const char *)str->data, str->length);
 }
 
 /*
  * ASN1_INTEGER conversions
- * TODO: Make a decision what's the right way to do this.
  */
-#define DO_IT_VIA_RUBY 0
 VALUE
-asn1integer_to_num(ASN1_INTEGER *ai)
+asn1integer_to_num(const ASN1_INTEGER *ai)
 {
     BIGNUM *bn;
-#if DO_IT_VIA_RUBY
-    char *txt;
-#endif
     VALUE num;
 
     if (!ai) {
 	ossl_raise(rb_eTypeError, "ASN1_INTEGER is NULL!");
     }
     if (ai->type == V_ASN1_ENUMERATED)
-	bn = ASN1_ENUMERATED_to_BN(ai, NULL);
+	/* const_cast: workaround for old OpenSSL */
+	bn = ASN1_ENUMERATED_to_BN((ASN1_ENUMERATED *)ai, NULL);
     else
 	bn = ASN1_INTEGER_to_BN(ai, NULL);
 
     if (!bn)
 	ossl_raise(eOSSLError, NULL);
-#if DO_IT_VIA_RUBY
-    if (!(txt = BN_bn2dec(bn))) {
-	BN_free(bn);
-	ossl_raise(eOSSLError, NULL);
-    }
-    num = rb_cstr_to_inum(txt, 10, Qtrue);
-    OPENSSL_free(txt);
-#else
     num = ossl_bn_new(bn);
-#endif
     BN_free(bn);
 
     return num;
 }
 
-#if DO_IT_VIA_RUBY
-ASN1_INTEGER *
-num_to_asn1integer(VALUE obj, ASN1_INTEGER *ai)
-{
-    BIGNUM *bn = NULL;
-
-    if (RTEST(rb_obj_is_kind_of(obj, cBN))) {
-	bn = GetBNPtr(obj);
-    } else {
-	obj = rb_String(obj);
-	if (!BN_dec2bn(&bn, StringValueCStr(obj))) {
-	    ossl_raise(eOSSLError, NULL);
-	}
-    }
-    if (!(ai = BN_to_ASN1_INTEGER(bn, ai))) {
-	BN_free(bn);
-	ossl_raise(eOSSLError, NULL);
-    }
-    BN_free(bn);
-    return ai;
-}
-#else
 ASN1_INTEGER *
 num_to_asn1integer(VALUE obj, ASN1_INTEGER *ai)
 {
@@ -184,7 +135,6 @@ num_to_asn1integer(VALUE obj, ASN1_INTEGER *ai)
 
     return ai;
 }
-#endif
 
 /********/
 /*
@@ -194,13 +144,13 @@ num_to_asn1integer(VALUE obj, ASN1_INTEGER *ai)
 #define ossl_asn1_get_tag(o)             rb_attr_get((o),sivTAG)
 #define ossl_asn1_get_tagging(o)         rb_attr_get((o),sivTAGGING)
 #define ossl_asn1_get_tag_class(o)       rb_attr_get((o),sivTAG_CLASS)
-#define ossl_asn1_get_infinite_length(o) rb_attr_get((o),sivINFINITE_LENGTH)
+#define ossl_asn1_get_indefinite_length(o) rb_attr_get((o),sivINDEFINITE_LENGTH)
 
 #define ossl_asn1_set_value(o,v)           rb_ivar_set((o),sivVALUE,(v))
 #define ossl_asn1_set_tag(o,v)             rb_ivar_set((o),sivTAG,(v))
 #define ossl_asn1_set_tagging(o,v)         rb_ivar_set((o),sivTAGGING,(v))
 #define ossl_asn1_set_tag_class(o,v)       rb_ivar_set((o),sivTAG_CLASS,(v))
-#define ossl_asn1_set_infinite_length(o,v) rb_ivar_set((o),sivINFINITE_LENGTH,(v))
+#define ossl_asn1_set_indefinite_length(o,v) rb_ivar_set((o),sivINDEFINITE_LENGTH,(v))
 
 VALUE mASN1;
 VALUE eASN1Error;
@@ -224,9 +174,10 @@ VALUE cASN1ObjectId;                          /* OBJECT IDENTIFIER */
 VALUE cASN1UTCTime, cASN1GeneralizedTime;     /* TIME              */
 VALUE cASN1Sequence, cASN1Set;                /* CONSTRUCTIVE      */
 
-static ID sIMPLICIT, sEXPLICIT;
-static ID sUNIVERSAL, sAPPLICATION, sCONTEXT_SPECIFIC, sPRIVATE;
-static ID sivVALUE, sivTAG, sivTAG_CLASS, sivTAGGING, sivINFINITE_LENGTH, sivUNUSED_BITS;
+static VALUE sym_IMPLICIT, sym_EXPLICIT;
+static VALUE sym_UNIVERSAL, sym_APPLICATION, sym_CONTEXT_SPECIFIC, sym_PRIVATE;
+static ID sivVALUE, sivTAG, sivTAG_CLASS, sivTAGGING, sivINDEFINITE_LENGTH, sivUNUSED_BITS;
+static ID id_each;
 
 /*
  * Ruby to ASN1 converters
@@ -251,13 +202,15 @@ obj_to_asn1bstr(VALUE obj, long unused_bits)
 {
     ASN1_BIT_STRING *bstr;
 
-    if(unused_bits < 0) unused_bits = 0;
+    if (unused_bits < 0 || unused_bits > 7)
+	ossl_raise(eASN1Error, "unused_bits for a bitstring value must be in "\
+		   "the range 0 to 7");
     StringValue(obj);
     if(!(bstr = ASN1_BIT_STRING_new()))
 	ossl_raise(eASN1Error, NULL);
     ASN1_BIT_STRING_set(bstr, (unsigned char *)RSTRING_PTR(obj), RSTRING_LENINT(obj));
     bstr->flags &= ~(ASN1_STRING_FLAG_BITS_LEFT|0x07); /* clear */
-    bstr->flags |= ASN1_STRING_FLAG_BITS_LEFT|(unused_bits&0x07);
+    bstr->flags |= ASN1_STRING_FLAG_BITS_LEFT | unused_bits;
 
     return bstr;
 }
@@ -307,15 +260,10 @@ obj_to_asn1utime(VALUE time)
     time_t sec;
     ASN1_UTCTIME *t;
 
-#if defined(HAVE_ASN1_TIME_ADJ)
     int off_days;
 
     ossl_time_split(time, &sec, &off_days);
     if (!(t = ASN1_UTCTIME_adj(NULL, sec, off_days, 0)))
-#else
-    sec = time_to_time_t(time);
-    if (!(t = ASN1_UTCTIME_set(NULL, sec)))
-#endif
 	ossl_raise(eASN1Error, NULL);
 
     return t;
@@ -327,15 +275,10 @@ obj_to_asn1gtime(VALUE time)
     time_t sec;
     ASN1_GENERALIZEDTIME *t;
 
-#if defined(HAVE_ASN1_TIME_ADJ)
     int off_days;
 
     ossl_time_split(time, &sec, &off_days);
     if (!(t = ASN1_GENERALIZEDTIME_adj(NULL, sec, off_days, 0)))
-#else
-    sec = time_to_time_t(time);
-    if (!(t = ASN1_GENERALIZEDTIME_set(NULL, sec)))
-#endif
 	ossl_raise(eASN1Error, NULL);
 
     return t;
@@ -363,13 +306,12 @@ decode_bool(unsigned char* der, long length)
 {
     const unsigned char *p = der;
 
-    assert(length == 3);
-    if (*p++ != 1)
-	ossl_raise(eASN1Error, "not a boolean");
-    if (*p++ != 1)
-	ossl_raise(eASN1Error, "length is not 1");
+    if (length != 3)
+	ossl_raise(eASN1Error, "invalid length for BOOLEAN");
+    if (p[0] != 1 || p[1] != 1)
+	ossl_raise(eASN1Error, "invalid BOOLEAN");
 
-    return *p ? Qtrue : Qfalse;
+    return p[2] ? Qtrue : Qfalse;
 }
 
 static VALUE
@@ -383,7 +325,7 @@ decode_int(unsigned char* der, long length)
     p = der;
     if(!(ai = d2i_ASN1_INTEGER(NULL, &p, length)))
 	ossl_raise(eASN1Error, NULL);
-    ret = rb_protect((VALUE(*)_((VALUE)))asn1integer_to_num,
+    ret = rb_protect((VALUE (*)(VALUE))asn1integer_to_num,
 		     (VALUE)ai, &status);
     ASN1_INTEGER_free(ai);
     if(status) rb_jump_tag(status);
@@ -423,7 +365,7 @@ decode_enum(unsigned char* der, long length)
     p = der;
     if(!(ai = d2i_ASN1_ENUMERATED(NULL, &p, length)))
 	ossl_raise(eASN1Error, NULL);
-    ret = rb_protect((VALUE(*)_((VALUE)))asn1integer_to_num,
+    ret = rb_protect((VALUE (*)(VALUE))asn1integer_to_num,
 		     (VALUE)ai, &status);
     ASN1_ENUMERATED_free(ai);
     if(status) rb_jump_tag(status);
@@ -485,7 +427,7 @@ decode_time(unsigned char* der, long length)
     p = der;
     if(!(time = d2i_ASN1_TIME(NULL, &p, length)))
 	ossl_raise(eASN1Error, NULL);
-    ret = rb_protect((VALUE(*)_((VALUE)))asn1time_to_time,
+    ret = rb_protect((VALUE (*)(VALUE))asn1time_to_time,
 		     (VALUE)time, &status);
     ASN1_TIME_free(time);
     if(status) rb_jump_tag(status);
@@ -556,7 +498,7 @@ ossl_asn1_get_asn1type(VALUE obj)
     VALUE value, rflag;
     void *ptr;
     void (*free_func)();
-    int tag, flag;
+    int tag;
 
     tag = ossl_asn1_default_tag(obj);
     value = ossl_asn1_get_value(obj);
@@ -572,8 +514,7 @@ ossl_asn1_get_asn1type(VALUE obj)
 	break;
     case V_ASN1_BIT_STRING:
         rflag = rb_attr_get(obj, sivUNUSED_BITS);
-        flag = NIL_P(rflag) ? -1 : NUM2INT(rflag);
-	ptr = obj_to_asn1bstr(value, flag);
+	ptr = obj_to_asn1bstr(value, NUM2INT(rflag));
 	free_func = ASN1_BIT_STRING_free;
 	break;
     case V_ASN1_NULL:
@@ -631,17 +572,14 @@ ossl_asn1_default_tag(VALUE obj)
     VALUE tmp_class, tag;
 
     tmp_class = CLASS_OF(obj);
-    while (tmp_class) {
+    while (!NIL_P(tmp_class)) {
 	tag = rb_hash_lookup(class_tag_map, tmp_class);
-	if (tag != Qnil) {
-       	    return NUM2INT(tag);
-      	}
-    	tmp_class = rb_class_superclass(tmp_class);
+	if (tag != Qnil)
+	    return NUM2INT(tag);
+	tmp_class = rb_class_superclass(tmp_class);
     }
-    ossl_raise(eASN1Error, "universal tag for %"PRIsVALUE" not found",
-	       rb_obj_class(obj));
 
-    return -1; /* dummy */
+    return -1;
 }
 
 static int
@@ -657,74 +595,46 @@ ossl_asn1_tag(VALUE obj)
 }
 
 static int
-ossl_asn1_is_explicit(VALUE obj)
-{
-    VALUE s;
-    int ret = -1;
-
-    s = ossl_asn1_get_tagging(obj);
-    if(NIL_P(s)) return 0;
-    else if(SYMBOL_P(s)){
-	if (SYM2ID(s) == sIMPLICIT)
-	    ret = 0;
-	else if (SYM2ID(s) == sEXPLICIT)
-	    ret = 1;
-    }
-    if(ret < 0){
-	ossl_raise(eASN1Error, "invalid tag default");
-    }
-
-    return ret;
-}
-
-static int
 ossl_asn1_tag_class(VALUE obj)
 {
     VALUE s;
-    int ret = -1;
 
     s = ossl_asn1_get_tag_class(obj);
-    if(NIL_P(s)) ret = V_ASN1_UNIVERSAL;
-    else if(SYMBOL_P(s)){
-	if (SYM2ID(s) == sUNIVERSAL)
-	    ret = V_ASN1_UNIVERSAL;
-	else if (SYM2ID(s) == sAPPLICATION)
-	    ret = V_ASN1_APPLICATION;
-	else if (SYM2ID(s) == sCONTEXT_SPECIFIC)
-	    ret = V_ASN1_CONTEXT_SPECIFIC;
-	else if (SYM2ID(s) == sPRIVATE)
-	    ret = V_ASN1_PRIVATE;
-    }
-    if(ret < 0){
+    if (NIL_P(s) || s == sym_UNIVERSAL)
+	return V_ASN1_UNIVERSAL;
+    else if (s == sym_APPLICATION)
+	return V_ASN1_APPLICATION;
+    else if (s == sym_CONTEXT_SPECIFIC)
+	return V_ASN1_CONTEXT_SPECIFIC;
+    else if (s == sym_PRIVATE)
+	return V_ASN1_PRIVATE;
+    else
 	ossl_raise(eASN1Error, "invalid tag class");
-    }
-
-    return ret;
 }
 
 static VALUE
 ossl_asn1_class2sym(int tc)
 {
     if((tc & V_ASN1_PRIVATE) == V_ASN1_PRIVATE)
-	return ID2SYM(sPRIVATE);
+	return sym_PRIVATE;
     else if((tc & V_ASN1_CONTEXT_SPECIFIC) == V_ASN1_CONTEXT_SPECIFIC)
-	return ID2SYM(sCONTEXT_SPECIFIC);
+	return sym_CONTEXT_SPECIFIC;
     else if((tc & V_ASN1_APPLICATION) == V_ASN1_APPLICATION)
-	return ID2SYM(sAPPLICATION);
+	return sym_APPLICATION;
     else
-	return ID2SYM(sUNIVERSAL);
+	return sym_UNIVERSAL;
 }
 
 /*
  * call-seq:
  *    OpenSSL::ASN1::ASN1Data.new(value, tag, tag_class) => ASN1Data
  *
- * +value+: Please have a look at Constructive and Primitive to see how Ruby
+ * _value_: Please have a look at Constructive and Primitive to see how Ruby
  * types are mapped to ASN.1 types and vice versa.
  *
- * +tag+: A +Number+ indicating the tag number.
+ * _tag_: An Integer indicating the tag number.
  *
- * +tag_class+: A +Symbol+ indicating the tag class. Please cf. ASN1 for
+ * _tag_class_: A Symbol indicating the tag class. Please cf. ASN1 for
  * possible values.
  *
  * == Example
@@ -736,73 +646,85 @@ ossl_asn1data_initialize(VALUE self, VALUE value, VALUE tag, VALUE tag_class)
 {
     if(!SYMBOL_P(tag_class))
 	ossl_raise(eASN1Error, "invalid tag class");
-    if((SYM2ID(tag_class) == sUNIVERSAL) && NUM2INT(tag) > 31)
-	ossl_raise(eASN1Error, "tag number for Universal too large");
     ossl_asn1_set_tag(self, tag);
     ossl_asn1_set_value(self, value);
     ossl_asn1_set_tag_class(self, tag_class);
-    ossl_asn1_set_infinite_length(self, Qfalse);
+    ossl_asn1_set_indefinite_length(self, Qfalse);
 
     return self;
 }
 
 static VALUE
-join_der_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, str))
+to_der_internal(VALUE self, int constructed, int indef_len, VALUE body)
 {
-    i = ossl_to_der_if_possible(i);
-    StringValue(i);
-    rb_str_append(str, i);
-    return Qnil;
-}
+    int encoding = constructed ? indef_len ? 2 : 1 : 0;
+    int tag_class = ossl_asn1_tag_class(self);
+    int tag_number = ossl_asn1_tag(self);
+    int default_tag_number = ossl_asn1_default_tag(self);
+    int body_length, total_length;
+    VALUE str;
+    unsigned char *p;
 
-static VALUE
-join_der(VALUE enumerable)
-{
-    VALUE str = rb_str_new(0, 0);
-    rb_block_call(enumerable, rb_intern("each"), 0, 0, join_der_i, str);
+    body_length = RSTRING_LENINT(body);
+    if (ossl_asn1_get_tagging(self) == sym_EXPLICIT) {
+	int inner_length, e_encoding = indef_len ? 2 : 1;
+
+	if (default_tag_number == -1)
+	    ossl_raise(eASN1Error, "explicit tagging of unknown tag");
+
+	inner_length = ASN1_object_size(encoding, body_length, default_tag_number);
+	total_length = ASN1_object_size(e_encoding, inner_length, tag_number);
+	str = rb_str_new(NULL, total_length);
+	p = (unsigned char *)RSTRING_PTR(str);
+	/* Put explicit tag */
+	ASN1_put_object(&p, e_encoding, inner_length, tag_number, tag_class);
+	/* Append inner object */
+	ASN1_put_object(&p, encoding, body_length, default_tag_number, V_ASN1_UNIVERSAL);
+	memcpy(p, RSTRING_PTR(body), body_length);
+	p += body_length;
+	if (indef_len) {
+	    ASN1_put_eoc(&p); /* For inner object */
+	    ASN1_put_eoc(&p); /* For wrapper object */
+	}
+    }
+    else {
+	total_length = ASN1_object_size(encoding, body_length, tag_number);
+	str = rb_str_new(NULL, total_length);
+	p = (unsigned char *)RSTRING_PTR(str);
+	ASN1_put_object(&p, encoding, body_length, tag_number, tag_class);
+	memcpy(p, RSTRING_PTR(body), body_length);
+	p += body_length;
+	if (indef_len)
+	    ASN1_put_eoc(&p);
+    }
+    assert(p - (unsigned char *)RSTRING_PTR(str) == total_length);
     return str;
 }
 
+static VALUE ossl_asn1prim_to_der(VALUE);
+static VALUE ossl_asn1cons_to_der(VALUE);
 /*
  * call-seq:
  *    asn1.to_der => DER-encoded String
  *
  * Encodes this ASN1Data into a DER-encoded String value. The result is
- * DER-encoded except for the possibility of infinite length encodings.
- * Infinite length encodings are not allowed in strict DER, so strictly
- * speaking the result of such an encoding would be a BER-encoding.
+ * DER-encoded except for the possibility of indefinite length forms.
+ * Indefinite length forms are not allowed in strict DER, so strictly speaking
+ * the result of such an encoding would be a BER-encoding.
  */
 static VALUE
 ossl_asn1data_to_der(VALUE self)
 {
-    VALUE value, der, inf_length;
-    int tag, tag_class, is_cons = 0;
-    long length;
-    unsigned char *p;
+    VALUE value = ossl_asn1_get_value(self);
 
-    value = ossl_asn1_get_value(self);
-    if(rb_obj_is_kind_of(value, rb_cArray)){
-	is_cons = 1;
-	value = join_der(value);
-    }
-    StringValue(value);
-
-    tag = ossl_asn1_tag(self);
-    tag_class = ossl_asn1_tag_class(self);
-    inf_length = ossl_asn1_get_infinite_length(self);
-    if (inf_length == Qtrue) {
-	is_cons = 2;
+    if (rb_obj_is_kind_of(value, rb_cArray))
+	return ossl_asn1cons_to_der(self);
+    else {
+	if (RTEST(ossl_asn1_get_indefinite_length(self)))
+	    ossl_raise(eASN1Error, "indefinite length form cannot be used " \
+		       "with primitive encoding");
+	return ossl_asn1prim_to_der(self);
     }
-    if((length = ASN1_object_size(is_cons, RSTRING_LENINT(value), tag)) <= 0)
-	ossl_raise(eASN1Error, NULL);
-    der = rb_str_new(0, length);
-    p = (unsigned char *)RSTRING_PTR(der);
-    ASN1_put_object(&p, is_cons, RSTRING_LENINT(value), tag, tag_class);
-    memcpy(p, RSTRING_PTR(value), RSTRING_LEN(value));
-    p += RSTRING_LEN(value);
-    ossl_str_adjust(der, p);
-
-    return der;
 }
 
 static VALUE
@@ -815,7 +737,7 @@ int_ossl_asn1_decode0_prim(unsigned char **pp, long length, long hlen, int tag,
 
     p = *pp;
 
-    if(tc == sUNIVERSAL && tag < ossl_asn1_info_size) {
+    if(tc == sym_UNIVERSAL && tag < ossl_asn1_info_size) {
 	switch(tag){
 	case V_ASN1_EOC:
 	    value = decode_eoc(p, hlen+length);
@@ -857,13 +779,14 @@ int_ossl_asn1_decode0_prim(unsigned char **pp, long length, long hlen, int tag,
     *pp += hlen + length;
     *num_read = hlen + length;
 
-    if (tc == sUNIVERSAL && tag < ossl_asn1_info_size && ossl_asn1_info[tag].klass) {
+    if (tc == sym_UNIVERSAL &&
+	tag < ossl_asn1_info_size && ossl_asn1_info[tag].klass) {
 	VALUE klass = *ossl_asn1_info[tag].klass;
 	VALUE args[4];
 	args[0] = value;
 	args[1] = INT2NUM(tag);
 	args[2] = Qnil;
-	args[3] = ID2SYM(tc);
+	args[3] = tc;
 	asn1data = rb_obj_alloc(klass);
 	ossl_asn1_initialize(4, args, asn1data);
 	if(tag == V_ASN1_BIT_STRING){
@@ -872,7 +795,7 @@ int_ossl_asn1_decode0_prim(unsigned char **pp, long length, long hlen, int tag,
     }
     else {
 	asn1data = rb_obj_alloc(cASN1Data);
-	ossl_asn1data_initialize(asn1data, value, INT2NUM(tag), ID2SYM(tc));
+	ossl_asn1data_initialize(asn1data, value, INT2NUM(tag), tc);
     }
 
     return asn1data;
@@ -884,62 +807,48 @@ int_ossl_asn1_decode0_cons(unsigned char **pp, long max_len, long length,
 			   int tag, VALUE tc, long *num_read)
 {
     VALUE value, asn1data, ary;
-    int infinite;
-    long off = *offset;
+    int indefinite;
+    long available_len, off = *offset;
 
-    infinite = (j == 0x21);
+    indefinite = (j == 0x21);
     ary = rb_ary_new();
 
-    while (length > 0 || infinite) {
+    available_len = indefinite ? max_len : length;
+    while (available_len > 0) {
 	long inner_read = 0;
-	value = ossl_asn1_decode0(pp, max_len, &off, depth + 1, yield, &inner_read);
+	value = ossl_asn1_decode0(pp, available_len, &off, depth + 1, yield, &inner_read);
 	*num_read += inner_read;
-	max_len -= inner_read;
-	rb_ary_push(ary, value);
-	if (length > 0)
-	    length -= inner_read;
+	available_len -= inner_read;
 
-	if (infinite &&
-	    NUM2INT(ossl_asn1_get_tag(value)) == V_ASN1_EOC &&
-	    SYM2ID(ossl_asn1_get_tag_class(value)) == sUNIVERSAL) {
+	if (indefinite &&
+	    ossl_asn1_tag(value) == V_ASN1_EOC &&
+	    ossl_asn1_get_tag_class(value) == sym_UNIVERSAL) {
 	    break;
 	}
+	rb_ary_push(ary, value);
     }
 
-    if (tc == sUNIVERSAL) {
+    if (tc == sym_UNIVERSAL) {
 	VALUE args[4];
-	int not_sequence_or_set;
-
-	not_sequence_or_set = tag != V_ASN1_SEQUENCE && tag != V_ASN1_SET;
-
-	if (not_sequence_or_set) {
-	    if (infinite) {
-		asn1data = rb_obj_alloc(cASN1Constructive);
-	    }
-	    else {
-		ossl_raise(eASN1Error, "invalid non-infinite tag");
-		return Qnil;
-	    }
-	}
-	else {
-	    VALUE klass = *ossl_asn1_info[tag].klass;
-	    asn1data = rb_obj_alloc(klass);
-	}
+	if (tag == V_ASN1_SEQUENCE || tag == V_ASN1_SET)
+	    asn1data = rb_obj_alloc(*ossl_asn1_info[tag].klass);
+	else
+	    asn1data = rb_obj_alloc(cASN1Constructive);
 	args[0] = ary;
 	args[1] = INT2NUM(tag);
 	args[2] = Qnil;
-	args[3] = ID2SYM(tc);
+	args[3] = tc;
 	ossl_asn1_initialize(4, args, asn1data);
     }
     else {
 	asn1data = rb_obj_alloc(cASN1Data);
-	ossl_asn1data_initialize(asn1data, ary, INT2NUM(tag), ID2SYM(tc));
+	ossl_asn1data_initialize(asn1data, ary, INT2NUM(tag), tc);
     }
 
-    if (infinite)
-	ossl_asn1_set_infinite_length(asn1data, Qtrue);
+    if (indefinite)
+	ossl_asn1_set_indefinite_length(asn1data, Qtrue);
     else
-	ossl_asn1_set_infinite_length(asn1data, Qfalse);
+	ossl_asn1_set_indefinite_length(asn1data, Qfalse);
 
     *offset = off;
     return asn1data;
@@ -963,13 +872,13 @@ ossl_asn1_decode0(unsigned char **pp, long length, long *offset, int depth,
     if(j & 0x80) ossl_raise(eASN1Error, NULL);
     if(len > length) ossl_raise(eASN1Error, "value is too short");
     if((tc & V_ASN1_PRIVATE) == V_ASN1_PRIVATE)
-	tag_class = sPRIVATE;
+	tag_class = sym_PRIVATE;
     else if((tc & V_ASN1_CONTEXT_SPECIFIC) == V_ASN1_CONTEXT_SPECIFIC)
-	tag_class = sCONTEXT_SPECIFIC;
+	tag_class = sym_CONTEXT_SPECIFIC;
     else if((tc & V_ASN1_APPLICATION) == V_ASN1_APPLICATION)
-	tag_class = sAPPLICATION;
+	tag_class = sym_APPLICATION;
     else
-	tag_class = sUNIVERSAL;
+	tag_class = sym_UNIVERSAL;
 
     hlen = p - start;
 
@@ -988,11 +897,12 @@ ossl_asn1_decode0(unsigned char **pp, long length, long *offset, int depth,
     if(j & V_ASN1_CONSTRUCTED) {
 	*pp += hlen;
 	off += hlen;
-	asn1data = int_ossl_asn1_decode0_cons(pp, length, len, &off, depth, yield, j, tag, tag_class, &inner_read);
+	asn1data = int_ossl_asn1_decode0_cons(pp, length - hlen, len, &off, depth, yield, j, tag, tag_class, &inner_read);
 	inner_read += hlen;
     }
     else {
-    	if ((j & 0x01) && (len == 0)) ossl_raise(eASN1Error, "Infinite length for primitive value");
+	if ((j & 0x01) && (len == 0))
+	    ossl_raise(eASN1Error, "indefinite length for primitive value");
 	asn1data = int_ossl_asn1_decode0_prim(pp, len, hlen, tag, tag_class, &inner_read);
 	off += hlen + len;
     }
@@ -1024,13 +934,13 @@ int_ossl_decode_sanity_check(long len, long read, long offset)
  *
  * If a block is given, it prints out each of the elements encountered.
  * Block parameters are (in that order):
- * * depth: The recursion depth, plus one with each constructed value being encountered (Number)
- * * offset: Current byte offset (Number)
- * * header length: Combined length in bytes of the Tag and Length headers. (Number)
- * * length: The overall remaining length of the entire data (Number)
+ * * depth: The recursion depth, plus one with each constructed value being encountered (Integer)
+ * * offset: Current byte offset (Integer)
+ * * header length: Combined length in bytes of the Tag and Length headers. (Integer)
+ * * length: The overall remaining length of the entire data (Integer)
  * * constructed: Whether this value is constructed or not (Boolean)
  * * tag_class: Current tag class (Symbol)
- * * tag: The current tag (Number)
+ * * tag: The current tag number (Integer)
  *
  * == Example
  *   der = File.binread('asn1data.der')
@@ -1060,9 +970,9 @@ ossl_asn1_traverse(VALUE self, VALUE obj)
  * call-seq:
  *    OpenSSL::ASN1.decode(der) -> ASN1Data
  *
- * Decodes a BER- or DER-encoded value and creates an ASN1Data instance. +der+
- * may be a +String+ or any object that features a +#to_der+ method transforming
- * it into a BER-/DER-encoded +String+.
+ * Decodes a BER- or DER-encoded value and creates an ASN1Data instance. _der_
+ * may be a String or any object that features a +.to_der+ method transforming
+ * it into a BER-/DER-encoded String+
  *
  * == Example
  *   der = File.binread('asn1data')
@@ -1090,9 +1000,9 @@ ossl_asn1_decode(VALUE self, VALUE obj)
  * call-seq:
  *    OpenSSL::ASN1.decode_all(der) -> Array of ASN1Data
  *
- * Similar to +decode+ with the difference that +decode+ expects one
- * distinct value represented in +der+. +decode_all+ on the contrary
- * decodes a sequence of sequential BER/DER values lined up in +der+
+ * Similar to #decode with the difference that #decode expects one
+ * distinct value represented in _der_. #decode_all on the contrary
+ * decodes a sequence of sequential BER/DER values lined up in _der_
  * and returns them as an array.
  *
  * == Example
@@ -1127,19 +1037,19 @@ ossl_asn1_decode_all(VALUE self, VALUE obj)
 
 /*
  * call-seq:
- *    OpenSSL::ASN1::Primitive.new( value [, tag, tagging, tag_class ]) => Primitive
+ *    OpenSSL::ASN1::Primitive.new(value [, tag, tagging, tag_class ]) => Primitive
  *
- * +value+: is mandatory.
+ * _value_: is mandatory.
  *
- * +tag+: optional, may be specified for tagged values. If no +tag+ is
+ * _tag_: optional, may be specified for tagged values. If no _tag_ is
  * specified, the UNIVERSAL tag corresponding to the Primitive sub-class
  * is used by default.
  *
- * +tagging+: may be used as an encoding hint to encode a value either
+ * _tagging_: may be used as an encoding hint to encode a value either
  * explicitly or implicitly, see ASN1 for possible values.
  *
- * +tag_class+: if +tag+ and +tagging+ are +nil+ then this is set to
- * +:UNIVERSAL+ by default. If either +tag+ or +tagging+ are set then
+ * _tag_class_: if _tag_ and _tagging_ are +nil+ then this is set to
+ * +:UNIVERSAL+ by default. If either _tag_ or _tagging_ are set then
  * +:CONTEXT_SPECIFIC+ is used as the default. For possible values please
  * cf. ASN1.
  *
@@ -1152,34 +1062,37 @@ static VALUE
 ossl_asn1_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE value, tag, tagging, tag_class;
+    int default_tag;
 
     rb_scan_args(argc, argv, "13", &value, &tag, &tagging, &tag_class);
-    if(argc > 1){
+    default_tag = ossl_asn1_default_tag(self);
+
+    if (default_tag == -1 || argc > 1) {
 	if(NIL_P(tag))
 	    ossl_raise(eASN1Error, "must specify tag number");
 	if(!NIL_P(tagging) && !SYMBOL_P(tagging))
 	    ossl_raise(eASN1Error, "invalid tagging method");
 	if(NIL_P(tag_class)) {
 	    if (NIL_P(tagging))
-		tag_class = ID2SYM(sUNIVERSAL);
+		tag_class = sym_UNIVERSAL;
 	    else
-		tag_class = ID2SYM(sCONTEXT_SPECIFIC);
+		tag_class = sym_CONTEXT_SPECIFIC;
 	}
 	if(!SYMBOL_P(tag_class))
 	    ossl_raise(eASN1Error, "invalid tag class");
-	if(!NIL_P(tagging) && SYM2ID(tagging) == sIMPLICIT && NUM2INT(tag) > 31)
-	    ossl_raise(eASN1Error, "tag number for Universal too large");
     }
     else{
-	tag = INT2NUM(ossl_asn1_default_tag(self));
+	tag = INT2NUM(default_tag);
 	tagging = Qnil;
-	tag_class = ID2SYM(sUNIVERSAL);
+	tag_class = sym_UNIVERSAL;
     }
     ossl_asn1_set_tag(self, tag);
     ossl_asn1_set_value(self, value);
     ossl_asn1_set_tagging(self, tagging);
     ossl_asn1_set_tag_class(self, tag_class);
-    ossl_asn1_set_infinite_length(self, Qfalse);
+    ossl_asn1_set_indefinite_length(self, Qfalse);
+    if (default_tag == V_ASN1_BIT_STRING)
+	rb_ivar_set(self, sivUNUSED_BITS, INT2FIX(0));
 
     return self;
 }
@@ -1187,59 +1100,66 @@ ossl_asn1_initialize(int argc, VALUE *argv, VALUE self)
 static VALUE
 ossl_asn1eoc_initialize(VALUE self) {
     VALUE tag, tagging, tag_class, value;
-    tag = INT2NUM(ossl_asn1_default_tag(self));
+    tag = INT2FIX(0);
     tagging = Qnil;
-    tag_class = ID2SYM(sUNIVERSAL);
+    tag_class = sym_UNIVERSAL;
     value = rb_str_new("", 0);
     ossl_asn1_set_tag(self, tag);
     ossl_asn1_set_value(self, value);
     ossl_asn1_set_tagging(self, tagging);
     ossl_asn1_set_tag_class(self, tag_class);
-    ossl_asn1_set_infinite_length(self, Qfalse);
+    ossl_asn1_set_indefinite_length(self, Qfalse);
     return self;
 }
 
+static VALUE
+ossl_asn1eoc_to_der(VALUE self)
+{
+    return rb_str_new("\0\0", 2);
+}
+
 /*
  * call-seq:
  *    asn1.to_der => DER-encoded String
  *
- * See ASN1Data#to_der for details. *
+ * See ASN1Data#to_der for details.
  */
 static VALUE
 ossl_asn1prim_to_der(VALUE self)
 {
     ASN1_TYPE *asn1;
-    int tn, tc, explicit;
-    long len, reallen;
-    unsigned char *buf, *p;
+    long alllen, bodylen;
+    unsigned char *p0, *p1;
+    int j, tag, tc, state;
     VALUE str;
 
-    tn = NUM2INT(ossl_asn1_get_tag(self));
-    tc = ossl_asn1_tag_class(self);
-    explicit = ossl_asn1_is_explicit(self);
-    asn1 = ossl_asn1_get_asn1type(self);
+    if (ossl_asn1_default_tag(self) == -1) {
+	str = ossl_asn1_get_value(self);
+	return to_der_internal(self, 0, 0, StringValue(str));
+    }
 
-    len = ASN1_object_size(1, i2d_ASN1_TYPE(asn1, NULL), tn);
-    if(!(buf = OPENSSL_malloc(len))){
+    asn1 = ossl_asn1_get_asn1type(self);
+    alllen = i2d_ASN1_TYPE(asn1, NULL);
+    if (alllen < 0) {
 	ASN1_TYPE_free(asn1);
-	ossl_raise(eASN1Error, "cannot alloc buffer");
+	ossl_raise(eASN1Error, "i2d_ASN1_TYPE");
     }
-    p = buf;
-    if (tc == V_ASN1_UNIVERSAL) {
-        i2d_ASN1_TYPE(asn1, &p);
-    } else if (explicit) {
-        ASN1_put_object(&p, 1, i2d_ASN1_TYPE(asn1, NULL), tn, tc);
-        i2d_ASN1_TYPE(asn1, &p);
-    } else {
-        i2d_ASN1_TYPE(asn1, &p);
-        *buf = tc | tn | (*buf & V_ASN1_CONSTRUCTED);
+    str = ossl_str_new(NULL, alllen, &state);
+    if (state) {
+	ASN1_TYPE_free(asn1);
+	rb_jump_tag(state);
     }
+    p0 = p1 = (unsigned char *)RSTRING_PTR(str);
+    i2d_ASN1_TYPE(asn1, &p0);
     ASN1_TYPE_free(asn1);
-    reallen = p - buf;
-    assert(reallen <= len);
-    str = ossl_buf2str((char *)buf, rb_long2int(reallen)); /* buf will be free in ossl_buf2str */
+    assert(p0 - p1 == alllen);
 
-    return str;
+    /* Strip header since to_der_internal() wants only the payload */
+    j = ASN1_get_object((const unsigned char **)&p1, &bodylen, &tag, &tc, alllen);
+    if (j & 0x80)
+	ossl_raise(eASN1Error, "ASN1_get_object"); /* should not happen */
+
+    return to_der_internal(self, 0, 0, rb_str_drop_bytes(str, alllen - bodylen));
 }
 
 /*
@@ -1251,92 +1171,41 @@ ossl_asn1prim_to_der(VALUE self)
 static VALUE
 ossl_asn1cons_to_der(VALUE self)
 {
-    int tag, tn, tc, explicit, constructed = 1;
-    int found_prim = 0, seq_len;
-    long length;
-    unsigned char *p;
-    VALUE value, str, inf_length;
-
-    tn = NUM2INT(ossl_asn1_get_tag(self));
-    tc = ossl_asn1_tag_class(self);
-    inf_length = ossl_asn1_get_infinite_length(self);
-    if (inf_length == Qtrue) {
-	VALUE ary, example;
-	constructed = 2;
-	if (CLASS_OF(self) == cASN1Sequence ||
-	    CLASS_OF(self) == cASN1Set) {
-	    tag = ossl_asn1_default_tag(self);
-	}
-	else { /* must be a constructive encoding of a primitive value */
-	    ary = ossl_asn1_get_value(self);
-	    if (!rb_obj_is_kind_of(ary, rb_cArray))
-		ossl_raise(eASN1Error, "Constructive value must be an Array");
-	    /* Recursively descend until a primitive value is found.
-	    The overall value of the entire constructed encoding
-	    is of the type of the first primitive encoding to be
-	    found. */
-	    while (!found_prim){
-		example = rb_ary_entry(ary, 0);
-		if (rb_obj_is_kind_of(example, cASN1Primitive)){
-		    found_prim = 1;
-		}
-		else {
-		    /* example is another ASN1Constructive */
-		    if (!rb_obj_is_kind_of(example, cASN1Constructive)){
-			ossl_raise(eASN1Error, "invalid constructed encoding");
-			return Qnil; /* dummy */
-		    }
-		    ary = ossl_asn1_get_value(example);
-		}
-	    }
-	    tag = ossl_asn1_default_tag(example);
-	}
-    }
-    else {
-	if (CLASS_OF(self) == cASN1Constructive)
-	    ossl_raise(eASN1Error, "Constructive shall only be used with infinite length");
-	tag = ossl_asn1_default_tag(self);
-    }
-    explicit = ossl_asn1_is_explicit(self);
-    value = join_der(ossl_asn1_get_value(self));
-
-    seq_len = ASN1_object_size(constructed, RSTRING_LENINT(value), tag);
-    length = ASN1_object_size(constructed, seq_len, tn);
-    str = rb_str_new(0, length);
-    p = (unsigned char *)RSTRING_PTR(str);
-    if(tc == V_ASN1_UNIVERSAL)
-	ASN1_put_object(&p, constructed, RSTRING_LENINT(value), tn, tc);
-    else{
-	if(explicit){
-	    ASN1_put_object(&p, constructed, seq_len, tn, tc);
-	    ASN1_put_object(&p, constructed, RSTRING_LENINT(value), tag, V_ASN1_UNIVERSAL);
-	}
-	else{
-	    ASN1_put_object(&p, constructed, RSTRING_LENINT(value), tn, tc);
+    VALUE ary, str;
+    long i;
+    int indef_len;
+
+    indef_len = RTEST(ossl_asn1_get_indefinite_length(self));
+    ary = rb_convert_type(ossl_asn1_get_value(self), T_ARRAY, "Array", "to_a");
+    str = rb_str_new(NULL, 0);
+    for (i = 0; i < RARRAY_LEN(ary); i++) {
+	VALUE item = RARRAY_AREF(ary, i);
+
+	if (indef_len && rb_obj_is_kind_of(item, cASN1EndOfContent)) {
+	    if (i != RARRAY_LEN(ary) - 1)
+		ossl_raise(eASN1Error, "illegal EOC octets in value");
+
+	    /*
+	     * EOC is not really part of the content, but we required to add one
+	     * at the end in the past.
+	     */
+	    break;
 	}
-    }
-    memcpy(p, RSTRING_PTR(value), RSTRING_LEN(value));
-    p += RSTRING_LEN(value);
 
-    /* In this case we need an additional EOC (one for the explicit part and
-     * one for the Constructive itself. The EOC for the Constructive is
-     * supplied by the user, but that for the "explicit wrapper" must be
-     * added here.
-     */
-    if (explicit && inf_length == Qtrue) {
-	ASN1_put_eoc(&p);
+	item = ossl_to_der_if_possible(item);
+	StringValue(item);
+	rb_str_append(str, item);
     }
-    ossl_str_adjust(str, p);
 
-    return str;
+    return to_der_internal(self, 1, indef_len, str);
 }
 
 /*
  * call-seq:
  *    asn1_ary.each { |asn1| block } => asn1_ary
  *
- * Calls <i>block</i> once for each element in +self+, passing that element
- * as parameter +asn1+. If no block is given, an enumerator is returned
+ * Calls the given block once for each element in self, passing that element
+ * as parameter _asn1_. If no block is given, an enumerator is returned
  * instead.
  *
  * == Example
@@ -1347,7 +1216,8 @@ ossl_asn1cons_to_der(VALUE self)
 static VALUE
 ossl_asn1cons_each(VALUE self)
 {
-    rb_ary_each(ossl_asn1_get_value(self));
+    rb_block_call(ossl_asn1_get_value(self), id_each, 0, 0, 0, 0);
+
     return self;
 }
 
@@ -1355,8 +1225,8 @@ ossl_asn1cons_each(VALUE self)
  * call-seq:
  *    OpenSSL::ASN1::ObjectId.register(object_id, short_name, long_name)
  *
- * This adds a new ObjectId to the internal tables. Where +object_id+ is the
- * numerical form, +short_name+ is the short name, and +long_name+ is the long
+ * This adds a new ObjectId to the internal tables. Where _object_id_ is the
+ * numerical form, _short_name_ is the short name, and _long_name_ is the long
  * name.
  *
  * Returns +true+ if successful. Raises an OpenSSL::ASN1::ASN1Error if it fails.
@@ -1375,14 +1245,13 @@ ossl_asn1obj_s_register(VALUE self, VALUE oid, VALUE sn, VALUE ln)
     return Qtrue;
 }
 
-/* Document-method: OpenSSL::ASN1::ObjectId#sn
+/*
+ * call-seq:
+ *    oid.sn -> string
+ *    oid.short_name -> string
  *
  * The short name of the ObjectId, as defined in <openssl/objects.h>.
  */
-/* Document-method: OpenSSL::ASN1::ObjectId#short_name
- *
- * +short_name+ is an alias to +sn+
- */
 static VALUE
 ossl_asn1obj_get_sn(VALUE self)
 {
@@ -1396,14 +1265,13 @@ ossl_asn1obj_get_sn(VALUE self)
     return ret;
 }
 
-/* Document-method: OpenSSL::ASN1::ObjectId#ln
+/*
+ * call-seq:
+ *    oid.ln -> string
+ *    oid.long_name -> string
  *
  * The long name of the ObjectId, as defined in <openssl/objects.h>.
  */
-/* Document-method: OpenSSL::ASN1::ObjectId#long_name
- *
- * +long_name+ is an alias to +ln+
- */
 static VALUE
 ossl_asn1obj_get_ln(VALUE self)
 {
@@ -1417,23 +1285,72 @@ ossl_asn1obj_get_ln(VALUE self)
     return ret;
 }
 
-/* Document-method: OpenSSL::ASN1::ObjectId#oid
+/*
+ *  call-seq:
+ *     oid == other_oid => true or false
+ *
+ *  Returns +true+ if _other_oid_ is the same as _oid_
+ */
+static VALUE
+ossl_asn1obj_eq(VALUE self, VALUE other)
+{
+    VALUE valSelf, valOther;
+    int nidSelf, nidOther;
+
+    valSelf = ossl_asn1_get_value(self);
+    valOther = ossl_asn1_get_value(other);
+
+    if ((nidSelf = OBJ_txt2nid(StringValueCStr(valSelf))) == NID_undef)
+	ossl_raise(eASN1Error, "OBJ_txt2nid");
+
+    if ((nidOther = OBJ_txt2nid(StringValueCStr(valOther))) == NID_undef)
+	ossl_raise(eASN1Error, "OBJ_txt2nid");
+
+    return nidSelf == nidOther ? Qtrue : Qfalse;
+}
+
+static VALUE
+asn1obj_get_oid_i(VALUE vobj)
+{
+    ASN1_OBJECT *a1obj = (void *)vobj;
+    VALUE str;
+    int len;
+
+    str = rb_usascii_str_new(NULL, 127);
+    len = OBJ_obj2txt(RSTRING_PTR(str), RSTRING_LENINT(str), a1obj, 1);
+    if (len <= 0 || len == INT_MAX)
+	ossl_raise(eASN1Error, "OBJ_obj2txt");
+    if (len > RSTRING_LEN(str)) {
+	/* +1 is for the \0 terminator added by OBJ_obj2txt() */
+	rb_str_resize(str, len + 1);
+	len = OBJ_obj2txt(RSTRING_PTR(str), len + 1, a1obj, 1);
+	if (len <= 0)
+	    ossl_raise(eASN1Error, "OBJ_obj2txt");
+    }
+    rb_str_set_len(str, len);
+    return str;
+}
+
+/*
+ * call-seq:
+ *    oid.oid -> string
  *
- * The object identifier as a +String+, e.g. "1.2.3.4.5"
+ * Returns a String representing the Object Identifier in the dot notation,
+ * e.g. "1.2.3.4.5"
  */
 static VALUE
 ossl_asn1obj_get_oid(VALUE self)
 {
-    VALUE val;
+    VALUE str;
     ASN1_OBJECT *a1obj;
-    char buf[128];
+    int state;
 
-    val = ossl_asn1_get_value(self);
-    a1obj = obj_to_asn1obj(val);
-    OBJ_obj2txt(buf, sizeof(buf), a1obj, 1);
+    a1obj = obj_to_asn1obj(ossl_asn1_get_value(self));
+    str = rb_protect(asn1obj_get_oid_i, (VALUE)a1obj, &state);
     ASN1_OBJECT_free(a1obj);
-
-    return rb_str_new2(buf);
+    if (state)
+	rb_jump_tag(state);
+    return str;
 }
 
 #define OSSL_ASN1_IMPL_FACTORY_METHOD(klass) \
@@ -1467,25 +1384,27 @@ OSSL_ASN1_IMPL_FACTORY_METHOD(EndOfContent)
 void
 Init_ossl_asn1(void)
 {
+#undef rb_intern
     VALUE ary;
     int i;
 
 #if 0
-    mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
+    mOSSL = rb_define_module("OpenSSL");
+    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
 #endif
 
-    sUNIVERSAL = rb_intern("UNIVERSAL");
-    sCONTEXT_SPECIFIC = rb_intern("CONTEXT_SPECIFIC");
-    sAPPLICATION = rb_intern("APPLICATION");
-    sPRIVATE = rb_intern("PRIVATE");
-    sEXPLICIT = rb_intern("EXPLICIT");
-    sIMPLICIT = rb_intern("IMPLICIT");
+    sym_UNIVERSAL = ID2SYM(rb_intern_const("UNIVERSAL"));
+    sym_CONTEXT_SPECIFIC = ID2SYM(rb_intern_const("CONTEXT_SPECIFIC"));
+    sym_APPLICATION = ID2SYM(rb_intern_const("APPLICATION"));
+    sym_PRIVATE = ID2SYM(rb_intern_const("PRIVATE"));
+    sym_EXPLICIT = ID2SYM(rb_intern_const("EXPLICIT"));
+    sym_IMPLICIT = ID2SYM(rb_intern_const("IMPLICIT"));
 
     sivVALUE = rb_intern("@value");
     sivTAG = rb_intern("@tag");
     sivTAGGING = rb_intern("@tagging");
     sivTAG_CLASS = rb_intern("@tag_class");
-    sivINFINITE_LENGTH = rb_intern("@infinite_length");
+    sivINDEFINITE_LENGTH = rb_intern("@indefinite_length");
     sivUNUSED_BITS = rb_intern("@unused_bits");
 
     /*
@@ -1511,24 +1430,21 @@ Init_ossl_asn1(void)
      * == ASN.1 class hierarchy
      *
      * The base class representing ASN.1 structures is ASN1Data. ASN1Data offers
-     * attributes to read and set the +tag+, the +tag_class+ and finally the
-     * +value+ of a particular ASN.1 item. Upon parsing, any tagged values
+     * attributes to read and set the _tag_, the _tag_class_ and finally the
+     * _value_ of a particular ASN.1 item. Upon parsing, any tagged values
      * (implicit or explicit) will be represented by ASN1Data instances because
      * their "real type" can only be determined using out-of-band information
      * from the ASN.1 type declaration. Since this information is normally
      * known when encoding a type, all sub-classes of ASN1Data offer an
-     * additional attribute +tagging+ that allows to encode a value implicitly
+     * additional attribute _tagging_ that allows to encode a value implicitly
      * (+:IMPLICIT+) or explicitly (+:EXPLICIT+).
      *
      * === Constructive
      *
      * Constructive is, as its name implies, the base class for all
      * constructed encodings, i.e. those that consist of several values,
-     * opposed to "primitive" encodings with just one single value.
-     * Primitive values that are encoded with "infinite length" are typically
-     * constructed (their values come in multiple chunks) and are therefore
-     * represented by instances of Constructive. The value of an Constructive
-     * is always an Array.
+     * opposed to "primitive" encodings with just one single value. The value of
+     * an Constructive is always an Array.
      *
      * ==== ASN1::Set and ASN1::Sequence
      *
@@ -1545,18 +1461,18 @@ Init_ossl_asn1(void)
      * Please cf. Primitive documentation for details on sub-classes and
      * their respective mappings of ASN.1 data types to Ruby objects.
      *
-     * == Possible values for +tagging+
+     * == Possible values for _tagging_
      *
      * When constructing an ASN1Data object the ASN.1 type definition may
      * require certain elements to be either implicitly or explicitly tagged.
-     * This can be achieved by setting the +tagging+ attribute manually for
+     * This can be achieved by setting the _tagging_ attribute manually for
      * sub-classes of ASN1Data. Use the symbol +:IMPLICIT+ for implicit
      * tagging and +:EXPLICIT+ if the element requires explicit tagging.
      *
-     * == Possible values for +tag_class+
+     * == Possible values for _tag_class_
      *
      * It is possible to create arbitrary ASN1Data objects that also support
-     * a PRIVATE or APPLICATION tag class. Possible values for the +tag_class+
+     * a PRIVATE or APPLICATION tag class. Possible values for the _tag_class_
      * attribute are:
      * * +:UNIVERSAL+ (the default for untagged values)
      * * +:CONTEXT_SPECIFIC+ (the default for tagged values)
@@ -1658,9 +1574,9 @@ Init_ossl_asn1(void)
      *
      * An implicitly 1-tagged INTEGER value will be parsed as an
      * ASN1Data with
-     * * +tag+ equal to 1
-     * * +tag_class+ equal to +:CONTEXT_SPECIFIC+
-     * * +value+ equal to a +String+ that carries the raw encoding
+     * * _tag_ equal to 1
+     * * _tag_class_ equal to +:CONTEXT_SPECIFIC+
+     * * _value_ equal to a String that carries the raw encoding
      *   of the INTEGER.
      * This implies that a subsequent decoding step is required to
      * completely decode implicitly tagged values.
@@ -1669,9 +1585,9 @@ Init_ossl_asn1(void)
      *
      * An explicitly 1-tagged INTEGER value will be parsed as an
      * ASN1Data with
-     * * +tag+ equal to 1
-     * * +tag_class+ equal to +:CONTEXT_SPECIFIC+
-     * * +value+ equal to an +Array+ with one single element, an
+     * * _tag_ equal to 1
+     * * _tag_class_ equal to +:CONTEXT_SPECIFIC+
+     * * _value_ equal to an Array with one single element, an
      *   instance of OpenSSL::ASN1::Integer, i.e. the inner element
      *   is the non-tagged primitive value, and the tagging is represented
      *   in the outer ASN1Data
@@ -1682,13 +1598,13 @@ Init_ossl_asn1(void)
      *   der = seq.to_der
      *   asn1 = OpenSSL::ASN1.decode(der)
      *   # pp asn1 => #<OpenSSL::ASN1::Sequence:0x87326e0
-     *   #              @infinite_length=false,
+     *   #              @indefinite_length=false,
      *   #              @tag=16,
      *   #              @tag_class=:UNIVERSAL,
      *   #              @tagging=nil,
      *   #              @value=
      *   #                [#<OpenSSL::ASN1::ASN1Data:0x87326f4
-     *   #                   @infinite_length=false,
+     *   #                   @indefinite_length=false,
      *   #                   @tag=0,
      *   #                   @tag_class=:CONTEXT_SPECIFIC,
      *   #                   @value="\x01">]>
@@ -1705,18 +1621,18 @@ Init_ossl_asn1(void)
      *   der = seq.to_der
      *   asn1 = OpenSSL::ASN1.decode(der)
      *   # pp asn1 => #<OpenSSL::ASN1::Sequence:0x87326e0
-     *   #              @infinite_length=false,
+     *   #              @indefinite_length=false,
      *   #              @tag=16,
      *   #              @tag_class=:UNIVERSAL,
      *   #              @tagging=nil,
      *   #              @value=
      *   #                [#<OpenSSL::ASN1::ASN1Data:0x87326f4
-     *   #                   @infinite_length=false,
+     *   #                   @indefinite_length=false,
      *   #                   @tag=0,
      *   #                   @tag_class=:CONTEXT_SPECIFIC,
      *   #                   @value=
      *   #                     [#<OpenSSL::ASN1::Integer:0x85bf308
-     *   #                        @infinite_length=false,
+     *   #                        @indefinite_length=false,
      *   #                        @tag=2,
      *   #                        @tag_class=:UNIVERSAL
      *   #                        @tagging=nil,
@@ -1732,73 +1648,75 @@ Init_ossl_asn1(void)
      */
     rb_attr(cASN1Data, rb_intern("value"), 1, 1, 0);
     /*
-     * A +Number+ representing the tag number of this ASN1Data. Never +nil+.
+     * An Integer representing the tag number of this ASN1Data. Never +nil+.
      */
     rb_attr(cASN1Data, rb_intern("tag"), 1, 1, 0);
     /*
-     * A +Symbol+ representing the tag class of this ASN1Data. Never +nil+.
+     * A Symbol representing the tag class of this ASN1Data. Never +nil+.
      * See ASN1Data for possible values.
      */
     rb_attr(cASN1Data, rb_intern("tag_class"), 1, 1, 0);
     /*
-     * Never +nil+. A +Boolean+ indicating whether the encoding was infinite
-     * length (in the case of parsing) or whether an infinite length encoding
-     * shall be used (in the encoding case).
-     * In DER, every value has a finite length associated with it. But in
-     * scenarios where large amounts of data need to be transferred it
-     * might be desirable to have some kind of streaming support available.
+     * Never +nil+. A boolean value indicating whether the encoding uses
+     * indefinite length (in the case of parsing) or whether an indefinite
+     * length form shall be used (in the encoding case).
+     * In DER, every value uses definite length form. But in scenarios where
+     * large amounts of data need to be transferred it might be desirable to
+     * have some kind of streaming support available.
      * For example, huge OCTET STRINGs are preferably sent in smaller-sized
      * chunks, each at a time.
      * This is possible in BER by setting the length bytes of an encoding
      * to zero and by this indicating that the following value will be
-     * sent in chunks. Infinite length encodings are always constructed.
+     * sent in chunks. Indefinite length encodings are always constructed.
      * The end of such a stream of chunks is indicated by sending a EOC
-     * (End of Content) tag. SETs and SEQUENCEs may use an infinite length
+     * (End of Content) tag. SETs and SEQUENCEs may use an indefinite length
      * encoding, but also primitive types such as e.g. OCTET STRINGS or
      * BIT STRINGS may leverage this functionality (cf. ITU-T X.690).
      */
-    rb_attr(cASN1Data, rb_intern("infinite_length"), 1, 1, 0);
+    rb_attr(cASN1Data, rb_intern("indefinite_length"), 1, 1, 0);
+    rb_define_alias(cASN1Data, "infinite_length", "indefinite_length");
+    rb_define_alias(cASN1Data, "infinite_length=", "indefinite_length=");
     rb_define_method(cASN1Data, "initialize", ossl_asn1data_initialize, 3);
     rb_define_method(cASN1Data, "to_der", ossl_asn1data_to_der, 0);
 
     /* Document-class: OpenSSL::ASN1::Primitive
      *
      * The parent class for all primitive encodings. Attributes are the same as
-     * for ASN1Data, with the addition of +tagging+.
-     * Primitive values can never be infinite length encodings, thus it is not
-     * possible to set the +infinite_length+ attribute for Primitive and its
-     * sub-classes.
+     * for ASN1Data, with the addition of _tagging_.
+     * Primitive values can never be encoded with indefinite length form, thus
+     * it is not possible to set the _indefinite_length_ attribute for Primitive
+     * and its sub-classes.
      *
      * == Primitive sub-classes and their mapping to Ruby classes
-     * * OpenSSL::ASN1::EndOfContent    <=> +value+ is always +nil+
-     * * OpenSSL::ASN1::Boolean         <=> +value+ is a +Boolean+
-     * * OpenSSL::ASN1::Integer         <=> +value+ is a +Number+
-     * * OpenSSL::ASN1::BitString       <=> +value+ is a +String+
-     * * OpenSSL::ASN1::OctetString     <=> +value+ is a +String+
-     * * OpenSSL::ASN1::Null            <=> +value+ is always +nil+
-     * * OpenSSL::ASN1::Object          <=> +value+ is a +String+
-     * * OpenSSL::ASN1::Enumerated      <=> +value+ is a +Number+
-     * * OpenSSL::ASN1::UTF8String      <=> +value+ is a +String+
-     * * OpenSSL::ASN1::NumericString   <=> +value+ is a +String+
-     * * OpenSSL::ASN1::PrintableString <=> +value+ is a +String+
-     * * OpenSSL::ASN1::T61String       <=> +value+ is a +String+
-     * * OpenSSL::ASN1::VideotexString  <=> +value+ is a +String+
-     * * OpenSSL::ASN1::IA5String       <=> +value+ is a +String+
-     * * OpenSSL::ASN1::UTCTime         <=> +value+ is a +Time+
-     * * OpenSSL::ASN1::GeneralizedTime <=> +value+ is a +Time+
-     * * OpenSSL::ASN1::GraphicString   <=> +value+ is a +String+
-     * * OpenSSL::ASN1::ISO64String     <=> +value+ is a +String+
-     * * OpenSSL::ASN1::GeneralString   <=> +value+ is a +String+
-     * * OpenSSL::ASN1::UniversalString <=> +value+ is a +String+
-     * * OpenSSL::ASN1::BMPString       <=> +value+ is a +String+
+     * * OpenSSL::ASN1::EndOfContent    <=> _value_ is always +nil+
+     * * OpenSSL::ASN1::Boolean         <=> _value_ is +true+ or +false+
+     * * OpenSSL::ASN1::Integer         <=> _value_ is an OpenSSL::BN
+     * * OpenSSL::ASN1::BitString       <=> _value_ is a String
+     * * OpenSSL::ASN1::OctetString     <=> _value_ is a String
+     * * OpenSSL::ASN1::Null            <=> _value_ is always +nil+
+     * * OpenSSL::ASN1::Object          <=> _value_ is a String
+     * * OpenSSL::ASN1::Enumerated      <=> _value_ is an OpenSSL::BN
+     * * OpenSSL::ASN1::UTF8String      <=> _value_ is a String
+     * * OpenSSL::ASN1::NumericString   <=> _value_ is a String
+     * * OpenSSL::ASN1::PrintableString <=> _value_ is a String
+     * * OpenSSL::ASN1::T61String       <=> _value_ is a String
+     * * OpenSSL::ASN1::VideotexString  <=> _value_ is a String
+     * * OpenSSL::ASN1::IA5String       <=> _value_ is a String
+     * * OpenSSL::ASN1::UTCTime         <=> _value_ is a Time
+     * * OpenSSL::ASN1::GeneralizedTime <=> _value_ is a Time
+     * * OpenSSL::ASN1::GraphicString   <=> _value_ is a String
+     * * OpenSSL::ASN1::ISO64String     <=> _value_ is a String
+     * * OpenSSL::ASN1::GeneralString   <=> _value_ is a String
+     * * OpenSSL::ASN1::UniversalString <=> _value_ is a String
+     * * OpenSSL::ASN1::BMPString       <=> _value_ is a String
      *
      * == OpenSSL::ASN1::BitString
      *
      * === Additional attributes
-     * +unused_bits+: if the underlying BIT STRING's
-     * length is a multiple of 8 then +unused_bits+ is 0. Otherwise
-     * +unused_bits+ indicates the number of bits that are to be ignored in
-     * the final octet of the +BitString+'s +value+.
+     * _unused_bits_: if the underlying BIT STRING's
+     * length is a multiple of 8 then _unused_bits_ is 0. Otherwise
+     * _unused_bits_ indicates the number of bits that are to be ignored in
+     * the final octet of the BitString's _value_.
      *
      * == OpenSSL::ASN1::ObjectId
      *
@@ -1806,20 +1724,16 @@ Init_ossl_asn1(void)
      * it is not typically allocated this way, but rather that are received from
      * parsed ASN1 encodings.
      *
-     * While OpenSSL::ASN1::ObjectId.new will allocate a new ObjectId, it is
-     * not typically allocated this way, but rather that are received from
-     * parsed ASN1 encodings.
-     *
      * === Additional attributes
-     * * +sn+: the short name as defined in <openssl/objects.h>.
-     * * +ln+: the long name as defined in <openssl/objects.h>.
-     * * +oid+: the object identifier as a +String+, e.g. "1.2.3.4.5"
-     * * +short_name+: alias for +sn+.
-     * * +long_name+: alias for +ln+.
+     * * _sn_: the short name as defined in <openssl/objects.h>.
+     * * _ln_: the long name as defined in <openssl/objects.h>.
+     * * _oid_: the object identifier as a String, e.g. "1.2.3.4.5"
+     * * _short_name_: alias for _sn_.
+     * * _long_name_: alias for _ln_.
      *
      * == Examples
      * With the Exception of OpenSSL::ASN1::EndOfContent, each Primitive class
-     * constructor takes at least one parameter, the +value+.
+     * constructor takes at least one parameter, the _value_.
      *
      * === Creating EndOfContent
      *   eoc = OpenSSL::ASN1::EndOfContent.new
@@ -1833,19 +1747,20 @@ Init_ossl_asn1(void)
     /*
      * May be used as a hint for encoding a value either implicitly or
      * explicitly by setting it either to +:IMPLICIT+ or to +:EXPLICIT+.
-     * +tagging+ is not set when a ASN.1 structure is parsed using
+     * _tagging_ is not set when a ASN.1 structure is parsed using
      * OpenSSL::ASN1.decode.
      */
     rb_attr(cASN1Primitive, rb_intern("tagging"), 1, 1, Qtrue);
+    rb_undef_method(cASN1Primitive, "indefinite_length=");
     rb_undef_method(cASN1Primitive, "infinite_length=");
     rb_define_method(cASN1Primitive, "initialize", ossl_asn1_initialize, -1);
     rb_define_method(cASN1Primitive, "to_der", ossl_asn1prim_to_der, 0);
 
     /* Document-class: OpenSSL::ASN1::Constructive
      *
-     * The parent class for all constructed encodings. The +value+ attribute
-     * of a Constructive is always an +Array+. Attributes are the same as
-     * for ASN1Data, with the addition of +tagging+.
+     * The parent class for all constructed encodings. The _value_ attribute
+     * of a Constructive is always an Array. Attributes are the same as
+     * for ASN1Data, with the addition of _tagging_.
      *
      * == SET and SEQUENCE
      *
@@ -1867,48 +1782,13 @@ Init_ossl_asn1(void)
      *   int = OpenSSL::ASN1::Integer.new(1)
      *   str = OpenSSL::ASN1::PrintableString.new('abc')
      *   set = OpenSSL::ASN1::Set.new( [ int, str ] )
-     *
-     * == Infinite length primitive values
-     *
-     * The only case where Constructive is used directly is for infinite
-     * length encodings of primitive values. These encodings are always
-     * constructed, with the contents of the +value+ +Array+ being either
-     * UNIVERSAL non-infinite length partial encodings of the actual value
-     * or again constructive encodings with infinite length (i.e. infinite
-     * length primitive encodings may be constructed recursively with another
-     * infinite length value within an already infinite length value). Each
-     * partial encoding must be of the same UNIVERSAL type as the overall
-     * encoding. The value of the overall encoding consists of the
-     * concatenation of each partial encoding taken in sequence. The +value+
-     * array of the outer infinite length value must end with a
-     * OpenSSL::ASN1::EndOfContent instance.
-     *
-     * Please note that it is not possible to encode Constructive without
-     * the +infinite_length+ attribute being set to +true+, use
-     * OpenSSL::ASN1::Sequence or OpenSSL::ASN1::Set in these cases instead.
-     *
-     * === Example - Infinite length OCTET STRING
-     *   partial1 = OpenSSL::ASN1::OctetString.new("\x01")
-     *   partial2 = OpenSSL::ASN1::OctetString.new("\x02")
-     *   inf_octets = OpenSSL::ASN1::Constructive.new( [ partial1,
-     *                                                   partial2,
-     *                                                   OpenSSL::ASN1::EndOfContent.new ],
-     *                                                 OpenSSL::ASN1::OCTET_STRING,
-     *                                                 nil,
-     *                                                 :UNIVERSAL )
-     *   # The real value of inf_octets is "\x01\x02", i.e. the concatenation
-     *   # of partial1 and partial2
-     *   inf_octets.infinite_length = true
-     *   der = inf_octets.to_der
-     *   asn1 = OpenSSL::ASN1.decode(der)
-     *   puts asn1.infinite_length # => true
      */
     cASN1Constructive = rb_define_class_under(mASN1,"Constructive", cASN1Data);
     rb_include_module(cASN1Constructive, rb_mEnumerable);
     /*
      * May be used as a hint for encoding a value either implicitly or
      * explicitly by setting it either to +:IMPLICIT+ or to +:EXPLICIT+.
-     * +tagging+ is not set when a ASN.1 structure is parsed using
+     * _tagging_ is not set when a ASN.1 structure is parsed using
      * OpenSSL::ASN1.decode.
      */
     rb_attr(cASN1Constructive, rb_intern("tagging"), 1, 1, Qtrue);
@@ -1962,11 +1842,14 @@ do{\
     rb_define_method(cASN1ObjectId, "oid", ossl_asn1obj_get_oid, 0);
     rb_define_alias(cASN1ObjectId, "short_name", "sn");
     rb_define_alias(cASN1ObjectId, "long_name", "ln");
+    rb_define_method(cASN1ObjectId, "==", ossl_asn1obj_eq, 1);
     rb_attr(cASN1BitString, rb_intern("unused_bits"), 1, 1, 0);
 
     rb_define_method(cASN1EndOfContent, "initialize", ossl_asn1eoc_initialize, 0);
+    rb_define_method(cASN1EndOfContent, "to_der", ossl_asn1eoc_to_der, 0);
 
     class_tag_map = rb_hash_new();
+    rb_gc_register_mark_object(class_tag_map);
     rb_hash_aset(class_tag_map, cASN1EndOfContent, INT2NUM(V_ASN1_EOC));
     rb_hash_aset(class_tag_map, cASN1Boolean, INT2NUM(V_ASN1_BOOLEAN));
     rb_hash_aset(class_tag_map, cASN1Integer, INT2NUM(V_ASN1_INTEGER));
@@ -1990,5 +1873,6 @@ do{\
     rb_hash_aset(class_tag_map, cASN1GeneralString, INT2NUM(V_ASN1_GENERALSTRING));
     rb_hash_aset(class_tag_map, cASN1UniversalString, INT2NUM(V_ASN1_UNIVERSALSTRING));
     rb_hash_aset(class_tag_map, cASN1BMPString, INT2NUM(V_ASN1_BMPSTRING));
-    rb_global_variable(&class_tag_map);
+
+    id_each = rb_intern_const("each");
 }
diff --git a/ext/openssl/ossl_asn1.h b/ext/openssl/ossl_asn1.h
index b1c85a6804..939a96ce74 100644
--- a/ext/openssl/ossl_asn1.h
+++ b/ext/openssl/ossl_asn1.h
@@ -13,26 +13,22 @@
 /*
  * ASN1_DATE conversions
  */
-VALUE asn1time_to_time(ASN1_TIME *);
-#if defined(HAVE_ASN1_TIME_ADJ)
+VALUE asn1time_to_time(const ASN1_TIME *);
 /* Splits VALUE to seconds and offset days. VALUE is typically a Time or an
  * Integer. This is used when updating ASN1_*TIME with ASN1_TIME_adj() or
  * X509_time_adj_ex(). We can't use ASN1_TIME_set() and X509_time_adj() because
  * they have the Year 2038 issue on sizeof(time_t) == 4 environment */
 void ossl_time_split(VALUE, time_t *, int *);
-#else
-time_t time_to_time_t(VALUE);
-#endif
 
 /*
  * ASN1_STRING conversions
  */
-VALUE asn1str_to_str(ASN1_STRING *);
+VALUE asn1str_to_str(const ASN1_STRING *);
 
 /*
  * ASN1_INTEGER conversions
  */
-VALUE asn1integer_to_num(ASN1_INTEGER *);
+VALUE asn1integer_to_num(const ASN1_INTEGER *);
 ASN1_INTEGER *num_to_asn1integer(VALUE, ASN1_INTEGER *);
 
 /*
diff --git a/ext/openssl/ossl_bio.c b/ext/openssl/ossl_bio.c
index cd2582646b..42833d901a 100644
--- a/ext/openssl/ossl_bio.c
+++ b/ext/openssl/ossl_bio.c
@@ -8,80 +8,35 @@
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 
 BIO *
-ossl_obj2bio(VALUE obj)
+ossl_obj2bio(volatile VALUE *pobj)
 {
+    VALUE obj = *pobj;
     BIO *bio;
 
-    if (RB_TYPE_P(obj, T_FILE)) {
-	rb_io_t *fptr;
-	FILE *fp;
-	int fd;
-
-	GetOpenFile(obj, fptr);
-	rb_io_check_readable(fptr);
-	if ((fd = rb_cloexec_dup(FPTR_TO_FD(fptr))) < 0){
-	    rb_sys_fail(0);
-	}
-        rb_update_max_fd(fd);
-	if (!(fp = fdopen(fd, "r"))){
-	    int e = errno;
-	    close(fd);
-	    rb_syserr_fail(e, 0);
-	}
-	if (!(bio = BIO_new_fp(fp, BIO_CLOSE))){
-	    fclose(fp);
-	    ossl_raise(eOSSLError, NULL);
-	}
-    }
-    else {
-	StringValue(obj);
-	bio = BIO_new_mem_buf(RSTRING_PTR(obj), RSTRING_LENINT(obj));
-	if (!bio) ossl_raise(eOSSLError, NULL);
-    }
-
+    if (RB_TYPE_P(obj, T_FILE))
+	obj = rb_funcallv(obj, rb_intern("read"), 0, NULL);
+    StringValue(obj);
+    bio = BIO_new_mem_buf(RSTRING_PTR(obj), RSTRING_LENINT(obj));
+    if (!bio)
+	ossl_raise(eOSSLError, "BIO_new_mem_buf");
+    *pobj = obj;
     return bio;
 }
 
-BIO *
-ossl_protect_obj2bio(VALUE obj, int *status)
-{
-     BIO *ret = NULL;
-     ret = (BIO*)rb_protect((VALUE(*)_((VALUE)))ossl_obj2bio, obj, status);
-     return ret;
-}
-
 VALUE
-ossl_membio2str0(BIO *bio)
+ossl_membio2str(BIO *bio)
 {
     VALUE ret;
+    int state;
     BUF_MEM *buf;
 
     BIO_get_mem_ptr(bio, &buf);
-    ret = rb_str_new(buf->data, buf->length);
-
-    return ret;
-}
-
-VALUE
-ossl_protect_membio2str(BIO *bio, int *status)
-{
-    return rb_protect((VALUE(*)_((VALUE)))ossl_membio2str0, (VALUE)bio, status);
-}
-
-VALUE
-ossl_membio2str(BIO *bio)
-{
-    VALUE ret;
-    int status = 0;
-
-    ret = ossl_protect_membio2str(bio, &status);
+    ret = ossl_str_new(buf->data, buf->length, &state);
     BIO_free(bio);
-    if(status) rb_jump_tag(status);
+    if (state)
+	rb_jump_tag(state);
 
     return ret;
 }
diff --git a/ext/openssl/ossl_bio.h b/ext/openssl/ossl_bio.h
index 1705d0ac89..da68c5e5a2 100644
--- a/ext/openssl/ossl_bio.h
+++ b/ext/openssl/ossl_bio.h
@@ -10,10 +10,7 @@
 #if !defined(_OSSL_BIO_H_)
 #define _OSSL_BIO_H_
 
-BIO *ossl_obj2bio(VALUE);
-BIO *ossl_protect_obj2bio(VALUE,int*);
-VALUE ossl_membio2str0(BIO*);
+BIO *ossl_obj2bio(volatile VALUE *);
 VALUE ossl_membio2str(BIO*);
-VALUE ossl_protect_membio2str(BIO*,int*);
 
 #endif
diff --git a/ext/openssl/ossl_bn.c b/ext/openssl/ossl_bn.c
index 6a0a21eb83..bec37299f7 100644
--- a/ext/openssl/ossl_bn.c
+++ b/ext/openssl/ossl_bn.c
@@ -10,6 +10,10 @@
 /* modified by Michal Rokos <m.rokos@sh.cvut.cz> */
 #include "ossl.h"
 
+#if HAVE_RB_EXT_RACTOR_SAFE
+#include <ruby/ractor.h>
+#endif
+
 #define NewBN(klass) \
   TypedData_Wrap_Struct((klass), &ossl_bn_type, 0)
 #define SetBN(obj, bn) do { \
@@ -26,11 +30,6 @@
   } \
 } while (0)
 
-#define SafeGetBN(obj, bn) do { \
-  OSSL_Check_Kind((obj), cBN); \
-  GetBN((obj), (bn)); \
-} while (0)
-
 static void
 ossl_bn_free(void *ptr)
 {
@@ -52,8 +51,6 @@ VALUE cBN;
 
 /* Document-class: OpenSSL::BNError
  *
- * BNError < OpenSSLError
- *
  * Generic Error for all of OpenSSL::BN (big num)
  */
 VALUE eBNError;
@@ -78,33 +75,78 @@ ossl_bn_new(const BIGNUM *bn)
 }
 
 static BIGNUM *
-try_convert_to_bnptr(VALUE obj)
+integer_to_bnptr(VALUE obj, BIGNUM *orig)
 {
-    BIGNUM *bn = NULL;
-    VALUE newobj;
+    BIGNUM *bn;
 
-    if (RTEST(rb_obj_is_kind_of(obj, cBN))) {
-	GetBN(obj, bn);
-    } else switch (TYPE(obj)) {
-    case T_FIXNUM:
-    case T_BIGNUM:
-	obj = rb_String(obj);
-	newobj = NewBN(cBN);	/* GC bug */
-	if (!BN_dec2bn(&bn, StringValueCStr(obj))) {
-	    ossl_raise(eBNError, NULL);
+    if (FIXNUM_P(obj)) {
+	long i;
+	unsigned char bin[sizeof(long)];
+	long n = FIX2LONG(obj);
+	unsigned long un = labs(n);
+
+	for (i = sizeof(long) - 1; 0 <= i; i--) {
+	    bin[i] = un & 0xff;
+	    un >>= 8;
 	}
-	SetBN(newobj, bn); /* Handle potencial mem leaks */
-	break;
+
+	bn = BN_bin2bn(bin, sizeof(bin), orig);
+	if (!bn)
+	    ossl_raise(eBNError, "BN_bin2bn");
+	if (n < 0)
+	    BN_set_negative(bn, 1);
     }
+    else { /* assuming Bignum */
+	size_t len = rb_absint_size(obj, NULL);
+	unsigned char *bin;
+	VALUE buf;
+	int sign;
+
+	if (INT_MAX < len) {
+	    rb_raise(eBNError, "bignum too long");
+	}
+	bin = (unsigned char*)ALLOCV_N(unsigned char, buf, len);
+	sign = rb_integer_pack(obj, bin, len, 1, 0, INTEGER_PACK_BIG_ENDIAN);
+
+	bn = BN_bin2bn(bin, (int)len, orig);
+	ALLOCV_END(buf);
+	if (!bn)
+	    ossl_raise(eBNError, "BN_bin2bn");
+	if (sign < 0)
+	    BN_set_negative(bn, 1);
+    }
+
     return bn;
 }
 
+static VALUE
+try_convert_to_bn(VALUE obj)
+{
+    BIGNUM *bn;
+    VALUE newobj = Qnil;
+
+    if (rb_obj_is_kind_of(obj, cBN))
+	return obj;
+    if (RB_INTEGER_TYPE_P(obj)) {
+	newobj = NewBN(cBN); /* Handle potential mem leaks */
+	bn = integer_to_bnptr(obj, NULL);
+	SetBN(newobj, bn);
+    }
+
+    return newobj;
+}
+
 BIGNUM *
-GetBNPtr(VALUE obj)
+ossl_bn_value_ptr(volatile VALUE *ptr)
 {
-    BIGNUM *bn = try_convert_to_bnptr(obj);
-    if (!bn)
+    VALUE tmp;
+    BIGNUM *bn;
+
+    tmp = try_convert_to_bn(*ptr);
+    if (NIL_P(tmp))
 	ossl_raise(rb_eTypeError, "Cannot convert into OpenSSL::BN");
+    GetBN(tmp, bn);
+    *ptr = tmp;
 
     return bn;
 }
@@ -112,12 +154,58 @@ GetBNPtr(VALUE obj)
 /*
  * Private
  */
-/*
- * BN_CTX - is used in more difficult math. ops
- * (Why just 1? Because Ruby itself isn't thread safe,
- *  we don't need to care about threads)
- */
-BN_CTX *ossl_bn_ctx;
+
+#if HAVE_RB_EXT_RACTOR_SAFE
+void
+ossl_bn_ctx_free(void *ptr)
+{
+    BN_CTX *ctx = (BN_CTX *)ptr;
+    BN_CTX_free(ctx);
+}
+
+struct rb_ractor_local_storage_type ossl_bn_ctx_key_type = {
+    NULL, // mark
+    ossl_bn_ctx_free,
+};
+
+rb_ractor_local_key_t ossl_bn_ctx_key;
+
+BN_CTX *
+ossl_bn_ctx_get(void)
+{
+    // stored in ractor local storage
+
+    BN_CTX *ctx = rb_ractor_local_storage_ptr(ossl_bn_ctx_key);
+    if (!ctx) {
+        if (!(ctx = BN_CTX_new())) {
+            ossl_raise(rb_eRuntimeError, "Cannot init BN_CTX");
+        }
+        rb_ractor_local_storage_ptr_set(ossl_bn_ctx_key, ctx);
+    }
+    return ctx;
+}
+#else
+// for ruby 2.x
+static BN_CTX *gv_ossl_bn_ctx;
+
+BN_CTX *
+ossl_bn_ctx_get(void)
+{
+    if (gv_ossl_bn_ctx == NULL) {
+        if (!(gv_ossl_bn_ctx = BN_CTX_new())) {
+            ossl_raise(rb_eRuntimeError, "Cannot init BN_CTX");
+        }
+    }
+    return gv_ossl_bn_ctx;
+}
+
+void
+ossl_bn_ctx_free(void)
+{
+    BN_CTX_free(gv_ossl_bn_ctx);
+    gv_ossl_bn_ctx = NULL;
+}
+#endif
 
 static VALUE
 ossl_bn_alloc(VALUE klass)
@@ -133,15 +221,14 @@ ossl_bn_alloc(VALUE klass)
     return obj;
 }
 
-/* Document-method: OpenSSL::BN.new
- *
- *    OpenSSL::BN.new => aBN
+/*
+ * call-seq:
  *    OpenSSL::BN.new(bn) => aBN
  *    OpenSSL::BN.new(integer) => aBN
  *    OpenSSL::BN.new(string) => aBN
  *    OpenSSL::BN.new(string, 0 | 2 | 10 | 16) => aBN
  *
- * Construct a new OpenSSL BigNum object.
+ * Construct a new OpenSSL BIGNUM object.
  */
 static VALUE
 ossl_bn_initialize(int argc, VALUE *argv, VALUE self)
@@ -149,50 +236,23 @@ ossl_bn_initialize(int argc, VALUE *argv, VALUE self)
     BIGNUM *bn;
     VALUE str, bs;
     int base = 10;
+    char *ptr;
 
     if (rb_scan_args(argc, argv, "11", &str, &bs) == 2) {
 	base = NUM2INT(bs);
     }
 
-    if (RB_TYPE_P(str, T_FIXNUM)) {
-	long i;
-	unsigned char bin[sizeof(long)];
-	long n = FIX2LONG(str);
-	unsigned long un = labs(n);
-
-	for (i = sizeof(long) - 1; 0 <= i; i--) {
-	    bin[i] = un&0xff;
-	    un >>= 8;
-	}
-
-	GetBN(self, bn);
-	if (!BN_bin2bn(bin, sizeof(bin), bn)) {
-	    ossl_raise(eBNError, NULL);
-	}
-	if (n < 0) BN_set_negative(bn, 1);
-	return self;
+    if (NIL_P(str)) {
+        ossl_raise(rb_eArgError, "invalid argument");
     }
-    else if (RB_TYPE_P(str, T_BIGNUM)) {
-        size_t len = rb_absint_size(str, NULL);
-	unsigned char *bin;
-	VALUE buf;
-        int sign;
-
-        if (INT_MAX < len) {
-            rb_raise(eBNError, "bignum too long");
-        }
-        bin = (unsigned char*)ALLOCV_N(unsigned char, buf, len);
-        sign = rb_integer_pack(str, bin, len, 1, 0, INTEGER_PACK_BIG_ENDIAN);
 
+    if (RB_INTEGER_TYPE_P(str)) {
 	GetBN(self, bn);
-	if (!BN_bin2bn(bin, (int)len, bn)) {
-	    ALLOCV_END(buf);
-	    ossl_raise(eBNError, NULL);
-	}
-	ALLOCV_END(buf);
-	if (sign < 0) BN_set_negative(bn, 1);
+	integer_to_bnptr(str, bn);
+
 	return self;
     }
+
     if (RTEST(rb_obj_is_kind_of(str, cBN))) {
 	BIGNUM *other;
 
@@ -207,12 +267,14 @@ ossl_bn_initialize(int argc, VALUE *argv, VALUE self)
     GetBN(self, bn);
     switch (base) {
     case 0:
-	if (!BN_mpi2bn((unsigned char *)StringValuePtr(str), RSTRING_LENINT(str), bn)) {
+        ptr = StringValuePtr(str);
+        if (!BN_mpi2bn((unsigned char *)ptr, RSTRING_LENINT(str), bn)) {
 	    ossl_raise(eBNError, NULL);
 	}
 	break;
     case 2:
-	if (!BN_bin2bn((unsigned char *)StringValuePtr(str), RSTRING_LENINT(str), bn)) {
+        ptr = StringValuePtr(str);
+        if (!BN_bin2bn((unsigned char *)ptr, RSTRING_LENINT(str), bn)) {
 	    ossl_raise(eBNError, NULL);
 	}
 	break;
@@ -238,12 +300,12 @@ ossl_bn_initialize(int argc, VALUE *argv, VALUE self)
  *    bn.to_s(base) => string
  *
  * === Parameters
- * * +base+ - integer
- * * * Valid values:
- * * * * 0 - MPI
- * * * * 2 - binary
- * * * * 10 - the default
- * * * * 16 - hex
+ * * _base_ - Integer
+ *   Valid values:
+ *   * 0 - MPI
+ *   * 2 - binary
+ *   * 10 - the default
+ *   * 16 - hex
  */
 static VALUE
 ossl_bn_to_s(int argc, VALUE *argv, VALUE self)
@@ -346,22 +408,40 @@ ossl_bn_coerce(VALUE self, VALUE other)
 
 /*
  * Document-method: OpenSSL::BN#zero?
+ * call-seq:
  *   bn.zero? => true | false
  */
 BIGNUM_BOOL1(is_zero)
 
 /*
  * Document-method: OpenSSL::BN#one?
+ * call-seq:
  *   bn.one? => true | false
  */
 BIGNUM_BOOL1(is_one)
 
 /*
  * Document-method: OpenSSL::BN#odd?
+ * call-seq:
  *   bn.odd? => true | false
  */
 BIGNUM_BOOL1(is_odd)
 
+/*
+ * call-seq:
+ *   bn.negative? => true | false
+ */
+static VALUE
+ossl_bn_is_negative(VALUE self)
+{
+    BIGNUM *bn;
+
+    GetBN(self, bn);
+    if (BN_is_zero(bn))
+	return Qfalse;
+    return BN_is_negative(bn) ? Qtrue : Qfalse;
+}
+
 #define BIGNUM_1c(func)					\
     static VALUE					\
     ossl_bn_##func(VALUE self)				\
@@ -369,11 +449,11 @@ BIGNUM_BOOL1(is_odd)
 	BIGNUM *bn, *result;				\
 	VALUE obj;					\
 	GetBN(self, bn);				\
-	obj = NewBN(CLASS_OF(self));			\
+	obj = NewBN(rb_obj_class(self));		\
 	if (!(result = BN_new())) {			\
 	    ossl_raise(eBNError, NULL);			\
 	}						\
-	if (!BN_##func(result, bn, ossl_bn_ctx)) {	\
+	if (BN_##func(result, bn, ossl_bn_ctx) <= 0) {	\
 	    BN_free(result);				\
 	    ossl_raise(eBNError, NULL);			\
 	}						\
@@ -383,6 +463,7 @@ BIGNUM_BOOL1(is_odd)
 
 /*
  * Document-method: OpenSSL::BN#sqr
+ * call-seq:
  *   bn.sqr => aBN
  */
 BIGNUM_1c(sqr)
@@ -394,11 +475,11 @@ BIGNUM_1c(sqr)
 	BIGNUM *bn1, *bn2 = GetBNPtr(other), *result;	\
 	VALUE obj;					\
 	GetBN(self, bn1);				\
-	obj = NewBN(CLASS_OF(self));			\
+	obj = NewBN(rb_obj_class(self));		\
 	if (!(result = BN_new())) {			\
 	    ossl_raise(eBNError, NULL);			\
 	}						\
-	if (!BN_##func(result, bn1, bn2)) {		\
+	if (BN_##func(result, bn1, bn2) <= 0) {		\
 	    BN_free(result);				\
 	    ossl_raise(eBNError, NULL);			\
 	}						\
@@ -408,12 +489,14 @@ BIGNUM_1c(sqr)
 
 /*
  * Document-method: OpenSSL::BN#+
+ * call-seq:
  *   bn + bn2 => aBN
  */
 BIGNUM_2(add)
 
 /*
  * Document-method: OpenSSL::BN#-
+ * call-seq:
  *   bn - bn2 => aBN
  */
 BIGNUM_2(sub)
@@ -425,11 +508,11 @@ BIGNUM_2(sub)
 	BIGNUM *bn1, *bn2 = GetBNPtr(other), *result;		\
 	VALUE obj;						\
 	GetBN(self, bn1);					\
-	obj = NewBN(CLASS_OF(self));				\
+	obj = NewBN(rb_obj_class(self));			\
 	if (!(result = BN_new())) {				\
 	    ossl_raise(eBNError, NULL);				\
 	}							\
-	if (!BN_##func(result, bn1, bn2, ossl_bn_ctx)) {	\
+	if (BN_##func(result, bn1, bn2, ossl_bn_ctx) <= 0) {	\
 	    BN_free(result);					\
 	    ossl_raise(eBNError, NULL);				\
 	}							\
@@ -439,42 +522,58 @@ BIGNUM_2(sub)
 
 /*
  * Document-method: OpenSSL::BN#*
+ * call-seq:
  *   bn * bn2 => aBN
  */
 BIGNUM_2c(mul)
 
 /*
  * Document-method: OpenSSL::BN#%
+ * call-seq:
  *   bn % bn2 => aBN
  */
 BIGNUM_2c(mod)
 
 /*
  * Document-method: OpenSSL::BN#**
+ * call-seq:
  *   bn ** bn2 => aBN
  */
 BIGNUM_2c(exp)
 
 /*
  * Document-method: OpenSSL::BN#gcd
+ * call-seq:
  *   bn.gcd(bn2) => aBN
  */
 BIGNUM_2c(gcd)
 
 /*
  * Document-method: OpenSSL::BN#mod_sqr
+ * call-seq:
  *   bn.mod_sqr(bn2) => aBN
  */
 BIGNUM_2c(mod_sqr)
 
 /*
- * Document-method: OpenSSL::BN#mod_inverse
- *   bn.mod_inverse(bn2) => aBN
+ * call-seq:
+ *    bn.mod_inverse(bn2) => aBN
  */
-BIGNUM_2c(mod_inverse)
+static VALUE
+ossl_bn_mod_inverse(VALUE self, VALUE other)
+{
+    BIGNUM *bn1, *bn2 = GetBNPtr(other), *result;
+    VALUE obj;
+    GetBN(self, bn1);
+    obj = NewBN(rb_obj_class(self));
+    if (!(result = BN_mod_inverse(NULL, bn1, bn2, ossl_bn_ctx)))
+        ossl_raise(eBNError, "BN_mod_inverse");
+    SetBN(obj, result);
+    return obj;
+}
 
 /*
- * Document-method: OpenSSL::BN#/
+ * call-seq:
  *    bn1 / bn2 => [result, remainder]
  *
  * Division of OpenSSL::BN instances
@@ -483,12 +582,13 @@ static VALUE
 ossl_bn_div(VALUE self, VALUE other)
 {
     BIGNUM *bn1, *bn2 = GetBNPtr(other), *r1, *r2;
-    VALUE obj1, obj2;
+    VALUE klass, obj1, obj2;
 
     GetBN(self, bn1);
 
-    obj1 = NewBN(CLASS_OF(self));
-    obj2 = NewBN(CLASS_OF(self));
+    klass = rb_obj_class(self);
+    obj1 = NewBN(klass);
+    obj2 = NewBN(klass);
     if (!(r1 = BN_new())) {
 	ossl_raise(eBNError, NULL);
     }
@@ -515,11 +615,11 @@ ossl_bn_div(VALUE self, VALUE other)
 	BIGNUM *bn3 = GetBNPtr(other2), *result;		\
 	VALUE obj;						\
 	GetBN(self, bn1);					\
-	obj = NewBN(CLASS_OF(self));				\
+	obj = NewBN(rb_obj_class(self));			\
 	if (!(result = BN_new())) {				\
 	    ossl_raise(eBNError, NULL);				\
 	}							\
-	if (!BN_##func(result, bn1, bn2, bn3, ossl_bn_ctx)) {	\
+	if (BN_##func(result, bn1, bn2, bn3, ossl_bn_ctx) <= 0) { \
 	    BN_free(result);					\
 	    ossl_raise(eBNError, NULL);				\
 	}							\
@@ -529,24 +629,28 @@ ossl_bn_div(VALUE self, VALUE other)
 
 /*
  * Document-method: OpenSSL::BN#mod_add
+ * call-seq:
  *   bn.mod_add(bn1, bn2) -> aBN
  */
 BIGNUM_3c(mod_add)
 
 /*
  * Document-method: OpenSSL::BN#mod_sub
+ * call-seq:
  *   bn.mod_sub(bn1, bn2) -> aBN
  */
 BIGNUM_3c(mod_sub)
 
 /*
  * Document-method: OpenSSL::BN#mod_mul
+ * call-seq:
  *   bn.mod_mul(bn1, bn2) -> aBN
  */
 BIGNUM_3c(mod_mul)
 
 /*
  * Document-method: OpenSSL::BN#mod_exp
+ * call-seq:
  *   bn.mod_exp(bn1, bn2) -> aBN
  */
 BIGNUM_3c(mod_exp)
@@ -557,7 +661,7 @@ BIGNUM_3c(mod_exp)
     {							\
 	BIGNUM *bn;					\
 	GetBN(self, bn);				\
-	if (!BN_##func(bn, NUM2INT(bit))) {		\
+	if (BN_##func(bn, NUM2INT(bit)) <= 0) {		\
 	    ossl_raise(eBNError, NULL);			\
 	}						\
 	return self;					\
@@ -565,29 +669,30 @@ BIGNUM_3c(mod_exp)
 
 /*
  * Document-method: OpenSSL::BN#set_bit!
+ * call-seq:
  *   bn.set_bit!(bit) -> self
  */
 BIGNUM_BIT(set_bit)
 
 /*
  * Document-method: OpenSSL::BN#clear_bit!
+ * call-seq:
  *   bn.clear_bit!(bit) -> self
  */
 BIGNUM_BIT(clear_bit)
 
 /*
  * Document-method: OpenSSL::BN#mask_bit!
+ * call-seq:
  *   bn.mask_bit!(bit) -> self
  */
 BIGNUM_BIT(mask_bits)
 
-/* Document-method: OpenSSL::BN#bit_set?
- *
- * Returns boolean of whether +bit+ is set.
- * Bitwise operations for openssl BIGNUMs.
- *
- *    bn.bit_set?(bit) => true | false
+/*
+ * call-seq:
+ *   bn.bit_set?(bit) => true | false
  *
+ * Tests bit _bit_ in _bn_ and returns +true+ if set, +false+ if not set.
  */
 static VALUE
 ossl_bn_is_bit_set(VALUE self, VALUE bit)
@@ -612,11 +717,11 @@ ossl_bn_is_bit_set(VALUE self, VALUE bit)
 	VALUE obj;					\
 	b = NUM2INT(bits);				\
 	GetBN(self, bn);				\
-	obj = NewBN(CLASS_OF(self));			\
+	obj = NewBN(rb_obj_class(self));		\
 	if (!(result = BN_new())) {			\
 		ossl_raise(eBNError, NULL);		\
 	}						\
-	if (!BN_##func(result, bn, b)) {		\
+	if (BN_##func(result, bn, b) <= 0) {		\
 		BN_free(result);			\
 		ossl_raise(eBNError, NULL);		\
 	}						\
@@ -646,19 +751,21 @@ BIGNUM_SHIFT(rshift)
 	int b;						\
 	b = NUM2INT(bits);				\
 	GetBN(self, bn);				\
-	if (!BN_##func(bn, bn, b))			\
+	if (BN_##func(bn, bn, b) <= 0)			\
 		ossl_raise(eBNError, NULL);		\
 	return self;					\
     }
 
 /*
  * Document-method: OpenSSL::BN#lshift!
+ * call-seq:
  *   bn.lshift!(bits) -> self
  */
 BIGNUM_SELF_SHIFT(lshift)
 
 /*
  * Document-method: OpenSSL::BN#rshift!
+ * call-seq:
  *   bn.rshift!(bits) -> self
  */
 BIGNUM_SELF_SHIFT(rshift)
@@ -683,7 +790,7 @@ BIGNUM_SELF_SHIFT(rshift)
 	if (!(result = BN_new())) {				\
 	    ossl_raise(eBNError, NULL);				\
 	}							\
-	if (!BN_##func(result, b, top, bottom)) {		\
+	if (BN_##func(result, b, top, bottom) <= 0) {		\
 	    BN_free(result);					\
 	    ossl_raise(eBNError, NULL);				\
 	}							\
@@ -712,7 +819,7 @@ BIGNUM_RAND(pseudo_rand)
 	if (!(result = BN_new())) {				\
 	    ossl_raise(eBNError, NULL);				\
 	}							\
-	if (!BN_##func##_range(result, bn)) {			\
+	if (BN_##func##_range(result, bn) <= 0) {		\
 	    BN_free(result);					\
 	    ossl_raise(eBNError, NULL);				\
 	}							\
@@ -722,6 +829,7 @@ BIGNUM_RAND(pseudo_rand)
 
 /*
  * Document-method: OpenSSL::BN.rand_range
+ * call-seq:
  *   BN.rand_range(range) -> aBN
  *
  */
@@ -729,6 +837,7 @@ BIGNUM_RAND_RANGE(rand)
 
 /*
  * Document-method: OpenSSL::BN.pseudo_rand_range
+ * call-seq:
  *   BN.pseudo_rand_range(range) -> aBN
  *
  */
@@ -738,15 +847,15 @@ BIGNUM_RAND_RANGE(pseudo_rand)
  * call-seq:
  *    BN.generate_prime(bits, [, safe [, add [, rem]]]) => bn
  *
- * Generates a random prime number of bit length +bits+. If +safe+ is true,
- * generates a safe prime. If +add+ is specified, generates a prime that
+ * Generates a random prime number of bit length _bits_. If _safe_ is set to
+ * +true+, generates a safe prime. If _add_ is specified, generates a prime that
  * fulfills condition <tt>p % add = rem</tt>.
  *
  * === Parameters
- * * +bits+ - integer
- * * +safe+ - boolean
- * * +add+ - BN
- * * +rem+ - BN
+ * * _bits_ - integer
+ * * _safe_ - boolean
+ * * _add_ - BN
+ * * _rem_ - BN
  */
 static VALUE
 ossl_bn_s_generate_prime(int argc, VALUE *argv, VALUE klass)
@@ -785,17 +894,19 @@ ossl_bn_s_generate_prime(int argc, VALUE *argv, VALUE klass)
     {						\
 	BIGNUM *bn;				\
 	GetBN(self, bn);			\
-	return INT2FIX(BN_##func(bn));		\
+	return INT2NUM(BN_##func(bn));		\
     }
 
 /*
  * Document-method: OpenSSL::BN#num_bytes
+ * call-seq:
  *   bn.num_bytes => integer
  */
 BIGNUM_NUM(num_bytes)
 
 /*
  * Document-method: OpenSSL::BN#num_bits
+ * call-seq:
  *   bn.num_bits => integer
  */
 BIGNUM_NUM(num_bits)
@@ -818,27 +929,61 @@ ossl_bn_copy(VALUE self, VALUE other)
     return self;
 }
 
+/*
+ * call-seq:
+ *   +bn -> aBN
+ */
+static VALUE
+ossl_bn_uplus(VALUE self)
+{
+    return self;
+}
+
+/*
+ * call-seq:
+ *   -bn -> aBN
+ */
+static VALUE
+ossl_bn_uminus(VALUE self)
+{
+    VALUE obj;
+    BIGNUM *bn1, *bn2;
+
+    GetBN(self, bn1);
+    obj = NewBN(cBN);
+    bn2 = BN_dup(bn1);
+    if (!bn2)
+	ossl_raise(eBNError, "BN_dup");
+    SetBN(obj, bn2);
+    BN_set_negative(bn2, !BN_is_negative(bn2));
+
+    return obj;
+}
+
 #define BIGNUM_CMP(func)				\
     static VALUE					\
     ossl_bn_##func(VALUE self, VALUE other)		\
     {							\
 	BIGNUM *bn1, *bn2 = GetBNPtr(other);		\
 	GetBN(self, bn1);				\
-	return INT2FIX(BN_##func(bn1, bn2));		\
+	return INT2NUM(BN_##func(bn1, bn2));		\
     }
 
 /*
  * Document-method: OpenSSL::BN#cmp
+ * call-seq:
  *   bn.cmp(bn2) => integer
  */
 /*
  * Document-method: OpenSSL::BN#<=>
+ * call-seq:
  *   bn <=> bn2 => integer
  */
 BIGNUM_CMP(cmp)
 
 /*
  * Document-method: OpenSSL::BN#ucmp
+ * call-seq:
  *   bn.ucmp(bn2) => integer
  */
 BIGNUM_CMP(ucmp)
@@ -847,7 +992,7 @@ BIGNUM_CMP(ucmp)
  *  call-seq:
  *     bn == obj => true or false
  *
- *  Returns +true+ only if +obj+ has the same value as +bn+. Contrast this
+ *  Returns +true+ only if _obj_ has the same value as _bn_. Contrast this
  *  with OpenSSL::BN#eql?, which requires obj to be OpenSSL::BN.
  */
 static VALUE
@@ -856,10 +1001,12 @@ ossl_bn_eq(VALUE self, VALUE other)
     BIGNUM *bn1, *bn2;
 
     GetBN(self, bn1);
-    /* BNPtr may raise, so we can't use here */
-    bn2 = try_convert_to_bnptr(other);
+    other = try_convert_to_bn(other);
+    if (NIL_P(other))
+	return Qfalse;
+    GetBN(other, bn2);
 
-    if (bn2 && !BN_cmp(bn1, bn2)) {
+    if (!BN_cmp(bn1, bn2)) {
 	return Qtrue;
     }
     return Qfalse;
@@ -870,7 +1017,7 @@ ossl_bn_eq(VALUE self, VALUE other)
  *     bn.eql?(obj) => true or false
  *
  *  Returns <code>true</code> only if <i>obj</i> is a
- *  <code>OpenSSL::BN</code> with the same value as <i>big</i>. Contrast this
+ *  <code>OpenSSL::BN</code> with the same value as <i>bn</i>. Contrast this
  *  with OpenSSL::BN#==, which performs type conversions.
  */
 static VALUE
@@ -898,20 +1045,20 @@ static VALUE
 ossl_bn_hash(VALUE self)
 {
     BIGNUM *bn;
-    VALUE hash;
+    VALUE tmp, hash;
     unsigned char *buf;
     int len;
 
     GetBN(self, bn);
     len = BN_num_bytes(bn);
-    buf = xmalloc(len);
+    buf = ALLOCV(tmp, len);
     if (BN_bn2bin(bn, buf) != len) {
-	xfree(buf);
-	ossl_raise(eBNError, NULL);
+	ALLOCV_END(tmp);
+	ossl_raise(eBNError, "BN_bn2bin");
     }
 
-    hash = INT2FIX(rb_memhash(buf, len));
-    xfree(buf);
+    hash = ST2FIX(rb_memhash(buf, len));
+    ALLOCV_END(tmp);
 
     return hash;
 }
@@ -921,12 +1068,12 @@ ossl_bn_hash(VALUE self)
  *    bn.prime? => true | false
  *    bn.prime?(checks) => true | false
  *
- *  Performs a Miller-Rabin probabilistic primality test with +checks+
- *  iterations. If +nchecks+ is not specified, a number of iterations is used
- *  that yields a false positive rate of at most 2^-80 for random input.
+ * Performs a Miller-Rabin probabilistic primality test with _checks_
+ * iterations. If _checks_ is not specified, a number of iterations is used
+ * that yields a false positive rate of at most 2^-80 for random input.
  *
  * === Parameters
- * * +checks+ - integer
+ * * _checks_ - integer
  */
 static VALUE
 ossl_bn_is_prime(int argc, VALUE *argv, VALUE self)
@@ -957,12 +1104,12 @@ ossl_bn_is_prime(int argc, VALUE *argv, VALUE self)
  *    bn.prime_fasttest?(checks) => true | false
  *    bn.prime_fasttest?(checks, trial_div) => true | false
  *
- *  Performs a Miller-Rabin primality test. This is same as #prime? except this
- *  first attempts trial divisions with some small primes.
+ * Performs a Miller-Rabin primality test. This is same as #prime? except this
+ * first attempts trial divisions with some small primes.
  *
  * === Parameters
- * * +checks+ - integer
- * * +trial_div+ - boolean
+ * * _checks_ - integer
+ * * _trial_div_ - boolean
  */
 static VALUE
 ossl_bn_is_prime_fasttest(int argc, VALUE *argv, VALUE self)
@@ -1001,12 +1148,15 @@ void
 Init_ossl_bn(void)
 {
 #if 0
-    mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
+    mOSSL = rb_define_module("OpenSSL");
+    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
 #endif
 
-    if (!(ossl_bn_ctx = BN_CTX_new())) {
-	ossl_raise(rb_eRuntimeError, "Cannot init BN_CTX");
-    }
+#ifdef HAVE_RB_EXT_RACTOR_SAFE
+    ossl_bn_ctx_key = rb_ractor_local_storage_ptr_newkey(&ossl_bn_ctx_key_type);
+#else
+    ossl_bn_ctx_get();
+#endif
 
     eBNError = rb_define_class_under(mOSSL, "BNError", eOSSLError);
 
@@ -1015,7 +1165,7 @@ Init_ossl_bn(void)
     rb_define_alloc_func(cBN, ossl_bn_alloc);
     rb_define_method(cBN, "initialize", ossl_bn_initialize, -1);
 
-    rb_define_copy_func(cBN, ossl_bn_copy);
+    rb_define_method(cBN, "initialize_copy", ossl_bn_copy, 1);
     rb_define_method(cBN, "copy", ossl_bn_copy, 1);
 
     /* swap (=coerce?) */
@@ -1024,6 +1174,9 @@ Init_ossl_bn(void)
     rb_define_method(cBN, "num_bits", ossl_bn_num_bits, 0);
     /* num_bits_word */
 
+    rb_define_method(cBN, "+@", ossl_bn_uplus, 0);
+    rb_define_method(cBN, "-@", ossl_bn_uminus, 0);
+
     rb_define_method(cBN, "+", ossl_bn_add, 1);
     rb_define_method(cBN, "-", ossl_bn_sub, 1);
     rb_define_method(cBN, "*", ossl_bn_mul, 1);
@@ -1057,6 +1210,7 @@ Init_ossl_bn(void)
     rb_define_method(cBN, "one?", ossl_bn_is_one, 0);
     /* is_word */
     rb_define_method(cBN, "odd?", ossl_bn_is_odd, 0);
+    rb_define_method(cBN, "negative?", ossl_bn_is_negative, 0);
 
     /* zero
      * one
diff --git a/ext/openssl/ossl_bn.h b/ext/openssl/ossl_bn.h
index 4cd9d0600a..1cc041fc22 100644
--- a/ext/openssl/ossl_bn.h
+++ b/ext/openssl/ossl_bn.h
@@ -13,10 +13,13 @@
 extern VALUE cBN;
 extern VALUE eBNError;
 
-extern BN_CTX *ossl_bn_ctx;
+BN_CTX *ossl_bn_ctx_get(void);
+#define ossl_bn_ctx ossl_bn_ctx_get()
+
+#define GetBNPtr(obj) ossl_bn_value_ptr(&(obj))
 
 VALUE ossl_bn_new(const BIGNUM *);
-BIGNUM *GetBNPtr(VALUE);
+BIGNUM *ossl_bn_value_ptr(volatile VALUE *);
 void Init_ossl_bn(void);
 
 
diff --git a/ext/openssl/ossl_cipher.c b/ext/openssl/ossl_cipher.c
index be7a0321ae..5b92fc39f0 100644
--- a/ext/openssl/ossl_cipher.c
+++ b/ext/openssl/ossl_cipher.c
@@ -23,19 +23,16 @@
 #define GetCipher(obj, ctx) do { \
     GetCipherInit((obj), (ctx)); \
     if (!(ctx)) { \
-	ossl_raise(rb_eRuntimeError, "Cipher not inititalized!"); \
+	ossl_raise(rb_eRuntimeError, "Cipher not initialized!"); \
     } \
 } while (0)
-#define SafeGetCipher(obj, ctx) do { \
-    OSSL_Check_Kind((obj), cCipher); \
-    GetCipher((obj), (ctx)); \
-} while (0)
 
 /*
  * Classes
  */
 VALUE cCipher;
 VALUE eCipherError;
+static ID id_auth_tag_len, id_key_set;
 
 static VALUE ossl_cipher_alloc(VALUE klass);
 static void ossl_cipher_free(void *ptr);
@@ -52,13 +49,26 @@ static const rb_data_type_t ossl_cipher_type = {
  * PUBLIC
  */
 const EVP_CIPHER *
-GetCipherPtr(VALUE obj)
+ossl_evp_get_cipherbyname(VALUE obj)
 {
-    EVP_CIPHER_CTX *ctx;
+    if (rb_obj_is_kind_of(obj, cCipher)) {
+	EVP_CIPHER_CTX *ctx;
+
+	GetCipher(obj, ctx);
+
+	return EVP_CIPHER_CTX_cipher(ctx);
+    }
+    else {
+	const EVP_CIPHER *cipher;
 
-    SafeGetCipher(obj, ctx);
+	StringValueCStr(obj);
+	cipher = EVP_get_cipherbyname(RSTRING_PTR(obj));
+	if (!cipher)
+	    ossl_raise(rb_eArgError,
+		       "unsupported cipher algorithm: %"PRIsVALUE, obj);
 
-    return EVP_CIPHER_CTX_cipher(ctx);
+	return cipher;
+    }
 }
 
 VALUE
@@ -94,7 +104,7 @@ ossl_cipher_alloc(VALUE klass)
  *  call-seq:
  *     Cipher.new(string) -> cipher
  *
- *  The string must contain a valid cipher name like "AES-128-CBC" or "3DES".
+ *  The string must contain a valid cipher name like "AES-256-CBC".
  *
  *  A list of cipher names is available by calling OpenSSL::Cipher.ciphers.
  */
@@ -104,27 +114,17 @@ ossl_cipher_initialize(VALUE self, VALUE str)
     EVP_CIPHER_CTX *ctx;
     const EVP_CIPHER *cipher;
     char *name;
-    unsigned char dummy_key[EVP_MAX_KEY_LENGTH] = { 0 };
 
     name = StringValueCStr(str);
     GetCipherInit(self, ctx);
     if (ctx) {
-	ossl_raise(rb_eRuntimeError, "Cipher already inititalized!");
+	ossl_raise(rb_eRuntimeError, "Cipher already initialized!");
     }
     AllocCipher(self, ctx);
     if (!(cipher = EVP_get_cipherbyname(name))) {
 	ossl_raise(rb_eRuntimeError, "unsupported cipher algorithm (%"PRIsVALUE")", str);
     }
-    /*
-     * EVP_CipherInit_ex() allows to specify NULL to key and IV, however some
-     * ciphers don't handle well (OpenSSL's bug). [Bug #2768]
-     *
-     * The EVP which has EVP_CIPH_RAND_KEY flag (such as DES3) allows
-     * uninitialized key, but other EVPs (such as AES) does not allow it.
-     * Calling EVP_CipherUpdate() without initializing key causes SEGV so we
-     * set the data filled with "\0" as the key by default.
-     */
-    if (EVP_CipherInit_ex(ctx, cipher, NULL, dummy_key, NULL, -1) != 1)
+    if (EVP_CipherInit_ex(ctx, cipher, NULL, NULL, NULL, -1) != 1)
 	ossl_raise(eCipherError, NULL);
 
     return self;
@@ -142,7 +142,7 @@ ossl_cipher_copy(VALUE self, VALUE other)
     if (!ctx1) {
 	AllocCipher(self, ctx1);
     }
-    SafeGetCipher(other, ctx2);
+    GetCipher(other, ctx2);
     if (EVP_CIPHER_CTX_copy(ctx1, ctx2) != 1)
 	ossl_raise(eCipherError, NULL);
 
@@ -237,6 +237,8 @@ ossl_cipher_init(int argc, VALUE *argv, VALUE self, int mode)
 	ossl_raise(eCipherError, NULL);
     }
 
+    rb_ivar_set(self, id_key_set, p_key ? Qtrue : Qfalse);
+
     return self;
 }
 
@@ -248,7 +250,7 @@ ossl_cipher_init(int argc, VALUE *argv, VALUE self, int mode)
  *
  *  Make sure to call Cipher#encrypt or Cipher#decrypt before using any of the
  *  following methods:
- *  * [key=, iv=, random_key, random_iv, pkcs5_keyivgen]
+ *  * [#key=, #iv=, #random_key, #random_iv, #pkcs5_keyivgen]
  *
  *  Internally calls EVP_CipherInit_ex(ctx, NULL, NULL, NULL, NULL, 1).
  */
@@ -266,7 +268,7 @@ ossl_cipher_encrypt(int argc, VALUE *argv, VALUE self)
  *
  *  Make sure to call Cipher#encrypt or Cipher#decrypt before using any of the
  *  following methods:
- *  * [key=, iv=, random_key, random_iv, pkcs5_keyivgen]
+ *  * [#key=, #iv=, #random_key, #random_iv, #pkcs5_keyivgen]
  *
  *  Internally calls EVP_CipherInit_ex(ctx, NULL, NULL, NULL, NULL, 0).
  */
@@ -278,20 +280,20 @@ ossl_cipher_decrypt(int argc, VALUE *argv, VALUE self)
 
 /*
  *  call-seq:
- *     cipher.pkcs5_keyivgen(pass [, salt [, iterations [, digest]]] ) -> nil
+ *     cipher.pkcs5_keyivgen(pass, salt = nil, iterations = 2048, digest = "MD5") -> nil
  *
  *  Generates and sets the key/IV based on a password.
  *
- *  WARNING: This method is only PKCS5 v1.5 compliant when using RC2, RC4-40,
+ *  *WARNING*: This method is only PKCS5 v1.5 compliant when using RC2, RC4-40,
  *  or DES with MD5 or SHA1. Using anything else (like AES) will generate the
  *  key/iv using an OpenSSL specific method. This method is deprecated and
  *  should no longer be used. Use a PKCS5 v2 key generation method from
  *  OpenSSL::PKCS5 instead.
  *
  *  === Parameters
- *  +salt+ must be an 8 byte string if provided.
- *  +iterations+ is a integer with a default of 2048.
- *  +digest+ is a Digest object that defaults to 'MD5'
+ *  * _salt_ must be an 8 byte string if provided.
+ *  * _iterations_ is an integer with a default of 2048.
+ *  * _digest_ is a Digest object that defaults to 'MD5'
  *
  *  A minimum of 1000 iterations is recommended.
  *
@@ -314,7 +316,9 @@ ossl_cipher_pkcs5_keyivgen(int argc, VALUE *argv, VALUE self)
 	salt = (unsigned char *)RSTRING_PTR(vsalt);
     }
     iter = NIL_P(viter) ? 2048 : NUM2INT(viter);
-    digest = NIL_P(vdigest) ? EVP_md5() : GetDigestPtr(vdigest);
+    if (iter <= 0)
+	rb_raise(rb_eArgError, "iterations must be a positive integer");
+    digest = NIL_P(vdigest) ? EVP_md5() : ossl_evp_get_digestbyname(vdigest);
     GetCipher(self, ctx);
     EVP_BytesToKey(EVP_CIPHER_CTX_cipher(ctx), digest, salt,
 		   (unsigned char *)RSTRING_PTR(vpass), RSTRING_LENINT(vpass), iter, key, iv);
@@ -323,6 +327,8 @@ ossl_cipher_pkcs5_keyivgen(int argc, VALUE *argv, VALUE self)
     OPENSSL_cleanse(key, sizeof key);
     OPENSSL_cleanse(iv, sizeof iv);
 
+    rb_ivar_set(self, id_key_set, Qtrue);
+
     return Qnil;
 }
 
@@ -331,25 +337,23 @@ ossl_cipher_update_long(EVP_CIPHER_CTX *ctx, unsigned char *out, long *out_len_p
 			const unsigned char *in, long in_len)
 {
     int out_part_len;
+    int limit = INT_MAX / 2 + 1;
     long out_len = 0;
-#define UPDATE_LENGTH_LIMIT INT_MAX
-
-#if SIZEOF_LONG > UPDATE_LENGTH_LIMIT
-    if (in_len > UPDATE_LENGTH_LIMIT) {
-	const int in_part_len = (UPDATE_LENGTH_LIMIT / 2 + 1) & ~1;
-	do {
-	    if (!EVP_CipherUpdate(ctx, out ? (out + out_len) : 0,
-				  &out_part_len, in, in_part_len))
-		return 0;
-	    out_len += out_part_len;
-	    in += in_part_len;
-	} while ((in_len -= in_part_len) > UPDATE_LENGTH_LIMIT);
-    }
-#endif
-    if (!EVP_CipherUpdate(ctx, out ? (out + out_len) : 0,
-			  &out_part_len, in, (int)in_len))
-	return 0;
-    if (out_len_ptr) *out_len_ptr = out_len += out_part_len;
+
+    do {
+	int in_part_len = in_len > limit ? limit : (int)in_len;
+
+	if (!EVP_CipherUpdate(ctx, out ? (out + out_len) : 0,
+			      &out_part_len, in, in_part_len))
+	    return 0;
+
+	out_len += out_part_len;
+	in += in_part_len;
+    } while ((in_len -= limit) > 0);
+
+    if (out_len_ptr)
+	*out_len_ptr = out_len;
+
     return 1;
 }
 
@@ -358,13 +362,12 @@ ossl_cipher_update_long(EVP_CIPHER_CTX *ctx, unsigned char *out, long *out_len_p
  *     cipher.update(data [, buffer]) -> string or buffer
  *
  *  Encrypts data in a streaming fashion. Hand consecutive blocks of data
- *  to the +update+ method in order to encrypt it. Returns the encrypted
+ *  to the #update method in order to encrypt it. Returns the encrypted
  *  data chunk. When done, the output of Cipher#final should be additionally
  *  added to the result.
  *
- *  === Parameters
- *  +data+ is a nonempty string.
- *  +buffer+ is an optional string to store the result.
+ *  If _buffer_ is given, the encryption/decryption result will be written to
+ *  it. _buffer_ will be resized automatically.
  */
 static VALUE
 ossl_cipher_update(int argc, VALUE *argv, VALUE self)
@@ -376,6 +379,9 @@ ossl_cipher_update(int argc, VALUE *argv, VALUE self)
 
     rb_scan_args(argc, argv, "11", &data, &str);
 
+    if (!RTEST(rb_attr_get(self, id_key_set)))
+	ossl_raise(eCipherError, "key not set");
+
     StringValue(data);
     in = (unsigned char *)RSTRING_PTR(data);
     if ((in_len = RSTRING_LEN(data)) == 0)
@@ -409,7 +415,7 @@ ossl_cipher_update(int argc, VALUE *argv, VALUE self)
  *  Returns the remaining data held in the cipher object. Further calls to
  *  Cipher#update or Cipher#final will return garbage. This call should always
  *  be made as the last call of an encryption or decryption operation, after
- *  after having fed the entire plaintext or ciphertext to the Cipher instance.
+ *  having fed the entire plaintext or ciphertext to the Cipher instance.
  *
  *  If an authenticated cipher was used, a CipherError is raised if the tag
  *  could not be authenticated successfully. Only call this method after
@@ -477,6 +483,8 @@ ossl_cipher_set_key(VALUE self, VALUE key)
     if (EVP_CipherInit_ex(ctx, NULL, NULL, (unsigned char *)RSTRING_PTR(key), NULL, -1) != 1)
 	ossl_raise(eCipherError, NULL);
 
+    rb_ivar_set(self, id_key_set, Qtrue);
+
     return key;
 }
 
@@ -491,20 +499,20 @@ ossl_cipher_set_key(VALUE self, VALUE key)
  *  Cipher#random_iv to create a secure random IV.
  *
  *  Only call this method after calling Cipher#encrypt or Cipher#decrypt.
- *
- *  If not explicitly set, the OpenSSL default of an all-zeroes ("\\0") IV is
- *  used.
  */
 static VALUE
 ossl_cipher_set_iv(VALUE self, VALUE iv)
 {
     EVP_CIPHER_CTX *ctx;
-    int iv_len;
+    int iv_len = 0;
 
     StringValue(iv);
     GetCipher(self, ctx);
 
-    iv_len = EVP_CIPHER_CTX_iv_length(ctx);
+    if (EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER)
+	iv_len = (int)(VALUE)EVP_CIPHER_CTX_get_app_data(ctx);
+    if (!iv_len)
+	iv_len = EVP_CIPHER_CTX_iv_length(ctx);
     if (RSTRING_LEN(iv) != iv_len)
 	ossl_raise(rb_eArgError, "iv must be %d bytes", iv_len);
 
@@ -514,7 +522,23 @@ ossl_cipher_set_iv(VALUE self, VALUE iv)
     return iv;
 }
 
-#ifdef HAVE_AUTHENTICATED_ENCRYPTION
+/*
+ *  call-seq:
+ *     cipher.authenticated? -> true | false
+ *
+ *  Indicated whether this Cipher instance uses an Authenticated Encryption
+ *  mode.
+ */
+static VALUE
+ossl_cipher_is_authenticated(VALUE self)
+{
+    EVP_CIPHER_CTX *ctx;
+
+    GetCipher(self, ctx);
+
+    return (EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER) ? Qtrue : Qfalse;
+}
+
 /*
  *  call-seq:
  *     cipher.auth_data = string -> string
@@ -546,6 +570,8 @@ ossl_cipher_set_auth_data(VALUE self, VALUE data)
     in_len = RSTRING_LEN(data);
 
     GetCipher(self, ctx);
+    if (!(EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER))
+	ossl_raise(eCipherError, "AEAD not supported by this cipher");
 
     if (!ossl_cipher_update_long(ctx, NULL, &out_len, in, in_len))
         ossl_raise(eCipherError, "couldn't set additional authenticated data");
@@ -560,10 +586,11 @@ ossl_cipher_set_auth_data(VALUE self, VALUE data)
  *  Gets the authentication tag generated by Authenticated Encryption Cipher
  *  modes (GCM for example). This tag may be stored along with the ciphertext,
  *  then set on the decryption cipher to authenticate the contents of the
- *  ciphertext against changes. If the optional integer parameter +tag_len+ is
- *  given, the returned tag will be +tag_len+ bytes long. If the parameter is
- *  omitted, the maximum length of 16 bytes will be returned. For maximum
- *  security, the default of 16 bytes should be chosen.
+ *  ciphertext against changes. If the optional integer parameter _tag_len_ is
+ *  given, the returned tag will be _tag_len_ bytes long. If the parameter is
+ *  omitted, the default length of 16 bytes or the length previously set by
+ *  #auth_tag_len= will be used. For maximum security, the longest possible
+ *  should be chosen.
  *
  *  The tag may only be retrieved after calling Cipher#final.
  */
@@ -574,12 +601,15 @@ ossl_cipher_get_auth_tag(int argc, VALUE *argv, VALUE self)
     EVP_CIPHER_CTX *ctx;
     int tag_len = 16;
 
-    if (rb_scan_args(argc, argv, "01", &vtag_len) == 1)
+    rb_scan_args(argc, argv, "01", &vtag_len);
+    if (NIL_P(vtag_len))
+	vtag_len = rb_attr_get(self, id_auth_tag_len);
+    if (!NIL_P(vtag_len))
 	tag_len = NUM2INT(vtag_len);
 
     GetCipher(self, ctx);
 
-    if (!(EVP_CIPHER_CTX_flags(ctx) & EVP_CIPH_FLAG_AEAD_CIPHER))
+    if (!(EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER))
 	ossl_raise(eCipherError, "authentication tag not supported by this cipher");
 
     ret = rb_str_new(NULL, tag_len);
@@ -593,13 +623,14 @@ ossl_cipher_get_auth_tag(int argc, VALUE *argv, VALUE self)
  *  call-seq:
  *     cipher.auth_tag = string -> string
  *
- *  Sets the authentication tag to verify the contents of the
- *  ciphertext. The tag must be set after calling Cipher#decrypt,
- *  Cipher#key= and Cipher#iv=, but before assigning the associated
- *  authenticated data using Cipher#auth_data= and of course, before
- *  decrypting any of the ciphertext. After all decryption is
- *  performed, the tag is verified automatically in the call to
- *  Cipher#final.
+ *  Sets the authentication tag to verify the integrity of the ciphertext.
+ *  This can be called only when the cipher supports AE. The tag must be set
+ *  after calling Cipher#decrypt, Cipher#key= and Cipher#iv=, but before
+ *  calling Cipher#final. After all decryption is performed, the tag is
+ *  verified automatically in the call to Cipher#final.
+ *
+ *  For OCB mode, the tag length must be supplied with #auth_tag_len=
+ *  beforehand.
  */
 static VALUE
 ossl_cipher_set_auth_tag(VALUE self, VALUE vtag)
@@ -613,7 +644,7 @@ ossl_cipher_set_auth_tag(VALUE self, VALUE vtag)
     tag_len = RSTRING_LENINT(vtag);
 
     GetCipher(self, ctx);
-    if (!(EVP_CIPHER_CTX_flags(ctx) & EVP_CIPH_FLAG_AEAD_CIPHER))
+    if (!(EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER))
 	ossl_raise(eCipherError, "authentication tag not supported by this cipher");
 
     if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG, tag_len, tag))
@@ -624,26 +655,63 @@ ossl_cipher_set_auth_tag(VALUE self, VALUE vtag)
 
 /*
  *  call-seq:
- *     cipher.authenticated? -> boolean
+ *     cipher.auth_tag_len = Integer -> Integer
  *
- *  Indicated whether this Cipher instance uses an Authenticated Encryption
- *  mode.
+ *  Sets the length of the authentication tag to be generated or to be given for
+ *  AEAD ciphers that requires it as in input parameter. Note that not all AEAD
+ *  ciphers support this method.
+ *
+ *  In OCB mode, the length must be supplied both when encrypting and when
+ *  decrypting, and must be before specifying an IV.
  */
 static VALUE
-ossl_cipher_is_authenticated(VALUE self)
+ossl_cipher_set_auth_tag_len(VALUE self, VALUE vlen)
 {
+    int tag_len = NUM2INT(vlen);
     EVP_CIPHER_CTX *ctx;
 
     GetCipher(self, ctx);
+    if (!(EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER))
+	ossl_raise(eCipherError, "AEAD not supported by this cipher");
+
+    if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG, tag_len, NULL))
+	ossl_raise(eCipherError, "unable to set authentication tag length");
 
-    return (EVP_CIPHER_CTX_flags(ctx) & EVP_CIPH_FLAG_AEAD_CIPHER) ? Qtrue : Qfalse;
+    /* for #auth_tag */
+    rb_ivar_set(self, id_auth_tag_len, INT2NUM(tag_len));
+
+    return vlen;
+}
+
+/*
+ * call-seq:
+ *   cipher.iv_len = integer -> integer
+ *
+ * Sets the IV/nonce length of the Cipher. Normally block ciphers don't allow
+ * changing the IV length, but some make use of IV for 'nonce'. You may need
+ * this for interoperability with other applications.
+ */
+static VALUE
+ossl_cipher_set_iv_length(VALUE self, VALUE iv_length)
+{
+    int len = NUM2INT(iv_length);
+    EVP_CIPHER_CTX *ctx;
+
+    GetCipher(self, ctx);
+    if (!(EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER))
+	ossl_raise(eCipherError, "cipher does not support AEAD");
+
+    if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_IVLEN, len, NULL))
+	ossl_raise(eCipherError, "unable to set IV length");
+
+    /*
+     * EVP_CIPHER_CTX_iv_length() returns the default length. So we need to save
+     * the length somewhere. Luckily currently we aren't using app_data.
+     */
+    EVP_CIPHER_CTX_set_app_data(ctx, (void *)(VALUE)len);
+
+    return iv_length;
 }
-#else
-#define ossl_cipher_set_auth_data rb_f_notimplement
-#define ossl_cipher_get_auth_tag rb_f_notimplement
-#define ossl_cipher_set_auth_tag rb_f_notimplement
-#define ossl_cipher_is_authenticated rb_f_notimplement
-#endif
 
 /*
  *  call-seq:
@@ -692,36 +760,83 @@ ossl_cipher_set_padding(VALUE self, VALUE padding)
     return padding;
 }
 
-#define CIPHER_0ARG_INT(func)					\
-    static VALUE						\
-    ossl_cipher_##func(VALUE self)				\
-    {								\
-	EVP_CIPHER_CTX *ctx;					\
-	GetCipher(self, ctx);					\
-	return INT2NUM(EVP_CIPHER_##func(EVP_CIPHER_CTX_cipher(ctx)));	\
-    }
-
 /*
  *  call-seq:
  *     cipher.key_len -> integer
  *
  *  Returns the key length in bytes of the Cipher.
  */
-CIPHER_0ARG_INT(key_length)
+static VALUE
+ossl_cipher_key_length(VALUE self)
+{
+    EVP_CIPHER_CTX *ctx;
+
+    GetCipher(self, ctx);
+
+    return INT2NUM(EVP_CIPHER_CTX_key_length(ctx));
+}
+
 /*
  *  call-seq:
  *     cipher.iv_len -> integer
  *
  *  Returns the expected length in bytes for an IV for this Cipher.
  */
-CIPHER_0ARG_INT(iv_length)
+static VALUE
+ossl_cipher_iv_length(VALUE self)
+{
+    EVP_CIPHER_CTX *ctx;
+    int len = 0;
+
+    GetCipher(self, ctx);
+    if (EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER)
+	len = (int)(VALUE)EVP_CIPHER_CTX_get_app_data(ctx);
+    if (!len)
+	len = EVP_CIPHER_CTX_iv_length(ctx);
+
+    return INT2NUM(len);
+}
+
 /*
  *  call-seq:
  *     cipher.block_size -> integer
  *
  *  Returns the size in bytes of the blocks on which this Cipher operates on.
  */
-CIPHER_0ARG_INT(block_size)
+static VALUE
+ossl_cipher_block_size(VALUE self)
+{
+    EVP_CIPHER_CTX *ctx;
+
+    GetCipher(self, ctx);
+
+    return INT2NUM(EVP_CIPHER_CTX_block_size(ctx));
+}
+
+/*
+ *  call-seq:
+ *     cipher.ccm_data_len = integer -> integer
+ *
+ *  Sets the length of the plaintext / ciphertext message that will be
+ *  processed in CCM mode. Make sure to call this method after #key= and
+ *  #iv= have been set, and before #auth_data=.
+ *
+ *  Only call this method after calling Cipher#encrypt or Cipher#decrypt.
+ */
+static VALUE
+ossl_cipher_set_ccm_data_len(VALUE self, VALUE data_len)
+{
+    int in_len, out_len;
+    EVP_CIPHER_CTX *ctx;
+
+    in_len = NUM2INT(data_len);
+
+    GetCipher(self, ctx);
+    if (EVP_CipherUpdate(ctx, NULL, &out_len, NULL, in_len) != 1)
+        ossl_raise(eCipherError, NULL);
+
+    return data_len;
+}
 
 /*
  * INIT
@@ -730,7 +845,8 @@ void
 Init_ossl_cipher(void)
 {
 #if 0
-    mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
+    mOSSL = rb_define_module("OpenSSL");
+    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
 #endif
 
     /* Document-class: OpenSSL::Cipher
@@ -760,22 +876,6 @@ Init_ossl_cipher(void)
      *
      *  cipher = OpenSSL::Cipher.new('AES-128-CBC')
      *
-     * For each algorithm supported, there is a class defined under the
-     * Cipher class that goes by the name of the cipher, e.g. to obtain an
-     * instance of AES, you could also use
-     *
-     *   # these are equivalent
-     *   cipher = OpenSSL::Cipher::AES.new(128, :CBC)
-     *   cipher = OpenSSL::Cipher::AES.new(128, 'CBC')
-     *   cipher = OpenSSL::Cipher::AES.new('128-CBC')
-     *
-     * Finally, due to its wide-spread use, there are also extra classes
-     * defined for the different key sizes of AES
-     *
-     *   cipher = OpenSSL::Cipher::AES128.new(:CBC)
-     *   cipher = OpenSSL::Cipher::AES192.new(:CBC)
-     *   cipher = OpenSSL::Cipher::AES256.new(:CBC)
-     *
      * === Choosing either encryption or decryption mode
      *
      * Encryption and decryption are often very similar operations for
@@ -804,7 +904,7 @@ Init_ossl_cipher(void)
      * without processing the password further. A simple and secure way to
      * create a key for a particular Cipher is
      *
-     *  cipher = OpenSSL::AES256.new(:CFB)
+     *  cipher = OpenSSL::Cipher.new('AES-256-CFB')
      *  cipher.encrypt
      *  key = cipher.random_key # also sets the generated key on the Cipher
      *
@@ -829,12 +929,10 @@ Init_ossl_cipher(void)
      * you absolutely need it</b>
      *
      * Because of this, you will end up with a mode that explicitly requires
-     * an IV in any case. Note that for backwards compatibility reasons,
-     * setting an IV is not explicitly mandated by the Cipher API. If not
-     * set, OpenSSL itself defaults to an all-zeroes IV ("\\0", not the
-     * character). Although the IV can be seen as public information, i.e.
-     * it may be transmitted in public once generated, it should still stay
-     * unpredictable to prevent certain kinds of attacks. Therefore, ideally
+     * an IV in any case. Although the IV can be seen as public information,
+     * i.e. it may be transmitted in public once generated, it should still
+     * stay unpredictable to prevent certain kinds of attacks. Therefore,
+     * ideally
      *
      * <b>Always create a secure random IV for every encryption of your
      * Cipher</b>
@@ -843,16 +941,16 @@ Init_ossl_cipher(void)
      * of the IV as a nonce (number used once) - it's public but random and
      * unpredictable. A secure random IV can be created as follows
      *
-     *  cipher = ...
-     *  cipher.encrypt
-     *  key = cipher.random_key
-     *  iv = cipher.random_iv # also sets the generated IV on the Cipher
+     *   cipher = ...
+     *   cipher.encrypt
+     *   key = cipher.random_key
+     *   iv = cipher.random_iv # also sets the generated IV on the Cipher
      *
-     *  Although the key is generally a random value, too, it is a bad choice
-     *  as an IV. There are elaborate ways how an attacker can take advantage
-     *  of such an IV. As a general rule of thumb, exposing the key directly
-     *  or indirectly should be avoided at all cost and exceptions only be
-     *  made with good reason.
+     * Although the key is generally a random value, too, it is a bad choice
+     * as an IV. There are elaborate ways how an attacker can take advantage
+     * of such an IV. As a general rule of thumb, exposing the key directly
+     * or indirectly should be avoided at all cost and exceptions only be
+     * made with good reason.
      *
      * === Calling Cipher#final
      *
@@ -874,14 +972,14 @@ Init_ossl_cipher(void)
      *
      *   data = "Very, very confidential data"
      *
-     *   cipher = OpenSSL::Cipher::AES.new(128, :CBC)
+     *   cipher = OpenSSL::Cipher.new('AES-128-CBC')
      *   cipher.encrypt
      *   key = cipher.random_key
      *   iv = cipher.random_iv
      *
      *   encrypted = cipher.update(data) + cipher.final
      *   ...
-     *   decipher = OpenSSL::Cipher::AES.new(128, :CBC)
+     *   decipher = OpenSSL::Cipher.new('AES-128-CBC')
      *   decipher.decrypt
      *   decipher.key = key
      *   decipher.iv = iv
@@ -906,35 +1004,48 @@ Init_ossl_cipher(void)
      * could otherwise be exploited to modify ciphertexts in ways beneficial to
      * potential attackers.
      *
-     * If no associated data is needed for encryption and later decryption,
-     * the OpenSSL library still requires a value to be set - "" may be used in
-     * case none is available. An example using the GCM (Galois Counter Mode):
+     * An associated data is used where there is additional information, such as
+     * headers or some metadata, that must be also authenticated but not
+     * necessarily need to be encrypted. If no associated data is needed for
+     * encryption and later decryption, the OpenSSL library still requires a
+     * value to be set - "" may be used in case none is available.
      *
-     *   cipher = OpenSSL::Cipher.new("aes-128-gcm")
-     *   cipher.encrypt
-     *   key = cipher.random_key
-     *   iv = cipher.random_iv
-     *   cipher.auth_data = ""
+     * An example using the GCM (Galois/Counter Mode). You have 16 bytes _key_,
+     * 12 bytes (96 bits) _nonce_ and the associated data _auth_data_. Be sure
+     * not to reuse the _key_ and _nonce_ pair. Reusing an nonce ruins the
+     * security guarantees of GCM mode.
+     *
+     *   cipher = OpenSSL::Cipher.new('AES-128-GCM').encrypt
+     *   cipher.key = key
+     *   cipher.iv = nonce
+     *   cipher.auth_data = auth_data
      *
      *   encrypted = cipher.update(data) + cipher.final
-     *   tag = cipher.auth_tag
+     *   tag = cipher.auth_tag # produces 16 bytes tag by default
      *
-     *   decipher = OpenSSL::Cipher.new("aes-128-gcm")
-     *   decipher.decrypt
+     * Now you are the receiver. You know the _key_ and have received _nonce_,
+     * _auth_data_, _encrypted_ and _tag_ through an untrusted network. Note
+     * that GCM accepts an arbitrary length tag between 1 and 16 bytes. You may
+     * additionally need to check that the received tag has the correct length,
+     * or you allow attackers to forge a valid single byte tag for the tampered
+     * ciphertext with a probability of 1/256.
+     *
+     *   raise "tag is truncated!" unless tag.bytesize == 16
+     *   decipher = OpenSSL::Cipher.new('AES-128-GCM').decrypt
      *   decipher.key = key
-     *   decipher.iv = iv
+     *   decipher.iv = nonce
      *   decipher.auth_tag = tag
-     *   decipher.auth_data = ""
+     *   decipher.auth_data = auth_data
      *
-     *   plain = decipher.update(encrypted) + decipher.final
+     *   decrypted = decipher.update(encrypted) + decipher.final
      *
-     *   puts data == plain #=> true
+     *   puts data == decrypted #=> true
      */
     cCipher = rb_define_class_under(mOSSL, "Cipher", rb_cObject);
     eCipherError = rb_define_class_under(cCipher, "CipherError", eOSSLError);
 
     rb_define_alloc_func(cCipher, ossl_cipher_alloc);
-    rb_define_copy_func(cCipher, ossl_cipher_copy);
+    rb_define_method(cCipher, "initialize_copy", ossl_cipher_copy, 1);
     rb_define_module_function(cCipher, "ciphers", ossl_s_ciphers, 0);
     rb_define_method(cCipher, "initialize", ossl_cipher_initialize, 1);
     rb_define_method(cCipher, "reset", ossl_cipher_reset, 0);
@@ -948,11 +1059,17 @@ Init_ossl_cipher(void)
     rb_define_method(cCipher, "auth_data=", ossl_cipher_set_auth_data, 1);
     rb_define_method(cCipher, "auth_tag=", ossl_cipher_set_auth_tag, 1);
     rb_define_method(cCipher, "auth_tag", ossl_cipher_get_auth_tag, -1);
+    rb_define_method(cCipher, "auth_tag_len=", ossl_cipher_set_auth_tag_len, 1);
     rb_define_method(cCipher, "authenticated?", ossl_cipher_is_authenticated, 0);
     rb_define_method(cCipher, "key_len=", ossl_cipher_set_key_length, 1);
     rb_define_method(cCipher, "key_len", ossl_cipher_key_length, 0);
     rb_define_method(cCipher, "iv=", ossl_cipher_set_iv, 1);
+    rb_define_method(cCipher, "iv_len=", ossl_cipher_set_iv_length, 1);
     rb_define_method(cCipher, "iv_len", ossl_cipher_iv_length, 0);
     rb_define_method(cCipher, "block_size", ossl_cipher_block_size, 0);
     rb_define_method(cCipher, "padding=", ossl_cipher_set_padding, 1);
+    rb_define_method(cCipher, "ccm_data_len=", ossl_cipher_set_ccm_data_len, 1);
+
+    id_auth_tag_len = rb_intern_const("auth_tag_len");
+    id_key_set = rb_intern_const("key_set");
 }
diff --git a/ext/openssl/ossl_cipher.h b/ext/openssl/ossl_cipher.h
index c444089fc2..2392d41c6a 100644
--- a/ext/openssl/ossl_cipher.h
+++ b/ext/openssl/ossl_cipher.h
@@ -13,7 +13,7 @@
 extern VALUE cCipher;
 extern VALUE eCipherError;
 
-const EVP_CIPHER *GetCipherPtr(VALUE);
+const EVP_CIPHER *ossl_evp_get_cipherbyname(VALUE);
 VALUE ossl_cipher_new(const EVP_CIPHER *);
 void Init_ossl_cipher(void);
 
diff --git a/ext/openssl/ossl_config.c b/ext/openssl/ossl_config.c
index 4e00fbe4ad..28392e208c 100644
--- a/ext/openssl/ossl_config.c
+++ b/ext/openssl/ossl_config.c
@@ -26,13 +26,13 @@ VALUE eConfigError;
  */
 
 /*
- * GetConfigPtr is a public C-level function for getting OpenSSL CONF struct
+ * DupConfigPtr is a public C-level function for getting OpenSSL CONF struct
  * from an OpenSSL::Config(eConfig) instance.  We decided to implement
  * OpenSSL::Config in Ruby level but we need to pass native CONF struct for
  * some OpenSSL features such as X509V3_EXT_*.
  */
 CONF *
-GetConfigPtr(VALUE obj)
+DupConfigPtr(VALUE obj)
 {
     CONF *conf;
     VALUE str;
@@ -41,7 +41,7 @@ GetConfigPtr(VALUE obj)
 
     OSSL_Check_Kind(obj, cConfig);
     str = rb_funcall(obj, rb_intern("to_s"), 0);
-    bio = ossl_obj2bio(str);
+    bio = ossl_obj2bio(&str);
     conf = NCONF_new(NULL);
     if(!conf){
 	BIO_free(bio);
@@ -50,9 +50,10 @@ GetConfigPtr(VALUE obj)
     if(!NCONF_load_bio(conf, bio, &eline)){
 	BIO_free(bio);
 	NCONF_free(conf);
-	if (eline <= 0) ossl_raise(eConfigError, "wrong config format");
-	else ossl_raise(eConfigError, "error in line %d", eline);
-	ossl_raise(eConfigError, NULL);
+	if (eline <= 0)
+	    ossl_raise(eConfigError, "wrong config format");
+	else
+	    ossl_raise(eConfigError, "error in line %d", eline);
     }
     BIO_free(bio);
 
@@ -71,6 +72,12 @@ void
 Init_ossl_config(void)
 {
     char *default_config_file;
+
+#if 0
+    mOSSL = rb_define_module("OpenSSL");
+    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
+#endif
+
     eConfigError = rb_define_class_under(mOSSL, "ConfigError", eOSSLError);
     cConfig = rb_define_class_under(mOSSL, "Config", rb_cObject);
 
diff --git a/ext/openssl/ossl_config.h b/ext/openssl/ossl_config.h
index 077e2f7400..627d297ba3 100644
--- a/ext/openssl/ossl_config.h
+++ b/ext/openssl/ossl_config.h
@@ -13,7 +13,6 @@
 extern VALUE cConfig;
 extern VALUE eConfigError;
 
-CONF* GetConfigPtr(VALUE obj);
 CONF* DupConfigPtr(VALUE obj);
 void Init_ossl_config(void);
 
diff --git a/ext/openssl/ossl_digest.c b/ext/openssl/ossl_digest.c
index d137dc57eb..6294fa2acf 100644
--- a/ext/openssl/ossl_digest.c
+++ b/ext/openssl/ossl_digest.c
@@ -15,10 +15,6 @@
 	ossl_raise(rb_eRuntimeError, "Digest CTX wasn't initialized!"); \
     } \
 } while (0)
-#define SafeGetDigest(obj, ctx) do { \
-    OSSL_Check_Kind((obj), cDigest); \
-    GetDigest((obj), (ctx)); \
-} while (0)
 
 /*
  * Classes
@@ -46,7 +42,7 @@ static const rb_data_type_t ossl_digest_type = {
  * Public
  */
 const EVP_MD *
-GetDigestPtr(VALUE obj)
+ossl_evp_get_digestbyname(VALUE obj)
 {
     const EVP_MD *md;
     ASN1_OBJECT *oid = NULL;
@@ -65,7 +61,7 @@ GetDigestPtr(VALUE obj)
     } else {
         EVP_MD_CTX *ctx;
 
-        SafeGetDigest(obj, ctx);
+        GetDigest(obj, ctx);
 
         md = EVP_MD_CTX_md(ctx);
     }
@@ -80,10 +76,13 @@ ossl_digest_new(const EVP_MD *md)
     EVP_MD_CTX *ctx;
 
     ret = ossl_digest_alloc(cDigest);
-    GetDigest(ret, ctx);
-    if (EVP_DigestInit_ex(ctx, md, NULL) != 1) {
-	ossl_raise(eDigestError, "Digest initialization failed.");
-    }
+    ctx = EVP_MD_CTX_new();
+    if (!ctx)
+	ossl_raise(eDigestError, "EVP_MD_CTX_new");
+    RTYPEDDATA_DATA(ret) = ctx;
+
+    if (!EVP_DigestInit_ex(ctx, md, NULL))
+	ossl_raise(eDigestError, "Digest initialization failed");
 
     return ret;
 }
@@ -94,13 +93,7 @@ ossl_digest_new(const EVP_MD *md)
 static VALUE
 ossl_digest_alloc(VALUE klass)
 {
-    VALUE obj = TypedData_Wrap_Struct(klass, &ossl_digest_type, 0);
-    EVP_MD_CTX *ctx = EVP_MD_CTX_create();
-    if (ctx == NULL)
-	ossl_raise(rb_eRuntimeError, "EVP_MD_CTX_create() failed");
-    RTYPEDDATA_DATA(obj) = ctx;
-
-    return obj;
+    return TypedData_Wrap_Struct(klass, &ossl_digest_type, 0);
 }
 
 VALUE ossl_digest_update(VALUE, VALUE);
@@ -109,19 +102,18 @@ VALUE ossl_digest_update(VALUE, VALUE);
  *  call-seq:
  *     Digest.new(string [, data]) -> Digest
  *
- * Creates a Digest instance based on +string+, which is either the ln
+ * Creates a Digest instance based on _string_, which is either the ln
  * (long name) or sn (short name) of a supported digest algorithm.
- * If +data+ (a +String+) is given, it is used as the initial input to the
+ *
+ * If _data_ (a String) is given, it is used as the initial input to the
  * Digest instance, i.e.
- *   digest = OpenSSL::Digest.new('sha256', 'digestdata')
- * is equal to
- *   digest = OpenSSL::Digest.new('sha256')
- *   digest.update('digestdata')
  *
- * === Example
- *   digest = OpenSSL::Digest.new('sha1')
+ *   digest = OpenSSL::Digest.new('sha256', 'digestdata')
  *
+ * is equivalent to
  *
+ *   digest = OpenSSL::Digest.new('sha256')
+ *   digest.update('digestdata')
  */
 static VALUE
 ossl_digest_initialize(int argc, VALUE *argv, VALUE self)
@@ -131,14 +123,19 @@ ossl_digest_initialize(int argc, VALUE *argv, VALUE self)
     VALUE type, data;
 
     rb_scan_args(argc, argv, "11", &type, &data);
-    md = GetDigestPtr(type);
+    md = ossl_evp_get_digestbyname(type);
     if (!NIL_P(data)) StringValue(data);
 
-    GetDigest(self, ctx);
-    if (EVP_DigestInit_ex(ctx, md, NULL) != 1) {
-	ossl_raise(eDigestError, "Digest initialization failed.");
+    TypedData_Get_Struct(self, EVP_MD_CTX, &ossl_digest_type, ctx);
+    if (!ctx) {
+	RTYPEDDATA_DATA(self) = ctx = EVP_MD_CTX_new();
+	if (!ctx)
+	    ossl_raise(eDigestError, "EVP_MD_CTX_new");
     }
 
+    if (!EVP_DigestInit_ex(ctx, md, NULL))
+	ossl_raise(eDigestError, "Digest initialization failed");
+
     if (!NIL_P(data)) return ossl_digest_update(self, data);
     return self;
 }
@@ -151,8 +148,13 @@ ossl_digest_copy(VALUE self, VALUE other)
     rb_check_frozen(self);
     if (self == other) return self;
 
-    GetDigest(self, ctx1);
-    SafeGetDigest(other, ctx2);
+    TypedData_Get_Struct(self, EVP_MD_CTX, &ossl_digest_type, ctx1);
+    if (!ctx1) {
+	RTYPEDDATA_DATA(self) = ctx1 = EVP_MD_CTX_new();
+	if (!ctx1)
+	    ossl_raise(eDigestError, "EVP_MD_CTX_new");
+    }
+    GetDigest(other, ctx2);
 
     if (!EVP_MD_CTX_copy(ctx1, ctx2)) {
 	ossl_raise(eDigestError, NULL);
@@ -190,7 +192,7 @@ ossl_digest_reset(VALUE self)
  * be passed individually to the Digest instance.
  *
  * === Example
- *   digest = OpenSSL::Digest::SHA256.new
+ *   digest = OpenSSL::Digest.new('SHA256')
  *   digest.update('First input')
  *   digest << 'Second input' # equivalent to digest.update('Second input')
  *   result = digest.digest
@@ -203,7 +205,9 @@ ossl_digest_update(VALUE self, VALUE data)
 
     StringValue(data);
     GetDigest(self, ctx);
-    EVP_DigestUpdate(ctx, RSTRING_PTR(data), RSTRING_LEN(data));
+
+    if (!EVP_DigestUpdate(ctx, RSTRING_PTR(data), RSTRING_LEN(data)))
+	ossl_raise(eDigestError, "EVP_DigestUpdate");
 
     return self;
 }
@@ -218,19 +222,21 @@ ossl_digest_finish(int argc, VALUE *argv, VALUE self)
 {
     EVP_MD_CTX *ctx;
     VALUE str;
-
-    rb_scan_args(argc, argv, "01", &str);
+    int out_len;
 
     GetDigest(self, ctx);
+    rb_scan_args(argc, argv, "01", &str);
+    out_len = EVP_MD_CTX_size(ctx);
 
     if (NIL_P(str)) {
-        str = rb_str_new(NULL, EVP_MD_CTX_size(ctx));
+        str = rb_str_new(NULL, out_len);
     } else {
         StringValue(str);
-        rb_str_resize(str, EVP_MD_CTX_size(ctx));
+        rb_str_resize(str, out_len);
     }
 
-    EVP_DigestFinal_ex(ctx, (unsigned char *)RSTRING_PTR(str), NULL);
+    if (!EVP_DigestFinal_ex(ctx, (unsigned char *)RSTRING_PTR(str), NULL))
+	ossl_raise(eDigestError, "EVP_DigestFinal_ex");
 
     return str;
 }
@@ -239,10 +245,10 @@ ossl_digest_finish(int argc, VALUE *argv, VALUE self)
  *  call-seq:
  *      digest.name -> string
  *
- * Returns the sn of this Digest instance.
+ * Returns the sn of this Digest algorithm.
  *
  * === Example
- *   digest = OpenSSL::Digest::SHA512.new
+ *   digest = OpenSSL::Digest.new('SHA512')
  *   puts digest.name # => SHA512
  *
  */
@@ -264,7 +270,7 @@ ossl_digest_name(VALUE self)
  * final message digest result.
  *
  * === Example
- *   digest = OpenSSL::Digest::SHA1.new
+ *   digest = OpenSSL::Digest.new('SHA1')
  *   puts digest.digest_length # => 20
  *
  */
@@ -288,7 +294,7 @@ ossl_digest_size(VALUE self)
  * consecutively.
  *
  * === Example
- *   digest = OpenSSL::Digest::SHA1.new
+ *   digest = OpenSSL::Digest.new('SHA1')
  *   puts digest.block_length # => 64
  */
 static VALUE
@@ -307,10 +313,9 @@ ossl_digest_block_length(VALUE self)
 void
 Init_ossl_digest(void)
 {
-    rb_require("digest");
-
 #if 0
-    mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
+    mOSSL = rb_define_module("OpenSSL");
+    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
 #endif
 
     /* Document-class: OpenSSL::Digest
@@ -341,54 +346,19 @@ Init_ossl_digest(void)
      * the integrity of a signed document, it suffices to re-compute the hash
      * and verify that it is equal to that in the signature.
      *
-     * Among the supported message digest algorithms are:
-     * * SHA, SHA1, SHA224, SHA256, SHA384 and SHA512
-     * * MD2, MD4, MDC2 and MD5
-     * * RIPEMD160
-     * * DSS, DSS1 (Pseudo algorithms to be used for DSA signatures. DSS is
-     *   equal to SHA and DSS1 is equal to SHA1)
+     * You can get a list of all digest algorithms supported on your system by
+     * running this command in your terminal:
      *
-     * For each of these algorithms, there is a sub-class of Digest that
-     * can be instantiated as simply as e.g.
+     *   openssl list -digest-algorithms
      *
-     *   digest = OpenSSL::Digest::SHA1.new
+     * Among the OpenSSL 1.1.1 supported message digest algorithms are:
+     * * SHA224, SHA256, SHA384, SHA512, SHA512-224 and SHA512-256
+     * * SHA3-224, SHA3-256, SHA3-384 and SHA3-512
+     * * BLAKE2s256 and BLAKE2b512
      *
-     * === Mapping between Digest class and sn/ln
+     * Each of these algorithms can be instantiated using the name:
      *
-     * The sn (short names) and ln (long names) are defined in
-     * <openssl/object.h> and <openssl/obj_mac.h>. They are textual
-     * representations of ASN.1 OBJECT IDENTIFIERs. Each supported digest
-     * algorithm has an OBJECT IDENTIFIER associated to it and those again
-     * have short/long names assigned to them.
-     * E.g. the OBJECT IDENTIFIER for SHA-1 is 1.3.14.3.2.26 and its
-     * sn is "SHA1" and its ln is "sha1".
-     * ==== MD2
-     * * sn: MD2
-     * * ln: md2
-     * ==== MD4
-     * * sn: MD4
-     * * ln: md4
-     * ==== MD5
-     * * sn: MD5
-     * * ln: md5
-     * ==== SHA
-     * * sn: SHA
-     * * ln: SHA
-     * ==== SHA-1
-     * * sn: SHA1
-     * * ln: sha1
-     * ==== SHA-224
-     * * sn: SHA224
-     * * ln: sha224
-     * ==== SHA-256
-     * * sn: SHA256
-     * * ln: sha256
-     * ==== SHA-384
-     * * sn: SHA384
-     * * ln: sha384
-     * ==== SHA-512
-     * * sn: SHA512
-     * * ln: sha512
+     *   digest = OpenSSL::Digest.new('SHA256')
      *
      * "Breaking" a message digest algorithm means defying its one-way
      * function characteristics, i.e. producing a collision or finding a way
@@ -401,7 +371,7 @@ Init_ossl_digest(void)
      * === Hashing a file
      *
      *   data = File.read('document')
-     *   sha256 = OpenSSL::Digest::SHA256.new
+     *   sha256 = OpenSSL::Digest.new('SHA256')
      *   digest = sha256.digest(data)
      *
      * === Hashing several pieces of data at once
@@ -409,7 +379,7 @@ Init_ossl_digest(void)
      *   data1 = File.read('file1')
      *   data2 = File.read('file2')
      *   data3 = File.read('file3')
-     *   sha256 = OpenSSL::Digest::SHA256.new
+     *   sha256 = OpenSSL::Digest.new('SHA256')
      *   sha256 << data1
      *   sha256 << data2
      *   sha256 << data3
@@ -418,7 +388,7 @@ Init_ossl_digest(void)
      * === Reuse a Digest instance
      *
      *   data1 = File.read('file1')
-     *   sha256 = OpenSSL::Digest::SHA256.new
+     *   sha256 = OpenSSL::Digest.new('SHA256')
      *   digest1 = sha256.digest(data1)
      *
      *   data2 = File.read('file2')
@@ -426,6 +396,12 @@ Init_ossl_digest(void)
      *   digest2 = sha256.digest(data2)
      *
      */
+
+    /*
+     * Digest::Class is defined by the digest library. rb_require() cannot be
+     * used here because it bypasses RubyGems.
+     */
+    rb_funcall(Qnil, rb_intern_const("require"), 1, rb_str_new_cstr("digest"));
     cDigest = rb_define_class_under(mOSSL, "Digest", rb_path2class("Digest::Class"));
     /* Document-class: OpenSSL::Digest::DigestError
      *
@@ -437,7 +413,7 @@ Init_ossl_digest(void)
     rb_define_alloc_func(cDigest, ossl_digest_alloc);
 
     rb_define_method(cDigest, "initialize", ossl_digest_initialize, -1);
-    rb_define_copy_func(cDigest, ossl_digest_copy);
+    rb_define_method(cDigest, "initialize_copy", ossl_digest_copy, 1);
     rb_define_method(cDigest, "reset", ossl_digest_reset, 0);
     rb_define_method(cDigest, "update", ossl_digest_update, 1);
     rb_define_alias(cDigest, "<<", "update");
diff --git a/ext/openssl/ossl_digest.h b/ext/openssl/ossl_digest.h
index 512f7d3a39..50bf5666a3 100644
--- a/ext/openssl/ossl_digest.h
+++ b/ext/openssl/ossl_digest.h
@@ -13,7 +13,7 @@
 extern VALUE cDigest;
 extern VALUE eDigestError;
 
-const EVP_MD *GetDigestPtr(VALUE);
+const EVP_MD *ossl_evp_get_digestbyname(VALUE);
 VALUE ossl_digest_new(const EVP_MD *);
 void Init_ossl_digest(void);
 
diff --git a/ext/openssl/ossl_engine.c b/ext/openssl/ossl_engine.c
index 3abc44b34e..90546934d1 100644
--- a/ext/openssl/ossl_engine.c
+++ b/ext/openssl/ossl_engine.c
@@ -25,10 +25,6 @@
         ossl_raise(rb_eRuntimeError, "ENGINE wasn't initialized."); \
     } \
 } while (0)
-#define SafeGetEngine(obj, engine) do { \
-    OSSL_Check_Kind((obj), cEngine); \
-    GetPKCS7((obj), (engine)); \
-} while (0)
 
 /*
  * Classes
@@ -50,13 +46,25 @@ VALUE eEngineError;
 /*
  * Private
  */
-#define OSSL_ENGINE_LOAD_IF_MATCH(x) \
+#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000
+#define OSSL_ENGINE_LOAD_IF_MATCH(engine_name, x) \
+do{\
+  if(!strcmp(#engine_name, RSTRING_PTR(name))){\
+    if (OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_##x, NULL))\
+      return Qtrue;\
+    else\
+      ossl_raise(eEngineError, "OPENSSL_init_crypto"); \
+  }\
+}while(0)
+#else
+#define OSSL_ENGINE_LOAD_IF_MATCH(engine_name, x)  \
 do{\
-  if(!strcmp(#x, RSTRING_PTR(name))){\
-    ENGINE_load_##x();\
+  if(!strcmp(#engine_name, RSTRING_PTR(name))){\
+    ENGINE_load_##engine_name();\
     return Qtrue;\
   }\
 }while(0)
+#endif
 
 static void
 ossl_engine_free(void *engine)
@@ -72,23 +80,19 @@ static const rb_data_type_t ossl_engine_type = {
     0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
 };
 
-/* Document-method: OpenSSL::Engine.load
- *
+/*
  * call-seq:
- *   load(enginename = nil)
+ *    OpenSSL::Engine.load(name = nil)
  *
- * This method loads engines. If +name+ is nil, then all builtin engines are
- * loaded. Otherwise, the given +name+, as a string,  is loaded if available to
- * your runtime, and returns true. If +name+ is not found, then nil is
+ * This method loads engines. If _name_ is nil, then all builtin engines are
+ * loaded. Otherwise, the given _name_, as a String,  is loaded if available to
+ * your runtime, and returns true. If _name_ is not found, then nil is
  * returned.
  *
  */
 static VALUE
 ossl_engine_s_load(int argc, VALUE *argv, VALUE klass)
 {
-#if !defined(HAVE_ENGINE_LOAD_BUILTIN_ENGINES)
-    return Qnil;
-#else
     VALUE name;
 
     rb_scan_args(argc, argv, "01", &name);
@@ -97,81 +101,76 @@ ossl_engine_s_load(int argc, VALUE *argv, VALUE klass)
         return Qtrue;
     }
     StringValueCStr(name);
-#ifndef OPENSSL_NO_STATIC_ENGINE
 #if HAVE_ENGINE_LOAD_DYNAMIC
-    OSSL_ENGINE_LOAD_IF_MATCH(dynamic);
+    OSSL_ENGINE_LOAD_IF_MATCH(dynamic, DYNAMIC);
 #endif
+#ifndef OPENSSL_NO_STATIC_ENGINE
 #if HAVE_ENGINE_LOAD_4758CCA
-    OSSL_ENGINE_LOAD_IF_MATCH(4758cca);
+    OSSL_ENGINE_LOAD_IF_MATCH(4758cca, 4758CCA);
 #endif
 #if HAVE_ENGINE_LOAD_AEP
-    OSSL_ENGINE_LOAD_IF_MATCH(aep);
+    OSSL_ENGINE_LOAD_IF_MATCH(aep, AEP);
 #endif
 #if HAVE_ENGINE_LOAD_ATALLA
-    OSSL_ENGINE_LOAD_IF_MATCH(atalla);
+    OSSL_ENGINE_LOAD_IF_MATCH(atalla, ATALLA);
 #endif
 #if HAVE_ENGINE_LOAD_CHIL
-    OSSL_ENGINE_LOAD_IF_MATCH(chil);
+    OSSL_ENGINE_LOAD_IF_MATCH(chil, CHIL);
 #endif
 #if HAVE_ENGINE_LOAD_CSWIFT
-    OSSL_ENGINE_LOAD_IF_MATCH(cswift);
+    OSSL_ENGINE_LOAD_IF_MATCH(cswift, CSWIFT);
 #endif
 #if HAVE_ENGINE_LOAD_NURON
-    OSSL_ENGINE_LOAD_IF_MATCH(nuron);
+    OSSL_ENGINE_LOAD_IF_MATCH(nuron, NURON);
 #endif
 #if HAVE_ENGINE_LOAD_SUREWARE
-    OSSL_ENGINE_LOAD_IF_MATCH(sureware);
+    OSSL_ENGINE_LOAD_IF_MATCH(sureware, SUREWARE);
 #endif
 #if HAVE_ENGINE_LOAD_UBSEC
-    OSSL_ENGINE_LOAD_IF_MATCH(ubsec);
+    OSSL_ENGINE_LOAD_IF_MATCH(ubsec, UBSEC);
 #endif
 #if HAVE_ENGINE_LOAD_PADLOCK
-    OSSL_ENGINE_LOAD_IF_MATCH(padlock);
+    OSSL_ENGINE_LOAD_IF_MATCH(padlock, PADLOCK);
 #endif
 #if HAVE_ENGINE_LOAD_CAPI
-    OSSL_ENGINE_LOAD_IF_MATCH(capi);
+    OSSL_ENGINE_LOAD_IF_MATCH(capi, CAPI);
 #endif
 #if HAVE_ENGINE_LOAD_GMP
-    OSSL_ENGINE_LOAD_IF_MATCH(gmp);
+    OSSL_ENGINE_LOAD_IF_MATCH(gmp, GMP);
 #endif
 #if HAVE_ENGINE_LOAD_GOST
-    OSSL_ENGINE_LOAD_IF_MATCH(gost);
-#endif
-#if HAVE_ENGINE_LOAD_CRYPTODEV
-    OSSL_ENGINE_LOAD_IF_MATCH(cryptodev);
-#endif
-#if HAVE_ENGINE_LOAD_AESNI
-    OSSL_ENGINE_LOAD_IF_MATCH(aesni);
+    OSSL_ENGINE_LOAD_IF_MATCH(gost, GOST);
 #endif
 #endif
-#ifdef HAVE_ENGINE_LOAD_OPENBSD_DEV_CRYPTO
-    OSSL_ENGINE_LOAD_IF_MATCH(openbsd_dev_crypto);
+#if HAVE_ENGINE_LOAD_CRYPTODEV
+    OSSL_ENGINE_LOAD_IF_MATCH(cryptodev, CRYPTODEV);
 #endif
-    OSSL_ENGINE_LOAD_IF_MATCH(openssl);
+    OSSL_ENGINE_LOAD_IF_MATCH(openssl, OPENSSL);
     rb_warning("no such builtin loader for `%"PRIsVALUE"'", name);
     return Qnil;
-#endif /* HAVE_ENGINE_LOAD_BUILTIN_ENGINES */
 }
 
-/* Document-method: OpenSSL::Engine.cleanup
+/*
  * call-seq:
- *  OpenSSL::Engine.cleanup
+ *    OpenSSL::Engine.cleanup
  *
  * It is only necessary to run cleanup when engines are loaded via
  * OpenSSL::Engine.load. However, running cleanup before exit is recommended.
  *
  * Note that this is needed and works only in OpenSSL < 1.1.0.
- *
- * See also, https://www.openssl.org/docs/crypto/engine.html
  */
 static VALUE
 ossl_engine_s_cleanup(VALUE self)
 {
+#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000
     ENGINE_cleanup();
+#endif
     return Qnil;
 }
 
-/* Document-method: OpenSSL::Engine.engines
+/*
+ * call-seq:
+ *    OpenSSL::Engine.engines -> [engine, ...]
  *
  * Returns an array of currently loaded engines.
  */
@@ -195,17 +194,16 @@ ossl_engine_s_engines(VALUE klass)
     return ary;
 }
 
-/* Document-method: OpenSSL::Engine.by_id
- *
+/*
  * call-seq:
- *   by_id(name) -> engine
+ *    OpenSSL::Engine.by_id(name) -> engine
  *
- * Fetch the engine as specified by the +id+ String
+ * Fetches the engine as specified by the _id_ String.
  *
  *   OpenSSL::Engine.by_id("openssl")
  *    => #<OpenSSL::Engine id="openssl" name="Software engine support">
  *
- * See OpenSSL::Engine.engines for the currently loaded engines
+ * See OpenSSL::Engine.engines for the currently loaded engines.
  */
 static VALUE
 ossl_engine_s_by_id(VALUE klass, VALUE id)
@@ -229,24 +227,11 @@ ossl_engine_s_by_id(VALUE klass, VALUE id)
     return obj;
 }
 
-static VALUE
-ossl_engine_s_alloc(VALUE klass)
-{
-    ENGINE *e;
-    VALUE obj;
-
-    obj = NewEngine(klass);
-    if (!(e = ENGINE_new())) {
-       ossl_raise(eEngineError, NULL);
-    }
-    SetEngine(obj, e);
-
-    return obj;
-}
-
-/* Document-method: OpenSSL::Engine#id
+/*
+ * call-seq:
+ *    engine.id -> string
  *
- * Get the id for this engine
+ * Gets the id for this engine.
  *
  *    OpenSSL::Engine.load
  *    OpenSSL::Engine.engines #=> [#<OpenSSL::Engine#>, ...]
@@ -261,9 +246,11 @@ ossl_engine_get_id(VALUE self)
     return rb_str_new2(ENGINE_get_id(e));
 }
 
-/* Document-method: OpenSSL::Engine#name
+/*
+ * call-seq:
+ *    engine.name -> string
  *
- * Get the descriptive name for this engine
+ * Get the descriptive name for this engine.
  *
  *    OpenSSL::Engine.load
  *    OpenSSL::Engine.engines #=> [#<OpenSSL::Engine#>, ...]
@@ -279,7 +266,9 @@ ossl_engine_get_name(VALUE self)
     return rb_str_new2(ENGINE_get_name(e));
 }
 
-/* Document-method: OpenSSL::Engine#finish
+/*
+ * call-seq:
+ *    engine.finish -> nil
  *
  * Releases all internal structural references for this engine.
  *
@@ -296,15 +285,14 @@ ossl_engine_finish(VALUE self)
     return Qnil;
 }
 
-/* Document-method: OpenSSL::Engine#cipher
- *
+/*
  * call-seq:
  *   engine.cipher(name) -> OpenSSL::Cipher
  *
- * This returns an OpenSSL::Cipher by +name+, if it is available in this
- * engine.
+ * Returns a new instance of OpenSSL::Cipher by _name_, if it is available in
+ * this engine.
  *
- * A EngineError will be raised if the cipher is unavailable.
+ * An EngineError will be raised if the cipher is unavailable.
  *
  *    e = OpenSSL::Engine.by_id("openssl")
  *     => #<OpenSSL::Engine id="openssl" name="Software engine support">
@@ -329,12 +317,11 @@ ossl_engine_get_cipher(VALUE self, VALUE name)
     return ossl_cipher_new(ciph);
 }
 
-/* Document-method: OpenSSL::Engine#digest
- *
+/*
  * call-seq:
  *   engine.digest(name) -> OpenSSL::Digest
  *
- * This returns an OpenSSL::Digest by +name+.
+ * Returns a new instance of OpenSSL::Digest by _name_.
  *
  * Will raise an EngineError if the digest is unavailable.
  *
@@ -362,12 +349,11 @@ ossl_engine_get_digest(VALUE self, VALUE name)
     return ossl_digest_new(md);
 }
 
-/* Document-method: OpenSSL::Engine#load_private_key
- *
+/*
  * call-seq:
  *    engine.load_private_key(id = nil, data = nil) -> OpenSSL::PKey
  *
- * Loads the given private key by +id+ and +data+.
+ * Loads the given private key identified by _id_ and _data_.
  *
  * An EngineError is raised of the OpenSSL::PKey is unavailable.
  *
@@ -392,12 +378,11 @@ ossl_engine_load_privkey(int argc, VALUE *argv, VALUE self)
     return obj;
 }
 
-/* Document-method: OpenSSL::Engine#load_public_key
- *
+/*
  * call-seq:
  *    engine.load_public_key(id = nil, data = nil) -> OpenSSL::PKey
  *
- * Loads the given private key by +id+ and +data+.
+ * Loads the given public key identified by _id_ and _data_.
  *
  * An EngineError is raised of the OpenSSL::PKey is unavailable.
  *
@@ -420,16 +405,15 @@ ossl_engine_load_pubkey(int argc, VALUE *argv, VALUE self)
     return ossl_pkey_new(pkey);
 }
 
-/* Document-method: OpenSSL::Engine#set_default
- *
+/*
  * call-seq:
  *    engine.set_default(flag)
  *
- * Set the defaults for this engine with the given +flag+.
+ * Set the defaults for this engine with the given _flag_.
  *
  * These flags are used to control combinations of algorithm methods.
  *
- * +flag+ can be one of the following, other flags are available depending on
+ * _flag_ can be one of the following, other flags are available depending on
  * your OS.
  *
  * [All flags]  0xFFFF
@@ -449,14 +433,13 @@ ossl_engine_set_default(VALUE self, VALUE flag)
     return Qtrue;
 }
 
-/* Document-method: OpenSSL::Engine#ctrl_cmd
- *
+/*
  * call-seq:
  *    engine.ctrl_cmd(command, value = nil) -> engine
  *
- * Send the given +command+ to this engine.
+ * Sends the given _command_ to this engine.
  *
- * Raises an EngineError if the +command+ fails.
+ * Raises an EngineError if the command fails.
  */
 static VALUE
 ossl_engine_ctrl_cmd(int argc, VALUE *argv, VALUE self)
@@ -486,7 +469,9 @@ ossl_engine_cmd_flag_to_name(int flag)
     }
 }
 
-/* Document-method: OpenSSL::Engine#cmds
+/*
+ * call-seq:
+ *    engine.cmds -> [["name", "description", "flags"], ...]
  *
  * Returns an array of command definitions for the current engine
  */
@@ -512,9 +497,11 @@ ossl_engine_get_cmds(VALUE self)
     return ary;
 }
 
-/* Document-method: OpenSSL::Engine#inspect
+/*
+ * call-seq:
+ *    engine.inspect -> string
  *
- * Pretty print this engine
+ * Pretty prints this engine.
  */
 static VALUE
 ossl_engine_inspect(VALUE self)
@@ -531,15 +518,19 @@ ossl_engine_inspect(VALUE self)
 void
 Init_ossl_engine(void)
 {
+#if 0
+    mOSSL = rb_define_module("OpenSSL");
+    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
+#endif
+
     cEngine = rb_define_class_under(mOSSL, "Engine", rb_cObject);
     eEngineError = rb_define_class_under(cEngine, "EngineError", eOSSLError);
 
-    rb_define_alloc_func(cEngine, ossl_engine_s_alloc);
+    rb_undef_alloc_func(cEngine);
     rb_define_singleton_method(cEngine, "load", ossl_engine_s_load, -1);
     rb_define_singleton_method(cEngine, "cleanup", ossl_engine_s_cleanup, 0);
     rb_define_singleton_method(cEngine, "engines", ossl_engine_s_engines, 0);
     rb_define_singleton_method(cEngine, "by_id", ossl_engine_s_by_id, 1);
-    rb_undef_method(CLASS_OF(cEngine), "new");
 
     rb_define_method(cEngine, "id", ossl_engine_get_id, 0);
     rb_define_method(cEngine, "name", ossl_engine_get_name, 0);
diff --git a/ext/openssl/ossl_hmac.c b/ext/openssl/ossl_hmac.c
index bb4b57846e..e831cff519 100644
--- a/ext/openssl/ossl_hmac.c
+++ b/ext/openssl/ossl_hmac.c
@@ -19,10 +19,6 @@
 	ossl_raise(rb_eRuntimeError, "HMAC wasn't initialized"); \
     } \
 } while (0)
-#define SafeGetHMAC(obj, ctx) do { \
-    OSSL_Check_Kind((obj), cHMAC); \
-    GetHMAC((obj), (ctx)); \
-} while (0)
 
 /*
  * Classes
@@ -88,18 +84,12 @@ ossl_hmac_alloc(VALUE klass)
  *
  * === A note about comparisons
  *
- * Two instances won't be equal when they're compared, even if they have the
- * same value. Use #to_s or #hexdigest to return the authentication code that
- * the instance represents. For example:
+ * Two instances can be securely compared with #== in constant time:
  *
  *	other_instance = OpenSSL::HMAC.new('key', OpenSSL::Digest.new('sha1'))
- *  	#=> f42bb0eeb018ebbd4597ae7213711ec60760843f
- *  	instance
- *  	#=> f42bb0eeb018ebbd4597ae7213711ec60760843f
- *  	instance == other_instance
- *  	#=> false
- *  	instance.to_s == other_instance.to_s
- *  	#=> true
+ *  #=> f42bb0eeb018ebbd4597ae7213711ec60760843f
+ *  instance == other_instance
+ *  #=> true
  *
  */
 static VALUE
@@ -110,7 +100,7 @@ ossl_hmac_initialize(VALUE self, VALUE key, VALUE digest)
     StringValue(key);
     GetHMAC(self, ctx);
     HMAC_Init_ex(ctx, RSTRING_PTR(key), RSTRING_LENINT(key),
-		 GetDigestPtr(digest), NULL);
+		 ossl_evp_get_digestbyname(digest), NULL);
 
     return self;
 }
@@ -124,7 +114,7 @@ ossl_hmac_copy(VALUE self, VALUE other)
     if (self == other) return self;
 
     GetHMAC(self, ctx1);
-    SafeGetHMAC(other, ctx2);
+    GetHMAC(other, ctx2);
 
     if (!HMAC_CTX_copy(ctx1, ctx2))
 	ossl_raise(eHMACError, "HMAC_CTX_copy");
@@ -135,7 +125,7 @@ ossl_hmac_copy(VALUE self, VALUE other)
  *  call-seq:
  *     hmac.update(string) -> self
  *
- * Returns +self+ updated with the message to be authenticated.
+ * Returns _hmac_ updated with the message to be authenticated.
  * Can be called repeatedly with chunks of the message.
  *
  * === Example
@@ -162,7 +152,7 @@ ossl_hmac_update(VALUE self, VALUE data)
 }
 
 static void
-hmac_final(HMAC_CTX *ctx, unsigned char **buf, unsigned int *buf_len)
+hmac_final(HMAC_CTX *ctx, unsigned char *buf, unsigned int *buf_len)
 {
     HMAC_CTX *final;
 
@@ -175,12 +165,7 @@ hmac_final(HMAC_CTX *ctx, unsigned char **buf, unsigned int *buf_len)
 	ossl_raise(eHMACError, "HMAC_CTX_copy");
     }
 
-    if (!(*buf = OPENSSL_malloc(HMAC_size(final)))) {
-	HMAC_CTX_free(final);
-	OSSL_Debug("Allocating %d mem", (int)HMAC_size(final));
-	ossl_raise(eHMACError, "Cannot allocate memory for hmac");
-    }
-    HMAC_Final(final, *buf, buf_len);
+    HMAC_Final(final, buf, buf_len);
     HMAC_CTX_free(final);
 }
 
@@ -191,26 +176,25 @@ hmac_final(HMAC_CTX *ctx, unsigned char **buf, unsigned int *buf_len)
  * Returns the authentication code an instance represents as a binary string.
  *
  * === Example
- *
- *	instance = OpenSSL::HMAC.new('key', OpenSSL::Digest.new('sha1'))
- * 	#=> f42bb0eeb018ebbd4597ae7213711ec60760843f
- * 	instance.digest
- * 	#=> "\xF4+\xB0\xEE\xB0\x18\xEB\xBDE\x97\xAEr\x13q\x1E\xC6\a`\x84?"
- *
+ *  instance = OpenSSL::HMAC.new('key', OpenSSL::Digest.new('sha1'))
+ *  #=> f42bb0eeb018ebbd4597ae7213711ec60760843f
+ *  instance.digest
+ *  #=> "\xF4+\xB0\xEE\xB0\x18\xEB\xBDE\x97\xAEr\x13q\x1E\xC6\a`\x84?"
  */
 static VALUE
 ossl_hmac_digest(VALUE self)
 {
     HMAC_CTX *ctx;
-    unsigned char *buf;
     unsigned int buf_len;
-    VALUE digest;
+    VALUE ret;
 
     GetHMAC(self, ctx);
-    hmac_final(ctx, &buf, &buf_len);
-    digest = ossl_buf2str((char *)buf, buf_len);
+    ret = rb_str_new(NULL, EVP_MAX_MD_SIZE);
+    hmac_final(ctx, (unsigned char *)RSTRING_PTR(ret), &buf_len);
+    assert(buf_len <= EVP_MAX_MD_SIZE);
+    rb_str_set_len(ret, buf_len);
 
-    return digest;
+    return ret;
 }
 
 /*
@@ -219,34 +203,28 @@ ossl_hmac_digest(VALUE self)
  *
  * Returns the authentication code an instance represents as a hex-encoded
  * string.
- *
  */
 static VALUE
 ossl_hmac_hexdigest(VALUE self)
 {
     HMAC_CTX *ctx;
-    unsigned char *buf;
-    char *hexbuf;
+    unsigned char buf[EVP_MAX_MD_SIZE];
     unsigned int buf_len;
-    VALUE hexdigest;
+    VALUE ret;
 
     GetHMAC(self, ctx);
-    hmac_final(ctx, &buf, &buf_len);
-    if (string2hex(buf, buf_len, &hexbuf, NULL) != 2 * (int)buf_len) {
-	OPENSSL_free(buf);
-	ossl_raise(eHMACError, "Memory alloc error");
-    }
-    OPENSSL_free(buf);
-    hexdigest = ossl_buf2str(hexbuf, 2 * buf_len);
+    hmac_final(ctx, buf, &buf_len);
+    ret = rb_str_new(NULL, buf_len * 2);
+    ossl_bin2hex(buf, RSTRING_PTR(ret), buf_len);
 
-    return hexdigest;
+    return ret;
 }
 
 /*
  *  call-seq:
  *     hmac.reset -> self
  *
- * Returns +self+ as it was when it was first initialized, with all processed
+ * Returns _hmac_ as it was when it was first initialized, with all processed
  * data cleared from it.
  *
  * === Example
@@ -276,16 +254,16 @@ ossl_hmac_reset(VALUE self)
  *  call-seq:
  *     HMAC.digest(digest, key, data) -> aString
  *
- * Returns the authentication code as a binary string. The +digest+ parameter
- * must be an instance of OpenSSL::Digest.
+ * Returns the authentication code as a binary string. The _digest_ parameter
+ * specifies the digest algorithm to use. This may be a String representing
+ * the algorithm name or an instance of OpenSSL::Digest.
  *
  * === Example
  *
  *	key = 'key'
  * 	data = 'The quick brown fox jumps over the lazy dog'
- * 	digest = OpenSSL::Digest.new('sha1')
  *
- * 	hmac = OpenSSL::HMAC.digest(digest, key, data)
+ * 	hmac = OpenSSL::HMAC.digest('sha1', key, data)
  * 	#=> "\xDE|\x9B\x85\xB8\xB7\x8A\xA6\xBC\x8Az6\xF7\n\x90p\x1C\x9D\xB4\xD9"
  *
  */
@@ -297,8 +275,9 @@ ossl_hmac_s_digest(VALUE klass, VALUE digest, VALUE key, VALUE data)
 
     StringValue(key);
     StringValue(data);
-    buf = HMAC(GetDigestPtr(digest), RSTRING_PTR(key), RSTRING_LENINT(key),
-	       (unsigned char *)RSTRING_PTR(data), RSTRING_LEN(data), NULL, &buf_len);
+    buf = HMAC(ossl_evp_get_digestbyname(digest), RSTRING_PTR(key),
+	       RSTRING_LENINT(key), (unsigned char *)RSTRING_PTR(data),
+	       RSTRING_LEN(data), NULL, &buf_len);
 
     return rb_str_new((const char *)buf, buf_len);
 }
@@ -307,38 +286,38 @@ ossl_hmac_s_digest(VALUE klass, VALUE digest, VALUE key, VALUE data)
  *  call-seq:
  *     HMAC.hexdigest(digest, key, data) -> aString
  *
- * Returns the authentication code as a hex-encoded string. The +digest+
- * parameter must be an instance of OpenSSL::Digest.
+ * Returns the authentication code as a hex-encoded string. The _digest_
+ * parameter specifies the digest algorithm to use. This may be a String
+ * representing the algorithm name or an instance of OpenSSL::Digest.
  *
  * === Example
  *
  *	key = 'key'
  * 	data = 'The quick brown fox jumps over the lazy dog'
- * 	digest = OpenSSL::Digest.new('sha1')
  *
- * 	hmac = OpenSSL::HMAC.hexdigest(digest, key, data)
+ * 	hmac = OpenSSL::HMAC.hexdigest('sha1', key, data)
  * 	#=> "de7c9b85b8b78aa6bc8a7a36f70a90701c9db4d9"
  *
  */
 static VALUE
 ossl_hmac_s_hexdigest(VALUE klass, VALUE digest, VALUE key, VALUE data)
 {
-    unsigned char *buf;
-    char *hexbuf;
+    unsigned char buf[EVP_MAX_MD_SIZE];
     unsigned int buf_len;
-    VALUE hexdigest;
+    VALUE ret;
 
     StringValue(key);
     StringValue(data);
 
-    buf = HMAC(GetDigestPtr(digest), RSTRING_PTR(key), RSTRING_LENINT(key),
-	       (unsigned char *)RSTRING_PTR(data), RSTRING_LEN(data), NULL, &buf_len);
-    if (string2hex(buf, buf_len, &hexbuf, NULL) != 2 * (int)buf_len) {
-	ossl_raise(eHMACError, "Cannot convert buf to hexbuf");
-    }
-    hexdigest = ossl_buf2str(hexbuf, 2 * buf_len);
+    if (!HMAC(ossl_evp_get_digestbyname(digest), RSTRING_PTR(key),
+	      RSTRING_LENINT(key), (unsigned char *)RSTRING_PTR(data),
+	      RSTRING_LEN(data), buf, &buf_len))
+	ossl_raise(eHMACError, "HMAC");
+
+    ret = rb_str_new(NULL, buf_len * 2);
+    ossl_bin2hex(buf, RSTRING_PTR(ret), buf_len);
 
-    return hexdigest;
+    return ret;
 }
 
 /*
@@ -348,10 +327,38 @@ void
 Init_ossl_hmac(void)
 {
 #if 0
-    /* :nodoc: */
-    mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
+    mOSSL = rb_define_module("OpenSSL");
+    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
 #endif
 
+    /*
+     * Document-class: OpenSSL::HMAC
+     *
+     * OpenSSL::HMAC allows computing Hash-based Message Authentication Code
+     * (HMAC). It is a type of message authentication code (MAC) involving a
+     * hash function in combination with a key. HMAC can be used to verify the
+     * integrity of a message as well as the authenticity.
+     *
+     * OpenSSL::HMAC has a similar interface to OpenSSL::Digest.
+     *
+     * === HMAC-SHA256 using one-shot interface
+     *
+     *   key = "key"
+     *   data = "message-to-be-authenticated"
+     *   mac = OpenSSL::HMAC.hexdigest("SHA256", key, data)
+     *   #=> "cddb0db23f469c8bf072b21fd837149bd6ace9ab771cceef14c9e517cc93282e"
+     *
+     * === HMAC-SHA256 using incremental interface
+     *
+     *   data1 = File.read("file1")
+     *   data2 = File.read("file2")
+     *   key = "key"
+     *   digest = OpenSSL::Digest.new('SHA256')
+     *   hmac = OpenSSL::HMAC.new(key, digest)
+     *   hmac << data1
+     *   hmac << data2
+     *   mac = hmac.digest
+     */
     eHMACError = rb_define_class_under(mOSSL, "HMACError", eOSSLError);
 
     cHMAC = rb_define_class_under(mOSSL, "HMAC", rb_cObject);
@@ -361,7 +368,7 @@ Init_ossl_hmac(void)
     rb_define_singleton_method(cHMAC, "hexdigest", ossl_hmac_s_hexdigest, 3);
 
     rb_define_method(cHMAC, "initialize", ossl_hmac_initialize, 2);
-    rb_define_copy_func(cHMAC, ossl_hmac_copy);
+    rb_define_method(cHMAC, "initialize_copy", ossl_hmac_copy, 1);
 
     rb_define_method(cHMAC, "reset", ossl_hmac_reset, 0);
     rb_define_method(cHMAC, "update", ossl_hmac_update, 1);
diff --git a/ext/openssl/ossl_kdf.c b/ext/openssl/ossl_kdf.c
new file mode 100644
index 0000000000..486e789458
--- /dev/null
+++ b/ext/openssl/ossl_kdf.c
@@ -0,0 +1,303 @@
+/*
+ * Ruby/OpenSSL Project
+ * Copyright (C) 2007, 2017 Ruby/OpenSSL Project Authors
+ */
+#include "ossl.h"
+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
+# include <openssl/kdf.h>
+#endif
+
+static VALUE mKDF, eKDF;
+
+/*
+ * call-seq:
+ *   KDF.pbkdf2_hmac(pass, salt:, iterations:, length:, hash:) -> aString
+ *
+ * PKCS #5 PBKDF2 (Password-Based Key Derivation Function 2) in combination
+ * with HMAC. Takes _pass_, _salt_ and _iterations_, and then derives a key
+ * of _length_ bytes.
+ *
+ * For more information about PBKDF2, see RFC 2898 Section 5.2
+ * (https://tools.ietf.org/html/rfc2898#section-5.2).
+ *
+ * === Parameters
+ * pass       :: The passphrase.
+ * salt       :: The salt. Salts prevent attacks based on dictionaries of common
+ *               passwords and attacks based on rainbow tables. It is a public
+ *               value that can be safely stored along with the password (e.g.
+ *               if the derived value is used for password storage).
+ * iterations :: The iteration count. This provides the ability to tune the
+ *               algorithm. It is better to use the highest count possible for
+ *               the maximum resistance to brute-force attacks.
+ * length     :: The desired length of the derived key in octets.
+ * hash       :: The hash algorithm used with HMAC for the PRF. May be a String
+ *               representing the algorithm name, or an instance of
+ *               OpenSSL::Digest.
+ */
+static VALUE
+kdf_pbkdf2_hmac(int argc, VALUE *argv, VALUE self)
+{
+    VALUE pass, salt, opts, kwargs[4], str;
+    static ID kwargs_ids[4];
+    int iters, len;
+    const EVP_MD *md;
+
+    if (!kwargs_ids[0]) {
+	kwargs_ids[0] = rb_intern_const("salt");
+	kwargs_ids[1] = rb_intern_const("iterations");
+	kwargs_ids[2] = rb_intern_const("length");
+	kwargs_ids[3] = rb_intern_const("hash");
+    }
+    rb_scan_args(argc, argv, "1:", &pass, &opts);
+    rb_get_kwargs(opts, kwargs_ids, 4, 0, kwargs);
+
+    StringValue(pass);
+    salt = StringValue(kwargs[0]);
+    iters = NUM2INT(kwargs[1]);
+    len = NUM2INT(kwargs[2]);
+    md = ossl_evp_get_digestbyname(kwargs[3]);
+
+    str = rb_str_new(0, len);
+    if (!PKCS5_PBKDF2_HMAC(RSTRING_PTR(pass), RSTRING_LENINT(pass),
+			   (unsigned char *)RSTRING_PTR(salt),
+			   RSTRING_LENINT(salt), iters, md, len,
+			   (unsigned char *)RSTRING_PTR(str)))
+	ossl_raise(eKDF, "PKCS5_PBKDF2_HMAC");
+
+    return str;
+}
+
+#if defined(HAVE_EVP_PBE_SCRYPT)
+/*
+ * call-seq:
+ *   KDF.scrypt(pass, salt:, N:, r:, p:, length:) -> aString
+ *
+ * Derives a key from _pass_ using given parameters with the scrypt
+ * password-based key derivation function. The result can be used for password
+ * storage.
+ *
+ * scrypt is designed to be memory-hard and more secure against brute-force
+ * attacks using custom hardwares than alternative KDFs such as PBKDF2 or
+ * bcrypt.
+ *
+ * The keyword arguments _N_, _r_ and _p_ can be used to tune scrypt. RFC 7914
+ * (published on 2016-08, https://tools.ietf.org/html/rfc7914#section-2) states
+ * that using values r=8 and p=1 appears to yield good results.
+ *
+ * See RFC 7914 (https://tools.ietf.org/html/rfc7914) for more information.
+ *
+ * === Parameters
+ * pass   :: Passphrase.
+ * salt   :: Salt.
+ * N      :: CPU/memory cost parameter. This must be a power of 2.
+ * r      :: Block size parameter.
+ * p      :: Parallelization parameter.
+ * length :: Length in octets of the derived key.
+ *
+ * === Example
+ *   pass = "password"
+ *   salt = SecureRandom.random_bytes(16)
+ *   dk = OpenSSL::KDF.scrypt(pass, salt: salt, N: 2**14, r: 8, p: 1, length: 32)
+ *   p dk #=> "\xDA\xE4\xE2...\x7F\xA1\x01T"
+ */
+static VALUE
+kdf_scrypt(int argc, VALUE *argv, VALUE self)
+{
+    VALUE pass, salt, opts, kwargs[5], str;
+    static ID kwargs_ids[5];
+    size_t len;
+    uint64_t N, r, p, maxmem;
+
+    if (!kwargs_ids[0]) {
+	kwargs_ids[0] = rb_intern_const("salt");
+	kwargs_ids[1] = rb_intern_const("N");
+	kwargs_ids[2] = rb_intern_const("r");
+	kwargs_ids[3] = rb_intern_const("p");
+	kwargs_ids[4] = rb_intern_const("length");
+    }
+    rb_scan_args(argc, argv, "1:", &pass, &opts);
+    rb_get_kwargs(opts, kwargs_ids, 5, 0, kwargs);
+
+    StringValue(pass);
+    salt = StringValue(kwargs[0]);
+    N = NUM2UINT64T(kwargs[1]);
+    r = NUM2UINT64T(kwargs[2]);
+    p = NUM2UINT64T(kwargs[3]);
+    len = NUM2LONG(kwargs[4]);
+    /*
+     * OpenSSL uses 32MB by default (if zero is specified), which is too small.
+     * Let's not limit memory consumption but just let malloc() fail inside
+     * OpenSSL. The amount is controllable by other parameters.
+     */
+    maxmem = SIZE_MAX;
+
+    str = rb_str_new(0, len);
+    if (!EVP_PBE_scrypt(RSTRING_PTR(pass), RSTRING_LEN(pass),
+			(unsigned char *)RSTRING_PTR(salt), RSTRING_LEN(salt),
+			N, r, p, maxmem, (unsigned char *)RSTRING_PTR(str), len))
+	ossl_raise(eKDF, "EVP_PBE_scrypt");
+
+    return str;
+}
+#endif
+
+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
+/*
+ * call-seq:
+ *    KDF.hkdf(ikm, salt:, info:, length:, hash:) -> String
+ *
+ * HMAC-based Extract-and-Expand Key Derivation Function (HKDF) as specified in
+ * {RFC 5869}[https://tools.ietf.org/html/rfc5869].
+ *
+ * New in OpenSSL 1.1.0.
+ *
+ * === Parameters
+ * _ikm_::
+ *   The input keying material.
+ * _salt_::
+ *   The salt.
+ * _info_::
+ *   The context and application specific information.
+ * _length_::
+ *   The output length in octets. Must be <= <tt>255 * HashLen</tt>, where
+ *   HashLen is the length of the hash function output in octets.
+ * _hash_::
+ *   The hash function.
+ */
+static VALUE
+kdf_hkdf(int argc, VALUE *argv, VALUE self)
+{
+    VALUE ikm, salt, info, opts, kwargs[4], str;
+    static ID kwargs_ids[4];
+    int saltlen, ikmlen, infolen;
+    size_t len;
+    const EVP_MD *md;
+    EVP_PKEY_CTX *pctx;
+
+    if (!kwargs_ids[0]) {
+	kwargs_ids[0] = rb_intern_const("salt");
+	kwargs_ids[1] = rb_intern_const("info");
+	kwargs_ids[2] = rb_intern_const("length");
+	kwargs_ids[3] = rb_intern_const("hash");
+    }
+    rb_scan_args(argc, argv, "1:", &ikm, &opts);
+    rb_get_kwargs(opts, kwargs_ids, 4, 0, kwargs);
+
+    StringValue(ikm);
+    ikmlen = RSTRING_LENINT(ikm);
+    salt = StringValue(kwargs[0]);
+    saltlen = RSTRING_LENINT(salt);
+    info = StringValue(kwargs[1]);
+    infolen = RSTRING_LENINT(info);
+    len = (size_t)NUM2LONG(kwargs[2]);
+    if (len > LONG_MAX)
+	rb_raise(rb_eArgError, "length must be non-negative");
+    md = ossl_evp_get_digestbyname(kwargs[3]);
+
+    str = rb_str_new(NULL, (long)len);
+    pctx = EVP_PKEY_CTX_new_id(EVP_PKEY_HKDF, NULL);
+    if (!pctx)
+	ossl_raise(eKDF, "EVP_PKEY_CTX_new_id");
+    if (EVP_PKEY_derive_init(pctx) <= 0) {
+	EVP_PKEY_CTX_free(pctx);
+	ossl_raise(eKDF, "EVP_PKEY_derive_init");
+    }
+    if (EVP_PKEY_CTX_set_hkdf_md(pctx, md) <= 0) {
+	EVP_PKEY_CTX_free(pctx);
+	ossl_raise(eKDF, "EVP_PKEY_CTX_set_hkdf_md");
+    }
+    if (EVP_PKEY_CTX_set1_hkdf_salt(pctx, (unsigned char *)RSTRING_PTR(salt),
+				    saltlen) <= 0) {
+	EVP_PKEY_CTX_free(pctx);
+	ossl_raise(eKDF, "EVP_PKEY_CTX_set_hkdf_salt");
+    }
+    if (EVP_PKEY_CTX_set1_hkdf_key(pctx, (unsigned char *)RSTRING_PTR(ikm),
+				   ikmlen) <= 0) {
+	EVP_PKEY_CTX_free(pctx);
+	ossl_raise(eKDF, "EVP_PKEY_CTX_set_hkdf_key");
+    }
+    if (EVP_PKEY_CTX_add1_hkdf_info(pctx, (unsigned char *)RSTRING_PTR(info),
+				    infolen) <= 0) {
+	EVP_PKEY_CTX_free(pctx);
+	ossl_raise(eKDF, "EVP_PKEY_CTX_set_hkdf_info");
+    }
+    if (EVP_PKEY_derive(pctx, (unsigned char *)RSTRING_PTR(str), &len) <= 0) {
+	EVP_PKEY_CTX_free(pctx);
+	ossl_raise(eKDF, "EVP_PKEY_derive");
+    }
+    rb_str_set_len(str, (long)len);
+    EVP_PKEY_CTX_free(pctx);
+
+    return str;
+}
+#endif
+
+void
+Init_ossl_kdf(void)
+{
+#if 0
+    mOSSL = rb_define_module("OpenSSL");
+    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
+#endif
+
+    /*
+     * Document-module: OpenSSL::KDF
+     *
+     * Provides functionality of various KDFs (key derivation function).
+     *
+     * KDF is typically used for securely deriving arbitrary length symmetric
+     * keys to be used with an OpenSSL::Cipher from passwords. Another use case
+     * is for storing passwords: Due to the ability to tweak the effort of
+     * computation by increasing the iteration count, computation can be slowed
+     * down artificially in order to render possible attacks infeasible.
+     *
+     * Currently, OpenSSL::KDF provides implementations for the following KDF:
+     *
+     * * PKCS #5 PBKDF2 (Password-Based Key Derivation Function 2) in
+     *   combination with HMAC
+     * * scrypt
+     * * HKDF
+     *
+     * == Examples
+     * === Generating a 128 bit key for a Cipher (e.g. AES)
+     *   pass = "secret"
+     *   salt = OpenSSL::Random.random_bytes(16)
+     *   iter = 20_000
+     *   key_len = 16
+     *   key = OpenSSL::KDF.pbkdf2_hmac(pass, salt: salt, iterations: iter,
+     *                                  length: key_len, hash: "sha1")
+     *
+     * === Storing Passwords
+     *   pass = "secret"
+     *   # store this with the generated value
+     *   salt = OpenSSL::Random.random_bytes(16)
+     *   iter = 20_000
+     *   hash = OpenSSL::Digest.new('SHA256')
+     *   len = hash.digest_length
+     *   # the final value to be stored
+     *   value = OpenSSL::KDF.pbkdf2_hmac(pass, salt: salt, iterations: iter,
+     *                                    length: len, hash: hash)
+     *
+     * == Important Note on Checking Passwords
+     * When comparing passwords provided by the user with previously stored
+     * values, a common mistake made is comparing the two values using "==".
+     * Typically, "==" short-circuits on evaluation, and is therefore
+     * vulnerable to timing attacks. The proper way is to use a method that
+     * always takes the same amount of time when comparing two values, thus
+     * not leaking any information to potential attackers. To do this, use
+     * +OpenSSL.fixed_length_secure_compare+.
+     */
+    mKDF = rb_define_module_under(mOSSL, "KDF");
+    /*
+     * Generic exception class raised if an error occurs in OpenSSL::KDF module.
+     */
+    eKDF = rb_define_class_under(mKDF, "KDFError", eOSSLError);
+
+    rb_define_module_function(mKDF, "pbkdf2_hmac", kdf_pbkdf2_hmac, -1);
+#if defined(HAVE_EVP_PBE_SCRYPT)
+    rb_define_module_function(mKDF, "scrypt", kdf_scrypt, -1);
+#endif
+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
+    rb_define_module_function(mKDF, "hkdf", kdf_hkdf, -1);
+#endif
+}
diff --git a/ext/openssl/ossl_kdf.h b/ext/openssl/ossl_kdf.h
new file mode 100644
index 0000000000..b6503f8d9d
--- /dev/null
+++ b/ext/openssl/ossl_kdf.h
@@ -0,0 +1,6 @@
+#if !defined(OSSL_KDF_H)
+#define OSSL_KDF_H
+
+void Init_ossl_kdf(void);
+
+#endif
diff --git a/ext/openssl/ossl_ns_spki.c b/ext/openssl/ossl_ns_spki.c
index e93b1b0a80..9b1147367a 100644
--- a/ext/openssl/ossl_ns_spki.c
+++ b/ext/openssl/ossl_ns_spki.c
@@ -73,7 +73,7 @@ ossl_spki_alloc(VALUE klass)
  *    SPKI.new([request]) => spki
  *
  * === Parameters
- * * +request+ - optional raw request, either in PEM or DER format.
+ * * _request_ - optional raw request, either in PEM or DER format.
  */
 static VALUE
 ossl_spki_initialize(int argc, VALUE *argv, VALUE self)
@@ -159,8 +159,6 @@ ossl_spki_print(VALUE self)
 {
     NETSCAPE_SPKI *spki;
     BIO *out;
-    BUF_MEM *buf;
-    VALUE str;
 
     GetSPKI(self, spki);
     if (!(out = BIO_new(BIO_s_mem()))) {
@@ -170,11 +168,8 @@ ossl_spki_print(VALUE self)
 	BIO_free(out);
 	ossl_raise(eSPKIError, NULL);
     }
-    BIO_get_mem_ptr(out, &buf);
-    str = rb_str_new(buf->data, buf->length);
-    BIO_free(out);
 
-    return str;
+    return ossl_membio2str(out);
 }
 
 /*
@@ -203,7 +198,7 @@ ossl_spki_get_public_key(VALUE self)
  *    spki.public_key = pub => pkey
  *
  * === Parameters
- * * +pub+ - the public key to be set for this instance
+ * * _pub_ - the public key to be set for this instance
  *
  * Sets the public key to be associated with the SPKI, an instance of
  * OpenSSL::PKey. This should be the public key corresponding to the
@@ -213,12 +208,13 @@ static VALUE
 ossl_spki_set_public_key(VALUE self, VALUE key)
 {
     NETSCAPE_SPKI *spki;
+    EVP_PKEY *pkey;
 
     GetSPKI(self, spki);
-    if (!NETSCAPE_SPKI_set_pubkey(spki, GetPKeyPtr(key))) { /* NO NEED TO DUP */
-	ossl_raise(eSPKIError, NULL);
-    }
-
+    pkey = GetPKeyPtr(key);
+    ossl_pkey_check_public_key(pkey);
+    if (!NETSCAPE_SPKI_set_pubkey(spki, pkey))
+	ossl_raise(eSPKIError, "NETSCAPE_SPKI_set_pubkey");
     return key;
 }
 
@@ -248,7 +244,7 @@ ossl_spki_get_challenge(VALUE self)
  *    spki.challenge = str => string
  *
  * === Parameters
- * * +str+ - the challenge string to be set for this instance
+ * * _str_ - the challenge string to be set for this instance
  *
  * Sets the challenge to be associated with the SPKI. May be used by the
  * server, e.g. to prevent replay.
@@ -273,8 +269,8 @@ ossl_spki_set_challenge(VALUE self, VALUE str)
  *    spki.sign(key, digest) => spki
  *
  * === Parameters
- * * +key+ - the private key to be used for signing this instance
- * * +digest+ - the digest to be used for signing this instance
+ * * _key_ - the private key to be used for signing this instance
+ * * _digest_ - the digest to be used for signing this instance
  *
  * To sign an SPKI, the private key corresponding to the public key set
  * for this instance should be used, in addition to a digest algorithm in
@@ -289,7 +285,7 @@ ossl_spki_sign(VALUE self, VALUE key, VALUE digest)
     const EVP_MD *md;
 
     pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
-    md = GetDigestPtr(digest);
+    md = ossl_evp_get_digestbyname(digest);
     GetSPKI(self, spki);
     if (!NETSCAPE_SPKI_sign(spki, pkey, md)) {
 	ossl_raise(eSPKIError, NULL);
@@ -303,7 +299,7 @@ ossl_spki_sign(VALUE self, VALUE key, VALUE digest)
  *    spki.verify(key) => boolean
  *
  * === Parameters
- * * +key+ - the public key to be used for verifying the SPKI signature
+ * * _key_ - the public key to be used for verifying the SPKI signature
  *
  * Returns +true+ if the signature is valid, +false+ otherwise. To verify an
  * SPKI, the public key contained within the SPKI should be used.
@@ -312,22 +308,25 @@ static VALUE
 ossl_spki_verify(VALUE self, VALUE key)
 {
     NETSCAPE_SPKI *spki;
+    EVP_PKEY *pkey;
 
     GetSPKI(self, spki);
-    switch (NETSCAPE_SPKI_verify(spki, GetPKeyPtr(key))) { /* NO NEED TO DUP */
-    case 0:
+    pkey = GetPKeyPtr(key);
+    ossl_pkey_check_public_key(pkey);
+    switch (NETSCAPE_SPKI_verify(spki, pkey)) {
+      case 0:
+	ossl_clear_error();
 	return Qfalse;
-    case 1:
+      case 1:
 	return Qtrue;
-    default:
-	ossl_raise(eSPKIError, NULL);
+      default:
+	ossl_raise(eSPKIError, "NETSCAPE_SPKI_verify");
     }
-    return Qnil; /* dummy */
 }
 
 /* Document-class: OpenSSL::Netscape::SPKI
  *
- * A Simple Public Key Infrastructure implementation (pronounced "spookey").
+ * A Simple Public Key Infrastructure implementation (pronounced "spooky").
  * The structure is defined as
  *   PublicKeyAndChallenge ::= SEQUENCE {
  *     spki SubjectPublicKeyInfo,
@@ -351,9 +350,9 @@ ossl_spki_verify(VALUE self, VALUE key)
  *   spki = OpenSSL::Netscape::SPKI.new
  *   spki.challenge = "RandomChallenge"
  *   spki.public_key = key.public_key
- *   spki.sign(key, OpenSSL::Digest::SHA256.new)
+ *   spki.sign(key, OpenSSL::Digest.new('SHA256'))
  *   #send a request containing this to a server generating a certificate
- * === Verifiying an SPKI request
+ * === Verifying an SPKI request
  *   request = #...
  *   spki = OpenSSL::Netscape::SPKI.new request
  *   unless spki.verify(spki.public_key)
@@ -380,7 +379,8 @@ void
 Init_ossl_ns_spki(void)
 {
 #if 0
-    mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
+    mOSSL = rb_define_module("OpenSSL");
+    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
 #endif
 
     mNetscape = rb_define_module_under(mOSSL, "Netscape");
diff --git a/ext/openssl/ossl_ocsp.c b/ext/openssl/ossl_ocsp.c
index bb5eb5a869..7a92e5df68 100644
--- a/ext/openssl/ossl_ocsp.c
+++ b/ext/openssl/ossl_ocsp.c
@@ -22,10 +22,6 @@
     TypedData_Get_Struct((obj), OCSP_REQUEST, &ossl_ocsp_request_type, (req)); \
     if(!(req)) ossl_raise(rb_eRuntimeError, "Request wasn't initialized!"); \
 } while (0)
-#define SafeGetOCSPReq(obj, req) do { \
-    OSSL_Check_Kind((obj), cOCSPReq); \
-    GetOCSPReq((obj), (req)); \
-} while (0)
 
 #define NewOCSPRes(klass) \
     TypedData_Wrap_Struct((klass), &ossl_ocsp_response_type, 0)
@@ -37,10 +33,6 @@
     TypedData_Get_Struct((obj), OCSP_RESPONSE, &ossl_ocsp_response_type, (res)); \
     if(!(res)) ossl_raise(rb_eRuntimeError, "Response wasn't initialized!"); \
 } while (0)
-#define SafeGetOCSPRes(obj, res) do { \
-    OSSL_Check_Kind((obj), cOCSPRes); \
-    GetOCSPRes((obj), (res)); \
-} while (0)
 
 #define NewOCSPBasicRes(klass) \
     TypedData_Wrap_Struct((klass), &ossl_ocsp_basicresp_type, 0)
@@ -52,10 +44,6 @@
     TypedData_Get_Struct((obj), OCSP_BASICRESP, &ossl_ocsp_basicresp_type, (res)); \
     if(!(res)) ossl_raise(rb_eRuntimeError, "Response wasn't initialized!"); \
 } while (0)
-#define SafeGetOCSPBasicRes(obj, res) do { \
-    OSSL_Check_Kind((obj), cOCSPBasicRes); \
-    GetOCSPBasicRes((obj), (res)); \
-} while (0)
 
 #define NewOCSPSingleRes(klass) \
     TypedData_Wrap_Struct((klass), &ossl_ocsp_singleresp_type, 0)
@@ -67,10 +55,6 @@
     TypedData_Get_Struct((obj), OCSP_SINGLERESP, &ossl_ocsp_singleresp_type, (res)); \
     if(!(res)) ossl_raise(rb_eRuntimeError, "SingleResponse wasn't initialized!"); \
 } while (0)
-#define SafeGetOCSPSingleRes(obj, res) do { \
-    OSSL_Check_Kind((obj), cOCSPSingleRes); \
-    GetOCSPSingleRes((obj), (res)); \
-} while (0)
 
 #define NewOCSPCertId(klass) \
     TypedData_Wrap_Struct((klass), &ossl_ocsp_certid_type, 0)
@@ -82,10 +66,6 @@
     TypedData_Get_Struct((obj), OCSP_CERTID, &ossl_ocsp_certid_type, (cid)); \
     if(!(cid)) ossl_raise(rb_eRuntimeError, "Cert ID wasn't initialized!"); \
 } while (0)
-#define SafeGetOCSPCertId(obj, cid) do { \
-    OSSL_Check_Kind((obj), cOCSPCertId); \
-    GetOCSPCertId((obj), (cid)); \
-} while (0)
 
 VALUE mOCSP;
 VALUE eOCSPError;
@@ -200,7 +180,7 @@ ossl_ocspreq_initialize_copy(VALUE self, VALUE other)
 
     rb_check_frozen(self);
     GetOCSPReq(self, req_old);
-    SafeGetOCSPReq(other, req);
+    GetOCSPReq(other, req);
 
     req_new = ASN1_item_dup(ASN1_ITEM_rptr(OCSP_REQUEST), req);
     if (!req_new)
@@ -218,24 +198,27 @@ ossl_ocspreq_initialize_copy(VALUE self, VALUE other)
  *   OpenSSL::OCSP::Request.new(request_der) -> request
  *
  * Creates a new OpenSSL::OCSP::Request.  The request may be created empty or
- * from a +request_der+ string.
+ * from a _request_der_ string.
  */
 
 static VALUE
 ossl_ocspreq_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE arg;
+    OCSP_REQUEST *req, *req_new;
     const unsigned char *p;
 
     rb_scan_args(argc, argv, "01", &arg);
     if(!NIL_P(arg)){
-	OCSP_REQUEST *req;
 	GetOCSPReq(self, req);
 	arg = ossl_to_der_if_possible(arg);
 	StringValue(arg);
 	p = (unsigned char *)RSTRING_PTR(arg);
-	if (!d2i_OCSP_REQUEST(&req, &p, RSTRING_LEN(arg)))
-	    ossl_raise(eOCSPError, "cannot load DER encoded request");
+	req_new = d2i_OCSP_REQUEST(NULL, &p, RSTRING_LEN(arg));
+	if (!req_new)
+	    ossl_raise(eOCSPError, "d2i_OCSP_REQUEST");
+	SetOCSPReq(self, req_new);
+	OCSP_REQUEST_free(req);
     }
 
     return self;
@@ -245,7 +228,7 @@ ossl_ocspreq_initialize(int argc, VALUE *argv, VALUE self)
  * call-seq:
  *   request.add_nonce(nonce = nil) -> request
  *
- * Adds a +nonce+ to the OCSP request.  If no nonce is given a random one will
+ * Adds a _nonce_ to the OCSP request.  If no nonce is given a random one will
  * be generated.
  *
  * The nonce is used to prevent replay attacks but some servers do not support
@@ -278,7 +261,7 @@ ossl_ocspreq_add_nonce(int argc, VALUE *argv, VALUE self)
  * call-seq:
  *   request.check_nonce(response) -> result
  *
- * Checks the nonce validity for this request and +response+.
+ * Checks the nonce validity for this request and _response_.
  *
  * The return value is one of the following:
  *
@@ -288,7 +271,7 @@ ossl_ocspreq_add_nonce(int argc, VALUE *argv, VALUE self)
  *  2 :: nonces both absent.
  *  3 :: nonce present in response only.
  *
- * For most responses, clients can check +result+ > 0.  If a responder doesn't
+ * For most responses, clients can check _result_ > 0.  If a responder doesn't
  * handle nonces <code>result.nonzero?</code> may be necessary.  A result of
  * <code>0</code> is always an error.
  */
@@ -301,7 +284,7 @@ ossl_ocspreq_check_nonce(VALUE self, VALUE basic_resp)
     int res;
 
     GetOCSPReq(self, req);
-    SafeGetOCSPBasicRes(basic_resp, bs);
+    GetOCSPBasicRes(basic_resp, bs);
     res = OCSP_check_nonce(req, bs);
 
     return INT2NUM(res);
@@ -311,19 +294,24 @@ ossl_ocspreq_check_nonce(VALUE self, VALUE basic_resp)
  * call-seq:
  *   request.add_certid(certificate_id) -> request
  *
- * Adds +certificate_id+ to the request.
+ * Adds _certificate_id_ to the request.
  */
 
 static VALUE
 ossl_ocspreq_add_certid(VALUE self, VALUE certid)
 {
     OCSP_REQUEST *req;
-    OCSP_CERTID *id;
+    OCSP_CERTID *id, *id_new;
 
     GetOCSPReq(self, req);
     GetOCSPCertId(certid, id);
-    if(!OCSP_request_add0_id(req, OCSP_CERTID_dup(id)))
-	ossl_raise(eOCSPError, NULL);
+
+    if (!(id_new = OCSP_CERTID_dup(id)))
+	ossl_raise(eOCSPError, "OCSP_CERTID_dup");
+    if (!OCSP_request_add0_id(req, id_new)) {
+	OCSP_CERTID_free(id_new);
+	ossl_raise(eOCSPError, "OCSP_request_add0_id");
+    }
 
     return self;
 }
@@ -363,16 +351,18 @@ ossl_ocspreq_get_certid(VALUE self)
  * call-seq:
  *   request.sign(cert, key, certs = nil, flags = 0, digest = nil) -> self
  *
- * Signs this OCSP request using +cert+, +key+ and optional +digest+. If
- * +digest+ is not specified, SHA-1 is used. +certs+ is an optional Array of
- * additional certificates that will be included in the request. If +certs+ is
- * not specified, flag OpenSSL::OCSP::NOCERTS is set. Pass an empty array to
- * include only the signer certificate.
+ * Signs this OCSP request using _cert_, _key_ and optional _digest_. If
+ * _digest_ is not specified, SHA-1 is used. _certs_ is an optional Array of
+ * additional certificates which are included in the request in addition to
+ * the signer certificate. Note that if _certs_ is +nil+ or not given, flag
+ * OpenSSL::OCSP::NOCERTS is enabled. Pass an empty array to include only the
+ * signer certificate.
  *
- * +flags+ can include:
- * OpenSSL::OCSP::NOCERTS::    don't include certificates
+ * _flags_ is a bitwise OR of the following constants:
+ *
+ * OpenSSL::OCSP::NOCERTS::
+ *   Don't include any certificates in the request. _certs_ will be ignored.
  */
-
 static VALUE
 ossl_ocspreq_sign(int argc, VALUE *argv, VALUE self)
 {
@@ -394,9 +384,9 @@ ossl_ocspreq_sign(int argc, VALUE *argv, VALUE self)
     if (NIL_P(digest))
 	md = EVP_sha1();
     else
-	md = GetDigestPtr(digest);
+	md = ossl_evp_get_digestbyname(digest);
     if (NIL_P(certs))
-	flags |= OCSP_NOCERTS;
+	flg |= OCSP_NOCERTS;
     else
 	x509s = ossl_x509_ary2sk(certs);
 
@@ -411,9 +401,12 @@ ossl_ocspreq_sign(int argc, VALUE *argv, VALUE self)
  * call-seq:
  *   request.verify(certificates, store, flags = 0) -> true or false
  *
- * Verifies this request using the given +certificates+ and +store+.
- * +certificates+ is an array of OpenSSL::X509::Certificate, +store+ is an
+ * Verifies this request using the given _certificates_ and _store_.
+ * _certificates_ is an array of OpenSSL::X509::Certificate, _store_ is an
  * OpenSSL::X509::Store.
+ *
+ * Note that +false+ is returned if the request does not have a signature.
+ * Use #signed? to check whether the request is signed or not.
  */
 
 static VALUE
@@ -432,7 +425,7 @@ ossl_ocspreq_verify(int argc, VALUE *argv, VALUE self)
     x509s = ossl_x509_ary2sk(certs);
     result = OCSP_request_verify(req, x509s, x509st, flg);
     sk_X509_pop_free(x509s, X509_free);
-    if (!result)
+    if (result <= 0)
 	ossl_clear_error();
 
     return result > 0 ? Qtrue : Qfalse;
@@ -463,13 +456,29 @@ ossl_ocspreq_to_der(VALUE self)
 }
 
 /*
+ * call-seq:
+ *    request.signed? -> true or false
+ *
+ * Returns +true+ if the request is signed, +false+ otherwise. Note that the
+ * validity of the signature is *not* checked. Use #verify to verify that.
+ */
+static VALUE
+ossl_ocspreq_signed_p(VALUE self)
+{
+    OCSP_REQUEST *req;
+
+    GetOCSPReq(self, req);
+    return OCSP_request_is_signed(req) ? Qtrue : Qfalse;
+}
+
+/*
  * OCSP::Response
  */
 
 /* call-seq:
  *   OpenSSL::OCSP::Response.create(status, basic_response = nil) -> response
  *
- * Creates an OpenSSL::OCSP::Response from +status+ and +basic_response+.
+ * Creates an OpenSSL::OCSP::Response from _status_ and _basic_response_.
  */
 
 static VALUE
@@ -511,7 +520,7 @@ ossl_ocspres_initialize_copy(VALUE self, VALUE other)
 
     rb_check_frozen(self);
     GetOCSPRes(self, res_old);
-    SafeGetOCSPRes(other, res);
+    GetOCSPRes(other, res);
 
     res_new = ASN1_item_dup(ASN1_ITEM_rptr(OCSP_RESPONSE), res);
     if (!res_new)
@@ -529,24 +538,27 @@ ossl_ocspres_initialize_copy(VALUE self, VALUE other)
  *   OpenSSL::OCSP::Response.new(response_der) -> response
  *
  * Creates a new OpenSSL::OCSP::Response.  The response may be created empty or
- * from a +response_der+ string.
+ * from a _response_der_ string.
  */
 
 static VALUE
 ossl_ocspres_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE arg;
+    OCSP_RESPONSE *res, *res_new;
     const unsigned char *p;
 
     rb_scan_args(argc, argv, "01", &arg);
     if(!NIL_P(arg)){
-	OCSP_RESPONSE *res;
 	GetOCSPRes(self, res);
 	arg = ossl_to_der_if_possible(arg);
 	StringValue(arg);
 	p = (unsigned char *)RSTRING_PTR(arg);
-	if (!d2i_OCSP_RESPONSE(&res, &p, RSTRING_LEN(arg)))
-	    ossl_raise(eOCSPError, "cannot load DER encoded response");
+	res_new = d2i_OCSP_RESPONSE(NULL, &p, RSTRING_LEN(arg));
+	if (!res_new)
+	    ossl_raise(eOCSPError, "d2i_OCSP_RESPONSE");
+	SetOCSPRes(self, res_new);
+	OCSP_RESPONSE_free(res);
     }
 
     return self;
@@ -664,7 +676,7 @@ ossl_ocspbres_initialize_copy(VALUE self, VALUE other)
 
     rb_check_frozen(self);
     GetOCSPBasicRes(self, bs_old);
-    SafeGetOCSPBasicRes(other, bs);
+    GetOCSPBasicRes(other, bs);
 
     bs_new = ASN1_item_dup(ASN1_ITEM_rptr(OCSP_BASICRESP), bs);
     if (!bs_new)
@@ -680,7 +692,7 @@ ossl_ocspbres_initialize_copy(VALUE self, VALUE other)
  * call-seq:
  *   OpenSSL::OCSP::BasicResponse.new(der_string = nil) -> basic_response
  *
- * Creates a new BasicResponse. If +der_string+ is given, decodes +der_string+
+ * Creates a new BasicResponse. If _der_string_ is given, decodes _der_string_
  * as DER.
  */
 
@@ -688,17 +700,20 @@ static VALUE
 ossl_ocspbres_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE arg;
+    OCSP_BASICRESP *res, *res_new;
     const unsigned char *p;
 
     rb_scan_args(argc, argv, "01", &arg);
     if (!NIL_P(arg)) {
-	OCSP_BASICRESP *res;
 	GetOCSPBasicRes(self, res);
 	arg = ossl_to_der_if_possible(arg);
 	StringValue(arg);
 	p = (unsigned char *)RSTRING_PTR(arg);
-	if (!d2i_OCSP_BASICRESP(&res, &p, RSTRING_LEN(arg)))
+	res_new = d2i_OCSP_BASICRESP(NULL, &p, RSTRING_LEN(arg));
+	if (!res_new)
 	    ossl_raise(eOCSPError, "d2i_OCSP_BASICRESP");
+	SetOCSPBasicRes(self, res_new);
+	OCSP_BASICRESP_free(res);
     }
 
     return self;
@@ -708,7 +723,7 @@ ossl_ocspbres_initialize(int argc, VALUE *argv, VALUE self)
  * call-seq:
  *   basic_response.copy_nonce(request) -> Integer
  *
- * Copies the nonce from +request+ into this response.  Returns 1 on success
+ * Copies the nonce from _request_ into this response.  Returns 1 on success
  * and 0 on failure.
  */
 
@@ -720,7 +735,7 @@ ossl_ocspbres_copy_nonce(VALUE self, VALUE request)
     int ret;
 
     GetOCSPBasicRes(self, bs);
-    SafeGetOCSPReq(request, req);
+    GetOCSPReq(request, req);
     ret = OCSP_copy_nonce(bs, req);
 
     return INT2NUM(ret);
@@ -730,7 +745,7 @@ ossl_ocspbres_copy_nonce(VALUE self, VALUE request)
  * call-seq:
  *   basic_response.add_nonce(nonce = nil)
  *
- * Adds +nonce+ to this response.  If no nonce was provided a random nonce
+ * Adds _nonce_ to this response.  If no nonce was provided a random nonce
  * will be added.
  */
 
@@ -776,26 +791,26 @@ add_status_convert_time(VALUE obj)
  * call-seq:
  *   basic_response.add_status(certificate_id, status, reason, revocation_time, this_update, next_update, extensions) -> basic_response
  *
- * Adds a certificate status for +certificate_id+. +status+ is the status, and
+ * Adds a certificate status for _certificate_id_. _status_ is the status, and
  * must be one of these:
  *
  * - OpenSSL::OCSP::V_CERTSTATUS_GOOD
  * - OpenSSL::OCSP::V_CERTSTATUS_REVOKED
  * - OpenSSL::OCSP::V_CERTSTATUS_UNKNOWN
  *
- * +reason+ and +revocation_time+ can be given only when +status+ is
- * OpenSSL::OCSP::V_CERTSTATUS_REVOKED. +reason+ describes the reason for the
+ * _reason_ and _revocation_time_ can be given only when _status_ is
+ * OpenSSL::OCSP::V_CERTSTATUS_REVOKED. _reason_ describes the reason for the
  * revocation, and must be one of OpenSSL::OCSP::REVOKED_STATUS_* constants.
- * +revocation_time+ is the time when the certificate is revoked.
+ * _revocation_time_ is the time when the certificate is revoked.
  *
- * +this_update+ and +next_update+ indicate the time at which ths status is
+ * _this_update_ and _next_update_ indicate the time at which ths status is
  * verified to be correct and the time at or before which newer information
- * will be available, respectively. +next_update+ is optional.
+ * will be available, respectively. _next_update_ is optional.
  *
- * +extensions+ is an Array of OpenSSL::X509::Extension to be included in the
+ * _extensions_ is an Array of OpenSSL::X509::Extension to be included in the
  * SingleResponse. This is also optional.
  *
- * Note that the times, +revocation_time+, +this_update+ and +next_update+
+ * Note that the times, _revocation_time_, _this_update_ and _next_update_
  * can be specified in either of Integer or Time object. If they are Integer, it
  * is treated as the relative seconds from the current time.
  */
@@ -813,7 +828,7 @@ ossl_ocspbres_add_status(VALUE self, VALUE cid, VALUE status,
     VALUE tmp;
 
     GetOCSPBasicRes(self, bs);
-    SafeGetOCSPCertId(cid, id);
+    GetOCSPCertId(cid, id);
     st = NUM2INT(status);
     if (!NIL_P(ext)) { /* All ext's members must be X509::Extension */
 	ext = rb_check_array_type(ext);
@@ -847,13 +862,11 @@ ossl_ocspbres_add_status(VALUE self, VALUE cid, VALUE status,
 	X509_EXTENSION *x509ext;
 
 	for(i = 0; i < RARRAY_LEN(ext); i++){
-	    x509ext = DupX509ExtPtr(RARRAY_AREF(ext, i));
+	    x509ext = GetX509ExtPtr(RARRAY_AREF(ext, i));
 	    if(!OCSP_SINGLERESP_add_ext(single, x509ext, -1)){
-		X509_EXTENSION_free(x509ext);
 		error = 1;
 		goto err;
 	    }
-	    X509_EXTENSION_free(x509ext);
 	}
     }
 
@@ -874,7 +887,7 @@ ossl_ocspbres_add_status(VALUE self, VALUE cid, VALUE status,
  * Returns an Array of statuses for this response.  Each status contains a
  * CertificateId, the status (0 for good, 1 for revoked, 2 for unknown), the
  * reason for the status, the revocation time, the time of this update, the time
- * for the next update and a list of OpenSSL::X509::Extensions.
+ * for the next update and a list of OpenSSL::X509::Extension.
  *
  * This should be superseded by BasicResponse#responses and #find_response that
  * return SingleResponse.
@@ -902,7 +915,7 @@ ossl_ocspbres_get_status(VALUE self)
 	status = OCSP_single_get0_status(single, &reason, &revtime,
 					 &thisupd, &nextupd);
 	if(status < 0) continue;
-	if(!(cid = OCSP_CERTID_dup(OCSP_SINGLERESP_get0_id(single))))
+	if(!(cid = OCSP_CERTID_dup((OCSP_CERTID *)OCSP_SINGLERESP_get0_id(single)))) /* FIXME */
 	    ossl_raise(eOCSPError, NULL);
 	ary = rb_ary_new();
 	rb_ary_push(ary, ossl_ocspcertid_new(cid));
@@ -963,7 +976,7 @@ ossl_ocspbres_get_responses(VALUE self)
  * call-seq:
  *   basic_response.find_response(certificate_id) -> SingleResponse | nil
  *
- * Returns a SingleResponse whose CertId matches with +certificate_id+, or nil
+ * Returns a SingleResponse whose CertId matches with _certificate_id_, or +nil+
  * if this BasicResponse does not contain it.
  */
 static VALUE
@@ -974,7 +987,7 @@ ossl_ocspbres_find_response(VALUE self, VALUE target)
     OCSP_CERTID *id;
     int n;
 
-    SafeGetOCSPCertId(target, id);
+    GetOCSPCertId(target, id);
     GetOCSPBasicRes(self, bs);
 
     if ((n = OCSP_resp_find(bs, id, -1)) == -1)
@@ -992,10 +1005,10 @@ ossl_ocspbres_find_response(VALUE self, VALUE target)
  * call-seq:
  *   basic_response.sign(cert, key, certs = nil, flags = 0, digest = nil) -> self
  *
- * Signs this OCSP response using the +cert+, +key+ and optional +digest+. This
+ * Signs this OCSP response using the _cert_, _key_ and optional _digest_. This
  * behaves in the similar way as OpenSSL::OCSP::Request#sign.
  *
- * +flags+ can include:
+ * _flags_ can include:
  * OpenSSL::OCSP::NOCERTS::    don't include certificates
  * OpenSSL::OCSP::NOTIME::     don't set producedAt
  * OpenSSL::OCSP::RESPID_KEY:: use signer's public key hash as responderID
@@ -1022,7 +1035,7 @@ ossl_ocspbres_sign(int argc, VALUE *argv, VALUE self)
     if (NIL_P(digest))
 	md = EVP_sha1();
     else
-	md = GetDigestPtr(digest);
+	md = ossl_evp_get_digestbyname(digest);
     if (NIL_P(certs))
 	flg |= OCSP_NOCERTS;
     else
@@ -1039,8 +1052,8 @@ ossl_ocspbres_sign(int argc, VALUE *argv, VALUE self)
  * call-seq:
  *   basic_response.verify(certificates, store, flags = 0) -> true or false
  *
- * Verifies the signature of the response using the given +certificates+ and
- * +store+. This works in the similar way as OpenSSL::OCSP::Request#verify.
+ * Verifies the signature of the response using the given _certificates_ and
+ * _store_. This works in the similar way as OpenSSL::OCSP::Request#verify.
  */
 static VALUE
 ossl_ocspbres_verify(int argc, VALUE *argv, VALUE self)
@@ -1056,9 +1069,57 @@ ossl_ocspbres_verify(int argc, VALUE *argv, VALUE self)
     x509st = GetX509StorePtr(store);
     flg = NIL_P(flags) ? 0 : NUM2INT(flags);
     x509s = ossl_x509_ary2sk(certs);
+#if (OPENSSL_VERSION_NUMBER < 0x1000202fL) || defined(LIBRESSL_VERSION_NUMBER)
+    /*
+     * OpenSSL had a bug that it doesn't use the certificates in x509s for
+     * verifying the chain. This can be a problem when the response is signed by
+     * a certificate issued by an intermediate CA.
+     *
+     *       root_ca
+     *         |
+     *   intermediate_ca
+     *         |-------------|
+     *     end_entity    ocsp_signer
+     *
+     * When the certificate hierarchy is like this, and the response contains
+     * only ocsp_signer certificate, the following code wrongly fails.
+     *
+     *   store = OpenSSL::X509::Store.new; store.add_cert(root_ca)
+     *   basic_response.verify([intermediate_ca], store)
+     *
+     * So add the certificates in x509s to the embedded certificates list first.
+     *
+     * This is fixed in OpenSSL 0.9.8zg, 1.0.0s, 1.0.1n, 1.0.2b. But it still
+     * exists in LibreSSL 2.1.10, 2.2.9, 2.3.6, 2.4.1.
+     */
+    if (!(flg & (OCSP_NOCHAIN | OCSP_NOVERIFY)) &&
+	sk_X509_num(x509s) && sk_X509_num(bs->certs)) {
+	int i;
+
+	bs = ASN1_item_dup(ASN1_ITEM_rptr(OCSP_BASICRESP), bs);
+	if (!bs) {
+	    sk_X509_pop_free(x509s, X509_free);
+	    ossl_raise(eOCSPError, "ASN1_item_dup");
+	}
+
+	for (i = 0; i < sk_X509_num(x509s); i++) {
+	    if (!OCSP_basic_add1_cert(bs, sk_X509_value(x509s, i))) {
+		sk_X509_pop_free(x509s, X509_free);
+		OCSP_BASICRESP_free(bs);
+		ossl_raise(eOCSPError, "OCSP_basic_add1_cert");
+	    }
+	}
+	result = OCSP_basic_verify(bs, x509s, x509st, flg);
+	OCSP_BASICRESP_free(bs);
+    }
+    else {
+	result = OCSP_basic_verify(bs, x509s, x509st, flg);
+    }
+#else
     result = OCSP_basic_verify(bs, x509s, x509st, flg);
+#endif
     sk_X509_pop_free(x509s, X509_free);
-    if (!result)
+    if (result <= 0)
 	ossl_clear_error();
 
     return result > 0 ? Qtrue : Qfalse;
@@ -1122,12 +1183,12 @@ ossl_ocspsres_alloc(VALUE klass)
  * call-seq:
  *   OpenSSL::OCSP::SingleResponse.new(der_string) -> SingleResponse
  *
- * Creates a new SingleResponse from +der_string+.
+ * Creates a new SingleResponse from _der_string_.
  */
 static VALUE
 ossl_ocspsres_initialize(VALUE self, VALUE arg)
 {
-    OCSP_SINGLERESP *res;
+    OCSP_SINGLERESP *res, *res_new;
     const unsigned char *p;
 
     arg = ossl_to_der_if_possible(arg);
@@ -1135,8 +1196,11 @@ ossl_ocspsres_initialize(VALUE self, VALUE arg)
     GetOCSPSingleRes(self, res);
 
     p = (unsigned char*)RSTRING_PTR(arg);
-    if (!d2i_OCSP_SINGLERESP(&res, &p, RSTRING_LEN(arg)))
+    res_new = d2i_OCSP_SINGLERESP(NULL, &p, RSTRING_LEN(arg));
+    if (!res_new)
 	ossl_raise(eOCSPError, "d2i_OCSP_SINGLERESP");
+    SetOCSPSingleRes(self, res_new);
+    OCSP_SINGLERESP_free(res);
 
     return self;
 }
@@ -1148,7 +1212,7 @@ ossl_ocspsres_initialize_copy(VALUE self, VALUE other)
 
     rb_check_frozen(self);
     GetOCSPSingleRes(self, sres_old);
-    SafeGetOCSPSingleRes(other, sres);
+    GetOCSPSingleRes(other, sres);
 
     sres_new = ASN1_item_dup(ASN1_ITEM_rptr(OCSP_SINGLERESP), sres);
     if (!sres_new)
@@ -1170,10 +1234,10 @@ ossl_ocspsres_initialize_copy(VALUE self, VALUE other)
  *
  * It is possible that the OCSP request takes a few seconds or the time is not
  * accurate. To avoid rejecting a valid response, this method allows the times
- * to be within +nsec+ of the current time.
+ * to be within _nsec_ seconds of the current time.
  *
  * Some responders don't set the nextUpdate field. This may cause a very old
- * response to be considered valid. The +maxsec+ parameter can be used to limit
+ * response to be considered valid. The _maxsec_ parameter can be used to limit
  * the age of responses.
  */
 static VALUE
@@ -1216,7 +1280,7 @@ ossl_ocspsres_get_certid(VALUE self)
     OCSP_CERTID *id;
 
     GetOCSPSingleRes(self, sres);
-    id = OCSP_CERTID_dup(OCSP_SINGLERESP_get0_id(sres));
+    id = OCSP_CERTID_dup((OCSP_CERTID *)OCSP_SINGLERESP_get0_id(sres)); /* FIXME */
 
     return ossl_ocspcertid_new(id);
 }
@@ -1264,8 +1328,10 @@ ossl_ocspsres_get_this_update(VALUE self)
     status = OCSP_single_get0_status(sres, NULL, NULL, &time, NULL);
     if (status < 0)
 	ossl_raise(eOCSPError, "OCSP_single_get0_status");
+    if (!time)
+	return Qnil;
 
-    return asn1time_to_time(time); /* will handle NULL */
+    return asn1time_to_time(time);
 }
 
 /*
@@ -1283,6 +1349,8 @@ ossl_ocspsres_get_next_update(VALUE self)
     status = OCSP_single_get0_status(sres, NULL, NULL, NULL, &time);
     if (status < 0)
 	ossl_raise(eOCSPError, "OCSP_single_get0_status");
+    if (!time)
+	return Qnil;
 
     return asn1time_to_time(time);
 }
@@ -1304,6 +1372,8 @@ ossl_ocspsres_get_revocation_time(VALUE self)
 	ossl_raise(eOCSPError, "OCSP_single_get0_status");
     if (status != V_OCSP_CERTSTATUS_REVOKED)
 	ossl_raise(eOCSPError, "certificate is not revoked");
+    if (!time)
+	return Qnil;
 
     return asn1time_to_time(time);
 }
@@ -1403,7 +1473,7 @@ ossl_ocspcid_initialize_copy(VALUE self, VALUE other)
 
     rb_check_frozen(self);
     GetOCSPCertId(self, cid_old);
-    SafeGetOCSPCertId(other, cid);
+    GetOCSPCertId(other, cid);
 
     cid_new = OCSP_CERTID_dup(cid);
     if (!cid_new)
@@ -1419,22 +1489,21 @@ ossl_ocspcid_initialize_copy(VALUE self, VALUE other)
  * call-seq:
  *   OpenSSL::OCSP::CertificateId.new(subject, issuer, digest = nil) -> certificate_id
  *   OpenSSL::OCSP::CertificateId.new(der_string)                    -> certificate_id
+ *   OpenSSL::OCSP::CertificateId.new(obj)                           -> certificate_id
  *
- * Creates a new OpenSSL::OCSP::CertificateId for the given +subject+ and
- * +issuer+ X509 certificates.  The +digest+ is used to compute the
- * certificate ID and must be an OpenSSL::Digest instance.
+ * Creates a new OpenSSL::OCSP::CertificateId for the given _subject_ and
+ * _issuer_ X509 certificates.  The _digest_ is a digest algorithm that is used
+ * to compute the hash values. This defaults to SHA-1.
  *
  * If only one argument is given, decodes it as DER representation of a
- * certificate ID.
+ * certificate ID or generates certificate ID from the object that responds to
+ * the to_der method.
  */
-
 static VALUE
 ossl_ocspcid_initialize(int argc, VALUE *argv, VALUE self)
 {
     OCSP_CERTID *id, *newid;
-    X509 *x509s, *x509i;
     VALUE subject, issuer, digest;
-    const EVP_MD *md;
 
     GetOCSPCertId(self, id);
     if (rb_scan_args(argc, argv, "12", &subject, &issuer, &digest) == 1) {
@@ -1444,25 +1513,25 @@ ossl_ocspcid_initialize(int argc, VALUE *argv, VALUE self)
 	arg = ossl_to_der_if_possible(subject);
 	StringValue(arg);
 	p = (unsigned char *)RSTRING_PTR(arg);
-	if (!d2i_OCSP_CERTID(&id, &p, RSTRING_LEN(arg)))
+	newid = d2i_OCSP_CERTID(NULL, &p, RSTRING_LEN(arg));
+	if (!newid)
 	    ossl_raise(eOCSPError, "d2i_OCSP_CERTID");
-
-	return self;
     }
+    else {
+	X509 *x509s, *x509i;
+	const EVP_MD *md;
 
-    x509s = GetX509CertPtr(subject); /* NO NEED TO DUP */
-    x509i = GetX509CertPtr(issuer); /* NO NEED TO DUP */
+	x509s = GetX509CertPtr(subject); /* NO NEED TO DUP */
+	x509i = GetX509CertPtr(issuer); /* NO NEED TO DUP */
+	md = !NIL_P(digest) ? ossl_evp_get_digestbyname(digest) : NULL;
 
-    if (!NIL_P(digest)) {
-	md = GetDigestPtr(digest);
 	newid = OCSP_cert_to_id(md, x509s, x509i);
-    } else {
-	newid = OCSP_cert_to_id(NULL, x509s, x509i);
+	if (!newid)
+	    ossl_raise(eOCSPError, "OCSP_cert_to_id");
     }
-    if(!newid)
-	ossl_raise(eOCSPError, NULL);
-    OCSP_CERTID_free(id);
+
     SetOCSPCertId(self, newid);
+    OCSP_CERTID_free(id);
 
     return self;
 }
@@ -1471,7 +1540,7 @@ ossl_ocspcid_initialize(int argc, VALUE *argv, VALUE self)
  * call-seq:
  *   certificate_id.cmp(other) -> true or false
  *
- * Compares this certificate id with +other+ and returns true if they are the
+ * Compares this certificate id with _other_ and returns +true+ if they are the
  * same.
  */
 static VALUE
@@ -1481,7 +1550,7 @@ ossl_ocspcid_cmp(VALUE self, VALUE other)
     int result;
 
     GetOCSPCertId(self, id);
-    SafeGetOCSPCertId(other, id2);
+    GetOCSPCertId(other, id2);
     result = OCSP_id_cmp(id, id2);
 
     return (result == 0) ? Qtrue : Qfalse;
@@ -1491,7 +1560,7 @@ ossl_ocspcid_cmp(VALUE self, VALUE other)
  * call-seq:
  *   certificate_id.cmp_issuer(other) -> true or false
  *
- * Compares this certificate id's issuer with +other+ and returns true if
+ * Compares this certificate id's issuer with _other_ and returns +true+ if
  * they are the same.
  */
 
@@ -1502,7 +1571,7 @@ ossl_ocspcid_cmp_issuer(VALUE self, VALUE other)
     int result;
 
     GetOCSPCertId(self, id);
-    SafeGetOCSPCertId(other, id2);
+    GetOCSPCertId(other, id2);
     result = OCSP_id_issuer_cmp(id, id2);
 
     return (result == 0) ? Qtrue : Qfalse;
@@ -1539,15 +1608,15 @@ ossl_ocspcid_get_issuer_name_hash(VALUE self)
 {
     OCSP_CERTID *id;
     ASN1_OCTET_STRING *name_hash;
-    char *hexbuf;
+    VALUE ret;
 
     GetOCSPCertId(self, id);
     OCSP_id_get0_info(&name_hash, NULL, NULL, NULL, id);
 
-    if (string2hex(name_hash->data, name_hash->length, &hexbuf, NULL) < 0)
-	ossl_raise(eOCSPError, "string2hex");
+    ret = rb_str_new(NULL, name_hash->length * 2);
+    ossl_bin2hex(name_hash->data, RSTRING_PTR(ret), name_hash->length);
 
-    return ossl_buf2str(hexbuf, name_hash->length * 2);
+    return ret;
 }
 
 /*
@@ -1562,15 +1631,15 @@ ossl_ocspcid_get_issuer_key_hash(VALUE self)
 {
     OCSP_CERTID *id;
     ASN1_OCTET_STRING *key_hash;
-    char *hexbuf;
+    VALUE ret;
 
     GetOCSPCertId(self, id);
     OCSP_id_get0_info(NULL, NULL, &key_hash, NULL, id);
 
-    if (string2hex(key_hash->data, key_hash->length, &hexbuf, NULL) < 0)
-	ossl_raise(eOCSPError, "string2hex");
+    ret = rb_str_new(NULL, key_hash->length * 2);
+    ossl_bin2hex(key_hash->data, RSTRING_PTR(ret), key_hash->length);
 
-    return ossl_buf2str(hexbuf, key_hash->length * 2);
+    return ret;
 }
 
 /*
@@ -1629,6 +1698,11 @@ ossl_ocspcid_to_der(VALUE self)
 void
 Init_ossl_ocsp(void)
 {
+#if 0
+    mOSSL = rb_define_module("OpenSSL");
+    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
+#endif
+
     /*
      * OpenSSL::OCSP implements Online Certificate Status Protocol requests
      * and responses.
@@ -1645,7 +1719,7 @@ Init_ossl_ocsp(void)
      * subject certificate so the CA knows which certificate we are asking
      * about:
      *
-     *   digest = OpenSSL::Digest::SHA1.new
+     *   digest = OpenSSL::Digest.new('SHA1')
      *   certificate_id =
      *     OpenSSL::OCSP::CertificateId.new subject, issuer, digest
      *
@@ -1662,18 +1736,11 @@ Init_ossl_ocsp(void)
      * To submit the request to the CA for verification we need to extract the
      * OCSP URI from the subject certificate:
      *
-     *   authority_info_access = subject.extensions.find do |extension|
-     *     extension.oid == 'authorityInfoAccess'
-     *   end
-     *
-     *   descriptions = authority_info_access.value.split "\n"
-     *   ocsp = descriptions.find do |description|
-     *     description.start_with? 'OCSP'
-     *   end
+     *   ocsp_uris = subject.ocsp_uris
      *
      *   require 'uri'
      *
-     *   ocsp_uri = URI ocsp[/URI:(.*)/, 1]
+     *   ocsp_uri = URI ocsp_uris[0]
      *
      * To submit the request we'll POST the request to the OCSP URI (per RFC
      * 2560).  Note that we only handle HTTP requests and don't handle any
@@ -1756,12 +1823,13 @@ Init_ossl_ocsp(void)
 
     cOCSPReq = rb_define_class_under(mOCSP, "Request", rb_cObject);
     rb_define_alloc_func(cOCSPReq, ossl_ocspreq_alloc);
-    rb_define_copy_func(cOCSPReq, ossl_ocspreq_initialize_copy);
+    rb_define_method(cOCSPReq, "initialize_copy", ossl_ocspreq_initialize_copy, 1);
     rb_define_method(cOCSPReq, "initialize", ossl_ocspreq_initialize, -1);
     rb_define_method(cOCSPReq, "add_nonce", ossl_ocspreq_add_nonce, -1);
     rb_define_method(cOCSPReq, "check_nonce", ossl_ocspreq_check_nonce, 1);
     rb_define_method(cOCSPReq, "add_certid", ossl_ocspreq_add_certid, 1);
     rb_define_method(cOCSPReq, "certid", ossl_ocspreq_get_certid, 0);
+    rb_define_method(cOCSPReq, "signed?", ossl_ocspreq_signed_p, 0);
     rb_define_method(cOCSPReq, "sign", ossl_ocspreq_sign, -1);
     rb_define_method(cOCSPReq, "verify", ossl_ocspreq_verify, -1);
     rb_define_method(cOCSPReq, "to_der", ossl_ocspreq_to_der, 0);
@@ -1774,7 +1842,7 @@ Init_ossl_ocsp(void)
     cOCSPRes = rb_define_class_under(mOCSP, "Response", rb_cObject);
     rb_define_singleton_method(cOCSPRes, "create", ossl_ocspres_s_create, 2);
     rb_define_alloc_func(cOCSPRes, ossl_ocspres_alloc);
-    rb_define_copy_func(cOCSPRes, ossl_ocspres_initialize_copy);
+    rb_define_method(cOCSPRes, "initialize_copy", ossl_ocspres_initialize_copy, 1);
     rb_define_method(cOCSPRes, "initialize", ossl_ocspres_initialize, -1);
     rb_define_method(cOCSPRes, "status", ossl_ocspres_status, 0);
     rb_define_method(cOCSPRes, "status_string", ossl_ocspres_status_string, 0);
@@ -1789,7 +1857,7 @@ Init_ossl_ocsp(void)
 
     cOCSPBasicRes = rb_define_class_under(mOCSP, "BasicResponse", rb_cObject);
     rb_define_alloc_func(cOCSPBasicRes, ossl_ocspbres_alloc);
-    rb_define_copy_func(cOCSPBasicRes, ossl_ocspbres_initialize_copy);
+    rb_define_method(cOCSPBasicRes, "initialize_copy", ossl_ocspbres_initialize_copy, 1);
     rb_define_method(cOCSPBasicRes, "initialize", ossl_ocspbres_initialize, -1);
     rb_define_method(cOCSPBasicRes, "copy_nonce", ossl_ocspbres_copy_nonce, 1);
     rb_define_method(cOCSPBasicRes, "add_nonce", ossl_ocspbres_add_nonce, -1);
@@ -1808,7 +1876,7 @@ Init_ossl_ocsp(void)
      */
     cOCSPSingleRes = rb_define_class_under(mOCSP, "SingleResponse", rb_cObject);
     rb_define_alloc_func(cOCSPSingleRes, ossl_ocspsres_alloc);
-    rb_define_copy_func(cOCSPSingleRes, ossl_ocspsres_initialize_copy);
+    rb_define_method(cOCSPSingleRes, "initialize_copy", ossl_ocspsres_initialize_copy, 1);
     rb_define_method(cOCSPSingleRes, "initialize", ossl_ocspsres_initialize, 1);
     rb_define_method(cOCSPSingleRes, "check_validity", ossl_ocspsres_check_validity, -1);
     rb_define_method(cOCSPSingleRes, "certid", ossl_ocspsres_get_certid, 0);
@@ -1827,7 +1895,7 @@ Init_ossl_ocsp(void)
 
     cOCSPCertId = rb_define_class_under(mOCSP, "CertificateId", rb_cObject);
     rb_define_alloc_func(cOCSPCertId, ossl_ocspcid_alloc);
-    rb_define_copy_func(cOCSPCertId, ossl_ocspcid_initialize_copy);
+    rb_define_method(cOCSPCertId, "initialize_copy", ossl_ocspcid_initialize_copy, 1);
     rb_define_method(cOCSPCertId, "initialize", ossl_ocspcid_initialize, -1);
     rb_define_method(cOCSPCertId, "cmp", ossl_ocspcid_cmp, 1);
     rb_define_method(cOCSPCertId, "cmp_issuer", ossl_ocspcid_cmp_issuer, 1);
diff --git a/ext/openssl/ossl_ocsp.h b/ext/openssl/ossl_ocsp.h
index 21e2c99a2e..6d2aac8657 100644
--- a/ext/openssl/ossl_ocsp.h
+++ b/ext/openssl/ossl_ocsp.h
@@ -13,9 +13,9 @@
 
 #if !defined(OPENSSL_NO_OCSP)
 extern VALUE mOCSP;
-extern VALUE cOPCSReq;
-extern VALUE cOPCSRes;
-extern VALUE cOPCSBasicRes;
+extern VALUE cOCSPReq;
+extern VALUE cOCSPRes;
+extern VALUE cOCSPBasicRes;
 #endif
 
 void Init_ossl_ocsp(void);
diff --git a/ext/openssl/ossl_pkcs12.c b/ext/openssl/ossl_pkcs12.c
index 5f849723a6..4566334481 100644
--- a/ext/openssl/ossl_pkcs12.c
+++ b/ext/openssl/ossl_pkcs12.c
@@ -17,11 +17,6 @@
     if(!(p12)) ossl_raise(rb_eRuntimeError, "PKCS12 wasn't initialized."); \
 } while (0)
 
-#define SafeGetPKCS12(obj, p12) do { \
-    OSSL_Check_Kind((obj), cPKCS12); \
-    GetPKCS12((obj), (p12)); \
-} while (0)
-
 #define ossl_pkcs12_set_key(o,v)      rb_iv_set((o), "@key", (v))
 #define ossl_pkcs12_set_cert(o,v)     rb_iv_set((o), "@certificate", (v))
 #define ossl_pkcs12_set_ca_certs(o,v) rb_iv_set((o), "@ca_certs", (v))
@@ -65,25 +60,44 @@ ossl_pkcs12_s_allocate(VALUE klass)
     return obj;
 }
 
+static VALUE
+ossl_pkcs12_initialize_copy(VALUE self, VALUE other)
+{
+    PKCS12 *p12, *p12_old, *p12_new;
+
+    rb_check_frozen(self);
+    GetPKCS12(self, p12_old);
+    GetPKCS12(other, p12);
+
+    p12_new = ASN1_dup((i2d_of_void *)i2d_PKCS12, (d2i_of_void *)d2i_PKCS12, (char *)p12);
+    if (!p12_new)
+	ossl_raise(ePKCS12Error, "ASN1_dup");
+
+    SetPKCS12(self, p12_new);
+    PKCS12_free(p12_old);
+
+    return self;
+}
+
 /*
  * call-seq:
  *    PKCS12.create(pass, name, key, cert [, ca, [, key_pbe [, cert_pbe [, key_iter [, mac_iter [, keytype]]]]]])
  *
  * === Parameters
- * * +pass+ - string
- * * +name+ - A string describing the key.
- * * +key+ - Any PKey.
- * * +cert+ - A X509::Certificate.
- * * * The public_key portion of the certificate must contain a valid public key.
- * * * The not_before and not_after fields must be filled in.
- * * +ca+ - An optional array of X509::Certificate's.
- * * +key_pbe+ - string
- * * +cert_pbe+ - string
- * * +key_iter+ - integer
- * * +mac_iter+ - integer
- * * +keytype+ - An integer representing an MSIE specific extension.
+ * * _pass_ - string
+ * * _name_ - A string describing the key.
+ * * _key_ - Any PKey.
+ * * _cert_ - A X509::Certificate.
+ *   * The public_key portion of the certificate must contain a valid public key.
+ *   * The not_before and not_after fields must be filled in.
+ * * _ca_ - An optional array of X509::Certificate's.
+ * * _key_pbe_ - string
+ * * _cert_pbe_ - string
+ * * _key_iter_ - integer
+ * * _mac_iter_ - integer
+ * * _keytype_ - An integer representing an MSIE specific extension.
  *
- * Any optional arguments may be supplied as nil to preserve the OpenSSL defaults.
+ * Any optional arguments may be supplied as +nil+ to preserve the OpenSSL defaults.
  *
  * See the OpenSSL documentation for PKCS12_create().
  */
@@ -104,7 +118,6 @@ ossl_pkcs12_s_create(int argc, VALUE *argv, VALUE self)
     friendlyname = NIL_P(name) ? NULL : StringValueCStr(name);
     key = GetPKeyPtr(pkey);
     x509 = GetX509CertPtr(cert);
-    x509s = NIL_P(ca) ? NULL : ossl_x509_ary2sk(ca);
 /* TODO: make a VALUE to nid function */
     if (!NIL_P(key_nid)) {
         if ((nkey = OBJ_txt2nid(StringValueCStr(key_nid))) == NID_undef)
@@ -122,6 +135,7 @@ ossl_pkcs12_s_create(int argc, VALUE *argv, VALUE self)
         ktype = NUM2INT(keytype);
 
     obj = NewPKCS12(cPKCS12);
+    x509s = NIL_P(ca) ? NULL : ossl_x509_ary2sk(ca);
     p12 = PKCS12_create(passphrase, friendlyname, key, x509, x509s,
                         nkey, ncert, kiter, miter, ktype);
     sk_X509_pop_free(x509s, X509_free);
@@ -142,8 +156,8 @@ ossl_pkcs12_s_create(int argc, VALUE *argv, VALUE self)
  *    PKCS12.new(str, pass) -> pkcs12
  *
  * === Parameters
- * * +str+ - Must be a DER encoded PKCS12 string.
- * * +pass+ - string
+ * * _str_ - Must be a DER encoded PKCS12 string.
+ * * _pass_ - string
  */
 static VALUE
 ossl_pkcs12_initialize(int argc, VALUE *argv, VALUE self)
@@ -159,7 +173,7 @@ ossl_pkcs12_initialize(int argc, VALUE *argv, VALUE self)
 
     if(rb_scan_args(argc, argv, "02", &arg, &pass) == 0) return self;
     passphrase = NIL_P(pass) ? NULL : StringValueCStr(pass);
-    in = ossl_obj2bio(arg);
+    in = ossl_obj2bio(&arg);
     d2i_PKCS12_bio(in, &pkcs);
     DATA_PTR(self) = pkcs;
     BIO_free(in);
@@ -171,15 +185,17 @@ ossl_pkcs12_initialize(int argc, VALUE *argv, VALUE self)
     if(!PKCS12_parse(pkcs, passphrase, &key, &x509, &x509s))
 	ossl_raise(ePKCS12Error, "PKCS12_parse");
     ERR_pop_to_mark();
-    pkey = rb_protect((VALUE(*)_((VALUE)))ossl_pkey_new, (VALUE)key,
-		      &st); /* NO DUP */
-    if(st) goto err;
-    cert = rb_protect((VALUE(*)_((VALUE)))ossl_x509_new, (VALUE)x509, &st);
-    if(st) goto err;
-    if(x509s){
-	ca =
-	    rb_protect((VALUE(*)_((VALUE)))ossl_x509_sk2ary, (VALUE)x509s, &st);
-	if(st) goto err;
+    if (key) {
+	pkey = rb_protect((VALUE (*)(VALUE))ossl_pkey_new, (VALUE)key, &st);
+	if (st) goto err;
+    }
+    if (x509) {
+	cert = rb_protect((VALUE (*)(VALUE))ossl_x509_new, (VALUE)x509, &st);
+	if (st) goto err;
+    }
+    if (x509s) {
+	ca = rb_protect((VALUE (*)(VALUE))ossl_x509_sk2ary, (VALUE)x509s, &st);
+	if (st) goto err;
     }
 
   err:
@@ -216,6 +232,12 @@ ossl_pkcs12_to_der(VALUE self)
 void
 Init_ossl_pkcs12(void)
 {
+#undef rb_intern
+#if 0
+    mOSSL = rb_define_module("OpenSSL");
+    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
+#endif
+
     /*
      * Defines a file format commonly used to store private keys with
      * accompanying public key certificates, protected with a password-based
@@ -226,6 +248,7 @@ Init_ossl_pkcs12(void)
     rb_define_singleton_method(cPKCS12, "create", ossl_pkcs12_s_create, -1);
 
     rb_define_alloc_func(cPKCS12, ossl_pkcs12_s_allocate);
+    rb_define_method(cPKCS12, "initialize_copy", ossl_pkcs12_initialize_copy, 1);
     rb_attr(cPKCS12, rb_intern("key"), 1, 0, Qfalse);
     rb_attr(cPKCS12, rb_intern("certificate"), 1, 0, Qfalse);
     rb_attr(cPKCS12, rb_intern("ca_certs"), 1, 0, Qfalse);
diff --git a/ext/openssl/ossl_pkcs5.c b/ext/openssl/ossl_pkcs5.c
deleted file mode 100644
index 56ed65fb9d..0000000000
--- a/ext/openssl/ossl_pkcs5.c
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Copyright (C) 2007 Technorama Ltd. <oss-ruby@technorama.net>
- */
-#include "ossl.h"
-
-VALUE mPKCS5;
-VALUE ePKCS5;
-
-#ifdef HAVE_PKCS5_PBKDF2_HMAC
-/*
- * call-seq:
- *    PKCS5.pbkdf2_hmac(pass, salt, iter, keylen, digest) => string
- *
- * === Parameters
- * * +pass+ - string
- * * +salt+ - string - should be at least 8 bytes long.
- * * +iter+ - integer - should be greater than 1000.  20000 is better.
- * * +keylen+ - integer
- * * +digest+ - a string or OpenSSL::Digest object.
- *
- * Available in OpenSSL 0.9.4.
- *
- * Digests other than SHA1 may not be supported by other cryptography libraries.
- */
-static VALUE
-ossl_pkcs5_pbkdf2_hmac(VALUE self, VALUE pass, VALUE salt, VALUE iter, VALUE keylen, VALUE digest)
-{
-    VALUE str;
-    const EVP_MD *md;
-    int len = NUM2INT(keylen);
-
-    StringValue(pass);
-    StringValue(salt);
-    md = GetDigestPtr(digest);
-
-    str = rb_str_new(0, len);
-
-    if (PKCS5_PBKDF2_HMAC(RSTRING_PTR(pass), RSTRING_LENINT(pass),
-			  (unsigned char *)RSTRING_PTR(salt), RSTRING_LENINT(salt),
-			  NUM2INT(iter), md, len,
-			  (unsigned char *)RSTRING_PTR(str)) != 1)
-        ossl_raise(ePKCS5, "PKCS5_PBKDF2_HMAC");
-
-    return str;
-}
-#else
-#define ossl_pkcs5_pbkdf2_hmac rb_f_notimplement
-#endif
-
-
-/*
- * call-seq:
- *    PKCS5.pbkdf2_hmac_sha1(pass, salt, iter, keylen) => string
- *
- * === Parameters
- * * +pass+ - string
- * * +salt+ - string - should be at least 8 bytes long.
- * * +iter+ - integer - should be greater than 1000.  20000 is better.
- * * +keylen+ - integer
- *
- * This method is available in almost any version of OpenSSL.
- *
- * Conforms to rfc2898.
- */
-static VALUE
-ossl_pkcs5_pbkdf2_hmac_sha1(VALUE self, VALUE pass, VALUE salt, VALUE iter, VALUE keylen)
-{
-    VALUE str;
-    int len = NUM2INT(keylen);
-
-    StringValue(pass);
-    StringValue(salt);
-
-    str = rb_str_new(0, len);
-
-    if (PKCS5_PBKDF2_HMAC_SHA1(RSTRING_PTR(pass), RSTRING_LENINT(pass),
-			       (const unsigned char *)RSTRING_PTR(salt), RSTRING_LENINT(salt), NUM2INT(iter),
-			       len, (unsigned char *)RSTRING_PTR(str)) != 1)
-        ossl_raise(ePKCS5, "PKCS5_PBKDF2_HMAC_SHA1");
-
-    return str;
-}
-
-void
-Init_ossl_pkcs5(void)
-{
-    /*
-     * Password-based Encryption
-     *
-     */
-
-    #if 0
-	mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
-    #endif
-
-    /* Document-class: OpenSSL::PKCS5
-     *
-     * Provides password-based encryption functionality based on PKCS#5.
-     * Typically used for securely deriving arbitrary length symmetric keys
-     * to be used with an OpenSSL::Cipher from passwords. Another use case
-     * is for storing passwords: Due to the ability to tweak the effort of
-     * computation by increasing the iteration count, computation can be
-     * slowed down artificially in order to render possible attacks infeasible.
-     *
-     * PKCS5 offers support for PBKDF2 with an OpenSSL::Digest::SHA1-based
-     * HMAC, or an arbitrary Digest if the underlying version of OpenSSL
-     * already supports it (>= 0.9.4).
-     *
-     * === Parameters
-     * ==== Password
-     * Typically an arbitrary String that represents the password to be used
-     * for deriving a key.
-     * ==== Salt
-     * Prevents attacks based on dictionaries of common passwords. It is a
-     * public value that can be safely stored along with the password (e.g.
-     * if PBKDF2 is used for password storage). For maximum security, a fresh,
-     * random salt should be generated for each stored password. According
-     * to PKCS#5, a salt should be at least 8 bytes long.
-     * ==== Iteration Count
-     * Allows to tweak the length that the actual computation will take. The
-     * larger the iteration count, the longer it will take.
-     * ==== Key Length
-     * Specifies the length in bytes of the output that will be generated.
-     * Typically, the key length should be larger than or equal to the output
-     * length of the underlying digest function, otherwise an attacker could
-     * simply try to brute-force the key. According to PKCS#5, security is
-     * limited by the output length of the underlying digest function, i.e.
-     * security is not improved if a key length strictly larger than the
-     * digest output length is chosen. Therefore, when using PKCS5 for
-     * password storage, it suffices to store values equal to the digest
-     * output length, nothing is gained by storing larger values.
-     *
-     * == Examples
-     * === Generating a 128 bit key for a Cipher (e.g. AES)
-     *   pass = "secret"
-     *   salt = OpenSSL::Random.random_bytes(16)
-     *   iter = 20000
-     *   key_len = 16
-     *   key = OpenSSL::PKCS5.pbkdf2_hmac_sha1(pass, salt, iter, key_len)
-     *
-     * === Storing Passwords
-     *   pass = "secret"
-     *   salt = OpenSSL::Random.random_bytes(16) #store this with the generated value
-     *   iter = 20000
-     *   digest = OpenSSL::Digest::SHA256.new
-     *   len = digest.digest_length
-     *   #the final value to be stored
-     *   value = OpenSSL::PKCS5.pbkdf2_hmac(pass, salt, iter, len, digest)
-     *
-     * === Important Note on Checking Passwords
-     * When comparing passwords provided by the user with previously stored
-     * values, a common mistake made is comparing the two values using "==".
-     * Typically, "==" short-circuits on evaluation, and is therefore
-     * vulnerable to timing attacks. The proper way is to use a method that
-     * always takes the same amount of time when comparing two values, thus
-     * not leaking any information to potential attackers. To compare two
-     * values, the following could be used:
-     *   def eql_time_cmp(a, b)
-     *     unless a.length == b.length
-     *       return false
-     *     end
-     *     cmp = b.bytes.to_a
-     *     result = 0
-     *     a.bytes.each_with_index {|c,i|
-     *       result |= c ^ cmp[i]
-     *     }
-     *     result == 0
-     *   end
-     * Please note that the premature return in case of differing lengths
-     * typically does not leak valuable information - when using PKCS#5, the
-     * length of the values to be compared is of fixed size.
-     */
-
-    mPKCS5 = rb_define_module_under(mOSSL, "PKCS5");
-    /* Document-class: OpenSSL::PKCS5::PKCS5Error
-     *
-     * Generic Exception class that is raised if an error occurs during a
-     * computation.
-     */
-    ePKCS5 = rb_define_class_under(mPKCS5, "PKCS5Error", eOSSLError);
-
-    rb_define_module_function(mPKCS5, "pbkdf2_hmac", ossl_pkcs5_pbkdf2_hmac, 5);
-    rb_define_module_function(mPKCS5, "pbkdf2_hmac_sha1", ossl_pkcs5_pbkdf2_hmac_sha1, 4);
-}
diff --git a/ext/openssl/ossl_pkcs5.h b/ext/openssl/ossl_pkcs5.h
deleted file mode 100644
index a3b132bc50..0000000000
--- a/ext/openssl/ossl_pkcs5.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#if !defined(_OSSL_PKCS5_H_)
-#define _OSSL_PKCS5_H_
-
-void Init_ossl_pkcs5(void);
-
-#endif /* _OSSL_PKCS5_H_ */
diff --git a/ext/openssl/ossl_pkcs7.c b/ext/openssl/ossl_pkcs7.c
index 5b7c07de2c..ea8e92d1bc 100644
--- a/ext/openssl/ossl_pkcs7.c
+++ b/ext/openssl/ossl_pkcs7.c
@@ -9,25 +9,6 @@
  */
 #include "ossl.h"
 
-#define NewPKCS7(klass) \
-    TypedData_Wrap_Struct((klass), &ossl_pkcs7_type, 0)
-#define SetPKCS7(obj, pkcs7) do { \
-    if (!(pkcs7)) { \
-	ossl_raise(rb_eRuntimeError, "PKCS7 wasn't initialized."); \
-    } \
-    RTYPEDDATA_DATA(obj) = (pkcs7); \
-} while (0)
-#define GetPKCS7(obj, pkcs7) do { \
-    TypedData_Get_Struct((obj), PKCS7, &ossl_pkcs7_type, (pkcs7)); \
-    if (!(pkcs7)) { \
-	ossl_raise(rb_eRuntimeError, "PKCS7 wasn't initialized."); \
-    } \
-} while (0)
-#define SafeGetPKCS7(obj, pkcs7) do { \
-    OSSL_Check_Kind((obj), cPKCS7); \
-    GetPKCS7((obj), (pkcs7)); \
-} while (0)
-
 #define NewPKCS7si(klass) \
     TypedData_Wrap_Struct((klass), &ossl_pkcs7_signer_info_type, 0)
 #define SetPKCS7si(obj, p7si) do { \
@@ -42,10 +23,6 @@
 	ossl_raise(rb_eRuntimeError, "PKCS7si wasn't initialized."); \
     } \
 } while (0)
-#define SafeGetPKCS7si(obj, p7si) do { \
-    OSSL_Check_Kind((obj), cPKCS7Signer); \
-    GetPKCS7si((obj), (p7si)); \
-} while (0)
 
 #define NewPKCS7ri(klass) \
     TypedData_Wrap_Struct((klass), &ossl_pkcs7_recip_info_type, 0)
@@ -61,10 +38,6 @@
 	ossl_raise(rb_eRuntimeError, "PKCS7ri wasn't initialized."); \
     } \
 } while (0)
-#define SafeGetPKCS7ri(obj, p7ri) do { \
-    OSSL_Check_Kind((obj), cPKCS7Recipient); \
-    GetPKCS7ri((obj), (p7ri)); \
-} while (0)
 
 #define numberof(ary) (int)(sizeof(ary)/sizeof((ary)[0]))
 
@@ -87,7 +60,7 @@ ossl_pkcs7_free(void *ptr)
     PKCS7_free(ptr);
 }
 
-static const rb_data_type_t ossl_pkcs7_type = {
+const rb_data_type_t ossl_pkcs7_type = {
     "OpenSSL/PKCS7",
     {
 	0, ossl_pkcs7_free,
@@ -162,7 +135,7 @@ DupPKCS7SignerPtr(VALUE obj)
 {
     PKCS7_SIGNER_INFO *p7si, *pkcs7;
 
-    SafeGetPKCS7si(obj, p7si);
+    GetPKCS7si(obj, p7si);
     if (!(pkcs7 = ossl_PKCS7_SIGNER_INFO_dup(p7si))) {
 	ossl_raise(ePKCS7Error, NULL);
     }
@@ -189,7 +162,7 @@ DupPKCS7RecipientPtr(VALUE obj)
 {
     PKCS7_RECIP_INFO *p7ri, *pkcs7;
 
-    SafeGetPKCS7ri(obj, p7ri);
+    GetPKCS7ri(obj, p7ri);
     if (!(pkcs7 = ossl_PKCS7_RECIP_INFO_dup(p7ri))) {
 	ossl_raise(ePKCS7Error, NULL);
     }
@@ -209,7 +182,7 @@ ossl_pkcs7_s_read_smime(VALUE klass, VALUE arg)
     VALUE ret, data;
 
     ret = NewPKCS7(cPKCS7);
-    in = ossl_obj2bio(arg);
+    in = ossl_obj2bio(&arg);
     out = NULL;
     pkcs7 = SMIME_read_PKCS7(in, &out);
     BIO_free(in);
@@ -238,10 +211,10 @@ ossl_pkcs7_s_write_smime(int argc, VALUE *argv, VALUE klass)
     rb_scan_args(argc, argv, "12", &pkcs7, &data, &flags);
     flg = NIL_P(flags) ? 0 : NUM2INT(flags);
     if(NIL_P(data)) data = ossl_pkcs7_get_data(pkcs7);
-    SafeGetPKCS7(pkcs7, p7);
+    GetPKCS7(pkcs7, p7);
     if(!NIL_P(data) && PKCS7_is_detached(p7))
 	flg |= PKCS7_DETACHED;
-    in = NIL_P(data) ? NULL : ossl_obj2bio(data);
+    in = NIL_P(data) ? NULL : ossl_obj2bio(&data);
     if(!(out = BIO_new(BIO_s_mem()))){
         BIO_free(in);
         ossl_raise(ePKCS7Error, NULL);
@@ -278,7 +251,7 @@ ossl_pkcs7_s_sign(int argc, VALUE *argv, VALUE klass)
     pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
     flg = NIL_P(flags) ? 0 : NUM2INT(flags);
     ret = NewPKCS7(cPKCS7);
-    in = ossl_obj2bio(data);
+    in = ossl_obj2bio(&data);
     if(NIL_P(certs)) x509s = NULL;
     else{
 	x509s = ossl_protect_x509_ary2sk(certs, &status);
@@ -331,10 +304,10 @@ ossl_pkcs7_s_encrypt(int argc, VALUE *argv, VALUE klass)
 #endif
 
     }
-    else ciph = GetCipherPtr(cipher); /* NO NEED TO DUP */
+    else ciph = ossl_evp_get_cipherbyname(cipher);
     flg = NIL_P(flags) ? 0 : NUM2INT(flags);
     ret = NewPKCS7(cPKCS7);
-    in = ossl_obj2bio(data);
+    in = ossl_obj2bio(&data);
     x509s = ossl_protect_x509_ary2sk(certs, &status);
     if(status){
 	BIO_free(in);
@@ -385,7 +358,7 @@ ossl_pkcs7_initialize(int argc, VALUE *argv, VALUE self)
     if(rb_scan_args(argc, argv, "01", &arg) == 0)
 	return self;
     arg = ossl_to_der_if_possible(arg);
-    in = ossl_obj2bio(arg);
+    in = ossl_obj2bio(&arg);
     p7 = PEM_read_bio_PKCS7(in, &pkcs, NULL, NULL);
     if (!p7) {
 	OSSL_BIO_reset(in);
@@ -414,7 +387,7 @@ ossl_pkcs7_copy(VALUE self, VALUE other)
     if (self == other) return self;
 
     GetPKCS7(self, a);
-    SafeGetPKCS7(other, b);
+    GetPKCS7(other, b);
 
     pkcs7 = PKCS7_dup(b);
     if (!pkcs7) {
@@ -537,7 +510,7 @@ ossl_pkcs7_set_cipher(VALUE self, VALUE cipher)
     PKCS7 *pkcs7;
 
     GetPKCS7(self, pkcs7);
-    if (!PKCS7_set_cipher(pkcs7, GetCipherPtr(cipher))) {
+    if (!PKCS7_set_cipher(pkcs7, ossl_evp_get_cipherbyname(cipher))) {
 	ossl_raise(ePKCS7Error, NULL);
     }
 
@@ -772,10 +745,12 @@ ossl_pkcs7_verify(int argc, VALUE *argv, VALUE self)
     VALUE data;
     const char *msg;
 
+    GetPKCS7(self, p7);
     rb_scan_args(argc, argv, "22", &certs, &store, &indata, &flags);
+    x509st = GetX509StorePtr(store);
     flg = NIL_P(flags) ? 0 : NUM2INT(flags);
     if(NIL_P(indata)) indata = ossl_pkcs7_get_data(self);
-    in = NIL_P(indata) ? NULL : ossl_obj2bio(indata);
+    in = NIL_P(indata) ? NULL : ossl_obj2bio(&indata);
     if(NIL_P(certs)) x509s = NULL;
     else{
 	x509s = ossl_protect_x509_ary2sk(certs, &status);
@@ -784,8 +759,6 @@ ossl_pkcs7_verify(int argc, VALUE *argv, VALUE self)
 	    rb_jump_tag(status);
 	}
     }
-    x509st = GetX509StorePtr(store);
-    GetPKCS7(self, p7);
     if(!(out = BIO_new(BIO_s_mem()))){
 	BIO_free(in);
 	sk_X509_pop_free(x509s, X509_free);
@@ -793,13 +766,13 @@ ossl_pkcs7_verify(int argc, VALUE *argv, VALUE self)
     }
     ok = PKCS7_verify(p7, x509s, x509st, in, out, flg);
     BIO_free(in);
-    if (ok < 0) ossl_raise(ePKCS7Error, NULL);
-    msg = ERR_reason_error_string(ERR_get_error());
+    sk_X509_pop_free(x509s, X509_free);
+    if (ok < 0) ossl_raise(ePKCS7Error, "PKCS7_verify");
+    msg = ERR_reason_error_string(ERR_peek_error());
     ossl_pkcs7_set_err_string(self, msg ? rb_str_new2(msg) : Qnil);
     ossl_clear_error();
     data = ossl_membio2str(out);
     ossl_pkcs7_set_data(self, data);
-    sk_X509_pop_free(x509s, X509_free);
 
     return (ok == 1) ? Qtrue : Qfalse;
 }
@@ -815,9 +788,9 @@ ossl_pkcs7_decrypt(int argc, VALUE *argv, VALUE self)
     BIO *out;
     VALUE str;
 
-    rb_scan_args(argc, argv, "21", &pkey, &cert, &flags);
+    rb_scan_args(argc, argv, "12", &pkey, &cert, &flags);
     key = GetPrivPKeyPtr(pkey); /* NO NEED TO DUP */
-    x509 = GetX509CertPtr(cert); /* NO NEED TO DUP */
+    x509 = NIL_P(cert) ? NULL : GetX509CertPtr(cert); /* NO NEED TO DUP */
     flg = NIL_P(flags) ? 0 : NUM2INT(flags);
     GetPKCS7(self, p7);
     if(!(out = BIO_new(BIO_s_mem())))
@@ -839,12 +812,12 @@ ossl_pkcs7_add_data(VALUE self, VALUE data)
     char buf[4096];
     int len;
 
-    in = ossl_obj2bio(data);
     GetPKCS7(self, pkcs7);
     if(PKCS7_type_is_signed(pkcs7)){
 	if(!PKCS7_content_new(pkcs7, NID_pkcs7_data))
 	    ossl_raise(ePKCS7Error, NULL);
     }
+    in = ossl_obj2bio(&data);
     if(!(out = PKCS7_dataInit(pkcs7, NULL))) goto err;
     for(;;){
 	if((len = BIO_read(in, buf, sizeof(buf))) <= 0)
@@ -856,7 +829,7 @@ ossl_pkcs7_add_data(VALUE self, VALUE data)
     ossl_pkcs7_set_data(self, Qnil);
 
  err:
-    BIO_free(out);
+    BIO_free_all(out);
     BIO_free(in);
     if(ERR_peek_error()){
 	ossl_raise(ePKCS7Error, NULL);
@@ -933,7 +906,7 @@ ossl_pkcs7si_initialize(VALUE self, VALUE cert, VALUE key, VALUE digest)
 
     pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
     x509 = GetX509CertPtr(cert); /* NO NEED TO DUP */
-    md = GetDigestPtr(digest);
+    md = ossl_evp_get_digestbyname(digest);
     GetPKCS7si(self, p7si);
     if (!(PKCS7_SIGNER_INFO_set(p7si, x509, pkey, (EVP_MD*)md))) {
 	ossl_raise(ePKCS7Error, NULL);
@@ -1054,6 +1027,12 @@ ossl_pkcs7ri_get_enc_key(VALUE self)
 void
 Init_ossl_pkcs7(void)
 {
+#undef rb_intern
+#if 0
+    mOSSL = rb_define_module("OpenSSL");
+    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
+#endif
+
     cPKCS7 = rb_define_class_under(mOSSL, "PKCS7", rb_cObject);
     ePKCS7Error = rb_define_class_under(cPKCS7, "PKCS7Error", eOSSLError);
     rb_define_singleton_method(cPKCS7, "read_smime", ossl_pkcs7_s_read_smime, 1);
@@ -1063,7 +1042,7 @@ Init_ossl_pkcs7(void)
     rb_attr(cPKCS7, rb_intern("data"), 1, 0, Qfalse);
     rb_attr(cPKCS7, rb_intern("error_string"), 1, 1, Qfalse);
     rb_define_alloc_func(cPKCS7, ossl_pkcs7_alloc);
-    rb_define_copy_func(cPKCS7, ossl_pkcs7_copy);
+    rb_define_method(cPKCS7, "initialize_copy", ossl_pkcs7_copy, 1);
     rb_define_method(cPKCS7, "initialize", ossl_pkcs7_initialize, -1);
     rb_define_method(cPKCS7, "type=", ossl_pkcs7_set_type, 1);
     rb_define_method(cPKCS7, "type", ossl_pkcs7_get_type, 0);
@@ -1094,7 +1073,6 @@ Init_ossl_pkcs7(void)
     rb_define_alloc_func(cPKCS7Signer, ossl_pkcs7si_alloc);
     rb_define_method(cPKCS7Signer, "initialize", ossl_pkcs7si_initialize,3);
     rb_define_method(cPKCS7Signer, "issuer", ossl_pkcs7si_get_issuer, 0);
-    rb_define_alias(cPKCS7Signer, "name", "issuer");
     rb_define_method(cPKCS7Signer, "serial", ossl_pkcs7si_get_serial,0);
     rb_define_method(cPKCS7Signer,"signed_time",ossl_pkcs7si_get_signed_time,0);
 
diff --git a/ext/openssl/ossl_pkcs7.h b/ext/openssl/ossl_pkcs7.h
index 139e00d640..3e1b094670 100644
--- a/ext/openssl/ossl_pkcs7.h
+++ b/ext/openssl/ossl_pkcs7.h
@@ -10,6 +10,22 @@
 #if !defined(_OSSL_PKCS7_H_)
 #define _OSSL_PKCS7_H_
 
+#define NewPKCS7(klass) \
+    TypedData_Wrap_Struct((klass), &ossl_pkcs7_type, 0)
+#define SetPKCS7(obj, pkcs7) do { \
+    if (!(pkcs7)) { \
+        ossl_raise(rb_eRuntimeError, "PKCS7 wasn't initialized."); \
+    } \
+    RTYPEDDATA_DATA(obj) = (pkcs7); \
+} while (0)
+#define GetPKCS7(obj, pkcs7) do { \
+    TypedData_Get_Struct((obj), PKCS7, &ossl_pkcs7_type, (pkcs7)); \
+    if (!(pkcs7)) { \
+        ossl_raise(rb_eRuntimeError, "PKCS7 wasn't initialized."); \
+    } \
+} while (0)
+
+extern const rb_data_type_t ossl_pkcs7_type;
 extern VALUE cPKCS7;
 extern VALUE cPKCS7Signer;
 extern VALUE cPKCS7Recipient;
diff --git a/ext/openssl/ossl_pkey.c b/ext/openssl/ossl_pkey.c
index 4ae8e14e3e..23204087ac 100644
--- a/ext/openssl/ossl_pkey.c
+++ b/ext/openssl/ossl_pkey.c
@@ -15,11 +15,26 @@
 VALUE mPKey;
 VALUE cPKey;
 VALUE ePKeyError;
-ID id_private_q;
+static ID id_private_q;
 
 /*
  * callback for generating keys
  */
+static VALUE
+call_check_ints0(VALUE arg)
+{
+    rb_thread_check_ints();
+    return Qnil;
+}
+
+static void *
+call_check_ints(void *arg)
+{
+    int state;
+    rb_protect(call_check_ints0, Qnil, &state);
+    return (void *)(VALUE)state;
+}
+
 int
 ossl_generate_cb_2(int p, int n, BN_GENCB *cb)
 {
@@ -38,11 +53,18 @@ ossl_generate_cb_2(int p, int n, BN_GENCB *cb)
 	*/
 	rb_protect(rb_yield, ary, &state);
 	if (state) {
-	    arg->stop = 1;
 	    arg->state = state;
+	    return 0;
+	}
+    }
+    if (arg->interrupted) {
+	arg->interrupted = 0;
+	state = (int)(VALUE)rb_thread_call_with_gvl(call_check_ints, NULL);
+	if (state) {
+	    arg->state = state;
+	    return 0;
 	}
     }
-    if (arg->stop) return 0;
     return 1;
 }
 
@@ -50,7 +72,7 @@ void
 ossl_generate_cb_stop(void *ptr)
 {
     struct ossl_generate_cb_arg *arg = (struct ossl_generate_cb_arg *)ptr;
-    arg->stop = 1;
+    arg->interrupted = 1;
 }
 
 static void
@@ -70,13 +92,16 @@ const rb_data_type_t ossl_evp_pkey_type = {
     0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
 };
 
-VALUE
-ossl_pkey_new(EVP_PKEY *pkey)
+static VALUE
+pkey_new0(EVP_PKEY *pkey)
 {
-    if (!pkey) {
-	ossl_raise(ePKeyError, "Cannot make new key from NULL.");
-    }
-    switch (EVP_PKEY_base_id(pkey)) {
+    VALUE obj;
+    int type;
+
+    if (!pkey || (type = EVP_PKEY_base_id(pkey)) == EVP_PKEY_NONE)
+	ossl_raise(rb_eRuntimeError, "pkey is empty");
+
+    switch (type) {
 #if !defined(OPENSSL_NO_RSA)
     case EVP_PKEY_RSA:
 	return ossl_rsa_new(pkey);
@@ -89,50 +114,47 @@ ossl_pkey_new(EVP_PKEY *pkey)
     case EVP_PKEY_DH:
 	return ossl_dh_new(pkey);
 #endif
-#if !defined(OPENSSL_NO_EC) && (OPENSSL_VERSION_NUMBER >= 0x0090802fL)
+#if !defined(OPENSSL_NO_EC)
     case EVP_PKEY_EC:
 	return ossl_ec_new(pkey);
 #endif
     default:
-	ossl_raise(ePKeyError, "unsupported key type");
+	obj = NewPKey(cPKey);
+	SetPKey(obj, pkey);
+	return obj;
     }
-
-    UNREACHABLE;
 }
 
 VALUE
-ossl_pkey_new_from_file(VALUE filename)
+ossl_pkey_new(EVP_PKEY *pkey)
 {
-    FILE *fp;
-    EVP_PKEY *pkey;
-
-    rb_check_safe_obj(filename);
-    if (!(fp = fopen(StringValueCStr(filename), "r"))) {
-	ossl_raise(ePKeyError, "%s", strerror(errno));
-    }
-    rb_fd_fix_cloexec(fileno(fp));
+    VALUE obj;
+    int status;
 
-    pkey = PEM_read_PrivateKey(fp, NULL, ossl_pem_passwd_cb, NULL);
-    fclose(fp);
-    if (!pkey) {
-	ossl_raise(ePKeyError, NULL);
+    obj = rb_protect((VALUE (*)(VALUE))pkey_new0, (VALUE)pkey, &status);
+    if (status) {
+	EVP_PKEY_free(pkey);
+	rb_jump_tag(status);
     }
 
-    return ossl_pkey_new(pkey);
+    return obj;
 }
 
 /*
  *  call-seq:
- *     OpenSSL::PKey.read(string [, pwd ] ) -> PKey
- *     OpenSSL::PKey.read(file [, pwd ]) -> PKey
+ *     OpenSSL::PKey.read(string [, pwd ]) -> PKey
+ *     OpenSSL::PKey.read(io [, pwd ]) -> PKey
+ *
+ * Reads a DER or PEM encoded string from _string_ or _io_ and returns an
+ * instance of the appropriate PKey class.
  *
  * === Parameters
- * * +string+ is a DER- or PEM-encoded string containing an arbitrary private
- * or public key.
- * * +file+ is an instance of +File+ containing a DER- or PEM-encoded
- * arbitrary private or public key.
- * * +pwd+ is an optional password in case +string+ or +file+ is an encrypted
- * PEM resource.
+ * * _string+ is a DER- or PEM-encoded string containing an arbitrary private
+ *   or public key.
+ * * _io_ is an instance of IO containing a DER- or PEM-encoded
+ *   arbitrary private or public key.
+ * * _pwd_ is an optional password in case _string_ or _io_ is an encrypted
+ *   PEM resource.
  */
 static VALUE
 ossl_pkey_new_from_data(int argc, VALUE *argv, VALUE self)
@@ -144,30 +166,77 @@ ossl_pkey_new_from_data(int argc, VALUE *argv, VALUE self)
     rb_scan_args(argc, argv, "11", &data, &pass);
     pass = ossl_pem_passwd_value(pass);
 
-    bio = ossl_obj2bio(data);
-    if (!(pkey = d2i_PrivateKey_bio(bio, NULL))) {
-	OSSL_BIO_reset(bio);
-	if (!(pkey = PEM_read_bio_PrivateKey(bio, NULL, ossl_pem_passwd_cb, (void *)pass))) {
-	    OSSL_BIO_reset(bio);
-	    if (!(pkey = d2i_PUBKEY_bio(bio, NULL))) {
-		OSSL_BIO_reset(bio);
-		pkey = PEM_read_bio_PUBKEY(bio, NULL, ossl_pem_passwd_cb, (void *)pass);
-	    }
-	}
-    }
+    bio = ossl_obj2bio(&data);
+    if ((pkey = d2i_PrivateKey_bio(bio, NULL)))
+	goto ok;
+    OSSL_BIO_reset(bio);
+    if ((pkey = d2i_PKCS8PrivateKey_bio(bio, NULL, ossl_pem_passwd_cb, (void *)pass)))
+	goto ok;
+    OSSL_BIO_reset(bio);
+    if ((pkey = d2i_PUBKEY_bio(bio, NULL)))
+	goto ok;
+    OSSL_BIO_reset(bio);
+    /* PEM_read_bio_PrivateKey() also parses PKCS #8 formats */
+    if ((pkey = PEM_read_bio_PrivateKey(bio, NULL, ossl_pem_passwd_cb, (void *)pass)))
+	goto ok;
+    OSSL_BIO_reset(bio);
+    if ((pkey = PEM_read_bio_PUBKEY(bio, NULL, NULL, NULL)))
+	goto ok;
+
+    BIO_free(bio);
+    ossl_raise(ePKeyError, "Could not parse PKey");
 
+ok:
     BIO_free(bio);
-    if (!pkey)
-	ossl_raise(rb_eArgError, "Could not parse PKey");
     return ossl_pkey_new(pkey);
 }
 
+void
+ossl_pkey_check_public_key(const EVP_PKEY *pkey)
+{
+    void *ptr;
+    const BIGNUM *n, *e, *pubkey;
+
+    if (EVP_PKEY_missing_parameters(pkey))
+	ossl_raise(ePKeyError, "parameters missing");
+
+    /* OpenSSL < 1.1.0 takes non-const pointer */
+    ptr = EVP_PKEY_get0((EVP_PKEY *)pkey);
+    switch (EVP_PKEY_base_id(pkey)) {
+      case EVP_PKEY_RSA:
+	RSA_get0_key(ptr, &n, &e, NULL);
+	if (n && e)
+	    return;
+	break;
+      case EVP_PKEY_DSA:
+	DSA_get0_key(ptr, &pubkey, NULL);
+	if (pubkey)
+	    return;
+	break;
+      case EVP_PKEY_DH:
+	DH_get0_key(ptr, &pubkey, NULL);
+	if (pubkey)
+	    return;
+	break;
+#if !defined(OPENSSL_NO_EC)
+      case EVP_PKEY_EC:
+	if (EC_KEY_get0_public_key(ptr))
+	    return;
+	break;
+#endif
+      default:
+	/* unsupported type; assuming ok */
+	return;
+    }
+    ossl_raise(ePKeyError, "public key missing");
+}
+
 EVP_PKEY *
 GetPKeyPtr(VALUE obj)
 {
     EVP_PKEY *pkey;
 
-    SafeGetPKey(obj, pkey);
+    GetPKey(obj, pkey);
 
     return pkey;
 }
@@ -180,7 +249,7 @@ GetPrivPKeyPtr(VALUE obj)
     if (rb_funcallv(obj, id_private_q, 0, NULL) != Qtrue) {
 	ossl_raise(rb_eArgError, "Private key is needed.");
     }
-    SafeGetPKey(obj, pkey);
+    GetPKey(obj, pkey);
 
     return pkey;
 }
@@ -190,21 +259,7 @@ DupPKeyPtr(VALUE obj)
 {
     EVP_PKEY *pkey;
 
-    SafeGetPKey(obj, pkey);
-    EVP_PKEY_up_ref(pkey);
-
-    return pkey;
-}
-
-EVP_PKEY *
-DupPrivPKeyPtr(VALUE obj)
-{
-    EVP_PKEY *pkey;
-
-    if (rb_funcallv(obj, id_private_q, 0, NULL) != Qtrue) {
-	ossl_raise(rb_eArgError, "Private key is needed.");
-    }
-    SafeGetPKey(obj, pkey);
+    GetPKey(obj, pkey);
     EVP_PKEY_up_ref(pkey);
 
     return pkey;
@@ -233,31 +288,185 @@ ossl_pkey_alloc(VALUE klass)
  *      PKeyClass.new -> self
  *
  * Because PKey is an abstract class, actually calling this method explicitly
- * will raise a +NotImplementedError+.
+ * will raise a NotImplementedError.
  */
 static VALUE
 ossl_pkey_initialize(VALUE self)
 {
     if (rb_obj_is_instance_of(self, cPKey)) {
-	ossl_raise(rb_eNotImpError, "OpenSSL::PKey::PKey is an abstract class.");
+	ossl_raise(rb_eTypeError, "OpenSSL::PKey::PKey can't be instantiated directly");
     }
     return self;
 }
 
 /*
+ * call-seq:
+ *    pkey.oid -> string
+ *
+ * Returns the short name of the OID associated with _pkey_.
+ */
+static VALUE
+ossl_pkey_oid(VALUE self)
+{
+    EVP_PKEY *pkey;
+    int nid;
+
+    GetPKey(self, pkey);
+    nid = EVP_PKEY_id(pkey);
+    return rb_str_new_cstr(OBJ_nid2sn(nid));
+}
+
+/*
+ * call-seq:
+ *    pkey.inspect -> string
+ *
+ * Returns a string describing the PKey object.
+ */
+static VALUE
+ossl_pkey_inspect(VALUE self)
+{
+    EVP_PKEY *pkey;
+    int nid;
+
+    GetPKey(self, pkey);
+    nid = EVP_PKEY_id(pkey);
+    return rb_sprintf("#<%"PRIsVALUE":%p oid=%s>",
+                      rb_class_name(CLASS_OF(self)), (void *)self,
+                      OBJ_nid2sn(nid));
+}
+
+static VALUE
+do_pkcs8_export(int argc, VALUE *argv, VALUE self, int to_der)
+{
+    EVP_PKEY *pkey;
+    VALUE cipher, pass;
+    const EVP_CIPHER *enc = NULL;
+    BIO *bio;
+
+    GetPKey(self, pkey);
+    rb_scan_args(argc, argv, "02", &cipher, &pass);
+    if (argc > 0) {
+	/*
+	 * TODO: EncryptedPrivateKeyInfo actually has more options.
+	 * Should they be exposed?
+	 */
+	enc = ossl_evp_get_cipherbyname(cipher);
+	pass = ossl_pem_passwd_value(pass);
+    }
+
+    bio = BIO_new(BIO_s_mem());
+    if (!bio)
+	ossl_raise(ePKeyError, "BIO_new");
+    if (to_der) {
+	if (!i2d_PKCS8PrivateKey_bio(bio, pkey, enc, NULL, 0,
+				     ossl_pem_passwd_cb, (void *)pass)) {
+	    BIO_free(bio);
+	    ossl_raise(ePKeyError, "i2d_PKCS8PrivateKey_bio");
+	}
+    }
+    else {
+	if (!PEM_write_bio_PKCS8PrivateKey(bio, pkey, enc, NULL, 0,
+					   ossl_pem_passwd_cb, (void *)pass)) {
+	    BIO_free(bio);
+	    ossl_raise(ePKeyError, "PEM_write_bio_PKCS8PrivateKey");
+	}
+    }
+    return ossl_membio2str(bio);
+}
+
+/*
+ * call-seq:
+ *    pkey.private_to_der                   -> string
+ *    pkey.private_to_der(cipher, password) -> string
+ *
+ * Serializes the private key to DER-encoded PKCS #8 format. If called without
+ * arguments, unencrypted PKCS #8 PrivateKeyInfo format is used. If called with
+ * a cipher name and a password, PKCS #8 EncryptedPrivateKeyInfo format with
+ * PBES2 encryption scheme is used.
+ */
+static VALUE
+ossl_pkey_private_to_der(int argc, VALUE *argv, VALUE self)
+{
+    return do_pkcs8_export(argc, argv, self, 1);
+}
+
+/*
+ * call-seq:
+ *    pkey.private_to_pem                   -> string
+ *    pkey.private_to_pem(cipher, password) -> string
+ *
+ * Serializes the private key to PEM-encoded PKCS #8 format. See #private_to_der
+ * for more details.
+ */
+static VALUE
+ossl_pkey_private_to_pem(int argc, VALUE *argv, VALUE self)
+{
+    return do_pkcs8_export(argc, argv, self, 0);
+}
+
+static VALUE
+do_spki_export(VALUE self, int to_der)
+{
+    EVP_PKEY *pkey;
+    BIO *bio;
+
+    GetPKey(self, pkey);
+    bio = BIO_new(BIO_s_mem());
+    if (!bio)
+	ossl_raise(ePKeyError, "BIO_new");
+    if (to_der) {
+	if (!i2d_PUBKEY_bio(bio, pkey)) {
+	    BIO_free(bio);
+	    ossl_raise(ePKeyError, "i2d_PUBKEY_bio");
+	}
+    }
+    else {
+	if (!PEM_write_bio_PUBKEY(bio, pkey)) {
+	    BIO_free(bio);
+	    ossl_raise(ePKeyError, "PEM_write_bio_PUBKEY");
+	}
+    }
+    return ossl_membio2str(bio);
+}
+
+/*
+ * call-seq:
+ *    pkey.public_to_der -> string
+ *
+ * Serializes the public key to DER-encoded X.509 SubjectPublicKeyInfo format.
+ */
+static VALUE
+ossl_pkey_public_to_der(VALUE self)
+{
+    return do_spki_export(self, 1);
+}
+
+/*
+ * call-seq:
+ *    pkey.public_to_pem -> string
+ *
+ * Serializes the public key to PEM-encoded X.509 SubjectPublicKeyInfo format.
+ */
+static VALUE
+ossl_pkey_public_to_pem(VALUE self)
+{
+    return do_spki_export(self, 0);
+}
+
+/*
  *  call-seq:
  *      pkey.sign(digest, data) -> String
  *
- * To sign the +String+ +data+, +digest+, an instance of OpenSSL::Digest, must
- * be provided. The return value is again a +String+ containing the signature.
+ * To sign the String _data_, _digest_, an instance of OpenSSL::Digest, must
+ * be provided. The return value is again a String containing the signature.
  * A PKeyError is raised should errors occur.
- * Any previous state of the +Digest+ instance is irrelevant to the signature
+ * Any previous state of the Digest instance is irrelevant to the signature
  * outcome, the digest instance is reset to its initial state during the
  * operation.
  *
  * == Example
  *   data = 'Sign me!'
- *   digest = OpenSSL::Digest::SHA256.new
+ *   digest = OpenSSL::Digest.new('SHA256')
  *   pkey = OpenSSL::PKey::RSA.new(2048)
  *   signature = pkey.sign(digest, data)
  */
@@ -271,23 +480,26 @@ ossl_pkey_sign(VALUE self, VALUE digest, VALUE data)
     VALUE str;
     int result;
 
-    if (rb_funcallv(self, id_private_q, 0, NULL) != Qtrue)
-	ossl_raise(rb_eArgError, "Private key is needed.");
-    GetPKey(self, pkey);
-    md = GetDigestPtr(digest);
+    pkey = GetPrivPKeyPtr(self);
+    md = ossl_evp_get_digestbyname(digest);
     StringValue(data);
-    str = rb_str_new(0, EVP_PKEY_size(pkey)+16);
+    str = rb_str_new(0, EVP_PKEY_size(pkey));
 
     ctx = EVP_MD_CTX_new();
     if (!ctx)
 	ossl_raise(ePKeyError, "EVP_MD_CTX_new");
-    EVP_SignInit(ctx, md);
-    EVP_SignUpdate(ctx, RSTRING_PTR(data), RSTRING_LEN(data));
+    if (!EVP_SignInit_ex(ctx, md, NULL)) {
+	EVP_MD_CTX_free(ctx);
+	ossl_raise(ePKeyError, "EVP_SignInit_ex");
+    }
+    if (!EVP_SignUpdate(ctx, RSTRING_PTR(data), RSTRING_LEN(data))) {
+	EVP_MD_CTX_free(ctx);
+	ossl_raise(ePKeyError, "EVP_SignUpdate");
+    }
     result = EVP_SignFinal(ctx, (unsigned char *)RSTRING_PTR(str), &buf_len, pkey);
     EVP_MD_CTX_free(ctx);
     if (!result)
-	ossl_raise(ePKeyError, NULL);
-    assert((long)buf_len <= RSTRING_LEN(str));
+	ossl_raise(ePKeyError, "EVP_SignFinal");
     rb_str_set_len(str, buf_len);
 
     return str;
@@ -297,18 +509,18 @@ ossl_pkey_sign(VALUE self, VALUE digest, VALUE data)
  *  call-seq:
  *      pkey.verify(digest, signature, data) -> String
  *
- * To verify the +String+ +signature+, +digest+, an instance of
+ * To verify the String _signature_, _digest_, an instance of
  * OpenSSL::Digest, must be provided to re-compute the message digest of the
- * original +data+, also a +String+. The return value is +true+ if the
+ * original _data_, also a String. The return value is +true+ if the
  * signature is valid, +false+ otherwise. A PKeyError is raised should errors
  * occur.
- * Any previous state of the +Digest+ instance is irrelevant to the validation
+ * Any previous state of the Digest instance is irrelevant to the validation
  * outcome, the digest instance is reset to its initial state during the
  * operation.
  *
  * == Example
  *   data = 'Sign me!'
- *   digest = OpenSSL::Digest::SHA256.new
+ *   digest = OpenSSL::Digest.new('SHA256')
  *   pkey = OpenSSL::PKey::RSA.new(2048)
  *   signature = pkey.sign(digest, data)
  *   pub_key = pkey.public_key
@@ -320,29 +532,37 @@ ossl_pkey_verify(VALUE self, VALUE digest, VALUE sig, VALUE data)
     EVP_PKEY *pkey;
     const EVP_MD *md;
     EVP_MD_CTX *ctx;
-    int result;
+    int siglen, result;
 
     GetPKey(self, pkey);
-    md = GetDigestPtr(digest);
+    ossl_pkey_check_public_key(pkey);
+    md = ossl_evp_get_digestbyname(digest);
     StringValue(sig);
+    siglen = RSTRING_LENINT(sig);
     StringValue(data);
 
     ctx = EVP_MD_CTX_new();
     if (!ctx)
 	ossl_raise(ePKeyError, "EVP_MD_CTX_new");
-    EVP_VerifyInit(ctx, md);
-    EVP_VerifyUpdate(ctx, RSTRING_PTR(data), RSTRING_LEN(data));
-    result = EVP_VerifyFinal(ctx, (unsigned char *)RSTRING_PTR(sig), RSTRING_LENINT(sig), pkey);
+    if (!EVP_VerifyInit_ex(ctx, md, NULL)) {
+	EVP_MD_CTX_free(ctx);
+	ossl_raise(ePKeyError, "EVP_VerifyInit_ex");
+    }
+    if (!EVP_VerifyUpdate(ctx, RSTRING_PTR(data), RSTRING_LEN(data))) {
+	EVP_MD_CTX_free(ctx);
+	ossl_raise(ePKeyError, "EVP_VerifyUpdate");
+    }
+    result = EVP_VerifyFinal(ctx, (unsigned char *)RSTRING_PTR(sig), siglen, pkey);
     EVP_MD_CTX_free(ctx);
     switch (result) {
     case 0:
+	ossl_clear_error();
 	return Qfalse;
     case 1:
 	return Qtrue;
     default:
-	ossl_raise(ePKeyError, NULL);
+	ossl_raise(ePKeyError, "EVP_VerifyFinal");
     }
-    return Qnil; /* dummy */
 }
 
 /*
@@ -351,8 +571,10 @@ ossl_pkey_verify(VALUE self, VALUE digest, VALUE sig, VALUE data)
 void
 Init_ossl_pkey(void)
 {
+#undef rb_intern
 #if 0
-    mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
+    mOSSL = rb_define_module("OpenSSL");
+    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
 #endif
 
     /* Document-module: OpenSSL::PKey
@@ -429,6 +651,12 @@ Init_ossl_pkey(void)
 
     rb_define_alloc_func(cPKey, ossl_pkey_alloc);
     rb_define_method(cPKey, "initialize", ossl_pkey_initialize, 0);
+    rb_define_method(cPKey, "oid", ossl_pkey_oid, 0);
+    rb_define_method(cPKey, "inspect", ossl_pkey_inspect, 0);
+    rb_define_method(cPKey, "private_to_der", ossl_pkey_private_to_der, -1);
+    rb_define_method(cPKey, "private_to_pem", ossl_pkey_private_to_pem, -1);
+    rb_define_method(cPKey, "public_to_der", ossl_pkey_public_to_der, 0);
+    rb_define_method(cPKey, "public_to_pem", ossl_pkey_public_to_pem, 0);
 
     rb_define_method(cPKey, "sign", ossl_pkey_sign, 2);
     rb_define_method(cPKey, "verify", ossl_pkey_verify, 3);
diff --git a/ext/openssl/ossl_pkey.h b/ext/openssl/ossl_pkey.h
index 1f68352cdc..0db59305f7 100644
--- a/ext/openssl/ossl_pkey.h
+++ b/ext/openssl/ossl_pkey.h
@@ -13,7 +13,6 @@
 extern VALUE mPKey;
 extern VALUE cPKey;
 extern VALUE ePKeyError;
-extern ID id_private_q;
 extern const rb_data_type_t ossl_evp_pkey_type;
 
 #define OSSL_PKEY_SET_PRIVATE(obj) rb_iv_set((obj), "private", Qtrue)
@@ -35,25 +34,20 @@ extern const rb_data_type_t ossl_evp_pkey_type;
 	rb_raise(rb_eRuntimeError, "PKEY wasn't initialized!");\
     } \
 } while (0)
-#define SafeGetPKey(obj, pkey) do { \
-    OSSL_Check_Kind((obj), cPKey); \
-    GetPKey((obj), (pkey)); \
-} while (0)
 
 struct ossl_generate_cb_arg {
     int yield;
-    int stop;
+    int interrupted;
     int state;
 };
 int ossl_generate_cb_2(int p, int n, BN_GENCB *cb);
 void ossl_generate_cb_stop(void *ptr);
 
 VALUE ossl_pkey_new(EVP_PKEY *);
-VALUE ossl_pkey_new_from_file(VALUE);
+void ossl_pkey_check_public_key(const EVP_PKEY *);
 EVP_PKEY *GetPKeyPtr(VALUE);
 EVP_PKEY *DupPKeyPtr(VALUE);
 EVP_PKEY *GetPrivPKeyPtr(VALUE);
-EVP_PKEY *DupPrivPKeyPtr(VALUE);
 void Init_ossl_pkey(void);
 
 /*
@@ -139,9 +133,9 @@ static VALUE ossl_##_keytype##_set_##_group(VALUE self, VALUE v1, VALUE v2, VALU
 	BIGNUM *bn3 = NULL, *orig_bn3 = NIL_P(v3) ? NULL : GetBNPtr(v3);\
 									\
 	Get##_type(self, obj);						\
-	if (orig_bn1 && !(bn1 = BN_dup(orig_bn1)) ||			\
-	    orig_bn2 && !(bn2 = BN_dup(orig_bn2)) ||			\
-	    orig_bn3 && !(bn3 = BN_dup(orig_bn3))) {			\
+        if ((orig_bn1 && !(bn1 = BN_dup(orig_bn1))) ||			\
+            (orig_bn2 && !(bn2 = BN_dup(orig_bn2))) ||			\
+            (orig_bn3 && !(bn3 = BN_dup(orig_bn3)))) {			\
 		BN_clear_free(bn1);					\
 		BN_clear_free(bn2);					\
 		BN_clear_free(bn3);					\
@@ -169,8 +163,8 @@ static VALUE ossl_##_keytype##_set_##_group(VALUE self, VALUE v1, VALUE v2) \
 	BIGNUM *bn2 = NULL, *orig_bn2 = NIL_P(v2) ? NULL : GetBNPtr(v2);\
 									\
 	Get##_type(self, obj);						\
-	if (orig_bn1 && !(bn1 = BN_dup(orig_bn1)) ||			\
-	    orig_bn2 && !(bn2 = BN_dup(orig_bn2))) {			\
+        if ((orig_bn1 && !(bn1 = BN_dup(orig_bn1))) ||			\
+            (orig_bn2 && !(bn2 = BN_dup(orig_bn2)))) {			\
 		BN_clear_free(bn1);					\
 		BN_clear_free(bn2);					\
 		ossl_raise(eBNError, NULL);				\
diff --git a/ext/openssl/ossl_pkey_dh.c b/ext/openssl/ossl_pkey_dh.c
index 139af15230..bf4e3f9322 100644
--- a/ext/openssl/ossl_pkey_dh.c
+++ b/ext/openssl/ossl_pkey_dh.c
@@ -150,8 +150,8 @@ dh_generate(int size, int gen)
  * components alike.
  *
  * === Parameters
- * * +size+ is an integer representing the desired key size. Keys smaller than 1024 bits should be considered insecure.
- * * +generator+ is a small number > 1, typically 2 or 5.
+ * * _size_ is an integer representing the desired key size. Keys smaller than 1024 bits should be considered insecure.
+ * * _generator_ is a small number > 1, typically 2 or 5.
  *
  */
 static VALUE
@@ -175,19 +175,21 @@ ossl_dh_s_generate(int argc, VALUE *argv, VALUE klass)
 }
 
 /*
- *  call-seq:
- *     DH.new([size [, generator] | string]) -> dh
+ * call-seq:
+ *   DH.new -> dh
+ *   DH.new(string) -> dh
+ *   DH.new(size [, generator]) -> dh
  *
  * Either generates a DH instance from scratch or by reading already existing
- * DH parameters from +string+. Note that when reading a DH instance from
+ * DH parameters from _string_. Note that when reading a DH instance from
  * data that was encoded from a DH instance by using DH#to_pem or DH#to_der
  * the result will *not* contain a public/private key pair yet. This needs to
  * be generated using DH#generate_key! first.
  *
  * === Parameters
- * * +size+ is an integer representing the desired key size. Keys smaller than 1024 bits should be considered insecure.
- * * +generator+ is a small number > 1, typically 2 or 5.
- * * +string+ contains the DER or PEM encoded key.
+ * * _size_ is an integer representing the desired key size. Keys smaller than 1024 bits should be considered insecure.
+ * * _generator_ is a small number > 1, typically 2 or 5.
+ * * _string_ contains the DER or PEM encoded key.
  *
  * === Examples
  *  DH.new # -> dh
@@ -210,17 +212,17 @@ ossl_dh_initialize(int argc, VALUE *argv, VALUE self)
     if(rb_scan_args(argc, argv, "02", &arg, &gen) == 0) {
       dh = DH_new();
     }
-    else if (FIXNUM_P(arg)) {
+    else if (RB_INTEGER_TYPE_P(arg)) {
 	if (!NIL_P(gen)) {
 	    g = NUM2INT(gen);
 	}
-	if (!(dh = dh_generate(FIX2INT(arg), g))) {
+	if (!(dh = dh_generate(NUM2INT(arg), g))) {
 	    ossl_raise(eDHError, NULL);
 	}
     }
     else {
 	arg = ossl_to_der_if_possible(arg);
-	in = ossl_obj2bio(arg);
+	in = ossl_obj2bio(&arg);
 	dh = PEM_read_bio_DHparams(in, NULL, NULL, NULL);
 	if (!dh){
 	    OSSL_BIO_reset(in);
@@ -260,7 +262,7 @@ ossl_dh_initialize_copy(VALUE self, VALUE other)
 	BIGNUM *pub2 = BN_dup(pub);
 	BIGNUM *priv2 = BN_dup(priv);
 
-	if (!pub2 || priv && !priv2) {
+        if (!pub2 || (priv && !priv2)) {
 	    BN_clear_free(pub2);
 	    BN_clear_free(priv2);
 	    ossl_raise(eDHError, "BN_dup");
@@ -434,7 +436,7 @@ ossl_dh_to_text(VALUE self)
  *     dh.public_key -> aDH
  *
  * Returns a new DH instance that carries just the public information, i.e.
- * the prime +p+ and the generator +g+, but no public/private key yet. Such
+ * the prime _p_ and the generator _g_, but no public/private key yet. Such
  * a pair may be generated using DH#generate_key!. The "public key" needed
  * for a key exchange with DH#compute_key is considered as per-session
  * information and may be retrieved with DH#pub_key once a key pair has
@@ -458,7 +460,7 @@ ossl_dh_to_public_key(VALUE self)
 
     GetDH(self, orig_dh);
     dh = DHparams_dup(orig_dh); /* err check perfomed by dh_instance */
-    obj = dh_instance(CLASS_OF(self), dh);
+    obj = dh_instance(rb_obj_class(self), dh);
     if (obj == Qfalse) {
 	DH_free(dh);
 	ossl_raise(eDHError, NULL);
@@ -524,8 +526,8 @@ ossl_dh_generate_key(VALUE self)
  * See DH_compute_key() for further information.
  *
  * === Parameters
- * * +pub_bn+ is a OpenSSL::BN, *not* the DH instance returned by
- * DH#public_key as that contains the DH parameters only.
+ * * _pub_bn_ is a OpenSSL::BN, *not* the DH instance returned by
+ *   DH#public_key as that contains the DH parameters only.
  */
 static VALUE
 ossl_dh_compute_key(VALUE self, VALUE pub)
@@ -550,7 +552,21 @@ ossl_dh_compute_key(VALUE self, VALUE pub)
     return str;
 }
 
+/*
+ * Document-method: OpenSSL::PKey::DH#set_pqg
+ * call-seq:
+ *   dh.set_pqg(p, q, g) -> self
+ *
+ * Sets _p_, _q_, _g_ to the DH instance.
+ */
 OSSL_PKEY_BN_DEF3(dh, DH, pqg, p, q, g)
+/*
+ * Document-method: OpenSSL::PKey::DH#set_key
+ * call-seq:
+ *   dh.set_key(pub_key, priv_key) -> self
+ *
+ * Sets _pub_key_ and _priv_key_ for the DH instance. _priv_key_ may be +nil+.
+ */
 OSSL_PKEY_BN_DEF2(dh, DH, key, pub_key, priv_key)
 
 /*
@@ -560,8 +576,9 @@ void
 Init_ossl_dh(void)
 {
 #if 0
-    mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL and mPKey */
     mPKey = rb_define_module_under(mOSSL, "PKey");
+    cPKey = rb_define_class_under(mPKey, "PKey", rb_cObject);
+    ePKeyError = rb_define_class_under(mPKey, "PKeyError", eOSSLError);
 #endif
 
     /* Document-class: OpenSSL::PKey::DHError
@@ -578,15 +595,15 @@ Init_ossl_dh(void)
      * on.
      *
      * === Accessor methods for the Diffie-Hellman parameters
-     * * DH#p
-     * The prime (an OpenSSL::BN) of the Diffie-Hellman parameters.
-     * * DH#g
-     * The generator (an OpenSSL::BN) g of the Diffie-Hellman parameters.
-     * * DH#pub_key
-     * The per-session public key (an OpenSSL::BN) matching the private key.
-     * This needs to be passed to DH#compute_key.
-     * * DH#priv_key
-     * The per-session private key, an OpenSSL::BN.
+     * DH#p::
+     *   The prime (an OpenSSL::BN) of the Diffie-Hellman parameters.
+     * DH#g::
+     *   The generator (an OpenSSL::BN) g of the Diffie-Hellman parameters.
+     * DH#pub_key::
+     *   The per-session public key (an OpenSSL::BN) matching the private key.
+     *   This needs to be passed to DH#compute_key.
+     * DH#priv_key::
+     *   The per-session private key, an OpenSSL::BN.
      *
      * === Example of a key exchange
      *  dh1 = OpenSSL::PKey::DH.new(2048)
@@ -601,7 +618,7 @@ Init_ossl_dh(void)
     cDH = rb_define_class_under(mPKey, "DH", cPKey);
     rb_define_singleton_method(cDH, "generate", ossl_dh_s_generate, -1);
     rb_define_method(cDH, "initialize", ossl_dh_initialize, -1);
-    rb_define_copy_func(cDH, ossl_dh_initialize_copy);
+    rb_define_method(cDH, "initialize_copy", ossl_dh_initialize_copy, 1);
     rb_define_method(cDH, "public?", ossl_dh_is_public, 0);
     rb_define_method(cDH, "private?", ossl_dh_is_private, 0);
     rb_define_method(cDH, "to_text", ossl_dh_to_text, 0);
diff --git a/ext/openssl/ossl_pkey_dsa.c b/ext/openssl/ossl_pkey_dsa.c
index 1ddc0d48f1..431c20e05c 100644
--- a/ext/openssl/ossl_pkey_dsa.c
+++ b/ext/openssl/ossl_pkey_dsa.c
@@ -95,8 +95,6 @@ ossl_dsa_new(EVP_PKEY *pkey)
 struct dsa_blocking_gen_arg {
     DSA *dsa;
     int size;
-    unsigned char* seed;
-    int seed_len;
     int *counter;
     unsigned long *h;
     BN_GENCB *cb;
@@ -107,7 +105,8 @@ static void *
 dsa_blocking_gen(void *arg)
 {
     struct dsa_blocking_gen_arg *gen = (struct dsa_blocking_gen_arg *)arg;
-    gen->result = DSA_generate_parameters_ex(gen->dsa, gen->size, gen->seed, gen->seed_len, gen->counter, gen->h, gen->cb);
+    gen->result = DSA_generate_parameters_ex(gen->dsa, gen->size, NULL, 0,
+					     gen->counter, gen->h, gen->cb);
     return 0;
 }
 
@@ -118,13 +117,9 @@ dsa_generate(int size)
     struct dsa_blocking_gen_arg gen_arg;
     DSA *dsa = DSA_new();
     BN_GENCB *cb = BN_GENCB_new();
-    unsigned char seed[20];
-    int seed_len = 20, counter;
+    int counter;
     unsigned long h;
 
-    if (RAND_bytes(seed, seed_len) <= 0)
-	return NULL;
-
     if (!dsa || !cb) {
 	DSA_free(dsa);
 	BN_GENCB_free(cb);
@@ -136,8 +131,6 @@ dsa_generate(int size)
     BN_GENCB_set(cb, ossl_generate_cb_2, &cb_arg);
     gen_arg.dsa = dsa;
     gen_arg.size = size;
-    gen_arg.seed = seed;
-    gen_arg.seed_len = seed_len;
     gen_arg.counter = &counter;
     gen_arg.h = &h;
     gen_arg.cb = cb;
@@ -179,7 +172,7 @@ dsa_generate(int size)
  * from scratch.
  *
  * === Parameters
- * * +size+ is an integer representing the desired key size.
+ * * _size_ is an integer representing the desired key size.
  *
  */
 static VALUE
@@ -198,14 +191,16 @@ ossl_dsa_s_generate(VALUE klass, VALUE size)
 
 /*
  *  call-seq:
- *    DSA.new([size | string [, pass]) -> dsa
+ *    DSA.new -> dsa
+ *    DSA.new(size) -> dsa
+ *    DSA.new(string [, pass]) -> dsa
  *
- * Creates a new DSA instance by reading an existing key from +string+.
+ * Creates a new DSA instance by reading an existing key from _string_.
  *
  * === Parameters
- * * +size+ is an integer representing the desired key size.
- * * +string+ contains a DER or PEM encoded key.
- * * +pass+ is a string that contains an optional password.
+ * * _size_ is an integer representing the desired key size.
+ * * _string_ contains a DER or PEM encoded key.
+ * * _pass_ is a string that contains an optional password.
  *
  * === Examples
  *  DSA.new -> dsa
@@ -226,15 +221,15 @@ ossl_dsa_initialize(int argc, VALUE *argv, VALUE self)
     if(rb_scan_args(argc, argv, "02", &arg, &pass) == 0) {
         dsa = DSA_new();
     }
-    else if (FIXNUM_P(arg)) {
-	if (!(dsa = dsa_generate(FIX2INT(arg)))) {
+    else if (RB_INTEGER_TYPE_P(arg)) {
+	if (!(dsa = dsa_generate(NUM2INT(arg)))) {
 	    ossl_raise(eDSAError, NULL);
 	}
     }
     else {
 	pass = ossl_pem_passwd_value(pass);
 	arg = ossl_to_der_if_possible(arg);
-	in = ossl_obj2bio(arg);
+	in = ossl_obj2bio(&arg);
 	dsa = PEM_read_bio_DSAPrivateKey(in, NULL, ossl_pem_passwd_cb, (void *)pass);
 	if (!dsa) {
 	    OSSL_BIO_reset(in);
@@ -334,8 +329,8 @@ ossl_dsa_is_private(VALUE self)
  * Encodes this DSA to its PEM encoding.
  *
  * === Parameters
- * * +cipher+ is an OpenSSL::Cipher.
- * * +password+ is a string containing your password.
+ * * _cipher_ is an OpenSSL::Cipher.
+ * * _password_ is a string containing your password.
  *
  * === Examples
  *  DSA.to_pem -> aString
@@ -353,7 +348,7 @@ ossl_dsa_export(int argc, VALUE *argv, VALUE self)
     GetDSA(self, dsa);
     rb_scan_args(argc, argv, "02", &cipher, &pass);
     if (!NIL_P(cipher)) {
-	ciph = GetCipherPtr(cipher);
+	ciph = ossl_evp_get_cipherbyname(cipher);
 	pass = ossl_pem_passwd_value(pass);
     }
     if (!(out = BIO_new(BIO_s_mem()))) {
@@ -387,14 +382,14 @@ static VALUE
 ossl_dsa_to_der(VALUE self)
 {
     DSA *dsa;
-    int (*i2d_func)_((DSA*, unsigned char**));
+    int (*i2d_func)(DSA *, unsigned char **);
     unsigned char *p;
     long len;
     VALUE str;
 
     GetDSA(self, dsa);
     if(DSA_HAS_PRIVATE(dsa))
-	i2d_func = (int(*)_((DSA*,unsigned char**)))i2d_DSAPrivateKey;
+	i2d_func = (int (*)(DSA *,unsigned char **))i2d_DSAPrivateKey;
     else
 	i2d_func = i2d_DSA_PUBKEY;
     if((len = i2d_func(dsa, NULL)) <= 0)
@@ -496,7 +491,7 @@ ossl_dsa_to_public_key(VALUE self)
 	(i2d_of_void *)i2d_DSAPublicKey, (d2i_of_void *)d2i_DSAPublicKey, (char *)(dsa))
     dsa = DSAPublicKey_dup(EVP_PKEY_get0_DSA(pkey));
 #undef DSAPublicKey_dup
-    obj = dsa_instance(CLASS_OF(self), dsa);
+    obj = dsa_instance(rb_obj_class(self), dsa);
     if (obj == Qfalse) {
 	DSA_free(dsa);
 	ossl_raise(eDSAError, NULL);
@@ -504,23 +499,21 @@ ossl_dsa_to_public_key(VALUE self)
     return obj;
 }
 
-#define ossl_dsa_buf_size(dsa) (DSA_size(dsa) + 16)
-
 /*
  *  call-seq:
  *    dsa.syssign(string) -> aString
  *
- * Computes and returns the DSA signature of +string+, where +string+ is
+ * Computes and returns the DSA signature of _string_, where _string_ is
  * expected to be an already-computed message digest of the original input
  * data. The signature is issued using the private key of this DSA instance.
  *
  * === Parameters
- * * +string+ is a message digest of the original input data to be signed
+ * * _string_ is a message digest of the original input data to be signed.
  *
  * === Example
  *  dsa = OpenSSL::PKey::DSA.new(2048)
  *  doc = "Sign me"
- *  digest = OpenSSL::Digest::SHA1.digest(doc)
+ *  digest = OpenSSL::Digest.digest('SHA1', doc)
  *  sig = dsa.syssign(digest)
  *
  *
@@ -540,7 +533,7 @@ ossl_dsa_sign(VALUE self, VALUE data)
     if (!DSA_PRIVATE(self, dsa))
 	ossl_raise(eDSAError, "Private DSA key needed!");
     StringValue(data);
-    str = rb_str_new(0, ossl_dsa_buf_size(dsa));
+    str = rb_str_new(0, DSA_size(dsa));
     if (!DSA_sign(0, (unsigned char *)RSTRING_PTR(data), RSTRING_LENINT(data),
 		  (unsigned char *)RSTRING_PTR(str),
 		  &buf_len, dsa)) { /* type is ignored (0) */
@@ -556,16 +549,16 @@ ossl_dsa_sign(VALUE self, VALUE data)
  *    dsa.sysverify(digest, sig) -> true | false
  *
  * Verifies whether the signature is valid given the message digest input. It
- * does so by validating +sig+ using the public key of this DSA instance.
+ * does so by validating _sig_ using the public key of this DSA instance.
  *
  * === Parameters
- * * +digest+ is a message digest of the original input data to be signed
- * * +sig+ is a DSA signature value
+ * * _digest_ is a message digest of the original input data to be signed
+ * * _sig_ is a DSA signature value
  *
  * === Example
  *  dsa = OpenSSL::PKey::DSA.new(2048)
  *  doc = "Sign me"
- *  digest = OpenSSL::Digest::SHA1.digest(doc)
+ *  digest = OpenSSL::Digest.digest('SHA1', doc)
  *  sig = dsa.syssign(digest)
  *  puts dsa.sysverify(digest, sig) # => true
  *
@@ -592,7 +585,21 @@ ossl_dsa_verify(VALUE self, VALUE digest, VALUE sig)
     return Qfalse;
 }
 
+/*
+ * Document-method: OpenSSL::PKey::DSA#set_pqg
+ * call-seq:
+ *   dsa.set_pqg(p, q, g) -> self
+ *
+ * Sets _p_, _q_, _g_ to the DSA instance.
+ */
 OSSL_PKEY_BN_DEF3(dsa, DSA, pqg, p, q, g)
+/*
+ * Document-method: OpenSSL::PKey::DSA#set_key
+ * call-seq:
+ *   dsa.set_key(pub_key, priv_key) -> self
+ *
+ * Sets _pub_key_ and _priv_key_ for the DSA instance. _priv_key_ may be +nil+.
+ */
 OSSL_PKEY_BN_DEF2(dsa, DSA, key, pub_key, priv_key)
 
 /*
@@ -602,8 +609,9 @@ void
 Init_ossl_dsa(void)
 {
 #if 0
-    mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL and mPKey */
     mPKey = rb_define_module_under(mOSSL, "PKey");
+    cPKey = rb_define_class_under(mPKey, "PKey", rb_cObject);
+    ePKeyError = rb_define_class_under(mPKey, "PKeyError", eOSSLError);
 #endif
 
     /* Document-class: OpenSSL::PKey::DSAError
@@ -619,18 +627,12 @@ Init_ossl_dsa(void)
      * DSA, the Digital Signature Algorithm, is specified in NIST's
      * FIPS 186-3. It is an asymmetric public key algorithm that may be used
      * similar to e.g. RSA.
-     * Please note that for OpenSSL versions prior to 1.0.0 the digest
-     * algorithms OpenSSL::Digest::DSS (equivalent to SHA) or
-     * OpenSSL::Digest::DSS1 (equivalent to SHA-1) must be used for issuing
-     * signatures with a DSA key using OpenSSL::PKey#sign.
-     * Starting with OpenSSL 1.0.0, digest algorithms are no longer restricted,
-     * any Digest may be used for signing.
      */
     cDSA = rb_define_class_under(mPKey, "DSA", cPKey);
 
     rb_define_singleton_method(cDSA, "generate", ossl_dsa_s_generate, 1);
     rb_define_method(cDSA, "initialize", ossl_dsa_initialize, -1);
-    rb_define_copy_func(cDSA, ossl_dsa_initialize_copy);
+    rb_define_method(cDSA, "initialize_copy", ossl_dsa_initialize_copy, 1);
 
     rb_define_method(cDSA, "public?", ossl_dsa_is_public, 0);
     rb_define_method(cDSA, "private?", ossl_dsa_is_private, 0);
diff --git a/ext/openssl/ossl_pkey_ec.c b/ext/openssl/ossl_pkey_ec.c
index 43eebd26e8..1d105abd35 100644
--- a/ext/openssl/ossl_pkey_ec.c
+++ b/ext/openssl/ossl_pkey_ec.c
@@ -4,18 +4,7 @@
 
 #include "ossl.h"
 
-#if !defined(OPENSSL_NO_EC) && (OPENSSL_VERSION_NUMBER >= 0x0090802fL)
-
-typedef struct {
-	EC_GROUP *group;
-	int dont_free;
-} ossl_ec_group;
-
-typedef struct {
-	EC_POINT *point;
-	int dont_free;
-} ossl_ec_point;
-
+#if !defined(OPENSSL_NO_EC)
 
 #define EXPORT_PEM 0
 #define EXPORT_DER 1
@@ -29,66 +18,27 @@ static const rb_data_type_t ossl_ec_point_type;
 	ossl_raise(rb_eRuntimeError, "THIS IS NOT A EC PKEY!"); \
     } \
 } while (0)
-
-#define SafeGet_ec_group(obj, group) do { \
-    OSSL_Check_Kind((obj), cEC_GROUP); \
-    TypedData_Get_Struct((obj), ossl_ec_group, &ossl_ec_group_type, (group)); \
-} while(0)
-
-#define Get_EC_KEY(obj, key) do { \
-    EVP_PKEY *pkey; \
-    GetPKeyEC((obj), pkey); \
-    (key) = EVP_PKEY_get0_EC_KEY(pkey); \
-} while(0)
-
-#define Require_EC_KEY(obj, key) do { \
-    Get_EC_KEY((obj), (key)); \
-    if ((key) == NULL) \
-        ossl_raise(eECError, "EC_KEY is not initialized"); \
-} while(0)
-
-#define SafeRequire_EC_KEY(obj, key) do { \
-    OSSL_Check_Kind((obj), cEC); \
-    Require_EC_KEY((obj), (key)); \
+#define GetEC(obj, key) do { \
+    EVP_PKEY *_pkey; \
+    GetPKeyEC(obj, _pkey); \
+    (key) = EVP_PKEY_get0_EC_KEY(_pkey); \
 } while (0)
 
-#define Get_EC_GROUP(obj, g) do { \
-    ossl_ec_group *ec_group; \
-    TypedData_Get_Struct((obj), ossl_ec_group, &ossl_ec_group_type, ec_group); \
-    if (ec_group == NULL) \
-        ossl_raise(eEC_GROUP, "missing ossl_ec_group structure"); \
-    (g) = ec_group->group; \
-} while(0)
-
-#define Require_EC_GROUP(obj, group) do { \
-    Get_EC_GROUP((obj), (group)); \
+#define GetECGroup(obj, group) do { \
+    TypedData_Get_Struct(obj, EC_GROUP, &ossl_ec_group_type, group); \
     if ((group) == NULL) \
-        ossl_raise(eEC_GROUP, "EC_GROUP is not initialized"); \
-} while(0)
-
-#define SafeRequire_EC_GROUP(obj, group) do { \
-    OSSL_Check_Kind((obj), cEC_GROUP); \
-    Require_EC_GROUP((obj), (group)); \
-} while(0)
-
-#define Get_EC_POINT(obj, p) do { \
-    ossl_ec_point *ec_point; \
-    TypedData_Get_Struct((obj), ossl_ec_point, &ossl_ec_point_type, ec_point); \
-    if (ec_point == NULL) \
-        ossl_raise(eEC_POINT, "missing ossl_ec_point structure"); \
-    (p) = ec_point->point; \
-} while(0)
-
-#define Require_EC_POINT(obj, point) do { \
-    Get_EC_POINT((obj), (point)); \
-    if ((point) == NULL) \
-        ossl_raise(eEC_POINT, "EC_POINT is not initialized"); \
-} while(0)
+	ossl_raise(eEC_GROUP, "EC_GROUP is not initialized"); \
+} while (0)
 
-#define SafeRequire_EC_POINT(obj, point) do { \
-    OSSL_Check_Kind((obj), cEC_POINT); \
-    Require_EC_POINT((obj), (point)); \
-} while(0)
+#define GetECPoint(obj, point) do { \
+    TypedData_Get_Struct(obj, EC_POINT, &ossl_ec_point_type, point); \
+    if ((point) == NULL) \
+	ossl_raise(eEC_POINT, "EC_POINT is not initialized"); \
+} while (0)
+#define GetECPointGroup(obj, group) do { \
+    VALUE _group = rb_attr_get(obj, id_i_group); \
+    GetECGroup(_group, group); \
+} while (0)
 
 VALUE cEC;
 VALUE eECError;
@@ -108,6 +58,11 @@ static ID ID_uncompressed;
 static ID ID_compressed;
 static ID ID_hybrid;
 
+static ID id_i_group;
+
+static VALUE ec_group_new(const EC_GROUP *group);
+static VALUE ec_point_new(const EC_POINT *point, const EC_GROUP *group);
+
 static VALUE ec_instance(VALUE klass, EC_KEY *ec)
 {
     EVP_PKEY *pkey;
@@ -161,8 +116,7 @@ ec_key_new_from_group(VALUE arg)
     if (rb_obj_is_kind_of(arg, cEC_GROUP)) {
 	EC_GROUP *group;
 
-	SafeRequire_EC_GROUP(arg, group);
-
+	GetECGroup(arg, group);
 	if (!(ec = EC_KEY_new()))
 	    ossl_raise(eECError, NULL);
 
@@ -213,17 +167,16 @@ ossl_ec_key_s_generate(VALUE klass, VALUE arg)
     return obj;
 }
 
-/*  call-seq:
- *     OpenSSL::PKey::EC.new()
- *     OpenSSL::PKey::EC.new(ec_key)
- *     OpenSSL::PKey::EC.new(ec_group)
- *     OpenSSL::PKey::EC.new("secp112r1")
- *     OpenSSL::PKey::EC.new(pem_string)
- *     OpenSSL::PKey::EC.new(pem_string [, pwd])
- *     OpenSSL::PKey::EC.new(der_string)
- *
- *  See the OpenSSL documentation for:
- *     EC_KEY_*
+/*
+ * call-seq:
+ *   OpenSSL::PKey::EC.new
+ *   OpenSSL::PKey::EC.new(ec_key)
+ *   OpenSSL::PKey::EC.new(ec_group)
+ *   OpenSSL::PKey::EC.new("secp112r1")
+ *   OpenSSL::PKey::EC.new(pem_string [, pwd])
+ *   OpenSSL::PKey::EC.new(der_string)
+ *
+ * Creates a new EC object from given arguments.
  */
 static VALUE ossl_ec_key_initialize(int argc, VALUE *argv, VALUE self)
 {
@@ -243,7 +196,7 @@ static VALUE ossl_ec_key_initialize(int argc, VALUE *argv, VALUE self)
     } else if (rb_obj_is_kind_of(arg, cEC)) {
 	EC_KEY *other_ec = NULL;
 
-	SafeRequire_EC_KEY(arg, other_ec);
+	GetEC(arg, other_ec);
 	if (!(ec = EC_KEY_dup(other_ec)))
 	    ossl_raise(eECError, NULL);
     } else if (rb_obj_is_kind_of(arg, cEC_GROUP)) {
@@ -252,7 +205,7 @@ static VALUE ossl_ec_key_initialize(int argc, VALUE *argv, VALUE self)
 	BIO *in;
 
 	pass = ossl_pem_passwd_value(pass);
-	in = ossl_obj2bio(arg);
+	in = ossl_obj2bio(&arg);
 
 	ec = PEM_read_bio_ECPrivateKey(in, NULL, ossl_pem_passwd_cb, (void *)pass);
 	if (!ec) {
@@ -280,8 +233,6 @@ static VALUE ossl_ec_key_initialize(int argc, VALUE *argv, VALUE self)
 	ossl_raise(eECError, "EVP_PKEY_assign_EC_KEY");
     }
 
-    rb_iv_set(self, "@group", Qnil);
-
     return self;
 }
 
@@ -294,7 +245,7 @@ ossl_ec_key_initialize_copy(VALUE self, VALUE other)
     GetPKey(self, pkey);
     if (EVP_PKEY_base_id(pkey) != EVP_PKEY_NONE)
 	ossl_raise(eECError, "EC already initialized");
-    SafeRequire_EC_KEY(other, ec);
+    GetEC(other, ec);
 
     ec_new = EC_KEY_dup(ec);
     if (!ec_new)
@@ -303,80 +254,46 @@ ossl_ec_key_initialize_copy(VALUE self, VALUE other)
 	EC_KEY_free(ec_new);
 	ossl_raise(eECError, "EVP_PKEY_assign_EC_KEY");
     }
-    rb_iv_set(self, "@group", Qnil); /* EC_KEY_dup() also copies the EC_GROUP */
 
     return self;
 }
 
 /*
- *  call-seq:
- *     key.group   => group
+ * call-seq:
+ *   key.group   => group
  *
- *  Returns a constant <code>OpenSSL::EC::Group</code> that is tied to the key.
- *  Modifying the returned group can make the key invalid.
+ * Returns the EC::Group that the key is associated with. Modifying the returned
+ * group does not affect _key_.
  */
-static VALUE ossl_ec_key_get_group(VALUE self)
+static VALUE
+ossl_ec_key_get_group(VALUE self)
 {
-    VALUE group_v;
     EC_KEY *ec;
-    ossl_ec_group *ec_group;
-    EC_GROUP *group;
-
-    Require_EC_KEY(self, ec);
-
-    group_v = rb_iv_get(self, "@group");
-    if (!NIL_P(group_v))
-        return group_v;
+    const EC_GROUP *group;
 
-    if ((group = (EC_GROUP *)EC_KEY_get0_group(ec)) != NULL) {
-        group_v = rb_obj_alloc(cEC_GROUP);
-        SafeGet_ec_group(group_v, ec_group);
-        ec_group->group = group;
-        ec_group->dont_free = 1;
-        rb_iv_set(group_v, "@key", self);
-        rb_iv_set(self, "@group", group_v);
-        return group_v;
-    }
+    GetEC(self, ec);
+    group = EC_KEY_get0_group(ec);
+    if (!group)
+	return Qnil;
 
-    return Qnil;
+    return ec_group_new(group);
 }
 
 /*
- *  call-seq:
- *     key.group = group   => group
+ * call-seq:
+ *   key.group = group
  *
- *  Returns the same object passed, not the group object associated with the key.
- *  If you wish to access the group object tied to the key call key.group after setting
- *  the group.
- *
- *  Setting the group will immediately destroy any previously assigned group object.
- *  The group is internally copied by OpenSSL.  Modifying the original group after
- *  assignment will not effect the internal key structure.
- *  (your changes may be lost).  BE CAREFUL.
- *
- *  EC_KEY_set_group calls EC_GROUP_free(key->group) then EC_GROUP_dup(), not EC_GROUP_copy.
- *  This documentation is accurate for OpenSSL 0.9.8b.
+ * Sets the EC::Group for the key. The group structure is internally copied so
+ * modification to _group_ after assigning to a key has no effect on the key.
  */
-static VALUE ossl_ec_key_set_group(VALUE self, VALUE group_v)
+static VALUE
+ossl_ec_key_set_group(VALUE self, VALUE group_v)
 {
-    VALUE old_group_v;
     EC_KEY *ec;
     EC_GROUP *group;
 
-    Require_EC_KEY(self, ec);
-    SafeRequire_EC_GROUP(group_v, group);
-
-    old_group_v = rb_iv_get(self, "@group");
-    if (!NIL_P(old_group_v)) {
-        ossl_ec_group *old_ec_group;
-        SafeGet_ec_group(old_group_v, old_ec_group);
-
-        old_ec_group->group = NULL;
-        old_ec_group->dont_free = 0;
-        rb_iv_set(old_group_v, "@key", Qnil);
-    }
-
-    rb_iv_set(self, "@group", Qnil);
+    GetEC(self, ec);
+    GetECGroup(group_v, group);
 
     if (EC_KEY_set_group(ec, group) != 1)
         ossl_raise(eECError, "EC_KEY_set_group");
@@ -395,8 +312,7 @@ static VALUE ossl_ec_key_get_private_key(VALUE self)
     EC_KEY *ec;
     const BIGNUM *bn;
 
-    Require_EC_KEY(self, ec);
-
+    GetEC(self, ec);
     if ((bn = EC_KEY_get0_private_key(ec)) == NULL)
         return Qnil;
 
@@ -414,7 +330,7 @@ static VALUE ossl_ec_key_set_private_key(VALUE self, VALUE private_key)
     EC_KEY *ec;
     BIGNUM *bn = NULL;
 
-    Require_EC_KEY(self, ec);
+    GetEC(self, ec);
     if (!NIL_P(private_key))
         bn = GetBNPtr(private_key);
 
@@ -431,26 +347,6 @@ static VALUE ossl_ec_key_set_private_key(VALUE self, VALUE private_key)
     return private_key;
 }
 
-
-static VALUE ossl_ec_point_dup(const EC_POINT *point, VALUE group_v)
-{
-    VALUE obj;
-    const EC_GROUP *group;
-    ossl_ec_point *new_point;
-
-    obj = rb_obj_alloc(cEC_POINT);
-    TypedData_Get_Struct(obj, ossl_ec_point, &ossl_ec_point_type, new_point);
-
-    SafeRequire_EC_GROUP(group_v, group);
-
-    new_point->point = EC_POINT_dup(point, group);
-    if (new_point->point == NULL)
-        ossl_raise(eEC_POINT, "EC_POINT_dup");
-    rb_iv_set(obj, "@group", group_v);
-
-    return obj;
-}
-
 /*
  *  call-seq:
  *     key.public_key   => OpenSSL::PKey::EC::Point
@@ -461,18 +357,12 @@ static VALUE ossl_ec_key_get_public_key(VALUE self)
 {
     EC_KEY *ec;
     const EC_POINT *point;
-    VALUE group;
-
-    Require_EC_KEY(self, ec);
 
+    GetEC(self, ec);
     if ((point = EC_KEY_get0_public_key(ec)) == NULL)
         return Qnil;
 
-    group = rb_funcall(self, rb_intern("group"), 0);
-    if (NIL_P(group))
-        ossl_raise(eECError, "EC_KEY_get0_get0_group (has public_key but no group???");
-
-    return ossl_ec_point_dup(point, group);
+    return ec_point_new(point, EC_KEY_get0_group(ec));
 }
 
 /*
@@ -486,9 +376,9 @@ static VALUE ossl_ec_key_set_public_key(VALUE self, VALUE public_key)
     EC_KEY *ec;
     EC_POINT *point = NULL;
 
-    Require_EC_KEY(self, ec);
+    GetEC(self, ec);
     if (!NIL_P(public_key))
-        SafeRequire_EC_POINT(public_key, point);
+        GetECPoint(public_key, point);
 
     switch (EC_KEY_set_public_key(ec, point)) {
     case 1:
@@ -514,7 +404,7 @@ static VALUE ossl_ec_key_is_public(VALUE self)
 {
     EC_KEY *ec;
 
-    Require_EC_KEY(self, ec);
+    GetEC(self, ec);
 
     return EC_KEY_get0_public_key(ec) ? Qtrue : Qfalse;
 }
@@ -530,7 +420,7 @@ static VALUE ossl_ec_key_is_private(VALUE self)
 {
     EC_KEY *ec;
 
-    Require_EC_KEY(self, ec);
+    GetEC(self, ec);
 
     return EC_KEY_get0_private_key(ec) ? Qtrue : Qfalse;
 }
@@ -542,8 +432,9 @@ static VALUE ossl_ec_key_to_string(VALUE self, VALUE ciph, VALUE pass, int forma
     int i = -1;
     int private = 0;
     VALUE str;
+    const EVP_CIPHER *cipher = NULL;
 
-    Require_EC_KEY(self, ec);
+    GetEC(self, ec);
 
     if (EC_KEY_get0_public_key(ec) == NULL)
         ossl_raise(eECError, "can't export - no public key set");
@@ -554,17 +445,17 @@ static VALUE ossl_ec_key_to_string(VALUE self, VALUE ciph, VALUE pass, int forma
     if (EC_KEY_get0_private_key(ec))
         private = 1;
 
+    if (!NIL_P(ciph)) {
+	cipher = ossl_evp_get_cipherbyname(ciph);
+	pass = ossl_pem_passwd_value(pass);
+    }
+
     if (!(out = BIO_new(BIO_s_mem())))
         ossl_raise(eECError, "BIO_new(BIO_s_mem())");
 
     switch(format) {
     case EXPORT_PEM:
     	if (private) {
-	    const EVP_CIPHER *cipher = NULL;
-	    if (!NIL_P(ciph)) {
-		cipher = GetCipherPtr(ciph);
-		pass = ossl_pem_passwd_value(pass);
-	    }
             i = PEM_write_bio_ECPrivateKey(out, ec, cipher, NULL, 0, ossl_pem_passwd_cb, (void *)pass);
     	} else {
             i = PEM_write_bio_EC_PUBKEY(out, ec);
@@ -599,12 +490,10 @@ static VALUE ossl_ec_key_to_string(VALUE self, VALUE ciph, VALUE pass, int forma
  *     key.export([cipher, pass_phrase]) => String
  *     key.to_pem([cipher, pass_phrase]) => String
  *
- * Outputs the EC key in PEM encoding.  If +cipher+ and +pass_phrase+ are
- * given they will be used to encrypt the key.  +cipher+ must be an
- * OpenSSL::Cipher::Cipher instance. Note that encryption will only be
- * effective for a private key, public keys will always be encoded in plain
- * text.
- *
+ * Outputs the EC key in PEM encoding.  If _cipher_ and _pass_phrase_ are given
+ * they will be used to encrypt the key.  _cipher_ must be an OpenSSL::Cipher
+ * instance. Note that encryption will only be effective for a private key,
+ * public keys will always be encoded in plain text.
  */
 static VALUE ossl_ec_key_export(int argc, VALUE *argv, VALUE self)
 {
@@ -636,7 +525,7 @@ static VALUE ossl_ec_key_to_text(VALUE self)
     BIO *out;
     VALUE str;
 
-    Require_EC_KEY(self, ec);
+    GetEC(self, ec);
     if (!(out = BIO_new(BIO_s_mem()))) {
 	ossl_raise(eECError, "BIO_new(BIO_s_mem())");
     }
@@ -667,8 +556,7 @@ static VALUE ossl_ec_key_generate_key(VALUE self)
 {
     EC_KEY *ec;
 
-    Require_EC_KEY(self, ec);
-
+    GetEC(self, ec);
     if (EC_KEY_generate_key(ec) != 1)
 	ossl_raise(eECError, "EC_KEY_generate_key");
 
@@ -687,8 +575,7 @@ static VALUE ossl_ec_key_check_key(VALUE self)
 {
     EC_KEY *ec;
 
-    Require_EC_KEY(self, ec);
-
+    GetEC(self, ec);
     if (EC_KEY_check_key(ec) != 1)
 	ossl_raise(eECError, "EC_KEY_check_key");
 
@@ -708,8 +595,8 @@ static VALUE ossl_ec_key_dh_compute_key(VALUE self, VALUE pubkey)
     int buf_len;
     VALUE str;
 
-    Require_EC_KEY(self, ec);
-    SafeRequire_EC_POINT(pubkey, point);
+    GetEC(self, ec);
+    GetECPoint(pubkey, point);
 
 /* BUG: need a way to figure out the maximum string size */
     buf_len = 1024;
@@ -738,17 +625,16 @@ static VALUE ossl_ec_key_dsa_sign_asn1(VALUE self, VALUE data)
     unsigned int buf_len;
     VALUE str;
 
-    Require_EC_KEY(self, ec);
+    GetEC(self, ec);
     StringValue(data);
 
     if (EC_KEY_get0_private_key(ec) == NULL)
 	ossl_raise(eECError, "Private EC key needed!");
 
-    str = rb_str_new(0, ECDSA_size(ec) + 16);
+    str = rb_str_new(0, ECDSA_size(ec));
     if (ECDSA_sign(0, (unsigned char *) RSTRING_PTR(data), RSTRING_LENINT(data), (unsigned char *) RSTRING_PTR(str), &buf_len, ec) != 1)
-         ossl_raise(eECError, "ECDSA_sign");
-
-    rb_str_resize(str, buf_len);
+	ossl_raise(eECError, "ECDSA_sign");
+    rb_str_set_len(str, buf_len);
 
     return str;
 }
@@ -763,27 +649,28 @@ static VALUE ossl_ec_key_dsa_verify_asn1(VALUE self, VALUE data, VALUE sig)
 {
     EC_KEY *ec;
 
-    Require_EC_KEY(self, ec);
+    GetEC(self, ec);
     StringValue(data);
     StringValue(sig);
 
-    switch (ECDSA_verify(0, (unsigned char *) RSTRING_PTR(data), RSTRING_LENINT(data), (unsigned char *) RSTRING_PTR(sig), (int)RSTRING_LEN(sig), ec)) {
-    case 1:	return Qtrue;
-    case 0:	return Qfalse;
-    default:	break;
+    switch (ECDSA_verify(0, (unsigned char *)RSTRING_PTR(data), RSTRING_LENINT(data),
+                         (unsigned char *)RSTRING_PTR(sig), RSTRING_LENINT(sig), ec)) {
+      case 1:
+        return Qtrue;
+      case 0:
+        return Qfalse;
+      default:
+        ossl_raise(eECError, "ECDSA_verify");
     }
-
-    ossl_raise(eECError, "ECDSA_verify");
-
-    UNREACHABLE;
 }
 
-static void ossl_ec_group_free(void *ptr)
+/*
+ * OpenSSL::PKey::EC::Group
+ */
+static void
+ossl_ec_group_free(void *ptr)
 {
-    ossl_ec_group *ec_group = ptr;
-    if (!ec_group->dont_free && ec_group->group)
-        EC_GROUP_clear_free(ec_group->group);
-    ruby_xfree(ec_group);
+    EC_GROUP_clear_free(ptr);
 }
 
 static const rb_data_type_t ossl_ec_group_type = {
@@ -794,40 +681,55 @@ static const rb_data_type_t ossl_ec_group_type = {
     0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
 };
 
-static VALUE ossl_ec_group_alloc(VALUE klass)
+static VALUE
+ossl_ec_group_alloc(VALUE klass)
+{
+    return TypedData_Wrap_Struct(klass, &ossl_ec_group_type, NULL);
+}
+
+static VALUE
+ec_group_new(const EC_GROUP *group)
 {
-    ossl_ec_group *ec_group;
     VALUE obj;
+    EC_GROUP *group_new;
 
-    obj = TypedData_Make_Struct(klass, ossl_ec_group, &ossl_ec_group_type, ec_group);
+    obj = ossl_ec_group_alloc(cEC_GROUP);
+    group_new = EC_GROUP_dup(group);
+    if (!group_new)
+	ossl_raise(eEC_GROUP, "EC_GROUP_dup");
+    RTYPEDDATA_DATA(obj) = group_new;
 
     return obj;
 }
 
-/*  call-seq:
- *     OpenSSL::PKey::EC::Group.new("secp112r1")
- *     OpenSSL::PKey::EC::Group.new(ec_group)
- *     OpenSSL::PKey::EC::Group.new(pem_string)
- *     OpenSSL::PKey::EC::Group.new(der_string)
- *     OpenSSL::PKey::EC::Group.new(pem_file)
- *     OpenSSL::PKey::EC::Group.new(der_file)
- *     OpenSSL::PKey::EC::Group.new(:GFp_simple)
- *     OpenSSL::PKey::EC::Group.new(:GFp_mult)
- *     OpenSSL::PKey::EC::Group.new(:GFp_nist)
- *     OpenSSL::PKey::EC::Group.new(:GF2m_simple)
- *     OpenSSL::PKey::EC::Group.new(:GFp, bignum_p, bignum_a, bignum_b)
- *     OpenSSL::PKey::EC::Group.new(:GF2m, bignum_p, bignum_a, bignum_b)
- *
- *  See the OpenSSL documentation for EC_GROUP_*
+/*
+ * call-seq:
+ *   OpenSSL::PKey::EC::Group.new(ec_group)
+ *   OpenSSL::PKey::EC::Group.new(pem_or_der_encoded)
+ *   OpenSSL::PKey::EC::Group.new(ec_method)
+ *   OpenSSL::PKey::EC::Group.new(:GFp, bignum_p, bignum_a, bignum_b)
+ *   OpenSSL::PKey::EC::Group.new(:GF2m, bignum_p, bignum_a, bignum_b)
+ *
+ * Creates a new EC::Group object.
+ *
+ * _ec_method_ is a symbol that represents an EC_METHOD. Currently the following
+ * are supported:
+ *
+ * * :GFp_simple
+ * * :GFp_mont
+ * * :GFp_nist
+ * * :GF2m_simple
+ *
+ * If the first argument is :GFp or :GF2m, creates a new curve with given
+ * parameters.
  */
 static VALUE ossl_ec_group_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE arg1, arg2, arg3, arg4;
-    ossl_ec_group *ec_group;
-    EC_GROUP *group = NULL;
+    EC_GROUP *group;
 
-    TypedData_Get_Struct(self, ossl_ec_group, &ossl_ec_group_type, ec_group);
-    if (ec_group->group != NULL)
+    TypedData_Get_Struct(self, EC_GROUP, &ossl_ec_group_type, group);
+    if (group)
         ossl_raise(rb_eRuntimeError, "EC_GROUP is already initialized");
 
     switch (rb_scan_args(argc, argv, "13", &arg1, &arg2, &arg3, &arg4)) {
@@ -857,11 +759,11 @@ static VALUE ossl_ec_group_initialize(int argc, VALUE *argv, VALUE self)
         } else if (rb_obj_is_kind_of(arg1, cEC_GROUP)) {
             const EC_GROUP *arg1_group;
 
-            SafeRequire_EC_GROUP(arg1, arg1_group);
+            GetECGroup(arg1, arg1_group);
             if ((group = EC_GROUP_dup(arg1_group)) == NULL)
                 ossl_raise(eEC_GROUP, "EC_GROUP_dup");
         } else {
-            BIO *in = ossl_obj2bio(arg1);
+            BIO *in = ossl_obj2bio(&arg1);
 
             group = PEM_read_bio_ECPKParameters(in, NULL, NULL, NULL);
             if (!group) {
@@ -920,8 +822,7 @@ static VALUE ossl_ec_group_initialize(int argc, VALUE *argv, VALUE self)
 
     if (group == NULL)
         ossl_raise(eEC_GROUP, "");
-
-    ec_group->group = group;
+    RTYPEDDATA_DATA(self) = group;
 
     return self;
 }
@@ -929,34 +830,35 @@ static VALUE ossl_ec_group_initialize(int argc, VALUE *argv, VALUE self)
 static VALUE
 ossl_ec_group_initialize_copy(VALUE self, VALUE other)
 {
-    ossl_ec_group *ec_group;
-    EC_GROUP *orig;
+    EC_GROUP *group, *group_new;
 
-    TypedData_Get_Struct(self, ossl_ec_group, &ossl_ec_group_type, ec_group);
-    if (ec_group->group)
+    TypedData_Get_Struct(self, EC_GROUP, &ossl_ec_group_type, group_new);
+    if (group_new)
 	ossl_raise(eEC_GROUP, "EC::Group already initialized");
-    SafeRequire_EC_GROUP(other, orig);
+    GetECGroup(other, group);
 
-    ec_group->group = EC_GROUP_dup(orig);
-    if (!ec_group->group)
+    group_new = EC_GROUP_dup(group);
+    if (!group_new)
 	ossl_raise(eEC_GROUP, "EC_GROUP_dup");
-
-    rb_iv_set(self, "@key", Qnil);
+    RTYPEDDATA_DATA(self) = group_new;
 
     return self;
 }
 
-/*  call-seq:
- *     group1.eql?(group2)   => true | false
- *     group1 == group2   => true | false
+/*
+ * call-seq:
+ *   group1.eql?(group2)   => true | false
+ *   group1 == group2   => true | false
  *
+ * Returns +true+ if the two groups use the same curve and have the same
+ * parameters, +false+ otherwise.
  */
 static VALUE ossl_ec_group_eql(VALUE a, VALUE b)
 {
     EC_GROUP *group1 = NULL, *group2 = NULL;
 
-    Require_EC_GROUP(a, group1);
-    SafeRequire_EC_GROUP(b, group2);
+    GetECGroup(a, group1);
+    GetECGroup(b, group2);
 
     if (EC_GROUP_cmp(group1, group2, ossl_bn_ctx) == 1)
        return Qfalse;
@@ -964,27 +866,35 @@ static VALUE ossl_ec_group_eql(VALUE a, VALUE b)
     return Qtrue;
 }
 
-/*  call-seq:
- *     group.generator   => ec_point
+/*
+ * call-seq:
+ *   group.generator   => ec_point
  *
- *  See the OpenSSL documentation for EC_GROUP_get0_generator()
+ * Returns the generator of the group.
+ *
+ * See the OpenSSL documentation for EC_GROUP_get0_generator()
  */
 static VALUE ossl_ec_group_get_generator(VALUE self)
 {
-    VALUE point_obj;
-    EC_GROUP *group = NULL;
-
-    Require_EC_GROUP(self, group);
+    EC_GROUP *group;
+    const EC_POINT *generator;
 
-    point_obj = ossl_ec_point_dup(EC_GROUP_get0_generator(group), self);
+    GetECGroup(self, group);
+    generator = EC_GROUP_get0_generator(group);
+    if (!generator)
+	return Qnil;
 
-    return point_obj;
+    return ec_point_new(generator, group);
 }
 
-/*  call-seq:
- *     group.set_generator(generator, order, cofactor)   => self
+/*
+ * call-seq:
+ *   group.set_generator(generator, order, cofactor)   => self
  *
- *  See the OpenSSL documentation for EC_GROUP_set_generator()
+ * Sets the curve parameters. _generator_ must be an instance of EC::Point that
+ * is on the curve. _order_ and _cofactor_ are integers.
+ *
+ * See the OpenSSL documentation for EC_GROUP_set_generator()
  */
 static VALUE ossl_ec_group_set_generator(VALUE self, VALUE generator, VALUE order, VALUE cofactor)
 {
@@ -992,8 +902,8 @@ static VALUE ossl_ec_group_set_generator(VALUE self, VALUE generator, VALUE orde
     const EC_POINT *point;
     const BIGNUM *o, *co;
 
-    Require_EC_GROUP(self, group);
-    SafeRequire_EC_POINT(generator, point);
+    GetECGroup(self, group);
+    GetECPoint(generator, point);
     o = GetBNPtr(order);
     co = GetBNPtr(cofactor);
 
@@ -1003,10 +913,13 @@ static VALUE ossl_ec_group_set_generator(VALUE self, VALUE generator, VALUE orde
     return self;
 }
 
-/*  call-seq:
- *     group.get_order   => order_bn
+/*
+ * call-seq:
+ *   group.get_order   => order_bn
+ *
+ * Returns the order of the group.
  *
- *  See the OpenSSL documentation for EC_GROUP_get_order()
+ * See the OpenSSL documentation for EC_GROUP_get_order()
  */
 static VALUE ossl_ec_group_get_order(VALUE self)
 {
@@ -1014,7 +927,7 @@ static VALUE ossl_ec_group_get_order(VALUE self)
     BIGNUM *bn;
     EC_GROUP *group = NULL;
 
-    Require_EC_GROUP(self, group);
+    GetECGroup(self, group);
 
     bn_obj = ossl_bn_new(NULL);
     bn = GetBNPtr(bn_obj);
@@ -1025,10 +938,13 @@ static VALUE ossl_ec_group_get_order(VALUE self)
     return bn_obj;
 }
 
-/*  call-seq:
- *     group.get_cofactor   => cofactor_bn
+/*
+ * call-seq:
+ *   group.get_cofactor   => cofactor_bn
+ *
+ * Returns the cofactor of the group.
  *
- *  See the OpenSSL documentation for EC_GROUP_get_cofactor()
+ * See the OpenSSL documentation for EC_GROUP_get_cofactor()
  */
 static VALUE ossl_ec_group_get_cofactor(VALUE self)
 {
@@ -1036,7 +952,7 @@ static VALUE ossl_ec_group_get_cofactor(VALUE self)
     BIGNUM *bn;
     EC_GROUP *group = NULL;
 
-    Require_EC_GROUP(self, group);
+    GetECGroup(self, group);
 
     bn_obj = ossl_bn_new(NULL);
     bn = GetBNPtr(bn_obj);
@@ -1047,17 +963,20 @@ static VALUE ossl_ec_group_get_cofactor(VALUE self)
     return bn_obj;
 }
 
-/*  call-seq:
- *     group.curve_name  => String
+/*
+ * call-seq:
+ *   group.curve_name  => String
  *
- *  See the OpenSSL documentation for EC_GROUP_get_curve_name()
+ * Returns the curve name (sn).
+ *
+ * See the OpenSSL documentation for EC_GROUP_get_curve_name()
  */
 static VALUE ossl_ec_group_get_curve_name(VALUE self)
 {
     EC_GROUP *group = NULL;
     int nid;
 
-    Get_EC_GROUP(self, group);
+    GetECGroup(self, group);
     if (group == NULL)
         return Qnil;
 
@@ -1067,10 +986,14 @@ static VALUE ossl_ec_group_get_curve_name(VALUE self)
     return rb_str_new2(OBJ_nid2sn(nid));
 }
 
-/*  call-seq:
- *     EC.builtin_curves => [[name, comment], ...]
+/*
+ * call-seq:
+ *   EC.builtin_curves => [[sn, comment], ...]
+ *
+ * Obtains a list of all predefined curves by the OpenSSL. Curve names are
+ * returned as sn.
  *
- *  See the OpenSSL documentation for EC_builtin_curves()
+ * See the OpenSSL documentation for EC_get_builtin_curves().
  */
 static VALUE ossl_s_builtin_curves(VALUE self)
 {
@@ -1100,43 +1023,56 @@ static VALUE ossl_s_builtin_curves(VALUE self)
     return ret;
 }
 
-/*  call-seq:
- *     group.asn1_flag  => Fixnum
+/*
+ * call-seq:
+ *   group.asn1_flag -> Integer
+ *
+ * Returns the flags set on the group.
  *
- *  See the OpenSSL documentation for EC_GROUP_get_asn1_flag()
+ * See also #asn1_flag=.
  */
 static VALUE ossl_ec_group_get_asn1_flag(VALUE self)
 {
     EC_GROUP *group = NULL;
     int flag;
 
-    Require_EC_GROUP(self, group);
-
+    GetECGroup(self, group);
     flag = EC_GROUP_get_asn1_flag(group);
 
-    return INT2FIX(flag);
+    return INT2NUM(flag);
 }
 
-/*  call-seq:
- *     group.asn1_flag = Fixnum   => Fixnum
+/*
+ * call-seq:
+ *   group.asn1_flag = flags
+ *
+ * Sets flags on the group. The flag value is used to determine how to encode
+ * the group: encode explicit parameters or named curve using an OID.
+ *
+ * The flag value can be either of:
  *
- *  See the OpenSSL documentation for EC_GROUP_set_asn1_flag()
+ * * EC::NAMED_CURVE
+ * * EC::EXPLICIT_CURVE
+ *
+ * See the OpenSSL documentation for EC_GROUP_set_asn1_flag().
  */
 static VALUE ossl_ec_group_set_asn1_flag(VALUE self, VALUE flag_v)
 {
     EC_GROUP *group = NULL;
 
-    Require_EC_GROUP(self, group);
-
+    GetECGroup(self, group);
     EC_GROUP_set_asn1_flag(group, NUM2INT(flag_v));
 
     return flag_v;
 }
 
-/*  call-seq:
- *     group.point_conversion_form  => :uncompressed | :compressed | :hybrid
+/*
+ * call-seq:
+ *   group.point_conversion_form -> Symbol
  *
- *  See the OpenSSL documentation for EC_GROUP_get_point_conversion_form()
+ * Returns the form how EC::Point data is encoded as ASN.1.
+ *
+ * See also #point_conversion_form=.
  */
 static VALUE ossl_ec_group_get_point_conversion_form(VALUE self)
 {
@@ -1144,8 +1080,7 @@ static VALUE ossl_ec_group_get_point_conversion_form(VALUE self)
     point_conversion_form_t form;
     VALUE ret;
 
-    Require_EC_GROUP(self, group);
-
+    GetECGroup(self, group);
     form = EC_GROUP_get_point_conversion_form(group);
 
     switch (form) {
@@ -1158,46 +1093,67 @@ static VALUE ossl_ec_group_get_point_conversion_form(VALUE self)
    return ID2SYM(ret);
 }
 
-/*  call-seq:
- *     group.point_conversion_form = form => form
+static point_conversion_form_t
+parse_point_conversion_form_symbol(VALUE sym)
+{
+    ID id = SYM2ID(sym);
+
+    if (id == ID_uncompressed)
+	return POINT_CONVERSION_UNCOMPRESSED;
+    else if (id == ID_compressed)
+	return POINT_CONVERSION_COMPRESSED;
+    else if (id == ID_hybrid)
+	return POINT_CONVERSION_HYBRID;
+    else
+	ossl_raise(rb_eArgError, "unsupported point conversion form %+"PRIsVALUE
+		   " (expected :compressed, :uncompressed, or :hybrid)", sym);
+}
+
+/*
+ * call-seq:
+ *   group.point_conversion_form = form
+ *
+ * Sets the form how EC::Point data is encoded as ASN.1 as defined in X9.62.
  *
- *  See the OpenSSL documentation for EC_GROUP_set_point_conversion_form()
+ * _format_ can be one of these:
+ *
+ * +:compressed+::
+ *   Encoded as z||x, where z is an octet indicating which solution of the
+ *   equation y is. z will be 0x02 or 0x03.
+ * +:uncompressed+::
+ *   Encoded as z||x||y, where z is an octet 0x04.
+ * +:hybrid+::
+ *   Encodes as z||x||y, where z is an octet indicating which solution of the
+ *   equation y is. z will be 0x06 or 0x07.
+ *
+ * See the OpenSSL documentation for EC_GROUP_set_point_conversion_form()
  */
-static VALUE ossl_ec_group_set_point_conversion_form(VALUE self, VALUE form_v)
+static VALUE
+ossl_ec_group_set_point_conversion_form(VALUE self, VALUE form_v)
 {
-    EC_GROUP *group = NULL;
+    EC_GROUP *group;
     point_conversion_form_t form;
-    ID form_id = SYM2ID(form_v);
-
-    Require_EC_GROUP(self, group);
 
-    if (form_id == ID_uncompressed) {
-        form = POINT_CONVERSION_UNCOMPRESSED;
-    } else if (form_id == ID_compressed) {
-        form = POINT_CONVERSION_COMPRESSED;
-    } else if (form_id == ID_hybrid) {
-        form = POINT_CONVERSION_HYBRID;
-    } else {
-        ossl_raise(rb_eArgError, "form must be :compressed, :uncompressed, or :hybrid");
-    }
+    GetECGroup(self, group);
+    form = parse_point_conversion_form_symbol(form_v);
 
     EC_GROUP_set_point_conversion_form(group, form);
 
     return form_v;
 }
 
-/*  call-seq:
- *     group.seed   => String or nil
+/*
+ * call-seq:
+ *   group.seed   => String or nil
  *
- *  See the OpenSSL documentation for EC_GROUP_get0_seed()
+ * See the OpenSSL documentation for EC_GROUP_get0_seed()
  */
 static VALUE ossl_ec_group_get_seed(VALUE self)
 {
     EC_GROUP *group = NULL;
     size_t seed_len;
 
-    Require_EC_GROUP(self, group);
-
+    GetECGroup(self, group);
     seed_len = EC_GROUP_get_seed_len(group);
 
     if (seed_len == 0)
@@ -1206,16 +1162,17 @@ static VALUE ossl_ec_group_get_seed(VALUE self)
     return rb_str_new((const char *)EC_GROUP_get0_seed(group), seed_len);
 }
 
-/*  call-seq:
- *     group.seed = seed  => seed
+/*
+ * call-seq:
+ *   group.seed = seed  => seed
  *
- *  See the OpenSSL documentation for EC_GROUP_set_seed()
+ * See the OpenSSL documentation for EC_GROUP_set_seed()
  */
 static VALUE ossl_ec_group_set_seed(VALUE self, VALUE seed)
 {
     EC_GROUP *group = NULL;
 
-    Require_EC_GROUP(self, group);
+    GetECGroup(self, group);
     StringValue(seed);
 
     if (EC_GROUP_set_seed(group, (unsigned char *)RSTRING_PTR(seed), RSTRING_LEN(seed)) != (size_t)RSTRING_LEN(seed))
@@ -1226,16 +1183,17 @@ static VALUE ossl_ec_group_set_seed(VALUE self, VALUE seed)
 
 /* get/set curve GFp, GF2m */
 
-/*  call-seq:
- *     group.degree   => Fixnum
+/*
+ * call-seq:
+ *   group.degree   => integer
  *
- *  See the OpenSSL documentation for EC_GROUP_get_degree()
+ * See the OpenSSL documentation for EC_GROUP_get_degree()
  */
 static VALUE ossl_ec_group_get_degree(VALUE self)
 {
     EC_GROUP *group = NULL;
 
-    Require_EC_GROUP(self, group);
+    GetECGroup(self, group);
 
     return INT2NUM(EC_GROUP_get_degree(group));
 }
@@ -1247,7 +1205,7 @@ static VALUE ossl_ec_group_to_string(VALUE self, int format)
     int i = -1;
     VALUE str;
 
-    Get_EC_GROUP(self, group);
+    GetECGroup(self, group);
 
     if (!(out = BIO_new(BIO_s_mem())))
         ossl_raise(eEC_GROUP, "BIO_new(BIO_s_mem())");
@@ -1274,8 +1232,9 @@ static VALUE ossl_ec_group_to_string(VALUE self, int format)
     return str;
 }
 
-/*  call-seq:
- *     group.to_pem   => String
+/*
+ * call-seq:
+ *   group.to_pem   => String
  *
  *  See the OpenSSL documentation for PEM_write_bio_ECPKParameters()
  */
@@ -1284,20 +1243,22 @@ static VALUE ossl_ec_group_to_pem(VALUE self)
     return ossl_ec_group_to_string(self, EXPORT_PEM);
 }
 
-/*  call-seq:
- *     group.to_der   => String
+/*
+ * call-seq:
+ *   group.to_der   => String
  *
- *  See the OpenSSL documentation for i2d_ECPKParameters_bio()
+ * See the OpenSSL documentation for i2d_ECPKParameters_bio()
  */
 static VALUE ossl_ec_group_to_der(VALUE self)
 {
     return ossl_ec_group_to_string(self, EXPORT_DER);
 }
 
-/*  call-seq:
- *     group.to_text   => String
+/*
+ * call-seq:
+ *   group.to_text   => String
  *
- *  See the OpenSSL documentation for ECPKParameters_print()
+ * See the OpenSSL documentation for ECPKParameters_print()
  */
 static VALUE ossl_ec_group_to_text(VALUE self)
 {
@@ -1305,7 +1266,7 @@ static VALUE ossl_ec_group_to_text(VALUE self)
     BIO *out;
     VALUE str;
 
-    Require_EC_GROUP(self, group);
+    GetECGroup(self, group);
     if (!(out = BIO_new(BIO_s_mem()))) {
 	ossl_raise(eEC_GROUP, "BIO_new(BIO_s_mem())");
     }
@@ -1319,107 +1280,103 @@ static VALUE ossl_ec_group_to_text(VALUE self)
 }
 
 
-static void ossl_ec_point_free(void *ptr)
+/*
+ * OpenSSL::PKey::EC::Point
+ */
+static void
+ossl_ec_point_free(void *ptr)
 {
-    ossl_ec_point *ec_point = ptr;
-    if (!ec_point->dont_free && ec_point->point)
-        EC_POINT_clear_free(ec_point->point);
-    ruby_xfree(ec_point);
+    EC_POINT_clear_free(ptr);
 }
 
 static const rb_data_type_t ossl_ec_point_type = {
-    "OpenSSL/ec_point",
+    "OpenSSL/EC_POINT",
     {
 	0, ossl_ec_point_free,
     },
     0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
 };
 
-static VALUE ossl_ec_point_alloc(VALUE klass)
+static VALUE
+ossl_ec_point_alloc(VALUE klass)
 {
-    ossl_ec_point *ec_point;
+    return TypedData_Wrap_Struct(klass, &ossl_ec_point_type, NULL);
+}
+
+static VALUE
+ec_point_new(const EC_POINT *point, const EC_GROUP *group)
+{
+    EC_POINT *point_new;
     VALUE obj;
 
-    obj = TypedData_Make_Struct(klass, ossl_ec_point, &ossl_ec_point_type, ec_point);
+    obj = ossl_ec_point_alloc(cEC_POINT);
+    point_new = EC_POINT_dup(point, group);
+    if (!point_new)
+	ossl_raise(eEC_POINT, "EC_POINT_dup");
+    RTYPEDDATA_DATA(obj) = point_new;
+    rb_ivar_set(obj, id_i_group, ec_group_new(group));
 
     return obj;
 }
 
+static VALUE ossl_ec_point_initialize_copy(VALUE, VALUE);
 /*
- *  call-seq:
- *     OpenSSL::PKey::EC::Point.new(point)
- *     OpenSSL::PKey::EC::Point.new(group)
- *     OpenSSL::PKey::EC::Point.new(group, bn)
+ * call-seq:
+ *   OpenSSL::PKey::EC::Point.new(point)
+ *   OpenSSL::PKey::EC::Point.new(group [, encoded_point])
+ *
+ * Creates a new instance of OpenSSL::PKey::EC::Point. If the only argument is
+ * an instance of EC::Point, a copy is returned. Otherwise, creates a point
+ * that belongs to _group_.
  *
- *  See the OpenSSL documentation for EC_POINT_*
+ * _encoded_point_ is the octet string representation of the point. This
+ * must be either a String or an OpenSSL::BN.
  */
 static VALUE ossl_ec_point_initialize(int argc, VALUE *argv, VALUE self)
 {
-    ossl_ec_point *ec_point;
-    EC_POINT *point = NULL;
-    VALUE arg1, arg2;
-    VALUE group_v = Qnil;
-    const EC_GROUP *group = NULL;
-
-    TypedData_Get_Struct(self, ossl_ec_point, &ossl_ec_point_type, ec_point);
-    if (ec_point->point)
-        ossl_raise(eEC_POINT, "EC_POINT already initialized");
-
-    switch (rb_scan_args(argc, argv, "11", &arg1, &arg2)) {
-    case 1:
-        if (rb_obj_is_kind_of(arg1, cEC_POINT)) {
-            const EC_POINT *arg_point;
-
-            group_v = rb_iv_get(arg1, "@group");
-            SafeRequire_EC_GROUP(group_v, group);
-            SafeRequire_EC_POINT(arg1, arg_point);
-
-            point = EC_POINT_dup(arg_point, group);
-        } else if (rb_obj_is_kind_of(arg1, cEC_GROUP)) {
-            group_v = arg1;
-            SafeRequire_EC_GROUP(group_v, group);
-
-            point = EC_POINT_new(group);
-        } else {
-            ossl_raise(eEC_POINT, "wrong argument type: must be OpenSSL::PKey::EC::Point or OpenSSL::Pkey::EC::Group");
-        }
-
-        break;
-     case 2:
-        if (!rb_obj_is_kind_of(arg1, cEC_GROUP))
-            ossl_raise(rb_eArgError, "1st argument must be OpenSSL::PKey::EC::Group");
-        group_v = arg1;
-        SafeRequire_EC_GROUP(group_v, group);
-
-        if (rb_obj_is_kind_of(arg2, cBN)) {
-            const BIGNUM *bn = GetBNPtr(arg2);
-
-            point = EC_POINT_bn2point(group, bn, NULL, ossl_bn_ctx);
-        } else {
-            BIO *in = ossl_obj2bio(arg1);
-
-/* BUG: finish me */
+    EC_POINT *point;
+    VALUE group_v, arg2;
+    const EC_GROUP *group;
 
-            BIO_free(in);
+    TypedData_Get_Struct(self, EC_POINT, &ossl_ec_point_type, point);
+    if (point)
+	rb_raise(eEC_POINT, "EC_POINT already initialized");
 
-            if (point == NULL) {
-                ossl_raise(eEC_POINT, "unknown type for 2nd arg");
-            }
-        }
-        break;
-    default:
-        ossl_raise(rb_eArgError, "wrong number of arguments");
+    rb_scan_args(argc, argv, "11", &group_v, &arg2);
+    if (rb_obj_is_kind_of(group_v, cEC_POINT)) {
+	if (argc != 1)
+	    rb_raise(rb_eArgError, "invalid second argument");
+	return ossl_ec_point_initialize_copy(self, group_v);
     }
 
-    if (point == NULL)
-        ossl_raise(eEC_POINT, NULL);
-
-    if (NIL_P(group_v))
-        ossl_raise(rb_eRuntimeError, "missing group (internal error)");
-
-    ec_point->point = point;
+    GetECGroup(group_v, group);
+    if (argc == 1) {
+	point = EC_POINT_new(group);
+	if (!point)
+	    ossl_raise(eEC_POINT, "EC_POINT_new");
+    }
+    else {
+	if (rb_obj_is_kind_of(arg2, cBN)) {
+	    point = EC_POINT_bn2point(group, GetBNPtr(arg2), NULL, ossl_bn_ctx);
+	    if (!point)
+		ossl_raise(eEC_POINT, "EC_POINT_bn2point");
+	}
+	else {
+	    StringValue(arg2);
+	    point = EC_POINT_new(group);
+	    if (!point)
+		ossl_raise(eEC_POINT, "EC_POINT_new");
+	    if (!EC_POINT_oct2point(group, point,
+				    (unsigned char *)RSTRING_PTR(arg2),
+				    RSTRING_LEN(arg2), ossl_bn_ctx)) {
+		EC_POINT_free(point);
+		ossl_raise(eEC_POINT, "EC_POINT_oct2point");
+	    }
+	}
+    }
 
-    rb_iv_set(self, "@group", group_v);
+    RTYPEDDATA_DATA(self) = point;
+    rb_ivar_set(self, id_i_group, group_v);
 
     return self;
 }
@@ -1427,47 +1384,45 @@ static VALUE ossl_ec_point_initialize(int argc, VALUE *argv, VALUE self)
 static VALUE
 ossl_ec_point_initialize_copy(VALUE self, VALUE other)
 {
-    ossl_ec_point *ec_point;
-    EC_POINT *orig;
+    EC_POINT *point, *point_new;
     EC_GROUP *group;
     VALUE group_v;
 
-    TypedData_Get_Struct(self, ossl_ec_point, &ossl_ec_point_type, ec_point);
-    if (ec_point->point)
+    TypedData_Get_Struct(self, EC_POINT, &ossl_ec_point_type, point_new);
+    if (point_new)
 	ossl_raise(eEC_POINT, "EC::Point already initialized");
-    SafeRequire_EC_POINT(other, orig);
+    GetECPoint(other, point);
 
-    group_v = rb_obj_dup(rb_iv_get(other, "@group"));
-    SafeRequire_EC_GROUP(group_v, group);
+    group_v = rb_obj_dup(rb_attr_get(other, id_i_group));
+    GetECGroup(group_v, group);
 
-    ec_point->point = EC_POINT_dup(orig, group);
-    if (!ec_point->point)
+    point_new = EC_POINT_dup(point, group);
+    if (!point_new)
 	ossl_raise(eEC_POINT, "EC_POINT_dup");
-    rb_iv_set(self, "@key", Qnil);
-    rb_iv_set(self, "@group", group_v);
+    RTYPEDDATA_DATA(self) = point_new;
+    rb_ivar_set(self, id_i_group, group_v);
 
     return self;
 }
 
 /*
- *  call-seq:
- *     point1.eql?(point2) => true | false
- *     point1 == point2 => true | false
- *
+ * call-seq:
+ *   point1.eql?(point2) => true | false
+ *   point1 == point2 => true | false
  */
 static VALUE ossl_ec_point_eql(VALUE a, VALUE b)
 {
     EC_POINT *point1, *point2;
-    VALUE group_v1 = rb_iv_get(a, "@group");
-    VALUE group_v2 = rb_iv_get(b, "@group");
+    VALUE group_v1 = rb_attr_get(a, id_i_group);
+    VALUE group_v2 = rb_attr_get(b, id_i_group);
     const EC_GROUP *group;
 
     if (ossl_ec_group_eql(group_v1, group_v2) == Qfalse)
         return Qfalse;
 
-    Require_EC_POINT(a, point1);
-    SafeRequire_EC_POINT(b, point2);
-    SafeRequire_EC_GROUP(group_v1, group);
+    GetECPoint(a, point1);
+    GetECPoint(b, point2);
+    GetECGroup(group_v1, group);
 
     if (EC_POINT_cmp(group, point1, point2, ossl_bn_ctx) == 1)
         return Qfalse;
@@ -1476,18 +1431,16 @@ static VALUE ossl_ec_point_eql(VALUE a, VALUE b)
 }
 
 /*
- *  call-seq:
- *     point.infinity? => true | false
- *
+ * call-seq:
+ *   point.infinity? => true | false
  */
 static VALUE ossl_ec_point_is_at_infinity(VALUE self)
 {
     EC_POINT *point;
-    VALUE group_v = rb_iv_get(self, "@group");
     const EC_GROUP *group;
 
-    Require_EC_POINT(self, point);
-    SafeRequire_EC_GROUP(group_v, group);
+    GetECPoint(self, point);
+    GetECPointGroup(self, group);
 
     switch (EC_POINT_is_at_infinity(group, point)) {
     case 1: return Qtrue;
@@ -1499,18 +1452,16 @@ static VALUE ossl_ec_point_is_at_infinity(VALUE self)
 }
 
 /*
- *  call-seq:
- *     point.on_curve? => true | false
- *
+ * call-seq:
+ *   point.on_curve? => true | false
  */
 static VALUE ossl_ec_point_is_on_curve(VALUE self)
 {
     EC_POINT *point;
-    VALUE group_v = rb_iv_get(self, "@group");
     const EC_GROUP *group;
 
-    Require_EC_POINT(self, point);
-    SafeRequire_EC_GROUP(group_v, group);
+    GetECPoint(self, point);
+    GetECPointGroup(self, group);
 
     switch (EC_POINT_is_on_curve(group, point, ossl_bn_ctx)) {
     case 1: return Qtrue;
@@ -1522,18 +1473,16 @@ static VALUE ossl_ec_point_is_on_curve(VALUE self)
 }
 
 /*
- *  call-seq:
- *     point.make_affine! => self
- *
+ * call-seq:
+ *   point.make_affine! => self
  */
 static VALUE ossl_ec_point_make_affine(VALUE self)
 {
     EC_POINT *point;
-    VALUE group_v = rb_iv_get(self, "@group");
     const EC_GROUP *group;
 
-    Require_EC_POINT(self, point);
-    SafeRequire_EC_GROUP(group_v, group);
+    GetECPoint(self, point);
+    GetECPointGroup(self, group);
 
     if (EC_POINT_make_affine(group, point, ossl_bn_ctx) != 1)
         ossl_raise(cEC_POINT, "EC_POINT_make_affine");
@@ -1542,18 +1491,16 @@ static VALUE ossl_ec_point_make_affine(VALUE self)
 }
 
 /*
- *  call-seq:
- *     point.invert! => self
- *
+ * call-seq:
+ *   point.invert! => self
  */
 static VALUE ossl_ec_point_invert(VALUE self)
 {
     EC_POINT *point;
-    VALUE group_v = rb_iv_get(self, "@group");
     const EC_GROUP *group;
 
-    Require_EC_POINT(self, point);
-    SafeRequire_EC_GROUP(group_v, group);
+    GetECPoint(self, point);
+    GetECPointGroup(self, group);
 
     if (EC_POINT_invert(group, point, ossl_bn_ctx) != 1)
         ossl_raise(cEC_POINT, "EC_POINT_invert");
@@ -1562,18 +1509,16 @@ static VALUE ossl_ec_point_invert(VALUE self)
 }
 
 /*
- *  call-seq:
- *     point.set_to_infinity! => self
- *
+ * call-seq:
+ *   point.set_to_infinity! => self
  */
 static VALUE ossl_ec_point_set_to_infinity(VALUE self)
 {
     EC_POINT *point;
-    VALUE group_v = rb_iv_get(self, "@group");
     const EC_GROUP *group;
 
-    Require_EC_POINT(self, point);
-    SafeRequire_EC_GROUP(group_v, group);
+    GetECPoint(self, point);
+    GetECPointGroup(self, group);
 
     if (EC_POINT_set_to_infinity(group, point) != 1)
         ossl_raise(cEC_POINT, "EC_POINT_set_to_infinity");
@@ -1582,48 +1527,83 @@ static VALUE ossl_ec_point_set_to_infinity(VALUE self)
 }
 
 /*
- *  call-seq:
- *     point.to_bn   => OpenSSL::BN
+ * call-seq:
+ *    point.to_octet_string(conversion_form) -> String
+ *
+ * Returns the octet string representation of the elliptic curve point.
  *
- *  See the OpenSSL documentation for EC_POINT_point2bn()
+ * _conversion_form_ specifies how the point is converted. Possible values are:
+ *
+ * - +:compressed+
+ * - +:uncompressed+
+ * - +:hybrid+
  */
-static VALUE ossl_ec_point_to_bn(VALUE self)
+static VALUE
+ossl_ec_point_to_octet_string(VALUE self, VALUE conversion_form)
 {
     EC_POINT *point;
-    VALUE bn_obj;
-    VALUE group_v = rb_iv_get(self, "@group");
     const EC_GROUP *group;
     point_conversion_form_t form;
-    BIGNUM *bn;
+    VALUE str;
+    size_t len;
+
+    GetECPoint(self, point);
+    GetECPointGroup(self, group);
+    form = parse_point_conversion_form_symbol(conversion_form);
+
+    len = EC_POINT_point2oct(group, point, form, NULL, 0, ossl_bn_ctx);
+    if (!len)
+	ossl_raise(eEC_POINT, "EC_POINT_point2oct");
+    str = rb_str_new(NULL, (long)len);
+    if (!EC_POINT_point2oct(group, point, form,
+			    (unsigned char *)RSTRING_PTR(str), len,
+			    ossl_bn_ctx))
+	ossl_raise(eEC_POINT, "EC_POINT_point2oct");
+    return str;
+}
 
-    Require_EC_POINT(self, point);
-    SafeRequire_EC_GROUP(group_v, group);
+/*
+ * call-seq:
+ *   point.add(point) => point
+ *
+ * Performs elliptic curve point addition.
+ */
+static VALUE ossl_ec_point_add(VALUE self, VALUE other)
+{
+    EC_POINT *point_self, *point_other, *point_result;
+    const EC_GROUP *group;
+    VALUE group_v = rb_attr_get(self, id_i_group);
+    VALUE result;
 
-    form = EC_GROUP_get_point_conversion_form(group);
+    GetECPoint(self, point_self);
+    GetECPoint(other, point_other);
+    GetECGroup(group_v, group);
 
-    bn_obj = rb_obj_alloc(cBN);
-    bn = GetBNPtr(bn_obj);
+    result = rb_obj_alloc(cEC_POINT);
+    ossl_ec_point_initialize(1, &group_v, result);
+    GetECPoint(result, point_result);
 
-    if (EC_POINT_point2bn(group, point, form, bn, ossl_bn_ctx) == NULL)
-        ossl_raise(eEC_POINT, "EC_POINT_point2bn");
+    if (EC_POINT_add(group, point_result, point_self, point_other, ossl_bn_ctx) != 1) {
+        ossl_raise(eEC_POINT, "EC_POINT_add");
+    }
 
-    return bn_obj;
+    return result;
 }
 
 /*
- *  call-seq:
- *     point.mul(bn1 [, bn2]) => point
- *     point.mul(bns, points [, bn2]) => point
+ * call-seq:
+ *   point.mul(bn1 [, bn2]) => point
+ *   point.mul(bns, points [, bn2]) => point
  *
  * Performs elliptic curve point multiplication.
  *
  * The first form calculates <tt>bn1 * point + bn2 * G</tt>, where +G+ is the
- * generator of the group of +point+. +bn2+ may be ommitted, and in that case,
+ * generator of the group of _point_. _bn2_ may be omitted, and in that case,
  * the result is just <tt>bn1 * point</tt>.
  *
  * The second form calculates <tt>bns[0] * point + bns[1] * points[0] + ...
- * + bns[-1] * points[-1] + bn2 * G</tt>. +bn2+ may be ommitted. +bns+ must be
- * an array of OpenSSL::BN. +points+ must be an array of
+ * + bns[-1] * points[-1] + bn2 * G</tt>. _bn2_ may be omitted. _bns_ must be
+ * an array of OpenSSL::BN. _points_ must be an array of
  * OpenSSL::PKey::EC::Point. Please note that <tt>points[0]</tt> is not
  * multiplied by <tt>bns[0]</tt>, but <tt>bns[1]</tt>.
  */
@@ -1631,23 +1611,23 @@ static VALUE ossl_ec_point_mul(int argc, VALUE *argv, VALUE self)
 {
     EC_POINT *point_self, *point_result;
     const EC_GROUP *group;
-    VALUE group_v = rb_iv_get(self, "@group");
+    VALUE group_v = rb_attr_get(self, id_i_group);
     VALUE arg1, arg2, arg3, result;
     const BIGNUM *bn_g = NULL;
 
-    Require_EC_POINT(self, point_self);
-    SafeRequire_EC_GROUP(group_v, group);
+    GetECPoint(self, point_self);
+    GetECGroup(group_v, group);
 
     result = rb_obj_alloc(cEC_POINT);
     ossl_ec_point_initialize(1, &group_v, result);
-    Require_EC_POINT(result, point_result);
+    GetECPoint(result, point_result);
 
     rb_scan_args(argc, argv, "12", &arg1, &arg2, &arg3);
-    if (rb_obj_is_kind_of(arg1, cBN)) {
+    if (!RB_TYPE_P(arg1, T_ARRAY)) {
 	BIGNUM *bn = GetBNPtr(arg1);
-	if (argc >= 2)
-	    bn_g = GetBNPtr(arg2);
 
+	if (!NIL_P(arg2))
+	    bn_g = GetBNPtr(arg2);
 	if (EC_POINT_mul(group, point_result, bn_g, point_self, bn, ossl_bn_ctx) != 1)
 	    ossl_raise(eEC_POINT, NULL);
     } else {
@@ -1656,27 +1636,30 @@ static VALUE ossl_ec_point_mul(int argc, VALUE *argv, VALUE self)
 	 * points  | self    | arg2[0] | arg2[1] | ...
 	 */
 	long i, num;
-	VALUE tmp_p, tmp_b;
+	VALUE bns_tmp, tmp_p, tmp_b;
 	const EC_POINT **points;
 	const BIGNUM **bignums;
 
-	if (!rb_obj_is_kind_of(arg1, rb_cArray) ||
-	    !rb_obj_is_kind_of(arg2, rb_cArray))
-	    ossl_raise(rb_eTypeError, "points must be array");
+	Check_Type(arg1, T_ARRAY);
+	Check_Type(arg2, T_ARRAY);
 	if (RARRAY_LEN(arg1) != RARRAY_LEN(arg2) + 1) /* arg2 must be 1 larger */
 	    ossl_raise(rb_eArgError, "bns must be 1 longer than points; see the documentation");
 
 	num = RARRAY_LEN(arg1);
+	bns_tmp = rb_ary_tmp_new(num);
 	bignums = ALLOCV_N(const BIGNUM *, tmp_b, num);
-	for (i = 0; i < num; i++)
-	    bignums[i] = GetBNPtr(RARRAY_AREF(arg1, i));
+	for (i = 0; i < num; i++) {
+	    VALUE item = RARRAY_AREF(arg1, i);
+	    bignums[i] = GetBNPtr(item);
+	    rb_ary_push(bns_tmp, item);
+	}
 
 	points = ALLOCV_N(const EC_POINT *, tmp_p, num);
 	points[0] = point_self; /* self */
 	for (i = 0; i < num - 1; i++)
-	    SafeRequire_EC_POINT(RARRAY_AREF(arg2, i), points[i + 1]);
+	    GetECPoint(RARRAY_AREF(arg2, i), points[i + 1]);
 
-	if (argc >= 3)
+	if (!NIL_P(arg3))
 	    bn_g = GetBNPtr(arg3);
 
 	if (EC_POINTs_mul(group, point_result, bn_g, num, points, bignums, ossl_bn_ctx) != 1) {
@@ -1694,13 +1677,31 @@ static VALUE ossl_ec_point_mul(int argc, VALUE *argv, VALUE self)
 
 void Init_ossl_ec(void)
 {
-#ifdef DONT_NEED_RDOC_WORKAROUND
-    mOSSL = rb_define_module("OpenSSL");
+#undef rb_intern
+#if 0
     mPKey = rb_define_module_under(mOSSL, "PKey");
+    cPKey = rb_define_class_under(mPKey, "PKey", rb_cObject);
+    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
+    ePKeyError = rb_define_class_under(mPKey, "PKeyError", eOSSLError);
 #endif
 
     eECError = rb_define_class_under(mPKey, "ECError", ePKeyError);
 
+    /*
+     * Document-class: OpenSSL::PKey::EC
+     *
+     * OpenSSL::PKey::EC provides access to Elliptic Curve Digital Signature
+     * Algorithm (ECDSA) and Elliptic Curve Diffie-Hellman (ECDH).
+     *
+     * === Key exchange
+     *   ec1 = OpenSSL::PKey::EC.generate("prime256v1")
+     *   ec2 = OpenSSL::PKey::EC.generate("prime256v1")
+     *   # ec1 and ec2 have own private key respectively
+     *   shared_key1 = ec1.dh_compute_key(ec2.public_key)
+     *   shared_key2 = ec2.dh_compute_key(ec1.public_key)
+     *
+     *   p shared_key1 == shared_key2 #=> true
+     */
     cEC = rb_define_class_under(mPKey, "EC", cPKey);
     cEC_GROUP = rb_define_class_under(cEC, "Group", rb_cObject);
     cEC_POINT = rb_define_class_under(cEC, "Point", rb_cObject);
@@ -1718,13 +1719,16 @@ void Init_ossl_ec(void)
     ID_compressed = rb_intern("compressed");
     ID_hybrid = rb_intern("hybrid");
 
-    rb_define_const(cEC, "NAMED_CURVE", ULONG2NUM(OPENSSL_EC_NAMED_CURVE));
+    rb_define_const(cEC, "NAMED_CURVE", INT2NUM(OPENSSL_EC_NAMED_CURVE));
+#if defined(OPENSSL_EC_EXPLICIT_CURVE)
+    rb_define_const(cEC, "EXPLICIT_CURVE", INT2NUM(OPENSSL_EC_EXPLICIT_CURVE));
+#endif
 
     rb_define_singleton_method(cEC, "builtin_curves", ossl_s_builtin_curves, 0);
 
     rb_define_singleton_method(cEC, "generate", ossl_ec_key_s_generate, 1);
     rb_define_method(cEC, "initialize", ossl_ec_key_initialize, -1);
-    rb_define_copy_func(cEC, ossl_ec_key_initialize_copy);
+    rb_define_method(cEC, "initialize_copy", ossl_ec_key_initialize_copy, 1);
 /* copy/dup/cmp */
 
     rb_define_method(cEC, "group", ossl_ec_key_get_group, 0);
@@ -1761,7 +1765,7 @@ void Init_ossl_ec(void)
 
     rb_define_alloc_func(cEC_GROUP, ossl_ec_group_alloc);
     rb_define_method(cEC_GROUP, "initialize", ossl_ec_group_initialize, -1);
-    rb_define_copy_func(cEC_GROUP, ossl_ec_group_initialize_copy);
+    rb_define_method(cEC_GROUP, "initialize_copy", ossl_ec_group_initialize_copy, 1);
     rb_define_method(cEC_GROUP, "eql?", ossl_ec_group_eql, 1);
     rb_define_alias(cEC_GROUP, "==", "eql?");
 /* copy/dup/cmp */
@@ -1797,7 +1801,7 @@ void Init_ossl_ec(void)
 
     rb_define_alloc_func(cEC_POINT, ossl_ec_point_alloc);
     rb_define_method(cEC_POINT, "initialize", ossl_ec_point_initialize, -1);
-    rb_define_copy_func(cEC_POINT, ossl_ec_point_initialize_copy);
+    rb_define_method(cEC_POINT, "initialize_copy", ossl_ec_point_initialize_copy, 1);
     rb_attr(cEC_POINT, rb_intern("group"), 1, 0, 0);
     rb_define_method(cEC_POINT, "eql?", ossl_ec_point_eql, 1);
     rb_define_alias(cEC_POINT, "==", "eql?");
@@ -1809,8 +1813,11 @@ void Init_ossl_ec(void)
     rb_define_method(cEC_POINT, "set_to_infinity!", ossl_ec_point_set_to_infinity, 0);
 /* all the other methods */
 
-    rb_define_method(cEC_POINT, "to_bn", ossl_ec_point_to_bn, 0);
+    rb_define_method(cEC_POINT, "to_octet_string", ossl_ec_point_to_octet_string, 1);
+    rb_define_method(cEC_POINT, "add", ossl_ec_point_add, 1);
     rb_define_method(cEC_POINT, "mul", ossl_ec_point_mul, -1);
+
+    id_i_group = rb_intern("@group");
 }
 
 #else /* defined NO_EC */
diff --git a/ext/openssl/ossl_pkey_rsa.c b/ext/openssl/ossl_pkey_rsa.c
index 2326a70f30..761866c66a 100644
--- a/ext/openssl/ossl_pkey_rsa.c
+++ b/ext/openssl/ossl_pkey_rsa.c
@@ -26,10 +26,10 @@
 static inline int
 RSA_HAS_PRIVATE(RSA *rsa)
 {
-    const BIGNUM *p, *q;
+    const BIGNUM *e, *d;
 
-    RSA_get0_factors(rsa, &p, &q);
-    return p && q; /* d? why? */
+    RSA_get0_key(rsa, NULL, &e, &d);
+    return e && d;
 }
 
 static inline int
@@ -172,8 +172,8 @@ rsa_generate(int size, unsigned long exp)
  *   RSA.generate(size)           => RSA instance
  *   RSA.generate(size, exponent) => RSA instance
  *
- * Generates an RSA keypair.  +size+ is an integer representing the desired key
- * size.  Keys smaller than 1024 should be considered insecure.  +exponent+ is
+ * Generates an RSA keypair.  _size_ is an integer representing the desired key
+ * size.  Keys smaller than 1024 should be considered insecure.  _exponent_ is
  * an odd number normally 3, 17, or 65537.
  */
 static VALUE
@@ -203,12 +203,12 @@ ossl_rsa_s_generate(int argc, VALUE *argv, VALUE klass)
  *   RSA.new(encoded_key)              => RSA instance
  *   RSA.new(encoded_key, pass_phrase) => RSA instance
  *
- * Generates or loads an RSA keypair.  If an integer +key_size+ is given it
+ * Generates or loads an RSA keypair.  If an integer _key_size_ is given it
  * represents the desired key size.  Keys less than 1024 bits should be
  * considered insecure.
  *
- * A key can instead be loaded from an +encoded_key+ which must be PEM or DER
- * encoded.  A +pass_phrase+ can be used to decrypt the key.  If none is given
+ * A key can instead be loaded from an _encoded_key_ which must be PEM or DER
+ * encoded.  A _pass_phrase_ can be used to decrypt the key.  If none is given
  * OpenSSL will prompt for the pass phrase.
  *
  * = Examples
@@ -229,14 +229,14 @@ ossl_rsa_initialize(int argc, VALUE *argv, VALUE self)
     if(rb_scan_args(argc, argv, "02", &arg, &pass) == 0) {
 	rsa = RSA_new();
     }
-    else if (FIXNUM_P(arg)) {
-	rsa = rsa_generate(FIX2INT(arg), NIL_P(pass) ? RSA_F4 : NUM2ULONG(pass));
+    else if (RB_INTEGER_TYPE_P(arg)) {
+	rsa = rsa_generate(NUM2INT(arg), NIL_P(pass) ? RSA_F4 : NUM2ULONG(pass));
 	if (!rsa) ossl_raise(eRSAError, NULL);
     }
     else {
 	pass = ossl_pem_passwd_value(pass);
 	arg = ossl_to_der_if_possible(arg);
-	in = ossl_obj2bio(arg);
+	in = ossl_obj2bio(&arg);
 	rsa = PEM_read_bio_RSAPrivateKey(in, NULL, ossl_pem_passwd_cb, (void *)pass);
 	if (!rsa) {
 	    OSSL_BIO_reset(in);
@@ -295,7 +295,7 @@ ossl_rsa_initialize_copy(VALUE self, VALUE other)
  * call-seq:
  *   rsa.public? => true
  *
- * The return value is always true since every private key is also a public
+ * The return value is always +true+ since every private key is also a public
  * key.
  */
 static VALUE
@@ -333,14 +333,15 @@ ossl_rsa_is_private(VALUE self)
  *   rsa.to_pem([cipher, pass_phrase]) => PEM-format String
  *   rsa.to_s([cipher, pass_phrase]) => PEM-format String
  *
- * Outputs this keypair in PEM encoding.  If +cipher+ and +pass_phrase+ are
- * given they will be used to encrypt the key.  +cipher+ must be an
- * OpenSSL::Cipher::Cipher instance.
+ * Outputs this keypair in PEM encoding.  If _cipher_ and _pass_phrase_ are
+ * given they will be used to encrypt the key.  _cipher_ must be an
+ * OpenSSL::Cipher instance.
  */
 static VALUE
 ossl_rsa_export(int argc, VALUE *argv, VALUE self)
 {
     RSA *rsa;
+    const BIGNUM *n, *e, *d, *p, *q, *dmp1, *dmq1, *iqmp;
     BIO *out;
     const EVP_CIPHER *ciph = NULL;
     VALUE cipher, pass, str;
@@ -350,13 +351,16 @@ ossl_rsa_export(int argc, VALUE *argv, VALUE self)
     rb_scan_args(argc, argv, "02", &cipher, &pass);
 
     if (!NIL_P(cipher)) {
-	ciph = GetCipherPtr(cipher);
+	ciph = ossl_evp_get_cipherbyname(cipher);
 	pass = ossl_pem_passwd_value(pass);
     }
     if (!(out = BIO_new(BIO_s_mem()))) {
 	ossl_raise(eRSAError, NULL);
     }
-    if (RSA_HAS_PRIVATE(rsa)) {
+    RSA_get0_key(rsa, &n, &e, &d);
+    RSA_get0_factors(rsa, &p, &q);
+    RSA_get0_crt_params(rsa, &dmp1, &dmq1, &iqmp);
+    if (n && e && d && p && q && dmp1 && dmq1 && iqmp) {
 	if (!PEM_write_bio_RSAPrivateKey(out, rsa, ciph, NULL, 0,
 					 ossl_pem_passwd_cb, (void *)pass)) {
 	    BIO_free(out);
@@ -383,35 +387,37 @@ static VALUE
 ossl_rsa_to_der(VALUE self)
 {
     RSA *rsa;
-    int (*i2d_func)_((const RSA*, unsigned char**));
-    unsigned char *p;
+    const BIGNUM *n, *e, *d, *p, *q, *dmp1, *dmq1, *iqmp;
+    int (*i2d_func)(const RSA *, unsigned char **);
+    unsigned char *ptr;
     long len;
     VALUE str;
 
     GetRSA(self, rsa);
-    if (RSA_HAS_PRIVATE(rsa))
+    RSA_get0_key(rsa, &n, &e, &d);
+    RSA_get0_factors(rsa, &p, &q);
+    RSA_get0_crt_params(rsa, &dmp1, &dmq1, &iqmp);
+    if (n && e && d && p && q && dmp1 && dmq1 && iqmp)
 	i2d_func = i2d_RSAPrivateKey;
     else
-	i2d_func = (int (*)(const RSA*, unsigned char**))i2d_RSA_PUBKEY;
+	i2d_func = (int (*)(const RSA *, unsigned char **))i2d_RSA_PUBKEY;
     if((len = i2d_func(rsa, NULL)) <= 0)
 	ossl_raise(eRSAError, NULL);
     str = rb_str_new(0, len);
-    p = (unsigned char *)RSTRING_PTR(str);
-    if(i2d_func(rsa, &p) < 0)
+    ptr = (unsigned char *)RSTRING_PTR(str);
+    if(i2d_func(rsa, &ptr) < 0)
 	ossl_raise(eRSAError, NULL);
-    ossl_str_adjust(str, p);
+    ossl_str_adjust(str, ptr);
 
     return str;
 }
 
-#define ossl_rsa_buf_size(rsa) (RSA_size(rsa)+16)
-
 /*
  * call-seq:
  *   rsa.public_encrypt(string)          => String
  *   rsa.public_encrypt(string, padding) => String
  *
- * Encrypt +string+ with the public key.  +padding+ defaults to PKCS1_PADDING.
+ * Encrypt _string_ with the public key.  _padding_ defaults to PKCS1_PADDING.
  * The encrypted string output can be decrypted using #private_decrypt.
  */
 static VALUE
@@ -429,7 +435,7 @@ ossl_rsa_public_encrypt(int argc, VALUE *argv, VALUE self)
     rb_scan_args(argc, argv, "11", &buffer, &padding);
     pad = (argc == 1) ? RSA_PKCS1_PADDING : NUM2INT(padding);
     StringValue(buffer);
-    str = rb_str_new(0, ossl_rsa_buf_size(rsa));
+    str = rb_str_new(0, RSA_size(rsa));
     buf_len = RSA_public_encrypt(RSTRING_LENINT(buffer), (unsigned char *)RSTRING_PTR(buffer),
 				 (unsigned char *)RSTRING_PTR(str), rsa, pad);
     if (buf_len < 0) ossl_raise(eRSAError, NULL);
@@ -443,8 +449,8 @@ ossl_rsa_public_encrypt(int argc, VALUE *argv, VALUE self)
  *   rsa.public_decrypt(string)          => String
  *   rsa.public_decrypt(string, padding) => String
  *
- * Decrypt +string+, which has been encrypted with the private key, with the
- * public key.  +padding+ defaults to PKCS1_PADDING.
+ * Decrypt _string_, which has been encrypted with the private key, with the
+ * public key.  _padding_ defaults to PKCS1_PADDING.
  */
 static VALUE
 ossl_rsa_public_decrypt(int argc, VALUE *argv, VALUE self)
@@ -461,7 +467,7 @@ ossl_rsa_public_decrypt(int argc, VALUE *argv, VALUE self)
     rb_scan_args(argc, argv, "11", &buffer, &padding);
     pad = (argc == 1) ? RSA_PKCS1_PADDING : NUM2INT(padding);
     StringValue(buffer);
-    str = rb_str_new(0, ossl_rsa_buf_size(rsa));
+    str = rb_str_new(0, RSA_size(rsa));
     buf_len = RSA_public_decrypt(RSTRING_LENINT(buffer), (unsigned char *)RSTRING_PTR(buffer),
 				 (unsigned char *)RSTRING_PTR(str), rsa, pad);
     if (buf_len < 0) ossl_raise(eRSAError, NULL);
@@ -475,7 +481,7 @@ ossl_rsa_public_decrypt(int argc, VALUE *argv, VALUE self)
  *   rsa.private_encrypt(string)          => String
  *   rsa.private_encrypt(string, padding) => String
  *
- * Encrypt +string+ with the private key.  +padding+ defaults to PKCS1_PADDING.
+ * Encrypt _string_ with the private key.  _padding_ defaults to PKCS1_PADDING.
  * The encrypted string output can be decrypted using #public_decrypt.
  */
 static VALUE
@@ -495,7 +501,7 @@ ossl_rsa_private_encrypt(int argc, VALUE *argv, VALUE self)
     rb_scan_args(argc, argv, "11", &buffer, &padding);
     pad = (argc == 1) ? RSA_PKCS1_PADDING : NUM2INT(padding);
     StringValue(buffer);
-    str = rb_str_new(0, ossl_rsa_buf_size(rsa));
+    str = rb_str_new(0, RSA_size(rsa));
     buf_len = RSA_private_encrypt(RSTRING_LENINT(buffer), (unsigned char *)RSTRING_PTR(buffer),
 				  (unsigned char *)RSTRING_PTR(str), rsa, pad);
     if (buf_len < 0) ossl_raise(eRSAError, NULL);
@@ -509,8 +515,8 @@ ossl_rsa_private_encrypt(int argc, VALUE *argv, VALUE self)
  *   rsa.private_decrypt(string)          => String
  *   rsa.private_decrypt(string, padding) => String
  *
- * Decrypt +string+, which has been encrypted with the public key, with the
- * private key.  +padding+ defaults to PKCS1_PADDING.
+ * Decrypt _string_, which has been encrypted with the public key, with the
+ * private key.  _padding_ defaults to PKCS1_PADDING.
  */
 static VALUE
 ossl_rsa_private_decrypt(int argc, VALUE *argv, VALUE self)
@@ -529,7 +535,7 @@ ossl_rsa_private_decrypt(int argc, VALUE *argv, VALUE self)
     rb_scan_args(argc, argv, "11", &buffer, &padding);
     pad = (argc == 1) ? RSA_PKCS1_PADDING : NUM2INT(padding);
     StringValue(buffer);
-    str = rb_str_new(0, ossl_rsa_buf_size(rsa));
+    str = rb_str_new(0, RSA_size(rsa));
     buf_len = RSA_private_decrypt(RSTRING_LENINT(buffer), (unsigned char *)RSTRING_PTR(buffer),
 				  (unsigned char *)RSTRING_PTR(str), rsa, pad);
     if (buf_len < 0) ossl_raise(eRSAError, NULL);
@@ -540,6 +546,196 @@ ossl_rsa_private_decrypt(int argc, VALUE *argv, VALUE self)
 
 /*
  * call-seq:
+ *    rsa.sign_pss(digest, data, salt_length:, mgf1_hash:) -> String
+ *
+ * Signs _data_ using the Probabilistic Signature Scheme (RSA-PSS) and returns
+ * the calculated signature.
+ *
+ * RSAError will be raised if an error occurs.
+ *
+ * See #verify_pss for the verification operation.
+ *
+ * === Parameters
+ * _digest_::
+ *   A String containing the message digest algorithm name.
+ * _data_::
+ *   A String. The data to be signed.
+ * _salt_length_::
+ *   The length in octets of the salt. Two special values are reserved:
+ *   +:digest+ means the digest length, and +:max+ means the maximum possible
+ *   length for the combination of the private key and the selected message
+ *   digest algorithm.
+ * _mgf1_hash_::
+ *   The hash algorithm used in MGF1 (the currently supported mask generation
+ *   function (MGF)).
+ *
+ * === Example
+ *   data = "Sign me!"
+ *   pkey = OpenSSL::PKey::RSA.new(2048)
+ *   signature = pkey.sign_pss("SHA256", data, salt_length: :max, mgf1_hash: "SHA256")
+ *   pub_key = pkey.public_key
+ *   puts pub_key.verify_pss("SHA256", signature, data,
+ *                           salt_length: :auto, mgf1_hash: "SHA256") # => true
+ */
+static VALUE
+ossl_rsa_sign_pss(int argc, VALUE *argv, VALUE self)
+{
+    VALUE digest, data, options, kwargs[2], signature;
+    static ID kwargs_ids[2];
+    EVP_PKEY *pkey;
+    EVP_PKEY_CTX *pkey_ctx;
+    const EVP_MD *md, *mgf1md;
+    EVP_MD_CTX *md_ctx;
+    size_t buf_len;
+    int salt_len;
+
+    if (!kwargs_ids[0]) {
+	kwargs_ids[0] = rb_intern_const("salt_length");
+	kwargs_ids[1] = rb_intern_const("mgf1_hash");
+    }
+    rb_scan_args(argc, argv, "2:", &digest, &data, &options);
+    rb_get_kwargs(options, kwargs_ids, 2, 0, kwargs);
+    if (kwargs[0] == ID2SYM(rb_intern("max")))
+	salt_len = -2; /* RSA_PSS_SALTLEN_MAX_SIGN */
+    else if (kwargs[0] == ID2SYM(rb_intern("digest")))
+	salt_len = -1; /* RSA_PSS_SALTLEN_DIGEST */
+    else
+	salt_len = NUM2INT(kwargs[0]);
+    mgf1md = ossl_evp_get_digestbyname(kwargs[1]);
+
+    pkey = GetPrivPKeyPtr(self);
+    buf_len = EVP_PKEY_size(pkey);
+    md = ossl_evp_get_digestbyname(digest);
+    StringValue(data);
+    signature = rb_str_new(NULL, (long)buf_len);
+
+    md_ctx = EVP_MD_CTX_new();
+    if (!md_ctx)
+	goto err;
+
+    if (EVP_DigestSignInit(md_ctx, &pkey_ctx, md, NULL, pkey) != 1)
+	goto err;
+
+    if (EVP_PKEY_CTX_set_rsa_padding(pkey_ctx, RSA_PKCS1_PSS_PADDING) != 1)
+	goto err;
+
+    if (EVP_PKEY_CTX_set_rsa_pss_saltlen(pkey_ctx, salt_len) != 1)
+	goto err;
+
+    if (EVP_PKEY_CTX_set_rsa_mgf1_md(pkey_ctx, mgf1md) != 1)
+	goto err;
+
+    if (EVP_DigestSignUpdate(md_ctx, RSTRING_PTR(data), RSTRING_LEN(data)) != 1)
+	goto err;
+
+    if (EVP_DigestSignFinal(md_ctx, (unsigned char *)RSTRING_PTR(signature), &buf_len) != 1)
+	goto err;
+
+    rb_str_set_len(signature, (long)buf_len);
+
+    EVP_MD_CTX_free(md_ctx);
+    return signature;
+
+  err:
+    EVP_MD_CTX_free(md_ctx);
+    ossl_raise(eRSAError, NULL);
+}
+
+/*
+ * call-seq:
+ *    rsa.verify_pss(digest, signature, data, salt_length:, mgf1_hash:) -> true | false
+ *
+ * Verifies _data_ using the Probabilistic Signature Scheme (RSA-PSS).
+ *
+ * The return value is +true+ if the signature is valid, +false+ otherwise.
+ * RSAError will be raised if an error occurs.
+ *
+ * See #sign_pss for the signing operation and an example code.
+ *
+ * === Parameters
+ * _digest_::
+ *   A String containing the message digest algorithm name.
+ * _data_::
+ *   A String. The data to be signed.
+ * _salt_length_::
+ *   The length in octets of the salt. Two special values are reserved:
+ *   +:digest+ means the digest length, and +:auto+ means automatically
+ *   determining the length based on the signature.
+ * _mgf1_hash_::
+ *   The hash algorithm used in MGF1.
+ */
+static VALUE
+ossl_rsa_verify_pss(int argc, VALUE *argv, VALUE self)
+{
+    VALUE digest, signature, data, options, kwargs[2];
+    static ID kwargs_ids[2];
+    EVP_PKEY *pkey;
+    EVP_PKEY_CTX *pkey_ctx;
+    const EVP_MD *md, *mgf1md;
+    EVP_MD_CTX *md_ctx;
+    int result, salt_len;
+
+    if (!kwargs_ids[0]) {
+	kwargs_ids[0] = rb_intern_const("salt_length");
+	kwargs_ids[1] = rb_intern_const("mgf1_hash");
+    }
+    rb_scan_args(argc, argv, "3:", &digest, &signature, &data, &options);
+    rb_get_kwargs(options, kwargs_ids, 2, 0, kwargs);
+    if (kwargs[0] == ID2SYM(rb_intern("auto")))
+	salt_len = -2; /* RSA_PSS_SALTLEN_AUTO */
+    else if (kwargs[0] == ID2SYM(rb_intern("digest")))
+	salt_len = -1; /* RSA_PSS_SALTLEN_DIGEST */
+    else
+	salt_len = NUM2INT(kwargs[0]);
+    mgf1md = ossl_evp_get_digestbyname(kwargs[1]);
+
+    GetPKey(self, pkey);
+    md = ossl_evp_get_digestbyname(digest);
+    StringValue(signature);
+    StringValue(data);
+
+    md_ctx = EVP_MD_CTX_new();
+    if (!md_ctx)
+	goto err;
+
+    if (EVP_DigestVerifyInit(md_ctx, &pkey_ctx, md, NULL, pkey) != 1)
+	goto err;
+
+    if (EVP_PKEY_CTX_set_rsa_padding(pkey_ctx, RSA_PKCS1_PSS_PADDING) != 1)
+	goto err;
+
+    if (EVP_PKEY_CTX_set_rsa_pss_saltlen(pkey_ctx, salt_len) != 1)
+	goto err;
+
+    if (EVP_PKEY_CTX_set_rsa_mgf1_md(pkey_ctx, mgf1md) != 1)
+	goto err;
+
+    if (EVP_DigestVerifyUpdate(md_ctx, RSTRING_PTR(data), RSTRING_LEN(data)) != 1)
+	goto err;
+
+    result = EVP_DigestVerifyFinal(md_ctx,
+				   (unsigned char *)RSTRING_PTR(signature),
+				   RSTRING_LEN(signature));
+
+    switch (result) {
+      case 0:
+	ossl_clear_error();
+	EVP_MD_CTX_free(md_ctx);
+	return Qfalse;
+      case 1:
+	EVP_MD_CTX_free(md_ctx);
+	return Qtrue;
+      default:
+	goto err;
+    }
+
+  err:
+    EVP_MD_CTX_free(md_ctx);
+    ossl_raise(eRSAError, NULL);
+}
+
+/*
+ * call-seq:
  *   rsa.params => hash
  *
  * THIS METHOD IS INSECURE, PRIVATE INFORMATION CAN LEAK OUT!!!
@@ -620,7 +816,7 @@ ossl_rsa_to_public_key(VALUE self)
     GetPKeyRSA(self, pkey);
     /* err check performed by rsa_instance */
     rsa = RSAPublicKey_dup(EVP_PKEY_get0_RSA(pkey));
-    obj = rsa_instance(CLASS_OF(self), rsa);
+    obj = rsa_instance(rb_obj_class(self), rsa);
     if (obj == Qfalse) {
 	RSA_free(rsa);
 	ossl_raise(eRSAError, NULL);
@@ -656,21 +852,45 @@ ossl_rsa_blinding_off(VALUE self)
 }
  */
 
-OSSL_PKEY_BN_DEF3(rsa, RSA, key, n, e, d);
-OSSL_PKEY_BN_DEF2(rsa, RSA, factors, p, q);
-OSSL_PKEY_BN_DEF3(rsa, RSA, crt_params, dmp1, dmq1, iqmp);
+/*
+ * Document-method: OpenSSL::PKey::RSA#set_key
+ * call-seq:
+ *   rsa.set_key(n, e, d) -> self
+ *
+ * Sets _n_, _e_, _d_ for the RSA instance.
+ */
+OSSL_PKEY_BN_DEF3(rsa, RSA, key, n, e, d)
+/*
+ * Document-method: OpenSSL::PKey::RSA#set_factors
+ * call-seq:
+ *   rsa.set_factors(p, q) -> self
+ *
+ * Sets _p_, _q_ for the RSA instance.
+ */
+OSSL_PKEY_BN_DEF2(rsa, RSA, factors, p, q)
+/*
+ * Document-method: OpenSSL::PKey::RSA#set_crt_params
+ * call-seq:
+ *   rsa.set_crt_params(dmp1, dmq1, iqmp) -> self
+ *
+ * Sets _dmp1_, _dmq1_, _iqmp_ for the RSA instance. They are calculated by
+ * <tt>d mod (p - 1)</tt>, <tt>d mod (q - 1)</tt> and <tt>q^(-1) mod p</tt>
+ * respectively.
+ */
+OSSL_PKEY_BN_DEF3(rsa, RSA, crt_params, dmp1, dmq1, iqmp)
 
 /*
  * INIT
  */
-#define DefRSAConst(x) rb_define_const(cRSA, #x,INT2FIX(RSA_##x))
+#define DefRSAConst(x) rb_define_const(cRSA, #x, INT2NUM(RSA_##x))
 
 void
 Init_ossl_rsa(void)
 {
 #if 0
-    mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL and mPKey */
     mPKey = rb_define_module_under(mOSSL, "PKey");
+    cPKey = rb_define_class_under(mPKey, "PKey", rb_cObject);
+    ePKeyError = rb_define_class_under(mPKey, "PKeyError", eOSSLError);
 #endif
 
     /* Document-class: OpenSSL::PKey::RSAError
@@ -684,7 +904,7 @@ Init_ossl_rsa(void)
     /* Document-class: OpenSSL::PKey::RSA
      *
      * RSA is an asymmetric public key algorithm that has been formalized in
-     * RFC 3447. It is in widespread use in public key infrastuctures (PKI)
+     * RFC 3447. It is in widespread use in public key infrastructures (PKI)
      * where certificates (cf. OpenSSL::X509::Certificate) often are issued
      * on the basis of a public/private RSA key pair. RSA is used in a wide
      * field of applications such as secure (symmetric) key exchange, e.g.
@@ -695,7 +915,7 @@ Init_ossl_rsa(void)
 
     rb_define_singleton_method(cRSA, "generate", ossl_rsa_s_generate, -1);
     rb_define_method(cRSA, "initialize", ossl_rsa_initialize, -1);
-    rb_define_copy_func(cRSA, ossl_rsa_initialize_copy);
+    rb_define_method(cRSA, "initialize_copy", ossl_rsa_initialize_copy, 1);
 
     rb_define_method(cRSA, "public?", ossl_rsa_is_public, 0);
     rb_define_method(cRSA, "private?", ossl_rsa_is_private, 0);
@@ -709,6 +929,8 @@ Init_ossl_rsa(void)
     rb_define_method(cRSA, "public_decrypt", ossl_rsa_public_decrypt, -1);
     rb_define_method(cRSA, "private_encrypt", ossl_rsa_private_encrypt, -1);
     rb_define_method(cRSA, "private_decrypt", ossl_rsa_private_decrypt, -1);
+    rb_define_method(cRSA, "sign_pss", ossl_rsa_sign_pss, -1);
+    rb_define_method(cRSA, "verify_pss", ossl_rsa_verify_pss, -1);
 
     DEF_OSSL_PKEY_BN(cRSA, rsa, n);
     DEF_OSSL_PKEY_BN(cRSA, rsa, e);
diff --git a/ext/openssl/ossl_rand.c b/ext/openssl/ossl_rand.c
index ff07a41bfc..659dc818b6 100644
--- a/ext/openssl/ossl_rand.c
+++ b/ext/openssl/ossl_rand.c
@@ -16,7 +16,7 @@ VALUE eRandomError;
  *  call-seq:
  *     seed(str) -> str
  *
- * ::seed is equivalent to ::add where +entropy+ is length of +str+.
+ * ::seed is equivalent to ::add where _entropy_ is length of _str_.
  */
 static VALUE
 ossl_rand_seed(VALUE self, VALUE str)
@@ -31,23 +31,23 @@ ossl_rand_seed(VALUE self, VALUE str)
  *  call-seq:
  *     add(str, entropy) -> self
  *
- * Mixes the bytes from +str+ into the Pseudo Random Number Generator(PRNG)
+ * Mixes the bytes from _str_ into the Pseudo Random Number Generator(PRNG)
  * state.
  *
- * Thus, if the data from +str+ are unpredictable to an adversary, this
+ * Thus, if the data from _str_ are unpredictable to an adversary, this
  * increases the uncertainty about the state and makes the PRNG output less
  * predictable.
  *
- * The +entropy+ argument is (the lower bound of) an estimate of how much
- * randomness is contained in +str+, measured in bytes.
+ * The _entropy_ argument is (the lower bound of) an estimate of how much
+ * randomness is contained in _str_, measured in bytes.
  *
- *  Example:
+ * === Example
  *
  *    pid = $$
  *    now = Time.now
  *    ary = [now.to_i, now.nsec, 1000, pid]
- *    OpenSSL::Random.add(ary.join("").to_s, 0.0)
- *    OpenSSL::Random.seed(ary.join("").to_s)
+ *    OpenSSL::Random.add(ary.join, 0.0)
+ *    OpenSSL::Random.seed(ary.join)
  */
 static VALUE
 ossl_rand_add(VALUE self, VALUE str, VALUE entropy)
@@ -62,13 +62,11 @@ ossl_rand_add(VALUE self, VALUE str, VALUE entropy)
  *  call-seq:
  *     load_random_file(filename) -> true
  *
- * Reads bytes from +filename+ and adds them to the PRNG.
+ * Reads bytes from _filename_ and adds them to the PRNG.
  */
 static VALUE
 ossl_rand_load_file(VALUE self, VALUE filename)
 {
-    rb_check_safe_obj(filename);
-
     if(!RAND_load_file(StringValueCStr(filename), -1)) {
 	ossl_raise(eRandomError, NULL);
     }
@@ -79,15 +77,13 @@ ossl_rand_load_file(VALUE self, VALUE filename)
  *  call-seq:
  *     write_random_file(filename) -> true
  *
- * Writes a number of random generated bytes (currently 1024) to +filename+
+ * Writes a number of random generated bytes (currently 1024) to _filename_
  * which can be used to initialize the PRNG by calling ::load_random_file in a
  * later session.
  */
 static VALUE
 ossl_rand_write_file(VALUE self, VALUE filename)
 {
-    rb_check_safe_obj(filename);
-
     if (RAND_write_file(StringValueCStr(filename)) == -1) {
 	ossl_raise(eRandomError, NULL);
     }
@@ -98,13 +94,13 @@ ossl_rand_write_file(VALUE self, VALUE filename)
  *  call-seq:
  *	random_bytes(length) -> string
  *
- * Generates +string+ with +length+ number of cryptographically strong
+ * Generates a String with _length_ number of cryptographically strong
  * pseudo-random bytes.
  *
- *  Example:
+ * === Example
  *
  *    OpenSSL::Random.random_bytes(12)
- *    => "..."
+ *    #=> "..."
  */
 static VALUE
 ossl_rand_bytes(VALUE self, VALUE len)
@@ -124,36 +120,6 @@ ossl_rand_bytes(VALUE self, VALUE len)
     return str;
 }
 
-#if defined(HAVE_RAND_PSEUDO_BYTES)
-/*
- *  call-seq:
- *	pseudo_bytes(length) -> string
- *
- * Generates +string+ with +length+ number of pseudo-random bytes.
- *
- * Pseudo-random byte sequences generated by ::pseudo_bytes will be unique if
- * they are of sufficient length, but are not necessarily unpredictable.
- *
- *  Example:
- *
- *    OpenSSL::Random.pseudo_bytes(12)
- *    => "..."
- */
-static VALUE
-ossl_rand_pseudo_bytes(VALUE self, VALUE len)
-{
-    VALUE str;
-    int n = NUM2INT(len);
-
-    str = rb_str_new(0, n);
-    if (RAND_pseudo_bytes((unsigned char *)RSTRING_PTR(str), n) < 1) {
-	ossl_raise(eRandomError, NULL);
-    }
-
-    return str;
-}
-#endif
-
 #ifdef HAVE_RAND_EGD
 /*
  *  call-seq:
@@ -164,8 +130,6 @@ ossl_rand_pseudo_bytes(VALUE self, VALUE len)
 static VALUE
 ossl_rand_egd(VALUE self, VALUE filename)
 {
-    rb_check_safe_obj(filename);
-
     if (RAND_egd(StringValueCStr(filename)) == -1) {
 	ossl_raise(eRandomError, NULL);
     }
@@ -176,9 +140,9 @@ ossl_rand_egd(VALUE self, VALUE filename)
  *  call-seq:
  *     egd_bytes(filename, length) -> true
  *
- * Queries the entropy gathering daemon EGD on socket path given by +filename+.
+ * Queries the entropy gathering daemon EGD on socket path given by _filename_.
  *
- * Fetches +length+ number of bytes and uses ::add to seed the OpenSSL built-in
+ * Fetches _length_ number of bytes and uses ::add to seed the OpenSSL built-in
  * PRNG.
  */
 static VALUE
@@ -186,8 +150,6 @@ ossl_rand_egd_bytes(VALUE self, VALUE filename, VALUE len)
 {
     int n = NUM2INT(len);
 
-    rb_check_safe_obj(filename);
-
     if (RAND_egd_bytes(StringValueCStr(filename), n) == -1) {
 	ossl_raise(eRandomError, NULL);
     }
@@ -199,7 +161,7 @@ ossl_rand_egd_bytes(VALUE self, VALUE filename, VALUE len)
  *  call-seq:
  *     status? => true | false
  *
- * Return true if the PRNG has been seeded with enough data, false otherwise.
+ * Return +true+ if the PRNG has been seeded with enough data, +false+ otherwise.
  */
 static VALUE
 ossl_rand_status(VALUE self)
@@ -214,7 +176,8 @@ void
 Init_ossl_rand(void)
 {
 #if 0
-    mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
+    mOSSL = rb_define_module("OpenSSL");
+    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
 #endif
 
     mRandom = rb_define_module_under(mOSSL, "Random");
@@ -226,8 +189,8 @@ Init_ossl_rand(void)
     rb_define_module_function(mRandom, "load_random_file", ossl_rand_load_file, 1);
     rb_define_module_function(mRandom, "write_random_file", ossl_rand_write_file, 1);
     rb_define_module_function(mRandom, "random_bytes", ossl_rand_bytes, 1);
-#if defined(HAVE_RAND_PSEUDO_BYTES)
-    rb_define_module_function(mRandom, "pseudo_bytes", ossl_rand_pseudo_bytes, 1);
+#if OPENSSL_VERSION_NUMBER < 0x10101000 || defined(LIBRESSL_VERSION_NUMBER)
+    rb_define_alias(rb_singleton_class(mRandom), "pseudo_bytes", "random_bytes");
 #endif
 #ifdef HAVE_RAND_EGD
     rb_define_module_function(mRandom, "egd", ossl_rand_egd, 1);
diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c
index 5876946183..7654be12ee 100644
--- a/ext/openssl/ossl_ssl.c
+++ b/ext/openssl/ossl_ssl.c
@@ -11,12 +11,14 @@
  */
 #include "ossl.h"
 
-#if defined(HAVE_UNISTD_H)
-#  include <unistd.h> /* for read(), and write() */
-#endif
-
 #define numberof(ary) (int)(sizeof(ary)/sizeof((ary)[0]))
 
+#if !defined(TLS1_3_VERSION) && \
+    defined(LIBRESSL_VERSION_NUMBER) && \
+    LIBRESSL_VERSION_NUMBER >= 0x3020000fL
+#  define TLS1_3_VERSION 0x0304
+#endif
+
 #ifdef _WIN32
 #  define TO_SOCKET(s) _get_osfhandle(s)
 #else
@@ -36,99 +38,40 @@ VALUE cSSLSocket;
 static VALUE eSSLErrorWaitReadable;
 static VALUE eSSLErrorWaitWritable;
 
-#define ossl_sslctx_set_cert(o,v)        	rb_iv_set((o),"@cert",(v))
-#define ossl_sslctx_set_key(o,v)         	rb_iv_set((o),"@key",(v))
-#define ossl_sslctx_set_client_ca(o,v)   	rb_iv_set((o),"@client_ca",(v))
-#define ossl_sslctx_set_ca_file(o,v)     	rb_iv_set((o),"@ca_file",(v))
-#define ossl_sslctx_set_ca_path(o,v)     	rb_iv_set((o),"@ca_path",(v))
-#define ossl_sslctx_set_timeout(o,v)     	rb_iv_set((o),"@timeout",(v))
-#define ossl_sslctx_set_verify_mode(o,v) 	rb_iv_set((o),"@verify_mode",(v))
-#define ossl_sslctx_set_verify_dep(o,v)  	rb_iv_set((o),"@verify_depth",(v))
-#define ossl_sslctx_set_verify_cb(o,v)   	rb_iv_set((o),"@verify_callback",(v))
-#define ossl_sslctx_set_cert_store(o,v)  	rb_iv_set((o),"@cert_store",(v))
-#define ossl_sslctx_set_extra_cert(o,v)  	rb_iv_set((o),"@extra_chain_cert",(v))
-#define ossl_sslctx_set_client_cert_cb(o,v) 	rb_iv_set((o),"@client_cert_cb",(v))
-#define ossl_sslctx_set_sess_id_ctx(o, v) 	rb_iv_set((o),"@session_id_context",(v))
-
-#define ossl_sslctx_get_cert(o)          	rb_iv_get((o),"@cert")
-#define ossl_sslctx_get_key(o)           	rb_iv_get((o),"@key")
-#define ossl_sslctx_get_client_ca(o)     	rb_iv_get((o),"@client_ca")
-#define ossl_sslctx_get_ca_file(o)       	rb_iv_get((o),"@ca_file")
-#define ossl_sslctx_get_ca_path(o)       	rb_iv_get((o),"@ca_path")
-#define ossl_sslctx_get_timeout(o)       	rb_iv_get((o),"@timeout")
-#define ossl_sslctx_get_verify_mode(o)   	rb_iv_get((o),"@verify_mode")
-#define ossl_sslctx_get_verify_dep(o)    	rb_iv_get((o),"@verify_depth")
-#define ossl_sslctx_get_verify_cb(o)     	rb_iv_get((o),"@verify_callback")
-#define ossl_sslctx_get_cert_store(o)    	rb_iv_get((o),"@cert_store")
-#define ossl_sslctx_get_extra_cert(o)    	rb_iv_get((o),"@extra_chain_cert")
-#define ossl_sslctx_get_client_cert_cb(o) 	rb_iv_get((o),"@client_cert_cb")
-#define ossl_sslctx_get_tmp_ecdh_cb(o)          rb_iv_get((o),"@tmp_ecdh_callback")
-#define ossl_sslctx_get_sess_id_ctx(o)   	rb_iv_get((o),"@session_id_context")
-
-#define ossl_ssl_get_io(o)           rb_iv_get((o),"@io")
-#define ossl_ssl_get_ctx(o)          rb_iv_get((o),"@context")
-#define ossl_ssl_get_x509(o)         rb_iv_get((o),"@x509")
-#define ossl_ssl_get_key(o)          rb_iv_get((o),"@key")
-
-#define ossl_ssl_set_io(o,v)         rb_iv_set((o),"@io",(v))
-#define ossl_ssl_set_ctx(o,v)        rb_iv_set((o),"@context",(v))
-#define ossl_ssl_set_sync_close(o,v) rb_iv_set((o),"@sync_close",(v))
-#define ossl_ssl_set_hostname_v(o,v) rb_iv_set((o),"@hostname",(v))
-#define ossl_ssl_set_x509(o,v)       rb_iv_set((o),"@x509",(v))
-#define ossl_ssl_set_key(o,v)        rb_iv_set((o),"@key",(v))
-#define ossl_ssl_set_tmp_dh(o,v)     rb_iv_set((o),"@tmp_dh",(v))
-#define ossl_ssl_set_tmp_ecdh(o,v)   rb_iv_set((o),"@tmp_ecdh",(v))
-
-static ID ID_callback_state;
-
+static ID id_call, ID_callback_state, id_tmp_dh_callback, id_tmp_ecdh_callback,
+	  id_npn_protocols_encoded, id_each;
 static VALUE sym_exception, sym_wait_readable, sym_wait_writable;
 
-/*
- * SSLContext class
- */
-static const struct {
-    const char *name;
-    SSL_METHOD *(*func)(void); /* FIXME: constify when dropping 0.9.8 */
-    int version;
-} ossl_ssl_method_tab[] = {
-#if defined(HAVE_SSL_CTX_SET_MIN_PROTO_VERSION)
-#define OSSL_SSL_METHOD_ENTRY(name, version) \
-    { #name,          (SSL_METHOD *(*)(void))TLS_method, version }, \
-    { #name"_server", (SSL_METHOD *(*)(void))TLS_server_method, version }, \
-    { #name"_client", (SSL_METHOD *(*)(void))TLS_client_method, version }
-#else
-#define OSSL_SSL_METHOD_ENTRY(name, version) \
-    { #name,          (SSL_METHOD *(*)(void))name##_method, version }, \
-    { #name"_server", (SSL_METHOD *(*)(void))name##_server_method, version }, \
-    { #name"_client", (SSL_METHOD *(*)(void))name##_client_method, version }
-#endif
-#if defined(HAVE_SSLV2_METHOD)
-    OSSL_SSL_METHOD_ENTRY(SSLv2, SSL2_VERSION),
-#endif
-#if defined(HAVE_SSLV3_METHOD)
-    OSSL_SSL_METHOD_ENTRY(SSLv3, SSL3_VERSION),
-#endif
-    OSSL_SSL_METHOD_ENTRY(TLSv1, TLS1_VERSION),
-#if defined(HAVE_TLSV1_1_METHOD)
-    OSSL_SSL_METHOD_ENTRY(TLSv1_1, TLS1_1_VERSION),
-#endif
-#if defined(HAVE_TLSV1_2_METHOD)
-    OSSL_SSL_METHOD_ENTRY(TLSv1_2, TLS1_2_VERSION),
-#endif
-    OSSL_SSL_METHOD_ENTRY(SSLv23, 0),
-#undef OSSL_SSL_METHOD_ENTRY
-};
+static ID id_i_cert_store, id_i_ca_file, id_i_ca_path, id_i_verify_mode,
+	  id_i_verify_depth, id_i_verify_callback, id_i_client_ca,
+	  id_i_renegotiation_cb, id_i_cert, id_i_key, id_i_extra_chain_cert,
+	  id_i_client_cert_cb, id_i_tmp_ecdh_callback, id_i_timeout,
+	  id_i_session_id_context, id_i_session_get_cb, id_i_session_new_cb,
+	  id_i_session_remove_cb, id_i_npn_select_cb, id_i_npn_protocols,
+	  id_i_alpn_select_cb, id_i_alpn_protocols, id_i_servername_cb,
+	  id_i_verify_hostname;
+static ID id_i_io, id_i_context, id_i_hostname;
 
 static int ossl_ssl_ex_vcb_idx;
-static int ossl_ssl_ex_store_p;
 static int ossl_ssl_ex_ptr_idx;
+static int ossl_sslctx_ex_ptr_idx;
+#if !defined(HAVE_X509_STORE_UP_REF)
+static int ossl_sslctx_ex_store_p;
+#endif
+
+static void
+ossl_sslctx_mark(void *ptr)
+{
+    SSL_CTX *ctx = ptr;
+    rb_gc_mark((VALUE)SSL_CTX_get_ex_data(ctx, ossl_sslctx_ex_ptr_idx));
+}
 
 static void
 ossl_sslctx_free(void *ptr)
 {
     SSL_CTX *ctx = ptr;
 #if !defined(HAVE_X509_STORE_UP_REF)
-    if(ctx && SSL_CTX_get_ex_data(ctx, ossl_ssl_ex_store_p)== (void*)1)
+    if (ctx && SSL_CTX_get_ex_data(ctx, ossl_sslctx_ex_store_p))
 	ctx->cert_store = NULL;
 #endif
     SSL_CTX_free(ctx);
@@ -137,7 +80,7 @@ ossl_sslctx_free(void *ptr)
 static const rb_data_type_t ossl_sslctx_type = {
     "OpenSSL/SSL/CTX",
     {
-	0, ossl_sslctx_free,
+        ossl_sslctx_mark, ossl_sslctx_free,
     },
     0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
 };
@@ -146,22 +89,24 @@ static VALUE
 ossl_sslctx_s_alloc(VALUE klass)
 {
     SSL_CTX *ctx;
-    long mode = SSL_MODE_ENABLE_PARTIAL_WRITE |
-	SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER;
+    long mode = 0 |
+	SSL_MODE_ENABLE_PARTIAL_WRITE |
+	SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER |
+	SSL_MODE_RELEASE_BUFFERS;
     VALUE obj;
 
-#ifdef SSL_MODE_RELEASE_BUFFERS
-    mode |= SSL_MODE_RELEASE_BUFFERS;
-#endif
-
     obj = TypedData_Wrap_Struct(klass, &ossl_sslctx_type, 0);
+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
+    ctx = SSL_CTX_new(TLS_method());
+#else
     ctx = SSL_CTX_new(SSLv23_method());
+#endif
     if (!ctx) {
         ossl_raise(eSSLError, "SSL_CTX_new");
     }
     SSL_CTX_set_mode(ctx, mode);
     RTYPEDDATA_DATA(obj) = ctx;
-    SSL_CTX_set_ex_data(ctx, ossl_ssl_ex_ptr_idx, (void*)obj);
+    SSL_CTX_set_ex_data(ctx, ossl_sslctx_ex_ptr_idx, (void *)obj);
 
 #if !defined(OPENSSL_NO_EC) && defined(HAVE_SSL_CTX_SET_ECDH_AUTO)
     /* We use SSL_CTX_set1_curves_list() to specify the curve used in ECDH. It
@@ -178,157 +123,266 @@ ossl_sslctx_s_alloc(VALUE klass)
     return obj;
 }
 
+static int
+parse_proto_version(VALUE str)
+{
+    int i;
+    static const struct {
+	const char *name;
+	int version;
+    } map[] = {
+	{ "SSL2", SSL2_VERSION },
+	{ "SSL3", SSL3_VERSION },
+	{ "TLS1", TLS1_VERSION },
+	{ "TLS1_1", TLS1_1_VERSION },
+	{ "TLS1_2", TLS1_2_VERSION },
+#ifdef TLS1_3_VERSION
+	{ "TLS1_3", TLS1_3_VERSION },
+#endif
+    };
+
+    if (NIL_P(str))
+	return 0;
+    if (RB_INTEGER_TYPE_P(str))
+	return NUM2INT(str);
+
+    if (SYMBOL_P(str))
+	str = rb_sym2str(str);
+    StringValue(str);
+    for (i = 0; i < numberof(map); i++)
+	if (!strncmp(map[i].name, RSTRING_PTR(str), RSTRING_LEN(str)))
+	    return map[i].version;
+    rb_raise(rb_eArgError, "unrecognized version %+"PRIsVALUE, str);
+}
+
 /*
  * call-seq:
- *    ctx.ssl_version = :TLSv1
- *    ctx.ssl_version = "SSLv23_client"
+ *    ctx.set_minmax_proto_version(min, max) -> nil
  *
- * You can get a list of valid versions with OpenSSL::SSL::SSLContext::METHODS
+ * Sets the minimum and maximum supported protocol versions. See #min_version=
+ * and #max_version=.
  */
 static VALUE
-ossl_sslctx_set_ssl_version(VALUE self, VALUE ssl_method)
+ossl_sslctx_set_minmax_proto_version(VALUE self, VALUE min_v, VALUE max_v)
 {
     SSL_CTX *ctx;
-    const char *s;
-    VALUE m = ssl_method;
-    int i;
+    int min, max;
 
     GetSSLCTX(self, ctx);
-    if (RB_TYPE_P(ssl_method, T_SYMBOL))
-	m = rb_sym2str(ssl_method);
-    s = StringValueCStr(m);
-    for (i = 0; i < numberof(ossl_ssl_method_tab); i++) {
-        if (strcmp(ossl_ssl_method_tab[i].name, s) == 0) {
-#if defined(HAVE_SSL_CTX_SET_MIN_PROTO_VERSION)
-	    int version = ossl_ssl_method_tab[i].version;
-#endif
-	    SSL_METHOD *method = ossl_ssl_method_tab[i].func();
-
-	    if (SSL_CTX_set_ssl_version(ctx, method) != 1)
-		ossl_raise(eSSLError, "SSL_CTX_set_ssl_version");
+    min = parse_proto_version(min_v);
+    max = parse_proto_version(max_v);
+
+#ifdef HAVE_SSL_CTX_SET_MIN_PROTO_VERSION
+    if (!SSL_CTX_set_min_proto_version(ctx, min))
+	ossl_raise(eSSLError, "SSL_CTX_set_min_proto_version");
+    if (!SSL_CTX_set_max_proto_version(ctx, max))
+	ossl_raise(eSSLError, "SSL_CTX_set_max_proto_version");
+#else
+    {
+	unsigned long sum = 0, opts = 0;
+	int i;
+	static const struct {
+	    int ver;
+	    unsigned long opts;
+	} options_map[] = {
+	    { SSL2_VERSION, SSL_OP_NO_SSLv2 },
+	    { SSL3_VERSION, SSL_OP_NO_SSLv3 },
+	    { TLS1_VERSION, SSL_OP_NO_TLSv1 },
+	    { TLS1_1_VERSION, SSL_OP_NO_TLSv1_1 },
+	    { TLS1_2_VERSION, SSL_OP_NO_TLSv1_2 },
+# if defined(TLS1_3_VERSION)
+	    { TLS1_3_VERSION, SSL_OP_NO_TLSv1_3 },
+# endif
+	};
 
-#if defined(HAVE_SSL_CTX_SET_MIN_PROTO_VERSION)
-	    if (!SSL_CTX_set_min_proto_version(ctx, version))
-		ossl_raise(eSSLError, "SSL_CTX_set_min_proto_version");
-	    if (!SSL_CTX_set_max_proto_version(ctx, version))
-		ossl_raise(eSSLError, "SSL_CTX_set_max_proto_version");
-#endif
-	    return ssl_method;
-        }
+	for (i = 0; i < numberof(options_map); i++) {
+	    sum |= options_map[i].opts;
+            if ((min && min > options_map[i].ver) ||
+                (max && max < options_map[i].ver)) {
+		opts |= options_map[i].opts;
+            }
+	}
+	SSL_CTX_clear_options(ctx, sum);
+	SSL_CTX_set_options(ctx, opts);
     }
+#endif
 
-    ossl_raise(rb_eArgError, "unknown SSL method `%"PRIsVALUE"'.", m);
+    return Qnil;
 }
 
 static VALUE
 ossl_call_client_cert_cb(VALUE obj)
 {
-    VALUE cb, ary, cert, key;
+    VALUE ctx_obj, cb, ary, cert, key;
 
-    cb = rb_funcall(obj, rb_intern("client_cert_cb"), 0);
-    if (NIL_P(cb)) return Qfalse;
-    ary = rb_funcall(cb, rb_intern("call"), 1, obj);
+    ctx_obj = rb_attr_get(obj, id_i_context);
+    cb = rb_attr_get(ctx_obj, id_i_client_cert_cb);
+    if (NIL_P(cb))
+	return Qnil;
+
+    ary = rb_funcallv(cb, id_call, 1, &obj);
     Check_Type(ary, T_ARRAY);
     GetX509CertPtr(cert = rb_ary_entry(ary, 0));
-    GetPKeyPtr(key = rb_ary_entry(ary, 1));
-    ossl_ssl_set_x509(obj, cert);
-    ossl_ssl_set_key(obj, key);
+    GetPrivPKeyPtr(key = rb_ary_entry(ary, 1));
 
-    return Qtrue;
+    return rb_ary_new3(2, cert, key);
 }
 
 static int
 ossl_client_cert_cb(SSL *ssl, X509 **x509, EVP_PKEY **pkey)
 {
-    VALUE obj, success;
+    VALUE obj, ret;
 
     obj = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx);
-    success = rb_protect(ossl_call_client_cert_cb, obj, NULL);
-    if (!RTEST(success)) return 0;
-    *x509 = DupX509CertPtr(ossl_ssl_get_x509(obj));
-    *pkey = DupPKeyPtr(ossl_ssl_get_key(obj));
+    ret = rb_protect(ossl_call_client_cert_cb, obj, NULL);
+    if (NIL_P(ret))
+	return 0;
+
+    *x509 = DupX509CertPtr(RARRAY_AREF(ret, 0));
+    *pkey = DupPKeyPtr(RARRAY_AREF(ret, 1));
 
     return 1;
 }
 
-#if !defined(OPENSSL_NO_DH)
-static VALUE
-ossl_call_tmp_dh_callback(VALUE args)
+#if !defined(OPENSSL_NO_DH) || \
+    !defined(OPENSSL_NO_EC) && defined(HAVE_SSL_CTX_SET_TMP_ECDH_CALLBACK)
+struct tmp_dh_callback_args {
+    VALUE ssl_obj;
+    ID id;
+    int type;
+    int is_export;
+    int keylength;
+};
+
+static EVP_PKEY *
+ossl_call_tmp_dh_callback(struct tmp_dh_callback_args *args)
 {
     VALUE cb, dh;
     EVP_PKEY *pkey;
 
-    cb = rb_funcall(rb_ary_entry(args, 0), rb_intern("tmp_dh_callback"), 0);
-
-    if (NIL_P(cb)) return Qfalse;
-    dh = rb_apply(cb, rb_intern("call"), args);
+    cb = rb_funcall(args->ssl_obj, args->id, 0);
+    if (NIL_P(cb))
+	return NULL;
+    dh = rb_funcall(cb, id_call, 3, args->ssl_obj, INT2NUM(args->is_export),
+		    INT2NUM(args->keylength));
     pkey = GetPKeyPtr(dh);
-    if (EVP_PKEY_base_id(pkey) != EVP_PKEY_DH) return Qfalse;
+    if (EVP_PKEY_base_id(pkey) != args->type)
+	return NULL;
 
-    return dh;
+    return pkey;
 }
+#endif
 
-static DH*
+#if !defined(OPENSSL_NO_DH)
+static DH *
 ossl_tmp_dh_callback(SSL *ssl, int is_export, int keylength)
 {
-    VALUE args, dh, rb_ssl;
+    VALUE rb_ssl;
+    EVP_PKEY *pkey;
+    struct tmp_dh_callback_args args;
+    int state;
 
     rb_ssl = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx);
+    args.ssl_obj = rb_ssl;
+    args.id = id_tmp_dh_callback;
+    args.is_export = is_export;
+    args.keylength = keylength;
+    args.type = EVP_PKEY_DH;
+
+    pkey = (EVP_PKEY *)rb_protect((VALUE (*)(VALUE))ossl_call_tmp_dh_callback,
+				  (VALUE)&args, &state);
+    if (state) {
+	rb_ivar_set(rb_ssl, ID_callback_state, INT2NUM(state));
+	return NULL;
+    }
+    if (!pkey)
+	return NULL;
 
-    args = rb_ary_new_from_args(3, rb_ssl, INT2FIX(is_export), INT2FIX(keylength));
-
-    dh = rb_protect(ossl_call_tmp_dh_callback, args, NULL);
-    if (!RTEST(dh)) return NULL;
-    ossl_ssl_set_tmp_dh(rb_ssl, dh);
-
-    return EVP_PKEY_get0_DH(GetPKeyPtr(dh));
+    return EVP_PKEY_get0_DH(pkey);
 }
 #endif /* OPENSSL_NO_DH */
 
 #if !defined(OPENSSL_NO_EC) && defined(HAVE_SSL_CTX_SET_TMP_ECDH_CALLBACK)
-static VALUE
-ossl_call_tmp_ecdh_callback(VALUE args)
+static EC_KEY *
+ossl_tmp_ecdh_callback(SSL *ssl, int is_export, int keylength)
 {
-    VALUE cb, ecdh;
+    VALUE rb_ssl;
     EVP_PKEY *pkey;
+    struct tmp_dh_callback_args args;
+    int state;
 
-    cb = rb_funcall(rb_ary_entry(args, 0), rb_intern("tmp_ecdh_callback"), 0);
-
-    if (NIL_P(cb)) return Qfalse;
-    ecdh = rb_apply(cb, rb_intern("call"), args);
-    pkey = GetPKeyPtr(ecdh);
-    if (EVP_PKEY_base_id(pkey) != EVP_PKEY_EC) return Qfalse;
+    rb_ssl = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx);
+    args.ssl_obj = rb_ssl;
+    args.id = id_tmp_ecdh_callback;
+    args.is_export = is_export;
+    args.keylength = keylength;
+    args.type = EVP_PKEY_EC;
+
+    pkey = (EVP_PKEY *)rb_protect((VALUE (*)(VALUE))ossl_call_tmp_dh_callback,
+				  (VALUE)&args, &state);
+    if (state) {
+	rb_ivar_set(rb_ssl, ID_callback_state, INT2NUM(state));
+	return NULL;
+    }
+    if (!pkey)
+	return NULL;
 
-    return ecdh;
+    return EVP_PKEY_get0_EC_KEY(pkey);
 }
+#endif
 
-static EC_KEY*
-ossl_tmp_ecdh_callback(SSL *ssl, int is_export, int keylength)
+static VALUE
+call_verify_certificate_identity(VALUE ctx_v)
 {
-    VALUE args, ecdh, rb_ssl;
-
-    rb_ssl = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx);
+    X509_STORE_CTX *ctx = (X509_STORE_CTX *)ctx_v;
+    SSL *ssl;
+    VALUE ssl_obj, hostname, cert_obj;
 
-    args = rb_ary_new_from_args(3, rb_ssl, INT2FIX(is_export), INT2FIX(keylength));
+    ssl = X509_STORE_CTX_get_ex_data(ctx, SSL_get_ex_data_X509_STORE_CTX_idx());
+    ssl_obj = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx);
+    hostname = rb_attr_get(ssl_obj, id_i_hostname);
 
-    ecdh = rb_protect(ossl_call_tmp_ecdh_callback, args, NULL);
-    if (!RTEST(ecdh)) return NULL;
-    ossl_ssl_set_tmp_ecdh(rb_ssl, ecdh);
+    if (!RTEST(hostname)) {
+	rb_warning("verify_hostname requires hostname to be set");
+	return Qtrue;
+    }
 
-    return EVP_PKEY_get0_EC_KEY(GetPKeyPtr(ecdh));
+    cert_obj = ossl_x509_new(X509_STORE_CTX_get_current_cert(ctx));
+    return rb_funcall(mSSL, rb_intern("verify_certificate_identity"), 2,
+		      cert_obj, hostname);
 }
-#endif
 
 static int
 ossl_ssl_verify_callback(int preverify_ok, X509_STORE_CTX *ctx)
 {
-    VALUE cb;
+    VALUE cb, ssl_obj, sslctx_obj, verify_hostname, ret;
     SSL *ssl;
+    int status;
 
     ssl = X509_STORE_CTX_get_ex_data(ctx, SSL_get_ex_data_X509_STORE_CTX_idx());
     cb = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_vcb_idx);
-    X509_STORE_CTX_set_ex_data(ctx, ossl_store_ctx_ex_verify_cb_idx, (void *)cb);
-    return ossl_verify_cb(preverify_ok, ctx);
+    ssl_obj = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx);
+    sslctx_obj = rb_attr_get(ssl_obj, id_i_context);
+    verify_hostname = rb_attr_get(sslctx_obj, id_i_verify_hostname);
+
+    if (preverify_ok && RTEST(verify_hostname) && !SSL_is_server(ssl) &&
+	!X509_STORE_CTX_get_error_depth(ctx)) {
+	ret = rb_protect(call_verify_certificate_identity, (VALUE)ctx, &status);
+	if (status) {
+	    rb_ivar_set(ssl_obj, ID_callback_state, INT2NUM(status));
+	    return 0;
+	}
+        if (ret != Qtrue) {
+            preverify_ok = 0;
+#if defined(X509_V_ERR_HOSTNAME_MISMATCH)
+            X509_STORE_CTX_set_error(ctx, X509_V_ERR_HOSTNAME_MISMATCH);
+#else
+            X509_STORE_CTX_set_error(ctx, X509_V_ERR_CERT_REJECTED);
+#endif
+        }
+    }
+
+    return ossl_verify_cb_call(cb, preverify_ok, ctx);
 }
 
 static VALUE
@@ -342,12 +396,11 @@ ossl_call_session_get_cb(VALUE ary)
     cb = rb_funcall(ssl_obj, rb_intern("session_get_cb"), 0);
     if (NIL_P(cb)) return Qnil;
 
-    return rb_funcall(cb, rb_intern("call"), 1, ary);
+    return rb_funcallv(cb, id_call, 1, &ary);
 }
 
-/* this method is currently only called for servers (in OpenSSL <= 0.9.8e) */
 static SSL_SESSION *
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+#if (!defined(LIBRESSL_VERSION_NUMBER) ? OPENSSL_VERSION_NUMBER >= 0x10100000 : LIBRESSL_VERSION_NUMBER >= 0x2080000f)
 ossl_sslctx_session_get_cb(SSL *ssl, const unsigned char *buf, int len, int *copy)
 #else
 ossl_sslctx_session_get_cb(SSL *ssl, unsigned char *buf, int len, int *copy)
@@ -355,13 +408,10 @@ ossl_sslctx_session_get_cb(SSL *ssl, unsigned char *buf, int len, int *copy)
 {
     VALUE ary, ssl_obj, ret_obj;
     SSL_SESSION *sess;
-    void *ptr;
     int state = 0;
 
     OSSL_Debug("SSL SESSION get callback entered");
-    if ((ptr = SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx)) == NULL)
-    	return NULL;
-    ssl_obj = (VALUE)ptr;
+    ssl_obj = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx);
     ary = rb_ary_new2(2);
     rb_ary_push(ary, ssl_obj);
     rb_ary_push(ary, rb_str_new((const char *)buf, len));
@@ -374,7 +424,7 @@ ossl_sslctx_session_get_cb(SSL *ssl, unsigned char *buf, int len, int *copy)
     if (!rb_obj_is_instance_of(ret_obj, cSSLSession))
         return NULL;
 
-    SafeGetSSLSession(ret_obj, sess);
+    GetSSLSession(ret_obj, sess);
     *copy = 1;
 
     return sess;
@@ -391,7 +441,7 @@ ossl_call_session_new_cb(VALUE ary)
     cb = rb_funcall(ssl_obj, rb_intern("session_new_cb"), 0);
     if (NIL_P(cb)) return Qnil;
 
-    return rb_funcall(cb, rb_intern("call"), 1, ary);
+    return rb_funcallv(cb, id_call, 1, &ary);
 }
 
 /* return 1 normal.  return 0 removes the session */
@@ -399,14 +449,11 @@ static int
 ossl_sslctx_session_new_cb(SSL *ssl, SSL_SESSION *sess)
 {
     VALUE ary, ssl_obj, sess_obj;
-    void *ptr;
     int state = 0;
 
     OSSL_Debug("SSL SESSION new callback entered");
 
-    if ((ptr = SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx)) == NULL)
-    	return 1;
-    ssl_obj = (VALUE)ptr;
+    ssl_obj = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx);
     sess_obj = rb_obj_alloc(cSSLSession);
     SSL_SESSION_up_ref(sess);
     DATA_PTR(sess_obj) = sess;
@@ -438,24 +485,28 @@ ossl_call_session_remove_cb(VALUE ary)
     Check_Type(ary, T_ARRAY);
     sslctx_obj = rb_ary_entry(ary, 0);
 
-    cb = rb_iv_get(sslctx_obj, "@session_remove_cb");
+    cb = rb_attr_get(sslctx_obj, id_i_session_remove_cb);
     if (NIL_P(cb)) return Qnil;
 
-    return rb_funcall(cb, rb_intern("call"), 1, ary);
+    return rb_funcallv(cb, id_call, 1, &ary);
 }
 
 static void
 ossl_sslctx_session_remove_cb(SSL_CTX *ctx, SSL_SESSION *sess)
 {
     VALUE ary, sslctx_obj, sess_obj;
-    void *ptr;
     int state = 0;
 
+    /*
+     * This callback is also called for all sessions in the internal store
+     * when SSL_CTX_free() is called.
+     */
+    if (rb_during_gc())
+	return;
+
     OSSL_Debug("SSL SESSION remove callback entered");
 
-    if ((ptr = SSL_CTX_get_ex_data(ctx, ossl_ssl_ex_ptr_idx)) == NULL)
-    	return;
-    sslctx_obj = (VALUE)ptr;
+    sslctx_obj = (VALUE)SSL_CTX_get_ex_data(ctx, ossl_sslctx_ex_ptr_idx);
     sess_obj = rb_obj_alloc(cSSLSession);
     SSL_SESSION_up_ref(sess);
     DATA_PTR(sess_obj) = sess;
@@ -464,7 +515,7 @@ ossl_sslctx_session_remove_cb(SSL_CTX *ctx, SSL_SESSION *sess)
     rb_ary_push(ary, sslctx_obj);
     rb_ary_push(ary, sess_obj);
 
-    rb_protect((VALUE(*)_((VALUE)))ossl_call_session_remove_cb, ary, &state);
+    rb_protect(ossl_call_session_remove_cb, ary, &state);
     if (state) {
 /*
   the SSL_CTX is frozen, nowhere to save state.
@@ -491,7 +542,6 @@ ossl_sslctx_add_extra_chain_cert_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, arg))
 
 static VALUE ossl_sslctx_setup(VALUE self);
 
-#ifdef HAVE_SSL_SET_TLSEXT_HOST_NAME
 static VALUE
 ossl_call_servername_cb(VALUE ary)
 {
@@ -500,12 +550,11 @@ ossl_call_servername_cb(VALUE ary)
     Check_Type(ary, T_ARRAY);
     ssl_obj = rb_ary_entry(ary, 0);
 
-    sslctx_obj = rb_iv_get(ssl_obj, "@context");
-    if (NIL_P(sslctx_obj)) return Qnil;
-    cb = rb_iv_get(sslctx_obj, "@servername_cb");
+    sslctx_obj = rb_attr_get(ssl_obj, id_i_context);
+    cb = rb_attr_get(sslctx_obj, id_i_servername_cb);
     if (NIL_P(cb)) return Qnil;
 
-    ret_obj = rb_funcall(cb, rb_intern("call"), 1, ary);
+    ret_obj = rb_funcallv(cb, id_call, 1, &ary);
     if (rb_obj_is_kind_of(ret_obj, cSSLContext)) {
         SSL *ssl;
         SSL_CTX *ctx2;
@@ -514,9 +563,10 @@ ossl_call_servername_cb(VALUE ary)
         GetSSL(ssl_obj, ssl);
         GetSSLCTX(ret_obj, ctx2);
         SSL_set_SSL_CTX(ssl, ctx2);
-        rb_iv_set(ssl_obj, "@context", ret_obj);
+        rb_ivar_set(ssl_obj, id_i_context, ret_obj);
     } else if (!NIL_P(ret_obj)) {
-            ossl_raise(rb_eArgError, "servername_cb must return an OpenSSL::SSL::SSLContext object or nil");
+	ossl_raise(rb_eArgError, "servername_cb must return an "
+		   "OpenSSL::SSL::SSLContext object or nil");
     }
 
     return ret_obj;
@@ -526,21 +576,18 @@ static int
 ssl_servername_cb(SSL *ssl, int *ad, void *arg)
 {
     VALUE ary, ssl_obj;
-    void *ptr;
     int state = 0;
     const char *servername = SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name);
 
     if (!servername)
         return SSL_TLSEXT_ERR_OK;
 
-    if ((ptr = SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx)) == NULL)
-    	return SSL_TLSEXT_ERR_ALERT_FATAL;
-    ssl_obj = (VALUE)ptr;
+    ssl_obj = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx);
     ary = rb_ary_new2(2);
     rb_ary_push(ary, ssl_obj);
     rb_ary_push(ary, rb_str_new2(servername));
 
-    rb_protect((VALUE(*)_((VALUE)))ossl_call_servername_cb, ary, &state);
+    rb_protect(ossl_call_servername_cb, ary, &state);
     if (state) {
         rb_ivar_set(ssl_obj, ID_callback_state, INT2NUM(state));
         return SSL_TLSEXT_ERR_ALERT_FATAL;
@@ -548,29 +595,24 @@ ssl_servername_cb(SSL *ssl, int *ad, void *arg)
 
     return SSL_TLSEXT_ERR_OK;
 }
-#endif
 
 static void
 ssl_renegotiation_cb(const SSL *ssl)
 {
     VALUE ssl_obj, sslctx_obj, cb;
-    void *ptr;
-
-    if ((ptr = SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx)) == NULL)
-	ossl_raise(eSSLError, "SSL object could not be retrieved");
-    ssl_obj = (VALUE)ptr;
 
-    sslctx_obj = rb_iv_get(ssl_obj, "@context");
-    if (NIL_P(sslctx_obj)) return;
-    cb = rb_iv_get(sslctx_obj, "@renegotiation_cb");
+    ssl_obj = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx);
+    sslctx_obj = rb_attr_get(ssl_obj, id_i_context);
+    cb = rb_attr_get(sslctx_obj, id_i_renegotiation_cb);
     if (NIL_P(cb)) return;
 
-    (void) rb_funcall(cb, rb_intern("call"), 1, ssl_obj);
+    rb_funcallv(cb, id_call, 1, &ssl_obj);
 }
 
-#if defined(HAVE_SSL_CTX_SET_NEXT_PROTO_SELECT_CB) || defined(HAVE_SSL_CTX_SET_ALPN_SELECT_CB)
+#if !defined(OPENSSL_NO_NEXTPROTONEG) || \
+    defined(HAVE_SSL_CTX_SET_ALPN_SELECT_CB)
 static VALUE
-ssl_npn_encode_protocol_i(VALUE cur, VALUE encoded)
+ssl_npn_encode_protocol_i(RB_BLOCK_CALL_FUNC_ARGLIST(cur, encoded))
 {
     int len = RSTRING_LENINT(cur);
     char len_byte;
@@ -587,18 +629,24 @@ static VALUE
 ssl_encode_npn_protocols(VALUE protocols)
 {
     VALUE encoded = rb_str_new(NULL, 0);
-    rb_iterate(rb_each, protocols, ssl_npn_encode_protocol_i, encoded);
+    rb_block_call(protocols, id_each, 0, 0, ssl_npn_encode_protocol_i, encoded);
     return encoded;
 }
 
-static int
-ssl_npn_select_cb_common(VALUE cb, const unsigned char **out, unsigned char *outlen, const unsigned char *in, unsigned int inlen)
+struct npn_select_cb_common_args {
+    VALUE cb;
+    const unsigned char *in;
+    unsigned inlen;
+};
+
+static VALUE
+npn_select_cb_common_i(VALUE tmp)
 {
-    VALUE selected;
-    long len;
-    VALUE protocols = rb_ary_new();
+    struct npn_select_cb_common_args *args = (void *)tmp;
+    const unsigned char *in = args->in, *in_end = in + args->inlen;
     unsigned char l;
-    const unsigned char *in_end = in + inlen;
+    long len;
+    VALUE selected, protocols = rb_ary_new();
 
     /* assume OpenSSL verifies this format */
     /* The format is len_1|proto_1|...|len_n|proto_n */
@@ -608,24 +656,50 @@ ssl_npn_select_cb_common(VALUE cb, const unsigned char **out, unsigned char *out
 	in += l;
     }
 
-    selected = rb_funcall(cb, rb_intern("call"), 1, protocols);
+    selected = rb_funcallv(args->cb, id_call, 1, &protocols);
     StringValue(selected);
     len = RSTRING_LEN(selected);
     if (len < 1 || len >= 256) {
 	ossl_raise(eSSLError, "Selected protocol name must have length 1..255");
     }
+
+    return selected;
+}
+
+static int
+ssl_npn_select_cb_common(SSL *ssl, VALUE cb, const unsigned char **out,
+			 unsigned char *outlen, const unsigned char *in,
+			 unsigned int inlen)
+{
+    VALUE selected;
+    int status;
+    struct npn_select_cb_common_args args;
+
+    args.cb = cb;
+    args.in = in;
+    args.inlen = inlen;
+
+    selected = rb_protect(npn_select_cb_common_i, (VALUE)&args, &status);
+    if (status) {
+	VALUE ssl_obj = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx);
+
+	rb_ivar_set(ssl_obj, ID_callback_state, INT2NUM(status));
+	return SSL_TLSEXT_ERR_ALERT_FATAL;
+    }
+
     *out = (unsigned char *)RSTRING_PTR(selected);
-    *outlen = (unsigned char)len;
+    *outlen = (unsigned char)RSTRING_LEN(selected);
 
     return SSL_TLSEXT_ERR_OK;
 }
+#endif
 
-#ifdef HAVE_SSL_CTX_SET_NEXT_PROTO_SELECT_CB
+#ifndef OPENSSL_NO_NEXTPROTONEG
 static int
-ssl_npn_advertise_cb(SSL *ssl, const unsigned char **out, unsigned int *outlen, void *arg)
+ssl_npn_advertise_cb(SSL *ssl, const unsigned char **out, unsigned int *outlen,
+		     void *arg)
 {
-    VALUE sslctx_obj = (VALUE) arg;
-    VALUE protocols = rb_iv_get(sslctx_obj, "@_protocols");
+    VALUE protocols = rb_attr_get((VALUE)arg, id_npn_protocols_encoded);
 
     *out = (const unsigned char *) RSTRING_PTR(protocols);
     *outlen = RSTRING_LENINT(protocols);
@@ -634,30 +708,32 @@ ssl_npn_advertise_cb(SSL *ssl, const unsigned char **out, unsigned int *outlen,
 }
 
 static int
-ssl_npn_select_cb(SSL *s, unsigned char **out, unsigned char *outlen, const unsigned char *in, unsigned int inlen, void *arg)
+ssl_npn_select_cb(SSL *ssl, unsigned char **out, unsigned char *outlen,
+		  const unsigned char *in, unsigned int inlen, void *arg)
 {
     VALUE sslctx_obj, cb;
 
     sslctx_obj = (VALUE) arg;
-    cb = rb_iv_get(sslctx_obj, "@npn_select_cb");
+    cb = rb_attr_get(sslctx_obj, id_i_npn_select_cb);
 
-    return ssl_npn_select_cb_common(cb, (const unsigned char **)out, outlen, in, inlen);
+    return ssl_npn_select_cb_common(ssl, cb, (const unsigned char **)out,
+				    outlen, in, inlen);
 }
 #endif
 
 #ifdef HAVE_SSL_CTX_SET_ALPN_SELECT_CB
 static int
-ssl_alpn_select_cb(SSL *ssl, const unsigned char **out, unsigned char *outlen, const unsigned char *in, unsigned int inlen, void *arg)
+ssl_alpn_select_cb(SSL *ssl, const unsigned char **out, unsigned char *outlen,
+		   const unsigned char *in, unsigned int inlen, void *arg)
 {
     VALUE sslctx_obj, cb;
 
     sslctx_obj = (VALUE) arg;
-    cb = rb_iv_get(sslctx_obj, "@alpn_select_cb");
+    cb = rb_attr_get(sslctx_obj, id_i_alpn_select_cb);
 
-    return ssl_npn_select_cb_common(cb, out, outlen, in, inlen);
+    return ssl_npn_select_cb_common(ssl, cb, out, outlen, in, inlen);
 }
 #endif
-#endif /* HAVE_SSL_CTX_SET_NEXT_PROTO_SELECT_CB || HAVE_SSL_CTX_SET_ALPN_SELECT_CB */
 
 /* This function may serve as the entry point to support further callbacks. */
 static void
@@ -678,7 +754,11 @@ ossl_sslctx_get_options(VALUE self)
 {
     SSL_CTX *ctx;
     GetSSLCTX(self, ctx);
-    return LONG2NUM(SSL_CTX_get_options(ctx));
+    /*
+     * Do explicit cast because SSL_CTX_get_options() returned (signed) long in
+     * OpenSSL before 1.1.0.
+     */
+    return ULONG2NUM((unsigned long)SSL_CTX_get_options(ctx));
 }
 
 /*
@@ -697,7 +777,7 @@ ossl_sslctx_set_options(VALUE self, VALUE options)
     if (NIL_P(options)) {
 	SSL_CTX_set_options(ctx, SSL_OP_ALL);
     } else {
-	SSL_CTX_set_options(ctx, NUM2LONG(options));
+	SSL_CTX_set_options(ctx, NUM2ULONG(options));
     }
 
     return self;
@@ -733,7 +813,7 @@ ossl_sslctx_setup(VALUE self)
 #if !defined(OPENSSL_NO_EC)
     /* We added SSLContext#tmp_ecdh_callback= in Ruby 2.3.0,
      * but SSL_CTX_set_tmp_ecdh_callback() was removed in OpenSSL 1.1.0. */
-    if (RTEST(ossl_sslctx_get_tmp_ecdh_cb(self))) {
+    if (RTEST(rb_attr_get(self, id_i_tmp_ecdh_callback))) {
 # if defined(HAVE_SSL_CTX_SET_TMP_ECDH_CALLBACK)
 	rb_warn("#tmp_ecdh_callback= is deprecated; use #ecdh_curves= instead");
 	SSL_CTX_set_tmp_ecdh_callback(ctx, ossl_tmp_ecdh_callback);
@@ -750,7 +830,11 @@ ossl_sslctx_setup(VALUE self)
     }
 #endif /* OPENSSL_NO_EC */
 
-    val = ossl_sslctx_get_cert_store(self);
+#ifdef HAVE_SSL_CTX_SET_POST_HANDSHAKE_AUTH
+    SSL_CTX_set_post_handshake_auth(ctx, 1);
+#endif
+
+    val = rb_attr_get(self, id_i_cert_store);
     if (!NIL_P(val)) {
 	X509_STORE *store = GetX509StorePtr(val); /* NO NEED TO DUP */
 	SSL_CTX_set_cert_store(ctx, store);
@@ -761,22 +845,22 @@ ossl_sslctx_setup(VALUE self)
 	 *   X509_STORE_free() doesn't care it.
 	 *   So we won't increment it but mark it by ex_data.
 	 */
-        SSL_CTX_set_ex_data(ctx, ossl_ssl_ex_store_p, (void *)1);
+        SSL_CTX_set_ex_data(ctx, ossl_sslctx_ex_store_p, ctx);
 #else /* Fixed in OpenSSL 1.0.2; bff9ce4db38b (master), 5b4b9ce976fc (1.0.2) */
 	X509_STORE_up_ref(store);
 #endif
     }
 
-    val = ossl_sslctx_get_extra_cert(self);
+    val = rb_attr_get(self, id_i_extra_chain_cert);
     if(!NIL_P(val)){
 	rb_block_call(val, rb_intern("each"), 0, 0, ossl_sslctx_add_extra_chain_cert_i, self);
     }
 
     /* private key may be bundled in certificate file. */
-    val = ossl_sslctx_get_cert(self);
+    val = rb_attr_get(self, id_i_cert);
     cert = NIL_P(val) ? NULL : GetX509CertPtr(val); /* NO DUP NEEDED */
-    val = ossl_sslctx_get_key(self);
-    key = NIL_P(val) ? NULL : GetPKeyPtr(val); /* NO DUP NEEDED */
+    val = rb_attr_get(self, id_i_key);
+    key = NIL_P(val) ? NULL : GetPrivPKeyPtr(val); /* NO DUP NEEDED */
     if (cert && key) {
         if (!SSL_CTX_use_certificate(ctx, cert)) {
             /* Adds a ref => Safe to FREE */
@@ -791,7 +875,7 @@ ossl_sslctx_setup(VALUE self)
         }
     }
 
-    val = ossl_sslctx_get_client_ca(self);
+    val = rb_attr_get(self, id_i_client_ca);
     if(!NIL_P(val)){
 	if (RB_TYPE_P(val, T_ARRAY)) {
 	    for(i = 0; i < RARRAY_LEN(val); i++){
@@ -811,48 +895,53 @@ ossl_sslctx_setup(VALUE self)
 	}
     }
 
-    val = ossl_sslctx_get_ca_file(self);
+    val = rb_attr_get(self, id_i_ca_file);
     ca_file = NIL_P(val) ? NULL : StringValueCStr(val);
-    val = ossl_sslctx_get_ca_path(self);
+    val = rb_attr_get(self, id_i_ca_path);
     ca_path = NIL_P(val) ? NULL : StringValueCStr(val);
     if(ca_file || ca_path){
 	if (!SSL_CTX_load_verify_locations(ctx, ca_file, ca_path))
 	    rb_warning("can't set verify locations");
     }
 
-    val = ossl_sslctx_get_verify_mode(self);
+    val = rb_attr_get(self, id_i_verify_mode);
     verify_mode = NIL_P(val) ? SSL_VERIFY_NONE : NUM2INT(val);
     SSL_CTX_set_verify(ctx, verify_mode, ossl_ssl_verify_callback);
-    if (RTEST(ossl_sslctx_get_client_cert_cb(self)))
+    if (RTEST(rb_attr_get(self, id_i_client_cert_cb)))
 	SSL_CTX_set_client_cert_cb(ctx, ossl_client_cert_cb);
 
-    val = ossl_sslctx_get_timeout(self);
+    val = rb_attr_get(self, id_i_timeout);
     if(!NIL_P(val)) SSL_CTX_set_timeout(ctx, NUM2LONG(val));
 
-    val = ossl_sslctx_get_verify_dep(self);
+    val = rb_attr_get(self, id_i_verify_depth);
     if(!NIL_P(val)) SSL_CTX_set_verify_depth(ctx, NUM2INT(val));
 
-#ifdef HAVE_SSL_CTX_SET_NEXT_PROTO_SELECT_CB
-    val = rb_iv_get(self, "@npn_protocols");
+#ifndef OPENSSL_NO_NEXTPROTONEG
+    val = rb_attr_get(self, id_i_npn_protocols);
     if (!NIL_P(val)) {
-	rb_iv_set(self, "@_protocols", ssl_encode_npn_protocols(val));
-	SSL_CTX_set_next_protos_advertised_cb(ctx, ssl_npn_advertise_cb, (void *) self);
+	VALUE encoded = ssl_encode_npn_protocols(val);
+	rb_ivar_set(self, id_npn_protocols_encoded, encoded);
+	SSL_CTX_set_next_protos_advertised_cb(ctx, ssl_npn_advertise_cb, (void *)self);
 	OSSL_Debug("SSL NPN advertise callback added");
     }
-    if (RTEST(rb_iv_get(self, "@npn_select_cb"))) {
+    if (RTEST(rb_attr_get(self, id_i_npn_select_cb))) {
 	SSL_CTX_set_next_proto_select_cb(ctx, ssl_npn_select_cb, (void *) self);
 	OSSL_Debug("SSL NPN select callback added");
     }
 #endif
 
 #ifdef HAVE_SSL_CTX_SET_ALPN_SELECT_CB
-    val = rb_iv_get(self, "@alpn_protocols");
+    val = rb_attr_get(self, id_i_alpn_protocols);
     if (!NIL_P(val)) {
 	VALUE rprotos = ssl_encode_npn_protocols(val);
-	SSL_CTX_set_alpn_protos(ctx, (unsigned char *)RSTRING_PTR(rprotos), RSTRING_LENINT(rprotos));
+
+	/* returns 0 on success */
+	if (SSL_CTX_set_alpn_protos(ctx, (unsigned char *)RSTRING_PTR(rprotos),
+				    RSTRING_LENINT(rprotos)))
+	    ossl_raise(eSSLError, "SSL_CTX_set_alpn_protos");
 	OSSL_Debug("SSL ALPN values added");
     }
-    if (RTEST(rb_iv_get(self, "@alpn_select_cb"))) {
+    if (RTEST(rb_attr_get(self, id_i_alpn_select_cb))) {
 	SSL_CTX_set_alpn_select_cb(ctx, ssl_alpn_select_cb, (void *) self);
 	OSSL_Debug("SSL ALPN select callback added");
     }
@@ -860,7 +949,7 @@ ossl_sslctx_setup(VALUE self)
 
     rb_obj_freeze(self);
 
-    val = ossl_sslctx_get_sess_id_ctx(self);
+    val = rb_attr_get(self, id_i_session_id_context);
     if (!NIL_P(val)){
 	StringValue(val);
 	if (!SSL_CTX_set_session_id_context(ctx, (unsigned char *)RSTRING_PTR(val),
@@ -869,26 +958,24 @@ ossl_sslctx_setup(VALUE self)
 	}
     }
 
-    if (RTEST(rb_iv_get(self, "@session_get_cb"))) {
+    if (RTEST(rb_attr_get(self, id_i_session_get_cb))) {
 	SSL_CTX_sess_set_get_cb(ctx, ossl_sslctx_session_get_cb);
 	OSSL_Debug("SSL SESSION get callback added");
     }
-    if (RTEST(rb_iv_get(self, "@session_new_cb"))) {
+    if (RTEST(rb_attr_get(self, id_i_session_new_cb))) {
 	SSL_CTX_sess_set_new_cb(ctx, ossl_sslctx_session_new_cb);
 	OSSL_Debug("SSL SESSION new callback added");
     }
-    if (RTEST(rb_iv_get(self, "@session_remove_cb"))) {
+    if (RTEST(rb_attr_get(self, id_i_session_remove_cb))) {
 	SSL_CTX_sess_set_remove_cb(ctx, ossl_sslctx_session_remove_cb);
 	OSSL_Debug("SSL SESSION remove callback added");
     }
 
-#ifdef HAVE_SSL_SET_TLSEXT_HOST_NAME
-    val = rb_iv_get(self, "@servername_cb");
+    val = rb_attr_get(self, id_i_servername_cb);
     if (!NIL_P(val)) {
         SSL_CTX_set_tlsext_servername_callback(ctx, ssl_servername_cb);
 	OSSL_Debug("SSL TLSEXT servername callback added");
     }
-#endif
 
     return Qtrue;
 }
@@ -903,8 +990,8 @@ ossl_ssl_cipher_to_ary(const SSL_CIPHER *cipher)
     rb_ary_push(ary, rb_str_new2(SSL_CIPHER_get_name(cipher)));
     rb_ary_push(ary, rb_str_new2(SSL_CIPHER_get_version(cipher)));
     bits = SSL_CIPHER_get_bits(cipher, &alg_bits);
-    rb_ary_push(ary, INT2FIX(bits));
-    rb_ary_push(ary, INT2FIX(alg_bits));
+    rb_ary_push(ary, INT2NUM(bits));
+    rb_ary_push(ary, INT2NUM(alg_bits));
 
     return ary;
 }
@@ -913,7 +1000,7 @@ ossl_ssl_cipher_to_ary(const SSL_CIPHER *cipher)
  * call-seq:
  *    ctx.ciphers => [[name, version, bits, alg_bits], ...]
  *
- * The list of ciphers configured for this context.
+ * The list of cipher suites configured for this context.
  */
 static VALUE
 ossl_sslctx_get_ciphers(VALUE self)
@@ -925,12 +1012,7 @@ ossl_sslctx_get_ciphers(VALUE self)
     int i, num;
 
     GetSSLCTX(self, ctx);
-    if(!ctx){
-        rb_warning("SSL_CTX is not initialized.");
-        return Qnil;
-    }
     ciphers = SSL_CTX_get_ciphers(ctx);
-
     if (!ciphers)
         return rb_ary_new();
 
@@ -949,11 +1031,9 @@ ossl_sslctx_get_ciphers(VALUE self)
  *    ctx.ciphers = [name, ...]
  *    ctx.ciphers = [[name, version, bits, alg_bits], ...]
  *
- * Sets the list of available ciphers for this context.  Note in a server
+ * Sets the list of available cipher suites for this context.  Note in a server
  * context some ciphers require the appropriate certificates.  For example, an
- * RSA cipher can only be chosen when an RSA certificate is available.
- *
- * See also OpenSSL::Cipher and OpenSSL::Cipher::ciphers
+ * RSA cipher suite can only be chosen when an RSA certificate is available.
  */
 static VALUE
 ossl_sslctx_set_ciphers(VALUE self, VALUE v)
@@ -980,10 +1060,6 @@ ossl_sslctx_set_ciphers(VALUE self, VALUE v)
     }
 
     GetSSLCTX(self, ctx);
-    if(!ctx){
-        ossl_raise(eSSLError, "SSL_CTX is not initialized.");
-        return Qnil;
-    }
     if (!SSL_CTX_set_cipher_list(ctx, StringValueCStr(str))) {
         ossl_raise(eSSLError, "SSL_CTX_set_cipher_list");
     }
@@ -1056,7 +1132,11 @@ ossl_sslctx_set_ecdh_curves(VALUE self, VALUE arg)
 	if (!ec)
 	    ossl_raise(eSSLError, NULL);
 	EC_KEY_set_asn1_flag(ec, OPENSSL_EC_NAMED_CURVE);
-	SSL_CTX_set_tmp_ecdh(ctx, ec);
+	if (!SSL_CTX_set_tmp_ecdh(ctx, ec)) {
+	    EC_KEY_free(ec);
+	    ossl_raise(eSSLError, "SSL_CTX_set_tmp_ecdh");
+	}
+	EC_KEY_free(ec);
 # if defined(HAVE_SSL_CTX_SET_ECDH_AUTO)
 	/* tmp_ecdh and ecdh_auto conflict. tmp_ecdh is ignored when ecdh_auto
 	 * is enabled. So disable ecdh_auto. */
@@ -1088,7 +1168,7 @@ ossl_sslctx_get_security_level(VALUE self)
     GetSSLCTX(self, ctx);
 
 #if defined(HAVE_SSL_CTX_GET_SECURITY_LEVEL)
-    return INT2FIX(SSL_CTX_get_security_level(ctx));
+    return INT2NUM(SSL_CTX_get_security_level(ctx));
 #else
     (void)ctx;
     return INT2FIX(0);
@@ -1097,7 +1177,7 @@ ossl_sslctx_get_security_level(VALUE self)
 
 /*
  * call-seq:
- *    ctx.security_level=(integer) -> Integer
+ *    ctx.security_level = integer
  *
  * Sets the security level for the context. OpenSSL limits parameters according
  * to the level. The "parameters" include: ciphersuites, curves, key sizes,
@@ -1134,11 +1214,139 @@ ossl_sslctx_set_security_level(VALUE self, VALUE value)
     return value;
 }
 
+#ifdef SSL_MODE_SEND_FALLBACK_SCSV
+/*
+ * call-seq:
+ *    ctx.enable_fallback_scsv() => nil
+ *
+ * Activate TLS_FALLBACK_SCSV for this context.
+ * See RFC 7507.
+ */
+static VALUE
+ossl_sslctx_enable_fallback_scsv(VALUE self)
+{
+    SSL_CTX *ctx;
+
+    GetSSLCTX(self, ctx);
+    SSL_CTX_set_mode(ctx, SSL_MODE_SEND_FALLBACK_SCSV);
+
+    return Qnil;
+}
+#endif
+
+/*
+ * call-seq:
+ *    ctx.add_certificate(certiticate, pkey [, extra_certs]) -> self
+ *
+ * Adds a certificate to the context. _pkey_ must be a corresponding private
+ * key with _certificate_.
+ *
+ * Multiple certificates with different public key type can be added by
+ * repeated calls of this method, and OpenSSL will choose the most appropriate
+ * certificate during the handshake.
+ *
+ * #cert=, #key=, and #extra_chain_cert= are old accessor methods for setting
+ * certificate and internally call this method.
+ *
+ * === Parameters
+ * _certificate_::
+ *   A certificate. An instance of OpenSSL::X509::Certificate.
+ * _pkey_::
+ *   The private key for _certificate_. An instance of OpenSSL::PKey::PKey.
+ * _extra_certs_::
+ *   Optional. An array of OpenSSL::X509::Certificate. When sending a
+ *   certificate chain, the certificates specified by this are sent following
+ *   _certificate_, in the order in the array.
+ *
+ * === Example
+ *   rsa_cert = OpenSSL::X509::Certificate.new(...)
+ *   rsa_pkey = OpenSSL::PKey.read(...)
+ *   ca_intermediate_cert = OpenSSL::X509::Certificate.new(...)
+ *   ctx.add_certificate(rsa_cert, rsa_pkey, [ca_intermediate_cert])
+ *
+ *   ecdsa_cert = ...
+ *   ecdsa_pkey = ...
+ *   another_ca_cert = ...
+ *   ctx.add_certificate(ecdsa_cert, ecdsa_pkey, [another_ca_cert])
+ *
+ * === Note
+ * OpenSSL before the version 1.0.2 could handle only one extra chain across
+ * all key types. Calling this method discards the chain set previously.
+ */
+static VALUE
+ossl_sslctx_add_certificate(int argc, VALUE *argv, VALUE self)
+{
+    VALUE cert, key, extra_chain_ary;
+    SSL_CTX *ctx;
+    X509 *x509;
+    STACK_OF(X509) *extra_chain = NULL;
+    EVP_PKEY *pkey, *pub_pkey;
+
+    GetSSLCTX(self, ctx);
+    rb_scan_args(argc, argv, "21", &cert, &key, &extra_chain_ary);
+    rb_check_frozen(self);
+    x509 = GetX509CertPtr(cert);
+    pkey = GetPrivPKeyPtr(key);
+
+    /*
+     * The reference counter is bumped, and decremented immediately.
+     * X509_get0_pubkey() is only available in OpenSSL >= 1.1.0.
+     */
+    pub_pkey = X509_get_pubkey(x509);
+    EVP_PKEY_free(pub_pkey);
+    if (!pub_pkey)
+	rb_raise(rb_eArgError, "certificate does not contain public key");
+    if (EVP_PKEY_cmp(pub_pkey, pkey) != 1)
+	rb_raise(rb_eArgError, "public key mismatch");
+
+    if (argc >= 3)
+	extra_chain = ossl_x509_ary2sk(extra_chain_ary);
+
+    if (!SSL_CTX_use_certificate(ctx, x509)) {
+	sk_X509_pop_free(extra_chain, X509_free);
+	ossl_raise(eSSLError, "SSL_CTX_use_certificate");
+    }
+    if (!SSL_CTX_use_PrivateKey(ctx, pkey)) {
+	sk_X509_pop_free(extra_chain, X509_free);
+	ossl_raise(eSSLError, "SSL_CTX_use_PrivateKey");
+    }
+
+    if (extra_chain) {
+#if OPENSSL_VERSION_NUMBER >= 0x10002000 && !defined(LIBRESSL_VERSION_NUMBER)
+	if (!SSL_CTX_set0_chain(ctx, extra_chain)) {
+	    sk_X509_pop_free(extra_chain, X509_free);
+	    ossl_raise(eSSLError, "SSL_CTX_set0_chain");
+	}
+#else
+	STACK_OF(X509) *orig_extra_chain;
+	X509 *x509_tmp;
+
+	/* First, clear the existing chain */
+	SSL_CTX_get_extra_chain_certs(ctx, &orig_extra_chain);
+	if (orig_extra_chain && sk_X509_num(orig_extra_chain)) {
+	    rb_warning("SSL_CTX_set0_chain() is not available; " \
+		       "clearing previously set certificate chain");
+	    SSL_CTX_clear_extra_chain_certs(ctx);
+	}
+	while ((x509_tmp = sk_X509_shift(extra_chain))) {
+	    /* Transfers ownership */
+	    if (!SSL_CTX_add_extra_chain_cert(ctx, x509_tmp)) {
+		X509_free(x509_tmp);
+		sk_X509_pop_free(extra_chain, X509_free);
+		ossl_raise(eSSLError, "SSL_CTX_add_extra_chain_cert");
+	    }
+	}
+	sk_X509_free(extra_chain);
+#endif
+    }
+    return self;
+}
+
 /*
  *  call-seq:
  *     ctx.session_add(session) -> true | false
  *
- * Adds +session+ to the session cache
+ * Adds _session_ to the session cache.
  */
 static VALUE
 ossl_sslctx_session_add(VALUE self, VALUE arg)
@@ -1147,7 +1355,7 @@ ossl_sslctx_session_add(VALUE self, VALUE arg)
     SSL_SESSION *sess;
 
     GetSSLCTX(self, ctx);
-    SafeGetSSLSession(arg, sess);
+    GetSSLSession(arg, sess);
 
     return SSL_CTX_add_session(ctx, sess) == 1 ? Qtrue : Qfalse;
 }
@@ -1156,7 +1364,7 @@ ossl_sslctx_session_add(VALUE self, VALUE arg)
  *  call-seq:
  *     ctx.session_remove(session) -> true | false
  *
- * Removes +session+ from the session cache
+ * Removes _session_ from the session cache.
  */
 static VALUE
 ossl_sslctx_session_remove(VALUE self, VALUE arg)
@@ -1165,7 +1373,7 @@ ossl_sslctx_session_remove(VALUE self, VALUE arg)
     SSL_SESSION *sess;
 
     GetSSLCTX(self, ctx);
-    SafeGetSSLSession(arg, sess);
+    GetSSLSession(arg, sess);
 
     return SSL_CTX_remove_session(ctx, sess) == 1 ? Qtrue : Qfalse;
 }
@@ -1292,9 +1500,9 @@ ossl_sslctx_get_session_cache_stats(VALUE self)
 
 /*
  *  call-seq:
- *     ctx.flush_sessions(time | nil) -> self
+ *     ctx.flush_sessions(time) -> self
  *
- * Removes sessions in the internal cache that have expired at +time+.
+ * Removes sessions in the internal cache that have expired at _time_.
  */
 static VALUE
 ossl_sslctx_flush_sessions(int argc, VALUE *argv, VALUE self)
@@ -1332,21 +1540,11 @@ ssl_started(SSL *ssl)
 }
 
 static void
-ossl_ssl_shutdown(SSL *ssl)
+ossl_ssl_mark(void *ptr)
 {
-    int i;
-
-    /* 4 is from SSL_smart_shutdown() of mod_ssl.c (v2.2.19) */
-    /* It says max 2x pending + 2x data = 4 */
-    for (i = 0; i < 4; ++i) {
-	/*
-	 * Ignore the case SSL_shutdown returns -1. Empty handshake_func
-	 * must not happen.
-	 */
-	if (SSL_shutdown(ssl) != 0)
-	    break;
-    }
-    ossl_clear_error();
+    SSL *ssl = ptr;
+    rb_gc_mark((VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx));
+    rb_gc_mark((VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_vcb_idx));
 }
 
 static void
@@ -1358,7 +1556,7 @@ ossl_ssl_free(void *ssl)
 const rb_data_type_t ossl_ssl_type = {
     "OpenSSL/SSL",
     {
-	0, ossl_ssl_free,
+        ossl_ssl_mark, ossl_ssl_free,
     },
     0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
 };
@@ -1374,10 +1572,10 @@ ossl_ssl_s_alloc(VALUE klass)
  *    SSLSocket.new(io) => aSSLSocket
  *    SSLSocket.new(io, ctx) => aSSLSocket
  *
- * Creates a new SSL socket from +io+ which must be a real ruby object (not an
+ * Creates a new SSL socket from _io_ which must be a real IO object (not an
  * IO-like object that responds to read/write).
  *
- * If +ctx+ is provided the SSL Sockets initial params will be taken from
+ * If _ctx_ is provided the SSL Sockets initial params will be taken from
  * the context.
  *
  * The OpenSSL::Buffering module provides additional IO methods.
@@ -1400,14 +1598,12 @@ ossl_ssl_initialize(int argc, VALUE *argv, VALUE self)
 	v_ctx = rb_funcall(cSSLContext, rb_intern("new"), 0);
 
     GetSSLCTX(v_ctx, ctx);
-    ossl_ssl_set_ctx(self, v_ctx);
+    rb_ivar_set(self, id_i_context, v_ctx);
     ossl_sslctx_setup(v_ctx);
 
     if (rb_respond_to(io, rb_intern("nonblock=")))
 	rb_funcall(io, rb_intern("nonblock="), 1, Qtrue);
-    ossl_ssl_set_io(self, io);
-
-    ossl_ssl_set_sync_close(self, Qfalse);
+    rb_ivar_set(self, id_i_io, io);
 
     ssl = SSL_new(ctx);
     if (!ssl)
@@ -1416,7 +1612,7 @@ ossl_ssl_initialize(int argc, VALUE *argv, VALUE self)
 
     SSL_set_ex_data(ssl, ossl_ssl_ex_ptr_idx, (void *)self);
     SSL_set_info_callback(ssl, ssl_info_cb);
-    verify_cb = ossl_sslctx_get_verify_cb(v_ctx);
+    verify_cb = rb_attr_get(v_ctx, id_i_verify_callback);
     SSL_set_ex_data(ssl, ossl_ssl_ex_vcb_idx, (void *)verify_cb);
 
     rb_call_super(0, NULL);
@@ -1435,11 +1631,12 @@ ossl_ssl_setup(VALUE self)
     if (ssl_started(ssl))
 	return Qtrue;
 
-    io = ossl_ssl_get_io(self);
+    io = rb_attr_get(self, id_i_io);
     GetOpenFile(io, fptr);
     rb_io_check_readable(fptr);
     rb_io_check_writable(fptr);
-    SSL_set_fd(ssl, TO_SOCKET(FPTR_TO_FD(fptr)));
+    if (!SSL_set_fd(ssl, TO_SOCKET(fptr->fd)))
+	ossl_raise(eSSLError, "SSL_set_fd");
 
     return Qtrue;
 }
@@ -1453,19 +1650,15 @@ ossl_ssl_setup(VALUE self)
 static void
 write_would_block(int nonblock)
 {
-    if (nonblock) {
-        VALUE exc = ossl_exc_new(eSSLErrorWaitWritable, "write would block");
-        rb_exc_raise(exc);
-    }
+    if (nonblock)
+	ossl_raise(eSSLErrorWaitWritable, "write would block");
 }
 
 static void
 read_would_block(int nonblock)
 {
-    if (nonblock) {
-        VALUE exc = ossl_exc_new(eSSLErrorWaitReadable, "read would block");
-        rb_exc_raise(exc);
-    }
+    if (nonblock)
+	ossl_raise(eSSLErrorWaitReadable, "read would block");
 }
 
 static int
@@ -1485,16 +1678,19 @@ ossl_start_ssl(VALUE self, int (*func)(), const char *funcname, VALUE opts)
     int ret, ret2;
     VALUE cb_state;
     int nonblock = opts != Qfalse;
+#if defined(SSL_R_CERTIFICATE_VERIFY_FAILED)
+    unsigned long err;
+#endif
 
     rb_ivar_set(self, ID_callback_state, Qnil);
 
     GetSSL(self, ssl);
 
-    GetOpenFile(ossl_ssl_get_io(self), fptr);
+    GetOpenFile(rb_attr_get(self, id_i_io), fptr);
     for(;;){
 	ret = func(ssl);
 
-        cb_state = rb_ivar_get(self, ID_callback_state);
+	cb_state = rb_attr_get(self, ID_callback_state);
         if (!NIL_P(cb_state)) {
 	    /* must cleanup OpenSSL error stack before re-raising */
 	    ossl_clear_error();
@@ -1508,16 +1704,38 @@ ossl_start_ssl(VALUE self, int (*func)(), const char *funcname, VALUE opts)
 	case SSL_ERROR_WANT_WRITE:
             if (no_exception_p(opts)) { return sym_wait_writable; }
             write_would_block(nonblock);
-            rb_io_wait_writable(FPTR_TO_FD(fptr));
+            rb_io_wait_writable(fptr->fd);
             continue;
 	case SSL_ERROR_WANT_READ:
             if (no_exception_p(opts)) { return sym_wait_readable; }
             read_would_block(nonblock);
-            rb_io_wait_readable(FPTR_TO_FD(fptr));
+            rb_io_wait_readable(fptr->fd);
             continue;
 	case SSL_ERROR_SYSCALL:
+#ifdef __APPLE__
+            /* See ossl_ssl_write_internal() */
+            if (errno == EPROTOTYPE)
+                continue;
+#endif
 	    if (errno) rb_sys_fail(funcname);
 	    ossl_raise(eSSLError, "%s SYSCALL returned=%d errno=%d state=%s", funcname, ret2, errno, SSL_state_string_long(ssl));
+#if defined(SSL_R_CERTIFICATE_VERIFY_FAILED)
+	case SSL_ERROR_SSL:
+	    err = ERR_peek_last_error();
+	    if (ERR_GET_LIB(err) == ERR_LIB_SSL &&
+		ERR_GET_REASON(err) == SSL_R_CERTIFICATE_VERIFY_FAILED) {
+		const char *err_msg = ERR_reason_error_string(err),
+		      *verify_msg = X509_verify_cert_error_string(SSL_get_verify_result(ssl));
+		if (!err_msg)
+		    err_msg = "(null)";
+		if (!verify_msg)
+		    verify_msg = "(null)";
+		ossl_clear_error(); /* let ossl_raise() not append message */
+		ossl_raise(eSSLError, "%s returned=%d errno=%d state=%s: %s (%s)",
+			   funcname, ret2, errno, SSL_state_string_long(ssl),
+			   err_msg, verify_msg);
+	    }
+#endif
 	default:
 	    ossl_raise(eSSLError, "%s returned=%d errno=%d state=%s", funcname, ret2, errno, SSL_state_string_long(ssl));
 	}
@@ -1558,10 +1776,10 @@ ossl_ssl_connect(VALUE self)
  *     retry
  *   end
  *
- * By specifying `exception: false`, the options hash allows you to indicate
+ * By specifying a keyword argument _exception_ to +false+, you can indicate
  * that connect_nonblock should not raise an IO::WaitReadable or
- * IO::WaitWritable exception, but return the symbol :wait_readable or
- * :wait_writable instead.
+ * IO::WaitWritable exception, but return the symbol +:wait_readable+ or
+ * +:wait_writable+ instead.
  */
 static VALUE
 ossl_ssl_connect_nonblock(int argc, VALUE *argv, VALUE self)
@@ -1606,10 +1824,10 @@ ossl_ssl_accept(VALUE self)
  *     retry
  *   end
  *
- * By specifying `exception: false`, the options hash allows you to indicate
+ * By specifying a keyword argument _exception_ to +false+, you can indicate
  * that accept_nonblock should not raise an IO::WaitReadable or
- * IO::WaitWritable exception, but return the symbol :wait_readable or
- * :wait_writable instead.
+ * IO::WaitWritable exception, but return the symbol +:wait_readable+ or
+ * +:wait_writable+ instead.
  */
 static VALUE
 ossl_ssl_accept_nonblock(int argc, VALUE *argv, VALUE self)
@@ -1629,7 +1847,7 @@ ossl_ssl_read_internal(int argc, VALUE *argv, VALUE self, int nonblock)
     int ilen, nread = 0;
     VALUE len, str;
     rb_io_t *fptr;
-    VALUE opts = Qnil;
+    VALUE io, opts = Qnil;
 
     if (nonblock) {
 	rb_scan_args(argc, argv, "11:", &len, &str, &opts);
@@ -1638,62 +1856,97 @@ ossl_ssl_read_internal(int argc, VALUE *argv, VALUE self, int nonblock)
     }
 
     ilen = NUM2INT(len);
-    if(NIL_P(str)) str = rb_str_new(0, ilen);
-    else{
-        StringValue(str);
-        rb_str_modify(str);
-        rb_str_resize(str, ilen);
+    if (NIL_P(str))
+	str = rb_str_new(0, ilen);
+    else {
+	StringValue(str);
+	if (RSTRING_LEN(str) >= ilen)
+	    rb_str_modify(str);
+	else
+	    rb_str_modify_expand(str, ilen - RSTRING_LEN(str));
     }
-    if(ilen == 0) return str;
+    rb_str_set_len(str, 0);
+    if (ilen == 0)
+	return str;
 
     GetSSL(self, ssl);
-    GetOpenFile(ossl_ssl_get_io(self), fptr);
+    io = rb_attr_get(self, id_i_io);
+    GetOpenFile(io, fptr);
     if (ssl_started(ssl)) {
-	if(!nonblock && SSL_pending(ssl) <= 0)
-	    rb_thread_wait_fd(FPTR_TO_FD(fptr));
-	for (;;){
-	    nread = SSL_read(ssl, RSTRING_PTR(str), RSTRING_LENINT(str));
+        rb_str_locktmp(str);
+        for (;;) {
+	    nread = SSL_read(ssl, RSTRING_PTR(str), ilen);
 	    switch(ssl_get_error(ssl, nread)){
 	    case SSL_ERROR_NONE:
+                rb_str_unlocktmp(str);
 		goto end;
 	    case SSL_ERROR_ZERO_RETURN:
+                rb_str_unlocktmp(str);
 		if (no_exception_p(opts)) { return Qnil; }
 		rb_eof_error();
 	    case SSL_ERROR_WANT_WRITE:
-		if (no_exception_p(opts)) { return sym_wait_writable; }
-                write_would_block(nonblock);
-                rb_io_wait_writable(FPTR_TO_FD(fptr));
+                if (nonblock) {
+                    rb_str_unlocktmp(str);
+                    if (no_exception_p(opts)) { return sym_wait_writable; }
+                    write_would_block(nonblock);
+                }
+                rb_io_wait_writable(fptr->fd);
                 continue;
 	    case SSL_ERROR_WANT_READ:
-		if (no_exception_p(opts)) { return sym_wait_readable; }
-                read_would_block(nonblock);
-                rb_io_wait_readable(FPTR_TO_FD(fptr));
+                if (nonblock) {
+                    rb_str_unlocktmp(str);
+                    if (no_exception_p(opts)) { return sym_wait_readable; }
+                    read_would_block(nonblock);
+                }
+                rb_io_wait_readable(fptr->fd);
 		continue;
 	    case SSL_ERROR_SYSCALL:
-		if(ERR_peek_error() == 0 && nread == 0) {
-		    if (no_exception_p(opts)) { return Qnil; }
-		    rb_eof_error();
+		if (!ERR_peek_error()) {
+                    rb_str_unlocktmp(str);
+		    if (errno)
+			rb_sys_fail(0);
+		    else {
+			/*
+			 * The underlying BIO returned 0. This is actually a
+			 * protocol error. But unfortunately, not all
+			 * implementations cleanly shutdown the TLS connection
+			 * but just shutdown/close the TCP connection. So report
+			 * EOF for now...
+			 */
+			if (no_exception_p(opts)) { return Qnil; }
+			rb_eof_error();
+		    }
 		}
-		rb_sys_fail(0);
+                /* fall through */
 	    default:
+                rb_str_unlocktmp(str);
 		ossl_raise(eSSLError, "SSL_read");
 	    }
         }
     }
     else {
         ID meth = nonblock ? rb_intern("read_nonblock") : rb_intern("sysread");
+
         rb_warning("SSL session is not started yet.");
+#if defined(RB_PASS_KEYWORDS)
+        if (nonblock) {
+            VALUE argv[3];
+            argv[0] = len;
+            argv[1] = str;
+            argv[2] = opts;
+            return rb_funcallv_kw(io, meth, 3, argv, RB_PASS_KEYWORDS);
+        }
+#else
         if (nonblock) {
-          return rb_funcall(ossl_ssl_get_io(self), meth, 3, len, str, opts);
-        } else {
-          return rb_funcall(ossl_ssl_get_io(self), meth, 2, len, str);
+            return rb_funcall(io, meth, 3, len, str, opts);
         }
+#endif
+        else
+            return rb_funcall(io, meth, 2, len, str);
     }
 
   end:
     rb_str_set_len(str, nread);
-    OBJ_TAINT(str);
-
     return str;
 }
 
@@ -1702,7 +1955,7 @@ ossl_ssl_read_internal(int argc, VALUE *argv, VALUE self, int nonblock)
  *    ssl.sysread(length) => string
  *    ssl.sysread(length, buffer) => buffer
  *
- * Reads +length+ bytes from the SSL connection.  If a pre-allocated +buffer+
+ * Reads _length_ bytes from the SSL connection.  If a pre-allocated _buffer_
  * is provided the data will be written into it.
  */
 static VALUE
@@ -1721,7 +1974,7 @@ ossl_ssl_read(int argc, VALUE *argv, VALUE self)
  * block.  If "exception: false" is passed, this method returns a symbol of
  * :wait_readable, :wait_writable, or nil, rather than raising an exception.
  *
- * Reads +length+ bytes from the SSL connection.  If a pre-allocated +buffer+
+ * Reads _length_ bytes from the SSL connection.  If a pre-allocated _buffer_
  * is provided the data will be written into it.
  */
 static VALUE
@@ -1737,28 +1990,45 @@ ossl_ssl_write_internal(VALUE self, VALUE str, VALUE opts)
     int nwrite = 0;
     rb_io_t *fptr;
     int nonblock = opts != Qfalse;
+    VALUE tmp, io;
 
-    StringValue(str);
+    tmp = rb_str_new_frozen(StringValue(str));
     GetSSL(self, ssl);
-    GetOpenFile(ossl_ssl_get_io(self), fptr);
-
+    io = rb_attr_get(self, id_i_io);
+    GetOpenFile(io, fptr);
     if (ssl_started(ssl)) {
-	for (;;){
-	    nwrite = SSL_write(ssl, RSTRING_PTR(str), RSTRING_LENINT(str));
+	for (;;) {
+	    int num = RSTRING_LENINT(tmp);
+
+	    /* SSL_write(3ssl) manpage states num == 0 is undefined */
+	    if (num == 0)
+		goto end;
+
+	    nwrite = SSL_write(ssl, RSTRING_PTR(tmp), num);
 	    switch(ssl_get_error(ssl, nwrite)){
 	    case SSL_ERROR_NONE:
 		goto end;
 	    case SSL_ERROR_WANT_WRITE:
 		if (no_exception_p(opts)) { return sym_wait_writable; }
                 write_would_block(nonblock);
-                rb_io_wait_writable(FPTR_TO_FD(fptr));
+                rb_io_wait_writable(fptr->fd);
                 continue;
 	    case SSL_ERROR_WANT_READ:
 		if (no_exception_p(opts)) { return sym_wait_readable; }
                 read_would_block(nonblock);
-                rb_io_wait_readable(FPTR_TO_FD(fptr));
+                rb_io_wait_readable(fptr->fd);
                 continue;
 	    case SSL_ERROR_SYSCALL:
+#ifdef __APPLE__
+                /*
+                 * It appears that send syscall can return EPROTOTYPE if the
+                 * socket is being torn down. Retry to get a proper errno to
+                 * make the error handling in line with the socket library.
+                 * [Bug #14713] https://bugs.ruby-lang.org/issues/14713
+                 */
+                if (errno == EPROTOTYPE)
+                    continue;
+#endif
 		if (errno) rb_sys_fail(0);
 	    default:
 		ossl_raise(eSSLError, "SSL_write");
@@ -1766,9 +2036,24 @@ ossl_ssl_write_internal(VALUE self, VALUE str, VALUE opts)
         }
     }
     else {
-        ID id_syswrite = rb_intern("syswrite");
+	ID meth = nonblock ?
+	    rb_intern("write_nonblock") : rb_intern("syswrite");
+
         rb_warning("SSL session is not started yet.");
-	return rb_funcall(ossl_ssl_get_io(self), id_syswrite, 1, str);
+#if defined(RB_PASS_KEYWORDS)
+        if (nonblock) {
+            VALUE argv[2];
+            argv[0] = str;
+            argv[1] = opts;
+            return rb_funcallv_kw(io, meth, 2, argv, RB_PASS_KEYWORDS);
+        }
+#else
+        if (nonblock) {
+            return rb_funcall(io, meth, 2, str, opts);
+        }
+#endif
+        else
+            return rb_funcall(io, meth, 1, str);
     }
 
   end:
@@ -1779,7 +2064,7 @@ ossl_ssl_write_internal(VALUE self, VALUE str, VALUE opts)
  * call-seq:
  *    ssl.syswrite(string) => Integer
  *
- * Writes +string+ to the SSL connection.
+ * Writes _string_ to the SSL connection.
  */
 static VALUE
 ossl_ssl_write(VALUE self, VALUE str)
@@ -1791,7 +2076,7 @@ ossl_ssl_write(VALUE self, VALUE str)
  * call-seq:
  *    ssl.syswrite_nonblock(string) => Integer
  *
- * Writes +string+ to the SSL connection in a non-blocking manner.  Raises an
+ * Writes _string_ to the SSL connection in a non-blocking manner.  Raises an
  * SSLError if writing would block.
  */
 static VALUE
@@ -1815,11 +2100,24 @@ static VALUE
 ossl_ssl_stop(VALUE self)
 {
     SSL *ssl;
+    int ret;
 
     GetSSL(self, ssl);
+    if (!ssl_started(ssl))
+	return Qnil;
+    ret = SSL_shutdown(ssl);
+    if (ret == 1) /* Have already received close_notify */
+	return Qnil;
+    if (ret == 0) /* Sent close_notify, but we don't wait for reply */
+	return Qnil;
 
-    ossl_ssl_shutdown(ssl);
-
+    /*
+     * XXX: Something happened. Possibly it failed because the underlying socket
+     * is not writable/readable, since it is in non-blocking mode. We should do
+     * some proper error handling using SSL_get_error() and maybe retry, but we
+     * can't block here. Give up for now.
+     */
+    ossl_clear_error();
     return Qnil;
 }
 
@@ -1922,29 +2220,29 @@ ossl_ssl_get_version(VALUE self)
 }
 
 /*
-* call-seq:
-*    ssl.cipher => [name, version, bits, alg_bits]
-*
-* The cipher being used for the current connection
-*/
+ * call-seq:
+ *    ssl.cipher -> nil or [name, version, bits, alg_bits]
+ *
+ * Returns the cipher suite actually used in the current session, or nil if
+ * no session has been established.
+ */
 static VALUE
 ossl_ssl_get_cipher(VALUE self)
 {
     SSL *ssl;
-    SSL_CIPHER *cipher;
+    const SSL_CIPHER *cipher;
 
     GetSSL(self, ssl);
-
-    cipher = (SSL_CIPHER *)SSL_get_current_cipher(ssl);
-
-    return ossl_ssl_cipher_to_ary(cipher);
+    cipher = SSL_get_current_cipher(ssl);
+    return cipher ? ossl_ssl_cipher_to_ary(cipher) : Qnil;
 }
 
 /*
  * call-seq:
  *    ssl.state => string
  *
- * A description of the current connection state.
+ * A description of the current connection state. This is for diagnostic
+ * purposes only.
  */
 static VALUE
 ossl_ssl_get_state(VALUE self)
@@ -1966,7 +2264,7 @@ ossl_ssl_get_state(VALUE self)
  * call-seq:
  *    ssl.pending => Integer
  *
- * The number of bytes that are immediately available for reading
+ * The number of bytes that are immediately available for reading.
  */
 static VALUE
 ossl_ssl_pending(VALUE self)
@@ -1982,7 +2280,7 @@ ossl_ssl_pending(VALUE self)
  * call-seq:
  *    ssl.session_reused? -> true | false
  *
- * Returns true if a reused session was negotiated during the handshake.
+ * Returns +true+ if a reused session was negotiated during the handshake.
  */
 static VALUE
 ossl_ssl_session_reused(VALUE self)
@@ -2007,7 +2305,7 @@ ossl_ssl_set_session(VALUE self, VALUE arg1)
     SSL_SESSION *sess;
 
     GetSSL(self, ssl);
-    SafeGetSSLSession(arg1, sess);
+    GetSSLSession(arg1, sess);
 
     if (SSL_set_session(ssl, sess) != 1)
         ossl_raise(eSSLError, "SSL_set_session");
@@ -2022,7 +2320,6 @@ ossl_ssl_set_session(VALUE self, VALUE arg1)
  * Sets the server hostname used for SNI. This needs to be set before
  * SSLSocket#connect.
  */
-#ifdef HAVE_SSL_SET_TLSEXT_HOST_NAME
 static VALUE
 ossl_ssl_set_hostname(VALUE self, VALUE arg)
 {
@@ -2038,11 +2335,10 @@ ossl_ssl_set_hostname(VALUE self, VALUE arg)
 	ossl_raise(eSSLError, NULL);
 
     /* for SSLSocket#hostname */
-    ossl_ssl_set_hostname_v(self, arg);
+    rb_ivar_set(self, id_i_hostname, arg);
 
     return arg;
 }
-#endif
 
 /*
  * call-seq:
@@ -2060,7 +2356,57 @@ ossl_ssl_get_verify_result(VALUE self)
 
     GetSSL(self, ssl);
 
-    return INT2FIX(SSL_get_verify_result(ssl));
+    return LONG2NUM(SSL_get_verify_result(ssl));
+}
+
+/*
+ * call-seq:
+ *    ssl.finished_message => "finished message"
+ *
+ * Returns the last *Finished* message sent
+ *
+ */
+static VALUE
+ossl_ssl_get_finished(VALUE self)
+{
+    SSL *ssl;
+    char sizer[1], *buf;
+    size_t len;
+
+    GetSSL(self, ssl);
+
+    len = SSL_get_finished(ssl, sizer, 0);
+    if (len == 0)
+        return Qnil;
+
+    buf = ALLOCA_N(char, len);
+    SSL_get_finished(ssl, buf, len);
+    return rb_str_new(buf, len);
+}
+
+/*
+ * call-seq:
+ *    ssl.peer_finished_message => "peer finished message"
+ *
+ * Returns the last *Finished* message received
+ *
+ */
+static VALUE
+ossl_ssl_get_peer_finished(VALUE self)
+{
+    SSL *ssl;
+    char sizer[1], *buf;
+    size_t len;
+
+    GetSSL(self, ssl);
+
+    len = SSL_get_peer_finished(ssl, sizer, 0);
+    if (len == 0)
+        return Qnil;
+
+    buf = ALLOCA_N(char, len);
+    SSL_get_peer_finished(ssl, buf, len);
+    return rb_str_new(buf, len);
 }
 
 /*
@@ -2086,10 +2432,10 @@ ossl_ssl_get_client_ca_list(VALUE self)
     return ossl_x509name_sk2ary(ca);
 }
 
-# ifdef HAVE_SSL_CTX_SET_NEXT_PROTO_SELECT_CB
+# ifndef OPENSSL_NO_NEXTPROTONEG
 /*
  * call-seq:
- *    ssl.npn_protocol => String
+ *    ssl.npn_protocol => String | nil
  *
  * Returns the protocol string that was finally selected by the client
  * during the handshake.
@@ -2114,9 +2460,9 @@ ossl_ssl_npn_protocol(VALUE self)
 # ifdef HAVE_SSL_CTX_SET_ALPN_SELECT_CB
 /*
  * call-seq:
- *    ssl.alpn_protocol => String
+ *    ssl.alpn_protocol => String | nil
  *
- * Returns the ALPN protocol string that was finally selected by the client
+ * Returns the ALPN protocol string that was finally selected by the server
  * during the handshake.
  */
 static VALUE
@@ -2141,7 +2487,7 @@ ossl_ssl_alpn_protocol(VALUE self)
  * call-seq:
  *    ssl.tmp_key => PKey or nil
  *
- * Returns the ephemeral key used in case of forward secrecy cipher
+ * Returns the ephemeral key used in case of forward secrecy cipher.
  */
 static VALUE
 ossl_ssl_tmp_key(VALUE self)
@@ -2160,18 +2506,30 @@ ossl_ssl_tmp_key(VALUE self)
 void
 Init_ossl_ssl(void)
 {
-    int i;
-    VALUE ary;
-
 #if 0
-    mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
+    mOSSL = rb_define_module("OpenSSL");
+    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
+    rb_mWaitReadable = rb_define_module_under(rb_cIO, "WaitReadable");
+    rb_mWaitWritable = rb_define_module_under(rb_cIO, "WaitWritable");
 #endif
 
-    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);
+    id_call = rb_intern_const("call");
+    ID_callback_state = rb_intern_const("callback_state");
+
+    ossl_ssl_ex_vcb_idx = SSL_get_ex_new_index(0, (void *)"ossl_ssl_ex_vcb_idx", 0, 0, 0);
+    if (ossl_ssl_ex_vcb_idx < 0)
+	ossl_raise(rb_eRuntimeError, "SSL_get_ex_new_index");
+    ossl_ssl_ex_ptr_idx = SSL_get_ex_new_index(0, (void *)"ossl_ssl_ex_ptr_idx", 0, 0, 0);
+    if (ossl_ssl_ex_ptr_idx < 0)
+	ossl_raise(rb_eRuntimeError, "SSL_get_ex_new_index");
+    ossl_sslctx_ex_ptr_idx = SSL_CTX_get_ex_new_index(0, (void *)"ossl_sslctx_ex_ptr_idx", 0, 0, 0);
+    if (ossl_sslctx_ex_ptr_idx < 0)
+	ossl_raise(rb_eRuntimeError, "SSL_CTX_get_ex_new_index");
+#if !defined(HAVE_X509_STORE_UP_REF)
+    ossl_sslctx_ex_store_p = SSL_CTX_get_ex_new_index(0, (void *)"ossl_sslctx_ex_store_p", 0, 0, 0);
+    if (ossl_sslctx_ex_store_p < 0)
+	ossl_raise(rb_eRuntimeError, "SSL_CTX_get_ex_new_index");
+#endif
 
     /* Document-module: OpenSSL::SSL
      *
@@ -2187,7 +2545,7 @@ Init_ossl_ssl(void)
      * This module contains configuration information about the SSL extension,
      * for example if socket support is enabled, or the host name TLS extension
      * is enabled.  Constants in this module will always be defined, but contain
-     * `true` or `false` values depending on the configuration of your OpenSSL
+     * +true+ or +false+ values depending on the configuration of your OpenSSL
      * installation.
      */
     mSSLExtConfig = rb_define_module_under(mOSSL, "ExtConfig");
@@ -2212,83 +2570,102 @@ Init_ossl_ssl(void)
      *
      * All attributes must be set before creating an SSLSocket as the
      * SSLContext will be frozen afterward.
-     *
-     * The following attributes are available but don't show up in rdoc:
-     * * ssl_version, cert, key, client_ca, ca_file, ca_path, timeout,
-     * * verify_mode, verify_depth client_cert_cb, tmp_dh_callback,
-     * * session_id_context, session_add_cb, session_new_cb, session_remove_cb
      */
     cSSLContext = rb_define_class_under(mSSL, "SSLContext", rb_cObject);
     rb_define_alloc_func(cSSLContext, ossl_sslctx_s_alloc);
+    rb_undef_method(cSSLContext, "initialize_copy");
 
     /*
      * Context certificate
+     *
+     * The _cert_, _key_, and _extra_chain_cert_ attributes are deprecated.
+     * It is recommended to use #add_certificate instead.
      */
-    rb_attr(cSSLContext, rb_intern("cert"), 1, 1, Qfalse);
+    rb_attr(cSSLContext, rb_intern_const("cert"), 1, 1, Qfalse);
 
     /*
      * Context private key
+     *
+     * The _cert_, _key_, and _extra_chain_cert_ attributes are deprecated.
+     * It is recommended to use #add_certificate instead.
      */
-    rb_attr(cSSLContext, rb_intern("key"), 1, 1, Qfalse);
+    rb_attr(cSSLContext, rb_intern_const("key"), 1, 1, Qfalse);
 
     /*
      * A certificate or Array of certificates that will be sent to the client.
      */
-    rb_attr(cSSLContext, rb_intern("client_ca"), 1, 1, Qfalse);
+    rb_attr(cSSLContext, rb_intern_const("client_ca"), 1, 1, Qfalse);
 
     /*
      * The path to a file containing a PEM-format CA certificate
      */
-    rb_attr(cSSLContext, rb_intern("ca_file"), 1, 1, Qfalse);
+    rb_attr(cSSLContext, rb_intern_const("ca_file"), 1, 1, Qfalse);
 
     /*
      * The path to a directory containing CA certificates in PEM format.
      *
      * Files are looked up by subject's X509 name's hash value.
      */
-    rb_attr(cSSLContext, rb_intern("ca_path"), 1, 1, Qfalse);
+    rb_attr(cSSLContext, rb_intern_const("ca_path"), 1, 1, Qfalse);
 
     /*
-     * Maximum session lifetime.
+     * Maximum session lifetime in seconds.
      */
-    rb_attr(cSSLContext, rb_intern("timeout"), 1, 1, Qfalse);
+    rb_attr(cSSLContext, rb_intern_const("timeout"), 1, 1, Qfalse);
 
     /*
      * Session verification mode.
      *
      * Valid modes are VERIFY_NONE, VERIFY_PEER, VERIFY_CLIENT_ONCE,
      * VERIFY_FAIL_IF_NO_PEER_CERT and defined on OpenSSL::SSL
+     *
+     * The default mode is VERIFY_NONE, which does not perform any verification
+     * at all.
+     *
+     * See SSL_CTX_set_verify(3) for details.
      */
-    rb_attr(cSSLContext, rb_intern("verify_mode"), 1, 1, Qfalse);
+    rb_attr(cSSLContext, rb_intern_const("verify_mode"), 1, 1, Qfalse);
 
     /*
      * Number of CA certificates to walk when verifying a certificate chain.
      */
-    rb_attr(cSSLContext, rb_intern("verify_depth"), 1, 1, Qfalse);
+    rb_attr(cSSLContext, rb_intern_const("verify_depth"), 1, 1, Qfalse);
 
     /*
      * A callback for additional certificate verification.  The callback is
      * invoked for each certificate in the chain.
      *
-     * The callback is invoked with two values.  +preverify_ok+ indicates
-     * indicates if the verification was passed (true) or not (false).
-     * +store_context+ is an OpenSSL::X509::StoreContext containing the
+     * The callback is invoked with two values.  _preverify_ok_ indicates
+     * indicates if the verification was passed (+true+) or not (+false+).
+     * _store_context_ is an OpenSSL::X509::StoreContext containing the
      * context used for certificate verification.
      *
-     * If the callback returns false verification is stopped.
+     * If the callback returns +false+, the chain verification is immediately
+     * stopped and a bad_certificate alert is then sent.
+     */
+    rb_attr(cSSLContext, rb_intern_const("verify_callback"), 1, 1, Qfalse);
+
+    /*
+     * Whether to check the server certificate is valid for the hostname.
+     *
+     * In order to make this work, verify_mode must be set to VERIFY_PEER and
+     * the server hostname must be given by OpenSSL::SSL::SSLSocket#hostname=.
      */
-    rb_attr(cSSLContext, rb_intern("verify_callback"), 1, 1, Qfalse);
+    rb_attr(cSSLContext, rb_intern_const("verify_hostname"), 1, 1, Qfalse);
 
     /*
-     * An OpenSSL::X509::Store used for certificate verification
+     * An OpenSSL::X509::Store used for certificate verification.
      */
-    rb_attr(cSSLContext, rb_intern("cert_store"), 1, 1, Qfalse);
+    rb_attr(cSSLContext, rb_intern_const("cert_store"), 1, 1, Qfalse);
 
     /*
      * An Array of extra X509 certificates to be added to the certificate
      * chain.
+     *
+     * The _cert_, _key_, and _extra_chain_cert_ attributes are deprecated.
+     * It is recommended to use #add_certificate instead.
      */
-    rb_attr(cSSLContext, rb_intern("extra_chain_cert"), 1, 1, Qfalse);
+    rb_attr(cSSLContext, rb_intern_const("extra_chain_cert"), 1, 1, Qfalse);
 
     /*
      * A callback invoked when a client certificate is requested by a server
@@ -2298,7 +2675,7 @@ Init_ossl_ssl(void)
      * containing an OpenSSL::X509::Certificate and an OpenSSL::PKey.  If any
      * other value is returned the handshake is suspended.
      */
-    rb_attr(cSSLContext, rb_intern("client_cert_cb"), 1, 1, Qfalse);
+    rb_attr(cSSLContext, rb_intern_const("client_cert_cb"), 1, 1, Qfalse);
 
 #if !defined(OPENSSL_NO_EC) && defined(HAVE_SSL_CTX_SET_TMP_ECDH_CALLBACK)
     /*
@@ -2311,7 +2688,7 @@ Init_ossl_ssl(void)
      * The callback is deprecated. This does not work with recent versions of
      * OpenSSL. Use OpenSSL::SSL::SSLContext#ecdh_curves= instead.
      */
-    rb_attr(cSSLContext, rb_intern("tmp_ecdh_callback"), 1, 1, Qfalse);
+    rb_attr(cSSLContext, rb_intern_const("tmp_ecdh_callback"), 1, 1, Qfalse);
 #endif
 
     /*
@@ -2319,7 +2696,7 @@ Init_ossl_ssl(void)
      * sessions for multiple applications to be distinguished, for example, by
      * name.
      */
-    rb_attr(cSSLContext, rb_intern("session_id_context"), 1, 1, Qfalse);
+    rb_attr(cSSLContext, rb_intern_const("session_id_context"), 1, 1, Qfalse);
 
     /*
      * A callback invoked on a server when a session is proposed by the client
@@ -2328,43 +2705,37 @@ Init_ossl_ssl(void)
      * The callback is invoked with the SSLSocket and session id.  The
      * callback may return a Session from an external cache.
      */
-    rb_attr(cSSLContext, rb_intern("session_get_cb"), 1, 1, Qfalse);
+    rb_attr(cSSLContext, rb_intern_const("session_get_cb"), 1, 1, Qfalse);
 
     /*
      * A callback invoked when a new session was negotiated.
      *
-     * The callback is invoked with an SSLSocket.  If false is returned the
+     * The callback is invoked with an SSLSocket.  If +false+ is returned the
      * session will be removed from the internal cache.
      */
-    rb_attr(cSSLContext, rb_intern("session_new_cb"), 1, 1, Qfalse);
+    rb_attr(cSSLContext, rb_intern_const("session_new_cb"), 1, 1, Qfalse);
 
     /*
      * A callback invoked when a session is removed from the internal cache.
      *
      * The callback is invoked with an SSLContext and a Session.
+     *
+     * IMPORTANT NOTE: It is currently not possible to use this safely in a
+     * multi-threaded application. The callback is called inside a global lock
+     * and it can randomly cause deadlock on Ruby thread switching.
      */
-    rb_attr(cSSLContext, rb_intern("session_remove_cb"), 1, 1, Qfalse);
+    rb_attr(cSSLContext, rb_intern_const("session_remove_cb"), 1, 1, Qfalse);
 
-#ifdef HAVE_SSL_SET_TLSEXT_HOST_NAME
     rb_define_const(mSSLExtConfig, "HAVE_TLSEXT_HOST_NAME", Qtrue);
-#else
-    rb_define_const(mSSLExtConfig, "HAVE_TLSEXT_HOST_NAME", Qfalse);
-#endif
-
-#ifdef TLS_DH_anon_WITH_AES_256_GCM_SHA384
-    rb_define_const(mSSLExtConfig, "TLS_DH_anon_WITH_AES_256_GCM_SHA384", Qtrue);
-#else
-    rb_define_const(mSSLExtConfig, "TLS_DH_anon_WITH_AES_256_GCM_SHA384", Qfalse);
-#endif
 
     /*
-     * A callback invoked whenever a new handshake is initiated. May be used
-     * to disable renegotiation entirely.
+     * A callback invoked whenever a new handshake is initiated on an
+     * established connection. May be used to disable renegotiation entirely.
      *
      * The callback is invoked with the active SSLSocket. The callback's
-     * return value is irrelevant, normal return indicates "approval" of the
+     * return value is ignored. A normal return indicates "approval" of the
      * renegotiation and will continue the process. To forbid renegotiation
-     * and to cancel the process, an Error may be raised within the callback.
+     * and to cancel the process, raise an exception within the callback.
      *
      * === Disable client renegotiation
      *
@@ -2372,14 +2743,12 @@ Init_ossl_ssl(void)
      * renegotiation entirely. You may use a callback as follows to implement
      * this feature:
      *
-     *   num_handshakes = 0
      *   ctx.renegotiation_cb = lambda do |ssl|
-     *     num_handshakes += 1
-     *     raise RuntimeError.new("Client renegotiation disabled") if num_handshakes > 1
+     *     raise RuntimeError, "Client renegotiation disabled"
      *   end
      */
-    rb_attr(cSSLContext, rb_intern("renegotiation_cb"), 1, 1, Qfalse);
-#ifdef HAVE_SSL_CTX_SET_NEXT_PROTO_SELECT_CB
+    rb_attr(cSSLContext, rb_intern_const("renegotiation_cb"), 1, 1, Qfalse);
+#ifndef OPENSSL_NO_NEXTPROTONEG
     /*
      * An Enumerable of Strings. Each String represents a protocol to be
      * advertised as the list of supported protocols for Next Protocol
@@ -2391,7 +2760,7 @@ Init_ossl_ssl(void)
      *
      *   ctx.npn_protocols = ["http/1.1", "spdy/2"]
      */
-    rb_attr(cSSLContext, rb_intern("npn_protocols"), 1, 1, Qfalse);
+    rb_attr(cSSLContext, rb_intern_const("npn_protocols"), 1, 1, Qfalse);
     /*
      * A callback invoked on the client side when the client needs to select
      * a protocol from the list sent by the server. Supported in OpenSSL 1.0.1
@@ -2404,75 +2773,81 @@ Init_ossl_ssl(void)
      * === Example
      *
      *   ctx.npn_select_cb = lambda do |protocols|
-     *     #inspect the protocols and select one
+     *     # inspect the protocols and select one
      *     protocols.first
      *   end
      */
-    rb_attr(cSSLContext, rb_intern("npn_select_cb"), 1, 1, Qfalse);
+    rb_attr(cSSLContext, rb_intern_const("npn_select_cb"), 1, 1, Qfalse);
 #endif
 
 #ifdef HAVE_SSL_CTX_SET_ALPN_SELECT_CB
     /*
      * An Enumerable of Strings. Each String represents a protocol to be
-     * advertised as the list of supported protocols for Application-Layer Protocol
-     * Negotiation. Supported in OpenSSL 1.0.1 and higher. Has no effect
-     * on the client side. If not set explicitly, the NPN extension will
-     * not be sent by the server in the handshake.
+     * advertised as the list of supported protocols for Application-Layer
+     * Protocol Negotiation. Supported in OpenSSL 1.0.2 and higher. Has no
+     * effect on the server side. If not set explicitly, the ALPN extension will
+     * not be included in the handshake.
      *
      * === Example
      *
      *   ctx.alpn_protocols = ["http/1.1", "spdy/2", "h2"]
      */
-    rb_attr(cSSLContext, rb_intern("alpn_protocols"), 1, 1, Qfalse);
+    rb_attr(cSSLContext, rb_intern_const("alpn_protocols"), 1, 1, Qfalse);
     /*
      * A callback invoked on the server side when the server needs to select
      * a protocol from the list sent by the client. Supported in OpenSSL 1.0.2
-     * and higher. The server MUST select a protocol of those advertised by
+     * and higher. The callback must return a protocol of those advertised by
      * the client. If none is acceptable, raising an error in the callback
      * will cause the handshake to fail. Not setting this callback explicitly
-     * means not supporting the ALPN extension on the client - any protocols
-     * advertised by the server will be ignored.
+     * means not supporting the ALPN extension on the server - any protocols
+     * advertised by the client will be ignored.
      *
      * === Example
      *
      *   ctx.alpn_select_cb = lambda do |protocols|
-     *     #inspect the protocols and select one
+     *     # inspect the protocols and select one
      *     protocols.first
      *   end
      */
-    rb_attr(cSSLContext, rb_intern("alpn_select_cb"), 1, 1, Qfalse);
+    rb_attr(cSSLContext, rb_intern_const("alpn_select_cb"), 1, 1, Qfalse);
 #endif
 
     rb_define_alias(cSSLContext, "ssl_timeout", "timeout");
     rb_define_alias(cSSLContext, "ssl_timeout=", "timeout=");
-    rb_define_method(cSSLContext, "ssl_version=", ossl_sslctx_set_ssl_version, 1);
+    rb_define_private_method(cSSLContext, "set_minmax_proto_version",
+			     ossl_sslctx_set_minmax_proto_version, 2);
     rb_define_method(cSSLContext, "ciphers",     ossl_sslctx_get_ciphers, 0);
     rb_define_method(cSSLContext, "ciphers=",    ossl_sslctx_set_ciphers, 1);
     rb_define_method(cSSLContext, "ecdh_curves=", ossl_sslctx_set_ecdh_curves, 1);
     rb_define_method(cSSLContext, "security_level", ossl_sslctx_get_security_level, 0);
     rb_define_method(cSSLContext, "security_level=", ossl_sslctx_set_security_level, 1);
+#ifdef SSL_MODE_SEND_FALLBACK_SCSV
+    rb_define_method(cSSLContext, "enable_fallback_scsv", ossl_sslctx_enable_fallback_scsv, 0);
+#endif
+    rb_define_method(cSSLContext, "add_certificate", ossl_sslctx_add_certificate, -1);
 
     rb_define_method(cSSLContext, "setup", ossl_sslctx_setup, 0);
+    rb_define_alias(cSSLContext, "freeze", "setup");
 
     /*
      * No session caching for client or server
      */
-    rb_define_const(cSSLContext, "SESSION_CACHE_OFF", LONG2FIX(SSL_SESS_CACHE_OFF));
+    rb_define_const(cSSLContext, "SESSION_CACHE_OFF", LONG2NUM(SSL_SESS_CACHE_OFF));
 
     /*
      * Client sessions are added to the session cache
      */
-    rb_define_const(cSSLContext, "SESSION_CACHE_CLIENT", LONG2FIX(SSL_SESS_CACHE_CLIENT)); /* doesn't actually do anything in 0.9.8e */
+    rb_define_const(cSSLContext, "SESSION_CACHE_CLIENT", LONG2NUM(SSL_SESS_CACHE_CLIENT)); /* doesn't actually do anything in 0.9.8e */
 
     /*
      * Server sessions are added to the session cache
      */
-    rb_define_const(cSSLContext, "SESSION_CACHE_SERVER", LONG2FIX(SSL_SESS_CACHE_SERVER));
+    rb_define_const(cSSLContext, "SESSION_CACHE_SERVER", LONG2NUM(SSL_SESS_CACHE_SERVER));
 
     /*
      * Both client and server sessions are added to the session cache
      */
-    rb_define_const(cSSLContext, "SESSION_CACHE_BOTH", LONG2FIX(SSL_SESS_CACHE_BOTH)); /* no different than CACHE_SERVER in 0.9.8e */
+    rb_define_const(cSSLContext, "SESSION_CACHE_BOTH", LONG2NUM(SSL_SESS_CACHE_BOTH)); /* no different than CACHE_SERVER in 0.9.8e */
 
     /*
      * Normally the session cache is checked for expired sessions every 255
@@ -2480,7 +2855,7 @@ Init_ossl_ssl(void)
      * the automatic flushing may be disabled and #flush_sessions can be
      * called explicitly.
      */
-    rb_define_const(cSSLContext, "SESSION_CACHE_NO_AUTO_CLEAR", LONG2FIX(SSL_SESS_CACHE_NO_AUTO_CLEAR));
+    rb_define_const(cSSLContext, "SESSION_CACHE_NO_AUTO_CLEAR", LONG2NUM(SSL_SESS_CACHE_NO_AUTO_CLEAR));
 
     /*
      * Always perform external lookups of sessions even if they are in the
@@ -2488,18 +2863,18 @@ Init_ossl_ssl(void)
      *
      * This flag has no effect on clients
      */
-    rb_define_const(cSSLContext, "SESSION_CACHE_NO_INTERNAL_LOOKUP", LONG2FIX(SSL_SESS_CACHE_NO_INTERNAL_LOOKUP));
+    rb_define_const(cSSLContext, "SESSION_CACHE_NO_INTERNAL_LOOKUP", LONG2NUM(SSL_SESS_CACHE_NO_INTERNAL_LOOKUP));
 
     /*
      * Never automatically store sessions in the internal store.
      */
-    rb_define_const(cSSLContext, "SESSION_CACHE_NO_INTERNAL_STORE", LONG2FIX(SSL_SESS_CACHE_NO_INTERNAL_STORE));
+    rb_define_const(cSSLContext, "SESSION_CACHE_NO_INTERNAL_STORE", LONG2NUM(SSL_SESS_CACHE_NO_INTERNAL_STORE));
 
     /*
      * Enables both SESSION_CACHE_NO_INTERNAL_LOOKUP and
      * SESSION_CACHE_NO_INTERNAL_STORE.
      */
-    rb_define_const(cSSLContext, "SESSION_CACHE_NO_INTERNAL", LONG2FIX(SSL_SESS_CACHE_NO_INTERNAL));
+    rb_define_const(cSSLContext, "SESSION_CACHE_NO_INTERNAL", LONG2NUM(SSL_SESS_CACHE_NO_INTERNAL));
 
     rb_define_method(cSSLContext, "session_add",     ossl_sslctx_session_add, 1);
     rb_define_method(cSSLContext, "session_remove",     ossl_sslctx_session_remove, 1);
@@ -2512,20 +2887,8 @@ Init_ossl_ssl(void)
     rb_define_method(cSSLContext, "options",     ossl_sslctx_get_options, 0);
     rb_define_method(cSSLContext, "options=",     ossl_sslctx_set_options, 1);
 
-    ary = rb_ary_new2(numberof(ossl_ssl_method_tab));
-    for (i = 0; i < numberof(ossl_ssl_method_tab); i++) {
-        rb_ary_push(ary, ID2SYM(rb_intern(ossl_ssl_method_tab[i].name)));
-    }
-    rb_obj_freeze(ary);
-    /* The list of available SSL/TLS methods */
-    rb_define_const(cSSLContext, "METHODS", ary);
-
     /*
      * Document-class: OpenSSL::SSL::SSLSocket
-     *
-     * The following attributes are available but don't show up in rdoc.
-     * * io, context, sync_close
-     *
      */
     cSSLSocket = rb_define_class_under(mSSL, "SSLSocket", rb_cObject);
 #ifdef OPENSSL_NO_SOCK
@@ -2535,6 +2898,7 @@ Init_ossl_ssl(void)
     rb_define_const(mSSLExtConfig, "OPENSSL_NO_SOCK", Qfalse);
     rb_define_alloc_func(cSSLSocket, ossl_ssl_s_alloc);
     rb_define_method(cSSLSocket, "initialize", ossl_ssl_initialize, -1);
+    rb_undef_method(cSSLSocket, "initialize_copy");
     rb_define_method(cSSLSocket, "connect",    ossl_ssl_connect, 0);
     rb_define_method(cSSLSocket, "connect_nonblock",    ossl_ssl_connect_nonblock, -1);
     rb_define_method(cSSLSocket, "accept",     ossl_ssl_accept, 0);
@@ -2556,70 +2920,161 @@ Init_ossl_ssl(void)
     rb_define_method(cSSLSocket, "session=",    ossl_ssl_set_session, 1);
     rb_define_method(cSSLSocket, "verify_result", ossl_ssl_get_verify_result, 0);
     rb_define_method(cSSLSocket, "client_ca", ossl_ssl_get_client_ca_list, 0);
-#ifdef HAVE_SSL_SET_TLSEXT_HOST_NAME
     /* #hostname is defined in lib/openssl/ssl.rb */
     rb_define_method(cSSLSocket, "hostname=", ossl_ssl_set_hostname, 1);
-#endif
+    rb_define_method(cSSLSocket, "finished_message", ossl_ssl_get_finished, 0);
+    rb_define_method(cSSLSocket, "peer_finished_message", ossl_ssl_get_peer_finished, 0);
 # ifdef HAVE_SSL_GET_SERVER_TMP_KEY
     rb_define_method(cSSLSocket, "tmp_key", ossl_ssl_tmp_key, 0);
 # endif
 # ifdef HAVE_SSL_CTX_SET_ALPN_SELECT_CB
     rb_define_method(cSSLSocket, "alpn_protocol", ossl_ssl_alpn_protocol, 0);
 # endif
-# ifdef HAVE_SSL_CTX_SET_NEXT_PROTO_SELECT_CB
+# ifndef OPENSSL_NO_NEXTPROTONEG
     rb_define_method(cSSLSocket, "npn_protocol", ossl_ssl_npn_protocol, 0);
 # endif
 #endif
 
-#define ossl_ssl_def_const(x) rb_define_const(mSSL, #x, LONG2NUM(SSL_##x))
+    rb_define_const(mSSL, "VERIFY_NONE", INT2NUM(SSL_VERIFY_NONE));
+    rb_define_const(mSSL, "VERIFY_PEER", INT2NUM(SSL_VERIFY_PEER));
+    rb_define_const(mSSL, "VERIFY_FAIL_IF_NO_PEER_CERT", INT2NUM(SSL_VERIFY_FAIL_IF_NO_PEER_CERT));
+    rb_define_const(mSSL, "VERIFY_CLIENT_ONCE", INT2NUM(SSL_VERIFY_CLIENT_ONCE));
 
-    ossl_ssl_def_const(VERIFY_NONE);
-    ossl_ssl_def_const(VERIFY_PEER);
-    ossl_ssl_def_const(VERIFY_FAIL_IF_NO_PEER_CERT);
-    ossl_ssl_def_const(VERIFY_CLIENT_ONCE);
-    /* Introduce constants included in OP_ALL.  These constants are mostly for
-     * unset some bits in OP_ALL such as;
-     *   ctx.options = OP_ALL & ~OP_DONT_INSERT_EMPTY_FRAGMENTS
-     */
-    ossl_ssl_def_const(OP_MICROSOFT_SESS_ID_BUG);
-    ossl_ssl_def_const(OP_NETSCAPE_CHALLENGE_BUG);
-    ossl_ssl_def_const(OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG);
-    ossl_ssl_def_const(OP_SSLREF2_REUSE_CERT_TYPE_BUG);
-    ossl_ssl_def_const(OP_MICROSOFT_BIG_SSLV3_BUFFER);
-    ossl_ssl_def_const(OP_MSIE_SSLV2_RSA_PADDING);
-    ossl_ssl_def_const(OP_SSLEAY_080_CLIENT_DH_BUG);
-    ossl_ssl_def_const(OP_TLS_D5_BUG);
-    ossl_ssl_def_const(OP_TLS_BLOCK_PADDING_BUG);
-    ossl_ssl_def_const(OP_DONT_INSERT_EMPTY_FRAGMENTS);
-    ossl_ssl_def_const(OP_ALL);
-    ossl_ssl_def_const(OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION);
-    ossl_ssl_def_const(OP_SINGLE_ECDH_USE);
-    ossl_ssl_def_const(OP_SINGLE_DH_USE);
-    ossl_ssl_def_const(OP_EPHEMERAL_RSA);
-    ossl_ssl_def_const(OP_CIPHER_SERVER_PREFERENCE);
-    ossl_ssl_def_const(OP_TLS_ROLLBACK_BUG);
-    ossl_ssl_def_const(OP_NO_SSLv2);
-    ossl_ssl_def_const(OP_NO_SSLv3);
-    ossl_ssl_def_const(OP_NO_TLSv1);
-#if defined(SSL_OP_NO_TLSv1_1)
-    ossl_ssl_def_const(OP_NO_TLSv1_1);
+    rb_define_const(mSSL, "OP_ALL", ULONG2NUM(SSL_OP_ALL));
+    rb_define_const(mSSL, "OP_LEGACY_SERVER_CONNECT", ULONG2NUM(SSL_OP_LEGACY_SERVER_CONNECT));
+#ifdef SSL_OP_TLSEXT_PADDING /* OpenSSL 1.0.1h and OpenSSL 1.0.2 */
+    rb_define_const(mSSL, "OP_TLSEXT_PADDING", ULONG2NUM(SSL_OP_TLSEXT_PADDING));
+#endif
+#ifdef SSL_OP_SAFARI_ECDHE_ECDSA_BUG /* OpenSSL 1.0.1f and OpenSSL 1.0.2 */
+    rb_define_const(mSSL, "OP_SAFARI_ECDHE_ECDSA_BUG", ULONG2NUM(SSL_OP_SAFARI_ECDHE_ECDSA_BUG));
+#endif
+#ifdef SSL_OP_ALLOW_NO_DHE_KEX /* OpenSSL 1.1.1 */
+    rb_define_const(mSSL, "OP_ALLOW_NO_DHE_KEX", ULONG2NUM(SSL_OP_ALLOW_NO_DHE_KEX));
 #endif
-#if defined(SSL_OP_NO_TLSv1_2)
-    ossl_ssl_def_const(OP_NO_TLSv1_2);
+    rb_define_const(mSSL, "OP_DONT_INSERT_EMPTY_FRAGMENTS", ULONG2NUM(SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS));
+    rb_define_const(mSSL, "OP_NO_TICKET", ULONG2NUM(SSL_OP_NO_TICKET));
+    rb_define_const(mSSL, "OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION", ULONG2NUM(SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION));
+    rb_define_const(mSSL, "OP_NO_COMPRESSION", ULONG2NUM(SSL_OP_NO_COMPRESSION));
+    rb_define_const(mSSL, "OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION", ULONG2NUM(SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION));
+#ifdef SSL_OP_NO_ENCRYPT_THEN_MAC /* OpenSSL 1.1.1 */
+    rb_define_const(mSSL, "OP_NO_ENCRYPT_THEN_MAC", ULONG2NUM(SSL_OP_NO_ENCRYPT_THEN_MAC));
 #endif
-#if defined(SSL_OP_NO_TICKET)
-    ossl_ssl_def_const(OP_NO_TICKET);
+    rb_define_const(mSSL, "OP_CIPHER_SERVER_PREFERENCE", ULONG2NUM(SSL_OP_CIPHER_SERVER_PREFERENCE));
+    rb_define_const(mSSL, "OP_TLS_ROLLBACK_BUG", ULONG2NUM(SSL_OP_TLS_ROLLBACK_BUG));
+#ifdef SSL_OP_NO_RENEGOTIATION /* OpenSSL 1.1.1 */
+    rb_define_const(mSSL, "OP_NO_RENEGOTIATION", ULONG2NUM(SSL_OP_NO_RENEGOTIATION));
 #endif
-#if defined(SSL_OP_NO_COMPRESSION)
-    ossl_ssl_def_const(OP_NO_COMPRESSION);
+    rb_define_const(mSSL, "OP_CRYPTOPRO_TLSEXT_BUG", ULONG2NUM(SSL_OP_CRYPTOPRO_TLSEXT_BUG));
+
+    rb_define_const(mSSL, "OP_NO_SSLv3", ULONG2NUM(SSL_OP_NO_SSLv3));
+    rb_define_const(mSSL, "OP_NO_TLSv1", ULONG2NUM(SSL_OP_NO_TLSv1));
+    rb_define_const(mSSL, "OP_NO_TLSv1_1", ULONG2NUM(SSL_OP_NO_TLSv1_1));
+    rb_define_const(mSSL, "OP_NO_TLSv1_2", ULONG2NUM(SSL_OP_NO_TLSv1_2));
+#ifdef SSL_OP_NO_TLSv1_3 /* OpenSSL 1.1.1 */
+    rb_define_const(mSSL, "OP_NO_TLSv1_3", ULONG2NUM(SSL_OP_NO_TLSv1_3));
 #endif
-    ossl_ssl_def_const(OP_PKCS1_CHECK_1);
-    ossl_ssl_def_const(OP_PKCS1_CHECK_2);
-    ossl_ssl_def_const(OP_NETSCAPE_CA_DN_BUG);
-    ossl_ssl_def_const(OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG);
-
-#undef rb_intern
-    sym_exception = ID2SYM(rb_intern("exception"));
-    sym_wait_readable = ID2SYM(rb_intern("wait_readable"));
-    sym_wait_writable = ID2SYM(rb_intern("wait_writable"));
+
+    /* SSL_OP_* flags for DTLS */
+#if 0
+    rb_define_const(mSSL, "OP_NO_QUERY_MTU", ULONG2NUM(SSL_OP_NO_QUERY_MTU));
+    rb_define_const(mSSL, "OP_COOKIE_EXCHANGE", ULONG2NUM(SSL_OP_COOKIE_EXCHANGE));
+    rb_define_const(mSSL, "OP_CISCO_ANYCONNECT", ULONG2NUM(SSL_OP_CISCO_ANYCONNECT));
+#endif
+
+    /* Deprecated in OpenSSL 1.1.0. */
+    rb_define_const(mSSL, "OP_MICROSOFT_SESS_ID_BUG", ULONG2NUM(SSL_OP_MICROSOFT_SESS_ID_BUG));
+    /* Deprecated in OpenSSL 1.1.0. */
+    rb_define_const(mSSL, "OP_NETSCAPE_CHALLENGE_BUG", ULONG2NUM(SSL_OP_NETSCAPE_CHALLENGE_BUG));
+    /* Deprecated in OpenSSL 0.9.8q and 1.0.0c. */
+    rb_define_const(mSSL, "OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG", ULONG2NUM(SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG));
+    /* Deprecated in OpenSSL 1.0.1h and 1.0.2. */
+    rb_define_const(mSSL, "OP_SSLREF2_REUSE_CERT_TYPE_BUG", ULONG2NUM(SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG));
+    /* Deprecated in OpenSSL 1.1.0. */
+    rb_define_const(mSSL, "OP_MICROSOFT_BIG_SSLV3_BUFFER", ULONG2NUM(SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER));
+    /* Deprecated in OpenSSL 0.9.7h and 0.9.8b. */
+    rb_define_const(mSSL, "OP_MSIE_SSLV2_RSA_PADDING", ULONG2NUM(SSL_OP_MSIE_SSLV2_RSA_PADDING));
+    /* Deprecated in OpenSSL 1.1.0. */
+    rb_define_const(mSSL, "OP_SSLEAY_080_CLIENT_DH_BUG", ULONG2NUM(SSL_OP_SSLEAY_080_CLIENT_DH_BUG));
+    /* Deprecated in OpenSSL 1.1.0. */
+    rb_define_const(mSSL, "OP_TLS_D5_BUG", ULONG2NUM(SSL_OP_TLS_D5_BUG));
+    /* Deprecated in OpenSSL 1.1.0. */
+    rb_define_const(mSSL, "OP_TLS_BLOCK_PADDING_BUG", ULONG2NUM(SSL_OP_TLS_BLOCK_PADDING_BUG));
+    /* Deprecated in OpenSSL 1.1.0. */
+    rb_define_const(mSSL, "OP_SINGLE_ECDH_USE", ULONG2NUM(SSL_OP_SINGLE_ECDH_USE));
+    /* Deprecated in OpenSSL 1.1.0. */
+    rb_define_const(mSSL, "OP_SINGLE_DH_USE", ULONG2NUM(SSL_OP_SINGLE_DH_USE));
+    /* Deprecated in OpenSSL 1.0.1k and 1.0.2. */
+    rb_define_const(mSSL, "OP_EPHEMERAL_RSA", ULONG2NUM(SSL_OP_EPHEMERAL_RSA));
+    /* Deprecated in OpenSSL 1.1.0. */
+    rb_define_const(mSSL, "OP_NO_SSLv2", ULONG2NUM(SSL_OP_NO_SSLv2));
+    /* Deprecated in OpenSSL 1.0.1. */
+    rb_define_const(mSSL, "OP_PKCS1_CHECK_1", ULONG2NUM(SSL_OP_PKCS1_CHECK_1));
+    /* Deprecated in OpenSSL 1.0.1. */
+    rb_define_const(mSSL, "OP_PKCS1_CHECK_2", ULONG2NUM(SSL_OP_PKCS1_CHECK_2));
+    /* Deprecated in OpenSSL 1.1.0. */
+    rb_define_const(mSSL, "OP_NETSCAPE_CA_DN_BUG", ULONG2NUM(SSL_OP_NETSCAPE_CA_DN_BUG));
+    /* Deprecated in OpenSSL 1.1.0. */
+    rb_define_const(mSSL, "OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG", ULONG2NUM(SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG));
+
+
+    /*
+     * SSL/TLS version constants. Used by SSLContext#min_version= and
+     * #max_version=
+     */
+    /* SSL 2.0 */
+    rb_define_const(mSSL, "SSL2_VERSION", INT2NUM(SSL2_VERSION));
+    /* SSL 3.0 */
+    rb_define_const(mSSL, "SSL3_VERSION", INT2NUM(SSL3_VERSION));
+    /* TLS 1.0 */
+    rb_define_const(mSSL, "TLS1_VERSION", INT2NUM(TLS1_VERSION));
+    /* TLS 1.1 */
+    rb_define_const(mSSL, "TLS1_1_VERSION", INT2NUM(TLS1_1_VERSION));
+    /* TLS 1.2 */
+    rb_define_const(mSSL, "TLS1_2_VERSION", INT2NUM(TLS1_2_VERSION));
+#ifdef TLS1_3_VERSION /* OpenSSL 1.1.1 */
+    /* TLS 1.3 */
+    rb_define_const(mSSL, "TLS1_3_VERSION", INT2NUM(TLS1_3_VERSION));
+#endif
+
+
+    sym_exception = ID2SYM(rb_intern_const("exception"));
+    sym_wait_readable = ID2SYM(rb_intern_const("wait_readable"));
+    sym_wait_writable = ID2SYM(rb_intern_const("wait_writable"));
+
+    id_tmp_dh_callback = rb_intern_const("tmp_dh_callback");
+    id_tmp_ecdh_callback = rb_intern_const("tmp_ecdh_callback");
+    id_npn_protocols_encoded = rb_intern_const("npn_protocols_encoded");
+    id_each = rb_intern_const("each");
+
+#define DefIVarID(name) do \
+    id_i_##name = rb_intern_const("@"#name); while (0)
+
+    DefIVarID(cert_store);
+    DefIVarID(ca_file);
+    DefIVarID(ca_path);
+    DefIVarID(verify_mode);
+    DefIVarID(verify_depth);
+    DefIVarID(verify_callback);
+    DefIVarID(client_ca);
+    DefIVarID(renegotiation_cb);
+    DefIVarID(cert);
+    DefIVarID(key);
+    DefIVarID(extra_chain_cert);
+    DefIVarID(client_cert_cb);
+    DefIVarID(tmp_ecdh_callback);
+    DefIVarID(timeout);
+    DefIVarID(session_id_context);
+    DefIVarID(session_get_cb);
+    DefIVarID(session_new_cb);
+    DefIVarID(session_remove_cb);
+    DefIVarID(npn_select_cb);
+    DefIVarID(npn_protocols);
+    DefIVarID(alpn_protocols);
+    DefIVarID(alpn_select_cb);
+    DefIVarID(servername_cb);
+    DefIVarID(verify_hostname);
+
+    DefIVarID(io);
+    DefIVarID(context);
+    DefIVarID(hostname);
 }
diff --git a/ext/openssl/ossl_ssl.h b/ext/openssl/ossl_ssl.h
index c1a3cd6c1d..535c56097c 100644
--- a/ext/openssl/ossl_ssl.h
+++ b/ext/openssl/ossl_ssl.h
@@ -24,11 +24,6 @@
 	} \
 } while (0)
 
-#define SafeGetSSLSession(obj, sess) do { \
-	OSSL_Check_Kind((obj), cSSLSession); \
-	GetSSLSession((obj), (sess)); \
-} while (0)
-
 extern const rb_data_type_t ossl_ssl_type;
 extern const rb_data_type_t ossl_ssl_session_type;
 extern VALUE mSSL;
diff --git a/ext/openssl/ossl_ssl_session.c b/ext/openssl/ossl_ssl_session.c
index 4836891d73..5514087387 100644
--- a/ext/openssl/ossl_ssl_session.c
+++ b/ext/openssl/ossl_ssl_session.c
@@ -28,12 +28,12 @@ static VALUE ossl_ssl_session_alloc(VALUE klass)
 
 /*
  * call-seq:
- *    Session.new(SSLSocket | string) => session
+ *   Session.new(ssl_socket) -> Session
+ *   Session.new(string) -> Session
  *
- * === Parameters
- * +SSLSocket+ is an OpenSSL::SSL::SSLSocket
- * +string+ must be a DER or PEM encoded Session.
-*/
+ * Creates a new Session object from an instance of SSLSocket or DER/PEM encoded
+ * String.
+ */
 static VALUE ossl_ssl_session_initialize(VALUE self, VALUE arg1)
 {
 	SSL_SESSION *ctx = NULL;
@@ -49,7 +49,7 @@ static VALUE ossl_ssl_session_initialize(VALUE self, VALUE arg1)
 		if ((ctx = SSL_get1_session(ssl)) == NULL)
 			ossl_raise(eSSLSession, "no session available");
 	} else {
-		BIO *in = ossl_obj2bio(arg1);
+		BIO *in = ossl_obj2bio(&arg1);
 
 		ctx = PEM_read_bio_SSL_SESSION(in, NULL, NULL, NULL);
 
@@ -73,42 +73,56 @@ static VALUE ossl_ssl_session_initialize(VALUE self, VALUE arg1)
 	return self;
 }
 
-#if HAVE_SSL_SESSION_CMP == 0
-int SSL_SESSION_cmp(const SSL_SESSION *a,const SSL_SESSION *b)
+static VALUE
+ossl_ssl_session_initialize_copy(VALUE self, VALUE other)
+{
+    SSL_SESSION *sess, *sess_other, *sess_new;
+
+    rb_check_frozen(self);
+    sess = RTYPEDDATA_DATA(self); /* XXX */
+    GetSSLSession(other, sess_other);
+
+    sess_new = ASN1_dup((i2d_of_void *)i2d_SSL_SESSION, (d2i_of_void *)d2i_SSL_SESSION,
+			(char *)sess_other);
+    if (!sess_new)
+	ossl_raise(eSSLSession, "ASN1_dup");
+
+    RTYPEDDATA_DATA(self) = sess_new;
+    SSL_SESSION_free(sess);
+
+    return self;
+}
+
+static int
+ossl_SSL_SESSION_cmp(const SSL_SESSION *a, const SSL_SESSION *b)
 {
     unsigned int a_len;
     const unsigned char *a_sid = SSL_SESSION_get_id(a, &a_len);
     unsigned int b_len;
     const unsigned char *b_sid = SSL_SESSION_get_id(b, &b_len);
 
-#if !defined(HAVE_OPAQUE_OPENSSL) /* missing SSL_SESSION_get_ssl_version() ? */
-    if (a->ssl_version != b->ssl_version)
+    if (SSL_SESSION_get_protocol_version(a) != SSL_SESSION_get_protocol_version(b))
 	return 1;
-#endif
     if (a_len != b_len)
 	return 1;
 
-#if defined(_WIN32)
-    return memcmp(a_sid, b_sid, a_len);
-#else
     return CRYPTO_memcmp(a_sid, b_sid, a_len);
-#endif
 }
-#endif
 
 /*
  * call-seq:
- *    session1 == session2 -> boolean
+ *   session1 == session2 -> boolean
  *
-*/
+ * Returns +true+ if the two Session is the same, +false+ if not.
+ */
 static VALUE ossl_ssl_session_eq(VALUE val1, VALUE val2)
 {
 	SSL_SESSION *ctx1, *ctx2;
 
 	GetSSLSession(val1, ctx1);
-	SafeGetSSLSession(val2, ctx2);
+	GetSSLSession(val2, ctx2);
 
-	switch (SSL_SESSION_cmp(ctx1, ctx2)) {
+	switch (ossl_SSL_SESSION_cmp(ctx1, ctx2)) {
 	case 0:		return Qtrue;
 	default:	return Qfalse;
 	}
@@ -118,51 +132,50 @@ static VALUE ossl_ssl_session_eq(VALUE val1, VALUE val2)
  * call-seq:
  *    session.time -> Time
  *
- * Gets start time of the session.
- *
-*/
-static VALUE ossl_ssl_session_get_time(VALUE self)
+ * Returns the time at which the session was established.
+ */
+static VALUE
+ossl_ssl_session_get_time(VALUE self)
 {
-	SSL_SESSION *ctx;
-	time_t t;
-
-	GetSSLSession(self, ctx);
-
-	t = SSL_SESSION_get_time(ctx);
+    SSL_SESSION *ctx;
+    long t;
 
-	if (t == 0)
-		return Qnil;
+    GetSSLSession(self, ctx);
+    t = SSL_SESSION_get_time(ctx);
+    if (t == 0)
+	return Qnil;
 
-	return rb_funcall(rb_cTime, rb_intern("at"), 1, TIMET2NUM(t));
+    return rb_funcall(rb_cTime, rb_intern("at"), 1, LONG2NUM(t));
 }
 
 /*
  * call-seq:
- *    session.timeout -> integer
+ *    session.timeout -> Integer
  *
- * Gets how long until the session expires in seconds.
+ * Returns the timeout value set for the session, in seconds from the
+ * established time.
  *
-*/
-static VALUE ossl_ssl_session_get_timeout(VALUE self)
+ */
+static VALUE
+ossl_ssl_session_get_timeout(VALUE self)
 {
-	SSL_SESSION *ctx;
-	time_t t;
+    SSL_SESSION *ctx;
+    long t;
 
-	GetSSLSession(self, ctx);
-
-	t = SSL_SESSION_get_timeout(ctx);
+    GetSSLSession(self, ctx);
+    t = SSL_SESSION_get_timeout(ctx);
 
-	return TIMET2NUM(t);
+    return LONG2NUM(t);
 }
 
 /*
  * call-seq:
- *    session.time=(Time) -> Time
- *    session.time=(integer) -> Time
+ *    session.time = time
+ *    session.time = integer
  *
  * Sets start time of the session. Time resolution is in seconds.
  *
-*/
+ */
 static VALUE ossl_ssl_session_set_time(VALUE self, VALUE time_v)
 {
 	SSL_SESSION *ctx;
@@ -179,11 +192,10 @@ static VALUE ossl_ssl_session_set_time(VALUE self, VALUE time_v)
 
 /*
  * call-seq:
- *    session.timeout=(integer) -> integer
+ *    session.timeout = integer
  *
  * Sets how long until the session expires in seconds.
- *
-*/
+ */
 static VALUE ossl_ssl_session_set_timeout(VALUE self, VALUE time_v)
 {
 	SSL_SESSION *ctx;
@@ -197,7 +209,7 @@ static VALUE ossl_ssl_session_set_timeout(VALUE self, VALUE time_v)
 
 /*
  * call-seq:
- *    session.id -> aString
+ *    session.id -> String
  *
  * Returns the Session ID.
 */
@@ -216,10 +228,10 @@ static VALUE ossl_ssl_session_get_id(VALUE self)
 
 /*
  * call-seq:
- *    session.to_der -> aString
+ *    session.to_der -> String
  *
  * Returns an ASN1 encoded String that contains the Session object.
-*/
+ */
 static VALUE ossl_ssl_session_to_der(VALUE self)
 {
 	SSL_SESSION *ctx;
@@ -245,14 +257,11 @@ static VALUE ossl_ssl_session_to_der(VALUE self)
  *    session.to_pem -> String
  *
  * Returns a PEM encoded String that contains the Session object.
-*/
+ */
 static VALUE ossl_ssl_session_to_pem(VALUE self)
 {
 	SSL_SESSION *ctx;
 	BIO *out;
-	BUF_MEM *buf;
-	VALUE str;
-	int i;
 
 	GetSSLSession(self, ctx);
 
@@ -260,16 +269,13 @@ static VALUE ossl_ssl_session_to_pem(VALUE self)
 		ossl_raise(eSSLSession, "BIO_s_mem()");
 	}
 
-	if (!(i=PEM_write_bio_SSL_SESSION(out, ctx))) {
+	if (!PEM_write_bio_SSL_SESSION(out, ctx)) {
 		BIO_free(out);
 		ossl_raise(eSSLSession, "SSL_SESSION_print()");
 	}
 
-	BIO_get_mem_ptr(out, &buf);
-	str = rb_str_new(buf->data, buf->length);
-	BIO_free(out);
 
-	return str;
+	return ossl_membio2str(out);
 }
 
 
@@ -277,14 +283,12 @@ static VALUE ossl_ssl_session_to_pem(VALUE self)
  * call-seq:
  *    session.to_text -> String
  *
- * Shows everything in the Session object.
-*/
+ * Shows everything in the Session object. This is for diagnostic purposes.
+ */
 static VALUE ossl_ssl_session_to_text(VALUE self)
 {
 	SSL_SESSION *ctx;
 	BIO *out;
-	BUF_MEM *buf;
-	VALUE str;
 
 	GetSSLSession(self, ctx);
 
@@ -297,25 +301,23 @@ static VALUE ossl_ssl_session_to_text(VALUE self)
 		ossl_raise(eSSLSession, "SSL_SESSION_print()");
 	}
 
-	BIO_get_mem_ptr(out, &buf);
-	str = rb_str_new(buf->data, buf->length);
-	BIO_free(out);
-
-	return str;
+	return ossl_membio2str(out);
 }
 
 
 void Init_ossl_ssl_session(void)
 {
 #if 0
-	mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
-	mSSL = rb_define_module_under(mOSSL, "SSL");
+    mOSSL = rb_define_module("OpenSSL");
+    mSSL = rb_define_module_under(mOSSL, "SSL");
+    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
 #endif
 	cSSLSession = rb_define_class_under(mSSL, "Session", rb_cObject);
 	eSSLSession = rb_define_class_under(cSSLSession, "SessionError", eOSSLError);
 
 	rb_define_alloc_func(cSSLSession, ossl_ssl_session_alloc);
 	rb_define_method(cSSLSession, "initialize", ossl_ssl_session_initialize, 1);
+	rb_define_method(cSSLSession, "initialize_copy", ossl_ssl_session_initialize_copy, 1);
 
 	rb_define_method(cSSLSession, "==", ossl_ssl_session_eq, 1);
 
diff --git a/ext/openssl/ossl_ts.c b/ext/openssl/ossl_ts.c
new file mode 100644
index 0000000000..cff9b7bfff
--- /dev/null
+++ b/ext/openssl/ossl_ts.c
@@ -0,0 +1,1524 @@
+/*
+ *
+ * Copyright (C) 2010 Martin Bosslet <Martin.Bosslet@googlemail.com>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#include "ossl.h"
+
+#ifndef OPENSSL_NO_TS
+
+#define NewTSRequest(klass) \
+    TypedData_Wrap_Struct((klass), &ossl_ts_req_type, 0)
+#define SetTSRequest(obj, req) do { \
+    if (!(req)) { \
+        ossl_raise(rb_eRuntimeError, "TS_REQ wasn't initialized."); \
+    } \
+    RTYPEDDATA_DATA(obj) = (req); \
+} while (0)
+#define GetTSRequest(obj, req) do { \
+    TypedData_Get_Struct((obj), TS_REQ, &ossl_ts_req_type, (req)); \
+    if (!(req)) { \
+        ossl_raise(rb_eRuntimeError, "TS_REQ wasn't initialized."); \
+    } \
+} while (0)
+
+#define NewTSResponse(klass) \
+    TypedData_Wrap_Struct((klass), &ossl_ts_resp_type, 0)
+#define SetTSResponse(obj, resp) do { \
+    if (!(resp)) { \
+        ossl_raise(rb_eRuntimeError, "TS_RESP wasn't initialized."); \
+    } \
+    RTYPEDDATA_DATA(obj) = (resp); \
+} while (0)
+#define GetTSResponse(obj, resp) do { \
+    TypedData_Get_Struct((obj), TS_RESP, &ossl_ts_resp_type, (resp)); \
+    if (!(resp)) { \
+        ossl_raise(rb_eRuntimeError, "TS_RESP wasn't initialized."); \
+    } \
+} while (0)
+
+#define NewTSTokenInfo(klass) \
+    TypedData_Wrap_Struct((klass), &ossl_ts_token_info_type, 0)
+#define SetTSTokenInfo(obj, info) do { \
+    if (!(info)) { \
+        ossl_raise(rb_eRuntimeError, "TS_TST_INFO wasn't initialized."); \
+    } \
+    RTYPEDDATA_DATA(obj) = (info); \
+} while (0)
+#define GetTSTokenInfo(obj, info) do { \
+    TypedData_Get_Struct((obj), TS_TST_INFO, &ossl_ts_token_info_type, (info)); \
+    if (!(info)) { \
+        ossl_raise(rb_eRuntimeError, "TS_TST_INFO wasn't initialized."); \
+    } \
+} while (0)
+
+#define ossl_tsfac_get_default_policy_id(o)      rb_attr_get((o),rb_intern("@default_policy_id"))
+#define ossl_tsfac_get_serial_number(o)          rb_attr_get((o),rb_intern("@serial_number"))
+#define ossl_tsfac_get_gen_time(o)               rb_attr_get((o),rb_intern("@gen_time"))
+#define ossl_tsfac_get_additional_certs(o)       rb_attr_get((o),rb_intern("@additional_certs"))
+#define ossl_tsfac_get_allowed_digests(o)        rb_attr_get((o),rb_intern("@allowed_digests"))
+
+static VALUE mTimestamp;
+static VALUE eTimestampError;
+static VALUE cTimestampRequest;
+static VALUE cTimestampResponse;
+static VALUE cTimestampTokenInfo;
+static VALUE cTimestampFactory;
+static VALUE sBAD_ALG, sBAD_REQUEST, sBAD_DATA_FORMAT, sTIME_NOT_AVAILABLE;
+static VALUE sUNACCEPTED_POLICY, sUNACCEPTED_EXTENSION, sADD_INFO_NOT_AVAILABLE;
+static VALUE sSYSTEM_FAILURE;
+
+static void
+ossl_ts_req_free(void *ptr)
+{
+    TS_REQ_free(ptr);
+}
+
+static const rb_data_type_t ossl_ts_req_type = {
+    "OpenSSL/Timestamp/Request",
+    {
+        0, ossl_ts_req_free,
+    },
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
+static void
+ossl_ts_resp_free(void *ptr)
+{
+    TS_RESP_free(ptr);
+}
+
+static  const rb_data_type_t ossl_ts_resp_type = {
+    "OpenSSL/Timestamp/Response",
+    {
+        0, ossl_ts_resp_free,
+    },
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
+static void
+ossl_ts_token_info_free(void *ptr)
+{
+        TS_TST_INFO_free(ptr);
+}
+
+static const rb_data_type_t ossl_ts_token_info_type = {
+    "OpenSSL/Timestamp/TokenInfo",
+    {
+        0, ossl_ts_token_info_free,
+    },
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
+static VALUE
+asn1_to_der(void *template, int (*i2d)(void *template, unsigned char **pp))
+{
+    VALUE str;
+    int len;
+    unsigned char *p;
+
+    if((len = i2d(template, NULL)) <= 0)
+        ossl_raise(eTimestampError, "Error when encoding to DER");
+    str = rb_str_new(0, len);
+    p = (unsigned char *)RSTRING_PTR(str);
+    if(i2d(template, &p) <= 0)
+        ossl_raise(eTimestampError, "Error when encoding to DER");
+    rb_str_set_len(str, p - (unsigned char*)RSTRING_PTR(str));
+
+    return str;
+}
+
+static ASN1_OBJECT*
+obj_to_asn1obj(VALUE obj)
+{
+    ASN1_OBJECT *a1obj;
+
+    StringValue(obj);
+    a1obj = OBJ_txt2obj(RSTRING_PTR(obj), 0);
+    if(!a1obj) a1obj = OBJ_txt2obj(RSTRING_PTR(obj), 1);
+    if(!a1obj) ossl_raise(eASN1Error, "invalid OBJECT ID");
+
+    return a1obj;
+}
+
+static VALUE
+get_asn1obj(ASN1_OBJECT *obj)
+{
+    BIO *out;
+    VALUE ret;
+    int nid;
+    if ((nid = OBJ_obj2nid(obj)) != NID_undef)
+        ret = rb_str_new2(OBJ_nid2sn(nid));
+    else{
+        if (!(out = BIO_new(BIO_s_mem())))
+            ossl_raise(eX509AttrError, NULL);
+        i2a_ASN1_OBJECT(out, obj);
+        ret = ossl_membio2str(out);
+    }
+
+    return ret;
+}
+
+static VALUE
+ossl_ts_req_alloc(VALUE klass)
+{
+    TS_REQ *req;
+    VALUE obj;
+
+    obj = NewTSRequest(klass);
+    if (!(req = TS_REQ_new()))
+        ossl_raise(eTimestampError, NULL);
+    SetTSRequest(obj, req);
+
+    /* Defaults */
+    TS_REQ_set_version(req, 1);
+    TS_REQ_set_cert_req(req, 1);
+
+    return obj;
+}
+
+/*
+ * When creating a Request with the +File+ or +string+ parameter, the
+ * corresponding +File+ or +string+ must be DER-encoded.
+ *
+ * call-seq:
+ *       OpenSSL::Timestamp::Request.new(file)    -> request
+ *       OpenSSL::Timestamp::Request.new(string)  -> request
+ *       OpenSSL::Timestamp::Request.new          -> empty request
+ */
+static VALUE
+ossl_ts_req_initialize(int argc, VALUE *argv, VALUE self)
+{
+    TS_REQ *ts_req = DATA_PTR(self);
+    BIO *in;
+    VALUE arg;
+
+    if(rb_scan_args(argc, argv, "01", &arg) == 0) {
+        return self;
+    }
+
+    arg = ossl_to_der_if_possible(arg);
+    in = ossl_obj2bio(&arg);
+    ts_req = d2i_TS_REQ_bio(in, &ts_req);
+    BIO_free(in);
+    if (!ts_req) {
+        DATA_PTR(self) = NULL;
+        ossl_raise(eTimestampError, "Error when decoding the timestamp request");
+    }
+    DATA_PTR(self) = ts_req;
+
+    return self;
+}
+
+/*
+ * Returns the 'short name' of the object identifier that represents the
+ * algorithm that was used to create the message imprint digest.
+ *
+ *  call-seq:
+ *       request.algorithm    -> string
+ */
+static VALUE
+ossl_ts_req_get_algorithm(VALUE self)
+{
+    TS_REQ *req;
+    TS_MSG_IMPRINT *mi;
+    X509_ALGOR *algor;
+
+    GetTSRequest(self, req);
+    mi = TS_REQ_get_msg_imprint(req);
+    algor = TS_MSG_IMPRINT_get_algo(mi);
+    return get_asn1obj(algor->algorithm);
+}
+
+/*
+ * Allows to set the object identifier  or the 'short name' of the
+ * algorithm that was used to create the message imprint digest.
+ *
+ * ===Example:
+ *      request.algorithm = "SHA1"
+ *
+ *  call-seq:
+ *       request.algorithm = "string"    -> string
+ */
+static VALUE
+ossl_ts_req_set_algorithm(VALUE self, VALUE algo)
+{
+    TS_REQ *req;
+    TS_MSG_IMPRINT *mi;
+    ASN1_OBJECT *obj;
+    X509_ALGOR *algor;
+
+    GetTSRequest(self, req);
+    obj = obj_to_asn1obj(algo);
+    mi = TS_REQ_get_msg_imprint(req);
+    algor = TS_MSG_IMPRINT_get_algo(mi);
+    if (!X509_ALGOR_set0(algor, obj, V_ASN1_NULL, NULL)) {
+        ASN1_OBJECT_free(obj);
+        ossl_raise(eTimestampError, "X509_ALGOR_set0");
+    }
+
+    return algo;
+}
+
+/*
+ * Returns the message imprint (digest) of the data to be timestamped.
+ *
+ * call-seq:
+ *       request.message_imprint    -> string or nil
+ */
+static VALUE
+ossl_ts_req_get_msg_imprint(VALUE self)
+{
+    TS_REQ *req;
+    TS_MSG_IMPRINT *mi;
+    ASN1_OCTET_STRING *hashed_msg;
+    VALUE ret;
+
+    GetTSRequest(self, req);
+    mi = TS_REQ_get_msg_imprint(req);
+    hashed_msg = TS_MSG_IMPRINT_get_msg(mi);
+
+    ret = rb_str_new((const char *)hashed_msg->data, hashed_msg->length);
+
+    return ret;
+}
+
+/*
+ * Set the message imprint digest.
+ *
+ *  call-seq:
+ *       request.message_imprint = "string"    -> string
+ */
+static VALUE
+ossl_ts_req_set_msg_imprint(VALUE self, VALUE hash)
+{
+    TS_REQ *req;
+    TS_MSG_IMPRINT *mi;
+    StringValue(hash);
+
+    GetTSRequest(self, req);
+    mi = TS_REQ_get_msg_imprint(req);
+    if (!TS_MSG_IMPRINT_set_msg(mi, (unsigned char *)RSTRING_PTR(hash), RSTRING_LENINT(hash)))
+        ossl_raise(eTimestampError, "TS_MSG_IMPRINT_set_msg");
+
+    return hash;
+}
+
+/*
+ * Returns the version of this request. +1+ is the default value.
+ *
+ * call-seq:
+ *       request.version -> Integer
+ */
+static VALUE
+ossl_ts_req_get_version(VALUE self)
+{
+    TS_REQ *req;
+
+    GetTSRequest(self, req);
+    return LONG2NUM(TS_REQ_get_version(req));
+}
+
+/*
+ * Sets the version number for this Request. This should be +1+ for compliant
+ * servers.
+ *
+ * call-seq:
+ *       request.version = number    -> Integer
+ */
+static VALUE
+ossl_ts_req_set_version(VALUE self, VALUE version)
+{
+    TS_REQ *req;
+    long ver;
+
+    if ((ver = NUM2LONG(version)) < 0)
+        ossl_raise(eTimestampError, "version must be >= 0!");
+    GetTSRequest(self, req);
+    if (!TS_REQ_set_version(req, ver))
+        ossl_raise(eTimestampError, "TS_REQ_set_version");
+
+    return version;
+}
+
+/*
+ * Returns the 'short name' of the object identifier that represents the
+ * timestamp policy under which the server shall create the timestamp.
+ *
+ * call-seq:
+ *       request.policy_id    -> string or nil
+ */
+static VALUE
+ossl_ts_req_get_policy_id(VALUE self)
+{
+    TS_REQ *req;
+
+    GetTSRequest(self, req);
+    if (!TS_REQ_get_policy_id(req))
+        return Qnil;
+    return get_asn1obj(TS_REQ_get_policy_id(req));
+}
+
+/*
+ * Allows to set the object identifier that represents the
+ * timestamp policy under which the server shall create the timestamp. This
+ * may be left +nil+, implying that the timestamp server will issue the
+ * timestamp using some default policy.
+ *
+ * ===Example:
+ *      request.policy_id = "1.2.3.4.5"
+ *
+ * call-seq:
+ *       request.policy_id = "string"   -> string
+ */
+static VALUE
+ossl_ts_req_set_policy_id(VALUE self, VALUE oid)
+{
+    TS_REQ *req;
+    ASN1_OBJECT *obj;
+    int ok;
+
+    GetTSRequest(self, req);
+    obj = obj_to_asn1obj(oid);
+    ok = TS_REQ_set_policy_id(req, obj);
+    ASN1_OBJECT_free(obj);
+    if (!ok)
+        ossl_raise(eTimestampError, "TS_REQ_set_policy_id");
+
+    return oid;
+}
+
+/*
+ * Returns the nonce (number used once) that the server shall include in its
+ * response.
+ *
+ * call-seq:
+ *       request.nonce    -> BN or nil
+ */
+static VALUE
+ossl_ts_req_get_nonce(VALUE self)
+{
+    TS_REQ *req;
+    const ASN1_INTEGER * nonce;
+
+    GetTSRequest(self, req);
+    if (!(nonce = TS_REQ_get_nonce(req)))
+        return Qnil;
+    return asn1integer_to_num(nonce);
+}
+
+/*
+ * Sets the nonce (number used once) that the server shall include in its
+ * response. If the nonce is set, the server must return the same nonce value in
+ * a valid Response.
+ *
+ * call-seq:
+ *       request.nonce = number    -> BN
+ */
+static VALUE
+ossl_ts_req_set_nonce(VALUE self, VALUE num)
+{
+    TS_REQ *req;
+    ASN1_INTEGER *nonce;
+    int ok;
+
+    GetTSRequest(self, req);
+    nonce = num_to_asn1integer(num, NULL);
+    ok = TS_REQ_set_nonce(req, nonce);
+    ASN1_INTEGER_free(nonce);
+    if (!ok)
+        ossl_raise(eTimestampError, NULL);
+    return num;
+}
+
+/*
+ * Indicates whether the response shall contain the timestamp authority's
+ * certificate or not.
+ *
+ * call-seq:
+ *       request.cert_requested?  -> true or false
+ */
+static VALUE
+ossl_ts_req_get_cert_requested(VALUE self)
+{
+    TS_REQ *req;
+
+    GetTSRequest(self, req);
+    return TS_REQ_get_cert_req(req) ? Qtrue: Qfalse;
+}
+
+/*
+ * Specify whether the response shall contain the timestamp authority's
+ * certificate or not. The default value is +true+.
+ *
+ * call-seq:
+ *       request.cert_requested = boolean -> true or false
+ */
+static VALUE
+ossl_ts_req_set_cert_requested(VALUE self, VALUE requested)
+{
+    TS_REQ *req;
+
+    GetTSRequest(self, req);
+    TS_REQ_set_cert_req(req, RTEST(requested));
+
+    return requested;
+}
+
+/*
+ * DER-encodes this Request.
+ *
+ * call-seq:
+ *       request.to_der    -> DER-encoded string
+ */
+static VALUE
+ossl_ts_req_to_der(VALUE self)
+{
+    TS_REQ *req;
+    TS_MSG_IMPRINT *mi;
+    X509_ALGOR *algo;
+    ASN1_OCTET_STRING *hashed_msg;
+
+    GetTSRequest(self, req);
+    mi = TS_REQ_get_msg_imprint(req);
+
+    algo = TS_MSG_IMPRINT_get_algo(mi);
+    if (OBJ_obj2nid(algo->algorithm) == NID_undef)
+        ossl_raise(eTimestampError, "Message imprint missing algorithm");
+
+    hashed_msg = TS_MSG_IMPRINT_get_msg(mi);
+    if (!hashed_msg->length)
+        ossl_raise(eTimestampError, "Message imprint missing hashed message");
+
+    return asn1_to_der((void *)req, (int (*)(void *, unsigned char **))i2d_TS_REQ);
+}
+
+static VALUE
+ossl_ts_resp_alloc(VALUE klass)
+{
+    TS_RESP *resp;
+    VALUE obj;
+
+    obj = NewTSResponse(klass);
+    if (!(resp = TS_RESP_new()))
+        ossl_raise(eTimestampError, NULL);
+    SetTSResponse(obj, resp);
+
+    return obj;
+}
+
+/*
+ * Creates a Response from a +File+ or +string+ parameter, the
+ * corresponding +File+ or +string+ must be DER-encoded. Please note
+ * that Response is an immutable read-only class. If you'd like to create
+ * timestamps please refer to Factory instead.
+ *
+ * call-seq:
+ *       OpenSSL::Timestamp::Response.new(file)    -> response
+ *       OpenSSL::Timestamp::Response.new(string)  -> response
+ */
+static VALUE
+ossl_ts_resp_initialize(VALUE self, VALUE der)
+{
+    TS_RESP *ts_resp = DATA_PTR(self);
+    BIO *in;
+
+    der = ossl_to_der_if_possible(der);
+    in  = ossl_obj2bio(&der);
+    ts_resp = d2i_TS_RESP_bio(in, &ts_resp);
+    BIO_free(in);
+    if (!ts_resp) {
+        DATA_PTR(self) = NULL;
+        ossl_raise(eTimestampError, "Error when decoding the timestamp response");
+    }
+    DATA_PTR(self) = ts_resp;
+
+    return self;
+}
+
+/*
+ * Returns one of GRANTED, GRANTED_WITH_MODS, REJECTION, WAITING,
+ * REVOCATION_WARNING or REVOCATION_NOTIFICATION. A timestamp token has
+ * been created only in case +status+ is equal to GRANTED or GRANTED_WITH_MODS.
+ *
+ * call-seq:
+ *       response.status -> BN (never nil)
+ */
+static VALUE
+ossl_ts_resp_get_status(VALUE self)
+{
+    TS_RESP *resp;
+    TS_STATUS_INFO *si;
+    const ASN1_INTEGER *st;
+
+    GetTSResponse(self, resp);
+    si = TS_RESP_get_status_info(resp);
+    st = TS_STATUS_INFO_get0_status(si);
+
+    return asn1integer_to_num(st);
+}
+
+/*
+ * In cases no timestamp token has been created, this field contains further
+ * info about the reason why response creation failed. The method returns either
+ * nil (the request was successful and a timestamp token was created) or one of
+ * the following:
+ * * :BAD_ALG - Indicates that the timestamp server rejects the message
+ *   imprint algorithm used in the Request
+ * * :BAD_REQUEST - Indicates that the timestamp server was not able to process
+ *   the Request properly
+ * * :BAD_DATA_FORMAT - Indicates that the timestamp server was not able to
+ *   parse certain data in the Request
+ * * :TIME_NOT_AVAILABLE - Indicates that the server could not access its time
+ *   source
+ * * :UNACCEPTED_POLICY - Indicates that the requested policy identifier is not
+ *   recognized or supported by the timestamp server
+ * * :UNACCEPTED_EXTENSIION - Indicates that an extension in the Request is
+ *   not supported by the timestamp server
+ * * :ADD_INFO_NOT_AVAILABLE -Indicates that additional information requested
+ *   is either not understood or currently not available
+ * * :SYSTEM_FAILURE - Timestamp creation failed due to an internal error that
+ *   occurred on the timestamp server
+ *
+ * call-seq:
+ *       response.failure_info -> nil or symbol
+ */
+static VALUE
+ossl_ts_resp_get_failure_info(VALUE self)
+{
+    TS_RESP *resp;
+    TS_STATUS_INFO *si;
+
+    /* The ASN1_BIT_STRING_get_bit changed from 1.0.0. to 1.1.0, making this
+     * const. */
+    #if defined(HAVE_TS_STATUS_INFO_GET0_FAILURE_INFO)
+    const ASN1_BIT_STRING *fi;
+    #else
+    ASN1_BIT_STRING *fi;
+    #endif
+
+    GetTSResponse(self, resp);
+    si = TS_RESP_get_status_info(resp);
+    fi = TS_STATUS_INFO_get0_failure_info(si);
+    if (!fi)
+        return Qnil;
+    if (ASN1_BIT_STRING_get_bit(fi, TS_INFO_BAD_ALG))
+        return sBAD_ALG;
+    if (ASN1_BIT_STRING_get_bit(fi, TS_INFO_BAD_REQUEST))
+        return sBAD_REQUEST;
+    if (ASN1_BIT_STRING_get_bit(fi, TS_INFO_BAD_DATA_FORMAT))
+        return sBAD_DATA_FORMAT;
+    if (ASN1_BIT_STRING_get_bit(fi, TS_INFO_TIME_NOT_AVAILABLE))
+        return sTIME_NOT_AVAILABLE;
+    if (ASN1_BIT_STRING_get_bit(fi, TS_INFO_UNACCEPTED_POLICY))
+        return sUNACCEPTED_POLICY;
+    if (ASN1_BIT_STRING_get_bit(fi, TS_INFO_UNACCEPTED_EXTENSION))
+        return sUNACCEPTED_EXTENSION;
+    if (ASN1_BIT_STRING_get_bit(fi, TS_INFO_ADD_INFO_NOT_AVAILABLE))
+        return sADD_INFO_NOT_AVAILABLE;
+    if (ASN1_BIT_STRING_get_bit(fi, TS_INFO_SYSTEM_FAILURE))
+        return sSYSTEM_FAILURE;
+
+    ossl_raise(eTimestampError, "Unrecognized failure info.");
+}
+
+/*
+ * In cases of failure this field may contain an array of strings further
+ * describing the origin of the failure.
+ *
+ * call-seq:
+ *       response.status_text -> Array of strings or nil
+ */
+static VALUE
+ossl_ts_resp_get_status_text(VALUE self)
+{
+    TS_RESP *resp;
+    TS_STATUS_INFO *si;
+    const STACK_OF(ASN1_UTF8STRING) *text;
+    ASN1_UTF8STRING *current;
+    int i;
+    VALUE ret = rb_ary_new();
+
+    GetTSResponse(self, resp);
+    si = TS_RESP_get_status_info(resp);
+    if ((text = TS_STATUS_INFO_get0_text(si))) {
+        for (i = 0; i < sk_ASN1_UTF8STRING_num(text); i++) {
+            current = sk_ASN1_UTF8STRING_value(text, i);
+            rb_ary_push(ret, asn1str_to_str(current));
+        }
+    }
+
+    return ret;
+}
+
+/*
+ * If a timestamp token is present, this returns it in the form of a
+ * OpenSSL::PKCS7.
+ *
+ * call-seq:
+ *       response.token -> nil or OpenSSL::PKCS7
+ */
+static VALUE
+ossl_ts_resp_get_token(VALUE self)
+{
+    TS_RESP *resp;
+    PKCS7 *p7, *copy;
+    VALUE obj;
+
+    GetTSResponse(self, resp);
+    if (!(p7 = TS_RESP_get_token(resp)))
+        return Qnil;
+
+    obj = NewPKCS7(cPKCS7);
+
+    if (!(copy = PKCS7_dup(p7)))
+        ossl_raise(eTimestampError, NULL);
+
+    SetPKCS7(obj, copy);
+
+    return obj;
+}
+
+/*
+ * Get the response's token info if present.
+ *
+ * call-seq:
+ *       response.token_info -> nil or OpenSSL::Timestamp::TokenInfo
+ */
+static VALUE
+ossl_ts_resp_get_token_info(VALUE self)
+{
+    TS_RESP *resp;
+    TS_TST_INFO *info, *copy;
+    VALUE obj;
+
+    GetTSResponse(self, resp);
+    if (!(info = TS_RESP_get_tst_info(resp)))
+        return Qnil;
+
+    obj = NewTSTokenInfo(cTimestampTokenInfo);
+
+    if (!(copy = TS_TST_INFO_dup(info)))
+        ossl_raise(eTimestampError, NULL);
+
+    SetTSTokenInfo(obj, copy);
+
+    return obj;
+}
+
+/*
+ * If the Request specified to request the TSA certificate
+ * (Request#cert_requested = true), then this field contains the
+ * certificate of the timestamp authority.
+ *
+ * call-seq:
+ *       response.tsa_certificate -> OpenSSL::X509::Certificate or nil
+ */
+static VALUE
+ossl_ts_resp_get_tsa_certificate(VALUE self)
+{
+    TS_RESP *resp;
+    PKCS7 *p7;
+    PKCS7_SIGNER_INFO *ts_info;
+    X509 *cert;
+
+    GetTSResponse(self, resp);
+    if (!(p7 = TS_RESP_get_token(resp)))
+        return Qnil;
+    ts_info = sk_PKCS7_SIGNER_INFO_value(p7->d.sign->signer_info, 0);
+    cert = PKCS7_cert_from_signer_info(p7, ts_info);
+    if (!cert)
+        return Qnil;
+    return ossl_x509_new(cert);
+}
+
+/*
+ * Returns the Response in DER-encoded form.
+ *
+ * call-seq:
+ *       response.to_der -> string
+ */
+static VALUE
+ossl_ts_resp_to_der(VALUE self)
+{
+    TS_RESP *resp;
+
+    GetTSResponse(self, resp);
+    return asn1_to_der((void *)resp, (int (*)(void *, unsigned char **))i2d_TS_RESP);
+}
+
+/*
+ * Verifies a timestamp token by checking the signature, validating the
+ * certificate chain implied by tsa_certificate and by checking conformance to
+ * a given Request. Mandatory parameters are the Request associated to this
+ * Response, and an OpenSSL::X509::Store of trusted roots.
+ *
+ * Intermediate certificates can optionally be supplied for creating the
+ * certificate chain. These intermediate certificates must all be
+ * instances of OpenSSL::X509::Certificate.
+ *
+ * If validation fails, several kinds of exceptions can be raised:
+ * * TypeError if types don't fit
+ * * TimestampError if something is wrong with the timestamp token itself, if
+ *   it is not conformant to the Request, or if validation of the timestamp
+ *   certificate chain fails.
+ *
+ * call-seq:
+ *       response.verify(Request, root_store) -> Response
+ *       response.verify(Request, root_store, [intermediate_cert]) -> Response
+ */
+static VALUE
+ossl_ts_resp_verify(int argc, VALUE *argv, VALUE self)
+{
+    VALUE ts_req, store, intermediates;
+    TS_RESP *resp;
+    TS_REQ *req;
+    X509_STORE *x509st;
+    TS_VERIFY_CTX *ctx;
+    STACK_OF(X509) *x509inter = NULL;
+    PKCS7* p7;
+    X509 *cert;
+    int status, i, ok;
+
+    rb_scan_args(argc, argv, "21", &ts_req, &store, &intermediates);
+
+    GetTSResponse(self, resp);
+    GetTSRequest(ts_req, req);
+    x509st = GetX509StorePtr(store);
+
+    if (!(ctx = TS_REQ_to_TS_VERIFY_CTX(req, NULL))) {
+        ossl_raise(eTimestampError, "Error when creating the verification context.");
+    }
+
+    if (!NIL_P(intermediates)) {
+        x509inter = ossl_protect_x509_ary2sk(intermediates, &status);
+        if (status) {
+            TS_VERIFY_CTX_free(ctx);
+            rb_jump_tag(status);
+        }
+    } else if (!(x509inter = sk_X509_new_null())) {
+        TS_VERIFY_CTX_free(ctx);
+        ossl_raise(eTimestampError, "sk_X509_new_null");
+    }
+
+    if (!(p7 = TS_RESP_get_token(resp))) {
+        TS_VERIFY_CTX_free(ctx);
+        sk_X509_pop_free(x509inter, X509_free);
+        ossl_raise(eTimestampError, "TS_RESP_get_token");
+    }
+    for (i=0; i < sk_X509_num(p7->d.sign->cert); i++) {
+        cert = sk_X509_value(p7->d.sign->cert, i);
+        if (!sk_X509_push(x509inter, cert)) {
+            sk_X509_pop_free(x509inter, X509_free);
+            TS_VERIFY_CTX_free(ctx);
+            ossl_raise(eTimestampError, "sk_X509_push");
+        }
+        X509_up_ref(cert);
+    }
+
+    TS_VERIFY_CTS_set_certs(ctx, x509inter);
+    TS_VERIFY_CTX_add_flags(ctx, TS_VFY_SIGNATURE);
+    TS_VERIFY_CTX_set_store(ctx, x509st);
+
+    ok = TS_RESP_verify_response(ctx, resp);
+
+    /* WORKAROUND:
+     *   X509_STORE can count references, but X509_STORE_free() doesn't check
+     *   this. To prevent our X509_STORE from being freed with our
+     *   TS_VERIFY_CTX we set the store to NULL first.
+     *   Fixed in OpenSSL 1.0.2; bff9ce4db38b (master), 5b4b9ce976fc (1.0.2)
+     */
+    TS_VERIFY_CTX_set_store(ctx, NULL);
+    TS_VERIFY_CTX_free(ctx);
+
+    if (!ok)
+        ossl_raise(eTimestampError, "TS_RESP_verify_response");
+
+    return self;
+}
+
+static VALUE
+ossl_ts_token_info_alloc(VALUE klass)
+{
+    TS_TST_INFO *info;
+    VALUE obj;
+
+    obj = NewTSTokenInfo(klass);
+    if (!(info = TS_TST_INFO_new()))
+        ossl_raise(eTimestampError, NULL);
+    SetTSTokenInfo(obj, info);
+
+    return obj;
+}
+
+/*
+ * Creates a TokenInfo from a +File+ or +string+ parameter, the
+ * corresponding +File+ or +string+ must be DER-encoded. Please note
+ * that TokenInfo is an immutable read-only class. If you'd like to create
+ * timestamps please refer to Factory instead.
+ *
+ * call-seq:
+ *       OpenSSL::Timestamp::TokenInfo.new(file)    -> token-info
+ *       OpenSSL::Timestamp::TokenInfo.new(string)  -> token-info
+ */
+static VALUE
+ossl_ts_token_info_initialize(VALUE self, VALUE der)
+{
+    TS_TST_INFO *info = DATA_PTR(self);
+    BIO *in;
+
+    der = ossl_to_der_if_possible(der);
+    in  = ossl_obj2bio(&der);
+    info = d2i_TS_TST_INFO_bio(in, &info);
+    BIO_free(in);
+    if (!info) {
+        DATA_PTR(self) = NULL;
+        ossl_raise(eTimestampError, "Error when decoding the timestamp token info");
+    }
+    DATA_PTR(self) = info;
+
+    return self;
+}
+
+/*
+ * Returns the version number of the token info. With compliant servers,
+ * this value should be +1+ if present. If status is GRANTED or
+ * GRANTED_WITH_MODS.
+ *
+ * call-seq:
+ *       token_info.version -> Integer or nil
+ */
+static VALUE
+ossl_ts_token_info_get_version(VALUE self)
+{
+    TS_TST_INFO *info;
+
+    GetTSTokenInfo(self, info);
+    return LONG2NUM(TS_TST_INFO_get_version(info));
+}
+
+/*
+ * Returns the timestamp policy object identifier of the policy this timestamp
+ * was created under. If status is GRANTED or GRANTED_WITH_MODS, this is never
+ * +nil+.
+ *
+ * ===Example:
+ *      id = token_info.policy_id
+ *      puts id                 -> "1.2.3.4.5"
+ *
+ * call-seq:
+ *       token_info.policy_id -> string or nil
+ */
+static VALUE
+ossl_ts_token_info_get_policy_id(VALUE self)
+{
+    TS_TST_INFO *info;
+
+    GetTSTokenInfo(self, info);
+    return get_asn1obj(TS_TST_INFO_get_policy_id(info));
+}
+
+/*
+ * Returns the 'short name' of the object identifier representing the algorithm
+ * that was used to derive the message imprint digest. For valid timestamps,
+ * this is the same value that was already given in the Request. If status is
+ * GRANTED or GRANTED_WITH_MODS, this is never +nil+.
+ *
+ * ===Example:
+ *      algo = token_info.algorithm
+ *      puts algo                -> "SHA1"
+ *
+ * call-seq:
+ *       token_info.algorithm -> string or nil
+ */
+static VALUE
+ossl_ts_token_info_get_algorithm(VALUE self)
+{
+    TS_TST_INFO *info;
+    TS_MSG_IMPRINT *mi;
+    X509_ALGOR *algo;
+
+    GetTSTokenInfo(self, info);
+    mi = TS_TST_INFO_get_msg_imprint(info);
+    algo = TS_MSG_IMPRINT_get_algo(mi);
+    return get_asn1obj(algo->algorithm);
+}
+
+/*
+ * Returns the message imprint digest. For valid timestamps,
+ * this is the same value that was already given in the Request.
+ * If status is GRANTED or GRANTED_WITH_MODS, this is never +nil+.
+ *
+ * ===Example:
+ *      mi = token_info.msg_imprint
+ *      puts mi                -> "DEADBEEF"
+ *
+ * call-seq:
+ *       token_info.msg_imprint -> string.
+ */
+static VALUE
+ossl_ts_token_info_get_msg_imprint(VALUE self)
+{
+    TS_TST_INFO *info;
+    TS_MSG_IMPRINT *mi;
+    ASN1_OCTET_STRING *hashed_msg;
+    VALUE ret;
+
+    GetTSTokenInfo(self, info);
+    mi = TS_TST_INFO_get_msg_imprint(info);
+    hashed_msg = TS_MSG_IMPRINT_get_msg(mi);
+    ret = rb_str_new((const char *)hashed_msg->data, hashed_msg->length);
+
+    return ret;
+}
+
+/*
+ * Returns serial number of the timestamp token. This value shall never be the
+ * same for two timestamp tokens issued by a dedicated timestamp authority.
+ * If status is GRANTED or GRANTED_WITH_MODS, this is never +nil+.
+ *
+ * call-seq:
+ *       token_info.serial_number -> BN or nil
+ */
+static VALUE
+ossl_ts_token_info_get_serial_number(VALUE self)
+{
+    TS_TST_INFO *info;
+
+    GetTSTokenInfo(self, info);
+    return asn1integer_to_num(TS_TST_INFO_get_serial(info));
+}
+
+/*
+ * Returns time when this timestamp token was created. If status is GRANTED or
+ * GRANTED_WITH_MODS, this is never +nil+.
+ *
+ * call-seq:
+ *       token_info.gen_time -> Time
+ */
+static VALUE
+ossl_ts_token_info_get_gen_time(VALUE self)
+{
+    TS_TST_INFO *info;
+
+    GetTSTokenInfo(self, info);
+    return asn1time_to_time(TS_TST_INFO_get_time(info));
+}
+
+/*
+ * If the ordering field is missing, or if the ordering field is present
+ * and set to false, then the genTime field only indicates the time at
+ * which the time-stamp token has been created by the TSA.  In such a
+ * case, the ordering of time-stamp tokens issued by the same TSA or
+ * different TSAs is only possible when the difference between the
+ * genTime of the first time-stamp token and the genTime of the second
+ * time-stamp token is greater than the sum of the accuracies of the
+ * genTime for each time-stamp token.
+ *
+ * If the ordering field is present and set to true, every time-stamp
+ * token from the same TSA can always be ordered based on the genTime
+ * field, regardless of the genTime accuracy.
+ *
+ * call-seq:
+ *       token_info.ordering -> true, falses or nil
+ */
+static VALUE
+ossl_ts_token_info_get_ordering(VALUE self)
+{
+    TS_TST_INFO *info;
+
+    GetTSTokenInfo(self, info);
+    return TS_TST_INFO_get_ordering(info) ? Qtrue : Qfalse;
+}
+
+/*
+ * If the timestamp token is valid then this field contains the same nonce that
+ * was passed to the timestamp server in the initial Request.
+ *
+ * call-seq:
+ *       token_info.nonce -> BN or nil
+ */
+static VALUE
+ossl_ts_token_info_get_nonce(VALUE self)
+{
+    TS_TST_INFO *info;
+    const ASN1_INTEGER *nonce;
+
+    GetTSTokenInfo(self, info);
+    if (!(nonce = TS_TST_INFO_get_nonce(info)))
+        return Qnil;
+
+    return asn1integer_to_num(nonce);
+}
+
+/*
+ * Returns the TokenInfo in DER-encoded form.
+ *
+ * call-seq:
+ *       token_info.to_der -> string
+ */
+static VALUE
+ossl_ts_token_info_to_der(VALUE self)
+{
+    TS_TST_INFO *info;
+
+    GetTSTokenInfo(self, info);
+    return asn1_to_der((void *)info, (int (*)(void *, unsigned char **))i2d_TS_TST_INFO);
+}
+
+static ASN1_INTEGER *
+ossl_tsfac_serial_cb(struct TS_resp_ctx *ctx, void *data)
+{
+    ASN1_INTEGER **snptr = (ASN1_INTEGER **)data;
+    ASN1_INTEGER *sn = *snptr;
+    *snptr = NULL;
+    return sn;
+}
+
+static int
+#if !defined(LIBRESSL_VERSION_NUMBER)
+ossl_tsfac_time_cb(struct TS_resp_ctx *ctx, void *data, long *sec, long *usec)
+#else
+ossl_tsfac_time_cb(struct TS_resp_ctx *ctx, void *data, time_t *sec, long *usec)
+#endif
+{
+    *sec = *((long *)data);
+    *usec = 0;
+    return 1;
+}
+
+/*
+ * Creates a Response with the help of an OpenSSL::PKey, an
+ * OpenSSL::X509::Certificate and a Request.
+ *
+ * Mandatory parameters for timestamp creation that need to be set in the
+ * Request:
+ *
+ * * Request#algorithm
+ * * Request#message_imprint
+ *
+ * Mandatory parameters that need to be set in the Factory:
+ * * Factory#serial_number
+ * * Factory#gen_time
+ * * Factory#allowed_digests
+ *
+ * In addition one of either Request#policy_id or Factory#default_policy_id
+ * must be set.
+ *
+ * Raises a TimestampError if creation fails, though successfully created error
+ * responses may be returned.
+ *
+ * call-seq:
+ *       factory.create_timestamp(key, certificate, request) -> Response
+ */
+static VALUE
+ossl_tsfac_create_ts(VALUE self, VALUE key, VALUE certificate, VALUE request)
+{
+    VALUE serial_number, def_policy_id, gen_time, additional_certs, allowed_digests;
+    VALUE str;
+    STACK_OF(X509) *inter_certs;
+    VALUE tsresp, ret = Qnil;
+    EVP_PKEY *sign_key;
+    X509 *tsa_cert;
+    TS_REQ *req;
+    TS_RESP *response = NULL;
+    TS_RESP_CTX *ctx = NULL;
+    BIO *req_bio;
+    ASN1_INTEGER *asn1_serial = NULL;
+    ASN1_OBJECT *def_policy_id_obj = NULL;
+    long lgen_time;
+    const char * err_msg = NULL;
+    int status = 0;
+
+    tsresp = NewTSResponse(cTimestampResponse);
+    tsa_cert = GetX509CertPtr(certificate);
+    sign_key = GetPrivPKeyPtr(key);
+    GetTSRequest(request, req);
+
+    gen_time = ossl_tsfac_get_gen_time(self);
+    if (!rb_obj_is_instance_of(gen_time, rb_cTime)) {
+        err_msg = "@gen_time must be a Time.";
+        goto end;
+    }
+    lgen_time = NUM2LONG(rb_funcall(gen_time, rb_intern("to_i"), 0));
+
+    serial_number = ossl_tsfac_get_serial_number(self);
+    if (NIL_P(serial_number)) {
+        err_msg = "@serial_number must be set.";
+        goto end;
+    }
+    asn1_serial = num_to_asn1integer(serial_number, NULL);
+
+    def_policy_id = ossl_tsfac_get_default_policy_id(self);
+    if (NIL_P(def_policy_id) && !TS_REQ_get_policy_id(req)) {
+        err_msg = "No policy id in the request and no default policy set";
+        goto end;
+    }
+    if (!NIL_P(def_policy_id) && !TS_REQ_get_policy_id(req)) {
+        def_policy_id_obj = (ASN1_OBJECT*)rb_protect((VALUE (*)(VALUE))obj_to_asn1obj, (VALUE)def_policy_id, &status);
+        if (status)
+            goto end;
+    }
+
+    if (!(ctx = TS_RESP_CTX_new())) {
+        err_msg = "Memory allocation failed.";
+        goto end;
+    }
+
+    TS_RESP_CTX_set_serial_cb(ctx, ossl_tsfac_serial_cb, &asn1_serial);
+    if (!TS_RESP_CTX_set_signer_cert(ctx, tsa_cert)) {
+        err_msg = "Certificate does not contain the timestamping extension";
+        goto end;
+    }
+
+    additional_certs = ossl_tsfac_get_additional_certs(self);
+    if (rb_obj_is_kind_of(additional_certs, rb_cArray)) {
+        inter_certs = ossl_protect_x509_ary2sk(additional_certs, &status);
+        if (status)
+                goto end;
+
+        /* this dups the sk_X509 and ups each cert's ref count */
+        TS_RESP_CTX_set_certs(ctx, inter_certs);
+        sk_X509_pop_free(inter_certs, X509_free);
+    }
+
+    TS_RESP_CTX_set_signer_key(ctx, sign_key);
+    if (!NIL_P(def_policy_id) && !TS_REQ_get_policy_id(req))
+        TS_RESP_CTX_set_def_policy(ctx, def_policy_id_obj);
+    if (TS_REQ_get_policy_id(req))
+        TS_RESP_CTX_set_def_policy(ctx, TS_REQ_get_policy_id(req));
+    TS_RESP_CTX_set_time_cb(ctx, ossl_tsfac_time_cb, &lgen_time);
+
+    allowed_digests = ossl_tsfac_get_allowed_digests(self);
+    if (rb_obj_is_kind_of(allowed_digests, rb_cArray)) {
+        int i;
+        VALUE rbmd;
+        const EVP_MD *md;
+
+        for (i = 0; i < RARRAY_LEN(allowed_digests); i++) {
+            rbmd = rb_ary_entry(allowed_digests, i);
+            md = (const EVP_MD *)rb_protect((VALUE (*)(VALUE))ossl_evp_get_digestbyname, rbmd, &status);
+            if (status)
+                goto end;
+            TS_RESP_CTX_add_md(ctx, md);
+        }
+    }
+
+    str = rb_protect(ossl_to_der, request, &status);
+    if (status)
+        goto end;
+
+    req_bio = (BIO*)rb_protect((VALUE (*)(VALUE))ossl_obj2bio, (VALUE)&str, &status);
+    if (status)
+        goto end;
+
+    response = TS_RESP_create_response(ctx, req_bio);
+    BIO_free(req_bio);
+
+    if (!response) {
+        err_msg = "Error during response generation";
+        goto end;
+    }
+
+    /* bad responses aren't exceptional, but openssl still sets error
+     * information. */
+    ossl_clear_error();
+
+    SetTSResponse(tsresp, response);
+    ret = tsresp;
+
+end:
+    ASN1_INTEGER_free(asn1_serial);
+    ASN1_OBJECT_free(def_policy_id_obj);
+    TS_RESP_CTX_free(ctx);
+    if (err_msg)
+        ossl_raise(eTimestampError, err_msg);
+    if (status)
+        rb_jump_tag(status);
+    return ret;
+}
+
+/*
+ * INIT
+ */
+void
+Init_ossl_ts(void)
+{
+    #if 0
+    mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
+    #endif
+
+    /*
+     * Possible return value for +Response#failure_info+. Indicates that the
+     * timestamp server rejects the message imprint algorithm used in the
+     * +Request+
+     */
+    sBAD_ALG = ID2SYM(rb_intern_const("BAD_ALG"));
+
+    /*
+     * Possible return value for +Response#failure_info+. Indicates that the
+     * timestamp server was not able to process the +Request+ properly.
+     */
+    sBAD_REQUEST = ID2SYM(rb_intern_const("BAD_REQUEST"));
+    /*
+     * Possible return value for +Response#failure_info+. Indicates that the
+     * timestamp server was not able to parse certain data in the +Request+.
+     */
+    sBAD_DATA_FORMAT = ID2SYM(rb_intern_const("BAD_DATA_FORMAT"));
+
+    sTIME_NOT_AVAILABLE = ID2SYM(rb_intern_const("TIME_NOT_AVAILABLE"));
+    sUNACCEPTED_POLICY = ID2SYM(rb_intern_const("UNACCEPTED_POLICY"));
+    sUNACCEPTED_EXTENSION = ID2SYM(rb_intern_const("UNACCEPTED_EXTENSION"));
+    sADD_INFO_NOT_AVAILABLE = ID2SYM(rb_intern_const("ADD_INFO_NOT_AVAILABLE"));
+    sSYSTEM_FAILURE = ID2SYM(rb_intern_const("SYSTEM_FAILURE"));
+
+    /* Document-class: OpenSSL::Timestamp
+     * Provides classes and methods to request, create and validate
+     * {RFC3161-compliant}[http://www.ietf.org/rfc/rfc3161.txt] timestamps.
+     * Request may be used to either create requests from scratch or to parse
+     * existing requests that again can be used to request timestamps from a
+     * timestamp server, e.g. via the net/http. The resulting timestamp
+     * response may be parsed using Response.
+     *
+     * Please note that Response is read-only and immutable. To create a
+     * Response, an instance of Factory as well as a valid Request are needed.
+     *
+     * ===Create a Response:
+     *      #Assumes ts.p12 is a PKCS#12-compatible file with a private key
+     *      #and a certificate that has an extended key usage of 'timeStamping'
+     *      p12 = OpenSSL::PKCS12.new(File.open('ts.p12', 'rb'), 'pwd')
+     *      md = OpenSSL::Digest.new('SHA1')
+     *      hash = md.digest(data) #some binary data to be timestamped
+     *      req = OpenSSL::Timestamp::Request.new
+     *      req.algorithm = 'SHA1'
+     *      req.message_imprint = hash
+     *      req.policy_id = "1.2.3.4.5"
+     *      req.nonce = 42
+     *      fac = OpenSSL::Timestamp::Factory.new
+     *      fac.gen_time = Time.now
+     *      fac.serial_number = 1
+     *      timestamp = fac.create_timestamp(p12.key, p12.certificate, req)
+     *
+     * ===Verify a timestamp response:
+     *      #Assume we have a timestamp token in a file called ts.der
+     *      ts = OpenSSL::Timestamp::Response.new(File.open('ts.der', 'rb')
+     *      #Assume we have the Request for this token in a file called req.der
+     *      req = OpenSSL::Timestamp::Request.new(File.open('req.der', 'rb')
+     *      # Assume the associated root CA certificate is contained in a
+     *      # DER-encoded file named root.cer
+     *      root = OpenSSL::X509::Certificate.new(File.open('root.cer', 'rb')
+     *      # get the necessary intermediate certificates, available in
+     *      # DER-encoded form in inter1.cer and inter2.cer
+     *      inter1 = OpenSSL::X509::Certificate.new(File.open('inter1.cer', 'rb')
+     *      inter2 = OpenSSL::X509::Certificate.new(File.open('inter2.cer', 'rb')
+     *      ts.verify(req, root, inter1, inter2) -> ts or raises an exception if validation fails
+     *
+     */
+    mTimestamp = rb_define_module_under(mOSSL, "Timestamp");
+
+    /* Document-class: OpenSSL::Timestamp::TimestampError
+     * Generic exception class of the Timestamp module.
+     */
+    eTimestampError = rb_define_class_under(mTimestamp, "TimestampError", eOSSLError);
+
+    /* Document-class: OpenSSL::Timestamp::Response
+     * Immutable and read-only representation of a timestamp response returned
+     * from a timestamp server after receiving an associated Request. Allows
+     * access to specific information about the response but also allows to
+     * verify the Response.
+     */
+    cTimestampResponse = rb_define_class_under(mTimestamp, "Response", rb_cObject);
+    rb_define_alloc_func(cTimestampResponse, ossl_ts_resp_alloc);
+    rb_define_method(cTimestampResponse, "initialize", ossl_ts_resp_initialize, 1);
+    rb_define_method(cTimestampResponse, "status", ossl_ts_resp_get_status, 0);
+    rb_define_method(cTimestampResponse, "failure_info", ossl_ts_resp_get_failure_info, 0);
+    rb_define_method(cTimestampResponse, "status_text", ossl_ts_resp_get_status_text, 0);
+    rb_define_method(cTimestampResponse, "token", ossl_ts_resp_get_token, 0);
+    rb_define_method(cTimestampResponse, "token_info", ossl_ts_resp_get_token_info, 0);
+    rb_define_method(cTimestampResponse, "tsa_certificate", ossl_ts_resp_get_tsa_certificate, 0);
+    rb_define_method(cTimestampResponse, "to_der", ossl_ts_resp_to_der, 0);
+    rb_define_method(cTimestampResponse, "verify", ossl_ts_resp_verify, -1);
+
+    /* Document-class: OpenSSL::Timestamp::TokenInfo
+     * Immutable and read-only representation of a timestamp token info from a
+     * Response.
+     */
+    cTimestampTokenInfo = rb_define_class_under(mTimestamp, "TokenInfo", rb_cObject);
+    rb_define_alloc_func(cTimestampTokenInfo, ossl_ts_token_info_alloc);
+    rb_define_method(cTimestampTokenInfo, "initialize", ossl_ts_token_info_initialize, 1);
+    rb_define_method(cTimestampTokenInfo, "version", ossl_ts_token_info_get_version, 0);
+    rb_define_method(cTimestampTokenInfo, "policy_id", ossl_ts_token_info_get_policy_id, 0);
+    rb_define_method(cTimestampTokenInfo, "algorithm", ossl_ts_token_info_get_algorithm, 0);
+    rb_define_method(cTimestampTokenInfo, "message_imprint", ossl_ts_token_info_get_msg_imprint, 0);
+    rb_define_method(cTimestampTokenInfo, "serial_number", ossl_ts_token_info_get_serial_number, 0);
+    rb_define_method(cTimestampTokenInfo, "gen_time", ossl_ts_token_info_get_gen_time, 0);
+    rb_define_method(cTimestampTokenInfo, "ordering", ossl_ts_token_info_get_ordering, 0);
+    rb_define_method(cTimestampTokenInfo, "nonce", ossl_ts_token_info_get_nonce, 0);
+    rb_define_method(cTimestampTokenInfo, "to_der", ossl_ts_token_info_to_der, 0);
+
+    /* Document-class: OpenSSL::Timestamp::Request
+     * Allows to create timestamp requests or parse existing ones. A Request is
+     * also needed for creating timestamps from scratch with Factory. When
+     * created from scratch, some default values are set:
+     * * version is set to +1+
+     * * cert_requested is set to +true+
+     * * algorithm, message_imprint, policy_id, and nonce are set to +false+
+     */
+    cTimestampRequest = rb_define_class_under(mTimestamp, "Request", rb_cObject);
+    rb_define_alloc_func(cTimestampRequest, ossl_ts_req_alloc);
+    rb_define_method(cTimestampRequest, "initialize", ossl_ts_req_initialize, -1);
+    rb_define_method(cTimestampRequest, "version=", ossl_ts_req_set_version, 1);
+    rb_define_method(cTimestampRequest, "version", ossl_ts_req_get_version, 0);
+    rb_define_method(cTimestampRequest, "algorithm=", ossl_ts_req_set_algorithm, 1);
+    rb_define_method(cTimestampRequest, "algorithm", ossl_ts_req_get_algorithm, 0);
+    rb_define_method(cTimestampRequest, "message_imprint=", ossl_ts_req_set_msg_imprint, 1);
+    rb_define_method(cTimestampRequest, "message_imprint", ossl_ts_req_get_msg_imprint, 0);
+    rb_define_method(cTimestampRequest, "policy_id=", ossl_ts_req_set_policy_id, 1);
+    rb_define_method(cTimestampRequest, "policy_id", ossl_ts_req_get_policy_id, 0);
+    rb_define_method(cTimestampRequest, "nonce=", ossl_ts_req_set_nonce, 1);
+    rb_define_method(cTimestampRequest, "nonce", ossl_ts_req_get_nonce, 0);
+    rb_define_method(cTimestampRequest, "cert_requested=", ossl_ts_req_set_cert_requested, 1);
+    rb_define_method(cTimestampRequest, "cert_requested?", ossl_ts_req_get_cert_requested, 0);
+    rb_define_method(cTimestampRequest, "to_der", ossl_ts_req_to_der, 0);
+
+    /*
+     * Indicates a successful response. Equal to +0+.
+     */
+    rb_define_const(cTimestampResponse, "GRANTED", INT2NUM(TS_STATUS_GRANTED));
+    /*
+     * Indicates a successful response that probably contains modifications
+     * from the initial request. Equal to +1+.
+     */
+    rb_define_const(cTimestampResponse, "GRANTED_WITH_MODS", INT2NUM(TS_STATUS_GRANTED_WITH_MODS));
+    /*
+     * Indicates a failure. No timestamp token was created. Equal to +2+.
+     */
+    rb_define_const(cTimestampResponse, "REJECTION", INT2NUM(TS_STATUS_REJECTION));
+    /*
+     * Indicates a failure. No timestamp token was created. Equal to +3+.
+     */
+    rb_define_const(cTimestampResponse, "WAITING", INT2NUM(TS_STATUS_WAITING));
+    /*
+     * Indicates a failure. No timestamp token was created. Revocation of a
+     * certificate is imminent. Equal to +4+.
+     */
+    rb_define_const(cTimestampResponse, "REVOCATION_WARNING", INT2NUM(TS_STATUS_REVOCATION_WARNING));
+    /*
+     * Indicates a failure. No timestamp token was created. A certificate
+     * has been revoked. Equal to +5+.
+     */
+    rb_define_const(cTimestampResponse, "REVOCATION_NOTIFICATION", INT2NUM(TS_STATUS_REVOCATION_NOTIFICATION));
+
+    /* Document-class: OpenSSL::Timestamp::Factory
+     *
+     * Used to generate a Response from scratch.
+     *
+     * Please bear in mind that the implementation will always apply and prefer
+     * the policy object identifier given in the request over the default policy
+     * id specified in the Factory. As a consequence, +default_policy_id+ will
+     * only be applied if no Request#policy_id was given. But this also means
+     * that one needs to check the policy identifier in the request manually
+     * before creating the Response, e.g. to check whether it complies to a
+     * specific set of acceptable policies.
+     *
+     * There exists also the possibility to add certificates (instances of
+     * OpenSSL::X509::Certificate) besides the timestamping certificate
+     * that will be included in the resulting timestamp token if
+     * Request#cert_requested? is +true+. Ideally, one would also include any
+     * intermediate certificates (the root certificate can be left out - in
+     * order to trust it any verifying party will have to be in its possession
+     * anyway). This simplifies validation of the timestamp since these
+     * intermediate certificates are "already there" and need not be passed as
+     * external parameters to Response#verify anymore, thus minimizing external
+     * resources needed for verification.
+     *
+     * ===Example: Inclusion of (untrusted) intermediate certificates
+     *
+     * Assume we received a timestamp request that has set Request#policy_id to
+     * +nil+ and Request#cert_requested? to true. The raw request bytes are
+     * stored in a variable called +req_raw+. We'd still like to integrate
+     * the necessary intermediate certificates (in +inter1.cer+ and
+     * +inter2.cer+) to simplify validation of the resulting Response. +ts.p12+
+     * is a PKCS#12-compatible file including the private key and the
+     * timestamping certificate.
+     *
+     *      req = OpenSSL::Timestamp::Request.new(raw_bytes)
+     *      p12 = OpenSSL::PKCS12.new(File.open('ts.p12', 'rb'), 'pwd')
+     *      inter1 = OpenSSL::X509::Certificate.new(File.open('inter1.cer', 'rb')
+     *      inter2 = OpenSSL::X509::Certificate.new(File.open('inter2.cer', 'rb')
+     *      fac = OpenSSL::Timestamp::Factory.new
+     *      fac.gen_time = Time.now
+     *      fac.serial_number = 1
+     *      fac.allowed_digests = ["sha256", "sha384", "sha512"]
+     *      #needed because the Request contained no policy identifier
+     *      fac.default_policy_id = '1.2.3.4.5'
+     *      fac.additional_certificates = [ inter1, inter2 ]
+     *      timestamp = fac.create_timestamp(p12.key, p12.certificate, req)
+     *
+     * ==Attributes
+     *
+     * ===default_policy_id
+     *
+     * Request#policy_id will always be preferred over this if present in the
+     * Request, only if Request#policy_id is nil default_policy will be used.
+     * If none of both is present, a TimestampError will be raised when trying
+     * to create a Response.
+     *
+     * call-seq:
+     *       factory.default_policy_id = "string" -> string
+     *       factory.default_policy_id            -> string or nil
+     *
+     * ===serial_number
+     *
+     * Sets or retrieves the serial number to be used for timestamp creation.
+     * Must be present for timestamp creation.
+     *
+     * call-seq:
+     *       factory.serial_number = number -> number
+     *       factory.serial_number          -> number or nil
+     *
+     * ===gen_time
+     *
+     * Sets or retrieves the Time value to be used in the Response. Must be
+     * present for timestamp creation.
+     *
+     * call-seq:
+     *       factory.gen_time = Time -> Time
+     *       factory.gen_time        -> Time or nil
+     *
+     * ===additional_certs
+     *
+     * Sets or retrieves additional certificates apart from the timestamp
+     * certificate (e.g. intermediate certificates) to be added to the Response.
+     * Must be an Array of OpenSSL::X509::Certificate.
+     *
+     * call-seq:
+     *       factory.additional_certs = [cert1, cert2] -> [ cert1, cert2 ]
+     *       factory.additional_certs                  -> array or nil
+     *
+     * ===allowed_digests
+     *
+     * Sets or retrieves the digest algorithms that the factory is allowed
+     * create timestamps for. Known vulnerable or weak algorithms should not be
+     * allowed where possible.
+     * Must be an Array of String or OpenSSL::Digest subclass instances.
+     *
+     * call-seq:
+     *       factory.allowed_digests = ["sha1", OpenSSL::Digest.new('SHA256').new] -> [ "sha1", OpenSSL::Digest) ]
+     *       factory.allowed_digests                                               -> array or nil
+     *
+     */
+    cTimestampFactory = rb_define_class_under(mTimestamp, "Factory", rb_cObject);
+    rb_attr(cTimestampFactory, rb_intern_const("allowed_digests"), 1, 1, 0);
+    rb_attr(cTimestampFactory, rb_intern_const("default_policy_id"), 1, 1, 0);
+    rb_attr(cTimestampFactory, rb_intern_const("serial_number"), 1, 1, 0);
+    rb_attr(cTimestampFactory, rb_intern_const("gen_time"), 1, 1, 0);
+    rb_attr(cTimestampFactory, rb_intern_const("additional_certs"), 1, 1, 0);
+    rb_define_method(cTimestampFactory, "create_timestamp", ossl_tsfac_create_ts, 3);
+}
+
+#endif
diff --git a/ext/openssl/ossl_ts.h b/ext/openssl/ossl_ts.h
new file mode 100644
index 0000000000..25fb0e1d64
--- /dev/null
+++ b/ext/openssl/ossl_ts.h
@@ -0,0 +1,16 @@
+/*
+ *
+ * Copyright (C) 2010 Martin Bosslet <Martin.Bosslet@googlemail.com>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+
+#if !defined(_OSSL_TS_H_)
+#define _OSSL_TS_H_
+
+void Init_ossl_ts(void);
+
+#endif
diff --git a/ext/openssl/ossl_version.h b/ext/openssl/ossl_version.h
deleted file mode 100644
index dcd026a19c..0000000000
--- a/ext/openssl/ossl_version.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * 'OpenSSL for Ruby' project
- * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
- * All rights reserved.
- */
-/*
- * This program is licensed under the same licence as Ruby.
- * (See the file 'LICENCE'.)
- */
-#if !defined(_OSSL_VERSION_H_)
-#define _OSSL_VERSION_H_
-
-#define OSSL_VERSION "1.1.0"
-
-#endif /* _OSSL_VERSION_H_ */
diff --git a/ext/openssl/ossl_x509.c b/ext/openssl/ossl_x509.c
index 14f794e8ee..4fc0648614 100644
--- a/ext/openssl/ossl_x509.c
+++ b/ext/openssl/ossl_x509.c
@@ -11,7 +11,7 @@
 
 VALUE mX509;
 
-#define DefX509Const(x) rb_define_const(mX509, #x,INT2FIX(X509_##x))
+#define DefX509Const(x) rb_define_const(mX509, #x, INT2NUM(X509_##x))
 #define DefX509Default(x,i) \
   rb_define_const(mX509, "DEFAULT_" #x, rb_str_new2(X509_get_default_##i()))
 
@@ -20,20 +20,19 @@ ossl_x509_time_adjust(ASN1_TIME *s, VALUE time)
 {
     time_t sec;
 
-#if defined(HAVE_ASN1_TIME_ADJ)
     int off_days;
 
     ossl_time_split(time, &sec, &off_days);
     return X509_time_adj_ex(s, off_days, 0, &sec);
-#else
-    sec = time_to_time_t(time);
-    return X509_time_adj(s, 0, &sec);
-#endif
 }
 
 void
 Init_ossl_x509(void)
 {
+#if 0
+    mOSSL = rb_define_module("OpenSSL");
+#endif
+
     mX509 = rb_define_module_under(mOSSL, "X509");
 
     Init_ossl_x509attr();
@@ -45,7 +44,13 @@ Init_ossl_x509(void)
     Init_ossl_x509revoked();
     Init_ossl_x509store();
 
+    /* Constants are up-to-date with 1.1.1. */
+
+    /* Certificate verification error code */
     DefX509Const(V_OK);
+#if defined(X509_V_ERR_UNSPECIFIED) /* 1.0.1r, 1.0.2f, 1.1.0 */
+    DefX509Const(V_ERR_UNSPECIFIED);
+#endif
     DefX509Const(V_ERR_UNABLE_TO_GET_ISSUER_CERT);
     DefX509Const(V_ERR_UNABLE_TO_GET_CRL);
     DefX509Const(V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE);
@@ -77,19 +82,167 @@ Init_ossl_x509(void)
     DefX509Const(V_ERR_AKID_SKID_MISMATCH);
     DefX509Const(V_ERR_AKID_ISSUER_SERIAL_MISMATCH);
     DefX509Const(V_ERR_KEYUSAGE_NO_CERTSIGN);
+    DefX509Const(V_ERR_UNABLE_TO_GET_CRL_ISSUER);
+    DefX509Const(V_ERR_UNHANDLED_CRITICAL_EXTENSION);
+    DefX509Const(V_ERR_KEYUSAGE_NO_CRL_SIGN);
+    DefX509Const(V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION);
+    DefX509Const(V_ERR_INVALID_NON_CA);
+    DefX509Const(V_ERR_PROXY_PATH_LENGTH_EXCEEDED);
+    DefX509Const(V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE);
+    DefX509Const(V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED);
+    DefX509Const(V_ERR_INVALID_EXTENSION);
+    DefX509Const(V_ERR_INVALID_POLICY_EXTENSION);
+    DefX509Const(V_ERR_NO_EXPLICIT_POLICY);
+    DefX509Const(V_ERR_DIFFERENT_CRL_SCOPE);
+    DefX509Const(V_ERR_UNSUPPORTED_EXTENSION_FEATURE);
+    DefX509Const(V_ERR_UNNESTED_RESOURCE);
+    DefX509Const(V_ERR_PERMITTED_VIOLATION);
+    DefX509Const(V_ERR_EXCLUDED_VIOLATION);
+    DefX509Const(V_ERR_SUBTREE_MINMAX);
     DefX509Const(V_ERR_APPLICATION_VERIFICATION);
+    DefX509Const(V_ERR_UNSUPPORTED_CONSTRAINT_TYPE);
+    DefX509Const(V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX);
+    DefX509Const(V_ERR_UNSUPPORTED_NAME_SYNTAX);
+    DefX509Const(V_ERR_CRL_PATH_VALIDATION_ERROR);
+#if defined(X509_V_ERR_PATH_LOOP)
+    DefX509Const(V_ERR_PATH_LOOP);
+#endif
+#if defined(X509_V_ERR_SUITE_B_INVALID_VERSION)
+    DefX509Const(V_ERR_SUITE_B_INVALID_VERSION);
+    DefX509Const(V_ERR_SUITE_B_INVALID_ALGORITHM);
+    DefX509Const(V_ERR_SUITE_B_INVALID_CURVE);
+    DefX509Const(V_ERR_SUITE_B_INVALID_SIGNATURE_ALGORITHM);
+    DefX509Const(V_ERR_SUITE_B_LOS_NOT_ALLOWED);
+    DefX509Const(V_ERR_SUITE_B_CANNOT_SIGN_P_384_WITH_P_256);
+#endif
+#if defined(X509_V_ERR_HOSTNAME_MISMATCH)
+    DefX509Const(V_ERR_HOSTNAME_MISMATCH);
+    DefX509Const(V_ERR_EMAIL_MISMATCH);
+    DefX509Const(V_ERR_IP_ADDRESS_MISMATCH);
+#endif
+#if defined(X509_V_ERR_DANE_NO_MATCH)
+    DefX509Const(V_ERR_DANE_NO_MATCH);
+#endif
+#if defined(X509_V_ERR_EE_KEY_TOO_SMALL)
+    DefX509Const(V_ERR_EE_KEY_TOO_SMALL);
+    DefX509Const(V_ERR_CA_KEY_TOO_SMALL);
+    DefX509Const(V_ERR_CA_MD_TOO_WEAK);
+#endif
+#if defined(X509_V_ERR_INVALID_CALL)
+    DefX509Const(V_ERR_INVALID_CALL);
+#endif
+#if defined(X509_V_ERR_STORE_LOOKUP)
+    DefX509Const(V_ERR_STORE_LOOKUP);
+#endif
+#if defined(X509_V_ERR_NO_VALID_SCTS)
+    DefX509Const(V_ERR_NO_VALID_SCTS);
+#endif
+#if defined(X509_V_ERR_PROXY_SUBJECT_NAME_VIOLATION)
+    DefX509Const(V_ERR_PROXY_SUBJECT_NAME_VIOLATION);
+#endif
+#if defined(X509_V_ERR_OCSP_VERIFY_NEEDED)
+    DefX509Const(V_ERR_OCSP_VERIFY_NEEDED);
+    DefX509Const(V_ERR_OCSP_VERIFY_FAILED);
+    DefX509Const(V_ERR_OCSP_CERT_UNKNOWN);
+#endif
 
+    /* Certificate verify flags */
+    /* Set by Store#flags= and StoreContext#flags=. */
+    DefX509Const(V_FLAG_USE_CHECK_TIME);
+    /* Set by Store#flags= and StoreContext#flags=. Enables CRL checking for the
+     * certificate chain leaf. */
     DefX509Const(V_FLAG_CRL_CHECK);
+    /* Set by Store#flags= and StoreContext#flags=. Enables CRL checking for all
+     * certificates in the certificate chain */
     DefX509Const(V_FLAG_CRL_CHECK_ALL);
+    /* Set by Store#flags= and StoreContext#flags=. Disables critical extension
+     * checking. */
+    DefX509Const(V_FLAG_IGNORE_CRITICAL);
+    /* Set by Store#flags= and StoreContext#flags=. Disables workarounds for
+     * broken certificates. */
+    DefX509Const(V_FLAG_X509_STRICT);
+    /* Set by Store#flags= and StoreContext#flags=. Enables proxy certificate
+     * verification. */
+    DefX509Const(V_FLAG_ALLOW_PROXY_CERTS);
+    /* Set by Store#flags= and StoreContext#flags=. Enables certificate policy
+     * constraints checking. */
+    DefX509Const(V_FLAG_POLICY_CHECK);
+    /* Set by Store#flags= and StoreContext#flags=.
+     * Implies V_FLAG_POLICY_CHECK */
+    DefX509Const(V_FLAG_EXPLICIT_POLICY);
+    /* Set by Store#flags= and StoreContext#flags=.
+     * Implies V_FLAG_POLICY_CHECK */
+    DefX509Const(V_FLAG_INHIBIT_ANY);
+    /* Set by Store#flags= and StoreContext#flags=.
+     * Implies V_FLAG_POLICY_CHECK */
+    DefX509Const(V_FLAG_INHIBIT_MAP);
+    /* Set by Store#flags= and StoreContext#flags=. */
+    DefX509Const(V_FLAG_NOTIFY_POLICY);
+    /* Set by Store#flags= and StoreContext#flags=. Enables some additional
+     * features including support for indirect signed CRLs. */
+    DefX509Const(V_FLAG_EXTENDED_CRL_SUPPORT);
+    /* Set by Store#flags= and StoreContext#flags=. Uses delta CRLs. If not
+     * specified, deltas are ignored. */
+    DefX509Const(V_FLAG_USE_DELTAS);
+    /* Set by Store#flags= and StoreContext#flags=. Enables checking of the
+     * signature of the root self-signed CA. */
+    DefX509Const(V_FLAG_CHECK_SS_SIGNATURE);
+#if defined(X509_V_FLAG_TRUSTED_FIRST)
+    /* Set by Store#flags= and StoreContext#flags=. When constructing a
+     * certificate chain, search the Store first for the issuer certificate.
+     * Enabled by default in OpenSSL >= 1.1.0. */
+    DefX509Const(V_FLAG_TRUSTED_FIRST);
+#endif
+#if defined(X509_V_FLAG_SUITEB_128_LOS_ONLY)
+    /* Set by Store#flags= and StoreContext#flags=.
+     * Enables Suite B 128 bit only mode. */
+    DefX509Const(V_FLAG_SUITEB_128_LOS_ONLY);
+#endif
+#if defined(X509_V_FLAG_SUITEB_192_LOS)
+    /* Set by Store#flags= and StoreContext#flags=.
+     * Enables Suite B 192 bit only mode. */
+    DefX509Const(V_FLAG_SUITEB_192_LOS);
+#endif
+#if defined(X509_V_FLAG_SUITEB_128_LOS)
+    /* Set by Store#flags= and StoreContext#flags=.
+     * Enables Suite B 128 bit mode allowing 192 bit algorithms. */
+    DefX509Const(V_FLAG_SUITEB_128_LOS);
+#endif
+#if defined(X509_V_FLAG_PARTIAL_CHAIN)
+    /* Set by Store#flags= and StoreContext#flags=.
+     * Allows partial chains if at least one certificate is in trusted store. */
+    DefX509Const(V_FLAG_PARTIAL_CHAIN);
+#endif
+#if defined(X509_V_FLAG_NO_ALT_CHAINS)
+    /* Set by Store#flags= and StoreContext#flags=. Suppresses searching for
+     * a alternative chain. No effect in OpenSSL >= 1.1.0. */
+    DefX509Const(V_FLAG_NO_ALT_CHAINS);
+#endif
+#if defined(X509_V_FLAG_NO_CHECK_TIME)
+    /* Set by Store#flags= and StoreContext#flags=. Suppresses checking the
+     * validity period of certificates and CRLs. No effect when the current
+     * time is explicitly set by Store#time= or StoreContext#time=. */
+    DefX509Const(V_FLAG_NO_CHECK_TIME);
+#endif
 
+    /* Set by Store#purpose=. SSL/TLS client. */
     DefX509Const(PURPOSE_SSL_CLIENT);
+    /* Set by Store#purpose=. SSL/TLS server. */
     DefX509Const(PURPOSE_SSL_SERVER);
+    /* Set by Store#purpose=. Netscape SSL server. */
     DefX509Const(PURPOSE_NS_SSL_SERVER);
+    /* Set by Store#purpose=. S/MIME signing. */
     DefX509Const(PURPOSE_SMIME_SIGN);
+    /* Set by Store#purpose=. S/MIME encryption. */
     DefX509Const(PURPOSE_SMIME_ENCRYPT);
+    /* Set by Store#purpose=. CRL signing */
     DefX509Const(PURPOSE_CRL_SIGN);
+    /* Set by Store#purpose=. No checks. */
     DefX509Const(PURPOSE_ANY);
+    /* Set by Store#purpose=. OCSP helper. */
     DefX509Const(PURPOSE_OCSP_HELPER);
+    /* Set by Store#purpose=. Time stamps signer. */
+    DefX509Const(PURPOSE_TIMESTAMP_SIGN);
 
     DefX509Const(TRUST_COMPAT);
     DefX509Const(TRUST_SSL_CLIENT);
@@ -98,6 +251,7 @@ Init_ossl_x509(void)
     DefX509Const(TRUST_OBJECT_SIGN);
     DefX509Const(TRUST_OCSP_SIGN);
     DefX509Const(TRUST_OCSP_REQUEST);
+    DefX509Const(TRUST_TSA);
 
     DefX509Default(CERT_AREA, cert_area);
     DefX509Default(CERT_DIR, cert_dir);
diff --git a/ext/openssl/ossl_x509.h b/ext/openssl/ossl_x509.h
index 576804858e..4fadfa6b82 100644
--- a/ext/openssl/ossl_x509.h
+++ b/ext/openssl/ossl_x509.h
@@ -31,7 +31,7 @@ extern VALUE cX509Attr;
 extern VALUE eX509AttrError;
 
 VALUE ossl_x509attr_new(X509_ATTRIBUTE *);
-X509_ATTRIBUTE *DupX509AttrPtr(VALUE);
+X509_ATTRIBUTE *GetX509AttrPtr(VALUE);
 void Init_ossl_x509attr(void);
 
 /*
@@ -41,7 +41,6 @@ extern VALUE cX509Cert;
 extern VALUE eX509CertError;
 
 VALUE ossl_x509_new(X509 *);
-VALUE ossl_x509_new_from_file(VALUE);
 X509 *GetX509CertPtr(VALUE);
 X509 *DupX509CertPtr(VALUE);
 void Init_ossl_x509cert(void);
@@ -54,7 +53,6 @@ extern VALUE eX509CRLError;
 
 VALUE ossl_x509crl_new(X509_CRL *);
 X509_CRL *GetX509CRLPtr(VALUE);
-X509_CRL *DupX509CRLPtr(VALUE);
 void Init_ossl_x509crl(void);
 
 /*
@@ -66,7 +64,6 @@ extern VALUE eX509ExtError;
 
 VALUE ossl_x509ext_new(X509_EXTENSION *);
 X509_EXTENSION *GetX509ExtPtr(VALUE);
-X509_EXTENSION *DupX509ExtPtr(VALUE);
 void Init_ossl_x509ext(void);
 
 /*
@@ -85,9 +82,7 @@ void Init_ossl_x509name(void);
 extern VALUE cX509Req;
 extern VALUE eX509ReqError;
 
-VALUE ossl_x509req_new(X509_REQ *);
 X509_REQ *GetX509ReqPtr(VALUE);
-X509_REQ *DupX509ReqPtr(VALUE);
 void Init_ossl_x509req(void);
 
 /*
@@ -107,14 +102,14 @@ extern VALUE cX509Store;
 extern VALUE cX509StoreContext;
 extern VALUE eX509StoreError;
 
-VALUE ossl_x509store_new(X509_STORE *);
 X509_STORE *GetX509StorePtr(VALUE);
-X509_STORE *DupX509StorePtr(VALUE);
-
-VALUE ossl_x509stctx_new(X509_STORE_CTX *);
-VALUE ossl_x509stctx_clear_ptr(VALUE);
-X509_STORE_CTX *GetX509StCtxtPtr(VALUE);
 
 void Init_ossl_x509store(void);
 
+/*
+ * Calls the verify callback Proc (the first parameter) with given pre-verify
+ * result and the X509_STORE_CTX.
+ */
+int ossl_verify_cb_call(VALUE, int, X509_STORE_CTX *);
+
 #endif /* _OSSL_X509_H_ */
diff --git a/ext/openssl/ossl_x509attr.c b/ext/openssl/ossl_x509attr.c
index 78ce236d96..60846cfe9d 100644
--- a/ext/openssl/ossl_x509attr.c
+++ b/ext/openssl/ossl_x509attr.c
@@ -23,10 +23,6 @@
 	ossl_raise(rb_eRuntimeError, "ATTR wasn't initialized!"); \
     } \
 } while (0)
-#define SafeGetX509Attr(obj, attr) do { \
-    OSSL_Check_Kind((obj), cX509Attr); \
-    GetX509Attr((obj), (attr)); \
-} while (0)
 
 /*
  * Classes
@@ -72,16 +68,13 @@ ossl_x509attr_new(X509_ATTRIBUTE *attr)
 }
 
 X509_ATTRIBUTE *
-DupX509AttrPtr(VALUE obj)
+GetX509AttrPtr(VALUE obj)
 {
-    X509_ATTRIBUTE *attr, *new;
+    X509_ATTRIBUTE *attr;
 
-    SafeGetX509Attr(obj, attr);
-    if (!(new = X509_ATTRIBUTE_dup(attr))) {
-	ossl_raise(eX509AttrError, NULL);
-    }
+    GetX509Attr(obj, attr);
 
-    return new;
+    return attr;
 }
 
 /*
@@ -130,6 +123,25 @@ ossl_x509attr_initialize(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
+static VALUE
+ossl_x509attr_initialize_copy(VALUE self, VALUE other)
+{
+    X509_ATTRIBUTE *attr, *attr_other, *attr_new;
+
+    rb_check_frozen(self);
+    GetX509Attr(self, attr);
+    GetX509Attr(other, attr_other);
+
+    attr_new = X509_ATTRIBUTE_dup(attr_other);
+    if (!attr_new)
+	ossl_raise(eX509AttrError, "X509_ATTRIBUTE_dup");
+
+    SetX509Attr(self, attr_new);
+    X509_ATTRIBUTE_free(attr);
+
+    return self;
+}
+
 /*
  * call-seq:
  *    attr.oid = string => string
@@ -141,12 +153,15 @@ ossl_x509attr_set_oid(VALUE self, VALUE oid)
     ASN1_OBJECT *obj;
     char *s;
 
+    GetX509Attr(self, attr);
     s = StringValueCStr(oid);
     obj = OBJ_txt2obj(s, 0);
-    if(!obj) obj = OBJ_txt2obj(s, 1);
     if(!obj) ossl_raise(eX509AttrError, NULL);
-    GetX509Attr(self, attr);
-    X509_ATTRIBUTE_set1_object(attr, obj);
+    if (!X509_ATTRIBUTE_set1_object(attr, obj)) {
+	ASN1_OBJECT_free(obj);
+	ossl_raise(eX509AttrError, "X509_ATTRIBUTE_set1_object");
+    }
+    ASN1_OBJECT_free(obj);
 
     return oid;
 }
@@ -289,11 +304,18 @@ ossl_x509attr_to_der(VALUE self)
 void
 Init_ossl_x509attr(void)
 {
+#if 0
+    mOSSL = rb_define_module("OpenSSL");
+    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
+    mX509 = rb_define_module_under(mOSSL, "X509");
+#endif
+
     eX509AttrError = rb_define_class_under(mX509, "AttributeError", eOSSLError);
 
     cX509Attr = rb_define_class_under(mX509, "Attribute", rb_cObject);
     rb_define_alloc_func(cX509Attr, ossl_x509attr_alloc);
     rb_define_method(cX509Attr, "initialize", ossl_x509attr_initialize, -1);
+    rb_define_method(cX509Attr, "initialize_copy", ossl_x509attr_initialize_copy, 1);
     rb_define_method(cX509Attr, "oid=", ossl_x509attr_set_oid, 1);
     rb_define_method(cX509Attr, "oid", ossl_x509attr_get_oid, 0);
     rb_define_method(cX509Attr, "value=", ossl_x509attr_set_value, 1);
diff --git a/ext/openssl/ossl_x509cert.c b/ext/openssl/ossl_x509cert.c
index a7e37960e5..e3766b1b16 100644
--- a/ext/openssl/ossl_x509cert.c
+++ b/ext/openssl/ossl_x509cert.c
@@ -23,10 +23,6 @@
 	ossl_raise(rb_eRuntimeError, "CERT wasn't initialized!"); \
     } \
 } while (0)
-#define SafeGetX509(obj, x509) do { \
-    OSSL_Check_Kind((obj), cX509Cert); \
-    GetX509((obj), (x509)); \
-} while (0)
 
 /*
  * Classes
@@ -71,46 +67,12 @@ ossl_x509_new(X509 *x509)
     return obj;
 }
 
-VALUE
-ossl_x509_new_from_file(VALUE filename)
-{
-    X509 *x509;
-    FILE *fp;
-    VALUE obj;
-
-    rb_check_safe_obj(filename);
-    obj = NewX509(cX509Cert);
-    if (!(fp = fopen(StringValueCStr(filename), "r"))) {
-	ossl_raise(eX509CertError, "%s", strerror(errno));
-    }
-    rb_fd_fix_cloexec(fileno(fp));
-    x509 = PEM_read_X509(fp, NULL, NULL, NULL);
-    /*
-     * prepare for DER...
-#if !defined(OPENSSL_NO_FP_API)
-    if (!x509) {
-    	(void)ERR_get_error();
-	rewind(fp);
-
-	x509 = d2i_X509_fp(fp, NULL);
-    }
-#endif
-    */
-    fclose(fp);
-    if (!x509) {
-	ossl_raise(eX509CertError, NULL);
-    }
-    SetX509(obj, x509);
-
-    return obj;
-}
-
 X509 *
 GetX509CertPtr(VALUE obj)
 {
     X509 *x509;
 
-    SafeGetX509(obj, x509);
+    GetX509(obj, x509);
 
     return x509;
 }
@@ -120,7 +82,7 @@ DupX509CertPtr(VALUE obj)
 {
     X509 *x509;
 
-    SafeGetX509(obj, x509);
+    GetX509(obj, x509);
 
     X509_up_ref(x509);
 
@@ -161,7 +123,7 @@ ossl_x509_initialize(int argc, VALUE *argv, VALUE self)
 	return self;
     }
     arg = ossl_to_der_if_possible(arg);
-    in = ossl_obj2bio(arg);
+    in = ossl_obj2bio(&arg);
     x509 = PEM_read_bio_X509(in, &x, NULL, NULL);
     DATA_PTR(self) = x;
     if (!x509) {
@@ -184,7 +146,7 @@ ossl_x509_copy(VALUE self, VALUE other)
     if (self == other) return self;
 
     GetX509(self, a);
-    SafeGetX509(other, b);
+    GetX509(other, b);
 
     x509 = X509_dup(b);
     if (!x509) ossl_raise(eX509CertError, NULL);
@@ -456,10 +418,10 @@ static VALUE
 ossl_x509_get_not_before(VALUE self)
 {
     X509 *x509;
-    ASN1_UTCTIME *asn1time;
+    const ASN1_TIME *asn1time;
 
     GetX509(self, x509);
-    if (!(asn1time = X509_get_notBefore(x509))) { /* NO DUP - don't free! */
+    if (!(asn1time = X509_get0_notBefore(x509))) {
 	ossl_raise(eX509CertError, NULL);
     }
 
@@ -474,10 +436,15 @@ static VALUE
 ossl_x509_set_not_before(VALUE self, VALUE time)
 {
     X509 *x509;
+    ASN1_TIME *asn1time;
 
     GetX509(self, x509);
-    if (!ossl_x509_time_adjust(X509_get_notBefore(x509), time))
-	ossl_raise(eX509CertError, NULL);
+    asn1time = ossl_x509_time_adjust(NULL, time);
+    if (!X509_set1_notBefore(x509, asn1time)) {
+	ASN1_TIME_free(asn1time);
+	ossl_raise(eX509CertError, "X509_set_notBefore");
+    }
+    ASN1_TIME_free(asn1time);
 
     return time;
 }
@@ -490,10 +457,10 @@ static VALUE
 ossl_x509_get_not_after(VALUE self)
 {
     X509 *x509;
-    ASN1_TIME *asn1time;
+    const ASN1_TIME *asn1time;
 
     GetX509(self, x509);
-    if (!(asn1time = X509_get_notAfter(x509))) { /* NO DUP - don't free! */
+    if (!(asn1time = X509_get0_notAfter(x509))) {
 	ossl_raise(eX509CertError, NULL);
     }
 
@@ -508,10 +475,15 @@ static VALUE
 ossl_x509_set_not_after(VALUE self, VALUE time)
 {
     X509 *x509;
+    ASN1_TIME *asn1time;
 
     GetX509(self, x509);
-    if (!ossl_x509_time_adjust(X509_get_notAfter(x509), time))
-	ossl_raise(eX509CertError, NULL);
+    asn1time = ossl_x509_time_adjust(NULL, time);
+    if (!X509_set1_notAfter(x509, asn1time)) {
+	ASN1_TIME_free(asn1time);
+	ossl_raise(eX509CertError, "X509_set_notAfter");
+    }
+    ASN1_TIME_free(asn1time);
 
     return time;
 }
@@ -536,18 +508,19 @@ ossl_x509_get_public_key(VALUE self)
 
 /*
  * call-seq:
- *    cert.public_key = key => key
+ *    cert.public_key = key
  */
 static VALUE
 ossl_x509_set_public_key(VALUE self, VALUE key)
 {
     X509 *x509;
+    EVP_PKEY *pkey;
 
     GetX509(self, x509);
-    if (!X509_set_pubkey(x509, GetPKeyPtr(key))) { /* DUPs pkey */
-	ossl_raise(eX509CertError, NULL);
-    }
-
+    pkey = GetPKeyPtr(key);
+    ossl_pkey_check_public_key(pkey);
+    if (!X509_set_pubkey(x509, pkey))
+	ossl_raise(eX509CertError, "X509_set_pubkey");
     return key;
 }
 
@@ -563,7 +536,7 @@ ossl_x509_sign(VALUE self, VALUE key, VALUE digest)
     const EVP_MD *md;
 
     pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
-    md = GetDigestPtr(digest);
+    md = ossl_evp_get_digestbyname(digest);
     GetX509(self, x509);
     if (!X509_sign(x509, pkey, md)) {
 	ossl_raise(eX509CertError, NULL);
@@ -576,7 +549,8 @@ ossl_x509_sign(VALUE self, VALUE key, VALUE digest)
  * call-seq:
  *    cert.verify(key) => true | false
  *
- * Checks that cert signature is made with PRIVversion of this PUBLIC 'key'
+ * Verifies the signature of the certificate, with the public key _key_. _key_
+ * must be an instance of OpenSSL::PKey.
  */
 static VALUE
 ossl_x509_verify(VALUE self, VALUE key)
@@ -584,9 +558,9 @@ ossl_x509_verify(VALUE self, VALUE key)
     X509 *x509;
     EVP_PKEY *pkey;
 
-    pkey = GetPKeyPtr(key); /* NO NEED TO DUP */
     GetX509(self, x509);
-
+    pkey = GetPKeyPtr(key);
+    ossl_pkey_check_public_key(pkey);
     switch (X509_verify(x509, pkey)) {
       case 1:
 	return Qtrue;
@@ -600,9 +574,10 @@ ossl_x509_verify(VALUE self, VALUE key)
 
 /*
  * call-seq:
- *    cert.check_private_key(key)
+ *    cert.check_private_key(key) -> true | false
  *
- * Checks if 'key' is PRIV key for this cert
+ * Returns +true+ if _key_ is the corresponding private key to the Subject
+ * Public Key Information, +false+ otherwise.
  */
 static VALUE
 ossl_x509_check_private_key(VALUE self, VALUE key)
@@ -614,7 +589,7 @@ ossl_x509_check_private_key(VALUE self, VALUE key)
     pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
     GetX509(self, x509);
     if (!X509_check_private_key(x509, pkey)) {
-	OSSL_Warning("Check private key:%s", OSSL_ErrMsg());
+	ossl_clear_error();
 	return Qfalse;
     }
 
@@ -667,13 +642,10 @@ ossl_x509_set_extensions(VALUE self, VALUE ary)
     while ((ext = X509_delete_ext(x509, 0)))
 	X509_EXTENSION_free(ext);
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	ext = DupX509ExtPtr(RARRAY_AREF(ary, i));
-
-	if (!X509_add_ext(x509, ext, -1)) { /* DUPs ext - FREE it */
-	    X509_EXTENSION_free(ext);
+	ext = GetX509ExtPtr(RARRAY_AREF(ary, i));
+	if (!X509_add_ext(x509, ext, -1)) { /* DUPs ext */
 	    ossl_raise(eX509CertError, NULL);
 	}
-	X509_EXTENSION_free(ext);
     }
 
     return ary;
@@ -690,12 +662,10 @@ ossl_x509_add_extension(VALUE self, VALUE extension)
     X509_EXTENSION *ext;
 
     GetX509(self, x509);
-    ext = DupX509ExtPtr(extension);
+    ext = GetX509ExtPtr(extension);
     if (!X509_add_ext(x509, ext, -1)) { /* DUPs ext - FREE it */
-	X509_EXTENSION_free(ext);
 	ossl_raise(eX509CertError, NULL);
     }
-    X509_EXTENSION_free(ext);
 
     return extension;
 }
@@ -715,14 +685,34 @@ ossl_x509_inspect(VALUE self)
 }
 
 /*
+ * call-seq:
+ *    cert1 == cert2 -> true | false
+ *
+ * Compares the two certificates. Note that this takes into account all fields,
+ * not just the issuer name and the serial number.
+ */
+static VALUE
+ossl_x509_eq(VALUE self, VALUE other)
+{
+    X509 *a, *b;
+
+    GetX509(self, a);
+    if (!rb_obj_is_kind_of(other, cX509Cert))
+	return Qfalse;
+    GetX509(other, b);
+
+    return !X509_cmp(a, b) ? Qtrue : Qfalse;
+}
+
+/*
  * INIT
  */
 void
 Init_ossl_x509cert(void)
 {
-
 #if 0
-    mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
+    mOSSL = rb_define_module("OpenSSL");
+    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
     mX509 = rb_define_module_under(mOSSL, "X509");
 #endif
 
@@ -798,7 +788,7 @@ Init_ossl_x509cert(void)
      *   root_ca.add_extension(ef.create_extension("keyUsage","keyCertSign, cRLSign", true))
      *   root_ca.add_extension(ef.create_extension("subjectKeyIdentifier","hash",false))
      *   root_ca.add_extension(ef.create_extension("authorityKeyIdentifier","keyid:always",false))
-     *   root_ca.sign(root_key, OpenSSL::Digest::SHA256.new)
+     *   root_ca.sign(root_key, OpenSSL::Digest.new('SHA256'))
      *
      * The next step is to create the end-entity certificate using the root CA
      * certificate.
@@ -817,14 +807,14 @@ Init_ossl_x509cert(void)
      *   ef.issuer_certificate = root_ca
      *   cert.add_extension(ef.create_extension("keyUsage","digitalSignature", true))
      *   cert.add_extension(ef.create_extension("subjectKeyIdentifier","hash",false))
-     *   cert.sign(root_key, OpenSSL::Digest::SHA256.new)
+     *   cert.sign(root_key, OpenSSL::Digest.new('SHA256'))
      *
      */
     cX509Cert = rb_define_class_under(mX509, "Certificate", rb_cObject);
 
     rb_define_alloc_func(cX509Cert, ossl_x509_alloc);
     rb_define_method(cX509Cert, "initialize", ossl_x509_initialize, -1);
-    rb_define_copy_func(cX509Cert, ossl_x509_copy);
+    rb_define_method(cX509Cert, "initialize_copy", ossl_x509_copy, 1);
 
     rb_define_method(cX509Cert, "to_der", ossl_x509_to_der, 0);
     rb_define_method(cX509Cert, "to_pem", ossl_x509_to_pem, 0);
@@ -852,4 +842,5 @@ Init_ossl_x509cert(void)
     rb_define_method(cX509Cert, "extensions=", ossl_x509_set_extensions, 1);
     rb_define_method(cX509Cert, "add_extension", ossl_x509_add_extension, 1);
     rb_define_method(cX509Cert, "inspect", ossl_x509_inspect, 0);
+    rb_define_method(cX509Cert, "==", ossl_x509_eq, 1);
 }
diff --git a/ext/openssl/ossl_x509crl.c b/ext/openssl/ossl_x509crl.c
index 2cbe4f941f..b0badf45c4 100644
--- a/ext/openssl/ossl_x509crl.c
+++ b/ext/openssl/ossl_x509crl.c
@@ -23,10 +23,6 @@
 	ossl_raise(rb_eRuntimeError, "CRL wasn't initialized!"); \
     } \
 } while (0)
-#define SafeGetX509CRL(obj, crl) do { \
-    OSSL_Check_Kind((obj), cX509CRL); \
-    GetX509CRL((obj), (crl)); \
-} while (0)
 
 /*
  * Classes
@@ -56,18 +52,7 @@ GetX509CRLPtr(VALUE obj)
 {
     X509_CRL *crl;
 
-    SafeGetX509CRL(obj, crl);
-
-    return crl;
-}
-
-X509_CRL *
-DupX509CRLPtr(VALUE obj)
-{
-    X509_CRL *crl;
-
-    SafeGetX509CRL(obj, crl);
-    X509_CRL_up_ref(crl);
+    GetX509CRL(obj, crl);
 
     return crl;
 }
@@ -115,7 +100,7 @@ ossl_x509crl_initialize(int argc, VALUE *argv, VALUE self)
 	return self;
     }
     arg = ossl_to_der_if_possible(arg);
-    in = ossl_obj2bio(arg);
+    in = ossl_obj2bio(&arg);
     crl = PEM_read_bio_X509_CRL(in, &x, NULL, NULL);
     DATA_PTR(self) = x;
     if (!crl) {
@@ -137,7 +122,7 @@ ossl_x509crl_copy(VALUE self, VALUE other)
     rb_check_frozen(self);
     if (self == other) return self;
     GetX509CRL(self, a);
-    SafeGetX509CRL(other, b);
+    GetX509CRL(other, b);
     if (!(crl = X509_CRL_dup(b))) {
 	ossl_raise(eX509CRLError, NULL);
     }
@@ -180,24 +165,20 @@ static VALUE
 ossl_x509crl_get_signature_algorithm(VALUE self)
 {
     X509_CRL *crl;
-    X509_ALGOR *alg;
+    const X509_ALGOR *alg;
     BIO *out;
-    BUF_MEM *buf;
-    VALUE str;
 
     GetX509CRL(self, crl);
     if (!(out = BIO_new(BIO_s_mem()))) {
 	ossl_raise(eX509CRLError, NULL);
     }
-    X509_CRL_get0_signature(NULL, &alg, crl);
+    X509_CRL_get0_signature(crl, NULL, &alg);
     if (!i2a_ASN1_OBJECT(out, alg->algorithm)) {
 	BIO_free(out);
 	ossl_raise(eX509CRLError, NULL);
     }
-    BIO_get_mem_ptr(out, &buf);
-    str = rb_str_new(buf->data, buf->length);
-    BIO_free(out);
-    return str;
+
+    return ossl_membio2str(out);
 }
 
 static VALUE
@@ -227,20 +208,29 @@ static VALUE
 ossl_x509crl_get_last_update(VALUE self)
 {
     X509_CRL *crl;
+    const ASN1_TIME *time;
 
     GetX509CRL(self, crl);
+    time = X509_CRL_get0_lastUpdate(crl);
+    if (!time)
+	return Qnil;
 
-    return asn1time_to_time(X509_CRL_get_lastUpdate(crl));
+    return asn1time_to_time(time);
 }
 
 static VALUE
 ossl_x509crl_set_last_update(VALUE self, VALUE time)
 {
     X509_CRL *crl;
+    ASN1_TIME *asn1time;
 
     GetX509CRL(self, crl);
-    if (!ossl_x509_time_adjust(X509_CRL_get_lastUpdate(crl), time))
-	ossl_raise(eX509CRLError, NULL);
+    asn1time = ossl_x509_time_adjust(NULL, time);
+    if (!X509_CRL_set1_lastUpdate(crl, asn1time)) {
+	ASN1_TIME_free(asn1time);
+	ossl_raise(eX509CRLError, "X509_CRL_set_lastUpdate");
+    }
+    ASN1_TIME_free(asn1time);
 
     return time;
 }
@@ -249,31 +239,29 @@ static VALUE
 ossl_x509crl_get_next_update(VALUE self)
 {
     X509_CRL *crl;
+    const ASN1_TIME *time;
 
     GetX509CRL(self, crl);
+    time = X509_CRL_get0_nextUpdate(crl);
+    if (!time)
+	return Qnil;
 
-    return asn1time_to_time(X509_CRL_get_nextUpdate(crl));
+    return asn1time_to_time(time);
 }
 
 static VALUE
 ossl_x509crl_set_next_update(VALUE self, VALUE time)
 {
     X509_CRL *crl;
-    ASN1_TIME *orig, *new;
+    ASN1_TIME *asn1time;
 
     GetX509CRL(self, crl);
-    /* orig may be NULL at this time; in this case a new ASN1_TIME is created */
-    orig = X509_CRL_get_nextUpdate(crl);
-    new = ossl_x509_time_adjust(orig, time);
-
-    if (!X509_CRL_set_nextUpdate(crl, new)) {
-	if (!orig)
-		ASN1_TIME_free(new);
-	ossl_raise(eX509CRLError, NULL);
+    asn1time = ossl_x509_time_adjust(NULL, time);
+    if (!X509_CRL_set1_nextUpdate(crl, asn1time)) {
+	ASN1_TIME_free(asn1time);
+	ossl_raise(eX509CRLError, "X509_CRL_set_nextUpdate");
     }
-    /* X509_CRL_set_nextUpdate() dups when orig != new */
-    if (!orig)
-	ASN1_TIME_free(new);
+    ASN1_TIME_free(asn1time);
 
     return time;
 }
@@ -308,6 +296,7 @@ ossl_x509crl_set_revoked(VALUE self, VALUE ary)
 {
     X509_CRL *crl;
     X509_REVOKED *rev;
+    STACK_OF(X509_REVOKED) *sk;
     long i;
 
     Check_Type(ary, T_ARRAY);
@@ -316,11 +305,15 @@ ossl_x509crl_set_revoked(VALUE self, VALUE ary)
 	OSSL_Check_Kind(RARRAY_AREF(ary, i), cX509Rev);
     }
     GetX509CRL(self, crl);
-    sk_X509_REVOKED_pop_free(X509_CRL_get_REVOKED(crl), X509_REVOKED_free);
+    if ((sk = X509_CRL_get_REVOKED(crl))) {
+	while ((rev = sk_X509_REVOKED_pop(sk)))
+	    X509_REVOKED_free(rev);
+    }
     for (i=0; i<RARRAY_LEN(ary); i++) {
 	rev = DupX509RevokedPtr(RARRAY_AREF(ary, i));
 	if (!X509_CRL_add0_revoked(crl, rev)) { /* NO DUP - don't free! */
-	    ossl_raise(eX509CRLError, NULL);
+	    X509_REVOKED_free(rev);
+	    ossl_raise(eX509CRLError, "X509_CRL_add0_revoked");
 	}
     }
     X509_CRL_sort(crl);
@@ -337,7 +330,8 @@ ossl_x509crl_add_revoked(VALUE self, VALUE revoked)
     GetX509CRL(self, crl);
     rev = DupX509RevokedPtr(revoked);
     if (!X509_CRL_add0_revoked(crl, rev)) { /* NO DUP - don't free! */
-	ossl_raise(eX509CRLError, NULL);
+	X509_REVOKED_free(rev);
+	ossl_raise(eX509CRLError, "X509_CRL_add0_revoked");
     }
     X509_CRL_sort(crl);
 
@@ -353,7 +347,7 @@ ossl_x509crl_sign(VALUE self, VALUE key, VALUE digest)
 
     GetX509CRL(self, crl);
     pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
-    md = GetDigestPtr(digest);
+    md = ossl_evp_get_digestbyname(digest);
     if (!X509_CRL_sign(crl, pkey, md)) {
 	ossl_raise(eX509CRLError, NULL);
     }
@@ -365,9 +359,12 @@ static VALUE
 ossl_x509crl_verify(VALUE self, VALUE key)
 {
     X509_CRL *crl;
+    EVP_PKEY *pkey;
 
     GetX509CRL(self, crl);
-    switch (X509_CRL_verify(crl, GetPKeyPtr(key))) {
+    pkey = GetPKeyPtr(key);
+    ossl_pkey_check_public_key(pkey);
+    switch (X509_CRL_verify(crl, pkey)) {
       case 1:
 	return Qtrue;
       case 0:
@@ -383,8 +380,6 @@ ossl_x509crl_to_der(VALUE self)
 {
     X509_CRL *crl;
     BIO *out;
-    BUF_MEM *buf;
-    VALUE str;
 
     GetX509CRL(self, crl);
     if (!(out = BIO_new(BIO_s_mem()))) {
@@ -394,11 +389,8 @@ ossl_x509crl_to_der(VALUE self)
 	BIO_free(out);
 	ossl_raise(eX509CRLError, NULL);
     }
-    BIO_get_mem_ptr(out, &buf);
-    str = rb_str_new(buf->data, buf->length);
-    BIO_free(out);
 
-    return str;
+    return ossl_membio2str(out);
 }
 
 static VALUE
@@ -406,8 +398,6 @@ ossl_x509crl_to_pem(VALUE self)
 {
     X509_CRL *crl;
     BIO *out;
-    BUF_MEM *buf;
-    VALUE str;
 
     GetX509CRL(self, crl);
     if (!(out = BIO_new(BIO_s_mem()))) {
@@ -417,11 +407,8 @@ ossl_x509crl_to_pem(VALUE self)
 	BIO_free(out);
 	ossl_raise(eX509CRLError, NULL);
     }
-    BIO_get_mem_ptr(out, &buf);
-    str = rb_str_new(buf->data, buf->length);
-    BIO_free(out);
 
-    return str;
+    return ossl_membio2str(out);
 }
 
 static VALUE
@@ -429,8 +416,6 @@ ossl_x509crl_to_text(VALUE self)
 {
     X509_CRL *crl;
     BIO *out;
-    BUF_MEM *buf;
-    VALUE str;
 
     GetX509CRL(self, crl);
     if (!(out = BIO_new(BIO_s_mem()))) {
@@ -440,11 +425,8 @@ ossl_x509crl_to_text(VALUE self)
 	BIO_free(out);
 	ossl_raise(eX509CRLError, NULL);
     }
-    BIO_get_mem_ptr(out, &buf);
-    str = rb_str_new(buf->data, buf->length);
-    BIO_free(out);
 
-    return str;
+    return ossl_membio2str(out);
 }
 
 /*
@@ -492,12 +474,10 @@ ossl_x509crl_set_extensions(VALUE self, VALUE ary)
     while ((ext = X509_CRL_delete_ext(crl, 0)))
 	X509_EXTENSION_free(ext);
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	ext = DupX509ExtPtr(RARRAY_AREF(ary, i));
-	if(!X509_CRL_add_ext(crl, ext, -1)) { /* DUPs ext - FREE it */
-	    X509_EXTENSION_free(ext);
+	ext = GetX509ExtPtr(RARRAY_AREF(ary, i)); /* NO NEED TO DUP */
+	if (!X509_CRL_add_ext(crl, ext, -1)) {
 	    ossl_raise(eX509CRLError, NULL);
 	}
-	X509_EXTENSION_free(ext);
     }
 
     return ary;
@@ -510,12 +490,10 @@ ossl_x509crl_add_extension(VALUE self, VALUE extension)
     X509_EXTENSION *ext;
 
     GetX509CRL(self, crl);
-    ext = DupX509ExtPtr(extension);
-    if (!X509_CRL_add_ext(crl, ext, -1)) { /* DUPs ext - FREE it */
-	X509_EXTENSION_free(ext);
+    ext = GetX509ExtPtr(extension);
+    if (!X509_CRL_add_ext(crl, ext, -1)) {
 	ossl_raise(eX509CRLError, NULL);
     }
-    X509_EXTENSION_free(ext);
 
     return extension;
 }
@@ -526,13 +504,19 @@ ossl_x509crl_add_extension(VALUE self, VALUE extension)
 void
 Init_ossl_x509crl(void)
 {
+#if 0
+    mOSSL = rb_define_module("OpenSSL");
+    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
+    mX509 = rb_define_module_under(mOSSL, "X509");
+#endif
+
     eX509CRLError = rb_define_class_under(mX509, "CRLError", eOSSLError);
 
     cX509CRL = rb_define_class_under(mX509, "CRL", rb_cObject);
 
     rb_define_alloc_func(cX509CRL, ossl_x509crl_alloc);
     rb_define_method(cX509CRL, "initialize", ossl_x509crl_initialize, -1);
-    rb_define_copy_func(cX509CRL, ossl_x509crl_copy);
+    rb_define_method(cX509CRL, "initialize_copy", ossl_x509crl_copy, 1);
 
     rb_define_method(cX509CRL, "version", ossl_x509crl_get_version, 0);
     rb_define_method(cX509CRL, "version=", ossl_x509crl_set_version, 1);
diff --git a/ext/openssl/ossl_x509ext.c b/ext/openssl/ossl_x509ext.c
index e5817543c5..5eb9bd759f 100644
--- a/ext/openssl/ossl_x509ext.c
+++ b/ext/openssl/ossl_x509ext.c
@@ -23,10 +23,6 @@
 	ossl_raise(rb_eRuntimeError, "EXT wasn't initialized!"); \
     } \
 } while (0)
-#define SafeGetX509Ext(obj, ext) do { \
-    OSSL_Check_Kind((obj), cX509Ext); \
-    GetX509Ext((obj), (ext)); \
-} while (0)
 #define MakeX509ExtFactory(klass, obj, ctx) do { \
     (obj) = TypedData_Wrap_Struct((klass), &ossl_x509extfactory_type, 0); \
     if (!((ctx) = OPENSSL_malloc(sizeof(X509V3_CTX)))) \
@@ -90,24 +86,11 @@ GetX509ExtPtr(VALUE obj)
 {
     X509_EXTENSION *ext;
 
-    SafeGetX509Ext(obj, ext);
+    GetX509Ext(obj, ext);
 
     return ext;
 }
 
-X509_EXTENSION *
-DupX509ExtPtr(VALUE obj)
-{
-    X509_EXTENSION *ext, *new;
-
-    SafeGetX509Ext(obj, ext);
-    if (!(new = X509_EXTENSION_dup(ext))) {
-	ossl_raise(eX509ExtError, NULL);
-    }
-
-    return new;
-}
-
 /*
  * Private
  */
@@ -189,20 +172,6 @@ ossl_x509extfactory_set_crl(VALUE self, VALUE crl)
 }
 
 static VALUE
-ossl_x509extfactory_set_config(VALUE self, VALUE config)
-{
-    X509V3_CTX *ctx;
-    CONF *conf;
-
-    GetX509ExtFactory(self, ctx);
-    rb_iv_set(self, "@config", config);
-    conf = GetConfigPtr(config);  /* NO DUP NEEDED */
-    X509V3_set_nconf(ctx, conf);
-
-    return config;
-}
-
-static VALUE
 ossl_x509extfactory_initialize(int argc, VALUE *argv, VALUE self)
 {
     /*X509V3_CTX *ctx;*/
@@ -225,12 +194,11 @@ ossl_x509extfactory_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 /*
- * Array to X509_EXTENSION
- * Structure:
- * ["ln", "value", bool_critical] or
- * ["sn", "value", bool_critical] or
- * ["ln", "critical,value"] or the same for sn
- * ["ln", "value"] => not critical
+ * call-seq:
+ *   ef.create_ext(ln_or_sn, "value", critical = false) -> X509::Extension
+ *   ef.create_ext(ln_or_sn, "critical,value")          -> X509::Extension
+ *
+ * Creates a new X509::Extension with passed values. See also x509v3_config(5).
  */
 static VALUE
 ossl_x509extfactory_create_ext(int argc, VALUE *argv, VALUE self)
@@ -258,8 +226,11 @@ ossl_x509extfactory_create_ext(int argc, VALUE *argv, VALUE self)
     GetX509ExtFactory(self, ctx);
     obj = NewX509Ext(cX509Ext);
     rconf = rb_iv_get(self, "@config");
-    conf = NIL_P(rconf) ? NULL : GetConfigPtr(rconf);
+    conf = NIL_P(rconf) ? NULL : DupConfigPtr(rconf);
+    X509V3_set_nconf(ctx, conf);
     ext = X509V3_EXT_nconf_nid(conf, ctx, nid, RSTRING_PTR(valstr));
+    X509V3_set_ctx_nodb(ctx);
+    NCONF_free(conf);
     if (!ext){
 	ossl_raise(eX509ExtError, "%"PRIsVALUE" = %"PRIsVALUE, oid, valstr);
     }
@@ -288,15 +259,15 @@ ossl_x509ext_alloc(VALUE klass)
 
 /*
  * call-seq:
- *    OpenSSL::X509::Extension.new asn1
- *    OpenSSL::X509::Extension.new name, value
- *    OpenSSL::X509::Extension.new name, value, critical
+ *    OpenSSL::X509::Extension.new(der)
+ *    OpenSSL::X509::Extension.new(oid, value)
+ *    OpenSSL::X509::Extension.new(oid, value, critical)
  *
  * Creates an X509 extension.
  *
- * The extension may be created from +asn1+ data or from an extension +name+
- * and +value+.  The +name+ may be either an OID or an extension name.  If
- * +critical+ is true the extension is marked critical.
+ * The extension may be created from _der_ data or from an extension _oid_
+ * and _value_.  The _oid_ may be either an OID or an extension name.  If
+ * _critical_ is +true+ the extension is marked critical.
  */
 static VALUE
 ossl_x509ext_initialize(int argc, VALUE *argv, VALUE self)
@@ -324,18 +295,39 @@ ossl_x509ext_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
+ossl_x509ext_initialize_copy(VALUE self, VALUE other)
+{
+    X509_EXTENSION *ext, *ext_other, *ext_new;
+
+    rb_check_frozen(self);
+    GetX509Ext(self, ext);
+    GetX509Ext(other, ext_other);
+
+    ext_new = X509_EXTENSION_dup(ext_other);
+    if (!ext_new)
+	ossl_raise(eX509ExtError, "X509_EXTENSION_dup");
+
+    SetX509Ext(self, ext_new);
+    X509_EXTENSION_free(ext);
+
+    return self;
+}
+
+static VALUE
 ossl_x509ext_set_oid(VALUE self, VALUE oid)
 {
     X509_EXTENSION *ext;
     ASN1_OBJECT *obj;
-    char *s;
 
-    s = StringValueCStr(oid);
-    obj = OBJ_txt2obj(s, 0);
-    if(!obj) obj = OBJ_txt2obj(s, 1);
-    if(!obj) ossl_raise(eX509ExtError, NULL);
     GetX509Ext(self, ext);
-    X509_EXTENSION_set_object(ext, obj);
+    obj = OBJ_txt2obj(StringValueCStr(oid), 0);
+    if (!obj)
+	ossl_raise(eX509ExtError, "OBJ_txt2obj");
+    if (!X509_EXTENSION_set_object(ext, obj)) {
+	ASN1_OBJECT_free(obj);
+	ossl_raise(eX509ExtError, "X509_EXTENSION_set_object");
+    }
+    ASN1_OBJECT_free(obj);
 
     return oid;
 }
@@ -346,17 +338,15 @@ ossl_x509ext_set_value(VALUE self, VALUE data)
     X509_EXTENSION *ext;
     ASN1_OCTET_STRING *asn1s;
 
+    GetX509Ext(self, ext);
     data = ossl_to_der_if_possible(data);
     StringValue(data);
-    if(!(asn1s = ASN1_OCTET_STRING_new())){
-	ossl_raise(eX509ExtError, NULL);
-    }
-    if(!ASN1_STRING_set((ASN1_STRING *)asn1s, (unsigned char *)RSTRING_PTR(data), RSTRING_LENINT(data))){
-	ASN1_OCTET_STRING_free(asn1s);
-	ossl_raise(eX509ExtError, NULL);
+    asn1s = X509_EXTENSION_get_data(ext);
+
+    if (!ASN1_OCTET_STRING_set(asn1s, (unsigned char *)RSTRING_PTR(data),
+			       RSTRING_LENINT(data))) {
+	ossl_raise(eX509ExtError, "ASN1_OCTET_STRING_set");
     }
-    GetX509Ext(self, ext);
-    X509_EXTENSION_set_data(ext, asn1s);
 
     return data;
 }
@@ -413,6 +403,19 @@ ossl_x509ext_get_value(VALUE obj)
 }
 
 static VALUE
+ossl_x509ext_get_value_der(VALUE obj)
+{
+    X509_EXTENSION *ext;
+    ASN1_OCTET_STRING *value;
+
+    GetX509Ext(obj, ext);
+    if ((value = X509_EXTENSION_get_data(ext)) == NULL)
+	ossl_raise(eX509ExtError, NULL);
+
+    return rb_str_new((const char *)value->data, value->length);
+}
+
+static VALUE
 ossl_x509ext_get_critical(VALUE obj)
 {
     X509_EXTENSION *ext;
@@ -447,6 +450,13 @@ ossl_x509ext_to_der(VALUE obj)
 void
 Init_ossl_x509ext(void)
 {
+#undef rb_intern
+#if 0
+    mOSSL = rb_define_module("OpenSSL");
+    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
+    mX509 = rb_define_module_under(mOSSL, "X509");
+#endif
+
     eX509ExtError = rb_define_class_under(mX509, "ExtensionError", eOSSLError);
 
     cX509ExtFactory = rb_define_class_under(mX509, "ExtensionFactory", rb_cObject);
@@ -458,23 +468,24 @@ Init_ossl_x509ext(void)
     rb_attr(cX509ExtFactory, rb_intern("subject_certificate"), 1, 0, Qfalse);
     rb_attr(cX509ExtFactory, rb_intern("subject_request"), 1, 0, Qfalse);
     rb_attr(cX509ExtFactory, rb_intern("crl"), 1, 0, Qfalse);
-    rb_attr(cX509ExtFactory, rb_intern("config"), 1, 0, Qfalse);
+    rb_attr(cX509ExtFactory, rb_intern("config"), 1, 1, Qfalse);
 
     rb_define_method(cX509ExtFactory, "issuer_certificate=", ossl_x509extfactory_set_issuer_cert, 1);
     rb_define_method(cX509ExtFactory, "subject_certificate=", ossl_x509extfactory_set_subject_cert, 1);
     rb_define_method(cX509ExtFactory, "subject_request=", ossl_x509extfactory_set_subject_req, 1);
     rb_define_method(cX509ExtFactory, "crl=", ossl_x509extfactory_set_crl, 1);
-    rb_define_method(cX509ExtFactory, "config=", ossl_x509extfactory_set_config, 1);
     rb_define_method(cX509ExtFactory, "create_ext", ossl_x509extfactory_create_ext, -1);
 
     cX509Ext = rb_define_class_under(mX509, "Extension", rb_cObject);
     rb_define_alloc_func(cX509Ext, ossl_x509ext_alloc);
     rb_define_method(cX509Ext, "initialize", ossl_x509ext_initialize, -1);
+    rb_define_method(cX509Ext, "initialize_copy", ossl_x509ext_initialize_copy, 1);
     rb_define_method(cX509Ext, "oid=", ossl_x509ext_set_oid, 1);
     rb_define_method(cX509Ext, "value=", ossl_x509ext_set_value, 1);
     rb_define_method(cX509Ext, "critical=", ossl_x509ext_set_critical, 1);
     rb_define_method(cX509Ext, "oid", ossl_x509ext_get_oid, 0);
     rb_define_method(cX509Ext, "value", ossl_x509ext_get_value, 0);
+    rb_define_method(cX509Ext, "value_der", ossl_x509ext_get_value_der, 0);
     rb_define_method(cX509Ext, "critical?", ossl_x509ext_get_critical, 0);
     rb_define_method(cX509Ext, "to_der", ossl_x509ext_to_der, 0);
 }
diff --git a/ext/openssl/ossl_x509name.c b/ext/openssl/ossl_x509name.c
index ff307c0626..1522c3d897 100644
--- a/ext/openssl/ossl_x509name.c
+++ b/ext/openssl/ossl_x509name.c
@@ -23,10 +23,6 @@
 	ossl_raise(rb_eRuntimeError, "Name wasn't initialized."); \
     } \
 } while (0)
-#define SafeGetX509Name(obj, name) do { \
-    OSSL_Check_Kind((obj), cX509Name); \
-    GetX509Name((obj), (name)); \
-} while (0)
 
 #define OBJECT_TYPE_TEMPLATE \
   rb_const_get(cX509Name, rb_intern("OBJECT_TYPE_TEMPLATE"))
@@ -81,7 +77,7 @@ GetX509NamePtr(VALUE obj)
 {
     X509_NAME *name;
 
-    SafeGetX509Name(obj, name);
+    GetX509Name(obj, name);
 
     return name;
 }
@@ -135,15 +131,15 @@ ossl_x509name_init_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
  *
  * Creates a new Name.
  *
- * A name may be created from a DER encoded string +der+, an Array
- * representing a +distinguished_name+ or a +distinguished_name+ along with a
- * +template+.
+ * A name may be created from a DER encoded string _der_, an Array
+ * representing a _distinguished_name_ or a _distinguished_name_ along with a
+ * _template_.
  *
  *   name = OpenSSL::X509::Name.new [['CN', 'nobody'], ['DC', 'example']]
  *
  *   name = OpenSSL::X509::Name.new name.to_der
  *
- * See add_entry for a description of the +distinguished_name+ Array's
+ * See add_entry for a description of the _distinguished_name_ Array's
  * contents
  */
 static VALUE
@@ -181,11 +177,30 @@ ossl_x509name_initialize(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
+static VALUE
+ossl_x509name_initialize_copy(VALUE self, VALUE other)
+{
+    X509_NAME *name, *name_other, *name_new;
+
+    rb_check_frozen(self);
+    GetX509Name(self, name);
+    GetX509Name(other, name_other);
+
+    name_new = X509_NAME_dup(name_other);
+    if (!name_new)
+	ossl_raise(eX509NameError, "X509_NAME_dup");
+
+    SetX509Name(self, name_new);
+    X509_NAME_free(name);
+
+    return self;
+}
+
 /*
  * call-seq:
- *    name.add_entry(oid, value [, type]) => self
+ *    name.add_entry(oid, value [, type], loc: -1, set: 0) => self
  *
- * Adds a new entry with the given +oid+ and +value+ to this name.  The +oid+
+ * Adds a new entry with the given _oid_ and _value_ to this name.  The _oid_
  * is an object identifier defined in ASN.1.  Some common OIDs are:
  *
  * C::  Country Name
@@ -194,24 +209,39 @@ ossl_x509name_initialize(int argc, VALUE *argv, VALUE self)
  * O::  Organization Name
  * OU:: Organizational Unit Name
  * ST:: State or Province Name
+ *
+ * The optional keyword parameters _loc_ and _set_ specify where to insert the
+ * new attribute. Refer to the manpage of X509_NAME_add_entry(3) for details.
+ * _loc_ defaults to -1 and _set_ defaults to 0. This appends a single-valued
+ * RDN to the end.
  */
 static
 VALUE ossl_x509name_add_entry(int argc, VALUE *argv, VALUE self)
 {
     X509_NAME *name;
-    VALUE oid, value, type;
+    VALUE oid, value, type, opts, kwargs[2];
+    static ID kwargs_ids[2];
     const char *oid_name;
+    int loc = -1, set = 0;
 
-    rb_scan_args(argc, argv, "21", &oid, &value, &type);
+    if (!kwargs_ids[0]) {
+	kwargs_ids[0] = rb_intern_const("loc");
+	kwargs_ids[1] = rb_intern_const("set");
+    }
+    rb_scan_args(argc, argv, "21:", &oid, &value, &type, &opts);
+    rb_get_kwargs(opts, kwargs_ids, 0, 2, kwargs);
     oid_name = StringValueCStr(oid);
     StringValue(value);
     if(NIL_P(type)) type = rb_aref(OBJECT_TYPE_TEMPLATE, oid);
+    if (kwargs[0] != Qundef)
+	loc = NUM2INT(kwargs[0]);
+    if (kwargs[1] != Qundef)
+	set = NUM2INT(kwargs[1]);
     GetX509Name(self, name);
     if (!X509_NAME_add_entry_by_txt(name, oid_name, NUM2INT(type),
-		(const unsigned char *)RSTRING_PTR(value), RSTRING_LENINT(value), -1, 0)) {
-	ossl_raise(eX509NameError, NULL);
-    }
-
+				    (unsigned char *)RSTRING_PTR(value),
+				    RSTRING_LENINT(value), loc, set))
+	ossl_raise(eX509NameError, "X509_NAME_add_entry_by_txt");
     return self;
 }
 
@@ -220,52 +250,83 @@ ossl_x509name_to_s_old(VALUE self)
 {
     X509_NAME *name;
     char *buf;
-    VALUE str;
 
     GetX509Name(self, name);
     buf = X509_NAME_oneline(name, NULL, 0);
-    str = rb_str_new2(buf);
-    OPENSSL_free(buf);
+    if (!buf)
+	ossl_raise(eX509NameError, "X509_NAME_oneline");
+    return ossl_buf2str(buf, rb_long2int(strlen(buf)));
+}
 
-    return str;
+static VALUE
+x509name_print(VALUE self, unsigned long iflag)
+{
+    X509_NAME *name;
+    BIO *out;
+    int ret;
+
+    GetX509Name(self, name);
+    out = BIO_new(BIO_s_mem());
+    if (!out)
+	ossl_raise(eX509NameError, NULL);
+    ret = X509_NAME_print_ex(out, name, 0, iflag);
+    if (ret < 0 || (iflag == XN_FLAG_COMPAT && ret == 0)) {
+	BIO_free(out);
+	ossl_raise(eX509NameError, "X509_NAME_print_ex");
+    }
+    return ossl_membio2str(out);
 }
 
 /*
  * call-seq:
- *    name.to_s => string
- *    name.to_s(flags) => string
+ *    name.to_s         -> string
+ *    name.to_s(format) -> string
  *
- * Returns this name as a Distinguished Name string.  +flags+ may be one of:
+ * Returns a String representation of the Distinguished Name. _format_ is
+ * one of:
  *
  * * OpenSSL::X509::Name::COMPAT
  * * OpenSSL::X509::Name::RFC2253
  * * OpenSSL::X509::Name::ONELINE
  * * OpenSSL::X509::Name::MULTILINE
+ *
+ * If _format_ is omitted, the largely broken and traditional OpenSSL format
+ * is used.
  */
 static VALUE
 ossl_x509name_to_s(int argc, VALUE *argv, VALUE self)
 {
-    X509_NAME *name;
-    VALUE flag, str;
-    BIO *out;
-    unsigned long iflag;
-
-    rb_scan_args(argc, argv, "01", &flag);
-    if (NIL_P(flag))
+    rb_check_arity(argc, 0, 1);
+    /* name.to_s(nil) was allowed */
+    if (!argc || NIL_P(argv[0]))
 	return ossl_x509name_to_s_old(self);
-    else iflag = NUM2ULONG(flag);
-    if (!(out = BIO_new(BIO_s_mem())))
-	ossl_raise(eX509NameError, NULL);
-    GetX509Name(self, name);
-    if (!X509_NAME_print_ex(out, name, 0, iflag)){
-	BIO_free(out);
-	ossl_raise(eX509NameError, NULL);
-    }
-    str = ossl_membio2str(out);
+    else
+	return x509name_print(self, NUM2ULONG(argv[0]));
+}
 
+/*
+ * call-seq:
+ *    name.to_utf8 -> string
+ *
+ * Returns an UTF-8 representation of the distinguished name, as specified
+ * in {RFC 2253}[https://www.ietf.org/rfc/rfc2253.txt].
+ */
+static VALUE
+ossl_x509name_to_utf8(VALUE self)
+{
+    VALUE str = x509name_print(self, XN_FLAG_RFC2253 & ~ASN1_STRFLGS_ESC_MSB);
+    rb_enc_associate_index(str, rb_utf8_encindex());
     return str;
 }
 
+/* :nodoc: */
+static VALUE
+ossl_x509name_inspect(VALUE self)
+{
+    return rb_enc_sprintf(rb_utf8_encoding(), "#<%"PRIsVALUE" %"PRIsVALUE">",
+			  rb_obj_class(self), ossl_x509name_to_utf8(self));
+}
+
 /*
  * call-seq:
  *    name.to_a => [[name, data, type], ...]
@@ -307,10 +368,7 @@ ossl_x509name_to_a(VALUE self)
 	    vname = rb_str_new2(short_name); /*do not free*/
 	}
 	value = X509_NAME_ENTRY_get_data(entry);
-	ary = rb_ary_new3(3,
-			  vname,
-			  rb_str_new((const char *)value->data, value->length),
-			  INT2FIX(value->type));
+	ary = rb_ary_new3(3, vname, asn1str_to_str(value), INT2NUM(value->type));
 	rb_ary_push(ret, ary);
     }
     return ret;
@@ -322,46 +380,48 @@ ossl_x509name_cmp0(VALUE self, VALUE other)
     X509_NAME *name1, *name2;
 
     GetX509Name(self, name1);
-    SafeGetX509Name(other, name2);
+    GetX509Name(other, name2);
 
     return X509_NAME_cmp(name1, name2);
 }
 
 /*
  * call-seq:
- *    name.cmp other => integer
- *    name.<=> other => integer
+ *    name.cmp(other) -> -1 | 0 | 1 | nil
+ *    name <=> other  -> -1 | 0 | 1 | nil
  *
- * Compares this Name with +other+ and returns 0 if they are the same and -1 or
- * +1 if they are greater or less than each other respectively.
+ * Compares this Name with _other_ and returns +0+ if they are the same and +-1+
+ * or ++1+ if they are greater or less than each other respectively.
+ * Returns +nil+ if they are not comparable (i.e. different types).
  */
 static VALUE
 ossl_x509name_cmp(VALUE self, VALUE other)
 {
     int result;
 
+    if (!rb_obj_is_kind_of(other, cX509Name))
+	return Qnil;
+
     result = ossl_x509name_cmp0(self, other);
     if (result < 0) return INT2FIX(-1);
-    if (result > 1) return INT2FIX(1);
+    if (result > 0) return INT2FIX(1);
 
     return INT2FIX(0);
 }
 
 /*
  * call-seq:
- *   name.eql? other => boolean
+ *   name.eql?(other) -> true | false
  *
- * Returns true if +name+ and +other+ refer to the same hash key.
+ * Returns true if _name_ and _other_ refer to the same hash key.
  */
 static VALUE
 ossl_x509name_eql(VALUE self, VALUE other)
 {
-    int result;
-
-    if(CLASS_OF(other) != cX509Name) return Qfalse;
-    result = ossl_x509name_cmp0(self, other);
+    if (!rb_obj_is_kind_of(other, cX509Name))
+	return Qfalse;
 
-    return (result == 0) ? Qtrue : Qfalse;
+    return ossl_x509name_cmp0(self, other) == 0 ? Qtrue : Qfalse;
 }
 
 /*
@@ -384,7 +444,6 @@ ossl_x509name_hash(VALUE self)
     return ULONG2NUM(hash);
 }
 
-#ifdef HAVE_X509_NAME_HASH_OLD
 /*
  * call-seq:
  *    name.hash_old => integer
@@ -403,7 +462,6 @@ ossl_x509name_hash_old(VALUE self)
 
     return ULONG2NUM(hash);
 }
-#endif
 
 /*
  * call-seq:
@@ -440,7 +498,7 @@ ossl_x509name_to_der(VALUE self)
  * You can create a Name by parsing a distinguished name String or by
  * supplying the distinguished name as an Array.
  *
- *   name = OpenSSL::X509::Name.parse 'CN=nobody/DC=example'
+ *   name = OpenSSL::X509::Name.parse '/CN=nobody/DC=example'
  *
  *   name = OpenSSL::X509::Name.new [['CN', 'nobody'], ['DC', 'example']]
  */
@@ -448,8 +506,15 @@ ossl_x509name_to_der(VALUE self)
 void
 Init_ossl_x509name(void)
 {
+#undef rb_intern
     VALUE utf8str, ptrstr, ia5str, hash;
 
+#if 0
+    mOSSL = rb_define_module("OpenSSL");
+    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
+    mX509 = rb_define_module_under(mOSSL, "X509");
+#endif
+
     id_aref = rb_intern("[]");
     eX509NameError = rb_define_class_under(mX509, "NameError", eOSSLError);
     cX509Name = rb_define_class_under(mX509, "Name", rb_cObject);
@@ -458,24 +523,24 @@ Init_ossl_x509name(void)
 
     rb_define_alloc_func(cX509Name, ossl_x509name_alloc);
     rb_define_method(cX509Name, "initialize", ossl_x509name_initialize, -1);
+    rb_define_method(cX509Name, "initialize_copy", ossl_x509name_initialize_copy, 1);
     rb_define_method(cX509Name, "add_entry", ossl_x509name_add_entry, -1);
     rb_define_method(cX509Name, "to_s", ossl_x509name_to_s, -1);
+    rb_define_method(cX509Name, "to_utf8", ossl_x509name_to_utf8, 0);
+    rb_define_method(cX509Name, "inspect", ossl_x509name_inspect, 0);
     rb_define_method(cX509Name, "to_a", ossl_x509name_to_a, 0);
     rb_define_method(cX509Name, "cmp", ossl_x509name_cmp, 1);
     rb_define_alias(cX509Name, "<=>", "cmp");
     rb_define_method(cX509Name, "eql?", ossl_x509name_eql, 1);
     rb_define_method(cX509Name, "hash", ossl_x509name_hash, 0);
-#ifdef HAVE_X509_NAME_HASH_OLD
     rb_define_method(cX509Name, "hash_old", ossl_x509name_hash_old, 0);
-#endif
     rb_define_method(cX509Name, "to_der", ossl_x509name_to_der, 0);
 
     utf8str = INT2NUM(V_ASN1_UTF8STRING);
     ptrstr = INT2NUM(V_ASN1_PRINTABLESTRING);
     ia5str = INT2NUM(V_ASN1_IA5STRING);
 
-    /* Document-const: DEFAULT_OBJECT_TYPE
-     *
+    /*
      * The default object type for name entries.
      */
     rb_define_const(cX509Name, "DEFAULT_OBJECT_TYPE", utf8str);
@@ -489,14 +554,12 @@ Init_ossl_x509name(void)
     rb_hash_aset(hash, rb_str_new2("domainComponent"), ia5str);
     rb_hash_aset(hash, rb_str_new2("emailAddress"), ia5str);
 
-    /* Document-const: OBJECT_TYPE_TEMPLATE
-     *
+    /*
      * The default object type template for name entries.
      */
     rb_define_const(cX509Name, "OBJECT_TYPE_TEMPLATE", hash);
 
-    /* Document-const: COMPAT
-     *
+    /*
      * A flag for #to_s.
      *
      * Breaks the name returned into multiple lines if longer than 80
@@ -504,24 +567,21 @@ Init_ossl_x509name(void)
      */
     rb_define_const(cX509Name, "COMPAT", ULONG2NUM(XN_FLAG_COMPAT));
 
-    /* Document-const: RFC2253
-     *
+    /*
      * A flag for #to_s.
      *
      * Returns an RFC2253 format name.
      */
     rb_define_const(cX509Name, "RFC2253", ULONG2NUM(XN_FLAG_RFC2253));
 
-    /* Document-const: ONELINE
-     *
+    /*
      * A flag for #to_s.
      *
      * Returns a more readable format than RFC2253.
      */
     rb_define_const(cX509Name, "ONELINE", ULONG2NUM(XN_FLAG_ONELINE));
 
-    /* Document-const: MULTILINE
-     *
+    /*
      * A flag for #to_s.
      *
      * Returns a multiline format.
diff --git a/ext/openssl/ossl_x509req.c b/ext/openssl/ossl_x509req.c
index 9025d4fe28..2c20042a92 100644
--- a/ext/openssl/ossl_x509req.c
+++ b/ext/openssl/ossl_x509req.c
@@ -23,10 +23,6 @@
 	ossl_raise(rb_eRuntimeError, "Req wasn't initialized!"); \
     } \
 } while (0)
-#define SafeGetX509Req(obj, req) do { \
-    OSSL_Check_Kind((obj), cX509Req); \
-    GetX509Req((obj), (req)); \
-} while (0)
 
 /*
  * Classes
@@ -51,49 +47,16 @@ static const rb_data_type_t ossl_x509req_type = {
 /*
  * Public functions
  */
-VALUE
-ossl_x509req_new(X509_REQ *req)
-{
-    X509_REQ *new;
-    VALUE obj;
-
-    obj = NewX509Req(cX509Req);
-    if (!req) {
-	new = X509_REQ_new();
-    } else {
-	new = X509_REQ_dup(req);
-    }
-    if (!new) {
-	ossl_raise(eX509ReqError, NULL);
-    }
-    SetX509Req(obj, new);
-
-    return obj;
-}
-
 X509_REQ *
 GetX509ReqPtr(VALUE obj)
 {
     X509_REQ *req;
 
-    SafeGetX509Req(obj, req);
+    GetX509Req(obj, req);
 
     return req;
 }
 
-X509_REQ *
-DupX509ReqPtr(VALUE obj)
-{
-    X509_REQ *req, *new;
-
-    SafeGetX509Req(obj, req);
-    if (!(new = X509_REQ_dup(req))) {
-	ossl_raise(eX509ReqError, NULL);
-    }
-
-    return new;
-}
-
 /*
  * Private functions
  */
@@ -123,7 +86,7 @@ ossl_x509req_initialize(int argc, VALUE *argv, VALUE self)
 	return self;
     }
     arg = ossl_to_der_if_possible(arg);
-    in = ossl_obj2bio(arg);
+    in = ossl_obj2bio(&arg);
     req = PEM_read_bio_X509_REQ(in, &x, NULL, NULL);
     DATA_PTR(self) = x;
     if (!req) {
@@ -145,7 +108,7 @@ ossl_x509req_copy(VALUE self, VALUE other)
     rb_check_frozen(self);
     if (self == other) return self;
     GetX509Req(self, a);
-    SafeGetX509Req(other, b);
+    GetX509Req(other, b);
     if (!(req = X509_REQ_dup(b))) {
 	ossl_raise(eX509ReqError, NULL);
     }
@@ -160,8 +123,6 @@ ossl_x509req_to_pem(VALUE self)
 {
     X509_REQ *req;
     BIO *out;
-    BUF_MEM *buf;
-    VALUE str;
 
     GetX509Req(self, req);
     if (!(out = BIO_new(BIO_s_mem()))) {
@@ -171,11 +132,8 @@ ossl_x509req_to_pem(VALUE self)
 	BIO_free(out);
 	ossl_raise(eX509ReqError, NULL);
     }
-    BIO_get_mem_ptr(out, &buf);
-    str = rb_str_new(buf->data, buf->length);
-    BIO_free(out);
 
-    return str;
+    return ossl_membio2str(out);
 }
 
 static VALUE
@@ -203,8 +161,6 @@ ossl_x509req_to_text(VALUE self)
 {
     X509_REQ *req;
     BIO *out;
-    BUF_MEM *buf;
-    VALUE str;
 
     GetX509Req(self, req);
     if (!(out = BIO_new(BIO_s_mem()))) {
@@ -214,11 +170,8 @@ ossl_x509req_to_text(VALUE self)
 	BIO_free(out);
 	ossl_raise(eX509ReqError, NULL);
     }
-    BIO_get_mem_ptr(out, &buf);
-    str = rb_str_new(buf->data, buf->length);
-    BIO_free(out);
 
-    return str;
+    return ossl_membio2str(out);
 }
 
 #if 0
@@ -250,7 +203,7 @@ ossl_x509req_get_version(VALUE self)
     GetX509Req(self, req);
     version = X509_REQ_get_version(req);
 
-    return LONG2FIX(version);
+    return LONG2NUM(version);
 }
 
 static VALUE
@@ -259,12 +212,12 @@ ossl_x509req_set_version(VALUE self, VALUE version)
     X509_REQ *req;
     long ver;
 
-    if ((ver = FIX2LONG(version)) < 0) {
+    if ((ver = NUM2LONG(version)) < 0) {
 	ossl_raise(eX509ReqError, "version must be >= 0!");
     }
     GetX509Req(self, req);
     if (!X509_REQ_set_version(req, ver)) {
-	ossl_raise(eX509ReqError, NULL);
+	ossl_raise(eX509ReqError, "X509_REQ_set_version");
     }
 
     return version;
@@ -302,25 +255,21 @@ static VALUE
 ossl_x509req_get_signature_algorithm(VALUE self)
 {
     X509_REQ *req;
-    X509_ALGOR *alg;
+    const X509_ALGOR *alg;
     BIO *out;
-    BUF_MEM *buf;
-    VALUE str;
 
     GetX509Req(self, req);
 
     if (!(out = BIO_new(BIO_s_mem()))) {
 	ossl_raise(eX509ReqError, NULL);
     }
-    X509_REQ_get0_signature(NULL, &alg, req);
+    X509_REQ_get0_signature(req, NULL, &alg);
     if (!i2a_ASN1_OBJECT(out, alg->algorithm)) {
 	BIO_free(out);
 	ossl_raise(eX509ReqError, NULL);
     }
-    BIO_get_mem_ptr(out, &buf);
-    str = rb_str_new(buf->data, buf->length);
-    BIO_free(out);
-    return str;
+
+    return ossl_membio2str(out);
 }
 
 static VALUE
@@ -344,11 +293,10 @@ ossl_x509req_set_public_key(VALUE self, VALUE key)
     EVP_PKEY *pkey;
 
     GetX509Req(self, req);
-    pkey = GetPKeyPtr(key); /* NO NEED TO DUP */
-    if (!X509_REQ_set_pubkey(req, pkey)) {
-	ossl_raise(eX509ReqError, NULL);
-    }
-
+    pkey = GetPKeyPtr(key);
+    ossl_pkey_check_public_key(pkey);
+    if (!X509_REQ_set_pubkey(req, pkey))
+	ossl_raise(eX509ReqError, "X509_REQ_set_pubkey");
     return key;
 }
 
@@ -361,7 +309,7 @@ ossl_x509req_sign(VALUE self, VALUE key, VALUE digest)
 
     GetX509Req(self, req);
     pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
-    md = GetDigestPtr(digest);
+    md = ossl_evp_get_digestbyname(digest);
     if (!X509_REQ_sign(req, pkey, md)) {
 	ossl_raise(eX509ReqError, NULL);
     }
@@ -379,7 +327,8 @@ ossl_x509req_verify(VALUE self, VALUE key)
     EVP_PKEY *pkey;
 
     GetX509Req(self, req);
-    pkey = GetPKeyPtr(key); /* NO NEED TO DUP */
+    pkey = GetPKeyPtr(key);
+    ossl_pkey_check_public_key(pkey);
     switch (X509_REQ_verify(req, pkey)) {
       case 1:
 	return Qtrue;
@@ -432,7 +381,7 @@ ossl_x509req_set_attributes(VALUE self, VALUE ary)
 	X509_ATTRIBUTE_free(attr);
     for (i=0;i<RARRAY_LEN(ary); i++) {
 	item = RARRAY_AREF(ary, i);
-	attr = DupX509AttrPtr(item);
+	attr = GetX509AttrPtr(item);
 	if (!X509_REQ_add1_attr(req, attr)) {
 	    ossl_raise(eX509ReqError, NULL);
 	}
@@ -446,7 +395,7 @@ ossl_x509req_add_attribute(VALUE self, VALUE attr)
     X509_REQ *req;
 
     GetX509Req(self, req);
-    if (!X509_REQ_add1_attr(req, DupX509AttrPtr(attr))) {
+    if (!X509_REQ_add1_attr(req, GetX509AttrPtr(attr))) {
 	ossl_raise(eX509ReqError, NULL);
     }
 
@@ -459,13 +408,19 @@ ossl_x509req_add_attribute(VALUE self, VALUE attr)
 void
 Init_ossl_x509req(void)
 {
+#if 0
+    mOSSL = rb_define_module("OpenSSL");
+    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
+    mX509 = rb_define_module_under(mOSSL, "X509");
+#endif
+
     eX509ReqError = rb_define_class_under(mX509, "RequestError", eOSSLError);
 
     cX509Req = rb_define_class_under(mX509, "Request", rb_cObject);
 
     rb_define_alloc_func(cX509Req, ossl_x509req_alloc);
     rb_define_method(cX509Req, "initialize", ossl_x509req_initialize, -1);
-    rb_define_copy_func(cX509Req, ossl_x509req_copy);
+    rb_define_method(cX509Req, "initialize_copy", ossl_x509req_copy, 1);
 
     rb_define_method(cX509Req, "to_pem", ossl_x509req_to_pem, 0);
     rb_define_method(cX509Req, "to_der", ossl_x509req_to_der, 0);
diff --git a/ext/openssl/ossl_x509revoked.c b/ext/openssl/ossl_x509revoked.c
index 067bec8cd4..5fe6853430 100644
--- a/ext/openssl/ossl_x509revoked.c
+++ b/ext/openssl/ossl_x509revoked.c
@@ -23,10 +23,6 @@
 	ossl_raise(rb_eRuntimeError, "REV wasn't initialized!"); \
     } \
 } while (0)
-#define SafeGetX509Rev(obj, rev) do { \
-    OSSL_Check_Kind((obj), cX509Rev); \
-    GetX509Rev((obj), (rev)); \
-} while (0)
 
 /*
  * Classes
@@ -76,7 +72,7 @@ DupX509RevokedPtr(VALUE obj)
 {
     X509_REVOKED *rev, *new;
 
-    SafeGetX509Rev(obj, rev);
+    GetX509Rev(obj, rev);
     if (!(new = X509_REVOKED_dup(rev))) {
 	ossl_raise(eX509RevError, NULL);
     }
@@ -110,6 +106,25 @@ ossl_x509revoked_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
+ossl_x509revoked_initialize_copy(VALUE self, VALUE other)
+{
+    X509_REVOKED *rev, *rev_other, *rev_new;
+
+    rb_check_frozen(self);
+    GetX509Rev(self, rev);
+    GetX509Rev(other, rev_other);
+
+    rev_new = X509_REVOKED_dup(rev_other);
+    if (!rev_new)
+	ossl_raise(eX509RevError, "X509_REVOKED_dup");
+
+    SetX509Rev(self, rev_new);
+    X509_REVOKED_free(rev);
+
+    return self;
+}
+
+static VALUE
 ossl_x509revoked_get_serial(VALUE self)
 {
     X509_REVOKED *rev;
@@ -123,11 +138,15 @@ static VALUE
 ossl_x509revoked_set_serial(VALUE self, VALUE num)
 {
     X509_REVOKED *rev;
-    ASN1_INTEGER *ai;
+    ASN1_INTEGER *asn1int;
 
     GetX509Rev(self, rev);
-    ai = X509_REVOKED_get0_serialNumber(rev);
-    X509_REVOKED_set_serialNumber(rev, num_to_asn1integer(num, ai));
+    asn1int = num_to_asn1integer(num, NULL);
+    if (!X509_REVOKED_set_serialNumber(rev, asn1int)) {
+	ASN1_INTEGER_free(asn1int);
+	ossl_raise(eX509RevError, "X509_REVOKED_set_serialNumber");
+    }
+    ASN1_INTEGER_free(asn1int);
 
     return num;
 }
@@ -136,20 +155,29 @@ static VALUE
 ossl_x509revoked_get_time(VALUE self)
 {
     X509_REVOKED *rev;
+    const ASN1_TIME *time;
 
     GetX509Rev(self, rev);
+    time = X509_REVOKED_get0_revocationDate(rev);
+    if (!time)
+	return Qnil;
 
-    return asn1time_to_time(X509_REVOKED_get0_revocationDate(rev));
+    return asn1time_to_time(time);
 }
 
 static VALUE
 ossl_x509revoked_set_time(VALUE self, VALUE time)
 {
     X509_REVOKED *rev;
+    ASN1_TIME *asn1time;
 
     GetX509Rev(self, rev);
-    if (!ossl_x509_time_adjust(X509_REVOKED_get0_revocationDate(rev), time))
-	ossl_raise(eX509RevError, NULL);
+    asn1time = ossl_x509_time_adjust(NULL, time);
+    if (!X509_REVOKED_set_revocationDate(rev, asn1time)) {
+	ASN1_TIME_free(asn1time);
+	ossl_raise(eX509RevError, "X509_REVOKED_set_revocationDate");
+    }
+    ASN1_TIME_free(asn1time);
 
     return time;
 }
@@ -199,7 +227,7 @@ ossl_x509revoked_set_extensions(VALUE self, VALUE ary)
 	X509_EXTENSION_free(ext);
     for (i=0; i<RARRAY_LEN(ary); i++) {
 	item = RARRAY_AREF(ary, i);
-	ext = DupX509ExtPtr(item);
+	ext = GetX509ExtPtr(item);
 	if(!X509_REVOKED_add_ext(rev, ext, -1)) {
 	    ossl_raise(eX509RevError, NULL);
 	}
@@ -214,25 +242,52 @@ ossl_x509revoked_add_extension(VALUE self, VALUE ext)
     X509_REVOKED *rev;
 
     GetX509Rev(self, rev);
-    if(!X509_REVOKED_add_ext(rev, DupX509ExtPtr(ext), -1)) {
+    if (!X509_REVOKED_add_ext(rev, GetX509ExtPtr(ext), -1)) {
 	ossl_raise(eX509RevError, NULL);
     }
 
     return ext;
 }
 
+static VALUE
+ossl_x509revoked_to_der(VALUE self)
+{
+    X509_REVOKED *rev;
+    VALUE str;
+    int len;
+    unsigned char *p;
+
+    GetX509Rev(self, rev);
+    len = i2d_X509_REVOKED(rev, NULL);
+    if (len <= 0)
+	ossl_raise(eX509RevError, "i2d_X509_REVOKED");
+    str = rb_str_new(NULL, len);
+    p = (unsigned char *)RSTRING_PTR(str);
+    if (i2d_X509_REVOKED(rev, &p) <= 0)
+	ossl_raise(eX509RevError, "i2d_X509_REVOKED");
+    ossl_str_adjust(str, p);
+    return str;
+}
+
 /*
  * INIT
  */
 void
 Init_ossl_x509revoked(void)
 {
+#if 0
+    mOSSL = rb_define_module("OpenSSL");
+    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
+    mX509 = rb_define_module_under(mOSSL, "X509");
+#endif
+
     eX509RevError = rb_define_class_under(mX509, "RevokedError", eOSSLError);
 
     cX509Rev = rb_define_class_under(mX509, "Revoked", rb_cObject);
 
     rb_define_alloc_func(cX509Rev, ossl_x509revoked_alloc);
     rb_define_method(cX509Rev, "initialize", ossl_x509revoked_initialize, -1);
+    rb_define_method(cX509Rev, "initialize_copy", ossl_x509revoked_initialize_copy, 1);
 
     rb_define_method(cX509Rev, "serial", ossl_x509revoked_get_serial, 0);
     rb_define_method(cX509Rev, "serial=", ossl_x509revoked_set_serial, 1);
@@ -241,4 +296,5 @@ Init_ossl_x509revoked(void)
     rb_define_method(cX509Rev, "extensions", ossl_x509revoked_get_extensions, 0);
     rb_define_method(cX509Rev, "extensions=", ossl_x509revoked_set_extensions, 1);
     rb_define_method(cX509Rev, "add_extension", ossl_x509revoked_add_extension, 1);
+    rb_define_method(cX509Rev, "to_der", ossl_x509revoked_to_der, 0);
 }
diff --git a/ext/openssl/ossl_x509store.c b/ext/openssl/ossl_x509store.c
index 26426d1832..9035a70aa9 100644
--- a/ext/openssl/ossl_x509store.c
+++ b/ext/openssl/ossl_x509store.c
@@ -23,10 +23,6 @@
 	ossl_raise(rb_eRuntimeError, "STORE wasn't initialized!"); \
     } \
 } while (0)
-#define SafeGetX509Store(obj, st) do { \
-    OSSL_Check_Kind((obj), cX509Store); \
-    GetX509Store((obj), (st)); \
-} while (0)
 
 #define NewX509StCtx(klass) \
     TypedData_Wrap_Struct((klass), &ossl_x509stctx_type, 0)
@@ -42,10 +38,65 @@
 	ossl_raise(rb_eRuntimeError, "STORE_CTX is out of scope!"); \
     } \
 } while (0)
-#define SafeGetX509StCtx(obj, storep) do { \
-    OSSL_Check_Kind((obj), cX509StoreContext); \
-    GetX509Store((obj), (ctx)); \
-} while (0)
+
+/*
+ * Verify callback stuff
+ */
+static int stctx_ex_verify_cb_idx, store_ex_verify_cb_idx;
+static VALUE ossl_x509stctx_new(X509_STORE_CTX *);
+
+struct ossl_verify_cb_args {
+    VALUE proc;
+    VALUE preverify_ok;
+    VALUE store_ctx;
+};
+
+static VALUE
+call_verify_cb_proc(struct ossl_verify_cb_args *args)
+{
+    return rb_funcall(args->proc, rb_intern("call"), 2,
+		      args->preverify_ok, args->store_ctx);
+}
+
+int
+ossl_verify_cb_call(VALUE proc, int ok, X509_STORE_CTX *ctx)
+{
+    VALUE rctx, ret;
+    struct ossl_verify_cb_args args;
+    int state;
+
+    if (NIL_P(proc))
+	return ok;
+
+    ret = Qfalse;
+    rctx = rb_protect((VALUE(*)(VALUE))ossl_x509stctx_new, (VALUE)ctx, &state);
+    if (state) {
+	rb_set_errinfo(Qnil);
+	rb_warn("StoreContext initialization failure");
+    }
+    else {
+	args.proc = proc;
+	args.preverify_ok = ok ? Qtrue : Qfalse;
+	args.store_ctx = rctx;
+	ret = rb_protect((VALUE(*)(VALUE))call_verify_cb_proc, (VALUE)&args, &state);
+	if (state) {
+	    rb_set_errinfo(Qnil);
+	    rb_warn("exception in verify_callback is ignored");
+	}
+	RTYPEDDATA_DATA(rctx) = NULL;
+    }
+    if (ret == Qtrue) {
+	X509_STORE_CTX_set_error(ctx, X509_V_OK);
+	ok = 1;
+    }
+    else {
+	if (X509_STORE_CTX_get_error(ctx) == X509_V_OK)
+	    X509_STORE_CTX_set_error(ctx, X509_V_ERR_CERT_REJECTED);
+	ok = 0;
+    }
+
+    return ok;
+}
 
 /*
  * Classes
@@ -55,6 +106,13 @@ VALUE cX509StoreContext;
 VALUE eX509StoreError;
 
 static void
+ossl_x509store_mark(void *ptr)
+{
+    X509_STORE *store = ptr;
+    rb_gc_mark((VALUE)X509_STORE_get_ex_data(store, store_ex_verify_cb_idx));
+}
+
+static void
 ossl_x509store_free(void *ptr)
 {
     X509_STORE_free(ptr);
@@ -63,7 +121,7 @@ ossl_x509store_free(void *ptr)
 static const rb_data_type_t ossl_x509store_type = {
     "OpenSSL/X509/STORE",
     {
-	0, ossl_x509store_free,
+        ossl_x509store_mark, ossl_x509store_free,
     },
     0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
 };
@@ -71,41 +129,34 @@ static const rb_data_type_t ossl_x509store_type = {
 /*
  * Public functions
  */
-VALUE
-ossl_x509store_new(X509_STORE *store)
-{
-    VALUE obj;
-
-    obj = NewX509Store(cX509Store);
-    SetX509Store(obj, store);
-
-    return obj;
-}
-
 X509_STORE *
 GetX509StorePtr(VALUE obj)
 {
     X509_STORE *store;
 
-    SafeGetX509Store(obj, store);
+    GetX509Store(obj, store);
 
     return store;
 }
 
-X509_STORE *
-DupX509StorePtr(VALUE obj)
+/*
+ * Private functions
+ */
+static int
+x509store_verify_cb(int ok, X509_STORE_CTX *ctx)
 {
-    X509_STORE *store;
+    VALUE proc;
 
-    SafeGetX509Store(obj, store);
-    X509_STORE_up_ref(store);
+    proc = (VALUE)X509_STORE_CTX_get_ex_data(ctx, stctx_ex_verify_cb_idx);
+    if (!proc)
+	proc = (VALUE)X509_STORE_get_ex_data(X509_STORE_CTX_get0_store(ctx),
+					     store_ex_verify_cb_idx);
+    if (!proc)
+	return ok;
 
-    return store;
+    return ossl_verify_cb_call(proc, ok, ctx);
 }
 
-/*
- * Private functions
- */
 static VALUE
 ossl_x509store_alloc(VALUE klass)
 {
@@ -130,7 +181,7 @@ ossl_x509store_set_vfy_cb(VALUE self, VALUE cb)
     X509_STORE *store;
 
     GetX509Store(self, store);
-    X509_STORE_set_ex_data(store, ossl_store_ex_verify_cb_idx, (void *)cb);
+    X509_STORE_set_ex_data(store, store_ex_verify_cb_idx, (void *)cb);
     rb_iv_set(self, "@verify_callback", cb);
 
     return cb;
@@ -141,6 +192,7 @@ ossl_x509store_set_vfy_cb(VALUE self, VALUE cb)
  * call-seq:
  *    X509::Store.new => store
  *
+ * Creates a new X509::Store.
  */
 static VALUE
 ossl_x509store_initialize(int argc, VALUE *argv, VALUE self)
@@ -153,7 +205,7 @@ ossl_x509store_initialize(int argc, VALUE *argv, VALUE self)
     /* [Bug #405] [Bug #1678] [Bug #3000]; already fixed? */
     store->ex_data.sk = NULL;
 #endif
-    X509_STORE_set_verify_cb(store, ossl_verify_cb);
+    X509_STORE_set_verify_cb(store, x509store_verify_cb);
     ossl_x509store_set_vfy_cb(self, Qnil);
 
     /* last verification status */
@@ -165,6 +217,13 @@ ossl_x509store_initialize(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
+/*
+ * call-seq:
+ *   store.flags = flags
+ *
+ * Sets _flags_ to the Store. _flags_ consists of zero or more of the constants
+ * defined in with name V_FLAG_* or'ed together.
+ */
 static VALUE
 ossl_x509store_set_flags(VALUE self, VALUE flags)
 {
@@ -177,6 +236,24 @@ ossl_x509store_set_flags(VALUE self, VALUE flags)
     return flags;
 }
 
+/*
+ * call-seq:
+ *   store.purpose = purpose
+ *
+ * Sets the store's purpose to _purpose_. If specified, the verifications on
+ * the store will check every untrusted certificate's extensions are consistent
+ * with the purpose. The purpose is specified by constants:
+ *
+ * * X509::PURPOSE_SSL_CLIENT
+ * * X509::PURPOSE_SSL_SERVER
+ * * X509::PURPOSE_NS_SSL_SERVER
+ * * X509::PURPOSE_SMIME_SIGN
+ * * X509::PURPOSE_SMIME_ENCRYPT
+ * * X509::PURPOSE_CRL_SIGN
+ * * X509::PURPOSE_ANY
+ * * X509::PURPOSE_OCSP_HELPER
+ * * X509::PURPOSE_TIMESTAMP_SIGN
+ */
 static VALUE
 ossl_x509store_set_purpose(VALUE self, VALUE purpose)
 {
@@ -189,6 +266,10 @@ ossl_x509store_set_purpose(VALUE self, VALUE purpose)
     return purpose;
 }
 
+/*
+ * call-seq:
+ *   store.trust = trust
+ */
 static VALUE
 ossl_x509store_set_trust(VALUE self, VALUE trust)
 {
@@ -201,6 +282,12 @@ ossl_x509store_set_trust(VALUE self, VALUE trust)
     return trust;
 }
 
+/*
+ * call-seq:
+ *   store.time = time
+ *
+ * Sets the time to be used in verifications.
+ */
 static VALUE
 ossl_x509store_set_time(VALUE self, VALUE time)
 {
@@ -210,13 +297,12 @@ ossl_x509store_set_time(VALUE self, VALUE time)
 
 /*
  * call-seq:
- *   store.add_file(file) -> store
- *
+ *   store.add_file(file) -> self
  *
- * Adds the certificates in +file+ to the certificate store.  The +file+ can
- * contain multiple PEM-encoded certificates.
+ * Adds the certificates in _file_ to the certificate store. _file_ is the path
+ * to the file, and the file contains one or more certificates in PEM format
+ * concatenated together.
  */
-
 static VALUE
 ossl_x509store_add_file(VALUE self, VALUE file)
 {
@@ -225,7 +311,6 @@ ossl_x509store_add_file(VALUE self, VALUE file)
     char *path = NULL;
 
     if(file != Qnil){
-	rb_check_safe_obj(file);
 	path = StringValueCStr(file);
     }
     GetX509Store(self, store);
@@ -234,10 +319,25 @@ ossl_x509store_add_file(VALUE self, VALUE file)
     if(X509_LOOKUP_load_file(lookup, path, X509_FILETYPE_PEM) != 1){
         ossl_raise(eX509StoreError, NULL);
     }
+#if OPENSSL_VERSION_NUMBER < 0x10101000 || defined(LIBRESSL_VERSION_NUMBER)
+    /*
+     * X509_load_cert_crl_file() which is called from X509_LOOKUP_load_file()
+     * did not check the return value of X509_STORE_add_{cert,crl}(), leaking
+     * "cert already in hash table" errors on the error queue, if duplicate
+     * certificates are found. This will be fixed by OpenSSL 1.1.1.
+     */
+    ossl_clear_error();
+#endif
 
     return self;
 }
 
+/*
+ * call-seq:
+ *   store.add_path(path) -> self
+ *
+ * Adds _path_ as the hash dir to be looked up by the store.
+ */
 static VALUE
 ossl_x509store_add_path(VALUE self, VALUE dir)
 {
@@ -246,7 +346,6 @@ ossl_x509store_add_path(VALUE self, VALUE dir)
     char *path = NULL;
 
     if(dir != Qnil){
-	rb_check_safe_obj(dir);
 	path = StringValueCStr(dir);
     }
     GetX509Store(self, store);
@@ -263,11 +362,12 @@ ossl_x509store_add_path(VALUE self, VALUE dir)
  * call-seq:
  *   store.set_default_paths
  *
- * Adds the default certificates to the certificate store.  These certificates
- * are loaded from the default configuration directory which can usually be
+ * Configures _store_ to look up CA certificates from the system default
+ * certificate store as needed basis. The location of the store can usually be
  * determined by:
  *
- *   File.dirname OpenSSL::Config::DEFAULT_CONFIG_FILE
+ * * OpenSSL::X509::DEFAULT_CERT_FILE
+ * * OpenSSL::X509::DEFAULT_CERT_DIR
  */
 static VALUE
 ossl_x509store_set_default_paths(VALUE self)
@@ -286,9 +386,8 @@ ossl_x509store_set_default_paths(VALUE self)
  * call-seq:
  *   store.add_cert(cert)
  *
- * Adds the OpenSSL::X509::Certificate +cert+ to the certificate store.
+ * Adds the OpenSSL::X509::Certificate _cert_ to the certificate store.
  */
-
 static VALUE
 ossl_x509store_add_cert(VALUE self, VALUE arg)
 {
@@ -304,6 +403,12 @@ ossl_x509store_add_cert(VALUE self, VALUE arg)
     return self;
 }
 
+/*
+ * call-seq:
+ *   store.add_crl(crl) -> self
+ *
+ * Adds the OpenSSL::X509::CRL _crl_ to the store.
+ */
 static VALUE
 ossl_x509store_add_crl(VALUE self, VALUE arg)
 {
@@ -323,6 +428,21 @@ static VALUE ossl_x509stctx_get_err(VALUE);
 static VALUE ossl_x509stctx_get_err_string(VALUE);
 static VALUE ossl_x509stctx_get_chain(VALUE);
 
+/*
+ * call-seq:
+ *   store.verify(cert, chain = nil) -> true | false
+ *
+ * Performs a certificate verification on the OpenSSL::X509::Certificate _cert_.
+ *
+ * _chain_ can be an array of OpenSSL::X509::Certificate that is used to
+ * construct the certificate chain.
+ *
+ * If a block is given, it overrides the callback set by #verify_callback=.
+ *
+ * After finishing the verification, the error information can be retrieved by
+ * #error, #error_string, and the resulting complete certificate chain can be
+ * retrieved by #chain.
+ */
 static VALUE
 ossl_x509store_verify(int argc, VALUE *argv, VALUE self)
 {
@@ -344,43 +464,15 @@ ossl_x509store_verify(int argc, VALUE *argv, VALUE self)
 }
 
 /*
- * Public Functions
+ * Private functions
  */
-static void ossl_x509stctx_free(void*);
-
-
-static const rb_data_type_t ossl_x509stctx_type = {
-    "OpenSSL/X509/STORE_CTX",
-    {
-	0, ossl_x509stctx_free,
-    },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
-
-VALUE
-ossl_x509stctx_new(X509_STORE_CTX *ctx)
-{
-    VALUE obj;
-
-    obj = NewX509StCtx(cX509StoreContext);
-    SetX509StCtx(obj, ctx);
-
-    return obj;
-}
-
-VALUE
-ossl_x509stctx_clear_ptr(VALUE obj)
+static void
+ossl_x509stctx_mark(void *ptr)
 {
-    OSSL_Check_Kind(obj, cX509StoreContext);
-    RDATA(obj)->data = NULL;
-
-    return obj;
+    X509_STORE_CTX *ctx = ptr;
+    rb_gc_mark((VALUE)X509_STORE_CTX_get_ex_data(ctx, stctx_ex_verify_cb_idx));
 }
 
-/*
- * Private functions
- */
 static void
 ossl_x509stctx_free(void *ptr)
 {
@@ -392,6 +484,14 @@ ossl_x509stctx_free(void *ptr)
     X509_STORE_CTX_free(ctx);
 }
 
+static const rb_data_type_t ossl_x509stctx_type = {
+    "OpenSSL/X509/STORE_CTX",
+    {
+        ossl_x509stctx_mark, ossl_x509stctx_free,
+    },
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 static VALUE
 ossl_x509stctx_alloc(VALUE klass)
 {
@@ -407,11 +507,28 @@ ossl_x509stctx_alloc(VALUE klass)
     return obj;
 }
 
+static VALUE
+ossl_x509stctx_new(X509_STORE_CTX *ctx)
+{
+    VALUE obj;
+
+    obj = NewX509StCtx(cX509StoreContext);
+    SetX509StCtx(obj, ctx);
+
+    return obj;
+}
+
 static VALUE ossl_x509stctx_set_flags(VALUE, VALUE);
 static VALUE ossl_x509stctx_set_purpose(VALUE, VALUE);
 static VALUE ossl_x509stctx_set_trust(VALUE, VALUE);
 static VALUE ossl_x509stctx_set_time(VALUE, VALUE);
 
+/*
+ * call-seq:
+ *   StoreContext.new(store, cert = nil, untrusted = nil)
+ *
+ * Sets up a StoreContext for a verification of the X.509 certificate _cert_.
+ */
 static VALUE
 ossl_x509stctx_initialize(int argc, VALUE *argv, VALUE self)
 {
@@ -420,15 +537,24 @@ ossl_x509stctx_initialize(int argc, VALUE *argv, VALUE self)
     X509_STORE *x509st;
     X509 *x509 = NULL;
     STACK_OF(X509) *x509s = NULL;
+    int state;
 
     rb_scan_args(argc, argv, "12", &store, &cert, &chain);
     GetX509StCtx(self, ctx);
-    SafeGetX509Store(store, x509st);
-    if(!NIL_P(cert)) x509 = DupX509CertPtr(cert); /* NEED TO DUP */
-    if(!NIL_P(chain)) x509s = ossl_x509_ary2sk(chain);
-    if(X509_STORE_CTX_init(ctx, x509st, x509, x509s) != 1){
+    GetX509Store(store, x509st);
+    if (!NIL_P(cert))
+        x509 = DupX509CertPtr(cert); /* NEED TO DUP */
+    if (!NIL_P(chain)) {
+        x509s = ossl_protect_x509_ary2sk(chain, &state);
+        if (state) {
+            X509_free(x509);
+            rb_jump_tag(state);
+        }
+    }
+    if (X509_STORE_CTX_init(ctx, x509st, x509, x509s) != 1){
+        X509_free(x509);
         sk_X509_pop_free(x509s, X509_free);
-        ossl_raise(eX509StoreError, NULL);
+        ossl_raise(eX509StoreError, "X509_STORE_CTX_init");
     }
     if (!NIL_P(t = rb_iv_get(store, "@time")))
 	ossl_x509stctx_set_time(self, t);
@@ -438,13 +564,17 @@ ossl_x509stctx_initialize(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
+/*
+ * call-seq:
+ *   stctx.verify -> true | false
+ */
 static VALUE
 ossl_x509stctx_verify(VALUE self)
 {
     X509_STORE_CTX *ctx;
 
     GetX509StCtx(self, ctx);
-    X509_STORE_CTX_set_ex_data(ctx, ossl_store_ctx_ex_verify_cb_idx,
+    X509_STORE_CTX_set_ex_data(ctx, stctx_ex_verify_cb_idx,
 			       (void *)rb_iv_get(self, "@verify_callback"));
 
     switch (X509_verify_cert(ctx)) {
@@ -458,6 +588,10 @@ ossl_x509stctx_verify(VALUE self)
     }
 }
 
+/*
+ * call-seq:
+ *   stctx.chain -> Array of X509::Certificate
+ */
 static VALUE
 ossl_x509stctx_get_chain(VALUE self)
 {
@@ -484,6 +618,10 @@ ossl_x509stctx_get_chain(VALUE self)
     return ary;
 }
 
+/*
+ * call-seq:
+ *   stctx.error -> Integer
+ */
 static VALUE
 ossl_x509stctx_get_err(VALUE self)
 {
@@ -491,9 +629,13 @@ ossl_x509stctx_get_err(VALUE self)
 
     GetX509StCtx(self, ctx);
 
-    return INT2FIX(X509_STORE_CTX_get_error(ctx));
+    return INT2NUM(X509_STORE_CTX_get_error(ctx));
 }
 
+/*
+ * call-seq:
+ *   stctx.error = error_code
+ */
 static VALUE
 ossl_x509stctx_set_error(VALUE self, VALUE err)
 {
@@ -505,6 +647,12 @@ ossl_x509stctx_set_error(VALUE self, VALUE err)
     return err;
 }
 
+/*
+ * call-seq:
+ *   stctx.error_string -> String
+ *
+ * Returns the error string corresponding to the error code retrieved by #error.
+ */
 static VALUE
 ossl_x509stctx_get_err_string(VALUE self)
 {
@@ -517,6 +665,10 @@ ossl_x509stctx_get_err_string(VALUE self)
     return rb_str_new2(X509_verify_cert_error_string(err));
 }
 
+/*
+ * call-seq:
+ *   stctx.error_depth -> Integer
+ */
 static VALUE
 ossl_x509stctx_get_err_depth(VALUE self)
 {
@@ -524,9 +676,13 @@ ossl_x509stctx_get_err_depth(VALUE self)
 
     GetX509StCtx(self, ctx);
 
-    return INT2FIX(X509_STORE_CTX_get_error_depth(ctx));
+    return INT2NUM(X509_STORE_CTX_get_error_depth(ctx));
 }
 
+/*
+ * call-seq:
+ *   stctx.current_cert -> X509::Certificate
+ */
 static VALUE
 ossl_x509stctx_get_curr_cert(VALUE self)
 {
@@ -537,6 +693,10 @@ ossl_x509stctx_get_curr_cert(VALUE self)
     return ossl_x509_new(X509_STORE_CTX_get_current_cert(ctx));
 }
 
+/*
+ * call-seq:
+ *   stctx.current_crl -> X509::CRL
+ */
 static VALUE
 ossl_x509stctx_get_curr_crl(VALUE self)
 {
@@ -551,6 +711,12 @@ ossl_x509stctx_get_curr_crl(VALUE self)
     return ossl_x509crl_new(crl);
 }
 
+/*
+ * call-seq:
+ *   stctx.flags = flags
+ *
+ * Sets the verification flags to the context. See Store#flags=.
+ */
 static VALUE
 ossl_x509stctx_set_flags(VALUE self, VALUE flags)
 {
@@ -563,6 +729,12 @@ ossl_x509stctx_set_flags(VALUE self, VALUE flags)
     return flags;
 }
 
+/*
+ * call-seq:
+ *   stctx.purpose = purpose
+ *
+ * Sets the purpose of the context. See Store#purpose=.
+ */
 static VALUE
 ossl_x509stctx_set_purpose(VALUE self, VALUE purpose)
 {
@@ -575,6 +747,10 @@ ossl_x509stctx_set_purpose(VALUE self, VALUE purpose)
     return purpose;
 }
 
+/*
+ * call-seq:
+ *   stctx.trust = trust
+ */
 static VALUE
 ossl_x509stctx_set_trust(VALUE self, VALUE trust)
 {
@@ -589,7 +765,9 @@ ossl_x509stctx_set_trust(VALUE self, VALUE trust)
 
 /*
  * call-seq:
- *    storectx.time = time => time
+ *   stctx.time = time
+ *
+ * Sets the time used in the verification. If not set, the current time is used.
  */
 static VALUE
 ossl_x509stctx_set_time(VALUE self, VALUE time)
@@ -610,13 +788,21 @@ ossl_x509stctx_set_time(VALUE self, VALUE time)
 void
 Init_ossl_x509store(void)
 {
-    VALUE x509stctx;
-
+#undef rb_intern
 #if 0
-    mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
+    mOSSL = rb_define_module("OpenSSL");
+    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
     mX509 = rb_define_module_under(mOSSL, "X509");
 #endif
 
+    /* Register ext_data slot for verify callback Proc */
+    stctx_ex_verify_cb_idx = X509_STORE_CTX_get_ex_new_index(0, (void *)"stctx_ex_verify_cb_idx", 0, 0, 0);
+    if (stctx_ex_verify_cb_idx < 0)
+	ossl_raise(eOSSLError, "X509_STORE_CTX_get_ex_new_index");
+    store_ex_verify_cb_idx = X509_STORE_get_ex_new_index(0, (void *)"store_ex_verify_cb_idx", 0, 0, 0);
+    if (store_ex_verify_cb_idx < 0)
+	ossl_raise(eOSSLError, "X509_STORE_get_ex_new_index");
+
     eX509StoreError = rb_define_class_under(mX509, "StoreError", eOSSLError);
 
     /* Document-class: OpenSSL::X509::Store
@@ -631,11 +817,11 @@ Init_ossl_x509store(void)
      *
      * This will use your system's built-in certificates.
      *
-     * If your system does not have a default set of certificates you can
-     * obtain a set from Mozilla here: http://curl.haxx.se/docs/caextract.html
-     * (Note that this set does not have an HTTPS download option so you may
-     * wish to use the firefox-db2pem.sh script to extract the certificates
-     * from a local install to avoid man-in-the-middle attacks.)
+     * If your system does not have a default set of certificates you can obtain
+     * a set extracted from Mozilla CA certificate store by cURL maintainers
+     * here: https://curl.haxx.se/docs/caextract.html (You may wish to use the
+     * firefox-db2pem.sh script to extract the certificates from a local install
+     * to avoid man-in-the-middle attacks.)
      *
      * After downloading or generating a cacert.pem from the above link you
      * can create a certificate store from the pem file like this:
@@ -646,6 +832,7 @@ Init_ossl_x509store(void)
      * The certificate store can be used with an SSLSocket like this:
      *
      *   ssl_context = OpenSSL::SSL::SSLContext.new
+     *   ssl_context.verify_mode = OpenSSL::SSL::VERIFY_PEER
      *   ssl_context.cert_store = cert_store
      *
      *   tcp_socket = TCPSocket.open 'example.com', 443
@@ -654,12 +841,30 @@ Init_ossl_x509store(void)
      */
 
     cX509Store = rb_define_class_under(mX509, "Store", rb_cObject);
+    /*
+     * The callback for additional certificate verification. It is invoked for
+     * each untrusted certificate in the chain.
+     *
+     * The callback is invoked with two values, a boolean that indicates if the
+     * pre-verification by OpenSSL has succeeded or not, and the StoreContext in
+     * use. The callback must return either true or false.
+     */
     rb_attr(cX509Store, rb_intern("verify_callback"), 1, 0, Qfalse);
+    /*
+     * The error code set by the last call of #verify.
+     */
     rb_attr(cX509Store, rb_intern("error"), 1, 0, Qfalse);
+    /*
+     * The description for the error code set by the last call of #verify.
+     */
     rb_attr(cX509Store, rb_intern("error_string"), 1, 0, Qfalse);
+    /*
+     * The certificate chain constructed by the last call of #verify.
+     */
     rb_attr(cX509Store, rb_intern("chain"), 1, 0, Qfalse);
     rb_define_alloc_func(cX509Store, ossl_x509store_alloc);
     rb_define_method(cX509Store, "initialize",   ossl_x509store_initialize, -1);
+    rb_undef_method(cX509Store, "initialize_copy");
     rb_define_method(cX509Store, "verify_callback=", ossl_x509store_set_vfy_cb, 1);
     rb_define_method(cX509Store, "flags=",       ossl_x509store_set_flags, 1);
     rb_define_method(cX509Store, "purpose=",     ossl_x509store_set_purpose, 1);
@@ -672,21 +877,26 @@ Init_ossl_x509store(void)
     rb_define_method(cX509Store, "add_crl",      ossl_x509store_add_crl, 1);
     rb_define_method(cX509Store, "verify",       ossl_x509store_verify, -1);
 
-    cX509StoreContext = rb_define_class_under(mX509,"StoreContext",rb_cObject);
-    x509stctx = cX509StoreContext;
+    /*
+     * Document-class: OpenSSL::X509::StoreContext
+     *
+     * A StoreContext is used while validating a single certificate and holds
+     * the status involved.
+     */
+    cX509StoreContext = rb_define_class_under(mX509,"StoreContext", rb_cObject);
     rb_define_alloc_func(cX509StoreContext, ossl_x509stctx_alloc);
-    rb_define_method(x509stctx,"initialize",  ossl_x509stctx_initialize, -1);
-    rb_define_method(x509stctx,"verify",      ossl_x509stctx_verify, 0);
-    rb_define_method(x509stctx,"chain",       ossl_x509stctx_get_chain,0);
-    rb_define_method(x509stctx,"error",       ossl_x509stctx_get_err, 0);
-    rb_define_method(x509stctx,"error=",      ossl_x509stctx_set_error, 1);
-    rb_define_method(x509stctx,"error_string",ossl_x509stctx_get_err_string,0);
-    rb_define_method(x509stctx,"error_depth", ossl_x509stctx_get_err_depth, 0);
-    rb_define_method(x509stctx,"current_cert",ossl_x509stctx_get_curr_cert, 0);
-    rb_define_method(x509stctx,"current_crl", ossl_x509stctx_get_curr_crl, 0);
-    rb_define_method(x509stctx,"flags=",      ossl_x509stctx_set_flags, 1);
-    rb_define_method(x509stctx,"purpose=",    ossl_x509stctx_set_purpose, 1);
-    rb_define_method(x509stctx,"trust=",      ossl_x509stctx_set_trust, 1);
-    rb_define_method(x509stctx,"time=",       ossl_x509stctx_set_time, 1);
-
+    rb_define_method(cX509StoreContext, "initialize", ossl_x509stctx_initialize, -1);
+    rb_undef_method(cX509StoreContext, "initialize_copy");
+    rb_define_method(cX509StoreContext, "verify", ossl_x509stctx_verify, 0);
+    rb_define_method(cX509StoreContext, "chain", ossl_x509stctx_get_chain,0);
+    rb_define_method(cX509StoreContext, "error", ossl_x509stctx_get_err, 0);
+    rb_define_method(cX509StoreContext, "error=", ossl_x509stctx_set_error, 1);
+    rb_define_method(cX509StoreContext, "error_string", ossl_x509stctx_get_err_string,0);
+    rb_define_method(cX509StoreContext, "error_depth", ossl_x509stctx_get_err_depth, 0);
+    rb_define_method(cX509StoreContext, "current_cert", ossl_x509stctx_get_curr_cert, 0);
+    rb_define_method(cX509StoreContext, "current_crl", ossl_x509stctx_get_curr_crl, 0);
+    rb_define_method(cX509StoreContext, "flags=", ossl_x509stctx_set_flags, 1);
+    rb_define_method(cX509StoreContext, "purpose=", ossl_x509stctx_set_purpose, 1);
+    rb_define_method(cX509StoreContext, "trust=", ossl_x509stctx_set_trust, 1);
+    rb_define_method(cX509StoreContext, "time=", ossl_x509stctx_set_time, 1);
 }
diff --git a/ext/openssl/ruby_missing.h b/ext/openssl/ruby_missing.h
index f076b1757d..069acc8b14 100644
--- a/ext/openssl/ruby_missing.h
+++ b/ext/openssl/ruby_missing.h
@@ -10,23 +10,15 @@
 #if !defined(_OSSL_RUBY_MISSING_H_)
 #define _OSSL_RUBY_MISSING_H_
 
-#define rb_define_copy_func(klass, func) \
-	rb_define_method((klass), "initialize_copy", (func), 1)
-
-
-#ifndef GetReadFile
-#define FPTR_TO_FD(fptr) ((fptr)->fd)
-#else
-#define FPTR_TO_FD(fptr) (fileno(GetReadFile(fptr)))
-#endif
-
-#ifndef HAVE_RB_IO_T
-#define rb_io_t OpenFile
+/* Ruby 2.4 */
+#ifndef RB_INTEGER_TYPE_P
+# define RB_INTEGER_TYPE_P(obj) (RB_FIXNUM_P(obj) || RB_TYPE_P(obj, T_BIGNUM))
 #endif
 
-#ifndef RB_INTEGER_TYPE_P
-/* for Ruby 2.3 compatibility */
-#define RB_INTEGER_TYPE_P(obj) (RB_FIXNUM_P(obj) || RB_TYPE_P(obj, T_BIGNUM))
+/* Ruby 2.5 */
+#ifndef ST2FIX
+# define RB_ST2FIX(h) LONG2FIX((long)(h))
+# define ST2FIX(h) RB_ST2FIX(h)
 #endif
 
 #endif /* _OSSL_RUBY_MISSING_H_ */
diff --git a/ext/pathname/depend b/ext/pathname/depend
index 79b6c53f50..9df2ba8e18 100644
--- a/ext/pathname/depend
+++ b/ext/pathname/depend
@@ -1,3 +1,166 @@
-$(OBJS): $(HDRS) $(ruby_headers) \
-  $(hdrdir)/ruby/encoding.h \
-  $(hdrdir)/ruby/oniguruma.h
+# AUTOGENERATED DEPENDENCIES START
+pathname.o: $(RUBY_EXTCONF_H)
+pathname.o: $(arch_hdrdir)/ruby/config.h
+pathname.o: $(hdrdir)/ruby.h
+pathname.o: $(hdrdir)/ruby/internal/anyargs.h
+pathname.o: $(hdrdir)/ruby/internal/arithmetic.h
+pathname.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+pathname.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+pathname.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+pathname.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+pathname.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+pathname.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+pathname.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+pathname.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+pathname.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+pathname.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+pathname.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+pathname.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+pathname.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+pathname.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+pathname.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+pathname.o: $(hdrdir)/ruby/internal/assume.h
+pathname.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+pathname.o: $(hdrdir)/ruby/internal/attr/artificial.h
+pathname.o: $(hdrdir)/ruby/internal/attr/cold.h
+pathname.o: $(hdrdir)/ruby/internal/attr/const.h
+pathname.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+pathname.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+pathname.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+pathname.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+pathname.o: $(hdrdir)/ruby/internal/attr/error.h
+pathname.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+pathname.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+pathname.o: $(hdrdir)/ruby/internal/attr/format.h
+pathname.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+pathname.o: $(hdrdir)/ruby/internal/attr/noalias.h
+pathname.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+pathname.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+pathname.o: $(hdrdir)/ruby/internal/attr/noinline.h
+pathname.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+pathname.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+pathname.o: $(hdrdir)/ruby/internal/attr/pure.h
+pathname.o: $(hdrdir)/ruby/internal/attr/restrict.h
+pathname.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+pathname.o: $(hdrdir)/ruby/internal/attr/warning.h
+pathname.o: $(hdrdir)/ruby/internal/attr/weakref.h
+pathname.o: $(hdrdir)/ruby/internal/cast.h
+pathname.o: $(hdrdir)/ruby/internal/compiler_is.h
+pathname.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+pathname.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+pathname.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+pathname.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+pathname.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+pathname.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+pathname.o: $(hdrdir)/ruby/internal/compiler_since.h
+pathname.o: $(hdrdir)/ruby/internal/config.h
+pathname.o: $(hdrdir)/ruby/internal/constant_p.h
+pathname.o: $(hdrdir)/ruby/internal/core.h
+pathname.o: $(hdrdir)/ruby/internal/core/rarray.h
+pathname.o: $(hdrdir)/ruby/internal/core/rbasic.h
+pathname.o: $(hdrdir)/ruby/internal/core/rbignum.h
+pathname.o: $(hdrdir)/ruby/internal/core/rclass.h
+pathname.o: $(hdrdir)/ruby/internal/core/rdata.h
+pathname.o: $(hdrdir)/ruby/internal/core/rfile.h
+pathname.o: $(hdrdir)/ruby/internal/core/rhash.h
+pathname.o: $(hdrdir)/ruby/internal/core/robject.h
+pathname.o: $(hdrdir)/ruby/internal/core/rregexp.h
+pathname.o: $(hdrdir)/ruby/internal/core/rstring.h
+pathname.o: $(hdrdir)/ruby/internal/core/rstruct.h
+pathname.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+pathname.o: $(hdrdir)/ruby/internal/ctype.h
+pathname.o: $(hdrdir)/ruby/internal/dllexport.h
+pathname.o: $(hdrdir)/ruby/internal/dosish.h
+pathname.o: $(hdrdir)/ruby/internal/error.h
+pathname.o: $(hdrdir)/ruby/internal/eval.h
+pathname.o: $(hdrdir)/ruby/internal/event.h
+pathname.o: $(hdrdir)/ruby/internal/fl_type.h
+pathname.o: $(hdrdir)/ruby/internal/gc.h
+pathname.o: $(hdrdir)/ruby/internal/glob.h
+pathname.o: $(hdrdir)/ruby/internal/globals.h
+pathname.o: $(hdrdir)/ruby/internal/has/attribute.h
+pathname.o: $(hdrdir)/ruby/internal/has/builtin.h
+pathname.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+pathname.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+pathname.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+pathname.o: $(hdrdir)/ruby/internal/has/extension.h
+pathname.o: $(hdrdir)/ruby/internal/has/feature.h
+pathname.o: $(hdrdir)/ruby/internal/has/warning.h
+pathname.o: $(hdrdir)/ruby/internal/intern/array.h
+pathname.o: $(hdrdir)/ruby/internal/intern/bignum.h
+pathname.o: $(hdrdir)/ruby/internal/intern/class.h
+pathname.o: $(hdrdir)/ruby/internal/intern/compar.h
+pathname.o: $(hdrdir)/ruby/internal/intern/complex.h
+pathname.o: $(hdrdir)/ruby/internal/intern/cont.h
+pathname.o: $(hdrdir)/ruby/internal/intern/dir.h
+pathname.o: $(hdrdir)/ruby/internal/intern/enum.h
+pathname.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+pathname.o: $(hdrdir)/ruby/internal/intern/error.h
+pathname.o: $(hdrdir)/ruby/internal/intern/eval.h
+pathname.o: $(hdrdir)/ruby/internal/intern/file.h
+pathname.o: $(hdrdir)/ruby/internal/intern/gc.h
+pathname.o: $(hdrdir)/ruby/internal/intern/hash.h
+pathname.o: $(hdrdir)/ruby/internal/intern/io.h
+pathname.o: $(hdrdir)/ruby/internal/intern/load.h
+pathname.o: $(hdrdir)/ruby/internal/intern/marshal.h
+pathname.o: $(hdrdir)/ruby/internal/intern/numeric.h
+pathname.o: $(hdrdir)/ruby/internal/intern/object.h
+pathname.o: $(hdrdir)/ruby/internal/intern/parse.h
+pathname.o: $(hdrdir)/ruby/internal/intern/proc.h
+pathname.o: $(hdrdir)/ruby/internal/intern/process.h
+pathname.o: $(hdrdir)/ruby/internal/intern/random.h
+pathname.o: $(hdrdir)/ruby/internal/intern/range.h
+pathname.o: $(hdrdir)/ruby/internal/intern/rational.h
+pathname.o: $(hdrdir)/ruby/internal/intern/re.h
+pathname.o: $(hdrdir)/ruby/internal/intern/ruby.h
+pathname.o: $(hdrdir)/ruby/internal/intern/select.h
+pathname.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+pathname.o: $(hdrdir)/ruby/internal/intern/signal.h
+pathname.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+pathname.o: $(hdrdir)/ruby/internal/intern/string.h
+pathname.o: $(hdrdir)/ruby/internal/intern/struct.h
+pathname.o: $(hdrdir)/ruby/internal/intern/thread.h
+pathname.o: $(hdrdir)/ruby/internal/intern/time.h
+pathname.o: $(hdrdir)/ruby/internal/intern/variable.h
+pathname.o: $(hdrdir)/ruby/internal/intern/vm.h
+pathname.o: $(hdrdir)/ruby/internal/interpreter.h
+pathname.o: $(hdrdir)/ruby/internal/iterator.h
+pathname.o: $(hdrdir)/ruby/internal/memory.h
+pathname.o: $(hdrdir)/ruby/internal/method.h
+pathname.o: $(hdrdir)/ruby/internal/module.h
+pathname.o: $(hdrdir)/ruby/internal/newobj.h
+pathname.o: $(hdrdir)/ruby/internal/rgengc.h
+pathname.o: $(hdrdir)/ruby/internal/scan_args.h
+pathname.o: $(hdrdir)/ruby/internal/special_consts.h
+pathname.o: $(hdrdir)/ruby/internal/static_assert.h
+pathname.o: $(hdrdir)/ruby/internal/stdalign.h
+pathname.o: $(hdrdir)/ruby/internal/stdbool.h
+pathname.o: $(hdrdir)/ruby/internal/symbol.h
+pathname.o: $(hdrdir)/ruby/internal/token_paste.h
+pathname.o: $(hdrdir)/ruby/internal/value.h
+pathname.o: $(hdrdir)/ruby/internal/value_type.h
+pathname.o: $(hdrdir)/ruby/internal/variable.h
+pathname.o: $(hdrdir)/ruby/internal/warning_push.h
+pathname.o: $(hdrdir)/ruby/internal/xmalloc.h
+pathname.o: $(hdrdir)/ruby/assert.h
+pathname.o: $(hdrdir)/ruby/backward.h
+pathname.o: $(hdrdir)/ruby/backward/2/assume.h
+pathname.o: $(hdrdir)/ruby/backward/2/attributes.h
+pathname.o: $(hdrdir)/ruby/backward/2/bool.h
+pathname.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+pathname.o: $(hdrdir)/ruby/backward/2/inttypes.h
+pathname.o: $(hdrdir)/ruby/backward/2/limits.h
+pathname.o: $(hdrdir)/ruby/backward/2/long_long.h
+pathname.o: $(hdrdir)/ruby/backward/2/stdalign.h
+pathname.o: $(hdrdir)/ruby/backward/2/stdarg.h
+pathname.o: $(hdrdir)/ruby/defines.h
+pathname.o: $(hdrdir)/ruby/encoding.h
+pathname.o: $(hdrdir)/ruby/intern.h
+pathname.o: $(hdrdir)/ruby/missing.h
+pathname.o: $(hdrdir)/ruby/onigmo.h
+pathname.o: $(hdrdir)/ruby/oniguruma.h
+pathname.o: $(hdrdir)/ruby/ruby.h
+pathname.o: $(hdrdir)/ruby/st.h
+pathname.o: $(hdrdir)/ruby/subst.h
+pathname.o: pathname.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/pathname/extconf.rb b/ext/pathname/extconf.rb
index c9133bc153..84e68277aa 100644
--- a/ext/pathname/extconf.rb
+++ b/ext/pathname/extconf.rb
@@ -1,4 +1,4 @@
 # frozen_string_literal: false
 require 'mkmf'
-have_struct_member("struct stat", "st_birthtimespec", "sys/stat.h")
+have_func("rb_file_s_birthtime")
 create_makefile('pathname')
diff --git a/ext/pathname/lib/pathname.rb b/ext/pathname/lib/pathname.rb
index a6621565d0..e6fb90277d 100644
--- a/ext/pathname/lib/pathname.rb
+++ b/ext/pathname/lib/pathname.rb
@@ -14,6 +14,8 @@ require 'pathname.so'
 
 class Pathname
 
+  # :stopdoc:
+
   # to_path is implemented so Pathname objects are usable with File.open, etc.
   TO_PATH = :to_path
 
@@ -33,12 +35,19 @@ class Pathname
     SEPARATOR_PAT = /#{Regexp.quote File::SEPARATOR}/
   end
 
+  if File.dirname('A:') == 'A:.' # DOSish drive letter
+    ABSOLUTE_PATH = /\A(?:[A-Za-z]:|#{SEPARATOR_PAT})/o
+  else
+    ABSOLUTE_PATH = /\A#{SEPARATOR_PAT}/o
+  end
+  private_constant :ABSOLUTE_PATH
+
   # :startdoc:
 
   # chop_basename(path) -> [pre-basename, basename] or nil
   def chop_basename(path) # :nodoc:
     base = File.basename(path)
-    if /\A#{SEPARATOR_PAT}?\z/o =~ base
+    if /\A#{SEPARATOR_PAT}?\z/o.match?(base)
       return nil
     else
       return path[0, path.rindex(base)], base
@@ -60,7 +69,7 @@ class Pathname
   def prepend_prefix(prefix, relpath) # :nodoc:
     if relpath.empty?
       File.dirname(prefix)
-    elsif /#{SEPARATOR_PAT}/o =~ prefix
+    elsif /#{SEPARATOR_PAT}/o.match?(prefix)
       prefix = File.dirname(prefix)
       prefix = File.join(prefix, "") if File.basename(prefix + 'a') != 'a'
       prefix + relpath
@@ -111,7 +120,7 @@ class Pathname
       end
     end
     pre.tr!(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR
-    if /#{SEPARATOR_PAT}/o =~ File.basename(pre)
+    if /#{SEPARATOR_PAT}/o.match?(File.basename(pre))
       names.shift while names[0] == '..'
     end
     self.class.new(prepend_prefix(pre, File.join(*names)))
@@ -160,7 +169,7 @@ class Pathname
       names.unshift base if base != '.'
     end
     pre.tr!(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR
-    if /#{SEPARATOR_PAT}/o =~ File.basename(pre)
+    if /#{SEPARATOR_PAT}/o.match?(File.basename(pre))
       names.shift while names[0] == '..'
     end
     if names.empty?
@@ -191,8 +200,7 @@ class Pathname
     begin
       stat1 = self.lstat
       stat2 = self.parent.lstat
-      stat1.dev == stat2.dev && stat1.ino == stat2.ino ||
-        stat1.dev != stat2.dev
+      stat1.dev != stat2.dev || stat1.ino == stat2.ino
     rescue Errno::ENOENT
       false
     end
@@ -206,7 +214,7 @@ class Pathname
   # pathnames which points to roots such as <tt>/usr/..</tt>.
   #
   def root?
-    !!(chop_basename(@path) == nil && /#{SEPARATOR_PAT}/o =~ @path)
+    chop_basename(@path) == nil && /#{SEPARATOR_PAT}/o.match?(@path)
   end
 
   # Predicate method for testing whether a path is absolute.
@@ -221,7 +229,7 @@ class Pathname
   #   p.absolute?
   #       #=> false
   def absolute?
-    !relative?
+    ABSOLUTE_PATH.match? @path
   end
 
   # The opposite of Pathname#absolute?
@@ -236,11 +244,7 @@ class Pathname
   #   p.relative?
   #       #=> true
   def relative?
-    path = @path
-    while r = chop_basename(path)
-      path, = r
-    end
-    path == ''
+    !absolute?
   end
 
   #
@@ -378,7 +382,7 @@ class Pathname
       basename_list2.shift
     end
     r1 = chop_basename(prefix1)
-    if !r1 && /#{SEPARATOR_PAT}/o =~ File.basename(prefix1)
+    if !r1 && (r1 = /#{SEPARATOR_PAT}/o.match?(File.basename(prefix1)))
       while !basename_list2.empty? && basename_list2.first == '..'
         index_list2.shift
         basename_list2.shift
@@ -501,7 +505,11 @@ class Pathname
   #
   # ArgumentError is raised when it cannot find a relative path.
   #
+  # Note that this method does not handle situations where the case sensitivity
+  # of the filesystem in use differs from the operating system default.
+  #
   def relative_path_from(base_directory)
+    base_directory = Pathname.new(base_directory) unless base_directory.is_a? Pathname
     dest_directory = self.cleanpath.to_s
     base_directory = base_directory.cleanpath.to_s
     dest_prefix = dest_directory
diff --git a/ext/pathname/pathname.c b/ext/pathname/pathname.c
index d560e7356f..55577d7da7 100644
--- a/ext/pathname/pathname.c
+++ b/ext/pathname/pathname.c
@@ -2,7 +2,75 @@
 #include "ruby/encoding.h"
 
 static VALUE rb_cPathname;
-static ID id_at_path, id_to_path;
+static ID id_ENOTDIR;
+static ID id_at_path;
+static ID id_atime;
+static ID id_base;
+static ID id_basename;
+static ID id_binread;
+static ID id_binwrite;
+static ID id_birthtime;
+static ID id_blockdev_p;
+static ID id_chardev_p;
+static ID id_chmod;
+static ID id_chown;
+static ID id_ctime;
+static ID id_directory_p;
+static ID id_dirname;
+static ID id_empty_p;
+static ID id_entries;
+static ID id_executable_p;
+static ID id_executable_real_p;
+static ID id_exist_p;
+static ID id_expand_path;
+static ID id_extname;
+static ID id_file_p;
+static ID id_fnmatch;
+static ID id_foreach;
+static ID id_ftype;
+static ID id_getwd;
+static ID id_glob;
+static ID id_grpowned_p;
+static ID id_lchmod;
+static ID id_lchown;
+static ID id_link;
+static ID id_lstat;
+static ID id_mkdir;
+static ID id_mtime;
+static ID id_open;
+static ID id_owned_p;
+static ID id_pipe_p;
+static ID id_read;
+static ID id_readable_p;
+static ID id_readable_real_p;
+static ID id_readlines;
+static ID id_readlink;
+static ID id_realdirpath;
+static ID id_realpath;
+static ID id_rename;
+static ID id_rmdir;
+static ID id_setgid_p;
+static ID id_setuid_p;
+static ID id_size;
+static ID id_size_p;
+static ID id_socket_p;
+static ID id_split;
+static ID id_stat;
+static ID id_sticky_p;
+static ID id_sub;
+static ID id_symlink;
+static ID id_symlink_p;
+static ID id_sysopen;
+static ID id_to_path;
+static ID id_truncate;
+static ID id_unlink;
+static ID id_utime;
+static ID id_world_readable_p;
+static ID id_world_writable_p;
+static ID id_writable_p;
+static ID id_writable_real_p;
+static ID id_write;
+static ID id_zero_p;
 
 static VALUE
 get_strpath(VALUE obj)
@@ -42,7 +110,6 @@ path_initialize(VALUE self, VALUE arg)
     str = rb_obj_dup(str);
 
     set_strpath(self, str);
-    OBJ_INFECT(self, str);
     return self;
 }
 
@@ -66,15 +133,12 @@ path_freeze(VALUE self)
  * call-seq:
  *   pathname.taint -> obj
  *
- * Taints this Pathname.
- *
- * See Object.taint.
+ * Returns pathname.  This method is deprecated and will be removed in Ruby 3.2.
  */
 static VALUE
 path_taint(VALUE self)
 {
-    rb_call_super(0, 0);
-    rb_obj_taint(get_strpath(self));
+    rb_warn("Pathname#taint is deprecated and will be removed in Ruby 3.2.");
     return self;
 }
 
@@ -82,15 +146,12 @@ path_taint(VALUE self)
  * call-seq:
  *   pathname.untaint -> obj
  *
- * Untaints this Pathname.
- *
- * See Object.untaint.
+ * Returns pathname.  This method is deprecated and will be removed in Ruby 3.2.
  */
 static VALUE
 path_untaint(VALUE self)
 {
-    rb_call_super(0, 0);
-    rb_obj_untaint(get_strpath(self));
+    rb_warn("Pathname#untaint is deprecated and will be removed in Ruby 3.2.");
     return self;
 }
 
@@ -155,11 +216,15 @@ path_cmp(VALUE self, VALUE other)
     return INT2FIX(0);
 }
 
+#ifndef ST2FIX
+#define ST2FIX(h) LONG2FIX((long)(h))
+#endif
+
 /* :nodoc: */
 static VALUE
 path_hash(VALUE self)
 {
-    return INT2FIX(rb_str_hash(get_strpath(self)));
+    return ST2FIX(rb_str_hash(get_strpath(self)));
 }
 
 /*
@@ -199,10 +264,10 @@ path_sub(int argc, VALUE *argv, VALUE self)
     VALUE str = get_strpath(self);
 
     if (rb_block_given_p()) {
-        str = rb_block_call(str, rb_intern("sub"), argc, argv, 0, 0);
+        str = rb_block_call(str, id_sub, argc, argv, 0, 0);
     }
     else {
-        str = rb_funcall2(str, rb_intern("sub"), argc, argv);
+        str = rb_funcallv(str, id_sub, argc, argv);
     }
     return rb_class_new_instance(1, &str, rb_obj_class(self));
 }
@@ -236,7 +301,6 @@ path_sub_ext(VALUE self, VALUE repl)
     }
     str2 = rb_str_subseq(str, 0, ext-p);
     rb_str_append(str2, repl);
-    OBJ_INFECT(str2, str);
     return rb_class_new_instance(1, &str2, rb_obj_class(self));
 }
 
@@ -257,7 +321,7 @@ path_realpath(int argc, VALUE *argv, VALUE self)
 {
     VALUE basedir, str;
     rb_scan_args(argc, argv, "01", &basedir);
-    str = rb_funcall(rb_cFile, rb_intern("realpath"), 2, get_strpath(self), basedir);
+    str = rb_funcall(rb_cFile, id_realpath, 2, get_strpath(self), basedir);
     return rb_class_new_instance(1, &str, rb_obj_class(self));
 }
 
@@ -273,7 +337,7 @@ path_realdirpath(int argc, VALUE *argv, VALUE self)
 {
     VALUE basedir, str;
     rb_scan_args(argc, argv, "01", &basedir);
-    str = rb_funcall(rb_cFile, rb_intern("realdirpath"), 2, get_strpath(self), basedir);
+    str = rb_funcall(rb_cFile, id_realdirpath, 2, get_strpath(self), basedir);
     return rb_class_new_instance(1, &str, rb_obj_class(self));
 }
 
@@ -296,10 +360,10 @@ path_each_line(int argc, VALUE *argv, VALUE self)
     args[0] = get_strpath(self);
     n = rb_scan_args(argc, argv, "03", &args[1], &args[2], &args[3]);
     if (rb_block_given_p()) {
-        return rb_block_call(rb_cIO, rb_intern("foreach"), 1+n, args, 0, 0);
+        return rb_block_call_kw(rb_cFile, id_foreach, 1+n, args, 0, 0, RB_PASS_CALLED_KEYWORDS);
     }
     else {
-        return rb_funcall2(rb_cIO, rb_intern("foreach"), 1+n, args);
+        return rb_funcallv_kw(rb_cFile, id_foreach, 1+n, args, RB_PASS_CALLED_KEYWORDS);
     }
 }
 
@@ -310,7 +374,7 @@ path_each_line(int argc, VALUE *argv, VALUE self)
  *
  * Returns all data from the file, or the first +N+ bytes if specified.
  *
- * See IO.read.
+ * See File.read.
  *
  */
 static VALUE
@@ -321,7 +385,7 @@ path_read(int argc, VALUE *argv, VALUE self)
 
     args[0] = get_strpath(self);
     n = rb_scan_args(argc, argv, "03", &args[1], &args[2], &args[3]);
-    return rb_funcall2(rb_cIO, rb_intern("read"), 1+n, args);
+    return rb_funcallv_kw(rb_cFile, id_read, 1+n, args, RB_PASS_CALLED_KEYWORDS);
 }
 
 /*
@@ -330,7 +394,7 @@ path_read(int argc, VALUE *argv, VALUE self)
  *
  * Returns all the bytes from the file, or the first +N+ if specified.
  *
- * See IO.binread.
+ * See File.binread.
  *
  */
 static VALUE
@@ -341,7 +405,7 @@ path_binread(int argc, VALUE *argv, VALUE self)
 
     args[0] = get_strpath(self);
     n = rb_scan_args(argc, argv, "02", &args[1], &args[2]);
-    return rb_funcall2(rb_cIO, rb_intern("binread"), 1+n, args);
+    return rb_funcallv(rb_cFile, id_binread, 1+n, args);
 }
 
 /*
@@ -351,7 +415,7 @@ path_binread(int argc, VALUE *argv, VALUE self)
  *
  * Writes +contents+ to the file.
  *
- * See IO.write.
+ * See File.write.
  *
  */
 static VALUE
@@ -362,7 +426,7 @@ path_write(int argc, VALUE *argv, VALUE self)
 
     args[0] = get_strpath(self);
     n = rb_scan_args(argc, argv, "03", &args[1], &args[2], &args[3]);
-    return rb_funcall2(rb_cIO, rb_intern("write"), 1+n, args);
+    return rb_funcallv_kw(rb_cFile, id_write, 1+n, args, RB_PASS_CALLED_KEYWORDS);
 }
 
 /*
@@ -372,7 +436,7 @@ path_write(int argc, VALUE *argv, VALUE self)
  *
  * Writes +contents+ to the file, opening it in binary mode.
  *
- * See IO.binwrite.
+ * See File.binwrite.
  *
  */
 static VALUE
@@ -383,7 +447,7 @@ path_binwrite(int argc, VALUE *argv, VALUE self)
 
     args[0] = get_strpath(self);
     n = rb_scan_args(argc, argv, "03", &args[1], &args[2], &args[3]);
-    return rb_funcall2(rb_cIO, rb_intern("binwrite"), 1+n, args);
+    return rb_funcallv_kw(rb_cFile, id_binwrite, 1+n, args, RB_PASS_CALLED_KEYWORDS);
 }
 
 /*
@@ -394,7 +458,7 @@ path_binwrite(int argc, VALUE *argv, VALUE self)
  *
  * Returns all the lines from the file.
  *
- * See IO.readlines.
+ * See File.readlines.
  *
  */
 static VALUE
@@ -405,7 +469,7 @@ path_readlines(int argc, VALUE *argv, VALUE self)
 
     args[0] = get_strpath(self);
     n = rb_scan_args(argc, argv, "03", &args[1], &args[2], &args[3]);
-    return rb_funcall2(rb_cIO, rb_intern("readlines"), 1+n, args);
+    return rb_funcallv_kw(rb_cFile, id_readlines, 1+n, args, RB_PASS_CALLED_KEYWORDS);
 }
 
 /*
@@ -423,7 +487,7 @@ path_sysopen(int argc, VALUE *argv, VALUE self)
 
     args[0] = get_strpath(self);
     n = rb_scan_args(argc, argv, "02", &args[1], &args[2]);
-    return rb_funcall2(rb_cIO, rb_intern("sysopen"), 1+n, args);
+    return rb_funcallv(rb_cIO, id_sysopen, 1+n, args);
 }
 
 /*
@@ -437,10 +501,10 @@ path_sysopen(int argc, VALUE *argv, VALUE self)
 static VALUE
 path_atime(VALUE self)
 {
-    return rb_funcall(rb_cFile, rb_intern("atime"), 1, get_strpath(self));
+    return rb_funcall(rb_cFile, id_atime, 1, get_strpath(self));
 }
 
-#if defined(HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC) || defined(_WIN32)
+#if defined(HAVE_RB_FILE_S_BIRTHTIME)
 /*
  * call-seq:
  *   pathname.birthtime	-> time
@@ -453,9 +517,10 @@ path_atime(VALUE self)
 static VALUE
 path_birthtime(VALUE self)
 {
-    return rb_funcall(rb_cFile, rb_intern("birthtime"), 1, get_strpath(self));
+    return rb_funcall(rb_cFile, id_birthtime, 1, get_strpath(self));
 }
 #else
+/* check at compilation time for `respond_to?` */
 # define path_birthtime rb_f_notimplement
 #endif
 
@@ -470,7 +535,7 @@ path_birthtime(VALUE self)
 static VALUE
 path_ctime(VALUE self)
 {
-    return rb_funcall(rb_cFile, rb_intern("ctime"), 1, get_strpath(self));
+    return rb_funcall(rb_cFile, id_ctime, 1, get_strpath(self));
 }
 
 /*
@@ -484,12 +549,12 @@ path_ctime(VALUE self)
 static VALUE
 path_mtime(VALUE self)
 {
-    return rb_funcall(rb_cFile, rb_intern("mtime"), 1, get_strpath(self));
+    return rb_funcall(rb_cFile, id_mtime, 1, get_strpath(self));
 }
 
 /*
  * call-seq:
- *   pathname.chmod	-> integer
+ *   pathname.chmod(mode_int)	-> integer
  *
  * Changes file permissions.
  *
@@ -498,12 +563,12 @@ path_mtime(VALUE self)
 static VALUE
 path_chmod(VALUE self, VALUE mode)
 {
-    return rb_funcall(rb_cFile, rb_intern("chmod"), 2, mode, get_strpath(self));
+    return rb_funcall(rb_cFile, id_chmod, 2, mode, get_strpath(self));
 }
 
 /*
  * call-seq:
- *   pathname.lchmod	-> integer
+ *   pathname.lchmod(mode_int)	-> integer
  *
  * Same as Pathname.chmod, but does not follow symbolic links.
  *
@@ -512,12 +577,12 @@ path_chmod(VALUE self, VALUE mode)
 static VALUE
 path_lchmod(VALUE self, VALUE mode)
 {
-    return rb_funcall(rb_cFile, rb_intern("lchmod"), 2, mode, get_strpath(self));
+    return rb_funcall(rb_cFile, id_lchmod, 2, mode, get_strpath(self));
 }
 
 /*
  * call-seq:
- *   pathname.chown	-> integer
+ *   pathname.chown(owner_int, group_int)	-> integer
  *
  * Change owner and group of the file.
  *
@@ -526,12 +591,12 @@ path_lchmod(VALUE self, VALUE mode)
 static VALUE
 path_chown(VALUE self, VALUE owner, VALUE group)
 {
-    return rb_funcall(rb_cFile, rb_intern("chown"), 3, owner, group, get_strpath(self));
+    return rb_funcall(rb_cFile, id_chown, 3, owner, group, get_strpath(self));
 }
 
 /*
  * call-seq:
- *   pathname.lchown	-> integer
+ *   pathname.lchown(owner_int, group_int)	-> integer
  *
  * Same as Pathname.chown, but does not follow symbolic links.
  *
@@ -540,13 +605,13 @@ path_chown(VALUE self, VALUE owner, VALUE group)
 static VALUE
 path_lchown(VALUE self, VALUE owner, VALUE group)
 {
-    return rb_funcall(rb_cFile, rb_intern("lchown"), 3, owner, group, get_strpath(self));
+    return rb_funcall(rb_cFile, id_lchown, 3, owner, group, get_strpath(self));
 }
 
 /*
  * call-seq:
- *    pathname.fnmatch(pattern, [flags])        -> string
- *    pathname.fnmatch?(pattern, [flags])       -> string
+ *    pathname.fnmatch(pattern, [flags])        -> true or false
+ *    pathname.fnmatch?(pattern, [flags])       -> true or false
  *
  * Return +true+ if the receiver matches the given pattern.
  *
@@ -558,9 +623,9 @@ path_fnmatch(int argc, VALUE *argv, VALUE self)
     VALUE str = get_strpath(self);
     VALUE pattern, flags;
     if (rb_scan_args(argc, argv, "11", &pattern, &flags) == 1)
-        return rb_funcall(rb_cFile, rb_intern("fnmatch"), 2, pattern, str);
+        return rb_funcall(rb_cFile, id_fnmatch, 2, pattern, str);
     else
-        return rb_funcall(rb_cFile, rb_intern("fnmatch"), 3, pattern, str, flags);
+        return rb_funcall(rb_cFile, id_fnmatch, 3, pattern, str, flags);
 }
 
 /*
@@ -574,7 +639,7 @@ path_fnmatch(int argc, VALUE *argv, VALUE self)
 static VALUE
 path_ftype(VALUE self)
 {
-    return rb_funcall(rb_cFile, rb_intern("ftype"), 1, get_strpath(self));
+    return rb_funcall(rb_cFile, id_ftype, 1, get_strpath(self));
 }
 
 /*
@@ -588,10 +653,17 @@ path_ftype(VALUE self)
 static VALUE
 path_make_link(VALUE self, VALUE old)
 {
-    return rb_funcall(rb_cFile, rb_intern("link"), 2, old, get_strpath(self));
+    return rb_funcall(rb_cFile, id_link, 2, old, get_strpath(self));
 }
 
 /*
+ * call-seq:
+ *   pathname.open()
+ *   pathname.open(mode="r" [, opt])                        -> file
+ *   pathname.open([mode [, perm]] [, opt])                 -> file
+ *   pathname.open(mode="r" [, opt]) {|file| block }        -> obj
+ *   pathname.open([mode [, perm]] [, opt]) {|file| block } -> obj
+ *
  * Opens the file for reading or writing.
  *
  * See File.open.
@@ -605,10 +677,10 @@ path_open(int argc, VALUE *argv, VALUE self)
     args[0] = get_strpath(self);
     n = rb_scan_args(argc, argv, "03", &args[1], &args[2], &args[3]);
     if (rb_block_given_p()) {
-        return rb_block_call(rb_cFile, rb_intern("open"), 1+n, args, 0, 0);
+        return rb_block_call_kw(rb_cFile, id_open, 1+n, args, 0, 0, RB_PASS_CALLED_KEYWORDS);
     }
     else {
-        return rb_funcall2(rb_cFile, rb_intern("open"), 1+n, args);
+        return rb_funcallv_kw(rb_cFile, id_open, 1+n, args, RB_PASS_CALLED_KEYWORDS);
     }
 }
 
@@ -621,7 +693,7 @@ static VALUE
 path_readlink(VALUE self)
 {
     VALUE str;
-    str = rb_funcall(rb_cFile, rb_intern("readlink"), 1, get_strpath(self));
+    str = rb_funcall(rb_cFile, id_readlink, 1, get_strpath(self));
     return rb_class_new_instance(1, &str, rb_obj_class(self));
 }
 
@@ -633,7 +705,7 @@ path_readlink(VALUE self)
 static VALUE
 path_rename(VALUE self, VALUE to)
 {
-    return rb_funcall(rb_cFile, rb_intern("rename"), 2, get_strpath(self), to);
+    return rb_funcall(rb_cFile, id_rename, 2, get_strpath(self), to);
 }
 
 /*
@@ -644,7 +716,7 @@ path_rename(VALUE self, VALUE to)
 static VALUE
 path_stat(VALUE self)
 {
-    return rb_funcall(rb_cFile, rb_intern("stat"), 1, get_strpath(self));
+    return rb_funcall(rb_cFile, id_stat, 1, get_strpath(self));
 }
 
 /*
@@ -653,7 +725,7 @@ path_stat(VALUE self)
 static VALUE
 path_lstat(VALUE self)
 {
-    return rb_funcall(rb_cFile, rb_intern("lstat"), 1, get_strpath(self));
+    return rb_funcall(rb_cFile, id_lstat, 1, get_strpath(self));
 }
 
 /*
@@ -667,7 +739,7 @@ path_lstat(VALUE self)
 static VALUE
 path_make_symlink(VALUE self, VALUE old)
 {
-    return rb_funcall(rb_cFile, rb_intern("symlink"), 2, old, get_strpath(self));
+    return rb_funcall(rb_cFile, id_symlink, 2, old, get_strpath(self));
 }
 
 /*
@@ -678,7 +750,7 @@ path_make_symlink(VALUE self, VALUE old)
 static VALUE
 path_truncate(VALUE self, VALUE length)
 {
-    return rb_funcall(rb_cFile, rb_intern("truncate"), 2, get_strpath(self), length);
+    return rb_funcall(rb_cFile, id_truncate, 2, get_strpath(self), length);
 }
 
 /*
@@ -689,7 +761,7 @@ path_truncate(VALUE self, VALUE length)
 static VALUE
 path_utime(VALUE self, VALUE atime, VALUE mtime)
 {
-    return rb_funcall(rb_cFile, rb_intern("utime"), 3, atime, mtime, get_strpath(self));
+    return rb_funcall(rb_cFile, id_utime, 3, atime, mtime, get_strpath(self));
 }
 
 /*
@@ -703,9 +775,9 @@ path_basename(int argc, VALUE *argv, VALUE self)
     VALUE str = get_strpath(self);
     VALUE fext;
     if (rb_scan_args(argc, argv, "01", &fext) == 0)
-        str = rb_funcall(rb_cFile, rb_intern("basename"), 1, str);
+        str = rb_funcall(rb_cFile, id_basename, 1, str);
     else
-        str = rb_funcall(rb_cFile, rb_intern("basename"), 2, str, fext);
+        str = rb_funcall(rb_cFile, id_basename, 2, str, fext);
     return rb_class_new_instance(1, &str, rb_obj_class(self));
 }
 
@@ -718,7 +790,7 @@ static VALUE
 path_dirname(VALUE self)
 {
     VALUE str = get_strpath(self);
-    str = rb_funcall(rb_cFile, rb_intern("dirname"), 1, str);
+    str = rb_funcall(rb_cFile, id_dirname, 1, str);
     return rb_class_new_instance(1, &str, rb_obj_class(self));
 }
 
@@ -731,7 +803,7 @@ static VALUE
 path_extname(VALUE self)
 {
     VALUE str = get_strpath(self);
-    return rb_funcall(rb_cFile, rb_intern("extname"), 1, str);
+    return rb_funcall(rb_cFile, id_extname, 1, str);
 }
 
 /*
@@ -745,9 +817,9 @@ path_expand_path(int argc, VALUE *argv, VALUE self)
     VALUE str = get_strpath(self);
     VALUE dname;
     if (rb_scan_args(argc, argv, "01", &dname) == 0)
-        str = rb_funcall(rb_cFile, rb_intern("expand_path"), 1, str);
+        str = rb_funcall(rb_cFile, id_expand_path, 1, str);
     else
-        str = rb_funcall(rb_cFile, rb_intern("expand_path"), 2, str, dname);
+        str = rb_funcall(rb_cFile, id_expand_path, 2, str, dname);
     return rb_class_new_instance(1, &str, rb_obj_class(self));
 }
 
@@ -761,7 +833,7 @@ path_split(VALUE self)
 {
     VALUE str = get_strpath(self);
     VALUE ary, dirname, basename;
-    ary = rb_funcall(rb_cFile, rb_intern("split"), 1, str);
+    ary = rb_funcall(rb_cFile, id_split, 1, str);
     ary = rb_check_array_type(ary);
     dirname = rb_ary_entry(ary, 0);
     basename = rb_ary_entry(ary, 1);
@@ -776,7 +848,7 @@ path_split(VALUE self)
 static VALUE
 path_blockdev_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("blockdev?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_blockdev_p, 1, get_strpath(self));
 }
 
 /*
@@ -785,7 +857,7 @@ path_blockdev_p(VALUE self)
 static VALUE
 path_chardev_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("chardev?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_chardev_p, 1, get_strpath(self));
 }
 
 /*
@@ -794,7 +866,7 @@ path_chardev_p(VALUE self)
 static VALUE
 path_executable_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("executable?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_executable_p, 1, get_strpath(self));
 }
 
 /*
@@ -803,7 +875,7 @@ path_executable_p(VALUE self)
 static VALUE
 path_executable_real_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("executable_real?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_executable_real_p, 1, get_strpath(self));
 }
 
 /*
@@ -812,7 +884,7 @@ path_executable_real_p(VALUE self)
 static VALUE
 path_exist_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("exist?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_exist_p, 1, get_strpath(self));
 }
 
 /*
@@ -821,7 +893,7 @@ path_exist_p(VALUE self)
 static VALUE
 path_grpowned_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("grpowned?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_grpowned_p, 1, get_strpath(self));
 }
 
 /*
@@ -830,7 +902,7 @@ path_grpowned_p(VALUE self)
 static VALUE
 path_directory_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("directory?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_directory_p, 1, get_strpath(self));
 }
 
 /*
@@ -839,7 +911,7 @@ path_directory_p(VALUE self)
 static VALUE
 path_file_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("file?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_file_p, 1, get_strpath(self));
 }
 
 /*
@@ -848,7 +920,7 @@ path_file_p(VALUE self)
 static VALUE
 path_pipe_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("pipe?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_pipe_p, 1, get_strpath(self));
 }
 
 /*
@@ -857,7 +929,7 @@ path_pipe_p(VALUE self)
 static VALUE
 path_socket_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("socket?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_socket_p, 1, get_strpath(self));
 }
 
 /*
@@ -866,7 +938,7 @@ path_socket_p(VALUE self)
 static VALUE
 path_owned_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("owned?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_owned_p, 1, get_strpath(self));
 }
 
 /*
@@ -875,7 +947,7 @@ path_owned_p(VALUE self)
 static VALUE
 path_readable_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("readable?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_readable_p, 1, get_strpath(self));
 }
 
 /*
@@ -884,7 +956,7 @@ path_readable_p(VALUE self)
 static VALUE
 path_world_readable_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("world_readable?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_world_readable_p, 1, get_strpath(self));
 }
 
 /*
@@ -893,7 +965,7 @@ path_world_readable_p(VALUE self)
 static VALUE
 path_readable_real_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("readable_real?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_readable_real_p, 1, get_strpath(self));
 }
 
 /*
@@ -902,7 +974,7 @@ path_readable_real_p(VALUE self)
 static VALUE
 path_setuid_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("setuid?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_setuid_p, 1, get_strpath(self));
 }
 
 /*
@@ -911,7 +983,7 @@ path_setuid_p(VALUE self)
 static VALUE
 path_setgid_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("setgid?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_setgid_p, 1, get_strpath(self));
 }
 
 /*
@@ -920,7 +992,7 @@ path_setgid_p(VALUE self)
 static VALUE
 path_size(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("size"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_size, 1, get_strpath(self));
 }
 
 /*
@@ -929,7 +1001,7 @@ path_size(VALUE self)
 static VALUE
 path_size_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("size?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_size_p, 1, get_strpath(self));
 }
 
 /*
@@ -938,7 +1010,7 @@ path_size_p(VALUE self)
 static VALUE
 path_sticky_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("sticky?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_sticky_p, 1, get_strpath(self));
 }
 
 /*
@@ -947,7 +1019,7 @@ path_sticky_p(VALUE self)
 static VALUE
 path_symlink_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("symlink?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_symlink_p, 1, get_strpath(self));
 }
 
 /*
@@ -956,7 +1028,7 @@ path_symlink_p(VALUE self)
 static VALUE
 path_writable_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("writable?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_writable_p, 1, get_strpath(self));
 }
 
 /*
@@ -965,7 +1037,7 @@ path_writable_p(VALUE self)
 static VALUE
 path_world_writable_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("world_writable?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_world_writable_p, 1, get_strpath(self));
 }
 
 /*
@@ -974,7 +1046,7 @@ path_world_writable_p(VALUE self)
 static VALUE
 path_writable_real_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("writable_real?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_writable_real_p, 1, get_strpath(self));
 }
 
 /*
@@ -983,11 +1055,27 @@ path_writable_real_p(VALUE self)
 static VALUE
 path_zero_p(VALUE self)
 {
-    return rb_funcall(rb_mFileTest, rb_intern("zero?"), 1, get_strpath(self));
+    return rb_funcall(rb_mFileTest, id_zero_p, 1, get_strpath(self));
 }
 
+/*
+ * Tests the file is empty.
+ *
+ * See Dir#empty? and FileTest.empty?.
+ */
 static VALUE
-glob_i(RB_BLOCK_CALL_FUNC_ARGLIST(elt, klass))
+path_empty_p(VALUE self)
+{
+
+    VALUE path = get_strpath(self);
+    if (RTEST(rb_funcall(rb_mFileTest, id_directory_p, 1, path)))
+        return rb_funcall(rb_cDir, id_empty_p, 1, path);
+    else
+        return rb_funcall(rb_mFileTest, id_empty_p, 1, path);
+}
+
+static VALUE
+s_glob_i(RB_BLOCK_CALL_FUNC_ARGLIST(elt, klass))
 {
     return rb_yield(rb_class_new_instance(1, &elt, klass));
 }
@@ -995,25 +1083,25 @@ glob_i(RB_BLOCK_CALL_FUNC_ARGLIST(elt, klass))
 /*
  * Returns or yields Pathname objects.
  *
- *  Pathname.glob("config/" "*.rb")
- *	#=> [#<Pathname:config/environment.rb>, #<Pathname:config/routes.rb>, ..]
+ *  Pathname.glob("lib/i*.rb")
+ *	#=> [#<Pathname:lib/ipaddr.rb>, #<Pathname:lib/irb.rb>]
  *
  * See Dir.glob.
  */
 static VALUE
 path_s_glob(int argc, VALUE *argv, VALUE klass)
 {
-    VALUE args[2];
+    VALUE args[3];
     int n;
 
-    n = rb_scan_args(argc, argv, "11", &args[0], &args[1]);
+    n = rb_scan_args(argc, argv, "12", &args[0], &args[1], &args[2]);
     if (rb_block_given_p()) {
-        return rb_block_call(rb_cDir, rb_intern("glob"), n, args, glob_i, klass);
+        return rb_block_call_kw(rb_cDir, id_glob, n, args, s_glob_i, klass, RB_PASS_CALLED_KEYWORDS);
     }
     else {
         VALUE ary;
         long i;
-        ary = rb_funcall2(rb_cDir, rb_intern("glob"), n, args);
+        ary = rb_funcallv_kw(rb_cDir, id_glob, n, args, RB_PASS_CALLED_KEYWORDS);
         ary = rb_convert_type(ary, T_ARRAY, "Array", "to_ary");
         for (i = 0; i < RARRAY_LEN(ary); i++) {
             VALUE elt = RARRAY_AREF(ary, i);
@@ -1024,6 +1112,54 @@ path_s_glob(int argc, VALUE *argv, VALUE klass)
     }
 }
 
+static VALUE
+glob_i(RB_BLOCK_CALL_FUNC_ARGLIST(elt, self))
+{
+    elt = rb_funcall(self, '+', 1, elt);
+    return rb_yield(elt);
+}
+
+/*
+ * Returns or yields Pathname objects.
+ *
+ *  Pathname("ruby-2.4.2").glob("R*.md")
+ *  #=> [#<Pathname:ruby-2.4.2/README.md>, #<Pathname:ruby-2.4.2/README.ja.md>]
+ *
+ * See Dir.glob.
+ * This method uses the +base+ keyword argument of Dir.glob.
+ */
+static VALUE
+path_glob(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[3];
+    int n;
+
+    n = rb_scan_args(argc, argv, "11", &args[0], &args[1]);
+    if (n == 1)
+      args[1] = INT2FIX(0);
+
+    args[2] = rb_hash_new();
+    rb_hash_aset(args[2], ID2SYM(id_base), get_strpath(self));
+
+    n = 3;
+
+    if (rb_block_given_p()) {
+        return rb_block_call_kw(rb_cDir, id_glob, n, args, glob_i, self, RB_PASS_KEYWORDS);
+    }
+    else {
+        VALUE ary;
+        long i;
+        ary = rb_funcallv_kw(rb_cDir, id_glob, n, args, RB_PASS_KEYWORDS);
+        ary = rb_convert_type(ary, T_ARRAY, "Array", "to_ary");
+        for (i = 0; i < RARRAY_LEN(ary); i++) {
+            VALUE elt = RARRAY_AREF(ary, i);
+            elt = rb_funcall(self, '+', 1, elt);
+            rb_ary_store(ary, i, elt);
+        }
+        return ary;
+    }
+}
+
 /*
  * Returns the current working directory as a Pathname.
  *
@@ -1036,7 +1172,7 @@ static VALUE
 path_s_getwd(VALUE klass)
 {
     VALUE str;
-    str = rb_funcall(rb_cDir, rb_intern("getwd"), 0);
+    str = rb_funcall(rb_cDir, id_getwd, 0);
     return rb_class_new_instance(1, &str, klass);
 }
 
@@ -1073,7 +1209,7 @@ path_entries(VALUE self)
     long i;
     klass = rb_obj_class(self);
     str = get_strpath(self);
-    ary = rb_funcall(rb_cDir, rb_intern("entries"), 1, str);
+    ary = rb_funcall(rb_cDir, id_entries, 1, str);
     ary = rb_convert_type(ary, T_ARRAY, "Array", "to_ary");
     for (i = 0; i < RARRAY_LEN(ary); i++) {
 	VALUE elt = RARRAY_AREF(ary, i);
@@ -1094,9 +1230,9 @@ path_mkdir(int argc, VALUE *argv, VALUE self)
     VALUE str = get_strpath(self);
     VALUE vmode;
     if (rb_scan_args(argc, argv, "01", &vmode) == 0)
-        return rb_funcall(rb_cDir, rb_intern("mkdir"), 1, str);
+        return rb_funcall(rb_cDir, id_mkdir, 1, str);
     else
-        return rb_funcall(rb_cDir, rb_intern("mkdir"), 2, str, vmode);
+        return rb_funcall(rb_cDir, id_mkdir, 2, str, vmode);
 }
 
 /*
@@ -1107,7 +1243,7 @@ path_mkdir(int argc, VALUE *argv, VALUE self)
 static VALUE
 path_rmdir(VALUE self)
 {
-    return rb_funcall(rb_cDir, rb_intern("rmdir"), 1, get_strpath(self));
+    return rb_funcall(rb_cDir, id_rmdir, 1, get_strpath(self));
 }
 
 /*
@@ -1121,7 +1257,7 @@ path_opendir(VALUE self)
     VALUE args[1];
 
     args[0] = get_strpath(self);
-    return rb_block_call(rb_cDir, rb_intern("open"), 1, args, 0, 0);
+    return rb_block_call(rb_cDir, id_open, 1, args, 0, 0);
 }
 
 static VALUE
@@ -1140,19 +1276,19 @@ path_each_entry(VALUE self)
     VALUE args[1];
 
     args[0] = get_strpath(self);
-    return rb_block_call(rb_cDir, rb_intern("foreach"), 1, args, each_entry_i, rb_obj_class(self));
+    return rb_block_call(rb_cDir, id_foreach, 1, args, each_entry_i, rb_obj_class(self));
 }
 
 static VALUE
 unlink_body(VALUE str)
 {
-    return rb_funcall(rb_cDir, rb_intern("unlink"), 1, str);
+    return rb_funcall(rb_cDir, id_unlink, 1, str);
 }
 
 static VALUE
 unlink_rescue(VALUE str, VALUE errinfo)
 {
-    return rb_funcall(rb_cFile, rb_intern("unlink"), 1, str);
+    return rb_funcall(rb_cFile, id_unlink, 1, str);
 }
 
 /*
@@ -1162,7 +1298,7 @@ unlink_rescue(VALUE str, VALUE errinfo)
 static VALUE
 path_unlink(VALUE self)
 {
-    VALUE eENOTDIR = rb_const_get_at(rb_mErrno, rb_intern("ENOTDIR"));
+    VALUE eENOTDIR = rb_const_get_at(rb_mErrno, id_ENOTDIR);
     VALUE str = get_strpath(self);
     return rb_rescue2(unlink_body, str, unlink_rescue, str, eENOTDIR, (VALUE)0);
 }
@@ -1186,6 +1322,8 @@ path_unlink(VALUE self)
 static VALUE
 path_f_pathname(VALUE self, VALUE str)
 {
+    if (CLASS_OF(str) == rb_cPathname)
+        return str;
     return rb_class_new_instance(1, &str, rb_cPathname);
 }
 
@@ -1351,6 +1489,8 @@ path_f_pathname(VALUE self, VALUE str)
  * - #binread(*args)
  * - #readlines(*args)
  * - #sysopen(*args)
+ * - #write(*args)
+ * - #binwrite(*args)
  *
  * === Utilities
  *
@@ -1372,8 +1512,11 @@ path_f_pathname(VALUE self, VALUE str)
 void
 Init_pathname(void)
 {
-    id_at_path = rb_intern("@path");
-    id_to_path = rb_intern("to_path");
+#ifdef HAVE_RB_EXT_RACTOR_SAFE
+    rb_ext_ractor_safe(true);
+#endif
+
+    InitVM(pathname);
 
     rb_cPathname = rb_define_class("Pathname", rb_cObject);
     rb_define_method(rb_cPathname, "initialize", path_initialize, 1);
@@ -1448,9 +1591,11 @@ Init_pathname(void)
     rb_define_method(rb_cPathname, "world_writable?", path_world_writable_p, 0);
     rb_define_method(rb_cPathname, "writable_real?", path_writable_real_p, 0);
     rb_define_method(rb_cPathname, "zero?", path_zero_p, 0);
+    rb_define_method(rb_cPathname, "empty?", path_empty_p, 0);
     rb_define_singleton_method(rb_cPathname, "glob", path_s_glob, -1);
     rb_define_singleton_method(rb_cPathname, "getwd", path_s_getwd, 0);
     rb_define_singleton_method(rb_cPathname, "pwd", path_s_getwd, 0);
+    rb_define_method(rb_cPathname, "glob", path_glob, -1);
     rb_define_method(rb_cPathname, "entries", path_entries, 0);
     rb_define_method(rb_cPathname, "mkdir", path_mkdir, -1);
     rb_define_method(rb_cPathname, "rmdir", path_rmdir, 0);
@@ -1461,3 +1606,78 @@ Init_pathname(void)
     rb_undef_method(rb_cPathname, "=~");
     rb_define_global_function("Pathname", path_f_pathname, 1);
 }
+
+void
+InitVM_pathname(void)
+{
+#undef rb_intern
+    id_at_path = rb_intern("@path");
+    id_to_path = rb_intern("to_path");
+    id_ENOTDIR = rb_intern("ENOTDIR");
+    id_atime = rb_intern("atime");
+    id_basename = rb_intern("basename");
+    id_base = rb_intern("base");
+    id_binread = rb_intern("binread");
+    id_binwrite = rb_intern("binwrite");
+    id_birthtime = rb_intern("birthtime");
+    id_blockdev_p = rb_intern("blockdev?");
+    id_chardev_p = rb_intern("chardev?");
+    id_chmod = rb_intern("chmod");
+    id_chown = rb_intern("chown");
+    id_ctime = rb_intern("ctime");
+    id_directory_p = rb_intern("directory?");
+    id_dirname = rb_intern("dirname");
+    id_empty_p = rb_intern("empty?");
+    id_entries = rb_intern("entries");
+    id_executable_p = rb_intern("executable?");
+    id_executable_real_p = rb_intern("executable_real?");
+    id_exist_p = rb_intern("exist?");
+    id_expand_path = rb_intern("expand_path");
+    id_extname = rb_intern("extname");
+    id_file_p = rb_intern("file?");
+    id_fnmatch = rb_intern("fnmatch");
+    id_foreach = rb_intern("foreach");
+    id_ftype = rb_intern("ftype");
+    id_getwd = rb_intern("getwd");
+    id_glob = rb_intern("glob");
+    id_grpowned_p = rb_intern("grpowned?");
+    id_lchmod = rb_intern("lchmod");
+    id_lchown = rb_intern("lchown");
+    id_link = rb_intern("link");
+    id_lstat = rb_intern("lstat");
+    id_mkdir = rb_intern("mkdir");
+    id_mtime = rb_intern("mtime");
+    id_open = rb_intern("open");
+    id_owned_p = rb_intern("owned?");
+    id_pipe_p = rb_intern("pipe?");
+    id_read = rb_intern("read");
+    id_readable_p = rb_intern("readable?");
+    id_readable_real_p = rb_intern("readable_real?");
+    id_readlines = rb_intern("readlines");
+    id_readlink = rb_intern("readlink");
+    id_realdirpath = rb_intern("realdirpath");
+    id_realpath = rb_intern("realpath");
+    id_rename = rb_intern("rename");
+    id_rmdir = rb_intern("rmdir");
+    id_setgid_p = rb_intern("setgid?");
+    id_setuid_p = rb_intern("setuid?");
+    id_size = rb_intern("size");
+    id_size_p = rb_intern("size?");
+    id_socket_p = rb_intern("socket?");
+    id_split = rb_intern("split");
+    id_stat = rb_intern("stat");
+    id_sticky_p = rb_intern("sticky?");
+    id_sub = rb_intern("sub");
+    id_symlink = rb_intern("symlink");
+    id_symlink_p = rb_intern("symlink?");
+    id_sysopen = rb_intern("sysopen");
+    id_truncate = rb_intern("truncate");
+    id_unlink = rb_intern("unlink");
+    id_utime = rb_intern("utime");
+    id_world_readable_p = rb_intern("world_readable?");
+    id_world_writable_p = rb_intern("world_writable?");
+    id_writable_p = rb_intern("writable?");
+    id_writable_real_p = rb_intern("writable_real?");
+    id_write = rb_intern("write");
+    id_zero_p = rb_intern("zero?");
+}
diff --git a/ext/pathname/pathname.gemspec b/ext/pathname/pathname.gemspec
new file mode 100644
index 0000000000..8593f9e9c7
--- /dev/null
+++ b/ext/pathname/pathname.gemspec
@@ -0,0 +1,25 @@
+Gem::Specification.new do |spec|
+  spec.name          = "pathname"
+  spec.version       = "0.1.0"
+  spec.authors       = ["Tanaka Akira"]
+  spec.email         = ["akr@fsij.org"]
+
+  spec.summary       = %q{Representation of the name of a file or directory on the filesystem}
+  spec.description   = %q{Representation of the name of a file or directory on the filesystem}
+  spec.homepage      = "https://github.com/ruby/pathname"
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.licenses      = ["Ruby", "BSD-2-Clause"]
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+  spec.extensions    = %w[ext/pathname/extconf.rb]
+end
diff --git a/ext/psych/.gitignore b/ext/psych/.gitignore
deleted file mode 100644
index 836058c169..0000000000
--- a/ext/psych/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-/api.c
-/config.h
-/dumper.c
-/emitter.c
-/loader.c
-/parser.c
-/reader.c
-/scanner.c
-/writer.c
-/yaml.h
-/yaml_private.h
diff --git a/ext/psych/depend b/ext/psych/depend
index 79b6c53f50..2017319fd1 100644
--- a/ext/psych/depend
+++ b/ext/psych/depend
@@ -1,3 +1,849 @@
-$(OBJS): $(HDRS) $(ruby_headers) \
-  $(hdrdir)/ruby/encoding.h \
-  $(hdrdir)/ruby/oniguruma.h
+$(OBJS): $(YAML_H)
+
+# AUTOGENERATED DEPENDENCIES START
+psych.o: $(RUBY_EXTCONF_H)
+psych.o: $(arch_hdrdir)/ruby/config.h
+psych.o: $(hdrdir)/ruby.h
+psych.o: $(hdrdir)/ruby/internal/anyargs.h
+psych.o: $(hdrdir)/ruby/internal/arithmetic.h
+psych.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+psych.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+psych.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+psych.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+psych.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+psych.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+psych.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+psych.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+psych.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+psych.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+psych.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+psych.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+psych.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+psych.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+psych.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+psych.o: $(hdrdir)/ruby/internal/assume.h
+psych.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+psych.o: $(hdrdir)/ruby/internal/attr/artificial.h
+psych.o: $(hdrdir)/ruby/internal/attr/cold.h
+psych.o: $(hdrdir)/ruby/internal/attr/const.h
+psych.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+psych.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+psych.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+psych.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+psych.o: $(hdrdir)/ruby/internal/attr/error.h
+psych.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+psych.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+psych.o: $(hdrdir)/ruby/internal/attr/format.h
+psych.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+psych.o: $(hdrdir)/ruby/internal/attr/noalias.h
+psych.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+psych.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+psych.o: $(hdrdir)/ruby/internal/attr/noinline.h
+psych.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+psych.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+psych.o: $(hdrdir)/ruby/internal/attr/pure.h
+psych.o: $(hdrdir)/ruby/internal/attr/restrict.h
+psych.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+psych.o: $(hdrdir)/ruby/internal/attr/warning.h
+psych.o: $(hdrdir)/ruby/internal/attr/weakref.h
+psych.o: $(hdrdir)/ruby/internal/cast.h
+psych.o: $(hdrdir)/ruby/internal/compiler_is.h
+psych.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+psych.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+psych.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+psych.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+psych.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+psych.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+psych.o: $(hdrdir)/ruby/internal/compiler_since.h
+psych.o: $(hdrdir)/ruby/internal/config.h
+psych.o: $(hdrdir)/ruby/internal/constant_p.h
+psych.o: $(hdrdir)/ruby/internal/core.h
+psych.o: $(hdrdir)/ruby/internal/core/rarray.h
+psych.o: $(hdrdir)/ruby/internal/core/rbasic.h
+psych.o: $(hdrdir)/ruby/internal/core/rbignum.h
+psych.o: $(hdrdir)/ruby/internal/core/rclass.h
+psych.o: $(hdrdir)/ruby/internal/core/rdata.h
+psych.o: $(hdrdir)/ruby/internal/core/rfile.h
+psych.o: $(hdrdir)/ruby/internal/core/rhash.h
+psych.o: $(hdrdir)/ruby/internal/core/robject.h
+psych.o: $(hdrdir)/ruby/internal/core/rregexp.h
+psych.o: $(hdrdir)/ruby/internal/core/rstring.h
+psych.o: $(hdrdir)/ruby/internal/core/rstruct.h
+psych.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+psych.o: $(hdrdir)/ruby/internal/ctype.h
+psych.o: $(hdrdir)/ruby/internal/dllexport.h
+psych.o: $(hdrdir)/ruby/internal/dosish.h
+psych.o: $(hdrdir)/ruby/internal/error.h
+psych.o: $(hdrdir)/ruby/internal/eval.h
+psych.o: $(hdrdir)/ruby/internal/event.h
+psych.o: $(hdrdir)/ruby/internal/fl_type.h
+psych.o: $(hdrdir)/ruby/internal/gc.h
+psych.o: $(hdrdir)/ruby/internal/glob.h
+psych.o: $(hdrdir)/ruby/internal/globals.h
+psych.o: $(hdrdir)/ruby/internal/has/attribute.h
+psych.o: $(hdrdir)/ruby/internal/has/builtin.h
+psych.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+psych.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+psych.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+psych.o: $(hdrdir)/ruby/internal/has/extension.h
+psych.o: $(hdrdir)/ruby/internal/has/feature.h
+psych.o: $(hdrdir)/ruby/internal/has/warning.h
+psych.o: $(hdrdir)/ruby/internal/intern/array.h
+psych.o: $(hdrdir)/ruby/internal/intern/bignum.h
+psych.o: $(hdrdir)/ruby/internal/intern/class.h
+psych.o: $(hdrdir)/ruby/internal/intern/compar.h
+psych.o: $(hdrdir)/ruby/internal/intern/complex.h
+psych.o: $(hdrdir)/ruby/internal/intern/cont.h
+psych.o: $(hdrdir)/ruby/internal/intern/dir.h
+psych.o: $(hdrdir)/ruby/internal/intern/enum.h
+psych.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+psych.o: $(hdrdir)/ruby/internal/intern/error.h
+psych.o: $(hdrdir)/ruby/internal/intern/eval.h
+psych.o: $(hdrdir)/ruby/internal/intern/file.h
+psych.o: $(hdrdir)/ruby/internal/intern/gc.h
+psych.o: $(hdrdir)/ruby/internal/intern/hash.h
+psych.o: $(hdrdir)/ruby/internal/intern/io.h
+psych.o: $(hdrdir)/ruby/internal/intern/load.h
+psych.o: $(hdrdir)/ruby/internal/intern/marshal.h
+psych.o: $(hdrdir)/ruby/internal/intern/numeric.h
+psych.o: $(hdrdir)/ruby/internal/intern/object.h
+psych.o: $(hdrdir)/ruby/internal/intern/parse.h
+psych.o: $(hdrdir)/ruby/internal/intern/proc.h
+psych.o: $(hdrdir)/ruby/internal/intern/process.h
+psych.o: $(hdrdir)/ruby/internal/intern/random.h
+psych.o: $(hdrdir)/ruby/internal/intern/range.h
+psych.o: $(hdrdir)/ruby/internal/intern/rational.h
+psych.o: $(hdrdir)/ruby/internal/intern/re.h
+psych.o: $(hdrdir)/ruby/internal/intern/ruby.h
+psych.o: $(hdrdir)/ruby/internal/intern/select.h
+psych.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+psych.o: $(hdrdir)/ruby/internal/intern/signal.h
+psych.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+psych.o: $(hdrdir)/ruby/internal/intern/string.h
+psych.o: $(hdrdir)/ruby/internal/intern/struct.h
+psych.o: $(hdrdir)/ruby/internal/intern/thread.h
+psych.o: $(hdrdir)/ruby/internal/intern/time.h
+psych.o: $(hdrdir)/ruby/internal/intern/variable.h
+psych.o: $(hdrdir)/ruby/internal/intern/vm.h
+psych.o: $(hdrdir)/ruby/internal/interpreter.h
+psych.o: $(hdrdir)/ruby/internal/iterator.h
+psych.o: $(hdrdir)/ruby/internal/memory.h
+psych.o: $(hdrdir)/ruby/internal/method.h
+psych.o: $(hdrdir)/ruby/internal/module.h
+psych.o: $(hdrdir)/ruby/internal/newobj.h
+psych.o: $(hdrdir)/ruby/internal/rgengc.h
+psych.o: $(hdrdir)/ruby/internal/scan_args.h
+psych.o: $(hdrdir)/ruby/internal/special_consts.h
+psych.o: $(hdrdir)/ruby/internal/static_assert.h
+psych.o: $(hdrdir)/ruby/internal/stdalign.h
+psych.o: $(hdrdir)/ruby/internal/stdbool.h
+psych.o: $(hdrdir)/ruby/internal/symbol.h
+psych.o: $(hdrdir)/ruby/internal/token_paste.h
+psych.o: $(hdrdir)/ruby/internal/value.h
+psych.o: $(hdrdir)/ruby/internal/value_type.h
+psych.o: $(hdrdir)/ruby/internal/variable.h
+psych.o: $(hdrdir)/ruby/internal/warning_push.h
+psych.o: $(hdrdir)/ruby/internal/xmalloc.h
+psych.o: $(hdrdir)/ruby/assert.h
+psych.o: $(hdrdir)/ruby/backward.h
+psych.o: $(hdrdir)/ruby/backward/2/assume.h
+psych.o: $(hdrdir)/ruby/backward/2/attributes.h
+psych.o: $(hdrdir)/ruby/backward/2/bool.h
+psych.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+psych.o: $(hdrdir)/ruby/backward/2/inttypes.h
+psych.o: $(hdrdir)/ruby/backward/2/limits.h
+psych.o: $(hdrdir)/ruby/backward/2/long_long.h
+psych.o: $(hdrdir)/ruby/backward/2/stdalign.h
+psych.o: $(hdrdir)/ruby/backward/2/stdarg.h
+psych.o: $(hdrdir)/ruby/defines.h
+psych.o: $(hdrdir)/ruby/encoding.h
+psych.o: $(hdrdir)/ruby/intern.h
+psych.o: $(hdrdir)/ruby/missing.h
+psych.o: $(hdrdir)/ruby/onigmo.h
+psych.o: $(hdrdir)/ruby/oniguruma.h
+psych.o: $(hdrdir)/ruby/ruby.h
+psych.o: $(hdrdir)/ruby/st.h
+psych.o: $(hdrdir)/ruby/subst.h
+psych.o: psych.c
+psych.o: psych.h
+psych.o: psych_emitter.h
+psych.o: psych_parser.h
+psych.o: psych_to_ruby.h
+psych.o: psych_yaml_tree.h
+psych_emitter.o: $(RUBY_EXTCONF_H)
+psych_emitter.o: $(arch_hdrdir)/ruby/config.h
+psych_emitter.o: $(hdrdir)/ruby.h
+psych_emitter.o: $(hdrdir)/ruby/internal/anyargs.h
+psych_emitter.o: $(hdrdir)/ruby/internal/arithmetic.h
+psych_emitter.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+psych_emitter.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+psych_emitter.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+psych_emitter.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+psych_emitter.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+psych_emitter.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+psych_emitter.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+psych_emitter.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+psych_emitter.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+psych_emitter.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+psych_emitter.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+psych_emitter.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+psych_emitter.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+psych_emitter.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+psych_emitter.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+psych_emitter.o: $(hdrdir)/ruby/internal/assume.h
+psych_emitter.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+psych_emitter.o: $(hdrdir)/ruby/internal/attr/artificial.h
+psych_emitter.o: $(hdrdir)/ruby/internal/attr/cold.h
+psych_emitter.o: $(hdrdir)/ruby/internal/attr/const.h
+psych_emitter.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+psych_emitter.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+psych_emitter.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+psych_emitter.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+psych_emitter.o: $(hdrdir)/ruby/internal/attr/error.h
+psych_emitter.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+psych_emitter.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+psych_emitter.o: $(hdrdir)/ruby/internal/attr/format.h
+psych_emitter.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+psych_emitter.o: $(hdrdir)/ruby/internal/attr/noalias.h
+psych_emitter.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+psych_emitter.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+psych_emitter.o: $(hdrdir)/ruby/internal/attr/noinline.h
+psych_emitter.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+psych_emitter.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+psych_emitter.o: $(hdrdir)/ruby/internal/attr/pure.h
+psych_emitter.o: $(hdrdir)/ruby/internal/attr/restrict.h
+psych_emitter.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+psych_emitter.o: $(hdrdir)/ruby/internal/attr/warning.h
+psych_emitter.o: $(hdrdir)/ruby/internal/attr/weakref.h
+psych_emitter.o: $(hdrdir)/ruby/internal/cast.h
+psych_emitter.o: $(hdrdir)/ruby/internal/compiler_is.h
+psych_emitter.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+psych_emitter.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+psych_emitter.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+psych_emitter.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+psych_emitter.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+psych_emitter.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+psych_emitter.o: $(hdrdir)/ruby/internal/compiler_since.h
+psych_emitter.o: $(hdrdir)/ruby/internal/config.h
+psych_emitter.o: $(hdrdir)/ruby/internal/constant_p.h
+psych_emitter.o: $(hdrdir)/ruby/internal/core.h
+psych_emitter.o: $(hdrdir)/ruby/internal/core/rarray.h
+psych_emitter.o: $(hdrdir)/ruby/internal/core/rbasic.h
+psych_emitter.o: $(hdrdir)/ruby/internal/core/rbignum.h
+psych_emitter.o: $(hdrdir)/ruby/internal/core/rclass.h
+psych_emitter.o: $(hdrdir)/ruby/internal/core/rdata.h
+psych_emitter.o: $(hdrdir)/ruby/internal/core/rfile.h
+psych_emitter.o: $(hdrdir)/ruby/internal/core/rhash.h
+psych_emitter.o: $(hdrdir)/ruby/internal/core/robject.h
+psych_emitter.o: $(hdrdir)/ruby/internal/core/rregexp.h
+psych_emitter.o: $(hdrdir)/ruby/internal/core/rstring.h
+psych_emitter.o: $(hdrdir)/ruby/internal/core/rstruct.h
+psych_emitter.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+psych_emitter.o: $(hdrdir)/ruby/internal/ctype.h
+psych_emitter.o: $(hdrdir)/ruby/internal/dllexport.h
+psych_emitter.o: $(hdrdir)/ruby/internal/dosish.h
+psych_emitter.o: $(hdrdir)/ruby/internal/error.h
+psych_emitter.o: $(hdrdir)/ruby/internal/eval.h
+psych_emitter.o: $(hdrdir)/ruby/internal/event.h
+psych_emitter.o: $(hdrdir)/ruby/internal/fl_type.h
+psych_emitter.o: $(hdrdir)/ruby/internal/gc.h
+psych_emitter.o: $(hdrdir)/ruby/internal/glob.h
+psych_emitter.o: $(hdrdir)/ruby/internal/globals.h
+psych_emitter.o: $(hdrdir)/ruby/internal/has/attribute.h
+psych_emitter.o: $(hdrdir)/ruby/internal/has/builtin.h
+psych_emitter.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+psych_emitter.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+psych_emitter.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+psych_emitter.o: $(hdrdir)/ruby/internal/has/extension.h
+psych_emitter.o: $(hdrdir)/ruby/internal/has/feature.h
+psych_emitter.o: $(hdrdir)/ruby/internal/has/warning.h
+psych_emitter.o: $(hdrdir)/ruby/internal/intern/array.h
+psych_emitter.o: $(hdrdir)/ruby/internal/intern/bignum.h
+psych_emitter.o: $(hdrdir)/ruby/internal/intern/class.h
+psych_emitter.o: $(hdrdir)/ruby/internal/intern/compar.h
+psych_emitter.o: $(hdrdir)/ruby/internal/intern/complex.h
+psych_emitter.o: $(hdrdir)/ruby/internal/intern/cont.h
+psych_emitter.o: $(hdrdir)/ruby/internal/intern/dir.h
+psych_emitter.o: $(hdrdir)/ruby/internal/intern/enum.h
+psych_emitter.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+psych_emitter.o: $(hdrdir)/ruby/internal/intern/error.h
+psych_emitter.o: $(hdrdir)/ruby/internal/intern/eval.h
+psych_emitter.o: $(hdrdir)/ruby/internal/intern/file.h
+psych_emitter.o: $(hdrdir)/ruby/internal/intern/gc.h
+psych_emitter.o: $(hdrdir)/ruby/internal/intern/hash.h
+psych_emitter.o: $(hdrdir)/ruby/internal/intern/io.h
+psych_emitter.o: $(hdrdir)/ruby/internal/intern/load.h
+psych_emitter.o: $(hdrdir)/ruby/internal/intern/marshal.h
+psych_emitter.o: $(hdrdir)/ruby/internal/intern/numeric.h
+psych_emitter.o: $(hdrdir)/ruby/internal/intern/object.h
+psych_emitter.o: $(hdrdir)/ruby/internal/intern/parse.h
+psych_emitter.o: $(hdrdir)/ruby/internal/intern/proc.h
+psych_emitter.o: $(hdrdir)/ruby/internal/intern/process.h
+psych_emitter.o: $(hdrdir)/ruby/internal/intern/random.h
+psych_emitter.o: $(hdrdir)/ruby/internal/intern/range.h
+psych_emitter.o: $(hdrdir)/ruby/internal/intern/rational.h
+psych_emitter.o: $(hdrdir)/ruby/internal/intern/re.h
+psych_emitter.o: $(hdrdir)/ruby/internal/intern/ruby.h
+psych_emitter.o: $(hdrdir)/ruby/internal/intern/select.h
+psych_emitter.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+psych_emitter.o: $(hdrdir)/ruby/internal/intern/signal.h
+psych_emitter.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+psych_emitter.o: $(hdrdir)/ruby/internal/intern/string.h
+psych_emitter.o: $(hdrdir)/ruby/internal/intern/struct.h
+psych_emitter.o: $(hdrdir)/ruby/internal/intern/thread.h
+psych_emitter.o: $(hdrdir)/ruby/internal/intern/time.h
+psych_emitter.o: $(hdrdir)/ruby/internal/intern/variable.h
+psych_emitter.o: $(hdrdir)/ruby/internal/intern/vm.h
+psych_emitter.o: $(hdrdir)/ruby/internal/interpreter.h
+psych_emitter.o: $(hdrdir)/ruby/internal/iterator.h
+psych_emitter.o: $(hdrdir)/ruby/internal/memory.h
+psych_emitter.o: $(hdrdir)/ruby/internal/method.h
+psych_emitter.o: $(hdrdir)/ruby/internal/module.h
+psych_emitter.o: $(hdrdir)/ruby/internal/newobj.h
+psych_emitter.o: $(hdrdir)/ruby/internal/rgengc.h
+psych_emitter.o: $(hdrdir)/ruby/internal/scan_args.h
+psych_emitter.o: $(hdrdir)/ruby/internal/special_consts.h
+psych_emitter.o: $(hdrdir)/ruby/internal/static_assert.h
+psych_emitter.o: $(hdrdir)/ruby/internal/stdalign.h
+psych_emitter.o: $(hdrdir)/ruby/internal/stdbool.h
+psych_emitter.o: $(hdrdir)/ruby/internal/symbol.h
+psych_emitter.o: $(hdrdir)/ruby/internal/token_paste.h
+psych_emitter.o: $(hdrdir)/ruby/internal/value.h
+psych_emitter.o: $(hdrdir)/ruby/internal/value_type.h
+psych_emitter.o: $(hdrdir)/ruby/internal/variable.h
+psych_emitter.o: $(hdrdir)/ruby/internal/warning_push.h
+psych_emitter.o: $(hdrdir)/ruby/internal/xmalloc.h
+psych_emitter.o: $(hdrdir)/ruby/assert.h
+psych_emitter.o: $(hdrdir)/ruby/backward.h
+psych_emitter.o: $(hdrdir)/ruby/backward/2/assume.h
+psych_emitter.o: $(hdrdir)/ruby/backward/2/attributes.h
+psych_emitter.o: $(hdrdir)/ruby/backward/2/bool.h
+psych_emitter.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+psych_emitter.o: $(hdrdir)/ruby/backward/2/inttypes.h
+psych_emitter.o: $(hdrdir)/ruby/backward/2/limits.h
+psych_emitter.o: $(hdrdir)/ruby/backward/2/long_long.h
+psych_emitter.o: $(hdrdir)/ruby/backward/2/stdalign.h
+psych_emitter.o: $(hdrdir)/ruby/backward/2/stdarg.h
+psych_emitter.o: $(hdrdir)/ruby/defines.h
+psych_emitter.o: $(hdrdir)/ruby/encoding.h
+psych_emitter.o: $(hdrdir)/ruby/intern.h
+psych_emitter.o: $(hdrdir)/ruby/missing.h
+psych_emitter.o: $(hdrdir)/ruby/onigmo.h
+psych_emitter.o: $(hdrdir)/ruby/oniguruma.h
+psych_emitter.o: $(hdrdir)/ruby/ruby.h
+psych_emitter.o: $(hdrdir)/ruby/st.h
+psych_emitter.o: $(hdrdir)/ruby/subst.h
+psych_emitter.o: psych.h
+psych_emitter.o: psych_emitter.c
+psych_emitter.o: psych_emitter.h
+psych_emitter.o: psych_parser.h
+psych_emitter.o: psych_to_ruby.h
+psych_emitter.o: psych_yaml_tree.h
+psych_parser.o: $(RUBY_EXTCONF_H)
+psych_parser.o: $(arch_hdrdir)/ruby/config.h
+psych_parser.o: $(hdrdir)/ruby.h
+psych_parser.o: $(hdrdir)/ruby/internal/anyargs.h
+psych_parser.o: $(hdrdir)/ruby/internal/arithmetic.h
+psych_parser.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+psych_parser.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+psych_parser.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+psych_parser.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+psych_parser.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+psych_parser.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+psych_parser.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+psych_parser.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+psych_parser.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+psych_parser.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+psych_parser.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+psych_parser.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+psych_parser.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+psych_parser.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+psych_parser.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+psych_parser.o: $(hdrdir)/ruby/internal/assume.h
+psych_parser.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+psych_parser.o: $(hdrdir)/ruby/internal/attr/artificial.h
+psych_parser.o: $(hdrdir)/ruby/internal/attr/cold.h
+psych_parser.o: $(hdrdir)/ruby/internal/attr/const.h
+psych_parser.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+psych_parser.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+psych_parser.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+psych_parser.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+psych_parser.o: $(hdrdir)/ruby/internal/attr/error.h
+psych_parser.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+psych_parser.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+psych_parser.o: $(hdrdir)/ruby/internal/attr/format.h
+psych_parser.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+psych_parser.o: $(hdrdir)/ruby/internal/attr/noalias.h
+psych_parser.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+psych_parser.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+psych_parser.o: $(hdrdir)/ruby/internal/attr/noinline.h
+psych_parser.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+psych_parser.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+psych_parser.o: $(hdrdir)/ruby/internal/attr/pure.h
+psych_parser.o: $(hdrdir)/ruby/internal/attr/restrict.h
+psych_parser.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+psych_parser.o: $(hdrdir)/ruby/internal/attr/warning.h
+psych_parser.o: $(hdrdir)/ruby/internal/attr/weakref.h
+psych_parser.o: $(hdrdir)/ruby/internal/cast.h
+psych_parser.o: $(hdrdir)/ruby/internal/compiler_is.h
+psych_parser.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+psych_parser.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+psych_parser.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+psych_parser.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+psych_parser.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+psych_parser.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+psych_parser.o: $(hdrdir)/ruby/internal/compiler_since.h
+psych_parser.o: $(hdrdir)/ruby/internal/config.h
+psych_parser.o: $(hdrdir)/ruby/internal/constant_p.h
+psych_parser.o: $(hdrdir)/ruby/internal/core.h
+psych_parser.o: $(hdrdir)/ruby/internal/core/rarray.h
+psych_parser.o: $(hdrdir)/ruby/internal/core/rbasic.h
+psych_parser.o: $(hdrdir)/ruby/internal/core/rbignum.h
+psych_parser.o: $(hdrdir)/ruby/internal/core/rclass.h
+psych_parser.o: $(hdrdir)/ruby/internal/core/rdata.h
+psych_parser.o: $(hdrdir)/ruby/internal/core/rfile.h
+psych_parser.o: $(hdrdir)/ruby/internal/core/rhash.h
+psych_parser.o: $(hdrdir)/ruby/internal/core/robject.h
+psych_parser.o: $(hdrdir)/ruby/internal/core/rregexp.h
+psych_parser.o: $(hdrdir)/ruby/internal/core/rstring.h
+psych_parser.o: $(hdrdir)/ruby/internal/core/rstruct.h
+psych_parser.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+psych_parser.o: $(hdrdir)/ruby/internal/ctype.h
+psych_parser.o: $(hdrdir)/ruby/internal/dllexport.h
+psych_parser.o: $(hdrdir)/ruby/internal/dosish.h
+psych_parser.o: $(hdrdir)/ruby/internal/error.h
+psych_parser.o: $(hdrdir)/ruby/internal/eval.h
+psych_parser.o: $(hdrdir)/ruby/internal/event.h
+psych_parser.o: $(hdrdir)/ruby/internal/fl_type.h
+psych_parser.o: $(hdrdir)/ruby/internal/gc.h
+psych_parser.o: $(hdrdir)/ruby/internal/glob.h
+psych_parser.o: $(hdrdir)/ruby/internal/globals.h
+psych_parser.o: $(hdrdir)/ruby/internal/has/attribute.h
+psych_parser.o: $(hdrdir)/ruby/internal/has/builtin.h
+psych_parser.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+psych_parser.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+psych_parser.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+psych_parser.o: $(hdrdir)/ruby/internal/has/extension.h
+psych_parser.o: $(hdrdir)/ruby/internal/has/feature.h
+psych_parser.o: $(hdrdir)/ruby/internal/has/warning.h
+psych_parser.o: $(hdrdir)/ruby/internal/intern/array.h
+psych_parser.o: $(hdrdir)/ruby/internal/intern/bignum.h
+psych_parser.o: $(hdrdir)/ruby/internal/intern/class.h
+psych_parser.o: $(hdrdir)/ruby/internal/intern/compar.h
+psych_parser.o: $(hdrdir)/ruby/internal/intern/complex.h
+psych_parser.o: $(hdrdir)/ruby/internal/intern/cont.h
+psych_parser.o: $(hdrdir)/ruby/internal/intern/dir.h
+psych_parser.o: $(hdrdir)/ruby/internal/intern/enum.h
+psych_parser.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+psych_parser.o: $(hdrdir)/ruby/internal/intern/error.h
+psych_parser.o: $(hdrdir)/ruby/internal/intern/eval.h
+psych_parser.o: $(hdrdir)/ruby/internal/intern/file.h
+psych_parser.o: $(hdrdir)/ruby/internal/intern/gc.h
+psych_parser.o: $(hdrdir)/ruby/internal/intern/hash.h
+psych_parser.o: $(hdrdir)/ruby/internal/intern/io.h
+psych_parser.o: $(hdrdir)/ruby/internal/intern/load.h
+psych_parser.o: $(hdrdir)/ruby/internal/intern/marshal.h
+psych_parser.o: $(hdrdir)/ruby/internal/intern/numeric.h
+psych_parser.o: $(hdrdir)/ruby/internal/intern/object.h
+psych_parser.o: $(hdrdir)/ruby/internal/intern/parse.h
+psych_parser.o: $(hdrdir)/ruby/internal/intern/proc.h
+psych_parser.o: $(hdrdir)/ruby/internal/intern/process.h
+psych_parser.o: $(hdrdir)/ruby/internal/intern/random.h
+psych_parser.o: $(hdrdir)/ruby/internal/intern/range.h
+psych_parser.o: $(hdrdir)/ruby/internal/intern/rational.h
+psych_parser.o: $(hdrdir)/ruby/internal/intern/re.h
+psych_parser.o: $(hdrdir)/ruby/internal/intern/ruby.h
+psych_parser.o: $(hdrdir)/ruby/internal/intern/select.h
+psych_parser.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+psych_parser.o: $(hdrdir)/ruby/internal/intern/signal.h
+psych_parser.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+psych_parser.o: $(hdrdir)/ruby/internal/intern/string.h
+psych_parser.o: $(hdrdir)/ruby/internal/intern/struct.h
+psych_parser.o: $(hdrdir)/ruby/internal/intern/thread.h
+psych_parser.o: $(hdrdir)/ruby/internal/intern/time.h
+psych_parser.o: $(hdrdir)/ruby/internal/intern/variable.h
+psych_parser.o: $(hdrdir)/ruby/internal/intern/vm.h
+psych_parser.o: $(hdrdir)/ruby/internal/interpreter.h
+psych_parser.o: $(hdrdir)/ruby/internal/iterator.h
+psych_parser.o: $(hdrdir)/ruby/internal/memory.h
+psych_parser.o: $(hdrdir)/ruby/internal/method.h
+psych_parser.o: $(hdrdir)/ruby/internal/module.h
+psych_parser.o: $(hdrdir)/ruby/internal/newobj.h
+psych_parser.o: $(hdrdir)/ruby/internal/rgengc.h
+psych_parser.o: $(hdrdir)/ruby/internal/scan_args.h
+psych_parser.o: $(hdrdir)/ruby/internal/special_consts.h
+psych_parser.o: $(hdrdir)/ruby/internal/static_assert.h
+psych_parser.o: $(hdrdir)/ruby/internal/stdalign.h
+psych_parser.o: $(hdrdir)/ruby/internal/stdbool.h
+psych_parser.o: $(hdrdir)/ruby/internal/symbol.h
+psych_parser.o: $(hdrdir)/ruby/internal/token_paste.h
+psych_parser.o: $(hdrdir)/ruby/internal/value.h
+psych_parser.o: $(hdrdir)/ruby/internal/value_type.h
+psych_parser.o: $(hdrdir)/ruby/internal/variable.h
+psych_parser.o: $(hdrdir)/ruby/internal/warning_push.h
+psych_parser.o: $(hdrdir)/ruby/internal/xmalloc.h
+psych_parser.o: $(hdrdir)/ruby/assert.h
+psych_parser.o: $(hdrdir)/ruby/backward.h
+psych_parser.o: $(hdrdir)/ruby/backward/2/assume.h
+psych_parser.o: $(hdrdir)/ruby/backward/2/attributes.h
+psych_parser.o: $(hdrdir)/ruby/backward/2/bool.h
+psych_parser.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+psych_parser.o: $(hdrdir)/ruby/backward/2/inttypes.h
+psych_parser.o: $(hdrdir)/ruby/backward/2/limits.h
+psych_parser.o: $(hdrdir)/ruby/backward/2/long_long.h
+psych_parser.o: $(hdrdir)/ruby/backward/2/stdalign.h
+psych_parser.o: $(hdrdir)/ruby/backward/2/stdarg.h
+psych_parser.o: $(hdrdir)/ruby/defines.h
+psych_parser.o: $(hdrdir)/ruby/encoding.h
+psych_parser.o: $(hdrdir)/ruby/intern.h
+psych_parser.o: $(hdrdir)/ruby/missing.h
+psych_parser.o: $(hdrdir)/ruby/onigmo.h
+psych_parser.o: $(hdrdir)/ruby/oniguruma.h
+psych_parser.o: $(hdrdir)/ruby/ruby.h
+psych_parser.o: $(hdrdir)/ruby/st.h
+psych_parser.o: $(hdrdir)/ruby/subst.h
+psych_parser.o: psych.h
+psych_parser.o: psych_emitter.h
+psych_parser.o: psych_parser.c
+psych_parser.o: psych_parser.h
+psych_parser.o: psych_to_ruby.h
+psych_parser.o: psych_yaml_tree.h
+psych_to_ruby.o: $(RUBY_EXTCONF_H)
+psych_to_ruby.o: $(arch_hdrdir)/ruby/config.h
+psych_to_ruby.o: $(hdrdir)/ruby.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/anyargs.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/arithmetic.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/assume.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/attr/artificial.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/attr/cold.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/attr/const.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/attr/error.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/attr/format.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/attr/noalias.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/attr/noinline.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/attr/pure.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/attr/restrict.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/attr/warning.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/attr/weakref.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/cast.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/compiler_is.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/compiler_since.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/config.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/constant_p.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/core.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/core/rarray.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/core/rbasic.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/core/rbignum.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/core/rclass.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/core/rdata.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/core/rfile.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/core/rhash.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/core/robject.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/core/rregexp.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/core/rstring.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/core/rstruct.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/ctype.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/dllexport.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/dosish.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/error.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/eval.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/event.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/fl_type.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/gc.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/glob.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/globals.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/has/attribute.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/has/builtin.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/has/extension.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/has/feature.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/has/warning.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/array.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/bignum.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/class.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/compar.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/complex.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/cont.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/dir.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/enum.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/error.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/eval.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/file.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/gc.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/hash.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/io.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/load.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/marshal.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/numeric.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/object.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/parse.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/proc.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/process.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/random.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/range.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/rational.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/re.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/ruby.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/select.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/signal.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/string.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/struct.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/thread.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/time.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/variable.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/intern/vm.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/interpreter.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/iterator.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/memory.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/method.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/module.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/newobj.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/rgengc.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/scan_args.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/special_consts.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/static_assert.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/stdalign.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/stdbool.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/symbol.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/token_paste.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/value.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/value_type.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/variable.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/warning_push.h
+psych_to_ruby.o: $(hdrdir)/ruby/internal/xmalloc.h
+psych_to_ruby.o: $(hdrdir)/ruby/assert.h
+psych_to_ruby.o: $(hdrdir)/ruby/backward.h
+psych_to_ruby.o: $(hdrdir)/ruby/backward/2/assume.h
+psych_to_ruby.o: $(hdrdir)/ruby/backward/2/attributes.h
+psych_to_ruby.o: $(hdrdir)/ruby/backward/2/bool.h
+psych_to_ruby.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+psych_to_ruby.o: $(hdrdir)/ruby/backward/2/inttypes.h
+psych_to_ruby.o: $(hdrdir)/ruby/backward/2/limits.h
+psych_to_ruby.o: $(hdrdir)/ruby/backward/2/long_long.h
+psych_to_ruby.o: $(hdrdir)/ruby/backward/2/stdalign.h
+psych_to_ruby.o: $(hdrdir)/ruby/backward/2/stdarg.h
+psych_to_ruby.o: $(hdrdir)/ruby/defines.h
+psych_to_ruby.o: $(hdrdir)/ruby/encoding.h
+psych_to_ruby.o: $(hdrdir)/ruby/intern.h
+psych_to_ruby.o: $(hdrdir)/ruby/missing.h
+psych_to_ruby.o: $(hdrdir)/ruby/onigmo.h
+psych_to_ruby.o: $(hdrdir)/ruby/oniguruma.h
+psych_to_ruby.o: $(hdrdir)/ruby/ruby.h
+psych_to_ruby.o: $(hdrdir)/ruby/st.h
+psych_to_ruby.o: $(hdrdir)/ruby/subst.h
+psych_to_ruby.o: psych.h
+psych_to_ruby.o: psych_emitter.h
+psych_to_ruby.o: psych_parser.h
+psych_to_ruby.o: psych_to_ruby.c
+psych_to_ruby.o: psych_to_ruby.h
+psych_to_ruby.o: psych_yaml_tree.h
+psych_yaml_tree.o: $(RUBY_EXTCONF_H)
+psych_yaml_tree.o: $(arch_hdrdir)/ruby/config.h
+psych_yaml_tree.o: $(hdrdir)/ruby.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/anyargs.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/arithmetic.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/assume.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/attr/artificial.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/attr/cold.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/attr/const.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/attr/error.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/attr/format.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/attr/noalias.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/attr/noinline.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/attr/pure.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/attr/restrict.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/attr/warning.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/attr/weakref.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/cast.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/compiler_is.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/compiler_since.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/config.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/constant_p.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/core.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/core/rarray.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/core/rbasic.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/core/rbignum.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/core/rclass.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/core/rdata.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/core/rfile.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/core/rhash.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/core/robject.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/core/rregexp.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/core/rstring.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/core/rstruct.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/ctype.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/dllexport.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/dosish.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/error.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/eval.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/event.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/fl_type.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/gc.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/glob.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/globals.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/has/attribute.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/has/builtin.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/has/extension.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/has/feature.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/has/warning.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/array.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/bignum.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/class.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/compar.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/complex.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/cont.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/dir.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/enum.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/error.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/eval.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/file.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/gc.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/hash.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/io.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/load.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/marshal.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/numeric.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/object.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/parse.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/proc.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/process.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/random.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/range.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/rational.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/re.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/ruby.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/select.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/signal.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/string.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/struct.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/thread.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/time.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/variable.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/intern/vm.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/interpreter.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/iterator.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/memory.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/method.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/module.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/newobj.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/rgengc.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/scan_args.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/special_consts.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/static_assert.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/stdalign.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/stdbool.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/symbol.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/token_paste.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/value.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/value_type.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/variable.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/warning_push.h
+psych_yaml_tree.o: $(hdrdir)/ruby/internal/xmalloc.h
+psych_yaml_tree.o: $(hdrdir)/ruby/assert.h
+psych_yaml_tree.o: $(hdrdir)/ruby/backward.h
+psych_yaml_tree.o: $(hdrdir)/ruby/backward/2/assume.h
+psych_yaml_tree.o: $(hdrdir)/ruby/backward/2/attributes.h
+psych_yaml_tree.o: $(hdrdir)/ruby/backward/2/bool.h
+psych_yaml_tree.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+psych_yaml_tree.o: $(hdrdir)/ruby/backward/2/inttypes.h
+psych_yaml_tree.o: $(hdrdir)/ruby/backward/2/limits.h
+psych_yaml_tree.o: $(hdrdir)/ruby/backward/2/long_long.h
+psych_yaml_tree.o: $(hdrdir)/ruby/backward/2/stdalign.h
+psych_yaml_tree.o: $(hdrdir)/ruby/backward/2/stdarg.h
+psych_yaml_tree.o: $(hdrdir)/ruby/defines.h
+psych_yaml_tree.o: $(hdrdir)/ruby/encoding.h
+psych_yaml_tree.o: $(hdrdir)/ruby/intern.h
+psych_yaml_tree.o: $(hdrdir)/ruby/missing.h
+psych_yaml_tree.o: $(hdrdir)/ruby/onigmo.h
+psych_yaml_tree.o: $(hdrdir)/ruby/oniguruma.h
+psych_yaml_tree.o: $(hdrdir)/ruby/ruby.h
+psych_yaml_tree.o: $(hdrdir)/ruby/st.h
+psych_yaml_tree.o: $(hdrdir)/ruby/subst.h
+psych_yaml_tree.o: psych.h
+psych_yaml_tree.o: psych_emitter.h
+psych_yaml_tree.o: psych_parser.h
+psych_yaml_tree.o: psych_to_ruby.h
+psych_yaml_tree.o: psych_yaml_tree.c
+psych_yaml_tree.o: psych_yaml_tree.h
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/psych/extconf.rb b/ext/psych/extconf.rb
index be33d35a5e..857f8e68c4 100644
--- a/ext/psych/extconf.rb
+++ b/ext/psych/extconf.rb
@@ -1,5 +1,5 @@
 # -*- coding: us-ascii -*-
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'mkmf'
 require 'fileutils'
 
@@ -13,8 +13,10 @@ if enable_config("bundled-libyaml", false) || !(find_header('yaml.h') && find_li
   $VPATH << "$(srcdir)/yaml"
   $INCFLAGS << " -I$(srcdir)/yaml"
 
-  $srcs = Dir.glob("#{$srcdir}/{,yaml/}*.c").map {|n| File.basename(n)}
+  $srcs = Dir.glob("#{$srcdir}/{,yaml/}*.c").map {|n| File.basename(n)}.sort
 
+  header = 'yaml/yaml.h'
+  header = "{$(VPATH)}#{header}" if $nmake
   if have_macro("_WIN32")
     $CPPFLAGS << " -DYAML_DECLARE_STATIC -DHAVE_CONFIG_H"
   end
@@ -34,6 +36,8 @@ if enable_config("bundled-libyaml", false) || !(find_header('yaml.h') && find_li
   have_header 'config.h'
 end
 
-create_makefile 'psych'
+create_makefile 'psych' do |mk|
+  mk << "YAML_H = #{header}".strip << "\n"
+end
 
 # :startdoc:
diff --git a/ext/psych/lib/psych.rb b/ext/psych/lib/psych.rb
index f442e544ce..34d2218549 100644
--- a/ext/psych/lib/psych.rb
+++ b/ext/psych/lib/psych.rb
@@ -1,8 +1,14 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
+require 'psych/versions'
 case RUBY_ENGINE
 when 'jruby'
   require 'psych_jars'
-  org.jruby.ext.psych.PsychLibrary.new.load(JRuby.runtime, false)
+  if JRuby::Util.respond_to?(:load_ext)
+    JRuby::Util.load_ext('org.jruby.ext.psych.PsychLibrary')
+  else
+    require 'java'; require 'jruby'
+    org.jruby.ext.psych.PsychLibrary.new.load(JRuby.runtime, false)
+  end
 else
   require 'psych.so'
 end
@@ -16,7 +22,6 @@ require 'psych/omap'
 require 'psych/set'
 require 'psych/coder'
 require 'psych/core_ext'
-require 'psych/deprecated'
 require 'psych/stream'
 require 'psych/json/tree_builder'
 require 'psych/json/stream'
@@ -27,7 +32,7 @@ require 'psych/class_loader'
 # = Overview
 #
 # Psych is a YAML parser and emitter.
-# Psych leverages libyaml [Home page: http://pyyaml.org/wiki/LibYAML]
+# Psych leverages libyaml [Home page: https://pyyaml.org/wiki/LibYAML]
 # or [HG repo: https://bitbucket.org/xi/libyaml] for its YAML parsing
 # and emitting capabilities. In addition to wrapping libyaml, Psych also
 # knows how to serialize and de-serialize most Ruby objects to and from
@@ -69,12 +74,15 @@ require 'psych/class_loader'
 #
 # ==== Reading from a string
 #
-#   Psych.load("--- a")             # => 'a'
-#   Psych.load("---\n - a\n - b")   # => ['a', 'b']
+#   Psych.safe_load("--- a")             # => 'a'
+#   Psych.safe_load("---\n - a\n - b")   # => ['a', 'b']
+#   # From a trusted string:
+#   Psych.load("--- !ruby/range\nbegin: 0\nend: 42\nexcl: false\n") # => 0..42
 #
 # ==== Reading from a file
 #
-#   Psych.load_file("database.yml")
+#   Psych.safe_load_file("data.yml", permitted_classes: [Date])
+#   Psych.load_file("trusted_database.yml")
 #
 # ==== Exception handling
 #
@@ -194,12 +202,13 @@ require 'psych/class_loader'
 #
 # ==== Receiving an events stream
 #
-#   parser = Psych::Parser.new(Psych::Handlers::Recorder.new)
+#   recorder = Psych::Handlers::Recorder.new
+#   parser = Psych::Parser.new(recorder)
 #
 #   parser.parse("---\n - a\n - b")
-#   parser.events # => [list of [event, args] lists]
-#                 # event is one of: Psych::Handler::EVENTS
-#                 # args are the arguments passed to the event
+#   recorder.events # => [list of [event, args] lists]
+#                   # event is one of: Psych::Handler::EVENTS
+#                   # args are the arguments passed to the event
 #
 # === Emitting
 #
@@ -223,17 +232,18 @@ require 'psych/class_loader'
 #   # => "a"
 
 module Psych
-  # The version is Psych you're using
-  VERSION         = '2.0.17'
-
   # The version of libyaml Psych is using
-  LIBYAML_VERSION = Psych.libyaml_version.join '.'
+  LIBYAML_VERSION = Psych.libyaml_version.join('.').freeze
+  # Deprecation guard
+  NOT_GIVEN = Object.new.freeze
+  private_constant :NOT_GIVEN
 
   ###
   # Load +yaml+ in to a Ruby data structure.  If multiple documents are
   # provided, the object contained in the first document will be returned.
-  # +filename+ will be used in the exception message if any exception is raised
-  # while parsing.
+  # +filename+ will be used in the exception message if any exception
+  # is raised while parsing.  If +yaml+ is empty, it returns
+  # the specified +fallback+ return value, which defaults to +false+.
   #
   # Raises a Psych::SyntaxError when a YAML syntax error is detected.
   #
@@ -243,15 +253,35 @@ module Psych
   #   Psych.load("---\n - a\n - b")   # => ['a', 'b']
   #
   #   begin
-  #     Psych.load("--- `", "file.txt")
+  #     Psych.load("--- `", filename: "file.txt")
   #   rescue Psych::SyntaxError => ex
   #     ex.file    # => 'file.txt'
   #     ex.message # => "(file.txt): found character that cannot start any token"
   #   end
-  def self.load yaml, filename = nil
-    result = parse(yaml, filename)
-    result ? result.to_ruby : result
+  #
+  # When the optional +symbolize_names+ keyword argument is set to a
+  # true value, returns symbols for keys in Hash objects (default: strings).
+  #
+  #   Psych.load("---\n foo: bar")                         # => {"foo"=>"bar"}
+  #   Psych.load("---\n foo: bar", symbolize_names: true)  # => {:foo=>"bar"}
+  #
+  # Raises a TypeError when `yaml` parameter is NilClass
+  #
+  # NOTE: This method *should not* be used to parse untrusted documents, such as
+  # YAML documents that are supplied via user input.  Instead, please use the
+  # safe_load method.
+  #
+  def self.unsafe_load yaml, legacy_filename = NOT_GIVEN, filename: nil, fallback: false, symbolize_names: false, freeze: false
+    if legacy_filename != NOT_GIVEN
+      warn_with_uplevel 'Passing filename with the 2nd argument of Psych.load is deprecated. Use keyword argument like Psych.load(yaml, filename: ...) instead.', uplevel: 1 if $VERBOSE
+      filename = legacy_filename
+    end
+
+    result = parse(yaml, filename: filename)
+    return fallback unless result
+    result.to_ruby(symbolize_names: symbolize_names, freeze: freeze)
   end
+  class << self; alias :load :unsafe_load; end
 
   ###
   # Safely load the yaml string in +yaml+.  By default, only the following
@@ -266,40 +296,71 @@ module Psych
   # * Hash
   #
   # Recursive data structures are not allowed by default.  Arbitrary classes
-  # can be allowed by adding those classes to the +whitelist+.  They are
+  # can be allowed by adding those classes to the +permitted_classes+ keyword argument.  They are
   # additive.  For example, to allow Date deserialization:
   #
-  #   Psych.safe_load(yaml, [Date])
+  #   Psych.safe_load(yaml, permitted_classes: [Date])
   #
   # Now the Date class can be loaded in addition to the classes listed above.
   #
-  # Aliases can be explicitly allowed by changing the +aliases+ parameter.
+  # Aliases can be explicitly allowed by changing the +aliases+ keyword argument.
   # For example:
   #
   #   x = []
   #   x << x
   #   yaml = Psych.dump x
   #   Psych.safe_load yaml               # => raises an exception
-  #   Psych.safe_load yaml, [], [], true # => loads the aliases
+  #   Psych.safe_load yaml, aliases: true # => loads the aliases
   #
   # A Psych::DisallowedClass exception will be raised if the yaml contains a
-  # class that isn't in the whitelist.
+  # class that isn't in the +permitted_classes+ list.
   #
   # A Psych::BadAlias exception will be raised if the yaml contains aliases
-  # but the +aliases+ parameter is set to false.
-  def self.safe_load yaml, whitelist_classes = [], whitelist_symbols = [], aliases = false, filename = nil
-    result = parse(yaml, filename)
-    return unless result
+  # but the +aliases+ keyword argument is set to false.
+  #
+  # +filename+ will be used in the exception message if any exception is raised
+  # while parsing.
+  #
+  # When the optional +symbolize_names+ keyword argument is set to a
+  # true value, returns symbols for keys in Hash objects (default: strings).
+  #
+  #   Psych.safe_load("---\n foo: bar")                         # => {"foo"=>"bar"}
+  #   Psych.safe_load("---\n foo: bar", symbolize_names: true)  # => {:foo=>"bar"}
+  #
+  def self.safe_load yaml, legacy_permitted_classes = NOT_GIVEN, legacy_permitted_symbols = NOT_GIVEN, legacy_aliases = NOT_GIVEN, legacy_filename = NOT_GIVEN, permitted_classes: [], permitted_symbols: [], aliases: false, filename: nil, fallback: nil, symbolize_names: false, freeze: false
+    if legacy_permitted_classes != NOT_GIVEN
+      warn_with_uplevel 'Passing permitted_classes with the 2nd argument of Psych.safe_load is deprecated. Use keyword argument like Psych.safe_load(yaml, permitted_classes: ...) instead.', uplevel: 1 if $VERBOSE
+      permitted_classes = legacy_permitted_classes
+    end
 
-    class_loader = ClassLoader::Restricted.new(whitelist_classes.map(&:to_s),
-                                               whitelist_symbols.map(&:to_s))
-    scanner      = ScalarScanner.new class_loader
-    if aliases
-      visitor = Visitors::ToRuby.new scanner, class_loader
-    else
-      visitor = Visitors::NoAliasRuby.new scanner, class_loader
+    if legacy_permitted_symbols != NOT_GIVEN
+      warn_with_uplevel 'Passing permitted_symbols with the 3rd argument of Psych.safe_load is deprecated. Use keyword argument like Psych.safe_load(yaml, permitted_symbols: ...) instead.', uplevel: 1 if $VERBOSE
+      permitted_symbols = legacy_permitted_symbols
+    end
+
+    if legacy_aliases != NOT_GIVEN
+      warn_with_uplevel 'Passing aliases with the 4th argument of Psych.safe_load is deprecated. Use keyword argument like Psych.safe_load(yaml, aliases: ...) instead.', uplevel: 1 if $VERBOSE
+      aliases = legacy_aliases
+    end
+
+    if legacy_filename != NOT_GIVEN
+      warn_with_uplevel 'Passing filename with the 5th argument of Psych.safe_load is deprecated. Use keyword argument like Psych.safe_load(yaml, filename: ...) instead.', uplevel: 1 if $VERBOSE
+      filename = legacy_filename
     end
-    visitor.accept result
+
+    result = parse(yaml, filename: filename)
+    return fallback unless result
+
+    class_loader = ClassLoader::Restricted.new(permitted_classes.map(&:to_s),
+                                               permitted_symbols.map(&:to_s))
+    scanner      = ScalarScanner.new class_loader
+    visitor = if aliases
+                Visitors::ToRuby.new scanner, class_loader, symbolize_names: symbolize_names, freeze: freeze
+              else
+                Visitors::NoAliasRuby.new scanner, class_loader, symbolize_names: symbolize_names, freeze: freeze
+              end
+    result = visitor.accept result
+    result
   end
 
   ###
@@ -314,28 +375,40 @@ module Psych
   #   Psych.parse("---\n - a\n - b") # => #<Psych::Nodes::Document:0x00>
   #
   #   begin
-  #     Psych.parse("--- `", "file.txt")
+  #     Psych.parse("--- `", filename: "file.txt")
   #   rescue Psych::SyntaxError => ex
   #     ex.file    # => 'file.txt'
   #     ex.message # => "(file.txt): found character that cannot start any token"
   #   end
   #
   # See Psych::Nodes for more information about YAML AST.
-  def self.parse yaml, filename = nil
-    parse_stream(yaml, filename) do |node|
+  def self.parse yaml, legacy_filename = NOT_GIVEN, filename: nil, fallback: NOT_GIVEN
+    if legacy_filename != NOT_GIVEN
+      warn_with_uplevel 'Passing filename with the 2nd argument of Psych.parse is deprecated. Use keyword argument like Psych.parse(yaml, filename: ...) instead.', uplevel: 1 if $VERBOSE
+      filename = legacy_filename
+    end
+
+    parse_stream(yaml, filename: filename) do |node|
       return node
     end
-    false
+
+    if fallback != NOT_GIVEN
+      warn_with_uplevel 'Passing the `fallback` keyword argument of Psych.parse is deprecated.', uplevel: 1 if $VERBOSE
+      fallback
+    else
+      false
+    end
   end
 
   ###
   # Parse a file at +filename+. Returns the Psych::Nodes::Document.
   #
   # Raises a Psych::SyntaxError when a YAML syntax error is detected.
-  def self.parse_file filename
-    File.open filename, 'r:bom|utf-8' do |f|
-      parse f, filename
+  def self.parse_file filename, fallback: false
+    result = File.open filename, 'r:bom|utf-8' do |f|
+      parse f, filename: filename
     end
+    result || fallback
   end
 
   ###
@@ -364,14 +437,21 @@ module Psych
   #   end
   #
   #   begin
-  #     Psych.parse_stream("--- `", "file.txt")
+  #     Psych.parse_stream("--- `", filename: "file.txt")
   #   rescue Psych::SyntaxError => ex
   #     ex.file    # => 'file.txt'
   #     ex.message # => "(file.txt): found character that cannot start any token"
   #   end
   #
+  # Raises a TypeError when NilClass is passed.
+  #
   # See Psych::Nodes for more information about YAML AST.
-  def self.parse_stream yaml, filename = nil, &block
+  def self.parse_stream yaml, legacy_filename = NOT_GIVEN, filename: nil, &block
+    if legacy_filename != NOT_GIVEN
+      warn_with_uplevel 'Passing filename with the 2nd argument of Psych.parse_stream is deprecated. Use keyword argument like Psych.parse_stream(yaml, filename: ...) instead.', uplevel: 1 if $VERBOSE
+      filename = legacy_filename
+    end
+
     if block_given?
       parser = Psych::Parser.new(Handlers::DocumentStream.new(&block))
       parser.parse yaml, filename
@@ -393,6 +473,24 @@ module Psych
   # to control the output format.  If an IO object is passed in, the YAML will
   # be dumped to that IO object.
   #
+  # Currently supported options are:
+  #
+  # [<tt>:indentation</tt>]   Number of space characters used to indent.
+  #                           Acceptable value should be in <tt>0..9</tt> range,
+  #                           otherwise option is ignored.
+  #
+  #                           Default: <tt>2</tt>.
+  # [<tt>:line_width</tt>]    Max character to wrap line at.
+  #
+  #                           Default: <tt>0</tt> (meaning "wrap at 81").
+  # [<tt>:canonical</tt>]     Write "canonical" YAML form (very verbose, yet
+  #                           strictly formal).
+  #
+  #                           Default: <tt>false</tt>.
+  # [<tt>:header</tt>]        Write <tt>%YAML [version]</tt> at the beginning of document.
+  #
+  #                           Default: <tt>false</tt>.
+  #
   # Example:
   #
   #   # Dump an array, get back a YAML string
@@ -402,10 +500,10 @@ module Psych
   #   Psych.dump(['a', 'b'], StringIO.new)  # => #<StringIO:0x000001009d0890>
   #
   #   # Dump an array with indentation set
-  #   Psych.dump(['a', ['b']], :indentation => 3) # => "---\n- a\n-  - b\n"
+  #   Psych.dump(['a', ['b']], indentation: 3) # => "---\n- a\n-  - b\n"
   #
   #   # Dump an array to an IO with indentation set
-  #   Psych.dump(['a', ['b']], StringIO.new, :indentation => 3)
+  #   Psych.dump(['a', ['b']], StringIO.new, indentation: 3)
   def self.dump o, io = nil, options = {}
     if Hash === io
       options = io
@@ -454,52 +552,114 @@ module Psych
   #   end
   #   list # => ['foo', 'bar']
   #
-  def self.load_stream yaml, filename = nil
-    if block_given?
-      parse_stream(yaml, filename) do |node|
-        yield node.to_ruby
-      end
-    else
-      parse_stream(yaml, filename).children.map { |child| child.to_ruby }
+  def self.load_stream yaml, legacy_filename = NOT_GIVEN, filename: nil, fallback: [], **kwargs
+    if legacy_filename != NOT_GIVEN
+      warn_with_uplevel 'Passing filename with the 2nd argument of Psych.load_stream is deprecated. Use keyword argument like Psych.load_stream(yaml, filename: ...) instead.', uplevel: 1 if $VERBOSE
+      filename = legacy_filename
     end
+
+    result = if block_given?
+               parse_stream(yaml, filename: filename) do |node|
+                 yield node.to_ruby(**kwargs)
+               end
+             else
+               parse_stream(yaml, filename: filename).children.map { |node| node.to_ruby(**kwargs) }
+             end
+
+    return fallback if result.is_a?(Array) && result.empty?
+    result
   end
 
   ###
   # Load the document contained in +filename+.  Returns the yaml contained in
-  # +filename+ as a Ruby object
-  def self.load_file filename
-    File.open(filename, 'r:bom|utf-8') { |f| self.load f, filename }
+  # +filename+ as a Ruby object, or if the file is empty, it returns
+  # the specified +fallback+ return value, which defaults to +false+.
+  #
+  # NOTE: This method *should not* be used to parse untrusted documents, such as
+  # YAML documents that are supplied via user input.  Instead, please use the
+  # safe_load_file method.
+  def self.unsafe_load_file filename, **kwargs
+    File.open(filename, 'r:bom|utf-8') { |f|
+      self.unsafe_load f, filename: filename, **kwargs
+    }
+  end
+  class << self; alias :load_file :unsafe_load_file; end
+
+  ###
+  # Safely loads the document contained in +filename+.  Returns the yaml contained in
+  # +filename+ as a Ruby object, or if the file is empty, it returns
+  # the specified +fallback+ return value, which defaults to +false+.
+  # See safe_load for options.
+  def self.safe_load_file filename, **kwargs
+    File.open(filename, 'r:bom|utf-8') { |f|
+      self.safe_load f, filename: filename, **kwargs
+    }
   end
 
   # :stopdoc:
-  @domain_types = {}
   def self.add_domain_type domain, type_tag, &block
     key = ['tag', domain, type_tag].join ':'
-    @domain_types[key] = [key, block]
-    @domain_types["tag:#{type_tag}"] = [key, block]
+    domain_types[key] = [key, block]
+    domain_types["tag:#{type_tag}"] = [key, block]
   end
 
   def self.add_builtin_type type_tag, &block
     domain = 'yaml.org,2002'
     key = ['tag', domain, type_tag].join ':'
-    @domain_types[key] = [key, block]
+    domain_types[key] = [key, block]
   end
 
   def self.remove_type type_tag
-    @domain_types.delete type_tag
+    domain_types.delete type_tag
   end
 
-  @load_tags = {}
-  @dump_tags = {}
   def self.add_tag tag, klass
-    @load_tags[tag] = klass.name
-    @dump_tags[klass] = tag
+    load_tags[tag] = klass.name
+    dump_tags[klass] = tag
+  end
+
+  # Workaround for emulating `warn '...', uplevel: 1` in Ruby 2.4 or lower.
+  def self.warn_with_uplevel(message, uplevel: 1)
+    at = parse_caller(caller[uplevel]).join(':')
+    warn "#{at}: #{message}"
+  end
+
+  def self.parse_caller(at)
+    if /^(.+?):(\d+)(?::in `.*')?/ =~ at
+      file = $1
+      line = $2.to_i
+      [file, line]
+    end
   end
+  private_class_method :warn_with_uplevel, :parse_caller
 
   class << self
-    attr_accessor :load_tags
-    attr_accessor :dump_tags
-    attr_accessor :domain_types
+    if defined?(Ractor)
+      require 'forwardable'
+      extend Forwardable
+
+      class Config
+        attr_accessor :load_tags, :dump_tags, :domain_types
+        def initialize
+          @load_tags = {}
+          @dump_tags = {}
+          @domain_types = {}
+        end
+      end
+
+      def config
+        Ractor.current[:PsychConfig] ||= Config.new
+      end
+
+      def_delegators :config, :load_tags, :dump_tags, :domain_types, :load_tags=, :dump_tags=, :domain_types=
+    else
+      attr_accessor :load_tags
+      attr_accessor :dump_tags
+      attr_accessor :domain_types
+    end
   end
+  self.load_tags = {}
+  self.dump_tags = {}
+  self.domain_types = {}
   # :startdoc:
 end
diff --git a/ext/psych/lib/psych/class_loader.rb b/ext/psych/lib/psych/class_loader.rb
index ba756f7ea7..a5d1a7a4a9 100644
--- a/ext/psych/lib/psych/class_loader.rb
+++ b/ext/psych/lib/psych/class_loader.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'psych/omap'
 require 'psych/set'
 
@@ -35,9 +35,11 @@ module Psych
 
     constants.each do |const|
       konst = const_get const
-      define_method(const.to_s.downcase) do
-        load konst
-      end
+      class_eval <<~RUBY
+        def #{const.to_s.downcase}
+          load #{konst.inspect}
+        end
+      RUBY
     end
 
     private
@@ -69,7 +71,7 @@ module Psych
       rescue
         nil
       end
-    }.compact]
+    }.compact].freeze
 
     class Restricted < ClassLoader
       def initialize classes, symbols
diff --git a/ext/psych/lib/psych/coder.rb b/ext/psych/lib/psych/coder.rb
index 26005f57b4..96a9c3fbad 100644
--- a/ext/psych/lib/psych/coder.rb
+++ b/ext/psych/lib/psych/coder.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Psych
   ###
   # If an object defines +encode_with+, then an instance of Psych::Coder will
diff --git a/ext/psych/lib/psych/core_ext.rb b/ext/psych/lib/psych/core_ext.rb
index 1a98279afd..81055cc501 100644
--- a/ext/psych/lib/psych/core_ext.rb
+++ b/ext/psych/lib/psych/core_ext.rb
@@ -1,34 +1,17 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 class Object
   def self.yaml_tag url
     Psych.add_tag(url, self)
   end
 
-  # FIXME: rename this to "to_yaml" when syck is removed
-
   ###
   # call-seq: to_yaml(options = {})
   #
   # Convert an object to YAML.  See Psych.dump for more information on the
   # available +options+.
-  def psych_to_yaml options = {}
+  def to_yaml options = {}
     Psych.dump self, options
   end
-  remove_method :to_yaml rescue nil
-  alias :to_yaml :psych_to_yaml
-end
-
-class Module
-  def psych_yaml_as url
-    return if caller[0].end_with?('rubytypes.rb')
-    if $VERBOSE
-      warn "#{caller[0]}: yaml_as is deprecated, please use yaml_tag"
-    end
-    Psych.add_tag(url, self)
-  end
-
-  remove_method :yaml_as rescue nil
-  alias :yaml_as :psych_yaml_as
 end
 
 if defined?(::IRB)
diff --git a/ext/psych/lib/psych/deprecated.rb b/ext/psych/lib/psych/deprecated.rb
deleted file mode 100644
index 165d2102b4..0000000000
--- a/ext/psych/lib/psych/deprecated.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-# frozen_string_literal: false
-require 'date'
-
-module Psych
-  DEPRECATED = __FILE__ # :nodoc:
-
-  module DeprecatedMethods # :nodoc:
-    attr_accessor :taguri
-    attr_accessor :to_yaml_style
-  end
-
-  def self.quick_emit thing, opts = {}, &block # :nodoc:
-    warn "#{caller[0]}: YAML.quick_emit is deprecated" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
-    target = eval 'self', block.binding
-    target.extend DeprecatedMethods
-    metaclass = class << target; self; end
-    metaclass.send(:define_method, :encode_with) do |coder|
-      target.taguri        = coder.tag
-      target.to_yaml_style = coder.style
-      block.call coder
-    end
-    target.psych_to_yaml unless opts[:nodump]
-  end
-
-  # This method is deprecated, use Psych.load_stream instead.
-  def self.load_documents yaml, &block
-    if $VERBOSE
-      warn "#{caller[0]}: load_documents is deprecated, use load_stream"
-    end
-    list = load_stream yaml
-    return list unless block_given?
-    list.each(&block)
-  end
-
-  def self.detect_implicit thing
-    warn "#{caller[0]}: detect_implicit is deprecated" if $VERBOSE
-    return '' unless String === thing
-    return 'null' if '' == thing
-    ss = ScalarScanner.new(ClassLoader.new)
-    ss.tokenize(thing).class.name.downcase
-  end
-
-  def self.add_ruby_type type_tag, &block
-    warn "#{caller[0]}: add_ruby_type is deprecated, use add_domain_type" if $VERBOSE
-    domain = 'ruby.yaml.org,2002'
-    key = ['tag', domain, type_tag].join ':'
-    @domain_types[key] = [key, block]
-  end
-
-  def self.add_private_type type_tag, &block
-    warn "#{caller[0]}: add_private_type is deprecated, use add_domain_type" if $VERBOSE
-    domain = 'x-private'
-    key = [domain, type_tag].join ':'
-    @domain_types[key] = [key, block]
-  end
-
-  def self.tagurize thing
-    warn "#{caller[0]}: add_private_type is deprecated, use add_domain_type" if $VERBOSE
-    return thing unless String === thing
-    "tag:yaml.org,2002:#{thing}"
-  end
-
-  def self.read_type_class type, reference
-    warn "#{caller[0]}: read_type_class is deprecated" if $VERBOSE
-    _, _, type, name = type.split ':', 4
-
-    reference = name.split('::').inject(reference) do |k,n|
-      k.const_get(n.to_sym)
-    end if name
-    [type, reference]
-  end
-
-  def self.object_maker klass, hash
-    warn "#{caller[0]}: object_maker is deprecated" if $VERBOSE
-    klass.allocate.tap do |obj|
-      hash.each { |k,v| obj.instance_variable_set(:"@#{k}", v) }
-    end
-  end
-end
-
-class Object
-  undef :to_yaml_properties rescue nil
-  def to_yaml_properties # :nodoc:
-    instance_variables
-  end
-end
diff --git a/ext/psych/lib/psych/exception.rb b/ext/psych/lib/psych/exception.rb
index 83c3d7fa82..fac0c42b9f 100644
--- a/ext/psych/lib/psych/exception.rb
+++ b/ext/psych/lib/psych/exception.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Psych
   class Exception < RuntimeError
   end
diff --git a/ext/psych/lib/psych/handler.rb b/ext/psych/lib/psych/handler.rb
index 1ab5f73e95..ad7249ff77 100644
--- a/ext/psych/lib/psych/handler.rb
+++ b/ext/psych/lib/psych/handler.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Psych
   ###
   # Psych::Handler is an abstract base class that defines the events used
@@ -105,7 +105,7 @@ module Psych
     #   - first element
     #   - *ponies
     #
-    # &ponies is the achor, *ponies is the alias.  In this case, alias is
+    # &ponies is the anchor, *ponies is the alias.  In this case, alias is
     # called with "ponies".
     def alias anchor
     end
@@ -119,7 +119,7 @@ module Psych
     # +tag+ is an associated tag or nil
     # +plain+ is a boolean value
     # +quoted+ is a boolean value
-    # +style+ is an integer idicating the string style
+    # +style+ is an integer indicating the string style
     #
     # See the constants in Psych::Nodes::Scalar for the possible values of
     # +style+
@@ -242,6 +242,11 @@ module Psych
     end
 
     ###
+    # Called before each event with line/column information.
+    def event_location(start_line, start_column, end_line, end_column)
+    end
+
+    ###
     # Is this handler a streaming handler?
     def streaming?
       false
diff --git a/ext/psych/lib/psych/handlers/document_stream.rb b/ext/psych/lib/psych/handlers/document_stream.rb
index c43b39ebc5..67da794093 100644
--- a/ext/psych/lib/psych/handlers/document_stream.rb
+++ b/ext/psych/lib/psych/handlers/document_stream.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'psych/tree_builder'
 
 module Psych
diff --git a/ext/psych/lib/psych/handlers/recorder.rb b/ext/psych/lib/psych/handlers/recorder.rb
index 341b81dec4..a8fc7b1144 100644
--- a/ext/psych/lib/psych/handlers/recorder.rb
+++ b/ext/psych/lib/psych/handlers/recorder.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'psych/handler'
 
 module Psych
diff --git a/ext/psych/lib/psych/json/ruby_events.rb b/ext/psych/lib/psych/json/ruby_events.rb
index 478eb667c7..17b7ddc386 100644
--- a/ext/psych/lib/psych/json/ruby_events.rb
+++ b/ext/psych/lib/psych/json/ruby_events.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Psych
   module JSON
     module RubyEvents # :nodoc:
diff --git a/ext/psych/lib/psych/json/stream.rb b/ext/psych/lib/psych/json/stream.rb
index 83b7e13655..2ebd3d7a66 100644
--- a/ext/psych/lib/psych/json/stream.rb
+++ b/ext/psych/lib/psych/json/stream.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'psych/json/ruby_events'
 require 'psych/json/yaml_events'
 
diff --git a/ext/psych/lib/psych/json/tree_builder.rb b/ext/psych/lib/psych/json/tree_builder.rb
index 2f94b8c252..5c2ee8ca25 100644
--- a/ext/psych/lib/psych/json/tree_builder.rb
+++ b/ext/psych/lib/psych/json/tree_builder.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'psych/json/yaml_events'
 
 module Psych
diff --git a/ext/psych/lib/psych/json/yaml_events.rb b/ext/psych/lib/psych/json/yaml_events.rb
index 07f64737c5..eb973f5361 100644
--- a/ext/psych/lib/psych/json/yaml_events.rb
+++ b/ext/psych/lib/psych/json/yaml_events.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Psych
   module JSON
     module YAMLEvents # :nodoc:
diff --git a/ext/psych/lib/psych/nodes.rb b/ext/psych/lib/psych/nodes.rb
index 01573b509b..5842c2e3e5 100644
--- a/ext/psych/lib/psych/nodes.rb
+++ b/ext/psych/lib/psych/nodes.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'psych/nodes/node'
 require 'psych/nodes/stream'
 require 'psych/nodes/document'
diff --git a/ext/psych/lib/psych/nodes/alias.rb b/ext/psych/lib/psych/nodes/alias.rb
index 716a00d62f..6da655f0fd 100644
--- a/ext/psych/lib/psych/nodes/alias.rb
+++ b/ext/psych/lib/psych/nodes/alias.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Psych
   module Nodes
     ###
@@ -14,6 +14,8 @@ module Psych
       def initialize anchor
         @anchor = anchor
       end
+
+      def alias?; true; end
     end
   end
 end
diff --git a/ext/psych/lib/psych/nodes/document.rb b/ext/psych/lib/psych/nodes/document.rb
index 7234fef1d8..f57410d636 100644
--- a/ext/psych/lib/psych/nodes/document.rb
+++ b/ext/psych/lib/psych/nodes/document.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Psych
   module Nodes
     ###
@@ -56,6 +56,8 @@ module Psych
       def root
         children.first
       end
+
+      def document?; true; end
     end
   end
 end
diff --git a/ext/psych/lib/psych/nodes/mapping.rb b/ext/psych/lib/psych/nodes/mapping.rb
index 4c11df8cd6..d49678cb0e 100644
--- a/ext/psych/lib/psych/nodes/mapping.rb
+++ b/ext/psych/lib/psych/nodes/mapping.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Psych
   module Nodes
     ###
@@ -52,6 +52,8 @@ module Psych
         @implicit = implicit
         @style    = style
       end
+
+      def mapping?; true; end
     end
   end
 end
diff --git a/ext/psych/lib/psych/nodes/node.rb b/ext/psych/lib/psych/nodes/node.rb
index e3621dc451..05cb08dac0 100644
--- a/ext/psych/lib/psych/nodes/node.rb
+++ b/ext/psych/lib/psych/nodes/node.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'stringio'
 require 'psych/class_loader'
 require 'psych/scalar_scanner'
@@ -17,6 +17,18 @@ module Psych
       # An associated tag
       attr_reader :tag
 
+      # The line number where this node start
+      attr_accessor :start_line
+
+      # The column number where this node start
+      attr_accessor :start_column
+
+      # The line number where this node ends
+      attr_accessor :end_line
+
+      # The column number where this node ends
+      attr_accessor :end_column
+
       # Create a new Psych::Nodes::Node
       def initialize
         @children = []
@@ -34,8 +46,8 @@ module Psych
       # Convert this node to Ruby.
       #
       # See also Psych::Visitors::ToRuby
-      def to_ruby
-        Visitors::ToRuby.create.accept(self)
+      def to_ruby(symbolize_names: false, freeze: false)
+        Visitors::ToRuby.create(symbolize_names: symbolize_names, freeze: freeze).accept(self)
       end
       alias :transform :to_ruby
 
@@ -51,6 +63,13 @@ module Psych
         io
       end
       alias :to_yaml :yaml
+
+      def alias?;    false; end
+      def document?; false; end
+      def mapping?;  false; end
+      def scalar?;   false; end
+      def sequence?; false; end
+      def stream?;   false; end
     end
   end
 end
diff --git a/ext/psych/lib/psych/nodes/scalar.rb b/ext/psych/lib/psych/nodes/scalar.rb
index ee5570518e..5550b616a3 100644
--- a/ext/psych/lib/psych/nodes/scalar.rb
+++ b/ext/psych/lib/psych/nodes/scalar.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Psych
   module Nodes
     ###
@@ -50,7 +50,7 @@ module Psych
       # +tag+ is an associated tag or nil
       # +plain+ is a boolean value
       # +quoted+ is a boolean value
-      # +style+ is an integer idicating the string style
+      # +style+ is an integer indicating the string style
       #
       # == See Also
       #
@@ -63,6 +63,8 @@ module Psych
         @quoted = quoted
         @style  = style
       end
+
+      def scalar?; true; end
     end
   end
 end
diff --git a/ext/psych/lib/psych/nodes/sequence.rb b/ext/psych/lib/psych/nodes/sequence.rb
index 1096469567..740f1938a4 100644
--- a/ext/psych/lib/psych/nodes/sequence.rb
+++ b/ext/psych/lib/psych/nodes/sequence.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Psych
   module Nodes
     ###
@@ -77,6 +77,8 @@ module Psych
         @implicit = implicit
         @style    = style
       end
+
+      def sequence?; true; end
     end
   end
 end
diff --git a/ext/psych/lib/psych/nodes/stream.rb b/ext/psych/lib/psych/nodes/stream.rb
index 559b0846e7..b525217821 100644
--- a/ext/psych/lib/psych/nodes/stream.rb
+++ b/ext/psych/lib/psych/nodes/stream.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Psych
   module Nodes
     ###
@@ -33,6 +33,8 @@ module Psych
         super()
         @encoding = encoding
       end
+
+      def stream?; true; end
     end
   end
 end
diff --git a/ext/psych/lib/psych/omap.rb b/ext/psych/lib/psych/omap.rb
index 233b945c4a..29cde0be50 100644
--- a/ext/psych/lib/psych/omap.rb
+++ b/ext/psych/lib/psych/omap.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Psych
   class Omap < ::Hash
   end
diff --git a/ext/psych/lib/psych/parser.rb b/ext/psych/lib/psych/parser.rb
index 242512f89f..39bc8289be 100644
--- a/ext/psych/lib/psych/parser.rb
+++ b/ext/psych/lib/psych/parser.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Psych
   ###
   # YAML event parser class.  This class parses a YAML document and calls
diff --git a/ext/psych/lib/psych/scalar_scanner.rb b/ext/psych/lib/psych/scalar_scanner.rb
index f519da1465..d565a336e8 100644
--- a/ext/psych/lib/psych/scalar_scanner.rb
+++ b/ext/psych/lib/psych/scalar_scanner.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'strscan'
 
 module Psych
@@ -10,21 +10,19 @@ module Psych
 
     # Taken from http://yaml.org/type/float.html
     FLOAT = /^(?:[-+]?([0-9][0-9_,]*)?\.[0-9]*([eE][-+][0-9]+)?(?# base 10)
-              |[-+]?[0-9][0-9_,]*(:[0-5]?[0-9])+\.[0-9_]*(?# base 60)
               |[-+]?\.(inf|Inf|INF)(?# infinity)
               |\.(nan|NaN|NAN)(?# not a number))$/x
 
     # Taken from http://yaml.org/type/int.html
-    INTEGER = /^(?:[-+]?0b[0-1_]+          (?# base 2)
-                  |[-+]?0[0-7_]+           (?# base 8)
-                  |[-+]?(?:0|[1-9][0-9_]*) (?# base 10)
-                  |[-+]?0x[0-9a-fA-F_]+    (?# base 16))$/x
+    INTEGER = /^(?:[-+]?0b[0-1_,]+          (?# base 2)
+                  |[-+]?0[0-7_,]+           (?# base 8)
+                  |[-+]?(?:0|[1-9][0-9_,]*) (?# base 10)
+                  |[-+]?0x[0-9a-fA-F_,]+    (?# base 16))$/x
 
     attr_reader :class_loader
 
     # Create a new scanner
     def initialize class_loader
-      @string_cache = {}
       @symbol_cache = {}
       @class_loader = class_loader
     end
@@ -32,81 +30,70 @@ module Psych
     # Tokenize +string+ returning the Ruby object
     def tokenize string
       return nil if string.empty?
-      return string if @string_cache.key?(string)
       return @symbol_cache[string] if @symbol_cache.key?(string)
 
-      case string
       # Check for a String type, being careful not to get caught by hash keys, hex values, and
       # special floats (e.g., -.inf).
-      when /^[^\d\.:-]?[A-Za-z_\s!@#\$%\^&\*\(\)\{\}\<\>\|\/\\~;=]+/, /\n/
-        if string.length > 5
-          @string_cache[string] = true
-          return string
-        end
+      if string.match?(/^[^\d\.:-]?[A-Za-z_\s!@#\$%\^&\*\(\)\{\}\<\>\|\/\\~;=]+/) || string.match?(/\n/)
+        return string if string.length > 5
 
-        case string
-        when /^[^ytonf~]/i
-          @string_cache[string] = true
+        if string.match?(/^[^ytonf~]/i)
           string
-        when '~', /^null$/i
+        elsif string == '~' || string.match?(/^null$/i)
           nil
-        when /^(yes|true|on)$/i
+        elsif string.match?(/^(yes|true|on)$/i)
           true
-        when /^(no|false|off)$/i
+        elsif string.match?(/^(no|false|off)$/i)
           false
         else
-          @string_cache[string] = true
           string
         end
-      when TIME
+      elsif string.match?(TIME)
         begin
           parse_time string
         rescue ArgumentError
           string
         end
-      when /^\d{4}-(?:1[012]|0\d|\d)-(?:[12]\d|3[01]|0\d|\d)$/
+      elsif string.match?(/^\d{4}-(?:1[012]|0\d|\d)-(?:[12]\d|3[01]|0\d|\d)$/)
         require 'date'
         begin
           class_loader.date.strptime(string, '%Y-%m-%d')
         rescue ArgumentError
           string
         end
-      when /^\.inf$/i
+      elsif string.match?(/^\.inf$/i)
         Float::INFINITY
-      when /^-\.inf$/i
+      elsif string.match?(/^-\.inf$/i)
         -Float::INFINITY
-      when /^\.nan$/i
+      elsif string.match?(/^\.nan$/i)
         Float::NAN
-      when /^:./
+      elsif string.match?(/^:./)
         if string =~ /^:(["'])(.*)\1/
           @symbol_cache[string] = class_loader.symbolize($2.sub(/^:/, ''))
         else
           @symbol_cache[string] = class_loader.symbolize(string.sub(/^:/, ''))
         end
-      when /^[-+]?[0-9][0-9_]*(:[0-5]?[0-9])+$/
+      elsif string.match?(/^[-+]?[0-9][0-9_]*(:[0-5]?[0-9]){1,2}$/)
         i = 0
         string.split(':').each_with_index do |n,e|
           i += (n.to_i * 60 ** (e - 2).abs)
         end
         i
-      when /^[-+]?[0-9][0-9_]*(:[0-5]?[0-9])+\.[0-9_]*$/
+      elsif string.match?(/^[-+]?[0-9][0-9_]*(:[0-5]?[0-9]){1,2}\.[0-9_]*$/)
         i = 0
         string.split(':').each_with_index do |n,e|
           i += (n.to_f * 60 ** (e - 2).abs)
         end
         i
-      when FLOAT
-        if string =~ /\A[-+]?\.\Z/
-          @string_cache[string] = true
+      elsif string.match?(FLOAT)
+        if string.match?(/\A[-+]?\.\Z/)
           string
         else
-          Float(string.gsub(/[,_]|\.$/, ''))
+          Float(string.gsub(/[,_]|\.([Ee]|$)/, '\1'))
         end
+      elsif string.match?(INTEGER)
+        parse_int string
       else
-        int = parse_int string.gsub(/[,_]/, '')
-        return int if int
-
-        @string_cache[string] = true
         string
       end
     end
@@ -114,8 +101,7 @@ module Psych
     ###
     # Parse and return an int from +string+
     def parse_int string
-      return unless INTEGER === string
-      Integer(string)
+      Integer(string.gsub(/[,_]/, ''))
     end
 
     ###
@@ -144,7 +130,7 @@ module Psych
         offset += ((tz[1] || 0) * 60)
       end
 
-      klass.at((time - offset).to_i, us)
+      klass.new(yy, m, dd, hh, mm, ss+us/(1_000_000r), offset)
     end
   end
 end
diff --git a/ext/psych/lib/psych/set.rb b/ext/psych/lib/psych/set.rb
index f35be15e6f..760d217098 100644
--- a/ext/psych/lib/psych/set.rb
+++ b/ext/psych/lib/psych/set.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Psych
   class Set < ::Hash
   end
diff --git a/ext/psych/lib/psych/stream.rb b/ext/psych/lib/psych/stream.rb
index 2f63d7d552..24e45afc3b 100644
--- a/ext/psych/lib/psych/stream.rb
+++ b/ext/psych/lib/psych/stream.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Psych
   ###
   # Psych::Stream is a streaming YAML emitter.  It will not buffer your YAML,
diff --git a/ext/psych/lib/psych/streaming.rb b/ext/psych/lib/psych/streaming.rb
index 260f8a8008..eb19792ad0 100644
--- a/ext/psych/lib/psych/streaming.rb
+++ b/ext/psych/lib/psych/streaming.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Psych
   module Streaming
     module ClassMethods
diff --git a/ext/psych/lib/psych/syntax_error.rb b/ext/psych/lib/psych/syntax_error.rb
index db293b9fb2..1598e6ff36 100644
--- a/ext/psych/lib/psych/syntax_error.rb
+++ b/ext/psych/lib/psych/syntax_error.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'psych/exception'
 
 module Psych
diff --git a/ext/psych/lib/psych/tree_builder.rb b/ext/psych/lib/psych/tree_builder.rb
index d359c933af..47a1695643 100644
--- a/ext/psych/lib/psych/tree_builder.rb
+++ b/ext/psych/lib/psych/tree_builder.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'psych/handler'
 
 module Psych
@@ -23,6 +23,18 @@ module Psych
       @stack = []
       @last  = nil
       @root  = nil
+
+      @start_line   = nil
+      @start_column = nil
+      @end_line     = nil
+      @end_column   = nil
+    end
+
+    def event_location(start_line, start_column, end_line, end_column)
+      @start_line   = start_line
+      @start_column = start_column
+      @end_line     = end_line
+      @end_column   = end_column
     end
 
     %w{
@@ -32,12 +44,15 @@ module Psych
       class_eval %{
         def start_#{node.downcase}(anchor, tag, implicit, style)
           n = Nodes::#{node}.new(anchor, tag, implicit, style)
+          set_start_location(n)
           @last.children << n
           push n
         end
 
         def end_#{node.downcase}
-          pop
+          n = pop
+          set_end_location(n)
+          n
         end
       }
     end
@@ -49,6 +64,7 @@ module Psych
     # See Psych::Handler#start_document
     def start_document version, tag_directives, implicit
       n = Nodes::Document.new version, tag_directives, implicit
+      set_start_location(n)
       @last.children << n
       push n
     end
@@ -60,26 +76,35 @@ module Psych
     # See Psych::Handler#start_document
     def end_document implicit_end = !streaming?
       @last.implicit_end = implicit_end
-      pop
+      n = pop
+      set_end_location(n)
+      n
     end
 
     def start_stream encoding
       @root = Nodes::Stream.new(encoding)
+      set_start_location(@root)
       push @root
     end
 
     def end_stream
-      pop
+      n = pop
+      set_end_location(n)
+      n
     end
 
     def scalar value, anchor, tag, plain, quoted, style
       s = Nodes::Scalar.new(value,anchor,tag,plain,quoted,style)
+      set_location(s)
       @last.children << s
       s
     end
 
     def alias anchor
-      @last.children << Nodes::Alias.new(anchor)
+      a = Nodes::Alias.new(anchor)
+      set_location(a)
+      @last.children << a
+      a
     end
 
     private
@@ -93,5 +118,20 @@ module Psych
       @last = @stack.last
       x
     end
+
+    def set_location(node)
+      set_start_location(node)
+      set_end_location(node)
+    end
+
+    def set_start_location(node)
+      node.start_line   = @start_line
+      node.start_column = @start_column
+    end
+
+    def set_end_location(node)
+      node.end_line   = @end_line
+      node.end_column = @end_column
+    end
   end
 end
diff --git a/ext/psych/lib/psych/versions.rb b/ext/psych/lib/psych/versions.rb
index 5f7652b097..acb21336c4 100644
--- a/ext/psych/lib/psych/versions.rb
+++ b/ext/psych/lib/psych/versions.rb
@@ -1,4 +1,10 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
+
 module Psych
-  DEFAULT_SNAKEYAML_VERSION = '1.14'.freeze
+  # The version of Psych you are using
+  VERSION = '3.3.2'
+
+  if RUBY_ENGINE == 'jruby'
+    DEFAULT_SNAKEYAML_VERSION = '1.28'.freeze
+  end
 end
diff --git a/ext/psych/lib/psych/visitors.rb b/ext/psych/lib/psych/visitors.rb
index 5dee4ebd7a..e2b084daee 100644
--- a/ext/psych/lib/psych/visitors.rb
+++ b/ext/psych/lib/psych/visitors.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'psych/visitors/visitor'
 require 'psych/visitors/to_ruby'
 require 'psych/visitors/emitter'
diff --git a/ext/psych/lib/psych/visitors/depth_first.rb b/ext/psych/lib/psych/visitors/depth_first.rb
index 2d74a212d6..b4ff9e40e7 100644
--- a/ext/psych/lib/psych/visitors/depth_first.rb
+++ b/ext/psych/lib/psych/visitors/depth_first.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Psych
   module Visitors
     class DepthFirst < Psych::Visitors::Visitor
diff --git a/ext/psych/lib/psych/visitors/emitter.rb b/ext/psych/lib/psych/visitors/emitter.rb
index f2ff9fdb28..e3b92b7d03 100644
--- a/ext/psych/lib/psych/visitors/emitter.rb
+++ b/ext/psych/lib/psych/visitors/emitter.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Psych
   module Visitors
     class Emitter < Psych::Visitors::Visitor
diff --git a/ext/psych/lib/psych/visitors/json_tree.rb b/ext/psych/lib/psych/visitors/json_tree.rb
index f2f0215cd2..9912cb1362 100644
--- a/ext/psych/lib/psych/visitors/json_tree.rb
+++ b/ext/psych/lib/psych/visitors/json_tree.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'psych/json/ruby_events'
 
 module Psych
diff --git a/ext/psych/lib/psych/visitors/to_ruby.rb b/ext/psych/lib/psych/visitors/to_ruby.rb
index c061da25f1..4de7f80d33 100644
--- a/ext/psych/lib/psych/visitors/to_ruby.rb
+++ b/ext/psych/lib/psych/visitors/to_ruby.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'psych/scalar_scanner'
 require 'psych/class_loader'
 require 'psych/exception'
@@ -12,39 +12,44 @@ module Psych
     ###
     # This class walks a YAML AST, converting each node to Ruby
     class ToRuby < Psych::Visitors::Visitor
-      def self.create
+      def self.create(symbolize_names: false, freeze: false)
         class_loader = ClassLoader.new
         scanner      = ScalarScanner.new class_loader
-        new(scanner, class_loader)
+        new(scanner, class_loader, symbolize_names: symbolize_names, freeze: freeze)
       end
 
       attr_reader :class_loader
 
-      def initialize ss, class_loader
+      def initialize ss, class_loader, symbolize_names: false, freeze: false
         super()
         @st = {}
         @ss = ss
+        @load_tags = Psych.load_tags
         @domain_types = Psych.domain_types
         @class_loader = class_loader
+        @symbolize_names = symbolize_names
+        @freeze = freeze
       end
 
       def accept target
         result = super
-        return result if @domain_types.empty? || !target.tag
 
-        key = target.tag.sub(/^[!\/]*/, '').sub(/(,\d+)\//, '\1:')
-        key = "tag:#{key}" unless key =~ /^(?:tag:|x-private)/
+        unless @domain_types.empty? || !target.tag
+          key = target.tag.sub(/^[!\/]*/, '').sub(/(,\d+)\//, '\1:')
+          key = "tag:#{key}" unless key =~ /^(?:tag:|x-private)/
 
-        if @domain_types.key? key
-          value, block = @domain_types[key]
-          return block.call value, result
+          if @domain_types.key? key
+            value, block = @domain_types[key]
+            result = block.call value, result
+          end
         end
 
+        result = deduplicate(result).freeze if @freeze
         result
       end
 
       def deserialize o
-        if klass = resolve_class(Psych.load_tags[o.tag])
+        if klass = resolve_class(@load_tags[o.tag])
           instance = klass.allocate
 
           if instance.respond_to?(:init_with)
@@ -70,11 +75,11 @@ module Psych
             o.value
           end
         when '!ruby/object:BigDecimal'
-          require 'bigdecimal'
+          require 'bigdecimal' unless defined? BigDecimal
           class_loader.big_decimal._load o.value
         when "!ruby/object:DateTime"
           class_loader.date_time
-          require 'date'
+          require 'date' unless defined? DateTime
           @ss.parse_time(o.value).to_datetime
         when '!ruby/encoding'
           ::Encoding.find o.value
@@ -124,7 +129,7 @@ module Psych
       end
 
       def visit_Psych_Nodes_Sequence o
-        if klass = resolve_class(Psych.load_tags[o.tag])
+        if klass = resolve_class(@load_tags[o.tag])
           instance = klass.allocate
 
           if instance.respond_to?(:init_with)
@@ -156,8 +161,8 @@ module Psych
       end
 
       def visit_Psych_Nodes_Mapping o
-        if Psych.load_tags[o.tag]
-          return revive(resolve_class(Psych.load_tags[o.tag]), o)
+        if @load_tags[o.tag]
+          return revive(resolve_class(@load_tags[o.tag]), o)
         end
         return revive_hash(register(o, {}), o) unless o.tag
 
@@ -252,6 +257,8 @@ module Psych
 
           e = build_exception((resolve_class($1) || class_loader.exception),
                               h.delete('message'))
+
+          e.set_backtrace h.delete('backtrace') if h.key? 'backtrace'
           init_with(e, h, o)
 
         when '!set', 'tag:yaml.org,2002:set'
@@ -320,6 +327,7 @@ module Psych
       end
 
       private
+
       def register node, object
         @st[node.anchor] = object if node.anchor
         object
@@ -331,13 +339,12 @@ module Psych
         list
       end
 
-      SHOVEL = '<<'
-      def revive_hash hash, o
+      def revive_hash hash, o, tagged= false
         o.children.each_slice(2) { |k,v|
           key = accept(k)
           val = accept(v)
 
-          if key == SHOVEL && k.tag != "tag:yaml.org,2002:str"
+          if key == '<<' && k.tag != "tag:yaml.org,2002:str"
             case v
             when Nodes::Alias, Nodes::Mapping
               begin
@@ -359,6 +366,12 @@ module Psych
               hash[key] = val
             end
           else
+            if !tagged && @symbolize_names && key.is_a?(String)
+              key = key.to_sym
+            elsif !@freeze
+              key = deduplicate(key)
+            end
+
             hash[key] = val
           end
 
@@ -366,12 +379,32 @@ module Psych
         hash
       end
 
+      if RUBY_VERSION < '2.7'
+        def deduplicate key
+          if key.is_a?(String)
+            # It is important to untaint the string, otherwise it won't
+            # be deduplicated into an fstring, but simply frozen.
+            -(key.untaint)
+          else
+            key
+          end
+        end
+      else
+        def deduplicate key
+          if key.is_a?(String)
+            -key
+          else
+            key
+          end
+        end
+      end
+
       def merge_key hash, key, val
       end
 
       def revive klass, node
         s = register(node, klass.allocate)
-        init_with(s, revive_hash({}, node), node)
+        init_with(s, revive_hash({}, node, true), node)
       end
 
       def init_with o, h, node
@@ -380,11 +413,6 @@ module Psych
 
         if o.respond_to?(:init_with)
           o.init_with c
-        elsif o.respond_to?(:yaml_initialize)
-          if $VERBOSE
-            warn "Implementing #{o.class}#yaml_initialize is deprecated, please implement \"init_with(coder)\""
-          end
-          o.yaml_initialize c.tag, c.map
         else
           h.each { |k,v| o.instance_variable_set(:"@#{k}", v) }
         end
diff --git a/ext/psych/lib/psych/visitors/visitor.rb b/ext/psych/lib/psych/visitors/visitor.rb
index d97bf550f6..21052aa66f 100644
--- a/ext/psych/lib/psych/visitors/visitor.rb
+++ b/ext/psych/lib/psych/visitors/visitor.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Psych
   module Visitors
     class Visitor
@@ -8,12 +8,26 @@ module Psych
 
       private
 
-      DISPATCH = Hash.new do |hash, klass|
-        hash[klass] = "visit_#{klass.name.gsub('::', '_')}"
+      # @api private
+      def self.dispatch_cache
+        Hash.new do |hash, klass|
+          hash[klass] = :"visit_#{klass.name.gsub('::', '_')}"
+        end.compare_by_identity
+      end
+
+      if defined?(Ractor)
+        def dispatch
+          @dispatch_cache ||= (Ractor.current[:Psych_Visitors_Visitor] ||= Visitor.dispatch_cache)
+        end
+      else
+        DISPATCH = dispatch_cache
+        def dispatch
+          DISPATCH
+        end
       end
 
       def visit target
-        send DISPATCH[target.class], target
+        send dispatch[target.class], target
       end
     end
   end
diff --git a/ext/psych/lib/psych/visitors/yaml_tree.rb b/ext/psych/lib/psych/visitors/yaml_tree.rb
index 7c400504fa..bf7c0bb8ca 100644
--- a/ext/psych/lib/psych/visitors/yaml_tree.rb
+++ b/ext/psych/lib/psych/visitors/yaml_tree.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'psych/tree_builder'
 require 'psych/scalar_scanner'
 require 'psych/class_loader'
@@ -53,15 +53,6 @@ module Psych
         new(emitter, ss, options)
       end
 
-      def self.new emitter = nil, ss = nil, options = nil
-        return super if emitter && ss && options
-
-        if $VERBOSE
-          warn "This API is deprecated, please pass an emitter, scalar scanner, and options or call #{self}.create() (#{caller.first})"
-        end
-        create emitter, ss
-      end
-
       def initialize emitter, ss, options
         super()
         @started    = false
@@ -89,7 +80,7 @@ module Psych
           raise(TypeError, "Can't dump #{target.class}") unless method
 
           h[klass] = method
-        end
+        end.compare_by_identity
       end
 
       def start encoding = Nodes::Stream::UTF8
@@ -139,24 +130,6 @@ module Psych
           return @emitter.alias anchor
         end
 
-        if target.respond_to?(:to_yaml)
-          begin
-            loc = target.method(:to_yaml).source_location.first
-            if loc !~ /(syck\/rubytypes.rb|psych\/core_ext.rb)/
-              unless target.respond_to?(:encode_with)
-                if $VERBOSE
-                  warn "implementing to_yaml is deprecated, please implement \"encode_with\""
-                end
-
-                target.to_yaml(:nodump => true)
-              end
-            end
-          rescue
-            # public_method or source_location might be overridden,
-            # and it's OK to skip it since it's only to emit a warning
-          end
-        end
-
         if target.respond_to?(:encode_with)
           dump_coder target
         else
@@ -191,6 +164,8 @@ module Psych
         @emitter.end_mapping
       end
 
+      alias :visit_Delegator :visit_Object
+
       def visit_Struct o
         tag = ['!ruby/struct', o.class.name].compact.join(':')
 
@@ -206,41 +181,11 @@ module Psych
       end
 
       def visit_Exception o
-        tag = ['!ruby/exception', o.class.name].join ':'
-
-        @emitter.start_mapping nil, tag, false, Nodes::Mapping::BLOCK
-
-        {
-          'message'   => private_iv_get(o, 'mesg'),
-          'backtrace' => private_iv_get(o, 'backtrace'),
-        }.each do |k,v|
-          next unless v
-          @emitter.scalar k, nil, nil, true, false, Nodes::Scalar::ANY
-          accept v
-        end
-
-        dump_ivars o
-
-        @emitter.end_mapping
+        dump_exception o, o.message.to_s
       end
 
       def visit_NameError o
-        tag = ['!ruby/exception', o.class.name].join ':'
-
-        @emitter.start_mapping nil, tag, false, Nodes::Mapping::BLOCK
-
-        {
-          'message'   => o.message.to_s,
-          'backtrace' => private_iv_get(o, 'backtrace'),
-        }.each do |k,v|
-          next unless v
-          @emitter.scalar k, nil, nil, true, false, Nodes::Scalar::ANY
-          accept v
-        end
-
-        dump_ivars o
-
-        @emitter.end_mapping
+        dump_exception o, o.message.to_s
       end
 
       def visit_Regexp o
@@ -331,12 +276,12 @@ module Psych
           style = Nodes::Scalar::FOLDED
         elsif o =~ /^[^[:word:]][^"]*$/
           style = Nodes::Scalar::DOUBLE_QUOTED
-        elsif not String === @ss.tokenize(o)
+        elsif not String === @ss.tokenize(o) or /\A0[0-7]*[89]/ =~ o
           style = Nodes::Scalar::SINGLE_QUOTED
         end
 
         is_primitive = o.class == ::String
-        ivars = find_ivars o, is_primitive
+        ivars = is_primitive ? [] : o.instance_variables
 
         if ivars.empty?
           unless is_primitive
@@ -346,7 +291,7 @@ module Psych
           end
           @emitter.scalar o, nil, tag, plain, quote, style
         else
-          maptag = '!ruby/string'
+          maptag = '!ruby/string'.dup
           maptag << ":#{o.class}" unless o.class == ::String
 
           register o, @emitter.start_mapping(nil, maptag, false, Nodes::Mapping::BLOCK)
@@ -403,14 +348,18 @@ module Psych
 
       def visit_Array o
         if o.class == ::Array
-          register o, @emitter.start_sequence(nil, nil, true, Nodes::Sequence::BLOCK)
-          o.each { |c| accept c }
-          @emitter.end_sequence
+          visit_Enumerator o
         else
           visit_array_subclass o
         end
       end
 
+      def visit_Enumerator o
+        register o, @emitter.start_sequence(nil, nil, true, Nodes::Sequence::BLOCK)
+        o.each { |c| accept c }
+        @emitter.end_sequence
+      end
+
       def visit_NilClass o
         @emitter.scalar('', nil, 'tag:yaml.org,2002:null', true, false, Nodes::Scalar::ANY)
       end
@@ -436,15 +385,9 @@ module Psych
       end
 
       private
-      # FIXME: Remove the index and count checks in Psych 3.0
-      NULL         = "\x00"
-      BINARY_RANGE = "\x00-\x7F"
-      WS_RANGE     = "^ -~\t\r\n"
 
       def binary? string
-        (string.encoding == Encoding::ASCII_8BIT && !string.ascii_only?) ||
-          string.index(NULL) ||
-          string.count(BINARY_RANGE, WS_RANGE).fdiv(string.length) > 0.3
+        string.encoding == Encoding::ASCII_8BIT && !string.ascii_only?
       end
 
       def visit_array_subclass o
@@ -485,15 +428,6 @@ module Psych
           node = @emitter.start_mapping(nil, tag, false, Psych::Nodes::Mapping::BLOCK)
           register(o, node)
 
-          # Dump the elements
-          accept 'elements'
-          @emitter.start_mapping nil, nil, true, Nodes::Mapping::BLOCK
-          o.each do |k,v|
-            accept k
-            accept v
-          end
-          @emitter.end_mapping
-
           # Dump the ivars
           accept 'ivars'
           @emitter.start_mapping nil, nil, true, Nodes::Mapping::BLOCK
@@ -503,6 +437,15 @@ module Psych
           end
           @emitter.end_mapping
 
+          # Dump the elements
+          accept 'elements'
+          @emitter.start_mapping nil, nil, true, Nodes::Mapping::BLOCK
+          o.each do |k,v|
+            accept k
+            accept v
+          end
+          @emitter.end_mapping
+
           @emitter.end_mapping
         else
           tag = "!ruby/hash:#{o.class}"
@@ -519,6 +462,24 @@ module Psych
       def dump_list o
       end
 
+      def dump_exception o, msg
+        tag = ['!ruby/exception', o.class.name].join ':'
+
+        @emitter.start_mapping nil, tag, false, Nodes::Mapping::BLOCK
+
+        if msg
+          @emitter.scalar 'message', nil, nil, true, false, Nodes::Scalar::ANY
+          accept msg
+        end
+
+        @emitter.scalar 'backtrace', nil, nil, true, false, Nodes::Scalar::ANY
+        accept o.backtrace
+
+        dump_ivars o
+
+        @emitter.end_mapping
+      end
+
       def format_time time
         if time.utc?
           time.strftime("%Y-%m-%d %H:%M:%S.%9N Z")
@@ -527,24 +488,6 @@ module Psych
         end
       end
 
-      # FIXME: remove this method once "to_yaml_properties" is removed
-      def find_ivars target, is_primitive=false
-        begin
-          loc = target.method(:to_yaml_properties).source_location.first
-          unless loc.start_with?(Psych::DEPRECATED) || loc.end_with?('rubytypes.rb')
-            if $VERBOSE
-              warn "#{loc}: to_yaml_properties is deprecated, please implement \"encode_with(coder)\""
-            end
-            return target.to_yaml_properties
-          end
-        rescue
-          # public_method or source_location might be overridden,
-          # and it's OK to skip it since it's only to emit a warning.
-        end
-
-        is_primitive ? [] : target.instance_variables
-      end
-
       def register target, yaml_obj
         @st.register target, yaml_obj
         yaml_obj
@@ -566,9 +509,9 @@ module Psych
       def emit_coder c, o
         case c.type
         when :scalar
-          @emitter.scalar c.scalar, nil, c.tag, c.tag.nil?, false, Nodes::Scalar::ANY
+          @emitter.scalar c.scalar, nil, c.tag, c.tag.nil?, false, c.style
         when :seq
-          @emitter.start_sequence nil, c.tag, c.tag.nil?, Nodes::Sequence::BLOCK
+          @emitter.start_sequence nil, c.tag, c.tag.nil?, c.style
           c.seq.each do |thing|
             accept thing
           end
@@ -586,9 +529,7 @@ module Psych
       end
 
       def dump_ivars target
-        ivars = find_ivars target
-
-        ivars.each do |iv|
+        target.instance_variables.each do |iv|
           @emitter.scalar("#{iv.to_s.sub(/^@/, '')}", nil, nil, true, false, Nodes::Scalar::ANY)
           accept target.instance_variable_get(iv)
         end
diff --git a/ext/psych/lib/psych/y.rb b/ext/psych/lib/psych/y.rb
index 82e05a783c..e857953c04 100644
--- a/ext/psych/lib/psych/y.rb
+++ b/ext/psych/lib/psych/y.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Kernel
   ###
   # An alias for Psych.dump_stream meant to be used with IRB.
diff --git a/ext/psych/lib/psych_jars.rb b/ext/psych/lib/psych_jars.rb
deleted file mode 100644
index bd7ea04de7..0000000000
--- a/ext/psych/lib/psych_jars.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-# frozen_string_literal: false
-require 'psych/versions'
-require 'psych.jar'
-
-require 'jar-dependencies'
-require_jar('org.yaml', 'snakeyaml', Psych::DEFAULT_SNAKEYAML_VERSION)
diff --git a/ext/psych/psych.c b/ext/psych/psych.c
index 3bb59bfc11..8af0bb6a5a 100644
--- a/ext/psych/psych.c
+++ b/ext/psych/psych.c
@@ -11,9 +11,9 @@ static VALUE libyaml_version(VALUE module)
 
     yaml_get_version(&major, &minor, &patch);
 
-    list[0] = INT2NUM((long)major);
-    list[1] = INT2NUM((long)minor);
-    list[2] = INT2NUM((long)patch);
+    list[0] = INT2NUM(major);
+    list[1] = INT2NUM(minor);
+    list[2] = INT2NUM(patch);
 
     return rb_ary_new4((long)3, list);
 }
@@ -22,6 +22,9 @@ VALUE mPsych;
 
 void Init_psych(void)
 {
+    #ifdef HAVE_RB_EXT_RACTOR_SAFE
+	RB_EXT_RACTOR_SAFE(true);
+    #endif
     mPsych = rb_define_module("Psych");
 
     rb_define_singleton_method(mPsych, "libyaml_version", libyaml_version, 0);
diff --git a/ext/psych/psych.gemspec b/ext/psych/psych.gemspec
index 70ac510f55..e9e36e6633 100644
--- a/ext/psych/psych.gemspec
+++ b/ext/psych/psych.gemspec
@@ -1,25 +1,67 @@
 # -*- encoding: utf-8 -*-
-# stub: psych 2.0.17 ruby lib
-# stub: ext/psych/extconf.rb
+# frozen_string_literal: true
+
+version_module = Module.new do
+  version_rb = File.join(__dir__, "lib/psych/versions.rb")
+  module_eval(File.read(version_rb), version_rb)
+end
 
 Gem::Specification.new do |s|
   s.name = "psych"
-  s.version = "2.0.17"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Aaron Patterson"]
-  s.date = "2015-12-07"
-  s.description = "Psych is a YAML parser and emitter.  Psych leverages libyaml[http://pyyaml.org/wiki/LibYAML]\nfor its YAML parsing and emitting capabilities.  In addition to wrapping\nlibyaml, Psych also knows how to serialize and de-serialize most Ruby objects\nto and from the YAML format."
-  s.email = ["aaron@tenderlovemaking.com"]
-  s.extensions = ["ext/psych/extconf.rb"]
-  s.extra_rdoc_files = ["CHANGELOG.rdoc", "README.rdoc"]
-  s.files = [".autotest", ".travis.yml", "CHANGELOG.rdoc", "Manifest.txt", "README.rdoc", "Rakefile", "ext/psych/depend", "ext/psych/extconf.rb", "ext/psych/psych.c", "ext/psych/psych.h", "ext/psych/psych_emitter.c", "ext/psych/psych_emitter.h", "ext/psych/psych_parser.c", "ext/psych/psych_parser.h", "ext/psych/psych_to_ruby.c", "ext/psych/psych_to_ruby.h", "ext/psych/psych_yaml_tree.c", "ext/psych/psych_yaml_tree.h", "ext/psych/yaml/LICENSE", "ext/psych/yaml/api.c", "ext/psych/yaml/config.h", "ext/psych/yaml/dumper.c", "ext/psych/yaml/emitter.c", "ext/psych/yaml/loader.c", "ext/psych/yaml/parser.c", "ext/psych/yaml/reader.c", "ext/psych/yaml/scanner.c", "ext/psych/yaml/writer.c", "ext/psych/yaml/yaml.h", "ext/psych/yaml/yaml_private.h", "lib/psych.rb", "lib/psych/class_loader.rb", "lib/psych/coder.rb", "lib/psych/core_ext.rb", "lib/psych/deprecated.rb", "lib/psych/exception.rb", "lib/psych/handler.rb", "lib/psych/handlers/document_stream.rb", "lib/psych/handlers/recorder.rb", "lib/psych/json/ruby_events.rb", "lib/psych/json/stream.rb", "lib/psych/json/tree_builder.rb", "lib/psych/json/yaml_events.rb", "lib/psych/nodes.rb", "lib/psych/nodes/alias.rb", "lib/psych/nodes/document.rb", "lib/psych/nodes/mapping.rb", "lib/psych/nodes/node.rb", "lib/psych/nodes/scalar.rb", "lib/psych/nodes/sequence.rb", "lib/psych/nodes/stream.rb", "lib/psych/omap.rb", "lib/psych/parser.rb", "lib/psych/scalar_scanner.rb", "lib/psych/set.rb", "lib/psych/stream.rb", "lib/psych/streaming.rb", "lib/psych/syntax_error.rb", "lib/psych/tree_builder.rb", "lib/psych/versions.rb", "lib/psych/visitors.rb", "lib/psych/visitors/depth_first.rb", "lib/psych/visitors/emitter.rb", "lib/psych/visitors/json_tree.rb", "lib/psych/visitors/to_ruby.rb", "lib/psych/visitors/visitor.rb", "lib/psych/visitors/yaml_tree.rb", "lib/psych/y.rb", "lib/psych_jars.rb", "test/psych/handlers/test_recorder.rb", "test/psych/helper.rb", "test/psych/json/test_stream.rb", "test/psych/nodes/test_enumerable.rb", "test/psych/test_alias_and_anchor.rb", "test/psych/test_array.rb", "test/psych/test_boolean.rb", "test/psych/test_class.rb", "test/psych/test_coder.rb", "test/psych/test_date_time.rb", "test/psych/test_deprecated.rb", "test/psych/test_document.rb", "test/psych/test_emitter.rb", "test/psych/test_encoding.rb", "test/psych/test_exception.rb", "test/psych/test_hash.rb", "test/psych/test_json_tree.rb", "test/psych/test_merge_keys.rb", "test/psych/test_nil.rb", "test/psych/test_null.rb", "test/psych/test_numeric.rb", "test/psych/test_object.rb", "test/psych/test_object_references.rb", "test/psych/test_omap.rb", "test/psych/test_parser.rb", "test/psych/test_psych.rb", "test/psych/test_safe_load.rb", "test/psych/test_scalar.rb", "test/psych/test_scalar_scanner.rb", "test/psych/test_serialize_subclasses.rb", "test/psych/test_set.rb", "test/psych/test_stream.rb", "test/psych/test_string.rb", "test/psych/test_struct.rb", "test/psych/test_symbol.rb", "test/psych/test_tainted.rb", "test/psych/test_to_yaml_properties.rb", "test/psych/test_tree_builder.rb", "test/psych/test_yaml.rb", "test/psych/test_yamldbm.rb", "test/psych/test_yamlstore.rb", "test/psych/visitors/test_depth_first.rb", "test/psych/visitors/test_emitter.rb", "test/psych/visitors/test_to_ruby.rb", "test/psych/visitors/test_yaml_tree.rb"]
-  s.homepage = "http://github.com/tenderlove/psych"
-  s.licenses = ["MIT"]
-  s.rdoc_options = ["--main", "README.rdoc"]
-  s.required_ruby_version = Gem::Requirement.new(">= 1.9.2")
-  s.rubygems_version = "2.5.0"
+  s.version = version_module::Psych::VERSION
+  s.authors = ["Aaron Patterson", "SHIBATA Hiroshi", "Charles Oliver Nutter"]
+  s.email = ["aaron@tenderlovemaking.com", "hsbt@ruby-lang.org", "headius@headius.com"]
   s.summary = "Psych is a YAML parser and emitter"
-  s.test_files = ["test/psych/handlers/test_recorder.rb", "test/psych/json/test_stream.rb", "test/psych/nodes/test_enumerable.rb", "test/psych/test_alias_and_anchor.rb", "test/psych/test_array.rb", "test/psych/test_boolean.rb", "test/psych/test_class.rb", "test/psych/test_coder.rb", "test/psych/test_date_time.rb", "test/psych/test_deprecated.rb", "test/psych/test_document.rb", "test/psych/test_emitter.rb", "test/psych/test_encoding.rb", "test/psych/test_exception.rb", "test/psych/test_hash.rb", "test/psych/test_json_tree.rb", "test/psych/test_marshalable.rb", "test/psych/test_merge_keys.rb", "test/psych/test_nil.rb", "test/psych/test_null.rb", "test/psych/test_numeric.rb", "test/psych/test_object.rb", "test/psych/test_object_references.rb", "test/psych/test_omap.rb", "test/psych/test_parser.rb", "test/psych/test_psych.rb", "test/psych/test_safe_load.rb", "test/psych/test_scalar.rb", "test/psych/test_scalar_scanner.rb", "test/psych/test_serialize_subclasses.rb", "test/psych/test_set.rb", "test/psych/test_stream.rb", "test/psych/test_string.rb", "test/psych/test_struct.rb", "test/psych/test_symbol.rb", "test/psych/test_tainted.rb", "test/psych/test_to_yaml_properties.rb", "test/psych/test_tree_builder.rb", "test/psych/test_yaml.rb", "test/psych/test_yamldbm.rb", "test/psych/test_yamlstore.rb", "test/psych/visitors/test_depth_first.rb", "test/psych/visitors/test_emitter.rb", "test/psych/visitors/test_to_ruby.rb", "test/psych/visitors/test_yaml_tree.rb"]
+  s.description = <<-DESCRIPTION
+Psych is a YAML parser and emitter. Psych leverages libyaml[https://pyyaml.org/wiki/LibYAML]
+for its YAML parsing and emitting capabilities. In addition to wrapping libyaml,
+Psych also knows how to serialize and de-serialize most Ruby objects to and from the YAML format.
+DESCRIPTION
+  s.homepage = "https://github.com/ruby/psych"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+
+  # for ruby core repository. It was generated by `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  s.files = [
+    ".gitignore", "Gemfile", "LICENSE", "Mavenfile", "README.md", "Rakefile", "bin/console",
+    "bin/setup", "ext/psych/depend", "ext/psych/extconf.rb", "ext/psych/psych.c", "ext/psych/psych.h",
+    "ext/psych/psych_emitter.c", "ext/psych/psych_emitter.h", "ext/psych/psych_parser.c", "ext/psych/psych_parser.h",
+    "ext/psych/psych_to_ruby.c", "ext/psych/psych_to_ruby.h", "ext/psych/psych_yaml_tree.c", "ext/psych/psych_yaml_tree.h",
+    "ext/psych/yaml/LICENSE", "ext/psych/yaml/api.c", "ext/psych/yaml/config.h", "ext/psych/yaml/dumper.c",
+    "ext/psych/yaml/emitter.c", "ext/psych/yaml/loader.c", "ext/psych/yaml/parser.c", "ext/psych/yaml/reader.c",
+    "ext/psych/yaml/scanner.c", "ext/psych/yaml/writer.c", "ext/psych/yaml/yaml.h", "ext/psych/yaml/yaml_private.h",
+    "lib/psych.rb", "lib/psych/class_loader.rb", "lib/psych/coder.rb", "lib/psych/core_ext.rb", "lib/psych/exception.rb",
+    "lib/psych/handler.rb", "lib/psych/handlers/document_stream.rb", "lib/psych/handlers/recorder.rb",
+    "lib/psych/json/ruby_events.rb", "lib/psych/json/stream.rb", "lib/psych/json/tree_builder.rb",
+    "lib/psych/json/yaml_events.rb", "lib/psych/nodes.rb", "lib/psych/nodes/alias.rb", "lib/psych/nodes/document.rb",
+    "lib/psych/nodes/mapping.rb", "lib/psych/nodes/node.rb", "lib/psych/nodes/scalar.rb", "lib/psych/nodes/sequence.rb",
+    "lib/psych/nodes/stream.rb", "lib/psych/omap.rb", "lib/psych/parser.rb", "lib/psych/scalar_scanner.rb",
+    "lib/psych/set.rb", "lib/psych/stream.rb", "lib/psych/streaming.rb", "lib/psych/syntax_error.rb",
+    "lib/psych/tree_builder.rb", "lib/psych/versions.rb", "lib/psych/visitors.rb","lib/psych/visitors/depth_first.rb",
+    "lib/psych/visitors/emitter.rb", "lib/psych/visitors/json_tree.rb", "lib/psych/visitors/to_ruby.rb",
+    "lib/psych/visitors/visitor.rb", "lib/psych/visitors/yaml_tree.rb", "lib/psych/y.rb", "psych.gemspec"
+  ]
+
+  s.rdoc_options = ["--main", "README.md"]
+  s.extra_rdoc_files = ["README.md"]
+
+  s.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+  s.required_rubygems_version = Gem::Requirement.new(">= 0")
+
+  if RUBY_ENGINE == 'jruby'
+    s.platform = 'java'
+    s.files.concat [
+      "ext/java/org/jruby/ext/psych/PsychEmitter.java",
+      "ext/java/org/jruby/ext/psych/PsychLibrary.java",
+      "ext/java/org/jruby/ext/psych/PsychParser.java",
+      "ext/java/org/jruby/ext/psych/PsychToRuby.java",
+      "ext/java/org/jruby/ext/psych/PsychYamlTree.java",
+      "lib/psych_jars.rb",
+      "lib/psych.jar"
+    ]
+    s.requirements = "jar org.yaml:snakeyaml, #{version_module::Psych::DEFAULT_SNAKEYAML_VERSION}"
+    s.add_dependency 'jar-dependencies', '>= 0.1.7'
+  else
+    s.extensions = ["ext/psych/extconf.rb"]
+  end
 end
diff --git a/ext/psych/psych.h b/ext/psych/psych.h
index 1830ca4b19..6b3d63f246 100644
--- a/ext/psych/psych.h
+++ b/ext/psych/psych.h
@@ -2,10 +2,7 @@
 #define PSYCH_H
 
 #include <ruby.h>
-
-#ifdef HAVE_RUBY_ENCODING_H
 #include <ruby/encoding.h>
-#endif
 
 #include <yaml.h>
 
diff --git a/ext/psych/psych_emitter.c b/ext/psych/psych_emitter.c
index 371c285183..022ffa0946 100644
--- a/ext/psych/psych_emitter.c
+++ b/ext/psych/psych_emitter.c
@@ -8,6 +8,7 @@
 #endif
 
 VALUE cPsychEmitter;
+static ID id_io;
 static ID id_write;
 static ID id_line_width;
 static ID id_indentation;
@@ -21,12 +22,8 @@ static void emit(yaml_emitter_t * emitter, yaml_event_t * event)
 
 static int writer(void *ctx, unsigned char *buffer, size_t size)
 {
-    VALUE io = (VALUE)ctx;
-#ifdef HAVE_RUBY_ENCODING_H
+    VALUE self = (VALUE)ctx, io = rb_attr_get(self, id_io);
     VALUE str = rb_enc_str_new((const char *)buffer, (long)size, rb_utf8_encoding());
-#else
-    VALUE str = rb_str_new((const char *)buffer, (long)size);
-#endif
     VALUE wrote = rb_funcall(io, id_write, 1, str);
     return (int)NUM2INT(wrote);
 }
@@ -94,7 +91,8 @@ static VALUE initialize(int argc, VALUE *argv, VALUE self)
 	yaml_emitter_set_canonical(emitter, Qtrue == canonical ? 1 : 0);
     }
 
-    yaml_emitter_set_output(emitter, writer, (void *)io);
+    rb_ivar_set(self, id_io, io);
+    yaml_emitter_set_output(emitter, writer, (void *)self);
 
     return self;
 }
@@ -168,9 +166,7 @@ static VALUE start_document(VALUE self, VALUE version, VALUE tags, VALUE imp)
     if(RTEST(tags)) {
 	long i = 0;
 	long len;
-#ifdef HAVE_RUBY_ENCODING_H
 	rb_encoding * encoding = rb_utf8_encoding();
-#endif
 
 	Check_Type(tags, T_ARRAY);
 
@@ -193,13 +189,11 @@ static VALUE start_document(VALUE self, VALUE version, VALUE tags, VALUE imp)
 	    value = RARRAY_AREF(tuple, 1);
 	    StringValue(name);
 	    StringValue(value);
-#ifdef HAVE_RUBY_ENCODING_H
 	    name = rb_str_export_to_enc(name, encoding);
 	    value = rb_str_export_to_enc(value, encoding);
-#endif
 
-	    tail->handle = (yaml_char_t *)RSTRING_PTR(name);
-	    tail->prefix = (yaml_char_t *)RSTRING_PTR(value);
+	    tail->handle = (yaml_char_t *)StringValueCStr(name);
+	    tail->prefix = (yaml_char_t *)StringValueCStr(value);
 
 	    tail++;
 	}
@@ -257,14 +251,11 @@ static VALUE scalar(
 	) {
     yaml_emitter_t * emitter;
     yaml_event_t event;
-#ifdef HAVE_RUBY_ENCODING_H
     rb_encoding *encoding;
-#endif
     TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
 
     Check_Type(value, T_STRING);
 
-#ifdef HAVE_RUBY_ENCODING_H
     encoding = rb_utf8_encoding();
 
     value = rb_str_export_to_enc(value, encoding);
@@ -278,12 +269,11 @@ static VALUE scalar(
 	Check_Type(tag, T_STRING);
 	tag = rb_str_export_to_enc(tag, encoding);
     }
-#endif
 
     yaml_scalar_event_initialize(
 	    &event,
-	    (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValuePtr(anchor)),
-	    (yaml_char_t *)(NIL_P(tag) ? NULL : StringValuePtr(tag)),
+	    (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValueCStr(anchor)),
+	    (yaml_char_t *)(NIL_P(tag) ? NULL : StringValueCStr(tag)),
 	    (yaml_char_t*)StringValuePtr(value),
 	    (int)RSTRING_LEN(value),
 	    plain ? 1 : 0,
@@ -313,7 +303,6 @@ static VALUE start_sequence(
     yaml_emitter_t * emitter;
     yaml_event_t event;
 
-#ifdef HAVE_RUBY_ENCODING_H
     rb_encoding * encoding = rb_utf8_encoding();
 
     if(!NIL_P(anchor)) {
@@ -325,14 +314,13 @@ static VALUE start_sequence(
 	Check_Type(tag, T_STRING);
 	tag = rb_str_export_to_enc(tag, encoding);
     }
-#endif
 
     TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
 
     yaml_sequence_start_event_initialize(
 	    &event,
-	    (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValuePtr(anchor)),
-	    (yaml_char_t *)(NIL_P(tag) ? NULL : StringValuePtr(tag)),
+	    (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValueCStr(anchor)),
+	    (yaml_char_t *)(NIL_P(tag) ? NULL : StringValueCStr(tag)),
 	    implicit ? 1 : 0,
 	    (yaml_sequence_style_t)NUM2INT(style)
 	    );
@@ -377,12 +365,10 @@ static VALUE start_mapping(
 	) {
     yaml_emitter_t * emitter;
     yaml_event_t event;
-#ifdef HAVE_RUBY_ENCODING_H
     rb_encoding *encoding;
-#endif
+
     TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
 
-#ifdef HAVE_RUBY_ENCODING_H
     encoding = rb_utf8_encoding();
 
     if(!NIL_P(anchor)) {
@@ -394,12 +380,11 @@ static VALUE start_mapping(
 	Check_Type(tag, T_STRING);
 	tag = rb_str_export_to_enc(tag, encoding);
     }
-#endif
 
     yaml_mapping_start_event_initialize(
 	    &event,
-	    (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValuePtr(anchor)),
-	    (yaml_char_t *)(NIL_P(tag) ? NULL : StringValuePtr(tag)),
+	    (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValueCStr(anchor)),
+	    (yaml_char_t *)(NIL_P(tag) ? NULL : StringValueCStr(tag)),
 	    implicit ? 1 : 0,
 	    (yaml_mapping_style_t)NUM2INT(style)
 	    );
@@ -440,16 +425,14 @@ static VALUE alias(VALUE self, VALUE anchor)
     yaml_event_t event;
     TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
 
-#ifdef HAVE_RUBY_ENCODING_H
     if(!NIL_P(anchor)) {
 	Check_Type(anchor, T_STRING);
 	anchor = rb_str_export_to_enc(anchor, rb_utf8_encoding());
     }
-#endif
 
     yaml_alias_event_initialize(
 	    &event,
-	    (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValuePtr(anchor))
+	    (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValueCStr(anchor))
 	    );
 
     emit(emitter, &event);
@@ -538,6 +521,7 @@ static VALUE set_line_width(VALUE self, VALUE width)
 
 void Init_psych_emitter(void)
 {
+#undef rb_intern
     VALUE psych     = rb_define_module("Psych");
     VALUE handler   = rb_define_class_under(psych, "Handler", rb_cObject);
     cPsychEmitter   = rb_define_class_under(psych, "Emitter", handler);
@@ -562,6 +546,7 @@ void Init_psych_emitter(void)
     rb_define_method(cPsychEmitter, "line_width", line_width, 0);
     rb_define_method(cPsychEmitter, "line_width=", set_line_width, 1);
 
+    id_io          = rb_intern("io");
     id_write       = rb_intern("write");
     id_line_width  = rb_intern("line_width");
     id_indentation = rb_intern("indentation");
diff --git a/ext/psych/psych_parser.c b/ext/psych/psych_parser.c
index 2caa8a09c3..fd550b671a 100644
--- a/ext/psych/psych_parser.c
+++ b/ext/psych/psych_parser.c
@@ -1,7 +1,6 @@
 #include <psych.h>
 
 VALUE cPsychParser;
-VALUE ePsychSyntaxError;
 
 static ID id_read;
 static ID id_path;
@@ -16,6 +15,7 @@ static ID id_start_sequence;
 static ID id_end_sequence;
 static ID id_start_mapping;
 static ID id_end_mapping;
+static ID id_event_location;
 
 #define PSYCH_TRANSCODE(_str, _yaml_enc, _internal_enc) \
   do { \
@@ -27,7 +27,7 @@ static ID id_end_mapping;
 static int io_reader(void * data, unsigned char *buf, size_t size, size_t *read)
 {
     VALUE io = (VALUE)data;
-    VALUE string = rb_funcall(io, id_read, 1, INT2NUM(size));
+    VALUE string = rb_funcall(io, id_read, 1, SIZET2NUM(size));
 
     *read = 0;
 
@@ -80,20 +80,22 @@ static VALUE allocate(VALUE klass)
 static VALUE make_exception(yaml_parser_t * parser, VALUE path)
 {
     size_t line, column;
+    VALUE ePsychSyntaxError;
 
     line = parser->context_mark.line + 1;
     column = parser->context_mark.column + 1;
 
+    ePsychSyntaxError = rb_const_get(mPsych, rb_intern("SyntaxError"));
+
     return rb_funcall(ePsychSyntaxError, rb_intern("new"), 6,
 	    path,
-	    INT2NUM(line),
-	    INT2NUM(column),
-	    INT2NUM(parser->problem_offset),
+	    SIZET2NUM(line),
+	    SIZET2NUM(column),
+	    SIZET2NUM(parser->problem_offset),
 	    parser->problem ? rb_usascii_str_new2(parser->problem) : Qnil,
 	    parser->context ? rb_usascii_str_new2(parser->context) : Qnil);
 }
 
-#ifdef HAVE_RUBY_ENCODING_H
 static VALUE transcode_string(VALUE src, int * parser_encoding)
 {
     int utf8    = rb_utf8_encindex();
@@ -171,8 +173,6 @@ static VALUE transcode_io(VALUE src, int * parser_encoding)
     return src;
 }
 
-#endif
-
 static VALUE protected_start_stream(VALUE pointer)
 {
     VALUE *args = (VALUE *)pointer;
@@ -235,6 +235,12 @@ static VALUE protected_end_stream(VALUE handler)
     return rb_funcall(handler, id_end_stream, 0);
 }
 
+static VALUE protected_event_location(VALUE pointer)
+{
+    VALUE *args = (VALUE *)pointer;
+    return rb_funcall3(args[0], id_event_location, 4, args + 1);
+}
+
 /*
  * call-seq:
  *    parser.parse(yaml)
@@ -250,13 +256,10 @@ static VALUE parse(int argc, VALUE *argv, VALUE self)
     yaml_parser_t * parser;
     yaml_event_t event;
     int done = 0;
-    int tainted = 0;
     int state = 0;
     int parser_encoding = YAML_ANY_ENCODING;
-#ifdef HAVE_RUBY_ENCODING_H
     int encoding = rb_utf8_encindex();
     rb_encoding * internal_enc = rb_default_internal_encoding();
-#endif
     VALUE handler = rb_iv_get(self, "@handler");
 
     if (rb_scan_args(argc, argv, "11", &yaml, &path) == 1) {
@@ -271,21 +274,14 @@ static VALUE parse(int argc, VALUE *argv, VALUE self)
     yaml_parser_delete(parser);
     yaml_parser_initialize(parser);
 
-    if (OBJ_TAINTED(yaml)) tainted = 1;
-
     if (rb_respond_to(yaml, id_read)) {
-#ifdef HAVE_RUBY_ENCODING_H
 	yaml = transcode_io(yaml, &parser_encoding);
 	yaml_parser_set_encoding(parser, parser_encoding);
-#endif
 	yaml_parser_set_input(parser, io_reader, (void *)yaml);
-	if (RTEST(rb_obj_is_kind_of(yaml, rb_cIO))) tainted = 1;
     } else {
 	StringValue(yaml);
-#ifdef HAVE_RUBY_ENCODING_H
 	yaml = transcode_string(yaml, &parser_encoding);
 	yaml_parser_set_encoding(parser, parser_encoding);
-#endif
 	yaml_parser_set_input_string(
 		parser,
 		(const unsigned char *)RSTRING_PTR(yaml),
@@ -294,6 +290,9 @@ static VALUE parse(int argc, VALUE *argv, VALUE self)
     }
 
     while(!done) {
+	VALUE event_args[5];
+	VALUE start_line, start_column, end_line, end_column;
+
 	if(!yaml_parser_parse(parser, &event)) {
 	    VALUE exception;
 
@@ -304,13 +303,25 @@ static VALUE parse(int argc, VALUE *argv, VALUE self)
 	    rb_exc_raise(exception);
 	}
 
+	start_line = SIZET2NUM(event.start_mark.line);
+	start_column = SIZET2NUM(event.start_mark.column);
+	end_line = SIZET2NUM(event.end_mark.line);
+	end_column = SIZET2NUM(event.end_mark.column);
+
+	event_args[0] = handler;
+	event_args[1] = start_line;
+	event_args[2] = start_column;
+	event_args[3] = end_line;
+	event_args[4] = end_column;
+	rb_protect(protected_event_location, (VALUE)event_args, &state);
+
 	switch(event.type) {
 	    case YAML_STREAM_START_EVENT:
 	      {
 		  VALUE args[2];
 
 		  args[0] = handler;
-		  args[1] = INT2NUM((long)event.data.stream_start.encoding);
+		  args[1] = INT2NUM(event.data.stream_start.encoding);
 		  rb_protect(protected_start_stream, (VALUE)args, &state);
 	      }
 	      break;
@@ -323,8 +334,8 @@ static VALUE parse(int argc, VALUE *argv, VALUE self)
 		VALUE version = event.data.document_start.version_directive ?
 		    rb_ary_new3(
 			(long)2,
-			INT2NUM((long)event.data.document_start.version_directive->major),
-			INT2NUM((long)event.data.document_start.version_directive->minor)
+			INT2NUM(event.data.document_start.version_directive->major),
+			INT2NUM(event.data.document_start.version_directive->minor)
 			) : rb_ary_new();
 
 		if(event.data.document_start.tag_directives.start) {
@@ -337,18 +348,12 @@ static VALUE parse(int argc, VALUE *argv, VALUE self)
 			VALUE prefix = Qnil;
 			if(start->handle) {
 			    handle = rb_str_new2((const char *)start->handle);
-			    if (tainted) OBJ_TAINT(handle);
-#ifdef HAVE_RUBY_ENCODING_H
 			    PSYCH_TRANSCODE(handle, encoding, internal_enc);
-#endif
 			}
 
 			if(start->prefix) {
 			    prefix = rb_str_new2((const char *)start->prefix);
-			    if (tainted) OBJ_TAINT(prefix);
-#ifdef HAVE_RUBY_ENCODING_H
 			    PSYCH_TRANSCODE(prefix, encoding, internal_enc);
-#endif
 			}
 
 			rb_ary_push(tag_directives, rb_ary_new3((long)2, handle, prefix));
@@ -376,10 +381,7 @@ static VALUE parse(int argc, VALUE *argv, VALUE self)
 		VALUE alias = Qnil;
 		if(event.data.alias.anchor) {
 		    alias = rb_str_new2((const char *)event.data.alias.anchor);
-		    if (tainted) OBJ_TAINT(alias);
-#ifdef HAVE_RUBY_ENCODING_H
 		    PSYCH_TRANSCODE(alias, encoding, internal_enc);
-#endif
 		}
 
 		args[0] = handler;
@@ -397,26 +399,17 @@ static VALUE parse(int argc, VALUE *argv, VALUE self)
 		    (const char *)event.data.scalar.value,
 		    (long)event.data.scalar.length
 		    );
-		if (tainted) OBJ_TAINT(val);
 
-#ifdef HAVE_RUBY_ENCODING_H
 		PSYCH_TRANSCODE(val, encoding, internal_enc);
-#endif
 
 		if(event.data.scalar.anchor) {
 		    anchor = rb_str_new2((const char *)event.data.scalar.anchor);
-		    if (tainted) OBJ_TAINT(anchor);
-#ifdef HAVE_RUBY_ENCODING_H
 		    PSYCH_TRANSCODE(anchor, encoding, internal_enc);
-#endif
 		}
 
 		if(event.data.scalar.tag) {
 		    tag = rb_str_new2((const char *)event.data.scalar.tag);
-		    if (tainted) OBJ_TAINT(tag);
-#ifdef HAVE_RUBY_ENCODING_H
 		    PSYCH_TRANSCODE(tag, encoding, internal_enc);
-#endif
 		}
 
 		plain_implicit =
@@ -425,7 +418,7 @@ static VALUE parse(int argc, VALUE *argv, VALUE self)
 		quoted_implicit =
 		    event.data.scalar.quoted_implicit == 0 ? Qfalse : Qtrue;
 
-		style = INT2NUM((long)event.data.scalar.style);
+		style = INT2NUM(event.data.scalar.style);
 
 		args[0] = handler;
 		args[1] = val;
@@ -445,25 +438,19 @@ static VALUE parse(int argc, VALUE *argv, VALUE self)
 		VALUE implicit, style;
 		if(event.data.sequence_start.anchor) {
 		    anchor = rb_str_new2((const char *)event.data.sequence_start.anchor);
-		    if (tainted) OBJ_TAINT(anchor);
-#ifdef HAVE_RUBY_ENCODING_H
 		    PSYCH_TRANSCODE(anchor, encoding, internal_enc);
-#endif
 		}
 
 		tag = Qnil;
 		if(event.data.sequence_start.tag) {
 		    tag = rb_str_new2((const char *)event.data.sequence_start.tag);
-		    if (tainted) OBJ_TAINT(tag);
-#ifdef HAVE_RUBY_ENCODING_H
 		    PSYCH_TRANSCODE(tag, encoding, internal_enc);
-#endif
 		}
 
 		implicit =
 		    event.data.sequence_start.implicit == 0 ? Qfalse : Qtrue;
 
-		style = INT2NUM((long)event.data.sequence_start.style);
+		style = INT2NUM(event.data.sequence_start.style);
 
 		args[0] = handler;
 		args[1] = anchor;
@@ -485,24 +472,18 @@ static VALUE parse(int argc, VALUE *argv, VALUE self)
 		VALUE implicit, style;
 		if(event.data.mapping_start.anchor) {
 		    anchor = rb_str_new2((const char *)event.data.mapping_start.anchor);
-		    if (tainted) OBJ_TAINT(anchor);
-#ifdef HAVE_RUBY_ENCODING_H
 		    PSYCH_TRANSCODE(anchor, encoding, internal_enc);
-#endif
 		}
 
 		if(event.data.mapping_start.tag) {
 		    tag = rb_str_new2((const char *)event.data.mapping_start.tag);
-		    if (tainted) OBJ_TAINT(tag);
-#ifdef HAVE_RUBY_ENCODING_H
 		    PSYCH_TRANSCODE(tag, encoding, internal_enc);
-#endif
 		}
 
 		implicit =
 		    event.data.mapping_start.implicit == 0 ? Qfalse : Qtrue;
 
-		style = INT2NUM((long)event.data.mapping_start.style);
+		style = INT2NUM(event.data.mapping_start.style);
 
 		args[0] = handler;
 		args[1] = anchor;
@@ -546,15 +527,16 @@ static VALUE mark(VALUE self)
 
     TypedData_Get_Struct(self, yaml_parser_t, &psych_parser_type, parser);
     mark_klass = rb_const_get_at(cPsychParser, rb_intern("Mark"));
-    args[0] = INT2NUM(parser->mark.index);
-    args[1] = INT2NUM(parser->mark.line);
-    args[2] = INT2NUM(parser->mark.column);
+    args[0] = SIZET2NUM(parser->mark.index);
+    args[1] = SIZET2NUM(parser->mark.line);
+    args[2] = SIZET2NUM(parser->mark.column);
 
     return rb_class_new_instance(3, args, mark_klass);
 }
 
 void Init_psych_parser(void)
 {
+#undef rb_intern
 #if 0
     mPsych = rb_define_module("Psych");
 #endif
@@ -575,23 +557,23 @@ void Init_psych_parser(void)
     rb_define_const(cPsychParser, "UTF16BE", INT2NUM(YAML_UTF16BE_ENCODING));
 
     rb_require("psych/syntax_error");
-    ePsychSyntaxError = rb_const_get(mPsych, rb_intern("SyntaxError"));
 
     rb_define_method(cPsychParser, "parse", parse, -1);
     rb_define_method(cPsychParser, "mark", mark, 0);
 
-    id_read           = rb_intern("read");
-    id_path           = rb_intern("path");
-    id_empty          = rb_intern("empty");
-    id_start_stream   = rb_intern("start_stream");
-    id_end_stream     = rb_intern("end_stream");
-    id_start_document = rb_intern("start_document");
-    id_end_document   = rb_intern("end_document");
-    id_alias          = rb_intern("alias");
-    id_scalar         = rb_intern("scalar");
-    id_start_sequence = rb_intern("start_sequence");
-    id_end_sequence   = rb_intern("end_sequence");
-    id_start_mapping  = rb_intern("start_mapping");
-    id_end_mapping    = rb_intern("end_mapping");
+    id_read            = rb_intern("read");
+    id_path            = rb_intern("path");
+    id_empty           = rb_intern("empty");
+    id_start_stream    = rb_intern("start_stream");
+    id_end_stream      = rb_intern("end_stream");
+    id_start_document  = rb_intern("start_document");
+    id_end_document    = rb_intern("end_document");
+    id_alias           = rb_intern("alias");
+    id_scalar          = rb_intern("scalar");
+    id_start_sequence  = rb_intern("start_sequence");
+    id_end_sequence    = rb_intern("end_sequence");
+    id_start_mapping   = rb_intern("start_mapping");
+    id_end_mapping     = rb_intern("end_mapping");
+    id_event_location  = rb_intern("event_location");
 }
 /* vim: set noet sws=4 sw=4: */
diff --git a/ext/psych/psych_to_ruby.c b/ext/psych/psych_to_ruby.c
index 3cc87a965e..b388ff7754 100644
--- a/ext/psych/psych_to_ruby.c
+++ b/ext/psych/psych_to_ruby.c
@@ -21,11 +21,7 @@ static VALUE build_exception(VALUE self, VALUE klass, VALUE mesg)
  */
 static VALUE path2class(VALUE self, VALUE path)
 {
-#ifdef HAVE_RUBY_ENCODING_H
     return rb_path_to_class(path);
-#else
-    return rb_path2class(StringValuePtr(path));
-#endif
 }
 
 void Init_psych_to_ruby(void)
diff --git a/ext/psych/psych_yaml_tree.c b/ext/psych/psych_yaml_tree.c
index bcf24d2070..225655d127 100644
--- a/ext/psych/psych_yaml_tree.c
+++ b/ext/psych/psych_yaml_tree.c
@@ -2,23 +2,11 @@
 
 VALUE cPsychVisitorsYamlTree;
 
-/*
- * call-seq: private_iv_get(target, prop)
- *
- * Get the private instance variable +prop+ from +target+
- */
-static VALUE private_iv_get(VALUE self, VALUE target, VALUE prop)
-{
-    return rb_attr_get(target, rb_intern(StringValuePtr(prop)));
-}
-
 void Init_psych_yaml_tree(void)
 {
     VALUE psych     = rb_define_module("Psych");
     VALUE visitors  = rb_define_module_under(psych, "Visitors");
     VALUE visitor   = rb_define_class_under(visitors, "Visitor", rb_cObject);
     cPsychVisitorsYamlTree = rb_define_class_under(visitors, "YAMLTree", visitor);
-
-    rb_define_private_method(cPsychVisitorsYamlTree, "private_iv_get", private_iv_get, 2);
 }
 /* vim: set noet sws=4 sw=4: */
diff --git a/ext/psych/yaml/LICENSE b/ext/psych/yaml/LICENSE
deleted file mode 100644
index 050ced23f6..0000000000
--- a/ext/psych/yaml/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2006 Kirill Simonov
-
-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.
diff --git a/ext/psych/yaml/api.c b/ext/psych/yaml/api.c
index e0b9d979cc..6add8b2661 100644
--- a/ext/psych/yaml/api.c
+++ b/ext/psych/yaml/api.c
@@ -74,7 +74,7 @@ YAML_DECLARE(int)
 yaml_string_extend(yaml_char_t **start,
         yaml_char_t **pointer, yaml_char_t **end)
 {
-    yaml_char_t *new_start = yaml_realloc(*start, (*end - *start)*2);
+    yaml_char_t *new_start = (yaml_char_t *)yaml_realloc((void*)*start, (*end - *start)*2);
 
     if (!new_start) return 0;
 
@@ -94,8 +94,9 @@ yaml_string_extend(yaml_char_t **start,
 YAML_DECLARE(int)
 yaml_string_join(
         yaml_char_t **a_start, yaml_char_t **a_pointer, yaml_char_t **a_end,
-        yaml_char_t **b_start, yaml_char_t **b_pointer, yaml_char_t **b_end)
+        yaml_char_t **b_start, yaml_char_t **b_pointer, SHIM(yaml_char_t **b_end))
 {
+    UNUSED_PARAM(b_end)
     if (*b_start == *b_pointer)
         return 1;
 
@@ -117,7 +118,12 @@ yaml_string_join(
 YAML_DECLARE(int)
 yaml_stack_extend(void **start, void **top, void **end)
 {
-    void *new_start = yaml_realloc(*start, ((char *)*end - (char *)*start)*2);
+    void *new_start;
+
+    if ((char *)*end - (char *)*start >= INT_MAX / 2)
+	return 0;
+
+    new_start = yaml_realloc(*start, ((char *)*end - (char *)*start)*2);
 
     if (!new_start) return 0;
 
@@ -177,17 +183,17 @@ yaml_parser_initialize(yaml_parser_t *parser)
         goto error;
     if (!BUFFER_INIT(parser, parser->buffer, INPUT_BUFFER_SIZE))
         goto error;
-    if (!QUEUE_INIT(parser, parser->tokens, INITIAL_QUEUE_SIZE))
+    if (!QUEUE_INIT(parser, parser->tokens, INITIAL_QUEUE_SIZE, yaml_token_t*))
         goto error;
-    if (!STACK_INIT(parser, parser->indents, INITIAL_STACK_SIZE))
+    if (!STACK_INIT(parser, parser->indents, int*))
         goto error;
-    if (!STACK_INIT(parser, parser->simple_keys, INITIAL_STACK_SIZE))
+    if (!STACK_INIT(parser, parser->simple_keys, yaml_simple_key_t*))
         goto error;
-    if (!STACK_INIT(parser, parser->states, INITIAL_STACK_SIZE))
+    if (!STACK_INIT(parser, parser->states, yaml_parser_state_t*))
         goto error;
-    if (!STACK_INIT(parser, parser->marks, INITIAL_STACK_SIZE))
+    if (!STACK_INIT(parser, parser->marks, yaml_mark_t*))
         goto error;
-    if (!STACK_INIT(parser, parser->tag_directives, INITIAL_STACK_SIZE))
+    if (!STACK_INIT(parser, parser->tag_directives, yaml_tag_directive_t*))
         goto error;
 
     return 1;
@@ -243,7 +249,7 @@ static int
 yaml_string_read_handler(void *data, unsigned char *buffer, size_t size,
         size_t *size_read)
 {
-    yaml_parser_t *parser = data;
+    yaml_parser_t *parser = (yaml_parser_t *)data;
 
     if (parser->input.string.current == parser->input.string.end) {
         *size_read = 0;
@@ -269,7 +275,7 @@ static int
 yaml_file_read_handler(void *data, unsigned char *buffer, size_t size,
         size_t *size_read)
 {
-    yaml_parser_t *parser = data;
+    yaml_parser_t *parser = (yaml_parser_t *)data;
 
     *size_read = fread(buffer, 1, size, parser->input.file);
     return !ferror(parser->input.file);
@@ -355,13 +361,13 @@ yaml_emitter_initialize(yaml_emitter_t *emitter)
         goto error;
     if (!BUFFER_INIT(emitter, emitter->raw_buffer, OUTPUT_RAW_BUFFER_SIZE))
         goto error;
-    if (!STACK_INIT(emitter, emitter->states, INITIAL_STACK_SIZE))
+    if (!STACK_INIT(emitter, emitter->states, yaml_emitter_state_t*))
         goto error;
-    if (!QUEUE_INIT(emitter, emitter->events, INITIAL_QUEUE_SIZE))
+    if (!QUEUE_INIT(emitter, emitter->events, INITIAL_QUEUE_SIZE, yaml_event_t*))
         goto error;
-    if (!STACK_INIT(emitter, emitter->indents, INITIAL_STACK_SIZE))
+    if (!STACK_INIT(emitter, emitter->indents, int*))
         goto error;
-    if (!STACK_INIT(emitter, emitter->tag_directives, INITIAL_STACK_SIZE))
+    if (!STACK_INIT(emitter, emitter->tag_directives, yaml_tag_directive_t*))
         goto error;
 
     return 1;
@@ -395,7 +401,7 @@ yaml_emitter_delete(yaml_emitter_t *emitter)
     }
     QUEUE_DEL(emitter, emitter->events);
     STACK_DEL(emitter, emitter->indents);
-    while (!STACK_EMPTY(emitter, emitter->tag_directives)) {
+    while (!STACK_EMPTY(empty, emitter->tag_directives)) {
         yaml_tag_directive_t tag_directive = POP(emitter, emitter->tag_directives);
         yaml_free(tag_directive.handle);
         yaml_free(tag_directive.prefix);
@@ -413,9 +419,9 @@ yaml_emitter_delete(yaml_emitter_t *emitter)
 static int
 yaml_string_write_handler(void *data, unsigned char *buffer, size_t size)
 {
-    yaml_emitter_t *emitter = data;
+  yaml_emitter_t *emitter = (yaml_emitter_t *)data;
 
-    if (emitter->output.string.size + *emitter->output.string.size_written
+    if (emitter->output.string.size - *emitter->output.string.size_written
             < size) {
         memcpy(emitter->output.string.buffer
                 + *emitter->output.string.size_written,
@@ -439,7 +445,7 @@ yaml_string_write_handler(void *data, unsigned char *buffer, size_t size)
 static int
 yaml_file_write_handler(void *data, unsigned char *buffer, size_t size)
 {
-    yaml_emitter_t *emitter = data;
+    yaml_emitter_t *emitter = (yaml_emitter_t *)data;
 
     return (fwrite(buffer, 1, size, emitter->output.file) == size);
 }
@@ -617,10 +623,10 @@ yaml_token_delete(yaml_token_t *token)
  */
 
 static int
-yaml_check_utf8(yaml_char_t *start, size_t length)
+yaml_check_utf8(const yaml_char_t *start, size_t length)
 {
-    yaml_char_t *end = start+length;
-    yaml_char_t *pointer = start;
+    const yaml_char_t *end = start+length;
+    const yaml_char_t *pointer = start;
 
     while (pointer < end) {
         unsigned char octet;
@@ -717,7 +723,7 @@ yaml_document_start_event_initialize(yaml_event_t *event,
                             /* Valid tag directives are expected. */
 
     if (version_directive) {
-        version_directive_copy = yaml_malloc(sizeof(yaml_version_directive_t));
+        version_directive_copy = YAML_MALLOC_STATIC(yaml_version_directive_t);
         if (!version_directive_copy) goto error;
         version_directive_copy->major = version_directive->major;
         version_directive_copy->minor = version_directive->minor;
@@ -725,7 +731,7 @@ yaml_document_start_event_initialize(yaml_event_t *event,
 
     if (tag_directives_start != tag_directives_end) {
         yaml_tag_directive_t *tag_directive;
-        if (!STACK_INIT(&context, tag_directives_copy, INITIAL_STACK_SIZE))
+        if (!STACK_INIT(&context, tag_directives_copy, yaml_tag_directive_t*))
             goto error;
         for (tag_directive = tag_directives_start;
                 tag_directive != tag_directives_end; tag_directive ++) {
@@ -788,7 +794,7 @@ yaml_document_end_event_initialize(yaml_event_t *event, int implicit)
  */
 
 YAML_DECLARE(int)
-yaml_alias_event_initialize(yaml_event_t *event, yaml_char_t *anchor)
+yaml_alias_event_initialize(yaml_event_t *event, const yaml_char_t *anchor)
 {
     yaml_mark_t mark = { 0, 0, 0 };
     yaml_char_t *anchor_copy = NULL;
@@ -813,8 +819,8 @@ yaml_alias_event_initialize(yaml_event_t *event, yaml_char_t *anchor)
 
 YAML_DECLARE(int)
 yaml_scalar_event_initialize(yaml_event_t *event,
-        yaml_char_t *anchor, yaml_char_t *tag,
-        yaml_char_t *value, int length,
+        const yaml_char_t *anchor, const yaml_char_t *tag,
+        const yaml_char_t *value, int length,
         int plain_implicit, int quoted_implicit,
         yaml_scalar_style_t style)
 {
@@ -822,7 +828,6 @@ yaml_scalar_event_initialize(yaml_event_t *event,
     yaml_char_t *anchor_copy = NULL;
     yaml_char_t *tag_copy = NULL;
     yaml_char_t *value_copy = NULL;
-    size_t value_length;
 
     assert(event);      /* Non-NULL event object is expected. */
     assert(value);      /* Non-NULL anchor is expected. */
@@ -840,19 +845,16 @@ yaml_scalar_event_initialize(yaml_event_t *event,
     }
 
     if (length < 0) {
-        value_length = strlen((char *)value);
-    }
-    else {
-        value_length = (size_t)length;
+        length = (int)strlen((char *)value);
     }
 
-    if (!yaml_check_utf8(value, value_length)) goto error;
-    value_copy = yaml_malloc(value_length+1);
+    if (!yaml_check_utf8(value, length)) goto error;
+    value_copy = YAML_MALLOC(length+1);
     if (!value_copy) goto error;
-    memcpy(value_copy, value, value_length);
-    value_copy[value_length] = '\0';
+    memcpy(value_copy, value, length);
+    value_copy[length] = '\0';
 
-    SCALAR_EVENT_INIT(*event, anchor_copy, tag_copy, value_copy, value_length,
+    SCALAR_EVENT_INIT(*event, anchor_copy, tag_copy, value_copy, length,
             plain_implicit, quoted_implicit, style, mark, mark);
 
     return 1;
@@ -871,7 +873,7 @@ error:
 
 YAML_DECLARE(int)
 yaml_sequence_start_event_initialize(yaml_event_t *event,
-        yaml_char_t *anchor, yaml_char_t *tag, int implicit,
+        const yaml_char_t *anchor, const yaml_char_t *tag, int implicit,
         yaml_sequence_style_t style)
 {
     yaml_mark_t mark = { 0, 0, 0 };
@@ -926,7 +928,7 @@ yaml_sequence_end_event_initialize(yaml_event_t *event)
 
 YAML_DECLARE(int)
 yaml_mapping_start_event_initialize(yaml_event_t *event,
-        yaml_char_t *anchor, yaml_char_t *tag, int implicit,
+        const yaml_char_t *anchor, const yaml_char_t *tag, int implicit,
         yaml_mapping_style_t style)
 {
     yaml_mark_t mark = { 0, 0, 0 };
@@ -1059,10 +1061,10 @@ yaml_document_initialize(yaml_document_t *document,
             (tag_directives_start == tag_directives_end));
                             /* Valid tag directives are expected. */
 
-    if (!STACK_INIT(&context, nodes, INITIAL_STACK_SIZE)) goto error;
+    if (!STACK_INIT(&context, nodes, yaml_node_t*)) goto error;
 
     if (version_directive) {
-        version_directive_copy = yaml_malloc(sizeof(yaml_version_directive_t));
+        version_directive_copy = YAML_MALLOC_STATIC(yaml_version_directive_t);
         if (!version_directive_copy) goto error;
         version_directive_copy->major = version_directive->major;
         version_directive_copy->minor = version_directive->minor;
@@ -1070,7 +1072,7 @@ yaml_document_initialize(yaml_document_t *document,
 
     if (tag_directives_start != tag_directives_end) {
         yaml_tag_directive_t *tag_directive;
-        if (!STACK_INIT(&context, tag_directives_copy, INITIAL_STACK_SIZE))
+        if (!STACK_INIT(&context, tag_directives_copy, yaml_tag_directive_t*))
             goto error;
         for (tag_directive = tag_directives_start;
                 tag_directive != tag_directives_end; tag_directive ++) {
@@ -1120,13 +1122,8 @@ error:
 YAML_DECLARE(void)
 yaml_document_delete(yaml_document_t *document)
 {
-    struct {
-        yaml_error_type_t error;
-    } context;
     yaml_tag_directive_t *tag_directive;
 
-    context.error = YAML_NO_ERROR;  /* Eliminate a compliler warning. */
-
     assert(document);   /* Non-NULL document object is expected. */
 
     while (!STACK_EMPTY(&context, document->nodes)) {
@@ -1196,7 +1193,7 @@ yaml_document_get_root_node(yaml_document_t *document)
 
 YAML_DECLARE(int)
 yaml_document_add_scalar(yaml_document_t *document,
-        yaml_char_t *tag, yaml_char_t *value, int length,
+        const yaml_char_t *tag, const yaml_char_t *value, int length,
         yaml_scalar_style_t style)
 {
     struct {
@@ -1206,8 +1203,6 @@ yaml_document_add_scalar(yaml_document_t *document,
     yaml_char_t *tag_copy = NULL;
     yaml_char_t *value_copy = NULL;
     yaml_node_t node;
-    size_t value_length;
-    ptrdiff_t ret;
 
     assert(document);   /* Non-NULL document object is expected. */
     assert(value);      /* Non-NULL value is expected. */
@@ -1221,26 +1216,19 @@ yaml_document_add_scalar(yaml_document_t *document,
     if (!tag_copy) goto error;
 
     if (length < 0) {
-        value_length = strlen((char *)value);
-    }
-    else {
-        value_length = (size_t)length;
+        length = (int)strlen((char *)value);
     }
 
-    if (!yaml_check_utf8(value, value_length)) goto error;
-    value_copy = yaml_malloc(value_length+1);
+    if (!yaml_check_utf8(value, length)) goto error;
+    value_copy = YAML_MALLOC(length+1);
     if (!value_copy) goto error;
-    memcpy(value_copy, value, value_length);
-    value_copy[value_length] = '\0';
+    memcpy(value_copy, value, length);
+    value_copy[length] = '\0';
 
-    SCALAR_NODE_INIT(node, tag_copy, value_copy, value_length, style, mark, mark);
+    SCALAR_NODE_INIT(node, tag_copy, value_copy, length, style, mark, mark);
     if (!PUSH(&context, document->nodes, node)) goto error;
 
-    ret = document->nodes.top - document->nodes.start;
-#if PTRDIFF_MAX > INT_MAX
-    if (ret > INT_MAX) goto error;
-#endif
-    return (int)ret;
+    return (int)(document->nodes.top - document->nodes.start);
 
 error:
     yaml_free(tag_copy);
@@ -1255,7 +1243,7 @@ error:
 
 YAML_DECLARE(int)
 yaml_document_add_sequence(yaml_document_t *document,
-        yaml_char_t *tag, yaml_sequence_style_t style)
+        const yaml_char_t *tag, yaml_sequence_style_t style)
 {
     struct {
         yaml_error_type_t error;
@@ -1268,7 +1256,6 @@ yaml_document_add_sequence(yaml_document_t *document,
         yaml_node_item_t *top;
     } items = { NULL, NULL, NULL };
     yaml_node_t node;
-    ptrdiff_t ret;
 
     assert(document);   /* Non-NULL document object is expected. */
 
@@ -1280,17 +1267,13 @@ yaml_document_add_sequence(yaml_document_t *document,
     tag_copy = yaml_strdup(tag);
     if (!tag_copy) goto error;
 
-    if (!STACK_INIT(&context, items, INITIAL_STACK_SIZE)) goto error;
+    if (!STACK_INIT(&context, items, yaml_node_item_t*)) goto error;
 
     SEQUENCE_NODE_INIT(node, tag_copy, items.start, items.end,
             style, mark, mark);
     if (!PUSH(&context, document->nodes, node)) goto error;
 
-    ret = document->nodes.top - document->nodes.start;
-#if PTRDIFF_MAX > INT_MAX
-    if (ret > INT_MAX) goto error;
-#endif
-    return (int)ret;
+    return (int)(document->nodes.top - document->nodes.start);
 
 error:
     STACK_DEL(&context, items);
@@ -1305,7 +1288,7 @@ error:
 
 YAML_DECLARE(int)
 yaml_document_add_mapping(yaml_document_t *document,
-        yaml_char_t *tag, yaml_mapping_style_t style)
+        const yaml_char_t *tag, yaml_mapping_style_t style)
 {
     struct {
         yaml_error_type_t error;
@@ -1318,7 +1301,6 @@ yaml_document_add_mapping(yaml_document_t *document,
         yaml_node_pair_t *top;
     } pairs = { NULL, NULL, NULL };
     yaml_node_t node;
-    ptrdiff_t ret;
 
     assert(document);   /* Non-NULL document object is expected. */
 
@@ -1330,17 +1312,13 @@ yaml_document_add_mapping(yaml_document_t *document,
     tag_copy = yaml_strdup(tag);
     if (!tag_copy) goto error;
 
-    if (!STACK_INIT(&context, pairs, INITIAL_STACK_SIZE)) goto error;
+    if (!STACK_INIT(&context, pairs, yaml_node_pair_t*)) goto error;
 
     MAPPING_NODE_INIT(node, tag_copy, pairs.start, pairs.end,
             style, mark, mark);
     if (!PUSH(&context, document->nodes, node)) goto error;
 
-    ret = document->nodes.top - document->nodes.start;
-#if PTRDIFF_MAX > INT_MAX
-    if (ret > INT_MAX) goto error;
-#endif
-    return (int)ret;
+    return (int)(document->nodes.top - document->nodes.start);
 
 error:
     STACK_DEL(&context, pairs);
diff --git a/ext/psych/yaml/config.h b/ext/psych/yaml/config.h
index f54c27d339..4b1150f5e4 100644
--- a/ext/psych/yaml/config.h
+++ b/ext/psych/yaml/config.h
@@ -1,10 +1,80 @@
+/* include/config.h.  Generated from config.h.in by configure.  */
+/* include/config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
+#define LT_OBJDIR ".libs/"
+
+/* Name of package */
+#define PACKAGE "yaml"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "https://github.com/yaml/libyaml/issues/new"
+
+/* Define to the full name of this package. */
 #define PACKAGE_NAME "yaml"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "yaml 0.2.5"
+
+/* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "yaml"
-#define PACKAGE_VERSION "0.1.6"
-#define PACKAGE_STRING "yaml 0.1.6"
-#define PACKAGE_BUGREPORT "http://pyyaml.org/newticket?component libyaml"
+
+/* Define to the home page for this package. */
 #define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "0.2.5"
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Version number of package */
+#define VERSION "0.2.5"
+
+/* Define the major version number. */
 #define YAML_VERSION_MAJOR 0
-#define YAML_VERSION_MINOR 1
-#define YAML_VERSION_PATCH 6
-#define YAML_VERSION_STRING "0.1.6"
+
+/* Define the minor version number. */
+#define YAML_VERSION_MINOR 2
+
+/* Define the patch version number. */
+#define YAML_VERSION_PATCH 5
+
+/* Define the version string. */
+#define YAML_VERSION_STRING "0.2.5"
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+/* #undef size_t */
diff --git a/ext/psych/yaml/dumper.c b/ext/psych/yaml/dumper.c
index 203c6a709c..1fe940b674 100644
--- a/ext/psych/yaml/dumper.c
+++ b/ext/psych/yaml/dumper.c
@@ -131,7 +131,7 @@ yaml_emitter_dump(yaml_emitter_t *emitter, yaml_document_t *document)
 
     assert(emitter->opened);    /* Emitter should be opened. */
 
-    emitter->anchors = yaml_malloc(sizeof(*(emitter->anchors))
+    emitter->anchors = (yaml_anchors_t*)yaml_malloc(sizeof(*(emitter->anchors))
             * (document->nodes.top - document->nodes.start));
     if (!emitter->anchors) goto error;
     memset(emitter->anchors, 0, sizeof(*(emitter->anchors))
@@ -245,9 +245,9 @@ yaml_emitter_anchor_node(yaml_emitter_t *emitter, int index)
 #define ANCHOR_TEMPLATE_LENGTH  16
 
 static yaml_char_t *
-yaml_emitter_generate_anchor(yaml_emitter_t *emitter, int anchor_id)
+yaml_emitter_generate_anchor(SHIM(yaml_emitter_t *emitter), int anchor_id)
 {
-    yaml_char_t *anchor = yaml_malloc(ANCHOR_TEMPLATE_LENGTH);
+    yaml_char_t *anchor = YAML_MALLOC(ANCHOR_TEMPLATE_LENGTH);
 
     if (!anchor) return NULL;
 
diff --git a/ext/psych/yaml/emitter.c b/ext/psych/yaml/emitter.c
index bf84fafc51..796294ccdf 100644
--- a/ext/psych/yaml/emitter.c
+++ b/ext/psych/yaml/emitter.c
@@ -16,7 +16,7 @@
 #define PUT(emitter,value)                                                      \
     (FLUSH(emitter)                                                             \
      && (*(emitter->buffer.pointer++) = (yaml_char_t)(value),                   \
-         emitter->column ++,                                                    \
+         emitter->column++,                                             	\
          1))
 
 /*
@@ -24,8 +24,8 @@
  */
 
 #define PUT_BREAK(emitter)                                                      \
-    (FLUSH(emitter)                                                             \
-     && ((emitter->line_break == YAML_CR_BREAK ?                                \
+    (FLUSH(emitter) ?                                                            \
+      ((emitter->line_break == YAML_CR_BREAK ?                                \
              (*(emitter->buffer.pointer++) = (yaml_char_t) '\r') :              \
           emitter->line_break == YAML_LN_BREAK ?                                \
              (*(emitter->buffer.pointer++) = (yaml_char_t) '\n') :              \
@@ -34,7 +34,7 @@
               *(emitter->buffer.pointer++) = (yaml_char_t) '\n') : 0),          \
          emitter->column = 0,                                                   \
          emitter->line ++,                                                      \
-         1))
+         1) : 0)
 
 /*
  * Copy a character from a string into buffer.
@@ -53,7 +53,7 @@
 #define WRITE_BREAK(emitter,string)                                             \
     (FLUSH(emitter)                                                             \
      && (CHECK(string,'\n') ?                                                   \
-         ((void)PUT_BREAK(emitter),                                             \
+         (PUT_BREAK(emitter),                                                   \
           string.pointer ++,                                                    \
           1) :                                                                  \
          (COPY(emitter->buffer,string),                                         \
@@ -495,6 +495,7 @@ static int
 yaml_emitter_emit_stream_start(yaml_emitter_t *emitter,
         yaml_event_t *event)
 {
+    emitter->open_ended = 0;
     if (event->type == YAML_STREAM_START_EVENT)
     {
         if (!emitter->encoding) {
@@ -597,13 +598,20 @@ yaml_emitter_emit_document_start(yaml_emitter_t *emitter,
             if (!yaml_emitter_write_indent(emitter))
                 return 0;
         }
+        emitter->open_ended = 0;
 
         if (event->data.document_start.version_directive) {
             implicit = 0;
             if (!yaml_emitter_write_indicator(emitter, "%YAML", 1, 0, 0))
                 return 0;
-            if (!yaml_emitter_write_indicator(emitter, "1.1", 1, 0, 0))
-                return 0;
+            if (event->data.document_start.version_directive->minor == 1) {
+                if (!yaml_emitter_write_indicator(emitter, "1.1", 1, 0, 0))
+                    return 0;
+            }
+            else {
+                if (!yaml_emitter_write_indicator(emitter, "1.2", 1, 0, 0))
+                    return 0;
+            }
             if (!yaml_emitter_write_indent(emitter))
                 return 0;
         }
@@ -644,19 +652,25 @@ yaml_emitter_emit_document_start(yaml_emitter_t *emitter,
 
         emitter->state = YAML_EMIT_DOCUMENT_CONTENT_STATE;
 
+        emitter->open_ended = 0;
         return 1;
     }
 
     else if (event->type == YAML_STREAM_END_EVENT)
     {
-        if (emitter->open_ended)
+
+        /**
+         * This can happen if a block scalar with trailing empty lines
+         * is at the end of the stream
+         */
+        if (emitter->open_ended == 2)
         {
             if (!yaml_emitter_write_indicator(emitter, "...", 1, 0, 0))
                 return 0;
+            emitter->open_ended = 0;
             if (!yaml_emitter_write_indent(emitter))
                 return 0;
         }
-
         if (!yaml_emitter_flush(emitter))
             return 0;
 
@@ -698,9 +712,12 @@ yaml_emitter_emit_document_end(yaml_emitter_t *emitter,
         if (!event->data.document_end.implicit) {
             if (!yaml_emitter_write_indicator(emitter, "...", 1, 0, 0))
                 return 0;
+            emitter->open_ended = 0;
             if (!yaml_emitter_write_indent(emitter))
                 return 0;
         }
+        else if (!emitter->open_ended)
+            emitter->open_ended = 1;
         if (!yaml_emitter_flush(emitter))
             return 0;
 
@@ -1002,10 +1019,12 @@ yaml_emitter_emit_node(yaml_emitter_t *emitter, yaml_event_t *event,
  */
 
 static int
-yaml_emitter_emit_alias(yaml_emitter_t *emitter, yaml_event_t *event)
+yaml_emitter_emit_alias(yaml_emitter_t *emitter, SHIM(yaml_event_t *event))
 {
     if (!yaml_emitter_process_anchor(emitter))
         return 0;
+    if (emitter->simple_key_context)
+        if (!PUT(emitter, ' ')) return 0;
     emitter->state = POP(emitter, emitter->states);
 
     return 1;
@@ -1087,7 +1106,7 @@ yaml_emitter_emit_mapping_start(yaml_emitter_t *emitter, yaml_event_t *event)
  */
 
 static int
-yaml_emitter_check_empty_document(yaml_emitter_t *emitter)
+yaml_emitter_check_empty_document(SHIM(yaml_emitter_t *emitter))
 {
     return 0;
 }
@@ -1234,7 +1253,7 @@ yaml_emitter_select_scalar_style(yaml_emitter_t *emitter, yaml_event_t *event)
 }
 
 /*
- * Write an achor.
+ * Write an anchor.
  */
 
 static int
@@ -1333,7 +1352,10 @@ static int
 yaml_emitter_analyze_version_directive(yaml_emitter_t *emitter,
         yaml_version_directive_t version_directive)
 {
-    if (version_directive.major != 1 || version_directive.minor != 1) {
+    if (version_directive.major != 1 || (
+        version_directive.minor != 1
+        && version_directive.minor != 2
+        )) {
         return yaml_emitter_set_emitter_error(emitter,
                 "incompatible %YAML directive");
     }
@@ -1493,7 +1515,7 @@ yaml_emitter_analyze_scalar(yaml_emitter_t *emitter,
     int break_space = 0;
     int space_break = 0;
 
-    int preceeded_by_whitespace = 0;
+    int preceded_by_whitespace = 0;
     int followed_by_whitespace = 0;
     int previous_space = 0;
     int previous_break = 0;
@@ -1524,7 +1546,7 @@ yaml_emitter_analyze_scalar(yaml_emitter_t *emitter,
         flow_indicators = 1;
     }
 
-    preceeded_by_whitespace = 1;
+    preceded_by_whitespace = 1;
     followed_by_whitespace = IS_BLANKZ_AT(string, WIDTH(string));
 
     while (string.pointer != string.end)
@@ -1570,7 +1592,7 @@ yaml_emitter_analyze_scalar(yaml_emitter_t *emitter,
                 }
             }
 
-            if (CHECK(string, '#') && preceeded_by_whitespace) {
+            if (CHECK(string, '#') && preceded_by_whitespace) {
                 flow_indicators = 1;
                 block_indicators = 1;
             }
@@ -1619,7 +1641,7 @@ yaml_emitter_analyze_scalar(yaml_emitter_t *emitter,
             previous_break = 0;
         }
 
-        preceeded_by_whitespace = IS_BLANKZ(string);
+        preceded_by_whitespace = IS_BLANKZ(string);
         MOVE(string);
         if (string.pointer != string.end) {
             followed_by_whitespace = IS_BLANKZ_AT(string, WIDTH(string));
@@ -1803,7 +1825,6 @@ yaml_emitter_write_indicator(yaml_emitter_t *emitter,
 
     emitter->whitespace = is_whitespace;
     emitter->indention = (emitter->indention && is_indention);
-    emitter->open_ended = 0;
 
     return 1;
 }
@@ -1904,7 +1925,17 @@ yaml_emitter_write_plain_scalar(yaml_emitter_t *emitter,
 
     STRING_ASSIGN(string, value, length);
 
-    if (!emitter->whitespace) {
+    /**
+     * Avoid trailing spaces for empty values in block mode.
+     * In flow mode, we still want the space to prevent ambiguous things
+     * like {a:}.
+     * Currently, the emitter forbids any plain empty scalar in flow mode
+     * (e.g. it outputs {a: ''} instead), so emitter->flow_level will
+     * never be true here.
+     * But if the emitter is ever changed to allow emitting empty values,
+     * the check for flow_level is already here.
+     */
+    if (!emitter->whitespace && (length || emitter->flow_level)) {
         if (!PUT(emitter, ' ')) return 0;
     }
 
@@ -1946,10 +1977,6 @@ yaml_emitter_write_plain_scalar(yaml_emitter_t *emitter,
 
     emitter->whitespace = 0;
     emitter->indention = 0;
-    if (emitter->root_context)
-    {
-        emitter->open_ended = 1;
-    }
 
     return 1;
 }
@@ -2008,6 +2035,9 @@ yaml_emitter_write_single_quoted_scalar(yaml_emitter_t *emitter,
         }
     }
 
+    if (breaks)
+        if (!yaml_emitter_write_indent(emitter)) return 0;
+
     if (!yaml_emitter_write_indicator(emitter, "'", 0, 0, 0))
         return 0;
 
@@ -2207,7 +2237,7 @@ yaml_emitter_write_block_scalar_hints(yaml_emitter_t *emitter,
         else if (string.start == string.pointer)
         {
             chomp_hint = "+";
-            emitter->open_ended = 1;
+            emitter->open_ended = 2;
         }
         else
         {
@@ -2217,7 +2247,7 @@ yaml_emitter_write_block_scalar_hints(yaml_emitter_t *emitter,
             if (IS_BREAK(string))
             {
                 chomp_hint = "+";
-                emitter->open_ended = 1;
+                emitter->open_ended = 2;
             }
         }
     }
@@ -2326,4 +2356,3 @@ yaml_emitter_write_folded_scalar(yaml_emitter_t *emitter,
 
     return 1;
 }
-
diff --git a/ext/psych/yaml/loader.c b/ext/psych/yaml/loader.c
index cb3ea93089..bcf3aee8cb 100644
--- a/ext/psych/yaml/loader.c
+++ b/ext/psych/yaml/loader.c
@@ -38,26 +38,46 @@ static void
 yaml_parser_delete_aliases(yaml_parser_t *parser);
 
 /*
+ * Document loading context.
+ */
+struct loader_ctx {
+    int *start;
+    int *end;
+    int *top;
+};
+
+/*
  * Composer functions.
  */
+static int
+yaml_parser_load_nodes(yaml_parser_t *parser, struct loader_ctx *ctx);
+
+static int
+yaml_parser_load_document(yaml_parser_t *parser, yaml_event_t *event);
 
 static int
-yaml_parser_load_document(yaml_parser_t *parser, yaml_event_t *first_event);
+yaml_parser_load_alias(yaml_parser_t *parser, yaml_event_t *event,
+        struct loader_ctx *ctx);
 
 static int
-yaml_parser_load_node(yaml_parser_t *parser, yaml_event_t *first_event);
+yaml_parser_load_scalar(yaml_parser_t *parser, yaml_event_t *event,
+        struct loader_ctx *ctx);
 
 static int
-yaml_parser_load_alias(yaml_parser_t *parser, yaml_event_t *first_event);
+yaml_parser_load_sequence(yaml_parser_t *parser, yaml_event_t *event,
+        struct loader_ctx *ctx);
 
 static int
-yaml_parser_load_scalar(yaml_parser_t *parser, yaml_event_t *first_event);
+yaml_parser_load_mapping(yaml_parser_t *parser, yaml_event_t *event,
+        struct loader_ctx *ctx);
 
 static int
-yaml_parser_load_sequence(yaml_parser_t *parser, yaml_event_t *first_event);
+yaml_parser_load_sequence_end(yaml_parser_t *parser, yaml_event_t *event,
+        struct loader_ctx *ctx);
 
 static int
-yaml_parser_load_mapping(yaml_parser_t *parser, yaml_event_t *first_event);
+yaml_parser_load_mapping_end(yaml_parser_t *parser, yaml_event_t *event,
+        struct loader_ctx *ctx);
 
 /*
  * Load the next document of the stream.
@@ -72,7 +92,7 @@ yaml_parser_load(yaml_parser_t *parser, yaml_document_t *document)
     assert(document);   /* Non-NULL document object is expected. */
 
     memset(document, 0, sizeof(yaml_document_t));
-    if (!STACK_INIT(parser, document->nodes, INITIAL_STACK_SIZE))
+    if (!STACK_INIT(parser, document->nodes, yaml_node_t*))
         goto error;
 
     if (!parser->stream_start_produced) {
@@ -90,7 +110,7 @@ yaml_parser_load(yaml_parser_t *parser, yaml_document_t *document)
         return 1;
     }
 
-    if (!STACK_INIT(parser, parser->aliases, INITIAL_STACK_SIZE))
+    if (!STACK_INIT(parser, parser->aliases, yaml_alias_data_t*))
         goto error;
 
     parser->document = document;
@@ -162,59 +182,78 @@ yaml_parser_delete_aliases(yaml_parser_t *parser)
  */
 
 static int
-yaml_parser_load_document(yaml_parser_t *parser, yaml_event_t *first_event)
+yaml_parser_load_document(yaml_parser_t *parser, yaml_event_t *event)
 {
-    yaml_event_t event;
+    struct loader_ctx ctx = { NULL, NULL, NULL };
 
-    assert(first_event->type == YAML_DOCUMENT_START_EVENT);
+    assert(event->type == YAML_DOCUMENT_START_EVENT);
                         /* DOCUMENT-START is expected. */
 
     parser->document->version_directive
-        = first_event->data.document_start.version_directive;
+        = event->data.document_start.version_directive;
     parser->document->tag_directives.start
-        = first_event->data.document_start.tag_directives.start;
+        = event->data.document_start.tag_directives.start;
     parser->document->tag_directives.end
-        = first_event->data.document_start.tag_directives.end;
+        = event->data.document_start.tag_directives.end;
     parser->document->start_implicit
-        = first_event->data.document_start.implicit;
-    parser->document->start_mark = first_event->start_mark;
-
-    if (!yaml_parser_parse(parser, &event)) return 0;
-
-    if (!yaml_parser_load_node(parser, &event)) return 0;
-
-    if (!yaml_parser_parse(parser, &event)) return 0;
-    assert(event.type == YAML_DOCUMENT_END_EVENT);
-                        /* DOCUMENT-END is expected. */
+        = event->data.document_start.implicit;
+    parser->document->start_mark = event->start_mark;
 
-    parser->document->end_implicit = event.data.document_end.implicit;
-    parser->document->end_mark = event.end_mark;
+    if (!STACK_INIT(parser, ctx, int*)) return 0;
+    if (!yaml_parser_load_nodes(parser, &ctx)) {
+        STACK_DEL(parser, ctx);
+        return 0;
+    }
+    STACK_DEL(parser, ctx);
 
     return 1;
 }
 
 /*
- * Compose a node.
+ * Compose a node tree.
  */
 
 static int
-yaml_parser_load_node(yaml_parser_t *parser, yaml_event_t *first_event)
+yaml_parser_load_nodes(yaml_parser_t *parser, struct loader_ctx *ctx)
 {
-    switch (first_event->type) {
-        case YAML_ALIAS_EVENT:
-            return yaml_parser_load_alias(parser, first_event);
-        case YAML_SCALAR_EVENT:
-            return yaml_parser_load_scalar(parser, first_event);
-        case YAML_SEQUENCE_START_EVENT:
-            return yaml_parser_load_sequence(parser, first_event);
-        case YAML_MAPPING_START_EVENT:
-            return yaml_parser_load_mapping(parser, first_event);
-        default:
-            assert(0);  /* Could not happen. */
-            return 0;
-    }
+    yaml_event_t event;
 
-    return 0;
+    do {
+        if (!yaml_parser_parse(parser, &event)) return 0;
+
+        switch (event.type) {
+            case YAML_ALIAS_EVENT:
+                if (!yaml_parser_load_alias(parser, &event, ctx)) return 0;
+                break;
+            case YAML_SCALAR_EVENT:
+                if (!yaml_parser_load_scalar(parser, &event, ctx)) return 0;
+                break;
+            case YAML_SEQUENCE_START_EVENT:
+                if (!yaml_parser_load_sequence(parser, &event, ctx)) return 0;
+                break;
+            case YAML_SEQUENCE_END_EVENT:
+                if (!yaml_parser_load_sequence_end(parser, &event, ctx))
+                    return 0;
+                break;
+            case YAML_MAPPING_START_EVENT:
+                if (!yaml_parser_load_mapping(parser, &event, ctx)) return 0;
+                break;
+            case YAML_MAPPING_END_EVENT:
+                if (!yaml_parser_load_mapping_end(parser, &event, ctx))
+                    return 0;
+                break;
+            default:
+                assert(0);  /* Could not happen. */
+                return 0;
+            case YAML_DOCUMENT_END_EVENT:
+                break;
+        }
+    } while (event.type != YAML_DOCUMENT_END_EVENT);
+
+    parser->document->end_implicit = event.data.document_end.implicit;
+    parser->document->end_mark = event.end_mark;
+
+    return 1;
 }
 
 /*
@@ -239,8 +278,8 @@ yaml_parser_register_anchor(yaml_parser_t *parser,
         if (strcmp((char *)alias_data->anchor, (char *)anchor) == 0) {
             yaml_free(anchor);
             return yaml_parser_set_composer_error_context(parser,
-                    "found duplicate anchor; first occurence",
-                    alias_data->mark, "second occurence", data.mark);
+                    "found duplicate anchor; first occurrence",
+                    alias_data->mark, "second occurrence", data.mark);
         }
     }
 
@@ -253,26 +292,79 @@ yaml_parser_register_anchor(yaml_parser_t *parser,
 }
 
 /*
+ * Compose node into its parent in the stree.
+ */
+
+static int
+yaml_parser_load_node_add(yaml_parser_t *parser, struct loader_ctx *ctx,
+        int index)
+{
+    struct yaml_node_s *parent;
+    int parent_index;
+
+    if (STACK_EMPTY(parser, *ctx)) {
+        /* This is the root node, there's no tree to add it to. */
+        return 1;
+    }
+
+    parent_index = *((*ctx).top - 1);
+    parent = &parser->document->nodes.start[parent_index-1];
+
+    switch (parent->type) {
+        case YAML_SEQUENCE_NODE:
+            if (!STACK_LIMIT(parser, parent->data.sequence.items, INT_MAX-1))
+                return 0;
+            if (!PUSH(parser, parent->data.sequence.items, index))
+                return 0;
+            break;
+        case YAML_MAPPING_NODE: {
+            yaml_node_pair_t pair;
+            if (!STACK_EMPTY(parser, parent->data.mapping.pairs)) {
+                yaml_node_pair_t *p = parent->data.mapping.pairs.top - 1;
+                if (p->key != 0 && p->value == 0) {
+                    p->value = index;
+                    break;
+                }
+            }
+
+            pair.key = index;
+            pair.value = 0;
+            if (!STACK_LIMIT(parser, parent->data.mapping.pairs, INT_MAX-1))
+                return 0;
+            if (!PUSH(parser, parent->data.mapping.pairs, pair))
+                return 0;
+
+            break;
+        }
+        default:
+            assert(0); /* Could not happen. */
+            return 0;
+    }
+    return 1;
+}
+
+/*
  * Compose a node corresponding to an alias.
  */
 
 static int
-yaml_parser_load_alias(yaml_parser_t *parser, yaml_event_t *first_event)
+yaml_parser_load_alias(yaml_parser_t *parser, yaml_event_t *event,
+        struct loader_ctx *ctx)
 {
-    yaml_char_t *anchor = first_event->data.alias.anchor;
+    yaml_char_t *anchor = event->data.alias.anchor;
     yaml_alias_data_t *alias_data;
 
     for (alias_data = parser->aliases.start;
             alias_data != parser->aliases.top; alias_data ++) {
         if (strcmp((char *)alias_data->anchor, (char *)anchor) == 0) {
             yaml_free(anchor);
-            return alias_data->index;
+            return yaml_parser_load_node_add(parser, ctx, alias_data->index);
         }
     }
 
     yaml_free(anchor);
     return yaml_parser_set_composer_error(parser, "found undefined alias",
-            first_event->start_mark);
+            event->start_mark);
 }
 
 /*
@@ -280,12 +372,12 @@ yaml_parser_load_alias(yaml_parser_t *parser, yaml_event_t *first_event)
  */
 
 static int
-yaml_parser_load_scalar(yaml_parser_t *parser, yaml_event_t *first_event)
+yaml_parser_load_scalar(yaml_parser_t *parser, yaml_event_t *event,
+        struct loader_ctx *ctx)
 {
     yaml_node_t node;
-    ptrdiff_t node_index;
     int index;
-    yaml_char_t *tag = first_event->data.scalar.tag;
+    yaml_char_t *tag = event->data.scalar.tag;
 
     if (!STACK_LIMIT(parser, parser->document->nodes, INT_MAX-1)) goto error;
 
@@ -295,27 +387,23 @@ yaml_parser_load_scalar(yaml_parser_t *parser, yaml_event_t *first_event)
         if (!tag) goto error;
     }
 
-    SCALAR_NODE_INIT(node, tag, first_event->data.scalar.value,
-            first_event->data.scalar.length, first_event->data.scalar.style,
-            first_event->start_mark, first_event->end_mark);
+    SCALAR_NODE_INIT(node, tag, event->data.scalar.value,
+            event->data.scalar.length, event->data.scalar.style,
+            event->start_mark, event->end_mark);
 
     if (!PUSH(parser, parser->document->nodes, node)) goto error;
 
-    node_index = parser->document->nodes.top - parser->document->nodes.start;
-#if PTRDIFF_MAX > INT_MAX
-    if (node_index > INT_MAX) goto error;
-#endif
-    index = (int)node_index;
+    index = (int)(parser->document->nodes.top - parser->document->nodes.start);
 
     if (!yaml_parser_register_anchor(parser, index,
-                first_event->data.scalar.anchor)) return 0;
+                event->data.scalar.anchor)) return 0;
 
-    return index;
+    return yaml_parser_load_node_add(parser, ctx, index);
 
 error:
     yaml_free(tag);
-    yaml_free(first_event->data.scalar.anchor);
-    yaml_free(first_event->data.scalar.value);
+    yaml_free(event->data.scalar.anchor);
+    yaml_free(event->data.scalar.value);
     return 0;
 }
 
@@ -324,18 +412,17 @@ error:
  */
 
 static int
-yaml_parser_load_sequence(yaml_parser_t *parser, yaml_event_t *first_event)
+yaml_parser_load_sequence(yaml_parser_t *parser, yaml_event_t *event,
+        struct loader_ctx *ctx)
 {
-    yaml_event_t event;
     yaml_node_t node;
     struct {
         yaml_node_item_t *start;
         yaml_node_item_t *end;
         yaml_node_item_t *top;
     } items = { NULL, NULL, NULL };
-    int index, item_index;
-    ptrdiff_t node_index;
-    yaml_char_t *tag = first_event->data.sequence_start.tag;
+    int index;
+    yaml_char_t *tag = event->data.sequence_start.tag;
 
     if (!STACK_LIMIT(parser, parser->document->nodes, INT_MAX-1)) goto error;
 
@@ -345,55 +432,57 @@ yaml_parser_load_sequence(yaml_parser_t *parser, yaml_event_t *first_event)
         if (!tag) goto error;
     }
 
-    if (!STACK_INIT(parser, items, INITIAL_STACK_SIZE)) goto error;
+    if (!STACK_INIT(parser, items, yaml_node_item_t*)) goto error;
 
     SEQUENCE_NODE_INIT(node, tag, items.start, items.end,
-            first_event->data.sequence_start.style,
-            first_event->start_mark, first_event->end_mark);
+            event->data.sequence_start.style,
+            event->start_mark, event->end_mark);
 
     if (!PUSH(parser, parser->document->nodes, node)) goto error;
 
-    node_index = parser->document->nodes.top - parser->document->nodes.start;
-#if PTRDIFF_MAX > INT_MAX
-    if (node_index > INT_MAX) goto error;
-#endif
-    index = (int)node_index;
+    index = (int)(parser->document->nodes.top - parser->document->nodes.start);
 
     if (!yaml_parser_register_anchor(parser, index,
-                first_event->data.sequence_start.anchor)) return 0;
-
-    if (!yaml_parser_parse(parser, &event)) return 0;
-
-    while (event.type != YAML_SEQUENCE_END_EVENT) {
-        if (!STACK_LIMIT(parser,
-                    parser->document->nodes.start[index-1].data.sequence.items,
-                    INT_MAX-1)) return 0;
-        item_index = yaml_parser_load_node(parser, &event);
-        if (!item_index) return 0;
-        if (!PUSH(parser,
-                    parser->document->nodes.start[index-1].data.sequence.items,
-                    item_index)) return 0;
-        if (!yaml_parser_parse(parser, &event)) return 0;
-    }
+                event->data.sequence_start.anchor)) return 0;
 
-    parser->document->nodes.start[index-1].end_mark = event.end_mark;
+    if (!yaml_parser_load_node_add(parser, ctx, index)) return 0;
 
-    return index;
+    if (!STACK_LIMIT(parser, *ctx, INT_MAX-1)) return 0;
+    if (!PUSH(parser, *ctx, index)) return 0;
+
+    return 1;
 
 error:
     yaml_free(tag);
-    yaml_free(first_event->data.sequence_start.anchor);
+    yaml_free(event->data.sequence_start.anchor);
     return 0;
 }
 
+static int
+yaml_parser_load_sequence_end(yaml_parser_t *parser, yaml_event_t *event,
+        struct loader_ctx *ctx)
+{
+    int index;
+
+    assert(((*ctx).top - (*ctx).start) > 0);
+
+    index = *((*ctx).top - 1);
+    assert(parser->document->nodes.start[index-1].type == YAML_SEQUENCE_NODE);
+    parser->document->nodes.start[index-1].end_mark = event->end_mark;
+
+    (void)POP(parser, *ctx);
+
+    return 1;
+}
+
 /*
  * Compose a mapping node.
  */
 
 static int
-yaml_parser_load_mapping(yaml_parser_t *parser, yaml_event_t *first_event)
+yaml_parser_load_mapping(yaml_parser_t *parser, yaml_event_t *event,
+        struct loader_ctx *ctx)
 {
-    yaml_event_t event;
     yaml_node_t node;
     struct {
         yaml_node_pair_t *start;
@@ -401,9 +490,7 @@ yaml_parser_load_mapping(yaml_parser_t *parser, yaml_event_t *first_event)
         yaml_node_pair_t *top;
     } pairs = { NULL, NULL, NULL };
     int index;
-    ptrdiff_t node_index;
-    yaml_node_pair_t pair;
-    yaml_char_t *tag = first_event->data.mapping_start.tag;
+    yaml_char_t *tag = event->data.mapping_start.tag;
 
     if (!STACK_LIMIT(parser, parser->document->nodes, INT_MAX-1)) goto error;
 
@@ -413,47 +500,45 @@ yaml_parser_load_mapping(yaml_parser_t *parser, yaml_event_t *first_event)
         if (!tag) goto error;
     }
 
-    if (!STACK_INIT(parser, pairs, INITIAL_STACK_SIZE)) goto error;
+    if (!STACK_INIT(parser, pairs, yaml_node_pair_t*)) goto error;
 
     MAPPING_NODE_INIT(node, tag, pairs.start, pairs.end,
-            first_event->data.mapping_start.style,
-            first_event->start_mark, first_event->end_mark);
+            event->data.mapping_start.style,
+            event->start_mark, event->end_mark);
 
     if (!PUSH(parser, parser->document->nodes, node)) goto error;
 
-    node_index = parser->document->nodes.top - parser->document->nodes.start;
-#if PTRDIFF_MAX > INT_MAX
-    if (node_index > INT_MAX) goto error;
-#endif
-    index = (int)node_index;
+    index = (int)(parser->document->nodes.top - parser->document->nodes.start);
 
     if (!yaml_parser_register_anchor(parser, index,
-                first_event->data.mapping_start.anchor)) return 0;
+                event->data.mapping_start.anchor)) return 0;
 
-    if (!yaml_parser_parse(parser, &event)) return 0;
+    if (!yaml_parser_load_node_add(parser, ctx, index)) return 0;
 
-    while (event.type != YAML_MAPPING_END_EVENT) {
-        if (!STACK_LIMIT(parser,
-                    parser->document->nodes.start[index-1].data.mapping.pairs,
-                    INT_MAX-1)) return 0;
-        pair.key = yaml_parser_load_node(parser, &event);
-        if (!pair.key) return 0;
-        if (!yaml_parser_parse(parser, &event)) return 0;
-        pair.value = yaml_parser_load_node(parser, &event);
-        if (!pair.value) return 0;
-        if (!PUSH(parser,
-                    parser->document->nodes.start[index-1].data.mapping.pairs,
-                    pair)) return 0;
-        if (!yaml_parser_parse(parser, &event)) return 0;
-    }
+    if (!STACK_LIMIT(parser, *ctx, INT_MAX-1)) return 0;
+    if (!PUSH(parser, *ctx, index)) return 0;
 
-    parser->document->nodes.start[index-1].end_mark = event.end_mark;
-
-    return index;
+    return 1;
 
 error:
     yaml_free(tag);
-    yaml_free(first_event->data.mapping_start.anchor);
+    yaml_free(event->data.mapping_start.anchor);
     return 0;
 }
 
+static int
+yaml_parser_load_mapping_end(yaml_parser_t *parser, yaml_event_t *event,
+        struct loader_ctx *ctx)
+{
+    int index;
+
+    assert(((*ctx).top - (*ctx).start) > 0);
+
+    index = *((*ctx).top - 1);
+    assert(parser->document->nodes.start[index-1].type == YAML_MAPPING_NODE);
+    parser->document->nodes.start[index-1].end_mark = event->end_mark;
+
+    (void)POP(parser, *ctx);
+
+    return 1;
+}
diff --git a/ext/psych/yaml/parser.c b/ext/psych/yaml/parser.c
index 32671b252c..ec2f8d3e05 100644
--- a/ext/psych/yaml/parser.c
+++ b/ext/psych/yaml/parser.c
@@ -605,7 +605,7 @@ yaml_parser_parse_node(yaml_parser_t *parser, yaml_event_t *event,
                     if (strcmp((char *)tag_directive->handle, (char *)tag_handle) == 0) {
                         size_t prefix_len = strlen((char *)tag_directive->prefix);
                         size_t suffix_len = strlen((char *)tag_suffix);
-                        tag = yaml_malloc(prefix_len+suffix_len+1);
+                        tag = YAML_MALLOC(prefix_len+suffix_len+1);
                         if (!tag) {
                             parser->error = YAML_MEMORY_ERROR;
                             goto error;
@@ -685,7 +685,7 @@ yaml_parser_parse_node(yaml_parser_t *parser, yaml_event_t *event,
                 return 1;
             }
             else if (anchor || tag) {
-                yaml_char_t *value = yaml_malloc(1);
+                yaml_char_t *value = YAML_MALLOC(1);
                 if (!value) {
                     parser->error = YAML_MEMORY_ERROR;
                     goto error;
@@ -1208,7 +1208,7 @@ yaml_parser_process_empty_scalar(yaml_parser_t *parser, yaml_event_t *event,
 {
     yaml_char_t *value;
 
-    value = yaml_malloc(1);
+    value = YAML_MALLOC(1);
     if (!value) {
         parser->error = YAML_MEMORY_ERROR;
         return 0;
@@ -1245,7 +1245,7 @@ yaml_parser_process_directives(yaml_parser_t *parser,
     } tag_directives = { NULL, NULL, NULL };
     yaml_token_t *token;
 
-    if (!STACK_INIT(parser, tag_directives, INITIAL_STACK_SIZE))
+    if (!STACK_INIT(parser, tag_directives, yaml_tag_directive_t*))
         goto error;
 
     token = PEEK_TOKEN(parser);
@@ -1261,12 +1261,15 @@ yaml_parser_process_directives(yaml_parser_t *parser,
                 goto error;
             }
             if (token->data.version_directive.major != 1
-                    || token->data.version_directive.minor != 1) {
+                    || (
+                        token->data.version_directive.minor != 1
+                        && token->data.version_directive.minor != 2
+                    )) {
                 yaml_parser_set_parser_error(parser,
                         "found incompatible YAML document", token->start_mark);
                 goto error;
             }
-            version_directive = yaml_malloc(sizeof(yaml_version_directive_t));
+            version_directive = YAML_MALLOC_STATIC(yaml_version_directive_t);
             if (!version_directive) {
                 parser->error = YAML_MEMORY_ERROR;
                 goto error;
@@ -1316,6 +1319,8 @@ yaml_parser_process_directives(yaml_parser_t *parser,
         STACK_DEL(parser, tag_directives);
     }
 
+    if (!version_directive_ref)
+        yaml_free(version_directive);
     return 1;
 
 error:
diff --git a/ext/psych/yaml/reader.c b/ext/psych/yaml/reader.c
index f1a06deb9d..f3ac54c251 100644
--- a/ext/psych/yaml/reader.c
+++ b/ext/psych/yaml/reader.c
@@ -460,10 +460,10 @@ yaml_parser_update_buffer(yaml_parser_t *parser, size_t length)
 
     }
 
-    if (parser->offset >= PTRDIFF_MAX)
+    if (parser->offset >= MAX_FILE_SIZE) {
         return yaml_parser_set_reader_error(parser, "input is too long",
-                PTRDIFF_MAX, -1);
+            parser->offset, -1);
+    }
 
     return 1;
 }
-
diff --git a/ext/psych/yaml/scanner.c b/ext/psych/yaml/scanner.c
index c8627e278e..bb5d201274 100644
--- a/ext/psych/yaml/scanner.c
+++ b/ext/psych/yaml/scanner.c
@@ -38,8 +38,8 @@
  *      BLOCK-END                       # Indentation decrease.
  *      FLOW-SEQUENCE-START             # '['
  *      FLOW-SEQUENCE-END               # ']'
- *      BLOCK-SEQUENCE-START            # '{'
- *      BLOCK-SEQUENCE-END              # '}'
+ *      FLOW-MAPPING-START              # '{'
+ *      FLOW-MAPPING-END                # '}'
  *      BLOCK-ENTRY                     # '-'
  *      FLOW-ENTRY                      # ','
  *      KEY                             # '?' or nothing (simple keys).
@@ -273,7 +273,7 @@
  * The tokens BLOCK-SEQUENCE-START and BLOCK-MAPPING-START denote indentation
  * increase that precedes a block collection (cf. the INDENT token in Python).
  * The token BLOCK-END denote indentation decrease that ends a block collection
- * (cf. the DEDENT token in Python).  However YAML has some syntax pecularities
+ * (cf. the DEDENT token in Python).  However YAML has some syntax peculiarities
  * that makes detections of these tokens more complex.
  *
  * The tokens BLOCK-ENTRY, KEY, and VALUE are used to represent the indicators
@@ -348,6 +348,7 @@
  *          SCALAR("another value",plain)
  *          KEY
  *          SCALAR("a mapping",plain)
+ *          VALUE
  *          BLOCK-MAPPING-START
  *          KEY
  *          SCALAR("key 1",plain)
@@ -711,7 +712,7 @@ yaml_parser_scan_tag_handle(yaml_parser_t *parser, int directive,
         yaml_mark_t start_mark, yaml_char_t **handle);
 
 static int
-yaml_parser_scan_tag_uri(yaml_parser_t *parser, int directive,
+yaml_parser_scan_tag_uri(yaml_parser_t *parser, int uri_char, int directive,
         yaml_char_t *head, yaml_mark_t start_mark, yaml_char_t **uri);
 
 static int
@@ -1222,12 +1223,10 @@ yaml_parser_roll_indent(yaml_parser_t *parser, ptrdiff_t column,
         if (!PUSH(parser, parser->indents, parser->indent))
             return 0;
 
-#if PTRDIFF_MAX > INT_MAX
         if (column > INT_MAX) {
             parser->error = YAML_MEMORY_ERROR;
             return 0;
         }
-#endif
 
         parser->indent = (int)column;
 
@@ -1251,7 +1250,7 @@ yaml_parser_roll_indent(yaml_parser_t *parser, ptrdiff_t column,
 
 /*
  * Pop indentation levels from the indents stack until the current level
- * becomes less or equal to the column.  For each intendation level, append
+ * becomes less or equal to the column.  For each indentation level, append
  * the BLOCK-END token.
  */
 
@@ -1266,7 +1265,7 @@ yaml_parser_unroll_indent(yaml_parser_t *parser, ptrdiff_t column)
     if (parser->flow_level)
         return 1;
 
-    /* Loop through the intendation levels in the stack. */
+    /* Loop through the indentation levels in the stack. */
 
     while (parser->indent > column)
     {
@@ -1638,7 +1637,7 @@ yaml_parser_fetch_key(yaml_parser_t *parser)
 
     if (!parser->flow_level)
     {
-        /* Check if we are allowed to start a new key (not nessesary simple). */
+        /* Check if we are allowed to start a new key (not necessary simple). */
 
         if (!parser->simple_key_allowed) {
             return yaml_parser_set_scanner_error(parser, NULL, parser->mark,
@@ -2294,7 +2293,7 @@ yaml_parser_scan_tag_directive_value(yaml_parser_t *parser,
 
     /* Scan a prefix. */
 
-    if (!yaml_parser_scan_tag_uri(parser, 1, NULL, start_mark, &prefix_value))
+    if (!yaml_parser_scan_tag_uri(parser, 1, 1, NULL, start_mark, &prefix_value))
         goto error;
 
     /* Expect a whitespace or line break. */
@@ -2401,7 +2400,7 @@ yaml_parser_scan_tag(yaml_parser_t *parser, yaml_token_t *token)
     {
         /* Set the handle to '' */
 
-        handle = yaml_malloc(1);
+        handle = YAML_MALLOC(1);
         if (!handle) goto error;
         handle[0] = '\0';
 
@@ -2412,7 +2411,7 @@ yaml_parser_scan_tag(yaml_parser_t *parser, yaml_token_t *token)
 
         /* Consume the tag value. */
 
-        if (!yaml_parser_scan_tag_uri(parser, 0, NULL, start_mark, &suffix))
+        if (!yaml_parser_scan_tag_uri(parser, 1, 0, NULL, start_mark, &suffix))
             goto error;
 
         /* Check for '>' and eat it. */
@@ -2440,20 +2439,20 @@ yaml_parser_scan_tag(yaml_parser_t *parser, yaml_token_t *token)
         {
             /* Scan the suffix now. */
 
-            if (!yaml_parser_scan_tag_uri(parser, 0, NULL, start_mark, &suffix))
+            if (!yaml_parser_scan_tag_uri(parser, 0, 0, NULL, start_mark, &suffix))
                 goto error;
         }
         else
         {
             /* It wasn't a handle after all.  Scan the rest of the tag. */
 
-            if (!yaml_parser_scan_tag_uri(parser, 0, handle, start_mark, &suffix))
+            if (!yaml_parser_scan_tag_uri(parser, 0, 0, handle, start_mark, &suffix))
                 goto error;
 
             /* Set the handle to '!'. */
 
             yaml_free(handle);
-            handle = yaml_malloc(2);
+            handle = YAML_MALLOC(2);
             if (!handle) goto error;
             handle[0] = '!';
             handle[1] = '\0';
@@ -2476,9 +2475,11 @@ yaml_parser_scan_tag(yaml_parser_t *parser, yaml_token_t *token)
     if (!CACHE(parser, 1)) goto error;
 
     if (!IS_BLANKZ(parser->buffer)) {
-        yaml_parser_set_scanner_error(parser, "while scanning a tag",
-                start_mark, "did not find expected whitespace or line break");
-        goto error;
+        if (!parser->flow_level || !CHECK(parser->buffer, ',') ) {
+            yaml_parser_set_scanner_error(parser, "while scanning a tag",
+                    start_mark, "did not find expected whitespace or line break");
+            goto error;
+        }
     }
 
     end_mark = parser->mark;
@@ -2567,7 +2568,7 @@ error:
  */
 
 static int
-yaml_parser_scan_tag_uri(yaml_parser_t *parser, int directive,
+yaml_parser_scan_tag_uri(yaml_parser_t *parser, int uri_char, int directive,
         yaml_char_t *head, yaml_mark_t start_mark, yaml_char_t **uri)
 {
     size_t length = head ? strlen((char *)head) : 0;
@@ -2603,8 +2604,11 @@ yaml_parser_scan_tag_uri(yaml_parser_t *parser, int directive,
      * The set of characters that may appear in URI is as follows:
      *
      *      '0'-'9', 'A'-'Z', 'a'-'z', '_', '-', ';', '/', '?', ':', '@', '&',
-     *      '=', '+', '$', ',', '.', '!', '~', '*', '\'', '(', ')', '[', ']',
-     *      '%'.
+     *      '=', '+', '$', '.', '!', '~', '*', '\'', '(', ')', '%'.
+     *
+     * If we are inside a verbatim tag <...> (parameter uri_char is true)
+     * then also the following flow indicators are allowed:
+     *      ',', '[', ']'
      */
 
     while (IS_ALPHA(parser->buffer) || CHECK(parser->buffer, ';')
@@ -2612,12 +2616,15 @@ yaml_parser_scan_tag_uri(yaml_parser_t *parser, int directive,
             || CHECK(parser->buffer, ':') || CHECK(parser->buffer, '@')
             || CHECK(parser->buffer, '&') || CHECK(parser->buffer, '=')
             || CHECK(parser->buffer, '+') || CHECK(parser->buffer, '$')
-            || CHECK(parser->buffer, ',') || CHECK(parser->buffer, '.')
+            || CHECK(parser->buffer, '.') || CHECK(parser->buffer, '%')
             || CHECK(parser->buffer, '!') || CHECK(parser->buffer, '~')
             || CHECK(parser->buffer, '*') || CHECK(parser->buffer, '\'')
             || CHECK(parser->buffer, '(') || CHECK(parser->buffer, ')')
-            || CHECK(parser->buffer, '[') || CHECK(parser->buffer, ']')
-            || CHECK(parser->buffer, '%'))
+            || (uri_char && (
+                CHECK(parser->buffer, ',')
+                || CHECK(parser->buffer, '[') || CHECK(parser->buffer, ']')
+                )
+            ))
     {
         /* Check if it is a URI-escape sequence. */
 
@@ -2775,15 +2782,15 @@ yaml_parser_scan_block_scalar(yaml_parser_t *parser, yaml_token_t *token,
 
         if (IS_DIGIT(parser->buffer))
         {
-            /* Check that the intendation is greater than 0. */
+            /* Check that the indentation is greater than 0. */
 
             if (CHECK(parser->buffer, '0')) {
                 yaml_parser_set_scanner_error(parser, "while scanning a block scalar",
-                        start_mark, "found an intendation indicator equal to 0");
+                        start_mark, "found an indentation indicator equal to 0");
                 goto error;
             }
 
-            /* Get the intendation level and eat the indicator. */
+            /* Get the indentation level and eat the indicator. */
 
             increment = AS_DIGIT(parser->buffer);
 
@@ -2797,7 +2804,7 @@ yaml_parser_scan_block_scalar(yaml_parser_t *parser, yaml_token_t *token,
     {
         if (CHECK(parser->buffer, '0')) {
             yaml_parser_set_scanner_error(parser, "while scanning a block scalar",
-                    start_mark, "found an intendation indicator equal to 0");
+                    start_mark, "found an indentation indicator equal to 0");
             goto error;
         }
 
@@ -2847,7 +2854,7 @@ yaml_parser_scan_block_scalar(yaml_parser_t *parser, yaml_token_t *token,
 
     end_mark = parser->mark;
 
-    /* Set the intendation level if it was specified. */
+    /* Set the indentation level if it was specified. */
 
     if (increment) {
         indent = parser->indent >= 0 ? parser->indent+increment : increment;
@@ -2862,7 +2869,7 @@ yaml_parser_scan_block_scalar(yaml_parser_t *parser, yaml_token_t *token,
 
     if (!CACHE(parser, 1)) goto error;
 
-    while ((int)parser->mark.column == indent && !IS_Z(parser->buffer))
+    while ((int)parser->mark.column == indent && !(IS_Z(parser->buffer)))
     {
         /*
          * We are at the beginning of a non-empty line.
@@ -2913,7 +2920,7 @@ yaml_parser_scan_block_scalar(yaml_parser_t *parser, yaml_token_t *token,
 
         if (!READ_LINE(parser, leading_break)) goto error;
 
-        /* Eat the following intendation spaces and line breaks. */
+        /* Eat the following indentation spaces and line breaks. */
 
         if (!yaml_parser_scan_block_scalar_breaks(parser,
                     &indent, &trailing_breaks, start_mark, &end_mark)) goto error;
@@ -2948,8 +2955,8 @@ error:
 }
 
 /*
- * Scan intendation spaces and line breaks for a block scalar.  Determine the
- * intendation level if needed.
+ * Scan indentation spaces and line breaks for a block scalar.  Determine the
+ * indentation level if needed.
  */
 
 static int
@@ -2961,11 +2968,11 @@ yaml_parser_scan_block_scalar_breaks(yaml_parser_t *parser,
 
     *end_mark = parser->mark;
 
-    /* Eat the intendation spaces and line breaks. */
+    /* Eat the indentation spaces and line breaks. */
 
     while (1)
     {
-        /* Eat the intendation spaces. */
+        /* Eat the indentation spaces. */
 
         if (!CACHE(parser, 1)) return 0;
 
@@ -2978,12 +2985,12 @@ yaml_parser_scan_block_scalar_breaks(yaml_parser_t *parser,
         if ((int)parser->mark.column > max_indent)
             max_indent = (int)parser->mark.column;
 
-        /* Check for a tab character messing the intendation. */
+        /* Check for a tab character messing the indentation. */
 
         if ((!*indent || (int)parser->mark.column < *indent)
                 && IS_TAB(parser->buffer)) {
             return yaml_parser_set_scanner_error(parser, "while scanning a block scalar",
-                    start_mark, "found a tab character where an intendation space is expected");
+                    start_mark, "found a tab character where an indentation space is expected");
         }
 
         /* Have we found a non-empty line? */
@@ -3162,8 +3169,8 @@ yaml_parser_scan_flow_scalar(yaml_parser_t *parser, yaml_token_t *token,
                         *(string.pointer++) = '"';
                         break;
 
-                    case '\'':
-                        *(string.pointer++) = '\'';
+                    case '/':
+                        *(string.pointer++) = '/';
                         break;
 
                     case '\\':
@@ -3280,6 +3287,11 @@ yaml_parser_scan_flow_scalar(yaml_parser_t *parser, yaml_token_t *token,
 
         /* Check if we are at the end of the scalar. */
 
+        /* Fix for crash uninitialized value crash
+         * Credit for the bug and input is to OSS Fuzz
+         * Credit for the fix to Alex Gaynor
+         */
+        if (!CACHE(parser, 1)) goto error;
         if (CHECK(parser->buffer, single ? '\'' : '"'))
             break;
 
@@ -3427,11 +3439,22 @@ yaml_parser_scan_plain_scalar(yaml_parser_t *parser, yaml_token_t *token)
 
         while (!IS_BLANKZ(parser->buffer))
         {
-            /* Check for 'x:x' in the flow context. TODO: Fix the test "spec-08-13". */
+            /* Check for "x:" + one of ',?[]{}' in the flow context. TODO: Fix the test "spec-08-13".
+             * This is not completely according to the spec
+             * See http://yaml.org/spec/1.1/#id907281 9.1.3. Plain
+             */
 
             if (parser->flow_level
                     && CHECK(parser->buffer, ':')
-                    && !IS_BLANKZ_AT(parser->buffer, 1)) {
+                    && (
+                        CHECK_AT(parser->buffer, ',', 1)
+                        || CHECK_AT(parser->buffer, '?', 1)
+                        || CHECK_AT(parser->buffer, '[', 1)
+                        || CHECK_AT(parser->buffer, ']', 1)
+                        || CHECK_AT(parser->buffer, '{', 1)
+                        || CHECK_AT(parser->buffer, '}', 1)
+                    )
+                    ) {
                 yaml_parser_set_scanner_error(parser, "while scanning a plain scalar",
                         start_mark, "found unexpected ':'");
                 goto error;
@@ -3441,8 +3464,8 @@ yaml_parser_scan_plain_scalar(yaml_parser_t *parser, yaml_token_t *token)
 
             if ((CHECK(parser->buffer, ':') && IS_BLANKZ_AT(parser->buffer, 1))
                     || (parser->flow_level &&
-                        (CHECK(parser->buffer, ',') || CHECK(parser->buffer, ':')
-                         || CHECK(parser->buffer, '?') || CHECK(parser->buffer, '[')
+                        (CHECK(parser->buffer, ',')
+                         || CHECK(parser->buffer, '[')
                          || CHECK(parser->buffer, ']') || CHECK(parser->buffer, '{')
                          || CHECK(parser->buffer, '}'))))
                 break;
@@ -3504,12 +3527,12 @@ yaml_parser_scan_plain_scalar(yaml_parser_t *parser, yaml_token_t *token)
         {
             if (IS_BLANK(parser->buffer))
             {
-                /* Check for tab character that abuse intendation. */
+                /* Check for tab characters that abuse indentation. */
 
                 if (leading_blanks && (int)parser->mark.column < indent
                         && IS_TAB(parser->buffer)) {
                     yaml_parser_set_scanner_error(parser, "while scanning a plain scalar",
-                            start_mark, "found a tab character that violate intendation");
+                            start_mark, "found a tab character that violates indentation");
                     goto error;
                 }
 
@@ -3542,7 +3565,7 @@ yaml_parser_scan_plain_scalar(yaml_parser_t *parser, yaml_token_t *token)
             if (!CACHE(parser, 1)) goto error;
         }
 
-        /* Check intendation level. */
+        /* Check indentation level. */
 
         if (!parser->flow_level && (int)parser->mark.column < indent)
             break;
@@ -3573,4 +3596,3 @@ error:
 
     return 0;
 }
-
diff --git a/ext/psych/yaml/yaml.h b/ext/psych/yaml/yaml.h
index f33a152594..f1b7bfde20 100644
--- a/ext/psych/yaml/yaml.h
+++ b/ext/psych/yaml/yaml.h
@@ -26,7 +26,9 @@ extern "C" {
 
 /** The public API declaration. */
 
-#ifdef _WIN32
+#if defined(__MINGW32__)
+#   define  YAML_DECLARE(type)  type
+#elif defined(_WIN32)
 #   if defined(YAML_DECLARE_STATIC)
 #       define  YAML_DECLARE(type)  type
 #   elif defined(YAML_DECLARE_EXPORT)
@@ -230,7 +232,7 @@ typedef enum yaml_token_type_e {
 
     /** A BLOCK-SEQUENCE-START token. */
     YAML_BLOCK_SEQUENCE_START_TOKEN,
-    /** A BLOCK-SEQUENCE-END token. */
+    /** A BLOCK-MAPPING-START token. */
     YAML_BLOCK_MAPPING_START_TOKEN,
     /** A BLOCK-END token. */
     YAML_BLOCK_END_TOKEN,
@@ -550,7 +552,7 @@ yaml_document_end_event_initialize(yaml_event_t *event, int implicit);
  */
 
 YAML_DECLARE(int)
-yaml_alias_event_initialize(yaml_event_t *event, yaml_char_t *anchor);
+yaml_alias_event_initialize(yaml_event_t *event, const yaml_char_t *anchor);
 
 /**
  * Create a SCALAR event.
@@ -576,8 +578,8 @@ yaml_alias_event_initialize(yaml_event_t *event, yaml_char_t *anchor);
 
 YAML_DECLARE(int)
 yaml_scalar_event_initialize(yaml_event_t *event,
-        yaml_char_t *anchor, yaml_char_t *tag,
-        yaml_char_t *value, int length,
+        const yaml_char_t *anchor, const yaml_char_t *tag,
+        const yaml_char_t *value, int length,
         int plain_implicit, int quoted_implicit,
         yaml_scalar_style_t style);
 
@@ -599,7 +601,7 @@ yaml_scalar_event_initialize(yaml_event_t *event,
 
 YAML_DECLARE(int)
 yaml_sequence_start_event_initialize(yaml_event_t *event,
-        yaml_char_t *anchor, yaml_char_t *tag, int implicit,
+        const yaml_char_t *anchor, const yaml_char_t *tag, int implicit,
         yaml_sequence_style_t style);
 
 /**
@@ -631,7 +633,7 @@ yaml_sequence_end_event_initialize(yaml_event_t *event);
 
 YAML_DECLARE(int)
 yaml_mapping_start_event_initialize(yaml_event_t *event,
-        yaml_char_t *anchor, yaml_char_t *tag, int implicit,
+        const yaml_char_t *anchor, const yaml_char_t *tag, int implicit,
         yaml_mapping_style_t style);
 
 /**
@@ -663,7 +665,7 @@ yaml_event_delete(yaml_event_t *event);
 
 /** The tag @c !!null with the only possible value: @c null. */
 #define YAML_NULL_TAG       "tag:yaml.org,2002:null"
-/** The tag @c !!bool with the values: @c true and @c falce. */
+/** The tag @c !!bool with the values: @c true and @c false. */
 #define YAML_BOOL_TAG       "tag:yaml.org,2002:bool"
 /** The tag @c !!str for string values. */
 #define YAML_STR_TAG        "tag:yaml.org,2002:str"
@@ -894,7 +896,7 @@ yaml_document_get_root_node(yaml_document_t *document);
 
 YAML_DECLARE(int)
 yaml_document_add_scalar(yaml_document_t *document,
-        yaml_char_t *tag, yaml_char_t *value, int length,
+        const yaml_char_t *tag, const yaml_char_t *value, int length,
         yaml_scalar_style_t style);
 
 /**
@@ -911,7 +913,7 @@ yaml_document_add_scalar(yaml_document_t *document,
 
 YAML_DECLARE(int)
 yaml_document_add_sequence(yaml_document_t *document,
-        yaml_char_t *tag, yaml_sequence_style_t style);
+        const yaml_char_t *tag, yaml_sequence_style_t style);
 
 /**
  * Create a MAPPING node and attach it to the document.
@@ -927,7 +929,7 @@ yaml_document_add_sequence(yaml_document_t *document,
 
 YAML_DECLARE(int)
 yaml_document_add_mapping(yaml_document_t *document,
-        yaml_char_t *tag, yaml_mapping_style_t style);
+        const yaml_char_t *tag, yaml_mapping_style_t style);
 
 /**
  * Add an item to a SEQUENCE node.
@@ -935,7 +937,7 @@ yaml_document_add_mapping(yaml_document_t *document,
  * @param[in,out]   document    A document object.
  * @param[in]       sequence    The sequence node id.
  * @param[in]       item        The item node id.
-*
+ *
  * @returns @c 1 if the function succeeded, @c 0 on error.
  */
 
@@ -950,7 +952,7 @@ yaml_document_append_sequence_item(yaml_document_t *document,
  * @param[in]       mapping     The mapping node id.
  * @param[in]       key         The key node id.
  * @param[in]       value       The value node id.
-*
+ *
  * @returns @c 1 if the function succeeded, @c 0 on error.
  */
 
@@ -1018,6 +1020,7 @@ typedef enum yaml_parser_state_e {
     YAML_PARSE_DOCUMENT_CONTENT_STATE,
     /** Expect DOCUMENT-END. */
     YAML_PARSE_DOCUMENT_END_STATE,
+
     /** Expect a block node. */
     YAML_PARSE_BLOCK_NODE_STATE,
     /** Expect a block node or indentless sequence. */
@@ -1028,6 +1031,7 @@ typedef enum yaml_parser_state_e {
     YAML_PARSE_BLOCK_SEQUENCE_FIRST_ENTRY_STATE,
     /** Expect an entry of a block sequence. */
     YAML_PARSE_BLOCK_SEQUENCE_ENTRY_STATE,
+
     /** Expect an entry of an indentless sequence. */
     YAML_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE,
     /** Expect the first key of a block mapping. */
@@ -1038,6 +1042,7 @@ typedef enum yaml_parser_state_e {
     YAML_PARSE_BLOCK_MAPPING_VALUE_STATE,
     /** Expect the first entry of a flow sequence. */
     YAML_PARSE_FLOW_SEQUENCE_FIRST_ENTRY_STATE,
+
     /** Expect an entry of a flow sequence. */
     YAML_PARSE_FLOW_SEQUENCE_ENTRY_STATE,
     /** Expect a key of an ordered mapping. */
@@ -1049,6 +1054,7 @@ typedef enum yaml_parser_state_e {
     /** Expect the first key of a flow mapping. */
     YAML_PARSE_FLOW_MAPPING_FIRST_KEY_STATE,
     /** Expect a key of a flow mapping. */
+
     YAML_PARSE_FLOW_MAPPING_KEY_STATE,
     /** Expect a value of a flow mapping. */
     YAML_PARSE_FLOW_MAPPING_VALUE_STATE,
@@ -1203,7 +1209,7 @@ typedef struct yaml_parser_s {
     /** The number of tokens fetched from the queue. */
     size_t tokens_parsed;
 
-    /* Does the tokens queue contain a token ready for dequeueing. */
+    /** Does the tokens queue contain a token ready for dequeueing. */
     int token_available;
 
     /** The indentation levels stack. */
@@ -1329,7 +1335,7 @@ yaml_parser_delete(yaml_parser_t *parser);
  * Set a string input.
  *
  * Note that the @a input pointer must be valid while the @a parser object
- * exists.  The application is responsible for destroing @a input after
+ * exists.  The application is responsible for destroying @a input after
  * destroying the @a parser.
  *
  * @param[in,out]   parser  A parser object.
@@ -1444,7 +1450,7 @@ yaml_parser_parse(yaml_parser_t *parser, yaml_event_t *event);
  * @param[in,out]   parser      A parser object.
  * @param[out]      document    An empty document object.
  *
- * @return @c 1 if the function succeeded, @c 0 on error.
+ * @returns @c 1 if the function succeeded, @c 0 on error.
  */
 
 YAML_DECLARE(int)
@@ -1487,6 +1493,7 @@ typedef enum yaml_emitter_state_e {
     YAML_EMIT_DOCUMENT_CONTENT_STATE,
     /** Expect DOCUMENT-END. */
     YAML_EMIT_DOCUMENT_END_STATE,
+
     /** Expect the first item of a flow sequence. */
     YAML_EMIT_FLOW_SEQUENCE_FIRST_ITEM_STATE,
     /** Expect an item of a flow sequence. */
@@ -1497,6 +1504,7 @@ typedef enum yaml_emitter_state_e {
     YAML_EMIT_FLOW_MAPPING_KEY_STATE,
     /** Expect a value for a simple key of a flow mapping. */
     YAML_EMIT_FLOW_MAPPING_SIMPLE_VALUE_STATE,
+
     /** Expect a value of a flow mapping. */
     YAML_EMIT_FLOW_MAPPING_VALUE_STATE,
     /** Expect the first item of a block sequence. */
@@ -1507,6 +1515,7 @@ typedef enum yaml_emitter_state_e {
     YAML_EMIT_BLOCK_MAPPING_FIRST_KEY_STATE,
     /** Expect the key of a block mapping. */
     YAML_EMIT_BLOCK_MAPPING_KEY_STATE,
+
     /** Expect a value for a simple key of a block mapping. */
     YAML_EMIT_BLOCK_MAPPING_SIMPLE_VALUE_STATE,
     /** Expect a value of a block mapping. */
@@ -1515,6 +1524,18 @@ typedef enum yaml_emitter_state_e {
     YAML_EMIT_END_STATE
 } yaml_emitter_state_t;
 
+
+/* This is needed for C++ */
+
+typedef struct yaml_anchors_s {
+    /** The number of references. */
+    int references;
+    /** The anchor id. */
+    int anchor;
+    /** If the node has been emitted? */
+    int serialized;
+} yaml_anchors_t;
+
 /**
  * The emitter structure.
  *
@@ -1546,7 +1567,7 @@ typedef struct yaml_emitter_s {
     /** Write handler. */
     yaml_write_handler_t *write_handler;
 
-    /** A pointer for passing to the white handler. */
+    /** A pointer for passing to the write handler. */
     void *write_handler_data;
 
     /** Standard (string or file) output data. */
@@ -1713,7 +1734,7 @@ typedef struct yaml_emitter_s {
         size_t length;
         /** Does the scalar contain line breaks? */
         int multiline;
-        /** Can the scalar be expessed in the flow plain style? */
+        /** Can the scalar be expressed in the flow plain style? */
         int flow_plain_allowed;
         /** Can the scalar be expressed in the block plain style? */
         int block_plain_allowed;
@@ -1740,14 +1761,7 @@ typedef struct yaml_emitter_s {
     int closed;
 
     /** The information associated with the document nodes. */
-    struct {
-        /** The number of references. */
-        int references;
-        /** The anchor id. */
-        int anchor;
-        /** If the node has been emitted? */
-        int serialized;
-    } *anchors;
+    yaml_anchors_t *anchors;
 
     /** The last assigned anchor id. */
     int last_anchor_id;
@@ -1936,10 +1950,10 @@ yaml_emitter_close(yaml_emitter_t *emitter);
 /**
  * Emit a YAML document.
  *
- * The documen object may be generated using the yaml_parser_load() function
+ * The document object may be generated using the yaml_parser_load() function
  * or the yaml_document_initialize() function.  The emitter takes the
- * responsibility for the document object and destoys its content after
- * it is emitted. The document object is destroyedeven if the function fails.
+ * responsibility for the document object and destroys its content after
+ * it is emitted. The document object is destroyed even if the function fails.
  *
  * @param[in,out]   emitter     An emitter object.
  * @param[in,out]   document    A document object.
diff --git a/ext/psych/yaml/yaml_private.h b/ext/psych/yaml/yaml_private.h
index 944499c94e..266a6bd3a7 100644
--- a/ext/psych/yaml/yaml_private.h
+++ b/ext/psych/yaml/yaml_private.h
@@ -2,8 +2,8 @@
 #include RUBY_EXTCONF_H
 #endif
 
-#if HAVE_CONFIG_H
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
 #endif
 
 #include <yaml.h>
@@ -12,16 +12,6 @@
 #include <limits.h>
 #include <stddef.h>
 
-#ifndef _MSC_VER
-#include <stdint.h>
-#else
-#ifdef _WIN64
-#define PTRDIFF_MAX _I64_MAX
-#else
-#define PTRDIFF_MAX INT_MAX
-#endif
-#endif
-
 /*
  * Memory management.
  */
@@ -81,6 +71,17 @@ yaml_parser_fetch_more_tokens(yaml_parser_t *parser);
 #define OUTPUT_RAW_BUFFER_SIZE  (OUTPUT_BUFFER_SIZE*2+2)
 
 /*
+ * The maximum size of a YAML input file.
+ * This used to be PTRDIFF_MAX, but that's not entirely portable
+ * because stdint.h isn't available on all platforms.
+ * It is not entirely clear why this isn't the maximum value
+ * that can fit into the parser->offset field.
+ */
+
+#define MAX_FILE_SIZE (~(size_t)0 / 2)
+
+
+/*
  * The size of other stacks and queues.
  */
 
@@ -93,7 +94,7 @@ yaml_parser_fetch_more_tokens(yaml_parser_t *parser);
  */
 
 #define BUFFER_INIT(context,buffer,size)                                        \
-    (((buffer).start = yaml_malloc(size)) ?                                     \
+  (((buffer).start = (yaml_char_t *)yaml_malloc(size)) ?                        \
         ((buffer).last = (buffer).pointer = (buffer).start,                     \
          (buffer).end = (buffer).start+(size),                                  \
          1) :                                                                   \
@@ -133,7 +134,7 @@ yaml_string_join(
      (value).pointer = (string))
 
 #define STRING_INIT(context,string,size)                                        \
-    (((string).start = yaml_malloc(size)) ?                                     \
+    (((string).start = YAML_MALLOC(size)) ?                                     \
         ((string).pointer = (string).start,                                     \
          (string).end = (string).start+(size),                                  \
          memset((string).start, 0, (size)),                                     \
@@ -174,14 +175,14 @@ yaml_string_join(
  * Check the octet at the specified position.
  */
 
-#define CHECK_AT(string,octet,offset)                                           \
+#define CHECK_AT(string,octet,offset)                   \
     ((string).pointer[offset] == (yaml_char_t)(octet))
 
 /*
  * Check the current octet in the buffer.
  */
 
-#define CHECK(string,octet) CHECK_AT((string),(octet),0)
+#define CHECK(string,octet) (CHECK_AT((string),(octet),0))
 
 /*
  * Check if the character at the specified position is an alphabetical
@@ -423,10 +424,10 @@ yaml_stack_extend(void **start, void **top, void **end);
 YAML_DECLARE(int)
 yaml_queue_extend(void **start, void **head, void **tail, void **end);
 
-#define STACK_INIT(context,stack,size)                                          \
-    (((stack).start = yaml_malloc((size)*sizeof(*(stack).start))) ?             \
+#define STACK_INIT(context,stack,type)                                     \
+  (((stack).start = (type)yaml_malloc(INITIAL_STACK_SIZE*sizeof(*(stack).start))) ? \
         ((stack).top = (stack).start,                                           \
-         (stack).end = (stack).start+(size),                                    \
+         (stack).end = (stack).start+INITIAL_STACK_SIZE,                        \
          1) :                                                                   \
         ((context)->error = YAML_MEMORY_ERROR,                                  \
          0))
@@ -436,8 +437,7 @@ yaml_queue_extend(void **start, void **head, void **tail, void **end);
      (stack).start = (stack).top = (stack).end = 0)
 
 #define STACK_EMPTY(context,stack)                                              \
-    ((void)(context),                                                           \
-     ((stack).start == (stack).top))
+    ((stack).start == (stack).top)
 
 #define STACK_LIMIT(context,stack,size)                                         \
     ((stack).top - (stack).start < (size) ?                                     \
@@ -457,8 +457,8 @@ yaml_queue_extend(void **start, void **head, void **tail, void **end);
 #define POP(context,stack)                                                      \
     (*(--(stack).top))
 
-#define QUEUE_INIT(context,queue,size)                                          \
-    (((queue).start = yaml_malloc((size)*sizeof(*(queue).start))) ?             \
+#define QUEUE_INIT(context,queue,size,type)                                     \
+  (((queue).start = (type)yaml_malloc((size)*sizeof(*(queue).start))) ?         \
         ((queue).head = (queue).tail = (queue).start,                           \
          (queue).end = (queue).start+(size),                                    \
          1) :                                                                   \
@@ -662,3 +662,27 @@ yaml_queue_extend(void **start, void **head, void **tail, void **end);
      (node).data.mapping.pairs.top = (node_pairs_start),                        \
      (node).data.mapping.style = (node_style))
 
+/* Strict C compiler warning helpers */
+
+#if defined(__clang__) || defined(__GNUC__)
+#  define HASATTRIBUTE_UNUSED
+#endif
+#ifdef HASATTRIBUTE_UNUSED
+#  define __attribute__unused__             __attribute__((__unused__))
+#else
+#  define __attribute__unused__
+#endif
+
+/* Shim arguments are arguments that must be included in your function,
+ * but serve no purpose inside.  Silence compiler warnings. */
+#define SHIM(a) /*@unused@*/ a __attribute__unused__
+
+/* UNUSED_PARAM() marks a shim argument in the body to silence compiler warnings */
+#ifdef __clang__
+#  define UNUSED_PARAM(a) (void)(a);
+#else
+#  define UNUSED_PARAM(a) /*@-noeffect*/if (0) (void)(a)/*@=noeffect*/;
+#endif
+
+#define YAML_MALLOC_STATIC(type) (type*)yaml_malloc(sizeof(type))
+#define YAML_MALLOC(size)        (yaml_char_t *)yaml_malloc(size)
diff --git a/ext/pty/depend b/ext/pty/depend
index 432ad0647c..23d6e6e329 100644
--- a/ext/pty/depend
+++ b/ext/pty/depend
@@ -1,18 +1,177 @@
 # AUTOGENERATED DEPENDENCIES START
 pty.o: $(RUBY_EXTCONF_H)
 pty.o: $(arch_hdrdir)/ruby/config.h
+pty.o: $(hdrdir)/ruby.h
+pty.o: $(hdrdir)/ruby/internal/anyargs.h
+pty.o: $(hdrdir)/ruby/internal/arithmetic.h
+pty.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+pty.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+pty.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+pty.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+pty.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+pty.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+pty.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+pty.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+pty.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+pty.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+pty.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+pty.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+pty.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+pty.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+pty.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+pty.o: $(hdrdir)/ruby/internal/assume.h
+pty.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+pty.o: $(hdrdir)/ruby/internal/attr/artificial.h
+pty.o: $(hdrdir)/ruby/internal/attr/cold.h
+pty.o: $(hdrdir)/ruby/internal/attr/const.h
+pty.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+pty.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+pty.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+pty.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+pty.o: $(hdrdir)/ruby/internal/attr/error.h
+pty.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+pty.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+pty.o: $(hdrdir)/ruby/internal/attr/format.h
+pty.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+pty.o: $(hdrdir)/ruby/internal/attr/noalias.h
+pty.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+pty.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+pty.o: $(hdrdir)/ruby/internal/attr/noinline.h
+pty.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+pty.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+pty.o: $(hdrdir)/ruby/internal/attr/pure.h
+pty.o: $(hdrdir)/ruby/internal/attr/restrict.h
+pty.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+pty.o: $(hdrdir)/ruby/internal/attr/warning.h
+pty.o: $(hdrdir)/ruby/internal/attr/weakref.h
+pty.o: $(hdrdir)/ruby/internal/cast.h
+pty.o: $(hdrdir)/ruby/internal/compiler_is.h
+pty.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+pty.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+pty.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+pty.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+pty.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+pty.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+pty.o: $(hdrdir)/ruby/internal/compiler_since.h
+pty.o: $(hdrdir)/ruby/internal/config.h
+pty.o: $(hdrdir)/ruby/internal/constant_p.h
+pty.o: $(hdrdir)/ruby/internal/core.h
+pty.o: $(hdrdir)/ruby/internal/core/rarray.h
+pty.o: $(hdrdir)/ruby/internal/core/rbasic.h
+pty.o: $(hdrdir)/ruby/internal/core/rbignum.h
+pty.o: $(hdrdir)/ruby/internal/core/rclass.h
+pty.o: $(hdrdir)/ruby/internal/core/rdata.h
+pty.o: $(hdrdir)/ruby/internal/core/rfile.h
+pty.o: $(hdrdir)/ruby/internal/core/rhash.h
+pty.o: $(hdrdir)/ruby/internal/core/robject.h
+pty.o: $(hdrdir)/ruby/internal/core/rregexp.h
+pty.o: $(hdrdir)/ruby/internal/core/rstring.h
+pty.o: $(hdrdir)/ruby/internal/core/rstruct.h
+pty.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+pty.o: $(hdrdir)/ruby/internal/ctype.h
+pty.o: $(hdrdir)/ruby/internal/dllexport.h
+pty.o: $(hdrdir)/ruby/internal/dosish.h
+pty.o: $(hdrdir)/ruby/internal/error.h
+pty.o: $(hdrdir)/ruby/internal/eval.h
+pty.o: $(hdrdir)/ruby/internal/event.h
+pty.o: $(hdrdir)/ruby/internal/fl_type.h
+pty.o: $(hdrdir)/ruby/internal/gc.h
+pty.o: $(hdrdir)/ruby/internal/glob.h
+pty.o: $(hdrdir)/ruby/internal/globals.h
+pty.o: $(hdrdir)/ruby/internal/has/attribute.h
+pty.o: $(hdrdir)/ruby/internal/has/builtin.h
+pty.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+pty.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+pty.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+pty.o: $(hdrdir)/ruby/internal/has/extension.h
+pty.o: $(hdrdir)/ruby/internal/has/feature.h
+pty.o: $(hdrdir)/ruby/internal/has/warning.h
+pty.o: $(hdrdir)/ruby/internal/intern/array.h
+pty.o: $(hdrdir)/ruby/internal/intern/bignum.h
+pty.o: $(hdrdir)/ruby/internal/intern/class.h
+pty.o: $(hdrdir)/ruby/internal/intern/compar.h
+pty.o: $(hdrdir)/ruby/internal/intern/complex.h
+pty.o: $(hdrdir)/ruby/internal/intern/cont.h
+pty.o: $(hdrdir)/ruby/internal/intern/dir.h
+pty.o: $(hdrdir)/ruby/internal/intern/enum.h
+pty.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+pty.o: $(hdrdir)/ruby/internal/intern/error.h
+pty.o: $(hdrdir)/ruby/internal/intern/eval.h
+pty.o: $(hdrdir)/ruby/internal/intern/file.h
+pty.o: $(hdrdir)/ruby/internal/intern/gc.h
+pty.o: $(hdrdir)/ruby/internal/intern/hash.h
+pty.o: $(hdrdir)/ruby/internal/intern/io.h
+pty.o: $(hdrdir)/ruby/internal/intern/load.h
+pty.o: $(hdrdir)/ruby/internal/intern/marshal.h
+pty.o: $(hdrdir)/ruby/internal/intern/numeric.h
+pty.o: $(hdrdir)/ruby/internal/intern/object.h
+pty.o: $(hdrdir)/ruby/internal/intern/parse.h
+pty.o: $(hdrdir)/ruby/internal/intern/proc.h
+pty.o: $(hdrdir)/ruby/internal/intern/process.h
+pty.o: $(hdrdir)/ruby/internal/intern/random.h
+pty.o: $(hdrdir)/ruby/internal/intern/range.h
+pty.o: $(hdrdir)/ruby/internal/intern/rational.h
+pty.o: $(hdrdir)/ruby/internal/intern/re.h
+pty.o: $(hdrdir)/ruby/internal/intern/ruby.h
+pty.o: $(hdrdir)/ruby/internal/intern/select.h
+pty.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+pty.o: $(hdrdir)/ruby/internal/intern/signal.h
+pty.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+pty.o: $(hdrdir)/ruby/internal/intern/string.h
+pty.o: $(hdrdir)/ruby/internal/intern/struct.h
+pty.o: $(hdrdir)/ruby/internal/intern/thread.h
+pty.o: $(hdrdir)/ruby/internal/intern/time.h
+pty.o: $(hdrdir)/ruby/internal/intern/variable.h
+pty.o: $(hdrdir)/ruby/internal/intern/vm.h
+pty.o: $(hdrdir)/ruby/internal/interpreter.h
+pty.o: $(hdrdir)/ruby/internal/iterator.h
+pty.o: $(hdrdir)/ruby/internal/memory.h
+pty.o: $(hdrdir)/ruby/internal/method.h
+pty.o: $(hdrdir)/ruby/internal/module.h
+pty.o: $(hdrdir)/ruby/internal/newobj.h
+pty.o: $(hdrdir)/ruby/internal/rgengc.h
+pty.o: $(hdrdir)/ruby/internal/scan_args.h
+pty.o: $(hdrdir)/ruby/internal/special_consts.h
+pty.o: $(hdrdir)/ruby/internal/static_assert.h
+pty.o: $(hdrdir)/ruby/internal/stdalign.h
+pty.o: $(hdrdir)/ruby/internal/stdbool.h
+pty.o: $(hdrdir)/ruby/internal/symbol.h
+pty.o: $(hdrdir)/ruby/internal/token_paste.h
+pty.o: $(hdrdir)/ruby/internal/value.h
+pty.o: $(hdrdir)/ruby/internal/value_type.h
+pty.o: $(hdrdir)/ruby/internal/variable.h
+pty.o: $(hdrdir)/ruby/internal/warning_push.h
+pty.o: $(hdrdir)/ruby/internal/xmalloc.h
+pty.o: $(hdrdir)/ruby/assert.h
 pty.o: $(hdrdir)/ruby/backward.h
+pty.o: $(hdrdir)/ruby/backward/2/assume.h
+pty.o: $(hdrdir)/ruby/backward/2/attributes.h
+pty.o: $(hdrdir)/ruby/backward/2/bool.h
+pty.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+pty.o: $(hdrdir)/ruby/backward/2/inttypes.h
+pty.o: $(hdrdir)/ruby/backward/2/limits.h
+pty.o: $(hdrdir)/ruby/backward/2/long_long.h
+pty.o: $(hdrdir)/ruby/backward/2/stdalign.h
+pty.o: $(hdrdir)/ruby/backward/2/stdarg.h
 pty.o: $(hdrdir)/ruby/defines.h
 pty.o: $(hdrdir)/ruby/encoding.h
 pty.o: $(hdrdir)/ruby/intern.h
 pty.o: $(hdrdir)/ruby/io.h
 pty.o: $(hdrdir)/ruby/missing.h
+pty.o: $(hdrdir)/ruby/onigmo.h
 pty.o: $(hdrdir)/ruby/oniguruma.h
 pty.o: $(hdrdir)/ruby/ruby.h
 pty.o: $(hdrdir)/ruby/st.h
 pty.o: $(hdrdir)/ruby/subst.h
 pty.o: $(hdrdir)/ruby/util.h
-pty.o: $(top_srcdir)/include/ruby.h
 pty.o: $(top_srcdir)/internal.h
+pty.o: $(top_srcdir)/internal/array.h
+pty.o: $(top_srcdir)/internal/compilers.h
+pty.o: $(top_srcdir)/internal/gc.h
+pty.o: $(top_srcdir)/internal/imemo.h
+pty.o: $(top_srcdir)/internal/process.h
+pty.o: $(top_srcdir)/internal/signal.h
+pty.o: $(top_srcdir)/internal/static_assert.h
+pty.o: $(top_srcdir)/internal/warnings.h
 pty.o: pty.c
 # AUTOGENERATED DEPENDENCIES END
diff --git a/ext/pty/extconf.rb b/ext/pty/extconf.rb
index 844902b1f7..038bdf4d2c 100644
--- a/ext/pty/extconf.rb
+++ b/ext/pty/extconf.rb
@@ -1,18 +1,18 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'mkmf'
 
 $INCFLAGS << " -I$(topdir) -I$(top_srcdir)"
 
-if /mswin|mingw|bccwin|nacl/ !~ RUBY_PLATFORM
+if /mswin|mingw|bccwin/ !~ RUBY_PLATFORM
   have_header("sys/stropts.h")
   have_func("setresuid")
   have_header("libutil.h")
   have_header("util.h") # OpenBSD openpty
   have_header("pty.h")
   have_header("pwd.h")
-  have_library("util", "openpty")
+  util = have_library("util", "openpty")
   if have_func("posix_openpt") or
-      have_func("openpty") or
+      (util or have_func("openpty")) or
       have_func("_getpty") or
       have_func("ptsname") or
       have_func("ioctl")
diff --git a/ext/pty/lib/expect.rb b/ext/pty/lib/expect.rb
index 122562127d..5dbfa09ae9 100644
--- a/ext/pty/lib/expect.rb
+++ b/ext/pty/lib/expect.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 $expect_verbose = false
 
 # Expect library adds the IO instance method #expect, which does similar act to
@@ -31,7 +31,7 @@ class IO
   # or yielded.  However, the buffer in a timeout session is kept for the next
   # expect call.  The default timeout is 9999999 seconds.
   def expect(pat,timeout=9999999)
-    buf = ''
+    buf = ''.dup
     case pat
     when String
       e_pat = Regexp.new(Regexp.quote(pat))
@@ -43,13 +43,13 @@ class IO
     @unusedBuf ||= ''
     while true
       if not @unusedBuf.empty?
-        c = @unusedBuf.slice!(0).chr
+        c = @unusedBuf.slice!(0)
       elsif !IO.select([self],nil,nil,timeout) or eof? then
         result = nil
         @unusedBuf = buf
         break
       else
-        c = getc.chr
+        c = getc
       end
       buf << c
       if $expect_verbose
@@ -57,7 +57,7 @@ class IO
         STDOUT.flush
       end
       if mat=e_pat.match(buf) then
-        result = [buf,*mat.to_a[1..-1]]
+        result = [buf,*mat.captures]
         break
       end
     end
@@ -69,4 +69,3 @@ class IO
     nil
   end
 end
-
diff --git a/ext/pty/pty.c b/ext/pty/pty.c
index 2ac412cfbc..e53871ede5 100644
--- a/ext/pty/pty.c
+++ b/ext/pty/pty.c
@@ -1,45 +1,51 @@
-#include	"ruby/config.h"
+#include "ruby/config.h"
+
 #ifdef RUBY_EXTCONF_H
-#include RUBY_EXTCONF_H
+# include RUBY_EXTCONF_H
 #endif
-#include	<stdlib.h>
-#include	<stdio.h>
-#include	<sys/types.h>
-#include	<sys/stat.h>
-#include	<sys/file.h>
-#include	<fcntl.h>
-#include	<errno.h>
+
+#include <ctype.h>
+#include <errno.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/file.h>
+#include <fcntl.h>
+
 #ifdef HAVE_PWD_H
-#include	<pwd.h>
+# include <pwd.h>
 #endif
+
 #ifdef HAVE_SYS_IOCTL_H
-#include	<sys/ioctl.h>
+# include <sys/ioctl.h>
 #endif
+
 #ifdef HAVE_LIBUTIL_H
-#include	<libutil.h>
+# include <libutil.h>
 #endif
+
 #ifdef HAVE_UTIL_H
-#include	<util.h>
+# include <util.h>
 #endif
+
 #ifdef HAVE_PTY_H
-#include	<pty.h>
+# include <pty.h>
 #endif
+
 #if defined(HAVE_SYS_PARAM_H)
-  /* for __FreeBSD_version */
+ /* for __FreeBSD_version */
 # include <sys/param.h>
 #endif
+
 #ifdef HAVE_SYS_WAIT_H
-#include <sys/wait.h>
+# include <sys/wait.h>
 #else
-#define WIFSTOPPED(status)    (((status) & 0xff) == 0x7f)
+# define WIFSTOPPED(status) (((status) & 0xff) == 0x7f)
 #endif
-#include <ctype.h>
-
-#include "internal.h"
-#include "ruby/io.h"
-#include "ruby/util.h"
 
-#include <signal.h>
 #ifdef HAVE_SYS_STROPTS_H
 #include <sys/stropts.h>
 #endif
@@ -48,6 +54,12 @@
 #include <unistd.h>
 #endif
 
+#include "internal.h"
+#include "internal/process.h"
+#include "internal/signal.h"
+#include "ruby/io.h"
+#include "ruby/util.h"
+
 #define	DEVICELEN	16
 
 #ifndef HAVE_SETEUID
@@ -143,7 +155,7 @@ chfunc(void *data, char *errbuf, size_t errbuf_len)
     dup2(slave,0);
     dup2(slave,1);
     dup2(slave,2);
-    close(slave);
+    if (slave < 0 || slave > 2) (void)!close(slave);
 #if defined(HAVE_SETEUID) || defined(HAVE_SETREUID) || defined(HAVE_SETRESUID)
     if (seteuid(getuid())) ERROR_EXIT("seteuid()");
 #endif
@@ -182,7 +194,7 @@ establishShell(int argc, VALUE *argv, struct pty_info *info,
 	argv = &v;
     }
 
-    carg.execarg_obj = rb_execarg_new(argc, argv, 1);
+    carg.execarg_obj = rb_execarg_new(argc, argv, 1, 0);
     carg.eargp = rb_execarg_get(carg.execarg_obj);
     rb_execarg_parent_start(carg.execarg_obj);
 
@@ -224,6 +236,21 @@ no_mesg(char *slavedevice, int nomesg)
 }
 #endif
 
+#if defined(I_PUSH) && !defined(__linux__) && !defined(_AIX)
+static inline int
+ioctl_I_PUSH(int fd, const char *const name)
+{
+    int ret = 0;
+# if defined(I_FIND)
+    ret = ioctl(fd, I_FIND, name);
+# endif
+    if (ret == 0) {
+        ret = ioctl(fd, I_PUSH, name);
+    }
+    return ret;
+}
+#endif
+
 static int
 get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg, int fail)
 {
@@ -231,19 +258,13 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg,
     /* Unix98 PTY */
     int masterfd = -1, slavefd = -1;
     char *slavedevice;
-    struct sigaction dfl, old;
 
-    dfl.sa_handler = SIG_DFL;
-    dfl.sa_flags = 0;
-    sigemptyset(&dfl.sa_mask);
-
-#if defined(__sun) || (defined(__FreeBSD__) && __FreeBSD_version < 902000)
+#if defined(__sun) || defined(__OpenBSD__) || (defined(__FreeBSD__) && __FreeBSD_version < 902000)
     /* workaround for Solaris 10: grantpt() doesn't work if FD_CLOEXEC is set.  [ruby-dev:44688] */
     /* FreeBSD 9.2 or later supports O_CLOEXEC
      * http://www.freebsd.org/cgi/query-pr.cgi?pr=162374 */
     if ((masterfd = posix_openpt(O_RDWR|O_NOCTTY)) == -1) goto error;
-    if (sigaction(SIGCHLD, &dfl, &old) == -1) goto error;
-    if (grantpt(masterfd) == -1) goto grantpt_error;
+    if (rb_grantpt(masterfd) == -1) goto error;
     rb_fd_fix_cloexec(masterfd);
 #else
     {
@@ -257,10 +278,8 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg,
 	if ((masterfd = posix_openpt(flags)) == -1) goto error;
     }
     rb_fd_fix_cloexec(masterfd);
-    if (sigaction(SIGCHLD, &dfl, &old) == -1) goto error;
-    if (grantpt(masterfd) == -1) goto grantpt_error;
+    if (rb_grantpt(masterfd) == -1) goto error;
 #endif
-    if (sigaction(SIGCHLD, &old, NULL) == -1) goto error;
     if (unlockpt(masterfd) == -1) goto error;
     if ((slavedevice = ptsname(masterfd)) == NULL) goto error;
     if (no_mesg(slavedevice, nomesg) == -1) goto error;
@@ -268,9 +287,9 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg,
     rb_update_max_fd(slavefd);
 
 #if defined(I_PUSH) && !defined(__linux__) && !defined(_AIX)
-    if (ioctl(slavefd, I_PUSH, "ptem") == -1) goto error;
-    if (ioctl(slavefd, I_PUSH, "ldterm") == -1) goto error;
-    if (ioctl(slavefd, I_PUSH, "ttcompat") == -1) goto error;
+    if (ioctl_I_PUSH(slavefd, "ptem") == -1) goto error;
+    if (ioctl_I_PUSH(slavefd, "ldterm") == -1) goto error;
+    if (ioctl_I_PUSH(slavefd, "ttcompat") == -1) goto error;
 #endif
 
     *master = masterfd;
@@ -278,8 +297,6 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg,
     strlcpy(SlaveName, slavedevice, DEVICELEN);
     return 0;
 
-  grantpt_error:
-    sigaction(SIGCHLD, &old, NULL);
   error:
     if (slavefd != -1) close(slavefd);
     if (masterfd != -1) close(masterfd);
@@ -331,30 +348,26 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg,
 
     extern char *ptsname(int);
     extern int unlockpt(int);
-    extern int grantpt(int);
 
 #if defined(__sun)
     /* workaround for Solaris 10: grantpt() doesn't work if FD_CLOEXEC is set.  [ruby-dev:44688] */
     if((masterfd = open("/dev/ptmx", O_RDWR, 0)) == -1) goto error;
-    s = signal(SIGCHLD, SIG_DFL);
-    if(grantpt(masterfd) == -1) goto error;
+    if(rb_grantpt(masterfd) == -1) goto error;
     rb_fd_fix_cloexec(masterfd);
 #else
     if((masterfd = rb_cloexec_open("/dev/ptmx", O_RDWR, 0)) == -1) goto error;
     rb_update_max_fd(masterfd);
-    s = signal(SIGCHLD, SIG_DFL);
-    if(grantpt(masterfd) == -1) goto error;
+    if(rb_grantpt(masterfd) == -1) goto error;
 #endif
-    signal(SIGCHLD, s);
     if(unlockpt(masterfd) == -1) goto error;
     if((slavedevice = ptsname(masterfd)) == NULL) goto error;
     if (no_mesg(slavedevice, nomesg) == -1) goto error;
     if((slavefd = rb_cloexec_open(slavedevice, O_RDWR, 0)) == -1) goto error;
     rb_update_max_fd(slavefd);
 #if defined(I_PUSH) && !defined(__linux__) && !defined(_AIX)
-    if(ioctl(slavefd, I_PUSH, "ptem") == -1) goto error;
-    if(ioctl(slavefd, I_PUSH, "ldterm") == -1) goto error;
-    ioctl(slavefd, I_PUSH, "ttcompat");
+    if(ioctl_I_PUSH(slavefd, "ptem") == -1) goto error;
+    if(ioctl_I_PUSH(slavefd, "ldterm") == -1) goto error;
+    ioctl_I_PUSH(slavefd, "ttcompat");
 #endif
     *master = masterfd;
     *slave = slavefd;
@@ -372,62 +385,34 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg,
     int  i;
     char MasterName[DEVICELEN];
 
+#define HEX1(c) \
+	c"0",c"1",c"2",c"3",c"4",c"5",c"6",c"7", \
+	c"8",c"9",c"a",c"b",c"c",c"d",c"e",c"f"
+
 #if defined(__hpux)
     static const char MasterDevice[] = "/dev/ptym/pty%s";
     static const char SlaveDevice[] =  "/dev/pty/tty%s";
     static const char deviceNo[][3] = {
-    "p0","p1","p2","p3","p4","p5","p6","p7",
-    "p8","p9","pa","pb","pc","pd","pe","pf",
-    "q0","q1","q2","q3","q4","q5","q6","q7",
-    "q8","q9","qa","qb","qc","qd","qe","qf",
-    "r0","r1","r2","r3","r4","r5","r6","r7",
-    "r8","r9","ra","rb","rc","rd","re","rf",
-    "s0","s1","s2","s3","s4","s5","s6","s7",
-    "s8","s9","sa","sb","sc","sd","se","sf",
-    "t0","t1","t2","t3","t4","t5","t6","t7",
-    "t8","t9","ta","tb","tc","td","te","tf",
-    "u0","u1","u2","u3","u4","u5","u6","u7",
-    "u8","u9","ua","ub","uc","ud","ue","uf",
-    "v0","v1","v2","v3","v4","v5","v6","v7",
-    "v8","v9","va","vb","vc","vd","ve","vf",
-    "w0","w1","w2","w3","w4","w5","w6","w7",
-    "w8","w9","wa","wb","wc","wd","we","wf",
+	HEX1("p"), HEX1("q"), HEX1("r"), HEX1("s"),
+	HEX1("t"), HEX1("u"), HEX1("v"), HEX1("w"),
     };
 #elif defined(_IBMESA)  /* AIX/ESA */
     static const char MasterDevice[] = "/dev/ptyp%s";
     static const char SlaveDevice[] = "/dev/ttyp%s";
     static const char deviceNo[][3] = {
-    "00","01","02","03","04","05","06","07","08","09","0a","0b","0c","0d","0e","0f",
-    "10","11","12","13","14","15","16","17","18","19","1a","1b","1c","1d","1e","1f",
-    "20","21","22","23","24","25","26","27","28","29","2a","2b","2c","2d","2e","2f",
-    "30","31","32","33","34","35","36","37","38","39","3a","3b","3c","3d","3e","3f",
-    "40","41","42","43","44","45","46","47","48","49","4a","4b","4c","4d","4e","4f",
-    "50","51","52","53","54","55","56","57","58","59","5a","5b","5c","5d","5e","5f",
-    "60","61","62","63","64","65","66","67","68","69","6a","6b","6c","6d","6e","6f",
-    "70","71","72","73","74","75","76","77","78","79","7a","7b","7c","7d","7e","7f",
-    "80","81","82","83","84","85","86","87","88","89","8a","8b","8c","8d","8e","8f",
-    "90","91","92","93","94","95","96","97","98","99","9a","9b","9c","9d","9e","9f",
-    "a0","a1","a2","a3","a4","a5","a6","a7","a8","a9","aa","ab","ac","ad","ae","af",
-    "b0","b1","b2","b3","b4","b5","b6","b7","b8","b9","ba","bb","bc","bd","be","bf",
-    "c0","c1","c2","c3","c4","c5","c6","c7","c8","c9","ca","cb","cc","cd","ce","cf",
-    "d0","d1","d2","d3","d4","d5","d6","d7","d8","d9","da","db","dc","dd","de","df",
-    "e0","e1","e2","e3","e4","e5","e6","e7","e8","e9","ea","eb","ec","ed","ee","ef",
-    "f0","f1","f2","f3","f4","f5","f6","f7","f8","f9","fa","fb","fc","fd","fe","ff",
+	HEX1("0"), HEX1("1"), HEX1("2"), HEX1("3"),
+	HEX1("4"), HEX1("5"), HEX1("6"), HEX1("7"),
+	HEX1("8"), HEX1("9"), HEX1("a"), HEX1("b"),
+	HEX1("c"), HEX1("d"), HEX1("e"), HEX1("f"),
     };
 #else /* 4.2BSD */
     static const char MasterDevice[] = "/dev/pty%s";
     static const char SlaveDevice[] = "/dev/tty%s";
     static const char deviceNo[][3] = {
-    "p0","p1","p2","p3","p4","p5","p6","p7",
-    "p8","p9","pa","pb","pc","pd","pe","pf",
-    "q0","q1","q2","q3","q4","q5","q6","q7",
-    "q8","q9","qa","qb","qc","qd","qe","qf",
-    "r0","r1","r2","r3","r4","r5","r6","r7",
-    "r8","r9","ra","rb","rc","rd","re","rf",
-    "s0","s1","s2","s3","s4","s5","s6","s7",
-    "s8","s9","sa","sb","sc","sd","se","sf",
+	HEX1("p"), HEX1("q"), HEX1("r"), HEX1("s"),
     };
 #endif
+#undef HEX1
     for (i = 0; i < numberof(deviceNo); i++) {
 	const char *const devno = deviceNo[i];
 	snprintf(MasterName, sizeof MasterName, MasterDevice, devno);
@@ -479,11 +464,11 @@ pty_close_pty(VALUE assoc)
 /*
  * call-seq:
  *   PTY.open => [master_io, slave_file]
- *   PTY.open {|master_io, slave_file| ... } => block value
+ *   PTY.open {|(master_io, slave_file)| ... } => block value
  *
  * Allocates a pty (pseudo-terminal).
  *
- * In the block form, yields two arguments <tt>master_io, slave_file</tt>
+ * In the block form, yields an array of two elements (<tt>master_io, slave_file</tt>)
  * and the value of the block is returned from +open+.
  *
  * The IO and File are both closed after the block completes if they haven't
@@ -547,8 +532,9 @@ pty_open(VALUE klass)
 }
 
 static VALUE
-pty_detach_process(struct pty_info *info)
+pty_detach_process(VALUE v)
 {
+    struct pty_info *info = (void *)v;
 #ifdef WNOHANG
     int st;
     if (rb_waitpid(info->child_pid, &st, WNOHANG) <= 0)
@@ -692,7 +678,7 @@ pty_check(int argc, VALUE *argv, VALUE self)
     if (!RTEST(exc)) return rb_last_status_get();
     raise_from_check(cpid, status);
 
-    UNREACHABLE;
+    UNREACHABLE_RETURN(Qnil);
 }
 
 static VALUE cPTY;
@@ -707,8 +693,8 @@ static VALUE cPTY;
 /*
  * Document-class: PTY
  *
- * Creates and managed pseudo terminals (PTYs).  See also
- * http://en.wikipedia.org/wiki/Pseudo_terminal
+ * Creates and manages pseudo terminals (PTYs).  See also
+ * https://en.wikipedia.org/wiki/Pseudo_terminal
  *
  * PTY allows you to allocate new terminals using ::open or ::spawn a new
  * terminal with a specific command.
diff --git a/ext/racc/cparse/README b/ext/racc/cparse/README
index 7771108b84..550e8d49fe 100644
--- a/ext/racc/cparse/README
+++ b/ext/racc/cparse/README
@@ -7,5 +7,5 @@ your own parser, you must get Racc full package.
 Get it from:
 
   - http://i.loveruby.net/en/projects/racc
-  - https://github.com/tenderlove/racc
+  - https://github.com/ruby/racc
 
diff --git a/ext/racc/cparse/cparse.c b/ext/racc/cparse/cparse.c
index b4429ed5f3..f71ed2bba9 100644
--- a/ext/racc/cparse/cparse.c
+++ b/ext/racc/cparse/cparse.c
@@ -11,7 +11,7 @@
 
 */
 
-#include "ruby/ruby.h"
+#include <ruby.h>
 
 #ifndef FALSE
 #define FALSE 0
@@ -24,7 +24,7 @@
                         Important Constants
 ----------------------------------------------------------------------- */
 
-#define RACC_VERSION "1.4.5"
+#define RACC_VERSION "1.4.15"
 
 #define DEFAULT_TOKEN -1
 #define ERROR_TOKEN    1
@@ -72,6 +72,10 @@ static ID id_d_e_pop;
 #  define LONG2NUM(i) INT2NUM(i)
 #endif
 
+#ifndef HAVE_RB_ARY_SUBSEQ
+#  define rb_ary_subseq(ary, beg, len) rb_ary_new4(len, RARRAY_PTR(ary) + beg)
+#endif
+
 static ID value_to_id _((VALUE v));
 static inline long num_to_long _((VALUE n));
 
@@ -208,7 +212,7 @@ static void extract_user_token _((struct cparse_params *v,
                                   VALUE block_args, VALUE *tok, VALUE *val));
 static void shift _((struct cparse_params* v, long act, VALUE tok, VALUE val));
 static int reduce _((struct cparse_params* v, long act));
-static VALUE reduce0 _((VALUE block_args, VALUE data, VALUE self));
+static rb_block_call_func reduce0;
 
 #ifdef DEBUG
 # define D_puts(msg)        if (v->sys_debug) puts(msg)
@@ -601,7 +605,7 @@ parse_main(struct cparse_params *v, VALUE tok, VALUE val, int resume)
   user_yyerror:
     if (v->errstatus == 3) {
         if (v->t == vFINAL_TOKEN) {
-            v->retval = Qfalse;
+            v->retval = Qnil;
             v->fin = CP_FIN_EOT;
             return;
         }
@@ -704,7 +708,7 @@ reduce(struct cparse_params *v, long act)
 }
 
 static VALUE
-reduce0(VALUE val, VALUE data, VALUE self)
+reduce0(RB_BLOCK_CALL_FUNC_ARGLIST(_, data))
 {
     struct cparse_params *v = rb_check_typeddata(data, &cparse_params_type);
     VALUE reduce_to, reduce_len, method_id;
@@ -815,14 +819,16 @@ reduce0(VALUE val, VALUE data, VALUE self)
 void
 Init_cparse(void)
 {
-#undef rb_intern
-#define rb_intern(str) rb_intern_const(str)
+#ifdef HAVE_RB_EXT_RACTOR_SAFE
+    rb_ext_ractor_safe(true);
+#endif
+
     VALUE Racc, Parser;
-    ID id_racc = rb_intern("Racc");
+    ID id_racc = rb_intern_const("Racc");
 
     if (rb_const_defined(rb_cObject, id_racc)) {
         Racc = rb_const_get(rb_cObject, id_racc);
-        Parser = rb_const_get_at(Racc, rb_intern("Parser"));
+        Parser = rb_const_get_at(Racc, rb_intern_const("Parser"));
     }
     else {
         Racc = rb_define_module("Racc");
@@ -842,16 +848,16 @@ Init_cparse(void)
 
     RaccBug = rb_eRuntimeError;
 
-    id_yydebug      = rb_intern("@yydebug");
-    id_nexttoken    = rb_intern("next_token");
-    id_onerror      = rb_intern("on_error");
-    id_noreduce     = rb_intern("_reduce_none");
-    id_errstatus    = rb_intern("@racc_error_status");
-
-    id_d_shift       = rb_intern("racc_shift");
-    id_d_reduce      = rb_intern("racc_reduce");
-    id_d_accept      = rb_intern("racc_accept");
-    id_d_read_token  = rb_intern("racc_read_token");
-    id_d_next_state  = rb_intern("racc_next_state");
-    id_d_e_pop       = rb_intern("racc_e_pop");
+    id_yydebug      = rb_intern_const("@yydebug");
+    id_nexttoken    = rb_intern_const("next_token");
+    id_onerror      = rb_intern_const("on_error");
+    id_noreduce     = rb_intern_const("_reduce_none");
+    id_errstatus    = rb_intern_const("@racc_error_status");
+
+    id_d_shift       = rb_intern_const("racc_shift");
+    id_d_reduce      = rb_intern_const("racc_reduce");
+    id_d_accept      = rb_intern_const("racc_accept");
+    id_d_read_token  = rb_intern_const("racc_read_token");
+    id_d_next_state  = rb_intern_const("racc_next_state");
+    id_d_e_pop       = rb_intern_const("racc_e_pop");
 }
diff --git a/ext/racc/cparse/depend b/ext/racc/cparse/depend
new file mode 100644
index 0000000000..97d8445764
--- /dev/null
+++ b/ext/racc/cparse/depend
@@ -0,0 +1,163 @@
+# AUTOGENERATED DEPENDENCIES START
+cparse.o: $(RUBY_EXTCONF_H)
+cparse.o: $(arch_hdrdir)/ruby/config.h
+cparse.o: $(hdrdir)/ruby.h
+cparse.o: $(hdrdir)/ruby/internal/anyargs.h
+cparse.o: $(hdrdir)/ruby/internal/arithmetic.h
+cparse.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+cparse.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+cparse.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+cparse.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+cparse.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+cparse.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+cparse.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+cparse.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+cparse.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+cparse.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+cparse.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+cparse.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+cparse.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+cparse.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+cparse.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+cparse.o: $(hdrdir)/ruby/internal/assume.h
+cparse.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+cparse.o: $(hdrdir)/ruby/internal/attr/artificial.h
+cparse.o: $(hdrdir)/ruby/internal/attr/cold.h
+cparse.o: $(hdrdir)/ruby/internal/attr/const.h
+cparse.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+cparse.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+cparse.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+cparse.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+cparse.o: $(hdrdir)/ruby/internal/attr/error.h
+cparse.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+cparse.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+cparse.o: $(hdrdir)/ruby/internal/attr/format.h
+cparse.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+cparse.o: $(hdrdir)/ruby/internal/attr/noalias.h
+cparse.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+cparse.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+cparse.o: $(hdrdir)/ruby/internal/attr/noinline.h
+cparse.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+cparse.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+cparse.o: $(hdrdir)/ruby/internal/attr/pure.h
+cparse.o: $(hdrdir)/ruby/internal/attr/restrict.h
+cparse.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+cparse.o: $(hdrdir)/ruby/internal/attr/warning.h
+cparse.o: $(hdrdir)/ruby/internal/attr/weakref.h
+cparse.o: $(hdrdir)/ruby/internal/cast.h
+cparse.o: $(hdrdir)/ruby/internal/compiler_is.h
+cparse.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+cparse.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+cparse.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+cparse.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+cparse.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+cparse.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+cparse.o: $(hdrdir)/ruby/internal/compiler_since.h
+cparse.o: $(hdrdir)/ruby/internal/config.h
+cparse.o: $(hdrdir)/ruby/internal/constant_p.h
+cparse.o: $(hdrdir)/ruby/internal/core.h
+cparse.o: $(hdrdir)/ruby/internal/core/rarray.h
+cparse.o: $(hdrdir)/ruby/internal/core/rbasic.h
+cparse.o: $(hdrdir)/ruby/internal/core/rbignum.h
+cparse.o: $(hdrdir)/ruby/internal/core/rclass.h
+cparse.o: $(hdrdir)/ruby/internal/core/rdata.h
+cparse.o: $(hdrdir)/ruby/internal/core/rfile.h
+cparse.o: $(hdrdir)/ruby/internal/core/rhash.h
+cparse.o: $(hdrdir)/ruby/internal/core/robject.h
+cparse.o: $(hdrdir)/ruby/internal/core/rregexp.h
+cparse.o: $(hdrdir)/ruby/internal/core/rstring.h
+cparse.o: $(hdrdir)/ruby/internal/core/rstruct.h
+cparse.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+cparse.o: $(hdrdir)/ruby/internal/ctype.h
+cparse.o: $(hdrdir)/ruby/internal/dllexport.h
+cparse.o: $(hdrdir)/ruby/internal/dosish.h
+cparse.o: $(hdrdir)/ruby/internal/error.h
+cparse.o: $(hdrdir)/ruby/internal/eval.h
+cparse.o: $(hdrdir)/ruby/internal/event.h
+cparse.o: $(hdrdir)/ruby/internal/fl_type.h
+cparse.o: $(hdrdir)/ruby/internal/gc.h
+cparse.o: $(hdrdir)/ruby/internal/glob.h
+cparse.o: $(hdrdir)/ruby/internal/globals.h
+cparse.o: $(hdrdir)/ruby/internal/has/attribute.h
+cparse.o: $(hdrdir)/ruby/internal/has/builtin.h
+cparse.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+cparse.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+cparse.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+cparse.o: $(hdrdir)/ruby/internal/has/extension.h
+cparse.o: $(hdrdir)/ruby/internal/has/feature.h
+cparse.o: $(hdrdir)/ruby/internal/has/warning.h
+cparse.o: $(hdrdir)/ruby/internal/intern/array.h
+cparse.o: $(hdrdir)/ruby/internal/intern/bignum.h
+cparse.o: $(hdrdir)/ruby/internal/intern/class.h
+cparse.o: $(hdrdir)/ruby/internal/intern/compar.h
+cparse.o: $(hdrdir)/ruby/internal/intern/complex.h
+cparse.o: $(hdrdir)/ruby/internal/intern/cont.h
+cparse.o: $(hdrdir)/ruby/internal/intern/dir.h
+cparse.o: $(hdrdir)/ruby/internal/intern/enum.h
+cparse.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+cparse.o: $(hdrdir)/ruby/internal/intern/error.h
+cparse.o: $(hdrdir)/ruby/internal/intern/eval.h
+cparse.o: $(hdrdir)/ruby/internal/intern/file.h
+cparse.o: $(hdrdir)/ruby/internal/intern/gc.h
+cparse.o: $(hdrdir)/ruby/internal/intern/hash.h
+cparse.o: $(hdrdir)/ruby/internal/intern/io.h
+cparse.o: $(hdrdir)/ruby/internal/intern/load.h
+cparse.o: $(hdrdir)/ruby/internal/intern/marshal.h
+cparse.o: $(hdrdir)/ruby/internal/intern/numeric.h
+cparse.o: $(hdrdir)/ruby/internal/intern/object.h
+cparse.o: $(hdrdir)/ruby/internal/intern/parse.h
+cparse.o: $(hdrdir)/ruby/internal/intern/proc.h
+cparse.o: $(hdrdir)/ruby/internal/intern/process.h
+cparse.o: $(hdrdir)/ruby/internal/intern/random.h
+cparse.o: $(hdrdir)/ruby/internal/intern/range.h
+cparse.o: $(hdrdir)/ruby/internal/intern/rational.h
+cparse.o: $(hdrdir)/ruby/internal/intern/re.h
+cparse.o: $(hdrdir)/ruby/internal/intern/ruby.h
+cparse.o: $(hdrdir)/ruby/internal/intern/select.h
+cparse.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+cparse.o: $(hdrdir)/ruby/internal/intern/signal.h
+cparse.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+cparse.o: $(hdrdir)/ruby/internal/intern/string.h
+cparse.o: $(hdrdir)/ruby/internal/intern/struct.h
+cparse.o: $(hdrdir)/ruby/internal/intern/thread.h
+cparse.o: $(hdrdir)/ruby/internal/intern/time.h
+cparse.o: $(hdrdir)/ruby/internal/intern/variable.h
+cparse.o: $(hdrdir)/ruby/internal/intern/vm.h
+cparse.o: $(hdrdir)/ruby/internal/interpreter.h
+cparse.o: $(hdrdir)/ruby/internal/iterator.h
+cparse.o: $(hdrdir)/ruby/internal/memory.h
+cparse.o: $(hdrdir)/ruby/internal/method.h
+cparse.o: $(hdrdir)/ruby/internal/module.h
+cparse.o: $(hdrdir)/ruby/internal/newobj.h
+cparse.o: $(hdrdir)/ruby/internal/rgengc.h
+cparse.o: $(hdrdir)/ruby/internal/scan_args.h
+cparse.o: $(hdrdir)/ruby/internal/special_consts.h
+cparse.o: $(hdrdir)/ruby/internal/static_assert.h
+cparse.o: $(hdrdir)/ruby/internal/stdalign.h
+cparse.o: $(hdrdir)/ruby/internal/stdbool.h
+cparse.o: $(hdrdir)/ruby/internal/symbol.h
+cparse.o: $(hdrdir)/ruby/internal/token_paste.h
+cparse.o: $(hdrdir)/ruby/internal/value.h
+cparse.o: $(hdrdir)/ruby/internal/value_type.h
+cparse.o: $(hdrdir)/ruby/internal/variable.h
+cparse.o: $(hdrdir)/ruby/internal/warning_push.h
+cparse.o: $(hdrdir)/ruby/internal/xmalloc.h
+cparse.o: $(hdrdir)/ruby/assert.h
+cparse.o: $(hdrdir)/ruby/backward.h
+cparse.o: $(hdrdir)/ruby/backward/2/assume.h
+cparse.o: $(hdrdir)/ruby/backward/2/attributes.h
+cparse.o: $(hdrdir)/ruby/backward/2/bool.h
+cparse.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+cparse.o: $(hdrdir)/ruby/backward/2/inttypes.h
+cparse.o: $(hdrdir)/ruby/backward/2/limits.h
+cparse.o: $(hdrdir)/ruby/backward/2/long_long.h
+cparse.o: $(hdrdir)/ruby/backward/2/stdalign.h
+cparse.o: $(hdrdir)/ruby/backward/2/stdarg.h
+cparse.o: $(hdrdir)/ruby/defines.h
+cparse.o: $(hdrdir)/ruby/intern.h
+cparse.o: $(hdrdir)/ruby/missing.h
+cparse.o: $(hdrdir)/ruby/ruby.h
+cparse.o: $(hdrdir)/ruby/st.h
+cparse.o: $(hdrdir)/ruby/subst.h
+cparse.o: cparse.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/racc/cparse/extconf.rb b/ext/racc/cparse/extconf.rb
index dfddf57111..3b4f594b9d 100644
--- a/ext/racc/cparse/extconf.rb
+++ b/ext/racc/cparse/extconf.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: false
-# $Id$
+#
 
 require 'mkmf'
-have_func('rb_block_call', 'ruby/ruby.h')
+
+have_func('rb_ary_subseq')
+
 create_makefile 'racc/cparse'
diff --git a/ext/rbconfig/sizeof/depend b/ext/rbconfig/sizeof/depend
index 589837bee7..09b62961c0 100644
--- a/ext/rbconfig/sizeof/depend
+++ b/ext/rbconfig/sizeof/depend
@@ -1,16 +1,332 @@
+# sources
+
+limits.c: $(top_srcdir)/tool/generic_erb.rb $(top_srcdir)/template/limits.c.tmpl
+	$(Q) $(RUBY) $(top_srcdir)/tool/generic_erb.rb --output=$@ \
+		$(top_srcdir)/template/limits.c.tmpl \
+
 sizes.c: $(top_srcdir)/tool/generic_erb.rb \
 		   $(top_srcdir)/template/sizes.c.tmpl \
-		   $(top_srcdir)/configure.in \
+		   $(top_srcdir)/configure.ac \
 		   $(top_srcdir)/ext/rbconfig/sizeof/extconf.rb
 	$(Q) $(RUBY) $(top_srcdir)/tool/generic_erb.rb --output=$@ \
 		$(top_srcdir)/template/sizes.c.tmpl \
-                $(top_srcdir)/configure.in \
-                $(top_srcdir)/ext/rbconfig/sizeof/extconf.rb
+		$(top_srcdir)/configure.ac \
+		$(top_srcdir)/ext/rbconfig/sizeof/extconf.rb
 
 # AUTOGENERATED DEPENDENCIES START
+limits.o: $(RUBY_EXTCONF_H)
+limits.o: $(arch_hdrdir)/ruby/config.h
+limits.o: $(hdrdir)/ruby/internal/anyargs.h
+limits.o: $(hdrdir)/ruby/internal/arithmetic.h
+limits.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+limits.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+limits.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+limits.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+limits.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+limits.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+limits.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+limits.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+limits.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+limits.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+limits.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+limits.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+limits.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+limits.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+limits.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+limits.o: $(hdrdir)/ruby/internal/assume.h
+limits.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+limits.o: $(hdrdir)/ruby/internal/attr/artificial.h
+limits.o: $(hdrdir)/ruby/internal/attr/cold.h
+limits.o: $(hdrdir)/ruby/internal/attr/const.h
+limits.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+limits.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+limits.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+limits.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+limits.o: $(hdrdir)/ruby/internal/attr/error.h
+limits.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+limits.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+limits.o: $(hdrdir)/ruby/internal/attr/format.h
+limits.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+limits.o: $(hdrdir)/ruby/internal/attr/noalias.h
+limits.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+limits.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+limits.o: $(hdrdir)/ruby/internal/attr/noinline.h
+limits.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+limits.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+limits.o: $(hdrdir)/ruby/internal/attr/pure.h
+limits.o: $(hdrdir)/ruby/internal/attr/restrict.h
+limits.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+limits.o: $(hdrdir)/ruby/internal/attr/warning.h
+limits.o: $(hdrdir)/ruby/internal/attr/weakref.h
+limits.o: $(hdrdir)/ruby/internal/cast.h
+limits.o: $(hdrdir)/ruby/internal/compiler_is.h
+limits.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+limits.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+limits.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+limits.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+limits.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+limits.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+limits.o: $(hdrdir)/ruby/internal/compiler_since.h
+limits.o: $(hdrdir)/ruby/internal/config.h
+limits.o: $(hdrdir)/ruby/internal/constant_p.h
+limits.o: $(hdrdir)/ruby/internal/core.h
+limits.o: $(hdrdir)/ruby/internal/core/rarray.h
+limits.o: $(hdrdir)/ruby/internal/core/rbasic.h
+limits.o: $(hdrdir)/ruby/internal/core/rbignum.h
+limits.o: $(hdrdir)/ruby/internal/core/rclass.h
+limits.o: $(hdrdir)/ruby/internal/core/rdata.h
+limits.o: $(hdrdir)/ruby/internal/core/rfile.h
+limits.o: $(hdrdir)/ruby/internal/core/rhash.h
+limits.o: $(hdrdir)/ruby/internal/core/robject.h
+limits.o: $(hdrdir)/ruby/internal/core/rregexp.h
+limits.o: $(hdrdir)/ruby/internal/core/rstring.h
+limits.o: $(hdrdir)/ruby/internal/core/rstruct.h
+limits.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+limits.o: $(hdrdir)/ruby/internal/ctype.h
+limits.o: $(hdrdir)/ruby/internal/dllexport.h
+limits.o: $(hdrdir)/ruby/internal/dosish.h
+limits.o: $(hdrdir)/ruby/internal/error.h
+limits.o: $(hdrdir)/ruby/internal/eval.h
+limits.o: $(hdrdir)/ruby/internal/event.h
+limits.o: $(hdrdir)/ruby/internal/fl_type.h
+limits.o: $(hdrdir)/ruby/internal/gc.h
+limits.o: $(hdrdir)/ruby/internal/glob.h
+limits.o: $(hdrdir)/ruby/internal/globals.h
+limits.o: $(hdrdir)/ruby/internal/has/attribute.h
+limits.o: $(hdrdir)/ruby/internal/has/builtin.h
+limits.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+limits.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+limits.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+limits.o: $(hdrdir)/ruby/internal/has/extension.h
+limits.o: $(hdrdir)/ruby/internal/has/feature.h
+limits.o: $(hdrdir)/ruby/internal/has/warning.h
+limits.o: $(hdrdir)/ruby/internal/intern/array.h
+limits.o: $(hdrdir)/ruby/internal/intern/bignum.h
+limits.o: $(hdrdir)/ruby/internal/intern/class.h
+limits.o: $(hdrdir)/ruby/internal/intern/compar.h
+limits.o: $(hdrdir)/ruby/internal/intern/complex.h
+limits.o: $(hdrdir)/ruby/internal/intern/cont.h
+limits.o: $(hdrdir)/ruby/internal/intern/dir.h
+limits.o: $(hdrdir)/ruby/internal/intern/enum.h
+limits.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+limits.o: $(hdrdir)/ruby/internal/intern/error.h
+limits.o: $(hdrdir)/ruby/internal/intern/eval.h
+limits.o: $(hdrdir)/ruby/internal/intern/file.h
+limits.o: $(hdrdir)/ruby/internal/intern/gc.h
+limits.o: $(hdrdir)/ruby/internal/intern/hash.h
+limits.o: $(hdrdir)/ruby/internal/intern/io.h
+limits.o: $(hdrdir)/ruby/internal/intern/load.h
+limits.o: $(hdrdir)/ruby/internal/intern/marshal.h
+limits.o: $(hdrdir)/ruby/internal/intern/numeric.h
+limits.o: $(hdrdir)/ruby/internal/intern/object.h
+limits.o: $(hdrdir)/ruby/internal/intern/parse.h
+limits.o: $(hdrdir)/ruby/internal/intern/proc.h
+limits.o: $(hdrdir)/ruby/internal/intern/process.h
+limits.o: $(hdrdir)/ruby/internal/intern/random.h
+limits.o: $(hdrdir)/ruby/internal/intern/range.h
+limits.o: $(hdrdir)/ruby/internal/intern/rational.h
+limits.o: $(hdrdir)/ruby/internal/intern/re.h
+limits.o: $(hdrdir)/ruby/internal/intern/ruby.h
+limits.o: $(hdrdir)/ruby/internal/intern/select.h
+limits.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+limits.o: $(hdrdir)/ruby/internal/intern/signal.h
+limits.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+limits.o: $(hdrdir)/ruby/internal/intern/string.h
+limits.o: $(hdrdir)/ruby/internal/intern/struct.h
+limits.o: $(hdrdir)/ruby/internal/intern/thread.h
+limits.o: $(hdrdir)/ruby/internal/intern/time.h
+limits.o: $(hdrdir)/ruby/internal/intern/variable.h
+limits.o: $(hdrdir)/ruby/internal/intern/vm.h
+limits.o: $(hdrdir)/ruby/internal/interpreter.h
+limits.o: $(hdrdir)/ruby/internal/iterator.h
+limits.o: $(hdrdir)/ruby/internal/memory.h
+limits.o: $(hdrdir)/ruby/internal/method.h
+limits.o: $(hdrdir)/ruby/internal/module.h
+limits.o: $(hdrdir)/ruby/internal/newobj.h
+limits.o: $(hdrdir)/ruby/internal/rgengc.h
+limits.o: $(hdrdir)/ruby/internal/scan_args.h
+limits.o: $(hdrdir)/ruby/internal/special_consts.h
+limits.o: $(hdrdir)/ruby/internal/static_assert.h
+limits.o: $(hdrdir)/ruby/internal/stdalign.h
+limits.o: $(hdrdir)/ruby/internal/stdbool.h
+limits.o: $(hdrdir)/ruby/internal/symbol.h
+limits.o: $(hdrdir)/ruby/internal/token_paste.h
+limits.o: $(hdrdir)/ruby/internal/value.h
+limits.o: $(hdrdir)/ruby/internal/value_type.h
+limits.o: $(hdrdir)/ruby/internal/variable.h
+limits.o: $(hdrdir)/ruby/internal/warning_push.h
+limits.o: $(hdrdir)/ruby/internal/xmalloc.h
+limits.o: $(hdrdir)/ruby/assert.h
+limits.o: $(hdrdir)/ruby/backward.h
+limits.o: $(hdrdir)/ruby/backward/2/assume.h
+limits.o: $(hdrdir)/ruby/backward/2/attributes.h
+limits.o: $(hdrdir)/ruby/backward/2/bool.h
+limits.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+limits.o: $(hdrdir)/ruby/backward/2/inttypes.h
+limits.o: $(hdrdir)/ruby/backward/2/limits.h
+limits.o: $(hdrdir)/ruby/backward/2/long_long.h
+limits.o: $(hdrdir)/ruby/backward/2/stdalign.h
+limits.o: $(hdrdir)/ruby/backward/2/stdarg.h
+limits.o: $(hdrdir)/ruby/defines.h
+limits.o: $(hdrdir)/ruby/intern.h
+limits.o: $(hdrdir)/ruby/missing.h
+limits.o: $(hdrdir)/ruby/ruby.h
+limits.o: $(hdrdir)/ruby/st.h
+limits.o: $(hdrdir)/ruby/subst.h
+limits.o: limits.c
 sizes.o: $(RUBY_EXTCONF_H)
 sizes.o: $(arch_hdrdir)/ruby/config.h
+sizes.o: $(hdrdir)/ruby/internal/anyargs.h
+sizes.o: $(hdrdir)/ruby/internal/arithmetic.h
+sizes.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+sizes.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+sizes.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+sizes.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+sizes.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+sizes.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+sizes.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+sizes.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+sizes.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+sizes.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+sizes.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+sizes.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+sizes.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+sizes.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+sizes.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+sizes.o: $(hdrdir)/ruby/internal/assume.h
+sizes.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+sizes.o: $(hdrdir)/ruby/internal/attr/artificial.h
+sizes.o: $(hdrdir)/ruby/internal/attr/cold.h
+sizes.o: $(hdrdir)/ruby/internal/attr/const.h
+sizes.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+sizes.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+sizes.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+sizes.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+sizes.o: $(hdrdir)/ruby/internal/attr/error.h
+sizes.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+sizes.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+sizes.o: $(hdrdir)/ruby/internal/attr/format.h
+sizes.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+sizes.o: $(hdrdir)/ruby/internal/attr/noalias.h
+sizes.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+sizes.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+sizes.o: $(hdrdir)/ruby/internal/attr/noinline.h
+sizes.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+sizes.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+sizes.o: $(hdrdir)/ruby/internal/attr/pure.h
+sizes.o: $(hdrdir)/ruby/internal/attr/restrict.h
+sizes.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+sizes.o: $(hdrdir)/ruby/internal/attr/warning.h
+sizes.o: $(hdrdir)/ruby/internal/attr/weakref.h
+sizes.o: $(hdrdir)/ruby/internal/cast.h
+sizes.o: $(hdrdir)/ruby/internal/compiler_is.h
+sizes.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+sizes.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+sizes.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+sizes.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+sizes.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+sizes.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+sizes.o: $(hdrdir)/ruby/internal/compiler_since.h
+sizes.o: $(hdrdir)/ruby/internal/config.h
+sizes.o: $(hdrdir)/ruby/internal/constant_p.h
+sizes.o: $(hdrdir)/ruby/internal/core.h
+sizes.o: $(hdrdir)/ruby/internal/core/rarray.h
+sizes.o: $(hdrdir)/ruby/internal/core/rbasic.h
+sizes.o: $(hdrdir)/ruby/internal/core/rbignum.h
+sizes.o: $(hdrdir)/ruby/internal/core/rclass.h
+sizes.o: $(hdrdir)/ruby/internal/core/rdata.h
+sizes.o: $(hdrdir)/ruby/internal/core/rfile.h
+sizes.o: $(hdrdir)/ruby/internal/core/rhash.h
+sizes.o: $(hdrdir)/ruby/internal/core/robject.h
+sizes.o: $(hdrdir)/ruby/internal/core/rregexp.h
+sizes.o: $(hdrdir)/ruby/internal/core/rstring.h
+sizes.o: $(hdrdir)/ruby/internal/core/rstruct.h
+sizes.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+sizes.o: $(hdrdir)/ruby/internal/ctype.h
+sizes.o: $(hdrdir)/ruby/internal/dllexport.h
+sizes.o: $(hdrdir)/ruby/internal/dosish.h
+sizes.o: $(hdrdir)/ruby/internal/error.h
+sizes.o: $(hdrdir)/ruby/internal/eval.h
+sizes.o: $(hdrdir)/ruby/internal/event.h
+sizes.o: $(hdrdir)/ruby/internal/fl_type.h
+sizes.o: $(hdrdir)/ruby/internal/gc.h
+sizes.o: $(hdrdir)/ruby/internal/glob.h
+sizes.o: $(hdrdir)/ruby/internal/globals.h
+sizes.o: $(hdrdir)/ruby/internal/has/attribute.h
+sizes.o: $(hdrdir)/ruby/internal/has/builtin.h
+sizes.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+sizes.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+sizes.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+sizes.o: $(hdrdir)/ruby/internal/has/extension.h
+sizes.o: $(hdrdir)/ruby/internal/has/feature.h
+sizes.o: $(hdrdir)/ruby/internal/has/warning.h
+sizes.o: $(hdrdir)/ruby/internal/intern/array.h
+sizes.o: $(hdrdir)/ruby/internal/intern/bignum.h
+sizes.o: $(hdrdir)/ruby/internal/intern/class.h
+sizes.o: $(hdrdir)/ruby/internal/intern/compar.h
+sizes.o: $(hdrdir)/ruby/internal/intern/complex.h
+sizes.o: $(hdrdir)/ruby/internal/intern/cont.h
+sizes.o: $(hdrdir)/ruby/internal/intern/dir.h
+sizes.o: $(hdrdir)/ruby/internal/intern/enum.h
+sizes.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+sizes.o: $(hdrdir)/ruby/internal/intern/error.h
+sizes.o: $(hdrdir)/ruby/internal/intern/eval.h
+sizes.o: $(hdrdir)/ruby/internal/intern/file.h
+sizes.o: $(hdrdir)/ruby/internal/intern/gc.h
+sizes.o: $(hdrdir)/ruby/internal/intern/hash.h
+sizes.o: $(hdrdir)/ruby/internal/intern/io.h
+sizes.o: $(hdrdir)/ruby/internal/intern/load.h
+sizes.o: $(hdrdir)/ruby/internal/intern/marshal.h
+sizes.o: $(hdrdir)/ruby/internal/intern/numeric.h
+sizes.o: $(hdrdir)/ruby/internal/intern/object.h
+sizes.o: $(hdrdir)/ruby/internal/intern/parse.h
+sizes.o: $(hdrdir)/ruby/internal/intern/proc.h
+sizes.o: $(hdrdir)/ruby/internal/intern/process.h
+sizes.o: $(hdrdir)/ruby/internal/intern/random.h
+sizes.o: $(hdrdir)/ruby/internal/intern/range.h
+sizes.o: $(hdrdir)/ruby/internal/intern/rational.h
+sizes.o: $(hdrdir)/ruby/internal/intern/re.h
+sizes.o: $(hdrdir)/ruby/internal/intern/ruby.h
+sizes.o: $(hdrdir)/ruby/internal/intern/select.h
+sizes.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+sizes.o: $(hdrdir)/ruby/internal/intern/signal.h
+sizes.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+sizes.o: $(hdrdir)/ruby/internal/intern/string.h
+sizes.o: $(hdrdir)/ruby/internal/intern/struct.h
+sizes.o: $(hdrdir)/ruby/internal/intern/thread.h
+sizes.o: $(hdrdir)/ruby/internal/intern/time.h
+sizes.o: $(hdrdir)/ruby/internal/intern/variable.h
+sizes.o: $(hdrdir)/ruby/internal/intern/vm.h
+sizes.o: $(hdrdir)/ruby/internal/interpreter.h
+sizes.o: $(hdrdir)/ruby/internal/iterator.h
+sizes.o: $(hdrdir)/ruby/internal/memory.h
+sizes.o: $(hdrdir)/ruby/internal/method.h
+sizes.o: $(hdrdir)/ruby/internal/module.h
+sizes.o: $(hdrdir)/ruby/internal/newobj.h
+sizes.o: $(hdrdir)/ruby/internal/rgengc.h
+sizes.o: $(hdrdir)/ruby/internal/scan_args.h
+sizes.o: $(hdrdir)/ruby/internal/special_consts.h
+sizes.o: $(hdrdir)/ruby/internal/static_assert.h
+sizes.o: $(hdrdir)/ruby/internal/stdalign.h
+sizes.o: $(hdrdir)/ruby/internal/stdbool.h
+sizes.o: $(hdrdir)/ruby/internal/symbol.h
+sizes.o: $(hdrdir)/ruby/internal/token_paste.h
+sizes.o: $(hdrdir)/ruby/internal/value.h
+sizes.o: $(hdrdir)/ruby/internal/value_type.h
+sizes.o: $(hdrdir)/ruby/internal/variable.h
+sizes.o: $(hdrdir)/ruby/internal/warning_push.h
+sizes.o: $(hdrdir)/ruby/internal/xmalloc.h
+sizes.o: $(hdrdir)/ruby/assert.h
 sizes.o: $(hdrdir)/ruby/backward.h
+sizes.o: $(hdrdir)/ruby/backward/2/assume.h
+sizes.o: $(hdrdir)/ruby/backward/2/attributes.h
+sizes.o: $(hdrdir)/ruby/backward/2/bool.h
+sizes.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+sizes.o: $(hdrdir)/ruby/backward/2/inttypes.h
+sizes.o: $(hdrdir)/ruby/backward/2/limits.h
+sizes.o: $(hdrdir)/ruby/backward/2/long_long.h
+sizes.o: $(hdrdir)/ruby/backward/2/stdalign.h
+sizes.o: $(hdrdir)/ruby/backward/2/stdarg.h
 sizes.o: $(hdrdir)/ruby/defines.h
 sizes.o: $(hdrdir)/ruby/intern.h
 sizes.o: $(hdrdir)/ruby/missing.h
diff --git a/ext/rbconfig/sizeof/extconf.rb b/ext/rbconfig/sizeof/extconf.rb
index 8cb16ca866..f7cd58f2d9 100644
--- a/ext/rbconfig/sizeof/extconf.rb
+++ b/ext/rbconfig/sizeof/extconf.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-$srcs = %w[sizes.c]
+$srcs = %w[sizes.c limits.c]
 $distcleanfiles.concat($srcs)
 
 have_type('int_least8_t')
diff --git a/ext/readline/.gitignore b/ext/readline/.gitignore
new file mode 100644
index 0000000000..3d372989ae
--- /dev/null
+++ b/ext/readline/.gitignore
@@ -0,0 +1 @@
+/readline-[1-9]*.*
diff --git a/ext/readline/depend b/ext/readline/depend
index eb05e65727..a6ad681cd0 100644
--- a/ext/readline/depend
+++ b/ext/readline/depend
@@ -1,18 +1,167 @@
 # AUTOGENERATED DEPENDENCIES START
 readline.o: $(RUBY_EXTCONF_H)
 readline.o: $(arch_hdrdir)/ruby/config.h
+readline.o: $(hdrdir)/ruby/assert.h
 readline.o: $(hdrdir)/ruby/backward.h
+readline.o: $(hdrdir)/ruby/backward/2/assume.h
+readline.o: $(hdrdir)/ruby/backward/2/attributes.h
+readline.o: $(hdrdir)/ruby/backward/2/bool.h
+readline.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+readline.o: $(hdrdir)/ruby/backward/2/inttypes.h
+readline.o: $(hdrdir)/ruby/backward/2/limits.h
+readline.o: $(hdrdir)/ruby/backward/2/long_long.h
+readline.o: $(hdrdir)/ruby/backward/2/stdalign.h
+readline.o: $(hdrdir)/ruby/backward/2/stdarg.h
 readline.o: $(hdrdir)/ruby/defines.h
 readline.o: $(hdrdir)/ruby/encoding.h
 readline.o: $(hdrdir)/ruby/intern.h
+readline.o: $(hdrdir)/ruby/internal/anyargs.h
+readline.o: $(hdrdir)/ruby/internal/arithmetic.h
+readline.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+readline.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+readline.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+readline.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+readline.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+readline.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+readline.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+readline.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+readline.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+readline.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+readline.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+readline.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+readline.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+readline.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+readline.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+readline.o: $(hdrdir)/ruby/internal/assume.h
+readline.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+readline.o: $(hdrdir)/ruby/internal/attr/artificial.h
+readline.o: $(hdrdir)/ruby/internal/attr/cold.h
+readline.o: $(hdrdir)/ruby/internal/attr/const.h
+readline.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+readline.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+readline.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+readline.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+readline.o: $(hdrdir)/ruby/internal/attr/error.h
+readline.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+readline.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+readline.o: $(hdrdir)/ruby/internal/attr/format.h
+readline.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+readline.o: $(hdrdir)/ruby/internal/attr/noalias.h
+readline.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+readline.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+readline.o: $(hdrdir)/ruby/internal/attr/noinline.h
+readline.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+readline.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+readline.o: $(hdrdir)/ruby/internal/attr/pure.h
+readline.o: $(hdrdir)/ruby/internal/attr/restrict.h
+readline.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+readline.o: $(hdrdir)/ruby/internal/attr/warning.h
+readline.o: $(hdrdir)/ruby/internal/attr/weakref.h
+readline.o: $(hdrdir)/ruby/internal/cast.h
+readline.o: $(hdrdir)/ruby/internal/compiler_is.h
+readline.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+readline.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+readline.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+readline.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+readline.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+readline.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+readline.o: $(hdrdir)/ruby/internal/compiler_since.h
+readline.o: $(hdrdir)/ruby/internal/config.h
+readline.o: $(hdrdir)/ruby/internal/constant_p.h
+readline.o: $(hdrdir)/ruby/internal/core.h
+readline.o: $(hdrdir)/ruby/internal/core/rarray.h
+readline.o: $(hdrdir)/ruby/internal/core/rbasic.h
+readline.o: $(hdrdir)/ruby/internal/core/rbignum.h
+readline.o: $(hdrdir)/ruby/internal/core/rclass.h
+readline.o: $(hdrdir)/ruby/internal/core/rdata.h
+readline.o: $(hdrdir)/ruby/internal/core/rfile.h
+readline.o: $(hdrdir)/ruby/internal/core/rhash.h
+readline.o: $(hdrdir)/ruby/internal/core/robject.h
+readline.o: $(hdrdir)/ruby/internal/core/rregexp.h
+readline.o: $(hdrdir)/ruby/internal/core/rstring.h
+readline.o: $(hdrdir)/ruby/internal/core/rstruct.h
+readline.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+readline.o: $(hdrdir)/ruby/internal/ctype.h
+readline.o: $(hdrdir)/ruby/internal/dllexport.h
+readline.o: $(hdrdir)/ruby/internal/dosish.h
+readline.o: $(hdrdir)/ruby/internal/error.h
+readline.o: $(hdrdir)/ruby/internal/eval.h
+readline.o: $(hdrdir)/ruby/internal/event.h
+readline.o: $(hdrdir)/ruby/internal/fl_type.h
+readline.o: $(hdrdir)/ruby/internal/gc.h
+readline.o: $(hdrdir)/ruby/internal/glob.h
+readline.o: $(hdrdir)/ruby/internal/globals.h
+readline.o: $(hdrdir)/ruby/internal/has/attribute.h
+readline.o: $(hdrdir)/ruby/internal/has/builtin.h
+readline.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+readline.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+readline.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+readline.o: $(hdrdir)/ruby/internal/has/extension.h
+readline.o: $(hdrdir)/ruby/internal/has/feature.h
+readline.o: $(hdrdir)/ruby/internal/has/warning.h
+readline.o: $(hdrdir)/ruby/internal/intern/array.h
+readline.o: $(hdrdir)/ruby/internal/intern/bignum.h
+readline.o: $(hdrdir)/ruby/internal/intern/class.h
+readline.o: $(hdrdir)/ruby/internal/intern/compar.h
+readline.o: $(hdrdir)/ruby/internal/intern/complex.h
+readline.o: $(hdrdir)/ruby/internal/intern/cont.h
+readline.o: $(hdrdir)/ruby/internal/intern/dir.h
+readline.o: $(hdrdir)/ruby/internal/intern/enum.h
+readline.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+readline.o: $(hdrdir)/ruby/internal/intern/error.h
+readline.o: $(hdrdir)/ruby/internal/intern/eval.h
+readline.o: $(hdrdir)/ruby/internal/intern/file.h
+readline.o: $(hdrdir)/ruby/internal/intern/gc.h
+readline.o: $(hdrdir)/ruby/internal/intern/hash.h
+readline.o: $(hdrdir)/ruby/internal/intern/io.h
+readline.o: $(hdrdir)/ruby/internal/intern/load.h
+readline.o: $(hdrdir)/ruby/internal/intern/marshal.h
+readline.o: $(hdrdir)/ruby/internal/intern/numeric.h
+readline.o: $(hdrdir)/ruby/internal/intern/object.h
+readline.o: $(hdrdir)/ruby/internal/intern/parse.h
+readline.o: $(hdrdir)/ruby/internal/intern/proc.h
+readline.o: $(hdrdir)/ruby/internal/intern/process.h
+readline.o: $(hdrdir)/ruby/internal/intern/random.h
+readline.o: $(hdrdir)/ruby/internal/intern/range.h
+readline.o: $(hdrdir)/ruby/internal/intern/rational.h
+readline.o: $(hdrdir)/ruby/internal/intern/re.h
+readline.o: $(hdrdir)/ruby/internal/intern/ruby.h
+readline.o: $(hdrdir)/ruby/internal/intern/select.h
+readline.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+readline.o: $(hdrdir)/ruby/internal/intern/signal.h
+readline.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+readline.o: $(hdrdir)/ruby/internal/intern/string.h
+readline.o: $(hdrdir)/ruby/internal/intern/struct.h
+readline.o: $(hdrdir)/ruby/internal/intern/thread.h
+readline.o: $(hdrdir)/ruby/internal/intern/time.h
+readline.o: $(hdrdir)/ruby/internal/intern/variable.h
+readline.o: $(hdrdir)/ruby/internal/intern/vm.h
+readline.o: $(hdrdir)/ruby/internal/interpreter.h
+readline.o: $(hdrdir)/ruby/internal/iterator.h
+readline.o: $(hdrdir)/ruby/internal/memory.h
+readline.o: $(hdrdir)/ruby/internal/method.h
+readline.o: $(hdrdir)/ruby/internal/module.h
+readline.o: $(hdrdir)/ruby/internal/newobj.h
+readline.o: $(hdrdir)/ruby/internal/rgengc.h
+readline.o: $(hdrdir)/ruby/internal/scan_args.h
+readline.o: $(hdrdir)/ruby/internal/special_consts.h
+readline.o: $(hdrdir)/ruby/internal/static_assert.h
+readline.o: $(hdrdir)/ruby/internal/stdalign.h
+readline.o: $(hdrdir)/ruby/internal/stdbool.h
+readline.o: $(hdrdir)/ruby/internal/symbol.h
+readline.o: $(hdrdir)/ruby/internal/token_paste.h
+readline.o: $(hdrdir)/ruby/internal/value.h
+readline.o: $(hdrdir)/ruby/internal/value_type.h
+readline.o: $(hdrdir)/ruby/internal/variable.h
+readline.o: $(hdrdir)/ruby/internal/warning_push.h
+readline.o: $(hdrdir)/ruby/internal/xmalloc.h
 readline.o: $(hdrdir)/ruby/io.h
 readline.o: $(hdrdir)/ruby/missing.h
+readline.o: $(hdrdir)/ruby/onigmo.h
 readline.o: $(hdrdir)/ruby/oniguruma.h
 readline.o: $(hdrdir)/ruby/ruby.h
 readline.o: $(hdrdir)/ruby/st.h
 readline.o: $(hdrdir)/ruby/subst.h
 readline.o: $(hdrdir)/ruby/thread.h
-readline.o: $(top_srcdir)/include/ruby.h
-readline.o: $(top_srcdir)/internal.h
 readline.o: readline.c
 # AUTOGENERATED DEPENDENCIES END
diff --git a/ext/readline/depend-gem b/ext/readline/depend-gem
new file mode 100644
index 0000000000..df01bd2a86
--- /dev/null
+++ b/ext/readline/depend-gem
@@ -0,0 +1,4 @@
+# AUTOGENERATED DEPENDENCIES START
+readline.o: $(RUBY_EXTCONF_H)
+readline.o: readline.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/readline/extconf.rb b/ext/readline/extconf.rb
index 776ab19ba8..d3e7872e65 100644
--- a/ext/readline/extconf.rb
+++ b/ext/readline/extconf.rb
@@ -59,7 +59,7 @@ else
             have_library("edit", "readline"))) ||
             (readline.have_header("editline/readline.h") &&
              have_library("edit", "readline"))
-    raise "readline nor libedit not found"
+    raise "Neither readline nor libedit was found"
   end
 end
 
@@ -71,6 +71,7 @@ readline.have_func("rl_completion_matches")
 readline.have_func("rl_refresh_line")
 readline.have_var("rl_deprep_term_function")
 readline.have_var("rl_completion_append_character")
+readline.have_var("rl_completion_quote_character")
 readline.have_var("rl_basic_word_break_characters")
 readline.have_var("rl_completer_word_break_characters")
 readline.have_var("rl_basic_quote_characters")
@@ -81,10 +82,11 @@ readline.have_var("rl_library_version")
 readline.have_var("rl_editing_mode")
 readline.have_var("rl_line_buffer")
 readline.have_var("rl_point")
+readline.have_var("rl_char_is_quoted_p")
 # workaround for native windows.
-/mswin|bccwin|mingw/ !~ RUBY_PLATFORM && readline.have_var("rl_event_hook")
-/mswin|bccwin|mingw/ !~ RUBY_PLATFORM && readline.have_var("rl_catch_sigwinch")
-/mswin|bccwin|mingw/ !~ RUBY_PLATFORM && readline.have_var("rl_catch_signals")
+/mswin|bccwin/ !~ RUBY_PLATFORM && readline.have_var("rl_event_hook")
+/mswin|bccwin/ !~ RUBY_PLATFORM && readline.have_var("rl_catch_sigwinch")
+/mswin|bccwin/ !~ RUBY_PLATFORM && readline.have_var("rl_catch_signals")
 readline.have_var("rl_pre_input_hook")
 readline.have_var("rl_special_prefixes")
 readline.have_func("rl_cleanup_after_signal")
@@ -107,5 +109,4 @@ unless readline.have_type("rl_hook_func_t*")
   $defs << "-Drl_hook_func_t=Function"
 end
 
-$INCFLAGS << " -I$(top_srcdir)"
 create_makefile("readline")
diff --git a/ext/readline/readline-ext.gemspec b/ext/readline/readline-ext.gemspec
new file mode 100644
index 0000000000..55dd591e1a
--- /dev/null
+++ b/ext/readline/readline-ext.gemspec
@@ -0,0 +1,26 @@
+Gem::Specification.new do |spec|
+  spec.name          = "readline-ext"
+  spec.version       = "0.1.1"
+  spec.authors       = ["Yukihiro Matsumoto"]
+  spec.email         = ["matz@ruby-lang.org"]
+
+  spec.summary       = %q{Provides an interface for GNU Readline and Edit Line (libedit).}
+  spec.description   = %q{Provides an interface for GNU Readline and Edit Line (libedit).}
+  spec.homepage      = "https://github.com/ruby/readline-ext"
+  spec.licenses      = ["Ruby", "BSD-2-Clause"]
+  spec.extensions    = %w[ext/readline/extconf.rb]
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z 2>/dev/null`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rake-compiler"
+end
diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index c3b98a8dc9..9f76f90e41 100644
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -33,7 +33,6 @@
 #include <editline/readline.h>
 #endif
 
-#include "internal.h"
 #include "ruby/io.h"
 #include "ruby/thread.h"
 
@@ -58,7 +57,11 @@ static VALUE mReadline;
 
 #define COMPLETION_PROC "completion_proc"
 #define COMPLETION_CASE_FOLD "completion_case_fold"
-static ID completion_proc, completion_case_fold;
+static ID id_call, completion_proc, completion_case_fold;
+#if defined HAVE_RL_CHAR_IS_QUOTED_P
+#define QUOTING_DETECTION_PROC "quoting_detection_proc"
+static ID quoting_detection_proc;
+#endif
 #if USE_INSERT_IGNORE_ESCAPE
 static ID id_orig_prompt, id_last_prompt;
 #endif
@@ -74,6 +77,8 @@ static ID id_special_prefixes;
 #endif
 #ifndef HAVE_RL_USERNAME_COMPLETION_FUNCTION
 # define rl_username_completion_function username_completion_function
+#else
+RUBY_EXTERN char *rl_username_completion_function(const char *, int);
 #endif
 #ifndef HAVE_RL_COMPLETION_MATCHES
 # define rl_completion_matches completion_matches
@@ -89,7 +94,7 @@ static char **readline_attempted_completion_function(const char *text,
                                                      int start, int end);
 
 #define OutputStringValue(str) do {\
-    SafeStringValue(str);\
+    StringValueCStr(str);\
     (str) = rb_str_conv_enc((str), rb_enc_get(str), rb_locale_encoding());\
 } while (0)\
 
@@ -132,6 +137,13 @@ static VALUE readline_outstream;
 static FILE *readline_rl_instream;
 static FILE *readline_rl_outstream;
 
+static void
+mustbe_callable(VALUE proc)
+{
+    if (!NIL_P(proc) && !rb_respond_to(proc, id_call))
+        rb_raise(rb_eArgError, "argument must respond to `call'");
+}
+
 #if defined HAVE_RL_GETC_FUNCTION
 
 #ifndef HAVE_RL_GETC
@@ -154,24 +166,25 @@ getc_body(struct getc_struct *p)
 #if defined(_WIN32)
     {
         INPUT_RECORD ir;
-        int n;
+        DWORD n;
         static int prior_key = '0';
         for (;;) {
+            HANDLE h;
             if (prior_key > 0xff) {
                 prior_key = rl_getc(p->input);
                 return prior_key;
             }
-            if (PeekConsoleInput((HANDLE)_get_osfhandle(p->fd), &ir, 1, &n)) {
+            h = (HANDLE)_get_osfhandle(p->fd);
+            if (PeekConsoleInput(h, &ir, 1, &n)) {
                 if (n == 1) {
                     if (ir.EventType == KEY_EVENT && ir.Event.KeyEvent.bKeyDown) {
                         prior_key = rl_getc(p->input);
                         return prior_key;
                     } else {
-                        ReadConsoleInput((HANDLE)_get_osfhandle(p->fd), &ir, 1, &n);
+                        ReadConsoleInput(h, &ir, 1, &n);
                     }
                 } else {
-                    HANDLE h = (HANDLE)_get_osfhandle(p->fd);
-                    rb_w32_wait_events(&h, 1, INFINITE);
+                    rb_w32_wait_events_blocking(&h, 1, INFINITE);
                 }
             } else {
                 break;
@@ -618,8 +631,7 @@ readline_s_set_output(VALUE self, VALUE output)
 static VALUE
 readline_s_set_pre_input_hook(VALUE self, VALUE proc)
 {
-    if (!NIL_P(proc) && !rb_respond_to(proc, rb_intern("call")))
-        rb_raise(rb_eArgError, "argument must respond to `call'");
+    mustbe_callable(proc);
     return rb_ivar_set(mReadline, id_pre_input_hook, proc);
 }
 
@@ -646,7 +658,7 @@ readline_pre_input_hook(void)
 
     proc = rb_attr_get(mReadline, id_pre_input_hook);
     if (!NIL_P(proc))
-        rb_funcall(proc, rb_intern("call"), 0);
+        rb_funcall(proc, id_call, 0);
     return 0;
 }
 #else
@@ -677,6 +689,17 @@ readline_s_insert_text(VALUE self, VALUE str)
 #endif
 
 #if defined(HAVE_RL_DELETE_TEXT)
+RUBY_EXTERN int rl_delete_text(int, int);
+static const char *
+str_subpos(const char *ptr, const char *end, long beg, long *sublen, rb_encoding *enc)
+{
+    VALUE str = rb_enc_str_new_static(ptr, end-ptr, enc);
+    OBJ_FREEZE(str);
+    ptr = rb_str_subpos(str, beg, sublen);
+    rb_gc_force_recycle(str);
+    return ptr;
+}
+
 /*
  * call-seq:
  *   Readline.delete_text([start[, length]]) -> self
@@ -694,21 +717,20 @@ readline_s_delete_text(int argc, VALUE *argv, VALUE self)
 {
     rb_check_arity(argc, 0, 2);
     if (rl_line_buffer) {
-        char *p, *ptr = rl_line_buffer;
-        long beg = 0, len = strlen(rl_line_buffer);
-        struct RString fakestr;
-        VALUE str = rb_setup_fake_str(&fakestr, ptr, len, rb_locale_encoding());
-        OBJ_FREEZE(str);
+        const char *p, *ptr = rl_line_buffer;
+        long beg = 0, len = strlen(ptr);
+        const char *end = ptr + len;
+        rb_encoding *enc = rb_locale_encoding();
         if (argc == 2) {
             beg = NUM2LONG(argv[0]);
             len = NUM2LONG(argv[1]);
           num_pos:
-            p = rb_str_subpos(str, beg, &len);
+            p = str_subpos(ptr, end, beg, &len, enc);
             if (!p) rb_raise(rb_eArgError, "invalid index");
             beg = p - ptr;
         }
         else if (argc == 1) {
-            len = rb_str_strlen(str);
+            len = rb_enc_strlen(ptr, ptr + len, enc);
             if (!rb_range_beg_len(argv[0], &beg, &len, len, 1)) {
                 beg = NUM2LONG(argv[0]);
                 goto num_pos;
@@ -800,7 +822,7 @@ readline_s_redisplay(VALUE self)
  *
  * When working with auto-complete there are some strategies that work well.
  * To get some ideas you can take a look at the
- * completion.rb[http://svn.ruby-lang.org/repos/ruby/trunk/lib/irb/completion.rb]
+ * completion.rb[https://git.ruby-lang.org/ruby.git/tree/lib/irb/completion.rb]
  * file for irb.
  *
  * The common strategy is to take a list of possible completions and filter it
@@ -815,8 +837,7 @@ readline_s_redisplay(VALUE self)
 static VALUE
 readline_s_set_completion_proc(VALUE self, VALUE proc)
 {
-    if (!NIL_P(proc) && !rb_respond_to(proc, rb_intern("call")))
-        rb_raise(rb_eArgError, "argument must respond to `call'");
+    mustbe_callable(proc);
     return rb_ivar_set(mReadline, completion_proc, proc);
 }
 
@@ -832,6 +853,51 @@ readline_s_get_completion_proc(VALUE self)
     return rb_attr_get(mReadline, completion_proc);
 }
 
+#ifdef HAVE_RL_CHAR_IS_QUOTED_P
+/*
+ * call-seq:
+ *   Readline.quoting_detection_proc = proc
+ *
+ * Specifies a Proc object +proc+ to determine if a character in the user's
+ * input is escaped. It should take the user's input and the index of the
+ * character in question as input, and return a boolean (true if the specified
+ * character is escaped).
+ *
+ * Readline will only call this proc with characters specified in
+ * +completer_quote_characters+, to discover if they indicate the end of a
+ * quoted argument, or characters specified in
+ * +completer_word_break_characters+, to discover if they indicate a break
+ * between arguments.
+ *
+ * If +completer_quote_characters+ is not set, or if the user input doesn't
+ * contain one of the +completer_quote_characters+ or a +\+ character,
+ * Readline will not attempt to use this proc at all.
+ *
+ * Raises ArgumentError if +proc+ does not respond to the call method.
+ */
+static VALUE
+readline_s_set_quoting_detection_proc(VALUE self, VALUE proc)
+{
+    mustbe_callable(proc);
+    return rb_ivar_set(mReadline, quoting_detection_proc, proc);
+}
+
+/*
+ * call-seq:
+ *   Readline.quoting_detection_proc -> proc
+ *
+ * Returns the quoting detection Proc object.
+ */
+static VALUE
+readline_s_get_quoting_detection_proc(VALUE self)
+{
+    return rb_attr_get(mReadline, quoting_detection_proc);
+}
+#else
+#define readline_s_set_quoting_detection_proc rb_f_notimplement
+#define readline_s_get_quoting_detection_proc rb_f_notimplement
+#endif
+
 /*
  * call-seq:
  *   Readline.completion_case_fold = bool
@@ -953,7 +1019,7 @@ readline_attempted_completion_function(const char *text, int start, int end)
     rl_attempted_completion_over = 1;
 #endif
     case_fold = RTEST(rb_attr_get(mReadline, completion_case_fold));
-    ary = rb_funcall(proc, rb_intern("call"), 1, rb_locale_str_new_cstr(text));
+    ary = rb_funcall(proc, id_call, 1, rb_locale_str_new_cstr(text));
     if (!RB_TYPE_P(ary, T_ARRAY))
         ary = rb_Array(ary);
     matches = RARRAY_LEN(ary);
@@ -1007,6 +1073,32 @@ readline_attempted_completion_function(const char *text, int start, int end)
     return result;
 }
 
+#ifdef HAVE_RL_CHAR_IS_QUOTED_P
+static int
+readline_char_is_quoted(char *text, int byte_index)
+{
+    VALUE proc, result, str;
+    long char_index;
+    size_t len;
+
+    proc = rb_attr_get(mReadline, quoting_detection_proc);
+    if (NIL_P(proc)) {
+        return 0;
+    }
+
+    len = strlen(text);
+    if (byte_index < 0 || len < (size_t)byte_index) {
+        rb_raise(rb_eIndexError, "invalid byte index (%d in %"PRIdSIZE")",
+                 byte_index, len);
+    }
+
+    str = rb_locale_str_new(text, len);
+    char_index = rb_str_sublen(str, byte_index);
+    result = rb_funcall(proc, id_call, 2, str, LONG2FIX(char_index));
+    return RTEST(result);
+}
+#endif
+
 #ifdef HAVE_RL_SET_SCREEN_SIZE
 /*
  * call-seq:
@@ -1056,6 +1148,7 @@ readline_s_get_screen_size(VALUE self)
 #endif
 
 #ifdef HAVE_RL_VI_EDITING_MODE
+RUBY_EXTERN int rl_vi_editing_mode(int, int);
 /*
  * call-seq:
  *   Readline.vi_editing_mode -> nil
@@ -1094,6 +1187,7 @@ readline_s_vi_editing_mode_p(VALUE self)
 #endif
 
 #ifdef HAVE_RL_EMACS_EDITING_MODE
+RUBY_EXTERN int rl_emacs_editing_mode(int, int);
 /*
  * call-seq:
  *   Readline.emacs_editing_mode -> nil
@@ -1213,6 +1307,35 @@ readline_s_get_completion_append_character(VALUE self)
 #define readline_s_get_completion_append_character rb_f_notimplement
 #endif
 
+#ifdef HAVE_RL_COMPLETION_QUOTE_CHARACTER
+/*
+ * call-seq:
+ *   Readline.completion_quote_character -> char
+ *
+ * When called during a completion (e.g. from within your completion_proc),
+ * it will return a string containing the character used to quote the
+ * argument being completed, or nil if the argument is unquoted.
+ *
+ * When called at other times, it will always return nil.
+ *
+ * Note that Readline.completer_quote_characters must be set,
+ * or this method will always return nil.
+ */
+static VALUE
+readline_s_get_completion_quote_character(VALUE self)
+{
+    char buf[1];
+
+    if (rl_completion_quote_character == '\0')
+        return Qnil;
+
+    buf[0] = (char) rl_completion_quote_character;
+    return rb_locale_str_new(buf, 1);
+}
+#else
+#define readline_s_get_completion_quote_character rb_f_notimplement
+#endif
+
 #ifdef HAVE_RL_BASIC_WORD_BREAK_CHARACTERS
 /*
  * call-seq:
@@ -1258,7 +1381,7 @@ readline_s_set_basic_word_break_characters(VALUE self, VALUE str)
  * Raises NotImplementedError if the using readline library does not support.
  */
 static VALUE
-readline_s_get_basic_word_break_characters(VALUE self, VALUE str)
+readline_s_get_basic_word_break_characters(VALUE self)
 {
     if (rl_basic_word_break_characters == NULL)
         return Qnil;
@@ -1313,7 +1436,7 @@ readline_s_set_completer_word_break_characters(VALUE self, VALUE str)
  * Raises NotImplementedError if the using readline library does not support.
  */
 static VALUE
-readline_s_get_completer_word_break_characters(VALUE self, VALUE str)
+readline_s_get_completer_word_break_characters(VALUE self)
 {
     if (rl_completer_word_break_characters == NULL)
         return Qnil;
@@ -1428,7 +1551,7 @@ readline_s_set_basic_quote_characters(VALUE self, VALUE str)
  * Raises NotImplementedError if the using readline library does not support.
  */
 static VALUE
-readline_s_get_basic_quote_characters(VALUE self, VALUE str)
+readline_s_get_basic_quote_characters(VALUE self)
 {
     if (rl_basic_quote_characters == NULL)
         return Qnil;
@@ -1484,7 +1607,7 @@ readline_s_set_completer_quote_characters(VALUE self, VALUE str)
  * Raises NotImplementedError if the using readline library does not support.
  */
 static VALUE
-readline_s_get_completer_quote_characters(VALUE self, VALUE str)
+readline_s_get_completer_quote_characters(VALUE self)
 {
     if (rl_completer_quote_characters == NULL)
         return Qnil;
@@ -1538,7 +1661,7 @@ readline_s_set_filename_quote_characters(VALUE self, VALUE str)
  * Raises NotImplementedError if the using readline library does not support.
  */
 static VALUE
-readline_s_get_filename_quote_characters(VALUE self, VALUE str)
+readline_s_get_filename_quote_characters(VALUE self)
 {
     if (rl_filename_quote_characters == NULL)
         return Qnil;
@@ -1549,6 +1672,7 @@ readline_s_get_filename_quote_characters(VALUE self, VALUE str)
 #endif
 
 #ifdef HAVE_RL_REFRESH_LINE
+RUBY_EXTERN int rl_refresh_line(int, int);
 /*
  * call-seq:
  *   Readline.refresh_line -> nil
@@ -1666,7 +1790,7 @@ rb_remove_history(int index)
 #else
     rb_notimplement();
 
-    UNREACHABLE;
+    UNREACHABLE_RETURN(Qnil);
 #endif
 }
 
@@ -1794,6 +1918,11 @@ username_completion_proc_call(VALUE self, VALUE str)
     return result;
 }
 
+#ifdef HAVE_RL_CLEAR_SIGNALS
+RUBY_EXTERN int rl_clear_signals(void);
+#endif
+
+#undef rb_intern
 void
 Init_readline(void)
 {
@@ -1813,6 +1942,7 @@ Init_readline(void)
 
     using_history();
 
+    id_call = rb_intern("call");
     completion_proc = rb_intern(COMPLETION_PROC);
     completion_case_fold = rb_intern(COMPLETION_CASE_FOLD);
 #if defined(HAVE_RL_PRE_INPUT_HOOK)
@@ -1821,6 +1951,9 @@ Init_readline(void)
 #if defined(HAVE_RL_SPECIAL_PREFIXES)
     id_special_prefixes = rb_intern("special_prefixes");
 #endif
+#if defined HAVE_RL_CHAR_IS_QUOTED_P
+    quoting_detection_proc = rb_intern(QUOTING_DETECTION_PROC);
+#endif
 
     mReadline = rb_define_module("Readline");
     rb_define_module_function(mReadline, "readline",
@@ -1833,6 +1966,10 @@ Init_readline(void)
                                readline_s_set_completion_proc, 1);
     rb_define_singleton_method(mReadline, "completion_proc",
                                readline_s_get_completion_proc, 0);
+    rb_define_singleton_method(mReadline, "quoting_detection_proc=",
+                               readline_s_set_quoting_detection_proc, 1);
+    rb_define_singleton_method(mReadline, "quoting_detection_proc",
+                               readline_s_get_quoting_detection_proc, 0);
     rb_define_singleton_method(mReadline, "completion_case_fold=",
                                readline_s_set_completion_case_fold, 1);
     rb_define_singleton_method(mReadline, "completion_case_fold",
@@ -1859,6 +1996,8 @@ Init_readline(void)
                                readline_s_set_completion_append_character, 1);
     rb_define_singleton_method(mReadline, "completion_append_character",
                                readline_s_get_completion_append_character, 0);
+    rb_define_singleton_method(mReadline, "completion_quote_character",
+                               readline_s_get_completion_quote_character, 0);
     rb_define_singleton_method(mReadline, "basic_word_break_characters=",
                                readline_s_set_basic_word_break_characters, 1);
     rb_define_singleton_method(mReadline, "basic_word_break_characters",
@@ -1897,8 +2036,8 @@ Init_readline(void)
                                readline_s_get_special_prefixes, 0);
 
 #if USE_INSERT_IGNORE_ESCAPE
-    CONST_ID(id_orig_prompt, "orig_prompt");
-    CONST_ID(id_last_prompt, "last_prompt");
+    id_orig_prompt = rb_intern("orig_prompt");
+    id_last_prompt = rb_intern("last_prompt");
 #endif
 
     history = rb_obj_alloc(rb_cObject);
@@ -1921,7 +2060,7 @@ Init_readline(void)
      * The history buffer. It extends Enumerable module, so it behaves
      * just like an array.
      * For example, gets the fifth content that the user input by
-     * HISTORY[4].
+     * <code>HISTORY[4]</code>.
      */
     rb_define_const(mReadline, "HISTORY", history);
 
@@ -1981,6 +2120,9 @@ Init_readline(void)
 #if defined(HAVE_RL_PRE_INPUT_HOOK)
     rl_pre_input_hook = (rl_hook_func_t *)readline_pre_input_hook;
 #endif
+#if defined HAVE_RL_CHAR_IS_QUOTED_P
+    rl_char_is_quoted_p = &readline_char_is_quoted;
+#endif
 #ifdef HAVE_RL_CATCH_SIGNALS
     rl_catch_signals = 0;
 #endif
@@ -1991,3 +2133,9 @@ Init_readline(void)
     rb_gc_register_address(&readline_instream);
     rb_gc_register_address(&readline_outstream);
 }
+
+/*
+ * Local variables:
+ * indent-tabs-mode: nil
+ * end:
+ */
diff --git a/ext/ripper/depend b/ext/ripper/depend
index f85d887a71..4ce522fbc3 100644
--- a/ext/ripper/depend
+++ b/ext/ripper/depend
@@ -1,7 +1,6 @@
 GEN  = $(srcdir)/tools/generate.rb
 SRC1 = $(top_srcdir)/parse.y
 SRC2 = $(srcdir)/eventids2.c
-BISON = bison
 
 .SUFFIXES: .y
 
@@ -12,15 +11,18 @@ ripper.o: ripper.c
 .y.c:
 	$(ECHO) compiling compiler $<
 	$(Q) $(BISON) -t -v -oy.tab.c $<
-	$(Q) sed -f $(top_srcdir)/tool/ytab.sed -e "/^#/s!y\.tab\.c!$@!" y.tab.c > $@
+	$(Q) sed -e "/^#/s!y\.tab\.c!$@!" -f $(top_srcdir)/tool/ytab.sed y.tab.c > $@
 	@$(RM) y.tab.c
 
 all: check
 static: check
 
-ripper.y: $(srcdir)/tools/preproc.rb $(top_srcdir)/parse.y
+ripper.y: $(srcdir)/tools/preproc.rb $(srcdir)/tools/dsl.rb $(top_srcdir)/parse.y {$(VPATH)}id.h
 	$(ECHO) extracting $@ from $(top_srcdir)/parse.y
-	$(Q) $(RUBY) $(top_srcdir)/tool/id2token.rb --path-separator=.$(PATH_SEPARATOR)./ --vpath=$(VPATH) id.h $(top_srcdir)/parse.y > ripper.tmp.y
+	$(Q) $(RUBY) $(top_srcdir)/tool/id2token.rb --path-separator=.$(PATH_SEPARATOR)./ \
+		--vpath=$(VPATH)$(PATH_SEPARATOR)$(top_srcdir) id.h $(top_srcdir)/parse.y > ripper.tmp.y
+	$(Q) $(RUBY) $(top_srcdir)/tool/pure_parser.rb ripper.tmp.y $(BISON)
+	$(Q) $(RM) ripper.tmp.y.bak
 	$(Q) $(RUBY) $(srcdir)/tools/preproc.rb ripper.tmp.y --output=$@
 	$(Q) $(RM) ripper.tmp.y
 
@@ -31,11 +33,11 @@ check: .eventids2-check
 	$(Q) $(RUBY) $(GEN) --mode=check --ids1src=$(SRC1) --ids2src=$(SRC2)
 	@exit > $@
 
-eventids1.c: $(srcdir)/tools/generate.rb $(SRC1)
+eventids1.c: $(GEN) $(srcdir)/tools/dsl.rb $(SRC1)
 	$(ECHO) generating $@ from $(SRC1)
 	$(Q) $(RUBY) $(GEN) --mode=eventids1 --ids1src=$(SRC1) --output=$@
 
-eventids2table.c: $(srcdir)/tools/generate.rb $(SRC2)
+eventids2table.c: $(GEN) $(srcdir)/tools/dsl.rb $(SRC2)
 	$(ECHO) generating $@ from $(SRC2)
 	$(Q) $(RUBY) $(GEN) --mode=eventids2table --ids2src=$(SRC2) --output=$@
 
@@ -49,24 +51,203 @@ ripper.E: ripper.c
 # AUTOGENERATED DEPENDENCIES START
 ripper.o: $(RUBY_EXTCONF_H)
 ripper.o: $(arch_hdrdir)/ruby/config.h
+ripper.o: $(hdrdir)/ruby.h
+ripper.o: $(hdrdir)/ruby/assert.h
 ripper.o: $(hdrdir)/ruby/backward.h
+ripper.o: $(hdrdir)/ruby/backward/2/assume.h
+ripper.o: $(hdrdir)/ruby/backward/2/attributes.h
+ripper.o: $(hdrdir)/ruby/backward/2/bool.h
+ripper.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+ripper.o: $(hdrdir)/ruby/backward/2/inttypes.h
+ripper.o: $(hdrdir)/ruby/backward/2/limits.h
+ripper.o: $(hdrdir)/ruby/backward/2/long_long.h
+ripper.o: $(hdrdir)/ruby/backward/2/stdalign.h
+ripper.o: $(hdrdir)/ruby/backward/2/stdarg.h
 ripper.o: $(hdrdir)/ruby/defines.h
 ripper.o: $(hdrdir)/ruby/encoding.h
 ripper.o: $(hdrdir)/ruby/intern.h
+ripper.o: $(hdrdir)/ruby/internal/anyargs.h
+ripper.o: $(hdrdir)/ruby/internal/arithmetic.h
+ripper.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+ripper.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+ripper.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+ripper.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+ripper.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+ripper.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+ripper.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+ripper.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+ripper.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+ripper.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+ripper.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+ripper.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+ripper.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+ripper.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+ripper.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+ripper.o: $(hdrdir)/ruby/internal/assume.h
+ripper.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+ripper.o: $(hdrdir)/ruby/internal/attr/artificial.h
+ripper.o: $(hdrdir)/ruby/internal/attr/cold.h
+ripper.o: $(hdrdir)/ruby/internal/attr/const.h
+ripper.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+ripper.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+ripper.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+ripper.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+ripper.o: $(hdrdir)/ruby/internal/attr/error.h
+ripper.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+ripper.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+ripper.o: $(hdrdir)/ruby/internal/attr/format.h
+ripper.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+ripper.o: $(hdrdir)/ruby/internal/attr/noalias.h
+ripper.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+ripper.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+ripper.o: $(hdrdir)/ruby/internal/attr/noinline.h
+ripper.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+ripper.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+ripper.o: $(hdrdir)/ruby/internal/attr/pure.h
+ripper.o: $(hdrdir)/ruby/internal/attr/restrict.h
+ripper.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+ripper.o: $(hdrdir)/ruby/internal/attr/warning.h
+ripper.o: $(hdrdir)/ruby/internal/attr/weakref.h
+ripper.o: $(hdrdir)/ruby/internal/cast.h
+ripper.o: $(hdrdir)/ruby/internal/compiler_is.h
+ripper.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+ripper.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+ripper.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+ripper.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+ripper.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+ripper.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+ripper.o: $(hdrdir)/ruby/internal/compiler_since.h
+ripper.o: $(hdrdir)/ruby/internal/config.h
+ripper.o: $(hdrdir)/ruby/internal/constant_p.h
+ripper.o: $(hdrdir)/ruby/internal/core.h
+ripper.o: $(hdrdir)/ruby/internal/core/rarray.h
+ripper.o: $(hdrdir)/ruby/internal/core/rbasic.h
+ripper.o: $(hdrdir)/ruby/internal/core/rbignum.h
+ripper.o: $(hdrdir)/ruby/internal/core/rclass.h
+ripper.o: $(hdrdir)/ruby/internal/core/rdata.h
+ripper.o: $(hdrdir)/ruby/internal/core/rfile.h
+ripper.o: $(hdrdir)/ruby/internal/core/rhash.h
+ripper.o: $(hdrdir)/ruby/internal/core/robject.h
+ripper.o: $(hdrdir)/ruby/internal/core/rregexp.h
+ripper.o: $(hdrdir)/ruby/internal/core/rstring.h
+ripper.o: $(hdrdir)/ruby/internal/core/rstruct.h
+ripper.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+ripper.o: $(hdrdir)/ruby/internal/ctype.h
+ripper.o: $(hdrdir)/ruby/internal/dllexport.h
+ripper.o: $(hdrdir)/ruby/internal/dosish.h
+ripper.o: $(hdrdir)/ruby/internal/error.h
+ripper.o: $(hdrdir)/ruby/internal/eval.h
+ripper.o: $(hdrdir)/ruby/internal/event.h
+ripper.o: $(hdrdir)/ruby/internal/fl_type.h
+ripper.o: $(hdrdir)/ruby/internal/gc.h
+ripper.o: $(hdrdir)/ruby/internal/glob.h
+ripper.o: $(hdrdir)/ruby/internal/globals.h
+ripper.o: $(hdrdir)/ruby/internal/has/attribute.h
+ripper.o: $(hdrdir)/ruby/internal/has/builtin.h
+ripper.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+ripper.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+ripper.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+ripper.o: $(hdrdir)/ruby/internal/has/extension.h
+ripper.o: $(hdrdir)/ruby/internal/has/feature.h
+ripper.o: $(hdrdir)/ruby/internal/has/warning.h
+ripper.o: $(hdrdir)/ruby/internal/intern/array.h
+ripper.o: $(hdrdir)/ruby/internal/intern/bignum.h
+ripper.o: $(hdrdir)/ruby/internal/intern/class.h
+ripper.o: $(hdrdir)/ruby/internal/intern/compar.h
+ripper.o: $(hdrdir)/ruby/internal/intern/complex.h
+ripper.o: $(hdrdir)/ruby/internal/intern/cont.h
+ripper.o: $(hdrdir)/ruby/internal/intern/dir.h
+ripper.o: $(hdrdir)/ruby/internal/intern/enum.h
+ripper.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+ripper.o: $(hdrdir)/ruby/internal/intern/error.h
+ripper.o: $(hdrdir)/ruby/internal/intern/eval.h
+ripper.o: $(hdrdir)/ruby/internal/intern/file.h
+ripper.o: $(hdrdir)/ruby/internal/intern/gc.h
+ripper.o: $(hdrdir)/ruby/internal/intern/hash.h
+ripper.o: $(hdrdir)/ruby/internal/intern/io.h
+ripper.o: $(hdrdir)/ruby/internal/intern/load.h
+ripper.o: $(hdrdir)/ruby/internal/intern/marshal.h
+ripper.o: $(hdrdir)/ruby/internal/intern/numeric.h
+ripper.o: $(hdrdir)/ruby/internal/intern/object.h
+ripper.o: $(hdrdir)/ruby/internal/intern/parse.h
+ripper.o: $(hdrdir)/ruby/internal/intern/proc.h
+ripper.o: $(hdrdir)/ruby/internal/intern/process.h
+ripper.o: $(hdrdir)/ruby/internal/intern/random.h
+ripper.o: $(hdrdir)/ruby/internal/intern/range.h
+ripper.o: $(hdrdir)/ruby/internal/intern/rational.h
+ripper.o: $(hdrdir)/ruby/internal/intern/re.h
+ripper.o: $(hdrdir)/ruby/internal/intern/ruby.h
+ripper.o: $(hdrdir)/ruby/internal/intern/select.h
+ripper.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ripper.o: $(hdrdir)/ruby/internal/intern/signal.h
+ripper.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+ripper.o: $(hdrdir)/ruby/internal/intern/string.h
+ripper.o: $(hdrdir)/ruby/internal/intern/struct.h
+ripper.o: $(hdrdir)/ruby/internal/intern/thread.h
+ripper.o: $(hdrdir)/ruby/internal/intern/time.h
+ripper.o: $(hdrdir)/ruby/internal/intern/variable.h
+ripper.o: $(hdrdir)/ruby/internal/intern/vm.h
+ripper.o: $(hdrdir)/ruby/internal/interpreter.h
+ripper.o: $(hdrdir)/ruby/internal/iterator.h
+ripper.o: $(hdrdir)/ruby/internal/memory.h
+ripper.o: $(hdrdir)/ruby/internal/method.h
+ripper.o: $(hdrdir)/ruby/internal/module.h
+ripper.o: $(hdrdir)/ruby/internal/newobj.h
+ripper.o: $(hdrdir)/ruby/internal/rgengc.h
+ripper.o: $(hdrdir)/ruby/internal/scan_args.h
+ripper.o: $(hdrdir)/ruby/internal/special_consts.h
+ripper.o: $(hdrdir)/ruby/internal/static_assert.h
+ripper.o: $(hdrdir)/ruby/internal/stdalign.h
+ripper.o: $(hdrdir)/ruby/internal/stdbool.h
+ripper.o: $(hdrdir)/ruby/internal/symbol.h
+ripper.o: $(hdrdir)/ruby/internal/token_paste.h
+ripper.o: $(hdrdir)/ruby/internal/value.h
+ripper.o: $(hdrdir)/ruby/internal/value_type.h
+ripper.o: $(hdrdir)/ruby/internal/variable.h
+ripper.o: $(hdrdir)/ruby/internal/warning_push.h
+ripper.o: $(hdrdir)/ruby/internal/xmalloc.h
 ripper.o: $(hdrdir)/ruby/io.h
 ripper.o: $(hdrdir)/ruby/missing.h
+ripper.o: $(hdrdir)/ruby/onigmo.h
 ripper.o: $(hdrdir)/ruby/oniguruma.h
+ripper.o: $(hdrdir)/ruby/ractor.h
 ripper.o: $(hdrdir)/ruby/regex.h
 ripper.o: $(hdrdir)/ruby/ruby.h
 ripper.o: $(hdrdir)/ruby/st.h
 ripper.o: $(hdrdir)/ruby/subst.h
 ripper.o: $(hdrdir)/ruby/util.h
-ripper.o: $(top_srcdir)/include/ruby.h
+ripper.o: $(top_srcdir)/constant.h
+ripper.o: $(top_srcdir)/id_table.h
 ripper.o: $(top_srcdir)/internal.h
+ripper.o: $(top_srcdir)/internal/array.h
+ripper.o: $(top_srcdir)/internal/bignum.h
+ripper.o: $(top_srcdir)/internal/bits.h
+ripper.o: $(top_srcdir)/internal/compile.h
+ripper.o: $(top_srcdir)/internal/compilers.h
+ripper.o: $(top_srcdir)/internal/complex.h
+ripper.o: $(top_srcdir)/internal/error.h
+ripper.o: $(top_srcdir)/internal/fixnum.h
+ripper.o: $(top_srcdir)/internal/gc.h
+ripper.o: $(top_srcdir)/internal/hash.h
+ripper.o: $(top_srcdir)/internal/imemo.h
+ripper.o: $(top_srcdir)/internal/io.h
+ripper.o: $(top_srcdir)/internal/numeric.h
+ripper.o: $(top_srcdir)/internal/parse.h
+ripper.o: $(top_srcdir)/internal/rational.h
+ripper.o: $(top_srcdir)/internal/re.h
+ripper.o: $(top_srcdir)/internal/serial.h
+ripper.o: $(top_srcdir)/internal/static_assert.h
+ripper.o: $(top_srcdir)/internal/string.h
+ripper.o: $(top_srcdir)/internal/symbol.h
+ripper.o: $(top_srcdir)/internal/thread.h
+ripper.o: $(top_srcdir)/internal/util.h
+ripper.o: $(top_srcdir)/internal/variable.h
+ripper.o: $(top_srcdir)/internal/vm.h
+ripper.o: $(top_srcdir)/internal/warnings.h
 ripper.o: $(top_srcdir)/node.h
 ripper.o: $(top_srcdir)/regenc.h
+ripper.o: $(top_srcdir)/ruby_assert.h
 ripper.o: $(top_srcdir)/symbol.h
-ripper.o: $(top_srcdir)/vm_opts.h
 ripper.o: ../../probes.h
 ripper.o: eventids2.c
 ripper.o: ripper.y
diff --git a/ext/ripper/eventids2.c b/ext/ripper/eventids2.c
index 04a40e0da7..ac38663f2d 100644
--- a/ext/ripper/eventids2.c
+++ b/ext/ripper/eventids2.c
@@ -1,12 +1,21 @@
-#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)
+enum {
+    tIGNORED_NL  = tLAST_TOKEN + 1,
+# define tIGNORED_NL ((enum yytokentype)tIGNORED_NL)
+    tCOMMENT,
+# define tCOMMENT ((enum yytokentype)tCOMMENT)
+    tEMBDOC_BEG,
+# define tEMBDOC_BEG ((enum yytokentype)tEMBDOC_BEG)
+    tEMBDOC,
+# define tEMBDOC ((enum yytokentype)tEMBDOC)
+    tEMBDOC_END,
+# define tEMBDOC_END ((enum yytokentype)tEMBDOC_END)
+    tHEREDOC_BEG,
+# define tHEREDOC_BEG ((enum yytokentype)tHEREDOC_BEG)
+    tHEREDOC_END,
+# define tHEREDOC_END ((enum yytokentype)tHEREDOC_END)
+    k__END__,
+# define k__END__ ((enum yytokentype)k__END__)
+};
 
 typedef struct {
     ID ripper_id_backref;
@@ -127,180 +136,178 @@ ripper_init_eventids2(void)
 
 STATIC_ASSERT(k__END___range, k__END__ < SHRT_MAX);
 STATIC_ASSERT(ripper_scanner_ids_size, sizeof(ripper_scanner_ids) < SHRT_MAX);
-#define O(member) (int)offsetof(ripper_scanner_ids_t, ripper_id_##member)
-
-static const struct token_assoc {
-    unsigned short token;
-    unsigned short id_offset;
-} token_to_eventid[] = {
-    {' ',			O(words_sep)},
-    {'!',			O(op)},
-    {'%',			O(op)},
-    {'&',			O(op)},
-    {'*',			O(op)},
-    {'+',			O(op)},
-    {'-',			O(op)},
-    {'/',			O(op)},
-    {'<',			O(op)},
-    {'=',			O(op)},
-    {'>',			O(op)},
-    {'?',			O(op)},
-    {'^',			O(op)},
-    {'|',			O(op)},
-    {'~',			O(op)},
-    {':',			O(op)},
-    {',',			O(comma)},
-    {'.',			O(period)},
-    {';',			O(semicolon)},
-    {'`',			O(backtick)},
-    {'\n',			O(nl)},
-    {keyword_alias,		O(kw)},
-    {keyword_and,		O(kw)},
-    {keyword_begin,		O(kw)},
-    {keyword_break,		O(kw)},
-    {keyword_case,		O(kw)},
-    {keyword_class,		O(kw)},
-    {keyword_def,		O(kw)},
-    {keyword_defined,		O(kw)},
-    {keyword_do,		O(kw)},
-    {keyword_do_block,		O(kw)},
-    {keyword_do_cond,		O(kw)},
-    {keyword_else,		O(kw)},
-    {keyword_elsif,		O(kw)},
-    {keyword_end,		O(kw)},
-    {keyword_ensure,		O(kw)},
-    {keyword_false,		O(kw)},
-    {keyword_for,		O(kw)},
-    {keyword_if,		O(kw)},
-    {modifier_if,		O(kw)},
-    {keyword_in,		O(kw)},
-    {keyword_module,		O(kw)},
-    {keyword_next,		O(kw)},
-    {keyword_nil,		O(kw)},
-    {keyword_not,		O(kw)},
-    {keyword_or,		O(kw)},
-    {keyword_redo,		O(kw)},
-    {keyword_rescue,		O(kw)},
-    {modifier_rescue,		O(kw)},
-    {keyword_retry,		O(kw)},
-    {keyword_return,		O(kw)},
-    {keyword_self,		O(kw)},
-    {keyword_super,		O(kw)},
-    {keyword_then,		O(kw)},
-    {keyword_true,		O(kw)},
-    {keyword_undef,		O(kw)},
-    {keyword_unless,		O(kw)},
-    {modifier_unless,		O(kw)},
-    {keyword_until,		O(kw)},
-    {modifier_until,		O(kw)},
-    {keyword_when,		O(kw)},
-    {keyword_while,		O(kw)},
-    {modifier_while,		O(kw)},
-    {keyword_yield,		O(kw)},
-    {keyword__FILE__,		O(kw)},
-    {keyword__LINE__,		O(kw)},
-    {keyword__ENCODING__,	O(kw)},
-    {keyword_BEGIN,		O(kw)},
-    {keyword_END,		O(kw)},
-    {keyword_do_LAMBDA,		O(kw)},
-    {tAMPER,			O(op)},
-    {tANDOP,			O(op)},
-    {tAREF,			O(op)},
-    {tASET,			O(op)},
-    {tASSOC,			O(op)},
-    {tBACK_REF,			O(backref)},
-    {tCHAR,			O(CHAR)},
-    {tCMP,			O(op)},
-    {tCOLON2,			O(op)},
-    {tCOLON3,			O(op)},
-    {tCONSTANT,			O(const)},
-    {tCVAR,			O(cvar)},
-    {tDOT2,			O(op)},
-    {tDOT3,			O(op)},
-    {tEQ,			O(op)},
-    {tEQQ,			O(op)},
-    {tFID,			O(ident)},
-    {tFLOAT,			O(float)},
-    {tGEQ,			O(op)},
-    {tGVAR,			O(gvar)},
-    {tIDENTIFIER,		O(ident)},
-    {tIMAGINARY,		O(imaginary)},
-    {tINTEGER,			O(int)},
-    {tIVAR,			O(ivar)},
-    {tLBRACE,			O(lbrace)},
-    {tLBRACE_ARG,		O(lbrace)},
-    {'{',			O(lbrace)},
-    {'}',			O(rbrace)},
-    {tLBRACK,			O(lbracket)},
-    {'[',			O(lbracket)},
-    {']',			O(rbracket)},
-    {tLEQ,			O(op)},
-    {tLPAREN,			O(lparen)},
-    {tLPAREN_ARG,		O(lparen)},
-    {'(',			O(lparen)},
-    {')',			O(rparen)},
-    {tLSHFT,			O(op)},
-    {tMATCH,			O(op)},
-    {tNEQ,			O(op)},
-    {tNMATCH,			O(op)},
-    {tNTH_REF,			O(backref)},
-    {tOP_ASGN,			O(op)},
-    {tOROP,			O(op)},
-    {tPOW,			O(op)},
-    {tQWORDS_BEG,		O(qwords_beg)},
-    {tQSYMBOLS_BEG,		O(qsymbols_beg)},
-    {tSYMBOLS_BEG,		O(symbols_beg)},
-    {tRATIONAL,			O(rational)},
-    {tREGEXP_BEG,		O(regexp_beg)},
-    {tREGEXP_END,		O(regexp_end)},
-    {tRPAREN,			O(rparen)},
-    {tRSHFT,			O(op)},
-    {tSTAR,			O(op)},
-    {tDSTAR,			O(op)},
-    {tANDDOT,			O(op)},
-    {tSTRING_BEG,		O(tstring_beg)},
-    {tSTRING_CONTENT,		O(tstring_content)},
-    {tSTRING_DBEG,		O(embexpr_beg)},
-    {tSTRING_DEND,		O(embexpr_end)},
-    {tSTRING_DVAR,		O(embvar)},
-    {tSTRING_END,		O(tstring_end)},
-    {tSYMBEG,			O(symbeg)},
-    {tUMINUS,			O(op)},
-    {tUMINUS_NUM,		O(op)},
-    {tUPLUS,			O(op)},
-    {tWORDS_BEG,		O(words_beg)},
-    {tXSTRING_BEG,		O(backtick)},
-    {tLABEL,			O(label)},
-    {tLABEL_END,		O(label_end)},
-    {tLAMBDA,			O(tlambda)},
-    {tLAMBEG,			O(tlambeg)},
-
-    /* ripper specific tokens */
-    {tIGNORED_NL,		O(ignored_nl)},
-    {tCOMMENT,			O(comment)},
-    {tEMBDOC_BEG,		O(embdoc_beg)},
-    {tEMBDOC,			O(embdoc)},
-    {tEMBDOC_END,		O(embdoc_end)},
-    {tSP,			O(sp)},
-    {tHEREDOC_BEG,		O(heredoc_beg)},
-    {tHEREDOC_END,		O(heredoc_end)},
-    {k__END__,			O(__end__)},
-};
 
 static ID
-ripper_token2eventid(int tok)
+ripper_token2eventid(enum yytokentype tok)
 {
-    int i;
+#define O(member) (int)offsetof(ripper_scanner_ids_t, ripper_id_##member)+1
+    static const unsigned short offsets[] = {
+        [' ']			= O(words_sep),
+        ['!']			= O(op),
+        ['%']			= O(op),
+        ['&']			= O(op),
+        ['*']			= O(op),
+        ['+']			= O(op),
+        ['-']			= O(op),
+        ['/']			= O(op),
+        ['<']			= O(op),
+        ['=']			= O(op),
+        ['>']			= O(op),
+        ['?']			= O(op),
+        ['^']			= O(op),
+        ['|']			= O(op),
+        ['~']			= O(op),
+        [':']			= O(op),
+        [',']			= O(comma),
+        ['.']			= O(period),
+        [';']			= O(semicolon),
+        ['`']			= O(backtick),
+        ['\n']			= O(nl),
+        [keyword_alias] 	= O(kw),
+        [keyword_and]		= O(kw),
+        [keyword_begin] 	= O(kw),
+        [keyword_break] 	= O(kw),
+        [keyword_case]		= O(kw),
+        [keyword_class] 	= O(kw),
+        [keyword_def]		= O(kw),
+        [keyword_defined]	= O(kw),
+        [keyword_do]		= O(kw),
+        [keyword_do_block]	= O(kw),
+        [keyword_do_cond]	= O(kw),
+        [keyword_else]		= O(kw),
+        [keyword_elsif] 	= O(kw),
+        [keyword_end]		= O(kw),
+        [keyword_ensure]	= O(kw),
+        [keyword_false] 	= O(kw),
+        [keyword_for]		= O(kw),
+        [keyword_if]		= O(kw),
+        [modifier_if]		= O(kw),
+        [keyword_in]		= O(kw),
+        [keyword_module]	= O(kw),
+        [keyword_next]		= O(kw),
+        [keyword_nil]		= O(kw),
+        [keyword_not]		= O(kw),
+        [keyword_or]		= O(kw),
+        [keyword_redo]		= O(kw),
+        [keyword_rescue]	= O(kw),
+        [modifier_rescue]	= O(kw),
+        [keyword_retry] 	= O(kw),
+        [keyword_return]	= O(kw),
+        [keyword_self]		= O(kw),
+        [keyword_super] 	= O(kw),
+        [keyword_then]		= O(kw),
+        [keyword_true]		= O(kw),
+        [keyword_undef] 	= O(kw),
+        [keyword_unless]	= O(kw),
+        [modifier_unless]	= O(kw),
+        [keyword_until] 	= O(kw),
+        [modifier_until]	= O(kw),
+        [keyword_when]		= O(kw),
+        [keyword_while] 	= O(kw),
+        [modifier_while]	= O(kw),
+        [keyword_yield] 	= O(kw),
+        [keyword__FILE__]	= O(kw),
+        [keyword__LINE__]	= O(kw),
+        [keyword__ENCODING__]	= O(kw),
+        [keyword_BEGIN] 	= O(kw),
+        [keyword_END]		= O(kw),
+        [keyword_do_LAMBDA]	= O(kw),
+        [tAMPER]		= O(op),
+        [tANDOP]		= O(op),
+        [tAREF] 		= O(op),
+        [tASET] 		= O(op),
+        [tASSOC]		= O(op),
+        [tBACK_REF]		= O(backref),
+        [tCHAR] 		= O(CHAR),
+        [tCMP]			= O(op),
+        [tCOLON2]		= O(op),
+        [tCOLON3]		= O(op),
+        [tCONSTANT]		= O(const),
+        [tCVAR] 		= O(cvar),
+        [tDOT2] 		= O(op),
+        [tDOT3] 		= O(op),
+        [tBDOT2]		= O(op),
+        [tBDOT3]		= O(op),
+        [tEQ]			= O(op),
+        [tEQQ]			= O(op),
+        [tFID]			= O(ident),
+        [tFLOAT]		= O(float),
+        [tGEQ]			= O(op),
+        [tGVAR] 		= O(gvar),
+        [tIDENTIFIER]		= O(ident),
+        [tIMAGINARY]		= O(imaginary),
+        [tINTEGER]		= O(int),
+        [tIVAR] 		= O(ivar),
+        [tLBRACE]		= O(lbrace),
+        [tLBRACE_ARG]		= O(lbrace),
+        ['{']			= O(lbrace),
+        ['}']			= O(rbrace),
+        [tLBRACK]		= O(lbracket),
+        ['[']			= O(lbracket),
+        [']']			= O(rbracket),
+        [tLEQ]			= O(op),
+        [tLPAREN]		= O(lparen),
+        [tLPAREN_ARG]		= O(lparen),
+        ['(']			= O(lparen),
+        [')']			= O(rparen),
+        [tLSHFT]		= O(op),
+        [tMATCH]		= O(op),
+        [tNEQ]			= O(op),
+        [tNMATCH]		= O(op),
+        [tNTH_REF]		= O(backref),
+        [tOP_ASGN]		= O(op),
+        [tOROP] 		= O(op),
+        [tPOW]			= O(op),
+        [tQWORDS_BEG]		= O(qwords_beg),
+        [tQSYMBOLS_BEG] 	= O(qsymbols_beg),
+        [tSYMBOLS_BEG]		= O(symbols_beg),
+        [tRATIONAL]		= O(rational),
+        [tREGEXP_BEG]		= O(regexp_beg),
+        [tREGEXP_END]		= O(regexp_end),
+        [tRPAREN]		= O(rparen),
+        [tRSHFT]		= O(op),
+        [tSTAR] 		= O(op),
+        [tDSTAR]		= O(op),
+        [tANDDOT]		= O(op),
+        [tSTRING_BEG]		= O(tstring_beg),
+        [tSTRING_CONTENT]	= O(tstring_content),
+        [tSTRING_DBEG]		= O(embexpr_beg),
+        [tSTRING_DEND]		= O(embexpr_end),
+        [tSTRING_DVAR]		= O(embvar),
+        [tSTRING_END]		= O(tstring_end),
+        [tSYMBEG]		= O(symbeg),
+        [tUMINUS]		= O(op),
+        [tUMINUS_NUM]		= O(op),
+        [tUPLUS]		= O(op),
+        [tWORDS_BEG]		= O(words_beg),
+        [tXSTRING_BEG]		= O(backtick),
+        [tLABEL]		= O(label),
+        [tLABEL_END]		= O(label_end),
+        [tLAMBDA]		= O(tlambda),
+        [tLAMBEG]		= O(tlambeg),
+
+        /* ripper specific tokens */
+        [tIGNORED_NL]		= O(ignored_nl),
+        [tCOMMENT]		= O(comment),
+        [tEMBDOC_BEG]		= O(embdoc_beg),
+        [tEMBDOC]		= O(embdoc),
+        [tEMBDOC_END]		= O(embdoc_end),
+        [tSP]			= O(sp),
+        [tHEREDOC_BEG]		= O(heredoc_beg),
+        [tHEREDOC_END]		= O(heredoc_end),
+        [k__END__]		= O(__end__),
+    };
+#undef O
 
-    for (i = 0; i < numberof(token_to_eventid); i++) {
-	const struct token_assoc *const a = &token_to_eventid[i];
-        if (a->token == tok)
-            return *(const ID *)((const char *)&ripper_scanner_ids + a->id_offset);
+    int i = (int)tok;
+    if (i >= 0 && i < numberof(offsets) && (i = offsets[i]) > 0) {
+        return *(const ID *)((const char *)&ripper_scanner_ids-1+i);
     }
-    if (tok < 256) {
+    /* 128..256 are used as operator tokens */
+    if (tok < 128) {
         return ripper_scanner_ids.ripper_id_CHAR;
     }
     rb_raise(rb_eRuntimeError, "[Ripper FATAL] unknown token %d", tok);
 
-    UNREACHABLE;
+    UNREACHABLE_RETURN(0);
 }
diff --git a/ext/ripper/extconf.rb b/ext/ripper/extconf.rb
index 91d4b320e4..2dde565bd9 100644
--- a/ext/ripper/extconf.rb
+++ b/ext/ripper/extconf.rb
@@ -1,11 +1,13 @@
 #!ruby -s
-# frozen_string_literal: false
+# frozen_string_literal: true
 
 require 'mkmf'
 require 'rbconfig'
 
 def main
-  unless find_executable('bison')
+  yacc = ENV["YACC"] || "bison"
+
+  unless find_executable(yacc)
     unless File.exist?('ripper.c') or File.exist?("#{$srcdir}/ripper.c")
       raise 'missing bison; abort'
     end
@@ -16,7 +18,9 @@ def main
   $defs << '-DRIPPER_DEBUG' if $debug
   $VPATH << '$(topdir)' << '$(top_srcdir)'
   $INCFLAGS << ' -I$(topdir) -I$(top_srcdir)'
-  create_makefile 'ripper'
+  create_makefile 'ripper' do |conf|
+    conf << "BISON = #{yacc}"
+  end
 end
 
 main
diff --git a/ext/ripper/lib/ripper.rb b/ext/ripper/lib/ripper.rb
index c5c3a8091e..e937d65217 100644
--- a/ext/ripper/lib/ripper.rb
+++ b/ext/ripper/lib/ripper.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'ripper/core'
 require 'ripper/lexer'
 require 'ripper/filter'
@@ -66,9 +66,9 @@ require 'ripper/sexp'
 #
 # == License
 #
-#   Ruby License.
+# Ruby License.
 #
-#                                                 Minero Aoki
-#                                         aamine@loveruby.net
-#                                       http://i.loveruby.net
+# - Minero Aoki
+# - aamine@loveruby.net
+# - http://i.loveruby.net
 class Ripper; end
diff --git a/ext/ripper/lib/ripper/core.rb b/ext/ripper/lib/ripper/core.rb
index 53ed14d5e1..fa075da5b9 100644
--- a/ext/ripper/lib/ripper/core.rb
+++ b/ext/ripper/lib/ripper/core.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 # $Id$
 #
@@ -30,6 +30,7 @@ class Ripper
 
   private
 
+  # :stopdoc:
   def _dispatch_0() nil end
   def _dispatch_1(a) a end
   def _dispatch_2(a, b) a end
@@ -38,6 +39,7 @@ class Ripper
   def _dispatch_5(a, b, c, d, e) a end
   def _dispatch_6(a, b, c, d, e, f) a end
   def _dispatch_7(a, b, c, d, e, f, g) a end
+  # :startdoc:
 
   #
   # Parser Events
diff --git a/ext/ripper/lib/ripper/filter.rb b/ext/ripper/lib/ripper/filter.rb
index a50a2c6c4e..9955d30550 100644
--- a/ext/ripper/lib/ripper/filter.rb
+++ b/ext/ripper/lib/ripper/filter.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 # $Id$
 #
@@ -25,6 +25,7 @@ class Ripper
       @__lexer = Lexer.new(src, filename, lineno)
       @__line = nil
       @__col = nil
+      @__state = nil
     end
 
     # The file name of the input.
@@ -46,13 +47,20 @@ class Ripper
       @__col
     end
 
+    # The scanner's state of the current token.
+    # This value is the bitwise OR of zero or more of the +Ripper::EXPR_*+ constants.
+    def state
+      @__state
+    end
+
     # Starts the parser.
     # +init+ is a data accumulator and is passed to the next event handler (as
     # of Enumerable#inject).
     def parse(init = nil)
       data = init
-      @__lexer.lex.each do |pos, event, tok|
+      @__lexer.lex.each do |pos, event, tok, state|
         @__line, @__col = *pos
+        @__state = state
         data = if respond_to?(event, true)
                then __send__(event, tok, data)
                else on_default(event, tok, data)
diff --git a/ext/ripper/lib/ripper/lexer.rb b/ext/ripper/lib/ripper/lexer.rb
index 69526340a7..1df1c022c7 100644
--- a/ext/ripper/lib/ripper/lexer.rb
+++ b/ext/ripper/lib/ripper/lexer.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 # $Id$
 #
@@ -14,84 +14,195 @@ require 'ripper/core'
 class Ripper
 
   # Tokenizes the Ruby program and returns an array of strings.
+  # The +filename+ and +lineno+ arguments are mostly ignored, since the
+  # return value is just the tokenized input.
+  # By default, this method does not handle syntax errors in +src+,
+  # use the +raise_errors+ keyword to raise a SyntaxError for an error in +src+.
   #
   #   p Ripper.tokenize("def m(a) nil end")
   #      # => ["def", " ", "m", "(", "a", ")", " ", "nil", " ", "end"]
   #
-  def Ripper.tokenize(src, filename = '-', lineno = 1)
-    Lexer.new(src, filename, lineno).tokenize
+  def Ripper.tokenize(src, filename = '-', lineno = 1, **kw)
+    Lexer.new(src, filename, lineno).tokenize(**kw)
   end
 
   # Tokenizes the Ruby program and returns an array of an array,
-  # which is formatted like <code>[[lineno, column], type, token]</code>.
+  # which is formatted like
+  # <code>[[lineno, column], type, token, state]</code>.
+  # The +filename+ argument is mostly ignored.
+  # By default, this method does not handle syntax errors in +src+,
+  # use the +raise_errors+ keyword to raise a SyntaxError for an error in +src+.
   #
   #   require 'ripper'
   #   require 'pp'
   #
   #   pp 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"]]
+  #   #=> [[[1,  0], :on_kw,     "def", FNAME    ],
+  #        [[1,  3], :on_sp,     " ",   FNAME    ],
+  #        [[1,  4], :on_ident,  "m",   ENDFN    ],
+  #        [[1,  5], :on_lparen, "(",   BEG|LABEL],
+  #        [[1,  6], :on_ident,  "a",   ARG      ],
+  #        [[1,  7], :on_rparen, ")",   ENDFN    ],
+  #        [[1,  8], :on_sp,     " ",   BEG      ],
+  #        [[1,  9], :on_kw,     "nil", END      ],
+  #        [[1, 12], :on_sp,     " ",   END      ],
+  #        [[1, 13], :on_kw,     "end", END      ]]
   #
-  def Ripper.lex(src, filename = '-', lineno = 1)
-    Lexer.new(src, filename, lineno).lex
+  def Ripper.lex(src, filename = '-', lineno = 1, **kw)
+    Lexer.new(src, filename, lineno).lex(**kw)
   end
 
   class Lexer < ::Ripper   #:nodoc: internal use only
-    Elem = Struct.new(:pos, :event, :tok)
+    State = Struct.new(:to_int, :to_s) do
+      alias to_i to_int
+      def initialize(i) super(i, Ripper.lex_state_name(i)).freeze end
+      # def inspect; "#<#{self.class}: #{self}>" end
+      alias inspect to_s
+      def pretty_print(q) q.text(to_s) end
+      def ==(i) super or to_int == i end
+      def &(i) self.class.new(to_int & i) end
+      def |(i) self.class.new(to_int | i) end
+      def allbits?(i) to_int.allbits?(i) end
+      def anybits?(i) to_int.anybits?(i) end
+      def nobits?(i) to_int.nobits?(i) end
+    end
+
+    Elem = Struct.new(:pos, :event, :tok, :state, :message) do
+      def initialize(pos, event, tok, state, message = nil)
+        super(pos, event, tok, State.new(state), message)
+      end
+
+      def inspect
+        "#<#{self.class}: #{event}@#{pos[0]}:#{pos[1]}:#{state}: #{tok.inspect}#{": " if message}#{message}>"
+      end
+
+      def pretty_print(q)
+        q.group(2, "#<#{self.class}:", ">") {
+          q.breakable
+          q.text("#{event}@#{pos[0]}:#{pos[1]}")
+          q.breakable
+          q.text(state)
+          q.breakable
+          q.text("token: ")
+          tok.pretty_print(q)
+          if message
+            q.breakable
+            q.text("message: ")
+            q.text(message)
+          end
+        }
+      end
+
+      def to_a
+        a = super
+        a.pop unless a.last
+        a
+      end
+    end
+
+    attr_reader :errors
+
+    def tokenize(**kw)
+      parse(**kw).sort_by(&:pos).map(&:tok)
+    end
 
-    def tokenize
-      parse().sort_by(&:pos).map(&:tok)
+    def lex(**kw)
+      parse(**kw).sort_by(&:pos).map(&:to_a)
     end
 
-    def lex
-      parse().sort_by(&:pos).map(&:to_a)
+    # parse the code and returns elements including errors.
+    def scan(**kw)
+      result = (parse(**kw) + errors + @stack.flatten).uniq.sort_by {|e| [*e.pos, (e.message ? -1 : 0)]}
+      result.each_with_index do |e, i|
+        if e.event == :on_parse_error and e.tok.empty? and (pre = result[i-1]) and
+          pre.pos[0] == e.pos[0] and (pre.pos[1] + pre.tok.size) == e.pos[1]
+          e.tok = pre.tok
+          e.pos[1] = pre.pos[1]
+          result[i-1] = e
+          result[i] = pre
+        end
+      end
+      result
     end
 
-    def parse
+    def parse(raise_errors: false)
+      @errors = []
       @buf = []
       @stack = []
-      super
+      super()
+      @buf = @stack.pop unless @stack.empty?
+      if raise_errors and !@errors.empty?
+        raise SyntaxError, @errors.map(&:message).join(' ;')
+      end
       @buf.flatten!
-      @buf
+      unless (result = @buf).empty?
+        result.concat(@buf) until (@buf = []; super(); @buf.flatten!; @buf.empty?)
+      end
+      result
     end
 
     private
 
+    unless SCANNER_EVENT_TABLE.key?(:ignored_sp)
+      SCANNER_EVENT_TABLE[:ignored_sp] = 1
+      SCANNER_EVENTS << :ignored_sp
+      EVENTS << :ignored_sp
+    end
+
     def on_heredoc_dedent(v, w)
-      @buf.last.each do |e|
-        if e.event == :on_tstring_content
+      ignored_sp = []
+      heredoc = @buf.last
+      heredoc.each_with_index do |e, i|
+        if Elem === e and e.event == :on_tstring_content and e.pos[1].zero?
+          tok = e.tok.dup if w > 0 and /\A\s/ =~ e.tok
           if (n = dedent_string(e.tok, w)) > 0
+            if e.tok.empty?
+              e.tok = tok[0, n]
+              e.event = :on_ignored_sp
+              next
+            end
+            ignored_sp << [i, Elem.new(e.pos.dup, :on_ignored_sp, tok[0, n], e.state)]
             e.pos[1] += n
           end
         end
       end
+      ignored_sp.reverse_each do |i, e|
+        heredoc[i, 0] = [e]
+      end
       v
     end
 
     def on_heredoc_beg(tok)
       @stack.push @buf
       buf = []
-      @buf << buf
+      @buf.push buf
       @buf = buf
-      @buf.push Elem.new([lineno(), column()], __callee__, tok)
+      @buf.push Elem.new([lineno(), column()], __callee__, tok, state())
     end
 
     def on_heredoc_end(tok)
-      @buf.push Elem.new([lineno(), column()], __callee__, tok)
+      @buf.push Elem.new([lineno(), column()], __callee__, tok, state())
       @buf = @stack.pop
     end
 
     def _push_token(tok)
-      @buf.push Elem.new([lineno(), column()], __callee__, tok)
+      e = Elem.new([lineno(), column()], __callee__, tok, state())
+      @buf.push(e)
+      e
+    end
+
+    def on_error1(mesg)
+      @errors.push Elem.new([lineno(), column()], __callee__, token(), state(), mesg)
+    end
+
+    def on_error2(mesg, elem)
+      @errors.push Elem.new(elem.pos, __callee__, elem.tok, elem.state, mesg)
+    end
+    PARSER_EVENTS.grep(/_error\z/) do |e|
+      arity = PARSER_EVENT_TABLE.fetch(e)
+      alias_method "on_#{e}", "on_error#{arity}"
     end
+    alias compile_error on_error1
 
     (SCANNER_EVENTS.map {|event|:"on_#{event}"} - private_instance_methods(false)).each do |event|
       alias_method event, :_push_token
@@ -156,7 +267,7 @@ class Ripper
       if m = /[^\w\s$()\[\]{}?*+\.]/.match(pattern)
         raise CompileError, "invalid char in pattern: #{m[0].inspect}"
       end
-      buf = ''
+      buf = +''
       pattern.scan(/(?:\w+|\$\(|[()\[\]\{\}?*+\.]+)/) do |tok|
         case tok
         when /\w/
@@ -177,14 +288,14 @@ class Ripper
     end
 
     def map_tokens(tokens)
-      tokens.map {|pos,type,str| map_token(type.to_s.sub(/\Aon_/,'')) }.join
+      tokens.map {|pos,type,str| map_token(type.to_s.delete_prefix('on_')) }.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
+      MAP[ev.to_s.delete_prefix('on_')] = seed.shift
     end
 
     def map_token(tok)
diff --git a/ext/ripper/lib/ripper/sexp.rb b/ext/ripper/lib/ripper/sexp.rb
index aa1f86e38c..b1d553b1da 100644
--- a/ext/ripper/lib/ripper/sexp.rb
+++ b/ext/ripper/lib/ripper/sexp.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 # $Id$
 #
@@ -17,6 +17,10 @@ class Ripper
   # Parses +src+ and create S-exp tree.
   # Returns more readable tree rather than Ripper.sexp_raw.
   # This method is mainly for developer use.
+  # The +filename+ argument is mostly ignored.
+  # By default, this method does not handle syntax errors in +src+,
+  # returning +nil+ in such cases. Use the +raise_errors+ keyword
+  # to raise a SyntaxError for an error in +src+.
   #
   #   require 'ripper'
   #   require 'pp'
@@ -25,18 +29,28 @@ class Ripper
   #     #=> [:program,
   #          [[:def,
   #           [:@ident, "m", [1, 4]],
-  #           [:paren, [:params, [[:@ident, "a", [1, 6]]], nil, nil, nil, nil]],
+  #           [:paren, [:params, [[:@ident, "a", [1, 6]]], nil, nil, nil, nil, nil, nil]],
   #           [:bodystmt, [[:var_ref, [:@kw, "nil", [1, 9]]]], nil, nil, nil]]]]
   #
-  def Ripper.sexp(src, filename = '-', lineno = 1)
+  def Ripper.sexp(src, filename = '-', lineno = 1, raise_errors: false)
     builder = SexpBuilderPP.new(src, filename, lineno)
     sexp = builder.parse
-    sexp unless builder.error?
+    if builder.error?
+      if raise_errors
+        raise SyntaxError, builder.error
+      end
+    else
+      sexp
+    end
   end
 
   # [EXPERIMENTAL]
   # Parses +src+ and create S-exp tree.
   # This method is mainly for developer use.
+  # The +filename+ argument is mostly ignored.
+  # By default, this method does not handle syntax errors in +src+,
+  # returning +nil+ in such cases. Use the +raise_errors+ keyword
+  # to raise a SyntaxError for an error in +src+.
   #
   #   require 'ripper'
   #   require 'pp'
@@ -54,13 +68,21 @@ class Ripper
   #             nil,
   #             nil]]]]
   #
-  def Ripper.sexp_raw(src, filename = '-', lineno = 1)
+  def Ripper.sexp_raw(src, filename = '-', lineno = 1, raise_errors: false)
     builder = SexpBuilder.new(src, filename, lineno)
     sexp = builder.parse
-    sexp unless builder.error?
+    if builder.error?
+      if raise_errors
+        raise SyntaxError, builder.error
+      end
+    else
+      sexp
+    end
   end
 
   class SexpBuilder < ::Ripper   #:nodoc:
+    attr_reader :error
+
     private
 
     def dedent_element(e, width)
@@ -107,6 +129,13 @@ class Ripper
         end
       End
     end
+
+    def on_error(mesg)
+      @error = mesg
+    end
+    remove_method :on_parse_error
+    alias on_parse_error on_error
+    alias compile_error on_error
   end
 
   class SexpBuilderPP < SexpBuilder #:nodoc:
@@ -134,6 +163,18 @@ class Ripper
       list
     end
 
+    def on_mlhs_paren(list)
+      [:mlhs, *list]
+    end
+
+    def on_mlhs_add_star(list, star)
+      list.push([:rest_param, star])
+    end
+
+    def on_mlhs_add_post(list, post)
+      list.concat(post)
+    end
+
     PARSER_EVENT_TABLE.each do |event, arity|
       if /_new\z/ =~ event and arity == 0
         alias_method "on_#{event}", :_dispatch_event_new
diff --git a/ext/ripper/tools/dsl.rb b/ext/ripper/tools/dsl.rb
new file mode 100644
index 0000000000..49ff51711f
--- /dev/null
+++ b/ext/ripper/tools/dsl.rb
@@ -0,0 +1,88 @@
+# Simple DSL implementation for Ripper code generation
+#
+# input: /*% ripper: stmts_add(stmts_new, void_stmt) %*/
+# output:
+#   VALUE v1, v2;
+#   v1 = dispatch0(stmts_new);
+#   v2 = dispatch0(void_stmt);
+#   $$ = dispatch2(stmts_add, v1, v2);
+
+$dollar = "$$"
+alias $$ $dollar
+
+class DSL
+  def initialize(code, options)
+    @events = {}
+    @error = options.include?("error")
+    @brace = options.include?("brace")
+    if options.include?("final")
+      @final = "p->result"
+    else
+      @final = (options.grep(/\A\$(?:\$|\d+)\z/)[0] || "$$")
+    end
+    @vars = 0
+
+    # create $1 == "$1", $2 == "$2", ...
+    s = (1..20).map {|n| "$#{n}"}
+    re = Array.new(s.size, "([^\0]+)")
+    /#{re.join("\0")}/ =~ s.join("\0")
+
+    # struct parser_params *p
+    p = p = "p"
+
+    @code = ""
+    @last_value = eval(code)
+  end
+
+  attr_reader :events
+
+  undef lambda
+  undef hash
+  undef class
+
+  def generate
+    s = "#@code#@final=#@last_value;"
+    s = "{VALUE #{ (1..@vars).map {|v| "v#{ v }" }.join(",") };#{ s }}" if @vars > 0
+    s << "ripper_error(p);" if @error
+    s = "{#{ s }}" if @brace
+    "\t\t\t#{s}"
+  end
+
+  def new_var
+    "v#{ @vars += 1 }"
+  end
+
+  def opt_event(event, default, addend)
+    add_event(event, [default, addend], true)
+  end
+
+  def add_event(event, args, qundef_check = false)
+    event = event.to_s.sub(/!\z/, "")
+    @events[event] = args.size
+    vars = []
+    args.each do |arg|
+      vars << v = new_var
+      @code << "#{ v }=#{ arg };"
+    end
+    v = new_var
+    d = "dispatch#{ args.size }(#{ [event, *vars].join(",") })"
+    d = "#{ vars.last }==Qundef ? #{ vars.first } : #{ d }" if qundef_check
+    @code << "#{ v }=#{ d };"
+    v
+  end
+
+  def method_missing(event, *args)
+    if event.to_s =~ /!\z/
+      add_event(event, args)
+    elsif args.empty? and /\Aid[A-Z_]/ =~ event.to_s
+      event
+    else
+      "#{ event }(#{ args.join(", ") })"
+    end
+  end
+
+  def self.const_missing(name)
+    name
+  end
+end
+
diff --git a/ext/ripper/tools/generate-param-macros.rb b/ext/ripper/tools/generate-param-macros.rb
index c1f0c5bc31..f0de55a5f2 100755..100644
--- a/ext/ripper/tools/generate-param-macros.rb
+++ b/ext/ripper/tools/generate-param-macros.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 off = true
 ARGF.each do |line|
   case line
diff --git a/ext/ripper/tools/generate.rb b/ext/ripper/tools/generate.rb
index cb02de9b4b..883e6ef2df 100755..100644
--- a/ext/ripper/tools/generate.rb
+++ b/ext/ripper/tools/generate.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 # $Id$
 
 require 'optparse'
@@ -68,7 +68,7 @@ def usage(msg)
 end
 
 def generate_eventids1(ids)
-  buf = ""
+  buf = "".dup
   buf << %Q[static struct {\n]
   ids.each do |id, arity|
     buf << %Q[    ID id_#{id};\n]
@@ -101,7 +101,7 @@ def generate_eventids1(ids)
 end
 
 def generate_eventids2_table(ids)
-  buf = ""
+  buf = "".dup
   buf << %Q[static void\n]
   buf << %Q[ripper_init_eventids2_table(VALUE self)\n]
   buf << %Q[{\n]
@@ -135,6 +135,8 @@ def check_arity(h)
   abort if invalid
 end
 
+require_relative "dsl"
+
 def read_ids1_with_locations(path)
   h = {}
   File.open(path) {|f|
@@ -144,6 +146,13 @@ def read_ids1_with_locations(path)
       line.scan(/\bdispatch(\d)\((\w+)/) do |arity, event|
         (h[event] ||= []).push [f.lineno, arity.to_i]
       end
+      if line =~ %r</\*% *ripper(?:\[(.*?)\])?: *(.*?) *%\*/>
+        gen = DSL.new($2, ($1 || "").split(","))
+        gen.generate
+        gen.events.each do |event, arity|
+          (h[event] ||= []).push [f.lineno, arity.to_i]
+        end
+      end
     end
   }
   h
diff --git a/ext/ripper/tools/preproc.rb b/ext/ripper/tools/preproc.rb
index 2377506cd5..b838a78db7 100755..100644
--- a/ext/ripper/tools/preproc.rb
+++ b/ext/ripper/tools/preproc.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 # $Id$
 
 require 'optparse'
@@ -24,7 +24,7 @@ def main
   unless ARGV.size == 1
     abort "wrong number of arguments (#{ARGV.size} for 1)"
   end
-  out = ""
+  out = "".dup
   File.open(ARGV[0]) {|f|
     prelude f, out
     grammar f, out
@@ -40,42 +40,54 @@ def main
 end
 
 def prelude(f, out)
+  @exprs = {}
+  lex_state_def = false
   while line = f.gets
     case line
-    when %r</\*%%%\*/>
-      out << '/*' << $/
-    when %r</\*%>
-      out << '*/' << $/
-    when %r<%\*/>
-      out << $/
     when /\A%%/
-      out << '%%' << $/
+      out << "%%\n"
       return
     when /\A%token/
       out << line.sub(/<\w+>/, '<val>')
     when /\A%type/
       out << line.sub(/<\w+>/, '<val>')
+    when /^enum lex_state_(?:bits|e) \{/
+      lex_state_def = true
+      out << line
+    when /^\}/
+      lex_state_def = false
+      out << line
     else
       out << line
     end
+    if lex_state_def
+      case line
+      when /^\s*(EXPR_\w+),\s+\/\*(.+)\*\//
+        @exprs[$1.chomp("_bit")] = $2.strip
+      when /^\s*(EXPR_\w+)\s+=\s+(.+)$/
+        name = $1
+        val = $2.chomp(",")
+        @exprs[name] = "equals to " + (val.start_with?("(") ? "<tt>#{val}</tt>" : "+#{val}+")
+      end
+    end
   end
 end
 
+require_relative "dsl"
+
 def grammar(f, out)
   while line = f.gets
     case line
+    when %r</\*% *ripper(?:\[(.*?)\])?: *(.*?) *%\*/>
+      out << DSL.new($2, ($1 || "").split(",")).generate << "\n"
     when %r</\*%%%\*/>
-      out << '#if 0' << $/
-    when %r</\*%c%\*/>
-      out << '/*' << $/
-    when %r</\*%c>
-      out << '*/' << $/
+      out << "#if 0\n"
     when %r</\*%>
-      out << '#endif' << $/
+      out << "#endif\n"
     when %r<%\*/>
-      out << $/
+      out << "\n"
     when /\A%%/
-      out << '%%' << $/
+      out << "%%\n"
       return
     else
       out << line
@@ -84,9 +96,12 @@ def grammar(f, out)
 end
 
 def usercode(f, out)
-  while line = f.gets
-    out << line
-  end
+  require 'erb'
+  compiler = ERB::Compiler.new('%-')
+  compiler.put_cmd = compiler.insert_cmd = "out.<<"
+  lineno = f.lineno
+  src, = compiler.compile(f.read)
+  eval(src, binding, f.path, lineno)
 end
 
 main
diff --git a/ext/ripper/tools/strip.rb b/ext/ripper/tools/strip.rb
index 0e409eb63b..23102f797a 100755..100644
--- a/ext/ripper/tools/strip.rb
+++ b/ext/ripper/tools/strip.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 last_is_void = false
 ARGF.each do |line|
   case line
diff --git a/ext/rubyvm/depend b/ext/rubyvm/depend
new file mode 100644
index 0000000000..0301ce074c
--- /dev/null
+++ b/ext/rubyvm/depend
@@ -0,0 +1,2 @@
+# AUTOGENERATED DEPENDENCIES START
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/rubyvm/extconf.rb b/ext/rubyvm/extconf.rb
new file mode 100644
index 0000000000..8c40f58e2b
--- /dev/null
+++ b/ext/rubyvm/extconf.rb
@@ -0,0 +1 @@
+create_makefile("rubyvm")
diff --git a/ext/rubyvm/lib/forwardable/impl.rb b/ext/rubyvm/lib/forwardable/impl.rb
new file mode 100644
index 0000000000..e9bde2f299
--- /dev/null
+++ b/ext/rubyvm/lib/forwardable/impl.rb
@@ -0,0 +1,16 @@
+# :stopdoc:
+module Forwardable
+  def self._valid_method?(method)
+    iseq = RubyVM::InstructionSequence.compile("().#{method}", nil, nil, 0, false)
+  rescue SyntaxError
+    false
+  else
+    iseq.to_a.dig(-1, 1, 1, :mid) == method.to_sym
+  end
+
+  def self._compile_method(src, file, line)
+    RubyVM::InstructionSequence.compile(src, file, file, line,
+               trace_instruction: false)
+      .eval
+  end
+end
diff --git a/ext/sdbm/_sdbm.c b/ext/sdbm/_sdbm.c
deleted file mode 100644
index 9ff0e7959a..0000000000
--- a/ext/sdbm/_sdbm.c
+++ /dev/null
@@ -1,952 +0,0 @@
-/*
- * sdbm - ndbm work-alike hashed database library
- * based on Per-Aake Larson's Dynamic Hashing algorithms. BIT 18 (1978).
- * author: oz@nexus.yorku.ca
- * status: public domain.
- *
- * core routines
- */
-
-#include "ruby/ruby.h"
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include "sdbm.h"
-
-/*
- * sdbm - ndbm work-alike hashed database library
- * tuning and portability constructs [not nearly enough]
- * author: oz@nexus.yorku.ca
- */
-
-#define BYTESIZ		8
-
-#ifdef BSD42
-#define SEEK_SET	L_SET
-#define	memset(s,c,n)	bzero((s), (n))		/* only when c is zero */
-#define	memcpy(s1,s2,n)	bcopy((s2), (s1), (n))
-#define	memcmp(s1,s2,n)	bcmp((s1),(s2),(n))
-#endif
-
-/*
- * important tuning parms (hah)
- */
-
-#ifndef SEEDUPS
-#define SEEDUPS 1	/* always detect duplicates */
-#endif
-#ifndef BADMESS
-#define BADMESS 1	/* generate a message for worst case:
-			   cannot make room after SPLTMAX splits */
-#endif
-
-/*
- * misc
- */
-#ifdef DEBUG
-#define debug(x)	printf x
-#else
-#define debug(x)
-#endif
-
-#ifdef BIG_E
-#define GET_SHORT(p, i)	(((unsigned)((unsigned char *)(p))[(i)*2] << 8) + (((unsigned char *)(p))[(i)*2 + 1]))
-#define PUT_SHORT(p, i, s) (((unsigned char *)(p))[(i)*2] = (unsigned char)((s) >> 8), ((unsigned char *)(p))[(i)*2 + 1] = (unsigned char)(s))
-#else
-#define GET_SHORT(p, i)	((p)[(i)])
-#define PUT_SHORT(p, i, s)	((p)[(i)] = (s))
-#endif
-
-/*#include "pair.h"*/
-static int   fitpair proto((char *, int));
-static void  putpair proto((char *, datum, datum));
-static datum getpair proto((char *, datum));
-static int   delpair proto((char *, datum));
-static int   chkpage proto((char *));
-static datum getnkey proto((char *, int));
-static void  splpage proto((char *, char *, long));
-#if SEEDUPS
-static int   duppair proto((char *, datum));
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef DOSISH
-#include <io.h>
-#endif
-#include <sys/types.h>
-#include <sys/stat.h>
-#ifdef BSD42
-#include <sys/file.h>
-#else
-#include <fcntl.h>
-/*#include <memory.h>*/
-#endif
-#ifndef O_BINARY
-#define O_BINARY	0
-#endif
-
-#include <errno.h>
-#ifndef EPERM
-#define EPERM	EACCES
-#endif
-#include <string.h>
-
-#ifdef __STDC__
-#include <stddef.h>
-#endif
-
-#ifndef NULL
-#define NULL	0
-#endif
-
-/*
- * externals
- */
-#if !defined(__sun) && !defined(_WIN32) && !defined(__CYGWIN__) && !defined(errno)
-extern int errno;
-#endif
-
-/*
- * forward
- */
-static int getdbit proto((DBM *, long));
-static int setdbit proto((DBM *, long));
-static int getpage proto((DBM *, long));
-static datum getnext proto((DBM *));
-static int makroom proto((DBM *, long, int));
-
-/*
- * useful macros
- */
-#define bad(x)		((x).dptr == NULL || (x).dsize < 0)
-#define exhash(item)	sdbm_hash((item).dptr, (item).dsize)
-#define ioerr(db)	((db)->flags |= DBM_IOERR)
-
-#define OFF_PAG(off)	(long) (off) * PBLKSIZ
-#define OFF_DIR(off)	(long) (off) * DBLKSIZ
-
-static long masks[] = {
-	000000000000L, 000000000001L, 000000000003L,
-	000000000007L, 000000000017L, 000000000037L,
-	000000000077L, 000000000177L, 000000000377L,
-	000000000777L, 000000001777L, 000000003777L,
-	000000007777L, 000000017777L, 000000037777L,
-	000000077777L, 000000177777L, 000000377777L,
-	000000777777L, 000001777777L, 000003777777L,
-	000007777777L, 000017777777L, 000037777777L,
-	000077777777L, 000177777777L, 000377777777L,
-	000777777777L, 001777777777L, 003777777777L,
-	007777777777L, 017777777777L
-};
-
-datum nullitem = {NULL, 0};
-
-DBM *
-sdbm_open(register char *file, register int flags, register int mode)
-{
-	register DBM *db;
-	register char *dirname;
-	register char *pagname;
-	register size_t n;
-
-	if (file == NULL || !*file)
-		return errno = EINVAL, (DBM *) NULL;
-/*
- * need space for two separate filenames
- */
-	n = strlen(file) * 2 + strlen(DIRFEXT) + strlen(PAGFEXT) + 2;
-
-	if ((dirname = malloc(n)) == NULL)
-		return errno = ENOMEM, (DBM *) NULL;
-/*
- * build the file names
- */
-	dirname = strcat(strcpy(dirname, file), DIRFEXT);
-	pagname = strcpy(dirname + strlen(dirname) + 1, file);
-	pagname = strcat(pagname, PAGFEXT);
-
-	db = sdbm_prep(dirname, pagname, flags, mode);
-	free((char *) dirname);
-	return db;
-}
-
-static int
-fd_set_cloexec(int fd)
-{
-  /* MinGW don't have F_GETFD and FD_CLOEXEC.  [ruby-core:40281] */
-#ifdef F_GETFD
-    int flags, ret;
-    flags = fcntl(fd, F_GETFD); /* should not fail except EBADF. */
-    if (flags == -1) {
-        return -1;
-    }
-    if (2 < fd) {
-        if (!(flags & FD_CLOEXEC)) {
-            flags |= FD_CLOEXEC;
-            ret = fcntl(fd, F_SETFD, flags);
-            if (ret == -1) {
-                return -1;
-            }
-        }
-    }
-#endif
-    return 0;
-}
-
-DBM *
-sdbm_prep(char *dirname, char *pagname, int flags, int mode)
-{
-	register DBM *db;
-	struct stat dstat;
-
-	if ((db = (DBM *) malloc(sizeof(DBM))) == NULL)
-		return errno = ENOMEM, (DBM *) NULL;
-
-        db->pagf = -1;
-        db->dirf = -1;
-        db->flags = 0;
-        db->hmask = 0;
-        db->blkptr = 0;
-        db->keyptr = 0;
-/*
- * adjust user flags so that WRONLY becomes RDWR,
- * as required by this package. Also set our internal
- * flag for RDONLY.
- */
-	if (flags & O_WRONLY)
-		flags = (flags & ~O_WRONLY) | O_RDWR;
-	if (flags & O_RDONLY)
-		db->flags = DBM_RDONLY;
-/*
- * open the files in sequence, and stat the dirfile.
- * If we fail anywhere, undo everything, return NULL.
- */
-	flags |= O_BINARY;
-#ifdef O_CLOEXEC
-        flags |= O_CLOEXEC;
-#endif
-
-	if ((db->pagf = open(pagname, flags, mode)) == -1) goto err;
-        if (fd_set_cloexec(db->pagf) == -1) goto err;
-        if ((db->dirf = open(dirname, flags, mode)) == -1) goto err;
-        if (fd_set_cloexec(db->dirf) == -1) goto err;
-/*
- * need the dirfile size to establish max bit number.
- */
-        if (fstat(db->dirf, &dstat) == -1) goto err;
-/*
- * zero size: either a fresh database, or one with a single,
- * unsplit data page: dirpage is all zeros.
- */
-        db->dirbno = (!dstat.st_size) ? 0 : -1;
-        db->pagbno = -1;
-        db->maxbno = dstat.st_size * (long) BYTESIZ;
-
-        (void) memset(db->pagbuf, 0, PBLKSIZ);
-        (void) memset(db->dirbuf, 0, DBLKSIZ);
-/*
- * success
- */
-        return db;
-
-    err:
-        if (db->pagf != -1)
-                (void) close(db->pagf);
-        if (db->dirf != -1)
-                (void) close(db->dirf);
-	free((char *) db);
-	return (DBM *) NULL;
-}
-
-void
-sdbm_close(register DBM *db)
-{
-	if (db == NULL)
-		errno = EINVAL;
-	else {
-		(void) close(db->dirf);
-		(void) close(db->pagf);
-		free((char *) db);
-	}
-}
-
-datum
-sdbm_fetch(register DBM *db, datum key)
-{
-	if (db == NULL || bad(key))
-		return errno = EINVAL, nullitem;
-
-	if (getpage(db, exhash(key)))
-		return getpair(db->pagbuf, key);
-
-	return ioerr(db), nullitem;
-}
-
-int
-sdbm_delete(register DBM *db, datum key)
-{
-	if (db == NULL || bad(key))
-		return errno = EINVAL, -1;
-	if (sdbm_rdonly(db))
-		return errno = EPERM, -1;
-
-	if (getpage(db, exhash(key))) {
-		if (!delpair(db->pagbuf, key))
-			return -1;
-/*
- * update the page file
- */
-		if (lseek(db->pagf, OFF_PAG(db->pagbno), SEEK_SET) < 0
-		    || write(db->pagf, db->pagbuf, PBLKSIZ) < 0)
-			return ioerr(db), -1;
-
-		return 0;
-	}
-
-	return ioerr(db), -1;
-}
-
-int
-sdbm_store(register DBM *db, datum key, datum val, int flags)
-{
-	int need;
-	register long hash;
-
-	if (db == NULL || bad(key))
-		return errno = EINVAL, -1;
-	if (sdbm_rdonly(db))
-		return errno = EPERM, -1;
-
-	need = key.dsize + val.dsize;
-/*
- * is the pair too big (or too small) for this database ??
- */
-	if (need < 0 || need > PAIRMAX)
-		return errno = EINVAL, -1;
-
-	if (getpage(db, (hash = exhash(key)))) {
-/*
- * if we need to replace, delete the key/data pair
- * first. If it is not there, ignore.
- */
-		if (flags == DBM_REPLACE)
-			(void) delpair(db->pagbuf, key);
-#if SEEDUPS
-		else if (duppair(db->pagbuf, key))
-			return 1;
-#endif
-/*
- * if we do not have enough room, we have to split.
- */
-		if (!fitpair(db->pagbuf, need))
-			if (!makroom(db, hash, need))
-				return ioerr(db), -1;
-/*
- * we have enough room or split is successful. insert the key,
- * and update the page file.
- */
-		(void) putpair(db->pagbuf, key, val);
-
-		if (lseek(db->pagf, OFF_PAG(db->pagbno), SEEK_SET) < 0
-		    || write(db->pagf, db->pagbuf, PBLKSIZ) < 0)
-			return ioerr(db), -1;
-	/*
-	 * success
-	 */
-		return 0;
-	}
-
-	return ioerr(db), -1;
-}
-
-/*
- * makroom - make room by splitting the overfull page
- * this routine will attempt to make room for SPLTMAX times before
- * giving up.
- */
-static int
-makroom(register DBM *db, long int hash, int need)
-{
-	long newp;
-	char twin[PBLKSIZ];
-#if defined _WIN32
-	char zer[PBLKSIZ];
-	long oldtail;
-#endif
-	char *pag = db->pagbuf;
-	char *new = twin;
-	register int smax = SPLTMAX;
-
-	do {
-/*
- * split the current page
- */
-		(void) splpage(pag, new, db->hmask + 1);
-/*
- * address of the new page
- */
-		newp = (hash & db->hmask) | (db->hmask + 1);
-		debug(("newp: %ld\n", newp));
-/*
- * write delay, read avoidance/cache shuffle:
- * select the page for incoming pair: if key is to go to the new page,
- * write out the previous one, and copy the new one over, thus making
- * it the current page. If not, simply write the new page, and we are
- * still looking at the page of interest. current page is not updated
- * here, as sdbm_store will do so, after it inserts the incoming pair.
- */
-
-#if defined _WIN32
-	/*
-	 * Fill hole with 0 if made it.
-	 * (hole is NOT read as 0)
-	 */
-	oldtail = lseek(db->pagf, 0L, SEEK_END);
-	memset(zer, 0, PBLKSIZ);
-	while (OFF_PAG(newp) > oldtail) {
-		if (lseek(db->pagf, 0L, SEEK_END) < 0 ||
-		    write(db->pagf, zer, PBLKSIZ) < 0) {
-
-			return 0;
-		}
-		oldtail += PBLKSIZ;
-	}
-#endif
-
-		if (hash & (db->hmask + 1)) {
-			if (lseek(db->pagf, OFF_PAG(db->pagbno), SEEK_SET) < 0
-			    || write(db->pagf, db->pagbuf, PBLKSIZ) < 0)
-				return 0;
-			db->pagbno = newp;
-			(void) memcpy(pag, new, PBLKSIZ);
-		}
-		else if (lseek(db->pagf, OFF_PAG(newp), SEEK_SET) < 0
-			 || write(db->pagf, new, PBLKSIZ) < 0)
-			return 0;
-
-		if (!setdbit(db, db->curbit))
-			return 0;
-/*
- * see if we have enough room now
- */
-		if (fitpair(pag, need))
-			return 1;
-/*
- * try again... update curbit and hmask as getpage would have
- * done. because of our update of the current page, we do not
- * need to read in anything. BUT we have to write the current
- * [deferred] page out, as the window of failure is too great.
- */
-		db->curbit = 2 * db->curbit +
-			((hash & (db->hmask + 1)) ? 2 : 1);
-		db->hmask |= (db->hmask + 1);
-
-		if (lseek(db->pagf, OFF_PAG(db->pagbno), SEEK_SET) < 0
-		    || write(db->pagf, db->pagbuf, PBLKSIZ) < 0)
-			return 0;
-
-	} while (--smax);
-/*
- * if we are here, this is real bad news. After SPLTMAX splits,
- * we still cannot fit the key. say goodnight.
- */
-#if BADMESS
-	(void) (write(2, "sdbm: cannot insert after SPLTMAX attempts.\n", 44) < 0);
-#endif
-	return 0;
-
-}
-
-/*
- * the following two routines will break if
- * deletions aren't taken into account. (ndbm bug)
- */
-datum
-sdbm_firstkey(register DBM *db)
-{
-	if (db == NULL)
-		return errno = EINVAL, nullitem;
-/*
- * start at page 0
- */
-	(void) memset(db->pagbuf, 0, PBLKSIZ);
-	if (lseek(db->pagf, OFF_PAG(0), SEEK_SET) < 0
-	    || read(db->pagf, db->pagbuf, PBLKSIZ) < 0)
-		return ioerr(db), nullitem;
-	db->pagbno = 0;
-	db->blkptr = 0;
-	db->keyptr = 0;
-
-	return getnext(db);
-}
-
-datum
-sdbm_nextkey(register DBM *db)
-{
-	if (db == NULL)
-		return errno = EINVAL, nullitem;
-	return getnext(db);
-}
-
-/*
- * all important binary trie traversal
- */
-static int
-getpage(register DBM *db, register long int hash)
-{
-	register int hbit;
-	register long dbit;
-	register long pagb;
-
-	dbit = 0;
-	hbit = 0;
-	while (dbit < db->maxbno && getdbit(db, dbit))
-		dbit = 2 * dbit + ((hash & ((long) 1 << hbit++)) ? 2 : 1);
-
-	debug(("dbit: %ld...", dbit));
-
-	db->curbit = dbit;
-	db->hmask = masks[hbit];
-
-	pagb = hash & db->hmask;
-/*
- * see if the block we need is already in memory.
- * note: this lookaside cache has about 10% hit rate.
- */
-	if (pagb != db->pagbno) {
-/*
- * note: here, we assume a "hole" is read as 0s.
- * if not, must zero pagbuf first.
- */
-		(void) memset(db->pagbuf, 0, PBLKSIZ);
-
-		if (lseek(db->pagf, OFF_PAG(pagb), SEEK_SET) < 0
-		    || read(db->pagf, db->pagbuf, PBLKSIZ) < 0)
-			return 0;
-		if (!chkpage(db->pagbuf)) {
-			return 0;
-		}
-		db->pagbno = pagb;
-
-		debug(("pag read: %ld\n", pagb));
-	}
-	return 1;
-}
-
-static int
-getdbit(register DBM *db, register long int dbit)
-{
-	register long c;
-	register long dirb;
-
-	c = dbit / BYTESIZ;
-	dirb = c / DBLKSIZ;
-
-	if (dirb != db->dirbno) {
-		if (lseek(db->dirf, OFF_DIR(dirb), SEEK_SET) < 0
-		    || read(db->dirf, db->dirbuf, DBLKSIZ) < 0)
-			return 0;
-		db->dirbno = dirb;
-
-		debug(("dir read: %ld\n", dirb));
-	}
-
-	return db->dirbuf[c % DBLKSIZ] & (1 << (dbit % BYTESIZ));
-}
-
-static int
-setdbit(register DBM *db, register long int dbit)
-{
-	register long c;
-	register long dirb;
-
-	c = dbit / BYTESIZ;
-	dirb = c / DBLKSIZ;
-
-	if (dirb != db->dirbno) {
-		if (lseek(db->dirf, OFF_DIR(dirb), SEEK_SET) < 0
-		    || read(db->dirf, db->dirbuf, DBLKSIZ) < 0)
-			return 0;
-		db->dirbno = dirb;
-
-		debug(("dir read: %ld\n", dirb));
-	}
-
-	db->dirbuf[c % DBLKSIZ] |= (1 << (dbit % BYTESIZ));
-
-	if (dbit >= db->maxbno)
-		db->maxbno += (long) DBLKSIZ * BYTESIZ;
-
-	if (lseek(db->dirf, OFF_DIR(dirb), SEEK_SET) < 0
-	    || write(db->dirf, db->dirbuf, DBLKSIZ) < 0)
-		return 0;
-
-	return 1;
-}
-
-/*
- * getnext - get the next key in the page, and if done with
- * the page, try the next page in sequence
- */
-static datum
-getnext(register DBM *db)
-{
-	datum key;
-
-	for (;;) {
-		db->keyptr++;
-		key = getnkey(db->pagbuf, db->keyptr);
-		if (key.dptr != NULL)
-			return key;
-/*
- * we either run out, or there is nothing on this page..
- * try the next one... If we lost our position on the
- * file, we will have to seek.
- */
-		db->keyptr = 0;
-		if (db->pagbno != db->blkptr++)
-			if (lseek(db->pagf, OFF_PAG(db->blkptr), SEEK_SET) < 0)
-				break;
-		db->pagbno = db->blkptr;
-		if (read(db->pagf, db->pagbuf, PBLKSIZ) <= 0)
-			break;
-		if (!chkpage(db->pagbuf)) {
-			break;
-		}
-	}
-
-	return ioerr(db), nullitem;
-}
-
-/* pair.c */
-/*
- * sdbm - ndbm work-alike hashed database library
- * based on Per-Aake Larson's Dynamic Hashing algorithms. BIT 18 (1978).
- * author: oz@nexus.yorku.ca
- * status: public domain.
- *
- * page-level routines
- */
-
-#ifndef BSD42
-/*#include <memory.h>*/
-#endif
-
-#define exhash(item)	sdbm_hash((item).dptr, (item).dsize)
-
-/*
- * forward
- */
-static int seepair proto((char *, int, char *, int));
-
-/*
- * page format:
- *	+------------------------------+
- * ino	| n | keyoff | datoff | keyoff |
- * 	+------------+--------+--------+
- *	| datoff | - - - ---->	       |
- *	+--------+---------------------+
- *	|	 F R E E A R E A       |
- *	+--------------+---------------+
- *	|  <---- - - - | data          |
- *	+--------+-----+----+----------+
- *	|  key   | data     | key      |
- *	+--------+----------+----------+
- *
- * calculating the offsets for free area:  if the number
- * of entries (ino[0]) is zero, the offset to the END of
- * the free area is the block size. Otherwise, it is the
- * nth (ino[ino[0]]) entry's offset.
- */
-
-static int
-fitpair(char *pag, int need)
-{
-	register int n;
-	register int off;
-	register int free;
-	register short *ino = (short *) pag;
-
-	off = ((n = GET_SHORT(ino,0)) > 0) ? GET_SHORT(ino,n) : PBLKSIZ;
-	free = off - (n + 1) * (int)sizeof(short);
-	need += 2 * (int)sizeof(short);
-
-	debug(("free %d need %d\n", free, need));
-
-	return need <= free;
-}
-
-static void
-putpair(char *pag, datum key, datum val)
-{
-	register int n;
-	register int off;
-	register short *ino = (short *) pag;
-
-	off = ((n = GET_SHORT(ino,0)) > 0) ? GET_SHORT(ino,n) : PBLKSIZ;
-/*
- * enter the key first
- */
-	off -= key.dsize;
-	if (key.dsize)
-		(void) memcpy(pag + off, key.dptr, key.dsize);
-	PUT_SHORT(ino,n + 1,off);
-/*
- * now the data
- */
-	off -= val.dsize;
-	if (val.dsize)
-		(void) memcpy(pag + off, val.dptr, val.dsize);
-	PUT_SHORT(ino,n + 2,off);
-/*
- * adjust item count
- */
-	PUT_SHORT(ino,0,GET_SHORT(ino,0) + 2);
-}
-
-static datum
-getpair(char *pag, datum key)
-{
-	register int i;
-	register int n;
-	datum val;
-	register short *ino = (short *) pag;
-
-	if ((n = GET_SHORT(ino,0)) == 0)
-		return nullitem;
-
-	if ((i = seepair(pag, n, key.dptr, key.dsize)) == 0)
-		return nullitem;
-
-	val.dptr = pag + GET_SHORT(ino,i + 1);
-	val.dsize = GET_SHORT(ino,i) - GET_SHORT(ino,i + 1);
-	return val;
-}
-
-#if SEEDUPS
-static int
-duppair(char *pag, datum key)
-{
-	register short *ino = (short *) pag;
-	return GET_SHORT(ino,0) > 0 &&
-		   seepair(pag, GET_SHORT(ino,0), key.dptr, key.dsize) > 0;
-}
-#endif
-
-static datum
-getnkey(char *pag, int num)
-{
-	datum key;
-	register int off;
-	register short *ino = (short *) pag;
-
-	num = num * 2 - 1;
-	if (GET_SHORT(ino,0) == 0 || num > GET_SHORT(ino,0))
-		return nullitem;
-
-	off = (num > 1) ? GET_SHORT(ino,num - 1) : PBLKSIZ;
-
-	key.dptr = pag + GET_SHORT(ino,num);
-	key.dsize = off - GET_SHORT(ino,num);
-
-	return key;
-}
-
-static int
-delpair(char *pag, datum key)
-{
-	register int n;
-	register int i;
-	register short *ino = (short *) pag;
-
-	if ((n = GET_SHORT(ino,0)) == 0)
-		return 0;
-
-	if ((i = seepair(pag, n, key.dptr, key.dsize)) == 0)
-		return 0;
-/*
- * found the key. if it is the last entry
- * [i.e. i == n - 1] we just adjust the entry count.
- * hard case: move all data down onto the deleted pair,
- * shift offsets onto deleted offsets, and adjust them.
- * [note: 0 < i < n]
- */
-	if (i < n - 1) {
-		register int m;
-		register char *dst = pag + (i == 1 ? PBLKSIZ : GET_SHORT(ino,i - 1));
-		register char *src = pag + GET_SHORT(ino,i + 1);
-		register ptrdiff_t   zoo = dst - src;
-
-		debug(("free-up %"PRIdPTRDIFF" ", zoo));
-/*
- * shift data/keys down
- */
-		m = GET_SHORT(ino,i + 1) - GET_SHORT(ino,n);
-#ifdef DUFF
-#define MOVB 	*--dst = *--src
-
-		if (m > 0) {
-			register int loop = (m + 8 - 1) >> 3;
-
-			switch (m & (8 - 1)) {
-			case 0:	do {
-				MOVB;	case 7:	MOVB;
-			case 6:	MOVB;	case 5:	MOVB;
-			case 4:	MOVB;	case 3:	MOVB;
-			case 2:	MOVB;	case 1:	MOVB;
-				} while (--loop);
-			}
-		}
-#else
-#ifdef MEMMOVE
-		memmove(dst-m, src-m, m);
-#else
-		while (m--)
-			*--dst = *--src;
-#endif
-#endif
-/*
- * adjust offset index up
- */
-		while (i < n - 1) {
-			PUT_SHORT(ino,i, GET_SHORT(ino,i + 2) + zoo);
-			i++;
-		}
-	}
-	PUT_SHORT(ino, 0, GET_SHORT(ino, 0) - 2);
-	return 1;
-}
-
-/*
- * search for the key in the page.
- * return offset index in the range 0 < i < n.
- * return 0 if not found.
- */
-static int
-seepair(char *pag, register int n, register char *key, register int siz)
-{
-	register int i;
-	register int off = PBLKSIZ;
-	register short *ino = (short *) pag;
-
-	for (i = 1; i < n; i += 2) {
-		if (siz == off - GET_SHORT(ino,i) &&
-		    memcmp(key, pag + GET_SHORT(ino,i), siz) == 0)
-			return i;
-		off = GET_SHORT(ino,i + 1);
-	}
-	return 0;
-}
-
-static void
-splpage(char *pag, char *new, long int sbit)
-{
-	datum key;
-	datum val;
-
-	register int n;
-	register int off = PBLKSIZ;
-	char cur[PBLKSIZ];
-	register short *ino = (short *) cur;
-
-	(void) memcpy(cur, pag, PBLKSIZ);
-	(void) memset(pag, 0, PBLKSIZ);
-	(void) memset(new, 0, PBLKSIZ);
-
-	n = GET_SHORT(ino,0);
-	for (ino++; n > 0; ino += 2) {
-		key.dptr = cur + GET_SHORT(ino,0);
-		key.dsize = off - GET_SHORT(ino,0);
-		val.dptr = cur + GET_SHORT(ino,1);
-		val.dsize = GET_SHORT(ino,0) - GET_SHORT(ino,1);
-/*
- * select the page pointer (by looking at sbit) and insert
- */
-		(void) putpair((exhash(key) & sbit) ? new : pag, key, val);
-
-		off = GET_SHORT(ino,1);
-		n -= 2;
-	}
-
-	debug(("%d split %d/%d\n", ((short *) cur)[0] / 2,
-	       ((short *) new)[0] / 2,
-	       ((short *) pag)[0] / 2));
-}
-
-/*
- * check page sanity:
- * number of entries should be something
- * reasonable, and all offsets in the index should be in order.
- * this could be made more rigorous.
- */
-static int
-chkpage(char *pag)
-{
-	register int n;
-	register int off;
-	register short *ino = (short *) pag;
-
-	if ((n = GET_SHORT(ino,0)) < 0 || n > PBLKSIZ / (int)sizeof(short))
-		return 0;
-
-	if (n > 0) {
-		off = PBLKSIZ;
-		for (ino++; n > 0; ino += 2) {
-			if (GET_SHORT(ino,0) > off || GET_SHORT(ino,1) > off ||
-			    GET_SHORT(ino,1) > GET_SHORT(ino,0))
-				return 0;
-			off = GET_SHORT(ino,1);
-			n -= 2;
-		}
-	}
-	return 1;
-}
-
-/* hash.c */
-/*
- * sdbm - ndbm work-alike hashed database library
- * based on Per-Aake Larson's Dynamic Hashing algorithms. BIT 18 (1978).
- * author: oz@nexus.yorku.ca
- * status: public domain. keep it that way.
- *
- * hashing routine
- */
-
-/*
- * polynomial conversion ignoring overflows
- * [this seems to work remarkably well, in fact better
- * then the ndbm hash function. Replace at your own risk]
- * use: 65599	nice.
- *      65587   even better.
- */
-long
-sdbm_hash(register char *str, register int len)
-{
-	register unsigned long n = 0;
-
-#ifdef DUFF
-
-#define HASHC	n = *str++ + 65599 * n
-
-	if (len > 0) {
-		register int loop = (len + 8 - 1) >> 3;
-
-		switch(len & (8 - 1)) {
-		case 0:	do {
-			HASHC;	case 7:	HASHC;
-		case 6:	HASHC;	case 5:	HASHC;
-		case 4:	HASHC;	case 3:	HASHC;
-		case 2:	HASHC;	case 1:	HASHC;
-			} while (--loop);
-		}
-
-	}
-#else
-	while (len--)
-		n = ((*str++) & 255) + 65587L * n;
-#endif
-	return n;
-}
diff --git a/ext/sdbm/depend b/ext/sdbm/depend
deleted file mode 100644
index aeb2099e18..0000000000
--- a/ext/sdbm/depend
+++ /dev/null
@@ -1,25 +0,0 @@
-# AUTOGENERATED DEPENDENCIES START
-_sdbm.o: $(RUBY_EXTCONF_H)
-_sdbm.o: $(arch_hdrdir)/ruby/config.h
-_sdbm.o: $(hdrdir)/ruby/backward.h
-_sdbm.o: $(hdrdir)/ruby/defines.h
-_sdbm.o: $(hdrdir)/ruby/intern.h
-_sdbm.o: $(hdrdir)/ruby/missing.h
-_sdbm.o: $(hdrdir)/ruby/ruby.h
-_sdbm.o: $(hdrdir)/ruby/st.h
-_sdbm.o: $(hdrdir)/ruby/subst.h
-_sdbm.o: _sdbm.c
-_sdbm.o: sdbm.h
-init.o: $(RUBY_EXTCONF_H)
-init.o: $(arch_hdrdir)/ruby/config.h
-init.o: $(hdrdir)/ruby/backward.h
-init.o: $(hdrdir)/ruby/defines.h
-init.o: $(hdrdir)/ruby/intern.h
-init.o: $(hdrdir)/ruby/missing.h
-init.o: $(hdrdir)/ruby/ruby.h
-init.o: $(hdrdir)/ruby/st.h
-init.o: $(hdrdir)/ruby/subst.h
-init.o: $(top_srcdir)/include/ruby.h
-init.o: init.c
-init.o: sdbm.h
-# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/sdbm/extconf.rb b/ext/sdbm/extconf.rb
deleted file mode 100644
index bdf3e299e6..0000000000
--- a/ext/sdbm/extconf.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# frozen_string_literal: false
-require 'mkmf'
-
-$defs << "-D""BADMESS=0"
-create_makefile("sdbm")
diff --git a/ext/sdbm/init.c b/ext/sdbm/init.c
deleted file mode 100644
index 684f31b98f..0000000000
--- a/ext/sdbm/init.c
+++ /dev/null
@@ -1,1067 +0,0 @@
-/************************************************
-
-  sdbminit.c -
-
-  $Author$
-  created at: Fri May  7 08:34:24 JST 1999
-
-  Copyright (C) 1995-2001 Yukihiro Matsumoto
-
-************************************************/
-
-#include "ruby.h"
-
-#include "sdbm.h"
-#include <fcntl.h>
-#include <errno.h>
-
-/*
- * Document-class: SDBM
- *
- * SDBM provides a simple file-based key-value store, which can only store
- * String keys and values.
- *
- * Note that Ruby comes with the source code for SDBM, while the DBM and GDBM
- * standard libraries rely on external libraries and headers.
- *
- * === Examples
- *
- * Insert values:
- *
- *   require 'sdbm'
- *
- *   SDBM.open 'my_database' do |db|
- *     db['apple'] = 'fruit'
- *     db['pear'] = 'fruit'
- *     db['carrot'] = 'vegetable'
- *     db['tomato'] = 'vegetable'
- *   end
- *
- * Bulk update:
- *
- *   require 'sdbm'
- *
- *   SDBM.open 'my_database' do |db|
- *     db.update('peach' => 'fruit', 'tomato' => 'fruit')
- *   end
- *
- * Retrieve values:
- *
- *   require 'sdbm'
- *
- *   SDBM.open 'my_database' do |db|
- *     db.each do |key, value|
- *       puts "Key: #{key}, Value: #{value}"
- *     end
- *   end
- *
- * Outputs:
- *
- *   Key: apple, Value: fruit
- *   Key: pear, Value: fruit
- *   Key: carrot, Value: vegetable
- *   Key: peach, Value: fruit
- *   Key: tomato, Value: fruit
- */
-
-static VALUE rb_cDBM, rb_eDBMError;
-
-struct dbmdata {
-    int  di_size;
-    DBM *di_dbm;
-};
-
-static void
-closed_sdbm(void)
-{
-    rb_raise(rb_eDBMError, "closed SDBM file");
-}
-
-#define GetDBM(obj, dbmp) do {\
-    TypedData_Get_Struct((obj), struct dbmdata, &sdbm_type, (dbmp));\
-    if ((dbmp) == 0) closed_sdbm();\
-    if ((dbmp)->di_dbm == 0) closed_sdbm();\
-} while (0)
-
-#define GetDBM2(obj, dbmp, dbm) do {\
-    GetDBM((obj), (dbmp));\
-    (dbm) = (dbmp)->di_dbm;\
-} while (0)
-
-static void
-free_sdbm(void *ptr)
-{
-    struct dbmdata *dbmp = ptr;
-
-    if (dbmp->di_dbm) sdbm_close(dbmp->di_dbm);
-    ruby_xfree(dbmp);
-}
-
-static size_t
-memsize_dbm(const void *ptr)
-{
-    size_t size = 0;
-    const struct dbmdata *dbmp = ptr;
-    if (dbmp) {
-	size += sizeof(*dbmp);
-	if (dbmp->di_dbm) size += sizeof(DBM);
-    }
-    return size;
-}
-
-static const rb_data_type_t sdbm_type = {
-    "sdbm",
-    {0, free_sdbm, memsize_dbm,},
-    0, 0,
-    RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
-/*
- * call-seq:
- *   sdbm.close -> nil
- *
- * Closes the database file.
- *
- * Raises SDBMError if the database is already closed.
- */
-static VALUE
-fsdbm_close(VALUE obj)
-{
-    struct dbmdata *dbmp;
-
-    GetDBM(obj, dbmp);
-    sdbm_close(dbmp->di_dbm);
-    dbmp->di_dbm = 0;
-
-    return Qnil;
-}
-
-/*
- * call-seq:
- *   sdbm.closed? -> true or false
- *
- * Returns +true+ if the database is closed.
- */
-static VALUE
-fsdbm_closed(VALUE obj)
-{
-    struct dbmdata *dbmp;
-
-    TypedData_Get_Struct(obj, struct dbmdata, &sdbm_type, dbmp);
-    if (dbmp == 0)
-	return Qtrue;
-    if (dbmp->di_dbm == 0)
-	return Qtrue;
-
-    return Qfalse;
-}
-
-static VALUE
-fsdbm_alloc(VALUE klass)
-{
-    return TypedData_Wrap_Struct(klass, &sdbm_type, 0);
-}
-/*
- * call-seq:
- *   SDBM.new(filename, mode = 0666)
- *
- * Creates a new database handle by opening the given +filename+. SDBM actually
- * uses two physical files, with extensions '.dir' and '.pag'. These extensions
- * will automatically be appended to the +filename+.
- *
- * If the file does not exist, a new file will be created using the given
- * +mode+, unless +mode+ is explicitly set to nil. In the latter case, no
- * database will be created.
- *
- * If the file exists, it will be opened in read/write mode. If this fails, it
- * will be opened in read-only mode.
- */
-static VALUE
-fsdbm_initialize(int argc, VALUE *argv, VALUE obj)
-{
-    VALUE file, vmode;
-    DBM *dbm;
-    struct dbmdata *dbmp;
-    int mode;
-
-    if (rb_scan_args(argc, argv, "11", &file, &vmode) == 1) {
-	mode = 0666;		/* default value */
-    }
-    else if (NIL_P(vmode)) {
-	mode = -1;		/* return nil if DB not exist */
-    }
-    else {
-	mode = NUM2INT(vmode);
-    }
-    FilePathValue(file);
-
-    dbm = 0;
-    if (mode >= 0)
-	dbm = sdbm_open(RSTRING_PTR(file), O_RDWR|O_CREAT, mode);
-    if (!dbm)
-	dbm = sdbm_open(RSTRING_PTR(file), O_RDWR, 0);
-    if (!dbm)
-	dbm = sdbm_open(RSTRING_PTR(file), O_RDONLY, 0);
-
-    if (!dbm) {
-	if (mode == -1) return Qnil;
-	rb_sys_fail_str(file);
-    }
-
-    dbmp = ALLOC(struct dbmdata);
-    DATA_PTR(obj) = dbmp;
-    dbmp->di_dbm = dbm;
-    dbmp->di_size = -1;
-
-    return obj;
-}
-
-/*
- * call-seq:
- *   SDBM.open(filename, mode = 0666)
- *   SDBM.open(filename, mode = 0666) { |sdbm| ... }
- *
- * If called without a block, this is the same as SDBM.new.
- *
- * If a block is given, the new database will be passed to the block and
- * will be safely closed after the block has executed.
- *
- * Example:
- *
- *     require 'sdbm'
- *
- *     SDBM.open('my_database') do |db|
- *       db['hello'] = 'world'
- *     end
- */
-static VALUE
-fsdbm_s_open(int argc, VALUE *argv, VALUE klass)
-{
-    VALUE obj = fsdbm_alloc(klass);
-
-    if (NIL_P(fsdbm_initialize(argc, argv, obj))) {
-	return Qnil;
-    }
-
-    if (rb_block_given_p()) {
-        return rb_ensure(rb_yield, obj, fsdbm_close, obj);
-    }
-
-    return obj;
-}
-
-static VALUE
-fsdbm_fetch(VALUE obj, VALUE keystr, VALUE ifnone)
-{
-    datum key, value;
-    struct dbmdata *dbmp;
-    DBM *dbm;
-
-    ExportStringValue(keystr);
-    key.dptr = RSTRING_PTR(keystr);
-    key.dsize = RSTRING_LENINT(keystr);
-
-    GetDBM2(obj, dbmp, dbm);
-    value = sdbm_fetch(dbm, key);
-    if (value.dptr == 0) {
-	if (ifnone == Qnil && rb_block_given_p())
-	    return rb_yield(rb_external_str_new(key.dptr, key.dsize));
-	return ifnone;
-    }
-    return rb_external_str_new(value.dptr, value.dsize);
-}
-
-/*
- * call-seq:
- *   sdbm[key] -> value or nil
- *
- * Returns the +value+ in the database associated with the given +key+ string.
- *
- * If no value is found, returns +nil+.
- */
-static VALUE
-fsdbm_aref(VALUE obj, VALUE keystr)
-{
-    return fsdbm_fetch(obj, keystr, Qnil);
-}
-
-/*
- * call-seq:
- *   sdbm.fetch(key) -> value or nil
- *   sdbm.fetch(key) { |key| ... }
- *
- * Returns the +value+ in the database associated with the given +key+ string.
- *
- * If a block is provided, the block will be called when there is no
- * +value+ associated with the given +key+. The +key+ will be passed in as an
- * argument to the block.
- *
- * If no block is provided and no value is associated with the given +key+,
- * then an IndexError will be raised.
- */
-static VALUE
-fsdbm_fetch_m(int argc, VALUE *argv, VALUE obj)
-{
-    VALUE keystr, valstr, ifnone;
-
-    rb_scan_args(argc, argv, "11", &keystr, &ifnone);
-    valstr = fsdbm_fetch(obj, keystr, ifnone);
-    if (argc == 1 && !rb_block_given_p() && NIL_P(valstr))
-	rb_raise(rb_eIndexError, "key not found");
-
-    return valstr;
-}
-
-/*
- * call-seq:
- *   sdbm.key(value) -> key
- *
- * Returns the +key+ associated with the given +value+. If more than one
- * +key+ corresponds to the given +value+, then the first key to be found
- * will be returned. If no keys are found, +nil+ will be returned.
- */
-static VALUE
-fsdbm_key(VALUE obj, VALUE valstr)
-{
-    datum key, val;
-    struct dbmdata *dbmp;
-    DBM *dbm;
-
-    ExportStringValue(valstr);
-    val.dptr = RSTRING_PTR(valstr);
-    val.dsize = RSTRING_LENINT(valstr);
-
-    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)
-	    return rb_external_str_new(key.dptr, key.dsize);
-    }
-    return Qnil;
-}
-
-/*
- * :nodoc:
- */
-static VALUE
-fsdbm_index(VALUE hash, VALUE value)
-{
-    rb_warn("SDBM#index is deprecated; use SDBM#key");
-    return fsdbm_key(hash, value);
-}
-
-/* call-seq:
- *   sdbm.select { |key, value| ... } -> Array
- *
- * Returns a new Array of key-value pairs for which the block returns +true+.
- *
- * Example:
- *
- *    require 'sdbm'
- *
- *    SDBM.open 'my_database' do |db|
- *      db['apple'] = 'fruit'
- *      db['pear'] = 'fruit'
- *      db['spinach'] = 'vegetable'
- *
- *      veggies = db.select do |key, value|
- *        value == 'vegetable'
- *      end #=> [["apple", "fruit"], ["pear", "fruit"]]
- *    end
- */
-static VALUE
-fsdbm_select(VALUE obj)
-{
-    VALUE new = rb_ary_new();
-    datum key, val;
-    DBM *dbm;
-    struct dbmdata *dbmp;
-
-    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_external_str_new(key.dptr, key.dsize),
-			     rb_external_str_new(val.dptr, val.dsize));
-	v = rb_yield(assoc);
-	if (RTEST(v)) {
-	    rb_ary_push(new, assoc);
-	}
-	GetDBM2(obj, dbmp, dbm);
-    }
-
-    return new;
-}
-
-/* call-seq:
- *   sdbm.values_at(key, ...) -> Array
- *
- * Returns an Array of values corresponding to the given keys.
- */
-static VALUE
-fsdbm_values_at(int argc, VALUE *argv, VALUE obj)
-{
-    VALUE new = rb_ary_new2(argc);
-    int i;
-
-    for (i=0; i<argc; i++) {
-        rb_ary_push(new, fsdbm_fetch(obj, argv[i], Qnil));
-    }
-
-    return new;
-}
-
-static void
-fdbm_modify(VALUE obj)
-{
-    if (OBJ_FROZEN(obj)) rb_error_frozen("SDBM");
-}
-
-/*
- * call-seq:
- *   sdbm.delete(key) -> value or nil
- *   sdbm.delete(key) { |key, value| ... }
- *
- * Deletes the key-value pair corresponding to the given +key+. If the
- * +key+ exists, the deleted value will be returned, otherwise +nil+.
- *
- * If a block is provided, the deleted +key+ and +value+ will be passed to
- * the block as arguments. If the +key+ does not exist in the database, the
- * value will be +nil+.
- */
-static VALUE
-fsdbm_delete(VALUE obj, VALUE keystr)
-{
-    datum key, value;
-    struct dbmdata *dbmp;
-    DBM *dbm;
-    VALUE valstr;
-
-    fdbm_modify(obj);
-    ExportStringValue(keystr);
-    key.dptr = RSTRING_PTR(keystr);
-    key.dsize = RSTRING_LENINT(keystr);
-
-    GetDBM2(obj, dbmp, dbm);
-    dbmp->di_size = -1;
-
-    value = sdbm_fetch(dbm, key);
-    if (value.dptr == 0) {
-	if (rb_block_given_p()) return rb_yield(keystr);
-	return Qnil;
-    }
-
-    /* need to save value before sdbm_delete() */
-    valstr = rb_external_str_new(value.dptr, value.dsize);
-
-    if (sdbm_delete(dbm, key)) {
-	dbmp->di_size = -1;
-	rb_raise(rb_eDBMError, "dbm_delete failed");
-    }
-    else if (dbmp->di_size >= 0) {
-	dbmp->di_size--;
-    }
-    return valstr;
-}
-
-/*
- * call-seq:
- *   sdbm.shift -> Array or nil
- *
- * Removes a key-value pair from the database and returns them as an
- * Array. If the database is empty, returns +nil+.
- */
-static VALUE
-fsdbm_shift(VALUE obj)
-{
-    datum key, val;
-    struct dbmdata *dbmp;
-    DBM *dbm;
-    VALUE keystr, valstr;
-
-    fdbm_modify(obj);
-    GetDBM2(obj, dbmp, dbm);
-    key = sdbm_firstkey(dbm);
-    if (!key.dptr) return Qnil;
-    val = sdbm_fetch(dbm, key);
-    keystr = rb_external_str_new(key.dptr, key.dsize);
-    valstr = rb_external_str_new(val.dptr, val.dsize);
-    sdbm_delete(dbm, key);
-    if (dbmp->di_size >= 0) {
-	dbmp->di_size--;
-    }
-
-    return rb_assoc_new(keystr, valstr);
-}
-
-/*
- * call-seq:
- *   sdbm.delete_if { |key, value| ... } -> self
- *   sdbm.reject!   { |key, value| ... } -> self
- *
- * Iterates over the key-value pairs in the database, deleting those for
- * which the block returns +true+.
- */
-static VALUE
-fsdbm_delete_if(VALUE obj)
-{
-    datum key, val;
-    struct dbmdata *dbmp;
-    DBM *dbm;
-    VALUE keystr, valstr;
-    VALUE ret, ary = rb_ary_new();
-    long i;
-    int status = 0, n;
-
-    fdbm_modify(obj);
-    GetDBM2(obj, dbmp, dbm);
-    n = dbmp->di_size;
-    dbmp->di_size = -1;
-    for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
-	val = sdbm_fetch(dbm, key);
-	keystr = rb_external_str_new(key.dptr, key.dsize);
-	valstr = rb_external_str_new(val.dptr, val.dsize);
-        ret = rb_protect(rb_yield, rb_assoc_new(rb_str_dup(keystr), valstr), &status);
-        if (status != 0) break;
-	if (RTEST(ret)) rb_ary_push(ary, keystr);
-	GetDBM2(obj, dbmp, dbm);
-    }
-
-    for (i = 0; i < RARRAY_LEN(ary); i++) {
-	keystr = RARRAY_AREF(ary, i);
-	ExportStringValue(keystr);
-	key.dptr = RSTRING_PTR(keystr);
-	key.dsize = RSTRING_LENINT(keystr);
-	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_LENINT(ary);
-
-    return obj;
-}
-
-/*
- * call-seq:
- *   sdbm.clear -> self
- *
- * Deletes all data from the database.
- */
-static VALUE
-fsdbm_clear(VALUE obj)
-{
-    datum key;
-    struct dbmdata *dbmp;
-    DBM *dbm;
-
-    fdbm_modify(obj);
-    GetDBM2(obj, dbmp, dbm);
-    dbmp->di_size = -1;
-    while (key = sdbm_firstkey(dbm), key.dptr) {
-	if (sdbm_delete(dbm, key)) {
-	    rb_raise(rb_eDBMError, "sdbm_delete failed");
-	}
-    }
-    dbmp->di_size = 0;
-
-    return obj;
-}
-
-/*
- * call-seq:
- *   sdbm.invert -> Hash
- *
- * Returns a Hash in which the key-value pairs have been inverted.
- *
- * Example:
- *
- *   require 'sdbm'
- *
- *   SDBM.open 'my_database' do |db|
- *     db.update('apple' => 'fruit', 'spinach' => 'vegetable')
- *
- *     db.invert  #=> {"fruit" => "apple", "vegetable" => "spinach"}
- *   end
- */
-static VALUE
-fsdbm_invert(VALUE obj)
-{
-    datum key, val;
-    struct dbmdata *dbmp;
-    DBM *dbm;
-    VALUE keystr, valstr;
-    VALUE hash = rb_hash_new();
-
-    GetDBM2(obj, dbmp, dbm);
-    for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
-	val = sdbm_fetch(dbm, key);
-	keystr = rb_external_str_new(key.dptr, key.dsize);
-	valstr = rb_external_str_new(val.dptr, val.dsize);
-	rb_hash_aset(hash, valstr, keystr);
-    }
-    return hash;
-}
-
-/*
- * call-seq:
- *   sdbm[key] = value      -> value
- *   sdbm.store(key, value) -> value
- *
- * Stores a new +value+ in the database with the given +key+ as an index.
- *
- * If the +key+ already exists, this will update the +value+ associated with
- * the +key+.
- *
- * Returns the given +value+.
- */
-static VALUE
-fsdbm_store(VALUE obj, VALUE keystr, VALUE valstr)
-{
-    datum key, val;
-    struct dbmdata *dbmp;
-    DBM *dbm;
-
-    if (valstr == Qnil) {
-	fsdbm_delete(obj, keystr);
-	return Qnil;
-    }
-
-    fdbm_modify(obj);
-    ExportStringValue(keystr);
-    ExportStringValue(valstr);
-
-    key.dptr = RSTRING_PTR(keystr);
-    key.dsize = RSTRING_LENINT(keystr);
-
-    val.dptr = RSTRING_PTR(valstr);
-    val.dsize = RSTRING_LENINT(valstr);
-
-    GetDBM2(obj, dbmp, dbm);
-    dbmp->di_size = -1;
-    if (sdbm_store(dbm, key, val, DBM_REPLACE)) {
-#ifdef HAVE_DBM_CLAERERR
-	sdbm_clearerr(dbm);
-#endif
-	if (errno == EPERM) rb_sys_fail(0);
-	rb_raise(rb_eDBMError, "sdbm_store failed");
-    }
-
-    return valstr;
-}
-
-static VALUE
-update_i(RB_BLOCK_CALL_FUNC_ARGLIST(pair, dbm))
-{
-    const VALUE *ptr;
-    Check_Type(pair, T_ARRAY);
-    if (RARRAY_LEN(pair) < 2) {
-	rb_raise(rb_eArgError, "pair must be [key, value]");
-    }
-    ptr = RARRAY_CONST_PTR(pair);
-    fsdbm_store(dbm, ptr[0], ptr[1]);
-    return Qnil;
-}
-
-/*
- * call-seq:
- *   sdbm.update(pairs) -> self
- *
- * Insert or update key-value pairs.
- *
- * This method will work with any object which implements an each_pair
- * method, such as a Hash.
- */
-static VALUE
-fsdbm_update(VALUE obj, VALUE other)
-{
-    rb_block_call(other, rb_intern("each_pair"), 0, 0, update_i, obj);
-    return obj;
-}
-
-/*
- * call-seq:
- *   sdbm.replace(pairs) -> self
- *
- * Empties the database, then inserts the given key-value pairs.
- *
- * This method will work with any object which implements an each_pair
- * method, such as a Hash.
- */
-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;
-}
-
-/*
- * call-seq:
- *   sdbm.length -> integer
- *   sdbm.size -> integer
- *
- * Returns the number of keys in the database.
- */
-static VALUE
-fsdbm_length(VALUE obj)
-{
-    datum key;
-    struct dbmdata *dbmp;
-    DBM *dbm;
-    int i = 0;
-
-    GetDBM2(obj, dbmp, dbm);
-    if (dbmp->di_size > 0) return INT2FIX(dbmp->di_size);
-
-    for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
-	i++;
-    }
-    dbmp->di_size = i;
-
-    return INT2FIX(i);
-}
-
-/*
- * call-seq:
- *   sdbm.empty? -> true or false
- *
- * Returns +true+ if the database is empty.
- */
-static VALUE
-fsdbm_empty_p(VALUE obj)
-{
-    datum key;
-    struct dbmdata *dbmp;
-    DBM *dbm;
-
-    GetDBM(obj, dbmp);
-    if (dbmp->di_size < 0) {
-	dbm = dbmp->di_dbm;
-
-	for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
-	    return Qfalse;
-	}
-    }
-    else {
-	if (dbmp->di_size)
-	    return Qfalse;
-    }
-    return Qtrue;
-}
-
-/*
- * call-seq:
- *   sdbm.each_value
- *   sdbm.each_value { |value| ... }
- *
- * Iterates over each +value+ in the database.
- *
- * If no block is given, returns an Enumerator.
- */
-static VALUE
-fsdbm_each_value(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);
-	rb_yield(rb_external_str_new(val.dptr, val.dsize));
-	GetDBM2(obj, dbmp, dbm);
-    }
-    return obj;
-}
-
-/*
- * call-seq:
- *   sdbm.each_key
- *   sdbm.each_key { |key| ... }
- *
- * Iterates over each +key+ in the database.
- *
- * If no block is given, returns an Enumerator.
- */
-static VALUE
-fsdbm_each_key(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_external_str_new(key.dptr, key.dsize));
-	GetDBM2(obj, dbmp, dbm);
-    }
-    return obj;
-}
-
-/*
- * call-seq:
- *   sdbm.each
- *   sdbm.each { |key, value| ... }
- *   sdbm.each_pair
- *   sdbm.each_pair { |key, value| ... }
- *
- * Iterates over each key-value pair in the database.
- *
- * If no block is given, returns an Enumerator.
- */
-static VALUE
-fsdbm_each_pair(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);
-	keystr = rb_external_str_new(key.dptr, key.dsize);
-	valstr = rb_external_str_new(val.dptr, val.dsize);
-	rb_yield(rb_assoc_new(keystr, valstr));
-	GetDBM2(obj, dbmp, dbm);
-    }
-
-    return obj;
-}
-
-/*
- * call-seq:
- *   sdbm.keys -> Array
- *
- * Returns a new Array containing the keys in the database.
- */
-static VALUE
-fsdbm_keys(VALUE obj)
-{
-    datum key;
-    struct dbmdata *dbmp;
-    DBM *dbm;
-    VALUE ary;
-
-    GetDBM2(obj, dbmp, dbm);
-    ary = rb_ary_new();
-    for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
-	rb_ary_push(ary, rb_external_str_new(key.dptr, key.dsize));
-    }
-
-    return ary;
-}
-
-/*
- * call-seq:
- *   sdbm.values -> Array
- *
- * Returns a new Array containing the values in the database.
- */
-static VALUE
-fsdbm_values(VALUE obj)
-{
-    datum key, val;
-    struct dbmdata *dbmp;
-    DBM *dbm;
-    VALUE ary;
-
-    GetDBM2(obj, dbmp, dbm);
-    ary = rb_ary_new();
-    for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
-	val = sdbm_fetch(dbm, key);
-	rb_ary_push(ary, rb_external_str_new(val.dptr, val.dsize));
-    }
-
-    return ary;
-}
-
-/*
- * call-seq:
- *   sdbm.include?(key) -> true or false
- *   sdbm.key?(key) -> true or false
- *   sdbm.member?(key) -> true or false
- *   sdbm.has_key?(key) -> true or false
- *
- * Returns +true+ if the database contains the given +key+.
- */
-static VALUE
-fsdbm_has_key(VALUE obj, VALUE keystr)
-{
-    datum key, val;
-    struct dbmdata *dbmp;
-    DBM *dbm;
-
-    ExportStringValue(keystr);
-    key.dptr = RSTRING_PTR(keystr);
-    key.dsize = RSTRING_LENINT(keystr);
-
-    GetDBM2(obj, dbmp, dbm);
-    val = sdbm_fetch(dbm, key);
-    if (val.dptr) return Qtrue;
-    return Qfalse;
-}
-
-/*
- * call-seq:
- *   sdbm.value?(key) -> true or false
- *   sdbm.has_value?(key) -> true or false
- *
- * Returns +true+ if the database contains the given +value+.
- */
-static VALUE
-fsdbm_has_value(VALUE obj, VALUE valstr)
-{
-    datum key, val;
-    struct dbmdata *dbmp;
-    DBM *dbm;
-
-    ExportStringValue(valstr);
-    val.dptr = RSTRING_PTR(valstr);
-    val.dsize = RSTRING_LENINT(valstr);
-
-    GetDBM2(obj, dbmp, dbm);
-    for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
-	val = sdbm_fetch(dbm, key);
-	if (val.dsize == RSTRING_LENINT(valstr) &&
-	    memcmp(val.dptr, RSTRING_PTR(valstr), val.dsize) == 0)
-	    return Qtrue;
-    }
-    return Qfalse;
-}
-
-/*
- * call-seq:
- *   sdbm.to_a -> Array
- *
- * Returns a new Array containing each key-value pair in the database.
- *
- * Example:
- *
- *   require 'sdbm'
- *
- *   SDBM.open 'my_database' do |db|
- *     db.update('apple' => 'fruit', 'spinach' => 'vegetable')
- *
- *     db.to_a  #=> [["apple", "fruit"], ["spinach", "vegetable"]]
- *   end
- */
-static VALUE
-fsdbm_to_a(VALUE obj)
-{
-    datum key, val;
-    struct dbmdata *dbmp;
-    DBM *dbm;
-    VALUE ary;
-
-    GetDBM2(obj, dbmp, dbm);
-    ary = rb_ary_new();
-    for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
-	val = sdbm_fetch(dbm, key);
-	rb_ary_push(ary, rb_assoc_new(rb_external_str_new(key.dptr, key.dsize),
-				      rb_external_str_new(val.dptr, val.dsize)));
-    }
-
-    return ary;
-}
-
-/*
- * call-seq:
- *   sdbm.to_hash -> Hash
- *
- * Returns a new Hash containing each key-value pair in the database.
- */
-static VALUE
-fsdbm_to_hash(VALUE obj)
-{
-    datum key, val;
-    struct dbmdata *dbmp;
-    DBM *dbm;
-    VALUE hash;
-
-    GetDBM2(obj, dbmp, dbm);
-    hash = rb_hash_new();
-    for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
-	val = sdbm_fetch(dbm, key);
-	rb_hash_aset(hash, rb_external_str_new(key.dptr, key.dsize),
-		           rb_external_str_new(val.dptr, val.dsize));
-    }
-
-    return hash;
-}
-
-/*
- * call-seq:
- *   sdbm.reject { |key, value| ... } -> Hash
- *
- * Creates a new Hash using the key-value pairs from the database, then
- * calls Hash#reject with the given block, which returns a Hash with
- * only the key-value pairs for which the block returns +false+.
- */
-static VALUE
-fsdbm_reject(VALUE obj)
-{
-    return rb_hash_delete_if(fsdbm_to_hash(obj));
-}
-
-void
-Init_sdbm(void)
-{
-    rb_cDBM = rb_define_class("SDBM", rb_cObject);
-    rb_eDBMError = rb_define_class("SDBMError", rb_eStandardError);
-    /* Document-class: SDBMError
-     * Exception class used to return errors from the sdbm library.
-     */
-    rb_include_module(rb_cDBM, rb_mEnumerable);
-
-    rb_define_alloc_func(rb_cDBM, fsdbm_alloc);
-    rb_define_singleton_method(rb_cDBM, "open", fsdbm_s_open, -1);
-
-    rb_define_method(rb_cDBM, "initialize", fsdbm_initialize, -1);
-    rb_define_method(rb_cDBM, "close", fsdbm_close, 0);
-    rb_define_method(rb_cDBM, "closed?", fsdbm_closed, 0);
-    rb_define_method(rb_cDBM, "[]", fsdbm_aref, 1);
-    rb_define_method(rb_cDBM, "fetch", fsdbm_fetch_m, -1);
-    rb_define_method(rb_cDBM, "[]=", fsdbm_store, 2);
-    rb_define_method(rb_cDBM, "store", fsdbm_store, 2);
-    rb_define_method(rb_cDBM, "index",  fsdbm_index, 1);
-    rb_define_method(rb_cDBM, "key",  fsdbm_key, 1);
-    rb_define_method(rb_cDBM, "select",  fsdbm_select, 0);
-    rb_define_method(rb_cDBM, "values_at",  fsdbm_values_at, -1);
-    rb_define_method(rb_cDBM, "length", fsdbm_length, 0);
-    rb_define_method(rb_cDBM, "size", fsdbm_length, 0);
-    rb_define_method(rb_cDBM, "empty?", fsdbm_empty_p, 0);
-    rb_define_method(rb_cDBM, "each", fsdbm_each_pair, 0);
-    rb_define_method(rb_cDBM, "each_value", fsdbm_each_value, 0);
-    rb_define_method(rb_cDBM, "each_key", fsdbm_each_key, 0);
-    rb_define_method(rb_cDBM, "each_pair", fsdbm_each_pair, 0);
-    rb_define_method(rb_cDBM, "keys", fsdbm_keys, 0);
-    rb_define_method(rb_cDBM, "values", fsdbm_values, 0);
-    rb_define_method(rb_cDBM, "shift", fsdbm_shift, 0);
-    rb_define_method(rb_cDBM, "delete", fsdbm_delete, 1);
-    rb_define_method(rb_cDBM, "delete_if", fsdbm_delete_if, 0);
-    rb_define_method(rb_cDBM, "reject!", fsdbm_delete_if, 0);
-    rb_define_method(rb_cDBM, "reject", fsdbm_reject, 0);
-    rb_define_method(rb_cDBM, "clear", fsdbm_clear, 0);
-    rb_define_method(rb_cDBM,"invert", fsdbm_invert, 0);
-    rb_define_method(rb_cDBM,"update", fsdbm_update, 1);
-    rb_define_method(rb_cDBM,"replace", fsdbm_replace, 1);
-
-    rb_define_method(rb_cDBM, "has_key?", fsdbm_has_key, 1);
-    rb_define_method(rb_cDBM, "include?", fsdbm_has_key, 1);
-    rb_define_method(rb_cDBM, "key?", fsdbm_has_key, 1);
-    rb_define_method(rb_cDBM, "member?", fsdbm_has_key, 1);
-    rb_define_method(rb_cDBM, "has_value?", fsdbm_has_value, 1);
-    rb_define_method(rb_cDBM, "value?", fsdbm_has_value, 1);
-
-    rb_define_method(rb_cDBM, "to_a", fsdbm_to_a, 0);
-    rb_define_method(rb_cDBM, "to_hash", fsdbm_to_hash, 0);
-}
diff --git a/ext/sdbm/sdbm.h b/ext/sdbm/sdbm.h
deleted file mode 100644
index c3b53c4a8f..0000000000
--- a/ext/sdbm/sdbm.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * sdbm - ndbm work-alike hashed database library
- * based on Per-Ake Larson's Dynamic Hashing algorithms. BIT 18 (1978).
- * author: oz@nexus.yorku.ca
- * status: public domain.
- */
-#ifndef	_SDBM_H_
-#define	_SDBM_H_
-
-#include <stdio.h>
-
-#define DBLKSIZ 4096
-#define PBLKSIZ 1024
-#define PAIRMAX 1008			/* arbitrary on PBLKSIZ-N */
-#define SPLTMAX	10			/* maximum allowed splits */
-					/* for a single insertion */
-#define DIRFEXT	".dir"
-#define PAGFEXT	".pag"
-
-typedef struct {
-	int dirf;		       /* directory file descriptor */
-	int pagf;		       /* page file descriptor */
-	int flags;		       /* status/error flags, see below */
-	int keyptr;		       /* current key for nextkey */
-	off_t maxbno;		       /* size of dirfile in bits */
-	long curbit;		       /* current bit number */
-	long hmask;		       /* current hash mask */
-	long blkptr;		       /* current block for nextkey */
-	long blkno;		       /* current page to read/write */
-	long pagbno;		       /* current page in pagbuf */
-	char pagbuf[PBLKSIZ];	       /* page file block buffer */
-	long dirbno;		       /* current block in dirbuf */
-	char dirbuf[DBLKSIZ];	       /* directory file block buffer */
-} DBM;
-
-#define DBM_RDONLY	0x1	       /* data base open read-only */
-#define DBM_IOERR	0x2	       /* data base I/O error */
-
-/*
- * utility macros
- */
-#define sdbm_rdonly(db)		((db)->flags & DBM_RDONLY)
-#define sdbm_error(db)		((db)->flags & DBM_IOERR)
-
-#define sdbm_clearerr(db)	((db)->flags &= ~DBM_IOERR)  /* ouch */
-
-#define sdbm_dirfno(db)	((db)->dirf)
-#define sdbm_pagfno(db)	((db)->pagf)
-
-typedef struct {
-	char *dptr;
-	int dsize;
-} datum;
-
-extern datum nullitem;
-
-#if defined(__STDC__)
-#define proto(p) p
-#else
-#define proto(p) ()
-#endif
-
-/*
- * flags to sdbm_store
- */
-#define DBM_INSERT	0
-#define DBM_REPLACE	1
-
-/*
- * ndbm interface
- */
-extern DBM *sdbm_open proto((char *, int, int));
-extern void sdbm_close proto((DBM *));
-extern datum sdbm_fetch proto((DBM *, datum));
-extern int sdbm_delete proto((DBM *, datum));
-extern int sdbm_store proto((DBM *, datum, datum, int));
-extern datum sdbm_firstkey proto((DBM *));
-extern datum sdbm_nextkey proto((DBM *));
-
-/*
- * other
- */
-extern DBM *sdbm_prep proto((char *, char *, int, int));
-extern long sdbm_hash proto((char *, int));
-
-#endif	/* _SDBM_H_ */
diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c
index 02766ba5d2..546a971760 100644
--- a/ext/socket/ancdata.c
+++ b/ext/socket/ancdata.c
@@ -2,7 +2,6 @@
 
 #include <time.h>
 
-int rsock_cmsg_cloexec_state = -1; /* <0: unknown, 0: ignored, >0: working */
 static VALUE sym_wait_readable, sym_wait_writable;
 
 #if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)
@@ -89,9 +88,9 @@ ancillary_initialize(VALUE self, VALUE vfamily, VALUE vlevel, VALUE vtype, VALUE
 static VALUE
 ancdata_new(int family, int level, int type, VALUE data)
 {
-    NEWOBJ_OF(obj, struct RObject, rb_cAncillaryData, T_OBJECT);
+    VALUE obj = rb_obj_alloc(rb_cAncillaryData);
     StringValue(data);
-    ancillary_initialize((VALUE)obj, INT2NUM(family), INT2NUM(level), INT2NUM(type), data);
+    ancillary_initialize(obj, INT2NUM(family), INT2NUM(level), INT2NUM(type), data);
     return (VALUE)obj;
 }
 
@@ -360,6 +359,8 @@ ancillary_timestamp(VALUE self)
  *
  * The size and endian is dependent on the host.
  *
+ *   require 'socket'
+ *
  *   p Socket::AncillaryData.int(:UNIX, :SOCKET, :RIGHTS, STDERR.fileno)
  *   #=> #<Socket::AncillaryData: UNIX SOCKET RIGHTS 2>
  */
@@ -1135,6 +1136,7 @@ bsock_sendmsg_internal(VALUE sock, VALUE data, VALUE vflags,
     rb_io_t *fptr;
     struct msghdr mh;
     struct iovec iov;
+    VALUE tmp;
     int controls_num;
 #if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)
     VALUE controls_str = 0;
@@ -1149,6 +1151,7 @@ bsock_sendmsg_internal(VALUE sock, VALUE data, VALUE vflags,
 #endif
 
     StringValue(data);
+    tmp = rb_str_tmp_frozen_acquire(data);
 
     if (!RB_TYPE_P(controls, T_ARRAY)) {
 	controls = rb_ary_new();
@@ -1259,8 +1262,8 @@ bsock_sendmsg_internal(VALUE sock, VALUE data, VALUE vflags,
     }
     mh.msg_iovlen = 1;
     mh.msg_iov = &iov;
-    iov.iov_base = RSTRING_PTR(data);
-    iov.iov_len = RSTRING_LEN(data);
+    iov.iov_base = RSTRING_PTR(tmp);
+    iov.iov_len = RSTRING_LEN(tmp);
 #if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)
     if (controls_str) {
         mh.msg_control = RSTRING_PTR(controls_str);
@@ -1293,6 +1296,7 @@ bsock_sendmsg_internal(VALUE sock, VALUE data, VALUE vflags,
 #if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)
     RB_GC_GUARD(controls_str);
 #endif
+    rb_str_tmp_frozen_release(data, tmp);
 
     return SSIZET2NUM(ss);
 }
@@ -1424,10 +1428,7 @@ make_io_for_unix_rights(VALUE ctl, struct cmsghdr *cmh, char *msg_end)
             if (fstat(fd, &stbuf) == -1)
                 rb_raise(rb_eSocket, "invalid fd in SCM_RIGHTS");
             rb_update_max_fd(fd);
-            if (rsock_cmsg_cloexec_state < 0)
-                rsock_cmsg_cloexec_state = rsock_detect_cloexec(fd);
-            if (rsock_cmsg_cloexec_state == 0 || fd <= 2)
-                rb_maygvl_fd_fix_cloexec(fd);
+            rb_maygvl_fd_fix_cloexec(fd);
             if (S_ISSOCK(stbuf.st_mode))
                 io = rsock_init_sock(rb_obj_alloc(rb_cSocket), fd);
             else
@@ -1626,10 +1627,9 @@ bsock_recvmsg_internal(VALUE sock,
     }
 
     if (NIL_P(dat_str))
-        dat_str = rb_tainted_str_new(datbuf, ss);
+        dat_str = rb_str_new(datbuf, ss);
     else {
         rb_str_resize(dat_str, ss);
-        OBJ_TAINT(dat_str);
 	rb_obj_reveal(dat_str, rb_cString);
     }
 
@@ -1655,7 +1655,7 @@ bsock_recvmsg_internal(VALUE sock,
             }
             ctl_end = (char*)cmh + cmh->cmsg_len;
 	    clen = (ctl_end <= msg_end ? ctl_end : msg_end) - (char*)CMSG_DATA(cmh);
-            ctl = ancdata_new(family, cmh->cmsg_level, cmh->cmsg_type, rb_tainted_str_new((char*)CMSG_DATA(cmh), clen));
+            ctl = ancdata_new(family, cmh->cmsg_level, cmh->cmsg_type, rb_str_new((char*)CMSG_DATA(cmh), clen));
             if (request_scm_rights)
                 make_io_for_unix_rights(ctl, cmh, msg_end);
             else
diff --git a/ext/socket/basicsocket.c b/ext/socket/basicsocket.c
index 2d2b22e1a9..fb5beed81a 100644
--- a/ext/socket/basicsocket.c
+++ b/ext/socket/basicsocket.c
@@ -158,10 +158,10 @@ bsock_close_write(VALUE sock)
  * * +optval+ is the value of the option, it is passed to the underlying
  *   setsockopt() as a pointer to a certain number of bytes. How this is
  *   done depends on the type:
- *   - Fixnum: value is assigned to an int, and a pointer to the int is
+ *   - Integer: value is assigned to an int, and a pointer to the int is
  *     passed, with length of sizeof(int).
  *   - true or false: 1 or 0 (respectively) is assigned to an int, and the
- *     int is passed as for a Fixnum. Note that +false+ must be passed,
+ *     int is passed as for an Integer. Note that +false+ must be passed,
  *     not +nil+.
  *   - String: the string's data and length is passed to the socket.
  * * +socketoption+ is an instance of Socket::Option
@@ -314,6 +314,18 @@ bsock_getsockopt(VALUE sock, VALUE lev, VALUE optname)
     level = rsock_level_arg(family, lev);
     option = rsock_optname_arg(family, level, optname);
     len = 256;
+#ifdef _AIX
+    switch (option) {
+      case SO_DEBUG:
+      case SO_REUSEADDR:
+      case SO_KEEPALIVE:
+      case SO_DONTROUTE:
+      case SO_BROADCAST:
+      case SO_OOBINLINE:
+        /* AIX doesn't set len for boolean options */
+        len = sizeof(int);
+    }
+#endif
     buf = ALLOCA_N(char,len);
 
     rb_io_check_closed(fptr);
@@ -530,8 +542,9 @@ rsock_bsock_send(int argc, VALUE *argv, VALUE sock)
     struct rsock_send_arg arg;
     VALUE flags, to;
     rb_io_t *fptr;
-    int n;
+    ssize_t n;
     rb_blocking_function_t *func;
+    const char *funcname;
 
     rb_scan_args(argc, argv, "21", &arg.mesg, &flags, &to);
 
@@ -542,21 +555,23 @@ rsock_bsock_send(int argc, VALUE *argv, VALUE sock)
 	arg.to = (struct sockaddr *)RSTRING_PTR(to);
 	arg.tolen = RSTRING_SOCKLEN(to);
 	func = rsock_sendto_blocking;
+	funcname = "sendto(2)";
     }
     else {
 	func = rsock_send_blocking;
+	funcname = "send(2)";
     }
     GetOpenFile(sock, fptr);
     arg.fd = fptr->fd;
     arg.flags = NUM2INT(flags);
     while (rsock_maybe_fd_writable(arg.fd),
-	   (n = (int)BLOCKING_REGION_FD(func, &arg)) < 0) {
+	   (n = (ssize_t)BLOCKING_REGION_FD(func, &arg)) < 0) {
 	if (rb_io_wait_writable(arg.fd)) {
 	    continue;
 	}
-	rb_sys_fail("send(2)");
+	rb_sys_fail(funcname);
     }
-    return INT2FIX(n);
+    return SSIZET2NUM(n);
 }
 
 /*
@@ -565,6 +580,8 @@ rsock_bsock_send(int argc, VALUE *argv, VALUE sock)
  *
  * Gets the do_not_reverse_lookup flag of _basicsocket_.
  *
+ *   require 'socket'
+ *
  *   BasicSocket.do_not_reverse_lookup = false
  *   TCPSocket.open("www.ruby-lang.org", 80) {|sock|
  *     p sock.do_not_reverse_lookup      #=> false
@@ -655,7 +672,7 @@ bsock_recv_nonblock(VALUE sock, VALUE len, VALUE flg, VALUE str, VALUE ex)
  *   BasicSocket.do_not_reverse_lookup  #=> false
  */
 static VALUE
-bsock_do_not_rev_lookup(void)
+bsock_do_not_rev_lookup(VALUE _)
 {
     return rsock_do_not_reverse_lookup?Qtrue:Qfalse;
 }
@@ -720,6 +737,13 @@ rsock_init_basicsocket(void)
     rb_define_private_method(rb_cBasicSocket,
 			     "__recv_nonblock", bsock_recv_nonblock, 4);
 
+#if MSG_DONTWAIT_RELIABLE
+    rb_define_private_method(rb_cBasicSocket,
+			     "__read_nonblock", rsock_read_nonblock, 3);
+    rb_define_private_method(rb_cBasicSocket,
+			     "__write_nonblock", rsock_write_nonblock, 2);
+#endif
+
     /* in ancdata.c */
     rb_define_private_method(rb_cBasicSocket, "__sendmsg",
 			     rsock_bsock_sendmsg, 4);
diff --git a/ext/socket/constants.c b/ext/socket/constants.c
index 6fc862777e..1bbb53b173 100644
--- a/ext/socket/constants.c
+++ b/ext/socket/constants.c
@@ -28,7 +28,6 @@ constant_arg(VALUE arg, int (*str_to_int)(const char*, long, int*), const char *
     else if (!NIL_P(tmp = rb_check_string_type(arg))) {
 	arg = tmp;
       str:
-	rb_check_safe_obj(arg);
         ptr = RSTRING_PTR(arg);
         if (str_to_int(ptr, RSTRING_LEN(arg), &ret) == -1)
 	    rb_raise(rb_eSocket, "%s: %s", errmsg, ptr);
diff --git a/ext/socket/depend b/ext/socket/depend
index 4c90ef1079..14cf6ab4f6 100644
--- a/ext/socket/depend
+++ b/ext/socket/depend
@@ -1,67 +1,557 @@
-getnameinfo.o: getnameinfo.c $(arch_hdrdir)/ruby/config.h addrinfo.h sockport.h
+srcs: constdefs.h constdefs.c
+
+getnameinfo.o: getnameinfo.c $(arch_hdrdir)/ruby/config.h addrinfo.h sockport.h rubysocket.h
 getaddrinfo.o: getaddrinfo.c $(arch_hdrdir)/ruby/config.h addrinfo.h sockport.h
 
-constdefs.h constdefs.c : $(srcdir)/mkconstants.rb
+constdefs.h: $(srcdir)/mkconstants.rb
 	@echo "generating constant definitions"
 	@$(RUBY) $(srcdir)/mkconstants.rb -H constdefs.h -o constdefs.c
 
+constdefs.c: constdefs.h
+
 # AUTOGENERATED DEPENDENCIES START
 ancdata.o: $(RUBY_EXTCONF_H)
 ancdata.o: $(arch_hdrdir)/ruby/config.h
+ancdata.o: $(hdrdir)/ruby.h
+ancdata.o: $(hdrdir)/ruby/internal/anyargs.h
+ancdata.o: $(hdrdir)/ruby/internal/arithmetic.h
+ancdata.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+ancdata.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+ancdata.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+ancdata.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+ancdata.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+ancdata.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+ancdata.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+ancdata.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+ancdata.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+ancdata.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+ancdata.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+ancdata.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+ancdata.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+ancdata.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+ancdata.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+ancdata.o: $(hdrdir)/ruby/internal/assume.h
+ancdata.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+ancdata.o: $(hdrdir)/ruby/internal/attr/artificial.h
+ancdata.o: $(hdrdir)/ruby/internal/attr/cold.h
+ancdata.o: $(hdrdir)/ruby/internal/attr/const.h
+ancdata.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+ancdata.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+ancdata.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+ancdata.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+ancdata.o: $(hdrdir)/ruby/internal/attr/error.h
+ancdata.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+ancdata.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+ancdata.o: $(hdrdir)/ruby/internal/attr/format.h
+ancdata.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+ancdata.o: $(hdrdir)/ruby/internal/attr/noalias.h
+ancdata.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+ancdata.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+ancdata.o: $(hdrdir)/ruby/internal/attr/noinline.h
+ancdata.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+ancdata.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+ancdata.o: $(hdrdir)/ruby/internal/attr/pure.h
+ancdata.o: $(hdrdir)/ruby/internal/attr/restrict.h
+ancdata.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+ancdata.o: $(hdrdir)/ruby/internal/attr/warning.h
+ancdata.o: $(hdrdir)/ruby/internal/attr/weakref.h
+ancdata.o: $(hdrdir)/ruby/internal/cast.h
+ancdata.o: $(hdrdir)/ruby/internal/compiler_is.h
+ancdata.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+ancdata.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+ancdata.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+ancdata.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+ancdata.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+ancdata.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+ancdata.o: $(hdrdir)/ruby/internal/compiler_since.h
+ancdata.o: $(hdrdir)/ruby/internal/config.h
+ancdata.o: $(hdrdir)/ruby/internal/constant_p.h
+ancdata.o: $(hdrdir)/ruby/internal/core.h
+ancdata.o: $(hdrdir)/ruby/internal/core/rarray.h
+ancdata.o: $(hdrdir)/ruby/internal/core/rbasic.h
+ancdata.o: $(hdrdir)/ruby/internal/core/rbignum.h
+ancdata.o: $(hdrdir)/ruby/internal/core/rclass.h
+ancdata.o: $(hdrdir)/ruby/internal/core/rdata.h
+ancdata.o: $(hdrdir)/ruby/internal/core/rfile.h
+ancdata.o: $(hdrdir)/ruby/internal/core/rhash.h
+ancdata.o: $(hdrdir)/ruby/internal/core/robject.h
+ancdata.o: $(hdrdir)/ruby/internal/core/rregexp.h
+ancdata.o: $(hdrdir)/ruby/internal/core/rstring.h
+ancdata.o: $(hdrdir)/ruby/internal/core/rstruct.h
+ancdata.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+ancdata.o: $(hdrdir)/ruby/internal/ctype.h
+ancdata.o: $(hdrdir)/ruby/internal/dllexport.h
+ancdata.o: $(hdrdir)/ruby/internal/dosish.h
+ancdata.o: $(hdrdir)/ruby/internal/error.h
+ancdata.o: $(hdrdir)/ruby/internal/eval.h
+ancdata.o: $(hdrdir)/ruby/internal/event.h
+ancdata.o: $(hdrdir)/ruby/internal/fl_type.h
+ancdata.o: $(hdrdir)/ruby/internal/gc.h
+ancdata.o: $(hdrdir)/ruby/internal/glob.h
+ancdata.o: $(hdrdir)/ruby/internal/globals.h
+ancdata.o: $(hdrdir)/ruby/internal/has/attribute.h
+ancdata.o: $(hdrdir)/ruby/internal/has/builtin.h
+ancdata.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+ancdata.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+ancdata.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+ancdata.o: $(hdrdir)/ruby/internal/has/extension.h
+ancdata.o: $(hdrdir)/ruby/internal/has/feature.h
+ancdata.o: $(hdrdir)/ruby/internal/has/warning.h
+ancdata.o: $(hdrdir)/ruby/internal/intern/array.h
+ancdata.o: $(hdrdir)/ruby/internal/intern/bignum.h
+ancdata.o: $(hdrdir)/ruby/internal/intern/class.h
+ancdata.o: $(hdrdir)/ruby/internal/intern/compar.h
+ancdata.o: $(hdrdir)/ruby/internal/intern/complex.h
+ancdata.o: $(hdrdir)/ruby/internal/intern/cont.h
+ancdata.o: $(hdrdir)/ruby/internal/intern/dir.h
+ancdata.o: $(hdrdir)/ruby/internal/intern/enum.h
+ancdata.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+ancdata.o: $(hdrdir)/ruby/internal/intern/error.h
+ancdata.o: $(hdrdir)/ruby/internal/intern/eval.h
+ancdata.o: $(hdrdir)/ruby/internal/intern/file.h
+ancdata.o: $(hdrdir)/ruby/internal/intern/gc.h
+ancdata.o: $(hdrdir)/ruby/internal/intern/hash.h
+ancdata.o: $(hdrdir)/ruby/internal/intern/io.h
+ancdata.o: $(hdrdir)/ruby/internal/intern/load.h
+ancdata.o: $(hdrdir)/ruby/internal/intern/marshal.h
+ancdata.o: $(hdrdir)/ruby/internal/intern/numeric.h
+ancdata.o: $(hdrdir)/ruby/internal/intern/object.h
+ancdata.o: $(hdrdir)/ruby/internal/intern/parse.h
+ancdata.o: $(hdrdir)/ruby/internal/intern/proc.h
+ancdata.o: $(hdrdir)/ruby/internal/intern/process.h
+ancdata.o: $(hdrdir)/ruby/internal/intern/random.h
+ancdata.o: $(hdrdir)/ruby/internal/intern/range.h
+ancdata.o: $(hdrdir)/ruby/internal/intern/rational.h
+ancdata.o: $(hdrdir)/ruby/internal/intern/re.h
+ancdata.o: $(hdrdir)/ruby/internal/intern/ruby.h
+ancdata.o: $(hdrdir)/ruby/internal/intern/select.h
+ancdata.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ancdata.o: $(hdrdir)/ruby/internal/intern/signal.h
+ancdata.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+ancdata.o: $(hdrdir)/ruby/internal/intern/string.h
+ancdata.o: $(hdrdir)/ruby/internal/intern/struct.h
+ancdata.o: $(hdrdir)/ruby/internal/intern/thread.h
+ancdata.o: $(hdrdir)/ruby/internal/intern/time.h
+ancdata.o: $(hdrdir)/ruby/internal/intern/variable.h
+ancdata.o: $(hdrdir)/ruby/internal/intern/vm.h
+ancdata.o: $(hdrdir)/ruby/internal/interpreter.h
+ancdata.o: $(hdrdir)/ruby/internal/iterator.h
+ancdata.o: $(hdrdir)/ruby/internal/memory.h
+ancdata.o: $(hdrdir)/ruby/internal/method.h
+ancdata.o: $(hdrdir)/ruby/internal/module.h
+ancdata.o: $(hdrdir)/ruby/internal/newobj.h
+ancdata.o: $(hdrdir)/ruby/internal/rgengc.h
+ancdata.o: $(hdrdir)/ruby/internal/scan_args.h
+ancdata.o: $(hdrdir)/ruby/internal/special_consts.h
+ancdata.o: $(hdrdir)/ruby/internal/static_assert.h
+ancdata.o: $(hdrdir)/ruby/internal/stdalign.h
+ancdata.o: $(hdrdir)/ruby/internal/stdbool.h
+ancdata.o: $(hdrdir)/ruby/internal/symbol.h
+ancdata.o: $(hdrdir)/ruby/internal/token_paste.h
+ancdata.o: $(hdrdir)/ruby/internal/value.h
+ancdata.o: $(hdrdir)/ruby/internal/value_type.h
+ancdata.o: $(hdrdir)/ruby/internal/variable.h
+ancdata.o: $(hdrdir)/ruby/internal/warning_push.h
+ancdata.o: $(hdrdir)/ruby/internal/xmalloc.h
+ancdata.o: $(hdrdir)/ruby/assert.h
 ancdata.o: $(hdrdir)/ruby/backward.h
+ancdata.o: $(hdrdir)/ruby/backward/2/assume.h
+ancdata.o: $(hdrdir)/ruby/backward/2/attributes.h
+ancdata.o: $(hdrdir)/ruby/backward/2/bool.h
+ancdata.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+ancdata.o: $(hdrdir)/ruby/backward/2/inttypes.h
+ancdata.o: $(hdrdir)/ruby/backward/2/limits.h
+ancdata.o: $(hdrdir)/ruby/backward/2/long_long.h
+ancdata.o: $(hdrdir)/ruby/backward/2/stdalign.h
+ancdata.o: $(hdrdir)/ruby/backward/2/stdarg.h
 ancdata.o: $(hdrdir)/ruby/defines.h
 ancdata.o: $(hdrdir)/ruby/encoding.h
 ancdata.o: $(hdrdir)/ruby/intern.h
 ancdata.o: $(hdrdir)/ruby/io.h
 ancdata.o: $(hdrdir)/ruby/missing.h
+ancdata.o: $(hdrdir)/ruby/onigmo.h
 ancdata.o: $(hdrdir)/ruby/oniguruma.h
 ancdata.o: $(hdrdir)/ruby/ruby.h
 ancdata.o: $(hdrdir)/ruby/st.h
 ancdata.o: $(hdrdir)/ruby/subst.h
 ancdata.o: $(hdrdir)/ruby/thread.h
 ancdata.o: $(hdrdir)/ruby/util.h
-ancdata.o: $(top_srcdir)/include/ruby.h
 ancdata.o: $(top_srcdir)/internal.h
+ancdata.o: $(top_srcdir)/internal/array.h
+ancdata.o: $(top_srcdir)/internal/compilers.h
+ancdata.o: $(top_srcdir)/internal/error.h
+ancdata.o: $(top_srcdir)/internal/gc.h
+ancdata.o: $(top_srcdir)/internal/io.h
+ancdata.o: $(top_srcdir)/internal/serial.h
+ancdata.o: $(top_srcdir)/internal/static_assert.h
+ancdata.o: $(top_srcdir)/internal/string.h
+ancdata.o: $(top_srcdir)/internal/thread.h
+ancdata.o: $(top_srcdir)/internal/vm.h
+ancdata.o: $(top_srcdir)/internal/warnings.h
 ancdata.o: ancdata.c
 ancdata.o: constdefs.h
 ancdata.o: rubysocket.h
 ancdata.o: sockport.h
 basicsocket.o: $(RUBY_EXTCONF_H)
 basicsocket.o: $(arch_hdrdir)/ruby/config.h
+basicsocket.o: $(hdrdir)/ruby.h
+basicsocket.o: $(hdrdir)/ruby/internal/anyargs.h
+basicsocket.o: $(hdrdir)/ruby/internal/arithmetic.h
+basicsocket.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+basicsocket.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+basicsocket.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+basicsocket.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+basicsocket.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+basicsocket.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+basicsocket.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+basicsocket.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+basicsocket.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+basicsocket.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+basicsocket.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+basicsocket.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+basicsocket.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+basicsocket.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+basicsocket.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+basicsocket.o: $(hdrdir)/ruby/internal/assume.h
+basicsocket.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+basicsocket.o: $(hdrdir)/ruby/internal/attr/artificial.h
+basicsocket.o: $(hdrdir)/ruby/internal/attr/cold.h
+basicsocket.o: $(hdrdir)/ruby/internal/attr/const.h
+basicsocket.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+basicsocket.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+basicsocket.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+basicsocket.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+basicsocket.o: $(hdrdir)/ruby/internal/attr/error.h
+basicsocket.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+basicsocket.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+basicsocket.o: $(hdrdir)/ruby/internal/attr/format.h
+basicsocket.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+basicsocket.o: $(hdrdir)/ruby/internal/attr/noalias.h
+basicsocket.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+basicsocket.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+basicsocket.o: $(hdrdir)/ruby/internal/attr/noinline.h
+basicsocket.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+basicsocket.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+basicsocket.o: $(hdrdir)/ruby/internal/attr/pure.h
+basicsocket.o: $(hdrdir)/ruby/internal/attr/restrict.h
+basicsocket.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+basicsocket.o: $(hdrdir)/ruby/internal/attr/warning.h
+basicsocket.o: $(hdrdir)/ruby/internal/attr/weakref.h
+basicsocket.o: $(hdrdir)/ruby/internal/cast.h
+basicsocket.o: $(hdrdir)/ruby/internal/compiler_is.h
+basicsocket.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+basicsocket.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+basicsocket.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+basicsocket.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+basicsocket.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+basicsocket.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+basicsocket.o: $(hdrdir)/ruby/internal/compiler_since.h
+basicsocket.o: $(hdrdir)/ruby/internal/config.h
+basicsocket.o: $(hdrdir)/ruby/internal/constant_p.h
+basicsocket.o: $(hdrdir)/ruby/internal/core.h
+basicsocket.o: $(hdrdir)/ruby/internal/core/rarray.h
+basicsocket.o: $(hdrdir)/ruby/internal/core/rbasic.h
+basicsocket.o: $(hdrdir)/ruby/internal/core/rbignum.h
+basicsocket.o: $(hdrdir)/ruby/internal/core/rclass.h
+basicsocket.o: $(hdrdir)/ruby/internal/core/rdata.h
+basicsocket.o: $(hdrdir)/ruby/internal/core/rfile.h
+basicsocket.o: $(hdrdir)/ruby/internal/core/rhash.h
+basicsocket.o: $(hdrdir)/ruby/internal/core/robject.h
+basicsocket.o: $(hdrdir)/ruby/internal/core/rregexp.h
+basicsocket.o: $(hdrdir)/ruby/internal/core/rstring.h
+basicsocket.o: $(hdrdir)/ruby/internal/core/rstruct.h
+basicsocket.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+basicsocket.o: $(hdrdir)/ruby/internal/ctype.h
+basicsocket.o: $(hdrdir)/ruby/internal/dllexport.h
+basicsocket.o: $(hdrdir)/ruby/internal/dosish.h
+basicsocket.o: $(hdrdir)/ruby/internal/error.h
+basicsocket.o: $(hdrdir)/ruby/internal/eval.h
+basicsocket.o: $(hdrdir)/ruby/internal/event.h
+basicsocket.o: $(hdrdir)/ruby/internal/fl_type.h
+basicsocket.o: $(hdrdir)/ruby/internal/gc.h
+basicsocket.o: $(hdrdir)/ruby/internal/glob.h
+basicsocket.o: $(hdrdir)/ruby/internal/globals.h
+basicsocket.o: $(hdrdir)/ruby/internal/has/attribute.h
+basicsocket.o: $(hdrdir)/ruby/internal/has/builtin.h
+basicsocket.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+basicsocket.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+basicsocket.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+basicsocket.o: $(hdrdir)/ruby/internal/has/extension.h
+basicsocket.o: $(hdrdir)/ruby/internal/has/feature.h
+basicsocket.o: $(hdrdir)/ruby/internal/has/warning.h
+basicsocket.o: $(hdrdir)/ruby/internal/intern/array.h
+basicsocket.o: $(hdrdir)/ruby/internal/intern/bignum.h
+basicsocket.o: $(hdrdir)/ruby/internal/intern/class.h
+basicsocket.o: $(hdrdir)/ruby/internal/intern/compar.h
+basicsocket.o: $(hdrdir)/ruby/internal/intern/complex.h
+basicsocket.o: $(hdrdir)/ruby/internal/intern/cont.h
+basicsocket.o: $(hdrdir)/ruby/internal/intern/dir.h
+basicsocket.o: $(hdrdir)/ruby/internal/intern/enum.h
+basicsocket.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+basicsocket.o: $(hdrdir)/ruby/internal/intern/error.h
+basicsocket.o: $(hdrdir)/ruby/internal/intern/eval.h
+basicsocket.o: $(hdrdir)/ruby/internal/intern/file.h
+basicsocket.o: $(hdrdir)/ruby/internal/intern/gc.h
+basicsocket.o: $(hdrdir)/ruby/internal/intern/hash.h
+basicsocket.o: $(hdrdir)/ruby/internal/intern/io.h
+basicsocket.o: $(hdrdir)/ruby/internal/intern/load.h
+basicsocket.o: $(hdrdir)/ruby/internal/intern/marshal.h
+basicsocket.o: $(hdrdir)/ruby/internal/intern/numeric.h
+basicsocket.o: $(hdrdir)/ruby/internal/intern/object.h
+basicsocket.o: $(hdrdir)/ruby/internal/intern/parse.h
+basicsocket.o: $(hdrdir)/ruby/internal/intern/proc.h
+basicsocket.o: $(hdrdir)/ruby/internal/intern/process.h
+basicsocket.o: $(hdrdir)/ruby/internal/intern/random.h
+basicsocket.o: $(hdrdir)/ruby/internal/intern/range.h
+basicsocket.o: $(hdrdir)/ruby/internal/intern/rational.h
+basicsocket.o: $(hdrdir)/ruby/internal/intern/re.h
+basicsocket.o: $(hdrdir)/ruby/internal/intern/ruby.h
+basicsocket.o: $(hdrdir)/ruby/internal/intern/select.h
+basicsocket.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+basicsocket.o: $(hdrdir)/ruby/internal/intern/signal.h
+basicsocket.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+basicsocket.o: $(hdrdir)/ruby/internal/intern/string.h
+basicsocket.o: $(hdrdir)/ruby/internal/intern/struct.h
+basicsocket.o: $(hdrdir)/ruby/internal/intern/thread.h
+basicsocket.o: $(hdrdir)/ruby/internal/intern/time.h
+basicsocket.o: $(hdrdir)/ruby/internal/intern/variable.h
+basicsocket.o: $(hdrdir)/ruby/internal/intern/vm.h
+basicsocket.o: $(hdrdir)/ruby/internal/interpreter.h
+basicsocket.o: $(hdrdir)/ruby/internal/iterator.h
+basicsocket.o: $(hdrdir)/ruby/internal/memory.h
+basicsocket.o: $(hdrdir)/ruby/internal/method.h
+basicsocket.o: $(hdrdir)/ruby/internal/module.h
+basicsocket.o: $(hdrdir)/ruby/internal/newobj.h
+basicsocket.o: $(hdrdir)/ruby/internal/rgengc.h
+basicsocket.o: $(hdrdir)/ruby/internal/scan_args.h
+basicsocket.o: $(hdrdir)/ruby/internal/special_consts.h
+basicsocket.o: $(hdrdir)/ruby/internal/static_assert.h
+basicsocket.o: $(hdrdir)/ruby/internal/stdalign.h
+basicsocket.o: $(hdrdir)/ruby/internal/stdbool.h
+basicsocket.o: $(hdrdir)/ruby/internal/symbol.h
+basicsocket.o: $(hdrdir)/ruby/internal/token_paste.h
+basicsocket.o: $(hdrdir)/ruby/internal/value.h
+basicsocket.o: $(hdrdir)/ruby/internal/value_type.h
+basicsocket.o: $(hdrdir)/ruby/internal/variable.h
+basicsocket.o: $(hdrdir)/ruby/internal/warning_push.h
+basicsocket.o: $(hdrdir)/ruby/internal/xmalloc.h
+basicsocket.o: $(hdrdir)/ruby/assert.h
 basicsocket.o: $(hdrdir)/ruby/backward.h
+basicsocket.o: $(hdrdir)/ruby/backward/2/assume.h
+basicsocket.o: $(hdrdir)/ruby/backward/2/attributes.h
+basicsocket.o: $(hdrdir)/ruby/backward/2/bool.h
+basicsocket.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+basicsocket.o: $(hdrdir)/ruby/backward/2/inttypes.h
+basicsocket.o: $(hdrdir)/ruby/backward/2/limits.h
+basicsocket.o: $(hdrdir)/ruby/backward/2/long_long.h
+basicsocket.o: $(hdrdir)/ruby/backward/2/stdalign.h
+basicsocket.o: $(hdrdir)/ruby/backward/2/stdarg.h
 basicsocket.o: $(hdrdir)/ruby/defines.h
 basicsocket.o: $(hdrdir)/ruby/encoding.h
 basicsocket.o: $(hdrdir)/ruby/intern.h
 basicsocket.o: $(hdrdir)/ruby/io.h
 basicsocket.o: $(hdrdir)/ruby/missing.h
+basicsocket.o: $(hdrdir)/ruby/onigmo.h
 basicsocket.o: $(hdrdir)/ruby/oniguruma.h
 basicsocket.o: $(hdrdir)/ruby/ruby.h
 basicsocket.o: $(hdrdir)/ruby/st.h
 basicsocket.o: $(hdrdir)/ruby/subst.h
 basicsocket.o: $(hdrdir)/ruby/thread.h
 basicsocket.o: $(hdrdir)/ruby/util.h
-basicsocket.o: $(top_srcdir)/include/ruby.h
 basicsocket.o: $(top_srcdir)/internal.h
+basicsocket.o: $(top_srcdir)/internal/array.h
+basicsocket.o: $(top_srcdir)/internal/compilers.h
+basicsocket.o: $(top_srcdir)/internal/error.h
+basicsocket.o: $(top_srcdir)/internal/gc.h
+basicsocket.o: $(top_srcdir)/internal/io.h
+basicsocket.o: $(top_srcdir)/internal/serial.h
+basicsocket.o: $(top_srcdir)/internal/static_assert.h
+basicsocket.o: $(top_srcdir)/internal/string.h
+basicsocket.o: $(top_srcdir)/internal/thread.h
+basicsocket.o: $(top_srcdir)/internal/vm.h
+basicsocket.o: $(top_srcdir)/internal/warnings.h
 basicsocket.o: basicsocket.c
 basicsocket.o: constdefs.h
 basicsocket.o: rubysocket.h
 basicsocket.o: sockport.h
 constants.o: $(RUBY_EXTCONF_H)
 constants.o: $(arch_hdrdir)/ruby/config.h
+constants.o: $(hdrdir)/ruby.h
+constants.o: $(hdrdir)/ruby/internal/anyargs.h
+constants.o: $(hdrdir)/ruby/internal/arithmetic.h
+constants.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+constants.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+constants.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+constants.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+constants.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+constants.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+constants.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+constants.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+constants.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+constants.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+constants.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+constants.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+constants.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+constants.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+constants.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+constants.o: $(hdrdir)/ruby/internal/assume.h
+constants.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+constants.o: $(hdrdir)/ruby/internal/attr/artificial.h
+constants.o: $(hdrdir)/ruby/internal/attr/cold.h
+constants.o: $(hdrdir)/ruby/internal/attr/const.h
+constants.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+constants.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+constants.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+constants.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+constants.o: $(hdrdir)/ruby/internal/attr/error.h
+constants.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+constants.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+constants.o: $(hdrdir)/ruby/internal/attr/format.h
+constants.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+constants.o: $(hdrdir)/ruby/internal/attr/noalias.h
+constants.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+constants.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+constants.o: $(hdrdir)/ruby/internal/attr/noinline.h
+constants.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+constants.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+constants.o: $(hdrdir)/ruby/internal/attr/pure.h
+constants.o: $(hdrdir)/ruby/internal/attr/restrict.h
+constants.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+constants.o: $(hdrdir)/ruby/internal/attr/warning.h
+constants.o: $(hdrdir)/ruby/internal/attr/weakref.h
+constants.o: $(hdrdir)/ruby/internal/cast.h
+constants.o: $(hdrdir)/ruby/internal/compiler_is.h
+constants.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+constants.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+constants.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+constants.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+constants.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+constants.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+constants.o: $(hdrdir)/ruby/internal/compiler_since.h
+constants.o: $(hdrdir)/ruby/internal/config.h
+constants.o: $(hdrdir)/ruby/internal/constant_p.h
+constants.o: $(hdrdir)/ruby/internal/core.h
+constants.o: $(hdrdir)/ruby/internal/core/rarray.h
+constants.o: $(hdrdir)/ruby/internal/core/rbasic.h
+constants.o: $(hdrdir)/ruby/internal/core/rbignum.h
+constants.o: $(hdrdir)/ruby/internal/core/rclass.h
+constants.o: $(hdrdir)/ruby/internal/core/rdata.h
+constants.o: $(hdrdir)/ruby/internal/core/rfile.h
+constants.o: $(hdrdir)/ruby/internal/core/rhash.h
+constants.o: $(hdrdir)/ruby/internal/core/robject.h
+constants.o: $(hdrdir)/ruby/internal/core/rregexp.h
+constants.o: $(hdrdir)/ruby/internal/core/rstring.h
+constants.o: $(hdrdir)/ruby/internal/core/rstruct.h
+constants.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+constants.o: $(hdrdir)/ruby/internal/ctype.h
+constants.o: $(hdrdir)/ruby/internal/dllexport.h
+constants.o: $(hdrdir)/ruby/internal/dosish.h
+constants.o: $(hdrdir)/ruby/internal/error.h
+constants.o: $(hdrdir)/ruby/internal/eval.h
+constants.o: $(hdrdir)/ruby/internal/event.h
+constants.o: $(hdrdir)/ruby/internal/fl_type.h
+constants.o: $(hdrdir)/ruby/internal/gc.h
+constants.o: $(hdrdir)/ruby/internal/glob.h
+constants.o: $(hdrdir)/ruby/internal/globals.h
+constants.o: $(hdrdir)/ruby/internal/has/attribute.h
+constants.o: $(hdrdir)/ruby/internal/has/builtin.h
+constants.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+constants.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+constants.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+constants.o: $(hdrdir)/ruby/internal/has/extension.h
+constants.o: $(hdrdir)/ruby/internal/has/feature.h
+constants.o: $(hdrdir)/ruby/internal/has/warning.h
+constants.o: $(hdrdir)/ruby/internal/intern/array.h
+constants.o: $(hdrdir)/ruby/internal/intern/bignum.h
+constants.o: $(hdrdir)/ruby/internal/intern/class.h
+constants.o: $(hdrdir)/ruby/internal/intern/compar.h
+constants.o: $(hdrdir)/ruby/internal/intern/complex.h
+constants.o: $(hdrdir)/ruby/internal/intern/cont.h
+constants.o: $(hdrdir)/ruby/internal/intern/dir.h
+constants.o: $(hdrdir)/ruby/internal/intern/enum.h
+constants.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+constants.o: $(hdrdir)/ruby/internal/intern/error.h
+constants.o: $(hdrdir)/ruby/internal/intern/eval.h
+constants.o: $(hdrdir)/ruby/internal/intern/file.h
+constants.o: $(hdrdir)/ruby/internal/intern/gc.h
+constants.o: $(hdrdir)/ruby/internal/intern/hash.h
+constants.o: $(hdrdir)/ruby/internal/intern/io.h
+constants.o: $(hdrdir)/ruby/internal/intern/load.h
+constants.o: $(hdrdir)/ruby/internal/intern/marshal.h
+constants.o: $(hdrdir)/ruby/internal/intern/numeric.h
+constants.o: $(hdrdir)/ruby/internal/intern/object.h
+constants.o: $(hdrdir)/ruby/internal/intern/parse.h
+constants.o: $(hdrdir)/ruby/internal/intern/proc.h
+constants.o: $(hdrdir)/ruby/internal/intern/process.h
+constants.o: $(hdrdir)/ruby/internal/intern/random.h
+constants.o: $(hdrdir)/ruby/internal/intern/range.h
+constants.o: $(hdrdir)/ruby/internal/intern/rational.h
+constants.o: $(hdrdir)/ruby/internal/intern/re.h
+constants.o: $(hdrdir)/ruby/internal/intern/ruby.h
+constants.o: $(hdrdir)/ruby/internal/intern/select.h
+constants.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+constants.o: $(hdrdir)/ruby/internal/intern/signal.h
+constants.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+constants.o: $(hdrdir)/ruby/internal/intern/string.h
+constants.o: $(hdrdir)/ruby/internal/intern/struct.h
+constants.o: $(hdrdir)/ruby/internal/intern/thread.h
+constants.o: $(hdrdir)/ruby/internal/intern/time.h
+constants.o: $(hdrdir)/ruby/internal/intern/variable.h
+constants.o: $(hdrdir)/ruby/internal/intern/vm.h
+constants.o: $(hdrdir)/ruby/internal/interpreter.h
+constants.o: $(hdrdir)/ruby/internal/iterator.h
+constants.o: $(hdrdir)/ruby/internal/memory.h
+constants.o: $(hdrdir)/ruby/internal/method.h
+constants.o: $(hdrdir)/ruby/internal/module.h
+constants.o: $(hdrdir)/ruby/internal/newobj.h
+constants.o: $(hdrdir)/ruby/internal/rgengc.h
+constants.o: $(hdrdir)/ruby/internal/scan_args.h
+constants.o: $(hdrdir)/ruby/internal/special_consts.h
+constants.o: $(hdrdir)/ruby/internal/static_assert.h
+constants.o: $(hdrdir)/ruby/internal/stdalign.h
+constants.o: $(hdrdir)/ruby/internal/stdbool.h
+constants.o: $(hdrdir)/ruby/internal/symbol.h
+constants.o: $(hdrdir)/ruby/internal/token_paste.h
+constants.o: $(hdrdir)/ruby/internal/value.h
+constants.o: $(hdrdir)/ruby/internal/value_type.h
+constants.o: $(hdrdir)/ruby/internal/variable.h
+constants.o: $(hdrdir)/ruby/internal/warning_push.h
+constants.o: $(hdrdir)/ruby/internal/xmalloc.h
+constants.o: $(hdrdir)/ruby/assert.h
 constants.o: $(hdrdir)/ruby/backward.h
+constants.o: $(hdrdir)/ruby/backward/2/assume.h
+constants.o: $(hdrdir)/ruby/backward/2/attributes.h
+constants.o: $(hdrdir)/ruby/backward/2/bool.h
+constants.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+constants.o: $(hdrdir)/ruby/backward/2/inttypes.h
+constants.o: $(hdrdir)/ruby/backward/2/limits.h
+constants.o: $(hdrdir)/ruby/backward/2/long_long.h
+constants.o: $(hdrdir)/ruby/backward/2/stdalign.h
+constants.o: $(hdrdir)/ruby/backward/2/stdarg.h
 constants.o: $(hdrdir)/ruby/defines.h
 constants.o: $(hdrdir)/ruby/encoding.h
 constants.o: $(hdrdir)/ruby/intern.h
 constants.o: $(hdrdir)/ruby/io.h
 constants.o: $(hdrdir)/ruby/missing.h
+constants.o: $(hdrdir)/ruby/onigmo.h
 constants.o: $(hdrdir)/ruby/oniguruma.h
 constants.o: $(hdrdir)/ruby/ruby.h
 constants.o: $(hdrdir)/ruby/st.h
 constants.o: $(hdrdir)/ruby/subst.h
 constants.o: $(hdrdir)/ruby/thread.h
 constants.o: $(hdrdir)/ruby/util.h
-constants.o: $(top_srcdir)/include/ruby.h
 constants.o: $(top_srcdir)/internal.h
+constants.o: $(top_srcdir)/internal/array.h
+constants.o: $(top_srcdir)/internal/compilers.h
+constants.o: $(top_srcdir)/internal/error.h
+constants.o: $(top_srcdir)/internal/gc.h
+constants.o: $(top_srcdir)/internal/io.h
+constants.o: $(top_srcdir)/internal/serial.h
+constants.o: $(top_srcdir)/internal/static_assert.h
+constants.o: $(top_srcdir)/internal/string.h
+constants.o: $(top_srcdir)/internal/thread.h
+constants.o: $(top_srcdir)/internal/vm.h
+constants.o: $(top_srcdir)/internal/warnings.h
 constants.o: constants.c
 constants.o: constdefs.c
 constants.o: constdefs.h
@@ -69,240 +559,2184 @@ constants.o: rubysocket.h
 constants.o: sockport.h
 ifaddr.o: $(RUBY_EXTCONF_H)
 ifaddr.o: $(arch_hdrdir)/ruby/config.h
+ifaddr.o: $(hdrdir)/ruby.h
+ifaddr.o: $(hdrdir)/ruby/internal/anyargs.h
+ifaddr.o: $(hdrdir)/ruby/internal/arithmetic.h
+ifaddr.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+ifaddr.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+ifaddr.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+ifaddr.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+ifaddr.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+ifaddr.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+ifaddr.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+ifaddr.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+ifaddr.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+ifaddr.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+ifaddr.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+ifaddr.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+ifaddr.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+ifaddr.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+ifaddr.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+ifaddr.o: $(hdrdir)/ruby/internal/assume.h
+ifaddr.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+ifaddr.o: $(hdrdir)/ruby/internal/attr/artificial.h
+ifaddr.o: $(hdrdir)/ruby/internal/attr/cold.h
+ifaddr.o: $(hdrdir)/ruby/internal/attr/const.h
+ifaddr.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+ifaddr.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+ifaddr.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+ifaddr.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+ifaddr.o: $(hdrdir)/ruby/internal/attr/error.h
+ifaddr.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+ifaddr.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+ifaddr.o: $(hdrdir)/ruby/internal/attr/format.h
+ifaddr.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+ifaddr.o: $(hdrdir)/ruby/internal/attr/noalias.h
+ifaddr.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+ifaddr.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+ifaddr.o: $(hdrdir)/ruby/internal/attr/noinline.h
+ifaddr.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+ifaddr.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+ifaddr.o: $(hdrdir)/ruby/internal/attr/pure.h
+ifaddr.o: $(hdrdir)/ruby/internal/attr/restrict.h
+ifaddr.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+ifaddr.o: $(hdrdir)/ruby/internal/attr/warning.h
+ifaddr.o: $(hdrdir)/ruby/internal/attr/weakref.h
+ifaddr.o: $(hdrdir)/ruby/internal/cast.h
+ifaddr.o: $(hdrdir)/ruby/internal/compiler_is.h
+ifaddr.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+ifaddr.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+ifaddr.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+ifaddr.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+ifaddr.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+ifaddr.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+ifaddr.o: $(hdrdir)/ruby/internal/compiler_since.h
+ifaddr.o: $(hdrdir)/ruby/internal/config.h
+ifaddr.o: $(hdrdir)/ruby/internal/constant_p.h
+ifaddr.o: $(hdrdir)/ruby/internal/core.h
+ifaddr.o: $(hdrdir)/ruby/internal/core/rarray.h
+ifaddr.o: $(hdrdir)/ruby/internal/core/rbasic.h
+ifaddr.o: $(hdrdir)/ruby/internal/core/rbignum.h
+ifaddr.o: $(hdrdir)/ruby/internal/core/rclass.h
+ifaddr.o: $(hdrdir)/ruby/internal/core/rdata.h
+ifaddr.o: $(hdrdir)/ruby/internal/core/rfile.h
+ifaddr.o: $(hdrdir)/ruby/internal/core/rhash.h
+ifaddr.o: $(hdrdir)/ruby/internal/core/robject.h
+ifaddr.o: $(hdrdir)/ruby/internal/core/rregexp.h
+ifaddr.o: $(hdrdir)/ruby/internal/core/rstring.h
+ifaddr.o: $(hdrdir)/ruby/internal/core/rstruct.h
+ifaddr.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+ifaddr.o: $(hdrdir)/ruby/internal/ctype.h
+ifaddr.o: $(hdrdir)/ruby/internal/dllexport.h
+ifaddr.o: $(hdrdir)/ruby/internal/dosish.h
+ifaddr.o: $(hdrdir)/ruby/internal/error.h
+ifaddr.o: $(hdrdir)/ruby/internal/eval.h
+ifaddr.o: $(hdrdir)/ruby/internal/event.h
+ifaddr.o: $(hdrdir)/ruby/internal/fl_type.h
+ifaddr.o: $(hdrdir)/ruby/internal/gc.h
+ifaddr.o: $(hdrdir)/ruby/internal/glob.h
+ifaddr.o: $(hdrdir)/ruby/internal/globals.h
+ifaddr.o: $(hdrdir)/ruby/internal/has/attribute.h
+ifaddr.o: $(hdrdir)/ruby/internal/has/builtin.h
+ifaddr.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+ifaddr.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+ifaddr.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+ifaddr.o: $(hdrdir)/ruby/internal/has/extension.h
+ifaddr.o: $(hdrdir)/ruby/internal/has/feature.h
+ifaddr.o: $(hdrdir)/ruby/internal/has/warning.h
+ifaddr.o: $(hdrdir)/ruby/internal/intern/array.h
+ifaddr.o: $(hdrdir)/ruby/internal/intern/bignum.h
+ifaddr.o: $(hdrdir)/ruby/internal/intern/class.h
+ifaddr.o: $(hdrdir)/ruby/internal/intern/compar.h
+ifaddr.o: $(hdrdir)/ruby/internal/intern/complex.h
+ifaddr.o: $(hdrdir)/ruby/internal/intern/cont.h
+ifaddr.o: $(hdrdir)/ruby/internal/intern/dir.h
+ifaddr.o: $(hdrdir)/ruby/internal/intern/enum.h
+ifaddr.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+ifaddr.o: $(hdrdir)/ruby/internal/intern/error.h
+ifaddr.o: $(hdrdir)/ruby/internal/intern/eval.h
+ifaddr.o: $(hdrdir)/ruby/internal/intern/file.h
+ifaddr.o: $(hdrdir)/ruby/internal/intern/gc.h
+ifaddr.o: $(hdrdir)/ruby/internal/intern/hash.h
+ifaddr.o: $(hdrdir)/ruby/internal/intern/io.h
+ifaddr.o: $(hdrdir)/ruby/internal/intern/load.h
+ifaddr.o: $(hdrdir)/ruby/internal/intern/marshal.h
+ifaddr.o: $(hdrdir)/ruby/internal/intern/numeric.h
+ifaddr.o: $(hdrdir)/ruby/internal/intern/object.h
+ifaddr.o: $(hdrdir)/ruby/internal/intern/parse.h
+ifaddr.o: $(hdrdir)/ruby/internal/intern/proc.h
+ifaddr.o: $(hdrdir)/ruby/internal/intern/process.h
+ifaddr.o: $(hdrdir)/ruby/internal/intern/random.h
+ifaddr.o: $(hdrdir)/ruby/internal/intern/range.h
+ifaddr.o: $(hdrdir)/ruby/internal/intern/rational.h
+ifaddr.o: $(hdrdir)/ruby/internal/intern/re.h
+ifaddr.o: $(hdrdir)/ruby/internal/intern/ruby.h
+ifaddr.o: $(hdrdir)/ruby/internal/intern/select.h
+ifaddr.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ifaddr.o: $(hdrdir)/ruby/internal/intern/signal.h
+ifaddr.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+ifaddr.o: $(hdrdir)/ruby/internal/intern/string.h
+ifaddr.o: $(hdrdir)/ruby/internal/intern/struct.h
+ifaddr.o: $(hdrdir)/ruby/internal/intern/thread.h
+ifaddr.o: $(hdrdir)/ruby/internal/intern/time.h
+ifaddr.o: $(hdrdir)/ruby/internal/intern/variable.h
+ifaddr.o: $(hdrdir)/ruby/internal/intern/vm.h
+ifaddr.o: $(hdrdir)/ruby/internal/interpreter.h
+ifaddr.o: $(hdrdir)/ruby/internal/iterator.h
+ifaddr.o: $(hdrdir)/ruby/internal/memory.h
+ifaddr.o: $(hdrdir)/ruby/internal/method.h
+ifaddr.o: $(hdrdir)/ruby/internal/module.h
+ifaddr.o: $(hdrdir)/ruby/internal/newobj.h
+ifaddr.o: $(hdrdir)/ruby/internal/rgengc.h
+ifaddr.o: $(hdrdir)/ruby/internal/scan_args.h
+ifaddr.o: $(hdrdir)/ruby/internal/special_consts.h
+ifaddr.o: $(hdrdir)/ruby/internal/static_assert.h
+ifaddr.o: $(hdrdir)/ruby/internal/stdalign.h
+ifaddr.o: $(hdrdir)/ruby/internal/stdbool.h
+ifaddr.o: $(hdrdir)/ruby/internal/symbol.h
+ifaddr.o: $(hdrdir)/ruby/internal/token_paste.h
+ifaddr.o: $(hdrdir)/ruby/internal/value.h
+ifaddr.o: $(hdrdir)/ruby/internal/value_type.h
+ifaddr.o: $(hdrdir)/ruby/internal/variable.h
+ifaddr.o: $(hdrdir)/ruby/internal/warning_push.h
+ifaddr.o: $(hdrdir)/ruby/internal/xmalloc.h
+ifaddr.o: $(hdrdir)/ruby/assert.h
 ifaddr.o: $(hdrdir)/ruby/backward.h
+ifaddr.o: $(hdrdir)/ruby/backward/2/assume.h
+ifaddr.o: $(hdrdir)/ruby/backward/2/attributes.h
+ifaddr.o: $(hdrdir)/ruby/backward/2/bool.h
+ifaddr.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+ifaddr.o: $(hdrdir)/ruby/backward/2/inttypes.h
+ifaddr.o: $(hdrdir)/ruby/backward/2/limits.h
+ifaddr.o: $(hdrdir)/ruby/backward/2/long_long.h
+ifaddr.o: $(hdrdir)/ruby/backward/2/stdalign.h
+ifaddr.o: $(hdrdir)/ruby/backward/2/stdarg.h
 ifaddr.o: $(hdrdir)/ruby/defines.h
 ifaddr.o: $(hdrdir)/ruby/encoding.h
 ifaddr.o: $(hdrdir)/ruby/intern.h
 ifaddr.o: $(hdrdir)/ruby/io.h
 ifaddr.o: $(hdrdir)/ruby/missing.h
+ifaddr.o: $(hdrdir)/ruby/onigmo.h
 ifaddr.o: $(hdrdir)/ruby/oniguruma.h
 ifaddr.o: $(hdrdir)/ruby/ruby.h
 ifaddr.o: $(hdrdir)/ruby/st.h
 ifaddr.o: $(hdrdir)/ruby/subst.h
 ifaddr.o: $(hdrdir)/ruby/thread.h
 ifaddr.o: $(hdrdir)/ruby/util.h
-ifaddr.o: $(top_srcdir)/include/ruby.h
 ifaddr.o: $(top_srcdir)/internal.h
+ifaddr.o: $(top_srcdir)/internal/array.h
+ifaddr.o: $(top_srcdir)/internal/compilers.h
+ifaddr.o: $(top_srcdir)/internal/error.h
+ifaddr.o: $(top_srcdir)/internal/gc.h
+ifaddr.o: $(top_srcdir)/internal/io.h
+ifaddr.o: $(top_srcdir)/internal/serial.h
+ifaddr.o: $(top_srcdir)/internal/static_assert.h
+ifaddr.o: $(top_srcdir)/internal/string.h
+ifaddr.o: $(top_srcdir)/internal/thread.h
+ifaddr.o: $(top_srcdir)/internal/vm.h
+ifaddr.o: $(top_srcdir)/internal/warnings.h
 ifaddr.o: constdefs.h
 ifaddr.o: ifaddr.c
 ifaddr.o: rubysocket.h
 ifaddr.o: sockport.h
 init.o: $(RUBY_EXTCONF_H)
 init.o: $(arch_hdrdir)/ruby/config.h
+init.o: $(hdrdir)/ruby.h
+init.o: $(hdrdir)/ruby/internal/anyargs.h
+init.o: $(hdrdir)/ruby/internal/arithmetic.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+init.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+init.o: $(hdrdir)/ruby/internal/assume.h
+init.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+init.o: $(hdrdir)/ruby/internal/attr/artificial.h
+init.o: $(hdrdir)/ruby/internal/attr/cold.h
+init.o: $(hdrdir)/ruby/internal/attr/const.h
+init.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+init.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+init.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+init.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+init.o: $(hdrdir)/ruby/internal/attr/error.h
+init.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+init.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+init.o: $(hdrdir)/ruby/internal/attr/format.h
+init.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+init.o: $(hdrdir)/ruby/internal/attr/noalias.h
+init.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+init.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+init.o: $(hdrdir)/ruby/internal/attr/noinline.h
+init.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+init.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+init.o: $(hdrdir)/ruby/internal/attr/pure.h
+init.o: $(hdrdir)/ruby/internal/attr/restrict.h
+init.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+init.o: $(hdrdir)/ruby/internal/attr/warning.h
+init.o: $(hdrdir)/ruby/internal/attr/weakref.h
+init.o: $(hdrdir)/ruby/internal/cast.h
+init.o: $(hdrdir)/ruby/internal/compiler_is.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+init.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+init.o: $(hdrdir)/ruby/internal/compiler_since.h
+init.o: $(hdrdir)/ruby/internal/config.h
+init.o: $(hdrdir)/ruby/internal/constant_p.h
+init.o: $(hdrdir)/ruby/internal/core.h
+init.o: $(hdrdir)/ruby/internal/core/rarray.h
+init.o: $(hdrdir)/ruby/internal/core/rbasic.h
+init.o: $(hdrdir)/ruby/internal/core/rbignum.h
+init.o: $(hdrdir)/ruby/internal/core/rclass.h
+init.o: $(hdrdir)/ruby/internal/core/rdata.h
+init.o: $(hdrdir)/ruby/internal/core/rfile.h
+init.o: $(hdrdir)/ruby/internal/core/rhash.h
+init.o: $(hdrdir)/ruby/internal/core/robject.h
+init.o: $(hdrdir)/ruby/internal/core/rregexp.h
+init.o: $(hdrdir)/ruby/internal/core/rstring.h
+init.o: $(hdrdir)/ruby/internal/core/rstruct.h
+init.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+init.o: $(hdrdir)/ruby/internal/ctype.h
+init.o: $(hdrdir)/ruby/internal/dllexport.h
+init.o: $(hdrdir)/ruby/internal/dosish.h
+init.o: $(hdrdir)/ruby/internal/error.h
+init.o: $(hdrdir)/ruby/internal/eval.h
+init.o: $(hdrdir)/ruby/internal/event.h
+init.o: $(hdrdir)/ruby/internal/fl_type.h
+init.o: $(hdrdir)/ruby/internal/gc.h
+init.o: $(hdrdir)/ruby/internal/glob.h
+init.o: $(hdrdir)/ruby/internal/globals.h
+init.o: $(hdrdir)/ruby/internal/has/attribute.h
+init.o: $(hdrdir)/ruby/internal/has/builtin.h
+init.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+init.o: $(hdrdir)/ruby/internal/has/extension.h
+init.o: $(hdrdir)/ruby/internal/has/feature.h
+init.o: $(hdrdir)/ruby/internal/has/warning.h
+init.o: $(hdrdir)/ruby/internal/intern/array.h
+init.o: $(hdrdir)/ruby/internal/intern/bignum.h
+init.o: $(hdrdir)/ruby/internal/intern/class.h
+init.o: $(hdrdir)/ruby/internal/intern/compar.h
+init.o: $(hdrdir)/ruby/internal/intern/complex.h
+init.o: $(hdrdir)/ruby/internal/intern/cont.h
+init.o: $(hdrdir)/ruby/internal/intern/dir.h
+init.o: $(hdrdir)/ruby/internal/intern/enum.h
+init.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+init.o: $(hdrdir)/ruby/internal/intern/error.h
+init.o: $(hdrdir)/ruby/internal/intern/eval.h
+init.o: $(hdrdir)/ruby/internal/intern/file.h
+init.o: $(hdrdir)/ruby/internal/intern/gc.h
+init.o: $(hdrdir)/ruby/internal/intern/hash.h
+init.o: $(hdrdir)/ruby/internal/intern/io.h
+init.o: $(hdrdir)/ruby/internal/intern/load.h
+init.o: $(hdrdir)/ruby/internal/intern/marshal.h
+init.o: $(hdrdir)/ruby/internal/intern/numeric.h
+init.o: $(hdrdir)/ruby/internal/intern/object.h
+init.o: $(hdrdir)/ruby/internal/intern/parse.h
+init.o: $(hdrdir)/ruby/internal/intern/proc.h
+init.o: $(hdrdir)/ruby/internal/intern/process.h
+init.o: $(hdrdir)/ruby/internal/intern/random.h
+init.o: $(hdrdir)/ruby/internal/intern/range.h
+init.o: $(hdrdir)/ruby/internal/intern/rational.h
+init.o: $(hdrdir)/ruby/internal/intern/re.h
+init.o: $(hdrdir)/ruby/internal/intern/ruby.h
+init.o: $(hdrdir)/ruby/internal/intern/select.h
+init.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+init.o: $(hdrdir)/ruby/internal/intern/signal.h
+init.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+init.o: $(hdrdir)/ruby/internal/intern/string.h
+init.o: $(hdrdir)/ruby/internal/intern/struct.h
+init.o: $(hdrdir)/ruby/internal/intern/thread.h
+init.o: $(hdrdir)/ruby/internal/intern/time.h
+init.o: $(hdrdir)/ruby/internal/intern/variable.h
+init.o: $(hdrdir)/ruby/internal/intern/vm.h
+init.o: $(hdrdir)/ruby/internal/interpreter.h
+init.o: $(hdrdir)/ruby/internal/iterator.h
+init.o: $(hdrdir)/ruby/internal/memory.h
+init.o: $(hdrdir)/ruby/internal/method.h
+init.o: $(hdrdir)/ruby/internal/module.h
+init.o: $(hdrdir)/ruby/internal/newobj.h
+init.o: $(hdrdir)/ruby/internal/rgengc.h
+init.o: $(hdrdir)/ruby/internal/scan_args.h
+init.o: $(hdrdir)/ruby/internal/special_consts.h
+init.o: $(hdrdir)/ruby/internal/static_assert.h
+init.o: $(hdrdir)/ruby/internal/stdalign.h
+init.o: $(hdrdir)/ruby/internal/stdbool.h
+init.o: $(hdrdir)/ruby/internal/symbol.h
+init.o: $(hdrdir)/ruby/internal/token_paste.h
+init.o: $(hdrdir)/ruby/internal/value.h
+init.o: $(hdrdir)/ruby/internal/value_type.h
+init.o: $(hdrdir)/ruby/internal/variable.h
+init.o: $(hdrdir)/ruby/internal/warning_push.h
+init.o: $(hdrdir)/ruby/internal/xmalloc.h
+init.o: $(hdrdir)/ruby/assert.h
 init.o: $(hdrdir)/ruby/backward.h
+init.o: $(hdrdir)/ruby/backward/2/assume.h
+init.o: $(hdrdir)/ruby/backward/2/attributes.h
+init.o: $(hdrdir)/ruby/backward/2/bool.h
+init.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+init.o: $(hdrdir)/ruby/backward/2/inttypes.h
+init.o: $(hdrdir)/ruby/backward/2/limits.h
+init.o: $(hdrdir)/ruby/backward/2/long_long.h
+init.o: $(hdrdir)/ruby/backward/2/stdalign.h
+init.o: $(hdrdir)/ruby/backward/2/stdarg.h
 init.o: $(hdrdir)/ruby/defines.h
 init.o: $(hdrdir)/ruby/encoding.h
 init.o: $(hdrdir)/ruby/intern.h
 init.o: $(hdrdir)/ruby/io.h
 init.o: $(hdrdir)/ruby/missing.h
+init.o: $(hdrdir)/ruby/onigmo.h
 init.o: $(hdrdir)/ruby/oniguruma.h
 init.o: $(hdrdir)/ruby/ruby.h
 init.o: $(hdrdir)/ruby/st.h
 init.o: $(hdrdir)/ruby/subst.h
 init.o: $(hdrdir)/ruby/thread.h
 init.o: $(hdrdir)/ruby/util.h
-init.o: $(top_srcdir)/include/ruby.h
 init.o: $(top_srcdir)/internal.h
+init.o: $(top_srcdir)/internal/array.h
+init.o: $(top_srcdir)/internal/compilers.h
+init.o: $(top_srcdir)/internal/error.h
+init.o: $(top_srcdir)/internal/gc.h
+init.o: $(top_srcdir)/internal/io.h
+init.o: $(top_srcdir)/internal/serial.h
+init.o: $(top_srcdir)/internal/static_assert.h
+init.o: $(top_srcdir)/internal/string.h
+init.o: $(top_srcdir)/internal/thread.h
+init.o: $(top_srcdir)/internal/vm.h
+init.o: $(top_srcdir)/internal/warnings.h
 init.o: constdefs.h
 init.o: init.c
 init.o: rubysocket.h
 init.o: sockport.h
 ipsocket.o: $(RUBY_EXTCONF_H)
 ipsocket.o: $(arch_hdrdir)/ruby/config.h
+ipsocket.o: $(hdrdir)/ruby.h
+ipsocket.o: $(hdrdir)/ruby/internal/anyargs.h
+ipsocket.o: $(hdrdir)/ruby/internal/arithmetic.h
+ipsocket.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+ipsocket.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+ipsocket.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+ipsocket.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+ipsocket.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+ipsocket.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+ipsocket.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+ipsocket.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+ipsocket.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+ipsocket.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+ipsocket.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+ipsocket.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+ipsocket.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+ipsocket.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+ipsocket.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+ipsocket.o: $(hdrdir)/ruby/internal/assume.h
+ipsocket.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+ipsocket.o: $(hdrdir)/ruby/internal/attr/artificial.h
+ipsocket.o: $(hdrdir)/ruby/internal/attr/cold.h
+ipsocket.o: $(hdrdir)/ruby/internal/attr/const.h
+ipsocket.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+ipsocket.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+ipsocket.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+ipsocket.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+ipsocket.o: $(hdrdir)/ruby/internal/attr/error.h
+ipsocket.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+ipsocket.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+ipsocket.o: $(hdrdir)/ruby/internal/attr/format.h
+ipsocket.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+ipsocket.o: $(hdrdir)/ruby/internal/attr/noalias.h
+ipsocket.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+ipsocket.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+ipsocket.o: $(hdrdir)/ruby/internal/attr/noinline.h
+ipsocket.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+ipsocket.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+ipsocket.o: $(hdrdir)/ruby/internal/attr/pure.h
+ipsocket.o: $(hdrdir)/ruby/internal/attr/restrict.h
+ipsocket.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+ipsocket.o: $(hdrdir)/ruby/internal/attr/warning.h
+ipsocket.o: $(hdrdir)/ruby/internal/attr/weakref.h
+ipsocket.o: $(hdrdir)/ruby/internal/cast.h
+ipsocket.o: $(hdrdir)/ruby/internal/compiler_is.h
+ipsocket.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+ipsocket.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+ipsocket.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+ipsocket.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+ipsocket.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+ipsocket.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+ipsocket.o: $(hdrdir)/ruby/internal/compiler_since.h
+ipsocket.o: $(hdrdir)/ruby/internal/config.h
+ipsocket.o: $(hdrdir)/ruby/internal/constant_p.h
+ipsocket.o: $(hdrdir)/ruby/internal/core.h
+ipsocket.o: $(hdrdir)/ruby/internal/core/rarray.h
+ipsocket.o: $(hdrdir)/ruby/internal/core/rbasic.h
+ipsocket.o: $(hdrdir)/ruby/internal/core/rbignum.h
+ipsocket.o: $(hdrdir)/ruby/internal/core/rclass.h
+ipsocket.o: $(hdrdir)/ruby/internal/core/rdata.h
+ipsocket.o: $(hdrdir)/ruby/internal/core/rfile.h
+ipsocket.o: $(hdrdir)/ruby/internal/core/rhash.h
+ipsocket.o: $(hdrdir)/ruby/internal/core/robject.h
+ipsocket.o: $(hdrdir)/ruby/internal/core/rregexp.h
+ipsocket.o: $(hdrdir)/ruby/internal/core/rstring.h
+ipsocket.o: $(hdrdir)/ruby/internal/core/rstruct.h
+ipsocket.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+ipsocket.o: $(hdrdir)/ruby/internal/ctype.h
+ipsocket.o: $(hdrdir)/ruby/internal/dllexport.h
+ipsocket.o: $(hdrdir)/ruby/internal/dosish.h
+ipsocket.o: $(hdrdir)/ruby/internal/error.h
+ipsocket.o: $(hdrdir)/ruby/internal/eval.h
+ipsocket.o: $(hdrdir)/ruby/internal/event.h
+ipsocket.o: $(hdrdir)/ruby/internal/fl_type.h
+ipsocket.o: $(hdrdir)/ruby/internal/gc.h
+ipsocket.o: $(hdrdir)/ruby/internal/glob.h
+ipsocket.o: $(hdrdir)/ruby/internal/globals.h
+ipsocket.o: $(hdrdir)/ruby/internal/has/attribute.h
+ipsocket.o: $(hdrdir)/ruby/internal/has/builtin.h
+ipsocket.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+ipsocket.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+ipsocket.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+ipsocket.o: $(hdrdir)/ruby/internal/has/extension.h
+ipsocket.o: $(hdrdir)/ruby/internal/has/feature.h
+ipsocket.o: $(hdrdir)/ruby/internal/has/warning.h
+ipsocket.o: $(hdrdir)/ruby/internal/intern/array.h
+ipsocket.o: $(hdrdir)/ruby/internal/intern/bignum.h
+ipsocket.o: $(hdrdir)/ruby/internal/intern/class.h
+ipsocket.o: $(hdrdir)/ruby/internal/intern/compar.h
+ipsocket.o: $(hdrdir)/ruby/internal/intern/complex.h
+ipsocket.o: $(hdrdir)/ruby/internal/intern/cont.h
+ipsocket.o: $(hdrdir)/ruby/internal/intern/dir.h
+ipsocket.o: $(hdrdir)/ruby/internal/intern/enum.h
+ipsocket.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+ipsocket.o: $(hdrdir)/ruby/internal/intern/error.h
+ipsocket.o: $(hdrdir)/ruby/internal/intern/eval.h
+ipsocket.o: $(hdrdir)/ruby/internal/intern/file.h
+ipsocket.o: $(hdrdir)/ruby/internal/intern/gc.h
+ipsocket.o: $(hdrdir)/ruby/internal/intern/hash.h
+ipsocket.o: $(hdrdir)/ruby/internal/intern/io.h
+ipsocket.o: $(hdrdir)/ruby/internal/intern/load.h
+ipsocket.o: $(hdrdir)/ruby/internal/intern/marshal.h
+ipsocket.o: $(hdrdir)/ruby/internal/intern/numeric.h
+ipsocket.o: $(hdrdir)/ruby/internal/intern/object.h
+ipsocket.o: $(hdrdir)/ruby/internal/intern/parse.h
+ipsocket.o: $(hdrdir)/ruby/internal/intern/proc.h
+ipsocket.o: $(hdrdir)/ruby/internal/intern/process.h
+ipsocket.o: $(hdrdir)/ruby/internal/intern/random.h
+ipsocket.o: $(hdrdir)/ruby/internal/intern/range.h
+ipsocket.o: $(hdrdir)/ruby/internal/intern/rational.h
+ipsocket.o: $(hdrdir)/ruby/internal/intern/re.h
+ipsocket.o: $(hdrdir)/ruby/internal/intern/ruby.h
+ipsocket.o: $(hdrdir)/ruby/internal/intern/select.h
+ipsocket.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+ipsocket.o: $(hdrdir)/ruby/internal/intern/signal.h
+ipsocket.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+ipsocket.o: $(hdrdir)/ruby/internal/intern/string.h
+ipsocket.o: $(hdrdir)/ruby/internal/intern/struct.h
+ipsocket.o: $(hdrdir)/ruby/internal/intern/thread.h
+ipsocket.o: $(hdrdir)/ruby/internal/intern/time.h
+ipsocket.o: $(hdrdir)/ruby/internal/intern/variable.h
+ipsocket.o: $(hdrdir)/ruby/internal/intern/vm.h
+ipsocket.o: $(hdrdir)/ruby/internal/interpreter.h
+ipsocket.o: $(hdrdir)/ruby/internal/iterator.h
+ipsocket.o: $(hdrdir)/ruby/internal/memory.h
+ipsocket.o: $(hdrdir)/ruby/internal/method.h
+ipsocket.o: $(hdrdir)/ruby/internal/module.h
+ipsocket.o: $(hdrdir)/ruby/internal/newobj.h
+ipsocket.o: $(hdrdir)/ruby/internal/rgengc.h
+ipsocket.o: $(hdrdir)/ruby/internal/scan_args.h
+ipsocket.o: $(hdrdir)/ruby/internal/special_consts.h
+ipsocket.o: $(hdrdir)/ruby/internal/static_assert.h
+ipsocket.o: $(hdrdir)/ruby/internal/stdalign.h
+ipsocket.o: $(hdrdir)/ruby/internal/stdbool.h
+ipsocket.o: $(hdrdir)/ruby/internal/symbol.h
+ipsocket.o: $(hdrdir)/ruby/internal/token_paste.h
+ipsocket.o: $(hdrdir)/ruby/internal/value.h
+ipsocket.o: $(hdrdir)/ruby/internal/value_type.h
+ipsocket.o: $(hdrdir)/ruby/internal/variable.h
+ipsocket.o: $(hdrdir)/ruby/internal/warning_push.h
+ipsocket.o: $(hdrdir)/ruby/internal/xmalloc.h
+ipsocket.o: $(hdrdir)/ruby/assert.h
 ipsocket.o: $(hdrdir)/ruby/backward.h
+ipsocket.o: $(hdrdir)/ruby/backward/2/assume.h
+ipsocket.o: $(hdrdir)/ruby/backward/2/attributes.h
+ipsocket.o: $(hdrdir)/ruby/backward/2/bool.h
+ipsocket.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+ipsocket.o: $(hdrdir)/ruby/backward/2/inttypes.h
+ipsocket.o: $(hdrdir)/ruby/backward/2/limits.h
+ipsocket.o: $(hdrdir)/ruby/backward/2/long_long.h
+ipsocket.o: $(hdrdir)/ruby/backward/2/stdalign.h
+ipsocket.o: $(hdrdir)/ruby/backward/2/stdarg.h
 ipsocket.o: $(hdrdir)/ruby/defines.h
 ipsocket.o: $(hdrdir)/ruby/encoding.h
 ipsocket.o: $(hdrdir)/ruby/intern.h
 ipsocket.o: $(hdrdir)/ruby/io.h
 ipsocket.o: $(hdrdir)/ruby/missing.h
+ipsocket.o: $(hdrdir)/ruby/onigmo.h
 ipsocket.o: $(hdrdir)/ruby/oniguruma.h
 ipsocket.o: $(hdrdir)/ruby/ruby.h
 ipsocket.o: $(hdrdir)/ruby/st.h
 ipsocket.o: $(hdrdir)/ruby/subst.h
 ipsocket.o: $(hdrdir)/ruby/thread.h
 ipsocket.o: $(hdrdir)/ruby/util.h
-ipsocket.o: $(top_srcdir)/include/ruby.h
 ipsocket.o: $(top_srcdir)/internal.h
+ipsocket.o: $(top_srcdir)/internal/array.h
+ipsocket.o: $(top_srcdir)/internal/compilers.h
+ipsocket.o: $(top_srcdir)/internal/error.h
+ipsocket.o: $(top_srcdir)/internal/gc.h
+ipsocket.o: $(top_srcdir)/internal/io.h
+ipsocket.o: $(top_srcdir)/internal/serial.h
+ipsocket.o: $(top_srcdir)/internal/static_assert.h
+ipsocket.o: $(top_srcdir)/internal/string.h
+ipsocket.o: $(top_srcdir)/internal/thread.h
+ipsocket.o: $(top_srcdir)/internal/vm.h
+ipsocket.o: $(top_srcdir)/internal/warnings.h
 ipsocket.o: constdefs.h
 ipsocket.o: ipsocket.c
 ipsocket.o: rubysocket.h
 ipsocket.o: sockport.h
 option.o: $(RUBY_EXTCONF_H)
 option.o: $(arch_hdrdir)/ruby/config.h
+option.o: $(hdrdir)/ruby.h
+option.o: $(hdrdir)/ruby/internal/anyargs.h
+option.o: $(hdrdir)/ruby/internal/arithmetic.h
+option.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+option.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+option.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+option.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+option.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+option.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+option.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+option.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+option.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+option.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+option.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+option.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+option.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+option.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+option.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+option.o: $(hdrdir)/ruby/internal/assume.h
+option.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+option.o: $(hdrdir)/ruby/internal/attr/artificial.h
+option.o: $(hdrdir)/ruby/internal/attr/cold.h
+option.o: $(hdrdir)/ruby/internal/attr/const.h
+option.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+option.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+option.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+option.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+option.o: $(hdrdir)/ruby/internal/attr/error.h
+option.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+option.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+option.o: $(hdrdir)/ruby/internal/attr/format.h
+option.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+option.o: $(hdrdir)/ruby/internal/attr/noalias.h
+option.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+option.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+option.o: $(hdrdir)/ruby/internal/attr/noinline.h
+option.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+option.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+option.o: $(hdrdir)/ruby/internal/attr/pure.h
+option.o: $(hdrdir)/ruby/internal/attr/restrict.h
+option.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+option.o: $(hdrdir)/ruby/internal/attr/warning.h
+option.o: $(hdrdir)/ruby/internal/attr/weakref.h
+option.o: $(hdrdir)/ruby/internal/cast.h
+option.o: $(hdrdir)/ruby/internal/compiler_is.h
+option.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+option.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+option.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+option.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+option.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+option.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+option.o: $(hdrdir)/ruby/internal/compiler_since.h
+option.o: $(hdrdir)/ruby/internal/config.h
+option.o: $(hdrdir)/ruby/internal/constant_p.h
+option.o: $(hdrdir)/ruby/internal/core.h
+option.o: $(hdrdir)/ruby/internal/core/rarray.h
+option.o: $(hdrdir)/ruby/internal/core/rbasic.h
+option.o: $(hdrdir)/ruby/internal/core/rbignum.h
+option.o: $(hdrdir)/ruby/internal/core/rclass.h
+option.o: $(hdrdir)/ruby/internal/core/rdata.h
+option.o: $(hdrdir)/ruby/internal/core/rfile.h
+option.o: $(hdrdir)/ruby/internal/core/rhash.h
+option.o: $(hdrdir)/ruby/internal/core/robject.h
+option.o: $(hdrdir)/ruby/internal/core/rregexp.h
+option.o: $(hdrdir)/ruby/internal/core/rstring.h
+option.o: $(hdrdir)/ruby/internal/core/rstruct.h
+option.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+option.o: $(hdrdir)/ruby/internal/ctype.h
+option.o: $(hdrdir)/ruby/internal/dllexport.h
+option.o: $(hdrdir)/ruby/internal/dosish.h
+option.o: $(hdrdir)/ruby/internal/error.h
+option.o: $(hdrdir)/ruby/internal/eval.h
+option.o: $(hdrdir)/ruby/internal/event.h
+option.o: $(hdrdir)/ruby/internal/fl_type.h
+option.o: $(hdrdir)/ruby/internal/gc.h
+option.o: $(hdrdir)/ruby/internal/glob.h
+option.o: $(hdrdir)/ruby/internal/globals.h
+option.o: $(hdrdir)/ruby/internal/has/attribute.h
+option.o: $(hdrdir)/ruby/internal/has/builtin.h
+option.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+option.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+option.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+option.o: $(hdrdir)/ruby/internal/has/extension.h
+option.o: $(hdrdir)/ruby/internal/has/feature.h
+option.o: $(hdrdir)/ruby/internal/has/warning.h
+option.o: $(hdrdir)/ruby/internal/intern/array.h
+option.o: $(hdrdir)/ruby/internal/intern/bignum.h
+option.o: $(hdrdir)/ruby/internal/intern/class.h
+option.o: $(hdrdir)/ruby/internal/intern/compar.h
+option.o: $(hdrdir)/ruby/internal/intern/complex.h
+option.o: $(hdrdir)/ruby/internal/intern/cont.h
+option.o: $(hdrdir)/ruby/internal/intern/dir.h
+option.o: $(hdrdir)/ruby/internal/intern/enum.h
+option.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+option.o: $(hdrdir)/ruby/internal/intern/error.h
+option.o: $(hdrdir)/ruby/internal/intern/eval.h
+option.o: $(hdrdir)/ruby/internal/intern/file.h
+option.o: $(hdrdir)/ruby/internal/intern/gc.h
+option.o: $(hdrdir)/ruby/internal/intern/hash.h
+option.o: $(hdrdir)/ruby/internal/intern/io.h
+option.o: $(hdrdir)/ruby/internal/intern/load.h
+option.o: $(hdrdir)/ruby/internal/intern/marshal.h
+option.o: $(hdrdir)/ruby/internal/intern/numeric.h
+option.o: $(hdrdir)/ruby/internal/intern/object.h
+option.o: $(hdrdir)/ruby/internal/intern/parse.h
+option.o: $(hdrdir)/ruby/internal/intern/proc.h
+option.o: $(hdrdir)/ruby/internal/intern/process.h
+option.o: $(hdrdir)/ruby/internal/intern/random.h
+option.o: $(hdrdir)/ruby/internal/intern/range.h
+option.o: $(hdrdir)/ruby/internal/intern/rational.h
+option.o: $(hdrdir)/ruby/internal/intern/re.h
+option.o: $(hdrdir)/ruby/internal/intern/ruby.h
+option.o: $(hdrdir)/ruby/internal/intern/select.h
+option.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+option.o: $(hdrdir)/ruby/internal/intern/signal.h
+option.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+option.o: $(hdrdir)/ruby/internal/intern/string.h
+option.o: $(hdrdir)/ruby/internal/intern/struct.h
+option.o: $(hdrdir)/ruby/internal/intern/thread.h
+option.o: $(hdrdir)/ruby/internal/intern/time.h
+option.o: $(hdrdir)/ruby/internal/intern/variable.h
+option.o: $(hdrdir)/ruby/internal/intern/vm.h
+option.o: $(hdrdir)/ruby/internal/interpreter.h
+option.o: $(hdrdir)/ruby/internal/iterator.h
+option.o: $(hdrdir)/ruby/internal/memory.h
+option.o: $(hdrdir)/ruby/internal/method.h
+option.o: $(hdrdir)/ruby/internal/module.h
+option.o: $(hdrdir)/ruby/internal/newobj.h
+option.o: $(hdrdir)/ruby/internal/rgengc.h
+option.o: $(hdrdir)/ruby/internal/scan_args.h
+option.o: $(hdrdir)/ruby/internal/special_consts.h
+option.o: $(hdrdir)/ruby/internal/static_assert.h
+option.o: $(hdrdir)/ruby/internal/stdalign.h
+option.o: $(hdrdir)/ruby/internal/stdbool.h
+option.o: $(hdrdir)/ruby/internal/symbol.h
+option.o: $(hdrdir)/ruby/internal/token_paste.h
+option.o: $(hdrdir)/ruby/internal/value.h
+option.o: $(hdrdir)/ruby/internal/value_type.h
+option.o: $(hdrdir)/ruby/internal/variable.h
+option.o: $(hdrdir)/ruby/internal/warning_push.h
+option.o: $(hdrdir)/ruby/internal/xmalloc.h
+option.o: $(hdrdir)/ruby/assert.h
 option.o: $(hdrdir)/ruby/backward.h
+option.o: $(hdrdir)/ruby/backward/2/assume.h
+option.o: $(hdrdir)/ruby/backward/2/attributes.h
+option.o: $(hdrdir)/ruby/backward/2/bool.h
+option.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+option.o: $(hdrdir)/ruby/backward/2/inttypes.h
+option.o: $(hdrdir)/ruby/backward/2/limits.h
+option.o: $(hdrdir)/ruby/backward/2/long_long.h
+option.o: $(hdrdir)/ruby/backward/2/stdalign.h
+option.o: $(hdrdir)/ruby/backward/2/stdarg.h
 option.o: $(hdrdir)/ruby/defines.h
 option.o: $(hdrdir)/ruby/encoding.h
 option.o: $(hdrdir)/ruby/intern.h
 option.o: $(hdrdir)/ruby/io.h
 option.o: $(hdrdir)/ruby/missing.h
+option.o: $(hdrdir)/ruby/onigmo.h
 option.o: $(hdrdir)/ruby/oniguruma.h
 option.o: $(hdrdir)/ruby/ruby.h
 option.o: $(hdrdir)/ruby/st.h
 option.o: $(hdrdir)/ruby/subst.h
 option.o: $(hdrdir)/ruby/thread.h
 option.o: $(hdrdir)/ruby/util.h
-option.o: $(top_srcdir)/include/ruby.h
 option.o: $(top_srcdir)/internal.h
+option.o: $(top_srcdir)/internal/array.h
+option.o: $(top_srcdir)/internal/compilers.h
+option.o: $(top_srcdir)/internal/error.h
+option.o: $(top_srcdir)/internal/gc.h
+option.o: $(top_srcdir)/internal/io.h
+option.o: $(top_srcdir)/internal/serial.h
+option.o: $(top_srcdir)/internal/static_assert.h
+option.o: $(top_srcdir)/internal/string.h
+option.o: $(top_srcdir)/internal/thread.h
+option.o: $(top_srcdir)/internal/vm.h
+option.o: $(top_srcdir)/internal/warnings.h
 option.o: constdefs.h
 option.o: option.c
 option.o: rubysocket.h
 option.o: sockport.h
 raddrinfo.o: $(RUBY_EXTCONF_H)
 raddrinfo.o: $(arch_hdrdir)/ruby/config.h
+raddrinfo.o: $(hdrdir)/ruby.h
+raddrinfo.o: $(hdrdir)/ruby/internal/anyargs.h
+raddrinfo.o: $(hdrdir)/ruby/internal/arithmetic.h
+raddrinfo.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+raddrinfo.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+raddrinfo.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+raddrinfo.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+raddrinfo.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+raddrinfo.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+raddrinfo.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+raddrinfo.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+raddrinfo.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+raddrinfo.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+raddrinfo.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+raddrinfo.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+raddrinfo.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+raddrinfo.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+raddrinfo.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+raddrinfo.o: $(hdrdir)/ruby/internal/assume.h
+raddrinfo.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+raddrinfo.o: $(hdrdir)/ruby/internal/attr/artificial.h
+raddrinfo.o: $(hdrdir)/ruby/internal/attr/cold.h
+raddrinfo.o: $(hdrdir)/ruby/internal/attr/const.h
+raddrinfo.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+raddrinfo.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+raddrinfo.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+raddrinfo.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+raddrinfo.o: $(hdrdir)/ruby/internal/attr/error.h
+raddrinfo.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+raddrinfo.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+raddrinfo.o: $(hdrdir)/ruby/internal/attr/format.h
+raddrinfo.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+raddrinfo.o: $(hdrdir)/ruby/internal/attr/noalias.h
+raddrinfo.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+raddrinfo.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+raddrinfo.o: $(hdrdir)/ruby/internal/attr/noinline.h
+raddrinfo.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+raddrinfo.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+raddrinfo.o: $(hdrdir)/ruby/internal/attr/pure.h
+raddrinfo.o: $(hdrdir)/ruby/internal/attr/restrict.h
+raddrinfo.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+raddrinfo.o: $(hdrdir)/ruby/internal/attr/warning.h
+raddrinfo.o: $(hdrdir)/ruby/internal/attr/weakref.h
+raddrinfo.o: $(hdrdir)/ruby/internal/cast.h
+raddrinfo.o: $(hdrdir)/ruby/internal/compiler_is.h
+raddrinfo.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+raddrinfo.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+raddrinfo.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+raddrinfo.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+raddrinfo.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+raddrinfo.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+raddrinfo.o: $(hdrdir)/ruby/internal/compiler_since.h
+raddrinfo.o: $(hdrdir)/ruby/internal/config.h
+raddrinfo.o: $(hdrdir)/ruby/internal/constant_p.h
+raddrinfo.o: $(hdrdir)/ruby/internal/core.h
+raddrinfo.o: $(hdrdir)/ruby/internal/core/rarray.h
+raddrinfo.o: $(hdrdir)/ruby/internal/core/rbasic.h
+raddrinfo.o: $(hdrdir)/ruby/internal/core/rbignum.h
+raddrinfo.o: $(hdrdir)/ruby/internal/core/rclass.h
+raddrinfo.o: $(hdrdir)/ruby/internal/core/rdata.h
+raddrinfo.o: $(hdrdir)/ruby/internal/core/rfile.h
+raddrinfo.o: $(hdrdir)/ruby/internal/core/rhash.h
+raddrinfo.o: $(hdrdir)/ruby/internal/core/robject.h
+raddrinfo.o: $(hdrdir)/ruby/internal/core/rregexp.h
+raddrinfo.o: $(hdrdir)/ruby/internal/core/rstring.h
+raddrinfo.o: $(hdrdir)/ruby/internal/core/rstruct.h
+raddrinfo.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+raddrinfo.o: $(hdrdir)/ruby/internal/ctype.h
+raddrinfo.o: $(hdrdir)/ruby/internal/dllexport.h
+raddrinfo.o: $(hdrdir)/ruby/internal/dosish.h
+raddrinfo.o: $(hdrdir)/ruby/internal/error.h
+raddrinfo.o: $(hdrdir)/ruby/internal/eval.h
+raddrinfo.o: $(hdrdir)/ruby/internal/event.h
+raddrinfo.o: $(hdrdir)/ruby/internal/fl_type.h
+raddrinfo.o: $(hdrdir)/ruby/internal/gc.h
+raddrinfo.o: $(hdrdir)/ruby/internal/glob.h
+raddrinfo.o: $(hdrdir)/ruby/internal/globals.h
+raddrinfo.o: $(hdrdir)/ruby/internal/has/attribute.h
+raddrinfo.o: $(hdrdir)/ruby/internal/has/builtin.h
+raddrinfo.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+raddrinfo.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+raddrinfo.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+raddrinfo.o: $(hdrdir)/ruby/internal/has/extension.h
+raddrinfo.o: $(hdrdir)/ruby/internal/has/feature.h
+raddrinfo.o: $(hdrdir)/ruby/internal/has/warning.h
+raddrinfo.o: $(hdrdir)/ruby/internal/intern/array.h
+raddrinfo.o: $(hdrdir)/ruby/internal/intern/bignum.h
+raddrinfo.o: $(hdrdir)/ruby/internal/intern/class.h
+raddrinfo.o: $(hdrdir)/ruby/internal/intern/compar.h
+raddrinfo.o: $(hdrdir)/ruby/internal/intern/complex.h
+raddrinfo.o: $(hdrdir)/ruby/internal/intern/cont.h
+raddrinfo.o: $(hdrdir)/ruby/internal/intern/dir.h
+raddrinfo.o: $(hdrdir)/ruby/internal/intern/enum.h
+raddrinfo.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+raddrinfo.o: $(hdrdir)/ruby/internal/intern/error.h
+raddrinfo.o: $(hdrdir)/ruby/internal/intern/eval.h
+raddrinfo.o: $(hdrdir)/ruby/internal/intern/file.h
+raddrinfo.o: $(hdrdir)/ruby/internal/intern/gc.h
+raddrinfo.o: $(hdrdir)/ruby/internal/intern/hash.h
+raddrinfo.o: $(hdrdir)/ruby/internal/intern/io.h
+raddrinfo.o: $(hdrdir)/ruby/internal/intern/load.h
+raddrinfo.o: $(hdrdir)/ruby/internal/intern/marshal.h
+raddrinfo.o: $(hdrdir)/ruby/internal/intern/numeric.h
+raddrinfo.o: $(hdrdir)/ruby/internal/intern/object.h
+raddrinfo.o: $(hdrdir)/ruby/internal/intern/parse.h
+raddrinfo.o: $(hdrdir)/ruby/internal/intern/proc.h
+raddrinfo.o: $(hdrdir)/ruby/internal/intern/process.h
+raddrinfo.o: $(hdrdir)/ruby/internal/intern/random.h
+raddrinfo.o: $(hdrdir)/ruby/internal/intern/range.h
+raddrinfo.o: $(hdrdir)/ruby/internal/intern/rational.h
+raddrinfo.o: $(hdrdir)/ruby/internal/intern/re.h
+raddrinfo.o: $(hdrdir)/ruby/internal/intern/ruby.h
+raddrinfo.o: $(hdrdir)/ruby/internal/intern/select.h
+raddrinfo.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+raddrinfo.o: $(hdrdir)/ruby/internal/intern/signal.h
+raddrinfo.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+raddrinfo.o: $(hdrdir)/ruby/internal/intern/string.h
+raddrinfo.o: $(hdrdir)/ruby/internal/intern/struct.h
+raddrinfo.o: $(hdrdir)/ruby/internal/intern/thread.h
+raddrinfo.o: $(hdrdir)/ruby/internal/intern/time.h
+raddrinfo.o: $(hdrdir)/ruby/internal/intern/variable.h
+raddrinfo.o: $(hdrdir)/ruby/internal/intern/vm.h
+raddrinfo.o: $(hdrdir)/ruby/internal/interpreter.h
+raddrinfo.o: $(hdrdir)/ruby/internal/iterator.h
+raddrinfo.o: $(hdrdir)/ruby/internal/memory.h
+raddrinfo.o: $(hdrdir)/ruby/internal/method.h
+raddrinfo.o: $(hdrdir)/ruby/internal/module.h
+raddrinfo.o: $(hdrdir)/ruby/internal/newobj.h
+raddrinfo.o: $(hdrdir)/ruby/internal/rgengc.h
+raddrinfo.o: $(hdrdir)/ruby/internal/scan_args.h
+raddrinfo.o: $(hdrdir)/ruby/internal/special_consts.h
+raddrinfo.o: $(hdrdir)/ruby/internal/static_assert.h
+raddrinfo.o: $(hdrdir)/ruby/internal/stdalign.h
+raddrinfo.o: $(hdrdir)/ruby/internal/stdbool.h
+raddrinfo.o: $(hdrdir)/ruby/internal/symbol.h
+raddrinfo.o: $(hdrdir)/ruby/internal/token_paste.h
+raddrinfo.o: $(hdrdir)/ruby/internal/value.h
+raddrinfo.o: $(hdrdir)/ruby/internal/value_type.h
+raddrinfo.o: $(hdrdir)/ruby/internal/variable.h
+raddrinfo.o: $(hdrdir)/ruby/internal/warning_push.h
+raddrinfo.o: $(hdrdir)/ruby/internal/xmalloc.h
+raddrinfo.o: $(hdrdir)/ruby/assert.h
 raddrinfo.o: $(hdrdir)/ruby/backward.h
+raddrinfo.o: $(hdrdir)/ruby/backward/2/assume.h
+raddrinfo.o: $(hdrdir)/ruby/backward/2/attributes.h
+raddrinfo.o: $(hdrdir)/ruby/backward/2/bool.h
+raddrinfo.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+raddrinfo.o: $(hdrdir)/ruby/backward/2/inttypes.h
+raddrinfo.o: $(hdrdir)/ruby/backward/2/limits.h
+raddrinfo.o: $(hdrdir)/ruby/backward/2/long_long.h
+raddrinfo.o: $(hdrdir)/ruby/backward/2/stdalign.h
+raddrinfo.o: $(hdrdir)/ruby/backward/2/stdarg.h
 raddrinfo.o: $(hdrdir)/ruby/defines.h
 raddrinfo.o: $(hdrdir)/ruby/encoding.h
 raddrinfo.o: $(hdrdir)/ruby/intern.h
 raddrinfo.o: $(hdrdir)/ruby/io.h
 raddrinfo.o: $(hdrdir)/ruby/missing.h
+raddrinfo.o: $(hdrdir)/ruby/onigmo.h
 raddrinfo.o: $(hdrdir)/ruby/oniguruma.h
 raddrinfo.o: $(hdrdir)/ruby/ruby.h
 raddrinfo.o: $(hdrdir)/ruby/st.h
 raddrinfo.o: $(hdrdir)/ruby/subst.h
 raddrinfo.o: $(hdrdir)/ruby/thread.h
 raddrinfo.o: $(hdrdir)/ruby/util.h
-raddrinfo.o: $(top_srcdir)/include/ruby.h
 raddrinfo.o: $(top_srcdir)/internal.h
+raddrinfo.o: $(top_srcdir)/internal/array.h
+raddrinfo.o: $(top_srcdir)/internal/compilers.h
+raddrinfo.o: $(top_srcdir)/internal/error.h
+raddrinfo.o: $(top_srcdir)/internal/gc.h
+raddrinfo.o: $(top_srcdir)/internal/io.h
+raddrinfo.o: $(top_srcdir)/internal/serial.h
+raddrinfo.o: $(top_srcdir)/internal/static_assert.h
+raddrinfo.o: $(top_srcdir)/internal/string.h
+raddrinfo.o: $(top_srcdir)/internal/thread.h
+raddrinfo.o: $(top_srcdir)/internal/vm.h
+raddrinfo.o: $(top_srcdir)/internal/warnings.h
 raddrinfo.o: constdefs.h
 raddrinfo.o: raddrinfo.c
 raddrinfo.o: rubysocket.h
 raddrinfo.o: sockport.h
 socket.o: $(RUBY_EXTCONF_H)
 socket.o: $(arch_hdrdir)/ruby/config.h
+socket.o: $(hdrdir)/ruby.h
+socket.o: $(hdrdir)/ruby/internal/anyargs.h
+socket.o: $(hdrdir)/ruby/internal/arithmetic.h
+socket.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+socket.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+socket.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+socket.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+socket.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+socket.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+socket.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+socket.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+socket.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+socket.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+socket.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+socket.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+socket.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+socket.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+socket.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+socket.o: $(hdrdir)/ruby/internal/assume.h
+socket.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+socket.o: $(hdrdir)/ruby/internal/attr/artificial.h
+socket.o: $(hdrdir)/ruby/internal/attr/cold.h
+socket.o: $(hdrdir)/ruby/internal/attr/const.h
+socket.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+socket.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+socket.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+socket.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+socket.o: $(hdrdir)/ruby/internal/attr/error.h
+socket.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+socket.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+socket.o: $(hdrdir)/ruby/internal/attr/format.h
+socket.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+socket.o: $(hdrdir)/ruby/internal/attr/noalias.h
+socket.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+socket.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+socket.o: $(hdrdir)/ruby/internal/attr/noinline.h
+socket.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+socket.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+socket.o: $(hdrdir)/ruby/internal/attr/pure.h
+socket.o: $(hdrdir)/ruby/internal/attr/restrict.h
+socket.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+socket.o: $(hdrdir)/ruby/internal/attr/warning.h
+socket.o: $(hdrdir)/ruby/internal/attr/weakref.h
+socket.o: $(hdrdir)/ruby/internal/cast.h
+socket.o: $(hdrdir)/ruby/internal/compiler_is.h
+socket.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+socket.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+socket.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+socket.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+socket.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+socket.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+socket.o: $(hdrdir)/ruby/internal/compiler_since.h
+socket.o: $(hdrdir)/ruby/internal/config.h
+socket.o: $(hdrdir)/ruby/internal/constant_p.h
+socket.o: $(hdrdir)/ruby/internal/core.h
+socket.o: $(hdrdir)/ruby/internal/core/rarray.h
+socket.o: $(hdrdir)/ruby/internal/core/rbasic.h
+socket.o: $(hdrdir)/ruby/internal/core/rbignum.h
+socket.o: $(hdrdir)/ruby/internal/core/rclass.h
+socket.o: $(hdrdir)/ruby/internal/core/rdata.h
+socket.o: $(hdrdir)/ruby/internal/core/rfile.h
+socket.o: $(hdrdir)/ruby/internal/core/rhash.h
+socket.o: $(hdrdir)/ruby/internal/core/robject.h
+socket.o: $(hdrdir)/ruby/internal/core/rregexp.h
+socket.o: $(hdrdir)/ruby/internal/core/rstring.h
+socket.o: $(hdrdir)/ruby/internal/core/rstruct.h
+socket.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+socket.o: $(hdrdir)/ruby/internal/ctype.h
+socket.o: $(hdrdir)/ruby/internal/dllexport.h
+socket.o: $(hdrdir)/ruby/internal/dosish.h
+socket.o: $(hdrdir)/ruby/internal/error.h
+socket.o: $(hdrdir)/ruby/internal/eval.h
+socket.o: $(hdrdir)/ruby/internal/event.h
+socket.o: $(hdrdir)/ruby/internal/fl_type.h
+socket.o: $(hdrdir)/ruby/internal/gc.h
+socket.o: $(hdrdir)/ruby/internal/glob.h
+socket.o: $(hdrdir)/ruby/internal/globals.h
+socket.o: $(hdrdir)/ruby/internal/has/attribute.h
+socket.o: $(hdrdir)/ruby/internal/has/builtin.h
+socket.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+socket.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+socket.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+socket.o: $(hdrdir)/ruby/internal/has/extension.h
+socket.o: $(hdrdir)/ruby/internal/has/feature.h
+socket.o: $(hdrdir)/ruby/internal/has/warning.h
+socket.o: $(hdrdir)/ruby/internal/intern/array.h
+socket.o: $(hdrdir)/ruby/internal/intern/bignum.h
+socket.o: $(hdrdir)/ruby/internal/intern/class.h
+socket.o: $(hdrdir)/ruby/internal/intern/compar.h
+socket.o: $(hdrdir)/ruby/internal/intern/complex.h
+socket.o: $(hdrdir)/ruby/internal/intern/cont.h
+socket.o: $(hdrdir)/ruby/internal/intern/dir.h
+socket.o: $(hdrdir)/ruby/internal/intern/enum.h
+socket.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+socket.o: $(hdrdir)/ruby/internal/intern/error.h
+socket.o: $(hdrdir)/ruby/internal/intern/eval.h
+socket.o: $(hdrdir)/ruby/internal/intern/file.h
+socket.o: $(hdrdir)/ruby/internal/intern/gc.h
+socket.o: $(hdrdir)/ruby/internal/intern/hash.h
+socket.o: $(hdrdir)/ruby/internal/intern/io.h
+socket.o: $(hdrdir)/ruby/internal/intern/load.h
+socket.o: $(hdrdir)/ruby/internal/intern/marshal.h
+socket.o: $(hdrdir)/ruby/internal/intern/numeric.h
+socket.o: $(hdrdir)/ruby/internal/intern/object.h
+socket.o: $(hdrdir)/ruby/internal/intern/parse.h
+socket.o: $(hdrdir)/ruby/internal/intern/proc.h
+socket.o: $(hdrdir)/ruby/internal/intern/process.h
+socket.o: $(hdrdir)/ruby/internal/intern/random.h
+socket.o: $(hdrdir)/ruby/internal/intern/range.h
+socket.o: $(hdrdir)/ruby/internal/intern/rational.h
+socket.o: $(hdrdir)/ruby/internal/intern/re.h
+socket.o: $(hdrdir)/ruby/internal/intern/ruby.h
+socket.o: $(hdrdir)/ruby/internal/intern/select.h
+socket.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+socket.o: $(hdrdir)/ruby/internal/intern/signal.h
+socket.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+socket.o: $(hdrdir)/ruby/internal/intern/string.h
+socket.o: $(hdrdir)/ruby/internal/intern/struct.h
+socket.o: $(hdrdir)/ruby/internal/intern/thread.h
+socket.o: $(hdrdir)/ruby/internal/intern/time.h
+socket.o: $(hdrdir)/ruby/internal/intern/variable.h
+socket.o: $(hdrdir)/ruby/internal/intern/vm.h
+socket.o: $(hdrdir)/ruby/internal/interpreter.h
+socket.o: $(hdrdir)/ruby/internal/iterator.h
+socket.o: $(hdrdir)/ruby/internal/memory.h
+socket.o: $(hdrdir)/ruby/internal/method.h
+socket.o: $(hdrdir)/ruby/internal/module.h
+socket.o: $(hdrdir)/ruby/internal/newobj.h
+socket.o: $(hdrdir)/ruby/internal/rgengc.h
+socket.o: $(hdrdir)/ruby/internal/scan_args.h
+socket.o: $(hdrdir)/ruby/internal/special_consts.h
+socket.o: $(hdrdir)/ruby/internal/static_assert.h
+socket.o: $(hdrdir)/ruby/internal/stdalign.h
+socket.o: $(hdrdir)/ruby/internal/stdbool.h
+socket.o: $(hdrdir)/ruby/internal/symbol.h
+socket.o: $(hdrdir)/ruby/internal/token_paste.h
+socket.o: $(hdrdir)/ruby/internal/value.h
+socket.o: $(hdrdir)/ruby/internal/value_type.h
+socket.o: $(hdrdir)/ruby/internal/variable.h
+socket.o: $(hdrdir)/ruby/internal/warning_push.h
+socket.o: $(hdrdir)/ruby/internal/xmalloc.h
+socket.o: $(hdrdir)/ruby/assert.h
 socket.o: $(hdrdir)/ruby/backward.h
+socket.o: $(hdrdir)/ruby/backward/2/assume.h
+socket.o: $(hdrdir)/ruby/backward/2/attributes.h
+socket.o: $(hdrdir)/ruby/backward/2/bool.h
+socket.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+socket.o: $(hdrdir)/ruby/backward/2/inttypes.h
+socket.o: $(hdrdir)/ruby/backward/2/limits.h
+socket.o: $(hdrdir)/ruby/backward/2/long_long.h
+socket.o: $(hdrdir)/ruby/backward/2/stdalign.h
+socket.o: $(hdrdir)/ruby/backward/2/stdarg.h
 socket.o: $(hdrdir)/ruby/defines.h
 socket.o: $(hdrdir)/ruby/encoding.h
 socket.o: $(hdrdir)/ruby/intern.h
 socket.o: $(hdrdir)/ruby/io.h
 socket.o: $(hdrdir)/ruby/missing.h
+socket.o: $(hdrdir)/ruby/onigmo.h
 socket.o: $(hdrdir)/ruby/oniguruma.h
 socket.o: $(hdrdir)/ruby/ruby.h
 socket.o: $(hdrdir)/ruby/st.h
 socket.o: $(hdrdir)/ruby/subst.h
 socket.o: $(hdrdir)/ruby/thread.h
 socket.o: $(hdrdir)/ruby/util.h
-socket.o: $(top_srcdir)/include/ruby.h
 socket.o: $(top_srcdir)/internal.h
+socket.o: $(top_srcdir)/internal/array.h
+socket.o: $(top_srcdir)/internal/compilers.h
+socket.o: $(top_srcdir)/internal/error.h
+socket.o: $(top_srcdir)/internal/gc.h
+socket.o: $(top_srcdir)/internal/io.h
+socket.o: $(top_srcdir)/internal/serial.h
+socket.o: $(top_srcdir)/internal/static_assert.h
+socket.o: $(top_srcdir)/internal/string.h
+socket.o: $(top_srcdir)/internal/thread.h
+socket.o: $(top_srcdir)/internal/vm.h
+socket.o: $(top_srcdir)/internal/warnings.h
 socket.o: constdefs.h
 socket.o: rubysocket.h
 socket.o: socket.c
 socket.o: sockport.h
 sockssocket.o: $(RUBY_EXTCONF_H)
 sockssocket.o: $(arch_hdrdir)/ruby/config.h
+sockssocket.o: $(hdrdir)/ruby.h
+sockssocket.o: $(hdrdir)/ruby/internal/anyargs.h
+sockssocket.o: $(hdrdir)/ruby/internal/arithmetic.h
+sockssocket.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+sockssocket.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+sockssocket.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+sockssocket.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+sockssocket.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+sockssocket.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+sockssocket.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+sockssocket.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+sockssocket.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+sockssocket.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+sockssocket.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+sockssocket.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+sockssocket.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+sockssocket.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+sockssocket.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+sockssocket.o: $(hdrdir)/ruby/internal/assume.h
+sockssocket.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+sockssocket.o: $(hdrdir)/ruby/internal/attr/artificial.h
+sockssocket.o: $(hdrdir)/ruby/internal/attr/cold.h
+sockssocket.o: $(hdrdir)/ruby/internal/attr/const.h
+sockssocket.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+sockssocket.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+sockssocket.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+sockssocket.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+sockssocket.o: $(hdrdir)/ruby/internal/attr/error.h
+sockssocket.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+sockssocket.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+sockssocket.o: $(hdrdir)/ruby/internal/attr/format.h
+sockssocket.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+sockssocket.o: $(hdrdir)/ruby/internal/attr/noalias.h
+sockssocket.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+sockssocket.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+sockssocket.o: $(hdrdir)/ruby/internal/attr/noinline.h
+sockssocket.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+sockssocket.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+sockssocket.o: $(hdrdir)/ruby/internal/attr/pure.h
+sockssocket.o: $(hdrdir)/ruby/internal/attr/restrict.h
+sockssocket.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+sockssocket.o: $(hdrdir)/ruby/internal/attr/warning.h
+sockssocket.o: $(hdrdir)/ruby/internal/attr/weakref.h
+sockssocket.o: $(hdrdir)/ruby/internal/cast.h
+sockssocket.o: $(hdrdir)/ruby/internal/compiler_is.h
+sockssocket.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+sockssocket.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+sockssocket.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+sockssocket.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+sockssocket.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+sockssocket.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+sockssocket.o: $(hdrdir)/ruby/internal/compiler_since.h
+sockssocket.o: $(hdrdir)/ruby/internal/config.h
+sockssocket.o: $(hdrdir)/ruby/internal/constant_p.h
+sockssocket.o: $(hdrdir)/ruby/internal/core.h
+sockssocket.o: $(hdrdir)/ruby/internal/core/rarray.h
+sockssocket.o: $(hdrdir)/ruby/internal/core/rbasic.h
+sockssocket.o: $(hdrdir)/ruby/internal/core/rbignum.h
+sockssocket.o: $(hdrdir)/ruby/internal/core/rclass.h
+sockssocket.o: $(hdrdir)/ruby/internal/core/rdata.h
+sockssocket.o: $(hdrdir)/ruby/internal/core/rfile.h
+sockssocket.o: $(hdrdir)/ruby/internal/core/rhash.h
+sockssocket.o: $(hdrdir)/ruby/internal/core/robject.h
+sockssocket.o: $(hdrdir)/ruby/internal/core/rregexp.h
+sockssocket.o: $(hdrdir)/ruby/internal/core/rstring.h
+sockssocket.o: $(hdrdir)/ruby/internal/core/rstruct.h
+sockssocket.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+sockssocket.o: $(hdrdir)/ruby/internal/ctype.h
+sockssocket.o: $(hdrdir)/ruby/internal/dllexport.h
+sockssocket.o: $(hdrdir)/ruby/internal/dosish.h
+sockssocket.o: $(hdrdir)/ruby/internal/error.h
+sockssocket.o: $(hdrdir)/ruby/internal/eval.h
+sockssocket.o: $(hdrdir)/ruby/internal/event.h
+sockssocket.o: $(hdrdir)/ruby/internal/fl_type.h
+sockssocket.o: $(hdrdir)/ruby/internal/gc.h
+sockssocket.o: $(hdrdir)/ruby/internal/glob.h
+sockssocket.o: $(hdrdir)/ruby/internal/globals.h
+sockssocket.o: $(hdrdir)/ruby/internal/has/attribute.h
+sockssocket.o: $(hdrdir)/ruby/internal/has/builtin.h
+sockssocket.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+sockssocket.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+sockssocket.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+sockssocket.o: $(hdrdir)/ruby/internal/has/extension.h
+sockssocket.o: $(hdrdir)/ruby/internal/has/feature.h
+sockssocket.o: $(hdrdir)/ruby/internal/has/warning.h
+sockssocket.o: $(hdrdir)/ruby/internal/intern/array.h
+sockssocket.o: $(hdrdir)/ruby/internal/intern/bignum.h
+sockssocket.o: $(hdrdir)/ruby/internal/intern/class.h
+sockssocket.o: $(hdrdir)/ruby/internal/intern/compar.h
+sockssocket.o: $(hdrdir)/ruby/internal/intern/complex.h
+sockssocket.o: $(hdrdir)/ruby/internal/intern/cont.h
+sockssocket.o: $(hdrdir)/ruby/internal/intern/dir.h
+sockssocket.o: $(hdrdir)/ruby/internal/intern/enum.h
+sockssocket.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+sockssocket.o: $(hdrdir)/ruby/internal/intern/error.h
+sockssocket.o: $(hdrdir)/ruby/internal/intern/eval.h
+sockssocket.o: $(hdrdir)/ruby/internal/intern/file.h
+sockssocket.o: $(hdrdir)/ruby/internal/intern/gc.h
+sockssocket.o: $(hdrdir)/ruby/internal/intern/hash.h
+sockssocket.o: $(hdrdir)/ruby/internal/intern/io.h
+sockssocket.o: $(hdrdir)/ruby/internal/intern/load.h
+sockssocket.o: $(hdrdir)/ruby/internal/intern/marshal.h
+sockssocket.o: $(hdrdir)/ruby/internal/intern/numeric.h
+sockssocket.o: $(hdrdir)/ruby/internal/intern/object.h
+sockssocket.o: $(hdrdir)/ruby/internal/intern/parse.h
+sockssocket.o: $(hdrdir)/ruby/internal/intern/proc.h
+sockssocket.o: $(hdrdir)/ruby/internal/intern/process.h
+sockssocket.o: $(hdrdir)/ruby/internal/intern/random.h
+sockssocket.o: $(hdrdir)/ruby/internal/intern/range.h
+sockssocket.o: $(hdrdir)/ruby/internal/intern/rational.h
+sockssocket.o: $(hdrdir)/ruby/internal/intern/re.h
+sockssocket.o: $(hdrdir)/ruby/internal/intern/ruby.h
+sockssocket.o: $(hdrdir)/ruby/internal/intern/select.h
+sockssocket.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+sockssocket.o: $(hdrdir)/ruby/internal/intern/signal.h
+sockssocket.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+sockssocket.o: $(hdrdir)/ruby/internal/intern/string.h
+sockssocket.o: $(hdrdir)/ruby/internal/intern/struct.h
+sockssocket.o: $(hdrdir)/ruby/internal/intern/thread.h
+sockssocket.o: $(hdrdir)/ruby/internal/intern/time.h
+sockssocket.o: $(hdrdir)/ruby/internal/intern/variable.h
+sockssocket.o: $(hdrdir)/ruby/internal/intern/vm.h
+sockssocket.o: $(hdrdir)/ruby/internal/interpreter.h
+sockssocket.o: $(hdrdir)/ruby/internal/iterator.h
+sockssocket.o: $(hdrdir)/ruby/internal/memory.h
+sockssocket.o: $(hdrdir)/ruby/internal/method.h
+sockssocket.o: $(hdrdir)/ruby/internal/module.h
+sockssocket.o: $(hdrdir)/ruby/internal/newobj.h
+sockssocket.o: $(hdrdir)/ruby/internal/rgengc.h
+sockssocket.o: $(hdrdir)/ruby/internal/scan_args.h
+sockssocket.o: $(hdrdir)/ruby/internal/special_consts.h
+sockssocket.o: $(hdrdir)/ruby/internal/static_assert.h
+sockssocket.o: $(hdrdir)/ruby/internal/stdalign.h
+sockssocket.o: $(hdrdir)/ruby/internal/stdbool.h
+sockssocket.o: $(hdrdir)/ruby/internal/symbol.h
+sockssocket.o: $(hdrdir)/ruby/internal/token_paste.h
+sockssocket.o: $(hdrdir)/ruby/internal/value.h
+sockssocket.o: $(hdrdir)/ruby/internal/value_type.h
+sockssocket.o: $(hdrdir)/ruby/internal/variable.h
+sockssocket.o: $(hdrdir)/ruby/internal/warning_push.h
+sockssocket.o: $(hdrdir)/ruby/internal/xmalloc.h
+sockssocket.o: $(hdrdir)/ruby/assert.h
 sockssocket.o: $(hdrdir)/ruby/backward.h
+sockssocket.o: $(hdrdir)/ruby/backward/2/assume.h
+sockssocket.o: $(hdrdir)/ruby/backward/2/attributes.h
+sockssocket.o: $(hdrdir)/ruby/backward/2/bool.h
+sockssocket.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+sockssocket.o: $(hdrdir)/ruby/backward/2/inttypes.h
+sockssocket.o: $(hdrdir)/ruby/backward/2/limits.h
+sockssocket.o: $(hdrdir)/ruby/backward/2/long_long.h
+sockssocket.o: $(hdrdir)/ruby/backward/2/stdalign.h
+sockssocket.o: $(hdrdir)/ruby/backward/2/stdarg.h
 sockssocket.o: $(hdrdir)/ruby/defines.h
 sockssocket.o: $(hdrdir)/ruby/encoding.h
 sockssocket.o: $(hdrdir)/ruby/intern.h
 sockssocket.o: $(hdrdir)/ruby/io.h
 sockssocket.o: $(hdrdir)/ruby/missing.h
+sockssocket.o: $(hdrdir)/ruby/onigmo.h
 sockssocket.o: $(hdrdir)/ruby/oniguruma.h
 sockssocket.o: $(hdrdir)/ruby/ruby.h
 sockssocket.o: $(hdrdir)/ruby/st.h
 sockssocket.o: $(hdrdir)/ruby/subst.h
 sockssocket.o: $(hdrdir)/ruby/thread.h
 sockssocket.o: $(hdrdir)/ruby/util.h
-sockssocket.o: $(top_srcdir)/include/ruby.h
 sockssocket.o: $(top_srcdir)/internal.h
+sockssocket.o: $(top_srcdir)/internal/array.h
+sockssocket.o: $(top_srcdir)/internal/compilers.h
+sockssocket.o: $(top_srcdir)/internal/error.h
+sockssocket.o: $(top_srcdir)/internal/gc.h
+sockssocket.o: $(top_srcdir)/internal/io.h
+sockssocket.o: $(top_srcdir)/internal/serial.h
+sockssocket.o: $(top_srcdir)/internal/static_assert.h
+sockssocket.o: $(top_srcdir)/internal/string.h
+sockssocket.o: $(top_srcdir)/internal/thread.h
+sockssocket.o: $(top_srcdir)/internal/vm.h
+sockssocket.o: $(top_srcdir)/internal/warnings.h
 sockssocket.o: constdefs.h
 sockssocket.o: rubysocket.h
 sockssocket.o: sockport.h
 sockssocket.o: sockssocket.c
 tcpserver.o: $(RUBY_EXTCONF_H)
 tcpserver.o: $(arch_hdrdir)/ruby/config.h
+tcpserver.o: $(hdrdir)/ruby.h
+tcpserver.o: $(hdrdir)/ruby/internal/anyargs.h
+tcpserver.o: $(hdrdir)/ruby/internal/arithmetic.h
+tcpserver.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+tcpserver.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+tcpserver.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+tcpserver.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+tcpserver.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+tcpserver.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+tcpserver.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+tcpserver.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+tcpserver.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+tcpserver.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+tcpserver.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+tcpserver.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+tcpserver.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+tcpserver.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+tcpserver.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+tcpserver.o: $(hdrdir)/ruby/internal/assume.h
+tcpserver.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+tcpserver.o: $(hdrdir)/ruby/internal/attr/artificial.h
+tcpserver.o: $(hdrdir)/ruby/internal/attr/cold.h
+tcpserver.o: $(hdrdir)/ruby/internal/attr/const.h
+tcpserver.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+tcpserver.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+tcpserver.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+tcpserver.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+tcpserver.o: $(hdrdir)/ruby/internal/attr/error.h
+tcpserver.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+tcpserver.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+tcpserver.o: $(hdrdir)/ruby/internal/attr/format.h
+tcpserver.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+tcpserver.o: $(hdrdir)/ruby/internal/attr/noalias.h
+tcpserver.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+tcpserver.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+tcpserver.o: $(hdrdir)/ruby/internal/attr/noinline.h
+tcpserver.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+tcpserver.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+tcpserver.o: $(hdrdir)/ruby/internal/attr/pure.h
+tcpserver.o: $(hdrdir)/ruby/internal/attr/restrict.h
+tcpserver.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+tcpserver.o: $(hdrdir)/ruby/internal/attr/warning.h
+tcpserver.o: $(hdrdir)/ruby/internal/attr/weakref.h
+tcpserver.o: $(hdrdir)/ruby/internal/cast.h
+tcpserver.o: $(hdrdir)/ruby/internal/compiler_is.h
+tcpserver.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+tcpserver.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+tcpserver.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+tcpserver.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+tcpserver.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+tcpserver.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+tcpserver.o: $(hdrdir)/ruby/internal/compiler_since.h
+tcpserver.o: $(hdrdir)/ruby/internal/config.h
+tcpserver.o: $(hdrdir)/ruby/internal/constant_p.h
+tcpserver.o: $(hdrdir)/ruby/internal/core.h
+tcpserver.o: $(hdrdir)/ruby/internal/core/rarray.h
+tcpserver.o: $(hdrdir)/ruby/internal/core/rbasic.h
+tcpserver.o: $(hdrdir)/ruby/internal/core/rbignum.h
+tcpserver.o: $(hdrdir)/ruby/internal/core/rclass.h
+tcpserver.o: $(hdrdir)/ruby/internal/core/rdata.h
+tcpserver.o: $(hdrdir)/ruby/internal/core/rfile.h
+tcpserver.o: $(hdrdir)/ruby/internal/core/rhash.h
+tcpserver.o: $(hdrdir)/ruby/internal/core/robject.h
+tcpserver.o: $(hdrdir)/ruby/internal/core/rregexp.h
+tcpserver.o: $(hdrdir)/ruby/internal/core/rstring.h
+tcpserver.o: $(hdrdir)/ruby/internal/core/rstruct.h
+tcpserver.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+tcpserver.o: $(hdrdir)/ruby/internal/ctype.h
+tcpserver.o: $(hdrdir)/ruby/internal/dllexport.h
+tcpserver.o: $(hdrdir)/ruby/internal/dosish.h
+tcpserver.o: $(hdrdir)/ruby/internal/error.h
+tcpserver.o: $(hdrdir)/ruby/internal/eval.h
+tcpserver.o: $(hdrdir)/ruby/internal/event.h
+tcpserver.o: $(hdrdir)/ruby/internal/fl_type.h
+tcpserver.o: $(hdrdir)/ruby/internal/gc.h
+tcpserver.o: $(hdrdir)/ruby/internal/glob.h
+tcpserver.o: $(hdrdir)/ruby/internal/globals.h
+tcpserver.o: $(hdrdir)/ruby/internal/has/attribute.h
+tcpserver.o: $(hdrdir)/ruby/internal/has/builtin.h
+tcpserver.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+tcpserver.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+tcpserver.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+tcpserver.o: $(hdrdir)/ruby/internal/has/extension.h
+tcpserver.o: $(hdrdir)/ruby/internal/has/feature.h
+tcpserver.o: $(hdrdir)/ruby/internal/has/warning.h
+tcpserver.o: $(hdrdir)/ruby/internal/intern/array.h
+tcpserver.o: $(hdrdir)/ruby/internal/intern/bignum.h
+tcpserver.o: $(hdrdir)/ruby/internal/intern/class.h
+tcpserver.o: $(hdrdir)/ruby/internal/intern/compar.h
+tcpserver.o: $(hdrdir)/ruby/internal/intern/complex.h
+tcpserver.o: $(hdrdir)/ruby/internal/intern/cont.h
+tcpserver.o: $(hdrdir)/ruby/internal/intern/dir.h
+tcpserver.o: $(hdrdir)/ruby/internal/intern/enum.h
+tcpserver.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+tcpserver.o: $(hdrdir)/ruby/internal/intern/error.h
+tcpserver.o: $(hdrdir)/ruby/internal/intern/eval.h
+tcpserver.o: $(hdrdir)/ruby/internal/intern/file.h
+tcpserver.o: $(hdrdir)/ruby/internal/intern/gc.h
+tcpserver.o: $(hdrdir)/ruby/internal/intern/hash.h
+tcpserver.o: $(hdrdir)/ruby/internal/intern/io.h
+tcpserver.o: $(hdrdir)/ruby/internal/intern/load.h
+tcpserver.o: $(hdrdir)/ruby/internal/intern/marshal.h
+tcpserver.o: $(hdrdir)/ruby/internal/intern/numeric.h
+tcpserver.o: $(hdrdir)/ruby/internal/intern/object.h
+tcpserver.o: $(hdrdir)/ruby/internal/intern/parse.h
+tcpserver.o: $(hdrdir)/ruby/internal/intern/proc.h
+tcpserver.o: $(hdrdir)/ruby/internal/intern/process.h
+tcpserver.o: $(hdrdir)/ruby/internal/intern/random.h
+tcpserver.o: $(hdrdir)/ruby/internal/intern/range.h
+tcpserver.o: $(hdrdir)/ruby/internal/intern/rational.h
+tcpserver.o: $(hdrdir)/ruby/internal/intern/re.h
+tcpserver.o: $(hdrdir)/ruby/internal/intern/ruby.h
+tcpserver.o: $(hdrdir)/ruby/internal/intern/select.h
+tcpserver.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+tcpserver.o: $(hdrdir)/ruby/internal/intern/signal.h
+tcpserver.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+tcpserver.o: $(hdrdir)/ruby/internal/intern/string.h
+tcpserver.o: $(hdrdir)/ruby/internal/intern/struct.h
+tcpserver.o: $(hdrdir)/ruby/internal/intern/thread.h
+tcpserver.o: $(hdrdir)/ruby/internal/intern/time.h
+tcpserver.o: $(hdrdir)/ruby/internal/intern/variable.h
+tcpserver.o: $(hdrdir)/ruby/internal/intern/vm.h
+tcpserver.o: $(hdrdir)/ruby/internal/interpreter.h
+tcpserver.o: $(hdrdir)/ruby/internal/iterator.h
+tcpserver.o: $(hdrdir)/ruby/internal/memory.h
+tcpserver.o: $(hdrdir)/ruby/internal/method.h
+tcpserver.o: $(hdrdir)/ruby/internal/module.h
+tcpserver.o: $(hdrdir)/ruby/internal/newobj.h
+tcpserver.o: $(hdrdir)/ruby/internal/rgengc.h
+tcpserver.o: $(hdrdir)/ruby/internal/scan_args.h
+tcpserver.o: $(hdrdir)/ruby/internal/special_consts.h
+tcpserver.o: $(hdrdir)/ruby/internal/static_assert.h
+tcpserver.o: $(hdrdir)/ruby/internal/stdalign.h
+tcpserver.o: $(hdrdir)/ruby/internal/stdbool.h
+tcpserver.o: $(hdrdir)/ruby/internal/symbol.h
+tcpserver.o: $(hdrdir)/ruby/internal/token_paste.h
+tcpserver.o: $(hdrdir)/ruby/internal/value.h
+tcpserver.o: $(hdrdir)/ruby/internal/value_type.h
+tcpserver.o: $(hdrdir)/ruby/internal/variable.h
+tcpserver.o: $(hdrdir)/ruby/internal/warning_push.h
+tcpserver.o: $(hdrdir)/ruby/internal/xmalloc.h
+tcpserver.o: $(hdrdir)/ruby/assert.h
 tcpserver.o: $(hdrdir)/ruby/backward.h
+tcpserver.o: $(hdrdir)/ruby/backward/2/assume.h
+tcpserver.o: $(hdrdir)/ruby/backward/2/attributes.h
+tcpserver.o: $(hdrdir)/ruby/backward/2/bool.h
+tcpserver.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+tcpserver.o: $(hdrdir)/ruby/backward/2/inttypes.h
+tcpserver.o: $(hdrdir)/ruby/backward/2/limits.h
+tcpserver.o: $(hdrdir)/ruby/backward/2/long_long.h
+tcpserver.o: $(hdrdir)/ruby/backward/2/stdalign.h
+tcpserver.o: $(hdrdir)/ruby/backward/2/stdarg.h
 tcpserver.o: $(hdrdir)/ruby/defines.h
 tcpserver.o: $(hdrdir)/ruby/encoding.h
 tcpserver.o: $(hdrdir)/ruby/intern.h
 tcpserver.o: $(hdrdir)/ruby/io.h
 tcpserver.o: $(hdrdir)/ruby/missing.h
+tcpserver.o: $(hdrdir)/ruby/onigmo.h
 tcpserver.o: $(hdrdir)/ruby/oniguruma.h
 tcpserver.o: $(hdrdir)/ruby/ruby.h
 tcpserver.o: $(hdrdir)/ruby/st.h
 tcpserver.o: $(hdrdir)/ruby/subst.h
 tcpserver.o: $(hdrdir)/ruby/thread.h
 tcpserver.o: $(hdrdir)/ruby/util.h
-tcpserver.o: $(top_srcdir)/include/ruby.h
 tcpserver.o: $(top_srcdir)/internal.h
+tcpserver.o: $(top_srcdir)/internal/array.h
+tcpserver.o: $(top_srcdir)/internal/compilers.h
+tcpserver.o: $(top_srcdir)/internal/error.h
+tcpserver.o: $(top_srcdir)/internal/gc.h
+tcpserver.o: $(top_srcdir)/internal/io.h
+tcpserver.o: $(top_srcdir)/internal/serial.h
+tcpserver.o: $(top_srcdir)/internal/static_assert.h
+tcpserver.o: $(top_srcdir)/internal/string.h
+tcpserver.o: $(top_srcdir)/internal/thread.h
+tcpserver.o: $(top_srcdir)/internal/vm.h
+tcpserver.o: $(top_srcdir)/internal/warnings.h
 tcpserver.o: constdefs.h
 tcpserver.o: rubysocket.h
 tcpserver.o: sockport.h
 tcpserver.o: tcpserver.c
 tcpsocket.o: $(RUBY_EXTCONF_H)
 tcpsocket.o: $(arch_hdrdir)/ruby/config.h
+tcpsocket.o: $(hdrdir)/ruby.h
+tcpsocket.o: $(hdrdir)/ruby/internal/anyargs.h
+tcpsocket.o: $(hdrdir)/ruby/internal/arithmetic.h
+tcpsocket.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+tcpsocket.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+tcpsocket.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+tcpsocket.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+tcpsocket.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+tcpsocket.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+tcpsocket.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+tcpsocket.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+tcpsocket.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+tcpsocket.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+tcpsocket.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+tcpsocket.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+tcpsocket.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+tcpsocket.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+tcpsocket.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+tcpsocket.o: $(hdrdir)/ruby/internal/assume.h
+tcpsocket.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+tcpsocket.o: $(hdrdir)/ruby/internal/attr/artificial.h
+tcpsocket.o: $(hdrdir)/ruby/internal/attr/cold.h
+tcpsocket.o: $(hdrdir)/ruby/internal/attr/const.h
+tcpsocket.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+tcpsocket.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+tcpsocket.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+tcpsocket.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+tcpsocket.o: $(hdrdir)/ruby/internal/attr/error.h
+tcpsocket.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+tcpsocket.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+tcpsocket.o: $(hdrdir)/ruby/internal/attr/format.h
+tcpsocket.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+tcpsocket.o: $(hdrdir)/ruby/internal/attr/noalias.h
+tcpsocket.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+tcpsocket.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+tcpsocket.o: $(hdrdir)/ruby/internal/attr/noinline.h
+tcpsocket.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+tcpsocket.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+tcpsocket.o: $(hdrdir)/ruby/internal/attr/pure.h
+tcpsocket.o: $(hdrdir)/ruby/internal/attr/restrict.h
+tcpsocket.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+tcpsocket.o: $(hdrdir)/ruby/internal/attr/warning.h
+tcpsocket.o: $(hdrdir)/ruby/internal/attr/weakref.h
+tcpsocket.o: $(hdrdir)/ruby/internal/cast.h
+tcpsocket.o: $(hdrdir)/ruby/internal/compiler_is.h
+tcpsocket.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+tcpsocket.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+tcpsocket.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+tcpsocket.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+tcpsocket.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+tcpsocket.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+tcpsocket.o: $(hdrdir)/ruby/internal/compiler_since.h
+tcpsocket.o: $(hdrdir)/ruby/internal/config.h
+tcpsocket.o: $(hdrdir)/ruby/internal/constant_p.h
+tcpsocket.o: $(hdrdir)/ruby/internal/core.h
+tcpsocket.o: $(hdrdir)/ruby/internal/core/rarray.h
+tcpsocket.o: $(hdrdir)/ruby/internal/core/rbasic.h
+tcpsocket.o: $(hdrdir)/ruby/internal/core/rbignum.h
+tcpsocket.o: $(hdrdir)/ruby/internal/core/rclass.h
+tcpsocket.o: $(hdrdir)/ruby/internal/core/rdata.h
+tcpsocket.o: $(hdrdir)/ruby/internal/core/rfile.h
+tcpsocket.o: $(hdrdir)/ruby/internal/core/rhash.h
+tcpsocket.o: $(hdrdir)/ruby/internal/core/robject.h
+tcpsocket.o: $(hdrdir)/ruby/internal/core/rregexp.h
+tcpsocket.o: $(hdrdir)/ruby/internal/core/rstring.h
+tcpsocket.o: $(hdrdir)/ruby/internal/core/rstruct.h
+tcpsocket.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+tcpsocket.o: $(hdrdir)/ruby/internal/ctype.h
+tcpsocket.o: $(hdrdir)/ruby/internal/dllexport.h
+tcpsocket.o: $(hdrdir)/ruby/internal/dosish.h
+tcpsocket.o: $(hdrdir)/ruby/internal/error.h
+tcpsocket.o: $(hdrdir)/ruby/internal/eval.h
+tcpsocket.o: $(hdrdir)/ruby/internal/event.h
+tcpsocket.o: $(hdrdir)/ruby/internal/fl_type.h
+tcpsocket.o: $(hdrdir)/ruby/internal/gc.h
+tcpsocket.o: $(hdrdir)/ruby/internal/glob.h
+tcpsocket.o: $(hdrdir)/ruby/internal/globals.h
+tcpsocket.o: $(hdrdir)/ruby/internal/has/attribute.h
+tcpsocket.o: $(hdrdir)/ruby/internal/has/builtin.h
+tcpsocket.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+tcpsocket.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+tcpsocket.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+tcpsocket.o: $(hdrdir)/ruby/internal/has/extension.h
+tcpsocket.o: $(hdrdir)/ruby/internal/has/feature.h
+tcpsocket.o: $(hdrdir)/ruby/internal/has/warning.h
+tcpsocket.o: $(hdrdir)/ruby/internal/intern/array.h
+tcpsocket.o: $(hdrdir)/ruby/internal/intern/bignum.h
+tcpsocket.o: $(hdrdir)/ruby/internal/intern/class.h
+tcpsocket.o: $(hdrdir)/ruby/internal/intern/compar.h
+tcpsocket.o: $(hdrdir)/ruby/internal/intern/complex.h
+tcpsocket.o: $(hdrdir)/ruby/internal/intern/cont.h
+tcpsocket.o: $(hdrdir)/ruby/internal/intern/dir.h
+tcpsocket.o: $(hdrdir)/ruby/internal/intern/enum.h
+tcpsocket.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+tcpsocket.o: $(hdrdir)/ruby/internal/intern/error.h
+tcpsocket.o: $(hdrdir)/ruby/internal/intern/eval.h
+tcpsocket.o: $(hdrdir)/ruby/internal/intern/file.h
+tcpsocket.o: $(hdrdir)/ruby/internal/intern/gc.h
+tcpsocket.o: $(hdrdir)/ruby/internal/intern/hash.h
+tcpsocket.o: $(hdrdir)/ruby/internal/intern/io.h
+tcpsocket.o: $(hdrdir)/ruby/internal/intern/load.h
+tcpsocket.o: $(hdrdir)/ruby/internal/intern/marshal.h
+tcpsocket.o: $(hdrdir)/ruby/internal/intern/numeric.h
+tcpsocket.o: $(hdrdir)/ruby/internal/intern/object.h
+tcpsocket.o: $(hdrdir)/ruby/internal/intern/parse.h
+tcpsocket.o: $(hdrdir)/ruby/internal/intern/proc.h
+tcpsocket.o: $(hdrdir)/ruby/internal/intern/process.h
+tcpsocket.o: $(hdrdir)/ruby/internal/intern/random.h
+tcpsocket.o: $(hdrdir)/ruby/internal/intern/range.h
+tcpsocket.o: $(hdrdir)/ruby/internal/intern/rational.h
+tcpsocket.o: $(hdrdir)/ruby/internal/intern/re.h
+tcpsocket.o: $(hdrdir)/ruby/internal/intern/ruby.h
+tcpsocket.o: $(hdrdir)/ruby/internal/intern/select.h
+tcpsocket.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+tcpsocket.o: $(hdrdir)/ruby/internal/intern/signal.h
+tcpsocket.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+tcpsocket.o: $(hdrdir)/ruby/internal/intern/string.h
+tcpsocket.o: $(hdrdir)/ruby/internal/intern/struct.h
+tcpsocket.o: $(hdrdir)/ruby/internal/intern/thread.h
+tcpsocket.o: $(hdrdir)/ruby/internal/intern/time.h
+tcpsocket.o: $(hdrdir)/ruby/internal/intern/variable.h
+tcpsocket.o: $(hdrdir)/ruby/internal/intern/vm.h
+tcpsocket.o: $(hdrdir)/ruby/internal/interpreter.h
+tcpsocket.o: $(hdrdir)/ruby/internal/iterator.h
+tcpsocket.o: $(hdrdir)/ruby/internal/memory.h
+tcpsocket.o: $(hdrdir)/ruby/internal/method.h
+tcpsocket.o: $(hdrdir)/ruby/internal/module.h
+tcpsocket.o: $(hdrdir)/ruby/internal/newobj.h
+tcpsocket.o: $(hdrdir)/ruby/internal/rgengc.h
+tcpsocket.o: $(hdrdir)/ruby/internal/scan_args.h
+tcpsocket.o: $(hdrdir)/ruby/internal/special_consts.h
+tcpsocket.o: $(hdrdir)/ruby/internal/static_assert.h
+tcpsocket.o: $(hdrdir)/ruby/internal/stdalign.h
+tcpsocket.o: $(hdrdir)/ruby/internal/stdbool.h
+tcpsocket.o: $(hdrdir)/ruby/internal/symbol.h
+tcpsocket.o: $(hdrdir)/ruby/internal/token_paste.h
+tcpsocket.o: $(hdrdir)/ruby/internal/value.h
+tcpsocket.o: $(hdrdir)/ruby/internal/value_type.h
+tcpsocket.o: $(hdrdir)/ruby/internal/variable.h
+tcpsocket.o: $(hdrdir)/ruby/internal/warning_push.h
+tcpsocket.o: $(hdrdir)/ruby/internal/xmalloc.h
+tcpsocket.o: $(hdrdir)/ruby/assert.h
 tcpsocket.o: $(hdrdir)/ruby/backward.h
+tcpsocket.o: $(hdrdir)/ruby/backward/2/assume.h
+tcpsocket.o: $(hdrdir)/ruby/backward/2/attributes.h
+tcpsocket.o: $(hdrdir)/ruby/backward/2/bool.h
+tcpsocket.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+tcpsocket.o: $(hdrdir)/ruby/backward/2/inttypes.h
+tcpsocket.o: $(hdrdir)/ruby/backward/2/limits.h
+tcpsocket.o: $(hdrdir)/ruby/backward/2/long_long.h
+tcpsocket.o: $(hdrdir)/ruby/backward/2/stdalign.h
+tcpsocket.o: $(hdrdir)/ruby/backward/2/stdarg.h
 tcpsocket.o: $(hdrdir)/ruby/defines.h
 tcpsocket.o: $(hdrdir)/ruby/encoding.h
 tcpsocket.o: $(hdrdir)/ruby/intern.h
 tcpsocket.o: $(hdrdir)/ruby/io.h
 tcpsocket.o: $(hdrdir)/ruby/missing.h
+tcpsocket.o: $(hdrdir)/ruby/onigmo.h
 tcpsocket.o: $(hdrdir)/ruby/oniguruma.h
 tcpsocket.o: $(hdrdir)/ruby/ruby.h
 tcpsocket.o: $(hdrdir)/ruby/st.h
 tcpsocket.o: $(hdrdir)/ruby/subst.h
 tcpsocket.o: $(hdrdir)/ruby/thread.h
 tcpsocket.o: $(hdrdir)/ruby/util.h
-tcpsocket.o: $(top_srcdir)/include/ruby.h
 tcpsocket.o: $(top_srcdir)/internal.h
+tcpsocket.o: $(top_srcdir)/internal/array.h
+tcpsocket.o: $(top_srcdir)/internal/compilers.h
+tcpsocket.o: $(top_srcdir)/internal/error.h
+tcpsocket.o: $(top_srcdir)/internal/gc.h
+tcpsocket.o: $(top_srcdir)/internal/io.h
+tcpsocket.o: $(top_srcdir)/internal/serial.h
+tcpsocket.o: $(top_srcdir)/internal/static_assert.h
+tcpsocket.o: $(top_srcdir)/internal/string.h
+tcpsocket.o: $(top_srcdir)/internal/thread.h
+tcpsocket.o: $(top_srcdir)/internal/vm.h
+tcpsocket.o: $(top_srcdir)/internal/warnings.h
 tcpsocket.o: constdefs.h
 tcpsocket.o: rubysocket.h
 tcpsocket.o: sockport.h
 tcpsocket.o: tcpsocket.c
 udpsocket.o: $(RUBY_EXTCONF_H)
 udpsocket.o: $(arch_hdrdir)/ruby/config.h
+udpsocket.o: $(hdrdir)/ruby.h
+udpsocket.o: $(hdrdir)/ruby/internal/anyargs.h
+udpsocket.o: $(hdrdir)/ruby/internal/arithmetic.h
+udpsocket.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+udpsocket.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+udpsocket.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+udpsocket.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+udpsocket.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+udpsocket.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+udpsocket.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+udpsocket.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+udpsocket.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+udpsocket.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+udpsocket.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+udpsocket.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+udpsocket.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+udpsocket.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+udpsocket.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+udpsocket.o: $(hdrdir)/ruby/internal/assume.h
+udpsocket.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+udpsocket.o: $(hdrdir)/ruby/internal/attr/artificial.h
+udpsocket.o: $(hdrdir)/ruby/internal/attr/cold.h
+udpsocket.o: $(hdrdir)/ruby/internal/attr/const.h
+udpsocket.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+udpsocket.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+udpsocket.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+udpsocket.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+udpsocket.o: $(hdrdir)/ruby/internal/attr/error.h
+udpsocket.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+udpsocket.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+udpsocket.o: $(hdrdir)/ruby/internal/attr/format.h
+udpsocket.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+udpsocket.o: $(hdrdir)/ruby/internal/attr/noalias.h
+udpsocket.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+udpsocket.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+udpsocket.o: $(hdrdir)/ruby/internal/attr/noinline.h
+udpsocket.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+udpsocket.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+udpsocket.o: $(hdrdir)/ruby/internal/attr/pure.h
+udpsocket.o: $(hdrdir)/ruby/internal/attr/restrict.h
+udpsocket.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+udpsocket.o: $(hdrdir)/ruby/internal/attr/warning.h
+udpsocket.o: $(hdrdir)/ruby/internal/attr/weakref.h
+udpsocket.o: $(hdrdir)/ruby/internal/cast.h
+udpsocket.o: $(hdrdir)/ruby/internal/compiler_is.h
+udpsocket.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+udpsocket.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+udpsocket.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+udpsocket.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+udpsocket.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+udpsocket.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+udpsocket.o: $(hdrdir)/ruby/internal/compiler_since.h
+udpsocket.o: $(hdrdir)/ruby/internal/config.h
+udpsocket.o: $(hdrdir)/ruby/internal/constant_p.h
+udpsocket.o: $(hdrdir)/ruby/internal/core.h
+udpsocket.o: $(hdrdir)/ruby/internal/core/rarray.h
+udpsocket.o: $(hdrdir)/ruby/internal/core/rbasic.h
+udpsocket.o: $(hdrdir)/ruby/internal/core/rbignum.h
+udpsocket.o: $(hdrdir)/ruby/internal/core/rclass.h
+udpsocket.o: $(hdrdir)/ruby/internal/core/rdata.h
+udpsocket.o: $(hdrdir)/ruby/internal/core/rfile.h
+udpsocket.o: $(hdrdir)/ruby/internal/core/rhash.h
+udpsocket.o: $(hdrdir)/ruby/internal/core/robject.h
+udpsocket.o: $(hdrdir)/ruby/internal/core/rregexp.h
+udpsocket.o: $(hdrdir)/ruby/internal/core/rstring.h
+udpsocket.o: $(hdrdir)/ruby/internal/core/rstruct.h
+udpsocket.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+udpsocket.o: $(hdrdir)/ruby/internal/ctype.h
+udpsocket.o: $(hdrdir)/ruby/internal/dllexport.h
+udpsocket.o: $(hdrdir)/ruby/internal/dosish.h
+udpsocket.o: $(hdrdir)/ruby/internal/error.h
+udpsocket.o: $(hdrdir)/ruby/internal/eval.h
+udpsocket.o: $(hdrdir)/ruby/internal/event.h
+udpsocket.o: $(hdrdir)/ruby/internal/fl_type.h
+udpsocket.o: $(hdrdir)/ruby/internal/gc.h
+udpsocket.o: $(hdrdir)/ruby/internal/glob.h
+udpsocket.o: $(hdrdir)/ruby/internal/globals.h
+udpsocket.o: $(hdrdir)/ruby/internal/has/attribute.h
+udpsocket.o: $(hdrdir)/ruby/internal/has/builtin.h
+udpsocket.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+udpsocket.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+udpsocket.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+udpsocket.o: $(hdrdir)/ruby/internal/has/extension.h
+udpsocket.o: $(hdrdir)/ruby/internal/has/feature.h
+udpsocket.o: $(hdrdir)/ruby/internal/has/warning.h
+udpsocket.o: $(hdrdir)/ruby/internal/intern/array.h
+udpsocket.o: $(hdrdir)/ruby/internal/intern/bignum.h
+udpsocket.o: $(hdrdir)/ruby/internal/intern/class.h
+udpsocket.o: $(hdrdir)/ruby/internal/intern/compar.h
+udpsocket.o: $(hdrdir)/ruby/internal/intern/complex.h
+udpsocket.o: $(hdrdir)/ruby/internal/intern/cont.h
+udpsocket.o: $(hdrdir)/ruby/internal/intern/dir.h
+udpsocket.o: $(hdrdir)/ruby/internal/intern/enum.h
+udpsocket.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+udpsocket.o: $(hdrdir)/ruby/internal/intern/error.h
+udpsocket.o: $(hdrdir)/ruby/internal/intern/eval.h
+udpsocket.o: $(hdrdir)/ruby/internal/intern/file.h
+udpsocket.o: $(hdrdir)/ruby/internal/intern/gc.h
+udpsocket.o: $(hdrdir)/ruby/internal/intern/hash.h
+udpsocket.o: $(hdrdir)/ruby/internal/intern/io.h
+udpsocket.o: $(hdrdir)/ruby/internal/intern/load.h
+udpsocket.o: $(hdrdir)/ruby/internal/intern/marshal.h
+udpsocket.o: $(hdrdir)/ruby/internal/intern/numeric.h
+udpsocket.o: $(hdrdir)/ruby/internal/intern/object.h
+udpsocket.o: $(hdrdir)/ruby/internal/intern/parse.h
+udpsocket.o: $(hdrdir)/ruby/internal/intern/proc.h
+udpsocket.o: $(hdrdir)/ruby/internal/intern/process.h
+udpsocket.o: $(hdrdir)/ruby/internal/intern/random.h
+udpsocket.o: $(hdrdir)/ruby/internal/intern/range.h
+udpsocket.o: $(hdrdir)/ruby/internal/intern/rational.h
+udpsocket.o: $(hdrdir)/ruby/internal/intern/re.h
+udpsocket.o: $(hdrdir)/ruby/internal/intern/ruby.h
+udpsocket.o: $(hdrdir)/ruby/internal/intern/select.h
+udpsocket.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+udpsocket.o: $(hdrdir)/ruby/internal/intern/signal.h
+udpsocket.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+udpsocket.o: $(hdrdir)/ruby/internal/intern/string.h
+udpsocket.o: $(hdrdir)/ruby/internal/intern/struct.h
+udpsocket.o: $(hdrdir)/ruby/internal/intern/thread.h
+udpsocket.o: $(hdrdir)/ruby/internal/intern/time.h
+udpsocket.o: $(hdrdir)/ruby/internal/intern/variable.h
+udpsocket.o: $(hdrdir)/ruby/internal/intern/vm.h
+udpsocket.o: $(hdrdir)/ruby/internal/interpreter.h
+udpsocket.o: $(hdrdir)/ruby/internal/iterator.h
+udpsocket.o: $(hdrdir)/ruby/internal/memory.h
+udpsocket.o: $(hdrdir)/ruby/internal/method.h
+udpsocket.o: $(hdrdir)/ruby/internal/module.h
+udpsocket.o: $(hdrdir)/ruby/internal/newobj.h
+udpsocket.o: $(hdrdir)/ruby/internal/rgengc.h
+udpsocket.o: $(hdrdir)/ruby/internal/scan_args.h
+udpsocket.o: $(hdrdir)/ruby/internal/special_consts.h
+udpsocket.o: $(hdrdir)/ruby/internal/static_assert.h
+udpsocket.o: $(hdrdir)/ruby/internal/stdalign.h
+udpsocket.o: $(hdrdir)/ruby/internal/stdbool.h
+udpsocket.o: $(hdrdir)/ruby/internal/symbol.h
+udpsocket.o: $(hdrdir)/ruby/internal/token_paste.h
+udpsocket.o: $(hdrdir)/ruby/internal/value.h
+udpsocket.o: $(hdrdir)/ruby/internal/value_type.h
+udpsocket.o: $(hdrdir)/ruby/internal/variable.h
+udpsocket.o: $(hdrdir)/ruby/internal/warning_push.h
+udpsocket.o: $(hdrdir)/ruby/internal/xmalloc.h
+udpsocket.o: $(hdrdir)/ruby/assert.h
 udpsocket.o: $(hdrdir)/ruby/backward.h
+udpsocket.o: $(hdrdir)/ruby/backward/2/assume.h
+udpsocket.o: $(hdrdir)/ruby/backward/2/attributes.h
+udpsocket.o: $(hdrdir)/ruby/backward/2/bool.h
+udpsocket.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+udpsocket.o: $(hdrdir)/ruby/backward/2/inttypes.h
+udpsocket.o: $(hdrdir)/ruby/backward/2/limits.h
+udpsocket.o: $(hdrdir)/ruby/backward/2/long_long.h
+udpsocket.o: $(hdrdir)/ruby/backward/2/stdalign.h
+udpsocket.o: $(hdrdir)/ruby/backward/2/stdarg.h
 udpsocket.o: $(hdrdir)/ruby/defines.h
 udpsocket.o: $(hdrdir)/ruby/encoding.h
 udpsocket.o: $(hdrdir)/ruby/intern.h
 udpsocket.o: $(hdrdir)/ruby/io.h
 udpsocket.o: $(hdrdir)/ruby/missing.h
+udpsocket.o: $(hdrdir)/ruby/onigmo.h
 udpsocket.o: $(hdrdir)/ruby/oniguruma.h
 udpsocket.o: $(hdrdir)/ruby/ruby.h
 udpsocket.o: $(hdrdir)/ruby/st.h
 udpsocket.o: $(hdrdir)/ruby/subst.h
 udpsocket.o: $(hdrdir)/ruby/thread.h
 udpsocket.o: $(hdrdir)/ruby/util.h
-udpsocket.o: $(top_srcdir)/include/ruby.h
 udpsocket.o: $(top_srcdir)/internal.h
+udpsocket.o: $(top_srcdir)/internal/array.h
+udpsocket.o: $(top_srcdir)/internal/compilers.h
+udpsocket.o: $(top_srcdir)/internal/error.h
+udpsocket.o: $(top_srcdir)/internal/gc.h
+udpsocket.o: $(top_srcdir)/internal/io.h
+udpsocket.o: $(top_srcdir)/internal/serial.h
+udpsocket.o: $(top_srcdir)/internal/static_assert.h
+udpsocket.o: $(top_srcdir)/internal/string.h
+udpsocket.o: $(top_srcdir)/internal/thread.h
+udpsocket.o: $(top_srcdir)/internal/vm.h
+udpsocket.o: $(top_srcdir)/internal/warnings.h
 udpsocket.o: constdefs.h
 udpsocket.o: rubysocket.h
 udpsocket.o: sockport.h
 udpsocket.o: udpsocket.c
 unixserver.o: $(RUBY_EXTCONF_H)
 unixserver.o: $(arch_hdrdir)/ruby/config.h
+unixserver.o: $(hdrdir)/ruby.h
+unixserver.o: $(hdrdir)/ruby/internal/anyargs.h
+unixserver.o: $(hdrdir)/ruby/internal/arithmetic.h
+unixserver.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+unixserver.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+unixserver.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+unixserver.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+unixserver.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+unixserver.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+unixserver.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+unixserver.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+unixserver.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+unixserver.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+unixserver.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+unixserver.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+unixserver.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+unixserver.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+unixserver.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+unixserver.o: $(hdrdir)/ruby/internal/assume.h
+unixserver.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+unixserver.o: $(hdrdir)/ruby/internal/attr/artificial.h
+unixserver.o: $(hdrdir)/ruby/internal/attr/cold.h
+unixserver.o: $(hdrdir)/ruby/internal/attr/const.h
+unixserver.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+unixserver.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+unixserver.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+unixserver.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+unixserver.o: $(hdrdir)/ruby/internal/attr/error.h
+unixserver.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+unixserver.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+unixserver.o: $(hdrdir)/ruby/internal/attr/format.h
+unixserver.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+unixserver.o: $(hdrdir)/ruby/internal/attr/noalias.h
+unixserver.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+unixserver.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+unixserver.o: $(hdrdir)/ruby/internal/attr/noinline.h
+unixserver.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+unixserver.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+unixserver.o: $(hdrdir)/ruby/internal/attr/pure.h
+unixserver.o: $(hdrdir)/ruby/internal/attr/restrict.h
+unixserver.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+unixserver.o: $(hdrdir)/ruby/internal/attr/warning.h
+unixserver.o: $(hdrdir)/ruby/internal/attr/weakref.h
+unixserver.o: $(hdrdir)/ruby/internal/cast.h
+unixserver.o: $(hdrdir)/ruby/internal/compiler_is.h
+unixserver.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+unixserver.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+unixserver.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+unixserver.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+unixserver.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+unixserver.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+unixserver.o: $(hdrdir)/ruby/internal/compiler_since.h
+unixserver.o: $(hdrdir)/ruby/internal/config.h
+unixserver.o: $(hdrdir)/ruby/internal/constant_p.h
+unixserver.o: $(hdrdir)/ruby/internal/core.h
+unixserver.o: $(hdrdir)/ruby/internal/core/rarray.h
+unixserver.o: $(hdrdir)/ruby/internal/core/rbasic.h
+unixserver.o: $(hdrdir)/ruby/internal/core/rbignum.h
+unixserver.o: $(hdrdir)/ruby/internal/core/rclass.h
+unixserver.o: $(hdrdir)/ruby/internal/core/rdata.h
+unixserver.o: $(hdrdir)/ruby/internal/core/rfile.h
+unixserver.o: $(hdrdir)/ruby/internal/core/rhash.h
+unixserver.o: $(hdrdir)/ruby/internal/core/robject.h
+unixserver.o: $(hdrdir)/ruby/internal/core/rregexp.h
+unixserver.o: $(hdrdir)/ruby/internal/core/rstring.h
+unixserver.o: $(hdrdir)/ruby/internal/core/rstruct.h
+unixserver.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+unixserver.o: $(hdrdir)/ruby/internal/ctype.h
+unixserver.o: $(hdrdir)/ruby/internal/dllexport.h
+unixserver.o: $(hdrdir)/ruby/internal/dosish.h
+unixserver.o: $(hdrdir)/ruby/internal/error.h
+unixserver.o: $(hdrdir)/ruby/internal/eval.h
+unixserver.o: $(hdrdir)/ruby/internal/event.h
+unixserver.o: $(hdrdir)/ruby/internal/fl_type.h
+unixserver.o: $(hdrdir)/ruby/internal/gc.h
+unixserver.o: $(hdrdir)/ruby/internal/glob.h
+unixserver.o: $(hdrdir)/ruby/internal/globals.h
+unixserver.o: $(hdrdir)/ruby/internal/has/attribute.h
+unixserver.o: $(hdrdir)/ruby/internal/has/builtin.h
+unixserver.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+unixserver.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+unixserver.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+unixserver.o: $(hdrdir)/ruby/internal/has/extension.h
+unixserver.o: $(hdrdir)/ruby/internal/has/feature.h
+unixserver.o: $(hdrdir)/ruby/internal/has/warning.h
+unixserver.o: $(hdrdir)/ruby/internal/intern/array.h
+unixserver.o: $(hdrdir)/ruby/internal/intern/bignum.h
+unixserver.o: $(hdrdir)/ruby/internal/intern/class.h
+unixserver.o: $(hdrdir)/ruby/internal/intern/compar.h
+unixserver.o: $(hdrdir)/ruby/internal/intern/complex.h
+unixserver.o: $(hdrdir)/ruby/internal/intern/cont.h
+unixserver.o: $(hdrdir)/ruby/internal/intern/dir.h
+unixserver.o: $(hdrdir)/ruby/internal/intern/enum.h
+unixserver.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+unixserver.o: $(hdrdir)/ruby/internal/intern/error.h
+unixserver.o: $(hdrdir)/ruby/internal/intern/eval.h
+unixserver.o: $(hdrdir)/ruby/internal/intern/file.h
+unixserver.o: $(hdrdir)/ruby/internal/intern/gc.h
+unixserver.o: $(hdrdir)/ruby/internal/intern/hash.h
+unixserver.o: $(hdrdir)/ruby/internal/intern/io.h
+unixserver.o: $(hdrdir)/ruby/internal/intern/load.h
+unixserver.o: $(hdrdir)/ruby/internal/intern/marshal.h
+unixserver.o: $(hdrdir)/ruby/internal/intern/numeric.h
+unixserver.o: $(hdrdir)/ruby/internal/intern/object.h
+unixserver.o: $(hdrdir)/ruby/internal/intern/parse.h
+unixserver.o: $(hdrdir)/ruby/internal/intern/proc.h
+unixserver.o: $(hdrdir)/ruby/internal/intern/process.h
+unixserver.o: $(hdrdir)/ruby/internal/intern/random.h
+unixserver.o: $(hdrdir)/ruby/internal/intern/range.h
+unixserver.o: $(hdrdir)/ruby/internal/intern/rational.h
+unixserver.o: $(hdrdir)/ruby/internal/intern/re.h
+unixserver.o: $(hdrdir)/ruby/internal/intern/ruby.h
+unixserver.o: $(hdrdir)/ruby/internal/intern/select.h
+unixserver.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+unixserver.o: $(hdrdir)/ruby/internal/intern/signal.h
+unixserver.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+unixserver.o: $(hdrdir)/ruby/internal/intern/string.h
+unixserver.o: $(hdrdir)/ruby/internal/intern/struct.h
+unixserver.o: $(hdrdir)/ruby/internal/intern/thread.h
+unixserver.o: $(hdrdir)/ruby/internal/intern/time.h
+unixserver.o: $(hdrdir)/ruby/internal/intern/variable.h
+unixserver.o: $(hdrdir)/ruby/internal/intern/vm.h
+unixserver.o: $(hdrdir)/ruby/internal/interpreter.h
+unixserver.o: $(hdrdir)/ruby/internal/iterator.h
+unixserver.o: $(hdrdir)/ruby/internal/memory.h
+unixserver.o: $(hdrdir)/ruby/internal/method.h
+unixserver.o: $(hdrdir)/ruby/internal/module.h
+unixserver.o: $(hdrdir)/ruby/internal/newobj.h
+unixserver.o: $(hdrdir)/ruby/internal/rgengc.h
+unixserver.o: $(hdrdir)/ruby/internal/scan_args.h
+unixserver.o: $(hdrdir)/ruby/internal/special_consts.h
+unixserver.o: $(hdrdir)/ruby/internal/static_assert.h
+unixserver.o: $(hdrdir)/ruby/internal/stdalign.h
+unixserver.o: $(hdrdir)/ruby/internal/stdbool.h
+unixserver.o: $(hdrdir)/ruby/internal/symbol.h
+unixserver.o: $(hdrdir)/ruby/internal/token_paste.h
+unixserver.o: $(hdrdir)/ruby/internal/value.h
+unixserver.o: $(hdrdir)/ruby/internal/value_type.h
+unixserver.o: $(hdrdir)/ruby/internal/variable.h
+unixserver.o: $(hdrdir)/ruby/internal/warning_push.h
+unixserver.o: $(hdrdir)/ruby/internal/xmalloc.h
+unixserver.o: $(hdrdir)/ruby/assert.h
 unixserver.o: $(hdrdir)/ruby/backward.h
+unixserver.o: $(hdrdir)/ruby/backward/2/assume.h
+unixserver.o: $(hdrdir)/ruby/backward/2/attributes.h
+unixserver.o: $(hdrdir)/ruby/backward/2/bool.h
+unixserver.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+unixserver.o: $(hdrdir)/ruby/backward/2/inttypes.h
+unixserver.o: $(hdrdir)/ruby/backward/2/limits.h
+unixserver.o: $(hdrdir)/ruby/backward/2/long_long.h
+unixserver.o: $(hdrdir)/ruby/backward/2/stdalign.h
+unixserver.o: $(hdrdir)/ruby/backward/2/stdarg.h
 unixserver.o: $(hdrdir)/ruby/defines.h
 unixserver.o: $(hdrdir)/ruby/encoding.h
 unixserver.o: $(hdrdir)/ruby/intern.h
 unixserver.o: $(hdrdir)/ruby/io.h
 unixserver.o: $(hdrdir)/ruby/missing.h
+unixserver.o: $(hdrdir)/ruby/onigmo.h
 unixserver.o: $(hdrdir)/ruby/oniguruma.h
 unixserver.o: $(hdrdir)/ruby/ruby.h
 unixserver.o: $(hdrdir)/ruby/st.h
 unixserver.o: $(hdrdir)/ruby/subst.h
 unixserver.o: $(hdrdir)/ruby/thread.h
 unixserver.o: $(hdrdir)/ruby/util.h
-unixserver.o: $(top_srcdir)/include/ruby.h
 unixserver.o: $(top_srcdir)/internal.h
+unixserver.o: $(top_srcdir)/internal/array.h
+unixserver.o: $(top_srcdir)/internal/compilers.h
+unixserver.o: $(top_srcdir)/internal/error.h
+unixserver.o: $(top_srcdir)/internal/gc.h
+unixserver.o: $(top_srcdir)/internal/io.h
+unixserver.o: $(top_srcdir)/internal/serial.h
+unixserver.o: $(top_srcdir)/internal/static_assert.h
+unixserver.o: $(top_srcdir)/internal/string.h
+unixserver.o: $(top_srcdir)/internal/thread.h
+unixserver.o: $(top_srcdir)/internal/vm.h
+unixserver.o: $(top_srcdir)/internal/warnings.h
 unixserver.o: constdefs.h
 unixserver.o: rubysocket.h
 unixserver.o: sockport.h
 unixserver.o: unixserver.c
 unixsocket.o: $(RUBY_EXTCONF_H)
 unixsocket.o: $(arch_hdrdir)/ruby/config.h
+unixsocket.o: $(hdrdir)/ruby.h
+unixsocket.o: $(hdrdir)/ruby/internal/anyargs.h
+unixsocket.o: $(hdrdir)/ruby/internal/arithmetic.h
+unixsocket.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+unixsocket.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+unixsocket.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+unixsocket.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+unixsocket.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+unixsocket.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+unixsocket.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+unixsocket.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+unixsocket.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+unixsocket.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+unixsocket.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+unixsocket.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+unixsocket.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+unixsocket.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+unixsocket.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+unixsocket.o: $(hdrdir)/ruby/internal/assume.h
+unixsocket.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+unixsocket.o: $(hdrdir)/ruby/internal/attr/artificial.h
+unixsocket.o: $(hdrdir)/ruby/internal/attr/cold.h
+unixsocket.o: $(hdrdir)/ruby/internal/attr/const.h
+unixsocket.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+unixsocket.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+unixsocket.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+unixsocket.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+unixsocket.o: $(hdrdir)/ruby/internal/attr/error.h
+unixsocket.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+unixsocket.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+unixsocket.o: $(hdrdir)/ruby/internal/attr/format.h
+unixsocket.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+unixsocket.o: $(hdrdir)/ruby/internal/attr/noalias.h
+unixsocket.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+unixsocket.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+unixsocket.o: $(hdrdir)/ruby/internal/attr/noinline.h
+unixsocket.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+unixsocket.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+unixsocket.o: $(hdrdir)/ruby/internal/attr/pure.h
+unixsocket.o: $(hdrdir)/ruby/internal/attr/restrict.h
+unixsocket.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+unixsocket.o: $(hdrdir)/ruby/internal/attr/warning.h
+unixsocket.o: $(hdrdir)/ruby/internal/attr/weakref.h
+unixsocket.o: $(hdrdir)/ruby/internal/cast.h
+unixsocket.o: $(hdrdir)/ruby/internal/compiler_is.h
+unixsocket.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+unixsocket.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+unixsocket.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+unixsocket.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+unixsocket.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+unixsocket.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+unixsocket.o: $(hdrdir)/ruby/internal/compiler_since.h
+unixsocket.o: $(hdrdir)/ruby/internal/config.h
+unixsocket.o: $(hdrdir)/ruby/internal/constant_p.h
+unixsocket.o: $(hdrdir)/ruby/internal/core.h
+unixsocket.o: $(hdrdir)/ruby/internal/core/rarray.h
+unixsocket.o: $(hdrdir)/ruby/internal/core/rbasic.h
+unixsocket.o: $(hdrdir)/ruby/internal/core/rbignum.h
+unixsocket.o: $(hdrdir)/ruby/internal/core/rclass.h
+unixsocket.o: $(hdrdir)/ruby/internal/core/rdata.h
+unixsocket.o: $(hdrdir)/ruby/internal/core/rfile.h
+unixsocket.o: $(hdrdir)/ruby/internal/core/rhash.h
+unixsocket.o: $(hdrdir)/ruby/internal/core/robject.h
+unixsocket.o: $(hdrdir)/ruby/internal/core/rregexp.h
+unixsocket.o: $(hdrdir)/ruby/internal/core/rstring.h
+unixsocket.o: $(hdrdir)/ruby/internal/core/rstruct.h
+unixsocket.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+unixsocket.o: $(hdrdir)/ruby/internal/ctype.h
+unixsocket.o: $(hdrdir)/ruby/internal/dllexport.h
+unixsocket.o: $(hdrdir)/ruby/internal/dosish.h
+unixsocket.o: $(hdrdir)/ruby/internal/error.h
+unixsocket.o: $(hdrdir)/ruby/internal/eval.h
+unixsocket.o: $(hdrdir)/ruby/internal/event.h
+unixsocket.o: $(hdrdir)/ruby/internal/fl_type.h
+unixsocket.o: $(hdrdir)/ruby/internal/gc.h
+unixsocket.o: $(hdrdir)/ruby/internal/glob.h
+unixsocket.o: $(hdrdir)/ruby/internal/globals.h
+unixsocket.o: $(hdrdir)/ruby/internal/has/attribute.h
+unixsocket.o: $(hdrdir)/ruby/internal/has/builtin.h
+unixsocket.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+unixsocket.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+unixsocket.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+unixsocket.o: $(hdrdir)/ruby/internal/has/extension.h
+unixsocket.o: $(hdrdir)/ruby/internal/has/feature.h
+unixsocket.o: $(hdrdir)/ruby/internal/has/warning.h
+unixsocket.o: $(hdrdir)/ruby/internal/intern/array.h
+unixsocket.o: $(hdrdir)/ruby/internal/intern/bignum.h
+unixsocket.o: $(hdrdir)/ruby/internal/intern/class.h
+unixsocket.o: $(hdrdir)/ruby/internal/intern/compar.h
+unixsocket.o: $(hdrdir)/ruby/internal/intern/complex.h
+unixsocket.o: $(hdrdir)/ruby/internal/intern/cont.h
+unixsocket.o: $(hdrdir)/ruby/internal/intern/dir.h
+unixsocket.o: $(hdrdir)/ruby/internal/intern/enum.h
+unixsocket.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+unixsocket.o: $(hdrdir)/ruby/internal/intern/error.h
+unixsocket.o: $(hdrdir)/ruby/internal/intern/eval.h
+unixsocket.o: $(hdrdir)/ruby/internal/intern/file.h
+unixsocket.o: $(hdrdir)/ruby/internal/intern/gc.h
+unixsocket.o: $(hdrdir)/ruby/internal/intern/hash.h
+unixsocket.o: $(hdrdir)/ruby/internal/intern/io.h
+unixsocket.o: $(hdrdir)/ruby/internal/intern/load.h
+unixsocket.o: $(hdrdir)/ruby/internal/intern/marshal.h
+unixsocket.o: $(hdrdir)/ruby/internal/intern/numeric.h
+unixsocket.o: $(hdrdir)/ruby/internal/intern/object.h
+unixsocket.o: $(hdrdir)/ruby/internal/intern/parse.h
+unixsocket.o: $(hdrdir)/ruby/internal/intern/proc.h
+unixsocket.o: $(hdrdir)/ruby/internal/intern/process.h
+unixsocket.o: $(hdrdir)/ruby/internal/intern/random.h
+unixsocket.o: $(hdrdir)/ruby/internal/intern/range.h
+unixsocket.o: $(hdrdir)/ruby/internal/intern/rational.h
+unixsocket.o: $(hdrdir)/ruby/internal/intern/re.h
+unixsocket.o: $(hdrdir)/ruby/internal/intern/ruby.h
+unixsocket.o: $(hdrdir)/ruby/internal/intern/select.h
+unixsocket.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+unixsocket.o: $(hdrdir)/ruby/internal/intern/signal.h
+unixsocket.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+unixsocket.o: $(hdrdir)/ruby/internal/intern/string.h
+unixsocket.o: $(hdrdir)/ruby/internal/intern/struct.h
+unixsocket.o: $(hdrdir)/ruby/internal/intern/thread.h
+unixsocket.o: $(hdrdir)/ruby/internal/intern/time.h
+unixsocket.o: $(hdrdir)/ruby/internal/intern/variable.h
+unixsocket.o: $(hdrdir)/ruby/internal/intern/vm.h
+unixsocket.o: $(hdrdir)/ruby/internal/interpreter.h
+unixsocket.o: $(hdrdir)/ruby/internal/iterator.h
+unixsocket.o: $(hdrdir)/ruby/internal/memory.h
+unixsocket.o: $(hdrdir)/ruby/internal/method.h
+unixsocket.o: $(hdrdir)/ruby/internal/module.h
+unixsocket.o: $(hdrdir)/ruby/internal/newobj.h
+unixsocket.o: $(hdrdir)/ruby/internal/rgengc.h
+unixsocket.o: $(hdrdir)/ruby/internal/scan_args.h
+unixsocket.o: $(hdrdir)/ruby/internal/special_consts.h
+unixsocket.o: $(hdrdir)/ruby/internal/static_assert.h
+unixsocket.o: $(hdrdir)/ruby/internal/stdalign.h
+unixsocket.o: $(hdrdir)/ruby/internal/stdbool.h
+unixsocket.o: $(hdrdir)/ruby/internal/symbol.h
+unixsocket.o: $(hdrdir)/ruby/internal/token_paste.h
+unixsocket.o: $(hdrdir)/ruby/internal/value.h
+unixsocket.o: $(hdrdir)/ruby/internal/value_type.h
+unixsocket.o: $(hdrdir)/ruby/internal/variable.h
+unixsocket.o: $(hdrdir)/ruby/internal/warning_push.h
+unixsocket.o: $(hdrdir)/ruby/internal/xmalloc.h
+unixsocket.o: $(hdrdir)/ruby/assert.h
 unixsocket.o: $(hdrdir)/ruby/backward.h
+unixsocket.o: $(hdrdir)/ruby/backward/2/assume.h
+unixsocket.o: $(hdrdir)/ruby/backward/2/attributes.h
+unixsocket.o: $(hdrdir)/ruby/backward/2/bool.h
+unixsocket.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+unixsocket.o: $(hdrdir)/ruby/backward/2/inttypes.h
+unixsocket.o: $(hdrdir)/ruby/backward/2/limits.h
+unixsocket.o: $(hdrdir)/ruby/backward/2/long_long.h
+unixsocket.o: $(hdrdir)/ruby/backward/2/stdalign.h
+unixsocket.o: $(hdrdir)/ruby/backward/2/stdarg.h
 unixsocket.o: $(hdrdir)/ruby/defines.h
 unixsocket.o: $(hdrdir)/ruby/encoding.h
 unixsocket.o: $(hdrdir)/ruby/intern.h
 unixsocket.o: $(hdrdir)/ruby/io.h
 unixsocket.o: $(hdrdir)/ruby/missing.h
+unixsocket.o: $(hdrdir)/ruby/onigmo.h
 unixsocket.o: $(hdrdir)/ruby/oniguruma.h
 unixsocket.o: $(hdrdir)/ruby/ruby.h
 unixsocket.o: $(hdrdir)/ruby/st.h
 unixsocket.o: $(hdrdir)/ruby/subst.h
 unixsocket.o: $(hdrdir)/ruby/thread.h
 unixsocket.o: $(hdrdir)/ruby/util.h
-unixsocket.o: $(top_srcdir)/include/ruby.h
 unixsocket.o: $(top_srcdir)/internal.h
+unixsocket.o: $(top_srcdir)/internal/array.h
+unixsocket.o: $(top_srcdir)/internal/compilers.h
+unixsocket.o: $(top_srcdir)/internal/error.h
+unixsocket.o: $(top_srcdir)/internal/gc.h
+unixsocket.o: $(top_srcdir)/internal/io.h
+unixsocket.o: $(top_srcdir)/internal/serial.h
+unixsocket.o: $(top_srcdir)/internal/static_assert.h
+unixsocket.o: $(top_srcdir)/internal/string.h
+unixsocket.o: $(top_srcdir)/internal/thread.h
+unixsocket.o: $(top_srcdir)/internal/vm.h
+unixsocket.o: $(top_srcdir)/internal/warnings.h
 unixsocket.o: constdefs.h
 unixsocket.o: rubysocket.h
 unixsocket.o: sockport.h
diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb
index fd70be45da..c86cc8f8c0 100644
--- a/ext/socket/extconf.rb
+++ b/ext/socket/extconf.rb
@@ -433,6 +433,7 @@ end
 case RUBY_PLATFORM
 when /mswin(32|64)|mingw/
   test_func = "WSACleanup"
+  have_library("iphlpapi")
   have_library("ws2_32", "WSACleanup", headers)
 when /cygwin/
   test_func = "socket(0,0,0)"
@@ -476,6 +477,7 @@ EOF
     have_func('inet_aton("", (struct in_addr *)0)', headers)
   have_func('getservbyport(0, "")', headers)
   have_func("getifaddrs((struct ifaddrs **)NULL)", headers)
+  have_struct_member("struct if_data", "ifi_vhid", headers) # FreeBSD
 
   have_func("getpeereid", headers)
 
@@ -566,6 +568,7 @@ EOS
     getaddr_info_ok = (:wide if getaddr_info_ok.nil?)
     if have_func("getnameinfo", headers) and have_func("getaddrinfo", headers)
       if CROSS_COMPILING ||
+         $mingw || $mswin ||
          checking_for("system getaddrinfo working") {
            try_run(cpp_include(headers) + GETADDRINFO_GETNAMEINFO_TEST)
          }
@@ -643,7 +646,7 @@ EOS
   if enable_config("socks", ENV["SOCKS_SERVER"])
     if have_library("socks5", "SOCKSinit")
       $defs << "-DSOCKS5" << "-DSOCKS"
-    elsif have_library("socks", "Rconnect")
+    elsif have_library("socksd", "Rconnect") || have_library("socks", "Rconnect")
       $defs << "-DSOCKS"
     end
   end
@@ -653,7 +656,7 @@ EOS
 #include <netinet/in.h>
 int t(struct in6_addr *addr) {return IN6_IS_ADDR_UNSPECIFIED(addr);}
 SRC
-    print "fixing apple's netinet6/in6.rb ..."; $stdout.flush
+    print "fixing apple's netinet6/in6.h ..."; $stdout.flush
     in6 = File.read("/usr/include/#{hdr}")
     if in6.gsub!(/\*\(const\s+__uint32_t\s+\*\)\(const\s+void\s+\*\)\(&(\(\w+\))->s6_addr\[(\d+)\]\)/) do
         i, r = $2.to_i.divmod(4)
diff --git a/ext/socket/getaddrinfo.c b/ext/socket/getaddrinfo.c
index b01f1cb82e..ce6dc40478 100644
--- a/ext/socket/getaddrinfo.c
+++ b/ext/socket/getaddrinfo.c
@@ -149,6 +149,7 @@ static int get_addr __P((const char *, int, struct addrinfo **,
 			struct addrinfo *, int));
 static int str_isnumber __P((const char *));
 
+#ifndef HAVE_GAI_STRERROR
 static const char *const ai_errlist[] = {
 	"success.",
 	"address family for hostname not supported.",	/* EAI_ADDRFAMILY */
@@ -166,6 +167,7 @@ static const char *const ai_errlist[] = {
 	"resolved protocol is unknown.",		/* EAI_PROTOCOL   */
 	"unknown error.", 				/* EAI_MAX        */
 };
+#endif
 
 #define GET_CANONNAME(ai, str) \
 if (pai->ai_flags & AI_CANONNAME) {\
diff --git a/ext/socket/getnameinfo.c b/ext/socket/getnameinfo.c
index bca97acc1f..94a5eb9439 100644
--- a/ext/socket/getnameinfo.c
+++ b/ext/socket/getnameinfo.c
@@ -76,6 +76,7 @@ typedef int socklen_t;
 
 #include "addrinfo.h"
 #include "sockport.h"
+#include "rubysocket.h"
 
 #define SUCCESS 0
 #define ANY 0
@@ -117,24 +118,6 @@ static struct afd {
 #define ENI_FAMILY	5
 #define ENI_SALEN	6
 
-#ifndef HAVE_INET_NTOP
-static const char *
-inet_ntop(int af, const void *addr, char *numaddr, size_t numaddr_len)
-{
-#ifdef HAVE_INET_NTOA
-	struct in_addr in;
-	memcpy(&in.s_addr, addr, sizeof(in.s_addr));
-	snprintf(numaddr, numaddr_len, "%s", inet_ntoa(in));
-#else
-	unsigned long x = ntohl(*(unsigned long*)addr);
-	snprintf(numaddr, numaddr_len, "%d.%d.%d.%d",
-		 (int) (x>>24) & 0xff, (int) (x>>16) & 0xff,
-		 (int) (x>> 8) & 0xff, (int) (x>> 0) & 0xff);
-#endif
-	return numaddr;
-}
-#endif
-
 int
 getnameinfo(const struct sockaddr *sa, socklen_t salen, char *host, socklen_t hostlen, char *serv, socklen_t servlen, int flags)
 {
diff --git a/ext/socket/ifaddr.c b/ext/socket/ifaddr.c
index a954163369..1da259bd6f 100644
--- a/ext/socket/ifaddr.c
+++ b/ext/socket/ifaddr.c
@@ -24,7 +24,6 @@ typedef struct rb_ifaddr_root_tag rb_ifaddr_root_t;
 struct rb_ifaddr_tag {
     int ord;
     struct ifaddrs *ifaddr;
-    rb_ifaddr_root_t *root;
 };
 
 struct rb_ifaddr_root_tag {
@@ -55,11 +54,12 @@ ifaddr_free(void *ptr)
 static size_t
 ifaddr_memsize(const void *ptr)
 {
+    size_t size = offsetof(rb_ifaddr_root_t, ary);
     const rb_ifaddr_t *ifaddr;
-    const rb_ifaddr_root_t *root;
     ifaddr = ptr;
-    root = get_root(ifaddr);
-    return sizeof(rb_ifaddr_root_t) + (root->numifaddrs - 1) * sizeof(rb_ifaddr_t);
+    if (ifaddr->ord == 0) size = sizeof(rb_ifaddr_root_t);
+    size += sizeof(struct ifaddrs);
+    return size;
 }
 
 static const rb_data_type_t ifaddr_type = {
@@ -84,6 +84,12 @@ get_ifaddr(VALUE self)
     return rifaddr;
 }
 
+static struct ifaddrs *
+get_ifaddrs(VALUE self)
+{
+    return get_ifaddr(self)->ifaddr;
+}
+
 static VALUE
 rsock_getifaddrs(void)
 {
@@ -106,7 +112,7 @@ rsock_getifaddrs(void)
         numifaddrs++;
 
     addr = TypedData_Wrap_Struct(rb_cSockIfaddr, &ifaddr_type, 0);
-    root = xmalloc(sizeof(rb_ifaddr_root_t) + (numifaddrs-1) * sizeof(rb_ifaddr_t));
+    root = xmalloc(offsetof(rb_ifaddr_root_t, ary) + numifaddrs * sizeof(rb_ifaddr_t));
     root->refcount = 0;
     root->numifaddrs = numifaddrs;
 
@@ -114,7 +120,6 @@ rsock_getifaddrs(void)
     for (i = 0; i < numifaddrs; i++) {
         root->ary[i].ord = i;
         root->ary[i].ifaddr = ifa;
-        root->ary[i].root = root;
         ifa = ifa->ifa_next;
     }
     RTYPEDDATA_DATA(addr) = &root->ary[0];
@@ -141,8 +146,7 @@ rsock_getifaddrs(void)
 static VALUE
 ifaddr_name(VALUE self)
 {
-    rb_ifaddr_t *rifaddr = get_ifaddr(self);
-    struct ifaddrs *ifa = rifaddr->ifaddr;
+    struct ifaddrs *ifa = get_ifaddrs(self);
     return rb_str_new_cstr(ifa->ifa_name);
 }
 
@@ -157,8 +161,7 @@ ifaddr_name(VALUE self)
 static VALUE
 ifaddr_ifindex(VALUE self)
 {
-    rb_ifaddr_t *rifaddr = get_ifaddr(self);
-    struct ifaddrs *ifa = rifaddr->ifaddr;
+    struct ifaddrs *ifa = get_ifaddrs(self);
     unsigned int ifindex = if_nametoindex(ifa->ifa_name);
     if (ifindex == 0) {
         rb_raise(rb_eArgError, "invalid interface name: %s", ifa->ifa_name);
@@ -179,8 +182,7 @@ ifaddr_ifindex(VALUE self)
 static VALUE
 ifaddr_flags(VALUE self)
 {
-    rb_ifaddr_t *rifaddr = get_ifaddr(self);
-    struct ifaddrs *ifa = rifaddr->ifaddr;
+    struct ifaddrs *ifa = get_ifaddrs(self);
     return IFAFLAGS2NUM(ifa->ifa_flags);
 }
 
@@ -195,8 +197,7 @@ ifaddr_flags(VALUE self)
 static VALUE
 ifaddr_addr(VALUE self)
 {
-    rb_ifaddr_t *rifaddr = get_ifaddr(self);
-    struct ifaddrs *ifa = rifaddr->ifaddr;
+    struct ifaddrs *ifa = get_ifaddrs(self);
     if (ifa->ifa_addr)
         return rsock_sockaddr_obj(ifa->ifa_addr, rsock_sockaddr_len(ifa->ifa_addr));
     return Qnil;
@@ -213,8 +214,7 @@ ifaddr_addr(VALUE self)
 static VALUE
 ifaddr_netmask(VALUE self)
 {
-    rb_ifaddr_t *rifaddr = get_ifaddr(self);
-    struct ifaddrs *ifa = rifaddr->ifaddr;
+    struct ifaddrs *ifa = get_ifaddrs(self);
     if (ifa->ifa_netmask)
         return rsock_sockaddr_obj(ifa->ifa_netmask, rsock_sockaddr_len(ifa->ifa_netmask));
     return Qnil;
@@ -231,8 +231,7 @@ ifaddr_netmask(VALUE self)
 static VALUE
 ifaddr_broadaddr(VALUE self)
 {
-    rb_ifaddr_t *rifaddr = get_ifaddr(self);
-    struct ifaddrs *ifa = rifaddr->ifaddr;
+    struct ifaddrs *ifa = get_ifaddrs(self);
     if ((ifa->ifa_flags & IFF_BROADCAST) && ifa->ifa_broadaddr)
         return rsock_sockaddr_obj(ifa->ifa_broadaddr, rsock_sockaddr_len(ifa->ifa_broadaddr));
     return Qnil;
@@ -249,13 +248,32 @@ ifaddr_broadaddr(VALUE self)
 static VALUE
 ifaddr_dstaddr(VALUE self)
 {
-    rb_ifaddr_t *rifaddr = get_ifaddr(self);
-    struct ifaddrs *ifa = rifaddr->ifaddr;
+    struct ifaddrs *ifa = get_ifaddrs(self);
     if ((ifa->ifa_flags & IFF_POINTOPOINT) && ifa->ifa_dstaddr)
         return rsock_sockaddr_obj(ifa->ifa_dstaddr, rsock_sockaddr_len(ifa->ifa_dstaddr));
     return Qnil;
 }
 
+#ifdef HAVE_STRUCT_IF_DATA_IFI_VHID
+/*
+ * call-seq:
+ *   ifaddr.vhid => Integer
+ *
+ * Returns the vhid address of _ifaddr_.
+ * nil is returned if there is no vhid.
+ */
+
+static VALUE
+ifaddr_vhid(VALUE self)
+{
+    struct ifaddrs *ifa = get_ifaddrs(self);
+    if (ifa->ifa_data)
+        return (INT2FIX(((struct if_data*)ifa->ifa_data)->ifi_vhid));
+    else
+        return Qnil;
+}
+#endif
+
 static void
 ifaddr_inspect_flags(ifa_flags_t flags, VALUE result)
 {
@@ -338,12 +356,9 @@ ifaddr_inspect_flags(ifa_flags_t flags, VALUE result)
 static VALUE
 ifaddr_inspect(VALUE self)
 {
-    rb_ifaddr_t *rifaddr = get_ifaddr(self);
-    struct ifaddrs *ifa;
+    struct ifaddrs *ifa = get_ifaddrs(self);
     VALUE result;
 
-    ifa = rifaddr->ifaddr;
-
     result = rb_str_new_cstr("#<");
 
     rb_str_append(result, rb_class_name(CLASS_OF(self)));
@@ -444,7 +459,8 @@ rsock_init_sockifaddr(void)
      *
      * Socket::Ifaddr represents a result of getifaddrs() function.
      */
-    rb_cSockIfaddr = rb_define_class_under(rb_cSocket, "Ifaddr", rb_cData);
+    rb_cSockIfaddr = rb_define_class_under(rb_cSocket, "Ifaddr", rb_cObject);
+    rb_undef_alloc_func(rb_cSockIfaddr);
     rb_define_method(rb_cSockIfaddr, "inspect", ifaddr_inspect, 0);
     rb_define_method(rb_cSockIfaddr, "name", ifaddr_name, 0);
     rb_define_method(rb_cSockIfaddr, "ifindex", ifaddr_ifindex, 0);
@@ -453,6 +469,9 @@ rsock_init_sockifaddr(void)
     rb_define_method(rb_cSockIfaddr, "netmask", ifaddr_netmask, 0);
     rb_define_method(rb_cSockIfaddr, "broadaddr", ifaddr_broadaddr, 0);
     rb_define_method(rb_cSockIfaddr, "dstaddr", ifaddr_dstaddr, 0);
+#ifdef HAVE_STRUCT_IF_DATA_IFI_VHID
+    rb_define_method(rb_cSockIfaddr, "vhid", ifaddr_vhid, 0);
+#endif
 #endif
 
     rb_define_singleton_method(rb_cSocket, "getifaddrs", socket_s_getifaddrs, 0);
diff --git a/ext/socket/init.c b/ext/socket/init.c
index 1ecd4fe352..af46b8edaa 100644
--- a/ext/socket/init.c
+++ b/ext/socket/init.c
@@ -10,6 +10,10 @@
 
 #include "rubysocket.h"
 
+#ifdef _WIN32
+VALUE rb_w32_conv_from_wchar(const WCHAR *wstr, rb_encoding *enc);
+#endif
+
 VALUE rb_cBasicSocket;
 VALUE rb_cIPSocket;
 VALUE rb_cTCPSocket;
@@ -39,7 +43,15 @@ rsock_raise_socket_error(const char *reason, int error)
     if (error == EAI_SYSTEM && (e = errno) != 0)
 	rb_syserr_fail(e, reason);
 #endif
+#ifdef _WIN32
+    rb_encoding *enc = rb_default_internal_encoding();
+    VALUE msg = rb_sprintf("%s: ", reason);
+    if (!enc) enc = rb_default_internal_encoding();
+    rb_str_concat(msg, rb_w32_conv_from_wchar(gai_strerrorW(error), enc));
+    rb_exc_raise(rb_exc_new_str(rb_eSocket, msg));
+#else
     rb_raise(rb_eSocket, "%s: %s", reason, gai_strerror(error));
+#endif
 }
 
 #ifdef _WIN32
@@ -56,6 +68,12 @@ is_socket(int fd)
 }
 #endif
 
+#if defined __APPLE__
+# define do_write_retry(code) do {ret = code;} while (ret == -1 && errno == EPROTOTYPE)
+#else
+# define do_write_retry(code) ret = code
+#endif
+
 VALUE
 rsock_init_sock(VALUE sock, int fd)
 {
@@ -83,8 +101,10 @@ rsock_sendto_blocking(void *data)
 {
     struct rsock_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);
+    ssize_t ret;
+    do_write_retry(sendto(arg->fd, RSTRING_PTR(mesg), RSTRING_LEN(mesg),
+			  arg->flags, arg->to, arg->tolen));
+    return (VALUE)ret;
 }
 
 VALUE
@@ -92,13 +112,16 @@ rsock_send_blocking(void *data)
 {
     struct rsock_send_arg *arg = data;
     VALUE mesg = arg->mesg;
-    return (VALUE)send(arg->fd, RSTRING_PTR(mesg), RSTRING_LEN(mesg),
-                       arg->flags);
+    ssize_t ret;
+    do_write_retry(send(arg->fd, RSTRING_PTR(mesg), RSTRING_LEN(mesg),
+			arg->flags));
+    return (VALUE)ret;
 }
 
 struct recvfrom_arg {
     int fd, flags;
     VALUE str;
+    size_t length;
     socklen_t alen;
     union_sockaddr buf;
 };
@@ -109,10 +132,11 @@ recvfrom_blocking(void *data)
     struct recvfrom_arg *arg = data;
     socklen_t len0 = arg->alen;
     ssize_t ret;
-    ret = recvfrom(arg->fd, RSTRING_PTR(arg->str), RSTRING_LEN(arg->str),
+    ret = recvfrom(arg->fd, RSTRING_PTR(arg->str), arg->length,
                    arg->flags, &arg->buf.addr, &arg->alen);
     if (ret != -1 && len0 < arg->alen)
         arg->alen = len0;
+
     return (VALUE)ret;
 }
 
@@ -121,7 +145,7 @@ rsock_strbuf(VALUE str, long buflen)
 {
     long len;
 
-    if (NIL_P(str)) return rb_tainted_str_new(0, buflen);
+    if (NIL_P(str)) return rb_str_new(0, buflen);
 
     StringValue(str);
     len = RSTRING_LEN(str);
@@ -130,7 +154,6 @@ rsock_strbuf(VALUE str, long buflen)
     } else {
 	rb_str_modify_expand(str, buflen - len);
     }
-    rb_str_set_len(str, buflen);
     return str;
 }
 
@@ -166,6 +189,7 @@ rsock_s_recvfrom(VALUE sock, int argc, VALUE *argv, enum sock_recv_type from)
     arg.fd = fptr->fd;
     arg.alen = (socklen_t)sizeof(arg.buf);
     arg.str = str;
+    arg.length = buflen;
 
     while (rb_io_check_closed(fptr),
 	   rsock_maybe_wait_fd(arg.fd),
@@ -176,10 +200,8 @@ rsock_s_recvfrom(VALUE sock, int argc, VALUE *argv, enum sock_recv_type from)
         }
     }
 
-    if (slen != RSTRING_LEN(str)) {
-	rb_str_set_len(str, slen);
-    }
-    rb_obj_taint(str);
+    /* Resize the string to the amount of data received */
+    rb_str_set_len(str, slen);
     switch (from) {
       case RECV_RECV:
 	return str;
@@ -260,7 +282,6 @@ rsock_s_recvfrom_nonblock(VALUE sock, VALUE len, VALUE flg, VALUE str,
     if (slen != RSTRING_LEN(str)) {
 	rb_str_set_len(str, slen);
     }
-    rb_obj_taint(str);
     switch (from) {
       case RECV_RECV:
         return str;
@@ -280,78 +301,137 @@ rsock_s_recvfrom_nonblock(VALUE sock, VALUE len, VALUE flg, VALUE str,
     return rb_assoc_new(str, addr);
 }
 
-/* returns true if SOCK_CLOEXEC is supported */
-int rsock_detect_cloexec(int fd)
+#if MSG_DONTWAIT_RELIABLE
+static VALUE sym_wait_writable;
+
+/* copied from io.c :< */
+static long
+read_buffered_data(char *ptr, long len, rb_io_t *fptr)
 {
-#ifdef SOCK_CLOEXEC
-    int flags = fcntl(fd, F_GETFD);
+    int n = fptr->rbuf.len;
+
+    if (n <= 0) return 0;
+    if (n > len) n = (int)len;
+    MEMMOVE(ptr, fptr->rbuf.ptr+fptr->rbuf.off, char, n);
+    fptr->rbuf.off += n;
+    fptr->rbuf.len -= n;
+    return n;
+}
+
+/* :nodoc: */
+VALUE
+rsock_read_nonblock(VALUE sock, VALUE length, VALUE buf, VALUE ex)
+{
+    rb_io_t *fptr;
+    long n;
+    long len = NUM2LONG(length);
+    VALUE str = rsock_strbuf(buf, len);
+    char *ptr;
 
-    if (flags == -1)
-	rb_bug("rsock_detect_cloexec: fcntl(%d, F_GETFD) failed: %s", fd, strerror(errno));
+    GetOpenFile(sock, fptr);
 
-    if (flags & FD_CLOEXEC)
-	return 1;
-#endif
-    return 0;
+    if (len == 0) {
+	rb_str_set_len(str, 0);
+	return str;
+    }
+
+    ptr = RSTRING_PTR(str);
+    n = read_buffered_data(ptr, len, fptr);
+    if (n <= 0) {
+	n = (long)recv(fptr->fd, ptr, len, MSG_DONTWAIT);
+	if (n < 0) {
+	    int e = errno;
+	    if ((e == EWOULDBLOCK || e == EAGAIN)) {
+		if (ex == Qfalse) return sym_wait_readable;
+		rb_readwrite_syserr_fail(RB_IO_WAIT_READABLE,
+					 e, "read would block");
+	    }
+	    rb_syserr_fail_path(e, fptr->pathv);
+	}
+    }
+    if (n != RSTRING_LEN(str)) {
+	rb_str_modify(str);
+	rb_str_set_len(str, n);
+    }
+    if (n == 0) {
+	if (ex == Qfalse) return Qnil;
+	rb_eof_error();
+    }
+
+    return str;
 }
 
-#ifdef SOCK_CLOEXEC
-static int
-rsock_socket0(int domain, int type, int proto)
+/* :nodoc: */
+VALUE
+rsock_write_nonblock(VALUE sock, VALUE str, VALUE ex)
 {
-    int ret;
-    static int cloexec_state = -1; /* <0: unknown, 0: ignored, >0: working */
-
-    if (cloexec_state > 0) { /* common path, if SOCK_CLOEXEC is defined */
-        ret = socket(domain, type|SOCK_CLOEXEC, proto);
-        if (ret >= 0) {
-            if (ret <= 2)
-                goto fix_cloexec;
-            goto update_max_fd;
-        }
-    }
-    else if (cloexec_state < 0) { /* usually runs once only for detection */
-        ret = socket(domain, type|SOCK_CLOEXEC, proto);
-        if (ret >= 0) {
-            cloexec_state = rsock_detect_cloexec(ret);
-            if (cloexec_state == 0 || ret <= 2)
-                goto fix_cloexec;
-            goto update_max_fd;
-        }
-        else if (ret == -1 && errno == EINVAL) {
-            /* SOCK_CLOEXEC is available since Linux 2.6.27.  Linux 2.6.18 fails with EINVAL */
-            ret = socket(domain, type, proto);
-            if (ret != -1) {
-                cloexec_state = 0;
-                /* fall through to fix_cloexec */
-            }
-        }
+    rb_io_t *fptr;
+    long n;
+
+    if (!RB_TYPE_P(str, T_STRING))
+	str = rb_obj_as_string(str);
+
+    sock = rb_io_get_write_io(sock);
+    GetOpenFile(sock, fptr);
+    rb_io_check_writable(fptr);
+
+    /*
+     * As with IO#write_nonblock, we may block if somebody is relying on
+     * buffered I/O; but nobody actually hits this because pipes and sockets
+     * are not userspace-buffered in Ruby by default.
+     */
+    if (fptr->wbuf.len > 0) {
+	rb_io_flush(sock);
     }
-    else { /* cloexec_state == 0 */
-        ret = socket(domain, type, proto);
+
+#ifdef __APPLE__
+  again:
+#endif
+    n = (long)send(fptr->fd, RSTRING_PTR(str), RSTRING_LEN(str), MSG_DONTWAIT);
+    if (n < 0) {
+	int e = errno;
+
+#ifdef __APPLE__
+	if (e == EPROTOTYPE) {
+	    goto again;
+	}
+#endif
+	if (e == EWOULDBLOCK || e == EAGAIN) {
+	    if (ex == Qfalse) return sym_wait_writable;
+	    rb_readwrite_syserr_fail(RB_IO_WAIT_WRITABLE, e,
+				    "write would block");
+	}
+	rb_syserr_fail_path(e, fptr->pathv);
     }
-    if (ret == -1)
-        return -1;
-fix_cloexec:
-    rb_maygvl_fd_fix_cloexec(ret);
-update_max_fd:
-    rb_update_max_fd(ret);
 
-    return ret;
+    return LONG2FIX(n);
 }
-#else /* !SOCK_CLOEXEC */
+#endif /* MSG_DONTWAIT_RELIABLE */
+
 static int
 rsock_socket0(int domain, int type, int proto)
 {
-    int ret = socket(domain, type, proto);
+#ifdef SOCK_CLOEXEC
+    type |= SOCK_CLOEXEC;
+#endif
+
+#ifdef SOCK_NONBLOCK
+    type |= SOCK_NONBLOCK;
+#endif
 
-    if (ret == -1)
+    int result = socket(domain, type, proto);
+
+    if (result == -1)
         return -1;
-    rb_fd_fix_cloexec(ret);
 
-    return ret;
+    rb_fd_fix_cloexec(result);
+
+#ifndef SOCK_NONBLOCK
+    rsock_make_fd_nonblock(result);
+#endif
+
+    return result;
 }
-#endif /* !SOCK_CLOEXEC */
 
 int
 rsock_socket(int domain, int type, int proto)
@@ -371,16 +451,35 @@ rsock_socket(int domain, int type, int proto)
 
 /* emulate blocking connect behavior on EINTR or non-blocking socket */
 static int
-wait_connectable(int fd)
+wait_connectable(int fd, struct timeval *timeout)
 {
     int sockerr, revents;
     socklen_t sockerrlen;
 
-    /* only to clear pending error */
     sockerrlen = (socklen_t)sizeof(sockerr);
     if (getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&sockerr, &sockerrlen) < 0)
         return -1;
 
+    /* necessary for non-blocking sockets (at least ECONNREFUSED) */
+    switch (sockerr) {
+      case 0:
+        break;
+#ifdef EALREADY
+      case EALREADY:
+#endif
+#ifdef EISCONN
+      case EISCONN:
+#endif
+#ifdef ECONNREFUSED
+      case ECONNREFUSED:
+#endif
+#ifdef EHOSTUNREACH
+      case EHOSTUNREACH:
+#endif
+        errno = sockerr;
+        return -1;
+    }
+
     /*
      * Stevens book says, successful finish turn on RB_WAITFD_OUT and
      * failure finish turn on both RB_WAITFD_IN and RB_WAITFD_OUT.
@@ -389,7 +488,7 @@ wait_connectable(int fd)
      *
      * Note: rb_wait_for_single_fd already retries on EINTR/ERESTART
      */
-    revents = rb_wait_for_single_fd(fd, RB_WAITFD_IN|RB_WAITFD_OUT, NULL);
+    revents = rb_wait_for_single_fd(fd, RB_WAITFD_IN|RB_WAITFD_OUT, timeout);
 
     if (revents < 0)
         return -1;
@@ -404,6 +503,12 @@ wait_connectable(int fd)
        * be defensive in case some platforms set SO_ERROR on the original,
        * interrupted connect()
        */
+
+	/* when the connection timed out, no errno is set and revents is 0. */
+	if (timeout && revents == 0) {
+	    errno = ETIMEDOUT;
+	    return -1;
+	}
       case EINTR:
 #ifdef ERESTART
       case ERESTART:
@@ -451,7 +556,7 @@ socks_connect_blocking(void *data)
 #endif
 
 int
-rsock_connect(int fd, const struct sockaddr *sockaddr, int len, int socks)
+rsock_connect(int fd, const struct sockaddr *sockaddr, int len, int socks, struct timeval *timeout)
 {
     int status;
     rb_blocking_function_t *func = connect_blocking;
@@ -475,15 +580,19 @@ rsock_connect(int fd, const struct sockaddr *sockaddr, int len, int socks)
 #ifdef EINPROGRESS
           case EINPROGRESS:
 #endif
-            return wait_connectable(fd);
+            return wait_connectable(fd, timeout);
         }
     }
     return status;
 }
 
-static void
-make_fd_nonblock(int fd)
+void
+rsock_make_fd_nonblock(int fd)
 {
+#ifdef _WIN32
+    return;
+#endif
+
     int flags;
 #ifdef F_GETFL
     flags = fcntl(fd, F_GETFL);
@@ -500,53 +609,34 @@ make_fd_nonblock(int fd)
 }
 
 static int
-cloexec_accept(int socket, struct sockaddr *address, socklen_t *address_len,
-	       int nonblock)
+cloexec_accept(int socket, struct sockaddr *address, socklen_t *address_len)
 {
-    int ret;
     socklen_t len0 = 0;
-#ifdef HAVE_ACCEPT4
-    static int try_accept4 = 1;
-#endif
     if (address_len) len0 = *address_len;
+
 #ifdef HAVE_ACCEPT4
-    if (try_accept4) {
-        int flags = 0;
-#ifdef SOCK_CLOEXEC
-        flags |= SOCK_CLOEXEC;
-#endif
+    int flags = SOCK_CLOEXEC;
+
 #ifdef SOCK_NONBLOCK
-        if (nonblock) {
-            flags |= SOCK_NONBLOCK;
-        }
+    flags |= SOCK_NONBLOCK;
 #endif
-        ret = accept4(socket, address, address_len, flags);
-        /* accept4 is available since Linux 2.6.28, glibc 2.10. */
-        if (ret != -1) {
-            if (ret <= 2)
-                rb_maygvl_fd_fix_cloexec(ret);
+
+    int result = accept4(socket, address, address_len, flags);
+    if (result == -1) return -1;
+
 #ifndef SOCK_NONBLOCK
-            if (nonblock) {
-                make_fd_nonblock(ret);
-            }
+    rsock_make_fd_nonblock(result);
 #endif
-            if (address_len && len0 < *address_len) *address_len = len0;
-            return ret;
-        }
-        if (errno != ENOSYS) {
-            return -1;
-        }
-        try_accept4 = 0;
-    }
+#else
+    int result = accept(socket, address, address_len);
+    if (result == -1) return -1;
+
+    rb_maygvl_fd_fix_cloexec(result);
+    rsock_make_fd_nonblock(result);
 #endif
-    ret = accept(socket, address, address_len);
-    if (ret == -1) return -1;
+
     if (address_len && len0 < *address_len) *address_len = len0;
-    rb_maygvl_fd_fix_cloexec(ret);
-    if (nonblock) {
-        make_fd_nonblock(ret);
-    }
-    return ret;
+    return result;
 }
 
 VALUE
@@ -556,7 +646,7 @@ rsock_s_accept_nonblock(VALUE klass, VALUE ex, rb_io_t *fptr,
     int fd2;
 
     rb_io_set_nonblock(fptr);
-    fd2 = cloexec_accept(fptr->fd, (struct sockaddr*)sockaddr, len, 1);
+    fd2 = cloexec_accept(fptr->fd, (struct sockaddr*)sockaddr, len);
     if (fd2 < 0) {
 	int e = errno;
 	switch (e) {
@@ -588,7 +678,7 @@ static VALUE
 accept_blocking(void *data)
 {
     struct accept_arg *arg = data;
-    return (VALUE)cloexec_accept(arg->fd, arg->sockaddr, arg->len, 0);
+    return (VALUE)cloexec_accept(arg->fd, arg->sockaddr, arg->len);
 }
 
 VALUE
@@ -680,4 +770,8 @@ rsock_init_socket_init(void)
 
 #undef rb_intern
     sym_wait_readable = ID2SYM(rb_intern("wait_readable"));
+
+#if MSG_DONTWAIT_RELIABLE
+    sym_wait_writable = ID2SYM(rb_intern("wait_writable"));
+#endif
 }
diff --git a/ext/socket/ipsocket.c b/ext/socket/ipsocket.c
index 9981fd43ad..72fea789a5 100644
--- a/ext/socket/ipsocket.c
+++ b/ext/socket/ipsocket.c
@@ -19,11 +19,14 @@ struct inetsock_arg
     } remote, local;
     int type;
     int fd;
+    VALUE resolv_timeout;
+    VALUE connect_timeout;
 };
 
 static VALUE
-inetsock_cleanup(struct inetsock_arg *arg)
+inetsock_cleanup(VALUE v)
 {
+    struct inetsock_arg *arg = (void *)v;
     if (arg->remote.res) {
 	rb_freeaddrinfo(arg->remote.res);
 	arg->remote.res = 0;
@@ -39,18 +42,29 @@ inetsock_cleanup(struct inetsock_arg *arg)
 }
 
 static VALUE
-init_inetsock_internal(struct inetsock_arg *arg)
+init_inetsock_internal(VALUE v)
 {
+    struct inetsock_arg *arg = (void *)v;
     int error = 0;
     int type = arg->type;
     struct addrinfo *res, *lres;
     int fd, status = 0, local = 0;
     int family = AF_UNSPEC;
     const char *syscall = 0;
+    VALUE connect_timeout = arg->connect_timeout;
+    struct timeval tv_storage;
+    struct timeval *tv = NULL;
+
+    if (!NIL_P(connect_timeout)) {
+        tv_storage = rb_time_interval(connect_timeout);
+        tv = &tv_storage;
+    }
 
     arg->remote.res = rsock_addrinfo(arg->remote.host, arg->remote.serv,
 				     family, SOCK_STREAM,
 				     (type == INET_SERVER) ? AI_PASSIVE : 0);
+
+
     /*
      * Maybe also accept a local address
      */
@@ -99,6 +113,11 @@ init_inetsock_internal(struct inetsock_arg *arg)
 	}
 	else {
 	    if (lres) {
+#if !defined(_WIN32) && !defined(__CYGWIN__)
+                status = 1;
+                setsockopt(fd, SOL_SOCKET, SO_REUSEADDR,
+                           (char*)&status, (socklen_t)sizeof(status));
+#endif
 		status = bind(fd, lres->ai_addr, lres->ai_addrlen);
 		local = status;
 		syscall = "bind(2)";
@@ -106,7 +125,7 @@ init_inetsock_internal(struct inetsock_arg *arg)
 
 	    if (status >= 0) {
 		status = rsock_connect(fd, res->ai_addr, res->ai_addrlen,
-				       (type == INET_SOCKS));
+				       (type == INET_SOCKS), tv);
 		syscall = "connect(2)";
 	    }
 	}
@@ -150,7 +169,8 @@ init_inetsock_internal(struct inetsock_arg *arg)
 
 VALUE
 rsock_init_inetsock(VALUE sock, VALUE remote_host, VALUE remote_serv,
-	            VALUE local_host, VALUE local_serv, int type)
+	            VALUE local_host, VALUE local_serv, int type,
+		    VALUE resolv_timeout, VALUE connect_timeout)
 {
     struct inetsock_arg arg;
     arg.sock = sock;
@@ -162,6 +182,8 @@ rsock_init_inetsock(VALUE sock, VALUE remote_host, VALUE remote_serv,
     arg.local.res = 0;
     arg.type = type;
     arg.fd = -1;
+    arg.resolv_timeout = resolv_timeout;
+    arg.connect_timeout = connect_timeout;
     return rb_ensure(init_inetsock_internal, (VALUE)&arg,
 		     inetsock_cleanup, (VALUE)&arg);
 }
@@ -191,6 +213,43 @@ rsock_revlookup_flag(VALUE revlookup, int *norevlookup)
 
 /*
  * call-seq:
+ *   ipsocket.inspect   -> string
+ *
+ * Return a string describing this IPSocket object.
+ */
+static VALUE
+ip_inspect(VALUE sock)
+{
+    VALUE str = rb_call_super(0, 0);
+    rb_io_t *fptr = RFILE(sock)->fptr;
+    union_sockaddr addr;
+    socklen_t len = (socklen_t)sizeof addr;
+    ID id;
+    if (fptr && fptr->fd >= 0 &&
+	getsockname(fptr->fd, &addr.addr, &len) >= 0 &&
+	(id = rsock_intern_family(addr.addr.sa_family)) != 0) {
+	VALUE family = rb_id2str(id);
+	char hbuf[1024], pbuf[1024];
+	long slen = RSTRING_LEN(str);
+	const char last = (slen > 1 && RSTRING_PTR(str)[slen - 1] == '>') ?
+	    (--slen, '>') : 0;
+	str = rb_str_subseq(str, 0, slen);
+	rb_str_cat_cstr(str, ", ");
+	rb_str_append(str, family);
+	if (!rb_getnameinfo(&addr.addr, len, hbuf, sizeof(hbuf),
+			    pbuf, sizeof(pbuf), NI_NUMERICHOST | NI_NUMERICSERV)) {
+	    rb_str_cat_cstr(str, ", ");
+	    rb_str_cat_cstr(str, hbuf);
+	    rb_str_cat_cstr(str, ", ");
+	    rb_str_cat_cstr(str, pbuf);
+	}
+	if (last) rb_str_cat(str, &last, 1);
+    }
+    return str;
+}
+
+/*
+ * call-seq:
  *   ipsocket.addr([reverse_lookup]) => [address_family, port, hostname, numeric_address]
  *
  * Returns the local address as an array which contains
@@ -303,6 +362,8 @@ ip_recvfrom(int argc, VALUE *argv, VALUE sock)
  *
  * Lookups the IP address of _host_.
  *
+ *   require 'socket'
+ *
  *   IPSocket.getaddress("localhost")     #=> "127.0.0.1"
  *   IPSocket.getaddress("ip6-localhost") #=> "::1"
  *
@@ -330,6 +391,7 @@ rsock_init_ipsocket(void)
      * IPSocket is the super class of TCPSocket and UDPSocket.
      */
     rb_cIPSocket = rb_define_class("IPSocket", rb_cBasicSocket);
+    rb_define_method(rb_cIPSocket, "inspect", ip_inspect, 0);
     rb_define_method(rb_cIPSocket, "addr", ip_addr, -1);
     rb_define_method(rb_cIPSocket, "peeraddr", ip_peeraddr, -1);
     rb_define_method(rb_cIPSocket, "recvfrom", ip_recvfrom, -1);
diff --git a/ext/socket/lib/socket.rb b/ext/socket/lib/socket.rb
index 5c3ed400f4..d756a32a5a 100644
--- a/ext/socket/lib/socket.rb
+++ b/ext/socket/lib/socket.rb
@@ -71,13 +71,13 @@ class Addrinfo
       begin
         yield sock
       ensure
-        sock.close if !sock.closed?
+        sock.close
       end
     else
       sock
     end
   end
-  private :connect_internal
+  protected :connect_internal
 
   # :call-seq:
   #   addrinfo.connect_from([local_addr_args], [opts]) {|socket| ... }
@@ -110,10 +110,8 @@ class Addrinfo
   #     puts s.read
   #   }
   #
-  def connect_from(*args, &block)
-    opts = Hash === args.last ? args.pop : {}
-    local_addr_args = args
-    connect_internal(family_addrinfo(*local_addr_args), opts[:timeout], &block)
+  def connect_from(*args, timeout: nil, &block)
+    connect_internal(family_addrinfo(*args), timeout, &block)
   end
 
   # :call-seq:
@@ -135,8 +133,8 @@ class Addrinfo
   #     puts s.read
   #   }
   #
-  def connect(opts={}, &block)
-    connect_internal(nil, opts[:timeout], &block)
+  def connect(timeout: nil, &block)
+    connect_internal(nil, timeout, &block)
   end
 
   # :call-seq:
@@ -158,11 +156,9 @@ class Addrinfo
   #     puts s.read
   #   }
   #
-  def connect_to(*args, &block)
-    opts = Hash === args.last ? args.pop : {}
-    remote_addr_args = args
-    remote_addrinfo = family_addrinfo(*remote_addr_args)
-    remote_addrinfo.send(:connect_internal, self, opts[:timeout], &block)
+  def connect_to(*args, timeout: nil, &block)
+    remote_addrinfo = family_addrinfo(*args)
+    remote_addrinfo.connect_internal(self, timeout, &block)
   end
 
   # creates a socket bound to self.
@@ -189,7 +185,7 @@ class Addrinfo
       begin
         yield sock
       ensure
-        sock.close if !sock.closed?
+        sock.close
       end
     else
       sock
@@ -212,7 +208,7 @@ class Addrinfo
       begin
         yield sock
       ensure
-        sock.close if !sock.closed?
+        sock.close
       end
     else
       sock
@@ -227,8 +223,8 @@ class Addrinfo
   #   #   #<Addrinfo: [::1]:80 TCP (:80)>
   #   #   #<Addrinfo: [::1]:80 UDP (:80)>
   #
-  def self.foreach(nodename, service, family=nil, socktype=nil, protocol=nil, flags=nil, &block)
-    Addrinfo.getaddrinfo(nodename, service, family, socktype, protocol, flags).each(&block)
+  def self.foreach(nodename, service, family=nil, socktype=nil, protocol=nil, flags=nil, timeout: nil, &block)
+    Addrinfo.getaddrinfo(nodename, service, family, socktype, protocol, flags, timeout: timeout).each(&block)
   end
 end
 
@@ -317,9 +313,9 @@ class BasicSocket < IO
   # but the non-blocking flag is set before the system call
   # and it doesn't retry the system call.
   #
-  # By specifying `exception: false`, the _opts_ hash allows you to indicate
+  # By specifying a keyword argument _exception_ to +false+, you can indicate
   # that sendmsg_nonblock should not raise an IO::WaitWritable exception, but
-  # return the symbol :wait_writable instead.
+  # return the symbol +:wait_writable+ instead.
   def sendmsg_nonblock(mesg, flags = 0, dest_sockaddr = nil, *controls,
                        exception: true)
     __sendmsg_nonblock(mesg, flags, dest_sockaddr, controls, exception)
@@ -340,6 +336,7 @@ class BasicSocket < IO
   # === Parameters
   # * +maxlen+ - the number of bytes to receive from the socket
   # * +flags+ - zero or more of the +MSG_+ options
+  # * +buf+ - destination String buffer
   # * +options+ - keyword hash, supporting `exception: false`
   #
   # === Example
@@ -365,9 +362,9 @@ class BasicSocket < IO
   # it is extended by IO::WaitReadable.
   # So IO::WaitReadable can be used to rescue the exceptions for retrying recv_nonblock.
   #
-  # By specifying `exception: false`, the options hash allows you to indicate
-  # that recv_nonblock should not raise an IO::WaitWritable exception, but
-  # return the symbol :wait_writable instead.
+  # By specifying a keyword argument _exception_ to +false+, you can indicate
+  # that recv_nonblock should not raise an IO::WaitReadable exception, but
+  # return the symbol +:wait_readable+ instead.
   #
   # === See
   # * Socket#recvfrom
@@ -439,13 +436,26 @@ class BasicSocket < IO
   # but non-blocking flag is set before the system call
   # and it doesn't retry the system call.
   #
-  # By specifying `exception: false`, the _opts_ hash allows you to indicate
-  # that recvmsg_nonblock should not raise an IO::WaitWritable exception, but
-  # return the symbol :wait_writable instead.
+  # By specifying a keyword argument _exception_ to +false+, you can indicate
+  # that recvmsg_nonblock should not raise an IO::WaitReadable exception, but
+  # return the symbol +:wait_readable+ instead.
   def recvmsg_nonblock(dlen = nil, flags = 0, clen = nil,
                        scm_rights: false, exception: true)
     __recvmsg_nonblock(dlen, flags, clen, scm_rights, exception)
   end
+
+  # Linux-specific optimizations to avoid fcntl for IO#read_nonblock
+  # and IO#write_nonblock using MSG_DONTWAIT
+  # Do other platforms support MSG_DONTWAIT reliably?
+  if RUBY_PLATFORM =~ /linux/ && Socket.const_defined?(:MSG_DONTWAIT)
+    def read_nonblock(len, str = nil, exception: true) # :nodoc:
+      __read_nonblock(len, str, exception)
+    end
+
+    def write_nonblock(buf, exception: true) # :nodoc:
+      __write_nonblock(buf, exception)
+    end
+  end
 end
 
 class Socket < BasicSocket
@@ -516,9 +526,9 @@ class Socket < BasicSocket
   # So IO::WaitReadable can be used to rescue the exceptions for retrying
   # recvfrom_nonblock.
   #
-  # By specifying `exception: false`, the options hash allows you to indicate
-  # that accept_nonblock should not raise an IO::WaitReadable exception, but
-  # return the symbol :wait_readable instead.
+  # By specifying a keyword argument _exception_ to +false+, you can indicate
+  # that recvfrom_nonblock should not raise an IO::WaitReadable exception, but
+  # return the symbol +:wait_readable+ instead.
   #
   # === See
   # * Socket#recvfrom
@@ -573,9 +583,9 @@ class Socket < BasicSocket
   # it is extended by IO::WaitReadable.
   # So IO::WaitReadable can be used to rescue the exceptions for retrying accept_nonblock.
   #
-  # By specifying `exception: false`, the options hash allows you to indicate
+  # By specifying a keyword argument _exception_ to +false+, you can indicate
   # that accept_nonblock should not raise an IO::WaitReadable exception, but
-  # return the symbol :wait_readable instead.
+  # return the symbol +:wait_readable+ instead.
   #
   # === See
   # * Socket#accept
@@ -596,6 +606,7 @@ class Socket < BasicSocket
   # _opts_ may have following options:
   #
   # [:connect_timeout] specify the timeout in seconds.
+  # [:resolv_timeout] specify the name resolution timeout in seconds.
   #
   # If a block is given, the block is called with the socket.
   # The value of the block is returned.
@@ -609,31 +620,26 @@ class Socket < BasicSocket
   #     puts sock.read
   #   }
   #
-  def self.tcp(host, port, *rest) # :yield: socket
-    opts = Hash === rest.last ? rest.pop : {}
-    raise ArgumentError, "wrong number of arguments (#{rest.length} for 2)" if 2 < rest.length
-    local_host, local_port = rest
+  def self.tcp(host, port, local_host = nil, local_port = nil, connect_timeout: nil, resolv_timeout: nil) # :yield: socket
     last_error = nil
     ret = nil
 
-    connect_timeout = opts[:connect_timeout]
-
     local_addr_list = nil
     if local_host != nil || local_port != nil
       local_addr_list = Addrinfo.getaddrinfo(local_host, local_port, nil, :STREAM, nil)
     end
 
-    Addrinfo.foreach(host, port, nil, :STREAM) {|ai|
+    Addrinfo.foreach(host, port, nil, :STREAM, timeout: resolv_timeout) {|ai|
       if local_addr_list
         local_addr = local_addr_list.find {|local_ai| local_ai.afamily == ai.afamily }
-        next if !local_addr
+        next unless local_addr
       else
         local_addr = nil
       end
       begin
         sock = local_addr ?
-          ai.connect_from(local_addr, :timeout => connect_timeout) :
-          ai.connect(:timeout => connect_timeout)
+          ai.connect_from(local_addr, timeout: connect_timeout) :
+          ai.connect(timeout: connect_timeout)
       rescue SystemCallError
         last_error = $!
         next
@@ -641,7 +647,7 @@ class Socket < BasicSocket
       ret = sock
       break
     }
-    if !ret
+    unless ret
       if last_error
         raise last_error
       else
@@ -652,7 +658,7 @@ class Socket < BasicSocket
       begin
         yield ret
       ensure
-        ret.close if !ret.closed?
+        ret.close
       end
     else
       ret
@@ -676,7 +682,7 @@ class Socket < BasicSocket
         if reuseaddr
           s.setsockopt(:SOCKET, :REUSEADDR, 1)
         end
-        if !port
+        unless port
           s.bind(ai)
           port = s.local_address.ip_port
         else
@@ -684,10 +690,10 @@ class Socket < BasicSocket
         end
       }
     rescue Errno::EADDRINUSE
-      sockets.each {|s| s.close }
+      sockets.each(&:close)
       retry
     rescue Exception
-      sockets.each {|s| s.close }
+      sockets.each(&:close)
       raise
     end
     sockets
@@ -704,7 +710,7 @@ class Socket < BasicSocket
         s.listen(Socket::SOMAXCONN)
       }
     rescue Exception
-      sockets.each {|s| s.close }
+      sockets.each(&:close)
       raise
     end
     sockets
@@ -767,7 +773,7 @@ class Socket < BasicSocket
           raise last_error
         end
       rescue Exception
-        sockets.each {|s| s.close }
+        sockets.each(&:close)
         raise
       end
     end
@@ -775,7 +781,7 @@ class Socket < BasicSocket
       begin
         yield sockets
       ensure
-        sockets.each {|s| s.close if !s.closed? }
+        sockets.each(&:close)
       end
     else
       sockets
@@ -894,18 +900,19 @@ class Socket < BasicSocket
     Addrinfo.foreach(host, port, nil, :DGRAM, nil, Socket::AI_PASSIVE) {|ai|
       if ai.ipv4? && ai.ip_address == "0.0.0.0"
         local_addrs.each {|a|
-          next if !a.ipv4?
+          next unless a.ipv4?
           ip_list << Addrinfo.new(a.to_sockaddr, :INET, :DGRAM, 0);
         }
       elsif ai.ipv6? && ai.ip_address == "::" && !ipv6_recvpktinfo
         local_addrs.each {|a|
-          next if !a.ipv6?
+          next unless a.ipv6?
           ip_list << Addrinfo.new(a.to_sockaddr, :INET6, :DGRAM, 0);
         }
       else
         ip_list << ai
       end
     }
+    ip_list.uniq!(&:to_sockaddr)
 
     if port == 0
       sockets = ip_sockets_port0(ip_list, false)
@@ -936,7 +943,7 @@ class Socket < BasicSocket
       begin
         yield sockets
       ensure
-        sockets.each {|s| s.close if !s.closed? } if sockets
+        sockets.each(&:close) if sockets
       end
     else
       sockets
@@ -1073,7 +1080,7 @@ class Socket < BasicSocket
       begin
         yield sock
       ensure
-        sock.close if !sock.closed?
+        sock.close
       end
     else
       sock
@@ -1097,7 +1104,7 @@ class Socket < BasicSocket
   #   }
   #
   def self.unix_server_socket(path)
-    if !unix_socket_abstract_name?(path)
+    unless unix_socket_abstract_name?(path)
       begin
         st = File.lstat(path)
       rescue Errno::ENOENT
@@ -1111,8 +1118,8 @@ class Socket < BasicSocket
       begin
         yield s
       ensure
-        s.close if !s.closed?
-        if !unix_socket_abstract_name?(path)
+        s.close
+        unless unix_socket_abstract_name?(path)
           File.unlink path
         end
       end
@@ -1197,9 +1204,9 @@ class Socket < BasicSocket
   # it is extended by IO::WaitWritable.
   # So IO::WaitWritable can be used to rescue the exceptions for retrying connect_nonblock.
   #
-  # By specifying `exception: false`, the options hash allows you to indicate
+  # By specifying a keyword argument _exception_ to +false+, you can indicate
   # that connect_nonblock should not raise an IO::WaitWritable exception, but
-  # return the symbol :wait_writable instead.
+  # return the symbol +:wait_writable+ instead.
   #
   # === See
   #  # Socket#connect
@@ -1215,7 +1222,6 @@ class UDPSocket < IPSocket
   #
   # Receives up to _maxlen_ bytes from +udpsocket+ using recvfrom(2) after
   # O_NONBLOCK is set for the underlying file descriptor.
-  # If _maxlen_ is omitted, its default value is 65536.
   # _flags_ is zero or more of the +MSG_+ options.
   # The first element of the results, _mesg_, is the data received.
   # The second element, _sender_inet_addr_, is an array to represent the sender address.
@@ -1256,9 +1262,9 @@ class UDPSocket < IPSocket
   # it is extended by IO::WaitReadable.
   # So IO::WaitReadable can be used to rescue the exceptions for retrying recvfrom_nonblock.
   #
-  # By specifying `exception: false`, the options hash allows you to indicate
-  # that recvmsg_nonblock should not raise an IO::WaitWritable exception, but
-  # return the symbol :wait_writable instead.
+  # By specifying a keyword argument _exception_ to +false+, you can indicate
+  # that recvfrom_nonblock should not raise an IO::WaitReadable exception, but
+  # return the symbol +:wait_readable+ instead.
   #
   # === See
   # * Socket#recvfrom
@@ -1297,9 +1303,9 @@ class TCPServer < TCPSocket
   # it is extended by IO::WaitReadable.
   # So IO::WaitReadable can be used to rescue the exceptions for retrying accept_nonblock.
   #
-  # By specifying `exception: false`, the options hash allows you to indicate
+  # By specifying a keyword argument _exception_ to +false+, you can indicate
   # that accept_nonblock should not raise an IO::WaitReadable exception, but
-  # return the symbol :wait_readable instead.
+  # return the symbol +:wait_readable+ instead.
   #
   # === See
   # * TCPServer#accept
@@ -1338,9 +1344,9 @@ class UNIXServer < UNIXSocket
   # it is extended by IO::WaitReadable.
   # So IO::WaitReadable can be used to rescue the exceptions for retrying accept_nonblock.
   #
-  # By specifying `exception: false`, the options hash allows you to indicate
+  # By specifying a keyword argument _exception_ to +false+, you can indicate
   # that accept_nonblock should not raise an IO::WaitReadable exception, but
-  # return the symbol :wait_readable instead.
+  # return the symbol +:wait_readable+ instead.
   #
   # === See
   # * UNIXServer#accept
diff --git a/ext/socket/mkconstants.rb b/ext/socket/mkconstants.rb
index 0ebf628b46..620a5f60ff 100644
--- a/ext/socket/mkconstants.rb
+++ b/ext/socket/mkconstants.rb
@@ -73,7 +73,15 @@ def each_name(pat)
   }
 end
 
-ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_const_decls")
+erb_new = lambda do |src, safe, trim|
+  if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+
+    ERB.new(src, trim_mode: trim)
+  else
+    ERB.new(src, safe, trim)
+  end
+end
+
+erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_const_decls")
 % each_const {|guard, name, default_value|
 #if !defined(<%=name%>)
 # if defined(HAVE_CONST_<%=name.upcase%>)
@@ -87,7 +95,7 @@ ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_const_decls")
 % }
 EOS
 
-ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_const_defs_in_guard(name, default_value)")
+erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_const_defs_in_guard(name, default_value)")
 #if defined(<%=name%>)
     /* <%= COMMENTS[name] %> */
     rb_define_const(rb_cSocket, <%=c_str name%>, INTEGER2NUM(<%=name%>));
@@ -96,7 +104,7 @@ ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_const_defs_in_guard(name, def
 #endif
 EOS
 
-ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_const_defs")
+erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_const_defs")
 % each_const {|guard, name, default_value|
 %   if guard
 #if <%=guard%>
@@ -146,7 +154,7 @@ def each_names_with_len(pat, prefix_optional=nil)
   }
 end
 
-ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_name_to_int_decl(funcname, pat, prefix_optional, guard=nil)")
+erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_name_to_int_decl(funcname, pat, prefix_optional, guard=nil)")
 %if guard
 #ifdef <%=guard%>
 int <%=funcname%>(const char *str, long len, int *valp);
@@ -156,7 +164,7 @@ int <%=funcname%>(const char *str, long len, int *valp);
 %end
 EOS
 
-ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_name_to_int_func_in_guard(funcname, pat, prefix_optional, guard=nil)")
+erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_name_to_int_func_in_guard(funcname, pat, prefix_optional, guard=nil)")
 int
 <%=funcname%>(const char *str, long len, int *valp)
 {
@@ -172,12 +180,13 @@ int
 
 %    }
       default:
+        if (!str || !valp) {/* wrong argument */}
         return -1;
     }
 }
 EOS
 
-ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_name_to_int_func(funcname, pat, prefix_optional, guard=nil)")
+erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_name_to_int_func(funcname, pat, prefix_optional, guard=nil)")
 %if guard
 #ifdef <%=guard%>
 <%=gen_name_to_int_func_in_guard(funcname, pat, prefix_optional, guard)%>
@@ -206,7 +215,7 @@ def reverse_each_name_with_prefix_optional(pat, prefix_pat)
   end
 end
 
-ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_int_to_name_hash(hash_var, pat, prefix_pat)")
+erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_int_to_name_hash(hash_var, pat, prefix_pat)")
     <%=hash_var%> = st_init_numtable();
 % reverse_each_name_with_prefix_optional(pat, prefix_pat) {|n,s|
 #ifdef <%=n%>
@@ -215,7 +224,7 @@ ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_int_to_name_hash(hash_var, pa
 % }
 EOS
 
-ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_int_to_name_func(func_name, hash_var)")
+erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_int_to_name_func(func_name, hash_var)")
 ID
 <%=func_name%>(int val)
 {
@@ -226,7 +235,7 @@ ID
 }
 EOS
 
-ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_int_to_name_decl(func_name, hash_var)")
+erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_int_to_name_decl(func_name, hash_var)")
 ID <%=func_name%>(int val);
 EOS
 
@@ -275,7 +284,7 @@ def_intern('rsock_intern_udp_optname',  /\AUDP_/, "UDP_")
 def_intern('rsock_intern_scm_optname',  /\ASCM_/, "SCM_")
 def_intern('rsock_intern_local_optname',  /\ALOCAL_/, "LOCAL_")
 
-result = ERB.new(<<'EOS', nil, '%').result(binding)
+result = erb_new.call(<<'EOS', nil, '%').result(binding)
 /* autogenerated file */
 
 <%= INTERN_DEFS.map {|vardef, gen_hash, decl, func| vardef }.join("\n") %>
@@ -318,7 +327,7 @@ init_constants(void)
 
 EOS
 
-header_result = ERB.new(<<'EOS', nil, '%').result(binding)
+header_result = erb_new.call(<<'EOS', nil, '%').result(binding)
 /* autogenerated file */
 <%= gen_const_decls %>
 <%= NAME_TO_INT_DEFS.map {|decl, func| decl }.join("\n") %>
diff --git a/ext/socket/option.c b/ext/socket/option.c
index 7307548e50..4b33b3f1d3 100644
--- a/ext/socket/option.c
+++ b/ext/socket/option.c
@@ -106,9 +106,9 @@ sockopt_initialize(VALUE self, VALUE vfamily, VALUE vlevel, VALUE voptname, VALU
 VALUE
 rsock_sockopt_new(int family, int level, int optname, VALUE data)
 {
-    NEWOBJ_OF(obj, struct RObject, rb_cSockOpt, T_OBJECT);
+    VALUE obj = rb_obj_alloc(rb_cSockOpt);
     StringValue(data);
-    sockopt_initialize((VALUE)obj, INT2NUM(family), INT2NUM(level), INT2NUM(optname), data);
+    sockopt_initialize(obj, INT2NUM(family), INT2NUM(level), INT2NUM(optname), data);
     return (VALUE)obj;
 }
 
@@ -272,6 +272,8 @@ sockopt_int(VALUE self)
  * Creates a new Socket::Option object which contains boolean as data.
  * Actually 0 or 1 as int is used.
  *
+ *   require 'socket'
+ *
  *   p Socket::Option.bool(:INET, :SOCKET, :KEEPALIVE, true)
  *   #=> #<Socket::Option: INET SOCKET KEEPALIVE 1>
  *
@@ -404,7 +406,7 @@ sockopt_s_ipv4_multicast_loop(VALUE klass, VALUE value)
  * call-seq:
  *   sockopt.ipv4_multicast_loop => integer
  *
- * Returns the ipv4_multicast_loop data in _sockopt_ as a integer.
+ * Returns the ipv4_multicast_loop data in _sockopt_ as an integer.
  *
  *   sockopt = Socket::Option.ipv4_multicast_loop(10)
  *   p sockopt.ipv4_multicast_loop => 10
@@ -422,7 +424,7 @@ sockopt_ipv4_multicast_loop(VALUE self)
     }
 #endif
     rb_raise(rb_eTypeError, "ipv4_multicast_loop socket option expected");
-    UNREACHABLE;
+    UNREACHABLE_RETURN(Qnil);
 }
 
 #define inspect_ipv4_multicast_loop(a,b,c,d) \
@@ -455,7 +457,7 @@ sockopt_s_ipv4_multicast_ttl(VALUE klass, VALUE value)
  * call-seq:
  *   sockopt.ipv4_multicast_ttl => integer
  *
- * Returns the ipv4_multicast_ttl data in _sockopt_ as a integer.
+ * Returns the ipv4_multicast_ttl data in _sockopt_ as an integer.
  *
  *   sockopt = Socket::Option.ipv4_multicast_ttl(10)
  *   p sockopt.ipv4_multicast_ttl => 10
@@ -473,7 +475,7 @@ sockopt_ipv4_multicast_ttl(VALUE self)
     }
 #endif
     rb_raise(rb_eTypeError, "ipv4_multicast_ttl socket option expected");
-    UNREACHABLE;
+    UNREACHABLE_RETURN(Qnil);
 }
 
 #define inspect_ipv4_multicast_ttl(a,b,c,d) \
@@ -645,7 +647,7 @@ inspect_timeval_as_interval(int level, int optname, VALUE data, VALUE ret)
  */
 
 #if !defined HAVE_INET_NTOP && ! defined _WIN32
-static const char *
+const char *
 inet_ntop(int af, const void *addr, char *numaddr, size_t numaddr_len)
 {
 #ifdef HAVE_INET_NTOA
@@ -660,10 +662,6 @@ inet_ntop(int af, const void *addr, char *numaddr, size_t numaddr_len)
 #endif
     return numaddr;
 }
-#elif defined __MINGW32__
-# define inet_ntop(f,a,n,l)      rb_w32_inet_ntop(f,a,n,l)
-#elif defined _MSC_VER && RUBY_MSVCRT_VERSION < 90
-const char *WSAAPI inet_ntop(int, const void *, char *, size_t);
 #endif
 
 /* Although the buffer size needed depends on the prefixes, "%u" may generate "4294967295".  */
@@ -1477,4 +1475,3 @@ rsock_init_sockopt(void)
 
     rb_define_method(rb_cSockOpt, "to_s", sockopt_data, 0); /* compatibility for ruby before 1.9.2 */
 }
-
diff --git a/ext/socket/raddrinfo.c b/ext/socket/raddrinfo.c
index 11f5d1f5a6..d99edfe057 100644
--- a/ext/socket/raddrinfo.c
+++ b/ext/socket/raddrinfo.c
@@ -145,15 +145,6 @@ ruby_getaddrinfo__darwin(const char *nodename, const char *servname,
 #define getaddrinfo(node,serv,hints,res) ruby_getaddrinfo__darwin((node),(serv),(hints),(res))
 #endif
 
-#ifndef GETADDRINFO_EMU
-struct getaddrinfo_arg
-{
-    const char *node;
-    const char *service;
-    const struct addrinfo *hints;
-    struct addrinfo **res;
-};
-
 #ifdef HAVE_INET_PTON
 static int
 parse_numeric_port(const char *service, int *portp)
@@ -182,6 +173,15 @@ parse_numeric_port(const char *service, int *portp)
 }
 #endif
 
+#ifndef GETADDRINFO_EMU
+struct getaddrinfo_arg
+{
+    const char *node;
+    const char *service;
+    const struct addrinfo *hints;
+    struct addrinfo **res;
+};
+
 static void *
 nogvl_getaddrinfo(void *arg)
 {
@@ -417,22 +417,18 @@ str_is_number(const char *p)
     char *ep;
 
     if (!p || *p == '\0')
-       return 0;
+        return 0;
     ep = NULL;
     (void)STRTOUL(p, &ep, 10);
     if (ep && *ep == '\0')
-       return 1;
+        return 1;
     else
-       return 0;
+        return 0;
 }
 
 #define str_equal(ptr, len, name) \
     ((ptr)[0] == name[0] && \
      rb_strlen_lit(name) == (len) && memcmp(ptr, name, len) == 0)
-#define SafeStringValueCStr(v) do {\
-    StringValueCStr(v);\
-    rb_check_safe_obj(v);\
-} while(0)
 
 static char*
 host_str(VALUE host, char *hbuf, size_t hbuflen, int *flags_ptr)
@@ -451,7 +447,7 @@ host_str(VALUE host, char *hbuf, size_t hbuflen, int *flags_ptr)
         const char *name;
         size_t len;
 
-        SafeStringValueCStr(host);
+        StringValueCStr(host);
         RSTRING_GETMEM(host, name, len);
         if (!len || str_equal(name, len, "<any>")) {
             make_inetaddr(INADDR_ANY, hbuf, hbuflen);
@@ -462,7 +458,7 @@ host_str(VALUE host, char *hbuf, size_t hbuflen, int *flags_ptr)
             if (flags_ptr) *flags_ptr |= AI_NUMERICHOST;
         }
         else if (len >= hbuflen) {
-            rb_raise(rb_eArgError, "hostname too long (%"PRIdSIZE")",
+            rb_raise(rb_eArgError, "hostname too long (%"PRIuSIZE")",
                      len);
         }
         else {
@@ -490,10 +486,10 @@ port_str(VALUE port, char *pbuf, size_t pbuflen, int *flags_ptr)
         const char *serv;
         size_t len;
 
-        SafeStringValueCStr(port);
+        StringValueCStr(port);
         RSTRING_GETMEM(port, serv, len);
         if (len >= pbuflen) {
-            rb_raise(rb_eArgError, "service name too long (%"PRIdSIZE")",
+            rb_raise(rb_eArgError, "service name too long (%"PRIuSIZE")",
                      len);
         }
         memcpy(pbuf, serv, len);
@@ -515,7 +511,7 @@ rsock_getaddrinfo(VALUE host, VALUE port, struct addrinfo *hints, int socktype_h
     portp = port_str(port, pbuf, sizeof(pbuf), &additional_flags);
 
     if (socktype_hack && hints->ai_socktype == 0 && str_is_number(portp)) {
-       hints->ai_socktype = SOCK_DGRAM;
+        hints->ai_socktype = SOCK_DGRAM;
     }
     hints->ai_flags |= additional_flags;
 
@@ -597,16 +593,21 @@ rsock_ipaddr(struct sockaddr *sockaddr, socklen_t sockaddrlen, int norevlookup)
 }
 
 #ifdef HAVE_SYS_UN_H
-VALUE
-rsock_unixpath_str(struct sockaddr_un *sockaddr, socklen_t len)
+static long
+unixsocket_len(const struct sockaddr_un *su, socklen_t socklen)
 {
-    char *s, *e;
-    s = sockaddr->sun_path;
-    e = (char *)sockaddr + len;
+    const char *s = su->sun_path, *e = (const char*)su + socklen;
     while (s < e && *(e-1) == '\0')
         e--;
-    if (s <= e)
-        return rb_str_new(s, e-s);
+    return e - s;
+}
+
+VALUE
+rsock_unixpath_str(struct sockaddr_un *sockaddr, socklen_t len)
+{
+    long n = unixsocket_len(sockaddr, len);
+    if (n >= 0)
+        return rb_str_new(sockaddr->sun_path, n);
     else
         return rb_str_new2("");
 }
@@ -649,8 +650,9 @@ struct hostent_arg {
 };
 
 static VALUE
-make_hostent_internal(struct hostent_arg *arg)
+make_hostent_internal(VALUE v)
 {
+    struct hostent_arg *arg = (void *)v;
     VALUE host = arg->host;
     struct addrinfo* addr = arg->addr->ai;
     VALUE (*ipaddr)(struct sockaddr*, socklen_t) = arg->ipaddr;
@@ -726,10 +728,8 @@ static void
 addrinfo_mark(void *ptr)
 {
     rb_addrinfo_t *rai = ptr;
-    if (rai) {
-        rb_gc_mark(rai->inspectname);
-        rb_gc_mark(rai->canonname);
-    }
+    rb_gc_mark(rai->inspectname);
+    rb_gc_mark(rai->canonname);
 }
 
 #define addrinfo_free RUBY_TYPED_DEFAULT_FREE
@@ -813,7 +813,7 @@ rsock_addrinfo_new(struct sockaddr *addr, socklen_t len,
 static struct rb_addrinfo *
 call_getaddrinfo(VALUE node, VALUE service,
                  VALUE family, VALUE socktype, VALUE protocol, VALUE flags,
-                 int socktype_hack)
+                 int socktype_hack, VALUE timeout)
 {
     struct addrinfo hints;
     struct rb_addrinfo *res;
@@ -830,6 +830,7 @@ call_getaddrinfo(VALUE node, VALUE service,
     if (!NIL_P(flags)) {
 	hints.ai_flags = NUM2INT(flags);
     }
+
     res = rsock_getaddrinfo(node, service, &hints, socktype_hack);
 
     if (res == NULL)
@@ -844,13 +845,13 @@ init_addrinfo_getaddrinfo(rb_addrinfo_t *rai, VALUE node, VALUE service,
                           VALUE family, VALUE socktype, VALUE protocol, VALUE flags,
                           VALUE inspectnode, VALUE inspectservice)
 {
-    struct rb_addrinfo *res = call_getaddrinfo(node, service, family, socktype, protocol, flags, 1);
+    struct rb_addrinfo *res = call_getaddrinfo(node, service, family, socktype, protocol, flags, 1, Qnil);
     VALUE canonname;
     VALUE inspectname = rb_str_equal(node, inspectnode) ? Qnil : make_inspectname(inspectnode, inspectservice, res->ai);
 
     canonname = Qnil;
     if (res->ai->ai_canonname) {
-        canonname = rb_tainted_str_new_cstr(res->ai->ai_canonname);
+        canonname = rb_str_new_cstr(res->ai->ai_canonname);
         OBJ_FREEZE(canonname);
     }
 
@@ -900,8 +901,6 @@ make_inspectname(VALUE node, VALUE service, struct addrinfo *res)
             rb_str_catf(inspectname, ":%d", FIX2INT(service));
     }
     if (!NIL_P(inspectname)) {
-        OBJ_INFECT(inspectname, node);
-        OBJ_INFECT(inspectname, service);
         OBJ_FREEZE(inspectname);
     }
     return inspectname;
@@ -914,13 +913,13 @@ addrinfo_firstonly_new(VALUE node, VALUE service, VALUE family, VALUE socktype,
     VALUE canonname;
     VALUE inspectname;
 
-    struct rb_addrinfo *res = call_getaddrinfo(node, service, family, socktype, protocol, flags, 0);
+    struct rb_addrinfo *res = call_getaddrinfo(node, service, family, socktype, protocol, flags, 0, Qnil);
 
     inspectname = make_inspectname(node, service, res->ai);
 
     canonname = Qnil;
     if (res->ai->ai_canonname) {
-        canonname = rb_tainted_str_new_cstr(res->ai->ai_canonname);
+        canonname = rb_str_new_cstr(res->ai->ai_canonname);
         OBJ_FREEZE(canonname);
     }
 
@@ -934,13 +933,13 @@ addrinfo_firstonly_new(VALUE node, VALUE service, VALUE family, VALUE socktype,
 }
 
 static VALUE
-addrinfo_list_new(VALUE node, VALUE service, VALUE family, VALUE socktype, VALUE protocol, VALUE flags)
+addrinfo_list_new(VALUE node, VALUE service, VALUE family, VALUE socktype, VALUE protocol, VALUE flags, VALUE timeout)
 {
     VALUE ret;
     struct addrinfo *r;
     VALUE inspectname;
 
-    struct rb_addrinfo *res = call_getaddrinfo(node, service, family, socktype, protocol, flags, 0);
+    struct rb_addrinfo *res = call_getaddrinfo(node, service, family, socktype, protocol, flags, 0, timeout);
 
     inspectname = make_inspectname(node, service, res->ai);
 
@@ -950,7 +949,7 @@ addrinfo_list_new(VALUE node, VALUE service, VALUE family, VALUE socktype, VALUE
         VALUE canonname = Qnil;
 
         if (r->ai_canonname) {
-            canonname = rb_tainted_str_new_cstr(r->ai_canonname);
+            canonname = rb_str_new_cstr(r->ai_canonname);
             OBJ_FREEZE(canonname);
         }
 
@@ -987,6 +986,12 @@ init_unix_addrinfo(rb_addrinfo_t *rai, VALUE path, int socktype)
     init_addrinfo(rai, (struct sockaddr *)&un, len,
 		  PF_UNIX, socktype, 0, Qnil, Qnil);
 }
+
+static long
+rai_unixsocket_len(const rb_addrinfo_t *rai)
+{
+    return unixsocket_len(&rai->addr.un, rai->sockaddr_len);
+}
 #endif
 
 /*
@@ -1116,16 +1121,16 @@ addrinfo_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 static int
-get_afamily(struct sockaddr *addr, socklen_t len)
+get_afamily(const struct sockaddr *addr, socklen_t len)
 {
-    if ((socklen_t)((char*)&addr->sa_family + sizeof(addr->sa_family) - (char*)addr) <= len)
+    if ((socklen_t)((const char*)&addr->sa_family + sizeof(addr->sa_family) - (char*)addr) <= len)
         return addr->sa_family;
     else
         return AF_UNSPEC;
 }
 
 static int
-ai_get_afamily(rb_addrinfo_t *rai)
+ai_get_afamily(const rb_addrinfo_t *rai)
 {
     return get_afamily(&rai->addr.addr, rai->sockaddr_len);
 }
@@ -1234,16 +1239,15 @@ rsock_inspect_sockaddr(struct sockaddr *sockaddr_arg, socklen_t socklen, VALUE r
           {
             struct sockaddr_un *addr = &sockaddr->un;
             char *p, *s, *e;
+            long len = unixsocket_len(addr, socklen);
             s = addr->sun_path;
-            e = (char*)addr + socklen;
-            while (s < e && *(e-1) == '\0')
-                e--;
-            if (e < s)
+            if (len < 0)
                 rb_str_cat2(ret, "too-short-AF_UNIX-sockaddr");
-            else if (s == e)
+            else if (len == 0)
                 rb_str_cat2(ret, "empty-path-AF_UNIX-sockaddr");
             else {
                 int printable_only = 1;
+                e = s + len;
                 p = s;
                 while (p < e) {
                     printable_only = printable_only && ISPRINT(*p) && !ISSPACE(*p);
@@ -1569,13 +1573,7 @@ addrinfo_mdump(VALUE self)
 #ifdef HAVE_SYS_UN_H
       case AF_UNIX:
       {
-        struct sockaddr_un *su = &rai->addr.un;
-        char *s, *e;
-        s = su->sun_path;
-        e = (char*)su + rai->sockaddr_len;
-        while (s < e && *(e-1) == '\0')
-            e--;
-        sockaddr = rb_str_new(s, e-s);
+        sockaddr = rb_str_new(rai->addr.un.sun_path, rai_unixsocket_len(rai));
         break;
       }
 #endif
@@ -1693,7 +1691,7 @@ addrinfo_mload(VALUE self, VALUE ary)
 #endif
         res = call_getaddrinfo(rb_ary_entry(pair, 0), rb_ary_entry(pair, 1),
                                INT2NUM(pfamily), INT2NUM(socktype), INT2NUM(protocol),
-                               INT2NUM(flags), 1);
+                               INT2NUM(flags), 1, Qnil);
 
         len = res->ai->ai_addrlen;
         memcpy(&ss, res->ai->ai_addr, res->ai->ai_addrlen);
@@ -1790,7 +1788,6 @@ addrinfo_to_sockaddr(VALUE self)
     rb_addrinfo_t *rai = get_addrinfo(self);
     VALUE ret;
     ret = rb_str_new((char*)&rai->addr, rai->sockaddr_len);
-    OBJ_INFECT(ret, self);
     return ret;
 }
 
@@ -1798,7 +1795,7 @@ addrinfo_to_sockaddr(VALUE self)
  * call-seq:
  *   addrinfo.canonname => string or nil
  *
- * returns the canonical name as an string.
+ * returns the canonical name as a string.
  *
  * nil is returned if no canonical name.
  *
@@ -2309,28 +2306,27 @@ addrinfo_unix_path(VALUE self)
     rb_addrinfo_t *rai = get_addrinfo(self);
     int family = ai_get_afamily(rai);
     struct sockaddr_un *addr;
-    char *s, *e;
+    long n;
 
     if (family != AF_UNIX)
 	rb_raise(rb_eSocket, "need AF_UNIX address");
 
     addr = &rai->addr.un;
 
-    s = addr->sun_path;
-    e = (char*)addr + rai->sockaddr_len;
-    if (e < s)
+    n = rai_unixsocket_len(rai);
+    if (n < 0)
         rb_raise(rb_eSocket, "too short AF_UNIX address: %"PRIuSIZE" bytes given for minimum %"PRIuSIZE" bytes.",
-            (size_t)rai->sockaddr_len, (size_t)(s - (char *)addr));
-    if (addr->sun_path + sizeof(addr->sun_path) < e)
+                 (size_t)rai->sockaddr_len, offsetof(struct sockaddr_un, sun_path));
+    if ((long)sizeof(addr->sun_path) < n)
         rb_raise(rb_eSocket,
             "too long AF_UNIX path (%"PRIuSIZE" bytes given but %"PRIuSIZE" bytes max)",
-            (size_t)(e - addr->sun_path), sizeof(addr->sun_path));
-    while (s < e && *(e-1) == '\0')
-        e--;
-    return rb_str_new(s, e-s);
+            (size_t)n, sizeof(addr->sun_path));
+    return rb_str_new(addr->sun_path, n);
 }
 #endif
 
+static ID id_timeout;
+
 /*
  * call-seq:
  *   Addrinfo.getaddrinfo(nodename, service, family, socktype, protocol, flags) => [addrinfo, ...]
@@ -2377,10 +2373,16 @@ addrinfo_unix_path(VALUE self)
 static VALUE
 addrinfo_s_getaddrinfo(int argc, VALUE *argv, VALUE self)
 {
-    VALUE node, service, family, socktype, protocol, flags;
+    VALUE node, service, family, socktype, protocol, flags, opts, timeout;
+
+    rb_scan_args(argc, argv, "24:", &node, &service, &family, &socktype,
+		 &protocol, &flags, &opts);
+    rb_get_kwargs(opts, &id_timeout, 0, 1, &timeout);
+    if (timeout == Qundef) {
+	timeout = Qnil;
+    }
 
-    rb_scan_args(argc, argv, "24", &node, &service, &family, &socktype, &protocol, &flags);
-    return addrinfo_list_new(node, service, family, socktype, protocol, flags);
+    return addrinfo_list_new(node, service, family, socktype, protocol, flags, timeout);
 }
 
 /*
@@ -2468,7 +2470,6 @@ addrinfo_s_unix(int argc, VALUE *argv, VALUE self)
     addr = addrinfo_s_allocate(rb_cAddrinfo);
     DATA_PTR(addr) = rai = alloc_addrinfo();
     init_unix_addrinfo(rai, path, socktype);
-    OBJ_INFECT(addr, path);
     return addr;
 }
 
@@ -2552,7 +2553,7 @@ rsock_io_socket_addrinfo(VALUE io, struct sockaddr *addr, socklen_t len)
         rb_raise(rb_eTypeError, "neither IO nor file descriptor");
     }
 
-    UNREACHABLE;
+    UNREACHABLE_RETURN(Qnil);
 }
 
 /*
@@ -2565,7 +2566,9 @@ rsock_init_addrinfo(void)
      * The Addrinfo class maps <tt>struct addrinfo</tt> to ruby.  This
      * structure identifies an Internet host and a service.
      */
-    rb_cAddrinfo = rb_define_class("Addrinfo", rb_cData);
+    id_timeout = rb_intern("timeout");
+
+    rb_cAddrinfo = rb_define_class("Addrinfo", rb_cObject);
     rb_define_alloc_func(rb_cAddrinfo, addrinfo_s_allocate);
     rb_define_method(rb_cAddrinfo, "initialize", addrinfo_initialize, -1);
     rb_define_method(rb_cAddrinfo, "inspect", addrinfo_inspect, 0);
diff --git a/ext/socket/rubysocket.h b/ext/socket/rubysocket.h
index ecd1dfd4ef..f0e4f3a4a0 100644
--- a/ext/socket/rubysocket.h
+++ b/ext/socket/rubysocket.h
@@ -1,12 +1,22 @@
 #ifndef RUBY_SOCKET_H
 #define RUBY_SOCKET_H 1
 
-#include "ruby/ruby.h"
-#include "ruby/io.h"
-#include "ruby/thread.h"
-#include "ruby/util.h"
-#include "internal.h"
+#include "ruby/config.h"
+#include RUBY_EXTCONF_H
+
+#if defined(__sun) || defined(_AIX)
+/* (Recent?)  Solaris' <nfs/nfs.h> have conflicting definition of T_DATA.  Let
+ * us honour system definition by undefining ours.
+ *
+ * See also [ruby-core:4261]
+ */
+# include "ruby/ruby.h"
+# undef T_DATA
+#endif
+
+#include <errno.h>
 #include <stdio.h>
+
 #include <sys/types.h>
 #include <sys/stat.h>
 
@@ -50,12 +60,11 @@
 #ifdef HAVE_NETPACKET_PACKET_H
 #  include <netpacket/packet.h>
 #endif
+
 #ifdef HAVE_NET_ETHERNET_H
 #  include <net/ethernet.h>
 #endif
 
-#include <errno.h>
-
 #ifdef HAVE_SYS_UN_H
 #  include <sys/un.h>
 #endif
@@ -81,12 +90,15 @@
 #  endif
 #  include <ifaddrs.h>
 #endif
+
 #ifdef HAVE_SYS_IOCTL_H
 #  include <sys/ioctl.h>
 #endif
+
 #ifdef HAVE_SYS_SOCKIO_H
 #  include <sys/sockio.h>
 #endif
+
 #ifdef HAVE_NET_IF_H
 #  include <net/if.h>
 #endif
@@ -94,16 +106,40 @@
 #ifdef HAVE_SYS_PARAM_H
 #  include <sys/param.h>
 #endif
+
 #ifdef HAVE_SYS_UCRED_H
 #  include <sys/ucred.h>
 #endif
+
 #ifdef HAVE_UCRED_H
 #  include <ucred.h>
 #endif
+
 #ifdef HAVE_NET_IF_DL_H
 #  include <net/if_dl.h>
 #endif
 
+#ifdef SOCKS5
+#  include <socks.h>
+#endif
+
+#ifndef HAVE_GETADDRINFO
+#  include "addrinfo.h"
+#endif
+
+#include "internal.h"
+#include "internal/array.h"
+#include "internal/error.h"
+#include "internal/gc.h"
+#include "internal/io.h"
+#include "internal/thread.h"
+#include "internal/vm.h"
+#include "ruby/io.h"
+#include "ruby/ruby.h"
+#include "ruby/thread.h"
+#include "ruby/util.h"
+#include "sockport.h"
+
 #ifndef HAVE_TYPE_SOCKLEN_T
 typedef int socklen_t;
 #endif
@@ -137,11 +173,6 @@ unsigned int if_nametoindex(const char *);
  */
 #define pseudo_AF_FTIP pseudo_AF_RTIP
 
-#ifndef HAVE_GETADDRINFO
-#  include "addrinfo.h"
-#endif
-
-#include "sockport.h"
 
 #ifndef NI_MAXHOST
 #  define NI_MAXHOST 1025
@@ -223,7 +254,6 @@ typedef union {
 #define INET_SOCKS  2
 
 extern int rsock_do_not_reverse_lookup;
-extern int rsock_cmsg_cloexec_state;
 #define FMODE_NOREVLOOKUP 0x100
 
 /* common socket families only */
@@ -249,9 +279,7 @@ extern VALUE rb_eSocket;
 
 #ifdef SOCKS
 extern VALUE rb_cSOCKSSocket;
-#  ifdef SOCKS5
-#    include <socks.h>
-#  else
+#  ifndef SOCKS5
 void SOCKSinit();
 int Rconnect();
 #  endif
@@ -292,6 +320,7 @@ int rb_getnameinfo(const struct sockaddr *sa, socklen_t salen, char *host, size_
 int rsock_fd_family(int fd);
 struct rb_addrinfo *rsock_addrinfo(VALUE host, VALUE port, int family, int socktype, int flags);
 struct rb_addrinfo *rsock_getaddrinfo(VALUE host, VALUE port, struct addrinfo *hints, int socktype_hack);
+
 VALUE rsock_fd_socket_addrinfo(int fd, struct sockaddr *addr, socklen_t len);
 VALUE rsock_io_socket_addrinfo(VALUE io, struct sockaddr *addr, socklen_t len);
 
@@ -317,7 +346,7 @@ int rsock_socket(int domain, int type, int proto);
 int rsock_detect_cloexec(int fd);
 VALUE rsock_init_sock(VALUE sock, int fd);
 VALUE rsock_sock_s_socketpair(int argc, VALUE *argv, VALUE klass);
-VALUE rsock_init_inetsock(VALUE sock, VALUE remote_host, VALUE remote_serv, VALUE local_host, VALUE local_serv, int type);
+VALUE rsock_init_inetsock(VALUE sock, VALUE remote_host, VALUE remote_serv, VALUE local_host, VALUE local_serv, int type, VALUE resolv_timeout, VALUE connect_timeout);
 VALUE rsock_init_unixsock(VALUE sock, VALUE path, int server);
 
 struct rsock_send_arg {
@@ -342,7 +371,7 @@ VALUE rsock_s_recvfrom_nonblock(VALUE sock, VALUE len, VALUE flg, VALUE str,
 			        VALUE ex, enum sock_recv_type from);
 VALUE rsock_s_recvfrom(VALUE sock, int argc, VALUE *argv, enum sock_recv_type from);
 
-int rsock_connect(int fd, const struct sockaddr *sockaddr, int len, int socks);
+int rsock_connect(int fd, const struct sockaddr *sockaddr, int len, int socks, struct timeval *timeout);
 
 VALUE rsock_s_accept(VALUE klass, int fd, struct sockaddr *sockaddr, socklen_t *len);
 VALUE rsock_s_accept_nonblock(VALUE klass, VALUE ex, rb_io_t *fptr,
@@ -408,7 +437,7 @@ NORETURN(void rsock_sys_fail_raddrinfo_or_sockaddr(const char *, VALUE addr, VAL
  * all cases.  For some syscalls (e.g. accept/accept4), blocking on the
  * syscall instead of relying on select/poll allows the kernel to use
  * "wake-one" behavior and avoid the thundering herd problem.
- * This is likely safe on all other *nix-like systems, so this whitelist
+ * This is likely safe on all other *nix-like systems, so this safe list
  * can be expanded by interested parties.
  */
 #if defined(__linux__)
@@ -430,4 +459,17 @@ static inline void rsock_maybe_wait_fd(int fd) { }
 #  define MSG_DONTWAIT_RELIABLE 0
 #endif
 
+VALUE rsock_read_nonblock(VALUE sock, VALUE length, VALUE buf, VALUE ex);
+VALUE rsock_write_nonblock(VALUE sock, VALUE buf, VALUE ex);
+
+void rsock_make_fd_nonblock(int fd);
+
+#if !defined HAVE_INET_NTOP && ! defined _WIN32
+const char *inet_ntop(int, const void *, char *, size_t);
+#elif defined __MINGW32__
+# define inet_ntop(f,a,n,l)      rb_w32_inet_ntop(f,a,n,l)
+#elif defined _MSC_VER && RUBY_MSVCRT_VERSION < 90
+const char *WSAAPI inet_ntop(int, const void *, char *, size_t);
+#endif
+
 #endif
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index 542cd02ed6..3d8c65032c 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -168,84 +168,47 @@ pair_yield(VALUE pair)
 #endif
 
 #if defined HAVE_SOCKETPAIR
-
-#ifdef SOCK_CLOEXEC
 static int
-rsock_socketpair0(int domain, int type, int protocol, int sv[2])
+rsock_socketpair0(int domain, int type, int protocol, int descriptors[2])
 {
-    int ret;
-    static int cloexec_state = -1; /* <0: unknown, 0: ignored, >0: working */
+#ifdef SOCK_CLOEXEC
+    type |= SOCK_CLOEXEC;
+#endif
 
-    if (cloexec_state > 0) { /* common path, if SOCK_CLOEXEC is defined */
-        ret = socketpair(domain, type|SOCK_CLOEXEC, protocol, sv);
-        if (ret == 0 && (sv[0] <= 2 || sv[1] <= 2)) {
-            goto fix_cloexec; /* highly unlikely */
-        }
-        goto update_max_fd;
-    }
-    else if (cloexec_state < 0) { /* usually runs once only for detection */
-        ret = socketpair(domain, type|SOCK_CLOEXEC, protocol, sv);
-        if (ret == 0) {
-            cloexec_state = rsock_detect_cloexec(sv[0]);
-            if ((cloexec_state == 0) || (sv[0] <= 2 || sv[1] <= 2))
-                goto fix_cloexec;
-            goto update_max_fd;
-        }
-        else if (ret == -1 && errno == EINVAL) {
-            /* SOCK_CLOEXEC is available since Linux 2.6.27.  Linux 2.6.18 fails with EINVAL */
-            ret = socketpair(domain, type, protocol, sv);
-            if (ret != -1) {
-                /* The reason of EINVAL may be other than SOCK_CLOEXEC.
-                 * So disable SOCK_CLOEXEC only if socketpair() succeeds without SOCK_CLOEXEC.
-                 * Ex. Socket.pair(:UNIX, 0xff) fails with EINVAL.
-                 */
-                cloexec_state = 0;
-            }
-        }
-    }
-    else { /* cloexec_state == 0 */
-        ret = socketpair(domain, type, protocol, sv);
-    }
-    if (ret == -1) {
-        return -1;
-    }
+#ifdef SOCK_NONBLOCK
+    type |= SOCK_NONBLOCK;
+#endif
 
-fix_cloexec:
-    rb_maygvl_fd_fix_cloexec(sv[0]);
-    rb_maygvl_fd_fix_cloexec(sv[1]);
+    int result = socketpair(domain, type, protocol, descriptors);
 
-update_max_fd:
-    rb_update_max_fd(sv[0]);
-    rb_update_max_fd(sv[1]);
+    if (result == -1)
+        return -1;
 
-    return ret;
-}
-#else /* !SOCK_CLOEXEC */
-static int
-rsock_socketpair0(int domain, int type, int protocol, int sv[2])
-{
-    int ret = socketpair(domain, type, protocol, sv);
+#ifndef SOCK_CLOEXEC
+    rb_fd_fix_cloexec(descriptors[0]);
+    rb_fd_fix_cloexec(descriptors[1]);
+#endif
 
-    if (ret == -1)
-	return -1;
+#ifndef SOCK_NONBLOCK
+    rsock_make_fd_nonblock(descriptors[0]);
+    rsock_make_fd_nonblock(descriptors[1]);
+#endif
 
-    rb_fd_fix_cloexec(sv[0]);
-    rb_fd_fix_cloexec(sv[1]);
-    return ret;
+    return result;
 }
-#endif /* !SOCK_CLOEXEC */
 
 static int
-rsock_socketpair(int domain, int type, int protocol, int sv[2])
+rsock_socketpair(int domain, int type, int protocol, int descriptors[2])
 {
-    int ret;
+    int result;
 
-    ret = rsock_socketpair0(domain, type, protocol, sv);
-    if (ret < 0 && rb_gc_for_fd(errno)) {
-        ret = rsock_socketpair0(domain, type, protocol, sv);
+    result = rsock_socketpair0(domain, type, protocol, descriptors);
+
+    if (result < 0 && rb_gc_for_fd(errno)) {
+        result = rsock_socketpair0(domain, type, protocol, descriptors);
     }
 
-    return ret;
+    return result;
 }
 
 /*
@@ -430,7 +393,7 @@ sock_connect(VALUE sock, VALUE addr)
     addr = rb_str_new4(addr);
     GetOpenFile(sock, fptr);
     fd = fptr->fd;
-    n = rsock_connect(fd, (struct sockaddr*)RSTRING_PTR(addr), RSTRING_SOCKLEN(addr), 0);
+    n = rsock_connect(fd, (struct sockaddr*)RSTRING_PTR(addr), RSTRING_SOCKLEN(addr), 0, NULL);
     if (n < 0) {
 	rsock_sys_fail_raddrinfo_or_sockaddr("connect(2)", addr, rai);
     }
@@ -983,7 +946,18 @@ sock_sockaddr(struct sockaddr *addr, socklen_t len)
  * call-seq:
  *   Socket.gethostbyname(hostname) => [official_hostname, alias_hostnames, address_family, *address_list]
  *
- * Obtains the host information for _hostname_.
+ * Use Addrinfo.getaddrinfo instead.
+ * This method is deprecated for the following reasons:
+ *
+ * - The 3rd element of the result is the address family of the first address.
+ *   The address families of the rest of the addresses are not returned.
+ * - Uncommon address representation:
+ *   4/16-bytes binary string to represent IPv4/IPv6 address.
+ * - gethostbyname() may take a long time and it may block other threads.
+ *   (GVL cannot be released since gethostbyname() is not thread safe.)
+ * - This method uses gethostbyname() function already removed from POSIX.
+ *
+ * This method obtains the host information for _hostname_.
  *
  *   p Socket.gethostbyname("hal") #=> ["localhost", ["hal"], 2, "\x7F\x00\x00\x01"]
  *
@@ -991,6 +965,7 @@ sock_sockaddr(struct sockaddr *addr, socklen_t len)
 static VALUE
 sock_s_gethostbyname(VALUE obj, VALUE host)
 {
+    rb_warn("Socket.gethostbyname is deprecated; use Addrinfo.getaddrinfo instead.");
     struct rb_addrinfo *res =
 	rsock_addrinfo(host, Qnil, AF_UNSPEC, SOCK_STREAM, AI_CANONNAME);
     return rsock_make_hostent(host, res, sock_sockaddr);
@@ -1000,13 +975,29 @@ sock_s_gethostbyname(VALUE obj, VALUE host)
  * call-seq:
  *   Socket.gethostbyaddr(address_string [, address_family]) => hostent
  *
- * Obtains the host information for _address_.
+ * Use Addrinfo#getnameinfo instead.
+ * This method is deprecated for the following reasons:
+ *
+ * - Uncommon address representation:
+ *   4/16-bytes binary string to represent IPv4/IPv6 address.
+ * - gethostbyaddr() may take a long time and it may block other threads.
+ *   (GVL cannot be released since gethostbyname() is not thread safe.)
+ * - This method uses gethostbyname() function already removed from POSIX.
+ *
+ * This method obtains the host information for _address_.
  *
  *   p Socket.gethostbyaddr([221,186,184,68].pack("CCCC"))
  *   #=> ["carbon.ruby-lang.org", [], 2, "\xDD\xBA\xB8D"]
+ *
+ *   p Socket.gethostbyaddr([127,0,0,1].pack("CCCC"))
+ *   ["localhost", [], 2, "\x7F\x00\x00\x01"]
+ *   p Socket.gethostbyaddr(([0]*15+[1]).pack("C"*16))
+ *   #=> ["localhost", ["ip6-localhost", "ip6-loopback"], 10,
+ *        "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01"]
+ *
  */
 static VALUE
-sock_s_gethostbyaddr(int argc, VALUE *argv)
+sock_s_gethostbyaddr(int argc, VALUE *argv, VALUE _)
 {
     VALUE addr, family;
     struct hostent *h;
@@ -1014,6 +1005,8 @@ sock_s_gethostbyaddr(int argc, VALUE *argv)
     VALUE ary, names;
     int t = AF_INET;
 
+    rb_warn("Socket.gethostbyaddr is deprecated; use Addrinfo#getnameinfo instead.");
+
     rb_scan_args(argc, argv, "11", &addr, &family);
     StringValue(addr);
     if (!NIL_P(family)) {
@@ -1068,7 +1061,7 @@ sock_s_gethostbyaddr(int argc, VALUE *argv)
  *   Socket.getservbyname("syslog", "udp") #=> 514
  */
 static VALUE
-sock_s_getservbyname(int argc, VALUE *argv)
+sock_s_getservbyname(int argc, VALUE *argv, VALUE _)
 {
     VALUE service, proto;
     struct servent *sp;
@@ -1109,7 +1102,7 @@ sock_s_getservbyname(int argc, VALUE *argv)
  *
  */
 static VALUE
-sock_s_getservbyport(int argc, VALUE *argv)
+sock_s_getservbyport(int argc, VALUE *argv, VALUE _)
 {
     VALUE port, proto;
     struct servent *sp;
@@ -1128,7 +1121,7 @@ sock_s_getservbyport(int argc, VALUE *argv)
     if (!sp) {
 	rb_raise(rb_eSocket, "no such service for port %d/%s", (int)portnum, protoname);
     }
-    return rb_tainted_str_new2(sp->s_name);
+    return rb_str_new2(sp->s_name);
 }
 
 /*
@@ -1137,6 +1130,9 @@ sock_s_getservbyport(int argc, VALUE *argv)
  *
  * Obtains address information for _nodename_:_servname_.
  *
+ * Note that Addrinfo.getaddrinfo provides the same functionality in
+ * an object oriented style.
+ *
  * _family_ should be an address family such as: :INET, :INET6, etc.
  *
  * _socktype_ should be a socket type such as: :STREAM, :DGRAM, :RAW, etc.
@@ -1164,7 +1160,7 @@ sock_s_getservbyport(int argc, VALUE *argv)
  * If Addrinfo object is preferred, use Addrinfo.getaddrinfo.
  */
 static VALUE
-sock_s_getaddrinfo(int argc, VALUE *argv)
+sock_s_getaddrinfo(int argc, VALUE *argv, VALUE _)
 {
     VALUE host, port, family, socktype, protocol, flags, ret, revlookup;
     struct addrinfo hints;
@@ -1188,6 +1184,7 @@ sock_s_getaddrinfo(int argc, VALUE *argv)
     if (NIL_P(revlookup) || !rsock_revlookup_flag(revlookup, &norevlookup)) {
 	norevlookup = rsock_do_not_reverse_lookup;
     }
+
     res = rsock_getaddrinfo(host, port, &hints, 0);
 
     ret = make_addrinfo(res, norevlookup);
@@ -1218,7 +1215,7 @@ sock_s_getaddrinfo(int argc, VALUE *argv)
  * If Addrinfo object is preferred, use Addrinfo#getnameinfo.
  */
 static VALUE
-sock_s_getnameinfo(int argc, VALUE *argv)
+sock_s_getnameinfo(int argc, VALUE *argv, VALUE _)
 {
     VALUE sa, af = Qnil, host = Qnil, port = Qnil, flags, tmp;
     char *hptr, *pptr;
@@ -1287,7 +1284,7 @@ sock_s_getnameinfo(int argc, VALUE *argv)
 	    hptr = NULL;
 	}
 	else {
-	    strncpy(hbuf, StringValuePtr(host), sizeof(hbuf));
+	    strncpy(hbuf, StringValueCStr(host), sizeof(hbuf));
 	    hbuf[sizeof(hbuf) - 1] = '\0';
 	    hptr = hbuf;
 	}
@@ -1301,7 +1298,7 @@ sock_s_getnameinfo(int argc, VALUE *argv)
 	    pptr = pbuf;
 	}
 	else {
-	    strncpy(pbuf, StringValuePtr(port), sizeof(pbuf));
+	    strncpy(pbuf, StringValueCStr(port), sizeof(pbuf));
 	    pbuf[sizeof(pbuf) - 1] = '\0';
 	    pptr = pbuf;
 	}
@@ -1351,7 +1348,7 @@ sock_s_getnameinfo(int argc, VALUE *argv)
     errno = saved_errno;
     rsock_raise_socket_error("getnameinfo", error);
 
-    UNREACHABLE;
+    UNREACHABLE_RETURN(Qnil);
 }
 
 /*
@@ -1375,8 +1372,6 @@ sock_s_pack_sockaddr_in(VALUE self, VALUE port, VALUE host)
     VALUE addr = rb_str_new((char*)res->ai->ai_addr, res->ai->ai_addrlen);
 
     rb_freeaddrinfo(res);
-    OBJ_INFECT(addr, port);
-    OBJ_INFECT(addr, host);
 
     return addr;
 }
@@ -1418,7 +1413,6 @@ sock_s_unpack_sockaddr_in(VALUE self, VALUE addr)
 #endif
     }
     host = rsock_make_ipaddr((struct sockaddr*)sockaddr, RSTRING_SOCKLEN(addr));
-    OBJ_INFECT(host, addr);
     return rb_assoc_new(INT2NUM(ntohs(sockaddr->sin_port)), host);
 }
 
@@ -1448,7 +1442,6 @@ sock_s_pack_sockaddr_un(VALUE self, VALUE path)
     }
     memcpy(sockaddr.sun_path, RSTRING_PTR(path), RSTRING_LEN(path));
     addr = rb_str_new((char*)&sockaddr, rsock_unix_sockaddr_len(path));
-    OBJ_INFECT(addr, path);
 
     return addr;
 }
@@ -1485,7 +1478,6 @@ sock_s_unpack_sockaddr_un(VALUE self, VALUE addr)
 		 RSTRING_LEN(addr), (int)sizeof(struct sockaddr_un));
     }
     path = rsock_unixpath_str(sockaddr, RSTRING_SOCKLEN(addr));
-    OBJ_INFECT(path, addr);
     return path;
 }
 #endif
@@ -1902,6 +1894,8 @@ socket_s_ip_address_list(VALUE self)
 void
 Init_socket(void)
 {
+    rb_ext_ractor_safe(true);
+
     rsock_init_basicsocket();
 
     /*
@@ -1955,6 +1949,8 @@ Init_socket(void)
      *
      * Let's create an internet socket using the IPv4 protocol in a C-like manner:
      *
+     *   require 'socket'
+     *
      *   s = Socket.new Socket::AF_INET, Socket::SOCK_STREAM
      *   s.connect Socket.pack_sockaddr_in(80, 'example.com')
      *
diff --git a/ext/socket/sockssocket.c b/ext/socket/sockssocket.c
index 81f77a67c5..b8b7e12998 100644
--- a/ext/socket/sockssocket.c
+++ b/ext/socket/sockssocket.c
@@ -13,13 +13,19 @@
 #ifdef SOCKS
 /*
  * call-seq:
- *   SOCKSSocket.new(host, serv) => socket
+ *   SOCKSSocket.new(host, port) => socket
  *
- * Opens a SOCKS connection to +host+ via the SOCKS server +serv+.
+ * Opens a SOCKS connection to +host+ via the SOCKS server.
+ *
+ * The SOCKS server configuration varies by implementation
+ *
+ * When using the Dante libsocks/libsocksd implementation it is configured as SOCKS_SERVER env var.
+ *
+ * See: https://manpages.debian.org/testing/dante-client/socksify.1.en.html for full env variable support.
  *
  */
 static VALUE
-socks_init(VALUE sock, VALUE host, VALUE serv)
+socks_init(VALUE sock, VALUE host, VALUE port)
 {
     static int init = 0;
 
@@ -28,7 +34,7 @@ socks_init(VALUE sock, VALUE host, VALUE serv)
 	init = 1;
     }
 
-    return rsock_init_inetsock(sock, host, serv, Qnil, Qnil, INET_SOCKS);
+    return rsock_init_inetsock(sock, host, port, Qnil, Qnil, INET_SOCKS, Qnil, Qnil);
 }
 
 #ifdef SOCKS5
diff --git a/ext/socket/tcpserver.c b/ext/socket/tcpserver.c
index 1bbb31adcf..7634420e38 100644
--- a/ext/socket/tcpserver.c
+++ b/ext/socket/tcpserver.c
@@ -36,7 +36,7 @@ tcp_svr_init(int argc, VALUE *argv, VALUE sock)
     VALUE hostname, port;
 
     rb_scan_args(argc, argv, "011", &hostname, &port);
-    return rsock_init_inetsock(sock, hostname, port, Qnil, Qnil, INET_SERVER);
+    return rsock_init_inetsock(sock, hostname, port, Qnil, Qnil, INET_SERVER, Qnil, Qnil);
 }
 
 /*
diff --git a/ext/socket/tcpsocket.c b/ext/socket/tcpsocket.c
index a7a82fd880..51e77a0de9 100644
--- a/ext/socket/tcpsocket.c
+++ b/ext/socket/tcpsocket.c
@@ -12,23 +12,42 @@
 
 /*
  * call-seq:
- *    TCPSocket.new(remote_host, remote_port, local_host=nil, local_port=nil)
+ *    TCPSocket.new(remote_host, remote_port, local_host=nil, local_port=nil, connect_timeout: nil)
  *
  * Opens a TCP connection to +remote_host+ on +remote_port+.  If +local_host+
  * and +local_port+ are specified, then those parameters are used on the local
  * end to establish the connection.
+ *
+ * [:connect_timeout] specify the timeout in seconds.
  */
 static VALUE
 tcp_init(int argc, VALUE *argv, VALUE sock)
 {
     VALUE remote_host, remote_serv;
     VALUE local_host, local_serv;
+    VALUE opt;
+    static ID keyword_ids[2];
+    VALUE kwargs[2];
+    VALUE resolv_timeout = Qnil;
+    VALUE connect_timeout = Qnil;
+
+    if (!keyword_ids[0]) {
+	CONST_ID(keyword_ids[0], "resolv_timeout");
+	CONST_ID(keyword_ids[1], "connect_timeout");
+    }
+
+    rb_scan_args(argc, argv, "22:", &remote_host, &remote_serv,
+			&local_host, &local_serv, &opt);
 
-    rb_scan_args(argc, argv, "22", &remote_host, &remote_serv,
-			&local_host, &local_serv);
+    if (!NIL_P(opt)) {
+	rb_get_kwargs(opt, keyword_ids, 0, 2, kwargs);
+	if (kwargs[0] != Qundef) { resolv_timeout = kwargs[0]; }
+	if (kwargs[1] != Qundef) { connect_timeout = kwargs[1]; }
+    }
 
     return rsock_init_inetsock(sock, remote_host, remote_serv,
-			       local_host, local_serv, INET_CLIENT);
+			       local_host, local_serv, INET_CLIENT,
+			       resolv_timeout, connect_timeout);
 }
 
 static VALUE
@@ -41,7 +60,16 @@ tcp_sockaddr(struct sockaddr *addr, socklen_t len)
  * call-seq:
  *   TCPSocket.gethostbyname(hostname) => [official_hostname, alias_hostnames, address_family, *address_list]
  *
- * Lookups host information by _hostname_.
+ * Use Addrinfo.getaddrinfo instead.
+ * This method is deprecated for the following reasons:
+ *
+ * - The 3rd element of the result is the address family of the first address.
+ *   The address families of the rest of the addresses are not returned.
+ * - gethostbyname() may take a long time and it may block other threads.
+ *   (GVL cannot be released since gethostbyname() is not thread safe.)
+ * - This method uses gethostbyname() function already removed from POSIX.
+ *
+ * This method lookups host information by _hostname_.
  *
  *   TCPSocket.gethostbyname("localhost")
  *   #=> ["localhost", ["hal"], 2, "127.0.0.1"]
@@ -50,6 +78,7 @@ tcp_sockaddr(struct sockaddr *addr, socklen_t len)
 static VALUE
 tcp_s_gethostbyname(VALUE obj, VALUE host)
 {
+    rb_warn("TCPSocket.gethostbyname is deprecated; use Addrinfo.getaddrinfo instead.");
     struct rb_addrinfo *res =
 	rsock_addrinfo(host, Qnil, AF_UNSPEC, SOCK_STREAM, AI_CANONNAME);
     return rsock_make_hostent(host, res, tcp_sockaddr);
diff --git a/ext/socket/udpsocket.c b/ext/socket/udpsocket.c
index 7b7b34f04d..593f05522d 100644
--- a/ext/socket/udpsocket.c
+++ b/ext/socket/udpsocket.c
@@ -19,6 +19,8 @@
  * _address_family_ should be an integer, a string or a symbol:
  * Socket::AF_INET, "AF_INET", :INET, etc.
  *
+ *   require 'socket'
+ *
  *   UDPSocket.new                   #=> #<UDPSocket:fd 3>
  *   UDPSocket.new(Socket::AF_INET6) #=> #<UDPSocket:fd 4>
  *
@@ -48,8 +50,9 @@ struct udp_arg
 };
 
 static VALUE
-udp_connect_internal(struct udp_arg *arg)
+udp_connect_internal(VALUE v)
 {
+    struct udp_arg *arg = (void *)v;
     rb_io_t *fptr;
     int fd;
     struct addrinfo *res;
@@ -57,7 +60,7 @@ udp_connect_internal(struct udp_arg *arg)
     rb_io_check_closed(fptr = arg->fptr);
     fd = fptr->fd;
     for (res = arg->res->ai; res; res = res->ai_next) {
-	if (rsock_connect(fd, res->ai_addr, res->ai_addrlen, 0) >= 0) {
+	if (rsock_connect(fd, res->ai_addr, res->ai_addrlen, 0, NULL) >= 0) {
 	    return Qtrue;
 	}
     }
@@ -95,8 +98,9 @@ udp_connect(VALUE sock, VALUE host, VALUE port)
 }
 
 static VALUE
-udp_bind_internal(struct udp_arg *arg)
+udp_bind_internal(VALUE v)
 {
+    struct udp_arg *arg = (void *)v;
     rb_io_t *fptr;
     int fd;
     struct addrinfo *res;
@@ -145,8 +149,9 @@ struct udp_send_arg {
 };
 
 static VALUE
-udp_send_internal(struct udp_send_arg *arg)
+udp_send_internal(VALUE v)
 {
+    struct udp_send_arg *arg = (void *)v;
     rb_io_t *fptr;
     int n;
     struct addrinfo *res;
diff --git a/ext/socket/unixserver.c b/ext/socket/unixserver.c
index 799dcffb00..b1f2a38547 100644
--- a/ext/socket/unixserver.c
+++ b/ext/socket/unixserver.c
@@ -17,6 +17,8 @@
  *
  * Creates a new UNIX server socket bound to _path_.
  *
+ *   require 'socket'
+ *
  *   serv = UNIXServer.new("/tmp/sock")
  *   s = serv.accept
  *   p s.read
diff --git a/ext/socket/unixsocket.c b/ext/socket/unixsocket.c
index f73f12777c..857cfa6002 100644
--- a/ext/socket/unixsocket.c
+++ b/ext/socket/unixsocket.c
@@ -22,7 +22,28 @@ unixsock_connect_internal(VALUE a)
 {
     struct unixsock_arg *arg = (struct unixsock_arg *)a;
     return (VALUE)rsock_connect(arg->fd, (struct sockaddr*)arg->sockaddr,
-			        arg->sockaddrlen, 0);
+			        arg->sockaddrlen, 0, NULL);
+}
+
+static VALUE
+unixsock_path_value(VALUE path)
+{
+#ifdef __linux__
+#define TO_STR_FOR_LINUX_ABSTRACT_NAMESPACE 0
+
+    VALUE name = path;
+#if TO_STR_FOR_LINUX_ABSTRACT_NAMESPACE
+    const int isstr = !NIL_P(name = rb_check_string_type(name));
+#else
+    const int isstr = RB_TYPE_P(name, T_STRING);
+#endif
+    if (isstr) {
+        if (RSTRING_LEN(name) == 0 || RSTRING_PTR(name)[0] == '\0') {
+            return name;             /* ignore encoding */
+        }
+    }
+#endif
+    return rb_get_path(path);
 }
 
 VALUE
@@ -33,7 +54,7 @@ rsock_init_unixsock(VALUE sock, VALUE path, int server)
     int fd, status;
     rb_io_t *fptr;
 
-    SafeStringValue(path);
+    path = unixsock_path_value(path);
 
     INIT_SOCKADDR_UN(&sockaddr, sizeof(struct sockaddr_un));
     if (sizeof(sockaddr.sun_path) < (size_t)RSTRING_LEN(path)) {
@@ -93,6 +114,8 @@ rsock_init_unixsock(VALUE sock, VALUE path, int server)
  *
  * Creates a new UNIX client socket connected to _path_.
  *
+ *   require 'socket'
+ *
  *   s = UNIXSocket.new("/tmp/sock")
  *   s.send "hello", 0
  *
@@ -315,6 +338,12 @@ unix_recv_io(int argc, VALUE *argv, VALUE sock)
     struct iomsg_arg arg;
     struct iovec vec[2];
     char buf[1];
+    unsigned int gc_reason = 0;
+    enum {
+        GC_REASON_EMSGSIZE = 0x1,
+        GC_REASON_TRUNCATE = 0x2,
+        GC_REASON_ENOMEM = 0x4
+    };
 
     int fd;
 #if FD_PASSING_BY_MSG_CONTROL
@@ -330,6 +359,7 @@ unix_recv_io(int argc, VALUE *argv, VALUE sock)
     if (argc <= 1)
 	mode = Qnil;
 
+retry:
     GetOpenFile(sock, fptr);
 
     arg.msg.msg_name = NULL;
@@ -357,12 +387,31 @@ unix_recv_io(int argc, VALUE *argv, VALUE sock)
 
     arg.fd = fptr->fd;
     while ((int)BLOCKING_REGION_FD(recvmsg_blocking, &arg) == -1) {
+        int e = errno;
+        if (e == EMSGSIZE && !(gc_reason & GC_REASON_EMSGSIZE)) {
+            /* FreeBSD gets here when we're out of FDs */
+            gc_reason |= GC_REASON_EMSGSIZE;
+            rb_gc_for_fd(EMFILE);
+            goto retry;
+        }
+        else if (e == ENOMEM && !(gc_reason & GC_REASON_ENOMEM)) {
+            /* ENOMEM is documented in recvmsg manpages */
+            gc_reason |= GC_REASON_ENOMEM;
+            rb_gc_for_fd(e);
+            goto retry;
+        }
 	if (!rb_io_wait_readable(arg.fd))
-	    rsock_sys_fail_path("recvmsg(2)", fptr->pathv);
+	    rsock_syserr_fail_path(e, "recvmsg(2)", fptr->pathv);
     }
 
 #if FD_PASSING_BY_MSG_CONTROL
     if (arg.msg.msg_controllen < (socklen_t)sizeof(struct cmsghdr)) {
+        /* FreeBSD and Linux both get here when we're out of FDs */
+        if (!(gc_reason & GC_REASON_TRUNCATE)) {
+            gc_reason |= GC_REASON_TRUNCATE;
+            rb_gc_for_fd(EMFILE);
+            goto retry;
+        }
 	rb_raise(rb_eSocket,
 		 "file descriptor was not passed (msg_controllen=%d smaller than sizeof(struct cmsghdr)=%d)",
 		 (int)arg.msg.msg_controllen, (int)sizeof(struct cmsghdr));
@@ -406,11 +455,7 @@ unix_recv_io(int argc, VALUE *argv, VALUE sock)
 #endif
 
     rb_update_max_fd(fd);
-
-    if (rsock_cmsg_cloexec_state < 0)
-	rsock_cmsg_cloexec_state = rsock_detect_cloexec(fd);
-    if (rsock_cmsg_cloexec_state == 0 || fd <= 2)
-	rb_maygvl_fd_fix_cloexec(fd);
+    rb_maygvl_fd_fix_cloexec(fd);
 
     if (klass == Qnil)
 	return INT2FIX(fd);
@@ -422,7 +467,7 @@ unix_recv_io(int argc, VALUE *argv, VALUE sock)
 	ff_argc = mode == Qnil ? 1 : 2;
 	ff_argv[0] = INT2FIX(fd);
 	ff_argv[1] = mode;
-        return rb_funcall2(klass, for_fd, ff_argc, ff_argv);
+        return rb_funcallv(klass, for_fd, ff_argc, ff_argv);
     }
 }
 #else
diff --git a/ext/stringio/depend b/ext/stringio/depend
index db356dd6e0..5f4b0b53c0 100644
--- a/ext/stringio/depend
+++ b/ext/stringio/depend
@@ -1,4 +1,167 @@
-stringio.o: stringio.c $(HDRS) $(ruby_headers) \
-  $(hdrdir)/ruby/io.h \
-  $(hdrdir)/ruby/encoding.h \
-  $(hdrdir)/ruby/oniguruma.h
+# AUTOGENERATED DEPENDENCIES START
+stringio.o: $(RUBY_EXTCONF_H)
+stringio.o: $(arch_hdrdir)/ruby/config.h
+stringio.o: $(hdrdir)/ruby.h
+stringio.o: $(hdrdir)/ruby/internal/anyargs.h
+stringio.o: $(hdrdir)/ruby/internal/arithmetic.h
+stringio.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+stringio.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+stringio.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+stringio.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+stringio.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+stringio.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+stringio.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+stringio.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+stringio.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+stringio.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+stringio.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+stringio.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+stringio.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+stringio.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+stringio.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+stringio.o: $(hdrdir)/ruby/internal/assume.h
+stringio.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+stringio.o: $(hdrdir)/ruby/internal/attr/artificial.h
+stringio.o: $(hdrdir)/ruby/internal/attr/cold.h
+stringio.o: $(hdrdir)/ruby/internal/attr/const.h
+stringio.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+stringio.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+stringio.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+stringio.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+stringio.o: $(hdrdir)/ruby/internal/attr/error.h
+stringio.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+stringio.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+stringio.o: $(hdrdir)/ruby/internal/attr/format.h
+stringio.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+stringio.o: $(hdrdir)/ruby/internal/attr/noalias.h
+stringio.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+stringio.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+stringio.o: $(hdrdir)/ruby/internal/attr/noinline.h
+stringio.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+stringio.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+stringio.o: $(hdrdir)/ruby/internal/attr/pure.h
+stringio.o: $(hdrdir)/ruby/internal/attr/restrict.h
+stringio.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+stringio.o: $(hdrdir)/ruby/internal/attr/warning.h
+stringio.o: $(hdrdir)/ruby/internal/attr/weakref.h
+stringio.o: $(hdrdir)/ruby/internal/cast.h
+stringio.o: $(hdrdir)/ruby/internal/compiler_is.h
+stringio.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+stringio.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+stringio.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+stringio.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+stringio.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+stringio.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+stringio.o: $(hdrdir)/ruby/internal/compiler_since.h
+stringio.o: $(hdrdir)/ruby/internal/config.h
+stringio.o: $(hdrdir)/ruby/internal/constant_p.h
+stringio.o: $(hdrdir)/ruby/internal/core.h
+stringio.o: $(hdrdir)/ruby/internal/core/rarray.h
+stringio.o: $(hdrdir)/ruby/internal/core/rbasic.h
+stringio.o: $(hdrdir)/ruby/internal/core/rbignum.h
+stringio.o: $(hdrdir)/ruby/internal/core/rclass.h
+stringio.o: $(hdrdir)/ruby/internal/core/rdata.h
+stringio.o: $(hdrdir)/ruby/internal/core/rfile.h
+stringio.o: $(hdrdir)/ruby/internal/core/rhash.h
+stringio.o: $(hdrdir)/ruby/internal/core/robject.h
+stringio.o: $(hdrdir)/ruby/internal/core/rregexp.h
+stringio.o: $(hdrdir)/ruby/internal/core/rstring.h
+stringio.o: $(hdrdir)/ruby/internal/core/rstruct.h
+stringio.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+stringio.o: $(hdrdir)/ruby/internal/ctype.h
+stringio.o: $(hdrdir)/ruby/internal/dllexport.h
+stringio.o: $(hdrdir)/ruby/internal/dosish.h
+stringio.o: $(hdrdir)/ruby/internal/error.h
+stringio.o: $(hdrdir)/ruby/internal/eval.h
+stringio.o: $(hdrdir)/ruby/internal/event.h
+stringio.o: $(hdrdir)/ruby/internal/fl_type.h
+stringio.o: $(hdrdir)/ruby/internal/gc.h
+stringio.o: $(hdrdir)/ruby/internal/glob.h
+stringio.o: $(hdrdir)/ruby/internal/globals.h
+stringio.o: $(hdrdir)/ruby/internal/has/attribute.h
+stringio.o: $(hdrdir)/ruby/internal/has/builtin.h
+stringio.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+stringio.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+stringio.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+stringio.o: $(hdrdir)/ruby/internal/has/extension.h
+stringio.o: $(hdrdir)/ruby/internal/has/feature.h
+stringio.o: $(hdrdir)/ruby/internal/has/warning.h
+stringio.o: $(hdrdir)/ruby/internal/intern/array.h
+stringio.o: $(hdrdir)/ruby/internal/intern/bignum.h
+stringio.o: $(hdrdir)/ruby/internal/intern/class.h
+stringio.o: $(hdrdir)/ruby/internal/intern/compar.h
+stringio.o: $(hdrdir)/ruby/internal/intern/complex.h
+stringio.o: $(hdrdir)/ruby/internal/intern/cont.h
+stringio.o: $(hdrdir)/ruby/internal/intern/dir.h
+stringio.o: $(hdrdir)/ruby/internal/intern/enum.h
+stringio.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+stringio.o: $(hdrdir)/ruby/internal/intern/error.h
+stringio.o: $(hdrdir)/ruby/internal/intern/eval.h
+stringio.o: $(hdrdir)/ruby/internal/intern/file.h
+stringio.o: $(hdrdir)/ruby/internal/intern/gc.h
+stringio.o: $(hdrdir)/ruby/internal/intern/hash.h
+stringio.o: $(hdrdir)/ruby/internal/intern/io.h
+stringio.o: $(hdrdir)/ruby/internal/intern/load.h
+stringio.o: $(hdrdir)/ruby/internal/intern/marshal.h
+stringio.o: $(hdrdir)/ruby/internal/intern/numeric.h
+stringio.o: $(hdrdir)/ruby/internal/intern/object.h
+stringio.o: $(hdrdir)/ruby/internal/intern/parse.h
+stringio.o: $(hdrdir)/ruby/internal/intern/proc.h
+stringio.o: $(hdrdir)/ruby/internal/intern/process.h
+stringio.o: $(hdrdir)/ruby/internal/intern/random.h
+stringio.o: $(hdrdir)/ruby/internal/intern/range.h
+stringio.o: $(hdrdir)/ruby/internal/intern/rational.h
+stringio.o: $(hdrdir)/ruby/internal/intern/re.h
+stringio.o: $(hdrdir)/ruby/internal/intern/ruby.h
+stringio.o: $(hdrdir)/ruby/internal/intern/select.h
+stringio.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+stringio.o: $(hdrdir)/ruby/internal/intern/signal.h
+stringio.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+stringio.o: $(hdrdir)/ruby/internal/intern/string.h
+stringio.o: $(hdrdir)/ruby/internal/intern/struct.h
+stringio.o: $(hdrdir)/ruby/internal/intern/thread.h
+stringio.o: $(hdrdir)/ruby/internal/intern/time.h
+stringio.o: $(hdrdir)/ruby/internal/intern/variable.h
+stringio.o: $(hdrdir)/ruby/internal/intern/vm.h
+stringio.o: $(hdrdir)/ruby/internal/interpreter.h
+stringio.o: $(hdrdir)/ruby/internal/iterator.h
+stringio.o: $(hdrdir)/ruby/internal/memory.h
+stringio.o: $(hdrdir)/ruby/internal/method.h
+stringio.o: $(hdrdir)/ruby/internal/module.h
+stringio.o: $(hdrdir)/ruby/internal/newobj.h
+stringio.o: $(hdrdir)/ruby/internal/rgengc.h
+stringio.o: $(hdrdir)/ruby/internal/scan_args.h
+stringio.o: $(hdrdir)/ruby/internal/special_consts.h
+stringio.o: $(hdrdir)/ruby/internal/static_assert.h
+stringio.o: $(hdrdir)/ruby/internal/stdalign.h
+stringio.o: $(hdrdir)/ruby/internal/stdbool.h
+stringio.o: $(hdrdir)/ruby/internal/symbol.h
+stringio.o: $(hdrdir)/ruby/internal/token_paste.h
+stringio.o: $(hdrdir)/ruby/internal/value.h
+stringio.o: $(hdrdir)/ruby/internal/value_type.h
+stringio.o: $(hdrdir)/ruby/internal/variable.h
+stringio.o: $(hdrdir)/ruby/internal/warning_push.h
+stringio.o: $(hdrdir)/ruby/internal/xmalloc.h
+stringio.o: $(hdrdir)/ruby/assert.h
+stringio.o: $(hdrdir)/ruby/backward.h
+stringio.o: $(hdrdir)/ruby/backward/2/assume.h
+stringio.o: $(hdrdir)/ruby/backward/2/attributes.h
+stringio.o: $(hdrdir)/ruby/backward/2/bool.h
+stringio.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+stringio.o: $(hdrdir)/ruby/backward/2/inttypes.h
+stringio.o: $(hdrdir)/ruby/backward/2/limits.h
+stringio.o: $(hdrdir)/ruby/backward/2/long_long.h
+stringio.o: $(hdrdir)/ruby/backward/2/stdalign.h
+stringio.o: $(hdrdir)/ruby/backward/2/stdarg.h
+stringio.o: $(hdrdir)/ruby/defines.h
+stringio.o: $(hdrdir)/ruby/encoding.h
+stringio.o: $(hdrdir)/ruby/intern.h
+stringio.o: $(hdrdir)/ruby/io.h
+stringio.o: $(hdrdir)/ruby/missing.h
+stringio.o: $(hdrdir)/ruby/onigmo.h
+stringio.o: $(hdrdir)/ruby/oniguruma.h
+stringio.o: $(hdrdir)/ruby/ruby.h
+stringio.o: $(hdrdir)/ruby/st.h
+stringio.o: $(hdrdir)/ruby/subst.h
+stringio.o: stringio.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/stringio/extconf.rb b/ext/stringio/extconf.rb
index ad8650dce2..a933159766 100644
--- a/ext/stringio/extconf.rb
+++ b/ext/stringio/extconf.rb
@@ -1,3 +1,4 @@
 # frozen_string_literal: false
 require 'mkmf'
+have_func("rb_io_extract_modeenc", "ruby/io.h")
 create_makefile('stringio')
diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c
index f35c702d0a..12930b3575 100644
--- a/ext/stringio/stringio.c
+++ b/ext/stringio/stringio.c
@@ -1,3 +1,4 @@
+/* -*- mode: c; indent-tabs-mode: t -*- */
 /**********************************************************************
 
   stringio.c -
@@ -11,6 +12,8 @@
 
 **********************************************************************/
 
+#define STRINGIO_VERSION "3.0.1.1"
+
 #include "ruby.h"
 #include "ruby/io.h"
 #include "ruby/encoding.h"
@@ -20,6 +23,90 @@
 #include <sys/fcntl.h>
 #endif
 
+#ifndef RB_INTEGER_TYPE_P
+# define RB_INTEGER_TYPE_P(c) (FIXNUM_P(c) || RB_TYPE_P(c, T_BIGNUM))
+#endif
+
+#ifndef RB_PASS_CALLED_KEYWORDS
+# define rb_funcallv_kw(recv, mid, arg, argv, kw_splat) rb_funcallv(recv, mid, arg, argv)
+# define rb_class_new_instance_kw(argc, argv, klass, kw_splat) rb_class_new_instance(argc, argv, klass)
+#endif
+
+#ifndef HAVE_RB_IO_EXTRACT_MODEENC
+#define rb_io_extract_modeenc strio_extract_modeenc
+static void
+strio_extract_modeenc(VALUE *vmode_p, VALUE *vperm_p, VALUE opthash,
+		      int *oflags_p, int *fmode_p, struct rb_io_enc_t *convconfig_p)
+{
+    VALUE mode = *vmode_p;
+    VALUE intmode;
+    int fmode;
+    int has_enc = 0, has_vmode = 0;
+
+    convconfig_p->enc = convconfig_p->enc2 = 0;
+
+  vmode_handle:
+    if (NIL_P(mode)) {
+	fmode = FMODE_READABLE;
+    }
+    else if (!NIL_P(intmode = rb_check_to_integer(mode, "to_int"))) {
+	int flags = NUM2INT(intmode);
+	fmode = rb_io_oflags_fmode(flags);
+    }
+    else {
+	const char *m = StringValueCStr(mode), *n, *e;
+	fmode = rb_io_modestr_fmode(m);
+	n = strchr(m, ':');
+	if (n) {
+	    long len;
+	    char encname[ENCODING_MAXNAMELEN+1];
+	    has_enc = 1;
+	    if (fmode & FMODE_SETENC_BY_BOM) {
+		n = strchr(n, '|');
+	    }
+	    e = strchr(++n, ':');
+	    len = e ? e - n : (long)strlen(n);
+	    if (len > 0 && len <= ENCODING_MAXNAMELEN) {
+		if (e) {
+		    memcpy(encname, n, len);
+		    encname[len] = '\0';
+		    n = encname;
+		}
+		convconfig_p->enc = rb_enc_find(n);
+	    }
+	    if (e && (len = strlen(++e)) > 0 && len <= ENCODING_MAXNAMELEN) {
+		convconfig_p->enc2 = rb_enc_find(e);
+	    }
+	}
+    }
+
+    if (!NIL_P(opthash)) {
+	rb_encoding *extenc = 0, *intenc = 0;
+	VALUE v;
+	if (!has_vmode) {
+	    ID id_mode;
+	    CONST_ID(id_mode, "mode");
+	    v = rb_hash_aref(opthash, ID2SYM(id_mode));
+	    if (!NIL_P(v)) {
+		if (!NIL_P(mode)) {
+		    rb_raise(rb_eArgError, "mode specified twice");
+		}
+		has_vmode = 1;
+		mode = v;
+		goto vmode_handle;
+	    }
+	}
+
+	if (rb_io_extract_encoding_option(opthash, &extenc, &intenc, &fmode)) {
+	    if (has_enc) {
+		rb_raise(rb_eArgError, "encoding specified twice");
+	    }
+	}
+    }
+    *fmode_p = fmode;
+}
+#endif
+
 struct StringIO {
     VALUE string;
     rb_encoding *enc;
@@ -31,6 +118,7 @@ struct StringIO {
 
 static VALUE strio_init(int, VALUE *, struct StringIO *, VALUE);
 static VALUE strio_unget_bytes(struct StringIO *, const char *, long);
+static long strio_write(VALUE self, VALUE str);
 
 #define IS_STRIO(obj) (rb_typeddata_is_kind_of((obj), &strio_data_type))
 #define error_inval(msg) (rb_syserr_fail(EINVAL, msg))
@@ -52,9 +140,8 @@ static void
 strio_mark(void *p)
 {
     struct StringIO *ptr = p;
-    if (ptr) {
-	rb_gc_mark(ptr->string);
-    }
+
+    rb_gc_mark(ptr->string);
 }
 
 static void
@@ -104,15 +191,14 @@ enc_subseq(VALUE str, long pos, long len, rb_encoding *enc)
 }
 
 static VALUE
-strio_substr(struct StringIO *ptr, long pos, long len)
+strio_substr(struct StringIO *ptr, long pos, long len, rb_encoding *enc)
 {
     VALUE str = ptr->string;
-    rb_encoding *enc = get_enc(ptr);
     long rlen = RSTRING_LEN(str) - pos;
 
     if (len > rlen) len = rlen;
     if (len < 0) len = 0;
-    if (len == 0) return rb_str_new(0,0);
+    if (len == 0) return rb_enc_str_new(0, 0, enc);
     return enc_subseq(str, pos, len, enc);
 }
 
@@ -182,45 +268,111 @@ strio_initialize(int argc, VALUE *argv, VALUE self)
     return strio_init(argc, argv, ptr, self);
 }
 
-static VALUE
-strio_init(int argc, VALUE *argv, struct StringIO *ptr, VALUE self)
+static int
+detect_bom(VALUE str, int *bomlen)
 {
-    VALUE string, mode;
-    int trunc = 0;
+    const char *p;
+    long len;
 
-    switch (rb_scan_args(argc, argv, "02", &string, &mode)) {
-      case 2:
-	if (FIXNUM_P(mode)) {
-	    int flags = FIX2INT(mode);
-	    ptr->flags = rb_io_oflags_fmode(flags);
-	    trunc = flags & O_TRUNC;
+    RSTRING_GETMEM(str, p, len);
+    if (len < 1) return 0;
+    switch ((unsigned char)p[0]) {
+      case 0xEF:
+	if (len < 2) break;
+	if ((unsigned char)p[1] == 0xBB && len > 2) {
+	    if ((unsigned char)p[2] == 0xBF) {
+		*bomlen = 3;
+		return rb_utf8_encindex();
+	    }
 	}
-	else {
-	    const char *m = StringValueCStr(mode);
-	    ptr->flags = rb_io_modestr_fmode(m);
-	    trunc = *m == 'w';
+	break;
+
+      case 0xFE:
+	if (len < 2) break;
+	if ((unsigned char)p[1] == 0xFF) {
+	    *bomlen = 2;
+	    return rb_enc_find_index("UTF-16BE");
 	}
-	StringValue(string);
-	if ((ptr->flags & FMODE_WRITABLE) && OBJ_FROZEN(string)) {
-	    rb_syserr_fail(EACCES, 0);
+	break;
+
+      case 0xFF:
+	if (len < 2) break;
+	if ((unsigned char)p[1] == 0xFE) {
+	    if (len >= 4 && (unsigned char)p[2] == 0 && (unsigned char)p[3] == 0) {
+		*bomlen = 4;
+		return rb_enc_find_index("UTF-32LE");
+	    }
+	    *bomlen = 2;
+	    return rb_enc_find_index("UTF-16LE");
 	}
-	if (trunc) {
-	    rb_str_resize(string, 0);
+	break;
+
+      case 0:
+	if (len < 4) break;
+	if ((unsigned char)p[1] == 0 && (unsigned char)p[2] == 0xFE && (unsigned char)p[3] == 0xFF) {
+	    *bomlen = 4;
+	    return rb_enc_find_index("UTF-32BE");
 	}
 	break;
-      case 1:
+    }
+    return 0;
+}
+
+static rb_encoding *
+set_encoding_by_bom(struct StringIO *ptr)
+{
+    int bomlen, idx = detect_bom(ptr->string, &bomlen);
+    rb_encoding *extenc = NULL;
+
+    if (idx) {
+	extenc = rb_enc_from_index(idx);
+	ptr->pos = bomlen;
+	if (ptr->flags & FMODE_WRITABLE) {
+	    rb_enc_associate_index(ptr->string, idx);
+	}
+    }
+    ptr->enc = extenc;
+    return extenc;
+}
+
+static VALUE
+strio_init(int argc, VALUE *argv, struct StringIO *ptr, VALUE self)
+{
+    VALUE string, vmode, opt;
+    int oflags;
+    struct rb_io_enc_t convconfig;
+
+    argc = rb_scan_args(argc, argv, "02:", &string, &vmode, &opt);
+    rb_io_extract_modeenc(&vmode, 0, opt, &oflags, &ptr->flags, &convconfig);
+    if (argc) {
 	StringValue(string);
-	ptr->flags = OBJ_FROZEN(string) ? FMODE_READABLE : FMODE_READWRITE;
-	break;
-      case 0:
+    }
+    else {
 	string = rb_enc_str_new("", 0, rb_default_external_encoding());
-	ptr->flags = FMODE_READWRITE;
-	break;
+    }
+    if (OBJ_FROZEN_RAW(string)) {
+	if (ptr->flags & FMODE_WRITABLE) {
+	    rb_syserr_fail(EACCES, 0);
+	}
+    }
+    else {
+	if (NIL_P(vmode)) {
+	    ptr->flags |= FMODE_WRITABLE;
+	}
+    }
+    if (ptr->flags & FMODE_TRUNC) {
+	rb_str_resize(string, 0);
     }
     ptr->string = string;
-    ptr->enc = 0;
+    if (argc == 1) {
+	ptr->enc = rb_enc_get(string);
+    }
+    else {
+	ptr->enc = convconfig.enc;
+    }
     ptr->pos = 0;
     ptr->lineno = 0;
+    if (ptr->flags & FMODE_SETENC_BY_BOM) set_encoding_by_bom(ptr);
     RBASIC(self)->flags |= (ptr->flags & FMODE_READWRITE) * (STRIO_READABLE / FMODE_READABLE);
     return self;
 }
@@ -244,7 +396,7 @@ strio_finalize(VALUE self)
 static VALUE
 strio_s_open(int argc, VALUE *argv, VALUE klass)
 {
-    VALUE obj = rb_class_new_instance(argc, argv, klass);
+    VALUE obj = rb_class_new_instance_kw(argc, argv, klass, RB_PASS_CALLED_KEYWORDS);
     if (!rb_block_given_p()) return obj;
     return rb_ensure(rb_yield, obj, strio_finalize, obj);
 }
@@ -259,7 +411,7 @@ strio_s_new(int argc, VALUE *argv, VALUE klass)
 	rb_warn("%"PRIsVALUE"::new() does not take block; use %"PRIsVALUE"::open() instead",
 		cname, cname);
     }
-    return rb_class_new_instance(argc, argv, klass);
+    return rb_class_new_instance_kw(argc, argv, klass, RB_PASS_CALLED_KEYWORDS);
 }
 
 /*
@@ -283,7 +435,7 @@ strio_nil(VALUE self)
 }
 
 /*
- * Returns *strio* itself.  Just for compatibility to IO.
+ * Returns an object itself.  Just for compatibility to IO.
  */
 static VALUE
 strio_self(VALUE self)
@@ -359,7 +511,7 @@ strio_set_string(VALUE self, VALUE string)
  * call-seq:
  *   strio.close  -> nil
  *
- * Closes strio.  The *strio* is unavailable for any further data
+ * Closes a StringIO. The stream is unavailable for any further data
  * operations; an +IOError+ is raised if such an attempt is made.
  */
 static VALUE
@@ -375,7 +527,7 @@ strio_close(VALUE self)
  *   strio.close_read    -> nil
  *
  * Closes the read end of a StringIO.  Will raise an +IOError+ if the
- * *strio* is not readable.
+ * receiver is not readable.
  */
 static VALUE
 strio_close_read(VALUE self)
@@ -393,7 +545,7 @@ strio_close_read(VALUE self)
  *   strio.close_write    -> nil
  *
  * Closes the write end of a StringIO.  Will raise an  +IOError+ if the
- * *strio* is not writeable.
+ * receiver is not writeable.
  */
 static VALUE
 strio_close_write(VALUE self)
@@ -410,7 +562,7 @@ strio_close_write(VALUE self)
  * call-seq:
  *   strio.closed?    -> true or false
  *
- * Returns +true+ if *strio* is completely closed, +false+ otherwise.
+ * Returns +true+ if the stream is completely closed, +false+ otherwise.
  */
 static VALUE
 strio_closed(VALUE self)
@@ -424,7 +576,7 @@ strio_closed(VALUE self)
  * call-seq:
  *   strio.closed_read?    -> true or false
  *
- * Returns +true+ if *strio* is not readable, +false+ otherwise.
+ * Returns +true+ if the stream is not readable, +false+ otherwise.
  */
 static VALUE
 strio_closed_read(VALUE self)
@@ -438,7 +590,7 @@ strio_closed_read(VALUE self)
  * call-seq:
  *   strio.closed_write?    -> true or false
  *
- * Returns +true+ if *strio* is not writable, +false+ otherwise.
+ * Returns +true+ if the stream is not writable, +false+ otherwise.
  */
 static VALUE
 strio_closed_write(VALUE self)
@@ -448,19 +600,26 @@ strio_closed_write(VALUE self)
     return Qtrue;
 }
 
+static struct StringIO *
+strio_to_read(VALUE self)
+{
+    struct StringIO *ptr = readable(self);
+    if (ptr->pos < RSTRING_LEN(ptr->string)) return ptr;
+    return NULL;
+}
+
 /*
  * call-seq:
  *   strio.eof     -> true or false
  *   strio.eof?    -> true or false
  *
- * Returns true if *strio* is at end of file. The stringio must be
- * opened for reading or an +IOError+ will be raised.
+ * Returns true if the stream is at the end of the data (underlying string).
+ * The stream must be opened for reading or an +IOError+ will be raised.
  */
 static VALUE
 strio_eof(VALUE self)
 {
-    struct StringIO *ptr = readable(self);
-    if (ptr->pos < RSTRING_LEN(ptr->string)) return Qfalse;
+    if (strio_to_read(self)) return Qfalse;
     return Qtrue;
 }
 
@@ -477,7 +636,6 @@ strio_copy(VALUE copy, VALUE orig)
 	strio_free(DATA_PTR(copy));
     }
     DATA_PTR(copy) = ptr;
-    OBJ_INFECT(copy, orig);
     RBASIC(copy)->flags &= ~STRIO_READWRITE;
     RBASIC(copy)->flags |= RBASIC(orig)->flags & STRIO_READWRITE;
     ++ptr->count;
@@ -488,7 +646,7 @@ strio_copy(VALUE copy, VALUE orig)
  * call-seq:
  *   strio.lineno    -> integer
  *
- * Returns the current line number in *strio*. The stringio must be
+ * Returns the current line number. The stream must be
  * opened for reading. +lineno+ counts the number of times  +gets+ is
  * called, rather than the number of newlines  encountered. The two
  * values will differ if +gets+ is  called with a separator other than
@@ -514,6 +672,13 @@ strio_set_lineno(VALUE self, VALUE lineno)
     return lineno;
 }
 
+/*
+ * call-seq:
+ *   strio.binmode    -> stringio
+ *
+ * Puts stream into binary mode. See IO#binmode.
+ *
+ */
 static VALUE
 strio_binmode(VALUE self)
 {
@@ -538,7 +703,7 @@ strio_binmode(VALUE self)
  *   strio.reopen(other_StrIO)     -> strio
  *   strio.reopen(string, mode)    -> strio
  *
- * Reinitializes *strio* with the given <i>other_StrIO</i> or _string_
+ * Reinitializes the stream with the given <i>other_StrIO</i> or _string_
  * and _mode_ (see StringIO#new).
  */
 static VALUE
@@ -556,7 +721,7 @@ strio_reopen(int argc, VALUE *argv, VALUE self)
  *   strio.pos     -> integer
  *   strio.tell    -> integer
  *
- * Returns the current offset (in bytes) of *strio*.
+ * Returns the current offset (in bytes).
  */
 static VALUE
 strio_get_pos(VALUE self)
@@ -568,7 +733,7 @@ strio_get_pos(VALUE self)
  * call-seq:
  *   strio.pos = integer    -> integer
  *
- * Seeks to the given position (in bytes) in *strio*.
+ * Seeks to the given position (in bytes).
  */
 static VALUE
 strio_set_pos(VALUE self, VALUE pos)
@@ -586,7 +751,7 @@ strio_set_pos(VALUE self, VALUE pos)
  * call-seq:
  *   strio.rewind    -> 0
  *
- * Positions *strio* to the beginning of input, resetting
+ * Positions the stream to the beginning of input, resetting
  * +lineno+ to zero.
  */
 static VALUE
@@ -610,29 +775,30 @@ strio_seek(int argc, VALUE *argv, VALUE self)
 {
     VALUE whence;
     struct StringIO *ptr = StringIO(self);
-    long offset;
+    long amount, offset;
 
     rb_scan_args(argc, argv, "11", NULL, &whence);
-    offset = NUM2LONG(argv[0]);
+    amount = NUM2LONG(argv[0]);
     if (CLOSED(self)) {
 	rb_raise(rb_eIOError, "closed stream");
     }
     switch (NIL_P(whence) ? 0 : NUM2LONG(whence)) {
       case 0:
+	offset = 0;
 	break;
       case 1:
-	offset += ptr->pos;
+	offset = ptr->pos;
 	break;
       case 2:
-	offset += RSTRING_LEN(ptr->string);
+	offset = RSTRING_LEN(ptr->string);
 	break;
       default:
 	error_inval("invalid whence");
     }
-    if (offset < 0) {
+    if (amount > LONG_MAX - offset || amount + offset < 0) {
 	error_inval(0);
     }
-    ptr->pos = offset;
+    ptr->pos = amount + offset;
     return INT2FIX(0);
 }
 
@@ -663,11 +829,11 @@ strio_get_sync(VALUE self)
 static VALUE
 strio_each_byte(VALUE self)
 {
-    struct StringIO *ptr = readable(self);
+    struct StringIO *ptr;
 
     RETURN_ENUMERATOR(self, 0, 0);
 
-    while (ptr->pos < RSTRING_LEN(ptr->string)) {
+    while ((ptr = strio_to_read(self)) != NULL) {
 	char c = RSTRING_PTR(ptr->string)[ptr->pos++];
 	rb_yield(CHR2FIX(c));
     }
@@ -675,18 +841,6 @@ strio_each_byte(VALUE self)
 }
 
 /*
- *  This is a deprecated alias for #each_byte.
- */
-static VALUE
-strio_bytes(VALUE self)
-{
-    rb_warn("StringIO#bytes is deprecated; use #each_byte instead");
-    if (!rb_block_given_p())
-	return rb_enumeratorize(self, ID2SYM(rb_intern("each_byte")), 0, 0);
-    return strio_each_byte(self);
-}
-
-/*
  * call-seq:
  *   strio.getc   -> string or nil
  *
@@ -734,6 +888,9 @@ strio_extend(struct StringIO *ptr, long pos, long len)
 {
     long olen;
 
+    if (len > LONG_MAX - pos)
+	rb_raise(rb_eArgError, "string size too big");
+
     check_modifiable(ptr);
     olen = RSTRING_LEN(ptr->string);
     if (pos + len > olen) {
@@ -750,7 +907,7 @@ strio_extend(struct StringIO *ptr, long pos, long len)
  * call-seq:
  *   strio.ungetc(string)   -> nil
  *
- * Pushes back one character (passed as a parameter) onto *strio*
+ * Pushes back one character (passed as a parameter)
  * such that a subsequent buffered read will return it.  There is no
  * limitation for multiple pushbacks including pushing back behind the
  * beginning of the buffer string.
@@ -763,13 +920,15 @@ strio_ungetc(VALUE self, VALUE c)
 
     check_modifiable(ptr);
     if (NIL_P(c)) return Qnil;
-    if (FIXNUM_P(c)) {
-	int cc = FIX2INT(c);
+    if (RB_INTEGER_TYPE_P(c)) {
+	int len, cc = NUM2INT(c);
 	char buf[16];
 
 	enc = rb_enc_get(ptr->string);
+	len = rb_enc_codelen(cc, enc);
+	if (len <= 0) rb_enc_uint_chr(cc, enc);
 	rb_enc_mbcput(cc, buf, enc);
-	return strio_unget_bytes(ptr, buf, rb_enc_codelen(cc, enc));
+	return strio_unget_bytes(ptr, buf, len);
     }
     else {
 	SafeStringValue(c);
@@ -794,24 +953,25 @@ static VALUE
 strio_ungetbyte(VALUE self, VALUE c)
 {
     struct StringIO *ptr = readable(self);
-    char buf[1], *cp = buf;
-    long cl = 1;
 
     check_modifiable(ptr);
     if (NIL_P(c)) return Qnil;
-    if (FIXNUM_P(c)) {
-	buf[0] = (char)FIX2INT(c);
-	return strio_unget_bytes(ptr, buf, 1);
+    if (RB_INTEGER_TYPE_P(c)) {
+        /* rb_int_and() not visible from exts */
+        VALUE v = rb_funcall(c, '&', 1, INT2FIX(0xff));
+        const char cc = NUM2INT(v) & 0xFF;
+        strio_unget_bytes(ptr, &cc, 1);
     }
     else {
+	long cl;
 	SafeStringValue(c);
-	cp = RSTRING_PTR(c);
 	cl = RSTRING_LEN(c);
-	if (cl == 0) return Qnil;
-	strio_unget_bytes(ptr, cp, cl);
-	RB_GC_GUARD(c);
-	return Qnil;
+	if (cl > 0) {
+	    strio_unget_bytes(ptr, RSTRING_PTR(c), cl);
+	    RB_GC_GUARD(c);
+	}
     }
+    return Qnil;
 }
 
 static VALUE
@@ -824,7 +984,7 @@ strio_unget_bytes(struct StringIO *ptr, const char *cp, long cl)
     len = RSTRING_LEN(str);
     rest = pos - len;
     if (cl > pos) {
-	long ex = (rest < 0 ? cl-pos : cl+rest);
+	long ex = cl - (rest < 0 ? pos : len);
 	rb_str_modify_expand(str, ex);
 	rb_str_set_len(str, len + ex);
 	s = RSTRING_PTR(str);
@@ -854,7 +1014,7 @@ strio_unget_bytes(struct StringIO *ptr, const char *cp, long cl)
 static VALUE
 strio_readchar(VALUE self)
 {
-    VALUE c = rb_funcall2(self, rb_intern("getc"), 0, 0);
+    VALUE c = rb_funcallv(self, rb_intern("getc"), 0, 0);
     if (NIL_P(c)) rb_eof_error();
     return c;
 }
@@ -868,7 +1028,7 @@ strio_readchar(VALUE self)
 static VALUE
 strio_readbyte(VALUE self)
 {
-    VALUE c = rb_funcall2(self, rb_intern("getbyte"), 0, 0);
+    VALUE c = rb_funcallv(self, rb_intern("getbyte"), 0, 0);
     if (NIL_P(c)) rb_eof_error();
     return c;
 }
@@ -894,18 +1054,6 @@ strio_each_char(VALUE self)
 }
 
 /*
- *  This is a deprecated alias for <code>each_char</code>.
- */
-static VALUE
-strio_chars(VALUE self)
-{
-    rb_warn("StringIO#chars is deprecated; use #each_char instead");
-    if (!rb_block_given_p())
-	return rb_enumeratorize(self, ID2SYM(rb_intern("each_char")), 0, 0);
-    return strio_each_char(self);
-}
-
-/*
  * call-seq:
  *   strio.each_codepoint {|c| block }  -> strio
  *   strio.each_codepoint               -> anEnumerator
@@ -924,31 +1072,15 @@ strio_each_codepoint(VALUE self)
 
     ptr = readable(self);
     enc = get_enc(ptr);
-    for (;;) {
-	if (ptr->pos >= RSTRING_LEN(ptr->string)) {
-	    return self;
-	}
-
+    while ((ptr = strio_to_read(self)) != NULL) {
 	c = rb_enc_codepoint_len(RSTRING_PTR(ptr->string)+ptr->pos,
 				 RSTRING_END(ptr->string), &n, enc);
-	rb_yield(UINT2NUM(c));
 	ptr->pos += n;
+	rb_yield(UINT2NUM(c));
     }
     return self;
 }
 
-/*
- *  This is a deprecated alias for <code>each_codepoint</code>.
- */
-static VALUE
-strio_codepoints(VALUE self)
-{
-    rb_warn("StringIO#codepoints is deprecated; use #each_codepoint instead");
-    if (!rb_block_given_p())
-	return rb_enumeratorize(self, ID2SYM(rb_intern("each_codepoint")), 0, 0);
-    return strio_each_codepoint(self);
-}
-
 /* Boyer-Moore search: copied from regex.c */
 static void
 bm_init_skip(long *skip, const char *pat, long m)
@@ -982,14 +1114,19 @@ bm_search(const char *little, long llen, const char *big, long blen, const long
     return -1;
 }
 
-static VALUE
-strio_getline(int argc, VALUE *argv, struct StringIO *ptr)
+struct getline_arg {
+    VALUE rs;
+    long limit;
+    unsigned int chomp: 1;
+};
+
+static struct getline_arg *
+prepare_getline_args(struct getline_arg *arg, int argc, VALUE *argv)
 {
-    const char *s, *e, *p;
-    long n, limit = 0;
-    VALUE str, lim;
+    VALUE str, lim, opts;
+    long limit = -1;
 
-    rb_scan_args(argc, argv, "02", &str, &lim);
+    argc = rb_scan_args(argc, argv, "02:", &str, &lim, &opts);
     switch (argc) {
       case 0:
 	str = rb_rs;
@@ -1000,7 +1137,6 @@ strio_getline(int argc, VALUE *argv, struct StringIO *ptr)
 	    VALUE 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 {
@@ -1014,6 +1150,39 @@ strio_getline(int argc, VALUE *argv, struct StringIO *ptr)
 	if (!NIL_P(lim)) limit = NUM2LONG(lim);
 	break;
     }
+    arg->rs = str;
+    arg->limit = limit;
+    arg->chomp = 0;
+    if (!NIL_P(opts)) {
+	static ID keywords[1];
+	VALUE vchomp;
+	if (!keywords[0]) {
+	    keywords[0] = rb_intern_const("chomp");
+	}
+	rb_get_kwargs(opts, keywords, 0, 1, &vchomp);
+	arg->chomp = (vchomp != Qundef) && RTEST(vchomp);
+    }
+    return arg;
+}
+
+static inline int
+chomp_newline_width(const char *s, const char *e)
+{
+    if (e > s && *--e == '\n') {
+	if (e > s && *--e == '\r') return 2;
+	return 1;
+    }
+    return 0;
+}
+
+static VALUE
+strio_getline(struct getline_arg *arg, struct StringIO *ptr)
+{
+    const char *s, *e, *p;
+    long n, limit = arg->limit;
+    VALUE str = arg->rs;
+    int w = 0;
+    rb_encoding *enc = get_enc(ptr);
 
     if (ptr->pos >= (n = RSTRING_LEN(ptr->string))) {
 	return Qnil;
@@ -1025,11 +1194,15 @@ strio_getline(int argc, VALUE *argv, struct StringIO *ptr)
 	e = rb_enc_right_char_head(s, s + limit, e, get_enc(ptr));
     }
     if (NIL_P(str)) {
-	str = strio_substr(ptr, ptr->pos, e - s);
+	if (arg->chomp) {
+	    w = chomp_newline_width(s, e);
+	}
+	str = strio_substr(ptr, ptr->pos, e - s - w, enc);
     }
     else if ((n = RSTRING_LEN(str)) == 0) {
 	p = s;
-	while (*p == '\n') {
+	while (p[(p + 1 < e) && (*p == '\r') && 0] == '\n') {
+	    p += *p == '\r';
 	    if (++p == e) {
 		return Qnil;
 	    }
@@ -1038,23 +1211,33 @@ strio_getline(int argc, VALUE *argv, struct StringIO *ptr)
 	while ((p = memchr(p, '\n', e - p)) && (p != e)) {
 	    if (*++p == '\n') {
 		e = p + 1;
+		w = (arg->chomp ? 1 : 0);
+		break;
+	    }
+	    else if (*p == '\r' && p < e && p[1] == '\n') {
+		e = p + 2;
+		w = (arg->chomp ? 2 : 0);
 		break;
 	    }
 	}
-	str = strio_substr(ptr, s - RSTRING_PTR(ptr->string), e - s);
+	if (!w && arg->chomp) {
+	    w = chomp_newline_width(s, e);
+	}
+	str = strio_substr(ptr, s - RSTRING_PTR(ptr->string), e - s - w, enc);
     }
     else if (n == 1) {
 	if ((p = memchr(s, RSTRING_PTR(str)[0], e - s)) != 0) {
 	    e = p + 1;
+	    w = (arg->chomp ? (p > s && *(p-1) == '\r') + 1 : 0);
 	}
-	str = strio_substr(ptr, ptr->pos, e - s);
+	str = strio_substr(ptr, ptr->pos, e - s - w, enc);
     }
     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) {
-			e = p + n;
+			e = p + (arg->chomp ? 0 : n);
 			break;
 		    }
 		}
@@ -1064,11 +1247,11 @@ strio_getline(int argc, VALUE *argv, struct StringIO *ptr)
 		p = RSTRING_PTR(str);
 		bm_init_skip(skip, p, n);
 		if ((pos = bm_search(p, n, s, e - s, skip)) >= 0) {
-		    e = s + pos + n;
+		    e = s + pos + (arg->chomp ? 0 : n);
 		}
 	    }
 	}
-	str = strio_substr(ptr, ptr->pos, e - s);
+	str = strio_substr(ptr, ptr->pos, e - s - w, enc);
     }
     ptr->pos = e - RSTRING_PTR(ptr->string);
     ptr->lineno++;
@@ -1077,48 +1260,55 @@ strio_getline(int argc, VALUE *argv, struct StringIO *ptr)
 
 /*
  * call-seq:
- *   strio.gets(sep=$/)     -> string or nil
- *   strio.gets(limit)      -> string or nil
- *   strio.gets(sep, limit) -> string or nil
+ *   strio.gets(sep=$/, chomp: false)     -> string or nil
+ *   strio.gets(limit, chomp: false)      -> string or nil
+ *   strio.gets(sep, limit, chomp: false) -> string or nil
  *
  * See IO#gets.
  */
 static VALUE
 strio_gets(int argc, VALUE *argv, VALUE self)
 {
-    VALUE str = strio_getline(argc, argv, readable(self));
+    struct getline_arg arg;
+    VALUE str;
 
+    if (prepare_getline_args(&arg, argc, argv)->limit == 0) {
+	struct StringIO *ptr = readable(self);
+	return rb_enc_str_new(0, 0, get_enc(ptr));
+    }
+
+    str = strio_getline(&arg, readable(self));
     rb_lastline_set(str);
     return str;
 }
 
 /*
  * call-seq:
- *   strio.readline(sep=$/)     -> string
- *   strio.readline(limit)      -> string or nil
- *   strio.readline(sep, limit) -> string or nil
+ *   strio.readline(sep=$/, chomp: false)     -> string
+ *   strio.readline(limit, chomp: false)      -> string or nil
+ *   strio.readline(sep, limit, chomp: false) -> string or nil
  *
  * See IO#readline.
  */
 static VALUE
 strio_readline(int argc, VALUE *argv, VALUE self)
 {
-    VALUE line = rb_funcall2(self, rb_intern("gets"), argc, argv);
+    VALUE line = rb_funcallv_kw(self, rb_intern("gets"), argc, argv, RB_PASS_CALLED_KEYWORDS);
     if (NIL_P(line)) rb_eof_error();
     return line;
 }
 
 /*
  * call-seq:
- *   strio.each(sep=$/) {|line| block }         -> strio
- *   strio.each(limit) {|line| block }          -> strio
- *   strio.each(sep, limit) {|line| block }     -> strio
- *   strio.each(...)                            -> anEnumerator
+ *   strio.each(sep=$/, chomp: false) {|line| block }         -> strio
+ *   strio.each(limit, chomp: false) {|line| block }          -> strio
+ *   strio.each(sep, limit, chomp: false) {|line| block }     -> strio
+ *   strio.each(...)                                          -> anEnumerator
  *
- *   strio.each_line(sep=$/) {|line| block }    -> strio
- *   strio.each_line(limit) {|line| block }     -> strio
- *   strio.each_line(sep,limit) {|line| block } -> strio
- *   strio.each_line(...)                       -> anEnumerator
+ *   strio.each_line(sep=$/, chomp: false) {|line| block }     -> strio
+ *   strio.each_line(limit, chomp: false) {|line| block }      -> strio
+ *   strio.each_line(sep, limit, chomp: false) {|line| block } -> strio
+ *   strio.each_line(...)                                      -> anEnumerator
  *
  * See IO#each.
  */
@@ -1126,38 +1316,26 @@ static VALUE
 strio_each(int argc, VALUE *argv, VALUE self)
 {
     VALUE line;
+    struct getline_arg arg;
 
     StringIO(self);
     RETURN_ENUMERATOR(self, argc, argv);
 
-    if (argc > 0 && !NIL_P(argv[argc-1]) && NIL_P(rb_check_string_type(argv[argc-1])) &&
-	NUM2LONG(argv[argc-1]) == 0) {
+    if (prepare_getline_args(&arg, argc, argv)->limit == 0) {
 	rb_raise(rb_eArgError, "invalid limit: 0 for each_line");
     }
 
-    while (!NIL_P(line = strio_getline(argc, argv, readable(self)))) {
+    while (!NIL_P(line = strio_getline(&arg, readable(self)))) {
 	rb_yield(line);
     }
     return self;
 }
 
 /*
- *  This is a deprecated alias for <code>each_line</code>.
- */
-static VALUE
-strio_lines(int argc, VALUE *argv, VALUE self)
-{
-    rb_warn("StringIO#lines is deprecated; use #each_line instead");
-    if (!rb_block_given_p())
-	return rb_enumeratorize(self, ID2SYM(rb_intern("each_line")), argc, argv);
-    return strio_each(argc, argv, self);
-}
-
-/*
  * call-seq:
- *   strio.readlines(sep=$/)    ->   array
- *   strio.readlines(limit)     ->   array
- *   strio.readlines(sep,limit) ->   array
+ *   strio.readlines(sep=$/, chomp: false)     ->   array
+ *   strio.readlines(limit, chomp: false)      ->   array
+ *   strio.readlines(sep, limit, chomp: false) ->   array
  *
  * See IO#readlines.
  */
@@ -1165,15 +1343,15 @@ static VALUE
 strio_readlines(int argc, VALUE *argv, VALUE self)
 {
     VALUE ary, line;
+    struct getline_arg arg;
 
     StringIO(self);
     ary = rb_ary_new();
-    if (argc > 0 && !NIL_P(argv[argc-1]) && NIL_P(rb_check_string_type(argv[argc-1])) &&
-	NUM2LONG(argv[argc-1]) == 0) {
+    if (prepare_getline_args(&arg, argc, argv)->limit == 0) {
 	rb_raise(rb_eArgError, "invalid limit: 0 for readlines");
     }
 
-    while (!NIL_P(line = strio_getline(argc, argv, readable(self)))) {
+    while (!NIL_P(line = strio_getline(&arg, readable(self)))) {
 	rb_ary_push(ary, line);
     }
     return ary;
@@ -1181,31 +1359,47 @@ strio_readlines(int argc, VALUE *argv, VALUE self)
 
 /*
  * call-seq:
- *   strio.write(string)    -> integer
- *   strio.syswrite(string) -> integer
+ *   strio.write(string, ...) -> integer
+ *   strio.syswrite(string)   -> integer
  *
- * Appends the given string to the underlying buffer string of *strio*.
+ * Appends the given string to the underlying buffer string.
  * The stream must be opened for writing.  If the argument is not a
  * string, it will be converted to a string using <code>to_s</code>.
  * Returns the number of bytes written.  See IO#write.
  */
 static VALUE
+strio_write_m(int argc, VALUE *argv, VALUE self)
+{
+    long len = 0;
+    while (argc-- > 0) {
+	/* StringIO can't exceed long limit */
+	len += strio_write(self, *argv++);
+    }
+    return LONG2NUM(len);
+}
+
+static long
 strio_write(VALUE self, VALUE str)
 {
     struct StringIO *ptr = writable(self);
     long len, olen;
     rb_encoding *enc, *enc2;
     rb_encoding *const ascii8bit = rb_ascii8bit_encoding();
+    rb_encoding *usascii = 0;
 
     if (!RB_TYPE_P(str, T_STRING))
 	str = rb_obj_as_string(str);
     enc = get_enc(ptr);
     enc2 = rb_enc_get(str);
-    if (enc != enc2 && enc != ascii8bit) {
-	str = rb_str_conv_enc(str, enc2, enc);
+    if (enc != enc2 && enc != ascii8bit && enc != (usascii = rb_usascii_encoding())) {
+	VALUE converted = rb_str_conv_enc(str, enc2, enc);
+	if (converted == str && enc2 != ascii8bit && enc2 != usascii) { /* conversion failed */
+	    rb_enc_check(rb_enc_from_encoding(enc), str);
+	}
+	str = converted;
     }
     len = RSTRING_LEN(str);
-    if (len == 0) return INT2FIX(0);
+    if (len == 0) return 0;
     check_modifiable(ptr);
     olen = RSTRING_LEN(ptr->string);
     if (ptr->flags & FMODE_APPEND) {
@@ -1214,7 +1408,6 @@ strio_write(VALUE self, VALUE str)
     if (ptr->pos == olen) {
 	if (enc == ascii8bit || enc2 == ascii8bit) {
 	    rb_enc_str_buf_cat(ptr->string, RSTRING_PTR(str), len, enc);
-	    OBJ_INFECT(ptr->string, str);
 	}
 	else {
 	    rb_str_buf_append(ptr->string, str);
@@ -1223,12 +1416,10 @@ strio_write(VALUE self, VALUE str)
     else {
 	strio_extend(ptr, ptr->pos, len);
 	memmove(RSTRING_PTR(ptr->string)+ptr->pos, RSTRING_PTR(str), len);
-	OBJ_INFECT(ptr->string, str);
     }
-    OBJ_INFECT(ptr->string, self);
     RB_GC_GUARD(str);
     ptr->pos += len;
-    return LONG2NUM(len);
+    return len;
 }
 
 /*
@@ -1302,7 +1493,6 @@ strio_read(int argc, VALUE *argv, VALUE self)
     long len;
     int binary = 0;
 
-    rb_check_arity(argc, 0, 2);
     switch (argc) {
       case 2:
 	str = argv[1];
@@ -1310,6 +1500,7 @@ strio_read(int argc, VALUE *argv, VALUE self)
 	    StringValue(str);
 	    rb_str_modify(str);
 	}
+	/* fall through */
       case 1:
 	if (!NIL_P(argv[0])) {
 	    len = NUM2LONG(argv[0]);
@@ -1327,22 +1518,26 @@ strio_read(int argc, VALUE *argv, VALUE self)
       case 0:
 	len = RSTRING_LEN(ptr->string);
 	if (len <= ptr->pos) {
+	    rb_encoding *enc = get_enc(ptr);
 	    if (NIL_P(str)) {
 		str = rb_str_new(0, 0);
 	    }
 	    else {
 		rb_str_resize(str, 0);
 	    }
+	    rb_enc_associate(str, enc);
 	    return str;
 	}
 	else {
 	    len -= ptr->pos;
 	}
 	break;
+      default:
+        rb_error_arity(argc, 0, 2);
     }
     if (NIL_P(str)) {
-	str = strio_substr(ptr, ptr->pos, len);
-	if (binary) rb_enc_associate(str, rb_ascii8bit_encoding());
+	rb_encoding *enc = binary ? rb_ascii8bit_encoding() : get_enc(ptr);
+	str = strio_substr(ptr, ptr->pos, len, enc);
     }
     else {
 	long rest = RSTRING_LEN(ptr->string) - ptr->pos;
@@ -1369,7 +1564,7 @@ strio_read(int argc, VALUE *argv, VALUE self)
 static VALUE
 strio_sysread(int argc, VALUE *argv, VALUE self)
 {
-    VALUE val = rb_funcall2(self, rb_intern("read"), argc, argv);
+    VALUE val = rb_funcallv_kw(self, rb_intern("read"), argc, argv, RB_PASS_CALLED_KEYWORDS);
     if (NIL_P(val)) {
 	rb_eof_error();
     }
@@ -1444,7 +1639,7 @@ strio_size(VALUE self)
  * call-seq:
  *   strio.truncate(integer)    -> 0
  *
- * Truncates the buffer string to at most _integer_ bytes. The *strio*
+ * Truncates the buffer string to at most _integer_ bytes. The stream
  * must be opened for writing.
  */
 static VALUE
@@ -1468,7 +1663,8 @@ strio_truncate(VALUE self, VALUE len)
  *     strio.external_encoding   => encoding
  *
  *  Returns the Encoding object that represents the encoding of the file.
- *  If strio is write mode and no encoding is specified, returns <code>nil</code>.
+ *  If the stream is write mode and no encoding is specified, returns
+ *  +nil+.
  */
 
 static VALUE
@@ -1483,13 +1679,13 @@ strio_external_encoding(VALUE self)
  *     strio.internal_encoding   => encoding
  *
  *  Returns the Encoding of the internal string if conversion is
- *  specified.  Otherwise returns nil.
+ *  specified.  Otherwise returns +nil+.
  */
 
 static VALUE
 strio_internal_encoding(VALUE self)
 {
-     return Qnil;
+    return Qnil;
 }
 
 /*
@@ -1525,23 +1721,47 @@ strio_set_encoding(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
+static VALUE
+strio_set_encoding_by_bom(VALUE self)
+{
+    struct StringIO *ptr = StringIO(self);
+
+    if (!set_encoding_by_bom(ptr)) return Qnil;
+    return rb_enc_from_encoding(ptr->enc);
+}
+
 /*
- * Pseudo I/O on String object.
+ * Pseudo I/O on String object, with interface corresponding to IO.
  *
- * Commonly used to simulate `$stdio` or `$stderr`
+ * Commonly used to simulate <code>$stdio</code> or <code>$stderr</code>
  *
  * === Examples
  *
  *   require 'stringio'
  *
+ *   # Writing stream emulation
  *   io = StringIO.new
  *   io.puts "Hello World"
  *   io.string #=> "Hello World\n"
+ *
+ *   # Reading stream emulation
+ *   io = StringIO.new "first\nsecond\nlast\n"
+ *   io.getc #=> "f"
+ *   io.gets #=> "irst\n"
+ *   io.read #=> "second\nlast\n"
  */
 void
 Init_stringio(void)
 {
-    VALUE StringIO = rb_define_class("StringIO", rb_cData);
+#undef rb_intern
+
+#ifdef HAVE_RB_EXT_RACTOR_SAFE
+  rb_ext_ractor_safe(true);
+#endif
+
+    VALUE StringIO = rb_define_class("StringIO", rb_cObject);
+
+    rb_define_const(StringIO, "VERSION", rb_str_new_cstr(STRINGIO_VERSION));
 
     rb_include_module(StringIO, rb_mEnumerable);
     rb_define_alloc_func(StringIO, strio_s_allocate);
@@ -1584,13 +1804,9 @@ Init_stringio(void)
 
     rb_define_method(StringIO, "each", strio_each, -1);
     rb_define_method(StringIO, "each_line", strio_each, -1);
-    rb_define_method(StringIO, "lines", strio_lines, -1);
     rb_define_method(StringIO, "each_byte", strio_each_byte, 0);
-    rb_define_method(StringIO, "bytes", strio_bytes, 0);
     rb_define_method(StringIO, "each_char", strio_each_char, 0);
-    rb_define_method(StringIO, "chars", strio_chars, 0);
     rb_define_method(StringIO, "each_codepoint", strio_each_codepoint, 0);
-    rb_define_method(StringIO, "codepoints", strio_codepoints, 0);
     rb_define_method(StringIO, "getc", strio_getc, 0);
     rb_define_method(StringIO, "ungetc", strio_ungetc, 1);
     rb_define_method(StringIO, "ungetbyte", strio_ungetbyte, 1);
@@ -1599,7 +1815,7 @@ Init_stringio(void)
     rb_define_method(StringIO, "readlines", strio_readlines, -1);
     rb_define_method(StringIO, "read", strio_read, -1);
 
-    rb_define_method(StringIO, "write", strio_write, 1);
+    rb_define_method(StringIO, "write", strio_write_m, -1);
     rb_define_method(StringIO, "putc", strio_putc, 1);
 
     /*
@@ -1623,6 +1839,7 @@ Init_stringio(void)
     rb_define_method(StringIO, "external_encoding", strio_external_encoding, 0);
     rb_define_method(StringIO, "internal_encoding", strio_internal_encoding, 0);
     rb_define_method(StringIO, "set_encoding", strio_set_encoding, -1);
+    rb_define_method(StringIO, "set_encoding_by_bom", strio_set_encoding_by_bom, 0);
 
     {
 	VALUE mReadable = rb_define_module_under(rb_cIO, "generic_readable");
diff --git a/ext/stringio/stringio.gemspec b/ext/stringio/stringio.gemspec
new file mode 100644
index 0000000000..524d976cfb
--- /dev/null
+++ b/ext/stringio/stringio.gemspec
@@ -0,0 +1,31 @@
+# -*- encoding: utf-8 -*-
+# frozen_string_literal: true
+
+source_version = ["", "ext/stringio/"].find do |dir|
+  begin
+    break File.open(File.join(__dir__, "#{dir}stringio.c")) {|f|
+      f.gets("\n#define STRINGIO_VERSION ")
+      f.gets[/\s*"(.+)"/, 1]
+    }
+  rescue Errno::ENOENT
+  end
+end
+Gem::Specification.new do |s|
+  s.name = "stringio"
+  s.version = source_version
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 2.6")
+  s.require_paths = ["lib"]
+  s.authors = ["Nobu Nakada"]
+  s.description = "Pseudo `IO` class from/to `String`."
+  s.email = "nobu@ruby-lang.org"
+  s.extensions = ["ext/stringio/extconf.rb"]
+  s.files = ["README.md", "ext/stringio/extconf.rb", "ext/stringio/stringio.c"]
+  s.homepage = "https://github.com/ruby/stringio"
+  s.licenses = ["Ruby", "BSD-2-Clause"]
+  s.required_ruby_version = ">= 2.5"
+  s.summary = "Pseudo IO on String"
+
+  # s.cert_chain  = %w[certs/nobu.pem]
+  # s.signing_key = File.expand_path("~/.ssh/gem-private_key.pem") if $0 =~ /gem\z/
+end
diff --git a/ext/strscan/depend b/ext/strscan/depend
index 318da4f7e7..f297134d3b 100644
--- a/ext/strscan/depend
+++ b/ext/strscan/depend
@@ -1,18 +1,168 @@
 # AUTOGENERATED DEPENDENCIES START
 strscan.o: $(RUBY_EXTCONF_H)
 strscan.o: $(arch_hdrdir)/ruby/config.h
+strscan.o: $(hdrdir)/ruby/internal/anyargs.h
+strscan.o: $(hdrdir)/ruby/internal/arithmetic.h
+strscan.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+strscan.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+strscan.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+strscan.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+strscan.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+strscan.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+strscan.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+strscan.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+strscan.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+strscan.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+strscan.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+strscan.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+strscan.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+strscan.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+strscan.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+strscan.o: $(hdrdir)/ruby/internal/assume.h
+strscan.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+strscan.o: $(hdrdir)/ruby/internal/attr/artificial.h
+strscan.o: $(hdrdir)/ruby/internal/attr/cold.h
+strscan.o: $(hdrdir)/ruby/internal/attr/const.h
+strscan.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+strscan.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+strscan.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+strscan.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+strscan.o: $(hdrdir)/ruby/internal/attr/error.h
+strscan.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+strscan.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+strscan.o: $(hdrdir)/ruby/internal/attr/format.h
+strscan.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+strscan.o: $(hdrdir)/ruby/internal/attr/noalias.h
+strscan.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+strscan.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+strscan.o: $(hdrdir)/ruby/internal/attr/noinline.h
+strscan.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+strscan.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+strscan.o: $(hdrdir)/ruby/internal/attr/pure.h
+strscan.o: $(hdrdir)/ruby/internal/attr/restrict.h
+strscan.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+strscan.o: $(hdrdir)/ruby/internal/attr/warning.h
+strscan.o: $(hdrdir)/ruby/internal/attr/weakref.h
+strscan.o: $(hdrdir)/ruby/internal/cast.h
+strscan.o: $(hdrdir)/ruby/internal/compiler_is.h
+strscan.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+strscan.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+strscan.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+strscan.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+strscan.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+strscan.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+strscan.o: $(hdrdir)/ruby/internal/compiler_since.h
+strscan.o: $(hdrdir)/ruby/internal/config.h
+strscan.o: $(hdrdir)/ruby/internal/constant_p.h
+strscan.o: $(hdrdir)/ruby/internal/core.h
+strscan.o: $(hdrdir)/ruby/internal/core/rarray.h
+strscan.o: $(hdrdir)/ruby/internal/core/rbasic.h
+strscan.o: $(hdrdir)/ruby/internal/core/rbignum.h
+strscan.o: $(hdrdir)/ruby/internal/core/rclass.h
+strscan.o: $(hdrdir)/ruby/internal/core/rdata.h
+strscan.o: $(hdrdir)/ruby/internal/core/rfile.h
+strscan.o: $(hdrdir)/ruby/internal/core/rhash.h
+strscan.o: $(hdrdir)/ruby/internal/core/rmatch.h
+strscan.o: $(hdrdir)/ruby/internal/core/robject.h
+strscan.o: $(hdrdir)/ruby/internal/core/rregexp.h
+strscan.o: $(hdrdir)/ruby/internal/core/rstring.h
+strscan.o: $(hdrdir)/ruby/internal/core/rstruct.h
+strscan.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+strscan.o: $(hdrdir)/ruby/internal/ctype.h
+strscan.o: $(hdrdir)/ruby/internal/dllexport.h
+strscan.o: $(hdrdir)/ruby/internal/dosish.h
+strscan.o: $(hdrdir)/ruby/internal/error.h
+strscan.o: $(hdrdir)/ruby/internal/eval.h
+strscan.o: $(hdrdir)/ruby/internal/event.h
+strscan.o: $(hdrdir)/ruby/internal/fl_type.h
+strscan.o: $(hdrdir)/ruby/internal/gc.h
+strscan.o: $(hdrdir)/ruby/internal/glob.h
+strscan.o: $(hdrdir)/ruby/internal/globals.h
+strscan.o: $(hdrdir)/ruby/internal/has/attribute.h
+strscan.o: $(hdrdir)/ruby/internal/has/builtin.h
+strscan.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+strscan.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+strscan.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+strscan.o: $(hdrdir)/ruby/internal/has/extension.h
+strscan.o: $(hdrdir)/ruby/internal/has/feature.h
+strscan.o: $(hdrdir)/ruby/internal/has/warning.h
+strscan.o: $(hdrdir)/ruby/internal/intern/array.h
+strscan.o: $(hdrdir)/ruby/internal/intern/bignum.h
+strscan.o: $(hdrdir)/ruby/internal/intern/class.h
+strscan.o: $(hdrdir)/ruby/internal/intern/compar.h
+strscan.o: $(hdrdir)/ruby/internal/intern/complex.h
+strscan.o: $(hdrdir)/ruby/internal/intern/cont.h
+strscan.o: $(hdrdir)/ruby/internal/intern/dir.h
+strscan.o: $(hdrdir)/ruby/internal/intern/enum.h
+strscan.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+strscan.o: $(hdrdir)/ruby/internal/intern/error.h
+strscan.o: $(hdrdir)/ruby/internal/intern/eval.h
+strscan.o: $(hdrdir)/ruby/internal/intern/file.h
+strscan.o: $(hdrdir)/ruby/internal/intern/gc.h
+strscan.o: $(hdrdir)/ruby/internal/intern/hash.h
+strscan.o: $(hdrdir)/ruby/internal/intern/io.h
+strscan.o: $(hdrdir)/ruby/internal/intern/load.h
+strscan.o: $(hdrdir)/ruby/internal/intern/marshal.h
+strscan.o: $(hdrdir)/ruby/internal/intern/numeric.h
+strscan.o: $(hdrdir)/ruby/internal/intern/object.h
+strscan.o: $(hdrdir)/ruby/internal/intern/parse.h
+strscan.o: $(hdrdir)/ruby/internal/intern/proc.h
+strscan.o: $(hdrdir)/ruby/internal/intern/process.h
+strscan.o: $(hdrdir)/ruby/internal/intern/random.h
+strscan.o: $(hdrdir)/ruby/internal/intern/range.h
+strscan.o: $(hdrdir)/ruby/internal/intern/rational.h
+strscan.o: $(hdrdir)/ruby/internal/intern/re.h
+strscan.o: $(hdrdir)/ruby/internal/intern/ruby.h
+strscan.o: $(hdrdir)/ruby/internal/intern/select.h
+strscan.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+strscan.o: $(hdrdir)/ruby/internal/intern/signal.h
+strscan.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+strscan.o: $(hdrdir)/ruby/internal/intern/string.h
+strscan.o: $(hdrdir)/ruby/internal/intern/struct.h
+strscan.o: $(hdrdir)/ruby/internal/intern/thread.h
+strscan.o: $(hdrdir)/ruby/internal/intern/time.h
+strscan.o: $(hdrdir)/ruby/internal/intern/variable.h
+strscan.o: $(hdrdir)/ruby/internal/intern/vm.h
+strscan.o: $(hdrdir)/ruby/internal/interpreter.h
+strscan.o: $(hdrdir)/ruby/internal/iterator.h
+strscan.o: $(hdrdir)/ruby/internal/memory.h
+strscan.o: $(hdrdir)/ruby/internal/method.h
+strscan.o: $(hdrdir)/ruby/internal/module.h
+strscan.o: $(hdrdir)/ruby/internal/newobj.h
+strscan.o: $(hdrdir)/ruby/internal/rgengc.h
+strscan.o: $(hdrdir)/ruby/internal/scan_args.h
+strscan.o: $(hdrdir)/ruby/internal/special_consts.h
+strscan.o: $(hdrdir)/ruby/internal/static_assert.h
+strscan.o: $(hdrdir)/ruby/internal/stdalign.h
+strscan.o: $(hdrdir)/ruby/internal/stdbool.h
+strscan.o: $(hdrdir)/ruby/internal/symbol.h
+strscan.o: $(hdrdir)/ruby/internal/token_paste.h
+strscan.o: $(hdrdir)/ruby/internal/value.h
+strscan.o: $(hdrdir)/ruby/internal/value_type.h
+strscan.o: $(hdrdir)/ruby/internal/variable.h
+strscan.o: $(hdrdir)/ruby/internal/warning_push.h
+strscan.o: $(hdrdir)/ruby/internal/xmalloc.h
+strscan.o: $(hdrdir)/ruby/assert.h
 strscan.o: $(hdrdir)/ruby/backward.h
+strscan.o: $(hdrdir)/ruby/backward/2/assume.h
+strscan.o: $(hdrdir)/ruby/backward/2/attributes.h
+strscan.o: $(hdrdir)/ruby/backward/2/bool.h
+strscan.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+strscan.o: $(hdrdir)/ruby/backward/2/inttypes.h
+strscan.o: $(hdrdir)/ruby/backward/2/limits.h
+strscan.o: $(hdrdir)/ruby/backward/2/long_long.h
+strscan.o: $(hdrdir)/ruby/backward/2/stdalign.h
+strscan.o: $(hdrdir)/ruby/backward/2/stdarg.h
 strscan.o: $(hdrdir)/ruby/defines.h
 strscan.o: $(hdrdir)/ruby/encoding.h
 strscan.o: $(hdrdir)/ruby/intern.h
 strscan.o: $(hdrdir)/ruby/missing.h
+strscan.o: $(hdrdir)/ruby/onigmo.h
 strscan.o: $(hdrdir)/ruby/oniguruma.h
 strscan.o: $(hdrdir)/ruby/re.h
 strscan.o: $(hdrdir)/ruby/regex.h
 strscan.o: $(hdrdir)/ruby/ruby.h
 strscan.o: $(hdrdir)/ruby/st.h
 strscan.o: $(hdrdir)/ruby/subst.h
-strscan.o: $(top_srcdir)/regenc.h
-strscan.o: $(top_srcdir)/regint.h
 strscan.o: strscan.c
 # AUTOGENERATED DEPENDENCIES END
diff --git a/ext/strscan/extconf.rb b/ext/strscan/extconf.rb
index c968f81c95..f0ecbf85d8 100644
--- a/ext/strscan/extconf.rb
+++ b/ext/strscan/extconf.rb
@@ -1,4 +1,5 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'mkmf'
-$INCFLAGS << " -I$(top_srcdir)"
+$INCFLAGS << " -I$(top_srcdir)" if $extmk
+have_func("onig_region_memsize", "ruby.h")
 create_makefile 'strscan'
diff --git a/ext/strscan/strscan.c b/ext/strscan/strscan.c
index e75bf6639c..e1426380b4 100644
--- a/ext/strscan/strscan.c
+++ b/ext/strscan/strscan.c
@@ -4,16 +4,25 @@
     Copyright (c) 1999-2006 Minero Aoki
 
     This program is free software.
-    You can distribute/modify this program under the terms of
-    the Ruby License. For details, see the file COPYING.
+    You can redistribute this program under the terms of the Ruby's or 2-clause
+    BSD License.  For details, see the COPYING and LICENSE.txt files.
 */
 
 #include "ruby/ruby.h"
 #include "ruby/re.h"
 #include "ruby/encoding.h"
-#include "regint.h"
 
-#define STRSCAN_VERSION "0.7.0"
+#ifdef RUBY_EXTCONF_H
+#  include RUBY_EXTCONF_H
+#endif
+
+#ifdef HAVE_ONIG_REGION_MEMSIZE
+extern size_t onig_region_memsize(const struct re_registers *regs);
+#endif
+
+#include <stdbool.h>
+
+#define STRSCAN_VERSION "3.0.1"
 
 /* =======================================================================
                          Data Type Definitions
@@ -41,6 +50,9 @@ struct strscanner
 
     /* regexp used for last scan */
     VALUE regex;
+
+    /* anchor mode */
+    bool fixed_anchor_p;
 };
 
 #define MATCHED_P(s)          ((s)->flags & FLAG_MATCHED)
@@ -64,7 +76,7 @@ struct strscanner
                             Function Prototypes
    ======================================================================= */
 
-static VALUE infect _((VALUE str, struct strscanner *p));
+static inline long minl _((const long n, const long x));
 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));
 
@@ -126,13 +138,6 @@ static VALUE inspect2 _((struct strscanner *p));
    ======================================================================= */
 
 static VALUE
-infect(VALUE str, struct strscanner *p)
-{
-    OBJ_INFECT(str, p->str);
-    return str;
-}
-
-static VALUE
 str_new(struct strscanner *p, const char *ptr, long len)
 {
     VALUE str = rb_str_new(ptr, len);
@@ -140,22 +145,26 @@ str_new(struct strscanner *p, const char *ptr, long len)
     return str;
 }
 
+static inline long
+minl(const long x, const long y)
+{
+    return (x < y) ? x : y;
+}
+
 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);
+    end_i = minl(end_i, S_LEN(p));
+    return str_new(p, S_PBEG(p) + beg_i, end_i - beg_i);
 }
 
 static VALUE
 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);
+    len = minl(len, S_LEN(p) - beg_i);
+    return str_new(p, S_PBEG(p) + beg_i, len);
 }
 
 /* =======================================================================
@@ -167,6 +176,7 @@ strscan_mark(void *ptr)
 {
     struct strscanner *p = ptr;
     rb_gc_mark(p->str);
+    rb_gc_mark(p->regex);
 }
 
 static void
@@ -181,7 +191,11 @@ static size_t
 strscan_memsize(const void *ptr)
 {
     const struct strscanner *p = ptr;
-    return sizeof(*p) - sizeof(p->regs) + onig_region_memsize(&p->regs);
+    size_t size = sizeof(*p) - sizeof(p->regs);
+#ifdef HAVE_ONIG_REGION_MEMSIZE
+    size += onig_region_memsize(&p->regs);
+#endif
+    return size;
 }
 
 static const rb_data_type_t strscanner_type = {
@@ -199,23 +213,46 @@ strscan_s_allocate(VALUE klass)
     CLEAR_MATCH_STATUS(p);
     onig_region_init(&(p->regs));
     p->str = Qnil;
+    p->regex = Qnil;
     return obj;
 }
 
 /*
- * call-seq: StringScanner.new(string, dup = false)
+ * call-seq:
+ *    StringScanner.new(string, fixed_anchor: false)
+ *    StringScanner.new(string, dup = false)
  *
  * Creates a new StringScanner object to scan over the given +string+.
+ *
+ * If +fixed_anchor+ is +true+, +\A+ always matches the beginning of
+ * the string. Otherwise, +\A+ always matches the current position.
+ *
  * +dup+ argument is obsolete and not used now.
  */
 static VALUE
 strscan_initialize(int argc, VALUE *argv, VALUE self)
 {
     struct strscanner *p;
-    VALUE str, need_dup;
+    VALUE str, options;
 
     p = check_strscan(self);
-    rb_scan_args(argc, argv, "11", &str, &need_dup);
+    rb_scan_args(argc, argv, "11", &str, &options);
+    options = rb_check_hash_type(options);
+    if (!NIL_P(options)) {
+        VALUE fixed_anchor;
+        ID keyword_ids[1];
+        keyword_ids[0] = rb_intern("fixed_anchor");
+        rb_get_kwargs(options, keyword_ids, 0, 1, &fixed_anchor);
+        if (fixed_anchor == Qundef) {
+            p->fixed_anchor_p = false;
+        }
+        else {
+            p->fixed_anchor_p = RTEST(fixed_anchor);
+        }
+    }
+    else {
+        p->fixed_anchor_p = false;
+    }
     StringValue(str);
     p->str = str;
 
@@ -289,7 +326,7 @@ strscan_reset(VALUE self)
  *   terminate
  *   clear
  *
- * Set the scan pointer to the end of the string and clear matching data.
+ * Sets the scan pointer to the end of the string and clear matching data.
  */
 static VALUE
 strscan_terminate(VALUE self)
@@ -408,19 +445,16 @@ static VALUE
 strscan_get_charpos(VALUE self)
 {
     struct strscanner *p;
-    VALUE substr;
 
     GET_SCANNER(self, p);
 
-    substr = rb_funcall(p->str, id_byteslice, 2, INT2FIX(0), INT2NUM(p->curr));
-
-    return rb_str_length(substr);
+    return LONG2NUM(rb_enc_strlen(S_PBEG(p), CURPTR(p), rb_enc_get(p->str)));
 }
 
 /*
  * call-seq: pos=(n)
  *
- * Set the byte position of the scan pointer.
+ * Sets the byte position of the scan pointer.
  *
  *   s = StringScanner.new('test string')
  *   s.pos = 7            # -> 7
@@ -438,19 +472,86 @@ strscan_set_pos(VALUE self, VALUE v)
     if (i < 0) rb_raise(rb_eRangeError, "index out of range");
     if (i > S_LEN(p)) rb_raise(rb_eRangeError, "index out of range");
     p->curr = i;
-    return INT2NUM(i);
+    return LONG2NUM(i);
+}
+
+static inline UChar *
+match_target(struct strscanner *p)
+{
+    if (p->fixed_anchor_p) {
+        return (UChar *)S_PBEG(p);
+    }
+    else
+    {
+        return (UChar *)CURPTR(p);
+    }
+}
+
+static inline void
+set_registers(struct strscanner *p, size_t length)
+{
+    const int at = 0;
+    OnigRegion *regs = &(p->regs);
+    onig_region_clear(regs);
+    if (onig_region_set(regs, at, 0, 0)) return;
+    if (p->fixed_anchor_p) {
+        regs->beg[at] = p->curr;
+        regs->end[at] = p->curr + length;
+    }
+    else
+    {
+        regs->end[at] = length;
+    }
+}
+
+static inline void
+succ(struct strscanner *p)
+{
+    if (p->fixed_anchor_p) {
+        p->curr = p->regs.end[0];
+    }
+    else
+    {
+        p->curr += p->regs.end[0];
+    }
+}
+
+static inline long
+last_match_length(struct strscanner *p)
+{
+    if (p->fixed_anchor_p) {
+        return p->regs.end[0] - p->prev;
+    }
+    else
+    {
+        return p->regs.end[0];
+    }
+}
+
+static inline long
+adjust_register_position(struct strscanner *p, long position)
+{
+    if (p->fixed_anchor_p) {
+        return position;
+    }
+    else {
+        return p->prev + position;
+    }
 }
 
 static VALUE
-strscan_do_scan(VALUE self, VALUE regex, int succptr, int getstr, int headonly)
+strscan_do_scan(VALUE self, VALUE pattern, int succptr, int getstr, int headonly)
 {
-    regex_t *rb_reg_prepare_re(VALUE re, VALUE str);
     struct strscanner *p;
-    regex_t *re;
-    long ret;
-    int tmpreg;
 
-    Check_Type(regex, T_REGEXP);
+    if (headonly) {
+        if (!RB_TYPE_P(pattern, T_REGEXP)) {
+            StringValue(pattern);
+        }
+    }
+    else {
+        Check_Type(pattern, T_REGEXP);
+    }
     GET_SCANNER(self, p);
 
     CLEAR_MATCH_STATUS(p);
@@ -458,49 +559,76 @@ strscan_do_scan(VALUE self, VALUE regex, int succptr, int getstr, int headonly)
         return Qnil;
     }
 
-    p->regex = regex;
-    re = rb_reg_prepare_re(regex, p->str);
-    tmpreg = re != RREGEXP_PTR(regex);
-    if (!tmpreg) RREGEXP(regex)->usecnt++;
+    if (RB_TYPE_P(pattern, T_REGEXP)) {
+        regex_t *rb_reg_prepare_re(VALUE re, VALUE str);
+        regex_t *re;
+        long ret;
+        int tmpreg;
+
+        p->regex = pattern;
+        re = rb_reg_prepare_re(pattern, p->str);
+        tmpreg = re != RREGEXP_PTR(pattern);
+        if (!tmpreg) RREGEXP(pattern)->usecnt++;
+
+        if (headonly) {
+            ret = onig_match(re,
+                             match_target(p),
+                             (UChar* )(CURPTR(p) + S_RESTLEN(p)),
+                             (UChar* )CURPTR(p),
+                             &(p->regs),
+                             ONIG_OPTION_NONE);
+        }
+        else {
+            ret = onig_search(re,
+                              match_target(p),
+                              (UChar* )(CURPTR(p) + S_RESTLEN(p)),
+                              (UChar* )CURPTR(p),
+                              (UChar* )(CURPTR(p) + S_RESTLEN(p)),
+                              &(p->regs),
+                              ONIG_OPTION_NONE);
+        }
+        if (!tmpreg) RREGEXP(pattern)->usecnt--;
+        if (tmpreg) {
+            if (RREGEXP(pattern)->usecnt) {
+                onig_free(re);
+            }
+            else {
+                onig_free(RREGEXP_PTR(pattern));
+                RREGEXP_PTR(pattern) = re;
+            }
+        }
 
-    if (headonly) {
-        ret = onig_match(re, (UChar* )CURPTR(p),
-                         (UChar* )(CURPTR(p) + S_RESTLEN(p)),
-                         (UChar* )CURPTR(p), &(p->regs), ONIG_OPTION_NONE);
+        if (ret == -2) rb_raise(ScanError, "regexp buffer overflow");
+        if (ret < 0) {
+            /* not matched */
+            return Qnil;
+        }
     }
     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);
-    }
-    if (!tmpreg) RREGEXP(regex)->usecnt--;
-    if (tmpreg) {
-        if (RREGEXP(regex)->usecnt) {
-            onig_free(re);
+        rb_enc_check(p->str, pattern);
+        if (S_RESTLEN(p) < RSTRING_LEN(pattern)) {
+            return Qnil;
         }
-        else {
-            onig_free(RREGEXP_PTR(regex));
-            RREGEXP_PTR(regex) = re;
+        if (memcmp(CURPTR(p), RSTRING_PTR(pattern), RSTRING_LEN(pattern)) != 0) {
+            return Qnil;
         }
-    }
-
-    if (ret == -2) rb_raise(ScanError, "regexp buffer overflow");
-    if (ret < 0) {
-        /* not matched */
-        return Qnil;
+        set_registers(p, RSTRING_LEN(pattern));
     }
 
     MATCHED(p);
     p->prev = p->curr;
+
     if (succptr) {
-        p->curr += p->regs.end[0];
+        succ(p);
     }
-    if (getstr) {
-        return extract_beg_len(p, p->prev, p->regs.end[0]);
-    }
-    else {
-        return INT2FIX(p->regs.end[0]);
+    {
+        const long length = last_match_length(p);
+        if (getstr) {
+            return extract_beg_len(p, p->prev, length);
+        }
+        else {
+            return INT2FIX(length);
+        }
     }
 }
 
@@ -515,7 +643,8 @@ strscan_do_scan(VALUE self, VALUE regex, int succptr, int getstr, int headonly)
  *   p s.scan(/\w+/)   # -> "test"
  *   p s.scan(/\w+/)   # -> nil
  *   p s.scan(/\s+/)   # -> " "
- *   p s.scan(/\w+/)   # -> "string"
+ *   p s.scan("str")   # -> "str"
+ *   p s.scan(/\w+/)   # -> "ing"
  *   p s.scan(/./)     # -> nil
  *
  */
@@ -534,6 +663,7 @@ strscan_scan(VALUE self, VALUE re)
  *   s = StringScanner.new('test string')
  *   p s.match?(/\w+/)   # -> 4
  *   p s.match?(/\w+/)   # -> 4
+ *   p s.match?("test")  # -> 4
  *   p s.match?(/\s+/)   # -> nil
  */
 static VALUE
@@ -555,7 +685,8 @@ strscan_match_p(VALUE self, VALUE re)
  *   p s.skip(/\w+/)   # -> 4
  *   p s.skip(/\w+/)   # -> nil
  *   p s.skip(/\s+/)   # -> 1
- *   p s.skip(/\w+/)   # -> 6
+ *   p s.skip("st")    # -> 2
+ *   p s.skip(/\w+/)   # -> 4
  *   p s.skip(/./)     # -> nil
  *
  */
@@ -699,7 +830,12 @@ static void
 adjust_registers_to_matched(struct strscanner *p)
 {
     onig_region_clear(&(p->regs));
-    onig_region_set(&(p->regs), 0, 0, (int)(p->curr - p->prev));
+    if (p->fixed_anchor_p) {
+        onig_region_set(&(p->regs), 0, (int)p->prev, (int)p->curr);
+    }
+    else {
+        onig_region_set(&(p->regs), 0, 0, (int)(p->curr - p->prev));
+    }
 }
 
 /*
@@ -711,9 +847,8 @@ adjust_registers_to_matched(struct strscanner *p)
  *   s.getch           # => "b"
  *   s.getch           # => nil
  *
- *   $KCODE = 'EUC'
- *   s = StringScanner.new("\244\242")
- *   s.getch           # => "\244\242"   # Japanese hira-kana "A" in EUC-JP
+ *   s = StringScanner.new("\244\242".force_encoding("euc-jp"))
+ *   s.getch           # => "\x{A4A2}"   # Japanese hira-kana "A" in EUC-JP
  *   s.getch           # => nil
  */
 static VALUE
@@ -728,15 +863,14 @@ strscan_getch(VALUE self)
         return Qnil;
 
     len = rb_enc_mbclen(CURPTR(p), S_PEND(p), rb_enc_get(p->str));
-    if (p->curr + len > S_LEN(p)) {
-        len = S_LEN(p) - p->curr;
-    }
+    len = minl(len, S_RESTLEN(p));
     p->prev = p->curr;
     p->curr += len;
     MATCHED(p);
     adjust_registers_to_matched(p);
-    return extract_range(p, p->prev + p->regs.beg[0],
-                            p->prev + p->regs.end[0]);
+    return extract_range(p,
+                         adjust_register_position(p, p->regs.beg[0]),
+                         adjust_register_position(p, p->regs.end[0]));
 }
 
 /*
@@ -749,10 +883,9 @@ strscan_getch(VALUE self)
  *   s.get_byte         # => "b"
  *   s.get_byte         # => nil
  *
- *   $KCODE = 'EUC'
- *   s = StringScanner.new("\244\242")
- *   s.get_byte         # => "\244"
- *   s.get_byte         # => "\242"
+ *   s = StringScanner.new("\244\242".force_encoding("euc-jp"))
+ *   s.get_byte         # => "\xA4"
+ *   s.get_byte         # => "\xA2"
  *   s.get_byte         # => nil
  */
 static VALUE
@@ -769,8 +902,9 @@ strscan_get_byte(VALUE self)
     p->curr++;
     MATCHED(p);
     adjust_registers_to_matched(p);
-    return extract_range(p, p->prev + p->regs.beg[0],
-                            p->prev + p->regs.end[0]);
+    return extract_range(p,
+                         adjust_register_position(p, p->regs.beg[0]),
+                         adjust_register_position(p, p->regs.end[0]));
 }
 
 /*
@@ -805,10 +939,9 @@ strscan_peek(VALUE self, VALUE vlen)
 
     len = NUM2LONG(vlen);
     if (EOS_P(p))
-        return infect(str_new(p, "", 0), p);
+        return str_new(p, "", 0);
 
-    if (p->curr + len > S_LEN(p))
-        len = S_LEN(p) - p->curr;
+    len = minl(len, S_RESTLEN(p));
     return extract_beg_len(p, p->curr, len);
 }
 
@@ -824,7 +957,7 @@ strscan_peep(VALUE self, VALUE vlen)
 }
 
 /*
- * Set the scan pointer to the previous position.  Only one previous position is
+ * Sets the scan pointer to the previous position.  Only one previous position is
  * remembered, and it changes with each scanning operation.
  *
  *   s = StringScanner.new('test string')
@@ -848,7 +981,7 @@ strscan_unscan(VALUE self)
 }
 
 /*
- * Returns +true+ iff the scan pointer is at the beginning of the line.
+ * Returns +true+ if and only if the scan pointer is at the beginning of the line.
  *
  *   s = StringScanner.new("test\ntest\n")
  *   s.bol?           # => true
@@ -901,7 +1034,7 @@ strscan_empty_p(VALUE self)
 }
 
 /*
- * Returns true iff there is more data in the string.  See #eos?.
+ * Returns true if and only if there is more data in the string.  See #eos?.
  * This method is obsolete; use #eos? instead.
  *
  *   s = StringScanner.new('test string')
@@ -918,7 +1051,7 @@ strscan_rest_p(VALUE self)
 }
 
 /*
- * Returns +true+ iff the last match was successful.
+ * Returns +true+ if and only if the last match was successful.
  *
  *   s = StringScanner.new('test string')
  *   s.match?(/\w+/)     # => 4
@@ -949,13 +1082,15 @@ 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]);
+    return extract_range(p,
+                         adjust_register_position(p, p->regs.beg[0]),
+                         adjust_register_position(p, p->regs.end[0]));
 }
 
 /*
- * Returns the size of the most recent match (see #matched), or +nil+ if there
- * was no recent match.
+ * Returns the size of the most recent match in bytes, or +nil+ if there
+ * was no recent match.  This is different than <tt>matched.size</tt>,
+ * which will return the size in characters.
  *
  *   s = StringScanner.new('test string')
  *   s.check /\w+/           # -> "test"
@@ -970,7 +1105,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]);
+    return LONG2NUM(p->regs.end[0] - p->regs.beg[0]);
 }
 
 static int
@@ -994,7 +1129,7 @@ name_to_backref_number(struct re_registers *regs, VALUE regexp, const char* name
 /*
  * call-seq: [](n)
  *
- * Return the n-th subgroup in the most recent match.
+ * Returns the n-th subgroup in the most recent match.
  *
  *   s = StringScanner.new("Fri Dec 12 1975 14:39")
  *   s.scan(/(\w+) (\w+) (\d+) /)       # -> "Fri Dec 12 "
@@ -1032,6 +1167,7 @@ strscan_aref(VALUE self, VALUE idx)
             idx = rb_sym2str(idx);
             /* fall through */
         case T_STRING:
+            if (!RTEST(p->regex)) return Qnil;
             RSTRING_GETMEM(idx, name, i);
             i = name_to_backref_number(&(p->regs), p->regex, name, name + i, rb_enc_get(idx));
             break;
@@ -1045,12 +1181,100 @@ strscan_aref(VALUE self, VALUE idx)
     if (i >= p->regs.num_regs) return Qnil;
     if (p->regs.beg[i] == -1)  return Qnil;
 
-    return extract_range(p, p->prev + p->regs.beg[i],
-                            p->prev + p->regs.end[i]);
+    return extract_range(p,
+                         adjust_register_position(p, p->regs.beg[i]),
+                         adjust_register_position(p, p->regs.end[i]));
+}
+
+/*
+ * call-seq: size
+ *
+ * Returns the amount of subgroups in the most recent match.
+ * The full match counts as a subgroup.
+ *
+ *   s = StringScanner.new("Fri Dec 12 1975 14:39")
+ *   s.scan(/(\w+) (\w+) (\d+) /)       # -> "Fri Dec 12 "
+ *   s.size                             # -> 4
+ */
+static VALUE
+strscan_size(VALUE self)
+{
+    struct strscanner *p;
+
+    GET_SCANNER(self, p);
+    if (! MATCHED_P(p))        return Qnil;
+    return INT2FIX(p->regs.num_regs);
+}
+
+/*
+ * call-seq: captures
+ *
+ * Returns the subgroups in the most recent match (not including the full match).
+ * If nothing was priorly matched, it returns nil.
+ *
+ *   s = StringScanner.new("Fri Dec 12 1975 14:39")
+ *   s.scan(/(\w+) (\w+) (\d+) /)       # -> "Fri Dec 12 "
+ *   s.captures                         # -> ["Fri", "Dec", "12"]
+ *   s.scan(/(\w+) (\w+) (\d+) /)       # -> nil
+ *   s.captures                         # -> nil
+ */
+static VALUE
+strscan_captures(VALUE self)
+{
+    struct strscanner *p;
+    int   i, num_regs;
+    VALUE new_ary;
+
+    GET_SCANNER(self, p);
+    if (! MATCHED_P(p))        return Qnil;
+
+    num_regs = p->regs.num_regs;
+    new_ary  = rb_ary_new2(num_regs);
+
+    for (i = 1; i < num_regs; i++) {
+        VALUE str = extract_range(p,
+                                  adjust_register_position(p, p->regs.beg[i]),
+                                  adjust_register_position(p, p->regs.end[i]));
+        rb_ary_push(new_ary, str);
+    }
+
+    return new_ary;
 }
 
 /*
- * Return the <i><b>pre</b>-match</i> (in the regular expression sense) of the last scan.
+ *  call-seq:
+ *     scanner.values_at( i1, i2, ... iN )   -> an_array
+ *
+ * Returns the subgroups in the most recent match at the given indices.
+ * If nothing was priorly matched, it returns nil.
+ *
+ *   s = StringScanner.new("Fri Dec 12 1975 14:39")
+ *   s.scan(/(\w+) (\w+) (\d+) /)       # -> "Fri Dec 12 "
+ *   s.values_at 0, -1, 5, 2            # -> ["Fri Dec 12 ", "12", nil, "Dec"]
+ *   s.scan(/(\w+) (\w+) (\d+) /)       # -> nil
+ *   s.values_at 0, -1, 5, 2            # -> nil
+ */
+
+static VALUE
+strscan_values_at(int argc, VALUE *argv, VALUE self)
+{
+    struct strscanner *p;
+    long i;
+    VALUE new_ary;
+
+    GET_SCANNER(self, p);
+    if (! MATCHED_P(p))        return Qnil;
+
+    new_ary = rb_ary_new2(argc);
+    for (i = 0; i<argc; i++) {
+        rb_ary_push(new_ary, strscan_aref(self, argv[i]));
+    }
+
+    return new_ary;
+}
+
+/*
+ * Returns the <i><b>pre</b>-match</i> (in the regular expression sense) of the last scan.
  *
  *   s = StringScanner.new('test string')
  *   s.scan(/\w+/)           # -> "test"
@@ -1065,11 +1289,13 @@ 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]);
+    return extract_range(p,
+                         0,
+                         adjust_register_position(p, p->regs.beg[0]));
 }
 
 /*
- * Return the <i><b>post</b>-match</i> (in the regular expression sense) of the last scan.
+ * Returns the <i><b>post</b>-match</i> (in the regular expression sense) of the last scan.
  *
  *   s = StringScanner.new('test string')
  *   s.scan(/\w+/)           # -> "test"
@@ -1084,7 +1310,9 @@ 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));
+    return extract_range(p,
+                         adjust_register_position(p, p->regs.end[0]),
+                         S_LEN(p));
 }
 
 /*
@@ -1098,7 +1326,7 @@ strscan_rest(VALUE self)
 
     GET_SCANNER(self, p);
     if (EOS_P(p)) {
-        return infect(str_new(p, "", 0), p);
+        return str_new(p, "", 0);
     }
     return extract_range(p, p->curr, S_LEN(p));
 }
@@ -1116,7 +1344,7 @@ strscan_rest_size(VALUE self)
     if (EOS_P(p)) {
         return INT2FIX(0);
     }
-    i = S_LEN(p) - p->curr;
+    i = S_RESTLEN(p);
     return INT2FIX(i);
 }
 
@@ -1153,11 +1381,11 @@ strscan_inspect(VALUE self)
     p = check_strscan(self);
     if (NIL_P(p->str)) {
 	a = rb_sprintf("#<%"PRIsVALUE" (uninitialized)>", rb_obj_class(self));
-	return infect(a, p);
+	return a;
     }
     if (EOS_P(p)) {
 	a = rb_sprintf("#<%"PRIsVALUE" fin>", rb_obj_class(self));
-	return infect(a, p);
+	return a;
     }
     if (p->curr == 0) {
 	b = inspect2(p);
@@ -1165,7 +1393,7 @@ strscan_inspect(VALUE self)
 		       rb_obj_class(self),
 		       p->curr, S_LEN(p),
 		       b);
-	return infect(a, p);
+	return a;
     }
     a = inspect1(p);
     b = inspect2(p);
@@ -1173,7 +1401,7 @@ strscan_inspect(VALUE self)
 		   rb_obj_class(self),
 		   p->curr, S_LEN(p),
 		   a, b);
-    return infect(a, p);
+    return a;
 }
 
 static VALUE
@@ -1202,7 +1430,7 @@ inspect2(struct strscanner *p)
     long len;
 
     if (EOS_P(p)) return rb_str_new2("");
-    len = S_LEN(p) - p->curr;
+    len = S_RESTLEN(p);
     if (len > INSPECT_LENGTH) {
 	str = rb_str_new(CURPTR(p), INSPECT_LENGTH);
 	rb_str_cat2(str, "...");
@@ -1213,6 +1441,23 @@ inspect2(struct strscanner *p)
     return rb_str_dump(str);
 }
 
+/*
+ * call-seq:
+ *    scanner.fixed_anchor? -> true or false
+ *
+ * Whether +scanner+ uses fixed anchor mode or not.
+ *
+ * If fixed anchor mode is used, +\A+ always matches the beginning of
+ * the string. Otherwise, +\A+ always matches the current position.
+ */
+static VALUE
+strscan_fixed_anchor_p(VALUE self)
+{
+    struct strscanner *p;
+    p = check_strscan(self);
+    return p->fixed_anchor_p ? Qtrue : Qfalse;
+}
+
 /* =======================================================================
                               Ruby Interface
    ======================================================================= */
@@ -1289,7 +1534,7 @@ inspect2(struct strscanner *p)
  *
  * === Finding Where we Are
  *
- * - #beginning_of_line? (#bol?)
+ * - #beginning_of_line? (<tt>#bol?</tt>)
  * - #eos?
  * - #rest?
  * - #rest_size
@@ -1306,13 +1551,13 @@ inspect2(struct strscanner *p)
  * - #matched
  * - #matched?
  * - #matched_size
- * - []
+ * - <tt>#[]</tt>
  * - #pre_match
  * - #post_match
  *
  * === Miscellaneous
  *
- * - <<
+ * - <tt><<</tt>
  * - #concat
  * - #string
  * - #string=
@@ -1323,6 +1568,11 @@ inspect2(struct strscanner *p)
 void
 Init_strscan(void)
 {
+#ifdef HAVE_RB_EXT_RACTOR_SAFE
+    rb_ext_ractor_safe(true);
+#endif
+
+#undef rb_intern
     ID id_scanerr = rb_intern("ScanError");
     VALUE tmp;
 
@@ -1389,10 +1639,15 @@ Init_strscan(void)
     rb_define_method(StringScanner, "[]",          strscan_aref,        1);
     rb_define_method(StringScanner, "pre_match",   strscan_pre_match,   0);
     rb_define_method(StringScanner, "post_match",  strscan_post_match,  0);
+    rb_define_method(StringScanner, "size",        strscan_size,        0);
+    rb_define_method(StringScanner, "captures",    strscan_captures,    0);
+    rb_define_method(StringScanner, "values_at",   strscan_values_at,  -1);
 
     rb_define_method(StringScanner, "rest",        strscan_rest,        0);
     rb_define_method(StringScanner, "rest_size",   strscan_rest_size,   0);
     rb_define_method(StringScanner, "restsize",    strscan_restsize,    0);
 
     rb_define_method(StringScanner, "inspect",     strscan_inspect,     0);
+
+    rb_define_method(StringScanner, "fixed_anchor?", strscan_fixed_anchor_p, 0);
 }
diff --git a/ext/strscan/strscan.gemspec b/ext/strscan/strscan.gemspec
new file mode 100644
index 0000000000..5d8119ea4c
--- /dev/null
+++ b/ext/strscan/strscan.gemspec
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+#
+source_version = ["", "ext/strscan/"].find do |dir|
+  begin
+    break File.open(File.join(__dir__, "#{dir}strscan.c")) {|f|
+      f.gets("\n#define STRSCAN_VERSION ")
+      f.gets[/\s*"(.+)"/, 1]
+    }
+  rescue Errno::ENOENT
+  end
+end
+
+Gem::Specification.new do |s|
+  s.name = "strscan"
+  s.version = source_version
+  s.summary = "Provides lexical scanning operations on a String."
+  s.description = "Provides lexical scanning operations on a String."
+
+  s.require_path = %w{lib}
+  s.files = %w{ext/strscan/extconf.rb ext/strscan/strscan.c}
+  s.extensions = %w{ext/strscan/extconf.rb}
+  s.required_ruby_version = ">= 2.4.0"
+
+  s.authors = ["Minero Aoki", "Sutou Kouhei"]
+  s.email = [nil, "kou@cozmixng.org"]
+  s.homepage = "https://github.com/ruby/strscan"
+  s.licenses = ["Ruby", "BSD-2-Clause"]
+end
diff --git a/ext/syslog/depend b/ext/syslog/depend
index ee2ad79052..4c0ef0ebac 100644
--- a/ext/syslog/depend
+++ b/ext/syslog/depend
@@ -1,7 +1,157 @@
 # AUTOGENERATED DEPENDENCIES START
 syslog.o: $(RUBY_EXTCONF_H)
 syslog.o: $(arch_hdrdir)/ruby/config.h
+syslog.o: $(hdrdir)/ruby/internal/anyargs.h
+syslog.o: $(hdrdir)/ruby/internal/arithmetic.h
+syslog.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+syslog.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+syslog.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+syslog.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+syslog.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+syslog.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+syslog.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+syslog.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+syslog.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+syslog.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+syslog.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+syslog.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+syslog.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+syslog.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+syslog.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+syslog.o: $(hdrdir)/ruby/internal/assume.h
+syslog.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+syslog.o: $(hdrdir)/ruby/internal/attr/artificial.h
+syslog.o: $(hdrdir)/ruby/internal/attr/cold.h
+syslog.o: $(hdrdir)/ruby/internal/attr/const.h
+syslog.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+syslog.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+syslog.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+syslog.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+syslog.o: $(hdrdir)/ruby/internal/attr/error.h
+syslog.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+syslog.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+syslog.o: $(hdrdir)/ruby/internal/attr/format.h
+syslog.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+syslog.o: $(hdrdir)/ruby/internal/attr/noalias.h
+syslog.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+syslog.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+syslog.o: $(hdrdir)/ruby/internal/attr/noinline.h
+syslog.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+syslog.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+syslog.o: $(hdrdir)/ruby/internal/attr/pure.h
+syslog.o: $(hdrdir)/ruby/internal/attr/restrict.h
+syslog.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+syslog.o: $(hdrdir)/ruby/internal/attr/warning.h
+syslog.o: $(hdrdir)/ruby/internal/attr/weakref.h
+syslog.o: $(hdrdir)/ruby/internal/cast.h
+syslog.o: $(hdrdir)/ruby/internal/compiler_is.h
+syslog.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+syslog.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+syslog.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+syslog.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+syslog.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+syslog.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+syslog.o: $(hdrdir)/ruby/internal/compiler_since.h
+syslog.o: $(hdrdir)/ruby/internal/config.h
+syslog.o: $(hdrdir)/ruby/internal/constant_p.h
+syslog.o: $(hdrdir)/ruby/internal/core.h
+syslog.o: $(hdrdir)/ruby/internal/core/rarray.h
+syslog.o: $(hdrdir)/ruby/internal/core/rbasic.h
+syslog.o: $(hdrdir)/ruby/internal/core/rbignum.h
+syslog.o: $(hdrdir)/ruby/internal/core/rclass.h
+syslog.o: $(hdrdir)/ruby/internal/core/rdata.h
+syslog.o: $(hdrdir)/ruby/internal/core/rfile.h
+syslog.o: $(hdrdir)/ruby/internal/core/rhash.h
+syslog.o: $(hdrdir)/ruby/internal/core/robject.h
+syslog.o: $(hdrdir)/ruby/internal/core/rregexp.h
+syslog.o: $(hdrdir)/ruby/internal/core/rstring.h
+syslog.o: $(hdrdir)/ruby/internal/core/rstruct.h
+syslog.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+syslog.o: $(hdrdir)/ruby/internal/ctype.h
+syslog.o: $(hdrdir)/ruby/internal/dllexport.h
+syslog.o: $(hdrdir)/ruby/internal/dosish.h
+syslog.o: $(hdrdir)/ruby/internal/error.h
+syslog.o: $(hdrdir)/ruby/internal/eval.h
+syslog.o: $(hdrdir)/ruby/internal/event.h
+syslog.o: $(hdrdir)/ruby/internal/fl_type.h
+syslog.o: $(hdrdir)/ruby/internal/gc.h
+syslog.o: $(hdrdir)/ruby/internal/glob.h
+syslog.o: $(hdrdir)/ruby/internal/globals.h
+syslog.o: $(hdrdir)/ruby/internal/has/attribute.h
+syslog.o: $(hdrdir)/ruby/internal/has/builtin.h
+syslog.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+syslog.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+syslog.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+syslog.o: $(hdrdir)/ruby/internal/has/extension.h
+syslog.o: $(hdrdir)/ruby/internal/has/feature.h
+syslog.o: $(hdrdir)/ruby/internal/has/warning.h
+syslog.o: $(hdrdir)/ruby/internal/intern/array.h
+syslog.o: $(hdrdir)/ruby/internal/intern/bignum.h
+syslog.o: $(hdrdir)/ruby/internal/intern/class.h
+syslog.o: $(hdrdir)/ruby/internal/intern/compar.h
+syslog.o: $(hdrdir)/ruby/internal/intern/complex.h
+syslog.o: $(hdrdir)/ruby/internal/intern/cont.h
+syslog.o: $(hdrdir)/ruby/internal/intern/dir.h
+syslog.o: $(hdrdir)/ruby/internal/intern/enum.h
+syslog.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+syslog.o: $(hdrdir)/ruby/internal/intern/error.h
+syslog.o: $(hdrdir)/ruby/internal/intern/eval.h
+syslog.o: $(hdrdir)/ruby/internal/intern/file.h
+syslog.o: $(hdrdir)/ruby/internal/intern/gc.h
+syslog.o: $(hdrdir)/ruby/internal/intern/hash.h
+syslog.o: $(hdrdir)/ruby/internal/intern/io.h
+syslog.o: $(hdrdir)/ruby/internal/intern/load.h
+syslog.o: $(hdrdir)/ruby/internal/intern/marshal.h
+syslog.o: $(hdrdir)/ruby/internal/intern/numeric.h
+syslog.o: $(hdrdir)/ruby/internal/intern/object.h
+syslog.o: $(hdrdir)/ruby/internal/intern/parse.h
+syslog.o: $(hdrdir)/ruby/internal/intern/proc.h
+syslog.o: $(hdrdir)/ruby/internal/intern/process.h
+syslog.o: $(hdrdir)/ruby/internal/intern/random.h
+syslog.o: $(hdrdir)/ruby/internal/intern/range.h
+syslog.o: $(hdrdir)/ruby/internal/intern/rational.h
+syslog.o: $(hdrdir)/ruby/internal/intern/re.h
+syslog.o: $(hdrdir)/ruby/internal/intern/ruby.h
+syslog.o: $(hdrdir)/ruby/internal/intern/select.h
+syslog.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+syslog.o: $(hdrdir)/ruby/internal/intern/signal.h
+syslog.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+syslog.o: $(hdrdir)/ruby/internal/intern/string.h
+syslog.o: $(hdrdir)/ruby/internal/intern/struct.h
+syslog.o: $(hdrdir)/ruby/internal/intern/thread.h
+syslog.o: $(hdrdir)/ruby/internal/intern/time.h
+syslog.o: $(hdrdir)/ruby/internal/intern/variable.h
+syslog.o: $(hdrdir)/ruby/internal/intern/vm.h
+syslog.o: $(hdrdir)/ruby/internal/interpreter.h
+syslog.o: $(hdrdir)/ruby/internal/iterator.h
+syslog.o: $(hdrdir)/ruby/internal/memory.h
+syslog.o: $(hdrdir)/ruby/internal/method.h
+syslog.o: $(hdrdir)/ruby/internal/module.h
+syslog.o: $(hdrdir)/ruby/internal/newobj.h
+syslog.o: $(hdrdir)/ruby/internal/rgengc.h
+syslog.o: $(hdrdir)/ruby/internal/scan_args.h
+syslog.o: $(hdrdir)/ruby/internal/special_consts.h
+syslog.o: $(hdrdir)/ruby/internal/static_assert.h
+syslog.o: $(hdrdir)/ruby/internal/stdalign.h
+syslog.o: $(hdrdir)/ruby/internal/stdbool.h
+syslog.o: $(hdrdir)/ruby/internal/symbol.h
+syslog.o: $(hdrdir)/ruby/internal/token_paste.h
+syslog.o: $(hdrdir)/ruby/internal/value.h
+syslog.o: $(hdrdir)/ruby/internal/value_type.h
+syslog.o: $(hdrdir)/ruby/internal/variable.h
+syslog.o: $(hdrdir)/ruby/internal/warning_push.h
+syslog.o: $(hdrdir)/ruby/internal/xmalloc.h
+syslog.o: $(hdrdir)/ruby/assert.h
 syslog.o: $(hdrdir)/ruby/backward.h
+syslog.o: $(hdrdir)/ruby/backward/2/assume.h
+syslog.o: $(hdrdir)/ruby/backward/2/attributes.h
+syslog.o: $(hdrdir)/ruby/backward/2/bool.h
+syslog.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+syslog.o: $(hdrdir)/ruby/backward/2/inttypes.h
+syslog.o: $(hdrdir)/ruby/backward/2/limits.h
+syslog.o: $(hdrdir)/ruby/backward/2/long_long.h
+syslog.o: $(hdrdir)/ruby/backward/2/stdalign.h
+syslog.o: $(hdrdir)/ruby/backward/2/stdarg.h
 syslog.o: $(hdrdir)/ruby/defines.h
 syslog.o: $(hdrdir)/ruby/intern.h
 syslog.o: $(hdrdir)/ruby/missing.h
diff --git a/ext/syslog/extconf.rb b/ext/syslog/extconf.rb
index 3bfea1fa73..1230a4d52e 100644
--- a/ext/syslog/extconf.rb
+++ b/ext/syslog/extconf.rb
@@ -4,6 +4,8 @@
 
 require 'mkmf'
 
+have_library("log") # for Android
+
 have_header("syslog.h") &&
   have_func("openlog") &&
   have_func("setlogmask") &&
diff --git a/ext/syslog/lib/syslog/logger.rb b/ext/syslog/lib/syslog/logger.rb
index 06cbe5b19d..453ca2785c 100644
--- a/ext/syslog/lib/syslog/logger.rb
+++ b/ext/syslog/lib/syslog/logger.rb
@@ -112,7 +112,7 @@ class Syslog::Logger
       end
 
       def #{meth}?
-        @level <= #{level}
+        level <= #{level}
       end
     EOM
   end
@@ -202,7 +202,7 @@ class Syslog::Logger
 
   def add severity, message = nil, progname = nil, &block
     severity ||= ::Logger::UNKNOWN
-    @level <= severity and
+    level <= severity and
       @@syslog.log( (LEVEL_MAP[severity] | @facility), '%s', formatter.call(severity, Time.now, progname, (message || block.call)) )
     true
   end
diff --git a/ext/syslog/syslog.c b/ext/syslog/syslog.c
index 9c41795f5b..4c540fc9c7 100644
--- a/ext/syslog/syslog.c
+++ b/ext/syslog/syslog.c
@@ -150,6 +150,7 @@ static VALUE mSyslog_close(VALUE self)
 static VALUE mSyslog_open(int argc, VALUE *argv, VALUE self)
 {
     VALUE ident, opt, fac;
+    const char *ident_ptr;
 
     if (syslog_opened) {
         rb_raise(rb_eRuntimeError, "syslog already open");
@@ -160,8 +161,8 @@ static VALUE mSyslog_open(int argc, VALUE *argv, VALUE self)
     if (NIL_P(ident)) {
         ident = rb_gv_get("$0");
     }
-    SafeStringValue(ident);
-    syslog_ident = strdup(RSTRING_PTR(ident));
+    ident_ptr = StringValueCStr(ident);
+    syslog_ident = strdup(ident_ptr);
 
     if (NIL_P(opt)) {
 	syslog_options = LOG_PID | LOG_CONS;
@@ -295,10 +296,6 @@ static VALUE mSyslog_set_mask(VALUE self, VALUE mask)
  *   Syslog.log(Syslog::LOG_ALERT, "Out of memory")
  *   Syslog.alert("Out of memory")
  *
- * Format strings are as for printf/sprintf, except that in addition %m is
- * replaced with the error message string that would be returned by
- * strerror(errno).
- *
  */
 static VALUE mSyslog_log(int argc, VALUE *argv, VALUE self)
 {
@@ -418,6 +415,7 @@ static VALUE mSyslogMacros_included(VALUE mod, VALUE target)
  */
 void Init_syslog(void)
 {
+#undef rb_intern
     mSyslog = rb_define_module("Syslog");
 
     mSyslogConstants    = rb_define_module_under(mSyslog, "Constants");
@@ -504,7 +502,7 @@ void Init_syslog(void)
     rb_define_syslog_facility(LOG_NEWS);
 #endif
 #ifdef LOG_NTP
-   rb_define_syslog_facility(LOG_NTP);
+    rb_define_syslog_facility(LOG_NTP);
 #endif
 #ifdef LOG_SECURITY
     rb_define_syslog_facility(LOG_SECURITY);
diff --git a/ext/syslog/syslog.gemspec b/ext/syslog/syslog.gemspec
new file mode 100644
index 0000000000..8f73f5ad0d
--- /dev/null
+++ b/ext/syslog/syslog.gemspec
@@ -0,0 +1,23 @@
+Gem::Specification.new do |spec|
+  spec.name          = "syslog"
+  spec.version       = "0.1.0"
+  spec.authors       = ["Akinori MUSHA"]
+  spec.email         = ["knu@idaemons.org"]
+
+  spec.summary       = %q{Ruby interface for the POSIX system logging facility.}
+  spec.description   = %q{Ruby interface for the POSIX system logging facility.}
+  spec.homepage      = "https://github.com/ruby/syslog"
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.licenses      = ["Ruby", "BSD-2-Clause"]
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.extensions    = ["ext/syslog/extconf.rb"]
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+end
diff --git a/ext/tk/ChangeLog.tkextlib b/ext/tk/ChangeLog.tkextlib
deleted file mode 100644
index 52a0b7ea3a..0000000000
--- a/ext/tk/ChangeLog.tkextlib
+++ /dev/null
@@ -1,949 +0,0 @@
-2009-07-12  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tkextlib/*: update release.
-	     Tcllib 1.8/Tklib 0.4.1  ==>  Tcllib 1.11.1/Tklib 0.5
-	     BWidgets 1.7            ==>  BWidgets 1.8
-	     TkTable 2.9             ==>  TkTable 2.10
-	     TkTreeCtrl 2005-12-02   ==>  TkTreeCtrl 2.2.9
-	     Tile 0.8.0/8.5.1        ==>  Tile 0.8.3/8.6b1
-	     IncrTcl 2005-02-14      ==>  IncrTcl 2008-12-15
-	     TclX 2005-02-07         ==>  TclX 2008-12-15
-	     Trofs 0.4.3             ==>  Trofs 0.4.4
-
---------------< ... some bug fixes ... >------------------
-
-Tue Nov 25 03:37:42 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tkextlib/blt/tabset.rb,
-	  ext/tk/lib/tkextlib/blt/tabnotebook.rb:
-	  fix many bugs. Now, those work properly.
-
-Sat Nov 22 10:31:25 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tkextlib/blt.rb, ext/tk/lib/tkextlib/blt/vector.rb:
-	  fix NameError bug.
-
-2008-05-12  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tkextlib/tkDND/shape.rb: wrong package name.
-
---------------< ... some changes ... >------------------
-
-2007-05-26  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tkextlib/tcllib/tablelist.rb: fix typo.
-
-	* ext/tk/lib/tkextlib/tile/dialog.rb: forget to give an argument.
-
-	* ext/tk/lib/tkextlib/version.rb: update RELEASE_DATE.
-
-2007-01-26  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tkextlib/iwidgets/checkbox.rb: wrong number of arguments
-	  [ruby-Bugs-7776].
-
-	* ext/tk/lib/tkextlib/iwidgets/radiobox.rb: ditto.
-
-	* ext/tk/lib/tkextlib/blt/tile/checkbutton.rb: change primary name
-	  of class [ruby-dev:30080].
-
-	* ext/tk/lib/tkextlib/blt/tile/radiobutton.rb: ditto.
-
-2006-11-07  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/tile/treeview.rb : minor bug fix.
-
-	* lib/tkextlib/blt/table.rb: fix bugs which forbade use of
-	  '::blt::table' command. Now, probably, it'll works properly.
-
-2006-11-06  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/version.rb: keep release date of tkextlib on
-	  "Tk::Tkextlib_RELEASE_DATE".
-
-	* lib/tkextlib/tile/treeview.rb : support Tile 0.7.8.
-	  Now, you can handle tree items as objects.
-
-2006-10-04  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/tile.rb, lib/tkextlib/tile/* : support Tile 0.7.6.
-
-2006-10-03  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/SUPPORT_STATUS: [ruby-talk:211939] check links
-	  of extensions.
-
-	* lib/tkextlib/blt/container.rb: define instance methods properly.
-
-        * lib/tkextlib/tile/tcombobox.rb: bug fix [ruby-talk:213003].
-
-	* lib/tkextlib/tile/tnotebook.rb: ditto.
-
-	* lib/tkextlib/tile/treeview.rb: ditto.
-
-	* lib/tkextlib/tile/sizegrip.rb: [new] add 'ttk::sizegrip' widget.
-
-2006-08-31  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/blt.rb: double dashes (--) option doesn't work
-	  properly on some versions of BLT (wrong description on the
-	  manual of `blt::bgexec'?).
-
-2005-12-11  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/SUPPORT_STATUS: update to support libraries in
-          ActiveTcl8.4.12.0.
-
-	* lib/tkextlib/tile/tnotebook.rb: add Tk::Tile::TNotebook#insert.
-
-	* sample/tkextlib/tile/demo.rb: improve the look of a part of the demo.
-
-2005-11-25  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* sample/tkextlib/tile/demo.rb: bug fix
-
-	* sample/tkextlib/tile/themes/*: add some themes (blue,
-	  keramik, and plastik; require Tile-0.5 or later).
-
-2005-11-22  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/tile.rb: bug fix (Tk::Tile::USE_TTK_NAMESPACE
-	  is not defined).
-
-2005-11-19  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* sample/tkextlib/treectrl/demo.rb: remove dependency on Ruby's
-	  version (1.8 or 1.9).
-
-2005-10-23  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/*: update to support ActiveTcl8.4.11.2
-
-	* lib/tkextlib/trofs/*: support Trofs 0.4.3
-
-	* lib/tkextlib/tile/*: support Tile 0.7.2
-
-	* lib/tkextlib/vu/*: support vu 2.3.0
-
-	* lib/tkextlib/tcllib/*: support Tcllib 1.8 (Tklib 0.3 part only)
-
-	* lib/tkextlib/*: improve conversion of option values
-
-2005-10-04  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/tktable/tktable.rb: border_* instance methods
-	  don't call 'border' subcommands.
-
-2005-08-10  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/blt/component.rb: didn't check
-	  __item_ruby2val_optkeys().
-
-2005-08-09  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/blt/barchart.rb: support to treat tkvariable-type
-	  configure options.
-
-	* lib/tkextlib/blt/component.rb: ditto.
-
-	* lib/tkextlib/blt/dragdrop.rb: ditto.
-
-	* lib/tkextlib/blt/treeview.rb: ditto.
-
-	* lib/tkextlib/bwidget/button.rb: ditto.
-
-	* lib/tkextlib/bwidget/entry.rb: ditto.
-
-	* lib/tkextlib/bwidget/label.rb: ditto.
-
-	* lib/tkextlib/bwidget/labelentry.rb: ditto.
-
-	* lib/tkextlib/bwidget/labelframe.rb: ditto.
-
-	* lib/tkextlib/bwidget/mainframe.rb: ditto.
-
-	* lib/tkextlib/bwidget/passwddlg.rb: ditto.
-
-	* lib/tkextlib/bwidget/spinbox.rb: ditto.
-
-	* lib/tkextlib/bwidget/tree.rb: ditto.
-
-	* lib/tkextlib/iwidgets/calendar.rb: ditto.
-
-	* lib/tkextlib/iwidgets/entryfield.rb: ditto.
-
-	* lib/tkextlib/iwidgets/hierarchy.rb: ditto.
-
-	* lib/tkextlib/iwidgets/labeledframe.rb: ditto.
-
-	* lib/tkextlib/iwidgets/labeledwidget.rb: ditto.
-
-	* lib/tkextlib/iwidgets/menubar.rb: ditto.
-
-	* lib/tkextlib/iwidgets/scrolledlistbox.rb: ditto.
-
-	* lib/tkextlib/iwidgets/spinner.rb: ditto.
-
-	* lib/tkextlib/iwidgets/toolbar.rb: ditto.
-
-	* lib/tkextlib/tkimg/pixmap.rb: ditto.
-
-	* lib/tkextlib/tktable/tktable.rb: ditto.
-
-2005-08-06  ocean  <ocean@ruby-lang.org>
-
-	* sample/tkextlib/tile/demo.rb: use Tk::Tile::Scale#variable.
-
-2005-08-04  ocean  <ocean@ruby-lang.org>
-
-	* sample/tkextlib/tile/demo.rb: followed previous changes.
-
-2005-08-04  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/tile/t*.rb: aliased class names starting with 'T'
-	  to non 'T' ones. (ie. Tk::Tile::TButton -> Tk::Tile::Button)
-	  [ruby-dev:26724]
-
-	* lib/tkextlib/tile.rb: ditto. (autoload support)
-
-2005-08-04  ocean  <ocean@ruby-lang.org>
-
-	* sample/tkextlib/tile/demo.rb: fixed: Tk::Tile::TProgressbar is
-	  supported on tile 0.6 or later, not tile 0.5.
-
-	* sample/tkextlib/tile/demo.rb: updated scales demo to use
-	  Tk::Tile::TProgressbar for tile 0.6 or later.
-
-	* sample/tkextlib/tile/demo.rb: set some TkVariable default values.
-
-2005-08-03  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/tile/treeview.rb: Tk::Tile::Treeview#headingconfigure
-	  is now working and more. [ruby-dev:26716]
-
-	* sample/tkextlib/tile/demo.rb: use Tk::Tile::Treeview#headingconfigure 	  instead of direct Tk.tk_call.
-
-2005-08-02  ocean  <ocean@ruby-lang.org>
-
-	* lib/tkextlib/tile/tprogressbar.rb: Tk::Tile::TProgressbar#start
-	  takes optional argument `interval'.
-
-	* sample/tkextlib/tile/demo.rb: emulate Tk::Tile::TProgressbar
-	  with Tk::Tile::TProgress in tile 0.4. (repeating buttons demo)
-
-2005-08-02  ocean  <ocean@ruby-lang.org>
-
-	* sample/tkextlib/tile/demo.rb: added repeating buttons demo.
-
-	* sample/tkextlib/tile/repeater.tcl: ditto. (new file)
-
-2005-08-01  ocean  <ocean@ruby-lang.org>
-
-	* lib/tkextlib/tile.rb: fixed autoload for Treeview.
-
-	* lib/tkextlib/tile/treeview.rb: replaced `ary2tk_list(items)' with
-	  `*items'.
-
-	* sample/tkextlib/tile/demo.rb: added treeview demo. (tile 0.5 or
-	  later is required) [ruby-dev:26668]
-
-2005-08-01  ocean  <ocean@ruby-lang.org>
-
-	* sample/tkextlib/tile/demo.rb: added combobox demo.
-
-2005-07-27  ocean  <ocean@ruby-lang.org>
-
-	* sample/tkextlib/tile/demo.rb: fixed typo.
-
-2005-06-16  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/SUPPOPRT_STATUS: add RELEASE_DATE information.
-
-	* lib/tkextlib/tile/style.rb: add "style element options <elem>"
-	  command support.
-
-2005-06-08  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/ICONS/icons.rb: fail to create instances of
-	  Tk::ICONS [ruby-dev:26305].
-
-2005-06-07  ocean  <ocean@ruby-lang.org>
-
-	* sample/tkextlib/tile/themes/kroc.{rb,tcl}: also support tile 0.4.
-
-2005-06-07  ocean  <ocean@ruby-lang.org>
-
-	* sample/tkextlib/tile/themes/kroc.{rb,tcl}: support tile 0.5 or later.
-	  ("pixmap" element constructor replaced by "image")
-
-2005-06-05  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* sample/tkextlib/tile/demo.rb: fix TypeError & create Console
-
-2005-05-30  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/blt.rb: add PACKAGE_NAME information of Tcl/Tk
-          Extension.
-
-	* lib/tkextlib/bwidget.rb: ditto.
-
-	* lib/tkextlib/iwidgets.rb: ditto.
-
-	* lib/tkextlib/tile.rb: ditto.
-
-	* lib/tkextlib/tkimg.rb: ditto.
-
-	* lib/tkextlib/vu.rb: ditto.
-
-	* lib/tkextlib/ICONS/icons.rb: ditto.
-
-	* lib/tkextlib/itcl/incr_tcl.rb: ditto.
-
-	* lib/tkextlib/itk/incr_tk.rb: ditto.
-
-	* lib/tkextlib/tcllib/autoscroll.rb: ditto.
-
-	* lib/tkextlib/tcllib/ctext.rb: ditto.
-
-	* lib/tkextlib/tcllib/cursor.rb: ditto.
-
-	* lib/tkextlib/tcllib/datefield.rb: ditto.
-
-	* lib/tkextlib/tcllib/ico.rb: ditto.
-
-	* lib/tkextlib/tcllib/ip_entry.rb: ditto.
-
-	* lib/tkextlib/tcllib/plotchart.rb: ditto.
-
-	* lib/tkextlib/tcllib/style.rb: ditto.
-
-	* lib/tkextlib/tcllib/tkpiechart.rb: ditto.
-
-	* lib/tkextlib/tclx/tclx.rb: ditto.
-
-	* lib/tkextlib/tkDND/shape.rb: ditto.
-
-	* lib/tkextlib/tkDND/tkdnd.rb: ditto.
-
-	* lib/tkextlib/tkHTML/htmlwidget.rb: ditto.
-
-	* lib/tkextlib/tkimg/bmp.rb: ditto.
-
-	* lib/tkextlib/tkimg/gif.rb: ditto.
-
-	* lib/tkextlib/tkimg/ico.rb: ditto.
-
-	* lib/tkextlib/tkimg/jpeg.rb: ditto.
-
-	* lib/tkextlib/tkimg/pcx.rb: ditto.
-
-	* lib/tkextlib/tkimg/pixmap.rb: ditto.
-
-	* lib/tkextlib/tkimg/png.rb: ditto.
-
-	* lib/tkextlib/tkimg/ppm.rb: ditto.
-
-	* lib/tkextlib/tkimg/ps.rb: ditto.
-
-	* lib/tkextlib/tkimg/sgi.rb: ditto.
-
-	* lib/tkextlib/tkimg/sun.rb: ditto.
-
-	* lib/tkextlib/tkimg/tga.rb: ditto.
-
-	* lib/tkextlib/tkimg/tiff.rb: ditto.
-
-	* lib/tkextlib/tkimg/window.rb: ditto.
-
-	* lib/tkextlib/tkimg/xbm.rb: ditto.
-
-	* lib/tkextlib/tkimg/xpm.rb: ditto.
-
-	* lib/tkextlib/tktable/tktable.rb: ditto.
-
-	* lib/tkextlib/tktrans/tktrans.rb: ditto.
-
-	* lib/tkextlib/treectrl/tktreectrl.rb: ditto.
-
-	* lib/tkextlib/winico/winico.rb: ditto.
-
-2005-05-25  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/iwidgets/scrolledlistbox.rb: follow the change
-          of tk.rb. modify to attend encoding.
-
-	* lib/tkextlib/iwidgets/scrolledtext.rb: ditto.
-
-	* lib/tkextlib/iwidgets/scrolledcanvas.rb: bug fix on
-	  TkCanvas#delete when given non-TkcItem arguments.
-
-2005-05-10  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/blt/winop.rb: fix typo
-
-2005-05-08  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/vu/pie.rb: fix typo
-
-2005-04-10  ocean  <ocean@ruby-lang.org>
-
-	* sample/tkextlib/treectrl/mailwasher.rb: fixed typo. [ruby-dev:26008]
-
-2005-04-09  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* sample/tkextlib/tile/demo.rb: new demo of Tile extension.
-
-	* sample/tkextlib/tile/iconlib.tcl: part of the demo.
-
-	* sample/tkextlib/tile/toolbutton.tcl: ditto.
-
-	* sample/tkextlib/tile/readme.txt: document of the demo.
-
-	* sample/tkextlib/tile/Orig_LICENSE.txt: ditto.
-
-	* sample/tkextlib/tile/themes/kroc.tcl: sample theme written with Tcl.
-
-	* sample/tkextlib/tile/themes/pkgIndex.tcl: pkgIndex of kroc.tcl.
-
-	* sample/tkextlib/tile/themes/kroc.rb: Kroc theme written with Ruby.
-
-	* sample/tkextlib/tile/themes/kroc/button-h.gif: images for Kroc theme.
-
-	* sample/tkextlib/tile/themes/kroc/button-n.gif: ditto.
-
-	* sample/tkextlib/tile/themes/kroc/button-p.gif: ditto.
-
-	* sample/tkextlib/tile/themes/kroc/check-hc.gif: ditto.
-
-	* sample/tkextlib/tile/themes/kroc/check-hu.gif: ditto.
-
-	* sample/tkextlib/tile/themes/kroc/check-nc.gif: ditto.
-
-	* sample/tkextlib/tile/themes/kroc/check-nu.gif: ditto.
-
-	* sample/tkextlib/tile/themes/kroc/radio-hc.gif: ditto.
-
-	* sample/tkextlib/tile/themes/kroc/radio-hu.gif: ditto.
-
-	* sample/tkextlib/tile/themes/kroc/radio-nc.gif: ditto.
-
-	* sample/tkextlib/tile/themes/kroc/radio-nu.gif: ditto.
-
-	* lib/tkextlib/tile.rb: bug fix (tested on the new demo).
-
-	* lib/tkextlib/tile/style.rb: ditto.
-
-	* lib/tkextlib/tile/tbutton.rb: ditto.
-
-	* lib/tkextlib/tile/tcheckbutton.rb: ditto.
-
-	* lib/tkextlib/tile/tcombobox.rb: ditto.
-
-	* lib/tkextlib/tile/tentry.rb: ditto.
-
-	* lib/tkextlib/tile/tframe.rb: ditto.
-
-	* lib/tkextlib/tile/tlabel.rb: ditto.
-
-	* lib/tkextlib/tile/tlabelframe.rb: ditto.
-
-	* lib/tkextlib/tile/tmenubutton.rb: ditto.
-
-	* lib/tkextlib/tile/tnotebook.rb: ditto.
-
-	* lib/tkextlib/tile/tprogressbar.rb: ditto.
-
-	* lib/tkextlib/tile/tradiobutton.rb: ditto.
-
-	* lib/tkextlib/tile/treeview.rb: ditto.
-
-	* lib/tkextlib/tile/tscrollbar.rb: ditto.
-
-	* lib/tkextlib/tile/tseparator.rb: ditto.
-
-	* lib/tkextlib/tile/tsquare.rb: ditto.
-
-	* lib/tkextlib/tile/tpaned.rb: new library
-
-	* lib/tkextlib/tile/tscale.rb: ditto.
-
-	* lib/tkextlib/SUPPORT_STATUS: update support status of Tile extension.
-
-	* lib/tkextlib/tcllib/ctext.rb: use TkCommandNames on create_self().
-
-	* lib/tkextlib/tcllib/datefield.rb: ditto.
-
-	* lib/tkextlib/tcllib/ip_entry.rb: ditto.
-
-	* lib/tkextlib/tkHTML/htmlwidget.rb: ditto.
-
-	* lib/tkextlib/treectrl/tktreectrl.rb: ditto.
-
-2005-04-09  ocean  <ocean@ruby-lang.org>
-
-	* sample/tkextlib/treectrl/explorer.rb: File.executable? returns true
-	  even if it's plain text file. (this function only checks access right)
-
-2005-04-09  ocean  <ocean@ruby-lang.org>
-
-	* sample/tkextlib/treectrl/{help,www-options}.rb: fixed typo.
-	  (click or resize column header)
-
-2005-04-09  ocean  <ocean@ruby-lang.org>
-
-	* sample/tkextlib/treectrl/imovie.rb: fixed typo. (click on clip title)
-
-2005-04-08  ocean  <ocean@ruby-lang.org>
-
-	* sample/tkextlib/treectrl/random.rb: fixed typo. (drop node outside of
-	  widget, or reenter widget while dragging)
-
-2005-04-08  ocean  <ocean@ruby-lang.org>
-
-	* sample/tkextlib/treectrl/outlook-newgrounp.rb: image had disappered when
-	  node was selected.
-
-2005-04-08  ocean  <ocean@ruby-lang.org>
-
-	* sample/tkextlib/treectrl/{random,outlook-newgroup}.rb:
-	  tk::treectrl uses 'afterId' not 'afterID'.
-
-	* sample/tkextlib/treectrl/{random,outlook-newgroup}.rb:
-	  item_firstchild can return empty string. (drop node to leaf node)
-
-	* sample/tkextlib/treectrl/random.rb: Enumerable#find didn't work properly
-	  because tried to compare String with Integer. (drag node and leave widget)
-
-	* sample/tkextlib/treectrl/random.rb: and some fixes.
-
-2005-04-08  ocean  <ocean@ruby-lang.org>
-
-	* lib/tkextlib/treectrl/tktreectrl.rb (selection_clear): fixed typo.
-
-	* sample/tkextlib/treectrl/random.rb: node deselection now works.
-
-	* sample/tkextlib/treectrl/demo.rb: fixed typo. (popup menu on column header)
-
-2005-04-08  ocean  <ocean@ruby-lang.org>
-
-	* sample/tkextlib/treectrl/help.rb: fixed typo. (wrong color)
-
-2005-04-08  ocean  <ocean@ruby-lang.org>
-
-	* sample/tkextlib/treectrl/random.rb: fixed typo. (wrong itemheight)
-
-	* sample/tkextlib/treectrl/outlook-newgroup.rb: ditto.
-
-	* sample/tkextlib/treectrl/explorer.rb: ditto.
-
-	* sample/tkextlib/treectrl/help.rb: ditto.
-
-2005-04-07  ocean  <ocean@ruby-lang.org>
-
-	* sample/tkextlib/treectrl/*.rb: some speed up... cache the result of
-	  version checking.
-
-2005-04-07  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/treectrl/tktreectrl.rb: performance tuning by calling
-	  tk_send_without_enc. [ruby-dev:25997]
-
-2005-04-04  ocean  <ocean@ruby-lang.org>
-
-	* lib/tkextlib/tktable/tktable.rb: added Tk::TkTable#selection_present.
-
-2005-04-02  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/treectrl/tktreectrl.rb: support TreeCtrl's cvs head.
-
-2005-04-02  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/blt/component.rb: add TreeCtrl#legend_window_create().
-
-	* sample/tkextlib/blt/graph6.rb: use legend_window_create().
-
-	* lib/tkextlib/blt/tree.rb: forget to call tagid().
-
-	* lib/tkextlib/blt/treeview.rb: ditto.
-
-2005-04-01  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* sample/tkextlib/treectrl/demo.rb: bridge the gap of
-	  Hash#index or Hash#key between ruby 1.8 and 1.9
-
-2005-04-01  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/blt/component.rb: bug fix on treatment of
-	  component objects.
-
-	* sample/tkextlib/blt/graph6.rb: a new sample script.
-
-2005-03-31  ocean  <ocean@ruby-lang.org>
-
-	* sample/tkextlib/treectrl/demo.rb: should use Hash#index.
-
-	* sample/tkextlib/treectrl/demo.rb: TkImage was not
-	  cached properly.
-
-	* sample/tkextlib/treectrl/random.rb: fixed typo.
-
-2005-03-31  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* sample/tkextlib/iwidgets/sample/hierarchy.rb: show basename
-	  only [ruby-dev:25970]
-
-	* sample/tkextlib/treectrl/demo.rb: add check for existence of
-	  'backgroundimage' option.
-
-	* sample/tkextlib/treectrl/bitmaps.rb: ditto.
-
-	* sample/tkextlib/treectrl/outlook-newgroup.rb: lack of '%I'
-	  event callback argument.
-
-2005-03-31  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* sample/tkextlib/iwidgets/sample/hierarchy.rb: fail to treat
-	  Japanese (i18n?) filenames.
-
-2005-03-30  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* sample/tkextlib/bwidget/tree.rb: use 'return' in the Proc object.
-
-	* sample/tkextlib/tkHTML/hv.rb: ditto.
-
-	* sample/tkextlib/tkHTML/ss.rb: ditto.
-
-	* sample/tkextlib/tktable/basic.rb: ditto.
-
-	* sample/tkextlib/tktable/command.rb: ditto.
-
-	* sample/tkextlib/tktable/debug.rb: ditto.
-
-	* sample/tkextlib/tktable/maxsize.rb: ditto.
-
-	* sample/tkextlib/treectrl/demo.rb: ditto.
-
-2005-03-29  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/blt/component.rb: cannot create elements except
-	  default type of element.
-
-	* lib/tkextlib/blt/barchart.rb: ditto.
-
-	* lib/tkextlib/blt/graph.rb: ditto.
-
-	* lib/tkextlib/blt/stripchart.rb: ditto.
-
-	* lib/tkextlib/blt/component.rb: axis command option gets
-	  proper object type of arguments.
-
-	* sample/tkextlib/blt/calendar.rb: new sample.
-
-	* sample/tkextlib/blt/pareto.rb: ditto.
-
-2005-03-28  ocean  <ocean@ruby-lang.org>
-
-	* lib/tkextlib/iwidgets/notebook.rb: fixed typo.
-
-2005-03-26  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/blt.rb: add commands for zooming.
-
-	* lib/tkextlib/blt/bitmap.rb (new_with_name): add for using
-          given name.
-
-	* lib/tkextlib/blt/busy.rb: bug fix on Tk::BLT::Busy::Shild class.
-
-	* lib/tkextlib/blt/component.rb: typo fix.
-
-	* lib/tkextlib/blt/component.rb: fix lack of *_create methods
-
-	* lib/tkextlib/blt/component.rb: proper call on xaxis_* and so on.
-
-	* lib/tkextlib/blt/htext.rb: add TkVariable object to access
-          special Tcl variables.
-
-	* lib/tkextlib/treectrl/tktreectrl.rb: typo fix.
-
-	* lib/tkextlib/treectrl/tktreectrl.rb: proper treatment
-          of 'font' option of element_configure.
-
-	* lib/tkextlib/treectrl/tktreectrl.rb: bug fix on item_sort.
-
-	* lib/tkextlib/treectrl/tktreectrl.rb: add methods to
-          call TreeCtrl commands for bindings.
-
-	* sample/tkextlib/blt/*: add some sample scripts.
-
-	* sample/tkextlib/treectrl/*: add some sample scripts.
-
-2005-03-18  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/treectrl/tktreectrl.rb: bug fix and define some
-	  classes for components of Tk::TreeCtrl
-
-2005-03-17  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/treectrl/tktreectrl.rb: call wrong method in
-	  Tk::TreeCtrl#*_configinfo and current_*_configinfo method
-
-2005-03-16  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/SUPPORT_STATUS: change the status of TkImg
-
-	* lib/tkextlib/treectrl/tktreectrl.rb: bug fix and support
-	  TkTreeCtrl-1.1
-
-	* lib/tkextlib/SUPPORT_STATUS: change the supported version of
-	  TkTreeCtrl
-
-2005-03-15  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* sample/tkextlib/tkimg: add sample
-
-2005-03-06  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/SUPPORT_STATUS: add version info of each extension
-
-2005-03-05  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/tile.rb: lack of "autoload TProgressbar"
-
-2005-03-05  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/tile.rb: support tile-0.6
-
-	* lib/tkextlib/tile/tbutton.rb: ditto
-
-	* lib/tkextlib/tile/tcheckbutton.rb: ditto
-
-	* lib/tkextlib/tile/tlabel.rb: ditto
-
-	* lib/tkextlib/tile/tmenubutton.rb: ditto
-
-	* lib/tkextlib/tile/tnotebook.rb: ditto
-
-	* lib/tkextlib/tile/tradiobutton.rb: ditto
-
-	* lib/tkextlib/tile/tcombobox.rb: [new] ditto
-
-	* lib/tkextlib/tile/tentry.rb: [new] ditto
-
-	* lib/tkextlib/tile/tframe.rb: [new] ditto
-
-	* lib/tkextlib/tile/tlabelframe.rb: [new] ditto
-
-	* lib/tkextlib/tile/tprogressbar.rb: [new] ditto
-
-	* lib/tkextlib/tile/treeview.rb: [new] ditto
-
-	* lib/tkextlib/tile/tscrollbar.rb: [new] ditto
-
-	* lib/tkextlib/tile/tseparator.rb: [new] ditto
-
-	* lib/tkextlib/tile/tsquare.rb: [new] ditto
-
-2005-02-20  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/tclx/tclx.rb: warning TclX's 'signal' command.
-
-2005-01-25  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/blt/component.rb: bug fix. cannot accept
-          a callback ID string for a command argument. [ruby-dev:25479]
-
-	* lib/tkextlib/blt/tabset.rb: ditto
-
-	* lib/tkextlib/blt/treeview.rb: ditto
-
-	* lib/tkextlib/bwidget/labelentry.rb: ditto
-
-	* lib/tkextlib/bwidget/listbox.rb: ditto
-
-	* lib/tkextlib/bwidget/notebook.rb: ditto
-
-	* lib/tkextlib/bwidget/spinbox.rb: ditto
-
-	* lib/tkextlib/bwidget/tree.rb: ditto
-
-	* lib/tkextlib/itk/incr_tk.rb: ditto
-
-	* lib/tkextlib/iwidgets/scrolledcanvas.rb: ditto
-
-	* lib/tkextlib/tkDND/tkdnd.rb: ditto
-
-	* lib/tkextlib/treectrl/tktreectrl.rb: ditto
-
-	* sample/tkextlib/tkHTML/ss.rb: local variable scope bug fix
-          [ruby-dev:25479]
-
-	* sample/tkextlib/vu/vu_demo.rb: rename from vu.rb; avoid the bug on
-	  Windows version of Tcl/Tk. The trouble based on the bug occurs when
-	  the script name (without extension) is a same name as a Tcl/Tk's
-	  library file name (without extension) required in the script.
-
-2004-12-24  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/blt: add BLT extension support
-
-2004-12-16  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/bwidget/labelentry.rb: use TkCore.callback_obj?()
-
-	* lib/tkextlib/bwidget/listbox.rb: ditto
-
-	* lib/tkextlib/bwidget/notebook.rb: ditto
-
-	* lib/tkextlib/bwidget/spinbox.rb: ditto
-
-	* lib/tkextlib/itk/incr_tk.rb: ditto
-
-	* lib/tkextlib/iwidgets/scrolledcanvas.rb: ditto
-
-	* lib/tkextlib/tkDND/tkdnd.rb: ditto
-
-	* lib/tkextlib/treectrl/tktreectrl.rb: ditto
-
-	* lib/tkextlib/winico/winico.rb: ditto
-
-2004-12-10  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/tile/style.rb: 'theme_use' method bug fix
-
-2004-12-08  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/bwidget/notebook.rb: raise method cannot return
-          the raised page.
-
-	* lib/tkextlib/bwidget/labelentry.rb: bind methods accept
-          subst_args + block
-
-	* lib/tkextlib/bwidget/listbox.rb: ditto
-
-	* lib/tkextlib/bwidget/notebook.rb: ditto
-
-	* lib/tkextlib/bwidget/spinbox.rb: ditto
-
-	* lib/tkextlib/bwidget/tree.rb: ditto
-
-	* lib/tkextlib/itk/incr_tk.rb: ditto
-
-	* lib/tkextlib/iwidgets/scrolledcanvas.rb: ditto
-
-	* lib/tkextlib/tkDND/tkdnd.rb: ditto
-
-	* lib/tkextlib/treectrl/tktreectrl.rb: ditto
-
-2004-11-26  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/bwidget/notebook.rb: uses epath
-
-	* lib/tkextlib/bwidget/widget.rb: ditto
-
-	* lib/tkextlib/tktable/tktable.rb: ditto
-
-	* lib/tkextlib/tcllib/cursor.rb: ditto, and bug fix
-
-2004-11-10  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/tile/style.rb: bug fix
-
-2004-11-07  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/iwidgets/scrolledcanvas.rb: bind-event methods
-	  accept multi substitution arguments.
-
-	* lib/tkextlib/tktable/tktable.rb: ditto.
-
-	* lib/tkextlib/treectrl/tktreectrl.rb: ditto
-
-2004-11-03  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/SUPPORT_STATUS: BLT moves to 'plan to support'
-          from 'not determined'
-
-	* lib/tkextlib/itk/incr_tk.rb: __cget_cmd and __config_cmd are
-          private methods
-
-	* lib/tkextlib/tcllib/autoscroll.rb: extend TkCore
-
-	* lib/tkextlib/tcllib/cursor.rb: ditto.
-
-	* lib/tkextlib/tcllib/plotchart.rb: ditto.
-
-	* lib/tkextlib/tcllib/style.rb: ditto.
-
-	* lib/tkextlib/tile/style.rb: ditto.
-
-	* lib/tkextlib/tkDND/shape.rb: ditto.
-
-2004-10-24  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/bwidget/tree.rb: bug fix on Windows
-
-2004-10-16  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/tcllib/ico.rb: new library (Tk::Tcllib:ICO)
-
-	* lib/tkextlib/tcllib.rb: add Tk::Tcllib::ICO (based on tcllib 1.7)
-
-2004-10-06  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/bwidget.rb (BWidget.grab): bug fix
-
-	* lib/tkextlib/tcllib.rb: typo fix
-
-2004-07-28  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/add winico support
-
-2004-07-23  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* lib/tkextlib/add TclX support (partially; infox command and
-          XPG/3 MsgCat only)
-
-2004-07-15  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* bug fix
-
-	* support TkTable extension
-
-2004-07-12  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* bug fix
-
-	* support Iwidgets extension
-
-2004-07-10  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* bug fix
-
-	* add more part of [incr Widget] support (about 65%? are complete)
-
-	* use Tk::ValidateConfigure.__def_validcmd() method
-          (new function to define validatecommand methods easier)
-
-	* tcllib.rb : avoid the loading trouble that almost all part of
-	  the extension is not available when some libraries are invalid.
-
-2004-07-09  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* add some part of [incr Widget] support (about 50%? are complete)
-
-2004-07-07  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* add [incr Tck], [incr Tk] support
-
-2004-07-06  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* support BWidget extension
-
-	* add BWidget extension demo
-
-	* add ICONS extension demo
-
-	* many bug fix
-
-2004-07-01  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* 1st release of tkextlib ( to support Tcl/Tk extensions )
diff --git a/ext/tk/MANUAL_tcltklib.eng b/ext/tk/MANUAL_tcltklib.eng
deleted file mode 100644
index 7d4804ef8a..0000000000
--- a/ext/tk/MANUAL_tcltklib.eng
+++ /dev/null
@@ -1,467 +0,0 @@
-(tof)
-                                    2005/07/05  Hidetoshi NAGAI
-
-This document describes about the 'tcltklib' library. Although there
-is the 'tcltk' library (tcltk.rb) under this directory, no description
-in this document (because it is not maintained recently).
-
-==============================================================
-module TclTklib
-  : Defines methods to do operations which are independed on
-  : Tcl/Tk interpreters
-
-  module TclTkLib::EventFlag
-    : Defines flags to define target events on 'do_one_event' methods.
-    : When to give, please use bit-operator (e.g. WINDOW | DONT_WAIT).
-
-    [constants]
-       NONE
-         : Is 0. It means "there is no target". But on the real
-         : operation, it is same to ALL.
-
-       WINDOW
-         : 'window' event is processed.
-
-       FILE
-         : 'file' event is processed.
-
-       TIMER
-         : 'timer' event is processed.
-
-       IDLE
-         : 'idle' operation (e.g. 're-draw'; the operations when the
-         : other kinds of events doesn't occur) is processed.
-
-       ALL
-         : All kinds of events are processed.
-         : Same to 'WINDOW | FILE | TIMER | IDLE'.
-
-       DONT_WAIT
-         : Without this flag, 'do_one_event' waits the occurrence of
-         : a target event. With this flag, doesn't wait and returns
-         : false if there is no target event for processing.
-
-  module TclTkLib::VarAccessFlag
-    : Defines flags to give '_get_variable' and so on. When to give,
-    : please use bit-operator (e.g. GLOBAL_ONLY | LEAVE_ERR_MSG ).
-
-    [constants]
-       NONE
-         : Is 0. It means "set no flag".
-
-       GLOBAL_ONLY
-         : (site Tcl/Tk's man page)
-         : Under normal circumstances the procedures look up
-         : variables as follows: If a procedure call is active
-         : in interp, a variable is looked up at the current
-         : level of procedure call. Otherwise, a variable is
-         : looked up first in the current namespace,  then  in
-         : the global namespace. However, if this bit is set
-         : in flags then the variable is looked up only in the
-         : global namespace even if there is a procedure call
-         : active. If both GLOBAL_ONLY and NAMESPACE_ONLY are
-         : given, GLOBAL_ONLY is ignored.
-         :
-         :  *** ATTENTION ***
-         : Tcl7.6 doesn't have namespaces. So NAMESPACE_ONLY
-         : is defined as 0, and then GLOBAL_ONLY is available
-         : even if flag is (GLOBAL_ONLY | NAMESPACE_ONLY).
-
-       NAMESPACE_ONLY
-         : (site Tcl/Tk's man page)
-         : Under normal circumstances the procedures look up
-         : variables as follows: If a procedure call is active
-         : in interp, a variable is looked up at the current
-         : level of procedure call. Otherwise, a variable is
-         : looked up first in the current namespace, then in
-         : the global namespace. However, if this bit is set
-         : in flags then the variable is looked up only in the
-         : current namespace even if there is a procedure call
-         : active.
-         :
-         :  *** ATTENTION ***
-         : Tcl7.6 doesn't have namespaces. So NAMESPACE_ONLY
-         : is defined as 0.
-
-       LEAVE_ERR_MSG
-         : (site Tcl/Tk's man page)
-         : If an error is returned and this bit is set in flags,
-         : then an error message will be left in the interpreter's
-         : result, where it can be retrieved with Tcl_GetObjResult
-         : or Tcl_GetStringResult. If this flag bit isn't set then
-         : no error message is left and the interpreter's result
-         : will not be modified.
-
-       APPEND_VALUE
-         : (site Tcl/Tk's man page)
-         : If this bit is set then newValue is appended to the
-         : current value, instead of replacing it. If the variable
-         : is currently undefined, then this bit is ignored.
-
-       LIST_ELEMENT
-         : (site Tcl/Tk's man page)
-         : If this bit is set, then newValue is converted to a
-         : valid Tcl list element before setting (or appending
-         : to) the variable. A separator space is appended before
-         : the new list element unless the list element is going
-         : to be the first element in a list or sublist (i.e. the
-         : variable's current value is empty, or contains the
-         : single character ``{'', or ends  in `` }'').
-
-       PARSE_VARNAME
-         : (site Tcl/Tk's man page)
-         : If this bit is set when calling _set_variable and so
-         : on, var_name argument may contain both an array and an
-         : element name: if the name contains an open parenthesis
-         : and ends with a close parenthesis, then the value
-         : between the parentheses is treated as an element name
-         : (which can have any string value) and the characters
-         : before  the first open parenthesis are treated as the
-         : name of an array variable. If the flag PARSE_VARNAME
-         : is given, index_name argument should be 'nil' since the
-         : array and element names are taken from var_name.
-         :
-         :  *** ATTENTION ***
-         : Tcl7.6 doesn't have this flag. So PARSE_VARNAME is
-         : defined as 0.
-
-  module TclTkLib::RELEASE_TYPE
-    : Defines release type number of Tcl/Tk
-
-       ALPHA
-         : ALPHA release
-
-       BETA
-         : BETA release
-
-       FINAL
-         : FINAL release
-
-  [module methods]
-     get_version()
-        : return an array of major, minor, release-type number,
-        : and patchlevel of current Tcl/Tk library.
-
-     mainloop(check_root = true)
-       : Starts the eventloop. If 'check_root' is true, this method
-       : doesn't return when a root widget exists.
-       : If 'check_root' is false, doesn't return by the other
-       : reasons than exceptions.
-
-    mainloop_thread?
-       : Returns whether the current thread executes the eventloop.
-       : If true, the eventloop is working on the current thread.
-       : If no eventloop is working, this method returns nil.
-       : And if the other thread executes the eventloop, returns false.
-       :
-       :  *** ATTENTION ***
-       : When this methods returns false, it is dangerous to call a Tk
-       : interpreter directly.
-
-    mainloop_watchdog(check_root = true)
-       : On the normal eventloop, some kinds of callback operations
-       : cause deadlock. To avoid some of such deadlocks, this
-       : method starts an eventloop and a watchdog-thread.
-
-    do_one_event(flag = TclTkLib::EventFlag::ALL |
-                          TclTkLib::EventFlag::DONT_WAIT)
-       : Do one event for processing. When processed an event,
-       : returns true.
-       : If NOT set DONT_WAIT flag, this method waits occurrence of
-       : a target event.
-       : If set DONT_WAIT flag and no event for processing, returns
-       : false immediately.
-       : If $SAFE >= 1 and the flag is tainted,
-       : force to set DONT_WAIT flag.
-
-    set_eventloop_tick(timer_tick)
-       : Define the interval of thread-switching with an integer
-       : value of mili-seconds.
-       : Default timer_tick is 0. It means that thread-switching
-       : is based on the count of processed events.
-       : ( see 'set_eventloop_weight' method )
-       : However, if the eventloop thread is the only thread,
-       : timer_tick cannot be set to 0. If 0, then is set to 100 ms
-       : automatically (see NO_THREAD_INTERRUPT_TIME on tcltklib.c).
-
-    get_eventloop_tick
-       : Get current value of 'timer_tick'
-
-    set_no_event_wait(no_event_wait)
-       : Define sleeping time of the eventloop when two or more
-       : thread are running and there is no event for processing.
-       : Default value is 20 (ms).
-       : If the eventloop thread is the only thread, this value is
-       : invalid.
-
-    get_no_event_wait
-       : Get current value of 'no_event_wait'.
-
-    set_eventloop_weight(loop_max, no_event_tick)
-       : Define the weight parameters for the eventloop thread.
-       : That is invalid when the eventloop is the only thread.
-       : 'loop_max' is the max events for thread-switching.
-       : 'no_event_tick' is the increment value of the event count
-       : when no event for processing (And then, the eventloop thread
-       : sleeps 'no_event_wait' mili-seconds).
-       : 'loop_max == 800' and 'no_event_tick == 10' are default.
-
-    get_eventloop_weight
-       : Get current values of 'loop_max' and 'no_event_tick'.
-
-    mainloop_abort_on_exception=(bool)
-       : Define whether the eventloop stops on exception or not.
-       : If true (default value), stops on exception.
-       : If false, show a warning message but ignore the exception.
-       : If nil, no warning message and ignore the exception.
-       : This parameter is sometimes useful when multiple Tk
-       : interpreters are working. Because the only one eventloop
-       : admins all Tk interpreters, sometimes exception on a
-       : interpreter kills the eventloop thread. Even if such
-       : situation, when abort_on_exception == false or nil,
-       : the eventloop ignores the exception and continue to working.
-
-    mainloop_abort_on_exception
-       : Get current status of that.
-
-    num_of_mainwindows
-       : Returns the number of main-windows (root-widget).
-       : Because there is only one main-window for one Tk interpreter,
-       : the value is same to the number of interpreters which has
-       : available Tk functions.
-
-    _merge_tklist(str, str, ... )
-       : Get a Tcl's list string from arguments with a Tcl/Tk's
-       : library function. Each argument is converted to a valid
-       : Tcl list element.
-
-    _conv_listelement(str)
-       : Convert the argument to a valid Tcl list element with
-       : Tcl/Tk's library function.
-
-    _toUTF8(str, encoding=nil)
-    _fromUTF8(str, encoding=nil)
-       : Call the function (which is internal function of Tcl/Tk) to
-       : convert to/from a UTF8 string.
-
-    _subst_UTF_backslash(str)
-    _subst_Tcl_backslash(str)
-       : Substitute backslash sequence with Tcl's rule (include \uhhhh;
-       : give a sixteen-bit hexadecimal value for Unicode character).
-       : _subst_Tcl_backslash method parses all backslash sequence.
-       : _subst_UTF_backslash method parses \uhhhh only.
-
-    encoding_system
-    encoding_system=(encoding)
-       : Get and set Tcl's system encoding.
-
-    encoding
-    encoding=(encoding)
-       : alias of encoding_system / encoding_system=
-       : ( probably, Ruby/Tk's tk.rb will override them )
-
-
-class TclTkIp
-  [class methods]
-    new(ip_name=nil, options='')
-       : Generate an instance of TclTkIp class.
-       : If 'ip_name' argument is given as a string, it is the name
-       : of the Tk interpreter which is shown by 'winfo interps'
-       : command.
-       : 'options' argument accepts a string which is the command
-       : line options of wish; such as '-geometry' or '-use'.
-       : The information is used to generate the root widget of the
-       : interpreter.
-       : ( e.g. TclTkIp.new('FOO', '-geometry 500x200 -use 0x2200009') )
-       : If is given nil or false for the 'option' argument, generates
-       : the Tcl interpreter without Tk library. Then the interpreter
-       : doesn't need GUI environment. Therefore, even if a window
-       : system doesn't exist or cannot be used, Ruby can control the
-       : Tcl interpreter and the extension libraries loaded on the
-       : interpreter.
-
-  [instance methods]
-    create_slave(name, safe=false)
-       : Create a slave interpreter.
-       : The parent of the interpreter is the receiver of this method.
-       : The name of the slave interpreter is given by 'name' argument.
-       : The 'safe' argument decides whether the slave interpreter is
-       : created as a safe interpreter or not. If true, create a safe
-       : interpreter. Default is false. However, if the parent
-       : interpreter is a safe interpreter, the created interpreter is
-       : a safe interpreter (ignore 'safe' argument value).
-
-    make_safe
-       : Make the interpreter to the safe interpreter, and returns
-       : self. If fail, raise RuntimeError.
-
-    safe?
-       : Check whether the interpreter is the safe interpreter.
-       : If is the safe interpreter, returns true.
-
-    allow_ruby_exit?
-       : Return the mode whether 'exit' function of ruby or 'exit'
-       : command of Tcl/Tk can quit the ruby process or not on the
-       : interpreter. If false, such a command quit the interpreter
-       : only.
-       : The default value for a master interpreter is true, and
-       : for a slave interpreter is false.
-
-    allow_ruby_exit=(mode)
-       : Change the mode of 'allow_ruby_exit?'.
-       : If the interpreter is a "safe" interpreter,
-       : this is not permitted (raise an exception).
-
-    delete
-       : Delete the interpreter.
-       : The deleted interpreter doesn't accept command and then
-       : raise an exception.
-
-    deleted?
-       : Check whether the interpreter is already deleted.
-       : If deleted, returns true.
-
-    has_mainwindow?
-       : Check whether the interpreter has a MainWindow (root widget).
-       : If has, returns true. If doesn't, returns false.
-       : If IP is already deleted, returns nil.
-
-    restart
-       : Restart Tk part of the interpreter.
-       : Use this when you need Tk functions after destroying the
-       : root widget.
-
-    _eval(str)
-    _invoke(*args)
-       : Estimates the arguments as a command on the Tk interpreter.
-       : The argument of _eval is a script of Tcl/Tk.
-       : Each argument of _invoke is a token of one command line of
-       : Tcl/Tk.
-       : Because the operation of _invoke doesn't through the
-       : command line parser of Tk interpreter, the cost of
-       : estimation is smaller than _eval. However, auto_load
-       : mechanism of the Tk interpreter doesn't work on _invoke.
-       : So _invoke can call only the command which already
-       : registered on the interpreter by 'load' command and so on.
-       : On _eval command, auto_load mechanism words. So if succeed
-       : to _eval and register the command once, after that, the
-       : command can be called by _invoke.
-
-    _cancel_eval(str)
-    _cancel_eval_unwind(str)
-       : (Tcl/Tk8.6 or later)
-       : Call Tcl_CancelEval() function, and cancel evaluation.
-
-    _toUTF8(str, encoding=nil)
-    _fromUTF8(str, encoding=nil)
-       : Call the function (which is internal function of Tcl/Tk) to
-       : convert to/from a UTF8 string.
-
-    _thread_vwait(var_name)
-    _thread_tkwait(mode, target)
-       : 'vwait' or 'tkwait' with thread support.
-       : The difference from normal 'vwait' or 'tkwait' command is
-       : doing independent wait from the vwait stack when they are
-       : called on the other thread than the eventloop thread.
-       : In the case of Tcl/Tk's vwait / tkwait, if 2nd vwait /
-       : tkwait is called on waiting for 1st vwait / tkwait,
-       : returns the order of [2nd]->[1st] regardless of the order
-       : of when the wait condition was fulfilled.
-       : If _thread_vwait / _thread_tkwait is called on the
-       : eventloop thread, there is no difference from vwait /
-       : tkwait. But if called on the other thread than the
-       : eventloop, stops the thread.  And when the wait condition
-       : is fulfilled, the thread restarts. The meaning of
-       : "independent from the vwait stack" is that the timing of
-       : restarting is independent from the waiting status of the
-       : other threads. That is, even if the eventloop thread is
-       : waiting by vwait and is not fulfilled the condition,
-       : _thread_vwait completes the waiting when its waiting
-       : condition is fulfilled and the thread which stopped by
-       : _thread_vwait can continue the operation.
-
-    _return_value
-       : Get the last result value on the interpreter.
-
-    _get_variable(var_name, flag)
-    _get_variable2(var_name, index_name, flag)
-       : Get the current value of a variable. If specified a
-       : index_name (see also the PARSE_VARNAME flag), get the
-       : value of the index_name element.
-
-    _set_variable(var_name, value, flag)
-    _set_variable2(var_name, index_name, value, flag)
-       : Create or modify a variable. If specified a index_name
-       : (see also the PARSE_VARNAME flag), create or modify the
-       : index_name element.
-
-    _unset_variable(var_name)
-    _unset_variable2(var_name, index_name)
-       : Remove a variable. If specified a index_name (see also
-       : the PARSE_VARNAME flag), remove the index_name element.
-
-    _get_global_var(var_name)
-    _get_global_var2(var_name, index_name)
-    _set_global_var(var_name, value)
-    _set_global_var2(var_name, index_name, value)
-    _unset_global_var(var_name)
-    _unset_global_var2(var_name, index_name)
-       : Call the associated method with the flag argument
-       : (GLOBAL_ONLY | LEAVE_ERR_MSG).
-
-    _split_tklist(str)
-       : Split the argument with Tcl/Tk's library function and
-       : get an array as a list of Tcl list elements.
-
-    _merge_tklist(str, str, ... )
-       : Get a Tcl's list string from arguments with a Tcl/Tk's
-       : library function. Each argument is converted to a valid
-       : Tcl list element.
-
-    _conv_listelement(str)
-       : Convert the argument to a valid Tcl list element with
-       : Tcl/Tk's library function.
-
-    mainloop
-    mainloop_watchdog
-       : If on the slave interpreter, never start an eventloop and
-       : returns nil.
-       : With the exception that, same to the TclTkLib module method
-       : with the same name.
-
-    do_one_event
-       : With the exception that the argument is forced to set
-       : DONT_WAIT flag on the slave interpreter, same to
-       : TclTkLib#do_one_event.
-
-    set_eventloop_tick
-    get_eventloop_tick
-    set_no_event_wait
-    get_no_event_wait
-    set_eventloop_weight
-    get_eventloop_weight
-    mainloop_abort_on_exception
-    mainloop_abort_on_exception=
-       : With the exception that it is ignored to set value on the
-       : slave interpreter, same to the TclTkLib module method with
-       : the same name.
-
-    encoding_table
-       : For Ruby m17n. Return encoding relation table between Ruby's
-       : Encoding object and Tcl's encoding name.
-
-class TkCallbackBreak < StandardError
-class TkCallbackContinue < StandardError
-  : They are exception classes to break or continue the Tk callback
-  : operation.
-  : If raise TkCallbackBreak on the callback procedure, Ruby returns
-  : 'break' code to Tk interpreter (Then the Tk interpreter will
-  : break the operation for the current event).
-  : If raise TkCallbackContinue, returns 'continue' code (Then the Tk
-  : interpreter will break the operation for the current bindtag and
-  : starts the operation for the next bindtag for the current event).
-  : However, current tcltklib supports Ruby's 'break' and 'next' to
-  : get the same effect. That is, those classes are obsolete. Those
-  : exist for backward compatibility.
-
-(eof)
diff --git a/ext/tk/MANUAL_tcltklib.ja b/ext/tk/MANUAL_tcltklib.ja
deleted file mode 100644
index 8641909517..0000000000
--- a/ext/tk/MANUAL_tcltklib.ja
+++ /dev/null
@@ -1,578 +0,0 @@
-(tof)
-                                    2005/07/05  Hidetoshi NAGAI
-
-本ドキュメントには古い tcltk ライブラリ，tcltklib ライブラリの説明
-が含まれていますが，その記述内容は古いものとなっています．
-
-tcltk ライブラリ（tcltk.rb）は現在ではメンテナンスが事実上行われて
-いないため，古いドキュメントの説明がそのまま有効です．それに対し，
-tcltklib ライブラリについては，現在の Ruby/Tk（tk.rb 以下のライブラ
-リ群）を稼働させるための中心としてメンテナンスされているため，少々
-違いが生じています．
-
-そこで，まず古い説明文書を示した後，現在の tcltklib ライブラリにつ
-いての説明を加えます．
-
-以下がライブラリの古い説明文書です．
-==============================================================
-	MANUAL.euc
-		Sep. 19, 1997	Y. Shigehiro
-
-以下, 「tcl/tk」という表記は, tclsh や wish を実現している, 一般でいう
-ところの tcl/tk を指します. 「tcltk ライブラリ」, 「tcltklib ライブラ
-リ」という表記は, 本パッケージに含まれる ruby 用のライブラリを指します.
-
-<< tcltk ライブラリ >>
-
-tcl/tk の C ライブラリを利用するための高(中?)水準インターフェースを提
-供します.
-
-このライブラリは ruby から tcl/tk ライブラリを利用するためのもので, 内
-部で tcltklib ライブラリを利用しています.
-
-[説明]
-
-tcl/tk インタプリタでは, ウィジェットに何か指示を送るには, ウィジェッ
-ト名に続いてパラメータを書きます. したがって, ウィジェットがオブジェク
-トであり, それに対してメソッドを送っている, とみなすことができます. さ
-て, tcl/tk インタプリタでは, 組み込みコマンドも, 前述のウィジェットと
-同じような書式の命令で実行されます. すなわち, コマンドもオブジェクトで
-あると考えることができます.
-
-このような考えに基づき, tcltk ライブラリでは, tcl/tk のコマンドやウィ
-ジェットに対応するオブジェクトを生成します. オブジェクトに対するメソッ
-ド呼び出しは, e() メソッドにより実行されます. 例えば, tcl/tk の info
-コマンドに対応する ruby のオブジェクトが info という名前であるとすると,
-tcl/tk の
-	info commands
-という命令は tcltk ライブラリでは
-	info.e("commands")
-と記述されます. また, 「.」というウィジェット (wish 実行時に自動的に生
-成されるルートウィジェット) に対応する ruby のオブジェクトが root とい
-う名前であるとすると,
-	. configure -height 300 -width 300
-という tcl/tk の命令は
-	root.e("configure -height 300 -width 300")
-と記述されます. このような記述は, 見ためには美しくありませんが, そして,
-スクリプトを読む人には見づらいかも知れませんが, 実際にスクリプトを書い
-てみると予想外に手軽です.
-
-[使用法]
-
-1. ライブラリを読み込む.
-     require "tcltk"
-
-2. tcl/tk インタプリタを生成する.
-     ip = TclTkInterpreter.new()
-
-3. tcl/tk のコマンドに対応するオブジェクトを変数に代入しておく.
-     # コマンドに対応するオブジェクトが入った Hash を取り出す.
-     c = ip.commands()
-     # 使いたいコマンドに対応するオブジェクトを個別の変数に代入する.
-     bind, button, info, wm = c.indexes("bind", "button", "info", "wm")
-
-4. 必要な処理を行う.
-     詳しくは, サンプルを参照のこと.
-
-5. 準備ができたら, イベントループに入る.
-     TclTk.mainloop()
-
-(( 以下, モジュール, クラス等の説明を書く予定.))
-
-
-
-<< tcltklib ライブラリ >>
-
-tcl/tk の C ライブラリを利用するための低水準インターフェースを提供しま
-す.
-
-コンパイル/実行には, tcl/tk の C ライブラリが必要です.
-
-[説明]
-
-このライブラリを用いると, ruby から tcl/tk の C ライブラリを利用できま
-す. 具体的には, ruby インタプリタから tcl/tk インタプリタを呼び出すこ
-とができます. さらに, その(ruby インタプリタから呼び出した) tcl/tk イ
-ンタプリタから, 逆に ruby インタプリタを呼び出すこともできます.
-
-[使用法]
-
-require "tcltklib" すると, 以下のモジュール, クラスが利用可能です.
-
-モジュール TclTkLib
-    tcl/tk ライブラリを呼び出すメソッドを集めたモジュールです. ただし,
-    tcl/tk インタプリタ関係のメソッドはクラス TclTkIp にあります.
-
-  モジュールメソッド mainloop()
-      Tk_MainLoop を実行します. 全ての tk のウインドウが無くなると終了
-      します(例えば, tcl/tk で書くところの "destroy ." をした場合等).
-    引数: 無し
-    戻り値: nil
-
-クラス TclTkIp
-    インスタンスが tcl/tk のインタプリタに対応します. tcl/tk のライブ
-    ラリの仕様通り, インスタンスを複数個生成しても正しく動作します(そ
-    んなことをする必要はあまり無いはずですが). インタプリタは wish の
-    tcl/tk コマンドを実行できます. さらに, 以下のコマンドを実行できま
-    す.
-      コマンド ruby
-	引数を ruby で実行します(ruby_eval_string を実行します). 引数
-	は 1 つでなければなりません. 戻り値は ruby の実行結果です.
-	ruby の実行結果は nil か String でなければなりません.
-
-  クラスメソッド new()
-      TclTkIp クラスのインスタンスを生成します
-    引数: 無し
-    戻り値 (TclTkIp): 生成されたインスタンス
-
-  メソッド _eval(script)
-      インタプリタで script を評価します(Tcl_Eval を実行します). 前述
-      のように, ruby コマンドにより script 内から ruby スクリプトを実
-      行できます.
-    引数: script (String) - インタプリタで評価するスクリプト文字列
-    戻り値 (String): 評価結果 ((Tcl_Interp *)->result)
-
-  メソッド _return_value()
-      直前の Tcl_Eval の戻り値を返します. 0(TCL_OK) で正常終了です.
-    引数: 無し
-    戻り値 (Fixnum): 直前の Tcl_Eval() が返した値.
-
-==============================================================
-
-以下が本ドキュメント作成時点での tcltklib ライブラリの説明です．
-==============================================================
-モジュール TclTkLib
-   : 個々の Tcl/Tk インタープリタに依存しない処理 ( == イベントルー
-   : プに関する処理 ) を呼び出すメソッドを定義したモジュール．
-
-   モジュール TclTkLib::EventFlag
-      : do_one_event を呼び出す際の処理対象イベントを指定するための
-      : フラグ ( WINDOW|DONT_WAIT というようにビット演算子で連結して
-      : 指定 ) を定数として定義したモジュール．以下の定数が含まれる．
-
-      定数  NONE
-         : 値は 0 で，値としてはいかなる種類のイベントも指定していない
-         : ことになるが，実際の処理上は ALL と同じとして扱われる．
-
-      定数  WINDOW
-         : window イベントを処理対象とする
-
-      定数  FILE
-         : file イベントを処理対象とする
-
-      定数  TIMER
-         : timer イベントを処理対象とする
-
-      定数  IDLE
-         : アイドルループ処理 ( 再描画など，他の種類のイベントが発生
-         : していないときに行われる処理 ) を処理対象とする
-
-      定数  ALL
-         : すべての種類のイベントを処理対象とする
-         : WINDOW|FILE|TIMER|IDLE と同じ
-
-      定数  DONT_WAIT
-         : 処理対象イベントが存在しない場合に，イベント発生を待たず
-         : に do_one_event を終了 ( false を返す ) する
-
-   モジュール TclTkLib::VarAccessFlag
-      : _get_variable などでのフラグを指定するためのもの．フラグに
-      : は以下の定数を OR で連結して与える．
-
-      定数  NONE
-         : 値は 0 で，何もフラグを指定していないのに等しい．
-
-      定数  GLOBAL_ONLY
-         : 通常，変数の検索はまず手続き呼び出しを行ったレベルで検
-         : 索し，次に現在の名前空間で検索，最後にグローバル空間で
-         : 検索を行う．しかし，このフラグが指定された場合には，グ
-         : ローバル空間でのみ検索する．
-         : もし GLOBAL_ONLY と NAMESPACE_ONLY とが両方指定された場
-         : 合には，GLOBAL_ONLY の指定は無視される．
-
-      定数  NAMESPACE_ONLY
-         : このフラグが指定された場合には，現在の名前空間でのみ変
-         : 数の検索を行う．GLOBAL_ONLY の説明も参照すること．
-
-      定数  LEAVE_ERR_MSG
-         : 変数アクセスにおいてエラーが発生した場合，このフラグが
-         : 指定されていれば，実行結果として Tcl インタープリタにエ
-         : ラーメッセージが残される．このフラグが指定されていなけ
-         : れば，エラーメッセージは一切残されない．
-
-      定数  APPEND_VALUE
-         : このフラグが指定されていた場合，変数の値を置き換えので
-         : はなく，現在の値に代入値が追加 (append; 文字列連結) さ
-         : れる．変数が未定義あった場合，このフラグは無視される．
-
-      定数  LIST_ELEMENT
-         : このフラグが指定されていた場合，代入値はまず Tcl のリス
-         : ト要素として適切となるように変換される．代入値がリスト
-         : (またはサブリスト) の最初の要素となるのでない限り，代入
-         : 値の直前には空白文字が追加される．
-
-      定数  PARSE_VARNAME
-         : _set_variable などの呼び出しにおいてこのフラグが指定さ
-         : れていた場合，var_name 引数が連想配列名と要素名とを両方
-         : 含む可能性がある (開き括弧を含み，閉じ括弧で終わる) こ
-         : とを示す．その場合，括弧の間が要素名指定，最初の開き括
-         : 弧までが連想配列名として扱われる．_set_variable2 などで
-         : このフラグを指定する場合，連想配列名と要素名は var_name
-         : から抽出されるはずであるから，index_name 引数は nil と
-         : せねばならない．
-
-   モジュール TclTkLib::RELEASE_TYPE
-      : Tcl/Tk のリリースタイプ番号の定義
-
-      定数  ALPHA
-         : ALPHA リリース
-
-      定数  BETA
-         : BETA リリース
-
-      定数  FINAL
-         : FINAL リリース
-
-   モジュールメソッド
-      get_version()
-         : Tcl/Tk の major, minor, release-type 番号, patchlevel を
-         : 配列にして返す．
-
-      mainloop(check_root = true)
-         : イベントループを起動する．check_root が true であれば，
-         : root widget が存在する限り，このメソッドは終了しない．
-         : check_root が false の場合は，root widget が消滅しても
-         : このメソッドは終了しない ( root widget が消滅しても，
-         : WINDOW 以外のイベントは発生しうるため )．終了には，外部
-         : からの働き掛け ( スレッドを活用するなど ) が必要．
-
-      mainloop_thread?
-         : カレントスレッドがイベントループを実行しているスレッド
-         : かどうかを返す．
-         : イベントループを実行しているスレッドであれば true を，
-         : どのスレッドでもイベントループが実行されていない場合は
-         : nil を，他のスレッドでイベントループが実行されている場
-         : 合は false を返す．
-         : false の際に Tk インタープリタを直接呼ぶのは危険である．
-
-      mainloop_watchdog(check_root = true)
-         : 通常のイベントループでは，イベント処理の内容によっては
-         : デッドロックを引き起こす可能性がある (例えばイベントに
-         : 対するコールバック処理中で widget 操作をし，その終了を
-         : 待つなど)．このメソッドは，そうしたデッドロックを回避す
-         : るための監視スレッド付きでイベントループを起動する
-         : ( 監視スレッドを生成した後にイベントループを実行する )．
-         : 引数の意味は mainloop と同じである．
-
-      do_one_event(flag = TclTkLib::EventFlag::ALL |
-                            TclTkLib::EventFlag::DONT_WAIT)
-         : 処理待ちのイベント 1 個を実行する．
-         : イベントを処理した場合は true を返す．
-         : フラグで DONT_WAIT を指定していない場合，フラグで処理対
-         : 象となっている種類のイベントが発生するまで待ち続ける．
-         : DONT_WAIT を指定していた場合，処理対象イベントがなくても
-         : すぐに終了し false を返す．
-         : $SAFE >= 1 かつ flag が汚染されているならば
-         : flag には DONT_WAIT が強制的に付けられる．
-
-      set_eventloop_tick(timer_tick)
-         : イベントループと同時に別スレッドが稼働している場合に，時
-         : 間に基づいた強制的なスレッドスイッチングをどの程度の頻度
-         : ( 時間間隔 ) で発生させるかをミリ秒単位の整数値で指定する．
-         : 0 を指定すると，この強制的なスイッチングは行われない．
-         : 標準では 0 に設定されており，イベント処理数に基づくスイッ
-         : チングだけが行われる ( see set_eventloop_weight )．
-         : ただし，稼働しているスレッドがイベントループだけの場合，
-         : timer_tick を 0 に設定することはできない．もし設定されて
-         : いたら，100 ms ( see NO_THREAD_INTERRUPT_TIME ) に自動設
-         : 定される．
-         : 詳細な説明は略すが，これは CPU パワーを節約しつつ安全で
-         : 安定した動作を実現するために実装した仕様である．
-
-      get_eventloop_tick
-         : timer_tick の現在値を返す．
-
-      set_no_event_wait(no_event_wait)
-         : 複数のスレッドが稼働している場合で，処理待ちイベントが全
-         : く存在しなかった際に sleep 状態に入る時間長を指定する．
-         : 稼働スレッドがイベントループだけの場合には意味をなさない．
-         : デフォルトの値は 20 (ms)
-
-      get_no_event_wait
-         : no_event_wait の現在値を返す．
-
-      set_eventloop_weight(loop_max, no_event_tick)
-         : 複数のスレッドが稼働している際に Ruby/Tk のイベントルー
-         : プに割り当てる比重を定めるためのパラメータを設定する．
-         : 稼働スレッドがイベントループだけの場合には意味をなさない．
-         : 一度のスレッド切り替えの間に処理するイベントの最大数と，
-         : 処理待ちのイベントが存在しない際の加算数とを設定する．
-         : 処理待ちイベントが存在しない場合は no_event_wait ( see
-         : set_no_event_wait ) だけの間 sleep 状態に入る．
-         : デフォルトではそれぞれ 800 回と 10 回，つまり，800 個のイ
-         : ベント (アイドルイベントを含む) を処理するとか，イベント
-         : が全く発生しないままに 80 回の処理待ちイベント検査が完了
-	 : するとかでカウントが 800 以上になるとスレッドスイッチング
-         : が発生することになる．
-
-      get_eventloop_weight
-         : 現在の loop_max と no_event_tick との値を返す．
-         : ( see set_eventloop_wait )
-
-      mainloop_abort_on_exception=(bool)
-         : Tk インタープリタ上で例外を発生した際に，イベントループを
-         : エラー停止させるかどうかを指定する．true を指定した場合は
-         : エラー停止するが，false の場合は例外を無視してイベントルー
-         : プを継続する．さらに nil の場合は警告モードでない限りはエ
-         : ラーメッセージの出力すら省略して，例外を無視する．
-	 : デフォルトでは true に設定されている．
-         : １個のインタープリタだけを使っている場合にはエラー時にその
-         : まま停止しても通常は問題ないが，複数のインタープリタが同時
-         : に動作している場合には，それらを管理するイベントループは１
-         : 個だけであるため，いずれかのインタープリタのエラーが原因で，
-         : 他のインタープリタの処理継続が不可能になることがある．その
-         : ような場合でもエラーを無視してイベントループが稼働を続ける
-         : ことで，他のインタープリタが正常に動作し続けることができる．
-
-      mainloop_abort_on_exception
-         : Tk インタープリタ上で例外を発生した際に，イベントループをエ
-         : ラー停止させるかどうかの設定状態を true/false で得る．
-
-      num_of_mainwindows
-         : 現在のメインウィンドウ (ルートウィジェット) の数を返す．
-         : メインウィンドウは一つのインタープリタに付き最大一つである
-         : ので，この値は現在 Tk の機能が有効であるインタープリタの総
-         : 数に等しい．
-
-      _merge_tklist(str, str, ... )
-         : Tcl/Tk のライブラリ関数を使って，引数の文字列がそれぞれ
-         : 正しく一つのリスト要素となるように連結した文字列を返す．
-
-      _conv_listelement(str)
-         : Tcl/Tk のライブラリ関数を使って，引数の文字列が Tcl の
-         : 一つのリスト要素として適切な表現になるように変換した文
-         : 字列を返す．
-
-      _toUTF8(str, encoding=nil)
-      _fromUTF8(str, encoding=nil)
-         : Tcl/Tk が内蔵している UTF8 変換処理を呼び出す．
-
-      _subst_UTF_backslash(str)
-      _subst_Tcl_backslash(str)
-         : Tcl のルールでバックスラッシュ記法 ( \uhhhh による
-         : Unicode 文字表現を含む ) を解析する．
-         : _subst_Tcl_backslash はすべてのバックスラッシュ記法を
-         : 置き換えるのに対し，_subst_UTF_backslash は \uhhhh
-         : による Unicode 文字表現だけを置き換える．
-
-      encoding_system
-      encoding_system=(encoding)
-         : Tcl の system encoding の獲得および設定
-
-      encoding
-      encoding=(encoding)
-         : encoding_system / encoding_system= の alias
-         : ( Ruby/Tk の tk.rb では置き換えられる予定のもの．)
-
-
-クラス TclTkIp
-   クラスメソッド
-      new(ip_name=nil, options='')
-         : TclTkIp クラスのインスタンスを生成する．
-         : ip_name に文字列を与えた場合は，それが winfo interps などで
-         : 表示される名前になる．
-         : options には，-geometry や -use など，wish のコマンドライン
-         : 引数として与えるオプションと同様の情報を文字列として与える．
-         : 与えられた情報は，root widget 生成の際に用いられる．
-         : ( e.g. TclTkIp.new('FOO', '-geometry 500x200 -use 0x2200009') )
-         : もし options に敢えて nil または false を与えた場合，Tk ライ
-         : ブラリが導入されていない (つまりは Tcl のみの) インタープリ
-         : タを生成する．この場合は GUI 環境は必要ないため，ウインドウ
-         : システムが存在しない，または使用できない環境でも Tcl インター
-         : プリタを生成し，Tcl やその拡張ライブラリを活用することができる．
-
-   インスタンスメソッド
-      create_slave(name, safe=false)
-         : レシーバを親とする name という名前のスレーブインタープリタを
-	 : 生成する．
-	 : safe には生成するインタープリタを safe インタープリタとする
-         : かを指定する．デフォルトは false ということになっているが，
-         : たとえ明確に false を指定していたとしても，親となるインター
-         : プリタが safe インタープリタであれば，その設定を引き継いで
-         : safe インタープリタとして生成される．
-
-      make_safe
-         : Tcl/Tk インタープリタを safe インタープリタに変更する．
-         : 戻り値はレシーバであるインタープリタ自身である．
-         : 失敗した場合は RuntimeError の例外を発生する．
-
-      safe?
-         : Tcl/Tk インタープリタが safe インタープリタであるかを調べる．
-         : safe インタープリタであれば true を返す．
-
-      allow_ruby_exit?
-         : 対象となるインタープリタ上の評価で，ruby の exit 関数または
-         : Tcl/Tk 上の exit コマンドによって ruby 自体を終了させること
-         : を許すかどうかを返す．
-	 : 許さない場合は対象のインタープリタだけが終了する．
-         : マスターインタープリタのデフォルト値は true，スレーブインター
-         : プリタのデフォルト値は false である．
-
-      allow_ruby_exit=(mode)
-         : 対象となるインタープリタの allow_ruby_exit? の状態を変更する．
-	 : インタープリタが safe インタープリタの場合は変更が許されない
-	 : (例外を発生)．
-
-      delete
-         : Tcl/Tk インタープリタを delete する．
-         : delete されたインタープリタは，以後一切の操作ができなくなり，
-         : コマンドを送っても例外を発生するようになる．
-
-      deleted?
-         : Tcl/Tk インタープリタがすでに delete されているかを調べる．
-         : delete 済みでコマンドを受け付けない状態になっているならば
-         : true を返す．
-
-      has_mainwindow?
-         : Tcl/Tk インタープリタにメインウィンドウ (root widget) が
-         : 存在すれば true を，存在しなければ false を返す．
-         : インタープリタが既に delete 済みであれば nil を返す．
-
-      restart
-         : Tcl/Tk インタープリタの Tk 部分の初期化，再起動を行う．
-         : 一旦 root widget を破壊した後に再度 Tk の機能が必要と
-         : なった場合に用いる．
-
-      _eval(str)
-      _invoke(*args)
-         : Tcl/Tk インタープリタ上で評価を行う．
-         : _eval は評価スクリプトが一つの文字列であることに対し，
-         : _invoke は評価スクリプトの token ごとに一つの引数とな
-         : るように与える．
-         : _invoke の方は Tcl/Tk インタープリタの字句解析器を用い
-         : ないため，評価の負荷がより少なくてすむ．ただし，その代
-         : わりに auto_load のような機構は働かず，load 等によって
-         : Tcl/Tk インタープリタ上に既に登録済みのコマンドしか呼
-         : び出すことができない．
-         : _eval では auto_load 機構が働くため，一度 _eval を実行
-         : して登録に成功しさえすれば，以降は _invoke でも利用で
-         : きるようになる．
-
-      _cancel_eval(str)
-      _cancel_eval_unwind(str)
-         : (Tcl/Tk8.6 or later)
-         : Tcl_CancelEval() 関数を呼び出し，eval の実行を打ち切る．
-
-      _toUTF8(str, encoding=nil)
-      _fromUTF8(str, encoding=nil)
-         : Tcl/Tk が内蔵している UTF8 変換処理を呼び出す．
-
-      _thread_vwait(var_name)
-      _thread_tkwait(mode, target)
-         : スレッド対応の vwait あるいは tkwait 相当のメソッド．
-         : 通常の vwait あるいは tkwait コマンドと異なるのは，イベン
-         : トループとは異なるスレッドから呼び出した場合に vwait 等の
-         : スタックとは独立に条件の成立待ちがなされることである．
-         : 通常の vwait / tkwait では，vwait / tkwait (1) の待ちの途
-         : 中でさらに vwait / tkwait (2) が呼ばれた場合，待ちの対象
-         : となっている条件の成立順序がどうあれ，(2)->(1) の順で待ち
-         : を終了して戻ってくる．
-         : _thread_vwait / _thread_tkwait は，イベントループのスレッ
-         : ドで呼ばれた場合は通常の vwait / tkwait と同様に動作する
-         : が，イベントループ以外のスレッドで呼ばれた場合にはそのス
-         : レッドを停止させて待ちに入り，条件が成立した時にスレッド
-         : の実行を再開する．「vwait 等の待ちスタックとは独立」とい
-         : う意味は，この再開のタイミングが他のスレッドでの待ち状況
-         : とは無関係ということである．つまり，イベントループ等の他
-         : のスレッドで vwait 等で待ちの状態にあったとしてもその完了
-         : を待つことなく，自らの待ち条件が成立次第，処理を継続する
-         : ことになる．
-
-      _return_value
-         : 直前の Tcl/Tk 上での評価の実行結果としての戻り値を返す．
-
-      _get_variable(var_name, flag)
-      _get_variable2(var_name, index_name, flag)
-         : Tcl/Tk 上の var という変数名の変数の値を返す．
-         : もし index_name が指定 (PARSE_VARNAME フラグの説明も参照)
-         : された場合は連想配列 var_name の index_name の要素を返す．
-         : flag には変数を検索する際の条件を指定する．flag に与える
-         : 値はモジュール TclTkLib::VarAccessFlag を参照すること．
-
-      _set_variable(var_name, value, flag)
-      _set_variable2(var_name, index_name, value, flag)
-         : Tcl/Tk 上の var という変数名の変数に値を設定する．
-         : もし index_name が指定 (PARSE_VARNAME フラグの説明も参照)
-         : された場合は連想配列 var_name の index_name の要素を設定
-         : する．
-         : flag には変数を検索する際の条件を指定する．flag に与える
-         : 値はモジュール TclTkLib::VarAccessFlag を参照すること．
-
-      _unset_variable(var_name)
-      _unset_variable2(var_name, index_name)
-         : Tcl/Tk 上の var_name という変数名の変数を消去する．
-         : もし index_name が指定 (PARSE_VARNAME フラグの説明も参照)
-         : された場合は連想配列 var_name から index_name の要素だけ
-         : を消去する．
-
-      _get_global_var(var_name)
-      _get_global_var2(var_name, index_name)
-      _set_global_var(var_name, value)
-      _set_global_var2(var_name, index_name, value)
-      _unset_global_var(var_name)
-      _unset_global_var2(var_name, index_name)
-         : それぞれ，対応する変数アクセスメソッドの flag に対して
-         : (GLOBAL_ONLY | LEAVE_ERR_MSG) を与えたもの．
-
-      _split_tklist(str)
-         : Tcl/Tk のライブラリ関数を使って，文字列 str をリストに
-         : 分割する (文字列の配列として返す)．
-
-      _merge_tklist(str, str, ... )
-         : Tcl/Tk のライブラリ関数を使って，引数の文字列がそれぞれ
-         : 正しく一つのリスト要素となるように連結した文字列を返す．
-
-      _conv_listelement(str)
-         : Tcl/Tk のライブラリ関数を使って，引数の文字列が Tcl の
-         : 一つのリスト要素として適切な表現になるように変換した文
-         : 字列を返す．
-
-      mainloop
-      mainloop_watchdog
-         : スレーブ IP の場合にはイベントループを起動せずに nil を返す．
-         : それ以外の点では引数を含めて TclTkLib の同名メソッドに同じ．
-
-      do_one_event
-         : スレーブ IP の場合には引数のイベントフラグに DONT_WAIT が
-         : 強制的に追加される (イベント待ちでスリープすることは禁止)．
-         : それ以外の点では引数を含めて TclTkLib の同名メソッドに同じ．
-
-      set_eventloop_tick
-      get_eventloop_tick
-      set_no_event_wait
-      get_no_event_wait
-      set_eventloop_weight
-      get_eventloop_weight
-      mainloop_abort_on_exception
-      mainloop_abort_on_exception=
-         : スレーブ IP の場合には値の設定が許されない (無視される)．
-         : それ以外の点では引数を含めて TclTkLib の同名メソッドに同じ．
-
-      encoding_table
-         : Ruby m17n 用に Ruby と Tk との間の encoding 対応表を返す．
-
-クラス TkCallbackBreak < StandardError
-クラス TkCallbackContinue < StandardError
-   : これらはイベントコールバックにおいて，コールバック処理を適切に中
-   : 断したり，次のバインドタグのバインディング処理に進めたりすること
-   : を可能にするための例外クラスである．
-   : コールバックで break や continue を実現するためには，コールバック
-   : である Ruby 手続きが Tcl/Tk インタープリタ側に適切なリターンコー
-   : ドを返す必要がある．Ruby の手続きが普通に値を返すのでは，それが普
-   : 通の戻り値であるのか否かを区別ができないため，例外発生を利用した
-   : 実装を行っている．
-   : ただし現在では，コールバック手続きを Ruby の break, next で終了す
-   : ることで同等の結果を得ることができるようになっている．それゆえ，
-   : これらは必要ないものではあるが，互換性のために残してある．
-
-(eof)
diff --git a/ext/tk/README.1st b/ext/tk/README.1st
deleted file mode 100644
index 4ffef34f1d..0000000000
--- a/ext/tk/README.1st
+++ /dev/null
@@ -1,19 +0,0 @@
-If you want to use Ruby/Tk (tk.rb and so on), you must have tcltklib.so
-which is working correctly. When you have some troubles on compiling,
-please read README.tcltklib and README.ActiveTcl.
-Even if there is a tcltklib.so on your Ruby library directory, it will not
-work without Tcl/Tk libraries (e.g. libtcl8.4.so) on your environment.
-You must also check that your Tcl/Tk is installed properly.
-
---------------------------------------------
- ( the following is written in UTF-8 )
-
-Ruby/Tk (tk.rb など) を使いたい場合には，tcltklib.so が正しく動いていな
-ければなりません．コンパイル時に何か問題が生じた場合は，README.tcltklib
-や README.ActiveTcl を見てください．
-たとえ Ruby のライブラリディレクトリに tcltklib.so が存在していたとして
-も，実行環境に Tcl/Tk ライブラリ (libtcl8.4.so など) がなければ機能しま
-せん．Tcl/Tk が正しくインストールされているかもチェックしてください．
-
-==========================================================
-                Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
diff --git a/ext/tk/README.ActiveTcl b/ext/tk/README.ActiveTcl
deleted file mode 100644
index 990f612648..0000000000
--- a/ext/tk/README.ActiveTcl
+++ /dev/null
@@ -1,62 +0,0 @@
-ActiveTcl is ActiveState's quality-assured distribution of Tcl.
-
-# see <http://www.activestate.com/Products/ActiveTcl/>
-#     <http://www.tcl.tk/>
-
-First of all, please try to configure without any options.
-"extconf.rb" searches ActiveTcl as default action.
-If you have ActiveTcl and standard (or your own) Tcl/Tk on your
-environment and don't want to use ActiveTcl on your Ruby/Tk, please
-use --without-ActiveTcl option.
-
-When "extconf.rb" fails to find your ActiveTcl libraries, please try
-the followings.
-
-If you want to use ActiveTcl binary package as the Tcl/Tk libraries,
-please use the following configure options.
-
-   --with-ActiveTcl=<ActiveTcl_root>
-     ( When without argument; no <ActiveTcl_root>; only '--with-ActiveTcl',
-       it same to '--with-ActiveTcl=/opt/ActiveTcl*/lib' )
-
-   --with-tcl-dir=<ActiveTcl_root>
-   --with-tk-dir=<ActiveTcl_root>
-
-And use the followings if you need.
-
-   --with-tcllib=<libname>
-   --with-tklib=<libname>
-   --enable-tcltk-stubs
-
-For example, when you install ActiveTcl-8.4.x to '/usr/local/ActiveTcl',
-
-   configure --with-tcl-dir=/usr/local/ActiveTcl/  \
-             --with-tk-dir=/usr/local/ActiveTcl/   \
-             --with-tcllib=tclstub8.4              \
-             --with-tklib=tkstub8.4                \
-             --enable-tcltk-stubs
-
-It depends on your environment that you have to add the directory of
-ActiveTcl's libraries to your library path when execute Ruby/Tk.
-One of the way is to add entries to TCLLIBPATH environment variable,
-and one of the others add to LD_LIBRARY_PATH environment variable
-
-Probably, using TCLLIBPATH is better. The value is appended at the
-head of Tcl's 'auto_path' variable. You can see the value of the
-variable by using 'Tk::AUTO_PATH.value' or 'Tk::AUTO_PATH.list'.
-
-For example, on Linux, one of the ways is to use LD_LIBRARY_PATH
-environment variable.
--------------------------------------------------------------------------
- [bash]$ LD_LIBRARY_PATH=/usr/local/ActiveTcl/lib:$LD_LIBRARY_PATH \
-         ruby your-Ruby/Tk-script
-
- [bash]$ LD_LIBRARY_PATH=/usr/local/ActiveTcl/lib:$LD_LIBRARY_PATH irb
--------------------------------------------------------------------------
-Based on it, the Tcl interpreter changes auto_path variable's value.
-
-Then, you'll be able to use Tcl/Tk extension libraries included in the
-ActiveTcl package (e.g. call TkPackage.require('BWidget'), and then,
-use functions/widgets of BWidget extension).
-
-                                  Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
diff --git a/ext/tk/README.fork b/ext/tk/README.fork
deleted file mode 100644
index c58d75883b..0000000000
--- a/ext/tk/README.fork
+++ /dev/null
@@ -1,34 +0,0 @@
-Ruby/Tk does NOT support forking the process on which Tk interpreter
-is running (unless NEVER control Tk interpreter under the forked child
-process). In the library 'tk.rb', a Tk interpreter is initialized.
-Therefore, if you want running Tk under a child process, please call
-"require 'tk'" in the child process.
-
-# If do fork and exec(<new Ruby/Tk>) on the child process, you can
-# control Ruby/Tk interpreter on the child process by 'send' command
-# of Tcl/Tk. About this, please see Tk.appsend and Tk.rb_appsend, or
-# 'remote-tk.rb' and the sample 'sample/remote-ip_sample.rb'.
-
-For example, the following sample1 will NOT work, and sample2 will
-work properly.
-
----<sample1: NOT work>---------------------------------------
-require 'tk'  ## init Tk interpreter under parent process
-
-exit! if fork ## exit parent process
-
-## child process
-TkButton.new(:text=>'QUIT', :command=>proc{exit}).pack
-Tk.mainloop
--------------------------------------------------------------
-
----<sample2: will work>--------------------------------------
-exit! if fork ## exit main process
-
-## child process
-require 'tk'  ## init Tk interpreter under child process
-TkButton.new(:text=>'QUIT', :command=>proc{exit}).pack
-Tk.mainloop
--------------------------------------------------------------
-
-                                         2004/05/22  Hidetoshi NAGAI
diff --git a/ext/tk/README.macosx-aqua b/ext/tk/README.macosx-aqua
deleted file mode 100644
index d727c01a19..0000000000
--- a/ext/tk/README.macosx-aqua
+++ /dev/null
@@ -1,67 +0,0 @@
-
-  *** for MacOS X Aqua (Tcl/Tk Aqua) users ***
-
-First of all, please read README.tcltklib to use Tcl/Tk Aqua Framework.
-
-With Tcl/Tk Aqua libraries, current tcltklib sometimes freezes when
-using Aqua specific dialogs (e.g. Tk.messageBox).
-This is a known bug of Ruby-1.8.4 release.
-
-When you meet the trouble on your GUI, you'll be able to avoid the trouble
-by Tcl/Tk's traditional dialogs.
-If you want to do that, please call some of the following bits of script
-after "require 'tk'".
-
-=================================================================
-# use a traditional dialog for Tk.chooseColor()
-Tk.ip_eval(<<'EOS')
-    proc ::tk_chooseColor {args} {
-        return [eval tk::dialog::color:: $args]
-    }
-EOS
-
-# use a traditional dialog for Tk.getOpenFile() and Tk.getMultipleOpenFile()
-Tk.ip_eval(<<'EOS')
-    proc ::tk_getOpenFile {args} {
-        if {$::tk_strictMotif} {
-            return [eval tk::MotifFDialog open $args]
-        } else {
-            return [eval ::tk::dialog::file:: open $args]
-        }
-    }
-EOS
-
-# use a traditional dialog for Tk.getSaveFile() and Tk.getMultipleSaveFile()
-Tk.ip_eval(<<'EOS')
-    proc ::tk_getSaveFile {args} {
-        if {$::tk_strictMotif} {
-            return [eval tk::MotifFDialog save $args]
-        } else {
-            return [eval ::tk::dialog::file:: save $args]
-        }
-    }
-EOS
-
-# use a traditional dialog for Tk.messageBox()
-Tk.ip_eval(<<'EOS')
-    proc ::tk_messageBox {args} {
-        return [eval tk::MessageBox $args]
-    }
-EOS
-
-# use a traditional dialog for Tk.chooseDirectory()
-Tk.ip_eval(<<'EOS')
-    proc ::tk_chooseDirectory {args} {
-        return [eval ::tk::dialog::file::chooseDir:: $args]
-    }
-EOS
-=================================================================
-
-Each of them replaces the platform specific dialog command to the
-traditional one.
-
-If you use some MultiTkIp objects, probably, you'll have to call the
-bits of script for each MultiTkIp object.
-
---
-Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
diff --git a/ext/tk/README.tcltklib b/ext/tk/README.tcltklib
deleted file mode 100644
index da343a4f3e..0000000000
--- a/ext/tk/README.tcltklib
+++ /dev/null
@@ -1,152 +0,0 @@
-To compile 'tcltklib', you must have Tcl/Tk libraries on your environment.
-Although 'extconf.rb' script searches Tcl/Tk libraries and header files
-(as default, searches tclConfig.sh/tkConfig.sh and use the defintions on
-those; ActiveTcl has high priority on searching unless --without-ActiveTcl),
-sometimes fails to find them. And then, 'tcltklib' cannot be compiled. If
-Tcl/Tk libraries or header files are installed but are not found, you can
-give the information by arguments of the 'configure' script. Please give
-some or all of the following options.
-
- --with-tk-old-extconf         use old "extconf.rb" (default: false).
-                               If current extconf.rb doesn't work properly
-                               (or your install process is based on old
-                               documant about Ruby/Tk install), please try
-			       this option.
-
- --with-ActiveTcl / --without-ActiveTcl
- --with-ActiveTcl=<dir>        search ActiveTcl libraries (default: true).
-                               When true, try to find installed ActiveTcl.
-                               When <dir> is given, use it as the ActiveTcl's
-			       top directory (use <dir>/lib, and so on).
-                               Old "extconf.rb" doesn't support this option.
-
- --with-tk-shlib-search-path=<paths>
-                               teach the paths for loading shared-libraries
-                               to linker.
-                               <paths> is a path list with the same format
-                               as PATH environment variable.
-                               This option may be experimental.
-                               Old "extconf.rb" doesn't support this option.
-
- --with-tcltkversion=<version>
- --with-tcltkversion=<tclversion>,<tkversion>
-      force version of Tcl/Tk library
-      (e.g. libtcl8.4g.so & libtk8.4g.so ==> --with-tcltkversion=8.4g
-            libtcl8.4.so  & libtk8.4g.so ==> --with-tcltkversion=8.4,8.4g)
-
- --enable-tcl-h-ver-check/--disable-tcl-h-ver-check
- --enable-tk-h-ver-check/--disable-tk-h-ver-check
-                               enable or disable for checking MAJOR_VERSION and
-                               MINOR_VERSION on tcl.h/tk.h whether match with
-                               Tcl/Tk libraries' version or not.
-
- --with-tcl-build-dir=<dir>
- --with-tk-build-dir=<dir>     If you want to compile with libraries on Tcl/Tk
-                               build dir (still NOT installed), you must use
-                               these options.
-                               (e.g. --with-tcl-build-dir=./build/tcl8.5.9/unix)
-                               When use these options, --with-tclConfig-dir and
-                               --with-tkConfig-dir options are ignored (however,
-                               --with-tclConfig-file and --with-tkConfig-file
-                               options are still available).
-
- --with-tclConfig-file=<file>/--without-tclConfig-file
- --with-tkConfig-file=<file>/--without-tkConfig-file
-                               file path of tclConfig.sh/tkConfig.sh, or don't
-                               refer those.
-                               If you want use non-standard filenames of config
-                               files (e.g. tclConfig-static.sh), you must use
-                               these options.
-
- --with-tclConfig-dir=<dir>
- --with-tkConfig-dir=<dir>     the directory contains 'tclConfig.sh' and
-                               'tkConfig.sh'.
-			       Current "extconf.rb" uses the information
-                               on tclConfig.sh/tkConfig.rb, if possible.
-                               Old "extconf.rb" doesn't support this option.
-
- --with-tcllib=<libname>       (e.g. libtcl8.4.so ==> --with-tcllib=tcl8.4)
- --with-tklib=<libname>        (e.g. libtk8.4.so  ==> --with-tklib=tk8.4)
-
- --enable-tcltk-stubs          (if you force to enable stubs)
-                               On old "extconf.rb", default is false.
-                               On current "extconf.rb", default is true when
-                               tclConfig.sh/tkConfig.sh have TCL_STUB_LIB_SPEC
-                               /TK_STUB_LIB_SPEC, else default is false.
-
- --with-tcl-dir=<path>
-      equal to "--with-tcl-include=<path>/include --with-tcl-lib=<path>/lib"
-
- --with-tk-dir=<path>
-      equal to "--with-tk-include=<path>/include --with-tk-lib=<path>/lib"
-
- --with-tcl-include=<dir>      the directory contains 'tcl.h'
- --with-tk-include=<dir>       the directory contains 'tk.h'
-
- --with-tcl-lib=<dir>          the directory contains 'libtcl<version>.so'
- --with-tk-lib=<dir>           the directory contains 'libtk<version>.so'
-
- --enable-mac-tcltk-framework  (MacOS X) use Tcl/Tk framework
-                               (Obsolete. Please use '--enable-tcltk-framework'.)
-
- --enable-tcltk-framework      use Tcl/Tk framework
-
- --with-tcltk-framework=<dir>  the directory contains Tcl/Tk framework;
-                               "<dir>/Tcl.framework" and "<dir>/Tk.framework".
-                               When this option is given, it is assumed that
-                               --enable-tcltk-framework option is given also.
-
- --with-tcl-framework-dir=<dir>
-      Tcl framework directory (e.g. "/Library/Frameworks/Tcl.framework")
-
- --with-tk-framework-dir=<dir>
-      Tk framework directory (e.g. "/Library/Frameworks/Tk.framework")
-
- --with-tcl-framework-header=<dir>
-      Tcl framework headers directory
-      (e.g. "/Library/Frameworks/Tcl.framework/Headers")
-
- --with-tk-framework-header=<dir>
-      Tk framework headers directory
-      (e.g. "/Library/Frameworks/Tk.framework/Headers")
-
-
- --with-X11 / --without-X11    use / not use the X Window System
-
- --with-X11-dir=<path>
-      equal to "--with-X11-include=<path>/include --with-X11-lib=<path>/lib"
-
- --with-X11-include=<dir>      the directory contais X11 header files
- --with-X11-lib=<dir>          the directory contais X11 libraries
-
-
-If you forgot to give the options when do 'configure' on toplevel
-directory of Ruby sources, please try something like as the followings.
-
- $ cd ext/tcltklib
- $ rm Makefile
- $ CONFIGURE_ARGS='--with-tcl-include=/usr/local/include/tcl8.4/ --with-tcllib=tcl8.4 --with-tklib=tk8.4' ruby extconf.rb
-
-
- *** ATTENTION ***
-When your Tcl/Tk libraries are compiled with "pthread support",
-Ruby/Tk may cause "Hang-up" or "Segmentation Fault" frequently.
-If you have such a trouble, please try to use the '--enable-pthread'
-option of the 'configure' command and re-compile Ruby sources.
-It may help you to avoid this trouble. The following configure
-options may be useful.
-
-  --enable-tcl-thread/--disable-tcl-thread
-  --with-tclConfig-file=<path of 'tclConfig.sh'>
-  --with-tkConfig-file=<path of 'tkConfig.sh'>
-
-It is not need that 'tclConfig.sh' is a normal Tcl/Tk's tclConfig.sh.
-But the file is expected to include the line "TCL_THREADS=0" or "...=1".
-When no "TCL_THREADS=?" line, if Tcl version is 7.x or 8.0 which is
-given by "TCL_MAJOR_VERSION=?" line and "TCL_MINOR_VERSION=?" line,
-then --disable-tcl-thread is expected. Else, ignore the 'tclConfig.sh'.
-If --enable-tcl-thread or --disable-tcl-thread option is given, then
---with-tclConfig-file option is ignored.
-
-==========================================================
-                Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
diff --git a/ext/tk/config_list.in b/ext/tk/config_list.in
deleted file mode 100644
index 143a7b5df6..0000000000
--- a/ext/tk/config_list.in
+++ /dev/null
@@ -1,41 +0,0 @@
-##############################################
-# configure options for Ruby/Tk
-# release date:  2011-06-05
-##############################################
-with tk-old-extconf
-with ActiveTcl
-with tk-shlib-search-path
-enable tcltk-stubs
-with tcltkversion
-enable tcl-h-ver-check
-enable tk-h-ver-check
-with tcl-build-dir
-with tk-build-dir
-with tcl-config
-with tk-config
-with tclConfig-dir
-with tkConfig-dir
-with tclConfig-file
-with tkConfig-file
-with tcllib
-with tklib
-with tcl-dir
-with tk-dir
-with tcl-include
-with tk-include
-with tcl-lib
-with tk-lib
-enable mac-tcltk-framework
-enable tcltk-framework
-with tcltk-framework
-with tcl-framework-dir
-with tk-framework-dir
-with tcl-framework-header
-with tk-framework-header
-with X11
-with X11-dir
-with X11-include
-with X11-lib
-enable pthread
-enable tcl-thread
-enable space-on-tk-libpath
diff --git a/ext/tk/depend b/ext/tk/depend
deleted file mode 100644
index f7ba3229c1..0000000000
--- a/ext/tk/depend
+++ /dev/null
@@ -1,2 +0,0 @@
-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
diff --git a/ext/tk/extconf.rb b/ext/tk/extconf.rb
deleted file mode 100644
index d4b017c85a..0000000000
--- a/ext/tk/extconf.rb
+++ /dev/null
@@ -1,2102 +0,0 @@
-# frozen_string_literal: false
-##############################################################
-# extconf.rb for tcltklib
-# release date: 2010-07-30
-##############################################################
-require 'mkmf'
-
-TkLib_Config = {}
-TkLib_Config['search_versions'] =
-  # %w[8.9 8.8 8.7 8.6 8.5 8.4 8.3 8.2 8.1 8.0 7.6 4.2]
-  # %w[8.7 8.6 8.5 8.4 8.3 8.2 8.1 8.0]
-  # %w[8.7 8.6 8.5 8.4 8.0] # to shorten search steps
-  %w[8.6 8.5 8.4]
-
-TkLib_Config['unsupported_versions'] =
-  %w[8.8 8.7]
-
-TkLib_Config['major_nums'] = '87'
-
-
-##############################################################
-
-TkLib_Config['enable-shared'] = enable_config("shared")
-
-
-##############################################################
-# use old extconf.rb ?
-##############################################################
-if with_config('tk-old-extconf')
-  require File.join(File.dirname(__FILE__), 'old-extconf.rb')
-  exit
-end
-
-
-##############################################################
-# check configs
-##############################################################
-($cleanfiles ||= "") << 'config_list'
-config_list_file = 'config_list'
-config_list_file_source = File.join(File.dirname(__FILE__),'config_list.in')
-if !File.exist?(config_list_file) ||
-    File.ctime(config_list_file_source) > File.ctime(config_list_file)
-  old_config_list_file = config_list_file_source
-else
-  old_config_list_file = config_list_file
-end
-
-current_configs = {'with'=>{}, 'enable'=>{}}
-
-# setup keys by config_list.in
-IO.foreach(config_list_file_source){|line|
-  line.chomp!
-  line.lstrip!
-  next if line.empty? || line =~ /^\#/ #
-  mode, key, value = line.split(/\s+/, 3)
-  value ||= ""
-  current_configs[mode][key] = value rescue nil
-}
-
-# define current value of keys
-IO.foreach(old_config_list_file){|line|
-  line.chomp!
-  line.lstrip!
-  next if line.empty? || line =~ /^\#/ #
-  mode, key, value = line.split(/\s+/, 3)
-  value ||= ""
-  if current_configs[mode] && current_configs[mode].has_key?(key)
-    current_configs[mode][key] = value
-  end
-}
-
-update_flag = false
-current_configs['with'].each_key{|key|
-  if (value = with_config(key).to_s) != current_configs['with'][key]
-    update_flag = true
-    current_configs['with'][key] = value
-  end
-}
-current_configs['enable'].each_key{|key|
-  if (value = enable_config(key).to_s) != current_configs['enable'][key]
-    update_flag = true
-    current_configs['enable'][key] = value
-  end
-}
-
-# update current_configs
-if update_flag || !File.exist?(config_list_file)
-  open(config_list_file, 'w'){|fobj|
-    fobj.print("# values of current configure options (generated by extconf.rb)\n");
-    ['with', 'enable'].each{|mode|
-      current_configs[mode].each_key{|key|
-        fobj.print("#{mode} #{key} #{current_configs[mode][key]}\n")
-      }
-    }
-  }
-end
-
-if update_flag
-  puts "Configure options for Ruby/Tk may be updated."
-  puts "So, delete files which depend on old configs."
-  File.delete(*Dir.glob("*.#{CONFIG['DLEXT']}", File::FNM_CASEFOLD))
-  File.delete(*Dir.glob("*.#{$OBJEXT}", File::FNM_CASEFOLD))
-  File.delete('Makefile') rescue nil
-
-else
-  makefile = 'Makefile'
-  if File.exist?(makefile) &&
-      File.ctime(config_list_file) > File.ctime(makefile)
-    # no need to update Makefile
-    exit
-  end
-end
-
-
-##############################################################
-# functions
-##############################################################
-def is_win32?
-  /mswin|mingw|cygwin|bccwin/ =~ RUBY_PLATFORM
-end
-
-def is_macosx?
- /darwin/ =~ RUBY_PLATFORM
-end
-
-def maybe_64bit?
-  /64|universal|s390x/ =~ RUBY_PLATFORM
-end
-
-if defined?(Logging.quiet) and Logging.quiet and /--jobserver-fds=/ !~ ENV["MAKEFLAGS"]
-  def progress(s)
-    print(s)
-  end
-  def newline
-  end
-else
-  def progress(s)
-  end
-  def newline
-    puts
-  end
-end
-
-def check_tcltk_version(version)
-  return [nil, nil] unless version.kind_of? String
-
-  tclver, tkver = version.split(',')
-  tclver = tclver.strip
-  return [tclver, tkver.strip] if tkver
-
-  dot = major = minor_dot = minor = plvl_dot = plvl = ext = nil
-  if tclver =~ /^(\d)(\.?)(\d)(\.?)(\d*)(.*)$/
-    major = $1; minor_dot = $2; minor = $3; plvl_dot = $4; plvl = $5; ext = $6
-    dot = ! minor_dot.empty?
-    if plvl_dot.empty? && ! plvl.empty?
-      minor << plvl
-    end
-  elsif tclver =~ /^(\d)(\.?)(\d?)(.*)$/
-    major = $1; minor_dot = $2; minor = $3; ext = $4
-    dot = ! minor_dot.empty?
-  else # unknown -> believe user
-    return [tclver, tkver]
-  end
-
-  # check Tcl7.6 / Tk4.2 ?
-  if major == "7" # Tcl7.6 ( not support Tclversion < 7.6 )
-    # Tk4.2
-    tkver  = "4" + ((dot)? ".": "") + ((minor.empty)? "": "2") + ext
-  elsif major == "4" # Tk4.2 ( not support Tkversion < 4.2 )
-    # Tcl7.6
-    tkver = tclver
-    tclver = "7" + ((dot)? ".": "") + ((minor.empty)? "": "6") + ext
-  end
-
-  tkver = tclver unless tkver
-
-  [tclver, tkver]
-end
-
-def get_shlib_versions(major = 8, minor_max = 9, minor_min = 0, ext = "")
-  if tclcfg = TkLib_Config["tclConfig_info"]
-    major = tclcfg['TCL_MAJOR_VERSION'].to_i
-    minor_min = tclcfg['TCL_MINOR_VERSION'].to_i
-
-  elsif TkLib_Config["tcltkversion"]
-    tclver, tkver = TkLib_Config["tcltkversion"]
-    if tclver =~ /8\.?(\d)(.*)/
-      minor_min = $1.to_i
-      ext = $2
-    else
-      # unsupported version
-      return [""]
-    end
-  end
-
-  # if disable-stubs, version is fixed.
-  minor_max = minor_min unless TkLib_Config["tcltk-stubs"]
-
-  vers = []
-  minor_max.downto(minor_min){|minor|
-    vers << "#{major}.#{minor}#{ext}" unless ext.empty?
-    vers << "#{major}.#{minor}"
-  }
-
-  vers << ""
-end
-
-def get_shlib_path_head
-  path_head = []
-  path_dirs = []
-
-  if TkLib_Config["ActiveTcl"].kind_of?(String)  # glob path
-    # path_head << TkLib_Config["ActiveTcl"]
-    path_head.concat Dir.glob(TkLib_Config["ActiveTcl"], File::FNM_CASEFOLD).sort.reverse
-    # path_dirs.concat Dir.glob(File.join(TkLib_Config["ActiveTcl"], 'lib'), File::FNM_CASEFOLD).sort.reverse
-  end
-
-  if CROSS_COMPILING
-  elsif is_win32?
-    if TkLib_Config["ActiveTcl"]
-      path_head.concat ["c:/ActiveTcl", "c:/Program Files/ActiveTcl",
-                        "c:/Program Files (x86)/ActiveTcl"]
-    end
-    path_head.concat [
-      "c:/Tcl", "c:/Program Files/Tcl", "c:/Program Files (x86)/Tcl",
-      "/Tcl", "/Program Files/Tcl", "/Program Files (x86)/Tcl"
-    ]
-    path_head.uniq!
-    #path_head.each{|dir| path_dirs << dir.dup if File.directory? dir}
-    path_head.each{|dir| path_dirs << File.expand_path(dir) if File.directory? dir}
-
-    # for MinGW
-    ["/usr/local/lib64", "/usr/lib64", "/usr/local/lib", "/usr/lib"].each{|dir|
-      #path_dirs << dir if File.directory? dir
-      path_dirs << File.expand_path(dir) if File.directory? dir
-    }
-    path_dirs |= ENV['LIBRARY_PATH'].split(';').find_all{|dir| File.directory? dir}.map{|dir| File.expand_path(dir)} if ENV['LIBRARY_PATH']
-    path_dirs |= ENV['PATH'].split(';').find_all{|dir| File.directory? dir}.map{|dir| File.expand_path(dir)} if ENV['PATH']
-
-  else
-    [
-      '/opt', '/pkg', '/share',
-      '/usr/local/opt', '/usr/local/pkg', '/usr/local/share', '/usr/local',
-      '/usr/opt', '/usr/pkg', '/usr/share', '/usr/contrib', '/usr'
-    ].each{|dir|
-      next unless File.directory?(dir)
-
-      path_dirs << "#{dir}/lib64" if maybe_64bit?
-      path_dirs << "#{dir}/lib"
-      path_dirs << "#{dir}" unless Dir.glob("#{dir}/lib*.*", File::FNM_CASEFOLD).empty?
-
-      dirnames = []
-      if TkLib_Config["ActiveTcl"]
-        dirnames.concat ["ActiveTcl"]
-      end
-      dirnames.concat ["TclTk","Tcl_Tk","Tcl-Tk"]
-
-      dirnames.each{|name|
-        path_dirs << "#{dir}/#{name}" if File.directory?("#{dir}/#{name}")
-        path_head << "#{dir}/#{name}" unless Dir.glob("#{dir}/#{name}[-89_]*", File::FNM_CASEFOLD).empty?
-      }
-    }
-  end
-
-  unless TkLib_Config["space-on-tk-libpath"]
-    path_head.delete_if{|path| path =~ / /}
-    path_dirs.delete_if{|path| path =~ / /}
-  end
-
-  [path_head, path_dirs]
-end
-
-def find_macosx_framework
-  use_framework = is_macosx? && TkLib_Config["ActiveTcl"]
-
-  use_framework ||= (tcl_hdr = with_config("tcl-framework-header"))
-  use_framework ||= (tk_hdr  = with_config("tk-framework-header"))
-  tcl_hdr = nil unless tcl_hdr.kind_of? String
-  tk_hdr  = nil unless tk_hdr.kind_of? String
-  TkLib_Config["tcl-framework-header"] = tcl_hdr
-  TkLib_Config["tk-framework-header"]  = tk_hdr
-
-  use_framework ||= (tcl_dir = with_config("tcl-framework-dir"))
-  tcl_dir = nil unless tcl_dir.kind_of? String
-  if !tcl_dir && tcl_hdr
-    # e.g. /Library/Frameworks/Tcl.framework/Headers
-    #       ==> /Library/Frameworks/Tcl.framework
-    tcl_dir = File.dirname(tcl_hdr.strip.chomp('/'))
-  end
-  TkLib_Config["tcl-framework-dir"] = tcl_dir
-
-  use_framework ||= (tk_dir = with_config("tk-framework-dir"))
-  tk_dir = nil unless tk_dir.kind_of? String
-  if !tk_dir && tk_hdr
-    # e.g. /Library/Frameworks/Tk.framework/Headers
-    #       ==> /Library/Frameworks/Tk.framework
-    tk_dir = File.dirname(tk_hdr.strip.chomp('/'))
-  end
-  TkLib_Config["tk-framework-dir"] = tk_dir
-
-  if tcl_dir && !tk_dir
-    tk_dir = File.join(File.dirname(tcl_dir), 'Tk.framework')
-    TkLib_Config["tk-framework-dir"] = tk_dir
-  elsif !tcl_dir && tk_dir
-    tcl_dir = File.join(File.dirname(tk_dir), 'Tcl.framework')
-    TkLib_Config["tcl-framework-dir"] = tcl_dir
-  end
-  if tcl_dir && tk_dir
-    TkLib_Config["tcltk-framework"] = File.dirname(tcl_dir) unless TkLib_Config["tcltk-framework"]
-    return [tcl_dir, tk_dir]
-  end
-
-  # framework is disabled?
-  if with_config("tcltk-framework") == false ||
-      enable_config("tcltk-framework") == false
-   return false
-  end
-
-  use_framework ||= (framework_dir = with_config("tcltk-framework"))
-  if framework_dir.kind_of? String
-    TkLib_Config["tcltk-framework"] = framework_dir.strip.chomp('/')
-    return [File.join(TkLib_Config["tcltk-framework"], 'Tcl.framework'),
-            File.join(TkLib_Config["tcltk-framework"], 'Tk.framework')]
-  end
-
-  unless enable_config("tcltk-framework", use_framework) ||
-      enable_config("mac-tcltk-framework", use_framework)
-    TkLib_Config["tcltk-framework"] = false
-    return false
-  end
-
-  paths = [
-    #"~/Library/Frameworks",
-    "/Library/Frameworks",
-    "/Network/Library/Frameworks", "/System/Library/Frameworks"
-  ]
-  paths.reverse! unless TkLib_Config["ActiveTcl"] # system has higher priority
-
-  paths.map{|dir| dir.strip.chomp('/')}.each{|dir|
-    next unless File.exist?(File.join(dir, "Tcl.framework", "Headers"))
-    next unless File.directory?(tcldir = File.join(dir, "Tcl.framework"))
-    next unless File.exist?(File.join(dir, "Tk.framework", "Headers"))
-    next unless File.directory?(tkdir  = File.join(dir, "Tk.framework"))
-    TkLib_Config["tcltk-framework"] = dir
-    return [tcldir, tkdir]
-  }
-
-  nil
-end
-
-def collect_tcltk_defs(tcl_defs_str, tk_defs_str)
-  conflicts = [
-    'PACKAGE_NAME', 'PACKAGE_TARNAME', 'PACKAGE_VERSION',
-    'PACKAGE_STRING', 'PACKAGE_BUGREPORT'
-  ]
-
-  begin
-    # Ruby 1.9.x or later
-    arch_config_h = RbConfig.expand($arch_hdrdir + "/ruby/config.h")
-    if File.exist?(arch_config_h)
-      keys = []
-      IO.foreach(arch_config_h){|line|
-        if line =~ /^#define +([^ ]+)/
-            keys << $1
-        end
-      }
-      conflicts = keys
-    end
-  rescue
-    # ignore, use default
-  end
-
-  if tcl_defs_str
-    tcl_defs = tcl_defs_str.split(/(?:\A|\s)\s*-D/).map{|s|
-      s =~ /^([^=]+)(.*)$/
-      [$1, $2]
-    }
-  else
-    tcl_defs = []
-  end
-
-  if tk_defs_str
-    tk_defs = tk_defs_str.split(/(?:\A|\s)\s*-D/).map{|s|
-      s =~ /^([^=]+)(.*)$/
-      [$1, $2]
-    }
-  else
-    tk_defs = []
-  end
-
-  defs = tcl_defs | tk_defs
-
-  defs.delete_if{|name,value|
-    conflicts.include?(name) ||
-      ( (vtcl = tcl_defs.assoc(name)) && (vtk = tk_defs.assoc(name)) &&
-          vtcl != vtk )
-  }
-
-  defs.map{|ary| /\S/ =~ (s = ary.join('')) and "-D" << s.strip}.compact
-end
-
-def parse_tclConfig(file)
-  # check tclConfig.sh/tkConfig.sh
-  tbl = Hash.new{|h,k| h[k] = ""}
-  return tbl unless file
-  IO.foreach(file){|line|
-    line.strip!
-    next if line !~ /^([^\#=][^=]*)=(['"]|)(.*)\2$/
-    key, val = $1, $3
-    tbl[key] = val.gsub(/\$\{([^}]+)\}/){|s|
-      subst = $1
-      (tbl[subst])? tbl[subst]: s
-    } rescue nil
-  }
-  tbl
-end
-
-def get_libpath(lib_flag, lib_spec)
-  # get libpath from {TCL,Tk}_LIB_FLAG and {TCL,Tk}_LIB_SPEC
-  lib_spec.gsub(/(#{lib_flag}|-L)/, "").strip
-end
-
-def get_tclConfig_dirs
-  config_dir = []
-
-  if CROSS_COMPILING
-  elsif is_win32?
-    if TkLib_Config["ActiveTcl"]
-      dirs = []
-      if TkLib_Config["ActiveTcl"].kind_of?(String)
-        dirs << File.join(TkLib_Config["ActiveTcl"], 'lib')
-      end
-      dirs.concat [
-        "c:/ActiveTcl*/lib", "c:/Tcl*/lib",
-        "c:/Program Files*/ActiveTcl*/lib", "c:/Program Files*/Tcl*/lib",
-        "/ActiveTcl*/lib", "/Tcl*/lib",
-        "/Program Files*/ActiveTcl*/lib", "/Program Files*/Tcl*/lib"
-      ]
-    else
-      dirs = [
-        "c:/Tcl*/lib", "c:/Program Files*/Tcl*/lib",
-        "/Tcl*/lib", "/Program Files*/Tcl*/lib"
-      ]
-    end
-    dirs = dirs.collect{|d| Dir.glob(d, File::FNM_CASEFOLD)}.flatten.uniq
-
-    dirs |= ENV['LIBRARY_PATH'].split(';')  if ENV['LIBRARY_PATH']
-    dirs |= ENV['PATH'].split(';')  if ENV['PATH']
-
-    exeext = RbConfig::CONFIG['EXEEXT']
-    ENV['PATH'].split(File::PATH_SEPARATOR).each{|dir|
-      dir.tr!(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR
-      next if Dir.glob(File.join(dir, "{tclsh,wish}*#{exeext}"), File::FNM_CASEFOLD).empty?
-      dirs << File.expand_path(File.join(dir, '..', 'lib'))
-      dirs << dir
-      # dirs << File.expand_path(File.join(dir, '..'))
-    }
-
-    unless TkLib_Config["space-on-tk-libpath"]
-      dirs.delete_if{|path| path =~ / /}
-    end
-
-    config_dir.concat(dirs.zip(dirs))
-
-  else
-    if framework = find_macosx_framework()
-      config_dir.unshift(framework)
-    end
-
-    if activeTcl = TkLib_Config['ActiveTcl']
-      # check latest version at first
-      if is_macosx?
-        base = File.expand_path(activeTcl)
-        config_dir << [
-          File.join(base, 'Tcl.framework'), File.join(base, 'Tk.framework')
-        ]
-
-        config_dir << [
-          File.join(base, 'Tcl.framework', 'Versions', 'Current'),
-          File.join(base, 'Tk.framework', 'Versions', 'Current')
-        ]
-
-        Dir.glob(File.join(base, 'Tcl.framework',
-                           'Versions', '*')).sort.reverse.each{|dir|
-          next if dir =~ /Current/
-          config_dir << [dir, dir.gsub(/Tcl/, 'Tk')]
-        }
-      else
-        config_dir.concat(Dir.glob(File.join(activeTcl, 'lib'), File::FNM_CASEFOLD).sort.reverse)
-      end
-    end
-
-    config_dir << RbConfig::CONFIG['libdir']
-
-    ((maybe_64bit?)? ['lib64', 'lib']: ['lib']).each{|dir|
-      config_dir.concat [
-        File.join(RbConfig::CONFIG['exec_prefix'], dir),
-        File.join(RbConfig::CONFIG['prefix'], dir),
-        "/usr/local/opt/#{dir}", "/usr/local/pkg/#{dir}",
-        "/usr/local/share/#{dir}", "/usr/local/#{dir}",
-        "/usr/opt/#{dir}", "/usr/pkg/#{dir}", "/usr/share/#{dir}",
-        "/usr/contrib/#{dir}", "/usr/#{dir}"
-      ]
-    }
-
-    config_dir.concat [
-      '/opt', '/pkg', '/share',
-      '/usr/local/opt', '/usr/local/pkg', '/usr/local/share', '/usr/local',
-      '/usr/opt', '/usr/pkg', '/usr/share', '/usr/contrib', '/usr'
-    ].map{|dir|
-      Dir.glob(dir + "/{tcltk,tcl,tk}[#{TkLib_Config['major_nums']}*/lib",
-               File::FNM_CASEFOLD)
-      Dir.glob(dir + "/{tcltk,tcl,tk}[#{TkLib_Config['major_nums']}*",
-               File::FNM_CASEFOLD)
-      Dir.glob(dir + '/{tcltk,tcl,tk}/lib', File::FNM_CASEFOLD)
-      Dir.glob(dir + '/{tcltk,tcl,tk}', File::FNM_CASEFOLD)
-    }.flatten!
-
-    exeext = RbConfig::CONFIG['EXEEXT']
-    ENV['PATH'].split(File::PATH_SEPARATOR).each{|dir|
-      dir.tr!(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR
-      next if Dir.glob(File.join(dir, "{tclsh,wish}*#{exeext}"), File::FNM_CASEFOLD).empty?
-      config_dir << File.expand_path(File.join(dir, '..', 'lib'))
-    }
-
-    # for MacOS X
-    paths = [
-      #"~/Library/Tcl",
-      "/Library/Tcl", "/Network/Library/Tcl", "/System/Library/Tcl"
-    ]
-    paths.reverse! unless TkLib_Config["ActiveTcl"]
-
-    paths.each{|path|
-      config_dir << path
-      config_dir.concat(Dir.glob(File.join(path, '{tcl,tk}*'), File::FNM_CASEFOLD).sort.reverse.find_all{|d| File.directory?(d)})
-    }
-
-    paths = [
-      #"~/Library/Frameworks",
-      "/Library/Frameworks",
-      "/Network/Library/Frameworks", "/System/Library/Frameworks"
-    ]
-    paths.reverse! unless TkLib_Config["ActiveTcl"]
-
-    paths.each{|frmwk|
-      base = File.expand_path(frmwk)
-      config_dir << [
-        File.join(base, 'Tcl.framework'), File.join(base, 'Tk.framework')
-      ]
-
-      config_dir << [
-        File.join(base, 'Tcl.framework', 'Versions', 'Current'),
-        File.join(base, 'Tk.framework', 'Versions', 'Current')
-      ]
-
-      Dir.glob(File.join(base, 'Tcl.framework',
-                         'Versions', '*')).sort.reverse.each{|dir|
-        next if dir =~ /Current/
-        config_dir << [dir, dir.gsub(/Tcl/, 'Tk')]
-      }
-    }
-  end
-
-  config_dir
-end
-
-def get_ext_list()
-  exts = [CONFIG['DLEXT']]
-  exts.concat %w(dll) if is_win32?
-  exts.concat %w(bundle dylib) if is_macosx?
-
-  if TkLib_Config["tcltk-stubs"] || TkLib_Config['enable-shared'] == false
-    exts.unshift "lib" if is_win32?
-    exts.unshift "a"
-    exts.unshift CONFIG['LIBEXT']
-  end
-
-  if is_win32?
-    exts.map!{|ext| [ext.downcase, ext.upcase]}.flatten!
-  end
-
-  exts
-end
-
-def libcheck_for_tclConfig(tcldir, tkdir, tclconf, tkconf)
-  tcllib_ok = tklib_ok = false
-
-  if TkLib_Config["tcltk-stubs"]
-    stub = "stub"
-    tclfunc = "Tcl_InitStubs"
-    tkfunc  = "Tk_InitStubs"
-  else
-    stub = ""
-    tclfunc = "Tcl_FindExecutable"
-    tkfunc  = "Tk_Init"
-  end
-
-  incflags = ($INCFLAGS ||= "").dup
-  libpath = ($LIBPATH ||= []).dup
-  libs_param = ($libs ||= "").dup
-  tcllibs = nil
-  mkmf_param = nil
-
-  tclver, tkver = TkLib_Config["tcltkversion"]
-  exts = "(" + get_ext_list.join('|') + ")"
-
-  if tclver
-    tcl_glob = "*tcl#{stub}#{tclver}.*"
-    tcl_regexp = /^.*(tcl#{stub}#{tclver}.*)\.(#{exts}).*$/
-  elsif tclconf
-    tcl_glob = "*tcl#{stub}#{tclconf['TCL_MAJOR_VERSION']}{.,}#{tclconf['TCL_MINOR_VERSION']}*.*"
-    tcl_regexp = /^.*(tcl#{stub}#{tclconf['TCL_MAJOR_VERSION']}(?:\.|)#{tclconf['TCL_MINOR_VERSION']}.*)\.(#{exts}).*$/
-  end
-  if tkver
-    tk_glob = "*tk#{stub}#{tkver}.*"
-    tk_regexp = /^.*(tk#{stub}#{tkver}.*)\.(#{exts}).*$/
-  elsif tkconf
-    tk_glob = "*tk#{stub}#{tkconf['TK_MAJOR_VERSION']}{.,}#{tkconf['TK_MINOR_VERSION']}*.*"
-    tk_regexp = /^.*(tk#{stub}#{tkconf['TK_MAJOR_VERSION']}(?:\.|)#{tkconf['TK_MINOR_VERSION']}.*)\.#{exts}.*$/
-  end
-
-  tcllib_ok ||= !tclconf || Dir.glob(File.join(tcldir, tcl_glob), File::FNM_CASEFOLD).find{|file|
-    if file =~ tcl_regexp
-      libname = $1
-      ext = $2.downcase
-      begin
-        $INCFLAGS = incflags.dup << " " << tclconf["TCL_INCLUDE_SPEC"]
-        #puts "check #{file} #{$1} #{tclfunc} #{tcldir}"
-        #find_library($1, tclfunc, tcldir)
-        if (tclconf && tclconf["TCL_SHARED_BUILD"] == "0") ||
-            (ext != CONFIG['DLEXT'] && ext == CONFIG['LIBEXT']) || ext == "a"
-          # static link
-          tcllibs = $libs + " -DSTATIC_BUILD " + file.quote
-
-          # FIX ME: avoid pathname trouble (fail to find) on MinGW.
-          #   e.g. TCL_INCLUDE_SPEC describes "-I/usr/local/include",
-          #        but compiler can find "-IC:/msys/1.0/local/include" only.
-          $INCFLAGS << " -I" << File.join(File.dirname(File.dirname(file)),"include") if is_win32?
-        else
-          tcllibs = append_library($libs, libname)
-          tcllibs = "#{libpathflag([tcldir])} #{tcllibs}"
-
-          # FIX ME: avoid pathname trouble (fail to find) on MinGW.
-          $INCFLAGS << " -I" << File.join(File.dirname(tcldir),"include") if is_win32?
-        end
-
-        $LIBPATH = libpath | [tcldir]
-        try_func(tclfunc, tcllibs, ["tcl.h"]) ||
-          ( try_func(tclfunc, tcllibs << " " << tclconf['TCL_LIBS'], ["tcl.h"]) if tclconf['TCL_LIBS'] )
-
-      ensure
-        mkmf_param = {
-          'PATH' => file,
-          'LIBNAME' => libname,
-          'libs' => tcllibs.dup,
-          'INCFLAGS' => $INCFLAGS.dup,
-          'LIBPATH' => $LIBPATH.dup,
-        }
-        $LIBPATH = libpath.dup
-        $libs = libs_param.dup
-      end
-    end
-  }
-  tclconf['MKMF_PARAMS'] = mkmf_param if tclconf && tcllib_ok
-
-  tklib_ok ||= !tkconf || Dir.glob(File.join(tkdir, tk_glob), File::FNM_CASEFOLD).find{|file|
-    if file =~ tk_regexp
-      libname = $1
-      ext = $2.downcase
-      begin
-        #puts "check #{file} #{$1} #{tkfunc} #{tkdir}"
-        # find_library($1, tkfunc, tkdir)
-        if (tkconf && tkconf["TCL_SHARED_BUILD"] == "0") ||
-            (ext != CONFIG['DLEXT'] && ext == CONFIG['LIBEXT']) || ext == "a"
-          # static link
-          tklibs = " -DSTATIC_BUILD " + file.quote
-
-          # FIX ME: avoid pathname trouble (fail to find) on MinGW.
-          $INCFLAGS << " -I" << File.join(File.dirname(File.dirname(file)),"include") if is_win32?
-        else
-          tklibs = append_library("", libname)
-          #tklibs = append_library("", $1)
-          tklibs = "#{libpathflag([tkdir])} #{tklibs}"
-
-          # FIX ME: avoid pathname trouble (fail to find) on MinGW.
-          $INCFLAGS << " -I" << File.join(File.dirname(tcldir),"include") if is_win32?
-        end
-
-        tklibs << " " <<  tcllibs if tcllibs
-        tmp_tklibs = tklibs.dup
-        $LIBPATH = libpath | [tkdir]
-        try_func(tkfunc, tklibs, ["tcl.h", "tk.h"]) ||
-          ( try_func(tkfunc, tklibs << " " << tkconf['TK_LIBS'], ["tcl.h", "tk.h"]) if tkconf['TK_LIBS'] ) ||
-          ( try_func(tkfunc, (tklibs = tmp_tklibs.dup) << " " << tkconf['TK_XLIBSW'], ["tcl.h", "tk.h"]) if tkconf['TK_XLIBSW'] ) ||
-          ( try_func(tkfunc, tklibs << " " << tkconf['TK_LIBS'], ["tcl.h", "tk.h"]) if tkconf['TK_LIBS'] )
-
-      ensure
-        mkmf_param = {
-          'PATH' => file,
-          'LIBNAME' => libname,
-          'libs' => tklibs.dup,
-          'INCFLAGS' => $INCFLAGS.dup,
-          'LIBPATH' => $LIBPATH.dup,
-        }
-        $LIBPATH = libpath.dup
-        $libs = libs_param.dup
-      end
-    end
-  }
-
-  $INCFLAGS = incflags.dup
-  tkconf['MKMF_PARAMS'] = mkmf_param if tkconf && tklib_ok
-
-  [tcllib_ok, tklib_ok]
-end
-
-def search_tclConfig(*paths) # libdir list or [tcl-libdir|file, tk-libdir|file]
-  TkLib_Config["tclConfig_paths"] = []
-
-  paths.compact!
-  if paths.empty?
-    config_dir = get_tclConfig_dirs
-  elsif paths.length == 1 && !paths[0][0] && !paths[0][1]
-    config_dir = get_tclConfig_dirs.map{|dir|
-      if dir.kind_of? Array
-        [ (paths[0][0] == false)? nil: dir[0],
-          (paths[0][1] == false)? nil: dir[1] ]
-      else
-        [ (paths[0][0] == false)? nil: dir,
-          (paths[0][1] == false)? nil: dir ]
-      end
-    }
-  else
-    # fixed tclConfig
-    config_dir = []
-    paths.each{|path|
-      if path.kind_of?(Array)
-        config_dir << path
-      else
-        dirs = Dir.glob(path, File::FNM_CASEFOLD)
-        config_dir.concat(dirs.zip(dirs))
-      end
-    }
-  end
-
-  tclver, tkver = TkLib_Config['tcltkversion']
-  if tclver && tclver =~ /^\D*(\d)\.?(\d)?/  # ignore PATCH_LEVEL
-    tclver_major = $1
-    tclver_minor = $2
-  else
-    tclver_major = nil
-    tclver_minor = nil
-  end
-  if tkver && tkver =~ /^\D*(\d)\.?(\d)?/  # ignore PATCH_LEVEL
-    tkver_major = $1
-    tkver_minor = $2
-  else
-    tkver_major = nil
-    tkver_minor = nil
-  end
-
-  conf = nil
-  progress_flag = false
-
-  config_dir.uniq!
-  config_dir.map{|dir|
-    if dir.kind_of? Array
-      [ (dir[0])? dir[0].strip.chomp('/'): nil,
-        (dir[1])? dir[1].strip.chomp('/'): nil ]
-    else
-      dir.strip.chomp('/')
-    end
-  }.each{|dir|
-    progress("."); progress_flag = true
-    # print("check #{dir} ==>");
-    if dir.kind_of? Array
-      tcldir, tkdir = dir
-    else
-      tcldir = tkdir = dir
-    end
-
-    tails = ['Config-shared.sh', 'config-shared.sh', 'Config.sh', 'config.sh']
-
-    if tcldir
-      if File.file?(tcldir)
-        tclcfg_files = [tcldir] * tails.length
-      else
-        tclcfg_files = tails.map{|f| File.join(tcldir, 'tcl' << f)}
-      end
-    else
-      tclcfg_files = [nil] * tails.length
-    end
-
-    if tkdir
-      if File.file?(tkdir)
-        tkcfg_files = [tkdir] * tails.length
-      else
-        tkcfg_files = tails.map{|f| File.join(tkdir, 'tk' << f)}
-      end
-    else
-      tkcfg_files = [nil] * tails.length
-    end
-
-    tclcfg_files.zip(tkcfg_files).map{|tclpath, tkpath|
-      [ (tclpath && File.exist?(tclpath))? File.expand_path(tclpath): tclpath,
-        (tkpath && File.exist?(tkpath))? File.expand_path(tkpath): tkpath ]
-    }.uniq.each{|tclpath, tkpath|
-      next if tclpath && !File.exist?(tclpath)
-      next if tkpath && !File.exist?(tkpath)
-
-      # parse tclConfig.sh/tkConfig.sh
-      tclconf = (tclpath)? parse_tclConfig(tclpath): nil
-      if tclconf
-        if tclver && ((tclver_major && tclver_major != tclconf['TCL_MAJOR_VERSION']) || (tclver_minor && tclver_minor != tclconf['TCL_MINOR_VERSION']))
-          print("\n") if progress_flag
-          puts "Ignore \"#{tclpath}\" (unmatch with configured version)."
-          progress_flag = false
-          next
-        end
-        if TkLib_Config['unsupported_versions'].find{|ver| ver == "#{tclconf['TCL_MAJOR_VERSION']}.#{tclconf['TCL_MINOR_VERSION']}"}
-          print("\n") if progress_flag
-          puts "Ignore \"#{tclpath}\" (unsupported version of Tcl/Tk)."
-          progress_flag = false
-          next
-        end
-      end
-
-      tkconf = (tkpath)? parse_tclConfig(tkpath): nil
-      if tkconf
-        if tkver && ((tkver_major && tkver_major != tkconf['TK_MAJOR_VERSION']) || (tkver_minor && tkver_minor != tkconf['TK_MINOR_VERSION']))
-          print("\n") if progress_flag
-          puts "Ignore \"#{tkpath}\" (unmatch with configured version)."
-          progress_flag = false
-          next
-        end
-        if TkLib_Config['unsupported_versions'].find{|ver| ver == "#{tkconf['TK_MAJOR_VERSION']}.#{tkconf['TK_MINOR_VERSION']}"}
-          print("\n") if progress_flag
-          puts "Ignore \"#{tkpath}\" (unsupported version of Tcl/Tk)."
-          progress_flag = false
-          next
-        end
-      end
-
-      # nativethread check
-      if !TkLib_Config["ruby_with_thread"]
-        if tclconf
-          if tclconf['TCL_THREADS'] == '1'
-            puts "\nWARNING: found #{tclpath.inspect}, but it WITH nativethread-support under ruby WITHOUT nativethread-support. So, ignore it."
-            TkLib_Config["tcl-NG-path"] << File.dirname(tclpath)
-            next
-          end
-        else
-          puts "\nWARNING: When not refer tclConfig.sh, cannot check native-thread support on Tcl/Tk libraries. Ruby, which is used now, does NOT support native-thread. So, if Tcl/Tk libraries support native-thread, it will NOT work properly."
-        end
-      end
-
-      # find tclConfig.sh & tkConfig.sh
-      conf = [tclconf, tkconf] unless conf
-
-      # check Tcl library
-      if is_macosx? && TkLib_Config["tcltk-framework"]
-        # if use framework, not check (believe it is installed properly)
-        tcllib_ok = tklib_ok = true
-      else
-        tcllib_ok, tklib_ok =
-          libcheck_for_tclConfig((tclpath)? File.dirname(tclpath): nil,
-                                 (tkpath)? File.dirname(tkpath): nil,
-                                 tclconf, tkconf)
-      end
-
-      unless tcllib_ok && tklib_ok
-        unless tcllib_ok
-          puts "\nWARNING: found #{tclpath.inspect}, but cannot find valid Tcl library for the tclConfig.sh. So, ignore it."
-          TkLib_Config["tcl-NG-path"] << File.dirname(tclpath)
-        end
-        unless tklib_ok
-          puts "\nWARNING: found #{tkpath.inspect}, but cannot find valid Tk library for the tkConfig.sh. So, ignore it."
-          TkLib_Config["tk-NG-path"] << File.dirname(tkpath)
-        end
-        next
-      end
-
-      #return [tclpath, tkpath]
-      # print(" #{[tclpath, tkpath].inspect}");
-      TkLib_Config["tclConfig_paths"] << [tclpath, tkpath]
-    }
-
-    # print("\n");
-  }
-
-  if is_macosx? && TkLib_Config["tcltk-stubs"]
-    CONFIG['LDSHARED'] << " -Xlinker -bind_at_load"
-    if config_string('LDSHAREDXX')
-      config_string('LDSHAREDXX') << " -Xlinker -bind_at_load"
-    end
-  end
-
-  if TkLib_Config["tclConfig_paths"].empty?
-    [nil, nil]
-  else
-    # find tclConfig.sh and tkConfig.sh
-    TkLib_Config["tclConfig_info"], TkLib_Config["tkConfig_info"] = conf
-    TkLib_Config["tclConfig_paths"][0]
-  end
-end
-
-def get_tclConfig(tclConfig_file, tkConfig_file, tclConfig_dir, tkConfig_dir)
-  use_tclConfig = tclConfig_file != false && tclConfig_dir != false
-  use_tkConfig  = tkConfig_file  != false && tkConfig_dir  != false
-
-  unless use_tclConfig || use_tkConfig
-    puts("Don't use [tclConfig.sh, tkConfig.sh]")
-    return [nil, nil]
-  end
-
-  tclConfig_file = nil unless tclConfig_file.kind_of? String
-  tkConfig_file = nil unless tkConfig_file.kind_of? String
-  tclConfig_dir = nil unless tclConfig_dir.kind_of? String
-  tkConfig_dir = nil unless tkConfig_dir.kind_of? String
-
-  if use_tclConfig && !tclConfig_dir
-    if tclConfig_file
-      tclConfig_dir = File.dirname(tclConfig_file)
-    elsif tkConfig_dir
-      tclConfig_dir = tkConfig_dir
-    end
-  end
-  if use_tkConfig && !tkConfig_dir
-    if tkConfig_file
-      tkConfig_dir = File.dirname(tkConfig_file)
-    elsif tclConfig_dir
-      tkConfig_dir = tclConfig_dir
-    end
-  end
-  tkConfig_dir ||= tclConfig_dir
-
-  if use_tclConfig
-    TkLib_Config["tclConfig-file"] = tclConfig_file
-    TkLib_Config["tclConfig-dir"] = tclConfig_dir
-  else
-    tclConfig_file = false
-    tclConfig_dir = false
-  end
-  if use_tkConfig
-    TkLib_Config["tkConfig-file"] = tkConfig_file
-    TkLib_Config["tkConfig-dir"] = tkConfig_dir
-  else
-    tkConfig_file = false
-    tkConfig_dir = false
-  end
-
-  print ("Don't use tclConfig.sh (specified by configure option).\n") unless use_tclConfig
-  print ("Don't use tkConfig.sh (specified by configure option).\n") unless use_tkConfig
-  print("Search ")
-  print("tclConfig.sh", (tclConfig_dir)? " (in #{tclConfig_dir})": "") if use_tclConfig
-  print((use_tclConfig)? " and ": "", "tkConfig.sh", (tkConfig_dir)? " (in #{tkConfig_dir})": "") if use_tkConfig
-  print(".")
-
-  if tclConfig_dir || tkConfig_dir || !use_tclConfig || !use_tkConfig
-    tclConfig, tkConfig =
-      search_tclConfig([ ((tclConfig_file)? tclConfig_file: tclConfig_dir),
-                         ((tkConfig_file)?  tkConfig_file:  tkConfig_dir) ])
-  else
-    tclConfig, tkConfig = search_tclConfig()
-  end
-  print("\n")
-  # TclConfig_Info = TkLib_Config["tclConfig_info"]
-  # TkConfig_Info  = TkLib_Config["tkConfig_info"]
-
-  if tclConfig || tkConfig
-    dirs = TkLib_Config["tclConfig_paths"].map{|tclpath, tkpath|
-      [ (tclpath)? File.dirname(tclpath): nil,
-        (tkpath)? File.dirname(tkpath): nil ]
-    }
-    dirs |= dirs
-    puts("Valid [tclConfig.sh, tkConfig.sh] are found in #{dirs.inspect}")
-    puts("Use [tclConfig.sh, tkConfig.sh] == #{[tclConfig, tkConfig].inspect}")
-    $LIBPATH ||= []
-    $LIBPATH |= [File.dirname(tclConfig)] if tclConfig
-    $LIBPATH |= [File.dirname(tkConfig)]  if tkConfig
-    #TkLib_Config["tclConfig_paths"].each{|tclcfg, tkcfg|
-    #  $LIBPATH |= [File.dirname(tclcfg)] | [File.dirname(tkcfg)]
-    #}
-  else
-    puts("Fail to find [tclConfig.sh, tkConfig.sh]")
-  end
-
-  [tclConfig, tkConfig]
-end
-
-def check_tcl_NG_path(path_list)
-  path_list.find_all{|path| not TkLib_Config["tcl-NG-path"].include?(path) }
-end
-
-def check_tk_NG_path(path_list)
-  path_list.find_all{|path| not TkLib_Config["tk-NG-path"].include?(path) }
-end
-
-def check_NG_path(path_list)
-  path_list.find_all{|path|
-    not (TkLib_Config["tcl-NG-path"].include?(path) &&
-         TkLib_Config["tk-NG-path"].include?(path))
-  }
-end
-
-def check_shlib_search_path(paths)
-  if !paths || paths.empty?
-    path_list = []
-
-    #if TkLib_Config["ActiveTcl"]
-    #  path_list.concat Dir.glob(TkLib_Config["ActiveTcl"], File::FNM_CASEFOLD).sort.reverse
-    #end
-    if TkLib_Config["ActiveTcl"].kind_of?(String)  # glob path
-      path_list.concat Dir.glob(TkLib_Config["ActiveTcl"], File::FNM_CASEFOLD).sort.reverse
-    end
-
-    vers = get_shlib_versions
-    path_head, path_dirs = get_shlib_path_head
-
-    path_list.concat vers.map{|ver|
-      path_head.map{|head|
-        if ver.empty?
-          head + "/lib"
-        else
-          dirs = []
-
-          if Dir.glob(head, File::FNM_CASEFOLD).find{|dir| dir == head}
-            dirs << head + "/lib"
-          end
-
-          if !Dir.glob(head + "-*", File::FNM_CASEFOLD).empty?
-            dirs << head + "-#{ver}/lib" if !Dir.glob(head + "-[89].*", File::FNM_CASEFOLD).empty?
-            dirs << head + "-#{ver.delete('.')}/lib" if !Dir.glob(head + "-[89][0-9]*", File::FNM_CASEFOLD).empty?
-          end
-
-          if !Dir.glob(head + "[_-]*", File::FNM_CASEFOLD).empty?
-            dirs << head + "_#{ver}/lib" if !Dir.glob(head + "_[89].*", File::FNM_CASEFOLD).empty?
-            dirs << head + "-#{ver}/lib" if !Dir.glob(head + "-[89].*", File::FNM_CASEFOLD).empty?
-            dirs << head + "_#{ver.delete('.')}/lib" if !Dir.glob(head + "_[89][0-9]*", File::FNM_CASEFOLD).empty?
-            dirs << head + "-#{ver.delete('.')}/lib" if !Dir.glob(head + "-[89][0-9]*", File::FNM_CASEFOLD).empty?
-          end
-
-          dirs
-        end
-      }
-    }.flatten!
-
-    path_list.concat path_dirs
-
-  else
-    # paths is a string with PATH environment style
-    path_list = paths.split((is_win32?)? ';': ':')
-  end
-
-  path_list = check_NG_path(path_list)
-  path_list.map!{|path| path.strip}
-
-  if !CROSS_COMPILING and (is_win32? || is_macosx?)
-    # exist-dir only
-    path_list.delete_if{|path| Dir.glob(File.join(path, "*.{a,so,dll,lib}")).empty?}
-  end
-
-  # keep paths for searching dynamic libs
-  #$LIBPATH |= path_list
-  path_list.uniq
-end
-
-def search_vers_on_path(vers, path, *heads)
-  exts = get_ext_list.join(',')
-  files = Dir.glob(File.join(path, "*{#{heads.join(',')}}*.{#{exts}}"), File::FNM_CASEFOLD)
-  vers.find_all{|ver| files.find{|f| f =~ /(#{ver}|#{ver.delete('.')})/} }
-end
-
-def find_tcl(tcllib, stubs, version, *opt_paths)
-  if TclConfig_Info['MKMF_PARAMS']
-    # already checked existence of tcl library based on tclConfig.sh
-    ($INCFLAGS ||= "") << " " << TclConfig_Info['MKMF_PARAMS']['INCFLAGS']
-    $LIBPATH ||= []; $LIBPATH |= TclConfig_Info['MKMF_PARAMS']['LIBPATH']
-    ($libs ||= "") << " " << TclConfig_Info['MKMF_PARAMS']['libs']
-    return [true, nil, nil, nil]
-  end
-  # else, no available tclConfig.sh on the system
-
-  print "Search Tcl library"
-
-  if stubs
-    func = "Tcl_InitStubs"
-    lib = "tclstub"
-  else
-    func = "Tcl_FindExecutable"
-    lib = "tcl"
-  end
-
-  if version && ! version.empty?
-    versions = [version]
-  else
-    versions = TkLib_Config['search_versions']
-  end
-
-  default_paths = []
-
-  default_paths.concat [
-    RbConfig::CONFIG['libdir'],
-    File.join(RbConfig::CONFIG['exec_prefix'], 'lib'),
-    File.join(RbConfig::CONFIG['prefix'], 'lib'),
-    "/usr/local/lib", "/usr/pkg/lib", "/usr/contrib/lib", "/usr/lib"
-  ].find_all{|dir| File.directory?(dir)} unless CROSS_COMPILING
-
-  if TkLib_Config["ActiveTcl"].kind_of?(String)  # glob path
-    default_paths.concat Dir.glob(TkLib_Config["ActiveTcl"]).sort.reverse.map{|d| d << "/lib"}
-  end
-
-  if !CROSS_COMPILING and is_win32?
-    default_paths.concat [
-      "c:/Tcl/lib","c:/Program Files/Tcl/lib","c:/Program Files (x86)/Tcl/lib",
-      "/Tcl/lib","/Program Files/Tcl/lib","/Program Files (x86)/Tcl/lib"
-    ].find_all{|dir| File.directory?(dir)}.map{|dir| File.expand_path(dir)}
-
-    # for MinGW
-    ["/usr/local/lib64", "/usr/lib64", "/usr/local/lib", "/usr/lib"].each{|dir|
-      default_paths << File.expand_path(dir) if File.directory? dir
-    }
-
-    default_paths |= ENV['LIBRARY_PATH'].split(';').find_all{|dir| File.directory? dir}.map{|dir| File.expand_path(dir)} if ENV['LIBRARY_PATH']
-    default_paths |= ENV['PATH'].split(';').find_all{|dir| File.directory? dir}.map{|dir| File.expand_path(dir)} if ENV['PATH']
-  end
-
-  default_paths |= TkLib_Config["checked_shlib_dirs"]
-
-  unless TkLib_Config["space-on-tk-libpath"]
-    default_paths.delete_if{|path| path =~ / /}
-  end
-
-  if (paths = opt_paths.compact).empty?
-    paths = check_tcl_NG_path(default_paths)
-  end
-
-  incflags = ($INCFLAGS ||= "").dup
-  libpath = ($LIBPATH ||= []).dup
-  libs_param = ($libs ||= "").dup
-  tcllibs = nil
-
-  exts = "(" + get_ext_list.join('|') + ")"
-
-  paths.map{|path|
-    lib_w_sufx = lib
-    begin
-      $LIBPATH |= [path]
-      inc = [File.join(File.dirname(path),"include"), File.dirname(path)]
-      inc.each{|f| $INCFLAGS << " -I" << f }
-
-      if tcllib
-        print(".")
-        if have_library(tcllib, func, ["tcl.h"])
-          return [true, path, tcllib, nil, *inc]
-        end
-      else
-        sufx_list = ['', 't', 'g', 's', 'x']
-        search_vers_on_path(versions, path, lib, 'tcl').find{|ver|
-          dir_enum = Dir.foreach(path)
-          no_dot_ver = ver.delete('.')
-          libnames = ["#{lib}#{ver}", "#{lib}#{no_dot_ver}"]
-          libnames << "tcl#{ver}" << "tcl#{no_dot_ver}"  if lib != "tcl"
-          libnames.find{|libname|
-            sufx_list.find{|sufx|
-              print(".")
-              dir_enum.map{|fname|
-                if fname =~ /^.*(#{libname}.*#{sufx})\.(#{exts}).*$/
-                  [fname, $1, $2]
-                end
-              }.compact.find{|fname, lib_w_sufx, ext|
-                ext.downcase!
-                if (ext != CONFIG['DLEXT'] && ext == CONFIG['LIBEXT']) ||
-                    ext == "a"
-                  # static link
-                  tcllibs = libs_param + " -DSTATIC_BUILD " + fname.quote
-                else
-                  tcllibs = append_library($libs, lib_w_sufx)
-                  tcllibs = "#{libpathflag([path])} #{tcllibs}"
-                end
-                if try_func(func, tcllibs, ["tcl.h"])
-                  return [true, path, nil, tcllibs, *inc]
-                end
-              }
-            }
-          }
-        }
-        if (!version && (print(".");try_func(func, libs_param, ["tcl.h"])))
-          return [true, path, lib_w_sufx, nil, *inc]
-        end
-      end
-    ensure
-      $LIBPATH = libpath.dup
-      $libs = libs_param.dup
-      $INCFLAGS = incflags.dup
-    end
-  }
-
-  progress("\n")
-  [false, nil, nil, nil]
-end
-
-def parse_TK_LIBS(tklibs)
-  sfx = "lib|shlib|dll|so"
-  re = /(("|')[^"']+\.(#{sfx})\2|[^"' ]+\.(#{sfx})|-l("|')[^"']+\5|-l[^" ]+)/#'
-
-  tklibs.scan(re).map{|lib,|
-    if lib =~ /^("|')([^"]+)\.(#{sfx})\1/
-        "\"-l#{$2}\""
-    elsif lib =~ /([^" ]+)\.(#{sfx})/
-        "-l#{$1}"
-    else
-      lib
-    end
-  }.join(' ')
-end
-
-def find_tk(tklib, stubs, version, *opt_paths)
-  if TkConfig_Info['MKMF_PARAMS']
-    # already checked existence of tcl library based on tkConfig.sh
-    ($INCFLAGS ||= "") << " " << TkConfig_Info['MKMF_PARAMS']['INCFLAGS']
-    $LIBPATH ||= []; $LIBPATH |= TkConfig_Info['MKMF_PARAMS']['LIBPATH']
-    ($libs ||= "") << " " << TkConfig_Info['MKMF_PARAMS']['libs']
-    return [true, nil, nil, nil]
-  end
-  # else, no available tkConfig.sh on the system
-
-  print "Search Tk library"
-
-  if stubs
-    func = "Tk_InitStubs"
-    lib = "tkstub"
-  else
-    func = "Tk_Init"
-    lib = "tk"
-  end
-
-  if version && ! version.empty?
-    versions = [version]
-  else
-    versions = TkLib_Config['search_versions']
-  end
-
-  default_paths = []
-
-  default_paths.concat [
-    RbConfig::CONFIG['libdir'],
-    File.join(RbConfig::CONFIG['exec_prefix'], 'lib'),
-    File.join(RbConfig::CONFIG['prefix'], 'lib'),
-    "/usr/local/lib", "/usr/pkg/lib", "/usr/contrib/lib", "/usr/lib"
-  ].find_all{|dir| File.directory?(dir)} unless CROSS_COMPILING
-
-  if !CROSS_COMPILING and is_win32?
-    default_paths.concat [
-      "c:/Tcl/lib","c:/Program Files/Tcl/lib","c:/Program Files (x86)/Tcl/lib",
-      "/Tcl/lib","/Program Files/Tcl/lib","/Program Files (x86)/Tcl/lib"
-    ].find_all{|dir| File.directory?(dir)}
-
-    # for MinGW
-    ["/usr/local/lib64", "/usr/lib64", "/usr/local/lib", "/usr/lib"].each{|dir|
-      default_paths << File.expand_path(dir) if File.directory? dir
-    }
-
-    default_paths |= ENV['LIBRARY_PATH'].split(';').find_all{|dir| File.directory? dir}.map{|dir| File.expand_path(dir)} if ENV['LIBRARY_PATH']
-    default_paths |= ENV['PATH'].split(';').find_all{|dir| File.directory? dir}.map{|dir| File.expand_path(dir)} if ENV['PATH']
-  end
-
-  default_paths |= TkLib_Config["checked_shlib_dirs"]
-
-  unless TkLib_Config["space-on-tk-libpath"]
-    default_paths.delete_if{|path| path =~ / /}
-  end
-
-  if (paths = opt_paths.compact).empty?
-    paths = check_tk_NG_path(default_paths)
-  end
-
-  incflags = ($INCFLAGS ||= "").dup
-  libpath = ($LIBPATH ||= []).dup
-  libs_param = ($libs ||= "").dup
-  tcllibs = nil
-
-  exts = "(" + get_ext_list.join('|') + ")"
-
-  paths.map{|path|
-    lib_w_sufx = lib
-    begin
-      $LIBPATH |= [path]
-      inc = [File.join(File.dirname(path),"include"), File.dirname(path)]
-      inc.each{|f| $INCFLAGS << " -I" << f }
-
-      if tklib
-        print(".")
-        if have_library(tklib, func, ["tcl.h", "tk.h"])
-          return [true, path, tklib, nil, *inc]
-        end
-      else
-        sufx_list = ['', 't', 'g', 's', 'x']
-        search_vers_on_path(versions, path, lib, 'tk').find{|ver|
-          dir_enum = Dir.foreach(path)
-          no_dot_ver = ver.delete('.')
-          libnames = ["#{lib}#{ver}", "#{lib}#{no_dot_ver}"]
-          libnames << "tk#{ver}" << "tk#{no_dot_ver}"  if lib != "tk"
-          libnames.find{|libname|
-            sufx_list.find{|sufx|
-              print(".")
-              dir_enum.map{|fname|
-                if fname =~ /^.*(#{libname}.*#{sufx})\.(#{exts}).*$/
-                  [fname, $1, $2]
-                end
-              }.compact.find{|fname, lib_w_sufx, ext|
-                if (ext != CONFIG['DLEXT'] && ext == CONFIG['LIBEXT']) ||
-                    ext == "a"
-                  # static link
-                  tklibs = libs_param + " -DSTATIC_BUILD " + fname.quote
-                else
-                  tklibs = append_library($libs, lib_w_sufx)
-                  tklibs = "#{libpathflag([path])} #{tklibs}"
-                end
-                if try_func(func, tklibs, ["tcl.h", "tk.h"])
-                  return [true, path, nil, tklibs, *inc]
-                end
-              }
-            }
-          }
-        }
-        if (!version && (print(".");try_func(func, libs_param, ["tcl.h", "tk.h"])))
-          return [true, path, lib_w_sufx, nil, *inc]
-        end
-      end
-    ensure
-      $LIBPATH = libpath
-      $libs = libs_param
-      $INCFLAGS = incflags.dup
-    end
-  }
-
-  progress("\n")
-  [false, nil, nil, nil]
-end
-
-def find_tcltk_library(tcllib, tklib, stubs, tclversion, tkversion,
-                       tcl_opt_paths, tk_opt_paths)
-  st,path,lib,libs,*inc = find_tcl(tcllib, stubs, tclversion, *tcl_opt_paths)
-  if !st && TkLib_Config['enable-shared'] == nil
-    TkLib_Config['enable-shared'] = false
-    st,path,lib,libs,*inc = find_tcl(tcllib, stubs, tclversion, *tcl_opt_paths)
-  end
-  unless st
-    puts("\n""Warning:: cannot find Tcl library. tcltklib will not be compiled (tcltklib is disabled on your Ruby. That is, Ruby/Tk will not work). Please check configure options.")
-    return false
-  else
-    ($LIBPATH ||= []; $LIBPATH |= [path]) if path
-    $libs = append_library($libs, lib) if lib
-    ($libs ||= "") << " " << libs if libs
-    $INCFLAGS ||= ""
-    inc.each{|f| $INCFLAGS << " -I" << f}
-  end
-
-  st,path,lib,libs,*inc = find_tk(tklib, stubs, tkversion, *tk_opt_paths)
-  if !st && TkLib_Config['enable-shared'] == nil
-    TkLib_Config['enable-shared'] = false
-    st,path,lib,libs,*inc = find_tk(tklib, stubs, tkversion, *tk_opt_paths)
-  end
-  unless st
-    puts("\n""Warning:: cannot find Tk library. tcltklib will not be compiled (tcltklib is disabled on your Ruby. That is, Ruby/Tk will not work). Please check configure options.")
-    return false
-  else
-    ($LIBPATH ||= []; $LIBPATH |= [path]) if path
-    $libs = append_library($libs, lib) if lib && !lib.empty?
-    ($libs ||= "") << " " << libs if libs
-    $INCFLAGS ||= ""
-    inc.each{|f| $INCFLAGS << " -I" << f}
-  end
-
-  true
-end
-
-def find_tcltk_header(tclver, tkver)
-  base_dir = []
-
-  base_dir.concat [
-    File.join(RbConfig::CONFIG['prefix'], 'include'),
-    "/usr/local/include", "/usr/pkg/include", "/usr/contrib/include",
-    "/usr/include"
-  ].find_all{|dir| File.directory?(dir)}.map{|dir| File.expand_path(dir)}
-
-  if !CROSS_COMPILING && is_win32?
-    base_dir.concat [
-      "c:/Tcl/include","c:/Program Files/Tcl/include",
-      "c:/Program Files (x86)/Tcl/include",
-      "/Tcl/include","/Program Files/Tcl/include",
-      "/Program Files (x86)/Tcl/include"
-    ].find_all{|dir| File.directory?(dir)}.map{|dir| File.expand_path(dir)}
-
-    if ENV['CPATH']
-      base_dir |= ENV['CPATH'].split(';').find_all{|dir| File.directory?(dir)}.map{|dir| File.expand_path(dir)}
-    end
-  end
-
-  base_dir |= TkLib_Config["checked_shlib_dirs"]
-
-  unless TkLib_Config["space-on-tk-libpath"]
-    base_dir.delete_if{|path| path =~ / /}
-  end
-
-  # tcl.h
-  if TclConfig_Info['MKMF_PARAMS']
-    # already checked existence of tcl headers based on tclConfig.sh
-    have_tcl_h = true
-  else
-    print "Search tcl.h"
-    newline
-    if enable_config("tcl-h-ver-check", true) &&
-        tclver && tclver =~ /^\D*(\d)\.?(\d)/
-      major = $1; minor = $2
-    else
-      major = minor = nil
-    end
-    progress(".")
-    if major && minor
-      # version check on tcl.h
-      version_check = proc {|code|
-        code << ("#if TCL_MAJOR_VERSION != #{major} || TCL_MINOR_VERSION != #{minor}\n" \
-                 "#error VERSION does not match\n" \
-                 "#endif")
-      }
-    else
-      version_check = nil
-    end
-    have_tcl_h = have_header('tcl.h', &version_check)
-    unless have_tcl_h
-      if tclver && ! tclver.empty?
-        versions = [tclver]
-      else
-        versions = TkLib_Config['search_versions']
-      end
-      paths = base_dir.dup
-      (versions + [""]).each{|ver|
-        paths.concat(base_dir.map{|dir|
-                       [
-                        dir + '/tcl' + ver,
-                        dir + '/tcl' + ver + '/include',
-                        dir + '/tcl' + ver.delete('.'),
-                        dir + '/tcl' + ver.delete('.') + '/include'
-                       ]
-                     }.flatten)
-      }
-      paths = paths.map{|dir|
-        (File.directory?(dir))? File.expand_path(dir): nil
-      }.compact.uniq
-
-      if major || minor
-        version_check = proc {|code|
-          code << "#if TCL_MAJOR_VERSION != #{major}\n#error MAJOR_VERSION does not match\n#endif\n" if major
-          code << "#if TCL_MINOR_VERSION != #{minor}\n#error MINOR_VERSION does not match\n#endif\n" if minor
-          code
-        }
-      else
-        version_check = nil
-      end
-      have_tcl_h = paths.find{|path|
-        progress(".")
-        inc_opt = " -I#{path.quote}"
-        if try_header("tcl", inc_opt, &version_check)
-          ($INCFLAGS ||= "") << inc_opt
-          true
-        else
-          false
-        end
-      }
-    end
-    progress("\n")
-  end
-
-  # tk.h
-  if TkConfig_Info['MKMF_PARAMS']
-    # already checked existence of tk headers based on tkConfig.sh
-    have_tk_h = true
-  else
-    print "Search tk.h"
-    newline
-    if enable_config("tk-h-ver-check", true) &&
-        tkver && tkver =~ /^\D*(\d)\.?(\d)/
-      major = $1; minor = $2
-    else
-      major = minor = nil
-    end
-    progress(".")
-    if major && minor
-      # version check on tk.h
-      version_check = proc {|code|
-        code << ("#if TK_MAJOR_VERSION != #{major} || TK_MINOR_VERSION != #{minor}\n" \
-                 "#error VERSION does not match\n" \
-                 "#endif")
-      }
-    else
-      version_check = nil
-    end
-    have_tk_h = have_header('tk.h')
-    unless have_tk_h
-      if tkver && ! tkver.empty?
-        versions = [tkver]
-      else
-        versions = TkLib_Config['search_versions']
-      end
-      paths = base_dir.dup
-      (versions + [""]).each{|ver|
-        paths.concat(base_dir.map{|dir|
-                       [
-                        dir + '/tk' + ver,
-                        dir + '/tk' + ver + '/include',
-                        dir + '/tk' + ver.delete('.'),
-                        dir + '/tk' + ver.delete('.') + '/include'
-                       ]
-                     }.flatten)
-      }
-      paths = paths.map{|dir|
-        (File.directory?(dir))? File.expand_path(dir): nil
-      }.compact.uniq
-
-      if major || minor
-        version_check = proc {|code|
-          code << "#if TK_MAJOR_VERSION != #{major}\n#error MAJOR_VERSION does not match\n#endif\n" if major
-          code << "#if TK_MINOR_VERSION != #{minor}\n#error MINOR_VERSION does not match\n#endif\n" if minor
-          code
-        }
-      else
-        version_check = nil
-      end
-      have_tk_h = paths.find{|path|
-        progress(".")
-        inc_opt = " -I#{path.quote}"
-        if try_header(%w'tcl.h tk.h', inc_opt, &version_check)
-          ($INCFLAGS ||= "") << inc_opt
-          true
-        else
-          false
-        end
-      }
-    end
-    progress("\n")
-  end
-
-  puts "Can't find \"tcl.h\"." unless have_tcl_h
-  puts "Can't find \"tk.h\"."  unless have_tk_h
-  have_tcl_h && have_tk_h
-end
-
-def setup_for_macosx_framework(tclver, tkver)
-  # use framework, but no tclConfig.sh
-  unless $LIBS && $LIBS.include?('-framework')
-    ($LIBS ||= "") << ' -framework Tk -framework Tcl'
-  end
-
-  if TkLib_Config["tcl-framework-header"]
-    TclConfig_Info['TCL_INCLUDE_SPEC'][0,0] =
-      " -I#{TkLib_Config["tcl-framework-header"].quote} "
-  else
-    tcl_base = File.join(TkLib_Config["tcltk-framework"], 'Tcl.framework')
-    if tclver
-      TclConfig_Info['TCL_INCLUDE_SPEC'] <<
-        " -I#{File.join(tcl_base, 'Versions', tclver, 'Headers').quote} "
-    end
-
-    TclConfig_Info['TCL_INCLUDE_SPEC'] << File.join(tcl_base, 'Headers')
-
-    unless tclver
-      dir = Dir.glob(File.join(tcl_base, 'Versions', '*', 'Headers'),
-                     File::FNM_CASEFOLD).sort.reverse[0]
-      TclConfig_Info['TCL_INCLUDE_SPEC'] << "-I#{dir.quote} " if dir
-    end
-  end
-
-  if TkLib_Config["tk-framework-header"]
-    TkConfig_Info['TK_INCLUDE_SPEC'][0,0] =
-      " -I#{TkLib_Config["tk-framework-header"].quote} "
-  else
-    tk_base  = File.join(TkLib_Config["tcltk-framework"], 'Tk.framework')
-    if tkver
-      TkConfig_Info['TK_INCLUDE_SPEC'] <<
-        " -I#{File.join(tk_base, 'Versions', tkver, 'Headers').quote} "
-    end
-
-    TkConfig_Info['TK_INCLUDE_SPEC'] << File.join(tk_base, 'Headers')
-
-    unless tkver
-      dir = Dir.glob(File.join(tk_base, 'Versions', '*', 'Headers'),
-                     File::FNM_CASEFOLD).sort.reverse[0]
-      TkConfig_Info['TK_INCLUDE_SPEC'] << "-I#{dir.quote} " if dir
-    end
-  end
-end
-
-def find_X11(*opt_paths)
-  defaults =
-    [ "/usr/X11*/lib", "/usr/lib/X11*", "/usr/local/X11*", "/usr/openwin/lib" ]
-  paths = []
-  opt_paths.compact.each{|path| paths.concat(Dir.glob(path.strip.chomp('/'), File::FNM_CASEFOLD))}
-  defaults.compact.each{|path| paths.concat(Dir.glob(path.strip.chomp('/'), File::FNM_CASEFOLD))}
-  st = find_library("X11", "XOpenDisplay", *paths)
-  unless st
-    puts("\n""Warning:: cannot find X11 library. tcltklib will not be compiled (tcltklib is disabled on your Ruby. That is, Ruby/Tk will not work). Please check configure options. If your Tcl/Tk don't require X11, please try --without-X11.")
-  end
-  st
-end
-
-def search_X_libraries
-  use_tkConfig = false
-  if TkConfig_Info['config_file_path']
-    # use definitions on tkConfig.sh
-    if (/\S/ =~ TkConfig_Info['TK_XINCLUDES'] ||
-        /\S/ =~ TkConfig_Info['TK_XLIBSW'])
-      use_tkConfig = true
-      #use_X = true && with_config("X11", ! is_win32?)
-      use_X = with_config("X11", true)
-    else
-      #use_X = false || with_config("X11", false)
-      use_X = with_config("X11", false)
-    end
-  else
-    # depend on configure options
-    use_X = with_config("X11", !(is_win32? || TkLib_Config["tcltk-framework"]))
-  end
-
-  if /\S/ =~ TkConfig_Info['TK_XINCLUDES']
-    ($INCFLAGS ||= "") << " " << TkConfig_Info['TK_XINCLUDES'].strip
-  end
-
-  if use_X
-    puts("Use X11 libraries (or use TK_XINCLUDES/TK_XLIBSW information on tkConfig.sh).")
-    x11_idir, x11_ldir = dir_config("X11")
-    x11_ldir2 = with_config("X11-lib")
-    unless find_X11(x11_ldir2, x11_ldir)
-      puts("Can't find X11 libraries. ")
-      if use_tkConfig &&
-          /\S/ =~ TkConfig_Info['TK_XLIBSW']
-        puts("But, try to use TK_XLIBSW information (believe tkConfig.sh).")
-        ($libs ||= "") << " " << TkConfig_Info['TK_XLIBSW'] << " "
-      else
-        puts("So, can't make tcltklib.so which is required by Ruby/Tk.")
-        exit
-      end
-    end
-  end
-
-  use_X
-end
-
-def pthread_check()
-  tcl_major_ver = nil
-  tcl_minor_ver = nil
-
-  # Is tcl-thread given by user ?
-  case enable_config("tcl-thread")
-  when true
-    tcl_enable_thread = true
-  when false
-    tcl_enable_thread = false
-  else
-    tcl_enable_thread = nil
-  end
-
-  if TclConfig_Info['config_file_path']
-    if tcl_enable_thread == true
-      puts("\n""Warning: definition of tclConfig.sh is ignored, because --enable-tcl-thread option is given.")
-    elsif tcl_enable_thread == false
-      puts("\n""Warning: definition of tclConfig.sh is ignored, because --disable-tcl-thread option is given.")
-    else
-      # tcl-thread is unknown and tclConfig.sh is given
-      if TclConfig_Info['TCL_THREADS']
-        tcl_enable_thread = (TclConfig_Info['TCL_THREADS'] == "1")
-      else
-        tcl_major_ver = TclConfig_Info['TCL_MAJOR_VERSION'].to_i
-        tcl_minor_ver = TclConfig_Info['TCL_MINOR_VERSION'].to_i
-        if tcl_major_ver < 8 || (tcl_major_ver == 8 && tcl_minor_ver == 0)
-          tcl_enable_thread = false
-        end
-      end
-
-      if tcl_enable_thread == nil
-        # cannot find definition
-        if tcl_major_ver
-          puts("\n""Warning: '#{TclConfig_Info['config_file_path']}' doesn't include TCL_THREADS definition.")
-        else
-          puts("\n""Warning: '#{TclConfig_Info['config_file_path']}' may not be a tclConfig file.")
-        end
-        #tclConfig = false
-      end
-    end
-  end
-
-  if tcl_enable_thread == nil && !TclConfig_Info['config_file_path']
-    # tcl-thread is unknown and tclConfig is unavailable
-    begin
-      try_run("int main() { exit(0); }")
-    rescue Exception
-      # cannot try_run. Is CROSS-COMPILE environment?
-      puts(%Q'\
-*****************************************************************************
-**
-** NATIVETHREAD SUPPORT CHECK WARNING:
-**
-**   We cannot check the consistency of nativethread support between
-**   Ruby and the Tcl/Tk library in your environment (are you perhaps
-**   cross-compiling?). If nativethread support for these 2 packages
-**   is inconsistent you may find you get errors when running Ruby/Tk
-**   (e.g. hangs or segmentation faults).  We strongly recommend
-**   you to check the consistency manually.
-**
-*****************************************************************************
-')
-      return true
-    end
-  end
-
-  if tcl_enable_thread == nil
-    # tcl-thread is unknown
-    if try_run(<<EOF)
-#include <tcl.h>
-int main() {
-   Tcl_Interp *ip;
-   ip = Tcl_CreateInterp();
-   exit((Tcl_Eval(ip, "set tcl_platform(threaded)") == TCL_OK)? 0: 1);
-}
-EOF
-      tcl_enable_thread = true
-    elsif try_run(<<EOF)
-#include <tcl.h>
-static Tcl_ThreadDataKey dataKey;
-int main() { exit((Tcl_GetThreadData(&dataKey, 1) == dataKey)? 1: 0); }
-EOF
-      tcl_enable_thread = true
-    else
-      tcl_enable_thread = false
-    end
-  end
-
-  # check pthread mode
-  if (TkLib_Config["ruby_with_thread"])
-    $CPPFLAGS ||= ""
-
-    # ruby -> enable
-    unless tcl_enable_thread
-      # ruby -> enable && tcl -> disable
-      puts(%Q'\
-*****************************************************************************
-**
-** NATIVETHREAD SUPPORT MODE WARNING:
-**
-**   Ruby is compiled with --enable-pthread, but your Tcl/Tk library
-**   seems to be compiled without nativethread support. Although you can
-**   create the tcltklib library, this combination may cause errors (e.g.
-**   hangs or segmentation faults). If you have no reason to keep the
-**   current nativethread support status, we recommend you reconfigure and
-**   recompile the libraries so that both or neither support nativethreads.
-**
-**   If you want change the status of nativethread support, please recompile
-**   Ruby without "--enable-pthread" configure option (If you use Ruby 1.9.x
-**   or later, you cannot remove this option, because it requires native-
-**   thread support.) or recompile Tcl/Tk with "--enable-threads" configure
-**   option (if your Tcl/Tk is later than or equal to Tcl/Tk 8.1).
-**
-*****************************************************************************
-')
-    end
-
-    # ruby -> enable && tcl -> enable/disable
-    if tcl_enable_thread
-      $CPPFLAGS += ' -DWITH_TCL_ENABLE_THREAD=1'
-    else
-      $CPPFLAGS += ' -DWITH_TCL_ENABLE_THREAD=0'
-    end
-
-    return true
-
-  else
-    # ruby -> disable
-    if tcl_enable_thread
-      # ruby -> disable && tcl -> enable
-      puts(%Q'\
-*****************************************************************************
-**
-** NATIVETHREAD SUPPORT MODE ERROR:
-**
-**   Ruby is not compiled with --enable-pthread, but your Tcl/Tk
-**   library seems to be compiled with nativethread support. This
-**   combination may cause frequent hang or segmentation fault
-**   errors when Ruby/Tk is working. We recommend that you NEVER
-**   create the library with such a combination of nativethread support.
-**
-**   Please recompile Ruby with the "--enable-pthread" configure option
-**   or recompile Tcl/Tk with the "--disable-threads" configure option.
-**
-*****************************************************************************
-')
-      $CPPFLAGS += ' -DWITH_TCL_ENABLE_THREAD=1'
-      return false
-    else
-      # ruby -> disable && tcl -> disable
-      $CPPFLAGS += ' -DWITH_TCL_ENABLE_THREAD=0'
-      return true
-    end
-  end
-end
-
-##############################################################
-# main
-##############################################################
-# check header file
-print("check functions.")
-
-%w"ruby_native_thread_p rb_errinfo rb_safe_level rb_hash_lookup
- rb_proc_new rb_obj_untrust rb_obj_taint rb_set_safe_level_force
- rb_sourcefile rb_thread_alive_p rb_thread_check_trap_pending
- ruby_enc_find_basename
-".each do |func|
-  have_func(func, "ruby.h")
-  progress(".")
-end
-progress("\n")
-
-# check libraries
-unless is_win32?
-  print("check libraries.")
-  have_library("nsl", "t_open")
-  progress(".")
-  have_library("socket", "socket")
-  progress(".")
-  have_library("dl", "dlopen")
-  progress(".")
-  have_library("m", "log", "math.h")
-  progress("\n")
-end
-$CPPFLAGS ||= ""
-$CPPFLAGS += ' -D_WIN32' if /cygwin/ =~ RUBY_PLATFORM
-
-# Does ruby have nativethread ?
-TkLib_Config["ruby_with_thread"] =
-  macro_defined?('HAVE_NATIVETHREAD', '#include "ruby.h"')
-
-
-#---------------------------------------------------
-TclConfig_Info = {}
-TkConfig_Info  = {}
-
-# use Tcl/Tk build dir?  (has highest priority)
-TkLib_Config["tcl-build-dir"] = with_config("tcl-build-dir")
-TkLib_Config["tk-build-dir"]  = with_config("tk-build-dir")
-if TkLib_Config["tcl-build-dir"]
-  puts("use Tcl build (pre-install) dir \"#{TkLib_Config["tcl-build-dir"]}\"")
-  TkLib_Config["tcl-build-dir"] = File.expand_path(TkLib_Config["tcl-build-dir"])
-  base = File.dirname(TkLib_Config["tcl-build-dir"])
-  ($INCFLAGS ||= "") << " -I#{File.join(base, "generic").quote} -I#{TkLib_Config["tcl-build-dir"].quote}"
-  $LIBPATH ||= []; $LIBPATH |= [TkLib_Config["tcl-build-dir"]]
-end
-if TkLib_Config["tk-build-dir"]
-  puts("use Tk build (pre-install) dir \"#{TkLib_Config["tk-build-dir"]}\"")
-  TkLib_Config["tk-build-dir"] = File.expand_path(TkLib_Config["tk-build-dir"])
-  base = File.dirname(TkLib_Config["tk-build-dir"])
-  ($INCFLAGS ||= "") << " -I#{File.join(base, "generic").quote} -I#{TkLib_Config["tk-build-dir"].quote}"
-  $LIBPATH ||= []; $LIBPATH |= [TkLib_Config["tk-build-dir"]]
-end
-
-# check requirement of Tcl/tk version
-tcltk_version = with_config("tcltkversion")
-TkLib_Config["tcltkversion"] = check_tcltk_version(tcltk_version)
-
-if TkLib_Config["tcl-build-dir"]
-  if (cfgfile = with_config("tclConfig-file", Dir.glob(File.join(TkLib_Config["tcl-build-dir"], "tclConfig*.sh"), File::FNM_CASEFOLD)[0]))
-    TclConfig_Info['config_file_path'] = cfgfile
-    TkLib_Config["tclConfig_info"] = cfginfo = parse_tclConfig(cfgfile)
-    if tclver = TkLib_Config["tcltkversion"][0]
-      TkLib_Config["tcltkversion"][0].sub!(/\d(\.?)\d/, "#{cfginfo['TCL_MAJOR_VERSION']}\\1#{cfginfo['TCL_MINOR_VERSION']}")
-    else
-      TkLib_Config["tcltkversion"][0] = "#{cfginfo['TCL_MAJOR_VERSION']}.#{cfginfo['TCL_MINOR_VERSION']}"
-    end
-  end
-end
-if TkLib_Config["tk-build-dir"]
-  if (cfgfile = with_config("tkConfig-file", Dir.glob(File.join(TkLib_Config["tk-build-dir"], "tkConfig*.sh"), File::FNM_CASEFOLD)[0]))
-    TkConfig_Info['config_file_path'] = cfgfile
-    TkLib_Config["tkConfig_info"] = cfginfo = parse_tclConfig(cfgfile)
-    if TkLib_Config["tcltkversion"][1]
-      TkLib_Config["tcltkversion"][1].sub!(/\d(\.?)\d/, "#{cfginfo['TK_MAJOR_VERSION']}\\1#{cfginfo['TK_MINOR_VERSION']}")
-    else
-      TkLib_Config["tcltkversion"][1] = "#{cfginfo['TK_MAJOR_VERSION']}.#{cfginfo['TK_MINOR_VERSION']}"
-    end
-  end
-end
-
-tclver, tkver = TkLib_Config["tcltkversion"]
-puts("Specified Tcl/Tk version is #{[tclver, tkver].inspect}") if tclver||tkver
-
-# use ActiveTcl ?
-#if activeTcl = with_config("ActiveTcl")
-#if activeTcl = with_config("ActiveTcl", true)
-if activeTcl = with_config("ActiveTcl", !(TkLib_Config["tcl-build-dir"] && TkLib_Config["tk-build-dir"]))
-  puts("Use ActiveTcl libraries (if available).")
-  unless activeTcl.kind_of? String
-    # set default ActiveTcl path
-    if CROSS_COMPILING
-    elsif is_win32?
-      activeTcl = 'c:/Tcl*'
-    elsif is_macosx?
-      activeTcl = '/Library/Frameworks'
-    else
-      activeTcl = '/opt/ActiveTcl*'
-    end
-  end
-end
-TkLib_Config["ActiveTcl"] = activeTcl
-
-# allow space chars on a libpath
-TkLib_Config["space-on-tk-libpath"] =
-  enable_config("space-on-tk-libpath", ! is_win32?)
-
-# enable Tcl/Tk stubs?
-=begin
-if /\S/ =~ TclConfig_Info['TCL_STUB_LIB_SPEC'] &&
-   /\S/ =~ TkConfig_Info['TK_STUB_LIB_SPEC']
-  stubs = true
-  unless (st = enable_config("tcltk-stubs")).nil?
-    stubs &&= st
-  end
-  unless (st = with_config("tcltk-stubs")).nil?
-    stubs &&= st
-  end
-else
-  stubs = enable_config("tcltk-stubs") || with_config("tcltk-stubs")
-end
-=end
-stubs = enable_config("tcltk-stubs") || with_config("tcltk-stubs")
-if (TkLib_Config["tcltk-stubs"] = stubs)
-  puts("Compile with Tcl/Tk stubs.")
-  $CPPFLAGS ||= ""; $CPPFLAGS += ' -DUSE_TCL_STUBS -DUSE_TK_STUBS'
-end
-
-# directory configuration of Tcl/Tk libraries
-if TkLib_Config["tcl-build-dir"]
-  tcl_idir = File.join(File.dirname(TkLib_Config["tcl-build-dir"]),"generic")
-  tcl_ldir = TkLib_Config["tcl-build-dir"]
-else
-  tcl_idir, tcl_ldir = dir_config("tcl")
-end
-if TkLib_Config["tk-build-dir"]
-  tk_idir = File.join(File.dirname(TkLib_Config["tk-build-dir"]),"generic")
-  tk_ldir = TkLib_Config["tk-build-dir"]
-else
-  tk_idir, tk_ldir = dir_config("tk")
-end
-
-tcl_idir = tk_idir unless tcl_idir
-tcl_ldir = tk_ldir unless tcl_ldir
-tk_idir = tcl_idir unless tk_idir
-tk_ldir = tcl_ldir unless tk_ldir
-
-TclConfig_Info['TCL_INCLUDE_SPEC'] ||= ""
-TkConfig_Info['TK_INCLUDE_SPEC']   ||= ""
-TclConfig_Info['TCL_INCLUDE_SPEC'][0,0] = "-I#{tcl_idir.quote} " if tcl_idir
-TkConfig_Info['TK_INCLUDE_SPEC'][0,0]   = "-I#{tk_idir.quote} "  if tk_idir
-
-# get tclConfig.sh/tkConfig.sh
-TkLib_Config["tcl-NG-path"] = []
-TkLib_Config["tk-NG-path"] = []
-tclcfg, tkcfg =
-  get_tclConfig(
-    TclConfig_Info['config_file_path'] || with_config("tclConfig-file", true),
-    TkConfig_Info['config_file_path']  || with_config("tkConfig-file", true),
-    (TclConfig_Info['config_file_path'])?
-                File.dirname(TclConfig_Info['config_file_path']) :
-                with_config("tclConfig-dir", tcl_ldir || true),
-    (TkConfig_Info['config_file_path'])?
-                File.dirname(TkConfig_Info['config_file_path']) :
-                with_config("tkConfig-dir", tk_ldir || true)
-  )
-TclConfig_Info.merge!(TkLib_Config["tclConfig_info"]) if TkLib_Config["tclConfig_info"]
-TkConfig_Info.merge!(TkLib_Config["tkConfig_info"]) if TkLib_Config["tkConfig_info"]
-TclConfig_Info['config_file_path'] ||= tclcfg
-TkConfig_Info['config_file_path'] ||= tkcfg
-
-tk_cfg_dir  = File.dirname(TkConfig_Info['config_file_path'])  rescue nil
-tcl_cfg_dir = File.dirname(TclConfig_Info['config_file_path']) rescue nil
-
-tk_ldir_list  = [tk_ldir,  tk_cfg_dir].uniq
-tcl_ldir_list = [tcl_ldir, tcl_cfg_dir].uniq
-
-if TkConfig_Info['config_file_path']
-  if TkLib_Config["tk-build-dir"]
-    spec_dir = get_libpath(TkConfig_Info['TK_LIB_FLAG'], TkConfig_Info['TK_BUILD_LIB_SPEC'])
-  else
-    spec_dir = get_libpath(TkConfig_Info['TK_LIB_FLAG'], TkConfig_Info['TK_LIB_SPEC'])
-  end
-  tk_ldir_list << spec_dir if File.directory?(spec_dir)
-end
-if TclConfig_Info['config_file_path']
-  if TkLib_Config["tcl-build-dir"]
-    spec_dir = get_libpath(TclConfig_Info['TCL_LIB_FLAG'], TclConfig_Info['TCL_BUILD_LIB_SPEC'])
-  else
-    spec_dir = get_libpath(TclConfig_Info['TCL_LIB_FLAG'], TclConfig_Info['TCL_LIB_SPEC'])
-  end
-  tcl_ldir_list << spec_dir if File.directory?(spec_dir)
-end
-
-# check tk_shlib_search_path
-TkLib_Config["checked_shlib_dirs"] =
-  check_shlib_search_path(with_config('tk-shlib-search-path'))
-
-# set TCL_DEFS and TK_DEFS
-$CPPFLAGS ||= ""
-# $CPPFLAGS += " #{TclConfig_Info['TCL_DEFS']}"
-# $CPPFLAGS += " #{TkConfig_Info['TK_DEFS']}"
-$defs += collect_tcltk_defs(TclConfig_Info['TCL_DEFS'], TkConfig_Info['TK_DEFS'])
-
-# MacOS X Frameworks?
-if TkLib_Config["tcltk-framework"]
-  puts("Use MacOS X Frameworks.")
-  ($LDFLAGS ||= "") << " " << libpathflag([TkLib_Config["tcl-build-dir"]]) if TkLib_Config["tcl-build-dir"]
-
-  libs = ''
-  if tcl_cfg_dir
-    TclConfig_Info['TCL_LIBS'] ||= ""
-    ($INCFLAGS ||= "") << ' ' << TclConfig_Info['TCL_INCLUDE_SPEC']
-    libs << ' ' << TclConfig_Info['TCL_LIBS']
-    if stubs
-      if TkLib_Config["tcl-build-dir"] &&
-          /\S/ =~ TclConfig_Info['TCL_BUILD_STUB_LIB_SPEC']
-        libs << ' ' << TclConfig_Info['TCL_BUILD_STUB_LIB_SPEC']
-      else
-        libs << ' ' << TclConfig_Info['TCL_STUB_LIB_SPEC']
-      end
-    else
-      if TkLib_Config["tcl-build-dir"] &&
-          /\S/ =~ TclConfig_Info['TCL_BUILD_LIB_SPEC']
-        libs << ' ' << TclConfig_Info['TCL_BUILD_LIB_SPEC']
-      else
-        libs << ' ' << TclConfig_Info['TCL_LIB_SPEC']
-      end
-    end
-  end
-
-  libs << " " << libpathflag([TkLib_Config["tk-build-dir"]]) if TkLib_Config["tk-build-dir"]
-
-  if tk_cfg_dir
-    TkConfig_Info['TK_LIBS'] ||= ""
-    ($INCFLAGS ||= "") << ' ' << TkConfig_Info['TK_INCLUDE_SPEC']
-    libs << ' ' << TkConfig_Info['TK_LIBS']
-    if stubs
-      if TkLib_Config["tk-build-dir"] &&
-          /\S/ =~ TclConfig_Info['TK_BUILD_STUB_LIB_SPEC']
-        libs << ' ' << TkConfig_Info['TK_BUILD_STUB_LIB_SPEC']
-      else
-        libs << ' ' << TkConfig_Info['TK_STUB_LIB_SPEC']
-      end
-    else
-      if TkLib_Config["tk-build-dir"] &&
-          /\S/ =~ TclConfig_Info['TK_BUILD_LIB_SPEC']
-        libs << ' ' << TkConfig_Info['TK_BUILD_LIB_SPEC']
-      else
-        libs << ' ' << TkConfig_Info['TK_LIB_SPEC']
-      end
-    end
-  end
-  $LDFLAGS << ' ' << libs
-  setup_for_macosx_framework(tclver, tkver) if tcl_cfg_dir && tk_cfg_dir
-end
-
-# name of  Tcl/Tk libraries
-tklib = with_config("tklib")
-tcllib = with_config("tcllib")
-
-# search X libraries
-use_X = search_X_libraries
-
-
-#---------------------------------------------------
-if (TkLib_Config["tcltk-framework"] ||
-      ( find_tcltk_header(tclver, tkver) &&
-          find_tcltk_library(tcllib, tklib, stubs, tclver, tkver,
-                             tcl_ldir_list, tk_ldir_list) ) ) &&
-    (stubs || pthread_check())
-  # create Makefile
-
-  # for SUPPORT_STATUS
-  $INSTALLFILES ||= []
-  $INSTALLFILES << ["lib/tkextlib/SUPPORT_STATUS", "$(RUBYLIBDIR)", "lib"]
-
-  # create
-  $defs << %[-DRUBY_VERSION=\\"#{RUBY_VERSION}\\"]
-  $defs << %[-DRUBY_RELEASE_DATE=\\"#{RUBY_RELEASE_DATE}\\"]
-
-  # remove harmful definitions.
-  $defs.delete_if{|x|/^-Du?intptr_t=/ =~ x}
-
-  create_makefile("tcltklib")
-
-  puts "\nFind Tcl/Tk libraries. Make tcltklib.so which is required by Ruby/Tk."
-else
-  puts "\nCan't find proper Tcl/Tk libraries. So, can't make tcltklib.so which is required by Ruby/Tk."
-  puts "If you have Tcl/Tk libraries on your environment, you may be able to use them with configure options (see ext/tk/README.tcltklib)."
-  puts "At present, Tcl/Tk8.6 is not supported. Although you can try to use Tcl/Tk8.6 with configure options, it will not work correctly. I recommend you to use Tcl/Tk8.5 or 8.4."
-end
diff --git a/ext/tk/lib/README b/ext/tk/lib/README
deleted file mode 100644
index df1c7906ea..0000000000
--- a/ext/tk/lib/README
+++ /dev/null
@@ -1,30 +0,0 @@
-README		this file
-multi-tk.rb	multiple Tk interpreter (included safe-Tk) support
-remotei-tk.rb	control remote Tk interpreter on the other process support
-tk.rb		Tk interface
-
-tk/             library files construct Ruby/Tk
-
-tkextlib/       non-standard Tcl/Tk extension support libraries
-
-*********************************************************************
-***  The followings exists for backward compatibility only.
-***  The only thing which they work is that requires current
-***  library files ( tk/*.rb ).
-*********************************************************************
-tkafter.rb	handles Tcl after
-tkbgerror.rb	Tk error module
-tkcanvas.rb	Tk canvas interface
-tkclass.rb	provides generic names for Tk classes
-tkconsole.rb	console command support
-tkdialog.rb	Tk dialog class
-tkentry.rb	Tk entry class
-tkfont.rb	Tk font support
-tkmacpkg.rb	Mac resource support
-tkmenubar.rb	TK menubar utility
-tkmngfocus.rb	focus manager
-tkpalette.rb	palette support
-tkscrollbox.rb	scroll box, also example of compound widget
-tktext.rb	text classes
-tkvirtevent.rb	virtual event support
-tkwinpkg.rb	Win DDE and registry support
diff --git a/ext/tk/lib/multi-tk.rb b/ext/tk/lib/multi-tk.rb
deleted file mode 100644
index 0fe766c049..0000000000
--- a/ext/tk/lib/multi-tk.rb
+++ /dev/null
@@ -1,3743 +0,0 @@
-# frozen_string_literal: false
-#
-#               multi-tk.rb - supports multi Tk interpreters
-#                       by Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-require 'tcltklib'
-require 'tkutil'
-require 'thread'
-
-if defined? Tk
-  fail RuntimeError,"'multi-tk' library must be required before requiring 'tk'"
-end
-
-################################################
-# ignore exception on the mainloop?
-
-TclTkLib.mainloop_abort_on_exception = true
-# TclTkLib.mainloop_abort_on_exception = false
-# TclTkLib.mainloop_abort_on_exception = nil
-
-
-################################################
-# add ThreadGroup check to TclTkIp.new
-class << TclTkIp
-  alias __new__ new
-  private :__new__
-
-  def new(*args)
-    if Thread.current.group != ThreadGroup::Default
-      raise SecurityError, 'only ThreadGroup::Default can call TclTkIp.new'
-    end
-    obj = __new__(*args)
-    obj.instance_eval{
-      @force_default_encoding ||= TkUtil.untrust([false])
-      @encoding ||= TkUtil.untrust([nil])
-      def @encoding.to_s; self.join(nil); end
-    }
-    obj
-  end
-end
-
-
-################################################
-# exception to treat the return value from IP
-class MultiTkIp_OK < Exception
-  def self.send(thread, ret=nil)
-    thread.raise self.new(ret)
-  end
-
-  def initialize(ret=nil)
-    super('succeed')
-    @return_value = ret
-  end
-
-  attr_reader :return_value
-  alias value return_value
-end
-MultiTkIp_OK.freeze
-
-
-################################################
-# methods for construction
-class MultiTkIp
-  class Command_Queue < Queue
-    def initialize(interp)
-      @interp = interp
-      super()
-    end
-
-    def push(value)
-      if !@interp || @interp.deleted?
-        fail RuntimeError, "Tk interpreter is already deleted"
-      end
-      super(value)
-    end
-    alias << push
-    alias enq push
-
-    def close
-      @interp = nil
-    end
-  end
-  Command_Queue.freeze
-
-  BASE_DIR = File.dirname(__FILE__)
-
-  WITH_RUBY_VM  = Object.const_defined?(:RubyVM) && ::RubyVM.class == Class
-  WITH_ENCODING = defined?(::Encoding.default_external)
-  #WITH_ENCODING = Object.const_defined?(:Encoding) && ::Encoding.class == Class
-
-  (@@SLAVE_IP_ID = ['slave'.freeze, TkUtil.untrust('0')]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  @@IP_TABLE = TkUtil.untrust({}) unless defined?(@@IP_TABLE)
-
-  @@INIT_IP_ENV  = TkUtil.untrust([]) unless defined?(@@INIT_IP_ENV)  # table of Procs
-  @@ADD_TK_PROCS = TkUtil.untrust([]) unless defined?(@@ADD_TK_PROCS) # table of [name, args, body]
-
-  @@TK_TABLE_LIST = TkUtil.untrust([]) unless defined?(@@TK_TABLE_LIST)
-
-  unless defined?(@@TK_CMD_TBL)
-    @@TK_CMD_TBL = TkUtil.untrust(Object.new)
-
-    # @@TK_CMD_TBL.instance_variable_set('@tbl', {}.taint)
-    tbl_obj = TkUtil.untrust(Hash.new{|hash,key|
-                               fail IndexError, "unknown command ID '#{key}'"
-                             })
-    @@TK_CMD_TBL.instance_variable_set('@tbl', tbl_obj)
-
-    class << @@TK_CMD_TBL
-      allow = [
-        '__send__', '__id__', 'freeze', 'inspect', 'kind_of?', 'object_id',
-        '[]', '[]=', 'delete', 'each', 'has_key?'
-      ]
-      instance_methods.each{|m| undef_method(m) unless allow.index(m.to_s)}
-
-      def kind_of?(klass)
-        @tbl.kind_of?(klass)
-      end
-
-      def inspect
-        if Thread.current.group == ThreadGroup::Default
-          @tbl.inspect
-        else
-          ip = MultiTkIp.__getip
-          @tbl.reject{|idx, ent| ent.respond_to?(:ip) && ent.ip != ip}.inspect
-        end
-      end
-
-      def [](idx)
-        return unless (ent = @tbl[idx])
-        if Thread.current.group == ThreadGroup::Default
-          ent
-        elsif ent.respond_to?(:ip)
-          (ent.ip == MultiTkIp.__getip)? ent: nil
-        else
-          ent
-        end
-      end
-
-      def []=(idx,val)
-        if self.has_key?(idx) && Thread.current.group != ThreadGroup::Default
-          fail SecurityError,"cannot change the entried command"
-        end
-        @tbl[idx] = val
-      end
-
-      def delete(idx, &blk)
-        # if gets an entry, is permitted to delete
-        if self[idx]
-          @tbl.delete(idx)
-        elsif blk
-          blk.call(idx)
-        else
-          nil
-        end
-      end
-
-      def each(&blk)
-        if Thread.current.group == ThreadGroup::Default
-          @tbl.each(&blk)
-        else
-          ip = MultiTkIp.__getip
-          @tbl.each{|idx, ent|
-            blk.call(idx, ent) unless ent.respond_to?(:ip) && ent.ip != ip
-          }
-        end
-        self
-      end
-
-      def has_key?(k)
-        @tbl.has_key?(k)
-      end
-      alias include? has_key?
-      alias key? has_key?
-      alias member? has_key?
-    end
-
-    @@TK_CMD_TBL.freeze
-  end
-
-  ######################################
-
-  @@CB_ENTRY_CLASS = Class.new(TkCallbackEntry){
-    def initialize(ip, cmd)
-      @ip = ip
-      @safe = safe = $SAFE
-      # @cmd = cmd
-      cmd = MultiTkIp._proc_on_safelevel(&cmd)
-      @cmd = proc{|*args| cmd.call(safe, *args)}
-      self.freeze
-    end
-    attr_reader :ip, :cmd
-    def inspect
-      cmd.inspect
-    end
-    def call(*args)
-      unless @ip.deleted?
-        current = Thread.current
-        backup_ip = current[:callback_ip]
-        current[:callback_ip] = @ip
-        begin
-          ret = @ip.cb_eval(@cmd, *args)
-          fail ret if ret.kind_of?(Exception)
-          ret
-        rescue TkCallbackBreak, TkCallbackContinue => e
-          fail e
-	rescue SecurityError => e
-          # in 'exit', 'exit!', and 'abort' : security error --> delete IP
-          if e.backtrace[0] =~ /^(.+?):(\d+):in `(exit|exit!|abort)'/
-	    @ip.delete
-          elsif @ip.safe?
-	    if @ip.respond_to?(:cb_error)
-              @ip.cb_error(e)
-            else
-              nil # ignore
-            end
-          else
-            fail e
-          end
-        rescue Exception => e
-          fail e if e.message =~ /^TkCallback/
-
-          if @ip.safe?
-	    if @ip.respond_to?(:cb_error)
-              @ip.cb_error(e)
-            else
-              nil # ignore
-            end
-          else
-            fail e
-          end
-        ensure
-          current[:callback_ip] = backup_ip
-        end
-      end
-    end
-  }.freeze
-
-  ######################################
-
-  def _keys2opts(src_keys)
-    return nil if src_keys == nil
-    keys = {}; src_keys.each{|k, v| keys[k.to_s] = v}
-    #keys.collect{|k,v| "-#{k} #{v}"}.join(' ')
-    keys.collect{|k,v| "-#{k} #{TclTkLib._conv_listelement(TkComm::_get_eval_string(v))}"}.join(' ')
-  end
-  private :_keys2opts
-
-  def _check_and_return(thread, exception, wait=0)
-    unless thread
-      unless exception.kind_of?(MultiTkIp_OK)
-        msg = "#{exception.class}: #{exception.message}"
-
-        if @interp.deleted?
-          warn("Warning (#{self}): " + msg)
-          return nil
-        end
-
-        if safe?
-          warn("Warning (#{self}): " + msg) if $DEBUG
-          return nil
-        end
-
-        begin
-          @interp._eval_without_enc(@interp._merge_tklist('bgerror', msg))
-        rescue Exception => e
-          warn("Warning (#{self}): " + msg)
-        end
-      end
-      return nil
-    end
-
-    if wait == 0
-      # no wait
-      Thread.pass
-      if thread.stop?
-        thread.raise exception
-      end
-      return thread
-    end
-
-    # wait to stop the caller thread
-    wait.times{
-      if thread.stop?
-        # ready to send exception
-        thread.raise exception
-        return thread
-      end
-
-      # wait
-      Thread.pass
-    }
-
-    # unexpected error
-    thread.raise RuntimeError, "the thread may not wait for the return value"
-    return thread
-  end
-
-  ######################################
-
-  def set_cb_error(cmd = Proc.new)
-    @cb_error_proc[0] = cmd
-  end
-
-  def cb_error(e)
-    if @cb_error_proc[0].respond_to?(:call)
-      @cb_error_proc[0].call(e)
-    end
-  end
-
-  ######################################
-
-  def set_safe_level(safe)
-    if safe > @safe_level[0]
-      @safe_level[0] = safe
-      @cmd_queue.enq([@system, 'set_safe_level', safe])
-    end
-    @safe_level[0]
-  end
-  def safe_level=(safe)
-    set_safe_level(safe)
-  end
-  def self.set_safe_level(safe)
-    __getip.set_safe_level(safe)
-  end
-  def self.safe_level=(safe)
-    self.set_safe_level(safe)
-  end
-  def safe_level
-    @safe_level[0]
-  end
-  def self.safe_level
-    __getip.safe_level
-  end
-
-  def wait_on_mainloop?
-    @wait_on_mainloop[0]
-  end
-  def wait_on_mainloop=(bool)
-    @wait_on_mainloop[0] = bool
-  end
-
-  def running_mainloop?
-    @wait_on_mainloop[1] > 0
-  end
-
-  def _destroy_slaves_of_slaveIP(ip)
-    unless ip.deleted?
-      # ip._split_tklist(ip._invoke('interp', 'slaves')).each{|name|
-      ip._split_tklist(ip._invoke_without_enc('interp', 'slaves')).each{|name|
-        name = _fromUTF8(name)
-        begin
-          # ip._eval_without_enc("#{name} eval {foreach i [after info] {after cancel $i}}")
-          after_ids = ip._eval_without_enc("#{name} eval {after info}")
-          ip._eval_without_enc("#{name} eval {foreach i {#{after_ids}} {after cancel $i}}")
-        rescue Exception
-        end
-        begin
-          # ip._invoke('interp', 'eval', name, 'destroy', '.')
-          ip._invoke(name, 'eval', 'destroy', '.')
-        rescue Exception
-        end
-
-        # safe_base?
-        if ip._eval_without_enc("catch {::safe::interpConfigure #{name}}") == '0'
-          begin
-            ip._eval_without_enc("::safe::interpDelete #{name}")
-          rescue Exception
-          end
-        end
-=begin
-        if ip._invoke('interp', 'exists', name) == '1'
-          begin
-            ip._invoke(name, 'eval', 'exit')
-          rescue Exception
-          end
-        end
-=end
-        unless ip.deleted?
-          if ip._invoke('interp', 'exists', name) == '1'
-            begin
-              ip._invoke('interp', 'delete', name)
-            rescue Exception
-            end
-          end
-        end
-      }
-    end
-  end
-
-  def _receiver_eval_proc_core(safe_level, thread, cmd, *args)
-    begin
-      #ret = proc{$SAFE = safe_level; cmd.call(*args)}.call
-      #ret = cmd.call(safe_level, *args)
-      normal_ret = false
-      ret = catch(:IRB_EXIT) do  # IRB hack
-        retval = cmd.call(safe_level, *args)
-        normal_ret = true
-        retval
-      end
-      unless normal_ret
-        # catch IRB_EXIT
-        exit(ret)
-      end
-      ret
-    rescue SystemExit => e
-      # delete IP
-      unless @interp.deleted?
-        @slave_ip_tbl.each{|name, subip|
-          _destroy_slaves_of_slaveIP(subip)
-          begin
-            # subip._eval_without_enc("foreach i [after info] {after cancel $i}")
-            after_ids = subip._eval_without_enc("after info")
-            subip._eval_without_enc("foreach i {#{after_ids}} {after cancel $i}")
-          rescue Exception
-          end
-=begin
-          begin
-            subip._invoke('destroy', '.') unless subip.deleted?
-          rescue Exception
-          end
-=end
-          # safe_base?
-          if @interp._eval_without_enc("catch {::safe::interpConfigure #{name}}") == '0'
-            begin
-              @interp._eval_without_enc("::safe::interpDelete #{name}")
-            rescue Exception
-            else
-              next if subip.deleted?
-            end
-          end
-          if subip.respond_to?(:safe_base?) && subip.safe_base? &&
-              !subip.deleted?
-            # do 'exit' to call the delete_hook procedure
-            begin
-              subip._eval_without_enc('exit')
-            rescue Exception
-            end
-          else
-            begin
-              subip.delete unless subip.deleted?
-            rescue Exception
-            end
-          end
-        }
-
-        begin
-          # @interp._eval_without_enc("foreach i [after info] {after cancel $i}")
-          after_ids = @interp._eval_without_enc("after info")
-          @interp._eval_without_enc("foreach i {#{after_ids}} {after cancel $i}")
-        rescue Exception
-        end
-        begin
-          @interp._invoke('destroy', '.') unless @interp.deleted?
-        rescue Exception
-        end
-        if @safe_base && !@interp.deleted?
-          # do 'exit' to call the delete_hook procedure
-          @interp._eval_without_enc('exit')
-        else
-          @interp.delete unless @interp.deleted?
-        end
-      end
-
-      if e.backtrace[0] =~ /^(.+?):(\d+):in `(exit|exit!|abort)'/
-        _check_and_return(thread, MultiTkIp_OK.new($3 == 'exit'))
-      else
-        _check_and_return(thread, MultiTkIp_OK.new(nil))
-      end
-
-      # if master? && !safe? && allow_ruby_exit?
-      if !@interp.deleted? && master? && !safe? && allow_ruby_exit?
-=begin
-        ObjectSpace.each_object(TclTkIp){|obj|
-          obj.delete unless obj.deleted?
-        }
-=end
-        #exit(e.status)
-        fail e
-      end
-      # break
-
-    rescue SecurityError => e
-      # in 'exit', 'exit!', and 'abort' : security error --> delete IP
-      if e.backtrace[0] =~ /^(.+?):(\d+):in `(exit|exit!|abort)'/
-        ret = ($3 == 'exit')
-        unless @interp.deleted?
-          @slave_ip_tbl.each{|name, subip|
-            _destroy_slaves_of_slaveIP(subip)
-            begin
-              # subip._eval_without_enc("foreach i [after info] {after cancel $i}")
-              after_ids = subip._eval_without_enc("after info")
-              subip._eval_without_enc("foreach i {#{after_ids}} {after cancel $i}")
-            rescue Exception
-            end
-=begin
-            begin
-              subip._invoke('destroy', '.') unless subip.deleted?
-            rescue Exception
-            end
-=end
-            # safe_base?
-            if @interp._eval_without_enc("catch {::safe::interpConfigure #{name}}") == '0'
-              begin
-                @interp._eval_without_enc("::safe::interpDelete #{name}")
-              rescue Exception
-              else
-                next if subip.deleted?
-              end
-            end
-            if subip.respond_to?(:safe_base?) && subip.safe_base? &&
-                !subip.deleted?
-              # do 'exit' to call the delete_hook procedure
-              begin
-                subip._eval_without_enc('exit')
-              rescue Exception
-              end
-            else
-              begin
-                subip.delete unless subip.deleted?
-              rescue Exception
-              end
-            end
-          }
-
-          begin
-            # @interp._eval_without_enc("foreach i [after info] {after cancel $i}")
-            after_ids = @interp._eval_without_enc("after info")
-            @interp._eval_without_enc("foreach i {#{after_ids}} {after cancel $i}")
-          rescue Exception
-          end
-=begin
-          begin
-            @interp._invoke('destroy', '.') unless @interp.deleted?
-          rescue Exception
-          end
-=end
-          if @safe_base && !@interp.deleted?
-            # do 'exit' to call the delete_hook procedure
-            @interp._eval_without_enc('exit')
-          else
-            @interp.delete unless @interp.deleted?
-          end
-        end
-        _check_and_return(thread, MultiTkIp_OK.new(ret))
-        # break
-
-      else
-        # raise security error
-        _check_and_return(thread, e)
-      end
-
-    rescue Exception => e
-      # raise exception
-      begin
-        bt = _toUTF8(e.backtrace.join("\n"))
-        if MultiTkIp::WITH_ENCODING
-          bt.force_encoding('utf-8')
-        else
-          bt.instance_variable_set(:@encoding, 'utf-8')
-        end
-      rescue Exception
-        bt = e.backtrace.join("\n")
-      end
-      begin
-        @interp._set_global_var('errorInfo', bt)
-      rescue Exception
-      end
-      _check_and_return(thread, e)
-
-    else
-      # no exception
-      _check_and_return(thread, MultiTkIp_OK.new(ret))
-    end
-  end
-
-  def _receiver_eval_proc(last_thread, safe_level, thread, cmd, *args)
-    if thread
-      Thread.new{
-        last_thread.join if last_thread
-        unless @interp.deleted?
-          _receiver_eval_proc_core(safe_level, thread, cmd, *args)
-        end
-      }
-    else
-      Thread.new{
-        unless  @interp.deleted?
-          _receiver_eval_proc_core(safe_level, thread, cmd, *args)
-        end
-      }
-      last_thread
-    end
-  end
-
-  private :_receiver_eval_proc, :_receiver_eval_proc_core
-
-  def _receiver_mainloop(check_root)
-    if @evloop_thread[0] && @evloop_thread[0].alive?
-      @evloop_thread[0]
-    else
-      @evloop_thread[0] = Thread.new{
-	while !@interp.deleted?
-	  #if check_root
-	  #  inf = @interp._invoke_without_enc('info', 'command', '.')
-	  #  break if !inf.kind_of?(String) || inf != '.'
-	  #end
-          break if check_root && !@interp.has_mainwindow?
-	  sleep 0.5
-	end
-      }
-      @evloop_thread[0]
-    end
-  end
-
-  def _create_receiver_and_watchdog(lvl = $SAFE)
-    lvl = $SAFE if lvl < $SAFE
-
-    # command-procedures receiver
-    receiver = Thread.new(lvl){|safe_level|
-      last_thread = {}
-
-      loop do
-        break if @interp.deleted?
-        thread, cmd, *args = @cmd_queue.deq
-        if thread == @system
-          # control command
-          case cmd
-          when 'set_safe_level'
-            begin
-              safe_level = args[0] if safe_level < args[0]
-            rescue Exception
-            end
-          when 'call_mainloop'
-            thread = args.shift
-            _check_and_return(thread,
-                              MultiTkIp_OK.new(_receiver_mainloop(*args)))
-          else
-            # ignore
-          end
-
-        else
-          # procedure
-          last_thread[thread] = _receiver_eval_proc(last_thread[thread],
-						    safe_level, thread,
-						    cmd, *args)
-        end
-      end
-    }
-
-    # watchdog of receiver
-    watchdog = Thread.new{
-      begin
-        loop do
-          sleep 1
-          if @interp.deleted?
-            receiver.kill
-            @cmd_queue.close
-          end
-          break unless receiver.alive?
-        end
-      rescue Exception
-        # ignore all kind of Exception
-      end
-
-      # receiver is dead
-      retry_count = 3
-      loop do
-        Thread.pass
-        begin
-          thread, cmd, *args = @cmd_queue.deq(true) # non-block
-        rescue ThreadError
-          # queue is empty
-          retry_count -= 1
-          break if retry_count <= 0
-          sleep 0.5
-          retry
-        end
-        next unless thread
-        if thread.alive?
-          if @interp.deleted?
-            thread.raise RuntimeError, 'the interpreter is already deleted'
-          else
-            thread.raise RuntimeError,
-              'the interpreter no longer receives command procedures'
-          end
-        end
-      end
-    }
-
-    # return threads
-    [receiver, watchdog]
-  end
-  private :_check_and_return, :_create_receiver_and_watchdog
-
-  ######################################
-
-  unless self.const_defined? :RUN_EVENTLOOP_ON_MAIN_THREAD
-    ### Ruby 1.9 !!!!!!!!!!!!!!!!!!!!!!!!!!
-    RUN_EVENTLOOP_ON_MAIN_THREAD = false
-  end
-
-  if self.const_defined? :DEFAULT_MASTER_NAME
-    name = DEFAULT_MASTER_NAME.to_s
-  else
-    name = nil
-  end
-  if self.const_defined?(:DEFAULT_MASTER_OPTS) &&
-      DEFAULT_MASTER_OPTS.kind_of?(Hash)
-    keys = DEFAULT_MASTER_OPTS
-  else
-    keys = {}
-  end
-
-  @@DEFAULT_MASTER = self.allocate
-  @@DEFAULT_MASTER.instance_eval{
-    @tk_windows = TkUtil.untrust({})
-
-    @tk_table_list = TkUtil.untrust([])
-
-    @slave_ip_tbl = TkUtil.untrust({})
-
-    @slave_ip_top = TkUtil.untrust({})
-
-    @evloop_thread = TkUtil.untrust([])
-
-    unless keys.kind_of? Hash
-      fail ArgumentError, "expecting a Hash object for the 2nd argument"
-    end
-
-    if !WITH_RUBY_VM || RUN_EVENTLOOP_ON_MAIN_THREAD ### check Ruby 1.9 !!!!!!!
-      @interp = TclTkIp.new(name, _keys2opts(keys))
-    else ### Ruby 1.9 !!!!!!!!!!!
-      @interp_thread = Thread.new{
-        current = Thread.current
-        begin
-          current[:interp] = interp = TclTkIp.new(name, _keys2opts(keys))
-        rescue e
-          current[:interp] = e
-          raise e
-        end
-        #sleep
-        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
-          begin
-            #TclTkLib.mainloop_abort_on_exception = false
-            #Thread.current[:status].value = TclTkLib.mainloop(true)
-            interp.mainloop_abort_on_exception = true
-            current[:status].value = interp.mainloop(true)
-          rescue SystemExit=>e
-            current[:status].value = e
-          rescue Exception=>e
-            current[:status].value = e
-            retry if interp.has_mainwindow?
-          ensure
-            mutex.synchronize{ cond_var.broadcast }
-          end
-
-          #Thread.current[:status].value = TclTkLib.mainloop(false)
-          current[:status].value = interp.mainloop(false)
-
-        ensure
-          # interp must be deleted before the thread for interp is dead.
-          # If not, raise Tcl_Panic on Tcl_AsyncDelete because async handler
-          # deleted by the wrong thread.
-          interp.delete
-        end
-      }
-      until @interp_thread[:interp]
-        Thread.pass
-      end
-      # INTERP_THREAD.run
-      raise @interp_thread[:interp] if @interp_thread[:interp].kind_of? Exception
-      @interp = @interp_thread[:interp]
-
-      # delete the interpreter and kill the eventloop thread at exit
-      interp = @interp
-      interp_thread = @interp_thread
-      END{
-        if interp_thread.alive?
-          interp.delete
-          interp_thread.kill
-        end
-      }
-
-      def self.mainloop(check_root = true)
-        begin
-          TclTkLib.set_eventloop_window_mode(true)
-          @interp_thread.value
-        ensure
-          TclTkLib.set_eventloop_window_mode(false)
-        end
-      end
-    end
-
-    @interp.instance_eval{
-      @force_default_encoding ||= TkUtil.untrust([false])
-      @encoding ||= TkUtil.untrust([nil])
-      def @encoding.to_s; self.join(nil); end
-    }
-
-    @ip_name = nil
-
-    @callback_status = TkUtil.untrust([])
-
-    @system = Object.new
-
-    @wait_on_mainloop = TkUtil.untrust([true, 0])
-
-    @threadgroup  = Thread.current.group
-
-    @safe_base = false
-
-    @safe_level = [$SAFE]
-
-    @cmd_queue = MultiTkIp::Command_Queue.new(@interp)
-
-    @cmd_receiver, @receiver_watchdog = _create_receiver_and_watchdog(@safe_level[0])
-
-    @threadgroup.add @cmd_receiver
-    @threadgroup.add @receiver_watchdog
-
-    # NOT enclose @threadgroup for @@DEFAULT_MASTER
-
-    @@IP_TABLE[ThreadGroup::Default] = self
-    @@IP_TABLE[@threadgroup] = self
-
-    #################################
-
-    @pseudo_toplevel = [false, nil]
-
-    def self.__pseudo_toplevel
-      Thread.current.group == ThreadGroup::Default &&
-        MultiTkIp.__getip == @@DEFAULT_MASTER &&
-        self.__pseudo_toplevel_evaluable? && @pseudo_toplevel[1]
-    end
-
-    def self.__pseudo_toplevel=(m)
-      unless (Thread.current.group == ThreadGroup::Default &&
-                MultiTkIp.__getip == @@DEFAULT_MASTER)
-        fail SecurityError, "no permission to manipulate"
-      end
-
-      # if m.kind_of?(Module) && m.respond_to?(:pseudo_toplevel_evaluable?)
-      if m.respond_to?(:pseudo_toplevel_evaluable?)
-        @pseudo_toplevel[0] = true
-        @pseudo_toplevel[1] = m
-      else
-        fail ArgumentError, 'fail to set pseudo-toplevel'
-      end
-      self
-    end
-
-    def self.__pseudo_toplevel_evaluable?
-      begin
-        @pseudo_toplevel[0] && @pseudo_toplevel[1].pseudo_toplevel_evaluable?
-      rescue Exception
-        false
-      end
-    end
-
-    def self.__pseudo_toplevel_evaluable=(mode)
-      unless (Thread.current.group == ThreadGroup::Default &&
-                MultiTkIp.__getip == @@DEFAULT_MASTER)
-        fail SecurityError, "no permission to manipulate"
-      end
-
-      @pseudo_toplevel[0] = (mode)? true: false
-    end
-
-    #################################
-
-    @assign_request = Class.new(Exception){
-      def self.new(target, ret)
-        obj = super()
-        obj.target = target
-        obj.ret = ret
-        obj
-      end
-      attr_accessor :target, :ret
-    }
-
-    @assign_thread = Thread.new{
-      loop do
-        begin
-          Thread.stop
-        rescue @assign_request=>req
-          begin
-            req.ret[0] = req.target.instance_eval{
-              @cmd_receiver, @receiver_watchdog =
-                _create_receiver_and_watchdog(@safe_level[0])
-              @threadgroup.add @cmd_receiver
-              @threadgroup.add @receiver_watchdog
-              @threadgroup.enclose
-              true
-            }
-          rescue Exception=>e
-            begin
-              req.ret[0] = e
-            rescue Exception
-              # ignore
-            end
-          end
-        rescue Exception
-          # ignore
-        end
-      end
-    }
-
-    def self.assign_receiver_and_watchdog(target)
-      ret = [nil]
-      @assign_thread.raise(@assign_request.new(target, ret))
-      while ret[0] == nil
-        unless @assign_thread.alive?
-          raise RuntimeError, 'lost the thread to assign a receiver and a watchdog thread'
-        end
-      end
-      if ret[0].kind_of?(Exception)
-        raise ret[0]
-      else
-        ret[0]
-      end
-    end
-
-    #################################
-
-    @init_ip_env_queue = Queue.new
-    Thread.new{
-      current = Thread.current
-      loop {
-        mtx, cond, ret, table, script = @init_ip_env_queue.deq
-        begin
-          ret[0] = table.each{|tg, ip| ip._init_ip_env(script) }
-        rescue Exception => e
-          ret[0] = e
-        ensure
-          mtx.synchronize{ cond.signal }
-        end
-        mtx = cond = ret = table = script = nil  # clear variables for GC
-      }
-    }
-
-    def self.__init_ip_env__(table, script)
-      ret = []
-      mtx  = (Thread.current[:MultiTk_ip_Mutex] ||= Mutex.new)
-      cond = (Thread.current[:MultiTk_ip_CondVar] ||= ConditionVariable.new)
-      mtx.synchronize{
-        @init_ip_env_queue.enq([mtx, cond, ret, table, script])
-        cond.wait(mtx)
-      }
-      if ret[0].kind_of?(Exception)
-        raise ret[0]
-      else
-        ret[0]
-      end
-    end
-
-    #################################
-
-    class << self
-      undef :instance_eval
-    end
-  }
-
-  @@DEFAULT_MASTER.freeze # defend against modification
-
-  ######################################
-
-  def self.inherited(subclass)
-    # trust if on ThreadGroup::Default or @@DEFAULT_MASTER's ThreadGroup
-    if @@IP_TABLE[Thread.current.group] == @@DEFAULT_MASTER
-      begin
-        class << subclass
-          self.methods.each{|m|
-            name = m.to_s
-            begin
-              unless name == '__id__' || name == '__send__' || name == 'freeze'
-                undef_method(m)
-              end
-            rescue Exception
-              # ignore all exceptions
-            end
-          }
-        end
-      ensure
-        subclass.freeze
-        fail SecurityError,
-          "cannot create subclass of MultiTkIp on a untrusted ThreadGroup"
-      end
-    end
-  end
-
-  ######################################
-
-  @@SAFE_OPT_LIST = [
-    'accessPath'.freeze,
-    'statics'.freeze,
-    'nested'.freeze,
-    'deleteHook'.freeze
-  ].freeze
-
-  def _parse_slaveopts(keys)
-    name = nil
-    safe = false
-    safe_opts = {}
-    tk_opts   = {}
-
-    keys.each{|k,v|
-      k_str = k.to_s
-      if k_str == 'name'
-        name = v
-      elsif k_str == 'safe'
-        safe = v
-      elsif @@SAFE_OPT_LIST.member?(k_str)
-        safe_opts[k_str] = v
-      else
-        tk_opts[k_str] = v
-      end
-    }
-
-    if keys['without_tk'] || keys[:without_tk]
-      [name, safe, safe_opts, nil]
-    else
-      [name, safe, safe_opts, tk_opts]
-    end
-  end
-  private :_parse_slaveopts
-
-  def _create_slave_ip_name
-    @@SLAVE_IP_ID.mutex.synchronize{
-      name = @@SLAVE_IP_ID.join('')
-      @@SLAVE_IP_ID[1].succ!
-      name.freeze
-    }
-  end
-  private :_create_slave_ip_name
-
-  ######################################
-
-  def __check_safetk_optkeys(optkeys)
-    # based on 'safetk.tcl'
-    new_keys = {}
-    optkeys.each{|k,v| new_keys[k.to_s] = v}
-
-    # check 'display'
-    if !new_keys.key?('display')
-      begin
-        #new_keys['display'] = @interp._invoke('winfo screen .')
-        new_keys['display'] = @interp._invoke('winfo', 'screen', '.')
-      rescue
-        if ENV[DISPLAY]
-          new_keys['display'] = ENV[DISPLAY]
-        elsif !new_keys.key?('use')
-          warn "Warning: no screen info or ENV[DISPLAY], so use ':0.0'"
-          new_keys['display'] = ':0.0'
-        end
-      end
-    end
-
-    # check 'use'
-    if new_keys.key?('use')
-      # given 'use'
-      case new_keys['use']
-      when TkWindow
-        new_keys['use'] = TkWinfo.id(new_keys['use'])
-        #assoc_display = @interp._eval('winfo screen .')
-        assoc_display = @interp._invoke('winfo', 'screen', '.')
-      when /^\..*/
-        new_keys['use'] = @interp._invoke('winfo', 'id', new_keys['use'])
-        assoc_display = @interp._invoke('winfo', 'screen', new_keys['use'])
-      else
-        begin
-          pathname = @interp._invoke('winfo', 'pathname', new_keys['use'])
-          assoc_display = @interp._invoke('winfo', 'screen', pathname)
-        rescue
-          assoc_display = new_keys['display']
-        end
-      end
-
-      # match display?
-      if assoc_display != new_keys['display']
-        if optkeys.key?(:display) || optkeys.key?('display')
-          fail RuntimeError,
-            "conflicting 'display'=>#{new_keys['display']} " +
-            "and display '#{assoc_display}' on 'use'=>#{new_keys['use']}"
-        else
-          new_keys['display'] = assoc_display
-        end
-      end
-    end
-
-    # return
-    new_keys
-  end
-  private :__check_safetk_optkeys
-
-  def __create_safetk_frame(slave_ip, slave_name, app_name, keys)
-    # display option is used by ::safe::loadTk
-    loadTk_keys = {}
-    loadTk_keys['display'] = keys['display']
-    dup_keys = keys.dup
-
-    # keys for toplevel : allow followings
-    toplevel_keys = {}
-    ['height', 'width', 'background', 'menu'].each{|k|
-      toplevel_keys[k] = dup_keys.delete(k) if dup_keys.key?(k)
-    }
-    toplevel_keys['classname'] = 'SafeTk'
-    toplevel_keys['screen'] = dup_keys.delete('display')
-
-    # other keys used by pack option of container frame
-
-    # create toplevel widget
-    begin
-      top = TkToplevel.new(toplevel_keys)
-    rescue NameError => e
-      fail e unless @interp.safe?
-      fail SecurityError, "unable create toplevel on the safe interpreter"
-    end
-    msg = "Untrusted Ruby/Tk applet (#{slave_name})"
-    if app_name.kind_of?(String)
-      top.title "#{app_name} (#{slave_name})"
-    else
-      top.title msg
-    end
-
-    # procedure to delete slave interpreter
-    slave_delete_proc = proc{
-      unless slave_ip.deleted?
-        #if slave_ip._invoke('info', 'command', '.') != ""
-        #  slave_ip._invoke('destroy', '.')
-        #end
-        #slave_ip.delete
-        slave_ip._eval_without_enc('exit')
-      end
-      begin
-        top.destroy if top.winfo_exist?
-      rescue
-        # ignore
-      end
-    }
-    tag = TkBindTag.new.bind('Destroy', slave_delete_proc)
-
-    top.bindtags = top.bindtags.unshift(tag)
-
-    # create control frame
-    TkFrame.new(top, :bg=>'red', :borderwidth=>3, :relief=>'ridge') {|fc|
-      fc.bindtags = fc.bindtags.unshift(tag)
-
-      TkFrame.new(fc, :bd=>0){|f|
-        TkButton.new(f,
-                     :text=>'Delete', :bd=>1, :padx=>2, :pady=>0,
-                     :highlightthickness=>0, :command=>slave_delete_proc
-                     ).pack(:side=>:right, :fill=>:both)
-        f.pack(:side=>:right, :fill=>:both, :expand=>true)
-      }
-
-      TkLabel.new(fc, :text=>msg, :padx=>2, :pady=>0,
-                  :anchor=>:w).pack(:side=>:left, :fill=>:both, :expand=>true)
-
-      fc.pack(:side=>:bottom, :fill=>:x)
-    }
-
-    # container frame for slave interpreter
-    dup_keys['fill'] = :both  unless dup_keys.key?('fill')
-    dup_keys['expand'] = true unless dup_keys.key?('expand')
-    c = TkFrame.new(top, :container=>true).pack(dup_keys)
-    c.bind('Destroy', proc{top.destroy})
-
-    # return keys
-    loadTk_keys['use'] = TkWinfo.id(c)
-    [loadTk_keys, top.path]
-  end
-  private :__create_safetk_frame
-
-  def __create_safe_slave_obj(safe_opts, app_name, tk_opts)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-
-    # safe interpreter
-    ip_name = _create_slave_ip_name
-    slave_ip = @interp.create_slave(ip_name, true)
-    slave_ip.instance_eval{
-      @force_default_encoding ||= TkUtil.untrust([false])
-      @encoding ||= TkUtil.untrust([nil])
-      def @encoding.to_s; self.join(nil); end
-    }
-    @slave_ip_tbl[ip_name] = slave_ip
-    def slave_ip.safe_base?
-      true
-    end
-
-    @interp._eval("::safe::interpInit #{ip_name}")
-
-    slave_ip._invoke('set', 'argv0', app_name) if app_name.kind_of?(String)
-
-    if tk_opts
-      tk_opts = __check_safetk_optkeys(tk_opts)
-      if tk_opts.key?('use')
-        @slave_ip_top[ip_name] = ''
-      else
-        tk_opts, top_path = __create_safetk_frame(slave_ip, ip_name, app_name,
-                                                  tk_opts)
-        @slave_ip_top[ip_name] = top_path
-      end
-      @interp._eval("::safe::loadTk #{ip_name} #{_keys2opts(tk_opts)}")
-      @interp._invoke('__replace_slave_tk_commands__', ip_name)
-    else
-      @slave_ip_top[ip_name] = nil
-    end
-
-    if safe_opts.key?('deleteHook') || safe_opts.key?(:deleteHook)
-      @interp._eval("::safe::interpConfigure #{ip_name} " +
-                    _keys2opts(safe_opts))
-    else
-      @interp._eval("::safe::interpConfigure #{ip_name} " +
-                    _keys2opts(safe_opts) + '-deleteHook {' +
-                    TkComm._get_eval_string(proc{|slave|
-                                              self._default_delete_hook(slave)
-                                            }) + '}')
-    end
-
-    [slave_ip, ip_name]
-  end
-
-  def __create_trusted_slave_obj(name, keys)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-
-    ip_name = _create_slave_ip_name
-    slave_ip = @interp.create_slave(ip_name, false)
-    slave_ip.instance_eval{
-      @force_default_encoding ||= TkUtil.untrust([false])
-      @encoding ||= TkUtil.untrust([nil])
-      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)
-    @interp._invoke('__replace_slave_tk_commands__', ip_name)
-    @slave_ip_tbl[ip_name] = slave_ip
-    [slave_ip, ip_name]
-  end
-
-  ######################################
-
-  def _create_slave_object(keys={})
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-
-    ip = MultiTkIp.new_slave(self, keys={})
-    @slave_ip_tbl[ip.name] = ip
-  end
-
-  ######################################
-
-  def initialize(master, safeip=true, keys={})
-    if master.deleted? && safeip == nil
-      fail RuntimeError, "cannot create a slave of a deleted interpreter"
-    end
-
-    if !master.deleted? && !master.master? && master.safe?
-      fail SecurityError, "safe-slave-ip cannot create a new interpreter"
-    end
-
-    if safeip == nil && !master.master?
-      fail SecurityError, "slave-ip cannot create a master-ip"
-    end
-
-    unless keys.kind_of? Hash
-      fail ArgumentError, "expecting a Hash object for the 2nd argument"
-    end
-
-    @tk_windows = {}
-    @tk_table_list = []
-    @slave_ip_tbl = {}
-    @slave_ip_top = {}
-    @cb_error_proc = []
-    @evloop_thread = []
-
-    TkUtil.untrust(@tk_windows)    unless @tk_windows.tainted?
-    TkUtil.untrust(@tk_table_list) unless @tk_table_list.tainted?
-    TkUtil.untrust(@slave_ip_tbl)  unless @slave_ip_tbl.tainted?
-    TkUtil.untrust(@slave_ip_top)  unless @slave_ip_top.tainted?
-    TkUtil.untrust(@cb_error_proc) unless @cb_error_proc.tainted?
-    TkUtil.untrust(@evloop_thread) unless @evloop_thread.tainted?
-
-    @callback_status = []
-
-    name, safe, safe_opts, tk_opts = _parse_slaveopts(keys)
-
-    safe = 1 if safe && !safe.kind_of?(Fixnum)
-
-    @safe_base = false
-
-    if safeip == nil
-      # create master-ip
-      unless WITH_RUBY_VM
-        @interp = TclTkIp.new(name, _keys2opts(tk_opts))
-        @interp.instance_eval{
-          @force_default_encoding ||= TkUtil.untrust([false])
-          @encoding ||= TkUtil.untrust([nil])
-          def @encoding.to_s; self.join(nil); end
-        }
-
-      else ### Ruby 1.9 !!!!!!!!!!!
-=begin
-        @interp_thread = Thread.new{
-          Thread.current[:interp] = interp = TclTkIp.new(name, _keys2opts(tk_opts))
-          interp.instance_eval{
-            @force_default_encoding ||= TkUtil.untrust([false])
-            @encoding ||= TkUtil.untrust([nil])
-            def @encoding.to_s; self.join(nil); end
-          }
-
-          #sleep
-          TclTkLib.mainloop(true)
-        }
-        until @interp_thread[:interp]
-          Thread.pass
-        end
-        # INTERP_THREAD.run
-        @interp = @interp_thread[:interp]
-=end
-        @interp_thread = Thread.new{
-          current = Thread.current
-          begin
-            current[:interp] = interp = TclTkIp.new(name, _keys2opts(tk_opts))
-          rescue e
-            current[:interp] = e
-            raise e
-          end
-          #sleep
-          #TclTkLib.mainloop(true)
-          current[:mutex] = mutex = Mutex.new
-          current[:root_check] = cond_ver = ConditionVariable.new
-
-          status = [nil]
-          def status.value
-            self[0]
-          end
-          def status.value=(val)
-            self[0] = val
-          end
-          current[:status] = status
-
-          begin
-            begin
-              current[:status].value = interp.mainloop(true)
-            rescue SystemExit=>e
-              current[:status].value = e
-            rescue Exception=>e
-              current[:status].value = e
-              retry if interp.has_mainwindow?
-            ensure
-              mutex.synchronize{ cond_var.broadcast }
-            end
-            current[:status].value = interp.mainloop(false)
-          ensure
-            interp.delete
-          end
-        }
-        until @interp_thread[:interp]
-          Thread.pass
-        end
-        # INTERP_THREAD.run
-        @interp = @interp_thread[:interp]
-
-        @evloop_thread[0] = @interp_thread
-
-        def self.mainloop(check_root = true)
-          begin
-            TclTkLib.set_eventloop_window_mode(true)
-            @interp_thread.value
-          ensure
-            TclTkLib.set_eventloop_window_mode(false)
-          end
-        end
-      end
-
-      @interp.instance_eval{
-        @force_default_encoding ||= TkUtil.untrust([false])
-        @encoding ||= TkUtil.untrust([nil])
-        def @encoding.to_s; self.join(nil); end
-      }
-
-      @ip_name = nil
-
-      if safe
-        safe = $SAFE if safe < $SAFE
-        @safe_level = [safe]
-      else
-        @safe_level = [$SAFE]
-      end
-
-    else
-      # create slave-ip
-      if safeip || master.safe?
-        @safe_base = true
-        @interp, @ip_name = master.__create_safe_slave_obj(safe_opts,
-                                                           name, tk_opts)
-        # @interp_thread = nil if RUBY_VERSION < '1.9.0' ### !!!!!!!!!!!
-        @interp_thread = nil unless WITH_RUBY_VM  ### Ruby 1.9 !!!!!!!!!!!
-        if safe
-          safe = master.safe_level if safe < master.safe_level
-          @safe_level = [safe]
-        else
-          @safe_level = [1]
-        end
-      else
-        @interp, @ip_name = master.__create_trusted_slave_obj(name, tk_opts)
-        # @interp_thread = nil if RUBY_VERSION < '1.9.0' ### !!!!!!!!!!!
-        @interp_thread = nil unless WITH_RUBY_VM  ### Ruby 1.9 !!!!!!!!!!!
-        if safe
-          safe = master.safe_level if safe < master.safe_level
-          @safe_level = [safe]
-        else
-          @safe_level = [master.safe_level]
-        end
-      end
-      @set_alias_proc = proc{|name|
-        master._invoke('interp', 'alias', @ip_name, name, '', name)
-      }.freeze
-    end
-
-    @system = Object.new
-
-    @wait_on_mainloop = TkUtil.untrust([true, 0])
-    # @wait_on_mainloop = TkUtil.untrust([false, 0])
-
-    @threadgroup  = ThreadGroup.new
-
-    @pseudo_toplevel = [false, nil]
-
-    @cmd_queue = MultiTkIp::Command_Queue.new(@interp)
-
-=begin
-    @cmd_receiver, @receiver_watchdog = _create_receiver_and_watchdog(@safe_level[0])
-
-    @threadgroup.add @cmd_receiver
-    @threadgroup.add @receiver_watchdog
-
-    @threadgroup.enclose
-=end
-    @@DEFAULT_MASTER.assign_receiver_and_watchdog(self)
-
-    @@IP_TABLE[@threadgroup] = self
-    @@TK_TABLE_LIST.size.times{
-      @tk_table_list << TkUtil.untrust({})
-    }
-    _init_ip_internal(@@INIT_IP_ENV, @@ADD_TK_PROCS)
-
-    class << self
-      undef :instance_eval
-    end
-
-    # dummy call for initialization
-    self.eval_proc{ Tk.tk_call('set', 'tcl_patchLevel') }
-
-    self.freeze  # defend against modification
-  end
-
-  ######################################
-
-  def _default_delete_hook(slave)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @slave_ip_tbl.delete(slave)
-    top = @slave_ip_top.delete(slave)
-    if top.kind_of?(String)
-      # call default hook of safetk.tcl (ignore exceptions)
-      if top == ''
-        begin
-          @interp._eval("::safe::disallowTk #{slave}")
-        rescue
-          warn("Warning: fail to call '::safe::disallowTk'") if $DEBUG
-        end
-      else # toplevel path
-        begin
-          @interp._eval("::safe::tkDelete {} #{top} #{slave}")
-        rescue
-          warn("Warning: fail to call '::safe::tkDelete'") if $DEBUG
-          begin
-            @interp._eval("destroy #{top}")
-          rescue
-            warn("Warning: fail to destroy toplevel") if $DEBUG
-          end
-        end
-      end
-    end
-  end
-
-end
-
-
-# get target IP
-class MultiTkIp
-  @@CALLBACK_SUBTHREAD = Class.new(Thread){
-    def self.new(interp, &blk)
-      super(interp){|ip| Thread.current[:callback_ip] = ip; blk.call}
-    end
-
-    @table = TkUtil.untrust(Hash.new{|h,k| h[k] = TkUtil.untrust([])})
-    def self.table
-      @table
-    end
-  }
-
-  def self._ip_id_
-    __getip._ip_id_
-  end
-  def _ip_id_
-    # for RemoteTkIp
-    ''
-  end
-
-  def self.__getip
-    current = Thread.current
-    if current.kind_of?(@@CALLBACK_SUBTHREAD)
-      return current[:callback_ip]
-    end
-    if TclTkLib.mainloop_thread? != false && current[:callback_ip]
-      return current[:callback_ip]
-    end
-    if current.group == ThreadGroup::Default
-      @@DEFAULT_MASTER
-    else
-      ip = @@IP_TABLE[current.group]
-      unless ip
-        fail SecurityError,
-          "cannot call Tk methods on #{Thread.current.inspect}"
-      end
-      ip
-    end
-  end
-end
-
-
-# aliases of constructor
-class << MultiTkIp
-  alias __new new
-  private :__new
-
-  def new_master(safe=nil, keys={}, &blk)
-    if MultiTkIp::WITH_RUBY_VM
-      #### TODO !!!!!!
-      fail RuntimeError,
-           'sorry, still not support multiple master-interpreters on RubyVM'
-    end
-
-    if safe.kind_of?(Hash)
-      keys = safe
-    elsif safe.kind_of?(Integer)
-      raise ArgumentError, "unexpected argument(s)" unless keys.kind_of?(Hash)
-      if !keys.key?(:safe) && !keys.key?('safe')
-        keys[:safe] = safe
-      end
-    elsif safe == nil
-      # do nothing
-    else
-      raise ArgumentError, "unexpected argument(s)"
-    end
-
-    ip = __new(__getip, nil, keys)
-    #ip.eval_proc(proc{$SAFE=ip.safe_level; Proc.new}.call) if block_given?
-    if block_given?
-      #Thread.new{ip.eval_proc(proc{$SAFE=ip.safe_level; Proc.new}.call)}
-      #Thread.new{ip.eval_proc(proc{$SAFE=ip.safe_level; yield}.call)}
-      ip._proc_on_safelevel(&blk).call(ip.safe_level)
-    end
-    ip
-  end
-
-  alias new new_master
-
-  def new_slave(safe=nil, keys={}, &blk)
-    if safe.kind_of?(Hash)
-      keys = safe
-    elsif safe.kind_of?(Integer)
-      raise ArgumentError, "unexpected argument(s)" unless keys.kind_of?(Hash)
-      if !keys.key?(:safe) && !keys.key?('safe')
-        keys[:safe] = safe
-      end
-    elsif safe == nil
-      # do nothing
-    else
-      raise ArgumentError, "unexpected argument(s)"
-    end
-
-    ip = __new(__getip, false, keys)
-    # ip.eval_proc(proc{$SAFE=ip.safe_level; Proc.new}.call) if block_given?
-    if block_given?
-      #Thread.new{ip.eval_proc(proc{$SAFE=ip.safe_level; Proc.new}.call)}
-      #Thread.new{ip.eval_proc(proc{$SAFE=ip.safe_level; yield}.call)}
-      ip._proc_on_safelevel(&blk).call(ip.safe_level)
-    end
-    ip
-  end
-  alias new_trusted_slave new_slave
-
-  def new_safe_slave(safe=1, keys={}, &blk)
-    if safe.kind_of?(Hash)
-      keys = safe
-    elsif safe.kind_of?(Integer)
-      raise ArgumentError, "unexpected argument(s)" unless keys.kind_of?(Hash)
-      if !keys.key?(:safe) && !keys.key?('safe')
-        keys[:safe] = safe
-      end
-    else
-      raise ArgumentError, "unexpected argument(s)"
-    end
-
-    ip = __new(__getip, true, keys)
-    # ip.eval_proc(proc{$SAFE=ip.safe_level; Proc.new}.call) if block_given?
-    if block_given?
-      #Thread.new{ip.eval_proc(proc{$SAFE=ip.safe_level; Proc.new}.call)}
-      #Thread.new{ip.eval_proc(proc{$SAFE=ip.safe_level; yield}.call)}
-      ip._proc_on_safelevel(&blk).call(ip.safe_level)
-    end
-    ip
-  end
-  alias new_safeTk new_safe_slave
-end
-
-
-# get info
-class MultiTkIp
-  def inspect
-    s = self.to_s.chop!
-    if self.manipulable?
-      if master?
-        if @interp.deleted?
-          s << ':deleted-master'
-        else
-          s << ':master'
-        end
-      else
-        if @interp.deleted?
-          s << ':deleted-slave'
-        elsif @interp.safe?
-          s << ':safe-slave'
-        else
-          s << ':trusted-slave'
-        end
-      end
-    end
-    s << '>'
-  end
-
-  def master?
-    if @ip_name
-      false
-    else
-      true
-    end
-  end
-  def self.master?
-    __getip.master?
-  end
-
-  def slave?
-    not master?
-  end
-  def self.slave?
-    not self.master?
-  end
-
-  def alive?
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    begin
-      return false unless @cmd_receiver.alive?
-      return false if @interp.deleted?
-      return false if @interp._invoke('interp', 'exists', '') == '0'
-    rescue Exception
-      return false
-    end
-    true
-  end
-  def self.alive?
-    __getip.alive?
-  end
-
-  def path
-    @ip_name || ''
-  end
-  def self.path
-    __getip.path
-  end
-  def ip_name
-    @ip_name || ''
-  end
-  def self.ip_name
-    __getip.ip_name
-  end
-  def to_eval
-    @ip_name || ''
-  end
-  def self.to_eval
-    __getip.to_eval
-  end
-
-  def slaves(all = false)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._invoke('interp','slaves').split.map!{|name|
-      if @slave_ip_tbl.key?(name)
-        @slave_ip_tbl[name]
-      elsif all
-        name
-      else
-        nil
-      end
-    }.compact!
-  end
-  def self.slaves(all = false)
-    __getip.slaves(all)
-  end
-
-  def manipulable?
-    return true if (Thread.current.group == ThreadGroup::Default)
-    ip = MultiTkIp.__getip
-    (ip == self) || ip._is_master_of?(@interp)
-  end
-  def self.manipulable?
-    true
-  end
-
-  def _is_master_of?(tcltkip_obj)
-    tcltkip_obj.slave_of?(@interp)
-  end
-  protected :_is_master_of?
-end
-
-
-# instance methods to treat tables
-class MultiTkIp
-  def _tk_cmd_tbl
-    tbl = {}
-    MultiTkIp.tk_cmd_tbl.each{|id, ent| tbl[id] = ent if ent.ip == self }
-    tbl
-  end
-
-  def _tk_windows
-    @tk_windows
-  end
-
-  def _tk_table_list
-    @tk_table_list
-  end
-
-  def _add_new_tables
-    (@@TK_TABLE_LIST.size - @tk_table_list.size).times{
-      @tk_table_list << TkUtil.untrust({})
-    }
-  end
-
-  def _init_ip_env(script)
-    self.eval_proc{script.call(self)}
-  end
-
-  def _add_tk_procs(name, args, body)
-    return if slave?
-    @interp._invoke('proc', name, args, body) if args && body
-    @interp._invoke('interp', 'slaves').split.each{|slave|
-      @interp._invoke('interp', 'alias', slave, name, '', name)
-    }
-  end
-
-  def _remove_tk_procs(*names)
-    return if slave?
-    names.each{|name|
-      name = name.to_s
-
-      return if @interp.deleted?
-      @interp._invoke('rename', name, '')
-
-      return if @interp.deleted?
-      @interp._invoke('interp', 'slaves').split.each{|slave|
-        return if @interp.deleted?
-        @interp._invoke('interp', 'alias', slave, name, '') rescue nil
-      }
-    }
-  end
-
-  def _init_ip_internal(init_ip_env, add_tk_procs)
-    #init_ip_env.each{|script| self.eval_proc{script.call(self)}}
-    init_ip_env.each{|script| self._init_ip_env(script)}
-    add_tk_procs.each{|name, args, body|
-      if master?
-        @interp._invoke('proc', name, args, body) if args && body
-      else
-        @set_alias_proc.call(name)
-      end
-    }
-  end
-end
-
-
-# class methods to treat tables
-class MultiTkIp
-  def self.tk_cmd_tbl
-    @@TK_CMD_TBL
-  end
-  def self.tk_windows
-    __getip._tk_windows
-  end
-  def self.tk_object_table(id)
-    __getip._tk_table_list[id]
-  end
-  def self.create_table
-    if __getip.slave?
-      begin
-        raise SecurityError, "slave-IP has no permission creating a new table"
-      rescue SecurityError => e
-        #p e.backtrace
-        # Is called on a Ruby/Tk library?
-        caller_info = e.backtrace[1]
-        if caller_info =~ %r{^#{MultiTkIp::BASE_DIR}/(tk|tkextlib)/[^:]+\.rb:}
-          # Probably, caller is a Ruby/Tk library  -->  allow creating
-        else
-          raise e
-        end
-      end
-    end
-
-    id = @@TK_TABLE_LIST.size
-    obj = Object.new
-    @@TK_TABLE_LIST << obj
-    obj.instance_variable_set(:@id, id)
-    obj.instance_variable_set(:@mutex, Mutex.new)
-    obj.instance_eval{
-      def self.mutex
-        @mutex
-      end
-      def self.method_missing(m, *args)
-        MultiTkIp.tk_object_table(@id).__send__(m, *args)
-      end
-    }
-    obj.freeze
-    @@IP_TABLE.each{|tg, ip| ip._add_new_tables }
-    return obj
-  end
-
-  def self.init_ip_env(script = Proc.new)
-    @@INIT_IP_ENV << script
-    if __getip.slave?
-      begin
-        raise SecurityError, "slave-IP has no permission initializing IP env"
-      rescue SecurityError => e
-        #p e.backtrace
-        # Is called on a Ruby/Tk library?
-        caller_info = e.backtrace[1]
-        if caller_info =~ %r{^#{MultiTkIp::BASE_DIR}/(tk|tkextlib)/[^:]+\.rb:}
-          # Probably, caller is a Ruby/Tk library  -->  allow creating
-        else
-          raise e
-        end
-      end
-    end
-
-    # @@IP_TABLE.each{|tg, ip|
-    #   ip._init_ip_env(script)
-    # }
-    @@DEFAULT_MASTER.__init_ip_env__(@@IP_TABLE, script)
-  end
-
-  def self.add_tk_procs(name, args=nil, body=nil)
-    if name.kind_of?(Array) # => an array of [name, args, body]
-      name.each{|param| self.add_tk_procs(*param)}
-    else
-      name = name.to_s
-      @@ADD_TK_PROCS << [name, args, body]
-      @@IP_TABLE.each{|tg, ip|
-        ip._add_tk_procs(name, args, body)
-      }
-    end
-  end
-
-  def self.remove_tk_procs(*names)
-    names.each{|name|
-      name = name.to_s
-      @@ADD_TK_PROCS.delete_if{|elem|
-        elem.kind_of?(Array) && elem[0].to_s == name
-      }
-    }
-    @@IP_TABLE.each{|tg, ip|
-      ip._remove_tk_procs(*names)
-    }
-  end
-
-  def self.init_ip_internal
-    __getip._init_ip_internal(@@INIT_IP_ENV, @@ADD_TK_PROCS)
-  end
-end
-
-# for callback operation
-class MultiTkIp
-  def self.cb_entry_class
-    @@CB_ENTRY_CLASS
-  end
-  def self.get_cb_entry(cmd)
-    @@CB_ENTRY_CLASS.new(__getip, cmd).freeze
-  end
-
-=begin
-  def cb_eval(cmd, *args)
-    #self.eval_callback{ TkComm._get_eval_string(TkUtil.eval_cmd(cmd, *args)) }
-    #ret = self.eval_callback{ TkComm._get_eval_string(TkUtil.eval_cmd(cmd, *args)) }
-    ret = self.eval_callback(*args){|safe, *params|
-      $SAFE=safe if $SAFE < safe
-      TkComm._get_eval_string(TkUtil.eval_cmd(cmd, *params))
-    }
-    if ret.kind_of?(Exception)
-      raise ret
-    end
-    ret
-  end
-=end
-  def cb_eval(cmd, *args)
-    self.eval_callback(*args,
-                       &_proc_on_safelevel{|*params|
-                         TkComm._get_eval_string(TkUtil.eval_cmd(cmd, *params))
-                       })
-  end
-=begin
-  def cb_eval(cmd, *args)
-    self.eval_callback(*args){|safe, *params|
-      $SAFE=safe if $SAFE < safe
-      # TkUtil.eval_cmd(cmd, *params)
-      TkComm._get_eval_string(TkUtil.eval_cmd(cmd, *params))
-    }
-  end
-=end
-=begin
-  def cb_eval(cmd, *args)
-    @callback_status[0] ||= TkVariable.new
-    @callback_status[1] ||= TkVariable.new
-    st, val = @callback_status
-    th = Thread.new{
-      self.eval_callback(*args){|safe, *params|
-        #p [status, val, safe, *params]
-        $SAFE=safe if $SAFE < safe
-        begin
-          TkComm._get_eval_string(TkUtil.eval_cmd(cmd, *params))
-        rescue TkCallbackContinue
-          st.value = 4
-        rescue TkCallbackBreak
-          st.value = 3
-        rescue TkCallbackReturn
-          st.value = 2
-        rescue Exception => e
-          val.value = e.message
-          st.value = 1
-        else
-          st.value = 0
-        end
-      }
-    }
-    begin
-      st.wait
-      status = st.numeric
-      retval = val.value
-    rescue => e
-      fail e
-    end
-
-    if status == 1
-      fail RuntimeError, retval
-    elsif status == 2
-      fail TkCallbackReturn, "Tk callback returns 'return' status"
-    elsif status == 3
-      fail TkCallbackBreak, "Tk callback returns 'break' status"
-    elsif status == 4
-      fail TkCallbackContinue, "Tk callback returns 'continue' status"
-    else
-      ''
-    end
-  end
-=end
-
-end
-
-# pseudo-toplevel operation support
-class MultiTkIp
-  # instance method
-  def __pseudo_toplevel
-    ip = MultiTkIp.__getip
-    (ip == @@DEFAULT_MASTER || ip == self) &&
-      self.__pseudo_toplevel_evaluable? && @pseudo_toplevel[1]
-  end
-
-  def __pseudo_toplevel=(m)
-    unless (Thread.current.group == ThreadGroup::Default &&
-              MultiTkIp.__getip == @@DEFAULT_MASTER)
-      fail SecurityError, "no permission to manipulate"
-    end
-
-    # if m.kind_of?(Module) && m.respond_to?(:pseudo_toplevel_evaluable?)
-    if m.respond_to?(:pseudo_toplevel_evaluable?)
-      @pseudo_toplevel[0] = true
-      @pseudo_toplevel[1] = m
-    else
-      fail ArgumentError, 'fail to set pseudo-toplevel'
-    end
-    self
-  end
-
-  def __pseudo_toplevel_evaluable?
-    begin
-      @pseudo_toplevel[0] && @pseudo_toplevel[1].pseudo_toplevel_evaluable?
-    rescue Exception
-      false
-    end
-  end
-
-  def __pseudo_toplevel_evaluable=(mode)
-    unless (Thread.current.group == ThreadGroup::Default &&
-              MultiTkIp.__getip == @@DEFAULT_MASTER)
-      fail SecurityError, "no permission to manipulate"
-    end
-
-    @pseudo_toplevel[0] = (mode)? true: false
-  end
-end
-
-
-################################################
-# use pseudo-toplevel feature of MultiTkIp ?
-if (!defined?(Use_PseudoToplevel_Feature_of_MultiTkIp) ||
-      Use_PseudoToplevel_Feature_of_MultiTkIp)
-  module MultiTkIp_PseudoToplevel_Evaluable
-    #def pseudo_toplevel_eval(body = Proc.new)
-    #  Thread.current[:TOPLEVEL] = self
-    #  begin
-    #    body.call
-    #  ensure
-    #    Thread.current[:TOPLEVEL] = nil
-    #  end
-    #end
-
-    def pseudo_toplevel_evaluable?
-      @pseudo_toplevel_evaluable
-    end
-
-    def pseudo_toplevel_evaluable=(mode)
-      @pseudo_toplevel_evaluable = (mode)? true: false
-    end
-
-    def self.extended(mod)
-      mod.__send__(:extend_object, mod)
-      mod.instance_variable_set('@pseudo_toplevel_evaluable', true)
-    end
-  end
-
-  class Object
-    alias __method_missing_alias_for_MultiTkIp__ method_missing
-    private :__method_missing_alias_for_MultiTkIp__
-
-    def method_missing(id, *args)
-      begin
-        has_top = (top = MultiTkIp.__getip.__pseudo_toplevel) &&
-          top.respond_to?(:pseudo_toplevel_evaluable?) &&
-          top.pseudo_toplevel_evaluable? &&
-          top.respond_to?(id)
-      rescue Exception => e
-        has_top = false
-      end
-
-      if has_top
-        top.__send__(id, *args)
-      else
-        __method_missing_alias_for_MultiTkIp__(id, *args)
-      end
-    end
-  end
-else
-  # dummy
-  module MultiTkIp_PseudoToplevel_Evaluable
-    def pseudo_toplevel_evaluable?
-      false
-    end
-  end
-end
-
-
-################################################
-# evaluate a procedure on the proper interpreter
-class MultiTkIp
-  # instance & class method
-  def _proc_on_safelevel(cmd=nil) # require a block for eval
-    if cmd
-      if cmd.kind_of?(Method)
-        _proc_on_safelevel{|*args| cmd.call(*args)}
-      else
-        _proc_on_safelevel(&cmd)
-      end
-    else
-      #Proc.new{|safe, *args| $SAFE=safe if $SAFE < safe; yield(*args)}
-      Proc.new{|safe, *args|
-        # avoid security error on Exception objects
-        untrust_proc = proc{|err|
-          begin
-            err.untrust if err.respond_to?(:untrust)
-          rescue SecurityError
-          end
-          err
-        }
-        $SAFE=safe if $SAFE < safe;
-        begin
-          yield(*args)
-        rescue Exception => e
-          fail untrust_proc.call(e)
-        end
-      }
-    end
-  end
-  def MultiTkIp._proc_on_safelevel(cmd=nil, &blk)
-    MultiTkIp.__getip._proc_on_safelevel(cmd, &blk)
-  end
-
-  def _proc_on_current_safelevel(cmd=nil, &blk) # require a block for eval
-    safe = $SAFE
-    cmd = _proc_on_safelevel(cmd, &blk)
-    Proc.new{|*args| cmd.call(safe, *args)}
-  end
-  def MultiTkIp._proc_on_current_safelevel(cmd=nil, &blk)
-    MultiTkIp.__getip._proc_on_current_safelevel(cmd, &blk)
-  end
-
-  ######################################
-  # instance method
-  def eval_proc_core(req_val, cmd, *args)
-    # check
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    unless cmd.kind_of?(Proc) || cmd.kind_of?(Method)
-      raise RuntimeError, "A Proc/Method object is expected for the 'cmd' argument"
-    end
-
-    # on IP thread
-    if @cmd_receiver == Thread.current ||
-        (!req_val && TclTkLib.mainloop_thread? != false) # callback
-      begin
-        ret = cmd.call(safe_level, *args)
-      rescue SystemExit => e
-        # exit IP
-        warn("Warning: "+ e.inspect + " on " + self.inspect) if $DEBUG
-        begin
-          self._eval_without_enc('exit')
-        rescue Exception => e
-        end
-        self.delete
-        ret = nil
-      rescue Exception => e
-        if $DEBUG
-          warn("Warning: " + e.class.inspect +
-               ((e.message.length > 0)? ' "' + e.message + '"': '') +
-               " on " + self.inspect)
-        end
-=begin
-        begin
-          bt = _toUTF8(e.backtrace.join("\n"))
-          bt.instance_variable_set(:@encoding, 'utf-8')
-        rescue Exception
-          bt = e.backtrace.join("\n")
-        end
-        begin
-          @interp._set_global_var('errorInfo', bt)
-        rescue Exception
-        end
-=end
-        ret = e
-      end
-      return ret
-    end
-
-    # send cmd to the proc-queue
-    unless req_val
-      begin
-        @cmd_queue.enq([nil, cmd, *args])
-      rescue Exception => e
-        # ignore
-        if $DEBUG
-          warn("Warning: " + e.class.inspect +
-               ((e.message.length > 0)? ' "' + e.message + '"': '') +
-               " on " + self.inspect)
-        end
-        return e
-      end
-      return nil
-    end
-
-    # send and get return value by exception
-    begin
-      @cmd_queue.enq([Thread.current, cmd, *args])
-      Thread.stop
-    rescue MultiTkIp_OK => ret
-      # return value
-      return ret.value
-    rescue SystemExit => e
-      # exit IP
-      warn("Warning: " + e.inspect + " on " + self.inspect) if $DEBUG
-      begin
-        self._eval_without_enc('exit')
-      rescue Exception
-      end
-      if !self.deleted? && !safe? && allow_ruby_exit?
-        self.delete
-        fail e
-      else
-        self.delete
-      end
-    rescue Exception => e
-      if $DEBUG
-        warn("Warning: " + e.class.inspect +
-             ((e.message.length > 0)? ' "' + e.message + '"': '') +
-             " on " + self.inspect)
-      end
-      return e
-    end
-    return nil
-  end
-  private :eval_proc_core
-
-if false && WITH_RUBY_VM  ### Ruby 1.9
-  # Not stable, so disable this feature
-  def eval_callback(*args)
-    if block_given?
-      cmd = Proc.new
-    else
-      cmd = args.shift
-    end
-    begin
-      if @@CALLBACK_SUBTHREAD.table[self].index(Thread.current)
-        last_th = nil
-      else
-        last_th = @@CALLBACK_SUBTHREAD.table[self][-1]
-      end
-      @@CALLBACK_SUBTHREAD.new(self){
-        @@CALLBACK_SUBTHREAD.table[self] << Thread.current
-        begin
-          last_th.join if last_th
-          eval_proc_core(false, cmd, *args)
-        rescue Exception=>e
-          e
-        ensure
-          @@CALLBACK_SUBTHREAD.table[self].delete(Thread.current)
-        end
-      }
-    end
-  end
-else  ### Ruby 1.8
-  def eval_callback(*args)
-    if block_given?
-      cmd = Proc.new
-    else
-      cmd = args.shift
-    end
-    begin
-      eval_proc_core(false, cmd, *args)
-    rescue Exception=>e
-      e
-    ensure
-    end
-  end
-end
-
-  def eval_proc(*args, &blk)
-    if block_given?
-      cmd = _proc_on_safelevel(&blk)
-    else
-      unless (cmd = args.shift)
-        fail ArgumentError, "A Proc or Method object is expected for 1st argument"
-      end
-      cmd = _proc_on_safelevel(&cmd)
-    end
-    if TclTkLib.mainloop_thread? == true
-      # call from eventloop
-      current = Thread.current
-      backup_ip = current[:callback_ip]
-      current[:callback_ip] = self
-      begin
-        eval_proc_core(false, cmd, *args)
-      ensure
-        current[:callback_ip] = backup_ip
-      end
-    else
-      eval_proc_core(true,
-                     proc{|safe, *params|
-                       Thread.new{cmd.call(safe, *params)}.value
-                     },
-                     *args)
-    end
-  end
-=begin
-  def eval_proc(*args)
-    # The scope of the eval-block of 'eval_proc' method is different from
-    # the external. If you want to pass local values to the eval-block,
-    # use arguments of eval_proc method. They are passed to block-arguments.
-    if block_given?
-      cmd = Proc.new
-    else
-      unless (cmd = args.shift)
-        fail ArgumentError, "A Proc or Method object is expected for 1st argument"
-      end
-    end
-    if TclTkLib.mainloop_thread? == true
-      # call from eventloop
-      current = Thread.current
-      backup_ip = current[:callback_ip]
-      current[:callback_ip] = self
-      begin
-        eval_proc_core(false,
-	               proc{|safe, *params|
-		         $SAFE=safe if $SAFE < safe
-                         cmd.call(*params)
-                       }, *args)
-      ensure
-        current[:callback_ip] = backup_ip
-      end
-    else
-      eval_proc_core(true,
-                     proc{|safe, *params|
-                       $SAFE=safe if $SAFE < safe
-                       Thread.new(*params, &cmd).value
-                     },
-                     *args)
-    end
-  end
-=end
-  alias call eval_proc
-
-  def bg_eval_proc(*args)
-    if block_given?
-      cmd = Proc.new
-    else
-      unless (cmd = args.shift)
-        fail ArgumentError, "A Proc or Method object is expected for 1st argument"
-      end
-    end
-    Thread.new{
-      eval_proc(cmd, *args)
-=begin
-      eval_proc_core(false,
-                     proc{|safe, *params|
-                       $SAFE=safe if $SAFE < safe
-                       Thread.new(*params, &cmd).value
-                     },
-                     safe_level, *args)
-=end
-    }
-  end
-  alias background_eval_proc bg_eval_proc
-  alias thread_eval_proc bg_eval_proc
-  alias bg_call bg_eval_proc
-  alias background_call bg_eval_proc
-
-  def eval_string(cmd, *eval_args)
-    # cmd string ==> proc
-    unless cmd.kind_of?(String)
-      raise RuntimeError, "A String object is expected for the 'cmd' argument"
-    end
-
-    eval_proc_core(true,
-                   proc{|safe|
-                     Kernel.eval("$SAFE=#{safe} if $SAFE < #{safe};" << cmd,
-                                 *eval_args)
-                   })
-  end
-  alias eval_str eval_string
-
-  def bg_eval_string(cmd, *eval_args)
-    # cmd string ==> proc
-    unless cmd.kind_of?(String)
-      raise RuntimeError, "A String object is expected for the 'cmd' argument"
-    end
-    Thread.new{
-      eval_proc_core(true,
-                     proc{|safe|
-                       Kernel.eval("$SAFE=#{safe} if $SAFE < #{safe};" << cmd,
-                                   *eval_args)
-                     })
-    }
-  end
-  alias background_eval_string bg_eval_string
-  alias bg_eval_str bg_eval_string
-  alias background_eval_str bg_eval_string
-
-  def eval(*args, &blk)
-    if block_given?
-      eval_proc(*args, &blk)
-    elsif args[0]
-      if args[0].respond_to?(:call)
-        eval_proc(*args)
-      else
-        eval_string(*args)
-      end
-    else
-      fail ArgumentError, "no argument to eval"
-    end
-  end
-
-  def bg_eval(*args, &blk)
-    if block_given?
-      bg_eval_proc(*args, &blk)
-    elsif args[0]
-      if args[0].respond_to?(:call)
-        bg_eval_proc(*args)
-      else
-        bg_eval_string(*args)
-      end
-    else
-      fail ArgumentError, "no argument to eval"
-    end
-  end
-  alias background_eval bg_eval
-end
-
-class << MultiTkIp
-  # class method
-  def eval_proc(*args, &blk)
-    # class ==> interp object
-    __getip.eval_proc(*args, &blk)
-  end
-  alias call eval_proc
-
-  def bg_eval_proc(*args, &blk)
-    # class ==> interp object
-    __getip.bg_eval_proc(*args, &blk)
-  end
-  alias background_eval_proc bg_eval_proc
-  alias thread_eval_proc bg_eval_proc
-  alias bg_call bg_eval_proc
-  alias background_call bg_eval_proc
-
-  def eval_string(cmd, *eval_args)
-    # class ==> interp object
-    __getip.eval_string(cmd, *eval_args)
-  end
-  alias eval_str eval_string
-
-  def bg_eval_string(cmd, *eval_args)
-    # class ==> interp object
-    __getip.bg_eval_string(cmd, *eval_args)
-  end
-  alias background_eval_string bg_eval_string
-  alias bg_eval_str bg_eval_string
-  alias background_eval_str bg_eval_string
-
-  def eval(*args, &blk)
-    # class ==> interp object
-    __getip.eval(*args, &blk)
-  end
-  def bg_eval(*args, &blk)
-    # class ==> interp object
-    __getip.bg_eval(*args, &blk)
-  end
-  alias background_eval bg_eval
-end
-
-
-# event loop
-# all master/slave IPs are controlled 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)
-  end
-  def mainloop_watchdog(check_root = true)
-    __getip.mainloop_watchdog(check_root)
-  end
-  def do_one_event(flag = TclTkLib::EventFlag::ALL)
-    __getip.do_one_event(flag)
-  end
-  def mainloop_abort_on_exception
-    # __getip.mainloop_abort_on_exception
-    TclTkLib.mainloop_abort_on_exception
-  end
-  def mainloop_abort_on_exception=(mode)
-    # __getip.mainloop_abort_on_exception=(mode)
-    TclTkLib.mainloop_abort_on_exception=(mode)
-  end
-  def set_eventloop_tick(tick)
-    __getip.set_eventloop_tick(tick)
-  end
-  def get_eventloop_tick
-    __getip.get_eventloop_tick
-  end
-  def set_no_event_wait(tick)
-    __getip.set_no_event_wait(tick)
-  end
-  def get_no_event_wait
-    __getip.get_no_event_wait
-  end
-  def set_eventloop_weight(loop_max, no_event_tick)
-    __getip.set_eventloop_weight(loop_max, no_event_tick)
-  end
-  def get_eventloop_weight
-    __getip.get_eventloop_weight
-  end
-end
-
-# class methods to delegate to TclTkIp
-class << MultiTkIp
-  def method_missing(id, *args)
-    __getip.__send__(id, *args)
-  end
-
-  def make_safe
-    __getip.make_safe
-  end
-
-  def safe?
-    __getip.safe?
-  end
-
-  def safe_base?
-    begin
-      __getip.safe_base?
-    rescue
-      false
-    end
-  end
-
-  def allow_ruby_exit?
-    __getip.allow_ruby_exit?
-  end
-
-  def allow_ruby_exit= (mode)
-    __getip.allow_ruby_exit = mode
-  end
-
-  def delete
-    __getip.delete
-  end
-
-  def deleted?
-    __getip.deleted?
-  end
-
-  def has_mainwindow?
-    __getip.has_mainwindow?
-  end
-
-  def invalid_namespace?
-    __getip.invalid_namespace?
-  end
-
-  def abort(msg = nil)
-    __getip.abort(msg)
-  end
-
-  def exit(st = true)
-    __getip.exit(st)
-  end
-
-  def exit!(st = false)
-    __getip.exit!(st)
-  end
-
-  def restart(app_name = nil, keys = {})
-    init_ip_internal
-
-    __getip._invoke('set', 'argv0', app_name) if app_name
-    if keys.kind_of?(Hash)
-      __getip._invoke('set', 'argv', _keys2opts(keys))
-    end
-
-    __getip.restart
-  end
-
-  def _eval(str)
-    __getip._eval(str)
-  end
-
-  def _invoke(*args)
-    __getip._invoke(*args)
-  end
-
-  def _eval_without_enc(str)
-    __getip._eval_without_enc(str)
-  end
-
-  def _invoke_without_enc(*args)
-    __getip._invoke_without_enc(*args)
-  end
-
-  def _eval_with_enc(str)
-    __getip._eval_with_enc(str)
-  end
-
-  def _invoke_with_enc(*args)
-    __getip._invoke_with_enc(*args)
-  end
-
-  def _toUTF8(str, encoding=nil)
-    __getip._toUTF8(str, encoding)
-  end
-
-  def _fromUTF8(str, encoding=nil)
-    __getip._fromUTF8(str, encoding)
-  end
-
-  def _thread_vwait(var)
-    __getip._thread_vwait(var)
-  end
-
-  def _thread_tkwait(mode, target)
-    __getip._thread_tkwait(mode, target)
-  end
-
-  def _return_value
-    __getip._return_value
-  end
-
-  def _get_variable(var, flag)
-    __getip._get_variable(var, flag)
-  end
-  def _get_variable2(var, idx, flag)
-    __getip._get_variable2(var, idx, flag)
-  end
-  def _set_variable(var, value, flag)
-    __getip._set_variable(var, value, flag)
-  end
-  def _set_variable2(var, idx, value, flag)
-    __getip._set_variable2(var, idx, value, flag)
-  end
-  def _unset_variable(var, flag)
-    __getip._unset_variable(var, flag)
-  end
-  def _unset_variable2(var, idx, flag)
-    __getip._unset_variable2(var, idx, flag)
-  end
-
-  def _get_global_var(var)
-    __getip._get_global_var(var)
-  end
-  def _get_global_var2(var, idx)
-    __getip._get_global_var2(var, idx)
-  end
-  def _set_global_var(var, value)
-    __getip._set_global_var(var, value)
-  end
-  def _set_global_var2(var, idx, value)
-    __getip._set_global_var2(var, idx, value)
-  end
-  def _unset_global_var(var)
-    __getip._unset_global_var(var)
-  end
-  def _unset_global_var2(var, idx)
-    __getip._unset_global_var2(var, idx)
-  end
-
-  def _make_menu_embeddable(menu_path)
-    __getip._make_menu_embeddable(menu_path)
-  end
-
-  def _split_tklist(str)
-    __getip._split_tklist(str)
-  end
-  def _merge_tklist(*args)
-    __getip._merge_tklist(*args)
-  end
-  def _conv_listelement(arg)
-    __getip._conv_listelement(arg)
-  end
-
-  def _create_console
-    __getip._create_console
-  end
-end
-
-
-# wrap methods on TclTkLib : not permit calling TclTkLib module methods
-class << TclTkLib
-  def mainloop(check_root = true)
-    MultiTkIp.mainloop(check_root)
-  end
-  def mainloop_watchdog(check_root = true)
-    MultiTkIp.mainloop_watchdog(check_root)
-  end
-  def do_one_event(flag = TclTkLib::EventFlag::ALL)
-    MultiTkIp.do_one_event(flag)
-  end
-  #def mainloop_abort_on_exception
-  #  MultiTkIp.mainloop_abort_on_exception
-  #end
-  #def mainloop_abort_on_exception=(mode)
-  #  MultiTkIp.mainloop_abort_on_exception=(mode)
-  #end
-  def set_eventloop_tick(tick)
-    MultiTkIp.set_eventloop_tick(tick)
-  end
-  def get_eventloop_tick
-    MultiTkIp.get_eventloop_tick
-  end
-  def set_no_event_wait(tick)
-    MultiTkIp.set_no_event_wait(tick)
-  end
-  def get_no_event_wait
-    MultiTkIp.get_no_event_wait
-  end
-  def set_eventloop_weight(loop_max, no_event_tick)
-    MultiTkIp.set_eventloop_weight(loop_max, no_event_tick)
-  end
-  def get_eventloop_weight
-    MultiTkIp.get_eventloop_weight
-  end
-  def restart(*args)
-    MultiTkIp.restart(*args)
-  end
-
-  def _merge_tklist(*args)
-    MultiTkIp._merge_tklist(*args)
-  end
-  def _conv_listelement(arg)
-    MultiTkIp._conv_listelement(arg)
-  end
-end
-
-
-# depend on TclTkIp
-class MultiTkIp
-#  def mainloop(check_root = true, restart_on_dead = true)
-  def mainloop(check_root = true, restart_on_dead = false)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-
-    if WITH_RUBY_VM  ### Ruby 1.9 !!!!!!!!!!!
-      return @interp_thread.value if @interp_thread
-    end
-
-    #return self if self.slave?
-    #return self if self != @@DEFAULT_MASTER
-    if self != @@DEFAULT_MASTER
-      if @wait_on_mainloop[0]
-        begin
-          @wait_on_mainloop[1] += 1
-          @cmd_queue.enq([@system, 'call_mainloop',
-                          Thread.current, check_root])
-          Thread.stop
-        rescue MultiTkIp_OK => ret
-          # return value
-          if ret.value.kind_of?(Thread)
-            return ret.value.value
-          else
-            return ret.value
-          end
-        rescue SystemExit => e
-          # exit IP
-          warn("Warning: " + e.inspect + " on " + self.inspect) if $DEBUG
-          begin
-            self._eval_without_enc('exit')
-          rescue Exception
-          end
-          self.delete
-        rescue StandardError => e
-          if $DEBUG
-            warn("Warning: " + e.class.inspect +
-                 ((e.message.length > 0)? ' "' + e.message + '"': '') +
-                 " on " + self.inspect)
-          end
-          return e
-        rescue Exception => e
-	  return e
-        ensure
-          @wait_on_mainloop[1] -= 1
-        end
-      end
-      return
-    end
-
-    unless restart_on_dead
-      @wait_on_mainloop[1] += 1
-=begin
-      begin
-        @interp.mainloop(check_root)
-      rescue StandardError => e
-        if $DEBUG
-          warn("Warning: " + e.class.inspect +
-               ((e.message.length > 0)? ' "' + e.message + '"': '') +
-               " on " + self.inspect)
-        end
-      end
-=end
-      begin
-	@interp.mainloop(check_root)
-      ensure
-	@wait_on_mainloop[1] -= 1
-      end
-    else
-      loop do
-        break unless self.alive?
-        if check_root
-          begin
-            break if TclTkLib.num_of_mainwindows == 0
-          rescue StandardError
-            break
-          end
-        end
-        break if @interp.deleted?
-        begin
-	  @wait_on_mainloop[1] += 1
-          @interp.mainloop(check_root)
-        rescue StandardError => e
-          if TclTkLib.mainloop_abort_on_exception != nil
-            #STDERR.print("Warning: Tk mainloop receives ", $!.class.inspect,
-            #             " exception (ignore) : ", $!.message, "\n");
-            if $DEBUG
-              warn("Warning: Tk mainloop receives " << e.class.inspect <<
-                   " exception (ignore) : " << e.message);
-            end
-          end
-          #raise e
-        rescue Exception => e
-=begin
-          if TclTkLib.mainloop_abort_on_exception != nil
-            #STDERR.print("Warning: Tk mainloop receives ", $!.class.inspect,
-            #             " exception (ignore) : ", $!.message, "\n");
-            if $DEBUG
-              warn("Warning: Tk mainloop receives " << e.class.inspect <<
-                   " exception (ignore) : " << e.message);
-            end
-          end
-=end
-          raise e
-        ensure
-          @wait_on_mainloop[1] -= 1
-          Thread.pass  # avoid eventloop conflict
-        end
-      end
-    end
-    self
-  end
-
-  def make_safe
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp.make_safe
-  end
-
-  def safe?
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp.safe?
-  end
-
-  def safe_base?
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @safe_base
-  end
-
-  def allow_ruby_exit?
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp.allow_ruby_exit?
-  end
-
-  def allow_ruby_exit= (mode)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp.allow_ruby_exit = mode
-  end
-
-  def delete
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @slave_ip_tbl.each{|name, subip|
-      _destroy_slaves_of_slaveIP(subip)
-=begin
-      begin
-        subip._invoke('destroy', '.') unless subip.deleted?
-      rescue Exception
-      end
-=end
-      begin
-        # subip._eval_without_enc("foreach i [after info] {after cancel $i}")
-	unless subip.deleted?
-	  after_ids = subip._eval_without_enc("after info")
-	  subip._eval_without_enc("foreach i {#{after_ids}} {after cancel $i}")
-	end
-      rescue Exception
-      end
-
-      # safe_base?
-      if @interp._eval_without_enc("catch {::safe::interpConfigure #{name}}") == '0'
-        begin
-          @interp._eval_without_enc("::safe::interpDelete #{name}")
-        rescue Exception
-        else
-          next if subip.deleted?
-        end
-      end
-      if subip.respond_to?(:safe_base?) && subip.safe_base? &&
-          !subip.deleted?
-        # do 'exit' to call the delete_hook procedure
-        begin
-          subip._eval_without_enc('exit')
-        rescue Exception
-        end
-      else
-        begin
-          subip.delete unless subip.deleted?
-        rescue Exception
-        end
-      end
-    }
-
-    begin
-      # @interp._eval_without_enc("foreach i [after info] {after cancel $i}")
-      after_ids = @interp._eval_without_enc("after info")
-      @interp._eval_without_enc("foreach i {#{after_ids}} {after cancel $i}")
-    rescue Exception
-    end
-
-    begin
-      @interp._invoke('destroy', '.') unless @interp.deleted?
-    rescue Exception
-    end
-
-    if @safe_base && !@interp.deleted?
-      # do 'exit' to call the delete_hook procedure
-      @interp._eval_without_enc('exit')
-    end
-    @interp.delete
-    self
-  end
-
-  def deleted?
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp.deleted?
-  end
-
-  def has_mainwindow?
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp.has_mainwindow?
-  end
-
-  def invalid_namespace?
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp.invalid_namespace?
-  end
-
-  def abort(msg = nil)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    if master? && !safe? && allow_ruby_exit?
-      if msg
-        Kernel.abort(msg)
-      else
-        Kernel.abort
-      end
-    else
-      # ignore msg
-      delete
-      1
-    end
-  end
-
-  def exit(st = true)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    if master? && !safe? && allow_ruby_exit?
-      Kernel.exit(st)
-    else
-      delete
-      st
-    end
-  end
-
-  def exit!(st = false)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    if master? && !safe? && allow_ruby_exit?
-      Kernel.exit!(st)
-    else
-      delete
-      st
-    end
-  end
-
-  def restart(app_name = nil, keys = {})
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-
-    _init_ip_internal(@@INIT_IP_ENV, @@ADD_TK_PROCS)
-
-    @interp._invoke('set', 'argv0', app_name) if app_name
-    if keys.kind_of?(Hash)
-      @interp._invoke('set', 'argv', _keys2opts(keys))
-    end
-
-    @interp.restart
-  end
-
-  def __eval(str)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp.__eval(str)
-  end
-
-  def __invoke(*args)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp.__invoke(*args)
-  end
-
-  def _eval(str)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._eval(str)
-  end
-
-  def _invoke(*args)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._invoke(*args)
-  end
-
-  def _eval_without_enc(str)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._eval_without_enc(str)
-  end
-
-  def _invoke_without_enc(*args)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._invoke_without_enc(*args)
-  end
-
-  def _eval_with_enc(str)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._eval_with_enc(str)
-  end
-
-  def _invoke_with_enc(*args)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._invoke_with_enc(*args)
-  end
-
-  def _toUTF8(str, encoding=nil)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._toUTF8(str, encoding)
-  end
-
-  def _fromUTF8(str, encoding=nil)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._fromUTF8(str, encoding)
-  end
-
-  def _thread_vwait(var)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._thread_vwait(var)
-  end
-
-  def _thread_tkwait(mode, target)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._thread_tkwait(mode, target)
-  end
-
-  def _return_value
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._return_value
-  end
-
-  def _get_variable(var, flag)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._get_variable(var, flag)
-  end
-  def _get_variable2(var, idx, flag)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._get_variable2(var, idx, flag)
-  end
-  def _set_variable(var, value, flag)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._set_variable(var, value, flag)
-  end
-  def _set_variable2(var, idx, value, flag)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._set_variable2(var, idx, value, flag)
-  end
-  def _unset_variable(var, flag)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._unset_variable(var, flag)
-  end
-  def _unset_variable2(var, idx, flag)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._unset_variable2(var, idx, flag)
-  end
-
-  def _get_global_var(var)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._get_global_var(var)
-  end
-  def _get_global_var2(var, idx)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._get_global_var2(var, idx)
-  end
-  def _set_global_var(var, value)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._set_global_var(var, value)
-  end
-  def _set_global_var2(var, idx, value)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._set_global_var2(var, idx, value)
-  end
-  def _unset_global_var(var)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._unset_global_var(var)
-  end
-  def _unset_global_var2(var, idx)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._unset_global_var2(var, idx)
-  end
-
-  def _make_menu_embeddable(menu_path)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._make_menu_embeddable(menu_path)
-  end
-
-  def _split_tklist(str)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._split_tklist(str)
-  end
-  def _merge_tklist(*args)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._merge_tklist(*args)
-  end
-  def _conv_listelement(arg)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._conv_listelement(arg)
-  end
-end
-
-
-# interp command support
-class MultiTkIp
-  def _lst2ary(str)
-    return [] if str == ""
-    idx = str.index('{')
-    while idx and idx > 0 and str[idx-1] == ?\\
-      idx = str.index('{', idx+1)
-    end
-    return str.split unless idx
-
-    list = str[0,idx].split
-    str = str[idx+1..-1]
-    i = -1
-    brace = 1
-    str.each_byte {|c|
-      c = c.chr
-      i += 1
-      brace += 1 if c == '{'
-      brace -= 1 if c == '}'
-      break if brace == 0
-    }
-    if i == 0
-      list.push ''
-    elsif str[0, i] == ' '
-      list.push ' '
-    else
-      list.push str[0..i-1]
-    end
-    #list += _lst2ary(str[i+1..-1])
-    list.concat(_lst2ary(str[i+1..-1]))
-    list
-  end
-  private :_lst2ary
-
-  def _slavearg(slave)
-    if slave.kind_of?(MultiTkIp)
-      slave.path
-    elsif slave.kind_of?(String)
-      slave
-    else
-      slave.to_s
-    end
-  end
-  private :_slavearg
-
-  def alias_info(slave, cmd_name)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    _lst2ary(@interp._invoke('interp', 'alias', _slavearg(slave), cmd_name))
-  end
-  def self.alias_info(slave, cmd_name)
-    __getip.alias_info(slave, cmd_name)
-  end
-
-  def alias_delete(slave, cmd_name)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._invoke('interp', 'alias', _slavearg(slave), cmd_name, '')
-    self
-  end
-  def self.alias_delete(slave, cmd_name)
-    __getip.alias_delete(slave, cmd_name)
-    self
-  end
-
-  def def_alias(slave, new_cmd, org_cmd, *args)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    ret = @interp._invoke('interp', 'alias', _slavearg(slave), new_cmd,
-                          '', org_cmd, *args)
-    (ret == new_cmd)? self: nil
-  end
-  def self.def_alias(slave, new_cmd, org_cmd, *args)
-    ret = __getip.def_alias(slave, new_cmd, org_cmd, *args)
-    (ret == new_cmd)? self: nil
-  end
-
-  def aliases(slave = '')
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    _lst2ary(@interp._invoke('interp', 'aliases', _slavearg(slave)))
-  end
-  def self.aliases(slave = '')
-    __getip.aliases(slave)
-  end
-
-  def delete_slaves(*args)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    slaves = args.collect{|s| _slavearg(s)}
-    @interp._invoke('interp', 'delete', *slaves) if slaves.size > 0
-    self
-  end
-  def self.delete_slaves(*args)
-    __getip.delete_slaves(*args)
-    self
-  end
-
-  def exist?(slave = '')
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    ret = @interp._invoke('interp', 'exists', _slavearg(slave))
-    (ret == '1')? true: false
-  end
-  def self.exist?(slave = '')
-    __getip.exist?(slave)
-  end
-
-  def delete_cmd(slave, cmd)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    slave_invoke = @interp._invoke('list', 'rename', cmd, '')
-    @interp._invoke('interp', 'eval', _slavearg(slave), slave_invoke)
-    self
-  end
-  def self.delete_cmd(slave, cmd)
-    __getip.delete_cmd(slave, cmd)
-    self
-  end
-
-  def expose_cmd(slave, cmd, aliasname = nil)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    if aliasname
-      @interp._invoke('interp', 'expose', _slavearg(slave), cmd, aliasname)
-    else
-      @interp._invoke('interp', 'expose', _slavearg(slave), cmd)
-    end
-    self
-  end
-  def self.expose_cmd(slave, cmd, aliasname = nil)
-    __getip.expose_cmd(slave, cmd, aliasname)
-    self
-  end
-
-  def hide_cmd(slave, cmd, aliasname = nil)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    if aliasname
-      @interp._invoke('interp', 'hide', _slavearg(slave), cmd, aliasname)
-    else
-      @interp._invoke('interp', 'hide', _slavearg(slave), cmd)
-    end
-    self
-  end
-  def self.hide_cmd(slave, cmd, aliasname = nil)
-    __getip.hide_cmd(slave, cmd, aliasname)
-    self
-  end
-
-  def hidden_cmds(slave = '')
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    _lst2ary(@interp._invoke('interp', 'hidden', _slavearg(slave)))
-  end
-  def self.hidden_cmds(slave = '')
-    __getip.hidden_cmds(slave)
-  end
-
-  def invoke_hidden(slave, cmd, *args)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    if args[-1].kind_of?(Hash)
-      keys = _symbolkey2str(args.pop)
-    else
-      keys = []
-    end
-    keys << _slavearg(slave)
-    if Tk::TCL_MAJOR_VERSION > 8 ||
-        (Tk::TCL_MAJOR_VERSION == 8 && Tk::TCL_MINOR_VERSION >= 5)
-      keys << '--'
-    end
-    keys << cmd
-    keys.concat(args)
-    @interp._invoke('interp', 'invokehidden', *keys)
-  end
-  def self.invoke_hidden(slave, cmd, *args)
-    __getip.invoke_hidden(slave, cmd, *args)
-  end
-
-  def invoke_hidden_on_global(slave, cmd, *args)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    if args[-1].kind_of?(Hash)
-      keys = _symbolkey2str(args.pop)
-    else
-      keys = []
-    end
-    keys << _slavearg(slave)
-    keys << '-global'
-    if Tk::TCL_MAJOR_VERSION > 8 ||
-        (Tk::TCL_MAJOR_VERSION == 8 && Tk::TCL_MINOR_VERSION >= 5)
-      keys << '--'
-    end
-    keys << cmd
-    keys.concat(args)
-    @interp._invoke('interp', 'invokehidden', *keys)
-  end
-  def self.invoke_hidden_on_global(slave, cmd, *args)
-    __getip.invoke_hidden_on_global(slave, cmd, *args)
-  end
-
-  def invoke_hidden_on_namespace(slave, ns, cmd, *args)
-    # for Tcl8.5 or later
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    if args[-1].kind_of?(Hash)
-      keys = _symbolkey2str(args.pop)
-    else
-      keys = []
-    end
-    keys << _slavearg(slave)
-    keys << '-namespace' << TkComm._get_eval_string(ns)
-    keys << '--' << cmd
-    keys.concat(args)
-    @interp._invoke('interp', 'invokehidden', *keys)
-  end
-  def self.invoke_hidden_on_namespace(slave, ns, cmd, *args)
-    __getip.invoke_hidden_on_namespace(slave, ns, cmd, *args)
-  end
-
-  def mark_trusted(slave = '')
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._invoke('interp', 'marktrusted', _slavearg(slave))
-    self
-  end
-  def self.mark_trusted(slave = '')
-    __getip.mark_trusted(slave)
-    self
-  end
-
-  def set_bgerror_handler(cmd = Proc.new, slave = nil, &b)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-
-    unless TkComm._callback_entry?(cmd)
-      if !slave && b
-        slave = cmd
-        cmd = Proc.new(&b)
-      end
-    end
-    slave = '' unless slave
-
-    @interp._invoke('interp', 'bgerror', _slavearg(slave), cmd)
-  end
-  def self.bgerror(cmd = Proc.new, slave = nil, &b)
-    __getip.bgerror(cmd, slave, &b)
-  end
-
-  def get_bgerror_handler(slave = '')
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    procedure(@interp._invoke('interp', 'bgerror', _slavearg(slave)))
-  end
-  def self.bgerror(slave = '')
-    __getip.bgerror(slave)
-  end
-
-  def set_limit(limit_type, slave = '', opts = {})
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._invoke('interp', 'limit', _slavearg(slave), limit_type, opts)
-  end
-  def self.set_limit(limit_type, slave = '', opts = {})
-    __getip.set_limit(limit_type, slave, opts)
-  end
-
-  def get_limit(limit_type, slave = '', slot = nil)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-
-    if slot
-      num_or_str(@interp._invoke('interp', 'limit', _slavearg(slave),
-                                 limit_type, slot))
-    else
-      l = @interp._split_tklist(@interp._invoke_without_enc('interp', 'limit',
-                                                            _slavearg(slave),
-                                                            limit_type))
-      l.map!{|s| _fromUTF8(s)}
-      r = {}
-      until l.empty?
-        key = l.shift[1..-1]
-        val = l.shift
-        val = num_or_str(val) if val
-        r[key] = val
-      end
-      r
-    end
-  end
-  def self.get_limit(limit_type, slave = '', slot = nil)
-    __getip.get_limit(limit_type, slave, slot)
-  end
-
-  def recursion_limit(slave = '', limit = None)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    number(@interp._invoke('interp', 'recursionlimit',
-                           _slavearg(slave), limit))
-  end
-  def self.recursion_limit(slave = '', limit = None)
-    __getip.recursion_limit(slave)
-  end
-
-  def alias_target(aliascmd, slave = '')
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._invoke('interp', 'target', _slavearg(slave), aliascmd)
-  end
-  def self.alias_target(aliascmd, slave = '')
-    __getip.alias_target(aliascmd, slave)
-  end
-
-  def share_stdin(dist, src = '')
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._invoke('interp', 'share', src, 'stdin', dist)
-    self
-  end
-  def self.share_stdin(dist, src = '')
-    __getip.share_stdin(dist, src)
-    self
-  end
-
-  def share_stdout(dist, src = '')
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._invoke('interp', 'share', src, 'stdout', dist)
-    self
-  end
-  def self.share_stdout(dist, src = '')
-    __getip.share_stdout(dist, src)
-    self
-  end
-
-  def share_stderr(dist, src = '')
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._invoke('interp', 'share', src, 'stderr', dist)
-    self
-  end
-  def self.share_stderr(dist, src = '')
-    __getip.share_stderr(dist, src)
-    self
-  end
-
-  def transfer_stdin(dist, src = '')
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._invoke('interp', 'transfer', src, 'stdin', dist)
-    self
-  end
-  def self.transfer_stdin(dist, src = '')
-    __getip.transfer_stdin(dist, src)
-    self
-  end
-
-  def transfer_stdout(dist, src = '')
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._invoke('interp', 'transfer', src, 'stdout', dist)
-    self
-  end
-  def self.transfer_stdout(dist, src = '')
-    __getip.transfer_stdout(dist, src)
-    self
-  end
-
-  def transfer_stderr(dist, src = '')
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._invoke('interp', 'transfer', src, 'stderr', dist)
-    self
-  end
-  def self.transfer_stderr(dist, src = '')
-    __getip.transfer_stderr(dist, src)
-    self
-  end
-
-  def share_stdio(dist, src = '')
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._invoke('interp', 'share', src, 'stdin',  dist)
-    @interp._invoke('interp', 'share', src, 'stdout', dist)
-    @interp._invoke('interp', 'share', src, 'stderr', dist)
-    self
-  end
-  def self.share_stdio(dist, src = '')
-    __getip.share_stdio(dist, src)
-    self
-  end
-
-  def transfer_stdio(dist, src = '')
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._invoke('interp', 'transfer', src, 'stdin',  dist)
-    @interp._invoke('interp', 'transfer', src, 'stdout', dist)
-    @interp._invoke('interp', 'transfer', src, 'stderr', dist)
-    self
-  end
-  def self.transfer_stdio(dist, src = '')
-    __getip.transfer_stdio(dist, src)
-    self
-  end
-end
-
-
-# Safe Base :: manipulating safe interpreter
-class MultiTkIp
-  def safeip_configure(slot, value=None)
-    # use for '-noStatics' option ==> {statics=>false}
-    #     for '-nestedLoadOk' option ==> {nested=>true}
-    if slot.kind_of?(Hash)
-      ip = MultiTkIp.__getip
-      ip._eval('::safe::interpConfigure ' + @ip_name + ' ' + _keys2opts(slot))
-    else
-      ip._eval('::safe::interpConfigure ' + @ip_name + ' ' +
-               "-#{slot} #{_get_eval_string(value)}")
-    end
-    self
-  end
-
-  def safeip_configinfo(slot = nil)
-    ip = MultiTkIp.__getip
-    ret = {}
-    if slot
-      conf = _lst2ary(ip._eval("::safe::interpConfigure " +
-                               @ip_name + " -#{slot}"))
-      if conf[0] == '-deleteHook'
-=begin
-        if conf[1] =~ /^rb_out\S* (c(_\d+_)?\d+)/
-          ret[conf[0][1..-1]] = MultiTkIp._tk_cmd_tbl[$1]
-=end
-        if conf[1] =~ /rb_out\S*(?:\s+(::\S*|[{](::.*)[}]|["](::.*)["]))? (c(_\d+_)?(\d+))/
-          ret[conf[0][1..-1]] = MultiTkIp._tk_cmd_tbl[$4]
-        else
-          ret[conf[0][1..-1]] = conf[1]
-        end
-      else
-        ret[conf[0][1..-1]] = conf[1]
-      end
-    else
-      Hash[*_lst2ary(ip._eval("::safe::interpConfigure " +
-                              @ip_name))].each{|k, v|
-        if k == '-deleteHook'
-=begin
-          if v =~ /^rb_out\S* (c(_\d+_)?\d+)/
-            ret[k[1..-1]] = MultiTkIp._tk_cmd_tbl[$1]
-=end
-          if v =~ /rb_out\S*(?:\s+(::\S*|[{](::.*)[}]|["](::.*)["]))? (c(_\d+_)?(\d+))/
-            ret[k[1..-1]] = MultiTkIp._tk_cmd_tbl[$4]
-          else
-            ret[k[1..-1]] = v
-          end
-        else
-          ret[k[1..-1]] = v
-        end
-      }
-    end
-    ret
-  end
-
-  def safeip_delete
-    ip = MultiTkIp.__getip
-    ip._eval("::safe::interpDelete " + @ip_name)
-  end
-
-  def safeip_add_to_access_path(dir)
-    ip = MultiTkIp.__getip
-    ip._eval("::safe::interpAddToAccessPath #{@ip_name} #{dir}")
-  end
-
-  def safeip_find_in_access_path(dir)
-    ip = MultiTkIp.__getip
-    ip._eval("::safe::interpFindInAccessPath #{@ip_name} #{dir}")
-  end
-
-  def safeip_set_log_cmd(cmd = Proc.new)
-    ip = MultiTkIp.__getip
-    ip._eval("::safe::setLogCmd #{@ip_name} #{_get_eval_string(cmd)}")
-  end
-end
-
-
-# encoding convert
-class << MultiTkIp
-  def encoding_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
-    @interp.encoding_table
-  end
-
-  def force_default_encoding=(mode)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp.force_default_encoding = mode
-  end
-  def force_default_encoding?
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp.force_default_encoding?
-  end
-
-  def default_encoding=(enc)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp.default_encoding = enc
-  end
-
-  def encoding=(enc)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp.encoding = enc
-  end
-  def encoding_name
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp.encoding_name
-  end
-  def encoding_obj
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp.encoding_obj
-  end
-  alias encoding encoding_name
-  alias default_encoding encoding_name
-
-  def encoding_convertfrom(str, enc=None)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp.encoding_convertfrom(str, enc)
-  end
-  alias encoding_convert_from encoding_convertfrom
-
-  def encoding_convertto(str, enc=None)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp.encoding_convertto(str, enc)
-  end
-  alias encoding_convert_to encoding_convertto
-end
-
-
-# remove methods for security
-=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
-end
-
-class MultiTkIp
-  # undef_method :instance_eval
-  undef_method :instance_variable_get
-  undef_method :instance_variable_set
-end
-# end of MultiTkIp definition
-
-# defend against modification
-#MultiTkIp.freeze
-#TclTkLib.freeze
-
-########################################
-#  start Tk which depends on MultiTkIp
-module TkCore
-  INTERP = MultiTkIp
-end
-require 'tk'
diff --git a/ext/tk/lib/remote-tk.rb b/ext/tk/lib/remote-tk.rb
deleted file mode 100644
index 4d33637c30..0000000000
--- a/ext/tk/lib/remote-tk.rb
+++ /dev/null
@@ -1,527 +0,0 @@
-# frozen_string_literal: false
-#
-#               remote-tk.rb - supports to control remote Tk interpreters
-#                       by Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
-if defined? MultiTkIp
-  fail RuntimeError, "'remote-tk' library must be required before requiring 'multi-tk'"
-end
-
-require 'tkutil'
-
-class MultiTkIp; end
-class RemoteTkIp < MultiTkIp; end
-
-class MultiTkIp
-  @@IP_TABLE = TkUtil.untrust({}) unless defined?(@@IP_TABLE)
-  @@TK_TABLE_LIST = TkUtil.untrust([]) unless defined?(@@TK_TABLE_LIST)
-  def self._IP_TABLE; @@IP_TABLE; end
-  def self._TK_TABLE_LIST; @@TK_TABLE_LIST; end
-
-  @flag = true
-  def self._DEFAULT_MASTER
-    # work only once
-    if @flag
-      @flag = nil
-      @@DEFAULT_MASTER
-    else
-      nil
-    end
-  end
-end
-class RemoteTkIp
-  @@IP_TABLE = MultiTkIp._IP_TABLE unless defined?(@@IP_TABLE)
-  @@TK_TABLE_LIST = MultiTkIp._TK_TABLE_LIST unless defined?(@@TK_TABLE_LIST)
-end
-class << MultiTkIp
-  undef _IP_TABLE
-  undef _TK_TABLE_LIST
-end
-
-require 'multi-tk'
-
-class RemoteTkIp
-  if defined?(@@DEFAULT_MASTER)
-    MultiTkIp._DEFAULT_MASTER
-  else
-    @@DEFAULT_MASTER = MultiTkIp._DEFAULT_MASTER
-  end
-end
-
-
-###############################
-
-class << RemoteTkIp
-  undef new_master, new_slave, new_safe_slave
-  undef new_trusted_slave, new_safeTk
-
-  def new(*args, &b)
-    ip = __new(*args)
-    ip.eval_proc(&b) if b
-    ip
-  end
-end
-
-class RemoteTkIp
-  def initialize(remote_ip, displayof=nil, timeout=5)
-    @interp = MultiTkIp.__getip
-    if @interp.safe?
-      fail SecurityError, "safe-IP cannot create RemoteTkIp"
-    end
-
-
-    @interp.allow_ruby_exit = false
-    @appname = @interp._invoke('tk', 'appname')
-    @remote = remote_ip.to_s.dup.freeze
-    if displayof.kind_of?(TkWindow)
-      @displayof = displayof.path.dup.freeze
-    else
-      @displayof = nil
-    end
-    if self.deleted?
-      fail RuntimeError, "no Tk application named \"#{@remote}\""
-    end
-
-    @tk_windows = {}
-    @tk_table_list = []
-    @slave_ip_tbl = {}
-    @slave_ip_top = {}
-
-    @force_default_encoding ||= TkUtil.untrust([false])
-    @encoding ||= TkUtil.untrust([nil])
-    def @encoding.to_s; self.join(nil); end
-
-    TkUtil.untrust(@tk_windows)    unless @tk_windows.tainted?
-    TkUtil.untrust(@tk_table_list) unless @tk_table_list.tainted?
-    TkUtil.untrust(@slave_ip_tbl)  unless @slave_ip_tbl.tainted?
-    TkUtil.untrust(@slave_ip_top)  unless @slave_ip_top.tainted?
-
-    @system = Object.new
-
-    @threadgroup  = ThreadGroup.new
-
-    @safe_level = [$SAFE]
-
-    @wait_on_mainloop = [true, 0]
-
-    @cmd_queue = Queue.new
-
-=begin
-    @cmd_receiver, @receiver_watchdog = _create_receiver_and_watchdog()
-
-    @threadgroup.add @cmd_receiver
-    @threadgroup.add @receiver_watchdog
-
-    @threadgroup.enclose
-=end
-    @@DEFAULT_MASTER.assign_receiver_and_watchdog(self)
-
-    @@IP_TABLE[@threadgroup] = self
-    @@TK_TABLE_LIST.size.times{
-      (tbl = {}).tainted? || TkUtil.untrust(tbl)
-      @tk_table_list << tbl
-    }
-
-    @ret_val = TkVariable.new
-    if timeout > 0 && ! _available_check(timeout)
-      fail RuntimeError, "cannot create connection"
-    end
-    @ip_id = _create_connection
-
-    class << self
-      undef :instance_eval
-    end
-
-    self.freeze  # defend against modification
-  end
-
-  def manipulable?
-    return true if (Thread.current.group == ThreadGroup::Default)
-    MultiTkIp.__getip == @interp && ! @interp.safe?
-  end
-  def self.manipulable?
-    true
-  end
-
-  def _is_master_of?(tcltkip_obj)
-    tcltkip_obj == @interp
-  end
-  protected :_is_master_of?
-
-  def _ip_id_
-    @ip_id
-  end
-
-  def _available_check(timeout = 5)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-
-    return nil if timeout < 1
-    @ret_val.value = ''
-    @interp._invoke('send', '-async', @remote,
-                    'send', '-async', Tk.appname,
-                    "set #{@ret_val.id} ready")
-    Tk.update
-    if @ret_val != 'ready'
-      (1..(timeout*5)).each{
-        sleep 0.2
-        Tk.update
-        break if @ret_val == 'ready'
-      }
-    end
-    @ret_val.value == 'ready'
-  end
-  private :_available_check
-
-  def _create_connection
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-
-    ip_id = '_' + @interp._invoke('send', @remote, <<-'EOS') + '_'
-      if {[catch {set _rubytk_control_ip_id_} ret] != 0} {
-        set _rubytk_control_ip_id_ 0
-      } else {
-        set _rubytk_control_ip_id_ [expr $ret + 1]
-      }
-      return $_rubytk_control_ip_id_
-    EOS
-
-    @interp._invoke('send', @remote, <<-EOS)
-      proc rb_out#{ip_id} args {
-        send #{@appname} rb_out \$args
-      }
-    EOS
-
-    ip_id
-  end
-  private :_create_connection
-
-  def _appsend(enc_mode, async, *cmds)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-
-    p ['_appsend', [@remote, @displayof], enc_mode, async, cmds] if $DEBUG
-    if $SAFE >= 1 && cmds.find{|obj| obj.tainted?}
-      fail SecurityError, "cannot send tainted commands at level #{$SAFE}"
-    end
-
-    cmds = @interp._merge_tklist(*TkUtil::_conv_args([], enc_mode, *cmds))
-    if @displayof
-      if async
-        @interp.__invoke('send', '-async', '-displayof', @displayof,
-                         '--', @remote, *cmds)
-      else
-        @interp.__invoke('send', '-displayof', @displayof,
-                         '--', @remote, *cmds)
-      end
-    else
-      if async
-        @interp.__invoke('send', '-async', '--', @remote, *cmds)
-      else
-        @interp.__invoke('send', '--', @remote, *cmds)
-      end
-    end
-  end
-  private :_appsend
-
-  def ready?(timeout=5)
-    if timeout < 0
-      fail ArgumentError, "timeout must be positive number"
-    end
-    _available_check(timeout)
-  end
-
-  def is_rubytk?
-    return false if _appsend(false, false, 'info', 'command', 'ruby') == ""
-    [ _appsend(false, false, 'ruby', 'RUBY_VERSION'),
-      _appsend(false, false, 'set', 'tk_patchLevel') ]
-  end
-
-  def appsend(async, *args)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-
-    if async != true && async != false && async != nil
-      args.unshift(async)
-      async = false
-    end
-    if @displayof
-      Tk.appsend_displayof(@remote, @displayof, async, *args)
-    else
-      Tk.appsend(@remote, async, *args)
-    end
-  end
-
-  def rb_appsend(async, *args)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-
-    if async != true && async != false && async != nil
-      args.unshift(async)
-      async = false
-    end
-    if @displayof
-      Tk.rb_appsend_displayof(@remote, @displayof, async, *args)
-    else
-      Tk.rb_appsend(@remote, async, *args)
-    end
-  end
-
-  def create_slave(name, safe=false)
-    if safe
-      safe_opt = ''
-    else
-      safe_opt = '-safe'
-    end
-    _appsend(false, false, "interp create #{safe_opt} -- #{name}")
-  end
-
-  def make_safe
-    fail RuntimeError, 'cannot change safe mode of the remote interpreter'
-  end
-
-  def safe?
-    _appsend(false, false, 'interp issafe')
-  end
-
-  def safe_base?
-    false
-  end
-
-  def allow_ruby_exit?
-    false
-  end
-
-  def allow_ruby_exit= (mode)
-    fail RuntimeError, 'cannot change mode of the remote interpreter'
-  end
-
-  def delete
-    _appsend(false, true, 'exit')
-  end
-
-  def deleted?
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-
-    if @displayof
-      lst = @interp._invoke_without_enc('winfo', 'interps',
-                                        '-displayof', @displayof)
-    else
-      lst = @interp._invoke_without_enc('winfo', 'interps')
-    end
-    # unless @interp._split_tklist(lst).index(@remote)
-    unless @interp._split_tklist(lst).index(_toUTF8(@remote))
-      true
-    else
-      false
-    end
-  end
-
-  def has_mainwindow?
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-
-    begin
-      inf = @interp._invoke_without_enc('info', 'command', '.')
-    rescue Exception
-      return nil
-    end
-    if !inf.kind_of?(String) || inf != '.'
-      false
-    else
-      true
-    end
-  end
-
-  def invalid_namespace?
-    false
-  end
-
-  def restart
-    fail RuntimeError, 'cannot restart the remote interpreter'
-  end
-
-  def __eval(str)
-    _appsend(false, false, str)
-  end
-  def _eval(str)
-    _appsend(nil, false, str)
-  end
-  def _eval_without_enc(str)
-    _appsend(false, false, str)
-  end
-  def _eval_with_enc(str)
-    _appsend(true, false, str)
-  end
-
-  def _invoke(*args)
-    _appsend(nil, false, *args)
-  end
-
-  def __invoke(*args)
-    _appsend(false, false, *args)
-  end
-  def _invoke(*args)
-    _appsend(nil, false, *args)
-  end
-  def _invoke_without_enc(*args)
-    _appsend(false, false, *args)
-  end
-  def _invoke_with_enc(*args)
-    _appsend(true, false, *args)
-  end
-
-  def _toUTF8(str, encoding=nil)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._toUTF8(str, encoding)
-  end
-
-  def _fromUTF8(str, encoding=nil)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._fromUTF8(str, encoding)
-  end
-
-  def _thread_vwait(var_name)
-    _appsend(false, 'thread_vwait', varname)
-  end
-
-  def _thread_tkwait(mode, target)
-    _appsend(false, 'thread_tkwait', mode, target)
-  end
-
-  def _return_value
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._return_value
-  end
-
-  def _get_variable(var_name, flag)
-    # ignore flag
-    _appsend(false, 'set', TkComm::_get_eval_string(var_name))
-  end
-  def _get_variable2(var_name, index_name, flag)
-    # ignore flag
-    _appsend(false, 'set', "#{TkComm::_get_eval_string(var_name)}(#{TkComm::_get_eval_string(index_name)})")
-  end
-
-  def _set_variable(var_name, value, flag)
-    # ignore flag
-    _appsend(false, 'set', TkComm::_get_eval_string(var_name), TkComm::_get_eval_string(value))
-  end
-  def _set_variable2(var_name, index_name, value, flag)
-    # ignore flag
-    _appsend(false, 'set', "#{TkComm::_get_eval_string(var_name)}(#{TkComm::_get_eval_string(index_name)})", TkComm::_get_eval_string(value))
-  end
-
-  def _unset_variable(var_name, flag)
-    # ignore flag
-    _appsend(false, 'unset', TkComm::_get_eval_string(var_name))
-  end
-  def _unset_variable2(var_name, index_name, flag)
-    # ignore flag
-    _appsend(false, 'unset', "#{var_name}(#{index_name})")
-  end
-
-  def _get_global_var(var_name)
-    _appsend(false, 'set', TkComm::_get_eval_string(var_name))
-  end
-  def _get_global_var2(var_name, index_name)
-    _appsend(false, 'set', "#{TkComm::_get_eval_string(var_name)}(#{TkComm::_get_eval_string(index_name)})")
-  end
-
-  def _set_global_var(var_name, value)
-    _appsend(false, 'set', TkComm::_get_eval_string(var_name), TkComm::_get_eval_string(value))
-  end
-  def _set_global_var2(var_name, index_name, value)
-    _appsend(false, 'set', "#{TkComm::_get_eval_string(var_name)}(#{TkComm::_get_eval_string(index_name)})", TkComm::_get_eval_string(value))
-  end
-
-  def _unset_global_var(var_name)
-    _appsend(false, 'unset', TkComm::_get_eval_string(var_name))
-  end
-  def _unset_global_var2(var_name, index_name)
-    _appsend(false, 'unset', "#{var_name}(#{index_name})")
-  end
-
-  def _split_tklist(str)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._split_tklist(str)
-  end
-
-  def _merge_tklist(*args)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._merge_tklist(*args)
-  end
-
-  def _conv_listelement(str)
-    raise SecurityError, "no permission to manipulate" unless self.manipulable?
-    @interp._conv_listelement(str)
-  end
-
-  def _create_console
-    fail RuntimeError, 'not support "_create_console" on the remote interpreter'
-  end
-
-  def mainloop
-    fail RuntimeError, 'not support "mainloop" on the remote interpreter'
-  end
-  def mainloop_watchdog
-    fail RuntimeError, 'not support "mainloop_watchdog" on the remote interpreter'
-  end
-  def do_one_event(flag = nil)
-    fail RuntimeError, 'not support "do_one_event" on the remote interpreter'
-  end
-  def mainloop_abort_on_exception
-    fail RuntimeError, 'not support "mainloop_abort_on_exception" on the remote interpreter'
-  end
-  def mainloop_abort_on_exception=(mode)
-    fail RuntimeError, 'not support "mainloop_abort_on_exception=" on the remote interpreter'
-  end
-  def set_eventloop_tick(*args)
-    fail RuntimeError, 'not support "set_eventloop_tick" on the remote interpreter'
-  end
-  def get_eventloop_tick
-    fail RuntimeError, 'not support "get_eventloop_tick" on the remote interpreter'
-  end
-  def set_no_event_wait(*args)
-    fail RuntimeError, 'not support "set_no_event_wait" on the remote interpreter'
-  end
-  def get_no_event_wait
-    fail RuntimeError, 'not support "get_no_event_wait" on the remote interpreter'
-  end
-  def set_eventloop_weight(*args)
-    fail RuntimeError, 'not support "set_eventloop_weight" on the remote interpreter'
-  end
-  def get_eventloop_weight
-    fail RuntimeError, 'not support "get_eventloop_weight" on the remote interpreter'
-  end
-end
-
-class << RemoteTkIp
-  def mainloop(*args)
-    fail RuntimeError, 'not support "mainloop" on the remote interpreter'
-  end
-  def mainloop_watchdog(*args)
-    fail RuntimeError, 'not support "mainloop_watchdog" on the remote interpreter'
-  end
-  def do_one_event(flag = nil)
-    fail RuntimeError, 'not support "do_one_event" on the remote interpreter'
-  end
-  def mainloop_abort_on_exception
-    fail RuntimeError, 'not support "mainloop_abort_on_exception" on the remote interpreter'
-  end
-  def mainloop_abort_on_exception=(mode)
-    fail RuntimeError, 'not support "mainloop_abort_on_exception=" on the remote interpreter'
-  end
-  def set_eventloop_tick(*args)
-    fail RuntimeError, 'not support "set_eventloop_tick" on the remote interpreter'
-  end
-  def get_eventloop_tick
-    fail RuntimeError, 'not support "get_eventloop_tick" on the remote interpreter'
-  end
-  def set_no_event_wait(*args)
-    fail RuntimeError, 'not support "set_no_event_wait" on the remote interpreter'
-  end
-  def get_no_event_wait
-    fail RuntimeError, 'not support "get_no_event_wait" on the remote interpreter'
-  end
-  def set_eventloop_weight(*args)
-    fail RuntimeError, 'not support "set_eventloop_weight" on the remote interpreter'
-  end
-  def get_eventloop_weight
-    fail RuntimeError, 'not support "get_eventloop_weight" on the remote interpreter'
-  end
-end
diff --git a/ext/tk/lib/tcltk.rb b/ext/tk/lib/tcltk.rb
deleted file mode 100644
index 7796bb86ef..0000000000
--- a/ext/tk/lib/tcltk.rb
+++ /dev/null
@@ -1,368 +0,0 @@
-# frozen_string_literal: false
-# tof
-
-#### tcltk library, more direct manipulation of tcl/tk
-####    Sep. 5, 1997    Y. Shigehiro
-
-require "tcltklib"
-
-################
-
-# module TclTk: collection of tcl/tk utilities (supplies namespace.)
-module TclTk
-
-  # initialize Hash to hold unique symbols and such
-  @namecnt = {}
-
-  # initialize Hash to hold callbacks
-  @callback = {}
-end
-
-# TclTk.mainloop(): call TclTkLib.mainloop()
-def TclTk.mainloop()
-  print("mainloop: start\n") if $DEBUG
-  TclTkLib.mainloop()
-  print("mainloop: end\n") if $DEBUG
-end
-
-# TclTk.deletecallbackkey(ca): remove callback from TclTk module
-#     this does not remove callbacks from tcl/tk interpreter
-#     without calling this method, TclTkInterpreter will not be GCed
-#   ca: callback(TclTkCallback)
-def TclTk.deletecallbackkey(ca)
-  print("deletecallbackkey: ", ca.to_s(), "\n") if $DEBUG
-  @callback.delete(ca.to_s)
-end
-
-# TclTk.dcb(ca, wid, W): call TclTk.deletecallbackkey() for each callbacks
-#     in an array.
-#     this is for callback for top-level <Destroy>
-#   ca: array of callbacks(TclTkCallback)
-#   wid: top-level widget(TclTkWidget)
-#   w: information about window given by %W(String)
-def TclTk.dcb(ca, wid, w)
-  if wid.to_s() == w
-    ca.each{|i|
-      TclTk.deletecallbackkey(i)
-    }
-  end
-end
-
-# TclTk._addcallback(ca): register callback
-#   ca: callback(TclTkCallback)
-def TclTk._addcallback(ca)
-  print("_addcallback: ", ca.to_s(), "\n") if $DEBUG
-  @callback[ca.to_s()] = ca
-end
-
-# TclTk._callcallback(key, arg): invoke registered callback
-#   key: key to select callback (to_s value of the TclTkCallback)
-#   arg: parameter from tcl/tk interpreter
-def TclTk._callcallback(key, arg)
-  print("_callcallback: ", @callback[key].inspect, "\n") if $DEBUG
-  @callback[key]._call(arg)
-  # throw out callback value
-  # should return String to satisfy rb_eval_string()
-  return ""
-end
-
-# TclTk._newname(prefix): generate unique name(String)
-#   prefix: prefix of the unique name
-def TclTk._newname(prefix)
-  # generated name counter is stored in @namecnt
-  if !@namecnt.key?(prefix)
-    # first appearing prefix, initialize
-    @namecnt[prefix] = 1
-  else
-    # already appeared prefix, generate next name
-    @namecnt[prefix] += 1
-  end
-  return "#{prefix}#{@namecnt[prefix]}"
-end
-
-################
-
-# class TclTkInterpreter: tcl/tk interpreter
-class TclTkInterpreter
-
-  # initialize():
-  def initialize()
-    # generate interpreter object
-    @ip = TclTkIp.new()
-
-    # add ruby_fmt command to tcl interpreter
-    # ruby_fmt command format arguments by `format' and call `ruby' command
-    # (notice ruby command receives only one argument)
-    if $DEBUG
-      @ip._eval("proc ruby_fmt {fmt args} { puts \"ruby_fmt: $fmt $args\" ; set cmd [list ruby [format $fmt $args]] ; uplevel $cmd }")
-    else
-      @ip._eval("proc ruby_fmt {fmt args} { set cmd [list ruby [format $fmt $args]] ; uplevel $cmd }")
-    end
-
-    # @ip._get_eval_string(*args): generate string to evaluate in tcl interpreter
-    #   *args: script which is going to be evaluated under tcl/tk
-    def @ip._get_eval_string(*args)
-      argstr = ""
-      args.each{|arg|
-        argstr += " " if argstr != ""
-        # call to_eval if it is defined
-        if (arg.respond_to?(:to_eval))
-          argstr += arg.to_eval()
-        else
-          # call to_s unless defined
-          argstr += arg.to_s()
-        end
-      }
-      return argstr
-    end
-
-    # @ip._eval_args(*args): evaluate string under tcl/tk interpreter
-    #     returns result string.
-    #   *args: script which is going to be evaluated under tcl/tk
-    def @ip._eval_args(*args)
-      # calculate the string to eval in the interpreter
-      argstr = _get_eval_string(*args)
-
-      # evaluate under the interpreter
-      print("_eval: \"", argstr, "\"") if $DEBUG
-      res = _eval(argstr)
-      if $DEBUG
-        print(" -> \"", res, "\"\n")
-      elsif  _return_value() != 0
-        print(res, "\n")
-      end
-      fail(%Q/can't eval "#{argstr}"/) if _return_value() != 0 #'
-      return res
-    end
-
-    # generate tcl/tk command object and register in the hash
-    @commands = {}
-    # for all commands registered in tcl/tk interpreter:
-    @ip._eval("info command").split(/ /).each{|comname|
-      if comname =~ /^[.]/
-        # if command is a widget (path), generate TclTkWidget,
-        # and register it in the hash
-        @commands[comname] = TclTkWidget.new(@ip, comname)
-      else
-        # otherwise, generate TclTkCommand
-        @commands[comname] = TclTkCommand.new(@ip, comname)
-      end
-    }
-  end
-
-  # commands(): returns hash of the tcl/tk commands
-  def commands()
-    return @commands
-  end
-
-  # rootwidget(): returns root widget(TclTkWidget)
-  def rootwidget()
-    return @commands["."]
-  end
-
-  # _tcltkip(): returns @ip(TclTkIp)
-  def _tcltkip()
-    return @ip
-  end
-
-  # method_missing(id, *args): execute undefined method as tcl/tk command
-  #   id: method symbol
-  #   *args: method arguments
-  def method_missing(id, *args)
-    # if command named by id registered, then execute it
-    if @commands.key?(id.id2name)
-      return @commands[id.id2name].e(*args)
-    else
-      # otherwise, exception
-      super
-    end
-  end
-end
-
-# class TclTkObject: base class of the tcl/tk objects
-class TclTkObject
-
-  # initialize(ip, exp):
-  #   ip: interpreter(TclTkIp)
-  #   exp: tcl/tk representation
-  def initialize(ip, exp)
-    fail("type is not TclTkIp") if !ip.kind_of?(TclTkIp)
-    @ip = ip
-    @exp = exp
-  end
-
-  # to_s(): returns tcl/tk representation
-  def to_s()
-    return @exp
-  end
-end
-
-# class TclTkCommand: tcl/tk commands
-# you should not call TclTkCommand.new()
-# commands are created by TclTkInterpreter:initialize()
-class TclTkCommand < TclTkObject
-
-  # e(*args): execute command.  returns String (e is for exec or eval)
-  #   *args: command arguments
-  def e(*args)
-    return @ip._eval_args(to_s(), *args)
-  end
-end
-
-# class TclTkLibCommand: tcl/tk commands in the library
-class TclTkLibCommand < TclTkCommand
-
-  # initialize(ip, name):
-  #   ip: interpreter(TclTkInterpreter)
-  #   name: command name (String)
-  def initialize(ip, name)
-    super(ip._tcltkip, name)
-  end
-end
-
-# class TclTkVariable: tcl/tk variable
-class TclTkVariable < TclTkObject
-
-  # initialize(interp, dat):
-  #   interp: interpreter(TclTkInterpreter)
-  #   dat: the value to set(String)
-  #       if nil, not initialize variable
-  def initialize(interp, dat)
-    # auto-generate tcl/tk representation (variable name)
-    exp = TclTk._newname("v_")
-    # initialize TclTkObject
-    super(interp._tcltkip(), exp)
-    # safe this for `set' command
-    @set = interp.commands()["set"]
-    # set value
-    set(dat) if dat
-  end
-
-  # although you can set/read variables by using set in tcl/tk,
-  # we provide the method for accessing variables
-
-  # set(data): set tcl/tk variable using `set'
-  #   data: new value
-  def set(data)
-    @set.e(to_s(), data.to_s())
-  end
-
-  # get(): read tcl/tk variable(String) using `set'
-  def get()
-    return @set.e(to_s())
-  end
-end
-
-# class TclTkWidget: tcl/tk widget
-class TclTkWidget < TclTkCommand
-
-  # initialize(*args):
-  #   *args: parameters
-  def initialize(*args)
-    if args[0].kind_of?(TclTkIp)
-      # in case the 1st argument is TclTkIp:
-
-      # Wrap tcl/tk widget by TclTkWidget
-      # (used in TclTkInterpreter#initialize())
-
-      # need two arguments
-      fail("invalid # of parameter") if args.size != 2
-
-      # ip: interpreter(TclTkIp)
-      # exp: tcl/tk representation
-      ip, exp = args
-
-      # initialize TclTkObject
-      super(ip, exp)
-    elsif args[0].kind_of?(TclTkInterpreter)
-      # in case 1st parameter is TclTkInterpreter:
-
-      # generate new widget from parent widget
-
-      # interp: interpreter(TclTkInterpreter)
-      # parent: parent widget
-      # command: widget generating tk command(label 等)
-      # *args: argument to the command
-      interp, parent, command, *args = args
-
-      # generate widget name
-      exp = parent.to_s()
-      exp += "." if exp !~ /[.]$/
-      exp += TclTk._newname("w_")
-      # initialize TclTkObject
-      super(interp._tcltkip(), exp)
-      # generate widget
-      res = @ip._eval_args(command, exp, *args)
-#      fail("can't create Widget") if res != exp
-      # for tk_optionMenu, it is legal res != exp
-    else
-      fail("first parameter is not TclTkInterpreter")
-    end
-  end
-end
-
-# class TclTkCallback: tcl/tk callbacks
-class TclTkCallback < TclTkObject
-
-  # initialize(interp, pr, arg):
-  #   interp: interpreter(TclTkInterpreter)
-  #   pr: callback procedure(Proc)
-  #   arg: string to pass as block parameters of pr
-  #       bind command of tcl/tk uses % replacement for parameters
-  #       pr can receive replaced data using block parameter
-  #       its format is specified by arg string
-  #       You should not specify arg for the command like
-  #       scrollbar with -command option, which receives parameters
-  #       without specifying any replacement
-  def initialize(interp, pr, arg = nil)
-    # auto-generate tcl/tk representation (variable name)
-    exp = TclTk._newname("c_")
-    # initialize TclTkObject
-    super(interp._tcltkip(), exp)
-    # save parameters
-    @pr = pr
-    @arg = arg
-    # register in the module
-    TclTk._addcallback(self)
-  end
-
-  # to_eval(): returns string representation for @ip._eval_args
-  def to_eval()
-    if @arg
-      # bind replaces %s before calling ruby_fmt, so %%s is used
-      s = %Q/{ruby_fmt {TclTk._callcallback("#{to_s()}", "%%s")} #{@arg}}/
-    else
-      s = %Q/{ruby_fmt {TclTk._callcallback("#{to_s()}", "%s")}}/
-    end
-
-    return s
-  end
-
-  # _call(arg): invoke callback
-  #   arg: callback parameter
-  def _call(arg)
-    @pr.call(arg)
-  end
-end
-
-# class TclTkImage: tcl/tk images
-class TclTkImage < TclTkCommand
-
-  # initialize(interp, t, *args):
-  #     generating image is done by TclTkImage.new()
-  #     destroying is done by image delete (inconsistent, sigh)
-  #   interp: interpreter(TclTkInterpreter)
-  #   t: image type (photo, bitmap, etc.)
-  #   *args: command argument
-  def initialize(interp, t, *args)
-    # auto-generate tcl/tk representation
-    exp = TclTk._newname("i_")
-    # initialize TclTkObject
-    super(interp._tcltkip(), exp)
-    # generate image
-    res = @ip._eval_args("image create", t, exp, *args)
-    fail("can't create Image") if res != exp
-  end
-end
-
-# eof
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
deleted file mode 100644
index 956313b54e..0000000000
--- a/ext/tk/lib/tk.rb
+++ /dev/null
@@ -1,5758 +0,0 @@
-# frozen_string_literal: false
-#
-#               tk.rb - Tk interface module using tcltklib
-#                       by Yukihiro Matsumoto <matz@netlab.jp>
-
-# use Shigehiro's tcltklib
-require 'tcltklib'
-require 'tkutil'
-
-# autoload
-require 'tk/autoload'
-
-# for Mutex
-require 'thread'
-
-class TclTkIp
-  # backup original (without encoding) _eval and _invoke
-  alias _eval_without_enc _eval
-  alias __eval__ _eval
-  alias _invoke_without_enc _invoke
-  alias __invoke__ _invoke
-
-  def _ip_id_
-    # for RemoteTkIp
-    ''
-  end
-
-  alias __initialize__ initialize
-  private :__initialize__
-
-  def initialize(*args)
-    __initialize__(*args)
-
-    @force_default_encoding ||= TkUtil.untrust([false])
-    @encoding ||= TkUtil.untrust([nil])
-    def @encoding.to_s; self.join(nil); end
-  end
-end
-
-# define TkComm module (step 1: basic functions)
-module TkComm
-  include TkUtil
-  extend TkUtil
-
-  WidgetClassNames = TkUtil.untrust({})
-  TkExtlibAutoloadModule = TkUtil.untrust([])
-
-  # None = Object.new  ### --> definition is moved to TkUtil module
-  # def None.to_s
-  #   'None'
-  # end
-  # None.freeze
-
-  #Tk_CMDTBL = {}
-  #Tk_WINDOWS = {}
-  Tk_IDs = [
-    TkUtil.untrust("00000"), # [0]-cmdid
-    TkUtil.untrust("00000")  # [1]-winid
-  ]
-  Tk_IDs.instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  # for backward compatibility
-  Tk_CMDTBL = Object.new
-  def Tk_CMDTBL.method_missing(id, *args)
-    TkCore::INTERP.tk_cmd_tbl.__send__(id, *args)
-  end
-  Tk_CMDTBL.freeze
-  Tk_WINDOWS = Object.new
-  def Tk_WINDOWS.method_missing(id, *args)
-    TkCore::INTERP.tk_windows.__send__(id, *args)
-  end
-  Tk_WINDOWS.freeze
-
-  self.instance_eval{
-    @cmdtbl = TkUtil.untrust([])
-  }
-
-  unless const_defined?(:GET_CONFIGINFO_AS_ARRAY)
-    # GET_CONFIGINFO_AS_ARRAY = false => returns a Hash { opt =>val, ... }
-    #                           true  => returns an Array [[opt,val], ... ]
-    # val is a list which includes resource info.
-    GET_CONFIGINFO_AS_ARRAY = true
-  end
-  unless const_defined?(:GET_CONFIGINFOwoRES_AS_ARRAY)
-    # for configinfo without resource info; list of [opt, value] pair
-    #           false => returns a Hash { opt=>val, ... }
-    #           true  => returns an Array [[opt,val], ... ]
-    GET_CONFIGINFOwoRES_AS_ARRAY = true
-  end
-  #  *** ATTENTION ***
-  # 'current_configinfo' method always returns a Hash under all cases of above.
-
-  def error_at
-    frames = caller()
-    frames.delete_if do |c|
-      c =~ %r!/tk(|core|thcore|canvas|text|entry|scrollbox)\.rb:\d+!
-    end
-    frames
-  end
-  private :error_at
-
-  def _genobj_for_tkwidget(path)
-    return TkRoot.new if path == '.'
-
-    begin
-      #tk_class = TkCore::INTERP._invoke('winfo', 'class', path)
-      tk_class = Tk.ip_invoke_without_enc('winfo', 'class', path)
-    rescue
-      return path
-    end
-
-    if ruby_class = WidgetClassNames[tk_class]
-      ruby_class_name = ruby_class.name
-      # gen_class_name = ruby_class_name + 'GeneratedOnTk'
-      gen_class_name = ruby_class_name
-      classname_def = ''
-    else # ruby_class == nil
-      if Tk.const_defined?(tk_class)
-        Tk.const_get(tk_class)  # auto_load
-        ruby_class = WidgetClassNames[tk_class]
-      end
-
-      unless ruby_class
-        mods = TkExtlibAutoloadModule.find_all{|m| m.const_defined?(tk_class)}
-        mods.each{|mod|
-          begin
-            mod.const_get(tk_class)  # auto_load
-            break if (ruby_class = WidgetClassNames[tk_class])
-          rescue LoadError
-            # ignore load error
-          end
-        }
-      end
-
-      unless ruby_class
-        std_class = 'Tk' << tk_class
-        if Object.const_defined?(std_class)
-          Object.const_get(std_class)  # auto_load
-          ruby_class = WidgetClassNames[tk_class]
-        end
-      end
-
-      unless ruby_class
-        if Tk.const_defined?('TOPLEVEL_ALIASES') &&
-            Tk::TOPLEVEL_ALIASES.const_defined?(std_class)
-          Tk::TOPLEVEL_ALIASES.const_get(std_class)  # auto_load
-          ruby_class = WidgetClassNames[tk_class]
-        end
-      end
-
-      if ruby_class
-        # found
-        ruby_class_name = ruby_class.name
-        gen_class_name = ruby_class_name
-        classname_def = ''
-      else
-        # unknown
-        ruby_class_name = 'TkWindow'
-        gen_class_name = 'TkWidget_' + tk_class
-        classname_def = "WidgetClassName = '#{tk_class}'.freeze"
-      end
-    end
-
-###################################
-=begin
-    if ruby_class = WidgetClassNames[tk_class]
-      ruby_class_name = ruby_class.name
-      # gen_class_name = ruby_class_name + 'GeneratedOnTk'
-      gen_class_name = ruby_class_name
-      classname_def = ''
-    else
-      mod = TkExtlibAutoloadModule.find{|m| m.const_defined?(tk_class)}
-      if mod
-        ruby_class_name = mod.name + '::' + tk_class
-        gen_class_name = ruby_class_name
-        classname_def = ''
-      elsif Object.const_defined?('Tk' + tk_class)
-        ruby_class_name = 'Tk' + tk_class
-        # gen_class_name = ruby_class_name + 'GeneratedOnTk'
-        gen_class_name = ruby_class_name
-        classname_def = ''
-      else
-        ruby_class_name = 'TkWindow'
-        # gen_class_name = ruby_class_name + tk_class + 'GeneratedOnTk'
-        gen_class_name = 'TkWidget_' + tk_class
-        classname_def = "WidgetClassName = '#{tk_class}'.freeze"
-      end
-    end
-=end
-
-=begin
-    unless Object.const_defined? gen_class_name
-      Object.class_eval "class #{gen_class_name}<#{ruby_class_name}
-                           #{classname_def}
-                         end"
-    end
-    Object.class_eval "#{gen_class_name}.new('widgetname'=>'#{path}',
-                                             'without_creating'=>true)"
-=end
-    base = Object
-    gen_class_name.split('::').each{|klass|
-      next if klass == ''
-      if base.const_defined?(klass)
-        base = base.class_eval klass
-      else
-        base = base.class_eval "class #{klass}<#{ruby_class_name}
-                                  #{classname_def}
-                                end
-                                #{klass}"
-      end
-    }
-    base.class_eval "#{gen_class_name}.new('widgetname'=>'#{path}',
-                                           'without_creating'=>true)"
-  end
-  private :_genobj_for_tkwidget
-  module_function :_genobj_for_tkwidget
-
-  def _at(x,y=nil)
-    if y
-      "@#{Integer(x)},#{Integer(y)}"
-    else
-      "@#{Integer(x)}"
-    end
-  end
-  module_function :_at
-
-  def tk_tcl2ruby(val, enc_mode = false, listobj = true)
-=begin
-    if val =~ /^rb_out\S* (c(_\d+_)?\d+)/
-      #return Tk_CMDTBL[$1]
-      return TkCore::INTERP.tk_cmd_tbl[$1]
-      #cmd_obj = TkCore::INTERP.tk_cmd_tbl[$1]
-      #if cmd_obj.kind_of?(Proc) || cmd_obj.kind_of?(Method)
-      #  cmd_obj
-      #else
-      #  cmd_obj.cmd
-      #end
-    end
-=end
-    if val =~ /rb_out\S*(?:\s+(::\S*|[{](::.*)[}]|["](::.*)["]))? (c(_\d+_)?(\d+))/
-      return TkCore::INTERP.tk_cmd_tbl[$4]
-    end
-    #if val.include? ?\s
-    #  return val.split.collect{|v| tk_tcl2ruby(v)}
-    #end
-    case val
-    when /\A@font\S+\z/
-      TkFont.get_obj(val)
-    when /\A-?\d+\z/
-      val.to_i
-    when /\A\.\S*\z/
-      #Tk_WINDOWS[val] ? Tk_WINDOWS[val] : _genobj_for_tkwidget(val)
-      TkCore::INTERP.tk_windows[val]?
-           TkCore::INTERP.tk_windows[val] : _genobj_for_tkwidget(val)
-    when /\Ai(_\d+_)?\d+\z/
-      TkImage::Tk_IMGTBL.mutex.synchronize{
-        TkImage::Tk_IMGTBL[val]? TkImage::Tk_IMGTBL[val] : val
-      }
-    when /\A-?\d+\.?\d*(e[-+]?\d+)?\z/
-      val.to_f
-    when /\\ /
-      val.gsub(/\\ /, ' ')
-    when /[^\\] /
-      if listobj
-        #tk_split_escstr(val).collect{|elt|
-        #  tk_tcl2ruby(elt, enc_mode, listobj)
-        #}
-        val = _toUTF8(val) unless enc_mode
-        tk_split_escstr(val, false, false).collect{|elt|
-          tk_tcl2ruby(elt, true, listobj)
-        }
-      elsif enc_mode
-        _fromUTF8(val)
-      else
-        val
-      end
-    else
-      if enc_mode
-        _fromUTF8(val)
-      else
-        val
-      end
-    end
-  end
-
-  private :tk_tcl2ruby
-  module_function :tk_tcl2ruby
-  #private_class_method :tk_tcl2ruby
-
-unless const_defined?(:USE_TCLs_LIST_FUNCTIONS)
-  USE_TCLs_LIST_FUNCTIONS = true
-end
-
-if USE_TCLs_LIST_FUNCTIONS
-  ###########################################################################
-  # use Tcl function version of split_list
-  ###########################################################################
-
-  def tk_split_escstr(str, src_enc=true, dst_enc=true)
-    str = _toUTF8(str) if src_enc
-    if dst_enc
-      TkCore::INTERP._split_tklist(str).map!{|s| _fromUTF8(s)}
-    else
-      TkCore::INTERP._split_tklist(str)
-    end
-  end
-
-  def tk_split_sublist(str, depth=-1, src_enc=true, dst_enc=true)
-    # return [] if str == ""
-    # list = TkCore::INTERP._split_tklist(str)
-    str = _toUTF8(str) if src_enc
-
-    if depth == 0
-      return "" if str == ""
-      list = [str]
-    else
-      return [] if str == ""
-      list = TkCore::INTERP._split_tklist(str)
-    end
-    if list.size == 1
-      # tk_tcl2ruby(list[0], nil, false)
-      tk_tcl2ruby(list[0], dst_enc, false)
-    else
-      list.collect{|token| tk_split_sublist(token, depth - 1, false, dst_enc)}
-    end
-  end
-
-  def tk_split_list(str, depth=0, src_enc=true, dst_enc=true)
-    return [] if str == ""
-    str = _toUTF8(str) if src_enc
-    TkCore::INTERP._split_tklist(str).map!{|token|
-      tk_split_sublist(token, depth - 1, false, dst_enc)
-    }
-  end
-
-  def tk_split_simplelist(str, src_enc=true, dst_enc=true)
-    #lst = TkCore::INTERP._split_tklist(str)
-    #if (lst.size == 1 && lst =~ /^\{.*\}$/)
-    #  TkCore::INTERP._split_tklist(str[1..-2])
-    #else
-    #  lst
-    #end
-
-    str = _toUTF8(str) if src_enc
-    if dst_enc
-      TkCore::INTERP._split_tklist(str).map!{|s| _fromUTF8(s)}
-    else
-      TkCore::INTERP._split_tklist(str)
-    end
-  end
-
-  def array2tk_list(ary, enc=nil)
-    return "" if ary.size == 0
-
-    sys_enc = TkCore::INTERP.encoding
-    sys_enc = TclTkLib.encoding_system unless sys_enc
-
-    dst_enc = (enc == nil)? sys_enc: enc
-
-    dst = ary.collect{|e|
-      if e.kind_of? Array
-        s = array2tk_list(e, enc)
-      elsif e.kind_of? Hash
-        tmp_ary = []
-        #e.each{|k,v| tmp_ary << k << v }
-        e.each{|k,v| tmp_ary << "-#{_get_eval_string(k)}" << v }
-        s = array2tk_list(tmp_ary, enc)
-      else
-        s = _get_eval_string(e, enc)
-      end
-
-      if dst_enc != true && dst_enc != false
-        if (s_enc = s.instance_variable_get(:@encoding))
-          s_enc = s_enc.to_s
-        elsif TkCore::WITH_ENCODING
-          s_enc = s.encoding.name
-        else
-          s_enc = sys_enc
-        end
-        dst_enc = true if s_enc != dst_enc
-      end
-
-      s
-    }
-
-    if sys_enc && dst_enc
-      dst.map!{|s| _toUTF8(s)}
-      ret = TkCore::INTERP._merge_tklist(*dst)
-      if TkCore::WITH_ENCODING
-        if dst_enc.kind_of?(String)
-          ret = _fromUTF8(ret, dst_enc)
-          ret.force_encoding(dst_enc)
-        else
-          ret.force_encoding('utf-8')
-        end
-      else # without encoding
-        if dst_enc.kind_of?(String)
-          ret = _fromUTF8(ret, dst_enc)
-          ret.instance_variable_set(:@encoding, dst_enc)
-        else
-          ret.instance_variable_set(:@encoding, 'utf-8')
-        end
-      end
-      ret
-    else
-      TkCore::INTERP._merge_tklist(*dst)
-    end
-  end
-
-else
-  ###########################################################################
-  # use Ruby script version of split_list (traditional methods)
-  ###########################################################################
-
-  def tk_split_escstr(str, src_enc=true, dst_enc=true)
-    return [] if str == ""
-    list = []
-    token = nil
-    escape = false
-    brace = 0
-    str.split('').each {|c|
-      brace += 1 if c == '{' && !escape
-      brace -= 1 if c == '}' && !escape
-      if brace == 0 && c == ' ' && !escape
-        list << token.gsub(/^\{(.*)\}$/, '\1') if token
-        token = nil
-      else
-        token = (token || "") << c
-      end
-      escape = (c == '\\' && !escape)
-    }
-    list << token.gsub(/^\{(.*)\}$/, '\1') if token
-    list
-  end
-
-  def tk_split_sublist(str, depth=-1, src_enc=true, dst_enc=true)
-    #return [] if str == ""
-    #return [tk_split_sublist(str[1..-2])] if str =~ /^\{.*\}$/
-    #list = tk_split_escstr(str)
-    if depth == 0
-      return "" if str == ""
-      str = str[1..-2] if str =~ /^\{.*\}$/
-      list = [str]
-    else
-      return [] if str == []
-      return [tk_split_sublist(str[1..-2], depth - 1)] if str =~ /^\{.*\}$/
-      list = tk_split_escstr(str)
-    end
-    if list.size == 1
-      tk_tcl2ruby(list[0], nil, false)
-    else
-      list.collect{|token| tk_split_sublist(token, depth - 1)}
-    end
-  end
-
-  def tk_split_list(str, depth=0, src_enc=true, dst_enc=true)
-    return [] if str == ""
-    tk_split_escstr(str).collect{|token|
-      tk_split_sublist(token, depth - 1)
-    }
-  end
-
-  def tk_split_simplelist(str, src_enc=true, dst_enc=true)
-    return [] if str == ""
-    list = []
-    token = nil
-    escape = false
-    brace = 0
-    str.split('').each {|c|
-      if c == '\\' && !escape
-        escape = true
-        token = (token || "") << c if brace > 0
-        next
-      end
-      brace += 1 if c == '{' && !escape
-      brace -= 1 if c == '}' && !escape
-      if brace == 0 && c == ' ' && !escape
-        list << token.gsub(/^\{(.*)\}$/, '\1') if token
-        token = nil
-      else
-        token = (token || "") << c
-      end
-      escape = false
-    }
-    list << token.gsub(/^\{(.*)\}$/, '\1') if token
-    list
-  end
-
-  def array2tk_list(ary, enc=nil)
-    ary.collect{|e|
-      if e.kind_of? Array
-        "{#{array2tk_list(e, enc)}}"
-      elsif e.kind_of? Hash
-        # "{#{e.to_a.collect{|ee| array2tk_list(ee)}.join(' ')}}"
-        e.each{|k,v| tmp_ary << "-#{_get_eval_string(k)}" << v }
-        array2tk_list(tmp_ary, enc)
-      else
-        s = _get_eval_string(e, enc)
-        (s.index(/\s/) || s.size == 0)? "{#{s}}": s
-      end
-    }.join(" ")
-  end
-end
-
-  private :tk_split_escstr, :tk_split_sublist
-  private :tk_split_list, :tk_split_simplelist
-  private :array2tk_list
-
-  module_function :tk_split_escstr, :tk_split_sublist
-  module_function :tk_split_list, :tk_split_simplelist
-  module_function :array2tk_list
-
-  private_class_method :tk_split_escstr, :tk_split_sublist
-  private_class_method :tk_split_list, :tk_split_simplelist
-#  private_class_method :array2tk_list
-
-=begin
-  ### --> definition is moved to TkUtil module
-  def _symbolkey2str(keys)
-    h = {}
-    keys.each{|key,value| h[key.to_s] = value}
-    h
-  end
-  private :_symbolkey2str
-  module_function :_symbolkey2str
-=end
-
-=begin
-  ### --> definition is moved to TkUtil module
-  # def hash_kv(keys, enc_mode = nil, conf = [], flat = false)
-  def hash_kv(keys, enc_mode = nil, conf = nil)
-    # Hash {key=>val, key=>val, ... } or Array [ [key, val], [key, val], ... ]
-    #     ==> Array ['-key', val, '-key', val, ... ]
-    dst = []
-    if keys and keys != None
-      keys.each{|k, v|
-        #dst.push("-#{k}")
-        dst.push('-' + k.to_s)
-        if v != None
-          # v = _get_eval_string(v, enc_mode) if (enc_mode || flat)
-          v = _get_eval_string(v, enc_mode) if enc_mode
-          dst.push(v)
-        end
-      }
-    end
-    if conf
-      conf + dst
-    else
-      dst
-    end
-  end
-  private :hash_kv
-  module_function :hash_kv
-=end
-
-=begin
-  ### --> definition is moved to TkUtil module
-  def bool(val)
-    case val
-    when "1", 1, 'yes', 'true'
-      true
-    else
-      false
-    end
-  end
-
-  def number(val)
-    case val
-    when /^-?\d+$/
-      val.to_i
-    when /^-?\d+\.?\d*(e[-+]?\d+)?$/
-      val.to_f
-    else
-      fail(ArgumentError, "invalid value for Number:'#{val}'")
-    end
-  end
-  def string(val)
-    if val == "{}"
-      ''
-    elsif val[0] == ?{ && val[-1] == ?}
-      val[1..-2]
-    else
-      val
-    end
-  end
-  def num_or_str(val)
-    begin
-      number(val)
-    rescue ArgumentError
-      string(val)
-    end
-  end
-=end
-
-  def list(val, depth=0, enc=true)
-    tk_split_list(val, depth, enc, enc)
-  end
-  def simplelist(val, src_enc=true, dst_enc=true)
-    tk_split_simplelist(val, src_enc, dst_enc)
-  end
-  def window(val)
-    if val =~ /^\./
-      #Tk_WINDOWS[val]? Tk_WINDOWS[val] : _genobj_for_tkwidget(val)
-      TkCore::INTERP.tk_windows[val]?
-           TkCore::INTERP.tk_windows[val] : _genobj_for_tkwidget(val)
-    else
-      nil
-    end
-  end
-  def image_obj(val)
-    if val =~ /^i(_\d+_)?\d+$/
-      TkImage::Tk_IMGTBL.mutex.synchronize{
-        TkImage::Tk_IMGTBL[val]? TkImage::Tk_IMGTBL[val] : val
-      }
-    else
-      val
-    end
-  end
-  def procedure(val)
-=begin
-    if val =~ /^rb_out\S* (c(_\d+_)?\d+)/
-      #Tk_CMDTBL[$1]
-      #TkCore::INTERP.tk_cmd_tbl[$1]
-      TkCore::INTERP.tk_cmd_tbl[$1].cmd
-=end
-    if val =~ /rb_out\S*(?:\s+(::\S*|[{](::.*)[}]|["](::.*)["]))? (c(_\d+_)?(\d+))/
-      return TkCore::INTERP.tk_cmd_tbl[$4].cmd
-    else
-      #nil
-      val
-    end
-  end
-  private :bool, :number, :num_or_str, :num_or_nil, :string
-  private :list, :simplelist, :window, :image_obj, :procedure
-  module_function :bool, :number, :num_or_str, :num_or_nil, :string
-  module_function :list, :simplelist, :window, :image_obj, :procedure
-
-  if (RUBY_VERSION.split('.').map{|n| n.to_i} <=> [1,8,7]) < 0
-    def slice_ary(ary, size)
-      sliced = []
-      wk_ary = ary.dup
-      until wk_ary.size.zero?
-        sub_ary = []
-        size.times{ sub_ary << wk_ary.shift }
-        yield(sub_ary) if block_given?
-        sliced << sub_ary
-      end
-      (block_given?)? ary: sliced
-    end
-  else
-    def slice_ary(ary, size, &b)
-      if b
-        ary.each_slice(size, &b)
-      else
-        ary.each_slice(size).to_a
-      end
-    end
-  end
-  private :slice_ary
-  module_function :slice_ary
-
-  def subst(str, *opts)
-    # opts := :nobackslashes | :nocommands | novariables
-    tk_call('subst',
-            *(opts.collect{|opt|
-                opt = opt.to_s
-                (opt[0] == ?-)? opt: '-' << opt
-              } << str))
-  end
-
-  def _toUTF8(str, encoding = nil)
-    TkCore::INTERP._toUTF8(str, encoding)
-  end
-  def _fromUTF8(str, encoding = nil)
-    TkCore::INTERP._fromUTF8(str, encoding)
-  end
-  private :_toUTF8, :_fromUTF8
-  module_function :_toUTF8, :_fromUTF8
-
-  def _callback_entry_class?(cls)
-    cls <= Proc || cls <= Method || cls <= TkCallbackEntry
-  end
-  private :_callback_entry_class?
-  module_function :_callback_entry_class?
-
-  def _callback_entry?(obj)
-    obj.kind_of?(Proc) || obj.kind_of?(Method) || obj.kind_of?(TkCallbackEntry)
-  end
-  private :_callback_entry?
-  module_function :_callback_entry?
-
-=begin
-  ### --> definition is moved to TkUtil module
-  def _get_eval_string(str, enc_mode = nil)
-    return nil if str == None
-    if str.kind_of?(TkObject)
-      str = str.path
-    elsif str.kind_of?(String)
-      str = _toUTF8(str) if enc_mode
-    elsif str.kind_of?(Symbol)
-      str = str.id2name
-      str = _toUTF8(str) if enc_mode
-    elsif str.kind_of?(Hash)
-      str = hash_kv(str, enc_mode).join(" ")
-    elsif str.kind_of?(Array)
-      str = array2tk_list(str)
-      str = _toUTF8(str) if enc_mode
-    elsif str.kind_of?(Proc)
-      str = install_cmd(str)
-    elsif str == nil
-      str = ""
-    elsif str == false
-      str = "0"
-    elsif str == true
-      str = "1"
-    elsif (str.respond_to?(:to_eval))
-      str = str.to_eval()
-      str = _toUTF8(str) if enc_mode
-    else
-      str = str.to_s() || ''
-      unless str.kind_of? String
-        fail RuntimeError, "fail to convert the object to a string"
-      end
-      str = _toUTF8(str) if enc_mode
-    end
-    return str
-  end
-=end
-=begin
-  def _get_eval_string(obj, enc_mode = nil)
-    case obj
-    when Numeric
-      obj.to_s
-    when String
-      (enc_mode)? _toUTF8(obj): obj
-    when Symbol
-      (enc_mode)? _toUTF8(obj.id2name): obj.id2name
-    when TkObject
-      obj.path
-    when Hash
-      hash_kv(obj, enc_mode).join(' ')
-    when Array
-      (enc_mode)? _toUTF8(array2tk_list(obj)): array2tk_list(obj)
-    when Proc, Method, TkCallbackEntry
-      install_cmd(obj)
-    when false
-      '0'
-    when true
-      '1'
-    when nil
-      ''
-    when None
-      nil
-    else
-      if (obj.respond_to?(:to_eval))
-        (enc_mode)? _toUTF8(obj.to_eval): obj.to_eval
-      else
-        begin
-          obj = obj.to_s || ''
-        rescue
-          fail RuntimeError, "fail to convert object '#{obj}' to string"
-        end
-        (enc_mode)? _toUTF8(obj): obj
-      end
-    end
-  end
-  private :_get_eval_string
-  module_function :_get_eval_string
-=end
-
-=begin
-  ### --> definition is moved to TkUtil module
-  def _get_eval_enc_str(obj)
-    return obj if obj == None
-    _get_eval_string(obj, true)
-  end
-  private :_get_eval_enc_str
-  module_function :_get_eval_enc_str
-=end
-
-=begin
-  ### --> obsolete
-  def ruby2tcl(v, enc_mode = nil)
-    if v.kind_of?(Hash)
-      v = hash_kv(v)
-      v.flatten!
-      v.collect{|e|ruby2tcl(e, enc_mode)}
-    else
-      _get_eval_string(v, enc_mode)
-    end
-  end
-  private :ruby2tcl
-=end
-
-=begin
-  ### --> definition is moved to TkUtil module
-  def _conv_args(args, enc_mode, *src_args)
-    conv_args = []
-    src_args.each{|arg|
-      conv_args << _get_eval_string(arg, enc_mode) unless arg == None
-      # if arg.kind_of?(Hash)
-      # arg.each{|k, v|
-      #   args << '-' + k.to_s
-      #   args << _get_eval_string(v, enc_mode)
-      # }
-      # elsif arg != None
-      #   args << _get_eval_string(arg, enc_mode)
-      # end
-    }
-    args + conv_args
-  end
-  private :_conv_args
-=end
-
-  def _curr_cmd_id
-    #id = format("c%.4d", Tk_IDs[0])
-    id = "c" + TkCore::INTERP._ip_id_ + TkComm::Tk_IDs[0]
-  end
-  def _next_cmd_id
-    TkComm::Tk_IDs.mutex.synchronize{
-      id = _curr_cmd_id
-      #Tk_IDs[0] += 1
-      TkComm::Tk_IDs[0].succ!
-      id
-    }
-  end
-  private :_curr_cmd_id, :_next_cmd_id
-  module_function :_curr_cmd_id, :_next_cmd_id
-
-  def TkComm.install_cmd(cmd, local_cmdtbl=nil)
-    return '' if cmd == ''
-    begin
-      ns = TkCore::INTERP._invoke_without_enc('namespace', 'current')
-      ns = nil if ns == '::' # for backward compatibility
-    rescue
-      # probably, Tcl7.6
-      ns = nil
-    end
-    id = _next_cmd_id
-    #Tk_CMDTBL[id] = cmd
-    if cmd.kind_of?(TkCallbackEntry)
-      TkCore::INTERP.tk_cmd_tbl[id] = cmd
-    else
-      TkCore::INTERP.tk_cmd_tbl[id] = TkCore::INTERP.get_cb_entry(cmd)
-    end
-    @cmdtbl = [] unless defined? @cmdtbl
-    TkUtil.untrust(@cmdtbl) unless @cmdtbl.tainted?
-    @cmdtbl.push id
-
-    if local_cmdtbl && local_cmdtbl.kind_of?(Array)
-      begin
-        local_cmdtbl << id
-      rescue Exception
-        # ignore
-      end
-    end
-
-    #return Kernel.format("rb_out %s", id);
-    if ns
-      'rb_out' << TkCore::INTERP._ip_id_ << ' ' << ns << ' ' << id
-    else
-      'rb_out' << TkCore::INTERP._ip_id_ << ' ' << id
-    end
-  end
-  def TkComm.uninstall_cmd(id, local_cmdtbl=nil)
-    #id = $1 if /rb_out\S* (c(_\d+_)?\d+)/ =~ id
-    id = $4 if id =~ /rb_out\S*(?:\s+(::\S*|[{](::.*)[}]|["](::.*)["]))? (c(_\d+_)?(\d+))/
-
-    if local_cmdtbl && local_cmdtbl.kind_of?(Array)
-      begin
-        local_cmdtbl.delete(id)
-      rescue Exception
-        # ignore
-      end
-    end
-    @cmdtbl.delete(id)
-
-    #Tk_CMDTBL.delete(id)
-    TkCore::INTERP.tk_cmd_tbl.delete(id)
-  end
-  # private :install_cmd, :uninstall_cmd
-  # module_function :install_cmd, :uninstall_cmd
-  def install_cmd(cmd)
-    TkComm.install_cmd(cmd, @cmdtbl)
-  end
-  def uninstall_cmd(id)
-    TkComm.uninstall_cmd(id, @cmdtbl)
-  end
-
-=begin
-  def install_win(ppath,name=nil)
-    if !name or name == ''
-      #name = format("w%.4d", Tk_IDs[1])
-      #Tk_IDs[1] += 1
-      name = "w" + Tk_IDs[1]
-      Tk_IDs[1].succ!
-    end
-    if name[0] == ?.
-      @path = name.dup
-    elsif !ppath or ppath == "."
-      @path = Kernel.format(".%s", name);
-    else
-      @path = Kernel.format("%s.%s", ppath, name)
-    end
-    #Tk_WINDOWS[@path] = self
-    TkCore::INTERP.tk_windows[@path] = self
-  end
-=end
-  def install_win(ppath,name=nil)
-    if name
-      if name == ''
-        raise ArgumentError, "invalid widget-name '#{name}'"
-      end
-      if name[0] == ?.
-        @path = '' + name
-        @path.freeze
-        return TkCore::INTERP.tk_windows[@path] = self
-      end
-    else
-      Tk_IDs.mutex.synchronize{
-        name = "w" + TkCore::INTERP._ip_id_ + Tk_IDs[1]
-        Tk_IDs[1].succ!
-      }
-    end
-    if !ppath or ppath == '.'
-      @path = '.' + name
-    else
-      @path = ppath + '.' + name
-    end
-    @path.freeze
-    TkCore::INTERP.tk_windows[@path] = self
-  end
-
-  def uninstall_win()
-    #Tk_WINDOWS.delete(@path)
-    TkCore::INTERP.tk_windows.delete(@path)
-  end
-  private :install_win, :uninstall_win
-
-  def _epath(win)
-    if win.kind_of?(TkObject)
-      win.epath
-    elsif win.respond_to?(:epath)
-      win.epath
-    else
-      win
-    end
-  end
-  private :_epath
-end
-
-# define TkComm module (step 2: event binding)
-module TkComm
-  include TkEvent
-  extend TkEvent
-
-  def tk_event_sequence(context)
-    if context.kind_of? TkVirtualEvent
-      context = context.path
-    end
-    if context.kind_of? Array
-      context = context.collect{|ev|
-        if ev.kind_of? TkVirtualEvent
-          ev.path
-        else
-          ev
-        end
-      }.join("><")
-    end
-    if /,/ =~ context
-      context = context.split(/\s*,\s*/).join("><")
-    else
-      context
-    end
-  end
-
-  def _bind_core(mode, what, context, cmd, *args)
-    id = install_bind(cmd, *args) if cmd
-    begin
-      tk_call_without_enc(*(what + ["<#{tk_event_sequence(context)}>",
-                              mode + id]))
-    rescue
-      uninstall_cmd(id) if cmd
-      fail
-    end
-  end
-
-  def _bind(what, context, cmd, *args)
-    _bind_core('', what, context, cmd, *args)
-  end
-
-  def _bind_append(what, context, cmd, *args)
-    _bind_core('+', what, context, cmd, *args)
-  end
-
-  def _bind_remove(what, context)
-    tk_call_without_enc(*(what + ["<#{tk_event_sequence(context)}>", '']))
-  end
-
-  def _bindinfo(what, context=nil)
-    if context
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        enum_obj = tk_call_without_enc(*what+["<#{tk_event_sequence(context)}>"]).each_line
-      else
-        enum_obj = tk_call_without_enc(*what+["<#{tk_event_sequence(context)}>"])
-      end
-      enum_obj.collect {|cmdline|
-=begin
-        if cmdline =~ /^rb_out\S* (c(?:_\d+_)?\d+)\s+(.*)$/
-          #[Tk_CMDTBL[$1], $2]
-          [TkCore::INTERP.tk_cmd_tbl[$1], $2]
-=end
-        if cmdline =~ /rb_out\S*(?:\s+(::\S*|[{](::.*)[}]|["](::.*)["]))? (c(_\d+_)?(\d+))/
-          [TkCore::INTERP.tk_cmd_tbl[$4], $5]
-        else
-          cmdline
-        end
-      }
-    else
-      tk_split_simplelist(tk_call_without_enc(*what)).collect!{|seq|
-        l = seq.scan(/<*[^<>]+>*/).collect!{|subseq|
-          case (subseq)
-          when /^<<[^<>]+>>$/
-            TkVirtualEvent.getobj(subseq[1..-2])
-          when /^<[^<>]+>$/
-            subseq[1..-2]
-          else
-            subseq.split('')
-          end
-        }.flatten
-        (l.size == 1) ? l[0] : l
-      }
-    end
-  end
-
-  def _bind_core_for_event_class(klass, mode, what, context, cmd, *args)
-    id = install_bind_for_event_class(klass, cmd, *args) if cmd
-    begin
-      tk_call_without_enc(*(what + ["<#{tk_event_sequence(context)}>",
-                              mode + id]))
-    rescue
-      uninstall_cmd(id) if cmd
-      fail
-    end
-  end
-
-  def _bind_for_event_class(klass, what, context, cmd, *args)
-    _bind_core_for_event_class(klass, '', what, context, cmd, *args)
-  end
-
-  def _bind_append_for_event_class(klass, what, context, cmd, *args)
-    _bind_core_for_event_class(klass, '+', what, context, cmd, *args)
-  end
-
-  def _bind_remove_for_event_class(klass, what, context)
-    _bind_remove(what, context)
-  end
-
-  def _bindinfo_for_event_class(klass, what, context=nil)
-    _bindinfo(what, context)
-  end
-
-  private :tk_event_sequence
-  private :_bind_core, :_bind, :_bind_append, :_bind_remove, :_bindinfo
-  private :_bind_core_for_event_class, :_bind_for_event_class,
-          :_bind_append_for_event_class, :_bind_remove_for_event_class,
-          :_bindinfo_for_event_class
-
-  #def bind(tagOrClass, context, cmd=Proc.new, *args)
-  #  _bind(["bind", tagOrClass], context, cmd, *args)
-  #  tagOrClass
-  #end
-  def bind(tagOrClass, context, *args)
-    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _bind(["bind", tagOrClass], context, cmd, *args)
-    tagOrClass
-  end
-
-  #def bind_append(tagOrClass, context, cmd=Proc.new, *args)
-  #  _bind_append(["bind", tagOrClass], context, cmd, *args)
-  #  tagOrClass
-  #end
-  def bind_append(tagOrClass, context, *args)
-    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _bind_append(["bind", tagOrClass], context, cmd, *args)
-    tagOrClass
-  end
-
-  def bind_remove(tagOrClass, context)
-    _bind_remove(['bind', tagOrClass], context)
-    tagOrClass
-  end
-
-  def bindinfo(tagOrClass, context=nil)
-    _bindinfo(['bind', tagOrClass], context)
-  end
-
-  #def bind_all(context, cmd=Proc.new, *args)
-  #  _bind(['bind', 'all'], context, cmd, *args)
-  #  TkBindTag::ALL
-  #end
-  def bind_all(context, *args)
-    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _bind(['bind', 'all'], context, cmd, *args)
-    TkBindTag::ALL
-  end
-
-  #def bind_append_all(context, cmd=Proc.new, *args)
-  #  _bind_append(['bind', 'all'], context, cmd, *args)
-  #  TkBindTag::ALL
-  #end
-  def bind_append_all(context, *args)
-    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _bind_append(['bind', 'all'], context, cmd, *args)
-    TkBindTag::ALL
-  end
-
-  def bind_remove_all(context)
-    _bind_remove(['bind', 'all'], context)
-    TkBindTag::ALL
-  end
-
-  def bindinfo_all(context=nil)
-    _bindinfo(['bind', 'all'], context)
-  end
-end
-
-
-module TkCore
-  include TkComm
-  extend TkComm
-
-  WITH_RUBY_VM  = Object.const_defined?(:RubyVM) && ::RubyVM.class == Class
-  WITH_ENCODING = defined?(::Encoding.default_external) && true
-  #WITH_ENCODING = Object.const_defined?(:Encoding) && ::Encoding.class == Class
-
-  unless self.const_defined? :INTERP
-    if self.const_defined? :IP_NAME
-      name = IP_NAME.to_s
-    else
-      #name = nil
-      name = $0
-    end
-    if self.const_defined? :IP_OPTS
-      if IP_OPTS.kind_of?(Hash)
-        opts = hash_kv(IP_OPTS).join(' ')
-      else
-        opts = IP_OPTS.to_s
-      end
-    else
-      opts = ''
-    end
-
-    # RUN_EVENTLOOP_ON_MAIN_THREAD = true
-
-    unless self.const_defined? :RUN_EVENTLOOP_ON_MAIN_THREAD
-      if WITH_RUBY_VM ### check Ruby 1.9 !!!!!!!
-        # *** NEED TO FIX ***
-        case RUBY_PLATFORM
-        when /cygwin/
-          RUN_EVENTLOOP_ON_MAIN_THREAD = true
-        when /darwin/ # MacOS X
-=begin
-          ip = TclTkIp.new(name, opts)
-          if ip._invoke_without_enc('tk', 'windowingsystem') == 'aqua' &&
-             (TclTkLib.get_version<=>[8,4,TclTkLib::RELEASE_TYPE::FINAL,6]) > 0
-=end
-          if TclTkLib::WINDOWING_SYSTEM == 'aqua' &&
-             (TclTkLib.get_version<=>[8,4,TclTkLib::RELEASE_TYPE::FINAL,6]) > 0
-            # *** KNOWN BUG ***
-            #  Main event loop thread of TkAqua (> Tk8.4.9) must be the main
-            #  application thread. So, ruby1.9 users must call Tk.mainloop on
-            #  the main application thread.
-            #
-            # *** ADD (2009/05/10) ***
-            #  In some cases (I don't know the description of conditions),
-            #  TkAqua 8.4.7 has a same kind of hang-up trouble.
-            #  So, if 8.4.7 or later, set RUN_EVENTLOOP_ON_MAIN_THREAD to true.
-            #  When you want to control this mode, please call the following
-            #  (set true/false as you want) before "require 'tk'".
-            #  ----------------------------------------------------------
-            #  module TkCore; RUN_EVENTLOOP_ON_MAIN_THREAD = true; end
-            #  ----------------------------------------------------------
-            #
-            # *** ADD (2010/07/05) ***
-            #  The value of TclTkLib::WINDOWING_SYSTEM is defined at compiling.
-            #  If it is inconsistent with linked DLL, please call the following
-            #  before "require 'tk'".
-            #  ----------------------------------------------------------
-            #  require 'tcltklib'
-            #  module TclTkLib
-            #    remove_const :WINDOWING_SYSTEM
-            #    WINDOWING_SYSTEM = 'x11' # or 'aqua'
-            #  end
-            #  ----------------------------------------------------------
-            #
-            RUN_EVENTLOOP_ON_MAIN_THREAD = true
-          else
-            RUN_EVENTLOOP_ON_MAIN_THREAD = false
-=begin
-            ip.delete
-            ip = nil
-=end
-          end
-        else
-          RUN_EVENTLOOP_ON_MAIN_THREAD = false
-        end
-
-      else # Ruby 1.8.x
-        RUN_EVENTLOOP_ON_MAIN_THREAD = false
-      end
-    end
-
-    if !WITH_RUBY_VM || RUN_EVENTLOOP_ON_MAIN_THREAD ### check Ruby 1.9 !!!!!!!
-      INTERP = TclTkIp.new(name, opts) unless self.const_defined? :INTERP
-    else
-      INTERP_MUTEX = Mutex.new
-      INTERP_ROOT_CHECK = ConditionVariable.new
-      INTERP_THREAD = Thread.new{
-        begin
-          #Thread.current[:interp] = interp = TclTkIp.new(name, opts)
-          interp = TclTkIp.new(name, opts)
-        rescue => e
-          Thread.current[:interp] = e
-          raise e
-        end
-
-        interp.mainloop_abort_on_exception = true
-        Thread.current.instance_variable_set("@interp", interp)
-
-        status = [nil]
-        def status.value
-          self[0]
-        end
-        def status.value=(val)
-          self[0] = val
-        end
-
-        Thread.current[:status] = status
-        #sleep
-
-        # like as 1.8, withdraw a root widget before calling Tk.mainloop
-        interp._eval <<EOS
-wm withdraw .
-rename wm __wm_orig__
-proc wm {subcmd win args} {
-  set val [eval [list __wm_orig__ $subcmd $win] $args]
-  if {[string equal $subcmd withdraw] && [string equal $win .]} {
-    rename wm {}
-    rename __wm_orig__ wm
-  }
-  return $val
-}
-proc __startup_rbtk_mainloop__ {args} {
-  rename __startup_rbtk_mainloop__ {}
-  if {[info command __wm_orig__] == "__wm_orig__"} {
-    rename wm {}
-    rename __wm_orig__ wm
-    if [string equal [wm state .] withdrawn] {
-      wm deiconify .
-    }
-  }
-}
-set __initial_state_of_rubytk__ 1
-trace add variable __initial_state_of_rubytk__ unset __startup_rbtk_mainloop__
-
-# complete initializing
-ruby {TkCore::INTERP_THREAD[:interp] = TkCore::INTERP_THREAD.instance_variable_get('@interp')}
-EOS
-
-        begin
-          begin
-            #TclTkLib.mainloop_abort_on_exception = false
-            #interp.mainloop_abort_on_exception = true
-            #Thread.current[:interp] = interp
-            #Thread.current[:status].value = TclTkLib.mainloop(true)
-            Thread.current[:status].value = interp.mainloop(true)
-          rescue SystemExit=>e
-            Thread.current[:status].value = e
-          rescue Exception=>e
-            Thread.current[:status].value = e
-            p e if $DEBUG
-            retry if interp.has_mainwindow?
-          ensure
-            INTERP_MUTEX.synchronize{ INTERP_ROOT_CHECK.broadcast }
-          end
-
-          unless interp.deleted?
-            begin
-              #Thread.current[:status].value = TclTkLib.mainloop(false)
-              Thread.current[:status].value = interp.mainloop(false)
-            rescue Exception=>e
-              puts "ignore exception on interp: #{e.inspect}\n" if $DEBUG
-            end
-          end
-
-        ensure
-          # interp must be deleted before the thread for interp is dead.
-          # If not, raise Tcl_Panic on Tcl_AsyncDelete because async handler
-          # deleted by the wrong thread.
-          interp.delete
-        end
-      }
-
-      # check a Tcl/Tk interpreter is initialized
-      until INTERP_THREAD[:interp]
-        # Thread.pass
-        INTERP_THREAD.run
-      end
-
-      # INTERP_THREAD.run
-      raise INTERP_THREAD[:interp] if INTERP_THREAD[:interp].kind_of? Exception
-
-      # check an eventloop is running
-      while INTERP_THREAD.alive? && TclTkLib.mainloop_thread?.nil?
-        INTERP_THREAD.run
-      end
-
-      INTERP = INTERP_THREAD[:interp]
-      INTERP_THREAD_STATUS = INTERP_THREAD[:status]
-
-      # delete the interpreter and kill the eventloop thread at exit
-      END{
-        if INTERP_THREAD.alive?
-          INTERP.delete
-          INTERP_THREAD.kill
-        end
-      }
-
-      # (for safety's sake) force the eventloop to run
-      INTERP_THREAD.run
-    end
-
-    def INTERP.__getip
-      self
-    end
-    def INTERP.default_master?
-      true
-    end
-
-    INTERP.instance_eval{
-      # @tk_cmd_tbl = TkUtil.untrust({})
-      @tk_cmd_tbl =
-        TkUtil.untrust(Hash.new{|hash, key|
-                         fail IndexError, "unknown command ID '#{key}'"
-                       })
-      def @tk_cmd_tbl.[]=(idx,val)
-        if self.has_key?(idx) && Thread.current.group != ThreadGroup::Default
-          fail SecurityError,"cannot change the entried command"
-        end
-        super(idx,val)
-      end
-
-      @tk_windows = TkUtil.untrust({})
-
-      @tk_table_list = TkUtil.untrust([])
-
-      @init_ip_env  = TkUtil.untrust([])  # table of Procs
-      @add_tk_procs = TkUtil.untrust([])  # table of [name, args, body]
-
-      @force_default_encoding ||= TkUtil.untrust([false])
-      @encoding ||= TkUtil.untrust([nil])
-      def @encoding.to_s; self.join(nil); end
-
-      @cb_entry_class = Class.new(TkCallbackEntry){
-        class << self
-          def inspect
-            sprintf("#<Class(TkCallbackEntry):%0x>", self.__id__)
-          end
-          alias to_s inspect
-        end
-
-        def initialize(ip, cmd)
-          @ip = ip
-          @cmd = cmd
-        end
-        attr_reader :ip, :cmd
-        def call(*args)
-          @ip.cb_eval(@cmd, *args)
-        end
-        def inspect
-          sprintf("#<cb_entry:%0x>", self.__id__)
-        end
-        alias to_s inspect
-      }.freeze
-    }
-
-    def INTERP.cb_entry_class
-      @cb_entry_class
-    end
-    def INTERP.tk_cmd_tbl
-      @tk_cmd_tbl
-    end
-    def INTERP.tk_windows
-      @tk_windows
-    end
-
-    class Tk_OBJECT_TABLE
-      def initialize(id)
-        @id = id
-        @mutex = Mutex.new
-      end
-      def mutex
-        @mutex
-      end
-      def method_missing(m, *args, &b)
-        TkCore::INTERP.tk_object_table(@id).__send__(m, *args, &b)
-      end
-    end
-
-    def INTERP.tk_object_table(id)
-      @tk_table_list[id]
-    end
-    def INTERP.create_table
-      id = @tk_table_list.size
-      (tbl = {}).tainted? || TkUtil.untrust(tbl)
-      @tk_table_list << tbl
-#      obj = Object.new
-#      obj.instance_eval <<-EOD
-#        def self.method_missing(m, *args)
-#         TkCore::INTERP.tk_object_table(#{id}).send(m, *args)
-#        end
-#      EOD
-#      return obj
-      Tk_OBJECT_TABLE.new(id)
-    end
-
-    def INTERP.get_cb_entry(cmd)
-      @cb_entry_class.new(__getip, cmd).freeze
-    end
-    def INTERP.cb_eval(cmd, *args)
-      TkUtil._get_eval_string(TkUtil.eval_cmd(cmd, *args))
-    end
-
-    def INTERP.init_ip_env(script = Proc.new)
-      @init_ip_env << script
-      script.call(self)
-    end
-    def INTERP.add_tk_procs(name, args = nil, body = nil)
-      if name.kind_of?(Array)
-        name.each{|param| self.add_tk_procs(*param)}
-      else
-        name = name.to_s
-        @add_tk_procs << [name, args, body]
-        self._invoke('proc', name, args, body) if args && body
-      end
-    end
-    def INTERP.remove_tk_procs(*names)
-      names.each{|name|
-        name = name.to_s
-        @add_tk_procs.delete_if{|elem|
-          elem.kind_of?(Array) && elem[0].to_s == name
-        }
-        #self._invoke('rename', name, '')
-        self.__invoke__('rename', name, '')
-      }
-    end
-    def INTERP.init_ip_internal
-      ip = self
-      @init_ip_env.each{|script| script.call(ip)}
-      @add_tk_procs.each{|name,args,body| ip._invoke('proc',name,args,body)}
-    end
-  end
-
-  unless self.const_defined? :RUN_EVENTLOOP_ON_MAIN_THREAD
-    ### Ruby 1.9 !!!!!!!!!!!!!!!!!!!!!!!!!!
-    RUN_EVENTLOOP_ON_MAIN_THREAD = false
-  end
-
-  WIDGET_DESTROY_HOOK = '<WIDGET_DESTROY_HOOK>'
-  INTERP._invoke_without_enc('event', 'add',
-                             "<#{WIDGET_DESTROY_HOOK}>", '<Destroy>')
-  INTERP._invoke_without_enc('bind', 'all', "<#{WIDGET_DESTROY_HOOK}>",
-                             install_cmd(proc{|path|
-                                unless TkCore::INTERP.deleted?
-                                  begin
-                                    if (widget=TkCore::INTERP.tk_windows[path])
-                                      if widget.respond_to?(:__destroy_hook__)
-                                        widget.__destroy_hook__
-                                      end
-                                    end
-                                  rescue Exception=>e
-                                      p e if $DEBUG
-                                  end
-                                end
-                             }) << ' %W')
-
-  INTERP.add_tk_procs(TclTkLib::FINALIZE_PROC_NAME, '',
-                      "catch { bind all <#{WIDGET_DESTROY_HOOK}> {} }")
-
-  INTERP.add_tk_procs('rb_out', 'ns args', <<-'EOL')
-    if [regexp {^::} $ns] {
-      set cmd {namespace eval $ns {ruby_cmd TkCore callback} $args}
-    } else {
-      set cmd {eval {ruby_cmd TkCore callback} $ns $args}
-    }
-    if {[set st [catch $cmd ret]] != 0} {
-       #return -code $st $ret
-       set idx [string first "\n\n" $ret]
-       if {$idx > 0} {
-          return -code $st \
-                 -errorinfo [string range $ret [expr $idx + 2] \
-                                               [string length $ret]] \
-                 [string range $ret 0 [expr $idx - 1]]
-       } else {
-          return -code $st $ret
-       }
-    } else {
-        return $ret
-    }
-  EOL
-=begin
-  INTERP.add_tk_procs('rb_out', 'args', <<-'EOL')
-    if {[set st [catch {eval {ruby_cmd TkCore callback} $args} ret]] != 0} {
-       #return -code $st $ret
-       set idx [string first "\n\n" $ret]
-       if {$idx > 0} {
-          return -code $st \
-                 -errorinfo [string range $ret [expr $idx + 2] \
-                                               [string length $ret]] \
-                 [string range $ret 0 [expr $idx - 1]]
-       } else {
-          return -code $st $ret
-       }
-    } else {
-        return $ret
-    }
-  EOL
-=end
-=begin
-  INTERP.add_tk_procs('rb_out', 'args', <<-'EOL')
-    #regsub -all {\\} $args {\\\\} args
-    #regsub -all {!} $args {\\!} args
-    #regsub -all "{" $args "\\{" args
-    regsub -all {(\\|!|\{|\})} $args {\\\1} args
-    if {[set st [catch {ruby [format "TkCore.callback %%Q!%s!" $args]} ret]] != 0} {
-       #return -code $st $ret
-       set idx [string first "\n\n" $ret]
-       if {$idx > 0} {
-          return -code $st \
-                 -errorinfo [string range $ret [expr $idx + 2] \
-                                               [string length $ret]] \
-                 [string range $ret 0 [expr $idx - 1]]
-       } else {
-          return -code $st $ret
-       }
-    } else {
-        return $ret
-    }
-  EOL
-=end
-
-  if !WITH_RUBY_VM || RUN_EVENTLOOP_ON_MAIN_THREAD ### check Ruby 1.9 !!!!!!!
-    at_exit{ INTERP.remove_tk_procs(TclTkLib::FINALIZE_PROC_NAME) }
-  else
-    at_exit{
-      Tk.root.destroy
-      INTERP.remove_tk_procs(TclTkLib::FINALIZE_PROC_NAME)
-      INTERP_THREAD.kill.join
-    }
-  end
-
-  EventFlag = TclTkLib::EventFlag
-
-  def callback_break
-    fail TkCallbackBreak, "Tk callback returns 'break' status"
-  end
-
-  def callback_continue
-    fail TkCallbackContinue, "Tk callback returns 'continue' status"
-  end
-
-  def callback_return
-    fail TkCallbackReturn, "Tk callback returns 'return' status"
-  end
-
-  def TkCore.callback(*arg)
-    begin
-      if TkCore::INTERP.tk_cmd_tbl.kind_of?(Hash)
-        #TkCore::INTERP.tk_cmd_tbl[arg.shift].call(*arg)
-        normal_ret = false
-        ret = catch(:IRB_EXIT) do  # IRB hack
-          retval = TkCore::INTERP.tk_cmd_tbl[arg.shift].call(*arg)
-          normal_ret = true
-          retval
-        end
-        unless normal_ret
-          # catch IRB_EXIT
-          exit(ret)
-        end
-        ret
-      end
-    rescue SystemExit=>e
-      exit(e.status)
-    rescue Interrupt=>e
-      fail(e)
-    rescue Exception => e
-      begin
-        msg = _toUTF8(e.class.inspect) + ': ' +
-              _toUTF8(e.message) + "\n" +
-              "\n---< backtrace of Ruby side >-----\n" +
-              _toUTF8(e.backtrace.join("\n")) +
-              "\n---< backtrace of Tk side >-------"
-        if TkCore::WITH_ENCODING
-          msg.force_encoding('utf-8')
-        else
-          msg.instance_variable_set(:@encoding, 'utf-8')
-        end
-      rescue Exception
-        msg = e.class.inspect + ': ' + e.message + "\n" +
-              "\n---< backtrace of Ruby side >-----\n" +
-              e.backtrace.join("\n") +
-              "\n---< backtrace of Tk side >-------"
-      end
-      # TkCore::INTERP._set_global_var('errorInfo', msg)
-      # fail(e)
-      fail(e, msg)
-    end
-  end
-=begin
-  def TkCore.callback(arg_str)
-    # arg = tk_split_list(arg_str)
-    arg = tk_split_simplelist(arg_str)
-    #_get_eval_string(TkUtil.eval_cmd(Tk_CMDTBL[arg.shift], *arg))
-    #_get_eval_string(TkUtil.eval_cmd(TkCore::INTERP.tk_cmd_tbl[arg.shift],
-    #                        *arg))
-    # TkCore::INTERP.tk_cmd_tbl[arg.shift].call(*arg)
-    begin
-      TkCore::INTERP.tk_cmd_tbl[arg.shift].call(*arg)
-    rescue Exception => e
-      raise(e, e.class.inspect + ': ' + e.message + "\n" +
-               "\n---< backtrace of Ruby side >-----\n" +
-               e.backtrace.join("\n") +
-               "\n---< backtrace of Tk side >-------")
-    end
-#=begin
-#    cb_obj = TkCore::INTERP.tk_cmd_tbl[arg.shift]
-#    unless $DEBUG
-#      cb_obj.call(*arg)
-#    else
-#      begin
-#       raise 'check backtrace'
-#      rescue
-#       # ignore backtrace before 'callback'
-#       pos = -($!.backtrace.size)
-#      end
-#      begin
-#       cb_obj.call(*arg)
-#      rescue
-#       trace = $!.backtrace
-#       raise $!, "\n#{trace[0]}: #{$!.message} (#{$!.class})\n" +
-#                 "\tfrom #{trace[1..pos].join("\n\tfrom ")}"
-#      end
-#    end
-#=end
-  end
-=end
-
-  def load_cmd_on_ip(tk_cmd)
-    bool(tk_call('auto_load', tk_cmd))
-  end
-
-  def after(ms, cmd=Proc.new)
-    cmdid = install_cmd(proc{ret = cmd.call;uninstall_cmd(cmdid); ret})
-    after_id = tk_call_without_enc("after",ms,cmdid)
-    after_id.instance_variable_set('@cmdid', cmdid)
-    after_id
-  end
-=begin
-  def after(ms, cmd=Proc.new)
-    crit_bup = Thread.critical
-    Thread.critical = true
-
-    myid = _curr_cmd_id
-    cmdid = install_cmd(proc{ret = cmd.call;uninstall_cmd(myid); ret})
-
-    Thread.critical = crit_bup
-
-    tk_call_without_enc("after",ms,cmdid)  # return id
-#    return
-#    if false #defined? Thread
-#      Thread.start do
-#       ms = Float(ms)/1000
-#       ms = 10 if ms == 0
-#       sleep ms/1000
-#       cmd.call
-#      end
-#    else
-#      cmdid = install_cmd(cmd)
-#      tk_call("after",ms,cmdid)
-#    end
-  end
-=end
-
-  def after_idle(cmd=Proc.new)
-    cmdid = install_cmd(proc{ret = cmd.call;uninstall_cmd(cmdid); ret})
-    after_id = tk_call_without_enc('after','idle',cmdid)
-    after_id.instance_variable_set('@cmdid', cmdid)
-    after_id
-  end
-=begin
-  def after_idle(cmd=Proc.new)
-    crit_bup = Thread.critical
-    Thread.critical = true
-
-    myid = _curr_cmd_id
-    cmdid = install_cmd(proc{ret = cmd.call;uninstall_cmd(myid); ret})
-
-    Thread.critical = crit_bup
-
-    tk_call_without_enc('after','idle',cmdid)
-  end
-=end
-
-  def after_cancel(afterId)
-    tk_call_without_enc('after','cancel',afterId)
-    if (cmdid = afterId.instance_variable_get('@cmdid'))
-      afterId.instance_variable_set('@cmdid', nil)
-      uninstall_cmd(cmdid)
-    end
-    afterId
-  end
-
-  def windowingsystem
-    tk_call_without_enc('tk', 'windowingsystem')
-  end
-
-  def scaling(scale=nil)
-    if scale
-      tk_call_without_enc('tk', 'scaling', scale)
-    else
-      Float(number(tk_call_without_enc('tk', 'scaling')))
-    end
-  end
-  def scaling_displayof(win, scale=nil)
-    if scale
-      tk_call_without_enc('tk', 'scaling', '-displayof', win, scale)
-    else
-      Float(number(tk_call_without_enc('tk', '-displayof', win, 'scaling')))
-    end
-  end
-
-  def inactive
-    Integer(tk_call_without_enc('tk', 'inactive'))
-  end
-  def inactive_displayof(win)
-    Integer(tk_call_without_enc('tk', 'inactive', '-displayof', win))
-  end
-  def reset_inactive
-    tk_call_without_enc('tk', 'inactive', 'reset')
-  end
-  def reset_inactive_displayof(win)
-    tk_call_without_enc('tk', 'inactive', '-displayof', win, 'reset')
-  end
-
-  def appname(name=None)
-    tk_call('tk', 'appname', name)
-  end
-
-  def appsend_deny
-    tk_call('rename', 'send', '')
-  end
-
-  def appsend(interp, async, *args)
-    if $SAFE >= 1 && args.find{|obj| obj.tainted?}
-      fail SecurityError, "cannot send tainted Tk commands at level #{$SAFE}"
-    end
-    if async != true && async != false && async != nil
-      args.unshift(async)
-      async = false
-    end
-    if async
-      tk_call('send', '-async', '--', interp, *args)
-    else
-      tk_call('send', '--', interp, *args)
-    end
-  end
-
-  def rb_appsend(interp, async, *args)
-    if $SAFE >= 1 && args.find{|obj| obj.tainted?}
-      fail SecurityError, "cannot send tainted Ruby commands at level #{$SAFE}"
-    end
-    if async != true && async != false && async != nil
-      args.unshift(async)
-      async = false
-    end
-    #args = args.collect!{|c| _get_eval_string(c).gsub(/[\[\]$"]/, '\\\\\&')}
-    args = args.collect!{|c| _get_eval_string(c).gsub(/[\[\]$"\\]/, '\\\\\&')}
-    # args.push(').to_s"')
-    # appsend(interp, async, 'ruby "(', *args)
-    args.push('}.call)"')
-    appsend(interp, async, 'ruby "TkComm._get_eval_string(proc{', *args)
-  end
-
-  def appsend_displayof(interp, win, async, *args)
-    if $SAFE >= 1 && args.find{|obj| obj.tainted?}
-      fail SecurityError, "cannot send tainted Tk commands at level #{$SAFE}"
-    end
-    win = '.' if win == nil
-    if async != true && async != false && async != nil
-      args.unshift(async)
-      async = false
-    end
-    if async
-      tk_call('send', '-async', '-displayof', win, '--', interp, *args)
-    else
-      tk_call('send', '-displayor', win, '--', interp, *args)
-    end
-  end
-
-  def rb_appsend_displayof(interp, win, async, *args)
-    if $SAFE >= 1 && args.find{|obj| obj.tainted?}
-      fail SecurityError, "cannot send tainted Ruby commands at level #{$SAFE}"
-    end
-    win = '.' if win == nil
-    if async != true && async != false && async != nil
-      args.unshift(async)
-      async = false
-    end
-    #args = args.collect!{|c| _get_eval_string(c).gsub(/[\[\]$"]/, '\\\\\&')}
-    args = args.collect!{|c| _get_eval_string(c).gsub(/[\[\]$"\\]/, '\\\\\&')}
-    # args.push(').to_s"')
-    # appsend_displayof(interp, win, async, 'ruby "(', *args)
-    args.push('}.call)"')
-    appsend(interp, win, async, 'ruby "TkComm._get_eval_string(proc{', *args)
-  end
-
-  def info(*args)
-    tk_call('info', *args)
-  end
-
-  def mainloop(check_root = true)
-    if !TkCore::WITH_RUBY_VM
-      TclTkLib.mainloop(check_root)
-
-    elsif TkCore::RUN_EVENTLOOP_ON_MAIN_THREAD
-      # if TclTkLib::WINDOWING_SYSTEM == 'aqua' &&
-      #if TkCore::INTERP._invoke_without_enc('tk','windowingsystem')=='aqua' &&
-      #    Thread.current != Thread.main &&
-      #    (TclTkLib.get_version <=> [8,4,TclTkLib::RELEASE_TYPE::FINAL,9]) > 0
-      #  raise RuntimeError,
-      #       "eventloop on TkAqua ( > Tk8.4.9 ) works on the main thread only"
-      #end
-      if Thread.current != Thread.main
-        raise RuntimeError, "Tk.mainloop is allowed on the main thread only"
-      end
-      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
-
-      # like as 1.8, withdraw a root widget before calling Tk.mainloop
-      TkCore::INTERP._eval_without_enc('catch {unset __initial_state_of_rubytk__}')
-      INTERP_THREAD.run
-
-      begin
-        TclTkLib.set_eventloop_window_mode(true)
-
-        # force run the eventloop
-        TkCore::INTERP._eval_without_enc('update')
-        TkCore::INTERP._eval_without_enc('catch {set __initial_state_of_rubytk__}')
-        INTERP_THREAD.run
-        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
-              raise status if status.kind_of?(Exception)
-            end
-          }
-        else
-          # INTERP_THREAD.value
-          begin
-            INTERP_THREAD.value
-          rescue Exception => e
-            raise e
-          end
-        end
-      rescue Exception => e
-        raise e
-      ensure
-        TclTkLib.set_eventloop_window_mode(false)
-      end
-    end
-  end
-
-  def mainloop_thread?
-    # true  : current thread is mainloop
-    # nil   : there is no mainloop
-    # false : mainloop is running on the other thread
-    #         ( At then, it is dangerous to call Tk interpreter directly. )
-    if !TkCore::WITH_RUBY_VM || TkCore::RUN_EVENTLOOP_ON_MAIN_THREAD
-      ### Ruby 1.9 !!!!!!!!!!!
-      TclTkLib.mainloop_thread?
-    else
-      Thread.current == INTERP_THREAD
-    end
-  end
-
-  def mainloop_exist?
-    TclTkLib.mainloop_thread? != nil
-  end
-
-  def is_mainloop?
-    TclTkLib.mainloop_thread? == true
-  end
-
-  def mainloop_watchdog(check_root = true)
-    # watchdog restarts mainloop when mainloop is dead
-    TclTkLib.mainloop_watchdog(check_root)
-  end
-
-  def do_one_event(flag = TclTkLib::EventFlag::ALL)
-    TclTkLib.do_one_event(flag)
-  end
-
-  def set_eventloop_tick(timer_tick)
-    TclTkLib.set_eventloop_tick(timer_tick)
-  end
-
-  def get_eventloop_tick()
-    TclTkLib.get_eventloop_tick
-  end
-
-  def set_no_event_wait(wait)
-    TclTkLib.set_no_even_wait(wait)
-  end
-
-  def get_no_event_wait()
-    TclTkLib.get_no_eventloop_wait
-  end
-
-  def set_eventloop_weight(loop_max, no_event_tick)
-    TclTkLib.set_eventloop_weight(loop_max, no_event_tick)
-  end
-
-  def get_eventloop_weight()
-    TclTkLib.get_eventloop_weight
-  end
-
-  def restart(app_name = nil, keys = {})
-    TkCore::INTERP.init_ip_internal
-
-    tk_call('set', 'argv0', app_name) if app_name
-    if keys.kind_of?(Hash)
-      # tk_call('set', 'argc', keys.size * 2)
-      tk_call('set', 'argv', hash_kv(keys).join(' '))
-    end
-
-    INTERP.restart
-    nil
-  end
-
-  def event_generate(win, context, keys=nil)
-    #win = win.path if win.kind_of?(TkObject)
-    if context.kind_of?(TkEvent::Event)
-      context.generate(win, ((keys)? keys: {}))
-    elsif keys
-      tk_call_without_enc('event', 'generate', win,
-                          "<#{tk_event_sequence(context)}>",
-                          *hash_kv(keys, true))
-    else
-      tk_call_without_enc('event', 'generate', win,
-                          "<#{tk_event_sequence(context)}>")
-    end
-    nil
-  end
-
-  def messageBox(keys)
-    tk_call('tk_messageBox', *hash_kv(keys))
-  end
-
-  def getOpenFile(keys = nil)
-    tk_call('tk_getOpenFile', *hash_kv(keys))
-  end
-  def getMultipleOpenFile(keys = nil)
-    simplelist(tk_call('tk_getOpenFile', '-multiple', '1', *hash_kv(keys)))
-  end
-
-  def getSaveFile(keys = nil)
-    tk_call('tk_getSaveFile', *hash_kv(keys))
-  end
-  def getMultipleSaveFile(keys = nil)
-    simplelist(tk_call('tk_getSaveFile', '-multiple', '1', *hash_kv(keys)))
-  end
-
-  def chooseColor(keys = nil)
-    tk_call('tk_chooseColor', *hash_kv(keys))
-  end
-
-  def chooseDirectory(keys = nil)
-    tk_call('tk_chooseDirectory', *hash_kv(keys))
-  end
-
-  def _ip_eval_core(enc_mode, cmd_string)
-    case enc_mode
-    when nil
-      res = INTERP._eval(cmd_string)
-    when false
-      res = INTERP._eval_without_enc(cmd_string)
-    when true
-      res = INTERP._eval_with_enc(cmd_string)
-    end
-    if  INTERP._return_value() != 0
-      fail RuntimeError, res, error_at
-    end
-    return res
-  end
-  private :_ip_eval_core
-
-  def ip_eval(cmd_string)
-    _ip_eval_core(nil, cmd_string)
-  end
-
-  def ip_eval_without_enc(cmd_string)
-    _ip_eval_core(false, cmd_string)
-  end
-
-  def ip_eval_with_enc(cmd_string)
-    _ip_eval_core(true, cmd_string)
-  end
-
-  def _ip_invoke_core(enc_mode, *args)
-    case enc_mode
-    when false
-      res = INTERP._invoke_without_enc(*args)
-    when nil
-      res = INTERP._invoke(*args)
-    when true
-      res = INTERP._invoke_with_enc(*args)
-    end
-    if  INTERP._return_value() != 0
-      fail RuntimeError, res, error_at
-    end
-    return res
-  end
-  private :_ip_invoke_core
-
-  def ip_invoke(*args)
-    _ip_invoke_core(nil, *args)
-  end
-
-  def ip_invoke_without_enc(*args)
-    _ip_invoke_core(false, *args)
-  end
-
-  def ip_invoke_with_enc(*args)
-    _ip_invoke_core(true, *args)
-  end
-
-  def _tk_call_core(enc_mode, *args)
-    ### puts args.inspect if $DEBUG
-    #args.collect! {|x|ruby2tcl(x, enc_mode)}
-    #args.compact!
-    #args.flatten!
-    args = _conv_args([], enc_mode, *args)
-    puts 'invoke args => ' + args.inspect if $DEBUG
-    ### print "=> ", args.join(" ").inspect, "\n" if $DEBUG
-    begin
-      # res = TkUtil.untrust(INTERP._invoke(*args))
-      # res = INTERP._invoke(enc_mode, *args)
-      res = _ip_invoke_core(enc_mode, *args)
-      # >>>>>  _invoke returns a TAINTED string  <<<<<
-    rescue NameError => err
-      # err = $!
-      begin
-        args.unshift "unknown"
-        #res = TkUtil.untrust(INTERP._invoke(*args))
-        #res = INTERP._invoke(enc_mode, *args)
-        res = _ip_invoke_core(enc_mode, *args)
-        # >>>>>  _invoke returns a TAINTED string  <<<<<
-      rescue StandardError => err2
-        fail err2 unless /^invalid command/ =~ err2.message
-        fail err
-      end
-    end
-    if  INTERP._return_value() != 0
-      fail RuntimeError, res, error_at
-    end
-    ### print "==> ", res.inspect, "\n" if $DEBUG
-    return res
-  end
-  private :_tk_call_core
-
-  def tk_call(*args)
-    _tk_call_core(nil, *args)
-  end
-
-  def tk_call_without_enc(*args)
-    _tk_call_core(false, *args)
-  end
-
-  def tk_call_with_enc(*args)
-    _tk_call_core(true, *args)
-  end
-
-  def _tk_call_to_list_core(depth, arg_enc, val_enc, *args)
-    args = _conv_args([], arg_enc, *args)
-    val = _tk_call_core(false, *args)
-    if !depth.kind_of?(Integer) || depth == 0
-      tk_split_simplelist(val, false, val_enc)
-    else
-      tk_split_list(val, depth, false, val_enc)
-    end
-  end
-  #private :_tk_call_to_list_core
-
-  def tk_call_to_list(*args)
-    _tk_call_to_list_core(-1, nil, true, *args)
-  end
-
-  def tk_call_to_list_without_enc(*args)
-    _tk_call_to_list_core(-1, false, false, *args)
-  end
-
-  def tk_call_to_list_with_enc(*args)
-    _tk_call_to_list_core(-1, true, true, *args)
-  end
-
-  def tk_call_to_simplelist(*args)
-    _tk_call_to_list_core(0, nil, true, *args)
-  end
-
-  def tk_call_to_simplelist_without_enc(*args)
-    _tk_call_to_list_core(0, false, false, *args)
-  end
-
-  def tk_call_to_simplelist_with_enc(*args)
-    _tk_call_to_list_core(0, true, true, *args)
-  end
-end
-
-
-module Tk
-  include TkCore
-  extend Tk
-
-  TCL_VERSION = INTERP._invoke_without_enc("info", "tclversion").freeze
-  TCL_PATCHLEVEL = INTERP._invoke_without_enc("info", "patchlevel").freeze
-
-  major, minor = TCL_VERSION.split('.')
-  TCL_MAJOR_VERSION = major.to_i
-  TCL_MINOR_VERSION = minor.to_i
-
-  TK_VERSION  = INTERP._invoke_without_enc("set", "tk_version").freeze
-  TK_PATCHLEVEL  = INTERP._invoke_without_enc("set", "tk_patchLevel").freeze
-
-  major, minor = TK_VERSION.split('.')
-  TK_MAJOR_VERSION = major.to_i
-  TK_MINOR_VERSION = minor.to_i
-
-  JAPANIZED_TK = (INTERP._invoke_without_enc("info", "commands",
-                                             "kanji") != "").freeze
-
-  def Tk.const_missing(sym)
-    case(sym)
-    when :TCL_LIBRARY
-      INTERP._invoke_without_enc('global', 'tcl_library')
-      INTERP._invoke("set", "tcl_library").freeze
-
-    when :TK_LIBRARY
-      INTERP._invoke_without_enc('global', 'tk_library')
-      INTERP._invoke("set", "tk_library").freeze
-
-    when :LIBRARY
-      INTERP._invoke("info", "library").freeze
-
-    #when :PKG_PATH, :PACKAGE_PATH, :TCL_PACKAGE_PATH
-    #  INTERP._invoke_without_enc('global', 'tcl_pkgPath')
-    #  tk_split_simplelist(INTERP._invoke('set', 'tcl_pkgPath'))
-
-    #when :LIB_PATH, :LIBRARY_PATH, :TCL_LIBRARY_PATH
-    #  INTERP._invoke_without_enc('global', 'tcl_libPath')
-    #  tk_split_simplelist(INTERP._invoke('set', 'tcl_libPath'))
-
-    when :PLATFORM, :TCL_PLATFORM
-      INTERP._invoke_without_enc('global', 'tcl_platform')
-      Hash[*tk_split_simplelist(INTERP._invoke_without_enc('array', 'get',
-                                                           'tcl_platform'))]
-
-    when :ENV
-      INTERP._invoke_without_enc('global', 'env')
-      Hash[*tk_split_simplelist(INTERP._invoke('array', 'get', 'env'))]
-
-    #when :AUTO_PATH   #<===
-    #  tk_split_simplelist(INTERP._invoke('set', 'auto_path'))
-
-    #when :AUTO_OLDPATH
-    #  tk_split_simplelist(INTERP._invoke('set', 'auto_oldpath'))
-
-    when :AUTO_INDEX
-      INTERP._invoke_without_enc('global', 'auto_index')
-      Hash[*tk_split_simplelist(INTERP._invoke('array', 'get', 'auto_index'))]
-
-    when :PRIV, :PRIVATE, :TK_PRIV
-      priv = {}
-      if INTERP._invoke_without_enc('info', 'vars', 'tk::Priv') != ""
-        var_nam = 'tk::Priv'
-      else
-        var_nam = 'tkPriv'
-      end
-      INTERP._invoke_without_enc('global', var_nam)
-      Hash[*tk_split_simplelist(INTERP._invoke('array', 'get',
-                                               var_nam))].each{|k,v|
-        k.freeze
-        case v
-        when /^-?\d+$/
-          priv[k] = v.to_i
-        when /^-?\d+\.?\d*(e[-+]?\d+)?$/
-          priv[k] = v.to_f
-        else
-          priv[k] = v.freeze
-        end
-      }
-      priv
-
-    else
-      raise NameError, 'uninitialized constant Tk::' + sym.id2name
-    end
-  end
-
-  def Tk.errorInfo
-    INTERP._invoke_without_enc('global', 'errorInfo')
-    INTERP._invoke_without_enc('set', 'errorInfo')
-  end
-
-  def Tk.errorCode
-    INTERP._invoke_without_enc('global', 'errorCode')
-    code = tk_split_simplelist(INTERP._invoke_without_enc('set', 'errorCode'))
-    case code[0]
-    when 'CHILDKILLED', 'CHILDSTATUS', 'CHILDSUSP'
-      begin
-        pid = Integer(code[1])
-        code[1] = pid
-      rescue
-      end
-    end
-    code
-  end
-
-  def Tk.has_mainwindow?
-    INTERP.has_mainwindow?
-  end
-
-  def root
-    Tk::Root.new
-  end
-
-  def Tk.load_tclscript(file, enc=nil)
-    if enc
-      # TCL_VERSION >= 8.5
-      tk_call('source', '-encoding', enc, file)
-    else
-      tk_call('source', file)
-    end
-  end
-
-  def Tk.load_tcllibrary(file, pkg_name=None, interp=None)
-    tk_call('load', file, pkg_name, interp)
-  end
-
-  def Tk.unload_tcllibrary(*args)
-    if args[-1].kind_of?(Hash)
-      keys = _symbolkey2str(args.pop)
-      nocomp = (keys['nocomplain'])? '-nocomplain': None
-      keeplib = (keys['keeplibrary'])? '-keeplibrary': None
-      tk_call('unload', nocomp, keeplib, '--', *args)
-    else
-      tk_call('unload', *args)
-    end
-  end
-
-  def Tk.pkgconfig_list(mod)
-    # Tk8.5 feature
-    if mod.kind_of?(Module)
-      if mod.respond_to?(:package_name)
-        pkgname = mod.package_name
-      elsif mod.const_defined?(:PACKAGE_NAME)
-        pkgname = mod::PACKAGE_NAME
-      else
-        fail NotImplementedError, 'may not be a module for a Tcl extension'
-      end
-    else
-      pkgname = mod.to_s
-    end
-
-    pkgname = '::' << pkgname unless pkgname =~ /^::/
-
-    tk_split_list(tk_call(pkgname + '::pkgconfig', 'list'))
-  end
-
-  def Tk.pkgconfig_get(mod, key)
-    # Tk8.5 feature
-    if mod.kind_of?(Module)
-      if mod.respond_to?(:package_name)
-        pkgname = mod.package_name
-      else
-        fail NotImplementedError, 'may not be a module for a Tcl extension'
-      end
-    else
-      pkgname = mod.to_s
-    end
-
-    pkgname = '::' << pkgname unless pkgname =~ /^::/
-
-    tk_call(pkgname + '::pkgconfig', 'get', key)
-  end
-
-  def Tk.tcl_pkgconfig_list
-    # Tk8.5 feature
-    Tk.pkgconfig_list('::tcl')
-  end
-
-  def Tk.tcl_pkgconfig_get(key)
-    # Tk8.5 feature
-    Tk.pkgconfig_get('::tcl', key)
-  end
-
-  def Tk.tk_pkgconfig_list
-    # Tk8.5 feature
-    Tk.pkgconfig_list('::tk')
-  end
-
-  def Tk.tk_pkgconfig_get(key)
-    # Tk8.5 feature
-    Tk.pkgconfig_get('::tk', key)
-  end
-
-  def Tk.bell(nice = false)
-    if nice
-      tk_call_without_enc('bell', '-nice')
-    else
-      tk_call_without_enc('bell')
-    end
-    nil
-  end
-
-  def Tk.bell_on_display(win, nice = false)
-    if nice
-      tk_call_without_enc('bell', '-displayof', win, '-nice')
-    else
-      tk_call_without_enc('bell', '-displayof', win)
-    end
-    nil
-  end
-
-  def Tk.destroy(*wins)
-    #tk_call_without_enc('destroy', *wins)
-    tk_call_without_enc('destroy', *(wins.collect{|win|
-                                       if win.kind_of?(TkWindow)
-                                         win.epath
-                                       else
-                                         win
-                                       end
-                                     }))
-  end
-
-  def Tk.exit
-    TkCore::INTERP.has_mainwindow? && tk_call_without_enc('destroy', '.')
-  end
-
-  ################################################
-
-  def Tk.sleep(ms = nil, id = nil)
-    if id
-      var = (id.kind_of?(TkVariable))? id: TkVarAccess.new(id.to_s)
-    else
-      var = TkVariable.new
-    end
-
-    var.value = tk_call_without_enc('after', ms, proc{ var.value = 0 }) if ms
-    var.thread_wait
-    ms
-  end
-
-  def Tk.wakeup(id)
-    ((id.kind_of?(TkVariable))? id: TkVarAccess.new(id.to_s)).value = 0
-    nil
-  end
-
-  ################################################
-
-  def Tk.pack(*args)
-    TkPack.configure(*args)
-  end
-  def Tk.pack_forget(*args)
-    TkPack.forget(*args)
-  end
-  def Tk.unpack(*args)
-    TkPack.forget(*args)
-  end
-
-  def Tk.grid(*args)
-    TkGrid.configure(*args)
-  end
-  def Tk.grid_forget(*args)
-    TkGrid.forget(*args)
-  end
-  def Tk.ungrid(*args)
-    TkGrid.forget(*args)
-  end
-
-  def Tk.place(*args)
-    TkPlace.configure(*args)
-  end
-  def Tk.place_forget(*args)
-    TkPlace.forget(*args)
-  end
-  def Tk.unplace(*args)
-    TkPlace.forget(*args)
-  end
-
-  def Tk.update(idle=nil)
-    if idle
-      tk_call_without_enc('update', 'idletasks')
-    else
-      tk_call_without_enc('update')
-    end
-  end
-  def Tk.update_idletasks
-    update(true)
-  end
-  def update(idle=nil)
-    # only for backward compatibility (This never be recommended to use)
-    Tk.update(idle)
-    self
-  end
-
-  # NOTE::
-  #   If no eventloop-thread is running, "thread_update" method is same
-  #   to "update" method. Else, "thread_update" method waits to complete
-  #   idletask operation on the eventloop-thread.
-  def Tk.thread_update(idle=nil)
-    if idle
-      tk_call_without_enc('thread_update', 'idletasks')
-    else
-      tk_call_without_enc('thread_update')
-    end
-  end
-  def Tk.thread_update_idletasks
-    thread_update(true)
-  end
-
-  def Tk.lower_window(win, below=None)
-    tk_call('lower', _epath(win), _epath(below))
-    nil
-  end
-  def Tk.raise_window(win, above=None)
-    tk_call('raise', _epath(win), _epath(above))
-    nil
-  end
-
-  def Tk.current_grabs(win = nil)
-    if win
-      window(tk_call_without_enc('grab', 'current', win))
-    else
-      tk_split_list(tk_call_without_enc('grab', 'current'))
-    end
-  end
-
-  def Tk.focus(display=nil)
-    if display == nil
-      window(tk_call_without_enc('focus'))
-    else
-      window(tk_call_without_enc('focus', '-displayof', display))
-    end
-  end
-
-  def Tk.focus_to(win, force=false)
-    if force
-      tk_call_without_enc('focus', '-force', win)
-    else
-      tk_call_without_enc('focus', win)
-    end
-  end
-
-  def Tk.focus_lastfor(win)
-    window(tk_call_without_enc('focus', '-lastfor', win))
-  end
-
-  def Tk.focus_next(win)
-    TkManageFocus.next(win)
-  end
-
-  def Tk.focus_prev(win)
-    TkManageFocus.prev(win)
-  end
-
-  def Tk.strictMotif(mode=None)
-    bool(tk_call_without_enc('set', 'tk_strictMotif', mode))
-  end
-
-  def Tk.show_kinsoku(mode='both')
-    begin
-      if /^8\.*/ === TK_VERSION  && JAPANIZED_TK
-        tk_split_simplelist(tk_call('kinsoku', 'show', mode))
-      end
-    rescue
-    end
-  end
-  def Tk.add_kinsoku(chars, mode='both')
-    begin
-      if /^8\.*/ === TK_VERSION  && JAPANIZED_TK
-        tk_split_simplelist(tk_call('kinsoku', 'add', mode,
-                                    *(chars.split(''))))
-      else
-        []
-      end
-    rescue
-      []
-    end
-  end
-  def Tk.delete_kinsoku(chars, mode='both')
-    begin
-      if /^8\.*/ === TK_VERSION  && JAPANIZED_TK
-        tk_split_simplelist(tk_call('kinsoku', 'delete', mode,
-                            *(chars.split(''))))
-      end
-    rescue
-    end
-  end
-
-  def Tk.toUTF8(str, encoding = nil)
-    _toUTF8(str, encoding)
-  end
-
-  def Tk.fromUTF8(str, encoding = nil)
-    _fromUTF8(str, encoding)
-  end
-end
-
-###########################################
-#  string with Tcl's encoding
-###########################################
-module Tk
-  def Tk.subst_utf_backslash(str)
-    Tk::EncodedString.subst_utf_backslash(str)
-  end
-  def Tk.subst_tk_backslash(str)
-    Tk::EncodedString.subst_tk_backslash(str)
-  end
-  def Tk.utf_to_backslash_sequence(str)
-    Tk::EncodedString.utf_to_backslash_sequence(str)
-  end
-  def Tk.utf_to_backslash(str)
-    Tk::EncodedString.utf_to_backslash_sequence(str)
-  end
-  def Tk.to_backslash_sequence(str)
-    Tk::EncodedString.to_backslash_sequence(str)
-  end
-end
-
-
-###########################################
-#  convert kanji string to/from utf-8
-###########################################
-if (/^(8\.[1-9]|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK)
-  module Tk
-    module Encoding
-      extend Encoding
-
-      TkCommandNames = ['encoding'.freeze].freeze
-
-      #############################################
-
-      if TkCore::WITH_ENCODING ### Ruby 1.9
-        RubyEncoding = ::Encoding
-
-        # for saving GC cost
-        #ENCNAMES_CMD = ['encoding'.freeze, 'names'.freeze]
-        BINARY_NAME  = 'binary'.freeze
-        UTF8_NAME    = 'utf-8'.freeze
-        DEFAULT_EXTERNAL_NAME = RubyEncoding.default_external.name.freeze
-        DEFAULT_INTERNAL_NAME = RubyEncoding.default_internal.name.freeze rescue nil
-
-        BINARY  = RubyEncoding.find(BINARY_NAME)
-        UNKNOWN = RubyEncoding.find('ASCII-8BIT')
-
-        ### start of creating ENCODING_TABLE
-        ENCODING_TABLE = TkCore::INTERP.encoding_table
-=begin
-        ENCODING_TABLE = {
-          'binary'       => BINARY,
-          # 'UNKNOWN-8BIT' => UNKNOWN,
-        }
-
-        list = TkCore::INTERP._invoke_without_enc(ENCNAMES_CMD[0],
-                                                  ENCNAMES_CMD[1])
-        TkCore::INTERP._split_tklist(list).each{|name|
-          begin
-            enc = RubyEncoding.find(name)
-          rescue ArgumentError
-            case name
-            when 'identity'
-              enc = BINARY
-            when 'shiftjis'
-              enc = RubyEncoding.find('Shift_JIS')
-            when 'unicode'
-              enc = RubyEncoding.find('UTF-8')
-              #if Tk.tk_call('set', 'tcl_platform(byteOrder)') =='littleEndian'
-              #  enc = RubyEncoding.find('UTF-16LE')
-              #else
-              #  enc = RubyEncoding.find('UTF-16BE')
-              #end
-            when 'symbol'
-              # single byte data
-              enc = RubyEncoding.find('ASCII-8BIT') ### ???
-            else
-              # unsupported on Ruby, but supported on Tk
-              enc = TkCore::INTERP.create_dummy_encoding_for_tk(name)
-            end
-          end
-          ENCODING_TABLE[name.freeze] = enc
-        }
-=end
-=begin
-        def ENCODING_TABLE.get_name(enc)
-          orig_enc = enc
-
-          # unless enc, use system default
-          #  1st: Ruby/Tk default encoding
-          #  2nd: Tcl/Tk default encoding
-          #  3rd: Ruby's default_external
-          enc ||= TkCore::INTERP.encoding
-          enc ||= TclTkLib.encoding_system
-          enc ||= DEFAULT_EXTERNAL_NAME
-
-          if enc.kind_of?(RubyEncoding)
-            # Ruby's Encoding object
-            if (name = self.key(enc))
-              return name
-            end
-
-            # Is it new ?
-            list = TkCore::INTERP._invoke_without_enc(ENCNAMES_CMD[0],
-                                                      ENCNAMES_CMD[1])
-            TkComm.simplelist(list).each{|name|
-              if ((enc == RubyEncoding.find(name)) rescue false)
-                # new relation!! update table
-                self[name.freeze] = enc
-                return name
-              end
-            }
-          else
-            # String or Symbol ?
-            if self[name = enc.to_s]
-              return name
-            end
-
-            # Is it new ?
-            if (enc_obj = (RubyEncoding.find(name) rescue false))
-              list = TkCore::INTERP._invoke_without_enc(ENCNAMES_CMD[0],
-                                                        ENCNAMES_CMD[1])
-              if TkComm.simplelist(list).index(name)
-                # Tk's encoding name ?
-                self[name.freeze] = enc_obj  # new relation!! update table
-                return name
-              else
-                # Ruby's encoding name ?
-                if (name = self.key(enc_obj))
-                  return name
-                end
-              end
-            end
-          end
-
-          fail ArgumentError, "unsupported Tk encoding '#{orig_enc}'"
-        end
-
-        def ENCODING_TABLE.get_obj(enc)
-          # returns the encoding object.
-          # If 'enc' is the encoding name on Tk only, it returns nil.
-          ((obj = self[self.get_name(enc)]).kind_of?(RubyEncoding))? obj: nil
-        end
-=end
-        ### end of creating ENCODING_TABLE
-
-      end
-
-      #############################################
-
-      if TkCore::WITH_ENCODING
-        ################################
-        ### Ruby 1.9
-        ################################
-        def force_default_encoding(mode)
-          TkCore::INTERP.force_default_encoding = mode
-        end
-
-        def force_default_encoding?
-          TkCore::INTERP.force_default_encoding?
-        end
-
-        def default_encoding=(enc)
-          TkCore::INTERP.default_encoding = Tk::Encoding::ENCODING_TABLE.get_name(enc)
-        end
-
-        def encoding=(enc)
-          TkCore::INTERP.encoding = Tk::Encoding::ENCODING_TABLE.get_name(enc)
-        end
-
-        def encoding_name
-          Tk::Encoding::ENCODING_TABLE.get_name(TkCore::INTERP.encoding)
-        end
-        def encoding_obj
-          Tk::Encoding::ENCODING_TABLE.get_obj(TkCore::INTERP.encoding)
-        end
-        alias encoding encoding_name
-        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'))
-        end
-        def encoding_names
-          self.tk_encoding_names.find_all{|name|
-            Tk::Encoding::ENCODING_TABLE.get_name(name) rescue false
-          }
-        end
-        def encoding_objs
-          self.tk_encoding_names.map!{|name|
-            Tk::Encoding::ENCODING_TABLE.get_obj(name) rescue nil
-          }.compact
-        end
-
-        def encoding_system=(enc)
-          TclTkLib.encoding_system = Tk::Encoding::ENCODING_TABLE.get_name(enc)
-        end
-
-        def encoding_system_name
-          Tk::Encoding::ENCODING_TABLE.get_name(TclTkLib.encoding_system)
-        end
-        def encoding_system_obj
-          Tk::Encoding::ENCODING_TABLE.get_obj(TclTkLib.encoding_system)
-        end
-        alias encoding_system encoding_system_name
-
-        ################################
-      else
-        ################################
-        ### Ruby 1.8-
-        ################################
-        def force_default_encoding=(mode)
-          true
-        end
-
-        def force_default_encoding?
-          true
-        end
-
-        def default_encoding=(enc)
-          TkCore::INTERP.default_encoding = enc
-        end
-
-        def encoding=(enc)
-          TkCore::INTERP.encoding = enc
-        end
-
-        def encoding_obj
-          TkCore::INTERP.encoding
-        end
-        def encoding_name
-          TkCore::INTERP.encoding
-        end
-        alias encoding encoding_name
-        alias default_encoding encoding_name
-
-        def tk_encoding_names
-          TkComm.simplelist(Tk.tk_call('encoding', 'names'))
-        end
-        def encoding_objs
-          self.tk_encoding_names
-        end
-        def encoding_names
-          self.tk_encoding_names
-        end
-
-        def encoding_system=(enc)
-          TclTkLib.encoding_system = enc
-        end
-
-        def encoding_system_name
-          TclTkLib.encoding_system
-        end
-        def encoding_system_obj
-          TclTkLib.encoding_system
-        end
-        alias encoding_system encoding_system_name
-
-        ################################
-      end
-
-      def encoding_convertfrom(str, enc=nil)
-        enc = encoding_system_name unless enc
-        str = str.dup
-        if TkCore::WITH_ENCODING
-          if str.kind_of?(Tk::EncodedString)
-            str.__instance_variable_set('@encoding', nil)
-          else
-            str.instance_variable_set('@encoding', nil)
-          end
-          str.force_encoding('binary')
-        else
-          str.instance_variable_set('@encoding', 'binary')
-        end
-        ret = TkCore::INTERP._invoke_without_enc('encoding', 'convertfrom',
-                                                 enc, str)
-        if TkCore::WITH_ENCODING
-          ret.force_encoding('utf-8')
-        else
-          Tk::UTF8_String.new(ret)
-        end
-        ret
-      end
-      alias encoding_convert_from encoding_convertfrom
-
-      def encoding_convertto(str, enc=nil)
-        # str must be a UTF-8 string
-        enc = encoding_system_name unless enc
-        ret = TkCore::INTERP._invoke_without_enc('encoding', 'convertto',
-                                                 enc, str)
-        #ret.instance_variable_set('@encoding', 'binary')
-        if TkCore::WITH_ENCODING
-          #ret.force_encoding(Tk::Encoding::ENCODING_TABLE.get_obj('binary'))
-          ret.force_encoding(Tk::Encoding::ENCODING_TABLE.get_obj(enc))
-        end
-        ret
-      end
-      alias encoding_convert_to encoding_convertto
-
-      def encoding_dirs
-        # Tcl8.5 feature
-        TkComm.simplelist(Tk.tk_call_without_enc('encoding', 'dirs'))
-      end
-
-      def encoding_dirs=(dir_list) # an array or a Tcl's list string
-        # Tcl8.5 feature
-        Tk.tk_call_without_enc('encoding', 'dirs', dir_list)
-      end
-    end
-
-    extend Encoding
-  end
-
-  class TclTkIp
-    def force_default_encoding=(mode)
-      @force_default_encoding[0] = (mode)? true: false
-    end
-
-    def force_default_encoding?
-      @force_default_encoding[0] ||= false
-    end
-
-    def default_encoding=(name)
-      name = name.name if Tk::WITH_ENCODING && name.kind_of?(::Encoding)
-      @encoding[0] = name.to_s.dup
-    end
-
-    # from tkencoding.rb by ttate@jaist.ac.jp
-    #attr_accessor :encoding
-    def encoding=(name)
-      self.force_default_encoding = true  # for compatibility
-      self.default_encoding = name
-    end
-
-    def encoding_name
-      (@encoding[0])? @encoding[0].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])
-      else
-        (@encoding[0])? @encoding[0].dup: nil
-      end
-    end
-
-    alias __toUTF8 _toUTF8
-    alias __fromUTF8 _fromUTF8
-
-    if Object.const_defined?(:Encoding) && ::Encoding.class == Class
-      # with Encoding (Ruby 1.9+)
-      #
-      # use functions on Tcl as default.
-      # but when unsupported encoding on Tcl, use methods on Ruby.
-      #
-      def _toUTF8(str, enc = nil)
-        if enc
-          # use given encoding
-          begin
-            enc_name = Tk::Encoding::ENCODING_TABLE.get_name(enc)
-          rescue
-            # unknown encoding for Tk -> try to convert encoding on Ruby
-            str = str.dup.force_encoding(enc)
-            str.encode!(Tk::Encoding::UTF8_NAME) # modify self !!
-            return str  # if no error, probably succeed converting
-          end
-        end
-
-        enc_name ||= str.instance_variable_get(:@encoding)
-
-        enc_name ||=
-          Tk::Encoding::ENCODING_TABLE.get_name(str.encoding) rescue nil
-
-        if enc_name
-          # str has its encoding information
-          encstr = __toUTF8(str, enc_name)
-          encstr.force_encoding(Tk::Encoding::UTF8_NAME)
-          return encstr
-        else
-          # str.encoding isn't supported by Tk -> try to convert on Ruby
-          begin
-            return str.encode(Tk::Encoding::UTF8_NAME) # new string
-          rescue
-            # error -> ignore, try to use default encoding of Ruby/Tk
-          end
-        end
-
-        #enc_name ||=
-        #  Tk::Encoding::ENCODING_TABLE.get_name(Tk.encoding) rescue nil
-        enc_name ||= Tk::Encoding::ENCODING_TABLE.get_name(nil)
-
-        # is 'binary' encoding?
-        if enc_name == Tk::Encoding::BINARY_NAME
-          return str.dup.force_encoding(Tk::Encoding::BINARY_NAME)
-        end
-
-        # force default encoding?
-        if ! str.kind_of?(Tk::EncodedString) && self.force_default_encoding?
-          enc_name = Tk::Encoding::ENCODING_TABLE.get_name(Tk.default_encoding)
-        end
-
-        encstr = __toUTF8(str, enc_name)
-        encstr.force_encoding(Tk::Encoding::UTF8_NAME)
-        encstr
-      end
-      def _fromUTF8(str, enc = nil)
-        # str must be UTF-8 or binary.
-        enc_name = str.instance_variable_get(:@encoding)
-        enc_name ||=
-          Tk::Encoding::ENCODING_TABLE.get_name(str.encoding) rescue nil
-
-        # is 'binary' encoding?
-        if enc_name == Tk::Encoding::BINARY_NAME
-          return str.dup.force_encoding(Tk::Encoding::BINARY_NAME)
-        end
-
-        # get target encoding name (if enc == nil, use default encoding)
-        begin
-          enc_name = Tk::Encoding::ENCODING_TABLE.get_name(enc)
-        rescue
-          # then, enc != nil
-          # unknown encoding for Tk -> try to convert encoding on Ruby
-          str = str.dup.force_encoding(Tk::Encoding::UTF8_NAME)
-          str.encode!(enc) # modify self !!
-          return str  # if no error, probably succeed converting
-        end
-
-        encstr = __fromUTF8(str, enc_name)
-        encstr.force_encoding(Tk::Encoding::ENCODING_TABLE.get_obj(enc_name))
-        encstr
-      end
-      ###
-    else
-      # without Encoding (Ruby 1.8)
-      def _toUTF8(str, encoding = nil)
-        __toUTF8(str, encoding)
-      end
-      def _fromUTF8(str, encoding = nil)
-        __fromUTF8(str, encoding)
-      end
-      ###
-    end
-
-    alias __eval _eval
-    alias __invoke _invoke
-
-    def _eval(cmd)
-      _fromUTF8(__eval(_toUTF8(cmd)))
-    end
-
-    def _invoke(*cmds)
-      _fromUTF8(__invoke(*(cmds.collect{|cmd| _toUTF8(cmd)})))
-    end
-
-    alias _eval_with_enc _eval
-    alias _invoke_with_enc _invoke
-
-=begin
-    #### --> definition is moved to TclTkIp module
-
-    def _toUTF8(str, encoding = nil)
-      # decide encoding
-      if encoding
-        encoding = encoding.to_s
-      elsif str.kind_of?(Tk::EncodedString) && str.encoding != nil
-        encoding = str.encoding.to_s
-      elsif str.instance_variable_get(:@encoding)
-        encoding = str.instance_variable_get(:@encoding).to_s
-      elsif defined?(@encoding) && @encoding != nil
-        encoding = @encoding.to_s
-      else
-        encoding = __invoke('encoding', 'system')
-      end
-
-      # convert
-      case encoding
-      when 'utf-8', 'binary'
-        str
-      else
-        __toUTF8(str, encoding)
-      end
-    end
-
-    def _fromUTF8(str, encoding = nil)
-      unless encoding
-        if defined?(@encoding) && @encoding != nil
-          encoding = @encoding.to_s
-        else
-          encoding = __invoke('encoding', 'system')
-        end
-      end
-
-      if str.kind_of?(Tk::EncodedString)
-        if str.encoding == 'binary'
-          str
-        else
-          __fromUTF8(str, encoding)
-        end
-      elsif str.instance_variable_get(:@encoding).to_s == 'binary'
-        str
-      else
-        __fromUTF8(str, encoding)
-      end
-    end
-=end
-
-=begin
-    def _eval(cmd)
-      if defined?(@encoding) && @encoding != 'utf-8'
-        ret = if cmd.kind_of?(Tk::EncodedString)
-                case cmd.encoding
-                when 'utf-8', 'binary'
-                  __eval(cmd)
-                else
-                  __eval(_toUTF8(cmd, cmd.encoding))
-                end
-              elsif cmd.instance_variable_get(:@encoding) == 'binary'
-                __eval(cmd)
-              else
-                __eval(_toUTF8(cmd, @encoding))
-              end
-        if ret.kind_of?(String) && ret.instance_variable_get(:@encoding) == 'binary'
-          ret
-        else
-          _fromUTF8(ret, @encoding)
-        end
-      else
-        __eval(cmd)
-      end
-    end
-
-    def _invoke(*cmds)
-      if defined?(@encoding) && @encoding != 'utf-8'
-        cmds = cmds.collect{|cmd|
-          if cmd.kind_of?(Tk::EncodedString)
-            case cmd.encoding
-            when 'utf-8', 'binary'
-              cmd
-            else
-              _toUTF8(cmd, cmd.encoding)
-            end
-          elsif cmd.instance_variable_get(:@encoding) == 'binary'
-            cmd
-          else
-            _toUTF8(cmd, @encoding)
-          end
-        }
-        ret = __invoke(*cmds)
-        if ret.kind_of?(String) && ret.instance_variable_get(:@encoding) == 'binary'
-          ret
-        else
-          _fromUTF8(ret, @encoding)
-        end
-      else
-        __invoke(*cmds)
-        end
-    end
-=end
-  end
-
-  module TclTkLib
-    class << self
-      def force_default_encoding=(mode)
-        TkCore::INTERP.force_default_encoding = mode
-      end
-
-      def force_default_encoding?
-        TkCore::INTERP.force_default_encoding?
-      end
-
-      def default_encoding=(name)
-        TkCore::INTERP.default_encoding = name
-      end
-
-      alias _encoding encoding
-      alias _encoding= encoding=
-      def encoding=(name)
-        name = name.name if name.kind_of?(::Encoding) if Tk::WITH_ENCODING
-        TkCore::INTERP.encoding = name
-      end
-
-      def encoding_name
-        TkCore::INTERP.encoding
-      end
-      alias encoding encoding_name
-      alias default_encoding encoding_name
-
-      def encoding_obj
-        if Tk::WITH_ENCODING
-          Tk::Encoding.tcl2rb_encoding(TkCore::INTERP.encoding)
-        else
-          TkCore::INTERP.encoding
-        end
-      end
-    end
-  end
-
-  # estimate encoding
-  unless TkCore::WITH_ENCODING
-    case $KCODE
-    when /^e/i  # EUC
-      Tk.encoding = 'euc-jp'
-      Tk.encoding_system = 'euc-jp'
-    when /^s/i  # SJIS
-      begin
-        if Tk.encoding_system == 'cp932'
-          Tk.encoding = 'cp932'
-        else
-          Tk.encoding = 'shiftjis'
-          Tk.encoding_system = 'shiftjis'
-        end
-      rescue StandardError, NameError
-        Tk.encoding = 'shiftjis'
-        Tk.encoding_system = 'shiftjis'
-      end
-    when /^u/i  # UTF8
-      Tk.encoding = 'utf-8'
-      Tk.encoding_system = 'utf-8'
-    else        # NONE
-      if defined? DEFAULT_TK_ENCODING
-        Tk.encoding_system = DEFAULT_TK_ENCODING
-      end
-      begin
-        Tk.encoding = Tk.encoding_system
-      rescue StandardError, NameError
-        Tk.encoding = 'utf-8'
-        Tk.encoding_system = 'utf-8'
-      end
-    end
-
-  else ### Ruby 1.9 !!!!!!!!!!!!
-    # loc_enc_obj = (::Encoding.find(::Encoding.locale_charmap) rescue Tk::Encoding::UNKNOWN)
-    loc_enc_obj = ::Encoding.find("locale")
-    ext_enc_obj = ::Encoding.default_external
-    int_enc_obj = ::Encoding.default_internal || ext_enc_obj
-    tksys_enc_name = Tk::Encoding::ENCODING_TABLE.get_name(Tk.encoding_system)
-    # p [Tk.encoding, Tk.encoding_system, loc_enc_obj, ext_enc_obj]
-
-=begin
-    if ext_enc_obj == Tk::Encoding::UNKNOWN
-      if defined? DEFAULT_TK_ENCODING
-        if DEFAULT_TK_ENCODING.kind_of?(::Encoding)
-          tk_enc_name    = DEFAULT_TK_ENCODING.name
-          tksys_enc_name = DEFAULT_TK_ENCODING.name
-        else
-          tk_enc_name    = DEFAULT_TK_ENCODING
-          tksys_enc_name = DEFAULT_TK_ENCODING
-        end
-      else
-        tk_enc_name    = loc_enc_obj.name
-        tksys_enc_name = loc_enc_obj.name
-      end
-    else
-      tk_enc_name    = ext_enc_obj.name
-      tksys_enc_name = ext_enc_obj.name
-    end
-
-    # Tk.encoding = tk_enc_name
-    Tk.default_encoding = tk_enc_name
-    Tk.encoding_system = tksys_enc_name
-=end
-
-    if ext_enc_obj == Tk::Encoding::UNKNOWN
-      if loc_enc_obj == Tk::Encoding::UNKNOWN
-        # use Tk.encoding_system
-      else
-        # use locale_charmap
-        begin
-          loc_enc_name = Tk::Encoding::ENCODING_TABLE.get_name(loc_enc_obj)
-          if loc_enc_name && loc_enc_name != tksys_enc_name
-            # use locale_charmap
-            Tk.encoding_system = loc_enc_name
-          else
-            # use Tk.encoding_system
-          end
-        rescue ArgumentError
-          # unsupported encoding on Tk -> use Tk.encoding_system
-        end
-      end
-    else
-      begin
-        ext_enc_name = Tk::Encoding::ENCODING_TABLE.get_name(ext_enc_obj)
-        if ext_enc_name && ext_enc_name != tksys_enc_name
-          # use default_external
-          Tk.encoding_system = ext_enc_name
-        else
-          # use Tk.encoding_system
-        end
-      rescue ArgumentError
-        # unsupported encoding on Tk -> use Tk.encoding_system
-      end
-    end
-
-    # setup Tk.encoding
-    enc_name = nil
-
-    begin
-      default_def = DEFAULT_TK_ENCODING
-      if ::Encoding.find(default_def.to_s) != Tk::Encoding::UNKNOWN
-        enc_name = Tk::Encoding::ENCODING_TABLE.get_name(default_def)
-      end
-    rescue NameError
-      # ignore
-      enc_name = nil
-    rescue ArgumentError
-      enc_name = nil
-      fail ArgumentError,
-           "DEFAULT_TK_ENCODING has an unknown encoding #{default_def}"
-    end
-
-    unless enc_name
-      #if ext_enc_obj == Tk::Encoding::UNKNOWN
-      if int_enc_obj == Tk::Encoding::UNKNOWN
-        if loc_enc_obj == Tk::Encoding::UNKNOWN
-          # use Tk.encoding_system
-          enc_name = tksys_enc_name
-        else
-          # use locale_charmap
-          begin
-            loc_enc_name = Tk::Encoding::ENCODING_TABLE.get_name(loc_enc_obj)
-            if loc_enc_name
-              # use locale_charmap
-              enc_name = loc_enc_name
-            else
-              # use Tk.encoding_system
-              enc_name = tksys_enc_name
-            end
-          rescue ArgumentError
-            # unsupported encoding on Tk -> use Tk.encoding_system
-            enc_name = tksys_enc_name
-          end
-        end
-      else
-        begin
-          #ext_enc_name = Tk::Encoding::ENCODING_TABLE.get_name(ext_enc_obj)
-          #if ext_enc_name && ext_enc_name != tksys_enc_name
-          int_enc_name = Tk::Encoding::ENCODING_TABLE.get_name(int_enc_obj)
-          if int_enc_name
-            # use default_internal
-            enc_name = int_enc_name
-          else
-            # use Tk.encoding_system
-            enc_name = tksys_enc_name
-          end
-        rescue ArgumentError
-          # unsupported encoding on Tk -> use Tk.encoding_system
-          enc_name = tksys_enc_name
-        end
-      end
-    end
-
-    Tk.default_encoding = (enc_name)? enc_name: tksys_enc_name
-  end
-
-else
-  # dummy methods
-  module Tk
-    module Encoding
-      extend Encoding
-
-      def force_default_encoding=(mode)
-        nil
-      end
-
-      def force_default_encoding?
-        nil
-      end
-
-      def default_encoding=(enc)
-        nil
-      end
-      def default_encoding
-        nil
-      end
-
-      def encoding=(name)
-        nil
-      end
-      def encoding
-        nil
-      end
-      def encoding_names
-        nil
-      end
-      def encoding_system
-        nil
-      end
-      def encoding_system=(enc)
-        nil
-      end
-
-      def encoding_convertfrom(str, enc=None)
-        str
-      end
-      alias encoding_convert_from encoding_convertfrom
-
-      def encoding_convertto(str, enc=None)
-        str
-      end
-      alias encoding_convert_to encoding_convertto
-      def encoding_dirs
-        nil
-      end
-      def encoding_dirs=(dir_array)
-        nil
-      end
-    end
-
-    extend Encoding
-  end
-
-  class TclTkIp
-    attr_accessor :encoding
-
-    alias __eval _eval
-    alias __invoke _invoke
-
-    alias _eval_with_enc _eval
-    alias _invoke_with_enc _invoke
-  end
-end
-
-
-module TkBindCore
-  #def bind(context, cmd=Proc.new, *args)
-  #  Tk.bind(self, context, cmd, *args)
-  #end
-  def bind(context, *args)
-    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    Tk.bind(self, context, cmd, *args)
-  end
-
-  #def bind_append(context, cmd=Proc.new, *args)
-  #  Tk.bind_append(self, context, cmd, *args)
-  #end
-  def bind_append(context, *args)
-    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    Tk.bind_append(self, context, cmd, *args)
-  end
-
-  def bind_remove(context)
-    Tk.bind_remove(self, context)
-  end
-
-  def bindinfo(context=nil)
-    Tk.bindinfo(self, context)
-  end
-end
-
-
-module TkTreatFont
-  def __font_optkeys
-    ['font']
-  end
-  private :__font_optkeys
-
-  def __pathname
-    self.path
-  end
-  private :__pathname
-
-  ################################
-
-  def font_configinfo(key = nil)
-    optkeys = __font_optkeys
-    if key && !optkeys.find{|opt| opt.to_s == key.to_s}
-      fail ArgumentError, "unknown font option name `#{key}'"
-    end
-
-    win, tag = __pathname.split(':')
-
-    if key
-      pathname = [win, tag, key].join(';')
-      TkFont.used_on(pathname) ||
-        TkFont.init_widget_font(pathname, *__confinfo_cmd)
-    elsif optkeys.size == 1
-      pathname = [win, tag, optkeys[0]].join(';')
-      TkFont.used_on(pathname) ||
-        TkFont.init_widget_font(pathname, *__confinfo_cmd)
-    else
-      fonts = {}
-      optkeys.each{|k|
-        k = k.to_s
-        pathname = [win, tag, k].join(';')
-        fonts[k] =
-          TkFont.used_on(pathname) ||
-          TkFont.init_widget_font(pathname, *__confinfo_cmd)
-      }
-      fonts
-    end
-  end
-  alias fontobj font_configinfo
-
-  def font_configure(slot)
-    pathname = __pathname
-
-    slot = _symbolkey2str(slot)
-
-    __font_optkeys.each{|optkey|
-      optkey = optkey.to_s
-      l_optkey = 'latin' << optkey
-      a_optkey = 'ascii' << optkey
-      k_optkey = 'kanji' << optkey
-
-      if slot.key?(optkey)
-        fnt = slot.delete(optkey)
-        if fnt.kind_of?(TkFont)
-          slot.delete(l_optkey)
-          slot.delete(a_optkey)
-          slot.delete(k_optkey)
-
-          fnt.call_font_configure([pathname, optkey], *(__config_cmd << {}))
-          next
-        else
-          if fnt
-            if (slot.key?(l_optkey) ||
-                slot.key?(a_optkey) ||
-                slot.key?(k_optkey))
-              fnt = TkFont.new(fnt)
-
-              lfnt = slot.delete(l_optkey)
-              lfnt = slot.delete(a_optkey) if slot.key?(a_optkey)
-              kfnt = slot.delete(k_optkey)
-
-              fnt.latin_replace(lfnt) if lfnt
-              fnt.kanji_replace(kfnt) if kfnt
-
-              fnt.call_font_configure([pathname, optkey],
-                                      *(__config_cmd << {}))
-              next
-            else
-              fnt = hash_kv(fnt) if fnt.kind_of?(Hash)
-              unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-                tk_call(*(__config_cmd << "-#{optkey}" << fnt))
-              else
-                begin
-                  tk_call(*(__config_cmd << "-#{optkey}" << fnt))
-                rescue
-                  # ignore
-                end
-              end
-            end
-          end
-          next
-        end
-      end
-
-      lfnt = slot.delete(l_optkey)
-      lfnt = slot.delete(a_optkey) if slot.key?(a_optkey)
-      kfnt = slot.delete(k_optkey)
-
-      if lfnt && kfnt
-        TkFont.new(lfnt, kfnt).call_font_configure([pathname, optkey],
-                                                   *(__config_cmd << {}))
-      elsif lfnt
-        latinfont_configure([lfnt, optkey])
-      elsif kfnt
-        kanjifont_configure([kfnt, optkey])
-      end
-    }
-
-    # configure other (without font) options
-    tk_call(*(__config_cmd.concat(hash_kv(slot)))) if slot != {}
-    self
-  end
-
-  def latinfont_configure(ltn, keys=nil)
-    if ltn.kind_of?(Array)
-      key = ltn[1]
-      ltn = ltn[0]
-    else
-      key = nil
-    end
-
-    optkeys = __font_optkeys
-    if key && !optkeys.find{|opt| opt.to_s == key.to_s}
-      fail ArgumentError, "unknown font option name `#{key}'"
-    end
-
-    win, tag = __pathname.split(':')
-
-    optkeys = [key] if key
-
-    optkeys.each{|optkey|
-      optkey = optkey.to_s
-
-      pathname = [win, tag, optkey].join(';')
-
-      if (fobj = TkFont.used_on(pathname))
-        fobj = TkFont.new(fobj) # create a new TkFont object
-      elsif Tk::JAPANIZED_TK
-        fobj = fontobj          # create a new TkFont object
-      else
-        ltn = hash_kv(ltn) if ltn.kind_of?(Hash)
-        unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-          tk_call(*(__config_cmd << "-#{optkey}" << ltn))
-        else
-          begin
-            tk_call(*(__config_cmd << "-#{optkey}" << ltn))
-          rescue => e
-            # ignore
-          end
-        end
-        next
-      end
-
-      if fobj.kind_of?(TkFont)
-        if ltn.kind_of?(TkFont)
-          conf = {}
-          ltn.latin_configinfo.each{|k,val| conf[k] = val}
-          if keys
-            fobj.latin_configure(conf.update(keys))
-          else
-            fobj.latin_configure(conf)
-          end
-        else
-          fobj.latin_replace(ltn)
-        end
-      end
-
-      fobj.call_font_configure([pathname, optkey], *(__config_cmd << {}))
-    }
-    self
-  end
-  alias asciifont_configure latinfont_configure
-
-  def kanjifont_configure(knj, keys=nil)
-    if knj.kind_of?(Array)
-      key = knj[1]
-      knj = knj[0]
-    else
-      key = nil
-    end
-
-    optkeys = __font_optkeys
-    if key && !optkeys.find{|opt| opt.to_s == key.to_s}
-      fail ArgumentError, "unknown font option name `#{key}'"
-    end
-
-    win, tag = __pathname.split(':')
-
-    optkeys = [key] if key
-
-    optkeys.each{|optkey|
-      optkey = optkey.to_s
-
-      pathname = [win, tag, optkey].join(';')
-
-      if (fobj = TkFont.used_on(pathname))
-        fobj = TkFont.new(fobj) # create a new TkFont object
-      elsif Tk::JAPANIZED_TK
-        fobj = fontobj          # create a new TkFont object
-      else
-        knj = hash_kv(knj) if knj.kind_of?(Hash)
-        unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-          tk_call(*(__config_cmd << "-#{optkey}" << knj))
-        else
-          begin
-            tk_call(*(__config_cmd << "-#{optkey}" << knj))
-          rescue => e
-            # ignore
-          end
-        end
-        next
-      end
-
-      if fobj.kind_of?(TkFont)
-        if knj.kind_of?(TkFont)
-          conf = {}
-          knj.kanji_configinfo.each{|k,val| conf[k] = val}
-          if keys
-            fobj.kanji_configure(conf.update(keys))
-          else
-            fobj.kanji_configure(conf)
-          end
-        else
-          fobj.kanji_replace(knj)
-        end
-      end
-
-      fobj.call_font_configure([pathname, optkey], *(__config_cmd << {}))
-    }
-    self
-  end
-
-  def font_copy(win, wintag=nil, winkey=nil, targetkey=nil)
-    if wintag
-      if winkey
-        fnt = win.tagfontobj(wintag, winkey).dup
-      else
-        fnt = win.tagfontobj(wintag).dup
-      end
-    else
-      if winkey
-        fnt = win.fontobj(winkey).dup
-      else
-        fnt = win.fontobj.dup
-      end
-    end
-
-    if targetkey
-      fnt.call_font_configure([__pathname, targetkey], *(__config_cmd << {}))
-    else
-      fnt.call_font_configure(__pathname, *(__config_cmd << {}))
-    end
-    self
-  end
-
-  def latinfont_copy(win, wintag=nil, winkey=nil, targetkey=nil)
-    if targetkey
-      fontobj(targetkey).dup.call_font_configure([__pathname, targetkey],
-                                                 *(__config_cmd << {}))
-    else
-      fontobj.dup.call_font_configure(__pathname, *(__config_cmd << {}))
-    end
-
-    if wintag
-      if winkey
-        fontobj.latin_replace(win.tagfontobj(wintag, winkey).latin_font_id)
-      else
-        fontobj.latin_replace(win.tagfontobj(wintag).latin_font_id)
-      end
-    else
-      if winkey
-        fontobj.latin_replace(win.fontobj(winkey).latin_font_id)
-      else
-        fontobj.latin_replace(win.fontobj.latin_font_id)
-      end
-    end
-    self
-  end
-  alias asciifont_copy latinfont_copy
-
-  def kanjifont_copy(win, wintag=nil, winkey=nil, targetkey=nil)
-    if targetkey
-      fontobj(targetkey).dup.call_font_configure([__pathname, targetkey],
-                                                 *(__config_cmd << {}))
-    else
-        fontobj.dup.call_font_configure(__pathname, *(__config_cmd << {}))
-    end
-
-    if wintag
-      if winkey
-        fontobj.kanji_replace(win.tagfontobj(wintag, winkey).kanji_font_id)
-      else
-        fontobj.kanji_replace(win.tagfontobj(wintag).kanji_font_id)
-      end
-    else
-      if winkey
-        fontobj.kanji_replace(win.fontobj(winkey).kanji_font_id)
-      else
-        fontobj.kanji_replace(win.fontobj.kanji_font_id)
-      end
-    end
-    self
-  end
-end
-
-
-module TkConfigMethod
-  include TkUtil
-  include TkTreatFont
-
-  def TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-    @mode || false
-  end
-  def TkConfigMethod.__set_IGNORE_UNKNOWN_CONFIGURE_OPTION__!(mode)
-    @mode = (mode)? true: false
-  end
-
-  def __cget_cmd
-    [self.path, 'cget']
-  end
-  private :__cget_cmd
-
-  def __config_cmd
-    [self.path, 'configure']
-  end
-  private :__config_cmd
-
-  def __confinfo_cmd
-    __config_cmd
-  end
-  private :__confinfo_cmd
-
-  def __configinfo_struct
-    {:key=>0, :alias=>1, :db_name=>1, :db_class=>2,
-      :default_value=>3, :current_value=>4}
-  end
-  private :__configinfo_struct
-
-  def __optkey_aliases
-    {}
-  end
-  private :__optkey_aliases
-
-  def __numval_optkeys
-    []
-  end
-  private :__numval_optkeys
-
-  def __numstrval_optkeys
-    []
-  end
-  private :__numstrval_optkeys
-
-  def __boolval_optkeys
-    ['exportselection', 'jump', 'setgrid', 'takefocus']
-  end
-  private :__boolval_optkeys
-
-  def __strval_optkeys
-    [
-      'text', 'label', 'show', 'data', 'file',
-      'activebackground', 'activeforeground', 'background',
-      'disabledforeground', 'disabledbackground', 'foreground',
-      'highlightbackground', 'highlightcolor', 'insertbackground',
-      'selectbackground', 'selectforeground', 'troughcolor'
-    ]
-  end
-  private :__strval_optkeys
-
-  def __listval_optkeys
-    []
-  end
-  private :__listval_optkeys
-
-  def __numlistval_optkeys
-    []
-  end
-  private :__numlistval_optkeys
-
-  def __tkvariable_optkeys
-    ['variable', 'textvariable']
-  end
-  private :__tkvariable_optkeys
-
-  def __val2ruby_optkeys  # { key=>proc, ... }
-    # The method is used to convert a opt-value to a ruby's object.
-    # When get the value of the option "key", "proc.call(value)" is called.
-    {}
-  end
-  private :__val2ruby_optkeys
-
-  def __ruby2val_optkeys  # { key=>proc, ... }
-    # The method is used to convert a ruby's object to a opt-value.
-    # When set the value of the option "key", "proc.call(value)" is called.
-    # That is, "-#{key} #{proc.call(value)}".
-    {}
-  end
-  private :__ruby2val_optkeys
-
-  def __methodcall_optkeys  # { key=>method, ... }
-    # The method is used to both of get and set.
-    # Usually, the 'key' will not be a widget option.
-    {}
-  end
-  private :__methodcall_optkeys
-
-  def __keyonly_optkeys  # { def_key=>undef_key or nil, ... }
-    {}
-  end
-  private :__keyonly_optkeys
-
-  def __conv_keyonly_opts(keys)
-    return keys unless keys.kind_of?(Hash)
-    keyonly = __keyonly_optkeys
-    keys2 = {}
-    keys.each{|k, v|
-      optkey = keyonly.find{|kk,vv| kk.to_s == k.to_s}
-      if optkey
-        defkey, undefkey = optkey
-        if v
-          keys2[defkey.to_s] = None
-        elsif undefkey
-          keys2[undefkey.to_s] = None
-        else
-          # remove key
-        end
-      else
-        keys2[k.to_s] = v
-      end
-    }
-    keys2
-  end
-  private :__conv_keyonly_opts
-
-  def config_hash_kv(keys, enc_mode = nil, conf = nil)
-    hash_kv(__conv_keyonly_opts(keys), enc_mode, conf)
-  end
-
-  ################################
-
-  def [](id)
-    cget(id)
-  end
-
-  def []=(id, val)
-    configure(id, val)
-    val
-  end
-
-  def cget_tkstring(option)
-    opt = option.to_s
-    fail ArgumentError, "Invalid option `#{option.inspect}'" if opt.length == 0
-    tk_call_without_enc(*(__cget_cmd << "-#{opt}"))
-  end
-
-  def __cget_core(slot)
-    orig_slot = slot
-    slot = slot.to_s
-
-    if slot.length == 0
-      fail ArgumentError, "Invalid option `#{orig_slot.inspect}'"
-    end
-
-    alias_name, real_name = __optkey_aliases.find{|k, v| k.to_s == slot}
-    if real_name
-      slot = real_name.to_s
-    end
-
-    if ( method = _symbolkey2str(__val2ruby_optkeys())[slot] )
-      optval = tk_call_without_enc(*(__cget_cmd << "-#{slot}"))
-      begin
-        return method.call(optval)
-      rescue => e
-        warn("Warning:: #{e.message} (when #{method}.call(#{optval.inspect})") if $DEBUG
-        return optval
-      end
-    end
-
-    if ( method = _symbolkey2str(__methodcall_optkeys)[slot] )
-      return self.__send__(method)
-    end
-
-    case slot
-    when /^(#{__numval_optkeys.join('|')})$/
-      begin
-        number(tk_call_without_enc(*(__cget_cmd << "-#{slot}")))
-      rescue
-        nil
-      end
-
-    when /^(#{__numstrval_optkeys.join('|')})$/
-      num_or_str(tk_call_without_enc(*(__cget_cmd << "-#{slot}")))
-
-    when /^(#{__boolval_optkeys.join('|')})$/
-      begin
-        bool(tk_call_without_enc(*(__cget_cmd << "-#{slot}")))
-      rescue
-        nil
-      end
-
-    when /^(#{__listval_optkeys.join('|')})$/
-      simplelist(tk_call_without_enc(*(__cget_cmd << "-#{slot}")))
-
-    when /^(#{__numlistval_optkeys.join('|')})$/
-      conf = tk_call_without_enc(*(__cget_cmd << "-#{slot}"))
-      if conf =~ /^[0-9+-]/
-        list(conf)
-      else
-        conf
-      end
-
-    when /^(#{__strval_optkeys.join('|')})$/
-      _fromUTF8(tk_call_without_enc(*(__cget_cmd << "-#{slot}")))
-
-    when /^(|latin|ascii|kanji)(#{__font_optkeys.join('|')})$/
-      fontcode = $1
-      fontkey  = $2
-      fnt = tk_tcl2ruby(tk_call_without_enc(*(__cget_cmd << "-#{fontkey}")), true)
-      unless fnt.kind_of?(TkFont)
-        fnt = fontobj(fontkey)
-      end
-      if fontcode == 'kanji' && JAPANIZED_TK && TK_VERSION =~ /^4\.*/
-        # obsolete; just for compatibility
-        fnt.kanji_font
-      else
-        fnt
-      end
-
-    when /^(#{__tkvariable_optkeys.join('|')})$/
-      v = tk_call_without_enc(*(__cget_cmd << "-#{slot}"))
-      (v.empty?)? nil: TkVarAccess.new(v)
-
-    else
-      tk_tcl2ruby(tk_call_without_enc(*(__cget_cmd << "-#{slot}")), true)
-    end
-  end
-  private :__cget_core
-
-  def cget(slot)
-    unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-      __cget_core(slot)
-    else
-      begin
-        __cget_core(slot)
-      rescue => e
-        if current_configinfo.has_key?(slot.to_s)
-          # error on known option
-          fail e
-        else
-          # unknown option
-          nil
-        end
-      end
-    end
-  end
-  def cget_strict(slot)
-    # never use TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-    __cget_core(slot)
-  end
-
-  def __configure_core(slot, value=None)
-    if slot.kind_of? Hash
-      slot = _symbolkey2str(slot)
-
-      __optkey_aliases.each{|alias_name, real_name|
-        alias_name = alias_name.to_s
-        if slot.has_key?(alias_name)
-          slot[real_name.to_s] = slot.delete(alias_name)
-        end
-      }
-
-      __methodcall_optkeys.each{|key, method|
-        value = slot.delete(key.to_s)
-        self.__send__(method, value) if value
-      }
-
-      __ruby2val_optkeys.each{|key, method|
-        key = key.to_s
-        slot[key] = method.call(slot[key]) if slot.has_key?(key)
-      }
-
-      __keyonly_optkeys.each{|defkey, undefkey|
-        conf = slot.find{|kk, vv| kk == defkey.to_s}
-        if conf
-          k, v = conf
-          if v
-            slot[k] = None
-          else
-            slot[undefkey.to_s] = None if undefkey
-            slot.delete(k)
-          end
-        end
-      }
-
-      if (slot.find{|k, v| k =~ /^(|latin|ascii|kanji)(#{__font_optkeys.join('|')})$/})
-        font_configure(slot)
-      elsif slot.size > 0
-        tk_call(*(__config_cmd.concat(hash_kv(slot))))
-      end
-
-    else
-      orig_slot = slot
-      slot = slot.to_s
-      if slot.length == 0
-        fail ArgumentError, "Invalid option `#{orig_slot.inspect}'"
-      end
-
-      alias_name, real_name = __optkey_aliases.find{|k, v| k.to_s == slot}
-      if real_name
-        slot = real_name.to_s
-      end
-
-      if ( conf = __keyonly_optkeys.find{|k, v| k.to_s == slot} )
-        defkey, undefkey = conf
-        if value
-          tk_call(*(__config_cmd << "-#{defkey}"))
-        elsif undefkey
-          tk_call(*(__config_cmd << "-#{undefkey}"))
-        end
-      elsif ( method = _symbolkey2str(__ruby2val_optkeys)[slot] )
-        tk_call(*(__config_cmd << "-#{slot}" << method.call(value)))
-      elsif ( method = _symbolkey2str(__methodcall_optkeys)[slot] )
-        self.__send__(method, value)
-      elsif (slot =~ /^(|latin|ascii|kanji)(#{__font_optkeys.join('|')})$/)
-        if value == None
-          fontobj($2)
-        else
-          font_configure({slot=>value})
-        end
-      else
-        tk_call(*(__config_cmd << "-#{slot}" << value))
-      end
-    end
-    self
-  end
-  private :__configure_core
-
-  def __check_available_configure_options(keys)
-    availables = self.current_configinfo.keys
-
-    # add non-standard keys
-    availables |= __font_optkeys.map{|k|
-      [k.to_s, "latin#{k}", "ascii#{k}", "kanji#{k}"]
-    }.flatten
-    availables |= __methodcall_optkeys.keys.map{|k| k.to_s}
-    availables |= __keyonly_optkeys.keys.map{|k| k.to_s}
-
-    keys = _symbolkey2str(keys)
-    keys.delete_if{|k, v| !(availables.include?(k))}
-  end
-
-  def configure(slot, value=None)
-    unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-      __configure_core(slot, value)
-    else
-      if slot.kind_of?(Hash)
-        begin
-          __configure_core(slot)
-        rescue
-          slot = __check_available_configure_options(slot)
-          __configure_core(slot) unless slot.empty?
-        end
-      else
-        begin
-          __configure_core(slot, value)
-        rescue => e
-          if current_configinfo.has_key?(slot.to_s)
-            # error on known option
-            fail e
-          else
-            # unknown option
-            nil
-          end
-        end
-      end
-    end
-    self
-  end
-
-  def configure_cmd(slot, value)
-    configure(slot, install_cmd(value))
-  end
-
-  def __configinfo_core(slot = nil)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if (slot &&
-          slot.to_s =~ /^(|latin|ascii|kanji)(#{__font_optkeys.join('|')})$/)
-        fontkey  = $2
-        # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{fontkey}"))))
-        conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{fontkey}")), false, true)
-        conf[__configinfo_struct[:key]] =
-          conf[__configinfo_struct[:key]][1..-1]
-        if ( ! __configinfo_struct[:alias] \
-            || conf.size > __configinfo_struct[:alias] + 1 )
-          fnt = conf[__configinfo_struct[:default_value]]
-          if TkFont.is_system_font?(fnt)
-            conf[__configinfo_struct[:default_value]] = TkNamedFont.new(fnt)
-          end
-          conf[__configinfo_struct[:current_value]] = fontobj(fontkey)
-        elsif ( __configinfo_struct[:alias] \
-               && conf.size == __configinfo_struct[:alias] + 1 \
-               && conf[__configinfo_struct[:alias]][0] == ?- )
-          conf[__configinfo_struct[:alias]] =
-            conf[__configinfo_struct[:alias]][1..-1]
-        end
-        conf
-      else
-        if slot
-          slot = slot.to_s
-
-          alias_name, real_name = __optkey_aliases.find{|k, v| k.to_s == slot}
-          if real_name
-            slot = real_name.to_s
-          end
-
-          case slot
-          when /^(#{__val2ruby_optkeys().keys.join('|')})$/
-            method = _symbolkey2str(__val2ruby_optkeys())[slot]
-            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd() << "-#{slot}")), false, true)
-            if ( __configinfo_struct[:default_value] \
-                && conf[__configinfo_struct[:default_value]] )
-              optval = conf[__configinfo_struct[:default_value]]
-              begin
-                val = method.call(optval)
-              rescue => e
-                warn("Warning:: #{e.message} (when #{method}.call(#{optval.inspect})") if $DEBUG
-                val = optval
-              end
-              conf[__configinfo_struct[:default_value]] = val
-            end
-            if ( conf[__configinfo_struct[:current_value]] )
-              optval = conf[__configinfo_struct[:current_value]]
-              begin
-                val = method.call(optval)
-              rescue => e
-                warn("Warning:: #{e.message} (when #{method}.call(#{optval.inspect})") if $DEBUG
-                val = optval
-              end
-              conf[__configinfo_struct[:current_value]] = val
-            end
-
-          when /^(#{__methodcall_optkeys.keys.join('|')})$/
-            method = _symbolkey2str(__methodcall_optkeys)[slot]
-            return [slot, '', '', '', self.__send__(method)]
-
-          when /^(#{__numval_optkeys.join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
-
-            if ( __configinfo_struct[:default_value] \
-                && conf[__configinfo_struct[:default_value]])
-              begin
-                conf[__configinfo_struct[:default_value]] =
-                  number(conf[__configinfo_struct[:default_value]])
-              rescue
-                conf[__configinfo_struct[:default_value]] = nil
-              end
-            end
-            if ( conf[__configinfo_struct[:current_value]] )
-              begin
-                conf[__configinfo_struct[:current_value]] =
-                  number(conf[__configinfo_struct[:current_value]])
-              rescue
-                conf[__configinfo_struct[:current_value]] = nil
-              end
-            end
-
-          when /^(#{__numstrval_optkeys.join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
-
-            if ( __configinfo_struct[:default_value] \
-                && conf[__configinfo_struct[:default_value]])
-              conf[__configinfo_struct[:default_value]] =
-                num_or_str(conf[__configinfo_struct[:default_value]])
-            end
-            if ( conf[__configinfo_struct[:current_value]] )
-              conf[__configinfo_struct[:current_value]] =
-                num_or_str(conf[__configinfo_struct[:current_value]])
-            end
-
-          when /^(#{__boolval_optkeys.join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
-
-            if ( __configinfo_struct[:default_value] \
-                && conf[__configinfo_struct[:default_value]])
-              begin
-                conf[__configinfo_struct[:default_value]] =
-                  bool(conf[__configinfo_struct[:default_value]])
-              rescue
-                conf[__configinfo_struct[:default_value]] = nil
-              end
-            end
-            if ( conf[__configinfo_struct[:current_value]] )
-              begin
-                conf[__configinfo_struct[:current_value]] =
-                  bool(conf[__configinfo_struct[:current_value]])
-              rescue
-                conf[__configinfo_struct[:current_value]] = nil
-              end
-            end
-
-          when /^(#{__listval_optkeys.join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
-
-            if ( __configinfo_struct[:default_value] \
-                && conf[__configinfo_struct[:default_value]])
-              conf[__configinfo_struct[:default_value]] =
-                simplelist(conf[__configinfo_struct[:default_value]])
-            end
-            if ( conf[__configinfo_struct[:current_value]] )
-              conf[__configinfo_struct[:current_value]] =
-                simplelist(conf[__configinfo_struct[:current_value]])
-            end
-
-          when /^(#{__numlistval_optkeys.join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
-
-            if ( __configinfo_struct[:default_value] \
-                && conf[__configinfo_struct[:default_value]] \
-                && conf[__configinfo_struct[:default_value]] =~ /^[0-9]/ )
-              conf[__configinfo_struct[:default_value]] =
-                list(conf[__configinfo_struct[:default_value]])
-            end
-            if ( conf[__configinfo_struct[:current_value]] \
-                && conf[__configinfo_struct[:current_value]] =~ /^[0-9]/ )
-              conf[__configinfo_struct[:current_value]] =
-                list(conf[__configinfo_struct[:current_value]])
-            end
-
-          when /^(#{__strval_optkeys.join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
-
-          when /^(#{__tkvariable_optkeys.join('|')})$/
-            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
-
-            if ( __configinfo_struct[:default_value] \
-                && conf[__configinfo_struct[:default_value]])
-              v = conf[__configinfo_struct[:default_value]]
-              if v.empty?
-                conf[__configinfo_struct[:default_value]] = nil
-              else
-                conf[__configinfo_struct[:default_value]] = TkVarAccess.new(v)
-              end
-            end
-            if ( conf[__configinfo_struct[:current_value]] )
-              v = conf[__configinfo_struct[:current_value]]
-              if v.empty?
-                conf[__configinfo_struct[:current_value]] = nil
-              else
-                conf[__configinfo_struct[:current_value]] = TkVarAccess.new(v)
-              end
-            end
-
-          else
-            # conf = tk_split_list(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
-            # conf = tk_split_list(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), 0, false, true)
-            conf = tk_split_list(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), 1, false, true)
-          end
-          conf[__configinfo_struct[:key]] =
-            conf[__configinfo_struct[:key]][1..-1]
-
-          if ( __configinfo_struct[:alias] \
-              && conf.size == __configinfo_struct[:alias] + 1 \
-              && conf[__configinfo_struct[:alias]][0] == ?- )
-            conf[__configinfo_struct[:alias]] =
-              conf[__configinfo_struct[:alias]][1..-1]
-          end
-
-          conf
-
-        else
-          # ret = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*__confinfo_cmd))).collect{|conflist|
-          #  conf = tk_split_simplelist(conflist)
-          ret = tk_split_simplelist(tk_call_without_enc(*__confinfo_cmd), false, false).collect{|conflist|
-            conf = tk_split_simplelist(conflist, false, true)
-            conf[__configinfo_struct[:key]] =
-              conf[__configinfo_struct[:key]][1..-1]
-
-            optkey = conf[__configinfo_struct[:key]]
-            case optkey
-            when /^(#{__val2ruby_optkeys().keys.join('|')})$/
-              method = _symbolkey2str(__val2ruby_optkeys())[optkey]
-              if ( __configinfo_struct[:default_value] \
-                  && conf[__configinfo_struct[:default_value]] )
-                optval = conf[__configinfo_struct[:default_value]]
-                begin
-                  val = method.call(optval)
-                rescue => e
-                  warn("Warning:: #{e.message} (when #{method}.call(#{optval.inspect})") if $DEBUG
-                  val = optval
-                end
-                conf[__configinfo_struct[:default_value]] = val
-              end
-              if ( conf[__configinfo_struct[:current_value]] )
-                optval = conf[__configinfo_struct[:current_value]]
-                begin
-                  val = method.call(optval)
-                rescue => e
-                  warn("Warning:: #{e.message} (when #{method}.call(#{optval.inspect})") if $DEBUG
-                  val = optval
-                end
-                conf[__configinfo_struct[:current_value]] = val
-              end
-
-            when /^(#{__strval_optkeys.join('|')})$/
-              # do nothing
-
-            when /^(#{__numval_optkeys.join('|')})$/
-              if ( __configinfo_struct[:default_value] \
-                  && conf[__configinfo_struct[:default_value]] )
-                begin
-                  conf[__configinfo_struct[:default_value]] =
-                    number(conf[__configinfo_struct[:default_value]])
-                rescue
-                  conf[__configinfo_struct[:default_value]] = nil
-                end
-              end
-              if ( conf[__configinfo_struct[:current_value]] )
-                begin
-                  conf[__configinfo_struct[:current_value]] =
-                    number(conf[__configinfo_struct[:current_value]])
-                rescue
-                  conf[__configinfo_struct[:current_value]] = nil
-                end
-              end
-
-            when /^(#{__numstrval_optkeys.join('|')})$/
-              if ( __configinfo_struct[:default_value] \
-                  && conf[__configinfo_struct[:default_value]] )
-                conf[__configinfo_struct[:default_value]] =
-                  num_or_str(conf[__configinfo_struct[:default_value]])
-              end
-              if ( conf[__configinfo_struct[:current_value]] )
-                conf[__configinfo_struct[:current_value]] =
-                  num_or_str(conf[__configinfo_struct[:current_value]])
-              end
-
-            when /^(#{__boolval_optkeys.join('|')})$/
-              if ( __configinfo_struct[:default_value] \
-                  && conf[__configinfo_struct[:default_value]] )
-                begin
-                  conf[__configinfo_struct[:default_value]] =
-                    bool(conf[__configinfo_struct[:default_value]])
-                rescue
-                  conf[__configinfo_struct[:default_value]] = nil
-                end
-              end
-              if ( conf[__configinfo_struct[:current_value]] )
-                begin
-                  conf[__configinfo_struct[:current_value]] =
-                    bool(conf[__configinfo_struct[:current_value]])
-                rescue
-                  conf[__configinfo_struct[:current_value]] = nil
-                end
-              end
-
-            when /^(#{__listval_optkeys.join('|')})$/
-              if ( __configinfo_struct[:default_value] \
-                  && conf[__configinfo_struct[:default_value]] )
-                conf[__configinfo_struct[:default_value]] =
-                  simplelist(conf[__configinfo_struct[:default_value]])
-              end
-              if ( conf[__configinfo_struct[:current_value]] )
-                conf[__configinfo_struct[:current_value]] =
-                  simplelist(conf[__configinfo_struct[:current_value]])
-              end
-
-            when /^(#{__numlistval_optkeys.join('|')})$/
-              if ( __configinfo_struct[:default_value] \
-                  && conf[__configinfo_struct[:default_value]] \
-                  && conf[__configinfo_struct[:default_value]] =~ /^[0-9]/ )
-                conf[__configinfo_struct[:default_value]] =
-                  list(conf[__configinfo_struct[:default_value]])
-              end
-              if ( conf[__configinfo_struct[:current_value]] \
-                  && conf[__configinfo_struct[:current_value]] =~ /^[0-9]/ )
-                conf[__configinfo_struct[:current_value]] =
-                  list(conf[__configinfo_struct[:current_value]])
-              end
-
-            when /^(#{__tkvariable_optkeys.join('|')})$/
-              if ( __configinfo_struct[:default_value] \
-                  && conf[__configinfo_struct[:default_value]] )
-                v = conf[__configinfo_struct[:default_value]]
-                if v.empty?
-                  conf[__configinfo_struct[:default_value]] = nil
-                else
-                  conf[__configinfo_struct[:default_value]] = TkVarAccess.new(v)
-                end
-              end
-              if ( conf[__configinfo_struct[:current_value]] )
-                v = conf[__configinfo_struct[:current_value]]
-                if v.empty?
-                  conf[__configinfo_struct[:current_value]] = nil
-                else
-                  conf[__configinfo_struct[:current_value]] = TkVarAccess.new(v)
-                end
-              end
-
-            else
-              if ( __configinfo_struct[:default_value] \
-                  && conf[__configinfo_struct[:default_value]] )
-                if conf[__configinfo_struct[:default_value]].index('{')
-                  conf[__configinfo_struct[:default_value]] =
-                    tk_split_list(conf[__configinfo_struct[:default_value]])
-                else
-                  conf[__configinfo_struct[:default_value]] =
-                    tk_tcl2ruby(conf[__configinfo_struct[:default_value]])
-                end
-              end
-              if conf[__configinfo_struct[:current_value]]
-                if conf[__configinfo_struct[:current_value]].index('{')
-                  conf[__configinfo_struct[:current_value]] =
-                    tk_split_list(conf[__configinfo_struct[:current_value]])
-                else
-                  conf[__configinfo_struct[:current_value]] =
-                    tk_tcl2ruby(conf[__configinfo_struct[:current_value]])
-                end
-              end
-            end
-
-            if ( __configinfo_struct[:alias] \
-                && conf.size == __configinfo_struct[:alias] + 1 \
-                && conf[__configinfo_struct[:alias]][0] == ?- )
-              conf[__configinfo_struct[:alias]] =
-                conf[__configinfo_struct[:alias]][1..-1]
-            end
-
-            conf
-          }
-
-          __font_optkeys.each{|optkey|
-            optkey = optkey.to_s
-            fontconf = ret.assoc(optkey)
-            if fontconf && fontconf.size > 2
-              ret.delete_if{|inf| inf[0] =~ /^(|latin|ascii|kanji)#{optkey}$/}
-              fnt = fontconf[__configinfo_struct[:default_value]]
-              if TkFont.is_system_font?(fnt)
-                fontconf[__configinfo_struct[:default_value]] \
-                  = TkNamedFont.new(fnt)
-              end
-              fontconf[__configinfo_struct[:current_value]] = fontobj(optkey)
-              ret.push(fontconf)
-            end
-          }
-
-          __methodcall_optkeys.each{|optkey, m|
-            ret << [optkey.to_s, '', '', '', self.__send__(m)]
-          }
-
-          ret
-        end
-      end
-
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      if (slot &&
-          slot.to_s =~ /^(|latin|ascii|kanji)(#{__font_optkeys.join('|')})$/)
-        fontkey  = $2
-        # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{fontkey}"))))
-        conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{fontkey}")), false, true)
-        conf[__configinfo_struct[:key]] =
-          conf[__configinfo_struct[:key]][1..-1]
-
-        if ( ! __configinfo_struct[:alias] \
-            || conf.size > __configinfo_struct[:alias] + 1 )
-          fnt = conf[__configinfo_struct[:default_value]]
-          if TkFont.is_system_font?(fnt)
-            conf[__configinfo_struct[:default_value]] = TkNamedFont.new(fnt)
-          end
-          conf[__configinfo_struct[:current_value]] = fontobj(fontkey)
-          { conf.shift => conf }
-        elsif ( __configinfo_struct[:alias] \
-               && conf.size == __configinfo_struct[:alias] + 1 )
-          if conf[__configinfo_struct[:alias]][0] == ?-
-            conf[__configinfo_struct[:alias]] =
-              conf[__configinfo_struct[:alias]][1..-1]
-          end
-          { conf[0] => conf[1] }
-        else
-          { conf.shift => conf }
-        end
-      else
-        if slot
-          slot = slot.to_s
-
-          alias_name, real_name = __optkey_aliases.find{|k,var| k.to_s == slot}
-          if real_name
-            slot = real_name.to_s
-          end
-
-          case slot
-          when /^(#{__val2ruby_optkeys().keys.join('|')})$/
-            method = _symbolkey2str(__val2ruby_optkeys())[slot]
-            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
-            if ( __configinfo_struct[:default_value] \
-                && conf[__configinfo_struct[:default_value]] )
-              optval = conf[__configinfo_struct[:default_value]]
-              begin
-                val = method.call(optval)
-              rescue => e
-                warn("Warning:: #{e.message} (when #{method}.call(#{optval.inspect})") if $DEBUG
-                val = optval
-              end
-              conf[__configinfo_struct[:default_value]] = val
-            end
-            if ( conf[__configinfo_struct[:current_value]] )
-              optval = conf[__configinfo_struct[:current_value]]
-              begin
-                val = method.call(optval)
-              rescue => e
-                warn("Warning:: #{e.message} (when #{method}.call(#{optval.inspect})") if $DEBUG
-                val = optval
-              end
-              conf[__configinfo_struct[:current_value]] = val
-            end
-
-          when /^(#{__methodcall_optkeys.keys.join('|')})$/
-            method = _symbolkey2str(__methodcall_optkeys)[slot]
-            return {slot => ['', '', '', self.__send__(method)]}
-
-          when /^(#{__numval_optkeys.join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
-
-            if ( __configinfo_struct[:default_value] \
-                && conf[__configinfo_struct[:default_value]] )
-              begin
-                conf[__configinfo_struct[:default_value]] =
-                  number(conf[__configinfo_struct[:default_value]])
-              rescue
-                conf[__configinfo_struct[:default_value]] = nil
-              end
-            end
-            if ( conf[__configinfo_struct[:current_value]] )
-              begin
-                conf[__configinfo_struct[:current_value]] =
-                  number(conf[__configinfo_struct[:current_value]])
-              rescue
-                conf[__configinfo_struct[:current_value]] = nil
-              end
-            end
-
-          when /^(#{__numstrval_optkeys.join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
-
-            if ( __configinfo_struct[:default_value] \
-                && conf[__configinfo_struct[:default_value]] )
-              conf[__configinfo_struct[:default_value]] =
-                num_or_str(conf[__configinfo_struct[:default_value]])
-            end
-            if ( conf[__configinfo_struct[:current_value]] )
-              conf[__configinfo_struct[:current_value]] =
-                num_or_str(conf[__configinfo_struct[:current_value]])
-            end
-
-          when /^(#{__boolval_optkeys.join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
-
-            if ( __configinfo_struct[:default_value] \
-                && conf[__configinfo_struct[:default_value]] )
-              begin
-                conf[__configinfo_struct[:default_value]] =
-                  bool(conf[__configinfo_struct[:default_value]])
-              rescue
-                conf[__configinfo_struct[:default_value]] = nil
-              end
-            end
-            if ( conf[__configinfo_struct[:current_value]] )
-              begin
-                conf[__configinfo_struct[:current_value]] =
-                  bool(conf[__configinfo_struct[:current_value]])
-              rescue
-                conf[__configinfo_struct[:current_value]] = nil
-              end
-            end
-
-          when /^(#{__listval_optkeys.join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
-
-            if ( __configinfo_struct[:default_value] \
-                && conf[__configinfo_struct[:default_value]] )
-              conf[__configinfo_struct[:default_value]] =
-                simplelist(conf[__configinfo_struct[:default_value]])
-            end
-            if ( conf[__configinfo_struct[:current_value]] )
-              conf[__configinfo_struct[:current_value]] =
-                simplelist(conf[__configinfo_struct[:current_value]])
-            end
-
-          when /^(#{__numlistval_optkeys.join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
-
-            if ( __configinfo_struct[:default_value] \
-                && conf[__configinfo_struct[:default_value]] \
-                && conf[__configinfo_struct[:default_value]] =~ /^[0-9]/ )
-              conf[__configinfo_struct[:default_value]] =
-                list(conf[__configinfo_struct[:default_value]])
-            end
-            if ( conf[__configinfo_struct[:current_value]] \
-                && conf[__configinfo_struct[:current_value]] =~ /^[0-9]/ )
-              conf[__configinfo_struct[:current_value]] =
-                list(conf[__configinfo_struct[:current_value]])
-            end
-
-          when /^(#{__tkvariable_optkeys.join('|')})$/
-            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
-
-            if ( __configinfo_struct[:default_value] \
-                && conf[__configinfo_struct[:default_value]] )
-              v = conf[__configinfo_struct[:default_value]]
-              if v.empty?
-                conf[__configinfo_struct[:default_value]] = nil
-              else
-                conf[__configinfo_struct[:default_value]] = TkVarAccess.new(v)
-              end
-            end
-            if ( conf[__configinfo_struct[:current_value]] )
-              v = conf[__configinfo_struct[:current_value]]
-              if v.empty?
-                conf[__configinfo_struct[:current_value]] = nil
-              else
-                conf[__configinfo_struct[:current_value]] = TkVarAccess.new(v)
-              end
-            end
-
-          when /^(#{__strval_optkeys.join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
-          else
-            # conf = tk_split_list(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
-            conf = tk_split_list(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), 0, false, true)
-          end
-          conf[__configinfo_struct[:key]] =
-            conf[__configinfo_struct[:key]][1..-1]
-
-          if ( __configinfo_struct[:alias] \
-              && conf.size == __configinfo_struct[:alias] + 1 )
-            if conf[__configinfo_struct[:alias]][0] == ?-
-              conf[__configinfo_struct[:alias]] =
-                conf[__configinfo_struct[:alias]][1..-1]
-            end
-            { conf[0] => conf[1] }
-          else
-            { conf.shift => conf }
-          end
-
-        else
-          ret = {}
-          # tk_split_simplelist(_fromUTF8(tk_call_without_enc(*__confinfo_cmd))).each{|conflist|
-          #  conf = tk_split_simplelist(conflist)
-          tk_split_simplelist(tk_call_without_enc(*__confinfo_cmd), false, false).each{|conflist|
-            conf = tk_split_simplelist(conflist, false, true)
-            conf[__configinfo_struct[:key]] =
-              conf[__configinfo_struct[:key]][1..-1]
-
-            optkey = conf[__configinfo_struct[:key]]
-            case optkey
-            when /^(#{__val2ruby_optkeys().keys.join('|')})$/
-              method = _symbolkey2str(__val2ruby_optkeys())[optkey]
-              if ( __configinfo_struct[:default_value] \
-                  && conf[__configinfo_struct[:default_value]] )
-                optval = conf[__configinfo_struct[:default_value]]
-                begin
-                  val = method.call(optval)
-                rescue => e
-                  warn("Warning:: #{e.message} (when #{method}.call(#{optval.inspect})") if $DEBUG
-                  val = optval
-                end
-                conf[__configinfo_struct[:default_value]] = val
-              end
-              if ( conf[__configinfo_struct[:current_value]] )
-                optval = conf[__configinfo_struct[:current_value]]
-                begin
-                  val = method.call(optval)
-                rescue => e
-                  warn("Warning:: #{e.message} (when #{method}.call(#{optval.inspect})") if $DEBUG
-                  val = optval
-                end
-                conf[__configinfo_struct[:current_value]] = val
-              end
-
-            when /^(#{__strval_optkeys.join('|')})$/
-              # do nothing
-
-            when /^(#{__numval_optkeys.join('|')})$/
-              if ( __configinfo_struct[:default_value] \
-                  && conf[__configinfo_struct[:default_value]] )
-                begin
-                  conf[__configinfo_struct[:default_value]] =
-                    number(conf[__configinfo_struct[:default_value]])
-                rescue
-                  conf[__configinfo_struct[:default_value]] = nil
-                end
-              end
-              if ( conf[__configinfo_struct[:current_value]] )
-                begin
-                  conf[__configinfo_struct[:current_value]] =
-                    number(conf[__configinfo_struct[:current_value]])
-                rescue
-                  conf[__configinfo_struct[:current_value]] = nil
-                end
-              end
-
-            when /^(#{__numstrval_optkeys.join('|')})$/
-              if ( __configinfo_struct[:default_value] \
-                  && conf[__configinfo_struct[:default_value]] )
-                conf[__configinfo_struct[:default_value]] =
-                  num_or_str(conf[__configinfo_struct[:default_value]])
-              end
-              if ( conf[__configinfo_struct[:current_value]] )
-                conf[__configinfo_struct[:current_value]] =
-                  num_or_str(conf[__configinfo_struct[:current_value]])
-              end
-
-            when /^(#{__boolval_optkeys.join('|')})$/
-              if ( __configinfo_struct[:default_value] \
-                  && conf[__configinfo_struct[:default_value]] )
-                begin
-                  conf[__configinfo_struct[:default_value]] =
-                    bool(conf[__configinfo_struct[:default_value]])
-                rescue
-                  conf[__configinfo_struct[:default_value]] = nil
-                end
-              end
-              if ( conf[__configinfo_struct[:current_value]] )
-                begin
-                  conf[__configinfo_struct[:current_value]] =
-                    bool(conf[__configinfo_struct[:current_value]])
-                rescue
-                  conf[__configinfo_struct[:current_value]] = nil
-                end
-              end
-
-            when /^(#{__listval_optkeys.join('|')})$/
-              if ( __configinfo_struct[:default_value] \
-                  && conf[__configinfo_struct[:default_value]] )
-                conf[__configinfo_struct[:default_value]] =
-                  simplelist(conf[__configinfo_struct[:default_value]])
-              end
-              if ( conf[__configinfo_struct[:current_value]] )
-                conf[__configinfo_struct[:current_value]] =
-                  simplelist(conf[__configinfo_struct[:current_value]])
-              end
-
-            when /^(#{__numlistval_optkeys.join('|')})$/
-              if ( __configinfo_struct[:default_value] \
-                  && conf[__configinfo_struct[:default_value]] \
-                  && conf[__configinfo_struct[:default_value]] =~ /^[0-9]/ )
-                conf[__configinfo_struct[:default_value]] =
-                  list(conf[__configinfo_struct[:default_value]])
-              end
-              if ( conf[__configinfo_struct[:current_value]] \
-                  && conf[__configinfo_struct[:current_value]] =~ /^[0-9]/ )
-                conf[__configinfo_struct[:current_value]] =
-                  list(conf[__configinfo_struct[:current_value]])
-              end
-
-            when /^(#{__tkvariable_optkeys.join('|')})$/
-              if ( __configinfo_struct[:default_value] \
-                  && conf[__configinfo_struct[:default_value]] )
-                v = conf[__configinfo_struct[:default_value]]
-                if v.empty?
-                  conf[__configinfo_struct[:default_value]] = nil
-                else
-                  conf[__configinfo_struct[:default_value]] = TkVarAccess.new
-                end
-              end
-              if ( conf[__configinfo_struct[:current_value]] )
-                v = conf[__configinfo_struct[:current_value]]
-                if v.empty?
-                  conf[__configinfo_struct[:current_value]] = nil
-                else
-                  conf[__configinfo_struct[:current_value]] = TkVarAccess.new
-                end
-              end
-
-            else
-              if ( __configinfo_struct[:default_value] \
-                  && conf[__configinfo_struct[:default_value]] )
-                if conf[__configinfo_struct[:default_value]].index('{')
-                  conf[__configinfo_struct[:default_value]] =
-                    tk_split_list(conf[__configinfo_struct[:default_value]])
-                else
-                  conf[__configinfo_struct[:default_value]] =
-                    tk_tcl2ruby(conf[__configinfo_struct[:default_value]])
-                end
-              end
-              if conf[__configinfo_struct[:current_value]]
-                if conf[__configinfo_struct[:current_value]].index('{')
-                  conf[__configinfo_struct[:current_value]] =
-                    tk_split_list(conf[__configinfo_struct[:current_value]])
-                else
-                  conf[__configinfo_struct[:current_value]] =
-                    tk_tcl2ruby(conf[__configinfo_struct[:current_value]])
-                end
-              end
-            end
-
-            if ( __configinfo_struct[:alias] \
-                && conf.size == __configinfo_struct[:alias] + 1 )
-              if conf[__configinfo_struct[:alias]][0] == ?-
-                conf[__configinfo_struct[:alias]] =
-                  conf[__configinfo_struct[:alias]][1..-1]
-              end
-              ret[conf[0]] = conf[1]
-            else
-              ret[conf.shift] = conf
-            end
-          }
-
-          __font_optkeys.each{|optkey|
-            optkey = optkey.to_s
-            fontconf = ret[optkey]
-            if fontconf.kind_of?(Array)
-              ret.delete(optkey)
-              ret.delete('latin' << optkey)
-              ret.delete('ascii' << optkey)
-              ret.delete('kanji' << optkey)
-              fnt = fontconf[__configinfo_struct[:default_value]]
-              if TkFont.is_system_font?(fnt)
-                fontconf[__configinfo_struct[:default_value]] \
-                  = TkNamedFont.new(fnt)
-              end
-              fontconf[__configinfo_struct[:current_value]] = fontobj(optkey)
-              ret[optkey] = fontconf
-            end
-          }
-
-          __methodcall_optkeys.each{|optkey, m|
-            ret[optkey.to_s] = ['', '', '', self.__send__(m)]
-          }
-
-          ret
-        end
-      end
-    end
-  end
-  private :__configinfo_core
-
-  def configinfo(slot = nil)
-    if slot && TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-      begin
-        __configinfo_core(slot)
-      rescue
-        Array.new(__configinfo_struct.values.max).unshift(slot.to_s)
-      end
-    else
-      __configinfo_core(slot)
-    end
-  end
-
-  def current_configinfo(slot = nil)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if slot
-        org_slot = slot
-        begin
-          conf = configinfo(slot)
-          if ( ! __configinfo_struct[:alias] \
-              || conf.size > __configinfo_struct[:alias] + 1 )
-            return {conf[0] => conf[-1]}
-          end
-          slot = conf[__configinfo_struct[:alias]]
-        end while(org_slot != slot)
-        fail RuntimeError,
-          "there is a configure alias loop about '#{org_slot}'"
-      else
-        ret = {}
-        configinfo().each{|cnf|
-          if ( ! __configinfo_struct[:alias] \
-              || cnf.size > __configinfo_struct[:alias] + 1 )
-            ret[cnf[0]] = cnf[-1]
-          end
-        }
-        ret
-      end
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      ret = {}
-      configinfo(slot).each{|key, cnf|
-        ret[key] = cnf[-1] if cnf.kind_of?(Array)
-      }
-      ret
-    end
-  end
-end
-
-class TkObject<TkKernel
-  extend  TkCore
-  include Tk
-  include TkConfigMethod
-  include TkBindCore
-
-### --> definition is moved to TkUtil module
-#  def path
-#    @path
-#  end
-
-  def epath
-    @path
-  end
-
-  def to_eval
-    @path
-  end
-
-  def tk_send(cmd, *rest)
-    tk_call(path, cmd, *rest)
-  end
-  def tk_send_without_enc(cmd, *rest)
-    tk_call_without_enc(path, cmd, *rest)
-  end
-  def tk_send_with_enc(cmd, *rest)
-    tk_call_with_enc(path, cmd, *rest)
-  end
-  # private :tk_send, :tk_send_without_enc, :tk_send_with_enc
-
-  def tk_send_to_list(cmd, *rest)
-    tk_call_to_list(path, cmd, *rest)
-  end
-  def tk_send_to_list_without_enc(cmd, *rest)
-    tk_call_to_list_without_enc(path, cmd, *rest)
-  end
-  def tk_send_to_list_with_enc(cmd, *rest)
-    tk_call_to_list_with_enc(path, cmd, *rest)
-  end
-  def tk_send_to_simplelist(cmd, *rest)
-    tk_call_to_simplelist(path, cmd, *rest)
-  end
-  def tk_send_to_simplelist_without_enc(cmd, *rest)
-    tk_call_to_simplelist_without_enc(path, cmd, *rest)
-  end
-  def tk_send_to_simplelist_with_enc(cmd, *rest)
-    tk_call_to_simplelist_with_enc(path, cmd, *rest)
-  end
-
-  def method_missing(id, *args)
-    name = id.id2name
-    case args.length
-    when 1
-      if name[-1] == ?=
-        configure name[0..-2], args[0]
-        args[0]
-      else
-        configure name, args[0]
-        self
-      end
-    when 0
-      begin
-        cget(name)
-      rescue
-        if self.kind_of?(TkWindow) && name != "to_ary" && name != "to_str"
-          fail NameError,
-               "unknown option '#{id}' for #{self.inspect} (deleted widget?)"
-        else
-          super(id, *args)
-        end
-#        fail NameError,
-#             "undefined local variable or method `#{name}' for #{self.to_s}",
-#             error_at
-      end
-    else
-      super(id, *args)
-#      fail NameError, "undefined method `#{name}' for #{self.to_s}", error_at
-    end
-  end
-
-=begin
-  def [](id)
-    cget(id)
-  end
-
-  def []=(id, val)
-    configure(id, val)
-    val
-  end
-=end
-
-  def event_generate(context, keys=nil)
-    if context.kind_of?(TkEvent::Event)
-      context.generate(self, ((keys)? keys: {}))
-    elsif keys
-      #tk_call('event', 'generate', path,
-      #       "<#{tk_event_sequence(context)}>", *hash_kv(keys))
-      tk_call_without_enc('event', 'generate', path,
-                          "<#{tk_event_sequence(context)}>",
-                          *hash_kv(keys, true))
-    else
-      #tk_call('event', 'generate', path, "<#{tk_event_sequence(context)}>")
-      tk_call_without_enc('event', 'generate', path,
-                          "<#{tk_event_sequence(context)}>")
-    end
-  end
-
-  def tk_trace_variable(v)
-    #unless v.kind_of?(TkVariable)
-    #  fail(ArgumentError, "type error (#{v.class}); must be TkVariable object")
-    #end
-    v
-  end
-  private :tk_trace_variable
-
-  def destroy
-    #tk_call 'trace', 'vdelete', @tk_vn, 'w', @var_id if @var_id
-  end
-end
-
-
-class TkWindow<TkObject
-  include TkWinfo
-  extend TkBindCore
-  include Tk::Wm_for_General
-  include Tk::Busy
-
-  @@WIDGET_INSPECT_FULL = false
-  def TkWindow._widget_inspect_full_?
-    @@WIDGET_INSPECT_FULL
-  end
-  def TkWindow._widget_inspect_full_=(mode)
-    @@WIDGET_INSPECT_FULL = (mode && true) || false
-  end
-
-  TkCommandNames = [].freeze
-  ## ==> If TkCommandNames[0] is a string (not a null string),
-  ##     assume the string is a Tcl/Tk's create command of the widget class.
-  WidgetClassName = ''.freeze
-  # WidgetClassNames[WidgetClassName] = self
-  ## ==> If self is a widget class, entry to the WidgetClassNames table.
-  def self.to_eval
-    self::WidgetClassName
-  end
-
-  def initialize(parent=nil, keys=nil)
-    if parent.kind_of? Hash
-      keys = _symbolkey2str(parent)
-      parent = keys.delete('parent')
-      widgetname = keys.delete('widgetname')
-      install_win(if parent then parent.path end, widgetname)
-      without_creating = keys.delete('without_creating')
-      # if without_creating && !widgetname
-      #   fail ArgumentError,
-      #        "if set 'without_creating' to true, need to define 'widgetname'"
-      # end
-    elsif keys
-      keys = _symbolkey2str(keys)
-      widgetname = keys.delete('widgetname')
-      install_win(if parent then parent.path end, widgetname)
-      without_creating = keys.delete('without_creating')
-      # if without_creating && !widgetname
-      #   fail ArgumentError,
-      #        "if set 'without_creating' to true, need to define 'widgetname'"
-      # end
-    else
-      install_win(if parent then parent.path end)
-    end
-    if self.method(:create_self).arity == 0
-      p 'create_self has no arg' if $DEBUG
-      create_self unless without_creating
-      if keys
-        # tk_call @path, 'configure', *hash_kv(keys)
-        configure(keys)
-      end
-    else
-      p 'create_self has args' if $DEBUG
-      fontkeys = {}
-      methodkeys = {}
-      if keys
-        #['font', 'kanjifont', 'latinfont', 'asciifont'].each{|key|
-        #  fontkeys[key] = keys.delete(key) if keys.key?(key)
-        #}
-        __font_optkeys.each{|key|
-          fkey = key.to_s
-          fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
-
-          fkey = "kanji#{key}"
-          fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
-
-          fkey = "latin#{key}"
-          fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
-
-          fkey = "ascii#{key}"
-          fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
-        }
-
-        __optkey_aliases.each{|alias_name, real_name|
-          alias_name = alias_name.to_s
-          if keys.has_key?(alias_name)
-            keys[real_name.to_s] = keys.delete(alias_name)
-          end
-        }
-
-        __methodcall_optkeys.each{|key|
-          key = key.to_s
-          methodkeys[key] = keys.delete(key) if keys.key?(key)
-        }
-
-        __ruby2val_optkeys.each{|key, method|
-          key = key.to_s
-          keys[key] = method.call(keys[key]) if keys.has_key?(key)
-        }
-      end
-      if without_creating && keys
-        #configure(keys)
-        configure(__conv_keyonly_opts(keys))
-      else
-        #create_self(keys)
-        create_self(__conv_keyonly_opts(keys))
-      end
-      font_configure(fontkeys) unless fontkeys.empty?
-      configure(methodkeys) unless methodkeys.empty?
-    end
-  end
-
-  def create_self(keys)
-    # may need to override
-    begin
-      cmd = self.class::TkCommandNames[0]
-      fail unless (cmd.kind_of?(String) && cmd.length > 0)
-    rescue
-      fail RuntimeError, "class #{self.class} may be an abstract class"
-    end
-
-    if keys and keys != None
-      unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-        tk_call_without_enc(cmd, @path, *hash_kv(keys, true))
-      else
-        begin
-          tk_call_without_enc(cmd, @path, *hash_kv(keys, true))
-        rescue => e
-          tk_call_without_enc(cmd, @path)
-          keys = __check_available_configure_options(keys)
-          unless keys.empty?
-            begin
-              # try to configure
-              configure(keys)
-            rescue
-              # fail => includes options adaptable when creation only?
-              begin
-                tk_call_without_enc('destroy', @path)
-              rescue
-                # cannot rescue options error
-                fail e
-              else
-                # re-create widget
-                tk_call_without_enc(cmd, @path, *hash_kv(keys, true))
-              end
-            end
-          end
-        end
-      end
-    else
-      tk_call_without_enc(cmd, @path)
-    end
-  end
-  private :create_self
-
-  def inspect
-    if @@WIDGET_INSPECT_FULL
-      super
-    else
-      str = super
-      str[0..(str.index(' '))] << '@path=' << @path.inspect << '>'
-    end
-  end
-
-  def exist?
-    TkWinfo.exist?(self)
-  end
-
-  alias subcommand tk_send
-
-  def bind_class
-    @db_class || self.class()
-  end
-
-  def database_classname
-    TkWinfo.classname(self)
-  end
-  def database_class
-    name = database_classname()
-    if WidgetClassNames[name]
-      WidgetClassNames[name]
-    else
-      TkDatabaseClass.new(name)
-    end
-  end
-  def self.database_classname
-    self::WidgetClassName
-  end
-  def self.database_class
-    WidgetClassNames[self::WidgetClassName]
-  end
-
-  def pack(keys = nil)
-    #tk_call_without_enc('pack', epath, *hash_kv(keys, true))
-    if keys
-      TkPack.configure(self, keys)
-    else
-      TkPack.configure(self)
-    end
-    self
-  end
-
-  def pack_in(target, keys = nil)
-    if keys
-      keys = keys.dup
-      keys['in'] = target
-    else
-      keys = {'in'=>target}
-    end
-    #tk_call 'pack', epath, *hash_kv(keys)
-    TkPack.configure(self, keys)
-    self
-  end
-
-  def pack_forget
-    #tk_call_without_enc('pack', 'forget', epath)
-    TkPack.forget(self)
-    self
-  end
-  alias unpack pack_forget
-
-  def pack_config(slot, value=None)
-    #if slot.kind_of? Hash
-    #  tk_call 'pack', 'configure', epath, *hash_kv(slot)
-    #else
-    #  tk_call 'pack', 'configure', epath, "-#{slot}", value
-    #end
-    if slot.kind_of? Hash
-      TkPack.configure(self, slot)
-    else
-      TkPack.configure(self, slot=>value)
-    end
-  end
-  alias pack_configure pack_config
-
-  def pack_info()
-    #ilist = list(tk_call('pack', 'info', epath))
-    #info = {}
-    #while key = ilist.shift
-    #  info[key[1..-1]] = ilist.shift
-    #end
-    #return info
-    TkPack.info(self)
-  end
-
-  def pack_propagate(mode=None)
-    #if mode == None
-    #  bool(tk_call('pack', 'propagate', epath))
-    #else
-    #  tk_call('pack', 'propagate', epath, mode)
-    #  self
-    #end
-    if mode == None
-      TkPack.propagate(self)
-    else
-      TkPack.propagate(self, mode)
-      self
-    end
-  end
-
-  def pack_slaves()
-    #list(tk_call('pack', 'slaves', epath))
-    TkPack.slaves(self)
-  end
-
-  def grid(keys = nil)
-    #tk_call 'grid', epath, *hash_kv(keys)
-    if keys
-      TkGrid.configure(self, keys)
-    else
-      TkGrid.configure(self)
-    end
-    self
-  end
-
-  def grid_in(target, keys = nil)
-    if keys
-      keys = keys.dup
-      keys['in'] = target
-    else
-      keys = {'in'=>target}
-    end
-    #tk_call 'grid', epath, *hash_kv(keys)
-    TkGrid.configure(self, keys)
-    self
-  end
-
-  def grid_anchor(anchor=None)
-    if anchor == None
-      TkGrid.anchor(self)
-    else
-      TkGrid.anchor(self, anchor)
-      self
-    end
-  end
-
-  def grid_forget
-    #tk_call('grid', 'forget', epath)
-    TkGrid.forget(self)
-    self
-  end
-  alias ungrid grid_forget
-
-  def grid_bbox(*args)
-    #list(tk_call('grid', 'bbox', epath, *args))
-    TkGrid.bbox(self, *args)
-  end
-
-  def grid_config(slot, value=None)
-    #if slot.kind_of? Hash
-    #  tk_call 'grid', 'configure', epath, *hash_kv(slot)
-    #else
-    #  tk_call 'grid', 'configure', epath, "-#{slot}", value
-    #end
-    if slot.kind_of? Hash
-      TkGrid.configure(self, slot)
-    else
-      TkGrid.configure(self, slot=>value)
-    end
-  end
-  alias grid_configure grid_config
-
-  def grid_columnconfig(index, keys)
-    #tk_call('grid', 'columnconfigure', epath, index, *hash_kv(keys))
-    TkGrid.columnconfigure(self, index, keys)
-  end
-  alias grid_columnconfigure grid_columnconfig
-
-  def grid_rowconfig(index, keys)
-    #tk_call('grid', 'rowconfigure', epath, index, *hash_kv(keys))
-    TkGrid.rowconfigure(self, index, keys)
-  end
-  alias grid_rowconfigure grid_rowconfig
-
-  def grid_columnconfiginfo(index, slot=nil)
-    #if slot
-    #  tk_call('grid', 'columnconfigure', epath, index, "-#{slot}").to_i
-    #else
-    #  ilist = list(tk_call('grid', 'columnconfigure', epath, index))
-    #  info = {}
-    #  while key = ilist.shift
-    #   info[key[1..-1]] = ilist.shift
-    #  end
-    #  info
-    #end
-    TkGrid.columnconfiginfo(self, index, slot)
-  end
-
-  def grid_rowconfiginfo(index, slot=nil)
-    #if slot
-    #  tk_call('grid', 'rowconfigure', epath, index, "-#{slot}").to_i
-    #else
-    #  ilist = list(tk_call('grid', 'rowconfigure', epath, index))
-    #  info = {}
-    #  while key = ilist.shift
-    #   info[key[1..-1]] = ilist.shift
-    #  end
-    #  info
-    #end
-    TkGrid.rowconfiginfo(self, index, slot)
-  end
-
-  def grid_column(index, keys=nil)
-    if keys.kind_of?(Hash)
-      grid_columnconfigure(index, keys)
-    else
-      grid_columnconfiginfo(index, keys)
-    end
-  end
-
-  def grid_row(index, keys=nil)
-    if keys.kind_of?(Hash)
-      grid_rowconfigure(index, keys)
-    else
-      grid_rowconfiginfo(index, keys)
-    end
-  end
-
-  def grid_info()
-    #list(tk_call('grid', 'info', epath))
-    TkGrid.info(self)
-  end
-
-  def grid_location(x, y)
-    #list(tk_call('grid', 'location', epath, x, y))
-    TkGrid.location(self, x, y)
-  end
-
-  def grid_propagate(mode=None)
-    #if mode == None
-    #  bool(tk_call('grid', 'propagate', epath))
-    #else
-    #  tk_call('grid', 'propagate', epath, mode)
-    #  self
-    #end
-    if mode == None
-      TkGrid.propagate(self)
-    else
-      TkGrid.propagate(self, mode)
-      self
-    end
-  end
-
-  def grid_remove()
-    #tk_call 'grid', 'remove', epath
-    TkGrid.remove(self)
-    self
-  end
-
-  def grid_size()
-    #list(tk_call('grid', 'size', epath))
-    TkGrid.size(self)
-  end
-
-  def grid_slaves(keys = nil)
-    #list(tk_call('grid', 'slaves', epath, *hash_kv(args)))
-    TkGrid.slaves(self, keys)
-  end
-
-  def place(keys)
-    #tk_call 'place', epath, *hash_kv(keys)
-    TkPlace.configure(self, keys)
-    self
-  end
-
-  def place_in(target, keys = nil)
-    if keys
-      keys = keys.dup
-      keys['in'] = target
-    else
-      keys = {'in'=>target}
-    end
-    #tk_call 'place', epath, *hash_kv(keys)
-    TkPlace.configure(self, keys)
-    self
-  end
-
-  def  place_forget
-    #tk_call 'place', 'forget', epath
-    TkPlace.forget(self)
-    self
-  end
-  alias unplace place_forget
-
-  def place_config(slot, value=None)
-    #if slot.kind_of? Hash
-    #  tk_call 'place', 'configure', epath, *hash_kv(slot)
-    #else
-    #  tk_call 'place', 'configure', epath, "-#{slot}", value
-    #end
-    TkPlace.configure(self, slot, value)
-  end
-  alias place_configure place_config
-
-  def place_configinfo(slot = nil)
-    # for >= Tk8.4a2 ?
-    #if slot
-    #  conf = tk_split_list(tk_call('place', 'configure', epath, "-#{slot}") )
-    #  conf[0] = conf[0][1..-1]
-    #  conf
-    #else
-    #  tk_split_simplelist(tk_call('place',
-    #                             'configure', epath)).collect{|conflist|
-    #   conf = tk_split_simplelist(conflist)
-    #   conf[0] = conf[0][1..-1]
-    #   conf
-    #  }
-    #end
-    TkPlace.configinfo(self, slot)
-  end
-
-  def place_info()
-    #ilist = list(tk_call('place', 'info', epath))
-    #info = {}
-    #while key = ilist.shift
-    #  info[key[1..-1]] = ilist.shift
-    #end
-    #return info
-    TkPlace.info(self)
-  end
-
-  def place_slaves()
-    #list(tk_call('place', 'slaves', epath))
-    TkPlace.slaves(self)
-  end
-
-  def set_focus(force=false)
-    if force
-      tk_call_without_enc('focus', '-force', path)
-    else
-      tk_call_without_enc('focus', path)
-    end
-    self
-  end
-  alias focus set_focus
-
-  def grab(opt = nil)
-    unless opt
-      tk_call_without_enc('grab', 'set', path)
-      return self
-    end
-
-    case opt
-    when 'set', :set
-      tk_call_without_enc('grab', 'set', path)
-      return self
-    when 'global', :global
-      #return(tk_call('grab', 'set', '-global', path))
-      tk_call_without_enc('grab', 'set', '-global', path)
-      return self
-    when 'release', :release
-      #return tk_call('grab', 'release', path)
-      tk_call_without_enc('grab', 'release', path)
-      return self
-    when 'current', :current
-      return window(tk_call_without_enc('grab', 'current', path))
-    when 'status', :status
-      return tk_call_without_enc('grab', 'status', path)
-    else
-      return tk_call_without_enc('grab', opt, path)
-    end
-  end
-
-  def grab_current
-    grab('current')
-  end
-  alias current_grab grab_current
-  def grab_release
-    grab('release')
-  end
-  alias release_grab grab_release
-  def grab_set
-    grab('set')
-  end
-  alias set_grab grab_set
-  def grab_set_global
-    grab('global')
-  end
-  alias set_global_grab grab_set_global
-  def grab_status
-    grab('status')
-  end
-
-  def lower(below=None)
-    # below = below.epath if below.kind_of?(TkObject)
-    below = _epath(below)
-    tk_call 'lower', epath, below
-    self
-  end
-  alias lower_window lower
-  def raise(above=None)
-    #above = above.epath if above.kind_of?(TkObject)
-    above = _epath(above)
-    tk_call 'raise', epath, above
-    self
-  end
-  alias raise_window raise
-
-  def command(cmd=nil, &b)
-    if cmd
-      configure_cmd('command', cmd)
-    elsif b
-      configure_cmd('command', Proc.new(&b))
-    else
-      cget('command')
-    end
-  end
-
-  def colormodel(model=None)
-    tk_call('tk', 'colormodel', path, model)
-    self
-  end
-
-  def caret(keys=nil)
-    TkXIM.caret(path, keys)
-  end
-
-  def destroy
-    super
-    children = []
-    rexp = /^#{self.path}\.[^.]+$/
-    TkCore::INTERP.tk_windows.each{|path, obj|
-      children << [path, obj] if path =~ rexp
-    }
-    if defined?(@cmdtbl)
-      for id in @cmdtbl
-        uninstall_cmd id
-      end
-    end
-
-    children.each{|path, obj|
-      obj.instance_eval{
-        if defined?(@cmdtbl)
-          for id in @cmdtbl
-            uninstall_cmd id
-          end
-        end
-      }
-      TkCore::INTERP.tk_windows.delete(path)
-    }
-
-    begin
-      tk_call_without_enc('destroy', epath)
-    rescue
-    end
-    uninstall_win
-  end
-
-  def wait_visibility(on_thread = true)
-    on_thread &= (Thread.list.size != 1)
-    if on_thread
-      INTERP._thread_tkwait('visibility', path)
-    else
-      INTERP._invoke('tkwait', 'visibility', path)
-    end
-  end
-  def eventloop_wait_visibility
-    wait_visibility(false)
-  end
-  def thread_wait_visibility
-    wait_visibility(true)
-  end
-  alias wait wait_visibility
-  alias tkwait wait_visibility
-  alias eventloop_wait eventloop_wait_visibility
-  alias eventloop_tkwait eventloop_wait_visibility
-  alias eventloop_tkwait_visibility eventloop_wait_visibility
-  alias thread_wait thread_wait_visibility
-  alias thread_tkwait thread_wait_visibility
-  alias thread_tkwait_visibility thread_wait_visibility
-
-  def wait_destroy(on_thread = true)
-    on_thread &= (Thread.list.size != 1)
-    if on_thread
-      INTERP._thread_tkwait('window', epath)
-    else
-      INTERP._invoke('tkwait', 'window', epath)
-    end
-  end
-  alias wait_window wait_destroy
-  def eventloop_wait_destroy
-    wait_destroy(false)
-  end
-  alias eventloop_wait_window eventloop_wait_destroy
-  def thread_wait_destroy
-    wait_destroy(true)
-  end
-  alias thread_wait_window thread_wait_destroy
-
-  alias tkwait_destroy wait_destroy
-  alias tkwait_window wait_destroy
-
-  alias eventloop_tkwait_destroy eventloop_wait_destroy
-  alias eventloop_tkwait_window eventloop_wait_destroy
-
-  alias thread_tkwait_destroy thread_wait_destroy
-  alias thread_tkwait_window thread_wait_destroy
-
-  def bindtags(taglist=nil)
-    if taglist
-      fail ArgumentError, "taglist must be Array" unless taglist.kind_of? Array
-      tk_call('bindtags', path, taglist)
-      taglist
-    else
-      list(tk_call('bindtags', path)).collect{|tag|
-        if tag.kind_of?(String)
-          if cls = WidgetClassNames[tag]
-            cls
-          elsif btag = TkBindTag.id2obj(tag)
-            btag
-          else
-            tag
-          end
-        else
-          tag
-        end
-      }
-    end
-  end
-
-  def bindtags=(taglist)
-    bindtags(taglist)
-    taglist
-  end
-
-  def bindtags_shift
-    taglist = bindtags
-    tag = taglist.shift
-    bindtags(taglist)
-    tag
-  end
-
-  def bindtags_unshift(tag)
-    bindtags(bindtags().unshift(tag))
-  end
-end
-TkWidget = TkWindow
-
-# freeze core modules
-#TclTkLib.freeze
-#TclTkIp.freeze
-#TkUtil.freeze
-#TkKernel.freeze
-#TkComm.freeze
-#TkComm::Event.freeze
-#TkCore.freeze
-#Tk.freeze
-
-module Tk
-  RELEASE_DATE = '2014-10-19'.freeze
-
-  autoload :AUTO_PATH,        'tk/variable'
-  autoload :TCL_PACKAGE_PATH, 'tk/variable'
-  autoload :PACKAGE_PATH,     'tk/variable'
-  autoload :TCL_LIBRARY_PATH, 'tk/variable'
-  autoload :LIBRARY_PATH,     'tk/variable'
-  autoload :TCL_PRECISION,    'tk/variable'
-end
-
-# call setup script for Tk extension libraries (base configuration)
-begin
-  require 'tkextlib/version.rb'
-  require 'tkextlib/setup.rb'
-rescue LoadError
-  # ignore
-end
diff --git a/ext/tk/lib/tk/after.rb b/ext/tk/lib/tk/after.rb
deleted file mode 100644
index 3213a6b818..0000000000
--- a/ext/tk/lib/tk/after.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# frozen_string_literal: false
-#
-#   tk/after.rb : methods for Tcl/Tk after command
-#
-#   $Id$
-#
-require 'tk/timer'
diff --git a/ext/tk/lib/tk/autoload.rb b/ext/tk/lib/tk/autoload.rb
deleted file mode 100644
index ef82c8944c..0000000000
--- a/ext/tk/lib/tk/autoload.rb
+++ /dev/null
@@ -1,763 +0,0 @@
-# frozen_string_literal: false
-#
-#  autoload
-#
-############################################
-#  geometry manager
-module Tk
-  autoload :Grid,             'tk/grid'
-  def Grid(*args); TkGrid.configure(*args); end
-
-  autoload :Pack,             'tk/pack'
-  def Pack(*args); TkPack.configure(*args); end
-
-  autoload :Place,            'tk/place'
-  def Place(*args); TkPlace.configure(*args); end
-end
-
-autoload :TkGrid,             'tk/grid'
-def TkGrid(*args); TkGrid.configure(*args); end
-
-autoload :TkPack,             'tk/pack'
-def TkPack(*args); TkPack.configure(*args); end
-
-autoload :TkPlace,            'tk/place'
-def TkPlace(*args); TkPlace.configure(*args); end
-
-
-############################################
-# classes on Tk module
-module Tk
-  autoload :Busy,             'tk/busy'
-
-  autoload :Button,           'tk/button'
-
-  autoload :Canvas,           'tk/canvas'
-
-  autoload :CheckButton,      'tk/checkbutton'
-  autoload :Checkbutton,      'tk/checkbutton'
-
-  autoload :Entry,            'tk/entry'
-
-  autoload :Frame,            'tk/frame'
-
-  autoload :Label,            'tk/label'
-
-  autoload :LabelFrame,       'tk/labelframe'
-  autoload :Labelframe,       'tk/labelframe'
-
-  autoload :Listbox,          'tk/listbox'
-
-  autoload :Menu,             'tk/menu'
-  autoload :MenuClone,        'tk/menu'
-  autoload :CloneMenu,        'tk/menu'
-  autoload :SystemMenu,       'tk/menu'
-  autoload :SysMenu_Help,     'tk/menu'
-  autoload :SysMenu_System,   'tk/menu'
-  autoload :SysMenu_Apple,    'tk/menu'
-  autoload :Menubutton,       'tk/menu'
-  autoload :MenuButton,       'tk/menu'
-  autoload :OptionMenubutton, 'tk/menu'
-  autoload :OptionMenBbutton, 'tk/menu'
-
-  autoload :Message,          'tk/message'
-
-  autoload :PanedWindow,      'tk/panedwindow'
-  autoload :Panedwindow,      'tk/panedwindow'
-
-  autoload :RadioButton,      'tk/radiobutton'
-  autoload :Radiobutton,      'tk/radiobutton'
-
-  autoload :Root,             'tk/root'
-
-  autoload :Scale,            'tk/scale'
-
-  autoload :Scrollbar,        'tk/scrollbar'
-  autoload :XScrollbar,       'tk/scrollbar'
-  autoload :YScrollbar,       'tk/scrollbar'
-
-  autoload :Spinbox,          'tk/spinbox'
-
-  autoload :Text,             'tk/text'
-
-  autoload :Toplevel,         'tk/toplevel'
-end
-
-
-############################################
-# sub-module of Tk
-module Tk
-  autoload :Clock,            'tk/clock'
-
-  autoload :OptionObj,        'tk/optionobj'
-
-  autoload :X_Scrollable,     'tk/scrollable'
-  autoload :Y_Scrollable,     'tk/scrollable'
-  autoload :Scrollable,       'tk/scrollable'
-
-  autoload :Fontchooser,      'tk/fontchooser'
-
-  autoload :Wm,               'tk/wm'
-  autoload :Wm_for_General,   'tk/wm'
-
-  autoload :MacResource,      'tk/macpkg'
-
-  autoload :WinDDE,           'tk/winpkg'
-  autoload :WinRegistry,      'tk/winpkg'
-
-  autoload :ValidateConfigure,     'tk/validation'
-  autoload :ItemValidateConfigure, 'tk/validation'
-
-  autoload :EncodedString,    'tk/encodedstr'
-  def Tk.EncodedString(str, enc = nil); Tk::EncodedString.new(str, enc); end
-
-  autoload :BinaryString,     'tk/encodedstr'
-  def Tk.BinaryString(str); Tk::BinaryString.new(str); end
-
-  autoload :UTF8_String,      'tk/encodedstr'
-  def Tk.UTF8_String(str); Tk::UTF8_String.new(str); end
-
-end
-
-
-############################################
-#  toplevel classes/modules (fixed)
-autoload :TkBgError,          'tk/bgerror'
-
-autoload :TkBindTag,          'tk/bindtag'
-autoload :TkBindTagAll,       'tk/bindtag'
-autoload :TkDatabaseClass,    'tk/bindtag'
-
-autoload :TkConsole,          'tk/console'
-
-autoload :TkcItem,            'tk/canvas'
-autoload :TkcArc,             'tk/canvas'
-autoload :TkcBitmap,          'tk/canvas'
-autoload :TkcImage,           'tk/canvas'
-autoload :TkcLine,            'tk/canvas'
-autoload :TkcOval,            'tk/canvas'
-autoload :TkcPolygon,         'tk/canvas'
-autoload :TkcRectangle,       'tk/canvas'
-autoload :TkcText,            'tk/canvas'
-autoload :TkcWindow,          'tk/canvas'
-
-autoload :TkcTagAccess,       'tk/canvastag'
-autoload :TkcTag,             'tk/canvastag'
-autoload :TkcTagString,       'tk/canvastag'
-autoload :TkcNamedTag,        'tk/canvastag'
-autoload :TkcTagAll,          'tk/canvastag'
-autoload :TkcTagCurrent,      'tk/canvastag'
-autoload :TkcTagGroup,        'tk/canvastag'
-
-autoload :TkClipboard,        'tk/clipboard'
-
-autoload :TkComposite,        'tk/composite'
-
-autoload :TkConsole,          'tk/console'
-
-autoload :TkDialog,           'tk/dialog'
-autoload :TkDialog2,          'tk/dialog'
-autoload :TkDialogObj,        'tk/dialog'
-autoload :TkWarning,          'tk/dialog'
-autoload :TkWarning2,         'tk/dialog'
-autoload :TkWarningObj,       'tk/dialog'
-
-autoload :TkEvent,            'tk/event'
-
-autoload :TkFont,             'tk/font'
-autoload :TkNamedFont,        'tk/font'
-
-autoload :TkImage,            'tk/image'
-autoload :TkBitmapImage,      'tk/image'
-autoload :TkPhotoImage,       'tk/image'
-
-autoload :TkItemConfigMethod, 'tk/itemconfig'
-
-autoload :TkTreatItemFont,    'tk/itemfont'
-
-autoload :TkKinput,           'tk/kinput'
-
-autoload :TkSystemMenu,       'tk/menu'
-
-autoload :TkMenubar,          'tk/menubar'
-
-autoload :TkMenuSpec,         'tk/menuspec'
-
-autoload :TkManageFocus,      'tk/mngfocus'
-
-autoload :TkMsgCatalog,       'tk/msgcat'
-autoload :TkMsgCat,           'tk/msgcat'
-
-autoload :TkNamespace,        'tk/namespace'
-
-autoload :TkOptionDB,         'tk/optiondb'
-autoload :TkOption,           'tk/optiondb'
-autoload :TkResourceDB,       'tk/optiondb'
-
-autoload :TkPackage,          'tk/package'
-
-autoload :TkPalette,          'tk/palette'
-
-autoload :TkRoot,             'tk/root'
-
-autoload :TkScrollbox,        'tk/scrollbox'
-
-autoload :TkSelection,        'tk/selection'
-
-autoload :TkTreatTagFont,     'tk/tagfont'
-
-autoload :TkTextImage,        'tk/textimage'
-autoload :TktImage,           'tk/textimage'
-
-autoload :TkTextMark,         'tk/textmark'
-autoload :TkTextNamedMark,    'tk/textmark'
-autoload :TkTextMarkInsert,   'tk/textmark'
-autoload :TkTextMarkCurrent,  'tk/textmark'
-autoload :TkTextMarkAnchor,   'tk/textmark'
-autoload :TktMark,            'tk/textmark'
-autoload :TktNamedMark,       'tk/textmark'
-autoload :TktMarkInsert,      'tk/textmark'
-autoload :TktMarkCurrent,     'tk/textmark'
-autoload :TktMarkAnchor,      'tk/textmark'
-
-autoload :TkTextTag,          'tk/texttag'
-autoload :TkTextNamedTag,     'tk/texttag'
-autoload :TkTextTagSel,       'tk/texttag'
-autoload :TktTag,             'tk/texttag'
-autoload :TktNamedTag,        'tk/texttag'
-autoload :TktTagSel,          'tk/texttag'
-
-autoload :TkTextWindow,       'tk/textwindow'
-autoload :TktWindow,          'tk/textwindow'
-
-autoload :TkAfter,            'tk/timer'
-autoload :TkTimer,            'tk/timer'
-autoload :TkRTTimer,          'tk/timer'
-
-autoload :TkTextWin,          'tk/txtwin_abst'
-
-autoload :TkValidation,       'tk/validation'
-autoload :TkValidateCommand,  'tk/validation'
-
-autoload :TkVariable,         'tk/variable'
-autoload :TkVarAccess,        'tk/variable'
-
-autoload :TkVirtualEvent,     'tk/virtevent'
-autoload :TkNamedVirtualEvent,'tk/virtevent'
-
-autoload :TkWinfo,            'tk/winfo'
-
-autoload :TkXIM,              'tk/xim'
-
-
-############################################
-#  toplevel classes/modules (switchable)
-module Tk
-  @TOPLEVEL_ALIAS_TABLE = {}
-  @TOPLEVEL_ALIAS_TABLE[:Tk] = {
-    :TkButton             => 'tk/button',
-
-    :TkCanvas             => 'tk/canvas',
-
-    :TkCheckButton        => 'tk/checkbutton',
-    :TkCheckbutton        => 'tk/checkbutton',
-
-    # :TkDialog             => 'tk/dialog',
-    # :TkDialog2            => 'tk/dialog',
-    # :TkDialogObj          => 'tk/dialog',
-    # :TkWarning            => 'tk/dialog',
-    # :TkWarning2           => 'tk/dialog',
-    # :TkWarningObj         => 'tk/dialog',
-
-    :TkEntry              => 'tk/entry',
-
-    :TkFrame              => 'tk/frame',
-
-    :TkLabel              => 'tk/label',
-
-    :TkLabelFrame         => 'tk/labelframe',
-    :TkLabelframe         => 'tk/labelframe',
-
-    :TkListbox            => 'tk/listbox',
-
-    :TkMacResource        => 'tk/macpkg',
-
-    :TkMenu               => 'tk/menu',
-    :TkMenuClone          => 'tk/menu',
-    :TkCloneMenu          => 'tk/menu',
-    # :TkSystemMenu         => 'tk/menu',
-    :TkSysMenu_Help       => 'tk/menu',
-    :TkSysMenu_System     => 'tk/menu',
-    :TkSysMenu_Apple      => 'tk/menu',
-    :TkMenubutton         => 'tk/menu',
-    :TkMenuButton         => 'tk/menu',
-    :TkOptionMenubutton   => 'tk/menu',
-    :TkOptionMenuButton   => 'tk/menu',
-
-    :TkMessage            => 'tk/message',
-
-    :TkPanedWindow        => 'tk/panedwindow',
-    :TkPanedwindow        => 'tk/panedwindow',
-
-    :TkRadioButton        => 'tk/radiobutton',
-    :TkRadiobutton        => 'tk/radiobutton',
-
-    # :TkRoot               => 'tk/root',
-
-    :TkScale              => 'tk/scale',
-
-    :TkScrollbar          => 'tk/scrollbar',
-    :TkXScrollbar         => 'tk/scrollbar',
-    :TkYScrollbar         => 'tk/scrollbar',
-
-    :TkSpinbox            => 'tk/spinbox',
-
-    :TkText               => 'tk/text',
-
-    :TkToplevel           => 'tk/toplevel',
-
-    :TkWinDDE             => 'tk/winpkg',
-    :TkWinRegistry        => 'tk/winpkg',
-  }
-
-  @TOPLEVEL_ALIAS_OWNER = {}
-
-  @TOPLEVEL_ALIAS_SETUP_PROC = {}
-
-  @AUTOLOAD_FILE_SYM_TABLE = Hash.new{|h,k| h[k]={}} # TABLE[file][sym] -> obj
-
-  @current_default_widget_set = nil
-
-  module TOPLEVEL_ALIASES; end
-end
-
-class Object
-  include Tk::TOPLEVEL_ALIASES
-end
-
-############################################
-#  methods to control default widget set
-############################################
-
-class << Tk
-  def default_widget_set
-    @current_default_widget_set
-  end
-
-  def default_widget_set=(target)
-    target = target.to_sym
-    return target if target == @current_default_widget_set
-
-    if (cmd = @TOPLEVEL_ALIAS_SETUP_PROC[target])
-      cmd.call(target)
-    end
-
-    _replace_toplevel_aliases(target)
-  end
-
-  def widget_set_symbols
-    @TOPLEVEL_ALIAS_TABLE.keys
-  end
-
-  def toplevel_aliases_on_widget_set(widget_set)
-    if (tbl = @TOPLEVEL_ALIAS_TABLE[widget_set.to_sym])
-      tbl.collect{|k, v| (v.nil?)? nil: k}.compact
-    else
-      fail ArgumentError, "unknown widget_set #{widget_set.to_sym.inspect}"
-    end
-  end
-
-  def __toplevel_alias_setup_proc__(*target_list, &cmd)
-    target_list.each{|target| @TOPLEVEL_ALIAS_SETUP_PROC[target.to_sym] = cmd}
-  end
-
-  def topobj_defined?(sym) #=> alias_filename or object or false
-    Object.autoload?(sym) ||
-      (Object.const_defined?(sym) && Object.const_get(sym))
-  end
-  def topalias_defined?(sym) #=> alias_filename or object or false
-    Tk::TOPLEVEL_ALIASES.autoload?(sym) ||
-      (Tk::TOPLEVEL_ALIASES.const_defined?(sym) &&
-         Tk::TOPLEVEL_ALIASES.const_get(sym))
-  end
-  def define_topobj(sym, obj)
-    if obj.kind_of? String
-      # obj is an autoload path
-      Object.autoload(sym, obj)
-      unless Object.autoload?(sym)
-        # file is autoloaded?
-        if @AUTOLOAD_FILE_SYM_TABLE.has_key?(obj) &&
-            (loaded_obj = @AUTOLOAD_FILE_SYM_TABLE[obj][sym])
-          Object.const_set(sym, loaded_obj)
-        else
-          fail ArgumentError, "cannot define autoload file (already loaded?)"
-        end
-      end
-    else
-      # object
-      Object.const_set(sym, obj)
-    end
-  end
-  def define_topalias(sym, obj)
-    if obj.kind_of? String
-      # obj is an autoload path
-      Tk::TOPLEVEL_ALIASES.autoload(sym, obj)
-      unless Tk::TOPLEVEL_ALIASES.autoload?(sym)
-        # file is autoloaded?
-        if @AUTOLOAD_FILE_SYM_TABLE.has_key?(obj) &&
-            (loaded_obj = @AUTOLOAD_FILE_SYM_TABLE[obj][sym])
-          Tk::TOPLEVEL_ALIASES.const_set(sym, loaded_obj)
-        else
-          fail ArgumentError, "cannot define autoload file (already loaded?)"
-        end
-      end
-    else
-      # object
-      Tk::TOPLEVEL_ALIASES.const_set(sym, obj)
-    end
-  end
-  def replace_topobj(sym, obj) #=> old_obj (alias_filename or object) or nil
-    if old_obj = topobj_defined?(sym)
-      Object.class_eval{remove_const sym} rescue nil # ignore err
-    end
-    define_topobj(sym, obj)
-    old_obj
-  end
-  def replace_topalias(sym, obj) #=> old_obj (alias_filename or object) or nil
-    if old_obj = topalias_defined?(sym)
-      Tk::TOPLEVEL_ALIASES.module_eval{remove_const sym} rescue nil #ignore err
-    end
-    define_topalias(sym, obj)
-    old_obj
-  end
-  private :topobj_defined?, :topalias_defined?
-  private :define_topobj, :define_topalias
-  private :replace_topobj, :replace_topalias
-
-  def __regist_toplevel_aliases__(target, obj, *symbols)
-    # initial regist
-    @TOPLEVEL_ALIAS_TABLE[target = target.to_sym] ||= {}
-    symbols.each{|sym|
-      @TOPLEVEL_ALIAS_TABLE[target][sym = sym.to_sym] = obj
-      if !topalias_defined?(sym) || target == @current_default_widget_set
-        @TOPLEVEL_ALIAS_OWNER[sym] = target
-        replace_topalias(sym, obj)
-        replace_topobj(sym, obj) unless obj.kind_of?(String) # NOT autoload
-      end
-    }
-  end
-
-  def regist_sym_for_loaded_file(auto, obj, sym)
-    @AUTOLOAD_FILE_SYM_TABLE[auto][sym] = obj
-
-    reg = /^#{Regexp.quote(auto)}(\.rb|\.so|)$/
-    @TOPLEVEL_ALIAS_TABLE.each_key{|set|
-      if @TOPLEVEL_ALIAS_TABLE[set][sym] =~ reg
-        @TOPLEVEL_ALIAS_TABLE[set][sym] = obj
-        if @TOPLEVEL_ALIAS_OWNER[sym].nil? || @TOPLEVEL_ALIAS_OWNER[sym] == set
-          replace_topalias(sym, obj)
-          replace_topobj(sym, obj) if set == @current_default_widget_set
-        end
-      end
-    }
-    if (f = Object.autoload?(sym)) && f =~ reg
-      replace_topobj(sym, obj)
-    end
-    if (f = Tk::TOPLEVEL_ALIASES.autoload?(sym)) && f =~ reg
-      replace_topalias(sym, obj)
-    end
-  end
-  private :regist_sym_for_loaded_file
-
-  def set_topalias(target, obj, sym)
-    # obj is a kind of String : define autoload path
-    #                  Class  : use the class object
-    if target == @current_default_widget_set
-      case @TOPLEVEL_ALIAS_OWNER[sym]
-      when false
-        # Object::sym is out of control. --> not change
-        # Make ALIAS::sym under control, because target widget set is current.
-        # Keep OWNER[sym]
-        @TOPLEVEL_ALIAS_TABLE[target][sym] = obj
-        replace_topalias(sym, obj)
-
-      when target
-        if current_obj = topobj_defined?(sym)
-          if current_obj == obj
-            # Make current_obj under control.
-            # Keep Object::sym.
-            # Keep OWNER[sym].
-            @TOPLEVEL_ALIAS_TABLE[target][sym] = obj
-            replace_topalias(sym, obj)
-
-          else # current_obj != obj
-            if current_obj == topalias_defined?(sym)
-              # Change controlled object
-              # Keep OWNER[sym].
-              @TOPLEVEL_ALIAS_TABLE[target][sym] = obj
-              replace_topalias(sym, obj)
-              replace_topobj(sym, obj)
-
-            else # current_obj != topalias_defined?(sym)
-              # Maybe current_obj is defined by user. --> OWNER[sym] = false
-              # Keep Object::sym.
-              @TOPLEVEL_ALIAS_OWNER[sym] = false
-              @TOPLEVEL_ALIAS_TABLE[target][sym] = obj
-              replace_topalias(sym, obj)
-            end
-          end
-
-        else # NOT topobj_defined?(sym)
-          # New definition for sym at target.
-          # Keep OWNER[sym].
-          @TOPLEVEL_ALIAS_TABLE[target][sym] = obj
-          replace_topalias(sym, obj)
-          define_topobj(sym, obj)
-        end
-
-      when nil
-        # New definition for sym at target.
-        @TOPLEVEL_ALIAS_OWNER[sym] = target
-        @TOPLEVEL_ALIAS_TABLE[target][sym] = obj
-        replace_topalias(sym, obj)
-
-      else # others
-        # Maybe planning to make sym under control.
-        @TOPLEVEL_ALIAS_OWNER[sym] = target
-        @TOPLEVEL_ALIAS_TABLE[target][sym] = obj
-        replace_topalias(sym, obj)
-        replace_topobj(sym, obj)
-      end
-
-    else # target != @current_default_widget_set
-      case @TOPLEVEL_ALIAS_OWNER[sym]
-      when false
-        # Object::sym is out of control. --> not change
-        if topalias_defined?(sym)
-          # ALIAS[sym] may be defined by other widget set.
-          # Keep Object::sym (even if it is not defined)
-          # Keep ALIAS[sym].
-          # Keep OWNER[sym].
-          @TOPLEVEL_ALIAS_TABLE[target][sym] = obj
-
-        else # NOT topalias_defined?(sym)
-          # Nobody controls ALIAS[sym].
-          # At least, current widget set doesn't control ALIAS[sym].
-          # Keep Object::sym (even if it is not defined)
-          # Keep OWNER[sym].
-          @TOPLEVEL_ALIAS_TABLE[target][sym] = obj
-          define_topalias(sym, obj)
-        end
-
-      when target
-        # Maybe change controlled object, because Object::sym is under control.
-        # Keep OWNER[sym].
-        @TOPLEVEL_ALIAS_TABLE[target][sym] = obj
-        replace_topalias(sym, obj)
-        replace_topobj(sym, obj)
-
-      when nil
-        # New definition for sym
-        @TOPLEVEL_ALIAS_OWNER[sym] = target
-        @TOPLEVEL_ALIAS_TABLE[target][sym] = obj
-        replace_topalias(sym, obj)
-        replace_topobj(sym, obj)
-
-      else # others
-        # An other widget set controls sym.
-        # Keep Object::sym (even if it is not defined)
-        # Keep ALIAS[sym].
-        # Keep OWNER[sym].
-        @TOPLEVEL_ALIAS_TABLE[target][sym] = obj
-
-      end
-    end
-
-    sym
-  end
-  private :set_topalias
-
-  def __set_toplevel_aliases__(target, obj, *symbols)
-    # obj is a kind of String : define autoload path
-    #                  Class  : use the class object
-    target = target.to_sym
-    symbols.each{|sym| set_topalias(target, obj, sym.to_sym)}
-  end
-
-  def __set_loaded_toplevel_aliases__(autopath, target, obj, *symbols)
-    # autopath is an autoload file
-    # Currently, this method doesn't support that autoload loads
-    # different toplevels between <basename>.rb and <basename>.so extension.
-    shortpath = (autopath =~ /^(.*)(.rb|.so)$/)? $1: autopath
-    target = target.to_sym
-    symbols.map!{|sym| sym.to_sym}
-
-    symbols.each{|sym| regist_sym_for_loaded_file(shortpath, obj, sym) }
-    symbols.each{|sym| set_topalias(target, obj, sym)}
-  end
-
-  def backup_current_topdef(sym)
-    return if (current = @current_default_widget_set).nil?
-
-    case @TOPLEVEL_ALIAS_OWNER[sym]
-    when false
-      # Object::sym is out of control.
-      if (cur_alias = topalias_defined?(sym)) && ! cur_alias.kind_of?(String)
-        @TOPLEVEL_ALIAS_TABLE[current][sym] = cur_alias
-      end
-
-    when current
-      if cur_obj = topobj_defined?(sym)
-        if ! cur_obj.kind_of?(String) && (cur_alias = topalias_defined?(sym))
-          if cur_alias.kind_of?(String)
-            # Maybe, user replaced Object::sym.
-            # Make Object::sym out of control.
-            @TOPLEVEL_ALIAS_OWNER[sym] = false
-          elsif cur_obj == cur_alias
-            # Possibly, defined normally. Backup it
-            @TOPLEVEL_ALIAS_TABLE[current][sym] = cur_alias
-          else
-            # Maybe, user replaced Object::sym.
-            # Make Object::sym out of control.
-            @TOPLEVEL_ALIAS_OWNER[sym] = false
-          end
-        end
-      else
-        # Maybe, user replaced Object::sym.
-        # Make Object::sym out of control.
-        @TOPLEVEL_ALIAS_OWNER[sym] = false
-      end
-
-    when nil
-      # Object::sym is out of control.
-      if (cur_alias = topalias_defined?(sym)) && ! cur_alias.kind_of?(String)
-        # Possibly, defined normally. Backup it.
-        @TOPLEVEL_ALIAS_TABLE[current][sym] = cur_alias
-      end
-    else
-      # No authority to control Object::sym and ALIASES::sym.
-      # Do nothing.
-    end
-  end
-  private :backup_current_topdef
-
-  def _replace_toplevel_aliases(target)
-    # backup
-    @TOPLEVEL_ALIAS_TABLE[target].each_key{|sym|
-      backup_current_topdef(sym)
-    }
-
-    # replace
-    @TOPLEVEL_ALIAS_TABLE[target].each_key{|sym|
-      next if (obj = @TOPLEVEL_ALIAS_TABLE[target][sym]).nil?
-      if @TOPLEVEL_ALIAS_OWNER[sym] == false
-        # Object::sym is out of control. --> not change
-        # Keep OWNER[sym].
-        replace_topalias(sym, obj)
-      else
-        # New definition
-        @TOPLEVEL_ALIAS_OWNER[sym] = target
-        replace_topalias(sym, obj)
-        replace_topobj(sym, obj)
-      end
-    }
-
-    # change default_widget_set
-    @current_default_widget_set = target
-  end
-  private :_replace_toplevel_aliases
-
-  def __import_toplevel_aliases__(target, *symbols)
-    current = @current_default_widget_set
-    symbols.each{|sym|
-      sym = sym.to_sym
-      if (obj = @TOPLEVEL_ALIAS_TABLE[target][sym]).nil?
-        # remove
-        @TOPLEVEL_ALIAS_TABLE[current].delete(sym)
-        @TOPLEVEL_ALIAS_OWNER.delete(sym)
-        Tk::TOPLEVEL_ALIASES.module_eval{remove_const sym} if topalias_defined?(sym)
-        Object.class_eval{remove_const sym} if topobj_defined?(sym)
-
-      elsif obj == false
-        # remove, but OWNER[sym] <- false and not treat Object::sym
-        @TOPLEVEL_ALIAS_TABLE[current].delete(sym)
-        @TOPLEVEL_ALIAS_OWNER[sym] = false
-        Tk::TOPLEVEL_ALIASES.module_eval{remove_const sym} if topalias_defined?(sym)
-
-      elsif @TOPLEVEL_ALIAS_OWNER[sym] == false
-        # Object::sym is out of control. --> not change
-        # Keep OWNER[sym].
-        @TOPLEVEL_ALIAS_TABLE[current][sym] = obj
-        replace_topalias(sym, obj)
-
-      else
-        # new definition under control
-        @TOPLEVEL_ALIAS_OWNER[sym] = current
-        @TOPLEVEL_ALIAS_TABLE[current][sym] = obj
-        replace_topalias(sym, obj)
-        replace_topobj(sym, obj)
-      end
-    }
-  end
-
-  def __remove_toplevel_aliases__(*symbols)
-    # remove toplevel aliases of current widget set
-    current = @current_default_widget_set
-    symbols.each{|sym|
-      sym = sym.to_sym
-      @TOPLEVEL_ALIAS_TABLE[current].delete(sym)
-      @TOPLEVEL_ALIAS_OWNER.delete(sym)
-      Tk::TOPLEVEL_ALIASES.module_eval{remove_const sym} if topalias_defined?(sym)
-      Object.class_eval{remove_const sym} if topobj_defined?(sym)
-    }
-  end
-
-  def __reset_toplevel_owner__(*symbols)
-    symbols.each{|sym| @TOPLEVEL_ALIAS_OWNER.delete(sym.to_sym)}
-  end
-
-  def __disable_toplevel_control__(*symbols)
-    symbols.each{|sym| @TOPLEVEL_ALIAS_OWNER[sym.to_sym] = false}
-  end
-
-  def __create_widget_set__(new_set, src_set={})
-    new_set = new_set.to_sym
-    if @TOPLEVEL_ALIAS_TABLE[new_set]
-      fail RuntimeError, "A widget-set #{new_set.inspect} is already exist."
-    end
-    if src_set.kind_of?(Symbol)
-      # new_set is an alias name of existed widget set.
-      @TOPLEVEL_ALIAS_TABLE[new_set] = @TOPLEVEL_ALIAS_TABLE[src_set]
-    else
-      @TOPLEVEL_ALIAS_TABLE[new_set] = {}
-      src_set.each{|sym, obj| set_topalias(new_set, obj, sym.to_sym) }
-    end
-  end
-end
-
-
-############################################
-# setup default widget set => :Tk
-Tk.default_widget_set = :Tk
-
-
-############################################
-#  depend on the version of Tcl/Tk
-# major, minor, type, patchlevel = TclTkLib.get_version
-
-############################################
-# Ttk (Tile) support
-=begin
-if major > 8 ||
-    (major == 8 && minor > 5) ||
-    (major == 8 && minor == 5 && type >= TclTkLib::RELEASE_TYPE::BETA)
-  # Tcl/Tk 8.5 beta or later
-  Object.autoload :Ttk, 'tkextlib/tile'
-  Tk.autoload :Tile, 'tkextlib/tile'
-
-  require 'tk/ttk_selector'
-end
-=end
-Object.autoload :Ttk, 'tkextlib/tile'
-Tk.autoload :Tile, 'tkextlib/tile'
-require 'tk/ttk_selector'
diff --git a/ext/tk/lib/tk/bgerror.rb b/ext/tk/lib/tk/bgerror.rb
deleted file mode 100644
index 9d2f59357e..0000000000
--- a/ext/tk/lib/tk/bgerror.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkbgerror -- bgerror ( tkerror ) module
-#                     1998/07/16 by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
-#
-require 'tk'
-
-module TkBgError
-  extend Tk
-
-  TkCommandNames = ['bgerror'.freeze].freeze
-
-  def bgerror(message)
-    tk_call('bgerror', message)
-  end
-  alias tkerror bgerror
-  alias show bgerror
-  module_function :bgerror, :tkerror, :show
-
-  def set_handler(hdlr = Proc.new) #==> handler :: proc{|msg| ...body... }
-    tk_call('proc', 'bgerror', 'msg', install_cmd(hdlr) + ' $msg')
-  end
-  def set_default
-    begin
-      tk_call('rename', 'bgerror', '')
-    rescue RuntimeError
-    end
-  end
-  module_function :set_handler, :set_default
-end
diff --git a/ext/tk/lib/tk/bindtag.rb b/ext/tk/lib/tk/bindtag.rb
deleted file mode 100644
index ad3c90b505..0000000000
--- a/ext/tk/lib/tk/bindtag.rb
+++ /dev/null
@@ -1,139 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/bind.rb : control event binding
-#
-require 'tk'
-
-class TkBindTag
-  include TkBindCore
-
-  #BTagID_TBL = {}
-  BTagID_TBL = TkCore::INTERP.create_table
-
-  (Tk_BINDTAG_ID = ["btag".freeze, TkUtil.untrust("00000")]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  TkCore::INTERP.init_ip_env{
-    BTagID_TBL.mutex.synchronize{ BTagID_TBL.clear }
-  }
-
-  def TkBindTag.id2obj(id)
-    BTagID_TBL.mutex.synchronize{
-      (BTagID_TBL[id])? BTagID_TBL[id]: id
-    }
-  end
-
-=begin
-  def TkBindTag.new_by_name(name, *args, &b)
-    BTagID_TBL.mutex.synchronize{
-      return BTagID_TBL[name] if BTagID_TBL[name]
-    }
-
-    self.new.instance_eval{
-      BTagID_TBL.mutex.synchronize{
-        BTagID_TBL.delete @id
-        @id = name
-        BTagID_TBL[@id] = self
-      }
-      bind(*args, &b) if args != []
-      self
-    }
-  end
-=end
-  def TkBindTag.new_by_name(name, *args, &b)
-    obj = nil
-    BTagID_TBL.mutex.synchronize{
-      if BTagID_TBL[name]
-        obj = BTagID_TBL[name]
-      else
-        (obj = BTagID_TBL[name] = self.allocate).instance_eval{
-          @id = name
-        }
-      end
-    }
-    bind(*args, &b) if obj && args != []
-    obj
-  end
-
-  def initialize(*args, &b)
-    Tk_BINDTAG_ID.mutex.synchronize{
-      # @id = Tk_BINDTAG_ID.join('')
-      @id = Tk_BINDTAG_ID.join(TkCore::INTERP._ip_id_)
-      Tk_BINDTAG_ID[1].succ!
-    }
-    BTagID_TBL.mutex.synchronize{
-      BTagID_TBL[@id] = self
-    }
-    bind(*args, &b) if args != []
-  end
-
-  ALL = self.new_by_name('all')
-
-  def name
-    @id
-  end
-
-  def to_eval
-    @id
-  end
-
-  def inspect
-    #Kernel.format "#<TkBindTag: %s>", @id
-    '#<TkBindTag: ' + @id + '>'
-  end
-end
-
-
-class TkBindTagAll<TkBindTag
-  def TkBindTagAll.new(*args, &b)
-    $stderr.puts "Warning: TkBindTagALL is obsolete. Use TkBindTag::ALL\n"
-
-    TkBindTag::ALL.bind(*args, &b) if args != []
-    TkBindTag::ALL
-  end
-end
-
-
-class TkDatabaseClass<TkBindTag
-=begin
-  def self.new(name, *args, &b)
-    BTagID_TBL.mutex.synchronize{
-      return BTagID_TBL[name] if BTagID_TBL[name]
-    }
-    super(name, *args, &b)
-  end
-
-  def initialize(name, *args, &b)
-    @id = name
-    BTagID_TBL.mutex.synchronize{
-      BTagID_TBL[@id] = self
-    }
-    bind(*args, &b) if args != []
-  end
-=end
-  def self.new(name, *args, &b)
-    BTagID_TBL.mutex.synchronize{
-      if BTagID_TBL[name]
-        BTagID_TBL[name]
-      else
-        BTagID_TBL[name] = self.allocate.instance_eval{
-          initialize(name, *args, &b)
-          self
-        }
-      end
-    }
-  end
-
-  def initialize(name, *args, &b)
-    @id = name
-    bind(*args, &b) if args != []
-  end
-
-  def inspect
-    #Kernel.format "#<TkDatabaseClass: %s>", @id
-    '#<TkDatabaseClass: ' + @id + '>'
-  end
-end
diff --git a/ext/tk/lib/tk/busy.rb b/ext/tk/lib/tk/busy.rb
deleted file mode 100644
index 18ebede9dd..0000000000
--- a/ext/tk/lib/tk/busy.rb
+++ /dev/null
@@ -1,119 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/busy.rb: support 'tk busy' command (Tcl/Tk8.6 or later)
-#
-require 'tk'
-
-module Tk::Busy
-  include TkCore
-  extend TkCore
-  extend TkItemConfigMethod
-end
-
-class << Tk::Busy
-  def __item_cget_cmd(win)
-    # maybe need to override
-    ['tk', 'busy', 'cget', win.path]
-  end
-  private :__item_cget_cmd
-
-  def __item_config_cmd(win)
-    # maybe need to override
-    ['tk', 'busy', 'configure', win.path]
-  end
-  private :__item_config_cmd
-
-  def __item_confinfo_cmd(win)
-    # maybe need to override
-    __item_config_cmd(win)
-  end
-  private :__item_confinfo_cmd
-
-  alias cget_tkstring itemcget_tkstring
-  alias cget itemcget
-  alias cget_strict itemcget_strict
-  alias configure itemconfigure
-  alias configinfo itemconfiginfo
-  alias current_configinfo current_itemconfiginfo
-
-  private :itemcget_tkstring, :itemcget, :itemcget_strict
-  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
-
-  def method_missing(id, *args)
-    name = id.id2name
-    case args.length
-    when 1
-      if name[-1] == ?=
-        configure name[0..-2], args[0]
-        args[0]
-      else
-        configure name, args[0]
-        self
-      end
-    when 0
-      begin
-        cget(name)
-      rescue
-        super(id, *args)
-      end
-    else
-      super(id, *args)
-    end
-  end
-
-  def hold(win, keys={})
-    tk_call_without_enc('tk', 'busy', 'hold', win, *hash_kv(keys))
-    win
-  end
-
-  def forget(*wins)
-    tk_call_without_enc('tk', 'busy', 'forget', *wins)
-    self
-  end
-
-  def current(pat=None)
-    list(tk_call('tk', 'busy', 'current', pat))
-  end
-
-  def status(win)
-    bool(tk_call_without_enc('tk', 'busy', 'status', win))
-  end
-end
-
-module Tk::Busy
-  def busy_configinfo(option=nil)
-    Tk::Busy.configinfo(self, option)
-  end
-
-  def busy_current_configinfo(option=nil)
-    Tk::Busy.current_configinfo(self, option)
-  end
-
-  def busy_configure(option, value=None)
-    Tk::Busy.configure(self, option, value)
-    self
-  end
-
-  def busy_cget(option)
-    Tk::Busy.configure(self, option)
-  end
-
-  def busy(keys={})
-    Tk::Busy.hold(self, keys)
-    self
-  end
-  alias busy_hold busy
-
-  def busy_forget
-    Tk::Busy.forget(self)
-    self
-  end
-
-  def busy_current?
-    ! Tk::Busy.current(self.path).empty?
-  end
-
-  def busy_status
-    Tk::Busy.status(self)
-  end
-end
diff --git a/ext/tk/lib/tk/button.rb b/ext/tk/lib/tk/button.rb
deleted file mode 100644
index dc252d8e82..0000000000
--- a/ext/tk/lib/tk/button.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/button.rb : treat button widget
-#
-require 'tk'
-require 'tk/label'
-
-class Tk::Button<Tk::Label
-  TkCommandNames = ['button'.freeze].freeze
-  WidgetClassName = 'Button'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-  #def create_self(keys)
-  #  if keys and keys != None
-  #    tk_call_without_enc('button', @path, *hash_kv(keys, true))
-  #  else
-  #    tk_call_without_enc('button', @path)
-  #  end
-  #end
-  #private :create_self
-
-  def invoke
-    _fromUTF8(tk_send_without_enc('invoke'))
-  end
-  def flash
-    tk_send_without_enc('flash')
-    self
-  end
-end
-
-#TkButton = Tk::Button unless Object.const_defined? :TkButton
-#Tk.__set_toplevel_aliases__(:Tk, Tk::Button, :TkButton)
-Tk.__set_loaded_toplevel_aliases__('tk/button.rb', :Tk, Tk::Button, :TkButton)
diff --git a/ext/tk/lib/tk/canvas.rb b/ext/tk/lib/tk/canvas.rb
deleted file mode 100644
index d707733d8c..0000000000
--- a/ext/tk/lib/tk/canvas.rb
+++ /dev/null
@@ -1,847 +0,0 @@
-# frozen_string_literal: false
-#
-#               tk/canvas.rb - Tk canvas classes
-#                       by Yukihiro Matsumoto <matz@caelum.co.jp>
-#
-require 'tk'
-require 'tk/canvastag'
-require 'tk/itemconfig'
-require 'tk/scrollable'
-
-module TkCanvasItemConfig
-  include TkItemConfigMethod
-
-  def __item_strval_optkeys(id)
-    # maybe need to override
-    super(id) + [
-      'fill', 'activefill', 'disabledfill',
-      'outline', 'activeoutline', 'disabledoutline'
-    ]
-  end
-  private :__item_strval_optkeys
-
-  def __item_methodcall_optkeys(id)
-    {'coords'=>'coords'}
-  end
-  private :__item_methodcall_optkeys
-
-  def __item_val2ruby_optkeys(id)  # { key=>proc, ... }
-    super(id).update('window'=>proc{|i, v| window(v)},
-                     'tags'=>proc{|i, v|
-                       simplelist(v).collect{|tag| TkcTag.id2obj(self, tag)}
-                     })
-  end
-  private :__item_val2ruby_optkeys
-
-  def __item_pathname(tagOrId)
-    if tagOrId.kind_of?(TkcItem) || tagOrId.kind_of?(TkcTag)
-      self.path + ';' + tagOrId.id.to_s
-    else
-      self.path + ';' + tagOrId.to_s
-    end
-  end
-  private :__item_pathname
-end
-
-class Tk::Canvas<TkWindow
-  include TkCanvasItemConfig
-  include Tk::Scrollable
-
-  TkCommandNames = ['canvas'.freeze].freeze
-  WidgetClassName = 'Canvas'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __destroy_hook__
-    TkcItem::CItemID_TBL.delete(@path)
-  end
-
-  #def create_self(keys)
-  #  if keys and keys != None
-  #    tk_call_without_enc('canvas', @path, *hash_kv(keys, true))
-  #  else
-  #    tk_call_without_enc('canvas', @path)
-  #  end
-  #end
-  #private :create_self
-
-  def __numval_optkeys
-    super() + ['closeenough']
-  end
-  private :__numval_optkeys
-
-  def __boolval_optkeys
-    super() + ['confine']
-  end
-  private :__boolval_optkeys
-
-  def tagid(tag)
-    if tag.kind_of?(TkcItem) || tag.kind_of?(TkcTag)
-      tag.id
-    else
-      tag  # maybe an Array of configure parameters
-    end
-  end
-  private :tagid
-
-
-  # create a canvas item without creating a TkcItem object
-  def create(type, *args)
-    if type.kind_of?(Class) && type < TkcItem
-      # do nothing
-    elsif TkcItem.type2class(type.to_s)
-      type = TkcItem.type2class(type.to_s)
-    else
-      fail ArgumentError, "type must a subclass of TkcItem class, or a string in CItemTypeToClass"
-    end
-    type.create(self, *args)
-  end
-
-  def addtag(tag, mode, *args)
-    mode = mode.to_s
-    if args[0] && mode =~ /^(above|below|with(tag)?)$/
-      args[0] = tagid(args[0])
-    end
-    tk_send_without_enc('addtag', tagid(tag), mode, *args)
-    self
-  end
-  def addtag_above(tagOrId, target)
-    addtag(tagOrId, 'above', tagid(target))
-  end
-  def addtag_all(tagOrId)
-    addtag(tagOrId, 'all')
-  end
-  def addtag_below(tagOrId, target)
-    addtag(tagOrId, 'below', tagid(target))
-  end
-  def addtag_closest(tagOrId, x, y, halo=None, start=None)
-    addtag(tagOrId, 'closest', x, y, halo, start)
-  end
-  def addtag_enclosed(tagOrId, x1, y1, x2, y2)
-    addtag(tagOrId, 'enclosed', x1, y1, x2, y2)
-  end
-  def addtag_overlapping(tagOrId, x1, y1, x2, y2)
-    addtag(tagOrId, 'overlapping', x1, y1, x2, y2)
-  end
-  def addtag_withtag(tagOrId, tag)
-    addtag(tagOrId, 'withtag', tagid(tag))
-  end
-
-  def bbox(tagOrId, *tags)
-    list(tk_send_without_enc('bbox', tagid(tagOrId),
-                             *tags.collect{|t| tagid(t)}))
-  end
-
-  #def itembind(tag, context, cmd=Proc.new, *args)
-  #  _bind([path, "bind", tagid(tag)], context, cmd, *args)
-  #  self
-  #end
-  def itembind(tag, context, *args)
-    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _bind([path, "bind", tagid(tag)], context, cmd, *args)
-    self
-  end
-
-  #def itembind_append(tag, context, cmd=Proc.new, *args)
-  #  _bind_append([path, "bind", tagid(tag)], context, cmd, *args)
-  #  self
-  #end
-  def itembind_append(tag, context, *args)
-    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _bind_append([path, "bind", tagid(tag)], context, cmd, *args)
-    self
-  end
-
-  def itembind_remove(tag, context)
-    _bind_remove([path, "bind", tagid(tag)], context)
-    self
-  end
-
-  def itembindinfo(tag, context=nil)
-    _bindinfo([path, "bind", tagid(tag)], context)
-  end
-
-  def canvasx(screen_x, *args)
-    #tk_tcl2ruby(tk_send_without_enc('canvasx', screen_x, *args))
-    number(tk_send_without_enc('canvasx', screen_x, *args))
-  end
-  def canvasy(screen_y, *args)
-    #tk_tcl2ruby(tk_send_without_enc('canvasy', screen_y, *args))
-    number(tk_send_without_enc('canvasy', screen_y, *args))
-  end
-  alias canvas_x canvasx
-  alias canvas_y canvasy
-
-  def coords(tag, *args)
-    if args.empty?
-      tk_split_list(tk_send_without_enc('coords', tagid(tag)))
-    else
-      tk_send_without_enc('coords', tagid(tag), *(args.flatten))
-      self
-    end
-  end
-
-  def dchars(tag, first, last=None)
-    tk_send_without_enc('dchars', tagid(tag),
-                        _get_eval_enc_str(first), _get_eval_enc_str(last))
-    self
-  end
-
-  def delete(*args)
-    tbl = nil
-    TkcItem::CItemID_TBL.mutex.synchronize{
-      tbl = TkcItem::CItemID_TBL[self.path]
-    }
-    if tbl
-      args.each{|tag|
-        find('withtag', tag).each{|item|
-          if item.kind_of?(TkcItem)
-            TkcItem::CItemID_TBL.mutex.synchronize{
-              tbl.delete(item.id)
-            }
-          end
-        }
-      }
-    end
-    tk_send_without_enc('delete', *args.collect{|t| tagid(t)})
-    self
-  end
-  alias remove delete
-
-  def dtag(tag, tag_to_del=None)
-    tk_send_without_enc('dtag', tagid(tag), tagid(tag_to_del))
-    self
-  end
-  alias deltag dtag
-
-  def find(mode, *args)
-    list(tk_send_without_enc('find', mode, *args)).collect!{|id|
-      TkcItem.id2obj(self, id)
-    }
-  end
-  def find_above(target)
-    find('above', tagid(target))
-  end
-  def find_all
-    find('all')
-  end
-  def find_below(target)
-    find('below', tagid(target))
-  end
-  def find_closest(x, y, halo=None, start=None)
-    find('closest', x, y, halo, start)
-  end
-  def find_enclosed(x1, y1, x2, y2)
-    find('enclosed', x1, y1, x2, y2)
-  end
-  def find_overlapping(x1, y1, x2, y2)
-    find('overlapping', x1, y1, x2, y2)
-  end
-  def find_withtag(tag)
-    find('withtag', tag)
-  end
-
-  def itemfocus(tagOrId=nil)
-    if tagOrId
-      tk_send_without_enc('focus', tagid(tagOrId))
-      self
-    else
-      ret = tk_send_without_enc('focus')
-      if ret == ""
-        nil
-      else
-        TkcItem.id2obj(self, ret)
-      end
-    end
-  end
-
-  def gettags(tagOrId)
-    list(tk_send_without_enc('gettags', tagid(tagOrId))).collect{|tag|
-      TkcTag.id2obj(self, tag)
-    }
-  end
-
-  def icursor(tagOrId, index)
-    tk_send_without_enc('icursor', tagid(tagOrId), index)
-    self
-  end
-
-  def imove(tagOrId, idx, x, y)
-    tk_send_without_enc('imove', tagid(tagOrId), idx, x, y)
-    self
-  end
-  alias i_move imove
-
-  def index(tagOrId, idx)
-    number(tk_send_without_enc('index', tagid(tagOrId), idx))
-  end
-
-  def insert(tagOrId, index, string)
-    tk_send_without_enc('insert', tagid(tagOrId), index,
-                        _get_eval_enc_str(string))
-    self
-  end
-
-=begin
-  def itemcget(tagOrId, option)
-    case option.to_s
-    when 'dash', 'activedash', 'disableddash'
-      conf = tk_send_without_enc('itemcget', tagid(tagOrId), "-#{option}")
-      if conf =~ /^[0-9]/
-        list(conf)
-      else
-        conf
-      end
-    when 'text', 'label', 'show', 'data', 'file', 'maskdata', 'maskfile'
-      _fromUTF8(tk_send_without_enc('itemcget', tagid(tagOrId), "-#{option}"))
-    when 'font', 'kanjifont'
-      #fnt = tk_tcl2ruby(tk_send('itemcget', tagid(tagOrId), "-#{option}"))
-      fnt = tk_tcl2ruby(_fromUTF8(tk_send_with_enc('itemcget', tagid(tagOrId), '-font')))
-      unless fnt.kind_of?(TkFont)
-        fnt = tagfontobj(tagid(tagOrId), fnt)
-      end
-      if option.to_s == 'kanjifont' && JAPANIZED_TK && TK_VERSION =~ /^4\.*/
-        # obsolete; just for compatibility
-        fnt.kanji_font
-      else
-        fnt
-      end
-    else
-      tk_tcl2ruby(_fromUTF8(tk_send_without_enc('itemcget', tagid(tagOrId),
-                                                "-#{option}")))
-    end
-  end
-
-  def itemconfigure(tagOrId, key, value=None)
-    if key.kind_of? Hash
-      key = _symbolkey2str(key)
-      coords = key.delete('coords')
-      self.coords(tagOrId, coords) if coords
-
-      if ( key['font'] || key['kanjifont'] \
-          || key['latinfont'] || key['asciifont'] )
-        tagfont_configure(tagid(tagOrId), key.dup)
-      else
-        _fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId),
-                                      *hash_kv(key, true)))
-      end
-
-    else
-      if ( key == 'coords' || key == :coords )
-        self.coords(tagOrId, value)
-      elsif ( key == 'font' || key == :font ||
-              key == 'kanjifont' || key == :kanjifont ||
-              key == 'latinfont' || key == :latinfont ||
-              key == 'asciifont' || key == :asciifont )
-        if value == None
-          tagfontobj(tagid(tagOrId))
-        else
-          tagfont_configure(tagid(tagOrId), {key=>value})
-        end
-      else
-        _fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId),
-                                      "-#{key}", _get_eval_enc_str(value)))
-      end
-    end
-    self
-  end
-#  def itemconfigure(tagOrId, key, value=None)
-#    if key.kind_of? Hash
-#      tk_send 'itemconfigure', tagid(tagOrId), *hash_kv(key)
-#    else
-#      tk_send 'itemconfigure', tagid(tagOrId), "-#{key}", value
-#    end
-#  end
-#  def itemconfigure(tagOrId, keys)
-#    tk_send 'itemconfigure', tagid(tagOrId), *hash_kv(keys)
-#  end
-
-  def itemconfiginfo(tagOrId, key=nil)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if key
-        case key.to_s
-        when 'coords'
-          return ['coords', '', '', '', self.coords(tagOrId)]
-        when 'dash', 'activedash', 'disableddash'
-          conf = tk_split_simplelist(tk_send_without_enc('itemconfigure', tagid(tagOrId), "-#{key}"))
-          if conf[3] && conf[3] =~ /^[0-9]/
-            conf[3] = list(conf[3])
-          end
-          if conf[4] && conf[4] =~ /^[0-9]/
-            conf[4] = list(conf[4])
-          end
-        when 'text', 'label', 'show', 'data', 'file', 'maskdata', 'maskfile'
-          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId), "-#{key}")))
-        when 'font', 'kanjifont'
-          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId),"-#{key}")))
-          conf[4] = tagfont_configinfo(tagid(tagOrId), conf[4])
-        else
-          conf = tk_split_list(_fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId), "-#{key}")))
-        end
-        conf[0] = conf[0][1..-1]
-        conf
-      else
-        ret = tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId)))).collect{|conflist|
-          conf = tk_split_simplelist(conflist)
-          conf[0] = conf[0][1..-1]
-          case conf[0]
-          when 'text', 'label', 'show', 'data', 'file', 'maskdata', 'maskfile'
-          when 'dash', 'activedash', 'disableddash'
-            if conf[3] && conf[3] =~ /^[0-9]/
-              conf[3] = list(conf[3])
-            end
-            if conf[4] && conf[4] =~ /^[0-9]/
-              conf[4] = list(conf[4])
-            end
-          else
-            if conf[3]
-              if conf[3].index('{')
-                conf[3] = tk_split_list(conf[3])
-              else
-                conf[3] = tk_tcl2ruby(conf[3])
-              end
-            end
-            if conf[4]
-              if conf[4].index('{')
-                conf[4] = tk_split_list(conf[4])
-              else
-                conf[4] = tk_tcl2ruby(conf[4])
-              end
-            end
-          end
-          conf[1] = conf[1][1..-1] if conf.size == 2 # alias info
-          conf
-        }
-
-        fontconf = ret.assoc('font')
-        if fontconf
-          ret.delete_if{|item| item[0] == 'font' || item[0] == 'kanjifont'}
-          fontconf[4] = tagfont_configinfo(tagid(tagOrId), fontconf[4])
-          ret.push(fontconf)
-        end
-
-        ret << ['coords', '', '', '', self.coords(tagOrId)]
-      end
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      if key
-        case key.to_s
-        when 'coords'
-          {'coords' => ['', '', '', self.coords(tagOrId)]}
-        when 'dash', 'activedash', 'disableddash'
-          conf = tk_split_simplelist(tk_send_without_enc('itemconfigure',
-                                                         tagid(tagOrId),
-                                                         "-#{key}"))
-          if conf[3] && conf[3] =~ /^[0-9]/
-            conf[3] = list(conf[3])
-          end
-          if conf[4] && conf[4] =~ /^[0-9]/
-            conf[4] = list(conf[4])
-          end
-        when 'text', 'label', 'show', 'data', 'file', 'maskdata', 'maskfile'
-          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId), "-#{key}")))
-        when 'font', 'kanjifont'
-          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId),"-#{key}")))
-          conf[4] = tagfont_configinfo(tagid(tagOrId), conf[4])
-        else
-          conf = tk_split_list(_fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId), "-#{key}")))
-        end
-        key = conf.shift[1..-1]
-        { key => conf }
-      else
-        ret = {}
-        tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId)))).each{|conflist|
-          conf = tk_split_simplelist(conflist)
-          key = conf.shift[1..-1]
-          case key
-          when 'text', 'label', 'show', 'data', 'file', 'maskdata', 'maskfile'
-          when 'dash', 'activedash', 'disableddash'
-            if conf[2] && conf[2] =~ /^[0-9]/
-              conf[2] = list(conf[2])
-            end
-            if conf[3] && conf[3] =~ /^[0-9]/
-              conf[3] = list(conf[3])
-            end
-          else
-            if conf[2]
-              if conf[2].index('{')
-                conf[2] = tk_split_list(conf[2])
-              else
-                conf[2] = tk_tcl2ruby(conf[2])
-              end
-            end
-            if conf[3]
-              if conf[3].index('{')
-                conf[3] = tk_split_list(conf[3])
-              else
-                conf[3] = tk_tcl2ruby(conf[3])
-              end
-            end
-          end
-          if conf.size == 1
-            ret[key] = conf[0][1..-1]  # alias info
-          else
-            ret[key] = conf
-          end
-        }
-
-        fontconf = ret['font']
-        if fontconf
-          ret.delete('font')
-          ret.delete('kanjifont')
-          fontconf[3] = tagfont_configinfo(tagid(tagOrId), fontconf[3])
-          ret['font'] = fontconf
-        end
-
-        ret['coords'] = ['', '', '', self.coords(tagOrId)]
-
-        ret
-      end
-    end
-  end
-
-  def current_itemconfiginfo(tagOrId, key=nil)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if key
-        conf = itemconfiginfo(tagOrId, key)
-        {conf[0] => conf[4]}
-      else
-        ret = {}
-        itemconfiginfo(tagOrId).each{|conf|
-          ret[conf[0]] = conf[4] if conf.size > 2
-        }
-        ret
-      end
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      ret = {}
-      itemconfiginfo(tagOrId, key).each{|k, conf|
-        ret[k] = conf[-1] if conf.kind_of?(Array)
-      }
-      ret
-    end
-  end
-=end
-
-  def lower(tag, below=nil)
-    if below
-      tk_send_without_enc('lower', tagid(tag), tagid(below))
-    else
-      tk_send_without_enc('lower', tagid(tag))
-    end
-    self
-  end
-
-  def move(tag, dx, dy)
-    tk_send_without_enc('move', tagid(tag), dx, dy)
-    self
-  end
-
-  def moveto(tag, x, y)
-    # Tcl/Tk 8.6 or later
-    tk_send_without_enc('moveto', tagid(tag), x, y)
-    self
-  end
-  alias move_to moveto
-
-  def postscript(keys)
-    tk_send("postscript", *hash_kv(keys))
-  end
-
-  def raise(tag, above=nil)
-    if above
-      tk_send_without_enc('raise', tagid(tag), tagid(above))
-    else
-      tk_send_without_enc('raise', tagid(tag))
-    end
-    self
-  end
-
-  def rchars(tag, first, last, str_or_coords)
-    # Tcl/Tk 8.6 or later
-    str_or_coords = str_or_coords.flatten if str_or_coords.kinad_of? Array
-    tk_send_without_enc('rchars', tagid(tag), first, last, str_or_coords)
-    self
-  end
-  alias replace_chars rchars
-  alias replace_coords rchars
-
-  def scale(tag, x, y, xs, ys)
-    tk_send_without_enc('scale', tagid(tag), x, y, xs, ys)
-    self
-  end
-
-  def scan_mark(x, y)
-    tk_send_without_enc('scan', 'mark', x, y)
-    self
-  end
-  def scan_dragto(x, y, gain=None)
-    tk_send_without_enc('scan', 'dragto', x, y, gain)
-    self
-  end
-
-  def select(mode, *args)
-    r = tk_send_without_enc('select', mode, *args)
-    (mode == 'item')? TkcItem.id2obj(self, r): self
-  end
-  def select_adjust(tagOrId, index)
-    select('adjust', tagid(tagOrId), index)
-  end
-  def select_clear
-    select('clear')
-  end
-  def select_from(tagOrId, index)
-    select('from', tagid(tagOrId), index)
-  end
-  def select_item
-    select('item')
-  end
-  def select_to(tagOrId, index)
-    select('to', tagid(tagOrId), index)
-  end
-
-  def itemtype(tag)
-    TkcItem.type2class(tk_send('type', tagid(tag)))
-  end
-
-  def create_itemobj_from_id(idnum)
-    id = TkcItem.id2obj(self, idnum.to_i)
-    return id if id.kind_of?(TkcItem)
-
-    typename = tk_send('type', id)
-    unless type = TkcItem.type2class(typename)
-      (itemclass = typename.dup)[0,1] = typename[0,1].upcase
-      type = TkcItem.const_set(itemclass, Class.new(TkcItem))
-      type.const_set("CItemTypeName", typename.freeze)
-      TkcItem::CItemTypeToClass[typename] = type
-    end
-
-    canvas = self
-    (obj = type.allocate).instance_eval{
-      @parent = @c = canvas
-      @path = canvas.path
-      @id = id
-      TkcItem::CItemID_TBL.mutex.synchronize{
-        TkcItem::CItemID_TBL[@path] = {} unless TkcItem::CItemID_TBL[@path]
-        TkcItem::CItemID_TBL[@path][@id] = self
-      }
-    }
-  end
-end
-
-#TkCanvas = Tk::Canvas unless Object.const_defined? :TkCanvas
-#Tk.__set_toplevel_aliases__(:Tk, Tk::Canvas, :TkCanvas)
-Tk.__set_loaded_toplevel_aliases__('tk/canvas.rb', :Tk, Tk::Canvas, :TkCanvas)
-
-
-class TkcItem<TkObject
-  extend Tk
-  include TkcTagAccess
-  extend TkItemFontOptkeys
-  extend TkItemConfigOptkeys
-
-  CItemTypeName = nil
-  CItemTypeToClass = {}
-
-  CItemID_TBL = TkCore::INTERP.create_table
-
-  TkCore::INTERP.init_ip_env{
-    CItemID_TBL.mutex.synchronize{ CItemID_TBL.clear }
-  }
-
-  def TkcItem.type2class(type)
-    CItemTypeToClass[type]
-  end
-
-  def TkcItem.id2obj(canvas, id)
-    cpath = canvas.path
-    CItemID_TBL.mutex.synchronize{
-      if CItemID_TBL[cpath]
-        CItemID_TBL[cpath][id]? CItemID_TBL[cpath][id]: id
-      else
-        id
-      end
-    }
-  end
-
-  ########################################
-  def self._parse_create_args(args)
-    fontkeys = {}
-    methodkeys = {}
-    if args[-1].kind_of? Hash
-      keys = _symbolkey2str(args.pop)
-      if args.size == 0
-        args = keys.delete('coords')
-        unless args.kind_of?(Array)
-          fail "coords parameter must be given by an Array"
-        end
-      end
-
-      #['font', 'kanjifont', 'latinfont', 'asciifont'].each{|key|
-      #  fontkeys[key] = keys.delete(key) if keys.key?(key)
-      #}
-      __item_font_optkeys(nil).each{|key|
-        fkey = key.to_s
-        fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
-
-        fkey = "kanji#{key}"
-        fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
-
-        fkey = "latin#{key}"
-        fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
-
-        fkey = "ascii#{key}"
-        fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
-      }
-
-      __item_optkey_aliases(nil).each{|alias_name, real_name|
-        alias_name = alias_name.to_s
-        if keys.has_key?(alias_name)
-          keys[real_name.to_s] = keys.delete(alias_name)
-        end
-      }
-
-      __item_methodcall_optkeys(nil).each{|key|
-        key = key.to_s
-        methodkeys[key] = keys.delete(key) if keys.key?(key)
-      }
-
-      __item_ruby2val_optkeys(nil).each{|key, method|
-        key = key.to_s
-        keys[key] = method.call(keys[key]) if keys.has_key?(key)
-      }
-
-      #args = args.flatten.concat(hash_kv(keys))
-      args = args.flatten.concat(itemconfig_hash_kv(nil, keys))
-    else
-      args = args.flatten
-    end
-
-    [args, fontkeys, methodkeys]
-  end
-  private_class_method :_parse_create_args
-
-  def self.create(canvas, *args)
-    unless self::CItemTypeName
-      fail RuntimeError, "#{self} is an abstract class"
-    end
-    args, fontkeys, methodkeys = _parse_create_args(args)
-    idnum = tk_call_without_enc(canvas.path, 'create',
-                                self::CItemTypeName, *args)
-    canvas.itemconfigure(idnum, fontkeys) unless fontkeys.empty?
-    canvas.itemconfigure(idnum, methodkeys) unless methodkeys.empty?
-    idnum.to_i  # 'canvas item id' is an integer number
-  end
-  ########################################
-
-  def initialize(parent, *args)
-    #unless parent.kind_of?(Tk::Canvas)
-    #  fail ArgumentError, "expect Tk::Canvas for 1st argument"
-    #end
-    @parent = @c = parent
-    @path = parent.path
-
-    @id = create_self(*args) # an integer number as 'canvas item id'
-    CItemID_TBL.mutex.synchronize{
-      CItemID_TBL[@path] = {} unless CItemID_TBL[@path]
-      CItemID_TBL[@path][@id] = self
-    }
-  end
-  def create_self(*args)
-    self.class.create(@c, *args) # return an integer number as 'canvas item id'
-  end
-  private :create_self
-
-  def id
-    @id
-  end
-
-  def exist?
-    if @c.find_withtag(@id)
-      true
-    else
-      false
-    end
-  end
-
-  def delete
-    @c.delete @id
-    CItemID_TBL.mutex.synchronize{
-      CItemID_TBL[@path].delete(@id) if CItemID_TBL[@path]
-    }
-    self
-  end
-  alias remove  delete
-  alias destroy delete
-end
-
-class TkcArc<TkcItem
-  CItemTypeName = 'arc'.freeze
-  CItemTypeToClass[CItemTypeName] = self
-end
-
-class TkcBitmap<TkcItem
-  CItemTypeName = 'bitmap'.freeze
-  CItemTypeToClass[CItemTypeName] = self
-end
-
-class TkcImage<TkcItem
-  CItemTypeName = 'image'.freeze
-  CItemTypeToClass[CItemTypeName] = self
-end
-
-class TkcLine<TkcItem
-  CItemTypeName = 'line'.freeze
-  CItemTypeToClass[CItemTypeName] = self
-end
-
-class TkcOval<TkcItem
-  CItemTypeName = 'oval'.freeze
-  CItemTypeToClass[CItemTypeName] = self
-end
-
-class TkcPolygon<TkcItem
-  CItemTypeName = 'polygon'.freeze
-  CItemTypeToClass[CItemTypeName] = self
-end
-
-class TkcRectangle<TkcItem
-  CItemTypeName = 'rectangle'.freeze
-  CItemTypeToClass[CItemTypeName] = self
-end
-
-class TkcText<TkcItem
-  CItemTypeName = 'text'.freeze
-  CItemTypeToClass[CItemTypeName] = self
-  def self.create(canvas, *args)
-    if args[-1].kind_of?(Hash)
-      keys = _symbolkey2str(args.pop)
-      txt = keys['text']
-      keys['text'] = _get_eval_enc_str(txt) if txt
-      args.push(keys)
-    end
-    super(canvas, *args)
-  end
-end
-
-class TkcWindow<TkcItem
-  CItemTypeName = 'window'.freeze
-  CItemTypeToClass[CItemTypeName] = self
-  def self.create(canvas, *args)
-    if args[-1].kind_of?(Hash)
-      keys = _symbolkey2str(args.pop)
-      win = keys['window']
-      # keys['window'] = win.epath if win.kind_of?(TkWindow)
-      keys['window'] = _epath(win) if win
-      args.push(keys)
-    end
-    super(canvas, *args)
-  end
-end
diff --git a/ext/tk/lib/tk/canvastag.rb b/ext/tk/lib/tk/canvastag.rb
deleted file mode 100644
index 4a14cd78a9..0000000000
--- a/ext/tk/lib/tk/canvastag.rb
+++ /dev/null
@@ -1,460 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/canvastag.rb - methods for treating canvas tags
-#
-require 'tk'
-require 'tk/tagfont'
-
-module TkcTagAccess
-  include TkComm
-  include TkTreatTagFont
-end
-
-require 'tk/canvas'
-
-module TkcTagAccess
-  def addtag(tag)
-    @c.addtag(tag, 'withtag', @id)
-    self
-  end
-
-  def bbox
-    @c.bbox(@id)
-  end
-
-  #def bind(seq, cmd=Proc.new, *args)
-  #  @c.itembind(@id, seq, cmd, *args)
-  #  self
-  #end
-  def bind(seq, *args)
-    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    @c.itembind(@id, seq, cmd, *args)
-    self
-  end
-
-  #def bind_append(seq, cmd=Proc.new, *args)
-  #  @c.itembind_append(@id, seq, cmd, *args)
-  #  self
-  #end
-  def bind_append(seq, *args)
-    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    @c.itembind_append(@id, seq, cmd, *args)
-    self
-  end
-
-  def bind_remove(seq)
-    @c.itembind_remove(@id, seq)
-    self
-  end
-
-  def bindinfo(seq=nil)
-    @c.itembindinfo(@id, seq)
-  end
-
-  def cget_tkstring(option)
-    @c.itemcget_tkstring(@id, option)
-  end
-  def cget(option)
-    @c.itemcget(@id, option)
-  end
-  def cget_strict(option)
-    @c.itemcget_strict(@id, option)
-  end
-
-  def configure(key, value=None)
-    @c.itemconfigure(@id, key, value)
-    self
-  end
-#  def configure(keys)
-#    @c.itemconfigure @id, keys
-#  end
-
-  def configinfo(key=nil)
-    @c.itemconfiginfo(@id, key)
-  end
-
-  def current_configinfo(key=nil)
-    @c.current_itemconfiginfo(@id, key)
-  end
-
-  def coords(*args)
-    @c.coords(@id, *args)
-  end
-
-  def dchars(first, last=None)
-    @c.dchars(@id, first, last)
-    self
-  end
-
-  def dtag(tag_to_del=None)
-    @c.dtag(@id, tag_to_del)
-    self
-  end
-  alias deltag dtag
-
-  def find
-    @c.find('withtag', @id)
-  end
-  alias list find
-
-  def focus
-    @c.itemfocus(@id)
-  end
-
-  def gettags
-    @c.gettags(@id)
-  end
-
-  def icursor(index)
-    @c.icursor(@id, index)
-    self
-  end
-
-  def imove(idx, x, y)
-    # Tcl/Tk 8.6 or later
-    @c.imove(@id, idx, x, y)
-    self
-  end
-  alias i_move imove
-
-  def index(idx)
-    @c.index(@id, idx)
-  end
-
-  def insert(beforethis, string)
-    @c.insert(@id, beforethis, string)
-    self
-  end
-
-  def lower(belowthis=None)
-    @c.lower(@id, belowthis)
-    self
-  end
-
-  def move(xamount, yamount)
-    @c.move(@id, xamount, yamount)
-    self
-  end
-
-  def moveto(x, y)
-    # Tcl/Tk 8.6 or later
-    @c.moveto(@id, x, y)
-    self
-  end
-  alias move_to moveto
-
-  def raise(abovethis=None)
-    @c.raise(@id, abovethis)
-    self
-  end
-
-  def scale(xorigin, yorigin, xscale, yscale)
-    @c.scale(@id, xorigin, yorigin, xscale, yscale)
-    self
-  end
-
-  def rchars(first, last, str_or_coords)
-    # Tcl/Tk 8.6 or later
-    @c.rchars(@id, first, last, str_or_coords)
-    self
-  end
-  alias replace_chars rchars
-  alias replace_coords rchars
-
-  def select_adjust(index)
-    @c.select('adjust', @id, index)
-    self
-  end
-  def select_from(index)
-    @c.select('from', @id, index)
-    self
-  end
-  def select_to(index)
-    @c.select('to', @id, index)
-    self
-  end
-
-  def itemtype
-    @c.itemtype(@id)
-  end
-
-  # Following operators support logical expressions of canvas tags
-  # (for Tk8.3+).
-  # If tag1.path is 't1' and tag2.path is 't2', then
-  #      ltag = tag1 & tag2; ltag.path => "(t1)&&(t2)"
-  #      ltag = tag1 | tag2; ltag.path => "(t1)||(t2)"
-  #      ltag = tag1 ^ tag2; ltag.path => "(t1)^(t2)"
-  #      ltag = - tag1;      ltag.path => "!(t1)"
-  def & (tag)
-    if tag.kind_of? TkObject
-      TkcTagString.new(@c, '(' + @id + ')&&(' + tag.path + ')')
-    else
-      TkcTagString.new(@c, '(' + @id + ')&&(' + tag.to_s + ')')
-    end
-  end
-
-  def | (tag)
-    if tag.kind_of? TkObject
-      TkcTagString.new(@c, '(' + @id + ')||(' + tag.path + ')')
-    else
-      TkcTagString.new(@c, '(' + @id + ')||(' + tag.to_s + ')')
-    end
-  end
-
-  def ^ (tag)
-    if tag.kind_of? TkObject
-      TkcTagString.new(@c, '(' + @id + ')^(' + tag.path + ')')
-    else
-      TkcTagString.new(@c, '(' + @id + ')^(' + tag.to_s + ')')
-    end
-  end
-
-  def -@
-    TkcTagString.new(@c, '!(' + @id + ')')
-  end
-end
-
-class TkcTag<TkObject
-  include TkcTagAccess
-
-  CTagID_TBL = TkCore::INTERP.create_table
-
-  (Tk_CanvasTag_ID = ['ctag'.freeze, TkUtil.untrust('00000')]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  TkCore::INTERP.init_ip_env{
-    CTagID_TBL.mutex.synchronize{ CTagID_TBL.clear }
-  }
-
-  def TkcTag.id2obj(canvas, id)
-    cpath = canvas.path
-    CTagID_TBL.mutex.synchronize{
-      if CTagID_TBL[cpath]
-        CTagID_TBL[cpath][id]? CTagID_TBL[cpath][id]: id
-      else
-        id
-      end
-    }
-  end
-
-  def initialize(parent, mode=nil, *args)
-    #unless parent.kind_of?(TkCanvas)
-    #  fail ArgumentError, "expect TkCanvas for 1st argument"
-    #end
-    @c = parent
-    @cpath = parent.path
-    Tk_CanvasTag_ID.mutex.synchronize{
-      # @path = @id = Tk_CanvasTag_ID.join('')
-      @path = @id = Tk_CanvasTag_ID.join(TkCore::INTERP._ip_id_)
-      Tk_CanvasTag_ID[1].succ!
-    }
-    CTagID_TBL.mutex.synchronize{
-      CTagID_TBL[@cpath] = {} unless CTagID_TBL[@cpath]
-      CTagID_TBL[@cpath][@id] = self
-    }
-    if mode
-      tk_call_without_enc(@c.path, "addtag", @id, mode, *args)
-    end
-  end
-  def id
-    @id
-  end
-
-  def exist?
-    if @c.find_withtag(@id)
-      true
-    else
-      false
-    end
-  end
-
-  def delete
-    @c.delete @id
-    CTagID_TBL.mutex.synchronize{
-      CTagID_TBL[@cpath].delete(@id) if CTagID_TBL[@cpath]
-    }
-    self
-  end
-  alias remove  delete
-  alias destroy delete
-
-  def set_to_above(target)
-    @c.addtag_above(@id, target)
-    self
-  end
-  alias above set_to_above
-
-  def set_to_all
-    @c.addtag_all(@id)
-    self
-  end
-  alias all set_to_all
-
-  def set_to_below(target)
-    @c.addtag_below(@id, target)
-    self
-  end
-  alias below set_to_below
-
-  def set_to_closest(x, y, halo=None, start=None)
-    @c.addtag_closest(@id, x, y, halo, start)
-    self
-  end
-  alias closest set_to_closest
-
-  def set_to_enclosed(x1, y1, x2, y2)
-    @c.addtag_enclosed(@id, x1, y1, x2, y2)
-    self
-  end
-  alias enclosed set_to_enclosed
-
-  def set_to_overlapping(x1, y1, x2, y2)
-    @c.addtag_overlapping(@id, x1, y1, x2, y2)
-    self
-  end
-  alias overlapping set_to_overlapping
-
-  def set_to_withtag(target)
-    @c.addtag_withtag(@id, target)
-    self
-  end
-  alias withtag set_to_withtag
-end
-
-class TkcTagString<TkcTag
-  def self.new(parent, name, mode=nil, *args)
-    obj = nil
-    CTagID_TBL.mutex.synchronize{
-      if CTagID_TBL[parent.path] && CTagID_TBL[parent.path][name]
-        obj = CTagID_TBL[parent.path][name]
-      else
-        # super(parent, name, *args)
-        (obj = self.allocate).instance_eval{
-          @c = parent
-          @cpath = parent.path
-          @path = @id = name
-          CTagID_TBL[@cpath] = {} unless CTagID_TBL[@cpath]
-          CTagID_TBL[@cpath][@id] = self
-        }
-      end
-    }
-    if obj && mode
-      tk_call_without_enc(@c.path, "addtag", @id, mode, *args)
-    end
-    obj
-  end
-
-  def initialize(parent, name, mode=nil, *args)
-    # dummy:: not called by 'new' method
-
-    #unless parent.kind_of?(TkCanvas)
-    #  fail ArgumentError, "expect TkCanvas for 1st argument"
-    #end
-    @c = parent
-    @cpath = parent.path
-    @path = @id = name
-
-    if mode
-      tk_call_without_enc(@c.path, "addtag", @id, mode, *args)
-    end
-  end
-end
-TkcNamedTag = TkcTagString
-
-class TkcTagAll<TkcTagString
-  def self.new(parent)
-    super(parent, 'all')
-  end
-=begin
-  def initialize(parent)
-    #unless parent.kind_of?(TkCanvas)
-    #  fail ArgumentError, "expect TkCanvas for 1st argument"
-    #end
-    @c = parent
-    @cpath = parent.path
-    @path = @id = 'all'
-    CTagID_TBL.mutex.synchronize{
-      CTagID_TBL[@cpath] = {} unless CTagID_TBL[@cpath]
-      CTagID_TBL[@cpath][@id] = self
-    }
-  end
-=end
-end
-
-class TkcTagCurrent<TkcTagString
-  def self.new(parent)
-    super(parent, 'current')
-  end
-=begin
-  def initialize(parent)
-    #unless parent.kind_of?(TkCanvas)
-    #  fail ArgumentError, "expect TkCanvas for 1st argument"
-    #end
-    @c = parent
-    @cpath = parent.path
-    @path = @id = 'current'
-    CTagID_TBL.mutex.synchronize{
-      CTagID_TBL[@cpath] = {} unless CTagID_TBL[@cpath]
-      CTagID_TBL[@cpath][@id] = self
-    }
-  end
-=end
-end
-
-class TkcGroup<TkcTag
-  (Tk_cGroup_ID = ['tkcg'.freeze, TkUtil.untrust('00000')]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  #def create_self(parent, *args)
-  def initialize(parent, *args)
-    #unless parent.kind_of?(TkCanvas)
-    #  fail ArgumentError, "expect TkCanvas for 1st argument"
-    #end
-    @c = parent
-    @cpath = parent.path
-    Tk_cGroup_ID.mutex.synchronize{
-      # @path = @id = Tk_cGroup_ID.join('')
-      @path = @id = Tk_cGroup_ID.join(TkCore::INTERP._ip_id_)
-      Tk_cGroup_ID[1].succ!
-    }
-    CTagID_TBL.mutex.synchronize{
-      CTagID_TBL[@cpath] = {} unless CTagID_TBL[@cpath]
-      CTagID_TBL[@cpath][@id] = self
-    }
-    include(*args) if args != []
-  end
-  #private :create_self
-
-  def include(*tags)
-    for i in tags
-      #i.addtag(@id)
-      @c.addtag_withtag(@id, i)
-    end
-    self
-  end
-  alias add include
-
-  def exclude(*tags)
-    for i in tags
-      #i.dtag(@id)
-      @c.dtag(i, @id)
-    end
-    self
-  end
-end
diff --git a/ext/tk/lib/tk/checkbutton.rb b/ext/tk/lib/tk/checkbutton.rb
deleted file mode 100644
index 521b015b3e..0000000000
--- a/ext/tk/lib/tk/checkbutton.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/checkbutton.rb : treat checkbutton widget
-#
-require 'tk'
-require 'tk/radiobutton'
-
-class Tk::CheckButton<Tk::RadioButton
-  TkCommandNames = ['checkbutton'.freeze].freeze
-  WidgetClassName = 'Checkbutton'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-  #def create_self(keys)
-  #  if keys and keys != None
-  #    tk_call_without_enc('checkbutton', @path, *hash_kv(keys, true))
-  #  else
-  #    tk_call_without_enc('checkbutton', @path)
-  #  end
-  #end
-  #private :create_self
-
-  def toggle
-    tk_send_without_enc('toggle')
-    self
-  end
-end
-
-Tk::Checkbutton = Tk::CheckButton
-#TkCheckButton = Tk::CheckButton unless Object.const_defined? :TkCheckButton
-#TkCheckbutton = Tk::Checkbutton unless Object.const_defined? :TkCheckbutton
-#Tk.__set_toplevel_aliases__(:Tk, Tk::CheckButton,
-#                            :TkCheckButton, :TkCheckbutton)
-Tk.__set_loaded_toplevel_aliases__('tk/checkbutton.rb', :Tk, Tk::CheckButton,
-                                   :TkCheckButton, :TkCheckbutton)
diff --git a/ext/tk/lib/tk/clipboard.rb b/ext/tk/lib/tk/clipboard.rb
deleted file mode 100644
index c5f481f979..0000000000
--- a/ext/tk/lib/tk/clipboard.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/clipboard.rb : methods to treat clipboard
-#
-require 'tk'
-
-module TkClipboard
-  include Tk
-  extend Tk
-
-  TkCommandNames = ['clipboard'.freeze].freeze
-
-  def self.clear(win=nil)
-    if win
-      tk_call_without_enc('clipboard', 'clear', '-displayof', win)
-    else
-      tk_call_without_enc('clipboard', 'clear')
-    end
-  end
-  def self.clear_on_display(win)
-    tk_call_without_enc('clipboard', 'clear', '-displayof', win)
-  end
-
-  def self.get(type=nil)
-    if type
-      tk_call_without_enc('clipboard', 'get', '-type', type)
-    else
-      tk_call_without_enc('clipboard', 'get')
-    end
-  end
-  def self.get_on_display(win, type=nil)
-    if type
-      tk_call_without_enc('clipboard', 'get', '-displayof', win, '-type', type)
-    else
-      tk_call_without_enc('clipboard', 'get', '-displayof', win)
-    end
-  end
-
-  def self.set(data, keys=nil)
-    clear
-    append(data, keys)
-  end
-  def self.set_on_display(win, data, keys=nil)
-    clear(win)
-    append_on_display(win, data, keys)
-  end
-
-  def self.append(data, keys=nil)
-    args = ['clipboard', 'append']
-    args.concat(hash_kv(keys))
-    args.concat(['--', data])
-    tk_call(*args)
-  end
-  def self.append_on_display(win, data, keys=nil)
-    args = ['clipboard', 'append', '-displayof', win]
-    args.concat(hash_kv(keys))
-    args.concat(['--', data])
-    tk_call(*args)
-  end
-
-  def clear
-    TkClipboard.clear_on_display(self)
-    self
-  end
-  def get(type=nil)
-    TkClipboard.get_on_display(self, type)
-  end
-  def set(data, keys=nil)
-    TkClipboard.set_on_display(self, data, keys)
-    self
-  end
-  def append(data, keys=nil)
-    TkClipboard.append_on_display(self, data, keys)
-    self
-  end
-end
diff --git a/ext/tk/lib/tk/clock.rb b/ext/tk/lib/tk/clock.rb
deleted file mode 100644
index df900d7364..0000000000
--- a/ext/tk/lib/tk/clock.rb
+++ /dev/null
@@ -1,72 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/clock.rb : methods for clock command
-#
-require 'tk'
-
-module Tk
-  module Clock
-    include Tk
-    extend TkCore
-
-    def self.add(clk, *args)
-      tk_call_without_enc('clock','add', clk, *args).to_i
-    end
-
-    def self.clicks(ms=nil)
-      ms = ms.to_s if ms.kind_of?(Symbol)
-      case ms
-      when nil, ''
-        tk_call_without_enc('clock','clicks').to_i
-      when /^mic/
-        tk_call_without_enc('clock','clicks','-microseconds').to_i
-      when /^mil/
-        tk_call_without_enc('clock','clicks','-milliseconds').to_i
-      else
-        tk_call_without_enc('clock','clicks','-milliseconds').to_i
-      end
-    end
-
-    def self.format(clk, form=nil)
-      if form
-        tk_call('clock','format',clk,'-format',form)
-      else
-        tk_call('clock','format',clk)
-      end
-    end
-
-    def self.formatGMT(clk, form=nil)
-      if form
-        tk_call('clock','format',clk,'-format',form,'-gmt','1')
-      else
-        tk_call('clock','format',clk,'-gmt','1')
-      end
-    end
-
-    def self.scan(str, base=nil)
-      if base
-        tk_call('clock','scan',str,'-base',base).to_i
-      else
-        tk_call('clock','scan',str).to_i
-      end
-    end
-
-    def self.scanGMT(str, base=nil)
-      if base
-        tk_call('clock','scan',str,'-base',base,'-gmt','1').to_i
-      else
-        tk_call('clock','scan',str,'-gmt','1').to_i
-      end
-    end
-
-    def self.seconds
-      tk_call_without_enc('clock','seconds').to_i
-    end
-    def self.milliseconds
-      tk_call_without_enc('clock','milliseconds').to_i
-    end
-    def self.microseconds
-      tk_call_without_enc('clock','microseconds').to_i
-    end
-  end
-end
diff --git a/ext/tk/lib/tk/composite.rb b/ext/tk/lib/tk/composite.rb
deleted file mode 100644
index 830d383d69..0000000000
--- a/ext/tk/lib/tk/composite.rb
+++ /dev/null
@@ -1,485 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/composite.rb :
-#
-require 'tk'
-
-module TkComposite
-  include Tk
-  extend Tk
-
-=begin
-  def initialize(parent=nil, *args)
-    @delegates = {}
-    @option_methods = {}
-    @option_setting = {}
-
-    if parent.kind_of? Hash
-      keys = _symbolkey2str(parent)
-      parent = keys.delete('parent')
-      @frame = TkFrame.new(parent)
-      @path = @epath = @frame.path
-      initialize_composite(keys)
-    else
-      @frame = TkFrame.new(parent)
-      @path = @epath = @frame.path
-      initialize_composite(*args)
-    end
-  end
-=end
-
-  def _choice_classname_of_baseframe
-    base_class_name = nil
-
-    klass = WidgetClassNames[self.class::WidgetClassName]
-
-    if klass
-      # WidgetClassName is a known class
-      #if klass <= TkFrame || klass < TkComposite
-      if klass <= TkFrame || klass < Tk::Frame || klass < TkComposite
-        # klass is valid for the base frame
-        if self.class <= klass
-          # use my classname
-          base_class_name = self.class.name
-          if base_class_name == ''
-            # anonymous class -> use ancestor's name
-            base_class_name = klass.name
-          end
-        else
-          # not subclass -> use WidgetClassName
-          base_class_name = klass.name
-        end
-
-      else
-        # klass is invalid for the base frame
-        #if self.class < TkFrame || self.class.superclass < TkComposite
-        if self.class < TkFrame || self.class.superclass < Tk::Frame || self.class.superclass < TkComposite
-          # my class name is valid for the base frame -> use my classname
-          base_class_name = self.class.name
-          if base_class_name == ''
-            # anonymous class -> use TkFrame
-            base_class_name = nil
-          end
-        else
-          # no idea for the base frame -> use TkFrame
-          base_class_name = nil
-        end
-      end
-
-    elsif self.class::WidgetClassName && ! self.class::WidgetClassName.empty?
-      # unknown WidgetClassName is defined -> use it for the base frame
-      base_class_name = self.class::WidgetClassName
-
-    else
-      # no valid WidgetClassName
-      #if self.class < TkFrame || self.class.superclass < TkComposite
-      if self.class < TkFrame || self.class.superclass < Tk::Frame || self.class.superclass < TkComposite
-        # my class name is valid for the base frame -> use my classname
-        base_class_name = self.class.name
-        if base_class_name == ''
-          # anonymous class -> use TkFrame
-          base_class_name = nil
-        end
-      else
-        # no idea for the base frame -> use TkFrame
-        base_class_name = nil
-      end
-    end
-
-    base_class_name
-  end
-  private :_choice_classname_of_baseframe
-
-  # def initialize(parent=nil, *args)
-  def initialize(*args)
-    @delegates = {}
-    @option_methods = {}
-    @option_setting = {}
-
-    if args[-1].kind_of?(Hash)
-      keys = _symbolkey2str(args.pop)
-    else
-      keys = {}
-    end
-    parent = args.shift
-    parent = keys.delete('parent') if keys.has_key?('parent')
-
-    if keys.key?('classname')
-      keys['class'] = keys.delete('classname')
-    end
-    if (base_class_name = (keys.delete('class')).to_s).empty?
-      base_class_name = _choice_classname_of_baseframe
-    end
-
-    if base_class_name
-      # @frame = Tk::Frame.new(parent, :class=>base_class_name)
-      # --> use current TkFrame class
-      @frame = TkFrame.new(parent, :class=>base_class_name)
-    else
-      # @frame = Tk::Frame.new(parent)
-      # --> use current TkFrame class
-      @frame = TkFrame.new(parent)
-    end
-    @path = @epath = @frame.path
-
-    args.push(keys) unless keys.empty?
-    initialize_composite(*args)
-  end
-
-  def database_classname
-    @frame.database_classname
-  end
-
-  def database_class
-    @frame.database_class
-  end
-
-  def epath
-    @epath
-  end
-
-  def initialize_composite(*args) end
-  private :initialize_composite
-
-  def inspect
-    str = super
-    str.chop << ' @epath=' << @epath.inspect << '>'
-  end
-
-  def _get_opt_method_list(arg)
-    m_set, m_cget, m_info = arg
-    m_set  = m_set.to_s
-    m_cget = m_set if !m_cget && self.method(m_set).arity == -1
-    m_cget = m_cget.to_s if m_cget
-    m_info = m_info.to_s if m_info
-    [m_set, m_cget, m_info]
-  end
-  private :_get_opt_method_list
-
-  def option_methods(*opts)
-    if opts.size == 1 && opts[0].kind_of?(Hash)
-      # {name => [m_set, m_cget, m_info], name => method} style
-      opts[0].each{|name, arg|
-        m_set, m_cget, m_info = _get_opt_method_list(arg)
-        @option_methods[name.to_s] = {
-          :set => m_set, :cget => m_cget, :info => m_info
-        }
-      }
-    else
-      # [m_set, m_cget, m_info] or method style
-      opts.each{|arg|
-        m_set, m_cget, m_info = _get_opt_method_list(arg)
-        @option_methods[m_set] = {
-          :set => m_set, :cget => m_cget, :info => m_info
-        }
-      }
-    end
-  end
-
-  def delegate_alias(alias_opt, option, *wins)
-    if wins.length == 0
-      fail ArgumentError, "target widgets are not given"
-    end
-    if alias_opt != option && (alias_opt == 'DEFAULT' || option == 'DEFAULT')
-      fail ArgumentError, "cannot alias 'DEFAULT' option"
-    end
-    alias_opt = alias_opt.to_s
-    option = option.to_s
-    if @delegates[alias_opt].kind_of?(Array)
-      if (elem = @delegates[alias_opt].assoc(option))
-        wins.each{|w| elem[1].push(w)}
-      else
-        @delegates[alias_opt] << [option, wins]
-      end
-    else
-      @delegates[alias_opt] = [ [option, wins] ]
-    end
-  end
-
-  def delegate(option, *wins)
-    delegate_alias(option, option, *wins)
-  end
-
-  def __cget_delegates(slot)
-    slot = slot.to_s
-
-    if @option_methods.include?(slot)
-      if @option_methods[slot][:cget]
-        return self.__send__(@option_methods[slot][:cget])
-      else
-        if @option_setting[slot]
-          return @option_setting[slot]
-        else
-          return ''
-        end
-      end
-    end
-
-    tbl = @delegates[slot]
-    tbl = @delegates['DEFAULT'] unless tbl
-
-    begin
-      if tbl
-        opt, wins = tbl[-1]
-        opt = slot if opt == 'DEFAULT'
-        if wins && wins[-1]
-          # return wins[-1].cget(opt)
-          return wins[-1].cget_strict(opt)
-        end
-      end
-    rescue
-    end
-
-    return None
-  end
-  private :__cget_delegates
-
-  def cget_tkstring(slot)
-    if (ret = __cget_delegates(slot)) == None
-      super(slot)
-    else
-      _get_eval_string(ret)
-    end
-  end
-
-  def cget(slot)
-    if (ret = __cget_delegates(slot)) == None
-      super(slot)
-    else
-      ret
-    end
-  end
-
-  def cget_strict(slot)
-    if (ret = __cget_delegates(slot)) == None
-      super(slot)
-    else
-      ret
-    end
-  end
-
-=begin
-  def cget(slot)
-    slot = slot.to_s
-
-    if @option_methods.include?(slot)
-      if @option_methods[slot][:cget]
-        return self.__send__(@option_methods[slot][:cget])
-      else
-        if @option_setting[slot]
-          return @option_setting[slot]
-        else
-          return ''
-        end
-      end
-    end
-
-    tbl = @delegates[slot]
-    tbl = @delegates['DEFAULT'] unless tbl
-
-    begin
-      if tbl
-        opt, wins = tbl[-1]
-        opt = slot if opt == 'DEFAULT'
-        if wins && wins[-1]
-          return wins[-1].cget(opt)
-        end
-      end
-    rescue
-    end
-
-    super(slot)
-  end
-=end
-
-  def configure(slot, value=None)
-    if slot.kind_of? Hash
-      slot.each{|slot,value| configure slot, value}
-      return self
-    end
-
-    slot = slot.to_s
-
-    if @option_methods.include?(slot)
-      unless @option_methods[slot][:cget]
-        if value.kind_of?(Symbol)
-          @option_setting[slot] = value.to_s
-        else
-          @option_setting[slot] = value
-        end
-      end
-      return self.__send__(@option_methods[slot][:set], value)
-    end
-
-    tbl = @delegates[slot]
-    tbl = @delegates['DEFAULT'] unless tbl
-
-    begin
-      if tbl
-        last = nil
-        tbl.each{|opt, wins|
-          opt = slot if opt == 'DEFAULT'
-          wins.each{|w| last = w.configure(opt, value)}
-        }
-        return last
-      end
-    rescue
-    end
-
-    super(slot, value)
-  end
-
-  def configinfo(slot = nil)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if slot
-        slot = slot.to_s
-        if @option_methods.include?(slot)
-          if @option_methods[slot][:info]
-            return self.__send__(@option_methods[slot][:info])
-          else
-            return [slot, '', '', '', self.cget(slot)]
-          end
-        end
-
-        tbl = @delegates[slot]
-        tbl = @delegates['DEFAULT'] unless tbl
-
-        begin
-          if tbl
-            if tbl.length == 1
-              opt, wins = tbl[0]
-              if slot == opt || opt == 'DEFAULT'
-                return wins[-1].configinfo(slot)
-              else
-                info = wins[-1].configinfo(opt)
-                info[0] = slot
-                return info
-              end
-            else
-              opt, wins = tbl[-1]
-              return [slot, '', '', '', wins[-1].cget(opt)]
-            end
-          end
-        rescue
-        end
-
-        super(slot)
-
-      else # slot == nil
-        info_list = super(slot)
-
-        tbl = @delegates['DEFAULT']
-        if tbl
-          wins = tbl[0][1]
-          if wins && wins[-1]
-            wins[-1].configinfo.each{|info|
-              slot = info[0]
-              info_list.delete_if{|i| i[0] == slot} << info
-            }
-          end
-        end
-
-        @delegates.each{|slot, tbl|
-          next if slot == 'DEFAULT'
-          if tbl.length == 1
-            opt, wins = tbl[0]
-            next unless wins && wins[-1]
-            if slot == opt
-              info_list.delete_if{|i| i[0] == slot} <<
-                wins[-1].configinfo(slot)
-            else
-              info = wins[-1].configinfo(opt)
-              info[0] = slot
-              info_list.delete_if{|i| i[0] == slot} << info
-            end
-          else
-            opt, wins = tbl[-1]
-            info_list.delete_if{|i| i[0] == slot} <<
-              [slot, '', '', '', wins[-1].cget(opt)]
-          end
-        }
-
-        @option_methods.each{|slot, m|
-          if m[:info]
-            info = self.__send__(m[:info])
-          else
-            info = [slot, '', '', '', self.cget(slot)]
-          end
-          info_list.delete_if{|i| i[0] == slot} << info
-        }
-
-        info_list
-      end
-
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      if slot
-        slot = slot.to_s
-        if @option_methods.include?(slot)
-          if @option_methods[slot][:info]
-            return self.__send__(@option_methods[slot][:info])
-          else
-            return {slot => ['', '', '', self.cget(slot)]}
-          end
-        end
-
-        tbl = @delegates[slot]
-        tbl = @delegates['DEFAULT'] unless tbl
-
-        begin
-          if tbl
-            if tbl.length == 1
-              opt, wins = tbl[0]
-              if slot == opt || opt == 'DEFAULT'
-                return wins[-1].configinfo(slot)
-              else
-                return {slot => wins[-1].configinfo(opt)[opt]}
-              end
-            else
-              opt, wins = tbl[-1]
-              return {slot => ['', '', '', wins[-1].cget(opt)]}
-            end
-          end
-        rescue
-        end
-
-        super(slot)
-
-      else # slot == nil
-        info_list = super(slot)
-
-        tbl = @delegates['DEFAULT']
-        if tbl
-          wins = tbl[0][1]
-          info_list.update(wins[-1].configinfo) if wins && wins[-1]
-        end
-
-        @delegates.each{|slot, tbl|
-          next if slot == 'DEFAULT'
-          if tbl.length == 1
-            opt, wins = tbl[0]
-            next unless wins && wins[-1]
-            if slot == opt
-              info_list.update(wins[-1].configinfo(slot))
-            else
-              info_list.update({slot => wins[-1].configinfo(opt)[opt]})
-            end
-          else
-            opt, wins = tbl[-1]
-            info_list.update({slot => ['', '', '', wins[-1].cget(opt)]})
-          end
-        }
-
-        @option_methods.each{|slot, m|
-          if m[:info]
-            info = self.__send__(m[:info])
-          else
-            info = {slot => ['', '', '', self.cget(slot)]}
-          end
-          info_list.update(info)
-        }
-
-        info_list
-      end
-    end
-  end
-end
diff --git a/ext/tk/lib/tk/console.rb b/ext/tk/lib/tk/console.rb
deleted file mode 100644
index c560912da8..0000000000
--- a/ext/tk/lib/tk/console.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-# frozen_string_literal: false
-#
-#   tk/console.rb : control the console on system without a real console
-#
-require 'tk'
-
-module TkConsole
-  include Tk
-  extend Tk
-
-  TkCommandNames = ['console'.freeze, 'consoleinterp'.freeze].freeze
-
-  def self.create
-    TkCore::INTERP._create_console
-  end
-  self.create  # initialize console
-
-  def self.title(str=None)
-    tk_call 'console', str
-  end
-  def self.hide
-    tk_call_without_enc('console', 'hide')
-  end
-  def self.show
-    tk_call_without_enc('console', 'show')
-  end
-  def self.eval(tcl_script)
-    #
-    # supports a Tcl script only
-    # I have no idea to support a Ruby script seamlessly.
-    #
-    _fromUTF8(tk_call_without_enc('console', 'eval',
-                                  _get_eval_enc_str(tcl_script)))
-  end
-  def self.maininterp_eval(tcl_script)
-    #
-    # supports a Tcl script only
-    # I have no idea to support a Ruby script seamlessly.
-    #
-    _fromUTF8(tk_call_without_enc('consoleinterp', 'eval',
-                                  _get_eval_enc_str(tcl_script)))
-
-  end
-  def self.maininterp_record(tcl_script)
-    #
-    # supports a Tcl script only
-    # I have no idea to support a Ruby script seamlessly.
-    #
-    _fromUTF8(tk_call_without_enc('consoleinterp', 'record',
-                                  _get_eval_enc_str(tcl_script)))
-
-  end
-end
diff --git a/ext/tk/lib/tk/dialog.rb b/ext/tk/lib/tk/dialog.rb
deleted file mode 100644
index 0b19be7cfa..0000000000
--- a/ext/tk/lib/tk/dialog.rb
+++ /dev/null
@@ -1,327 +0,0 @@
-# frozen_string_literal: false
-#
-#   tk/dialog.rb : create dialog boxes
-#
-require 'tk'
-require 'tk/variable.rb'
-
-class TkDialogObj < TkWindow
-  extend Tk
-
-  TkCommandNames = ['tk_dialog'.freeze].freeze
-
-  def self.show(*args)
-    dlog = self.new(*args)
-    dlog.show
-    dlog
-  end
-
-  def _set_button_config(configs)
-    set_config = proc{|c,i|
-      if $VERBOSE && (c.has_key?('command') || c.has_key?(:command))
-        STDERR.print("Warning: cannot give a command option " +
-                     "to the dialog button#{i}. It was removed.\n")
-      end
-      c.delete('command'); c.delete(:command)
-      # @config << Kernel.format("%s.button%s configure %s; ",
-      #                                @path, i, hash_kv(c).join(' '))
-      # @config << @path+'.button'+i.to_s+' configure '+hash_kv(c).join(' ')+'; '
-      @config << @path+'.button'+i.to_s+' configure '+
-                   array2tk_list(hash_kv(c))+'; '
-    }
-    case configs
-    when Proc
-      @buttons.each_index{|i|
-        if (c = configs.call(i)).kind_of?(Hash)
-          set_config.call(c,i)
-        end
-      }
-
-    when Array
-      @buttons.each_index{|i|
-        if (c = configs[i]).kind_of?(Hash)
-          set_config.call(c,i)
-        end
-      }
-
-    when Hash
-      @buttons.each_with_index{|s,i|
-        if (c = configs[s]).kind_of?(Hash)
-          set_config.call(c,i)
-        end
-      }
-    end
-    # @config = 'after idle {' + @config + '};' if @config != ""
-    @config = array2tk_list(['after', 'idle', @config]) << ';' if @config != ""
-  end
-  private :_set_button_config
-
-  # initialize tk_dialog
-  def create_self(keys)
-    # @var = TkVariable.new
-    @val = nil
-
-    @title   = title
-
-    @message = message
-    @message_config = message_config
-    @msgframe_config = msgframe_config
-
-    @bitmap  = bitmap
-    @bitmap_config = message_config
-
-    @default_button = default_button
-
-    @buttons = buttons
-    @button_configs = proc{|num| button_configs(num)}
-    @btnframe_config = btnframe_config
-
-    #@config = "puts [winfo children .w0000];"
-    @config = ""
-
-    @command = prev_command
-
-    if keys.kind_of?(Hash)
-      @title   = keys['title'] if keys.key? 'title'
-      @message = keys['message'] if keys.key? 'message'
-      @bitmap  = keys['bitmap'] if keys.key? 'bitmap'
-      # @bitmap  = '{}' if @bitmap == nil || @bitmap == ""
-      @bitmap  = '' unless @bitmap
-      @default_button = keys['default'] if keys.key? 'default'
-      @buttons = keys['buttons'] if keys.key? 'buttons'
-
-      @command = keys['prev_command'] if keys.key? 'prev_command'
-
-      @message_config = keys['message_config'] if keys.key? 'message_config'
-      @msgframe_config = keys['msgframe_config'] if keys.key? 'msgframe_config'
-      @bitmap_config  = keys['bitmap_config']  if keys.key? 'bitmap_config'
-      @button_configs = keys['button_configs'] if keys.key? 'button_configs'
-      @btnframe_config = keys['btnframe_config'] if keys.key? 'btnframe_config'
-    end
-
-    #if @title.include? ?\s
-    #  @title = '{' + @title + '}'
-    #end
-
-    if @buttons.kind_of?(Array)
-      _set_button_config(@buttons.collect{|cfg|
-                           (cfg.kind_of? Array)? cfg[1]: nil})
-      @buttons = @buttons.collect{|cfg| (cfg.kind_of? Array)? cfg[0]: cfg}
-    end
-    if @buttons.kind_of?(Hash)
-      _set_button_config(@buttons)
-      @buttons = @buttons.keys
-    end
-    @buttons = tk_split_simplelist(@buttons) if @buttons.kind_of?(String)
-    @buttons = [] unless @buttons
-=begin
-    @buttons = @buttons.collect{|s|
-      if s.kind_of?(Array)
-        s = s.join(' ')
-      end
-      if s.include? ?\s
-        '{' + s + '}'
-      else
-        s
-      end
-    }
-=end
-
-    if @message_config.kind_of?(Hash)
-      # @config << Kernel.format("%s.msg configure %s;",
-      #                        @path, hash_kv(@message_config).join(' '))
-      # @config << @path+'.msg configure '+hash_kv(@message_config).join(' ')+';'
-      @config << @path+'.msg configure '+
-                   array2tk_list(hash_kv(@message_config))+';'
-    end
-
-    if @msgframe_config.kind_of?(Hash)
-      # @config << Kernel.format("%s.top configure %s;",
-      #                        @path, hash_kv(@msgframe_config).join(' '))
-      # @config << @path+'.top configure '+hash_kv(@msgframe_config).join(' ')+';'
-      @config << @path+'.top configure '+
-                   array2tk_list(hash_kv(@msgframe_config))+';'
-    end
-
-    if @btnframe_config.kind_of?(Hash)
-      # @config << Kernel.format("%s.bot configure %s;",
-      #                        @path, hash_kv(@btnframe_config).join(' '))
-      # @config << @path+'.bot configure '+hash_kv(@btnframe_config).join(' ')+';'
-      @config << @path+'.bot configure '+
-                   array2tk_list(hash_kv(@btnframe_config))+';'
-    end
-
-    if @bitmap_config.kind_of?(Hash)
-      # @config << Kernel.format("%s.bitmap configure %s;",
-      #                        @path, hash_kv(@bitmap_config).join(' '))
-      # @config << @path+'.bitmap configure '+hash_kv(@bitmap_config).join(' ')+';'
-      @config << @path+'.bitmap configure '+
-                    array2tk_list(hash_kv(@bitmap_config))+';'
-    end
-
-    _set_button_config(@button_configs) if @button_configs
-  end
-  private :create_self
-
-  def show
-    # if @command.kind_of?(Proc)
-    if TkComm._callback_entry?(@command)
-      @command.call(self)
-    end
-
-    if @default_button.kind_of?(String)
-      default_button = @buttons.index(@default_button)
-    else
-      default_button = @default_button
-    end
-    # default_button = '{}' if default_button == nil
-    default_button = '' if default_button == nil
-    #Tk.ip_eval('eval {global '+@var.id+';'+@config+
-    #          'set '+@var.id+' [tk_dialog '+
-    #          @path+" "+@title+" {#{@message}} "+@bitmap+" "+
-    #          String(default_button)+" "+@buttons.join(' ')+']}')
-    Tk.ip_eval(@config)
-    # @val = Tk.ip_eval('tk_dialog ' + @path + ' ' + @title +
-    #                 ' {' + @message + '} ' + @bitmap + ' ' +
-    #                 String(default_button) + ' ' + @buttons.join(' ')).to_i
-    # @val = Tk.ip_eval(self.class::TkCommandNames[0] + ' ' + @path + ' ' +
-    #                   @title + ' {' + @message + '} ' + @bitmap + ' ' +
-    #                   String(default_button) + ' ' + @buttons.join(' ')).to_i
-    @val = Tk.ip_eval(array2tk_list([
-                                      self.class::TkCommandNames[0],
-                                      @path, @title, @message, @bitmap,
-                                      String(default_button)
-                                    ].concat(@buttons))).to_i
-  end
-
-  def value
-    # @var.value.to_i
-    @val
-  end
-
-  def name
-    (@val)? @buttons[@val]: nil
-  end
-
-  ############################################################
-  #                                                          #
-  #  following methods should be overridden for each dialog  #
-  #                                                          #
-  ############################################################
-  private
-
-  def title
-    # returns a title string of the dialog window
-    return "DIALOG"
-  end
-  def message
-    # returns a message text to display on the dialog
-    return "MESSAGE"
-  end
-  def message_config
-    # returns a Hash {option=>value, ...} for the message text
-    return nil
-  end
-  def msgframe_config
-    # returns a Hash {option=>value, ...} for the message text frame
-    return nil
-  end
-  def bitmap
-    # returns a bitmap name or a bitmap file path
-    # (@ + path ; e.g. '@/usr/share/bitmap/sample.xbm')
-    return "info"
-  end
-  def bitmap_config
-    # returns nil or a Hash {option=>value, ...} for the bitmap
-    return nil
-  end
-  def default_button
-    # returns a default button's number or name
-    # if nil or null string, set no-default
-    return 0
-  end
-  def buttons
-    #return "BUTTON1 BUTTON2"
-    return ["BUTTON1", "BUTTON2"]
-  end
-  def button_configs(num)
-    # returns nil / Proc / Array or Hash (see _set_button_config)
-    return nil
-  end
-  def btnframe_config
-    # returns nil or a Hash {option=>value, ...} for the button frame
-    return nil
-  end
-  def prev_command
-    # returns nil or a Proc
-    return nil
-  end
-end
-TkDialog2 = TkDialogObj
-
-#
-# TkDialog : with showing at initialize
-#
-class TkDialog < TkDialogObj
-  def self.show(*args)
-    self.new(*args)
-  end
-
-  def initialize(*args)
-    super(*args)
-    show
-  end
-end
-
-
-#
-# dialog for warning
-#
-class TkWarningObj < TkDialogObj
-  def initialize(parent = nil, mes = nil)
-    if !mes
-      if parent.kind_of?(TkWindow)
-        mes = ""
-      else
-        mes = parent.to_s
-        parent = nil
-      end
-    end
-    super(parent, :message=>mes)
-  end
-
-  def show(mes = nil)
-    mes_bup = @message
-    @message = mes if mes
-    ret = super()
-    @message = mes_bup
-    ret
-  end
-
-  #######
-  private
-
-  def title
-    return "WARNING";
-  end
-  def bitmap
-    return "warning";
-  end
-  def default_button
-    return 0;
-  end
-  def buttons
-    return "OK";
-  end
-end
-TkWarning2 = TkWarningObj
-
-class TkWarning < TkWarningObj
-  def self.show(*args)
-    self.new(*args)
-  end
-  def initialize(*args)
-    super(*args)
-    show
-  end
-end
diff --git a/ext/tk/lib/tk/encodedstr.rb b/ext/tk/lib/tk/encodedstr.rb
deleted file mode 100644
index 9ca13b3d1a..0000000000
--- a/ext/tk/lib/tk/encodedstr.rb
+++ /dev/null
@@ -1,188 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/encodedstr.rb : Tk::EncodedString class
-#
-require 'tk'
-
-###########################################
-#  string with Tcl's encoding
-###########################################
-module Tk
-  class EncodedString < String
-    Encoding = nil
-
-    def self.subst_utf_backslash(str)
-      # str.gsub(/\\u([0-9A-Fa-f]{1,4})/){[$1.hex].pack('U')}
-      TclTkLib._subst_UTF_backslash(str)
-    end
-    def self.utf_backslash(str)
-      self.subst_utf_backslash(str)
-    end
-
-    def self.subst_tk_backslash(str)
-      TclTkLib._subst_Tcl_backslash(str)
-    end
-
-    def self.utf_to_backslash_sequence(str)
-      str.unpack('U*').collect{|c|
-        if c <= 0xFF  # ascii character
-          c.chr
-        else
-          format('\u%X', c)
-        end
-      }.join('')
-    end
-    def self.utf_to_backslash(str)
-      self.utf_to_backslash_sequence(str)
-    end
-
-    def self.to_backslash_sequence(str)
-      str.unpack('U*').collect{|c|
-        if c <= 0x1F  # control character
-          case c
-          when 0x07; '\a'
-          when 0x08; '\b'
-          when 0x09; '\t'
-          when 0x0a; '\n'
-          when 0x0b; '\v'
-          when 0x0c; '\f'
-          when 0x0d; '\r'
-          else
-            format('\x%02X', c)
-          end
-        elsif c <= 0xFF  # ascii character
-          c.chr
-        else
-          format('\u%X', c)
-        end
-      }.join('')
-    end
-
-    def self.new_with_utf_backslash(str, enc = nil)
-      self.new('', enc).replace(self.subst_utf_backslash(str))
-    end
-
-    def self.new_without_utf_backslash(str, enc = nil)
-      self.new('', enc).replace(str)
-    end
-
-    def initialize(str, enc = nil)
-      super(str)
-      # @encoding = ( enc ||
-      #              ((self.class::Encoding)?
-      #                  self.class::Encoding : Tk.encoding_system) )
-      enc ||= (self.class::Encoding)?
-                         self.class::Encoding :
-                         ((Tk.encoding)? Tk.encoding : Tk.encoding_system)
-      if TkCore::WITH_ENCODING
-        unless encobj = Tk::Encoding::ENCODING_TABLE.get_obj(enc)
-          fail ArgumentError, "unsupported Tk encoding '#{enc}'"
-        end
-        self.force_encoding(encobj)
-      else
-        @encoding = enc
-      end
-    end
-
-    if TkCore::WITH_ENCODING
-      alias encoding_obj encoding
-      alias __encoding   encoding
-      def encoding
-        Tk::Encoding::ENCODING_TABLE.get_name(super())
-      end
-    else
-      def encoding
-        @encoding
-      end
-      alias encoding_obj encoding
-    end
-
-    if TkCore::WITH_ENCODING
-      # wrapper methods for compatibility
-      alias __instance_variable_get instance_variable_get
-      alias __instance_variable_set instance_variable_set
-      alias __instance_eval         instance_eval
-      alias __instance_variables    instance_variables
-
-      def instance_variable_get(key)
-        if (key.to_s == '@encoding')
-          self.encoding
-        else
-          super(key)
-        end
-      end
-
-      def instance_variable_set(key, value)
-        if (key.to_s == '@encoding')
-          if value
-            self.force_encoding(value)
-          else
-            self.force_encoding(Tk::Encoding::UNKNOWN)
-          end
-          value
-        else
-          super(key, value)
-        end
-      end
-
-      def instance_eval(*args, &b)
-        old_enc = @encoding = self.encoding
-
-        ret = super(*args, &b)
-
-        if @encoding
-          if @encoding != old_enc
-            # modified by user
-            self.force_encoding(@encoding)
-          end
-          remove_instance_variable(:@encoding)
-        else
-          begin
-            remove_instance_variable(:@encoding)
-            # user sets to nil -> use current default
-            self.force_encoding(Tk.encoding)
-          rescue NameError
-            # removed by user -> ignore, because user don't use @encoding
-          end
-        end
-        ret
-      end
-    end
-
-    def instance_variables
-      ret = super()
-      ret << :@encoding  # fake !!
-      ret
-    end
-  end
-  # def Tk.EncodedString(str, enc = nil)
-  #   Tk::EncodedString.new(str, enc)
-  # end
-
-  ##################################
-
-  class BinaryString < EncodedString
-    Encoding = 'binary'.freeze
-  end
-  # def Tk.BinaryString(str)
-  #   Tk::BinaryString.new(str)
-  # end
-
-  ##################################
-
-  class UTF8_String < EncodedString
-    Encoding = 'utf-8'.freeze
-    def self.new(str)
-      super(self.subst_utf_backslash(str))
-    end
-
-    def to_backslash_sequence
-      Tk::EncodedString.utf_to_backslash_sequence(self)
-    end
-    alias to_backslash to_backslash_sequence
-  end
-  # def Tk.UTF8_String(str)
-  #   Tk::UTF8_String.new(str)
-  # end
-
-end
diff --git a/ext/tk/lib/tk/entry.rb b/ext/tk/lib/tk/entry.rb
deleted file mode 100644
index aa40e4755c..0000000000
--- a/ext/tk/lib/tk/entry.rb
+++ /dev/null
@@ -1,121 +0,0 @@
-# frozen_string_literal: false
-#
-#               tk/entry.rb - Tk entry classes
-#                       by Yukihiro Matsumoto <matz@caelum.co.jp>
-
-require 'tk'
-require 'tk/label'
-require 'tk/scrollable'
-require 'tk/validation'
-
-class Tk::Entry<Tk::Label
-  include X_Scrollable
-  include TkValidation
-
-  TkCommandNames = ['entry'.freeze].freeze
-  WidgetClassName = 'Entry'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  #def create_self(keys)
-  #  super(__conv_vcmd_on_hash_kv(keys))
-  #end
-  #private :create_self
-
-  def __strval_optkeys
-    super() + ['show', 'disabledbackground', 'readonlybackground']
-  end
-  private :__strval_optkeys
-
-  def bbox(index)
-    list(tk_send_without_enc('bbox', index))
-  end
-  def cursor
-    number(tk_send_without_enc('index', 'insert'))
-  end
-  alias icursor cursor
-  def cursor=(index)
-    tk_send_without_enc('icursor', index)
-    #self
-    index
-  end
-  alias icursor= cursor=
-  def index(idx)
-    number(tk_send_without_enc('index', idx))
-  end
-  def insert(pos,text)
-    tk_send_without_enc('insert', pos, _get_eval_enc_str(text))
-    self
-  end
-  def delete(first, last=None)
-    tk_send_without_enc('delete', first, last)
-    self
-  end
-  def mark(pos)
-    tk_send_without_enc('scan', 'mark', pos)
-    self
-  end
-  def dragto(pos)
-    tk_send_without_enc('scan', 'dragto', pos)
-    self
-  end
-  def selection_adjust(index)
-    tk_send_without_enc('selection', 'adjust', index)
-    self
-  end
-  def selection_clear
-    tk_send_without_enc('selection', 'clear')
-    self
-  end
-  def selection_from(index)
-    tk_send_without_enc('selection', 'from', index)
-    self
-  end
-  def selection_present()
-    bool(tk_send_without_enc('selection', 'present'))
-  end
-  def selection_range(s, e)
-    tk_send_without_enc('selection', 'range', s, e)
-    self
-  end
-  def selection_to(index)
-    tk_send_without_enc('selection', 'to', index)
-    self
-  end
-
-  def invoke_validate
-    bool(tk_send_without_enc('validate'))
-  end
-  def validate(mode = nil)
-    if mode
-      configure 'validate', mode
-    else
-      invoke_validate
-    end
-  end
-
-  def value
-    _fromUTF8(tk_send_without_enc('get'))
-  end
-  def value= (val)
-    tk_send_without_enc('delete', 0, 'end')
-    tk_send_without_enc('insert', 0, _get_eval_enc_str(val))
-    val
-  end
-  alias get value
-  alias set value=
-
-  def [](*args)
-    self.value[*args]
-  end
-  def []=(*args)
-    val = args.pop
-    str = self.value
-    str[*args] = val
-    self.value = str
-    val
-  end
-end
-
-#TkEntry = Tk::Entry unless Object.const_defined? :TkEntry
-#Tk.__set_toplevel_aliases__(:Tk, Tk::Entry, :TkEntry)
-Tk.__set_loaded_toplevel_aliases__('tk/entry.rb', :Tk, Tk::Entry, :TkEntry)
diff --git a/ext/tk/lib/tk/event.rb b/ext/tk/lib/tk/event.rb
deleted file mode 100644
index 5658e92874..0000000000
--- a/ext/tk/lib/tk/event.rb
+++ /dev/null
@@ -1,563 +0,0 @@
-# frozen_string_literal: false
-#
-#  tk/event.rb - module for event
-#
-
-module TkEvent
-end
-
-########################
-
-require 'tkutil'
-require 'tk' unless Object.const_defined? :TkComm
-
-########################
-
-module TkEvent
-  class Event < TkUtil::CallbackSubst
-    module Grp
-      KEY         =           0x1
-      BUTTON      =           0x2
-      MOTION      =           0x4
-      CROSSING    =           0x8
-      FOCUS       =           0x10
-      EXPOSE      =           0x20
-      VISIBILITY  =           0x40
-      CREATE      =           0x80
-      DESTROY     =           0x100
-      UNMAP       =           0x200
-      MAP         =           0x400
-      REPARENT    =           0x800
-      CONFIG      =           0x1000
-      GRAVITY     =           0x2000
-      CIRC        =           0x4000
-      PROP        =           0x8000
-      COLORMAP    =           0x10000
-      VIRTUAL     =           0x20000
-      ACTIVATE    =           0x40000
-      MAPREQ      =           0x80000
-      CONFIGREQ   =           0x100000
-      RESIZEREQ   =           0x200000
-      CIRCREQ     =           0x400000
-
-      MWHEEL      =           KEY
-
-      STRING_DATA =           0x80000000  # special flag for 'data' field
-
-      ALL         =           0xFFFFFFFF
-
-      KEY_BUTTON_MOTION_VIRTUAL  = (KEY|MWHEEL|BUTTON|MOTION|VIRTUAL)
-      KEY_BUTTON_MOTION_CROSSING = (KEY|MWHEEL|BUTTON|MOTION|CROSSING|VIRTUAL)
-    end
-
-    type_data = [
-      #-----+-------------------+------------------+-----------------------#
-      #  ID |  const            |  group_flag      |  context_name         #
-      #-----+-------------------+------------------+-----------------------#
-      [  2,  :KeyPress,          Grp::KEY,         'KeyPress',    'Key'    ],
-      [  3,  :KeyRelease,        Grp::KEY,         'KeyRelease'            ],
-      [  4,  :ButtonPress,       Grp::BUTTON,      'ButtonPress', 'Button' ],
-      [  5,  :ButtonRelease,     Grp::BUTTON,      'ButtonRelease'         ],
-      [  6,  :MotionNotify,      Grp::MOTION,      'Motion'                ],
-      [  7,  :EnterNotify,       Grp::CROSSING,    'Enter'                 ],
-      [  8,  :LeaveNotify,       Grp::CROSSING,    'Leave'                 ],
-      [  9,  :FocusIn,           Grp::FOCUS,       'FocusIn'               ],
-      [ 10,  :FocusOut,          Grp::FOCUS,       'FocusOut'              ],
-      [ 11,  :KeymapNotify,      0,                                        ],
-      [ 12,  :Expose,            Grp::EXPOSE,      'Expose'                ],
-      [ 13,  :GraphicsExpose,    Grp::EXPOSE,                              ],
-      [ 14,  :NoExpose,          0,                                        ],
-      [ 15,  :VisibilityNotify,  Grp::VISIBILITY,  'Visibility'            ],
-      [ 16,  :CreateNotify,      Grp::CREATE,      'Create'                ],
-      [ 17,  :DestroyNotify,     Grp::DESTROY,     'Destroy'               ],
-      [ 18,  :UnmapNotify,       Grp::UNMAP,       'Unmap'                 ],
-      [ 19,  :MapNotify,         Grp::MAP,         'Map'                   ],
-      [ 20,  :MapRequest,        Grp::MAPREQ,      'MapRequest'            ],
-      [ 21,  :ReparentNotify,    Grp::REPARENT,    'Reparent'              ],
-      [ 22,  :ConfigureNotify,   Grp::CONFIG,      'Configure'             ],
-      [ 23,  :ConfigureRequest,  Grp::CONFIGREQ,   'ConfigureRequest'      ],
-      [ 24,  :GravityNotify,     Grp::GRAVITY,     'Gravity'               ],
-      [ 25,  :ResizeRequest,     Grp::RESIZEREQ,   'ResizeRequest'         ],
-      [ 26,  :CirculateNotify,   Grp::CIRC,        'Circulate'             ],
-      [ 27,  :CirculateRequest,  0,                'CirculateRequest'      ],
-      [ 28,  :PropertyNotify,    Grp::PROP,        'Property'              ],
-      [ 29,  :SelectionClear,    0,                                        ],
-      [ 30,  :SelectionRequest,  0,                                        ],
-      [ 31,  :SelectionNotify,   0,                                        ],
-      [ 32,  :ColormapNotify,    Grp::COLORMAP,    'Colormap'              ],
-      [ 33,  :ClientMessage,     0,                                        ],
-      [ 34,  :MappingNotify,     0,                                        ],
-      [ 35,  :VirtualEvent,      Grp::VIRTUAL,                             ],
-      [ 36,  :ActivateNotify,    Grp::ACTIVATE,    'Activate'              ],
-      [ 37,  :DeactivateNotify,  Grp::ACTIVATE,    'Deactivate'            ],
-      [ 38,  :MouseWheelEvent,   Grp::MWHEEL,      'MouseWheel'            ],
-      [ 39,  :TK_LASTEVENT,      0,                                        ]
-    ]
-
-    module TypeNum
-    end
-
-    TYPE_NAME_TBL  = Hash.new
-    TYPE_ID_TBL    = Hash.new
-    TYPE_GROUP_TBL = Hash.new
-
-    type_data.each{|id, c_name, g_flag, *t_names|
-      TypeNum.const_set(c_name, id)
-      t_names.each{|t_name| t_name.freeze; TYPE_NAME_TBL[t_name] = id }
-      TYPE_ID_TBL[id]    = t_names
-      TYPE_GROUP_TBL[id] = g_flag
-    }
-
-    TYPE_NAME_TBL.freeze
-    TYPE_ID_TBL.freeze
-
-    def self.type_id(name)
-      TYPE_NAME_TBL[name.to_s]
-    end
-
-    def self.type_name(id)
-      TYPE_ID_TBL[id] && TYPE_ID_TBL[id][0]
-    end
-
-    def self.group_flag(id)
-      TYPE_GROUP_TBL[id] || 0
-    end
-
-    #############################################
-
-    module StateMask
-      ShiftMask      =        (1<<0)
-      LockMask       =        (1<<1)
-      ControlMask    =        (1<<2)
-      Mod1Mask       =        (1<<3)
-      Mod2Mask       =        (1<<4)
-      Mod3Mask       =        (1<<5)
-      Mod4Mask       =        (1<<6)
-      Mod5Mask       =        (1<<7)
-      Button1Mask    =        (1<<8)
-      Button2Mask    =        (1<<9)
-      Button3Mask    =        (1<<10)
-      Button4Mask    =        (1<<11)
-      Button5Mask    =        (1<<12)
-
-      AnyModifier    =        (1<<15)
-
-      META_MASK      =  (AnyModifier<<1)
-      ALT_MASK       =  (AnyModifier<<2)
-      EXTENDED_MASK  =  (AnyModifier<<3)
-
-      CommandMask    =  Mod1Mask
-      OptionMask     =  Mod2Mask
-    end
-
-    #############################################
-
-    FIELD_FLAG = {
-      # key  =>  flag
-      'above'       => Grp::CONFIG,
-      'borderwidth' => (Grp::CREATE|Grp::CONFIG),
-      'button'      => Grp::BUTTON,
-      'count'       => Grp::EXPOSE,
-      'data'        => (Grp::VIRTUAL|Grp::STRING_DATA),
-      'delta'       => Grp::MWHEEL,
-      'detail'      => (Grp::FOCUS|Grp::CROSSING),
-      'focus'       => Grp::CROSSING,
-      'height'      => (Grp::EXPOSE|Grp::CONFIG),
-      'keycode'     => Grp::KEY,
-      'keysym'      => Grp::KEY,
-      'mode'        => (Grp::CROSSING|Grp::FOCUS),
-      'override'    => (Grp::CREATE|Grp::MAP|Grp::REPARENT|Grp::CONFIG),
-      'place'       => Grp::CIRC,
-      'root'        => (Grp::KEY_BUTTON_MOTION_VIRTUAL|Grp::CROSSING),
-      'rootx'       => (Grp::KEY_BUTTON_MOTION_VIRTUAL|Grp::CROSSING),
-      'rooty'       => (Grp::KEY_BUTTON_MOTION_VIRTUAL|Grp::CROSSING),
-      'sendevent'   => Grp::ALL,
-      'serial'      => Grp::ALL,
-      'state'       => (Grp::KEY_BUTTON_MOTION_VIRTUAL|
-                        Grp::CROSSING|Grp::VISIBILITY),
-      'subwindow'   => (Grp::KEY_BUTTON_MOTION_VIRTUAL|Grp::CROSSING),
-      'time'        => (Grp::KEY_BUTTON_MOTION_VIRTUAL|Grp::CROSSING|
-                        Grp::PROP),
-      'warp'        => Grp::KEY_BUTTON_MOTION_VIRTUAL,
-      'width'       => (Grp::EXPOSE|Grp::CREATE|Grp::CONFIG),
-      'window'      => (Grp::CREATE|Grp::UNMAP|Grp::MAP|Grp::REPARENT|
-                        Grp::CONFIG|Grp::GRAVITY|Grp::CIRC),
-      'when'        => Grp::ALL,
-      'x'           => (Grp::KEY_BUTTON_MOTION_VIRTUAL|Grp::CROSSING|
-                        Grp::EXPOSE|Grp::CREATE|Grp::CONFIG|Grp::GRAVITY|
-                        Grp::REPARENT),
-      'y'           => (Grp::KEY_BUTTON_MOTION_VIRTUAL|Grp::CROSSING|
-                        Grp::EXPOSE|Grp::CREATE|Grp::CONFIG|Grp::GRAVITY|
-                        Grp::REPARENT),
-    }
-
-    FIELD_OPERATION = {
-      'root' => proc{|val|
-        begin
-          Tk.tk_call_without_enc('winfo', 'pathname', val)
-          val
-        rescue
-          nil
-        end
-      },
-
-      'subwindow' => proc{|val|
-        begin
-          Tk.tk_call_without_enc('winfo', 'pathname', val)
-          val
-        rescue
-          nil
-        end
-      },
-
-      'window' => proc{|val| nil}
-    }
-
-    #-------------------------------------------
-
-    def valid_fields(group_flag=nil)
-      group_flag = self.class.group_flag(self.type) unless group_flag
-
-      fields = {}
-      FIELD_FLAG.each{|key, flag|
-        next if (flag & group_flag) == 0
-        begin
-          val = self.__send__(key)
-        rescue
-          next
-        end
-        # next if !val || val == '??'
-        next if !val || (val == '??' && (flag & Grp::STRING_DATA))
-        fields[key] = val
-      }
-
-      fields
-    end
-
-    def valid_for_generate(group_flag=nil)
-      fields = valid_fields(group_flag)
-
-      FIELD_OPERATION.each{|key, cmd|
-        next unless fields.has_key?(key)
-        val = FIELD_OPERATION[key].call(fields[key])
-        if val
-          fields[key] = val
-        else
-          fields.delete(key)
-        end
-      }
-
-      fields
-    end
-
-    def generate(win, modkeys={})
-      klass = self.class
-
-      if modkeys.has_key?(:type) || modkeys.has_key?('type')
-        modkeys = TkComm._symbolkey2str(modkeys)
-        type_id = modkeys.delete('type')
-      else
-        type_id = self.type
-      end
-
-      type_name  = klass.type_name(type_id)
-      unless type_name
-        fail RuntimeError, "type_id #{type_id} is invalid"
-      end
-
-      group_flag = klass.group_flag(type_id)
-
-      opts = valid_for_generate(group_flag)
-
-      modkeys.each{|key, val|
-        if val
-          opts[key.to_s] = val
-        else
-          opts.delete(key.to_s)
-        end
-      }
-
-      if group_flag != Grp::KEY
-        Tk.event_generate(win, type_name, opts)
-      else
-        # If type is KEY event, focus should be set to target widget.
-        # If not set, original widget will get the same event.
-        # That will make infinite loop.
-        w = Tk.tk_call_without_enc('focus')
-        begin
-          Tk.tk_call_without_enc('focus', win)
-          Tk.event_generate(win, type_name, opts)
-        ensure
-          Tk.tk_call_without_enc('focus', w)
-        end
-      end
-    end
-
-    #############################################
-
-    # [ <'%' subst-key char>, <proc type char>, <instance var (accessor) name>]
-    KEY_TBL = [
-      [ ?#, ?n, :serial ],
-      [ ?a, ?s, :above ],
-      [ ?b, ?n, :num ],
-      [ ?c, ?n, :count ],
-      [ ?d, ?s, :detail ],
-      # ?e
-      [ ?f, ?b, :focus ],
-      # ?g
-      [ ?h, ?n, :height ],
-      [ ?i, ?s, :win_hex ],
-      # ?j
-      [ ?k, ?n, :keycode ],
-      # ?l
-      [ ?m, ?s, :mode ],
-      # ?n
-      [ ?o, ?b, :override ],
-      [ ?p, ?s, :place ],
-      # ?q
-      # ?r
-      [ ?s, ?x, :state ],
-      [ ?t, ?n, :time ],
-      # ?u
-      [ ?v, ?n, :value_mask ],
-      [ ?w, ?n, :width ],
-      [ ?x, ?n, :x ],
-      [ ?y, ?n, :y ],
-      # ?z
-      [ ?A, ?s, :char ],
-      [ ?B, ?n, :borderwidth ],
-      # ?C
-      [ ?D, ?n, :wheel_delta ],
-      [ ?E, ?b, :send_event ],
-      # ?F
-      # ?G
-      # ?H
-      # ?I
-      # ?J
-      [ ?K, ?s, :keysym ],
-      # ?L
-      # ?M
-      [ ?N, ?n, :keysym_num ],
-      # ?O
-      [ ?P, ?s, :property ],
-      # ?Q
-      [ ?R, ?s, :rootwin_id ],
-      [ ?S, ?s, :subwindow ],
-      [ ?T, ?n, :type ],
-      # ?U
-      # ?V
-      [ ?W, ?w, :widget ],
-      [ ?X, ?n, :x_root ],
-      [ ?Y, ?n, :y_root ],
-      # ?Z
-      nil
-    ]
-
-    # [ <'%' subst-key str>, <proc type char>, <instance var (accessor) name>]
-    #   the subst-key string will be converted to a bytecode (128+idx).
-    LONGKEY_TBL = [
-      # for example, for %CTT and %CST subst-key on tkdnd-2.0
-      # ['CTT', ?l, :drop_target_type],
-      # ['CST', ?l, :drop_source_type],
-    ]
-
-    # [ <proc type char>, <proc/method to convert tcl-str to ruby-obj>]
-    PROC_TBL = [
-      [ ?n, TkComm.method(:num_or_str) ],
-      [ ?s, TkComm.method(:string) ],
-      [ ?b, TkComm.method(:bool) ],
-      [ ?w, TkComm.method(:window) ],
-
-      [ ?x, proc{|val|
-          begin
-            TkComm::number(val)
-          rescue ArgumentError
-            val
-          end
-        }
-      ],
-
-      nil
-    ]
-
-=begin
-    # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-    KEY_TBL.map!{|inf|
-      if inf.kind_of?(Array)
-        inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-        inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-      end
-      inf
-    }
-
-    PROC_TBL.map!{|inf|
-      if inf.kind_of?(Array)
-        inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-      end
-      inf
-    }
-=end
-
-    # setup tables to be used by scan_args, _get_subst_key, _get_all_subst_keys
-    #
-    #     _get_subst_key() and _get_all_subst_keys() generates key-string
-    #     which describe how to convert callback arguments to ruby objects.
-    #     When binding parameters are given, use _get_subst_key().
-    #     But when no parameters are given, use _get_all_subst_keys() to
-    #     create a Event class object as a callback parameter.
-    #
-    #     scan_args() is used when doing callback. It convert arguments
-    #     ( which are Tcl strings ) to ruby objects based on the key string
-    #     that is generated by _get_subst_key() or _get_all_subst_keys().
-    #
-    _setup_subst_table(KEY_TBL, PROC_TBL)
-    # _setup_subst_table(KEY_TBL, LONGKEY_TBL, PROC_TBL) # if use longname-keys
-
-    #
-    # NOTE: The order of parameters which passed to callback procedure is
-    #        <extra_arg>, <extra_arg>, ... , <subst_arg>, <subst_arg>, ...
-    #
-
-    # If you need support extra arguments given by Tcl/Tk,
-    # please override _get_extra_args_tbl
-    #
-    #def self._get_extra_args_tbl
-    #  # return an array of convert procs
-    #  []
-    #end
-
-=begin
-    alias button num
-    alias delta  wheel_delta
-    alias root   rootwin_id
-    alias rootx  x_root
-    alias root_x x_root
-    alias rooty  y_root
-    alias root_y y_root
-    alias sendevent send_event
-=end
-    ALIAS_TBL = {
-      :button    => :num,
-      :data      => :detail,
-      :delta     => :wheel_delta,
-      :root      => :rootwin_id,
-      :rootx     => :x_root,
-      :root_x    => :x_root,
-      :rooty     => :y_root,
-      :root_y    => :y_root,
-      :sendevent => :send_event,
-      :window    => :widget
-    }
-
-    _define_attribute_aliases(ALIAS_TBL)
-
-  end
-
-  ###############################################
-
-  def install_bind_for_event_class(klass, cmd, *args)
-    extra_args_tbl = klass._get_extra_args_tbl
-
-    if args.compact.size > 0
-      args.map!{|arg| klass._sym2subst(arg)}
-      args = args.join(' ')
-      keys = klass._get_subst_key(args)
-
-      if cmd.kind_of?(String)
-        id = cmd
-      elsif cmd.kind_of?(TkCallbackEntry)
-        id = install_cmd(cmd)
-      else
-        id = install_cmd(proc{|*arg|
-          ex_args = []
-          extra_args_tbl.reverse_each{|conv| ex_args << conv.call(arg.pop)}
-          begin
-            TkUtil.eval_cmd(cmd, *(ex_args.concat(klass.scan_args(keys, arg))))
-          rescue Exception=>e
-            if TkCore::INTERP.kind_of?(TclTkIp)
-              fail e
-            else
-              # MultiTkIp
-              fail Exception, "#{e.class}: #{e.message.dup}"
-            end
-          end
-        })
-      end
-    elsif cmd.respond_to?(:arity) && cmd.arity == 0  # args.size == 0
-      args = ''
-      if cmd.kind_of?(String)
-        id = cmd
-      elsif cmd.kind_of?(TkCallbackEntry)
-        id = install_cmd(cmd)
-      else
-        id = install_cmd(proc{
-                           begin
-                             TkUtil.eval_cmd(cmd)
-                           rescue Exception=>e
-                             if TkCore::INTERP.kind_of?(TclTkIp)
-                               fail e
-                             else
-                               # MultiTkIp
-                               fail Exception, "#{e.class}: #{e.message.dup}"
-                             end
-                           end
-                         })
-      end
-    else
-      keys, args = klass._get_all_subst_keys
-
-      if cmd.kind_of?(String)
-        id = cmd
-      elsif cmd.kind_of?(TkCallbackEntry)
-        id = install_cmd(cmd)
-      else
-        id = install_cmd(proc{|*arg|
-          ex_args = []
-          extra_args_tbl.reverse_each{|conv| ex_args << conv.call(arg.pop)}
-          begin
-            TkUtil.eval_cmd(cmd, *(ex_args << klass.new(*klass.scan_args(keys, arg))))
-          rescue Exception=>e
-            if TkCore::INTERP.kind_of?(TclTkIp)
-              fail e
-            else
-              # MultiTkIp
-              fail Exception, "#{e.class}: #{e.message.dup}"
-            end
-          end
-        })
-      end
-    end
-
-    if TkCore::INTERP.kind_of?(TclTkIp)
-      id + ' ' + args
-    else
-      # MultiTkIp
-      "if {[set st [catch {#{id} #{args}} ret]] != 0} {
-         if {$st == 4} {
-           return -code continue $ret
-         } elseif {$st == 3} {
-           return -code break $ret
-         } elseif {$st == 2} {
-           return -code return $ret
-         } elseif {[regexp {^Exception: (TkCallbackContinue: .*)$} \
-                                                               $ret m msg]} {
-           return -code continue $msg
-         } elseif {[regexp {^Exception: (TkCallbackBreak: .*)$} $ret m msg]} {
-           return -code break $msg
-         } elseif {[regexp {^Exception: (TkCallbackReturn: .*)$} $ret m msg]} {
-           return -code return $msg
-         } elseif {[regexp {^Exception: (\\S+: .*)$} $ret m msg]} {
-           return -code return $msg
-         } else {
-           return -code error $ret
-         }
-       } else {
-          set ret
-       }"
-    end
-  end
-
-  def install_bind(cmd, *args)
-    install_bind_for_event_class(TkEvent::Event, cmd, *args)
-  end
-end
diff --git a/ext/tk/lib/tk/font.rb b/ext/tk/lib/tk/font.rb
deleted file mode 100644
index 6ae46ebb8e..0000000000
--- a/ext/tk/lib/tk/font.rb
+++ /dev/null
@@ -1,2352 +0,0 @@
-# frozen_string_literal: false
-#
-#  tk/font.rb - the class to treat fonts on Ruby/Tk
-#
-#                               by  Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-
-class TkFont
-  include Tk
-  extend TkCore
-
-  TkCommandNames = ['font'.freeze].freeze
-
-  (Tk_FontID = ["@font".freeze, TkUtil.untrust("00000")]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  Tk_FontNameTBL = TkCore::INTERP.create_table
-  Tk_FontUseTBL  = TkCore::INTERP.create_table
-
-  TkCore::INTERP.init_ip_env{
-    Tk_FontNameTBL.mutex.synchronize{ Tk_FontNameTBL.clear }
-    Tk_FontUseTBL.mutex.synchronize{ Tk_FontUseTBL.clear }
-  }
-
-  # option_type : default => string
-  OptionType = Hash.new(?s)
-  OptionType['size'] = ?n
-  OptionType['pointadjust'] = ?n
-  OptionType['underline'] = ?b
-  OptionType['overstrike'] = ?b
-
-  # metric_type : default => num_or_str
-  MetricType = Hash.new(?n)
-  MetricType['fixed'] = ?b
-
-  # system font names
-  SYSTEM_FONT_NAMES = []
-  def SYSTEM_FONT_NAMES.add(font_names)
-    (@mutex ||= Mutex.new).synchronize{
-      self.replace(self | font_names.map{|name| name.to_s})
-    }
-  end
-  def SYSTEM_FONT_NAMES.include?(name)
-    (@mutex ||= Mutex.new).synchronize{
-      super(name.to_s)
-    }
-  end
-
-  # set default font
-  case Tk::TK_VERSION
-  when /^4\..*/
-    DEFAULT_LATIN_FONT_NAME = 'a14'.freeze
-    DEFAULT_KANJI_FONT_NAME = 'k14'.freeze
-
-  when /^8\.[0-4]/
-    if JAPANIZED_TK
-      begin
-        fontnames = tk_call('font', 'names')
-        case fontnames
-        when /defaultgui/
-          # Tcl/Tk-JP for Windows
-          ltn = 'defaultgui'
-          knj = 'defaultgui'
-        when /Mincho:Helvetica-Bold-12/
-          # Tcl/Tk-JP for UNIX/X
-          ltn, knj = tk_split_simplelist(tk_call('font', 'configure',
-                                                 'Mincho:Helvetica-Bold-12',
-                                                 '-compound'))
-        else
-          # unknown Tcl/Tk-JP
-          #platform = tk_call('set', 'tcl_platform(platform)')
-          platform = Tk::PLATFORM['platform']
-          case platform
-          when 'unix'
-            ltn = {'family'=>'Helvetica'.freeze,
-                   'size'=>-12, 'weight'=>'bold'.freeze}
-            #knj = 'k14'
-            #knj = '-misc-fixed-medium-r-normal--14-*-*-*-c-*-jisx0208.1983-0'
-            knj = '-*-fixed-bold-r-normal--12-*-*-*-c-*-jisx0208.1983-0'
-          when 'windows'
-            ltn = {'family'=>'MS Sans Serif'.freeze, 'size'=>8}
-            knj = 'mincho'
-          when 'macintosh'
-            ltn = 'system'
-            knj = 'mincho'
-          else # unknown
-            ltn = 'Helvetica'
-            knj = 'mincho'
-          end
-        end
-      rescue
-        ltn = 'Helvetica'
-        knj = 'mincho'
-      end
-
-    else # not JAPANIZED_TK
-      begin
-        #platform = tk_call('set', 'tcl_platform(platform)')
-        platform = Tk::PLATFORM['platform']
-        case platform
-        when 'unix'
-          ltn = {'family'=>'Helvetica'.freeze,
-                 'size'=>-12, 'weight'=>'bold'.freeze}
-        when 'windows'
-          ltn = {'family'=>'MS Sans Serif'.freeze, 'size'=>8}
-        when 'macintosh'
-          ltn = 'system'
-        else # unknown
-          ltn = 'Helvetica'
-        end
-      rescue
-        ltn = 'Helvetica'
-      end
-
-      knj = ltn.dup
-    end
-
-    DEFAULT_LATIN_FONT_NAME = ltn.freeze
-    DEFAULT_KANJI_FONT_NAME = knj.freeze
-
-  when /^8\.[5-9]/, /^9\..*/
-    if tk_call('font', 'names') =~ /\bTkDefaultFont\b/
-      DEFAULT_LATIN_FONT_NAME = 'TkDefaultFont'.freeze
-      DEFAULT_KANJI_FONT_NAME = 'TkDefaultFont'.freeze
-    else
-      DEFAULT_LATIN_FONT_NAME = 'Helvetica'.freeze
-      DEFAULT_KANJI_FONT_NAME = 'mincho'.freeze
-    end
-
-  else # unknown version
-    DEFAULT_LATIN_FONT_NAME = 'Helvetica'.freeze
-    DEFAULT_KANJI_FONT_NAME = 'mincho'.freeze
-
-  end
-
-  if $DEBUG
-    print "default latin font = "; p DEFAULT_LATIN_FONT_NAME
-    print "default kanji font = "; p DEFAULT_KANJI_FONT_NAME
-  end
-
-
-  ###################################
-  class DescendantFont
-    def initialize(compound, type)
-      unless compound.kind_of?(TkFont)
-        fail ArgumentError, "a TkFont object is expected for the 1st argument"
-      end
-
-      @compound = compound
-      case type
-      when 'kanji', 'latin', 'ascii'
-        @type = type
-      when :kanji, :latin, :ascii
-        @type = type.to_s
-      else
-        fail ArgumentError, "unknown type '#{type}'"
-      end
-    end
-
-    def dup
-      fail RuntimeError, "cannot duplicate a descendant font"
-    end
-    def clone
-      fail RuntimeError, "cannot clone a descendant font"
-    end
-
-    def to_eval
-      @compound.__send__(@type + '_font_id')
-    end
-    def font
-      @compound.__send__(@type + '_font_id')
-    end
-    alias font_id font
-    alias name font
-    alias to_s font
-
-    def [](slot)
-      @compound.__send__(@type + '_configinfo', slot)
-    end
-    def []=(slot, value)
-      @compound.__send__(@type + '_configure', slot, value)
-      value
-    end
-
-    def method_missing(id, *args)
-      @compound.__send__(@type + '_' + id.id2name, *args)
-    end
-  end
-
-
-  ###################################
-  # class methods
-  ###################################
-  def TkFont.is_system_font?(fnt)
-    # true  --> system font which is available on the current system
-    # false --> not system font (or unknown system font)
-    # nil   --> system font name, but not available on the current system
-    fnt = fnt.to_s
-    SYSTEM_FONT_NAMES.include?(fnt) && self.names.index(fnt) && true
-  end
-
-  def TkFont.actual(fnt, option=nil)
-    fnt = '{}' if fnt == ''
-    if fnt.kind_of?(TkFont)
-     fnt.actual(option)
-    else
-      actual_core(fnt, nil, option)
-    end
-  end
-  def TkFont.actual_hash(fnt, option=nil)
-    Hash[TkFont.actual(fnt, option)]
-  end
-
-  def TkFont.actual_displayof(fnt, win, option=nil)
-    fnt = '{}' if fnt == ''
-    if fnt.kind_of?(TkFont)
-     fnt.actual_displayof(win, option)
-    else
-      win = '.' unless win
-      actual_core(fnt, win, option)
-    end
-  end
-  def TkFont.actual_hash_displayof(fnt, option=nil)
-    Hash[TkFont.actual_displayof(fnt, option)]
-  end
-
-  def TkFont.configure(fnt, slot, value=None)
-    if fnt.kind_of?(TkFont)
-      fnt.configure(fnt, slot, value)
-    else
-      configure_core(fnt, slot, value)
-    end
-    fnt
-  end
-
-  def TkFont.configinfo(fnt, slot=nil)
-    if fnt.kind_of?(TkFont)
-      fnt.configinfo(fnt, slot)
-    else
-      configinfo_core(fnt, slot)
-    end
-  end
-
-  def TkFont.current_configinfo(fnt, slot=nil)
-    if fnt.kind_of?(TkFont)
-      fnt.current_configinfo(fnt, slot)
-    else
-      current_configinfo_core(fnt, slot)
-    end
-  end
-
-  def TkFont.measure(fnt, text)
-    fnt = '{}' if fnt == ''
-    if fnt.kind_of?(TkFont)
-      fnt.measure(text)
-    else
-      measure_core(fnt, nil, text)
-    end
-  end
-
-  def TkFont.measure_displayof(fnt, win, text)
-    fnt = '{}' if fnt == ''
-    if fnt.kind_of?(TkFont)
-      fnt.measure_displayof(win, text)
-    else
-      win = '.' unless win
-      measure_core(fnt, win, text)
-    end
-  end
-
-  def TkFont.metrics(fnt, option=nil)
-    fnt = '{}' if fnt == ''
-    if fnt.kind_of?(TkFont)
-      fnt.metrics(option)
-    else
-      metrics_core(fnt, nil, option)
-    end
-  end
-  def TkFont.metrics_hash(fnt, option=nil)
-    if option
-      val = TkFont.metrics(fnt, option)
-      case TkFont::MetricsType[option.to_s]
-      when ?n
-        val = TkComm::num_or_str(val)
-      when ?b
-        val = TkComm::bool(val)
-      else
-        # do nothing
-      end
-      return val
-    end
-
-    h = Hash[TkFont.metrics(fnt)]
-    h.keys.each{|k|
-      case TkFont::MetricsType[k.to_s]
-      when ?n
-        h[k] = TkComm::num_or_str(h[k])
-      when ?b
-        h[k] = TkComm::bool(h[k])
-      else
-        # do nothing
-      end
-    }
-    h
-  end
-
-  def TkFont.metrics_displayof(fnt, win, option=nil)
-    fnt = '{}' if fnt == ''
-    if fnt.kind_of?(TkFont)
-      font.metrics_displayof(win, option=nil)
-    else
-      win = '.' unless win
-      metrics_core(fnt, win, option)
-    end
-  end
-  def TkFont.metrics_hash_displayof(fnt, win, option=nil)
-    if option
-      val = TkFont.metrics_displayof(fnt, win, option)
-      case TkFont::MetricsType[option.to_s]
-      when ?n
-        val = TkComm::num_or_str(val)
-      when ?b
-        val = TkComm::bool(val)
-      else
-        # do nothing
-      end
-      return val
-    end
-
-    h = Hash[TkFont.metrics_displayof(fnt, win, option)]
-    h.keys.each{|k|
-      case TkFont::MetricsType[k.to_s]
-      when ?n
-        h[k] = TkComm::num_or_str(h[k])
-      when ?b
-        h[k] = TkComm::bool(h[k])
-      else
-        # do nothing
-      end
-    }
-    h
-  end
-
-  def TkFont.families(win=nil)
-    case (Tk::TK_VERSION)
-    when /^4\..*/
-      ['fixed']
-
-    when /^8\..*/
-      if win
-        tk_split_simplelist(tk_call('font', 'families', '-displayof', win))
-      else
-        tk_split_simplelist(tk_call('font', 'families'))
-      end
-    end
-  end
-
-  def TkFont.names
-    case (Tk::TK_VERSION)
-    when /^4\..*/
-      r = ['fixed']
-      r += ['a14', 'k14'] if JAPANIZED_TK
-      Tk_FontNameTBL.mutex.synchronize{
-        Tk_FontNameTBL.each_value{|obj| r.push(obj)}
-      }
-      #r | []
-      r.uniq
-
-    when /^8\..*/
-      tk_split_simplelist(tk_call('font', 'names'))
-
-    end
-  end
-
-  def TkFont.create_copy(font)
-    fail 'source-font must be a TkFont object' unless font.kind_of? TkFont
-    if TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
-      keys = {}
-      font.configinfo.each{|key,value| keys[key] = value }
-      TkFont.new(font.latin_font_id, font.kanji_font_id, keys)
-    else # ! TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
-      TkFont.new(font.latin_font_id, font.kanji_font_id, font.configinfo)
-    end
-  end
-
-  def TkFont.get_obj(name)
-    name = name.to_s
-    if name =~ /^(@font[0-9]+)(|c|l|k)$/
-      Tk_FontNameTBL.mutex.synchronize{
-        Tk_FontNameTBL[$1]
-      }
-    else
-      Tk_FontNameTBL.mutex.synchronize{
-        Tk_FontNameTBL[name]
-      }
-    end
-  end
-
-  def TkFont.init_widget_font(pathname, *args)
-    win, tag, key = pathname.split(';')
-    key = 'font' if key == nil || key == ''
-    path = [win, tag, key].join(';')
-
-    case (Tk::TK_VERSION)
-    when /^4\..*/
-      regexp = /^-(|kanji)#{key} /
-
-      conf_list = tk_split_simplelist(tk_call(*args)).
-        find_all{|prop| prop =~ regexp}.
-        collect{|prop| tk_split_simplelist(prop)}
-
-      if conf_list.size == 0
-        raise RuntimeError, "the widget may not support 'font' option"
-      end
-
-      args << {}
-
-      ltn_key = "-#{key}"
-      knj_key = "-kanji#{key}"
-
-      ltn_info = conf_list.find{|conf| conf[0] == ltn_key}
-      ltn = ltn_info[-1]
-      ltn = nil if ltn == [] || ltn == ""
-
-      knj_info = conf_list.find{|conf| conf[0] == knj_key}
-      knj = knj_info[-1]
-      knj = nil if knj == [] || knj == ""
-
-      TkFont.new(ltn, knj).call_font_configure([path, key], *args)
-
-    when /^8\.[0-4]/
-      regexp = /^-#{key} /
-
-      conf_list = tk_split_simplelist(tk_call(*args)).
-        find_all{|prop| prop =~ regexp}.
-        collect{|prop| tk_split_simplelist(prop)}
-
-      if conf_list.size == 0
-        raise RuntimeError, "the widget may not support 'font' option"
-      end
-
-      args << {}
-
-      optkey = "-#{key}"
-
-      info = conf_list.find{|conf| conf[0] == optkey}
-      fnt = info[-1]
-      fnt = nil if fnt == [] || fnt == ""
-
-      unless fnt
-        # create dummy
-        # TkFont.new(nil, nil).call_font_configure([path, key], *args)
-        dummy_fnt = TkFont.allocate
-        dummy_fnt.instance_eval{ init_dummy_fontobj() }
-        dummy_fnt
-      else
-        begin
-          compound = tk_split_simplelist(
-              Hash[*tk_split_simplelist(tk_call('font', 'configure',
-                                                fnt))].collect{|k,v|
-                [k[1..-1], v]
-              }.assoc('compound')[1])
-        rescue
-          compound = []
-        end
-        if compound == []
-          if TkFont.is_system_font?(fnt)
-            TkNamedFont.new(fnt).call_font_configure([path, key], *args)
-          else
-            TkFont.new(fnt).call_font_configure([path, key], *args)
-          end
-        else
-          TkFont.new(compound[0],
-                     compound[1]).call_font_configure([path, key], *args)
-        end
-      end
-
-    when /^8\.[5-9]/, /^9\..*/
-      regexp = /^-#{key} /
-
-      conf_list = tk_split_simplelist(tk_call(*args)).
-        find_all{|prop| prop =~ regexp}.
-        collect{|prop| tk_split_simplelist(prop)}
-
-      if conf_list.size == 0
-        raise RuntimeError, "the widget may not support 'font' option"
-      end
-
-      args << {}
-
-      optkey = "-#{key}"
-
-      info = conf_list.find{|conf| conf[0] == optkey}
-      fnt = info[-1]
-      fnt = nil if fnt == [] || fnt == ""
-
-      unless fnt
-        # create dummy
-        # TkFont.new(nil, nil).call_font_configure([path, key], *args)
-        dummy_fnt = TkFont.allocate
-        dummy_fnt.instance_eval{ init_dummy_fontobj() }
-        dummy_fnt
-      else
-        if TkFont.is_system_font?(fnt)
-          TkNamedFont.new(fnt).call_font_configure([path, key], *args)
-        else
-          TkFont.new(fnt).call_font_configure([path, key], *args)
-        end
-      end
-    end
-  end
-
-  def TkFont.used_on(path=nil)
-    Tk_FontUseTBL.mutex.synchronize{
-      if path
-        Tk_FontUseTBL[path]
-      else
-        # Tk_FontUseTBL.values | []
-        Tk_FontUseTBL.values.uniq
-      end
-    }
-  end
-
-  def TkFont.failsafe(font)
-    begin
-      if /^8\..*/ === Tk::TK_VERSION  && JAPANIZED_TK
-        tk_call('font', 'failsafe', font)
-      end
-    rescue
-    end
-  end
-
-  ###################################
-  # instance methods
-  ###################################
-  private
-  ###################################
-  def init_dummy_fontobj
-    Tk_FontID.mutex.synchronize{
-      @id = Tk_FontID.join(TkCore::INTERP._ip_id_)
-      Tk_FontID[1].succ!
-    }
-    Tk_FontNameTBL.mutex.synchronize{
-      Tk_FontNameTBL[@id] = self
-    }
-
-    # @latin_desscendant = nil
-    # @kanji_desscendant = nil
-    @descendant = [nil, nil] # [latin, kanji]
-
-    case (Tk::TK_VERSION)
-    when /^4\..*/
-      @latinfont = ""
-      @kanjifont = ""
-      if JAPANIZED_TK
-        @compoundfont = [[@latinfont], [@kanjifont]]
-        @fontslot = {'font'=>@latinfont, 'kanjifont'=>@kanjifont}
-      else
-        @compoundfont = @latinfont
-        @fontslot = {'font'=>@latinfont}
-      end
-    else
-      @latinfont = @id + 'l'
-      @kanjifont = @id + 'k'
-      @compoundfont = @id + 'c'
-
-      if JAPANIZED_TK
-        tk_call('font', 'create', @latinfont, '-charset', 'iso8859')
-        tk_call('font', 'create', @kanjifont, '-charset', 'jisx0208.1983')
-        tk_call('font', 'create', @compoundfont,
-                '-compound', [@latinfont, @kanjifont])
-      else
-        tk_call('font', 'create', @latinfont)
-        tk_call('font', 'create', @kanjifont)
-        tk_call('font', 'create', @compoundfont)
-      end
-
-      @fontslot = {'font'=>@compoundfont}
-    end
-
-    self
-  end
-
-  def initialize(ltn=nil, knj=nil, keys=nil)
-    ltn = '{}' if ltn == ''
-    knj = '{}' if knj == ''
-
-    Tk_FontID.mutex.synchronize{
-      # @id = Tk_FontID.join('')
-      @id = Tk_FontID.join(TkCore::INTERP._ip_id_)
-      Tk_FontID[1].succ!
-    }
-    Tk_FontNameTBL.mutex.synchronize{
-      Tk_FontNameTBL[@id] = self
-    }
-
-    # @latin_desscendant = nil
-    # @kanji_desscendant = nil
-    @descendant = [nil, nil] # [latin, kanji]
-
-    # @latinfont = @id + 'l'
-    # @kanjifont = @id + 'k'
-    # @compoundfont = @id + 'c'
-    # @fontslot = {}
-
-    if knj.kind_of?(Hash) && !keys
-      keys = knj
-      knj = nil
-    end
-
-    # compound font check
-    if Tk::TK_VERSION == '8.0' && JAPANIZED_TK
-      begin
-        compound = tk_split_simplelist(tk_call('font', 'configure',
-                                               ltn, '-compound'))
-        if knj == nil
-          if compound != []
-            ltn, knj = compound
-          end
-        else
-          if compound != []
-            ltn = compound[0]
-          end
-          compound = tk_split_simplelist(tk_call('font', 'configure',
-                                                 knj, '-compound'))
-          if compound != []
-            knj = compound[1]
-          end
-        end
-      rescue
-      end
-    end
-
-    if ltn
-      if JAPANIZED_TK && !knj
-        if Tk::TK_VERSION =~ /^4..*/
-          knj = DEFAULT_KANJI_FONT_NAME
-        else
-          knj = ltn
-        end
-      end
-    else
-      ltn = DEFAULT_LATIN_FONT_NAME
-      knj = DEFAULT_KANJI_FONT_NAME if JAPANIZED_TK && !knj
-    end
-
-    create_compoundfont(ltn, knj, keys)
-  end
-
-  def initialize_copy(font)
-    unless font.kind_of?(TkFont)
-      fail TypeError, '"initialize_copy should take same class object'
-    end
-    if TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
-      keys = {}
-      font.configinfo.each{|key,value| keys[key] = value }
-      initialize(font.latin_font_id, font.kanji_font_id, keys)
-    else # ! TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
-      initialize(font.latin_font_id, font.kanji_font_id, font.configinfo)
-    end
-  end
-
-  def _get_font_info_from_hash(font)
-    font = _symbolkey2str(font)
-    foundry  = (info = font['foundry'] .to_s)?  info: '*'
-    family   = (info = font['family']  .to_s)?  info: '*'
-    weight   = (info = font['weight']  .to_s)?  info: '*'
-    slant    = (info = font['slant']   .to_s)?  info: '*'
-    swidth   = (info = font['swidth']  .to_s)?  info: '*'
-    adstyle  = (info = font['adstyle'] .to_s)?  info: '*'
-    pixels   = (info = font['pixels']  .to_s)?  info: '*'
-    points   = (info = font['points']  .to_s)?  info: '*'
-    resx     = (info = font['resx']    .to_s)?  info: '*'
-    resy     = (info = font['resy']    .to_s)?  info: '*'
-    space    = (info = font['space']   .to_s)?  info: '*'
-    avgWidth = (info = font['avgWidth'].to_s)?  info: '*'
-    charset  = (info = font['charset'] .to_s)?  info: '*'
-    encoding = (info = font['encoding'].to_s)?  info: '*'
-
-    [foundry, family, weight, slant, swidth, adstyle,
-      pixels, points, resx, resy, space, avgWidth, charset, encoding]
-  end
-
-  def create_latinfont_tk4x(font)
-    if font.kind_of? Hash
-      @latinfont = '-' + _get_font_info_from_hash(font).join('-') + '-'
-
-    elsif font.kind_of? Array
-      finfo = {}
-      finfo['family'] = font[0].to_s
-      if font[1]
-        fsize = font[1].to_s
-        if fsize != '0' && fsize =~ /^(|\+|-)([0-9]+)$/
-          if $1 == '-'
-            finfo['pixels'] = $2
-          else
-            finfo['points'] = $2
-          end
-        else
-          finfo['points'] = '13'
-        end
-      end
-      font[2..-1].each{|style|
-        case (style)
-        when 'normal'
-          finfo['weight'] = style
-        when 'bold'
-          finfo['weight'] = style
-        when 'roman'
-          finfo['slant'] = 'r'
-        when 'italic'
-          finfo['slant'] = 'i'
-        end
-      }
-
-      @latinfont = '-' + _get_font_info_from_hash(finfo).join('-') + '-'
-
-    elsif font.kind_of? TkFont
-      @latinfont = font.latin_font
-
-    else
-      if font
-        @latinfont = font
-      else
-        @latinfont = DEFAULT_LATIN_FONT_NAME
-      end
-
-    end
-  end
-
-  def create_kanjifont_tk4x(font)
-    unless JAPANIZED_TK
-      @kanjifont = ""
-      return
-    end
-
-    if font.kind_of? Hash
-      @kanjifont = '-' + _get_font_info_from_hash(font).join('-') + '-'
-
-    elsif font.kind_of? Array
-      finfo = {}
-      finfo['family'] = font[0].to_s
-      if font[1]
-        fsize = font[1].to_s
-        if fsize != '0' && fsize =~ /^(|\+|-)([0-9]+)$/
-          if $1 == '-'
-            finfo['pixels'] = $2
-          else
-            finfo['points'] = $2
-          end
-        else
-          finfo['points'] = '13'
-        end
-      end
-      font[2..-1].each{|style|
-        case (style)
-        when 'normal'
-          finfo['weight'] = style
-        when 'bold'
-          finfo['weight'] = style
-        when 'roman'
-          finfo['slant'] = 'r'
-        when 'italic'
-          finfo['slant'] = 'i'
-        end
-      }
-
-      @kanjifont = '-' + _get_font_info_from_hash(finfo).join('-') + '-'
-    elsif font.kind_of? TkFont
-      @kanjifont = font.kanji_font_id
-    else
-      if font
-        @kanjifont = font
-      else
-        @kanjifont = DEFAULT_KANJI_FONT_NAME
-      end
-    end
-  end
-
-  def create_compoundfont_tk4x(ltn, knj, keys)
-    create_latinfont(ltn)
-    create_kanjifont(knj)
-
-    if JAPANIZED_TK
-      @compoundfont = [[@latinfont], [@kanjifont]]
-      @fontslot = {'font'=>@latinfont, 'kanjifont'=>@kanjifont}
-      # @fontslot.clear
-      # @fontslot['font'] = @latinfont
-      # @fontslot['kanjifont'] = @kanjifont
-    else
-      @compoundfont = @latinfont
-      @fontslot = {'font'=>@latinfont}
-      # @fontslot.clear
-      # @fontslot['font'] = @latinfont
-    end
-  end
-
-  def create_latinfont_tk8x(font)
-    @latinfont = @id + 'l'
-
-    if JAPANIZED_TK
-      if font.kind_of? Hash
-        if font[:charset] || font['charset']
-          tk_call('font', 'create', @latinfont, *hash_kv(font))
-        else
-          tk_call('font', 'create', @latinfont,
-                  '-charset', 'iso8859', *hash_kv(font))
-        end
-      elsif font.kind_of? Array
-        tk_call('font', 'create', @latinfont, '-copy', array2tk_list(font))
-        tk_call('font', 'configure', @latinfont, '-charset', 'iso8859')
-      elsif font.kind_of? TkFont
-        tk_call('font', 'create', @latinfont, '-copy', font.latin_font)
-      elsif font
-        tk_call('font', 'create', @latinfont, '-copy', font,
-                '-charset', 'iso8859')
-      else
-        tk_call('font', 'create', @latinfont, '-charset', 'iso8859')
-      end
-    else
-      if font.kind_of? Hash
-        tk_call('font', 'create', @latinfont, *hash_kv(font))
-      else
-        keys = {}
-        if font.kind_of? Array
-          actual_core(array2tk_list(font)).each{|key,val| keys[key] = val}
-        elsif font.kind_of? TkFont
-          actual_core(font.latin_font).each{|key,val| keys[key] = val}
-        elsif font
-          actual_core(font).each{|key,val| keys[key] = val}
-        end
-        tk_call('font', 'create', @latinfont, *hash_kv(keys))
-      end
-
-      if font && @compoundfont
-        keys = {}
-        actual_core(@latinfont).each{|key,val| keys[key] = val}
-        tk_call('font', 'configure', @compoundfont, *hash_kv(keys))
-      end
-    end
-  end
-
-  def create_kanjifont_tk8x(font)
-    @kanjifont = @id + 'k'
-
-    if JAPANIZED_TK
-      if font.kind_of? Hash
-        if font[:charset] || font['charset']
-          tk_call('font', 'create', @kanjifont, *hash_kv(font))
-        else
-          tk_call('font', 'create', @kanjifont,
-                  '-charset', 'jisx0208.1983', *hash_kv(font))
-        end
-      elsif font.kind_of? Array
-        tk_call('font', 'create', @kanjifont, '-copy', array2tk_list(font))
-        tk_call('font', 'configure', @kanjifont, '-charset', 'jisx0208.1983')
-      elsif font.kind_of? TkFont
-        tk_call('font', 'create', @kanjifont, '-copy', font.kanji_font_id)
-      elsif font
-        tk_call('font', 'create', @kanjifont, '-copy', font,
-                '-charset', 'jisx0208.1983')
-      else
-        tk_call('font', 'create', @kanjifont, '-charset', 'jisx0208.1983')
-      end
-      # end of JAPANIZED_TK
-
-    else
-      if font.kind_of? Hash
-        tk_call('font', 'create', @kanjifont, *hash_kv(font))
-      else
-        keys = {}
-        if font.kind_of? Array
-          actual_core(array2tk_list(font)).each{|key,val| keys[key] = val}
-        elsif font.kind_of? TkFont
-          actual_core(font.kanji_font_id).each{|key,val| keys[key] = val}
-        elsif font
-          actual_core(font).each{|key,val| keys[key] = val}
-        end
-        tk_call('font', 'create', @kanjifont, *hash_kv(keys))
-      end
-
-      if font && @compoundfont
-        keys = {}
-        actual_core(@kanjifont).each{|key,val| keys[key] = val}
-        tk_call('font', 'configure', @compoundfont, *hash_kv(keys))
-      end
-    end
-  end
-
-  def create_compoundfont_tk8x(ltn, knj, keys)
-    if knj
-      create_latinfont(ltn)
-      create_kanjifont(knj)
-    else
-      cfnt = ltn
-      create_kanjifont(cfnt)
-      create_latinfont(cfnt)
-    end
-
-    @compoundfont = @id + 'c'
-
-    if JAPANIZED_TK
-      unless keys
-        keys = {}
-      else
-        keys = keys.dup
-      end
-      if (tk_call('font', 'configure', @latinfont, '-underline') == '1' &&
-          tk_call('font', 'configure', @kanjifont, '-underline') == '1' &&
-          !keys.key?('underline'))
-        keys['underline'] = true
-      end
-      if (tk_call('font', 'configure', @latinfont, '-overstrike') == '1' &&
-          tk_call('font', 'configure', @kanjifont, '-overstrike') == '1' &&
-          !keys.key?('overstrike'))
-        keys['overstrike'] = true
-      end
-
-      @fontslot = {'font'=>@compoundfont}
-      # @fontslot['font'] = @compoundfont
-      begin
-        tk_call('font', 'create', @compoundfont,
-                '-compound', [@latinfont, @kanjifont], *hash_kv(keys))
-      rescue RuntimeError => e
-        if ltn == knj
-          if e.message =~ /kanji font .* specified/
-            tk_call('font', 'delete', @latinfont)
-            create_latinfont(DEFAULT_LATIN_FONT_NAME)
-            opts = []
-            Hash[*(tk_split_simplelist(tk_call('font', 'configure',
-                                               @kanjifont)))].each{|k,v|
-              case k
-              when '-size', '-weight', '-slant', '-underline', '-overstrike'
-                opts << k << v
-              end
-            }
-            tk_call('font', 'configure', @latinfont, *opts)
-            tk_call('font', 'create', @compoundfont,
-                    '-compound', [@latinfont, @kanjifont], *hash_kv(keys))
-
-          elsif e.message =~ /ascii font .* specified/
-            tk_call('font', 'delete', @kanjifont)
-            create_kanjifont(DEFAULT_KANJI_FONT_NAME)
-            opts = []
-            Hash[*(tk_split_simplelist(tk_call('font', 'configure',
-                                               @latinfont)))].each{|k,v|
-              case k
-              when '-size', '-weight', '-slant', '-underline', '-overstrike'
-                opts << k << v
-              end
-            }
-            tk_call('font', 'configure', @kanjifont, *opts)
-            tk_call('font', 'create', @compoundfont,
-                    '-compound', [@latinfont, @kanjifont], *hash_kv(keys))
-
-          else
-            raise e
-          end
-        else
-          raise e
-        end
-      end
-    else
-      tk_call('font', 'create', @compoundfont)
-
-      latinkeys = {}
-      begin
-        actual_core(@latinfont).each{|key,val| latinkeys[key] = val}
-      rescue
-        latinkeys = {}
-      end
-      if latinkeys != {}
-        tk_call('font', 'configure', @compoundfont, *hash_kv(latinkeys))
-      end
-
-      if knj
-        compoundkeys = nil
-        kanjikeys = {}
-        begin
-          actual_core(@kanjifont).each{|key,val| kanjikeys[key] = val}
-        rescue
-          kanjikeys = {}
-        end
-        if kanjikeys != {}
-          tk_call('font', 'configure', @compoundfont, *hash_kv(kanjikeys))
-        end
-      end
-
-      if cfnt
-        if cfnt.kind_of?(Hash)
-          compoundkeys = cfnt.dup
-        else
-          compoundkeys = {}
-          actual_core(cfnt).each{|key,val| compoundkeys[key] = val}
-        end
-        compoundkeys.update(_symbolkey2str(keys))
-        keys = compoundkeys
-      end
-
-      @fontslot = {'font'=>@compoundfont}
-      # @fontslot['font'] = @compoundfont
-      tk_call('font', 'configure', @compoundfont, *hash_kv(keys))
-    end
-  end
-
-  ###################################
-  public
-  ###################################
-  def inspect
-    sprintf("#<%s:%0x:%s>", self.class.inspect, self.__id__, @compoundfont)
-  end
-
-  def method_missing(id, *args)
-    name = id.id2name
-    case args.length
-    when 1
-      if name[-1] == ?=
-        configure name[0..-2], args[0]
-        args[0]
-      else
-        configure name, args[0]
-        self
-      end
-    when 0
-      begin
-        configinfo name
-      rescue
-        super(id, *args)
-#        fail NameError, "undefined local variable or method `#{name}' for #{self.to_s}", error_at
-      end
-    else
-      super(id, *args)
-#      fail NameError, "undefined method `#{name}' for #{self.to_s}", error_at
-    end
-  end
-
-  def call_font_configure(path, *args)
-    if path.kind_of?(Array)
-      # [path, optkey]
-      win, tag = path[0].split(';')
-      optkey = path[1].to_s
-    else
-      win, tag, optkey = path.split(';')
-    end
-
-    fontslot = _symbolkey2str(@fontslot)
-    if optkey && optkey != ""
-      ltn = fontslot.delete('font')
-      knj = fontslot.delete('kanjifont')
-      fontslot[optkey] = ltn if ltn
-      fontslot["kanji#{optkey}"] = knj if knj
-    end
-
-    keys = _symbolkey2str(args.pop).update(fontslot)
-    args.concat(hash_kv(keys))
-    begin
-      tk_call(*args)
-    rescue => e
-      unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-        fail e
-      end
-    end
-    Tk_FontUseTBL.mutex.synchronize{
-      Tk_FontUseTBL[[win, tag, optkey].join(';')] = self
-    }
-    self
-  end
-
-  def used
-    ret = []
-    table = nil
-    Tk_FontUseTBL.mutex.synchronize{
-      table = Tk_FontUseTBL.clone # to avoid deadlock
-    }
-    table.each{|key,value|
-      next unless self == value
-      if key.include?(';')
-        win, tag, optkey = key.split(';')
-        winobj = tk_tcl2ruby(win)
-        #if winobj.kind_of? TkText
-        if winobj.kind_of?(TkText) || winobj.kind_of?(Tk::Text)
-          if optkey
-            ret.push([winobj, winobj.tagid2obj(tag), optkey])
-          else
-            ret.push([winobj, winobj.tagid2obj(tag)])
-          end
-        #elsif winobj.kind_of? TkCanvas
-        elsif winobj.kind_of?(TkCanvas) || winobj.kind_of?(Tk::Canvas)
-          if (tagobj = TkcTag.id2obj(winobj, tag)).kind_of? TkcTag
-            if optkey
-              ret.push([winobj, tagobj, optkey])
-            else
-              ret.push([winobj, tagobj])
-            end
-          elsif (tagobj = TkcItem.id2obj(winobj, tag)).kind_of? TkcItem
-            if optkey
-              ret.push([winobj, tagobj, optkey])
-            else
-              ret.push([winobj, tagobj])
-            end
-          else
-            if optkey
-              ret.push([winobj, tag, optkey])
-            else
-              ret.push([winobj, tag])
-            end
-          end
-        #elsif winobj.kind_of? TkMenu
-        elsif winobj.kind_of?(TkMenu) || winobj.kind_of?(Tk::Menu)
-          if optkey
-            ret.push([winobj, tag, optkey])
-          else
-            ret.push([winobj, tag])
-          end
-        else
-          if optkey
-            ret.push([win, tag, optkey])
-          else
-            ret.push([win, tag])
-          end
-        end
-      else
-        ret.push(tk_tcl2ruby(key))
-      end
-    }
-    ret
-  end
-
-  def id
-    @id
-  end
-
-  def to_eval
-    font
-  end
-
-  def font
-    @compoundfont
-  end
-  alias font_id font
-  alias name font
-  alias to_s font
-
-  def latin_font_id
-    @latinfont
-  end
-
-  def latin_font
-    # @latinfont
-    if @descendant[0] # [0] -> latin
-      @descendant[0]
-    else
-      @descendant[0] = DescendantFont.new(self, 'latin')
-    end
-=begin
-    if @latin_descendant
-      @latin_descendant
-    else
-      @latin_descendant = DescendantFont.new(self, 'latin')
-    end
-=end
-  end
-  alias latinfont latin_font
-
-  def kanji_font_id
-    @kanjifont
-  end
-
-  def kanji_font
-    # @kanjifont
-    if @descendant[1] # [1] -> kanji
-      @descendant[1]
-    else
-      @descendant[1] = DescendantFont.new(self, 'kanji')
-    end
-=begin
-    if @kanji_descendant
-      @kanji_descendant
-    else
-      @kanji_descendant = DescendantFont.new(self, 'kanji')
-    end
-=end
-  end
-  alias kanjifont kanji_font
-
-  def actual(option=nil)
-    actual_core(@compoundfont, nil, option)
-  end
-  def actual_hash(option=nil)
-    Hash[actual(option)]
-  end
-
-  def actual_displayof(win, option=nil)
-    win = '.' unless win
-    actual_core(@compoundfont, win, option)
-  end
-  def actual_hash_displayof(win, option=nil)
-    Hash[actual_displayof(win, option)]
-  end
-
-  def latin_actual(option=nil)
-    if @latinfont == nil
-      actual_core(@compoundfont, nil, option) # use @compoundfont
-    else
-      actual_core(@latinfont, nil, option)
-    end
-  end
-  def latin_actual_hash(option=nil)
-    Hash[latin_actual(option)]
-  end
-
-  def latin_actual_displayof(win, option=nil)
-    win = '.' unless win
-    if @latinfont == nil
-      actual_core(@compoundfont, win, option) # use @compoundfont
-    else
-      actual_core(@latinfont, win, option)
-    end
-  end
-  def latin_actual_hash_displayof(win, option=nil)
-    Hash[latin_actual_displayof(win, option)]
-  end
-
-  def kanji_actual(option=nil)
-    #if JAPANIZED_TK
-    if @kanjifont == nil
-      actual_core(@compoundfont, nil, option) # use @compoundfont
-    elsif @kanjifont != ""
-      actual_core(@kanjifont, nil, option)
-    else
-      actual_core_tk4x(nil, nil, option)
-    end
-  end
-  def kanji_actual_hash(option=nil)
-    Hash[kanji_actual(option)]
-  end
-
-  def kanji_actual_displayof(win, option=nil)
-    #if JAPANIZED_TK
-    if @kanjifont == nil
-      actual_core(@compoundfont, nil, option) # use @compoundfont
-    elsif @kanjifont != ""
-      win = '.' unless win
-      actual_core(@kanjifont, win, option)
-    else
-      actual_core_tk4x(nil, win, option)
-    end
-  end
-  def kanji_actual_hash_displayof(win, option=nil)
-    Hash[kanji_actual_displayof(win, option)]
-  end
-
-  def [](slot)
-    configinfo slot
-  end
-
-  def []=(slot, val)
-    configure slot, val
-    val
-  end
-
-  def configure(slot, value=None)
-    configure_core(@compoundfont, slot, value)
-    self
-  end
-
-  def configinfo(slot=nil)
-    configinfo_core(@compoundfont, slot)
-  end
-
-  def current_configinfo(slot=nil)
-    current_configinfo_core(@compoundfont, slot)
-  end
-
-  def delete
-    delete_core
-  end
-
-  def latin_configure(slot, value=None)
-    if JAPANIZED_TK
-      configure_core(@latinfont, slot, value)
-    else
-      configure(slot, value)
-    end
-    self
-  end
-
-  def latin_configinfo(slot=nil)
-    if JAPANIZED_TK
-      configinfo_core(@latinfont, slot)
-    else
-      configinfo(slot)
-    end
-  end
-  def latin_current_configinfo(slot=nil)
-    Hash[latin_configinfo(slot)]
-  end
-
-  def kanji_configure(slot, value=None)
-    #if JAPANIZED_TK
-    if @kanjifont == nil
-      configure_core(@compoundfont, slot, value) # use @compoundfont
-    elsif @kanjifont != ""
-      configure_core(@kanjifont, slot, value)
-      configure('size'=>configinfo('size')) # to reflect new configuration
-    else
-      #""
-      configure(slot, value)
-    end
-    self
-  end
-
-  def kanji_configinfo(slot=nil)
-    #if JAPANIZED_TK
-    if @kanjifont == nil
-      configure_core(@compoundfont, slot) # use @compoundfont
-    elsif @kanjifont != ""
-      configinfo_core(@kanjifont, slot)
-    else
-      #[]
-      configinfo(slot)
-    end
-  end
-  def kanji_current_configinfo(slot=nil)
-    Hash[kanji_configinfo(slot)]
-  end
-
-  def replace(ltn, knj=None)
-    knj = ltn if knj == None
-    latin_replace(ltn)
-    kanji_replace(knj)
-    self
-  end
-
-  def latin_replace(ltn)
-    if @latinfont
-      latin_replace_core(ltn)
-      reset_pointadjust
-    else
-      # not compound font -> copy properties of ltn
-      latinkeys = {}
-      begin
-        actual_core(ltn).each{|key,val| latinkeys[key] = val}
-      rescue
-        latinkeys = {}
-      end
-      begin
-        tk_call('font', 'configure', @compoundfont, *hash_kv(latinkeys))
-      rescue
-        # not exist? (deleted?) -> create font
-        tk_call('font', 'create', @compoundfont, *hash_kv(latinkeys))
-      end
-    end
-
-    self
-  end
-
-  def kanji_replace(knj)
-    return self unless @kanjifont  # ignore
-    kanji_replace_core(knj)
-    reset_pointadjust
-    self
-  end
-
-  def measure(text)
-    measure_core(@compoundfont, nil, text)
-  end
-
-  def measure_displayof(win, text)
-    win = '.' unless win
-    measure_core(@compoundfont, win, text)
-  end
-
-  def metrics(option=nil)
-    metrics_core(@compoundfont, nil, option)
-  end
-  def metrics_hash(option=nil)
-    if option
-      val = metrics(option)
-      case TkFont::MetricsType[option.to_s]
-      when ?n
-        val = TkComm::num_or_str(val)
-      when ?b
-        val = TkComm::bool(val)
-      else
-        # do nothing
-      end
-      return val
-    end
-
-    h = Hash[metrics(option)]
-    h.keys.each{|k|
-      case TkFont::MetricsType[k.to_s]
-      when ?n
-        h[k] = TkComm::num_or_str(h[k])
-      when ?b
-        h[k] = TkComm::bool(h[k])
-      else
-        # do nothing
-      end
-    }
-    h
-  end
-
-  def metrics_displayof(win, option=nil)
-    win = '.' unless win
-    metrics_core(@compoundfont, win, option)
-  end
-  def metrics_hash_displayof(win, option=nil)
-    if option
-      val = metrics_displayof(win, option)
-      case TkFont::MetricsType[option.to_s]
-      when ?n
-        val = TkComm::num_or_str(val)
-      when ?b
-        val = TkComm::bool(val)
-      else
-        # do nothing
-      end
-      return val
-    end
-
-    h = Hash[metrics_displayof(win, option)]
-    h.keys.each{|k|
-      case TkFont::MetricsType[k.to_s]
-      when ?n
-        h[k] = TkComm::num_or_str(h[k])
-      when ?b
-        h[k] = TkComm::bool(h[k])
-      else
-        # do nothing
-      end
-    }
-    h
-  end
-
-  def latin_metrics(option=nil)
-    if @latinfont == nil
-      metrics_core(@compoundfont, nil, option) # use @compoundfont
-    else
-      metrics_core(@latinfont, nil, option)
-    end
-  end
-  def latin_metrics_hash(option=nil)
-    if option
-      val = latin_metrics(option)
-      case TkFont::MetricsType[option.to_s]
-      when ?n
-        val = TkComm::num_or_str(val)
-      when ?b
-        val = TkComm::bool(val)
-      else
-        # do nothing
-      end
-      return val
-    end
-
-    h = Hash[latin_metrics(option)]
-    h.keys.each{|k|
-      case TkFont::MetricsType[k.to_s]
-      when ?n
-        h[k] = TkComm::num_or_str(h[k])
-      when ?b
-        h[k] = TkComm::bool(h[k])
-      else
-        # do nothing
-      end
-    }
-    h
-  end
-
-  def latin_metrics_displayof(win, option=nil)
-    win = '.' unless win
-    if @latinfont == nil
-      metrics_core(@compoundfont, win, option) # use @compoundfont
-    else
-      metrics_core(@latinfont, win, option)
-    end
-  end
-  def latin_metrics_hash_displayof(win, option=nil)
-    if option
-      val = latin_metrics_displayof(win, option)
-      case TkFont::MetricsType[option.to_s]
-      when ?n
-        val = TkComm::num_or_str(val)
-      when ?b
-        val = TkComm::bool(val)
-      else
-        # do nothing
-      end
-      return val
-    end
-
-    h = Hash[latin_metrics_displayof(win, option)]
-    h.keys.each{|k|
-      case TkFont::MetricsType[k.to_s]
-      when ?n
-        h[k] = TkComm::num_or_str(h[k])
-      when ?b
-        h[k] = TkComm::bool(h[k])
-      else
-        # do nothing
-      end
-    }
-    h
-  end
-
-  def kanji_metrics(option=nil)
-    if @latinfont == nil
-      metrics_core(@compoundfont, nil, option) # use @compoundfont
-    elsif JAPANIZED_TK
-      metrics_core(@kanjifont, nil, option)
-    else
-      metrics_core_tk4x(nil, nil, option)
-    end
-  end
-  def kanji_metrics_hash(option=nil)
-    if option
-      val = kanji_metrics(option)
-      case TkFont::MetricsType[option.to_s]
-      when ?n
-        val = TkComm::num_or_str(val)
-      when ?b
-        val = TkComm::bool(val)
-      else
-        # do nothing
-      end
-      return val
-    end
-
-    h = Hash[kanji_metrics(option)]
-    h.keys.each{|k|
-      case TkFont::MetricsType[k.to_s]
-      when ?n
-        h[k] = TkComm::num_or_str(h[k])
-      when ?b
-        h[k] = TkComm::bool(h[k])
-      else
-        # do nothing
-      end
-    }
-    h
-  end
-
-  def kanji_metrics_displayof(win, option=nil)
-    win = '.' unless win
-    if @latinfont == nil
-      metrics_core(@compoundfont, win, option) # use @compoundfont
-    elsif JAPANIZED_TK
-      metrics_core(@kanjifont, win, option)
-    else
-      metrics_core_tk4x(nil, win, option)
-    end
-  end
-  def kanji_metrics_hash_displayof(win, option=nil)
-    if option
-      val = kanji_metrics_displayof(win, option)
-      case TkFont::MetricsType[option.to_s]
-      when ?n
-        val = TkComm::num_or_str(val)
-      when ?b
-        val = TkComm::bool(val)
-      else
-        # do nothing
-      end
-      return val
-    end
-
-    h = Hash[kanji_metrics_displayof(win, option)]
-    h.keys.each{|k|
-      case TkFont::MetricsType[k.to_s]
-      when ?n
-        h[k] = TkComm::num_or_str(h[k])
-      when ?b
-        h[k] = TkComm::bool(h[k])
-      else
-        # do nothing
-      end
-    }
-    h
-  end
-
-  def reset_pointadjust
-    begin
-      if /^8\..*/ === Tk::TK_VERSION  && JAPANIZED_TK
-        configure('pointadjust' => latin_actual.assoc('size')[1].to_f /
-                                      kanji_actual.assoc('size')[1].to_f )
-      end
-    rescue
-    end
-    self
-  end
-
-  ###################################
-  # private alias
-  ###################################
-  case (Tk::TK_VERSION)
-  when /^4\..*/
-    alias create_latinfont        create_latinfont_tk4x
-    alias create_kanjifont        create_kanjifont_tk4x
-    alias create_compoundfont     create_compoundfont_tk4x
-
-  when /^8\.[0-5]/
-    alias create_latinfont        create_latinfont_tk8x
-    alias create_kanjifont        create_kanjifont_tk8x
-    alias create_compoundfont     create_compoundfont_tk8x
-
-  else
-    alias create_latinfont        create_latinfont_tk8x
-    alias create_kanjifont        create_kanjifont_tk8x
-    alias create_compoundfont     create_compoundfont_tk8x
-
-  end
-
-  ###################################
-  # public alias
-  ###################################
-  alias ascii_font             latin_font
-  alias asciifont              latinfont
-  alias create_asciifont       create_latinfont
-  alias ascii_actual           latin_actual
-  alias ascii_actual_displayof latin_actual_displayof
-  alias ascii_configure        latin_configure
-  alias ascii_configinfo       latin_configinfo
-  alias ascii_replace          latin_replace
-  alias ascii_metrics          latin_metrics
-
-  ###################################
-=begin
-  def dup
-    TkFont.new(self)
-  end
-  def clone
-    TkFont.new(self)
-  end
-=end
-end
-
-module TkFont::CoreMethods
-  include Tk
-  extend TkCore
-
-  private
-
-  def actual_core_tk4x(font, win=nil, option=nil)
-    # dummy
-    if option == 'pointadjust' || option == :pointadjust
-        1.0
-    elsif option
-      case TkFont::OptionType[option.to_s]
-      when ?n
-        0
-      when ?b
-        false
-      else
-        ''
-      end
-    else
-      [['family',''], ['size',0], ['weight',''], ['slant',''],
-        ['underline',false], ['overstrike',false], ['charset',''],
-        ['pointadjust',0]]
-    end
-  end
-
-  def actual_core_tk8x(font, win=nil, option=nil)
-    font = '{}' if font == ''
-
-    if option == 'compound' || option == :compound
-      ""
-    elsif option
-      if win
-        val = tk_call('font', 'actual', font,
-                      "-displayof", win, "-#{option}")
-      else
-        val = tk_call('font', 'actual', font, "-#{option}")
-      end
-      case TkFont::OptionType[option.to_s]
-      when ?n
-        num_or_str(val)
-      when ?b
-        bool(val)
-      else
-        val
-      end
-    else
-      l = tk_split_simplelist(if win
-                                 tk_call('font', 'actual', font,
-                                                     "-displayof", win)
-                              else
-                                 tk_call('font', 'actual', font)
-                              end)
-      r = []
-      while key=l.shift
-        if key == '-compound'
-          l.shift
-        else
-          key = key[1..-1]
-          val = l.shift
-          case TkFont::OptionType[key]
-          when ?n
-            r.push [key, num_or_str(val)]
-          when ?b
-            r.push [key, bool(val)]
-          else
-            r.push [key, val]
-          end
-        end
-      end
-      r
-    end
-  end
-
-  def configure_core_tk4x(font, slot, value=None)
-    #""
-    self
-  end
-
-  def configinfo_core_tk4x(font, option=nil)
-    # dummy
-    if TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
-      if option == 'pointadjust' || option == :pointadjust
-        1.0
-      elsif option
-        case TkFont::OptionType[option.to_s]
-        when ?n
-          0
-        when ?b
-          false
-        else
-          ''
-        end
-      else
-        [['family',''], ['size',0], ['weight',''], ['slant',''],
-          ['underline',false], ['overstrike',false], ['charset',''],
-          ['pointadjust',1.0]]
-      end
-    else # ! TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
-      current_configinfo_core_tk4x(font, option)
-    end
-  end
-
-  def current_configinfo_core_tk4x(font, option=nil)
-    if option
-      case TkFont::OptionType[option.to_s]
-      when ?n
-        0
-      when ?b
-        false
-      else
-        ''
-      end
-    else
-      {'family'=>'', 'size'=>0, 'weight'=>'', 'slant'=>'',
-        'underline'=>false, 'overstrike'=>false,
-        'charset'=>false, 'pointadjust'=>1.0}
-    end
-  end
-
-  def configure_core_tk8x(font, slot, value=None)
-    if JAPANIZED_TK
-      begin
-        padjust = tk_call('font', 'configure', font, '-pointadjust')
-      rescue
-        padjust = nil
-      end
-    else
-      padjust = nil
-    end
-    if slot.kind_of? Hash
-      if JAPANIZED_TK && (slot.key?('family') || slot.key?(:family))
-        slot = _symbolkey2str(slot)
-        configure_core_tk8x(font, 'family', slot.delete('family'))
-      end
-
-      if ((slot.key?('size') || slot.key?(:size)) &&
-          padjust && !slot.key?('pointadjust') && !slot.key?(:pointadjust))
-        tk_call('font', 'configure', font,
-                '-pointadjust', padjust, *hash_kv(slot))
-      else
-        tk_call('font', 'configure', font, *hash_kv(slot))
-      end
-    elsif (slot == 'size' || slot == :size) && padjust != nil
-      tk_call('font', 'configure', font,
-              "-#{slot}", value, '-pointadjust', padjust)
-    elsif JAPANIZED_TK && (slot == 'family' || slot == :family)
-      # compound font?
-      begin
-        compound = tk_split_simplelist(tk_call('font', 'configure',
-                                               font, '-compound'))
-      rescue
-        tk_call('font', 'configure', font, '-family', value)
-        return self
-      end
-      if compound == []
-        tk_call('font', 'configure', font, '-family', value)
-        return self
-      end
-      ltn, knj = compound
-
-      lfnt = tk_call('font', 'create', '-copy', ltn)
-      begin
-        tk_call('font', 'configure', lfnt, '-family', value)
-        latin_replace_core_tk8x(lfnt)
-      rescue RuntimeError => e
-        fail e if $DEBUG
-      ensure
-        tk_call('font', 'delete', lfnt) if lfnt != ''
-      end
-
-      kfnt = tk_call('font', 'create', '-copy', knj)
-      begin
-        tk_call('font', 'configure', kfnt, '-family', value)
-        kanji_replace_core_tk8x(lfnt)
-      rescue RuntimeError => e
-        fail e if $DEBUG
-      ensure
-        tk_call('font', 'delete', kfnt) if kfnt != ''
-      end
-
-    else
-      tk_call('font', 'configure', font, "-#{slot}", value)
-    end
-    self
-  end
-
-  def configinfo_core_tk8x(font, option=nil)
-    if TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
-      if option == 'compound' || option == :compound
-        ""
-      elsif option
-        val = tk_call('font', 'configure', font, "-#{option}")
-        case TkFont::OptionType[option.to_s]
-        when ?n
-          num_or_str(val)
-        when ?b
-          bool(val)
-        else
-          val
-        end
-      else
-        l = tk_split_simplelist(tk_call('font', 'configure', font))
-        r = []
-        while key=l.shift
-          if key == '-compound'
-            l.shift
-          else
-            key = key[1..-1]
-            val = l.shift
-            case TkFont::OptionType[key]
-            when ?n
-              r.push [key, num_or_str(val)]
-            when ?b
-              r.push [key, bool(val)]
-            else
-              r.push [key, val]
-            end
-          end
-        end
-        r
-      end
-    else # ! TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
-      current_configinfo_core_tk8x(font, option)
-    end
-  end
-
-  def current_configinfo_core_tk8x(font, option=nil)
-    if option == 'compound'
-      ""
-    elsif option
-      val = tk_call('font', 'configure', font, "-#{option}")
-      case TkFont::OptionType[option.to_s]
-      when ?n
-        num_or_str(val)
-      when ?b
-        bool(val)
-      else
-        val
-      end
-    else
-      l = tk_split_simplelist(tk_call('font', 'configure', font))
-      h = {}
-      while key=l.shift
-        if key == '-compound'
-          l.shift
-        else
-          key = key[1..-1]
-          val = l.shift
-          case TkFont::OptionType[key]
-          when ?n
-            h[key] = num_or_str(val)
-          when ?b
-            h[key] = bool(val)
-          else
-            h[key] = val
-          end
-        end
-      end
-      h
-    end
-  end
-
-  def delete_core_tk4x
-    TkFont::Tk_FontNameTBL.mutex.synchronize{
-      TkFont::Tk_FontNameTBL.delete(@id)
-    }
-    TkFont::Tk_FontUseTBL.mutex.synchronize{
-      TkFont::Tk_FontUseTBL.delete_if{|key,value| value == self}
-    }
-  end
-
-  def delete_core_tk8x
-    begin
-      tk_call('font', 'delete', @latinfont) if @latinfont
-    rescue
-    end
-    begin
-      tk_call('font', 'delete', @kanjifont) if @kanjifont
-    rescue
-    end
-    begin
-      tk_call('font', 'delete', @compoundfont) if @compoundfont
-    rescue
-    end
-    TkFont::Tk_FontNameTBL.mutex.synchronize{
-      TkFont::Tk_FontNameTBL.delete(@id)
-    }
-    TkFont::Tk_FontUseTBL.mutex.synchronize{
-      TkFont::Tk_FontUseTBL.delete_if{|key,value| value == self}
-    }
-  end
-
-  def latin_replace_core_tk4x(ltn)
-    create_latinfont_tk4x(ltn)
-    @compoundfont[0] = [@latinfont] if JAPANIZED_TK
-    @fontslot['font'] = @latinfont
-    table = nil
-    TkFont::Tk_FontUseTBL.mutex.synchronize{
-      table = TkFont::Tk_FontUseTBL.clone
-    }
-    table.each{|w, fobj|
-      if self == fobj
-        begin
-          if w.include?(';')
-            win, tag, optkey = w.split(';')
-            optkey = 'font' if optkey == nil || optkey == ''
-            winobj = tk_tcl2ruby(win)
-#           winobj.tagfont_configure(tag, {'font'=>@latinfont})
-            #if winobj.kind_of? TkText
-            if winobj.kind_of?(TkText) || winobj.kind_of?(Tk::Text)
-              tk_call(win, 'tag', 'configure', tag, "-#{optkey}", @latinfont)
-            #elsif winobj.kind_of? TkCanvas
-            elsif winobj.kind_of?(TkCanvas) || winobj.kind_of?(Tk::Canvas)
-              tk_call(win, 'itemconfigure', tag, "-#{optkey}", @latinfont)
-            #elsif winobj.kind_of? TkMenu
-            elsif winobj.kind_of?(TkMenu) || winobj.kind_of?(Tk::Menu)
-              tk_call(win, 'entryconfigure', tag, "-#{optkey}", @latinfont)
-            else
-              raise RuntimeError, "unknown widget type"
-            end
-          else
-#           tk_tcl2ruby(w).font_configure('font'=>@latinfont)
-            tk_call(w, 'configure', '-font', @latinfont)
-          end
-        rescue
-          TkFont::Tk_FontUseTBL.mutex.synchronize{
-            TkFont::Tk_FontUseTBL.delete(w)
-          }
-        end
-      end
-    }
-    self
-  end
-
-  def kanji_replace_core_tk4x(knj)
-    return self unless JAPANIZED_TK
-
-    create_kanjifont_tk4x(knj)
-    @compoundfont[1] = [@kanjifont]
-    @fontslot['kanjifont'] = @kanjifont
-    table = nil
-    TkFont::Tk_FontUseTBL.mutex.synchronize{
-      table = TkFont::Tk_FontUseTBL.clone
-    }
-    table.dup.each{|w, fobj|
-      if self == fobj
-        begin
-          if w.include?(';')
-            win, tag, optkey = w.split(';')
-            optkey = 'kanjifont' unless optkey
-            winobj = tk_tcl2ruby(win)
-#           winobj.tagfont_configure(tag, {'kanjifont'=>@kanjifont})
-            #if winobj.kind_of? TkText
-            if winobj.kind_of?(TkText) || winobj.kind_of?(Tk::Text)
-              tk_call(win, 'tag', 'configure', tag, "-#{optkey}", @kanjifont)
-            #elsif winobj.kind_of? TkCanvas
-            elsif winobj.kind_of?(TkCanvas) || winobj.kind_of?(Tk::Canvas)
-              tk_call(win, 'itemconfigure', tag, "-#{optkey}", @kanjifont)
-            #elsif winobj.kind_of? TkMenu
-            elsif winobj.kind_of?(TkMenu) || winobj.kind_of?(Tk::Menu)
-              tk_call(win, 'entryconfigure', tag, "-#{optkey}", @latinfont)
-            else
-              raise RuntimeError, "unknown widget type"
-            end
-          else
-#           tk_tcl2ruby(w).font_configure('kanjifont'=>@kanjifont)
-            tk_call(w, 'configure', '-kanjifont', @kanjifont)
-          end
-        rescue
-          Tk_FontUseTBL.mutex.synchronize{
-            TkFont::Tk_FontUseTBL.delete(w)
-          }
-        end
-      end
-    }
-    self
-  end
-
-  def latin_replace_core_tk8x(ltn)
-    ltn = '{}' if ltn == ''
-
-    if JAPANIZED_TK
-      begin
-        tk_call('font', 'delete', '@font_tmp')
-      rescue
-      end
-      begin
-        fnt_bup = tk_call('font', 'create', '@font_tmp', '-copy', @latinfont)
-      rescue
-        #fnt_bup = ''
-        fnt_bup = TkFont::DEFAULT_LATIN_FONT_NAME
-      end
-    end
-
-    begin
-      tk_call('font', 'delete', @latinfont)
-    rescue
-    end
-    create_latinfont(ltn)
-
-    if JAPANIZED_TK
-      keys = self.configinfo
-      tk_call('font', 'delete', @compoundfont)
-      begin
-        tk_call('font', 'create', @compoundfont,
-                '-compound', [@latinfont, @kanjifont], *hash_kv(keys))
-=begin
-        latinkeys = {}
-        begin
-          actual_core(@latinfont).each{|key,val| latinkeys[key] = val}
-        rescue
-          latinkeys = {}
-        end
-        if latinkeys != {}
-          tk_call('font', 'configure', @compoundfont, *hash_kv(latinkeys))
-        end
-=end
-      rescue RuntimeError => e
-        tk_call('font', 'delete', @latinfont)
-        if fnt_bup && fnt_bup != ''
-          tk_call('font', 'create', @latinfont, '-copy', fnt_bup)
-          tk_call('font', 'create', @compoundfont,
-                  '-compound', [@latinfont, @kanjifont], *hash_kv(keys))
-          tk_call('font', 'delete', fnt_bup)
-        else
-          fail e
-        end
-      end
-
-    else
-      latinkeys = {}
-      begin
-        actual_core(@latinfont).each{|key,val| latinkeys[key] = val}
-      rescue
-        latinkeys = {}
-      end
-      begin
-        tk_call('font', 'configure', @compoundfont, *hash_kv(latinkeys))
-      rescue
-        # not exist? (deleted?) -> create font
-        tk_call('font', 'create', @compoundfont, *hash_kv(latinkeys))
-      end
-    end
-    self
-  end
-
-  def kanji_replace_core_tk8x(knj)
-    knj = '{}' if knj == ''
-
-    if JAPANIZED_TK
-      begin
-        tk_call('font', 'delete', '@font_tmp')
-      rescue
-      end
-      begin
-        fnt_bup = tk_call('font', 'create', '@font_tmp', '-copy', @kanjifont)
-      rescue
-        #fnt_bup = ''
-        fnt_bup = TkFont::DEFAULT_KANJI_FONT_NAME
-      end
-    end
-
-    begin
-      tk_call('font', 'delete', @kanjifont)
-    rescue
-    end
-    create_kanjifont(knj)
-
-    if JAPANIZED_TK
-      keys = self.configinfo
-      tk_call('font', 'delete', @compoundfont)
-      begin
-        tk_call('font', 'create', @compoundfont,
-                '-compound', [@latinfont, @kanjifont], *hash_kv(keys))
-      rescue RuntimeError => e
-        tk_call('font', 'delete', @kanjifont)
-        if fnt_bup && fnt_bup != ''
-          tk_call('font', 'create', @kanjifont, '-copy', fnt_bup)
-          tk_call('font', 'create', @compoundfont,
-                  '-compound', [@latinfont, @kanjifont], *hash_kv(keys))
-          tk_call('font', 'delete', fnt_bup)
-        else
-          fail e
-        end
-      end
-    end
-    self
-  end
-
-  def measure_core_tk4x(font, win, text)
-    0
-  end
-
-  def measure_core_tk8x(font, win, text)
-    font = '{}' if font == ''
-
-    if win
-      number(tk_call('font', 'measure', font,
-                     '-displayof', win, text))
-    else
-      number(tk_call('font', 'measure', font, text))
-    end
-  end
-
-  def metrics_core_tk4x(font, win, option=nil)
-    # dummy
-    if option
-      ""
-    else
-      [['ascent',[]], ['descent',[]], ['linespace',[]], ['fixed',[]]]
-    end
-  end
-
-  def metrics_core_tk8x(font, win, option=nil)
-    font = '{}' if font == ''
-
-    if option
-      if win
-        number(tk_call('font', 'metrics', font,
-                       "-displayof", win, "-#{option}"))
-      else
-        number(tk_call('font', 'metrics', font, "-#{option}"))
-      end
-    else
-      l = tk_split_list(if win
-                          tk_call('font','metrics',font,"-displayof",win)
-                        else
-                          tk_call('font','metrics',font)
-                        end)
-      r = []
-      while key=l.shift
-        r.push [key[1..-1], l.shift.to_i]
-=begin
-        if key == '-fixed'  # boolean value
-          r.push [key[1..-1], bool(l.shift)]
-        else
-          r.push [key[1..-1], l.shift.to_i]
-        end
-=end
-      end
-      r
-    end
-  end
-
-  ###################################
-  # private alias
-  ###################################
-  case (Tk::TK_VERSION)
-  when /^4\..*/
-    alias actual_core             actual_core_tk4x
-    alias configure_core          configure_core_tk4x
-    alias configinfo_core         configinfo_core_tk4x
-    alias current_configinfo_core current_configinfo_core_tk4x
-    alias delete_core             delete_core_tk4x
-    alias latin_replace_core      latin_replace_core_tk4x
-    alias kanji_replace_core      kanji_replace_core_tk4x
-    alias measure_core            measure_core_tk4x
-    alias metrics_core            metrics_core_tk4x
-
-  when /^8\.[0-9]/
-    alias actual_core             actual_core_tk8x
-    alias configure_core          configure_core_tk8x
-    alias configinfo_core         configinfo_core_tk8x
-    alias current_configinfo_core current_configinfo_core_tk8x
-    alias delete_core             delete_core_tk8x
-    alias latin_replace_core      latin_replace_core_tk8x
-    alias kanji_replace_core      kanji_replace_core_tk8x
-    alias measure_core            measure_core_tk8x
-    alias metrics_core            metrics_core_tk8x
-
-  else
-    alias actual_core             actual_core_tk8x
-    alias configure_core          configure_core_tk8x
-    alias configinfo_core         configinfo_core_tk8x
-    alias current_configinfo_core current_configinfo_core_tk8x
-    alias delete_core             delete_core_tk8x
-    alias latin_replace_core      latin_replace_core_tk8x
-    alias kanji_replace_core      kanji_replace_core_tk8x
-    alias measure_core            measure_core_tk8x
-    alias metrics_core            metrics_core_tk8x
-
-  end
-end
-
-class TkFont
-  include TkFont::CoreMethods
-  extend  TkFont::CoreMethods
-end
-
-class TkNamedFont < TkFont
-  # for built-in named fonts
-  def TkNamedFont.find(name)
-    name = name.to_s
-    unless (obj = Tk_FontNameTBL[name])
-      obj = self.new(name) if TkFont.is_system_font?(name)
-    end
-    obj
-  end
-
-  def TkNamedFont.new(name, keys=nil)
-    name = name.to_s
-    obj = nil
-    Tk_FontNameTBL.mutex.synchronize{
-      unless (obj = Tk_FontNameTBL[name])
-        (obj = self.allocate).instance_eval{
-          @id = @compoundfont = name.to_s
-          @latinfont = nil
-          @kanjifont = nil
-          @descendant = [self, self] # [latin, kanji] : dummy
-          Tk_FontNameTBL[@id] = self
-        }
-      end
-    }
-    obj.instance_eval{ initialize(name, keys) }
-    obj
-  end
-
-  ###########################
-  private
-  ###########################
-  def initialize(name, keys=nil)
-    @id = @compoundfont = name.to_s
-
-    # if not exist named font, create it.
-    begin
-      if keys
-        tk_call('font', 'configure', @compoundfont, keys)
-      else
-        tk_call('font', 'configure', @compoundfont)
-      end
-    rescue
-      # the named font doesn't exist -> create
-      if keys
-        tk_call('font', 'create', @compoundfont, keys)
-      else
-        tk_call('font', 'create', @compoundfont)
-      end
-    end
-  end
-
-  def create_latinfont(fnt)
-    # ignore
-  end
-  def create_kanjifont(fnt)
-    # ignore
-  end
-  def create_compoundfont(ltn, knj, keys)
-    # ignore
-  end
-
-  ###########################
-  public
-  ###########################
-  def latin_font_id
-    @compoundfont
-  end
-  def kanji_font_id
-    @compoundfont
-  end
-end
-
-#######################################
-# define system font names
-#######################################
-if Tk::TCL_MAJOR_VERSION > 8 ||
-    (Tk::TCL_MAJOR_VERSION == 8 && Tk::TCL_MINOR_VERSION >= 5)
-  # add standard fonts of Tcl/Tk 8.5+
-  TkFont::SYSTEM_FONT_NAMES.add [
-    'TkDefaultFont', 'TkTextFont', 'TkFixedFont', 'TkMenuFont',
-    'TkHeadingFont', 'TkCaptionFont', 'TkSmallCaptionFont',
-    'TkIconFont', 'TkTooltipFont'
-  ]
-end
-
-# platform-specific fonts
-#  -- windows
-TkFont::SYSTEM_FONT_NAMES.add [
-  'ansifixed', 'ansi', 'device', 'oemfixed', 'systemfixed', 'system'
-]
-
-#  --  macintosh, macosx
-TkFont::SYSTEM_FONT_NAMES.add ['system', 'application']
-
-if Tk::TCL_MAJOR_VERSION > 8 ||
-    (Tk::TCL_MAJOR_VERSION == 8 && Tk::TCL_MINOR_VERSION >= 5)
-  TkFont::SYSTEM_FONT_NAMES.add ['menu']
-end
-
-#  --  macosx (Aqua theme)
-if Tk::TCL_MAJOR_VERSION > 8 ||
-    (Tk::TCL_MAJOR_VERSION == 8 && Tk::TCL_MINOR_VERSION >= 5)
-  TkFont::SYSTEM_FONT_NAMES.add [
-    'systemSystemFont', 'systemEmphasizedSystemFont',
-    'systemSmallSystemFont', 'systemSmallEmphasizedSystemFont',
-    'systemApplicationFont', 'systemLabelFont', 'systemViewsFont',
-    'systemMenuTitleFont', 'systemMenuItemFont', 'systemMenuItemMarkFont',
-    'systemMenuItemCmdKeyFont', 'systemWindowTitleFont',
-    'systemPushButtonFont', 'systemUtilityWindowTitleFont',
-    'systemAlertHeaderFont', 'systemToolbarFont', 'systemMiniSystemFont',
-    'systemDetailSystemFont', 'systemDetailEmphasizedSystemFont'
-  ]
-end
-
-#######################################
-# autoload
-#######################################
-class TkFont
-  autoload :Chooser, 'tk/fontchooser'
-end
diff --git a/ext/tk/lib/tk/fontchooser.rb b/ext/tk/lib/tk/fontchooser.rb
deleted file mode 100644
index 325ca4dbd2..0000000000
--- a/ext/tk/lib/tk/fontchooser.rb
+++ /dev/null
@@ -1,181 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/fontchooser.rb -- "tk fontchooser" support (Tcl/Tk8.6 or later)
-#
-require 'tk'
-require 'tk/font'
-
-module TkFont::Chooser
-  extend TkCore
-end
-
-module Tk
-  Fontchooser = TkFont::Chooser
-end
-
-class << TkFont::Chooser
-  def method_missing(id, *args)
-    name = id.id2name
-    case args.length
-    when 1
-      if name[-1] == ?=
-        configure name[0..-2], args[0]
-        args[0]
-      else
-        configure name, args[0]
-        self
-      end
-    when 0
-      begin
-        cget(name)
-      rescue
-        super(id, *args)
-      end
-    else
-      super(id, *args)
-    end
-  end
-
-  def __configinfo_value(key, val)
-    case key
-    when 'parent'
-      window(val)
-    when 'title'
-      val
-    when 'font'
-      if (lst = tk_split_simplelist(val)).size == 1
-        lst[0]
-      else
-        lst.map{|elem| num_or_str(elem)}
-      end
-    when 'command'
-      tk_tcl2ruby(val)
-    when 'visible'
-      bool(val)
-    else # unknown
-      val
-    end
-  end
-  private :__configinfo_value
-
-  def configinfo(option=nil)
-    if !option && TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
-      lst = tk_split_simplelist(tk_call('tk', 'fontchooser', 'configure'))
-      ret = []
-      TkComm.slice_ary(lst, 2){|k, v|
-        k = k[1..-1]
-        ret << [k, __configinfo_value(k, v)]
-      }
-      ret
-    else
-      current_configinfo(option)
-    end
-  end
-
-  def current_configinfo(option=nil)
-    if option
-      opt = option.to_s
-      fail ArgumentError, "Invalid option `#{option.inspect}'" if opt.empty?
-      __configinfo_value(option.to_s, tk_call('tk','fontchooser',
-                                              'configure',"-#{opt}"))
-    else
-      lst = tk_split_simplelist(tk_call('tk', 'fontchooser', 'configure'))
-      ret = {}
-      TkComm.slice_ary(lst, 2){|k, v|
-        k = k[1..-1]
-        ret[k] = __configinfo_value(k, v)
-      }
-      ret
-    end
-  end
-
-  def configure(option, value=None)
-    if option.kind_of? Hash
-      tk_call('tk', 'fontchooser', 'configure',
-              *hash_kv(_symbolkey2str(option)))
-    else
-      opt = option.to_s
-      fail ArgumentError, "Invalid option `#{option.inspect}'" if opt.empty?
-      tk_call('tk', 'fontchooser', 'configure', "-#{opt}", value)
-    end
-    self
-  end
-
-  def configure_cmd(slot, value)
-    configure(slot, install_cmd(value))
-  end
-
-  def command(cmd=nil, &b)
-    if cmd
-      configure_cmd('command', cmd)
-    elsif b
-      configure_cmd('command', Proc.new(&b))
-    else
-      cget('command')
-    end
-  end
-
-  def cget(slot)
-    configinfo slot
-  end
-
-  def [](slot)
-    cget slot
-  end
-
-  def []=(slot, val)
-    configure slot, val
-    val
-  end
-
-  def show
-    tk_call('tk', 'fontchooser', 'show')
-    self
-  end
-
-  def hide
-    tk_call('tk', 'fontchooser', 'hide')
-    self
-  end
-
-  def toggle
-    cget(:visible) ?  hide: show
-    self
-  end
-
-  def set_for(target, title="Font")
-    if target.kind_of? TkFont
-      configs = {
-        :font=>target.actual_hash,
-        :command=>proc{|fnt, *args|
-          target.configure(TkFont.actual_hash(fnt))
-        }
-      }
-    elsif target.kind_of? Hash
-      # key=>value list or OptionObj
-      fnt = target[:font] rescue ''
-      fnt = fnt.actual_hash if fnt.kind_of?(TkFont)
-      configs = {
-        :font => fnt,
-        :command=>proc{|fnt, *args|
-          target[:font] = TkFont.actual_hash(fnt)
-        }
-      }
-    else
-      configs = {
-        :font=>target.cget_tkstring(:font),
-        :command=>proc{|fnt, *args|
-          target.font = TkFont.actual_hash_displayof(fnt, target)
-        }
-      }
-    end
-
-    configs[:title] = title if title
-    configure(configs)
-    target
-  end
-
-  def unset
-    configure(:command, nil)
-  end
-end
diff --git a/ext/tk/lib/tk/frame.rb b/ext/tk/lib/tk/frame.rb
deleted file mode 100644
index 0682faf3fe..0000000000
--- a/ext/tk/lib/tk/frame.rb
+++ /dev/null
@@ -1,133 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/frame.rb : treat frame widget
-#
-require 'tk'
-
-class Tk::Frame<TkWindow
-  TkCommandNames = ['frame'.freeze].freeze
-  WidgetClassName = 'Frame'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-################# old version
-#  def initialize(parent=nil, keys=nil)
-#    if keys.kind_of? Hash
-#      keys = keys.dup
-#      @classname = keys.delete('classname') if keys.key?('classname')
-#      @colormap  = keys.delete('colormap')  if keys.key?('colormap')
-#      @container = keys.delete('container') if keys.key?('container')
-#      @visual    = keys.delete('visual')    if keys.key?('visual')
-#    end
-#    super(parent, keys)
-#  end
-#
-#  def create_self
-#    s = []
-#    s << "-class"     << @classname if @classname
-#    s << "-colormap"  << @colormap  if @colormap
-#    s << "-container" << @container if @container
-#    s << "-visual"    << @visual    if @visual
-#    tk_call 'frame', @path, *s
-#  end
-#################
-
-  def __boolval_optkeys
-    super() << 'container'
-  end
-  private :__boolval_optkeys
-
-  def initialize(parent=nil, keys=nil)
-    my_class_name = nil
-    if self.class < WidgetClassNames[self.class::WidgetClassName]
-      my_class_name = self.class.name
-      my_class_name = nil if my_class_name == ''
-    end
-    if parent.kind_of? Hash
-      keys = _symbolkey2str(parent)
-    else
-      if keys
-        keys = _symbolkey2str(keys)
-        keys['parent'] = parent
-      else
-        keys = {'parent'=>parent}
-      end
-    end
-    if keys.key?('classname')
-       keys['class'] = keys.delete('classname')
-    end
-    @classname = keys['class']
-    @colormap  = keys['colormap']
-    @container = keys['container']
-    @visual    = keys['visual']
-    if !@classname && my_class_name
-      keys['class'] = @classname = my_class_name
-    end
-    if @classname.kind_of? TkBindTag
-      @db_class = @classname
-      @classname = @classname.id
-    elsif @classname
-      @db_class = TkDatabaseClass.new(@classname)
-    else
-      @db_class = self.class
-      @classname = @db_class::WidgetClassName
-    end
-    super(keys)
-  end
-
-  #def create_self(keys)
-  #  if keys and keys != None
-  #    tk_call_without_enc('frame', @path, *hash_kv(keys))
-  #  else
-  #    tk_call_without_enc( 'frame', @path)
-  #  end
-  #end
-  #private :create_self
-
-  def database_classname
-    @classname
-  end
-
-  def self.database_class
-    if self == WidgetClassNames[WidgetClassName] || self.name == ''
-      self
-    else
-      TkDatabaseClass.new(self.name)
-    end
-  end
-  def self.database_classname
-    self.database_class.name
-  end
-
-  def self.bind(*args, &b)
-    if self == WidgetClassNames[WidgetClassName] || self.name == ''
-      super(*args, &b)
-    else
-      TkDatabaseClass.new(self.name).bind(*args, &b)
-    end
-  end
-  def self.bind_append(*args, &b)
-    if self == WidgetClassNames[WidgetClassName] || self.name == ''
-      super(*args, &b)
-    else
-      TkDatabaseClass.new(self.name).bind_append(*args, &b)
-    end
-  end
-  def self.bind_remove(*args)
-    if self == WidgetClassNames[WidgetClassName] || self.name == ''
-      super(*args)
-    else
-      TkDatabaseClass.new(self.name).bind_remove(*args)
-    end
-  end
-  def self.bindinfo(*args)
-    if self == WidgetClassNames[WidgetClassName] || self.name == ''
-      super(*args)
-    else
-      TkDatabaseClass.new(self.name).bindinfo(*args)
-    end
-  end
-end
-
-#TkFrame = Tk::Frame unless Object.const_defined? :TkFrame
-#Tk.__set_toplevel_aliases__(:Tk, Tk::Frame, :TkFrame)
-Tk.__set_loaded_toplevel_aliases__('tk/frame.rb', :Tk, Tk::Frame, :TkFrame)
diff --git a/ext/tk/lib/tk/grid.rb b/ext/tk/lib/tk/grid.rb
deleted file mode 100644
index 5a4a26403a..0000000000
--- a/ext/tk/lib/tk/grid.rb
+++ /dev/null
@@ -1,280 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/grid.rb : control grid geometry manager
-#
-require 'tk'
-
-module TkGrid
-  include Tk
-  extend Tk
-
-  TkCommandNames = ['grid'.freeze].freeze
-
-  def anchor(master, anchor=None)
-    # master = master.epath if master.kind_of?(TkObject)
-    master = _epath(master)
-    tk_call_without_enc('grid', 'anchor', master, anchor)
-  end
-
-  def bbox(master, *args)
-    # master = master.epath if master.kind_of?(TkObject)
-    master = _epath(master)
-    args.unshift(master)
-    list(tk_call_without_enc('grid', 'bbox', *args))
-  end
-
-=begin
-  def configure(win, *args)
-    if args[-1].kind_of?(Hash)
-      opts = args.pop
-    else
-      opts = {}
-    end
-    params = []
-    params.push(_epath(win))
-    args.each{|win|
-      case win
-      when '-', 'x', '^'  # RELATIVE PLACEMENT
-        params.push(win)
-      else
-        params.push(_epath(win))
-      end
-    }
-    opts.each{|k, v|
-      params.push("-#{k}")
-      params.push((v.kind_of?(TkObject))? v.epath: v)
-    }
-    if Tk::TCL_MAJOR_VERSION < 8 ||
-        (Tk::TCL_MAJOR_VERSION == 8 && Tk::TCL_MINOR_VERSION <= 3)
-      if params[0] == '-' || params[0] == 'x' || params[0] == '^'
-        tk_call_without_enc('grid', *params)
-      else
-        tk_call_without_enc('grid', 'configure', *params)
-      end
-    else
-      tk_call_without_enc('grid', 'configure', *params)
-    end
-  end
-=end
-  def configure(*args)
-    if args[-1].kind_of?(Hash)
-      opts = args.pop
-    else
-      opts = {}
-    end
-    fail ArgumentError, 'no widget is given' if args.empty?
-    params = []
-    args.flatten(1).each{|win|
-      case win
-      when '-', ?-              # RELATIVE PLACEMENT (increase columnspan)
-        params.push('-')
-      when /^-+$/             # RELATIVE PLACEMENT (increase columnspan)
-        params.concat(win.to_s.split(//))
-      when '^', ?^              # RELATIVE PLACEMENT (increase rowspan)
-        params.push('^')
-      when /^\^+$/             # RELATIVE PLACEMENT (increase rowspan)
-        params.concat(win.to_s.split(//))
-      when 'x', :x, ?x, nil, '' # RELATIVE PLACEMENT (empty column)
-        params.push('x')
-      when /^x+$/             # RELATIVE PLACEMENT (empty column)
-        params.concat(win.to_s.split(//))
-      else
-        params.push(_epath(win))
-      end
-    }
-    opts.each{|k, v|
-      params.push("-#{k}")
-      params.push(_epath(v))  # have to use 'epath' (hash_kv() is unavailable)
-    }
-    if Tk::TCL_MAJOR_VERSION < 8 ||
-        (Tk::TCL_MAJOR_VERSION == 8 && Tk::TCL_MINOR_VERSION <= 3)
-      if params[0] == '-' || params[0] == 'x' || params[0] == '^'
-        tk_call_without_enc('grid', *params)
-      else
-        tk_call_without_enc('grid', 'configure', *params)
-      end
-    else
-      tk_call_without_enc('grid', 'configure', *params)
-    end
-  end
-  alias grid configure
-
-  def columnconfigure(master, index, args)
-    # master = master.epath if master.kind_of?(TkObject)
-    master = _epath(master)
-    tk_call_without_enc("grid", 'columnconfigure',
-                        master, index, *hash_kv(args))
-  end
-
-  def rowconfigure(master, index, args)
-    # master = master.epath if master.kind_of?(TkObject)
-    master = _epath(master)
-    tk_call_without_enc("grid", 'rowconfigure', master, index, *hash_kv(args))
-  end
-
-  def columnconfiginfo(master, index, slot=nil)
-    # master = master.epath if master.kind_of?(TkObject)
-    master = _epath(master)
-    if slot
-      case slot
-      when 'uniform', :uniform
-        tk_call_without_enc('grid', 'columnconfigure',
-                            master, index, "-#{slot}")
-      else
-        num_or_str(tk_call_without_enc('grid', 'columnconfigure',
-                                       master, index, "-#{slot}"))
-      end
-    else
-      #ilist = list(tk_call_without_enc('grid','columnconfigure',master,index))
-      ilist = simplelist(tk_call_without_enc('grid', 'columnconfigure',
-                                             master, index))
-      info = {}
-      while key = ilist.shift
-        case key
-        when 'uniform'
-          info[key[1..-1]] = ilist.shift
-        else
-          info[key[1..-1]] = tk_tcl2ruby(ilist.shift)
-        end
-      end
-      info
-    end
-  end
-
-  def rowconfiginfo(master, index, slot=nil)
-    # master = master.epath if master.kind_of?(TkObject)
-    master = _epath(master)
-    if slot
-      case slot
-      when 'uniform', :uniform
-        tk_call_without_enc('grid', 'rowconfigure',
-                            master, index, "-#{slot}")
-      else
-        num_or_str(tk_call_without_enc('grid', 'rowconfigure',
-                                       master, index, "-#{slot}"))
-      end
-    else
-      #ilist = list(tk_call_without_enc('grid', 'rowconfigure', master, index))
-      ilist = simplelist(tk_call_without_enc('grid', 'rowconfigure',
-                                             master, index))
-      info = {}
-      while key = ilist.shift
-        case key
-        when 'uniform'
-          info[key[1..-1]] = ilist.shift
-        else
-          info[key[1..-1]] = tk_tcl2ruby(ilist.shift)
-        end
-      end
-      info
-    end
-  end
-
-  def column(master, index, keys=nil)
-    if keys.kind_of?(Hash)
-      columnconfigure(master, index, keys)
-    else
-      columnconfiginfo(master, index, keys)
-    end
-  end
-
-  def row(master, index, keys=nil)
-    if keys.kind_of?(Hash)
-      rowconfigure(master, index, keys)
-    else
-      rowconfiginfo(master, index, keys)
-    end
-  end
-
-  def add(widget, *args)
-    configure(widget, *args)
-  end
-
-  def forget(*args)
-    return '' if args.size == 0
-    wins = args.collect{|win|
-      # (win.kind_of?(TkObject))? win.epath: win
-      _epath(win)
-    }
-    tk_call_without_enc('grid', 'forget', *wins)
-  end
-
-  def info(slave)
-    # slave = slave.epath if slave.kind_of?(TkObject)
-    slave = _epath(slave)
-    #ilist = list(tk_call_without_enc('grid', 'info', slave))
-    ilist = simplelist(tk_call_without_enc('grid', 'info', slave))
-    info = {}
-    while key = ilist.shift
-      #info[key[1..-1]] = ilist.shift
-      info[key[1..-1]] = tk_tcl2ruby(ilist.shift)
-    end
-    return info
-  end
-
-  def location(master, x, y)
-    # master = master.epath if master.kind_of?(TkObject)
-    master = _epath(master)
-    list(tk_call_without_enc('grid', 'location', master, x, y))
-  end
-
-  def propagate(master, mode=None)
-    # master = master.epath if master.kind_of?(TkObject)
-    master = _epath(master)
-    if mode == None
-      bool(tk_call_without_enc('grid', 'propagate', master))
-    else
-      tk_call_without_enc('grid', 'propagate', master, mode)
-    end
-  end
-
-  def remove(*args)
-    return '' if args.size == 0
-    wins = args.collect{|win|
-      # (win.kind_of?(TkObject))? win.epath: win
-      _epath(win)
-    }
-    tk_call_without_enc('grid', 'remove', *wins)
-  end
-
-  def size(master)
-    # master = master.epath if master.kind_of?(TkObject)
-    master = _epath(master)
-    list(tk_call_without_enc('grid', 'size', master))
-  end
-
-  def slaves(master, keys=nil)
-    # master = master.epath if master.kind_of?(TkObject)
-    master = _epath(master)
-    list(tk_call_without_enc('grid', 'slaves', master, *hash_kv(args)))
-  end
-
-  module_function :anchor, :bbox, :add, :forget, :propagate, :info
-  module_function :remove, :size, :slaves, :location
-  module_function :grid, :configure, :columnconfigure, :rowconfigure
-  module_function :column, :row, :columnconfiginfo, :rowconfiginfo
-end
-=begin
-def TkGrid(win, *args)
-  if args[-1].kind_of?(Hash)
-    opts = args.pop
-  else
-    opts = {}
-  end
-  params = []
-  params.push((win.kind_of?(TkObject))? win.epath: win)
-  args.each{|win|
-    case win
-    when '-', 'x', '^'  # RELATIVE PLACEMENT
-      params.push(win)
-    else
-      params.push((win.kind_of?(TkObject))? win.epath: win)
-    end
-  }
-  opts.each{|k, v|
-    params.push("-#{k}")
-    params.push((v.kind_of?(TkObject))? v.epath: v)
-  }
-  tk_call_without_enc("grid", *params)
-end
-=end
diff --git a/ext/tk/lib/tk/image.rb b/ext/tk/lib/tk/image.rb
deleted file mode 100644
index ec23e495d0..0000000000
--- a/ext/tk/lib/tk/image.rb
+++ /dev/null
@@ -1,396 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/image.rb : treat Tk image objects
-#
-
-require 'tk'
-
-class TkImage<TkObject
-  include Tk
-
-  TkCommandNames = ['image'.freeze].freeze
-
-  Tk_IMGTBL = TkCore::INTERP.create_table
-
-  (Tk_Image_ID = ['i'.freeze, TkUtil.untrust('00000')]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  TkCore::INTERP.init_ip_env{
-    Tk_IMGTBL.mutex.synchronize{ Tk_IMGTBL.clear }
-  }
-
-  def self.new(keys=nil)
-    if keys.kind_of?(Hash)
-      name = nil
-      if keys.key?(:imagename)
-        name = keys[:imagename]
-      elsif keys.key?('imagename')
-        name = keys['imagename']
-      end
-      if name
-        if name.kind_of?(TkImage)
-          obj = name
-        else
-          name = _get_eval_string(name)
-          obj = nil
-          Tk_IMGTBL.mutex.synchronize{
-            obj = Tk_IMGTBL[name]
-          }
-        end
-        if obj
-          if !(keys[:without_creating] || keys['without_creating'])
-            keys = _symbolkey2str(keys)
-            keys.delete('imagename')
-            keys.delete('without_creating')
-            obj.instance_eval{
-              tk_call_without_enc('image', 'create',
-                                  @type, @path, *hash_kv(keys, true))
-            }
-          end
-          return obj
-        end
-      end
-    end
-    (obj = self.allocate).instance_eval{
-      Tk_IMGTBL.mutex.synchronize{
-        initialize(keys)
-        Tk_IMGTBL[@path] = self
-      }
-    }
-    obj
-  end
-
-  def initialize(keys=nil)
-    @path = nil
-    without_creating = false
-    if keys.kind_of?(Hash)
-      keys = _symbolkey2str(keys)
-      @path = keys.delete('imagename')
-      without_creating = keys.delete('without_creating')
-    end
-    unless @path
-      Tk_Image_ID.mutex.synchronize{
-        @path = Tk_Image_ID.join(TkCore::INTERP._ip_id_)
-        Tk_Image_ID[1].succ!
-      }
-    end
-    unless without_creating
-      tk_call_without_enc('image', 'create',
-                          @type, @path, *hash_kv(keys, true))
-    end
-  end
-
-  def delete
-    Tk_IMGTBL.mutex.synchronize{
-      Tk_IMGTBL.delete(@id) if @id
-    }
-    tk_call_without_enc('image', 'delete', @path)
-    self
-  end
-  def height
-    number(tk_call_without_enc('image', 'height', @path))
-  end
-  def inuse
-    bool(tk_call_without_enc('image', 'inuse', @path))
-  end
-  def itemtype
-    tk_call_without_enc('image', 'type', @path)
-  end
-  def width
-    number(tk_call_without_enc('image', 'width', @path))
-  end
-
-  def TkImage.names
-    Tk_IMGTBL.mutex.synchronize{
-      Tk.tk_call_without_enc('image', 'names').split.collect!{|id|
-        (Tk_IMGTBL[id])? Tk_IMGTBL[id] : id
-      }
-    }
-  end
-
-  def TkImage.types
-    Tk.tk_call_without_enc('image', 'types').split
-  end
-end
-
-class TkBitmapImage<TkImage
-  def __strval_optkeys
-    super() + ['maskdata', 'maskfile']
-  end
-  private :__strval_optkeys
-
-  def initialize(*args)
-    @type = 'bitmap'
-    super(*args)
-  end
-end
-
-# A photo is an image whose pixels can display any color or be transparent.
-# At present, only GIF and PPM/PGM formats are supported, but an interface
-# exists to allow additional image file formats to be added easily.
-#
-# This class documentation is a copy from the original Tcl/Tk at
-# http://www.tcl.tk/man/tcl8.5/TkCmd/photo.htm with some rewritten parts.
-class TkPhotoImage<TkImage
-  NullArgOptionKeys = [ "shrink", "grayscale" ]
-
-  def _photo_hash_kv(keys)
-    keys = _symbolkey2str(keys)
-    NullArgOptionKeys.collect{|opt|
-      if keys[opt]
-        keys[opt] = None
-      else
-        keys.delete(opt)
-      end
-    }
-    keys.collect{|k,v|
-      ['-' << k, v]
-    }.flatten
-  end
-  private :_photo_hash_kv
-
-  # Create a new image with the given options.
-  # == Examples of use :
-  # === Create an empty image of 300x200 pixels
-  #
-  #		image = TkPhotoImage.new(:height => 200, :width => 300)
-  #
-  # === Create an image from a file
-  #
-  #		image = TkPhotoImage.new(:file: => 'my_image.gif')
-  #
-  # == Options
-  # Photos support the following options:
-  # * :data
-  #   Specifies the contents of the image as a string.
-  # * :format
-  #   Specifies the name of the file format for the data.
-  # * :file
-  #   Gives the name of a file that is to be read to supply data for the image.
-  # * :gamma
-  #   Specifies that the colors allocated for displaying this image in a window
-  #   should be corrected for a non-linear display with the specified gamma
-  #   exponent value.
-  # * height
-  #   Specifies the height of the image, in pixels. This option is useful
-  #   primarily in situations where the user wishes to build up the contents of
-  #   the image piece by piece. A value of zero (the default) allows the image
-  #   to expand or shrink vertically to fit the data stored in it.
-  # * palette
-  #   Specifies the resolution of the color cube to be allocated for displaying
-  #   this image.
-  # * width
-  #   Specifies the width of the image, in pixels. This option is useful
-  #   primarily in situations where the user wishes to build up the contents of
-  #   the image piece by piece. A value of zero (the default) allows the image
-  #   to expand or shrink horizontally to fit the data stored in it.
-  def initialize(*args)
-    @type = 'photo'
-    super(*args)
-  end
-
-  # Blank the image; that is, set the entire image to have no data, so it will
-  # be displayed as transparent, and the background of whatever window it is
-  # displayed in will show through.
-  def blank
-    tk_send_without_enc('blank')
-    self
-  end
-
-  def cget_strict(option)
-    case option.to_s
-    when 'data', 'file'
-      tk_send 'cget', '-' << option.to_s
-    else
-      tk_tcl2ruby(tk_send('cget', '-' << option.to_s))
-    end
-  end
-
-  # Returns the current value of the configuration option given by option.
-  # Example, display name of the file from which <tt>image</tt> was created:
-  # 	puts image.cget :file
-  def cget(option)
-    unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-      cget_strict(option)
-    else
-      begin
-        cget_strict(option)
-      rescue => e
-        if current_configinfo.has_key?(option.to_s)
-          # error on known option
-          fail e
-        else
-          # unknown option
-          nil
-        end
-      end
-    end
-  end
-
-  # Copies a region from the image called source to the image called
-  # destination, possibly with pixel zooming and/or subsampling. If no options
-  # are specified, this method copies the whole of source into destination,
-  # starting at coordinates (0,0) in destination. The following options may be
-  # specified:
-  #
-  # * :from [x1, y1, x2, y2]
-  #   Specifies a rectangular sub-region of the source image to be copied.
-  #   (x1,y1) and (x2,y2) specify diagonally opposite corners of the rectangle.
-  #   If x2 and y2 are not specified, the default value is the bottom-right
-  #   corner of the source image. The pixels copied will include the left and
-  #   top edges of the specified rectangle but not the bottom or right edges.
-  #   If the :from option is not given, the default is the whole source image.
-  # * :to [x1, y1, x2, y2]
-  #   Specifies a rectangular sub-region of the destination image to be
-  #   affected. (x1,y1) and (x2,y2) specify diagonally opposite corners of the
-  #   rectangle. If x2 and y2 are not specified, the default value is (x1,y1)
-  #   plus the size of the source region (after subsampling and zooming, if
-  #   specified). If x2 and  y2 are specified, the source region will be
-  #   replicated if necessary to fill the destination region in a tiled fashion.
-  # * :shrink
-  #   Specifies that the size of the destination image should be reduced, if
-  #   necessary, so that the region being copied into is at the bottom-right
-  #   corner of the image. This option will not affect the width or height of
-  #   the image if the user has specified a non-zero value for the :width or
-  #   :height configuration option, respectively.
-  # * :zoom [x, y]
-  #   Specifies that the source region should be magnified by a factor of x
-  #   in the X direction and y in the Y direction. If y is not given, the
-  #   default value is the same as x. With this option, each pixel in the
-  #   source image will be expanded into a block of x x y pixels in the
-  #   destination image, all the same color. x and y must be greater than 0.
-  # * :subsample [x, y]
-  #   Specifies that the source image should be reduced in size by using only
-  #   every xth pixel in the X direction and yth pixel in the Y direction.
-  #   Negative values will cause the image to be flipped about the Y or X axes,
-  #   respectively. If y is not given, the default value is the same as x.
-  # * :compositingrule rule
-  #   Specifies how transparent pixels in the source image are combined with
-  #   the destination image. When a compositing rule of <tt>overlay</tt> is set,
-  #   the old  contents of the destination image are visible, as if the source
-  #   image were  printed on a piece of transparent film and placed over the
-  #   top of the  destination. When a compositing rule of <tt>set</tt> is set,
-  #   the old contents of  the destination image are discarded and the source
-  #   image is used as-is. The default compositing rule is <tt>overlay</tt>.
-  def copy(src, *opts)
-    if opts.size == 0
-      tk_send('copy', src)
-    elsif opts.size == 1 && opts[0].kind_of?(Hash)
-      tk_send('copy', src, *_photo_hash_kv(opts[0]))
-    else
-      # for backward compatibility
-      args = opts.collect{|term|
-        if term.kind_of?(String) && term.include?(?\s)
-          term.split
-        else
-          term
-        end
-      }.flatten
-      tk_send('copy', src, *args)
-    end
-    self
-  end
-
-  # Returns image data in the form of a string. The following options may be
-  # specified:
-  # * :background color
-  #   If the color is specified, the data will not contain any transparency
-  #   information. In all transparent pixels the color will be replaced by the
-  #   specified color.
-  # * :format format-name
-  #   Specifies the name of the image file format handler to be used.
-  #   Specifically, this subcommand searches for the first handler whose name
-  #   matches an initial substring of format-name and which has the capability
-  #   to read this image data. If this option is not given, this subcommand
-  #   uses the first handler that has the capability to read the image data.
-  # * :from [x1, y1, x2, y2]
-  #   Specifies a rectangular region of imageName to be returned. If only x1
-  #   and y1 are specified, the region extends from (x1,y1) to the bottom-right
-  #   corner of imageName. If all four coordinates are given, they specify
-  #   diagonally opposite corners of the rectangular region, including x1,y1
-  #   and excluding x2,y2. The default, if this option is not given, is the
-  #   whole image.
-  # * :grayscale
-  #   If this options is specified, the data will not contain color information.
-  #   All pixel data will be transformed into grayscale.
-  def data(keys={})
-    tk_split_list(tk_send('data', *_photo_hash_kv(keys)))
-  end
-
-  # Returns the color of the pixel at coordinates (x,y) in the image as a list
-  # of three integers between 0 and 255, representing the red, green and blue
-  # components respectively.
-  def get(x, y)
-    tk_send('get', x, y).split.collect{|n| n.to_i}
-  end
-
-  def put(data, *opts)
-    if opts.empty?
-      tk_send('put', data)
-    elsif opts.size == 1 && opts[0].kind_of?(Hash)
-      tk_send('put', data, *_photo_hash_kv(opts[0]))
-    else
-      # for backward compatibility
-      tk_send('put', data, '-to', *opts)
-    end
-    self
-  end
-
-  def read(file, *opts)
-    if opts.size == 0
-      tk_send('read', file)
-    elsif opts.size == 1 && opts[0].kind_of?(Hash)
-      tk_send('read', file, *_photo_hash_kv(opts[0]))
-    else
-      # for backward compatibility
-      args = opts.collect{|term|
-        if term.kind_of?(String) && term.include?(?\s)
-          term.split
-        else
-          term
-        end
-      }.flatten
-      tk_send('read', file, *args)
-    end
-    self
-  end
-
-  def redither
-    tk_send 'redither'
-    self
-  end
-
-  # Returns a boolean indicating if the pixel at (x,y) is transparent.
-  def get_transparency(x, y)
-    bool(tk_send('transparency', 'get', x, y))
-  end
-
-  # Makes the pixel at (x,y) transparent if <tt>state</tt> is true, and makes
-  # that pixel opaque otherwise.
-  def set_transparency(x, y, state)
-    tk_send('transparency', 'set', x, y, state)
-    self
-  end
-
-  def write(file, *opts)
-    if opts.size == 0
-      tk_send('write', file)
-    elsif opts.size == 1 && opts[0].kind_of?(Hash)
-      tk_send('write', file, *_photo_hash_kv(opts[0]))
-    else
-      # for backward compatibility
-      args = opts.collect{|term|
-        if term.kind_of?(String) && term.include?(?\s)
-          term.split
-        else
-          term
-        end
-      }.flatten
-      tk_send('write', file, *args)
-    end
-    self
-  end
-end
diff --git a/ext/tk/lib/tk/itemconfig.rb b/ext/tk/lib/tk/itemconfig.rb
deleted file mode 100644
index e615fa0950..0000000000
--- a/ext/tk/lib/tk/itemconfig.rb
+++ /dev/null
@@ -1,1222 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/itemconfig.rb : control item/tag configuration of widget
-#
-require 'tk'
-require 'tkutil'
-require 'tk/itemfont.rb'
-
-module TkItemConfigOptkeys
-  include TkUtil
-
-  def __item_optkey_aliases(id)
-    {}
-  end
-  private :__item_optkey_aliases
-
-  def __item_numval_optkeys(id)
-    []
-  end
-  private :__item_numval_optkeys
-
-  def __item_numstrval_optkeys(id)
-    []
-  end
-  private :__item_numstrval_optkeys
-
-  def __item_boolval_optkeys(id)
-    ['exportselection', 'jump', 'setgrid', 'takefocus']
-  end
-  private :__item_boolval_optkeys
-
-  def __item_strval_optkeys(id)
-    # maybe need to override
-    [
-      'text', 'label', 'show', 'data', 'file', 'maskdata', 'maskfile',
-      'activebackground', 'activeforeground', 'background',
-      'disabledforeground', 'disabledbackground', 'foreground',
-      'highlightbackground', 'highlightcolor', 'insertbackground',
-      'selectbackground', 'selectforeground', 'troughcolor'
-    ]
-  end
-  private :__item_strval_optkeys
-
-  def __item_listval_optkeys(id)
-    []
-  end
-  private :__item_listval_optkeys
-
-  def __item_numlistval_optkeys(id)
-    # maybe need to override
-    ['dash', 'activedash', 'disableddash']
-  end
-  private :__item_numlistval_optkeys
-
-  def __item_tkvariable_optkeys(id)
-    ['variable', 'textvariable']
-  end
-  private :__item_tkvariable_optkeys
-
-  def __item_val2ruby_optkeys(id)  # { key=>method, ... }
-    # The method is used to convert a opt-value to a ruby's object.
-    # When get the value of the option "key", "method.call(id, val)" is called.
-    {}
-  end
-  private :__item_val2ruby_optkeys
-
-  def __item_ruby2val_optkeys(id)  # { key=>method, ... }
-    # The method is used to convert a ruby's object to a opt-value.
-    # When set the value of the option "key", "method.call(id, val)" is called.
-    # That is, "-#{key} #{method.call(id, value)}".
-    {}
-  end
-  private :__item_ruby2val_optkeys
-
-  def __item_methodcall_optkeys(id)  # { key=>method, ... }
-    # Use the method for both of get and set.
-    # Usually, the 'key' will not be a widget option.
-    #
-    # maybe need to override
-    # {'coords'=>'coords'}
-    {}
-  end
-  private :__item_methodcall_optkeys
-
-  ################################################
-
-  def __item_keyonly_optkeys(id)  # { def_key=>(undef_key|nil), ... }
-    # maybe need to override
-    {}
-  end
-  private :__item_keyonly_optkeys
-
-
-  def __conv_item_keyonly_opts(id, keys)
-    return keys unless keys.kind_of?(Hash)
-    keyonly = __item_keyonly_optkeys(id)
-    keys2 = {}
-    keys.each{|k, v|
-      optkey = keyonly.find{|kk,vv| kk.to_s == k.to_s}
-      if optkey
-        defkey, undefkey = optkey
-        if v
-          keys2[defkey.to_s] = None
-        else
-          keys2[undefkey.to_s] = None
-        end
-      else
-        keys2[k.to_s] = v
-      end
-    }
-    keys2
-  end
-
-  def itemconfig_hash_kv(id, keys, enc_mode = nil, conf = nil)
-    hash_kv(__conv_item_keyonly_opts(id, keys), enc_mode, conf)
-  end
-end
-
-module TkItemConfigMethod
-  include TkUtil
-  include TkTreatItemFont
-  include TkItemConfigOptkeys
-
-  def TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-    @mode || false
-  end
-  def TkItemConfigMethod.__set_IGNORE_UNKNOWN_CONFIGURE_OPTION__!(mode)
-    @mode = (mode)? true: false
-  end
-
-  def __item_cget_cmd(id)
-    # maybe need to override
-    [self.path, 'itemcget', id]
-  end
-  private :__item_cget_cmd
-
-  def __item_config_cmd(id)
-    # maybe need to override
-    [self.path, 'itemconfigure', id]
-  end
-  private :__item_config_cmd
-
-  def __item_confinfo_cmd(id)
-    # maybe need to override
-    __item_config_cmd(id)
-  end
-  private :__item_confinfo_cmd
-
-  def __item_configinfo_struct(id)
-    # maybe need to override
-    {:key=>0, :alias=>1, :db_name=>1, :db_class=>2,
-      :default_value=>3, :current_value=>4}
-  end
-  private :__item_configinfo_struct
-
-  ################################################
-
-  def tagid(tagOrId)
-    # maybe need to override
-    tagOrId
-  end
-
-  ################################################
-
-
-  def itemcget_tkstring(tagOrId, option)
-    opt = option.to_s
-    fail ArgumentError, "Invalid option `#{option.inspect}'" if opt.length == 0
-    tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{opt}"))
-  end
-
-  def __itemcget_core(tagOrId, option)
-    orig_opt = option
-    option = option.to_s
-
-    if option.length == 0
-      fail ArgumentError, "Invalid option `#{orig_opt.inspect}'"
-    end
-
-    alias_name, real_name = __item_optkey_aliases(tagid(tagOrId)).find{|k, v| k.to_s == option}
-    if real_name
-      option = real_name.to_s
-    end
-
-    if ( method = _symbolkey2str(__item_val2ruby_optkeys(tagid(tagOrId)))[option] )
-      optval = tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{option}"))
-      begin
-        return method.call(tagOrId, optval)
-      rescue => e
-        warn("Warning:: #{e.message} (when #{method}.call(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
-        return optval
-      end
-    end
-
-    if ( method = _symbolkey2str(__item_methodcall_optkeys(tagid(tagOrId)))[option] )
-      return self.__send__(method, tagOrId)
-    end
-
-    case option
-    when /^(#{__item_numval_optkeys(tagid(tagOrId)).join('|')})$/
-      begin
-        number(tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{option}")))
-      rescue
-        nil
-      end
-
-    when /^(#{__item_numstrval_optkeys(tagid(tagOrId)).join('|')})$/
-      num_or_str(tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{option}")))
-
-    when /^(#{__item_boolval_optkeys(tagid(tagOrId)).join('|')})$/
-      begin
-        bool(tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{option}")))
-      rescue
-        nil
-      end
-
-    when /^(#{__item_listval_optkeys(tagid(tagOrId)).join('|')})$/
-      simplelist(tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{option}")))
-
-    when /^(#{__item_numlistval_optkeys(tagid(tagOrId)).join('|')})$/
-      conf = tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{option}"))
-      if conf =~ /^[0-9]/
-        list(conf)
-      else
-        conf
-      end
-
-    when /^(#{__item_tkvariable_optkeys(tagid(tagOrId)).join('|')})$/
-      v = tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{option}"))
-      (v.empty?)? nil: TkVarAccess.new(v)
-
-    when /^(#{__item_strval_optkeys(tagid(tagOrId)).join('|')})$/
-      _fromUTF8(tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{option}")))
-
-    when /^(|latin|ascii|kanji)(#{__item_font_optkeys(tagid(tagOrId)).join('|')})$/
-      fontcode = $1
-      fontkey  = $2
-      fnt = tk_tcl2ruby(tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{fontkey}")), true)
-      unless fnt.kind_of?(TkFont)
-        fnt = tagfontobj(tagid(tagOrId), fontkey)
-      end
-      if fontcode == 'kanji' && JAPANIZED_TK && TK_VERSION =~ /^4\.*/
-        # obsolete; just for compatibility
-        fnt.kanji_font
-      else
-        fnt
-      end
-    else
-      tk_tcl2ruby(tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{option}")), true)
-    end
-  end
-  private :__itemcget_core
-
-  def itemcget(tagOrId, option)
-    unless TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-      __itemcget_core(tagOrId, option)
-    else
-      begin
-        __itemcget_core(tagOrId, option)
-      rescue => e
-        begin
-          if __current_itemconfiginfo(tagOrId).has_key?(option.to_s)
-            # not tag error & option is known -> error on known option
-            fail e
-          else
-            # not tag error & option is unknown
-            nil
-          end
-        rescue
-          fail e  # tag error
-        end
-      end
-    end
-  end
-  def itemcget_strict(tagOrId, option)
-    # never use TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-    __itemcget_core(tagOrId, option)
-  end
-
-  def __itemconfigure_core(tagOrId, slot, value=None)
-    if slot.kind_of? Hash
-      slot = _symbolkey2str(slot)
-
-      __item_optkey_aliases(tagid(tagOrId)).each{|alias_name, real_name|
-        alias_name = alias_name.to_s
-        if slot.has_key?(alias_name)
-          slot[real_name.to_s] = slot.delete(alias_name)
-        end
-      }
-
-      __item_methodcall_optkeys(tagid(tagOrId)).each{|key, method|
-        value = slot.delete(key.to_s)
-        self.__send__(method, tagOrId, value) if value
-      }
-
-      __item_ruby2val_optkeys(tagid(tagOrId)).each{|key, method|
-        key = key.to_s
-        slot[key] = method.call(tagOrId, slot[key]) if slot.has_key?(key)
-      }
-
-      __item_keyonly_optkeys(tagid(tagOrId)).each{|defkey, undefkey|
-        conf = slot.find{|kk, vv| kk == defkey.to_s}
-        if conf
-          k, v = conf
-          if v
-            slot[k] = None
-          else
-            slot[undefkey.to_s] = None if undefkey
-            slot.delete(k)
-          end
-        end
-      }
-
-      if (slot.find{|k, v| k =~ /^(|latin|ascii|kanji)(#{__item_font_optkeys(tagid(tagOrId)).join('|')})$/})
-        tagfont_configure(tagid(tagOrId), slot)
-      elsif slot.size > 0
-        tk_call(*(__item_config_cmd(tagid(tagOrId)).concat(hash_kv(slot))))
-      end
-
-    else
-      orig_slot = slot
-      slot = slot.to_s
-      if slot.length == 0
-        fail ArgumentError, "Invalid option `#{orig_slot.inspect}'"
-      end
-
-      alias_name, real_name = __item_optkey_aliases(tagid(tagOrId)).find{|k, v| k.to_s == slot}
-      if real_name
-        slot = real_name.to_s
-      end
-
-      if ( conf = __item_keyonly_optkeys(tagid(tagOrId)).find{|k, v| k.to_s == slot } )
-        defkey, undefkey = conf
-        if value
-          tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{defkey}"))
-        elsif undefkey
-          tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{undefkey}"))
-        end
-      elsif ( method = _symbolkey2str(__item_ruby2val_optkeys(tagid(tagOrId)))[slot] )
-        tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{slot}" << method.call(tagOrId, value)))
-      elsif ( method = _symbolkey2str(__item_methodcall_optkeys(tagid(tagOrId)))[slot] )
-        self.__send__(method, tagOrId, value)
-      elsif (slot =~ /^(|latin|ascii|kanji)(#{__item_font_optkeys(tagid(tagOrId)).join('|')})$/)
-        if value == None
-          tagfontobj(tagid(tagOrId), $2)
-        else
-          tagfont_configure(tagid(tagOrId), {slot=>value})
-        end
-      else
-        tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{slot}" << value))
-      end
-    end
-    self
-  end
-  private :__itemconfigure_core
-
-  def __check_available_itemconfigure_options(tagOrId, keys)
-    id = tagid(tagOrId)
-
-    availables = self.__current_itemconfiginfo(id).keys
-
-    # add non-standard keys
-    availables |= __font_optkeys.map{|k|
-      [k.to_s, "latin#{k}", "ascii#{k}", "kanji#{k}"]
-    }.flatten
-    availables |= __item_methodcall_optkeys(id).keys.map{|k| k.to_s}
-    availables |= __item_keyonly_optkeys(id).keys.map{|k| k.to_s}
-
-    keys = _symbolkey2str(keys)
-
-    keys.delete_if{|k, v| !(availables.include?(k))}
-  end
-
-  def itemconfigure(tagOrId, slot, value=None)
-    unless TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-      __itemconfigure_core(tagOrId, slot, value)
-    else
-      if slot.kind_of?(Hash)
-        begin
-          __itemconfigure_core(tagOrId, slot)
-        rescue
-          slot = __check_available_itemconfigure_options(tagOrId, slot)
-          __itemconfigure_core(tagOrId, slot) unless slot.empty?
-        end
-      else
-        begin
-          __itemconfigure_core(tagOrId, slot, value)
-        rescue => e
-          begin
-            if __current_itemconfiginfo(tagOrId).has_key?(slot.to_s)
-              # not tag error & option is known -> error on known option
-              fail e
-            else
-              # not tag error & option is unknown
-              nil
-            end
-          rescue
-            fail e  # tag error
-          end
-        end
-      end
-    end
-    self
-  end
-
-  def __itemconfiginfo_core(tagOrId, slot = nil)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if (slot && slot.to_s =~ /^(|latin|ascii|kanji)(#{__item_font_optkeys(tagid(tagOrId)).join('|')})$/)
-        fontkey  = $2
-        # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{fontkey}"))))
-        conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{fontkey}")), false, true)
-        conf[__item_configinfo_struct(tagid(tagOrId))[:key]] =
-          conf[__item_configinfo_struct(tagid(tagOrId))[:key]][1..-1]
-        if ( ! __item_configinfo_struct(tagid(tagOrId))[:alias] \
-            || conf.size > __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 )
-          fnt = conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
-          if TkFont.is_system_font?(fnt)
-            conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = TkNamedFont.new(fnt)
-          end
-          conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = tagfontobj(tagid(tagOrId), fontkey)
-        elsif ( __item_configinfo_struct(tagid(tagOrId))[:alias] \
-               && conf.size == __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 \
-               && conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][0] == ?- )
-          conf[__item_configinfo_struct(tagid(tagOrId))[:alias]] =
-            conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][1..-1]
-        end
-        conf
-      else
-        if slot
-          slot = slot.to_s
-
-          alias_name, real_name = __item_optkey_aliases(tagid(tagOrId)).find{|k, v| k.to_s == slot}
-          if real_name
-            slot = real_name.to_s
-          end
-
-          case slot
-          when /^(#{__item_val2ruby_optkeys(tagid(tagOrId)).keys.join('|')})$/
-            method = _symbolkey2str(__item_val2ruby_optkeys(tagid(tagOrId)))[slot]
-            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
-            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-              optval = conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
-              begin
-                val = method.call(tagOrId, optval)
-              rescue => e
-                warn("Warning:: #{e.message} (when #{method}.call(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
-                val = optval
-              end
-              conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = val
-            end
-            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-              optval = conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
-              begin
-                val = method.call(tagOrId, optval)
-              rescue => e
-                warn("Warning:: #{e.message} (when #{method}lcall(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
-                val = optval
-              end
-              conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = val
-            end
-
-          when /^(#{__item_methodcall_optkeys(tagid(tagOrId)).keys.join('|')})$/
-            method = _symbolkey2str(__item_methodcall_optkeys(tagid(tagOrId)))[slot]
-            return [slot, '', '', '', self.__send__(method, tagOrId)]
-
-          when /^(#{__item_numval_optkeys(tagid(tagOrId)).join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
-
-            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-              begin
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
-                  number(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-              rescue
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
-              end
-            end
-            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-              begin
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
-                  number(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-              rescue
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
-              end
-            end
-
-          when /^(#{__item_numstrval_optkeys(tagid(tagOrId)).join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
-
-            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-              conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
-                num_or_str(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-            end
-            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-              conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
-                num_or_str(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-            end
-
-          when /^(#{__item_boolval_optkeys(tagid(tagOrId)).join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
-
-            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-              begin
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
-                  bool(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-              rescue
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
-              end
-            end
-            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-              begin
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
-                  bool(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-              rescue
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
-              end
-            end
-
-          when /^(#{__item_listval_optkeys(tagid(tagOrId)).join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
-
-            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-              conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
-                simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-            end
-            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-              conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
-                simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-            end
-
-          when /^(#{__item_numlistval_optkeys(tagid(tagOrId)).join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
-
-            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] \
-                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =~ /^[0-9]/ )
-              conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
-                list(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-            end
-            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] \
-                && conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =~ /^[0-9]/ )
-              conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
-                list(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-            end
-
-          when /^(#{__item_strval_optkeys(tagid(tagOrId)).join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
-
-          when /^(#{__item_tkvariable_optkeys(tagid(tagOrId)).join('|')})$/
-            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
-
-            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-              v = conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
-              if v.empty?
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
-              else
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = TkVarAccess.new(v)
-              end
-            end
-            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-              v = conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
-              if v.empty?
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
-              else
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = TkVarAccess.new(v)
-              end
-            end
-
-          else
-            # conf = tk_split_list(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
-            conf = tk_split_list(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), 0, false, true)
-          end
-          conf[__item_configinfo_struct(tagid(tagOrId))[:key]] =
-            conf[__item_configinfo_struct(tagid(tagOrId))[:key]][1..-1]
-
-          if ( __item_configinfo_struct(tagid(tagOrId))[:alias] \
-              && conf.size == __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 \
-              && conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][0] == ?- )
-            conf[__item_configinfo_struct(tagid(tagOrId))[:alias]] =
-              conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][1..-1]
-          end
-
-          conf
-
-        else
-          # ret = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)))))).collect{|conflist|
-          #   conf = tk_split_simplelist(conflist)
-          ret = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)))), false, false).collect{|conflist|
-            conf = tk_split_simplelist(conflist, false, true)
-            conf[__item_configinfo_struct(tagid(tagOrId))[:key]] =
-              conf[__item_configinfo_struct(tagid(tagOrId))[:key]][1..-1]
-
-            optkey = conf[__item_configinfo_struct(tagid(tagOrId))[:key]]
-            case optkey
-            when /^(#{__item_val2ruby_optkeys(tagid(tagOrId)).keys.join('|')})$/
-              method = _symbolkey2str(__item_val2ruby_optkeys(tagid(tagOrId)))[optkey]
-              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-                optval = conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
-                begin
-                  val = method(tagOrId, optval)
-                rescue => e
-                  warn("Warning:: #{e.message} (when #{method}.call(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
-                  val = optval
-                end
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = val
-              end
-              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-                optval = conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
-                begin
-                  val = method.call(tagOrId, optval)
-                rescue => e
-                  warn("Warning:: #{e.message} (when #{method}.call(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
-                  val = optval
-                end
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = val
-              end
-
-            when /^(#{__item_strval_optkeys(tagid(tagOrId)).join('|')})$/
-              # do nothing
-
-            when /^(#{__item_numval_optkeys(tagid(tagOrId)).join('|')})$/
-              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-                begin
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
-                    number(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-                rescue
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
-                end
-              end
-              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-                begin
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
-                    number(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-                rescue
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
-                end
-              end
-
-            when /^(#{__item_numstrval_optkeys(tagid(tagOrId)).join('|')})$/
-              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
-                  num_or_str(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-              end
-              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
-                  num_or_str(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-              end
-
-            when /^(#{__item_boolval_optkeys(tagid(tagOrId)).join('|')})$/
-              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-                begin
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
-                    bool(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-                rescue
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
-                end
-              end
-              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-                begin
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
-                    bool(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-                rescue
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
-                end
-              end
-
-            when /^(#{__item_listval_optkeys(tagid(tagOrId)).join('|')})$/
-              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
-                  simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-              end
-              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
-                  simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-              end
-
-            when /^(#{__item_numlistval_optkeys(tagid(tagOrId)).join('|')})$/
-              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] \
-                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =~ /^[0-9]/ )
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
-                  list(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-              end
-              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] \
-                  && conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =~ /^[0-9]/ )
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
-                  list(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-              end
-
-            when /^(#{__item_tkvariable_optkeys(tagid(tagOrId)).join('|')})$/
-              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-                v = conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
-                if v.empty?
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
-                else
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = TkVarAccess.new(v)
-                end
-              end
-              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-                v = conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
-                if v.empty?
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
-                else
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = TkVarAccess.new(v)
-                end
-              end
-
-            else
-              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-                if conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]].index('{')
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
-                    tk_split_list(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-                else
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
-                    tk_tcl2ruby(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-                end
-              end
-              if conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
-                if conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]].index('{')
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
-                    tk_split_list(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-                else
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
-                    tk_tcl2ruby(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-                end
-              end
-            end
-
-            if ( __item_configinfo_struct(tagid(tagOrId))[:alias] \
-                && conf.size == __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 \
-                && conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][0] == ?- )
-              conf[__item_configinfo_struct(tagid(tagOrId))[:alias]] =
-                conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][1..-1]
-            end
-
-            conf
-          }
-
-          __item_font_optkeys(tagid(tagOrId)).each{|optkey|
-            optkey = optkey.to_s
-            fontconf = ret.assoc(optkey)
-            if fontconf && fontconf.size > 2
-              ret.delete_if{|inf| inf[0] =~ /^(|latin|ascii|kanji)#{optkey}$/}
-              fnt = fontconf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
-              if TkFont.is_system_font?(fnt)
-                fontconf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = TkNamedFont.new(fnt)
-              end
-              fontconf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = tagfontobj(tagid(tagOrId), optkey)
-              ret.push(fontconf)
-            end
-          }
-
-          __item_methodcall_optkeys(tagid(tagOrId)).each{|optkey, method|
-            ret << [optkey.to_s, '', '', '', self.__send__(method, tagOrId)]
-          }
-
-          ret
-        end
-      end
-
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      if (slot && slot.to_s =~ /^(|latin|ascii|kanji)(#{__item_font_optkeys(tagid(tagOrId)).join('|')})$/)
-        fontkey  = $2
-        # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{fontkey}"))))
-        conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{fontkey}")), false, true)
-        conf[__item_configinfo_struct(tagid(tagOrId))[:key]] =
-          conf[__item_configinfo_struct(tagid(tagOrId))[:key]][1..-1]
-
-        if ( ! __item_configinfo_struct(tagid(tagOrId))[:alias] \
-            || conf.size > __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 )
-          fnt = conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
-          if TkFont.is_system_font?(fnt)
-            conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = TkNamedFont.new(fnt)
-          end
-          conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = tagfontobj(tagid(tagOrId), fontkey)
-          { conf.shift => conf }
-        elsif ( __item_configinfo_struct(tagid(tagOrId))[:alias] \
-               && conf.size == __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 )
-          if conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][0] == ?-
-            conf[__item_configinfo_struct(tagid(tagOrId))[:alias]] =
-              conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][1..-1]
-          end
-          { conf[0] => conf[1] }
-        else
-          { conf.shift => conf }
-        end
-      else
-        if slot
-          slot = slot.to_s
-
-          alias_name, real_name = __item_optkey_aliases(tagid(tagOrId)).find{|k, v| k.to_s == slot}
-          if real_name
-            slot = real_name.to_s
-          end
-
-          case slot
-          when /^(#{__item_val2ruby_optkeys(tagid(tagOrId)).keys.join('|')})$/
-            method = _symbolkey2str(__item_val2ruby_optkeys(tagid(tagOrId)))[slot]
-            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
-            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-              optval = conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
-              begin
-                val = method.call(tagOrId, optval)
-              rescue => e
-                warn("Warning:: #{e.message} (when #{method}.call(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
-                val = optval
-              end
-              conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = val
-            end
-            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-              optval = conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
-              begin
-                val = method.call(tagOrId, optval)
-              rescue => e
-                warn("Warning:: #{e.message} (when #{method}.call(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
-                val = optval
-              end
-              conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = val
-            end
-
-          when /^(#{__item_methodcall_optkeys(tagid(tagOrId)).keys.join('|')})$/
-            method = _symbolkey2str(__item_methodcall_optkeys(tagid(tagOrId)))[slot]
-            return {slot => ['', '', '', self.__send__(method, tagOrId)]}
-
-          when /^(#{__item_numval_optkeys(tagid(tagOrId)).join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
-
-            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-              begin
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
-                  number(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-              rescue
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
-              end
-            end
-            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-              begin
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
-                  number(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-              rescue
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
-              end
-            end
-
-          when /^(#{__item_numstrval_optkeys(tagid(tagOrId)).join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
-
-            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-              conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
-                num_or_stre(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-            end
-            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-              conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
-                num_or_str(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-            end
-
-          when /^(#{__item_boolval_optkeys(tagid(tagOrId)).join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
-
-            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-              begin
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
-                  bool(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-              rescue
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
-              end
-            end
-            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-              begin
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
-                  bool(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-              rescue
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
-              end
-            end
-
-          when /^(#{__item_listval_optkeys(tagid(tagOrId)).join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
-
-            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-              conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
-                simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-            end
-            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-              conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
-                simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-            end
-
-          when /^(#{__item_numlistval_optkeys(tagid(tagOrId)).join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
-
-            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] \
-                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =~ /^[0-9]/ )
-              conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
-                list(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-            end
-            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] \
-                && conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =~ /^[0-9]/ )
-              conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
-                list(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-            end
-
-          when /^(#{__item_strval_optkeys(tagid(tagOrId)).join('|')})$/
-            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
-            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
-
-          when /^(#{__item_tkvariable_optkeys(tagid(tagOrId)).join('|')})$/
-            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
-
-            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-              v = conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
-              if v.empty?
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
-              else
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = TkVarAccess.new(v)
-              end
-            end
-            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-              v = conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
-              if v.empty?
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
-              else
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = TkVarAccess.new(v)
-              end
-            end
-
-          else
-            # conf = tk_split_list(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
-            conf = tk_split_list(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), 0, false, true)
-          end
-          conf[__item_configinfo_struct(tagid(tagOrId))[:key]] =
-            conf[__item_configinfo_struct(tagid(tagOrId))[:key]][1..-1]
-
-          if ( __item_configinfo_struct(tagid(tagOrId))[:alias] \
-              && conf.size == __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 )
-            if conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][0] == ?-
-              conf[__item_configinfo_struct(tagid(tagOrId))[:alias]] =
-                conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][1..-1]
-            end
-            { conf[0] => conf[1] }
-          else
-            { conf.shift => conf }
-          end
-
-        else
-          ret = {}
-          # tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)))))).each{|conflist|
-          #   conf = tk_split_simplelist(conflist)
-          tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)))), false, false).each{|conflist|
-            conf = tk_split_simplelist(conflist, false, true)
-            conf[__item_configinfo_struct(tagid(tagOrId))[:key]] =
-              conf[__item_configinfo_struct(tagid(tagOrId))[:key]][1..-1]
-
-            optkey = conf[__item_configinfo_struct(tagid(tagOrId))[:key]]
-            case optkey
-            when /^(#{__item_val2ruby_optkeys(tagid(tagOrId)).keys.join('|')})$/
-              method = _symbolkey2str(__item_val2ruby_optkeys(tagid(tagOrId)))[optkey]
-              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-                optval = conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
-                begin
-                  val = method.call(tagOrId, optval)
-                rescue => e
-                  warn("Warning:: #{e.message} (when #{method}.call(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
-                  val = optval
-                end
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = val
-              end
-              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-                optval = conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
-                begin
-                  val = method.call(tagOrId, optval)
-                rescue => e
-                  warn("Warning:: #{e.message} (when #{method}.call(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
-                  val = optval
-                end
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = val
-              end
-
-            when /^(#{__item_strval_optkeys(tagid(tagOrId)).join('|')})$/
-              # do nothing
-
-            when /^(#{__item_numval_optkeys(tagid(tagOrId)).join('|')})$/
-              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-                begin
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
-                    number(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-                rescue
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
-                end
-              end
-              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-                begin
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
-                    number(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-                rescue
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
-                end
-              end
-
-            when /^(#{__item_numstrval_optkeys(tagid(tagOrId)).join('|')})$/
-              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
-                  num_or_str(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-              end
-              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
-                  num_or_str(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-              end
-
-            when /^(#{__item_boolval_optkeys(tagid(tagOrId)).join('|')})$/
-              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-                begin
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
-                    bool(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-                rescue
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
-                end
-              end
-              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-                begin
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
-                    bool(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-                rescue
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
-                end
-              end
-
-            when /^(#{__item_listval_optkeys(tagid(tagOrId)).join('|')})$/
-              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
-                  simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-              end
-              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
-                  simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-              end
-
-            when /^(#{__item_numlistval_optkeys(tagid(tagOrId)).join('|')})$/
-              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] \
-                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =~ /^[0-9]/ )
-                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
-                  list(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-              end
-              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] \
-                  && conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =~ /^[0-9]/ )
-                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
-                  list(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-              end
-
-            when /^(#{__item_tkvariable_optkeys(tagid(tagOrId)).join('|')})$/
-              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-                v = conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
-                if v.empty?
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
-                else
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = TkVarAccess.new(v)
-                end
-              end
-              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
-                v = conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
-                if v.empty?
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
-                else
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = TkVarAccess.new(v)
-                end
-              end
-
-            else
-              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
-                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
-                if conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]].index('{')
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
-                    tk_split_list(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-                else
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =
-                    tk_tcl2ruby(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
-                end
-              end
-              if conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
-                if conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]].index('{')
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
-                    tk_split_list(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-                else
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
-                    tk_tcl2ruby(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
-                end
-              end
-            end
-
-            if ( __item_configinfo_struct(tagid(tagOrId))[:alias] \
-                && conf.size == __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 )
-              if conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][0] == ?-
-                conf[__item_configinfo_struct(tagid(tagOrId))[:alias]] =
-                  conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][1..-1]
-              end
-              ret[conf[0]] = conf[1]
-            else
-              ret[conf.shift] = conf
-            end
-          }
-
-          __item_font_optkeys(tagid(tagOrId)).each{|optkey|
-            optkey = optkey.to_s
-            fontconf = ret[optkey]
-            if fontconf.kind_of?(Array)
-              ret.delete(optkey)
-              ret.delete('latin' << optkey)
-              ret.delete('ascii' << optkey)
-              ret.delete('kanji' << optkey)
-              fnt = fontconf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
-              if TkFont.is_system_font?(fnt)
-                fontconf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = TkNamedFont.new(fnt)
-              end
-              fontconf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = tagfontobj(tagid(tagOrId), optkey)
-              ret[optkey] = fontconf
-            end
-          }
-
-          __item_methodcall_optkeys(tagid(tagOrId)).each{|optkey, method|
-            ret[optkey.to_s] = ['', '', '', self.__send__(method, tagOrId)]
-          }
-
-          ret
-        end
-      end
-    end
-  end
-  private :__itemconfiginfo_core
-
-  def itemconfiginfo(tagOrId, slot = nil)
-    if slot && TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-      begin
-        __itemconfiginfo_core(tagOrId, slot)
-      rescue => e
-        begin
-          __itemconfiginfo_core(tagOrId)
-          # not tag error -> option is unknown
-          Array.new(__item_configinfo_struct.values.max).unshift(slot.to_s)
-        rescue
-          fail e  # tag error
-        end
-      end
-    else
-      __itemconfiginfo_core(tagOrId, slot)
-    end
-  end
-
-  def __current_itemconfiginfo(tagOrId, slot = nil)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if slot
-        org_slot = slot
-        begin
-          conf = __itemconfiginfo_core(tagOrId, slot)
-          if ( ! __item_configinfo_struct(tagid(tagOrId))[:alias] \
-              || conf.size > __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 )
-            return {conf[0] => conf[-1]}
-          end
-          slot = conf[__item_configinfo_struct(tagid(tagOrId))[:alias]]
-        end while(org_slot != slot)
-        fail RuntimeError,
-          "there is a configure alias loop about '#{org_slot}'"
-      else
-        ret = {}
-        __itemconfiginfo_core(tagOrId).each{|conf|
-          if ( ! __item_configinfo_struct(tagid(tagOrId))[:alias] \
-              || conf.size > __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 )
-            ret[conf[0]] = conf[-1]
-          end
-        }
-
-        ret
-      end
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      ret = {}
-      __itemconfiginfo_core(tagOrId, slot).each{|key, conf|
-        ret[key] = conf[-1] if conf.kind_of?(Array)
-      }
-      ret
-    end
-  end
-
-  def current_itemconfiginfo(tagOrId, slot = nil)
-    __current_itemconfiginfo(tagOrId, slot)
-  end
-end
diff --git a/ext/tk/lib/tk/itemfont.rb b/ext/tk/lib/tk/itemfont.rb
deleted file mode 100644
index 92f75ac388..0000000000
--- a/ext/tk/lib/tk/itemfont.rb
+++ /dev/null
@@ -1,328 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/itemfont.rb : control font of widget items
-#
-require 'tk'
-
-module TkItemFontOptkeys
-  def __item_font_optkeys(id)
-    # maybe need to override
-    ['font']
-  end
-  private :__item_font_optkeys
-end
-
-module TkTreatItemFont
-  include TkItemFontOptkeys
-
-  def __item_pathname(id)
-    # maybe need to override
-    [self.path, id].join(';')
-  end
-  private :__item_pathname
-
-  ################################################
-
-  def tagfont_configinfo(tagOrId, key = nil)
-    optkeys = __item_font_optkeys(tagid(tagOrId))
-    if key && !optkeys.find{|opt| opt.to_s == key.to_s}
-      fail ArgumentError, "unknown font option name `#{key}'"
-    end
-
-    win, tag = __item_pathname(tagid(tagOrId)).split(';')
-
-    if key
-      pathname = [win, tag, key].join(';')
-      TkFont.used_on(pathname) ||
-        TkFont.init_widget_font(pathname,
-                                *(__item_confinfo_cmd(tagid(tagOrId))))
-    elsif optkeys.size == 1
-      pathname = [win, tag, optkeys[0]].join(';')
-      TkFont.used_on(pathname) ||
-        TkFont.init_widget_font(pathname,
-                                *(__item_confinfo_cmd(tagid(tagOrId))))
-    else
-      fonts = {}
-      optkeys.each{|key|
-        key = key.to_s
-        pathname = [win, tag, key].join(';')
-        fonts[key] =
-          TkFont.used_on(pathname) ||
-          TkFont.init_widget_font(pathname,
-                                  *(__item_confinfo_cmd(tagid(tagOrId))))
-      }
-      fonts
-    end
-  end
-  alias tagfontobj tagfont_configinfo
-
-  def tagfont_configure(tagOrId, slot)
-    pathname = __item_pathname(tagid(tagOrId))
-
-    slot = _symbolkey2str(slot)
-
-    __item_font_optkeys(tagid(tagOrId)).each{|optkey|
-      optkey = optkey.to_s
-      l_optkey = 'latin' << optkey
-      a_optkey = 'ascii' << optkey
-      k_optkey = 'kanji' << optkey
-
-      if slot.key?(optkey)
-        fnt = slot.delete(optkey)
-        if fnt.kind_of?(TkFont)
-          slot.delete(l_optkey)
-          slot.delete(a_optkey)
-          slot.delete(k_optkey)
-
-          fnt.call_font_configure([pathname, optkey],
-                                  *(__item_config_cmd(tagid(tagOrId)) << {}))
-          next
-        else
-          if fnt
-            if (slot.key?(l_optkey) ||
-                slot.key?(a_optkey) ||
-                slot.key?(k_optkey))
-              fnt = TkFont.new(fnt)
-
-              lfnt = slot.delete(l_optkey)
-              lfnt = slot.delete(a_optkey) if slot.key?(a_optkey)
-              kfnt = slot.delete(k_optkey)
-
-              fnt.latin_replace(lfnt) if lfnt
-              fnt.kanji_replace(kfnt) if kfnt
-
-              fnt.call_font_configure([pathname, optkey],
-                                      *(__item_config_cmd(tagid(tagOrId)) << {}))
-              next
-            else
-              fnt = hash_kv(fnt) if fnt.kind_of?(Hash)
-              unless TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-                tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{optkey}" << fnt))
-              else
-                begin
-                  tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{optkey}" << fnt))
-                rescue => e
-                  # ignore
-                end
-              end
-            end
-          end
-          next
-        end
-      end
-
-      lfnt = slot.delete(l_optkey)
-      lfnt = slot.delete(a_optkey) if slot.key?(a_optkey)
-      kfnt = slot.delete(k_optkey)
-
-      if lfnt && kfnt
-        TkFont.new(lfnt, kfnt).call_font_configure([pathname, optkey],
-                                                   *(__item_config_cmd(tagid(tagOrId)) << {}))
-      elsif lfnt
-        latintagfont_configure([lfnt, optkey])
-      elsif kfnt
-        kanjitagfont_configure([kfnt, optkey])
-      end
-    }
-
-    # configure other (without font) options
-    tk_call(*(__item_config_cmd(tagid(tagOrId)).concat(hash_kv(slot)))) if slot != {}
-    self
-  end
-
-  def latintagfont_configure(tagOrId, ltn, keys=nil)
-    if ltn.kind_of?(Array)
-      key = ltn[1]
-      ltn = ltn[0]
-    else
-      key = nil
-    end
-
-    optkeys = __item_font_optkeys(tagid(tagOrId))
-    if key && !optkeys.find{|opt| opt.to_s == key.to_s}
-      fail ArgumentError, "unknown font option name `#{key}'"
-    end
-
-    win, tag = __item_pathname(tagid(tagOrId)).split(';')
-
-    optkeys = [key] if key
-
-    optkeys.each{|optkey|
-      optkey = optkey.to_s
-
-      pathname = [win, tag, optkey].join(';')
-
-      if (fobj = TkFont.used_on(pathname))
-        fobj = TkFont.new(fobj) # create a new TkFont object
-      elsif Tk::JAPANIZED_TK
-        fobj = fontobj          # create a new TkFont object
-      else
-        ltn = hash_kv(ltn) if ltn.kind_of?(Hash)
-        unless TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-          tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{optkey}" << ltn))
-        else
-          begin
-            tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{optkey}" << ltn))
-          rescue => e
-            # ignore
-          end
-        end
-        next
-      end
-
-      if fobj.kind_of?(TkFont)
-        if ltn.kind_of?(TkFont)
-          conf = {}
-          ltn.latin_configinfo.each{|key,val| conf[key] = val}
-          if keys
-            fobj.latin_configure(conf.update(keys))
-          else
-            fobj.latin_configure(conf)
-          end
-        else
-          fobj.latin_replace(ltn)
-        end
-      end
-
-      fobj.call_font_configure([pathname, optkey], *(__item_config_cmd(tagid(tagOrId)) << {}))
-    }
-    self
-  end
-  alias asciitagfont_configure latintagfont_configure
-
-  def kanjitagfont_configure(tagOrId, knj, keys=nil)
-    if knj.kind_of?(Array)
-      key = knj[1]
-      knj = knj[0]
-    else
-      key = nil
-    end
-
-    optkeys = __item_font_optkeys(tagid(tagOrId))
-    if key && !optkeys.find{|opt| opt.to_s == key.to_s}
-      fail ArgumentError, "unknown font option name `#{key}'"
-    end
-
-    win, tag = __item_pathname(tagid(tagOrId)).split(';')
-
-    optkeys = [key] if key
-
-    optkeys.each{|optkey|
-      optkey = optkey.to_s
-
-      pathname = [win, tag, optkey].join(';')
-
-      if (fobj = TkFont.used_on(pathname))
-        fobj = TkFont.new(fobj) # create a new TkFont object
-      elsif Tk::JAPANIZED_TK
-        fobj = fontobj          # create a new TkFont object
-      else
-        knj = hash_kv(knj) if knj.kind_of?(Hash)
-        unless TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-          tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{optkey}" << knj))
-        else
-          begin
-            tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{optkey}" << knj))
-          rescue => e
-            # ignore
-          end
-        end
-        next
-      end
-
-      if fobj.kind_of?(TkFont)
-        if knj.kind_of?(TkFont)
-          conf = {}
-          knj.kanji_configinfo.each{|key,val| conf[key] = val}
-          if keys
-            fobj.kanji_configure(conf.update(keys))
-          else
-            fobj.kanji_configure(conf)
-          end
-        else
-          fobj.kanji_replace(knj)
-        end
-      end
-
-      fobj.call_font_configure([pathname, optkey], *(__item_config_cmd(tagid(tagOrId)) << {}))
-    }
-    self
-  end
-
-  def tagfont_copy(tagOrId, win, wintag=nil, winkey=nil, targetkey=nil)
-    if wintag
-      if winkey
-        fnt = win.tagfontobj(wintag, winkey).dup
-      else
-        fnt = win.tagfontobj(wintag).dup
-      end
-    else
-      if winkey
-        fnt = win.fontobj(winkey).dup
-      else
-        fnt = win.fontobj.dup
-      end
-    end
-
-    if targetkey
-      fnt.call_font_configure([__item_pathname(tagid(tagOrId)), targetkey],
-                              *(__item_config_cmd(tagid(tagOrId)) << {}))
-    else
-      fnt.call_font_configure(__item_pathname(tagid(tagOrId)),
-                              *(__item_config_cmd(tagid(tagOrId)) << {}))
-    end
-    self
-  end
-
-
-  def latintagfont_copy(tagOrId, win, wintag=nil, winkey=nil, targetkey=nil)
-    if targetkey
-      fontobj(targetkey).dup.call_font_configure([__item_pathname(tagid(tagOrId)), targetkey],
-                                                 *(__item_config_cmd(tagid(tagOrId)) << {}))
-    else
-      fontobj.dup.call_font_configure(__item_pathname(tagid(tagOrId)),
-                                      *(__item_config_cmd(tagid(tagOrId)) << {}))
-    end
-
-    if wintag
-      if winkey
-        fontobj.latin_replace(win.tagfontobj(wintag, winkey).latin_font_id)
-      else
-        fontobj.latin_replace(win.tagfontobj(wintag).latin_font_id)
-      end
-    else
-      if winkey
-        fontobj.latin_replace(win.fontobj(winkey).latin_font_id)
-      else
-        fontobj.latin_replace(win.fontobj.latin_font_id)
-      end
-    end
-    self
-  end
-  alias asciitagfont_copy latintagfont_copy
-
-  def kanjifont_copy(tagOrId, win, wintag=nil, winkey=nil, targetkey=nil)
-    if targetkey
-      fontobj(targetkey).dup.call_font_configure([__item_pathname(tagid(tagOrId)), targetkey],
-                                                 *(__item_config_cmd(tagid(tagOrId)) << {}))
-    else
-        fontobj.dup.call_font_configure(__item_pathname(tagid(tagOrId)),
-                                        *(__item_config_cmd(tagid(tagOrId)) << {}))
-    end
-
-    if wintag
-      if winkey
-        fontobj.kanji_replace(win.tagfontobj(wintag, winkey).kanji_font_id)
-      else
-        fontobj.kanji_replace(win.tagfontobj(wintag).kanji_font_id)
-      end
-    else
-      if winkey
-        fontobj.kanji_replace(win.fontobj(winkey).kanji_font_id)
-      else
-        fontobj.kanji_replace(win.fontobj.kanji_font_id)
-      end
-    end
-    self
-  end
-end
diff --git a/ext/tk/lib/tk/kinput.rb b/ext/tk/lib/tk/kinput.rb
deleted file mode 100644
index 6d2b3d7a7a..0000000000
--- a/ext/tk/lib/tk/kinput.rb
+++ /dev/null
@@ -1,72 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/kinput.rb : control kinput
-#
-require 'tk'
-
-module TkKinput
-  include Tk
-  extend Tk
-
-  TkCommandNames = [
-    'kinput_start'.freeze,
-    'kinput_send_spot'.freeze,
-    'kanjiInput'.freeze
-  ].freeze
-
-  def TkKinput.start(win, style=None)
-    tk_call('kinput_start', win, style)
-  end
-  def kinput_start(style=None)
-    TkKinput.start(self, style)
-  end
-
-  def TkKinput.send_spot(win)
-    tk_call('kinput_send_spot', win)
-  end
-  def kinput_send_spot
-    TkKinput.send_spot(self)
-  end
-
-  def TkKinput.input_start(win, keys=nil)
-    tk_call('kanjiInput', 'start', win, *hash_kv(keys))
-  end
-  def kanji_input_start(keys=nil)
-    TkKinput.input_start(self, keys)
-  end
-
-  def TkKinput.attribute_config(win, slot, value=None)
-    if slot.kind_of? Hash
-      tk_call('kanjiInput', 'attribute', win, *hash_kv(slot))
-    else
-      tk_call('kanjiInput', 'attribute', win, "-#{slot}", value)
-    end
-  end
-  def kinput_attribute_config(slot, value=None)
-    TkKinput.attribute_config(self, slot, value)
-  end
-
-  def TkKinput.attribute_info(win, slot=nil)
-    if slot
-      conf = tk_split_list(tk_call('kanjiInput', 'attribute',
-                                   win, "-#{slot}"))
-      conf[0] = conf[0][1..-1]
-      conf
-    else
-      tk_split_list(tk_call('kanjiInput', 'attribute', win)).collect{|conf|
-        conf[0] = conf[0][1..-1]
-        conf
-      }
-    end
-  end
-  def kinput_attribute_info(slot=nil)
-    TkKinput.attribute_info(self, slot)
-  end
-
-  def TkKinput.input_end(win)
-    tk_call('kanjiInput', 'end', win)
-  end
-  def kanji_input_end
-    TkKinput.input_end(self)
-  end
-end
diff --git a/ext/tk/lib/tk/label.rb b/ext/tk/lib/tk/label.rb
deleted file mode 100644
index 48f67deb31..0000000000
--- a/ext/tk/lib/tk/label.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/label.rb : treat label widget
-#
-require 'tk'
-
-class Tk::Label<TkWindow
-  TkCommandNames = ['label'.freeze].freeze
-  WidgetClassName = 'Label'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-  #def create_self(keys)
-  #  if keys and keys != None
-  #    tk_call_without_enc('label', @path, *hash_kv(keys, true))
-  #  else
-  #    tk_call_without_enc('label', @path)
-  #  end
-  #end
-  #private :create_self
-end
-
-#TkLabel = Tk::Label unless Object.const_defined? :TkLabel
-#Tk.__set_toplevel_aliases__(:Tk, Tk::Label, :TkLabel)
-Tk.__set_loaded_toplevel_aliases__('tk/label.rb', :Tk, Tk::Label, :TkLabel)
diff --git a/ext/tk/lib/tk/labelframe.rb b/ext/tk/lib/tk/labelframe.rb
deleted file mode 100644
index f9497dc2f0..0000000000
--- a/ext/tk/lib/tk/labelframe.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/labelframe.rb : treat labelframe widget
-#
-require 'tk'
-require 'tk/frame'
-
-class Tk::LabelFrame<Tk::Frame
-  TkCommandNames = ['labelframe'.freeze].freeze
-  WidgetClassName = 'Labelframe'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-  #def create_self(keys)
-  #  if keys and keys != None
-  #    tk_call_without_enc('labelframe', @path, *hash_kv(keys, true))
-  #  else
-  #    tk_call_without_enc('labelframe', @path)
-  #  end
-  #end
-  #private :create_self
-
-  def __val2ruby_optkeys  # { key=>proc, ... }
-    super().update('labelwidget'=>proc{|v| window(v)})
-  end
-  private :__val2ruby_optkeys
-end
-
-Tk::Labelframe = Tk::LabelFrame
-#TkLabelFrame = Tk::LabelFrame unless Object.const_defined? :TkLabelFrame
-#TkLabelframe = Tk::Labelframe unless Object.const_defined? :TkLabelframe
-#Tk.__set_toplevel_aliases__(:Tk, Tk::LabelFrame, :TkLabelFrame, :TkLabelframe)
-Tk.__set_loaded_toplevel_aliases__('tk/labelframe.rb', :Tk, Tk::LabelFrame,
-                                   :TkLabelFrame, :TkLabelframe)
diff --git a/ext/tk/lib/tk/listbox.rb b/ext/tk/lib/tk/listbox.rb
deleted file mode 100644
index df4d422007..0000000000
--- a/ext/tk/lib/tk/listbox.rb
+++ /dev/null
@@ -1,285 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/listbox.rb : treat listbox widget
-#
-require 'tk'
-require 'tk/itemconfig'
-require 'tk/scrollable'
-require 'tk/txtwin_abst'
-
-module TkListItemConfig
-  include TkItemConfigMethod
-
-  def __item_listval_optkeys(id)
-    []
-  end
-  private :__item_listval_optkeys
-end
-
-class Tk::Listbox<TkTextWin
-  include TkListItemConfig
-  include Scrollable
-
-  TkCommandNames = ['listbox'.freeze].freeze
-  WidgetClassName = 'Listbox'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  #def create_self(keys)
-  #  if keys and keys != None
-  #    tk_call_without_enc('listbox', @path, *hash_kv(keys, true))
-  #  else
-  #    tk_call_without_enc('listbox', @path)
-  #  end
-  #end
-  #private :create_self
-
-  def __tkvariable_optkeys
-    super() << 'listvariable'
-  end
-  private :__tkvariable_optkeys
-
-  def tagid(id)
-    #id.to_s
-    _get_eval_string(id)
-  end
-
-  def activate(y)
-    tk_send_without_enc('activate', y)
-    self
-  end
-  def curselection
-    list(tk_send_without_enc('curselection'))
-  end
-  def get(first, last=nil)
-    if last
-      # tk_split_simplelist(_fromUTF8(tk_send_without_enc('get', first, last)))
-      tk_split_simplelist(tk_send_without_enc('get', first, last), false, true)
-    else
-      _fromUTF8(tk_send_without_enc('get', first))
-    end
-  end
-  def nearest(y)
-    tk_send_without_enc('nearest', y).to_i
-  end
-  def size
-    tk_send_without_enc('size').to_i
-  end
-  def selection_anchor(index)
-    tk_send_without_enc('selection', 'anchor', index)
-    self
-  end
-  def selection_clear(first, last=None)
-    tk_send_without_enc('selection', 'clear', first, last)
-    self
-  end
-  def selection_includes(index)
-    bool(tk_send_without_enc('selection', 'includes', index))
-  end
-  def selection_set(first, last=None)
-    tk_send_without_enc('selection', 'set', first, last)
-    self
-  end
-
-  def index(idx)
-    tk_send_without_enc('index', idx).to_i
-  end
-
-  def value
-    get('0', 'end')
-  end
-
-  def value= (vals)
-    unless vals.kind_of?(Array)
-      fail ArgumentError, 'an Array is expected'
-    end
-    tk_send_without_enc('delete', '0', 'end')
-    tk_send_without_enc('insert', '0',
-                        *(vals.collect{|v| _get_eval_enc_str(v)}))
-    vals
-  end
-
-  def clear
-    tk_send_without_enc('delete', '0', 'end')
-    self
-  end
-  alias erase clear
-
-=begin
-  def itemcget(index, key)
-    case key.to_s
-    when 'text', 'label', 'show'
-      _fromUTF8(tk_send_without_enc('itemcget', index, "-#{key}"))
-    when 'font', 'kanjifont'
-      #fnt = tk_tcl2ruby(tk_send('itemcget', index, "-#{key}"))
-      fnt = tk_tcl2ruby(_fromUTF8(tk_send_without_enc('itemcget', index,
-                                                      '-font')))
-      unless fnt.kind_of?(TkFont)
-        fnt = tagfontobj(index, fnt)
-      end
-      if key.to_s == 'kanjifont' && JAPANIZED_TK && TK_VERSION =~ /^4\.*/
-        # obsolete; just for compatibility
-        fnt.kanji_font
-      else
-        fnt
-      end
-    else
-      tk_tcl2ruby(_fromUTF8(tk_send_without_enc('itemcget', index, "-#{key}")))
-    end
-  end
-  def itemconfigure(index, key, val=None)
-    if key.kind_of? Hash
-      if (key['font'] || key[:font] ||
-          key['kanjifont'] || key[:kanjifont] ||
-          key['latinfont'] || key[:latinfont] ||
-          key['asciifont'] || key[:asciifont] )
-        tagfont_configure(index, _symbolkey2str(key))
-      else
-        tk_send_without_enc('itemconfigure', index, *hash_kv(key, true))
-      end
-
-    else
-      if (key == 'font' || key == :font ||
-          key == 'kanjifont' || key == :kanjifont ||
-          key == 'latinfont' || key == :latinfont ||
-          key == 'asciifont' || key == :asciifont )
-        if val == None
-          tagfontobj(index)
-        else
-          tagfont_configure(index, {key=>val})
-        end
-      else
-        tk_call('itemconfigure', index, "-#{key}", val)
-      end
-    end
-    self
-  end
-
-  def itemconfiginfo(index, key=nil)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if key
-        case key.to_s
-        when 'text', 'label', 'show'
-          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure',index,"-#{key}")))
-        when 'font', 'kanjifont'
-          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure',index,"-#{key}")))
-          conf[4] = tagfont_configinfo(index, conf[4])
-        else
-          conf = tk_split_list(_fromUTF8(tk_send_without_enc('itemconfigure',index,"-#{key}")))
-        end
-        conf[0] = conf[0][1..-1]
-        conf
-      else
-        ret = tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure', index))).collect{|conflist|
-          conf = tk_split_simplelist(conflist)
-          conf[0] = conf[0][1..-1]
-          case conf[0]
-          when 'text', 'label', 'show'
-          else
-            if conf[3]
-              if conf[3].index('{')
-                conf[3] = tk_split_list(conf[3])
-              else
-                conf[3] = tk_tcl2ruby(conf[3])
-              end
-            end
-            if conf[4]
-              if conf[4].index('{')
-                conf[4] = tk_split_list(conf[4])
-              else
-                conf[4] = tk_tcl2ruby(conf[4])
-              end
-            end
-          end
-          conf[1] = conf[1][1..-1] if conf.size == 2 # alias info
-          conf
-        }
-        fontconf = ret.assoc('font')
-        if fontconf
-          ret.delete_if{|item| item[0] == 'font' || item[0] == 'kanjifont'}
-          fontconf[4] = tagfont_configinfo(index, fontconf[4])
-          ret.push(fontconf)
-        else
-          ret
-        end
-      end
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      if key
-        case key.to_s
-        when 'text', 'label', 'show'
-          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure',index,"-#{key}")))
-        when 'font', 'kanjifont'
-          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure',index,"-#{key}")))
-          conf[4] = tagfont_configinfo(index, conf[4])
-        else
-          conf = tk_split_list(_fromUTF8(tk_send_without_enc('itemconfigure',index,"-#{key}")))
-        end
-        key = conf.shift[1..-1]
-        { key => conf }
-      else
-        ret = {}
-        tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure', index))).each{|conflist|
-          conf = tk_split_simplelist(conflist)
-          key = conf.shift[1..-1]
-          case key
-          when 'text', 'label', 'show'
-          else
-            if conf[2]
-              if conf[2].index('{')
-                conf[2] = tk_split_list(conf[2])
-              else
-                conf[2] = tk_tcl2ruby(conf[2])
-              end
-            end
-            if conf[3]
-              if conf[3].index('{')
-                conf[3] = tk_split_list(conf[3])
-              else
-                conf[3] = tk_tcl2ruby(conf[3])
-              end
-            end
-          end
-          if conf.size == 1
-            ret[key] = conf[0][1..-1]  # alias info
-          else
-            ret[key] = conf
-          end
-        }
-        fontconf = ret['font']
-        if fontconf
-          ret.delete('font')
-          ret.delete('kanjifont')
-          fontconf[3] = tagfont_configinfo(index, fontconf[3])
-          ret['font'] = fontconf
-        end
-        ret
-      end
-    end
-  end
-
-  def current_itemconfiginfo(index, key=nil)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if key
-        conf = itemconfiginfo(index, key)
-        {conf[0] => conf[4]}
-      else
-        ret = {}
-        itemconfiginfo(index).each{|conf|
-          ret[conf[0]] = conf[4] if conf.size > 2
-        }
-        ret
-      end
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      ret = {}
-      itemconfiginfo(index, key).each{|k, conf|
-        ret[k] = conf[-1] if conf.kind_of?(Array)
-      }
-      ret
-    end
-  end
-=end
-end
-
-#TkListbox = Tk::Listbox unless Object.const_defined? :TkListbox
-#Tk.__set_toplevel_aliases__(:Tk, Tk::Listbox, :TkListbox)
-Tk.__set_loaded_toplevel_aliases__('tk/listbox.rb', :Tk, Tk::Listbox,
-                                   :TkListbox)
diff --git a/ext/tk/lib/tk/macpkg.rb b/ext/tk/lib/tk/macpkg.rb
deleted file mode 100644
index abf9b176fb..0000000000
--- a/ext/tk/lib/tk/macpkg.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-# frozen_string_literal: false
-#
-#   tk/macpkg.rb : methods for Tcl/Tk packages for Macintosh
-#                     2000/11/22 by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
-#
-#     ATTENTION !!
-#         This is NOT TESTED. Because I have no test-environment.
-#
-#
-require 'tk'
-
-module Tk
-  def Tk.load_tclscript_rsrc(resource_name, file=None)
-    # Mac only
-    tk_call('source', '-rsrc', resource_name, file)
-  end
-
-  def Tk.load_tclscript_rsrcid(resource_id, file=None)
-    # Mac only
-    tk_call('source', '-rsrcid', resource_id, file)
-  end
-end
-
-module Tk::MacResource
-end
-#TkMacResource = Tk::MacResource
-#Tk.__set_toplevel_aliases__(:Tk, Tk::MacResource, :TkMacResource)
-Tk.__set_loaded_toplevel_aliases__('tk/macpkg.rb', :Tk, Tk::MacResource,
-                                   :TkMacResource)
-
-module Tk::MacResource
-  extend Tk
-  extend Tk::MacResource
-
-  TkCommandNames = ['resource'.freeze].freeze
-
-  PACKAGE_NAME = 'resource'.freeze
-  def self.package_name
-    PACKAGE_NAME
-  end
-
-  tk_call_without_enc('package', 'require', 'resource')
-
-  def close(rsrcRef)
-    tk_call('resource', 'close', rsrcRef)
-  end
-
-  def delete(rsrcType, opts=nil)
-    tk_call('resource', 'delete', *(hash_kv(opts) << rsrcType))
-  end
-
-  def files(rsrcRef=nil)
-    if rsrcRef
-      tk_call('resource', 'files', rsrcRef)
-    else
-      tk_split_simplelist(tk_call('resource', 'files'))
-    end
-  end
-
-  def list(rsrcType, rsrcRef=nil)
-    tk_split_simplelist(tk_call('resource', 'list', rsrcType, rsrcRef))
-  end
-
-  def open(fname, access=nil)
-    tk_call('resource', 'open', fname, access)
-  end
-
-  def read(rsrcType, rsrcID, rsrcRef=nil)
-    tk_call('resource', 'read', rsrcType, rsrcID, rsrcRef)
-  end
-
-  def types(rsrcRef=nil)
-    tk_split_simplelist(tk_call('resource', 'types', rsrcRef))
-  end
-
-  def write(rsrcType, data, opts=nil)
-    tk_call('resource', 'write', *(hash_kv(opts) << rsrcType << data))
-  end
-
-  module_function :close, :delete, :files, :list, :open, :read, :types, :write
-end
diff --git a/ext/tk/lib/tk/menu.rb b/ext/tk/lib/tk/menu.rb
deleted file mode 100644
index a466a11012..0000000000
--- a/ext/tk/lib/tk/menu.rb
+++ /dev/null
@@ -1,719 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/menu.rb : treat menu and menubutton
-#
-require 'tk'
-require 'tk/itemconfig'
-require 'tk/menuspec'
-
-module TkMenuEntryConfig
-  include TkItemConfigMethod
-
-  def __item_cget_cmd(id)
-    [self.path, 'entrycget', id]
-  end
-  private :__item_cget_cmd
-
-  def __item_config_cmd(id)
-    [self.path, 'entryconfigure', id]
-  end
-  private :__item_config_cmd
-
-  def __item_strval_optkeys(id)
-    super(id) << 'selectcolor'
-  end
-  private :__item_strval_optkeys
-
-  def __item_listval_optkeys(id)
-    []
-  end
-  private :__item_listval_optkeys
-
-  def __item_val2ruby_optkeys(id)  # { key=>proc, ... }
-    super(id).update('menu'=>proc{|i, v| window(v)})
-  end
-  private :__item_val2ruby_optkeys
-
-  alias entrycget_tkstring itemcget_tkstring
-  alias entrycget itemcget
-  alias entrycget_strict itemcget_strict
-  alias entryconfigure itemconfigure
-  alias entryconfiginfo itemconfiginfo
-  alias current_entryconfiginfo current_itemconfiginfo
-
-  private :itemcget_tkstring, :itemcget, :itemcget_strict
-  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
-end
-
-class Tk::Menu<TkWindow
-  include Wm
-  include TkMenuEntryConfig
-  extend TkMenuSpec
-
-  TkCommandNames = ['menu'.freeze].freeze
-  WidgetClassName = 'Menu'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  #def create_self(keys)
-  #  if keys and keys != None
-  #    tk_call_without_enc('menu', @path, *hash_kv(keys, true))
-  #  else
-  #    tk_call_without_enc('menu', @path)
-  #  end
-  #end
-  #private :create_self
-
-  def __strval_optkeys
-    super() << 'selectcolor' << 'title'
-  end
-  private :__strval_optkeys
-
-  def __boolval_optkeys
-    super() << 'tearoff'
-  end
-  private :__boolval_optkeys
-
-  def self.new_menuspec(menu_spec, parent = nil, tearoff = false, keys = nil)
-    if parent.kind_of?(Hash)
-      keys = _symbolkey2str(parent)
-      parent = keys.delete('parent')
-      tearoff = keys.delete('tearoff')
-    elsif tearoff.kind_of?(Hash)
-      keys = _symbolkey2str(tearoff)
-      tearoff = keys.delete('tearoff')
-    elsif keys
-      keys = _symbolkey2str(keys)
-    else
-      keys = {}
-    end
-
-    widgetname = keys.delete('widgetname')
-    _create_menu(parent, menu_spec, widgetname, tearoff, keys)
-  end
-
-  def tagid(id)
-    #id.to_s
-    _get_eval_string(id)
-  end
-
-  def activate(index)
-    tk_send_without_enc('activate', _get_eval_enc_str(index))
-    self
-  end
-  def add(type, keys=nil)
-    tk_send_without_enc('add', type, *hash_kv(keys, true))
-    self
-  end
-  def add_cascade(keys=nil)
-    add('cascade', keys)
-  end
-  def add_checkbutton(keys=nil)
-    add('checkbutton', keys)
-  end
-  def add_command(keys=nil)
-    add('command', keys)
-  end
-  def add_radiobutton(keys=nil)
-    add('radiobutton', keys)
-  end
-  def add_separator(keys=nil)
-    add('separator', keys)
-  end
-
-  def clone_menu(*args)
-    if args[0].kind_of?(TkWindow)
-      parent = args.shift
-    else
-      parent = self
-    end
-
-    if args[0].kind_of?(String) || args[0].kind_of?(Symbol) # menu type
-      type = args.shift
-    else
-      type = None # 'normal'
-    end
-
-    if args[0].kind_of?(Hash)
-      keys = _symbolkey2str(args.shift)
-    else
-      keys = {}
-    end
-
-    parent = keys.delete('parent') if keys.has_key?('parent')
-    type = keys.delete('type') if keys.has_key?('type')
-
-    if keys.empty?
-      Tk::MenuClone.new(self, parent, type)
-    else
-      Tk::MenuClone.new(self, parent, type, keys)
-    end
-  end
-
-  def index(idx)
-    ret = tk_send_without_enc('index', _get_eval_enc_str(idx))
-    (ret == 'none')? nil: number(ret)
-  end
-  def invoke(index)
-    _fromUTF8(tk_send_without_enc('invoke', _get_eval_enc_str(index)))
-  end
-  def insert(index, type, keys=nil)
-    tk_send_without_enc('insert', _get_eval_enc_str(index),
-                        type, *hash_kv(keys, true))
-    self
-  end
-  def delete(first, last=nil)
-    if last
-      tk_send_without_enc('delete', _get_eval_enc_str(first),
-                          _get_eval_enc_str(last))
-    else
-      tk_send_without_enc('delete', _get_eval_enc_str(first))
-    end
-    self
-  end
-  def popup(x, y, index=nil)
-    if index
-      tk_call_without_enc('tk_popup', path, x, y,
-                          _get_eval_enc_str(index))
-    else
-      tk_call_without_enc('tk_popup', path, x, y)
-    end
-    self
-  end
-  def post(x, y)
-    _fromUTF8(tk_send_without_enc('post', x, y))
-  end
-  def postcascade(index)
-    tk_send_without_enc('postcascade', _get_eval_enc_str(index))
-    self
-  end
-  def postcommand(cmd=Proc.new)
-    configure_cmd 'postcommand', cmd
-    self
-  end
-  def set_focus
-    tk_call_without_enc('tk_menuSetFocus', path)
-    self
-  end
-  def tearoffcommand(cmd=Proc.new)
-    configure_cmd 'tearoffcommand', cmd
-    self
-  end
-  def menutype(index)
-    tk_send_without_enc('type', _get_eval_enc_str(index))
-  end
-  def unpost
-    tk_send_without_enc('unpost')
-    self
-  end
-  def xposition(index)
-    number(tk_send_without_enc('xposition', _get_eval_enc_str(index)))
-  end
-  def yposition(index)
-    number(tk_send_without_enc('yposition', _get_eval_enc_str(index)))
-  end
-
-=begin
-  def entrycget(index, key)
-    case key.to_s
-    when 'text', 'label', 'show'
-      _fromUTF8(tk_send_without_enc('entrycget',
-                                    _get_eval_enc_str(index), "-#{key}"))
-    when 'font', 'kanjifont'
-      #fnt = tk_tcl2ruby(tk_send('entrycget', index, "-#{key}"))
-      fnt = tk_tcl2ruby(_fromUTF8(tk_send_without_enc('entrycget', _get_eval_enc_str(index), '-font')))
-      unless fnt.kind_of?(TkFont)
-        fnt = tagfontobj(index, fnt)
-      end
-      if key.to_s == 'kanjifont' && JAPANIZED_TK && TK_VERSION =~ /^4\.*/
-        # obsolete; just for compatibility
-        fnt.kanji_font
-      else
-        fnt
-      end
-    else
-      tk_tcl2ruby(_fromUTF8(tk_send_without_enc('entrycget', _get_eval_enc_str(index), "-#{key}")))
-    end
-  end
-  def entryconfigure(index, key, val=None)
-    if key.kind_of? Hash
-      if (key['font'] || key[:font] ||
-          key['kanjifont'] || key[:kanjifont] ||
-          key['latinfont'] || key[:latinfont] ||
-          key['asciifont'] || key[:asciifont])
-        tagfont_configure(index, _symbolkey2str(key))
-      else
-        tk_send_without_enc('entryconfigure', _get_eval_enc_str(index),
-                            *hash_kv(key, true))
-      end
-
-    else
-      if (key == 'font' || key == :font ||
-          key == 'kanjifont' || key == :kanjifont ||
-          key == 'latinfont' || key == :latinfont ||
-          key == 'asciifont' || key == :asciifont )
-        if val == None
-          tagfontobj(index)
-        else
-          tagfont_configure(index, {key=>val})
-        end
-      else
-        tk_call('entryconfigure', index, "-#{key}", val)
-      end
-    end
-    self
-  end
-
-  def entryconfiginfo(index, key=nil)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if key
-        case key.to_s
-        when 'text', 'label', 'show'
-          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('entryconfigure',_get_eval_enc_str(index),"-#{key}")))
-        when 'font', 'kanjifont'
-          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('entryconfigure',_get_eval_enc_str(index),"-#{key}")))
-          conf[4] = tagfont_configinfo(index, conf[4])
-        else
-          conf = tk_split_list(_fromUTF8(tk_send_without_enc('entryconfigure',_get_eval_enc_str(index),"-#{key}")))
-        end
-        conf[0] = conf[0][1..-1]
-        conf
-      else
-        ret = tk_split_simplelist(_fromUTF8(tk_send_without_enc('entryconfigure', _get_eval_enc_str(index)))).collect{|conflist|
-          conf = tk_split_simplelist(conflist)
-          conf[0] = conf[0][1..-1]
-          case conf[0]
-          when 'text', 'label', 'show'
-          else
-            if conf[3]
-              if conf[3].index('{')
-                conf[3] = tk_split_list(conf[3])
-              else
-                conf[3] = tk_tcl2ruby(conf[3])
-              end
-            end
-            if conf[4]
-              if conf[4].index('{')
-                conf[4] = tk_split_list(conf[4])
-              else
-                conf[4] = tk_tcl2ruby(conf[4])
-              end
-            end
-          end
-          conf[1] = conf[1][1..-1] if conf.size == 2 # alias info
-          conf
-        }
-        if fontconf
-          ret.delete_if{|item| item[0] == 'font' || item[0] == 'kanjifont'}
-          fontconf[4] = tagfont_configinfo(index, fontconf[4])
-          ret.push(fontconf)
-        else
-          ret
-        end
-      end
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      if key
-        case key.to_s
-        when 'text', 'label', 'show'
-          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('entryconfigure',_get_eval_enc_str(index),"-#{key}")))
-        when 'font', 'kanjifont'
-          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('entryconfigure',_get_eval_enc_str(index),"-#{key}")))
-          conf[4] = tagfont_configinfo(index, conf[4])
-        else
-          conf = tk_split_list(_fromUTF8(tk_send_without_enc('entryconfigure',_get_eval_enc_str(index),"-#{key}")))
-        end
-        key = conf.shift[1..-1]
-        { key => conf }
-      else
-        ret = {}
-        tk_split_simplelist(_fromUTF8(tk_send_without_enc('entryconfigure', _get_eval_enc_str(index)))).each{|conflist|
-          conf = tk_split_simplelist(conflist)
-          key = conf.shift[1..-1]
-          case key
-          when 'text', 'label', 'show'
-          else
-            if conf[2]
-              if conf[2].index('{')
-                conf[2] = tk_split_list(conf[2])
-              else
-                conf[2] = tk_tcl2ruby(conf[2])
-              end
-            end
-            if conf[3]
-              if conf[3].index('{')
-                conf[3] = tk_split_list(conf[3])
-              else
-                conf[3] = tk_tcl2ruby(conf[3])
-              end
-            end
-          end
-          if conf.size == 1
-            ret[key] = conf[0][1..-1]  # alias info
-          else
-            ret[key] = conf
-          end
-        }
-        fontconf = ret['font']
-        if fontconf
-          ret.delete('font')
-          ret.delete('kanjifont')
-          fontconf[3] = tagfont_configinfo(index, fontconf[3])
-          ret['font'] = fontconf
-        end
-        ret
-      end
-    end
-  end
-
-  def current_entryconfiginfo(index, key=nil)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if key
-        conf = entryconfiginfo(index, key)
-        {conf[0] => conf[4]}
-      else
-        ret = {}
-        entryconfiginfo(index).each{|conf|
-          ret[conf[0]] = conf[4] if conf.size > 2
-        }
-        ret
-      end
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      ret = {}
-      entryconfiginfo(index, key).each{|k, conf|
-        ret[k] = conf[-1] if conf.kind_of?(Array)
-      }
-      ret
-    end
-  end
-=end
-end
-
-#TkMenu = Tk::Menu unless Object.const_defined? :TkMenu
-#Tk.__set_toplevel_aliases__(:Tk, Tk::Menu, :TkMenu)
-Tk.__set_loaded_toplevel_aliases__('tk/menu.rb', :Tk, Tk::Menu, :TkMenu)
-
-
-module Tk::Menu::TkInternalFunction; end
-class << Tk::Menu::TkInternalFunction
-  # These methods calls internal functions of Tcl/Tk.
-  # So, They may not work on your Tcl/Tk.
-  def next_menu(menu, dir='next')
-    dir = dir.to_s
-    case dir
-    when 'next', 'forward', 'down'
-      dir = 'right'
-    when 'previous', 'backward', 'up'
-      dir = 'left'
-    end
-
-    Tk.tk_call('::tk::MenuNextMenu', menu, dir)
-  end
-
-  def next_entry(menu, delta)
-    # delta is increment value of entry index.
-    # For example, +1 denotes 'next entry' and -1 denotes 'previous entry'.
-    Tk.tk_call('::tk::MenuNextEntry', menu, delta)
-  end
-end
-
-class Tk::MenuClone<Tk::Menu
-=begin
-  def initialize(parent, type=None)
-    widgetname = nil
-    if parent.kind_of? Hash
-      keys = _symbolkey2str(parent)
-      parent = keys.delete('parent')
-      widgetname = keys.delete('widgetname')
-      type = keys.delete('type'); type = None unless type
-    end
-    #unless parent.kind_of?(TkMenu)
-    #  fail ArgumentError, "parent must be TkMenu"
-    #end
-    @parent = parent
-    install_win(@parent.path, widgetname)
-    tk_call_without_enc(@parent.path, 'clone', @path, type)
-  end
-=end
-  def initialize(src_menu, *args)
-    widgetname = nil
-
-    if args[0].kind_of?(TkWindow)  # parent window
-      parent = args.shift
-    else
-      parent = src_menu
-    end
-
-    if args[0].kind_of?(String) || args[0].kind_of?(Symbol)  # menu type
-      type = args.shift
-    else
-      type = None  # 'normal'
-    end
-
-    if args[0].kind_of?(Hash)
-      keys = _symbolkey2str(args.shift)
-      parent = keys.delete('parent') if keys.has_key?('parent')
-      widgetname = keys.delete('widgetname')
-      type = keys.delete('type') if keys.has_key?('type')
-    else
-      keys = nil
-    end
-
-    @src_menu = src_menu
-    @parent = parent
-    @type = type
-    install_win(@parent.path, widgetname)
-    tk_call_without_enc(@src_menu.path, 'clone', @path, @type)
-    configure(keys) if keys && !keys.empty?
-  end
-
-  def source_menu
-    @src_menu
-  end
-end
-Tk::CloneMenu = Tk::MenuClone
-#TkMenuClone = Tk::MenuClone unless Object.const_defined? :TkMenuClone
-#TkCloneMenu = Tk::CloneMenu unless Object.const_defined? :TkCloneMenu
-#Tk.__set_toplevel_aliases__(:Tk, Tk::MenuClone, :TkMenuClone, :TkCloneMenu)
-Tk.__set_loaded_toplevel_aliases__('tk/menu.rb', :Tk, Tk::MenuClone,
-                                   :TkMenuClone, :TkCloneMenu)
-
-module Tk::SystemMenu
-  def initialize(parent, keys=nil)
-    if parent.kind_of? Hash
-      keys = _symbolkey2str(parent)
-      parent = keys.delete('parent')
-    end
-    #unless parent.kind_of? TkMenu
-    #  fail ArgumentError, "parent must be a TkMenu object"
-    #end
-    # @path = Kernel.format("%s.%s", parent.path, self.class::SYSMENU_NAME)
-    @path = parent.path + '.' + self.class::SYSMENU_NAME
-    #TkComm::Tk_WINDOWS[@path] = self
-    TkCore::INTERP.tk_windows[@path] = self
-    if self.method(:create_self).arity == 0
-      p 'create_self has no arg' if $DEBUG
-      create_self
-      configure(keys) if keys
-    else
-      p 'create_self has an arg' if $DEBUG
-      create_self(keys)
-    end
-  end
-end
-TkSystemMenu = Tk::SystemMenu
-
-
-class Tk::SysMenu_Help<Tk::Menu
-  # for all platform
-  include Tk::SystemMenu
-  SYSMENU_NAME = 'help'
-end
-#TkSysMenu_Help = Tk::SysMenu_Help unless Object.const_defined? :TkSysMenu_Help
-#Tk.__set_toplevel_aliases__(:Tk, Tk::SysMenu_Help, :TkSysMenu_Help)
-Tk.__set_loaded_toplevel_aliases__('tk/menu.rb', :Tk, Tk::SysMenu_Help,
-                                   :TkSysMenu_Help)
-
-
-class Tk::SysMenu_System<Tk::Menu
-  # for Windows
-  include Tk::SystemMenu
-  SYSMENU_NAME = 'system'
-end
-#TkSysMenu_System = Tk::SysMenu_System unless Object.const_defined? :TkSysMenu_System
-#Tk.__set_toplevel_aliases__(:Tk, Tk::SysMenu_System, :TkSysMenu_System)
-Tk.__set_loaded_toplevel_aliases__('tk/menu.rb', :Tk, Tk::SysMenu_System,
-                                   :TkSysMenu_System)
-
-
-class Tk::SysMenu_Apple<Tk::Menu
-  # for Macintosh
-  include Tk::SystemMenu
-  SYSMENU_NAME = 'apple'
-end
-#TkSysMenu_Apple = Tk::SysMenu_Apple unless Object.const_defined? :TkSysMenu_Apple
-#Tk.__set_toplevel_aliases__(:Tk, Tk::SysMenu_Apple, :TkSysMenu_Apple)
-Tk.__set_loaded_toplevel_aliases__('tk/menu.rb', :Tk, Tk::SysMenu_Apple,
-                                   :TkSysMenu_Apple)
-
-
-class Tk::Menubutton<Tk::Label
-  TkCommandNames = ['menubutton'.freeze].freeze
-  WidgetClassName = 'Menubutton'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-  def create_self(keys)
-    if keys and keys != None
-      unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-        # tk_call_without_enc('menubutton', @path, *hash_kv(keys, true))
-        tk_call_without_enc(self.class::TkCommandNames[0], @path,
-                            *hash_kv(keys, true))
-      else
-        begin
-          tk_call_without_enc(self.class::TkCommandNames[0], @path,
-                              *hash_kv(keys, true))
-        rescue
-          tk_call_without_enc(self.class::TkCommandNames[0], @path)
-          keys = __check_available_configure_options(keys)
-          unless keys.empty?
-            tk_call_without_enc('destroy', @path) rescue nil
-            tk_call_without_enc(self.class::TkCommandNames[0], @path,
-                                *hash_kv(keys, true))
-          end
-        end
-      end
-    else
-      # tk_call_without_enc('menubutton', @path)
-      tk_call_without_enc(self.class::TkCommandNames[0], @path)
-    end
-  end
-  private :create_self
-
-  def __boolval_optkeys
-    super() << 'indicatoron'
-  end
-  private :__boolval_optkeys
-
-end
-Tk::MenuButton = Tk::Menubutton
-#TkMenubutton = Tk::Menubutton unless Object.const_defined? :TkMenubutton
-#TkMenuButton = Tk::MenuButton unless Object.const_defined? :TkMenuButton
-#Tk.__set_toplevel_aliases__(:Tk, Tk::Menubutton, :TkMenubutton, :TkMenuButton)
-Tk.__set_loaded_toplevel_aliases__('tk/menu.rb', :Tk, Tk::Menubutton,
-                                   :TkMenubutton, :TkMenuButton)
-
-
-class Tk::OptionMenubutton<Tk::Menubutton
-  TkCommandNames = ['tk_optionMenu'.freeze].freeze
-
-  class OptionMenu<TkMenu
-    def initialize(path)  #==> return value of tk_optionMenu
-      @path = path
-      #TkComm::Tk_WINDOWS[@path] = self
-      TkCore::INTERP.tk_windows[@path] = self
-    end
-  end
-
-  def initialize(*args)
-    # args :: [parent,] [var,] [value[, ...],] [keys]
-    #    parent --> TkWindow or nil
-    #    var    --> TkVariable or nil
-    #    keys   --> Hash
-    #       keys[:parent] or keys['parent']     --> parent
-    #       keys[:variable] or keys['variable'] --> var
-    #       keys[:values] or keys['values']     --> value, ...
-    #       other Hash keys are menubutton options
-    keys = {}
-    keys = args.pop if args[-1].kind_of?(Hash)
-    keys = _symbolkey2str(keys)
-
-    parent = nil
-    if !args.empty? && (args[0].kind_of?(TkWindow) || args[0] == nil)
-      keys.delete('parent') # ignore
-      parent = args.shift
-    else
-      parent = keys.delete('parent')
-    end
-
-    @variable = nil
-    if !args.empty? && (args[0].kind_of?(TkVariable) || args[0] == nil)
-      keys.delete('variable') # ignore
-      @variable = args.shift
-    else
-      @variable = keys.delete('variable')
-    end
-    @variable = TkVariable.new unless @variable
-
-    (args = keys.delete('values') || []) if args.empty?
-    if args.empty?
-      args << @variable.value
-    else
-      @variable.value = args[0]
-    end
-
-    install_win(if parent then parent.path end)
-    @menu = OptionMenu.new(tk_call('tk_optionMenu',
-                                   @path, @variable.id, *args))
-
-    configure(keys) if keys
-  end
-
-  def value
-    @variable.value
-  end
-
-  def value=(val)
-    @variable.value = val
-  end
-
-  def activate(index)
-    @menu.activate(index)
-    self
-  end
-  def add(value)
-    @menu.add('radiobutton', 'variable'=>@variable,
-              'label'=>value, 'value'=>value)
-    self
-  end
-  def index(index)
-    @menu.index(index)
-  end
-  def invoke(index)
-    @menu.invoke(index)
-  end
-  def insert(index, value)
-    @menu.insert(index, 'radiobutton', 'variable'=>@variable,
-              'label'=>value, 'value'=>value)
-    self
-  end
-  def delete(index, last=None)
-    @menu.delete(index, last)
-    self
-  end
-  def xposition(index)
-    @menu.xposition(index)
-  end
-  def yposition(index)
-    @menu.yposition(index)
-  end
-  def menu
-    @menu
-  end
-  def menucget(key)
-    @menu.cget(key)
-  end
-  def menucget_strict(key)
-    @menu.cget_strict(key)
-  end
-  def menuconfigure(key, val=None)
-    @menu.configure(key, val)
-    self
-  end
-  def menuconfiginfo(key=nil)
-    @menu.configinfo(key)
-  end
-  def current_menuconfiginfo(key=nil)
-    @menu.current_configinfo(key)
-  end
-  def entrycget(index, key)
-    @menu.entrycget(index, key)
-  end
-  def entrycget_strict(index, key)
-    @menu.entrycget_strict(index, key)
-  end
-  def entryconfigure(index, key, val=None)
-    @menu.entryconfigure(index, key, val)
-    self
-  end
-  def entryconfiginfo(index, key=nil)
-    @menu.entryconfiginfo(index, key)
-  end
-  def current_entryconfiginfo(index, key=nil)
-    @menu.current_entryconfiginfo(index, key)
-  end
-end
-
-Tk::OptionMenuButton = Tk::OptionMenubutton
-#TkOptionMenubutton = Tk::OptionMenubutton unless Object.const_defined? :TkOptionMenubutton
-#TkOptionMenuButton = Tk::OptionMenuButton unless Object.const_defined? :TkOptionMenuButton
-#Tk.__set_toplevel_aliases__(:Tk, Tk::OptionMenubutton,
-#                            :TkOptionMenubutton, :TkOptionMenuButton)
-Tk.__set_loaded_toplevel_aliases__('tk/menu.rb', :Tk, Tk::OptionMenubutton,
-                                   :TkOptionMenubutton, :TkOptionMenuButton)
diff --git a/ext/tk/lib/tk/menubar.rb b/ext/tk/lib/tk/menubar.rb
deleted file mode 100644
index 73f8801d98..0000000000
--- a/ext/tk/lib/tk/menubar.rb
+++ /dev/null
@@ -1,138 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/menubar.rb
-#
-# Original version:
-#   Copyright (C) 1998 maeda shugo. All rights reserved.
-#   This file can be distributed under the terms of the Ruby.
-
-# Usage:
-#
-# menu_spec = [
-#   [['File', 0],
-#     ['Open', proc{puts('Open clicked')}, 0],
-#     '---',
-#     ['Quit', proc{exit}, 0]],
-#   [['Edit', 0],
-#     ['Cut', proc{puts('Cut clicked')}, 2],
-#     ['Copy', proc{puts('Copy clicked')}, 0],
-#     ['Paste', proc{puts('Paste clicked')}, 0]]
-# ]
-# menubar = TkMenubar.new(nil, menu_spec,
-#                       'tearoff'=>false,
-#                       'foreground'=>'grey40',
-#                       'activeforeground'=>'red',
-#                       'font'=>'-adobe-helvetica-bold-r-*--12-*-iso8859-1')
-# menubar.pack('side'=>'top', 'fill'=>'x')
-#
-#
-# OR
-#
-#
-# menubar = TkMenubar.new
-# menubar.add_menu([['File', 0],
-#                  ['Open', proc{puts('Open clicked')}, 0],
-#                  '---',
-#                  ['Quit', proc{exit}, 0]])
-# menubar.add_menu([['Edit', 0],
-#                  ['Cut', proc{puts('Cut clicked')}, 2],
-#                  ['Copy', proc{puts('Copy clicked')}, 0],
-#                  ['Paste', proc{puts('Paste clicked')}, 0]])
-# menubar.configure('tearoff', false)
-# menubar.configure('foreground', 'grey40')
-# menubar.configure('activeforeground', 'red')
-# menubar.configure('font', '-adobe-helvetica-bold-r-*--12-*-iso8859-1')
-# menubar.pack('side'=>'top', 'fill'=>'x')
-#
-#
-# OR
-#
-# radio_var = TkVariable.new('y')
-# menu_spec = [
-#   [['File', 0],
-#     {:label=>'Open', :command=>proc{puts('Open clicked')}, :underline=>0},
-#     '---',
-#     ['Check_A', TkVariable.new(true), 6],
-#     {:type=>'checkbutton', :label=>'Check_B',
-#                 :variable=>TkVariable.new, :underline=>6},
-#     '---',
-#     ['Radio_X', [radio_var, 'x'], 6],
-#     ['Radio_Y', [radio_var, 'y'], 6],
-#     ['Radio_Z', [radio_var, 'z'], 6],
-#     '---',
-#     ['cascade', [
-#                    ['sss', proc{p 'sss'}, 0],
-#                    ['ttt', proc{p 'ttt'}, 0],
-#                    ['uuu', proc{p 'uuu'}, 0],
-#                    ['vvv', proc{p 'vvv'}, 0],
-#                 ], 0],
-#     '---',
-#     ['Quit', proc{exit}, 0]],
-#   [['Edit', 0],
-#     ['Cut', proc{puts('Cut clicked')}, 2],
-#     ['Copy', proc{puts('Copy clicked')}, 0],
-#     ['Paste', proc{puts('Paste clicked')}, 0]]
-# ]
-# menubar = TkMenubar.new(nil, menu_spec,
-#                        'tearoff'=>false,
-#                        'foreground'=>'grey40',
-#                        'activeforeground'=>'red',
-#                        'font'=>'Helvetica 12 bold')
-# menubar.pack('side'=>'top', 'fill'=>'x')
-
-# See tk/menuspec.rb about the format of the menu_spec
-
-# To use add_menu, configuration must be done by calling configure after
-# adding all menus by add_menu, not by the constructor arguments.
-
-require 'tk'
-require 'tk/frame'
-require 'tk/composite'
-require 'tk/menuspec'
-
-class TkMenubar<Tk::Frame
-  include TkComposite
-  include TkMenuSpec
-
-  def initialize(parent = nil, spec = nil, options = {})
-    if parent.kind_of? Hash
-      options = parent
-      parent = nil
-      spec = (options.has_key?('spec'))? options.delete('spec'): nil
-    end
-
-    _symbolkey2str(options)
-    menuspec_opt = {}
-    TkMenuSpec::MENUSPEC_OPTKEYS.each{|key|
-      menuspec_opt[key] = options.delete(key) if options.has_key?(key)
-    }
-
-    super(parent, options)
-
-    @menus = []
-
-    spec.each{|info| add_menu(info, menuspec_opt)} if spec
-
-    options.each{|key, value| configure(key, value)} if options
-  end
-
-  def add_menu(menu_info, menuspec_opt={})
-    mbtn, menu = _create_menubutton(@frame, menu_info, menuspec_opt)
-
-    submenus = _get_cascade_menus(menu).flatten
-
-    @menus.push([mbtn, menu])
-    delegate('tearoff', menu, *submenus)
-    delegate('foreground', mbtn, menu, *submenus)
-    delegate('background', mbtn, menu, *submenus)
-    delegate('disabledforeground', mbtn, menu, *submenus)
-    delegate('activeforeground', mbtn, menu, *submenus)
-    delegate('activebackground', mbtn, menu, *submenus)
-    delegate('font', mbtn, menu, *submenus)
-    delegate('kanjifont', mbtn, menu, *submenus)
-  end
-
-  def [](index)
-    return @menus[index]
-  end
-end
diff --git a/ext/tk/lib/tk/menuspec.rb b/ext/tk/lib/tk/menuspec.rb
deleted file mode 100644
index 8039676e69..0000000000
--- a/ext/tk/lib/tk/menuspec.rb
+++ /dev/null
@@ -1,457 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/menuspec.rb
-#                              Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-# based on tkmenubar.rb :
-#   Copyright (C) 1998 maeda shugo. All rights reserved.
-#   This file can be distributed under the terms of the Ruby.
-#
-# The format of the menu_spec is:
-#   [ menubutton_info, menubutton_info, ... ]
-#
-# The format of the menubutton_info is:
-#   [ menubutton_info, entry_info, entry_info, ... ]
-#
-# And each format of *_info is:
-#   [
-#     [text, underline, configs], # menu button/entry (*1)
-#     [label, command, underline, accelerator, configs],   # command entry
-#     [label, TkVar_obj, underline, accelerator, configs], # checkbutton entry
-#     [label, [TkVar_obj, value],
-#                        underline, accelerator, configs], # radiobutton entry
-#     [label, [[...menu_info...], [...menu_info...], ...],
-#                        underline, accelerator, configs], # cascade entry (*2)
-#     '---', # separator
-#     ...
-#   ]
-#
-# A menu_info is an array of menu entries:
-#   [ entry_info, entry_info, ... ]
-#
-#
-# underline, accelerator, and configs are optional parameters.
-# Hashes are OK instead of Arrays. Then the entry type ('command',
-# 'checkbutton', 'radiobutton' or 'cascade') is given by 'type' key
-# (e.g. :type=>'cascade'). When type is 'cascade', an array of menu_info
-# is acceptable for 'menu' key (then, create sub-menu).
-#
-# If the value of underline is true instead of an integer,
-# check whether the text/label string contains a '&' character.
-# When includes, the first '&' is removed and its following character is
-# converted the corresponding 'underline' option (first '&' is removed).
-# Else if the value of underline is a String or a Regexp,
-# use the result of label.index(underline) as the index of underline
-# (don't remove matched substring).
-#
-# NOTE: (*1)
-#   If you want to make special menus (*.help for UNIX, *.system for Win,
-#   and *.apple for Mac), append 'menu_name'=>name (name is 'help' for UNIX,
-#   'system' for Win, and 'apple' for Mac) option to the configs hash of
-#   menu button/entry information.
-#
-# NOTE: (*2)
-#   If you want to configure a cascade menu, add :menu_config=>{...configs..}
-#   to the configs of the cascade entry.
-
-module TkMenuSpec
-  extend TkMenuSpec
-
-  MENUSPEC_OPTKEYS = [ 'layout_proc' ]
-
-  def _create_menu(parent, menu_info, menu_name = nil,
-                   tearoff = false, default_opts = nil)
-    if tearoff.kind_of?(Hash)
-      default_opts = tearoff
-      tearoff = false
-    end
-
-    if menu_name.kind_of?(Hash)
-      default_opts = menu_name
-      menu_name = nil
-      tearoff = false
-    end
-
-    if default_opts.kind_of?(Hash)
-      orig_opts = _symbolkey2str(default_opts)
-    else
-      orig_opts = {}
-    end
-
-    tearoff = orig_opts.delete('tearoff') if orig_opts.key?('tearoff')
-    tearoff = false unless tearoff # nil --> false
-
-    if menu_name
-      #menu = Tk::Menu.new(parent, :widgetname=>menu_name, :tearoff=>tearoff)
-      # --> use current TkMenu class
-      menu = TkMenu.new(parent, :widgetname=>menu_name, :tearoff=>tearoff)
-    else
-      #menu = Tk::Menu.new(parent, :tearoff=>tearoff)
-      # --> use current TkMenu class
-      menu = TkMenu.new(parent, :tearoff=>tearoff)
-    end
-
-    for item_info in menu_info
-      if item_info.kind_of?(Hash)
-        options = orig_opts.dup
-        options.update(_symbolkey2str(item_info))
-        item_type = (options.delete('type') || 'command').to_s
-        menu_name = options.delete('menu_name')
-        menu_opts = orig_opts.dup
-        menu_opts.update(_symbolkey2str(options.delete('menu_config') || {}))
-        if item_type == 'cascade' && options['menu'].kind_of?(Array)
-          # create cascade menu
-          submenu = _create_menu(menu, options['menu'], menu_name,
-                                 tearoff, menu_opts)
-          options['menu'] = submenu
-        end
-        case options['underline']
-        when String, Regexp
-          if options['label'] &&
-              (idx = options['label'].index(options['underline']))
-            options['underline'] = idx
-          else
-            options['underline'] = -1
-          end
-        when true
-          if options['label'] && (idx = options['label'].index('&'))
-            options['label'] = options['label'].dup
-            options['label'][idx] = ''
-            options['underline'] = idx
-          else
-            options['underline'] = -1
-          end
-        end
-        menu.add(item_type, options)
-
-      elsif item_info.kind_of?(Array)
-        options = orig_opts.dup
-
-        options['label'] = item_info[0] if item_info[0]
-
-        case item_info[1]
-        when TkVariable
-          # checkbutton
-          item_type = 'checkbutton'
-          options['variable'] = item_info[1]
-          options['onvalue']  = true
-          options['offvalue'] = false
-
-        when Array
-          # radiobutton or cascade
-          if item_info[1][0].kind_of?(TkVariable)
-            # radiobutton
-            item_type = 'radiobutton'
-            options['variable'] = item_info[1][0]
-            options['value'] = item_info[1][1] if item_info[1][1]
-
-          else
-            # cascade
-            item_type = 'cascade'
-            menu_opts = orig_opts.dup
-            if item_info[4] && item_info[4].kind_of?(Hash)
-              opts = _symbolkey2str(item_info[4])
-              menu_name = opts.delete('menu_name')
-              menu_config = opts.delete('menu_config') || {}
-              menu_opts.update(_symbolkey2str(menu_config))
-            end
-            submenu = _create_menu(menu, item_info[1], menu_name,
-                                   tearoff, menu_opts)
-            options['menu'] = submenu
-          end
-
-        else
-          # command
-          item_type = 'command'
-          options['command'] = item_info[1] if item_info[1]
-        end
-
-        options['underline'] = item_info[2] if item_info[2]
-        options['accelerator'] = item_info[3] if item_info[3]
-        if item_info[4] && item_info[4].kind_of?(Hash)
-          opts = _symbolkey2str(item_info[4])
-          if item_type == 'cascade'
-            opts.delete('menu_name')
-            opts.delete('menu_config')
-          end
-          options.update(opts)
-        end
-
-        case options['underline']
-        when String, Regexp
-          if options['label'] &&
-              (idx = options['label'].index(options['underline']))
-            options['underline'] = idx
-          else
-            options['underline'] = -1
-          end
-        when true
-          if options['label'] && (idx = options['label'].index('&'))
-            options['label'] = options['label'].dup
-            options['label'][idx] = ''
-            options['underline'] = idx
-          else
-            options['underline'] = -1
-          end
-        end
-
-        menu.add(item_type, options)
-
-      elsif /^-+$/ =~ item_info
-        menu.add('separator')
-
-      else
-        menu.add('command', 'label' => item_info)
-      end
-    end
-
-    menu
-  end
-  private :_create_menu
-
-  def _use_menubar?(parent)
-    use_menubar = false
-    if parent.kind_of?(Tk::Root) || parent.kind_of?(Tk::Toplevel)
-      true
-    elsif parent.current_configinfo.has_key?('menu')
-      true
-    else
-      false
-    end
-  end
-  private :_use_menubar?
-
-  def _create_menu_for_menubar(parent)
-    #unless (mbar = parent.menu).kind_of?(TkMenu)
-    # --> use current TkMenu class
-    mbar = parent.menu
-    unless mbar.kind_of?(Tk::Menu) || mbar.kind_of?(TkMenu)
-      #mbar = Tk::Menu.new(parent, :tearoff=>false)
-      mbar = TkMenu.new(parent, :tearoff=>false)
-      parent.menu(mbar)
-    end
-    mbar
-  end
-  private :_create_menu_for_menubar
-
-  def _create_menubutton(parent, menu_info, tearoff=false, default_opts = {})
-    btn_info = menu_info[0]
-
-    if tearoff.kind_of?(Hash)
-      default_opts = tearoff
-      tearoff = false
-    end
-
-    if default_opts.kind_of?(Hash)
-      default_opts = _symbolkey2str(default_opts)
-
-      if default_opts.has_key?('layout_proc')
-        layout_proc = default_opts.delete('layout_proc')
-      end
-
-      _vertical_mbar_bind_proc = proc{|m, dir|
-        Tk::Menu::TkInternalFunction.next_menu(m, dir) rescue nil
-        # ignore error when the internal function doesn't exist
-      }
-
-      case layout_proc
-      when :vertical, 'vertical', :vertical_left, 'vertical_left'
-        layout_proc = proc{|_parent, _mbtn|
-          _mbtn.direction :right
-          _mbtn.pack(:side=>:top, :fill=>:x)
-
-          menu = _mbtn.menu
-          menu.bind('Tab', _vertical_mbar_bind_proc, :widget, 'forward')
-          menu.bind('Alt-Tab', _vertical_mbar_bind_proc, :widget, 'backward')
-        }
-      when :vertical_right, 'vertical_right'
-        layout_proc = proc{|_parent, _mbtn|
-          _mbtn.direction :left
-          _mbtn.pack(:side=>:top, :fill=>:x)
-
-          menu = _mbtn.menu
-          menu.bind('Tab', _vertical_mbar_bind_proc, :widget, 'forward')
-          menu.bind('Alt-Tab', _vertical_mbar_bind_proc, :widget, 'backward')
-        }
-      when :horizontal, 'horizontal'
-        layout_proc = proc{|_parent, _mbtn| _mbtn.pack(:side=>:left)}
-      else
-        # do nothing
-      end
-    end
-
-    keys = (default_opts)? default_opts.dup: {}
-
-    tearoff = keys.delete('tearoff') if keys.key?('tearoff')
-    tearoff = false unless tearoff # nil --> false
-
-    if _use_menubar?(parent) && ! layout_proc
-      # menubar by menu entries
-      mbar = _create_menu_for_menubar(parent)
-
-      menu_name = nil
-
-      if btn_info.kind_of?(Hash)
-        keys.update(_symbolkey2str(btn_info))
-        menu_name = keys.delete('menu_name')
-        keys['label'] = keys.delete('text') || ''
-
-        case keys['underline']
-        when String, Regexp
-          if idx = keys['label'].index(keys['underline'])
-            keys['underline'] = idx
-          else
-            keys['underline'] = -1
-          end
-        when true
-          if idx = keys['label'].index('&')
-            keys['label'] = keys['label'].dup
-            keys['label'][idx] = ''
-            keys['underline'] = idx
-          else
-            keys['underline'] = -1
-          end
-        end
-
-      elsif btn_info.kind_of?(Array)
-        keys['label'] = btn_info[0] if btn_info[0]
-
-        case btn_info[1]
-        when Integer
-          keys['underline'] = btn_info[1]
-        when String, Regexp
-          if idx = keys['label'].index(btn_info[1])
-            keys['underline'] = idx
-          else
-            keys['underline'] = -1
-          end
-        when true
-          if idx = keys['label'].index('&')
-            keys['label'] = keys['label'].dup
-            keys['label'][idx] = ''
-            keys['underline'] = idx
-          else
-            keys['underline'] = -1
-          end
-        end
-
-        if btn_info[2]&&btn_info[2].kind_of?(Hash)
-          keys.update(_symbolkey2str(btn_info[2]))
-          menu_name = keys.delete('menu_name')
-        end
-
-      else
-        keys = {:label=>btn_info}
-      end
-
-      menu = _create_menu(mbar, menu_info[1..-1], menu_name,
-                          tearoff, default_opts)
-      menu.tearoff(tearoff)
-
-      keys['menu'] = menu
-      mbar.add('cascade', keys)
-
-      [mbar, menu]
-
-    else
-      # menubar by menubuttons
-      #mbtn = Tk::Menubutton.new(parent)
-      # --> use current TkMenubutton class
-      mbtn = TkMenubutton.new(parent)
-
-      menu_name = nil
-
-      if btn_info.kind_of?(Hash)
-        keys.update(_symbolkey2str(btn_info))
-        menu_name = keys.delete('menu_name')
-        keys['text'] = keys.delete('label') || ''
-        case keys['underline']
-        when String, Regexp
-          if idx = keys['text'].index(keys['underline'])
-            keys['underline'] = idx
-          else
-            keys['underline'] = -1
-          end
-        when true
-          if idx = keys['text'].index('&')
-            keys['text'] = keys['text'].dup
-            keys['text'][idx] = ''
-            keys['underline'] = idx
-          else
-            keys['underline'] = -1
-          end
-        end
-        mbtn.configure(keys)
-
-      elsif btn_info.kind_of?(Array)
-        case btn_info[1]
-        when String, Regexp
-          if btn_info[0] && (idx = btn_info[0].index(btn_info[1]))
-            btn_info[1] = idx
-          else
-            btn_info[1] = -1
-          end
-        when true
-          if btn_info[0] && (idx = btn_info[0].index('&'))
-            btn_info[0] = btn_info[0].dup
-            btn_info[0][idx] = ''
-            btn_info[1] = idx
-          else
-            btn_info[1] = -1
-          end
-        end
-        mbtn.configure('text', btn_info[0]) if btn_info[0]
-        mbtn.configure('underline', btn_info[1]) if btn_info[1]
-        # mbtn.configure('accelerator', btn_info[2]) if btn_info[2]
-        if btn_info[2]&&btn_info[2].kind_of?(Hash)
-          keys.update(_symbolkey2str(btn_info[2]))
-          menu_name = keys.delete('menu_name')
-          mbtn.configure(keys)
-        end
-
-      else
-        mbtn.configure('text', btn_info)
-      end
-
-      menu = _create_menu(mbtn, menu_info[1..-1], menu_name,
-                          tearoff, default_opts)
-      mbtn.menu(menu)
-
-      if layout_proc.kind_of?(Proc) || layout_proc.kind_of?(Method)
-        # e.g. make a vertical menubar
-        #  :layout_proc => proc{|parent, btn| btn.pack(:side=>:top, :fill=>:x)}
-        layout_proc.call(parent, mbtn)
-      else
-        mbtn.pack('side' => 'left')
-      end
-
-      [mbtn, menu]
-    end
-  end
-  private :_create_menubutton
-
-  def _create_menubar(parent, menu_spec, tearoff = false, opts = nil)
-    if tearoff.kind_of?(Hash)
-      opts = tearoff
-      tearoff = false
-    end
-    tearoff = false unless tearoff # nil --> false
-    menu_spec.each{|menu_info|
-      _create_menubutton(parent, menu_info, tearoff, opts)
-    }
-    parent
-  end
-  private :_create_menubar
-
-  def _get_cascade_menus(menu)
-    menus = []
-    (0..(menu.index('last'))).each{|idx|
-      if menu.menutype(idx) == 'cascade'
-        submenu = menu.entrycget(idx, 'menu')
-        menus << [submenu, _get_cascade_menus(submenu)]
-      end
-    }
-    menus
-  end
-  private :_get_cascade_menus
-end
diff --git a/ext/tk/lib/tk/message.rb b/ext/tk/lib/tk/message.rb
deleted file mode 100644
index 432e9667bd..0000000000
--- a/ext/tk/lib/tk/message.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/message.rb : treat message widget
-#
-require 'tk'
-require 'tk/label'
-
-class Tk::Message<Tk::Label
-  TkCommandNames = ['message'.freeze].freeze
-  WidgetClassName = 'Message'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-  #def create_self(keys)
-  #  if keys and keys != None
-  #    tk_call_without_enc('message', @path, *hash_kv(keys, true))
-  #  else
-  #    tk_call_without_enc('message', @path)
-  #  end
-  #end
-  private :create_self
-end
-
-#TkMessage = Tk::Message unless Object.const_defined? :TkMessage
-#Tk.__set_toplevel_aliases__(:Tk, Tk::Message, :TkMessage)
-Tk.__set_loaded_toplevel_aliases__('tk/message.rb', :Tk, Tk::Message,
-                                   :TkMessage)
diff --git a/ext/tk/lib/tk/mngfocus.rb b/ext/tk/lib/tk/mngfocus.rb
deleted file mode 100644
index 06b20eb6ab..0000000000
--- a/ext/tk/lib/tk/mngfocus.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: false
-#
-#   tk/mngfocus.rb : methods for Tcl/Tk standard library 'focus.tcl'
-#                           by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
-#
-require 'tk'
-
-module TkManageFocus
-  extend Tk
-
-  TkCommandNames = [
-    'tk_focusFollowMouse'.freeze,
-    'tk_focusNext'.freeze,
-    'tk_focusPrev'.freeze
-  ].freeze
-
-  def TkManageFocus.followsMouse
-    tk_call_without_enc('tk_focusFollowsMouse')
-  end
-
-  def TkManageFocus.next(win)
-    tk_tcl2ruby(tk_call('tk_focusNext', win))
-  end
-  def focusNext
-    TkManageFocus.next(self)
-  end
-
-  def TkManageFocus.prev(win)
-    tk_tcl2ruby(tk_call('tk_focusPrev', win))
-  end
-  def focusPrev
-    TkManageFocus.prev(self)
-  end
-end
diff --git a/ext/tk/lib/tk/msgcat.rb b/ext/tk/lib/tk/msgcat.rb
deleted file mode 100644
index 1e98889faf..0000000000
--- a/ext/tk/lib/tk/msgcat.rb
+++ /dev/null
@@ -1,300 +0,0 @@
-# frozen_string_literal: false
-#
-#   tk/msgcat.rb : methods for Tcl message catalog
-#                     by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
-#
-require 'tk'
-
-#class TkMsgCatalog
-class TkMsgCatalog < TkObject
-  include TkCore
-  extend Tk
-  #extend TkMsgCatalog
-
-  TkCommandNames = [
-    '::msgcat::mc'.freeze,
-    '::msgcat::mcmax'.freeze,
-    '::msgcat::mclocale'.freeze,
-    '::msgcat::mcpreferences'.freeze,
-    '::msgcat::mcload'.freeze,
-    '::msgcat::mcset'.freeze,
-    '::msgcat::mcmset'.freeze,
-    '::msgcat::mcunknown'.freeze
-  ].freeze
-
-  tk_call_without_enc('package', 'require', 'Tcl', '8.2')
-
-  PACKAGE_NAME = 'msgcat'.freeze
-  def self.package_name
-    PACKAGE_NAME
-  end
-
-  if self.const_defined? :FORCE_VERSION
-    tk_call_without_enc('package', 'require', 'msgcat', FORCE_VERSION)
-  else
-    tk_call_without_enc('package', 'require', 'msgcat')
-  end
-
-  MSGCAT_EXT = '.msg'
-
-  UNKNOWN_CBTBL = TkUtil.untrust(Hash.new{|hash,key| hash[key] = {}})
-
-  TkCore::INTERP.add_tk_procs('::msgcat::mcunknown', 'args', <<-'EOL')
-    if {[set st [catch {eval {ruby_cmd TkMsgCatalog callback} [namespace current] $args} ret]] != 0} {
-       #return -code $st $ret
-       set idx [string first "\n\n" $ret]
-       if {$idx > 0} {
-          return -code $st \
-                 -errorinfo [string range $ret [expr $idx + 2] \
-                                               [string length $ret]] \
-                 [string range $ret 0 [expr $idx - 1]]
-       } else {
-          return -code $st $ret
-       }
-    } else {
-        return $ret
-    }
-  EOL
-
-  def self.callback(namespace, locale, src_str, *args)
-    src_str = sprintf(src_str, *args) unless args.empty?
-    cmd_tbl = TkMsgCatalog::UNKNOWN_CBTBL[TkCore::INTERP.__getip]
-    cmd = cmd_tbl[namespace]
-    cmd = cmd_tbl['::'] unless cmd  # use global scope as interp default
-    return src_str unless cmd       # no cmd -> return src-str (default action)
-    begin
-      cmd.call(locale, src_str)
-    rescue SystemExit
-      exit(0)
-    rescue Interrupt
-      exit!(1)
-    rescue Exception => e
-      begin
-        msg = _toUTF8(e.class.inspect) + ': ' +
-              _toUTF8(e.message) + "\n" +
-              "\n---< backtrace of Ruby side >-----\n" +
-              _toUTF8(e.backtrace.join("\n")) +
-              "\n---< backtrace of Tk side >-------"
-        if TkCore::WITH_ENCODING
-          msg.force_encoding('utf-8')
-        else
-          msg.instance_variable_set(:@encoding, 'utf-8')
-        end
-      rescue Exception
-        msg = e.class.inspect + ': ' + e.message + "\n" +
-              "\n---< backtrace of Ruby side >-----\n" +
-              e.backtrace.join("\n") +
-              "\n---< backtrace of Tk side >-------"
-      end
-      fail(e, msg)
-    end
-  end
-
-  def initialize(namespace = nil)
-    if namespace.kind_of?(TkNamespace)
-      @namespace = namespace
-    elsif namespace == nil
-      @namespace = TkNamespace.new('::')  # global namespace
-    else
-      @namespace = TkNamespace.new(namespace)
-    end
-    @path = @namespace.path
-
-    @msgcat_ext = '.msg'
-  end
-  attr_accessor :msgcat_ext
-
-  def method_missing(id, *args)
-    # locale(src, trans) ==> set_translation(locale, src, trans)
-    loc = id.id2name
-    case args.length
-    when 0 # set locale
-      self.locale=(loc)
-
-    when 1 # src only, or trans_list
-      if args[0].kind_of?(Array)
-        # trans_list
-        #list = args[0].collect{|src, trans|
-        #  [ Tk::UTF8_String.new(src), Tk::UTF8_String.new(trans) ]
-        #}
-        self.set_translation_list(loc, args[0])
-      else
-        # src
-        #self.set_translation(loc, Tk::UTF8_String.new(args[0]))
-        self.set_translation(loc, args[0])
-      end
-
-    when 2 # src and trans, or, trans_list and enc
-      if args[0].kind_of?(Array)
-        # trans_list
-        self.set_translation_list(loc, *args)
-      else
-        #self.set_translation(loc, args[0], Tk::UTF8_String.new(args[1]))
-        self.set_translation(loc, *args)
-      end
-
-    when 3 # src and trans and enc
-      self.set_translation(loc, *args)
-
-    else
-      super(id, *args)
-#      fail NameError, "undefined method `#{name}' for #{self.to_s}", error_at
-
-    end
-  end
-
-  # *args ::= form, arg, arg, ...
-  def self.translate(*args)
-    dst = args.collect{|src|
-      tk_call_without_enc('::msgcat::mc', _get_eval_string(src, true))
-    }
-    Tk.UTF8_String(sprintf(*dst))
-  end
-  class << self
-    alias mc translate
-    alias [] translate
-  end
-  def translate(*args)
-    dst = args.collect{|src|
-      @namespace.eval{tk_call_without_enc('::msgcat::mc',
-                                          _get_eval_string(src, true))}
-    }
-    Tk.UTF8_String(sprintf(*dst))
-  end
-  alias mc translate
-  alias [] translate
-
-  def self.maxlen(*src_strings)
-    tk_call('::msgcat::mcmax', *src_strings).to_i
-  end
-  def maxlen(*src_strings)
-    @namespace.eval{tk_call('::msgcat::mcmax', *src_strings).to_i}
-  end
-
-  def self.locale
-    tk_call('::msgcat::mclocale')
-  end
-  def locale
-    @namespace.eval{tk_call('::msgcat::mclocale')}
-  end
-
-  def self.locale=(locale)
-    tk_call('::msgcat::mclocale', locale)
-  end
-  def locale=(locale)
-    @namespace.eval{tk_call('::msgcat::mclocale', locale)}
-  end
-
-  def self.preferences
-    tk_split_simplelist(tk_call('::msgcat::mcpreferences'))
-  end
-  def preferences
-    tk_split_simplelist(@namespace.eval{tk_call('::msgcat::mcpreferences')})
-  end
-
-  def self.load_tk(dir)
-    number(tk_call('::msgcat::mcload', dir))
-  end
-
-  def self.load_rb(dir)
-    count = 0
-    preferences().each{|loc|
-      file = File.join(dir, loc + self::MSGCAT_EXT)
-      if File.readable?(file)
-        count += 1
-        if TkCore::WITH_ENCODING
-          eval(IO.read(file, :encoding=>"ASCII-8BIT"))
-        else
-          eval(IO.read(file))
-        end
-      end
-    }
-    count
-  end
-
-  def load_tk(dir)
-    number(@namespace.eval{tk_call('::msgcat::mcload', dir)})
-  end
-
-  def load_rb(dir)
-    count = 0
-    preferences().each{|loc|
-      file = File.join(dir, loc + @msgcat_ext)
-      if File.readable?(file)
-        count += 1
-        if TkCore::WITH_ENCODING
-          @namespace.eval(IO.read(file, :encoding=>"ASCII-8BIT"))
-        else
-          @namespace.eval(IO.read(file))
-        end
-      end
-    }
-    count
-  end
-
-  def self.load(dir)
-    self.load_rb(dir)
-  end
-  alias load load_rb
-
-  def self.set_translation(locale, src_str, trans_str=None, enc='utf-8')
-    if trans_str && trans_str != None
-      trans_str = Tk.UTF8_String(_toUTF8(trans_str, enc))
-      Tk.UTF8_String(ip_eval_without_enc("::msgcat::mcset {#{locale}} {#{_get_eval_string(src_str, true)}} {#{trans_str}}"))
-    else
-      Tk.UTF8_String(ip_eval_without_enc("::msgcat::mcset {#{locale}} {#{_get_eval_string(src_str, true)}}"))
-    end
-  end
-  def set_translation(locale, src_str, trans_str=None, enc='utf-8')
-    if trans_str && trans_str != None
-      trans_str = Tk.UTF8_String(_toUTF8(trans_str, enc))
-      Tk.UTF8_String(@namespace.eval{
-                       ip_eval_without_enc("::msgcat::mcset {#{locale}} {#{_get_eval_string(src_str, true)}} {#{trans_str}}")
-                     })
-    else
-      Tk.UTF8_String(@namespace.eval{
-                       ip_eval_without_enc("::msgcat::mcset {#{locale}} {#{_get_eval_string(src_str, true)}}")
-                     })
-    end
-  end
-
-  def self.set_translation_list(locale, trans_list, enc='utf-8')
-    # trans_list ::= [ [src, trans], [src, trans], ... ]
-    list = []
-    trans_list.each{|src, trans|
-      if trans && trans != None
-        list << _get_eval_string(src, true)
-        list << Tk.UTF8_String(_toUTF8(trans, enc))
-      else
-        list << _get_eval_string(src, true) << ''
-      end
-    }
-    #number(tk_call_without_enc('::msgcat::mcmset', locale, list))
-    number(ip_eval_without_enc("::msgcat::mcmset {#{locale}} {#{_get_eval_string(list)}}"))
-  end
-  def set_translation_list(locale, trans_list, enc='utf-8')
-    # trans_list ::= [ [src, trans], [src, trans], ... ]
-    list = []
-    trans_list.each{|src, trans|
-      if trans && trans != None
-        list << _get_eval_string(src, true)
-        list << Tk.UTF8_String(_toUTF8(trans, enc))
-      else
-        list << _get_eval_string(src, true) << ''
-      end
-    }
-    number(@namespace.eval{
-             #tk_call_without_enc('::msgcat::mcmset', locale, list)
-             ip_eval_without_enc("::msgcat::mcmset {#{locale}} {#{_get_eval_string(list)}}")
-           })
-  end
-
-  def self.def_unknown_proc(cmd=Proc.new)
-    TkMsgCatalog::UNKNOWN_CBTBL[TkCore::INTERP.__getip]['::'] = cmd
-  end
-  def def_unknown_proc(cmd=Proc.new)
-    TkMsgCatalog::UNKNOWN_CBTBL[TkCore::INTERP.__getip][@namespace.path] = cmd
-  end
-end
-
-TkMsgCat = TkMsgCatalog
diff --git a/ext/tk/lib/tk/namespace.rb b/ext/tk/lib/tk/namespace.rb
deleted file mode 100644
index 1cab6fa060..0000000000
--- a/ext/tk/lib/tk/namespace.rb
+++ /dev/null
@@ -1,547 +0,0 @@
-# frozen_string_literal: false
-#
-#   tk/namespace.rb : methods to manipulate Tcl/Tk namespace
-#                           by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
-#
-require 'tk'
-
-class TkNamespace < TkObject
-  extend Tk
-
-  TkCommandNames = [
-    'namespace'.freeze,
-  ].freeze
-
-  Tk_Namespace_ID_TBL = TkCore::INTERP.create_table
-
-  (Tk_Namespace_ID = ["ns".freeze, TkUtil.untrust("00000")]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  Tk_NsCode_RetObjID_TBL = TkCore::INTERP.create_table
-
-  TkCore::INTERP.init_ip_env{
-    Tk_Namespace_ID_TBL.mutex.synchronize{ Tk_Namespace_ID_TBL.clear }
-    Tk_NsCode_RetObjID_TBL.mutex.synchronize{ Tk_NsCode_RetObjID_TBL.clear }
-  }
-
-  def TkNamespace.id2obj(id)
-    Tk_Namespace_ID_TBL.mutex.synchronize{
-      Tk_Namespace_ID_TBL[id]? Tk_Namespace_ID_TBL[id]: id
-    }
-  end
-
-  #####################################
-
-  class Ensemble < TkObject
-    def __cget_cmd
-      ['namespace', 'ensemble', 'configure', self.path]
-    end
-    private :__cget_cmd
-
-    def __config_cmd
-      ['namespace', 'ensemble', 'configure', self.path]
-    end
-    private :__config_cmd
-
-    def __configinfo_struct
-      {:key=>0, :alias=>nil, :db_name=>nil, :db_class=>nil,
-        :default_value=>nil, :current_value=>2}
-    end
-    private :__configinfo_struct
-
-    def __boolval_optkeys
-      ['prefixes']
-    end
-    private :__boolval_optkeys
-
-    def __listval_optkeys
-      ['map', 'subcommands', 'unknown']
-    end
-    private :__listval_optkeys
-
-    def self.exist?(ensemble)
-      bool(tk_call('namespace', 'ensemble', 'exists', ensemble))
-    end
-
-    def initialize(keys = {})
-      @ensemble = @path = tk_call('namespace', 'ensemble', 'create', keys)
-    end
-
-    def cget(slot)
-      if slot == :namespace || slot == 'namespace'
-        ns = super(slot)
-        Tk_Namespace_ID_TBL.mutex.synchronize{
-          if TkNamespace::Tk_Namespace_ID_TBL.key?(ns)
-            TkNamespace::Tk_Namespace_ID_TBL[ns]
-          else
-            ns
-          end
-        }
-      else
-        super(slot)
-      end
-    end
-    def cget_strict(slot)
-      if slot == :namespace || slot == 'namespace'
-        ns = super(slot)
-        Tk_Namespace_ID_TBL.mutex.synchronize{
-          if TkNamespace::Tk_Namespace_ID_TBL.key?(ns)
-            TkNamespace::Tk_Namespace_ID_TBL[ns]
-          else
-            ns
-          end
-        }
-      else
-        super(slot)
-      end
-    end
-
-    def configinfo(slot = nil)
-      if slot
-        if slot == :namespace || slot == 'namespace'
-          val = super(slot)
-          Tk_Namespace_ID_TBL.mutex.synchronize{
-            if TkNamespace::Tk_Namespace_ID_TBL.key?(val)
-              val = TkNamespace::Tk_Namespace_ID_TBL[val]
-            end
-          }
-        else
-          val = super(slot)
-        end
-
-        if TkComm::GET_CONFIGINFO_AS_ARRAY
-          [slot.to_s, val]
-        else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-          {slot.to_s => val}
-        end
-
-      else
-        info = super()
-
-        if TkComm::GET_CONFIGINFO_AS_ARRAY
-          Tk_Namespace_ID_TBL.mutex.synchronize{
-            info.map!{|inf|
-              if inf[0] == 'namespace' &&
-                  TkNamespace::Tk_Namespace_ID_TBL.key?(inf[-1])
-                [inf[0], TkNamespace::Tk_Namespace_ID_TBL[inf[-1]]]
-              else
-                inf
-              end
-            }
-          }
-        else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-          val = info['namespace']
-          Tk_Namespace_ID_TBL.mutex.synchronize{
-            if TkNamespace::Tk_Namespace_ID_TBL.key?(val)
-              info['namespace'] = TkNamespace::Tk_Namespace_ID_TBL[val]
-            end
-          }
-        end
-
-        info
-      end
-    end
-
-    def exists?
-      bool(tk_call('namespace', 'ensemble', 'exists', @path))
-    end
-  end
-
-  #####################################
-
-  class ScopeArgs < Array
-    include Tk
-
-    # alias __tk_call             tk_call
-    # alias __tk_call_without_enc tk_call_without_enc
-    # alias __tk_call_with_enc    tk_call_with_enc
-    def tk_call(*args)
-      #super('namespace', 'eval', @namespace, *args)
-      args = args.collect{|arg| (s = _get_eval_string(arg, true))? s: ''}
-      super('namespace', 'eval', @namespace,
-            TkCore::INTERP._merge_tklist(*args))
-    end
-    def tk_call_without_enc(*args)
-      #super('namespace', 'eval', @namespace, *args)
-      args = args.collect{|arg| (s = _get_eval_string(arg, true))? s: ''}
-      super('namespace', 'eval', @namespace,
-            TkCore::INTERP._merge_tklist(*args))
-    end
-    def tk_call_with_enc(*args)
-      #super('namespace', 'eval', @namespace, *args)
-      args = args.collect{|arg| (s = _get_eval_string(arg, true))? s: ''}
-      super('namespace', 'eval', @namespace,
-            TkCore::INTERP._merge_tklist(*args))
-    end
-
-    def initialize(namespace, *args)
-      @namespace = namespace
-      super(args.size)
-      self.replace(args)
-    end
-  end
-
-  #####################################
-
-  class NsCode < TkObject
-    def initialize(scope, use_obj_id = false)
-      @scope = scope + ' '
-      @use_obj_id = use_obj_id
-    end
-    def path
-      @scope
-    end
-    def to_eval
-      @scope
-    end
-    def call(*args)
-      ret = TkCore::INTERP._eval_without_enc(@scope + array2tk_list(args))
-      if @use_obj_id
-        ret = TkNamespace::Tk_NsCode_RetObjID_TBL.delete(ret.to_i)
-      end
-      ret
-    end
-  end
-
-  #####################################
-
-  def install_cmd(cmd)
-    lst = tk_split_simplelist(super(cmd), false, false)
-    if lst[1] =~ /^::/
-      lst[1] = @fullname
-    else
-      lst.insert(1, @fullname)
-    end
-    TkCore::INTERP._merge_tklist(*lst)
-  end
-
-  alias __tk_call             tk_call
-  alias __tk_call_without_enc tk_call_without_enc
-  alias __tk_call_with_enc    tk_call_with_enc
-  def tk_call(*args)
-    #super('namespace', 'eval', @fullname, *args)
-    args = args.collect{|arg| (s = _get_eval_string(arg, true))? s: ''}
-    super('namespace', 'eval', @fullname,
-          TkCore::INTERP._merge_tklist(*args))
-  end
-  def tk_call_without_enc(*args)
-    #super('namespace', 'eval', @fullname, *args)
-    args = args.collect{|arg| (s = _get_eval_string(arg, true))? s: ''}
-    super('namespace', 'eval', @fullname,
-          TkCore::INTERP._merge_tklist(*args))
-  end
-  def tk_call_with_enc(*args)
-    #super('namespace', 'eval', @fullname, *args)
-    args = args.collect{|arg| (s = _get_eval_string(arg, true))? s: ''}
-    super('namespace', 'eval', @fullname,
-          TkCore::INTERP._merge_tklist(*args))
-  end
-  alias ns_tk_call             tk_call
-  alias ns_tk_call_without_enc tk_call_without_enc
-  alias ns_tk_call_with_enc    tk_call_with_enc
-
-  def initialize(name = nil, parent = nil)
-    unless name
-      Tk_Namespace_ID.mutex.synchronize{
-        # name = Tk_Namespace_ID.join('')
-        name = Tk_Namespace_ID.join(TkCore::INTERP._ip_id_)
-        Tk_Namespace_ID[1].succ!
-      }
-    end
-    name = __tk_call('namespace', 'current') if name == ''
-    if parent
-      if parent =~ /^::/
-        if name =~ /^::/
-          @fullname = parent + name
-        else
-          @fullname = parent +'::'+ name
-        end
-      else
-        ancestor = __tk_call('namespace', 'current')
-        ancestor = '' if ancestor == '::'
-        if name =~ /^::/
-          @fullname = ancestor + '::' + parent + name
-        else
-          @fullname = ancestor + '::'+ parent +'::'+ name
-        end
-      end
-    else # parent == nil
-      ancestor = __tk_call('namespace', 'current')
-      ancestor = '' if ancestor == '::'
-      if name =~ /^::/
-        @fullname = name
-      else
-        @fullname = ancestor + '::' + name
-      end
-    end
-    @path = @fullname
-    @parent = __tk_call('namespace', 'qualifiers', @fullname)
-    @name = __tk_call('namespace', 'tail', @fullname)
-
-    # create namespace
-    __tk_call('namespace', 'eval', @fullname, '')
-
-    Tk_Namespace_ID_TBL.mutex.synchronize{
-      Tk_Namespace_ID_TBL[@fullname] = self
-    }
-  end
-
-  def self.children(*args)
-    # args ::= [<namespace>] [<pattern>]
-    # <pattern> must be glob-style pattern
-    tk_split_simplelist(tk_call('namespace', 'children', *args)).collect{|ns|
-      # ns is fullname
-      Tk_Namespace_ID_TBL.mutex.synchronize{
-        if Tk_Namespace_ID_TBL.key?(ns)
-          Tk_Namespace_ID_TBL[ns]
-        else
-          ns
-        end
-      }
-    }
-  end
-  def children(pattern=None)
-    TkNamespace.children(@fullname, pattern)
-  end
-
-  def self.code(script = Proc.new)
-    TkNamespace.new('').code(script)
-  end
-=begin
-  def code(script = Proc.new)
-    if script.kind_of?(String)
-      cmd = proc{|*args| ScopeArgs.new(@fullname,*args).instance_eval(script)}
-    elsif script.kind_of?(Proc)
-      cmd = proc{|*args| ScopeArgs.new(@fullname,*args).instance_eval(&script)}
-    else
-      fail ArgumentError, "String or Proc is expected"
-    end
-    TkNamespace::NsCode.new(tk_call_without_enc('namespace', 'code',
-                                                _get_eval_string(cmd, false)))
-  end
-=end
-  def code(script = Proc.new)
-    if script.kind_of?(String)
-      cmd = proc{|*args|
-        ret = ScopeArgs.new(@fullname,*args).instance_eval(script)
-        id = ret.object_id
-        TkNamespace::Tk_NsCode_RetObjID_TBL[id] = ret
-        id
-      }
-    elsif script.kind_of?(Proc)
-      cmd = proc{|*args|
-        if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-          obj = ScopeArgs.new(@fullname,*args)
-          ret = obj.instance_exec(obj, &script)
-        else
-          ret = ScopeArgs.new(@fullname,*args).instance_eval(&script)
-        end
-        id = ret.object_id
-        TkNamespace::Tk_NsCode_RetObjID_TBL[id] = ret
-        id
-      }
-    else
-      fail ArgumentError, "String or Proc is expected"
-    end
-    TkNamespace::NsCode.new(tk_call_without_enc('namespace', 'code',
-                                                _get_eval_string(cmd, false)),
-                            true)
-  end
-
-  def self.current_path
-    tk_call('namespace', 'current')
-  end
-  def current_path
-    @fullname
-  end
-
-  def self.current
-    ns = self.current_path
-    Tk_Namespace_ID_TBL.mutex.synchronize{
-      if Tk_Namespace_ID_TBL.key?(ns)
-        Tk_Namespace_ID_TBL[ns]
-      else
-        ns
-      end
-    }
-  end
-  def current_namespace
-    # ns_tk_call('namespace', 'current')
-    # @fullname
-    self
-  end
-  alias current current_namespace
-
-  def self.delete(*ns_list)
-    tk_call('namespace', 'delete', *ns_list)
-    ns_list.each{|ns|
-      Tk_Namespace_ID_TBL.mutex.synchronize{
-        if ns.kind_of?(TkNamespace)
-          Tk_Namespace_ID_TBL.delete(ns.path)
-        else
-          Tk_Namespace_ID_TBL.delete(ns.to_s)
-        end
-      }
-    }
-  end
-  def delete
-    TkNamespece.delete(@fullname)
-  end
-
-  def self.ensemble_create(*keys)
-    tk_call('namespace', 'ensemble', 'create', *hash_kv(keys))
-  end
-  def self.ensemble_configure(cmd, slot, value=None)
-    if slot.kind_of?(Hash)
-      tk_call('namespace', 'ensemble', 'configure', cmd, *hash_kv(slot))
-    else
-      tk_call('namespace', 'ensemble', 'configure', cmd, '-'+slot.to_s, value)
-    end
-  end
-  def self.ensemble_configinfo(cmd, slot = nil)
-    if slot
-      tk_call('namespace', 'ensemble', 'configure', cmd, '-' + slot.to_s)
-    else
-      inf = {}
-      Hash(*tk_split_simplelist(tk_call('namespace', 'ensemble', 'configure', cmd))).each{|k, v| inf[k[1..-1]] = v}
-      inf
-    end
-  end
-  def self.ensemble_exist?(cmd)
-    bool(tk_call('namespace', 'ensemble', 'exists', cmd))
-  end
-
-  def self.eval(namespace, cmd = Proc.new, *args)
-    #tk_call('namespace', 'eval', namespace, cmd, *args)
-    TkNamespace.new(namespace).eval(cmd, *args)
-  end
-=begin
-  def eval(cmd = Proc.new, *args)
-    #TkNamespace.eval(@fullname, cmd, *args)
-    #ns_tk_call(cmd, *args)
-    code_obj = code(cmd)
-    ret = code_obj.call(*args)
-    # uninstall_cmd(TkCore::INTERP._split_tklist(code_obj.path)[-1])
-    uninstall_cmd(_fromUTF8(TkCore::INTERP._split_tklist(_toUTF8(code_obj.path))[-1]))
-    tk_tcl2ruby(ret)
-  end
-=end
-  def eval(cmd = Proc.new, *args)
-    code_obj = code(cmd)
-    ret = code_obj.call(*args)
-    uninstall_cmd(_fromUTF8(TkCore::INTERP._split_tklist(_toUTF8(code_obj.path))[-1]))
-    ret
-  end
-
-  def self.exist?(ns)
-    bool(tk_call('namespace', 'exists', ns))
-  end
-  def exist?
-    TkNamespece.exist?(@fullname)
-  end
-
-  def self.export(*patterns)
-    tk_call('namespace', 'export', *patterns)
-  end
-  def self.export_with_clear(*patterns)
-    tk_call('namespace', 'export', '-clear', *patterns)
-  end
-  def export
-    TkNamespace.export(@fullname)
-  end
-  def export_with_clear
-    TkNamespace.export_with_clear(@fullname)
-  end
-
-  def self.forget(*patterns)
-    tk_call('namespace', 'forget', *patterns)
-  end
-  def forget
-    TkNamespace.forget(@fullname)
-  end
-
-  def self.import(*patterns)
-    tk_call('namespace', 'import', *patterns)
-  end
-  def self.force_import(*patterns)
-    tk_call('namespace', 'import', '-force', *patterns)
-  end
-  def import
-    TkNamespace.import(@fullname)
-  end
-  def force_import
-    TkNamespace.force_import(@fullname)
-  end
-
-  def self.inscope(namespace, script, *args)
-    tk_call('namespace', 'inscope', namespace, script, *args)
-  end
-  def inscope(script, *args)
-    TkNamespace.inscope(@fullname, script, *args)
-  end
-
-  def self.origin(cmd)
-    tk_call('namespace', 'origin', cmd)
-  end
-
-  def self.parent(namespace=None)
-    ns = tk_call('namespace', 'parent', namespace)
-    Tk_Namespace_ID_TBL.mutex.synchronize{
-      if Tk_Namespace_ID_TBL.key?(ns)
-        Tk_Namespace_ID_TBL[ns]
-      else
-        ns
-      end
-    }
-  end
-  def parent
-    tk_call('namespace', 'parent', @fullname)
-  end
-
-  def self.get_path
-    tk_call('namespace', 'path')
-  end
-  def self.set_path(*namespace_list)
-    tk_call('namespace', 'path', array2tk_list(namespace_list))
-  end
-  def set_path
-    tk_call('namespace', 'path', @fullname)
-  end
-
-  def self.qualifiers(str)
-    tk_call('namespace', 'qualifiers', str)
-  end
-
-  def self.tail(str)
-    tk_call('namespace', 'tail', str)
-  end
-
-  def self.upvar(namespace, *var_pairs)
-    tk_call('namespace', 'upvar', namespace, *(var_pairs.flatten))
-  end
-  def upvar(*var_pairs)
-    TkNamespace.inscope(@fullname, *(var_pairs.flatten))
-  end
-
-  def self.get_unknown_handler
-    tk_tcl2ruby(tk_call('namespace', 'unknown'))
-  end
-  def self.set_unknown_handler(cmd = Proc.new)
-    tk_call('namespace', 'unknown', cmd)
-  end
-
-  def self.which(name)
-    tk_call('namespace', 'which', name)
-  end
-  def self.which_command(name)
-    tk_call('namespace', 'which', '-command', name)
-  end
-  def self.which_variable(name)
-    tk_call('namespace', 'which', '-variable', name)
-  end
-end
-
-TkNamespace::Global = TkNamespace.new('::')
diff --git a/ext/tk/lib/tk/optiondb.rb b/ext/tk/lib/tk/optiondb.rb
deleted file mode 100644
index ced8a111e4..0000000000
--- a/ext/tk/lib/tk/optiondb.rb
+++ /dev/null
@@ -1,372 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/optiondb.rb : treat option database
-#
-require 'tk'
-
-module TkOptionDB
-  include Tk
-  extend Tk
-
-  TkCommandNames = ['option'.freeze].freeze
-  (CmdClassID = ['CMD_CLASS'.freeze, TkUtil.untrust('00000')]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  module Priority
-    WidgetDefault = 20
-    StartupFile   = 40
-    UserDefault   = 60
-    Interactive   = 80
-  end
-
-  def add(pat, value, pri=None)
-    tk_call('option', 'add', pat, value, pri)
-  end
-  def clear
-    tk_call_without_enc('option', 'clear')
-  end
-  def get(win, name, klass)
-    tk_call('option', 'get', win ,name, klass)
-  end
-  def readfile(file, pri=None)
-    tk_call('option', 'readfile', file, pri)
-  end
-  alias read_file readfile
-  module_function :add, :clear, :get, :readfile, :read_file
-
-  def read_entries(file, f_enc=nil)
-    if TkCore::INTERP.safe?
-      fail SecurityError,
-        "can't call 'TkOptionDB.read_entries' on a safe interpreter"
-    end
-
-    i_enc = ((Tk.encoding)? Tk.encoding : Tk.encoding_system)
-
-    unless f_enc
-      f_enc = i_enc
-    end
-
-    ent = []
-    cline = ''
-    open(file, 'r') {|f|
-      while line = f.gets
-        #cline += line.chomp!
-        cline.concat(line.chomp!)
-        case cline
-        when /\\$/    # continue
-          cline.chop!
-          next
-        when /^\s*(!|#)/     # comment
-          cline = ''
-          next
-        when /^([^:]+):(.*)$/
-          pat = $1.strip
-          val = $2.lstrip
-          p "ResourceDB: #{[pat, val].inspect}" if $DEBUG
-          pat = TkCore::INTERP._toUTF8(pat, f_enc)
-          pat = TkCore::INTERP._fromUTF8(pat, i_enc)
-          val = TkCore::INTERP._toUTF8(val, f_enc)
-          val = TkCore::INTERP._fromUTF8(val, i_enc)
-          ent << [pat, val]
-          cline = ''
-        else          # unknown --> ignore
-          cline = ''
-          next
-        end
-      end
-    }
-    ent
-  end
-  module_function :read_entries
-
-  def read_with_encoding(file, f_enc=nil, pri=None)
-    # try to read the file as an OptionDB file
-    read_entries(file, f_enc).each{|pat, val|
-      add(pat, val, pri)
-    }
-
-=begin
-    i_enc = Tk.encoding()
-
-    unless f_enc
-      f_enc = i_enc
-    end
-
-    cline = ''
-    open(file, 'r') {|f|
-      while line = f.gets
-        cline += line.chomp!
-        case cline
-        when /\\$/    # continue
-          cline.chop!
-          next
-        when /^\s*!/     # comment
-          cline = ''
-          next
-        when /^([^:]+):\s(.*)$/
-          pat = $1
-          val = $2
-          p "ResourceDB: #{[pat, val].inspect}" if $DEBUG
-          pat = TkCore::INTERP._toUTF8(pat, f_enc)
-          pat = TkCore::INTERP._fromUTF8(pat, i_enc)
-          val = TkCore::INTERP._toUTF8(val, f_enc)
-          val = TkCore::INTERP._fromUTF8(val, i_enc)
-          add(pat, val, pri)
-          cline = ''
-        else          # unknown --> ignore
-          cline = ''
-          next
-        end
-      end
-    }
-=end
-  end
-  module_function :read_with_encoding
-
-  # support procs on the resource database
-  @@resource_proc_class = Class.new
-
-  @@resource_proc_class.const_set(:CARRIER, '.'.freeze)
-
-  @@resource_proc_class.instance_variable_set('@method_tbl',
-                                              TkCore::INTERP.create_table)
-  @@resource_proc_class.instance_variable_set('@add_method', false)
-  @@resource_proc_class.instance_variable_set('@safe_mode', 4)
-
-  class << @@resource_proc_class
-    private :new
-
-=begin
-    CARRIER    = '.'.freeze
-    METHOD_TBL = TkCore::INTERP.create_table
-    ADD_METHOD = false
-    SAFE_MODE  = 4
-=end
-
-=begin
-    def __closed_block_check__(str)
-      depth = 0
-      str.scan(/[{}]/){|x|
-        if x == "{"
-          depth += 1
-        elsif x == "}"
-          depth -= 1
-        end
-        if depth <= 0 && !($' =~ /\A\s*\Z/)
-          fail RuntimeError, "bad string for procedure : #{str.inspect}"
-        end
-      }
-      str
-    end
-    private :__closed_block_check__
-=end
-
-    def __check_proc_string__(str)
-      # If you want to check the proc_string, do it in this method.
-      # Please define this in the block given to 'new_proc_class' method.
-      str
-    end
-
-    def method_missing(id, *args)
-      #res_proc, proc_str = self::METHOD_TBL[id]
-      res_proc, proc_str = @method_tbl[id]
-
-      proc_source = TkOptionDB.get(self::CARRIER, id.id2name, '').strip
-      res_proc = nil if proc_str != proc_source # resource is changed
-
-      # unless res_proc.kind_of?(Proc)
-      unless TkComm._callback_entry?(res_proc)
-        #if id == :new || !(self::METHOD_TBL.has_key?(id) || self::ADD_METHOD)
-        if id == :new || !(@method_tbl.has_key?(id) || @add_method)
-          raise NoMethodError,
-                "not support resource-proc '#{id.id2name}' for #{self.name}"
-        end
-        proc_str = proc_source
-        proc_str = '{' + proc_str + '}' unless /\A\{.*\}\Z/ =~ proc_str
-        #proc_str = __closed_block_check__(proc_str)
-        proc_str = __check_proc_string__(proc_str)
-        res_proc = proc{
-          begin
-            #eval("$SAFE = #{self::SAFE_MODE};\nProc.new" + proc_str)
-            eval("$SAFE = #{@safe_mode};\nProc.new" + proc_str)
-          rescue SyntaxError=>err
-            raise SyntaxError,
-              TkCore::INTERP._toUTF8(err.message.gsub(/\(eval\):\d:/,
-                                                      "(#{id.id2name}):"))
-          end
-        }.call
-        #self::METHOD_TBL[id] = [res_proc, proc_source]
-        @method_tbl[id] = [res_proc, proc_source]
-      end
-      res_proc.call(*args)
-    end
-
-    private :__check_proc_string__, :method_missing
-  end
-  @@resource_proc_class.freeze
-
-=begin
-  def __create_new_class(klass, func, safe = 4, add = false, parent = nil)
-    klass = klass.to_s if klass.kind_of? Symbol
-    unless (?A..?Z) === klass[0]
-      fail ArgumentError, "bad string '#{klass}' for class name"
-    end
-    unless func.kind_of? Array
-      fail ArgumentError, "method-list must be Array"
-    end
-    func_str = func.join(' ')
-    if parent == nil
-      install_win(parent)
-    elsif parent <= @@resource_proc_class
-      install_win(parent::CARRIER)
-    else
-      fail ArgumentError, "parent must be Resource-Proc class"
-    end
-    carrier = Tk.tk_call_without_enc('frame', @path, '-class', klass)
-
-    body = <<-"EOD"
-      class #{klass} < TkOptionDB.module_eval('@@resource_proc_class')
-        CARRIER    = '#{carrier}'.freeze
-        METHOD_TBL = TkCore::INTERP.create_table
-        ADD_METHOD = #{add}
-        SAFE_MODE  = #{safe}
-        %w(#{func_str}).each{|f| METHOD_TBL[f.intern] = nil }
-      end
-    EOD
-
-    if parent.kind_of?(Class) && parent <= @@resource_proc_class
-      parent.class_eval(body)
-      eval(parent.name + '::' + klass)
-    else
-      eval(body)
-      eval('TkOptionDB::' + klass)
-    end
-  end
-=end
-  def __create_new_class(klass, func, safe = 4, add = false, parent = nil)
-    if klass.kind_of?(TkWindow)
-      carrier = klass.path
-      CmdClassID.mutex.synchronize{
-        klass = CmdClassID.join(TkCore::INTERP._ip_id_)
-        CmdClassID[1].succ!
-      }
-      parent = nil # ignore parent
-    else
-      klass = klass.to_s if klass.kind_of?(Symbol)
-      unless (?A..?Z) === klass[0]
-        fail ArgumentError, "bad string '#{klass}' for class name"
-      end
-      if parent == nil
-        install_win(nil)
-      elsif parent.kind_of?(TkWindow)
-        install_win(parent.path)
-      elsif parent <= @@resource_proc_class
-        install_win(parent::CARRIER)
-      else
-        fail ArgumentError, "parent must be Resource-Proc class"
-      end
-      carrier = Tk.tk_call_without_enc('frame', @path, '-class', klass)
-    end
-
-    unless func.kind_of?(Array)
-      fail ArgumentError, "method-list must be Array"
-    end
-    func_str = func.join(' ')
-
-    if parent.kind_of?(Class) && parent <= @@resource_proc_class
-      cmd_klass = Class.new(parent)
-    else
-      cmd_klass = Class.new(TkOptionDB.module_eval('@@resource_proc_class'))
-    end
-    cmd_klass.const_set(:CARRIER, carrier.dup.freeze)
-
-    cmd_klass.instance_variable_set('@method_tbl', TkCore::INTERP.create_table)
-    cmd_klass.instance_variable_set('@add_method', add)
-    cmd_klass.instance_variable_set('@safe_mode', safe)
-    func.each{|f|
-      cmd_klass.instance_variable_get('@method_tbl')[f.to_s.intern] = nil
-    }
-=begin
-    cmd_klass.const_set(:METHOD_TBL, TkCore::INTERP.create_table)
-    cmd_klass.const_set(:ADD_METHOD, add)
-    cmd_klass.const_set(:SAFE_MODE, safe)
-    func.each{|f| cmd_klass::METHOD_TBL[f.to_s.intern] = nil }
-=end
-
-    cmd_klass
-  end
-  module_function :__create_new_class
-  private_class_method :__create_new_class
-
-  def __remove_methods_of_proc_class(klass)
-    # for security, make these methods invalid
-    class << klass
-      def __null_method(*args); nil; end
-      [ :class_eval, :name, :superclass, :clone, :dup, :autoload, :autoload?,
-        :ancestors, :const_defined?, :const_get, :const_set, :const_missing,
-        :class_variables, :constants, :included_modules, :instance_methods,
-        :method_defined?, :module_eval, :private_instance_methods,
-        :protected_instance_methods, :public_instance_methods,
-        :singleton_methods, :remove_const, :remove_method, :undef_method,
-        :to_s, :inspect, :display, :method, :methods, :respond_to?,
-        :instance_variable_get, :instance_variable_set, :instance_method,
-        :instance_eval, :instance_exec, :instance_variables, :kind_of?, :is_a?,
-        :private_methods, :protected_methods, :public_methods ].each{|m|
-        alias_method(m, :__null_method)
-      }
-    end
-  end
-  module_function :__remove_methods_of_proc_class
-  private_class_method :__remove_methods_of_proc_class
-
-  RAND_BASE_CNT = [0]
-  RAND_BASE_HEAD = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-  RAND_BASE_CHAR = RAND_BASE_HEAD + 'abcdefghijklmnopqrstuvwxyz0123456789_'
-  def __get_random_basename
-    name = '%s%03d' % [RAND_BASE_HEAD[rand(RAND_BASE_HEAD.size),1],
-                       RAND_BASE_CNT[0]]
-    len = RAND_BASE_CHAR.size
-    (6+rand(10)).times{
-      name << RAND_BASE_CHAR[rand(len),1]
-    }
-    RAND_BASE_CNT[0] = RAND_BASE_CNT[0] + 1
-    name
-  end
-  module_function :__get_random_basename
-  private_class_method :__get_random_basename
-
-  # define new proc class :
-  # If you want to modify the new class or create a new subclass,
-  # you must do such operation in the block parameter.
-  # Because the created class is frozen after evaluating the block.
-  def new_proc_class(klass, func, safe = 4, add = false, parent = nil, &b)
-    new_klass = __create_new_class(klass, func, safe, add, parent)
-    new_klass.class_eval(&b) if block_given?
-    __remove_methods_of_proc_class(new_klass)
-    new_klass.freeze
-    new_klass
-  end
-  module_function :new_proc_class
-
-  def eval_under_random_base(parent = nil, &b)
-    new_klass = __create_new_class(__get_random_basename(),
-                                   [], 4, false, parent)
-    ret = new_klass.class_eval(&b) if block_given?
-    __remove_methods_of_proc_class(new_klass)
-    new_klass.freeze
-    ret
-  end
-  module_function :eval_under_random_base
-
-  def new_proc_class_random(klass, func, safe = 4, add = false, &b)
-    eval_under_random_base(){
-      TkOptionDB.new_proc_class(klass, func, safe, add, self, &b)
-    }
-  end
-  module_function :new_proc_class_random
-end
-TkOption = TkOptionDB
-TkResourceDB = TkOptionDB
diff --git a/ext/tk/lib/tk/optionobj.rb b/ext/tk/lib/tk/optionobj.rb
deleted file mode 100644
index 4219e4be71..0000000000
--- a/ext/tk/lib/tk/optionobj.rb
+++ /dev/null
@@ -1,213 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/optionobj.rb : control options for a group of widgets
-#
-#  NOTE: If you want to use key-only option (no value),
-#        use Tk::None for the value of the key-only option.
-#
-#        e.g. hash_kv({'aaa'=>1, 'bbb'=>Tk::None, 'ccc'=>3})
-#                 => ["-aaa", 1, "-bbb", "-ccc", 3]
-#
-require 'tk'
-
-module Tk
-  class OptionObj < Hash
-    include TkUtil
-
-    def initialize(hash = nil)
-      super()
-      @observ = []
-      update_without_notify(_symbolkey2str(hash)) if hash
-    end
-
-    def observ_info
-      @observ.dup
-    end
-
-    def observs
-      @observ.collect{|win|
-        if win.kind_of?(Array)
-          win[0]
-        else
-          win
-        end
-      }
-    end
-
-    def _remove_win(win)
-      if win.kind_of?(Array)
-        widget, method = win
-        @observ.delete_if{|x|
-          if x.kind_of?(Array)
-            x[0] == widget
-          else
-            x == widget
-          end
-        }
-      else
-        @observ.delete_if{|x|
-          if x.kind_of?(Array)
-            x[0] == win
-          else
-            x == win
-          end
-        }
-      end
-    end
-    private :_remove_win
-
-    def assign(*wins)
-      # win :=
-      #   widget             #==> call widget.configure(hash)
-      #   [widget]           #==> call widget.configure(hash)
-      #   [widget, nil, {src=>target, ... }]
-      #                      #==> call widget.configure(hash)
-      #                               with converting hash-key
-      #   [widget, method]   #==> call widget.method(hash)
-      #   [widget, method, {src=>target, ... }]
-      #                      #==> call widget.method(hash)
-      #                               with converting hash-key
-      #   [widget [receiver, method, arg, ... ]]
-      #                      #==> call receiver.method(arg, ... , hash)
-      #   [widget [receiver, method, arg, ... ], {src=>target, ... }]
-      #                      #==> call receiver.method(arg, ... , hash)
-      #                               with onverting hash-key
-      #
-      # src := option_name_on_optobj
-      #
-      # target :=
-      #   nil                #==> not use the src
-      #   option_name_on_target_widget
-      #   [ option_name_on_target_widget, ... ]
-      #                      #==> set all of them
-      #
-      wins.each{|win|
-        _remove_win(win)
-        @observ << win
-        notify(win)
-      }
-      self
-    end
-
-    def unassign(*wins)
-      wins.each{|win|
-        _remove_win(win)
-      }
-      self
-    end
-
-    def notify(target = nil)
-      if target
-        targets = [target]
-      elsif @observ.empty?
-        return self
-      else
-        targets = @observ.dup
-      end
-
-      return self if empty?
-
-      org_hash = _symbolkey2str(self)
-
-      targets.each{|win|
-        widget = receiver = win
-        hash = org_hash
-        begin
-          if win.kind_of?(Array)
-            widget, method, conv_tbl = win
-            receiver = widget
-
-            if conv_tbl
-              hash = {}
-              org_hash.each{|key, val|
-                key = conv_tbl[key] if conv_tbl.key?(key)
-                next unless key
-                if key.kind_of?(Array)
-                  key.each{|k| hash[k] = val}
-                else
-                  hash[key] = val
-                end
-              }
-            end
-
-            if method.kind_of?(Array)
-              receiver, method, *args = method
-              receiver.__send__(method, *(args << hash))
-            elsif method
-              widget.__send__(method, hash)
-            else
-              widget.configure(hash)
-            end
-
-          else
-            widget.configure(self)
-          end
-        rescue => e
-          if ( ( widget.kind_of?(TkObject) \
-                && widget.respond_to?('exist?') \
-                && ! receiver.exist? ) \
-            || ( receiver.kind_of?(TkObject) \
-                && receiver.respond_to?('exist?') \
-                && ! receiver.exist? ) )
-            @observ.delete(win)
-          else
-            fail e
-          end
-        end
-      }
-
-      self
-    end
-    alias apply notify
-
-    def +(hash)
-      unless hash.kind_of?(Hash)
-        fail ArgumentError, "expect a Hash"
-      end
-      new_obj = self.dup
-      new_obj.update_without_notify(_symbolkey2str(hash))
-      new_obj
-    end
-
-    alias update_without_notify update
-
-    def update(hash)
-      update_without_notify(_symbolkey2str(hash))
-      notify
-    end
-
-    def configure(key, value=nil)
-      if key.kind_of?(Hash)
-        update(key)
-      else
-        store(key,value)
-      end
-    end
-
-    def [](key)
-      super(key.to_s)
-    end
-    alias cget []
-
-    def store(key, val)
-      key = key.to_s
-      super(key, val)
-      notify
-    end
-    def []=(key, val)
-      store(key,val)
-    end
-
-    def replace(hash)
-      super(_symbolkey2str(hash))
-      notify
-    end
-
-    def default(opt)
-      fail RuntimeError, "unknown option `#{opt}'"
-    end
-    private :default
-
-    undef :default=
-  end
-end
diff --git a/ext/tk/lib/tk/pack.rb b/ext/tk/lib/tk/pack.rb
deleted file mode 100644
index 45926d4043..0000000000
--- a/ext/tk/lib/tk/pack.rb
+++ /dev/null
@@ -1,108 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/pack.rb : control pack geometry manager
-#
-require 'tk'
-
-module TkPack
-  include Tk
-  extend Tk
-
-  TkCommandNames = ['pack'.freeze].freeze
-
-=begin
-  def configure(win, *args)
-    if args[-1].kind_of?(Hash)
-      opts = args.pop
-    else
-      opts = {}
-    end
-    params = []
-    # params.push((win.kind_of?(TkObject))? win.epath: win)
-    params.push(_epath(win))
-    args.each{|win|
-      # params.push((win.kind_of?(TkObject))? win.epath: win)
-      params.push(_epath(win))
-    }
-    opts.each{|k, v|
-      params.push("-#{k}")
-      # params.push((v.kind_of?(TkObject))? v.epath: v)
-      params.push(_epath(v))
-    }
-    tk_call_without_enc("pack", 'configure', *params)
-  end
-=end
-  def configure(*args)
-    if args[-1].kind_of?(Hash)
-      opts = args.pop
-    else
-      opts = {}
-    end
-    fail ArgumentError, 'no widget is given' if args.empty?
-    params = []
-    args.flatten(1).each{|win| params.push(_epath(win))}
-    opts.each{|k, v|
-      params.push("-#{k}")
-      params.push(_epath(v))  # have to use 'epath' (hash_kv() is unavailable)
-    }
-    tk_call_without_enc("pack", 'configure', *params)
-  end
-  alias pack configure
-
-  def forget(*args)
-    return '' if args.size == 0
-    wins = args.collect{|win|
-      # (win.kind_of?(TkObject))? win.epath: win
-      _epath(win)
-    }
-    tk_call_without_enc('pack', 'forget', *wins)
-  end
-
-  def info(slave)
-    # slave = slave.epath if slave.kind_of?(TkObject)
-    slave = _epath(slave)
-    ilist = list(tk_call_without_enc('pack', 'info', slave))
-    info = {}
-    while key = ilist.shift
-      info[key[1..-1]] = ilist.shift
-    end
-    return info
-  end
-
-  def propagate(master, mode=None)
-    # master = master.epath if master.kind_of?(TkObject)
-    master = _epath(master)
-    if mode == None
-      bool(tk_call_without_enc('pack', 'propagate', master))
-    else
-      tk_call_without_enc('pack', 'propagate', master, mode)
-    end
-  end
-
-  def slaves(master)
-    # master = master.epath if master.kind_of?(TkObject)
-    master = _epath(master)
-    list(tk_call_without_enc('pack', 'slaves', master))
-  end
-
-  module_function :pack, :configure, :forget, :info, :propagate, :slaves
-end
-=begin
-def TkPack(win, *args)
-  if args[-1].kind_of?(Hash)
-    opts = args.pop
-  else
-    opts = {}
-  end
-  params = []
-  params.push((win.kind_of?(TkObject))? win.epath: win)
-  args.each{|win|
-    params.push((win.kind_of?(TkObject))? win.epath: win)
-  }
-  opts.each{|k, v|
-    params.push("-#{k}")
-    params.push((v.kind_of?(TkObject))? v.epath: v)
-  }
-  tk_call_without_enc("pack", *params)
-end
-=end
diff --git a/ext/tk/lib/tk/package.rb b/ext/tk/lib/tk/package.rb
deleted file mode 100644
index fe6939c2d4..0000000000
--- a/ext/tk/lib/tk/package.rb
+++ /dev/null
@@ -1,144 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/package.rb : package command
-#
-require 'tk'
-
-module TkPackage
-  include TkCore
-  extend TkPackage
-
-  TkCommandNames = ['package'.freeze].freeze
-
-  def add_path(path)
-    Tk::AUTO_PATH.value = Tk::AUTO_PATH.to_a << path
-  end
-
-  def forget(package)
-    tk_call('package', 'forget', package)
-    nil
-  end
-
-  def if_needed(pkg, ver, *arg, &b)
-    size = arg.size
-
-    if size==0 && !b
-      # proc info
-      procedure(tk_call('package', 'ifneeded', pkg, ver))
-
-    elsif size==0 && b
-      # set proc
-      cmd = proc(&b)
-      tk_call('package', 'ifneeded', pkg, ver, cmd)
-      cmd
-
-    elsif size==1 && !b
-      # set proc
-      cmd = arg[0]
-      if cmd
-        tk_call('package', 'ifneeded', pkg, ver, cmd)
-        cmd
-      else
-        # remove proc
-        tk_call('package', 'ifneeded', pkg, ver, '')
-        nil
-      end
-
-    else
-      fail ArgumentError, 'too many arguments'
-    end
-  end
-
-  def names
-    tk_split_simplelist(tk_call('package', 'names'))
-  end
-
-  def provide(package, version=nil)
-    if version
-      tk_call('package', 'provide', package, version)
-    end
-    if (ret = tk_call('package', 'provide', package)) == ''
-      nil
-    else
-      ret
-    end
-  end
-
-  def present(package, version=None)
-    begin
-      tk_call('package', 'present', package, version)
-    rescue => e
-      fail e.class, 'TkPackage ' << e.message
-    end
-  end
-
-  def present_exact(package, version)
-    begin
-      tk_call('package', 'present', '-exact', package, version)
-    rescue => e
-      fail e.class, 'TkPackage ' << e.message
-    end
-  end
-
-  def require(package, version=None)
-    begin
-      tk_call('package', 'require', package, version)
-    rescue => e
-      fail e.class, 'TkPackage ' << e.message
-    end
-  end
-
-  def require_exact(package, version)
-    begin
-      tk_call('package', 'require', '-exact', package, version)
-    rescue => e
-      fail e.class, 'TkPackage ' << e.message
-    end
-  end
-
-  def unknown_proc(*arg, &b)
-    size = arg.size
-
-    if size==0 && !b
-      # proc info
-      procedure(tk_call('package', 'unknown'))
-
-    elsif size==0 && b
-      # set proc
-      cmd = proc(&b)
-      tk_call('package', 'unknown', cmd)
-      cmd
-
-    elsif size==1 && !b
-      # set proc
-      cmd = arg[0]
-      if cmd
-        tk_call('package', 'unknown', cmd)
-        cmd
-      else
-        # remove proc
-        tk_call('package', 'unknown', '')
-        nil
-      end
-
-    else
-      fail ArgumentError, 'too many arguments'
-    end
-  end
-
-  def versions(package)
-    tk_split_simplelist(tk_call('package', 'versions', package))
-  end
-
-  def vcompare(version1, version2)
-    number(tk_call('package', 'vcompare', version1, version2))
-  end
-
-  def vsatisfies(version1, version2)
-    bool(tk_call('package', 'vsatisfies', version1, version2))
-  end
-
-  def prefer(setting = None)
-    tk_call('package', 'prefer', setting)
-  end
-end
diff --git a/ext/tk/lib/tk/palette.rb b/ext/tk/lib/tk/palette.rb
deleted file mode 100644
index e118e8dbe5..0000000000
--- a/ext/tk/lib/tk/palette.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-# frozen_string_literal: false
-#
-#   tk/palette.rb : methods for Tcl/Tk standard library 'palette.tcl'
-#                     1998/06/21 by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
-#
-require 'tk'
-
-module TkPalette
-  include Tk
-  extend Tk
-
-  TkCommandNames = [
-    'tk_setPalette'.freeze,
-    'tk_bisque'.freeze,
-    'tkDarken'.freeze
-  ].freeze
-
-  def TkPalette.set(*args)
-    args = args[0].to_a.flatten if args[0].kind_of? Hash
-    tk_call('tk_setPalette', *args)
-  end
-  def TkPalette.setPalette(*args)
-    TkPalette.set(*args)
-  end
-
-  def TkPalette.bisque
-    tk_call('tk_bisque')
-  end
-
-  def TkPalette.darken(color, percent)
-    tk_call('tkDarken', color, percent)
-  end
-
-  def TkPalette.recolorTree(win, colors)
-    if not colors.kind_of?(Hash)
-      fail "2nd arg need to be Hash"
-    end
-
-    tk_call('global', "tkPalette")
-    colors.each{|key, value|
-      begin
-        if win.cget(key) == tk_call('set', "tkPalette(#{key})")
-          win[key] = colors[key]
-        end
-      rescue
-        # ignore
-      end
-    }
-
-    TkWinfo.children(win).each{|w| TkPalette.recolorTree(w, colors)}
-  end
-
-  def recolorTree(colors)
-    TkPalette.recolorTree(self, colors)
-  end
-end
diff --git a/ext/tk/lib/tk/panedwindow.rb b/ext/tk/lib/tk/panedwindow.rb
deleted file mode 100644
index 285292f018..0000000000
--- a/ext/tk/lib/tk/panedwindow.rb
+++ /dev/null
@@ -1,261 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/panedwindow.rb : treat panedwindow
-#
-require 'tk'
-
-class Tk::PanedWindow<TkWindow
-  TkCommandNames = ['panedwindow'.freeze].freeze
-  WidgetClassName = 'Panedwindow'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-  #def create_self(keys)
-  #  if keys and keys != None
-  #    tk_call_without_enc('panedwindow', @path, *hash_kv(keys, true))
-  #  else
-  #    tk_call_without_enc('panedwindow', @path)
-  #  end
-  #end
-  #private :create_self
-
-  def add(*args)
-    keys = args.pop
-    fail ArgumentError, "no window in arguments" unless keys
-    if keys && keys.kind_of?(Hash)
-      fail ArgumentError, "no window in arguments" if args == []
-      # args = args.collect{|w| (w.kind_of?(TkObject))? w.epath: w }
-      args = args.collect{|w| _epath(w) }
-      #args.push(hash_kv(keys))
-      args.concat(hash_kv(keys))
-    else
-      args.push(keys) if keys
-      # args = args.collect{|w| (w.kind_of?(TkObject))? w.epath: w }
-      args = args.collect{|w| _epath(w) }
-    end
-    tk_send_without_enc('add', *args)
-    self
-  end
-
-  def forget(win, *wins)
-    wins.unshift(win)
-    # tk_send_without_enc('forget', *((w.kind_of?(TkObject))? w.epath: w))
-    tk_send_without_enc('forget', *(wins.collect{|w| _epath(w)}))
-    self
-  end
-  alias del forget
-  alias delete forget
-  alias remove forget
-
-  def identify(x, y)
-    list(tk_send_without_enc('identify', x, y))
-  end
-
-  def proxy_coord
-    list(tk_send_without_enc('proxy', 'coord'))
-  end
-  def proxy_forget
-    tk_send_without_enc('proxy', 'forget')
-    self
-  end
-  def proxy_place(x, y)
-    tk_send_without_enc('proxy', 'place', x, y)
-    self
-  end
-
-  def sash_coord(index)
-    list(tk_send('sash', 'coord', index))
-  end
-  def sash_dragto(index, x, y)
-    tk_send('sash', 'dragto', index, x, y)
-    self
-  end
-  def sash_mark(index, x, y)
-    tk_send('sash', 'mark', index, x, y)
-    self
-  end
-  def sash_place(index, x, y)
-    tk_send('sash', 'place', index, x, y)
-    self
-  end
-
-  def panecget_strict(win, key)
-    # win = win.epath if win.kind_of?(TkObject)
-    win = _epath(win)
-    tk_tcl2ruby(tk_send_without_enc('panecget', win, "-#{key}"))
-  end
-  def panecget(win, key)
-    unless TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-      panecget_strict(win, key)
-    else
-      begin
-        panecget_strict(win, key)
-      rescue => e
-        begin
-          if current_paneconfiginfo(win).has_key?(option.to_s)
-            # not tag error & option is known -> error on known option
-            fail e
-          else
-            # not tag error & option is unknown
-            nil
-          end
-        rescue
-          fail e  # tag error
-        end
-      end
-    end
-  end
-
-  def paneconfigure(win, key, value=nil)
-    # win = win.epath if win.kind_of?(TkObject)
-    win = _epath(win)
-    if key.kind_of? Hash
-      params = []
-      key.each{|k, v|
-        params.push("-#{k}")
-        # params.push((v.kind_of?(TkObject))? v.epath: v)
-        params.push(_epath(v))
-      }
-      tk_send_without_enc('paneconfigure', win, *params)
-    else
-      # value = value.epath if value.kind_of?(TkObject)
-      value = _epath(value)
-      tk_send_without_enc('paneconfigure', win, "-#{key}", value)
-    end
-    self
-  end
-  alias pane_config paneconfigure
-
-  def paneconfiginfo(win, key=nil)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      # win = win.epath if win.kind_of?(TkObject)
-      win = _epath(win)
-      if key
-        #conf = tk_split_list(tk_send_without_enc('paneconfigure',
-        #                                         win, "-#{key}"))
-        conf = tk_split_list(tk_send_without_enc('paneconfigure',
-                                                 win, "-#{key}"),
-                             false, true)
-        conf[0] = conf[0][1..-1]
-        if conf[0] == 'hide'
-          conf[3] = bool(conf[3]) unless conf[3].empty?
-          conf[4] = bool(conf[4]) unless conf[4].empty?
-        end
-        conf
-      else
-        #tk_split_simplelist(tk_send_without_enc('paneconfigure',
-        #                                        win)).collect{|conflist|
-        #  conf = tk_split_simplelist(conflist)
-        tk_split_simplelist(tk_send_without_enc('paneconfigure', win),
-                            false, false).collect{|conflist|
-          conf = tk_split_simplelist(conflist, false, true)
-          conf[0] = conf[0][1..-1]
-          if conf[3]
-            if conf[0] == 'hide'
-              conf[3] = bool(conf[3]) unless conf[3].empty?
-            elsif conf[3].index('{')
-              conf[3] = tk_split_list(conf[3])
-            else
-              conf[3] = tk_tcl2ruby(conf[3])
-            end
-          end
-          if conf[4]
-            if conf[0] == 'hide'
-              conf[4] = bool(conf[4]) unless conf[4].empty?
-            elsif conf[4].index('{')
-              conf[4] = tk_split_list(conf[4])
-            else
-              conf[4] = tk_tcl2ruby(conf[4])
-            end
-          end
-          conf[1] = conf[1][1..-1] if conf.size == 2 # alias info
-          conf
-        }
-      end
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      # win = win.epath if win.kind_of?(TkObject)
-      win = _epath(win)
-      if key
-        #conf = tk_split_list(tk_send_without_enc('paneconfigure',
-        #                                         win, "-#{key}"))
-        conf = tk_split_list(tk_send_without_enc('paneconfigure',
-                                                 win, "-#{key}"),
-                             false, true)
-        key = conf.shift[1..-1]
-        if key == 'hide'
-          conf[2] = bool(conf[2]) unless conf[2].empty?
-          conf[3] = bool(conf[3]) unless conf[3].empty?
-        end
-        { key => conf }
-      else
-        ret = {}
-        #tk_split_simplelist(tk_send_without_enc('paneconfigure',
-        #                                        win)).each{|conflist|
-        #  conf = tk_split_simplelist(conflist)
-        tk_split_simplelist(tk_send_without_enc('paneconfigure', win),
-                            false, false).each{|conflist|
-          conf = tk_split_simplelist(conflist, false, true)
-          key = conf.shift[1..-1]
-          if key
-            if key == 'hide'
-              conf[2] = bool(conf[2]) unless conf[2].empty?
-            elsif conf[2].index('{')
-              conf[2] = tk_split_list(conf[2])
-            else
-              conf[2] = tk_tcl2ruby(conf[2])
-            end
-          end
-          if conf[3]
-            if key == 'hide'
-              conf[3] = bool(conf[3]) unless conf[3].empty?
-            elsif conf[3].index('{')
-              conf[3] = tk_split_list(conf[3])
-            else
-              conf[3] = tk_tcl2ruby(conf[3])
-            end
-          end
-          if conf.size == 1
-            ret[key] = conf[0][1..-1]  # alias info
-          else
-            ret[key] = conf
-          end
-        }
-        ret
-      end
-    end
-  end
-  alias pane_configinfo paneconfiginfo
-
-  def current_paneconfiginfo(win, key=nil)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if key
-        conf = paneconfiginfo(win, key)
-        {conf[0] => conf[4]}
-      else
-        ret = {}
-        paneconfiginfo(win).each{|conf|
-          ret[conf[0]] = conf[4] if conf.size > 2
-        }
-        ret
-      end
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      ret = {}
-      paneconfiginfo(win, key).each{|k, conf|
-        ret[k] = conf[-1] if conf.kind_of?(Array)
-      }
-      ret
-    end
-  end
-
-  alias current_pane_configinfo current_paneconfiginfo
-
-  def panes
-    list(tk_send_without_enc('panes'))
-  end
-end
-
-Tk::Panedwindow = Tk::PanedWindow
-#TkPanedWindow = Tk::PanedWindow unless Object.const_defined? :TkPanedWindow
-#TkPanedwindow = Tk::Panedwindow unless Object.const_defined? :TkPanedwindow
-#Tk.__set_toplevel_aliases__(:Tk, Tk::PanedWindow,
-#                            :TkPanedWindow, :TkPanedwindow)
-Tk.__set_loaded_toplevel_aliases__('tk/panedwindow.rb', :Tk, Tk::PanedWindow,
-                                   :TkPanedWindow, :TkPanedwindow)
diff --git a/ext/tk/lib/tk/place.rb b/ext/tk/lib/tk/place.rb
deleted file mode 100644
index efda36df5e..0000000000
--- a/ext/tk/lib/tk/place.rb
+++ /dev/null
@@ -1,129 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/place.rb : control place geometry manager
-#
-require 'tk'
-
-module TkPlace
-  include Tk
-  extend Tk
-
-  TkCommandNames = ['place'.freeze].freeze
-
-  def configure(win, slot, value=None)
-    # for >= Tk8.4a2 ?
-    # win = win.epath if win.kind_of?(TkObject)
-    win = _epath(win)
-    if slot.kind_of? Hash
-      params = []
-      slot.each{|k, v|
-        params.push("-#{k}")
-        # params.push((v.kind_of?(TkObject))? v.epath: v)
-        params.push(_epath(v))
-      }
-      tk_call_without_enc('place', 'configure', win, *params)
-    else
-      # value = value.epath if value.kind_of?(TkObject)
-      value = _epath(value)
-      tk_call_without_enc('place', 'configure', win, "-#{slot}", value)
-    end
-  end
-  alias place configure
-
-  def configinfo(win, slot = nil)
-    # for >= Tk8.4a2 ?
-    if TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
-      # win = win.epath if win.kind_of?(TkObject)
-      win = _epath(win)
-      if slot
-        #conf = tk_split_list(tk_call_without_enc('place', 'configure',
-        #                                        win, "-#{slot}") )
-        conf = tk_split_simplelist(tk_call_without_enc('place', 'configure',
-                                                       win, "-#{slot}") )
-        conf[0] = conf[0][1..-1]
-        conf[1] = tk_tcl2ruby(conf[1])
-        conf[2] = tk_tcl2ruby(conf[1])
-        conf[3] = tk_tcl2ruby(conf[1])
-        conf[4] = tk_tcl2ruby(conf[1])
-        conf
-      else
-        tk_split_simplelist(tk_call_without_enc('place', 'configure',
-                                                win)).collect{|conflist|
-          #conf = list(conflist)
-          conf = simplelist(conflist).collect!{|inf| tk_tcl2ruby(inf)}
-          conf[0] = conf[0][1..-1]
-          conf
-        }
-      end
-    else # ! TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
-      current_configinfo(win, slot)
-    end
-  end
-
-  def current_configinfo(win, slot = nil)
-    # win = win.epath if win.kind_of?(TkObject)
-    win = _epath(win)
-    if slot
-      #conf = tk_split_list(tk_call_without_enc('place', 'configure',
-      #                                         win, "-#{slot}") )
-      conf = tk_split_simplelist(tk_call_without_enc('place', 'configure',
-                                                     win, "-#{slot}") )
-      # { conf[0][1..-1] => conf[1] }
-      { conf[0][1..-1] => tk_tcl2ruby(conf[4]) }
-    else
-      ret = {}
-      #tk_split_list(tk_call_without_enc('place','configure',win)).each{|conf|
-      tk_split_simplelist(tk_call_without_enc('place', 'configure',
-                                              win)).each{|conf_list|
-        #ret[conf[0][1..-1]] = conf[1]
-        conf = simplelist(conf_list)
-        ret[conf[0][1..-1]] = tk_tcl2ruby(conf[4])
-      }
-      ret
-    end
-  end
-
-  def forget(win)
-    # win = win.epath if win.kind_of?(TkObject)
-    win = _epath(win)
-    tk_call_without_enc('place', 'forget', win)
-  end
-
-  def info(win)
-    # win = win.epath if win.kind_of?(TkObject)
-    win = _epath(win)
-    #ilist = list(tk_call_without_enc('place', 'info', win))
-    ilist = simplelist(tk_call_without_enc('place', 'info', win))
-    info = {}
-    while key = ilist.shift
-      #info[key[1..-1]] = ilist.shift
-      info[key[1..-1]] = tk_tcl2ruby(ilist.shift)
-    end
-    return info
-  end
-
-  def slaves(master)
-    # master = master.epath if master.kind_of?(TkObject)
-    master = _epath(master)
-    list(tk_call('place', 'slaves', master))
-  end
-
-  module_function :place, :configure, :configinfo, :current_configinfo
-  module_function :forget, :info, :slaves
-end
-=begin
-def TkPlace(win, slot, value=None)
-  win = win.epath if win.kind_of?(TkObject)
-  if slot.kind_of? Hash
-    params = []
-    slot.each{|k, v|
-      params.push("-#{k}")
-      params.push((v.kind_of?(TkObject))? v.epath: v)
-    }
-    tk_call_without_enc('place', win, *params)
-  else
-    value = value.epath if value.kind_of?(TkObject)
-    tk_call_without_enc('place', win, "-#{slot}", value)
-  end
-end
-=end
diff --git a/ext/tk/lib/tk/radiobutton.rb b/ext/tk/lib/tk/radiobutton.rb
deleted file mode 100644
index b0858df2b4..0000000000
--- a/ext/tk/lib/tk/radiobutton.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/radiobutton.rb : treat radiobutton widget
-#
-require 'tk'
-require 'tk/button'
-
-class Tk::RadioButton<Tk::Button
-  TkCommandNames = ['radiobutton'.freeze].freeze
-  WidgetClassName = 'Radiobutton'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-  #def create_self(keys)
-  #  if keys and keys != None
-  #    tk_call_without_enc('radiobutton', @path, *hash_kv(keys, true))
-  #  else
-  #    tk_call_without_enc('radiobutton', @path)
-  #  end
-  #end
-  #private :create_self
-
-  def __boolval_optkeys
-    super() << 'indicatoron'
-  end
-  private :__boolval_optkeys
-
-  def __strval_optkeys
-    super() << 'selectcolor'
-  end
-  private :__strval_optkeys
-
-  def __ruby2val_optkeys  # { key=>proc, ... }
-    {
-      'variable'=>proc{|v| tk_trace_variable(v)}  # for backward compatibility
-    }
-  end
-  private :__ruby2val_optkeys
-
-
-  def deselect
-    tk_send_without_enc('deselect')
-    self
-  end
-  def select
-    tk_send_without_enc('select')
-    self
-  end
-
-  def get_value
-    var = tk_send_without_enc('cget', '-variable')
-    if TkVariable::USE_TCLs_SET_VARIABLE_FUNCTIONS
-      _fromUTF8(INTERP._get_global_var(var))
-    else
-      INTERP._eval(Kernel.format('global %s; set %s', var, var))
-    end
-  end
-
-  def set_value(val)
-    var = tk_send_without_enc('cget', '-variable')
-    if TkVariable::USE_TCLs_SET_VARIABLE_FUNCTIONS
-      _fromUTF8(INTERP._set_global_var(var, _get_eval_string(val, true)))
-    else
-      s = '"' + _get_eval_string(val).gsub(/[\[\]$"\\]/, '\\\\\&') + '"'
-      INTERP._eval(Kernel.format('global %s; set %s %s', var, var, s))
-    end
-  end
-end
-
-Tk::Radiobutton = Tk::RadioButton
-#TkRadioButton = Tk::RadioButton unless Object.const_defined? :TkRadioButton
-#TkRadiobutton = Tk::Radiobutton unless Object.const_defined? :TkRadiobutton
-#Tk.__set_toplevel_aliases__(:Tk, Tk::RadioButton,
-#                            :TkRadioButton, :TkRadiobutton)
-Tk.__set_loaded_toplevel_aliases__('tk/radiobutton.rb', :Tk, Tk::RadioButton,
-                                   :TkRadioButton, :TkRadiobutton)
diff --git a/ext/tk/lib/tk/root.rb b/ext/tk/lib/tk/root.rb
deleted file mode 100644
index b92732fd7d..0000000000
--- a/ext/tk/lib/tk/root.rb
+++ /dev/null
@@ -1,96 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/root.rb : treat root widget
-#
-require 'tk'
-require 'tk/wm'
-require 'tk/menuspec'
-
-class Tk::Root<TkWindow
-  include Wm
-  include TkMenuSpec
-
-  def __methodcall_optkeys  # { key=>method, ... }
-    TOPLEVEL_METHODCALL_OPTKEYS
-  end
-  private :__methodcall_optkeys
-
-  def Root.new(keys=nil, &b)
-    unless TkCore::INTERP.tk_windows['.']
-      TkCore::INTERP.tk_windows['.'] =
-        super(:without_creating=>true, :widgetname=>'.'){}
-    end
-    root = TkCore::INTERP.tk_windows['.']
-
-    keys = _symbolkey2str(keys)
-
-    # wm commands
-    root.instance_eval{
-      __methodcall_optkeys.each{|key, method|
-        value = keys.delete(key.to_s)
-        self.__send__(method, value) if value
-      }
-    }
-
-    if keys  # wm commands ( for backward compatibility )
-      keys.each{|k,v|
-        if v.kind_of? Array
-          root.__send__(k,*v)
-        else
-          root.__send__(k,v)
-        end
-      }
-    end
-
-    if block_given?
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        root.instance_exec(root, &b)
-      else
-        root.instance_eval(&b)
-      end
-    end
-    root
-  end
-
-  WidgetClassName = 'Tk'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def self.to_eval
-    # self::WidgetClassName
-    '.'
-  end
-
-  def create_self
-    @path = '.'
-  end
-  private :create_self
-
-  def path
-    "."
-  end
-
-  def add_menu(menu_info, tearoff=false, opts=nil)
-    # See tk/menuspec.rb for menu_info.
-    # opts is a hash of default configs for all of cascade menus.
-    # Configs of menu_info can override it.
-    if tearoff.kind_of?(Hash)
-      opts = tearoff
-      tearoff = false
-    end
-    _create_menubutton(self, menu_info, tearoff, opts)
-  end
-
-  def add_menubar(menu_spec, tearoff=false, opts=nil)
-    # See tk/menuspec.rb for menu_spec.
-    # opts is a hash of default configs for all of cascade menus.
-    # Configs of menu_spec can override it.
-    menu_spec.each{|info| add_menu(info, tearoff, opts)}
-    self.menu
-  end
-
-  def Root.destroy
-    TkCore::INTERP._invoke('destroy', '.')
-  end
-end
-
-TkRoot = Tk::Root unless Object.const_defined? :TkRoot
diff --git a/ext/tk/lib/tk/scale.rb b/ext/tk/lib/tk/scale.rb
deleted file mode 100644
index f6f60e3c25..0000000000
--- a/ext/tk/lib/tk/scale.rb
+++ /dev/null
@@ -1,113 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/scale.rb : treat scale widget
-#
-require 'tk'
-
-class Tk::Scale<TkWindow
-  TkCommandNames = ['scale'.freeze].freeze
-  WidgetClassName = 'Scale'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def create_self(keys)
-    if keys and keys != None
-      if keys.key?('command') && ! keys['command'].kind_of?(String)
-        cmd = keys.delete('command')
-        keys['command'] = proc{|val| cmd.call(val.to_f)}
-      end
-      unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-        #tk_call_without_enc('scale', @path, *hash_kv(keys, true))
-        tk_call_without_enc(self.class::TkCommandNames[0], @path,
-                            *hash_kv(keys, true))
-      else
-        begin
-          tk_call_without_enc(self.class::TkCommandNames[0], @path,
-                              *hash_kv(keys, true))
-        rescue
-          tk_call_without_enc(self.class::TkCommandNames[0], @path)
-          keys = __check_available_configure_options(keys)
-          unless keys.empty?
-            begin
-              tk_call_without_enc('destroy', @path)
-            rescue
-              # cannot destroy
-              configure(keys)
-            else
-              # re-create widget
-              tk_call_without_enc(self.class::TkCommandNames[0], @path,
-                                  *hash_kv(keys, true))
-            end
-          end
-        end
-      end
-    else
-      #tk_call_without_enc('scale', @path)
-      tk_call_without_enc(self.class::TkCommandNames[0], @path)
-    end
-  end
-  private :create_self
-
-  def __strval_optkeys
-    super() << 'label'
-  end
-  private :__strval_optkeys
-
-  def _wrap_command_arg(cmd)
-    proc{|val|
-      if val.kind_of?(String)
-        cmd.call(number(val))
-      else
-        cmd.call(val)
-      end
-    }
-  end
-  private :_wrap_command_arg
-
-  def configure_cmd(slot, value)
-    configure(slot=>value)
-  end
-
-  def configure(slot, value=None)
-    if (slot == 'command' || slot == :command)
-      configure('command'=>value)
-    elsif slot.kind_of?(Hash) &&
-        (slot.key?('command') || slot.key?(:command))
-      slot = _symbolkey2str(slot)
-      slot['command'] = _wrap_command_arg(slot.delete('command'))
-    end
-    super(slot, value)
-  end
-
-  def command(cmd=Proc.new)
-    configure('command'=>cmd)
-  end
-
-  def get(x=None, y=None)
-    number(tk_send_without_enc('get', x, y))
-  end
-
-  def coords(val=None)
-    tk_split_list(tk_send_without_enc('coords', val))
-  end
-
-  def identify(x, y)
-    tk_send_without_enc('identify', x, y)
-  end
-
-  def set(val)
-    tk_send_without_enc('set', val)
-  end
-
-  def value
-    get
-  end
-
-  def value= (val)
-    set(val)
-    val
-  end
-end
-
-#TkScale = Tk::Scale unless Object.const_defined? :TkScale
-#Tk.__set_toplevel_aliases__(:Tk, Tk::Scale, :TkScale)
-Tk.__set_loaded_toplevel_aliases__('tk/scale.rb', :Tk, Tk::Scale, :TkScale)
diff --git a/ext/tk/lib/tk/scrollable.rb b/ext/tk/lib/tk/scrollable.rb
deleted file mode 100644
index e9b4a93d6d..0000000000
--- a/ext/tk/lib/tk/scrollable.rb
+++ /dev/null
@@ -1,83 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/scrollable.rb : module for scrollable widget
-#
-require 'tk'
-
-module Tk
-  module XScrollable
-    def xscrollcommand(cmd=Proc.new)
-      configure_cmd 'xscrollcommand', cmd
-      # Tk.update  # avoid scrollbar trouble
-      self
-    end
-
-    def xview(*index)
-      if index.size == 0
-        list(tk_send_without_enc('xview'))
-      else
-        tk_send_without_enc('xview', *index)
-        self
-      end
-    end
-    def xview_moveto(*index)
-      xview('moveto', *index)
-    end
-    def xview_scroll(*index)
-      xview('scroll', *index)
-    end
-
-    def xscrollbar(bar=nil)
-      if bar
-        @xscrollbar = bar
-        @xscrollbar.orient 'horizontal'
-        self.xscrollcommand {|*arg| @xscrollbar.set(*arg)}
-        @xscrollbar.command {|*arg| self.xview(*arg)}
-        Tk.update  # avoid scrollbar trouble
-      end
-      @xscrollbar
-    end
-  end
-
-  module YScrollable
-    def yscrollcommand(cmd=Proc.new)
-      configure_cmd 'yscrollcommand', cmd
-      # Tk.update  # avoid scrollbar trouble
-      self
-    end
-
-    def yview(*index)
-      if index.size == 0
-        list(tk_send_without_enc('yview'))
-      else
-        tk_send_without_enc('yview', *index)
-        self
-      end
-    end
-    def yview_moveto(*index)
-      yview('moveto', *index)
-    end
-    def yview_scroll(*index)
-      yview('scroll', *index)
-    end
-
-    def yscrollbar(bar=nil)
-      if bar
-        @yscrollbar = bar
-        @yscrollbar.orient 'vertical'
-        self.yscrollcommand {|*arg| @yscrollbar.set(*arg)}
-        @yscrollbar.command {|*arg| self.yview(*arg)}
-        Tk.update  # avoid scrollbar trouble
-      end
-      @yscrollbar
-    end
-  end
-
-  X_Scrollable = XScrollable
-  Y_Scrollable = YScrollable
-
-  module Scrollable
-    include XScrollable
-    include YScrollable
-  end
-end
diff --git a/ext/tk/lib/tk/scrollbar.rb b/ext/tk/lib/tk/scrollbar.rb
deleted file mode 100644
index c16ed38756..0000000000
--- a/ext/tk/lib/tk/scrollbar.rb
+++ /dev/null
@@ -1,184 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/scrollbar.rb : treat scrollbar widget
-#
-require 'tk'
-
-class Tk::Scrollbar<TkWindow
-  TkCommandNames = ['scrollbar'.freeze].freeze
-  WidgetClassName = 'Scrollbar'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def create_self(keys)
-    @assigned = []
-    @scroll_proc = proc{|*args|
-      if self.orient == 'horizontal'
-        @assigned.each{|w| w.xview(*args)}
-      else # 'vertical'
-        @assigned.each{|w| w.yview(*args)}
-      end
-    }
-
-    if keys and keys != None
-      unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-        #tk_call_without_enc('scrollbar', @path, *hash_kv(keys, true))
-        tk_call_without_enc(self.class::TkCommandNames[0], @path,
-                            *hash_kv(keys, true))
-      else
-        begin
-          tk_call_without_enc(self.class::TkCommandNames[0], @path,
-                              *hash_kv(keys, true))
-        rescue
-          tk_call_without_enc(self.class::TkCommandNames[0], @path)
-          keys = __check_available_configure_options(keys)
-          unless keys.empty?
-            begin
-              tk_call_without_enc('destroy', @path)
-            rescue
-              # cannot destroy
-              configure(keys)
-            else
-              # re-create widget
-              tk_call_without_enc(self.class::TkCommandNames[0], @path,
-                                  *hash_kv(keys, true))
-            end
-          end
-        end
-      end
-    else
-      #tk_call_without_enc('scrollbar', @path)
-      tk_call_without_enc(self.class::TkCommandNames[0], @path)
-    end
-  end
-  private :create_self
-
-  def propagate_set(src_win, first, last)
-    self.set(first, last)
-    if self.orient == 'horizontal'
-      @assigned.each{|w| w.xview('moveto', first) if w != src_win}
-    else # 'vertical'
-      @assigned.each{|w| w.yview('moveto', first) if w != src_win}
-    end
-  end
-
-  def assign(*wins)
-    begin
-      self.command(@scroll_proc) if self.cget('command').cmd != @scroll_proc
-    rescue Exception
-      self.command(@scroll_proc)
-    end
-    orient = self.orient
-    wins.each{|w|
-      @assigned << w unless @assigned.index(w)
-      if orient == 'horizontal'
-        w.xscrollcommand proc{|first, last| self.propagate_set(w, first, last)}
-      else # 'vertical'
-        w.yscrollcommand proc{|first, last| self.propagate_set(w, first, last)}
-      end
-    }
-    Tk.update  # avoid scrollbar trouble
-    self
-  end
-
-  def assigned_list
-    begin
-      return @assigned.dup if self.cget('command').cmd == @scroll_proc
-    rescue Exception
-    end
-    fail RuntimeError, "not depend on the assigned_list"
-  end
-
-  def configure(*args)
-    ret = super(*args)
-    # Tk.update  # avoid scrollbar trouble
-    ret
-  end
-
-  #def delta(deltax=None, deltay=None)
-  def delta(deltax, deltay)
-    number(tk_send_without_enc('delta', deltax, deltay))
-  end
-
-  #def fraction(x=None, y=None)
-  def fraction(x, y)
-    number(tk_send_without_enc('fraction', x, y))
-  end
-
-  def identify(x, y)
-    tk_send_without_enc('identify', x, y)
-  end
-
-  def get
-    #ary1 = tk_send('get').split
-    #ary2 = []
-    #for i in ary1
-    #  ary2.push number(i)
-    #end
-    #ary2
-    list(tk_send_without_enc('get'))
-  end
-
-  def set(first, last)
-    tk_send_without_enc('set', first, last)
-    self
-  end
-
-  def activate(element=None)
-    tk_send_without_enc('activate', element)
-  end
-
-  def moveto(fraction)
-    tk_send_without_enc('moveto', fraction)
-    self
-  end
-
-  def scroll(*args)
-    tk_send_without_enc('scroll', *args)
-    self
-  end
-
-  def scroll_units(num)
-    scroll(num, 'units')
-    self
-  end
-
-  def scroll_pages(num)
-    scroll(num, 'pages')
-    self
-  end
-end
-
-#TkScrollbar = Tk::Scrollbar unless Object.const_defined? :TkScrollbar
-#Tk.__set_toplevel_aliases__(:Tk, Tk::Scrollbar, :TkScrollbar)
-Tk.__set_loaded_toplevel_aliases__('tk/scrollbar.rb', :Tk, Tk::Scrollbar,
-                                   :TkScrollbar)
-
-
-class Tk::XScrollbar<Tk::Scrollbar
-  def create_self(keys)
-    keys = {} unless keys
-    keys['orient'] = 'horizontal'
-    super(keys)
-  end
-  private :create_self
-end
-
-#TkXScrollbar = Tk::XScrollbar unless Object.const_defined? :TkXScrollbar
-#Tk.__set_toplevel_aliases__(:Tk, Tk::XScrollbar, :TkXScrollbar)
-Tk.__set_loaded_toplevel_aliases__('tk/scrollbar.rb', :Tk, Tk::XScrollbar,
-                                   :TkXScrollbar)
-
-
-class Tk::YScrollbar<Tk::Scrollbar
-  def create_self(keys)
-    keys = {} unless keys
-    keys['orient'] = 'vertical'
-    super(keys)
-  end
-  private :create_self
-end
-
-#TkYScrollbar = Tk::YScrollbar unless Object.const_defined? :TkYScrollbar
-#Tk.__set_toplevel_aliases__(:Tk, Tk::YScrollbar, :TkYScrollbar)
-Tk.__set_loaded_toplevel_aliases__('tk/scrollbar.rb', :Tk, Tk::YScrollbar,
-                                   :TkYScrollbar)
diff --git a/ext/tk/lib/tk/scrollbox.rb b/ext/tk/lib/tk/scrollbox.rb
deleted file mode 100644
index a470765d7c..0000000000
--- a/ext/tk/lib/tk/scrollbox.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-# frozen_string_literal: false
-#
-#               tk/scrollbox.rb - Tk Listbox with Scrollbar
-#                                 as an example of Composite Widget
-#                       by Yukihiro Matsumoto <matz@netlab.co.jp>
-#
-require 'tk'
-require 'tk/listbox'
-
-class TkScrollbox<Tk::Listbox
-  include TkComposite
-  def initialize_composite(keys=nil)
-    #list = Tk::Listbox.new(@frame)
-    # -> use current TkListbox class
-    list = TkListbox.new(@frame)
-    #scroll = Tk::Scrollbar.new(@frame)
-    # -> use current TkScrollbar class
-    scroll = TkScrollbar.new(@frame)
-    @path = list.path
-
-=begin
-    list.configure 'yscroll', scroll.path+" set"
-    list.pack 'side'=>'left','fill'=>'both','expand'=>'yes'
-    scroll.configure 'command', list.path+" yview"
-    scroll.pack 'side'=>'right','fill'=>'y'
-=end
-    list.yscrollbar(scroll)
-    list.pack('side'=>'left','fill'=>'both','expand'=>'yes')
-    scroll.pack('side'=>'right','fill'=>'y')
-
-    delegate('DEFAULT', list)
-    delegate('foreground', list)
-    delegate('background', list, scroll)
-    delegate('borderwidth', @frame)
-    delegate('relief', @frame)
-
-    configure keys if keys
-  end
-  private :initialize_composite
-end
diff --git a/ext/tk/lib/tk/selection.rb b/ext/tk/lib/tk/selection.rb
deleted file mode 100644
index 085d8b2d2d..0000000000
--- a/ext/tk/lib/tk/selection.rb
+++ /dev/null
@@ -1,87 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/selection.rb : control selection
-#
-require 'tk'
-
-module TkSelection
-  include Tk
-  extend Tk
-
-  TkCommandNames = ['selection'.freeze].freeze
-
-  def self.clear(sel=nil)
-    if sel
-      tk_call_without_enc('selection', 'clear', '-selection', sel)
-    else
-      tk_call_without_enc('selection', 'clear')
-    end
-  end
-  def self.clear_on_display(win, sel=nil)
-    if sel
-      tk_call_without_enc('selection', 'clear',
-                          '-displayof', win, '-selection', sel)
-    else
-      tk_call_without_enc('selection', 'clear', '-displayof', win)
-    end
-  end
-  def clear(sel=nil)
-    TkSelection.clear_on_display(self, sel)
-    self
-  end
-
-  def self.get(keys=nil)
-    #tk_call('selection', 'get', *hash_kv(keys))
-    _fromUTF8(tk_call_without_enc('selection', 'get', *hash_kv(keys)))
-  end
-  def self.get_on_display(win, keys=nil)
-    #tk_call('selection', 'get', '-displayof', win, *hash_kv(keys))
-    _fromUTF8(tk_call_without_enc('selection', 'get', '-displayof',
-                                  win, *hash_kv(keys)))
-  end
-  def get(keys=nil)
-    TkSelection.get_on_display(self, sel)
-  end
-
-  def self.handle(win, func=Proc.new, keys=nil, &b)
-    if func.kind_of?(Hash) && keys == nil
-      keys = func
-      func = Proc.new(&b)
-    end
-    args = ['selection', 'handle']
-    args.concat(hash_kv(keys))
-    args.concat([win, func])
-    tk_call_without_enc(*args)
-  end
-  def handle(func=Proc.new, keys=nil, &b)
-    TkSelection.handle(self, func, keys, &b)
-  end
-
-  def self.get_owner(sel=nil)
-    if sel
-      window(tk_call_without_enc('selection', 'own', '-selection', sel))
-    else
-      window(tk_call_without_enc('selection', 'own'))
-    end
-  end
-  def self.get_owner_on_display(win, sel=nil)
-    if sel
-      window(tk_call_without_enc('selection', 'own',
-                                 '-displayof', win, '-selection', sel))
-    else
-      window(tk_call_without_enc('selection', 'own', '-displayof', win))
-    end
-  end
-  def get_owner(sel=nil)
-    TkSelection.get_owner_on_display(self, sel)
-    self
-  end
-
-  def self.set_owner(win, keys=nil)
-    tk_call_without_enc('selection', 'own', *(hash_kv(keys) << win))
-  end
-  def set_owner(keys=nil)
-    TkSelection.set_owner(self, keys)
-    self
-  end
-end
diff --git a/ext/tk/lib/tk/spinbox.rb b/ext/tk/lib/tk/spinbox.rb
deleted file mode 100644
index 4be41c4266..0000000000
--- a/ext/tk/lib/tk/spinbox.rb
+++ /dev/null
@@ -1,145 +0,0 @@
-# frozen_string_literal: false
-#
-#               tk/spinbox.rb - Tk spinbox classes
-#                       by Yukihiro Matsumoto <matz@caelum.co.jp>
-#
-require 'tk'
-require 'tk/entry'
-
-class Tk::Spinbox<Tk::Entry
-  TkCommandNames = ['spinbox'.freeze].freeze
-  WidgetClassName = 'Spinbox'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  class SpinCommand < TkValidateCommand
-    class ValidateArgs < TkUtil::CallbackSubst
-      KEY_TBL = [
-        [ ?d, ?s, :direction ],
-        [ ?s, ?e, :current ],
-        [ ?W, ?w, :widget ],
-        nil
-      ]
-
-      PROC_TBL = [
-        [ ?s, TkComm.method(:string) ],
-        [ ?w, TkComm.method(:window) ],
-
-        [ ?e, proc{|val|
-            #enc = Tk.encoding
-            enc = ((Tk.encoding)? Tk.encoding : Tk.encoding_system)
-            if enc
-              Tk.fromUTF8(TkComm::string(val), enc)
-            else
-              TkComm::string(val)
-            end
-          }
-        ],
-
-        nil
-      ]
-
-=begin
-      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-      KEY_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-        end
-        inf
-      }
-
-      PROC_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-        end
-        inf
-      }
-=end
-
-      _setup_subst_table(KEY_TBL, PROC_TBL);
-
-      def self.ret_val(val)
-        (val)? '1': '0'
-      end
-    end
-
-    def self._config_keys
-      ['command']
-    end
-  end
-
-  def __validation_class_list
-    super() << SpinCommand
-  end
-
-  Tk::ValidateConfigure.__def_validcmd(binding, SpinCommand)
-
-  #def create_self(keys)
-  #  tk_call_without_enc('spinbox', @path)
-  #  if keys and keys != None
-  #    configure(keys)
-  #  end
-  #end
-  #private :create_self
-
-  def __boolval_optkeys
-    super() << 'wrap'
-  end
-  private :__boolval_optkeys
-
-  def __strval_optkeys
-    super() << 'buttonbackground' << 'format'
-  end
-  private :__strval_optkeys
-
-  def __listval_optkeys
-    super() << 'values'
-  end
-  private :__listval_optkeys
-
-  def identify(x, y)
-    tk_send_without_enc('identify', x, y)
-  end
-
-  def invoke(elem)
-    tk_send_without_enc('invoke', elem)
-    self
-  end
-
-  def spinup
-    begin
-      tk_send_without_enc('invoke', 'buttonup')
-    rescue RuntimeError => e
-      # old version of element?
-      begin
-        tk_send_without_enc('invoke', 'spinup')
-      rescue
-        fail e
-      end
-    end
-    self
-  end
-
-  def spindown
-    begin
-      tk_send_without_enc('invoke', 'buttondown')
-    rescue RuntimeError => e
-      # old version of element?
-      begin
-        tk_send_without_enc('invoke', 'spinup')
-      rescue
-        fail e
-      end
-    end
-    self
-  end
-
-  def set(str)
-    _fromUTF8(tk_send_without_enc('set', _get_eval_enc_str(str)))
-  end
-end
-
-#TkSpinbox = Tk::Spinbox unless Object.const_defined? :TkSpinbox
-#Tk.__set_toplevel_aliases__(:Tk, Tk::Spinbox, :TkSpinbox)
-Tk.__set_loaded_toplevel_aliases__('tk/spinbox.rb', :Tk, Tk::Spinbox,
-                                   :TkSpinbox)
diff --git a/ext/tk/lib/tk/tagfont.rb b/ext/tk/lib/tk/tagfont.rb
deleted file mode 100644
index e3fd60465c..0000000000
--- a/ext/tk/lib/tk/tagfont.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/tagfont.rb : control font of tags
-#
-require 'tk'
-
-module TkTreatTagFont
-  def font_configinfo
-    @parent.tagfont_configinfo(@id)
-  end
-#  alias font font_configinfo
-
-  def font_configure(slot)
-    @parent.tagfont_configure(@id, slot)
-    self
-  end
-
-  def latinfont_configure(ltn, keys=nil)
-    @parent.latintagfont_configure(@id, ltn, keys)
-    self
-  end
-  alias asciifont_configure latinfont_configure
-
-  def kanjifont_configure(knj, keys=nil)
-    @parent.kanjitagfont_configure(@id, ltn, keys)
-    self
-  end
-
-  def font_copy(win, wintag=nil)
-    @parent.tagfont_copy(@id, win, wintag)
-    self
-  end
-
-  def latinfont_copy(win, wintag=nil)
-    @parent.latintagfont_copy(@id, win, wintag)
-    self
-  end
-  alias asciifont_copy latinfont_copy
-
-  def kanjifont_copy(win, wintag=nil)
-    @parent.kanjitagfont_copy(@id, win, wintag)
-    self
-  end
-end
diff --git a/ext/tk/lib/tk/text.rb b/ext/tk/lib/tk/text.rb
deleted file mode 100644
index 616c3ae89c..0000000000
--- a/ext/tk/lib/tk/text.rb
+++ /dev/null
@@ -1,1605 +0,0 @@
-# frozen_string_literal: false
-#
-#               tk/text.rb - Tk text classes
-#                       by Yukihiro Matsumoto <matz@caelum.co.jp>
-require 'tk'
-require 'tk/itemfont'
-require 'tk/itemconfig'
-require 'tk/scrollable'
-require 'tk/txtwin_abst'
-
-module TkTextTagConfig
-  include TkTreatItemFont
-  include TkItemConfigMethod
-
-  def __item_cget_cmd(id)  # id := [ type, tagOrId ]
-    [self.path, id[0], 'cget', id[1]]
-  end
-  private :__item_cget_cmd
-
-  def __item_config_cmd(id)  # id := [ type, tagOrId ]
-    [self.path, id[0], 'configure', id[1]]
-  end
-  private :__item_config_cmd
-
-  def __item_pathname(id)
-    if id.kind_of?(Array)
-      id = tagid(id[1])
-    end
-    [self.path, id].join(';')
-  end
-  private :__item_pathname
-
-  def tag_cget_tkstring(tagOrId, option)
-    itemcget_tkstring(['tag', tagOrId], option)
-  end
-  def tag_cget(tagOrId, option)
-    itemcget(['tag', tagOrId], option)
-  end
-  def tag_cget_strict(tagOrId, option)
-    itemcget_strict(['tag', tagOrId], option)
-  end
-  def tag_configure(tagOrId, slot, value=None)
-    itemconfigure(['tag', tagOrId], slot, value)
-  end
-  def tag_configinfo(tagOrId, slot=nil)
-    itemconfiginfo(['tag', tagOrId], slot)
-  end
-  def current_tag_configinfo(tagOrId, slot=nil)
-    current_itemconfiginfo(['tag', tagOrId], slot)
-  end
-
-  def window_cget_tkstring(tagOrId, option)
-    itemcget_tkstring(['window', tagOrId], option)
-  end
-  def window_cget(tagOrId, option)
-    itemcget(['window', tagOrId], option)
-  end
-  def window_cget_strict(tagOrId, option)
-    itemcget_strict(['window', tagOrId], option)
-  end
-  def window_configure(tagOrId, slot, value=None)
-    itemconfigure(['window', tagOrId], slot, value)
-  end
-  def window_configinfo(tagOrId, slot=nil)
-    itemconfiginfo(['window', tagOrId], slot)
-  end
-  def current_window_configinfo(tagOrId, slot=nil)
-    current_itemconfiginfo(['window', tagOrId], slot)
-  end
-
-  private :itemcget_tkstring, :itemcget, :itemcget_strict
-  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
-end
-
-class Tk::Text<TkTextWin
-  ItemConfCMD = ['tag'.freeze, 'configure'.freeze].freeze
-  #include TkTreatTextTagFont
-  include TkTextTagConfig
-  include Scrollable
-
-  #######################################
-
-  module IndexModMethods
-    def +(mod)
-      return chars(mod) if mod.kind_of?(Numeric)
-
-      mod = mod.to_s
-      if mod =~ /^\s*[+-]?\d/
-        Tk::Text::IndexString.new(String.new(id) << ' + ' << mod)
-      else
-        Tk::Text::IndexString.new(String.new(id) << ' ' << mod)
-      end
-    end
-
-    def -(mod)
-      return chars(-mod) if mod.kind_of?(Numeric)
-
-      mod = mod.to_s
-      if mod =~ /^\s*[+-]?\d/
-        Tk::Text::IndexString.new(String.new(id) << ' - ' << mod)
-      elsif mod =~ /^\s*[-]\s+(\d.*)$/
-        Tk::Text::IndexString.new(String.new(id) << ' - -' << $1)
-      else
-        Tk::Text::IndexString.new(String.new(id) << ' ' << mod)
-      end
-    end
-
-    def chars(mod)
-      fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
-      if mod < 0
-        Tk::Text::IndexString.new(String.new(id) << ' ' << mod.to_s << ' chars')
-      else
-        Tk::Text::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' chars')
-      end
-    end
-    alias char chars
-
-    def display_chars(mod)
-      # Tk8.5 feature
-      fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
-      if mod < 0
-        Tk::Text::IndexString.new(String.new(id) << ' ' << mod.to_s << ' display chars')
-      else
-        Tk::Text::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' display chars')
-      end
-    end
-    alias display_char display_chars
-
-    def any_chars(mod)
-      # Tk8.5 feature
-      fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
-      if mod < 0
-        Tk::Text::IndexString.new(String.new(id) << ' ' << mod.to_s << ' any chars')
-      else
-        Tk::Text::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' any chars')
-      end
-    end
-    alias any_char any_chars
-
-    def indices(mod)
-      # Tk8.5 feature
-      fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
-      if mod < 0
-        Tk::Text::IndexString.new(String.new(id) << ' ' << mod.to_s << ' indices')
-      else
-        Tk::Text::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' indices')
-      end
-    end
-
-    def display_indices(mod)
-      # Tk8.5 feature
-      fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
-      if mod < 0
-        Tk::Text::IndexString.new(String.new(id) << ' ' << mod.to_s << ' display indices')
-      else
-        Tk::Text::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' display indices')
-      end
-    end
-
-    def any_indices(mod)
-      # Tk8.5 feature
-      fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
-      if mod < 0
-        Tk::Text::IndexString.new(String.new(id) << ' ' << mod.to_s << ' any indices')
-      else
-        Tk::Text::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' any indices')
-      end
-    end
-
-    def lines(mod)
-      fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
-      if mod < 0
-        Tk::Text::IndexString.new(String.new(id) << ' ' << mod.to_s << ' lines')
-      else
-        Tk::Text::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' lines')
-      end
-    end
-    alias line lines
-
-    def display_lines(mod)
-      # Tk8.5 feature
-      fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
-      if mod < 0
-        Tk::Text::IndexString.new(String.new(id) << ' ' << mod.to_s << ' display_lines')
-      else
-        Tk::Text::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' display lines')
-      end
-    end
-    alias display_line display_lines
-
-    def any_lines(mod)
-      # Tk8.5 feature
-      fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
-      if mod < 0
-        Tk::Text::IndexString.new(String.new(id) << ' ' << mod.to_s << ' any_lines')
-      else
-        Tk::Text::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' any lines')
-      end
-    end
-    alias any_line any_lines
-
-    def linestart
-      Tk::Text::IndexString.new(String.new(id) << ' linestart')
-    end
-    def lineend
-      Tk::Text::IndexString.new(String.new(id) << ' lineend')
-    end
-
-    def display_linestart
-      # Tk8.5 feature
-      Tk::Text::IndexString.new(String.new(id) << ' display linestart')
-    end
-    def display_lineend
-      # Tk8.5 feature
-      Tk::Text::IndexString.new(String.new(id) << ' display lineend')
-    end
-
-    def wordstart
-      Tk::Text::IndexString.new(String.new(id) << ' wordstart')
-    end
-    def wordend
-      Tk::Text::IndexString.new(String.new(id) << ' wordend')
-    end
-
-    def display_wordstart
-      # Tk8.5 feature
-      Tk::Text::IndexString.new(String.new(id) << ' display wordstart')
-    end
-    def display_wordend
-      # Tk8.5 feature
-      Tk::Text::IndexString.new(String.new(id) << ' display wordend')
-    end
-  end
-
-  class IndexString < String
-    include IndexModMethods
-
-    def self.at(x,y)
-      self.new("@#{x},#{y}")
-    end
-
-    def self.new(str)
-      if str.kind_of?(String)
-        super(str)
-      elsif str.kind_of?(Symbol)
-        super(str.to_s)
-      else
-        str
-      end
-    end
-
-    def id
-      self
-    end
-  end
-
-  #######################################
-
-  TkCommandNames = ['text'.freeze].freeze
-  WidgetClassName = 'Text'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def self.new(*args, &block)
-    obj = super(*args){}
-    obj.init_instance_variable
-    if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-      obj.instance_exec(obj, &block) if defined? yield
-    else
-      obj.instance_eval(&block) if defined? yield
-    end
-    obj
-  end
-
-  def init_instance_variable
-    @cmdtbl = []
-    @tags = {}
-  end
-
-  def __destroy_hook__
-    TkTextTag::TTagID_TBL.mutex.synchronize{
-      TkTextTag::TTagID_TBL.delete(@path)
-    }
-    TkTextTag::TMarkID_TBL.mutex.synchronize{
-      TkTextMark::TMarkID_TBL.delete(@path)
-    }
-  end
-
-  def create_self(keys)
-    #if keys and keys != None
-    #  #tk_call_without_enc('text', @path, *hash_kv(keys, true))
-    #  tk_call_without_enc(self.class::TkCommandNames[0], @path,
-    #                     *hash_kv(keys, true))
-    #else
-    #  #tk_call_without_enc('text', @path)
-    #  tk_call_without_enc(self.class::TkCommandNames[0], @path)
-    #end
-    super(keys)
-    init_instance_variable
-  end
-  private :create_self
-
-  def __strval_optkeys
-    super() << 'inactiveseletcionbackground'
-  end
-  private :__strval_optkeys
-
-  def self.at(x, y)
-    Tk::Text::IndexString.at(x, y)
-  end
-
-  def at(x, y)
-    Tk::Text::IndexString.at(x, y)
-  end
-
-  def index(idx)
-    Tk::Text::IndexString.new(tk_send_without_enc('index',
-                                                  _get_eval_enc_str(idx)))
-  end
-
-  def get_displaychars(*index)
-    # Tk8.5 feature
-    get('-displaychars', *index)
-  end
-
-  def value
-    _fromUTF8(tk_send_without_enc('get', "1.0", "end - 1 char"))
-  end
-
-  def value= (val)
-    tk_send_without_enc('delete', "1.0", 'end')
-    tk_send_without_enc('insert', "1.0", _get_eval_enc_str(val))
-    val
-  end
-
-  def clear
-    tk_send_without_enc('delete', "1.0", 'end')
-    self
-  end
-  alias erase clear
-
-  def _addcmd(cmd)
-    @cmdtbl.push cmd
-  end
-
-  def _addtag(name, obj)
-    @tags[name] = obj
-  end
-
-  def tagid(tag)
-    if tag.kind_of?(TkTextTag) \
-      || tag.kind_of?(TkTextMark) \
-      || tag.kind_of?(TkTextImage) \
-      || tag.kind_of?(TkTextWindow)
-      tag.id
-    else
-      tag  # maybe an Array of configure parameters
-    end
-  end
-  private :tagid
-
-  def tagid2obj(tagid)
-    if @tags[tagid]
-      @tags[tagid]
-    else
-      tagid
-    end
-  end
-
-  def tag_names(index=None)
-    #tk_split_simplelist(_fromUTF8(tk_send_without_enc('tag', 'names', _get_eval_enc_str(index)))).collect{|elt|
-    tk_split_simplelist(tk_send_without_enc('tag', 'names', _get_eval_enc_str(index)), false, true).collect{|elt|
-      tagid2obj(elt)
-    }
-  end
-
-  def mark_names
-    #tk_split_simplelist(_fromUTF8(tk_send_without_enc('mark', 'names'))).collect{|elt|
-    tk_split_simplelist(tk_send_without_enc('mark', 'names'), false, true).collect{|elt|
-      tagid2obj(elt)
-    }
-  end
-
-  def mark_gravity(mark, direction=nil)
-    if direction
-      tk_send_without_enc('mark', 'gravity',
-                          _get_eval_enc_str(mark), direction)
-      self
-    else
-      tk_send_without_enc('mark', 'gravity', _get_eval_enc_str(mark))
-    end
-  end
-
-  def mark_set(mark, index)
-    tk_send_without_enc('mark', 'set', _get_eval_enc_str(mark),
-                        _get_eval_enc_str(index))
-    self
-  end
-  alias set_mark mark_set
-
-  def mark_unset(*marks)
-    tk_send_without_enc('mark', 'unset',
-                        *(marks.collect{|mark| _get_eval_enc_str(mark)}))
-    self
-  end
-  alias unset_mark mark_unset
-
-  def mark_next(index)
-    tagid2obj(_fromUTF8(tk_send_without_enc('mark', 'next',
-                                            _get_eval_enc_str(index))))
-  end
-  alias next_mark mark_next
-
-  def mark_previous(index)
-    tagid2obj(_fromUTF8(tk_send_without_enc('mark', 'previous',
-                                            _get_eval_enc_str(index))))
-  end
-  alias previous_mark mark_previous
-
-  def image_cget_strict(index, slot)
-    case slot.to_s
-    when 'text', 'label', 'show', 'data', 'file'
-      _fromUTF8(tk_send_without_enc('image', 'cget',
-                                    _get_eval_enc_str(index), "-#{slot}"))
-    else
-      tk_tcl2ruby(_fromUTF8(tk_send_without_enc('image', 'cget',
-                                                _get_eval_enc_str(index),
-                                                "-#{slot}")))
-    end
-  end
-
-  def image_cget(index, slot)
-    unless TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-      image_cget_strict(index, slot)
-    else
-      begin
-        image_cget_strict(index, slot)
-      rescue => e
-        begin
-          if current_image_configinfo(index).has_key?(slot.to_s)
-            # not tag error & option is known -> error on known option
-            fail e
-          else
-            # not tag error & option is unknown
-            nil
-          end
-        rescue
-          fail e  # tag error
-        end
-      end
-    end
-  end
-
-  def image_configure(index, slot, value=None)
-    if slot.kind_of?(Hash)
-      _fromUTF8(tk_send_without_enc('image', 'configure',
-                                    _get_eval_enc_str(index),
-                                    *hash_kv(slot, true)))
-    else
-      _fromUTF8(tk_send_without_enc('image', 'configure',
-                                    _get_eval_enc_str(index),
-                                    "-#{slot}",
-                                    _get_eval_enc_str(value)))
-    end
-    self
-  end
-
-  def image_configinfo(index, slot = nil)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if slot
-        case slot.to_s
-        when 'text', 'label', 'show', 'data', 'file'
-          #conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}")))
-          conf = tk_split_simplelist(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}"), false, true)
-        else
-          #conf = tk_split_list(_fromUTF8(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}")))
-          conf = tk_split_list(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}"), 0, false, true)
-        end
-        conf[0] = conf[0][1..-1]
-        conf
-      else
-        # tk_split_simplelist(_fromUTF8(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index)))).collect{|conflist|
-        #  conf = tk_split_simplelist(conflist)
-        tk_split_simplelist(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index)), false, false).collect{|conflist|
-          conf = tk_split_simplelist(conflist, false, true)
-          conf[0] = conf[0][1..-1]
-          case conf[0]
-          when 'text', 'label', 'show', 'data', 'file'
-          else
-            if conf[3]
-              if conf[3].index('{')
-                conf[3] = tk_split_list(conf[3])
-              else
-                conf[3] = tk_tcl2ruby(conf[3])
-              end
-            end
-            if conf[4]
-              if conf[4].index('{')
-                conf[4] = tk_split_list(conf[4])
-              else
-                conf[4] = tk_tcl2ruby(conf[4])
-              end
-            end
-          end
-          conf[1] = conf[1][1..-1] if conf.size == 2 # alias info
-          conf
-        }
-      end
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      if slot
-        case slot.to_s
-        when 'text', 'label', 'show', 'data', 'file'
-          #conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}")))
-          conf = tk_split_simplelist(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}"), false, true)
-        else
-          #conf = tk_split_list(_fromUTF8(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}")))
-          conf = tk_split_list(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}"), 0, false, true)
-        end
-        key = conf.shift[1..-1]
-        { key => conf }
-      else
-        ret = {}
-        #tk_split_simplelist(_fromUTF8(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index)))).each{|conflist|
-        #  conf = tk_split_simplelist(conflist)
-        tk_split_simplelist(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index)), false, false).each{|conflist|
-          conf = tk_split_simplelist(conflist, false, true)
-          key = conf.shift[1..-1]
-          case key
-          when 'text', 'label', 'show', 'data', 'file'
-          else
-            if conf[2]
-              if conf[2].index('{')
-                conf[2] = tk_split_list(conf[2])
-              else
-                conf[2] = tk_tcl2ruby(conf[2])
-              end
-            end
-            if conf[3]
-              if conf[3].index('{')
-                conf[3] = tk_split_list(conf[3])
-              else
-                conf[3] = tk_tcl2ruby(conf[3])
-              end
-            end
-          end
-          if conf.size == 1
-            ret[key] = conf[0][1..-1]  # alias info
-          else
-            ret[key] = conf
-          end
-        }
-        ret
-      end
-    end
-  end
-
-  def current_image_configinfo(index, slot = nil)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if slot
-        conf = image_configinfo(index, slot)
-        {conf[0] => conf[4]}
-      else
-        ret = {}
-        image_configinfo(index).each{|conf|
-          ret[conf[0]] = conf[4] if conf.size > 2
-        }
-        ret
-      end
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      ret = {}
-      image_configinfo(index, slot).each{|k, conf|
-        ret[k] = conf[-1] if conf.kind_of?(Array)
-      }
-      ret
-    end
-  end
-
-  def image_names
-    #tk_split_simplelist(_fromUTF8(tk_send_without_enc('image', 'names'))).collect{|elt|
-    tk_split_simplelist(tk_send_without_enc('image', 'names'), false, true).collect{|elt|
-      tagid2obj(elt)
-    }
-  end
-
-  def set_insert(index)
-    tk_send_without_enc('mark','set','insert', _get_eval_enc_str(index))
-    self
-  end
-
-  def set_current(index)
-    tk_send_without_enc('mark','set','current', _get_eval_enc_str(index))
-    self
-  end
-
-  def insert(index, chars, *tags)
-    if tags[0].kind_of?(Array)
-      # multiple chars-taglist argument :: str, [tag,...], str, [tag,...], ...
-      args = [chars]
-      while tags.size > 0
-        args << tags.shift.collect{|x|_get_eval_string(x)}.join(' ')  # taglist
-        args << tags.shift if tags.size > 0                           # chars
-      end
-      super(index, *args)
-    else
-      # single chars-taglist argument :: str, tag, tag, ...
-      if tags.size == 0
-        super(index, chars)
-      else
-        super(index, chars, tags.collect{|x|_get_eval_string(x)}.join(' '))
-      end
-    end
-  end
-
-  def destroy
-    @tags = {} unless @tags
-    @tags.each_value do |t|
-      t.destroy
-    end
-    super()
-  end
-
-  def backspace
-    self.delete 'insert'
-  end
-
-  def bbox(index)
-    list(tk_send_without_enc('bbox', _get_eval_enc_str(index)))
-  end
-
-  def compare(idx1, op, idx2)
-    bool(tk_send_without_enc('compare', _get_eval_enc_str(idx1),
-                             op, _get_eval_enc_str(idx2)))
-  end
-
-  def count(idx1, idx2, *opts)
-    # opts are Tk8.5 feature
-    cnt = 0
-    args = opts.collect{|opt|
-      str = opt.to_s
-      cnt += 1 if str != 'update'
-      '-' + str
-    }
-    args << _get_eval_enc_str(idx1) << _get_eval_enc_str(idx2)
-    if cnt <= 1
-      number(tk_send_without_enc('count', *opts))
-    else
-      list(tk_send_without_enc('count', *opts))
-    end
-  end
-
-  def count_info(idx1, idx2, update=true)
-    # Tk8.5 feature
-    opts = [
-      :chars, :displaychars, :displayindices, :displaylines,
-      :indices, :lines, :xpixels, :ypixels
-    ]
-    if update
-      lst = count(idx1, idx2, :update, *opts)
-    else
-      lst = count(idx1, idx2, *opts)
-    end
-    info = {}
-    opts.each_with_index{|key, idx| info[key] = lst[idx]}
-    info
-  end
-
-  def peer_names()
-    # Tk8.5 feature
-    list(tk_send_without_enc('peer', 'names'))
-  end
-
-  def replace(idx1, idx2, *opts)
-    tk_send('replace', idx1, idx2, *opts)
-    self
-  end
-
-  def debug
-    bool(tk_send_without_enc('debug'))
-  end
-  def debug=(boolean)
-    tk_send_without_enc('debug', boolean)
-    #self
-    boolean
-  end
-
-  def dlineinfo(index)
-    list(tk_send_without_enc('dlineinfo', _get_eval_enc_str(index)))
-  end
-
-  def modified?
-    bool(tk_send_without_enc('edit', 'modified'))
-  end
-  def modified(mode)
-    tk_send_without_enc('edit', 'modified', mode)
-    self
-  end
-  def modified=(mode)
-    modified(mode)
-    mode
-  end
-
-  def edit_redo
-    tk_send_without_enc('edit', 'redo')
-    self
-  end
-  def edit_reset
-    tk_send_without_enc('edit', 'reset')
-    self
-  end
-  def edit_separator
-    tk_send_without_enc('edit', 'separator')
-    self
-  end
-  def edit_undo
-    tk_send_without_enc('edit', 'undo')
-    self
-  end
-
-  def xview_pickplace(index)
-    tk_send_without_enc('xview', '-pickplace', _get_eval_enc_str(index))
-    self
-  end
-
-  def yview_pickplace(index)
-    tk_send_without_enc('yview', '-pickplace', _get_eval_enc_str(index))
-    self
-  end
-
-  def text_copy
-    # Tk8.4 feature
-    tk_call_without_enc('tk_textCopy', @path)
-    self
-  end
-
-  def text_cut
-    # Tk8.4 feature
-    tk_call_without_enc('tk_textCut', @path)
-    self
-  end
-
-  def text_paste
-    # Tk8.4 feature
-    tk_call_without_enc('tk_textPaste', @path)
-    self
-  end
-
-  def tag_add(tag, index1, index2=None)
-    tk_send_without_enc('tag', 'add', _get_eval_enc_str(tag),
-                        _get_eval_enc_str(index1),
-                        _get_eval_enc_str(index2))
-    self
-  end
-  alias addtag tag_add
-  alias add_tag tag_add
-
-  def tag_delete(*tags)
-    tk_send_without_enc('tag', 'delete',
-                        *(tags.collect{|tag| _get_eval_enc_str(tag)}))
-    TkTextTag::TTagID_TBL.mutex.synchronize{
-      if TkTextTag::TTagID_TBL[@path]
-        tags.each{|tag|
-          if tag.kind_of?(TkTextTag)
-            TkTextTag::TTagID_TBL[@path].delete(tag.id)
-          else
-            TkTextTag::TTagID_TBL[@path].delete(tag)
-          end
-        }
-      end
-    }
-    self
-  end
-  alias deltag tag_delete
-  alias delete_tag tag_delete
-
-  #def tag_bind(tag, seq, cmd=Proc.new, *args)
-  #  _bind([@path, 'tag', 'bind', tag], seq, cmd, *args)
-  #  self
-  #end
-  def tag_bind(tag, seq, *args)
-    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _bind([@path, 'tag', 'bind', tag], seq, cmd, *args)
-    self
-  end
-
-  #def tag_bind_append(tag, seq, cmd=Proc.new, *args)
-  #  _bind_append([@path, 'tag', 'bind', tag], seq, cmd, *args)
-  #  self
-  #end
-  def tag_bind_append(tag, seq, *args)
-    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _bind_append([@path, 'tag', 'bind', tag], seq, cmd, *args)
-    self
-  end
-
-  def tag_bind_remove(tag, seq)
-    _bind_remove([@path, 'tag', 'bind', tag], seq)
-    self
-  end
-
-  def tag_bindinfo(tag, context=nil)
-    _bindinfo([@path, 'tag', 'bind', tag], context)
-  end
-
-=begin
-  def tag_cget(tag, key)
-    case key.to_s
-    when 'text', 'label', 'show', 'data', 'file'
-      tk_call_without_enc(@path, 'tag', 'cget',
-                          _get_eval_enc_str(tag), "-#{key}")
-    when 'font', 'kanjifont'
-      #fnt = tk_tcl2ruby(tk_send('tag', 'cget', tag, "-#{key}"))
-      fnt = tk_tcl2ruby(_fromUTF8(tk_send_without_enc('tag','cget',_get_eval_enc_str(tag),'-font')))
-      unless fnt.kind_of?(TkFont)
-        fnt = tagfontobj(tag, fnt)
-      end
-      if key.to_s == 'kanjifont' && JAPANIZED_TK && TK_VERSION =~ /^4\.*/
-        # obsolete; just for compatibility
-        fnt.kanji_font
-      else
-        fnt
-      end
-    else
-      tk_tcl2ruby(_fromUTF8(tk_call_without_enc(@path,'tag','cget',_get_eval_enc_str(tag),"-#{key}")))
-    end
-  end
-
-  def tag_configure(tag, key, val=None)
-    if key.kind_of?(Hash)
-      key = _symbolkey2str(key)
-      if ( key['font'] || key['kanjifont'] \
-          || key['latinfont'] || key['asciifont'] )
-        tagfont_configure(tag, key)
-      else
-        tk_send_without_enc('tag', 'configure', _get_eval_enc_str(tag),
-                            *hash_kv(key, true))
-      end
-
-    else
-      if  key == 'font' || key == :font ||
-          key == 'kanjifont' || key == :kanjifont ||
-          key == 'latinfont' || key == :latinfont ||
-          key == 'asciifont' || key == :asciifont
-        if val == None
-          tagfontobj(tag)
-        else
-          tagfont_configure(tag, {key=>val})
-        end
-      else
-        tk_send_without_enc('tag', 'configure', _get_eval_enc_str(tag),
-                            "-#{key}", _get_eval_enc_str(val))
-      end
-    end
-    self
-  end
-
-  def tag_configinfo(tag, key=nil)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if key
-        case key.to_s
-        when 'text', 'label', 'show', 'data', 'file'
-          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('tag','configure',_get_eval_enc_str(tag),"-#{key}")))
-        when 'font', 'kanjifont'
-          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('tag','configure',_get_eval_enc_str(tag),"-#{key}")))
-          conf[4] = tagfont_configinfo(tag, conf[4])
-        else
-          conf = tk_split_list(_fromUTF8(tk_send_without_enc('tag','configure',_get_eval_enc_str(tag),"-#{key}")))
-        end
-        conf[0] = conf[0][1..-1]
-        conf
-      else
-        ret = tk_split_simplelist(_fromUTF8(tk_send('tag','configure',_get_eval_enc_str(tag)))).collect{|conflist|
-          conf = tk_split_simplelist(conflist)
-          conf[0] = conf[0][1..-1]
-          case conf[0]
-          when 'text', 'label', 'show', 'data', 'file'
-          else
-            if conf[3]
-              if conf[3].index('{')
-                conf[3] = tk_split_list(conf[3])
-              else
-                conf[3] = tk_tcl2ruby(conf[3])
-              end
-            end
-            if conf[4]
-              if conf[4].index('{')
-                conf[4] = tk_split_list(conf[4])
-              else
-                conf[4] = tk_tcl2ruby(conf[4])
-              end
-            end
-          end
-          conf[1] = conf[1][1..-1] if conf.size == 2 # alias info
-          conf
-        }
-        fontconf = ret.assoc('font')
-        if fontconf
-          ret.delete_if{|item| item[0] == 'font' || item[0] == 'kanjifont'}
-          fontconf[4] = tagfont_configinfo(tag, fontconf[4])
-          ret.push(fontconf)
-        else
-          ret
-        end
-      end
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      if key
-        case key.to_s
-        when 'text', 'label', 'show', 'data', 'file'
-          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('tag','configure',_get_eval_enc_str(tag),"-#{key}")))
-        when 'font', 'kanjifont'
-          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('tag','configure',_get_eval_enc_str(tag),"-#{key}")))
-          conf[4] = tagfont_configinfo(tag, conf[4])
-        else
-          conf = tk_split_list(_fromUTF8(tk_send_without_enc('tag','configure',_get_eval_enc_str(tag),"-#{key}")))
-        end
-        key = conf.shift[1..-1]
-        { key => conf }
-      else
-        ret = {}
-        tk_split_simplelist(_fromUTF8(tk_send('tag','configure',_get_eval_enc_str(tag)))).each{|conflist|
-          conf = tk_split_simplelist(conflist)
-          key = conf.shift[1..-1]
-          case key
-          when 'text', 'label', 'show', 'data', 'file'
-          else
-            if conf[2]
-              if conf[2].index('{')
-                conf[2] = tk_split_list(conf[2])
-              else
-                conf[2] = tk_tcl2ruby(conf[2])
-              end
-            end
-            if conf[3]
-              if conf[3].index('{')
-                conf[3] = tk_split_list(conf[3])
-              else
-                conf[3] = tk_tcl2ruby(conf[3])
-              end
-            end
-          end
-          if conf.size == 1
-            ret[key] = conf[0][1..-1]  # alias info
-          else
-            ret[key] = conf
-          end
-        }
-        fontconf = ret['font']
-        if fontconf
-          ret.delete('font')
-          ret.delete('kanjifont')
-          fontconf[3] = tagfont_configinfo(tag, fontconf[3])
-          ret['font'] = fontconf
-        end
-        ret
-      end
-    end
-  end
-
-  def current_tag_configinfo(tag, key=nil)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if key
-        conf = tag_configinfo(tag, key)
-        {conf[0] => conf[4]}
-      else
-        ret = {}
-        tag_configinfo(tag).each{|conf|
-          ret[conf[0]] = conf[4] if conf.size > 2
-        }
-        ret
-      end
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      ret = {}
-      tag_configinfo(tag, key).each{|k, conf|
-        ret[k] = conf[-1] if conf.kind_of?(Array)
-      }
-      ret
-    end
-  end
-=end
-
-  def tag_raise(tag, above=None)
-    tk_send_without_enc('tag', 'raise', _get_eval_enc_str(tag),
-                        _get_eval_enc_str(above))
-    self
-  end
-
-  def tag_lower(tag, below=None)
-    tk_send_without_enc('tag', 'lower', _get_eval_enc_str(tag),
-                        _get_eval_enc_str(below))
-    self
-  end
-
-  def tag_remove(tag, *indices)
-    tk_send_without_enc('tag', 'remove', _get_eval_enc_str(tag),
-                        *(indices.collect{|idx| _get_eval_enc_str(idx)}))
-    self
-  end
-
-  def tag_ranges(tag)
-    #l = tk_split_simplelist(tk_send_without_enc('tag', 'ranges',
-    #                                            _get_eval_enc_str(tag)))
-    l = tk_split_simplelist(tk_send_without_enc('tag', 'ranges',
-                                                _get_eval_enc_str(tag)),
-                            false, true)
-    r = []
-    while key=l.shift
-      r.push [Tk::Text::IndexString.new(key), Tk::Text::IndexString.new(l.shift)]
-    end
-    r
-  end
-
-  def tag_nextrange(tag, first, last=None)
-    simplelist(tk_send_without_enc('tag', 'nextrange',
-                                   _get_eval_enc_str(tag),
-                                   _get_eval_enc_str(first),
-                                   _get_eval_enc_str(last))).collect{|idx|
-      Tk::Text::IndexString.new(idx)
-    }
-  end
-
-  def tag_prevrange(tag, first, last=None)
-    simplelist(tk_send_without_enc('tag', 'prevrange',
-                                   _get_eval_enc_str(tag),
-                                   _get_eval_enc_str(first),
-                                   _get_eval_enc_str(last))).collect{|idx|
-      Tk::Text::IndexString.new(idx)
-    }
-  end
-
-=begin
-  def window_cget(index, slot)
-    case slot.to_s
-    when 'text', 'label', 'show', 'data', 'file'
-      _fromUTF8(tk_send_without_enc('window', 'cget',
-                                    _get_eval_enc_str(index), "-#{slot}"))
-    when 'font', 'kanjifont'
-      #fnt = tk_tcl2ruby(tk_send('window', 'cget', index, "-#{slot}"))
-      fnt = tk_tcl2ruby(_fromUTF8(tk_send_without_enc('window', 'cget', _get_eval_enc_str(index), '-font')))
-      unless fnt.kind_of?(TkFont)
-        fnt = tagfontobj(index, fnt)
-      end
-      if slot.to_s == 'kanjifont' && JAPANIZED_TK && TK_VERSION =~ /^4\.*/
-        # obsolete; just for compatibility
-        fnt.kanji_font
-      else
-        fnt
-      end
-    else
-      tk_tcl2ruby(_fromUTF8(tk_send_without_enc('window', 'cget', _get_eval_enc_str(index), "-#{slot}")))
-    end
-  end
-
-  def window_configure(index, slot, value=None)
-    if index.kind_of?(TkTextWindow)
-      index.configure(slot, value)
-    else
-      if slot.kind_of?(Hash)
-        slot = _symbolkey2str(slot)
-        win = slot['window']
-        # slot['window'] = win.epath if win.kind_of?(TkWindow)
-        slot['window'] = _epath(win) if win
-        if slot['create']
-          p_create = slot['create']
-          if p_create.kind_of?(Proc)
-#=begin
-            slot['create'] = install_cmd(proc{
-                                           id = p_create.call
-                                           if id.kind_of?(TkWindow)
-                                             id.epath
-                                           else
-                                             id
-                                           end
-                                         })
-#=end
-            slot['create'] = install_cmd(proc{_epath(p_create.call)})
-          end
-        end
-        tk_send_without_enc('window', 'configure',
-                            _get_eval_enc_str(index),
-                            *hash_kv(slot, true))
-      else
-        if slot == 'window' || slot == :window
-          # id = value
-          # value = id.epath if id.kind_of?(TkWindow)
-          value = _epath(value)
-        end
-        if slot == 'create' || slot == :create
-          p_create = value
-          if p_create.kind_of?(Proc)
-#=begin
-            value = install_cmd(proc{
-                                  id = p_create.call
-                                  if id.kind_of?(TkWindow)
-                                    id.epath
-                                  else
-                                    id
-                                  end
-                                })
-#=end
-            value = install_cmd(proc{_epath(p_create.call)})
-          end
-        end
-        tk_send_without_enc('window', 'configure',
-                            _get_eval_enc_str(index),
-                            "-#{slot}", _get_eval_enc_str(value))
-      end
-    end
-    self
-  end
-
-  def window_configinfo(win, slot = nil)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if slot
-        case slot.to_s
-        when 'text', 'label', 'show', 'data', 'file'
-          conf = tk_split_simplelist(_fromUTF8(tk_send('window', 'configure', _get_eval_enc_str(win), "-#{slot}")))
-        else
-          conf = tk_split_list(_fromUTF8(tk_send('window', 'configure', _get_eval_enc_str(win), "-#{slot}")))
-        end
-        conf[0] = conf[0][1..-1]
-        conf
-      else
-        tk_split_simplelist(_fromUTF8(tk_send('window', 'configure', _get_eval_enc_str(win)))).collect{|conflist|
-          conf = tk_split_simplelist(conflist)
-          conf[0] = conf[0][1..-1]
-          case conf[0]
-          when 'text', 'label', 'show', 'data', 'file'
-          else
-            if conf[3]
-              if conf[3].index('{')
-                conf[3] = tk_split_list(conf[3])
-              else
-                conf[3] = tk_tcl2ruby(conf[3])
-              end
-            end
-            if conf[4]
-              if conf[4].index('{')
-                conf[4] = tk_split_list(conf[4])
-              else
-                conf[4] = tk_tcl2ruby(conf[4])
-              end
-            end
-          end
-          conf[1] = conf[1][1..-1] if conf.size == 2 # alias info
-          conf
-        }
-      end
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      if slot
-        case slot.to_s
-        when 'text', 'label', 'show', 'data', 'file'
-          conf = tk_split_simplelist(_fromUTF8(tk_send('window', 'configure', _get_eval_enc_str(win), "-#{slot}")))
-        else
-          conf = tk_split_list(_fromUTF8(tk_send('window', 'configure', _get_eval_enc_str(win), "-#{slot}")))
-        end
-        key = conf.shift[1..-1]
-        { key => conf }
-      else
-        ret = {}
-        tk_split_simplelist(_fromUTF8(tk_send('window', 'configure', _get_eval_enc_str(win)))).each{|conflist|
-          conf = tk_split_simplelist(conflist)
-          key = conf.shift[1..-1]
-          case key
-          when 'text', 'label', 'show', 'data', 'file'
-          else
-            if conf[2]
-              if conf[2].index('{')
-                conf[2] = tk_split_list(conf[2])
-              else
-                conf[2] = tk_tcl2ruby(conf[2])
-              end
-            end
-            if conf[3]
-              if conf[3].index('{')
-                conf[3] = tk_split_list(conf[3])
-              else
-                conf[3] = tk_tcl2ruby(conf[3])
-              end
-            end
-          end
-          if conf.size == 1
-            ret[key] = conf[0][1..-1]  # alias info
-          else
-            ret[key] = conf
-          end
-        }
-        ret
-      end
-    end
-  end
-
-  def current_window_configinfo(win, slot = nil)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if slot
-        conf = window_configinfo(win, slot)
-        {conf[0] => conf[4]}
-      else
-        ret = {}
-        window_configinfo(win).each{|conf|
-          ret[conf[0]] = conf[4] if conf.size > 2
-        }
-        ret
-      end
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      ret = {}
-      window_configinfo(win, slot).each{|k, conf|
-        ret[k] = conf[-1] if conf.kind_of?(Array)
-      }
-      ret
-    end
-  end
-=end
-
-  def window_names
-    # tk_split_simplelist(_fromUTF8(tk_send_without_enc('window', 'names'))).collect{|elt|
-    tk_split_simplelist(tk_send_without_enc('window', 'names'), false, true).collect{|elt|
-      tagid2obj(elt)
-    }
-  end
-
-  def _ktext_length(txt)
-    if TkCore::WITH_ENCODING ### Ruby 1.9 !!!!!!!!!!!!!
-      return txt.length
-    end
-    ###########################
-
-    if $KCODE !~ /n/i
-      return txt.gsub(/[^\Wa-zA-Z_\d]/, ' ').length
-    end
-
-    # $KCODE == 'NONE'
-    if JAPANIZED_TK
-      tk_call_without_enc('kstring', 'length',
-                          _get_eval_enc_str(txt)).to_i
-    else
-      begin
-        tk_call_without_enc('encoding', 'convertto', 'ascii',
-                            _get_eval_enc_str(txt)).length
-      rescue StandardError, NameError
-        # sorry, I have no plan
-        txt.length
-      end
-    end
-  end
-  private :_ktext_length
-
-  def tksearch(*args)
-    # call 'search' subcommand of text widget
-    #   args ::= [<array_of_opts>] <pattern> <start_index> [<stop_index>]
-    # If <pattern> is regexp, then it must be a regular expression of Tcl
-    nocase = false
-    if args[0].kind_of?(Array)
-      opts = args.shift.collect{|opt|
-        s_opt = opt.to_s
-        nocase = true if s_opt == 'nocase'
-        '-' + s_opt
-      }
-    else
-      opts = []
-    end
-
-    if args[0].kind_of?(Regexp)
-      regexp = args.shift
-      if !nocase && (regexp.options & Regexp::IGNORECASE) != 0
-        opts << '-nocase'
-      end
-      args.unshift(regexp.source)
-    end
-
-    opts << '--'
-
-    ret = tk_send('search', *(opts + args))
-    if ret == ""
-      nil
-    else
-      Tk::Text::IndexString.new(ret)
-    end
-  end
-
-  def tksearch_with_count(*args)
-    # call 'search' subcommand of text widget
-    #   args ::= [<array_of_opts>] <var> <pattern> <start_index> [<stop_index>]
-    # If <pattern> is regexp, then it must be a regular expression of Tcl
-    nocase = false
-    if args[0].kind_of?(Array)
-      opts = args.shift.collect{|opt|
-        s_opt = opt.to_s
-        nocase = true if s_opt == 'nocase'
-        '-' + s_opt
-      }
-    else
-      opts = []
-    end
-
-    opts << '-count' << args.shift
-
-    if args[0].kind_of?(Regexp)
-      regexp = args.shift
-      if !nocase && (regexp.options & Regexp::IGNORECASE) != 0
-        opts << '-nocase'
-      end
-      args.unshift(regexp.source)
-    end
-
-    opts << '--'
-
-    ret = tk_send('search', *(opts + args))
-    if ret == ""
-      nil
-    else
-      Tk::Text::IndexString.new(ret)
-    end
-  end
-
-  def search_with_length(pat,start,stop=None)
-    pat = pat.chr if pat.kind_of?(Integer)
-    if stop != None
-      return ["", 0] if compare(start,'>=',stop)
-      txt = get(start,stop)
-      if (pos = txt.index(pat))
-        match = $&
-        #pos = txt[0..(pos-1)].split('').length if pos > 0
-        pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
-        if pat.kind_of?(String)
-          #return [index(start + " + #{pos} chars"), pat.split('').length]
-          return [index(start + " + #{pos} chars"),
-                  _ktext_length(pat), pat.dup]
-        else
-          #return [index(start + " + #{pos} chars"), $&.split('').length]
-          return [index(start + " + #{pos} chars"),
-                  _ktext_length(match), match]
-        end
-      else
-        return ["", 0]
-      end
-    else
-      txt = get(start,'end - 1 char')
-      if (pos = txt.index(pat))
-        match = $&
-        #pos = txt[0..(pos-1)].split('').length if pos > 0
-        pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
-        if pat.kind_of?(String)
-          #return [index(start + " + #{pos} chars"), pat.split('').length]
-          return [index(start + " + #{pos} chars"),
-                  _ktext_length(pat), pat.dup]
-        else
-          #return [index(start + " + #{pos} chars"), $&.split('').length]
-          return [index(start + " + #{pos} chars"),
-                  _ktext_length(match), match]
-        end
-      else
-        txt = get('1.0','end - 1 char')
-        if (pos = txt.index(pat))
-          match = $&
-          #pos = txt[0..(pos-1)].split('').length if pos > 0
-          pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
-          if pat.kind_of?(String)
-            #return [index("1.0 + #{pos} chars"), pat.split('').length]
-            return [index("1.0 + #{pos} chars"),
-                    _ktext_length(pat), pat.dup]
-          else
-            #return [index("1.0 + #{pos} chars"), $&.split('').length]
-            return [index("1.0 + #{pos} chars"), _ktext_length(match), match]
-          end
-        else
-          return ["", 0]
-        end
-      end
-    end
-  end
-
-  def search(pat,start,stop=None)
-    search_with_length(pat,start,stop)[0]
-  end
-
-  def rsearch_with_length(pat,start,stop=None)
-    pat = pat.chr if pat.kind_of?(Integer)
-    if stop != None
-      return ["", 0] if compare(start,'<=',stop)
-      txt = get(stop,start)
-      if (pos = txt.rindex(pat))
-        match = $&
-        #pos = txt[0..(pos-1)].split('').length if pos > 0
-        pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
-        if pat.kind_of?(String)
-          #return [index(stop + " + #{pos} chars"), pat.split('').length]
-          return [index(stop + " + #{pos} chars"), _ktext_length(pat), pat.dup]
-        else
-          #return [index(stop + " + #{pos} chars"), $&.split('').length]
-          return [index(stop + " + #{pos} chars"), _ktext_length(match), match]
-        end
-      else
-        return ["", 0]
-      end
-    else
-      txt = get('1.0',start)
-      if (pos = txt.rindex(pat))
-        match = $&
-        #pos = txt[0..(pos-1)].split('').length if pos > 0
-        pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
-        if pat.kind_of?(String)
-          #return [index("1.0 + #{pos} chars"), pat.split('').length]
-          return [index("1.0 + #{pos} chars"), _ktext_length(pat), pat.dup]
-        else
-          #return [index("1.0 + #{pos} chars"), $&.split('').length]
-          return [index("1.0 + #{pos} chars"), _ktext_length(match), match]
-        end
-      else
-        txt = get('1.0','end - 1 char')
-        if (pos = txt.rindex(pat))
-          match = $&
-          #pos = txt[0..(pos-1)].split('').length if pos > 0
-          pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
-          if pat.kind_of?(String)
-            #return [index("1.0 + #{pos} chars"), pat.split('').length]
-            return [index("1.0 + #{pos} chars"), _ktext_length(pat), pat.dup]
-          else
-            #return [index("1.0 + #{pos} chars"), $&.split('').length]
-            return [index("1.0 + #{pos} chars"), _ktext_length(match), match]
-          end
-        else
-          return ["", 0]
-        end
-      end
-    end
-  end
-
-  def rsearch(pat,start,stop=None)
-    rsearch_with_length(pat,start,stop)[0]
-  end
-
-  def dump(type_info, *index, &block)
-    if type_info.kind_of?(Symbol)
-      type_info = [ type_info.to_s ]
-    elsif type_info.kind_of?(String)
-      type_info = [ type_info ]
-    end
-    args = type_info.collect{|inf| '-' + inf}
-    args << '-command' << block if block
-    str = tk_send('dump', *(args + index))
-    result = []
-    sel = nil
-    i = 0
-    while i < str.size
-      # retrieve key
-      idx = str.index(/ /, i)
-      result.push str[i..(idx-1)]
-      i = idx + 1
-
-      # retrieve value
-      case result[-1]
-      when 'text'
-        if str[i] == ?{
-          # text formed as {...}
-          val, i = _retrieve_braced_text(str, i)
-          result.push val
-        else
-          # text which may contain backslashes
-          val, i = _retrieve_backslashed_text(str, i)
-          result.push val
-        end
-      else
-        idx = str.index(/ /, i)
-        val = str[i..(idx-1)]
-        case result[-1]
-        when 'mark'
-          case val
-          when 'insert'
-            result.push TkTextMarkInsert.new(self)
-          when 'current'
-            result.push TkTextMarkCurrent.new(self)
-          when 'anchor'
-            result.push TkTextMarkAnchor.new(self)
-          else
-            result.push tk_tcl2ruby(val)
-          end
-        when 'tagon'
-          if val == 'sel'
-            if sel
-              result.push sel
-            else
-              result.push TkTextTagSel.new(self)
-            end
-          else
-            result.push tk_tcl2ruby(val)
-          end
-        when 'tagoff'
-            result.push tk_tcl2ruby(val)
-        when 'window'
-          result.push tk_tcl2ruby(val)
-        when 'image'
-          result.push tk_tcl2ruby(val)
-        end
-        i = idx + 1
-      end
-
-      # retrieve index
-      idx = str.index(/ /, i)
-      if idx
-        result.push(Tk::Text::IndexString.new(str[i..(idx-1)]))
-        i = idx + 1
-      else
-        result.push(Tk::Text::IndexString.new(str[i..-1]))
-        break
-      end
-    end
-
-    kvis = []
-    until result.empty?
-      kvis.push [result.shift, result.shift, result.shift]
-    end
-    kvis  # result is [[key1, value1, index1], [key2, value2, index2], ...]
-  end
-
-  def _retrieve_braced_text(str, i)
-    cnt = 0
-    idx = i
-    while idx < str.size
-      case str[idx]
-      when ?{
-        cnt += 1
-      when ?}
-        cnt -= 1
-        if cnt == 0
-          break
-        end
-      end
-      idx += 1
-    end
-    return str[i+1..idx-1], idx + 2
-  end
-  private :_retrieve_braced_text
-
-  def _retrieve_backslashed_text(str, i)
-    j = i
-    idx = nil
-    loop {
-      idx = str.index(/ /, j)
-      if str[idx-1] == ?\\
-        j += 1
-      else
-        break
-      end
-    }
-    val = str[i..(idx-1)]
-    val.gsub!(/\\( |\{|\})/, '\1')
-    return val, idx + 1
-  end
-  private :_retrieve_backslashed_text
-
-  def dump_all(*index, &block)
-    dump(['all'], *index, &block)
-  end
-  def dump_mark(*index, &block)
-    dump(['mark'], *index, &block)
-  end
-  def dump_tag(*index, &block)
-    dump(['tag'], *index, &block)
-  end
-  def dump_text(*index, &block)
-    dump(['text'], *index, &block)
-  end
-  def dump_window(*index, &block)
-    dump(['window'], *index, &block)
-  end
-  def dump_image(*index, &block)
-    dump(['image'], *index, &block)
-  end
-end
-
-#TkText = Tk::Text unless Object.const_defined? :TkText
-#Tk.__set_toplevel_aliases__(:Tk, Tk::Text, :TkText)
-Tk.__set_loaded_toplevel_aliases__('tk/text.rb', :Tk, Tk::Text, :TkText)
-
-
-#######################################
-
-class Tk::Text::Peer < Tk::Text
-  # Tk8.5 feature
-  def initialize(text, parent=nil, keys={})
-    unless text.kind_of?(Tk::Text)
-      fail ArgumentError, "Tk::Text is expected for 1st argument"
-    end
-    @src_text = text
-    super(parent, keys)
-  end
-
-  def create_self(keys)
-    if keys and keys != None
-      tk_call_without_enc(@src_text.path, 'peer', 'create',
-                          @path, *hash_kv(keys, true))
-    else
-      tk_call_without_enc(@src_text.path, 'peer', 'create', @path)
-    end
-  end
-  private :create_self
-end
diff --git a/ext/tk/lib/tk/textimage.rb b/ext/tk/lib/tk/textimage.rb
deleted file mode 100644
index f7329c5dcc..0000000000
--- a/ext/tk/lib/tk/textimage.rb
+++ /dev/null
@@ -1,89 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/textimage.rb - treat Tk text image object
-#
-require 'tk'
-require 'tk/text'
-
-class TkTextImage<TkObject
-  include Tk::Text::IndexModMethods
-
-  def initialize(parent, index, keys)
-    #unless parent.kind_of?(Tk::Text)
-    #  fail ArgumentError, "expect Tk::Text for 1st argument"
-    #end
-    @t = parent
-    if index == 'end' || index == :end
-      @path = TkTextMark.new(@t, tk_call(@t.path, 'index', 'end - 1 chars'))
-    elsif index.kind_of? TkTextMark
-      if tk_call_without_enc(@t.path,'index',index.path) == tk_call_without_enc(@t.path,'index','end')
-        @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index',
-                                                       'end - 1 chars'))
-      else
-        @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index',
-                                                       index.path))
-      end
-    else
-      @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index',
-                                                     _get_eval_enc_str(index)))
-    end
-    @path.gravity = 'left'
-    @index = @path.path
-    @id = tk_call_without_enc(@t.path, 'image', 'create', @index,
-                              *hash_kv(keys, true)).freeze
-    @path.gravity = 'right'
-  end
-
-  def id
-    Tk::Text::IndexString.new(@id)
-  end
-  def mark
-    @path
-  end
-
-  def [](slot)
-    cget(slot)
-  end
-  def []=(slot, value)
-    configure(slot, value)
-    value
-  end
-
-  def cget(slot)
-    @t.image_cget(@index, slot)
-  end
-
-  def cget_strict(slot)
-    @t.image_cget_strict(@index, slot)
-  end
-
-  def configure(slot, value=None)
-    @t.image_configure(@index, slot, value)
-    self
-  end
-#  def configure(slot, value)
-#    tk_call @t.path, 'image', 'configure', @index, "-#{slot}", value
-#  end
-
-  def configinfo(slot = nil)
-    @t.image_configinfo(@index, slot)
-  end
-
-  def current_configinfo(slot = nil)
-    @t.current_image_configinfo(@index, slot)
-  end
-
-  def image
-    img = tk_call_without_enc(@t.path, 'image', 'cget', @index, '-image')
-    TkImage::Tk_IMGTBL[img]? TkImage::Tk_IMGTBL[img] : img
-  end
-
-  def image=(value)
-    tk_call_without_enc(@t.path, 'image', 'configure', @index, '-image',
-                        _get_eval_enc_str(value))
-    #self
-    value
-  end
-end
-
-TktImage = TkTextImage
diff --git a/ext/tk/lib/tk/textmark.rb b/ext/tk/lib/tk/textmark.rb
deleted file mode 100644
index 80945cc70c..0000000000
--- a/ext/tk/lib/tk/textmark.rb
+++ /dev/null
@@ -1,205 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/textmark.rb - methods for treating text marks
-#
-require 'tk'
-require 'tk/text'
-
-class TkTextMark<TkObject
-  include Tk::Text::IndexModMethods
-
-  TMarkID_TBL = TkCore::INTERP.create_table
-
-  (Tk_TextMark_ID = ['mark'.freeze, TkUtil.untrust('00000')]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  TkCore::INTERP.init_ip_env{
-    TMarkID_TBL.mutex.synchronize{ TMarkID_TBL.clear }
-  }
-
-  def TkTextMark.id2obj(text, id)
-    tpath = text.path
-    TMarkID_TBL.mutex.synchronize{
-      if TMarkID_TBL[tpath]
-        TMarkID_TBL[tpath][id]? TMarkID_TBL[tpath][id]: id
-      else
-        id
-      end
-    }
-  end
-
-  def initialize(parent, index)
-    #unless parent.kind_of?(Tk::Text)
-    #  fail ArgumentError, "expect Tk::Text for 1st argument"
-    #end
-    @parent = @t = parent
-    @tpath = parent.path
-    Tk_TextMark_ID.mutex.synchronize{
-      # @path = @id = Tk_TextMark_ID.join('')
-      @path = @id = Tk_TextMark_ID.join(TkCore::INTERP._ip_id_).freeze
-      Tk_TextMark_ID[1].succ!
-    }
-    TMarkID_TBL.mutex.synchronize{
-      TMarkID_TBL[@id] = self
-      TMarkID_TBL[@tpath] = {} unless TMarkID_TBL[@tpath]
-      TMarkID_TBL[@tpath][@id] = self
-    }
-    tk_call_without_enc(@t.path, 'mark', 'set', @id,
-                        _get_eval_enc_str(index))
-    @t._addtag id, self
-  end
-
-  def id
-    Tk::Text::IndexString.new(@id)
-  end
-
-  def exist?
-    #if ( tk_split_simplelist(_fromUTF8(tk_call_without_enc(@t.path, 'mark', 'names'))).find{|id| id == @id } )
-    if ( tk_split_simplelist(tk_call_without_enc(@t.path, 'mark', 'names'), false, true).find{|id| id == @id } )
-      true
-    else
-      false
-    end
-  end
-
-=begin
-  # move to Tk::Text::IndexModMethods module
-  def +(mod)
-    return chars(mod) if mod.kind_of?(Numeric)
-
-    mod = mod.to_s
-    if mod =~ /^\s*[+-]?\d/
-      Tk::Text::IndexString.new(@id + ' + ' + mod)
-    else
-      Tk::Text::IndexString.new(@id + ' ' + mod)
-    end
-  end
-
-  def -(mod)
-    return chars(-mod) if mod.kind_of?(Numeric)
-
-    mod = mod.to_s
-    if mod =~ /^\s*[+-]?\d/
-      Tk::Text::IndexString.new(@id + ' - ' + mod)
-    elsif mod =~ /^\s*[-]\s+(\d.*)$/
-      Tk::Text::IndexString.new(@id + ' - -' + $1)
-    else
-      Tk::Text::IndexString.new(@id + ' ' + mod)
-    end
-  end
-=end
-
-  def pos
-    @t.index(@id)
-  end
-
-  def pos=(where)
-    set(where)
-  end
-
-  def set(where)
-    tk_call_without_enc(@t.path, 'mark', 'set', @id,
-                        _get_eval_enc_str(where))
-    self
-  end
-
-  def unset
-    tk_call_without_enc(@t.path, 'mark', 'unset', @id)
-    self
-  end
-  alias destroy unset
-
-  def gravity
-    tk_call_without_enc(@t.path, 'mark', 'gravity', @id)
-  end
-
-  def gravity=(direction)
-    tk_call_without_enc(@t.path, 'mark', 'gravity', @id, direction)
-    #self
-    direction
-  end
-
-  def next(index = nil)
-    if index
-      @t.tagid2obj(_fromUTF8(tk_call_without_enc(@t.path, 'mark', 'next', _get_eval_enc_str(index))))
-    else
-      @t.tagid2obj(_fromUTF8(tk_call_without_enc(@t.path, 'mark', 'next', @id)))
-    end
-  end
-
-  def previous(index = nil)
-    if index
-      @t.tagid2obj(_fromUTF8(tk_call_without_enc(@t.path, 'mark', 'previous', _get_eval_enc_str(index))))
-    else
-      @t.tagid2obj(_fromUTF8(tk_call_without_enc(@t.path, 'mark', 'previous', @id)))
-    end
-  end
-end
-TktMark = TkTextMark
-
-class TkTextNamedMark<TkTextMark
-  def self.new(parent, name, index=nil)
-    TMarkID_TBL.mutex.synchronize{
-      if TMarkID_TBL[parent.path] && TMarkID_TBL[parent.path][name]
-        obj = TMarkID_TBL[parent.path][name]
-      else
-        # super(parent, name, *args)
-        (obj = self.allocate).instance_eval{
-          @parent = @t = parent
-          @tpath = parent.path
-          @path = @id = name
-          TMarkID_TBL[@id] = self
-          TMarkID_TBL[@tpath] = {} unless TMarkID_TBL[@tpath]
-          TMarkID_TBL[@tpath][@id] = self unless TMarkID_TBL[@tpath][@id]
-          @t._addtag @id, self
-        }
-        obj
-      end
-
-      if obj && index
-        tk_call_without_enc(parent.path, 'mark', 'set', name,
-                            _get_eval_enc_str(index))
-      end
-      obj
-    }
-  end
-
-  def initialize(parent, name, index=nil)
-    # dummy:: not called by 'new' method
-
-    #unless parent.kind_of?(Tk::Text)
-    #  fail ArgumentError, "expect Tk::Text for 1st argument"
-    #end
-    @parent = @t = parent
-    @tpath = parent.path
-    @path = @id = name
-    tk_call_without_enc(@t.path, 'mark', 'set', @id,
-                        _get_eval_enc_str(index)) if index
-    @t._addtag @id, self
-  end
-end
-TktNamedMark = TkTextNamedMark
-
-class TkTextMarkInsert<TkTextNamedMark
-  def self.new(parent,*args)
-    super(parent, 'insert', *args)
-  end
-end
-TktMarkInsert = TkTextMarkInsert
-
-class TkTextMarkCurrent<TkTextNamedMark
-  def self.new(parent,*args)
-    super(parent, 'current', *args)
-  end
-end
-TktMarkCurrent = TkTextMarkCurrent
-
-class TkTextMarkAnchor<TkTextNamedMark
-  def self.new(parent,*args)
-    super(parent, 'anchor', *args)
-  end
-end
-TktMarkAnchor = TkTextMarkAnchor
diff --git a/ext/tk/lib/tk/texttag.rb b/ext/tk/lib/tk/texttag.rb
deleted file mode 100644
index 9f11c6539b..0000000000
--- a/ext/tk/lib/tk/texttag.rb
+++ /dev/null
@@ -1,322 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/texttag.rb - methods for treating text tags
-#
-require 'tk'
-require 'tk/text'
-require 'tk/tagfont'
-
-class TkTextTag<TkObject
-  include TkTreatTagFont
-  include Tk::Text::IndexModMethods
-
-  TTagID_TBL = TkCore::INTERP.create_table
-
-  (Tk_TextTag_ID = ['tag'.freeze, TkUtil.untrust('00000')]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  TkCore::INTERP.init_ip_env{
-    TTagID_TBL.mutex.synchronize{ TTagID_TBL.clear }
-  }
-
-  def TkTextTag.id2obj(text, id)
-    tpath = text.path
-    TTagID_TBL.mutex.synchronize{
-      if TTagID_TBL[tpath]
-        TTagID_TBL[tpath][id]? TTagID_TBL[tpath][id]: id
-      else
-        id
-      end
-    }
-  end
-
-  def initialize(parent, *args)
-    #unless parent.kind_of?(TkText)
-    #  fail ArgumentError, "expect TkText for 1st argument"
-    #end
-    @parent = @t = parent
-    @tpath = parent.path
-    Tk_TextTag_ID.mutex.synchronize{
-      # @path = @id = Tk_TextTag_ID.join('')
-      @path = @id = Tk_TextTag_ID.join(TkCore::INTERP._ip_id_).freeze
-      Tk_TextTag_ID[1].succ!
-    }
-    TTagID_TBL.mutex.synchronize{
-      TTagID_TBL[@id] = self
-      TTagID_TBL[@tpath] = {} unless TTagID_TBL[@tpath]
-      TTagID_TBL[@tpath][@id] = self
-    }
-    #tk_call @t.path, "tag", "configure", @id, *hash_kv(keys)
-    if args != []
-      keys = args.pop
-      if keys.kind_of?(Hash)
-        add(*args) if args != []
-        configure(keys)
-      else
-        args.push keys
-        add(*args)
-      end
-    end
-    @t._addtag id, self
-  end
-
-  def id
-    Tk::Text::IndexString.new(@id)
-  end
-
-  def exist?
-    #if ( tk_split_simplelist(_fromUTF8(tk_call_without_enc(@t.path, 'tag', 'names'))).find{|id| id == @id } )
-    if ( tk_split_simplelist(tk_call_without_enc(@t.path, 'tag', 'names'), false, true).find{|id| id == @id } )
-      true
-    else
-      false
-    end
-  end
-
-  def first
-    Tk::Text::IndexString.new(@id + '.first')
-  end
-
-  def last
-    Tk::Text::IndexString.new(@id + '.last')
-  end
-
-  def add(*indices)
-    tk_call_without_enc(@t.path, 'tag', 'add', @id,
-                        *(indices.collect{|idx| _get_eval_enc_str(idx)}))
-    self
-  end
-
-  def remove(*indices)
-    tk_call_without_enc(@t.path, 'tag', 'remove', @id,
-                        *(indices.collect{|idx| _get_eval_enc_str(idx)}))
-    self
-  end
-
-  def ranges
-    l = tk_split_simplelist(tk_call_without_enc(@t.path, 'tag', 'ranges', @id))
-    r = []
-    while key=l.shift
-      r.push [Tk::Text::IndexString.new(key), Tk::Text::IndexString.new(l.shift)]
-    end
-    r
-  end
-
-  def nextrange(first, last=None)
-    simplelist(tk_call_without_enc(@t.path, 'tag', 'nextrange', @id,
-                                   _get_eval_enc_str(first),
-                                   _get_eval_enc_str(last))).collect{|idx|
-      Tk::Text::IndexString.new(idx)
-    }
-  end
-
-  def prevrange(first, last=None)
-    simplelist(tk_call_without_enc(@t.path, 'tag', 'prevrange', @id,
-                                   _get_eval_enc_str(first),
-                                   _get_eval_enc_str(last))).collect{|idx|
-      Tk::Text::IndexString.new(idx)
-    }
-  end
-
-  def [](key)
-    cget key
-  end
-
-  def []=(key,val)
-    configure key, val
-    val
-  end
-
-  def cget_tkstring(key)
-    @t.tag_cget_tkstring @id, key
-  end
-  def cget(key)
-    @t.tag_cget @id, key
-  end
-  def cget_strict(key)
-    @t.tag_cget_strict @id, key
-  end
-=begin
-  def cget(key)
-    case key.to_s
-    when 'text', 'label', 'show', 'data', 'file'
-      _fromUTF8(tk_call_without_enc(@t.path, 'tag', 'cget', @id, "-#{key}"))
-    when 'font', 'kanjifont'
-      #fnt = tk_tcl2ruby(tk_call(@t.path, 'tag', 'cget', @id, "-#{key}"))
-      fnt = tk_tcl2ruby(_fromUTF8(tk_call_without_enc(@t.path, 'tag', 'cget',
-                                                      @id, '-font')))
-      unless fnt.kind_of?(TkFont)
-        fnt = tagfontobj(@id, fnt)
-      end
-      if key.to_s == 'kanjifont' && JAPANIZED_TK && TK_VERSION =~ /^4\.*/
-        # obsolete; just for compatibility
-        fnt.kanji_font
-      else
-        fnt
-      end
-    else
-      tk_tcl2ruby(_fromUTF8(tk_call_without_enc(@t.path, 'tag', 'cget',
-                                                @id, "-#{key}")))
-    end
-  end
-=end
-
-  def configure(key, val=None)
-    @t.tag_configure @id, key, val
-  end
-#  def configure(key, val=None)
-#    if key.kind_of?(Hash)
-#      tk_call @t.path, 'tag', 'configure', @id, *hash_kv(key)
-#    else
-#      tk_call @t.path, 'tag', 'configure', @id, "-#{key}", val
-#    end
-#  end
-#  def configure(key, value)
-#    if value == FALSE
-#      value = "0"
-#    elsif value.kind_of?(Proc)
-#      value = install_cmd(value)
-#    end
-#    tk_call @t.path, 'tag', 'configure', @id, "-#{key}", value
-#  end
-
-  def configinfo(key=nil)
-    @t.tag_configinfo @id, key
-  end
-
-  def current_configinfo(key=nil)
-    @t.current_tag_configinfo @id, key
-  end
-
-  #def bind(seq, cmd=Proc.new, *args)
-  #  _bind([@t.path, 'tag', 'bind', @id], seq, cmd, *args)
-  #  self
-  #end
-  def bind(seq, *args)
-    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _bind([@t.path, 'tag', 'bind', @id], seq, cmd, *args)
-    self
-  end
-
-  #def bind_append(seq, cmd=Proc.new, *args)
-  #  _bind_append([@t.path, 'tag', 'bind', @id], seq, cmd, *args)
-  #  self
-  #end
-  def bind_append(seq, *args)
-    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _bind_append([@t.path, 'tag', 'bind', @id], seq, cmd, *args)
-    self
-  end
-
-  def bind_remove(seq)
-    _bind_remove([@t.path, 'tag', 'bind', @id], seq)
-    self
-  end
-
-  def bindinfo(context=nil)
-    _bindinfo([@t.path, 'tag', 'bind', @id], context)
-  end
-
-  def raise(above=None)
-    tk_call_without_enc(@t.path, 'tag', 'raise', @id,
-                        _get_eval_enc_str(above))
-    self
-  end
-
-  def lower(below=None)
-    tk_call_without_enc(@t.path, 'tag', 'lower', @id,
-                        _get_eval_enc_str(below))
-    self
-  end
-
-  def destroy
-    tk_call_without_enc(@t.path, 'tag', 'delete', @id)
-    TTagID_TBL.mutex.synchronize{
-      TTagID_TBL[@tpath].delete(@id) if TTagID_TBL[@tpath]
-    }
-    self
-  end
-end
-TktTag = TkTextTag
-
-class TkTextNamedTag<TkTextTag
-  def self.new(parent, name, *args)
-    tagobj = nil
-    TTagID_TBL.mutex.synchronize{
-      if TTagID_TBL[parent.path] && TTagID_TBL[parent.path][name]
-        tagobj = TTagID_TBL[parent.path][name]
-      else
-        # super(parent, name, *args)
-        (tagobj = self.allocate).instance_eval{
-          @parent = @t = parent
-          @tpath = parent.path
-          @path = @id = name
-          TTagID_TBL[@id] = self
-          TTagID_TBL[@tpath] = {} unless TTagID_TBL[@tpath]
-          TTagID_TBL[@tpath][@id] = self unless TTagID_TBL[@tpath][@id]
-          @t._addtag @id, self
-        }
-      end
-    }
-
-    if args != []
-      keys = args.pop
-      if keys.kind_of?(Hash)
-        tagobj.add(*args) if args != []
-        tagobj.configure(keys)
-      else
-        args.push keys
-        tagobj.add(*args)
-      end
-    end
-
-    tagobj
-  end
-
-  def initialize(parent, name, *args)
-    # dummy:: not called by 'new' method
-
-    #unless parent.kind_of?(Tk::Text)
-    #  fail ArgumentError, "expect Tk::Text for 1st argument"
-    #end
-    @parent = @t = parent
-    @tpath = parent.path
-    @path = @id = name
-
-    #if mode
-    #  tk_call @t.path, "addtag", @id, *args
-    #end
-    if args != []
-      keys = args.pop
-      if keys.kind_of?(Hash)
-        add(*args) if args != []
-        configure(keys)
-      else
-        args.push keys
-        add(*args)
-      end
-    end
-    @t._addtag @id, self
-  end
-end
-TktNamedTag = TkTextNamedTag
-
-class TkTextTagSel<TkTextNamedTag
-  def self.new(parent, *args)
-    super(parent, 'sel', *args)
-  end
-end
-TktTagSel = TkTextTagSel
diff --git a/ext/tk/lib/tk/textwindow.rb b/ext/tk/lib/tk/textwindow.rb
deleted file mode 100644
index e0be5bac7a..0000000000
--- a/ext/tk/lib/tk/textwindow.rb
+++ /dev/null
@@ -1,155 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/textwindow.rb - treat Tk text window object
-#
-require 'tk'
-require 'tk/text'
-
-class TkTextWindow<TkObject
-  include Tk::Text::IndexModMethods
-
-  def initialize(parent, index, keys = {})
-    #unless parent.kind_of?(Tk::Text)
-    #  fail ArgumentError, "expect Tk::Text for 1st argument"
-    #end
-    @t = parent
-    if index == 'end' || index == :end
-      @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index',
-                                                     'end - 1 chars'))
-    elsif index.kind_of?(TkTextMark)
-      if tk_call_without_enc(@t.path,'index',index.path) == tk_call_without_enc(@t.path,'index','end')
-        @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index',
-                                                       'end - 1 chars'))
-      else
-        @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index',
-                                                       index.path))
-      end
-    else
-      @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index', _get_eval_enc_str(index)))
-    end
-    @path.gravity = 'left'
-    @index = @path.path
-    keys = _symbolkey2str(keys)
-    @id = keys['window']
-    # keys['window'] = @id.epath if @id.kind_of?(TkWindow)
-    keys['window'] = _epath(@id) if @id
-    if keys['create']
-      @p_create = keys['create']
-      # if @p_create.kind_of?(Proc)
-      if TkComm._callback_entry?(@p_create)
-=begin
-        keys['create'] = install_cmd(proc{
-                                       @id = @p_create.call
-                                       if @id.kind_of?(TkWindow)
-                                         @id.epath
-                                       else
-                                         @id
-                                       end
-                                     })
-=end
-        keys['create'] = install_cmd(proc{@id = @p_create.call; _epath(@id)})
-      end
-    end
-    tk_call_without_enc(@t.path, 'window', 'create', @index,
-                        *hash_kv(keys, true))
-    @path.gravity = 'right'
-  end
-
-  def id
-    Tk::Text::IndexString.new(_epath(@id))
-  end
-  def mark
-    @path
-  end
-
-  def [](slot)
-    cget(slot)
-  end
-  def []=(slot, value)
-    configure(slot, value)
-    value
-  end
-
-  def cget(slot)
-    @t.window_cget(@index, slot)
-  end
-  def cget_strict(slot)
-    @t.window_cget_strict(@index, slot)
-  end
-
-  def configure(slot, value=None)
-    if slot.kind_of?(Hash)
-      slot = _symbolkey2str(slot)
-      if slot['window']
-        @id = slot['window']
-        # slot['window'] = @id.epath if @id.kind_of?(TkWindow)
-        slot['window'] = _epath(@id) if @id
-      end
-      if slot['create']
-        self.create=slot.delete('create')
-      end
-      if slot.size > 0
-        tk_call_without_enc(@t.path, 'window', 'configure', @index,
-                            *hash_kv(slot, true))
-      end
-    else
-      if slot == 'window' || slot == :window
-        @id = value
-        # value = @id.epath if @id.kind_of?(TkWindow)
-        value = _epath(@id) if @id
-      end
-      if slot == 'create' || slot == :create
-        self.create=value
-      else
-        tk_call_without_enc(@t.path, 'window', 'configure', @index,
-                            "-#{slot}", _get_eval_enc_str(value))
-      end
-    end
-    self
-  end
-
-  def configinfo(slot = nil)
-    @t.window_configinfo(@index, slot)
-  end
-
-  def current_configinfo(slot = nil)
-    @t.current_window_configinfo(@index, slot)
-  end
-
-  def window
-    @id
-  end
-
-  def window=(value)
-    @id = value
-    # value = @id.epath if @id.kind_of?(TkWindow)
-    value = _epath(@id) if @id
-    tk_call_without_enc(@t.path, 'window', 'configure', @index,
-                        '-window', _get_eval_enc_str(value))
-    value
-  end
-
-  def create
-    @p_create
-  end
-
-  def create=(value)
-    @p_create = value
-    # if @p_create.kind_of?(Proc)
-    if TkComm._callback_entry?(@p_create)
-      value = install_cmd(proc{
-                            @id = @p_create.call
-                            if @id.kind_of?(TkWindow)
-                              @id.epath
-                            else
-                              @id
-                            end
-                          })
-    end
-    tk_call_without_enc(@t.path, 'window', 'configure', @index,
-                        '-create', _get_eval_enc_str(value))
-    value
-  end
-end
-
-TktWindow = TkTextWindow
diff --git a/ext/tk/lib/tk/timer.rb b/ext/tk/lib/tk/timer.rb
deleted file mode 100644
index c1457e274e..0000000000
--- a/ext/tk/lib/tk/timer.rb
+++ /dev/null
@@ -1,666 +0,0 @@
-# frozen_string_literal: false
-#
-#   tk/timer.rb : methods for Tcl/Tk after command
-#
-#   $Id$
-#
-require 'tk'
-
-class TkTimer
-  include TkCore
-  extend TkCore
-
-  TkCommandNames = ['after'.freeze].freeze
-
-  (Tk_CBID = ['a'.freeze, TkUtil.untrust('00000')]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  Tk_CBTBL = TkUtil.untrust({})
-
-  TkCore::INTERP.add_tk_procs('rb_after', 'id', <<-'EOL')
-    if {[set st [catch {eval {ruby_cmd TkTimer callback} $id} ret]] != 0} {
-        return -code $st $ret
-    } {
-        return $ret
-    }
-  EOL
-
-  DEFAULT_IGNORE_EXCEPTIONS = [ NameError, RuntimeError ].freeze
-
-  ###############################
-  # class methods
-  ###############################
-  def self.start(*args, &b)
-    self.new(*args, &b).start
-  end
-
-  def self.callback(obj_id)
-    ex_obj = Tk_CBTBL[obj_id]
-    return "" if ex_obj == nil; # canceled
-    ex_obj.cb_call
-  end
-
-  def self.info(obj = nil)
-    if obj
-      if obj.kind_of?(TkTimer)
-        if obj.after_id
-          inf = tk_split_list(tk_call_without_enc('after','info',obj.after_id))
-          [Tk_CBTBL[inf[0][1]], inf[1]]
-        else
-          nil
-        end
-      else
-        fail ArgumentError, "TkTimer object is expected"
-      end
-    else
-      tk_call_without_enc('after', 'info').split(' ').collect!{|id|
-        ret = Tk_CBTBL.find{|key,val| val.after_id == id}
-        (ret == nil)? id: ret[1]
-      }
-    end
-  end
-
-
-  ###############################
-  # instance methods
-  ###############################
-  def do_callback
-    @in_callback = true
-    @after_id = nil
-    begin
-      @return_value = @current_proc.call(self)
-    rescue SystemExit
-      exit(0)
-    rescue Interrupt
-      exit!(1)
-    rescue Exception => e
-      if @cancel_on_exception &&
-          @cancel_on_exception.find{|exc| e.kind_of?(exc)}
-        cancel
-        @return_value = e
-        @in_callback = false
-        return e
-      else
-        fail e
-      end
-    end
-    if @set_next
-      set_next_callback(@current_args)
-    else
-      @set_next = true
-    end
-    @in_callback = false
-    @return_value
-  end
-
-  def set_callback(sleep, args=nil)
-    if TkCore::INTERP.deleted?
-      self.cancel
-      return self
-    end
-    @after_script = "rb_after #{@id}"
-    @current_args = args
-    @current_script = [sleep, @after_script]
-    @after_id = tk_call_without_enc('after', sleep, @after_script)
-    self
-  end
-
-  def set_next_callback(args)
-    if @running == false || @proc_max == 0 || @do_loop == 0
-      Tk_CBTBL.delete(@id) ;# for GC
-      @running = false
-      # @wait_var.value = 0
-      __at_end__
-      return
-    end
-    if @current_pos >= @proc_max
-      if @do_loop < 0 || (@do_loop -= 1) > 0
-        @current_pos = 0
-      else
-        Tk_CBTBL.delete(@id) ;# for GC
-        @running = false
-        # @wait_var.value = 0
-        __at_end__
-        return
-      end
-    end
-
-    @current_args = args
-
-    # if @sleep_time.kind_of?(Proc)
-    if TkComm._callback_entry?(@sleep_time)
-      sleep = @sleep_time.call(self)
-    else
-      sleep = @sleep_time
-    end
-    @current_sleep = sleep
-
-    cmd, *cmd_args = @loop_proc[@current_pos]
-    @current_pos += 1
-    @current_proc = cmd
-
-    set_callback(sleep, cmd_args)
-  end
-
-  def initialize(*args, &b)
-    Tk_CBID.mutex.synchronize{
-      # @id = Tk_CBID.join('')
-      @id = Tk_CBID.join(TkCore::INTERP._ip_id_)
-      Tk_CBID[1].succ!
-    }
-
-    @wait_var = TkVariable.new(0)
-
-    @at_end_proc = nil
-
-    @cb_cmd = TkCore::INTERP.get_cb_entry(self.method(:do_callback))
-
-    @set_next = true
-
-    @init_sleep = 0
-    @init_proc = nil
-    @init_args = []
-
-    @current_script = []
-    @current_proc = nil
-    @current_args = nil
-    @return_value = nil
-
-    @sleep_time = 0
-    @current_sleep = 0
-    @loop_exec = 0
-    @do_loop = 0
-    @loop_proc = []
-    @proc_max = 0
-    @current_pos = 0
-
-    @after_id = nil
-    @after_script = nil
-
-    @cancel_on_exception = DEFAULT_IGNORE_EXCEPTIONS
-    # Unless @cancel_on_exception, Ruby/Tk shows an error dialog box when
-    # an exception is raised on TkTimer callback procedure.
-    # If @cancel_on_exception is an array of exception classes and the raised
-    # exception is included in the array, Ruby/Tk cancels executing TkTimer
-    # callback procedures silently (TkTimer#cancel is called and no dialog is
-    # shown).
-
-    if b
-      case args.size
-      when 0
-        add_procs(b)
-      when 1
-        args << -1 << b
-      else
-        args << b
-      end
-    end
-
-    set_procs(*args) if args != []
-
-    @running = false
-    @in_callback = false
-  end
-
-  attr :after_id
-  attr :after_script
-  attr :current_proc
-  attr :current_args
-  attr :current_sleep
-  alias :current_interval :current_sleep
-  attr :return_value
-
-  attr_accessor :loop_exec
-
-  def __at_end__
-    @at_end_proc.call(self) if @at_end_proc
-    @wait_var.value = 0  # for wait
-  end
-  private :__at_end__
-
-  def cb_call
-    @cb_cmd.call
-  end
-
-  def get_procs
-    [@init_sleep, @init_proc, @init_args, @sleep_time, @loop_exec, @loop_proc]
-  end
-
-  def current_status
-    [@running, @current_sleep, @current_proc, @current_args,
-      @do_loop, @cancel_on_exception]
-  end
-
-  def cancel_on_exception?
-    @cancel_on_exception
-  end
-
-  def cancel_on_exception=(mode)
-    if mode.kind_of?(Array)
-      @cancel_on_exception = mode
-    elsif mode
-      @cancel_on_exception = DEFAULT_IGNORE_EXCEPTIONS
-    else
-      @cancel_on_exception = false
-    end
-    #self
-  end
-
-  def running?
-    @running
-  end
-
-  def loop_rest
-    @do_loop
-  end
-
-  def loop_rest=(rest)
-    @do_loop = rest
-    #self
-  end
-
-  def set_interval(interval)
-    #if interval != 'idle' && interval != :idle \
-    #  && !interval.kind_of?(Integer) && !interval.kind_of?(Proc)
-    if interval != 'idle' && interval != :idle \
-      && !interval.kind_of?(Integer) && !TkComm._callback_entry?(interval)
-      fail ArgumentError, "expect Integer or Proc"
-    end
-    @sleep_time = interval
-  end
-
-  def set_procs(interval, loop_exec, *procs)
-    #if interval != 'idle' && interval != :idle \
-    #   && !interval.kind_of?(Integer) && !interval.kind_of?(Proc)
-    if interval != 'idle' && interval != :idle \
-      && !interval.kind_of?(Integer) && !TkComm._callback_entry?(interval)
-      fail ArgumentError, "expect Integer or Proc for 1st argument"
-    end
-    @sleep_time = interval
-
-    @loop_proc = []
-    procs.each{|e|
-      # if e.kind_of?(Proc)
-      if TkComm._callback_entry?(e)
-        @loop_proc.push([e])
-      else
-        @loop_proc.push(e)
-      end
-    }
-    @proc_max = @loop_proc.size
-    @current_pos = 0
-
-    if loop_exec.kind_of?(Integer) && loop_exec < 0
-      @loop_exec = -1
-    elsif loop_exec == true
-      @loop_exec = -1
-    elsif loop_exec == nil || loop_exec == false || loop_exec == 0
-      @loop_exec = 0
-    else
-      if not loop_exec.kind_of?(Integer)
-        fail ArgumentError, "expect Integer for 2nd argument"
-      end
-      @loop_exec = loop_exec
-    end
-    @do_loop = @loop_exec
-
-    self
-  end
-
-  def add_procs(*procs)
-    procs.each{|e|
-      # if e.kind_of?(Proc)
-      if TkComm._callback_entry?(e)
-        @loop_proc.push([e])
-      else
-        @loop_proc.push(e)
-      end
-    }
-    @proc_max = @loop_proc.size
-
-    self
-  end
-
-  def delete_procs(*procs)
-    procs.each{|e|
-      # if e.kind_of?(Proc)
-      if TkComm._callback_entry?(e)
-        @loop_proc.delete([e])
-      else
-        @loop_proc.delete(e)
-      end
-    }
-    @proc_max = @loop_proc.size
-
-    cancel if @proc_max == 0
-
-    self
-  end
-
-  def delete_at(n)
-    @loop_proc.delete_at(n)
-    @proc_max = @loop_proc.size
-    cancel if @proc_max == 0
-    self
-  end
-
-  def set_start_proc(sleep=nil, init_proc=nil, *init_args, &b)
-    # set parameters for 'restart'
-    sleep = @init_sleep unless sleep
-
-    if sleep != 'idle' && sleep != :idle && !sleep.kind_of?(Integer)
-      fail ArgumentError, "expect Integer or 'idle' for 1st argument"
-    end
-
-    @init_sleep = sleep
-    @init_proc = init_proc
-    @init_args = init_args
-
-    @init_proc = b if !@init_proc && b
-    @init_proc = proc{|*args| } if @init_sleep > 0 && !@init_proc
-
-    self
-  end
-
-  def start(*init_args, &b)
-    return nil if @running
-
-    Tk_CBTBL[@id] = self
-    @do_loop = @loop_exec
-    @current_pos = 0
-    @return_value = nil
-    @after_id = nil
-
-    @init_sleep = 0
-    @init_proc  = nil
-    @init_args  = nil
-
-    argc = init_args.size
-    if argc > 0
-      sleep = init_args.shift
-      if sleep != 'idle' && sleep != :idle && !sleep.kind_of?(Integer)
-        fail ArgumentError, "expect Integer or 'idle' for 1st argument"
-      end
-      @init_sleep = sleep
-    end
-    @init_proc = init_args.shift if argc > 1
-    @init_args = init_args if argc > 2
-
-    @init_proc = b if !@init_proc && b
-    @init_proc = proc{|*args| } if @init_sleep > 0 && !@init_proc
-
-    @current_sleep = @init_sleep
-    @running = true
-    if @init_proc
-      # if not @init_proc.kind_of?(Proc)
-      if !TkComm._callback_entry?(@init_proc)
-        fail ArgumentError, "Argument '#{@init_proc}' need to be Proc"
-      end
-      @current_proc = @init_proc
-      set_callback(@init_sleep, @init_args)
-      @set_next = false if @in_callback
-    else
-      set_next_callback(@init_args)
-    end
-
-    self
-  end
-
-  def reset(*reset_args)
-    restart() if @running
-
-    if @init_proc
-      @return_value = @init_proc.call(self)
-    else
-      @return_value = nil
-    end
-
-    @current_pos   = 0
-    @current_args  = @init_args
-    @current_script = []
-
-    @set_next = false if @in_callback
-
-    self
-  end
-
-  def restart(*restart_args, &b)
-    cancel if @running
-    if restart_args.empty? && !b
-      start(@init_sleep, @init_proc, *@init_args)
-    else
-      start(*restart_args, &b)
-    end
-  end
-
-  def cancel
-    @running = false
-    # @wait_var.value = 0
-    __at_end__
-    tk_call 'after', 'cancel', @after_id if @after_id
-    @after_id = nil
-
-    Tk_CBTBL.delete(@id) ;# for GC
-    self
-  end
-  alias stop cancel
-
-  def continue(wait=nil)
-    fail RuntimeError, "is already running" if @running
-    return restart() if @current_script.empty?
-    sleep, cmd = @current_script
-    fail RuntimeError, "no procedure to continue" unless cmd
-    if wait
-      unless wait.kind_of?(Integer)
-        fail ArgumentError, "expect Integer for 1st argument"
-      end
-      sleep = wait
-    end
-    Tk_CBTBL[@id] = self
-    @running = true
-    @after_id = tk_call_without_enc('after', sleep, cmd)
-    self
-  end
-
-  def skip
-    fail RuntimeError, "is not running now" unless @running
-    cancel
-    Tk_CBTBL[@id] = self
-    @running = true
-    set_next_callback(@current_args)
-    self
-  end
-
-  def info
-    if @after_id
-      inf = tk_split_list(tk_call_without_enc('after', 'info', @after_id))
-      [Tk_CBTBL[inf[0][1]], inf[1]]
-    else
-      nil
-    end
-  end
-
-  def at_end(*arg, &b)
-    if arg.empty?
-      if b
-        @at_end_proc = b
-      else
-        # no proc
-        return @at_end_proc
-      end
-    else
-      fail ArgumentError, "wrong number of arguments" if arg.length != 1 || b
-      @at_end_proc = arg[0]
-    end
-    self
-  end
-
-  def wait(on_thread = true, check_root = false)
-    unless @running
-      if @return_value.kind_of?(Exception)
-        fail @return_value
-      else
-        return @return_value
-      end
-    end
-
-    @wait_var.wait(on_thread, check_root)
-    if @return_value.kind_of?(Exception)
-      fail @return_value
-    else
-      @return_value
-    end
-  end
-  def eventloop_wait(check_root = false)
-    wait(false, check_root)
-  end
-  def thread_wait(check_root = false)
-    wait(true, check_root)
-  end
-  def tkwait(on_thread = true)
-    wait(on_thread, true)
-  end
-  def eventloop_tkwait
-    wait(false, true)
-  end
-  def thread_tkwait
-    wait(true, true)
-  end
-end
-
-TkAfter = TkTimer
-
-
-class TkRTTimer < TkTimer
-  DEFAULT_OFFSET_LIST_SIZE = 5
-
-  def initialize(*args, &b)
-    super(*args, &b)
-
-    @offset_list = Array.new(DEFAULT_OFFSET_LIST_SIZE){ [0, 0] }
-    @offset_s = 0
-    @offset_u = 0
-    @est_time = nil
-  end
-
-  def start(*args, &b)
-    return nil if @running
-    @est_time = nil
-    @cb_start_time = Time.now
-    super(*args, &b)
-  end
-
-  def cancel
-    super()
-    @est_time = nil
-    @cb_start_time = Time.now
-    self
-  end
-  alias stop cancel
-
-  def continue(wait=nil)
-    fail RuntimeError, "is already running" if @running
-    @cb_start_time = Time.now
-    super(wait)
-  end
-
-  def set_interval(interval)
-    super(interval)
-    @est_time = nil
-  end
-
-  def _offset_ave
-    size = 0
-    d_sec = 0; d_usec = 0
-    @offset_list.each_with_index{|offset, idx|
-      # weight = 1
-      weight = idx + 1
-      size += weight
-      d_sec += offset[0] * weight
-      d_usec += offset[1] * weight
-    }
-    offset_s, mod = d_sec.divmod(size)
-    offset_u = ((mod * 1000000 + d_usec) / size.to_f).round
-    [offset_s, offset_u]
-  end
-  private :_offset_ave
-
-  def set_next_callback(args)
-    if @running == false || @proc_max == 0 || @do_loop == 0
-      Tk_CBTBL.delete(@id) ;# for GC
-      @running = false
-      # @wait_var.value = 0
-      __at_end__
-      return
-    end
-    if @current_pos >= @proc_max
-      if @do_loop < 0 || (@do_loop -= 1) > 0
-        @current_pos = 0
-      else
-        Tk_CBTBL.delete(@id) ;# for GC
-        @running = false
-        # @wait_var.value = 0
-        __at_end__
-        return
-      end
-    end
-
-    @current_args = args
-
-    cmd, *cmd_args = @loop_proc[@current_pos]
-    @current_pos += 1
-    @current_proc = cmd
-
-    @offset_s, @offset_u = _offset_ave
-
-    if TkComm._callback_entry?(@sleep_time)
-      sleep = @sleep_time.call(self)
-    else
-      sleep = @sleep_time
-    end
-
-    if @est_time
-      @est_time = Time.at(@est_time.to_i, @est_time.usec + sleep*1000)
-    else
-      @est_time = Time.at(@cb_start_time.to_i,
-                          @cb_start_time.usec + sleep*1000)
-    end
-
-    now = Time.now
-    real_sleep = ((@est_time.to_i - now.to_i + @offset_s)*1000.0 +
-                  (@est_time.usec - now.usec + @offset_u)/1000.0).round
-    if real_sleep <= 0
-      real_sleep = 0
-      @offset_s = now.to_i
-      @offset_u = now.usec
-    end
-    @current_sleep = real_sleep
-
-    set_callback(real_sleep, cmd_args)
-  end
-
-  def cb_call
-    if @est_time
-      @offset_list.shift
-
-      @cb_start_time = Time.now
-
-      if @current_sleep == 0
-        @offset_list.push([
-                            @offset_s - @cb_start_time.to_i,
-                            @offset_u - @cb_start_time.usec
-                          ])
-      else
-        @offset_list.push([
-                            @offset_s + (@est_time.to_i - @cb_start_time.to_i),
-                            @offset_u + (@est_time.usec - @cb_start_time.usec)
-                          ])
-      end
-    end
-
-    @cb_cmd.call
-  end
-end
diff --git a/ext/tk/lib/tk/tk_mac.rb b/ext/tk/lib/tk/tk_mac.rb
deleted file mode 100644
index ed90fd1c67..0000000000
--- a/ext/tk/lib/tk/tk_mac.rb
+++ /dev/null
@@ -1,159 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/tk_mac.rb : Access Mac-Specific functionality on OS X from Tk
-#                (supported by Tk8.6 or later)
-#
-#     ATTENTION !!
-#         This is NOT TESTED. Because I have no test-environment.
-#
-require 'tk'
-
-module Tk
-  module Mac
-  end
-end
-
-module Tk::Mac
-  extend TkCore
-
-  # event handler callbacks
-  def self.def_ShowPreferences(cmd=Proc.new)
-    ip_eval("proc ::tk::mac::ShowPreferences {} { #{install_cmd(cmd)} }")
-    nil
-  end
-
-  def self.def_OpenApplication(cmd=Proc.new)
-    ip_eval("proc ::tk::mac::OpenApplication {} { #{install_cmd(cmd)} }")
-    nil
-  end
-
-  def self.def_ReopenApplication(cmd=Proc.new)
-    ip_eval("proc ::tk::mac::ReopenApplication {} { #{install_cmd(cmd)} }")
-    nil
-  end
-
-  def self.def_OpenDocument(cmd=Proc.new)
-    ip_eval("proc ::tk::mac::OpenDocument {args} { eval #{install_cmd(cmd)} $args }")
-    nil
-  end
-
-  def self.def_PrintDocument(cmd=Proc.new)
-    ip_eval("proc ::tk::mac::PrintDocument {args} { eval #{install_cmd(cmd)} $args }")
-    nil
-  end
-
-  def self.def_Quit(cmd=Proc.new)
-    ip_eval("proc ::tk::mac::Quit {} { #{install_cmd(cmd)} }")
-    nil
-  end
-
-  def self.def_OnHide(cmd=Proc.new)
-    ip_eval("proc ::tk::mac::OnHide {} { #{install_cmd(cmd)} }")
-    nil
-  end
-
-  def self.def_OnShow(cmd=Proc.new)
-    ip_eval("proc ::tk::mac::OnShow {} { #{install_cmd(cmd)} }")
-    nil
-  end
-
-  def self.def_ShowHelp(cmd=Proc.new)
-    ip_eval("proc ::tk::mac::ShowHelp {} { #{install_cmd(cmd)} }")
-    nil
-  end
-
-
-  # additional dialogs
-  def self.standardAboutPanel
-    tk_call('::tk::mac::standardAboutPanel')
-    nil
-  end
-
-
-  # system configuration
-  def self.useCompatibilityMetrics(mode)
-    tk_call('::tk::mac::useCompatibilityMetrics', mode)
-    nil
-  end
-
-  def self.CGAntialiasLimit(limit)
-    tk_call('::tk::mac::CGAntialiasLimit', limit)
-    nil
-  end
-
-  def self.antialiasedtext(num)
-    tk_call('::tk::mac::antialiasedtext', num)
-    nil
-  end
-
-  def self.useThemedToplevel(mode)
-    tk_call('::tk::mac::useThemedToplevel', mode)
-    nil
-  end
-
-end
-
-class Tk::Mac::IconBitmap < TkImage
-  TkCommandNames = ['::tk::mac::iconBitmap'].freeze
-
-  def self.new(width, height, keys)
-    if keys.kind_of?(Hash)
-      name = nil
-      if keys.key?(:imagename)
-        name = keys[:imagename]
-      elsif keys.key?('imagename')
-        name = keys['imagename']
-      end
-      if name
-        if name.kind_of?(TkImage)
-          obj = name
-        else
-          name = _get_eval_string(name)
-          obj = nil
-          Tk_IMGTBL.mutex.synchronize{
-            obj = Tk_IMGTBL[name]
-          }
-        end
-        if obj
-          if !(keys[:without_creating] || keys['without_creating'])
-            keys = _symbolkey2str(keys)
-            keys.delete('imagename')
-            keys.delete('without_creating')
-            obj.instance_eval{
-              tk_call_without_enc('::tk::mac::iconBitmap',
-                                  @path, width, height, *hash_kv(keys, true))
-            }
-          end
-          return obj
-        end
-      end
-    end
-    (obj = self.allocate).instance_eval{
-      Tk_IMGTBL.mutex.synchronize{
-        initialize(width, height, keys)
-        Tk_IMGTBL[@path] = self
-      }
-    }
-    obj
-  end
-
-  def initialize(width, height, keys)
-    @path = nil
-    without_creating = false
-    if keys.kind_of?(Hash)
-      keys = _symbolkey2str(keys)
-      @path = keys.delete('imagename')
-      without_creating = keys.delete('without_creating')
-    end
-    unless @path
-      Tk_Image_ID.mutex.synchronize{
-        @path = Tk_Image_ID.join(TkCore::INTERP._ip_id_)
-        Tk_Image_ID[1].succ!
-      }
-    end
-    unless without_creating
-      tk_call_without_enc('::tk::mac::iconBitmap',
-                          @path, width, height, *hash_kv(keys, true))
-    end
-  end
-end
diff --git a/ext/tk/lib/tk/toplevel.rb b/ext/tk/lib/tk/toplevel.rb
deleted file mode 100644
index e66b0fc1be..0000000000
--- a/ext/tk/lib/tk/toplevel.rb
+++ /dev/null
@@ -1,265 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/toplevel.rb : treat toplevel widget
-#
-require 'tk'
-require 'tk/wm'
-require 'tk/menuspec'
-
-class Tk::Toplevel<TkWindow
-  include Wm
-  include TkMenuSpec
-
-  TkCommandNames = ['toplevel'.freeze].freeze
-  WidgetClassName = 'Toplevel'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-################# old version
-#  def initialize(parent=nil, screen=nil, classname=nil, keys=nil)
-#    if screen.kind_of? Hash
-#      keys = screen.dup
-#    else
-#      @screen = screen
-#    end
-#    @classname = classname
-#    if keys.kind_of? Hash
-#      keys = keys.dup
-#      @classname = keys.delete('classname') if keys.key?('classname')
-#      @colormap  = keys.delete('colormap')  if keys.key?('colormap')
-#      @container = keys.delete('container') if keys.key?('container')
-#      @screen    = keys.delete('screen')    if keys.key?('screen')
-#      @use       = keys.delete('use')       if keys.key?('use')
-#      @visual    = keys.delete('visual')    if keys.key?('visual')
-#    end
-#    super(parent, keys)
-#  end
-#
-#  def create_self
-#    s = []
-#    s << "-class"     << @classname if @classname
-#    s << "-colormap"  << @colormap  if @colormap
-#    s << "-container" << @container if @container
-#    s << "-screen"    << @screen    if @screen
-#    s << "-use"       << @use       if @use
-#    s << "-visual"    << @visual    if @visual
-#    tk_call 'toplevel', @path, *s
-#  end
-#################
-
-  def __boolval_optkeys
-    super() << 'container'
-  end
-  private :__boolval_optkeys
-
-  def __strval_optkeys
-    super() << 'screen'
-  end
-  private :__strval_optkeys
-
-  def __val2ruby_optkeys  # { key=>proc, ... }
-    super().update('menu'=>proc{|v| window(v)})
-  end
-  private :__val2ruby_optkeys
-
-  def __methodcall_optkeys  # { key=>method, ... }
-    TOPLEVEL_METHODCALL_OPTKEYS
-  end
-  private :__methodcall_optkeys
-
-  def _wm_command_option_chk(keys)
-    keys = {} unless keys
-    new_keys = {}
-    wm_cmds = {}
-
-    conf_methods = _symbolkey2str(__methodcall_optkeys())
-
-    keys.each{|k,v| # k is a String
-      if conf_methods.key?(k)
-        wm_cmds[conf_methods[k]] = v
-      elsif Wm.method_defined?(k)
-        case k
-        when 'screen','class','colormap','container','use','visual'
-          new_keys[k] = v
-        else
-          case self.method(k).arity
-          when -1,1
-            wm_cmds[k] = v
-          else
-            new_keys[k] = v
-          end
-        end
-      else
-        new_keys[k] = v
-      end
-    }
-    [new_keys, wm_cmds]
-  end
-  private :_wm_command_option_chk
-
-  def initialize(parent=nil, screen=nil, classname=nil, keys=nil)
-    my_class_name = nil
-    if self.class < WidgetClassNames[WidgetClassName]
-      my_class_name = self.class.name
-      my_class_name = nil if my_class_name == ''
-    end
-    if parent.kind_of? Hash
-      keys = _symbolkey2str(parent)
-      if keys.key?('classname')
-        keys['class'] = keys.delete('classname')
-      end
-      @classname = keys['class']
-      @colormap  = keys['colormap']
-      @container = keys['container']
-      @screen    = keys['screen']
-      @use       = keys['use']
-      @visual    = keys['visual']
-      if !@classname && my_class_name
-        keys['class'] = @classname = my_class_name
-      end
-      if @classname.kind_of? TkBindTag
-        @db_class = @classname
-        keys['class'] = @classname = @classname.id
-      elsif @classname
-        @db_class = TkDatabaseClass.new(@classname)
-        keys['class'] = @classname
-      else
-        @db_class = self.class
-        @classname = @db_class::WidgetClassName
-      end
-      keys, cmds = _wm_command_option_chk(keys)
-      super(keys)
-      cmds.each{|k,v|
-        if v.kind_of? Array
-          self.__send__(k,*v)
-        else
-          self.__send__(k,v)
-        end
-      }
-      return
-    end
-
-    if screen.kind_of? Hash
-      keys = screen
-    else
-      @screen = screen
-      if classname.kind_of? Hash
-        keys = classname
-      else
-        @classname = classname
-      end
-    end
-    if keys.kind_of? Hash
-      keys = _symbolkey2str(keys)
-      if keys.key?('classname')
-        keys['class'] = keys.delete('classname')
-      end
-      @classname = keys['class']  unless @classname
-      @colormap  = keys['colormap']
-      @container = keys['container']
-      @screen    = keys['screen'] unless @screen
-      @use       = keys['use']
-      @visual    = keys['visual']
-    else
-      keys = {}
-    end
-    if !@classname && my_class_name
-      keys['class'] = @classname = my_class_name
-    end
-    if @classname.kind_of? TkBindTag
-      @db_class = @classname
-      keys['class'] = @classname = @classname.id
-    elsif @classname
-      @db_class = TkDatabaseClass.new(@classname)
-      keys['class'] = @classname
-    else
-      @db_class = self.class
-      @classname = @db_class::WidgetClassName
-    end
-    keys, cmds = _wm_command_option_chk(keys)
-    super(parent, keys)
-    cmds.each{|k,v|
-      if v.kind_of? Array
-        self.send(k,*v)
-      else
-        self.send(k,v)
-      end
-    }
-  end
-
-  #def create_self(keys)
-  #  if keys and keys != None
-  #    tk_call_without_enc('toplevel', @path, *hash_kv(keys, true))
-  #  else
-  #    tk_call_without_enc('toplevel', @path)
-  #  end
-  #end
-  #private :create_self
-
-  def specific_class
-    @classname
-  end
-
-  def add_menu(menu_info, tearoff=false, opts=nil)
-    # See tk/menuspec.rb for menu_info.
-    # opts is a hash of default configs for all of cascade menus.
-    # Configs of menu_info can override it.
-    if tearoff.kind_of?(Hash)
-      opts = tearoff
-      tearoff = false
-    end
-    _create_menubutton(self, menu_info, tearoff, opts)
-  end
-
-  def add_menubar(menu_spec, tearoff=false, opts=nil)
-    # See tk/menuspec.rb for menu_spec.
-    # opts is a hash of default configs for all of cascade menus.
-    # Configs of menu_spec can override it.
-    menu_spec.each{|info| add_menu(info, tearoff, opts)}
-    self.menu
-  end
-
-  def self.database_class
-    if self == WidgetClassNames[WidgetClassName] || self.name == ''
-      self
-    else
-      TkDatabaseClass.new(self.name)
-    end
-  end
-  def self.database_classname
-    self.database_class.name
-  end
-
-  def self.bind(*args, &b)
-    if self == WidgetClassNames[WidgetClassName] || self.name == ''
-      super(*args, &b)
-    else
-      TkDatabaseClass.new(self.name).bind(*args, &b)
-    end
-  end
-  def self.bind_append(*args, &b)
-    if self == WidgetClassNames[WidgetClassName] || self.name == ''
-      super(*args, &b)
-    else
-      TkDatabaseClass.new(self.name).bind_append(*args, &b)
-    end
-  end
-  def self.bind_remove(*args)
-    if self == WidgetClassNames[WidgetClassName] || self.name == ''
-      super(*args)
-    else
-      TkDatabaseClass.new(self.name).bind_remove(*args)
-    end
-  end
-  def self.bindinfo(*args)
-    if self == WidgetClassNames[WidgetClassName] || self.name == ''
-      super(*args)
-    else
-      TkDatabaseClass.new(self.name).bindinfo(*args)
-    end
-  end
-end
-
-#TkToplevel = Tk::Toplevel unless Object.const_defined? :TkToplevel
-#Tk.__set_toplevel_aliases__(:Tk, Tk::Toplevel, :TkToplevel)
-Tk.__set_loaded_toplevel_aliases__('tk/toplevel.rb', :Tk, Tk::Toplevel,
-                                   :TkToplevel)
diff --git a/ext/tk/lib/tk/ttk_selector.rb b/ext/tk/lib/tk/ttk_selector.rb
deleted file mode 100644
index 4589e7fc29..0000000000
--- a/ext/tk/lib/tk/ttk_selector.rb
+++ /dev/null
@@ -1,99 +0,0 @@
-# frozen_string_literal: false
-#
-#  ttk_selector
-#
-######################################
-#  toplevel classes/modules
-module Tk
-  @TOPLEVEL_ALIAS_TABLE[:Ttk] = {
-    :TkButton       => 'tkextlib/tile/tbutton',
-
-    :TkCheckbutton  => 'tkextlib/tile/tcheckbutton',
-    :TkCheckButton  => 'tkextlib/tile/tcheckbutton',
-
-    # :TkDialog       => 'tkextlib/tile/dialog',
-
-    :TkEntry        => 'tkextlib/tile/tentry',
-
-    :TkCombobox     => 'tkextlib/tile/tcombobox',
-
-    :TkFrame        => 'tkextlib/tile/tframe',
-
-    :TkLabel        => 'tkextlib/tile/tlabel',
-
-    :TkLabelframe   => 'tkextlib/tile/tlabelframe',
-    :TkLabelFrame   => 'tkextlib/tile/tlabelframe',
-
-    :TkMenubutton   => 'tkextlib/tile/tmenubutton',
-    :TkMenuButton   => 'tkextlib/tile/tmenubutton',
-
-    :TkNotebook     => 'tkextlib/tile/tnotebook',
-
-    # :TkPaned        => 'tkextlib/tile/tpaned',
-    :TkPanedwindow  => 'tkextlib/tile/tpaned',
-    :TkPanedWindow  => 'tkextlib/tile/tpaned',
-
-    :TkProgressbar  => 'tkextlib/tile/tprogressbar',
-
-    :TkRadiobutton  => 'tkextlib/tile/tradiobutton',
-    :TkRadioButton  => 'tkextlib/tile/tradiobutton',
-
-    :TkScale        => 'tkextlib/tile/tscale',
-    # :TkProgress     => 'tkextlib/tile/tscale',
-
-    :TkScrollbar    => 'tkextlib/tile/tscrollbar',
-    :TkXScrollbar   => 'tkextlib/tile/tscrollbar',
-    :TkYScrollbar   => 'tkextlib/tile/tscrollbar',
-
-    :TkSeparator    => 'tkextlib/tile/tseparator',
-
-    :TkSizeGrip     => 'tkextlib/tile/sizegrip',
-    :TkSizegrip     => 'tkextlib/tile/sizegrip',
-
-    # :TkSquare       => 'tkextlib/tile/tsquare',
-
-    :TkTreeview     => 'tkextlib/tile/treeview',
-  }
-
-  # @TOPLEVEL_ALIAS_TABLE[:Tile] = @TOPLEVEL_ALIAS_TABLE[:Ttk]
-  Tk.__create_widget_set__(:Tile, :Ttk)
-
-  ############################################
-  #  depend on the version of Tcl/Tk
-  major, minor, type, patchlevel = TclTkLib.get_version
-
-  #  ttk::spinbox is supported on Tcl/Tk8.6b1 or later
-  if ([major,minor,type,patchlevel] <=>
-        [8,6,TclTkLib::RELEASE_TYPE::BETA,1]) >= 0
-    @TOPLEVEL_ALIAS_TABLE[:Ttk].update(
-      :TkSpinbox => 'tkextlib/tile/tspinbox'
-    )
-  end
-
-  ################################################
-  # register some Ttk widgets as default
-  # (Ttk is a standard library on Tcl/Tk8.5+)
-  @TOPLEVEL_ALIAS_TABLE[:Ttk].each{|sym, file|
-    #unless Tk::TOPLEVEL_ALIASES.autoload?(sym) || Tk::TOPLEVEL_ALIASES.const_defined?(sym)
-    #   @TOPLEVEL_ALIAS_OWNER[sym] = :Ttk
-    #   Tk::TOPLEVEL_ALIASES.autoload(sym, file)
-    #end
-    Tk.__regist_toplevel_aliases__(:Ttk, file, sym)
-  }
-
-  ################################################
-
-  # @TOPLEVEL_ALIAS_SETUP_PROC[:Tile] =
-  #   @TOPLEVEL_ALIAS_SETUP_PROC[:Ttk] = proc{|mod|
-  #   unless Tk.autoload?(:Tile) || Tk.const_defined?(:Tile)
-  #     Object.autoload :Ttk, 'tkextlib/tile'
-  #     Tk.autoload :Tile, 'tkextlib/tile'
-  #   end
-  # }
-  Tk.__toplevel_alias_setup_proc__(:Ttk, :Tile){|mod|
-    unless Tk.autoload?(:Tile) || Tk.const_defined?(:Tile)
-      Object.autoload :Ttk, 'tkextlib/tile'
-      Tk.autoload :Tile, 'tkextlib/tile'
-    end
-  }
-end
diff --git a/ext/tk/lib/tk/txtwin_abst.rb b/ext/tk/lib/tk/txtwin_abst.rb
deleted file mode 100644
index 32986d4788..0000000000
--- a/ext/tk/lib/tk/txtwin_abst.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/txtwin_abst.rb : TkTextWin abstract class
-#
-require 'tk'
-
-class TkTextWin<TkWindow
-  TkCommandNames = [].freeze
-  #def create_self
-  #  fail RuntimeError, "TkTextWin is an abstract class"
-  #end
-  #private :create_self
-
-  def bbox(index)
-    list(tk_send_without_enc('bbox', index))
-  end
-  def delete(first, last=None)
-    tk_send_without_enc('delete', first, last)
-    self
-  end
-  def get(*index)
-    _fromUTF8(tk_send_without_enc('get', *index))
-  end
-  def insert(index, *args)
-    tk_send('insert', index, *args)
-    self
-  end
-  def scan_mark(x, y)
-    tk_send_without_enc('scan', 'mark', x, y)
-    self
-  end
-  def scan_dragto(x, y)
-    tk_send_without_enc('scan', 'dragto', x, y)
-    self
-  end
-  def see(index)
-    tk_send_without_enc('see', index)
-    self
-  end
-end
diff --git a/ext/tk/lib/tk/validation.rb b/ext/tk/lib/tk/validation.rb
deleted file mode 100644
index c6cbfb280e..0000000000
--- a/ext/tk/lib/tk/validation.rb
+++ /dev/null
@@ -1,398 +0,0 @@
-# frozen_string_literal: false
-#
-#  tk/validation.rb - validation support module for entry, spinbox, and so on
-#
-require 'tk'
-
-module Tk
-  module ValidateConfigure
-    def self.__def_validcmd(scope, klass, keys=nil)
-      keys = klass._config_keys unless keys
-      keys.each{|key|
-        eval("def #{key}(*args, &b)
-                 __validcmd_call(#{klass.name}, '#{key}', *args, &b)
-              end", scope)
-      }
-    end
-
-    def __validcmd_call(klass, key, *args, &b)
-      return cget(key) if args.empty? && !b
-
-      cmd = (b)? proc(&b) : args.shift
-
-      if cmd.kind_of?(klass)
-        configure(key, cmd)
-      elsif !args.empty?
-        configure(key, [cmd, args])
-      else
-        configure(key, cmd)
-      end
-    end
-
-    def __validation_class_list
-      # maybe need to override
-      []
-    end
-
-    def __get_validate_key2class
-      k2c = {}
-      __validation_class_list.each{|klass|
-        klass._config_keys.each{|key|
-          k2c[key.to_s] = klass
-        }
-      }
-      k2c
-    end
-
-    def __conv_vcmd_on_hash_kv(keys)
-      key2class = __get_validate_key2class
-
-      keys = _symbolkey2str(keys)
-      key2class.each{|key, klass|
-        if keys[key].kind_of?(Array)
-          cmd, *args = keys[key]
-          #keys[key] = klass.new(cmd, args.join(' '))
-          keys[key] = klass.new(cmd, *args)
-        # elsif keys[key].kind_of?(Proc) ||  keys[key].kind_of?(Method)
-        elsif TkComm._callback_entry?(keys[key])
-          keys[key] = klass.new(keys[key])
-        end
-      }
-      keys
-    end
-
-    def create_self(keys)
-      super(__conv_vcmd_on_hash_kv(keys))
-    end
-    private :create_self
-
-    def configure(slot, value=TkComm::None)
-      if slot.kind_of?(Hash)
-        super(__conv_vcmd_on_hash_kv(slot))
-      else
-        super(__conv_vcmd_on_hash_kv(slot=>value))
-      end
-      self
-    end
-=begin
-    def configure(slot, value=TkComm::None)
-      key2class = __get_validate_key2class
-
-      if slot.kind_of?(Hash)
-        slot = _symbolkey2str(slot)
-        key2class.each{|key, klass|
-          if slot[key].kind_of?(Array)
-            cmd, *args = slot[key]
-            slot[key] = klass.new(cmd, args.join(' '))
-          elsif slot[key].kind_of?(Proc) || slot[key].kind_of?(Method)
-            slot[key] = klass.new(slot[key])
-          end
-        }
-        super(slot)
-
-      else
-        slot = slot.to_s
-        if (klass = key2class[slot])
-          if value.kind_of?(Array)
-            cmd, *args = value
-            value = klass.new(cmd, args.join(' '))
-          elsif value.kind_of?(Proc) || value.kind_of?(Method)
-            value = klass.new(value)
-          end
-        end
-        super(slot, value)
-      end
-
-      self
-    end
-=end
-  end
-
-  module ItemValidateConfigure
-    def self.__def_validcmd(scope, klass, keys=nil)
-      keys = klass._config_keys unless keys
-      keys.each{|key|
-        eval("def item_#{key}(id, *args, &b)
-                 __item_validcmd_call(#{klass.name}, '#{key}', id, *args, &b)
-              end", scope)
-      }
-    end
-
-    def __item_validcmd_call(tagOrId, klass, key, *args, &b)
-      return itemcget(tagid(tagOrId), key) if args.empty? && !b
-
-      cmd = (b)? proc(&b) : args.shift
-
-      if cmd.kind_of?(klass)
-        itemconfigure(tagid(tagOrId), key, cmd)
-      elsif !args.empty?
-        itemconfigure(tagid(tagOrId), key, [cmd, args])
-      else
-        itemconfigure(tagid(tagOrId), key, cmd)
-      end
-    end
-
-    def __item_validation_class_list(id)
-      # maybe need to override
-      []
-    end
-
-    def __get_item_validate_key2class(id)
-      k2c = {}
-      __item_validation_class_list(id).each{|klass|
-        klass._config_keys.each{|key|
-          k2c[key.to_s] = klass
-        }
-      }
-    end
-
-    def __conv_item_vcmd_on_hash_kv(keys)
-      key2class = __get_item_validate_key2class(tagid(tagOrId))
-
-      keys = _symbolkey2str(keys)
-      key2class.each{|key, klass|
-        if keys[key].kind_of?(Array)
-          cmd, *args = keys[key]
-          #keys[key] = klass.new(cmd, args.join(' '))
-          keys[key] = klass.new(cmd, *args)
-        # elsif keys[key].kind_of?(Proc) || keys[key].kind_of?(Method)
-        elsif TkComm._callback_entry?(keys[key])
-          keys[key] = klass.new(keys[key])
-        end
-      }
-      keys
-    end
-
-    def itemconfigure(tagOrId, slot, value=TkComm::None)
-      if slot.kind_of?(Hash)
-        super(__conv_item_vcmd_on_hash_kv(slot))
-      else
-        super(__conv_item_vcmd_on_hash_kv(slot=>value))
-      end
-      self
-    end
-=begin
-    def itemconfigure(tagOrId, slot, value=TkComm::None)
-      key2class = __get_item_validate_key2class(tagid(tagOrId))
-
-      if slot.kind_of?(Hash)
-        slot = _symbolkey2str(slot)
-        key2class.each{|key, klass|
-          if slot[key].kind_of?(Array)
-            cmd, *args = slot[key]
-            slot[key] = klass.new(cmd, args.join(' '))
-          elsif slot[key].kind_of?(Proc) ||  slot[key].kind_of?(Method)
-            slot[key] = klass.new(slot[key])
-          end
-        }
-        super(slot)
-
-      else
-        slot = slot.to_s
-        if (klass = key2class[slot])
-          if value.kind_of?(Array)
-            cmd, *args = value
-            value = klass.new(cmd, args.join(' '))
-          elsif value.kind_of?(Proc) || value.kind_of?(Method)
-            value = klass.new(value)
-          end
-        end
-        super(slot, value)
-      end
-
-      self
-    end
-=end
-  end
-end
-
-class TkValidateCommand
-  include TkComm
-  extend  TkComm
-
-  class ValidateArgs < TkUtil::CallbackSubst
-    KEY_TBL = [
-      [ ?d, ?n, :action ],
-      [ ?i, ?x, :index ],
-      [ ?s, ?e, :current ],
-      [ ?v, ?s, :type ],
-      [ ?P, ?e, :value ],
-      [ ?S, ?e, :string ],
-      [ ?V, ?s, :triggered ],
-      [ ?W, ?w, :widget ],
-      nil
-    ]
-
-    PROC_TBL = [
-      [ ?n, TkComm.method(:number) ],
-      [ ?s, TkComm.method(:string) ],
-      [ ?w, TkComm.method(:window) ],
-
-      [ ?e, proc{|val|
-          #enc = Tk.encoding
-          enc = ((Tk.encoding)? Tk.encoding : Tk.encoding_system)
-          if enc
-            Tk.fromUTF8(TkComm::string(val), enc)
-          else
-            TkComm::string(val)
-          end
-        }
-      ],
-
-      [ ?x, proc{|val|
-          idx = TkComm::number(val)
-          if idx < 0
-            nil
-          else
-            idx
-          end
-        }
-      ],
-
-      nil
-    ]
-
-=begin
-    # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-    KEY_TBL.map!{|inf|
-      if inf.kind_of?(Array)
-        inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-        inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-      end
-      inf
-    }
-
-    PROC_TBL.map!{|inf|
-      if inf.kind_of?(Array)
-        inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-      end
-      inf
-    }
-=end
-
-    _setup_subst_table(KEY_TBL, PROC_TBL);
-
-    #
-    # NOTE: The order of parameters which passed to callback procedure is
-    #        <extra_arg>, <extra_arg>, ... , <subst_arg>, <subst_arg>, ...
-    #
-
-    #def self._get_extra_args_tbl
-    #  # return an array of convert procs
-    #  []
-    #end
-
-    def self.ret_val(val)
-      (val)? '1': '0'
-    end
-  end
-
-  ###############################################
-
-  def self._config_keys
-    # array of config-option key (string or symbol)
-    ['vcmd', 'validatecommand', 'invcmd', 'invalidcommand']
-  end
-
-  def _initialize_for_cb_class(klass, cmd = Proc.new, *args)
-    extra_args_tbl = klass._get_extra_args_tbl
-
-    if args.compact.size > 0
-      args.map!{|arg| klass._sym2subst(arg)}
-      args = args.join(' ')
-      keys = klass._get_subst_key(args)
-      if cmd.kind_of?(String)
-        id = cmd
-      elsif cmd.kind_of?(TkCallbackEntry)
-        @id = install_cmd(cmd)
-      else
-        @id = install_cmd(proc{|*arg|
-             ex_args = []
-             extra_args_tbl.reverse_each{|conv| ex_args << conv.call(arg.pop)}
-             klass.ret_val(cmd.call(
-               *(ex_args.concat(klass.scan_args(keys, arg)))
-             ))
-        }) + ' ' + args
-      end
-    else
-      keys, args = klass._get_all_subst_keys
-      if cmd.kind_of?(String)
-        id = cmd
-      elsif cmd.kind_of?(TkCallbackEntry)
-        @id = install_cmd(cmd)
-      else
-        @id = install_cmd(proc{|*arg|
-             ex_args = []
-             extra_args_tbl.reverse_each{|conv| ex_args << conv.call(arg.pop)}
-             klass.ret_val(cmd.call(
-               *(ex_args << klass.new(*klass.scan_args(keys, arg)))
-             ))
-        }) + ' ' + args
-      end
-    end
-  end
-
-  def initialize(cmd = Proc.new, *args)
-    _initialize_for_cb_class(self.class::ValidateArgs, cmd, *args)
-  end
-
-  def to_eval
-    @id
-  end
-end
-
-module TkValidation
-  include Tk::ValidateConfigure
-
-  class ValidateCmd < TkValidateCommand
-    module Action
-      Insert = 1
-      Delete = 0
-      Others = -1
-      Focus  = -1
-      Forced = -1
-      Textvariable = -1
-      TextVariable = -1
-    end
-  end
-
-  #####################################
-
-  def __validation_class_list
-    super() << ValidateCmd
-  end
-
-  Tk::ValidateConfigure.__def_validcmd(binding, ValidateCmd)
-
-=begin
-  def validatecommand(cmd = Proc.new, args = nil)
-    if cmd.kind_of?(ValidateCmd)
-      configure('validatecommand', cmd)
-    elsif args
-      configure('validatecommand', [cmd, args])
-    else
-      configure('validatecommand', cmd)
-    end
-  end
-=end
-#  def validatecommand(*args, &b)
-#    __validcmd_call(ValidateCmd, 'validatecommand', *args, &b)
-#  end
-#  alias vcmd validatecommand
-
-=begin
-  def invalidcommand(cmd = Proc.new, args = nil)
-    if cmd.kind_of?(ValidateCmd)
-      configure('invalidcommand', cmd)
-    elsif args
-      configure('invalidcommand', [cmd, args])
-    else
-      configure('invalidcommand', cmd)
-    end
-  end
-=end
-#  def invalidcommand(*args, &b)
-#    __validcmd_call(ValidateCmd, 'invalidcommand', *args, &b)
-#  end
-#  alias invcmd invalidcommand
-end
diff --git a/ext/tk/lib/tk/variable.rb b/ext/tk/lib/tk/variable.rb
deleted file mode 100644
index 8ac0fc6ace..0000000000
--- a/ext/tk/lib/tk/variable.rb
+++ /dev/null
@@ -1,1797 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/variable.rb : treat Tk variable object
-#
-require 'tk'
-
-class TkVariable
-  include Tk
-  extend TkCore
-
-  include Comparable
-
-  #TkCommandNames = ['tkwait'.freeze].freeze
-  TkCommandNames = ['vwait'.freeze].freeze
-
-  #TkVar_CB_TBL = {}
-  #TkVar_ID_TBL = {}
-  TkVar_CB_TBL = TkCore::INTERP.create_table
-  TkVar_ID_TBL = TkCore::INTERP.create_table
-  (Tk_VARIABLE_ID = ["v".freeze, TkUtil.untrust("00000")]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-  TkCore::INTERP.init_ip_env{
-    TkVar_CB_TBL.mutex.synchronize{ TkVar_CB_TBL.clear }
-    TkVar_ID_TBL.mutex.synchronize{ TkVar_ID_TBL.clear }
-  }
-
-  major, minor, type, patchlevel = TclTkLib.get_version
-  USE_OLD_TRACE_OPTION_STYLE = (major < 8) || (major == 8 && minor < 4)
-
-  #TkCore::INTERP.add_tk_procs('rb_var', 'args',
-  #     "ruby [format \"TkVariable.callback %%Q!%s!\" $args]")
-  TkCore::INTERP.add_tk_procs('rb_var', 'args', <<-'EOL')
-    if {[set st [catch {eval {ruby_cmd TkVariable callback} $args} ret]] != 0} {
-       set idx [string first "\n\n" $ret]
-       if {$idx > 0} {
-          global errorInfo
-          set tcl_backtrace $errorInfo
-          set errorInfo [string range $ret [expr $idx + 2] \
-                                           [string length $ret]]
-          append errorInfo "\n" $tcl_backtrace
-          bgerror [string range $ret 0 [expr $idx - 1]]
-       } else {
-          bgerror $ret
-       }
-       return ""
-       #return -code $st $ret
-    } else {
-        return $ret
-    }
-  EOL
-
-  #def TkVariable.callback(args)
-  def TkVariable.callback(id, name1, name2, op)
-    #name1,name2,op = tk_split_list(args)
-    #name1,name2,op = tk_split_simplelist(args)
-    if cb_obj = TkVar_CB_TBL[id]
-      #_get_eval_string(TkVar_CB_TBL[name1].trace_callback(name2,op))
-      begin
-        _get_eval_string(cb_obj.trace_callback(name2, op))
-      rescue SystemExit
-        exit(0)
-      rescue Interrupt
-        exit!(1)
-      rescue Exception => e
-        begin
-          msg = _toUTF8(e.class.inspect) + ': ' +
-                _toUTF8(e.message) + "\n" +
-                "\n---< backtrace of Ruby side >-----\n" +
-                _toUTF8(e.backtrace.join("\n")) +
-                "\n---< backtrace of Tk side >-------"
-          if TkCore::WITH_ENCODING
-            msg.force_encoding('utf-8')
-          else
-            msg.instance_variable_set(:@encoding, 'utf-8')
-          end
-        rescue Exception
-          msg = e.class.inspect + ': ' + e.message + "\n" +
-                "\n---< backtrace of Ruby side >-----\n" +
-                e.backtrace.join("\n") +
-                "\n---< backtrace of Tk side >-------"
-        end
-        fail(e, msg)
-      end
-=begin
-      begin
-        raise 'check backtrace'
-      rescue
-        # ignore backtrace before 'callback'
-        pos = -($!.backtrace.size)
-      end
-      begin
-        _get_eval_string(TkVar_CB_TBL[name1].trace_callback(name2,op))
-      rescue
-        trace = $!.backtrace
-        raise $!, "\n#{trace[0]}: #{$!.message} (#{$!.class})\n" +
-                  "\tfrom #{trace[1..pos].join("\n\tfrom ")}"
-      end
-=end
-    else
-      ''
-    end
-  end
-
-  def self.new_hash(val = {})
-    if val.kind_of?(Hash)
-      self.new(val)
-    else
-      fail ArgumentError, 'Hash is expected'
-    end
-  end
-
-  #
-  # default_value is available only when the variable is an assoc array.
-  #
-  def default_value(val=nil, &b)
-    if b
-      @def_default = :proc
-      @default_val = proc(&b)
-    else
-      @def_default = :val
-      @default_val = val
-    end
-    self
-  end
-  def set_default_value(val)
-    @def_default = :val
-    @default_val = val
-    self
-  end
-  alias default_value= set_default_value
-  def default_proc(cmd = Proc.new)
-    @def_default = :proc
-    @default_val = cmd
-    self
-  end
-
-  def undef_default
-    @default_val = nil
-    @def_default = false
-    self
-  end
-
-  def default_value_type
-    @type
-  end
-  def default_element_value_type(idxs)
-    if idxs.kind_of?(Array)
-      index = idxs.collect{|idx| _get_eval_string(idx, true)}.join(',')
-    else
-      index = _get_eval_string(idxs, true)
-    end
-    @element_type[index]
-  end
-
-  def _set_default_value_type_core(type, idxs)
-    if type.kind_of?(Class)
-      if type == NilClass
-        type = nil
-      elsif type == Numeric
-        type = :numeric
-      elsif type == TrueClass || type == FalseClass
-        type = :bool
-      elsif type == String
-        type = :string
-      elsif type == Symbol
-        type = :symbol
-      elsif type == Array
-        type = :list
-      elsif type <= TkVariable
-        type = :variable
-      elsif type <= TkWindow
-        type = :window
-      elsif TkComm._callback_entry_class?(type)
-        type = :procedure
-      else
-        type = nil
-      end
-    else
-      case(type)
-      when nil
-        type = nil
-      when :numeric, 'numeric'
-        type = :numeric
-      when true, false, :bool, 'bool'
-        type = :bool
-      when :string, 'string'
-        type = :string
-      when :symbol, 'symbol'
-        type = :symbol
-      when :list, 'list'
-        type = :list
-      when :numlist, 'numlist'
-        type = :numlist
-      when :variable, 'variable'
-        type = :variable
-      when :window, 'window'
-        type = :window
-      when :procedure, 'procedure'
-        type = :procedure
-      else
-        return _set_default_value_type_core(type.class, idxs)
-      end
-    end
-    if idxs
-      if idxs.kind_of?(Array)
-        index = idxs.collect{|idx| _get_eval_string(idx, true)}.join(',')
-      else
-        index = _get_eval_string(idxs, true)
-      end
-      @element_type[index] = type
-    else
-      @type = type
-    end
-    type
-  end
-  private :_set_default_value_type_core
-
-  def set_default_value_type(type)
-    _set_default_value_type_core(type, nil)
-    self
-  end
-  alias default_value_type= set_default_value_type
-
-  def set_default_element_value_type(idxs, type)
-    _set_default_value_type_core(type, idxs)
-    self
-  end
-
-  def _to_default_type(val, idxs = nil)
-    if idxs
-      if idxs.kind_of?(Array)
-        index = idxs.collect{|idx| _get_eval_string(idx, true)}.join(',')
-      else
-        index = _get_eval_string(idxs, true)
-      end
-      type = @element_type[index]
-    else
-      type = @type
-    end
-    return val unless type
-    if val.kind_of?(Hash)
-      val.keys.each{|k| val[k] = _to_default_type(val[k], idxs) }
-      val
-    else
-      begin
-        case(type)
-        when :numeric
-          number(val)
-        when :bool
-          TkComm.bool(val)
-        when :string
-          val
-        when :symbol
-          val.intern
-        when :list
-          tk_split_simplelist(val)
-        when :numlist
-          tk_split_simplelist(val).collect!{|v| number(v)}
-        when :variable
-          TkVarAccess.new(val)
-        when :window
-          TkComm.window(val)
-        when :procedure
-          TkComm.procedure(val)
-        else
-          val
-        end
-      rescue
-        val
-      end
-    end
-  end
-  private :_to_default_type
-
-  def _to_default_element_type(idxs, val)
-    _to_default_type(val, idxs)
-  end
-  private :_to_default_element_type
-
-  def initialize(val="", type=nil)
-    # @id = Tk_VARIABLE_ID.join('')
-    begin
-      Tk_VARIABLE_ID.mutex.synchronize{
-        @id = Tk_VARIABLE_ID.join(TkCore::INTERP._ip_id_)
-        Tk_VARIABLE_ID[1].succ!
-      }
-    end until INTERP._invoke_without_enc('info', 'globals', @id).empty?
-
-    TkVar_ID_TBL.mutex.synchronize{
-      TkVar_ID_TBL[@id] = self
-    }
-
-    @var  = @id
-    @elem = nil
-
-    @def_default = false
-    @default_val = nil
-
-    @trace_var  = nil
-    @trace_elem = nil
-    @trace_opts = nil
-
-    @type = nil
-    var = self
-    @element_type = Hash.new{|k,v| var.default_value_type }
-
-    self.default_value_type = type
-
-    # teach Tk-ip that @id is global var
-    INTERP._invoke_without_enc('global', @id)
-    #INTERP._invoke('global', @id)
-
-    # create and init
-    if val.kind_of?(Hash)
-      # assoc-array variable
-      self[''] = 0
-      self.clear
-    end
-    self.value = val
-
-=begin
-    if val == []
-      # INTERP._eval(format('global %s; set %s(0) 0; unset %s(0)',
-      #                     @id, @id, @id))
-    elsif val.kind_of?(Array)
-      a = []
-      # val.each_with_index{|e,i| a.push(i); a.push(array2tk_list(e))}
-      # s = '"' + a.join(" ").gsub(/[\[\]$"]/, '\\\\\&') + '"'
-      val.each_with_index{|e,i| a.push(i); a.push(e)}
-      #s = '"' + array2tk_list(a).gsub(/[\[\]$"]/, '\\\\\&') + '"'
-      s = '"' + array2tk_list(a).gsub(/[\[\]$"\\]/, '\\\\\&') + '"'
-      INTERP._eval(format('global %s; array set %s %s', @id, @id, s))
-    elsif  val.kind_of?(Hash)
-      #s = '"' + val.to_a.collect{|e| array2tk_list(e)}.join(" ")\
-      #             .gsub(/[\[\]$"]/, '\\\\\&') + '"'
-      s = '"' + val.to_a.collect{|e| array2tk_list(e)}.join(" ")\
-                   .gsub(/[\[\]$"\\]/, '\\\\\&') + '"'
-      INTERP._eval(format('global %s; array set %s %s', @id, @id, s))
-    else
-      #s = '"' + _get_eval_string(val).gsub(/[\[\]$"]/, '\\\\\&') + '"'
-      s = '"' + _get_eval_string(val).gsub(/[\[\]$"\\]/, '\\\\\&') + '"'
-      INTERP._eval(format('global %s; set %s %s', @id, @id, s))
-    end
-=end
-=begin
-    if  val.kind_of?(Hash)
-      #s = '"' + val.to_a.collect{|e| array2tk_list(e)}.join(" ")\
-      #             .gsub(/[\[\]$"]/, '\\\\\&') + '"'
-      s = '"' + val.to_a.collect{|e| array2tk_list(e)}.join(" ")\
-                   .gsub(/[\[\]$"\\]/, '\\\\\&') + '"'
-      INTERP._eval(Kernel.format('global %s; array set %s %s', @id, @id, s))
-    else
-      #s = '"' + _get_eval_string(val).gsub(/[\[\]$"]/, '\\\\\&') + '"'
-      s = '"' + _get_eval_string(val).gsub(/[\[\]$"\\]/, '\\\\\&') + '"'
-      INTERP._eval(Kernel.format('global %s; set %s %s', @id, @id, s))
-    end
-=end
-  end
-
-  def wait(on_thread = false, check_root = false)
-    on_thread &= (Thread.list.size != 1)
-    if on_thread
-      if check_root
-        INTERP._thread_tkwait('variable', @id)
-      else
-        INTERP._thread_vwait(@id)
-      end
-    else
-      if check_root
-        INTERP._invoke_without_enc('tkwait', 'variable', @id)
-      else
-        INTERP._invoke_without_enc('vwait', @id)
-      end
-    end
-  end
-  def eventloop_wait(check_root = false)
-    wait(false, check_root)
-  end
-  def thread_wait(check_root = false)
-    wait(true, check_root)
-  end
-  def tkwait(on_thread = true)
-    wait(on_thread, true)
-  end
-  def eventloop_tkwait
-    wait(false, true)
-  end
-  def thread_tkwait
-    wait(true, true)
-  end
-
-  def id
-    @id
-  end
-
-  def ref(*idxs)
-    # "#{@id}(#{idxs.collect{|idx| _get_eval_string(idx)}.join(',')})"
-    TkVarAccess.new("#{@id}(#{idxs.collect{|idx| _get_eval_string(idx)}.join(',')})")
-  end
-
-  def is_hash?
-    #ITNERP._eval("global #{@id}; array exist #{@id}") == '1'
-    INTERP._invoke_without_enc('global', @id)
-    # INTERP._invoke_without_enc('array', 'exist', @id) == '1'
-    TkComm.bool(INTERP._invoke_without_enc('array', 'exist', @id))
-  end
-
-  def is_scalar?
-    ! is_hash?
-  end
-
-  def exist?(*elems)
-    INTERP._invoke_without_enc('global', @id)
-    if elems.empty?
-      TkComm.bool(tk_call('info', 'exist', @id))
-    else
-      # array
-      index = elems.collect{|idx| _get_eval_string(idx, true)}.join(',')
-      TkComm.bool(tk_call('info', 'exist', "#{@id}")) &&
-        TkComm.bool(tk_call('info', 'exist', "#{@id}(#{index})"))
-    end
-  end
-
-  def keys
-    if (is_scalar?)
-      fail RuntimeError, 'cannot get keys from a scalar variable'
-    end
-    #tk_split_simplelist(INTERP._eval("global #{@id}; array get #{@id}"))
-    INTERP._invoke_without_enc('global', @id)
-    #tk_split_simplelist(INTERP._fromUTF8(INTERP._invoke_without_enc('array', 'names', @id)))
-    tk_split_simplelist(INTERP._invoke_without_enc('array', 'names', @id),
-                        false, true)
-  end
-
-  def size
-    INTERP._invoke_without_enc('global', @id)
-    TkComm.number(INTERP._invoke_without_enc('array', 'size', @id))
-  end
-
-  def clear
-    if (is_scalar?)
-      fail RuntimeError, 'cannot clear a scalar variable'
-    end
-    keys.each{|k| unset(k)}
-    self
-  end
-
-  def update(hash)
-    if (is_scalar?)
-      fail RuntimeError, 'cannot update a scalar variable'
-    end
-    hash.each{|k,v| self[k] = v}
-    self
-  end
-
-unless const_defined?(:USE_TCLs_SET_VARIABLE_FUNCTIONS)
-  USE_TCLs_SET_VARIABLE_FUNCTIONS = true
-end
-
-if USE_TCLs_SET_VARIABLE_FUNCTIONS
-  ###########################################################################
-  # use Tcl function version of set tkvariable
-  ###########################################################################
-
-  def _value
-    #if INTERP._eval("global #{@id}; array exist #{@id}") == '1'
-    INTERP._invoke_without_enc('global', @id)
-    # if INTERP._invoke('array', 'exist', @id) == '1'
-    if TkComm.bool(INTERP._invoke('array', 'exist', @id))
-      #Hash[*tk_split_simplelist(INTERP._eval("global #{@id}; array get #{@id}"))]
-      Hash[*tk_split_simplelist(INTERP._invoke('array', 'get', @id))]
-    else
-      _fromUTF8(INTERP._get_global_var(@id))
-    end
-  end
-
-  def value=(val)
-    val = val._value if !@type && @type != :variable && val.kind_of?(TkVariable)
-    if val.kind_of?(Hash)
-      self.clear
-      val.each{|k, v|
-        #INTERP._set_global_var2(@id, _toUTF8(_get_eval_string(k)),
-        #                       _toUTF8(_get_eval_string(v)))
-        INTERP._set_global_var2(@id, _get_eval_string(k, true),
-                                _get_eval_string(v, true))
-      }
-      self.value
-#    elsif val.kind_of?(Array)
-=begin
-      INTERP._set_global_var(@id, '')
-      val.each{|v|
-        #INTERP._set_variable(@id, _toUTF8(_get_eval_string(v)),
-        INTERP._set_variable(@id, _get_eval_string(v, true),
-                             TclTkLib::VarAccessFlag::GLOBAL_ONLY   |
-                             TclTkLib::VarAccessFlag::LEAVE_ERR_MSG |
-                             TclTkLib::VarAccessFlag::APPEND_VALUE  |
-                             TclTkLib::VarAccessFlag::LIST_ELEMENT)
-      }
-      self.value
-=end
-#      _fromUTF8(INTERP._set_global_var(@id, array2tk_list(val, true)))
-    else
-      #_fromUTF8(INTERP._set_global_var(@id, _toUTF8(_get_eval_string(val))))
-      _fromUTF8(INTERP._set_global_var(@id, _get_eval_string(val, true)))
-    end
-  end
-
-  def _element_value(*idxs)
-    index = idxs.collect{|idx| _get_eval_string(idx, true)}.join(',')
-    begin
-      _fromUTF8(INTERP._get_global_var2(@id, index))
-    rescue => e
-      case @def_default
-      when :proc
-        @default_val.call(self, *idxs)
-      when :val
-        @default_val
-      else
-        fail e
-      end
-    end
-    #_fromUTF8(INTERP._get_global_var2(@id, index))
-    #_fromUTF8(INTERP._get_global_var2(@id, _toUTF8(_get_eval_string(index))))
-    #_fromUTF8(INTERP._get_global_var2(@id, _get_eval_string(index, true)))
-  end
-
-  def []=(*args)
-    val = args.pop
-    type = default_element_value_type(args)
-    val = val._value if !type && type != :variable && val.kind_of?(TkVariable)
-    index = args.collect{|idx| _get_eval_string(idx, true)}.join(',')
-    _fromUTF8(INTERP._set_global_var2(@id, index, _get_eval_string(val, true)))
-    #_fromUTF8(INTERP._set_global_var2(@id, _toUTF8(_get_eval_string(index)),
-    #                                 _toUTF8(_get_eval_string(val))))
-    #_fromUTF8(INTERP._set_global_var2(@id, _get_eval_string(index, true),
-    #                                 _get_eval_string(val, true)))
-  end
-
-  def unset(*elems)
-    if elems.empty?
-      INTERP._unset_global_var(@id)
-    else
-      index = elems.collect{|idx| _get_eval_string(idx, true)}.join(',')
-      INTERP._unset_global_var2(@id, index)
-    end
-  end
-  alias remove unset
-
-else
-  ###########################################################################
-  # use Ruby script version of set tkvariable (traditional methods)
-  ###########################################################################
-
-  def _value
-    begin
-      INTERP._eval(Kernel.format('global %s; set %s', @id, @id))
-      #INTERP._eval(Kernel.format('set %s', @id))
-      #INTERP._invoke_without_enc('set', @id)
-    rescue
-      if INTERP._eval(Kernel.format('global %s; array exists %s',
-                            @id, @id)) != "1"
-      #if INTERP._eval(Kernel.format('array exists %s', @id)) != "1"
-      #if INTERP._invoke_without_enc('array', 'exists', @id) != "1"
-        fail
-      else
-        Hash[*tk_split_simplelist(INTERP._eval(Kernel.format('global %s; array get %s', @id, @id)))]
-        #Hash[*tk_split_simplelist(_fromUTF8(INTERP._invoke_without_enc('array', 'get', @id)))]
-      end
-    end
-  end
-
-  def value=(val)
-    val = val._value if !@type && @type != :variable && val.kind_of?(TkVariable)
-    begin
-      #s = '"' + _get_eval_string(val).gsub(/[\[\]$"]/, '\\\\\&') + '"'
-      s = '"' + _get_eval_string(val).gsub(/[\[\]$"\\]/, '\\\\\&') + '"'
-      INTERP._eval(Kernel.format('global %s; set %s %s', @id, @id, s))
-      #INTERP._eval(Kernel.format('set %s %s', @id, s))
-      #_fromUTF8(INTERP._invoke_without_enc('set', @id, _toUTF8(s)))
-    rescue
-      if INTERP._eval(Kernel.format('global %s; array exists %s',
-                            @id, @id)) != "1"
-      #if INTERP._eval(Kernel.format('array exists %s', @id)) != "1"
-      #if INTERP._invoke_without_enc('array', 'exists', @id) != "1"
-        fail
-      else
-        if val == []
-          INTERP._eval(Kernel.format('global %s; unset %s; set %s(0) 0; unset %s(0)', @id, @id, @id, @id))
-          #INTERP._eval(Kernel.format('unset %s; set %s(0) 0; unset %s(0)',
-          #                          @id, @id, @id))
-          #INTERP._invoke_without_enc('unset', @id)
-          #INTERP._invoke_without_enc('set', @id+'(0)', 0)
-          #INTERP._invoke_without_enc('unset', @id+'(0)')
-        elsif val.kind_of?(Array)
-          a = []
-          val.each_with_index{|e,i| a.push(i); a.push(array2tk_list(e, true))}
-          #s = '"' + a.join(" ").gsub(/[\[\]$"]/, '\\\\\&') + '"'
-          s = '"' + a.join(" ").gsub(/[\[\]$"\\]/, '\\\\\&') + '"'
-          INTERP._eval(Kernel.format('global %s; unset %s; array set %s %s',
-                                     @id, @id, @id, s))
-          #INTERP._eval(Kernel.format('unset %s; array set %s %s',
-          #                          @id, @id, s))
-          #INTERP._invoke_without_enc('unset', @id)
-          #_fromUTF8(INTERP._invoke_without_enc('array','set', @id, _toUTF8(s)))
-        elsif  val.kind_of?(Hash)
-          #s = '"' + val.to_a.collect{|e| array2tk_list(e)}.join(" ")\
-          #                      .gsub(/[\[\]$"]/, '\\\\\&') + '"'
-          s = '"' + val.to_a.collect{|e| array2tk_list(e, true)}.join(" ")\
-                                .gsub(/[\[\]$\\"]/, '\\\\\&') + '"'
-          INTERP._eval(Kernel.format('global %s; unset %s; array set %s %s',
-                                     @id, @id, @id, s))
-          #INTERP._eval(Kernel.format('unset %s; array set %s %s',
-          #                          @id, @id, s))
-          #INTERP._invoke_without_enc('unset', @id)
-          #_fromUTF8(INTERP._invoke_without_enc('array','set', @id, _toUTF8(s)))
-        else
-          fail
-        end
-      end
-    end
-  end
-
-  def _element_value(*idxs)
-    index = idxs.collect{|idx| _get_eval_string(idx)}.join(',')
-    begin
-      INTERP._eval(Kernel.format('global %s; set %s(%s)', @id, @id, index))
-    rescue => e
-      case @def_default
-      when :proc
-        @default_val.call(self, *idxs)
-      when :val
-        @default_val
-      else
-        fail e
-      end
-    end
-    #INTERP._eval(Kernel.format('global %s; set %s(%s)', @id, @id, index))
-    #INTERP._eval(Kernel.format('global %s; set %s(%s)',
-    #                           @id, @id, _get_eval_string(index)))
-    #INTERP._eval(Kernel.format('set %s(%s)', @id, _get_eval_string(index)))
-    #INTERP._eval('set ' + @id + '(' + _get_eval_string(index) + ')')
-  end
-
-  def []=(*args)
-    val = args.pop
-    type = default_element_value_type(args)
-    val = val._value if !type && type != :variable && val.kind_of?(TkVariable)
-    index = args.collect{|idx| _get_eval_string(idx)}.join(',')
-    INTERP._eval(Kernel.format('global %s; set %s(%s) %s', @id, @id,
-                              index, _get_eval_string(val)))
-    #INTERP._eval(Kernel.format('global %s; set %s(%s) %s', @id, @id,
-    #                          _get_eval_string(index), _get_eval_string(val)))
-    #INTERP._eval(Kernel.format('set %s(%s) %s', @id,
-    #                          _get_eval_string(index), _get_eval_string(val)))
-    #INTERP._eval('set ' + @id + '(' + _get_eval_string(index) + ') ' +
-    #            _get_eval_string(val))
-  end
-
-  def unset(*elems)
-    if elems.empty?
-      INTERP._eval(Kernel.format('global %s; unset %s', @id, @id))
-      #INTERP._eval(Kernel.format('unset %s', @id))
-      #INTERP._eval('unset ' + @id)
-    else
-      index = elems.collect{|idx| _get_eval_string(idx, true)}.join(',')
-      INTERP._eval(Kernel.format('global %s; unset %s(%s)', @id, @id, index))
-      #INTERP._eval(Kernel.format('global %s; unset %s(%s)',
-      #                           @id, @id, _get_eval_string(elem)))
-      #INTERP._eval(Kernel.format('unset %s(%s)', @id, tk_tcl2ruby(elem)))
-      #INTERP._eval('unset ' + @id + '(' + _get_eval_string(elem) + ')')
-    end
-  end
-  alias remove unset
-
-end
-
-  protected :_value, :_element_value
-
-  def value
-    _to_default_type(_value)
-  end
-
-  def [](*idxs)
-    _to_default_element_type(idxs, _element_value(*idxs))
-  end
-
-  def set_value(val)
-    self.value = val
-    self
-  end
-
-  def to_hash
-    hash = {}
-    self.keys.each{|k|
-      hash[k] = self[k]
-    }
-    hash
-  end
-
-  def set_element_value(idxs, val)
-    if idxs.kind_of?(Array)
-      self[*idxs]=val
-    else
-      self[idxs]=val
-    end
-    self
-  end
-
-  def set_value_type(val)
-    self.default_value_type = val.class
-    self.value = val
-    self
-  end
-
-  alias value_type= set_value_type
-
-  def set_element_value_type(idxs, val)
-    self.set_default_element_value_type(idxs, val.class)
-    if idxs.kind_of?(Array)
-      self[*idxs]=val
-    else
-      self[idxs]=val
-    end
-    self
-  end
-
-  def numeric
-    number(_value)
-  end
-  def numeric_element(*idxs)
-    number(_element_value(*idxs))
-  end
-  def set_numeric(val)
-    case val
-    when Numeric
-      self.value=(val)
-    when TkVariable
-      self.value=(val.numeric)
-    else
-      raise ArgumentError, "Numeric is expected"
-    end
-    self
-  end
-  alias numeric= set_numeric
-  def set_numeric_element(idxs, val)
-    case val
-    when Numeric
-      val
-    when TkVariable
-      val = val.numeric
-    else
-      raise ArgumentError, "Numeric is expected"
-    end
-    if idxs.kind_of?(Array)
-      self[*idxs]=val
-    else
-      self[idxs]=val
-    end
-    self
-  end
-  def set_numeric_type(val)
-    @type = :numeric
-    self.numeric=(val)
-    self
-  end
-  alias numeric_type= set_numeric_type
-  def set_numeric_element_type(idxs, val)
-    self.set_default_element_value_type(idxs, :numeric)
-    self.set_numeric_element(idxs, val)
-  end
-
-  def bool
-    TkComm.bool(_value)
-=begin
-    # see Tcl_GetBoolean man-page
-    case _value.downcase
-    when '0', 'false', 'no', 'off'
-      false
-    else
-      true
-    end
-=end
-  end
-  def bool_element(*idxs)
-    TkComm.bool(_element_value(*idxs))
-  end
-  def set_bool(val)
-    if ! val
-      self.value = '0'
-    else
-      case val.to_s.downcase
-      when 'false', '0', 'no', 'off'
-        self.value = '0'
-      else
-        self.value = '1'
-      end
-    end
-    self
-  end
-  alias bool= set_bool
-  def set_bool_element(idxs, val)
-    if ! val
-      val = '0'
-    else
-      case val.to_s.downcase
-      when 'false', '0', 'no', 'off'
-        val = '0'
-      else
-        val = '1'
-      end
-    end
-    if idxs.kind_of?(Array)
-      self[*idxs]=val
-    else
-      self[idxs]=val
-    end
-    self
-  end
-  def set_bool_type(val)
-    @type = :bool
-    self.bool=(val)
-    self
-  end
-  alias bool_type= set_bool_type
-  def set_bool_element_type(idxs, val)
-    self.set_default_element_value_type(idxs, :bool)
-    self.set_bool_element(idxs, val)
-  end
-
-  def variable
-    # keeps a Tcl's variable name
-    TkVarAccess.new(self._value)
-  end
-  def variable_element(*idxs)
-    TkVarAccess.new(_element_value(*idxs))
-  end
-  def set_variable(var)
-    var = var.id if var.kind_of?(TkVariable)
-    self.value = var
-    self
-  end
-  alias variable= set_variable
-  def set_variable_element(idxs, var)
-    var = var.id if var.kind_of?(TkVariable)
-    if idxs.kind_of?(Array)
-      self[*idxs]=var
-    else
-      self[idxs]=var
-    end
-    self
-  end
-  def set_variable_type(var)
-    @type = :variable
-    var = var.id if var.kind_of?(TkVariable)
-    self.value = var
-    self
-  end
-  alias variable_type= set_variable_type
-  def set_variable_element_type(idxs, var)
-    self.set_default_element_value_type(idxs, :variable)
-    self.set_variable_element(idxs, var)
-  end
-
-  def window
-    TkComm.window(self._value)
-  end
-  def window_element(*idxs)
-    TkComm.window(_element_value(*idxs))
-  end
-  def set_window(win)
-    win = win._value if win.kind_of?(TkVariable)
-    self.value = win
-    self
-  end
-  alias window= set_window
-  def set_window_element(idxs, win)
-    win = win._value if win.kind_of?(TkVariable)
-    if idxs.kind_of?(Array)
-      self[*idxs]=win
-    else
-      self[idxs]=win
-    end
-    self
-  end
-  def set_window_type(win)
-    @type = :window
-    self.window=(win)
-    self
-  end
-  alias window_type= set_window_type
-  def set_window_element_type(idxs, win)
-    self.set_default_element_value_type(idxs, :window)
-    self.set_window_element(idxs, win)
-  end
-
-  def procedure
-    TkComm.procedure(self._value)
-  end
-  def procedure_element(*idxs)
-    TkComm.procedure(_element_value(*idxs))
-  end
-  def set_procedure(cmd)
-    self.value = cmd
-    self
-  end
-  alias procedure= set_procedure
-  def set_procedure_element(idxs, cmd)
-    cmd = cmd._value if cmd.kind_of?(TkVariable)
-    if idxs.kind_of?(Array)
-      self[*idxs]=cmd
-    else
-      self[idxs]=cmd
-    end
-    self
-  end
-  def set_procedure_type(cmd)
-    @type = :procedure
-    self.procedure=(cmd)
-    self
-  end
-  alias procedure_type= set_procedure_type
-  def set_procedure_element_type(idxs, cmd)
-    self.set_default_element_value_type(idxs, :procedure)
-    self.set_proceure_element(idxs, cmd)
-  end
-
-  def to_proc
-    cmd = self.procedure
-    if cmd.respond_to?(:call)
-      cmd
-    else
-      # cmd is a String
-      cmd.to_sym.to_proc
-    end
-  end
-
-  def to_i
-    number(_value).to_i
-  end
-  alias to_int to_i
-  def element_to_i(*idxs)
-    number(_element_value(*idxs)).to_i
-  end
-
-  def to_f
-    number(_value).to_f
-  end
-  def element_to_f(*idxs)
-    number(_element_value(*idxs)).to_f
-  end
-
-  def to_s
-    #string(value).to_s
-    _value
-  end
-  alias string to_s
-  alias to_str to_s
-  def element_to_s(*idxs)
-    _element_value(*idxs)
-  end
-  def string_element(*idxs)
-    _element_value(*idxs)
-  end
-  def set_string(val)
-    val = val._value if val.kind_of?(TkVariable)
-    self.value=val
-    self
-  end
-  alias string= set_string
-  def set_string_element(idxs, val)
-    val = val._value if val.kind_of?(TkVariable)
-    if idxs.kind_of?(Array)
-      self[*idxs]=val
-    else
-      self[idxs]=val
-    end
-    self
-  end
-  def set_string_type(val)
-    @type = :string
-    self.string=(val)
-    self
-  end
-  alias string_type= set_string_type
-  def set_string_element_type(idxs, val)
-    self.set_default_element_value_type(idxs, :string)
-    self.set_string_element(idxs, val)
-  end
-
-  def to_sym
-    _value.intern
-  end
-  alias symbol to_sym
-  def element_to_sym(*idxs)
-    _element_value(*idxs).intern
-  end
-  alias symbol_element element_to_sym
-  def set_symbol(val)
-    val = val._value if val.kind_of?(TkVariable)
-    self.value=val
-    self
-  end
-  alias symbol= set_symbol
-  def set_symbol_element(idxs, val)
-    val = val._value if val.kind_of?(TkVariable)
-    if idxs.kind_of?(Array)
-      self[*idxs]=val
-    else
-      self[idxs]=val
-    end
-    self
-  end
-  def set_symbol_type(val)
-    @type = :symbol
-    self.value=(val)
-    self
-  end
-  alias symbol_type= set_symbol_type
-  def set_symbol_element_type(idxs, val)
-    self.set_default_element_value_type(idxs, :symbol)
-    self.set_symbol_element(idxs, val)
-  end
-
-  def list
-    #tk_split_list(value)
-    tk_split_simplelist(_value)
-  end
-  alias to_a list
-  alias to_ary list
-  def list_element(*idxs)
-    tk_split_simplelist(_element_value(*idxs))
-  end
-  alias element_to_a list_element
-
-  def numlist
-    list.collect!{|val| number(val)}
-  end
-  def numlist_element(*idxs)
-    list_element(*idxs).collect!{|val| number(val)}
-  end
-
-  def set_list(val)
-    case val
-    when Array
-      self.value=(val)
-    when TkVariable
-      self.value=(val.list)
-    else
-      raise ArgumentError, "Array is expected"
-    end
-    self
-  end
-  alias list= set_list
-
-  alias set_numlist set_list
-  alias numlist= set_numlist
-
-  def set_list_element(idxs, val)
-    case val
-    when Array
-      val
-    when TkVariable
-      val = val.list
-    else
-      raise ArgumentError, "Array is expected"
-    end
-    if idxs.kind_of?(Array)
-      self[*idxs]=val
-    else
-      self[idxs]=val
-    end
-    self
-  end
-  alias set_numlist_element set_list_element
-
-  def set_list_type(val)
-    @type = :list
-    self.list=(val)
-    self
-  end
-  alias list_type= set_list_type
-  def set_list_element_type(idxs, val)
-    self.set_default_element_value_type(idxs, :list)
-    self.set_list_element(idxs, val)
-  end
-  def set_numlist_type(val)
-    @type = :numlist
-    self.numlist=(val)
-    self
-  end
-  alias numlist_type= set_numlist_type
-  def set_numlist_element_type(idxs, val)
-    self.set_default_element_value_type(idxs, :numlist)
-    self.set_numlist_element(idxs, val)
-  end
-
-  def lappend(*elems)
-    tk_call('lappend', @id, *elems)
-    self
-  end
-  def element_lappend(idxs, *elems)
-    if idxs.kind_of?(Array)
-      idxs = idxs.collect{|idx| _get_eval_string(idx, true)}.join(',')
-    end
-    tk_call('lappend', "#{@id}(#{idxs})", *elems)
-    self
-  end
-
-  def lindex(idx)
-    tk_call('lindex', self._value, idx)
-  end
-  alias lget lindex
-  def element_lindex(elem_idxs, idx)
-    if elem_idxs.kind_of?(Array)
-      val = _element_value(*elem_idxs)
-    else
-      val = _element_value(elem_idxs)
-    end
-    tk_call('lindex', val, idx)
-  end
-  alias element_lget element_lindex
-
-  def lget_i(idx)
-    number(lget(idx)).to_i
-  end
-  def element_lget_i(elem_idxs, idx)
-    number(element_lget(elem_idxs, idx)).to_i
-  end
-
-  def lget_f(idx)
-    number(lget(idx)).to_f
-  end
-  def element_lget_f(elem_idxs, idx)
-    number(element_lget(elem_idxs, idx)).to_f
-  end
-
-  def lset(idx, val)
-    tk_call('lset', @id, idx, val)
-    self
-  end
-  def element_lset(elem_idxs, idx, val)
-    if elem_idxs.kind_of?(Array)
-      idxs = elem_idxs.collect{|i| _get_eval_string(i, true)}.join(',')
-    end
-    tk_call('lset', "#{@id}(#{idxs})", idx, val)
-    self
-  end
-
-  def inspect
-    #Kernel.format "#<TkVariable: %s>", @id
-    '#<TkVariable: ' + @id + '>'
-  end
-
-  def coerce(other)
-    case other
-    when TkVariable
-      [other._value, self._value]
-    when String
-      [other, self.to_s]
-    when Symbol
-      [other, self.to_sym]
-    when Numeric
-      [other, self.numeric]
-    when Array
-      [other, self.to_a]
-    else
-      [other, self._value]
-    end
-  end
-
-  def +@
-    self.numeric
-  end
-  def -@
-    -(self.numeric)
-  end
-
-  def &(other)
-    if other.kind_of?(Array)
-      self.to_a & other.to_a
-    else
-      self.to_i & other.to_i
-    end
-  end
-  def |(other)
-    if other.kind_of?(Array)
-      self.to_a | other.to_a
-    else
-      self.to_i | other.to_i
-    end
-  end
-  def +(other)
-    case other
-    when Array
-      self.to_a + other
-    when String
-      self._value + other
-    else
-      begin
-        number(self._value) + other
-      rescue
-        self._value + other.to_s
-      end
-    end
-  end
-  def -(other)
-    if other.kind_of?(Array)
-      self.to_a - other
-    else
-      number(self._value) - other
-    end
-  end
-  def *(other)
-    num_or_str(self._value) * other
-    #begin
-    #  number(self._value) * other
-    #rescue
-    #  self._value * other
-    #end
-  end
-  def /(other)
-    number(self._value) / other
-  end
-  def %(other)
-    num_or_str(self._value) % other
-    #begin
-    #  number(self._value) % other
-    #rescue
-    #  self._value % other
-    #end
-  end
-  def **(other)
-    number(self._value) ** other
-  end
-  def =~(other)
-    self._value =~ other
-  end
-
-  def ==(other)
-    case other
-    when TkVariable
-      #self.equal?(other)
-      self._value == other._value
-    when String
-      self.to_s == other
-    when Symbol
-      self.to_sym == other
-    when Integer
-      self.to_i == other
-    when Float
-      self.to_f == other
-    when Array
-      self.to_a == other
-    when Hash
-      # false if self is not an assoc array
-      self._value == other
-    else
-      # false
-      self._value == _get_eval_string(other)
-    end
-  end
-
-  def ===(other)
-    if other.kind_of?(TkVariable)
-      self.id == other.id
-    else
-      super
-    end
-  end
-
-  def zero?
-    numeric.zero?
-  end
-  def nonzero?
-    !(numeric.zero?)
-  end
-
-  def <=>(other)
-    if other.kind_of?(TkVariable)
-      begin
-        val = other.numeric
-        other = val
-      rescue
-        other = other._value
-      end
-    elsif other.kind_of?(Numeric)
-      begin
-        return self.numeric <=> other
-      rescue
-        return self._value <=> other.to_s
-      end
-    elsif other.kind_of?(Array)
-      return self.list <=> other
-    else
-      return self._value <=> other
-    end
-  end
-
-  def to_eval
-    @id
-  end
-
-  def trace_callback(elem, op)
-    if @trace_var.kind_of? Array
-      @trace_var.each{|m,e| e.call(self,elem,op) if m.index(op)}
-    end
-    if elem.kind_of?(String) && elem != ''
-      if @trace_elem.kind_of?(Hash) && @trace_elem[elem].kind_of?(Array)
-        @trace_elem[elem].each{|m,e| e.call(self,elem,op) if m.index(op)}
-      end
-    end
-  end
-
-  def _check_trace_opt(opts)
-    if opts.kind_of?(Array)
-      opt_str = opts.map{|s| s.to_s}.join(' ')
-    else
-      opt_str = opts.to_s
-    end
-
-    fail ArgumentError, 'null trace option' if opt_str.empty?
-
-    if opt_str =~ /[^arwu\s]/
-      # new format (Tcl/Tk8.4+?)
-      if opts.kind_of?(Array)
-        opt_ary = opts.map{|opt| opt.to_s.strip}
-      else
-        opt_ary = opt_str.split(/\s+|\|/)
-        opt_ary.delete('')
-      end
-      if USE_OLD_TRACE_OPTION_STYLE
-        opt_ary.uniq.map{|opt|
-          case opt
-          when 'array'
-            'a'
-          when 'read'
-            'r'
-          when 'write'
-            'w'
-          when 'unset'
-            'u'
-          else
-            fail ArgumentError, "unsupported trace option '#{opt}' on Tcl/Tk#{Tk::TCL_PATCHLEVEL}"
-          end
-        }.join
-      else
-        opt_ary
-      end
-    else
-      # old format
-      opt_ary = opt_str.delete('^arwu').split(//).uniq
-      if USE_OLD_TRACE_OPTION_STYLE
-        opt_ary.join
-      else
-        opt_ary.map{|c|
-          case c
-          when 'a'
-            'array'
-          when 'r'
-            'read'
-          when 'w'
-            'write'
-          when 'u'
-            'unset'
-          end
-        }
-      end
-    end
-  end
-  private :_check_trace_opt
-
-  def trace(opts, cmd = Proc.new)
-    opts = _check_trace_opt(opts)
-    (@trace_var ||= []).unshift([opts,cmd])
-
-    if @trace_opts == nil
-      TkVar_CB_TBL[@id] = self
-      @trace_opts = opts.dup
-      if USE_OLD_TRACE_OPTION_STYLE
-        Tk.tk_call_without_enc('trace', 'variable',
-                               @id, @trace_opts, 'rb_var ' << @id)
-      else
-        Tk.tk_call_without_enc('trace', 'add', 'variable',
-                               @id, @trace_opts, 'rb_var ' << @id)
-      end
-    else
-      newopts = @trace_opts.dup
-      if USE_OLD_TRACE_OPTION_STYLE
-        opts.each_byte{|c| newopts.concat(c.chr) unless newopts.index(c.chr)}
-        if newopts != @trace_opts
-          Tk.tk_call_without_enc('trace', 'vdelete',
-                                 @id, @trace_opts, 'rb_var ' << @id)
-          @trace_opts.replace(newopts)
-          Tk.tk_call_without_enc('trace', 'variable',
-                                 @id, @trace_opts, 'rb_var ' << @id)
-        end
-      else
-        newopts |= opts
-        unless (newopts - @trace_opts).empty?
-          Tk.tk_call_without_enc('trace', 'remove', 'variable',
-                                 @id, @trace_opts, 'rb_var ' << @id)
-          @trace_opts.replace(newopts)
-          Tk.tk_call_without_enc('trace', 'add', 'variable',
-                                 @id, @trace_opts, 'rb_var ' << @id)
-        end
-      end
-    end
-
-    self
-  end
-
-  def trace_element(elem, opts, cmd = Proc.new)
-    if @elem
-      fail(RuntimeError,
-           "invalid for a TkVariable which denotes an element of Tcl's array")
-    end
-
-    opts = _check_trace_opt(opts)
-
-    ((@trace_elem ||= {})[elem] ||= []).unshift([opts,cmd])
-
-    if @trace_opts == nil
-      TkVar_CB_TBL[@id] = self
-      @trace_opts = opts.dup
-      if USE_OLD_TRACE_OPTION_STYLE
-        Tk.tk_call_without_enc('trace', 'add', 'variable',
-                               @id, @trace_opts, 'rb_var ' << @id)
-      else
-        Tk.tk_call_without_enc('trace', 'variable',
-                               @id, @trace_opts, 'rb_var ' << @id)
-      end
-    else
-      newopts = @trace_opts.dup
-      if USE_OLD_TRACE_OPTION_STYLE
-        opts.each_byte{|c| newopts.concat(c.chr) unless newopts.index(c.chr)}
-        if newopts != @trace_opts
-          Tk.tk_call_without_enc('trace', 'vdelete',
-                                 @id, @trace_opts, 'rb_var ' << @id)
-          @trace_opts.replace(newopts)
-          Tk.tk_call_without_enc('trace', 'variable',
-                                 @id, @trace_opts, 'rb_var ' << @id)
-        end
-      else
-        newopts |= opts
-        unless (newopts - @trace_opts).empty?
-          Tk.tk_call_without_enc('trace', 'remove', 'variable',
-                                 @id, @trace_opts, 'rb_var ' << @id)
-          @trace_opts.replace(newopts)
-          Tk.tk_call_without_enc('trace', 'add', 'variable',
-                                 @id, @trace_opts, 'rb_var ' << @id)
-        end
-      end
-    end
-
-    self
-  end
-
-  def trace_info
-    return [] unless @trace_var
-    @trace_var.dup
-  end
-  alias trace_vinfo trace_info
-
-  def trace_info_for_element(elem)
-    if @elem
-      fail(RuntimeError,
-           "invalid for a TkVariable which denotes an element of Tcl's array")
-    end
-    return [] unless @trace_elem
-    return [] unless @trace_elem[elem]
-    @trace_elem[elem].dup
-  end
-  alias trace_vinfo_for_element trace_info_for_element
-
-  def trace_remove(opts,cmd)
-    return self unless @trace_var.kind_of? Array
-
-    opts = _check_trace_opt(opts)
-
-    idx = -1
-    if USE_OLD_TRACE_OPTION_STYLE
-      newopts = ''
-      @trace_var.each_with_index{|e, i|
-        if idx < 0 && e[1] == cmd
-          diff = false
-          ['a', 'r', 'w', 'u'].each{|c|
-            break if (diff = e[0].index(c) ^ opts.index(c))
-          }
-          unless diff
-            #find
-            idx = i
-            next
-          end
-        end
-        e[0].each_byte{|c| newopts.concat(c.chr) unless newopts.index(c.chr)}
-      }
-    else
-      newopts = []
-      @trace_var.each_with_index{|e, i|
-        if idx < 0 && e[1] == cmd &&
-            e[0].size == opts.size && (e[0] - opts).empty?
-          # find
-          idx = i
-          next
-        end
-        newopts |= e[0]
-      }
-    end
-
-    if idx >= 0
-      @trace_var.delete_at(idx)
-    else
-      return self
-    end
-
-    (@trace_elem ||= {}).each{|elem|
-      @trace_elem[elem].each{|e|
-        if USE_OLD_TRACE_OPTION_STYLE
-          e[0].each_byte{|c| newopts.concat(c.chr) unless newopts.index(c.chr)}
-        else
-          newopts |= e[0]
-        end
-      }
-    }
-
-    if USE_OLD_TRACE_OPTION_STYLE
-      diff = false
-      @trace_opts.each_byte{|c| break if (diff = ! newopts.index(c))}
-      if diff
-        Tk.tk_call_without_enc('trace', 'vdelete',
-                               @id, @trace_opts, 'rb_var ' << @id)
-        @trace_opts.replace(newopts)
-        unless @trace_opts.empty?
-          Tk.tk_call_without_enc('trace', 'variable',
-                                 @id, @trace_opts, 'rb_var ' << @id)
-        end
-      end
-    else
-      unless (@trace_opts - newopts).empty?
-        Tk.tk_call_without_enc('trace', 'remove', 'variable',
-                               @id, @trace_opts, 'rb_var ' << @id)
-        @trace_opts.replace(newopts)
-        unless @trace_opts.empty?
-          Tk.tk_call_without_enc('trace', 'add', 'variable',
-                                 @id, @trace_opts, 'rb_var ' << @id)
-        end
-      end
-    end
-
-    self
-  end
-  alias trace_delete  trace_remove
-  alias trace_vdelete trace_remove
-
-  def trace_remove_for_element(elem,opts,cmd)
-    if @elem
-      fail(RuntimeError,
-           "invalid for a TkVariable which denotes an element of Tcl's array")
-    end
-    return self unless @trace_elem.kind_of? Hash
-    return self unless @trace_elem[elem].kind_of? Array
-
-    opts = _check_trace_opt(opts)
-
-    idx = -1
-    if USE_OLD_TRACE_OPTION_STYLE
-      @trace_elem[elem].each_with_index{|e, i|
-        if idx < 0 && e[1] == cmd
-          diff = false
-          ['a', 'r', 'w', 'u'].each{|c|
-            break if (diff = e[0].index(c) ^ opts.index(c))
-          }
-          unless diff
-            #find
-            idx = i
-            next
-          end
-        end
-      }
-    else
-      @trace_elem[elem].each_with_index{|e, i|
-        if idx < 0 && e[1] == cmd &&
-            e[0].size == opts.size && (e[0] - opts).empty?
-          # find
-          idx = i
-          next
-        end
-      }
-    end
-
-    if idx >= 0
-      @trace_elem[elem].delete_at(idx)
-    else
-      return self
-    end
-
-    if USE_OLD_TRACE_OPTION_STYLE
-      newopts = ''
-      @trace_var.each{|e|
-        e[0].each_byte{|c| newopts.concat(c.chr) unless newopts.index(c.chr)}
-      }
-      @trace_elem.each{|elem|
-        @trace_elem[elem].each{|e|
-          e[0].each_byte{|c| newopts.concat(c.chr) unless newopts.index(c.chr)}
-        }
-      }
-    else
-      newopts = []
-      @trace_var.each{|e|
-        newopts |= e[0]
-      }
-      @trace_elem.each{|elem|
-        @trace_elem[elem].each{|e|
-          e[0].each_byte{|c| newopts.concat(c.chr) unless newopts.index(c.chr)}
-        }
-      }
-    end
-
-    if USE_OLD_TRACE_OPTION_STYLE
-      diff = false
-      @trace_opts.each_byte{|c| break if (diff = ! newopts.index(c))}
-      if diff
-        Tk.tk_call_without_enc('trace', 'vdelete',
-                               @id, @trace_opts, 'rb_var ' << @id)
-        @trace_opts.replace(newopts)
-        unless @trace_opts.empty?
-          Tk.tk_call_without_enc('trace', 'variable',
-                                 @id, @trace_opts, 'rb_var ' << @id)
-        end
-      end
-    else
-      unless (@trace_opts - newopts).empty?
-        Tk.tk_call_without_enc('trace', 'remove', 'variable',
-                               @id, @trace_opts, 'rb_var ' << @id)
-        @trace_opts.replace(newopts)
-        unless @trace_opts.empty?
-          Tk.tk_call_without_enc('trace', 'add', 'variable',
-                                 @id, @trace_opts, 'rb_var ' << @id)
-        end
-      end
-    end
-
-    self
-  end
-  alias trace_delete_for_element  trace_remove_for_element
-  alias trace_vdelete_for_element trace_remove_for_element
-end
-
-class TkVarAccess<TkVariable
-  def self.new(name, *args)
-    if name.kind_of?(TkVariable)
-      name.value = args[0] unless args.empty?
-      return name
-    end
-
-    name = name.to_s
-    v = nil
-    TkVar_ID_TBL.mutex.synchronize{
-      if v = TkVar_ID_TBL[name]
-        v.value = args[0] unless args.empty?
-        return v
-      else
-        (v = self.allocate).instance_eval{
-          @id = name
-          TkVar_ID_TBL[@id] = self
-          @var = @id
-        }
-      end
-    }
-
-    v.instance_eval{ initialize(name, *args) }
-    v
-  end
-
-  def self.new_hash(name, *args)
-    if name.kind_of?(TkVariable)
-      unless name.is_hash?
-        fail ArgumentError, "already exist as a scalar variable"
-      end
-      name.value = args[0] unless args.empty?
-      return name
-    end
-
-    name = name.to_s
-    v = nil
-    TkVar_ID_TBL.mutex.synchronize{
-      if v = TkVar_ID_TBL[name]
-        unless v.is_hash?
-          fail ArgumentError, "already exist as a scalar variable"
-        end
-        v.value = args[0] unless args.empty?
-        return v
-      else
-        (v = self.allocate).instance_eval{
-          @id = name
-          TkVar_ID_TBL[@id] = self
-          @var = @id
-        }
-      end
-    }
-
-    INTERP._invoke_without_enc('global', name)
-    if args.empty? && INTERP._invoke_without_enc('array', 'exist', name) == '0'
-      v.instance_eval{ initialize(name, {}) }  # force creating
-    else
-      v.instance_eval{ initialize(name, *args) }
-    end
-    v
-  end
-
-  def initialize(varname, val=nil)
-    # @id = varname
-    # TkVar_ID_TBL[@id] = self
-
-    # @var  = @id
-    @elem = nil
-
-    @def_default = false
-    @default_val = nil
-
-    @trace_var  = nil
-    @trace_elem = nil
-    @trace_opts = nil
-
-    @type = nil
-    var = self
-    @element_type = Hash.new{|k,v| var.default_value_type }
-
-    # is an element?
-    if @id =~ /^([^(]+)\((.+)\)$/
-      # is an element --> var == $1, elem == $2
-      @var  = $1
-      @elem = $2
-    end
-
-    # teach Tk-ip that @id is global var
-    INTERP._invoke_without_enc('global', @var)
-=begin
-    begin
-      INTERP._invoke_without_enc('global', @id)
-    rescue => e
-      if @id =~ /^(.+)\([^()]+\)$/
-        # is an element --> varname == $1
-        INTERP._invoke_without_enc('global', $1)
-      else
-        fail e
-      end
-    end
-=end
-
-    if val
-      if val.kind_of?(Hash)
-        # assoc-array variable
-        self[''] = 0
-        self.clear
-      end
-      #s = '"' + _get_eval_string(val).gsub(/[\[\]$"]/, '\\\\\&') + '"' #"
-      #s = '"' + _get_eval_string(val).gsub(/[\[\]$"\\]/, '\\\\\&') + '"' #"
-      #INTERP._eval(Kernel.format('global %s; set %s %s', @id, @id, s))
-      #INTERP._set_global_var(@id, _toUTF8(_get_eval_string(val)))
-      self.value = val
-    end
-  end
-end
-
-module Tk
-  begin
-    INTERP._invoke_without_enc('global', 'auto_path')
-    auto_path = INTERP._invoke('set', 'auto_path')
-  rescue => e
-    begin
-      INTERP._invoke_without_enc('global', 'env')
-      auto_path = INTERP._invoke('set', 'env(TCLLIBPATH)')
-    rescue => e
-      auto_path = Tk::LIBRARY
-    end
-  end
-
-  AUTO_PATH = TkVarAccess.new('auto_path', auto_path)
-
-=begin
-  AUTO_OLDPATH = tk_split_simplelist(INTERP._invoke('set', 'auto_oldpath'))
-  AUTO_OLDPATH.each{|s| s.freeze}
-  AUTO_OLDPATH.freeze
-=end
-
-  TCL_PACKAGE_PATH = TkVarAccess.new('tcl_pkgPath')
-  PACKAGE_PATH = TCL_PACKAGE_PATH
-
-  TCL_LIBRARY_PATH = TkVarAccess.new('tcl_libPath')
-  LIBRARY_PATH = TCL_LIBRARY_PATH
-
-  TCL_PRECISION = TkVarAccess.new('tcl_precision')
-end
diff --git a/ext/tk/lib/tk/virtevent.rb b/ext/tk/lib/tk/virtevent.rb
deleted file mode 100644
index de3c33da36..0000000000
--- a/ext/tk/lib/tk/virtevent.rb
+++ /dev/null
@@ -1,140 +0,0 @@
-# frozen_string_literal: false
-#
-#   tk/virtevent.rb : treats virtual events
-#                     1998/07/16 by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
-#
-require 'tk'
-
-class TkVirtualEvent<TkObject
-  extend Tk
-
-  TkCommandNames = ['event'.freeze].freeze
-
-  (TkVirtualEventID = ["VirtEvent".freeze, TkUtil.untrust("00000")]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  TkVirtualEventTBL = TkCore::INTERP.create_table
-
-  TkCore::INTERP.init_ip_env{
-    TkVirtualEventTBL.mutex.synchronize{ TkVirtualEventTBL.clear }
-  }
-
-  class PreDefVirtEvent<self
-    def self.new(event, *sequences)
-      if event =~ /^<(<.*>)>$/
-        event = $1
-      elsif event !~ /^<.*>$/
-        event = '<' + event + '>'
-      end
-      TkVirtualEvent::TkVirtualEventTBL.mutex.synchronize{
-        if TkVirtualEvent::TkVirtualEventTBL.has_key?(event)
-          TkVirtualEvent::TkVirtualEventTBL[event]
-        else
-          # super(event, *sequences)
-          (obj = self.allocate).instance_eval{
-            initialize(event, *sequences)
-            TkVirtualEvent::TkVirtualEventTBL[@id] = self
-          }
-        end
-      }
-    end
-
-    def initialize(event, *sequences)
-      @path = @id = event
-      _add_sequences(sequences)
-    end
-  end
-
-  def TkVirtualEvent.getobj(event)
-    obj = nil
-    TkVirtualEventTBL.mutex.synchronize{
-      obj = TkVirtualEventTBL[event]
-    }
-    if obj
-      obj
-    else
-      if tk_call_without_enc('event', 'info').index("<#{event}>")
-        PreDefVirtEvent.new(event)
-      else
-        fail ArgumentError, "undefined virtual event '<#{event}>'"
-      end
-    end
-  end
-
-  def TkVirtualEvent.info
-    tk_call_without_enc('event', 'info').split(/\s+/).collect!{|seq|
-      TkVirtualEvent.getobj(seq[1..-2])
-    }
-  end
-
-  def initialize(*sequences)
-    TkVirtualEventID.mutex.synchronize{
-      # @path = @id = '<' + TkVirtualEventID.join('') + '>'
-      @path = @id = '<' + TkVirtualEventID.join(TkCore::INTERP._ip_id_) + '>'
-      TkVirtualEventID[1].succ!
-    }
-    _add_sequences(sequences)
-  end
-
-  def _add_sequences(seq_ary)
-    unless seq_ary.empty?
-      tk_call_without_enc('event', 'add', "<#{@id}>",
-                          *(seq_ary.collect{|seq|
-                              "<#{tk_event_sequence(seq)}>"
-                            }) )
-    end
-    self
-  end
-  private :_add_sequences
-
-  def add(*sequences)
-    if sequences != []
-      _add_sequences(sequences)
-      TkVirtualEventTBL.mutex.synchronize{
-        TkVirtualEventTBL[@id] = self
-      }
-    end
-    self
-  end
-
-  def delete(*sequences)
-    if sequences.empty?
-      tk_call_without_enc('event', 'delete', "<#{@id}>")
-      TkVirtualEventTBL.mutex.synchronize{
-        TkVirtualEventTBL.delete(@id)
-      }
-    else
-      tk_call_without_enc('event', 'delete', "<#{@id}>",
-                          *(sequences.collect{|seq|
-                              "<#{tk_event_sequence(seq)}>"
-                            }) )
-      if tk_call_without_enc('event','info',"<#{@id}>").empty?
-        TkVirtualEventTBL.mutex.synchronize{
-          TkVirtualEventTBL.delete(@id)
-        }
-      end
-    end
-    self
-  end
-
-  def info
-    tk_call_without_enc('event','info',"<#{@id}>").split(/\s+/).collect!{|seq|
-      lst = seq.scan(/<*[^<>]+>*/).collect!{|subseq|
-        case (subseq)
-        when /^<<[^<>]+>>$/
-          TkVirtualEvent.getobj(subseq[1..-2])
-        when /^<[^<>]+>$/
-          subseq[1..-2]
-        else
-          subseq.split('')
-        end
-      }.flatten
-      (lst.size == 1) ? lst[0] : lst
-    }
-  end
-end
-
-TkNamedVirtualEvent = TkVirtualEvent::PreDefVirtEvent
diff --git a/ext/tk/lib/tk/winfo.rb b/ext/tk/lib/tk/winfo.rb
deleted file mode 100644
index 36f32e5952..0000000000
--- a/ext/tk/lib/tk/winfo.rb
+++ /dev/null
@@ -1,393 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/winfo.rb : methods for winfo command
-#
-module TkWinfo
-end
-
-require 'tk'
-
-module TkWinfo
-  include Tk
-  extend Tk
-
-  TkCommandNames = ['winfo'.freeze].freeze
-
-  def TkWinfo.atom(name, win=nil)
-    if win
-      number(tk_call_without_enc('winfo', 'atom', '-displayof', win,
-                                 _get_eval_enc_str(name)))
-    else
-      number(tk_call_without_enc('winfo', 'atom', _get_eval_enc_str(name)))
-    end
-  end
-  def winfo_atom(name)
-    TkWinfo.atom(name, self)
-  end
-
-  def TkWinfo.atomname(id, win=nil)
-    if win
-      _fromUTF8(tk_call_without_enc('winfo', 'atomname',
-                                    '-displayof', win, id))
-    else
-      _fromUTF8(tk_call_without_enc('winfo', 'atomname', id))
-    end
-  end
-  def winfo_atomname(id)
-    TkWinfo.atomname(id, self)
-  end
-
-  def TkWinfo.cells(win)
-    number(tk_call_without_enc('winfo', 'cells', win))
-  end
-  def winfo_cells
-    TkWinfo.cells self
-  end
-
-  def TkWinfo.children(win)
-    list(tk_call_without_enc('winfo', 'children', win))
-  end
-  def winfo_children
-    TkWinfo.children self
-  end
-
-  def TkWinfo.classname(win)
-    tk_call_without_enc('winfo', 'class', win)
-  end
-  def winfo_classname
-    TkWinfo.classname self
-  end
-  alias winfo_class winfo_classname
-
-  def TkWinfo.colormapfull(win)
-     bool(tk_call_without_enc('winfo', 'colormapfull', win))
-  end
-  def winfo_colormapfull
-    TkWinfo.colormapfull self
-  end
-
-  def TkWinfo.containing(rootX, rootY, win=nil)
-    if win
-      window(tk_call_without_enc('winfo', 'containing',
-                                 '-displayof', win, rootX, rootY))
-    else
-      window(tk_call_without_enc('winfo', 'containing', rootX, rootY))
-    end
-  end
-  def winfo_containing(x, y)
-    TkWinfo.containing(x, y, self)
-  end
-
-  def TkWinfo.depth(win)
-    number(tk_call_without_enc('winfo', 'depth', win))
-  end
-  def winfo_depth
-    TkWinfo.depth self
-  end
-
-  def TkWinfo.exist?(win)
-    bool(tk_call_without_enc('winfo', 'exists', win))
-  end
-  def winfo_exist?
-    TkWinfo.exist? self
-  end
-
-  def TkWinfo.fpixels(win, dist)
-    number(tk_call_without_enc('winfo', 'fpixels', win, dist))
-  end
-  def winfo_fpixels(dist)
-    TkWinfo.fpixels self, dist
-  end
-
-  def TkWinfo.geometry(win)
-    tk_call_without_enc('winfo', 'geometry', win)
-  end
-  def winfo_geometry
-    TkWinfo.geometry self
-  end
-
-  def TkWinfo.height(win)
-    number(tk_call_without_enc('winfo', 'height', win))
-  end
-  def winfo_height
-    TkWinfo.height self
-  end
-
-  def TkWinfo.id(win)
-    tk_call_without_enc('winfo', 'id', win)
-  end
-  def winfo_id
-    TkWinfo.id self
-  end
-
-  def TkWinfo.interps(win=nil)
-    if win
-      #tk_split_simplelist(tk_call_without_enc('winfo', 'interps',
-      #                                        '-displayof', win))
-      tk_split_simplelist(tk_call_without_enc('winfo', 'interps',
-                                              '-displayof', win),
-                          false, true)
-    else
-      #tk_split_simplelist(tk_call_without_enc('winfo', 'interps'))
-      tk_split_simplelist(tk_call_without_enc('winfo', 'interps'),
-                          false, true)
-    end
-  end
-  def winfo_interps
-    TkWinfo.interps self
-  end
-
-  def TkWinfo.mapped?(win)
-    bool(tk_call_without_enc('winfo', 'ismapped', win))
-  end
-  def winfo_mapped?
-    TkWinfo.mapped? self
-  end
-
-  def TkWinfo.manager(win)
-    tk_call_without_enc('winfo', 'manager', win)
-  end
-  def winfo_manager
-    TkWinfo.manager self
-  end
-
-  def TkWinfo.appname(win)
-    tk_call('winfo', 'name', win)
-  end
-  def winfo_appname
-    TkWinfo.appname self
-  end
-
-  def TkWinfo.parent(win)
-    window(tk_call_without_enc('winfo', 'parent', win))
-  end
-  def winfo_parent
-    TkWinfo.parent self
-  end
-
-  def TkWinfo.widget(id, win=nil)
-    if win
-      window(tk_call_without_enc('winfo', 'pathname', '-displayof', win, id))
-    else
-      window(tk_call_without_enc('winfo', 'pathname', id))
-    end
-  end
-  def winfo_widget(id)
-    TkWinfo.widget id, self
-  end
-
-  def TkWinfo.pixels(win, dist)
-    number(tk_call_without_enc('winfo', 'pixels', win, dist))
-  end
-  def winfo_pixels(dist)
-    TkWinfo.pixels self, dist
-  end
-
-  def TkWinfo.reqheight(win)
-    number(tk_call_without_enc('winfo', 'reqheight', win))
-  end
-  def winfo_reqheight
-    TkWinfo.reqheight self
-  end
-
-  def TkWinfo.reqwidth(win)
-    number(tk_call_without_enc('winfo', 'reqwidth', win))
-  end
-  def winfo_reqwidth
-    TkWinfo.reqwidth self
-  end
-
-  def TkWinfo.rgb(win, color)
-    list(tk_call_without_enc('winfo', 'rgb', win, color))
-  end
-  def winfo_rgb(color)
-    TkWinfo.rgb self, color
-  end
-
-  def TkWinfo.rootx(win)
-    number(tk_call_without_enc('winfo', 'rootx', win))
-  end
-  def winfo_rootx
-    TkWinfo.rootx self
-  end
-
-  def TkWinfo.rooty(win)
-    number(tk_call_without_enc('winfo', 'rooty', win))
-  end
-  def winfo_rooty
-    TkWinfo.rooty self
-  end
-
-  def TkWinfo.screen(win)
-    tk_call('winfo', 'screen', win)
-  end
-  def winfo_screen
-    TkWinfo.screen self
-  end
-
-  def TkWinfo.screencells(win)
-    number(tk_call_without_enc('winfo', 'screencells', win))
-  end
-  def winfo_screencells
-    TkWinfo.screencells self
-  end
-
-  def TkWinfo.screendepth(win)
-    number(tk_call_without_enc('winfo', 'screendepth', win))
-  end
-  def winfo_screendepth
-    TkWinfo.screendepth self
-  end
-
-  def TkWinfo.screenheight (win)
-    number(tk_call_without_enc('winfo', 'screenheight', win))
-  end
-  def winfo_screenheight
-    TkWinfo.screenheight self
-  end
-
-  def TkWinfo.screenmmheight(win)
-    number(tk_call_without_enc('winfo', 'screenmmheight', win))
-  end
-  def winfo_screenmmheight
-    TkWinfo.screenmmheight self
-  end
-
-  def TkWinfo.screenmmwidth(win)
-    number(tk_call_without_enc('winfo', 'screenmmwidth', win))
-  end
-  def winfo_screenmmwidth
-    TkWinfo.screenmmwidth self
-  end
-
-  def TkWinfo.screenvisual(win)
-    tk_call_without_enc('winfo', 'screenvisual', win)
-  end
-  def winfo_screenvisual
-    TkWinfo.screenvisual self
-  end
-
-  def TkWinfo.screenwidth(win)
-    number(tk_call_without_enc('winfo', 'screenwidth', win))
-  end
-  def winfo_screenwidth
-    TkWinfo.screenwidth self
-  end
-
-  def TkWinfo.server(win)
-    tk_call('winfo', 'server', win)
-  end
-  def winfo_server
-    TkWinfo.server self
-  end
-
-  def TkWinfo.toplevel(win)
-    window(tk_call_without_enc('winfo', 'toplevel', win))
-  end
-  def winfo_toplevel
-    TkWinfo.toplevel self
-  end
-
-  def TkWinfo.visual(win)
-    tk_call_without_enc('winfo', 'visual', win)
-  end
-  def winfo_visual
-    TkWinfo.visual self
-  end
-
-  def TkWinfo.visualid(win)
-    tk_call_without_enc('winfo', 'visualid', win)
-  end
-  def winfo_visualid
-    TkWinfo.visualid self
-  end
-
-  def TkWinfo.visualsavailable(win, includeids=false)
-    if includeids
-      list(tk_call_without_enc('winfo', 'visualsavailable',
-                               win, "includeids"))
-    else
-      list(tk_call_without_enc('winfo', 'visualsavailable', win))
-    end
-  end
-  def winfo_visualsavailable(includeids=false)
-    TkWinfo.visualsavailable self, includeids
-  end
-
-  def TkWinfo.vrootheight(win)
-    number(tk_call_without_enc('winfo', 'vrootheight', win))
-  end
-  def winfo_vrootheight
-    TkWinfo.vrootheight self
-  end
-
-  def TkWinfo.vrootwidth(win)
-    number(tk_call_without_enc('winfo', 'vrootwidth', win))
-  end
-  def winfo_vrootwidth
-    TkWinfo.vrootwidth self
-  end
-
-  def TkWinfo.vrootx(win)
-    number(tk_call_without_enc('winfo', 'vrootx', win))
-  end
-  def winfo_vrootx
-    TkWinfo.vrootx self
-  end
-
-  def TkWinfo.vrooty(win)
-    number(tk_call_without_enc('winfo', 'vrooty', win))
-  end
-  def winfo_vrooty
-    TkWinfo.vrooty self
-  end
-
-  def TkWinfo.width(win)
-    number(tk_call_without_enc('winfo', 'width', win))
-  end
-  def winfo_width
-    TkWinfo.width self
-  end
-
-  def TkWinfo.x(win)
-    number(tk_call_without_enc('winfo', 'x', win))
-  end
-  def winfo_x
-    TkWinfo.x self
-  end
-
-  def TkWinfo.y(win)
-    number(tk_call_without_enc('winfo', 'y', win))
-  end
-  def winfo_y
-    TkWinfo.y self
-  end
-
-  def TkWinfo.viewable(win)
-    bool(tk_call_without_enc('winfo', 'viewable', win))
-  end
-  def winfo_viewable
-    TkWinfo.viewable self
-  end
-
-  def TkWinfo.pointerx(win)
-    number(tk_call_without_enc('winfo', 'pointerx', win))
-  end
-  def winfo_pointerx
-    TkWinfo.pointerx self
-  end
-
-  def TkWinfo.pointery(win)
-    number(tk_call_without_enc('winfo', 'pointery', win))
-  end
-  def winfo_pointery
-    TkWinfo.pointery self
-  end
-
-  def TkWinfo.pointerxy(win)
-    list(tk_call_without_enc('winfo', 'pointerxy', win))
-  end
-  def winfo_pointerxy
-    TkWinfo.pointerxy self
-  end
-end
diff --git a/ext/tk/lib/tk/winpkg.rb b/ext/tk/lib/tk/winpkg.rb
deleted file mode 100644
index 2a8f724bef..0000000000
--- a/ext/tk/lib/tk/winpkg.rb
+++ /dev/null
@@ -1,157 +0,0 @@
-# frozen_string_literal: false
-#
-#   tk/winpkg.rb : methods for Tcl/Tk packages for Microsoft Windows
-#                     2000/11/22 by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
-#
-#     ATTENTION !!
-#         This is NOT TESTED. Because I have no test-environment.
-#
-require 'tk'
-
-module Tk::WinDDE
-end
-#TkWinDDE = Tk::WinDDE
-#Tk.__set_toplevel_aliases__(:Tk, Tk::WinDDE, :TkWinDDE)
-Tk.__set_loaded_toplevel_aliases__('tk/winpkg.rb', :Tk, Tk::WinDDE, :TkWinDDE)
-
-module Tk::WinDDE
-  extend Tk
-  extend Tk::WinDDE
-
-  TkCommandNames = ['dde'.freeze].freeze
-
-  PACKAGE_NAME = 'dde'.freeze
-  def self.package_name
-    PACKAGE_NAME
-  end
-
-  if self.const_defined? :FORCE_VERSION
-    tk_call_without_enc('package', 'require', 'dde', FORCE_VERSION)
-  else
-    tk_call_without_enc('package', 'require', 'dde')
-  end
-
-  #def servername(topic=None)
-  #  tk_call('dde', 'servername', topic)
-  #end
-  def servername(*args)
-    if args.size == 0
-      tk_call('dde', 'servername')
-    else
-      if args[-1].kind_of?(Hash)  # dde 1.2 +
-        keys = _symbolkey2str(args.pop)
-        force = (keys.delete('force'))? '-force': None
-        exact = (keys.delete('exact'))? '-exact': None
-        if keys.size == 0
-          tk_call('dde', 'servername', force, exact)
-        elsif args.size == 0
-          tk_call('dde', 'servername', force, exact, *hash_kv(keys))
-        else
-          tk_call('dde', 'servername', force, exact,
-                  *((hash_kv(keys) << '--') + args))
-        end
-      else
-        tk_call('dde', 'servername', *args)
-      end
-    end
-  end
-
-  def execute(service, topic, data)
-    tk_call('dde', 'execute', service, topic, data)
-  end
-
-  def async_execute(service, topic, data)
-    tk_call('dde', '-async', 'execute', service, topic, data)
-  end
-
-  def poke(service, topic, item, data)
-    tk_call('dde', 'poke', service, topic, item, data)
-  end
-
-  def request(service, topic, item)
-    tk_call('dde', 'request', service, topic, item)
-  end
-
-  def binary_request(service, topic, item)
-    tk_call('dde', 'request', '-binary', service, topic, item)
-  end
-
-  def services(service, topic)
-    tk_call('dde', 'services', service, topic)
-  end
-
-  def eval(topic, cmd, *args)
-    tk_call('dde', 'eval', topic, cmd, *args)
-  end
-
-  def async_eval(topic, cmd, *args)
-    tk_call('dde', 'eval', -async, topic, cmd, *args)
-  end
-
-  module_function :servername, :execute, :async_execute,
-                  :poke, :request, :services, :eval
-end
-
-module Tk::WinRegistry
-end
-#TkWinRegistry = Tk::WinRegistry
-#Tk.__set_toplevel_aliases__(:Tk, Tk::WinRegistry, :TkWinRegistry)
-Tk.__set_loaded_toplevel_aliases__('tk/winpkg.rb', :Tk, Tk::WinRegistry,
-                                   :TkWinRegistry)
-
-module Tk::WinRegistry
-  extend Tk
-  extend Tk::WinRegistry
-
-  TkCommandNames = ['registry'.freeze].freeze
-
-  if self.const_defined? :FORCE_VERSION
-    tk_call('package', 'require', 'registry', FORCE_VERSION)
-  else
-    tk_call('package', 'require', 'registry')
-  end
-
-  def broadcast(keynam, timeout=nil)
-    if timeout
-      tk_call('registry', 'broadcast', keynam, '-timeout', timeout)
-    else
-      tk_call('registry', 'broadcast', keynam)
-    end
-  end
-
-  def delete(keynam, valnam=None)
-    tk_call('registry', 'delete', keynam, valnam)
-  end
-
-  def get(keynam, valnam)
-    tk_call('registry', 'get', keynam, valnam)
-  end
-
-  def keys(keynam, pattern=nil)
-    lst = tk_split_simplelist(tk_call('registry', 'keys', keynam))
-    if pattern
-      lst.find_all{|key| key =~ pattern}
-    else
-      lst
-    end
-  end
-
-  def set(keynam, valnam=None, data=None, dattype=None)
-    tk_call('registry', 'set', keynam, valnam, data, dattype)
-  end
-
-  def type(keynam, valnam)
-    tk_call('registry', 'type', keynam, valnam)
-  end
-
-  def values(keynam, pattern=nil)
-    lst = tk_split_simplelist(tk_call('registry', 'values', keynam))
-    if pattern
-      lst.find_all{|val| val =~ pattern}
-    else
-      lst
-    end
-  end
-
-  module_function :delete, :get, :keys, :set, :type, :values
-end
diff --git a/ext/tk/lib/tk/wm.rb b/ext/tk/lib/tk/wm.rb
deleted file mode 100644
index 5aa67e37b6..0000000000
--- a/ext/tk/lib/tk/wm.rb
+++ /dev/null
@@ -1,553 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/wm.rb : methods for wm command
-#
-require 'tk'
-
-module Tk
-  module Wm
-    #include TkComm
-    extend TkCore
-
-    TkCommandNames = ['wm'.freeze].freeze
-
-    TOPLEVEL_METHODCALL_OPTKEYS = {}
-
-    def Wm.aspect(win, *args)
-      if args.length == 0
-        list(tk_call_without_enc('wm', 'aspect', win.epath))
-      else
-        args = args[0] if args.length == 1 && args[0].kind_of?(Array)
-        tk_call('wm', 'aspect', win.epath, *args)
-        win
-      end
-    end
-    def aspect(*args)
-      Wm.aspect(self, *args)
-    end
-    alias wm_aspect aspect
-    TOPLEVEL_METHODCALL_OPTKEYS['aspect'] = 'aspect'
-
-    def Wm.attributes(win, slot=nil,value=TkComm::None)
-      if slot == nil
-        lst = tk_split_list(tk_call('wm', 'attributes', win.epath))
-        info = {}
-        while key = lst.shift
-          info[key[1..-1]] = lst.shift
-        end
-        info
-      elsif slot.kind_of? Hash
-        tk_call('wm', 'attributes', win.epath, *hash_kv(slot))
-        win
-      elsif value == TkComm::None
-        tk_call('wm', 'attributes', win.epath, "-#{slot}")
-      else
-        tk_call('wm', 'attributes', win.epath, "-#{slot}", value)
-        win
-      end
-    end
-    def attributes(slot=nil,value=TkComm::None)
-      Wm.attributes(self, slot, value)
-    end
-    alias wm_attributes attributes
-    TOPLEVEL_METHODCALL_OPTKEYS['attributes'] = 'attributes'
-
-    def Wm.client(win, name=TkComm::None)
-      if name == TkComm::None
-        tk_call('wm', 'client', win.epath)
-      else
-        name = '' if name == nil
-        tk_call('wm', 'client', win.epath, name)
-        win
-      end
-    end
-    def client(name=TkComm::None)
-      Wm.client(self, name)
-    end
-    alias wm_client client
-    TOPLEVEL_METHODCALL_OPTKEYS['client'] = 'client'
-
-    def Wm.colormapwindows(win, *args)
-      if args.size == 0
-        list(tk_call_without_enc('wm', 'colormapwindows', win.epath))
-      else
-        args = args[0] if args.length == 1 && args[0].kind_of?(Array)
-        tk_call_without_enc('wm', 'colormapwindows', win.epath, *args)
-        win
-      end
-    end
-    def colormapwindows(*args)
-      Wm.colormapwindows(self, *args)
-    end
-    alias wm_colormapwindows colormapwindows
-    TOPLEVEL_METHODCALL_OPTKEYS['colormapwindows'] = 'colormapwindows'
-
-    def Wm.command(win, value=nil)
-      if value
-        tk_call('wm', 'command', win.epath, value)
-        win
-      else
-        #procedure(tk_call('wm', 'command', win.epath))
-        tk_call('wm', 'command', win.epath)
-      end
-    end
-    def wm_command(value=nil)
-      Wm.command(self, value)
-    end
-    TOPLEVEL_METHODCALL_OPTKEYS['wm_command'] = 'wm_command'
-
-    def Wm.deiconify(win, ex = true)
-      if ex
-        tk_call_without_enc('wm', 'deiconify', win.epath)
-      else
-        Wm.iconify(win)
-      end
-      win
-    end
-    def deiconify(ex = true)
-      Wm.deiconify(self, ex)
-    end
-    alias wm_deiconify deiconify
-
-    def Wm.focusmodel(win, mode = nil)
-      if mode
-        tk_call_without_enc('wm', 'focusmodel', win.epath, mode)
-        win
-      else
-        tk_call_without_enc('wm', 'focusmodel', win.epath)
-      end
-    end
-    def focusmodel(mode = nil)
-      Wm.focusmodel(self, mode)
-    end
-    alias wm_focusmodel focusmodel
-    TOPLEVEL_METHODCALL_OPTKEYS['focusmodel'] = 'focusmodel'
-
-    def Wm.forget(win)
-      # Tcl/Tk 8.5+
-      # work with dockable frames
-      tk_call_without_enc('wm', 'forget', win.epath)
-      win
-    end
-    def wm_forget
-      Wm.forget(self)
-    end
-
-    def Wm.frame(win)
-      tk_call_without_enc('wm', 'frame', win.epath)
-    end
-    def frame
-      Wm.frame(self)
-    end
-    alias wm_frame frame
-
-    def Wm.geometry(win, geom=nil)
-      if geom
-        tk_call_without_enc('wm', 'geometry', win.epath, geom)
-        win
-      else
-        tk_call_without_enc('wm', 'geometry', win.epath)
-      end
-    end
-    def geometry(geom=nil)
-      Wm.geometry(self, geom)
-    end
-    alias wm_geometry geometry
-    TOPLEVEL_METHODCALL_OPTKEYS['geometry'] = 'geometry'
-
-    def Wm.grid(win, *args)
-      if args.size == 0
-        list(tk_call_without_enc('wm', 'grid', win.epath))
-      else
-        args = args[0] if args.length == 1 && args[0].kind_of?(Array)
-        tk_call_without_enc('wm', 'grid', win.epath, *args)
-        win
-      end
-    end
-    def wm_grid(*args)
-      Wm.grid(self, *args)
-    end
-    TOPLEVEL_METHODCALL_OPTKEYS['wm_grid'] = 'wm_grid'
-
-    def Wm.group(win, leader = nil)
-      if leader
-        tk_call('wm', 'group', win.epath, leader)
-        win
-      else
-        window(tk_call('wm', 'group', win.epath))
-      end
-    end
-    def group(leader = nil)
-      Wm.group(self, leader)
-    end
-    alias wm_group group
-    TOPLEVEL_METHODCALL_OPTKEYS['group'] = 'group'
-
-    def Wm.iconbitmap(win, bmp=nil)
-      if bmp
-        tk_call_without_enc('wm', 'iconbitmap', win.epath, bmp)
-        win
-      else
-        image_obj(tk_call_without_enc('wm', 'iconbitmap', win.epath))
-      end
-    end
-    def iconbitmap(bmp=nil)
-      Wm.iconbitmap(self, bmp)
-    end
-    alias wm_iconbitmap iconbitmap
-    TOPLEVEL_METHODCALL_OPTKEYS['iconbitmap'] = 'iconbitmap'
-
-    def Wm.iconphoto(win, *imgs)
-      if imgs.empty?
-        win.instance_eval{
-          @wm_iconphoto = nil unless defined? @wm_iconphoto
-          return @wm_iconphoto
-        }
-      end
-
-      imgs = imgs[0] if imgs.length == 1 && imgs[0].kind_of?(Array)
-      tk_call_without_enc('wm', 'iconphoto', win.epath, *imgs)
-      win.instance_eval{ @wm_iconphoto = imgs  }
-      win
-    end
-    def iconphoto(*imgs)
-      Wm.iconphoto(self, *imgs)
-    end
-    alias wm_iconphoto iconphoto
-    TOPLEVEL_METHODCALL_OPTKEYS['iconphoto'] = 'iconphoto'
-
-    def Wm.iconphoto_default(win, *imgs)
-      imgs = imgs[0] if imgs.length == 1 && imgs[0].kind_of?(Array)
-      tk_call_without_enc('wm', 'iconphoto', win.epath, '-default', *imgs)
-      win
-    end
-    def iconphoto_default(*imgs)
-      Wm.iconphoto_default(self, *imgs)
-    end
-    alias wm_iconphoto_default iconphoto_default
-
-    def Wm.iconify(win, ex = true)
-      if ex
-        tk_call_without_enc('wm', 'iconify', win.epath)
-      else
-        Wm.deiconify(win)
-      end
-      win
-    end
-    def iconify(ex = true)
-      Wm.iconify(self, ex)
-    end
-    alias wm_iconify iconify
-
-    def Wm.iconmask(win, bmp=nil)
-      if bmp
-        tk_call_without_enc('wm', 'iconmask', win.epath, bmp)
-        win
-      else
-        image_obj(tk_call_without_enc('wm', 'iconmask', win.epath))
-      end
-    end
-    def iconmask(bmp=nil)
-      Wm.iconmask(self, bmp)
-    end
-    alias wm_iconmask iconmask
-    TOPLEVEL_METHODCALL_OPTKEYS['iconmask'] = 'iconmask'
-
-    def Wm.iconname(win, name=nil)
-      if name
-        tk_call('wm', 'iconname', win.epath, name)
-        win
-      else
-        tk_call('wm', 'iconname', win.epath)
-      end
-    end
-    def iconname(name=nil)
-      Wm.iconname(self, name)
-    end
-    alias wm_iconname iconname
-    TOPLEVEL_METHODCALL_OPTKEYS['iconname'] = 'iconname'
-
-    def Wm.iconposition(win, *args)
-      if args.size == 0
-        list(tk_call_without_enc('wm', 'iconposition', win.epath))
-      else
-        args = args[0] if args.length == 1 && args[0].kind_of?(Array)
-        tk_call_without_enc('wm', 'iconposition', win.epath, *args)
-        win
-      end
-    end
-    def iconposition(*args)
-      Wm.iconposition(self, *args)
-    end
-    alias wm_iconposition iconposition
-    TOPLEVEL_METHODCALL_OPTKEYS['iconposition'] = 'iconposition'
-
-    def Wm.iconwindow(win, iconwin = nil)
-      if iconwin
-        tk_call_without_enc('wm', 'iconwindow', win.epath, iconwin)
-        win
-      else
-        w = tk_call_without_enc('wm', 'iconwindow', win.epath)
-        (w == '')? nil: window(w)
-      end
-    end
-    def iconwindow(iconwin = nil)
-      Wm.iconwindow(self, iconwin)
-    end
-    alias wm_iconwindow iconwindow
-    TOPLEVEL_METHODCALL_OPTKEYS['iconwindow'] = 'iconwindow'
-
-    def Wm.manage(win)
-      # Tcl/Tk 8.5+ feature
-      tk_call_without_enc('wm', 'manage', win.epath)
-      win
-    end
-    def wm_manage
-      Wm.manage(self)
-    end
-=begin
-    def Wm.manage(win, use_id = nil)
-      # Tcl/Tk 8.5+ feature
-      # --------------------------------------------------------------
-      # In the future release, I want to support to embed the 'win'
-      # into the container which has window-id 'use-id'.
-      # It may give users flexibility on controlling their GUI.
-      # However, it may be difficult for current Tcl/Tk (Tcl/Tk8.5.1),
-      # because it seems to require to modify Tcl/Tk's source code.
-      # --------------------------------------------------------------
-      if use_id
-        tk_call_without_enc('wm', 'manage', win.epath, '-use', use_id)
-      else
-        tk_call_without_enc('wm', 'manage', win.epath)
-      end
-      win
-    end
-=end
-
-    def Wm.maxsize(win, *args)
-      if args.size == 0
-        list(tk_call_without_enc('wm', 'maxsize', win.epath))
-      else
-        args = args[0] if args.length == 1 && args[0].kind_of?(Array)
-        tk_call_without_enc('wm', 'maxsize', win.epath, *args)
-        win
-      end
-    end
-    def maxsize(*args)
-      Wm.maxsize(self, *args)
-    end
-    alias wm_maxsize maxsize
-    TOPLEVEL_METHODCALL_OPTKEYS['maxsize'] = 'maxsize'
-
-    def Wm.minsize(win, *args)
-      if args.size == 0
-        list(tk_call_without_enc('wm', 'minsize', win.epath))
-      else
-        args = args[0] if args.length == 1 && args[0].kind_of?(Array)
-        tk_call_without_enc('wm', 'minsize', win.path, *args)
-        win
-      end
-    end
-    def minsize(*args)
-      Wm.minsize(self, *args)
-    end
-    alias wm_minsize minsize
-    TOPLEVEL_METHODCALL_OPTKEYS['minsize'] = 'minsize'
-
-    def Wm.overrideredirect(win, mode=TkComm::None)
-      if mode == TkComm::None
-        bool(tk_call_without_enc('wm', 'overrideredirect', win.epath))
-      else
-        tk_call_without_enc('wm', 'overrideredirect', win.epath, mode)
-        win
-      end
-    end
-    def overrideredirect(mode=TkComm::None)
-      Wm.overrideredirect(self, mode)
-    end
-    alias wm_overrideredirect overrideredirect
-    TOPLEVEL_METHODCALL_OPTKEYS['overrideredirect'] = 'overrideredirect'
-
-    def Wm.positionfrom(win, who=TkComm::None)
-      if who == TkComm::None
-        r = tk_call_without_enc('wm', 'positionfrom', win.epath)
-        (r == "")? nil: r
-      else
-        tk_call_without_enc('wm', 'positionfrom', win.epath, who)
-        win
-      end
-    end
-    def positionfrom(who=TkComm::None)
-      Wm.positionfrom(self, who)
-    end
-    alias wm_positionfrom positionfrom
-    TOPLEVEL_METHODCALL_OPTKEYS['positionfrom'] = 'positionfrom'
-
-    def Wm.protocol(win, name=nil, cmd=nil, &b)
-      if cmd
-        tk_call_without_enc('wm', 'protocol', win.epath, name, cmd)
-        win
-      elsif b
-        tk_call_without_enc('wm', 'protocol', win.epath, name, proc(&b))
-        win
-      elsif name
-        result = tk_call_without_enc('wm', 'protocol', win.epath, name)
-        (result == "")? nil : tk_tcl2ruby(result)
-      else
-        tk_split_simplelist(tk_call_without_enc('wm', 'protocol', win.epath))
-      end
-    end
-    def protocol(name=nil, cmd=nil, &b)
-      Wm.protocol(self, name, cmd, &b)
-    end
-    alias wm_protocol protocol
-
-    def Wm.protocols(win, kv=nil)
-      unless kv
-        ret = {}
-        Wm.protocol(win).each{|name|
-          ret[name] = Wm.protocol(win, name)
-        }
-        return ret
-      end
-
-      unless kv.kind_of?(Hash)
-        fail ArgumentError, 'expect a hash of protocol=>command'
-      end
-      kv.each{|k, v| Wm.protocol(win, k, v)}
-      win
-    end
-    def protocols(kv=nil)
-      Wm.protocols(self, kv)
-    end
-    alias wm_protocols protocols
-    TOPLEVEL_METHODCALL_OPTKEYS['protocols'] = 'protocols'
-
-    def Wm.resizable(win, *args)
-      if args.length == 0
-        list(tk_call_without_enc('wm', 'resizable', win.epath)).map!{|e| bool(e)}
-      else
-        args = args[0] if args.length == 1 && args[0].kind_of?(Array)
-        tk_call_without_enc('wm', 'resizable', win.epath, *args)
-        win
-      end
-    end
-    def resizable(*args)
-      Wm.resizable(self, *args)
-    end
-    alias wm_resizable resizable
-    TOPLEVEL_METHODCALL_OPTKEYS['resizable'] = 'resizable'
-
-    def Wm.sizefrom(win, who=TkComm::None)
-      if who == TkComm::None
-        r = tk_call_without_enc('wm', 'sizefrom', win.epath)
-        (r == "")? nil: r
-      else
-        tk_call_without_enc('wm', 'sizefrom', win.epath, who)
-        win
-      end
-    end
-    def sizefrom(who=TkComm::None)
-      Wm.sizefrom(self, who)
-    end
-    alias wm_sizefrom sizefrom
-    TOPLEVEL_METHODCALL_OPTKEYS['sizefrom'] = 'sizefrom'
-
-    def Wm.stackorder(win)
-      list(tk_call('wm', 'stackorder', win.epath))
-    end
-    def stackorder
-      Wm.stackorder(self)
-    end
-    alias wm_stackorder stackorder
-
-    def Wm.stackorder_isabove(win, target)
-      bool(tk_call('wm', 'stackorder', win.epath, 'isabove', target))
-    end
-    def Wm.stackorder_is_above(win, target)
-      Wm.stackorder_isabove(win, target)
-    end
-    def stackorder_isabove(target)
-      Wm.stackorder_isabove(self, target)
-    end
-    alias stackorder_is_above stackorder_isabove
-    alias wm_stackorder_isabove stackorder_isabove
-    alias wm_stackorder_is_above stackorder_isabove
-
-    def Wm.stackorder_isbelow(win, target)
-      bool(tk_call('wm', 'stackorder', win.epath, 'isbelow', target))
-    end
-    def Wm.stackorder_is_below(win, target)
-      Wm.stackorder_isbelow(win, target)
-    end
-    def stackorder_isbelow(target)
-      Wm.stackorder_isbelow(self, target)
-    end
-    alias stackorder_is_below stackorder_isbelow
-    alias wm_stackorder_isbelow stackorder_isbelow
-    alias wm_stackorder_is_below stackorder_isbelow
-
-    def Wm.state(win, st=nil)
-      if st
-        tk_call_without_enc('wm', 'state', win.epath, st)
-        win
-      else
-        tk_call_without_enc('wm', 'state', win.epath)
-      end
-    end
-    def state(st=nil)
-      Wm.state(self, st)
-    end
-    alias wm_state state
-    TOPLEVEL_METHODCALL_OPTKEYS['state'] = 'state'
-
-    def Wm.title(win, str=nil)
-      if str
-        tk_call('wm', 'title', win.epath, str)
-        win
-      else
-        tk_call('wm', 'title', win.epath)
-      end
-    end
-    def title(str=nil)
-      Wm.title(self, str)
-    end
-    alias wm_title title
-    TOPLEVEL_METHODCALL_OPTKEYS['title'] = 'title'
-
-    def Wm.transient(win, master=nil)
-      if master
-        tk_call_without_enc('wm', 'transient', win.epath, master)
-        win
-      else
-        window(tk_call_without_enc('wm', 'transient', win.epath))
-      end
-    end
-    def transient(master=nil)
-      Wm.transient(self, master)
-    end
-    alias wm_transient transient
-    TOPLEVEL_METHODCALL_OPTKEYS['transient'] = 'transient'
-
-    def Wm.withdraw(win, ex = true)
-      if ex
-        tk_call_without_enc('wm', 'withdraw', win.epath)
-      else
-        Wm.deiconify(win)
-      end
-      win
-    end
-    def withdraw(ex = true)
-      Wm.withdraw(self, ex)
-    end
-    alias wm_withdraw withdraw
-  end
-
-  module Wm_for_General
-    Wm.instance_methods.each{|m|
-      if (m = m.to_s) =~ /^wm_(.*)$/
-        eval "def #{m}(*args, &b); Tk::Wm.#{$1}(self, *args, &b); end"
-      end
-    }
-  end
-end
diff --git a/ext/tk/lib/tk/xim.rb b/ext/tk/lib/tk/xim.rb
deleted file mode 100644
index 08c7d0c0b7..0000000000
--- a/ext/tk/lib/tk/xim.rb
+++ /dev/null
@@ -1,123 +0,0 @@
-# frozen_string_literal: false
-#
-# tk/xim.rb : control input_method
-#
-require 'tk'
-
-module TkXIM
-  include Tk
-  extend Tk
-
-  TkCommandNames = ['imconfigure'.freeze].freeze
-
-  def TkXIM.useinputmethods(value = None, win = nil)
-    if value == None
-      if win
-        bool(tk_call_without_enc('tk', 'useinputmethods',
-                                 '-displayof', win))
-      else
-        bool(tk_call_without_enc('tk', 'useinputmethods'))
-      end
-    else
-      if win
-        bool(tk_call_without_enc('tk', 'useinputmethods',
-                                 '-displayof', win, value))
-      else
-        bool(tk_call_without_enc('tk', 'useinputmethods', value))
-      end
-    end
-  end
-
-  def TkXIM.useinputmethods_displayof(win, value = None)
-    TkXIM.useinputmethods(value, win)
-  end
-
-  def TkXIM.caret(win, keys=nil)
-    if keys
-      tk_call_without_enc('tk', 'caret', win, *hash_kv(keys))
-      self
-    else
-      lst = tk_split_list(tk_call_without_enc('tk', 'caret', win))
-      info = {}
-      while key = lst.shift
-        info[key[1..-1]] = lst.shift
-      end
-      info
-    end
-  end
-
-  def TkXIM.configure(win, slot, value=None)
-    begin
-      if /^8\.*/ === Tk::TK_VERSION  && JAPANIZED_TK
-        if slot.kind_of? Hash
-          tk_call('imconfigure', win, *hash_kv(slot))
-        else
-          tk_call('imconfigure', win, "-#{slot}", value)
-        end
-      end
-    rescue
-    end
-  end
-
-  def TkXIM.configinfo(win, slot=nil)
-    if TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
-      begin
-        if /^8\.*/ === Tk::TK_VERSION  && JAPANIZED_TK
-          if slot
-            conf = tk_split_list(tk_call('imconfigure', win, "-#{slot}"))
-            conf[0] = conf[0][1..-1]
-            conf
-          else
-            tk_split_list(tk_call('imconfigure', win)).collect{|conf|
-              conf[0] = conf[0][1..-1]
-              conf
-            }
-          end
-        else
-          []
-        end
-      rescue
-        []
-      end
-    else # ! TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
-      TkXIM.current_configinfo(win, slot)
-    end
-  end
-
-  def TkXIM.current_configinfo(win, slot=nil)
-    begin
-      if /^8\.*/ === Tk::TK_VERSION  && JAPANIZED_TK
-        if slot
-          conf = tk_split_list(tk_call('imconfigure', win, "-#{slot}"))
-          { conf[0][1..-1] => conf[1] }
-        else
-          ret = {}
-          tk_split_list(tk_call('imconfigure', win)).each{|conf|
-            ret[conf[0][1..-1]] = conf[1]
-          }
-          ret
-        end
-      else
-        {}
-      end
-    rescue
-      {}
-    end
-  end
-
-  def useinputmethods(value=None)
-    TkXIM.useinputmethods(value, self)
-  end
-
-  def caret(keys=nil)
-    TkXIM.caret(self, keys=nil)
-  end
-
-  def imconfigure(slot, value=None)
-    TkXIM.configure(self, slot, value)
-  end
-
-  def imconfiginfo(slot=nil)
-    TkXIM.configinfo(self, slot)
-  end
-end
diff --git a/ext/tk/lib/tkafter.rb b/ext/tk/lib/tkafter.rb
deleted file mode 100644
index 0ce5049d4a..0000000000
--- a/ext/tk/lib/tkafter.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# frozen_string_literal: false
-#
-#   tkafter.rb - load tk/after.rb
-#
-require 'tk/timer'
diff --git a/ext/tk/lib/tkbgerror.rb b/ext/tk/lib/tkbgerror.rb
deleted file mode 100644
index 875f3fef2f..0000000000
--- a/ext/tk/lib/tkbgerror.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# frozen_string_literal: false
-#
-#   tkbgerror.rb - load tk/bgerror.rb
-#
-require 'tk/bgerror'
diff --git a/ext/tk/lib/tkcanvas.rb b/ext/tk/lib/tkcanvas.rb
deleted file mode 100644
index d4d0afac9e..0000000000
--- a/ext/tk/lib/tkcanvas.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# frozen_string_literal: false
-#
-#   tkcanvas.rb - load tk/canvas.rb
-#
-require 'tk/canvas'
diff --git a/ext/tk/lib/tkclass.rb b/ext/tk/lib/tkclass.rb
deleted file mode 100644
index 947cbf3a4a..0000000000
--- a/ext/tk/lib/tkclass.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-# frozen_string_literal: false
-#
-#               tkclass.rb - Tk classes
-#                       Date: 2000/11/27 09:23:36
-#                       by Yukihiro Matsumoto <matz@caelum.co.jp>
-#
-#                       $Id$
-
-require "tk"
-
-TopLevel = TkToplevel
-Frame = TkFrame
-Label = TkLabel
-Button = TkButton
-Radiobutton = TkRadioButton
-Checkbutton = TkCheckButton
-Message = TkMessage
-Entry = TkEntry
-Spinbox = TkSpinbox
-Text = TkText
-Scale = TkScale
-Scrollbar = TkScrollbar
-Listbox = TkListbox
-Menu = TkMenu
-Menubutton = TkMenubutton
-Canvas = TkCanvas
-Arc = TkcArc
-Bitmap = TkcBitmap
-Line = TkcLine
-Oval = TkcOval
-Polygon = TkcPolygon
-Rectangle = TkcRectangle
-TextItem = TkcText
-WindowItem = TkcWindow
-BitmapImage = TkBitmapImage
-PhotoImage = TkPhotoImage
-Selection = TkSelection
-Winfo = TkWinfo
-Pack = TkPack
-Grid = TkGrid
-Place = TkPlace
-Variable = TkVariable
-Font = TkFont
-VirtualEvent = TkVirtualEvent
-
-def Mainloop
-  Tk.mainloop
-end
diff --git a/ext/tk/lib/tkconsole.rb b/ext/tk/lib/tkconsole.rb
deleted file mode 100644
index f4e8669c11..0000000000
--- a/ext/tk/lib/tkconsole.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# frozen_string_literal: false
-#
-#   tkconsole.rb - load tk/console.rb
-#
-require 'tk/console'
diff --git a/ext/tk/lib/tkdialog.rb b/ext/tk/lib/tkdialog.rb
deleted file mode 100644
index 7a24e2a37a..0000000000
--- a/ext/tk/lib/tkdialog.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# frozen_string_literal: false
-#
-#   tkdialog.rb - load tk/dialog.rb
-#
-require 'tk/dialog'
diff --git a/ext/tk/lib/tkentry.rb b/ext/tk/lib/tkentry.rb
deleted file mode 100644
index 9ae2f7c8fe..0000000000
--- a/ext/tk/lib/tkentry.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# frozen_string_literal: false
-#
-#   tkentry.rb - load tk/entry.rb
-#
-require 'tk/entry'
diff --git a/ext/tk/lib/tkextlib/ICONS.rb b/ext/tk/lib/tkextlib/ICONS.rb
deleted file mode 100644
index 10402c1292..0000000000
--- a/ext/tk/lib/tkextlib/ICONS.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# frozen_string_literal: false
-#
-#  ICONS support
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/ICONS/setup.rb'
-
-# load library
-require 'tkextlib/ICONS/icons'
diff --git a/ext/tk/lib/tkextlib/ICONS/icons.rb b/ext/tk/lib/tkextlib/ICONS/icons.rb
deleted file mode 100644
index 2934757b6d..0000000000
--- a/ext/tk/lib/tkextlib/ICONS/icons.rb
+++ /dev/null
@@ -1,130 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/ICONS/icons.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/ICONS/setup.rb'
-
-# TkPackage.require('icons', '1.0')
-TkPackage.require('icons')
-
-module Tk
-  class ICONS < TkImage
-    extend Tk
-
-    PACKAGE_NAME = 'icons'.freeze
-    def self.package_name
-      PACKAGE_NAME
-    end
-
-    def self.package_version
-      begin
-        TkPackage.require('icons')
-      rescue
-        ''
-      end
-    end
-
-    def self.create(*args)  # icon, icon, ..., ?option=>value, ...?
-      if args[-1].kind_of?(Hash)
-        keys = args.pop
-        icons = simplelist(tk_call('::icons::icons', 'create',
-                                   *(hash_kv(keys) << (args.flatten))))
-      else
-        icons = simplelist(tk_call('::icons::icons', 'create',
-                                   args.flatten))
-      end
-
-      icons.collect{|icon| self.new(icon, :without_creating=>true)}
-    end
-
-    def self.delete(*icons)  # icon, icon, ...
-      icons = icons.flatten
-      return if icons.empty?
-      icons.map!{|icon|
-        if icon.kind_of?(Tk::ICONS)
-          Tk_IMGTBL.delete(icon.path)
-          icon.name
-        elsif icon.to_s =~ /^::icon::(.*)/
-          name = $1
-          Tk_IMGTBL.delete(icon)
-          name
-        else
-          Tk_IMGTBL.delete("::icon::#{icon}")
-          icon
-        end
-      }
-      tk_call('::icons::icons', 'delete', icons)
-    end
-
-    def self.query(*args)  # icon, icon, ..., ?option=>value, ...?
-      if args[-1].kind_of?(Hash)
-        keys = args.pop
-        simplelist(tk_call('::icons::icons', 'query',
-                           *(hash_kv(keys) << (args.flatten))))
-      else
-        simplelist(tk_call('::icons::icons', 'query', args.flatten))
-      end . map{|inf| list(inf) }
-    end
-
-    ##########################################
-
-    class << self
-      alias _new new
-
-      def new(name, keys=nil)
-        if obj = Tk_IMGTBL["::icon::#{name}"]
-          if keys
-            keys = _symbolkey2str(keys)
-            unless keys.delete('without_creating')
-              tk_call('::icons::icons', 'create', *(hash_kv(keys) << obj.name))
-            end
-          end
-        else
-          obj = _new(name, keys)
-        end
-        obj
-      end
-    end
-
-    ##########################################
-
-    def initialize(name, keys=nil)
-      if name.kind_of?(String) && name =~ /^::icon::(.+)$/
-          @name = $1
-          @path = name
-      else
-        @name = name.to_s
-        @path = "::icon::#{@name}"
-      end
-      keys = _symbolkey2str(keys)
-      unless keys.delete('without_creating')
-        tk_call('::icons::icons', 'create', *(hash_kv(keys) << @name))
-      end
-      Tk_IMGTBL[@path] = self
-    end
-
-    def name
-      @name
-    end
-
-    def delete
-      Tk_IMGTBL.delete(@path)
-      tk_call('::icons::icons', 'delete', @name)
-      self
-    end
-
-    def query(keys={})
-      list(simplelist(tk_call('::icons::icons', 'query',
-                               *(hash_kv(keys) << @name))
-                      )[0])
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/ICONS/setup.rb b/ext/tk/lib/tkextlib/ICONS/setup.rb
deleted file mode 100644
index cc967dced6..0000000000
--- a/ext/tk/lib/tkextlib/ICONS/setup.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: false
-#
-#  setup.rb   --   setup script before calling TkPackage.require()
-#
-#    If you need some setup operations (for example, add a library path
-#    to the library search path) before using Tcl/Tk library packages
-#    wrapped by Ruby scripts in this directory, please write the setup
-#    operations in this file.
-#
diff --git a/ext/tk/lib/tkextlib/SUPPORT_STATUS b/ext/tk/lib/tkextlib/SUPPORT_STATUS
deleted file mode 100644
index 6af915360d..0000000000
--- a/ext/tk/lib/tkextlib/SUPPORT_STATUS
+++ /dev/null
@@ -1,193 +0,0 @@
-
-  [ current support status of Tcl/Tk extensions ]
-
-  *** RELEASE_DATE of the libraries => see 'tkextlib/version.rb' ***
-
-The following list shows *CURRENT* status when this file was last modified.
-If you want to add other Tcl/Tk extensions to the planned list (or change
-their status position), please send a request to the ruby-talk,
-ruby-list, or ruby-dev ML. Although we cannot promise to support your
-requests, we'll try to do it.
-
-If you want to check that wrapper libraries are ready to use on your
-environment, please execute 'pkg_checker.rb' with no arguments. The
-script may give you some hints about that.
-
-
-  ***** IMPORTANT NOTE **********************************************
-
-    'support' means that Ruby/Tk's wrapper libraries are released.
-    'not support' does *NOT* mean that the extension doesn't work
-    on Ruby/Tk.
-
-    The version number of each extension means the latest version
-    which is checked its feature. That is, it does NOT means only
-    version of working. Library files maybe include some features
-    which is included in the former version but removed from the
-    latest, and maybe able to support the later version then the
-    shown version.
-
-    Even if the status of the extension is 'not support', you can
-    control the functions/widgets of the extension without wrapper
-    libraries by Tk.tk_call(), Tk.ip_eval(), and so on.
-
-    If you cannot use installed Tcl/Tk extension, please check the
-    followings.
-
-     (1) On your Tcl/Tk, does the extension work?
-
-     (2) Do DLL libraries of the extension exist on DLL load-path?
-         (See also "<ruby archive>/ext/tcltklib/README.ActiveTcl")
-
-     (3) Is the Tcl library directory of the extension included in
-         library search-path of the Tcl interpreter linked Ruby/Tk?
-
-    The check results may request you to do some setup operations
-    before using the extension. If so, then please write the step
-    of setup operations into the "setup.rb" file in the directory
-    of the wrapper libraries for the extension (It is the wrapper
-    libraries have the standard structure of the libraries in this
-    directory). The "setup" file is required before requiring the
-    Tcl library package (TkPackage.require(<libname>)).
-
-  *******************************************************************
-
-
-===< support with some examples (may be beta quality) >=======================
-
-Tcllib       1.11.1
-Tklib        0.5     http://sourceforge.net/projects/tcllib      ==> tcllib
-                       ( partial support; primary support target is Tklib)
-
-IWidgets     4.0.2   http://sourceforge.net/projects/incrtcl     ==> iwidgets
-
-BWidget      1.8 [ CVS/Hd(2009-07-02) ]
-                     http://sourceforge.net/projects/tcllib      ==> bwidget
-
-TkTable      2.10    http://sourceforge.net/projects/tktable     ==> tktable
-                         * see also <http://www.korus.hu/~fery/ruby/tktable.rb>
-                                    written by Ferenc Engard (ferenc@engard.hu)
-
-Vu widgets   2.3.0   http://sourceforge.net/projects/tktable     ==> vu
-
-TkHTML       2.0     http://www.hwaci.com/sw/tkhtml/             ==> tkHTML
-
-ICONS        1.0     http://www.satisoft.com/tcltk/icons/        ==> ICONS
-
-TkImg        1.3     http://sourceforge.net/projects/tkimg       ==> tkimg
-
-
-BLT          2.4z    http://sourceforge.net/projects/blt         ==> blt
-
-TkTreeCtrl   2.2.9
-                     http://tktreectrl.sourceforge.net/          ==> treectrl
-
-Tile         0.8.3/8.6b1
-                     http://sourceforge.net/projects/tktable     ==> tile
-
-
-
-===< support (may be alpha or beta quality) >=================================
-
-IncrTcl      CVS/Hd(2008-12-15)
-                     http://sourceforge.net/projects/incrtcl     ==> itcl, itk
-
-TclX         CVS/Hd(2008-12-15)
-                     http://sourceforge.net/projects/tclx
-                       ==> tclx (partial support; infox command and
-                                                   XPG/3 message catalogs only)
-
-Trofs        0.4.4   http://math.nist.gov/~DPorter/tcltk/trofs/
-
-
-
-===< possibly available (not tested; alpha quality) >=========================
-
-winico       0.6
-                     http://sourceforge.net/projects/tktable
-                       ==> winico (win32 only)
-
-TkTrans      latest(2004-10-11)
-                     http://www2.cmp.uea.ac.uk/~fuzz/tktrans/default.html
-                       ==>  tktrans (win32 only)
-
-TkDND        1.0a2   http://sourceforge.net/projects/tkdnd       ==> tkDND
-
-
-
-===< plan to support (alpha quality libraries may be included) >==============
-
-GraphViz     ***     http://www.graphviz.org/
-
-Tkgeomap     ***     http://tkgeomap.sourceforge.net/index.html
-
-
-
-===< not determined to supprt or not >========================================
-
-Tix          ***     http://tixlibrary.sourceforge.net/
-
-TkZinc       ***     http://www.tkzinc.org/
-
-Wbc          ***     http://home.t-online.de/home/csaba.nemethi/
-
-Mentry       ***     http://home.t-online.de/home/csaba.nemethi/
-
-Tablelist    ***     http://home.t-online.de/home/csaba.nemethi/
-
-ANIGIF       ***     http://cardtable.sourceforge.net/tcltk/
-
-IMG_ROTATE   ***     http://cardtable.sourceforge.net/tcltk/
-
-TclVfs       ***     http://sourceforge.net/projects/tclvfs/
-
-vfwtcl       ***     http://sourceforge.net/projects/avicaptcl
-                        * Win32 only
-
-multicast    ***     http://sourceforge.net/projects/avicaptcl
-                        * Win32 only
-
-XBit         ***     http://www.geocities.com/~chengye/
-                        * current implementation is for Windows only
-
-QuickTimeTcl ***     http://hem.fyristorg.com/matben/qt/
-                        * works under Mac OS (8,9,X) or Windows
-
-
-
-===< may not support (already exist, out of Ruby/Tk scope, and so on) >=======
-
-TkCon        ***     http://sourceforge.net/projects/tkcon
-
-Expect       ***     http://sourceforge.net/projects/expect
-
-TclXML       ***     http://sourceforge.net/projects/tclxml
-
-TclXSLT      ***     http://sourceforge.net/projects/tclxml
-
-TclDOM       ***     http://sourceforge.net/projects/tclxml
-
-TclSOAP      ***     http://sourceforge.net/projects/tclsoap
-
-Snack        ***     http://www.speech.kth.se/~kare/snack2.2.tar.gz
-                        * use Snack for Ruby
-                              (see http://rbsnack.sourceforge.net/)
-
-Tcom         ***     http://www.vex.net/~cthuang/tcom/
-
-tDOM         ***     http://www.tdom.org
-
-Mk4tcl       ***     http://www.equi4.com/metakit/tcl.html
-
-Memchan      ***     http://sourceforge.net/projects/memchan
-
-XOTcl        ***     http://www.xotcl.org/
-
-
-===< tool (may not supprt) >==================================================
-
-tbcload/tclcompiler
-             ***     http://www.tcl.tk/software/tclpro/
-
-
-(End of List)
diff --git a/ext/tk/lib/tkextlib/blt.rb b/ext/tk/lib/tkextlib/blt.rb
deleted file mode 100644
index 665e41226f..0000000000
--- a/ext/tk/lib/tkextlib/blt.rb
+++ /dev/null
@@ -1,190 +0,0 @@
-# frozen_string_literal: false
-#
-#  BLT support
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tk/variable'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/blt/setup.rb'
-
-# load all image format handlers
-#TkPackage.require('BLT', '2.4')
-TkPackage.require('BLT')
-
-module Tk
-  module BLT
-    TkComm::TkExtlibAutoloadModule.unshift(self)
-    # Require autoload-symbols which is a same name as widget classname.
-    # Those are used at  TkComm._genobj_for_tkwidget method.
-
-    extend TkCore
-
-    VERSION = tk_call('set', 'blt_version')
-    PATCH_LEVEL = tk_call('set', 'blt_patchLevel')
-
-    begin
-      lib = TkCore::INTERP._invoke('set', 'blt_library')
-    rescue
-      lib = ''
-    end
-    LIBRARY  = TkVarAccess.new('blt_library', lib)
-
-    begin
-      lib = TkCore::INTERP._invoke('set', 'blt_libPath')
-    rescue
-      lib = ''
-    end
-    LIB_PATH = TkVarAccess.new('blt_libPath', lib)
-
-    PACKAGE_NAME = 'BLT'.freeze
-    def self.package_name
-      PACKAGE_NAME
-    end
-
-    def self.package_version
-      begin
-        TkPackage.require('BLT')
-      rescue
-        ''
-      end
-    end
-
-    ####################################################
-
-    def self.beep(percent = 50)
-      tk_call('::blt::beep', percent)
-    end
-
-    def self.bgexec(*args)
-      if args[0].kind_of?(TkVariable)
-        var = args.shift
-      else
-        var = TkVariable.new
-      end
-      params = [var]
-
-      params.concat(hash_kv(args.shift, true)) if args[0].kind_of?(Hash)
-
-      params << '--' if args[0] =~ /^\s*-[^-]/
-      params.concat(args)
-
-      tk_call('::blt::bgexec', *params)
-      var
-    end
-
-    def self.detach_bgexec(*args)
-      if args[0].kind_of?(TkVariable)
-        var = args.shift
-      else
-        var = TkVariable.new
-      end
-      params = [var]
-
-      params.concat(hash_kv(args.shift, true)) if args[0].kind_of?(Hash)
-
-      params << '--' if args[0] =~ /^\s*-[^-]/
-      params.concat(args)
-      params << '&'
-
-      [var, tk_split_list(tk_call('::blt::bgexec', *params))]
-    end
-
-    def self.bltdebug(lvl = nil)
-      if lvl
-        tk_call('::blt::bltdebug', lvl)
-      else
-        number(tk_call('::blt::bltdebug'))
-      end
-    end
-
-    def self.crc32_file(name)
-      tk_call_without_enc('::blt::crc32', name)
-    end
-    def self.crc32_data(dat)
-      tk_call_without_enc('::blt::crc32', '-data', dat)
-    end
-
-    ####################################################
-
-    def self.active_legend(graph)
-      tk_call_without_enc('Blt_ActiveLegend', graph)
-    end
-    def self.crosshairs(graph)
-      tk_call_without_enc('Blt_Crosshairs', graph)
-    end
-    def self.zoom_stack(graph)
-      tk_call_without_enc('Blt_ZoomStack', graph)
-    end
-    def self.print_key(graph)
-      tk_call_without_enc('Blt_PrintKey', graph)
-    end
-    def self.closest_point(graph)
-      tk_call_without_enc('Blt_ClosestPoint', graph)
-    end
-
-    module GraphCommand
-      def active_legend
-        tk_call_without_enc('Blt_ActiveLegend', @path)
-        self
-      end
-      def crosshairs
-        tk_call_without_enc('Blt_Crosshairs', @path)
-        self
-      end
-      def zoom_stack
-        tk_call_without_enc('Blt_ZoomStack', @path)
-        self
-      end
-      def print_key
-        tk_call_without_enc('Blt_PrintKey', @path)
-        self
-      end
-      def closest_point
-        tk_call_without_enc('Blt_ClosestPoint', @path)
-        self
-      end
-    end
-
-    ####################################################
-
-    autoload :PlotComponent,'tkextlib/blt/component.rb'
-
-    autoload :Barchart,     'tkextlib/blt/barchart.rb'
-    autoload :Bitmap,       'tkextlib/blt/bitmap.rb'
-    autoload :Busy,         'tkextlib/blt/busy.rb'
-    autoload :Container,    'tkextlib/blt/container.rb'
-    autoload :CutBuffer,    'tkextlib/blt/cutbuffer.rb'
-    autoload :DragDrop,     'tkextlib/blt/dragdrop.rb'
-    autoload :EPS,          'tkextlib/blt/eps.rb'
-    autoload :Htext,        'tkextlib/blt/htext.rb'
-    autoload :Graph,        'tkextlib/blt/graph.rb'
-    autoload :Spline,       'tkextlib/blt/spline.rb'
-    autoload :Stripchart,   'tkextlib/blt/stripchart.rb'
-    autoload :Table,        'tkextlib/blt/table.rb'
-    autoload :Tabnotebook,  'tkextlib/blt/tabnotebook.rb'
-    autoload :Tabset,       'tkextlib/blt/tabset.rb'
-    autoload :Ted,          'tkextlib/blt/ted.rb'
-    autoload :Tile,         'tkextlib/blt/tile.rb'
-    autoload :Tree,         'tkextlib/blt/tree.rb'
-    autoload :TreeView,     'tkextlib/blt/treeview.rb'
-    autoload :Hiertable,    'tkextlib/blt/treeview.rb'
-    # Hierbox is obsolete
-    autoload :Vector,       'tkextlib/blt/vector.rb'
-    autoload :VectorAccess, 'tkextlib/blt/vector.rb'
-    autoload :Watch,        'tkextlib/blt/watch.rb'
-    autoload :Winop,        'tkextlib/blt/winop.rb'
-    autoload :WinOp,        'tkextlib/blt/winop.rb'
-
-    # Unix only
-    autoload :DnD,          'tkextlib/blt/unix_dnd.rb'
-
-    # Windows only
-    autoload :Printer,      'tkextlib/blt/win_printer.rb'
-  end
-end
diff --git a/ext/tk/lib/tkextlib/blt/barchart.rb b/ext/tk/lib/tkextlib/blt/barchart.rb
deleted file mode 100644
index 5b6f09ead3..0000000000
--- a/ext/tk/lib/tkextlib/blt/barchart.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/blt/barchart.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/blt.rb'
-require 'tkextlib/blt/component.rb'
-
-module Tk::BLT
-  class Barchart < TkWindow
-    TkCommandNames = ['::blt::barchart'.freeze].freeze
-    WidgetClassName = 'Barchart'.freeze
-    WidgetClassNames[WidgetClassName] ||= self
-
-    include PlotComponent
-    include GraphCommand
-
-    def __boolval_optkeys
-      ['bufferelements', 'buffergraph', 'invertxy']
-    end
-    private :__boolval_optkeys
-
-    def __strval_optkeys
-      ['text', 'label', 'title', 'file',
-        'background', 'plotbackground']
-    end
-    private :__strval_optkeys
-
-    def __tkvariable_optkeys
-      super() << 'colormap' << 'fontmap'
-    end
-    private :__tkvariable_optkeys
-
-=begin
-    BarElement_ID = ['blt_barchart_bar'.freeze, TkUtil.untrust('00000')].freeze
-
-    def bar(elem=nil, keys={})
-      if elem.kind_of?(Hash)
-        keys = elem
-        elem = nil
-      end
-      unless elem
-        elem = BarElement_ID.join(TkCore::INTERP._ip_id_).freeze
-        BarElement_ID[1].succ!
-      end
-      tk_send('bar', elem, keys)
-      Element.new(self, elem, :without_creating=>true)
-    end
-=end
-
-    def extents(item)
-      num_or_str(tk_send_without_enc('extents', item))
-    end
-
-    def invtransform(x, y)
-      list(tk_send_without_enc('invtransform', x, y))
-    end
-
-    def inside(x, y)
-      bool(tk_send_without_enc('inside', x, y))
-    end
-
-    def metafile(file=None)
-      # Windows only
-      tk_send('metafile', file)
-      self
-    end
-
-    def snap(output, keys={})
-      tk_send_without_enc('snap', *(hash_kv(keys, false) + output))
-      self
-    end
-
-    def transform(x, y)
-      list(tk_send_without_enc('transform', x, y))
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/blt/bitmap.rb b/ext/tk/lib/tkextlib/blt/bitmap.rb
deleted file mode 100644
index b9f411044e..0000000000
--- a/ext/tk/lib/tkextlib/blt/bitmap.rb
+++ /dev/null
@@ -1,113 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/blt/bitmap.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/blt.rb'
-
-module Tk::BLT
-  class Bitmap < TkObject
-    extend TkCore
-
-    TkCommandNames = ['::blt::bitmap'.freeze].freeze
-
-    BITMAP_ID_TBL = TkCore::INTERP.create_table
-
-    (BITMAP_ID = ['blt_bitmap_id'.freeze, TkUtil.untrust('00000')]).instance_eval{
-      @mutex = Mutex.new
-      def mutex; @mutex; end
-      freeze
-    }
-
-    TkCore::INTERP.init_ip_env{
-      BITMAP_ID_TBL.mutex.synchronize{ BITMAP_ID_TBL.clear }
-    }
-
-    def self.data(name)
-      dat = tk_simple_list(tk_call('::blt::bitmap', 'data', name))
-      [ tk_split_list(dat[0]), tk_simple_list(dat[1]) ]
-    end
-
-    def self.exist?(name)
-      bool(tk_call('::blt::bitmap', 'exists', name))
-    end
-
-    def self.height(name)
-      number(tk_call('::blt::bitmap', 'height', name))
-    end
-
-    def self.width(name)
-      number(tk_call('::blt::bitmap', 'width', name))
-    end
-
-    def self.source(name)
-      tk_simple_list(tk_call('::blt::bitmap', 'source', name))
-    end
-
-    #################################
-
-    class << self
-      alias _new new
-
-      def new(data, keys={})
-        _new(:data, nil, data, keys)
-      end
-      alias define new
-
-      def new_with_name(name, data, keys={})
-        _new(:data, name, data, keys)
-      end
-      alias define_with_name new_with_name
-
-      def compose(text, keys={})
-        _new(:text, nil, text, keys)
-      end
-
-      def compose_with_name(name, text, keys={})
-        _new(:text, name, text, keys)
-      end
-    end
-
-    def initialize(type, name, data, keys = {})
-      if name
-        @id = name
-      else
-        BITMAP_ID.mutex.synchronize{
-          @id = BITMAP_ID.join(TkCore::INTERP._ip_id_)
-          BITMAP_ID[1].succ!
-        }
-        BITMAP_ID_TBL.mutex.synchronize{
-          BITMAP_ID_TBL[@id] = self
-        }
-      end
-
-      @path = @id
-
-      unless bool(tk_call('::blt::bitmap', 'exists', @id))
-        if type == :text
-          tk_call('::blt::bitmap', 'compose', @id, data, *hash_kv(keys))
-        else # :data
-          tk_call('::blt::bitmap', 'define', @id, data, *hash_kv(keys))
-        end
-      end
-    end
-
-    def exist?
-      bool(tk_call('::blt::bitmap', 'exists', @id))
-    end
-
-    def height
-      number(tk_call('::blt::bitmap', 'height', @id))
-    end
-
-    def width
-      number(tk_call('::blt::bitmap', 'width', @id))
-    end
-
-    def source
-      tk_simple_list(tk_call('::blt::bitmap', 'source', @id))
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/blt/busy.rb b/ext/tk/lib/tkextlib/blt/busy.rb
deleted file mode 100644
index ab24420750..0000000000
--- a/ext/tk/lib/tkextlib/blt/busy.rb
+++ /dev/null
@@ -1,84 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/blt/busy.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tk/itemconfig.rb'
-require 'tkextlib/blt.rb'
-
-module Tk::BLT
-  module Busy
-    extend TkCore
-    extend TkItemConfigMethod
-
-    TkCommandNames = ['::blt::busy'.freeze].freeze
-
-    ###########################
-
-    class Shield < TkWindow
-      def self.shield_path(win)
-        win = window(win) unless win.kind_of?(TkWindow)
-        if win.kind_of?(Tk::Toplevel)
-          win.path + '._Busy'
-        else
-          win.path + '_Busy'
-        end
-      end
-
-      def initialize(win)
-        @path = self.class.shield_path(win)
-      end
-    end
-
-    def self.shield_path(win)
-      Tk::BLT::Busy::Shield.shield_path(win)
-    end
-  end
-end
-
-class << Tk::BLT::Busy
-  def __item_config_cmd(win)
-    ['::blt::busy', 'configure', win]
-  end
-  private :__item_config_cmd
-
-  undef itemcget
-  undef itemcget_tkstring
-  alias configure itemconfigure
-  alias configinfo itemconfiginfo
-  alias current_configinfo current_itemconfiginfo
-  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
-
-  ##################################
-
-  def hold(win, keys={})
-    tk_call('::blt::busy', 'hold', win, *hash_kv(keys))
-  end
-
-  def release(*wins)
-    tk_call('::blt::busy', 'release', *wins)
-  end
-
-  def forget(*wins)
-    tk_call('::blt::busy', 'forget', *wins)
-  end
-
-  def is_busy(pat=None)
-    tk_split_list(tk_call('::blt::busy', 'isbusy', pat))
-  end
-
-  def names(pat=None)
-    tk_split_list(tk_call('::blt::busy', 'names', pat))
-  end
-  alias windows names
-
-  def check(win)
-    bool(tk_call('::blt::busy', 'check', win))
-  end
-
-  def status(win)
-    bool(tk_call('::blt::busy', 'status', win))
-  end
-end
diff --git a/ext/tk/lib/tkextlib/blt/component.rb b/ext/tk/lib/tkextlib/blt/component.rb
deleted file mode 100644
index a6b6f13905..0000000000
--- a/ext/tk/lib/tkextlib/blt/component.rb
+++ /dev/null
@@ -1,2219 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/blt/component.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/blt.rb'
-
-module Tk::BLT
-  module PlotComponent
-    include TkItemConfigMethod
-
-    module OptKeys
-      def __item_font_optkeys(id)
-        ['font', 'tickfont', 'titlefont']
-      end
-      private :__item_font_optkeys
-
-      def __item_numstrval_optkeys(id)
-        ['xoffset', 'yoffset']
-      end
-      private :__item_numstrval_optkeys
-
-      def __item_boolval_optkeys(id)
-        ['hide', 'under', 'descending', 'logscale', 'loose', 'showticks',
-          'titlealternate', 'scalesymbols', 'minor', 'raised',
-          'center', 'decoration', 'landscape', 'maxpect']
-      end
-      private :__item_boolval_optkeys
-
-      def __item_strval_optkeys(id)
-        ['text', 'label', 'limits', 'title',
-          'show', 'file', 'maskdata', 'maskfile',
-          'color', 'titlecolor', 'fill', 'outline', 'offdash']
-      end
-      private :__item_strval_optkeys
-
-      def __item_listval_optkeys(id)
-        ['bindtags']
-      end
-      private :__item_listval_optkeys
-
-      def __item_numlistval_optkeys(id)
-        ['dashes', 'majorticks', 'minorticks']
-      end
-      private :__item_numlistval_optkeys
-
-      def __item_tkvariable_optkeys(id)
-        ['variable', 'textvariable', 'colormap', 'fontmap']
-      end
-      private :__item_tkvariable_optkeys
-    end
-
-    include OptKeys
-
-    def __item_cget_cmd(id)
-      if id.kind_of?(Array)
-        # id := [ type, name ]
-        [self.path, id[0], 'cget', id[1]]
-      else
-        [self.path, id, 'cget']
-      end
-    end
-    private :__item_cget_cmd
-
-    def __item_config_cmd(id)
-      if id.kind_of?(Array)
-        # id := [ type, name, ... ]
-        type, *names = id
-        [self.path, type, 'configure'].concat(names)
-      else
-        [self.path, id, 'configure']
-      end
-    end
-    private :__item_config_cmd
-
-    def __item_pathname(id)
-      if id.kind_of?(Array)
-        id = tagid(id[1])
-      end
-      [self.path, id].join(';')
-    end
-    private :__item_pathname
-
-    def axis_cget_tkstring(id, option)
-      ret = itemcget_tkstring(['axis', tagid(id)], option)
-    end
-    def axis_cget(id, option)
-      ret = itemcget(['axis', tagid(id)], option)
-    end
-    def axis_cget_strict(id, option)
-      ret = itemcget_strict(['axis', tagid(id)], option)
-    end
-    def axis_configure(*args)
-      slot = args.pop
-      if slot.kind_of?(Hash)
-        value = None
-        slot = _symbolkey2str(slot)
-        if cmd = slot.delete('command')
-          slot['command'] = proc{|w, tick|
-            cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
-          }
-        end
-      else
-        value = slot
-        slot = args.pop
-        if slot == :command || slot == 'command'
-          cmd = value
-          value = proc{|w, tick|
-            cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
-          }
-        end
-      end
-      id_list = args.flatten.collect!{|id| tagid(id)}.unshift('axis')
-      itemconfigure(id_list, slot, value)
-    end
-    def axis_configinfo(id, slot=nil)
-      itemconfiginfo(['axis', tagid(id)], slot)
-    end
-    def current_axis_configinfo(id, slot=nil)
-      current_itemconfiginfo(['axis', tagid(id)], slot)
-    end
-
-    def crosshairs_cget_tkstring(option)
-      itemcget_tkstring('crosshairs', option)
-    end
-    def crosshairs_cget(option)
-      itemcget('crosshairs', option)
-    end
-    def crosshairs_cget_strict(option)
-      itemcget_strict('crosshairs', option)
-    end
-    def crosshairs_configure(slot, value=None)
-      itemconfigure('crosshairs', slot, value)
-    end
-    def crosshairs_configinfo(slot=nil)
-      itemconfiginfo('crosshairs', slot)
-    end
-    def current_crosshairs_configinfo(slot=nil)
-      current_itemconfiginfo('crosshairs', slot)
-    end
-
-    def element_cget_tkstring(id, option)
-      itemcget_tkstring(['element', tagid(id)], option)
-    end
-    def element_cget(id, option)
-      itemcget(['element', tagid(id)], option)
-    end
-    def element_cget_strict(id, option)
-      itemcget_strict(['element', tagid(id)], option)
-    end
-    def element_configure(*args)
-      slot = args.pop
-      if slot.kind_of?(Hash)
-        value = None
-      else
-        value = slot
-        slot = args.pop
-      end
-      id_list = args.flatten.collect!{|id| tagid(id)}.unshift('element')
-      itemconfigure(id_list, slot, value)
-    end
-    def element_configinfo(id, slot=nil)
-      itemconfiginfo(['element', tagid(id)], slot)
-    end
-    def current_element_configinfo(id, slot=nil)
-      current_itemconfiginfo(['element', tagid(id)], slot)
-    end
-
-    def bar_cget_tkstring(id, option)
-      itemcget_tkstring(['bar', tagid(id)], option)
-    end
-    def bar_cget(id, option)
-      itemcget(['bar', tagid(id)], option)
-    end
-    def bar_cget_strict(id, option)
-      itemcget_strict(['bar', tagid(id)], option)
-    end
-    def bar_configure(*args)
-      slot = args.pop
-      if slot.kind_of?(Hash)
-        value = None
-      else
-        value = slot
-        slot = args.pop
-      end
-      id_list = args.flatten.collect!{|id| tagid(id)}.unshift('bar')
-      itemconfigure(id_list, slot, value)
-    end
-    def bar_configinfo(id, slot=nil)
-      itemconfiginfo(['bar', tagid(id)], slot)
-    end
-    def current_bar_configinfo(id, slot=nil)
-      current_itemconfiginfo(['bar', tagid(id)], slot)
-    end
-
-    def line_cget_tkstring(id, option)
-      itemcget_tkstring(['line', tagid(id)], option)
-    end
-    def line_cget(id, option)
-      itemcget(['line', tagid(id)], option)
-    end
-    def line_cget_strict(id, option)
-      itemcget_strict(['line', tagid(id)], option)
-    end
-    def line_configure(*args)
-      slot = args.pop
-      if slot.kind_of?(Hash)
-        value = None
-      else
-        value = slot
-        slot = args.pop
-      end
-      id_list = args.flatten.collect!{|id| tagid(id)}.unshift('line')
-      itemconfigure(id_list, slot, value)
-    end
-    def line_configinfo(id, slot=nil)
-      itemconfiginfo(['line', tagid(id)], slot)
-    end
-    def current_line_configinfo(id, slot=nil)
-      current_itemconfiginfo(['line', tagid(id)], slot)
-    end
-
-    def gridline_cget_tkstring(option)
-      itemcget_tkstring('grid', option)
-    end
-    def gridline_cget(option)
-      itemcget('grid', option)
-    end
-    def gridline_cget_strict(option)
-      itemcget_strict('grid', option)
-    end
-    def gridline_configure(slot, value=None)
-      itemconfigure('grid', slot, value)
-    end
-    def gridline_configinfo(slot=nil)
-      itemconfiginfo('grid', slot)
-    end
-    def current_gridline_configinfo(slot=nil)
-      current_itemconfiginfo('grid', slot)
-    end
-
-    def legend_cget_tkstring(option)
-      itemcget_tkstring('legend', option)
-    end
-    def legend_cget(option)
-      itemcget('legend', option)
-    end
-    def legend_cget_strict(option)
-      itemcget_strict('legend', option)
-    end
-    def legend_configure(slot, value=None)
-      itemconfigure('legend', slot, value)
-    end
-    def legend_configinfo(slot=nil)
-      itemconfiginfo('legend', slot)
-    end
-    def current_legend_configinfo(slot=nil)
-      current_itemconfiginfo('legend', slot)
-    end
-
-    def pen_cget_tkstring(id, option)
-      itemcget_tkstring(['pen', tagid(id)], option)
-    end
-    def pen_cget(id, option)
-      itemcget(['pen', tagid(id)], option)
-    end
-    def pen_cget_strict(id, option)
-      itemcget_strict(['pen', tagid(id)], option)
-    end
-    def pen_configure(*args)
-      slot = args.pop
-      if slot.kind_of?(Hash)
-        value = None
-      else
-        value = slot
-        slot = args.pop
-      end
-      id_list = args.flatten.collect!{|id| tagid(id)}.unshift('pen')
-      itemconfigure(id_list, slot, value)
-    end
-    def pen_configinfo(id, slot=nil)
-      itemconfiginfo(['pen', tagid(id)], slot)
-    end
-    def current_pen_configinfo(id, slot=nil)
-      current_itemconfiginfo(['pen', tagid(id)], slot)
-    end
-
-    def postscript_cget_tkstring(option)
-      itemcget_tkstring('postscript', option)
-    end
-    def postscript_cget(option)
-      itemcget('postscript', option)
-    end
-    def postscript_cget_strict(option)
-      itemcget_strict('postscript', option)
-    end
-    def postscript_configure(slot, value=None)
-      itemconfigure('postscript', slot, value)
-    end
-    def postscript_configinfo(slot=nil)
-      itemconfiginfo('postscript', slot)
-    end
-    def current_postscript_configinfo(slot=nil)
-      current_itemconfiginfo('postscript', slot)
-    end
-
-    def marker_cget_tkstring(id, option)
-      itemcget_tkstring(['marker', tagid(id)], option)
-    end
-    def marker_cget(id, option)
-      itemcget(['marker', tagid(id)], option)
-    end
-    def marker_cget_strict(id, option)
-      itemcget_strict(['marker', tagid(id)], option)
-    end
-    def marker_configure(*args)
-      slot = args.pop
-      if slot.kind_of?(Hash)
-        value = None
-      else
-        value = slot
-        slot = args.pop
-      end
-      id_list = args.flatten.collect!{|id| tagid(id)}.unshift('marker')
-      itemconfigure(id_list, slot, value)
-    end
-    def marker_configinfo(id, slot=nil)
-      itemconfiginfo(['marker', tagid(id)], slot)
-    end
-    def current_marker_configinfo(id, slot=nil)
-      current_itemconfiginfo(['marker', tagid(id)], slot)
-    end
-
-    alias __itemcget_tkstring itemcget_tkstring
-    alias __itemcget itemcget
-    alias __itemcget_strict itemcget_strict
-    alias __itemconfiginfo itemconfiginfo
-    alias __current_itemconfiginfo current_itemconfiginfo
-    private :__itemcget_tkstring, :__itemcget, :__itemconfiginfo, :__current_itemconfiginfo
-
-    def itemcget_tkstring(tagOrId, option)
-      __itemcget_tkstring(tagid(tagOrId), option)
-    end
-    def itemcget_strict(tagOrId, option)
-      ret = __itemcget(tagid(tagOrId), option)
-      if option == 'bindtags' || option == :bindtags
-        ret.collect{|tag| TkBindTag.id2obj(tag)}
-      else
-        ret
-      end
-    end
-    def itemcget(tagOrId, option)
-      unless TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-        itemcget_strict(tagOrId, option)
-      else
-        begin
-          itemcget_strict(tagOrId, option)
-        rescue => e
-          begin
-            if current_itemconfiginfo(tagOrId).has_key?(option.to_s)
-              # error on known option
-              fail e
-            else
-              # unknown option
-              nil
-            end
-          rescue
-            fail e  # tag error
-          end
-        end
-      end
-    end
-    def itemconfiginfo(tagOrId, slot = nil)
-      ret = __itemconfiginfo(tagid(tagOrId), slot)
-
-      if TkComm::GET_CONFIGINFO_AS_ARRAY
-        if slot
-          if slot == 'bindtags' || slot == :bindtags
-            ret[-2] = ret[-2].collect{|tag| TkBindTag.id2obj(tag)}
-            ret[-1] = ret[-1].collect{|tag| TkBindTag.id2obj(tag)}
-          end
-        else
-          if (inf = ret.assoc('bindtags'))
-            inf[-2] = inf[-2].collect{|tag| TkBindTag.id2obj(tag)}
-            inf[-1] = inf[-1].collect{|tag| TkBindTag.id2obj(tag)}
-          end
-        end
-
-      else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-        if (inf = ret['bindtags'])
-          inf[-2] = inf[-2].collect{|tag| TkBindTag.id2obj(tag)}
-          inf[-1] = inf[-1].collect{|tag| TkBindTag.id2obj(tag)}
-          ret['bindtags'] = inf
-        end
-      end
-
-      ret
-    end
-    def current_itemconfiginfo(tagOrId, slot = nil)
-      ret = __current_itemconfiginfo(tagid(tagOrId), slot)
-
-      if (val = ret['bindtags'])
-        ret['bindtags'] = val.collect{|tag| TkBindTag.id2obj(tag)}
-      end
-
-      ret
-    end
-
-    private :itemcget_tkstring, :itemcget, :itemcget_strict
-    private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
-
-    #################
-
-    class Axis < TkObject
-      (OBJ_ID = ['blt_chart_axis'.freeze, TkUtil.untrust('00000')]).instance_eval{
-        @mutex = Mutex.new
-        def mutex; @mutex; end
-        freeze
-      }
-
-      AxisID_TBL = TkCore::INTERP.create_table
-
-      TkCore::INTERP.init_ip_env{
-        AxisID_TBL.mutex.synchronize{ AxisID_TBL.clear }
-      }
-
-      def self.id2obj(chart, id)
-        cpath = chart.path
-        AxisID_TBL.mutex.synchronize{
-          return id unless AxisID_TBL[cpath]
-          AxisID_TBL[cpath][id]? AxisID_TBL[cpath][id]: id
-        }
-      end
-
-      def self.new(chart, axis=nil, keys={})
-        if axis.kind_of?(Hash)
-          keys = axis
-          axis = nil
-        end
-        if keys
-          keys = _symbolkey2str(keys)
-          not_create = keys.delete('without_creating')
-        else
-          not_create = false
-        end
-
-        obj = nil
-        AxisID_TBL.mutex.synchronize{
-          chart_path = chart.path
-          AxisID_TBL[chart_path] ||= {}
-          if axis && AxisID_TBL[chart_path][axis]
-            obj = AxisID_TBL[chart_path][axis]
-          else
-            (obj = self.allocate).instance_eval{
-              if axis
-                @axis = @id = axis.to_s
-              else
-                OBJ_ID.mutex.synchronize{
-                  @axis = @id = OBJ_ID.join(TkCore::INTERP._ip_id_).freeze
-                  OBJ_ID[1].succ!
-                }
-              end
-              @path = @id
-              @parent = @chart = chart
-              @cpath = @chart.path
-              Axis::AxisID_TBL[@cpath][@axis] = self
-              unless not_create
-                tk_call(@chart, 'axis', 'create', @axis, keys)
-                return obj
-              end
-            }
-          end
-        }
-
-        obj.configure(keys) if obj && ! keys.empty?
-        obj
-      end
-
-      def initialize(chart, axis=nil, keys={})
-        # dummy:: not called by 'new' method
-
-        if axis.kind_of?(Hash)
-          keys = axis
-          axis = nil
-        end
-        if axis
-          @axis = @id = axis.to_s
-        else
-          OBJ_ID.mutex.synchronize{
-            @axis = @id = OBJ_ID.join(TkCore::INTERP._ip_id_).freeze
-            OBJ_ID[1].succ!
-          }
-        end
-        @path = @id
-        @parent = @chart = chart
-        @cpath = @chart.path
-        # Axis::AxisID_TBL[@cpath][@axis] = self
-        keys = _symbolkey2str(keys)
-        unless keys.delete('without_creating')
-          # @chart.axis_create(@axis, keys)
-          tk_call(@chart, 'axis', 'create', @axis, keys)
-        end
-      end
-
-      def id
-        @id
-      end
-
-      def to_eval
-        @id
-      end
-
-      def cget_tkstring(option)
-        @chart.axis_cget_tkstring(@id, option)
-      end
-      def cget(option)
-        @chart.axis_cget(@id, option)
-      end
-      def cget_strict(option)
-        @chart.axis_cget_strict(@id, option)
-      end
-      def configure(key, value=None)
-        @chart.axis_configure(@id, key, value)
-        self
-      end
-      def configinfo(key=nil)
-        @chart.axis_configinfo(@id, key)
-      end
-      def current_configinfo(key=nil)
-        @chart.current_axis_configinfo(@id, key)
-      end
-
-      def command(cmd=nil, &b)
-        if cmd
-          configure('command', cmd)
-        elsif b
-          configure('command', Proc.new(&b))
-        else
-          cget('command')
-        end
-      end
-
-      def delete
-        @chart.axis_delete(@id)
-        self
-      end
-
-      def invtransform(val)
-        @chart.axis_invtransform(@id, val)
-      end
-
-      def limits
-        @chart.axis_limits(@id)
-      end
-
-      def name
-        @axis
-      end
-
-      def transform(val)
-        @chart.axis_transform(@id, val)
-      end
-
-      def view
-        @chart.axis_view(@id)
-        self
-      end
-
-      def use(name=None) # if @id == xaxis | x2axis | yaxis | y2axis
-        @chart.axis_use(@id, name)
-      end
-
-      def use_as(axis) # axis := xaxis | x2axis | yaxis | y2axis
-        @chart.axis_use(axis, @id)
-      end
-    end
-
-    #################
-
-    class Crosshairs < TkObject
-      CrosshairsID_TBL = TkCore::INTERP.create_table
-
-      TkCore::INTERP.init_ip_env{
-        CrosshairsID_TBL.mutex.synchronize{ CrosshairsID_TBL.clear }
-      }
-
-      def self.new(chart, keys={})
-        obj = nil
-        CrosshairsID_TBL.mutex.synchronize{
-          unless (obj = CrosshairsID_TBL[chart.path])
-            (obj = self.allocate).instance_eval{
-              @parent = @chart = chart
-              @cpath = @chart.path
-              @path = @id = 'crosshairs'
-              Crosshairs::CrosshairsID_TBL[@cpath] = self
-            }
-          end
-        }
-        chart.crosshair_configure(keys) if obj && ! keys.empty?
-        obj
-      end
-
-      def initialize(chart, keys={})
-        # dummy:: not called by 'new' method
-
-        @parent = @chart = chart
-        @cpath = @chart.path
-        # Crosshairs::CrosshairsID_TBL[@cpath] = self
-        @chart.crosshair_configure(keys) unless keys.empty?
-        @path = @id = 'crosshairs'
-      end
-
-      def id
-        @id
-      end
-
-      def to_eval
-        @id
-      end
-
-      def cget_tkstring(option)
-        @chart.crosshair_cget_tkstring(option)
-      end
-      def cget(option)
-        @chart.crosshair_cget(option)
-      end
-      def cget_strict(option)
-        @chart.crosshair_cget_strict(option)
-      end
-      def configure(key, value=None)
-        @chart.crosshair_configure(key, value)
-        self
-      end
-      def configinfo(key=nil)
-        @chart.crosshair_configinfo(key)
-      end
-      def current_configinfo(key=nil)
-        @chart.current_crosshair_configinfo(key)
-      end
-
-      def off
-        @chart.crosshair_off
-        self
-      end
-      def on
-        @chart.crosshair_on
-        self
-      end
-      def toggle
-        @chart.crosshair_toggle
-        self
-      end
-    end
-
-    #################
-
-    class Element < TkObject
-      extend Tk
-      extend TkItemFontOptkeys
-      extend TkItemConfigOptkeys
-
-      extend Tk::BLT::PlotComponent::OptKeys
-
-      ElementTypeName = 'element'
-      ElementTypeToClass = { ElementTypeName=>self }
-
-      ElementID_TBL = TkCore::INTERP.create_table
-
-      TkCore::INTERP.init_ip_env{
-        ElementID_TBL.mutex.synchronize{ ElementID_TBL.clear }
-      }
-
-      (OBJ_ID = ['blt_chart_element'.freeze, TkUtil.untrust('00000')]).instance_eval{
-        @mutex = Mutex.new
-        def mutex; @mutex; end
-        freeze
-      }
-
-      def Element.type2class(type)
-        ElementTypeToClass[type]
-      end
-
-      def Element.id2obj(chart, id)
-        cpath = chart.path
-        ElementID_TBL.mutex.synchronize{
-          return id unless ElementID_TBL[cpath]
-          ElementID_TBL[cpath][id]? ElementID_TBL[cpath][id]: id
-        }
-      end
-
-      def self.new(chart, element=nil, keys={})
-        if element.kind_of?(Hash)
-          keys = element
-          element = nil
-        end
-        if keys
-          keys = _symbolkey2str(keys)
-          not_create = keys.delete('without_creating')
-        else
-          not_create = false
-        end
-
-        obj = nil
-        ElementID_TBL.mutex.synchronize{
-          chart_path = chart.path
-          ElementID_TBL[chart_path] ||= {}
-          if element && ElementID_TBL[chart_path][element]
-            obj = ElementID_TBL[chart_path][element]
-          else
-            (obj = self.allocate).instance_eval{
-              if element
-                @element = @id = element.to_s
-              else
-                OBJ_ID.mutex.synchronize{
-                  @element = @id = OBJ_ID.join(TkCore::INTERP._ip_id_).freeze
-                  OBJ_ID[1].succ!
-                }
-              end
-              @path = @id
-              @parent = @chart = chart
-              @cpath = @chart.path
-              @typename = self.class::ElementTypeName
-              Element::ElementID_TBL[@cpath][@element] = self
-              unless not_create
-                tk_call(@chart, @typename, 'create', @element, keys)
-                return obj
-              end
-            }
-          end
-        }
-
-        obj.configure(keys) if obj && ! keys.empty?
-        obj
-      end
-
-      def initialize(chart, element=nil, keys={})
-        # dummy:: not called by 'new' method
-
-        if element.kind_of?(Hash)
-          keys = element
-          element = nil
-        end
-        if element
-          @element = @id = element.to_s
-        else
-          OBJ_ID.mutex.synchronize{
-            @element = @id = OBJ_ID.join(TkCore::INTERP._ip_id_).freeze
-            OBJ_ID[1].succ!
-          }
-        end
-        @path = @id
-        @parent = @chart = chart
-        @cpath = @chart.path
-        @typename = self.class::ElementTypeName
-        # Element::ElementID_TBL[@cpath][@element] = self
-        keys = _symbolkey2str(keys)
-        unless keys.delete('without_creating')
-          # @chart.element_create(@element, keys)
-          tk_call(@chart, @typename, 'create', @element, keys)
-        end
-      end
-
-      def id
-        @id
-      end
-
-      def to_eval
-        @id
-      end
-
-      def cget_tkstring(option)
-        # @chart.element_cget(@id, option)
-        @chart.__send__(@typename + '_cget_tkstring', @id, option)
-      end
-      def cget(option)
-        # @chart.element_cget(@id, option)
-        @chart.__send__(@typename + '_cget', @id, option)
-      end
-      def cget_strict(option)
-        @chart.__send__(@typename + '_cget_strict', @id, option)
-      end
-      def configure(key, value=None)
-        # @chart.element_configure(@id, key, value)
-        @chart.__send__(@typename + '_configure', @id, key, value)
-        self
-      end
-      def configinfo(key=nil)
-        # @chart.element_configinfo(@id, key)
-        @chart.__send__(@typename + '_configinfo', @id, key)
-      end
-      def current_configinfo(key=nil)
-        # @chart.current_element_configinfo(@id, key)
-        @chart.__send__('current_' << @typename << '_configinfo', @id, key)
-      end
-
-      def activate(*args)
-        @chart.element_activate(@id, *args)
-      end
-
-      def closest(x, y, var, keys={})
-        # @chart.element_closest(x, y, var, @id, keys)
-        @chart.__send__(@typename + '_closest', x, y, var, @id, keys)
-      end
-
-      def deactivate
-        @chart.element_deactivate(@id)
-        self
-      end
-
-      def delete
-        @chart.element_delete(@id)
-        self
-      end
-
-      def exist?
-        @chart.element_exist?(@id)
-      end
-
-      def name
-        @element
-      end
-
-      def type
-        @chart.element_type(@id)
-      end
-    end
-
-    class Bar < Element
-      ElementTypeName = 'bar'.freeze
-      ElementTypeToClass[ElementTypeName] = self
-    end
-    class Line < Element
-      ElementTypeName = 'line'.freeze
-      ElementTypeToClass[ElementTypeName] = self
-    end
-
-    #################
-
-    class GridLine < TkObject
-      GridLineID_TBL = TkCore::INTERP.create_table
-      TkCore::INTERP.init_ip_env{
-        GridLineID_TBL.mutex.synchronize{ GridLineID_TBL.clear }
-      }
-
-      def self.new(chart, keys={})
-        obj = nil
-        GridLineID_TBL.mutex.synchronize{
-          unless (obj = GridLineID_TBL[chart.path])
-            (obj = self.allocate).instance_eval{
-              @parent = @chart = chart
-              @cpath = @chart.path
-              @path = @id = 'grid'
-              GridLine::GridLineID_TBL[@cpath] = self
-            }
-          end
-        }
-        chart.gridline_configure(keys) if obj && ! keys.empty?
-        obj
-      end
-
-      def initialize(chart, keys={})
-        # dummy:: not called by 'new' method
-
-        @parent = @chart = chart
-        @cpath = @chart.path
-        # GridLine::GridLineID_TBL[@cpath] = self
-        @chart.gridline_configure(keys) unless keys.empty?
-        @path = @id = 'grid'
-      end
-
-      def id
-        @id
-      end
-
-      def to_eval
-        @id
-      end
-
-      def cget_tkstring(option)
-        @chart.gridline_cget_tkstring(option)
-      end
-      def cget(option)
-        @chart.gridline_cget(option)
-      end
-      def cget_strict(option)
-        @chart.gridline_cget_strict(option)
-      end
-      def configure(key, value=None)
-        @chart.gridline_configure(key, value)
-        self
-      end
-      def configinfo(key=nil)
-        @chart.gridline_configinfo(key)
-      end
-      def current_configinfo(key=nil)
-        @chart.current_gridline_configinfo(key)
-      end
-
-      def off
-        @chart.gridline_off
-        self
-      end
-      def on
-        @chart.gridline_on
-        self
-      end
-      def toggle
-        @chart.gridline_toggle
-        self
-      end
-    end
-
-    #################
-
-    class Legend < TkObject
-      LegendID_TBL = TkCore::INTERP.create_table
-
-      TkCore::INTERP.init_ip_env{
-        LegendID_TBL.mutex.synchronize{ LegendID_TBL.clear }
-      }
-
-      def self.new(chart, keys={})
-        obj = nil
-        LegenedID_TBL.mutex.synchronize{
-          unless (obj = LegenedID_TBL[chart.path])
-            (obj = self.allocate).instance_eval{
-              @parent = @chart = chart
-              @cpath = @chart.path
-              @path = @id = 'crosshairs'
-              Legend::LegenedID_TBL[@cpath] = self
-            }
-          end
-        }
-        chart.legend_configure(keys) if obj && ! keys.empty?
-        obj
-      end
-
-      def initialize(chart, keys={})
-        # dummy:: not called by 'new' method
-
-        @parent = @chart = chart
-        @cpath = @chart.path
-        # Legend::LegendID_TBL[@cpath] = self
-        @chart.legend_configure(keys) unless keys.empty?
-        @path = @id = 'legend'
-      end
-
-      def id
-        @id
-      end
-
-      def to_eval
-        @id
-      end
-
-      def cget_tkstring(option)
-        @chart.legend_cget_tkstring(option)
-      end
-      def cget(option)
-        @chart.legend_cget(option)
-      end
-      def cget_strict(option)
-        @chart.legend_cget_strict(option)
-      end
-      def configure(key, value=None)
-        @chart.legend_configure(key, value)
-        self
-      end
-      def configinfo(key=nil)
-        @chart.legend_configinfo(key)
-      end
-      def current_configinfo(key=nil)
-        @chart.current_legend_configinfo(key)
-      end
-
-      def activate(*args)
-        @chart.legend_activate(*args)
-      end
-
-      def deactivate(*args)
-        @chart.legend_deactivate(*args)
-      end
-
-      def get(pos, y=nil)
-        @chart.legend_get(pos, y)
-      end
-    end
-
-    #################
-
-    class Pen < TkObject
-      (OBJ_ID = ['blt_chart_pen'.freeze, TkUtil.untrust('00000')]).instance_eval{
-        @mutex = Mutex.new
-        def mutex; @mutex; end
-        freeze
-      }
-
-      PenID_TBL = TkCore::INTERP.create_table
-
-      TkCore::INTERP.init_ip_env{
-        PenID_TBL.mutex.synchronize{ PenID_TBL.clear }
-      }
-
-      def self.id2obj(chart, id)
-        cpath = chart.path
-        PenID_TBL.mutex.synchronize{
-          return id unless PenID_TBL[cpath]
-          PenID_TBL[cpath][id]? PenID_TBL[cpath][id]: id
-        }
-      end
-
-      def self.new(chart, pen=nil, keys={})
-        if pen.kind_of?(Hash)
-          keys = pen
-          pen = nil
-        end
-        if keys
-          keys = _symbolkey2str(keys)
-          not_create = keys.delete('without_creating')
-        else
-          not_create = false
-        end
-
-        obj = nil
-        PenID_TBL.mutex.synchronize{
-          chart_path = chart.path
-          PenID_TBL[chart_path] ||= {}
-          if pen && PenID_TBL[chart_path][pen]
-            obj = PenID_TBL[chart_path][pen]
-          else
-            (obj = self.allocate).instance_eval{
-              if pen
-                @pen = @id = pen.to_s
-              else
-                OBJ_ID.mutex.synchronize{
-                  @pen = @id = OBJ_ID.join(TkCore::INTERP._ip_id_).freeze
-                  OBJ_ID[1].succ!
-                }
-              end
-              @path = @id
-              @parent = @chart = chart
-              @cpath = @chart.path
-              Pen::PenID_TBL[@cpath][@pen] = self
-              unless not_create
-                tk_call(@chart, 'pen', 'create', @pen, keys)
-                return obj
-              end
-            }
-          end
-        }
-
-        obj.configure(keys) if obj && ! keys.empty?
-        obj
-      end
-
-      def initialize(chart, pen=nil, keys={})
-        if pen.kind_of?(Hash)
-          keys = pen
-          pen = nil
-        end
-        if pen
-          @pen = @id = pen.to_s
-        else
-          OBJ_ID.mutex.synchronize{
-            @pen = @id = OBJ_ID.join(TkCore::INTERP._ip_id_).freeze
-            OBJ_ID[1].succ!
-          }
-        end
-        @path = @id
-        @parent = @chart = chart
-        @cpath = @chart.path
-        Pen::PenID_TBL[@cpath][@pen] = self
-        keys = _symbolkey2str(keys)
-        unless keys.delete('without_creating')
-          # @chart.pen_create(@pen, keys)
-          tk_call(@chart, 'pen', 'create', @pen, keys)
-        end
-      end
-
-      def id
-        @id
-      end
-
-      def to_eval
-        @id
-      end
-
-      def cget_tkstring(option)
-        @chart.pen_cget_tkstring(@id, option)
-      end
-      def cget(option)
-        @chart.pen_cget(@id, option)
-      end
-      def cget_strict(option)
-        @chart.pen_cget_strict(@id, option)
-      end
-      def configure(key, value=None)
-        @chart.pen_configure(@id, key, value)
-        self
-      end
-      def configinfo(key=nil)
-        @chart.pen_configinfo(@id, key)
-      end
-      def current_configinfo(key=nil)
-        @chart.current_pen_configinfo(@id, key)
-      end
-
-      def delete
-        @chart.pen_delete(@id)
-        self
-      end
-
-      def name
-        @pen
-      end
-    end
-
-    #################
-
-    class Postscript < TkObject
-      PostscriptID_TBL = TkCore::INTERP.create_table
-
-      TkCore::INTERP.init_ip_env{
-        PostscriptID_TBL.mutex.synchronize{ PostscriptID_TBL.clear }
-      }
-
-      def self.new(chart, keys={})
-        obj = nil
-        PostscriptID_TBL.mutex.synchronize{
-          unless (obj = PostscriptID_TBL[chart.path])
-            (obj = self.allocate).instance_eval{
-              @parent = @chart = chart
-              @cpath = @chart.path
-              @path = @id = 'postscript'
-              Postscript::PostscriptID_TBL[@cpath] = self
-            }
-          end
-        }
-        chart.postscript_configure(keys) if obj && ! keys.empty?
-        obj
-      end
-
-      def initialize(chart, keys={})
-        # dummy:: not called by 'new' method
-
-        @parent = @chart = chart
-        @cpath = @chart.path
-        # Postscript::PostscriptID_TBL[@cpath] = self
-        @chart.postscript_configure(keys) unless keys.empty?
-        @path = @id = 'postscript'
-      end
-
-      def id
-        @id
-      end
-
-      def to_eval
-        @id
-      end
-
-      def cget_tkstring(option)
-        @chart.postscript_cget_tkstring(option)
-      end
-      def cget(option)
-        @chart.postscript_cget(option)
-      end
-      def cget_strict(option)
-        @chart.postscript_cget_strict(option)
-      end
-      def configure(key, value=None)
-        @chart.postscript_configure(key, value)
-        self
-      end
-      def configinfo(key=nil)
-        @chart.postscript_configinfo(key)
-      end
-      def current_configinfo(key=nil)
-        @chart.current_postscript_configinfo(key)
-      end
-
-      def output(file=nil, keys={})
-        if file.kind_of?(Hash)
-          keys = file
-          file = nil
-        end
-
-        ret = @chart.postscript_output(file, keys)
-
-        if file
-          self
-        else
-          ret
-        end
-      end
-    end
-
-    #################
-    class Marker < TkObject
-      extend Tk
-      extend TkItemFontOptkeys
-      extend TkItemConfigOptkeys
-
-      extend Tk::BLT::PlotComponent::OptKeys
-
-      MarkerTypeName = nil
-      MarkerTypeToClass = {}
-      MarkerID_TBL = TkCore::INTERP.create_table
-
-      TkCore::INTERP.init_ip_env{
-        MarkerID_TBL.mutex.synchronize{ MarkerID_TBL.clear }
-      }
-
-      def Marker.type2class(type)
-        MarkerTypeToClass[type]
-      end
-
-      def Marker.id2obj(chart, id)
-        cpath = chart.path
-        MarkerID_TBL.mutex.synchronize{
-          if MarkerID_TBL[cpath]
-            MarkerID_TBL[cpath][id]? MarkerID_TBL[cpath][id]: id
-          else
-            id
-          end
-        }
-      end
-
-      def self._parse_create_args(keys)
-        fontkeys = {}
-        methodkeys = {}
-        if keys.kind_of? Hash
-          keys = _symbolkey2str(keys)
-
-          __item_font_optkeys(nil).each{|key|
-            fkey = key.to_s
-            fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
-
-            fkey = "kanji#{key}"
-            fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
-
-            fkey = "latin#{key}"
-            fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
-
-            fkey = "ascii#{key}"
-            fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
-          }
-
-          __item_optkey_aliases(nil).each{|alias_name, real_name|
-            alias_name = alias_name.to_s
-            if keys.has_key?(alias_name)
-              keys[real_name.to_s] = keys.delete(alias_name)
-            end
-          }
-
-          __item_methodcall_optkeys(nil).each{|key|
-            key = key.to_s
-            methodkeys[key] = keys.delete(key) if keys.key?(key)
-          }
-
-          __item_ruby2val_optkeys(nil).each{|key, method|
-            key = key.to_s
-            keys[key] = method.call(keys[key]) if keys.has_key?(key)
-          }
-
-          args = itemconfig_hash_kv(nil, keys)
-        else
-          args = []
-        end
-
-        [args, fontkeys, methodkeys]
-      end
-      private_class_method :_parse_create_args
-
-      def self.create(chart, keys={})
-        unless self::MarkerTypeName
-          fail RuntimeError, "#{self} is an abstract class"
-        end
-        args, fontkeys, methodkeys = _parse_create_args(keys)
-        idnum = tk_call_without_enc(chart.path, 'marker', 'create',
-                                    self::MarkerTypeName, *args)
-        chart.marker_configure(idnum, fontkeys) unless fontkeys.empty?
-        chart.marker_configure(idnum, methodkeys) unless methodkeys.empty?
-        idnum.to_i  # 'item id' is an integer number
-      end
-
-      def self.create_type(chart, type, keys={})
-        args, fontkeys, methodkeys = _parse_create_args(keys)
-        idnum = tk_call_without_enc(chart.path, 'marker', 'create',
-                                    type, *args)
-        chart.marker_configure(idnum, fontkeys) unless fontkeys.empty?
-        chart.marker_configure(idnum, methodkeys) unless methodkeys.empty?
-        id = idnum.to_i  # 'item id' is an integer number
-        obj = self.allocate
-        obj.instance_eval{
-          @parent = @chart = chart
-          @cpath = chart.path
-          @id = id
-          Tk::BLT::PlotComponent::Marker::MarkerID_TBL.mutex.synchronize{
-            Tk::BLT::PlotComponent::Marker::MarkerID_TBL[@cpath] ||= {}
-            Tk::BLT::PlotComponent::Marker::MarkerID_TBL[@cpath][@id] = self
-          }
-        }
-        obj
-      end
-
-      def initialize(parent, *args)
-        @parent = @chart = parent
-        @cpath = parent.path
-
-        @path = @id = create_self(*args) # an integer number as 'item id'
-        Tk::BLT::PlotComponent::Marker::MarkerID_TBL.mutex.synchronize{
-          Tk::BLT::PlotComponent::Marker::MarkerID_TBL[@cpath] ||= {}
-          Tk::BLT::PlotComponent::Marker::MarkerID_TBL[@cpath][@id] = self
-        }
-      end
-      def create_self(*args)
-        self.class.create(@chart, *args) # return an integer as 'item id'
-      end
-      private :create_self
-
-      def id
-        @id
-      end
-
-      def to_eval
-        @id
-      end
-
-      def cget_tkstring(option)
-        @chart.marker_cget_tkstring(@id, option)
-      end
-      def cget(option)
-        @chart.marker_cget(@id, option)
-      end
-      def cget_strict(option)
-        @chart.marker_cget_strict(@id, option)
-      end
-      def configure(key, value=None)
-        @chart.marker_configure(@id, key, value)
-        self
-      end
-      def configinfo(key=nil)
-        @chart.marker_configinfo(@id, key)
-      end
-      def current_configinfo(key=nil)
-        @chart.current_marker_configinfo(@id, key)
-      end
-
-      def after(target=None)
-        @chart.marker_after(@id, target)
-      end
-
-      def before(target=None)
-        @chart.marker_before(@id, target)
-      end
-
-      def delete
-        @chart.marker_delete(@id)
-      end
-
-      def exist?
-        @chart.marker_exist(@id)
-      end
-
-      def type
-        @chart.marker_type(@id)
-      end
-    end
-
-    class TextMarker < Marker
-      MarkerTypeName = 'text'.freeze
-      MarkerTypeToClass[MarkerTypeName] = self
-    end
-    class LineMarker < Marker
-      MarkerTypeName = 'line'.freeze
-      MarkerTypeToClass[MarkerTypeName] = self
-    end
-    class BitmapMarker < Marker
-      MarkerTypeName = 'bitmap'.freeze
-      MarkerTypeToClass[MarkerTypeName] = self
-    end
-    class ImageMarker < Marker
-      MarkerTypeName = 'image'.freeze
-      MarkerTypeToClass[MarkerTypeName] = self
-    end
-    class PolygonMarker < Marker
-      MarkerTypeName = 'polygon'.freeze
-      MarkerTypeToClass[MarkerTypeName] = self
-    end
-    class WindowMarker < Marker
-      MarkerTypeName = 'window'.freeze
-      MarkerTypeToClass[MarkerTypeName] = self
-    end
-
-    #################
-
-    def __destroy_hook__
-      Axis::AxisID_TBL.delete(@path)
-      Crosshairs::CrosshairsID_TBL.delete(@path)
-      Element::ElementID_TBL.delete(@path)
-      GridLine::GridLineID_TBL.delete(@path)
-      Legend::LegendID_TBL.delete(@path)
-      Pen::PenID_TBL.delete(@path)
-      Postscript::PostscriptID_TBL.delete(@path)
-      Marker::MarkerID_TBL.delete(@path)
-      super()
-    end
-
-    #################
-
-    def tagid(tag)
-      if tag.kind_of?(Axis) ||
-          tag.kind_of?(Crosshairs) ||
-          tag.kind_of?(Element) ||
-          tag.kind_of?(GridLine) ||
-          tag.kind_of?(Legend) ||
-          tag.kind_of?(Pen) ||
-          tag.kind_of?(Postscript) ||
-          tag.kind_of?(Marker)
-        tag.id
-      else
-        tag  # maybe an Array of configure parameters
-      end
-    end
-
-    def _component_bind(target, tag, context, *args)
-      if TkComm._callback_entry?(args[0]) || !block_given?
-        cmd = args.shift
-      else
-        cmd = Proc.new
-      end
-      _bind([path, target, 'bind', tagid(tag)], context, cmd, *args)
-      self
-    end
-    def _component_bind_append(target, tag, context, *args)
-      if TkComm._callback_entry?(args[0]) || !block_given?
-        cmd = args.shift
-      else
-        cmd = Proc.new
-      end
-      _bind_append([path, target, 'bind', tagid(tag)], context, cmd, *args)
-      self
-    end
-    def _component_bind_remove(target, tag, context)
-      _bind_remove([path, target, 'bind', tagid(tag)], context)
-      self
-    end
-    def _component_bindinfo(target, tag, context=nil)
-      _bindinfo([path, target, 'bind', tagid(tag)], context)
-    end
-    private :_component_bind, :_component_bind_append
-    private :_component_bind_remove, :_component_bindinfo
-
-    def axis_bind(tag, context, *args)
-      _component_bind('axis', tag, context, *args)
-    end
-    def axis_bind_append(tag, context, *args)
-      _component_bind_append('axis', tag, context, *args)
-    end
-    def axis_bind_remove(tag, context)
-      _component_bind_remove('axis', tag, context)
-    end
-    def axis_bindinfo(tag, context=nil)
-      _component_bindinfo('axis', tag, context)
-    end
-
-    def element_bind(tag, context, *args)
-      _component_bind('element', tag, context, *args)
-    end
-    def element_bind_append(tag, context, *args)
-      _component_bind_append('element', tag, context, *args)
-    end
-    def element_bind_remove(tag, context)
-      _component_bind_remove('element', tag, context)
-    end
-    def element_bindinfo(tag, context=nil)
-      _component_bindinfo('element', tag, context)
-    end
-
-    def bar_bind(tag, context, *args)
-      _component_bind('bar', tag, context, *args)
-    end
-    def bar_bind_append(tag, context, *args)
-      _component_bind_append('bar', tag, context, *args)
-    end
-    def bar_bind_remove(tag, context)
-      _component_bind_remove('bar', tag, context)
-    end
-    def bar_bindinfo(tag, context=nil)
-      _component_bindinfo('bar', tag, context)
-    end
-
-    def line_bind(tag, context, *args)
-      _component_bind('line', tag, context, *args)
-    end
-    def line_bind_append(tag, context, *args)
-      _component_bind_append('line', tag, context, *args)
-    end
-    def line_bind_remove(tag, context)
-      _component_bind_remove('line', tag, context)
-    end
-    def line_bindinfo(tag, context=nil)
-      _component_bindinfo('line', tag, context)
-    end
-
-    def legend_bind(tag, context, *args)
-      _component_bind('legend', tag, context, *args)
-    end
-    def legend_bind_append(tag, context, *args)
-      _component_bind_append('legend', tag, context, *args)
-    end
-    def legend_bind_remove(tag, context)
-      _component_bind_remove('legend', tag, context)
-    end
-    def legend_bindinfo(tag, context=nil)
-      _component_bindinfo('legend', tag, context)
-    end
-
-    def marker_bind(tag, context, *args)
-      _component_bind('marker', tag, context, *args)
-    end
-    def marker_bind_append(tag, context, *args)
-      _component_bind_append('marker', tag, context, *args)
-    end
-    def marker_bind_remove(tag, context)
-      _component_bind_remove('marker', tag, context)
-    end
-    def marker_bindinfo(tag, context=nil)
-      _component_bindinfo('marker', tag, context)
-    end
-
-    ###################
-
-    def axis_create(id=nil, keys={})
-      # tk_send('axis', 'create', tagid(id), keys)
-      Tk::BLT::PlotComponent::Axis.new(self, tagid(id), keys)
-    end
-    def axis_delete(*ids)
-      tk_send('axis', 'delete', *(ids.collect{|id| tagid(id)}))
-      self
-    end
-    def axis_invtransform(id, val)
-      list(tk_send('axis', 'invtransform', tagid(id), val))
-    end
-    def axis_limits(id)
-      list(tk_send('axis', 'limits', tagid(id)))
-    end
-    def axis_names(*pats)
-      simplelist(tk_send('axis', 'names',
-                         *(pats.collect{|pat| tagid(pat)}))).collect{|axis|
-        Tk::BLT::PlotComponent::Axis.id2obj(self, axis)
-      }
-    end
-    def axis_transform(id, val)
-      list(tk_send('axis', 'transform', tagid(id), val))
-    end
-    def axis_view(id)
-      tk_send('axis', 'view', tagid(id))
-      self
-    end
-    def axis_use(id, target=nil)
-      if target
-        Tk::BLT::PlotComponent::Axis.id2obj(self,
-                                            tk_send('axis', 'use',
-                                                    tagid(id), tagid(target)))
-      else
-        Tk::BLT::PlotComponent::Axis.id2obj(self,
-                                            tk_send('axis', 'use', tagid(id)))
-      end
-    end
-
-    ###################
-
-    def crosshairs_off
-      tk_send_without_enc('crosshairs', 'off')
-      self
-    end
-    def crosshairs_on
-      tk_send_without_enc('crosshairs', 'on')
-      self
-    end
-    def crosshairs_toggle
-      tk_send_without_enc('crosshairs', 'toggle')
-      self
-    end
-
-    ###################
-
-    def element_create(id=nil, keys={})
-      # tk_send('element', 'create', tagid(id), keys)
-      Tk::BLT::PlotComponent::Element.new(self, tagid(id), keys)
-    end
-    def element_activate(*args)
-      if args.empty?
-        list(tk_send('element', 'activate')).collect{|elem|
-          Tk::BLT::PlotComponent::Element.id2obj(self, elem)
-        }
-      else
-        # id, *indices
-        id = args.shift
-        tk_send('element', 'activate', tagid(id), *args)
-      end
-    end
-    def element_closest(x, y, var, *args)
-      if args[-1].kind_of?(Hash)
-        keys = args.pop
-        bool(tk_send('element', 'closest', x, y, var,
-                     *(hash_kv(keys).concat(args.collect{|id| tagid(id)}))))
-      else
-        bool(tk_send('element', 'closest', x, y, var,
-                     *(args.collect{|id| tagid(id)})))
-      end
-    end
-    def element_deactivate(*ids)
-      tk_send('element', 'deactivate', *(ids.collect{|id| tagid(id)}))
-      self
-    end
-    def element_delete(*ids)
-      tk_send('element', 'delete', *(ids.collect{|id| tagid(id)}))
-      self
-    end
-    def element_exist?(id)
-      bool(tk_send('element', 'exists', tagid(id)))
-    end
-    def element_names(*pats)
-      simplelist(tk_send('element', 'names',
-                         *(pats.collect{|pat| tagid(pat)}))).collect{|elem|
-        Tk::BLT::PlotComponent::Element.id2obj(self, elem)
-      }
-    end
-    def element_show(*names)
-      if names.empty?
-        simplelist(tk_send('element', 'show'))
-      else
-        tk_send('element', 'show', *(names.collect{|n| tagid(n)}))
-        self
-      end
-    end
-    def element_type(id)
-      tk_send('element', 'type', tagid(id))
-    end
-
-    ###################
-
-    def bar_create(id=nil, keys={})
-      # tk_send('bar', 'create', tagid(id), keys)
-      Tk::BLT::PlotComponent::Bar.new(self, tagid(id), keys)
-    end
-    alias bar bar_create
-    def bar_activate(*args)
-      if args.empty?
-        list(tk_send('bar', 'activate')).collect{|elem|
-          Tk::BLT::PlotComponent::Element.id2obj(self, elem)
-        }
-      else
-        # id, *indices
-        id = args.shift
-        tk_send('bar', 'activate', tagid(id), *args)
-      end
-    end
-    def bar_closest(x, y, var, *args)
-      if args[-1].kind_of?(Hash)
-        keys = args.pop
-        bool(tk_send('bar', 'closest', x, y, var,
-                     *(hash_kv(keys).concat(args.collect{|id| tagid(id)}))))
-      else
-        bool(tk_send('bar', 'closest', x, y, var,
-                     *(args.collect{|id| tagid(id)})))
-      end
-    end
-    def bar_deactivate(*ids)
-      tk_send('bar', 'deactivate', *(ids.collect{|id| tagid(id)}))
-      self
-    end
-    def bar_delete(*ids)
-      tk_send('bar', 'delete', *(ids.collect{|id| tagid(id)}))
-      self
-    end
-    def bar_exist?(id)
-      bool(tk_send('bar', 'exists', tagid(id)))
-    end
-    def bar_names(*pats)
-      simplelist(tk_send('bar', 'names',
-                         *(pats.collect{|pat| tagid(pat)}))).collect{|elem|
-        Tk::BLT::PlotComponent::Element.id2obj(self, elem)
-      }
-    end
-    def bar_show(*names)
-      if names.empty?
-        simplelist(tk_send('bar', 'show'))
-      else
-        tk_send('bar', 'show', *(names.collect{|n| tagid(n)}))
-        self
-      end
-    end
-    def bar_type(id)
-      tk_send('bar', 'type', tagid(id))
-    end
-
-    ###################
-
-    def line_create(id=nil, keys={})
-      # tk_send('line', 'create', tagid(id), keys)
-      Tk::BLT::PlotComponent::Line.new(self, tagid(id), keys)
-    end
-    alias bar line_create
-    def line_activate(*args)
-      if args.empty?
-        list(tk_send('line', 'activate')).collect{|elem|
-          Tk::BLT::PlotComponent::Element.id2obj(self, elem)
-        }
-      else
-        # id, *indices
-        id = args.shift
-        tk_send('line', 'activate', tagid(id), *args)
-      end
-    end
-    def line_closest(x, y, var, *args)
-      if args[-1].kind_of?(Hash)
-        keys = args.pop
-        bool(tk_send('line', 'closest', x, y, var,
-                     *(hash_kv(keys).concat(args.collect{|id| tagid(id)}))))
-      else
-        bool(tk_send('line', 'closest', x, y, var,
-                     *(args.collect{|id| tagid(id)})))
-      end
-    end
-    def line_deactivate(*ids)
-      tk_send('line', 'deactivate', *(ids.collect{|id| tagid(id)}))
-      self
-    end
-    def line_delete(*ids)
-      tk_send('line', 'delete', *(ids.collect{|id| tagid(id)}))
-      self
-    end
-    def line_exist?(id)
-      bool(tk_send('line', 'exists', tagid(id)))
-    end
-    def line_names(*pats)
-      simplelist(tk_send('line', 'names',
-                         *(pats.collect{|pat| tagid(pat)}))).collect{|elem|
-        Tk::BLT::PlotComponent::Element.id2obj(self, elem)
-      }
-    end
-    def line_show(*names)
-      if names.empty?
-        simplelist(tk_send('line', 'show'))
-      else
-        tk_send('line', 'show', *(names.collect{|n| tagid(n)}))
-        self
-      end
-    end
-    def line_type(id)
-      tk_send('line', 'type', tagid(id))
-    end
-
-    ###################
-
-    def gridline_off
-      tk_send_without_enc('grid', 'off')
-      self
-    end
-    def gridline_on
-      tk_send_without_enc('grid', 'on')
-      self
-    end
-    def gridline_toggle
-      tk_send_without_enc('grid', 'toggle')
-      self
-    end
-
-    ###################
-
-    def legend_window_create(parent=nil, keys=nil)
-      if parent.kind_of?(Hash)
-        keys = _symbolkey2str(parent)
-        parent = keys.delete('parent')
-        widgetname = keys.delete('widgetname')
-        keys.delete('without_creating')
-      elsif keys
-        keys = _symbolkey2str(keys)
-        widgetname = keys.delete('widgetname')
-        keys.delete('without_creating')
-      end
-
-      legend = self.class.new(parent, :without_creating=>true,
-                              :widgetname=>widgetname)
-      class << legend
-        def __destroy_hook__
-          TkCore::INTERP.tk_windows.delete(@path)
-        end
-      end
-
-      if keys
-        self.legend_configure(keys.update('position'=>legend))
-      else
-        self.legend_configure('position'=>legend)
-      end
-      legend
-    end
-
-    def legend_activate(*pats)
-      list(tk_send('legend', 'activate',
-                   *(pats.collect{|pat| tagid(pat)}))).collect{|elem|
-        Tk::BLT::PlotComponent::Element.id2obj(self, elem)
-      }
-    end
-    def legend_deactivate(*pats)
-      list(tk_send('legend', 'deactivate',
-                   *(pats.collect{|pat| tagid(pat)}))).collect{|elem|
-        Tk::BLT::PlotComponent::Element.id2obj(self, elem)
-      }
-    end
-    def legend_get(pos, y=nil)
-      if y
-        Tk::BLT::PlotComponent::Element.id2obj(self,
-                                               tk_send('legend', 'get',
-                                                       _at(pos, y)))
-      else
-        Tk::BLT::PlotComponent::Element.id2obj(self,
-                                               tk_send('legend', 'get', pos))
-      end
-    end
-
-    ###################
-
-    def pen_create(id=nil, keys={})
-      # tk_send('pen', 'create', tagid(id), keys)
-      Tk::BLT::PlotComponent::Pen.new(self, tagid(id), keys)
-    end
-    def pen_delete(*ids)
-      tk_send('pen', 'delete', *(ids.collect{|id| tagid(id)}))
-      self
-    end
-    def pen_names(*pats)
-      simplelist(tk_send('pen', 'names',
-                         *(pats.collect{|pat| tagid(pat)}))).collect{|pen|
-        Tk::BLT::PlotComponent::Pen.id2obj(self, pen)
-      }
-    end
-
-    ###################
-
-    def postscript_output(file=nil, keys={})
-      if file.kind_of?(Hash)
-        keys = file
-        file = nil
-      end
-
-      if file
-        tk_send('postscript', 'output', file, keys)
-        self
-      else
-        tk_send('postscript', 'output', keys)
-      end
-    end
-
-    ###################
-
-    def marker_create(type, keys={})
-      case type
-      when :text, 'text'
-        Tk::BLT::PlotComponent::TextMarker.new(self, keys)
-      when :line, 'line'
-        Tk::BLT::PlotComponent::LineMarker.new(self, keys)
-      when :bitmap, 'bitmap'
-        Tk::BLT::PlotComponent::BitmapMarker.new(self, keys)
-      when :image, 'image'
-        Tk::BLT::PlotComponent::ImageMarker.new(self, keys)
-      when :polygon, 'polygon'
-        Tk::BLT::PlotComponent::PolygonMarker.new(self, keys)
-      when :window, 'window'
-        Tk::BLT::PlotComponent::WindowMarker.new(self, keys)
-      else
-        if type.kind_of?(Tk::BLT::PlotComponent::Marker)
-          type.new(self, keys)
-        else
-          Tk::BLT::PlotComponent::Marker.create_type(self, type, keys)
-        end
-      end
-    end
-    def marker_after(id, target=nil)
-      if target
-        tk_send_without_enc('marker', 'after', tagid(id), tagid(target))
-      else
-        tk_send_without_enc('marker', 'after', tagid(id))
-      end
-      self
-    end
-    def marker_before(id, target=None)
-      if target
-        tk_send_without_enc('marker', 'before', tagid(id), tagid(target))
-      else
-        tk_send_without_enc('marker', 'before', tagid(id))
-      end
-      self
-    end
-    def marker_delete(*ids)
-      tk_send('marker', 'delete', *(ids.collect{|id| tagid(id)}))
-      self
-    end
-    def marker_exist?(id)
-      bool(tk_send('marker', 'exists', tagid(id)))
-    end
-    def marker_names(*pats)
-      simplelist(tk_send('marker', 'names',
-                         *(pats.collect{|pat| tagid(pat)}))).collect{|id|
-        Tk::BLT::PlotComponent::Marker.id2obj(self, id)
-      }
-    end
-    def marker_type(id)
-      tk_send('marker', 'type', tagid(id))
-    end
-
-    ###################
-
-    def xaxis_cget_tkstring(option)
-      itemcget_tkstring('xaxis', option)
-    end
-    def xaxis_cget(option)
-      itemcget('xaxis', option)
-    end
-    def xaxis_cget_strict(option)
-      itemcget_strict('xaxis', option)
-    end
-    def xaxis_configure(slot, value=None)
-      if slot.kind_of?(Hash)
-        slot = _symbolkey2str(slot)
-        if cmd = slot.delete('command')
-          slot['command'] = proc{|w, tick|
-            cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
-          }
-        end
-      elsif slot == :command || slot == 'command'
-        cmd = value
-        value = proc{|w, tick|
-          cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
-        }
-      end
-      itemconfigure('xaxis', slot, value)
-    end
-    def xaxis_configinfo(slot=nil)
-      itemconfiginfo('xaxis', slot)
-    end
-    def current_xaxis_configinfo(slot=nil)
-      current_itemconfiginfo('xaxis', slot)
-    end
-    def xaxis_bind(context, *args)
-      if TkComm._callback_entry?(args[0]) || !block_given?
-        cmd = args.shift
-      else
-        cmd = Proc.new
-      end
-      _bind([path, 'xaxis', 'bind'], context, cmd, *args)
-      self
-    end
-    def xaxis_bind_append(context, *args)
-      if TkComm._callback_entry?(args[0]) || !block_given?
-        cmd = args.shift
-      else
-        cmd = Proc.new
-      end
-      _bind_append([path, 'xaxis', 'bind'], context, cmd, *args)
-      self
-    end
-    def xaxis_bind_remove(context)
-      _bind_remove([path, 'xaxis', 'bind'], context)
-      self
-    end
-    def xaxis_bindinfo(context=nil)
-      _bindinfo([path, 'xaxis', 'bind'], context)
-    end
-    def xaxis_invtransform(val)
-      list(tk_send('xaxis', 'invtransform', val))
-    end
-    def xaxis_limits
-      list(tk_send('xaxis', 'limits'))
-    end
-    def xaxis_transform(val)
-      list(tk_send('xaxis', 'transform', val))
-    end
-    def xaxis_use(target=nil)
-      if target
-        Tk::BLT::PlotComponent::Axis.id2obj(self,
-                                            tk_send('xaxis', 'use',
-                                                    tagid(target)))
-      else
-        Tk::BLT::PlotComponent::Axis.id2obj(self, tk_send('xaxis', 'use'))
-      end
-    end
-
-    def x2axis_cget_tkstring(option)
-      itemcget_tkstring('x2axis', option)
-    end
-    def x2axis_cget(option)
-      itemcget('x2axis', option)
-    end
-    def x2axis_cget_strict(option)
-      itemcget_strict('x2axis', option)
-    end
-    def x2axis_configure(slot, value=None)
-      if slot.kind_of?(Hash)
-        slot = _symbolkey2str(slot)
-        if cmd = slot.delete('command')
-          slot['command'] = proc{|w, tick|
-            cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
-          }
-        end
-      elsif slot == :command || slot == 'command'
-        cmd = value
-        value = proc{|w, tick|
-          cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
-        }
-      end
-      itemconfigure('x2axis', slot, value)
-    end
-    def x2axis_configinfo(slot=nil)
-      itemconfiginfo('x2axis', slot)
-    end
-    def current_x2axis_configinfo(slot=nil)
-      current_itemconfiginfo('x2axis', slot)
-    end
-    def x2axis_bind(context, *args)
-      if TkComm._callback_entry?(args[0]) || !block_given?
-        cmd = args.shift
-      else
-        cmd = Proc.new
-      end
-      _bind([path, 'x2axis', 'bind'], context, cmd, *args)
-      self
-    end
-    def x2axis_bind_append(context, *args)
-      if TkComm._callback_entry?(args[0]) || !block_given?
-        cmd = args.shift
-      else
-        cmd = Proc.new
-      end
-      _bind_append([path, 'x2axis', 'bind'], context, cmd, *args)
-      self
-    end
-    def x2axis_bind_remove(context)
-      _bind_remove([path, 'x2axis', 'bind'], context)
-      self
-    end
-    def x2axis_bindinfo(context=nil)
-      _bindinfo([path, 'x2axis', 'bind'], context)
-    end
-    def x2axis_invtransform(val)
-      list(tk_send('x2axis', 'invtransform', val))
-    end
-    def x2axis_limits
-      list(tk_send('x2axis', 'limits'))
-    end
-    def x2axis_transform(val)
-      list(tk_send('x2axis', 'transform', val))
-    end
-    def x2axis_use(target=nil)
-      if target
-        Tk::BLT::PlotComponent::Axis.id2obj(self,
-                                            tk_send('x2axis', 'use',
-                                                    tagid(target)))
-      else
-        Tk::BLT::PlotComponent::Axis.id2obj(self, tk_send('x2axis', 'use'))
-      end
-    end
-
-    def yaxis_cget_tkstring(option)
-      itemcget_tkstring('yaxis', option)
-    end
-    def yaxis_cget(option)
-      itemcget('yaxis', option)
-    end
-    def yaxis_cget_strict(option)
-      itemcget_strict('yaxis', option)
-    end
-    def yaxis_configure(slot, value=None)
-      if slot.kind_of?(Hash)
-        slot = _symbolkey2str(slot)
-        if cmd = slot.delete('command')
-          slot['command'] = proc{|w, tick|
-            cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
-          }
-        end
-      elsif slot == :command || slot == 'command'
-        cmd = value
-        value = proc{|w, tick|
-          cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
-        }
-      end
-      itemconfigure('yaxis', slot, value)
-    end
-    def yaxis_configinfo(slot=nil)
-      itemconfiginfo('yaxis', slot)
-    end
-    def current_yaxis_configinfo(slot=nil)
-      current_itemconfiginfo('yaxis', slot)
-    end
-    def yaxis_bind(context, *args)
-      if TkComm._callback_entry?(args[0]) || !block_given?
-        cmd = args.shift
-      else
-        cmd = Proc.new
-      end
-      _bind([path, 'yaxis', 'bind'], context, cmd, *args)
-      self
-    end
-    def yaxis_bind_append(context, *args)
-      if TkComm._callback_entry?(args[0]) || !block_given?
-        cmd = args.shift
-      else
-        cmd = Proc.new
-      end
-      _bind_append([path, 'yaxis', 'bind'], context, cmd, *args)
-      self
-    end
-    def yaxis_bind_remove(context)
-      _bind_remove([path, 'yaxis', 'bind'], context)
-      self
-    end
-    def yaxis_bindinfo(context=nil)
-      _bindinfo([path, 'yaxis', 'bind'], context)
-    end
-    def yaxis_invtransform(val)
-      list(tk_send('yaxis', 'invtransform', val))
-    end
-    def yaxis_limits
-      list(tk_send('yaxis', 'limits'))
-    end
-    def yaxis_transform(val)
-      list(tk_send('yaxis', 'transform', val))
-    end
-    def yaxis_use(target=nil)
-      if target
-        Tk::BLT::PlotComponent::Axis.id2obj(self,
-                                            tk_send('yaxis', 'use',
-                                                    tagid(target)))
-      else
-        Tk::BLT::PlotComponent::Axis.id2obj(self, tk_send('yaxis', 'use'))
-      end
-    end
-
-    def y2axis_cget_tkstring(option)
-      itemcget_tkstring('y2axis', option)
-    end
-    def y2axis_cget(option)
-      itemcget('y2axis', option)
-    end
-    def y2axis_cget_strict(option)
-      itemcget_strict('y2axis', option)
-    end
-    def y2axis_configure(slot, value=None)
-      if slot.kind_of?(Hash)
-        slot = _symbolkey2str(slot)
-        if cmd = slot.delete('command')
-          slot['command'] = proc{|w, tick|
-            cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
-          }
-        end
-      elsif slot == :command || slot == 'command'
-        cmd = value
-        value = proc{|w, tick|
-          cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
-        }
-      end
-      itemconfigure('y2axis', slot, value)
-    end
-    def y2axis_configinfo(slot=nil)
-      axis_configinfo('y2axis', slot)
-    end
-    def current_y2axis_configinfo(slot=nil)
-      current_itemconfiginfo('y2axis', slot)
-    end
-    def y2axis_bind(context, *args)
-      if TkComm._callback_entry?(args[0]) || !block_given?
-        cmd = args.shift
-      else
-        cmd = Proc.new
-      end
-      _bind([path, 'y2axis', 'bind'], context, cmd, *args)
-      self
-    end
-    def y2axis_bind_append(context, *args)
-      if TkComm._callback_entry?(args[0]) || !block_given?
-        cmd = args.shift
-      else
-        cmd = Proc.new
-      end
-      _bind_append([path, 'y2axis', 'bind'], context, cmd, *args)
-      self
-    end
-    def y2axis_bind_remove(context)
-      _bind_remove([path, 'y2axis', 'bind'], context)
-      self
-    end
-    def y2axis_bindinfo(context=nil)
-      _bindinfo([path, 'y2axis', 'bind'], context)
-    end
-    def y2axis_invtransform(val)
-      list(tk_send('y2axis', 'invtransform', val))
-    end
-    def y2axis_limits
-      list(tk_send('y2axis', 'limits'))
-    end
-    def y2axis_transform(val)
-      list(tk_send('y2axis', 'transform', val))
-    end
-    def y2axis_use(target=nil)
-      if target
-        Tk::BLT::PlotComponent::Axis.id2obj(self,
-                                            tk_send('y2axis', 'use',
-                                                    tagid(target)))
-      else
-        Tk::BLT::PlotComponent::Axis.id2obj(self, tk_send('y2axis', 'use'))
-      end
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/blt/container.rb b/ext/tk/lib/tkextlib/blt/container.rb
deleted file mode 100644
index 6ee11138d7..0000000000
--- a/ext/tk/lib/tkextlib/blt/container.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/blt/container.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/blt.rb'
-
-module Tk::BLT
-  class Container < TkWindow
-    TkCommandNames = ['::blt::container'.freeze].freeze
-    WidgetClassName = 'Container'.freeze
-    WidgetClassNames[WidgetClassName] ||= self
-
-    def __strval_optkeys
-      super() << 'name'
-    end
-    private :__strval_optkeys
-
-    def find_command(pat)
-      Hash[*simplelist(tk_send_without_enc('find', '-command', pat))]
-    end
-
-    def find_name(pat)
-      Hash[*simplelist(tk_send_without_enc('find', '-name', pat))]
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/blt/cutbuffer.rb b/ext/tk/lib/tkextlib/blt/cutbuffer.rb
deleted file mode 100644
index b36aece6e7..0000000000
--- a/ext/tk/lib/tkextlib/blt/cutbuffer.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/blt/cutbuffer.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/blt.rb'
-
-module Tk::BLT
-  module CutBuffer
-    TkCommandNames = ['::blt::cutbuffer'.freeze].freeze
-
-    def self.get(num = 0)
-      Tk.tk_call('::blt::cutbuffer', 'get', num)
-    end
-    def self.rotate(count = 1)
-      Tk.tk_call('::blt::cutbuffer', 'rotate', count)
-    end
-    def self.set(val, num = 0)
-      Tk.tk_call('::blt::cutbuffer', 'set', val, num)
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/blt/dragdrop.rb b/ext/tk/lib/tkextlib/blt/dragdrop.rb
deleted file mode 100644
index dc2531b12e..0000000000
--- a/ext/tk/lib/tkextlib/blt/dragdrop.rb
+++ /dev/null
@@ -1,270 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/blt/dragdrop.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tk/itemconfig'
-require 'tkextlib/blt.rb'
-
-module Tk::BLT
-  module DragDrop
-    extend TkCore
-
-    TkCommandNames = ['::blt::drag&drop'.freeze].freeze
-
-    class Token < TkWindow
-      WidgetClassName = 'DragDropToken'.freeze
-      WidgetClassNames[WidgetClassName] ||= self
-
-      def initialize(arg)
-        if arg.kind_of?(Hash) # arg is a hash includes the widgetpath of token
-          arg = _symbolkey2str(arg)
-          install_win(nil, arg['widgetname'])
-        else  # arg is a drag&drop source
-          tk_call('::blt::drag&drop', 'source', arg)
-          install_win(nil, tk_call('::blt::drag&drop', 'token', arg))
-        end
-      end
-    end
-
-    ###################################
-
-    extend TkItemConfigMethod
-    extend Tk::ValidateConfigure
-
-    class << self
-      def __item_config_cmd(id)  # id := ['source'|'target', win]
-        ['::blt::drag&drop', id[0], id[1]]
-      end
-      private :__item_config_cmd
-
-      def __item_boolval_optkeys(id)
-        super(id) << 'selftarget'
-      end
-      private :__item_boolval_optkeys
-
-      def __item_listval_optkeys(id)
-        super(id) << 'send'
-      end
-      private :__item_listval_optkeys
-
-      def __item_strval_optkeys(id)
-        super(id) << 'rejectbg' << 'rejectfg' << 'tokenbg'
-      end
-      private :__item_strval_optkeys
-
-      undef itemcget
-      undef itemcget_tkstring
-      private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
-
-      def source_configure(win, slot, value=None)
-        itemconfigure(['source', win], slot, value)
-      end
-      def source_configinfo(win, slot=nil)
-        itemconfiginfo(['source', win], slot)
-      end
-      def current_source_configinfo(win, slot=nil)
-        current_itemconfiginfo(['source', win], slot)
-      end
-    end
-
-    class PackageCommand < TkValidateCommand
-      class ValidateArgs < TkUtil::CallbackSubst
-        KEY_TBL = [
-          [ ?t, ?w, :token ],
-          [ ?W, ?w, :widget ],
-          nil
-        ]
-
-        PROC_TBL = [
-          [ ?w, TkComm.method(:window) ],
-          nil
-        ]
-
-=begin
-        # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-        KEY_TBL.map!{|inf|
-          if inf.kind_of?(Array)
-            inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-            inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-          end
-          inf
-        }
-
-        PROC_TBL.map!{|inf|
-          if inf.kind_of?(Array)
-            inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-          end
-          inf
-        }
-=end
-
-        _setup_subst_table(KEY_TBL, PROC_TBL)
-
-        def self.ret_val(val)
-          val
-        end
-      end
-
-      def self._config_keys
-        ['packagecmd']
-      end
-    end
-
-    class SiteCommand < TkValidateCommand
-      class ValidateArgs < TkUtil::CallbackSubst
-        KEY_TBL = [
-          [ ?s, ?b, :compatible ],
-          [ ?t, ?w, :token ],
-          nil
-        ]
-
-        PROC_TBL = [
-          [ ?b, TkComm.method(:bool) ],
-          [ ?w, TkComm.method(:window) ],
-          nil
-        ]
-
-=begin
-        # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-        KEY_TBL.map!{|inf|
-          if inf.kind_of?(Array)
-            inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-            inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-          end
-          inf
-        }
-
-        PROC_TBL.map!{|inf|
-          if inf.kind_of?(Array)
-            inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-          end
-          inf
-        }
-=end
-
-        _setup_subst_table(KEY_TBL, PROC_TBL)
-
-        def self.ret_val(val)
-          val
-        end
-      end
-
-      def self._config_keys
-        ['sitecmd']
-      end
-    end
-
-    def self.__validation_class_list
-      super() << PackageCommand << SiteCommand
-    end
-
-    class << self
-      Tk::ValidateConfigure.__def_validcmd(binding, PackageCommand)
-      Tk::ValidateConfigure.__def_validcmd(binding, SiteCommand)
-    end
-
-    ###################################
-
-    class DnD_Handle < TkUtil::CallbackSubst
-      KEY_TBL = [
-        [ ?i, ?s, :ip_name ],
-        [ ?v, ?v, :value ],
-        [ ?W, ?w, :widget ],
-        nil
-      ]
-
-      PROC_TBL = [
-        [ ?i, TkComm.method(:string) ],
-        [ ?v, TkComm.method(:tk_tcl2ruby) ],
-        [ ?w, TkComm.method(:window) ],
-        nil
-      ]
-
-=begin
-      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-      KEY_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-        end
-        inf
-      }
-
-      PROC_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-        end
-        inf
-      }
-=end
-
-      _setup_subst_table(KEY_TBL, PROC_TBL)
-    end
-
-    def self.source_handler(win, datatype, cmd=Proc.new, *args)
-      _bind_for_event_class(DnD_Handle,
-                            ['::blt::drag&drop', 'source', win, 'handler'],
-                            cmd, *args)
-    end
-
-    def self.target_handler(win, datatype, cmd=Proc.new, *args)
-      _bind_for_event_class(DnD_Handle,
-                            ['::blt::drag&drop', 'target', win, 'handler'],
-                            cmd, *args)
-    end
-
-    ###################################
-
-    def self.init_source(win)
-      tk_call('::blt::drag&drop', 'source', win)
-    end
-
-    def self.source()
-      list(tk_call('::blt::drag&drop', 'source'))
-    end
-
-    def self.source_handler_list(win)
-      simplelist(tk_call('::blt::drag&drop', 'source', win, 'handler'))
-    end
-    def self.source_handler_info(win, type)
-      tk_tcl2ruby(tk_call('::blt::drag&drop', 'source', win, 'handler', type))
-    end
-
-    def self.target
-      list(tk_call('::blt::drag&drop', 'target'))
-    end
-    def self.target_handler_list(win)
-      simplelist(tk_call('::blt::drag&drop', 'target', win, 'handler'))
-    end
-
-    def self.handle_target(win, type, val=None)
-      tk_call('::blt::drag&drop', 'target', win, 'handle', type, val)
-    end
-
-    def self.token(win)
-      window(tk_call('::blt::drag&drop', 'token', win))
-    end
-
-    def self.drag(win, x, y)
-      tk_call('::blt::drag&drop', 'drag', win, x, y)
-    end
-    def self.drop(win, x, y)
-      tk_call('::blt::drag&drop', 'drop', win, x, y)
-    end
-
-    def self.errors(cmd=Proc.new)
-      tk_call('::blt::drag&drop', 'errors', cmd)
-    end
-
-    def self.active
-      bool(tk_call('::blt::drag&drop', 'active'))
-    end
-
-    def self.location(x=None, y=None)
-      list(tk_call('::blt::drag&drop', 'location', x, y))
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/blt/eps.rb b/ext/tk/lib/tkextlib/blt/eps.rb
deleted file mode 100644
index bd2d3cc47e..0000000000
--- a/ext/tk/lib/tkextlib/blt/eps.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/blt/eps.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tk/canvas'
-require 'tkextlib/blt.rb'
-
-module Tk::BLT
-  class EPS < TkcItem
-    CItemTypeName = 'eps'.freeze
-    CItemTypeToClass[CItemTypeName] = self
-  end
-end
-
-class Tk::Canvas
-  alias __BLT_EPS_item_strval_optkeys __item_strval_optkeys
-  def __item_strval_optkeys(id)
-    __BLT_EPS_item_strval_optkeys(id) + [
-      'shadowcolor', 'title', 'titlecolor'
-    ]
-  end
-  private :__item_strval_optkeys
-
-  alias __BLT_EPS_item_boolval_optkeys __item_boolval_optkeys
-  def __item_boolval_optkeys(id)
-    __BLT_EPS_item_boolval_optkeys(id) + ['showimage']
-  end
-  private :__item_boolval_optkeys
-end
-
diff --git a/ext/tk/lib/tkextlib/blt/graph.rb b/ext/tk/lib/tkextlib/blt/graph.rb
deleted file mode 100644
index 02de006f33..0000000000
--- a/ext/tk/lib/tkextlib/blt/graph.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/blt/graph.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/blt.rb'
-require 'tkextlib/blt/component.rb'
-
-module Tk::BLT
-  class Graph < TkWindow
-    TkCommandNames = ['::blt::graph'.freeze].freeze
-    WidgetClassName = 'Graph'.freeze
-    WidgetClassNames[WidgetClassName] ||= self
-
-    include PlotComponent
-    include GraphCommand
-
-    def __boolval_optkeys
-      ['bufferelements', 'invertxy']
-    end
-    private :__boolval_optkeys
-
-    def __strval_optkeys
-      ['text', 'label', 'title', 'file', 'plotbackground']
-    end
-    private :__strval_optkeys
-
-=begin
-    BarElement_ID = ['blt_graph_bar'.freeze, TkUtil.untrust('00000')].freeze
-
-    def bar(elem=nil, keys={})
-      if elem.kind_of?(Hash)
-        keys = elem
-        elem = nil
-      end
-      unless elem
-        elem = BarElement_ID.join(TkCore::INTERP._ip_id_).freeze
-        BarElement_ID[1].succ!
-      end
-      tk_send('bar', elem, keys)
-      Element.new(self, elem, :without_creating=>true)
-    end
-=end
-
-    def extents(item)
-      num_or_str(tk_send_without_enc('extents', item))
-    end
-
-    def invtransform(x, y)
-      list(tk_send_without_enc('invtransform', x, y))
-    end
-
-    def inside(x, y)
-      bool(tk_send_without_enc('inside', x, y))
-    end
-
-    def snap(output, keys={})
-      tk_send_without_enc('snap', *(hash_kv(keys, false) + output))
-      self
-    end
-
-    def transform(x, y)
-      list(tk_send_without_enc('transform', x, y))
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/blt/htext.rb b/ext/tk/lib/tkextlib/blt/htext.rb
deleted file mode 100644
index d0f5e8b5e6..0000000000
--- a/ext/tk/lib/tkextlib/blt/htext.rb
+++ /dev/null
@@ -1,113 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/blt/htext.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tk/itemconfig.rb'
-require 'tkextlib/blt.rb'
-
-module Tk::BLT
-  class Htext<TkWindow
-    Htext_Var = TkVarAccess.new_hash('htext')
-    Htext_Widget = TkVarAccess.new('htext(widget)', :window)
-    Htext_File = TkVarAccess.new('htext(file)')
-    Htext_Line = TkVarAccess.new('htext(line)')
-
-    include TkItemConfigMethod
-    include Scrollable
-
-    TkCommandNames = ['::blt::htext'.freeze].freeze
-    WidgetClassName = 'Htext'.freeze
-    WidgetClassNames[WidgetClassName] ||= self
-
-    alias window_cget_tkstring itemcget_tkstring
-    alias window_cget itemcget
-    alias window_cget_strict itemcget_strict
-    alias window_configure itemconfigure
-    alias window_configuinfo itemconfiginfo
-    alias current_window_configuinfo current_itemconfiginfo
-
-    def __strval_optkeys
-      super() << 'filename'
-    end
-  private :__strval_optkeys
-
-    def append(win, keys={})
-      tk_send('append', _epath(win), keys)
-      self
-    end
-
-    def goto_line(idx)
-      tk_send_without_enc('gotoline', idx)
-      self
-    end
-    def current_line
-      number(tk_send_without_enc('gotoline'))
-    end
-
-    def index(str)
-      number(tk_send('index', str))
-    end
-
-    def line_pos(str)
-      tk_send('linepos', str)
-    end
-
-    def range(from=None, to=None)
-      tk_send_without_enc('range', from, to)
-    end
-
-    def scan_mark(pos)
-      tk_send_without_enc('scan', 'mark', pos)
-      self
-    end
-
-    def scan_dragto(pos)
-      tk_send_without_enc('scan', 'dragto', pos)
-      self
-    end
-
-    def search(pat, from=None, to=None)
-      num = number(tk_send('search', pat, from, to))
-      (num < 0)? nil: num
-    end
-
-    def selection_adjust(index)
-      tk_send_without_enc('selection', 'adjust', index)
-      self
-    end
-    def selection_clear()
-      tk_send_without_enc('selection', 'clear')
-      self
-    end
-    def selection_from(index)
-      tk_send_without_enc('selection', 'from', index)
-      self
-    end
-    def selection_line(index)
-      tk_send_without_enc('selection', 'line', index)
-      self
-    end
-    def selection_present()
-      bool(tk_send_without_enc('selection', 'present'))
-    end
-    def selection_range(first, last)
-      tk_send_without_enc('selection', 'range', first, last)
-      self
-    end
-    def selection_to(index)
-      tk_send_without_enc('selection', 'to', index)
-      self
-    end
-    def selection_word(index)
-      tk_send_without_enc('selection', 'word', index)
-      self
-    end
-
-    def windows(pat=None)
-      list(tk_send('windows', pat))
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/blt/setup.rb b/ext/tk/lib/tkextlib/blt/setup.rb
deleted file mode 100644
index cc967dced6..0000000000
--- a/ext/tk/lib/tkextlib/blt/setup.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: false
-#
-#  setup.rb   --   setup script before calling TkPackage.require()
-#
-#    If you need some setup operations (for example, add a library path
-#    to the library search path) before using Tcl/Tk library packages
-#    wrapped by Ruby scripts in this directory, please write the setup
-#    operations in this file.
-#
diff --git a/ext/tk/lib/tkextlib/blt/spline.rb b/ext/tk/lib/tkextlib/blt/spline.rb
deleted file mode 100644
index 84d96a08f0..0000000000
--- a/ext/tk/lib/tkextlib/blt/spline.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/blt/spline.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/blt.rb'
-
-module Tk::BLT
-  module Spline
-    extend TkCore
-
-    TkCommandNames = ['::blt::spline'.freeze].freeze
-
-    def self.natural(x, y, sx, sy)
-      tk_call('::blt::spline', 'natural', x, y, sx, sy)
-    end
-
-    def self.quadratic(x, y, sx, sy)
-      tk_call('::blt::spline', 'quadratic', x, y, sx, sy)
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/blt/stripchart.rb b/ext/tk/lib/tkextlib/blt/stripchart.rb
deleted file mode 100644
index 332521ab0b..0000000000
--- a/ext/tk/lib/tkextlib/blt/stripchart.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/blt/stripchart.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/blt.rb'
-require 'tkextlib/blt/component.rb'
-
-module Tk::BLT
-  class Stripchart < TkWindow
-    TkCommandNames = ['::blt::stripchart'.freeze].freeze
-    WidgetClassName = 'Stripchart'.freeze
-    WidgetClassNames[WidgetClassName] ||= self
-
-    include PlotComponent
-    include GraphCommand
-
-    def __boolval_optkeys
-      ['bufferelements', 'buffergraph', 'invertxy']
-    end
-    private :__boolval_optkeys
-
-    def __strval_optkeys
-      ['text', 'label', 'title', 'file',
-        'background', 'plotbackground']
-    end
-    private :__strval_optkeys
-
-=begin
-    BarElement_ID = ['blt_stripchart_bar'.freeze, TkUtil.untrust('00000')].freeze
-
-    def bar(elem=nil, keys={})
-      if elem.kind_of?(Hash)
-        keys = elem
-        elem = nil
-      end
-      unless elem
-        elem = BarElement_ID.join(TkCore::INTERP._ip_id_).freeze
-        BarElement_ID[1].succ!
-      end
-      tk_send('bar', elem, keys)
-      Element.new(self, elem, :without_creating=>true)
-    end
-=end
-
-    def extents(item)
-      num_or_str(tk_send_without_enc('extents', item))
-    end
-
-    def invtransform(x, y)
-      list(tk_send_without_enc('invtransform', x, y))
-    end
-
-    def inside(x, y)
-      bool(tk_send_without_enc('inside', x, y))
-    end
-
-    def metafile(file=None)
-      # Windows only
-      tk_send('metafile', file)
-      self
-    end
-
-    def snap(output, keys={})
-      tk_send_without_enc('snap', *(hash_kv(keys, false) + output))
-      self
-    end
-
-    def transform(x, y)
-      list(tk_send_without_enc('transform', x, y))
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/blt/table.rb b/ext/tk/lib/tkextlib/blt/table.rb
deleted file mode 100644
index 39e345408d..0000000000
--- a/ext/tk/lib/tkextlib/blt/table.rb
+++ /dev/null
@@ -1,413 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/blt/table.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tk/itemconfig.rb'
-require 'tkextlib/blt.rb'
-
-module Tk::BLT
-  module Table
-    include Tk
-    extend Tk
-    extend TkItemConfigMethod
-
-    TkCommandNames = ['::blt::table'.freeze].freeze
-
-    module TableContainer
-      def blt_table_add(*args)
-        Tk::BLT::Table.add(self, *args)
-        self
-      end
-
-      def blt_table_arrange()
-        Tk::BLT::Table.arrange(self)
-        self
-      end
-
-      def blt_table_cget_tkstring(*args)
-        Tk::BLT::Table.cget_tkstring(self, *args)
-      end
-      def blt_table_cget(*args)
-        Tk::BLT::Table.cget(self, *args)
-      end
-      def blt_table_cget_strict(*args)
-        Tk::BLT::Table.cget_strict(self, *args)
-      end
-
-      def blt_table_configure(*args)
-        Tk::BLT::Table.configure(self, *args)
-        self
-      end
-
-      def blt_table_configinfo(*args)
-        Tk::BLT::Table.configinfo(self, *args)
-      end
-
-      def blt_table_current_configinfo(*args)
-        Tk::BLT::Table.current_configinfo(self, *args)
-      end
-
-      def blt_table_locate(x, y)
-        Tk::BLT::Table.locate(self, x, y)
-      end
-
-      def blt_table_delete(*args)
-        Tk::BLT::Table.delete(self, *args)
-        self
-      end
-
-      def blt_table_extents(item)
-        Tk::BLT::Table.extents(self, item)
-      end
-
-      def blt_table_insert(*args)
-        Tk::BLT::Table.insert(self, *args)
-        self
-      end
-
-      def blt_table_insert_before(*args)
-        Tk::BLT::Table.insert_before(self, *args)
-        self
-      end
-
-      def blt_table_insert_after(*args)
-        Tk::BLT::Table.insert_after(self, *args)
-        self
-      end
-
-      def blt_table_join(first, last)
-        Tk::BLT::Table.join(self, first, last)
-        self
-      end
-
-      def blt_table_save()
-        Tk::BLT::Table.save(self)
-      end
-
-      def blt_table_search(*args)
-        Tk::BLT::Table.search(self, *args)
-      end
-
-      def blt_table_split(*args)
-        Tk::BLT::Table.split(self, *args)
-        self
-      end
-
-      def blt_table_itemcget_tkstring(*args)
-        Tk::BLT::Table.itemcget_tkstring(self, *args)
-      end
-      def blt_table_itemcget(*args)
-        Tk::BLT::Table.itemcget(self, *args)
-      end
-      def blt_table_itemcget_strict(*args)
-        Tk::BLT::Table.itemcget_strict(self, *args)
-      end
-
-      def blt_table_itemconfigure(*args)
-        Tk::BLT::Table.itemconfigure(self, *args)
-        self
-      end
-
-      def blt_table_itemconfiginfo(*args)
-        Tk::BLT::Table.itemconfiginfo(self, *args)
-      end
-
-      def blt_table_current_itemconfiginfo(*args)
-        Tk::BLT::Table.current_itemconfiginfo(self, *args)
-      end
-
-      def blt_table_iteminfo(item)
-        Tk::BLT::Table.iteminfo(self, item)
-      end
-    end
-  end
-end
-
-
-############################################
-class << Tk::BLT::Table
-  def __item_cget_cmd(id) # id := [ container, item ]
-    win = (id[0].kind_of?(TkWindow))? id[0].path: id[0].to_s
-    ['::blt::table', 'cget', win, id[1]]
-  end
-  private :__item_cget_cmd
-
-  def __item_config_cmd(id) # id := [ container, item, ... ]
-    container, *items = id
-    win = (container.kind_of?(TkWindow))? container.path: container.to_s
-    ['::blt::table', 'configure', win, *items]
-  end
-  private :__item_config_cmd
-
-  def __item_pathname(id)
-    win = (id[0].kind_of?(TkWindow))? id[0].path: id[0].to_s
-    win + ';'
-  end
-  private :__item_pathname
-
-  alias __itemcget_tkstring itemcget_tkstring
-  alias __itemcget itemcget
-  alias __itemcget_strict itemcget_strict
-  alias __itemconfigure itemconfigure
-  alias __itemconfiginfo itemconfiginfo
-  alias __current_itemconfiginfo current_itemconfiginfo
-
-  private :__itemcget_tkstring, :__itemcget, :__itemcget_strict
-  private :__itemconfigure, :__itemconfiginfo, :__current_itemconfiginfo
-
-  def __boolval_optkeys
-    super() << 'propagate'
-  end
-  private :__boolval_optkeys
-
-  def tagid(tag)
-    if tag.kind_of?(Array)
-      case tag[0]
-      when Integer
-        # [row, col]
-        tag.join(',')
-      when :c, :C, 'c', 'C', :r, :R, 'r', 'R'
-        # c0 or r1 or C*, and so on
-        tag.collect{|elem| elem.to_s}.join('')
-      else
-        tag
-      end
-    elsif tag.kind_of?(TkWindow)
-      _epath(tag)
-    else
-      tag
-    end
-  end
-
-  def tagid2obj(tagid)
-    tagid
-  end
-
-  ############################################
-
-  def cget_tkstring(container, option)
-    __itemcget_tkstring([container], option)
-  end
-  def cget(container, option)
-    __itemcget([container], option)
-  end
-  def cget_strict(container, option)
-    __itemcget_strict([container], option)
-  end
-
-  def configure(container, *args)
-    __itemconfigure([container], *args)
-  end
-
-  def configinfo(container, *args)
-    __itemconfiginfo([container], *args)
-  end
-
-  def current_configinfo(container, *args)
-    __current_itemconfiginfo([container], *args)
-  end
-
-  def itemcget_tkstring(container, item, option)
-    __itemcget_tkstring([container, tagid(item)], option)
-  end
-  def itemcget(container, item, option)
-    __itemcget([container, tagid(item)], option)
-  end
-  def itemcget_strict(container, item, option)
-    __itemcget_strict([container, tagid(item)], option)
-  end
-
-  def itemconfigure(container, *args)
-    if args[-1].kind_of?(Hash)
-      # container, item, item, ... , hash_optkeys
-      keys = args.pop
-      fail ArgumentError, 'no item is given' if args.empty?
-      id = [container]
-      args.each{|item| id << tagid(item)}
-      __itemconfigure(id, keys)
-    else
-      # container, item, item, ... , option, value
-      val = args.pop
-      opt = args.pop
-      fail ArgumentError, 'no item is given' if args.empty?
-      id = [container]
-      args.each{|item| id << tagid(item)}
-      __itemconfigure(id, opt, val)
-    end
-    container
-  end
-
-  def itemconfiginfo(container, *args)
-    slot = args[-1]
-    if slot.kind_of?(String) || slot.kind_of?(Symbol)
-      slot = slot.to_s
-      if slot[0] == ?. || slot =~ /^\d+,\d+$/ || slot =~ /^(c|C|r|R)(\*|\d+)/
-        #   widget     ||    row,col          ||    Ci or Ri
-        slot = nil
-      else
-        # option
-        slot = args.pop
-      end
-    else
-      slot = nil
-    end
-
-    fail ArgumentError, 'no item is given' if args.empty?
-
-    id = [container]
-    args.each{|item| id << tagid(item)}
-    __itemconfiginfo(id, slot)
-  end
-
-  def current_itemconfiginfo(container, *args)
-    slot = args[-1]
-    if slot.kind_of?(String) || slot.kind_of?(Symbol)
-      slot = slot.to_s
-      if slot[0] == ?. || slot =~ /^\d+,\d+$/ || slot =~ /^(c|C|r|R)(\*|\d+)/
-        #   widget     ||    row,col          ||    Ci or Ri
-        slot = nil
-      else
-        # option
-        slot = args.pop
-      end
-    else
-      slot = nil
-    end
-
-    fail ArgumentError, 'no item is given' if args.empty?
-
-    id = [container]
-    args.each{|item| id << tagid(item)}
-    __current_itemconfiginfo(id, slot)
-  end
-
-  def info(container)
-    ret = {}
-    inf = list(tk_call('::blt::table', 'info', container))
-    until inf.empty?
-      opt = inf.slice!(0..1)
-      ret[opt[1..-1]] = opt[1]
-    end
-    ret
-  end
-
-  def iteminfo(container, item)
-    inf = list(tk_call('::blt::table', 'info', container, tagid(item)).chomp)
-
-    ret = []
-    until inf.empty? || (inf[0].kind_of?(String) && inf[0] =~ /^-/)
-      ret << inf.shift
-    end
-
-    if inf.length > 1
-      keys = {}
-      while inf.length > 1
-        opt = inf.slice!(0..1)
-        keys[opt[0][1..-1]] = opt[1]
-      end
-      ret << keys
-    end
-
-    ret
-  end
-
-  ############################################
-
-  def create_container(container)
-    tk_call('::blt::table', container)
-    begin
-      class << container
-        include Tk::BLT::Table::TableContainer
-      end
-    rescue
-      warn('fail to include TableContainer methods (frozen object?)')
-    end
-    container
-  end
-
-  def add(container, *args)
-    if args.empty?
-      tk_call('::blt::table', container)
-    else
-      args = args.collect{|arg|
-        if arg.kind_of?(TkWindow)
-          _epath(arg)
-        elsif arg.kind_of?(Array)  # index
-          arg.join(',')
-        else
-          arg
-        end
-      }
-      tk_call('::blt::table', container, *args)
-    end
-    container
-  end
-
-  def arrange(container)
-    tk_call('::blt::table', 'arrange', container)
-    container
-  end
-
-  def delete(container, *args)
-    tk_call('::blt::table', 'delete', container, *args)
-  end
-
-  def extents(container, item)
-    ret = []
-    inf = list(tk_call('::blt::table', 'extents', container, item))
-    ret << inf.slice!(0..4) until inf.empty?
-    ret
-  end
-
-  def forget(*wins)
-    wins = wins.collect{|win| _epath(win)}
-    tk_call('::blt::table', 'forget', *wins)
-  end
-
-  def insert(container, *args)
-    tk_call('::blt::table', 'insert', container, *args)
-  end
-
-  def insert_before(container, *args)
-    tk_call('::blt::table', 'insert', container, '-before', *args)
-  end
-
-  def insert_after(container, *args)
-    tk_call('::blt::table', 'insert', container, '-after', *args)
-  end
-
-  def join(container, first, last)
-    tk_call('::blt::table', 'join', container, first, last)
-  end
-
-  def locate(container, x, y)
-    tk_call('::blt::table', 'locate', container, x, y)
-  end
-
-  def containers(arg={})
-    list(tk_call('::blt::table', 'containers', *hash_kv(arg)))
-  end
-
-  def containers_pattern(pat)
-    list(tk_call('::blt::table', 'containers', '-pattern', pat))
-  end
-
-  def containers_slave(win)
-    list(tk_call('::blt::table', 'containers', '-slave', win))
-  end
-
-  def save(container)
-    tk_call('::blt::table', 'save', container)
-  end
-
-  def search(container, keys={})
-    list(tk_call('::blt::table', 'containers', *hash_kv(keys)))
-  end
-
-  def split(container, *args)
-    tk_call('::blt::table', 'split', container, *args)
-  end
-end
diff --git a/ext/tk/lib/tkextlib/blt/tabnotebook.rb b/ext/tk/lib/tkextlib/blt/tabnotebook.rb
deleted file mode 100644
index f08f198163..0000000000
--- a/ext/tk/lib/tkextlib/blt/tabnotebook.rb
+++ /dev/null
@@ -1,111 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/blt/tabnotebook.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/blt.rb'
-require 'tkextlib/blt/tabset.rb'
-
-module Tk::BLT
-  class Tabnotebook < Tabset
-    TkCommandNames = ['::blt::tabnotebook'.freeze].freeze
-    WidgetClassName = 'Tabnotebook'.freeze
-    WidgetClassNames[WidgetClassName] ||= self
-
-    class Tab < Tk::BLT::Tabset::Tab
-      def self.new(parent, pos=nil, name=nil, keys={})
-        if pos.kind_of?(Hash)
-          keys = pos
-          name = nil
-          pos  = nil
-        end
-        if name.kind_of?(Hash)
-          keys = name
-          name = nil
-        end
-        obj = nil
-        TabID_TBL.mutex.synchronize{
-          if name && TabID_TBL[parent.path] && TabID_TBL[parent.path][name]
-            obj = TabID_TBL[parent.path][name]
-            if pos
-              if pos.to_s == 'end'
-                obj.move_after('end')
-              else
-                obj.move_before(pos)
-              end
-            end
-            obj.configure if keys && ! keys.empty?
-          else
-            (obj = self.allocate).instance_eval{
-              initialize(parent, pos, name, keys)
-              TabID_TBL[@tpath] = {} unless TabID_TBL[@tpath]
-              TabID_TBL[@tpath][@id] = self
-            }
-          end
-        }
-        obj
-      end
-
-      def initialize(parent, pos, name, keys)
-        @t = parent
-        @tpath = parent.path
-        if name
-          @path = @id = name
-          unless (list(tk_call(@tpath, 'tab', 'names', @id)).empty?)
-            if pos
-              idx = tk_call(@tpath, 'index', @id)
-              if pos.to_s == 'end'
-                tk_call(@tpath, 'move', idx, 'after', 'end')
-              else
-                tk_call(@tpath, 'move', idx, 'before', pos)
-              end
-            end
-            tk_call(@tpath, 'tab', 'configure', @id, keys)
-          else
-            fail ArgumentError, "can't find tab \"#{@id}\" in #{@t}"
-          end
-        else
-          pos = 'end' unless pos
-          @path = @id = tk_call(@tpath, 'insert', pos, keys)
-        end
-      end
-    end
-
-    #######################################
-
-    def get_tab(index)
-      if (idx = tk_send_without_enc('id', tagindex(index))).empty?
-        nil
-      else
-        Tk::BLT::Tabset::Tab.id2obj(self, idx)
-      end
-    end
-    alias get_id get_tab
-
-    def get_tabobj(index)
-      if (idx = tk_send_without_enc('id', tagindex(index))).empty?
-        nil
-      else
-        Tk::BLT::Tabnotebook::Tab.new(self, nil, idx)
-      end
-    end
-
-    alias index_name index
-
-    def insert(pos=nil, keys={})
-      if pos.kind_of?(Hash)
-        keys = pos
-        pos = nil
-      end
-      pos = 'end' if pos.nil?
-      Tk::BLT::Tabnotebook::Tab.new(self, nil,
-                                    tk_send('insert', tagindex(pos), keys))
-
-    end
-    undef :insert_tabs
-
-    undef :tab_pageheight, :tab_pagewidth
-  end
-end
diff --git a/ext/tk/lib/tkextlib/blt/tabset.rb b/ext/tk/lib/tkextlib/blt/tabset.rb
deleted file mode 100644
index 022d9784e9..0000000000
--- a/ext/tk/lib/tkextlib/blt/tabset.rb
+++ /dev/null
@@ -1,505 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/blt/tabset.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/blt.rb'
-
-module Tk::BLT
-  class Tabset < TkWindow
-    class Tab < TkObject
-      include TkTreatItemFont
-
-      TabID_TBL = TkCore::INTERP.create_table
-
-      (TabsetTab_ID = ['blt_tabset_tab'.freeze, TkUtil.untrust('00000')]).instance_eval{
-        @mutex = Mutex.new
-        def mutex; @mutex; end
-        freeze
-      }
-
-      TkCore::INTERP.init_ip_env{
-        TabID_TBL.mutex.synchronize{ TabID_TBL.clear }
-      }
-
-      def self.id2obj(tabset, id)
-        tpath = tabset.path
-        TabID_TBL.mutex.synchronize{
-          if TabID_TBL[tpath]
-            TabID_TBL[tpath][id]? TabID_TBL[tpath][id]: id
-          else
-            id
-          end
-        }
-      end
-
-      def self.new(parent, pos=nil, name=nil, keys={})
-        if pos.kind_of?(Hash)
-          keys = pos
-          name = nil
-          pos  = nil
-        end
-        if name.kind_of?(Hash)
-          keys = name
-          name = nil
-        end
-        obj = nil
-        TabID_TBL.mutex.synchronize{
-          if name && TabID_TBL[parent.path] && TabID_TBL[parent.path][name]
-            obj = TabID_TBL[parent.path][name]
-            if pos
-              if pos.to_s == 'end'
-                obj.move_after('end')
-              else
-                obj.move_before(pos)
-              end
-            end
-            obj.configure if keys && ! keys.empty?
-          else
-            (obj = self.allocate).instance_eval{
-              initialize(parent, pos, name, keys)
-              TabID_TBL[@tpath] = {} unless TabID_TBL[@tpath]
-              TabID_TBL[@tpath][@id] = self
-            }
-          end
-        }
-        obj
-      end
-
-      def initialize(parent, pos, name, keys)
-        @t = parent
-        @tpath = parent.path
-        if name
-          @path = @id = name
-          unless (list(tk_call(@tpath, 'tab', 'names', @id)).empty?)
-            if pos
-              idx = tk_call(@tpath, 'index', '-name', @id)
-              if pos.to_s == 'end'
-                tk_call(@tpath, 'move', idx, 'after', 'end')
-              else
-                tk_call(@tpath, 'move', idx, 'before', pos)
-              end
-            end
-            tk_call(@tpath, 'tab', 'configure', @id, keys)
-          else
-            pos = 'end' unless pos
-            tk_call(@tpath, 'insert', pos, @id, keys)
-          end
-        else
-          pos = 'end' unless pos
-          TabsetTab_ID.mutex.synchronize{
-            @path = @id = TabsetTab_ID.join(TkCore::INTERP._ip_id_)
-            TabsetTab_ID[1].succ!
-          }
-          tk_call(@tpath, 'insert', pos, @id, keys)
-        end
-      end
-
-      #def bind(context, cmd=Proc.new, *args)
-      #  @t.tab_bind(@id, context, cmd, *args)
-      #  self
-      #end
-      def bind(context, *args)
-        # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-        if TkComm._callback_entry?(args[0]) || !block_given?
-          cmd = args.shift
-        else
-          cmd = Proc.new
-        end
-        @t.tab_bind(@id, context, cmd, *args)
-        self
-      end
-      #def bind_append(context, cmd=Proc.new, *args)
-      #  @t.tab_bind_append(@id, context, cmd, *args)
-      #  self
-      #end
-      def bind_append(context, *args)
-        # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-        if TkComm._callback_entry?(args[0]) || !block_given?
-          cmd = args.shift
-        else
-          cmd = Proc.new
-        end
-        @t.tab_bind_append(@id, context, cmd, *args)
-        self
-      end
-      def bind_remove(context)
-        @t.tab_bind_remove(@id, context)
-        self
-      end
-      def bindinfo(context=nil)
-        @t.tab_bindinfo(@id, context)
-      end
-
-      def cget_tkstring(*args)
-        @t.tab_cget_tkstring(@id, *args)
-      end
-      def cget(*args)
-        @t.tab_cget(@id, *args)
-      end
-      def cget_strict(*args)
-        @t.tab_cget_strict(@id, *args)
-      end
-      def configure(*args)
-        @t.tab_configure(@id, *args)
-      end
-      def configinfo(*args)
-        @t.tab_configinfo(@id, *args)
-      end
-      def current_configinfo(*args)
-        @t.current_tab_configinfo(@id, *args)
-      end
-
-      def delete()
-        @t.delete(@id)
-        TabID_TBL.mutex.synchronize{
-          TabID_TBL[@tpath].delete(@id)
-        }
-        self
-      end
-
-      def get_name()
-        @id.dup
-      end
-
-      def focus()
-        @t.focus(self.index)
-      end
-
-      def index()
-        @t.index_name(@id)
-      end
-
-      def invoke()
-        @t.invoke(self.index)
-      end
-
-      def move_before(idx)
-        @t.move_before(self.index, idx)
-      end
-      def move_after(idx)
-        @t.move_after(self.index, idx)
-      end
-
-      def perforation_highlight(mode)
-        @t.perforation_highlight(self.index, mode)
-      end
-      def perforation_invoke()
-        @t.perforation_invoke(self.index)
-      end
-
-      def see()
-        @t.see(self.index)
-      end
-
-      def tearoff(name=None)
-        @t.tab_tearoff(self.index, *args)
-      end
-    end
-
-    ########################################
-
-    class NamedTab < Tab
-      def self.new(parent, name)
-        super(parent, nil, name, {})
-      end
-    end
-
-    ########################################
-
-    include X_Scrollable
-    include TkItemConfigMethod
-
-    TkCommandNames = ['::blt::tabset'.freeze].freeze
-    WidgetClassName = 'Tabset'.freeze
-    WidgetClassNames[WidgetClassName] ||= self
-
-    def __destroy_hook__
-      Tk::BLT::Tabset::Tab::TabID_TBL.mutex.synchronize{
-        Tk::BLT::Tabset::Tab::TabID_TBL.delete(@path)
-      }
-    end
-
-    ########################################
-
-    def __boolval_optkeys
-      super() << 'samewidth' << 'tearoff'
-    end
-    private :__strval_optkeys
-
-    def __strval_optkeys
-      super() << 'tabbackground' << 'tabforeground'
-    end
-    private :__strval_optkeys
-
-    def __item_cget_cmd(id)
-      [self.path, 'tab', 'cget', id]
-    end
-    private :__item_cget_cmd
-
-    def __item_config_cmd(id)
-      [self.path, 'tab', 'configure', id]
-    end
-    private :__item_config_cmd
-
-    def __item_pathname(tagOrId)
-      if tagOrId.kind_of?(Tk::BLT::Tabset::Tab)
-        self.path + ';' + tagOrId.id.to_s
-      else
-        self.path + ';' + tagOrId.to_s
-      end
-    end
-    private :__item_pathname
-
-    alias tab_cget_tkstring itemcget_tkstring
-    alias tab_cget itemcget
-    alias tab_cget_strict itemcget_strict
-    alias tab_configure itemconfigure
-    alias tab_configinfo itemconfiginfo
-    alias current_tab_configinfo current_itemconfiginfo
-
-    def __item_strval_optkeys(id)
-      super(id) << 'shadow'
-    end
-    private :__item_strval_optkeys
-
-    def tagid(tab)
-      if tab.kind_of?(Tk::BLT::Tabset::Tab)
-        tab.id
-      else
-        tab
-      end
-    end
-
-    def tagindex(tab)
-      if tab.kind_of?(Tk::BLT::Tabset::Tab)
-        tab.index
-      else
-        tab
-      end
-    end
-
-    ########################################
-
-    def activate(index)
-      tk_send('activate', tagindex(index))
-      self
-    end
-    alias highlight activate
-
-    #def tabbind(tag, context, cmd=Proc.new, *args)
-    #  _bind([path, "bind", tagid(tag)], context, cmd, *args)
-    #  self
-    #end
-    def tabbind(tag, context, *args)
-      # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-      if TkComm._callback_entry?(args[0]) || !block_given?
-        cmd = args.shift
-      else
-        cmd = Proc.new
-      end
-      _bind([path, "bind", tagid(tag)], context, cmd, *args)
-      self
-    end
-    #def tabbind_append(tag, context, cmd=Proc.new, *args)
-    #  _bind_append([path, "bind", tagid(tag)], context, cmd, *args)
-    #  self
-    #end
-    def tabbind_append(tag, context, *args)
-      # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-      if TkComm._callback_entry?(args[0]) || !block_given?
-        cmd = args.shift
-      else
-        cmd = Proc.new
-      end
-      _bind_append([path, "bind", tagid(tag)], context, cmd, *args)
-      self
-    end
-    def tabbind_remove(tag, context)
-      _bind_remove([path, "bind", tagid(tag)], context)
-      self
-    end
-    def tabbindinfo(tag, context=nil)
-      _bindinfo([path, "bind", tagid(tag)], context)
-    end
-
-    def delete(first, last=None)
-      tk_send('delete', tagindex(first), tagindex(last))
-      if first.kind_of?(Tk::BLT::Tabset::Tab)
-        TabID_TBL.mutex.synchronize{
-          TabID_TBL[@path].delete(first.id)
-        }
-      end
-      # middle tabs of the range are unknown
-      if last.kind_of?(Tk::BLT::Tabset::Tab)
-        TabID_TBL.mutex.synchronize{
-          TabID_TBL[@path].delete(last.id)
-        }
-      end
-      self
-    end
-
-    def focus(index)
-      tk_send('focus', tagindex(index))
-      self
-    end
-
-    def get_tab(index)
-      if (idx = tk_send_without_enc('get', tagindex(index))).empty?
-        nil
-      else
-        Tk::BLT::Tabset::Tab.id2obj(self, idx)
-      end
-    end
-    def get_tabobj(index)
-      if (idx = tk_send_without_enc('get', tagindex(index))).empty?
-        nil
-      else
-       Tk::BLT::Tabset::Tab.new(self, nil, name, {})
-      end
-    end
-
-    def index(str)
-      num_or_str(tk_send('index', str))
-    end
-    def index_name(tab)
-      num_or_str(tk_send('index', '-name', tagid(tab)))
-    end
-
-    def insert(pos, tab, keys={})
-      pos = 'end' if pos.nil?
-      Tk::BLT::Tabset::Tab.new(self, tagindex(pos), tagid(tab), keys)
-    end
-    def insert_tabs(pos, *tabs)
-      pos = 'end' if pos.nil?
-      if tabs[-1].kind_of?(Hash)
-        keys = tabs.pop
-      else
-        keys = {}
-      end
-      fail ArgumentError, 'no tabs is given' if tabs.empty?
-      tabs.map!{|tab| tagid(tab)}
-      tk_send('insert', tagindex(pos), *(tabs + [keys]))
-      tabs.collect{|tab| Tk::BLT::Tabset::Tab.new(self, nil, tagid(tab))}
-    end
-
-    def invoke(index)
-      tk_send('invoke', tagindex(index))
-    end
-
-    def move_before(index, base_idx)
-      tk_send('move', tagindex(index), 'before', tagindex(base_idx))
-      self
-    end
-    def move_after(index, base_idx)
-      tk_send('move', tagindex(index), 'after', tagindex(base_idx))
-      self
-    end
-
-    def nearest(x, y)
-      Tk::BLT::Tabset::Tab.id2obj(self, num_or_str(tk_send_without_enc('nearest', x, y)))
-    end
-
-    def perforation_activate(mode)
-      tk_send('perforation', 'activate', mode)
-      self
-    end
-    def perforation_highlight(index, *args)
-      if args.empty?
-        # index --> mode
-        tk_send('perforation', 'highlight', index)
-      elsif args.size == 1
-        # args[0] --> mode
-        tk_send('perforation', 'highlight', tagindex(index), args[0])
-      else # Error: call to get Tcl's error message
-        tk_send('perforation', 'highlight', tagindex(index), *args)
-      end
-      self
-    end
-    def perforation_invoke(index=nil)
-      if index
-        tk_send('perforation', 'invoke', tagindex(index))
-      else
-        tk_send('perforation', 'invoke')
-      end
-    end
-
-    def scan_mark(x, y)
-      tk_send_without_enc('scan', 'mark', x, y)
-      self
-    end
-    def scan_dragto(x, y)
-      tk_send_without_enc('scan', 'dragto', x, y)
-      self
-    end
-
-    def see(index)
-      tk_send('see', tagindex(index))
-      self
-    end
-
-    def size()
-      number(tk_send_without_enc('size'))
-    end
-
-    def select(index)
-      tk_send('select', tagindex(index))
-      self
-    end
-
-    def tab_dockall
-      tk_send('tab', 'dockall')
-      self
-    end
-
-    def tab_names(pat=None)
-      simplelist(tk_send('tab', 'names', pat)).collect{|name|
-        Tk::BLT::Tabset::Tab.id2obj(self, name)
-      }
-    end
-
-    def tab_objs(pat=None)
-      simplelist(tk_send('tab', 'names', pat)).collect{|name|
-        Tk::BLT::Tabset::Tab.new(self, nil, name, {})
-      }
-    end
-
-    def tab_ids(pat=None)
-      simplelist(tk_send('tab', 'names', pat))
-    end
-
-    def tab_pageheight
-      number(tk_send('tab', 'pageheight'))
-    end
-
-    def tab_pagewidth
-      number(tk_send('tab', 'pagewidth'))
-    end
-
-    def tab_tearoff(index, parent=None)
-      window(tk_send('tab', 'tearoff', tagindex(index), parent))
-    end
-
-    def xscrollcommand(cmd=Proc.new)
-      configure_cmd 'scrollcommand', cmd
-      self
-    end
-    alias scrollcommand xscrollcommand
-
-    def xview(*index)
-      if index.empty?
-        list(tk_send_without_enc('view'))
-      else
-        tk_send_without_enc('view', *index)
-        self
-      end
-    end
-    alias view xview
-    alias view_moveto xview_moveto
-    alias view_scroll xview_scroll
-
-    alias scrollbar xscrollbar
-  end
-end
diff --git a/ext/tk/lib/tkextlib/blt/ted.rb b/ext/tk/lib/tkextlib/blt/ted.rb
deleted file mode 100644
index 7e81eab27d..0000000000
--- a/ext/tk/lib/tkextlib/blt/ted.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/blt/ted.rb
-#
-#    *** This is alpha version, because there is no document on BLT. ***
-#
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/blt.rb'
-
-module Tk::BLT
-  module Ted
-    extend TkCore
-
-    TkCommandNames = ['::blt::ted'.freeze].freeze
-
-    ##############################
-
-    extend TkItemConfigMethod
-
-    class << self
-      def __item_cget_cmd(id)
-        ['::blt::ted', 'cget', id]
-      end
-      private :__item_cget_cmd
-
-      def __item_config_cmd(id)
-        ['::blt::ted', 'configure', id]
-      end
-      private :__item_config_cmd
-
-      private :itemcget_tkstring, :itemcget, :itemcget_strict
-      private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
-
-      def cget_tkstring(master, option)
-        itemcget_tkstring(master, option)
-      end
-      def cget(master, option)
-        itemcget(master, option)
-      end
-      def cget_strict(master, option)
-        itemcget_strict(master, option)
-      end
-      def configure(master, slot, value=None)
-        itemconfigure(master, slot, value)
-      end
-      def configinfo(master, slot=nil)
-        itemconfiginfo(master, slot)
-      end
-      def current_configinfo(master, slot=nil)
-        current_itemconfiginfo(master, slot)
-      end
-    end
-
-    ##############################
-
-    def self.edit(master, *args)
-      tk_call('::blt::ted', 'edit', master, *args)
-    end
-    def self.rep(master, *args)
-      tk_call('::blt::ted', 'rep', master, *args)
-    end
-    def self.select(master, *args)
-      tk_call('::blt::ted', 'select', master, *args)
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/blt/tile.rb b/ext/tk/lib/tkextlib/blt/tile.rb
deleted file mode 100644
index f52a5d3944..0000000000
--- a/ext/tk/lib/tkextlib/blt/tile.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/blt/tile.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/blt.rb'
-
-module Tk::BLT
-  module Tile
-    TkComm::TkExtlibAutoloadModule.unshift(self)
-    # Require autoload-symbols which is a same name as widget classname.
-    # Those are used at  TkComm._genobj_for_tkwidget method.
-
-    autoload :Button,      'tkextlib/blt/tile/button.rb'
-    autoload :CheckButton, 'tkextlib/blt/tile/checkbutton.rb'
-    autoload :Checkbutton, 'tkextlib/blt/tile/checkbutton.rb'
-    autoload :Radiobutton, 'tkextlib/blt/tile/radiobutton.rb'
-    autoload :RadioButton, 'tkextlib/blt/tile/radiobutton.rb'
-    autoload :Frame,       'tkextlib/blt/tile/frame.rb'
-    autoload :Label,       'tkextlib/blt/tile/label.rb'
-    autoload :Scrollbar,   'tkextlib/blt/tile/scrollbar.rb'
-    autoload :Toplevel,    'tkextlib/blt/tile/toplevel.rb'
-  end
-end
diff --git a/ext/tk/lib/tkextlib/blt/tile/button.rb b/ext/tk/lib/tkextlib/blt/tile/button.rb
deleted file mode 100644
index e3d819edb7..0000000000
--- a/ext/tk/lib/tkextlib/blt/tile/button.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/blt/tile/button.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tk/button'
-require 'tkextlib/blt/tile.rb'
-
-module Tk::BLT
-  module Tile
-    class Button < Tk::Button
-      TkCommandNames = ['::blt::tile::button'.freeze].freeze
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/blt/tile/checkbutton.rb b/ext/tk/lib/tkextlib/blt/tile/checkbutton.rb
deleted file mode 100644
index 0c8c7f9774..0000000000
--- a/ext/tk/lib/tkextlib/blt/tile/checkbutton.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/blt/tile/checkbutton.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tk/checkbutton'
-require 'tkextlib/blt/tile.rb'
-
-module Tk::BLT
-  module Tile
-    class CheckButton < Tk::CheckButton
-      TkCommandNames = ['::blt::tile::checkbutton'.freeze].freeze
-    end
-    Checkbutton = CheckButton
-  end
-end
diff --git a/ext/tk/lib/tkextlib/blt/tile/frame.rb b/ext/tk/lib/tkextlib/blt/tile/frame.rb
deleted file mode 100644
index 8d979fe485..0000000000
--- a/ext/tk/lib/tkextlib/blt/tile/frame.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/blt/tile/frame.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tk/frame'
-require 'tkextlib/blt/tile.rb'
-
-module Tk::BLT
-  module Tile
-    class Frame < Tk::Frame
-      TkCommandNames = ['::blt::tile::frame'.freeze].freeze
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/blt/tile/label.rb b/ext/tk/lib/tkextlib/blt/tile/label.rb
deleted file mode 100644
index f58450d902..0000000000
--- a/ext/tk/lib/tkextlib/blt/tile/label.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/blt/tile/label.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tk/label'
-require 'tkextlib/blt/tile.rb'
-
-module Tk::BLT
-  module Tile
-    class Label < Tk::Label
-      TkCommandNames = ['::blt::tile::label'.freeze].freeze
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/blt/tile/radiobutton.rb b/ext/tk/lib/tkextlib/blt/tile/radiobutton.rb
deleted file mode 100644
index ee449c75b0..0000000000
--- a/ext/tk/lib/tkextlib/blt/tile/radiobutton.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/blt/tile/radiobutton.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tk/radiobutton'
-require 'tkextlib/blt/tile.rb'
-
-module Tk::BLT
-  module Tile
-    class RadioButton < Tk::RadioButton
-      TkCommandNames = ['::blt::tile::radiobutton'.freeze].freeze
-    end
-    Radiobutton = RadioButton
-  end
-end
diff --git a/ext/tk/lib/tkextlib/blt/tile/scrollbar.rb b/ext/tk/lib/tkextlib/blt/tile/scrollbar.rb
deleted file mode 100644
index 35d878d5aa..0000000000
--- a/ext/tk/lib/tkextlib/blt/tile/scrollbar.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/blt/tile/scrollbar.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tk/scrollbar'
-require 'tkextlib/blt/tile.rb'
-
-module Tk::BLT
-  module Tile
-    class Scrollbar < Tk::Scrollbar
-      TkCommandNames = ['::blt::tile::scrollbar'.freeze].freeze
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/blt/tile/toplevel.rb b/ext/tk/lib/tkextlib/blt/tile/toplevel.rb
deleted file mode 100644
index e30b8b37b5..0000000000
--- a/ext/tk/lib/tkextlib/blt/tile/toplevel.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/blt/tile/toplevel.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tk/toplevel'
-require 'tkextlib/blt/tile.rb'
-
-module Tk::BLT
-  module Tile
-    class Toplevel < Tk::Toplevel
-      TkCommandNames = ['::blt::tile::toplevel'.freeze].freeze
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/blt/tree.rb b/ext/tk/lib/tkextlib/blt/tree.rb
deleted file mode 100644
index ae235f68e8..0000000000
--- a/ext/tk/lib/tkextlib/blt/tree.rb
+++ /dev/null
@@ -1,1059 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/blt/tree.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/blt.rb'
-
-module Tk::BLT
-  class Tree < TkObject
-    TkCommandNames = ['::blt::tree'.freeze].freeze
-
-    ###################################
-
-    class Node < TkObject
-      TreeNodeID_TBL = TkCore::INTERP.create_table
-
-      TkCore::INTERP.init_ip_env{
-        TreeNodeID_TBL.mutex.synchronize{ TreeNodeID_TBL.clear }
-      }
-
-      def self.id2obj(tree, id)
-        tpath = tree.path
-        TreeNodeID_TBL.mutex.synchronize{
-          if TreeNodeID_TBL[tpath]
-            if TreeNodeID_TBL[tpath][id]
-              TreeNodeID_TBL[tpath][id]
-            else
-              begin
-                # self.new(tree, nil, 'node'=>Integer(id))
-                id = Integer(id)
-                if bool(tk_call(@tpath, 'exists', id))
-                  (obj = self.allocate).instance_eval{
-                    @parent = @tree = tree
-                    @tpath = tpath
-                    @path = @id = id
-                    TreeNodeID_TBL[@tpath] = {} unless TreeNodeID_TBL[@tpath]
-                    TreeNodeID_TBL[@tpath][@id] = self
-                  }
-                  obj
-                else
-                  id
-                end
-              rescue
-                id
-              end
-            end
-          else
-            id
-          end
-        }
-      end
-
-      def self.new(tree, parent, keys={})
-        keys = _symbolkey2str(keys)
-        tpath = tree.path
-
-        TreeNodeID_TBL.mutex.synchronize{
-          TreeNodeID_TBL[tpath] ||= {}
-          if (id = keys['node']) && (obj = TreeNodeID_TBL[tpath][id])
-            keys.delete('node')
-            tk_call(tree.path, 'move', id, parent, keys) if parent
-            return obj
-          end
-
-          (obj = self.allocate).instance_eval{
-            initialize(tree, parent, keys)
-            TreeNodeID_TBL[tpath][@id] = self
-          }
-          obj
-        }
-      end
-
-      def initialize(tree, parent, keys={})
-        @parent = @tree = tree
-        @tpath = @parent.path
-
-        if (id = keys['node']) && bool(tk_call(@tpath, 'exists', id))
-          @path = @id = id
-          keys.delete('node')
-          tk_call(@tpath, 'move', @id, parent, keys) if parent
-        else
-          parent = tk_call(@tpath, 'root') unless parent
-          @path = @id = tk_call(@tpath, 'insert', parent, keys)
-        end
-      end
-
-      def id
-        @id
-      end
-
-      def apply(keys={})
-        @tree.apply(@id, keys)
-        self
-      end
-
-      def children()
-        @tree.children(@id)
-      end
-
-      def copy(parent, keys={})
-        @tree.copy(@id, parent, keys)
-      end
-      def copy_to(dest_tree, parent, keys={})
-        @tree.copy_to(@id, dest_tree, parent, keys)
-      end
-
-      def degree()
-        @tree.degree(@id)
-      end
-
-      def delete()
-        @tree.delete(@id)
-        self
-      end
-
-      def depth()
-        @tree.depth(@id)
-      end
-
-      def dump()
-        @tree.dump(@id)
-      end
-
-      def dump_to_file(file)
-        @tree.dump_to_file(@id, file)
-        self
-      end
-
-      def exist?(keys={})
-        @tree.exist?(@id, keys)
-      end
-
-      def find(keys={})
-        @tree.find(@id, keys)
-      end
-
-      def find_child(label)
-        @tree.find_child(@id, label)
-      end
-
-      def first_child()
-        @tree.first_child(@id)
-      end
-
-      def get()
-        @tree.get(@id)
-      end
-      def get_value(key, default_val=None)
-        @tree.get_value(@id, key, default_val)
-      end
-
-      def index()
-        @tree.index(@id)
-      end
-
-      def leaf?()
-        @tree.leaf?(@id)
-      end
-      def link?()
-        @tree.link?(@id)
-      end
-      def root?()
-        @tree.root?(@id)
-      end
-
-      def keys()
-        @tree.keys(@id)
-      end
-
-      def label(text = nil)
-        @tree.label(@id, nil)
-      end
-      def label=(text)
-        @tree.label(@id, text)
-      end
-
-      def last_child()
-        @tree.last_child(@id)
-      end
-
-      def move(dest, keys={})
-        @tree.keys(@id, dest, keys)
-        self
-      end
-
-      def next()
-        @tree.next(@id)
-      end
-
-      def next_sibling()
-        @tree.next_sibling(@id)
-      end
-
-      def parent()
-        @tree.parent(@id)
-      end
-
-      def fullpath()
-        @tree.fullpath(@id)
-      end
-
-      def position()
-        @tree.position(@id)
-      end
-
-      def previous()
-        @tree.previous(@id)
-      end
-
-      def prev_sibling()
-        @tree.prev_sibling(@id)
-      end
-
-      def restore(str, keys={})
-        @tree.restore(@id, str, keys)
-        self
-      end
-      def restore_overwrite(str, keys={})
-        @tree.restore_overwrite(@id, str, keys)
-        self
-      end
-
-      def restore_from_file(file, keys={})
-        @tree.restore_from_file(@id, file, keys)
-        self
-      end
-      def restore_overwrite_from_file(file, keys={})
-        @tree.restore_overwrite_from_file(@id, file, keys)
-        self
-      end
-
-      def root()
-        @tree.root(@id)
-        self
-      end
-
-      def set(data)
-        @tree.set(@id, data)
-        self
-      end
-
-      def size()
-        @tree.size(@id)
-      end
-
-      def sort(keys={})
-        @tree.sort(@id, keys)
-        self
-      end
-
-      def type(key)
-        @tree.type(@id, key)
-      end
-
-      def unset(*keys)
-        @tree.unset(@id, *keys)
-        self
-      end
-
-      def values(key=None)
-        @tree.values(@id, key)
-      end
-    end
-
-    ###################################
-
-    class Tag < TkObject
-      TreeTagID_TBL = TkCore::INTERP.create_table
-
-      TkCore::INTERP.init_ip_env{
-        TreeTagID_TBL.mutex.synchronize{ TreeTagID_TBL.clear }
-      }
-
-      (TreeTag_ID = ['blt_tree_tag'.freeze, TkUtil.untrust('00000')]).instance_eval{
-        @mutex = Mutex.new
-        def mutex; @mutex; end
-        freeze
-      }
-
-      def self.id2obj(tree, id)
-        tpath = tree.path
-        TreeTagID_TBL.mutex.synchronize{
-          if TreeTagID_TBL[tpath]
-            if TreeTagID_TBL[tpath][id]
-              TreeTagID_TBL[tpath][id]
-            else
-              begin
-                # self.new(tree, id)
-                (obj = self.allocate).instance_eval{
-                  @parent = @tree = tree
-                  @tpath = @parent.path
-                  @path = @id = id.dup.freeze if id
-                  TreeTagID_TBL[@tpath] = {} unless TreeTagID_TBL[@tpath]
-                  TreeTagID_TBL[@tpath][@id] = self
-                }
-                obj
-              rescue
-                id
-              end
-            end
-          else
-            id
-          end
-        }
-      end
-
-      def initialize(tree, tag_str = nil)
-        @parent = @tree = tree
-        @tpath = @parent.path
-
-        if tag_str
-          @path = @id = tag_str.dup.freeze
-        else
-          TreeTag_ID.mutex.synchronize{
-            @path = @id = TreeTag_ID.join(TkCore::INTERP._ip_id_)
-            TreeTag_ID[1].succ!
-          }
-        end
-        TreeTagID_TBL.mutex.synchronize{
-          TreeTagID_TBL[@tpath] = {} unless TreeTagID_TBL[@tpath]
-          TreeTagID_TBL[@tpath][@id] = self
-        }
-      end
-
-      def id
-        @id
-      end
-
-      def add(*nodes)
-        tk_call(@tpath, 'tag', 'add', @id, *nodes)
-        self
-      end
-
-      def delete(*nodes)
-        tk_call(@tpath, 'tag', 'delete', @id, *nodes)
-        self
-      end
-
-      def forget()
-        tk_call(@tpath, 'tag', 'forget', @id)
-        TreeTagID_TBL.mutex.synchronize{
-          TreeTagID_TBL[@tpath].delete(@id)
-        }
-        self
-      end
-
-      def nodes()
-        simplelist(tk_call(@tpath, 'tag', 'nodes', @id)).collect{|node|
-          Tk::BLT::Tree::Node.id2obj(@path, node)
-        }
-      end
-
-      def set(node)
-        tk_call(@tpath, 'tag', 'set', node, @id)
-        self
-      end
-
-      def unset(node)
-        tk_call(@tpath, 'tag', 'unset', node, @id)
-        self
-      end
-    end
-
-    ###################################
-
-    class Notify < TkObject
-      NotifyID_TBL = TkCore::INTERP.create_table
-
-      TkCore::INTERP.init_ip_env{
-        NotifyID_TBL.mutex.synchronize{ NotifyID_TBL.clear }
-      }
-
-      def self.id2obj(tree, id)
-        tpath = tree.path
-        NotifyID_TBL.mutex.synchronize{
-          if NotifyID_TBL[tpath]
-            if NotifyID_TBL[tpath][id]
-              NotifyID_TBL[tpath][id]
-            else
-              (obj = self.allocate).instance_eval{
-                @parent = @tree = tree
-                @tpath = @parent.path
-                @path = @id = id
-                NotifyID_TBL[@tpath] ||= {}
-                NotifyID_TBL[@tpath][@id] = self
-              }
-              obj
-            end
-          else
-            return id
-          end
-        }
-      end
-
-      def self.new(tree, *args, &b)
-        NotifyID_TBL.mutex.synchronize{
-          if tree.kind_of?(Array)
-            # not create
-            tpath = tree[0].path
-            NotifyID_TBL[tpath] ||= {}
-            unless (obj = NotifyID_TBL[tpath][tree[1]])
-              (NotifyID_TBL[tpath][tree[1]] =
-                 obj = self.allocate).instance_eval{
-                @parent = @tree = tree[0]
-                @tpath = @parent.path
-                @path = @id = tree[1]
-              }
-            end
-            return obj
-          end
-
-          (obj = self.allocate).instance_eval{
-            initialize(tree, *args, &b)
-            NotifyID_TBL[@tpath] ||= {}
-            NotifyID_TBL[@tpath][@id] = self
-          }
-          return obj
-        }
-      end
-
-      def initialize(tree, *args, &b)
-        @parent = @tree = tree
-        @tpath = @parent.path
-
-        # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-        if TkComm._callback_entry?(args[0])
-          cmd = args.shift
-        # elsif args[-1].kind_of?(Proc) || args[-1].kind_of?(Method)
-        elsif TkComm._callback_entry?(args[-1])
-          cmd = args.pop
-        elsif b
-          cmd = Proc.new(&b)
-        else
-          fail ArgumentError, "lack of 'command' argument"
-        end
-
-        args = args.collect{|arg| '-' << arg.to_s}
-
-        args << proc{|id, type|
-          cmd.call(Tk::BLT::Tree::Node.id2obj(@tree, id),
-                   ((type[0] == ?-)? type[1..-1]: type))
-        }
-
-        @path = @id = tk_call(@tpath, 'notify', 'create', *args)
-      end
-
-      def id
-        @id
-      end
-
-      def delete()
-        tk_call(@tpath, 'notify', 'delete', @id)
-        NotifyID_TBL.mutex.synchronize{
-          NotifyID_TBL[@tpath].delete(@id)
-        }
-        self
-      end
-
-      def info()
-        lst = simplelist(tk_call(@tpath, 'notify', 'info', id))
-        lst[0] = Tk::BLT::Tree::Notify.id2obj(@tree, lst[0])
-        lst[1] = simplelist(lst[1]).collect{|flag| flag[1..-1]}
-        lst[2] = tk_tcl2ruby(lst[2])
-        lst
-      end
-    end
-
-    ###################################
-
-    class Trace < TkObject
-      TraceID_TBL = TkCore::INTERP.create_table
-
-      TkCore::INTERP.init_ip_env{
-        TraceID_TBL.mutex.synchronize{ TraceID_TBL.clear }
-      }
-
-      def self.id2obj(tree, id)
-        tpath = tree.path
-        TraceID_TBL.mutex.synchronize{
-          if TraceID_TBL[tpath]
-            if TraceID_TBL[tpath][id]
-              TraceID_TBL[tpath][id]
-            else
-              begin
-                # self.new([tree, id])
-                (obj = self.allocate).instance_eval{
-                  @parent = @tree = tree
-                  @tpath = @parent.path
-                  @path = @id = node  # == traceID
-                  TraceID_TBL[@tpath] ||= {}
-                  TraceID_TBL[@tpath][@id] = self
-                }
-                obj
-              rescue
-                id
-              end
-            end
-          else
-            id
-          end
-        }
-      end
-
-      def self.new(tree, *args, &b)
-        TraceID_TBL.mutex.synchronize{
-          if tree.kind_of?(Array)
-            # not create
-            tpath = tree[0].path
-            TraceID_TBL[tpath] ||= {}
-            unless (obj = TraceID_TBL[tpath][tree[1]])
-              (TraceID_TBL[tpath][tree[1]] =
-                 obj = self.allocate).instance_eval{
-                @parent = @tree = tree
-                @tpath = @parent.path
-                @path = @id = tree[1]  # == traceID
-              }
-            end
-            return obj
-          end
-
-          # super(true, tree, *args, &b)
-          (obj = self.allocate).instance_eval{
-            initialize(tree, *args, &b)
-            TraceID_TBL[@tpath] ||= {}
-            TraceID_TBL[@tpath][@id] = self
-          }
-          return obj
-        }
-      end
-
-      def initialize(tree, node, key, opts, cmd=nil, &b)
-        @parent = @tree = tree
-        @tpath = @parent.path
-
-        if !cmd
-          if b
-            cmd = Proc.new(&b)
-          else
-            fail ArgumentError, "lack of 'command' argument"
-          end
-        end
-
-        @path = @id = tk_call(@tpath, 'trace', 'create', node, key, opts,
-                              proc{|t, id, k, ops|
-                                tobj = Tk::BLT::Tree.id2obj(t)
-                                if tobj.kind_of?(Tk::BLT::Tree)
-                                  nobj = Tk::BLT::Tree::Node.id2obj(tobj, id)
-                                else
-                                  nobj = id
-                                end
-                                cmd.call(tobj, nobj, k, ops)
-                              })
-      end
-
-      def id
-        @id
-      end
-
-      def delete()
-        tk_call(@tpath, 'trace', 'delete', @id)
-        TraceID_TBL.mutex.synchronize{
-          TraceID_TBL[tpath].delete(@id)
-        }
-        self
-      end
-
-      def info()
-        lst = simplelist(tk_call(@tpath, 'trace', 'info', id))
-        lst[0] = Tk::BLT::Tree::Trace.id2obj(@tree, lst[0])
-        lst[2] = simplelist(lst[2])
-        lst[3] = tk_tcl2ruby(lst[3])
-        lst
-      end
-    end
-
-    ###################################
-
-    TreeID_TBL = TkCore::INTERP.create_table
-
-    (Tree_ID = ['blt_tree'.freeze, TkUtil.untrust('00000')]).instance_eval{
-      @mutex = Mutex.new
-      def mutex; @mutex; end
-      freeze
-    }
-
-    def __keyonly_optkeys
-      {
-        # apply / find  command
-        'invert'=>nil, 'leafonly'=>nil, 'nocase'=>nil,
-
-        # apply / find / sort command
-        'path'=>nil,
-
-        # copy / restore / restorefile command
-        'overwrite'=>nil,
-
-        # copy command
-        'recurse'=>nil, 'tags'=>nil,
-
-        # sort command
-        'ascii'=>nil, 'decreasing'=>nil, 'disctionary'=>nil,
-        'integer'=>nil, 'real'=>nil, 'recurse'=>nil, 'reorder'=>nil,
-      }
-    end
-
-    def self.id2obj(id)
-      TreeID_TBL.mutex.synchronize{
-        TreeID_TBL[id]? TreeID_TBL[id]: id
-      }
-    end
-
-    def self.names(pat = None)
-      simplelist(tk_call('::blt::tree', 'names', pat)).collect{|name|
-        id2obj(name)
-      }
-    end
-
-    def self.destroy(*names)
-      tk_call('::blt::tree', 'destroy',
-              *(names.collect{|n| (n.kind_of?(Tk::BLT::Tree))? n.id: n }) )
-    end
-
-    def self.new(name = nil)
-      TreeID_TBL.mutex.synchronize{
-        if name && TreeID_TBL[name]
-          TreeID_TBL[name]
-        else
-          (obj = self.allocate).instance_eval{
-            initialize(name)
-            TreeID_TBL[@id] = self
-          }
-          obj
-        end
-      }
-    end
-
-    def initialize(name = nil)
-      if name
-        @path = @id = name
-      else
-        Tree_ID.mutex.synchronize{
-          @path = @id = Tree_ID.join(TkCore::INTERP._ip_id_)
-          Tree_ID[1].succ!
-        }
-      end
-
-      tk_call('::blt::tree', 'create', @id)
-    end
-
-    def __destroy_hook__
-      Tk::BLT::Tree::Node::TreeNodeID_TBL.mutex.synchronize{
-        Tk::BLT::Tree::Node::TreeNodeID_TBL.delete(@path)
-      }
-      Tk::BLT::Tree::Tag::TreeTagID_TBL.mutex.synchronize{
-        Tk::BLT::Tree::Tag::TreeTagID_TBL.delete(@path)
-      }
-      Tk::BLT::Tree::Notify::NotifyID_TBL.mutex.synchronize{
-        Tk::BLT::Tree::Notify::NotifyID_TBL.delete(@path)
-      }
-      Tk::BLT::Tree::Trace::TraceID_TBL.mutex.synchronize{
-        Tk::BLT::Tree::Trace::TraceID_TBL.delete(@path)
-      }
-    end
-
-    def tagid(tag)
-      if tag.kind_of?(Tk::BLT::Tree::Node) ||
-          tag.kind_of?(Tk::BLT::Tree::Tag) ||
-          tag.kind_of?(Tk::BLT::Tree::Notify) ||
-          tag.kind_of?(Tk::BLT::Tree::Trace)
-        tag.id
-      else
-        tag  # maybe an Array of configure parameters
-      end
-    end
-
-    def destroy()
-      tk_call('::blt::tree', 'destroy', @id)
-      self
-    end
-
-    def ancestor(node1, node2)
-      Tk::BLT::Tree::Node.id2obj(self, tk_call('::blt::tree', 'ancestor',
-                                               tagid(node1), tagid(node2)))
-    end
-
-    def apply(node, keys={})
-      tk_call('::blt::tree', 'apply', tagid(node), __conv_keyonly_opts(keys))
-      self
-    end
-
-    def attach(tree_obj)
-      tk_call('::blt::tree', 'attach', tree_obj)
-      self
-    end
-
-    def children(node)
-      simplelist(tk_call('::blt::tree', 'children', tagid(node))).collect{|n|
-        Tk::BLT::Tree::Node.id2obj(self, n)
-      }
-    end
-
-    def copy(src, parent, keys={})
-      id = tk_call('::blt::tree', 'copy', tagid(src), tagid(parent),
-                   __conv_keyonly_opts(keys))
-      Tk::BLT::Tree::Node.new(self, nil, 'node'=>id)
-    end
-    def copy_to(src, dest_tree, parent, keys={})
-      return copy(src, parent, keys={}) unless dest_tree
-
-      id = tk_call('::blt::tree', 'copy', tagid(src), dest_tree,
-                   tagid(parent), __conv_keyonly_opts(keys))
-      Tk::BLT::Tree::Node.new(dest_tree, nil, 'node'=>id)
-    end
-
-    def degree(node)
-      number(tk_call('::blt::tree', 'degree', tagid(node)))
-    end
-
-    def delete(*nodes)
-      tk_call('::blt::tree', 'delete', *(nodes.collect{|node| tagid(node)}))
-      Tk::BLT::Tree::Node::TreeNodeID_TBL.mutex.synchronize{
-        nodes.each{|node|
-          if node.kind_of?(Tk::BLT::Tree::Node)
-            Tk::BLT::Tree::Node::TreeNodeID_TBL[@path].delete(node.id)
-          else
-            Tk::BLT::Tree::Node::TreeNodeID_TBL[@path].delete(node.to_s)
-          end
-        }
-      }
-      self
-    end
-
-    def depth(node)
-      number(tk_call('::blt::tree', 'depth', tagid(node)))
-    end
-
-    def dump(node)
-      simplelist(tk_call('::blt::tree', 'dump', tagid(node))).collect{|n|
-        simplelist(n)
-      }
-    end
-
-    def dump_to_file(node, file)
-      tk_call('::blt::tree', 'dumpfile', tagid(node), file)
-      self
-    end
-
-    def exist?(node, key=None)
-      bool(tk_call('::blt::tree', 'exists', tagid(node), key))
-    end
-
-    def find(node, keys={})
-      simplelist(tk_call('::blt::tree', 'find', tagid(node),
-                         __conv_keyonly_opts(keys))).collect{|n|
-        Tk::BLT::Tree::Node.id2obj(self, n)
-      }
-    end
-
-    def find_child(node, label)
-      ret = tk_call('::blt::tree', 'findchild', tagid(node), label)
-      (ret == '-1')? nil: Tk::BLT::Tree::Node.id2obj(self, ret)
-    end
-
-    def first_child(node)
-      ret = tk_call('::blt::tree', 'firstchild', tagid(node))
-      (ret == '-1')? nil: Tk::BLT::Tree::Node.id2obj(self, ret)
-    end
-
-    def get(node)
-      Hash[*simplelist(tk_call('::blt::tree', 'get', tagid(node)))]
-    end
-    def get_value(node, key, default_val=None)
-      tk_call('::blt::tree', 'get', tagid(node), key, default_val)
-    end
-
-    def index(node)
-      Tk::BLT::Tree::Node.id2obj(self,
-                                 tk_call('::blt::tree', 'index', tagid(node)))
-    end
-
-    def insert(parent, keys={})
-      id = tk_call('::blt::tree', 'insert', tagid(parent), keys)
-      Tk::BLT::Tree::Node.new(self, nil, 'node'=>id)
-    end
-
-    def ancestor?(node1, node2)
-      bool(tk_call('::blt::tree', 'is', 'ancestor',
-                   tagid(node1), tagid(node2)))
-    end
-    def before?(node1, node2)
-      bool(tk_call('::blt::tree', 'is', 'before',
-                   tagid(node1), tagid(node2)))
-    end
-    def leaf?(node)
-      bool(tk_call('::blt::tree', 'is', 'leaf', tagid(node)))
-    end
-    def link?(node)
-      bool(tk_call('::blt::tree', 'is', 'link', tagid(node)))
-    end
-    def root?(node)
-      bool(tk_call('::blt::tree', 'is', 'root', tagid(node)))
-    end
-
-    def keys(node, *nodes)
-      if nodes.empty?
-        simplelist(tk_call('blt::tree', 'keys', tagid(node)))
-      else
-        simplelist(tk_call('blt::tree', 'keys', tagid(node),
-                           *(nodes.collect{|n| tagid(n)}))).collect{|lst|
-          simplelist(lst)
-        }
-      end
-    end
-
-    def label(node, text=nil)
-      if text
-        tk_call('::blt::tree', 'label', tagid(node), text)
-        text
-      else
-        tk_call('::blt::tree', 'label', tagid(node))
-      end
-    end
-
-    def last_child(node)
-      ret = tk_call('::blt::tree', 'lastchild', tagid(node))
-      (ret == '-1')? nil: Tk::BLT::Tree::Node.id2obj(self, ret)
-    end
-
-    def link(parent, node, keys={})
-      ret = tk_call('::blt::tree', 'link', tagid(parent), tagid(node),
-                    __conv_keyonly_opts(keys))
-      (ret == '-1')? nil: Tk::BLT::Tree::Node.id2obj(self, ret)
-    end
-
-    def move(node, dest, keys={})
-      tk_call('::blt::tree', 'move', tagid(node), tagid(dest), keys)
-      self
-    end
-
-    def next(node)
-      ret = tk_call('::blt::tree', 'next', tagid(node))
-      (ret == '-1')? nil: Tk::BLT::Tree::Node.id2obj(self, ret)
-    end
-
-    def next_sibling(node)
-      ret = tk_call('::blt::tree', 'nextsibling', tagid(node))
-      (ret == '-1')? nil: Tk::BLT::Tree::Node.id2obj(self, ret)
-    end
-
-    def notify_create(*args, &b)
-      Tk::BLT::Tree::Notify.new(self, *args, &b)
-    end
-
-    def notify_delete(id)
-      if id.kind_of?(Tk::BLT::Tree::Notify)
-        id.delete
-      else
-        tk_call(@path, 'notify', 'delete', id)
-        Tk::BLT::Tree::Notify::NotifyID_TBL.mutex.synchronize{
-          Tk::BLT::Tree::Notify::NotifyID_TBL[@path].delete(id.to_s)
-        }
-      end
-      self
-    end
-
-    def notify_info(id)
-      lst = simplelist(tk_call(@path, 'notify', 'info', tagid(id)))
-      lst[0] = Tk::BLT::Tree::Notify.id2obj(self, lst[0])
-      lst[1] = simplelist(lst[1]).collect{|flag| flag[1..-1]}
-      lst[2] = tk_tcl2ruby(lst[2])
-      lst
-    end
-
-    def notify_names()
-      tk_call(@path, 'notify', 'names').collect{|id|
-        Tk::BLT::Tree::Notify.id2obj(self, id)
-      }
-    end
-
-    def parent(node)
-      ret = tk_call('::blt::tree', 'parent', tagid(node))
-      (ret == '-1')? nil: Tk::BLT::Tree::Node.id2obj(self, ret)
-    end
-
-    def fullpath(node)
-      tk_call('::blt::tree', 'path', tagid(node))
-    end
-
-    def position(node)
-      number(tk_call('::blt::tree', 'position', tagid(node)))
-    end
-
-    def previous(node)
-      ret = tk_call('::blt::tree', 'previous', tagid(node))
-      (ret == '-1')? nil: Tk::BLT::Tree::Node.id2obj(self, ret)
-    end
-
-    def prev_sibling(node)
-      ret = tk_call('::blt::tree', 'prevsibling', tagid(node))
-      (ret == '-1')? nil: Tk::BLT::Tree::Node.id2obj(self, ret)
-    end
-
-    def restore(node, str, keys={})
-      tk_call('::blt::tree', 'restore', tagid(node), str,
-              __conv_keyonly_opts(keys))
-      self
-    end
-    def restore_overwrite(node, str, keys={})
-      keys = __conv_keyonly_opts(keys)
-      keys.delete('overwrite')
-      keys.delete(:overwrite)
-      tk_call('::blt::tree', 'restore', tagid(node), str, '-overwrite', keys)
-      self
-    end
-
-    def restore_from_file(node, file, keys={})
-      tk_call('::blt::tree', 'restorefile', tagid(node), file,
-              __conv_keyonly_opts(keys))
-      self
-    end
-    def restore_overwrite_from_file(node, file, keys={})
-      keys = __conv_keyonly_opts(keys)
-      keys.delete('overwrite')
-      keys.delete(:overwrite)
-      tk_call('::blt::tree', 'restorefile', tagid(node), file,
-              '-overwrite', keys)
-      self
-    end
-
-    def root(node=None)
-      Tk::BLT::Tree::Node.id2obj(self, tk_call('::blt::tree', 'root',
-                                               tagid(node)))
-    end
-
-    def set(node, data)
-      unless data.kind_of?(Hash)
-        fail ArgumentError, 'Hash is expected for data'
-      end
-      args = []
-      data.each{|k, v|  args << k << v}
-      tk_call('::blt::tree', 'set', tagid(node), *args)
-      self
-    end
-
-    def size(node)
-      number(tk_call('::blt::tree', 'size', tagid(node)))
-    end
-
-    def sort(node, keys={})
-      tk_call('::blt::tree', 'sort', tagid(node), __conv_keyonly_opts(keys))
-      self
-    end
-
-    def tag_add(tag, *nodes)
-      tk_call(@path, 'tag', 'add', tagid(tag), *(nodes.collect{|n| tagid(n)}))
-      self
-    end
-
-    def tag_delete(tag, *nodes)
-      tk_call(@path, 'tag', 'delete', tagid(tag),
-              *(nodes.collect{|n| tagid(n)}))
-      self
-    end
-
-    def tag_forget(tag)
-      tag = tag.id if tag.kind_of?(Tk::BLT::Tree::Tag)
-      tk_call(@path, 'tag', 'forget', tag)
-      TreeTagID_TBL.mutex.synchronize{
-        TreeTagID_TBL[@path].delete(tag)
-      }
-      self
-    end
-
-    def tag_get(node, *patterns)
-      simplelist(tk_call(@tpath, 'tag', 'get', tagid(node),
-                         *(patterns.collect{|pat| tagid(pat)}))).collect{|str|
-        Tk::BLT::Tree::Tag.id2obj(self, str)
-      }
-    end
-
-    def tag_names(node = None)
-      simplelist(tk_call(@tpath, 'tag', 'names', tagid(node))).collect{|str|
-        Tk::BLT::Tree::Tag.id2obj(self, str)
-      }
-    end
-
-    def tag_nodes(tag)
-      simplelist(tk_call(@tpath, 'tag', 'nodes', tagid(tag))).collect{|node|
-        Tk::BLT::Tree::Node.id2obj(self, node)
-      }
-    end
-
-    def tag_set(node, *tags)
-      tk_call(@path, 'tag', 'set', tagid(node), *(tags.collect{|t| tagid(t)}))
-      self
-    end
-
-    def tag_unset(node, *tags)
-      tk_call(@path, 'tag', 'unset', tagid(node),
-              *(tags.collect{|t| tagid(t)}))
-      self
-    end
-
-    def trace_create(*args, &b)
-      Tk::BLT::Tree::Trace.new(self, *args, &b)
-    end
-
-=begin
-    def trace_delete(*args)
-      args.each{|id|
-        if id.kind_of?(Tk::BLT::Tree::Trace)
-          id.delete
-        else
-          tk_call(@path, 'trace', 'delete', id)
-          Tk::BLT::Tree::Trace::TraceID_TBL[@path].delete(id.to_s)
-        end
-        self
-      }
-    end
-=end
-    def trace_delete(*args)
-      args = args.collect{|id| tagid(id)}
-      tk_call(@path, 'trace', 'delete', *args)
-      Tk::BLT::Tree::Trace::TraceID_TBL.mutex.synchronize{
-        args.each{|id| Tk::BLT::Tree::Trace::TraceID_TBL[@path].delete(id.to_s)}
-      }
-      self
-    end
-
-    def trace_info(id)
-      lst = simplelist(tk_call(@path, 'trace', 'info', tagid(id)))
-      lst[0] = Tk::BLT::Tree::Trace.id2obj(self, lst[0])
-      lst[2] = simplelist(lst[2])
-      lst[3] = tk_tcl2ruby(lst[3])
-      lst
-    end
-
-    def trace_names()
-      tk_call(@path, 'trace', 'names').collect{|id|
-        Tk::BLT::Tree::Trace.id2obj(self, id)
-      }
-    end
-
-    def type(node, key)
-      tk_call('::blt::tree', 'type', tagid(node), key)
-    end
-
-    def unset(node, *keys)
-      tk_call('::blt::tree', 'unset', tagid(node), *keys)
-      self
-    end
-
-    def values(node, key=None)
-      simplelist(tk_call('::blt::tree', 'values', tagid(node), key))
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/blt/treeview.rb b/ext/tk/lib/tkextlib/blt/treeview.rb
deleted file mode 100644
index 2866ba3027..0000000000
--- a/ext/tk/lib/tkextlib/blt/treeview.rb
+++ /dev/null
@@ -1,1288 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/blt/treeview.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/blt.rb'
-require 'tk/validation.rb'
-
-module Tk::BLT
-  class Treeview < TkWindow
-    module ConfigMethod
-    end
-
-    module TagOrID_Methods
-    end
-
-    class Node < TkObject
-    end
-
-    class Tag < TkObject
-    end
-  end
-
-  class Hiertable < Treeview
-  end
-end
-
-######################################
-
-module Tk::BLT::Treeview::ConfigMethod
-  include TkItemConfigMethod
-
-  def __item_boolval_optkeys(id)
-    case id
-    when Array
-      # id := [ 'column', name ]
-      ['edit', 'hide']
-    when 'sort'
-      ['decreasing']
-    else
-      []
-    end
-  end
-  private :__item_boolval_optkeys
-
-  def __item_strval_optkeys(id)
-    case id
-    when Array
-      # id := [ 'column', name ]
-      super() << 'titleforeground' << 'titleshadow'
-    when 'sort'
-      ['decreasing']
-    else
-      []
-    end
-  end
-  private :__item_strval_optkeys
-
-  def __item_listval_optkeys(id)
-    case id
-    when 'entry'
-      ['bindtags']
-    else
-      []
-    end
-  end
-  private :__item_listval_optkeys
-
-  def __item_cget_cmd(id)
-    if id.kind_of?(Array)
-      # id := [ type, name ]
-      [self.path, id[0], 'cget', id[1]]
-    else
-      [self.path, id, 'cget']
-    end
-  end
-  private :__item_cget_cmd
-
-  def __item_config_cmd(id)
-    if id.kind_of?(Array)
-      # id := [ type, name ]
-      [self.path, id[0], 'configure', id[1]]
-    else
-      [self.path, id, 'configure']
-    end
-  end
-  private :__item_config_cmd
-
-  def __item_pathname(id)
-    if id.kind_of?(Array)
-      id = tagid(id[1])
-    end
-    [self.path, id].join(';')
-  end
-  private :__item_pathname
-
-  def column_cget_tkstring(name, option)
-    itemcget_tkstring(['column', name], option)
-  end
-  def column_cget(name, option)
-    itemcget(['column', name], option)
-  end
-  def column_cget_strict(name, option)
-    itemcget_strict(['column', name], option)
-  end
-  def column_configure(name, slot, value=None)
-    itemconfigure(['column', name], slot, value)
-  end
-  def column_configinfo(name, slot=nil)
-    itemconfiginfo(['column', name], slot)
-  end
-  def current_column_configinfo(name, slot=nil)
-    current_itemconfiginfo(['column', name], slot)
-  end
-
-  def button_cget_tkstring(option)
-    itemcget_tkstring('button', option)
-  end
-  def button_cget(option)
-    itemcget('button', option)
-  end
-  def button_cget_strict(option)
-    itemcget_strict('button', option)
-  end
-  def button_configure(slot, value=None)
-    itemconfigure('button', slot, value)
-  end
-  def button_configinfo(slot=nil)
-    itemconfiginfo('button', slot)
-  end
-  def current_button_configinfo(slot=nil)
-    current_itemconfiginfo('button', slot)
-  end
-
-  def entry_cget_tkstring(option)
-    itemcget_tkstring('entry', option)
-  end
-  def entry_cget(option)
-    ret = itemcget('entry', option)
-    if option == 'bindtags' || option == :bindtags
-      ret.collect{|tag| TkBindTag.id2obj(tag)}
-    else
-      ret
-    end
-  end
-  def entry_cget_strict(option)
-    ret = itemcget_strict('entry', option)
-    if option == 'bindtags' || option == :bindtags
-      ret.collect{|tag| TkBindTag.id2obj(tag)}
-    else
-      ret
-    end
-  end
-  def entry_configure(slot, value=None)
-    itemconfigure('entry', slot, value)
-  end
-  def entry_configinfo(slot=nil)
-    ret = itemconfiginfo('entry', slot)
-
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if slot
-        if slot == 'bindtags' || slot == :bindtags
-          ret[-2] = ret[-2].collect{|tag| TkBindTag.id2obj(tag)}
-          ret[-1] = ret[-1].collect{|tag| TkBindTag.id2obj(tag)}
-        end
-      else
-        inf = ret.assoc('bindtags')
-        inf[-2] = inf[-2].collect{|tag| TkBindTag.id2obj(tag)}
-        inf[-1] = inf[-1].collect{|tag| TkBindTag.id2obj(tag)}
-      end
-
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      if (inf = ret['bindtags'])
-        inf[-2] = inf[-2].collect{|tag| TkBindTag.id2obj(tag)}
-        inf[-1] = inf[-1].collect{|tag| TkBindTag.id2obj(tag)}
-        ret['bindtags'] = inf
-      end
-    end
-
-    ret
-  end
-  def current_entry_configinfo(slot=nil)
-    ret = current_itemconfiginfo('entry', slot)
-
-    if (val = ret['bindtags'])
-      ret['bindtags'] = val.collect{|tag| TkBindTag.id2obj(tag)}
-    end
-
-    ret
-  end
-
-  def sort_cget_tkstring(option)
-    itemcget_tkstring('sort', option)
-  end
-  def sort_cget(option)
-    itemcget('sort', option)
-  end
-  def sort_cget_strict(option)
-    itemcget_strict('sort', option)
-  end
-  def sort_configure(slot, value=None)
-    itemconfigure('sort', slot, value)
-  end
-  def sort_configinfo(slot=nil)
-    itemconfiginfo('sort', slot)
-  end
-  def current_sort_configinfo(slot=nil)
-    current_itemconfiginfo('sort', slot)
-  end
-
-  def text_cget_tkstring(option)
-    itemcget_tkstring('text', option)
-  end
-  def text_cget(option)
-    itemcget('text', option)
-  end
-  def text_cget_strict(option)
-    itemcget_strict('text', option)
-  end
-  def text_configure(slot, value=None)
-    itemconfigure('text', slot, value)
-  end
-  def text_configinfo(slot=nil)
-    itemconfiginfo('text', slot)
-  end
-  def current_text_configinfo(slot=nil)
-    current_itemconfiginfo('text', slot)
-  end
-
-  private :itemcget_tkstring, :itemcget, :itemcget_strict
-  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
-end
-
-class Tk::BLT::Treeview
-  TkCommandNames = ['::blt::treeview'.freeze].freeze
-  WidgetClassName = 'TreeView'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  include Scrollable
-  include ValidateConfigure
-  include ItemValidateConfigure
-  include Tk::BLT::Treeview::ConfigMethod
-
-  ########################
-
-  def __boolval_optkeys
-    ['autocreate', 'allowduplicates', 'exportselection', 'flat', 'hideroot',
-      'newtags', 'showtitles', 'sortselection']
-  end
-  private :__boolval_optkeys
-
-  def __strval_optkeys
-    super() + ['focusforeground', 'linecolor', 'separator', 'trim']
-  end
-  private :__strval_optkeys
-
-  ########################
-
-  class OpenCloseCommand < TkValidateCommand
-    class ValidateArgs < TkUtil::CallbackSubst
-      KEY_TBL = [
-        [ ?W, ?w, :widget ],
-        [ ?p, ?s, :name ],
-        [ ?P, ?s, :fullpath ],
-        [ ?#, ?x, :node_id ],
-        nil
-      ]
-
-      PROC_TBL = [
-        [ ?x, TkComm.method(:num_or_str) ],
-        [ ?s, TkComm.method(:string) ],
-        [ ?w, TkComm.method(:window) ],
-        nil
-      ]
-
-=begin
-      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-      KEY_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-        end
-        inf
-      }
-
-      PROC_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-        end
-        inf
-      }
-=end
-
-      _setup_subst_table(KEY_TBL, PROC_TBL);
-
-      def self.ret_val(val)
-        val
-      end
-    end
-
-    def self._config_keys
-      ['opencommand', 'closecomand']
-    end
-  end
-
-  def __validation_class_list
-    super() << OpenCloseCommand
-  end
-
-  Tk::ValidateConfigure.__def_validcmd(binding, OpenCloseCommand)
-
-  ########################
-
-  def __item_validation_class_list(id)
-    case id
-    when 'entry'
-      super(id) << OpenCloseCommand
-    else
-      super(id)
-    end
-  end
-
-  Tk::ItemValidateConfigure.__def_validcmd(binding, OpenCloseCommand)
-
-  ########################
-
-  def __destroy_hook__
-    Tk::BLT::Treeview::Node::TreeNodeID_TBL.mutex.synchronize{
-      Tk::BLT::Treeview::Node::TreeNodeID_TBL.delete(@path)
-    }
-    Tk::BLT::Treeview::Tag::TreeTagID_TBL.mutex.synchronize{
-      Tk::BLT::Treeview::Tag::TreeTagID_TBL.delete(@path)
-    }
-  end
-
-  def tagid(tag)
-    if tag.kind_of?(Tk::BLT::Treeview::Node) \
-      || tag.kind_of?(Tk::BLT::Treeview::Tag)
-      tag.id
-    else
-      tag  # maybe an Array of configure parameters
-    end
-  end
-  private :tagid
-
-  def tagid2obj(tagid)
-    if tagid.kind_of?(Integer)
-      Tk::BLT::Treeview::Node.id2obj(self, tagid.to_s)
-    elsif tagid.kind_of?(String)
-      if tagid =~ /^\d+$/
-        Tk::BLT::Treeview::Node.id2obj(self, tagid)
-      else
-        Tk::BLT::Treeview::Tag.id2obj(self, tagid)
-      end
-    else
-      tagid
-    end
-  end
-
-  def bbox(*tags)
-    list(tk_send('bbox', *(tags.collect{|tag| tagid(tag)})))
-  end
-
-  def screen_bbox(*tags)
-    list(tk_send('bbox', '-screen', *(tags.collect{|tag| tagid(tag)})))
-  end
-
-  def tag_bind(tag, seq, *args)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _bind([@path, 'bind', tagid(tag)], seq, cmd, *args)
-    self
-  end
-  def tag_bind_append(tag, seq, *args)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _bind_append([@path, 'bind', tagid(tag)], seq, cmd, *args)
-    self
-  end
-  def tag_bind_remove(tag, seq)
-    _bind_remove([@path, 'bind', tagid(tag)], seq)
-    self
-  end
-  def tag_bindinfo(tag, seq=nil)
-    _bindinfo([@path, 'bind', tagid(tag)], seq)
-  end
-
-  def button_activate(tag)
-    tk_send('button', 'activate', tagid(tag))
-    self
-  end
-
-  def button_bind(tag, seq, *args)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _bind([@path, 'button', 'bind', tagid(tag)], seq, cmd, *args)
-    self
-  end
-  def button_bind_append(tag, seq, *args)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _bind_append([@path, 'button', 'bind', tagid(tag)], seq, cmd, *args)
-    self
-  end
-  def button_bind_remove(tag, seq)
-    _bind_remove([@path, 'button', 'bind', tagid(tag)], seq)
-    self
-  end
-  def button_bindinfo(tag, seq=nil)
-    _bindinfo([@path, 'button', 'bind', tagid(tag)], seq)
-  end
-
-  def close(*tags)
-    tk_send('close', *(tags.collect{|tag| tagid(tag)}))
-    self
-  end
-  def close_recurse(*tags)
-    tk_send('close', '-recurse', *(tags.collect{|tag| tagid(tag)}))
-    self
-  end
-
-  def column_activate(column=None)
-    if column == None
-      tk_send('column', 'activate')
-    else
-      tk_send('column', 'activate', column)
-      self
-    end
-  end
-
-  def column_delete(*fields)
-    tk_send('column', 'delete', *fields)
-    self
-  end
-  def column_insert(pos, field, *opts)
-    tk_send('column', 'insert', pos, field, *opts)
-    self
-  end
-  def column_invoke(field)
-    tk_send('column', 'invoke', field)
-    self
-  end
-  def column_move(name, dest)
-    tk_send('column', 'move', name, dest)
-    self
-  end
-  def column_names()
-    simplelist(tk_send('column', 'names'))
-  end
-  def column_nearest(x, y=None)
-    tk_send('column', 'nearest', x, y)
-  end
-
-  def curselection
-    simplelist(tk_send('curselection')).collect{|id| tagid2obj(id)}
-  end
-
-  def delete(*tags)
-    tk_send('delete', *(tags.collect{|tag| tagid(tag)}))
-    self
-  end
-
-  def entry_activate(tag)
-    tk_send('entry', 'activate', tagid(tag))
-    self
-  end
-  def entry_children(tag, first=None, last=None)
-    simplelist(tk_send('entry', 'children', tagid(tag),
-                       first, last)).collect{|id| tagid2obj(id)}
-  end
-  def entry_delete(tag, first=None, last=None)
-    tk_send('entry', 'delete', tagid(tag), first, last)
-  end
-  def entry_before?(tag1, tag2)
-    bool(tk_send('entry', 'isbefore', tagid(tag1), tagid(tag2)))
-  end
-  def entry_hidden?(tag)
-    bool(tk_send('entry', 'ishidden', tagid(tag)))
-  end
-  def entry_open?(tag)
-    bool(tk_send('entry', 'isopen', tagid(tag)))
-  end
-
-  def entry_size(tag)
-    number(tk_send('entry', 'size', tagid(tag)))
-  end
-  def entry_size_recurse(tag)
-    number(tk_send('entry', 'size', '-recurse', tagid(tag)))
-  end
-
-  def _search_flags(keys)
-    keys = _symbolkey2str(keys)
-    keys['exact'] = None if keys.delete('exact')
-    keys['glob'] = None if keys.delete('glob')
-    keys['regexp'] = None if keys.delete('regexp')
-    keys['nonmatching'] = None if keys.delete('nonmatching')
-  end
-  private :_search_flags
-
-  ################################
-
-  class FindExecFlagValue < TkValidateCommand
-    class ValidateArgs < TkUtil::CallbackSubst
-      KEY_TBL = [
-        [ ?W, ?w, :widget ],
-        [ ?p, ?s, :name ],
-        [ ?P, ?s, :fullpath ],
-        [ ?#, ?x, :node_id ],
-        nil
-      ]
-
-      PROC_TBL = [
-        [ ?x, TkComm.method(:num_or_str) ],
-        [ ?s, TkComm.method(:string) ],
-        [ ?w, TkComm.method(:window) ],
-        nil
-      ]
-
-=begin
-      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-      KEY_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-        end
-        inf
-      }
-
-      PROC_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-        end
-        inf
-      }
-=end
-
-      _setup_subst_table(KEY_TBL, PROC_TBL);
-
-      def self.ret_val(val)
-        val
-      end
-    end
-
-    def self._config_keys
-      []
-    end
-  end
-
-  def _find_exec_flag_value(val)
-    if val.kind_of?(Array)
-      cmd, *args = val
-      #FindExecFlagValue.new(cmd, args.join(' '))
-      FindExecFlagValue.new(cmd, *args)
-    elsif TkComm._callback_entry?(val)
-      FindExecFlagValue.new(val)
-    else
-      val
-    end
-  end
-
-  ################################
-
-  def find(first, last, keys={})
-    keys = _search_flags(keys)
-    keys['exec'] = _find_exec_flag_value(keys['exec']) if keys.key?('exec')
-    args = hash_kv(keys) << '--' << tagid(first) << tagid(last)
-    simplelist(tk_send('find', *args)).collect{|id| tagid2obj(id)}
-  end
-
-  def tag_focus(tag)
-    tk_send('focus', tagid(tag))
-    self
-  end
-  def get(*tags)
-    simplelist(tk_send('get', *(tags.collect{|tag| tagid(tag)})))
-  end
-  def get_full(*tags)
-    simplelist(tk_send('get', '-full', *(tags.collect{|tag| tagid(tag)})))
-  end
-
-  def hide(*tags)
-    if tags[-1].kind_of?(Hash)
-      keys = tags.pop
-    else
-      keys = {}
-    end
-    keys = _search_flags(keys)
-    args = hash_kv(keys) << '--'
-    args.concat(tags.collect{|t| tagid(t)})
-    tk_send('hide', *args)
-    self
-  end
-
-  def index(str)
-    tagid2obj(tk_send('index', str))
-  end
-  def index_at(tag, str)
-    tagid2obj(tk_send('index', '-at', tagid(tag), str))
-  end
-  def index_at_path(tag, str)
-    tagid2obj(tk_send('index', '-at', tagid(tag), '-path', str))
-  end
-
-  def insert(pos, parent=nil, keys={})
-    Tk::BLT::Treeview::Node.new(pos, parent, keys)
-  end
-  def insert_at(tag, pos, parent=nil, keys={})
-    if parent.kind_of?(Hash)
-      keys = parent
-      parent = nil
-    end
-
-    keys = _symbolkey2str(keys)
-    keys['at'] = tagid(tag)
-
-    Tk::BLT::Treeview::Node.new(pos, parent, keys)
-  end
-
-  def move_before(tag, dest)
-    tk_send('move', tagid(tag), 'before', tagid(dest))
-    self
-  end
-  def move_after(tag, dest)
-    tk_send('move', tagid(tag), 'after', tagid(dest))
-    self
-  end
-  def move_into(tag, dest)
-    tk_send('move', tagid(tag), 'into', tagid(dest))
-    self
-  end
-
-  def nearest(x, y, var=None)
-    tagid2obj(tk_send('nearest', x, y, var))
-  end
-
-  def open(*tags)
-    tk_send('open', *(tags.collect{|tag| tagid(tag)}))
-    self
-  end
-  def open_recurse(*tags)
-    tk_send('open', '-recurse', *(tags.collect{|tag| tagid(tag)}))
-    self
-  end
-
-  def range(first, last)
-    simplelist(tk_send('range', tagid(first), tagid(last))).collect{|id|
-      tagid2obj(id)
-    }
-  end
-  def range_open(first, last)
-    simplelist(tk_send('range', '-open',
-                       tagid(first), tagid(last))).collect{|id|
-      tagid2obj(id)
-    }
-  end
-
-  def scan_mark(x, y)
-    tk_send_without_enc('scan', 'mark', x, y)
-    self
-  end
-  def scan_dragto(x, y)
-    tk_send_without_enc('scan', 'dragto', x, y)
-    self
-  end
-
-  def see(tag)
-    tk_send_without_enc('see', tagid(tag))
-    self
-  end
-  def see_anchor(anchor, tag)
-    tk_send_without_enc('see', '-anchor', anchor, tagid(tag))
-    self
-  end
-
-  def selection_anchor(tag)
-    tk_send_without_enc('selection', 'anchor', tagid(tag))
-    self
-  end
-  def selection_cancel()
-    tk_send_without_enc('selection', 'cancel')
-    self
-  end
-  def selection_clear(first, last=None)
-    tk_send_without_enc('selection', 'clear', tagid(first), tagid(last))
-    self
-  end
-  def selection_clear_all()
-    tk_send_without_enc('selection', 'clearall')
-    self
-  end
-  def selection_mark(tag)
-    tk_send_without_enc('selection', 'mark', tagid(tag))
-    self
-  end
-  def selection_include?(tag)
-    bool(tk_send('selection', 'include', tagid(tag)))
-  end
-  def selection_present?()
-    bool(tk_send('selection', 'present'))
-  end
-  def selection_set(first, last=None)
-    tk_send_without_enc('selection', 'set', tagid(first), tagid(last))
-    self
-  end
-  def selection_toggle(first, last=None)
-    tk_send_without_enc('selection', 'toggle', tagid(first), tagid(last))
-    self
-  end
-
-  def show(*tags)
-    if tags[-1].kind_of?(Hash)
-      keys = tags.pop
-    else
-      keys = {}
-    end
-    keys = _search_flags(keys)
-    args = hash_kv(keys) << '--'
-    args.concat(tags.collect{|t| tagid(t)})
-    tk_send('show', *args)
-    self
-  end
-
-  def sort_auto(mode)
-    tk_send('sort', 'auto', mode)
-    self
-  end
-  def sort_auto=(mode)
-    tk_send('sort', 'auto', mode)
-    mode
-  end
-  def sort_auto?
-    bool(tk_send('sort', 'auto'))
-  end
-  def sort_once(*tags)
-    tk_send('sort', 'once', *(tags.collect{|tag| tagid(tag)}))
-    self
-  end
-  def sort_once_recurse(*tags)
-    tk_send('sort', 'once', '-recurse', *(tags.collect{|tag| tagid(tag)}))
-    self
-  end
-
-  def tag_add(tag, *ids)
-    tk_send('tag', 'add', tagid(tag), *ids)
-    self
-  end
-  def tag_delete(tag, *ids)
-    tk_send('tag', 'delete', tagid(tag), *ids)
-    self
-  end
-  def tag_forget(tag)
-    tk_send('tag', 'forget', tagid(tag))
-    self
-  end
-  def tag_names(id=nil)
-    id = (id)? tagid(id): None
-
-    simplelist(tk_send('tag', 'nodes', id)).collect{|tag|
-      Tk::BLT::Treeview::Tag.id2obj(self, tag)
-    }
-  end
-  def tag_nodes(tag)
-    simplelist(tk_send('tag', 'nodes', tagid(tag))).collect{|id|
-      Tk::BLT::Treeview::Node.id2obj(self, id)
-    }
-  end
-
-  def text_apply
-    tk_send('text', 'apply')
-    self
-  end
-  def text_cancel
-    tk_send('text', 'cancel')
-    self
-  end
-
-  def text_delete(first, last)
-    tk_send('text', 'delete', first, last)
-    self
-  end
-  def text_get(x, y)
-    tk_send('text', 'get', x, y)
-  end
-  def text_get_root(x, y)
-    tk_send('text', 'get', '-root', x, y)
-  end
-  def text_icursor(idx)
-    tk_send('text', 'icursor', idx)
-    self
-  end
-  def text_index(idx)
-    num_or_str(tk_send('text', 'index', idx))
-  end
-  def text_insert(idx, str)
-    tk_send('text', 'insert', idx, str)
-    self
-  end
-
-  def text_selection_adjust(idx)
-    tk_send('text', 'selection', 'adjust', idx)
-    self
-  end
-  def text_selection_clear
-    tk_send('text', 'selection', 'clear')
-    self
-  end
-  def text_selection_from(idx)
-    tk_send('text', 'selection', 'from', idx)
-    self
-  end
-  def text_selection_present
-    num_or_str(tk_send('text', 'selection', 'present'))
-  end
-  def text_selection_range(start, last)
-    tk_send('text', 'selection', 'range', start, last)
-    self
-  end
-  def text_selection_to(idx)
-    tk_send('text', 'selection', 'to', idx)
-    self
-  end
-
-  def toggle(tag)
-    tk_send('toggle', tagid(tag))
-    self
-  end
-end
-
-######################################
-
-module Tk::BLT::Treeview::TagOrID_Methods
-  def bbox
-    @tree.bbox(self)
-  end
-  def screen_bbox
-    @tree.screen_bbox(self)
-  end
-
-  def bind(seq, *args)
-    @tree.tag_bind(self, seq, *args)
-    self
-  end
-  def bind_append(seq, *args)
-    @tree.tag_bind_append(self, seq, *args)
-    self
-  end
-  def bind_remove(seq)
-    @tree.tag_bind_remove(self, seq)
-    self
-  end
-  def bindinfo(seq=nil)
-    @tree.tag_bindinfo(self, seq)
-  end
-
-  def button_activate
-    @tree.button_activate(self)
-    self
-  end
-
-  def button_bind(seq, *args)
-    @tree.button_bind(self, seq, *args)
-    self
-  end
-  def button_bind_append(seq, *args)
-    @tree.button_bind_append(self, seq, *args)
-    self
-  end
-  def button_bind_remove(seq)
-    @tree.button_bind_remove(self, seq)
-    self
-  end
-  def button_bindinfo(seq=nil)
-    @tree.button_bindinfo(self, seq)
-  end
-
-  def close
-    @tree.close(self)
-    self
-  end
-  def close_recurse
-    @tree.close_recurse(self)
-    self
-  end
-
-  def delete
-    @tree.delete(self)
-    self
-  end
-
-  def entry_activate
-    @tree.entry_activate(self)
-    self
-  end
-  def entry_children(first=None, last=None)
-    @tree.entry_children(self, first, last)
-  end
-  def entry_delete(first=None, last=None)
-    @tree.entry_delete(self, first, last)
-  end
-  def entry_before?(tag)
-    @tree.entry_before?(self, tag)
-  end
-  def entry_hidden?
-    @tree.entry_before?(self)
-  end
-  def entry_open?
-    @tree.entry_open?(self)
-  end
-
-  def entry_size
-    @tree.entry_size(self)
-  end
-  def entry_size_recurse
-    @tree.entry_size_recurse(self)
-  end
-
-  def focus
-    @tree.tag_focus(self)
-    self
-  end
-
-  def get
-    @tree.get(self)
-  end
-  def get_full
-    @tree.get_full(self)
-  end
-
-  def hide
-    @tree.hide(self)
-    self
-  end
-
-  def index(str)
-    @tree.index_at(self, str)
-  end
-  def index_path(str)
-    @tree.index_at_path(self, str)
-  end
-
-  def insert(pos, parent=nil, keys={})
-    @tree.insert_at(self, pos, parent, keys)
-  end
-
-  def move_before(dest)
-    @tree.move_before(self, dest)
-    self
-  end
-  def move_after(dest)
-    @tree.move_after(self, dest)
-    self
-  end
-  def move_into(dest)
-    @tree.move_into(self, dest)
-    self
-  end
-
-  def open
-    @tree.open(self)
-    self
-  end
-  def open_recurse
-    @tree.open_recurse(self)
-    self
-  end
-
-  def range_to(tag)
-    @tree.range(self, tag)
-  end
-  def range_open_to(tag)
-    @tree.range(self, tag)
-  end
-
-  def see
-    @tree.see(self)
-    self
-  end
-  def see_anchor(anchor)
-    @tree.see_anchor(anchor, self)
-    self
-  end
-
-  def selection_anchor
-    @tree.selection_anchor(self)
-    self
-  end
-  def selection_clear
-    @tree.selection_clear(self)
-    self
-  end
-  def selection_mark
-    @tree.selection_mark(self)
-    self
-  end
-  def selection_include?
-    @tree.selection_include?(self)
-  end
-  def selection_set
-    @tree.selection_set(self)
-    self
-  end
-  def selection_toggle
-    @tree.selection_toggle(self)
-    self
-  end
-
-  def show
-    @tree.show(self)
-    self
-  end
-
-  def sort_once
-    @tree.sort_once(self)
-    self
-  end
-  def sort_once_recurse
-    @tree.sort_once_recurse(self)
-    self
-  end
-
-  def toggle
-    @tree.toggle(self)
-    self
-  end
-end
-
-######################################
-
-class Tk::BLT::Treeview::Node < TkObject
-  include Tk::BLT::Treeview::TagOrID_Methods
-
-  TreeNodeID_TBL = TkCore::INTERP.create_table
-
-  (TreeNode_ID = ['blt_treeview_node'.freeze, TkUtil.untrust('00000')]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  TkCore::INTERP.init_ip_env{
-    TreeNodeID_TBL.mutex.synchronize{ TreeNodeID_TBL.clear }
-  }
-
-  def self.id2obj(tree, id)
-    tpath = tree.path
-    TreeNodeID_TBL.mutex.synchronize{
-      if TreeNodeID_TBL[tpath]
-        if TreeNodeID_TBL[tpath][id]
-          TreeNodeID_TBL[tpath][id]
-        else
-          begin
-            # self.new(tree, nil, nil, 'node'=>Integer(id))
-            unless (tk_call(@tpath, 'get', id)).empty?
-              id = Integer(id)
-              (obj = self.allocate).instance_eval{
-                @parent = @tree = tree
-                @tpath = @parent.path
-                @path = @id = id
-                TreeNodeID_TBL[@tpath] ||= {}
-                TreeNodeID_TBL[@tpath][@id] = self
-              }
-              obj
-            else
-              id
-            end
-          rescue
-            id
-          end
-        end
-      else
-        id
-      end
-    }
-  end
-
-  def self.new(tree, pos, parent=nil, keys={})
-    if parent.kind_of?(Hash)
-      keys = parent
-      parent = nil
-    end
-
-    keys = _symbolkey2str(keys)
-    tpath = tree.path
-
-    TreeNodeID_TBL.mutex.synchronize{
-      TreeNodeID_TBL[tpath] ||= {}
-      if (id = keys['node']) && (obj = TreeNodeID_TBL[tpath][id])
-        keys.delete('node')
-        tk_call(tree.path, 'move', id, pos, parent) if parent
-        return obj
-      end
-
-      #super(tree, pos, parent, keys)
-      (obj = self.allocate).instance_eval{
-        initialize(tree, pos, parent, keys)
-        TreeNodeID_TBL[tpath][@id] = self
-      }
-      obj
-    }
-  end
-
-  def initialize(tree, pos, parent, keys)
-    @parent = @tree = tree
-    @tpath = @parent.path
-
-    if (id = keys['node'])
-      # if tk_call(@tpath, 'get', id).empty?
-      #   fail RuntimeError, "not exist the node '#{id}'"
-      # end
-      @path = @id = id
-      tk_call(@tpath, 'move', @id, pos, tagid(parent)) if parent
-      configure(keys) if keys && ! keys.empty?
-    else
-      name = nil
-      TreeNode_ID.mutex.synchronize{
-        name = TreeNode_ID.join(TkCore::INTERP._ip_id_).freeze
-        TreeNode_ID[1].succ!
-      }
-
-      at = keys.delete['at']
-
-      if parent
-        if parent.kind_of?(Tk::BLT::Treeview::Node) ||
-            parent.kind_of?(Tk::BLT::Treeview::Tag)
-          path = [get_full(parent.id)[0], name]
-          at = nil # ignore 'at' option
-        else
-          path = [parent.to_s, name]
-        end
-      else
-        path = name
-      end
-
-      if at
-        @id = tk_call(@tpath, 'insert', '-at', tagid(at), pos, path, keys)
-      else
-        @id = tk_call(@tpath, 'insert', pos, path, keys)
-      end
-      @path = @id
-    end
-  end
-
-  def id
-    @id
-  end
-end
-
-######################################
-
-class Tk::BLT::Treeview::Tag < TkObject
-  include Tk::BLT::Treeview::TagOrID_Methods
-
-  TreeTagID_TBL = TkCore::INTERP.create_table
-
-  (TreeTag_ID = ['blt_treeview_tag'.freeze, TkUtil.untrust('00000')]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  TkCore::INTERP.init_ip_env{
-    TreeTagID_TBL.mutex.synchronize{ TreeTagID_TBL.clear }
-  }
-
-  def self.id2obj(tree, name)
-    tpath = tree.path
-    TreeTagID_TBL.mutex.synchronize{
-      if TreeTagID_TBL[tpath]
-        if TreeTagID_TBL[tpath][name]
-          TreeTagID_TBL[tpath][name]
-        else
-          #self.new(tree, name)
-          (obj = self.allocate).instance_eval{
-            @parent = @tree = tree
-            @tpath = @parent.path
-            @path = @id = name
-            TreeTagID_TBL[@tpath] = {} unless TreeTagID_TBL[@tpath]
-            TreeTagID_TBL[@tpath][@id] = self
-          }
-          obj
-        end
-      else
-        id
-      end
-    }
-  end
-
-  def self.new_by_name(tree, name, *ids)
-    TreeTagID_TBL.mutex.synchronize{
-      unless (obj = TreeTagID_TBL[tree.path][name])
-        (obj = self.allocate).instance_eval{
-          initialize(tree, name, ids)
-          TreeTagID_TBL[@tpath] = {} unless TreeTagID_TBL[@tpath]
-          TreeTagID_TBL[@tpath][@id] = self
-        }
-      end
-      obj
-    }
-  end
-
-  def self.new(tree, *ids)
-    TreeTagID_TBL.mutex.synchronize{
-      (obj = self.allocate).instance_eval{
-        if tree.kind_of?(Array)
-          initialize(tree[0], tree[1], ids)
-        else
-          initialize(tree, nil, ids)
-        end
-        TreeTagID_TBL[@tpath] = {} unless TreeTagID_TBL[@tpath]
-        TreeTagID_TBL[@tpath][@id] = self
-      }
-      obj
-    }
-  end
-
-  def initialize(tree, name, ids)
-    @parent = @tree = tree
-    @tpath = @parent.path
-
-    if name
-      @path = @id = name
-    else
-      TreeTag_ID.mutex.synchronize{
-        @path = @id = TreeTag_ID.join(TkCore::INTERP._ip_id_).freeze
-        TreeTag_ID[1].succ!
-      }
-    end
-
-    unless ids.empty?
-      tk_call(@tpath, 'tag', 'add', @id, *(ids.collect{|id| tagid(id)}))
-    end
-  end
-
-  def tagid(tag)
-    if tag.kind_of?(Tk::BLT::Treeview::Node) \
-      || tag.kind_of?(Tk::BLT::Treeview::Tag)
-      tag.id
-    else
-      tag
-    end
-  end
-  private :tagid
-
-  def id
-    @id
-  end
-
-  def add(*ids)
-    tk_call(@tpath, 'tag', 'add', @id, *(ids{|id| tagid(id)}))
-    self
-  end
-
-  def remove(*ids)
-    tk_call(@tpath, 'tag', 'delete', @id, *(ids{|id| tagid(id)}))
-    self
-  end
-
-  def forget
-    tk_call(@tpath, 'tag', 'forget', @id)
-    self
-  end
-
-  def nodes
-    simplelist(tk_call(@tpath, 'tag', 'nodes', @id)).collect{|id|
-      Tk::BLT::Treeview::Node.id2obj(@tree, id)
-    }
-  end
-end
-
-class Tk::BLT::Hiertable
-  TkCommandNames = ['::blt::hiertable'.freeze].freeze
-  WidgetClassName = 'Hiertable'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-end
diff --git a/ext/tk/lib/tkextlib/blt/unix_dnd.rb b/ext/tk/lib/tkextlib/blt/unix_dnd.rb
deleted file mode 100644
index 3c0cd33b79..0000000000
--- a/ext/tk/lib/tkextlib/blt/unix_dnd.rb
+++ /dev/null
@@ -1,142 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/blt/unix_dnd.rb
-#
-#    *** This is alpha version, because there is no document on BLT. ***
-#
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/blt.rb'
-
-module Tk::BLT
-  module DnD
-    extend TkCore
-
-    TkCommandNames = ['::blt::dnd'.freeze].freeze
-
-    ##############################
-
-    extend TkItemConfigMethod
-
-    class << self
-      def __item_cget_cmd(id)
-        ['::blt::dnd', *id]
-      end
-      private :__item_cget_cmd
-
-      def __item_config_cmd(id)
-        ['::blt::dnd', *id]
-      end
-      private :__item_config_cmd
-
-      private :itemcget_tkstring, :itemcget, :itemcget_strict
-      private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
-
-      def cget_tkstring(win, option)
-        itemcget_tkstring(['cget', win], option)
-      end
-      def cget(win, option)
-        itemcget(['cget', win], option)
-      end
-      def cget_strict(win, option)
-        itemcget_strict(['cget', win], option)
-      end
-      def configure(win, slot, value=None)
-        itemconfigure(['configure', win], slot, value)
-      end
-      def configinfo(win, slot=nil)
-        itemconfiginfo(['configure', win], slot)
-      end
-      def current_configinfo(win, slot=nil)
-        current_itemconfiginfo(['configure', win], slot)
-      end
-
-      def token_cget_tkstring(win, option)
-        itemcget_tkstring(['token', 'cget', win], option)
-      end
-      def token_cget(win, option)
-        itemcget(['token', 'cget', win], option)
-      end
-      def token_cget_strict(win, option)
-        itemcget_strict(['token', 'cget', win], option)
-      end
-      def token_configure(win, slot, value=None)
-        itemconfigure(['token', 'configure', win], slot, value)
-      end
-      def token_configinfo(win, slot=nil)
-        itemconfiginfo(['token', 'configure', win], slot)
-      end
-      def current_token_configinfo(win, slot=nil)
-        current_itemconfiginfo(['token', 'configure', win], slot)
-      end
-
-      def token_windowconfigure(win, slot, value=None)
-        itemconfigure(['token', 'window', win], slot, value)
-      end
-      def token_windowconfiginfo(win, slot=nil)
-        itemconfiginfo(['token', 'window', win], slot)
-      end
-      def current_token_windowconfiginfo(win, slot=nil)
-        current_itemconfiginfo(['token', 'window', win], slot)
-      end
-    end
-
-    ##############################
-
-    def self.cancel(win)
-      tk_call('::blt::dnd', 'cancel', *wins)
-    end
-    def self.delete(*wins)
-      tk_call('::blt::dnd', 'delete', *wins)
-    end
-    def self.delete_source(*wins)
-      tk_call('::blt::dnd', 'delete', '-source', *wins)
-    end
-    def self.delete_target(*wins)
-      tk_call('::blt::dnd', 'delete', '-target', *wins)
-    end
-    def self.drag(win, x, y, token=None)
-      tk_call('::blt::dnd', 'drag', win, x, y, token)
-    end
-    def self.drop(win, x, y, token=None)
-      tk_call('::blt::dnd', 'drop', win, x, y, token)
-    end
-    def self.get_data(win, fmt=nil, cmd=nil)
-      if fmt
-        tk_call('::blt::dnd', 'getdata', win, fmt, cmd)
-      else
-        list(tk_call('::blt::dnd', 'getdata', win))
-      end
-    end
-    def self.names(pat=None)
-      list(tk_call('::blt::dnd', 'names', pat))
-    end
-    def self.source_names(pat=None)
-      list(tk_call('::blt::dnd', 'names', '-source', pat))
-    end
-    def self.target_names(pat=None)
-      list(tk_call('::blt::dnd', 'names', '-target', pat))
-    end
-    def self.pull(win, fmt)
-      tk_call('::blt::dnd', 'pull', win, fmt)
-    end
-    def self.register(win, keys={})
-      tk_call('::blt::dnd', 'register', win, keys)
-    end
-    def self.select(win, x, y, timestamp)
-      tk_call('::blt::dnd', 'select', win, x, y, timestamp)
-    end
-    def self.set_data(win, fmt=nil, cmd=nil)
-      if fmt
-        tk_call('::blt::dnd', 'setdata', win, fmt, cmd)
-      else
-        list(tk_call('::blt::dnd', 'setdata', win))
-      end
-    end
-    def self.token(*args)
-      tk_call('::blt::dnd', 'token', *args)
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/blt/vector.rb b/ext/tk/lib/tkextlib/blt/vector.rb
deleted file mode 100644
index a3ab7e64b2..0000000000
--- a/ext/tk/lib/tkextlib/blt/vector.rb
+++ /dev/null
@@ -1,257 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/blt/vector.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/blt.rb'
-
-module Tk::BLT
-  class Vector < TkVariable
-    TkCommandNames = ['::blt::vector'.freeze].freeze
-
-    def self.create(*args)
-      tk_call('::blt::vector', 'create', *args)
-    end
-
-    def self.destroy(*args)
-      tk_call('::blt::vector', 'destroy', *args)
-    end
-
-    def self.expr(expression)
-      tk_call('::blt::vector', 'expr', expression)
-    end
-
-    def self.names(pat=None)
-      list = simplelist(tk_call('::blt::vector', 'names', pat))
-      TkVar_ID_TBL.mutex.synchronize{
-        list.collect{|name|
-          if TkVar_ID_TBL[name]
-            TkVar_ID_TBL[name]
-          elsif name[0..1] == '::' && TkVar_ID_TBL[name[2..-1]]
-            TkVar_ID_TBL[name[2..-1]]
-          else
-            name
-          end
-        }
-      }
-    end
-
-    ####################################
-
-    def initialize(size=nil, keys={})
-      if size.kind_of?(Hash)
-        keys = size
-        size = nil
-      end
-      if size.kind_of?(Array)
-        # [first, last]
-        size = size.join(':')
-      end
-      if size
-        @id = TkCore::INTERP._invoke('::blt::vector', 'create',
-                                     "#auto(#{size})", *hash_kv(keys))
-      else
-        @id = TkCore::INTERP._invoke('::blt::vector', 'create',
-                                     "#auto", *hash_kv(keys))
-      end
-
-      TkVar_ID_TBL.mutex.synchronize{
-        TkVar_ID_TBL[@id] = self
-      }
-
-      @def_default = false
-      @default_val = nil
-
-      @trace_var  = nil
-      @trace_elem = nil
-      @trace_opts = nil
-
-      # teach Tk-ip that @id is global var
-      TkCore::INTERP._invoke_without_enc('global', @id)
-    end
-
-    def destroy
-      tk_call('::blt::vector', 'destroy', @id)
-    end
-
-    def inspect
-      '#<Tk::BLT::Vector: ' + @id + '>'
-    end
-
-    def to_s
-      @id
-    end
-
-    def *(item)
-      list(tk_call(@id, '*', item))
-    end
-
-    def +(item)
-      list(tk_call(@id, '+', item))
-    end
-
-    def -(item)
-      list(tk_call(@id, '-', item))
-    end
-
-    def /(item)
-      list(tk_call(@id, '/', item))
-    end
-
-    def append(*vectors)
-      tk_call(@id, 'append', *vectors)
-    end
-
-    def binread(channel, len=None, keys={})
-      if len.kind_of?(Hash)
-        keys = len
-        len = None
-      end
-      keys = _symbolkey2str(keys)
-      keys['swap'] = None if keys.delete('swap')
-      tk_call(@id, 'binread', channel, len, keys)
-    end
-
-    def clear()
-      tk_call(@id, 'clear')
-      self
-    end
-
-    def delete(*indices)
-      tk_call(@id, 'delete', *indices)
-      self
-    end
-
-    def dup_vector(vec)
-      tk_call(@id, 'dup', vec)
-      self
-    end
-
-    def expr(expression)
-      tk_call(@id, 'expr', expression)
-      self
-    end
-
-    def index(idx, val=None)
-      number(tk_call(@id, 'index', idx, val))
-    end
-
-    def [](idx)
-      index(idx)
-    end
-
-    def []=(idx, val)
-      index(idx, val)
-    end
-
-    def length()
-      number(tk_call(@id, 'length'))
-    end
-
-    def length=(size)
-      number(tk_call(@id, 'length', size))
-    end
-
-    def merge(*vectors)
-      tk_call(@id, 'merge', *vectors)
-      self
-    end
-
-    def normalize(vec=None)
-      tk_call(@id, 'normalize', vec)
-      self
-    end
-
-    def notify(keyword)
-      tk_call(@id, 'notify', keyword)
-      self
-    end
-
-    def offset()
-      number(tk_call(@id, 'offset'))
-    end
-
-    def offset=(val)
-      number(tk_call(@id, 'offset', val))
-    end
-
-    def random()
-      tk_call(@id, 'random')
-    end
-
-    def populate(vector, density=None)
-      tk_call(@id, 'populate', vector, density)
-      self
-    end
-
-    def range(first, last=None)
-      list(tk_call(@id, 'range', first, last))
-    end
-
-    def search(val1, val2=None)
-      list(tk_call(@id, 'search', val1, val2))
-    end
-
-    def set(item)
-      tk_call(@id, 'set', item)
-      self
-    end
-
-    def seq(start, finish=None, step=None)
-      tk_call(@id, 'seq', start, finish, step)
-      self
-    end
-
-    def sort(*vectors)
-      tk_call(@id, 'sort', *vectors)
-      self
-    end
-
-    def sort_reverse(*vectors)
-      tk_call(@id, 'sort', '-reverse', *vectors)
-      self
-    end
-
-    def split(*vectors)
-      tk_call(@id, 'split', *vectors)
-      self
-    end
-
-    def variable(var)
-      tk_call(@id, 'variable', var)
-      self
-    end
-  end
-
-  class VectorAccess < Vector
-    def self.new(name)
-      TkVar_ID_TBL.mutex.synchronize{
-        if TkVar_ID_TBL[name]
-          TkVar_ID_TBL[name]
-        else
-          (obj = self.allocate).instance_eval{
-            initialize(name)
-            TkVar_ID_TBL[@id] = self
-          }
-          obj
-        end
-      }
-    end
-
-    def initialize(vec_name)
-      @id = vec_name
-
-      @def_default = false
-      @default_val = nil
-
-      @trace_var  = nil
-      @trace_elem = nil
-      @trace_opts = nil
-
-      # teach Tk-ip that @id is global var
-      TkCore::INTERP._invoke_without_enc('global', @id)
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/blt/watch.rb b/ext/tk/lib/tkextlib/blt/watch.rb
deleted file mode 100644
index b88c81c745..0000000000
--- a/ext/tk/lib/tkextlib/blt/watch.rb
+++ /dev/null
@@ -1,176 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/blt/watch.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/blt.rb'
-
-module Tk::BLT
-  class Watch < TkObject
-    extend TkCore
-
-    TkCommandNames = ['::blt::watch'.freeze].freeze
-
-    WATCH_ID_TBL = TkCore::INTERP.create_table
-
-    (BLT_WATCH_ID = ['blt_watch_id'.freeze, TkUtil.untrust('00000')]).instance_eval{
-      @mutex = Mutex.new
-      def mutex; @mutex; end
-      freeze
-    }
-
-    TkCore::INTERP.init_ip_env{
-      WATCH_ID_TBL.mutex.synchronize{ WATCH_ID_TBL.clear }
-    }
-
-    def self.names(state = None)
-      lst = tk_split_list(tk_call('::blt::watch', 'names', state))
-      WATCH_ID_TBL.mutex.synchronize{
-        lst.collect{|name|
-          WATCH_ID_TBL[name] || name
-        }
-      }
-    end
-
-    def __numval_optkeys
-      ['maxlevel']
-    end
-    private :__numval_optkeys
-
-    def __boolval_optkeys
-      ['active']
-    end
-    private :__boolval_optkeys
-
-    def __config_cmd
-      ['::blt::watch', 'configure', self.path]
-    end
-    private :__config_cmd
-
-    def initialize(name = nil, keys = {})
-      if name.kind_of?(Hash)
-        keys = name
-        name = nil
-      end
-
-      if name
-        @id = name.to_s
-      else
-        BLT_WATCH_ID.mutex.synchronize{
-          @id = BLT_WATCH_ID.join(TkCore::INTERP._ip_id_)
-          BLT_WATCH_ID[1].succ!
-        }
-      end
-
-      @path = @id
-
-      WATCH_ID_TBL.mutex.synchronize{
-        WATCH_ID_TBL[@id] = self
-      }
-      tk_call('::blt::watch', 'create', @id, *hash_kv(keys))
-    end
-
-    def activate
-      tk_call('::blt::watch', 'activate', @id)
-      self
-    end
-    def deactivate
-      tk_call('::blt::watch', 'deactivate', @id)
-      self
-    end
-    def delete
-      tk_call('::blt::watch', 'delete', @id)
-      self
-    end
-    def info
-      ret = []
-      lst = tk_split_simplelist(tk_call('::blt::watch', 'info', @id))
-      until lst.empty?
-        k, v, *lst = lst
-        k = k[1..-1]
-        case k
-        when /^(#{__strval_optkeys.join('|')})$/
-          # do nothing
-
-        when /^(#{__numval_optkeys.join('|')})$/
-          begin
-            v = number(v)
-          rescue
-            v = nil
-          end
-
-        when /^(#{__numstrval_optkeys.join('|')})$/
-          v = num_or_str(v)
-
-        when /^(#{__boolval_optkeys.join('|')})$/
-          begin
-            v = bool(v)
-          rescue
-            v = nil
-          end
-
-        when /^(#{__listval_optkeys.join('|')})$/
-          v = simplelist(v)
-
-        when /^(#{__numlistval_optkeys.join('|')})$/
-          v = list(v)
-
-        else
-          if v.index('{')
-            v = tk_split_list(v)
-          else
-            v = tk_tcl2ruby(v)
-          end
-        end
-
-        ret << [k, v]
-      end
-
-      ret
-    end
-    def configinfo(slot = nil)
-      if slot
-        slot = slot.to_s
-        v = cget(slot)
-        if TkComm::GET_CONFIGINFO_AS_ARRAY
-          [slot, v]
-        else
-          {slot=>v}
-        end
-      else
-        if TkComm::GET_CONFIGINFO_AS_ARRAY
-          info
-        else
-          Hash[*(info.flatten)]
-        end
-      end
-    end
-    def cget_strict(key)
-      key = key.to_s
-      begin
-        info.assoc(key)[1]
-      rescue
-        fail ArgumentError, "unknown option '#{key}'"
-      end
-    end
-    def cget(key)
-      unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-        cget_strict(key)
-      else
-        begin
-          cget_strict(key)
-        rescue => e
-          if current_configinfo.has_key?(key.to_s)
-            # error on known option
-            fail e
-          else
-            # unknown option
-            nil
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/blt/win_printer.rb b/ext/tk/lib/tkextlib/blt/win_printer.rb
deleted file mode 100644
index 8d609acc19..0000000000
--- a/ext/tk/lib/tkextlib/blt/win_printer.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/blt/win_printer.rb
-#
-#      *** Windows only ***
-#
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/blt.rb'
-
-module Tk::BLT
-  class Printer < TkObject
-    extend TkCore
-
-    TkCommandNames = ['::blt::printer'.freeze].freeze
-
-    def self.enum(attribute)
-      simplelist(tk_call('::blt::printer', 'enum', attribute))
-    end
-
-    def self.names(pat=None)
-      simplelist(tk_call('::blt::printer', 'names', pat))
-    end
-
-    def self.open(printer)
-      self.new(printer)
-    end
-
-    #################################
-
-    def initialize(printer)
-      @printer_id = tk_call('::blt::printer', 'open', printer)
-    end
-
-    def close
-      tk_call('::blt::print', 'close', @printer_id)
-      self
-    end
-    def get_attrs(var)
-      tk_call('::blt::print', 'getattrs', @printer_id, var)
-      var
-    end
-    def set_attrs(var)
-      tk_call('::blt::print', 'setattrs', @printer_id, var)
-      self
-    end
-    def snap(win)
-      tk_call('::blt::print', 'snap', @printer_id, win)
-      self
-    end
-    def write(str)
-      tk_call('::blt::print', 'write', @printer_id, str)
-      self
-    end
-    def write_with_title(title, str)
-      tk_call('::blt::print', 'write', @printer_id, title, str)
-      self
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/blt/winop.rb b/ext/tk/lib/tkextlib/blt/winop.rb
deleted file mode 100644
index 38033e1113..0000000000
--- a/ext/tk/lib/tkextlib/blt/winop.rb
+++ /dev/null
@@ -1,108 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/blt/winop.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/blt.rb'
-
-module Tk::BLT
-  module Winop
-    extend TkCore
-
-    TkCommandNames = ['::blt::winop'.freeze].freeze
-  end
-  WinOp = Winop
-end
-
-class << Tk::BLT::Winop
-  def changes(win)
-    tk_call('::blt::winop', 'changes', win)
-  end
-
-  def colormap(win)
-    Hash[*list(tk_call('::blt::winop', 'colormap', win))]
-  end
-
-  def convolve(src, dest, filter)
-    tk_call('::blt::winop', 'convolve', src, dest, filter)
-  end
-
-  def image_convolve(src, dest, filter)
-    tk_call('::blt::winop', 'image', 'convolve', src, dest, filter)
-  end
-  def image_gradient(photo, left, right, type)
-    tk_call('::blt::winop', 'image', 'gradient', photo, left, right, type)
-  end
-  def image_read_jpeg(file, photo)
-    tk_call('::blt::winop', 'image', 'readjpeg', file, photo)
-  end
-  def image_resample(src, dest, horiz_filter=None, vert_filter=None)
-    tk_call('::blt::winop', 'image', 'resample',
-            src, dest, horiz_filter, vert_filter)
-  end
-  def image_rotate(src, dest, angle)
-    tk_call('::blt::winop', 'image', 'rotate', src, dest, angle)
-  end
-  def image_snap(win, photo, width=None, height=None)
-    tk_call('::blt::winop', 'image', 'snap', win, photo, width, height)
-  end
-  def image_subsample(src, dest, x, y, width, height,
-                      horiz_filter=None, vert_filter=None)
-    tk_call('::blt::winop', 'image', 'subsample',
-            src, dest, x, y, width, height, horiz_filter, vert_filter)
-  end
-
-  def quantize(src, dest, colors)
-    tk_call('::blt::winop', 'quantize', src, dest, colors)
-  end
-
-  def query()
-    tk_call('::blt::winop', 'query')
-  end
-
-  def read_jpeg(file, photo)
-    tk_call('::blt::winop', 'readjpeg', file, photo)
-  end
-
-  def resample(src, dest, horiz_filter=None, vert_filter=None)
-    tk_call('::blt::winop', 'resample',
-            src, dest, horiz_filter, vert_filter)
-  end
-
-  def subsample(src, dest, x, y, width, height,
-                horiz_filter=None, vert_filter=None)
-    tk_call('::blt::winop', 'subsample',
-            src, dest, x, y, width, height, horiz_filter, vert_filter)
-  end
-
-  def raise(*wins)
-    tk_call('::blt::winop', 'raise', *wins)
-  end
-
-  def lower(*wins)
-    tk_call('::blt::winop', 'lower', *wins)
-  end
-
-  def map(*wins)
-    tk_call('::blt::winop', 'map', *wins)
-  end
-
-  def unmap(*wins)
-    tk_call('::blt::winop', 'unmap', *wins)
-  end
-
-  def move(win, x, y)
-    tk_call('::blt::winop', 'move', win, x, y)
-  end
-
-  def snap(win, photo)
-    tk_call('::blt::winop', 'snap', win, photo)
-  end
-
-  def warpto(win = None)
-    tk_call('::blt::winop', 'warpto', win)
-  end
-  alias warp_to warpto
-end
diff --git a/ext/tk/lib/tkextlib/bwidget.rb b/ext/tk/lib/tkextlib/bwidget.rb
deleted file mode 100644
index 0fa9c77ecf..0000000000
--- a/ext/tk/lib/tkextlib/bwidget.rb
+++ /dev/null
@@ -1,154 +0,0 @@
-# frozen_string_literal: false
-#
-#  BWidget extension support
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/bwidget/setup.rb'
-
-# load all image format handlers
-#TkPackage.require('BWidget', '1.7')
-TkPackage.require('BWidget')
-
-module Tk
-  module BWidget
-    TkComm::TkExtlibAutoloadModule.unshift(self)
-    # Require autoload-symbols which is a same name as widget classname.
-    # Those are used at  TkComm._genobj_for_tkwidget method.
-
-    extend TkCore
-
-    LIBRARY = tk_call('set', '::BWIDGET::LIBRARY')
-
-    PACKAGE_NAME = 'BWidget'.freeze
-    def self.package_name
-      PACKAGE_NAME
-    end
-
-    def self.package_version
-      begin
-        TkPackage.require('BWidget')
-      rescue
-        ''
-      end
-    end
-
-    def self.XLFDfont(cmd, *args)
-      if args[-1].kind_of?(Hash)
-        keys = args.pop
-        args.concat(hash_kv(keys))
-      end
-      tk_call('BWidget::XLFDfont', cmd, *args)
-    end
-
-    def self.assert(exp, msg=None)
-      tk_call('BWidget::assert', exp, msg)
-    end
-
-    def self.badOptionString(type, value, list)
-      tk_call('BWidget::badOptionString', type, value, list)
-    end
-
-    def self.bindMouseWheel(widget)
-      tk_call('BWidget::bindMouseWheel', widget)
-    end
-
-    def self.classes(klass)
-      list(tk_call('BWidget::classes', klass))
-    end
-
-    def self.clonename(menu)
-      tk_call('BWidget::clonename', menu)
-    end
-
-    def self.focus(opt, path)
-      tk_call('BWidget::focus', opt, path)
-    end
-
-    def self.get3dcolor(path, bgcolor)
-      tk_call('BWidget::get3dcolor', path, bgcolor)
-    end
-
-    def self.getname(name)
-      tk_call('BWidget::getname', name)
-    end
-
-    def self.grab(opt, path)
-      tk_call('BWidget::grab', opt, path)
-    end
-
-    def self.inuse(klass)
-      bool(tk_call('BWidget::inuse', klass))
-    end
-
-    def self.library(klass, *klasses)
-      tk_call('BWidget::library', klass, *klasses)
-    end
-
-    def self.lreorder(list, neworder)
-      tk_call('BWidget::lreorder', list, neworder)
-    end
-
-    def self.parsetext(text)
-      tk_call('BWidget::parsetext', text)
-    end
-
-    def self.place(path, w, h, *args)
-      if args[-1].kind_of?(Hash)
-        keys = args.pop
-        args.concat(hash_kv(keys))
-      end
-      tk_call('BWidget::place', path, w, h, *(args.flatten))
-    end
-
-    def self.write(file, mode=None)
-      tk_call('BWidget::write', file, mode)
-    end
-
-    def self.wrongNumArgsString(str)
-      tk_call('BWidget::wrongNumArgsString', str)
-    end
-
-    ####################################################
-
-    autoload :ArrowButton,     'tkextlib/bwidget/arrowbutton'
-    autoload :Bitmap,          'tkextlib/bwidget/bitmap'
-    autoload :Button,          'tkextlib/bwidget/button'
-    autoload :ButtonBox,       'tkextlib/bwidget/buttonbox'
-    autoload :ComboBox,        'tkextlib/bwidget/combobox'
-    autoload :Dialog,          'tkextlib/bwidget/dialog'
-    autoload :DragSite,        'tkextlib/bwidget/dragsite'
-    autoload :DropSite,        'tkextlib/bwidget/dropsite'
-    autoload :DynamicHelp,     'tkextlib/bwidget/dynamichelp'
-    autoload :Entry,           'tkextlib/bwidget/entry'
-    autoload :Label,           'tkextlib/bwidget/label'
-    autoload :LabelEntry,      'tkextlib/bwidget/labelentry'
-    autoload :LabelFrame,      'tkextlib/bwidget/labelframe'
-    autoload :ListBox,         'tkextlib/bwidget/listbox'
-    autoload :MainFrame,       'tkextlib/bwidget/mainframe'
-    autoload :MessageDlg,      'tkextlib/bwidget/messagedlg'
-    autoload :NoteBook,        'tkextlib/bwidget/notebook'
-    autoload :PagesManager,    'tkextlib/bwidget/pagesmanager'
-    autoload :PanedWindow,     'tkextlib/bwidget/panedwindow'
-    autoload :PasswdDlg,       'tkextlib/bwidget/passwddlg'
-    autoload :ProgressBar,     'tkextlib/bwidget/progressbar'
-    autoload :ProgressDlg,     'tkextlib/bwidget/progressdlg'
-    autoload :ScrollableFrame, 'tkextlib/bwidget/scrollableframe'
-    autoload :ScrolledWindow,  'tkextlib/bwidget/scrolledwindow'
-    autoload :ScrollView,      'tkextlib/bwidget/scrollview'
-    autoload :SelectColor,     'tkextlib/bwidget/selectcolor'
-    autoload :SelectFont,      'tkextlib/bwidget/selectfont'
-    autoload :Separator,       'tkextlib/bwidget/separator'
-    autoload :SpinBox,         'tkextlib/bwidget/spinbox'
-    autoload :TitleFrame,      'tkextlib/bwidget/titleframe'
-    autoload :Tree,            'tkextlib/bwidget/tree'
-    autoload :Widget,          'tkextlib/bwidget/widget'
-
-  end
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/arrowbutton.rb b/ext/tk/lib/tkextlib/bwidget/arrowbutton.rb
deleted file mode 100644
index a991245065..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/arrowbutton.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/bwidget/arrowbutton.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/bwidget.rb'
-require 'tkextlib/bwidget/button'
-
-module Tk
-  module BWidget
-    class ArrowButton < Tk::BWidget::Button
-    end
-  end
-end
-
-class Tk::BWidget::ArrowButton
-  TkCommandNames = ['ArrowButton'.freeze].freeze
-  WidgetClassName = 'ArrowButton'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/bitmap.rb b/ext/tk/lib/tkextlib/bwidget/bitmap.rb
deleted file mode 100644
index 3acdfdf5ec..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/bitmap.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/bwidget/bitmap.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-require 'tk/image'
-require 'tkextlib/bwidget.rb'
-
-module Tk
-  module BWidget
-    class Bitmap < TkPhotoImage
-    end
-  end
-end
-
-class Tk::BWidget::Bitmap
-  def initialize(name)
-    @path = tk_call_without_enc('Bitmap::get', name)
-    Tk_IMGTBL[@path] = self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/button.rb b/ext/tk/lib/tkextlib/bwidget/button.rb
deleted file mode 100644
index ad880ebfdd..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/button.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/bwidget/button.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tk/button'
-require 'tkextlib/bwidget.rb'
-
-module Tk
-  module BWidget
-    class Button < Tk::Button
-    end
-  end
-end
-
-class Tk::BWidget::Button
-  TkCommandNames = ['Button'.freeze].freeze
-  WidgetClassName = 'Button'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __strval_optkeys
-    super() << 'helptext'
-  end
-  private :__strval_optkeys
-
-  def __tkvariable_optkeys
-    super() << 'helpvar'
-  end
-  private :__tkvariable_optkeys
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/buttonbox.rb b/ext/tk/lib/tkextlib/bwidget/buttonbox.rb
deleted file mode 100644
index 780a6a649e..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/buttonbox.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/bwidget/buttonbox.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/bwidget.rb'
-require 'tkextlib/bwidget/button'
-
-module Tk
-  module BWidget
-    class ButtonBox < TkWindow
-    end
-  end
-end
-
-class Tk::BWidget::ButtonBox
-  TkCommandNames = ['ButtonBox'.freeze].freeze
-  WidgetClassName = 'ButtonBox'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  include TkItemConfigMethod
-
-  def __boolval_optkeys
-    super() << 'homogeneous'
-  end
-  private :__boolval_optkeys
-
-  def tagid(tagOrId)
-    if tagOrId.kind_of?(Tk::BWidget::Button)
-      name = tagOrId[:name]
-      return index(name) unless name.empty?
-    end
-    if tagOrId.kind_of?(Tk::Button)
-      return index(tagOrId[:text])
-    end
-    # index(tagOrId.to_s)
-    index(_get_eval_string(tagOrId))
-  end
-
-  def add(keys={}, &b)
-    win = window(tk_send('add', *hash_kv(keys)))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    win
-  end
-
-  def delete(idx)
-    tk_send('delete', tagid(idx))
-    self
-  end
-
-  def index(idx)
-    if idx.kind_of?(Tk::BWidget::Button)
-      name = idx[:name]
-      idx = name unless name.empty?
-    end
-    if idx.kind_of?(Tk::Button)
-      idx = idx[:text]
-    end
-    number(tk_send('index', idx.to_s))
-  end
-
-  def insert(idx, keys={}, &b)
-    win = window(tk_send('insert', tagid(idx), *hash_kv(keys)))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    win
-  end
-
-  def invoke(idx)
-    tk_send('invoke', tagid(idx))
-    self
-  end
-
-  def set_focus(idx)
-    tk_send('setfocus', tagid(idx))
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/combobox.rb b/ext/tk/lib/tkextlib/bwidget/combobox.rb
deleted file mode 100644
index b3de3186d6..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/combobox.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/bwidget/combobox.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tk/entry'
-require 'tkextlib/bwidget.rb'
-require 'tkextlib/bwidget/listbox'
-require 'tkextlib/bwidget/spinbox'
-
-module Tk
-  module BWidget
-    class ComboBox < Tk::BWidget::SpinBox
-    end
-  end
-end
-
-class Tk::BWidget::ComboBox
-  include Scrollable
-
-  TkCommandNames = ['ComboBox'.freeze].freeze
-  WidgetClassName = 'ComboBox'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __boolval_optkeys
-    super() << 'autocomplete' << 'autopost'
-  end
-  private :__boolval_optkeys
-
-  def get_listbox(&b)
-    win = window(tk_send_without_enc('getlistbox'))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    win
-  end
-
-  def clear_value
-    tk_send_without_enc('clearvalue')
-    self
-  end
-  alias clearvalue clear_value
-
-  def icursor(idx)
-    tk_send_without_enc('icursor', idx)
-  end
-
-  def post
-    tk_send_without_enc('post')
-    self
-  end
-
-  def unpost
-    tk_send_without_enc('unpost')
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/dialog.rb b/ext/tk/lib/tkextlib/bwidget/dialog.rb
deleted file mode 100644
index ed929cb830..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/dialog.rb
+++ /dev/null
@@ -1,195 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/bwidget/dialog.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tk/frame'
-require 'tkextlib/bwidget.rb'
-require 'tkextlib/bwidget/buttonbox'
-
-module Tk
-  module BWidget
-    class Dialog < TkWindow
-    end
-  end
-end
-
-class Tk::BWidget::Dialog
-  TkCommandNames = ['Dialog'.freeze].freeze
-  WidgetClassName = 'Dialog'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  include TkItemConfigMethod
-
-  def __numstrval_optkeys
-    super() << 'buttonwidth'
-  end
-  private :__numstrval_optkeys
-
-  def __strval_optkeys
-    super() << 'title' << 'geometry'
-  end
-  private :__strval_optkeys
-
-  def __boolval_optkeys
-    super() << 'transient' << 'homogeneous'
-  end
-  private :__boolval_optkeys
-
-  def initialize(parent=nil, keys=nil)
-    @relative = ''
-    if parent.kind_of?(Hash)
-      keys = _symbolkey2str(parent)
-      @relative = keys['parent'] if keys.key?('parent')
-      @relative = keys.delete('relative') if keys.key?('relative')
-      super(keys)
-    elsif keys
-      keys = _symbolkey2str(keys)
-      @relative = keys.delete('parent') if keys.key?('parent')
-      @relative = keys.delete('relative') if keys.key?('relative')
-      super(parent, keys)
-    else
-      super(parent)
-    end
-  end
-
-  def create_self(keys)
-    cmd = self.class::TkCommandNames[0]
-    if keys and keys != None
-      tk_call_without_enc(cmd, @path, '-parent', @relative,
-                          *hash_kv(keys, true))
-    else
-      tk_call_without_enc(cmd, @path, '-parent', @relative)
-    end
-  end
-
-  def cget_tkstring(slot)
-    if slot.to_s == 'relative'
-      super('parent')
-    else
-      super(slot)
-    end
-  end
-  def cget_strict(slot)
-    if slot.to_s == 'relative'
-      super('parent')
-    else
-      super(slot)
-    end
-  end
-  def cget(slot)
-    if slot.to_s == 'relative'
-      super('parent')
-    else
-      super(slot)
-    end
-  end
-
-  def configure(slot, value=None)
-    if slot.kind_of?(Hash)
-      slot = _symbolkey2str(slot)
-      slot['parent'] = slot.delete('relative') if slot.key?('relative')
-      super(slot)
-    else
-      if slot.to_s == 'relative'
-        super('parent', value)
-      else
-        super(slot, value)
-      end
-    end
-  end
-
-  def configinfo(slot=nil)
-    if slot
-      if slot.to_s == 'relative'
-        super('parent')
-      else
-        super(slot)
-      end
-    else
-      ret = super()
-      if TkComm::GET_CONFIGINFO_AS_ARRAY
-        ret << ['relative', 'parent']
-      else
-        ret['relative'] = 'parent'
-      end
-    end
-  end
-
-  def tagid(tagOrId)
-    if tagOrId.kind_of?(Tk::BWidget::Button)
-      name = tagOrId[:name]
-      return index(name) unless name.empty?
-    end
-    if tagOrId.kind_of?(Tk::Button)
-      return index(tagOrId[:text])
-    end
-    # index(tagOrId.to_s)
-    index(_get_eval_string(tagOrId))
-  end
-
-  def add(keys={}, &b)
-    win = window(tk_send('add', *hash_kv(keys)))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    win
-  end
-
-  def get_frame(&b)
-    win = window(tk_send('getframe'))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    win
-  end
-
-  def get_buttonbox(&b)
-    win = window(@path + '.bbox')
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    win
-  end
-
-  def draw(focus_win=None)
-    tk_send('draw', focus_win)
-  end
-
-  def enddialog(ret)
-    tk_send('enddialog', ret)
-  end
-
-  def index(idx)
-    get_buttonbox.index(idx)
-  end
-
-  def invoke(idx)
-    tk_send('invoke', tagid(idx))
-    self
-  end
-
-  def set_focus(idx)
-    tk_send('setfocus', tagid(idx))
-    self
-  end
-
-  def withdraw
-    tk_send('withdraw')
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/dragsite.rb b/ext/tk/lib/tkextlib/bwidget/dragsite.rb
deleted file mode 100644
index 6c7ea4491a..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/dragsite.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/bwidget/dragsite.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/bwidget.rb'
-
-module Tk
-  module BWidget
-    module DragSite
-    end
-  end
-end
-
-module Tk::BWidget::DragSite
-  include Tk
-  extend Tk
-
-  def self.include(klass, type, event)
-    tk_call('DragSite::include', klass, type, event)
-  end
-
-  def self.register(path, keys={})
-    tk_call('DragSite::register', path, *hash_kv(keys))
-  end
-
-  def self.set_drag(path, subpath, initcmd, endcmd, force=None)
-    tk_call('DragSite::setdrag', path, subpath, initcmd, endcmd, force)
-  end
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/dropsite.rb b/ext/tk/lib/tkextlib/bwidget/dropsite.rb
deleted file mode 100644
index e5eb7f4a88..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/dropsite.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/bwidget/dropsite.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/bwidget.rb'
-
-module Tk
-  module BWidget
-    module DropSite
-    end
-  end
-end
-
-module Tk::BWidget::DropSite
-  include Tk
-  extend Tk
-
-  def self.include(klass, type)
-    tk_call('DropSite::include', klass, type)
-  end
-
-  def self.register(path, keys={})
-    tk_call('DropSite::register', path, *hash_kv(keys))
-  end
-
-  def self.set_cursor(cursor)
-    tk_call('DropSite::setcursor', cursor)
-  end
-
-  def self.set_drop(path, subpath, dropover, drop, force=None)
-    tk_call('DropSite::setdrop', path, subpath, dropover, drop, force)
-  end
-
-  def self.set_operation(op)
-    tk_call('DropSite::setoperation', op)
-  end
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/dynamichelp.rb b/ext/tk/lib/tkextlib/bwidget/dynamichelp.rb
deleted file mode 100644
index 7e7538fc00..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/dynamichelp.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/bwidget/dynamichelp.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/bwidget.rb'
-
-module Tk
-  module BWidget
-    module DynamicHelp
-    end
-  end
-end
-
-module Tk::BWidget::DynamicHelp
-  include Tk
-  extend Tk
-
-  def self.__pathname
-    'DynamicHelp::configure'
-  end
-
-  def __strval_optkeys
-    super() << 'topbackground'
-  end
-  private :__strval_optkeys
-
-  def self.__cget_cmd
-    ['DynamicHelp::configure']
-  end
-
-  def self.__config_cmd
-    ['DynamicHelp::configure']
-  end
-
-  def self.cget_strict(slot)
-    slot = slot.to_s
-    info = {}
-    self.current_configinfo.each{|k,v| info[k.to_s] = v if k.to_s == slot}
-    fail RuntimeError, "unknown option \"-#{slot}\""  if info.empty?
-    info.values[0]
-  end
-  def self.cget(slot)
-    self.current_configinfo(slot).values[0]
-  end
-
-  def self.add(widget, keys={})
-    tk_call('DynamicHelp::add', widget, *hash_kv(keys))
-  end
-
-  def self.delete(widget)
-    tk_call('DynamicHelp::delete', widget)
-  end
-
-  def self.include(klass, type)
-    tk_call('DynamicHelp::include', klass, type)
-  end
-
-  def self.sethelp(path, subpath, force=None)
-    tk_call('DynamicHelp::sethelp', path, subpath, force)
-  end
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/entry.rb b/ext/tk/lib/tkextlib/bwidget/entry.rb
deleted file mode 100644
index bfbe2f1967..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/entry.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/bwidget/entry.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tk/entry'
-require 'tkextlib/bwidget.rb'
-
-module Tk
-  module BWidget
-    class Entry < Tk::Entry
-    end
-  end
-end
-
-class Tk::BWidget::Entry
-  include Scrollable
-
-  TkCommandNames = ['Entry'.freeze].freeze
-  WidgetClassName = 'Entry'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __strval_optkeys
-    super() << 'helptext' << 'insertbackground'
-  end
-  private :__strval_optkeys
-
-  def __boolval_optkeys
-    super() << 'dragenabled' << 'dropenabled' << 'editable'
-  end
-  private :__boolval_optkeys
-
-  def __tkvariable_optkeys
-    super() << 'helpvar'
-  end
-  private :__tkvariable_optkeys
-
-  def invoke
-    tk_send_without_enc('invoke')
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/label.rb b/ext/tk/lib/tkextlib/bwidget/label.rb
deleted file mode 100644
index 9a0b73d95c..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/label.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/bwidget/label.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tk/label'
-require 'tkextlib/bwidget.rb'
-
-module Tk
-  module BWidget
-    class Label < Tk::Label
-    end
-  end
-end
-
-class Tk::BWidget::Label
-  TkCommandNames = ['Label'.freeze].freeze
-  WidgetClassName = 'Label'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __strval_optkeys
-    super() << 'helptext'
-  end
-  private :__strval_optkeys
-
-  def __boolval_optkeys
-    super() << 'dragenabled' << 'dropenabled'
-  end
-  private :__boolval_optkeys
-
-  def __tkvariable_optkeys
-    super() << 'helpvar'
-  end
-  private :__tkvariable_optkeys
-
-  def set_focus
-    tk_send_without_enc('setfocus')
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/labelentry.rb b/ext/tk/lib/tkextlib/bwidget/labelentry.rb
deleted file mode 100644
index 501f9515fa..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/labelentry.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/bwidget/labelentry.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tk/entry'
-require 'tkextlib/bwidget.rb'
-require 'tkextlib/bwidget/labelframe'
-require 'tkextlib/bwidget/entry'
-
-module Tk
-  module BWidget
-    class LabelEntry < Tk::Entry
-    end
-  end
-end
-
-class Tk::BWidget::LabelEntry
-  include Scrollable
-
-  TkCommandNames = ['LabelEntry'.freeze].freeze
-  WidgetClassName = 'LabelEntry'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __strval_optkeys
-    super() << 'helptext' << 'insertbackground' << 'entryfg' << 'entrybg'
-  end
-  private :__strval_optkeys
-
-  def __tkvariable_optkeys
-    super() << 'helpvar'
-  end
-  private :__tkvariable_optkeys
-
-  def __font_optkeys
-    super() << 'labelfont'
-  end
-  private :__font_optkeys
-
-  #def entrybind(*args)
-  #  _bind([path, 'bind'], *args)
-  #  self
-  #end
-  def entrybind(context, *args)
-    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _bind([path, 'bind'], context, cmd, *args)
-    self
-  end
-
-  #def entrybind_append(*args)
-  #  _bind_append([path, 'bind'], *args)
-  #  self
-  #end
-  def entrybind_append(context, *args)
-    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _bind_append([path, 'bind'], context, cmd, *args)
-    self
-  end
-
-  def entrybind_remove(*args)
-    _bind_remove([path, 'bind'], *args)
-    self
-  end
-
-  def entrybindinfo(*args)
-    _bindinfo([path, 'bind'], *args)
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/labelframe.rb b/ext/tk/lib/tkextlib/bwidget/labelframe.rb
deleted file mode 100644
index 21c529c6c9..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/labelframe.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/bwidget/labelframe.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tk/frame'
-require 'tkextlib/bwidget.rb'
-require 'tkextlib/bwidget/label'
-
-module Tk
-  module BWidget
-    class LabelFrame < TkWindow
-    end
-  end
-end
-
-class Tk::BWidget::LabelFrame
-  TkCommandNames = ['LabelFrame'.freeze].freeze
-  WidgetClassName = 'LabelFrame'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __strval_optkeys
-    super() << 'helptext'
-  end
-  private :__strval_optkeys
-
-  def __boolval_optkeys
-    super() << 'dragenabled' << 'dropenabled'
-  end
-  private :__boolval_optkeys
-
-  def __tkvariable_optkeys
-    super() << 'helpvar'
-  end
-  private :__tkvariable_optkeys
-
-  def self.align(*args)
-    tk_call('LabelFrame::align', *args)
-  end
-  def get_frame(&b)
-    win = window(tk_send_without_enc('getframe'))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    win
-  end
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/listbox.rb b/ext/tk/lib/tkextlib/bwidget/listbox.rb
deleted file mode 100644
index 301eb4bb54..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/listbox.rb
+++ /dev/null
@@ -1,362 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/bwidget/listbox.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tk/canvas'
-require 'tkextlib/bwidget.rb'
-
-module Tk
-  module BWidget
-    class ListBox < TkWindow
-      # is NOT a subclass of a listbox widget class.
-      # because it constructed on a canvas widget.
-
-      class Item < TkObject
-      end
-    end
-  end
-end
-
-class Tk::BWidget::ListBox
-  include TkItemConfigMethod
-  include Scrollable
-
-  TkCommandNames = ['ListBox'.freeze].freeze
-  WidgetClassName = 'ListBox'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  class Event_for_Items < TkEvent::Event
-    def self._get_extra_args_tbl
-      [
-        TkComm.method(:string)   # item identifier
-      ]
-    end
-  end
-
-  def __boolval_optkeys
-    super() << 'autofocus' << 'dragenabled' << 'dropenabled' << 'selectfill'
-  end
-  private :__boolval_optkeys
-
-  def tagid(tag)
-    if tag.kind_of?(Tk::BWidget::ListBox::Item)
-      tag.id
-    else
-      # tag
-      _get_eval_string(tag)
-    end
-  end
-
-  #def imagebind(*args)
-  #  _bind_for_event_class(Event_for_Items, [path, 'bindImage'], *args)
-  #  self
-  #end
-  def imagebind(context, *args)
-    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _bind_for_event_class(Event_for_Items, [path, 'bindImage'],
-                          context, cmd, *args)
-    self
-  end
-
-  #def imagebind_append(*args)
-  #  _bind_append_for_event_class(Event_for_Items, [path, 'bindImage'], *args)
-  #  self
-  #end
-  def imagebind_append(context, *args)
-    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _bind_append_for_event_class(Event_for_Items, [path, 'bindImage'],
-                                 context, cmd, *args)
-    self
-  end
-
-  def imagebind_remove(*args)
-    _bind_remove_for_event_class(Event_for_Items, [path, 'bindImage'], *args)
-    self
-  end
-
-  def imagebindinfo(*args)
-    _bindinfo_for_event_class(Event_for_Items, [path, 'bindImage'], *args)
-  end
-
-  #def textbind(*args)
-  #  _bind_for_event_class(Event_for_Items, [path, 'bindText'], *args)
-  #  self
-  #end
-  def textbind(context, *args)
-    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _bind_for_event_class(Event_for_Items, [path, 'bindText'],
-                          context, cmd, *args)
-    self
-  end
-
-  #def textbind_append(*args)
-  #  _bind_append_for_event_class(Event_for_Items, [path, 'bindText'], *args)
-  #  self
-  #end
-  def textbind_append(context, *args)
-    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _bind_append_for_event_class(Event_for_Items, [path, 'bindText'],
-                                 context, cmd, *args)
-    self
-  end
-
-  def textbind_remove(*args)
-    _bind_remove_for_event_class(Event_for_Items, [path, 'bindText'], *args)
-    self
-  end
-
-  def textbindinfo(*args)
-    _bindinfo_for_event_class(Event_for_Items, [path, 'bindText'], *args)
-  end
-
-  def delete(*args)
-    tk_send('delete', *args)
-    self
-  end
-
-  def edit(item, text, *args)
-    tk_send('edit', tagid(item), text, *args)
-    self
-  end
-
-  def exist?(item)
-    bool(tk_send('exists', tagid(item)))
-  end
-
-  def index(item)
-    num_or_str(tk_send('index', tagid(item)))
-  end
-
-  def insert(idx, item, keys={})
-    tk_send('insert', idx, tagid(item), *hash_kv(keys))
-    self
-  end
-
-  def get_item(idx)
-    tk_send('items', idx)
-  end
-
-  def items(first=None, last=None)
-    list(tk_send('items', first, last))
-  end
-
-  def move(item, idx)
-    tk_send('move', tagid(item), idx)
-    self
-  end
-
-  def reorder(neworder)
-    tk_send('reorder', neworder)
-    self
-  end
-
-  def see(item)
-    tk_send('see', tagid(item))
-    self
-  end
-
-  def selection_clear
-    tk_send_without_enc('selection', 'clear')
-    self
-  end
-
-  def selection_set(*args)
-    tk_send_without_enc('selection', 'set',
-                        *(args.collect{|item| tagid(item)}))
-    self
-  end
-
-  def selection_add(*args)
-    tk_send_without_enc('selection', 'add',
-                        *(args.collect{|item| tagid(item)}))
-    self
-  end
-
-  def selection_remove(*args)
-    tk_send_without_enc('selection', 'remove',
-                        *(args.collect{|item| tagid(item)}))
-    self
-  end
-
-  def selection_get(*args)
-    simplelist(tk_send_without_enc('selection', 'get')).collect{|item|
-      Tk::BWidget::ListBox::Item.id2obj(self, item)
-    }
-  end
-end
-
-class Tk::BWidget::ListBox::Item
-  include TkTreatTagFont
-
-  ListItem_TBL = TkCore::INTERP.create_table
-
-  (ListItem_ID = ['bw:item'.freeze, TkUtil.untrust('00000')]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  TkCore::INTERP.init_ip_env{
-    ListItem_TBL.mutex.synchronize{ ListItem_TBL.clear }
-  }
-
-  def self.id2obj(lbox, id)
-    lpath = lbox.path
-    ListItem_TBL.mutex.synchronize{
-      if ListItem_TBL[lpath]
-        ListItem_TBL[lpath][id]? ListItem_TBL[lpath][id]: id
-      else
-        id
-      end
-    }
-  end
-
-  def initialize(lbox, *args)
-    if lbox.kind_of?(Tk::BWidget::ListBox)
-      @listbox = lbox
-    else
-      fail RuntimeError,
-        "expect Tk::BWidget::ListBox or Tk::BWidget::ListBox::Item for 1st argument"
-    end
-
-    if args[-1].kind_of?(Hash)
-      keys = _symbolkey2str(args.pop)
-    else
-      keys = {}
-    end
-
-    index = keys.delete('index')
-    unless args.empty?
-      index = args.shift
-    end
-    index = 'end' unless index
-
-    unless args.empty?
-      fail RuntimeError, 'too much arguments'
-    end
-
-    @lpath = @listbox.path
-
-    if keys.key?('itemname')
-      @path = @id = keys.delete('itemname')
-    else
-      ListItem_ID.mutex.synchronize{
-        @path = @id = ListItem_ID.join(TkCore::INTERP._ip_id_)
-        ListItem_ID[1].succ!
-      }
-    end
-
-    ListItem_TBL.mutex.synchronize{
-      ListItem_TBL[@id] = self
-      ListItem_TBL[@lpath] = {} unless ListItem_TBL[@lpath]
-      ListItem_TBL[@lpath][@id] = self
-    }
-
-    @listbox.insert(index, @id, keys)
-  end
-
-  def listbox
-    @listbox
-  end
-
-  def id
-    @id
-  end
-
-  def [](key)
-    cget(key)
-  end
-
-  def []=(key, val)
-    configure(key, val)
-    val
-  end
-
-  def cget_tkstring(key)
-    @listbox.itemcget_tkstring(@id, key)
-  end
-  def cget(key)
-    @listbox.itemcget(@id, key)
-  end
-  def cget_strict(key)
-    @listbox.itemcget_strict(@id, key)
-  end
-
-  def configure(key, val=None)
-    @listbox.itemconfigure(@id, key, val)
-  end
-
-  def configinfo(key=nil)
-    @listbox.itemconfiginfo(@id, key)
-  end
-
-  def current_configinfo(key=nil)
-    @listbox.current_itemconfiginfo(@id, key)
-  end
-
-  def delete
-    @listbox.delete(@id)
-    self
-  end
-
-  def edit(*args)
-    @listbox.edit(@id, *args)
-    self
-  end
-
-  def exist?
-    @listbox.exist?(@id)
-  end
-
-  def index
-    @listbox.index(@id)
-  end
-
-  def move(index)
-    @listbox.move(@id, index)
-  end
-
-  def see
-    @listbox.see(@id)
-  end
-
-  def selection_add
-    @listbox.selection_add(@id)
-  end
-
-  def selection_remove
-    @listbox.selection_remove(@id)
-  end
-
-  def selection_set
-    @listbox.selection_set(@id)
-  end
-
-  def selection_toggle
-    @listbox.selection_toggle(@id)
-  end
-end
-
diff --git a/ext/tk/lib/tkextlib/bwidget/mainframe.rb b/ext/tk/lib/tkextlib/bwidget/mainframe.rb
deleted file mode 100644
index ad097439c3..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/mainframe.rb
+++ /dev/null
@@ -1,133 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/bwidget/mainframe.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tk/frame'
-require 'tkextlib/bwidget.rb'
-require 'tkextlib/bwidget/progressbar'
-
-module Tk
-  module BWidget
-    class MainFrame < TkWindow
-    end
-  end
-end
-
-class Tk::BWidget::MainFrame
-  TkCommandNames = ['MainFrame'.freeze].freeze
-  WidgetClassName = 'MainFrame'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __strval_optkeys
-    super() << 'progressfg'
-  end
-  private :__strval_optkeys
-
-  def __tkvariable_optkeys
-    super() << 'progressvar'
-  end
-  private :__tkvariable_optkeys
-
-  def __val2ruby_optkeys  # { key=>proc, ... }
-    # The method is used to convert a opt-value to a ruby's object.
-    # When get the value of the option "key", "proc.call(value)" is called.
-    {
-      'menu'=>proc{|v| simplelist(v).collect!{|elem| simplelist(v)}}
-    }
-  end
-  private :__val2ruby_optkeys
-
-  def add_indicator(keys={}, &b)
-    win = window(tk_send('addindicator', *hash_kv(keys)))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    win
-  end
-
-  def add_toolbar(&b)
-    win = window(tk_send('addtoolbar'))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    win
-  end
-
-  def get_frame(&b)
-    win = window(tk_send('getframe'))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    win
-  end
-
-  def get_indicator(idx, &b)
-    win = window(tk_send('getindicator', idx))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    win
-  end
-
-  def get_menu(menu_id, &b)
-    win = window(tk_send('getmenu', menu_id))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    win
-  end
-
-  def get_toolbar(idx, &b)
-    win = window(tk_send('gettoolbar', idx))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    win
-  end
-
-  def get_menustate(tag)
-    tk_send('getmenustate', tag) # return state name string
-  end
-
-  def set_menustate(tag, state)
-    tk_send('setmenustate', tag, state)
-    self
-  end
-
-  def show_statusbar(name)
-    tk_send('showstatusbar', name)
-    self
-  end
-
-  def show_toolbar(idx, mode)
-    tk_send('showtoolbar', idx, mode)
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/messagedlg.rb b/ext/tk/lib/tkextlib/bwidget/messagedlg.rb
deleted file mode 100644
index 69819360a8..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/messagedlg.rb
+++ /dev/null
@@ -1,193 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/bwidget/messagedlg.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/bwidget.rb'
-require 'tkextlib/bwidget/dialog.rb'
-
-module Tk
-  module BWidget
-    class MessageDlg < TkWindow
-    end
-  end
-end
-
-class Tk::BWidget::MessageDlg
-  TkCommandNames = ['MessageDlg'.freeze].freeze
-  WidgetClassName = 'MessageDlg'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def initialize(parent=nil, keys=nil)
-    @relative = ''
-    if parent.kind_of?(Hash)
-      keys = _symbolkey2str(parent)
-      @relative = keys['parent'] if keys.key?('parent')
-      @relative = keys.delete('relative') if keys.key?('relative')
-      super(keys)
-    elsif keys
-      keys = _symbolkey2str(keys)
-      @relative = keys.delete('parent') if keys.key?('parent')
-      @relative = keys.delete('relative') if keys.key?('relative')
-      super(parent, keys)
-    else
-      super(parent)
-    end
-  end
-
-  def create_self(keys)
-    # NOT create widget.
-    # Because the widget no longer exist when returning from creation.
-    @keys = _symbolkey2str(keys).update('parent'=>@relative)
-    @info = nil
-  end
-  private :create_self
-
-  def __strval_optkeys
-    super() << 'message' << 'title'
-  end
-  private :__strval_optkeys
-
-  def __listval_optkeys
-    super() << 'buttons'
-  end
-  private :__listval_optkeys
-
-  def cget(slot)
-    slot = slot.to_s
-    if slot == 'relative'
-      slot = 'parent'
-    end
-    if winfo_exist?
-      val = super(slot)
-      @keys[slot] = val
-    end
-    @keys[slot]
-  end
-  def cget_strict(slot)
-    slot = slot.to_s
-    if slot == 'relative'
-      slot = 'parent'
-    end
-    if winfo_exist?
-      val = super(slot)
-      @keys[slot] = val
-    end
-    @keys[slot]
-  end
-
-  def configure(slot, value=None)
-    if winfo_exist?
-      super(slot, value)
-    end
-    if slot.kind_of?(Hash)
-      slot = _symbolkey2str(slot)
-      slot['parent'] = slot.delete('relative') if slot.key?('relative')
-      @keys.update(slot)
-
-      if @info
-        # update @info
-        slot.each{|k, v|
-          if TkComm::GET_CONFIGINFO_AS_ARRAY
-            if (inf = @info.assoc(k))
-              inf[-1] = v
-            else
-              @info << [k, '', '', '', v]
-            end
-          else
-            if (inf = @info[k])
-              inf[-1] = v
-            else
-              @info[k] = ['', '', '', v]
-            end
-          end
-        }
-      end
-
-    else # ! Hash
-      slot = slot.to_s
-      slot = 'parent' if slot == 'relative'
-      @keys[slot] = value
-
-      if @info
-        # update @info
-        if TkComm::GET_CONFIGINFO_AS_ARRAY
-          if (inf = @info.assoc(slot))
-            inf[-1] = value
-          else
-            @info << [slot, '', '', '', value]
-          end
-        else
-          if (inf = @info[slot])
-            inf[-1] = value
-          else
-            @info[slot] = ['', '', '', value]
-          end
-        end
-      end
-    end
-
-    self
-  end
-
-  def configinfo(slot=nil)
-    if winfo_exist?
-      @info = super()
-      if TkComm::GET_CONFIGINFO_AS_ARRAY
-        @info << ['relative', 'parent']
-      else
-        @info['relative'] = 'parent'
-      end
-    end
-
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if @info
-        if winfo_exist?
-          # update @keys
-          @info.each{|inf| @keys[inf[0]] = inf[-1] if inf.size > 2 }
-        end
-      else
-        @info = []
-        @keys.each{|k, v|
-          @info << [k, '', '', '', v]
-        }
-        @info << ['relative', 'parent']
-      end
-
-      if slot
-        @info.asoc(slot.to_s).dup
-      else
-        @info.dup
-      end
-
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      if @info
-        if winfo_exist?
-          # update @keys
-          @info.each{|k, inf| @keys[k] = inf[-1] if inf.size > 2 }
-        end
-      else
-        @info = {}
-        @keys.each{|k, v|
-          @info[k] = ['', '', '', v]
-        }
-        @info['relative'] = 'parent'
-      end
-
-      if slot
-        @info[slot.to_s].dup
-      else
-        @info.dup
-      end
-    end
-  end
-
-  def create
-    # return the index of the pressed button, or nil if it is destroyed
-    ret = num_or_str(tk_call(self.class::TkCommandNames[0],
-                             @path, *hash_kv(@keys)))
-    (ret < 0)? nil: ret
-  end
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/notebook.rb b/ext/tk/lib/tkextlib/bwidget/notebook.rb
deleted file mode 100644
index 97e9670d01..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/notebook.rb
+++ /dev/null
@@ -1,167 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/bwidget/notebook.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tk/frame'
-require 'tkextlib/bwidget.rb'
-
-module Tk
-  module BWidget
-    class NoteBook < TkWindow
-    end
-  end
-end
-
-class Tk::BWidget::NoteBook
-  include TkItemConfigMethod
-
-  TkCommandNames = ['NoteBook'.freeze].freeze
-  WidgetClassName = 'NoteBook'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  class Event_for_Tabs < TkEvent::Event
-    def self._get_extra_args_tbl
-      [
-        TkComm.method(:string)   # page identifier
-      ]
-    end
-  end
-
-  def __boolval_optkeys
-    super() << 'homogeneous'
-  end
-  private :__boolval_optkeys
-
-  def tagid(id)
-    if id.kind_of?(TkWindow)
-      #id.path
-      id.epath
-    elsif id.kind_of?(TkObject)
-      id.to_eval
-    else
-      # id.to_s
-      _get_eval_string(id)
-    end
-  end
-
-  #def tabbind(*args)
-  #  _bind_for_event_class(Event_for_Tabs, [path, 'bindtabs'], *args)
-  #  self
-  #end
-  def tabbind(context, *args)
-    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _bind_for_event_class(Event_for_Tabs, [path, 'bindtabs'],
-                          context, cmd, *args)
-    self
-  end
-
-  #def tabbind_append(*args)
-  #  _bind_append_for_event_class(Event_for_Tabs, [path, 'bindtabs'], *args)
-  #  self
-  #end
-  def tabbind_append(context, *args)
-    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _bind_append_for_event_class(Event_for_Tabs, [path, 'bindtabs'],
-                                 context, cmd, *args)
-    self
-  end
-
-  def tabbind_remove(*args)
-    _bind_remove_for_event_class(Event_for_Tabs, [path, 'bindtabs'], *args)
-    self
-  end
-
-  def tabbindinfo(*args)
-    _bindinfo_for_event_class(Event_for_Tabs, [path, 'bindtabs'], *args)
-  end
-
-  def add(page, &b)
-    win = window(tk_send('add', tagid(page)))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    win
-  end
-
-  def compute_size
-    tk_send('compute_size')
-    self
-  end
-
-  def delete(page, destroyframe=None)
-    tk_send('delete', tagid(page), destroyframe)
-    self
-  end
-
-  def get_frame(page, &b)
-    win = window(tk_send('getframe', tagid(page)))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    win
-  end
-
-  def index(page)
-    num_or_str(tk_send('index', tagid(page)))
-  end
-
-  def insert(index, page, keys={}, &b)
-    win = window(tk_send('insert', index, tagid(page), *hash_kv(keys)))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    win
-  end
-
-  def move(page, index)
-    tk_send('move', tagid(page), index)
-    self
-  end
-
-  def get_page(page)
-    tk_send('pages', page)
-  end
-
-  def pages(first=None, last=None)
-    list(tk_send('pages', first, last))
-  end
-
-  def raise(page=nil)
-    if page
-      tk_send('raise', page)
-      self
-    else
-      tk_send('raise')
-    end
-  end
-
-  def see(page)
-    tk_send('see', page)
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/pagesmanager.rb b/ext/tk/lib/tkextlib/bwidget/pagesmanager.rb
deleted file mode 100644
index ce18ee0edb..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/pagesmanager.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/bwidget/pagesmanager.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tk/frame'
-require 'tkextlib/bwidget.rb'
-
-module Tk
-  module BWidget
-    class PagesManager < TkWindow
-    end
-  end
-end
-
-class Tk::BWidget::PagesManager
-  TkCommandNames = ['PagesManager'.freeze].freeze
-  WidgetClassName = 'PagesManager'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def tagid(id)
-    # id.to_s
-    _get_eval_string(id)
-  end
-
-  def add(page, &b)
-    win = window(tk_send('add', tagid(page)))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    win
-  end
-
-  def compute_size
-    tk_send('compute_size')
-    self
-  end
-
-  def delete(page)
-    tk_send('delete', tagid(page))
-    self
-  end
-
-  def get_frame(page, &b)
-    win = window(tk_send('getframe', tagid(page)))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    win
-  end
-
-  def get_page(page)
-    tk_send('pages', page)
-  end
-
-  def pages(first=None, last=None)
-    list(tk_send('pages', first, last))
-  end
-
-  def raise(page=None)
-    tk_send('raise', page)
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/panedwindow.rb b/ext/tk/lib/tkextlib/bwidget/panedwindow.rb
deleted file mode 100644
index 560c563479..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/panedwindow.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/bwidget/panedwindow.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tk/frame'
-require 'tkextlib/bwidget.rb'
-
-module Tk
-  module BWidget
-    class PanedWindow < TkWindow
-    end
-  end
-end
-
-class Tk::BWidget::PanedWindow
-  TkCommandNames = ['PanedWindow'.freeze].freeze
-  WidgetClassName = 'PanedWindow'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __strval_optkeys
-    super() << 'activator'
-  end
-  private :__strval_optkeys
-
-  def add(keys={})
-    window(tk_send('add', *hash_kv(keys)))
-  end
-
-  def get_frame(idx, &b)
-    win = window(tk_send_without_enc('getframe', idx))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    win
-  end
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/panelframe.rb b/ext/tk/lib/tkextlib/bwidget/panelframe.rb
deleted file mode 100644
index 0e32f4e261..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/panelframe.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/bwidget/panelframe.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tk/frame'
-require 'tkextlib/bwidget.rb'
-
-module Tk
-  module BWidget
-    class PanelFrame < TkWindow
-    end
-  end
-end
-
-class Tk::BWidget::PanelFrame
-  TkCommandNames = ['PanelFrame'.freeze].freeze
-  WidgetClassName = 'PanelFrame'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __strval_optkeys
-    super() + ['panelforeground', 'panelbackground']
-  end
-  private :__strval_optkeys
-
-  def add(win, keys={})
-    tk_send('add', win, keys)
-    self
-  end
-
-  def delete(*wins)
-    tk_send('delete', *wins)
-    self
-  end
-
-  def get_frame(&b)
-    win = window(tk_send_without_enc('getframe'))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    win
-  end
-
-  def items
-    simplelist(tk_send('items')).map{|w| window(w)}
-  end
-
-  def remove(*wins)
-    tk_send('remove', *wins)
-    self
-  end
-
-  def remove_with_destroy(*wins)
-    tk_send('remove', '-destroy', *wins)
-    self
-  end
-
-  def delete(*wins) # same to 'remove_with_destroy'
-    tk_send('delete', *wins)
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/passwddlg.rb b/ext/tk/lib/tkextlib/bwidget/passwddlg.rb
deleted file mode 100644
index 9fe6fc6a02..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/passwddlg.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/bwidget/passwddlg.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/bwidget.rb'
-require 'tkextlib/bwidget/messagedlg'
-
-module Tk
-  module BWidget
-    class PasswdDlg < Tk::BWidget::MessageDlg
-    end
-  end
-end
-
-class Tk::BWidget::PasswdDlg
-  TkCommandNames = ['PasswdDlg'.freeze].freeze
-  WidgetClassName = 'PasswdDlg'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __strval_optkeys
-    super() << 'loginhelptext' << 'loginlabel' << 'logintext' <<
-      'passwdlabel' << 'passwdtext'
-  end
-  private :__strval_optkeys
-
-  def __boolval_optkeys
-    super() << 'passwdeditable' << 'homogeneous'
-  end
-  private :__boolval_optkeys
-
-  def __tkvariable_optkeys
-    super() << 'loginhelpvar' << 'logintextvariable' <<
-      'passwdhelpvar' << 'passwdtextvariable'
-  end
-  private :__tkvariable_optkeys
-
-  def create
-    login, passwd = simplelist(tk_call(self.class::TkCommandNames[0],
-                                       @path, *hash_kv(@keys)))
-    [login, passwd]
-  end
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/progressbar.rb b/ext/tk/lib/tkextlib/bwidget/progressbar.rb
deleted file mode 100644
index f06ddc164e..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/progressbar.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/bwidget/progressbar.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/bwidget.rb'
-
-module Tk
-  module BWidget
-    class ProgressBar < TkWindow
-    end
-  end
-end
-
-class Tk::BWidget::ProgressBar
-  TkCommandNames = ['ProgressBar'.freeze].freeze
-  WidgetClassName = 'ProgressBar'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/progressdlg.rb b/ext/tk/lib/tkextlib/bwidget/progressdlg.rb
deleted file mode 100644
index e11a73e88d..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/progressdlg.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/bwidget/progressdlg.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tk/variable'
-require 'tkextlib/bwidget.rb'
-require 'tkextlib/bwidget/progressbar'
-require 'tkextlib/bwidget/messagedlg'
-
-module Tk
-  module BWidget
-    class ProgressDlg < Tk::BWidget::MessageDlg
-    end
-  end
-end
-
-class Tk::BWidget::ProgressDlg
-  TkCommandNames = ['ProgressDlg'.freeze].freeze
-  WidgetClassName = 'ProgressDlg'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def create_self(keys)
-    # NOT create widget for reusing the object
-    super(keys)
-    @keys['textvariable'] = TkVariable.new unless @keys.key?('textvariable')
-    @keys['variable']     = TkVariable.new unless @keys.key?('variable')
-  end
-
-  def textvariable
-    @keys['textvariable']
-  end
-
-  def text
-    @keys['textvariable'].value
-  end
-
-  def text= (txt)
-    @keys['textvariable'].value = txt
-  end
-
-  def variable
-    @keys['variable']
-  end
-
-  def value
-    @keys['variable'].value
-  end
-
-  def value= (val)
-    @keys['variable'].value = val
-  end
-
-  def create
-    window(tk_call(self.class::TkCommandNames[0], @path, *hash_kv(@keys)))
-  end
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/scrollableframe.rb b/ext/tk/lib/tkextlib/bwidget/scrollableframe.rb
deleted file mode 100644
index 2b184746a4..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/scrollableframe.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/bwidget/scrollableframe.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tk/frame'
-require 'tkextlib/bwidget.rb'
-
-module Tk
-  module BWidget
-    class ScrollableFrame < TkWindow
-    end
-  end
-end
-
-class Tk::BWidget::ScrollableFrame
-  include Scrollable
-
-  TkCommandNames = ['ScrollableFrame'.freeze].freeze
-  WidgetClassName = 'ScrollableFrame'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def get_frame(&b)
-    win = window(tk_send_without_enc('getframe'))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    win
-  end
-
-  def see(win, vert=None, horiz=None)
-    tk_send_without_enc('see', win, vert, horiz)
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/scrolledwindow.rb b/ext/tk/lib/tkextlib/bwidget/scrolledwindow.rb
deleted file mode 100644
index 9bd5e87554..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/scrolledwindow.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/bwidget/scrolledwindow.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tk/frame'
-require 'tkextlib/bwidget.rb'
-
-module Tk
-  module BWidget
-    class ScrolledWindow < TkWindow
-    end
-  end
-end
-
-class Tk::BWidget::ScrolledWindow
-  TkCommandNames = ['ScrolledWindow'.freeze].freeze
-  WidgetClassName = 'ScrolledWindow'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __strval_optkeys
-    super() << 'sides'
-  end
-  private :__strval_optkeys
-
-  def __boolval_optkeys
-    super() << 'managed'
-  end
-  private :__boolval_optkeys
-
-  def get_frame(&b)
-    win = window(tk_send_without_enc('getframe'))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    win
-  end
-
-  def set_widget(win)
-    tk_send_without_enc('setwidget', win)
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/scrollview.rb b/ext/tk/lib/tkextlib/bwidget/scrollview.rb
deleted file mode 100644
index d60fdca89e..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/scrollview.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/bwidget/scrollview.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/bwidget.rb'
-
-module Tk
-  module BWidget
-    class ScrollView < TkWindow
-    end
-  end
-end
-
-class Tk::BWidget::ScrollView
-  TkCommandNames = ['ScrollView'.freeze].freeze
-  WidgetClassName = 'ScrollView'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __strval_optkeys
-    super() << 'fill'
-  end
-  private :__strval_optkeys
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/selectcolor.rb b/ext/tk/lib/tkextlib/bwidget/selectcolor.rb
deleted file mode 100644
index 85809b69bd..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/selectcolor.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/bwidget/selectcolor.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/bwidget.rb'
-require 'tkextlib/bwidget/messagedlg'
-
-module Tk
-  module BWidget
-    class SelectColor < Tk::BWidget::MessageDlg
-      class Dialog < Tk::BWidget::SelectColor
-      end
-      class Menubutton < Tk::Menubutton
-      end
-      MenuButton = Menubutton
-    end
-  end
-end
-
-class Tk::BWidget::SelectColor
-  extend Tk
-
-  TkCommandNames = ['SelectColor'.freeze].freeze
-  WidgetClassName = 'SelectColor'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def dialog(keys={})
-    newkeys = @keys.dup
-    newkeys.update(_symbolkey2str(keys))
-    tk_call('SelectColor::dialog', @path, *hash_kv(newkeys))
-  end
-
-  def menu(*args)
-    if args[-1].kind_of?(Hash)
-      keys = args.pop
-    else
-      keys = {}
-    end
-    place = args.flatten
-    newkeys = @keys.dup
-    newkeys.update(_symbolkey2str(keys))
-    tk_call('SelectColor::menu', @path, place, *hash_kv(newkeys))
-  end
-
-  def self.set_color(idx, color)
-    tk_call('SelectColor::setcolor', idx, color)
-  end
-end
-
-class Tk::BWidget::SelectColor::Dialog
-  def create_self(keys)
-    super(keys)
-    @keys['type'] = 'dialog'
-  end
-
-  def create
-    @keys['type'] = 'dialog'  # 'dialog' type returns color
-    tk_call(Tk::BWidget::SelectColor::TkCommandNames[0],
-            @path, *hash_kv(@keys))
-  end
-end
-
-class Tk::BWidget::SelectColor::Menubutton
-  def create_self(keys)
-    keys = {} unless keys
-    keys = _symbolkey2str(keys)
-    keys['type'] = 'menubutton'  # 'toolbar' type returns widget path
-    window(tk_call(Tk::BWidget::SelectColor::TkCommandNames[0],
-                   @path, *hash_kv(keys)))
-  end
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/selectfont.rb b/ext/tk/lib/tkextlib/bwidget/selectfont.rb
deleted file mode 100644
index 4f67a2e239..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/selectfont.rb
+++ /dev/null
@@ -1,92 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/bwidget/selectfont.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/bwidget.rb'
-require 'tkextlib/bwidget/messagedlg'
-
-module Tk
-  module BWidget
-    class SelectFont < Tk::BWidget::MessageDlg
-      class Dialog < Tk::BWidget::SelectFont
-      end
-      class Toolbar < TkWindow
-      end
-    end
-  end
-end
-
-class Tk::BWidget::SelectFont
-  extend Tk
-
-  TkCommandNames = ['SelectFont'.freeze].freeze
-  WidgetClassName = 'SelectFont'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __strval_optkeys
-    super() << 'sampletext' <<  'title'
-  end
-  private :__strval_optkeys
-
-  def __boolval_optkeys
-    super() << 'nosizes'
-  end
-  private :__boolval_optkeys
-
-  def __font_optkeys
-    [] # without fontobj operation
-  end
-  private :__font_optkeys
-
-  def create
-    tk_call(self.class::TkCommandNames[0], @path, *hash_kv(@keys))
-  end
-
-  def self.load_font
-    tk_call('SelectFont::loadfont')
-  end
-end
-
-class Tk::BWidget::SelectFont::Dialog
-  def __font_optkeys
-    [] # without fontobj operation
-  end
-
-  def create_self(keys)
-    super(keys)
-    @keys['type'] = 'dialog'
-  end
-
-  def configure(slot, value=None)
-    if slot.kind_of?(Hash)
-      slot.delete['type']
-      slot.delete[:type]
-      return self if slot.empty?
-    else
-      return self if slot == 'type' || slot == :type
-    end
-    super(slot, value)
-  end
-
-  def create
-    @keys['type'] = 'dialog'  # 'dialog' type returns font name
-    tk_call(Tk::BWidget::SelectFont::TkCommandNames[0], @path, *hash_kv(@keys))
-  end
-end
-
-class Tk::BWidget::SelectFont::Toolbar
-  def __font_optkeys
-    [] # without fontobj operation
-  end
-
-  def create_self(keys)
-    keys = {} unless keys
-    keys = _symbolkey2str(keys)
-    keys['type'] = 'toolbar'  # 'toolbar' type returns widget path
-    window(tk_call(Tk::BWidget::SelectFont::TkCommandNames[0],
-                   @path, *hash_kv(keys)))
-  end
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/separator.rb b/ext/tk/lib/tkextlib/bwidget/separator.rb
deleted file mode 100644
index 786c41c763..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/separator.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/bwidget/separator.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/bwidget.rb'
-
-module Tk
-  module BWidget
-    class Separator < TkWindow
-    end
-  end
-end
-
-class Tk::BWidget::Separator
-  TkCommandNames = ['Separator'.freeze].freeze
-  WidgetClassName = 'Separator'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/setup.rb b/ext/tk/lib/tkextlib/bwidget/setup.rb
deleted file mode 100644
index cc967dced6..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/setup.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: false
-#
-#  setup.rb   --   setup script before calling TkPackage.require()
-#
-#    If you need some setup operations (for example, add a library path
-#    to the library search path) before using Tcl/Tk library packages
-#    wrapped by Ruby scripts in this directory, please write the setup
-#    operations in this file.
-#
diff --git a/ext/tk/lib/tkextlib/bwidget/spinbox.rb b/ext/tk/lib/tkextlib/bwidget/spinbox.rb
deleted file mode 100644
index 00fe33da39..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/spinbox.rb
+++ /dev/null
@@ -1,99 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/bwidget/entry.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/bwidget.rb'
-require 'tkextlib/bwidget/arrowbutton'
-require 'tkextlib/bwidget/entry'
-
-module Tk
-  module BWidget
-    class SpinBox < Tk::Entry
-    end
-  end
-end
-
-class Tk::BWidget::SpinBox
-  include Scrollable
-
-  TkCommandNames = ['SpinBox'.freeze].freeze
-  WidgetClassName = 'SpinBox'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __strval_optkeys
-    super() << 'helptext' << 'insertbackground' << 'entryfg' << 'entrybg'
-  end
-  private :__strval_optkeys
-
-  def __boolval_optkeys
-    super() << 'dragenabled' << 'dropenabled' << 'editable'
-  end
-  private :__boolval_optkeys
-
-  def __listval_optkeys
-    super() << 'values'
-  end
-  private :__listval_optkeys
-
-  def __tkvariable_optkeys
-    super() << 'helpvar'
-  end
-  private :__tkvariable_optkeys
-
-  #def entrybind(*args)
-  #  _bind([path, 'bind'], *args)
-  #  self
-  #end
-  def entrybind(context, *args)
-    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _bind([path, 'bind'], context, cmd, *args)
-    self
-  end
-
-  #def entrybind_append(*args)
-  #  _bind_append([path, 'bind'], *args)
-  #  self
-  #end
-  def entrybind_append(context, *args)
-    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _bind_append([path, 'bind'], context, cmd, *args)
-    self
-  end
-
-  def entrybind_remove(*args)
-    _bind_remove([path, 'bind'], *args)
-    self
-  end
-
-  def entrybindinfo(*args)
-    _bindinfo([path, 'bind'], *args)
-    self
-  end
-
-  def get_index_of_value
-    number(tk_send_without_enc('getvalue'))
-  end
-  alias get_value get_index_of_value
-  alias get_value_index get_index_of_value
-
-  def set_value_by_index(idx)
-    idx = "@#{idx}" if idx.kind_of?(Integer)
-    tk_send_without_enc('setvalue', idx)
-    self
-  end
-  alias set_value set_value_by_index
-  alias set_index_value set_value_by_index
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/statusbar.rb b/ext/tk/lib/tkextlib/bwidget/statusbar.rb
deleted file mode 100644
index 28fd6fab21..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/statusbar.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/bwidget/statusbar.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tk/frame'
-require 'tkextlib/bwidget.rb'
-
-module Tk
-  module BWidget
-    class StatusBar < TkWindow
-    end
-  end
-end
-
-class Tk::BWidget::StatusBar
-  TkCommandNames = ['StatusBar'.freeze].freeze
-  WidgetClassName = 'StatusBar'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __boolval_optkeys
-    super() << 'showresize' << 'showseparator' << 'showresizesep'
-  end
-  private :__boolval_optkeys
-
-  def add(win, keys={})
-    tk_send('add', win, keys)
-    self
-  end
-
-  def remove(*wins)
-    tk_send('remove', *wins)
-    self
-  end
-
-  def remove_with_destroy(*wins)
-    tk_send('remove', '-destroy', *wins)
-    self
-  end
-
-  def delete(*wins) # same to 'remove_with_destroy'
-    tk_send('delete', *wins)
-    self
-  end
-
-  def get_frame(&b)
-    win = window(tk_send_without_enc('getframe'))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    win
-  end
-
-  def items
-    simplelist(tk_send('items')).map{|w| window(w)}
-  end
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/titleframe.rb b/ext/tk/lib/tkextlib/bwidget/titleframe.rb
deleted file mode 100644
index eca622399e..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/titleframe.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/bwidget/titleframe.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tk/frame'
-require 'tkextlib/bwidget.rb'
-
-module Tk
-  module BWidget
-    class TitleFrame < TkWindow
-    end
-  end
-end
-
-class Tk::BWidget::TitleFrame
-  TkCommandNames = ['TitleFrame'.freeze].freeze
-  WidgetClassName = 'TitleFrame'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def get_frame(&b)
-    win = window(tk_send_without_enc('getframe'))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    win
-  end
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/tree.rb b/ext/tk/lib/tkextlib/bwidget/tree.rb
deleted file mode 100644
index 468b5e31c4..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/tree.rb
+++ /dev/null
@@ -1,501 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/bwidget/tree.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tk/canvas'
-require 'tkextlib/bwidget.rb'
-
-module Tk
-  module BWidget
-    class Tree < TkWindow
-      class Node < TkObject
-      end
-    end
-  end
-end
-
-class Tk::BWidget::Tree
-  include TkItemConfigMethod
-  include Scrollable
-
-  TkCommandNames = ['Tree'.freeze].freeze
-  WidgetClassName = 'Tree'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  class Event_for_Items < TkEvent::Event
-    def self._get_extra_args_tbl
-      [
-        TkComm.method(:string)   # item identifier
-      ]
-    end
-  end
-
-  def __strval_optkeys
-    super() << 'crossfill' << 'linesfill'
-  end
-  private :__strval_optkeys
-
-  def __boolval_optkeys
-    super() << 'dragenabled' << 'dropenabled' <<
-      'redraw' << 'selectfill' << 'showlines'
-  end
-  private :__boolval_optkeys
-
-  def __tkvariable_optkeys
-    super() << 'helpvar'
-  end
-  private :__tkvariable_optkeys
-
-  def tagid(tag)
-    if tag.kind_of?(Tk::BWidget::Tree::Node)
-      tag.id
-    else
-      # tag
-      _get_eval_string(tag)
-    end
-  end
-
-  def areabind(context, *args)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _bind_for_event_class(Event_for_Items, [path, 'bindArea'],
-                          context, cmd, *args)
-    self
-  end
-
-  def areabind_append(context, *args)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _bind_append_for_event_class(Event_for_Items, [path, 'bindArea'],
-                                 context, cmd, *args)
-    self
-  end
-
-  def areabind_remove(*args)
-    _bind_remove_for_event_class(Event_for_Items, [path, 'bindArea'], *args)
-    self
-  end
-
-  def areabindinfo(*args)
-    _bindinfo_for_event_class(Event_for_Items, [path, 'bindArea'], *args)
-  end
-
-  #def imagebind(*args)
-  #  _bind_for_event_class(Event_for_Items, [path, 'bindImage'], *args)
-  #  self
-  #end
-  def imagebind(context, *args)
-    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _bind_for_event_class(Event_for_Items, [path, 'bindImage'],
-                          context, cmd, *args)
-    self
-  end
-
-  #def imagebind_append(*args)
-  #  _bind_append_for_event_class(Event_for_Items, [path, 'bindImage'], *args)
-  #  self
-  #end
-  def imagebind_append(context, *args)
-    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _bind_append_for_event_class(Event_for_Items, [path, 'bindImage'],
-                                 context, cmd, *args)
-    self
-  end
-
-  def imagebind_remove(*args)
-    _bind_remove_for_event_class(Event_for_Items, [path, 'bindImage'], *args)
-    self
-  end
-
-  def imagebindinfo(*args)
-    _bindinfo_for_event_class(Event_for_Items, [path, 'bindImage'], *args)
-  end
-
-  #def textbind(*args)
-  #  _bind_for_event_class(Event_for_Items, [path, 'bindText'], *args)
-  #  self
-  #end
-  def textbind(context, *args)
-    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _bind_for_event_class(Event_for_Items, [path, 'bindText'],
-                          context, cmd, *args)
-    self
-  end
-
-  #def textbind_append(*args)
-  #  _bind_append_for_event_class(Event_for_Items, [path, 'bindText'], *args)
-  #  self
-  #end
-  def textbind_append(context, *args)
-    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _bind_append_for_event_class(Event_for_Items, [path, 'bindText'],
-                                 context, cmd, *args)
-    self
-  end
-
-  def textbind_remove(*args)
-    _bind_remove_for_event_class(Event_for_Items, [path, 'bindText'], *args)
-    self
-  end
-
-  def textbindinfo(*args)
-    _bindinfo_for_event_class(Event_for_Items, [path, 'bindText'], *args)
-  end
-
-  def close_tree(node, recurse=None)
-    tk_send('closetree', tagid(node), recurse)
-    self
-  end
-
-  def delete(*args)
-    tk_send('delete', *(args.collect{|node| tagid(node)}))
-    self
-  end
-
-  def edit(node, text, *args)
-    tk_send('edit', tagid(node), text, *args)
-    self
-  end
-
-  def exist?(node)
-    bool(tk_send('exists', tagid(node)))
-  end
-
-  def find(findinfo, confine=None)
-    Tk::BWidget::Tree::Node.id2obj(self, tk_send(findinfo, confine))
-  end
-  def find_position(x, y, confine=None)
-    self.find(_at(x,y), confine)
-  end
-  def find_line(linenum)
-    self.find(linenum)
-  end
-
-  def index(node)
-    num_or_str(tk_send('index', tagid(node)))
-  end
-
-  def insert(idx, parent, node, keys={})
-    tk_send('insert', idx, tagid(parent), tagid(node), *hash_kv(keys))
-    self
-  end
-
-  def line(node)
-    number(tk_send('line', tagid(node)))
-  end
-
-  def move(parent, node, idx)
-    tk_send('move', tagid(parent), tagid(node), idx)
-    self
-  end
-
-  def get_node(node, idx)
-    Tk::BWidget::Tree::Node.id2obj(self, tk_send('nodes', tagid(node), idx))
-  end
-
-  def nodes(node, first=None, last=None)
-    simplelist(tk_send('nodes', tagid(node), first, last)).collect{|node|
-      Tk::BWidget::Tree::Node.id2obj(self, node)
-    }
-  end
-
-  def open?(node)
-    bool(self.itemcget(tagid(node), 'open'))
-  end
-
-  def open_tree(node, recurse=None)
-    tk_send('opentree', tagid(node), recurse)
-    self
-  end
-
-  def parent(node)
-    Tk::BWidget::Tree::Node.id2obj(self, tk_send('parent', tagid(node)))
-  end
-
-  def reorder(node, neworder)
-    tk_send('reorder', tagid(node), neworder)
-    self
-  end
-
-  def see(node)
-    tk_send('see', tagid(node))
-    self
-  end
-
-  def selection_add(*args)
-    tk_send_without_enc('selection', 'add',
-                        *(args.collect{|node| tagid(node)}))
-    self
-  end
-
-  def selection_clear
-    tk_send_without_enc('selection', 'clear')
-    self
-  end
-
-  def selection_get
-    list(tk_send_without_enc('selection', 'get'))
-  end
-
-  def selection_include?(*args)
-    bool(tk_send_without_enc('selection', 'get',
-                             *(args.collect{|node| tagid(node)})))
-  end
-
-  def selection_range(*args)
-    tk_send_without_enc('selection', 'range',
-                        *(args.collect{|node| tagid(node)}))
-    self
-  end
-
-  def selection_remove(*args)
-    tk_send_without_enc('selection', 'remove',
-                        *(args.collect{|node| tagid(node)}))
-    self
-  end
-
-  def selection_set(*args)
-    tk_send_without_enc('selection', 'set',
-                        *(args.collect{|node| tagid(node)}))
-    self
-  end
-
-  def selection_toggle(*args)
-    tk_send_without_enc('selection', 'toggle',
-                        *(args.collect{|node| tagid(node)}))
-    self
-  end
-
-  def toggle(node)
-    tk_send_without_enc('toggle', tagid(node))
-    self
-  end
-
-  def visible(node)
-    bool(tk_send_without_enc('visible', tagid(node)))
-  end
-end
-
-class Tk::BWidget::Tree::Node
-  include TkTreatTagFont
-
-  TreeNode_TBL = TkCore::INTERP.create_table
-
-  (TreeNode_ID = ['bw:node'.freeze, TkUtil.untrust('00000')]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  TkCore::INTERP.init_ip_env{
-    TreeNode_TBL.mutex.synchronize{ TreeNode_TBL.clear }
-  }
-
-  def self.id2obj(tree, id)
-    tpath = tree.path
-    TreeNode_TBL.mutex.synchronize{
-      if TreeNode_TBL[tpath]
-        TreeNode_TBL[tpath][id]? TreeNode_TBL[tpath][id]: id
-      else
-        id
-      end
-    }
-  end
-
-  def initialize(tree, *args)
-    if tree.kind_of?(Tk::BWidget::Tree)
-      @tree = tree
-      parent = args.shift
-      if parent.kind_of?(Tk::BWidget::Tree::Node)
-        if parent.tree.path != @tree.path
-          fail RuntimeError, 'tree of parent node is not match'
-        end
-      end
-    elsif tree.kind_of?(Tk::BWidget::Tree::Node)
-      @tree = tree.tree
-      parent = tree.parent
-    else
-      fail RuntimeError,
-        "expect Tk::BWidget::Tree or Tk::BWidget::Tree::Node for 1st argument"
-    end
-
-    if args[-1].kind_of?(Hash)
-      keys = _symbolkey2str(args.pop)
-    else
-      keys = {}
-    end
-
-    index = keys.delete('index')
-    unless args.empty?
-      index = args.shift
-    end
-    index = 'end' unless index
-
-    unless args.empty?
-      fail RuntimeError, 'too much arguments'
-    end
-
-    @tpath = @tree.path
-
-    if keys.key?('nodename')
-      @path = @id = keys.delete('nodename')
-    else
-      TreeNode_ID.mutex.synchronize{
-        @path = @id = TreeNode_ID.join(TkCore::INTERP._ip_id_)
-        TreeNode_ID[1].succ!
-      }
-    end
-
-    TreeNode_TBL.mutex.synchronize{
-      TreeNode_TBL[@id] = self
-      TreeNode_TBL[@tpath] = {} unless TreeNode_TBL[@tpath]
-      TreeNode_TBL[@tpath][@id] = self
-    }
-
-    @tree.insert(index, parent, @id, keys)
-  end
-
-  def tree
-    @tree
-  end
-
-  def id
-    @id
-  end
-
-  def [](key)
-    cget(key)
-  end
-
-  def []=(key, val)
-    configure(key, val)
-    val
-  end
-
-  def cget_tkstring(key)
-    @tree.itemcget_tkstring(@id, key)
-  end
-  def cget(key)
-    @tree.itemcget(@id, key)
-  end
-  def cget_strict(key)
-    @tree.itemcget_strict(@id, key)
-  end
-
-  def configure(key, val=None)
-    @tree.itemconfigure(@id, key, val)
-  end
-
-  def configinfo(key=nil)
-    @tree.itemconfiginfo(@id, key)
-  end
-
-  def current_configinfo(key=nil)
-    @tree.current_itemconfiginfo(@id, key)
-  end
-
-  def close_tree(recurse=None)
-    @tree.close_tree(@id, recurse)
-    self
-  end
-
-  def delete
-    @tree.delete(@id)
-    self
-  end
-
-  def edit(*args)
-    @tree.edit(@id, *args)
-    self
-  end
-
-  def exist?
-    @tree.exist?(@id)
-  end
-
-  def index
-    @tree.index(@id)
-  end
-
-  def move(index, parent=nil)
-    if parent
-      @tree.move(parent, @id, index)
-    else
-      @tree.move(self.parent, @id, index)
-    end
-  end
-
-  def open_tree(recurse=None)
-    @tree.open_tree(@id, recurse)
-    self
-  end
-
-  def open?
-    bool(@tree.itemcget(@id, 'open'))
-  end
-
-  def parent
-    @tree.parent(@id)
-  end
-
-  def reorder(neworder)
-    @tree.reorder(@id, neworder)
-  end
-
-  def see
-    @tree.see(@id)
-  end
-
-  def selection_add
-    @tree.selection_add(@id)
-  end
-
-  def selection_remove
-    @tree.selection_remove(@id)
-  end
-
-  def selection_set
-    @tree.selection_set(@id)
-  end
-
-  def selection_toggle
-    @tree.selection_toggle(@id)
-  end
-
-  def toggle
-    @tree.toggle(@id)
-  end
-
-  def visible
-    @tree.visible(@id)
-  end
-end
diff --git a/ext/tk/lib/tkextlib/bwidget/widget.rb b/ext/tk/lib/tkextlib/bwidget/widget.rb
deleted file mode 100644
index ab08826b19..0000000000
--- a/ext/tk/lib/tkextlib/bwidget/widget.rb
+++ /dev/null
@@ -1,130 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/bwidget/widget.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/bwidget.rb'
-
-module Tk
-  module BWidget
-    module Widget
-    end
-  end
-end
-
-module Tk::BWidget::Widget
-  include Tk
-  extend Tk
-
-  def self.__pathname
-    'Widget::configure'
-  end
-
-  def self.__cget_cmd
-    ['Widget::cget']
-  end
-
-  def self.__config_cmd
-    ['Widget::configure']
-  end
-
-  def self.cget_strict(slot)
-    slot = slot.to_s
-    info = {}
-    self.current_configinfo.each{|k,v| info[k.to_s] = v if k.to_s == slot}
-    fail RuntimeError, "unknown option \"-#{slot}\""  if info.empty?
-    info.values[0]
-  end
-  def self.cget(slot)
-    self.current_configinfo(slot).values[0]
-  end
-
-  def self.add_map(klass, subclass, subpath, opts)
-    tk_call('Widget::addmap', klass, subclass, subpath, opts)
-  end
-
-  def self.bwinclude(klass, subclass, subpath, *args)
-    tk_call('Widget::bwinclude', klass, subclass, subpath, *args)
-  end
-
-  def self.create(klass, path, rename=None, &b)
-    win = window(tk_call('Widget::create', klass, path, rename))
-    if b
-      if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-        win.instance_exec(self, &b)
-      else
-        win.instance_eval(&b)
-      end
-    end
-    win
-  end
-
-  def self.declare(klass, optlist)
-    tk_call('Widget::declare', klass, optlist)
-  end
-
-  def self.define(klass, filename, *args)
-    tk_call('Widget::define', klass, filename, *args)
-  end
-
-  def self.destroy(win)
-    tk_call('Widget::destroy', _epath(win))
-  end
-
-  def self.focus_next(win)
-    tk_call('Widget::focusNext', win)
-  end
-
-  def self.focus_ok(win)
-    tk_call('Widget::focusOk', win)
-  end
-
-  def self.focus_prev(win)
-    tk_call('Widget::focusPrev', win)
-  end
-
-  def self.generate_doc(dir, widgetlist)
-    tk_call('Widget::generate-doc', dir, widgetlist)
-  end
-
-  def self.generate_widget_doc(klass, iscmd, file)
-    tk_call('Widget::generate-widget-doc', klass, iscmd, file)
-  end
-
-  def self.get_option(win, option)
-    tk_call('Widget::getoption', win, option)
-  end
-
-  def self.get_variable(win, varname, my_varname=None)
-    tk_call('Widget::getVariable', win, varname, my_varname)
-  end
-
-  def self.has_changed(win, option, pvalue)
-    tk_call('Widget::hasChanged', win, option, pvalue)
-  end
-
-  def self.init(klass, win, options)
-    tk_call('Widget::init', klass, win, options)
-  end
-
-  def self.set_option(win, option, value)
-    tk_call('Widget::setoption', win, option, value)
-  end
-
-  def self.sub_cget_strict(win, subwidget)
-    tk_call('Widget::subcget', win, subwidget)
-  end
-  def self.sub_cget(win, subwidget)
-    self.sub_cget_strict(win, subwidget)
-  end
-
-  def self.sync_options(klass, subclass, subpath, options)
-    tk_call('Widget::syncoptions', klass, subclass, subpath, options)
-  end
-
-  def self.tkinclude(klass, tkwidget, subpath, *args)
-    tk_call('Widget::tkinclude', klass, tkwidget, subpath, *args)
-  end
-end
diff --git a/ext/tk/lib/tkextlib/itcl.rb b/ext/tk/lib/tkextlib/itcl.rb
deleted file mode 100644
index 3a67b3f651..0000000000
--- a/ext/tk/lib/tkextlib/itcl.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# frozen_string_literal: false
-#
-#  [incr Tcl] support
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/itcl/setup.rb'
-
-# load library
-require 'tkextlib/itcl/incr_tcl.rb'
diff --git a/ext/tk/lib/tkextlib/itcl/incr_tcl.rb b/ext/tk/lib/tkextlib/itcl/incr_tcl.rb
deleted file mode 100644
index de1be12392..0000000000
--- a/ext/tk/lib/tkextlib/itcl/incr_tcl.rb
+++ /dev/null
@@ -1,179 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/itk/incr_tcl.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-
-# call setup script
-require 'tkextlib/itcl.rb'
-
-# TkPackage.require('Itcl', '3.2')
-TkPackage.require('Itcl')
-
-module Tk
-  module Itcl
-    include Tk
-    extend Tk
-
-    LIBRARY = TkVarAccess.new('::itcl::library')
-    PURIST = TkVarAccess.new('::itcl::purist')
-
-    VERSION    = TkCore::INTERP._invoke("set", "::itcl::version").freeze
-    PATCHLEVEL = TkCore::INTERP._invoke("set", "::itcl::patchLevel").freeze
-
-    PACKAGE_NAME = 'Itcl'.freeze
-    def self.package_name
-      PACKAGE_NAME
-    end
-
-    def self.package_version
-      begin
-        TkPackage.require('Itcl')
-      rescue
-        ''
-      end
-    end
-
-    ##############################################
-
-    class ItclObject < TkObject
-      ITCL_CLASSNAME = ''.freeze
-
-      (ITCL_OBJ_ID = ['itclobj'.freeze, TkUtil.untrust('00000')]).instance_eval{
-        @mutex = Mutex.new
-        def mutex; @mutex; end
-        freeze
-      }
-      ITCL_OBJ_TBL = TkUtil.untrust({})
-
-      def initialize(*args)
-        if (@klass = self.class::ITCL_CLASSNAME).empty?
-          fail RuntimeError, 'unknown itcl class (abstract class?)'
-        end
-        Tk::Itcl::ItclObject::ITCL_OBJ_ID.mutex.synchronize{
-          @id = Tk::Itcl::ItclObject::TCL_OBJ_ID.join(TkCore::INTERP._ip_id_)
-          Tk::Itcl::ItclObject::ITCL_OBJ_ID[1].succ!
-        }
-        @path = @id
-      end
-
-      def self.call_proc(name, *args)
-        tk_call("#{ITCL_CLASSNAME}::#{cmd}", *args)
-      end
-
-      def call_method(name, *args)
-        tk_call(@path, name, *args)
-      end
-
-      def isa(klass)
-        bool(tk_call(@path, 'isa', klass))
-      end
-      alias itcl_kind_of? isa
-
-      def info_class
-        tk_call(@path, 'info', 'class')
-      end
-
-      def info_inherit
-        simplelist(tk_call(@path, 'info', 'inherit'))
-      end
-
-      def info_heritage
-        list(tk_call(@path, 'info', 'heritage'))
-      end
-
-      def info_function(*args)
-        if args[-1].kind_of?(Array)
-          params = args.pop
-          params.each{|param|
-            param = param.to_s
-            args << ( (param[0] == ?-)? param: "-#{param}" )
-          }
-        end
-        list(tk_call(@path, 'info', 'function', *args))
-      end
-
-      def info_variable(*args)
-        if args[-1].kind_of?(Array)
-          params = args.pop
-          params.each{|param|
-            param = param.to_s
-            args << ( (param[0] == ?-)? param: "-#{param}" )
-          }
-        end
-        list(tk_call(@path, 'info', 'variable', *args))
-      end
-    end
-
-    ##############################################
-
-    def self.body(klass, func, args, body)
-      tk_call('::itcl::body', "#{klass}::#{func}", args, body)
-    end
-
-    def self.code(cmd, *args)
-      tk_call('::itcl::code', cmd, *args)
-    end
-
-    def self.code_in_namespace(namespace, cmd, *args)
-      tk_call('::itcl::code', '-namespace', namespace, cmd, *args)
-    end
-
-    def self.configbody(klass, var, body)
-      tk_call('::itcl::configbody', "#{klass}::#{var}", body)
-    end
-
-    def self.create_itcl_class(name, body)
-      TkCore::INTERP._invoke('::itcl::class', name, body)
-      klass = Class.new(Tk::Itcl::ItclObject)
-      klass.const_set('ITCL_CLASSNAME', name.dup.freeze)
-      klass
-    end
-
-    def self.delete_itcl_class(*names)
-      tk_call('::itcl::delete', 'class',  *names)
-    end
-
-    def self.delete_itcl_object(*names)
-      tk_call('::itcl::delete', 'object',  *names)
-    end
-
-    def self.delete_namespace(*names)
-      tk_call('::itcl::delete', 'namespace',  *names)
-    end
-
-    def self.ensemble(name, *args)
-      tk_call('::itcl::ensemble', name, *args)
-    end
-
-    def self.find_classes(pat=None)
-      simplelist(tk_call('::itcl::find', 'classes', pat))
-    end
-
-    def self.find_objects(*args)
-      simplelist(tk_call('::itcl::find', 'objects', *args))
-    end
-
-    def self.is_itcl_class(target)
-      bool(tk_call('::itcl::is', 'class', target))
-    end
-
-    def self.is_itcl_object(target)
-      bool(tk_call('::itcl::is', 'object', target))
-    end
-
-    def self.create_local_obj(klass, name, *args)
-      tk_call('::itcl::local', klass, name, *args)
-    end
-
-    def self.is_itcl_instance(klass, target)
-      bool(tk_call('::itcl::is', 'object', '-class', klass, target))
-    end
-
-    def self.scope(var)
-      tk_call('::itcl::scope', var)
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/itcl/setup.rb b/ext/tk/lib/tkextlib/itcl/setup.rb
deleted file mode 100644
index 917b877947..0000000000
--- a/ext/tk/lib/tkextlib/itcl/setup.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# frozen_string_literal: false
-#
-#  setup.rb   --   setup script before calling TkPackage.require()
-#
-#    If you need some setup operations (for example, add a library path
-#    to the library search path) before using Tcl/Tk library packages
-#    wrapped by Ruby scripts in this directory, please write the setup
-#    operations in this file.
-#
-
-
-# set [incr Tcl] library directory
-
-# ENV['ITCL_LIBRARY'] = '/usr/local/ActiveTcl/lib/itcl3.2/'
diff --git a/ext/tk/lib/tkextlib/itk.rb b/ext/tk/lib/tkextlib/itk.rb
deleted file mode 100644
index 112cb789f2..0000000000
--- a/ext/tk/lib/tkextlib/itk.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# frozen_string_literal: false
-#
-#  [incr Tk] support
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/itk/setup.rb'
-
-# load library
-require 'tkextlib/itk/incr_tk.rb'
diff --git a/ext/tk/lib/tkextlib/itk/incr_tk.rb b/ext/tk/lib/tkextlib/itk/incr_tk.rb
deleted file mode 100644
index 8c6fe1374f..0000000000
--- a/ext/tk/lib/tkextlib/itk/incr_tk.rb
+++ /dev/null
@@ -1,447 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/itk/incr_tk.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tk/menuspec'
-require 'tkextlib/itcl.rb'
-
-# call setup script
-require 'tkextlib/itk.rb'
-
-#TkPackage.require('Itk', '3.2')
-TkPackage.require('Itk')
-
-module Tk
-  module Itk
-    include Tk
-    extend Tk
-
-    LIBRARY = TkVarAccess.new('::itk::library')
-
-    PACKAGE_NAME = 'Itk'.freeze
-    def self.package_name
-      PACKAGE_NAME
-    end
-
-    def self.package_version
-      begin
-        TkPackage.require('Itk')
-      rescue
-        ''
-      end
-    end
-
-    def self.usual(arg, *args)
-      tk_call('::itk::usual', arg, *args)
-    end
-
-    def self.usual_names
-      list(tk_call('::itk::usual'))
-    end
-
-    ############################
-
-    class Archetype < TkWindow
-      TkCommandNames = [].freeze
-      # WidgetClassName = 'Archetype'.freeze
-      # WidgetClassNames[WidgetClassName] = self
-
-      def self.to_eval
-        '::itk::' << self::WidgetClassName
-      end
-
-      def __destroy_hook__
-        Tk::Itk::Component::ComponentID_TBL.delete(self.path)
-      end
-
-      #### [incr Tk] public methods
-      def component
-        simplelist(tk_send('component'))
-      end
-
-      def component_path(name)
-        window(tk_send('component', name))
-      end
-      alias component_widget component_path
-
-      def component_invoke(name, cmd, *args)
-        window(tk_send('component', name, cmd, *args))
-      end
-
-      def component_obj(*names)
-        names = component if names.empty?
-        names.collect{|name| Tk::Itk::Component.new(self.path, name) }
-      end
-
-      #### [incr Tk] protected methods
-=begin
-      def itk_component_add(visibility, name, create_cmds, option_cmds=None)
-        args = []
-        visibility.each{|v| v = v.to_s; args << ( (v[0] == ?-)? v: "-#{v}" )}
-        args << '--' << name << create_cmd << option_cmds
-        tk_call('itk_component', 'add', *args)
-      end
-
-      def itk_component_delete(*names)
-        tk_call('itk_component', 'delete', *names)
-      end
-
-      def itk_initialize(keys={})
-        tk_call('itk_initialize', keys)
-      end
-
-      def itk_option_add(*args)
-        tk_call('itk_option', 'add', *args)
-      end
-
-      def itk_option_define(name, resource, klass, init, config=None)
-        tk_call('itk_option', 'define', name, resource, klass, init, config)
-      end
-
-      def itk_option_remove(*args)
-        tk_call('itk_option', 'remove', *args)
-      end
-=end
-    end
-
-    ############################
-
-    class Toplevel < Archetype
-      TkCommandNames = ['::itk::Toplevel'].freeze
-      WidgetClassName = 'Toplevel'.freeze
-      WidgetClassNames[WidgetClassName] ||= self
-
-      include Wm
-      include TkMenuSpec
-
-      def __strval_optkeys
-        super() << 'title'
-      end
-      private :__strval_optkeys
-    end
-
-    ############################
-
-    class Widget < Archetype
-      TkCommandNames = ['::itk::Widget'].freeze
-      WidgetClassName = 'Widget'.freeze
-      WidgetClassNames[WidgetClassName] ||= self
-    end
-
-
-    ############################
-
-    class Component < TkObject
-      def __cget_cmd
-        [self.master, 'component', self.name, 'cget']
-      end
-      private :__cget_cmd
-
-      def __config_cmd
-        [self.master, 'component', self.name, 'configure']
-      end
-      private :__config_cmd
-
-      ComponentID_TBL = TkCore::INTERP.create_table
-
-      (Itk_Component_ID = ['itk:component'.freeze, TkUtil.untrust('00000')]).instance_eval{
-        @mutex = Mutex.new
-        def mutex; @mutex; end
-        freeze
-      }
-
-      TkCore::INTERP.init_ip_env{
-        ComponentID_TBL.mutex.synchronize{ ComponentID_TBL.clear }
-      }
-
-      def self.id2obj(master, id)
-        if master.kind_of?(TkObject)
-          master = master.path
-        else
-          master = master.to_s
-        end
-        ComponentID_TBL.mutex.synchronize{
-          if ComponentID_TBL.key?(master)
-            (ComponentID_TBL[master].key?(id))? ComponentID_TBL[master][id]: id
-          else
-            id
-          end
-        }
-      end
-
-      def self.new(master, component=nil)
-        if master.kind_of?(TkObject)
-          master = master.path
-        else
-          master = master.to_s
-        end
-
-        if component.kind_of?(Tk::Itk::Component)
-          component = component.name
-        elsif component
-          component = component.to_s
-        else
-          Itk_Component_ID.mutex.synchronize{
-            component = Itk_Component_ID.join(TkCore::INTERP._ip_id_)
-            Itk_Component_ID[1].succ!
-          }
-        end
-
-        ComponentID_TBL.mutex.synchronize{
-          if ComponentID_TBL.key?(master)
-            if ComponentID_TBL[master].key?(component)
-              return ComponentID_TBL[master][component]
-            end
-          else
-            ComponentID_TBL[master] = {}
-          end
-        }
-
-        super(master, component)
-      end
-
-      def initialize(master, component)
-        @master = master
-        @component = component
-
-        ComponentID_TBL.mutex.synchronize{
-          ComponentID_TBL[@master][@component] = self
-        }
-
-        begin
-          @widget = window(tk_call(@master, 'component', @component))
-          @path = @widget.path
-        rescue
-          @widget = nil
-          @path = nil
-        end
-      end
-
-      def path
-        unless @path
-          begin
-            @widget = window(tk_call(@master, 'component', @component))
-            @path = @widget.path
-          rescue
-            fail RuntimeError, 'component is not assigned to a widget'
-          end
-        end
-        @path
-      end
-
-      def epath
-        path()
-      end
-
-      def to_eval
-        path()
-      end
-
-      def master
-        @master
-      end
-
-      def name
-        @component
-      end
-
-      def widget
-        unless @widget
-          begin
-            @widget = window(tk_call(@master, 'component', @component))
-            @path = @widget.path
-          rescue
-            fail RuntimeError, 'component is not assigned to a widget'
-          end
-        end
-        @widget
-      end
-
-      def widget_class
-        unless @widget
-          begin
-            @widget = window(tk_call(@master, 'component', @component))
-            @path = @widget.path
-            @widget.classname
-          rescue
-            nil
-          end
-        end
-      end
-
-      def method_missing(id, *args)
-        name = id.id2name
-
-        # try 1 : component command
-        begin
-          return tk_call(@master, 'component', @component, name, *args)
-        rescue
-        end
-
-        # try 2 : component configure
-        len = args.length
-        begin
-          case len
-          when 1
-            if name[-1] == ?=
-              return configure(name[0..-2], args[0])
-            else
-              return configure(name, args[0])
-            end
-          when 0
-            return cget(name)
-          end
-        rescue
-        end
-
-        # try 3 : widget method or widget configure
-        begin
-          unless @widget
-            @widget = window(tk_call(@master, 'component', @component))
-            @path = @widget.path
-          end
-          @widget.__send__(id, *args)
-        rescue
-        end
-
-        # unknown method
-        super(id, *args)
-        # fail RuntimeError, "unknown method '#{name}' for #{self.inspect}"
-      end
-
-      def tk_send(cmd, *rest)
-        begin
-          tk_call(@master, 'component', @component, cmd, *rest)
-        rescue
-          unless @path
-            begin
-              @widget = window(tk_call(@master, 'component', @component))
-              @path = @widget.path
-            rescue
-              fail RuntimeError, 'component is not assigned to a widget'
-            end
-          end
-          tk_call(@path, cmd, *rest)
-        end
-      end
-
-      def tk_send_without_enc(cmd, *rest)
-        begin
-          tk_call_without_enc(@master, 'component', @component, cmd, *rest)
-        rescue
-          unless @path
-            begin
-              @widget = window(tk_call(@master, 'component', @component))
-              @path = @widget.path
-            rescue
-              fail RuntimeError, 'component is not assigned to a widget'
-            end
-          end
-          tk_call_without_enc(@path, cmd, *rest)
-        end
-      end
-
-      def tk_send_with_enc(cmd, *rest)
-        begin
-          tk_call_with_enc(@master, 'component', @component, cmd, *rest)
-        rescue
-          unless @path
-            begin
-              @widget = window(tk_call(@master, 'component', @component))
-              @path = @widget.path
-            rescue
-              fail RuntimeError, 'component is not assigned to a widget'
-            end
-          end
-          tk_call_with_enc(@path, cmd, *rest)
-        end
-      end
-
-      #def bind(*args)
-      #  unless @widget
-      #    begin
-      #      @widget = window(tk_call(@master, 'component', @component))
-      #      @path = @widget.path
-      #    rescue
-      #      fail RuntimeError, 'component is not assigned to a widget'
-      #    end
-      #  end
-      #  @widget.bind(*args)
-      #end
-      def bind(context, *args)
-        unless @widget
-          begin
-            @widget = window(tk_call(@master, 'component', @component))
-            @path = @widget.path
-          rescue
-            fail RuntimeError, 'component is not assigned to a widget'
-          end
-        end
-        # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-        if TkComm._callback_entry?(args[0]) || !block_given?
-          cmd = args.shift
-        else
-          cmd = Proc.new
-        end
-        @widget.bind(context, cmd, *args)
-      end
-
-      #def bind_append(*args)
-      #  unless @widget
-      #    begin
-      #      @widget = window(tk_call(@master, 'component', @component))
-      #      @path = @widget.path
-      #    rescue
-      #      fail RuntimeError, 'component is not assigned to a widget'
-      #    end
-      #  end
-      #  @widget.bind_append(*args)
-      #end
-      def bind_append(context, *args)
-        unless @widget
-          begin
-            @widget = window(tk_call(@master, 'component', @component))
-            @path = @widget.path
-          rescue
-            fail RuntimeError, 'component is not assigned to a widget'
-          end
-        end
-        # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-        if TkComm._callback_entry?(args[0]) || !block_given?
-          cmd = args.shift
-        else
-          cmd = Proc.new
-        end
-        @widget.bind_append(context, cmd, *args)
-      end
-
-      def bind_remove(*args)
-        unless @widget
-          begin
-            @widget = window(tk_call(@master, 'component', @component))
-            @path = @widget.path
-          rescue
-            fail RuntimeError, 'component is not assigned to a widget'
-          end
-        end
-        @widget.bind_remove(*args)
-      end
-
-      def bindinfo(*args)
-        unless @widget
-          begin
-            @widget = window(tk_call(@master, 'component', @component))
-            @path = @widget.path
-          rescue
-            fail RuntimeError, 'component is not assigned to a widget'
-          end
-        end
-        @widget.bindinfo(*args)
-      end
-
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/itk/setup.rb b/ext/tk/lib/tkextlib/itk/setup.rb
deleted file mode 100644
index f32d5d6a75..0000000000
--- a/ext/tk/lib/tkextlib/itk/setup.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# frozen_string_literal: false
-#
-#  setup.rb   --   setup script before calling TkPackage.require()
-#
-#    If you need some setup operations (for example, add a library path
-#    to the library search path) before using Tcl/Tk library packages
-#    wrapped by Ruby scripts in this directory, please write the setup
-#    operations in this file.
-#
-
-
-# set [incr Tk] library directory
-
-# ENV['ITK_LIBRARY'] = '/usr/local/ActiveTcl/lib/itk3.2/'
diff --git a/ext/tk/lib/tkextlib/iwidgets.rb b/ext/tk/lib/tkextlib/iwidgets.rb
deleted file mode 100644
index 2ebd9d993e..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-# frozen_string_literal: false
-#
-#  [incr Widgets] support
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/itcl'
-require 'tkextlib/itk'
-
-# call setup script for general 'tkextlib' libraries
-#require 'tkextlib/setup.rb'
-
-# call setup script
-#require 'tkextlib/iwidgets/setup.rb'
-
-# load all image format handlers
-#TkPackage.require('Iwidgets', '4.0')
-TkPackage.require('Iwidgets')
-
-module Tk
-  module Iwidgets
-    TkComm::TkExtlibAutoloadModule.unshift(self)
-
-    extend TkCore
-
-    PACKAGE_NAME = 'Iwidgets'.freeze
-    def self.package_name
-      PACKAGE_NAME
-    end
-
-    def self.package_version
-      begin
-        TkPackage.require('Iwidgets')
-      rescue
-        ''
-      end
-    end
-
-    ####################################################
-
-    autoload :Buttonbox,             'tkextlib/iwidgets/buttonbox'
-    autoload :Calendar,              'tkextlib/iwidgets/calendar'
-    autoload :Canvasprintbox,        'tkextlib/iwidgets/canvasprintbox'
-    autoload :Canvasprintdialog,     'tkextlib/iwidgets/canvasprintdialog'
-    autoload :Checkbox,              'tkextlib/iwidgets/checkbox'
-    autoload :Combobox,              'tkextlib/iwidgets/combobox'
-    autoload :Dateentry,             'tkextlib/iwidgets/dateentry'
-    autoload :Datefield,             'tkextlib/iwidgets/datefield'
-    autoload :Dialog,                'tkextlib/iwidgets/dialog'
-    autoload :Dialogshell,           'tkextlib/iwidgets/dialogshell'
-    autoload :Disjointlistbox,       'tkextlib/iwidgets/disjointlistbox'
-    autoload :Entryfield,            'tkextlib/iwidgets/entryfield'
-    autoload :Extbutton,             'tkextlib/iwidgets/extbutton'
-    autoload :Extfileselectionbox,   'tkextlib/iwidgets/extfileselectionbox'
-    autoload :Extfileselectiondialog,'tkextlib/iwidgets/extfileselectiondialog'
-    autoload :Feedback,              'tkextlib/iwidgets/feedback'
-    autoload :Fileselectionbox,      'tkextlib/iwidgets/fileselectionbox'
-    autoload :Fileselectiondialog,   'tkextlib/iwidgets/fileselectiondialog'
-    autoload :Finddialog,            'tkextlib/iwidgets/finddialog'
-    autoload :Hierarchy,             'tkextlib/iwidgets/hierarchy'
-    autoload :Hyperhelp,             'tkextlib/iwidgets/hyperhelp'
-    autoload :Labeledframe,          'tkextlib/iwidgets/labeledframe'
-    autoload :Labeledwidget,         'tkextlib/iwidgets/labeledwidget'
-    autoload :Mainwindow,            'tkextlib/iwidgets/mainwindow'
-    autoload :Menubar,               'tkextlib/iwidgets/menubar'
-    autoload :Messagebox,            'tkextlib/iwidgets/messagebox'
-    autoload :Messagedialog,         'tkextlib/iwidgets/messagedialog'
-    autoload :Notebook,              'tkextlib/iwidgets/notebook'
-    autoload :Optionmenu,            'tkextlib/iwidgets/optionmenu'
-    autoload :Panedwindow,           'tkextlib/iwidgets/panedwindow'
-    autoload :Pushbutton,            'tkextlib/iwidgets/pushbutton'
-    autoload :Promptdialog,          'tkextlib/iwidgets/promptdialog'
-    autoload :Radiobox,              'tkextlib/iwidgets/radiobox'
-    autoload :Scrolledcanvas,        'tkextlib/iwidgets/scrolledcanvas'
-    autoload :Scrolledframe,         'tkextlib/iwidgets/scrolledframe'
-    autoload :Scrolledhtml,          'tkextlib/iwidgets/scrolledhtml'
-    autoload :Scrolledlistbox,       'tkextlib/iwidgets/scrolledlistbox'
-    autoload :Scrolledtext,          'tkextlib/iwidgets/scrolledtext'
-    autoload :Scrolledwidget,        'tkextlib/iwidgets/scrolledwidget'
-    autoload :Selectionbox,          'tkextlib/iwidgets/selectionbox'
-    autoload :Selectiondialog,       'tkextlib/iwidgets/selectiondialog'
-    autoload :Shell,                 'tkextlib/iwidgets/shell'
-    autoload :Spindate,              'tkextlib/iwidgets/spindate'
-    autoload :Spinint,               'tkextlib/iwidgets/spinint'
-    autoload :Spinner,               'tkextlib/iwidgets/spinner'
-    autoload :Spintime,              'tkextlib/iwidgets/spintime'
-    autoload :Tabnotebook,           'tkextlib/iwidgets/tabnotebook'
-    autoload :Tabset,                'tkextlib/iwidgets/tabset'
-    autoload :Timeentry,             'tkextlib/iwidgets/timeentry'
-    autoload :Timefield,             'tkextlib/iwidgets/timefield'
-    autoload :Toolbar,               'tkextlib/iwidgets/toolbar'
-    autoload :Watch,                 'tkextlib/iwidgets/watch'
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/buttonbox.rb b/ext/tk/lib/tkextlib/iwidgets/buttonbox.rb
deleted file mode 100644
index 0357114c83..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/buttonbox.rb
+++ /dev/null
@@ -1,122 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/buttonbox.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class Buttonbox < Tk::Itk::Widget
-    end
-  end
-end
-
-class Tk::Iwidgets::Buttonbox
-  TkCommandNames = ['::iwidgets::buttonbox'.freeze].freeze
-  WidgetClassName = 'Buttonbox'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  ####################################
-
-  include TkItemConfigMethod
-
-  def __item_cget_cmd(id)
-    [self.path, 'buttoncget', id]
-  end
-  private :__item_cget_cmd
-
-  def __item_config_cmd(id)
-    [self.path, 'buttonconfigure', id]
-  end
-  private :__item_config_cmd
-
-  def __item_boolval_optkeys(id)
-    super(id) << 'defaultring'
-  end
-  private :__item_boolval_optkeys
-
-  def tagid(tagOrId)
-    if tagOrId.kind_of?(Tk::Itk::Component)
-      tagOrId.name
-    else
-      #_get_eval_string(tagOrId)
-      tagOrId
-    end
-  end
-
-  alias buttoncget_tkstring itemcget_tkstring
-  alias buttoncget itemcget
-  alias buttoncget_strict itemcget_strict
-  alias buttonconfigure itemconfigure
-  alias buttonconfiginfo itemconfiginfo
-  alias current_buttonconfiginfo current_itemconfiginfo
-
-  private :itemcget_tkstring, :itemcget, :itemcget_strict
-  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
-
-  ####################################
-
-  def add(tag=nil, keys={})
-    if tag.kind_of?(Hash)
-      keys = tag
-      tag = nil
-    end
-    if tag
-      tag = Tk::Itk::Component.new(self, tagid(tag))
-    else
-      tag = Tk::Itk::Component.new(self)
-    end
-    tk_call(@path, 'add', tagid(tag), *hash_kv(keys))
-    tag
-  end
-
-  def default(idx)
-    tk_call(@path, 'default', index(idx))
-    self
-  end
-
-  def delete(idx)
-    tk_call(@path, 'delete', index(idx))
-    self
-  end
-
-  def hide(idx)
-    tk_call(@path, 'hide', index(idx))
-    self
-  end
-
-  def index(idx)
-    number(tk_call(@path, 'index', tagid(idx)))
-  end
-
-  def insert(idx, tag=nil, keys={})
-    if tag.kind_of?(Hash)
-      keys = tag
-      tag = nil
-    end
-    if tag
-      tag = Tk::Itk::Component.new(self, tagid(tag))
-    else
-      tag = Tk::Itk::Component.new(self)
-    end
-    tk_call(@path, 'insert', index(idx), tagid(tag), *hash_kv(keys))
-    tag
-  end
-
-  def invoke(idx=nil)
-    if idx
-      tk_call(@path, 'invoke', index(idx))
-    else
-      tk_call(@path, 'invoke')
-    end
-    self
-  end
-
-  def show(idx)
-    tk_call(@path, 'show', index(idx))
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/calendar.rb b/ext/tk/lib/tkextlib/iwidgets/calendar.rb
deleted file mode 100644
index 4cfb9203c8..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/calendar.rb
+++ /dev/null
@@ -1,126 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/calendar.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class Calendar < Tk::Itk::Widget
-    end
-  end
-end
-
-class Tk::Iwidgets::Calendar
-  TkCommandNames = ['::iwidgets::calendar'.freeze].freeze
-  WidgetClassName = 'Calendar'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __strval_optkeys
-    super() + [
-      'buttonforeground', 'outline', 'selectcolor',
-      'weekdaybackground', 'weekendbackground'
-    ]
-  end
-  private :__strval_optkeys
-
-  def __listval_optkeys
-    super() << 'days'
-  end
-  private :__listval_optkeys
-
-  def __font_optkeys
-    super() + ['currentdatefont', 'datefont', 'dayfont', 'titlefont']
-  end
-  private :__font_optkeys
-
-  ####################################
-
-  include Tk::ValidateConfigure
-
-  class CalendarCommand < TkValidateCommand
-    #class CalCmdArgs < TkUtil::CallbackSubst
-    class ValidateArgs < TkUtil::CallbackSubst
-      KEY_TBL  = [ [?d, ?s, :date], nil ]
-      PROC_TBL = [ [?s, TkComm.method(:string) ], nil ]
-
-=begin
-      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-      KEY_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-        end
-        inf
-      }
-
-      PROC_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-        end
-        inf
-      }
-=end
-
-      _setup_subst_table(KEY_TBL, PROC_TBL);
-
-      def self.ret_val(val)
-        val
-      end
-    end
-
-    def self._config_keys
-      # array of config-option key (string or symbol)
-      ['command']
-    end
-
-    #def initialize(cmd = Proc.new, *args)
-    #  _initialize_for_cb_class(CalCmdArgs, cmd, *args)
-    #end
-  end
-
-  def __validation_class_list
-    super() << CalendarCommand
-  end
-
-  Tk::ValidateConfigure.__def_validcmd(binding, CalendarCommand)
-=begin
-  def command(cmd = Proc.new, args = nil)
-    if cmd.kind_of?(CalendarCommand)
-      configure('command', cmd)
-    elsif args
-      configure('command', [cmd, args])
-    else
-      configure('command', cmd)
-    end
-  end
-=end
-
-  ####################################
-
-  def get_string
-    tk_call(@path, 'get', '-string')
-  end
-  alias get get_string
-
-  def get_clicks
-    number(tk_call(@path, 'get', '-clicks'))
-  end
-
-  def select(date)
-    tk_call(@path, 'select', date)
-    self
-  end
-
-  def show(date)
-    tk_call(@path, 'show', date)
-    self
-  end
-  def show_now
-    tk_call(@path, 'show', 'now')
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/canvasprintbox.rb b/ext/tk/lib/tkextlib/iwidgets/canvasprintbox.rb
deleted file mode 100644
index 3fe489dc95..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/canvasprintbox.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/canvasprintbox.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class Canvasprintbox < Tk::Itk::Widget
-    end
-  end
-end
-
-class Tk::Iwidgets::Canvasprintbox
-  TkCommandNames = ['::iwidgets::canvasprintbox'.freeze].freeze
-  WidgetClassName = 'Canvasprintbox'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __strval_optkeys
-    super() << 'filename'
-  end
-  private :__strval_optkeys
-
-  def __boolval_optkeys
-    super() << 'stretch'
-  end
-  private :__boolval_optkeys
-
-  def get_output
-    tk_call(@path, 'getoutput')
-  end
-
-  def print
-    bool(tk_call(@path, 'print'))
-  end
-
-  def refresh
-    tk_call(@path, 'refresh')
-    self
-  end
-
-  def set_canvas(win)
-    tk_call(@path, 'setcanvas', win)
-    self
-  end
-
-  def stop
-    tk_call(@path, 'stop')
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/canvasprintdialog.rb b/ext/tk/lib/tkextlib/iwidgets/canvasprintdialog.rb
deleted file mode 100644
index 4b5fdf5d7c..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/canvasprintdialog.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/canvasprintdialog.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class Canvasprintdialog < Tk::Iwidgets::Dialog
-    end
-  end
-end
-
-class Tk::Iwidgets::Canvasprintdialog
-  TkCommandNames = ['::iwidgets::canvasprintdialog'.freeze].freeze
-  WidgetClassName = 'Canvasprintdialog'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def get_output
-    tk_call(@path, 'getoutput')
-  end
-
-  def print
-    bool(tk_call(@path, 'print'))
-  end
-
-  def refresh
-    tk_call(@path, 'refresh')
-    self
-  end
-
-  def set_canvas(win)
-    tk_call(@path, 'setcanvas', win)
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/checkbox.rb b/ext/tk/lib/tkextlib/iwidgets/checkbox.rb
deleted file mode 100644
index 4589fe7ffa..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/checkbox.rb
+++ /dev/null
@@ -1,131 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/checkbox.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class  Checkbox < Tk::Iwidgets::Labeledframe
-    end
-  end
-end
-
-class Tk::Iwidgets::Checkbox
-  TkCommandNames = ['::iwidgets::checkbox'.freeze].freeze
-  WidgetClassName = 'Checkbox'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  ####################################
-
-  include TkItemConfigMethod
-
-  def __item_cget_cmd(id)
-    [self.path, 'buttoncget', id]
-  end
-  private :__item_cget_cmd
-
-  def __item_config_cmd(id)
-    [self.path, 'buttonconfigure', id]
-  end
-  private :__item_config_cmd
-
-  def __item_boolval_optkeys(id)
-    super(id) << 'defaultring'
-  end
-  private :__item_boolval_optkeys
-
-  def tagid(tagOrId)
-    if tagOrId.kind_of?(Tk::Itk::Component)
-      tagOrId.name
-    else
-      #_get_eval_string(tagOrId)
-      tagOrId
-    end
-  end
-
-  alias buttoncget_tkstring itemcget_tkstring
-  alias buttoncget itemcget
-  alias buttoncget_strict itemcget_strict
-  alias buttonconfigure itemconfigure
-  alias buttonconfiginfo itemconfiginfo
-  alias current_buttonconfiginfo current_itemconfiginfo
-
-  private :itemcget_tkstring, :itemcget, :itemcget_strict
-  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
-
-  ####################################
-
-  def add(tag=nil, keys={})
-    if tag.kind_of?(Hash)
-      keys = tag
-      tag = nil
-    end
-    if tag
-      tag = Tk::Itk::Component.new(self, tagid(tag))
-    else
-      tag = Tk::Itk::Component.new(self)
-    end
-    tk_call(@path, 'add', tagid(tag), *hash_kv(keys))
-    tag
-  end
-
-  def delete(idx)
-    tk_call(@path, 'delete', index(idx))
-    self
-  end
-
-  def deselect(idx)
-    tk_call(@path, 'deselect', index(idx))
-    self
-  end
-
-  def flash(idx)
-    tk_call(@path, 'flash', index(idx))
-    self
-  end
-
-  def get_tags
-    simplelist(tk_call_without_enc(@path, 'get'))
-  end
-
-  def get_objs
-    simplelist(tk_call_without_enc(@path, 'get')).collect{|id|
-      Tk::Itk::Component.id2obj(self, id)
-    }
-  end
-
-  def get(idx=nil)
-    if idx
-      bool(tk_call_without_enc(@path, 'get', index(idx)))
-    else
-      get_tags
-    end
-  end
-
-  def index(idx)
-    number(tk_call(@path, 'index', tagid(idx)))
-  end
-
-  def insert(idx, tag=nil, keys={})
-    if tag.kind_of?(Hash)
-      keys = tag
-      tag = nil
-    end
-    if tag
-      tag = Tk::Itk::Component.new(self, tagid(tag))
-    else
-      tag = Tk::Itk::Component.new(self)
-    end
-    tk_call(@path, 'insert', index(idx), tagid(tag), *hash_kv(keys))
-    tag
-  end
-
-  def select(idx)
-    tk_call(@path, 'select', index(idx))
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/combobox.rb b/ext/tk/lib/tkextlib/iwidgets/combobox.rb
deleted file mode 100644
index d4c05b5be5..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/combobox.rb
+++ /dev/null
@@ -1,105 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/combobox.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class Combobox < Tk::Iwidgets::Entryfield
-    end
-  end
-end
-
-class Tk::Iwidgets::Combobox
-  TkCommandNames = ['::iwidgets::combobox'.freeze].freeze
-  WidgetClassName = 'Combobox'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __boolval_optkeys
-    super() << 'completion' << 'dropdown' << 'editable' << 'unique'
-  end
-  private :__boolval_optkeys
-
-  def clear(component=None)
-    tk_call(@path, 'clear', component)
-    self
-  end
-
-  def delete_list(first, last=None)
-    tk_call(@path, 'delete', 'list', first, last)
-    self
-  end
-
-  def delete_entry(first, last=None)
-    tk_call(@path, 'delete', 'entry', first, last)
-    self
-  end
-
-  def get_list_contents(index)
-    tk_call(@path, 'get', index)
-  end
-
-  def insert_list(idx, *elems)
-    tk_call(@path, 'insert', 'list', idx, *elems)
-    self
-  end
-
-  def insert_entry(idx, *elems)
-    tk_call(@path, 'insert', 'entry', idx, *elems)
-    self
-  end
-
-  # listbox methods
-  def size
-    tk_send_without_enc('size').to_i
-  end
-  def see(index)
-    tk_send_without_enc('see', index)
-    self
-  end
-  def selection_anchor(index)
-    tk_send_without_enc('selection', 'anchor', index)
-    self
-  end
-  def selection_clear(first, last=None)
-    tk_send_without_enc('selection', 'clear', first, last)
-    self
-  end
-  def selection_includes(index)
-    bool(tk_send_without_enc('selection', 'includes', index))
-  end
-  def selection_set(first, last=None)
-    tk_send_without_enc('selection', 'set', first, last)
-    self
-  end
-
-  # scrolledlistbox methods
-  def get_curselection
-    tk_call(@path, 'getcurselection')
-  end
-  def justify(dir)
-    tk_call(@path, 'justify', dir)
-    self
-  end
-  def sort(*params, &b)
-    # see 'lsort' man page about params
-    if b
-      tk_call(@path, 'sort', '-command', proc(&b), *params)
-    else
-      tk_call(@path, 'sort', *params)
-    end
-    self
-  end
-  def sort_ascending
-    tk_call(@path, 'sort', 'ascending')
-    self
-  end
-  def sort_descending
-    tk_call(@path, 'sort', 'descending')
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/dateentry.rb b/ext/tk/lib/tkextlib/iwidgets/dateentry.rb
deleted file mode 100644
index e135b89ed7..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/dateentry.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/dateentry.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class  Dateentry < Tk::Iwidgets::Datefield
-    end
-  end
-end
-
-class Tk::Iwidgets::Dateentry
-  TkCommandNames = ['::iwidgets::dateentry'.freeze].freeze
-  WidgetClassName = 'Dateentry'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/datefield.rb b/ext/tk/lib/tkextlib/iwidgets/datefield.rb
deleted file mode 100644
index 35977e1f6d..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/datefield.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/datefield.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class  Datefield < Tk::Iwidgets::Labeledwidget
-    end
-  end
-end
-
-class Tk::Iwidgets::Datefield
-  TkCommandNames = ['::iwidgets::datefield'.freeze].freeze
-  WidgetClassName = 'Datefield'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __boolval_optkeys
-    super() << 'gmt'
-  end
-  private :__boolval_optkeys
-
-  def __strval_optkeys
-    super() << 'textbackground'
-  end
-  private :__strval_optkeys
-
-  def __font_optkeys
-    super() << 'textfont'
-  end
-  private :__font_optkeys
-
-  def get_string
-    tk_call(@path, 'get', '-string')
-  end
-  alias get get_string
-
-  def get_clicks
-    number(tk_call(@path, 'get', '-clicks'))
-  end
-
-  def valid?
-    bool(tk_call(@path, 'isvalid'))
-  end
-  alias isvalid? valid?
-
-  def show(date=None)
-    tk_call(@path, 'show', date)
-    self
-  end
-  def show_now
-    tk_call(@path, 'show', 'now')
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/dialog.rb b/ext/tk/lib/tkextlib/iwidgets/dialog.rb
deleted file mode 100644
index edefba1844..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/dialog.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/dialog.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class Dialog < Tk::Iwidgets::Dialogshell
-    end
-  end
-end
-
-class Tk::Iwidgets::Dialog
-  TkCommandNames = ['::iwidgets::dialog'.freeze].freeze
-  WidgetClassName = 'Dialog'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/dialogshell.rb b/ext/tk/lib/tkextlib/iwidgets/dialogshell.rb
deleted file mode 100644
index 009fc61c56..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/dialogshell.rb
+++ /dev/null
@@ -1,122 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/dialogshell.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class Dialogshell < Tk::Iwidgets::Shell
-    end
-  end
-end
-
-class Tk::Iwidgets::Dialogshell
-  TkCommandNames = ['::iwidgets::dialogshell'.freeze].freeze
-  WidgetClassName = 'Dialogshell'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  ####################################
-
-  include TkItemConfigMethod
-
-  def __item_cget_cmd(id)
-    [self.path, 'buttoncget', id]
-  end
-  private :__item_cget_cmd
-
-  def __item_config_cmd(id)
-    [self.path, 'buttonconfigure', id]
-  end
-  private :__item_config_cmd
-
-  def __item_boolval_optkeys(id)
-    super(id) << 'defaultring'
-  end
-  private :__item_boolval_optkeys
-
-  def tagid(tagOrId)
-    if tagOrId.kind_of?(Tk::Itk::Component)
-      tagOrId.name
-    else
-      #_get_eval_string(tagOrId)
-      tagOrId
-    end
-  end
-
-  alias buttoncget_tkstring itemcget_tkstring
-  alias buttoncget itemcget
-  alias buttoncget_strict itemcget_strict
-  alias buttonconfigure itemconfigure
-  alias buttonconfiginfo itemconfiginfo
-  alias current_buttonconfiginfo current_itemconfiginfo
-
-  private :itemcget_tkstring, :itemcget, :itemcget_strict
-  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
-
-  ####################################
-
-  def add(tag=nil, keys={})
-    if tag.kind_of?(Hash)
-      keys = tag
-      tag = nil
-    end
-    if tag
-      tag = Tk::Itk::Component.new(self, tagid(tag))
-    else
-      tag = Tk::Itk::Component.new(self)
-    end
-    tk_call(@path, 'add', tagid(tag), *hash_kv(keys))
-    tag
-  end
-
-  def default(idx)
-    tk_call(@path, 'default', index(idx))
-    self
-  end
-
-  def delete(idx)
-    tk_call(@path, 'delete', index(idx))
-    self
-  end
-
-  def hide(idx)
-    tk_call(@path, 'hide', index(idx))
-    self
-  end
-
-  def index(idx)
-    number(tk_call(@path, 'index', tagid(idx)))
-  end
-
-  def insert(idx, tag=nil, keys={})
-    if tag.kind_of?(Hash)
-      keys = tag
-      tag = nil
-    end
-    if tag
-      tag = Tk::Itk::Component.new(self, tagid(tag))
-    else
-      tag = Tk::Itk::Component.new(self)
-    end
-    tk_call(@path, 'insert', index(idx), tagid(tag), *hash_kv(keys))
-    tag
-  end
-
-  def invoke(idx=nil)
-    if idx
-      tk_call(@path, 'invoke', index(idx))
-    else
-      tk_call(@path, 'invoke')
-    end
-    self
-  end
-
-  def show(idx)
-    tk_call(@path, 'show', index(idx))
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/disjointlistbox.rb b/ext/tk/lib/tkextlib/iwidgets/disjointlistbox.rb
deleted file mode 100644
index 3ae3f319b6..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/disjointlistbox.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/disjointlistbox.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class  Disjointlistbox < Tk::Itk::Widget
-    end
-  end
-end
-
-class Tk::Iwidgets::Disjointlistbox
-  TkCommandNames = ['::iwidgets::disjointlistbox'.freeze].freeze
-  WidgetClassName = 'Disjointlistbox'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __strval_optkeys
-    super() << 'lhslabeltext' << 'rhslabeltext' << 'lhsbuttonlabel' << 'rhsbuttonlabel'
-  end
-  private :__strval_optkeys
-
-  def set_lhs(*items)
-    tk_call(@path, 'setlhs', items)
-    self
-  end
-  def set_rhs(*items)
-    tk_call(@path, 'setrhs', items)
-    self
-  end
-
-  def get_lhs
-    simplelist(tk_call(@path, 'getlhs'))
-  end
-  def get_rhs
-    simplelist(tk_call(@path, 'getrhs'))
-  end
-
-  def insert_lhs(*items)
-    tk_call(@path, 'insertlhs', items)
-    self
-  end
-  def insert_rhs(*items)
-    tk_call(@path, 'insertrhs', items)
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/entryfield.rb b/ext/tk/lib/tkextlib/iwidgets/entryfield.rb
deleted file mode 100644
index 75baca05d4..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/entryfield.rb
+++ /dev/null
@@ -1,186 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/entryfield.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class  Entryfield < Tk::Iwidgets::Labeledwidget
-    end
-  end
-end
-
-class Tk::Iwidgets::Entryfield
-  TkCommandNames = ['::iwidgets::entryfield'.freeze].freeze
-  WidgetClassName = 'Entryfield'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __font_optkeys
-    super() << 'textfont'
-  end
-  private :__font_optkeys
-
-  ####################################
-
-  include Tk::ValidateConfigure
-
-  class EntryfieldValidate < TkValidateCommand
-    #class CalCmdArgs < TkUtil::CallbackSubst
-    class ValidateArgs < TkUtil::CallbackSubst
-      KEY_TBL  = [
-        [ ?c, ?s, :char ],
-        [ ?P, ?s, :post ],
-        [ ?S, ?s, :current ],
-        [ ?W, ?w, :widget ],
-        nil
-      ]
-      PROC_TBL = [
-        [ ?s, TkComm.method(:string) ],
-        [ ?w, TkComm.method(:window) ],
-        nil
-      ]
-
-=begin
-      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-      KEY_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-        end
-        inf
-      }
-
-      PROC_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-        end
-        inf
-      }
-=end
-
-      _setup_subst_table(KEY_TBL, PROC_TBL);
-    end
-
-    def self._config_keys
-      ['validate', 'invalid']
-    end
-  end
-
-  def __validation_class_list
-    super() << EntryfieldValidate
-  end
-
-  Tk::ValidateConfigure.__def_validcmd(binding, EntryfieldValidate)
-=begin
-  def validate(cmd = Proc.new, args = nil)
-    if cmd.kind_of?(ValidateCmd)
-      configure('validate', cmd)
-    elsif args
-      configure('validate', [cmd, args])
-    else
-      configure('validate', cmd)
-    end
-  end
-
-  def invalid(cmd = Proc.new, args = nil)
-    if cmd.kind_of?(ValidateCmd)
-      configure('invalid', cmd)
-    elsif args
-      configure('invalid', [cmd, args])
-    else
-      configure('invalid', cmd)
-    end
-  end
-=end
-
-  ####################################
-
-  def clear
-    tk_call(@path, 'clear')
-    self
-  end
-
-  def delete(first, last=None)
-    tk_send_without_enc('delete', first, last)
-    self
-  end
-
-  def value
-    _fromUTF8(tk_send_without_enc('get'))
-  end
-  def value= (val)
-    tk_send_without_enc('delete', 0, 'end')
-    tk_send_without_enc('insert', 0, _get_eval_enc_str(val))
-    val
-  end
-  alias get value
-  alias set value=
-
-  def cursor=(index)
-    tk_send_without_enc('icursor', index)
-    #self
-    index
-  end
-  alias icursor cursor=
-
-  def index(index)
-    number(tk_send_without_enc('index', index))
-  end
-
-  def insert(pos,text)
-    tk_send_without_enc('insert', pos, _get_eval_enc_str(text))
-    self
-  end
-
-  def mark(pos)
-    tk_send_without_enc('scan', 'mark', pos)
-    self
-  end
-  def dragto(pos)
-    tk_send_without_enc('scan', 'dragto', pos)
-    self
-  end
-  def selection_adjust(index)
-    tk_send_without_enc('selection', 'adjust', index)
-    self
-  end
-  def selection_clear
-    tk_send_without_enc('selection', 'clear')
-    self
-  end
-  def selection_from(index)
-    tk_send_without_enc('selection', 'from', index)
-    self
-  end
-  def selection_present()
-    bool(tk_send_without_enc('selection', 'present'))
-  end
-  def selection_range(s, e)
-    tk_send_without_enc('selection', 'range', s, e)
-    self
-  end
-  def selection_to(index)
-    tk_send_without_enc('selection', 'to', index)
-    self
-  end
-
-  # based on tk/scrollable.rb
-  def xview(*index)
-    if index.size == 0
-      list(tk_send_without_enc('xview'))
-    else
-      tk_send_without_enc('xview', *index)
-      self
-    end
-  end
-  def xview_moveto(*index)
-    xview('moveto', *index)
-  end
-  def xview_scroll(*index)
-    xview('scroll', *index)
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/extbutton.rb b/ext/tk/lib/tkextlib/iwidgets/extbutton.rb
deleted file mode 100644
index 3c77c2ec21..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/extbutton.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/extbutton.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class  Extbutton < Tk::Itk::Widget
-    end
-  end
-end
-
-class Tk::Iwidgets::Extbutton
-  TkCommandNames = ['::iwidgets::extbutton'.freeze].freeze
-  WidgetClassName = 'Extbutton'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __strval_optkeys
-    super() << 'bitmapforeground' << 'ringbackground'
-  end
-  private :__strval_optkeys
-
-  def __boolval_optkeys
-    super() << 'defaultring'
-  end
-  private :__boolval_optkeys
-
-  def invoke
-    tk_call(@path, 'invoke')
-    self
-  end
-
-  def flash
-    tk_call(@path, 'flash')
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/extfileselectionbox.rb b/ext/tk/lib/tkextlib/iwidgets/extfileselectionbox.rb
deleted file mode 100644
index 4581771309..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/extfileselectionbox.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/extfileselectionbox.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class  Extfileselectionbox < Tk::Itk::Widget
-    end
-  end
-end
-
-class Tk::Iwidgets::Extfileselectionbox
-  TkCommandNames = ['::iwidgets::extfileselectionbox'.freeze].freeze
-  WidgetClassName = 'Extfileselectionbox'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __strval_optkeys
-    super() + [
-      'dirslabel', 'fileslabel', 'filterlabel', 'mask', 'nomatchstring',
-      'selectionlabel'
-    ]
-  end
-  private :__strval_optkeys
-
-  def __boolval_optkeys
-    super() + ['dirson', 'fileson', 'filteron', 'selectionon']
-  end
-  private :__boolval_optkeys
-
-  def child_site
-    window(tk_call(@path, 'childsite'))
-  end
-
-  def filter
-    tk_call(@path, 'filter')
-    self
-  end
-
-  def get
-    tk_call(@path, 'get')
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/extfileselectiondialog.rb b/ext/tk/lib/tkextlib/iwidgets/extfileselectiondialog.rb
deleted file mode 100644
index 32a06cc46f..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/extfileselectiondialog.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/extfileselectiondialog.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class  Extfileselectiondialog < Tk::Iwidgets::Dialog
-    end
-  end
-end
-
-class Tk::Iwidgets::Extfileselectiondialog
-  TkCommandNames = ['::iwidgets::extfileselectiondialog'.freeze].freeze
-  WidgetClassName = 'Extfileselectiondialog'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def child_site
-    window(tk_call(@path, 'childsite'))
-  end
-
-  def filter
-    tk_call(@path, 'filter')
-    self
-  end
-
-  def get
-    tk_call(@path, 'get')
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/feedback.rb b/ext/tk/lib/tkextlib/iwidgets/feedback.rb
deleted file mode 100644
index e52d60edac..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/feedback.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/feedback.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class Feedback < Tk::Iwidgets::Labeledwidget
-    end
-  end
-end
-
-class Tk::Iwidgets::Feedback
-  TkCommandNames = ['::iwidgets::feedback'.freeze].freeze
-  WidgetClassName = 'Feedback'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __strval_optkeys
-    super() << 'barcolor'
-  end
-  private :__strval_optkeys
-
-  def reset
-    tk_call(@path, 'reset')
-    self
-  end
-
-  def step(inc=1)
-    tk_call(@path, 'step', inc)
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/fileselectionbox.rb b/ext/tk/lib/tkextlib/iwidgets/fileselectionbox.rb
deleted file mode 100644
index 3811f2b57e..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/fileselectionbox.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/fileselectionbox.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class Fileselectionbox < Tk::Itk::Widget
-    end
-  end
-end
-
-class Tk::Iwidgets::Fileselectionbox
-  TkCommandNames = ['::iwidgets::fileselectionbox'.freeze].freeze
-  WidgetClassName = 'Fileselectionbox'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __strval_optkeys
-    super() + [
-      'directory', 'dirslabel', 'fileslabel', 'filterlabel', 'mask',
-      'nomatchstring', 'selectionlabel'
-    ]
-  end
-  private :__strval_optkeys
-
-  def __boolval_optkeys
-    super() + ['dirson', 'fileson', 'filteron', 'selectionon']
-  end
-  private :__boolval_optkeys
-
-  def child_site
-    window(tk_call(@path, 'childsite'))
-  end
-
-  def filter
-    tk_call(@path, 'filter')
-    self
-  end
-
-  def get
-    tk_call(@path, 'get')
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/fileselectiondialog.rb b/ext/tk/lib/tkextlib/iwidgets/fileselectiondialog.rb
deleted file mode 100644
index 8d368486ea..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/fileselectiondialog.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/fileselectiondialog.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class Fileselectiondialog < Tk::Iwidgets::Dialog
-    end
-  end
-end
-
-class Tk::Iwidgets::Fileselectiondialog
-  TkCommandNames = ['::iwidgets::fileselectiondialog'.freeze].freeze
-  WidgetClassName = 'Fileselectiondialog'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def child_site
-    window(tk_call(@path, 'childsite'))
-  end
-
-  def filter
-    tk_call(@path, 'filter')
-    self
-  end
-
-  def get
-    tk_call(@path, 'get')
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/finddialog.rb b/ext/tk/lib/tkextlib/iwidgets/finddialog.rb
deleted file mode 100644
index ff0b587390..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/finddialog.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/finddialog.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class Finddialog < Tk::Iwidgets::Dialogshell
-    end
-  end
-end
-
-class Tk::Iwidgets::Finddialog
-  TkCommandNames = ['::iwidgets::finddialog'.freeze].freeze
-  WidgetClassName = 'Finddialog'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __strval_optkeys
-    super() + [
-      'patternbackground', 'patternforeground',
-      'searchbackground', 'searchforeground'
-    ]
-  end
-  private :__strval_optkeys
-
-  def __val2ruby_optkeys  # { key=>proc, ... }
-    super().update('textwidget'=>proc{|v| window(v)})
-  end
-  private :__val2ruby_optkeys
-
-  def clear
-    tk_call(@path, 'clear')
-    self
-  end
-
-  def find
-    tk_call(@path, 'find')
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/hierarchy.rb b/ext/tk/lib/tkextlib/iwidgets/hierarchy.rb
deleted file mode 100644
index af99973240..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/hierarchy.rb
+++ /dev/null
@@ -1,366 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/hierarchy.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tk/text'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class Hierarchy < Tk::Iwidgets::Scrolledwidget
-    end
-  end
-end
-
-class Tk::Iwidgets::Hierarchy
-  ItemConfCMD = ['tag'.freeze, 'configure'.freeze].freeze
-  include TkTextTagConfig
-
-  TkCommandNames = ['::iwidgets::hierarchy'.freeze].freeze
-  WidgetClassName = 'Hierarchy'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  ####################################
-
-  include Tk::ValidateConfigure
-
-  class QueryCommand < TkValidateCommand
-    class ValidateArgs < TkUtil::CallbackSubst
-      KEY_TBL  = [ [?n, ?s, :node], nil ]
-      PROC_TBL = [ [?s, TkComm.method(:string) ], nil ]
-
-=begin
-      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-      KEY_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-        end
-        inf
-      }
-
-      PROC_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-        end
-        inf
-      }
-=end
-
-      _setup_subst_table(KEY_TBL, PROC_TBL);
-
-      def self.ret_val(val)
-        val
-      end
-    end
-
-    def self._config_keys
-      # array of config-option key (string or symbol)
-      ['querycommand']
-    end
-  end
-
-  class IndicatorCommand < TkValidateCommand
-    class ValidateArgs < TkUtil::CallbackSubst
-      KEY_TBL  = [
-        [ ?n, ?s, :node ],
-        [ ?s, ?b, :status ],
-        nil
-      ]
-
-      PROC_TBL = [
-        [ ?s, TkComm.method(:string) ],
-        [ ?b, TkComm.method(:bool) ],
-        nil
-      ]
-
-=begin
-      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-      KEY_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-        end
-        inf
-      }
-
-      PROC_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-        end
-        inf
-      }
-=end
-
-      _setup_subst_table(KEY_TBL, PROC_TBL);
-
-      def self.ret_val(val)
-        val
-      end
-    end
-
-    def self._config_keys
-      # array of config-option key (string or symbol)
-      ['iconcommand', 'icondblcommand', 'imagedblcommand']
-    end
-  end
-
-  class IconCommand < TkValidateCommand
-    class ValidateArgs < TkUtil::CallbackSubst
-      KEY_TBL  = [
-        [ ?n, ?s, :node ],
-        [ ?i, ?s, :icon ],
-        nil
-      ]
-      PROC_TBL = [ [ ?s, TkComm.method(:string) ], nil ]
-
-=begin
-      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-      KEY_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-        end
-        inf
-      }
-
-      PROC_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-        end
-        inf
-      }
-=end
-
-      _setup_subst_table(KEY_TBL, PROC_TBL);
-
-      def self.ret_val(val)
-        val
-      end
-    end
-
-    def self._config_keys
-      # array of config-option key (string or symbol)
-      ['dblclickcommand', 'imagecommand', 'selectcommand']
-    end
-  end
-
-  def __validation_class_list
-    super() << QueryCommand << IndicatorCommand << IconCommand
-  end
-
-  Tk::ValidateConfigure.__def_validcmd(binding, QueryCommand)
-  Tk::ValidateConfigure.__def_validcmd(binding, IndicatorCommand)
-  Tk::ValidateConfigure.__def_validcmd(binding, IconCommand)
-
-  ####################################
-
-  def __boolval_optkeys
-    super() << 'alwaysquery' << 'expanded' << 'filter'
-  end
-  private :__boolval_optkeys
-
-  def __strval_optkeys
-    super() << 'markbackground' << 'markforeground' << 'textbackground'
-  end
-  private :__strval_optkeys
-
-  def __font_optkeys
-    super() << 'textfont'
-  end
-  private :__font_optkeys
-
-  def clear
-    tk_call(@path, 'clear')
-    self
-  end
-
-  def collapse(node)
-    tk_call(@path, 'collapse')
-    self
-  end
-
-  def current
-    tk_call(@path, 'current')
-  end
-
-  def draw(mode=None)
-    case mode
-    when None
-      # do nothing
-    when 'now', :now
-      mode = '-now'
-    when 'eventually', :eventually
-      mode = '-eventually'
-    when String, Symbol
-      mode = mode.to_s
-      mode = '-' << mode if mode[0] != ?-
-    end
-    tk_call(@path, 'draw', mode)
-  end
-
-  def expand(node)
-    tk_call(@path, 'expand', node)
-    self
-  end
-
-  def expanded?(node)
-    bool(tk_call(@path, 'expanded', node))
-  end
-
-  def exp_state
-    list(tk_call(@path, 'expState'))
-  end
-  alias expand_state  exp_state
-  alias expanded_list exp_state
-
-  def mark_clear
-    tk_call(@path, 'mark', 'clear')
-    self
-  end
-  def mark_add(*nodes)
-    tk_call(@path, 'mark', 'add', *nodes)
-    self
-  end
-  def mark_remove(*nodes)
-    tk_call(@path, 'mark', 'remove', *nodes)
-    self
-  end
-  def mark_get
-    list(tk_call(@path, 'mark', 'get'))
-  end
-
-  def refresh(node)
-    tk_call(@path, 'refresh', node)
-    self
-  end
-
-  def prune(node)
-    tk_call(@path, 'prune', node)
-    self
-  end
-
-  def selection_clear
-    tk_call(@path, 'selection', 'clear')
-    self
-  end
-  def selection_add(*nodes)
-    tk_call(@path, 'selection', 'add', *nodes)
-    self
-  end
-  def selection_remove(*nodes)
-    tk_call(@path, 'selection', 'remove', *nodes)
-    self
-  end
-  def selection_get
-    list(tk_call(@path, 'selection', 'get'))
-  end
-
-  def toggle(node)
-    tk_call(@path, 'toggle', node)
-    self
-  end
-
-  # based on Tk::Text widget
-
-  def bbox(index)
-    list(tk_send_without_enc('bbox', _get_eval_enc_str(index)))
-  end
-
-  def compare(idx1, op, idx2)
-    bool(tk_send_without_enc('compare', _get_eval_enc_str(idx1),
-                             op, _get_eval_enc_str(idx2)))
-  end
-
-  def debug
-    bool(tk_send_without_enc('debug'))
-  end
-  def debug=(boolean)
-    tk_send_without_enc('debug', boolean)
-    #self
-    boolean
-  end
-
-  def delete(first, last=None)
-    tk_send_without_enc('delete', first, last)
-    self
-  end
-
-  def dlineinfo(index)
-    list(tk_send_without_enc('dlineinfo', _get_eval_enc_str(index)))
-  end
-
-  def get(*index)
-    _fromUTF8(tk_send_without_enc('get', *index))
-  end
-
-  def index(index)
-    tk_send_without_enc('index', _get_eval_enc_str(index))
-  end
-
-  def insert(index, chars, *tags)
-    if tags[0].kind_of? Array
-      # multiple chars-taglist argument :: str, [tag,...], str, [tag,...], ...
-      args = [chars]
-      while tags.size > 0
-        args << tags.shift.collect{|x|_get_eval_string(x)}.join(' ')  # taglist
-        args << tags.shift if tags.size > 0                           # chars
-      end
-      super(index, *args)
-    else
-      # single chars-taglist argument :: str, tag, tag, ...
-      if tags.size == 0
-        super(index, chars)
-      else
-        super(index, chars, tags.collect{|x|_get_eval_string(x)}.join(' '))
-      end
-    end
-  end
-
-  def scan_mark(x, y)
-    tk_send_without_enc('scan', 'mark', x, y)
-    self
-  end
-  def scan_dragto(x, y)
-    tk_send_without_enc('scan', 'dragto', x, y)
-    self
-  end
-  def see(index)
-    tk_send_without_enc('see', index)
-    self
-  end
-
-  # based on tk/scrollable.rb
-  def xview(*index)
-    if index.size == 0
-      list(tk_send_without_enc('xview'))
-    else
-      tk_send_without_enc('xview', *index)
-      self
-    end
-  end
-  def xview_moveto(*index)
-    xview('moveto', *index)
-  end
-  def xview_scroll(*index)
-    xview('scroll', *index)
-  end
-
-  def yview(*index)
-    if index.size == 0
-      list(tk_send_without_enc('yview'))
-    else
-      tk_send_without_enc('yview', *index)
-      self
-    end
-  end
-  def yview_moveto(*index)
-    yview('moveto', *index)
-  end
-  def yview_scroll(*index)
-    yview('scroll', *index)
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/hyperhelp.rb b/ext/tk/lib/tkextlib/iwidgets/hyperhelp.rb
deleted file mode 100644
index 1650c7af37..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/hyperhelp.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/hyperhelp.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class Hyperhelp < Tk::Iwidgets::Shell
-    end
-  end
-end
-
-class Tk::Iwidgets::Hyperhelp
-  TkCommandNames = ['::iwidgets::hyperhelp'.freeze].freeze
-  WidgetClassName = 'Hyperhelp'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __strval_optkeys
-    super() << 'helpdir'
-  end
-  private :__strval_optkeys
-
-  def __listval_optkeys
-    super() << 'topics'
-  end
-  private :__listval_optkeys
-
-  def show_topic(topic)
-    tk_call(@path, 'showtopic', topic)
-    self
-  end
-
-  def follow_link(href)
-    tk_call(@path, 'followlink', href)
-    self
-  end
-
-  def forward
-    tk_call(@path, 'forward')
-    self
-  end
-
-  def back
-    tk_call(@path, 'back')
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/labeledframe.rb b/ext/tk/lib/tkextlib/iwidgets/labeledframe.rb
deleted file mode 100644
index f4f3786528..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/labeledframe.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/labeledframe.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class Labeledframe < Tk::Itk::Archetype
-    end
-  end
-end
-
-class Tk::Iwidgets::Labeledframe
-  TkCommandNames = ['::iwidgets::labeledframe'.freeze].freeze
-  WidgetClassName = 'Labeledframe'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __strval_optkeys
-    super() << 'labeltext'
-  end
-  private :__strval_optkeys
-
-  def __tkvariable_optkeys
-    super() << 'labelvariable'
-  end
-  private :__tkvariable_optkeys
-
-  def __font_optkeys
-    super() << 'labelfont'
-  end
-  private :__font_optkeys
-
-  def child_site
-    window(tk_call(@path, 'childsite'))
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/labeledwidget.rb b/ext/tk/lib/tkextlib/iwidgets/labeledwidget.rb
deleted file mode 100644
index fe3c03135c..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/labeledwidget.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/labeledwidget.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class Labeledwidget < Tk::Itk::Widget
-    end
-  end
-end
-
-class Tk::Iwidgets::Labeledwidget
-  extend TkCore
-
-  TkCommandNames = ['::iwidgets::labeledwidget'.freeze].freeze
-  WidgetClassName = 'Labeledwidget'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __strval_optkeys
-    super() << 'labeltext'
-  end
-  private :__strval_optkeys
-
-  def __tkvariable_optkeys
-    super() << 'labelvariable'
-  end
-  private :__tkvariable_optkeys
-
-  def __font_optkeys
-    super() << 'labelfont'
-  end
-  private :__font_optkeys
-
-  def self.alignlabels(*wins)
-    tk_call('::iwidgets::Labeledwidget::alignlabels', *wins)
-  end
-
-  def child_site
-    window(tk_call(@path, 'childsite'))
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/mainwindow.rb b/ext/tk/lib/tkextlib/iwidgets/mainwindow.rb
deleted file mode 100644
index 34c9eb52e3..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/mainwindow.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/mainwindow.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class Mainwindow < Tk::Iwidgets::Shell
-    end
-  end
-end
-
-class Tk::Iwidgets::Mainwindow
-  TkCommandNames = ['::iwidgets::mainwindow'.freeze].freeze
-  WidgetClassName = 'Mainwindow'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __boolval_optkeys
-    super() << 'helpline' << 'statusline'
-  end
-  private :__boolval_optkeys
-
-  def __strval_optkeys
-    super() << 'menubarbackground' << 'menubarforeground' << 'toolbarforeground'
-  end
-  private :__strval_optkeys
-
-  def __font_optkeys
-    super() << 'menubarfont' << 'toolbarfont'
-  end
-  private :__font_optkeys
-
-  def child_site
-    window(tk_call(@path, 'childsite'))
-  end
-
-  def menubar(*args)
-    unless args.empty?
-      tk_call(@path, 'menubar', *args)
-    end
-    window(tk_call(@path, 'menubar'))
-  end
-
-  def mousebar(*args)
-    unless args.empty?
-      tk_call(@path, 'mousebar', *args)
-    end
-    window(tk_call(@path, 'mousebar'))
-  end
-
-  def msgd(*args)
-    unless args.empty?
-      tk_call(@path, 'msgd', *args)
-    end
-    window(tk_call(@path, 'msgd'))
-  end
-
-  def toolbar(*args)
-    unless args.empty?
-      tk_call(@path, 'toolbar', *args)
-    end
-    window(tk_call(@path, 'toolbar'))
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/menubar.rb b/ext/tk/lib/tkextlib/iwidgets/menubar.rb
deleted file mode 100644
index f729511230..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/menubar.rb
+++ /dev/null
@@ -1,213 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/menubar.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class Menubar < Tk::Itk::Widget
-    end
-  end
-end
-
-class Tk::Iwidgets::Menubar
-  TkCommandNames = ['::iwidgets::menubar'.freeze].freeze
-  WidgetClassName = 'Menubar'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __strval_optkeys
-    super() << 'menubuttons'
-  end
-  private :__strval_optkeys
-
-  def __tkvariable_optkeys
-    super() << 'helpvariable'
-  end
-  private :__tkvariable_optkeys
-
-  ####################################
-
-  include TkItemConfigMethod
-
-  def __item_cget_cmd(id)
-    [self.path, 'menucget', id]
-  end
-  private :__item_cget_cmd
-
-  def __item_config_cmd(id)
-    [self.path, 'menuconfigure', id]
-  end
-  private :__item_config_cmd
-
-  def __item_strval_optkeys(id)
-    super(id) << 'selectcolor'
-  end
-  private :__item_strval_optkeys
-
-  def __item_tkvariable_optkeys(id)
-    super(id) << 'helpstr'
-  end
-  private :__item_tkvariable_optkeys
-
-  def tagid(tagOrId)
-    if tagOrId.kind_of?(Tk::Itk::Component)
-      tagOrId.name
-    else
-      #_get_eval_string(tagOrId)
-      tagOrId
-    end
-  end
-
-  alias menucget_tkstring itemcget_tkstring
-  alias menucget itemcget
-  alias menucget_strict itemcget_strict
-  alias menuconfigure itemconfigure
-  alias menuconfiginfo itemconfiginfo
-  alias current_menuconfiginfo current_itemconfiginfo
-
-  private :itemcget_tkstring, :itemcget, :itemcget_strict
-  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
-
-  ####################################
-
-  def __methodcall_optkeys
-    {'menubuttons'=>'menubuttons'}
-  end
-
-  def menubuttons(val = nil)
-    unless val
-      return tk_call(@path, 'cget', '-menubuttons')
-    end
-
-    tk_call(@path, 'configure', '-menubuttons', _parse_menu_spec(val))
-    self
-  end
-
-  def _parse_menu_spec(menu_spec)
-    ret = ''
-    menu_spec.each{|spec|
-      next unless spec
-
-      if spec.kind_of?(Hash)
-        args = [spec]
-        type = 'options'
-      else
-        type, *args = spec
-      end
-
-      type = type.to_s
-      case type
-      when 'options'
-        keys = args[0]
-        ary = [type]
-        ary.concat(hash_kv(keys))
-        ret << array2tk_list(ary) << "\n"
-
-      when 'menubutton', 'cascade'
-        name, keys = args
-        if keys
-          ary = [type, name]
-          keys = _symbolkey2str(keys)
-          keys['menu'] = _parse_menu_spec(keys['menu']) if keys.key?('menu')
-          ary.concat(hash_kv(keys))
-          ret << array2tk_list(ary) << "\n"
-        else
-          ret << array2tk_list([type, name]) << "\n"
-        end
-
-      else
-        name, keys = args
-        if keys
-          ary = [type, name]
-          ary.concat(hash_kv(keys))
-          ret << array2tk_list(ary) << "\n"
-        else
-          ret << array2tk_list([type, name]) << "\n"
-        end
-      end
-    }
-    ret
-  end
-
-  ####################################
-
-  def add(type, tag=nil, keys={})
-    if tag.kind_of?(Hash)
-      keys = tag
-      tag = nil
-    end
-    if tag
-      tag = Tk::Itk::Component.new(self, tagid(tag))
-    else
-      tag = Tk::Itk::Component.new(self)
-    end
-    keys = _symbolkey2str(keys)
-    keys['menu'] = _parse_menu_spec(keys['menu']) if keys.key?('menu')
-    tk_call(@path, 'add', type, tagid(tag), *hash_kv(keys))
-    tag
-  end
-
-  def delete(path1, path2=nil)
-    if path2
-    else
-      tk_call(@path, 'delete', index(idx))
-    end
-    self
-  end
-
-  def index(idx)
-    number(tk_call(@path, 'index', tagid(idx)))
-  end
-
-  def insert(idx, type, tag=nil, keys={})
-    if tag.kind_of?(Hash)
-      keys = tag
-      tag = nil
-    end
-    if tag
-      tag = Tk::Itk::Component.new(self, tagid(tag))
-    else
-      tag = Tk::Itk::Component.new(self)
-    end
-    keys = _symbolkey2str(keys)
-    keys['menu'] = _parse_menu_spec(keys['menu']) if keys.key?('menu')
-    tk_call(@path, 'insert', index(idx), type, tagid(tag), *hash_kv(keys))
-    tag
-  end
-
-  def invoke(idx)
-    tk_call(@path, 'invoke', index(idx))
-    self
-  end
-
-  def menupath(pat)
-    if (win = tk_call(@path, 'path', pat)) == '-1'
-      return nil
-    end
-    window(win)
-  end
-  def menupath_glob(pat)
-    if (win = tk_call(@path, 'path', '-glob', pat)) == '-1'
-      return nil
-    end
-    window(win)
-  end
-  def menupath_tclregexp(pat)
-    if (win = tk_call(@path, 'path', '-regexp', pat)) == '-1'
-      return nil
-    end
-    window(win)
-  end
-
-  def type(path)
-    tk_call(@path, 'type', path)
-  end
-
-  def yposition(path)
-    number(tk_call(@path, 'yposition', path))
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/messagebox.rb b/ext/tk/lib/tkextlib/iwidgets/messagebox.rb
deleted file mode 100644
index a4c28228ee..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/messagebox.rb
+++ /dev/null
@@ -1,94 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/messagebox.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class Messagebox < Tk::Iwidgets::Scrolledwidget
-    end
-  end
-end
-
-class Tk::Iwidgets::Messagebox
-  TkCommandNames = ['::iwidgets::messagebox'.freeze].freeze
-  WidgetClassName = 'Messagebox'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  ####################################
-
-  include TkItemConfigMethod
-
-  def __item_cget_cmd(id)
-    [self.path, 'type', 'cget', id]
-  end
-  private :__item_cget_cmd
-
-  def __item_config_cmd(id)
-    [self.path, 'type', 'configure', id]
-  end
-  private :__item_config_cmd
-
-  def tagid(tagOrId)
-    if tagOrId.kind_of?(Tk::Itk::Component)
-      tagOrId.name
-    else
-      #_get_eval_string(tagOrId)
-      tagOrId
-    end
-  end
-
-  def __item_boolval_optkeys(id)
-    super(id) << 'bell' << 'show'
-  end
-  private :__item_boolval_optkeys
-
-  alias typecget_tkstring itemcget_tkstring
-  alias typecget itemcget
-  alias typecget_strict itemcget_strict
-  alias typeconfigure itemconfigure
-  alias typeconfiginfo itemconfiginfo
-  alias current_typeconfiginfo current_itemconfiginfo
-
-  private :itemcget_tkstring, :itemcget, :itemcget_strict
-  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
-
-  ####################################
-
-  def __strval_optkeys
-    super() << 'filename' << 'savedir'
-  end
-  private :__strval_optkeys
-
-  def type_add(tag=nil, keys={})
-    if tag.kind_of?(Hash)
-      keys = tag
-      tag = nil
-    end
-    unless tag
-      tag = Tk::Itk::Component.new(self)
-    end
-    tk_call(@path, 'type', 'add', tagid(tag), *hash_kv(keys))
-    tag
-  end
-
-  def clear
-    tk_call(@path, 'clear')
-    self
-  end
-
-  def export(file)
-    tk_call(@path, 'export', file)
-    self
-  end
-
-  def issue(string, type=None, *args)
-    tk_call(@path, 'issue', string, tagid(type), *args)
-    self
-  end
-
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/messagedialog.rb b/ext/tk/lib/tkextlib/iwidgets/messagedialog.rb
deleted file mode 100644
index 2fb4533b67..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/messagedialog.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/messagedialog.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class Messagedialog < Tk::Iwidgets::Dialog
-    end
-  end
-end
-
-class Tk::Iwidgets::Messagedialog
-  TkCommandNames = ['::iwidgets::messagedialog'.freeze].freeze
-  WidgetClassName = 'Messagedialog'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/notebook.rb b/ext/tk/lib/tkextlib/iwidgets/notebook.rb
deleted file mode 100644
index ad2a372512..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/notebook.rb
+++ /dev/null
@@ -1,176 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/notebook.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class Notebook < Tk::Itk::Widget
-    end
-  end
-end
-
-class Tk::Iwidgets::Notebook
-  TkCommandNames = ['::iwidgets::notebook'.freeze].freeze
-  WidgetClassName = 'Notebook'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  ####################################
-
-  include TkItemConfigMethod
-
-  def __item_cget_cmd(id)
-    [self.path, 'pagecget', id]
-  end
-  private :__item_cget_cmd
-
-  def __item_config_cmd(id)
-    [self.path, 'pageconfigure', id]
-  end
-  private :__item_config_cmd
-
-  def tagid(tagOrId)
-    if tagOrId.kind_of?(Tk::Itk::Component)
-      tagOrId.name
-    else
-      #_get_eval_string(tagOrId)
-      tagOrId
-    end
-  end
-
-  alias pagecget_tkstring itemcget_tkstring
-  alias pagecget itemcget
-  alias pagecget_strict itemcget_strict
-  alias pageconfigure itemconfigure
-  alias pageconfiginfo itemconfiginfo
-  alias current_pageconfiginfo current_itemconfiginfo
-
-  private :itemcget_tkstring, :itemcget, :itemcget_strict
-  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
-
-  ####################################
-
-  def __boolval_optkeys
-    super() << 'auto'
-  end
-  private :__boolval_optkeys
-
-  def add(keys={})
-    window(tk_call(@path, 'add', *hash_kv(keys)))
-  end
-
-  def child_site_list
-    list(tk_call(@path, 'childsite'))
-  end
-
-  def child_site(idx)
-    if (new_idx = self.index(idx)) < 0
-      new_idx = tagid(idx)
-    end
-    window(tk_call(@path, 'childsite', new_idx))
-  end
-
-  def delete(idx1, idx2=nil)
-    if (new_idx1 = self.index(idx1)) < 0
-      new_idx1 = tagid(idx1)
-    end
-    if idx2
-      if (new_idx2 = self.index(idx2)) < 0
-        new_idx2 = tagid(idx2)
-      end
-      tk_call(@path, 'delete', new_idx1, new_idx2)
-    else
-      tk_call(@path, 'delete', new_idx1)
-    end
-    self
-  end
-
-  def index(idx)
-    number(tk_call(@path, 'index', tagid(idx)))
-  end
-
-  def insert(idx, keys={})
-    if (new_idx = self.index(idx)) < 0
-      new_idx = tagid(idx)
-    end
-    window(tk_call(@path, 'insert', new_idx, *hash_kv(keys)))
-  end
-
-  def next
-    tk_call(@path, 'next')
-    self
-  end
-
-  def prev
-    tk_call(@path, 'prev')
-    self
-  end
-
-  def select(idx)
-    if (new_idx = self.index(idx)) < 0
-      new_idx = tagid(idx)
-    end
-    tk_call(@path, 'select', new_idx)
-    self
-  end
-
-  def scrollcommand(cmd=Proc.new)
-    configure_cmd 'scrollcommand', cmd
-    self
-  end
-  alias xscrollcommand scrollcommand
-  alias yscrollcommand scrollcommand
-
-  def xscrollbar(bar=nil)
-    if bar
-      @scrollbar = bar
-      @scrollbar.orient 'horizontal'
-      self.scrollcommand {|*arg| @scrollbar.set(*arg)}
-      @scrollbar.command {|*arg| self.xview(*arg)}
-      Tk.update  # avoid scrollbar trouble
-    end
-    @scrollbar
-  end
-  def yscrollbar(bar=nil)
-    if bar
-      @scrollbar = bar
-      @scrollbar.orient 'vertical'
-      self.scrollcommand {|*arg| @scrollbar.set(*arg)}
-      @scrollbar.command {|*arg| self.yview(*arg)}
-      Tk.update  # avoid scrollbar trouble
-    end
-    @scrollbar
-  end
-  alias scrollbar yscrollbar
-
-  def view(*idxs)
-    if idxs.size == 0
-      idx = num_or_str(tk_send_without_enc('view'))
-      if idx.kind_of?(Fixnum) && idx < 0
-        nil
-      else
-        idx
-      end
-    else
-      tk_send_without_enc('view', *idxs)
-      self
-    end
-  end
-  alias xview view
-  alias yview view
-
-  def view_moveto(*idxs)
-    view('moveto', *idxs)
-  end
-  alias xview_moveto view_moveto
-  alias yview_moveto view_moveto
-  def view_scroll(index, what='pages')
-    view('scroll', index, what)
-  end
-  alias xview_scroll view_scroll
-  alias yview_scroll view_scroll
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/optionmenu.rb b/ext/tk/lib/tkextlib/iwidgets/optionmenu.rb
deleted file mode 100644
index 642db11ff1..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/optionmenu.rb
+++ /dev/null
@@ -1,93 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/optionmenu.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class  Optionmenu < Tk::Iwidgets::Labeledwidget
-    end
-  end
-end
-
-class Tk::Iwidgets::Optionmenu
-  TkCommandNames = ['::iwidgets::optionmenu'.freeze].freeze
-  WidgetClassName = 'Optionmenu'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __boolval_optkeys
-    super() << 'cyclicon'
-  end
-  private :__boolval_optkeys
-
-  def delete(first, last=nil)
-    if last
-      tk_call(@path, 'delete', first, last)
-    else
-      tk_call(@path, 'delete', first)
-    end
-    self
-  end
-
-  def disable(idx)
-    tk_call(@path, 'disable', idx)
-    self
-  end
-
-  def enable(idx)
-    tk_call(@path, 'enable', idx)
-    self
-  end
-
-  def get(first=nil, last=nil)
-    if last
-      simplelist(tk_call(@path, 'get', first, last))
-    elsif first
-      tk_call(@path, 'get', first)
-    else
-      tk_call(@path, 'get')
-    end
-  end
-  def get_range(first, last)
-    get(first, last)
-  end
-  def get_selected
-    get()
-  end
-
-  def index(idx)
-    number(tk_call(@path, 'index', idx))
-  end
-
-  def insert(idx, *args)
-    tk_call(@path, 'insert', idx, *args)
-    self
-  end
-
-  def select(idx)
-    tk_call(@path, 'select', idx)
-    self
-  end
-
-  def sort(*params, &b)
-    # see 'lsort' man page about params
-    if b
-      tk_call(@path, 'sort', '-command', proc(&b), *params)
-    else
-      tk_call(@path, 'sort', *params)
-    end
-    self
-  end
-  def sort_ascending
-    tk_call(@path, 'sort', 'ascending')
-    self
-  end
-  def sort_descending
-    tk_call(@path, 'sort', 'descending')
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/panedwindow.rb b/ext/tk/lib/tkextlib/iwidgets/panedwindow.rb
deleted file mode 100644
index 5f17bdd862..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/panedwindow.rb
+++ /dev/null
@@ -1,135 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/panedwindow.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class Panedwindow < Tk::Itk::Widget
-    end
-  end
-end
-
-class Tk::Iwidgets::Panedwindow
-  TkCommandNames = ['::iwidgets::panedwindow'.freeze].freeze
-  WidgetClassName = 'Panedwindow'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  ####################################
-
-  include TkItemConfigMethod
-
-  def __item_cget_cmd(id)
-    [self.path, 'panecget', id]
-  end
-  private :__item_cget_cmd
-
-  def __item_config_cmd(id)
-    [self.path, 'paneconfigure', id]
-  end
-  private :__item_config_cmd
-
-  def tagid(tagOrId)
-    if tagOrId.kind_of?(Tk::Itk::Component)
-      tagOrId.name
-    else
-      #_get_eval_string(tagOrId)
-      tagOrId
-    end
-  end
-
-  alias panecget_tkstring itemcget_tkstring
-  alias panecget itemcget
-  alias panecget_strict itemcget_strict
-  alias paneconfigure itemconfigure
-  alias paneconfiginfo itemconfiginfo
-  alias current_paneconfiginfo current_itemconfiginfo
-
-  private :itemcget_tkstring, :itemcget, :itemcget_strict
-  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
-
-  ####################################
-
-  def __boolval_optkeys
-    super() << 'showhandle'
-  end
-  private :__boolval_optkeys
-
-  def add(tag=nil, keys={})
-    if tag.kind_of?(Hash)
-      keys = tag
-      tag = nil
-    end
-    if tag
-      tag = Tk::Itk::Component.new(self, tagid(tag))
-    else
-      tag = Tk::Itk::Component.new(self)
-    end
-    window(tk_call(@path, 'add', tagid(tag), *hash_kv(keys)))
-    tag
-  end
-
-  def child_site_list
-    list(tk_call(@path, 'childsite'))
-  end
-
-  def child_site(idx)
-    window(tk_call(@path, 'childsite', index(idx)))
-  end
-
-  def delete(idx)
-    tk_call(@path, 'delete', index(idx))
-    self
-  end
-
-  def fraction(*percentages)
-    tk_call(@path, 'fraction', *percentages)
-    self
-  end
-
-  def hide(idx)
-    tk_call(@path, 'hide', index(idx))
-    self
-  end
-
-  def index(idx)
-    number(tk_call(@path, 'index', tagid(idx)))
-  end
-
-  def insert(idx, tag=nil, keys={})
-    if tag.kind_of?(Hash)
-      keys = tag
-      tag = nil
-    end
-    if tag
-      tag = Tk::Itk::Component.new(self, tagid(tag))
-    else
-      tag = Tk::Itk::Component.new(self)
-    end
-    window(tk_call(@path, 'insert', index(idx), tagid(tag), *hash_kv(keys)))
-    tag
-  end
-
-  def invoke(idx=nil)
-    if idx
-      tk_call(@path, 'invoke', index(idx))
-    else
-      tk_call(@path, 'invoke')
-    end
-    self
-  end
-
-  def reset
-    tk_call(@path, 'reset')
-    self
-  end
-
-  def show(idx)
-    tk_call(@path, 'show', index(idx))
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/promptdialog.rb b/ext/tk/lib/tkextlib/iwidgets/promptdialog.rb
deleted file mode 100644
index fc73a51742..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/promptdialog.rb
+++ /dev/null
@@ -1,132 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/promptdialog.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class Promptdialog < Tk::Iwidgets::Dialog
-    end
-  end
-end
-
-class Tk::Iwidgets::Promptdialog
-  TkCommandNames = ['::iwidgets::promptdialog'.freeze].freeze
-  WidgetClassName = 'Promptdialog'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  # index method is not available, because it shows index of the entry field
-  def default(name)
-    tk_call(@path, 'default', tagid(name))
-    self
-  end
-
-  def hide(name)
-    tk_call(@path, 'hide', tagid(name))
-    self
-  end
-
-  def invoke(name=nil)
-    if name
-      tk_call(@path, 'invoke', tagid(name))
-    else
-      tk_call(@path, 'invoke')
-    end
-    self
-  end
-
-  def show(name)
-    tk_call(@path, 'show', tagid(name))
-    self
-  end
-
-
-  # based on Tk::Iwidgets::Entryfield
-  def clear
-    tk_call(@path, 'clear')
-    self
-  end
-
-  def delete(first, last=None)
-    tk_send_without_enc('delete', first, last)
-    self
-  end
-
-  def value
-    _fromUTF8(tk_send_without_enc('get'))
-  end
-  def value= (val)
-    tk_send_without_enc('delete', 0, 'end')
-    tk_send_without_enc('insert', 0, _get_eval_enc_str(val))
-    val
-  end
-  alias get value
-  alias set value=
-
-  def cursor=(index)
-    tk_send_without_enc('icursor', index)
-    #self
-    index
-  end
-  alias icursor cursor=
-
-  def index(idx)
-    number(tk_send_without_enc('index', idx))
-  end
-
-  def insert(pos,text)
-    tk_send_without_enc('insert', pos, _get_eval_enc_str(text))
-    self
-  end
-
-  def mark(pos)
-    tk_send_without_enc('scan', 'mark', pos)
-    self
-  end
-  def dragto(pos)
-    tk_send_without_enc('scan', 'dragto', pos)
-    self
-  end
-  def selection_adjust(index)
-    tk_send_without_enc('selection', 'adjust', index)
-    self
-  end
-  def selection_clear
-    tk_send_without_enc('selection', 'clear')
-    self
-  end
-  def selection_from(index)
-    tk_send_without_enc('selection', 'from', index)
-    self
-  end
-  def selection_present()
-    bool(tk_send_without_enc('selection', 'present'))
-  end
-  def selection_range(s, e)
-    tk_send_without_enc('selection', 'range', s, e)
-    self
-  end
-  def selection_to(index)
-    tk_send_without_enc('selection', 'to', index)
-    self
-  end
-
-  def xview(*index)
-    if index.size == 0
-      list(tk_send_without_enc('xview'))
-    else
-      tk_send_without_enc('xview', *index)
-      self
-    end
-  end
-  def xview_moveto(*index)
-    xview('moveto', *index)
-  end
-  def xview_scroll(*index)
-    xview('scroll', *index)
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/pushbutton.rb b/ext/tk/lib/tkextlib/iwidgets/pushbutton.rb
deleted file mode 100644
index cec3563ddc..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/pushbutton.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/pushbutton.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class Pushbutton < Tk::Itk::Widget
-    end
-  end
-end
-
-class Tk::Iwidgets::Pushbutton
-  TkCommandNames = ['::iwidgets::pushbutton'.freeze].freeze
-  WidgetClassName = 'Pushbutton'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __boolval_optkeys
-    super() << 'defaultring'
-  end
-  private :__boolval_optkeys
-
-  def invoke
-    tk_call_without_enc(@path, 'invoke')
-    self
-  end
-
-  def flash
-    tk_call_without_enc(@path, 'flash')
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/radiobox.rb b/ext/tk/lib/tkextlib/iwidgets/radiobox.rb
deleted file mode 100644
index 1c9e9f8d34..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/radiobox.rb
+++ /dev/null
@@ -1,122 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/radiobox.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class Radiobox < Tk::Iwidgets::Labeledframe
-    end
-  end
-end
-
-class Tk::Iwidgets::Radiobox
-  TkCommandNames = ['::iwidgets::radiobox'.freeze].freeze
-  WidgetClassName = 'Radiobox'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  ####################################
-
-  include TkItemConfigMethod
-
-  def __item_cget_cmd(id)
-    [self.path, 'buttoncget', id]
-  end
-  private :__item_cget_cmd
-
-  def __item_config_cmd(id)
-    [self.path, 'buttonconfigure', id]
-  end
-  private :__item_config_cmd
-
-  def __item_boolval_optkeys(id)
-    super(id) << 'defaultring'
-  end
-  private :__item_boolval_optkeys
-
-  def tagid(tagOrId)
-    if tagOrId.kind_of?(Tk::Itk::Component)
-      tagOrId.name
-    else
-      #_get_eval_string(tagOrId)
-      tagOrId
-    end
-  end
-
-  alias buttoncget_tkstring itemcget_tkstring
-  alias buttoncget itemcget
-  alias buttoncget_strict itemcget_strict
-  alias buttonconfigure itemconfigure
-  alias buttonconfiginfo itemconfiginfo
-  alias current_buttonconfiginfo current_itemconfiginfo
-
-  private :itemcget_tkstring, :itemcget, :itemcget_strict
-  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
-
-  ####################################
-
-  def add(tag=nil, keys={})
-    if tag.kind_of?(Hash)
-      keys = tag
-      tag = nil
-    end
-    if tag
-      tag = Tk::Itk::Component.new(self, tagid(tag))
-    else
-      tag = Tk::Itk::Component.new(self)
-    end
-    tk_call(@path, 'add', tagid(tag), *hash_kv(keys))
-    tag
-  end
-
-  def delete(idx)
-    tk_call(@path, 'delete', index(idx))
-    self
-  end
-
-  def deselect(idx)
-    tk_call(@path, 'deselect', index(idx))
-    self
-  end
-
-  def flash(idx)
-    tk_call(@path, 'flash', index(idx))
-    self
-  end
-
-  def get_tag
-    ((tag = tk_call_without_enc(@path, 'get')).empty?)? nil: tag
-  end
-  alias get get_tag
-
-  def get_obj
-    (tag = get_tag)? Tk::Itk::Component.id2obj(self, tag): nil
-  end
-
-  def index(idx)
-    number(tk_call(@path, 'index', tagid(idx)))
-  end
-
-  def insert(idx, tag=nil, keys={})
-    if tag.kind_of?(Hash)
-      keys = tag
-      tag = nil
-    end
-    if tag
-      tag = Tk::Itk::Component.new(self, tagid(tag))
-    else
-      tag = Tk::Itk::Component.new(self)
-    end
-    tk_call(@path, 'insert', index(idx), tagid(tag), *hash_kv(keys))
-    tag
-  end
-
-  def select(idx)
-    tk_call(@path, 'select', index(idx))
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/scopedobject.rb b/ext/tk/lib/tkextlib/iwidgets/scopedobject.rb
deleted file mode 100644
index e17fee98dc..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/scopedobject.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/buttonbox.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class Scopedobject < TkObject
-    end
-  end
-end
-
-class Tk::Iwidgets::Scopedobject
-  TkCommandNames = ['::iwidgets::scopedobject'.freeze].freeze
-  WidgetClassName = 'Scopedobject'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def initialize(obj_name, keys={})
-    @path = tk_call(self.class::TkCommandNames[0], obj_name, *hash_kv(keys))
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb b/ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb
deleted file mode 100644
index 463689f513..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb
+++ /dev/null
@@ -1,354 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/scrolledcanvas.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tk/canvas'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class Scrolledcanvas < Tk::Iwidgets::Scrolledwidget
-    end
-  end
-end
-
-class Tk::Iwidgets::Scrolledcanvas
-  TkCommandNames = ['::iwidgets::scrolledcanvas'.freeze].freeze
-  WidgetClassName = 'Scrolledcanvas'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  ################################
-
-  def __boolval_optkeys
-    super() << 'autoresize'
-  end
-  private :__boolval_optkeys
-
-  def __strval_optkeys
-    super() << 'textbackground'
-  end
-  private :__strval_optkeys
-
-  def initialize(*args)
-    super(*args)
-    @canvas = component_widget('canvas')
-  end
-
-  def method_missing(id, *args)
-    if @canvas.respond_to?(id)
-      @canvas.__send__(id, *args)
-    else
-      super(id, *args)
-    end
-  end
-
-  ################################
-
-  def child_site
-    window(tk_call(@path, 'childsite'))
-  end
-
-  def justify(dir)
-    tk_call(@path, 'justify', dir)
-    self
-  end
-
-  ##########################
-  include TkCanvasItemConfig
-
-  def tagid(tag)
-    if tag.kind_of?(TkcItem) || tag.kind_of?(TkcTag)
-      tag.id
-    elsif tag.kind_of?(Tk::Itk::Component)
-      tag.name
-    else
-      tag  # maybe an Array of configure parameters
-    end
-  end
-  private :tagid
-
-  # create a canvas item without creating a TkcItem object
-  def create(type, *args)
-    type.create(self, *args)
-  end
-
-  #######################
-
-  def addtag(tag, mode, *args)
-    tk_send_without_enc('addtag', tagid(tag), mode, *args)
-    self
-  end
-  def addtag_above(tagOrId, target)
-    addtag(tagOrId, 'above', tagid(target))
-  end
-  def addtag_all(tagOrId)
-    addtag(tagOrId, 'all')
-  end
-  def addtag_below(tagOrId, target)
-    addtag(tagOrId, 'below', tagid(target))
-  end
-  def addtag_closest(tagOrId, x, y, halo=None, start=None)
-    addtag(tagOrId, 'closest', x, y, halo, start)
-  end
-  def addtag_enclosed(tagOrId, x1, y1, x2, y2)
-    addtag(tagOrId, 'enclosed', x1, y1, x2, y2)
-  end
-  def addtag_overlapping(tagOrId, x1, y1, x2, y2)
-    addtag(tagOrId, 'overlapping', x1, y1, x2, y2)
-  end
-  def addtag_withtag(tagOrId, tag)
-    addtag(tagOrId, 'withtag', tagid(tag))
-  end
-
-  def bbox(tagOrId, *tags)
-    list(tk_send_without_enc('bbox', tagid(tagOrId),
-                             *tags.collect{|t| tagid(t)}))
-  end
-
-  #def itembind(tag, context, cmd=Proc.new, *args)
-  #  _bind([path, "bind", tagid(tag)], context, cmd, *args)
-  #  self
-  #end
-  def itembind(tag, context, *args)
-    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _bind([path, "bind", tagid(tag)], context, cmd, *args)
-    self
-  end
-
-  #def itembind_append(tag, context, cmd=Proc.new, *args)
-  #  _bind_append([path, "bind", tagid(tag)], context, cmd, *args)
-  #  self
-  #end
-  def itembind_append(tag, context, *args)
-    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _bind_append([path, "bind", tagid(tag)], context, cmd, *args)
-    self
-  end
-
-  def itembind_remove(tag, context)
-    _bind_remove([path, "bind", tagid(tag)], context)
-    self
-  end
-
-  def itembindinfo(tag, context=nil)
-    _bindinfo([path, "bind", tagid(tag)], context)
-  end
-
-  def canvasx(screen_x, *args)
-    #tk_tcl2ruby(tk_send_without_enc('canvasx', screen_x, *args))
-    number(tk_send_without_enc('canvasx', screen_x, *args))
-  end
-  def canvasy(screen_y, *args)
-    #tk_tcl2ruby(tk_send_without_enc('canvasy', screen_y, *args))
-    number(tk_send_without_enc('canvasy', screen_y, *args))
-  end
-
-  def coords(tag, *args)
-    if args == []
-      tk_split_list(tk_send_without_enc('coords', tagid(tag)))
-    else
-      tk_send_without_enc('coords', tagid(tag), *(args.flatten))
-      self
-    end
-  end
-
-  def dchars(tag, first, last=None)
-    tk_send_without_enc('dchars', tagid(tag),
-                        _get_eval_enc_str(first), _get_eval_enc_str(last))
-    self
-  end
-
-  def delete(*args)
-    tbl = nil
-    TkcItem::CItemID_TBL.mutex.synchronize{
-      tbl = TkcItem::CItemID_TBL[self.path]
-    }
-    if tbl
-      find('withtag', *args).each{|item|
-        if item.kind_of?(TkcItem)
-          TkcItem::CItemID_TBL.mutex.synchronize{
-            tbl.delete(item.id)
-          }
-        end
-      }
-    end
-    tk_send_without_enc('delete', *args.collect{|t| tagid(t)})
-    self
-  end
-  alias remove delete
-
-  def dtag(tag, tag_to_del=None)
-    tk_send_without_enc('dtag', tagid(tag), tag_to_del)
-    self
-  end
-
-  def find(mode, *args)
-    list(tk_send_without_enc('find', mode, *args)).collect!{|id|
-      TkcItem.id2obj(self, id)
-    }
-  end
-  def find_above(target)
-    find('above', tagid(target))
-  end
-  def find_all
-    find('all')
-  end
-  def find_below(target)
-    find('below', tagid(target))
-  end
-  def find_closest(x, y, halo=None, start=None)
-    find('closest', x, y, halo, start)
-  end
-  def find_enclosed(x1, y1, x2, y2)
-    find('enclosed', x1, y1, x2, y2)
-  end
-  def find_overlapping(x1, y1, x2, y2)
-    find('overlapping', x1, y1, x2, y2)
-  end
-  def find_withtag(tag)
-    find('withtag', tag)
-  end
-
-  def itemfocus(tagOrId=nil)
-    if tagOrId
-      tk_send_without_enc('focus', tagid(tagOrId))
-      self
-    else
-      ret = tk_send_without_enc('focus')
-      if ret == ""
-        nil
-      else
-        TkcItem.id2obj(self, ret)
-      end
-    end
-  end
-
-  def gettags(tagOrId)
-    list(tk_send_without_enc('gettags', tagid(tagOrId))).collect{|tag|
-      TkcTag.id2obj(self, tag)
-    }
-  end
-
-  def icursor(tagOrId, index)
-    tk_send_without_enc('icursor', tagid(tagOrId), index)
-    self
-  end
-
-  def index(tagOrId, idx)
-    number(tk_send_without_enc('index', tagid(tagOrId), idx))
-  end
-
-  def insert(tagOrId, index, string)
-    tk_send_without_enc('insert', tagid(tagOrId), index,
-                        _get_eval_enc_str(string))
-    self
-  end
-
-  def lower(tag, below=nil)
-    if below
-      tk_send_without_enc('lower', tagid(tag), tagid(below))
-    else
-      tk_send_without_enc('lower', tagid(tag))
-    end
-    self
-  end
-
-  def move(tag, x, y)
-    tk_send_without_enc('move', tagid(tag), x, y)
-    self
-  end
-
-  def postscript(keys)
-    tk_send("postscript", *hash_kv(keys))
-  end
-
-  def raise(tag, above=nil)
-    if above
-      tk_send_without_enc('raise', tagid(tag), tagid(above))
-    else
-      tk_send_without_enc('raise', tagid(tag))
-    end
-    self
-  end
-
-  def scale(tag, x, y, xs, ys)
-    tk_send_without_enc('scale', tagid(tag), x, y, xs, ys)
-    self
-  end
-
-  def scan_mark(x, y)
-    tk_send_without_enc('scan', 'mark', x, y)
-    self
-  end
-  def scan_dragto(x, y)
-    tk_send_without_enc('scan', 'dragto', x, y)
-    self
-  end
-
-  def select(mode, *args)
-    r = tk_send_without_enc('select', mode, *args)
-    (mode == 'item')? TkcItem.id2obj(self, r): self
-  end
-  def select_adjust(tagOrId, index)
-    select('adjust', tagid(tagOrId), index)
-  end
-  def select_clear
-    select('clear')
-  end
-  def select_from(tagOrId, index)
-    select('from', tagid(tagOrId), index)
-  end
-  def select_item
-    select('item')
-  end
-  def select_to(tagOrId, index)
-    select('to', tagid(tagOrId), index)
-  end
-
-  def itemtype(tag)
-    TkcItem.type2class(tk_send('type', tagid(tag)))
-  end
-
-  def xview(*index)
-    if index.size == 0
-      list(tk_send_without_enc('xview'))
-    else
-      tk_send_without_enc('xview', *index)
-      self
-    end
-  end
-  def xview_moveto(*index)
-    xview('moveto', *index)
-  end
-  def xview_scroll(*index)
-    xview('scroll', *index)
-  end
-
-  def yview(*index)
-    if index.size == 0
-      list(tk_send_without_enc('yview'))
-    else
-      tk_send_without_enc('yview', *index)
-      self
-    end
-  end
-  def yview_moveto(*index)
-    yview('moveto', *index)
-  end
-  def yview_scroll(*index)
-    yview('scroll', *index)
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/scrolledframe.rb b/ext/tk/lib/tkextlib/iwidgets/scrolledframe.rb
deleted file mode 100644
index f105576fd6..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/scrolledframe.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/scrolledframe.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class Scrolledframe < Tk::Iwidgets::Scrolledwidget
-    end
-  end
-end
-
-class Tk::Iwidgets::Scrolledframe
-  TkCommandNames = ['::iwidgets::scrolledframe'.freeze].freeze
-  WidgetClassName = 'Scrolledframe'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def child_site
-    window(tk_call(@path, 'childsite'))
-  end
-
-  def justify(dir)
-    tk_call(@path, 'justify', dir)
-    self
-  end
-
-  def xview(*index)
-    if index.size == 0
-      list(tk_send_without_enc('xview'))
-    else
-      tk_send_without_enc('xview', *index)
-      self
-    end
-  end
-  def xview_moveto(*index)
-    xview('moveto', *index)
-  end
-  def xview_scroll(*index)
-    xview('scroll', *index)
-  end
-
-  def yview(*index)
-    if index.size == 0
-      list(tk_send_without_enc('yview'))
-    else
-      tk_send_without_enc('yview', *index)
-      self
-    end
-  end
-  def yview_moveto(*index)
-    yview('moveto', *index)
-  end
-  def yview_scroll(*index)
-    yview('scroll', *index)
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/scrolledhtml.rb b/ext/tk/lib/tkextlib/iwidgets/scrolledhtml.rb
deleted file mode 100644
index 4ee5abe9fc..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/scrolledhtml.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/scrolledhtml.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class Scrolledhtml < Tk::Iwidgets::Scrolledtext
-    end
-  end
-end
-
-class Tk::Iwidgets::Scrolledhtml
-  TkCommandNames = ['::iwidgets::scrolledhtml'.freeze].freeze
-  WidgetClassName = 'Scrolledhtml'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __boolval_optkeys
-    super() << 'update'
-  end
-  private :__boolval_optkeys
-
-  def __strval_optkeys
-    super() << 'fontname' << 'link' << 'alink' << 'textbackground'
-  end
-  private :__strval_optkeys
-
-  def __font_optkeys
-    super() << 'fixedfont'
-  end
-  private :__font_optkeys
-
-  def import(href)
-    tk_call(@path, 'import', href)
-    self
-  end
-
-  def import_link(href)
-    tk_call(@path, 'import', '-link', href)
-    self
-  end
-
-  def pwd
-    tk_call(@path, 'pwd')
-  end
-
-  def render(htmltext, workdir=None)
-    tk_call(@path, 'render', htmltext, workdir)
-    self
-  end
-
-  def title
-    tk_call(@path, 'title')
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb b/ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb
deleted file mode 100644
index 94949c5524..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb
+++ /dev/null
@@ -1,208 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/scrolledlistbox.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tk/listbox'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class Scrolledlistbox < Tk::Iwidgets::Scrolledwidget
-    end
-  end
-end
-
-class Tk::Iwidgets::Scrolledlistbox
-  TkCommandNames = ['::iwidgets::scrolledlistbox'.freeze].freeze
-  WidgetClassName = 'Scrolledlistbox'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __strval_optkeys
-    super() << 'textbackground'
-  end
-  private :__strval_optkeys
-
-  def __tkvariable_optkeys
-    super() << 'listvariable'
-  end
-  private :__tkvariable_optkeys
-
-  def __font_optkeys
-    super() << 'textfont'
-  end
-  private :__font_optkeys
-
-  ################################
-
-  def initialize(*args)
-    super(*args)
-    @listbox = component_widget('listbox')
-  end
-
-  def method_missing(id, *args)
-    if @listbox.respond_to?(id)
-      @listbox.__send__(id, *args)
-    else
-      super(id, *args)
-    end
-  end
-
-  ################################
-
-  def clear
-    tk_call(@path, 'clear')
-    self
-  end
-
-  def get_curselection
-    tk_call(@path, 'getcurselection')
-  end
-
-  def justify(dir)
-    tk_call(@path, 'justify', dir)
-    self
-  end
-
-  def selected_item_count
-    number(tk_call(@path, 'selecteditemcount'))
-  end
-
-  def sort(*params, &b)
-    # see 'lsort' man page about params
-    if b
-      tk_call(@path, 'sort', '-command', proc(&b), *params)
-    else
-      tk_call(@path, 'sort', *params)
-    end
-    self
-  end
-  def sort_ascending
-    tk_call(@path, 'sort', 'ascending')
-    self
-  end
-  def sort_descending
-    tk_call(@path, 'sort', 'descending')
-    self
-  end
-
-  #####################################
-
-  def bbox(index)
-    list(tk_send_without_enc('bbox', index))
-  end
-  def delete(first, last=None)
-    tk_send_without_enc('delete', first, last)
-    self
-  end
-  def get(*index)
-    _fromUTF8(tk_send_without_enc('get', *index))
-  end
-  def insert(index, *args)
-    tk_send('insert', index, *args)
-    self
-  end
-  def scan_mark(x, y)
-    tk_send_without_enc('scan', 'mark', x, y)
-    self
-  end
-  def scan_dragto(x, y)
-    tk_send_without_enc('scan', 'dragto', x, y)
-    self
-  end
-  def see(index)
-    tk_send_without_enc('see', index)
-    self
-  end
-
-  #####################################
-
-  include TkListItemConfig
-
-  def tagid(tag)
-    if tag.kind_of?(Tk::Itk::Component)
-      tag.name
-    else
-      super(tag)
-    end
-  end
-  private :tagid
-
-  #####################################
-
-  def activate(y)
-    tk_send_without_enc('activate', y)
-    self
-  end
-  def curselection
-    list(tk_send_without_enc('curselection'))
-  end
-  def get(first, last=nil)
-    if last
-      # tk_split_simplelist(_fromUTF8(tk_send_without_enc('get', first, last)))
-      tk_split_simplelist(tk_send_without_enc('get', first, last),
-                          false, true)
-    else
-      _fromUTF8(tk_send_without_enc('get', first))
-    end
-  end
-  def nearest(y)
-    tk_send_without_enc('nearest', y).to_i
-  end
-  def size
-    tk_send_without_enc('size').to_i
-  end
-  def selection_anchor(index)
-    tk_send_without_enc('selection', 'anchor', index)
-    self
-  end
-  def selection_clear(first, last=None)
-    tk_send_without_enc('selection', 'clear', first, last)
-    self
-  end
-  def selection_includes(index)
-    bool(tk_send_without_enc('selection', 'includes', index))
-  end
-  def selection_set(first, last=None)
-    tk_send_without_enc('selection', 'set', first, last)
-    self
-  end
-
-  def index(idx)
-    tk_send_without_enc('index', idx).to_i
-  end
-
-  #####################################
-
-  def xview(*index)
-    if index.size == 0
-      list(tk_send_without_enc('xview'))
-    else
-      tk_send_without_enc('xview', *index)
-      self
-    end
-  end
-  def xview_moveto(*index)
-    xview('moveto', *index)
-  end
-  def xview_scroll(*index)
-    xview('scroll', *index)
-  end
-
-  def yview(*index)
-    if index.size == 0
-      list(tk_send_without_enc('yview'))
-    else
-      tk_send_without_enc('yview', *index)
-      self
-    end
-  end
-  def yview_moveto(*index)
-    yview('moveto', *index)
-  end
-  def yview_scroll(*index)
-    yview('scroll', *index)
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb b/ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb
deleted file mode 100644
index 1e2898988c..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb
+++ /dev/null
@@ -1,569 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/scrolledtext.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tk/text'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class Scrolledtext < Tk::Iwidgets::Scrolledwidget
-    end
-  end
-end
-
-class Tk::Iwidgets::Scrolledtext
-  TkCommandNames = ['::iwidgets::scrolledtext'.freeze].freeze
-  WidgetClassName = 'Scrolledtext'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __strval_optkeys
-    super() << 'textbackground'
-  end
-  private :__strval_optkeys
-
-  def __font_optkeys
-    super() << 'textfont'
-  end
-  private :__font_optkeys
-
-  ################################
-
-  def initialize(*args)
-    super(*args)
-    @text = component_widget('text')
-  end
-
-  def method_missing(id, *args)
-    if @text.respond_to?(id)
-      @text.__send__(id, *args)
-    else
-      super(id, *args)
-    end
-  end
-
-  ################################
-
-  def child_site
-    window(tk_call(@path, 'childsite'))
-  end
-
-  def clear
-    tk_call(@path, 'clear')
-    self
-  end
-
-  def import(file, idx=nil)
-    if idx
-      tk_call(@path, 'import', file, index(idx))
-    else
-      tk_call(@path, 'import', file)
-    end
-    self
-  end
-
-  def export(file)
-    tk_call(@path, 'export', file)
-    self
-  end
-
-  #####################################
-
-  include TkTextTagConfig
-
-  def tagid(tag)
-    if tag.kind_of?(Tk::Itk::Component)
-      tag.name
-    else
-      super(tag)
-    end
-  end
-  private :tagid
-
-  def bbox(index)
-    list(tk_send('bbox', index))
-  end
-  def compare(idx1, op, idx2)
-    bool(tk_send_without_enc('compare', _get_eval_enc_str(idx1),
-                             op, _get_eval_enc_str(idx2)))
-  end
-
-  def debug
-    bool(tk_send_without_enc('debug'))
-  end
-  def debug=(boolean)
-    tk_send_without_enc('debug', boolean)
-    #self
-    boolean
-  end
-
-  def delete(first, last=None)
-    tk_send_without_enc('delete', first, last)
-    self
-  end
-
-  def dlineinfo(index)
-    list(tk_send_without_enc('dlineinfo', _get_eval_enc_str(index)))
-  end
-
-  def get(*index)
-    _fromUTF8(tk_send_without_enc('get', *index))
-  end
-  def get_displaychars(*index)
-    # Tk8.5 feature
-    get('-displaychars', *index)
-  end
-
-  def image_cget_tkstring(index, slot)
-    _fromUTF8(tk_send_without_enc('image', 'cget',
-                                  _get_eval_enc_str(index), "-#{slot.to_s}"))
-  end
-  def image_cget_strict(index, slot)
-    case slot.to_s
-    when 'text', 'label', 'show', 'data', 'file'
-      _fromUTF8(tk_send_without_enc('image', 'cget',
-                                    _get_eval_enc_str(index), "-#{slot}"))
-    else
-      tk_tcl2ruby(_fromUTF8(tk_send_without_enc('image', 'cget',
-                                                _get_eval_enc_str(index),
-                                                "-#{slot}")))
-    end
-  end
-  def image_cget(index, slot)
-    unless TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-      image_cget_strict(index, slot)
-    else
-      begin
-        image_cget_strict(index, slot)
-      rescue => e
-        begin
-          if current_image_configinfo.has_key?(slot.to_s)
-            # error on known option
-            fail e
-          else
-            # unknown option
-            nil
-          end
-        rescue
-          fail e  # tag error
-        end
-      end
-    end
-  end
-
-  def image_configure(index, slot, value=None)
-    if slot.kind_of? Hash
-      _fromUTF8(tk_send_without_enc('image', 'configure',
-                                    _get_eval_enc_str(index),
-                                    *hash_kv(slot, true)))
-    else
-      _fromUTF8(tk_send_without_enc('image', 'configure',
-                                    _get_eval_enc_str(index),
-                                    "-#{slot}",
-                                    _get_eval_enc_str(value)))
-    end
-    self
-  end
-
-  def image_configinfo(index, slot = nil)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if slot
-        case slot.to_s
-        when 'text', 'label', 'show', 'data', 'file'
-          #conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}")))
-          conf = tk_split_simplelist(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}"), false, true)
-        else
-          #conf = tk_split_list(_fromUTF8(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}")))
-          conf = tk_split_list(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}"), 0, false, true)
-        end
-        conf[0] = conf[0][1..-1]
-        conf
-      else
-        #tk_split_simplelist(_fromUTF8(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index)))).collect{|conflist|
-        #  conf = tk_split_simplelist(conflist)
-        tk_split_simplelist(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index)), false, false).collect{|conflist|
-          conf = tk_split_simplelist(conflist, false, true)
-          conf[0] = conf[0][1..-1]
-          case conf[0]
-          when 'text', 'label', 'show', 'data', 'file'
-          else
-            if conf[3]
-              if conf[3].index('{')
-                conf[3] = tk_split_list(conf[3])
-              else
-                conf[3] = tk_tcl2ruby(conf[3])
-              end
-            end
-            if conf[4]
-              if conf[4].index('{')
-                conf[4] = tk_split_list(conf[4])
-              else
-                conf[4] = tk_tcl2ruby(conf[4])
-              end
-            end
-          end
-          conf[1] = conf[1][1..-1] if conf.size == 2 # alias info
-          conf
-        }
-      end
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      if slot
-        case slot.to_s
-        when 'text', 'label', 'show', 'data', 'file'
-          #conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}")))
-          conf = tk_split_simplelist(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}"), false, true)
-        else
-          #conf = tk_split_list(_fromUTF8(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}")))
-          conf = tk_split_list(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}"), 0, false, true)
-        end
-        key = conf.shift[1..-1]
-        { key => conf }
-      else
-        ret = {}
-        #tk_split_simplelist(_fromUTF8(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index)))).each{|conflist|
-        #  conf = tk_split_simplelist(conflist)
-        tk_split_simplelist(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index)), false, false).each{|conflist|
-          conf = tk_split_simplelist(conflist, false, true)
-          key = conf.shift[1..-1]
-          case key
-          when 'text', 'label', 'show', 'data', 'file'
-          else
-            if conf[2]
-              if conf[2].index('{')
-                conf[2] = tk_split_list(conf[2])
-              else
-                conf[2] = tk_tcl2ruby(conf[2])
-              end
-            end
-            if conf[3]
-              if conf[3].index('{')
-                conf[3] = tk_split_list(conf[3])
-              else
-                conf[3] = tk_tcl2ruby(conf[3])
-              end
-            end
-          end
-          if conf.size == 1
-            ret[key] = conf[0][1..-1]  # alias info
-          else
-            ret[key] = conf
-          end
-        }
-        ret
-      end
-    end
-  end
-
-  def current_image_configinfo(index, slot = nil)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if slot
-        conf = image_configinfo(index, slot)
-        {conf[0] => conf[4]}
-      else
-        ret = {}
-        image_configinfo(index).each{|conf|
-          ret[conf[0]] = conf[4] if conf.size > 2
-        }
-        ret
-      end
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      ret = {}
-      image_configinfo(index, slot).each{|k, conf|
-        ret[k] = conf[-1] if conf.kind_of?(Array)
-      }
-      ret
-    end
-  end
-
-  def image_names
-    #tk_split_simplelist(_fromUTF8(tk_send_without_enc('image', 'names'))).collect{|elt|
-    tk_split_simplelist(tk_send_without_enc('image', 'names'), false, true).collect{|elt|
-      tagid2obj(elt)
-    }
-  end
-
-  def index(idx)
-    tk_send_without_enc('index', _get_eval_enc_str(idx))
-  end
-
-  def insert(index, *args)
-    tk_send('insert', index, *args)
-    self
-  end
-
-  def mark_names
-    #tk_split_simplelist(_fromUTF8(tk_send_without_enc('mark', 'names'))).collect{|elt|
-    tk_split_simplelist(tk_send_without_enc('mark', 'names'), false, true).collect{|elt|
-      tagid2obj(elt)
-    }
-  end
-
-  def mark_gravity(mark, direction=nil)
-    if direction
-      tk_send_without_enc('mark', 'gravity',
-                          _get_eval_enc_str(mark), direction)
-      self
-    else
-      tk_send_without_enc('mark', 'gravity', _get_eval_enc_str(mark))
-    end
-  end
-
-  def mark_set(mark, index)
-    tk_send_without_enc('mark', 'set', _get_eval_enc_str(mark),
-                        _get_eval_enc_str(index))
-    self
-  end
-  alias set_mark mark_set
-
-  def mark_unset(*marks)
-    tk_send_without_enc('mark', 'unset',
-                        *(marks.collect{|mark| _get_eval_enc_str(mark)}))
-    self
-  end
-  alias unset_mark mark_unset
-
-  def mark_next(index)
-    tagid2obj(_fromUTF8(tk_send_without_enc('mark', 'next',
-                                            _get_eval_enc_str(index))))
-  end
-  alias next_mark mark_next
-
-  def mark_previous(index)
-    tagid2obj(_fromUTF8(tk_send_without_enc('mark', 'previous',
-                                            _get_eval_enc_str(index))))
-  end
-  alias previous_mark mark_previous
-
-  def scan_mark(x, y)
-    tk_send_without_enc('scan', 'mark', x, y)
-    self
-  end
-  def scan_dragto(x, y)
-    tk_send_without_enc('scan', 'dragto', x, y)
-    self
-  end
-
-
-  def _ktext_length(txt)
-    if TkCore::WITH_ENCODING ### Ruby 1.9 !!!!!!!!!!!!!
-      return txt.length
-    end
-    ###########################
-
-    if $KCODE !~ /n/i
-      return txt.gsub(/[^\Wa-zA-Z_\d]/, ' ').length
-    end
-
-    # $KCODE == 'NONE'
-    if JAPANIZED_TK
-      tk_call_without_enc('kstring', 'length',
-                          _get_eval_enc_str(txt)).to_i
-    else
-      begin
-        tk_call_without_enc('encoding', 'convertto', 'ascii',
-                            _get_eval_enc_str(txt)).length
-      rescue StandardError, NameError
-        # sorry, I have no plan
-        txt.length
-      end
-    end
-  end
-  private :_ktext_length
-
-  def tksearch(*args)
-    # call 'search' subcommand of text widget
-    #   args ::= [<array_of_opts>] <pattern> <start_index> [<stop_index>]
-    # If <pattern> is regexp, then it must be a regular expression of Tcl
-    if args[0].kind_of?(Array)
-      opts = args.shift.collect{|opt| '-' + opt.to_s }
-    else
-      opts = []
-    end
-
-    opts << '--'
-
-    ret = tk_send('search', *(opts + args))
-    if ret == ""
-      nil
-    else
-      ret
-    end
-  end
-
-  def tksearch_with_count(*args)
-    # call 'search' subcommand of text widget
-    #   args ::= [<array_of_opts>] <var> <pattern> <start_index> [<stop_index>]
-    # If <pattern> is regexp, then it must be a regular expression of Tcl
-    if args[0].kind_of?(Array)
-      opts = args.shift.collect{|opt| '-' + opt.to_s }
-    else
-      opts = []
-    end
-
-    opts << '-count' << args.shift << '--'
-
-    ret = tk_send('search', *(opts + args))
-    if ret == ""
-      nil
-    else
-      ret
-    end
-  end
-
-  def search_with_length(pat,start,stop=None)
-    pat = pat.chr if pat.kind_of? Integer
-    if stop != None
-      return ["", 0] if compare(start,'>=',stop)
-      txt = get(start,stop)
-      if (pos = txt.index(pat))
-        match = $&
-        #pos = txt[0..(pos-1)].split('').length if pos > 0
-        pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
-        if pat.kind_of? String
-          #return [index(start + " + #{pos} chars"), pat.split('').length]
-          return [index(start + " + #{pos} chars"),
-                  _ktext_length(pat), pat.dup]
-        else
-          #return [index(start + " + #{pos} chars"), $&.split('').length]
-          return [index(start + " + #{pos} chars"),
-                  _ktext_length(match), match]
-        end
-      else
-        return ["", 0]
-      end
-    else
-      txt = get(start,'end - 1 char')
-      if (pos = txt.index(pat))
-        match = $&
-        #pos = txt[0..(pos-1)].split('').length if pos > 0
-        pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
-        if pat.kind_of? String
-          #return [index(start + " + #{pos} chars"), pat.split('').length]
-          return [index(start + " + #{pos} chars"),
-                  _ktext_length(pat), pat.dup]
-        else
-          #return [index(start + " + #{pos} chars"), $&.split('').length]
-          return [index(start + " + #{pos} chars"),
-                  _ktext_length(match), match]
-        end
-      else
-        txt = get('1.0','end - 1 char')
-        if (pos = txt.index(pat))
-          match = $&
-          #pos = txt[0..(pos-1)].split('').length if pos > 0
-          pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
-          if pat.kind_of? String
-            #return [index("1.0 + #{pos} chars"), pat.split('').length]
-            return [index("1.0 + #{pos} chars"),
-                    _ktext_length(pat), pat.dup]
-          else
-            #return [index("1.0 + #{pos} chars"), $&.split('').length]
-            return [index("1.0 + #{pos} chars"), _ktext_length(match), match]
-          end
-        else
-          return ["", 0]
-        end
-      end
-    end
-  end
-
-  def search(pat,start,stop=None)
-    search_with_length(pat,start,stop)[0]
-  end
-
-  def rsearch_with_length(pat,start,stop=None)
-    pat = pat.chr if pat.kind_of? Integer
-    if stop != None
-      return ["", 0] if compare(start,'<=',stop)
-      txt = get(stop,start)
-      if (pos = txt.rindex(pat))
-        match = $&
-        #pos = txt[0..(pos-1)].split('').length if pos > 0
-        pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
-        if pat.kind_of? String
-          #return [index(stop + " + #{pos} chars"), pat.split('').length]
-          return [index(stop + " + #{pos} chars"), _ktext_length(pat), pat.dup]
-        else
-          #return [index(stop + " + #{pos} chars"), $&.split('').length]
-          return [index(stop + " + #{pos} chars"), _ktext_length(match), match]
-        end
-      else
-        return ["", 0]
-      end
-    else
-      txt = get('1.0',start)
-      if (pos = txt.rindex(pat))
-        match = $&
-        #pos = txt[0..(pos-1)].split('').length if pos > 0
-        pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
-        if pat.kind_of? String
-          #return [index("1.0 + #{pos} chars"), pat.split('').length]
-          return [index("1.0 + #{pos} chars"), _ktext_length(pat), pat.dup]
-        else
-          #return [index("1.0 + #{pos} chars"), $&.split('').length]
-          return [index("1.0 + #{pos} chars"), _ktext_length(match), match]
-        end
-      else
-        txt = get('1.0','end - 1 char')
-        if (pos = txt.rindex(pat))
-          match = $&
-          #pos = txt[0..(pos-1)].split('').length if pos > 0
-          pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
-          if pat.kind_of? String
-            #return [index("1.0 + #{pos} chars"), pat.split('').length]
-            return [index("1.0 + #{pos} chars"), _ktext_length(pat), pat.dup]
-          else
-            #return [index("1.0 + #{pos} chars"), $&.split('').length]
-            return [index("1.0 + #{pos} chars"), _ktext_length(match), match]
-          end
-        else
-          return ["", 0]
-        end
-      end
-    end
-  end
-
-  def rsearch(pat,start,stop=None)
-    rsearch_with_length(pat,start,stop)[0]
-  end
-
-  def see(index)
-    tk_send_without_enc('see', index)
-    self
-  end
-
-  ###############################
-
-  def xview(*index)
-    if index.size == 0
-      list(tk_send_without_enc('xview'))
-    else
-      tk_send_without_enc('xview', *index)
-      self
-    end
-  end
-  def xview_moveto(*index)
-    xview('moveto', *index)
-  end
-  def xview_scroll(*index)
-    xview('scroll', *index)
-  end
-
-  def yview(*index)
-    if index.size == 0
-      list(tk_send_without_enc('yview'))
-    else
-      tk_send_without_enc('yview', *index)
-      self
-    end
-  end
-  def yview_moveto(*index)
-    yview('moveto', *index)
-  end
-  def yview_scroll(*index)
-    yview('scroll', *index)
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/scrolledwidget.rb b/ext/tk/lib/tkextlib/iwidgets/scrolledwidget.rb
deleted file mode 100644
index a8b4e5a27b..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/scrolledwidget.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/scrolledwidget.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class Scrolledwidget < Tk::Iwidgets::Labeledwidget
-    end
-  end
-end
-
-class Tk::Iwidgets::Scrolledwidget
-  TkCommandNames = ['::iwidgets::scrolledwidget'.freeze].freeze
-  WidgetClassName = 'Scrolledwidget'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/selectionbox.rb b/ext/tk/lib/tkextlib/iwidgets/selectionbox.rb
deleted file mode 100644
index 333f68e306..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/selectionbox.rb
+++ /dev/null
@@ -1,103 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/selectionbox.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class Selectionbox < Tk::Itk::Widget
-    end
-  end
-end
-
-class Tk::Iwidgets::Selectionbox
-  TkCommandNames = ['::iwidgets::selectionbox'.freeze].freeze
-  WidgetClassName = 'Selectionbox'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __boolval_optkeys
-    super() << 'itemson' << 'selectionon'
-  end
-  private :__boolval_optkeys
-
-  def __strval_optkeys
-    super() << 'itemslabel' << 'selectionlabel'
-  end
-  private :__strval_optkeys
-
-  def child_site
-    window(tk_call(@path, 'childsite'))
-  end
-
-  def clear_items
-    tk_call(@path, 'clear', 'items')
-    self
-  end
-
-  def clear_selection
-    tk_call(@path, 'clear', 'selection')
-    self
-  end
-
-  def get
-    tk_call(@path, 'get')
-  end
-
-  def insert_items(idx, *args)
-    tk_call(@path, 'insert', 'items', idx, *args)
-  end
-
-  def insert_selection(pos, text)
-    tk_call(@path, 'insert', 'selection', pos, text)
-  end
-
-  def select_item
-    tk_call(@path, 'selectitem')
-    self
-  end
-
-  # based on Tk::Listbox ( and TkTextWin )
-  def curselection
-    list(tk_send_without_enc('curselection'))
-  end
-  def delete(first, last=None)
-    tk_send_without_enc('delete', first, last)
-    self
-  end
-  def index(idx)
-    tk_send_without_enc('index', idx).to_i
-  end
-  def nearest(y)
-    tk_send_without_enc('nearest', y).to_i
-  end
-  def scan_mark(x, y)
-    tk_send_without_enc('scan', 'mark', x, y)
-    self
-  end
-  def scan_dragto(x, y)
-    tk_send_without_enc('scan', 'dragto', x, y)
-    self
-  end
-  def selection_anchor(index)
-    tk_send_without_enc('selection', 'anchor', index)
-    self
-  end
-  def selection_clear(first, last=None)
-    tk_send_without_enc('selection', 'clear', first, last)
-    self
-  end
-  def selection_includes(index)
-    bool(tk_send_without_enc('selection', 'includes', index))
-  end
-  def selection_set(first, last=None)
-    tk_send_without_enc('selection', 'set', first, last)
-    self
-  end
-  def size
-    tk_send_without_enc('size').to_i
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/selectiondialog.rb b/ext/tk/lib/tkextlib/iwidgets/selectiondialog.rb
deleted file mode 100644
index 0d0b94e8d2..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/selectiondialog.rb
+++ /dev/null
@@ -1,93 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/selectiondialog.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class Selectiondialog < Tk::Iwidgets::Dialog
-    end
-  end
-end
-
-class Tk::Iwidgets::Selectiondialog
-  TkCommandNames = ['::iwidgets::selectiondialog'.freeze].freeze
-  WidgetClassName = 'Selectiondialog'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def child_site
-    window(tk_call(@path, 'childsite'))
-  end
-
-  def clear_items
-    tk_call(@path, 'clear', 'items')
-    self
-  end
-
-  def clear_selection
-    tk_call(@path, 'clear', 'selection')
-    self
-  end
-
-  def get
-    tk_call(@path, 'get')
-  end
-
-  def insert_items(idx, *args)
-    tk_call(@path, 'insert', 'items', idx, *args)
-  end
-
-  def insert_selection(pos, text)
-    tk_call(@path, 'insert', 'selection', pos, text)
-  end
-
-  def select_item
-    tk_call(@path, 'selectitem')
-    self
-  end
-
-  # based on Tk::Listbox ( and TkTextWin )
-  def curselection
-    list(tk_send_without_enc('curselection'))
-  end
-  def delete(first, last=None)
-    tk_send_without_enc('delete', first, last)
-    self
-  end
-  def index(idx)
-    tk_send_without_enc('index', idx).to_i
-  end
-  def nearest(y)
-    tk_send_without_enc('nearest', y).to_i
-  end
-  def scan_mark(x, y)
-    tk_send_without_enc('scan', 'mark', x, y)
-    self
-  end
-  def scan_dragto(x, y)
-    tk_send_without_enc('scan', 'dragto', x, y)
-    self
-  end
-  def selection_anchor(index)
-    tk_send_without_enc('selection', 'anchor', index)
-    self
-  end
-  def selection_clear(first, last=None)
-    tk_send_without_enc('selection', 'clear', first, last)
-    self
-  end
-  def selection_includes(index)
-    bool(tk_send_without_enc('selection', 'includes', index))
-  end
-  def selection_set(first, last=None)
-    tk_send_without_enc('selection', 'set', first, last)
-    self
-  end
-  def size
-    tk_send_without_enc('size').to_i
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/setup.rb b/ext/tk/lib/tkextlib/iwidgets/setup.rb
deleted file mode 100644
index cc967dced6..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/setup.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: false
-#
-#  setup.rb   --   setup script before calling TkPackage.require()
-#
-#    If you need some setup operations (for example, add a library path
-#    to the library search path) before using Tcl/Tk library packages
-#    wrapped by Ruby scripts in this directory, please write the setup
-#    operations in this file.
-#
diff --git a/ext/tk/lib/tkextlib/iwidgets/shell.rb b/ext/tk/lib/tkextlib/iwidgets/shell.rb
deleted file mode 100644
index b3f8dc7fbe..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/shell.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/shell.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class Shell < Tk::Itk::Toplevel
-    end
-  end
-end
-
-class Tk::Iwidgets::Shell
-  TkCommandNames = ['::iwidgets::shell'.freeze].freeze
-  WidgetClassName = 'Shell'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def activate
-    tk_call(@path, 'activate')  # may return val of deactivate method
-  end
-
-  def center(win=None)
-    tk_call(@path, 'center', win)
-    self
-  end
-
-  def child_site
-    window(tk_call(@path, 'childsite'))
-  end
-
-  def deactivate(val=None)
-    tk_call(@path, 'deactivate', val)
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/spindate.rb b/ext/tk/lib/tkextlib/iwidgets/spindate.rb
deleted file mode 100644
index 8860348cc0..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/spindate.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/spindate.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class Spindate < Tk::Itk::Widget
-    end
-  end
-end
-
-class Tk::Iwidgets::Spindate
-  TkCommandNames = ['::iwidgets::spindate'.freeze].freeze
-  WidgetClassName = 'Spindate'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __boolval_optkeys
-    super() << 'dayon' << 'monthon' << 'yearon'
-  end
-  private :__boolval_optkeys
-
-  def __strval_optkeys
-    super() << 'daylabel' << 'monthformat' << 'monthlabel' << 'yearlabel'
-  end
-  private :__strval_optkeys
-
-  def get_string
-    tk_call(@path, 'get', '-string')
-  end
-  alias get get_string
-
-  def get_clicks
-    number(tk_call(@path, 'get', '-clicks'))
-  end
-
-  def show(date=None)
-    tk_call(@path, 'show', date)
-    self
-  end
-  def show_now
-    tk_call(@path, 'show', 'now')
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/spinint.rb b/ext/tk/lib/tkextlib/iwidgets/spinint.rb
deleted file mode 100644
index 85736d095c..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/spinint.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/spinint.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class  Spinint < Tk::Iwidgets::Spinner
-    end
-  end
-end
-
-class Tk::Iwidgets::Spinint
-  TkCommandNames = ['::iwidgets::spinint'.freeze].freeze
-  WidgetClassName = 'Spinint'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __boolval_optkeys
-    super() << 'wrap'
-  end
-  private :__boolval_optkeys
-
-  def __numlistval_optkeys
-    super() << 'range'
-  end
-  private :__numlistval_optkeys
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/spinner.rb b/ext/tk/lib/tkextlib/iwidgets/spinner.rb
deleted file mode 100644
index 49968e86d8..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/spinner.rb
+++ /dev/null
@@ -1,170 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/spinner.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class  Spinner < Tk::Iwidgets::Labeledwidget
-    end
-  end
-end
-
-class Tk::Iwidgets::Spinner
-  TkCommandNames = ['::iwidgets::spinner'.freeze].freeze
-  WidgetClassName = 'Spinner'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  ####################################
-
-  include Tk::ValidateConfigure
-
-  class EntryfieldValidate < TkValidateCommand
-    #class CalCmdArgs < TkUtil::CallbackSubst
-    class ValidateArgs < TkUtil::CallbackSubst
-      KEY_TBL  = [
-        [ ?c, ?s, :char ],
-        [ ?P, ?s, :post ],
-        [ ?S, ?s, :current ],
-        [ ?W, ?w, :widget ],
-        nil
-      ]
-      PROC_TBL = [
-        [ ?s, TkComm.method(:string) ],
-        [ ?w, TkComm.method(:window) ],
-        nil
-      ]
-
-=begin
-      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-      KEY_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-        end
-        inf
-      }
-
-      PROC_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-        end
-        inf
-      }
-=end
-
-      _setup_subst_table(KEY_TBL, PROC_TBL);
-    end
-
-    def self._config_keys
-      ['validate', 'invalid']
-    end
-  end
-
-  def __validation_class_list
-    super() << EntryfieldValidate
-  end
-
-  Tk::ValidateConfigure.__def_validcmd(binding, EntryfieldValidate)
-
-  ####################################
-
-  def up
-    tk_call_without_enc(@path, 'up')
-    self
-  end
-
-  def down
-    tk_call_without_enc(@path, 'down')
-    self
-  end
-
-  def clear
-    tk_call_without_enc(@path, 'clear')
-    self
-  end
-
-  def delete(first, last=None)
-    tk_send_without_enc('delete', first, last)
-    self
-  end
-
-  def value
-    _fromUTF8(tk_send_without_enc('get'))
-  end
-  def value= (val)
-    tk_send_without_enc('delete', 0, 'end')
-    tk_send_without_enc('insert', 0, _get_eval_enc_str(val))
-    val
-  end
-  alias get value
-  alias set value=
-
-  def cursor=(index)
-    tk_send_without_enc('icursor', index)
-    #self
-    index
-  end
-  alias icursor cursor=
-
-  def index(idx)
-    number(tk_send_without_enc('index', idx))
-  end
-
-  def insert(pos,text)
-    tk_send_without_enc('insert', pos, _get_eval_enc_str(text))
-    self
-  end
-
-  def mark(pos)
-    tk_send_without_enc('scan', 'mark', pos)
-    self
-  end
-  def dragto(pos)
-    tk_send_without_enc('scan', 'dragto', pos)
-    self
-  end
-  def selection_adjust(index)
-    tk_send_without_enc('selection', 'adjust', index)
-    self
-  end
-  def selection_clear
-    tk_send_without_enc('selection', 'clear')
-    self
-  end
-  def selection_from(index)
-    tk_send_without_enc('selection', 'from', index)
-    self
-  end
-  def selection_present()
-    bool(tk_send_without_enc('selection', 'present'))
-  end
-  def selection_range(s, e)
-    tk_send_without_enc('selection', 'range', s, e)
-    self
-  end
-  def selection_to(index)
-    tk_send_without_enc('selection', 'to', index)
-    self
-  end
-
-  # based on tk/scrollable.rb
-  def xview(*index)
-    if index.size == 0
-      list(tk_send_without_enc('xview'))
-    else
-      tk_send_without_enc('xview', *index)
-      self
-    end
-  end
-  def xview_moveto(*index)
-    xview('moveto', *index)
-  end
-  def xview_scroll(*index)
-    xview('scroll', *index)
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/spintime.rb b/ext/tk/lib/tkextlib/iwidgets/spintime.rb
deleted file mode 100644
index 9b280ec0e4..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/spintime.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/spintime.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class Spintime < Tk::Itk::Widget
-    end
-  end
-end
-
-class Tk::Iwidgets::Spintime
-  TkCommandNames = ['::iwidgets::spintime'.freeze].freeze
-  WidgetClassName = 'Spintime'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __boolval_optkeys
-    super() << 'houron' << 'militaryon' << 'minutelabel' << 'secondlabel'
-  end
-  private :__boolval_optkeys
-
-  def __strval_optkeys
-    super() << 'hourlabel' << 'minuteon' << 'secondon'
-  end
-  private :__strval_optkeys
-
-  def get_string
-    tk_call(@path, 'get', '-string')
-  end
-  alias get get_string
-
-  def get_clicks
-    number(tk_call(@path, 'get', '-clicks'))
-  end
-
-  def show(date=None)
-    tk_call(@path, 'show', date)
-    self
-  end
-  def show_now
-    tk_call(@path, 'show', 'now')
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/tabnotebook.rb b/ext/tk/lib/tkextlib/iwidgets/tabnotebook.rb
deleted file mode 100644
index 89e3362185..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/tabnotebook.rb
+++ /dev/null
@@ -1,182 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/tabnotebook.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class Tabnotebook < Tk::Itk::Widget
-    end
-  end
-end
-
-class Tk::Iwidgets::Tabnotebook
-  TkCommandNames = ['::iwidgets::tabnotebook'.freeze].freeze
-  WidgetClassName = 'Tabnotebook'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  ####################################
-
-  include TkItemConfigMethod
-
-  def __item_cget_cmd(id)
-    [self.path, 'pagecget', id]
-  end
-  private :__item_cget_cmd
-
-  def __item_config_cmd(id)
-    [self.path, 'pageconfigure', id]
-  end
-  private :__item_config_cmd
-
-  def __item_strval_optkeys(id)
-    super(id) << 'tabbackground' << 'tabforeground'
-  end
-  private :__item_strval_optkeys
-
-  def tagid(tagOrId)
-    if tagOrId.kind_of?(Tk::Itk::Component)
-      tagOrId.name
-    else
-      #_get_eval_string(tagOrId)
-      tagOrId
-    end
-  end
-
-  alias pagecget_tkstring itemcget_tkstring
-  alias pagecget itemcget
-  alias pagecget_strict itemcget_strict
-  alias pageconfigure itemconfigure
-  alias pageconfiginfo itemconfiginfo
-  alias current_pageconfiginfo current_itemconfiginfo
-
-  private :itemcget_tkstring, :itemcget, :itemcget_strict
-  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
-
-  ####################################
-
-  def __boolval_optkeys
-    super() << 'auto' << 'equaltabs' << 'raiseselect' << 'tabborders'
-  end
-  private :__boolval_optkeys
-
-  def __strval_optkeys
-    super() << 'backdrop' << 'tabbackground' << 'tabforeground'
-  end
-  private :__strval_optkeys
-
-  def initialize(*args)
-    super(*args)
-    @tabset = self.component_widget('tabset')
-  end
-
-  def add(keys={})
-    window(tk_call(@path, 'add', *hash_kv(keys)))
-  end
-
-  def child_site_list
-    list(tk_call(@path, 'childsite'))
-  end
-
-  def child_site(idx)
-    window(tk_call(@path, 'childsite', index(idx)))
-  end
-
-  def delete(idx1, idx2=nil)
-    if idx2
-      tk_call(@path, 'delete', index(idx1), index(idx2))
-    else
-      tk_call(@path, 'delete', index(idx1))
-    end
-    self
-  end
-
-  def index(idx)
-    #number(tk_call(@path, 'index', tagid(idx)))
-    @tabset.index(tagid(idx))
-  end
-
-  def insert(idx, keys={})
-    window(tk_call(@path, 'insert', index(idx), *hash_kv(keys)))
-  end
-
-  def next
-    tk_call(@path, 'next')
-    self
-  end
-
-  def prev
-    tk_call(@path, 'prev')
-    self
-  end
-
-  def select(idx)
-    tk_call(@path, 'select', index(idx))
-    self
-  end
-
-  def show_tab(idx)
-    @tabset.show_tab(idx)
-    self
-  end
-
-  def scrollcommand(cmd=Proc.new)
-    configure_cmd 'scrollcommand', cmd
-    self
-  end
-  alias xscrollcommand scrollcommand
-  alias yscrollcommand scrollcommand
-
-  def xscrollbar(bar=nil)
-    if bar
-      @scrollbar = bar
-      @scrollbar.orient 'horizontal'
-      self.scrollcommand {|*arg| @scrollbar.set(*arg)}
-      @scrollbar.command {|*arg| self.xview(*arg)}
-      Tk.update  # avoid scrollbar trouble
-    end
-    @scrollbar
-  end
-  def yscrollbar(bar=nil)
-    if bar
-      @scrollbar = bar
-      @scrollbar.orient 'vertical'
-      self.scrollcommand {|*arg| @scrollbar.set(*arg)}
-      @scrollbar.command {|*arg| self.yview(*arg)}
-      Tk.update  # avoid scrollbar trouble
-    end
-    @scrollbar
-  end
-  alias scrollbar yscrollbar
-
-  def view(*index)
-    if index.size == 0
-      idx = num_or_str(tk_send_without_enc('view'))
-      if idx.kind_of?(Fixnum) && idx < 0
-        nil
-      else
-        idx
-      end
-    else
-      tk_send_without_enc('view', *index)
-      self
-    end
-  end
-  alias xview view
-  alias yview view
-
-  def view_moveto(*index)
-    view('moveto', *index)
-  end
-  alias xview_moveto view_moveto
-  alias yview_moveto view_moveto
-  def view_scroll(index, what='pages')
-    view('scroll', index, what)
-  end
-  alias xview_scroll view_scroll
-  alias yview_scroll view_scroll
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/tabset.rb b/ext/tk/lib/tkextlib/iwidgets/tabset.rb
deleted file mode 100644
index 816ea087ef..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/tabset.rb
+++ /dev/null
@@ -1,146 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/tabset.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class Tabset < Tk::Itk::Widget
-    end
-  end
-end
-
-class Tk::Iwidgets::Tabset
-  TkCommandNames = ['::iwidgets::tabset'.freeze].freeze
-  WidgetClassName = 'Tabset'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  ####################################
-
-  include TkItemConfigMethod
-
-  def __item_cget_cmd(id)
-    [self.path, 'tabcget', id]
-  end
-  private :__item_cget_cmd
-
-  def __item_config_cmd(id)
-    [self.path, 'tabconfigure', id]
-  end
-  private :__item_config_cmd
-
-  def tagid(tagOrId)
-    if tagOrId.kind_of?(Tk::Itk::Component)
-      tagOrId.name
-    else
-      #_get_eval_string(tagOrId)
-      tagOrId
-    end
-  end
-
-  alias tabcget_tkstring itemcget_tkstring
-  alias tabcget itemcget
-  alias tabcget_strict itemcget_strict
-  alias tabconfigure itemconfigure
-  alias tabconfiginfo itemconfiginfo
-  alias current_tabconfiginfo current_itemconfiginfo
-
-  private :itemcget_tkstring, :itemcget, :itemcget_strict
-  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
-
-  ####################################
-
-  def __boolval_optkeys
-    super() << 'equaltabs' << 'raiseselect' << 'tabborders'
-  end
-  private :__boolval_optkeys
-
-  def __strval_optkeys
-    super() << 'backdrop'
-  end
-  private :__strval_optkeys
-
-  def add(keys={})
-    window(tk_call(@path, 'add', *hash_kv(keys)))
-  end
-
-  def delete(idx1, idx2=nil)
-    if idx2
-      tk_call(@path, 'delete', index(idx1), index(idx2))
-    else
-      tk_call(@path, 'delete', index(idx1))
-    end
-    self
-  end
-
-  def index(idx)
-    number(tk_call(@path, 'index', tagid(idx)))
-  end
-
-  def insert(idx, keys={})
-    window(tk_call(@path, 'insert', index(idx), *hash_kv(keys)))
-  end
-
-  def next
-    tk_call(@path, 'next')
-    self
-  end
-
-  def prev
-    tk_call(@path, 'prev')
-    self
-  end
-
-  def select(idx)
-    tk_call(@path, 'select', index(idx))
-    self
-  end
-
-  def show_tab(idx)
-    if index(idx) == 0
-      self.start = 0
-      return
-    end
-
-    reutrn unless @canvas ||= self.winfo_children[0]
-
-    delta = 1 if (delta = cget(:gap)) == 'overlap' ||
-                   (delta = self.winfo_pixels(delta) + 1) <= 0
-
-    case cget(:tabpos)
-    when 's', 'n'
-      if (head = tabcget(idx, :left)) < 0
-        self.start -= head
-        return
-      end
-      tabs_size = @canvas.winfo_width
-      tab_start, tab_end = @canvas .
-        find_overlapping(head, 0, head + delta, @canvas.winfo_height) .
-        find_all{|id| @canvas.itemtype(id) == TkcPolygon} .
-        map!{|id| bbox = @canvas.bbox(id); [bbox[0], bbox[2]]} . max
-
-    when 'e', 'w'
-      if (head = tabcget(idx, :top)) < 0
-        self.start -= head
-        return
-      end
-      tabs_size = @canvas.winfo_height
-      tab_start, tab_end = @canvas .
-        find_overlapping(0, head, @canvas.winfo_width, head + delta) .
-        find_all{|id| @canvas.itemtype(id) == TkcPolygon} .
-        map!{|id| bbox = @canvas.bbox(id); [bbox[1], bbox[3]]} . max
-    end
-
-    if (size = tab_end - tab_start + 1) > tabs_size
-      self.start -= tab_start
-    elsif head + size > tabs_size
-      self.start -= head + size - tabs_size
-    end
-
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/timeentry.rb b/ext/tk/lib/tkextlib/iwidgets/timeentry.rb
deleted file mode 100644
index d4078e6e4f..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/timeentry.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/timeentry.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class Timeentry < Tk::Iwidgets::Timefield
-    end
-  end
-end
-
-class Tk::Iwidgets::Timeentry
-  TkCommandNames = ['::iwidgets::timeentry'.freeze].freeze
-  WidgetClassName = 'Timeentry'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __strval_optkeys
-    super() << 'closetext'
-  end
-  private :__strval_optkeys
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/timefield.rb b/ext/tk/lib/tkextlib/iwidgets/timefield.rb
deleted file mode 100644
index d759a0762f..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/timefield.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/timefield.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class  Timefield < Tk::Iwidgets::Labeledwidget
-    end
-  end
-end
-
-class Tk::Iwidgets::Timefield
-  TkCommandNames = ['::iwidgets::timefield'.freeze].freeze
-  WidgetClassName = 'Timefield'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __boolval_optkeys
-    super() << 'gmt'
-  end
-  private :__boolval_optkeys
-
-  def __strval_optkeys
-    super() << 'textbackground'
-  end
-  private :__strval_optkeys
-
-  def __font_optkeys
-    super() << 'textfont'
-  end
-  private :__font_optkeys
-
-  def get_string
-    tk_call(@path, 'get', '-string')
-  end
-  alias get get_string
-
-  def get_clicks
-    number(tk_call(@path, 'get', '-clicks'))
-  end
-
-  def valid?
-    bool(tk_call(@path, 'isvalid'))
-  end
-  alias isvalid? valid?
-
-  def show(time=None)
-    tk_call(@path, 'show', time)
-    self
-  end
-  def show_now
-    tk_call(@path, 'show', 'now')
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/toolbar.rb b/ext/tk/lib/tkextlib/iwidgets/toolbar.rb
deleted file mode 100644
index 7f2a54b88b..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/toolbar.rb
+++ /dev/null
@@ -1,113 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/toolbar.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class Toolbar < Tk::Itk::Widget
-    end
-  end
-end
-
-class Tk::Iwidgets::Toolbar
-  TkCommandNames = ['::iwidgets::toolbar'.freeze].freeze
-  WidgetClassName = 'Toolbar'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __tkvariable_optkeys
-    super() << 'helpvariable'
-  end
-  private :__tkvariable_optkeys
-
-  ####################################
-
-  include TkItemConfigMethod
-
-  def __item_cget_cmd(id)
-    [self.path, 'itemcget', self.index(id)]
-  end
-  private :__item_cget_cmd
-
-  def __item_config_cmd(id)
-    [self.path, 'itemconfigure', self.index(id)]
-  end
-  private :__item_config_cmd
-
-  def __item_strval_optkeys(id)
-    super(id) << 'helpstr' << 'balloonstr'
-  end
-  private :__item_strval_optkeys
-
-  def tagid(tagOrId)
-    if tagOrId.kind_of?(Tk::Itk::Component)
-      tagOrId.name
-    else
-      #_get_eval_string(tagOrId)
-      tagOrId
-    end
-  end
-
-  ####################################
-
-  def __strval_optkeys
-    super() << 'balloonbackground' << 'balloonforeground'
-  end
-  private :__strval_optkeys
-
-  def __tkvariable_optkeys
-    super() << 'helpvariable'
-  end
-  private :__tkvariable_optkeys
-
-  def __font_optkeys
-    super() << 'balloonfont'
-  end
-  private :__font_optkeys
-
-  def add(type, tag=nil, keys={})
-    if tag.kind_of?(Hash)
-      keys = tag
-      tag = nil
-    end
-    if tag
-      tag = Tk::Itk::Component.new(self, tagid(tag))
-    else
-      tag = Tk::Itk::Component.new(self)
-    end
-    window(tk_call(@path, 'add', type, tagid(tag), *hash_kv(keys)))
-    tag
-  end
-
-  def delete(idx1, idx2=nil)
-    if idx2
-      tk_call(@path, 'delete', index(idx1), index(idx2))
-    else
-      tk_call(@path, 'delete', index(idx1))
-    end
-    self
-  end
-
-  def index(idx)
-    number(tk_call(@path, 'index', tagid(idx)))
-  end
-
-  def insert(idx, type, tag=nil, keys={})
-    if tag.kind_of?(Hash)
-      keys = tag
-      tag = nil
-    end
-    if tag
-      tag = Tk::Itk::Component.new(self, tagid(tag))
-    else
-      tag = Tk::Itk::Component.new(self)
-    end
-    window(tk_call(@path, 'insert', index(idx), type,
-                   tagid(tag), *hash_kv(keys)))
-    tag
-  end
-end
diff --git a/ext/tk/lib/tkextlib/iwidgets/watch.rb b/ext/tk/lib/tkextlib/iwidgets/watch.rb
deleted file mode 100644
index c6e862b36a..0000000000
--- a/ext/tk/lib/tkextlib/iwidgets/watch.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/iwidgets/watch.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tkextlib/iwidgets.rb'
-
-module Tk
-  module Iwidgets
-    class Watch < Tk::Itk::Widget
-    end
-  end
-end
-
-class Tk::Iwidgets::Watch
-  TkCommandNames = ['::iwidgets::watch'.freeze].freeze
-  WidgetClassName = 'Watch'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __boolval_optkeys
-    super() << 'showampm'
-  end
-  private :__boolval_optkeys
-
-  def __strval_optkeys
-    super() << 'clockcolor' << 'hourcolor' << 'minutecolor' <<
-      'pivotcolor' << 'secondcolor' << 'tickcolor'
-  end
-  private :__strval_optkeys
-
-  def get_string
-    tk_call(@path, 'get', '-string')
-  end
-  alias get get_string
-
-  def get_clicks
-    number(tk_call(@path, 'get', '-clicks'))
-  end
-
-  def show(time=None)
-    tk_call(@path, 'show', time)
-    self
-  end
-  def show_now
-    tk_call(@path, 'show', 'now')
-    self
-  end
-
-  def watch(*args)
-    unless args.empty?
-      tk_call(@path, 'watch', *args)
-    end
-    component_path('canvas')
-  end
-end
diff --git a/ext/tk/lib/tkextlib/pkg_checker.rb b/ext/tk/lib/tkextlib/pkg_checker.rb
deleted file mode 100755
index 76a25ca629..0000000000
--- a/ext/tk/lib/tkextlib/pkg_checker.rb
+++ /dev/null
@@ -1,185 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-#
-#  Ruby/Tk extension library checker
-#
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-
-TkRoot.new.withdraw  # hide root window
-
-name = File.basename(__FILE__)
-
-add_path = false
-verbose  = false
-
-def help_msg
-  print "Usage: #{$0} [-l] [-v] [-h] [--] [dir]\n"
-  print "\tIf dir is omitted, check the directory that this command exists.\n"
-  print "\tAvailable options are \n"
-  print "\t  -l : Add dir to $LOAD_PATH\n"
-  print "\t       (If dir == '<parent>/tkextlib', add <parent> also.)\n"
-  print "\t  -v : Verbose mode (show reason of fail)\n"
-  print "\t  -h : Show this message\n"
-  print "\t  -- : End of options\n"
-end
-
-while(ARGV[0] && ARGV[0][0] == ?-)
-  case ARGV[0]
-  when '--'
-    ARGV.shift
-    break;
-  when '-l'
-    ARGV.shift
-    add_path = true
-  when '-v'
-    ARGV.shift
-    verbose = true
-  when '-h'
-    help_msg
-    exit(0)
-  else
-    print "Argument Error!! : unknown option '#{ARGV[0]}'\n"
-    help_msg
-    exit(1)
-  end
-end
-
-if ARGV[0]
-  dir = File.expand_path(ARGV[0])
-else
-  dir = File.dirname(File.expand_path(__FILE__))
-end
-
-if add_path
-  $LOAD_PATH.unshift(dir)
-  if File.basename(dir) == 'tkextlib'
-    $LOAD_PATH.unshift(File.dirname(dir))
-  end
-end
-
-print "\nRuby/Tk extension library checker\n"
-print "( Note:: This check is very simple one. Shown status may be wrong. )\n"
-print "\n check directory :: #{dir}"
-print "\n $LOAD_PATH :: #{$LOAD_PATH.inspect}\n"
-
-def get_pkg_list(file)
-  pkg_list = []
-
-  File.foreach(file){|l|
-    if l =~ /^(?:[^#]+\s|\s*)(?:|;\s*)TkPackage\s*\.\s*require\s*\(?\s*(["'])((\w|:)+)\1/
-      pkg = [$2, :package]
-      pkg_list << pkg unless pkg_list.member?(pkg)
-    end
-    if l =~ /^(?:[^#]+\s|\s*)(?:|;\s*)Tk\s*\.\s*load_tcllibrary\s*\(?\s*(["'])((\w|:)+)\1/
-      pkg = [$2, :library]
-      pkg_list << pkg unless pkg_list.member?(pkg)
-    end
-    if l =~ /^(?:[^#]+\s|\s*)(?:|;\s*)Tk\s*\.\s*load_tclscript\s*\(?\s*(["'])((\w|:)+)\1/
-      pkg = [$2, :script]
-      pkg_list << pkg unless pkg_list.member?(pkg)
-    end
-    if l =~ /^(?:[^#]+\s|\s*)(?:|;\s*)require\s*\(?\s*(["'])((\w|\/|:)+)\1/
-      pkg = [$2, :require_ruby_lib]
-      pkg_list << pkg unless pkg_list.member?(pkg)
-    end
-  }
-
-  pkg_list
-end
-
-def check_pkg(file, verbose=false)
-  pkg_list = get_pkg_list(file)
-
-  error_list = []
-  success_list = {}
-
-  pkg_list.each{|name, type|
-    next if success_list[name]
-
-    begin
-      case type
-      when :package
-        ver = TkPackage.require(name)
-        success_list[name] = ver
-        error_list.delete_if{|n, t| n == name}
-
-      when :library
-        Tk.load_tcllibrary(name)
-        success_list[name] = :library
-        error_list.delete_if{|n, t| n == name}
-
-      when :script
-        Tk.load_tclscript(name)
-        success_list[name] = :script
-        error_list.delete_if{|n, t| n == name}
-
-      when :require_ruby_lib
-        require name
-
-      end
-    rescue => e
-      if verbose
-        error_list << [name, type, e.message]
-      else
-        error_list << [name, type]
-      end
-    end
-  }
-
-  success_list.dup.each{|name, ver|
-    unless ver.kind_of?(String)
-      begin
-        ver = TkPackage.require(name)
-        sccess_list[name] = ver
-      rescue
-      end
-    end
-  }
-
-  [success_list, error_list]
-end
-
-def subdir_check(dir, verbose=false)
-  Dir.foreach(dir){|f|
-    next if f == '.' || f == '..'
-    if File.directory?(f)
-      subdir_check(File.join(dir, f))
-    elsif File.extname(f) == '.rb'
-      path = File.join(dir, f)
-      suc, err = check_pkg(path, verbose)
-      if err.empty?
-        print 'Ready : ', path, ' : require->', suc.inspect, "\n"
-      else
-        print '*LACK : ', path, ' : require->', suc.inspect,
-          '  FAIL->', err.inspect, "\n"
-      end
-    end
-  }
-end
-
-Dir.chdir(dir)
-
-(Dir['*.rb'] - ['setup.rb', name]).each{|f|
-  subdir = File.basename(f, '.*')
-=begin
-  begin
-    # read 'setup.rb' as if the library has standard structure
-    require File.join(subdir, 'setup.rb')
-  rescue LoadError
-    # ignore error
-  end
-=end
-  print "\n"
-
-  suc, err = check_pkg(f, verbose)
-  if err.empty?
-    print 'Ready : ', f, ' : require->', suc.inspect, "\n"
-  else
-    print '*LACK : ', f, ' : require->', suc.inspect,
-      '  FAIL->', err.inspect, "\n"
-  end
-
-  subdir_check(subdir, verbose) if File.directory?(subdir)
-}
diff --git a/ext/tk/lib/tkextlib/setup.rb b/ext/tk/lib/tkextlib/setup.rb
deleted file mode 100644
index 08ad32e99b..0000000000
--- a/ext/tk/lib/tkextlib/setup.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: false
-#
-#  setup.rb   --   setup script before using Tk extension libraries
-#
-#    If you need some setup operations for Tk extensions (for example,
-#    modify the dynamic library path) required, please write the setup
-#    operations in this file. This file is required at the last of
-#    "require 'tk'".
-#
diff --git a/ext/tk/lib/tkextlib/tcllib.rb b/ext/tk/lib/tkextlib/tcllib.rb
deleted file mode 100644
index 75d250cba4..0000000000
--- a/ext/tk/lib/tkextlib/tcllib.rb
+++ /dev/null
@@ -1,106 +0,0 @@
-# frozen_string_literal: false
-#
-#  tcllib extension support
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/tcllib/setup.rb'
-
-err = ''
-
-# package:: autoscroll
-target = 'tkextlib/tcllib/autoscroll'
-begin
-  require target
-rescue => e
-  err << "\n  ['" << target << "'] "  << e.class.name << ' : ' << e.message
-end
-
-# package:: cursor
-target = 'tkextlib/tcllib/cursor'
-begin
-  require target
-rescue => e
-  err << "\n  ['" << target << "'] "  << e.class.name << ' : ' << e.message
-end
-
-# package:: style
-target = 'tkextlib/tcllib/style'
-begin
-  require target
-rescue => e
-  err << "\n  ['" << target << "'] "  << e.class.name << ' : ' << e.message
-end
-
-# autoload
-module Tk
-  module Tcllib
-    TkComm::TkExtlibAutoloadModule.unshift(self)
-
-    # package:: autoscroll
-    autoload :Autoscroll,         'tkextlib/tcllib/autoscroll'
-
-    # package:: ctext
-    autoload :CText,              'tkextlib/tcllib/ctext'
-
-    # package:: cursor
-    autoload :Cursor,             'tkextlib/tcllib/cursor'
-
-    # package:: datefield
-    autoload :Datefield,          'tkextlib/tcllib/datefield'
-    autoload :DateField,          'tkextlib/tcllib/datefield'
-
-    # package:: getstring
-    autoload :GetString_Dialog,   'tkextlib/tcllib/getstring'
-
-    # package:: history
-    autoload :History,            'tkextlib/tcllib/history'
-
-    # package:: ico
-    autoload :ICO,                'tkextlib/tcllib/ico'
-
-    # package:: ipentry
-    autoload :IP_Entry,           'tkextlib/tcllib/ip_entry'
-    autoload :IPEntry,            'tkextlib/tcllib/ip_entry'
-
-    # package:: khim
-    autoload :KHIM,               'tkextlib/tcllib/khim'
-
-    # package:: ntext
-    autoload :Ntext,              'tkextlib/tcllib/ntext'
-
-    # package:: Plotchart
-    autoload :Plotchart,          'tkextlib/tcllib/plotchart'
-
-    # package:: style
-    autoload :Style,              'tkextlib/tcllib/style'
-
-    # package:: swaplist
-    autoload :Swaplist_Dialog,    'tkextlib/tcllib/swaplist'
-
-    # package:: tablelist
-    autoload :Tablelist,           'tkextlib/tcllib/tablelist'
-    autoload :TableList,           'tkextlib/tcllib/tablelist'
-    autoload :Tablelist_Tile,      'tkextlib/tcllib/tablelist_tile'
-    autoload :TableList_Tile,      'tkextlib/tcllib/tablelist_tile'
-
-    # package:: tkpiechart
-    autoload :Tkpiechart,         'tkextlib/tcllib/tkpiechart'
-
-    # package:: tooltip
-    autoload :Tooltip,            'tkextlib/tcllib/tooltip'
-
-    # package:: widget
-    autoload :Widget,             'tkextlib/tcllib/widget'
-  end
-end
-
-if $VERBOSE && !err.empty?
-  warn("Warning: some sub-packages are failed to require : " + err)
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/README b/ext/tk/lib/tkextlib/tcllib/README
deleted file mode 100644
index 441918adce..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/README
+++ /dev/null
@@ -1,135 +0,0 @@
-
- [ tcllib extension support files ]
-
-Tcllib includes many utilities. But currently, supports TKLib part
-only (see the following 'tcllib contents').
-
-If you request to support others, please send your message to one of
-ruby-talk/ruby-list/ruby-dev/ruby-ext mailing lists.
-
------<from "What is tcllib?">----------------------------
-Tcllib is a collection of utility modules for Tcl. These modules provide
-a wide variety of functionality, from implementations of standard data
-structures to implementations of common networking protocols. The intent
-is to collect commonly used function into a single library, which users
-can rely on to be available and stable.
----------------------------------------------------------
-
------< tcllib contents (based on tcllib-1.6.1) >---------
-Programming tools
-    * cmdline - Procedures to process command lines and options.
-    * comm - A remote communications facility for Tcl (7.6, 8.0, and later)
-    * control - Procedures for control flow structures.
-    * fileutil - Procedures implementing some file utilities
-    * log - Procedures to log messages of libraries and applications.
-    * logger - System to control logging of events.
-    * multiplexer - One-to-many communication with sockets.
-    * snit - Snit's Not Incr Tcl
-    * snitfaq - Snit Frequently Asked Questions
-    * stooop - Object oriented extension.
-    * stoop - Simple Tcl Only Object Oriented Programming
-    * switched - stooop switched class
-    * profiler - Tcl source code profiler
-
-Mathematics
-    * math::statistics - Basic statistical functions and procedures
-    * math::calculus - Integration and ordinary differential equations
-    * math::optimize - Optimisation routines
-    * math::fuzzy - Fuzzy comparison of floating-point numbers
-    * counter - Procedures for counters and histograms
-    * combinatorics - Combinatorial functions in the Tcl Math Library
-
-Data structures
-    * struct::list - Procedures for manipulating lists
-    * struct::set - Procedures for manipulating sets
-    * struct::stack - Create and manipulate stack objects
-    * struct::queue - Create and manipulate queue objects
-    * struct::prioqueue - Create and manipulate prioqueue objects
-    * struct::skiplist - Create and manipulate skiplists
-    * struct::tree - Create and manipulate tree objects
-    * struct::graph - Create and manipulate directed graph objects
-    * struct::record - Define and create records (similar to 'C' structures)
-    * struct::matrix - Create and manipulate matrix objects
-    * struct::pool - Create and manipulate pool objects (of discrete items)
-    * report - Create and manipulate report objects
-
-Text processing
-    * expander - Procedures to process templates and expand text.
-    * base64 - Procedures to encode and decode base64
-    * yencode - encode/decoding a binary file
-    * uuencode - encode/decoding a binary file
-    * csv - Procedures to handle CSV data.
-    * inifile - Parsing of Windows INI files
-    * htmlparse - Procedures to parse HTML strings
-    * mime - Manipulation of MIME body parts
-    * Tcl MIME - generates and parses MIME body parts
-    * textutil - Procedures to manipulate texts and strings.
-    * exif - Tcl EXIF extracts and parses EXIF fields from digital images
-    * EXIF - extract and parse EXIF fields from digital images
-
-Hashes, checksums, and encryption
-    * cksum - calculate a cksum(1) compatible checksum
-    * crc16 - Perform a 16bit Cyclic Redundancy Check
-    * crc32 - Perform a 32bit Cyclic Redundancy Check
-    * des - Perform DES encryption of Tcl data
-    * md4 - MD4 Message-Digest Algorithm
-    * md5 - MD5 Message-Digest Algorithm
-    * ripemd160 - RIPEMD-160 Message-Digest Algorithm
-    * ripemd128 - RIPEMD-128 Message-Digest Algorithm
-    * md5crypt - MD5-based password encryption
-    * sha1 - Perform sha1 hashing
-    * sum - calculate a sum(1) compatible checksum
-    * soundex - Soundex
-
-Documentation tools
-    * mpexpand - Markup processor
-    * doctools - Create and manipulate doctools converter object
-    * doctoc_fmt - Specification of simple tcl markup for table of contents
-    * doctools_api - Interface specification for formatter code
-    * doctools_fmt - Specification of simple tcl markup for manpages
-    * docidx - Create and manipulate docidx converter objects
-    * docidx_api - Interface specification for index formatting code
-    * docidx_fmt - Specification of simple tcl markup for an index
-    * doctoc - Create and manipulate doctoc converter objects
-    * doctoc_api - Interface specification for toc formatting code
-    * doctools::changelog - Handle text in Emacs ChangeLog format
-    * doctools::cvs - Handle text in 'cvs log' format
-
-Networking
-    * uri - URI utilities
-    * dns - Tcl Domain Name Service Client
-    * ntp_time - Tcl Time Service Client
-    * nntp - Tcl client for the NNTP protocol
-    * pop3 - Tcl client for POP3 email protocol
-    * pop3d - Tcl POP3 server implementation
-    * pop3d::udb - Simple user database for pop3d
-    * pop3d::dbox - Simple mailbox database for pop3d
-    * ftp - Client-side tcl implementation of the ftp protocol
-    * ftp - Client-side tcl implementation of the ftp protocol
-    * ftpd - Tcl FTP server implementation
-    * smtp - Client-side tcl implementation of the smtp protocol
-    * smtpd - Tcl SMTP server implementation
-    * irc - Create IRC connection and interface.
-
-CGI programming
-    * ncgi - Procedures to manipulate CGI values.
-    * html - Procedures to generate HTML structures
-    * javascript - Procedures to generate HTML and Java Script structures.
-
-Grammars and finite automata
-    * grammar::fa - Create and manipulate finite automatons
-    * grammar::fa::op - Operations on finite automatons
-    * grammar::dacceptor - Create and use deterministic acceptors
-    * grammar::dexec - Execute deterministic finite automatons
-
-TKLib
-    * Plotchart - Simple plotting and charting package
-    * autoscroll - Provides for a scrollbar to automatically mapped and
-                   unmapped as needed
-    * ctext - An extended text widget with customizable Syntax highlighting
-    * cursor - Procedures to handle CURSOR data
-    * datefield - Tk datefield widget
-    * style - Changes default Tk look&feel
-    * ipentry - An IP address entry widget
-    * tkpiechart - Creates and dynamically updates 2D or 3D pie charts
----------------------------------------------------------
diff --git a/ext/tk/lib/tkextlib/tcllib/autoscroll.rb b/ext/tk/lib/tkextlib/tcllib/autoscroll.rb
deleted file mode 100644
index ae45b84787..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/autoscroll.rb
+++ /dev/null
@@ -1,159 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/tcllib/autoscroll.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-#   * Part of tcllib extension
-#   * Provides for a scrollbar to automatically mapped and unmapped as needed
-#
-# (The following is the original description of the library.)
-#
-# This package allows scrollbars to be mapped and unmapped as needed
-# depending on the size and content of the scrollbars scrolled widget.
-# The scrollbar must be managed by either pack or grid, other geometry
-# managers are not supported.
-#
-# When managed by pack, any geometry changes made in the scrollbars parent
-# between the time a scrollbar is unmapped, and when it is mapped will be
-# lost. It is an error to destroy any of the scrollbars siblings while the
-# scrollbar is unmapped. When managed by grid, if anything becomes gridded
-# in the same row and column the scrollbar occupied it will be replaced by
-# the scrollbar when remapped.
-#
-# This package may be used on any scrollbar-like widget as long as it
-# supports the set subcommand in the same style as scrollbar. If the set
-# subcommand is not used then this package will have no effect.
-#
-
-require 'tk'
-require 'tk/scrollbar'
-require 'tkextlib/tcllib.rb'
-
-module Tk
-  module Tcllib
-    module Autoscroll
-      PACKAGE_NAME = 'autoscroll'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('autoscroll')
-        rescue
-          ''
-        end
-      end
-
-      def self.not_available
-        fail RuntimeError, "'tkextlib/tcllib/autoscroll' extension is not available on your current environment."
-      end
-
-      def self.autoscroll(win)
-        Tk::Tcllib::Autoscroll.not_available
-      end
-
-      def self.unautoscroll(win)
-        Tk::Tcllib::Autoscroll.not_available
-      end
-    end
-  end
-end
-
-module Tk
-  module Scrollable
-    def autoscroll(mode = nil)
-      case mode
-      when :x, 'x'
-        if @xscrollbar
-          Tk::Tcllib::Autoscroll.autoscroll(@xscrollbar)
-        end
-      when :y, 'y'
-        if @yscrollbar
-          Tk::Tcllib::Autoscroll.autoscroll(@yscrollbar)
-        end
-      when nil, :both, 'both'
-        if @xscrollbar
-          Tk::Tcllib::Autoscroll.autoscroll(@xscrollbar)
-        end
-        if @yscrollbar
-          Tk::Tcllib::Autoscroll.autoscroll(@yscrollbar)
-        end
-      else
-        fail ArgumentError, "'x', 'y' or 'both' (String or Symbol) is expected"
-      end
-      self
-    end
-    def unautoscroll(mode = nil)
-      case mode
-      when :x, 'x'
-        if @xscrollbar
-          Tk::Tcllib::Autoscroll.unautoscroll(@xscrollbar)
-        end
-      when :y, 'y'
-        if @yscrollbar
-          Tk::Tcllib::Autoscroll.unautoscroll(@yscrollbar)
-        end
-      when nil, :both, 'both'
-        if @xscrollbar
-          Tk::Tcllib::Autoscroll.unautoscroll(@xscrollbar)
-        end
-        if @yscrollbar
-          Tk::Tcllib::Autoscroll.unautoscroll(@yscrollbar)
-        end
-      else
-        fail ArgumentError, "'x', 'y' or 'both' (String or Symbol) is expected"
-      end
-      self
-    end
-  end
-end
-
-class Tk::Scrollbar
-  def autoscroll
-    # Arranges for the already existing scrollbar to be mapped
-    # and unmapped as needed.
-    #tk_call_without_enc('::autoscroll::autoscroll', @path)
-    Tk::Tcllib::Autoscroll.autoscroll(self)
-    self
-  end
-  def unautoscroll
-    #     Returns the scrollbar to its original static state.
-    #tk_call_without_enc('::autoscroll::unautoscroll', @path)
-    Tk::Tcllib::Autoscroll.unautoscroll(self)
-    self
-  end
-end
-
-# TkPackage.require('autoscroll', '1.0')
-# TkPackage.require('autoscroll', '1.1')
-TkPackage.require('autoscroll')
-
-module Tk
-  module Tcllib
-    class << Autoscroll
-      undef not_available
-    end
-
-    module Autoscroll
-      extend TkCore
-      def self.autoscroll(win)
-        tk_call_without_enc('::autoscroll::autoscroll', win.path)
-      end
-
-      def self.unautoscroll(win)
-        tk_call_without_enc('::autoscroll::unautoscroll', win.path)
-      end
-
-      def self.wrap
-        # v1.1
-        tk_call_without_enc('::autoscroll::wrap')
-      end
-
-      def self.unwrap
-        # v1.1
-        tk_call_without_enc('::autoscroll::unwrap')
-      end
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/calendar.rb b/ext/tk/lib/tkextlib/tcllib/calendar.rb
deleted file mode 100644
index fa53603d91..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/calendar.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/tcllib/calendar.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-#   * Part of tcllib extension
-#   * calendar widget
-#
-
-require 'tk'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('widget::calendar', '0.9')
-TkPackage.require('widget::calendar')
-
-module Tk::Tcllib
-  module Widget
-    class Calendar < TkCanvas
-      PACKAGE_NAME = 'widget::calendar'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('widget::calendar')
-        rescue
-          ''
-        end
-      end
-    end
-  end
-end
-
-class Tk::Tcllib::Widget::Calendar
-  TkCommandNames = ['::widget::calendar'.freeze].freeze
-
-  def __boolval_optkeys
-    super() << 'showpast'
-  end
-  private :__boolval_optkeys
-
-  def create_self(keys)
-    if keys and keys != None
-      tk_call_without_enc(self.class::TkCommandNames[0], @path,
-                          *hash_kv(keys, true))
-    else
-      tk_call_without_enc(self.class::TkCommandNames[0], @path)
-    end
-  end
-  private :create_self
-
-  def get(what = 'all')
-    tk_send('get', what)
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/canvas_sqmap.rb b/ext/tk/lib/tkextlib/tcllib/canvas_sqmap.rb
deleted file mode 100644
index f3d1847d73..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/canvas_sqmap.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/tcllib/canvas.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-#   * Part of tcllib extension
-#   *
-#
-
-require 'tk'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('widget::canvas_sqmap', '0.2')
-TkPackage.require('widget::canvas_sqmap')
-
-module Tk::Tcllib
-  module Widget
-    class Canvas_Sqmap < Canvas
-      TkCommandNames = ['::widget::canvas_sqmap'.freeze].freeze
-
-      def image_set(cell, img)
-        tk_send('image', 'set', cell, img)
-        self
-      end
-
-      def image_unset(cell)
-        tk_send('image', 'unset', cell)
-        self
-      end
-
-      def flush
-        tk_send('flush')
-        self
-      end
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/canvas_zoom.rb b/ext/tk/lib/tkextlib/tcllib/canvas_zoom.rb
deleted file mode 100644
index bb8b04a18b..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/canvas_zoom.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/tcllib/canvas.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-#   * Part of tcllib extension
-#   *
-#
-
-require 'tk'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('widget::canvas_zoom', '0.1')
-TkPackage.require('widget::canvas_zoom')
-
-module Tk::Tcllib
-  module Widget
-    class Canvas_Zoom < Canvas
-      TkCommandNames = ['::widget::canvas_zoom'.freeze].freeze
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/chatwidget.rb b/ext/tk/lib/tkextlib/tcllib/chatwidget.rb
deleted file mode 100644
index 34a8ca5094..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/chatwidget.rb
+++ /dev/null
@@ -1,152 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/tcllib/chatwidget.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-#   * Part of tcllib extension
-#   * chatwidget - Provides a multi-paned view suitable for display of
-#                  chat room or irc channel information
-#
-
-require 'tk'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('chatwidget', '1.1.0')
-TkPackage.require('chatwidget')
-
-module Tk::Tcllib
-  class ChatWidget < TkText
-    PACKAGE_NAME = 'chatwidget'.freeze
-    def self.package_name
-      PACKAGE_NAME
-    end
-
-    def self.package_version
-      begin
-        TkPackage.require('chatwidget')
-      rescue
-        ''
-      end
-    end
-  end
-end
-
-class Tk::Tcllib::ChatWidget
-  TkCommandNames = ['::chatwidget::chatwidget'.freeze].freeze
-
-  def show_topic
-    tk_send_without_enc('topic', 'show')
-    self
-  end
-
-  def hide_topic
-    tk_send_without_enc('topic', 'hide')
-    self
-  end
-
-  def set_topic(topic)
-    tk_send('topic', 'set', topic)
-  end
-
-  def list_name
-    tk_split_simplelist(tk_send('name', 'list'))
-  end
-
-  def list_name_full
-    tk_split_simplelist(tk_send('name', 'list')).map{|lst|
-      nick, *opts = tk_split_simplelist(lst)
-      h_opt = {}
-      opts.slice(2){|k, v| h_opt[k[1..-1]] = tk_tcl2ruby(v)}
-      [nick, h_opt]
-    }
-  end
-
-  def add_name(nick, opts={})
-    tk_send('name', 'add', nick, *(hash_kv(opts)))
-  end
-
-  def delete_name(nick)
-    tk_send('name', 'delete', nick)
-  end
-
-  def get_name(nick)
-    lst = tk_send('name', 'get', nick)
-    return nil if lst.empty?
-    nick, *opts = tk_split_simplelist(lst)
-    h_opt = {}
-    opts.slice(2){|k, v| h_opt[k[1..-1]] = tk_tcl2ruby(v)}
-    [nick, h_opt]
-  end
-
-  def message(msg, opts={})
-    tk_send('message', msg, *(hash_kv(opts)))
-    self
-  end
-
-  def _parse_hook_list(lst)
-    tk_split_simplelist(lst).map{|hook|
-      cmd, prior = tk_split_simplelist(hook)
-      [procedure(cmd), number(prior)]
-    }
-  end
-  private :_parse_hook_list
-
-  def hook_add(type, *args, &blk) # args -> [prior, cmd], [prior], [cmd]
-    #type -> 'message', 'post', 'names_group', 'names_nick', 'chatstate', 'url'
-
-    if prior = args.shift
-      if !prior.kind_of?(Numeric)
-        cmd = prior
-        if (prior = args.shift) && !prior.kind_of?(Numeric)  # error
-          args.unshift(prior)
-        end
-        args.unshift(cmd)
-      end
-      prior ||= 50  # default priority
-    end
-
-    cmd = args.shift || blk
-
-    fail ArgumentError, "invalid arguments" unless args.empty?
-    fail ArgumentError, "no callback is given" unless cmd
-
-    _parse_hook_list(tk_send('hook', 'add', type, cmd, prior))
-  end
-
-  def hook_remove(type, cmd)
-    #type -> 'message', 'post', 'names_group', 'names_nick', 'chatstate', 'url'
-    _parse_hook_list(tk_send('hook', 'remove', type, cmd))
-  end
-
-  def hook_run(type, *cmd_args)
-    #type -> 'message', 'post', 'names_group', 'names_nick', 'chatstate', 'url'
-    tk_send('hook', 'run', type, *cmd_args)
-  end
-
-  def hook_list(type)
-    #type -> 'message', 'post', 'names_group', 'names_nick', 'chatstate', 'url'
-    _parse_hook_list(tk_send('hook', 'list', type))
-  end
-
-  def show_names
-    tk_send('names', 'show')
-    self
-  end
-
-  def hide_names
-    tk_send('names', 'hide')
-    self
-  end
-
-  def names_widget
-    window(tk_send('names'))
-  end
-
-  def entry_widget
-    window(tk_send('entry'))
-  end
-
-  def chat_widget
-    window(tk_send('chat'))
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/crosshair.rb b/ext/tk/lib/tkextlib/tcllib/crosshair.rb
deleted file mode 100644
index 74cc0a881c..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/crosshair.rb
+++ /dev/null
@@ -1,118 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/tcllib/crosshair.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-#   * Part of tcllib extension
-#   * Crosshairs for Tk canvas
-#
-
-require 'tk'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('crosshair', '1.0.2')
-TkPackage.require('crosshair')
-
-module Tk::Tcllib
-  module Crosshair
-    PACKAGE_NAME = 'crosshair'.freeze
-    def self.package_name
-      PACKAGE_NAME
-    end
-
-    def self.package_version
-      begin
-        TkPackage.require('crosshair')
-      rescue
-        ''
-      end
-    end
-  end
-end
-
-module Tk::Tcllib::Crosshair
-  include TkCore
-  TkCommandNames = ['::crosshair::crosshair'.freeze].freeze
-
-  def self.crosshair(w, keys={})
-    Tk.tk_call('::crosshair::crosshair', w, *hash_kv(keys))
-    w
-  end
-  def self.on(w, keys={})
-    self.crosshair(w, keys)
-  end
-
-  def self.off(w)
-    Tk.tk_call('::crosshair::off', w)
-    w
-  end
-
-  def self.track_on(w, &b)
-    Tk.tk_call('::crosshair::track_on', w, b)
-    w
-  end
-
-  def self.track_off(w)
-    Tk.tk_call('::crosshair::track_off', w)
-    w
-  end
-end
-
-class << Tk::Tcllib::Crosshair
-  include TkComm
-  include TkCanvasItemConfig
-
-  def __item_methodcall_optkeys(id)
-    {}
-  end
-  private :__item_methodcall_optkeys
-
-  def __item_config_cmd(id)
-    # maybe need to override
-    ['::crosshair::configure', id]
-  end
-  private :__item_config_cmd
-
-  private :itemcget_tkstring, :itemcget, :itemcget_strict
-  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
-
-  def confugure(w, slot, value=None)
-    itemconfigure(w, slot, value)
-  end
-  def confuginfo(w, slot = nil)
-    itemconfiginfo(w, slot)
-  end
-  def current_configinfo(w, slot = nil)
-    current_itemconfiginfo(w, slot)
-  end
-  def cget(w, slot)
-    current_itemconfiginfo(w, slot).values[0]
-  end
-end
-
-module Tk::Tcllib::Crosshair
-  def crosshair_on(keys={})
-    Tk::Tcllib::Crosshair.on(self, keys)
-  end
-  def crosshair_off
-    Tk::Tcllib::Crosshair.off(self)
-  end
-  def crosshair_track_on(&b)
-    Tk::Tcllib::Crosshair.track_on(self, &b)
-  end
-  def crosshair_track_off
-    Tk::Tcllib::Crosshair.track_off(self)
-  end
-  def crosshair_configure(*args)
-    Tk::Tcllib::Crosshair.configure(self, *args)
-  end
-  def crosshair_configinfo(slot = nil)
-    Tk::Tcllib::Crosshair.configinfo(self, slot)
-  end
-  def crosshair_current_configinfo(slot = nil)
-    Tk::Tcllib::Crosshair.current_configinfo(self, slot)
-  end
-  def crosshair_cget(slot)
-    Tk::Tcllib::Crosshair.cget(self, slot)
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/ctext.rb b/ext/tk/lib/tkextlib/tcllib/ctext.rb
deleted file mode 100644
index 1c61ec81a6..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/ctext.rb
+++ /dev/null
@@ -1,161 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/tcllib/ctext.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-#   * Part of tcllib extension
-#   * Overloads the text widget and provides new commands
-#
-
-require 'tk'
-require 'tk/text'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('ctext', '3.1')
-TkPackage.require('ctext')
-
-module Tk
-  module Tcllib
-    class CText < Tk::Text
-      PACKAGE_NAME = 'ctext'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('ctext')
-        rescue
-          ''
-        end
-      end
-    end
-  end
-end
-
-class Tk::Tcllib::CText
-  TkCommandNames = ['ctext'.freeze].freeze
-  WidgetClassName = 'Ctext'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def create_self(keys)
-    if keys and keys != None
-      tk_call_without_enc(self.class::TkCommandNames[0], @path,
-                          *hash_kv(keys, true))
-    else
-      tk_call_without_enc(self.class::TkCommandNames[0], @path)
-    end
-  end
-  private :create_self
-
-  def __strval_optkeys
-    super() << 'linemapfg' << 'linemapbg' <<
-      'linemap_select_fg' << 'linemap_select_bg'
-  end
-  private :__strval_optkeys
-
-  def __boolval_optkeys
-    super() << 'highlight' << 'linemap_markable'
-  end
-  private :__boolval_optkeys
-
-  def append(*args)
-    tk_send('append', *args)
-  end
-
-  def copy
-    tk_send('copy')
-  end
-
-  def cut
-    tk_send('cut')
-  end
-
-  def fast_delete(*args)
-    tk_send('fastdelete', *args)
-  end
-
-  def fast_insert(*args)
-    tk_send('fastinsert', *args)
-  end
-
-  def highlight(*args)
-    tk_send('highlight', *args)
-  end
-
-  def paste
-    tk_send('paste')
-  end
-
-  def edit(*args)
-    tk_send('edit', *args)
-  end
-
-  def add_highlight_class(klass, col, *keywords)
-    tk_call('ctext::addHighlightClass', @path, klass, col, keywords.flatten)
-    self
-  end
-
-  def add_highlight_class_for_special_chars(klass, col, *chrs)
-    tk_call('ctext::addHighlightClassForSpecialChars',
-            @path, klass, col, chrs.join(''))
-    self
-  end
-
-  def add_highlight_class_for_regexp(klass, col, tcl_regexp)
-    tk_call('ctext::addHighlightClassForRegexp',
-            @path, klass, col, tcl_regexp)
-    self
-  end
-
-  def add_highlight_class_with_only_char_start(klass, col, chr)
-    tk_call('ctext::addHighlightClassWithOnlyCharStart',
-            @path, klass, col, chr)
-    self
-  end
-
-  def clear_highlight_classes
-    tk_call('ctext::clearHighlightClasses', @path)
-    self
-  end
-
-  def get_highlight_classes
-    tk_split_simplelist(tk_call('ctext::getHighlightClasses', @path))
-  end
-
-  def delete_highlight_class(klass)
-    tk_call('ctext::deleteHighlightClass', @path, klass)
-    self
-  end
-
-  def enable_C_comments
-    tk_call('ctext::enableComments', @path)
-    self
-  end
-
-  def disable_C_comments
-    tk_call('ctext::disableComments', @path)
-    self
-  end
-
-  def find_next_char(idx, chr)
-    tk_call('ctext::findNextChar', @path, idx, chr)
-  end
-
-  def find_next_space(idx)
-    tk_call('ctext::findNextSpace', @path, idx)
-  end
-
-  def find_previous_space(idx)
-    tk_call('ctext::findPreviousSpace', @path, idx)
-  end
-
-  def set_update_proc(cmd=Proc.new)
-    tk_call('proc', 'ctext::update', '', cmd)
-    self
-  end
-
-  def modified?(mode)
-    bool(tk_call('ctext::modified', @path, mode))
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/cursor.rb b/ext/tk/lib/tkextlib/tcllib/cursor.rb
deleted file mode 100644
index 4c93cfc063..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/cursor.rb
+++ /dev/null
@@ -1,98 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/tcllib/cursor.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-#   * Part of tcllib extension
-#   * Procedures to handle CURSOR data
-#
-
-require 'tk'
-require 'tkextlib/tcllib.rb'
-
-module Tk
-  module Tcllib
-    module Cursor
-      PACKAGE_NAME = 'cursor'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('cursor')
-        rescue
-          ''
-        end
-      end
-
-      def self.not_available
-        fail RuntimeError, "'tkextlib/tcllib/cursor' extension is not available on your current environment."
-      end
-
-      def self.cursor_display(win=None)
-        Tk::Tcllib::Cursor.not_available
-      end
-
-      def self.cursor_propagate(win, cursor)
-        Tk::Tcllib::Cursor.not_available
-      end
-
-      def self.cursor_restore(win, cursor = None)
-        Tk::Tcllib::Cursor.not_available
-      end
-    end
-  end
-
-  def self.cursor_display(parent=None)
-    # Pops up a dialog with a listbox containing all the cursor names.
-    # Selecting a cursor name will display it in that dialog.
-    # This is simply for viewing any available cursors on the platform .
-    #tk_call_without_enc('::cursor::display', parent)
-    Tk::Tcllib::Cursor.cursor_display(parent)
-  end
-end
-
-class TkWindow
-  def cursor_propagate(cursor)
-    # Sets the cursor for self and all its descendants to cursor.
-    #tk_call_without_enc('::cursor::propagate', @path, cursor)
-    Tk::Tcllib::Cursor.cursor_propagate(self, cursor)
-  end
-  def cursor_restore(cursor = None)
-    # Restore the original or previously set cursor for self and all its
-    # descendants. If cursor is specified, that will be used if on any
-    # widget that did not have a preset cursor (set by a previous call
-    # to TkWindow#cursor_propagate).
-    #tk_call_without_enc('::cursor::restore', @path, cursor)
-    Tk::Tcllib::Cursor.cursor_restore(self, cursor)
-  end
-end
-
-# TkPackage.require('cursor', '0.1')
-TkPackage.require('cursor')
-
-module Tk
-  module Tcllib
-    class << Cursor
-      undef not_available
-    end
-
-    module Cursor
-      extend TkCore
-      def self.cursor_display(win=None)
-        tk_call_without_enc('::cursor::display', _epath(win))
-      end
-
-      def self.cursor_propagate(win, cursor)
-        #tk_call_without_enc('::cursor::propagate', win.path, cursor)
-        tk_call_without_enc('::cursor::propagate', _epath(win), cursor)
-      end
-
-      def self.cursor_restore(win, cursor = None)
-        #tk_call_without_enc('::cursor::restore', win.path, cursor)
-        tk_call_without_enc('::cursor::restore', _epath(win), cursor)
-      end
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/dateentry.rb b/ext/tk/lib/tkextlib/tcllib/dateentry.rb
deleted file mode 100644
index 81b38515fc..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/dateentry.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/tcllib/dateentry.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-#   * Part of tcllib extension
-#   * dateentry widget
-#
-
-require 'tk'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('widget::dateentry', '0.91')
-TkPackage.require('widget::dateentry')
-
-module Tk::Tcllib
-  module Widget
-    class Dateentry < Tk::Tile::TEntry
-      PACKAGE_NAME = 'widget::dateentry'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('widget::dateentry')
-        rescue
-          ''
-        end
-      end
-    end
-    DateEntry = Dateentry
-  end
-end
-
-class Tk::Tcllib::Widget::Dateentry
-  TkCommandNames = ['::widget::dateentry'.freeze].freeze
-
-  def __strval_optkeys
-    super() << ['dateformat']
-  end
-  private :__strval_optkeys
-
-  def create_self(keys)
-    if keys and keys != None
-      tk_call_without_enc(self.class::TkCommandNames[0], @path,
-                          *hash_kv(keys, true))
-    else
-      tk_call_without_enc(self.class::TkCommandNames[0], @path)
-    end
-  end
-  private :create_self
-
-  def post
-    tk_send('post')
-    self
-  end
-
-  def unpost
-    tk_send('unpost')
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/datefield.rb b/ext/tk/lib/tkextlib/tcllib/datefield.rb
deleted file mode 100644
index ceed1260df..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/datefield.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/tcllib/datefield.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-#   * Part of tcllib extension
-#   * Tk datefield widget
-#
-# (The following is the original description of the library.)
-#
-# The datefield package provides the datefield widget which is an enhanced
-# text entry widget for the purpose of date entry. Only valid dates of the
-# form MM/DD/YYYY can be entered.
-#
-# The datefield widget is, in fact, just an entry widget with specialized
-# bindings. This means all the command and options for an entry widget apply
-# equally here.
-
-require 'tk'
-require 'tk/entry'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('datefield', '0.1')
-TkPackage.require('datefield')
-
-module Tk
-  module Tcllib
-    class Datefield < Tk::Entry
-      PACKAGE_NAME = 'datefield'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('datefield')
-        rescue
-          ''
-        end
-      end
-    end
-    DateField = Datefield
-  end
-end
-
-class Tk::Tcllib::Datefield
-  TkCommandNames = ['::datefield::datefield'.freeze].freeze
-
-  def create_self(keys)
-    if keys and keys != None
-      tk_call_without_enc(self.class::TkCommandNames[0], @path,
-                          *hash_kv(keys, true))
-    else
-      tk_call_without_enc(self.class::TkCommandNames[0], @path)
-    end
-  end
-  private :create_self
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/diagrams.rb b/ext/tk/lib/tkextlib/tcllib/diagrams.rb
deleted file mode 100644
index 7fb7b3c7ee..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/diagrams.rb
+++ /dev/null
@@ -1,225 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/tcllib/diagrams.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-#   * Part of tcllib extension
-#   * Draw diagrams
-#
-
-require 'tk'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('Diagrams', '0.3')
-TkPackage.require('Diagrams')
-
-module Tk::Tcllib
-  module Diagrams
-    PACKAGE_NAME = 'Diagrams'.freeze
-    def self.package_name
-      PACKAGE_NAME
-    end
-
-    def self.package_version
-      begin
-        TkPackage.require('Diagrams')
-      rescue
-        ''
-      end
-    end
-  end
-end
-
-class << Tk::Tcllib::Diagrams
-  include TkCore
-
-  def drawin(canvas)
-    tk_call('::Diagrams::drawin', canvas)
-    canvas
-  end
-  alias draw_in drawin
-
-  def saveps(filename)
-    tk_call('::Diagrams::saveps', filename)
-    filename
-  end
-  alias save_ps saveps
-
-  def direction(dir)
-    tk_call('::Diagrams::direction', dir)
-    dir
-  end
-
-  def currentpos(pos)
-    list(tk_call('::Diagrams::currentpos', pos))
-  end
-  alias current_pos currentpos
-  alias currentpos= currentpos
-  alias current_pos= currentpos
-
-  def getpos(anchor, obj)
-    list(tk_call('::Diagrams::getpos', anchor, obj))
-  end
-  alias get_pos getpos
-
-  def position(x, y)
-    list(tk_call('::Diagrams::position', x, y))
-  end
-
-  def box(text, width=nil, height=nil)
-    if width || height
-      width  = '' unless width
-      height = '' unless height
-      list(tk_call('::Diagrams::box', text, width, height))
-    else
-      list(tk_call('::Diagrams::box', text))
-    end
-  end
-
-  def plaintext(text, width=nil, height=nil)
-    if width || height
-      width  = '' unless width
-      height = '' unless height
-      list(tk_call('::Diagrams::plaintext', text, width, height))
-    else
-      list(tk_call('::Diagrams::plaintext', text))
-    end
-  end
-
-  def circle(text, radius=nil)
-    if radius
-      list(tk_call('::Diagrams::circle', text, radius))
-    else
-      list(tk_call('::Diagrams::circle', text))
-    end
-  end
-
-  def slanted(text, width=nil, height=nil, angle=nil)
-    if width || height || angle
-      width  = '' unless width
-      height = '' unless height
-      if angle
-        list(tk_call('::Diagrams::slanted', text, width, height, angle))
-      else
-        list(tk_call('::Diagrams::slanted', text, width, height))
-      end
-    else
-      list(tk_call('::Diagrams::slanted', text))
-    end
-  end
-
-  def diamond(text, width=nil, height=nil)
-    if width || height
-      width  = '' unless width
-      height = '' unless height
-      list(tk_call('::Diagrams::diamond', text, width, height))
-    else
-      list(tk_call('::Diagrams::diamond', text))
-    end
-  end
-
-  def drum(text, width=nil, height=nil)
-    if width || height
-      width  = '' unless width
-      height = '' unless height
-      list(tk_call('::Diagrams::drum', text, width, height))
-    else
-      list(tk_call('::Diagrams::drum', text))
-    end
-  end
-
-  def arrow(text=nil, length=nil, head=nil)
-    if length || head
-      text   = '' unless text
-      length = '' unless length
-      list(tk_call('::Diagrams::arrow', text, length, head))
-    else
-      if text
-        list(tk_call('::Diagrams::arrow', text))
-      else
-        list(tk_call('::Diagrams::arrow'))
-      end
-    end
-  end
-
-  def line(*args)
-    ary = []
-    args.each{|arg|
-      if arg.kind_of?(Array) && arg.length == 2  # [length, angle]
-        ary.concat arg
-      else # ["POSITION", x, y] or length or angle
-        ary << arg
-      end
-    }
-    list(tk_call('::Diagrams::line', *ary))
-  end
-
-  def bracket(dir, dist, from_pos, to_pos)
-    list(tk_call('::Diagrams::bracket', dir, dist, from_pos, to_pos))
-  end
-
-  def attach(anchor=None)
-    tk_call('::Diagrams::attach', anchor)
-  end
-
-  def color(name=None)
-    tk_call('::Diagrams::color', name)
-  end
-
-  def fillcolor(name=None)
-    tk_call('::Diagrams::fillcolor', name)
-  end
-
-  def textcolor(name=None)
-    tk_call('::Diagrams::textcolor', name)
-  end
-
-  def usegap(mode=None)
-    bool(tk_call('::Diagrams::usegap', mode))
-  end
-  alias use_gap usegap
-
-  def xgap(val=None)
-    number(tk_call('::Diagrams::xgap', val))
-  end
-
-  def ygap(val=None)
-    number(tk_call('::Diagrams::ygap', val))
-  end
-
-  def textfont(fnt=None)
-    tk_call('::Diagrams::textfont', fnt)
-  end
-
-  def linewidth(pixels=None)
-    number(tk_call('::Diagrams::linewidth', pixels))
-  end
-
-  def linestyle(style=None)
-    tk_call('::Diagrams::linestyle', style)
-  end
-
-  def pushstate
-    tk_call('::Diagrams::pushstate')
-  end
-  alias push_state pushstate
-
-  def popstate
-    tk_call('::Diagrams::popstate')
-  end
-  alias pop_state popstate
-
-  def computepos
-    list(tk_call('::Diagrams::computepos'))
-  end
-  alias compute_pos computepos
-
-  def boxcoords(x1, y1, x2, y2)
-    list(tk_call('::Diagrams::boxcoords', x1, y1, x2, y2))
-  end
-
-  def moveobject(obj)
-    list(tk_call('::Diagrams::moveobject', obj))
-  end
-  alias move_object moveobject
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/dialog.rb b/ext/tk/lib/tkextlib/tcllib/dialog.rb
deleted file mode 100644
index 46fd06f177..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/dialog.rb
+++ /dev/null
@@ -1,85 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/tcllib/dialog.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-#   * Part of tcllib extension
-#   * Generic dialog widget (themed)
-#
-
-require 'tk'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('widget::dialog', '1.2')
-TkPackage.require('widget::dialog')
-
-module Tk::Tcllib
-  module Widget
-    class Dialog < TkWindow
-      PACKAGE_NAME = 'widget::dialog'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('widget::dialog')
-        rescue
-          ''
-        end
-      end
-    end
-  end
-end
-
-class Tk::Tcllib::Widget::Dialog
-  TkCommandNames = ['::widget::dialog'.freeze].freeze
-
-  def __boolval_optkeys
-    ['separator', 'synchronous', 'transient']
-  end
-  private :__boolval_optkeys
-
-  def create_self(keys)
-    if keys and keys != None
-      tk_call_without_enc(self.class::TkCommandNames[0], @path,
-                          *hash_kv(keys, true))
-    else
-      tk_call_without_enc(self.class::TkCommandNames[0], @path)
-    end
-  end
-  private :create_self
-
-  def add(what, *args)
-    window(tk_send('add', *args))
-  end
-
-  def get_frame
-    window(tk_send('getframe'))
-  end
-
-  def set_widget(widget)
-    tk_send('setwidget', widget)
-    self
-  end
-
-  def display
-    tk_send('display')
-    self
-  end
-  alias show display
-
-  def cancel
-    tk_send('cancel')
-    self
-  end
-
-  def close(reason = None)
-    tk_send('close', reason)
-  end
-
-  def withdraw
-    tk_send('withdraw')
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/getstring.rb b/ext/tk/lib/tkextlib/tcllib/getstring.rb
deleted file mode 100644
index 72d9c5f517..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/getstring.rb
+++ /dev/null
@@ -1,135 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/tcllib/getstring.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-#   * Part of tcllib extension
-#   * A dialog which consists of an Entry, OK, and Cancel buttons.
-#
-
-require 'tk'
-require 'tk/entry'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('getstring', '0.1')
-TkPackage.require('getstring')
-
-module Tk::Tcllib
-  class GetString_Dialog < TkWindow
-    PACKAGE_NAME = 'getstring'.freeze
-    def self.package_name
-      PACKAGE_NAME
-    end
-
-    def self.package_version
-      begin
-        TkPackage.require('getstring')
-      rescue
-        ''
-      end
-    end
-  end
-end
-
-
-class Tk::Tcllib::GetString_Dialog
-  TkCommandNames = ['::getstring::tk_getString'.freeze].freeze
-  WidgetClassName = 'TkSDialog'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def self.show(*args)
-    dialog = self.new(*args)
-    dialog.show
-    [dialog.status, dialog.value]
-  end
-  def self.display(*args)
-    self.show(*args)
-  end
-
-  def initialize(*args)   # args = (parent=nil, text='', keys=nil)
-    keys = args.pop
-    if keys.kind_of?(Hash)
-      text = args.pop
-      @keys = _symbolkey2str(keys)
-      args.push(keys)
-    else
-      text = keys
-      @keys = {}
-    end
-    if text
-      @text = text.dup
-    else
-      @text = ''
-    end
-
-    @variable = TkVariable.new
-    @status = nil
-
-    super(*args)
-  end
-
-  def create_self(keys)
-    # dummy
-  end
-  private :create_self
-
-  def show
-    @variable.value = ''
-    @status = bool(tk_call(self.class::TkCommandNames[0],
-                           @path, @variable, @text, *hash_kv(@keys)))
-  end
-  alias display show
-
-  def status
-    @status
-  end
-
-  def value
-    @variable.value
-  end
-
-  def cget_strict(slot)
-    slot = slot.to_s
-    if slot == 'text'
-      @text
-    else
-      @keys[slot]
-    end
-  end
-  def cget(slot)
-    cget_strict(slot)
-  end
-
-  def configure(slot, value=None)
-    if slot.kind_of?(Hash)
-      slot.each{|k, v| configure(k, v)}
-    else
-      slot = slot.to_s
-      value = _symbolkey2str(value) if value.kind_of?(Hash)
-      if value && value != None
-        if slot == 'text'
-          @text = value.to_s
-        else
-          @keys[slot] = value
-        end
-      else
-        if slot == 'text'
-          @text = ''
-        else
-          @keys.delete(slot)
-        end
-      end
-    end
-    self
-  end
-
-  def configinfo(slot = nil)
-    if slot
-      slot = slot.to_s
-      [ slot, nil, nil, nil, ( (slot == 'text')? @text: @keys[slot] ) ]
-    else
-      @keys.collect{|k, v| [ k, nil, nil, nil, v ] }   \
-      << [ 'text', nil, nil, nil, @text ]
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/history.rb b/ext/tk/lib/tkextlib/tcllib/history.rb
deleted file mode 100644
index a1b92726ee..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/history.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/tcllib/history.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-#   * Part of tcllib extension
-#   * Provides a history for Entry widgets
-#
-
-require 'tk'
-require 'tk/entry'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('history', '0.1')
-TkPackage.require('history')
-
-module Tk::Tcllib
-  module History
-    PACKAGE_NAME = 'history'.freeze
-    def self.package_name
-      PACKAGE_NAME
-    end
-
-    def self.package_version
-      begin
-        TkPackage.require('history')
-      rescue
-        ''
-      end
-    end
-  end
-end
-
-module Tk::Tcllib::History
-  extend TkCore
-
-  def self.init(entry, length=None)
-    tk_call_without_enc('::history::init', entry.path, length)
-    entry.extend(self)  # add methods to treat history to the entry widget
-  end
-
-  def self.remove(entry)
-    tk_call_without_enc('::history::remove', entry.path)
-    entry
-  end
-
-  def history_remove
-    tk_call_without_enc('::history::remove', @path)
-    self
-  end
-
-  def history_add(text)
-    tk_call('::history::add', @path, text)
-    self
-  end
-
-  def history_get
-    simplelist(tk_call_without_enc('::history::get', @path))
-  end
-
-  def history_clear
-    tk_call_without_enc('::history::clear', @path)
-    self
-  end
-
-  def history_configure(opt, value)
-    tk_call('::history::configure', @path, opt, value)
-    self
-  end
-
-  def history_configinfo(opt)
-    tk_call('::history::configure', @path, opt)
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/ico.rb b/ext/tk/lib/tkextlib/tcllib/ico.rb
deleted file mode 100644
index 8814205f94..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/ico.rb
+++ /dev/null
@@ -1,147 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/tcllib/ico.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-#   * Part of tcllib extension
-#   * Reading and writing windows icons
-#
-
-require 'tk'
-require 'tk/image'
-#require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('ico', '0.3')
-TkPackage.require('ico')
-
-module Tk
-  module Tcllib
-    class ICO < TkImage
-      PACKAGE_NAME = 'ico'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('ico')
-        rescue
-          ''
-        end
-      end
-    end
-  end
-end
-
-class Tk::Tcllib::ICO
-  def self.list(file, keys=nil)
-    tk_split_list(tk_call_without_enc('::ico::getIconList', file,
-                                      *hash_kv(keys, true)))
-  end
-
-  def self.icons(file, keys=nil)
-    tk_split_simplelist(tk_call_without_enc('::ico::icons', file,
-                                            *hash_kv(keys, true))).map{|elem|
-      num_or_str(elem)
-    }
-  end
-
-  def self.get_members(file, name, keys=nil)
-    tk_split_simplelist(tk_call_without_enc('::ico::getMembers', file, name,
-                                            *hash_kv(keys, true))).map{|elem|
-      name, width, height, bpp =  tk_split_simplelist(elem)
-      [name, number(width), number(height), number(bpp)]
-    }
-  end
-
-  def self.get(file, index, keys=nil)
-    tk_call_without_enc('::ico::getIcon', file, index, *hash_kv(keys, true))
-  end
-  def self.get_icon(*args)
-    get(*args)
-  end
-
-  def self.get_by_name(file, name, keys=nil)
-    tk_call_without_enc('::ico::getIconByName', file, name,
-                        *hash_kv(keys, true))
-  end
-  def self.get_icon_by_name(*args)
-    get_by_name(*args)
-  end
-
-  def self.get_fileicon(file, keys=nil)
-    tk_call_without_enc('::ico::getFileIcon', file, *hash_kv(keys, true))
-  end
-
-  def self.get_image(file, index, keys={})
-    keys = _symbolkey2str(keys)
-    keys.delete('format')
-    self.new(file, index, keys)
-  end
-
-  def self.get_data(file, index, keys={})
-    keys['format'] = 'data'
-    tk_split_list(tk_call_without_enc('::ico::getIcon', file, index,
-                                      *hash_kv(keys, true)))
-  end
-
-  def self.write(file, index, depth, data, keys=nil)
-    tk_call_without_enc('::ico::writeIcon', file, index, depth, data,
-                        *hash_kv(keys, true))
-  end
-
-  def self.copy(from_file, from_index, to_file, to_index, keys=nil)
-    tk_call_without_enc('::ico::copyIcon',
-                        from_file, from_index, to_file, to_index,
-                        *hash_kv(keys, true))
-  end
-
-  def self.exe_to_ico(exe_file, ico_file, keys=nil)
-    tk_call_without_enc('::ico::copyIcon', exe_file, ico_file,
-                        *hash_kv(keys, true))
-  end
-
-  def self.clear_cache(file=None)
-    tk_call_without_enc('::ico::clearCache', file)
-  end
-
-  def self.transparent_color(image, color)
-    if image.kind_of?(Array)
-      tk_split_list(tk_call_without_enc('::ico::transparentColor',
-                                        image, color))
-    else
-      tk_call_without_enc('::ico::transparentColor', image, color)
-    end
-  end
-
-  def self.show(file, keys=nil)
-    tk_call_without_enc('::ico::Show', file, *hash_kv(keys, true))
-  end
-
-  ###########################
-
-  def initialize(file, index, keys=nil)
-    keys = _symbolkey2str(keys)
-    if keys.key?('name')
-      @path = keys['name'].to_s
-    else
-      Tk_Image_ID.mutex.synchronize{
-        @path = Tk_Image_ID.join(TkCore::INTERP._ip_id_)
-        Tk_Image_ID[1].succ!
-      }
-    end
-    tk_call_without_enc('::ico::getIcon', file, index, '-name', @path,
-                        '-format', 'image', *hash_kv(keys, true))
-    Tk_IMGTBL[@path] = self
-  end
-
-  def write(file, index, depth, keys=nil)
-    Tk::Tcllib::ICO.write(file, index, depth, @path, keys=nil)
-    self
-  end
-
-  def transparent_color(color)
-    tk_call_without_enc('::ico::transparentColor', @path, color)
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/ip_entry.rb b/ext/tk/lib/tkextlib/tcllib/ip_entry.rb
deleted file mode 100644
index 6bbd8442a6..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/ip_entry.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/tcllib/ip_entry.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-#   * Part of tcllib extension
-#   * An IP address entry widget
-#
-# (The following is the original description of the library.)
-#
-# This package provides a widget for the entering of a IP address.
-# It guarantees a valid address at all times.
-
-require 'tk'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('ipentry', '0.1')
-TkPackage.require('ipentry')
-
-module Tk
-  module Tcllib
-    class IP_Entry < Tk::Entry
-      PACKAGE_NAME = 'ipentry'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('ipentry')
-        rescue
-          ''
-        end
-      end
-    end
-    IPEntry = IP_Entry
-
-    class IP_Entry6 < IP_Entry
-    end
-    IPEntry6 = IP_Entry6
-    IP6_Entry = IP_Entry6
-  end
-end
-
-class Tk::Tcllib::IP_Entry
-  TkCommandNames = ['::ipentry::ipentry'.freeze].freeze
-  WidgetClassName = 'IPEntry'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def create_self(keys)
-    if keys and keys != None
-      tk_call_without_enc(self.class::TkCommandNames[0], @path,
-                          *hash_kv(keys, true))
-    else
-      tk_call_without_enc(self.class::TkCommandNames[0], @path)
-    end
-  end
-  private :create_self
-
-  def __strval_optkeys
-    super() << 'fg' << 'bg' << 'insertbackground'
-  end
-  private :__strval_optkeys
-
-  def complete?
-    bool(tk_send_without_enc('complete'))
-  end
-
-  def insert(*ip)
-    tk_send_without_enc('insert', array2tk_list(ip.flatten))
-  end
-end
-
-class Tk::Tcllib::IP_Entry6 < Tk::Tcllib::IP_Entry
-  TkCommandNames = ['::ipentry::ipentry6'.freeze].freeze
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/khim.rb b/ext/tk/lib/tkextlib/tcllib/khim.rb
deleted file mode 100644
index e79f26b381..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/khim.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/tcllib/khim.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-#   * Part of tcllib extension
-#   * Kevin's Hacky Input Method
-#
-
-require 'tk'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('khim', '1.0')
-TkPackage.require('khim')
-
-module Tk::Tcllib
-  class KHIM < TkToplevel
-    PACKAGE_NAME = 'khim'.freeze
-    def self.package_name
-      PACKAGE_NAME
-    end
-
-    def self.package_version
-      begin
-        TkPackage.require('khim')
-      rescue
-        ''
-      end
-    end
-  end
-end
-
-class Tk::Tcllib::KHIM
-  TkCommandNames = ['::khim::getOptions'.freeze].freeze
-
-  def self.get_options(parent='')
-    path = parent + '.tcllib_widget_khim_dialog'
-    self.new(:widgetname => path)
-  end
-
-  def self.get_config #=> cmd_string
-    Tk.tk_call_without_enc('::khim::getConfig')
-  end
-
-  def self.set_config(*args)
-    if args.length == 1
-      # cmd_string generated by
-      #Tk.ip_eval_without_enc(cmd_string)
-      Tk.ip_eval(cmd_string)
-    else
-      # args for setConfig command
-      #Tk.tk_call_without_enc('::khim::setConfig', *args)
-      Tk.tk_call('::khim::setConfig', *args)
-    end
-  end
-
-  def self.showHelp
-    Tk::Tcllib::KHIM::Help.new
-  end
-
-  def create_self(keys=None)
-    @db_class = @classname = nil
-    super(None) # ignore keys
-  end
-end
-
-class Tk::Tcllib::KHIM::Help < TkToplevel
-  TkCommandNames = ['::khim::showHelp'.freeze].freeze
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/menuentry.rb b/ext/tk/lib/tkextlib/tcllib/menuentry.rb
deleted file mode 100644
index 51521499da..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/menuentry.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/tcllib/menuentry.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-#   * Part of tcllib extension
-#   * menuentry widget
-#
-
-require 'tk'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('widget::menuentry', '1.0')
-TkPackage.require('widget::menuentry')
-
-module Tk::Tcllib
-  module Widget
-    class Menuentry < Tk::Tile::TEntry
-      PACKAGE_NAME = 'widget::menuentry'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('widget::menuentry')
-        rescue
-          ''
-        end
-      end
-    end
-    MenuEntry = Menuentry
-  end
-end
-
-class Tk::Tcllib::Widget::Menuentry
-  TkCommandNames = ['::widget::menuentry'.freeze].freeze
-
-  def create_self(keys)
-    if keys and keys != None
-      tk_call_without_enc(self.class::TkCommandNames[0], @path,
-                          *hash_kv(keys, true))
-    else
-      tk_call_without_enc(self.class::TkCommandNames[0], @path)
-    end
-  end
-  private :create_self
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/ntext.rb b/ext/tk/lib/tkextlib/tcllib/ntext.rb
deleted file mode 100644
index 2d0c208236..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/ntext.rb
+++ /dev/null
@@ -1,147 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/tcllib/ntext.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-#   * Part of tcllib extension
-#   * Ntext bindtag
-#
-
-require 'tk'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('ntext', '0.81')
-TkPackage.require('ntext')
-
-module Tk::Tcllib
-  Ntext = TkBindTag.new_by_name('Ntext')
-end
-
-# variables
-Tk::Tcllib::Ntext.instance_eval{
-  # boolean
-  @classicAnchor = TkVarAccess.new('::ntext::classicAnchor')
-  @classicExtras  = TkVarAccess.new('::ntext::classicExtras')
-  @classicMouseSelect = TkVarAccess.new('::ntext::classicMouseSelect')
-  @classicWordBreak = TkVarAccess.new('::ntext::classicWordBreak')
-  @classicWrap = TkVarAccess.new('::ntext::classicWrap')
-  @overwrite = TkVarAccess.new('::ntext::overwrite')
-
-  # regexp
-  @newWrapRegexp = TkVarAccess.new('::ntext::newWrapRegexp')
-
-  # variables (advanced use)
-  @tcl_match_wordBreakAfter = TkVarAccess.new('::ntext::tcl_match_wordBreakAfter')
-  @tcl_match_wordBreakBefore = TkVarAccess.new('::ntext::tcl_match_wordBreakBefore')
-  @tcl_match_endOfWord = TkVarAccess.new('::ntext::tcl_match_endOfWord')
-  @tcl_match_startOfNextWord = TkVarAccess.new('::ntext::tcl_match_startOfNextWord')
-  @tcl_match_startOfPreviousWord = TkVarAccess.new('::ntext::tcl_match_startOfPreviousWord')
-}
-
-class << Tk::Tcllib::Ntext
-  def wrapIndent(txt, *args)
-    TK.tk_call('::next::wrapIndent', txt, *args)
-  end
-
-  def initializeMatchPatterns
-    TK.tk_call('::next::initializeMatchPatterns')
-    self
-  end
-
-  def createMatchPatterns(*args)
-    TK.tk_call('::next::createMatchPatterns', *args)
-    self
-  end
-
-  # functions (advanced use)
-  #ntext::new_wordBreakAfter
-  #ntext::new_wordBreakBefore
-  #ntext::new_endOfWord
-  #ntext::new_startOfNextWord
-  #ntext::new_startOfPreviousWord
-
-  # accessor
-  def classicAnchor
-    @classicAnchor.bool
-  end
-  def classicAnchor=(mode)
-    @classicAnchor.bool = mode
-  end
-
-  def classicExtras
-    @classicExtras.bool
-  end
-  def classicExtras=(mode)
-    @classicExtras.bool = mode
-  end
-
-  def classicMouseSelect
-    @classicMouseSelect.bool
-  end
-  def classicMouseSelect=(mode)
-    @classicMouseSelect.bool = mode
-  end
-
-  def classicWordBreak
-    @classicWordBreak.bool
-  end
-  def classicWordBreak=(mode)
-    @classicWordBreak.bool = mode
-  end
-
-  def classicWrap
-    @classicWrap.bool
-  end
-  def classicWrap=(mode)
-    @classicWrap.bool = mode
-  end
-
-  def overwrite
-    @overwrite.bool
-  end
-  def overwrite=(mode)
-    @classic.bool = mode
-  end
-
-  def newWrapRegexp
-    @newWrapRegexp.value
-  end
-  def newWrapRegexp=(val)
-    @newWrapRegexp.value = val
-  end
-
-  def tcl_match_wordBreakAfter
-    @tcl_match_wordBreakAfter.value
-  end
-  def tcl_match_wordBreakAfter=(val)
-    @tcl_match_wordBreakAfter.value = val
-  end
-
-  def tcl_match_wordBreakBefore
-    @tcl_match_wordBreakBefore.value
-  end
-  def tcl_match_wordBreakBefore=(val)
-    @tcl_match_wordBreakBefore.value = val
-  end
-
-  def tcl_match_endOfWord
-    @tcl_match_endOfWord.value
-  end
-  def tcl_match_endOfWord=(val)
-    @tcl_match_endOfWord.value = val
-  end
-
-  def tcl_match_startOfNextWord
-    @tcl_match_startOfNextWord.value
-  end
-  def tcl_match_startOfNextWord=(val)
-    @tcl_match_startOfNextWord.value = val
-  end
-
-  def tcl_match_startOfPreviousWord
-    @tcl_match_startOfPreviousWord.value
-  end
-  def tcl_match_startOfPreviousWord=(val)
-    @tcl_match_startOfPreviousWord.value = val
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/panelframe.rb b/ext/tk/lib/tkextlib/tcllib/panelframe.rb
deleted file mode 100644
index 678d5d0a9a..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/panelframe.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/tcllib/panelframe.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-#   * Part of tcllib extension
-#   * Create PanelFrame widgets.
-#
-
-require 'tk'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('widget::panelframe', '1.0')
-TkPackage.require('widget::panelframe')
-
-module Tk::Tcllib
-  module Widget
-    class PanelFrame < TkWindow
-      PACKAGE_NAME = 'widget::panelframe'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('widget::panelframe')
-        rescue
-          ''
-        end
-      end
-    end
-    Panelframe = PanelFrame
-  end
-end
-
-class Tk::Tcllib::Widget::PanelFrame
-  TkCommandNames = ['::widget::panelframe'.freeze].freeze
-
-  def create_self(keys)
-    if keys and keys != None
-      tk_call_without_enc(self.class::TkCommandNames[0], @path,
-                          *hash_kv(keys, true))
-    else
-      tk_call_without_enc(self.class::TkCommandNames[0], @path)
-    end
-  end
-  private :create_self
-
-  def add(what, *args)
-    window(tk_send('add', *args))
-  end
-
-  #def get_frame
-  #  window(tk_send('getframe'))
-  #end
-
-  def set_widget(widget)
-    tk_send('setwidget', widget)
-    self
-  end
-
-  def remove(*wins)
-    tk_send('remove', *wins)
-    self
-  end
-  def remove_destroy(*wins)
-    tk_send('remove', '-destroy', *wins)
-    self
-  end
-
-  def delete(*wins)
-    tk_send('delete', *wins)
-    self
-  end
-
-  def items
-    simplelist(tk_send('items')).collect!{|w| window(w)}
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/plotchart.rb b/ext/tk/lib/tkextlib/tcllib/plotchart.rb
deleted file mode 100644
index 1817f9a791..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/plotchart.rb
+++ /dev/null
@@ -1,1405 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/tcllib/plotchart.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-#   * Part of tcllib extension
-#   * Simple plotting and charting package
-#
-# (The following is the original description of the library.)
-#
-# Plotchart is a Tcl-only package that focuses on the easy creation of
-# xy-plots, barcharts and other common types of graphical presentations.
-# The emphasis is on ease of use, rather than flexibility. The procedures
-# that create a plot use the entire canvas window, making the layout of the
-# plot completely automatic.
-#
-# This results in the creation of an xy-plot in, say, ten lines of code:
-# --------------------------------------------------------------------
-#    package require Plotchart
-#
-#    canvas .c -background white -width 400 -height 200
-#    pack   .c -fill both
-#
-#    #
-#    # Create the plot with its x- and y-axes
-#    #
-#    set s [::Plotchart::createXYPlot .c {0.0 100.0 10.0} {0.0 100.0 20.0}]
-#
-#    foreach {x y} {0.0 32.0 10.0 50.0 25.0 60.0 78.0 11.0 } {
-#        $s plot series1 $x $y
-#    }
-#
-#    $s title "Data series"
-# --------------------------------------------------------------------
-#
-# A drawback of the package might be that it does not do any data management.
-# So if the canvas that holds the plot is to be resized, the whole plot must
-# be redrawn. The advantage, though, is that it offers a number of plot and
-# chart types:
-#
-#    * XY-plots like the one shown above with any number of data series.
-#    * Stripcharts, a kind of XY-plots where the horizontal axis is adjusted
-#      automatically. The result is a kind of sliding window on the data
-#      series.
-#    * Polar plots, where the coordinates are polar instead of cartesian.
-#    * Isometric plots, where the scale of the coordinates in the two
-#      directions is always the same, i.e. a circle in world coordinates
-#      appears as a circle on the screen.
-#      You can zoom in and out, as well as pan with these plots (Note: this
-#      works best if no axes are drawn, the zooming and panning routines do
-#      not distinguish the axes), using the mouse buttons with the control
-#      key and the arrow keys with the control key.
-#    * Piecharts, with automatic scaling to indicate the proportions.
-#    * Barcharts, with either vertical or horizontal bars, stacked bars or
-#      bars side by side.
-#    * Timecharts, where bars indicate a time period and milestones or other
-#      important moments in time are represented by triangles.
-#    * 3D plots (both for displaying surfaces and 3D bars)
-#
-
-require 'tk'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('Plotchart', '0.9')
-# TkPackage.require('Plotchart', '1.1')
-# TkPackage.require('Plotchart', '1.6.3')
-TkPackage.require('Plotchart')
-
-module Tk
-  module Tcllib
-    module Plotchart
-      PACKAGE_NAME = 'Plotchart'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('Plotchart')
-        rescue
-          ''
-        end
-      end
-    end
-  end
-end
-
-module Tk::Tcllib::Plotchart
-  extend TkCore
-  ############################
-  def self.view_port(w, *args) # args := pxmin, pymin, pxmax, pymax
-    tk_call_without_enc('::Plotchart::viewPort', w.path, *(args.flatten))
-  end
-
-  def self.world_coordinates(w, *args) # args := xmin, ymin, xmax, ymax
-    tk_call_without_enc('::Plotchart::worldCoordinates',
-                        w.path, *(args.flatten))
-  end
-
-  def self.world_3D_coordinates(w, *args)
-    # args := xmin, ymin, zmin, xmax, ymax, zmax
-    tk_call_without_enc('::Plotchart::world3DCoordinates',
-                        w.path, *(args.flatten))
-  end
-
-  def self.coords_to_pixel(w, x, y)
-    list(tk_call_without_enc('::Plotchart::coordsToPixel', w.path, x, y))
-  end
-
-  def self.coords_3D_to_pixel(w, x, y, z)
-    list(tk_call_without_enc('::Plotchart::coords3DToPixel', w.path, x, y, z))
-  end
-
-  def self.plotconfig(*args)
-    case args.length
-    when 0, 1, 2
-      # 0: (no args) --> list of chat types
-      # 1: charttype --> list of components
-      # 2: charttype, component --> list of properties
-      simplelist(tk_call('::Plotchart::plotconfig', *args))
-    when 3
-      # 3: charttype, component, property --> current value
-      tk_call('::Plotchart::plotconfig', *args)
-    else
-      # 4: charttype, component, property, value : set new value
-      # 5+: Error on Tcl/Tk
-      tk_call('::Plotchart::plotconfig', *args)
-      nil
-    end
-  end
-
-  def self.plotpack(w, dir, *plots)
-    tk_call_without_enc('::Plotchart::plotpack', w.path, dir, *plots)
-    w
-  end
-
-  def self.polar_coordinates(w, radmax)
-    tk_call_without_enc('::Plotchart::polarCoordinates', w.path, radmax)
-  end
-
-  def self.polar_to_pixel(w, rad, phi)
-    list(tk_call_without_enc('::Plotchart::polarToPixel', w.path, rad, phi))
-  end
-
-  def self.pixel_to_coords(w, x, y)
-    list(tk_call_without_enc('::Plotchart::pixelToCoords', w.path, x, y))
-  end
-
-  def self.determine_scale(*args) # (xmin, xmax, inverted=false)
-    tk_call_without_enc('::Plotchart::determineScale', *args)
-  end
-
-  def self.set_zoom_pan(w)
-    tk_call_without_enc('::Plotchart::setZoomPan', w.path)
-  end
-
-  ############################
-  module ChartMethod
-    include TkCore
-
-    def title(str)
-      tk_call_without_enc(@chart, 'title', _get_eval_enc_str(str))
-      self
-    end
-
-    def save_plot(filename)
-      tk_call_without_enc(@chart, 'saveplot', filename)
-      self
-    end
-
-    def xtext(str)
-      tk_call_without_enc(@chart, 'xtext', _get_eval_enc_str(str))
-      self
-    end
-
-    def ytext(str)
-      tk_call_without_enc(@chart, 'ytext', _get_eval_enc_str(str))
-      self
-    end
-
-    def xconfig(key, value=None)
-      if key.kind_of?(Hash)
-        tk_call_without_enc(@chart, 'xconfig', *hash_kv(key, true))
-      else
-        tk_call(@chart, 'xconfig', "-#{key}",value)
-      end
-      self
-    end
-
-    def yconfig(key, value=None)
-      if key.kind_of?(Hash)
-        tk_call_without_enc(@chart, 'yconfig', *hash_kv(key, true))
-      else
-        tk_call(@chart, 'yconfig', "-#{key}", value)
-      end
-      self
-    end
-
-    def background(part, color_or_image, dir)
-      tk_call_without_enc(@chart, 'background',
-                          part, color_or_image, dir)
-      self
-    end
-
-    def xticklines(color=None)
-      tk_call(@chart, 'xticklines', color)
-      self
-    end
-
-    def yticklines(color=None)
-      tk_call(@chart, 'yticklines', color)
-      self
-    end
-
-    def legendconfig(key, value=None)
-      if key.kind_of?(Hash)
-        tk_call_without_enc(@chart, 'legendconfig', *hash_kv(key, true))
-      else
-        tk_call(@chart, 'legendconfig', "-#{key}", value)
-      end
-      self
-    end
-
-    def legend(series, text)
-      tk_call_without_enc(@chart, 'legend',
-                          _get_eval_enc_str(series), _get_eval_enc_str(text))
-      self
-    end
-
-    def balloon(*args) # args => (x, y, text, dir) or ([x, y], text, dir)
-      if args[0].kind_of?(Array)
-        # args => ([x, y], text, dir)
-        x, y = args.shift
-      else
-        # args => (x, y, text, dir)
-        x = args.shift
-        y = args.shift
-      end
-
-      text, dir = args
-
-      tk_call_without_enc(@chart, 'balloon', x, y,
-                          _get_eval_enc_str(text), dir)
-      self
-    end
-
-    def balloonconfig(key, value=None)
-      if key.kind_of?(Hash)
-        tk_call_without_enc(@chart, 'balloonconfig', *hash_kv(key, true))
-      else
-        tk_call(@chart, 'balloonconfig', "-#{key}", value)
-      end
-    end
-
-    def plaintext(*args) # args => (x, y, text, dir) or ([x, y], text, dir)
-      if args[0].kind_of?(Array)
-        # args => ([x, y], text, dir)
-        x, y = args.shift
-      else
-        # args => (x, y, text, dir)
-        x = args.shift
-        y = args.shift
-      end
-
-      text, dir = args
-
-      tk_call_without_enc(@chart, 'plaintext', x, y,
-                          _get_eval_enc_str(text), dir)
-      self
-    end
-
-    ############################
-
-    def view_port(*args) # args := pxmin, pymin, pxmax, pymax
-      tk_call_without_enc('::Plotchart::viewPort', @path, *(args.flatten))
-      self
-    end
-
-    def world_coordinates(*args) # args := xmin, ymin, xmax, ymax
-      tk_call_without_enc('::Plotchart::worldCoordinates',
-                          @path, *(args.flatten))
-      self
-    end
-
-    def world_3D_coordinates(*args)
-      # args := xmin, ymin, zmin, xmax, ymax, zmax
-      tk_call_without_enc('::Plotchart::world3DCoordinates',
-                          @path, *(args.flatten))
-      self
-    end
-
-    def coords_to_pixel(x, y)
-      list(tk_call_without_enc('::Plotchart::coordsToPixel', @path, x, y))
-    end
-
-    def coords_3D_to_pixel(x, y, z)
-      list(tk_call_without_enc('::Plotchart::coords3DToPixel', @path, x, y, z))
-    end
-
-    def plotpack(dir, *plots)
-      tk_call_without_enc('::Plotchart::plotpack', @path, dir, *plots)
-      self
-    end
-
-    def polar_coordinates(radmax)
-      tk_call_without_enc('::Plotchart::polarCoordinates', @path, radmax)
-      self
-    end
-
-    def polar_to_pixel(rad, phi)
-      list(tk_call_without_enc('::Plotchart::polarToPixel', @path, rad, phi))
-    end
-
-    def pixel_to_coords(x, y)
-      list(tk_call_without_enc('::Plotchart::pixelToCoords', @path, x, y))
-    end
-
-    def determine_scale(xmax, ymax)
-      tk_call_without_enc('::Plotchart::determineScale', @path, xmax, ymax)
-      self
-    end
-
-    def set_zoom_pan()
-      tk_call_without_enc('::Plotchart::setZoomPan', @path)
-      self
-    end
-  end
-
-  ############################
-  class XYPlot < Tk::Canvas
-    include ChartMethod
-
-    TkCommandNames = [
-      'canvas'.freeze,
-      '::Plotchart::createXYPlot'.freeze
-    ].freeze
-
-    def initialize(*args) # args := ([parent,] xaxis, yaxis [, keys])
-                          # xaxis := Array of [minimum, maximum, stepsize]
-                          # yaxis := Array of [minimum, maximum, stepsize]
-      if args[0].kind_of?(Array)
-        @xaxis = args.shift
-        @yaxis = args.shift
-
-        super(*args) # create canvas widget
-      else
-        parent = args.shift
-
-        @xaxis = args.shift
-        @yaxis = args.shift
-
-        if parent.kind_of?(Tk::Canvas)
-          @path = parent.path
-        else
-          super(parent, *args) # create canvas widget
-        end
-      end
-
-      @chart = _create_chart
-    end
-
-    def _create_chart
-      p self.class::TkCommandNames[1] if $DEBUG
-      tk_call_without_enc(self.class::TkCommandNames[1], @path,
-                          array2tk_list(@xaxis), array2tk_list(@yaxis))
-    end
-    private :_create_chart
-
-    def __destroy_hook__
-      Tk::Tcllib::Plotchart::PlotSeries::SeriesID_TBL.mutex.synchronize{
-        Tk::Tcllib::Plotchart::PlotSeries::SeriesID_TBL.delete(@path)
-      }
-    end
-
-    def plot(series, x, y)
-      tk_call_without_enc(@chart, 'plot', _get_eval_enc_str(series), x, y)
-      self
-    end
-
-    def contourlines(xcrd, ycrd, vals, clss=None)
-      xcrd = array2tk_list(xcrd) if xcrd.kind_of?(Array)
-      ycrd = array2tk_list(ycrd) if ycrd.kind_of?(Array)
-      vals = array2tk_list(vals) if vals.kind_of?(Array)
-      clss = array2tk_list(clss) if clss.kind_of?(Array)
-
-      tk_call(@chart, 'contourlines', xcrd, ycrd, vals, clss)
-      self
-    end
-
-    def contourfill(xcrd, ycrd, vals, clss=None)
-      xcrd = array2tk_list(xcrd) if xcrd.kind_of?(Array)
-      ycrd = array2tk_list(ycrd) if ycrd.kind_of?(Array)
-      vals = array2tk_list(vals) if vals.kind_of?(Array)
-      clss = array2tk_list(clss) if clss.kind_of?(Array)
-
-      tk_call(@chart, 'contourfill', xcrd, ycrd, vals, clss)
-      self
-    end
-
-    def contourbox(xcrd, ycrd, vals, clss=None)
-      xcrd = array2tk_list(xcrd) if xcrd.kind_of?(Array)
-      ycrd = array2tk_list(ycrd) if ycrd.kind_of?(Array)
-      vals = array2tk_list(vals) if vals.kind_of?(Array)
-      clss = array2tk_list(clss) if clss.kind_of?(Array)
-
-      tk_call(@chart, 'contourbox', xcrd, ycrd, vals, clss)
-      self
-    end
-
-    def color_map(colors)
-      colors = array2tk_list(colors) if colors.kind_of?(Array)
-
-      tk_call_without_enc(@chart, 'colorMap', colors)
-      self
-    end
-
-    def grid_cells(xcrd, ycrd)
-      xcrd = array2tk_list(xcrd) if xcrd.kind_of?(Array)
-      ycrd = array2tk_list(ycrd) if ycrd.kind_of?(Array)
-
-      tk_call_without_enc(@chart, 'grid', xcrd, ycrd)
-      self
-    end
-
-    def dataconfig(series, key, value=None)
-      if key.kind_of?(Hash)
-        tk_call_without_enc(@chart, 'dataconfig', series, *hash_kv(key, true))
-      else
-        tk_call(@chart, 'dataconfig', series, "-#{key}", value)
-      end
-    end
-
-    def rescale(xscale, yscale) # xscale|yscale => [newmin, newmax, newstep]
-      tk_call_without_enc(@chart, 'rescale', xscale, yscale)
-      self
-    end
-
-    def trend(series, xcrd, ycrd)
-      tk_call_without_enc(@chart, 'trend',
-                          _get_eval_enc_str(series), xcrd, ycrd)
-      self
-    end
-
-    def rchart(series, xcrd, ycrd)
-      tk_call_without_enc(@chart, 'rchart',
-                          _get_eval_enc_str(series), xcrd, ycrd)
-      self
-    end
-
-    def interval(series, xcrd, ymin, ymax, ycenter=None)
-      tk_call(@chart, 'interval', series, xcrd, ymin, ymax, ycenter)
-      self
-    end
-
-    def box_and_whiskers(series, xcrd, ycrd)
-      tk_call_without_enc(@chart, 'box-and-whiskers',
-                          _get_eval_enc_str(series), xcrd, ycrd)
-      self
-    end
-    alias box_whiskers box_and_whiskers
-
-    def vectorconfig(series, key, value=None)
-      if key.kind_of?(Hash)
-        tk_call_without_enc(@chart, 'vectorconfig',
-                            _get_eval_enc_str(series), *hash_kv(key, true))
-      else
-        tk_call(@chart, 'vectorconfig', series, "-#{key}", value)
-      end
-      self
-    end
-
-    def vector(series, xcrd, ycrd, ucmp, vcmp)
-      tk_call_without_enc(@chart, 'vector', _get_eval_enc_str(series),
-                          xcrd, ycrd, ucmp, vcmp)
-      self
-    end
-
-    def dotconfig(series, key, value=None)
-      if key.kind_of?(Hash)
-        tk_call_without_enc(@chart, 'dotconfig',
-                            _get_eval_enc_str(series), *hash_kv(key, true))
-      else
-        tk_call(@chart, 'dotconfig', series, "-#{key}", value)
-      end
-      self
-    end
-
-    def dot(series, xcrd, ycrd, value)
-      tk_call_without_enc(@chart, 'dot', _get_eval_enc_str(series),
-                          xcrd, ycrd, value)
-      self
-    end
-  end
-
-  ############################
-  class Stripchart < XYPlot
-    TkCommandNames = [
-      'canvas'.freeze,
-      '::Plotchart::createStripchart'.freeze
-    ].freeze
-  end
-
-  ############################
-  class TXPlot < XYPlot
-    TkCommandNames = [
-      'canvas'.freeze,
-      '::Plotchart::createTXPlot'.freeze
-    ].freeze
-  end
-
-  ############################
-  class XLogYPlot < XYPlot
-    TkCommandNames = [
-      'canvas'.freeze,
-      '::Plotchart::createXLogYPlot'.freeze
-    ].freeze
-  end
-
-  ############################
-  class Histogram < XYPlot
-    TkCommandNames = [
-      'canvas'.freeze,
-      '::Plotchart::createHistogram'.freeze
-    ].freeze
-  end
-
-  ############################
-  class PolarPlot < Tk::Canvas
-    include ChartMethod
-
-    TkCommandNames = [
-      'canvas'.freeze,
-      '::Plotchart::createPolarplot'.freeze
-    ].freeze
-
-    def initialize(*args) # args := ([parent,] radius_data [, keys])
-                          # radius_data := Array of [maximum_radius, stepsize]
-      if args[0].kind_of?(Array)
-        @radius_data = args.shift
-
-        super(*args) # create canvas widget
-      else
-        parent = args.shift
-
-        @radius_data = args.shift
-
-        if parent.kind_of?(Tk::Canvas)
-          @path = parent.path
-        else
-          super(parent, *args) # create canvas widget
-        end
-      end
-
-      @chart = _create_chart
-    end
-
-    def _create_chart
-      p self.class::TkCommandNames[1] if $DEBUG
-      tk_call_without_enc(self.class::TkCommandNames[1], @path,
-                          array2tk_list(@radius_data))
-    end
-    private :_create_chart
-
-    def __destroy_hook__
-      Tk::Tcllib::Plotchart::PlotSeries::SeriesID_TBL.mutex.synchronize{
-        Tk::Tcllib::Plotchart::PlotSeries::SeriesID_TBL.delete(@path)
-      }
-    end
-
-    def plot(series, radius, angle)
-      tk_call_without_enc(@chart, 'plot', _get_eval_enc_str(series),
-                          radius, angle)
-      self
-    end
-
-    def dataconfig(series, key, value=None)
-      if key.kind_of?(Hash)
-        tk_call_without_enc(@chart, 'dataconfig', _get_eval_enc_str(series),
-                            *hash_kv(key, true))
-      else
-        tk_call(@chart, 'dataconfig', series, "-#{key}", value)
-      end
-    end
-  end
-  Polarplot = PolarPlot
-
-  ############################
-  class IsometricPlot < Tk::Canvas
-    include ChartMethod
-
-    TkCommandNames = [
-      'canvas'.freeze,
-      '::Plotchart::createIsometricPlot'.freeze
-    ].freeze
-
-    def initialize(*args) # args := ([parent,] xaxis, yaxis, [, step] [, keys])
-                          # xaxis := Array of [minimum, maximum]
-                          # yaxis := Array of [minimum, maximum]
-                          # step := Float of stepsize | "noaxes" | :noaxes
-      if args[0].kind_of?(Array)
-        @xaxis = args.shift
-        @yaxis = args.shift
-
-        if args[0].kind_of?(Hash)
-          @stepsize = :noaxes
-        else
-          @stepsize = args.shift
-        end
-
-        super(*args) # create canvas widget
-      else
-        parent = args.shift
-
-        @xaxis = args.shift
-        @yaxis = args.shift
-
-        if args[0].kind_of?(Hash)
-          @stepsize = :noaxes
-        else
-          @stepsize = args.shift
-        end
-
-        if parent.kind_of?(Tk::Canvas)
-          @path = parent.path
-        else
-          super(parent, *args) # create canvas widget
-        end
-      end
-
-      @chart = _create_chart
-    end
-
-    def _create_chart
-      p self.class::TkCommandNames[1] if $DEBUG
-      tk_call_without_enc(self.class::TkCommandNames[1], @path,
-                          array2tk_list(@xaxis), array2tk_list(@yaxis),
-                          @stepsize)
-    end
-    private :_create_chart
-
-    def plot(type, *args)
-      self.__send__("plot_#{type.to_s.tr('-', '_')}", *args)
-    end
-
-    def plot_rectangle(*args) # args := x1, y1, x2, y2, color
-      tk_call_without_enc(@chart, 'plot', 'rectangle', *(args.flatten))
-      self
-    end
-
-    def plot_filled_rectangle(*args) # args := x1, y1, x2, y2, color
-      tk_call_without_enc(@chart, 'plot', 'filled-rectangle', *(args.flatten))
-      self
-    end
-
-    def plot_circle(*args) # args := xc, yc, radius, color
-      tk_call_without_enc(@chart, 'plot', 'circle', *(args.flatten))
-      self
-    end
-
-    def plot_filled_circle(*args) # args := xc, yc, radius, color
-      tk_call_without_enc(@chart, 'plot', 'filled-circle', *(args.flatten))
-      self
-    end
-  end
-  Isometricplot = IsometricPlot
-
-  ############################
-  class Plot3D < Tk::Canvas
-    include ChartMethod
-
-    TkCommandNames = [
-      'canvas'.freeze,
-      '::Plotchart::create3DPlot'.freeze
-    ].freeze
-
-    def initialize(*args) # args := ([parent,] xaxis, yaxis, zaxis [, keys])
-                          # xaxis := Array of [minimum, maximum, stepsize]
-                          # yaxis := Array of [minimum, maximum, stepsize]
-                          # zaxis := Array of [minimum, maximum, stepsize]
-      if args[0].kind_of?(Array)
-        @xaxis = args.shift
-        @yaxis = args.shift
-        @zaxis = args.shift
-
-        super(*args) # create canvas widget
-      else
-        parent = args.shift
-
-        @xaxis = args.shift
-        @yaxis = args.shift
-        @zaxis = args.shift
-
-        if parent.kind_of?(Tk::Canvas)
-          @path = parent.path
-        else
-          super(parent, *args) # create canvas widget
-        end
-      end
-
-      @chart = _create_chart
-    end
-
-    def _create_chart
-      p self.class::TkCommandNames[1] if $DEBUG
-      tk_call_without_enc(self.class::TkCommandNames[1], @path,
-                          array2tk_list(@xaxis),
-                          array2tk_list(@yaxis),
-                          array2tk_list(@zaxis))
-    end
-    private :_create_chart
-
-    def plot_function(cmd=Proc.new)
-      Tk.ip_eval("proc #{@path}_#{@chart} {x y} {#{install_cmd(cmd)} $x $y}")
-      tk_call_without_enc(@chart, 'plotfunc', "#{@path}_#{@chart}")
-      self
-    end
-
-    def plot_funcont(conts, cmd=Proc.new)
-      conts = array2tk_list(conts) if conts.kind_of?(Array)
-      Tk.ip_eval("proc #{@path}_#{@chart} {x y} {#{install_cmd(cmd)} $x $y}")
-      tk_call_without_enc(@chart, 'plotfuncont', "#{@path}_#{@chart}", conts)
-      self
-    end
-
-    def grid_size(nxcells, nycells)
-      tk_call_without_enc(@chart, 'gridsize', nxcells, nycells)
-      self
-    end
-
-    def plot_line(dat, color)
-      # dat has to be provided as a 2 level array.
-      # 1st level contains rows, drawn in y-direction,
-      # and each row is an array whose elements are drawn in x-direction,
-      # for the columns.
-      tk_call_without_enc(@chart, 'plotline', dat, color)
-      self
-    end
-
-    def plot_data(dat)
-      # dat has to be provided as a 2 level array.
-      # 1st level contains rows, drawn in y-direction,
-      # and each row is an array whose elements are drawn in x-direction,
-      # for the columns.
-      tk_call_without_enc(@chart, 'plotdata', dat)
-      self
-    end
-
-    def zconfig(key, value=None)
-      if key.kind_of?(Hash)
-        tk_call_without_enc(@chart, 'zconfig', *hash_kv(key, true))
-      else
-        tk_call(@chart, 'zconfig', "-#{key}", value)
-      end
-      self
-    end
-
-    def colour(fill, border)
-      # configure the colours to use for polygon borders and inner area
-      tk_call_without_enc(@chart, 'colour', fill, border)
-      self
-    end
-    alias colours colour
-    alias colors  colour
-    alias color   colour
-  end
-
-  ############################
-  class Barchart3D < Tk::Canvas
-    include ChartMethod
-
-    TkCommandNames = [
-      'canvas'.freeze,
-      '::Plotchart::create3DBarchart'.freeze
-    ].freeze
-
-    def initialize(*args) # args := ([parent,] yaxis, nobars [, keys])
-                          # yaxis  := Array of [minimum, maximum, stepsize]
-                          # nobars := number of bars
-      if args[0].kind_of?(Array)
-        @yaxis = args.shift
-        @nobars = args.shift
-
-        super(*args) # create canvas widget
-      else
-        parent = args.shift
-
-        @yaxis = args.shift
-        @nobars = args.shift
-
-        if parent.kind_of?(Tk::Canvas)
-          @path = parent.path
-        else
-          super(parent, *args) # create canvas widget
-        end
-      end
-
-      @chart = _create_chart
-    end
-
-    def _create_chart
-      p self.class::TkCommandNames[1] if $DEBUG
-      tk_call_without_enc(self.class::TkCommandNames[1], @path,
-                          array2tk_list(@yaxis), @nobars)
-    end
-    private :_create_chart
-
-    def plot(label, yvalue, color)
-      tk_call_without_enc(@chart, 'plot', _get_eval_enc_str(label),
-                          _get_eval_enc_str(yvalue), color)
-      self
-    end
-
-    def config(key, value=None)
-      if key.kind_of?(Hash)
-        tk_call_without_enc(@chart, 'config', *hash_kv(key, true))
-      else
-        tk_call(@chart, 'config', "-#{key}", value)
-      end
-      self
-    end
-  end
-
-  ############################
-  class RibbonChart3D < Tk::Canvas
-    include ChartMethod
-
-    TkCommandNames = [
-      'canvas'.freeze,
-      '::Plotchart::create3DRibbonChart'.freeze
-    ].freeze
-
-    def initialize(*args) # args := ([parent,] names, yaxis, zaxis [, keys])
-                          # names := Array of the series
-                          # yaxis := Array of [minimum, maximum, stepsize]
-                          # zaxis := Array of [minimum, maximum, stepsize]
-      if args[0].kind_of?(Array)
-        @names = args.shift
-        @yaxis = args.shift
-        @zaxis = args.shift
-
-        super(*args) # create canvas widget
-      else
-        parent = args.shift
-
-        @names = args.shift
-        @yaxis = args.shift
-        @zaxis = args.shift
-
-        if parent.kind_of?(Tk::Canvas)
-          @path = parent.path
-        else
-          super(parent, *args) # create canvas widget
-        end
-      end
-
-      @chart = _create_chart
-    end
-
-    def _create_chart
-      p self.class::TkCommandNames[1] if $DEBUG
-      tk_call_without_enc(self.class::TkCommandNames[1], @path,
-                          array2tk_list(@names),
-                          array2tk_list(@yaxis),
-                          array2tk_list(@zaxis))
-    end
-    private :_create_chart
-
-    def line(*args) # xypairs, color
-      color = args.pop # last argument is a color
-      xypairs = TkComm.slice_ary(args.flatten, 2) # regenerate xypairs
-      tk_call_without_enc(@chart, 'line', xypairs, color)
-      self
-    end
-
-    def area(*args) # xypairs, color
-      color = args.pop # last argument is a color
-      xypairs = TkComm.slice_ary(args.flatten, 2) # regenerate xypairs
-      tk_call_without_enc(@chart, 'area', xypairs, color)
-      self
-    end
-
-    def zconfig(key, value=None)
-      if key.kind_of?(Hash)
-        tk_call_without_enc(@chart, 'zconfig', *hash_kv(key, true))
-      else
-        tk_call(@chart, 'zconfig',"-#{key}", value)
-      end
-      self
-    end
-  end
-
-
-  ############################
-  class Piechart < Tk::Canvas
-    include ChartMethod
-
-    TkCommandNames = [
-      'canvas'.freeze,
-      '::Plotchart::createPiechart'.freeze
-    ].freeze
-
-    def initialize(*args) # args := ([parent] [, keys])
-      if args[0].kind_of?(Tk::Canvas)
-        parent = args.shift
-        @path = parent.path
-      else
-        super(*args) # create canvas widget
-      end
-      @chart = _create_chart
-    end
-
-    def _create_chart
-      p self.class::TkCommandNames[1] if $DEBUG
-      tk_call_without_enc(self.class::TkCommandNames[1], @path)
-    end
-    private :_create_chart
-
-    def plot(*dat)  # argument is a list of [label, value]
-      tk_call(@chart, 'plot', dat.flatten)
-      self
-    end
-
-    def colours(*list)
-      tk_call_without_enc(@chart, 'colours', *list)
-      self
-    end
-    alias colors  colours
-  end
-
-
-  ############################
-  class Radialchart < Tk::Canvas
-    include ChartMethod
-
-    TkCommandNames = [
-      'canvas'.freeze,
-      '::Plotchart::createRadialchart'.freeze
-    ].freeze
-
-    def initialize(*args) # args := ([parent,] names, scale, style [, keys])
-                          # radius_data := Array of [maximum_radius, stepsize]
-      if args[0].kind_of?(Array)
-        @names = args.shift
-        @scale = args.shift
-        @style = args.shift
-
-        super(*args) # create canvas widget
-      else
-        parent = args.shift
-
-        @names = args.shift
-        @scale = args.shift
-        @style = args.shift
-
-        if parent.kind_of?(Tk::Canvas)
-          @path = parent.path
-        else
-          super(parent, *args) # create canvas widget
-        end
-      end
-
-      @chart = _create_chart
-    end
-
-    def _create_chart
-      p self.class::TkCommandNames[1] if $DEBUG
-      tk_call_without_enc(self.class::TkCommandNames[1], @path,
-                          array2tk_list(@names), @scale, @style)
-    end
-    private :_create_chart
-
-    def __destroy_hook__
-      Tk::Tcllib::Plotchart::PlotSeries::SeriesID_TBL.mutex.synchronize{
-        Tk::Tcllib::Plotchart::PlotSeries::SeriesID_TBL.delete(@path)
-      }
-    end
-
-    def plot(data, color, thickness)
-      tk_call_without_enc(@chart, 'plot', _get_eval_enc_str(data),
-                          color, thickness)
-      self
-    end
-
-    def colours(*list)
-      tk_call_without_enc(@chart, 'colours', *list)
-      self
-    end
-    alias colors  colours
-  end
-
-  ############################
-  class Barchart < Tk::Canvas
-    include ChartMethod
-
-    TkCommandNames = [
-      'canvas'.freeze,
-      '::Plotchart::createBarchart'.freeze
-    ].freeze
-
-    def initialize(*args)
-      # args := ([parent,] xlabels, ylabels [, series] [, keys])
-      # xlabels, ylabels := labels | axis ( depend on normal or horizontal )
-      # labels := Array of [label, label, ...]
-      #   (It determines the number of bars that will be plotted per series.)
-      # axis := Array of [minimum, maximum, stepsize]
-      # series := Integer number of data series | 'stacked' | :stacked
-      if args[0].kind_of?(Array)
-        @xlabels = args.shift
-        @ylabels  = args.shift
-
-        if args[0].kind_of?(Hash)
-          @series_size = :stacked
-        else
-          @series_size  = args.shift
-        end
-
-        super(*args) # create canvas widget
-      else
-        parent = args.shift
-
-        @xlabels = args.shift
-        @ylabels = args.shift
-
-        if args[0].kind_of?(Hash)
-          @series_size = :stacked
-        else
-          @series_size  = args.shift
-        end
-
-        if parent.kind_of?(Tk::Canvas)
-          @path = parent.path
-        else
-          super(parent, *args) # create canvas widget
-        end
-      end
-
-      @chart = _create_chart
-    end
-
-    def _create_chart
-      p self.class::TkCommandNames[1] if $DEBUG
-      tk_call_without_enc(self.class::TkCommandNames[1], @path,
-                          array2tk_list(@xlabels), array2tk_list(@ylabels),
-                          @series_size)
-    end
-    private :_create_chart
-
-    def __destroy_hook__
-      Tk::Tcllib::Plotchart::PlotSeries::SeriesID_TBL.mutex.synchronize{
-        Tk::Tcllib::Plotchart::PlotSeries::SeriesID_TBL.delete(@path)
-      }
-    end
-
-    def plot(series, dat, col=None)
-      tk_call(@chart, 'plot', series, dat, col)
-      self
-    end
-
-    def colours(*cols)
-      # set the colours to be used
-      tk_call(@chart, 'colours', *cols)
-      self
-    end
-    alias colour colours
-    alias colors colours
-    alias color  colours
-  end
-
-  ############################
-  class HorizontalBarchart < Barchart
-    TkCommandNames = [
-      'canvas'.freeze,
-      '::Plotchart::createHorizontalBarchart'.freeze
-    ].freeze
-  end
-
-  ############################
-  class Boxplot < Tk::Canvas
-    include ChartMethod
-
-    TkCommandNames = [
-      'canvas'.freeze,
-      '::Plotchart::createBoxplot'.freeze
-    ].freeze
-
-    def initialize(*args) # args := ([parent,] xaxis, ylabels [, keys])
-                          # xaxis := Array of [minimum, maximum, stepsize]
-                          # yaxis := List of labels for the y-axis
-      if args[0].kind_of?(Array)
-        @xaxis   = args.shift
-        @ylabels = args.shift
-
-        super(*args) # create canvas widget
-      else
-        parent = args.shift
-
-        @xaxis   = args.shift
-        @ylabels = args.shift
-
-        if parent.kind_of?(Tk::Canvas)
-          @path = parent.path
-        else
-          super(parent, *args) # create canvas widget
-        end
-      end
-
-      @chart = _create_chart
-    end
-
-    def _create_chart
-      p self.class::TkCommandNames[1] if $DEBUG
-      tk_call_without_enc(self.class::TkCommandNames[1], @path,
-                          array2tk_list(@xaxis), array2tk_list(@ylabels))
-    end
-    private :_create_chart
-
-    def __destroy_hook__
-      Tk::Tcllib::Plotchart::PlotSeries::SeriesID_TBL.mutex.synchronize{
-        Tk::Tcllib::Plotchart::PlotSeries::SeriesID_TBL.delete(@path)
-      }
-    end
-
-    def plot(label, *values)
-      tk_call(@chart, 'plot', label, values.flatten)
-      self
-    end
-  end
-
-  ############################
-  class RightAxis < Tk::Canvas
-    include ChartMethod
-
-    TkCommandNames = [
-      'canvas'.freeze,
-      '::Plotchart::createRightAxis'.freeze
-    ].freeze
-
-    def initialize(*args) # args := ([parent,] yaxis [, keys])
-                          # yaxis := Array of [minimum, maximum, stepsize]
-      if args[0].kind_of?(Array)
-        @yaxis   = args.shift
-
-        super(*args) # create canvas widget
-      else
-        parent = args.shift
-
-        @yaxis   = args.shift
-
-        if parent.kind_of?(Tk::Canvas)
-          @path = parent.path
-        else
-          super(parent, *args) # create canvas widget
-        end
-      end
-
-      @chart = _create_chart
-    end
-
-    def _create_chart
-      p self.class::TkCommandNames[1] if $DEBUG
-      tk_call_without_enc(self.class::TkCommandNames[1], @path,
-                          array2tk_list(@yaxis))
-    end
-    private :_create_chart
-
-    def __destroy_hook__
-      Tk::Tcllib::Plotchart::PlotSeries::SeriesID_TBL.mutex.synchronize{
-        Tk::Tcllib::Plotchart::PlotSeries::SeriesID_TBL.delete(@path)
-      }
-    end
-  end
-
-  ############################
-  class Timechart < Tk::Canvas
-    include ChartMethod
-
-    TkCommandNames = [
-      'canvas'.freeze,
-      '::Plotchart::createTimechart'.freeze
-    ].freeze
-
-    def initialize(*args)
-      # args := ([parent,] time_begin, time_end, items [, keys])
-      # time_begin := String of time format (e.g. "1 january 2004")
-      # time_end   := String of time format (e.g. "1 january 2004")
-      # items := Expected/maximum number of items
-      #          ( This determines the vertical spacing. )
-      if args[0].kind_of?(String)
-        @time_begin = args.shift
-        @time_end   = args.shift
-        @items      = args.shift
-
-        super(*args) # create canvas widget
-      else
-        parent = args.shift
-
-        @time_begin = args.shift
-        @time_end   = args.shift
-        @items      = args.shift
-
-        if parent.kind_of?(Tk::Canvas)
-          @path = parent.path
-        else
-          super(parent, *args) # create canvas widget
-        end
-      end
-
-      @chart = _create_chart
-    end
-
-    def _create_chart
-      p self.class::TkCommandNames[1] if $DEBUG
-      tk_call_without_enc(self.class::TkCommandNames[1], @path,
-                          @time_begin, @time_end, @items)
-    end
-    private :_create_chart
-
-    def period(txt, time_begin, time_end, col=None)
-      tk_call(@chart, 'period', txt, time_begin, time_end, col)
-      self
-    end
-
-    def milestone(txt, time, col=None)
-      tk_call(@chart, 'milestone', txt, time, col)
-      self
-    end
-
-    def vertline(txt, time)
-      tk_call(@chart, 'vertline', txt, time)
-      self
-    end
-
-    def hscroll=(scr)
-      tk_call_without_enc(@chart, 'hscroll', scr)
-      scr
-    end
-    def hscroll(scr)
-      tk_call_without_enc(@chart, 'hscroll', scr)
-      self
-    end
-
-    def vscroll=(scr)
-      tk_call_without_enc(@chart, 'vscroll', scr)
-      scr
-    end
-    def vscroll(scr)
-      tk_call_without_enc(@chart, 'vscroll', scr)
-      self
-    end
-  end
-
-  ############################
-  class Ganttchart < Tk::Canvas
-    include ChartMethod
-
-    TkCommandNames = [
-      'canvas'.freeze,
-      '::Plotchart::createGanttchart'.freeze
-    ].freeze
-
-    def initialize(*args)
-      # args := ([parent,] time_begin, time_end, items [, text_width] [, keys])
-      # time_begin := String of time format (e.g. "1 january 2004")
-      # time_end   := String of time format (e.g. "1 january 2004")
-      # args := Expected/maximum number of items
-      #          ( This determines the vertical spacing. ),
-      #         Expected/maximum width of items,
-      #         Option Hash ( { key=>value, ... } )
-      if args[0].kind_of?(String)
-        @time_begin = args.shift
-        @time_end   = args.shift
-        @args  = args
-
-        super(*args) # create canvas widget
-      else
-        parent = args.shift
-
-        @time_begin = args.shift
-        @time_end   = args.shift
-        @args  = args
-
-        if parent.kind_of?(Tk::Canvas)
-          @path = parent.path
-        else
-          super(parent, *args) # create canvas widget
-        end
-      end
-
-      @chart = _create_chart
-    end
-
-    def _create_chart
-      p self.class::TkCommandNames[1] if $DEBUG
-      tk_call(self.class::TkCommandNames[1], @path,
-              @time_begin, @time_end, *args)
-    end
-    private :_create_chart
-
-    def task(txt, time_begin, time_end, completed=0.0)
-      list(tk_call(@chart, 'task', txt, time_begin, time_end,
-                   completed)).collect!{|id|
-        TkcItem.id2obj(self, id)
-      }
-    end
-
-    def milestone(txt, time, col=None)
-      tk_call(@chart, 'milestone', txt, time, col)
-      self
-    end
-
-    def vertline(txt, time)
-      tk_call(@chart, 'vertline', txt, time)
-      self
-    end
-
-    def connect(from_task, to_task)
-      from_task = array2tk_list(from_task) if from_task.kind_of?(Array)
-      to_task   = array2tk_list(to_task)   if to_task.kind_of?(Array)
-
-      tk_call(@chart, 'connect', from_task, to_task)
-      self
-    end
-
-    def summary(txt, tasks)
-      tasks = array2tk_list(tasks) if tasks.kind_of?(Array)
-      tk_call(@chart, 'summary', tasks)
-      self
-    end
-
-    def color_of_part(keyword, newcolor)
-      tk_call(@chart, 'color', keyword, newcolor)
-      self
-    end
-
-    def font_of_part(keyword, newfont)
-      tk_call(@chart, 'font', keyword, newfont)
-      self
-    end
-
-    def hscroll=(scr)
-      tk_call_without_enc(@chart, 'hscroll', scr)
-      scr
-    end
-    def hscroll(scr)
-      tk_call_without_enc(@chart, 'hscroll', scr)
-      self
-    end
-
-    def vscroll=(scr)
-      tk_call_without_enc(@chart, 'vscroll', scr)
-      scr
-    end
-    def vscroll(scr)
-      tk_call_without_enc(@chart, 'vscroll', scr)
-      self
-    end
-  end
-
-  ############################
-  class PlotSeries < TkObject
-    SeriesID_TBL = TkCore::INTERP.create_table
-
-    (Series_ID = ['series'.freeze, TkUtil.untrust('00000')]).instance_eval{
-      @mutex = Mutex.new
-      def mutex; @mutex; end
-      freeze
-    }
-    TkCore::INTERP.init_ip_env{
-      SeriesID_TBL.mutex.synchronize{ SeriesID_TBL.clear }
-    }
-
-    def self.id2obj(chart, id)
-      path = chart.path
-      SeriesID_TBL.mutex.synchronize{
-        if SeriesID_TBL[path]
-          SeriesID_TBL[path][id]? SeriesID_TBL[path][id]: id
-        else
-          id
-        end
-      }
-    end
-
-    def initialize(chart, keys=nil)
-      @parent = @chart_obj = chart
-      @ppath = @chart_obj.path
-      Series_ID.mutex.synchronize{
-        @path = @series = @id = Series_ID.join(TkCore::INTERP._ip_id_)
-        Series_ID[1].succ!
-      }
-      SeriesID_TBL.mutex.synchronize{
-        SeriesID_TBL[@ppath] ||= {}
-        SeriesID_TBL[@ppath][@id] = self
-      }
-      dataconfig(keys) if keys.kind_of?(Hash)
-    end
-
-    def plot(*args)
-      @chart_obj.plot(@series, *args)
-    end
-
-    def dataconfig(key, value=None)
-      @chart_obj.dataconfig(@series, key, value)
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/ruler.rb b/ext/tk/lib/tkextlib/tcllib/ruler.rb
deleted file mode 100644
index f57b0b0e1a..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/ruler.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/tcllib/ruler.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-#   * Part of tcllib extension
-#   * ruler widget
-#
-
-require 'tk'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('widget::ruler', '1.0')
-TkPackage.require('widget::ruler')
-
-module Tk::Tcllib
-  module Widget
-    class Ruler < TkWindow
-      PACKAGE_NAME = 'widget::ruler'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('widget::ruler')
-        rescue
-          ''
-        end
-      end
-    end
-  end
-end
-
-class Tk::Tcllib::Widget::Ruler
-  TkCommandNames = ['::widget::ruler'.freeze].freeze
-
-  def __boolval_optkeys
-    ['showvalues', 'outline', 'grid']
-  end
-  private :__boolval_optkeys
-
-  def __numlistval_optkeys
-    ['interval', 'sizes']
-  end
-  private :__numlistval_optkeys
-
-  def create_self(keys)
-    if keys and keys != None
-      tk_call_without_enc(self.class::TkCommandNames[0], @path,
-                          *hash_kv(keys, true))
-    else
-      tk_call_without_enc(self.class::TkCommandNames[0], @path)
-    end
-  end
-  private :create_self
-
-  def redraw
-    tk_send('redraw')
-    self
-  end
-
-  def shade(org, dest, frac)
-    tk_send('shade', org, dest, frac)
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/screenruler.rb b/ext/tk/lib/tkextlib/tcllib/screenruler.rb
deleted file mode 100644
index 64dd4f4ccc..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/screenruler.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/tcllib/screenruler.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-#   * Part of tcllib extension
-#   * screenruler dialog
-#
-
-require 'tk'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('widget::screenruler', '1.1')
-TkPackage.require('widget::screenruler')
-
-module Tk::Tcllib
-  module Widget
-    class ScreenRuler < TkWindow
-      PACKAGE_NAME = 'widget::ruler'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('widget::screenruler')
-        rescue
-          ''
-        end
-      end
-    end
-    Screenruler = ScreenRuler
-  end
-end
-
-class Tk::Tcllib::Widget::ScreenRuler
-  TkCommandNames = ['::widget::screenruler'.freeze].freeze
-
-  def __boolval_optkeys
-    ['topmost', 'reflect']
-  end
-  private :__boolval_optkeys
-
-  def __numlistval_optkeys
-    ['alpha']
-  end
-  private :__numlistval_optkeys
-
-  def create_self(keys)
-    if keys and keys != None
-      tk_call_without_enc(self.class::TkCommandNames[0], @path,
-                          *hash_kv(keys, true))
-    else
-      tk_call_without_enc(self.class::TkCommandNames[0], @path)
-    end
-  end
-  private :create_self
-
-  def display
-    tk_send('display')
-    self
-  end
-  alias show display
-
-  def hide
-    tk_send('hide')
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/scrolledwindow.rb b/ext/tk/lib/tkextlib/tcllib/scrolledwindow.rb
deleted file mode 100644
index 380d301a1a..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/scrolledwindow.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/tcllib/scrolledwindow.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-#   * Part of tcllib extension
-#   * scrolledwindow widget
-#
-
-require 'tk'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('widget::scrolledwindow', '1.2')
-TkPackage.require('widget::scrolledwindow')
-
-module Tk::Tcllib
-  module Widget
-    class Scrolledwindow < Tk::Tile::TFrame
-      PACKAGE_NAME = 'widget::scrolledwindow'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('widget::scrolledwindow')
-        rescue
-          ''
-        end
-      end
-    end
-    ScrolledWindow = Scrolledwindow
-  end
-end
-
-class Tk::Tcllib::Widget::ScrolledWindow
-  TkCommandNames = ['::widget::scrolledwindow'.freeze].freeze
-
-  def create_self(keys)
-    if keys and keys != None
-      tk_call_without_enc(self.class::TkCommandNames[0], @path,
-                          *hash_kv(keys, true))
-    else
-      tk_call_without_enc(self.class::TkCommandNames[0], @path)
-    end
-  end
-  private :create_self
-
-  def getframe
-    window(tk_send_without_enc('getframe'))
-  end
-  alias get_frame getframe
-
-  def setwidget(w)
-    window(tk_send_without_enc('setwidget', w))
-  end
-  alias set_widget setwidget
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/scrollwin.rb b/ext/tk/lib/tkextlib/tcllib/scrollwin.rb
deleted file mode 100644
index f9bf127799..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/scrollwin.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/tcllib/scrollwin.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-#   * Part of tcllib extension
-#   * Scrolled widget
-#
-
-require 'tk'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('widget::scrolledwindow', '1.0')
-TkPackage.require('widget::scrolledwindow')
-
-module Tk::Tcllib
-  module Widget
-    class ScrolledWindow < TkWindow
-      PACKAGE_NAME = 'widget::scrolledwindow'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('widget::scrolledwindow')
-        rescue
-          ''
-        end
-      end
-    end
-    Scrolledwindow = ScrolledWindow
-  end
-end
-
-class Tk::Tcllib::Widget::ScrolledWindow
-  TkCommandNames = ['::widget::scrolledwindow'.freeze].freeze
-
-  def __numlistval_optkeys
-    ['ipad']
-  end
-  private :__numlistval_optkeys
-
-  def create_self(keys)
-    if keys and keys != None
-      tk_call_without_enc(self.class::TkCommandNames[0], @path,
-                          *hash_kv(keys, true))
-    else
-      tk_call_without_enc(self.class::TkCommandNames[0], @path)
-    end
-  end
-  private :create_self
-
-  def get_frame
-    window(tk_send('getframe'))
-  end
-
-  def set_widget(widget)
-    tk_send('setwidget', widget)
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/setup.rb b/ext/tk/lib/tkextlib/tcllib/setup.rb
deleted file mode 100644
index cc967dced6..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/setup.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: false
-#
-#  setup.rb   --   setup script before calling TkPackage.require()
-#
-#    If you need some setup operations (for example, add a library path
-#    to the library search path) before using Tcl/Tk library packages
-#    wrapped by Ruby scripts in this directory, please write the setup
-#    operations in this file.
-#
diff --git a/ext/tk/lib/tkextlib/tcllib/statusbar.rb b/ext/tk/lib/tkextlib/tcllib/statusbar.rb
deleted file mode 100644
index b2c8f54b94..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/statusbar.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/tcllib/statusbar.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-#   * Part of tcllib extension
-#   * statusbar widget
-#
-
-require 'tk'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('widget::statusbar', '1.2')
-TkPackage.require('widget::statusbar')
-
-module Tk::Tcllib
-  module Widget
-    class Statusbar < Tk::Tile::TFrame
-      PACKAGE_NAME = 'widget::statusbar'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('widget::statusbar')
-        rescue
-          ''
-        end
-      end
-    end
-  end
-end
-
-class Tk::Tcllib::Widget::Statusbar
-  TkCommandNames = ['::widget::statusbar'.freeze].freeze
-
-  def __boolval_optkeys
-    super() << 'separator' << 'resize' << 'resizeseparator'
-  end
-  private :__boolval_optkeys
-
-  def create_self(keys)
-    if keys and keys != None
-      tk_call_without_enc(self.class::TkCommandNames[0], @path,
-                          *hash_kv(keys, true))
-    else
-      tk_call_without_enc(self.class::TkCommandNames[0], @path)
-    end
-  end
-  private :create_self
-
-  def getframe
-    window(tk_send_without_enc('getframe'))
-  end
-  alias get_frame getframe
-
-  def add(w, keys={})
-    window(tk_send_without_enc('setwidget', *(hash_kv(keys))))
-  end
-
-  def remove(*wins)
-    tk_send_without_enc('remove', *wins)
-    self
-  end
-
-  def remove_with_destroy(*wins)
-    tk_send_without_enc('remove', '-destroy', *wins)
-    self
-  end
-
-  def delete(*wins)
-    tk_send_without_enc('delete', *wins)
-    self
-  end
-
-  def items(pat=None)
-    tk_split_list(tk_send('items', pat))
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/style.rb b/ext/tk/lib/tkextlib/tcllib/style.rb
deleted file mode 100644
index f3b66b7861..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/style.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/tcllib/style.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-#   * Part of tcllib extension
-#   * select and use some 'style' of option (resource) DB
-#
-
-require 'tk'
-require 'tkextlib/tcllib.rb'
-
-module Tk::Tcllib
-  module Style
-    PACKAGE_NAME = 'style'.freeze
-    def self.package_name
-      PACKAGE_NAME
-    end
-
-    def self.package_version
-      begin
-        TkPackage.require('style')
-      rescue
-        ''
-      end
-    end
-
-    def self.not_available
-      fail RuntimeError, "'tkextlib/tcllib/style' extension is not available on your current environment."
-    end
-
-    def self.names
-      Tk::Tcllib::Style.not_available
-    end
-
-    def self.use(style)
-      Tk::Tcllib::Style.not_available
-    end
-  end
-end
-
-# TkPackage.require('style', '0.1')
-# TkPackage.require('style', '0.3')
-TkPackage.require('style')
-
-module Tk::Tcllib
-  class << Style
-    undef not_available
-  end
-
-  module Style
-    extend TkCore
-
-    def self.names
-      tk_split_simplelist(tk_call('style::names'))
-    end
-
-    def self.use(style)
-      tk_call('style::use', style)
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/superframe.rb b/ext/tk/lib/tkextlib/tcllib/superframe.rb
deleted file mode 100644
index 776ad7c166..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/superframe.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/tcllib/superframe.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-#   * Part of tcllib extension
-#   * Superframe widget - enhanced labelframe widget
-#
-
-require 'tk'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('widget::superframe', '1.0')
-TkPackage.require('widget::superframe')
-
-module Tk::Tcllib
-  module Widget
-    class SuperFrame < TkWindow
-      PACKAGE_NAME = 'widget::superframe'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('widget::superframe')
-        rescue
-          ''
-        end
-      end
-    end
-    Superframe = SuperlFrame
-  end
-end
-
-class Tk::Tcllib::Widget::SuperFrame
-  TkCommandNames = ['::widget::superframe'.freeze].freeze
-
-  def create_self(keys)
-    if keys and keys != None
-      tk_call_without_enc(self.class::TkCommandNames[0], @path,
-                          *hash_kv(keys, true))
-    else
-      tk_call_without_enc(self.class::TkCommandNames[0], @path)
-    end
-  end
-  private :create_self
-
-  def labelwidget
-    window(tk_send('labelwidget'))
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/swaplist.rb b/ext/tk/lib/tkextlib/tcllib/swaplist.rb
deleted file mode 100644
index 7eaed8dbaa..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/swaplist.rb
+++ /dev/null
@@ -1,151 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/tcllib/swaplist.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-#   * Part of tcllib extension
-#   * A dialog which allows a user to move options between two lists
-#
-
-require 'tk'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('swaplist', '0.1')
-TkPackage.require('swaplist')
-
-module Tk::Tcllib
-  class Swaplist_Dialog < TkWindow
-    PACKAGE_NAME = 'swaplist'.freeze
-    def self.package_name
-      PACKAGE_NAME
-    end
-
-    def self.package_version
-      begin
-        TkPackage.require('swaplist')
-      rescue
-        ''
-      end
-    end
-  end
-end
-
-
-class Tk::Tcllib::Swaplist_Dialog
-  TkCommandNames = ['::swaplist::swaplist'.freeze].freeze
-  WidgetClassName = 'Swaplist'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def self.show(*args)
-    dialog = self.new(*args)
-    dialog.show
-    [dialog.status, dialog.value]
-  end
-  def self.display(*args)
-    self.show(*args)
-  end
-
-  def initialize(*args)
-    # args = (parent=nil, complete_list=[], selected_list=[], keys=nil)
-    keys = args.pop
-    if keys.kind_of?(Hash)
-      @selected_list = args.pop
-      @complete_list = args.pop
-      @keys = _symbolkey2str(keys)
-      args.push(keys)
-    else
-      @selected_list = keys
-      @complete_list = args.pop
-      @keys = {}
-    end
-
-    @selected_list = [] unless @selected_list
-    @complete_list = [] unless @complete_list
-
-    @variable = TkVariable.new
-    @status = nil
-
-    super(*args)
-  end
-
-  def create_self(keys)
-    # dummy
-  end
-  private :create_self
-
-  def show
-    @variable.value = ''
-    @status = bool(tk_call(self.class::TkCommandNames[0],
-                           @path, @variable,
-                           @complete_list, @selected_list,
-                           *hash_kv(@keys)))
-  end
-  alias display show
-
-  def status
-    @status
-  end
-
-  def value
-    @variable.list
-  end
-  alias selected value
-
-  def cget_strict(slot)
-    slot = slot.to_s
-    if slot == 'complete_list'
-      @complete_list
-    elsif slot == 'selected_list'
-      @selected_list
-    else
-      @keys[slot]
-    end
-  end
-  def cget(slot)
-    cget_strict(slot)
-  end
-
-  def configure(slot, value=None)
-    if slot.kind_of?(Hash)
-      slot.each{|k, v| configure(k, v)}
-    else
-      slot = slot.to_s
-      value = _symbolkey2str(value) if value.kind_of?(Hash)
-      if value && value != None
-        if slot == 'complete_list'
-          @complete_list = value
-        elsif slot == 'selected_list'
-          @selected_list = value
-        else
-          @keys[slot] = value
-        end
-      else
-        if slot == 'complete_list'
-          @complete_list = []
-        elsif slot == 'selected_list'
-          @selected_list = []
-        else
-          @keys.delete(slot)
-        end
-      end
-    end
-    self
-  end
-
-  def configinfo(slot = nil)
-    if slot
-      slot = slot.to_s
-      if slot == 'complete_list'
-        [ slot, nil, nil, nil, @complete_list ]
-      elsif slot == 'selected_list'
-        [ slot, nil, nil, nil, @selected_list ]
-      else
-        [ slot, nil, nil, nil, @keys[slot] ]
-      end
-    else
-      @keys.collect{|k, v| [ k, nil, nil, nil, v ] }           \
-      << [ 'complete_list', nil, nil, nil, @complete_list ]   \
-      << [ 'selected_list', nil, nil, nil, @selected_list ]
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/tablelist.rb b/ext/tk/lib/tkextlib/tcllib/tablelist.rb
deleted file mode 100644
index 7cfe2faf1e..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/tablelist.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/tcllib/tablelist.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-#   * Part of tcllib extension
-#   * A multi-column listbox
-
-require 'tk'
-require 'tkextlib/tcllib.rb'
-
-# check Tile extension :: If already loaded, use tablelist_tile.
-unless defined? Tk::Tcllib::Tablelist_usingTile
-  Tk::Tcllib::Tablelist_usingTile =
-    TkPackage.provide('tile') || TkPackage.provide('Ttk')
-end
-
-if Tk::Tcllib::Tablelist_usingTile
-  # with Tile
-  require 'tkextlib/tcllib/tablelist_tile'
-
-else
-  # without Tile
-
-  # TkPackage.require('tablelist', '4.2')
-  TkPackage.require('tablelist')
-
-  require 'tkextlib/tcllib/tablelist_core'
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/tablelist_core.rb b/ext/tk/lib/tkextlib/tcllib/tablelist_core.rb
deleted file mode 100644
index b45f18796a..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/tablelist_core.rb
+++ /dev/null
@@ -1,1073 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/tcllib/tablelist_core.rb
-#
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-#   * Part of tcllib extension
-#   * This file is required by 'tkextlib/tcllib/tablelist.rb' or
-#     'tkextlib/tcllib/tablelist_tile.rb'.
-#
-
-module Tk
-  module Tcllib
-    class Tablelist < TkWindow
-      if Tk::Tcllib::Tablelist_usingTile
-        PACKAGE_NAME = 'Tablelist_tile'.freeze
-      else
-        PACKAGE_NAME = 'Tablelist'.freeze
-      end
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require(self.package_name)
-        rescue
-          ''
-        end
-      end
-
-      def self.use_Tile?
-        (Tk::Tcllib::Tablelist_usingTile)? true: false
-      end
-    end
-    TableList = Tablelist
-  end
-end
-
-module Tk::Tcllib::TablelistItemConfig
-  include TkItemConfigMethod
-
-  def _to_idx(idx)
-    if idx.kind_of?(Array)
-      idx.collect{|elem| _get_eval_string(elem)}.join(',')
-    else
-      idx
-    end
-  end
-  def _from_idx(idx)
-    return idx unless idx.kind_of?(String)
-
-    if idx[0] == ?@  # '@x,y'
-      idx
-    elsif idx =~ /([^,]+),([^,]+)/
-      row = $1, column = $2
-      [num_or_str(row), num_or_str(column)]
-    else
-      num_or_str(idx)
-    end
-  end
-  private :_to_idx, :_from_idx
-
-  def __item_cget_cmd(mixed_id)
-    [self.path, mixed_id[0] + 'cget', _to_idx(mixed_id[1])]
-  end
-  def __item_config_cmd(mixed_id)
-    [self.path, mixed_id[0] + 'configure', _to_idx(mixed_id[1])]
-  end
-
-  def cell_cget_tkstring(tagOrId, option)
-    itemcget_tkstring(['cell', tagOrId], option)
-  end
-  def cell_cget(tagOrId, option)
-    itemcget(['cell', tagOrId], option)
-  end
-  def cell_cget_strict(tagOrId, option)
-    itemcget_strict(['cell', tagOrId], option)
-  end
-  def cell_configure(tagOrId, slot, value=None)
-    itemconfigure(['cell', tagOrId], slot, value)
-  end
-  def cell_configinfo(tagOrId, slot=nil)
-    itemconfiginfo(['cell', tagOrId], slot)
-  end
-  def current_cell_configinfo(tagOrId, slot=nil)
-    current_itemconfiginfo(['cell', tagOrId], slot)
-  end
-  alias cellcget_tkstring cell_cget_tkstring
-  alias cellcget cell_cget
-  alias cellcget_strict cell_cget_strict
-  alias cellconfigure cell_configure
-  alias cellconfiginfo cell_configinfo
-  alias current_cellconfiginfo current_cell_configinfo
-
-  def column_cget_tkstring(tagOrId, option)
-    itemcget_tkstring(['column', tagOrId], option)
-  end
-  def column_cget(tagOrId, option)
-    itemcget(['column', tagOrId], option)
-  end
-  def column_cget_strict(tagOrId, option)
-    itemcget_strict(['column', tagOrId], option)
-  end
-  def column_configure(tagOrId, slot, value=None)
-    itemconfigure(['column', tagOrId], slot, value)
-  end
-  def column_configinfo(tagOrId, slot=nil)
-    itemconfiginfo(['column', tagOrId], slot)
-  end
-  def current_column_configinfo(tagOrId, slot=nil)
-    current_itemconfiginfo(['column', tagOrId], slot)
-  end
-  alias columncget_tkstring column_cget_tkstring
-  alias columncget column_cget
-  alias columncget_strict column_cget_strict
-  alias columnconfigure column_configure
-  alias columnconfiginfo column_configinfo
-  alias current_columnconfiginfo current_column_configinfo
-
-  def row_cget_tkstring(tagOrId, option)
-    itemcget_tkstring(['row', tagOrId], option)
-  end
-  def row_cget(tagOrId, option)
-    itemcget(['row', tagOrId], option)
-  end
-  def row_cget_strict(tagOrId, option)
-    itemcget_strict(['row', tagOrId], option)
-  end
-  def row_configure(tagOrId, slot, value=None)
-    itemconfigure(['row', tagOrId], slot, value)
-  end
-  def row_configinfo(tagOrId, slot=nil)
-    itemconfiginfo(['row', tagOrId], slot)
-  end
-  def current_row_configinfo(tagOrId, slot=nil)
-    current_itemconfiginfo(['row', tagOrId], slot)
-  end
-  alias rowcget_tkstring row_cget_tkstring
-  alias rowcget row_cget
-  alias rowcget_strict row_cget_strict
-  alias rowconfigure row_configure
-  alias rowconfiginfo row_configinfo
-  alias current_rowconfiginfo current_row_configinfo
-
-  private :itemcget_tkstring, :itemcget, :itemcget_strict
-  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
-end
-
-class Tk::Tcllib::Tablelist
-  include Tk::Tcllib::TablelistItemConfig
-  include Scrollable
-
-  TkCommandNames = ['::tablelist::tablelist'.freeze].freeze
-  WidgetClassName = 'Tablelist'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def create_self(keys)
-    if keys and keys != None
-      tk_call_without_enc(self.class::TkCommandNames[0], @path,
-                          *hash_kv(keys, true))
-    else
-      tk_call_without_enc(self.class::TkCommandNames[0], @path)
-    end
-  end
-  private :create_self
-
-  ##########################
-
-  def __numval_optkeys
-    super() + ['titlecolumns']
-  end
-  private :__numval_optkeys
-
-  def __strval_optkeys
-    super() + ['snipstring']
-  end
-  private :__strval_optkeys
-
-  def __boolval_optkeys
-    super() - ['takefocus'] + [
-      'forceeditendcommand', 'movablecolumns', 'movablerows',
-      'protecttitlecolumns', 'resizablecolumns', 'setfocus',
-      'showarrow', 'showlabels', 'showseparators'
-    ]
-  end
-  private :__boolval_optkeys
-
-  def __listval_optkeys
-    super() + ['columns', 'columntitles']
-  end
-  private :__listval_optkeys
-
-  def __tkvariable_optkeys
-    super() + ['listvariable']
-  end
-  private :__tkvariable_optkeys
-
-  def __val2ruby_optkeys  # { key=>proc, ... }
-    # The method is used to convert a opt-value to a ruby's object.
-    # When get the value of the option "key", "proc.call(value)" is called.
-    super().update('stretch'=>proc{|v|
-                     (v == 'all')? v: simplelist(v)
-                   },
-                   'takefocus'=>proc{|v|
-                     case v
-                     when '1'
-                       true
-                     when '0'
-                       false
-                     when ''
-                       nil
-                     else # cmd
-                       tk_tcl2ruby(cmd)
-                       end
-                   })
-  end
-  private :__val2ruby_optkeys
-
-  def __ruby2val_optkeys  # { key=>proc, ... }
-    # The method is used to convert a ruby's object to a opt-value.
-    # When set the value of the option "key", "proc.call(value)" is called.
-    # That is, "-#{key} #{proc.call(value)}".
-    super().update('stretch'=>proc{|v|
-                     (v.kind_of?(Array))? v.collect{|e| _to_idx(e)}: v
-                   },
-                   'takefocus'=>proc{|v|
-                     case v
-                     when true
-                       '1'
-                     when false
-                       '0'
-                     when nil
-                       ''
-                     else
-                       _get_eval_string(v)
-                     end
-                   })
-  end
-  private :__ruby2val_optkeys
-
-  def __font_optkeys
-    super() + ['labelfont']
-  end
-  private :__font_optkeys
-
-  ##########################
-
-  def __item_strval_optkeys(id)
-    if id[0] == 'cell'
-      super(id) + ['title']
-    else
-      super(id) - ['text'] + ['title', 'name']
-    end
-  end
-  private :__item_strval_optkeys
-
-  def __item_boolval_optkeys(id)
-    super(id) + [
-      'changesnipside', 'editable', 'hide', 'resizable', 'selectable',
-      'showarrow', 'showlinenumbers', 'stretchable', 'stretchwindow', 'wrap'
-    ]
-  end
-  private :__item_boolval_optkeys
-
-  def __item_listval_optkeys(id)
-    if id[0] == 'cell'
-      super(id)
-    else
-      super(id) + ['text']
-    end
-  end
-  private :__item_listval_optkeys
-
-  def __item_font_optkeys(id)
-    # maybe need to override
-    super(id) + ['labelfont']
-  end
-  private :__item_font_optkeys
-
-  ##########################
-
-  def activate(index)
-    tk_send('activate', _to_idx(index))
-    self
-  end
-
-  def activate_cell(index)
-    tk_send('activatecell', _to_idx(index))
-    self
-  end
-  alias activatecell activate_cell
-
-  def get_attrib(name=nil)
-    if name && name != None
-      tk_send('attrib', name)
-    else
-      ret = []
-      lst = simplelist(tk_send('attrib'))
-      until lst.empty?
-        ret << ( [lst.shift] << lst.shift )
-      end
-      ret
-    end
-  end
-  def set_attrib(*args)
-    tk_send('attrib', *(args.flatten))
-    self
-  end
-
-  def bbox(index)
-    list(tk_send('bbox', _to_idx(index)))
-  end
-
-  def bodypath
-    window(tk_send('bodypath'))
-  end
-
-  def bodytag
-    TkBindTag.new_by_name(tk_send('bodytag'))
-  end
-
-  def cancel_editing
-    tk_send('cancelediting')
-    self
-  end
-  alias cancelediting cancel_editing
-
-  def get_cellattrib(name=nil)
-    if name && name != None
-      tk_send('cellattrib', name)
-    else
-      ret = []
-      lst = simplelist(tk_send('cellattrib'))
-      until lst.empty?
-        ret << ( [lst.shift] << lst.shift )
-      end
-      ret
-    end
-  end
-  def set_cellattrib(*args)
-    tk_send('cellattrib', *(args.flatten))
-    self
-  end
-
-  def cellindex(idx)
-    _from_idx(tk_send('cellindex', _to_idx(idx)))
-  end
-
-  def cellselection_anchor(idx)
-    tk_send('cellselection', 'anchor', _to_idx(idx))
-    self
-  end
-
-  def cellselection_clear(first, last=nil)
-    if first.kind_of?(Array)
-      tk_send('cellselection', 'clear', first.collect{|idx| _to_idx(idx)})
-    else
-      first = _to_idx(first)
-      last = (last)? _to_idx(last): first
-      tk_send('cellselection', 'clear', first, last)
-    end
-    self
-  end
-
-  def cellselection_includes(idx)
-    bool(tk_send('cellselection', 'includes', _to_idx(idx)))
-  end
-
-  def cellselection_set(first, last=nil)
-    if first.kind_of?(Array)
-      tk_send('cellselection', 'set', first.collect{|idx| _to_idx(idx)})
-    else
-      first = _to_idx(first)
-      last = (last)? _to_idx(last): first
-      tk_send('cellselection', 'set', first, last)
-    end
-    self
-  end
-
-  def get_columnattrib(name=nil)
-    if name && name != None
-      tk_send('columnattrib', name)
-    else
-      ret = []
-      lst = simplelist(tk_send('columnattrib'))
-      until lst.empty?
-        ret << ( [lst.shift] << lst.shift )
-      end
-      ret
-    end
-  end
-  def set_columnattrib(*args)
-    tk_send('columnattrib', *(args.flatten))
-    self
-  end
-
-  def columncount
-    number(tk_send('columncount'))
-  end
-
-  def columnindex(idx)
-    number(tk_send('columnindex', _to_idx(idx)))
-  end
-
-  def columnwidth(idx, opt=nil)
-    if opt
-      number(tk_send('columnwidth', _to_idx(idx), "-#{opt}"))
-    else
-      number(tk_send('columnwidth', _to_idx(idx)))
-    end
-  end
-  def requested_columnwidth(idx)
-    columnwidth(idx, 'requested')
-  end
-  def stretched_columnwidth(idx)
-    columnwidth(idx, 'stretched')
-  end
-  def total_columnwidth(idx)
-    columnwidth(idx, 'total')
-  end
-
-  def configcelllist(lst) # lst ==> [idx, opt, val, idx, opt, val, ...]
-    ary = []
-    lst.slice(3){|idx, opt, val|
-      ary << _to_idx(idx) << "-#{opt}" << val
-    }
-    tk_send('configcelllist', ary)
-    self
-  end
-  alias config_celllist configcelllist
-
-  def configcells(*args) # args ==> idx, opt, val, idx, opt, val, ...
-    ary = []
-    args.slice(3){|idx, opt, val|
-      ary << _to_idx(idx) << "-#{opt}" << val
-    }
-    tk_send('configcells', *ary)
-    self
-  end
-  alias config_cells configcells
-
-  def configcolumnlist(lst) # lst ==> [idx, opt, val, idx, opt, val, ...]
-    ary = []
-    lst.slice(3){|idx, opt, val|
-      ary << _to_idx(idx) << "-#{opt}" << val
-    }
-    tk_send('configcolumnlist', ary)
-    self
-  end
-  alias config_columnlist configcolumnlist
-
-  def configcolumns(*args) # args ==> idx, opt, val, idx, opt, val, ...
-    ary = []
-    args.slice(3){|idx, opt, val|
-      ary << _to_idx(idx) << "-#{opt}" << val
-    }
-    tk_send('configcolumns', *ary)
-    self
-  end
-  alias config_columns configcolumns
-
-  def configrowlist(lst) # lst ==> [idx, opt, val, idx, opt, val, ...]
-    ary = []
-    lst.slice(3){|idx, opt, val|
-      ary << _to_idx(idx) << "-#{opt}" << val
-    }
-    tk_send('configrowlist', ary)
-    self
-  end
-  alias config_rowlist configrowlist
-
-  def configrows(*args) # args ==> idx, opt, val, idx, opt, val, ...
-    ary = []
-    args.slice(3){|idx, opt, val|
-      ary << _to_idx(idx) << "-#{opt}" << val
-    }
-    tk_send('configrows', *ary)
-    self
-  end
-  alias config_rows configrows
-
-  def containing(y)
-    idx = num_or_str(tk_send('containing', y))
-    (idx.kind_of?(Fixnum) && idx < 0)?  nil: idx
-  end
-
-  def containing_cell(x, y)
-    idx = _from_idx(tk_send('containingcell', x, y))
-    if idx.kind_of?(Array)
-      [
-        ((idx[0].kind_of?(Fixnum) && idx[0] < 0)?  nil: idx[0]),
-        ((idx[1].kind_of?(Fixnum) && idx[1] < 0)?  nil: idx[1])
-      ]
-    else
-      idx
-    end
-  end
-  alias containingcell containing_cell
-
-  def containing_column(x)
-    idx = num_or_str(tk_send('containingcolumn', x))
-    (idx.kind_of?(Fixnum) && idx < 0)?  nil: idx
-  end
-  alias containingcolumn containing_column
-
-  def curcellselection
-    simplelist(tk_send('curcellselection')).collect!{|idx| _from_idx(idx)}
-  end
-
-  def curselection
-    list(tk_send('curselection'))
-  end
-
-  def delete_items(first, last=nil)
-    if first.kind_of?(Array)
-      tk_send('delete', first.collect{|idx| _to_idx(idx)})
-    else
-      first = _to_idx(first)
-      last = (last)? _to_idx(last): first
-      tk_send('delete', first, last)
-    end
-    self
-  end
-  alias delete delete_items
-  alias deleteitems delete_items
-
-  def delete_columns(first, last=nil)
-    if first.kind_of?(Array)
-      tk_send('deletecolumns', first.collect{|idx| _to_idx(idx)})
-    else
-      first = _to_idx(first)
-      last = (last)? _to_idx(last): first
-      tk_send('deletecolumns', first, last)
-    end
-    self
-  end
-  alias deletecolumns delete_columns
-
-  def edit_cell(idx)
-    tk_send('editcell', _to_idx(idx))
-    self
-  end
-  alias editcell edit_cell
-
-  def editwintag
-    TkBindTag.new_by_name(tk_send('editwintag'))
-  end
-
-  def editwinpath
-    window(tk_send('editwinpath'))
-  end
-
-  def entrypath
-    window(tk_send('entrypath'))
-  end
-
-  def fill_column(idx, txt)
-    tk_send('fillcolumn', _to_idx(idx), txt)
-    self
-  end
-  alias fillcolumn fill_column
-
-  def finish_editing
-    tk_send('finishediting')
-    self
-  end
-  alias finishediting finish_editing
-
-  def formatinfo
-    key, row, col = simplelist(tk_send('formatinfo'))
-    [key, number(row), number(col)]
-  end
-
-  def get(first, last=nil)
-    if first.kind_of?(Array)
-      simplelist(tk_send('get', first.collect{|idx| _to_idx(idx)})).collect!{|elem| simplelist(elem) }
-    else
-      first = _to_idx(first)
-      last = (last)? _to_idx(last): first
-      simplelist(tk_send('get', first, last))
-    end
-  end
-
-  def get_cells(first, last=nil)
-    if first.kind_of?(Array)
-      simplelist(tk_send('getcells', first.collect{|idx| _to_idx(idx)})).collect!{|elem| simplelist(elem) }
-    else
-      first = _to_idx(first)
-      last = (last)? _to_idx(last): first
-      simplelist(tk_send('getcells', first, last))
-    end
-  end
-  alias getcells get_cells
-
-  def get_columns(first, last=nil)
-    if first.kind_of?(Array)
-      simplelist(tk_send('getcolumns', first.collect{|idx| _to_idx(idx)})).collect!{|elem| simplelist(elem) }
-    else
-      first = _to_idx(first)
-      last = (last)? _to_idx(last): first
-      simplelist(tk_send('getcolumns', first, last))
-    end
-  end
-  alias getcolumns get_columns
-
-  def get_keys(first, last=nil)
-    if first.kind_of?(Array)
-      simplelist(tk_send('getkeys', first.collect{|idx| _to_idx(idx)})).collect!{|elem| simplelist(elem) }
-    else
-      first = _to_idx(first)
-      last = (last)? _to_idx(last): first
-      simplelist(tk_send('getkeys', first, last))
-    end
-  end
-  alias getkeys get_keys
-
-  def has_attrib?(name)
-    bool(tk_send('hasattrib', name))
-  end
-
-  def has_cellattrib?(idx, name)
-    bool(tk_send('hascellattrib', _to_idx(idx), name))
-  end
-
-  def has_columnattrib?(idx, name)
-    bool(tk_send('hascolumnattrib', _to_idx(idx), name))
-  end
-
-  def has_rowattrib?(idx, name)
-    bool(tk_send('hasrowattrib', _to_idx(idx), name))
-  end
-
-  def imagelabelpath(idx)
-    window(tk_send('imagelabelpath', _to_idx(idx)))
-  end
-
-  def index(idx)
-    number(tk_send('index', _to_idx(idx)))
-  end
-
-  def insert(idx, *items)
-    tk_send('insert', _to_idx(idx), *items)
-    self
-  end
-
-  def insert_columnlist(idx, columnlist)
-    tk_send('insertcolumnlist', _to_idx(idx), columnlist)
-    self
-  end
-  alias insertcolumnlist insert_columnlist
-
-  def insert_columns(idx, *args)
-    tk_send('insertcolums', _to_idx(idx), *args)
-    self
-  end
-  alias insertcolumns insert_columns
-
-  def insert_list(idx, list)
-    tk_send('insertlist', _to_idx(idx), list)
-    self
-  end
-  alias insertlist insert_list
-
-  def is_elem_snipped?(cellidx, tkvar)
-    bool(tk_send('iselemsnipped', _to_idx(cellidx), tkvar))
-  end
-  alias elem_snipped? is_elem_snipped?
-
-  def is_title_snipped?(colidx, tkvar)
-    bool(tk_send('istitlesnipped', _to_idx(colidx), tkvar))
-  end
-  alias title_snipped? is_title_snipped?
-
-  def itemlistvar
-    TkVarAccess.new(tk_send('itemlistvar'))
-  end
-
-  def labelpath(idx)
-    window(tk_send('labelpath', _to_idx(idx)))
-  end
-
-  def labels
-    simplelist(tk_send('labels'))
-  end
-
-  def labeltag
-    TkBindTag.new_by_name(tk_send('labeltag'))
-  end
-
-  def move(src, target)
-    tk_send('move', _to_idx(src), _to_idx(target))
-    self
-  end
-
-  def move_column(src, target)
-    tk_send('movecolumn', _to_idx(src), _to_idx(target))
-    self
-  end
-  alias movecolumn move_column
-
-  def nearest(y)
-    _from_idx(tk_send('nearest', y))
-  end
-
-  def nearest_cell(x, y)
-    _from_idx(tk_send('nearestcell', x, y))
-  end
-  alias nearestcell nearest_cell
-
-  def nearest_column(x)
-    _from_idx(tk_send('nearestcolumn', x))
-  end
-  alias nearestcolumn nearest_column
-
-  def reject_input
-    tk_send('rejectinput')
-    self
-  end
-  alias rejectinput reject_input
-
-  def reset_sortinfo
-    tk_send('resetsortinfo')
-    self
-  end
-  alias resetsortinfo reset_sortinfo
-
-  def get_rowattrib(name=nil)
-    if name && name != None
-      tk_send('rowattrib', name)
-    else
-      ret = []
-      lst = simplelist(tk_send('rowattrib'))
-      until lst.empty?
-        ret << ( [lst.shift] << lst.shift )
-      end
-      ret
-    end
-  end
-  def set_rowattrib(*args)
-    tk_send('rowattrib', *(args.flatten))
-    self
-  end
-
-  def scan_mark(x, y)
-    tk_send('scan', 'mark', x, y)
-    self
-  end
-
-  def scan_dragto(x, y)
-    tk_send('scan', 'dragto', x, y)
-    self
-  end
-
-  def see(idx)
-    tk_send('see', _to_idx(idx))
-    self
-  end
-
-  def see_cell(idx)
-    tk_send('seecell', _to_idx(idx))
-    self
-  end
-  alias seecell see_cell
-
-  def see_column(idx)
-    tk_send('seecolumn', _to_idx(idx))
-    self
-  end
-  alias seecolumn see_column
-
-  def selection_anchor(idx)
-    tk_send('selection', 'anchor', _to_idx(idx))
-    self
-  end
-
-  def selection_clear(first, last=nil)
-    if first.kind_of?(Array)
-      tk_send('selection', 'clear', first.collect{|idx| _to_idx(idx)})
-    else
-      first = _to_idx(first)
-      last = (last)? _to_idx(last): first
-      tk_send('selection', 'clear', first, last)
-    end
-    self
-  end
-
-  def selection_includes(idx)
-    bool(tk_send('selection', 'includes', _to_idx(idx)))
-  end
-
-  def selection_set(first, last=nil)
-    if first.kind_of?(Array)
-      tk_send('selection', 'set', first.collect{|idx| _to_idx(idx)})
-    else
-      first = _to_idx(first)
-      last = (last)? _to_idx(last): first
-      tk_send('selection', 'set', first, last)
-    end
-    self
-  end
-
-  def separatorpath(idx=nil)
-    if idx
-      window(tk_send('separatorpath', _to_idx(idx)))
-    else
-      window(tk_send('separatorpath'))
-    end
-  end
-
-  def separators
-    simplelist(tk_send('separators')).collect!{|w| window(w)}
-  end
-
-  def size
-    number(tk_send('size'))
-  end
-
-  def sort(order=nil)
-    if order
-      order = order.to_s
-      order = '-' << order if order[0] != ?-
-      if order.length < 2
-        order = nil
-      end
-    end
-    if order
-      tk_send('sort', order)
-    else
-      tk_send('sort')
-    end
-    self
-  end
-  def sort_increasing
-    tk_send('sort', '-increasing')
-    self
-  end
-  def sort_decreasing
-    tk_send('sort', '-decreasing')
-    self
-  end
-
-
-  # default of 'labelcommand' option
-  DEFAULT_labelcommand_value =
-    DEFAULT_sortByColumn_cmd = '::tablelist::sortByColumn'
-
-  # default of 'labelcommand2' option
-  DEFAULT_labelcommand2_value =
-    DEFAULT_addToSortColumns_cmd = '::tablelist::addToSortColumns'
-
-  def sortByColumn_with_event_generate(idx)
-    tk_call('::tablelist::sortByColumn', @path, _to_idx(idx))
-  end
-
-  def addToSortColumns_with_event_generate(idx)
-    tk_call('::tablelist::addToSortColumns', @path, _to_idx(idx))
-  end
-
-  def sort_by_column(idx, order=nil)
-    if order
-      order = order.to_s
-      order = '-' << order if order[0] != ?-
-      if order.length < 2
-        order = nil
-      end
-    end
-    if order
-      tk_send('sortbycolumn', _to_idx(idx), order)
-    else
-      tk_send('sortbycolumn', _to_idx(idx))
-    end
-    self
-  end
-  def sort_by_column_increasing(idx)
-    tk_send('sortbycolumn', _to_idx(idx), '-increasing')
-    self
-  end
-  def sort_by_column_decreasing(idx)
-    tk_send('sortbycolumn', _to_idx(idx), '-decreasing')
-    self
-  end
-
-  def sort_by_columnlist(idxlist, orderlist=None)
-    # orderlist :: list of 'increasing' or 'decreasing'
-    tk_send('sortbycolumnlist', idxlist.map{|idx| _to_idx(idx)}, orderlist)
-    self
-  end
-
-  def sortcolumn
-    idx = num_or_str(tk_send('sortcolum'))
-    (idx.kind_of?(Fixnum) && idx < 0)?  nil: idx
-  end
-
-  def sortcolumnlist
-    simplelist(tk_send('sortcolumlist')).map{|col| num_or_str(col)}
-  end
-
-  def sortorder
-    tk_send('sortorder')
-  end
-
-  def sortorderlist
-    simplelist(tk_send('sortorderlist'))
-  end
-
-  def toggle_columnhide(first, last=nil)
-    if first.kind_of?(Array)
-      tk_send('togglecolumnhide', first.collect{|idx| _to_idx(idx)})
-    else
-      first = _to_idx(first)
-      last = (last)? _to_idx(last): first
-      tk_send('togglecolumnhide', first, last)
-    end
-  end
-
-  def toggle_rowhide(first, last=nil)
-    if first.kind_of?(Array)
-      tk_send('togglerowhide', first.collect{|idx| _to_idx(idx)})
-    else
-      first = _to_idx(first)
-      last = (last)? _to_idx(last): first
-      tk_send('togglerowhide', first, last)
-    end
-  end
-
-  def toggle_visibility(first, last=nil)
-    if first.kind_of?(Array)
-      tk_send('togglevisibility', first.collect{|idx| _to_idx(idx)})
-    else
-      first = _to_idx(first)
-      last = (last)? _to_idx(last): first
-      tk_send('togglevisibility', first, last)
-    end
-    self
-  end
-  alias togglevisibility toggle_visibility
-
-  def unset_attrib(name)
-    tk_send('unsetattrib', name)
-    self
-  end
-
-  def unset_cellattrib(idx, name)
-    tk_send('unsetcellattrib', _to_idx(idx), name)
-    self
-  end
-
-  def unset_columnattrib(idx, name)
-    tk_send('unsetcolumnattrib', _to_idx(idx), name)
-    self
-  end
-
-  def unset_rowattrib(idx, name)
-    tk_send('unsetrowattrib', _to_idx(idx), name)
-    self
-  end
-
-  def windowpath(idx)
-    window(tk_send('windowpath', _to_idx(idx)))
-  end
-end
-
-class << Tk::Tcllib::Tablelist
-  ############################################################
-  # helper commands
-  def getTablelistPath(descendant)
-    window(Tk.tk_call('::tablelist::getTablelistPath', descendant))
-  end
-
-  def getTablelistColumn(descendant)
-    num_or_str(Tk.tk_call('::tablelist::getTablelistColumn', headerlabel))
-  end
-
-
-  def convEventFields(descendant, x, y)
-    window(Tk.tk_call('::tablelist::convEventFields', descendant, x, y))
-  end
-
-
-  ############################################################
-  # with the BWidget package
-  def addBWidgetEntry(name=None)
-    Tk.tk_call('::tablelist::addBWidgetEntry', name)
-  end
-
-  def addBWidgetSpinBox(name=None)
-    Tk.tk_call('::tablelist::addBWidgetSpinBox', name)
-  end
-
-  def addBWidgetComboBox(name=None)
-    Tk.tk_call('::tablelist::addBWidgetComboBox', name)
-  end
-
-
-  ############################################################
-  # with the Iwidgets ([incr Widgets]) package
-  def addIncrEntryfield(name=None)
-    Tk.tk_call('::tablelist::addIncrEntry', name)
-  end
-
-  def addIncrDateTimeWidget(type, seconds=false, name=None)
-    # type := 'datefield'|'dateentry'|timefield'|'timeentry'
-    if seconds && seconds != None
-      seconds = '-seconds'
-    else
-      seconds = None
-    end
-    Tk.tk_call('::tablelist::addDateTimeWidget', type, seconds, name)
-  end
-
-  def addIncrSpinner(name=None)
-    Tk.tk_call('::tablelist::addIncrSpinner', name)
-  end
-
-  def addIncrSpinint(name=None)
-    Tk.tk_call('::tablelist::addIncrSpinint', name)
-  end
-
-  def addIncrCombobox(name=None)
-    Tk.tk_call('::tablelist::addIncrCombobox', name)
-  end
-
-
-  ############################################################
-  # with Bryan Oakley's combobox package
-  def addOakleyCombobox(name=None)
-    Tk.tk_call('::tablelist::addOakleyCombobox', name)
-  end
-
-  ############################################################
-  # with the multi-entry package Mentry is a library extension
-  def addDateMentry(format, separator, gmt=false, name=None)
-    if gmt && gmt != None
-      gmt = '-gmt'
-    else
-      gmt = None
-    end
-    Tk.tk_call('::tablelist::addDateMentry', format, separator, gmt, name)
-  end
-
-  def addTimeMentry(format, separator, gmt=false, name=None)
-    if gmt && gmt != None
-      gmt = '-gmt'
-    else
-      gmt = None
-    end
-    Tk.tk_call('::tablelist::addTimeMentry', format, separator, gmt, name)
-  end
-
-  def addDateTimeMentry(format, date_sep, time_sep, gmt=false, name=None)
-    if gmt && gmt != None
-      gmt = '-gmt'
-    else
-      gmt = None
-    end
-    Tk.tk_call('::tablelist::addDateTimeMentry',
-               format, date_sep, time_sep, gmt, name)
-  end
-
-  def addFixedPointMentry(count1, count2, comma=false, name=None)
-    if comma && comma != None
-      comma = '-comma'
-    else
-      comma = None
-    end
-    Tk.tk_call('::tablelist::addFixedPoingMentry', count1, count2, comma, name)
-  end
-
-  def addIPAddrMentry(name=None)
-    Tk.tk_call('::tablelist::addIPAddrMentry', name)
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/tablelist_tile.rb b/ext/tk/lib/tkextlib/tcllib/tablelist_tile.rb
deleted file mode 100644
index d467e54970..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/tablelist_tile.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/tcllib/tablelist_tile.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-#   * Part of tcllib extension
-#   * A multi-column listbox
-
-require 'tk'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('tablelist_tile', '4.2')
-TkPackage.require('tablelist_tile')
-
-unless defined? Tk::Tcllib::Tablelist_usingTile
-  Tk::Tcllib::Tablelist_usingTile = true
-end
-
-require 'tkextlib/tcllib/tablelist_core'
-
-module Tk
-  module Tcllib
-    class Tablelist
-      # commands related to tile Themems
-      def self.set_theme(theme)
-        Tk.tk_call('::tablelist::setTheme', theme)
-      end
-
-      def self.get_current_theme
-        Tk.tk_call('::tablelist::getCurrentTheme')
-      end
-
-      def self.get_theme_list
-        TkComm.simplelist(Tk.tk_call('::tablelist::getThemes'))
-      end
-      def self.set_theme_defaults
-        Tk.tk_call('::tablelist::setThemeDefaults')
-      end
-    end
-
-    Tablelist_Tile = Tablelist
-    TableList_Tile = Tablelist
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/tkpiechart.rb b/ext/tk/lib/tkextlib/tcllib/tkpiechart.rb
deleted file mode 100644
index 2fc75a68ec..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/tkpiechart.rb
+++ /dev/null
@@ -1,315 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/tcllib/tkpiechart.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-#   * Part of tcllib extension
-#   * Create 2D or 3D pies with labels in Tcl canvases
-#
-
-require 'tk'
-require 'tk/canvas'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('tkpiechart', '6.6')
-TkPackage.require('tkpiechart')
-
-module Tk
-  module Tcllib
-    module Tkpiechart
-    end
-  end
-end
-
-module Tk::Tcllib::Tkpiechart
-  PACKAGE_NAME = 'tkpiechart'.freeze
-  def self.package_name
-    PACKAGE_NAME
-  end
-
-  def self.package_version
-    begin
-      TkPackage.require('tkpiechart')
-    rescue
-      ''
-    end
-  end
-
-  module ConfigMethod
-    include TkConfigMethod
-
-    def __pathname
-      self.path + ';' + self.tag
-    end
-    private :__pathname
-
-    def __cget_cmd
-      ['::switched::cget', self.tag]
-    end
-
-    def __config_cmd
-      ['::switched::configure', self.tag]
-    end
-    private :__config_cmd
-
-    def __configinfo_struct
-      {:key=>0, :alias=>nil, :db_name=>nil, :db_class=>nil,
-        :default_value=>1, :current_value=>2}
-    end
-    private :__configinfo_struct
-
-    def __boolval_optkeys
-      super() << 'select' << 'autoupdate' << 'selectable'
-    end
-    private :__boolval_optkeys
-
-    def __strval_optkeys
-      super() << 'bordercolor' << 'textbackground' <<
-        'widestvaluetext' << 'title'
-    end
-    private :__strval_optkeys
-
-    def __listval_optkeys
-      super() << 'colors'
-    end
-    private :__listval_optkeys
-  end
-
-  ####################################
-  class PieChartObj < TkcItem
-    include ConfigMethod
-
-    def __font_optkeys
-      ['titlefont']
-    end
-    private :__font_optkeys
-  end
-
-  ####################################
-  class Pie < TkcItem
-    include ConfigMethod
-
-    def create_self(x, y, width, height, keys=None)
-      if keys and keys != None
-        @tag_key = tk_call_without_enc('::stooop::new', 'pie',
-                                       @c, x, y, *hash_kv(keys, true))
-      else
-        @tag_key = tk_call_without_enc('::stooop::new', 'pie', @c, x, y)
-      end
-
-      @slice_tbl = {}
-
-      id = "pie(#{@tag_key})"
-
-      @tag = @tag_pie = TkcNamedTag(@c, id)
-      @tag_slices = TkcNamedTag(@c, "pieSlices(#{@tag_key})")
-
-      id
-    end
-    private :create_self
-
-    def tag_key
-      @tag_key
-    end
-    def tag
-      @tag
-    end
-    def canvas
-      @c
-    end
-    def _entry_slice(slice)
-      @slice_tbl[slice.to_eval] = slice
-    end
-    def _delete_slice(slice)
-      @slice_tbl.delete(slice.to_eval)
-    end
-
-    def delete
-      tk_call_without_enc('::stooop::delete', @tag_key)
-      CItemID_TBL.mutex.synchronize{
-        CItemID_TBL[@path].delete(@id) if CItemID_TBL[@path]
-      }
-      self
-    end
-
-    def new_slice(text=None)
-      Slice.new(self, text)
-    end
-
-    def delete_slice(slice)
-      unless slice.kind_of?(Slice)
-        unless (slice = @slice_tbl[slice])
-          return tk_call_without_enc('pie::deleteSlice', @tag_key, slice)
-        end
-      end
-      unless slice.kind_of?(Slice) && slice.pie == self
-        fail ArgumentError, "argument is not a slice of self"
-      end
-      slice.delete
-    end
-
-    def selected_slices
-      tk_split_simplelist(tk_call_without_enc('pie::selectedSlices',
-                                              @tag_key)).collect{|slice|
-        @slice_tbl[slice] || Slice.new(:no_create, self, slice)
-      }
-    end
-  end
-
-  ####################################
-  class Slice < TkcItem
-    include ConfigMethod
-
-    def __config_cmd
-      ['::switched::configure', self.tag]
-    end
-    private :__config_cmd
-
-    #------------------------
-
-    def initialize(pie, *args)
-      unless pie.kind_of?(Pie) && pie != :no_create
-        fail ArgumentError, "expects TkPiechart::Pie for 1st argument"
-      end
-
-      if pie == :no_create
-        @pie, @tag_key = args
-      else
-        text = args[0] || None
-        @pie = pie
-        @tag_key = tk_call_without_enc('pie::newSlice', @pie.tag_key, text)
-      end
-      @parent = @c = @pie.canvas
-      @path = @parent.path
-
-      @pie._entry_slice(self)
-
-      @id = "slices(#{@tag_key})"
-      @tag = TkcNamedTag.new(@pie.canvas, @id)
-
-      CItemID_TBL.mutex.synchronize{
-        CItemID_TBL[@path] = {} unless CItemID_TBL[@path]
-        CItemID_TBL[@path][@id] = self
-      }
-    end
-
-    def tag_key
-      @tag_key
-    end
-    def tag
-      @tag
-    end
-    def pie
-      @pie
-    end
-
-    def delete
-      tk_call_without_enc('pie::deleteSlice', @pie.tag_key, @tag_key)
-      CItemID_TBL.mutex.synchronize{
-        CItemID_TBL[@path].delete(@id) if CItemID_TBL[@path]
-      }
-      @pie._delete_slice(self)
-      self
-    end
-
-    def size(share, disp=None)
-      tk_call_without_enc('pie::sizeSlice',
-                          @pie.tag_key, @tag_key, share, disp)
-      self
-    end
-
-    def label(text)
-      tk_call_without_enc('pie::labelSlice', @pie.tag_key, @tag_key, text)
-      self
-    end
-  end
-
-  ####################################
-  class BoxLabeler < TkcItem
-    include ConfigMethod
-
-    def __config_cmd
-      ['::switched::configure', self.tag]
-    end
-    private :__config_cmd
-
-    #------------------------
-
-    def create_self(keys=None)
-      if keys and keys != None
-        @tag_key = tk_call_without_enc('::stooop::new', 'pieBoxLabeler',
-                                       *hash_kv(keys, true))
-      else
-        @tag_key = tk_call_without_enc('::stooop::new', 'pieBoxLabeler')
-      end
-
-      id = "pieBoxLabeler(#{@tag_key})"
-      @tag = TkcNamedTag(@c, id)
-
-      id
-    end
-    private :create_self
-  end
-
-  ####################################
-  class PeripheralLabeler < TkcItem
-    include ConfigMethod
-
-    def __font_optkeys
-      ['font', 'smallfont']
-    end
-    private :__font_optkeys
-
-    def __config_cmd
-      ['::switched::configure', self.tag]
-    end
-    private :__config_cmd
-
-    #------------------------
-
-    def create_self(keys=None)
-      if keys and keys != None
-        @tag_key = tk_call_without_enc('::stooop::new',
-                                       'piePeripheralLabeler',
-                                       *hash_kv(keys, true))
-      else
-        @tag_key = tk_call_without_enc('::stooop::new', 'piePeripheralLabeler')
-      end
-
-      id = "piePeripheralLabeler(#{@tag_key})"
-      @tag = TkcNamedTag(@c, id)
-
-      id
-    end
-    private :create_self
-  end
-
-  ####################################
-  class Label < TkcItem
-    include ConfigMethod
-
-    def __config_cmd
-      ['::switched::configure', self.tag]
-    end
-    private :__config_cmd
-
-    #------------------------
-
-    def create_self(x, y, keys=None)
-      if keys and keys != None
-        @tag_key = tk_call_without_enc('::stooop::new', 'canvasLabel',
-                                       @c, x, y, width, height,
-                                       *hash_kv(keys, true))
-      else
-        @tag_key = tk_call_without_enc('::stooop::new', 'canvasLabel',
-                                       @c, x, y, width, height)
-      end
-
-      id = "canvasLabel(#{@tag_key})"
-      @tag = TkcNamedTag(@c, id)
-
-      id
-    end
-    private :create_self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/toolbar.rb b/ext/tk/lib/tkextlib/tcllib/toolbar.rb
deleted file mode 100644
index a771548db4..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/toolbar.rb
+++ /dev/null
@@ -1,176 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/tcllib/toolbar.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-#   * Part of tcllib extension
-#   * toolbar widget
-#
-
-require 'tk'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('widget::toolbar', '1.2')
-TkPackage.require('widget::toolbar')
-
-module Tk::Tcllib
-  module Widget
-    class Toolbar < TkWindow
-      PACKAGE_NAME = 'widget::toolbar'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('widget::toolbar')
-        rescue
-          ''
-        end
-      end
-    end
-
-    module ToolbarItemConfig
-      include TkItemConfigMethod
-    end
-  end
-end
-
-
-class Tk::Tcllib::Widget::ToolbarItem < TkObject
-  include TkTreatTagFont
-
-  ToolbarItemID_TBL = TkCore::INTERP.create_table
-
-  TkCore::INTERP.init_ip_env{
-    TTagID_TBL.mutex.synchronize{ TTagID_TBL.clear }
-  }
-
-  def ToolbarItem.id2obj(tbar, id)
-    tpath = tbar.path
-    ToolbarItemID_TBL.mutex.synchronize{
-      if ToolbarItemID_TBL[tpath]
-        ToolbarItemID_TBL[tpath][id]? ToolbarItemID_TBL[tpath][id]: id
-      else
-        id
-      end
-    }
-  end
-
-  def initialize(parent, *args)
-    @parent = @t = parent
-    @tpath = parent.path
-
-    @path = @id = @t.tk_send('add', *args)
-    # A same id is rejected by the Tcl function.
-
-    ToolbarItemID_TBL.mutex.synchronize{
-      ToolbarItemID_TBL[@id] = self
-      ToolbarItemID_TBL[@tpath] = {} unless ToolbarItemID_TBL[@tpath]
-      ToolbarItemID_TBL[@tpath][@id] = self
-    }
-  end
-
-  def [](key)
-    cget key
-  end
-
-  def []=(key,val)
-    configure key, val
-    val
-  end
-
-  def cget_tkstring(option)
-    @t.itemcget_tkstring(@id, option)
-  end
-  def cget(option)
-    @t.itemcget(@id, option)
-  end
-  def cget_strict(option)
-    @t.itemcget_strict(@id, option)
-  end
-
-  def configure(key, value=None)
-    @t.itemconfigure(@id, key, value)
-    self
-  end
-
-  def configinfo(key=nil)
-    @t.itemconfiginfo(@id, key)
-  end
-
-  def current_configinfo(key=nil)
-    @t.current_itemconfiginfo(@id, key)
-  end
-
-  def delete
-    @t.delete(@id)
-  end
-
-  def itemid
-    @t.itemid(@id)
-  end
-
-  def remove
-    @t.remove(@id)
-  end
-  def remove_with_destroy
-    @t.remove_with_destroy(@id)
-  end
-end
-
-class Tk::Tcllib::Widget::Toolbar
-  include Tk::Tcllib::Widget::ToolbarItemConfig
-
-  TkCommandNames = ['::widget::toolbar'.freeze].freeze
-
-  def __destroy_hook__
-    Tk::Tcllib::Widget::ToolbarItem::ToolbarItemID_TBL.mutex.synchronize{
-      Tk::Tcllib::Widget::ToolbarItem::ToolbarItemID_TBL.delete(@path)
-    }
-  end
-
-  def create_self(keys)
-    if keys and keys != None
-      tk_call_without_enc(self.class::TkCommandNames[0], @path,
-                          *hash_kv(keys, true))
-    else
-      tk_call_without_enc(self.class::TkCommandNames[0], @path)
-    end
-  end
-  private :create_self
-
-  def getframe
-    window(tk_send('getframe'))
-  end
-  alias get_frame getframe
-
-  def add(*args)
-    Tk::Tcllib::Widget::Toolbar.new(self, *args)
-  end
-
-  def itemid(item)
-    window(tk_send('itemid'))
-  end
-
-  def items(pattern)
-    tk_split_simplelist(tk_send('items', pattern)).map{|id|
-      Tk::Tcllib::Widget::ToolbarItem.id2obj(self, id)
-    }
-  end
-
-  def remove(*items)
-    tk_send('remove', *items)
-    self
-  end
-
-  def remove_with_destroy(*items)
-    tk_send('remove', '-destroy', *items)
-    self
-  end
-
-  def delete(*items)
-    tk_send('delete', *items)
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/tooltip.rb b/ext/tk/lib/tkextlib/tcllib/tooltip.rb
deleted file mode 100644
index 4a70ec5732..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/tooltip.rb
+++ /dev/null
@@ -1,105 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/tcllib/tooltip.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-#   * Part of tcllib extension
-#   * Provides tooltips, a small text message that is displayed when the
-#     mouse hovers over a widget.
-#
-
-require 'tk'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('tooltip', '1.1')
-TkPackage.require('tooltip')
-
-module Tk::Tcllib
-  module Tooltip
-    PACKAGE_NAME = 'tooltip'.freeze
-    def self.package_name
-      PACKAGE_NAME
-    end
-
-    def self.package_version
-      begin
-        TkPackage.require('tooltip')
-      rescue
-        ''
-      end
-    end
-  end
-end
-
-module Tk::Tcllib::Tooltip
-  extend TkCore
-
-  WidgetClassName = 'Tooltip'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def self.database_classname
-    self::WidgetClassName
-  end
-  def self.database_class
-    WidgetClassNames[self::WidgetClassName]
-  end
-
-  def self.clear(glob_path_pat = None)
-    self.clear_glob(glob_path_pat)
-  end
-
-  def self.clear_glob(glob_path_pat)
-    tk_call_without_enc('::tooltip::tooltip', 'clear', glob_path_pat)
-  end
-
-  def self.clear_widgets(*args)
-    self.clear_glob("{#{args.collect{|w| _get_eval_string(w)}.join(',')}}")
-  end
-
-  def self.clear_children(*args)
-    self.clear_glob("{#{args.collect{|w| s = _get_eval_string(w); "#{s},#{s}.*"}.join(',')}}")
-  end
-
-  def self.delay(millisecs=None)
-    number(tk_call_without_enc('::tooltip::tooltip', 'delay', millisecs))
-  end
-  def self.delay=(millisecs)
-    self.delay(millisecs)
-  end
-
-  def self.fade?
-    bool(tk_call_without_enc('::tooltip::tooltip', 'fade'))
-  end
-  def self.fade(mode)
-    tk_call_without_enc('::tooltip::tooltip', 'fade', mode)
-  end
-
-  def self.disable
-    tk_call_without_enc('::tooltip::tooltip', 'disable')
-    false
-  end
-  def self.off
-    self.disable
-  end
-
-  def self.enable
-    tk_call_without_enc('::tooltip::tooltip', 'enable')
-    true
-  end
-  def self.on
-    self.enable
-  end
-
-  def self.register(widget, msg, keys=nil)
-    if keys.kind_of?(Hash)
-      args = hash_kv(keys) << msg
-    else
-      args = msg
-    end
-    tk_call('::tooltip::tooltip', widget.path, *args)
-  end
-
-  def self.erase(widget)
-    tk_call_without_enc('::tooltip::tooltip', widget.path, '')
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/validator.rb b/ext/tk/lib/tkextlib/tcllib/validator.rb
deleted file mode 100644
index c2c9dda376..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/validator.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/tcllib/validator.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-#   * Part of tcllib extension
-#   * Provides a unified validation API
-#
-
-require 'tk'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('widget::validator', '0.1')
-TkPackage.require('widget::validator')
-
-module Tk::Tcllib
-  module Validator
-    PACKAGE_NAME = 'widget::validator'.freeze
-    def self.package_name
-      PACKAGE_NAME
-    end
-
-    def self.package_version
-      begin
-        TkPackage.require('widget::validator')
-      rescue
-        ''
-      end
-    end
-  end
-end
-
-module Tk::Tcllib::Validator
-  extend TkCore
-
-  def self.attach(widget, color, cmd=Proc.new)
-    tk_call_without_enc('::widget::validator', 'attach', widget, color, cmd)
-    nil
-  end
-
-  def self.detach(widget)
-    tk_call_without_enc('::widget::validator', 'detach', widget)
-    nil
-  end
-
-  def self.validate(widget)
-    tk_call_without_enc('::widget::validator', 'validate', widget)
-    nil
-  end
-
-  def attach_validator(color, cmd=Proc.new)
-    tk_call_without_enc('::widget::validator', 'attach', @path, color, cmd)
-    self
-  end
-
-  def detach_validator(color, cmd=Proc.new)
-    tk_call_without_enc('::widget::validator', 'detach', @path)
-    self
-  end
-
-  def invoke_validator(color, cmd=Proc.new)
-    tk_call_without_enc('::widget::validator', 'validate', @path)
-    self
-  end
-  alias validate_validator invoke_validator
-end
diff --git a/ext/tk/lib/tkextlib/tcllib/widget.rb b/ext/tk/lib/tkextlib/tcllib/widget.rb
deleted file mode 100644
index b8d5070b0b..0000000000
--- a/ext/tk/lib/tkextlib/tcllib/widget.rb
+++ /dev/null
@@ -1,83 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/tcllib/widget.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-#   * Part of tcllib extension
-#   * megawidget package that uses snit as the object system (snidgets)
-#
-
-require 'tk'
-require 'tkextlib/tcllib.rb'
-
-# TkPackage.require('widget', '3.0')
-TkPackage.require('widget')
-
-module Tk::Tcllib
-  module Widget
-    PACKAGE_NAME = 'widget'.freeze
-    def self.package_name
-      PACKAGE_NAME
-    end
-
-    def self.package_version
-      begin
-        TkPackage.require('widget')
-      rescue
-        ''
-      end
-    end
-
-    #--- followings may be private functions of tklib
-    def self.isa(compare_as, *args)
-      begin
-        return Tk.tk_call('::widget::isa', compare_as, *args)
-      rescue => e
-        if TkComm.bool(Tk.tk_call('info','command','::widget::isa')) ||
-            ! TkComm.bool(Tk.tk_call('info','command','::widget::validate'))
-          fail e
-        end
-      end
-      Tk.tk_call('::widget::validate', compare_as, *args)
-    end
-    def self.validate(compare_as, *args)
-      begin
-        return Tk.tk_call('::widget::validate', compare_as, *args)
-      rescue => e
-        if TkComm.bool(Tk.tk_call('info','command','::widget::validate')) ||
-            ! TkComm.bool(Tk.tk_call('info','command','::widget::isa'))
-          fail e
-        end
-      end
-      Tk.tk_call('::widget::isa', compare_as, *args)
-    end
-  end
-end
-
-module Tk::Tcllib::Widget
-  TkComm::TkExtlibAutoloadModule.unshift(self)
-
-  autoload :Calendar,           'tkextlib/tcllib/calendar'
-
-  autoload :Canvas_Sqmap,       'tkextlib/tcllib/canvas_sqmap'
-  autoload :Canvas_Zoom,        'tkextlib/tcllib/canvas_zoom'
-
-  autoload :Dialog,             'tkextlib/tcllib/dialog'
-
-  autoload :Panelframe,         'tkextlib/tcllib/panelframe'
-  autoload :PanelFrame,         'tkextlib/tcllib/panelframe'
-
-  autoload :Ruler,              'tkextlib/tcllib/ruler'
-
-  autoload :Screenruler,        'tkextlib/tcllib/screenruler'
-  autoload :ScreenRuler,        'tkextlib/tcllib/screenruler'
-
-  autoload :Scrolledwindow,     'tkextlib/tcllib/scrollwin'
-  autoload :ScrolledWindow,     'tkextlib/tcllib/scrollwin'
-
-  autoload :Superframe,         'tkextlib/tcllib/superframe'
-  autoload :SuperFrame,         'tkextlib/tcllib/superframe'
-
-  autoload :Toolbar,            'tkextlib/tcllib/toolbar'
-  autoload :ToolbarItem,        'tkextlib/tcllib/toolbar'
-end
diff --git a/ext/tk/lib/tkextlib/tclx.rb b/ext/tk/lib/tkextlib/tclx.rb
deleted file mode 100644
index 1189d855cb..0000000000
--- a/ext/tk/lib/tkextlib/tclx.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# frozen_string_literal: false
-#
-#  TclX support
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/tclx/setup.rb'
-
-# load library
-require 'tkextlib/tclx/tclx'
diff --git a/ext/tk/lib/tkextlib/tclx/setup.rb b/ext/tk/lib/tkextlib/tclx/setup.rb
deleted file mode 100644
index cc967dced6..0000000000
--- a/ext/tk/lib/tkextlib/tclx/setup.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: false
-#
-#  setup.rb   --   setup script before calling TkPackage.require()
-#
-#    If you need some setup operations (for example, add a library path
-#    to the library search path) before using Tcl/Tk library packages
-#    wrapped by Ruby scripts in this directory, please write the setup
-#    operations in this file.
-#
diff --git a/ext/tk/lib/tkextlib/tclx/tclx.rb b/ext/tk/lib/tkextlib/tclx/tclx.rb
deleted file mode 100644
index 7360a85403..0000000000
--- a/ext/tk/lib/tkextlib/tclx/tclx.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-# frozen_string_literal: false
-#
-#  tclx/tclx.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/tclx/setup.rb'
-
-# TkPackage.require('Tclx', '8.0')
-TkPackage.require('Tclx')
-
-module Tk
-  module TclX
-    PACKAGE_NAME = 'Tclx'.freeze
-    def self.package_name
-      PACKAGE_NAME
-    end
-
-    def self.package_version
-      begin
-        TkPackage.require('Tclx')
-      rescue
-        ''
-      end
-    end
-
-    def self.infox(*args)
-      Tk.tk_call('infox', *args)
-    end
-
-    def self.signal(*args)
-      warn("Warning: Don't recommend to use TclX's 'signal' command. Please use Ruby's 'Signal.trap' method")
-      Tk.tk_call('signal', *args)
-    end
-
-    def self.signal_restart(*args)
-      warn("Warning: Don't recommend to use TclX's 'signal' command. Please use Ruby's 'Signal.trap' method")
-      Tk.tk_call('signal', '-restart', *args)
-    end
-
-    ##############################
-
-    class XPG3_MsgCat
-      class << self
-        alias open new
-      end
-
-      def initialize(catname, fail_mode=false)
-        if fail_mode
-          @msgcat_id = Tk.tk_call('catopen', '-fail', catname)
-        else
-          @msgcat_id = Tk.tk_call('catopen', '-nofail', catname)
-        end
-      end
-
-      def close(fail_mode=false)
-        if fail_mode
-          Tk.tk_call('catclose', '-fail', @msgcat_id)
-        else
-          Tk.tk_call('catclose', '-nofail', @msgcat_id)
-        end
-        self
-      end
-
-      def get(setnum, msgnum, defaultstr)
-        Tk.tk_call('catgets', @msgcat_id, setnum, msgnum, defaultstr)
-      end
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tile.rb b/ext/tk/lib/tkextlib/tile.rb
deleted file mode 100644
index 003a978e72..0000000000
--- a/ext/tk/lib/tkextlib/tile.rb
+++ /dev/null
@@ -1,450 +0,0 @@
-# frozen_string_literal: false
-#
-#  Tile theme engine (tile widget set) support
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tk/ttk_selector'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# library directory
-require 'tkextlib/tile/setup.rb'
-
-# load package
-# TkPackage.require('tile', '0.4')
-# TkPackage.require('tile', '0.6')
-# TkPackage.require('tile', '0.7')
-if Tk::TK_MAJOR_VERSION > 8 ||
-    (Tk::TK_MAJOR_VERSION == 8 && Tk::TK_MINOR_VERSION >= 5)
-  begin
-    TkPackage.require('tile') # for compatibility (version check of 'tile')
-  rescue RuntimeError
-    # ignore, even if cannot find package 'tile'
-  end
-  pkgname = 'Ttk'
-else
-  pkgname = 'tile'
-end
-
-begin
-  verstr = TkPackage.require(pkgname)
-rescue RuntimeError
-  # define dummy methods
-  module Tk
-    module Tile
-      CANNOT_FIND_PACKAGE = true
-      def self.const_missing(sym)
-        TkPackage.require(PACKAGE_NAME)
-      end
-      def self.method_missing(*args)
-        TkPackage.require(PACKAGE_NAME)
-      end
-    end
-  end
-  Tk.__cannot_find_tk_package_for_widget_set__(:Ttk, pkgname)
-  if pkgname == 'Ttk'
-    verstr = Tk::TK_PATCHLEVEL  # dummy
-  else
-    verstr = '0.7'  # dummy
-  end
-end
-
-ver = verstr.split('.')
-if ver[0].to_i == 0
-  # Tile extension package
-  if ver[1].to_i <= 4
-    # version 0.4 or former
-    module Tk
-      module Tile
-        USE_TILE_NAMESPACE = true
-        USE_TTK_NAMESPACE  = false
-        TILE_SPEC_VERSION_ID = 0
-      end
-    end
-  elsif ver[1].to_i <= 6
-    # version 0.5 -- version 0.6
-    module Tk
-      module Tile
-        USE_TILE_NAMESPACE = true
-        USE_TTK_NAMESPACE  = true
-        TILE_SPEC_VERSION_ID = 5
-      end
-    end
-  elsif ver[1].to_i <= 7
-    module Tk
-      module Tile
-        USE_TILE_NAMESPACE = false
-        USE_TTK_NAMESPACE  = true
-        TILE_SPEC_VERSION_ID = 7
-      end
-    end
-  else
-    # version 0.8 or later
-    module Tk
-      module Tile
-        USE_TILE_NAMESPACE = false
-        USE_TTK_NAMESPACE  = true
-        TILE_SPEC_VERSION_ID = 8
-      end
-    end
-  end
-
-  module Tk::Tile
-    PACKAGE_NAME = 'tile'.freeze
-  end
-else
-  # Ttk package merged Tcl/Tk core (Tcl/Tk 8.5+)
-  module Tk
-    module Tile
-      USE_TILE_NAMESPACE = false
-      USE_TTK_NAMESPACE  = true
-      TILE_SPEC_VERSION_ID = 8
-
-      PACKAGE_NAME = 'Ttk'.freeze
-    end
-  end
-end
-
-# autoload
-module Tk
-  module Tile
-    TkComm::TkExtlibAutoloadModule.unshift(self)
-
-    def self.package_name
-      PACKAGE_NAME
-    end
-
-    def self.package_version
-      begin
-        TkPackage.require(PACKAGE_NAME)
-      rescue
-        ''
-      end
-    end
-
-    def self.__Import_Tile_Widgets__!
-      warn 'Warning: "Tk::Tile::__Import_Tile_Widgets__!" is obsolete.' <<
-           ' To control default widget set, use "Tk.default_widget_set = :Ttk"'
-      Tk.tk_call('namespace', 'import', '-force', 'ttk::*')
-    end
-
-    def self.__define_LoadImages_proc_for_compatibility__!
-      # Ttk 8.5 (Tile 0.8) lost 'LoadImages' utility procedure.
-      # So, some old scripts don't work, because those scripts use the
-      # procedure to define local styles.
-      # Of course, rewriting such Tcl/Tk scripts isn't difficult for
-      # Tcl/Tk users. However, it may be troublesome for Ruby/Tk users
-      # who use such Tcl/Tk scripts as it is.
-      # This method may help Ruby/Tk users who don't want to modify old
-      # Tcl/Tk scripts for the latest version of Ttk (Tile) extension.
-      # This method defines a compatible 'LoadImages' procedure on the
-      # Tcl/Tk interpreter working under Ruby/Tk.
-      # Please give attention to use this method. It may conflict with
-      # some definitions on Tcl/Tk scripts.
-      klass_name = self.name
-      proc_name = 'LoadImages'
-      if Tk::Tile::USE_TTK_NAMESPACE
-        ns_list = ['::tile']
-        if Tk.info(:commands, "::ttk::#{proc_name}").empty?
-          ns_list << '::ttk'
-        end
-      else # Tk::Tile::USE_TILE_NAMESPACE
-        ns_list = ['::ttk']
-        if Tk.info(:commands, "::tile::#{proc_name}").empty?
-          ns_list << '::tile'
-        end
-      end
-
-      ns_list.each{|ns|
-        cmd = "#{ns}::#{proc_name}"
-        unless Tk.info(:commands, cmd).empty?
-          #fail RuntimeError, "can't define '#{cmd}' command (already exist)"
-
-          # do nothing !!!
-          warn "Warning: can't define '#{cmd}' command (already exist)" if $DEBUG
-          next
-        end
-        TkNamespace.eval(ns){
-          TkCore::INTERP.add_tk_procs(proc_name, 'imgdir {patterns {*.gif}}',
-                                      <<-'EOS')
-            foreach pattern $patterns {
-              foreach file [glob -directory $imgdir $pattern] {
-                set img [file tail [file rootname $file]]
-                if {![info exists images($img)]} {
-                  set images($img) [image create photo -file $file]
-                }
-              }
-            }
-            return [array get images]
-          EOS
-        }
-      }
-    end
-
-    def self.load_images(imgdir, pat=nil)
-      if Tk::Tile::TILE_SPEC_VERSION_ID < 8
-        if Tk::Tile::USE_TTK_NAMESPACE
-          cmd = '::ttk::LoadImages'
-        else # Tk::Tile::USE_TILE_NAMESPACE
-          cmd = '::tile::LoadImages'
-        end
-        pat ||= TkComm::None
-        images = Hash[*TkComm.simplelist(Tk.tk_call(cmd, imgdir, pat))]
-        images.keys.each{|k|
-          images[k] = TkPhotoImage.new(:imagename=>images[k],
-                                       :without_creating=>true)
-        }
-      else ## TILE_SPEC_VERSION_ID >= 8
-        pat ||= '*.gif'
-        if pat.kind_of?(Array)
-          pat_list = pat
-        else
-          pat_list = [ pat ]
-        end
-        Dir.chdir(imgdir){
-          pat_list.each{|pat|
-            Dir.glob(pat).each{|f|
-              img = File.basename(f, '.*')
-              unless TkComm.bool(Tk.info('exists', "images(#{img})"))
-                Tk.tk_call('set', "images(#{img})",
-                           Tk.tk_call('image', 'create', 'photo', '-file', f))
-              end
-            }
-          }
-        }
-        images = Hash[*TkComm.simplelist(Tk.tk_call('array', 'get', 'images'))]
-        images.keys.each{|k|
-          images[k] = TkPhotoImage.new(:imagename=>images[k],
-                                       :without_creating=>true)
-        }
-      end
-
-      images
-    end
-
-    def self.style(*args)
-      args.map!{|arg| TkComm._get_eval_string(arg)}.join('.')
-    end
-
-    def self.themes(glob_ptn = nil)
-      if TILE_SPEC_VERSION_ID < 8 && Tk.info(:commands, '::ttk::themes').empty?
-        fail RuntimeError, 'not support glob option' if glob_ptn
-        cmd = ['::tile::availableThemes']
-      else
-        glob_ptn = '*' unless glob_ptn
-        cmd = ['::ttk::themes', glob_ptn]
-      end
-
-      begin
-        TkComm.simplelist(Tk.tk_call_without_enc(*cmd))
-      rescue
-        TkComm.simplelist(Tk.tk_call('lsearch', '-all', '-inline',
-                                     Tk::Tile::Style.theme_names,
-                                     glob_ptn))
-      end
-    end
-
-    def self.set_theme(theme)
-      if TILE_SPEC_VERSION_ID < 8 && Tk.info(:commands, '::ttk::setTheme').empty?
-        cmd = '::tile::setTheme'
-      else
-        cmd = '::ttk::setTheme'
-      end
-
-      begin
-        Tk.tk_call_without_enc(cmd, theme)
-      rescue
-        Tk::Tile::Style.theme_use(theme)
-      end
-    end
-
-    module KeyNav
-      if Tk::Tile::TILE_SPEC_VERSION_ID < 8
-        def self.enableMnemonics(w)
-          Tk.tk_call('::keynav::enableMnemonics', w)
-        end
-        def self.defaultButton(w)
-          Tk.tk_call('::keynav::defaultButton', w)
-        end
-      else # dummy
-        def self.enableMnemonics(w)
-          ""
-        end
-        def self.defaultButton(w)
-          ""
-        end
-      end
-    end
-
-    module Font
-      Default      = 'TkDefaultFont'
-      Text         = 'TkTextFont'
-      Heading      = 'TkHeadingFont'
-      Caption      = 'TkCaptionFont'
-      Tooltip      = 'TkTooltipFont'
-
-      Fixed        = 'TkFixedFont'
-      Menu         = 'TkMenuFont'
-      SmallCaption = 'TkSmallCaptionFont'
-      Icon         = 'TkIconFont'
-
-      TkFont::SYSTEM_FONT_NAMES.add [
-        'TkDefaultFont', 'TkTextFont', 'TkHeadingFont',
-        'TkCaptionFont', 'TkTooltipFont', 'TkFixedFont',
-        'TkMenuFont', 'TkSmallCaptionFont', 'TkIconFont'
-      ]
-    end
-
-    module ParseStyleLayout
-      def _style_layout(lst)
-        ret = []
-        until lst.empty?
-          sub = [lst.shift]
-          keys = {}
-
-          until lst.empty?
-            if lst[0][0] == ?-
-              k = lst.shift[1..-1]
-              children = lst.shift
-              children = _style_layout(children) if children.kind_of?(Array)
-              keys[k] = children
-            else
-              break
-            end
-          end
-
-          sub << keys unless keys.empty?
-          ret << sub
-        end
-        ret
-      end
-      private :_style_layout
-    end
-
-    module TileWidget
-      include Tk::Tile::ParseStyleLayout
-
-      def __val2ruby_optkeys  # { key=>proc, ... }
-        # The method is used to convert a opt-value to a ruby's object.
-        # When get the value of the option "key", "proc.call(value)" is called.
-        super().update('style'=>proc{|v| _style_layout(list(v))})
-      end
-      private :__val2ruby_optkeys
-
-      def ttk_instate(state, script=nil, &b)
-        if script
-          tk_send('instate', state, script)
-        elsif b
-          tk_send('instate', state, Proc.new(&b))
-        else
-          bool(tk_send('instate', state))
-        end
-      end
-      alias tile_instate ttk_instate
-
-      def ttk_state(state=nil)
-        if state
-          tk_send('state', state)
-        else
-          list(tk_send('state'))
-        end
-      end
-      alias tile_state ttk_state
-
-      def ttk_identify(x, y)
-        ret = tk_send_without_enc('identify', x, y)
-        (ret.empty?)? nil: ret
-      end
-      alias tile_identify ttk_identify
-
-      # remove instate/state/identify method
-      # to avoid the conflict with widget options
-      if Tk.const_defined?(:USE_OBSOLETE_TILE_STATE_METHOD) && Tk::USE_OBSOLETE_TILE_STATE_METHOD
-        alias instate  ttk_instate
-        alias state    ttk_state
-        alias identify ttk_identify
-      end
-    end
-
-    ######################################
-
-    autoload :TButton,       'tkextlib/tile/tbutton'
-    autoload :Button,        'tkextlib/tile/tbutton'
-
-    autoload :TCheckButton,  'tkextlib/tile/tcheckbutton'
-    autoload :CheckButton,   'tkextlib/tile/tcheckbutton'
-    autoload :TCheckbutton,  'tkextlib/tile/tcheckbutton'
-    autoload :Checkbutton,   'tkextlib/tile/tcheckbutton'
-
-    autoload :Dialog,        'tkextlib/tile/dialog'
-
-    autoload :TEntry,        'tkextlib/tile/tentry'
-    autoload :Entry,         'tkextlib/tile/tentry'
-
-    autoload :TCombobox,     'tkextlib/tile/tcombobox'
-    autoload :Combobox,      'tkextlib/tile/tcombobox'
-
-    autoload :TFrame,        'tkextlib/tile/tframe'
-    autoload :Frame,         'tkextlib/tile/tframe'
-
-    autoload :TLabelframe,   'tkextlib/tile/tlabelframe'
-    autoload :Labelframe,    'tkextlib/tile/tlabelframe'
-    autoload :TLabelFrame,   'tkextlib/tile/tlabelframe'
-    autoload :LabelFrame,    'tkextlib/tile/tlabelframe'
-
-    autoload :TLabel,        'tkextlib/tile/tlabel'
-    autoload :Label,         'tkextlib/tile/tlabel'
-
-    autoload :TMenubutton,   'tkextlib/tile/tmenubutton'
-    autoload :Menubutton,    'tkextlib/tile/tmenubutton'
-    autoload :TMenuButton,   'tkextlib/tile/tmenubutton'
-    autoload :MenuButton,    'tkextlib/tile/tmenubutton'
-
-    autoload :TNotebook,     'tkextlib/tile/tnotebook'
-    autoload :Notebook,      'tkextlib/tile/tnotebook'
-
-    autoload :TPaned,        'tkextlib/tile/tpaned'
-    autoload :Paned,         'tkextlib/tile/tpaned'
-    autoload :PanedWindow,   'tkextlib/tile/tpaned'
-    autoload :Panedwindow,   'tkextlib/tile/tpaned'
-
-    autoload :TProgressbar,  'tkextlib/tile/tprogressbar'
-    autoload :Progressbar,   'tkextlib/tile/tprogressbar'
-
-    autoload :TRadioButton,  'tkextlib/tile/tradiobutton'
-    autoload :RadioButton,   'tkextlib/tile/tradiobutton'
-    autoload :TRadiobutton,  'tkextlib/tile/tradiobutton'
-    autoload :Radiobutton,   'tkextlib/tile/tradiobutton'
-
-    autoload :TScale,        'tkextlib/tile/tscale'
-    autoload :Scale,         'tkextlib/tile/tscale'
-    autoload :TProgress,     'tkextlib/tile/tscale'
-    autoload :Progress,      'tkextlib/tile/tscale'
-
-    autoload :TScrollbar,    'tkextlib/tile/tscrollbar'
-    autoload :Scrollbar,     'tkextlib/tile/tscrollbar'
-    autoload :XScrollbar,    'tkextlib/tile/tscrollbar'
-    autoload :YScrollbar,    'tkextlib/tile/tscrollbar'
-
-    autoload :TSeparator,    'tkextlib/tile/tseparator'
-    autoload :Separator,     'tkextlib/tile/tseparator'
-
-    autoload :TSpinbox,      'tkextlib/tile/tspinbox'
-    autoload :Spinbox,       'tkextlib/tile/tspinbox'
-
-    autoload :TSquare,       'tkextlib/tile/tsquare'
-    autoload :Square,        'tkextlib/tile/tsquare'
-
-    autoload :SizeGrip,      'tkextlib/tile/sizegrip'
-    autoload :Sizegrip,      'tkextlib/tile/sizegrip'
-
-    autoload :Treeview,      'tkextlib/tile/treeview'
-
-    autoload :Style,         'tkextlib/tile/style'
-  end
-end
-
-Ttk = Tk::Tile
diff --git a/ext/tk/lib/tkextlib/tile/dialog.rb b/ext/tk/lib/tkextlib/tile/dialog.rb
deleted file mode 100644
index d81851bb68..0000000000
--- a/ext/tk/lib/tkextlib/tile/dialog.rb
+++ /dev/null
@@ -1,103 +0,0 @@
-# frozen_string_literal: false
-#
-#  ttk::dialog  (tile-0.7+)
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-require 'tkextlib/tile.rb'
-
-module Tk
-  module Tile
-    class Dialog < TkWindow
-    end
-  end
-end
-
-begin
-  TkPackage.require('ttk::dialog') # this may be required.
-rescue RuntimeError
-  # ignore
-end
-
-class Tk::Tile::Dialog
-  TkCommandNames = ['::ttk::dialog'.freeze].freeze
-
-  def self.show(*args)
-    dialog = self.new(*args)
-    dialog.show
-    [dialog.status, dialog.value]
-  end
-  def self.display(*args)
-    self.show(*args)
-  end
-
-  def self.define_dialog_type(name, keys)
-    Tk.tk_call('::ttk::dialog::define', name, keys)
-    name
-  end
-
-  def self.style(*args)
-    ['Dialog', *(args.map!{|a| _get_eval_string(a)})].join('.')
-  end
-
-  #########################
-
-  def initialize(keys={})
-    @keys = _symbolkey2str(keys)
-    super(*args)
-  end
-
-  def create_self(keys)
-    # dummy
-  end
-  private :create_self
-
-  def show
-    tk_call(self.class::TkCommandNames[0], @path, *hash_kv(@keys))
-  end
-  alias display show
-
-  def client_frame
-    window(tk_call_without_enc('::ttk::dialog::clientframe', @path))
-  end
-
-  def cget_strict(slot)
-    @keys[slot.to_s]
-  end
-  def cget(slot)
-    @keys[slot.to_s]
-  end
-=begin
-  def cget(slot)
-    unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-      cget_strict(slot)
-    else
-      cget_strict(slot) rescue nil
-    end
-  end
-=end
-
-  def configure(slot, value=None)
-    if slot.kind_of?(Hash)
-      slot.each{|k, v| configure(k, v)}
-    else
-      slot = slot.to_s
-      value = _symbolkey2str(value) if value.kind_of?(Hash)
-      if value && value != None
-        @keys[slot] = value
-      else
-        @keys.delete(slot)
-      end
-    end
-    self
-  end
-
-  def configinfo(slot = nil)
-    if slot
-      slot = slot.to_s
-      [ slot, nil, nil, nil, @keys[slot] ]
-    else
-      @keys.collect{|k, v| [ k, nil, nil, nil, v ] }
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tile/setup.rb b/ext/tk/lib/tkextlib/tile/setup.rb
deleted file mode 100644
index cc967dced6..0000000000
--- a/ext/tk/lib/tkextlib/tile/setup.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: false
-#
-#  setup.rb   --   setup script before calling TkPackage.require()
-#
-#    If you need some setup operations (for example, add a library path
-#    to the library search path) before using Tcl/Tk library packages
-#    wrapped by Ruby scripts in this directory, please write the setup
-#    operations in this file.
-#
diff --git a/ext/tk/lib/tkextlib/tile/sizegrip.rb b/ext/tk/lib/tkextlib/tile/sizegrip.rb
deleted file mode 100644
index 4b9510aefa..0000000000
--- a/ext/tk/lib/tkextlib/tile/sizegrip.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-# frozen_string_literal: false
-#
-#  ttk::sizegrip widget
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-require 'tkextlib/tile.rb'
-
-module Tk
-  module Tile
-    class SizeGrip < TkWindow
-    end
-    Sizegrip = SizeGrip
-  end
-end
-
-class Tk::Tile::SizeGrip < TkWindow
-  include Tk::Tile::TileWidget
-
-  TkCommandNames = ['::ttk::sizegrip'.freeze].freeze
-  WidgetClassName = 'TSizegrip'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def self.style(*args)
-    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
-  end
-end
-
-#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Sizegrip,
-#                            :TkSizegrip, :TkSizeGrip)
-Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/sizegrip.rb',
-                                   :Ttk, Tk::Tile::Sizegrip,
-                                   :TkSizegrip, :TkSizeGrip)
diff --git a/ext/tk/lib/tkextlib/tile/style.rb b/ext/tk/lib/tkextlib/tile/style.rb
deleted file mode 100644
index a96cba795f..0000000000
--- a/ext/tk/lib/tkextlib/tile/style.rb
+++ /dev/null
@@ -1,337 +0,0 @@
-# frozen_string_literal: false
-#
-#  style commands
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-require 'tkextlib/tile.rb'
-
-module Tk
-  module Tile
-    module Style
-    end
-  end
-end
-
-module Tk::Tile::Style
-  extend TkCore
-end
-
-class << Tk::Tile::Style
-  if Tk::Tile::TILE_SPEC_VERSION_ID < 8
-    TkCommandNames = ['style'.freeze].freeze
-
-    # --- Tk::Tile::Style.__define_wrapper_proc_for_compatibility__! ---
-    # On Ttk (Tile) extension, 'style' command has incompatible changes
-    # depend on the version of the extension. It requires modifying the
-    # Tcl/Tk scripts to define local styles. The rule for modification
-    # is a simple one. But, if users want to keep compatibility between
-    # versions of the extension, they will have to contrive to do that.
-    # It may be troublesome, especially for Ruby/Tk users.
-    # This method may help such work. This method make some definitions
-    # on the Tcl/Tk interpreter to work with different version of style
-    # command format. Please give attention to use this method. It may
-    # conflict with some definitions on Tcl/Tk scripts.
-    if Tk::Tile::TILE_SPEC_VERSION_ID < 7
-      def __define_wrapper_proc_for_compatibility__!
-        __define_themes_and_setTheme_proc__!
-
-        unless Tk.info(:commands, '::ttk::style').empty?
-          # fail RuntimeError,
-          #      "can't define '::ttk::style' command (already exist)"
-
-          # do nothing !!!
-          warn "Warning: can't define '::ttk::style' command (already exist)" if $DEBUG
-          return
-        end
-        TkCore::INTERP.add_tk_procs('::ttk::style', 'args', <<-'EOS')
-        if [string equal [lrange $args 0 1] {element create}] {
-          if [string equal [lindex $args 3] image] {
-            set spec [lindex $args 4]
-            set map  [lrange $spec 1 end]
-            if [llength $map] {
-              # return [eval [concat [list ::style element create [lindex $args 2] image [lindex $spec 0] -map $map] [lrange $args 5 end]]]
-              return [uplevel 1 [list ::style element create [lindex $args 2] image [lindex $spec 0] -map $map] [lrange $args 5 end]]
-            }
-          }
-        }
-        # return [eval "::style $args"]
-        return [uplevel 1 ::style $args]
-      EOS
-        #########################
-      end
-    else ### TILE_SPEC_VERSION_ID == 7
-      def __define_wrapper_proc_for_compatibility__!
-        __define_themes_and_setTheme_proc__!
-
-        unless Tk.info(:commands, '::ttk::style').empty?
-          # fail RuntimeError,
-          #     "can't define '::ttk::style' command (already exist)"
-
-          # do nothing !!!
-          warn "Warning: can't define '::ttk::style' command (already exist)" if $DEBUG
-          return
-        end
-        TkCore::INTERP.add_tk_procs('::ttk::style', 'args', <<-'EOS')
-        if [string equal [lrange $args 0 1] {element create}] {
-          if [string equal [lindex $args 3] image] {
-            set spec [lindex $args 4]
-            set map  [lrange $spec 1 end]
-            if [llength $map] {
-              # return [eval [concat [list ::style element create [lindex $args 2] image [lindex $spec 0] -map $map] [lrange $args 5 end]]]
-              return [uplevel 1 [list ::style element create [lindex $args 2] image [lindex $spec 0] -map $map] [lrange $args 5 end]]]
-            }
-          }
-        } elseif [string equal [lindex $args 0] default] {
-          # return [eval "::style [lreplace $args 0 0 configure]"]
-          return [uplevel 1 ::style [lreplace $args 0 0 configure]]
-        }
-        # return [eval "::style $args"]
-        return [uplevel 1 ::style $args]
-      EOS
-        #########################
-      end
-    end
-  else ### TILE_SPEC_VERSION_ID >= 8
-    TkCommandNames = ['::ttk::style'.freeze].freeze
-
-    def __define_wrapper_proc_for_compatibility__!
-      __define_themes_and_setTheme_proc__!
-
-      unless Tk.info(:commands, '::style').empty?
-        # fail RuntimeError, "can't define '::style' command (already exist)"
-
-        # do nothing !!!
-        warn "Warning: can't define '::style' command (already exist)" if $DEBUG
-        return
-      end
-      TkCore::INTERP.add_tk_procs('::style', 'args', <<-'EOS')
-        if [string equal [lrange $args 0 1] {element create}] {
-          if [string equal [lindex $args 3] image] {
-            set name [lindex $args 4]
-            set opts [lrange $args 5 end]
-            set idx [lsearch $opts -map]
-            if {$idx >= 0 && [expr $idx % 2 == 0]} {
-             # return [eval [concat [list ::ttk::style element create [lindex $args 2] image [concat $name [lindex $opts [expr $idx + 1]]]] [lreplace $opts $idx [expr $idx + 1]]]]
-              return [uplevel 1 [list ::ttk::style element create [lindex $args 2] image [concat $name [lindex $opts [expr $idx + 1]]]] [lreplace $opts $idx [expr $idx + 1]]]
-            }
-          }
-        } elseif [string equal [lindex $args 0] default] {
-          # return [eval "::ttk::style [lreplace $args 0 0 configure]"]
-          return [uplevel 1 ::ttk::style [lreplace $args 0 0 configure]]
-        }
-        # return [eval "::ttk::style $args"]
-        return [uplevel 1 ::ttk::style $args]
-      EOS
-      #########################
-    end
-  end
-
-  def __define_themes_and_setTheme_proc__!
-    TkCore::INTERP.add_tk_procs('::ttk::themes', '{ptn *}', <<-'EOS')
-      #set themes [list]
-      set themes [::ttk::style theme names]
-      foreach pkg [lsearch -inline -all -glob [package names] ttk::theme::$ptn] {
-          set theme [namespace tail $pkg]
-          if {[lsearch -exact $themes $theme] < 0} {
-              lappend themes $theme
-          }
-      }
-      foreach pkg [lsearch -inline -all -glob [package names] tile::theme::$ptn] {
-          set theme [namespace tail $pkg]
-          if {[lsearch -exact $themes $theme] < 0} {
-              lappend themes $theme
-          }
-      }
-      return $themes
-    EOS
-    #########################
-    TkCore::INTERP.add_tk_procs('::ttk::setTheme', 'theme', <<-'EOS')
-      variable currentTheme
-      if {[lsearch -exact [::ttk::style theme names] $theme] < 0} {
-          package require [lsearch -inline -regexp [package names] (ttk|tile)::theme::$theme]
-      }
-      ::ttk::style theme use $theme
-      set currentTheme $theme
-    EOS
-  end
-  private :__define_themes_and_setTheme_proc__!
-
-  def configure(style=nil, keys=nil)
-    if style.kind_of?(Hash)
-      keys = style
-      style = nil
-    end
-    style = '.' unless style
-
-    if Tk::Tile::TILE_SPEC_VERSION_ID < 7
-      sub_cmd = 'default'
-    else
-      sub_cmd = 'configure'
-    end
-
-    if keys && keys != None
-      tk_call(TkCommandNames[0], sub_cmd, style, *hash_kv(keys))
-    else
-      tk_call(TkCommandNames[0], sub_cmd, style)
-    end
-  end
-  alias default configure
-
-  def map(style=nil, keys=nil)
-    if style.kind_of?(Hash)
-      keys = style
-      style = nil
-    end
-    style = '.' unless style
-
-    if keys && keys != None
-      if keys.kind_of?(Hash)
-        tk_call(TkCommandNames[0], 'map', style, *hash_kv(keys))
-      else
-        simplelist(tk_call(TkCommandNames[0], 'map', style, '-' << keys.to_s))
-      end
-    else
-      ret = {}
-      Hash[*(simplelist(tk_call(TkCommandNames[0], 'map', style)))].each{|k, v|
-        ret[k[1..-1]] = list(v)
-      }
-      ret
-    end
-  end
-  alias map_configure map
-
-  def map_configinfo(style=nil, key=None)
-    style = '.' unless style
-    map(style, key)
-  end
-
-  def map_default_configinfo(key=None)
-    map('.', key)
-  end
-
-  def lookup(style, opt, state=None, fallback_value=None)
-    tk_call(TkCommandNames[0], 'lookup', style,
-            '-' << opt.to_s, state, fallback_value)
-  end
-
-  include Tk::Tile::ParseStyleLayout
-
-  def layout(style=nil, spec=nil)
-    if style.kind_of?(Hash)
-      spec = style
-      style = nil
-    end
-    style = '.' unless style
-
-    if spec
-      tk_call(TkCommandNames[0], 'layout', style, spec)
-    else
-      _style_layout(list(tk_call(TkCommandNames[0], 'layout', style)))
-    end
-  end
-
-  def element_create(name, type, *args)
-    if type == 'image' || type == :image
-      element_create_image(name, *args)
-    elsif type == 'vsapi' || type == :vsapi
-      element_create_vsapi(name, *args)
-    else
-      tk_call(TkCommandNames[0], 'element', 'create', name, type, *args)
-    end
-  end
-
-  def element_create_image(name, *args)
-    fail ArgumentError, 'Must supply a base image' unless (spec = args.shift)
-    if (opts = args.shift)
-      if opts.kind_of?(Hash)
-        opts = _symbolkey2str(opts)
-      else
-        fail ArgumentError, 'bad option'
-      end
-    end
-    fail ArgumentError, 'too many arguments' unless args.empty?
-
-    if spec.kind_of?(Array)
-      # probably, command format is tile 0.8+ (Tcl/Tk8.5+) style
-      if Tk::Tile::TILE_SPEC_VERSION_ID >= 8
-        if opts
-          tk_call(TkCommandNames[0],
-                  'element', 'create', name, 'image', spec, opts)
-        else
-          tk_call(TkCommandNames[0], 'element', 'create', name, 'image', spec)
-        end
-      else
-        fail ArgumentError, 'illegal arguments' if opts.key?('map')
-        base = spec.shift
-        opts['map'] = spec
-        tk_call(TkCommandNames[0],
-                'element', 'create', name, 'image', base, opts)
-      end
-    else
-      # probably, command format is tile 0.7.8 or older style
-      if Tk::Tile::TILE_SPEC_VERSION_ID >= 8
-        spec = [spec, *(opts.delete('map'))] if opts.key?('map')
-      end
-      if opts
-        tk_call(TkCommandNames[0],
-                'element', 'create', name, 'image', spec, opts)
-      else
-        tk_call(TkCommandNames[0], 'element', 'create', name, 'image', spec)
-      end
-    end
-  end
-
-  def element_create_vsapi(name, class_name, part_id, *args)
-    # supported on Tcl/Tk 8.6 or later
-
-    # argument check
-    if (state_map = args.shift || None)
-      if state_map.kind_of?(Hash)
-        opts = _symbolkey2str(state_map)
-        state_map = None
-      end
-    end
-    opts = args.shift || None
-    fail ArgumentError, "too many arguments" unless args.empty?
-
-    # define a Microsoft Visual Styles element
-    tk_call(TkCommandNames[0], 'element', 'create', name, 'vsapi',
-            class_name, part_id, state_map, opts)
-  end
-
-  def element_names()
-    list(tk_call(TkCommandNames[0], 'element', 'names'))
-  end
-
-  def element_options(elem)
-    simplelist(tk_call(TkCommandNames[0], 'element', 'options', elem))
-  end
-
-  def theme_create(name, keys=nil)
-    name = name.to_s
-    if keys && keys != None
-      tk_call(TkCommandNames[0], 'theme', 'create', name, *hash_kv(keys))
-    else
-      tk_call(TkCommandNames[0], 'theme', 'create', name)
-    end
-    name
-  end
-
-  def theme_settings(name, cmd=nil, &b)
-    name = name.to_s
-    cmd = Proc.new(&b) if !cmd && b
-    tk_call(TkCommandNames[0], 'theme', 'settings', name, cmd)
-    name
-  end
-
-  def theme_names()
-    list(tk_call(TkCommandNames[0], 'theme', 'names'))
-  end
-
-  def theme_use(name)
-    name = name.to_s
-    tk_call(TkCommandNames[0], 'theme', 'use', name)
-    name
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tile/tbutton.rb b/ext/tk/lib/tkextlib/tile/tbutton.rb
deleted file mode 100644
index 217da62eca..0000000000
--- a/ext/tk/lib/tkextlib/tile/tbutton.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# frozen_string_literal: false
-#
-#  tbutton widget
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-require 'tkextlib/tile.rb'
-
-module Tk
-  module Tile
-    class TButton < Tk::Button
-    end
-    Button = TButton
-  end
-end
-
-class Tk::Tile::TButton < Tk::Button
-  include Tk::Tile::TileWidget
-
-  if Tk::Tile::USE_TTK_NAMESPACE
-    TkCommandNames = ['::ttk::button'.freeze].freeze
-  else
-    TkCommandNames = ['::tbutton'.freeze].freeze
-  end
-  WidgetClassName = 'TButton'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def self.style(*args)
-    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
-  end
-end
-
-#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Button, :TkButton)
-Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tbutton.rb',
-                                   :Ttk, Tk::Tile::Button, :TkButton)
diff --git a/ext/tk/lib/tkextlib/tile/tcheckbutton.rb b/ext/tk/lib/tkextlib/tile/tcheckbutton.rb
deleted file mode 100644
index c0e4d4b505..0000000000
--- a/ext/tk/lib/tkextlib/tile/tcheckbutton.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-# frozen_string_literal: false
-#
-#  tcheckbutton widget
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-require 'tkextlib/tile.rb'
-
-module Tk
-  module Tile
-    class TCheckButton < Tk::CheckButton
-    end
-    TCheckbutton = TCheckButton
-    CheckButton  = TCheckButton
-    Checkbutton  = TCheckButton
-  end
-end
-
-class Tk::Tile::TCheckButton < Tk::CheckButton
-  include Tk::Tile::TileWidget
-
-  if Tk::Tile::USE_TTK_NAMESPACE
-    TkCommandNames = ['::ttk::checkbutton'.freeze].freeze
-  else
-    TkCommandNames = ['::tcheckbutton'.freeze].freeze
-  end
-  WidgetClassName = 'TCheckbutton'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def self.style(*args)
-    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
-  end
-end
-
-#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Checkbutton,
-#                            :TkCheckbutton, :TkCheckButton)
-Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tcheckbutton.rb',
-                                   :Ttk, Tk::Tile::Checkbutton,
-                                   :TkCheckbutton, :TkCheckButton)
diff --git a/ext/tk/lib/tkextlib/tile/tcombobox.rb b/ext/tk/lib/tkextlib/tile/tcombobox.rb
deleted file mode 100644
index f2dec21fbf..0000000000
--- a/ext/tk/lib/tkextlib/tile/tcombobox.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-# frozen_string_literal: false
-#
-#  tcombobox widget
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-require 'tkextlib/tile.rb'
-
-module Tk
-  module Tile
-    class TCombobox < Tk::Tile::TEntry
-    end
-    Combobox = TCombobox
-  end
-end
-
-class Tk::Tile::TCombobox < Tk::Tile::TEntry
-  include Tk::Tile::TileWidget
-
-  if Tk::Tile::USE_TTK_NAMESPACE
-    TkCommandNames = ['::ttk::combobox'.freeze].freeze
-  else
-    TkCommandNames = ['::tcombobox'.freeze].freeze
-  end
-  WidgetClassName = 'TCombobox'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __boolval_optkeys
-    super() << 'exportselection'
-  end
-  private :__boolval_optkeys
-
-  def __listval_optkeys
-    super() << 'values'
-  end
-  private :__listval_optkeys
-
-  def self.style(*args)
-    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
-  end
-
-  def current
-    number(tk_send_without_enc('current'))
-  end
-  def current=(idx)
-    tk_send_without_enc('current', idx)
-  end
-
-  def set(val)
-    tk_send('set', val)
-  end
-end
-
-#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Combobox, :TkCombobox)
-Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tcombobox.rb',
-                                   :Ttk, Tk::Tile::Combobox, :TkCombobox)
diff --git a/ext/tk/lib/tkextlib/tile/tentry.rb b/ext/tk/lib/tkextlib/tile/tentry.rb
deleted file mode 100644
index 5d577a65a6..0000000000
--- a/ext/tk/lib/tkextlib/tile/tentry.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-# frozen_string_literal: false
-#
-#  tentry widget
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-require 'tkextlib/tile.rb'
-
-module Tk
-  module Tile
-    class TEntry < Tk::Entry
-    end
-    Entry = TEntry
-  end
-end
-
-class Tk::Tile::TEntry < Tk::Entry
-  include Tk::Tile::TileWidget
-
-  if Tk::Tile::USE_TTK_NAMESPACE
-    TkCommandNames = ['::ttk::entry'.freeze].freeze
-  else
-    TkCommandNames = ['::tentry'.freeze].freeze
-  end
-  WidgetClassName = 'TEntry'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __optkey_aliases
-    {:vcmd=>:validatecommand, :invcmd=>:invalidcommand}
-  end
-  private :__optkey_aliases
-
-  def __boolval_optkeys
-    super() << 'exportselection'
-  end
-  private :__boolval_optkeys
-
-  def __strval_optkeys
-    super() << 'show'
-  end
-  private :__strval_optkeys
-
-  def self.style(*args)
-    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
-  end
-end
-
-#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Entry, :TkEntry)
-Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tentry.rb',
-                                   :Ttk, Tk::Tile::Entry, :TkEntry)
diff --git a/ext/tk/lib/tkextlib/tile/tframe.rb b/ext/tk/lib/tkextlib/tile/tframe.rb
deleted file mode 100644
index 5ebf19d1e8..0000000000
--- a/ext/tk/lib/tkextlib/tile/tframe.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# frozen_string_literal: false
-#
-#  tframe widget
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-require 'tkextlib/tile.rb'
-
-module Tk
-  module Tile
-    class TFrame < Tk::Frame
-    end
-    Frame = TFrame
-  end
-end
-
-class Tk::Tile::TFrame < Tk::Frame
-  include Tk::Tile::TileWidget
-
-  if Tk::Tile::USE_TTK_NAMESPACE
-    TkCommandNames = ['::ttk::frame'.freeze].freeze
-  else
-    TkCommandNames = ['::tframe'.freeze].freeze
-  end
-  WidgetClassName = 'TFrame'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def self.style(*args)
-    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
-  end
-end
-
-#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Frame, :TkFrame)
-Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tframe.rb',
-                                   :Ttk, Tk::Tile::Frame, :TkFrame)
diff --git a/ext/tk/lib/tkextlib/tile/tlabel.rb b/ext/tk/lib/tkextlib/tile/tlabel.rb
deleted file mode 100644
index 3dddeafc21..0000000000
--- a/ext/tk/lib/tkextlib/tile/tlabel.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# frozen_string_literal: false
-#
-#  tlabel widget
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-require 'tkextlib/tile.rb'
-
-module Tk
-  module Tile
-    class TLabel < Tk::Label
-    end
-    Label = TLabel
-  end
-end
-
-class Tk::Tile::TLabel < Tk::Label
-  include Tk::Tile::TileWidget
-
-  if Tk::Tile::USE_TTK_NAMESPACE
-    TkCommandNames = ['::ttk::label'.freeze].freeze
-  else
-    TkCommandNames = ['::tlabel'.freeze].freeze
-  end
-  WidgetClassName = 'TLabel'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def self.style(*args)
-    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
-  end
-end
-
-#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Label, :TkLabel)
-Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tlabel.rb',
-                                   :Ttk, Tk::Tile::Label, :TkLabel)
diff --git a/ext/tk/lib/tkextlib/tile/tlabelframe.rb b/ext/tk/lib/tkextlib/tile/tlabelframe.rb
deleted file mode 100644
index d512f31ffe..0000000000
--- a/ext/tk/lib/tkextlib/tile/tlabelframe.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-# frozen_string_literal: false
-#
-#  tlabelframe widget
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-require 'tkextlib/tile.rb'
-
-module Tk
-  module Tile
-    class TLabelframe < Tk::Tile::TFrame
-    end
-    TLabelFrame = TLabelframe
-    Labelframe  = TLabelframe
-    LabelFrame  = TLabelframe
-  end
-end
-
-class Tk::Tile::TLabelframe < Tk::Tile::TFrame
-  include Tk::Tile::TileWidget
-
-  if Tk::Tile::USE_TTK_NAMESPACE
-    TkCommandNames = ['::ttk::labelframe'.freeze].freeze
-  else
-    TkCommandNames = ['::tlabelframe'.freeze].freeze
-  end
-  WidgetClassName = 'TLabelframe'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def self.style(*args)
-    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
-  end
-end
-
-#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Labelframe,
-#                            :TkLabelframe, :TkLabelFrame)
-Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tlabelframe.rb',
-                                   :Ttk, Tk::Tile::Labelframe,
-                                   :TkLabelframe, :TkLabelFrame)
diff --git a/ext/tk/lib/tkextlib/tile/tmenubutton.rb b/ext/tk/lib/tkextlib/tile/tmenubutton.rb
deleted file mode 100644
index a22ebaeca7..0000000000
--- a/ext/tk/lib/tkextlib/tile/tmenubutton.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-# frozen_string_literal: false
-#
-#  tmenubutton widget
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-require 'tkextlib/tile.rb'
-
-module Tk
-  module Tile
-    class TMenubutton < Tk::Menubutton
-    end
-    TMenuButton = TMenubutton
-    Menubutton  = TMenubutton
-    MenuButton  = TMenubutton
-  end
-end
-
-class Tk::Tile::TMenubutton < Tk::Menubutton
-  include Tk::Tile::TileWidget
-
-  if Tk::Tile::USE_TTK_NAMESPACE
-    TkCommandNames = ['::ttk::menubutton'.freeze].freeze
-  else
-    TkCommandNames = ['::tmenubutton'.freeze].freeze
-  end
-  WidgetClassName = 'TMenubutton'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def self.style(*args)
-    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
-  end
-end
-
-#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Menubutton,
-#                            :TkMenubutton, :TkMenuButton)
-Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tmenubutton.rb',
-                                   :Ttk, Tk::Tile::Menubutton,
-                                   :TkMenubutton, :TkMenuButton)
diff --git a/ext/tk/lib/tkextlib/tile/tnotebook.rb b/ext/tk/lib/tkextlib/tile/tnotebook.rb
deleted file mode 100644
index 4089dcfd4b..0000000000
--- a/ext/tk/lib/tkextlib/tile/tnotebook.rb
+++ /dev/null
@@ -1,148 +0,0 @@
-# frozen_string_literal: false
-#
-#  tnotebook widget
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-require 'tkextlib/tile.rb'
-
-module Tk
-  module Tile
-    class TNotebook < TkWindow
-    end
-    Notebook = TNotebook
-  end
-end
-
-class Tk::Tile::TNotebook < TkWindow
-  ################################
-  include TkItemConfigMethod
-
-  def __item_cget_cmd(id)
-    [self.path, 'tab', id]
-  end
-  private :__item_cget_cmd
-
-  def __item_config_cmd(id)
-    [self.path, 'tab', id]
-  end
-  private :__item_config_cmd
-
-  def __item_listval_optkeys(id)
-    []
-  end
-  private :__item_listval_optkeys
-
-  def __item_methodcall_optkeys(id)  # { key=>method, ... }
-    {}
-  end
-  private :__item_methodcall_optkeys
-
-  #alias tabcget itemcget
-  #alias tabcget_strict itemcget_strict
-  alias tabconfigure itemconfigure
-  alias tabconfiginfo itemconfiginfo
-  alias current_tabconfiginfo current_itemconfiginfo
-
-  def tabcget_tkstring(tagOrId, option)
-    tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{option}")), false, true)[-1]
-  end
-  def tabcget_strict(tagOrId, option)
-    tabconfiginfo(tagOrId, option)[-1]
-  end
-  def tabcget(tagOrId, option)
-    unless TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-      tabcget_strict(tagOrId, option)
-    else
-      begin
-        tabcget_strict(tagOrId, option)
-      rescue => e
-        begin
-          if current_tabconfiginfo(tagOrId).has_key?(option.to_s)
-            # not tag error & option is known -> error on known option
-            fail e
-          else
-            # not tag error & option is unknown
-            nil
-          end
-        rescue
-          fail e  # tag error
-        end
-      end
-    end
-  end
-  ################################
-
-  include Tk::Tile::TileWidget
-
-  if Tk::Tile::USE_TTK_NAMESPACE
-    TkCommandNames = ['::ttk::notebook'.freeze].freeze
-  else
-    TkCommandNames = ['::tnotebook'.freeze].freeze
-  end
-  WidgetClassName = 'TNotebook'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def self.style(*args)
-    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
-  end
-
-  def enable_traversal()
-    if Tk::Tile::TILE_SPEC_VERSION_ID < 5
-      tk_call_without_enc('::tile::enableNotebookTraversal', @path)
-    elsif Tk::Tile::TILE_SPEC_VERSION_ID < 7
-      tk_call_without_enc('::tile::notebook::enableTraversal', @path)
-    else
-      tk_call_without_enc('::ttk::notebook::enableTraversal', @path)
-    end
-    self
-  end
-
-  def add(child, keys=nil)
-    if keys && keys != None
-      tk_send('add', _epath(child), *hash_kv(keys))
-    else
-      tk_send('add', _epath(child))
-    end
-    self
-  end
-
-  def forget(idx)
-    tk_send('forget', idx)
-    self
-  end
-
-  def hide(idx)
-    tk_send('hide', idx)
-  end
-
-  def index(idx)
-    number(tk_send('index', idx))
-  end
-
-  def insert(idx, subwin, keys=nil)
-    if keys && keys != None
-      tk_send('insert', idx, subwin, *hash_kv(keys))
-    else
-      tk_send('insert', idx, subwin)
-    end
-    self
-  end
-
-  def select(idx)
-    tk_send('select', idx)
-    self
-  end
-
-  def selected
-    window(tk_send_without_enc('select'))
-  end
-
-  def tabs
-    list(tk_send('tabs'))
-  end
-end
-
-#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Notebook, :TkNotebook)
-Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tnotebook.rb',
-                                   :Ttk, Tk::Tile::Notebook, :TkNotebook)
diff --git a/ext/tk/lib/tkextlib/tile/tpaned.rb b/ext/tk/lib/tkextlib/tile/tpaned.rb
deleted file mode 100644
index f51a1f3b41..0000000000
--- a/ext/tk/lib/tkextlib/tile/tpaned.rb
+++ /dev/null
@@ -1,246 +0,0 @@
-# frozen_string_literal: false
-#
-#  tpaned widget
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-require 'tkextlib/tile.rb'
-
-module Tk
-  module Tile
-    class TPaned < TkWindow
-    end
-    PanedWindow = Panedwindow = Paned = TPaned
-  end
-end
-
-class Tk::Tile::TPaned < TkWindow
-  include Tk::Tile::TileWidget
-
-  if Tk::Tile::USE_TTK_NAMESPACE
-    if Tk::Tile::TILE_SPEC_VERSION_ID < 8
-      TkCommandNames = ['::ttk::paned'.freeze].freeze
-    else
-      TkCommandNames = ['::ttk::panedwindow'.freeze].freeze
-    end
-  else
-    TkCommandNames = ['::tpaned'.freeze].freeze
-  end
-  WidgetClassName = 'TPaned'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def self.style(*args)
-    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
-  end
-
-  def add(*args)
-    keys = args.pop
-    fail ArgumentError, "no window in arguments" unless keys
-
-    if keys && keys.kind_of?(Hash)
-      fail ArgumentError, "no window in arguments" if args == []
-      opts = hash_kv(keys)
-    else
-      args.push(keys) if keys
-      opts = []
-    end
-
-    args.each{|win|
-      tk_send_without_enc('add', _epath(win), *opts)
-    }
-    self
-  end
-
-  def forget(pane)
-    pane = _epath(pane)
-    tk_send_without_enc('forget', pane)
-    self
-  end
-
-  def insert(pos, win, keys)
-    win = _epath(win)
-    tk_send_without_enc('insert', pos, win, *hash_kv(keys))
-    self
-  end
-
-  def panecget_tkstring(pane, slot)
-    pane = _epath(pane)
-    tk_send_without_enc('pane', pane, "-#{slot}")
-  end
-  alias pane_cget_tkstring panecget_tkstring
-
-  def panecget_strict(pane, slot)
-    pane = _epath(pane)
-    tk_tcl2ruby(tk_send_without_enc('pane', pane, "-#{slot}"))
-  end
-  alias pane_cget_strict panecget_strict
-
-  def panecget(pane, slot)
-    unless TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-      panecget_strict(pane, slot)
-    else
-      begin
-        panecget_strict(pane, slot)
-      rescue => e
-        begin
-          if current_paneconfiginfo(pane).has_key?(slot.to_s)
-            # not tag error & option is known -> error on known option
-            fail e
-          else
-            # not tag error & option is unknown
-            nil
-          end
-        rescue
-          fail e  # tag error
-        end
-      end
-    end
-  end
-  alias pane_cget panecget
-
-  def paneconfigure(pane, key, value=nil)
-    pane = _epath(pane)
-    if key.kind_of? Hash
-      params = []
-      key.each{|k, v|
-        params.push("-#{k}")
-        # params.push((v.kind_of?(TkObject))? v.epath: v)
-        params.push(_epath(v))
-      }
-      tk_send_without_enc('pane', pane, *params)
-    else
-      # value = value.epath if value.kind_of?(TkObject)
-      value = _epath(value)
-      tk_send_without_enc('pane', pane, "-#{key}", value)
-    end
-    self
-  end
-  alias pane_config paneconfigure
-  alias pane_configure paneconfigure
-
-  def paneconfiginfo(win)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      win = _epath(win)
-      if key
-        conf = tk_split_list(tk_send_without_enc('pane', win, "-#{key}"))
-        conf[0] = conf[0][1..-1]
-        if conf[0] == 'hide'
-          conf[3] = bool(conf[3]) unless conf[3].empty?
-          conf[4] = bool(conf[4]) unless conf[4].empty?
-        end
-        conf
-      else
-        tk_split_simplelist(tk_send_without_enc('pane',
-                                                win)).collect{|conflist|
-          conf = tk_split_simplelist(conflist)
-          conf[0] = conf[0][1..-1]
-          if conf[3]
-            if conf[0] == 'hide'
-              conf[3] = bool(conf[3]) unless conf[3].empty?
-            elsif conf[3].index('{')
-              conf[3] = tk_split_list(conf[3])
-            else
-              conf[3] = tk_tcl2ruby(conf[3])
-            end
-          end
-          if conf[4]
-            if conf[0] == 'hide'
-              conf[4] = bool(conf[4]) unless conf[4].empty?
-            elsif conf[4].index('{')
-              conf[4] = tk_split_list(conf[4])
-            else
-              conf[4] = tk_tcl2ruby(conf[4])
-            end
-          end
-          conf[1] = conf[1][1..-1] if conf.size == 2 # alias info
-          conf
-        }
-      end
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      win = _epath(win)
-      if key
-        conf = tk_split_list(tk_send_without_enc('pane', win, "-#{key}"))
-        key = conf.shift[1..-1]
-        if key == 'hide'
-          conf[2] = bool(conf[2]) unless conf[2].empty?
-          conf[3] = bool(conf[3]) unless conf[3].empty?
-        end
-        { key => conf }
-      else
-        ret = {}
-        tk_split_simplelist(tk_send_without_enc('pane',
-                                                win)).each{|conflist|
-          conf = tk_split_simplelist(conflist)
-          key = conf.shift[1..-1]
-          if key
-            if key == 'hide'
-              conf[2] = bool(conf[2]) unless conf[2].empty?
-            elsif conf[2].index('{')
-              conf[2] = tk_split_list(conf[2])
-            else
-              conf[2] = tk_tcl2ruby(conf[2])
-            end
-          end
-          if conf[3]
-            if key == 'hide'
-              conf[3] = bool(conf[3]) unless conf[3].empty?
-            elsif conf[3].index('{')
-              conf[3] = tk_split_list(conf[3])
-            else
-              conf[3] = tk_tcl2ruby(conf[3])
-            end
-          end
-          if conf.size == 1
-            ret[key] = conf[0][1..-1]  # alias info
-          else
-            ret[key] = conf
-          end
-        }
-        ret
-      end
-    end
-  end
-  alias pane_configinfo paneconfiginfo
-
-  def current_paneconfiginfo(win, key=nil)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if key
-        conf = paneconfiginfo(win, key)
-        {conf[0] => conf[4]}
-      else
-        ret = {}
-        paneconfiginfo(win).each{|conf|
-          ret[conf[0]] = conf[4] if conf.size > 2
-        }
-        ret
-      end
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      ret = {}
-      paneconfiginfo(win, key).each{|k, conf|
-        ret[k] = conf[-1] if conf.kind_of?(Array)
-      }
-      ret
-    end
-  end
-  alias current_pane_configinfo current_paneconfiginfo
-
-  def panes
-    tk_split_simplelist(tk_send_without_enc('panes')).map{|w|
-      (obj = window(w))? obj: w
-    }
-  end
-
-  def identify(x, y)
-    num_or_nil(tk_send_without_enc('identify', x, y))
-  end
-
-  def sashpos(idx, newpos=None)
-    num_or_str(tk_send_without_enc('sashpos', idx, newpos))
-  end
-end
-
-#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Panedwindow,
-#                            :TkPanedwindow, :TkPanedWindow)
-Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tpaned.rb',
-                                   :Ttk, Tk::Tile::Panedwindow,
-                                   :TkPanedwindow, :TkPanedWindow)
diff --git a/ext/tk/lib/tkextlib/tile/tprogressbar.rb b/ext/tk/lib/tkextlib/tile/tprogressbar.rb
deleted file mode 100644
index 446e053e3b..0000000000
--- a/ext/tk/lib/tkextlib/tile/tprogressbar.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-# frozen_string_literal: false
-#
-#  tprogressbar widget
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-require 'tkextlib/tile.rb'
-
-module Tk
-  module Tile
-    class TProgressbar < TkWindow
-    end
-    Progressbar = TProgressbar
-  end
-end
-
-class Tk::Tile::TProgressbar
-  include Tk::Tile::TileWidget
-
-  if Tk::Tile::USE_TTK_NAMESPACE
-    TkCommandNames = ['::ttk::progressbar'.freeze].freeze
-  else
-    TkCommandNames = ['::tprogressbar'.freeze].freeze
-  end
-  WidgetClassName = 'TProgressbar'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def self.style(*args)
-    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
-  end
-
-  def step(amount=None)
-    tk_send_without_enc('step', amount).to_f
-  end
-  #def step=(amount)
-  #  tk_send_without_enc('step', amount)
-  #end
-
-  def start(interval=None)
-    if Tk::Tile::TILE_SPEC_VERSION_ID < 5
-      tk_call_without_enc('::tile::progressbar::start', @path, interval)
-    else
-      tk_send_without_enc('start', interval)
-    end
-  end
-
-  def stop(amount=None)
-    if Tk::Tile::TILE_SPEC_VERSION_ID < 5
-      tk_call_without_enc('::tile::progressbar::stop', @path)
-    else
-      tk_send_without_enc('stop', amount)
-    end
-  end
-end
-
-#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Progressbar, :TkProgressbar)
-Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tprogressbar.rb',
-                                   :Ttk, Tk::Tile::Progressbar, :TkProgressbar)
diff --git a/ext/tk/lib/tkextlib/tile/tradiobutton.rb b/ext/tk/lib/tkextlib/tile/tradiobutton.rb
deleted file mode 100644
index 202de1eb25..0000000000
--- a/ext/tk/lib/tkextlib/tile/tradiobutton.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-# frozen_string_literal: false
-#
-#  tradiobutton widget
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-require 'tkextlib/tile.rb'
-
-module Tk
-  module Tile
-    class TRadioButton < Tk::RadioButton
-    end
-    TRadiobutton = TRadioButton
-    RadioButton  = TRadioButton
-    Radiobutton  = TRadioButton
-  end
-end
-
-class Tk::Tile::TRadioButton < Tk::RadioButton
-  include Tk::Tile::TileWidget
-
-  if Tk::Tile::USE_TTK_NAMESPACE
-    TkCommandNames = ['::ttk::radiobutton'.freeze].freeze
-  else
-    TkCommandNames = ['::tradiobutton'.freeze].freeze
-  end
-  WidgetClassName = 'TRadiobutton'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def self.style(*args)
-    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
-  end
-end
-
-#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Radiobutton,
-#                            :TkRadiobutton, :TkRadioButton)
-Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tradiobutton.rb',
-                                   :Ttk, Tk::Tile::Radiobutton,
-                                   :TkRadiobutton, :TkRadioButton)
diff --git a/ext/tk/lib/tkextlib/tile/treeview.rb b/ext/tk/lib/tkextlib/tile/treeview.rb
deleted file mode 100644
index 1be8f54348..0000000000
--- a/ext/tk/lib/tkextlib/tile/treeview.rb
+++ /dev/null
@@ -1,1337 +0,0 @@
-# frozen_string_literal: false
-#
-#  treeview widget
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-require 'tkextlib/tile.rb'
-
-module Tk
-  module Tile
-    class Treeview < TkWindow
-    end
-  end
-end
-
-module Tk::Tile::TreeviewConfig
-  include TkItemConfigMethod
-
-  def __item_configinfo_struct(id)
-    # maybe need to override
-    {:key=>0, :alias=>nil, :db_name=>nil, :db_class=>nil,
-      :default_value=>nil, :current_value=>1}
-  end
-  private :__item_configinfo_struct
-
-  def __itemconfiginfo_core(tagOrId, slot = nil)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if (slot && slot.to_s =~ /^(|latin|ascii|kanji)(#{__item_font_optkeys(tagid(tagOrId)).join('|')})$/)
-        fontkey  = $2
-        return [slot.to_s, tagfontobj(tagid(tagOrId), fontkey)]
-      else
-        if slot
-          slot = slot.to_s
-
-          alias_name, real_name = __item_optkey_aliases(tagid(tagOrId)).find{|k, v| k.to_s == slot}
-          if real_name
-            slot = real_name.to_s
-          end
-
-          case slot
-          when /^(#{__tile_specific_item_optkeys(tagid(tagOrId)).join('|')})$/
-            begin
-              # On tile-0.7.{2-8}, 'state' options has no '-' at its head.
-              val = tk_call(*(__item_confinfo_cmd(tagid(tagOrId)) << slot))
-            rescue
-              # Maybe, 'state' option has '-' in future.
-              val = tk_call(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))
-            end
-            return [slot, val]
-
-          when /^(#{__item_val2ruby_optkeys(tagid(tagOrId)).keys.join('|')})$/
-            method = _symbolkey2str(__item_val2ruby_optkeys(tagid(tagOrId)))[slot]
-            optval = tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))
-            begin
-              val = method.call(tagOrId, optval)
-            rescue => e
-              warn("Warning:: #{e.message} (when #{method}lcall(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
-              val = optval
-            end
-            return [slot, val]
-
-          when /^(#{__item_methodcall_optkeys(tagid(tagOrId)).keys.join('|')})$/
-            method = _symbolkey2str(__item_methodcall_optkeys(tagid(tagOrId)))[slot]
-            return [slot, self.__send__(method, tagOrId)]
-
-          when /^(#{__item_numval_optkeys(tagid(tagOrId)).join('|')})$/
-            begin
-              val = number(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")))
-            rescue
-              val = nil
-            end
-            return [slot, val]
-
-          when /^(#{__item_numstrval_optkeys(tagid(tagOrId)).join('|')})$/
-            val = num_or_str(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")))
-            return [slot, val]
-
-          when /^(#{__item_boolval_optkeys(tagid(tagOrId)).join('|')})$/
-            begin
-              val = bool(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")))
-            rescue
-              val = nil
-            end
-            return [slot, val]
-
-          when /^(#{__item_listval_optkeys(tagid(tagOrId)).join('|')})$/
-            val = simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")))
-            return [slot, val]
-
-          when /^(#{__item_numlistval_optkeys(tagid(tagOrId)).join('|')})$/
-            val = tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))
-            if val =~ /^[0-9]/
-              return [slot, list(val)]
-            else
-              return [slot, val]
-            end
-
-          when /^(#{__item_strval_optkeys(tagid(tagOrId)).join('|')})$/
-            val = tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))
-            return [slot, val]
-
-          when /^(#{__item_tkvariable_optkeys(tagid(tagOrId)).join('|')})$/
-            val = tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))
-            if val.empty?
-              return [slot, nil]
-            else
-              return [slot, TkVarAccess.new(val)]
-            end
-
-          else
-            val = tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))
-            if val.index('{')
-              return [slot, tk_split_list(val)]
-            else
-              return [slot, tk_tcl2ruby(val)]
-            end
-          end
-
-        else # ! slot
-          ret = Hash[*(tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)))), false, false))].to_a.collect{|conf|
-            conf[0] = conf[0][1..-1] if conf[0][0] == ?-
-            case conf[0]
-            when /^(#{__item_val2ruby_optkeys(tagid(tagOrId)).keys.join('|')})$/
-              method = _symbolkey2str(__item_val2ruby_optkeys(tagid(tagOrId)))[conf[0]]
-              optval = conf[1]
-              begin
-                val = method.call(tagOrId, optval)
-              rescue => e
-                warn("Warning:: #{e.message} (when #{method}.call(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
-                val = optval
-              end
-              conf[1] = val
-
-            when /^(#{__item_strval_optkeys(tagid(tagOrId)).join('|')})$/
-              # do nothing
-
-            when /^(#{__item_numval_optkeys(tagid(tagOrId)).join('|')})$/
-              begin
-                conf[1] = number(conf[1])
-              rescue
-                conf[1] = nil
-              end
-
-            when /^(#{__item_numstrval_optkeys(tagid(tagOrId)).join('|')})$/
-              conf[1] = num_or_str(conf[1])
-
-            when /^(#{__item_boolval_optkeys(tagid(tagOrId)).join('|')})$/
-              begin
-                conf[1] = bool(conf[1])
-              rescue
-                conf[1] = nil
-              end
-
-            when /^(#{__item_listval_optkeys(tagid(tagOrId)).join('|')})$/
-              conf[1] = simplelist(conf[1])
-
-            when /^(#{__item_numlistval_optkeys(tagid(tagOrId)).join('|')})$/
-              if conf[1] =~ /^[0-9]/
-                conf[1] = list(conf[1])
-              end
-
-            when /^(#{__item_tkvariable_optkeys(tagid(tagOrId)).join('|')})$/
-              if conf[1].empty?
-                conf[1] = nil
-              else
-                conf[1] = TkVarAccess.new(conf[1])
-              end
-
-            else
-              if conf[1].index('{')
-                conf[1] = tk_split_list(conf[1])
-              else
-                conf[1] = tk_tcl2ruby(conf[1])
-              end
-            end
-
-            conf
-          }
-
-          __item_font_optkeys(tagid(tagOrId)).each{|optkey|
-            optkey = optkey.to_s
-            fontconf = ret.assoc(optkey)
-            if fontconf
-              ret.delete_if{|inf| inf[0] =~ /^(|latin|ascii|kanji)#{optkey}$/}
-              fontconf[1] = tagfontobj(tagid(tagOrId), optkey)
-              ret.push(fontconf)
-            end
-          }
-
-          __item_methodcall_optkeys(tagid(tagOrId)).each{|optkey, method|
-            ret << [optkey.to_s, self.__send__(method, tagOrId)]
-          }
-
-          ret
-        end
-      end
-
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      if (slot && slot.to_s =~ /^(|latin|ascii|kanji)(#{__item_font_optkeys(tagid(tagOrId)).join('|')})$/)
-        fontkey  = $2
-        return {slot.to_s => tagfontobj(tagid(tagOrId), fontkey)}
-      else
-        if slot
-          slot = slot.to_s
-
-          alias_name, real_name = __item_optkey_aliases(tagid(tagOrId)).find{|k, v| k.to_s == slot}
-          if real_name
-            slot = real_name.to_s
-          end
-
-          case slot
-          when /^(#{__tile_specific_item_optkeys(tagid(tagOrId)).join('|')})$/
-            begin
-              # On tile-0.7.{2-8}, 'state' option has no '-' at its head.
-              val = tk_call(*(__item_confinfo_cmd(tagid(tagOrId)) << slot))
-            rescue
-              # Maybe, 'state' option has '-' in future.
-              val = tk_call(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))
-            end
-            return {slot => val}
-
-          when /^(#{__item_val2ruby_optkeys(tagid(tagOrId)).keys.join('|')})$/
-            method = _symbolkey2str(__item_val2ruby_optkeys(tagid(tagOrId)))[slot]
-            optval = tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))
-            begin
-              val = method.call(tagOrId, optval)
-            rescue => e
-              warn("Warning:: #{e.message} (when #{method}lcall(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
-              val = optval
-            end
-            return {slot => val}
-
-          when /^(#{__item_methodcall_optkeys(tagid(tagOrId)).keys.join('|')})$/
-            method = _symbolkey2str(__item_methodcall_optkeys(tagid(tagOrId)))[slot]
-            return {slot => self.__send__(method, tagOrId)}
-
-          when /^(#{__item_numval_optkeys(tagid(tagOrId)).join('|')})$/
-            begin
-              val = number(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")))
-            rescue
-              val = nil
-            end
-            return {slot => val}
-
-          when /^(#{__item_numstrval_optkeys(tagid(tagOrId)).join('|')})$/
-            val = num_or_str(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")))
-            return {slot => val}
-
-          when /^(#{__item_boolval_optkeys(tagid(tagOrId)).join('|')})$/
-            begin
-              val = bool(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")))
-            rescue
-              val = nil
-            end
-            return {slot => val}
-
-          when /^(#{__item_listval_optkeys(tagid(tagOrId)).join('|')})$/
-            val = simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")))
-            return {slot => val}
-
-          when /^(#{__item_numlistval_optkeys(tagid(tagOrId)).join('|')})$/
-            val = tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))
-            if val =~ /^[0-9]/
-              return {slot => list(val)}
-            else
-              return {slot => val}
-            end
-
-          when /^(#{__item_strval_optkeys(tagid(tagOrId)).join('|')})$/
-            val = tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))
-            return {slot => val}
-
-          when /^(#{__item_tkvariable_optkeys(tagid(tagOrId)).join('|')})$/
-            val = tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))
-            if val.empty?
-              return {slot => nil}
-            else
-              return {slot => TkVarAccess.new(val)}
-            end
-
-          else
-            val = tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))
-            if val.index('{')
-              return {slot => tk_split_list(val)}
-            else
-              return {slot => tk_tcl2ruby(val)}
-            end
-          end
-
-        else # ! slot
-          ret = {}
-          ret = Hash[*(tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)))), false, false))].to_a.collect{|conf|
-            conf[0] = conf[0][1..-1] if conf[0][0] == ?-
-
-            optkey = conf[0]
-            case optkey
-            when /^(#{__item_val2ruby_optkeys(tagid(tagOrId)).keys.join('|')})$/
-              method = _symbolkey2str(__item_val2ruby_optkeys(tagid(tagOrId)))[optkey]
-              optval = conf[1]
-              begin
-                val = method.call(tagOrId, optval)
-              rescue => e
-                warn("Warning:: #{e.message} (when #{method}.call(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
-                val = optval
-              end
-              conf[1] = val
-
-            when /^(#{__item_strval_optkeys(tagid(tagOrId)).join('|')})$/
-              # do nothing
-
-            when /^(#{__item_numval_optkeys(tagid(tagOrId)).join('|')})$/
-              begin
-                conf[1] = number(conf[1])
-              rescue
-                conf[1] = nil
-              end
-
-            when /^(#{__item_numstrval_optkeys(tagid(tagOrId)).join('|')})$/
-              conf[1] = num_or_str(conf[1])
-
-            when /^(#{__item_boolval_optkeys(tagid(tagOrId)).join('|')})$/
-              begin
-                conf[1] = bool(conf[1])
-              rescue
-                conf[1] = nil
-              end
-
-            when /^(#{__item_listval_optkeys(tagid(tagOrId)).join('|')})$/
-              conf[1] = simplelist(conf[1])
-
-            when /^(#{__item_numlistval_optkeys(tagid(tagOrId)).join('|')})$/
-              if conf[1] =~ /^[0-9]/
-                conf[1] = list(conf[1])
-              end
-
-            when /^(#{__item_tkvariable_optkeys(tagid(tagOrId)).join('|')})$/
-              if conf[1].empty?
-                conf[1] = nil
-              else
-                conf[1] = TkVarAccess.new(conf[1])
-              end
-
-            else
-              if conf[1].index('{')
-                return [slot, tk_split_list(conf[1])]
-              else
-                return [slot, tk_tcl2ruby(conf[1])]
-              end
-            end
-
-            ret[conf[0]] = conf[1]
-          }
-
-          __item_font_optkeys(tagid(tagOrId)).each{|optkey|
-            optkey = optkey.to_s
-            fontconf = ret[optkey]
-            if fontconf.kind_of?(Array)
-              ret.delete(optkey)
-              ret.delete('latin' << optkey)
-              ret.delete('ascii' << optkey)
-              ret.delete('kanji' << optkey)
-              fontconf[1] = tagfontobj(tagid(tagOrId), optkey)
-              ret[optkey] = fontconf
-            end
-          }
-
-          __item_methodcall_optkeys(tagid(tagOrId)).each{|optkey, method|
-            ret[optkey.to_s] = self.__send__(method, tagOrId)
-          }
-
-          ret
-        end
-      end
-    end
-  end
-
-  ###################
-
-  def __item_cget_cmd(id)
-    [self.path, *id]
-  end
-  private :__item_cget_cmd
-
-  def __item_config_cmd(id)
-    [self.path, *id]
-  end
-  private :__item_config_cmd
-
-  def __item_numstrval_optkeys(id)
-    case id[0]
-    when :item, 'item'
-      ['width']
-    when :column, 'column'
-      super(id[1]) + ['minwidth']
-    when :tag, 'tag'
-      super(id[1])
-    when :heading, 'heading'
-      super(id[1])
-    else
-      super(id[1])
-    end
-  end
-  private :__item_numstrval_optkeys
-
-  def __item_strval_optkeys(id)
-    case id[0]
-    when :item, 'item'
-      super(id) + ['id']
-    when :column, 'column'
-      super(id[1])
-    when :tag, 'tag'
-      super(id[1])
-    when :heading, 'heading'
-      super(id[1])
-    else
-      super(id[1])
-    end
-  end
-  private :__item_strval_optkeys
-
-  def __item_boolval_optkeys(id)
-    case id[0]
-    when :item, 'item'
-      ['open']
-    when :column, 'column'
-      super(id[1]) + ['stretch']
-    when :tag, 'tag'
-      super(id[1])
-    when :heading, 'heading'
-      super(id[1])
-    end
-  end
-  private :__item_boolval_optkeys
-
-  def __item_listval_optkeys(id)
-    case id[0]
-    when :item, 'item'
-      ['values']
-    when :column, 'column'
-      []
-    when :heading, 'heading'
-      []
-    else
-      []
-    end
-  end
-  private :__item_listval_optkeys
-
-  def __item_val2ruby_optkeys(id)
-    case id[0]
-    when :item, 'item'
-      {
-        'tags'=>proc{|arg_id, val|
-          simplelist(val).collect{|tag|
-            Tk::Tile::Treeview::Tag.id2obj(self, tag)
-          }
-        }
-      }
-    when :column, 'column'
-      {}
-    when :heading, 'heading'
-      {}
-    else
-      {}
-    end
-  end
-  private :__item_val2ruby_optkeys
-
-  def __tile_specific_item_optkeys(id)
-    case id[0]
-    when :item, 'item'
-      []
-    when :column, 'column'
-      []
-    when :heading, 'heading'
-      ['state']  # On tile-0.7.{2-8}, 'state' options has no '-' at its head.
-    else
-      []
-    end
-  end
-  private :__item_val2ruby_optkeys
-
-  def itemconfiginfo(tagOrId, slot = nil)
-    __itemconfiginfo_core(tagOrId, slot)
-  end
-
-  def current_itemconfiginfo(tagOrId, slot = nil)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if slot
-        org_slot = slot
-        begin
-          conf = __itemconfiginfo_core(tagOrId, slot)
-          if ( ! __item_configinfo_struct(tagid(tagOrId))[:alias] \
-              || conf.size > __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 )
-            return {conf[0] => conf[-1]}
-          end
-          slot = conf[__item_configinfo_struct(tagid(tagOrId))[:alias]]
-        end while(org_slot != slot)
-        fail RuntimeError,
-          "there is a configure alias loop about '#{org_slot}'"
-      else
-        ret = {}
-        __itemconfiginfo_core(tagOrId).each{|conf|
-          if ( ! __item_configinfo_struct(tagid(tagOrId))[:alias] \
-              || conf.size > __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 )
-            ret[conf[0]] = conf[-1]
-          end
-        }
-        ret
-      end
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      ret = {}
-      __itemconfiginfo_core(tagOrId, slot).each{|key, conf|
-        ret[key] = conf[-1] if conf.kind_of?(Array)
-      }
-      ret
-    end
-  end
-
-  alias __itemcget_tkstring itemcget_tkstring
-  alias __itemcget itemcget
-  alias __itemcget_strict itemcget_strict
-  alias __itemconfigure itemconfigure
-  alias __itemconfiginfo itemconfiginfo
-  alias __current_itemconfiginfo current_itemconfiginfo
-
-  private :__itemcget_tkstring, :__itemcget, :__itemcget_strict
-  private :__itemconfigure, :__itemconfiginfo, :__current_itemconfiginfo
-
-  # Treeview Item
-  def itemcget_tkstring(tagOrId, option)
-    __itemcget_tkstring([:item, tagOrId], option)
-  end
-  def itemcget(tagOrId, option)
-    __itemcget([:item, tagOrId], option)
-  end
-  def itemcget_strict(tagOrId, option)
-    __itemcget_strict([:item, tagOrId], option)
-  end
-  def itemconfigure(tagOrId, slot, value=None)
-    __itemconfigure([:item, tagOrId], slot, value)
-  end
-  def itemconfiginfo(tagOrId, slot=nil)
-    __itemconfiginfo([:item, tagOrId], slot)
-  end
-  def current_itemconfiginfo(tagOrId, slot=nil)
-    __current_itemconfiginfo([:item, tagOrId], slot)
-  end
-
-  # Treeview Column
-  def columncget_tkstring(tagOrId, option)
-    __itemcget_tkstring([:column, tagOrId], option)
-  end
-  def columncget(tagOrId, option)
-    __itemcget([:column, tagOrId], option)
-  end
-  def columncget_strict(tagOrId, option)
-    __itemcget_strict([:column, tagOrId], option)
-  end
-  def columnconfigure(tagOrId, slot, value=None)
-    __itemconfigure([:column, tagOrId], slot, value)
-  end
-  def columnconfiginfo(tagOrId, slot=nil)
-    __itemconfiginfo([:column, tagOrId], slot)
-  end
-  def current_columnconfiginfo(tagOrId, slot=nil)
-    __current_itemconfiginfo([:column, tagOrId], slot)
-  end
-  alias column_cget_tkstring columncget_tkstring
-  alias column_cget columncget
-  alias column_cget_strict columncget_strict
-  alias column_configure columnconfigure
-  alias column_configinfo columnconfiginfo
-  alias current_column_configinfo current_columnconfiginfo
-
-  # Treeview Heading
-  def headingcget_tkstring(tagOrId, option)
-    if __tile_specific_item_optkeys([:heading, tagOrId]).index(option.to_s)
-      begin
-        # On tile-0.7.{2-8}, 'state' options has no '-' at its head.
-        tk_call(*(__item_cget_cmd([:heading, tagOrId]) << option.to_s))
-      rescue
-        # Maybe, 'state' option has '-' in future.
-        tk_call(*(__item_cget_cmd([:heading, tagOrId]) << "-#{option}"))
-      end
-    else
-      __itemcget_tkstring([:heading, tagOrId], option)
-    end
-  end
-  def headingcget_strict(tagOrId, option)
-    if __tile_specific_item_optkeys([:heading, tagOrId]).index(option.to_s)
-      begin
-        # On tile-0.7.{2-8}, 'state' options has no '-' at its head.
-        tk_call(*(__item_cget_cmd([:heading, tagOrId]) << option.to_s))
-      rescue
-        # Maybe, 'state' option has '-' in future.
-        tk_call(*(__item_cget_cmd([:heading, tagOrId]) << "-#{option}"))
-      end
-    else
-      __itemcget_strict([:heading, tagOrId], option)
-    end
-  end
-  def headingcget(tagOrId, option)
-    unless TkItemConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
-      headingcget_strict(tagOrId, option)
-    else
-      begin
-        headingcget_strict(tagOrId, option)
-      rescue => e
-        begin
-          if current_headingconfiginfo(tagOrId).has_key?(option.to_s)
-            # not tag error & option is known -> error on known option
-            fail e
-          else
-            # not tag error & option is unknown
-            nil
-          end
-        rescue
-          fail e  # tag error
-        end
-      end
-    end
-  end
-  def headingconfigure(tagOrId, slot, value=None)
-    if slot.kind_of?(Hash)
-      slot = _symbolkey2str(slot)
-      sp_kv = []
-      __tile_specific_item_optkeys([:heading, tagOrId]).each{|k|
-        sp_kv << k << _get_eval_string(slot.delete(k)) if slot.has_key?(k)
-      }
-      tk_call(*(__item_config_cmd([:heading, tagOrId]).concat(sp_kv)))
-      tk_call(*(__item_config_cmd([:heading, tagOrId]).concat(hash_kv(slot))))
-    elsif __tile_specific_item_optkeys([:heading, tagOrId]).index(slot.to_s)
-      begin
-        # On tile-0.7.{2-8}, 'state' options has no '-' at its head.
-        tk_call(*(__item_cget_cmd([:heading, tagOrId]) << slot.to_s << value))
-      rescue
-        # Maybe, 'state' option has '-' in future.
-        tk_call(*(__item_cget_cmd([:heading, tagOrId]) << "-#{slot}" << value))
-      end
-    else
-      __itemconfigure([:heading, tagOrId], slot, value)
-    end
-    self
-  end
-  def headingconfiginfo(tagOrId, slot=nil)
-    __itemconfiginfo([:heading, tagOrId], slot)
-  end
-  def current_headingconfiginfo(tagOrId, slot=nil)
-    __current_itemconfiginfo([:heading, tagOrId], slot)
-  end
-  alias heading_cget_tkstring headingcget_tkstring
-  alias heading_cget headingcget
-  alias heading_cget_strict headingcget_strict
-  alias heading_configure headingconfigure
-  alias heading_configinfo headingconfiginfo
-  alias current_heading_configinfo current_headingconfiginfo
-
-  # Treeview Tag
-  def tagcget_tkstring(tagOrId, option)
-    __itemcget_tkstring([:tag, :configure, tagOrId], option)
-  end
-  def tagcget(tagOrId, option)
-    __itemcget([:tag, :configure, tagOrId], option)
-  end
-  def tagcget_strict(tagOrId, option)
-    __itemcget_strict([:tag, :configure, tagOrId], option)
-  end
-  def tagconfigure(tagOrId, slot, value=None)
-    __itemconfigure([:tag, :configure, tagOrId], slot, value)
-  end
-  def tagconfiginfo(tagOrId, slot=nil)
-    __itemconfiginfo([:tag, :configure, tagOrId], slot)
-  end
-  def current_tagconfiginfo(tagOrId, slot=nil)
-    __current_itemconfiginfo([:tag, :configure, tagOrId], slot)
-  end
-  alias tag_cget_tkstring tagcget_tkstring
-  alias tag_cget tagcget
-  alias tag_cget_strict tagcget_strict
-  alias tag_configure tagconfigure
-  alias tag_configinfo tagconfiginfo
-  alias current_tag_configinfo current_tagconfiginfo
-end
-
-########################
-
-class Tk::Tile::Treeview::Item < TkObject
-  ItemID_TBL = TkCore::INTERP.create_table
-
-  TkCore::INTERP.init_ip_env{
-    Tk::Tile::Treeview::Item::ItemID_TBL.mutex.synchronize{
-      Tk::Tile::Treeview::Item::ItemID_TBL.clear
-    }
-  }
-
-  def self.id2obj(tree, id)
-    tpath = tree.path
-    Tk::Tile::Treeview::Item::ItemID_TBL.mutex.synchronize{
-      if Tk::Tile::Treeview::Item::ItemID_TBL[tpath]
-        (Tk::Tile::Treeview::Item::ItemID_TBL[tpath][id])? \
-             Tk::Tile::Treeview::Item::ItemID_TBL[tpath][id]: id
-      else
-        id
-      end
-    }
-  end
-
-  def self.assign(tree, id)
-    tpath = tree.path
-    obj = nil
-    Tk::Tile::Treeview::Item::ItemID_TBL.mutex.synchronize{
-      if Tk::Tile::Treeview::Item::ItemID_TBL[tpath] &&
-          Tk::Tile::Treeview::Item::ItemID_TBL[tpath][id]
-        return Tk::Tile::Treeview::Item::ItemID_TBL[tpath][id]
-      end
-
-      obj = self.allocate
-      obj.instance_eval{
-        @parent = @t = tree
-        @tpath = tpath
-        @path = @id = id
-      }
-      Tk::Tile::Treeview::Item::ItemID_TBL[tpath] ||= {}
-      Tk::Tile::Treeview::Item::ItemID_TBL[tpath][id] = obj
-    }
-    obj
-  end
-
-  def _insert_item(tree, parent_item, idx, keys={})
-    keys = _symbolkey2str(keys)
-    id = keys.delete('id')
-    if id
-      num_or_str(tk_call(tree, 'insert',
-                         parent_item, idx, '-id', id, *hash_kv(keys)))
-    else
-      num_or_str(tk_call(tree, 'insert', parent_item, idx, *hash_kv(keys)))
-    end
-  end
-  private :_insert_item
-
-  def initialize(tree, parent_item = '', idx = 'end', keys = {})
-    if parent_item.kind_of?(Hash)
-      keys = parent_item
-      idx = 'end'
-      parent_item = ''
-    elsif idx.kind_of?(Hash)
-      keys = idx
-      idx = 'end'
-    end
-
-    @parent = @t = tree
-    @tpath = tree.path
-    @path = @id = _insert_item(@t, parent_item, idx, keys)
-    Tk::Tile::Treeview::Item::ItemID_TBL.mutex.synchronize{
-      ItemID_TBL[@tpath] = {} unless ItemID_TBL[@tpath]
-      ItemID_TBL[@tpath][@id] = self
-    }
-  end
-  def id
-    @id
-  end
-
-  def cget_tkstring(option)
-    @t.itemcget_tkstring(@id, option)
-  end
-  def cget(option)
-    @t.itemcget(@id, option)
-  end
-  def cget_strict(option)
-    @t.itemcget_strict(@id, option)
-  end
-
-  def configure(key, value=None)
-    @t.itemconfigure(@id, key, value)
-    self
-  end
-
-  def configinfo(key=nil)
-    @t.itemconfiginfo(@id, key)
-  end
-
-  def current_configinfo(key=nil)
-    @t.current_itemconfiginfo(@id, key)
-  end
-
-  def open?
-    cget('open')
-  end
-  def open
-    configure('open', true)
-    self
-  end
-  def close
-    configure('open', false)
-    self
-  end
-
-  def tag_has?(tag)
-    @t.tag_has?(tag, @id)
-  end
-  alias has_tag? tag_has?
-
-  def bbox(column=None)
-    @t.bbox(@id, column)
-  end
-
-  def children
-    @t.children(@id)
-  end
-  def set_children(*items)
-    @t.set_children(@id, *items)
-    self
-  end
-
-  def delete
-    @t.delete(@id)
-    self
-  end
-
-  def detach
-    @t.detach(@id)
-    self
-  end
-
-  def exist?
-    @t.exist?(@id)
-  end
-
-  def focus
-    @t.focus_item(@id)
-  end
-
-  def index
-    @t.index(@id)
-  end
-
-  def insert(idx='end', keys={})
-    @t.insert(@id, idx, keys)
-  end
-
-  def move(parent, idx)
-    @t.move(@id, parent, idx)
-    self
-  end
-
-  def next_item
-    @t.next_item(@id)
-  end
-
-  def parent_item
-    @t.parent_item(@id)
-  end
-
-  def prev_item
-    @t.prev_item(@id)
-  end
-
-  def see
-    @t.see(@id)
-    self
-  end
-
-  def selection_add
-    @t.selection_add(@id)
-    self
-  end
-
-  def selection_remove
-    @t.selection_remove(@id)
-    self
-  end
-
-  def selection_set
-    @t.selection_set(@id)
-    self
-  end
-
-  def selection_toggle
-    @t.selection_toggle(@id)
-    self
-  end
-
-  def get_directory
-    @t.get_directory(@id)
-  end
-  alias get_dictionary get_directory
-
-  def get(col)
-    @t.get(@id, col)
-  end
-
-  def set(col, value)
-    @t.set(@id, col, value)
-  end
-end
-
-########################
-
-class Tk::Tile::Treeview::Root < Tk::Tile::Treeview::Item
-  def self.new(tree, keys = {})
-    tpath = tree.path
-    obj = nil
-    Tk::Tile::Treeview::Item::ItemID_TBL.mutex.synchronize{
-      if Tk::Tile::Treeview::Item::ItemID_TBL[tpath] &&
-          Tk::Tile::Treeview::Item::ItemID_TBL[tpath]['']
-        obj = Tk::Tile::Treeview::Item::ItemID_TBL[tpath]['']
-      else
-        #super(tree, keys)
-        (obj = self.allocate).instance_eval{
-          @parent = @t = tree
-          @tpath = tree.path
-          @path = @id = ''
-          Tk::Tile::Treeview::Item::ItemID_TBL[@tpath] ||= {}
-          Tk::Tile::Treeview::Item::ItemID_TBL[@tpath][@id] = self
-        }
-      end
-    }
-    obj.configure(keys) if keys && ! keys.empty?
-    obj
-  end
-
-  def initialize(tree, keys = {})
-    # dummy:: not called by 'new' method
-    @parent = @t = tree
-    @tpath = tree.path
-    @path = @id = ''
-    Tk::Tile::Treeview::Item::ItemID_TBL.mutex.synchronize{
-      Tk::Tile::Treeview::Item::ItemID_TBL[@tpath] ||= {}
-      Tk::Tile::Treeview::Item::ItemID_TBL[@tpath][@id] = self
-    }
-  end
-end
-
-########################
-
-class Tk::Tile::Treeview::Tag < TkObject
-  include TkTreatTagFont
-
-  TagID_TBL = TkCore::INTERP.create_table
-
-  (Tag_ID = ['tile_treeview_tag'.freeze, TkUtil.untrust('00000')]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  TkCore::INTERP.init_ip_env{
-    Tk::Tile::Treeview::Tag::TagID_TBL.mutex.synchronize{
-      Tk::Tile::Treeview::Tag::TagID_TBL.clear
-    }
-  }
-
-  def self.id2obj(tree, id)
-    tpath = tree.path
-    Tk::Tile::Treeview::Tag::TagID_TBL.mutex.synchronize{
-      if Tk::Tile::Treeview::Tag::TagID_TBL[tpath]
-        (Tk::Tile::Treeview::Tag::TagID_TBL[tpath][id])? \
-               Tk::Tile::Treeview::Tag::TagID_TBL[tpath][id]: id
-      else
-        id
-      end
-    }
-  end
-
-  def initialize(tree, keys=nil)
-    @parent = @t = tree
-    @tpath = tree.path
-    Tag_ID.mutex.synchronize{
-      @path = @id = Tag_ID.join(TkCore::INTERP._ip_id_)
-      Tag_ID[1].succ!
-    }
-    TagID_TBL.mutex.synchronize{
-      TagID_TBL[@tpath] = {} unless TagID_TBL[@tpath]
-      TagID_TBL[@tpath][@id] = self
-    }
-    if keys && keys != None
-      tk_call_without_enc(@tpath, 'tag', 'configure', @id, *hash_kv(keys,true))
-    end
-  end
-  def id
-    @id
-  end
-
-  def tag_has?(item)
-    @t.tag_has?(@id, item)
-  end
-  alias added? tag_has?
-
-  def tag_has
-    @t.tag_has(@id)
-  end
-
-  def add(*items)
-    @t.tag_add(@id, *items)
-  end
-
-  def remove(*items)
-    @t.tag_remove(@id, *items)
-  end
-
-  def bind(seq, *args)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    @t.tag_bind(@id, seq, cmd, *args)
-    self
-  end
-
-  def bind_append(seq, *args)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    @t.tag_bind_append(@id, seq, cmd, *args)
-    self
-  end
-
-  def bind_remove(seq)
-    @t.tag_bind_remove(@id, seq)
-    self
-  end
-
-  def bindinfo(seq=nil)
-    @t.tag_bindinfo(@id, seq)
-  end
-
-  def cget_tkstring(option)
-    @t.tagcget_tkstring(@id, option)
-  end
-  def cget(option)
-    @t.tagcget(@id, option)
-  end
-  def cget_strict(option)
-    @t.tagcget_strict(@id, option)
-  end
-
-  def configure(key, value=None)
-    @t.tagconfigure(@id, key, value)
-    self
-  end
-
-  def configinfo(key=nil)
-    @t.tagconfiginfo(@id, key)
-  end
-
-  def current_configinfo(key=nil)
-    @t.current_tagconfiginfo(@id, key)
-  end
-end
-
-########################
-
-class Tk::Tile::Treeview < TkWindow
-  include Tk::Tile::TileWidget
-  include Scrollable
-
-  include Tk::Tile::TreeviewConfig
-
-  if Tk::Tile::USE_TTK_NAMESPACE
-    TkCommandNames = ['::ttk::treeview'.freeze].freeze
-  else
-    TkCommandNames = ['::treeview'.freeze].freeze
-  end
-  WidgetClassName = 'Treeview'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __destroy_hook__
-    Tk::Tile::Treeview::Item::ItemID_TBL.mutex.synchronize{
-      Tk::Tile::Treeview::Item::ItemID_TBL.delete(@path)
-    }
-    Tk::Tile::Treeview::Tag::ItemID_TBL.mutex.synchronize{
-      Tk::Tile::Treeview::Tag::ItemID_TBL.delete(@path)
-    }
-  end
-
-  def self.style(*args)
-    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
-  end
-
-  def tagid(id)
-    if id.kind_of?(Tk::Tile::Treeview::Item) ||
-        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])
-    else
-      _get_eval_string(id)
-    end
-  end
-
-  def root
-    Tk::Tile::Treeview::Root.new(self)
-  end
-
-  def bbox(item, column=None)
-    list(tk_send('item', 'bbox', item, column))
-  end
-
-  def children(item)
-    simplelist(tk_send_without_enc('children', item)).collect{|id|
-      Tk::Tile::Treeview::Item.id2obj(self, id)
-    }
-  end
-  def set_children(item, *items)
-    tk_send_without_enc('children', item,
-                        array2tk_list(items.flatten, true))
-    self
-  end
-
-  def delete(*items)
-    tk_send_without_enc('delete', array2tk_list(items.flatten, true))
-    self
-  end
-
-  def detach(*items)
-    tk_send_without_enc('detach', array2tk_list(items.flatten, true))
-    self
-  end
-
-  def exist?(item)
-    bool(tk_send_without_enc('exists', _get_eval_enc_str(item)))
-  end
-
-  def focus_item(item = nil)
-    if item
-      tk_send('focus', item)
-      item
-    else
-      id = tk_send('focus')
-      (id.empty?)? nil: Tk::Tile::Treeview::Item.id2obj(self, id)
-    end
-  end
-
-  def identify(x, y)
-    # tile-0.7.2 or previous
-    ret = simplelist(tk_send('identify', x, y))
-    case ret[0]
-    when 'heading', 'separator'
-      ret[-1] = num_or_str(ret[-1])
-    when 'cell'
-      ret[1] = Tk::Tile::Treeview::Item.id2obj(self, ret[1])
-      ret[-1] = num_or_str(ret[-1])
-    when 'item', 'row'
-      ret[1] = Tk::Tile::Treeview::Item.id2obj(self, ret[1])
-    end
-  end
-
-  def identify_region(x, y)
-    tk_send('identify', 'region', x, y)
-  end
-
-  def identify_item(x, y)
-    id = tk_send('identify', 'item', x, y)
-    (id.empty?)? nil: Tk::Tile::Treeview::Item.id2obj(self, id)
-  end
-
-  def identify_element(x, y)
-    tk_send('identify', 'element', x, y)
-  end
-
-  def row_identify(x, y)
-    id = tk_send('identify', 'row', x, y)
-    (id.empty?)? nil: Tk::Tile::Treeview::Item.id2obj(self, id)
-  end
-  alias identify_row row_identify
-
-  def column_identify(x, y)
-    tk_send('identify', 'column', x, y)
-  end
-  alias identify_column column_identify
-
-  def index(item)
-    number(tk_send('index', item))
-  end
-
-  # def insert(parent, idx='end', keys={})
-  #   keys = _symbolkey2str(keys)
-  #   id = keys.delete('id')
-  #   if id
-  #     num_or_str(tk_send('insert', parent, idx, '-id', id, *hash_kv(keys)))
-  #   else
-  #     num_or_str(tk_send('insert', parent, idx, *hash_kv(keys)))
-  #   end
-  # end
-  def insert(parent, idx='end', keys={})
-    Tk::Tile::Treeview::Item.new(self, parent, idx, keys)
-  end
-
-  # def instate(spec, cmd=Proc.new)
-  #   tk_send('instate', spec, cmd)
-  # end
-  # def state(spec=None)
-  #   tk_send('state', spec)
-  # end
-
-  def move(item, parent, idx)
-    tk_send('move', item, parent, idx)
-    self
-  end
-
-  def next_item(item)
-    id = tk_send('next', item)
-    (id.empty?)? nil: Tk::Tile::Treeview::Item.id2obj(self, id)
-  end
-
-  def parent_item(item)
-    if (id = tk_send('parent', item)).empty?
-      Tk::Tile::Treeview::Root.new(self)
-    else
-      Tk::Tile::Treeview::Item.id2obj(self, id)
-    end
-  end
-
-  def prev_item(item)
-    id = tk_send('prev', item)
-    (id.empty?)? nil: Tk::Tile::Treeview::Item.id2obj(self, id)
-  end
-
-  def see(item)
-    tk_send('see', item)
-    self
-  end
-
-  def selection
-    simplelist(tk_send('selection')).collect{|id|
-      Tk::Tile::Treeview::Item.id2obj(self, id)
-    }
-  end
-  alias selection_get selection
-
-  def selection_add(*items)
-    tk_send('selection', 'add', array2tk_list(items.flatten, true))
-    self
-  end
-  def selection_remove(*items)
-    tk_send('selection', 'remove', array2tk_list(items.flatten, true))
-    self
-  end
-  def selection_set(*items)
-    tk_send('selection', 'set', array2tk_list(items.flatten, true))
-    self
-  end
-  def selection_toggle(*items)
-    tk_send('selection', 'toggle', array2tk_list(items.flatten, true))
-    self
-  end
-
-  def get_directory(item)
-    # tile-0.7+
-    ret = []
-    lst = simplelist(tk_send('set', item))
-    until lst.empty?
-      col = lst.shift
-      val = lst.shift
-      ret << [col, val]
-    end
-    ret
-  end
-  alias get_dictionary get_directory
-
-  def get(item, col)
-    tk_send('set', item, col)
-  end
-  def set(item, col, value)
-    tk_send('set', item, col, value)
-    self
-  end
-
-  def tag_has?(tag, item)
-    bool(tk_send('tag', 'has', tagid(tag), tagid(item)))
-  end
-  def tag_has(tag)
-    tk_split_simplelist(tk_send('tag', 'has', tagid(tag))).collect{|id|
-      Tk::Tile::Treeview::Item.id2obj(self, id)
-    }
-  end
-
-  def tag_bind(tag, seq, *args)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _bind([@path, 'tag', 'bind', tag], seq, cmd, *args)
-    self
-  end
-  alias tagbind tag_bind
-
-  def tag_bind_append(tag, seq, *args)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _bind_append([@path, 'tag', 'bind', tag], seq, cmd, *args)
-    self
-  end
-  alias tagbind_append tag_bind_append
-
-  def tag_bind_remove(tag, seq)
-    _bind_remove([@path, 'tag', 'bind', tag], seq)
-    self
-  end
-  alias tagbind_remove tag_bind_remove
-
-  def tag_bindinfo(tag, context=nil)
-    _bindinfo([@path, 'tag', 'bind', tag], context)
-  end
-  alias tagbindinfo tag_bindinfo
-
-  def tag_names
-    tk_split_simplelist(tk_send('tag', 'names')).collect{|id|
-      Tk::Tile::Treeview::Tag.id2obj(self, id)
-    }
-  end
-
-  def tag_add(tag, *items)
-    fail ArgumentError, "no target items" if items.empty?
-    tk_send('tag', 'add', tagid(tag), *(items.collect{|item| tagid(item)}))
-    self
-  end
-
-  def tag_remove(tag, *items)
-    tk_send('tag', 'remove', tagid(tag), *(items.collect{|item| tagid(item)}))
-    self
-  end
-
-end
-
-#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Treeview, :TkTreeview)
-Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/treeview.rb',
-                                   :Ttk, Tk::Tile::Treeview, :TkTreeview)
diff --git a/ext/tk/lib/tkextlib/tile/tscale.rb b/ext/tk/lib/tkextlib/tile/tscale.rb
deleted file mode 100644
index 446344ecea..0000000000
--- a/ext/tk/lib/tkextlib/tile/tscale.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-# frozen_string_literal: false
-#
-#  tscale & tprogress widget
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-require 'tkextlib/tile.rb'
-
-module Tk
-  module Tile
-    class TScale < Tk::Scale
-    end
-    Scale = TScale
-
-    class TProgress < TScale
-    end
-    Progress = TProgress
-  end
-end
-
-class Tk::Tile::TScale < Tk::Scale
-  include Tk::Tile::TileWidget
-
-  if Tk::Tile::USE_TTK_NAMESPACE
-    TkCommandNames = ['::ttk::scale'.freeze].freeze
-  else
-    TkCommandNames = ['::tscale'.freeze].freeze
-  end
-  WidgetClassName = 'TScale'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def self.style(*args)
-    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
-  end
-
-  alias identify ttk_identify
-end
-
-class Tk::Tile::TProgress < Tk::Tile::TScale
-  include Tk::Tile::TileWidget
-
-  if Tk::Tile::USE_TTK_NAMESPACE
-    TkCommandNames = ['::ttk::progress'.freeze].freeze
-  else
-    TkCommandNames = ['::tprogress'.freeze].freeze
-  end
-  WidgetClassName = 'TProgress'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def self.style(*args)
-    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
-  end
-end
-
-#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Scale, :TkScale)
-Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tscale.rb',
-                                   :Ttk, Tk::Tile::Scale, :TkScale)
diff --git a/ext/tk/lib/tkextlib/tile/tscrollbar.rb b/ext/tk/lib/tkextlib/tile/tscrollbar.rb
deleted file mode 100644
index 621ca48efb..0000000000
--- a/ext/tk/lib/tkextlib/tile/tscrollbar.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-# frozen_string_literal: false
-#
-#  tscrollbar widget
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-require 'tkextlib/tile.rb'
-
-module Tk
-  module Tile
-    class TScrollbar < Tk::Scrollbar
-    end
-    Scrollbar = TScrollbar
-  end
-end
-
-class Tk::Tile::TScrollbar < Tk::Scrollbar
-  include Tk::Tile::TileWidget
-
-  if Tk::Tile::USE_TTK_NAMESPACE
-    TkCommandNames = ['::ttk::scrollbar'.freeze].freeze
-  else
-    TkCommandNames = ['::tscrollbar'.freeze].freeze
-  end
-  WidgetClassName = 'TScrollbar'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def self.style(*args)
-    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
-  end
-
-  alias identify ttk_identify
-end
-
-#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Scrollbar, :TkScrollbar)
-Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tscrollbar.rb',
-                                   :Ttk, Tk::Tile::Scrollbar, :TkScrollbar)
-
-#######################################################################
-
-class Tk::Tile::XScrollbar < Tk::Tile::TScrollbar
-  def create_self(keys)
-    keys = {} unless keys
-    keys['orient'] = 'horizontal'
-    super(keys)
-  end
-  private :create_self
-end
-
-class Tk::Tile::YScrollbar < Tk::Tile::TScrollbar
-  def create_self(keys)
-    keys = {} unless keys
-    keys['orient'] = 'vertical'
-    super(keys)
-  end
-  private :create_self
-end
-
-#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::XScrollbar, :TkXScrollbar)
-#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::YScrollbar, :TkYScrollbar)
-Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tscrollbar.rb',
-                                   :Ttk, Tk::Tile::XScrollbar, :TkXScrollbar)
-Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tscrollbar.rb',
-                                   :Ttk, Tk::Tile::YScrollbar, :TkYScrollbar)
diff --git a/ext/tk/lib/tkextlib/tile/tseparator.rb b/ext/tk/lib/tkextlib/tile/tseparator.rb
deleted file mode 100644
index d4a90e56db..0000000000
--- a/ext/tk/lib/tkextlib/tile/tseparator.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# frozen_string_literal: false
-#
-#  tseparator widget
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-require 'tkextlib/tile.rb'
-
-module Tk
-  module Tile
-    class TSeparator < TkWindow
-    end
-    Separator = TSeparator
-  end
-end
-
-class Tk::Tile::TSeparator < TkWindow
-  include Tk::Tile::TileWidget
-
-  if Tk::Tile::USE_TTK_NAMESPACE
-    TkCommandNames = ['::ttk::separator'.freeze].freeze
-  else
-    TkCommandNames = ['::tseparator'.freeze].freeze
-  end
-  WidgetClassName = 'TSeparator'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def self.style(*args)
-    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
-  end
-end
-
-#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Separator, :TkSeparator)
-Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tseparator.rb',
-                                   :Ttk, Tk::Tile::Separator, :TkSeparator)
diff --git a/ext/tk/lib/tkextlib/tile/tspinbox.rb b/ext/tk/lib/tkextlib/tile/tspinbox.rb
deleted file mode 100644
index 47d822e68c..0000000000
--- a/ext/tk/lib/tkextlib/tile/tspinbox.rb
+++ /dev/null
@@ -1,108 +0,0 @@
-# frozen_string_literal: false
-#
-#  ttk::spinbox widget  (Tcl/Tk 8.6b1 or later)
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-require 'tkextlib/tile.rb'
-
-module Tk
-  module Tile
-    class TSpinbox < Tk::Tile::TEntry
-    end
-    Spinbox = TSpinbox
-  end
-end
-
-class Tk::Tile::TSpinbox < Tk::Tile::TEntry
-  include Tk::Tile::TileWidget
-
-  if Tk::Tile::USE_TTK_NAMESPACE
-    TkCommandNames = ['::ttk::spinbox'.freeze].freeze
-  else
-    TkCommandNames = ['::tspinbox'.freeze].freeze
-  end
-  WidgetClassName = 'TSpinbox'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  class SpinCommand < TkValidateCommand
-    class ValidateArgs < TkUtil::CallbackSubst
-      KEY_TBL = [
-        [ ?d, ?s, :direction ],
-        [ ?s, ?e, :current ],
-        [ ?W, ?w, :widget ],
-        nil
-      ]
-
-      PROC_TBL = [
-        [ ?s, TkComm.method(:string) ],
-        [ ?w, TkComm.method(:window) ],
-
-        [ ?e, proc{|val|
-            #enc = Tk.encoding
-            enc = ((Tk.encoding)? Tk.encoding : Tk.encoding_system)
-            if enc
-              Tk.fromUTF8(TkComm::string(val), enc)
-            else
-              TkComm::string(val)
-            end
-          }
-        ],
-
-        nil
-      ]
-
-      _setup_subst_table(KEY_TBL, PROC_TBL);
-
-      def self.ret_val(val)
-        (val)? '1': '0'
-      end
-    end
-
-    def self._config_keys
-      ['command']
-    end
-  end
-
-  def __validation_class_list
-    super() << SpinCommand
-  end
-
-  Tk::ValidateConfigure.__def_validcmd(binding, SpinCommand)
-
-  def __boolval_optkeys
-    super() << 'wrap'
-  end
-  private :__boolval_optkeys
-
-  def __strval_optkeys
-    super() << 'buttonbackground' << 'format'
-  end
-  private :__strval_optkeys
-
-  def __listval_optkeys
-    super() << 'values'
-  end
-  private :__listval_optkeys
-
-  def self.style(*args)
-    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
-  end
-
-  def current
-    number(tk_send_without_enc('current'))
-  end
-  def current=(idx)
-    tk_send('current', idx)
-  end
-
-  def set(val)
-    tk_send('set', val)
-  end
-
-  alias identify ttk_identify
-end
-
-#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Spinbox, :TkSpinbox)
-Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/tspinbox.rb',
-                                   :Ttk, Tk::Tile::Spinbox, :TkSpinbox)
diff --git a/ext/tk/lib/tkextlib/tile/tsquare.rb b/ext/tk/lib/tkextlib/tile/tsquare.rb
deleted file mode 100644
index 7412966708..0000000000
--- a/ext/tk/lib/tkextlib/tile/tsquare.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-# frozen_string_literal: false
-#
-#  tsquare widget
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-require 'tkextlib/tile.rb'
-
-module Tk
-  module Tile
-    class TSquare < TkWindow
-    end
-    Square = TSquare
-  end
-end
-
-class Tk::Tile::TSquare < TkWindow
-  include Tk::Tile::TileWidget
-
-  if Tk::Tile::USE_TTK_NAMESPACE
-    TkCommandNames = ['::ttk::square'.freeze].freeze
-  else
-    TkCommandNames = ['::tsquare'.freeze].freeze
-  end
-  WidgetClassName = 'TSquare'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def self.style(*args)
-    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tkDND.rb b/ext/tk/lib/tkextlib/tkDND.rb
deleted file mode 100644
index c76c48d169..0000000000
--- a/ext/tk/lib/tkextlib/tkDND.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# frozen_string_literal: false
-#
-#  TkDND (Tk Drag & Drop Extension) support
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/tkDND/setup.rb'
-
-module Tk
-  module TkDND
-    autoload :DND,   'tkextlib/tkDND/tkdnd'
-    autoload :Shape, 'tkextlib/tkDND/shape'
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tkDND/setup.rb b/ext/tk/lib/tkextlib/tkDND/setup.rb
deleted file mode 100644
index cc967dced6..0000000000
--- a/ext/tk/lib/tkextlib/tkDND/setup.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: false
-#
-#  setup.rb   --   setup script before calling TkPackage.require()
-#
-#    If you need some setup operations (for example, add a library path
-#    to the library search path) before using Tcl/Tk library packages
-#    wrapped by Ruby scripts in this directory, please write the setup
-#    operations in this file.
-#
diff --git a/ext/tk/lib/tkextlib/tkDND/shape.rb b/ext/tk/lib/tkextlib/tkDND/shape.rb
deleted file mode 100644
index 06d8d64ac7..0000000000
--- a/ext/tk/lib/tkextlib/tkDND/shape.rb
+++ /dev/null
@@ -1,126 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/tkDND/shape.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/tkDND/setup.rb'
-
-# TkPackage.require('Shape', '0.3')
-TkPackage.require('Shape')
-
-module Tk
-  module TkDND
-    module Shape
-      extend TkCore
-
-      PACKAGE_NAME = 'Shape'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-=begin
-      def self.package_version
-        begin
-          TkPackage.require('Shape')
-        rescue
-          ''
-        end
-      end
-=end
-      class << self
-        def package_version
-          Tk.tk_call('set', 'shape_version')
-        end
-        alias shape_version package_version
-
-        def package_patchlevel
-          Tk.tk_call('set', 'shape_patchLevel')
-        end
-        alias shape_patchlevel package_patchlevel
-
-        def version
-          tk_call('shape', 'version')
-        end
-        alias xshape_version version
-      end
-
-      ############################
-
-      def shape_bounds(kind=nil)
-        if kind
-          ret = tk_call('shape', 'bounds', @path, "-#{kind}")
-        else
-          ret = tk_call('shape', 'bounds', @path)
-        end
-        if ret == ""
-          nil
-        else
-          list(ret)
-        end
-      end
-
-      def shape_get(kind=nil)
-        if kind
-          list(tk_call('shape', 'get', @path, "-#{kind}"))
-        else
-          list(tk_call('shape', 'get', @path))
-        end
-      end
-
-      def shape_offset(x, y, kind=nil)
-        if kind
-          tk_call('shape', 'get', @path, "-#{kind}", x, y)
-        else
-          tk_call('shape', 'get', @path, x, y)
-        end
-        self
-      end
-
-      def _parse_shapespec_param(args)
-        cmd = []
-
-        kind_keys    = ['bounding', 'clip', 'both']
-        offset_keys  = ['offset']
-        srckind_keys = ['bitmap', 'rectangles', 'reset', 'test', 'window']
-
-        cmd << "-#{args.shift}" if kind_keys.member?(args[0].to_s)
-
-        if offset_keys.member?(args[0].to_s)
-          cmd << "-#{args.shift}"
-          cmd << args.shift # xOffset
-          cmd << args.shift # yOffset
-        end
-
-        if srckind_keys.member?(args[0].to_s)
-          cmd << "-#{args.shift}"
-        end
-
-        cmd.concat(args)
-
-        cmd
-      end
-      private :_parse_shapespec_param
-
-      def shape_set(*args) # ?kind? ?offset <x> <y>? srckind ?arg ...?
-        tk_call('shape', 'set', @path, *(_parse_shapespec_param(args)))
-        self
-      end
-
-      def shape_update(op, *args) # ?kind? ?offset <x> <y>? srckind ?arg ...?
-        tk_call('shape', 'update', @path, op, *(_parse_shapespec_param(args)))
-        self
-      end
-    end
-  end
-end
-
-class TkWindow
-  include Tk::TkDND::Shape
-end
diff --git a/ext/tk/lib/tkextlib/tkDND/tkdnd.rb b/ext/tk/lib/tkextlib/tkDND/tkdnd.rb
deleted file mode 100644
index c2059b7c23..0000000000
--- a/ext/tk/lib/tkextlib/tkDND/tkdnd.rb
+++ /dev/null
@@ -1,183 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/tkDND/tkdnd.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/tkDND/setup.rb'
-
-TkPackage.require('tkdnd')
-
-module Tk
-  module TkDND
-    PACKAGE_NAME = 'tkdnd'.freeze
-    def self.package_name
-      PACKAGE_NAME
-    end
-
-    def self.package_version
-      begin
-        TkPackage.require('tkdnd')
-      rescue
-        ''
-      end
-    end
-
-    class DND_Subst < TkUtil::CallbackSubst
-      KEY_TBL = [
-        [ ?a, ?l, :actions ],
-        [ ?A, ?s, :action ],
-        [ ?b, ?L, :codes ],
-        [ ?c, ?s, :code ],
-        [ ?d, ?l, :descriptions ],
-        [ ?D, ?l, :data ],
-        [ ?L, ?l, :source_types ],
-        [ ?m, ?l, :modifiers ],
-        [ ?t, ?l, :types ],
-        [ ?T, ?s, :type ],
-        [ ?W, ?w, :widget ],
-        [ ?x, ?n, :x ],
-        [ ?X, ?n, :x_root ],
-        [ ?y, ?n, :y ],
-        [ ?Y, ?n, :y_root ],
-        nil
-      ]
-
-      PROC_TBL = [
-        [ ?n, TkComm.method(:num_or_str) ],
-        [ ?s, TkComm.method(:string) ],
-        [ ?l, TkComm.method(:list) ],
-        [ ?L, TkComm.method(:simplelist) ],
-        [ ?w, TkComm.method(:window) ],
-        nil
-      ]
-
-=begin
-      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-      KEY_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-        end
-        inf
-      }
-
-      PROC_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-        end
-        inf
-      }
-=end
-
-      # setup tables
-      _setup_subst_table(KEY_TBL, PROC_TBL);
-    end
-
-    module DND
-      def self.version
-        begin
-          TkPackage.require('tkdnd')
-        rescue
-          ''
-        end
-      end
-
-      def dnd_bindtarget_info(type=nil, event=nil)
-        if event
-          procedure(tk_call('dnd', 'bindtarget', @path, type, event))
-        elsif type
-          procedure(tk_call('dnd', 'bindtarget', @path, type))
-        else
-          simplelist(tk_call('dnd', 'bindtarget', @path))
-        end
-      end
-
-      #def dnd_bindtarget(type, event, cmd=Proc.new, prior=50, *args)
-      #  event = tk_event_sequence(event)
-      #  if prior.kind_of?(Numeric)
-      #    tk_call('dnd', 'bindtarget', @path, type, event,
-      #            install_bind_for_event_class(DND_Subst, cmd, *args),
-      #            prior)
-      #  else
-      #    tk_call('dnd', 'bindtarget', @path, type, event,
-      #            install_bind_for_event_class(DND_Subst, cmd, prior, *args))
-      #  end
-      #  self
-      #end
-      def dnd_bindtarget(type, event, *args)
-        # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-        if TkComm._callback_entry?(args[0]) || !block_given?
-          cmd = args.shift
-        else
-          cmd = Proc.new
-        end
-
-        prior = 50
-        prior = args.shift unless args.empty?
-
-        event = tk_event_sequence(event)
-        if prior.kind_of?(Numeric)
-          tk_call('dnd', 'bindtarget', @path, type, event,
-                  install_bind_for_event_class(DND_Subst, cmd, *args),
-                  prior)
-        else
-          tk_call('dnd', 'bindtarget', @path, type, event,
-                  install_bind_for_event_class(DND_Subst, cmd, prior, *args))
-        end
-        self
-      end
-
-      def dnd_cleartarget
-        tk_call('dnd', 'cleartarget', @path)
-        self
-      end
-
-      def dnd_bindsource_info(type=nil)
-        if type
-          procedure(tk_call('dnd', 'bindsource', @path, type))
-        else
-          simplelist(tk_call('dnd', 'bindsource', @path))
-        end
-      end
-
-      #def dnd_bindsource(type, cmd=Proc.new, prior=None)
-      #  tk_call('dnd', 'bindsource', @path, type, cmd, prior)
-      #  self
-      #end
-      def dnd_bindsource(type, *args)
-        # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-        if TkComm._callback_entry?(args[0]) || !block_given?
-          cmd = args.shift
-        else
-          cmd = Proc.new
-        end
-
-        args = [TkComm::None] if args.empty?
-
-        tk_call('dnd', 'bindsource', @path, type, cmd, *args)
-        self
-      end
-
-      def dnd_clearsource()
-        tk_call('dnd', 'clearsource', @path)
-        self
-      end
-
-      def dnd_drag(keys=nil)
-        tk_call('dnd', 'drag', @path, *hash_kv(keys))
-        self
-      end
-    end
-  end
-end
-
-class TkWindow
-  include Tk::TkDND::DND
-end
diff --git a/ext/tk/lib/tkextlib/tkHTML.rb b/ext/tk/lib/tkextlib/tkHTML.rb
deleted file mode 100644
index d64e676024..0000000000
--- a/ext/tk/lib/tkextlib/tkHTML.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# frozen_string_literal: false
-#
-#  TkHtml support
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/tkHTML/setup.rb'
-
-# load library
-require 'tkextlib/tkHTML/htmlwidget'
diff --git a/ext/tk/lib/tkextlib/tkHTML/htmlwidget.rb b/ext/tk/lib/tkextlib/tkHTML/htmlwidget.rb
deleted file mode 100644
index 362c381830..0000000000
--- a/ext/tk/lib/tkextlib/tkHTML/htmlwidget.rb
+++ /dev/null
@@ -1,454 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/tkHTML/htmlwidget.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/tkHTML/setup.rb'
-
-# TkPackage.require('Tkhtml', '2.0')
-TkPackage.require('Tkhtml')
-
-module Tk
-  class HTML_Widget < TkWindow
-    PACKAGE_NAME = 'Tkhtml'.freeze
-    def self.package_name
-      PACKAGE_NAME
-    end
-
-    def self.package_version
-      begin
-        TkPackage.require('Tkhtml')
-      rescue
-        ''
-      end
-    end
-
-    class ClippingWindow < TkWindow
-    end
-  end
-end
-
-class Tk::HTML_Widget::ClippingWindow
-  WidgetClassName = 'HtmlClip'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  HtmlClip_TBL = TkCore::INTERP.create_table
-
-  TkCore::INTERP.init_ip_env{
-    HtmlClip_TBL.mutex.synchronize{ HtmlClip_TBL.clear }
-  }
-
-  def self.new(parent, keys={})
-    if parent.kind_of?(Hash)
-      keys = TkComm._symbolkey2str(parent)
-      parent = keys.delete('parent')
-    end
-
-    if parent.kind_of?(String)
-      ppath = parent.path
-    elsif parent
-      ppath = parent
-    else
-      ppath = ''
-    end
-    HtmlClip_TBL.mutex.synchronize{
-      return HtmlClip_TBL[ppath] if HtmlClip_TBL[ppath]
-    }
-
-    widgetname = keys.delete('widgetname')
-    if widgetname =~ /^(.*)\.[^.]+$/
-      ppath2 = $1
-      if ppath2[0] != ?.
-        ppath2 = ppath + '.' + ppath2
-      end
-      HtmlClip_TBL.mutex.synchronize{
-        return HtmlClip_TBL[ppath2] if HtmlClip_TBL[ppath2]
-      }
-
-      ppath = ppath2
-    end
-
-    parent = TkComm._genobj_for_tkwidget(ppath)
-    unless parent.kind_of?(Tk::HTML_Widget)
-      fail ArgumentError, "parent must be a Tk::HTML_Widget instance"
-    end
-
-    super(parent)
-  end
-
-  def initialize(parent)
-    @parent = parent
-    @ppath = parent.path
-    @path = @id = @ppath + '.x'
-    HtmlClip_TBL.mutex.synchronize{
-      HtmlClip_TBL[@ppath] = self
-    }
-  end
-
-  def method_missing(m, *args, &b)
-    @parent.__send__(m, *args, &b)
-  end
-end
-
-class Tk::HTML_Widget
-  include Scrollable
-
-  TkCommandNames = ['html'.freeze].freeze
-  WidgetClassName = 'Html'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def create_self(keys)
-    if keys and keys != None
-      tk_call_without_enc(self.class::TkCommandNames[0], @path,
-                          *hash_kv(keys, true))
-    else
-      tk_call_without_enc(self.class::TkCommandNames[0], @path)
-    end
-  end
-  private :create_self
-
-  def __strval_optkeys
-    super() << 'base' << 'selectioncolor' << 'unvisitedcolor' << 'visitedcolor'
-  end
-  private :__strval_optkeys
-
-  ###################################
-  #  class methods
-  ###################################
-  def self.reformat(src, dst, txt)
-    tk_call('html', 'reformat', src, dst, txt)
-  end
-
-  def self.url_join(*args) # args := sheme authority path query fragment
-    tk_call('html', 'urljoin', *args)
-  end
-
-  def self.url_split(uri)
-    tk_call('html', 'urlsplit', uri)
-  end
-
-  def self.lockcopy(src, dst)
-    tk_call('html', 'lockcopy', src, dst)
-  end
-
-  def self.gzip_file(file, dat)
-    tk_call('html', 'gzip', 'file', file, dat)
-  end
-
-  def self.gunzip_file(file, dat)
-    tk_call('html', 'gunzip', 'file', filet)
-  end
-
-  def self.gzip_data(dat)
-    tk_call('html', 'gzip', 'data', file, dat)
-  end
-
-  def self.gunzip_data(dat)
-    tk_call('html', 'gunzip', 'data', filet)
-  end
-
-  def self.base64_encode(dat)
-    tk_call('html', 'base64', 'encode', dat)
-  end
-
-  def self.base64_decode(dat)
-    tk_call('html', 'base64', 'encode', dat)
-  end
-
-  def self.text_format(dat, len)
-    tk_call('html', 'text', 'format', dat, len)
-  end
-
-  def self.xor(cmd, *args)
-    tk_call('html', 'xor', cmd, *args)
-  end
-
-  def self.stdchan(cmd, channel)
-    tk_call('html', 'stdchan', cmd, channel)
-  end
-
-  def self.crc32(data)
-    tk_call('html', 'crc32', data)
-  end
-
-  ###################################
-  #  instance methods
-  ###################################
-  def clipping_window
-    ClippingWindow.new(self)
-  end
-  alias clipwin  clipping_window
-  alias htmlclip clipping_window
-
-  def bgimage(image, tid=None)
-    tk_send('bgimage', image, tid)
-    self
-  end
-
-  def clear()
-    tk_send('clear')
-    self
-  end
-
-  def coords(index=None, percent=None)
-    tk_send('coords', index, percent)
-  end
-
-  def forminfo(*args)
-    tk_send('forminfo', *args)
-  end
-  alias form_info forminfo
-
-  def href(x, y)
-    simplelist(tk_send('href', x, y))
-  end
-
-  def image_add(id, img)
-    tk_send('imageadd', id, img)
-    self
-  end
-
-  def image_at(x, y)
-    tk_send('imageat', x, y)
-  end
-
-  def images()
-    list(tk_send('images'))
-  end
-
-  def image_set(id, num)
-    tk_send('imageset', id, num)
-    self
-  end
-
-  def image_update(id, imgs)
-    tk_send('imageupdate', id, imgs)
-    self
-  end
-
-  def index(idx, count=None, unit=None)
-    tk_send('index', idx, count, unit)
-  end
-
-  def insert_cursor(idx)
-    tk_send('insert', idx)
-  end
-
-  def names()
-    simple_list(tk_send('names'))
-  end
-
-  def on_screen(id, x, y)
-    bool(tk_send('onscreen', id, x, y))
-  end
-
-  def over(x, y)
-    list(tk_send('over', x, y))
-  end
-
-  def over_markup(x, y)
-    list(tk_send('over', x, y, '-muponly'))
-  end
-
-  def over_attr(x, y, attrs)
-    list(tk_send('overattr', x, y, attrs))
-  end
-
-  def parse(txt)
-    tk_send('parse', txt)
-    self
-  end
-
-  def resolver(*uri_args)
-    tk_send('resolver', *uri_args)
-  end
-
-  def selection_clear()
-    tk_send('selection', 'clear')
-    self
-  end
-
-  def selection_set(first, last)
-    tk_send('selection', 'set', first, last)
-    self
-  end
-
-  def refresh(*opts)
-    tk_send('refresh', *opts)
-  end
-
-  def layout()
-    tk_send('layout')
-  end
-
-  def sizewindow(*args)
-    tk_send('sizewindow', *args)
-  end
-
-  def postscript(*args)
-    tk_send('postscript', *args)
-  end
-
-  def source()
-    tk_send('source')
-  end
-
-  def plain_text(first, last)
-    tk_send('text', 'ascii', first, last)
-  end
-  alias ascii_text plain_text
-  alias text_ascii plain_text
-
-  def text_delete(first, last)
-    tk_send('text', 'delete', first, last)
-    self
-  end
-
-  def html_text(first, last)
-    tk_send('text', 'html', first, last)
-  end
-  alias text_html html_text
-
-  def text_insert(idx, txt)
-    tk_send('text', 'insert', idx, txt)
-    self
-  end
-
-  def break_text(idx)
-    tk_send('text', 'break', idx)
-  end
-  alias text_break break_text
-
-  def text_find(txt, *args)
-    tk_send('text', 'find', txt, *args)
-  end
-
-  def text_table(idx, imgs=None, attrs=None)
-    tk_send('text', 'table', idx, imgs, attrs)
-  end
-
-  def token_append(tag, *args)
-    tk_send('token', 'append', tag, *args)
-    self
-  end
-
-  def token_delete(first, last=None)
-    tk_send('token', 'delete', first, last)
-    self
-  end
-
-  def token_define(*args)
-    tk_send('token', 'defile', *args)
-    self
-  end
-
-  def token_find(tag, *args)
-    list(tk_send('token', 'find', tag, *args))
-  end
-
-  def token_get(first, last=None)
-    list(tk_send('token', 'get', first, last))
-  end
-
-  def token_list(first, last=None)
-    list(tk_send('token', 'list', first, last))
-  end
-
-  def token_markup(first, last=None)
-    list(tk_send('token', 'markup', first, last))
-  end
-
-  def token_DOM(first, last=None)
-    list(tk_send('token', 'domtokens', first, last))
-  end
-  alias token_dom token_DOM
-  alias token_domtokens token_DOM
-  alias token_dom_tokens token_DOM
-
-  def token_get_end(idx)
-    tk_send('token', 'getend', idx)
-  end
-  alias token_getend token_get_end
-
-  def token_offset(start, num1, num2)
-    list(tk_send('token', 'offset', start, num1, num2))
-  end
-
-  def token_get_attr(idx, name=None)
-    list(tk_send('token', 'attr', idx, name))
-  end
-
-  def token_set_attr(idx, name=None, val=None)
-    tk_send('token', 'attr', idx, name, val)
-    self
-  end
-
-  def token_handler(tag, cmd=nil, &b)
-    cmd = Proc.new(&b) if !cmd && b
-    if cmd
-      tk_send('token', 'handler', tag, cmd)
-      return self
-    else
-      return tk_send('token', 'handler', tag)
-    end
-  end
-
-  def token_insert(idx, tag, *args)
-    tk_send('token', 'insert', idx, tag, *args)
-    self
-  end
-
-  def token_attrs(*args)
-    list(tk_send('token', 'attrs', *args))
-  end
-
-  def token_unique(*args)
-    list(tk_send('token', 'unique', *args))
-  end
-
-  def token_on_events(*args)
-    list(tk_send('token', 'onEvents', *args))
-  end
-
-  def dom_nameidx(tag, name)
-    number(tk_send('dom', 'nameidx', tag, name))
-  end
-  alias dom_name_index dom_nameidx
-
-  def dom_radioidx(tag, name)
-    number(tk_send('dom', 'radioidx', tag, name))
-  end
-  alias dom_radio_index dom_radioidx
-
-  def dom_id(*spec)
-    tk_send('dom', 'id', *spec)
-  end
-
-  def dom_ids(*spec)
-    list(tk_send('dom', 'ids', *spec))
-  end
-
-  def dom_value(*spec)
-    list(tk_send('dom', 'value', *spec))
-  end
-
-  def dom_attr(idx)
-    tk_send('dom', 'attr', idx)
-  end
-
-  def dom_formel(name)
-    tk_send('dom', 'formel', name)
-  end
-  alias dom_form_element dom_formel
-
-  def dom_tree(idx, val)
-    list(tk_send('dom', 'tree', idx, val))
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tkHTML/setup.rb b/ext/tk/lib/tkextlib/tkHTML/setup.rb
deleted file mode 100644
index cc967dced6..0000000000
--- a/ext/tk/lib/tkextlib/tkHTML/setup.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: false
-#
-#  setup.rb   --   setup script before calling TkPackage.require()
-#
-#    If you need some setup operations (for example, add a library path
-#    to the library search path) before using Tcl/Tk library packages
-#    wrapped by Ruby scripts in this directory, please write the setup
-#    operations in this file.
-#
diff --git a/ext/tk/lib/tkextlib/tkimg.rb b/ext/tk/lib/tkextlib/tkimg.rb
deleted file mode 100644
index de4b7212c3..0000000000
--- a/ext/tk/lib/tkextlib/tkimg.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-# frozen_string_literal: false
-#
-#  TkImg extension support
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/tkimg/setup.rb'
-
-# load all image format handlers
-#TkPackage.require('Img', '1.3')
-TkPackage.require('Img')
-
-module Tk
-  module Img
-    PACKAGE_NAME = 'Img'.freeze
-    def self.package_name
-      PACKAGE_NAME
-    end
-
-    def self.package_version
-      begin
-        TkPackage.require('Img')
-      rescue
-        ''
-      end
-    end
-  end
-end
-
-# autoload
-autoload :TkPixmapImage, 'tkextlib/tkimg/pixmap'
diff --git a/ext/tk/lib/tkextlib/tkimg/README b/ext/tk/lib/tkextlib/tkimg/README
deleted file mode 100644
index f5981cb98c..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/README
+++ /dev/null
@@ -1,26 +0,0 @@
-
- [ Tcl/Tk Image formats (TkImg) support ]
-
-TkImg contains a collection of format handlers for the Tk photo
-image type, and a new image type, pixmaps.
-
-Supported formats of TkImg version 1.3 are
--------------------------------------------------------
-   bmp    : Windows Bitmap Format
-   gif    : Graphics Interchange Format
-   ico    : Windows Icon Format
-   jpeg   : Joint Picture Expert Group format
-   pcx    : Paintbrush Format
-   pixmap : Pixmap Image type
-   png    : Portable Network Graphics format
-   ppm    : Portable Pixmap format
-   ps     : Adobe PostScript Format
-   sgi    : SGI Native Format
-   sun    : Sun Raster Format
-   tga    : Truevision Targa Format
-   tiff   : Tagged Image File Format
-   window : Tk Windows
-   xbm    : X Window Bitmap Format
-   xpm    : X Window Pixmap Format
--------------------------------------------------------
-
diff --git a/ext/tk/lib/tkextlib/tkimg/bmp.rb b/ext/tk/lib/tkextlib/tkimg/bmp.rb
deleted file mode 100644
index 48a3b7ef5f..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/bmp.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: false
-#
-#  TkImg - format 'bmp'
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/tkimg/setup.rb'
-
-#TkPackage.require('img::bmp', '1.3')
-TkPackage.require('img::bmp')
-
-module Tk
-  module Img
-    module BMP
-      PACKAGE_NAME = 'img::bmp'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('img::bmp')
-        rescue
-          ''
-        end
-      end
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tkimg/dted.rb b/ext/tk/lib/tkextlib/tkimg/dted.rb
deleted file mode 100644
index 30c595c1b6..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/dted.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: false
-#
-#  TkImg - format 'DTED'
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/tkimg/setup.rb'
-
-# TkPackage.require('img::dted', '1.4')
-TkPackage.require('img::dted')
-
-module Tk
-  module Img
-    module DTED
-      PACKAGE_NAME = 'img::dted'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('img::dted')
-        rescue
-          ''
-        end
-      end
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tkimg/gif.rb b/ext/tk/lib/tkextlib/tkimg/gif.rb
deleted file mode 100644
index ce5f3e94ec..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/gif.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: false
-#
-#  TkImg - format 'gif'
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/tkimg/setup.rb'
-
-# TkPackage.require('img::gif', '1.3')
-TkPackage.require('img::gif')
-
-module Tk
-  module Img
-    module GIF
-      PACKAGE_NAME = 'img::gif'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('img::gif')
-        rescue
-          ''
-        end
-      end
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tkimg/ico.rb b/ext/tk/lib/tkextlib/tkimg/ico.rb
deleted file mode 100644
index 80656005f0..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/ico.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: false
-#
-#  TkImg - format 'ico'
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/tkimg/setup.rb'
-
-# TkPackage.require('img::ico', '1.3')
-TkPackage.require('img::ico')
-
-module Tk
-  module Img
-    module ICO
-      PACKAGE_NAME = 'img::ico'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('img::ico')
-        rescue
-          ''
-        end
-      end
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tkimg/jpeg.rb b/ext/tk/lib/tkextlib/tkimg/jpeg.rb
deleted file mode 100644
index 24e11a84de..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/jpeg.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: false
-#
-#  TkImg - format 'jpeg'
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/tkimg/setup.rb'
-
-# TkPackage.require('img::jpeg', '1.3')
-TkPackage.require('img::jpeg')
-
-module Tk
-  module Img
-    module JPEG
-      PACKAGE_NAME = 'img::jpeg'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('img::jpeg')
-        rescue
-          ''
-        end
-      end
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tkimg/pcx.rb b/ext/tk/lib/tkextlib/tkimg/pcx.rb
deleted file mode 100644
index 942d585120..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/pcx.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: false
-#
-#  TkImg - format 'pcx'
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)#
-
-require 'tk'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/tkimg/setup.rb'
-
-# TkPackage.require('img::pcx', '1.3')
-TkPackage.require('img::pcx')
-
-module Tk
-  module Img
-    module PCX
-      PACKAGE_NAME = 'img::pcx'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('img::pcx')
-        rescue
-          ''
-        end
-      end
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tkimg/pixmap.rb b/ext/tk/lib/tkextlib/tkimg/pixmap.rb
deleted file mode 100644
index b90468a108..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/pixmap.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-# frozen_string_literal: false
-#
-#  TkImg - format 'pixmap'
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/tkimg/setup.rb'
-
-# TkPackage.require('img::pixmap', '1.3')
-TkPackage.require('img::pixmap')
-
-module Tk
-  module Img
-    module PIXMAP
-      PACKAGE_NAME = 'img::pixmap'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('img::pixmap')
-        rescue
-          ''
-        end
-      end
-    end
-  end
-end
-
-class TkPixmapImage<TkImage
-  def self.version
-    Tk::Img::PIXMAP.version
-  end
-
-  def initialize(*args)
-    @type = 'pixmap'
-    super(*args)
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tkimg/png.rb b/ext/tk/lib/tkextlib/tkimg/png.rb
deleted file mode 100644
index 76f7329772..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/png.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: false
-#
-#  TkImg - format 'png'
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/tkimg/setup.rb'
-
-# TkPackage.require('img::png', '1.3')
-TkPackage.require('img::png')
-
-module Tk
-  module Img
-    module PNG
-      PACKAGE_NAME = 'img::png'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('img::png')
-        rescue
-          ''
-        end
-      end
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tkimg/ppm.rb b/ext/tk/lib/tkextlib/tkimg/ppm.rb
deleted file mode 100644
index a6b705e6ad..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/ppm.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: false
-#
-#  TkImg - format 'ppm'
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/tkimg/setup.rb'
-
-# TkPackage.require('img::ppm', '1.3')
-TkPackage.require('img::ppm')
-
-module Tk
-  module Img
-    module PPM
-      PACKAGE_NAME = 'img::ppm'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('img::ppm')
-        rescue
-          ''
-        end
-      end
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tkimg/ps.rb b/ext/tk/lib/tkextlib/tkimg/ps.rb
deleted file mode 100644
index 2a450ed157..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/ps.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: false
-#
-#  TkImg - format 'ps'
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/tkimg/setup.rb'
-
-# TkPackage.require('img::ps', '1.3')
-TkPackage.require('img::ps')
-
-module Tk
-  module Img
-    module PS
-      PACKAGE_NAME = 'img::ps'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('img::ps')
-        rescue
-          ''
-        end
-      end
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tkimg/raw.rb b/ext/tk/lib/tkextlib/tkimg/raw.rb
deleted file mode 100644
index 2eddbbc43a..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/raw.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: false
-#
-#  TkImg - format 'Raw Data'
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/tkimg/setup.rb'
-
-# TkPackage.require('img::raw', '1.4')
-TkPackage.require('img::raw')
-
-module Tk
-  module Img
-    module Raw
-      PACKAGE_NAME = 'img::raw'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('img::raw')
-        rescue
-          ''
-        end
-      end
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tkimg/setup.rb b/ext/tk/lib/tkextlib/tkimg/setup.rb
deleted file mode 100644
index cc967dced6..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/setup.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: false
-#
-#  setup.rb   --   setup script before calling TkPackage.require()
-#
-#    If you need some setup operations (for example, add a library path
-#    to the library search path) before using Tcl/Tk library packages
-#    wrapped by Ruby scripts in this directory, please write the setup
-#    operations in this file.
-#
diff --git a/ext/tk/lib/tkextlib/tkimg/sgi.rb b/ext/tk/lib/tkextlib/tkimg/sgi.rb
deleted file mode 100644
index 73a5bce0ac..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/sgi.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: false
-#
-#  TkImg - format 'sgi'
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/tkimg/setup.rb'
-
-# TkPackage.require('img::sgi', '1.3')
-TkPackage.require('img::sgi')
-
-module Tk
-  module Img
-    module SGI
-      PACKAGE_NAME = 'img::sgi'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('img::sgi')
-        rescue
-          ''
-        end
-      end
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tkimg/sun.rb b/ext/tk/lib/tkextlib/tkimg/sun.rb
deleted file mode 100644
index bd1ac0e577..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/sun.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: false
-#
-#  TkImg - format 'sun'
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/tkimg/setup.rb'
-
-# TkPackage.require('img::sun', '1.3')
-TkPackage.require('img::sun')
-
-module Tk
-  module Img
-    module SUN
-      PACKAGE_NAME = 'img::sun'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('img::sun')
-        rescue
-          ''
-        end
-      end
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tkimg/tga.rb b/ext/tk/lib/tkextlib/tkimg/tga.rb
deleted file mode 100644
index 1dd499b953..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/tga.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: false
-#
-#  TkImg - format 'tga'
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/tkimg/setup.rb'
-
-# TkPackage.require('img::tga', '1.3')
-TkPackage.require('img::tga')
-
-module Tk
-  module Img
-    module TGA
-      PACKAGE_NAME = 'img::tga'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('img::tga')
-        rescue
-          ''
-        end
-      end
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tkimg/tiff.rb b/ext/tk/lib/tkextlib/tkimg/tiff.rb
deleted file mode 100644
index a2d1d8fcc5..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/tiff.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: false
-#
-#  TkImg - format 'tiff'
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/tkimg/setup.rb'
-
-# TkPackage.require('img::tiff', '1.3')
-TkPackage.require('img::tiff')
-
-module Tk
-  module Img
-    module TIFF
-      PACKAGE_NAME = 'img::tiff'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('img::tiff')
-        rescue
-          ''
-        end
-      end
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tkimg/window.rb b/ext/tk/lib/tkextlib/tkimg/window.rb
deleted file mode 100644
index 346f246aa4..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/window.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: false
-#
-#  TkImg - format 'window'
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/tkimg/setup.rb'
-
-# TkPackage.require('img::window', '1.3')
-TkPackage.require('img::window')
-
-module Tk
-  module Img
-    module WINDOW
-      PACKAGE_NAME = 'img::window'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('img::window')
-        rescue
-          ''
-        end
-      end
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tkimg/xbm.rb b/ext/tk/lib/tkextlib/tkimg/xbm.rb
deleted file mode 100644
index 0a4deffdd7..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/xbm.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: false
-#
-#  TkImg - format 'xbm'
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/tkimg/setup.rb'
-
-# TkPackage.require('img::xbm', '1.3')
-TkPackage.require('img::xbm')
-
-module Tk
-  module Img
-    module XBM
-      PACKAGE_NAME = 'img::xbm'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('img::xbm')
-        rescue
-          ''
-        end
-      end
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tkimg/xpm.rb b/ext/tk/lib/tkextlib/tkimg/xpm.rb
deleted file mode 100644
index 7708b9d427..0000000000
--- a/ext/tk/lib/tkextlib/tkimg/xpm.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: false
-#
-#  TkImg - format 'xpm'
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/tkimg/setup.rb'
-
-# TkPackage.require('img::xpm', '1.3')
-TkPackage.require('img::xpm')
-
-module Tk
-  module Img
-    module XPM
-      PACKAGE_NAME = 'img::xpm'.freeze
-      def self.package_name
-        PACKAGE_NAME
-      end
-
-      def self.package_version
-        begin
-          TkPackage.require('img::xpm')
-        rescue
-          ''
-        end
-      end
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tktable.rb b/ext/tk/lib/tkextlib/tktable.rb
deleted file mode 100644
index a957294db0..0000000000
--- a/ext/tk/lib/tkextlib/tktable.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_string_literal: false
-#
-#  TkTable support
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/tktable/setup.rb'
-
-# load library
-require 'tkextlib/tktable/tktable'
diff --git a/ext/tk/lib/tkextlib/tktable/setup.rb b/ext/tk/lib/tkextlib/tktable/setup.rb
deleted file mode 100644
index cc967dced6..0000000000
--- a/ext/tk/lib/tkextlib/tktable/setup.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: false
-#
-#  setup.rb   --   setup script before calling TkPackage.require()
-#
-#    If you need some setup operations (for example, add a library path
-#    to the library search path) before using Tcl/Tk library packages
-#    wrapped by Ruby scripts in this directory, please write the setup
-#    operations in this file.
-#
diff --git a/ext/tk/lib/tkextlib/tktable/tktable.rb b/ext/tk/lib/tkextlib/tktable/tktable.rb
deleted file mode 100644
index d8811a9676..0000000000
--- a/ext/tk/lib/tkextlib/tktable/tktable.rb
+++ /dev/null
@@ -1,967 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/tktable/tktable.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-require 'tk/validation'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/tktable/setup.rb'
-
-# TkPackage.require('Tktable', '2.8')
-TkPackage.require('Tktable')
-
-module Tk
-  class TkTable < TkWindow
-    PACKAGE_NAME = 'Tktable'.freeze
-    def self.package_name
-      PACKAGE_NAME
-    end
-
-    def self.package_version
-      begin
-        TkPackage.require('Tktable')
-      rescue
-        ''
-      end
-    end
-
-    class CellTag < TkObject
-    end
-
-    module ConfigMethod
-    end
-  end
-end
-
-module Tk::TkTable::ConfigMethod
-  include TkItemConfigMethod
-
-  def __item_cget_cmd(id)  # id := [ type, tagOrId ]
-    [self.path, id[0], 'cget', id[1]]
-  end
-  private :__item_cget_cmd
-
-  def __item_config_cmd(id)  # id := [ type, tagOrId ]
-    [self.path, id[0], 'configure', id[1]]
-  end
-  private :__item_config_cmd
-
-  def __item_pathname(id)
-    if id.kind_of?(Array)
-      id = tagid(id[1])
-    end
-    [self.path, id].join(';')
-  end
-  private :__item_pathname
-
-  def __item_boolval_optkeys(id)
-    super(id) << 'multiline' << 'showtext' << 'wrap'
-  end
-  private :__item_boolval_optkeys
-
-  def __item_strval_optkeys(id)
-    super(id) << 'ellipsis'
-  end
-  private :__item_strval_optkeys
-
-  def __item_val2ruby_optkeys(id)  # { key=>method, ... }
-    super(id).update('window'=>proc{|k,v| window(v)})
-  end
-  private :__item_val2ruby_optkeys
-
-  def tag_cget_tkstring(tagOrId, option)
-    itemcget_tkstring(['tag', tagid(tagOrId)], option)
-  end
-  def tag_cget(tagOrId, option)
-    itemcget(['tag', tagid(tagOrId)], option)
-  end
-  def tag_cget_strict(tagOrId, option)
-    itemcget_strict(['tag', tagid(tagOrId)], option)
-  end
-  def tag_configure(tagOrId, slot, value=None)
-    itemconfigure(['tag', tagid(tagOrId)], slot, value)
-  end
-  def tag_configinfo(tagOrId, slot=nil)
-    itemconfiginfo(['tag', tagid(tagOrId)], slot)
-  end
-  def current_tag_configinfo(tagOrId, slot=nil)
-    current_itemconfiginfo(['tag', tagid(tagOrId)], slot)
-  end
-
-  def window_cget_tkstring(tagOrId, option)
-    itemcget_tkstring(['window', tagid(tagOrId)], option)
-  end
-  def window_cget(tagOrId, option)
-    itemcget(['window', tagid(tagOrId)], option)
-  end
-  def window_cget_strict(tagOrId, option)
-    itemcget_strict(['window', tagid(tagOrId)], option)
-  end
-  def window_configure(tagOrId, slot, value=None)
-    if slot == :window || slot == 'window'
-      value = _epath(value)
-    elsif slot.kind_of?(Hash)
-      if slot.key?(:window) || slot.key?('window')
-        slot = _symbolkey2str(slot)
-        slot['window'] = _epath(slot['window'])
-      end
-    end
-    itemconfigure(['window', tagid(tagOrId)], slot, value)
-  end
-  def window_configinfo(tagOrId, slot=nil)
-    itemconfiginfo(['window', tagid(tagOrId)], slot)
-  end
-  def current_window_configinfo(tagOrId, slot=nil)
-    current_itemconfiginfo(['window', tagid(tagOrId)], slot)
-  end
-
-  private :itemcget_tkstring, :itemcget, :itemcget_strict
-  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
-end
-
-#####################################################
-
-class Tk::TkTable::CellTag
-  include TkTreatTagFont
-
-  CellTagID_TBL = TkCore::INTERP.create_table
-
-  (CellTag_ID = ['tktbl:celltag'.freeze, TkUtil.untrust('00000')]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  TkCore::INTERP.init_ip_env{
-    CellTagID_TBL.mutex.synchronize{ CellTagID_TBL.clear }
-  }
-
-  def self.id2obj(table, id)
-    tpath = table.path
-    CellTagID_TBL.mutex.synchronize{
-      if CellTagID_TBL[tpath]
-        CellTagID_TBL[tpath][id]? CellTagID_TBL[tpath][id] : id
-      else
-        id
-      end
-    }
-  end
-
-  def initialize(parent, keys=nil)
-    @parent = @t = parent
-    @tpath - parent.path
-    CellTag_ID.mutex.synchronize{
-      @path = @id = CellTag_ID.join(TkCore::INTERP._ip_id_)
-      CellTag_ID[1].succ!
-    }
-    CellTagID_TBL.mutex.synchronize{
-      CellTagID_TBL[@tpath] = {} unless CellTagID_TBL[@tpath]
-      CellTagID_TBL[@tpath][@id] = self
-    }
-    configure(keys) if keys
-  end
-
-  def id
-    @id
-  end
-
-  def destroy
-    tk_call(@tpath, 'tag', 'delete', @id)
-    CellTagID_TBL.mutex.synchronize{
-      CellTagID_TBL[@tpath].delete(@id) if CellTagID_TBL[@tpath]
-    }
-    self
-  end
-  alias delete destroy
-
-  def exist?
-    @t.tag_exist?(@id)
-  end
-  def include?(idx)
-    @t.tag_include?(@id, idx)
-  end
-
-  def add_cell(*args)
-    @t.tag_cell(@id, *args)
-  end
-  def add_col(*args)
-    @t.tag_col(@id, *args)
-  end
-  def add_row(*args)
-    @t.tag_row(@id, *args)
-  end
-
-  def raise(target=None)
-    @t.tag_raise(@id, target)
-  end
-  def lower(target=None)
-    @t.tag_lower(@id, target)
-  end
-
-  def cget_tkstring(key)
-    @t.tag_cget_tkstring(@id, key)
-  end
-  def cget(key)
-    @t.tag_cget(@id, key)
-  end
-  def cget_strict(key)
-    @t.tag_cget_strict(@id, key)
-  end
-  def configure(key, val=None)
-    @t.tag_configure(@id, key, val)
-  end
-  def configinfo(key=nil)
-    @t.tag_configinfo(@id, key)
-  end
-  def current_configinfo(key=nil)
-    @t.current_tag_configinfo(@id, key)
-  end
-end
-
-class Tk::TkTable::NamedCellTag < Tk::TkTable::CellTag
-  def self.new(parent, name, keys=nil)
-    obj = nil
-    CellTagID_TBL.mutex.synchronize{
-      if CellTagID_TBL[parent.path] && CellTagID_TBL[parent.path][name]
-        obj = CellTagID_TBL[parent.path][name]
-      else
-        #super(parent, name, keys)
-        (obj = self.allocate).instance_eval{
-          @parent = @t = parent
-          @tpath = parent.path
-          @path = @id = name
-          CellTagID_TBL[@tpath] = {} unless CellTagID_TBL[@tpath]
-          CellTagID_TBL[@tpath][@id] = self
-        }
-      end
-    }
-    obj.configure(keys) if keys && ! keys.empty?
-    obj
-  end
-
-  def initialize(parent, name, keys=nil)
-    # dummy:: not called by 'new' method
-    @parent = @t = parent
-    @tpath = parent.path
-    @path = @id = name
-    CellTagID_TBL.mutex.synchronize{
-      CellTagID_TBL[@tpath] = {} unless CellTagID_TBL[@tpath]
-      CellTagID_TBL[@tpath][@id] = self
-    }
-    configure(keys) if keys && ! keys.empty?
-  end
-end
-
-#####################################################
-
-class Tk::TkTable
-  TkCommandNames = ['table'.freeze].freeze
-  WidgetClassName = 'Table'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  include Scrollable
-  include Tk::TkTable::ConfigMethod
-  include Tk::ValidateConfigure
-
-  def __destroy_hook__
-    Tk::TkTable::CelTag::CellTagID_TBL.mutex.synchronize{
-      Tk::TkTable::CelTag::CellTagID_TBL.delete(@path)
-    }
-  end
-
-  def __boolval_optkeys
-    super() << 'autoclear' << 'flashmode' << 'invertselected' <<
-      'multiline' << 'selecttitle' << 'wrap'
-  end
-  private :__boolval_optkeys
-
-  def __strval_optkeys
-    super() << 'colseparator' << 'ellipsis' << 'rowseparator' << 'sparsearray'
-  end
-  private :__strval_optkeys
-
-
-  #################################
-
-  class BrowseCommand < TkValidateCommand
-    class ValidateArgs < TkUtil::CallbackSubst
-      KEY_TBL = [
-        [ ?c, ?n, :column ],
-        [ ?C, ?s, :index ],
-        [ ?i, ?x, :cursor ],
-        [ ?r, ?n, :row ],
-        [ ?s, ?s, :last_index ],
-        [ ?S, ?s, :new_index ],
-        [ ?W, ?w, :widget ],
-        nil
-      ]
-
-      PROC_TBL = [
-        [ ?n, TkComm.method(:number) ],
-        [ ?x, TkComm.method(:num_or_str) ],
-        [ ?s, TkComm.method(:string) ],
-        [ ?w, TkComm.method(:window) ],
-        nil
-      ]
-
-=begin
-      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-      KEY_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-        end
-        inf
-      }
-
-      PROC_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-        end
-        inf
-      }
-=end
-
-      _setup_subst_table(KEY_TBL, PROC_TBL);
-
-      def self.ret_val(val)
-        val
-      end
-    end
-
-    def self._config_keys
-      ['browsecommand', 'browsecmd']
-    end
-  end
-  #--------------------------------
-  class CellCommand < TkValidateCommand
-    class ValidateArgs < TkUtil::CallbackSubst
-      KEY_TBL = [
-        [ ?c, ?n, :column ],
-        [ ?C, ?s, :index ],
-        [ ?i, ?m, :rw_mode ],
-        [ ?r, ?n, :row ],
-        [ ?s, ?v, :value ],
-        [ ?W, ?w, :widget ],
-        nil
-      ]
-
-      PROC_TBL = [
-        [ ?n, TkComm.method(:number) ],
-        [ ?s, TkComm.method(:string) ],
-        [ ?w, TkComm.method(:window) ],
-        [ ?m, proc{|val| (val == '0')? (:r) : (:w)} ],
-        [ ?v, proc{|val| TkComm.tk_tcl2ruby(val, true, false)} ],
-        nil
-      ]
-
-=begin
-      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-      KEY_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-        end
-        inf
-      }
-
-      PROC_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-        end
-        inf
-      }
-=end
-
-      _setup_subst_table(KEY_TBL, PROC_TBL);
-
-      def self.ret_val(val)
-        TkComm._get_eval_string(val)
-      end
-    end
-
-    def self._config_keys
-      ['command']
-    end
-  end
-  #--------------------------------
-  class SelectionCommand < TkValidateCommand
-    class ValidateArgs < TkUtil::CallbackSubst
-      KEY_TBL = [
-        [ ?c, ?n, :sel_columns ],
-        [ ?C, ?s, :sel_area ],
-        [ ?i, ?n, :total ],
-        [ ?r, ?n, :sel_rows ],
-        [ ?s, ?s, :value ],
-        [ ?W, ?w, :widget ],
-        nil
-      ]
-
-      PROC_TBL = [
-        [ ?n, TkComm.method(:number) ],
-        [ ?s, TkComm.method(:string) ],
-        [ ?w, TkComm.method(:window) ],
-        nil
-      ]
-
-=begin
-      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-      KEY_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-        end
-        inf
-      }
-
-      PROC_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-        end
-        inf
-      }
-=end
-
-      _setup_subst_table(KEY_TBL, PROC_TBL);
-
-      def self.ret_val(val)
-        val.to_s
-      end
-    end
-
-    def self._config_keys
-      ['selectioncommand', 'selcmd']
-    end
-  end
-  #--------------------------------
-  class ValidateCommand < TkValidateCommand
-    class ValidateArgs < TkUtil::CallbackSubst
-      KEY_TBL = [
-        [ ?c, ?n, :column ],
-        [ ?C, ?s, :index ],
-        [ ?i, ?x, :cursor ],
-        [ ?r, ?n, :row ],
-        [ ?s, ?v, :current_value ],
-        [ ?S, ?v, :new_value ],
-        [ ?W, ?w, :widget ],
-        nil
-      ]
-
-      PROC_TBL = [
-        [ ?n, TkComm.method(:number) ],
-        [ ?x, TkComm.method(:num_or_str) ],
-        [ ?s, TkComm.method(:string) ],
-        [ ?w, TkComm.method(:window) ],
-        [ ?v, proc{|val| TkComm.tk_tcl2ruby(val, true, false)} ],
-        nil
-      ]
-
-=begin
-      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-      KEY_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-        end
-        inf
-      }
-
-      PROC_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-        end
-        inf
-      }
-=end
-
-      _setup_subst_table(KEY_TBL, PROC_TBL);
-    end
-
-    def self._config_keys
-      ['vcmd', 'validatecommand']
-    end
-  end
-
-  #################################
-
-  def __validation_class_list
-    super() <<
-      BrowseCommand << CellCommand << SelectionCommand << ValidateCommand
-  end
-
-  Tk::ValidateConfigure.__def_validcmd(binding, BrowseCommand)
-  Tk::ValidateConfigure.__def_validcmd(binding, CellCommand)
-  Tk::ValidateConfigure.__def_validcmd(binding, SelectionCommand)
-  Tk::ValidateConfigure.__def_validcmd(binding, ValidateCommand)
-
-  #################################
-
-  def activate(idx)
-    tk_send('activate', tagid(idx))
-  end
-
-  def bbox(idx)
-    list(tk_send('bbox', tagid(idx)))
-  end
-
-  def border_mark(x, y)
-    simplelist(tk_send('border', 'mark', x, y))
-  end
-  def border_mark_row(x, y)
-    tk_send('border', 'mark', x, y, 'row')
-  end
-  def border_mark_col(x, y)
-    tk_send('border', 'mark', x, y, 'col')
-  end
-  def border_dragto(x, y)
-    tk_send('border', 'dragto', x, y)
-  end
-
-  def clear_cache(first=None, last=None)
-    tk_send('clear', 'cache', tagid(first), tagid(last))
-    self
-  end
-  def clear_sizes(first=None, last=None)
-    tk_send('clear', 'sizes', tagid(first), tagid(last))
-    self
-  end
-  def clear_tags(first=None, last=None)
-    tk_send('clear', 'tags', tagid(first), tagid(last))
-    self
-  end
-  def clear_all(first=None, last=None)
-    tk_send('clear', 'all', tagid(first), tagid(last))
-    self
-  end
-
-  def curselection
-    simplelist(tk_send('curselection'))
-  end
-  def curselection=(val)
-    tk_send('curselection', val)
-    val
-  end
-
-  def curvalue
-    tk_tcl2ruby(tk_send('curvalue'), true, false)
-  end
-  def curvalue=(val)
-    tk_send('curvalue', val)
-    val
-  end
-
-  def delete_active(idx1, idx2=None)
-    tk_send('delete', 'active', tagid(idx1), tagid(idx2))
-    self
-  end
-  def delete_cols(*args) # ?switches_array?, index, ?count?
-    params = []
-    if args[0].kind_of?(Array)
-      switches = args.shift
-      switches.each{|k| params << "-#{k}"}
-    end
-    params << '--'
-    params << tagid(args.shift)
-    params.concat(args)
-    tk_send('delete', 'cols', *params)
-    self
-  end
-  def delete_rows(*args) # ?switches_array?, index, ?count?
-    params = []
-    if args[0].kind_of?(Array)
-      switches = args.shift
-      switches.each{|k| params << "-#{k}"}
-    end
-    params << '--'
-    params << tagid(args.shift)
-    params.concat(args)
-    tk_send('delete', 'rows', *params)
-    self
-  end
-
-  def get(idx)
-    tk_tcl2ruby(tk_send('get', tagid(idx)), true, false)
-  end
-  def get_area(idx1, idx2)
-    simplelist(tk_send('get', tagid(idx1), tagid(idx2))).collect{|v|
-      tk_tcl2ruby(v, true, false)
-    }
-  end
-
-  def height_list
-    list(tk_send('height'))
-  end
-  def height(row)
-    number(tk_send('height', row))
-  end
-  def set_height(*pairs)
-    tk_send('height', *(pairs.flatten))
-    self
-  end
-
-  def hidden_list
-    simplelist(tk_send('hidden'))
-  end
-  def hidden?(idx, *args)
-    if args.empty?
-      if (ret = tk_send('hidden', tagid(idx))) == ''
-        false
-      else
-        ret
-      end
-    else
-      bool(tk_send('hidden', tagid(idx), *(args.collect{|i| tagid(i)})))
-    end
-  end
-
-  def icursor
-    number(tk_send('icursor'))
-  end
-  def icursor_set(idx)
-    number(tk_send('icursor', tagid(idx)))
-  end
-
-  def index(idx)
-    tk_send('index', tagid(idx))
-  end
-  def row_index(idx)
-    number(tk_send('index', tagid(idx), 'row'))
-  end
-  def col_index(idx)
-    number(tk_send('index', tagid(idx), 'col'))
-  end
-
-  def insert_active(idx, val)
-    tk_send('insert', 'active', tagid(idx), val)
-    self
-  end
-  def insert_cols(*args) # ?switches_array?, index, ?count?
-    params = []
-    if args[0].kind_of?(Array)
-      switches = args.shift
-      switches.each{|k| params << "-#{k}"}
-    end
-    params << '--'
-    params.concat(args)
-    params << tagid(args.shift)
-    tk_send('insert', 'cols', *params)
-    self
-  end
-  def insert_rows(*args) # ?switches_array?, index, ?count?
-    params = []
-    if args[0].kind_of?(Array)
-      switches = args.shift
-      switches.each{|k| params << "-#{k}"}
-    end
-    params << '--'
-    params << tagid(args.shift)
-    params.concat(args)
-    tk_send('insert', 'rows', *params)
-    self
-  end
-
-  # def postscript(*args)
-  #   tk_send('postscript', *args)
-  # end
-
-  def reread
-    tk_send('reread')
-    self
-  end
-
-  def scan_mark(x, y)
-    tk_send('scan', 'mark', x, y)
-    self
-  end
-  def scan_dragto(x, y)
-    tk_send('scan', 'dragto', x, y)
-    self
-  end
-
-  def see(idx)
-    tk_send('see', tagid(idx))
-    self
-  end
-
-  def selection_anchor(idx)
-    tk_send('selection', 'anchor', tagid(idx))
-    self
-  end
-  def selection_clear(first, last=None)
-    tk_send('selection', 'clear', tagid(first), tagid(last))
-    self
-  end
-  def selection_clear_all
-    selection_clear('all')
-  end
-  def selection_include?(idx)
-    bool(tk_send('selection', 'includes', tagid(idx)))
-  end
-  def selection_present
-    bool(tk_send('selection', 'present'))
-  end
-  def selection_set(first, last=None)
-    tk_send('selection', 'set', tagid(first), tagid(last))
-    self
-  end
-
-  def set(*pairs) # idx, val, idx, val, ...
-    args = []
-    0.step(pairs.size-1, 2){|i|
-      args << tagid(pairs[i])
-      args << pairs[i+1]
-    }
-    tk_send('set', *args)
-    self
-  end
-  def set_row(*pairs) # idx, val, idx, val, ...
-    args = []
-    0.step(pairs.size-1, 2){|i|
-      args << tagid(pairs[i])
-      args << pairs[i+1]
-    }
-    tk_send('set', 'row', *args)
-    self
-  end
-  def set_col(*pairs) # idx, val, idx, val, ...
-    args = []
-    0.step(pairs.size-1, 2){|i|
-      args << tagid(pairs[i])
-      args << pairs[i+1]
-    }
-    tk_send('set', 'col', *args)
-    self
-  end
-=begin
-  def set(*pairs) # idx, val, idx, val, ...  OR [idx, val], [idx, val], ...
-    if pairs[0].kind_of?(Array)
-      # [idx, val], [idx, val], ...
-      args = []
-      pairs.each{|idx, val| args << tagid(idx) << val }
-      tk_send('set', *args)
-    else
-      # idx, val, idx, val, ...
-      args = []
-      0.step(pairs.size-1, 2){|i|
-        args << tagid(pairs[i])
-        args << pairs[i+1]
-      }
-      tk_send('set', *args)
-    end
-    self
-  end
-  def set_row(*pairs)
-    if pairs[0].kind_of?(Array)
-      # [idx, val], [idx, val], ...
-      args = []
-      pairs.each{|idx, val| args << tagid(idx) << val }
-      tk_send('set', 'row', *args)
-    else
-      # idx, val, idx, val, ...
-      args = []
-      0.step(pairs.size-1, 2){|i|
-        args << tagid(pairs[i])
-        args << pairs[i+1]
-      }
-      tk_send('set', 'row', *args)
-    end
-    self
-  end
-  def set_col(*pairs)
-    if pairs[0].kind_of?(Array)
-      # [idx, val], [idx, val], ...
-      args = []
-      pairs.each{|idx, val| args << idx << val }
-      tk_send('set', 'col', *args)
-    else
-      # idx, val, idx, val, ...
-      args = []
-      0.step(pairs.size-1, 2){|i|
-        args << tagid(pairs[i])
-        args << pairs[i+1]
-      }
-      tk_send('set', 'col', *args)
-    end
-    self
-  end
-=end
-
-  def spans
-    simplelist(tk_send('spans')).collect{|inf|
-      lst = simplelist(inf)
-      idx = lst[0]
-      rows, cols = lst[1].split(',').map!{|n| Integer(n)}
-      [idx [rows, cols]]
-    }
-  end
-  alias span_list spans
-  def span(idx)
-    lst = simplelist(tk_send('spans', tagid(idx)))
-    idx = lst[0]
-    rows, cols = lst[1].split(',').map!{|n| Integer(n)}
-    [idx [rows, cols]]
-  end
-  def set_spans(*pairs)
-    # idx, val, idx, val, ...
-    args = []
-    0.step(pairs.size-1, 2){|i|
-      args << tagid(pairs[i])
-      val = pairs[i+1]
-      if val.kind_of?(Array)
-        args << val.join(',')
-      else
-        args << val
-      end
-    }
-    tk_send('spans', *args)
-    self
-  end
-=begin
-  def set_spans(*pairs)
-    if pairs[0].kind_of?(Array)
-      # [idx, val], [idx, val], ...
-      args = []
-      pairs.each{|idx, val|
-        args << tagid(idx)
-        if val.kind_of?(Array)
-          args << val.join(',')
-        else
-          args << val
-        end
-      }
-      tk_send('spans', *args)
-    else
-      # idx, val, idx, val, ...
-      args = []
-      0.step(pairs.size-1, 2){|i|
-        args << tagid(pairs[i])
-        val = pairs[i+1]
-        if val.kind_of?(Array)
-          args << val.join(',')
-        else
-          args << val
-        end
-      }
-      tk_send('spans', *args)
-    end
-    self
-  end
-=end
-
-  def tagid(tag)
-    if tag.kind_of?(Tk::TkTable::CellTag)
-      tag.id
-    elsif tag.kind_of?(Array)
-      if tag[0].kind_of?(Integer) && tag[1].kind_of?(Integer)
-        # [row, col]
-        tag.join(',')
-      else
-        tag
-      end
-    else
-      tag
-    end
-  end
-
-  def tagid2obj(tagid)
-    Tk::TkTable::CellTag::CellTagID_TBL.mutex.synchronize{
-      if Tk::TkTable::CellTag::CellTagID_TBL.key?(@path)
-        if Tk::TkTable::CellTag::CellTagID_TBL[@path].key?(tagid)
-          Tk::TkTable::CellTag::CellTagID_TBL[@path][tagid]
-        else
-          tagid
-        end
-      else
-        tagid
-      end
-    }
-  end
-
-  def tag_cell(tag, *cells)
-    tk_send('tag', 'cell', tagid(tag), *(cells.collect{|idx| tagid(idx)}))
-    self
-  end
-  def tag_reset(*cells)
-    tk_send('tag', 'cell', '', *(cells.collect{|idx| tagid(idx)}))
-    self
-  end
-  def tag_col(tag, *cols)
-    tk_send('tag', 'col', tagid(tag), *cols)
-    self
-  end
-  def tag_col_reset(*cols)
-    tk_send('tag', 'col', '', *cols)
-    self
-  end
-  def tag_delete(tag)
-    tk_send('tag', 'delete', tagid(tag))
-    Tk::TkTable::CellTag::CellTagID_TBL.mutex.synchronize{
-      if Tk::TkTable::CellTag::CellTagID_TBL[@path]
-        if tag.kind_of? Tk::TkTable::CellTag
-          Tk::TkTable::CellTag::CellTagID_TBL[@path].delete(tag.id)
-        else
-          Tk::TkTable::CellTag::CellTagID_TBL[@path].delete(tag)
-        end
-      end
-    }
-    self
-  end
-  def tag_exist?(tag)
-    bool(tk_send('tag', 'exists', tagid(tag)))
-  end
-  def tag_include?(tag, idx)
-    bool(tk_send('tag', 'includes', tagid(tag), tagid(idx)))
-  end
-  def tag_lower(tag, target=None)
-    tk_send('tag', 'lower', tagid(tag), tagid(target))
-    self
-  end
-  def tag_names(pat=None)
-    simplelist(tk_send('tag', 'names', pat)).collect{|tag| tagid2obj(tag)}
-  end
-  def tag_raise(tag, target=None)
-    tk_send('tag', 'raise', tagid(tag), tagid(target))
-    self
-  end
-  def tag_row(tag, *rows)
-    tk_send('tag', 'row', tagid(tag), *rows)
-    self
-  end
-  def tag_row_reset(*rows)
-    tk_send('tag', 'row', '', *rows)
-    self
-  end
-
-  def validate(idx)
-    bool(tk_send('validate', tagid(idx)))
-  end
-
-  def width_list
-    list(tk_send('width'))
-  end
-  def width(row)
-    number(tk_send('width', row))
-  end
-  def set_width(*pairs)
-    tk_send('width', *(pairs.flatten))
-    self
-  end
-
-  def window_delete(*args)
-    tk_send('window', 'delete', *(args.collect{|idx| tagid(idx)}))
-    self
-  end
-  def window_move(from_idx, to_idx)
-    tk_send('window', 'move', tagid(from_idx), tagid(to_idx))
-    self
-  end
-  def window_names(pat=None)
-    simplelist(tk_send('window', 'names', pat))
-  end
-end
diff --git a/ext/tk/lib/tkextlib/tktrans.rb b/ext/tk/lib/tkextlib/tktrans.rb
deleted file mode 100644
index 031eeb9fd7..0000000000
--- a/ext/tk/lib/tkextlib/tktrans.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_string_literal: false
-#
-#  TkTrans support (win32 only)
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/tktrans/setup.rb'
-
-# load library
-require 'tkextlib/tktrans/tktrans'
diff --git a/ext/tk/lib/tkextlib/tktrans/setup.rb b/ext/tk/lib/tkextlib/tktrans/setup.rb
deleted file mode 100644
index cc967dced6..0000000000
--- a/ext/tk/lib/tkextlib/tktrans/setup.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: false
-#
-#  setup.rb   --   setup script before calling TkPackage.require()
-#
-#    If you need some setup operations (for example, add a library path
-#    to the library search path) before using Tcl/Tk library packages
-#    wrapped by Ruby scripts in this directory, please write the setup
-#    operations in this file.
-#
diff --git a/ext/tk/lib/tkextlib/tktrans/tktrans.rb b/ext/tk/lib/tkextlib/tktrans/tktrans.rb
deleted file mode 100644
index e6e0e3a78d..0000000000
--- a/ext/tk/lib/tkextlib/tktrans/tktrans.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-# frozen_string_literal: false
-#
-#  TkTrans support (win32 only)
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/tktrans/setup.rb'
-
-TkPackage.require('tktrans') rescue Tk.load_tcllibrary('tktrans')
-
-module Tk
-  module TkTrans
-    PACKAGE_NAME = 'tktrans'.freeze
-    def self.package_name
-      PACKAGE_NAME
-    end
-
-    def self.package_version
-      begin
-        TkPackage.require('tktrans')
-      rescue
-        ''
-      end
-    end
-  end
-end
-
-class TkWindow
-  def tktrans_set_image(img)
-    tk_send('tktrans::setwidget', @path, img)
-    self
-  end
-  def tktrans_get_image()
-    tk_send('tktrans::setwidget', @path)
-  end
-end
-
-class Tk::Root
-  undef tktrans_set_image, tktrans_get_image
-
-  def tktrans_set_image(img)
-    tk_send('tktrans::settoplevel', @path, img)
-    self
-  end
-  def tktrans_get_image()
-    tk_send('tktrans::settoplevel', @path)
-  end
-end
-
-class Tk::Toplevel
-  undef tktrans_set_image, tktrans_get_image
-
-  def tktrans_set_image(img)
-    tk_send('tktrans::settoplevel', @path, img)
-    self
-  end
-  def tktrans_get_image()
-    tk_send('tktrans::settoplevel', @path)
-  end
-end
diff --git a/ext/tk/lib/tkextlib/treectrl.rb b/ext/tk/lib/tkextlib/treectrl.rb
deleted file mode 100644
index 227d55ff1e..0000000000
--- a/ext/tk/lib/tkextlib/treectrl.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# frozen_string_literal: false
-#
-#  TkTreeCtrl support
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/treectrl/setup.rb'
-
-# load library
-require 'tkextlib/treectrl/tktreectrl'
diff --git a/ext/tk/lib/tkextlib/treectrl/setup.rb b/ext/tk/lib/tkextlib/treectrl/setup.rb
deleted file mode 100644
index cc967dced6..0000000000
--- a/ext/tk/lib/tkextlib/treectrl/setup.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: false
-#
-#  setup.rb   --   setup script before calling TkPackage.require()
-#
-#    If you need some setup operations (for example, add a library path
-#    to the library search path) before using Tcl/Tk library packages
-#    wrapped by Ruby scripts in this directory, please write the setup
-#    operations in this file.
-#
diff --git a/ext/tk/lib/tkextlib/treectrl/tktreectrl.rb b/ext/tk/lib/tkextlib/treectrl/tktreectrl.rb
deleted file mode 100644
index dbd59f8c05..0000000000
--- a/ext/tk/lib/tkextlib/treectrl/tktreectrl.rb
+++ /dev/null
@@ -1,2523 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/treectrl/tktreectrl.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/treectrl/setup.rb'
-
-# TkPackage.require('treectrl', '1.0')
-# TkPackage.require('treectrl', '1.1')
-TkPackage.require('treectrl')
-
-module Tk
-  class TreeCtrl < TkWindow
-    BindTag_FileList = TkBindTag.new_by_name('TreeCtrlFileList')
-
-    PACKAGE_NAME = 'treectrl'.freeze
-    def self.package_name
-      PACKAGE_NAME
-    end
-
-    def self.package_version
-      begin
-        TkPackage.require('treectrl')
-      rescue
-        ''
-      end
-    end
-
-    HasColumnCreateCommand =
-      (TkPackage.vcompare(self.package_version, '1.1') >= 0)
-
-    # dummy ::
-    #  pkgIndex.tcl of TreeCtrl-1.0 doesn't support auto_load for
-    #  'loupe' command (probably it is bug, I think).
-    #  So, calling a 'treectrl' command for loading the dll with
-    #  the auto_load facility.
-    begin
-      tk_call('treectrl')
-    rescue
-    end
-    def self.loupe(img, x, y, w, h, zoom)
-      # NOTE: platform == 'unix' only
-
-      # img  => TkPhotoImage
-      # x, y => screen coords
-      # w, h => magnifier width and height
-      # zoom => zooming rate
-      Tk.tk_call_without_enc('loupe', img, x, y, w, h, zoom)
-    end
-
-    def self.text_layout(font, text, keys={})
-      TkComm.list(Tk.tk_call_without_enc('textlayout', font, text, keys))
-    end
-
-    def self.image_tint(img, color, alpha)
-      Tk.tk_call_without_enc('imagetint', img, color, alpha)
-    end
-
-    class NotifyEvent < TkUtil::CallbackSubst
-    end
-
-    module ConfigMethod
-    end
-  end
-  TreeCtrl_Widget = TreeCtrl
-end
-
-##############################################
-
-class Tk::TreeCtrl::NotifyEvent
-  # [ <'%' subst-key char>, <proc type char>, <instance var (accessor) name>]
-  KEY_TBL = [
-    [ ?c, ?n, :item_num ],
-    [ ?d, ?s, :detail ],
-    [ ?D, ?l, :items ],
-    [ ?e, ?e, :event ],
-    [ ?I, ?n, :id ],
-    [ ?l, ?n, :lower_bound ],
-    [ ?p, ?n, :active_id ],
-    [ ?P, ?e, :pattern ],
-    [ ?S, ?l, :sel_items ],
-    [ ?T, ?w, :widget ],
-    [ ?u, ?n, :upper_bound ],
-    [ ?W, ?o, :object ],
-    [ ??, ?x, :parm_info ],
-    nil
-  ]
-
-  # [ <proc type char>, <proc/method to convert tcl-str to ruby-obj>]
-  PROC_TBL = [
-    [ ?n, TkComm.method(:num_or_str) ],
-    [ ?s, TkComm.method(:string) ],
-    [ ?l, TkComm.method(:list) ],
-    [ ?w, TkComm.method(:window) ],
-
-    [ ?e, proc{|val|
-        case val
-        when /^<<[^<>]+>>$/
-          TkVirtualEvent.getobj(val[1..-2])
-        when /^<[^<>]+>$/
-          val[1..-2]
-        else
-          val
-        end
-      }
-    ],
-
-    [ ?o, proc{|val| TkComm.tk_tcl2ruby(val)} ],
-
-    [ ?x, proc{|val|
-        begin
-          inf = {}
-          Hash[*(TkComm.list(val))].each{|k, v|
-            if keyinfo = KEY_TBL.assoc(k[0])
-              if cmd = PROC_TBL.assoc(keyinfo[1])
-                begin
-                  new_v = cmd.call(v)
-                  v = new_v
-                rescue
-                end
-              end
-            end
-            inf[k] = v
-          }
-          inf
-        rescue
-          val
-        end
-      } ],
-
-    nil
-  ]
-
-=begin
-  # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-  KEY_TBL.map!{|inf|
-    if inf.kind_of?(Array)
-      inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-      inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-    end
-    inf
-  }
-
-  PROC_TBL.map!{|inf|
-    if inf.kind_of?(Array)
-      inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-    end
-    inf
-  }
-=end
-
-  # setup tables to be used by scan_args, _get_subst_key, _get_all_subst_keys
-  #
-  #     _get_subst_key() and _get_all_subst_keys() generates key-string
-  #     which describe how to convert callback arguments to ruby objects.
-  #     When binding parameters are given, use _get_subst_key().
-  #     But when no parameters are given, use _get_all_subst_keys() to
-  #     create a Event class object as a callback parameter.
-  #
-  #     scan_args() is used when doing callback. It convert arguments
-  #     ( which are Tcl strings ) to ruby objects based on the key string
-  #     that is generated by _get_subst_key() or _get_all_subst_keys().
-  #
-  _setup_subst_table(KEY_TBL, PROC_TBL);
-end
-
-##############################################
-
-module Tk::TreeCtrl::ConfigMethod
-  include TkItemConfigMethod
-
-  def treectrl_tagid(key, obj)
-    if key.kind_of?(Array)
-      key = key.join(' ')
-    else
-      key = key.to_s
-    end
-
-    if (obj.kind_of?(Tk::TreeCtrl::Column) ||
-        obj.kind_of?(Tk::TreeCtrl::Element) ||
-        obj.kind_of?(Tk::TreeCtrl::Item) ||
-        obj.kind_of?(Tk::TreeCtrl::Style))
-      obj = obj.id
-    end
-
-    case key
-    when 'column'
-      obj
-
-    when 'debug'
-      None
-
-    when 'dragimage'
-      None
-
-    when 'element'
-      obj
-
-    when 'item element'
-      obj
-
-    when 'marquee'
-      None
-
-    when 'notify'
-      obj
-
-    when 'style'
-      obj
-
-    else
-      obj
-    end
-  end
-
-  def tagid(mixed_id)
-    if mixed_id == 'debug'
-      ['debug', None]
-    elsif mixed_id == 'dragimage'
-      ['dragimage', None]
-    elsif mixed_id == 'marquee'
-      ['marquee', None]
-    elsif mixed_id.kind_of?(Array)
-      [mixed_id[0], treectrl_tagid(*mixed_id)]
-    else
-      tagid(mixed_id.split(':'))
-    end
-  end
-
-  def __item_cget_cmd(mixed_id)
-    if mixed_id[0] == 'column' && mixed_id[1] == 'drag'
-      return [self.path, 'column', 'dragcget']
-    end
-
-    if mixed_id[1].kind_of?(Array)
-      id = mixed_id[1]
-    else
-      id = [mixed_id[1]]
-    end
-
-    if mixed_id[0].kind_of?(Array)
-      ([self.path].concat(mixed_id[0]) << 'cget').concat(id)
-    else
-      [self.path, mixed_id[0], 'cget'].concat(id)
-    end
-  end
-  private :__item_cget_cmd
-
-  def __item_config_cmd(mixed_id)
-    if mixed_id[0] == 'column' && mixed_id[1] == 'drag'
-      return [self.path, 'column', 'dragconfigure']
-    end
-
-    if mixed_id[1].kind_of?(Array)
-      id = mixed_id[1]
-    else
-      id = [mixed_id[1]]
-    end
-
-    if mixed_id[0].kind_of?(Array)
-      ([self.path].concat(mixed_id[0]) << 'configure').concat(id)
-    else
-      [self.path, mixed_id[0], 'configure'].concat(id)
-    end
-  end
-  private :__item_config_cmd
-
-  def __item_pathname(id)
-    if id.kind_of?(Array)
-      key = id[0]
-      if key.kind_of?(Array)
-        key = key.join(' ')
-      end
-
-      tag = id[1]
-      if tag.kind_of?(Array)
-        tag = tag.join(' ')
-      end
-
-      id = [key, tag].join(':')
-    end
-    [self.path, id].join(';')
-  end
-  private :__item_pathname
-
-  def __item_configinfo_struct(id)
-    if id.kind_of?(Array) && id[0].to_s == 'notify'
-      {:key=>0, :alias=>nil, :db_name=>nil, :db_class=>nil,
-        :default_value=>nil, :current_value=>1}
-    else
-      {:key=>0, :alias=>1, :db_name=>1, :db_class=>2,
-        :default_value=>3, :current_value=>4}
-    end
-  end
-  private :__item_configinfo_struct
-
-
-  def __item_font_optkeys(id)
-    if id.kind_of?(Array) && (id[0] == 'element' ||
-                              (id[0].kind_of?(Array) && id[0][1] == 'element'))
-      []
-    else
-      ['font']
-    end
-  end
-  private :__item_font_optkeys
-
-  def __item_numstrval_optkeys(id)
-    if id == 'debug'
-      ['displaydelay']
-    else
-      super(id)
-    end
-  end
-  private :__item_numstrval_optkeys
-
-  def __item_boolval_optkeys(id)
-    if id == 'debug'
-      ['data', 'display', 'enable', 'span', 'textlayout']
-    elsif id == 'dragimage'
-      ['visible']
-    elsif id == 'marquee'
-      ['visible']
-    elsif id.kind_of?(Array)
-      case id[0]
-      when 'item'
-        ['visible', 'wrap', 'open', 'returnid', 'visible']
-      when 'column'
-        if id[1] == 'drag'
-          ['enable']
-        else
-          ['button', 'expand', 'resize', 'squeeze', 'sunken',
-            'visible', 'widthhack']
-        end
-      when 'element'
-        ['draw', 'filled', 'showfocus', 'clip', 'destroy']
-      when 'notify'
-        ['active']
-      when 'style'
-        ['detach', 'indent', 'visible']
-      else
-        if id[0].kind_of?(Array) && id[0][1] == 'element'
-          ['filled', 'showfocus']
-        else
-          super(id)
-        end
-      end
-    else
-      super(id)
-    end
-  end
-  private :__item_boolval_optkeys
-
-  def __item_strval_optkeys(id)
-    if id == 'debug'
-      ['erasecolor']
-    elsif id.kind_of?(Array)
-      case id[0]
-      when 'column'
-        if id[1] == 'drag'
-          ['indicatorcolor']
-        else
-          super(id) << 'textcolor'
-        end
-      when 'element'
-        super(id) << 'fill' << 'outline' << 'format'
-      else
-        super(id)
-      end
-    else
-      super(id)
-    end
-  end
-  private :__item_strval_optkeys
-
-  def __item_listval_optkeys(id)
-    if id.kind_of?(Array)
-      case id[0]
-      when 'column'
-        ['itembackground']
-      when 'element'
-        ['relief']
-      when 'style'
-        ['union']
-      else
-        if id[0].kind_of?(Array) && id[0][1] == 'element'
-          ['relief']
-        else
-          []
-        end
-      end
-    else
-      []
-    end
-  end
-  private :__item_listval_optkeys
-
-  def __item_val2ruby_optkeys(id)
-    if id.kind_of?(Array)
-      case id[0]
-      when 'item'
-        { 'button' => proc{|id,val| (val == 'auto')? val: TkComm.bool(val)} }
-      else
-        []
-      end
-    else
-      []
-    end
-  end
-  private :__item_val2ruby_optkeys
-
-  def __item_keyonly_optkeys(id)  # { def_key=>(undef_key|nil), ... }
-    {
-      'notreally'=>nil,
-      'increasing'=>'decreasing',
-      'decreasing'=>'increasing',
-      'ascii'=>nil,
-      'dictionary'=>nil,
-      'integer'=>nil,
-      'real'=>nil
-    }
-  end
-  private :__item_keyonly_optkeys
-
-  def column_cget_tkstring(tagOrId, option)
-    itemcget_tkstring(['column', tagOrId], option)
-  end
-  def column_cget(tagOrId, option)
-    itemcget(['column', tagOrId], option)
-  end
-  def column_cget_strict(tagOrId, option)
-    itemcget_strict(['column', tagOrId], option)
-  end
-  def column_configure(tagOrId, slot, value=None)
-    itemconfigure(['column', tagOrId], slot, value)
-  end
-  def column_configinfo(tagOrId, slot=nil)
-    itemconfiginfo(['column', tagOrId], slot)
-  end
-  def current_column_configinfo(tagOrId, slot=nil)
-    current_itemconfiginfo(['column', tagOrId], slot)
-  end
-
-  def column_dragcget_tkstring(option)
-    itemcget_tkstring(['column', 'drag'], option)
-  end
-  def column_dragcget(option)
-    itemcget(['column', 'drag'], option)
-  end
-  def column_dragcget_strict(option)
-    itemcget_strict(['column', 'drag'], option)
-  end
-  def column_dragconfigure(slot, value=None)
-    itemconfigure(['column', 'drag'], slot, value)
-  end
-  def column_dragconfiginfo(slot=nil)
-    itemconfiginfo(['column', 'drag'], slot)
-  end
-  def current_column_dragconfiginfo(slot=nil)
-    current_itemconfiginfo(['column', 'drag'], slot)
-  end
-
-  def debug_cget_tkstring(option)
-    itemcget_tkstring('debug', option)
-  end
-  def debug_cget(option)
-    itemcget('debug', option)
-  end
-  def debug_cget_strict(option)
-    itemcget_strict('debug', option)
-  end
-  def debug_configure(slot, value=None)
-    itemconfigure('debug', slot, value)
-  end
-  def debug_configinfo(slot=nil)
-    itemconfiginfo('debug', slot)
-  end
-  def current_debug_configinfo(slot=nil)
-    current_itemconfiginfo('debug', slot)
-  end
-
-  def dragimage_cget_tkstring(option)
-    itemcget_tkstring('dragimage', option)
-  end
-  def dragimage_cget(option)
-    itemcget('dragimage', option)
-  end
-  def dragimage_cget_strict(option)
-    itemcget_strict('dragimage', option)
-  end
-  def dragimage_configure(slot, value=None)
-    itemconfigure('dragimage', slot, value)
-  end
-  def dragimage_configinfo(slot=nil)
-    itemconfiginfo('dragimage', slot)
-  end
-  def current_dragimage_configinfo(slot=nil)
-    current_itemconfiginfo('dragimage', slot)
-  end
-
-  def element_cget_tkstring(tagOrId, option)
-    itemcget_tkstring(['element', tagOrId], option)
-  end
-  def element_cget(tagOrId, option)
-    itemcget(['element', tagOrId], option)
-  end
-  def element_cget_strict(tagOrId, option)
-    itemcget_strict(['element', tagOrId], option)
-  end
-  def element_configure(tagOrId, slot, value=None)
-    itemconfigure(['element', tagOrId], slot, value)
-  end
-  def element_configinfo(tagOrId, slot=nil)
-    itemconfiginfo(['element', tagOrId], slot)
-  end
-  def current_element_configinfo(tagOrId, slot=nil)
-    current_itemconfiginfo(['element', tagOrId], slot)
-  end
-
-  def item_cget_tkstring(tagOrId, option)
-    itemcget_tkstring(['item', tagOrId], option)
-  end
-  def item_cget(tagOrId, option)
-    itemcget(['item', tagOrId], option)
-  end
-  def item_cget_strict(tagOrId, option)
-    itemcget_strict(['item', tagOrId], option)
-  end
-  def item_configure(tagOrId, slot, value=None)
-    itemconfigure(['item', tagOrId], slot, value)
-  end
-  def item_configinfo(tagOrId, slot=nil)
-    itemconfiginfo(['item', tagOrId], slot)
-  end
-  def current_item_configinfo(tagOrId, slot=nil)
-    current_itemconfiginfo(['item', tagOrId], slot)
-  end
-
-  def item_element_cget_tkstring(item, column, elem, option)
-    itemcget_tkstring([['item', 'element'], [item, column, elem]], option)
-  end
-  def item_element_cget(item, column, elem, option)
-    itemcget([['item', 'element'], [item, column, elem]], option)
-  end
-  def item_element_cget_strict(item, column, elem, option)
-    itemcget_strict([['item', 'element'], [item, column, elem]], option)
-  end
-  def item_element_configure(item, column, elem, slot, value=None)
-    itemconfigure([['item', 'element'], [item, column, elem]], slot, value)
-  end
-  def item_element_configinfo(item, column, elem, slot=nil)
-    itemconfiginfo([['item', 'element'], [item, column, elem]], slot)
-  end
-  def current_item_element_configinfo(item, column, elem, slot=nil)
-    current_itemconfiginfo([['item', 'element'], [item, column, elem]], slot)
-  end
-
-  def marquee_cget_tkstring(option)
-    itemcget_tkstring('marquee', option)
-  end
-  def marquee_cget(option)
-    itemcget('marquee', option)
-  end
-  def marquee_cget_strict(option)
-    itemcget_strict('marquee', option)
-  end
-  def marquee_configure(slot, value=None)
-    itemconfigure('marquee', slot, value)
-  end
-  def marquee_configinfo(slot=nil)
-    itemconfiginfo('marquee', slot)
-  end
-  def current_marquee_configinfo(slot=nil)
-    current_itemconfiginfo('marquee', slot)
-  end
-
-  def notify_cget_tkstring(win, pattern, option)
-    pattern = "<#{pattern}>"
-    # "notify" doesn't have cget subcommand.
-    tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(['notify', [win, pattern]])) << "-#{option}")), false, true)[-1]
-  end
-  def notify_cget(win, pattern, option)
-    pattern = "<#{pattern}>"
-    # "notify" doesn't have cget subcommand.
-    current_itemconfiginfo(['notify', [win, pattern]])[option.to_s]
-  end
-  def notify_cget_strict(win, pattern, option)
-    pattern = "<#{pattern}>"
-    # "notify" doesn't have cget subcommand.
-    info = current_itemconfiginfo(['notify', [win, pattern]])
-    option = option.to_s
-    unless info.has_key?(option)
-      fail RuntimeError, "unknown option \"#{option}\""
-    else
-      info[option]
-    end
-  end
-  def notify_configure(win, pattern, slot, value=None)
-    pattern = "<#{pattern}>"
-    itemconfigure(['notify', [win, pattern]], slot, value)
-  end
-  def notify_configinfo(win, pattern, slot=nil)
-    pattern = "<#{pattern}>"
-    itemconfiginfo(['notify', [win, pattern]], slot)
-  end
-  def current_notify_configinfo(tagOrId, slot=nil)
-    pattern = "<#{pattern}>"
-    current_itemconfiginfo(['notify', [win, pattern]], slot)
-  end
-
-  def style_cget_tkstring(tagOrId, option)
-    itemcget_tkstring(['style', tagOrId], option)
-  end
-  def style_cget(tagOrId, option)
-    itemcget(['style', tagOrId], option)
-  end
-  def style_cget_strict(tagOrId, option)
-    itemcget_strict(['style', tagOrId], option)
-  end
-  def style_configure(tagOrId, slot, value=None)
-    itemconfigure(['style', tagOrId], slot, value)
-  end
-  def style_configinfo(tagOrId, slot=nil)
-    itemconfiginfo(['style', tagOrId], slot)
-  end
-  def current_style_configinfo(tagOrId, slot=nil)
-    current_itemconfiginfo(['style', tagOrId], slot)
-  end
-
-  private :itemcget_tkstring, :itemcget, :itemcget_strict
-  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
-end
-
-##############################################
-
-class Tk::TreeCtrl
-  include Tk::TreeCtrl::ConfigMethod
-  include Scrollable
-
-  TkCommandNames = ['treectrl'.freeze].freeze
-  WidgetClassName = 'TreeCtrl'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  #########################
-
-  def __destroy_hook__
-    Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL.mutex.synchronize{
-      Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL.delete(@path)
-    }
-    Tk::TreeCtrl::Element::TreeCtrlElementID_TBL.mutex.synchronize{
-      Tk::TreeCtrl::Element::TreeCtrlElementID_TBL.delete(@path)
-    }
-    Tk::TreeCtrl::Item::TreeCtrlItemID_TBL.mutex.synchronize{
-      Tk::TreeCtrl::Item::TreeCtrlItemID_TBL.delete(@path)
-    }
-    Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL.mutex.synchronize{
-      Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL.delete(@path)
-    }
-  end
-
-  #########################
-
-  def __strval_optkeys
-    super() + [
-      'buttoncolor', 'columnprefix', 'itemprefix', 'linecolor'
-    ]
-  end
-  private :__strval_optkeys
-
-  def __boolval_optkeys
-    [
-      'itemwidthequal', 'usetheme',
-      'showbuttons', 'showheader', 'showlines', 'showroot',
-      'showrootbutton', 'showrootlines', 'showrootchildbuttons'
-    ]
-  end
-  private :__boolval_optkeys
-
-  def __listval_optkeys
-    [ 'defaultstyle' ]
-  end
-  private :__listval_optkeys
-
-  #########################
-
-  def install_bind(cmd, *args)
-    install_bind_for_event_class(Tk::TreeCtrl::NotifyEvent, cmd, *args)
-  end
-
-  #########################
-
-  def create_self(keys)
-    if keys and keys != None
-      tk_call_without_enc(self.class::TkCommandNames[0], @path,
-                          *hash_kv(keys, true))
-    else
-      tk_call_without_enc(self.class::TkCommandNames[0], @path)
-    end
-  end
-  private :create_self
-
-  #########################
-
-  def activate(desc)
-    tk_send('activate', desc)
-    self
-  end
-
-  def canvasx(x)
-    number(tk_send('canvasx', x))
-  end
-
-  def canvasy(y)
-    number(tk_send('canvasy', y))
-  end
-
-  def collapse(*dsc)
-    tk_send_without_enc('collapse', *(dsc.map!{|d| _get_eval_string(d, true)}))
-    self
-  end
-
-  def collapse_recurse(*dsc)
-    tk_send_without_enc('collapse', '-recurse',
-                        *(dsc.map!{|d| _get_eval_string(d, true)}))
-    self
-  end
-
-  def column_bbox(idx)
-    list(tk_send('column', 'bbox', idx))
-  end
-
-  def column_compare(column1, op, column2)
-    bool(tk_send('column', 'compare', column1, op, column2))
-  end
-
-  def column_count
-    num_or_str(tk_send('column', 'count'))
-  end
-
-  def column_create(keys=nil)
-    if keys && keys.kind_of?(Hash)
-      num_or_str(tk_send('column', 'create', *hash_kv(keys)))
-    else
-      num_or_str(tk_send('column', 'create'))
-    end
-  end
-
-  def column_delete(idx)
-    Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL.mutex.synchronize{
-      if Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[self.path]
-        Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[self.path].delete(idx)
-      end
-    }
-    tk_send('column', 'delete', idx)
-    self
-  end
-
-  def column_index(idx)
-    num_or_str(tk_send('column', 'index', idx))
-  end
-
-  def column_id(idx)
-    tk_send('column', 'id', idx)
-  end
-
-  def column_list(visible=false)
-    if visible
-      simplelist(tk_send('column', 'list', '-visible'))
-    else
-      simplelist(tk_send('column', 'list'))
-    end
-  end
-  def column_visible_list
-    column_list(true)
-  end
-
-  def column_move(idx, before)
-    tk_send('column', 'move', idx, before)
-    self
-  end
-
-  def column_needed_width(idx)
-    num_or_str(tk_send('column', 'neededwidth', idx))
-  end
-  alias column_neededwidth column_needed_width
-
-  def column_order(column, visible=false)
-    if visible
-      num_or_str(tk_send('column', 'order', column, '-visible'))
-    else
-      num_or_str(tk_send('column', 'order', column))
-    end
-  end
-  def column_visible_order(column)
-    column_order(column, true)
-  end
-
-  def column_width(idx)
-    num_or_str(tk_send('column', 'width', idx))
-  end
-
-  def compare(item1, op, item2)
-    bool(tk_send('compare', item1, op, item2))
-  end
-
-  def contentbox()
-    list(tk_send('contentbox'))
-  end
-
-  def depth(item=None)
-    num_or_str(tk_send_without_enc('depth', _get_eval_string(item, true)))
-  end
-
-  def dragimage_add(item, *args)
-    tk_send('dragimage', 'add', item, *args)
-    self
-  end
-
-  def dragimage_clear()
-    tk_send('dragimage', 'clear')
-    self
-  end
-
-  def dragimage_offset(*args) # x, y
-    if args.empty?
-      list(tk_send('dragimage', 'offset'))
-    else
-      tk_send('dragimage', 'offset', *args)
-      self
-    end
-  end
-
-  def dragimage_visible(*args) # mode
-    if args..empty?
-      bool(tk_send('dragimage', 'visible'))
-    else
-      tk_send('dragimage', 'visible', *args)
-      self
-    end
-  end
-  def dragimage_visible?
-    dragimage_visible()
-  end
-
-  def debug_dinfo
-    tk_send('debug', 'dinfo')
-    self
-  end
-
-  def debug_scroll
-    tk_send('debug', 'scroll')
-  end
-
-  def element_create(elem, type, keys=nil)
-    if keys && keys.kind_of?(Hash)
-      tk_send('element', 'create', elem, type, *hash_kv(keys))
-    else
-      tk_send('element', 'create', elem, type)
-    end
-  end
-
-  def element_delete(*elems)
-    Tk::TreeCtrl::Element::TreeCtrlElementID_TBL.mutex.synchronize{
-      if Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[self.path]
-        elems.each{|elem|
-          Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[self.path].delete(elem)
-        }
-      end
-    }
-    tk_send('element', 'delete', *elems)
-    self
-  end
-
-  def element_names()
-    list(tk_send('element', 'names')).collect!{|elem|
-      Tk::TreeCtrl::Element.id2obj(self, elem)
-    }
-  end
-
-  def _conv_element_perstate_val(opt, val)
-    case opt
-    when 'background', 'foreground', 'fill', 'outline', 'format'
-      val
-    when 'draw', 'filled', 'showfocus', 'destroy'
-      bool(val)
-    else
-      tk_tcl2ruby(val)
-    end
-  end
-  private :_conv_element_perstate_val
-
-  def element_perstate(elem, opt, st_list)
-    tk_send('element', 'perstate', elem, "-{opt}", st_list)
-  end
-
-  def element_type(elem)
-    tk_send('element', 'type', elem)
-  end
-
-  def element_class(elem)
-    Tk::TreeCtrl::Element.type2class(element_type(elem))
-  end
-
-  def expand(*dsc)
-    tk_send('expand', *dsc)
-    self
-  end
-
-  def expand_recurse(*dsc)
-    tk_send('expand', '-recurse', *dsc)
-    self
-  end
-
-  def identify(x, y)
-    lst = list(tk_send('identify', x, y))
-
-    if lst[0] == 'item'
-      lst[1] = Tk::TreeCtrl::Item.id2obj(self, lst[1])
-      size = lst.size
-      i = 2
-      while i < size
-        case lst[i]
-        when 'line'
-          i += 1
-          lst[i] = Tk::TreeCtrl::Item.id2obj(self, lst[i])
-          i += 1
-
-        when 'button'
-          i += 1
-
-        when 'column'
-          i += 2
-
-        when 'elem'
-          i += 1
-          lst[i] = Tk::TreeCtrl::Element.id2obj(self, lst[i])
-          i += 1
-
-        else
-          i += 1
-        end
-      end
-    end
-
-    lst
-  end
-
-  def index(idx)
-    num_or_str(tk_send('index', idx))
-  end
-
-  def item_ancestors(item)
-    list(tk_send('item', 'ancestors', item)).collect!{|id|
-      Tk::TreeCtrl::Item.id2obj(self, id)
-    }
-  end
-
-  def item_bbox(item, *args)
-    list(tk_send('item', 'bbox', item, *args))
-  end
-
-  def item_children(item)
-    list(tk_send('item', 'children', item)).collect!{|id|
-      Tk::TreeCtrl::Item.id2obj(self, id)
-    }
-  end
-
-  def item_collapse(item)
-    tk_send_without_enc('item', 'collapse', _get_eval_string(item, true))
-    self
-  end
-
-  def item_collapse_recurse(item)
-    tk_send_without_enc('item', 'collapse',
-                        _get_eval_string(item, true), '-recurse')
-    self
-  end
-
-  def item_compare(item1, op, item2)
-    bool(tk_send('item', 'compare', item1, op, item2))
-  end
-
-  def item_complex(item, *args)
-    tk_send_without_enc('item', 'complex',
-                        _get_eval_string(item, true),
-                        *(args.map!{|arg| _get_eval_string(arg, true)}))
-    self
-  end
-
-  def item_count
-    num_or_str(tk_send('item', 'count'))
-  end
-
-  def item_create(keys={})
-    num_or_str(tk_send_without_enc('item', 'create', *hash_kv(keys, true)))
-  end
-
-  def _erase_children(item)
-    item_children(item).each{|i| _erase_children(i)}
-    # table is already locked
-    Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[self.path].delete(item)
-  end
-  private :_erase_children
-
-  def item_delete(first, last=None)
-    Tk::TreeCtrl::Item::TreeCtrlItemID_TBL.mutex.synchronize{
-      if Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[self.path]
-        if first == 'all' || first == :all || last == 'all' || last == :all
-          Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[self.path].clear
-        elsif last == None
-          _erase_children(first)
-        else
-          self.range(first, last).each{|id|
-            _erase_children(id)
-          }
-        end
-      end
-    }
-    tk_send('item', 'delete', first, last)
-    self
-  end
-
-  def item_dump(item)
-    list(tk_send('item', 'dump', item))
-  end
-
-  def item_dump_hash(item)
-    Hash[*list(tk_send('item', 'dump', item))]
-  end
-
-  def item_element_actual(item, column, elem, key)
-    tk_send('item', 'element', 'actual', item, column, elem, "-#{key}")
-  end
-
-  def item_element_perstate(elem, opt, st_list)
-    tk_send('item', 'element', 'perstate', elem, "-{opt}", st_list)
-  end
-
-  def item_expand(item)
-    tk_send('item', 'expand', item)
-    self
-  end
-
-  def item_expand_recurse(item)
-    tk_send('item', 'expand', item, '-recurse')
-    self
-  end
-
-  def item_firstchild(parent, child=nil)
-    if child
-      tk_send_without_enc('item', 'firstchild',
-                          _get_eval_string(parent, true),
-                          _get_eval_string(child, true))
-      self
-    else
-      id = num_or_str(tk_send_without_enc('item', 'firstchild',
-                                          _get_eval_string(parent, true)))
-      Tk::TreeCtrl::Item.id2obj(self, id)
-    end
-  end
-  alias item_first_child item_firstchild
-
-  def item_hasbutton(item, st=None)
-    if st == None
-      bool(tk_send_without_enc('item', 'hasbutton',
-                               _get_eval_string(item, true)))
-    else
-      tk_send_without_enc('item', 'hasbutton',
-                          _get_eval_string(item, true),
-                          _get_eval_string(st))
-      self
-    end
-  end
-  alias item_has_button item_hasbutton
-
-  def item_hasbutton?(item)
-    item_hasbutton(item)
-  end
-  alias item_has_button? item_hasbutton?
-
-  def item_id(item)
-    tk_send('item', 'id', item)
-  end
-
-  def item_image(item, column=nil, *args)
-    if args.empty?
-      if column
-        img = tk_send('item', 'image', item, column)
-        TkImage::Tk_IMGTBL[img]? TkImage::Tk_IMGTBL[img] : img
-      else
-        simplelist(tk_send('item', 'image', item)).collect!{|img|
-          TkImage::Tk_IMGTBL[img]? TkImage::Tk_IMGTBL[img] : img
-        }
-      end
-    else
-      tk_send('item', 'image', item, column, *args)
-      self
-    end
-  end
-  def get_item_image(item, column=nil)
-    item_image(item, column)
-  end
-  def set_item_image(item, col, img, *args)
-    item_image(item, col, img, *args)
-  end
-
-  def item_index(item)
-    list(tk_send('item', 'index', item))
-  end
-
-  def item_isancestor(item, des)
-    bool(tk_send('item', 'isancestor', item, des))
-  end
-  alias item_is_ancestor  item_isancestor
-  alias item_isancestor?  item_isancestor
-  alias item_is_ancestor? item_isancestor
-
-  def item_isopen(item)
-    bool(tk_send('item', 'isopen', item))
-  end
-  alias item_is_open    item_isopen
-  alias item_isopen?    item_isopen
-  alias item_is_open?   item_isopen
-  alias item_isopened?  item_isopen
-  alias item_is_opened? item_isopen
-
-  def item_lastchild(parent, child=nil)
-    if child
-      tk_send_without_enc('item', 'lastchild',
-                          _get_eval_string(parent, true),
-                          _get_eval_string(child, true))
-      self
-    else
-      id = num_or_str(tk_send_without_enc('item', 'lastchild',
-                                          _get_eval_string(parent, true)))
-      Tk::TreeCtrl::Item.id2obj(self, id)
-    end
-  end
-  alias item_last_child item_lastchild
-
-  def item_nextsibling(sibling, nxt=nil)
-    if nxt
-      tk_send('item', 'nextsibling', sibling, nxt)
-      self
-    else
-      id = num_or_str(tk_send('item', 'nextsibling', sibling))
-      Tk::TreeCtrl::Item.id2obj(self, id)
-    end
-  end
-  alias item_next_sibling item_nextsibling
-
-  def item_numchildren(item)
-    number(tk_send_without_enc('item', 'numchildren',
-                               _get_eval_string(item, true)))
-  end
-  alias item_num_children  item_numchildren
-  alias item_children_size item_numchildren
-
-  def item_order(item, visible=false)
-    if visible
-      ret = num_or_str(tk_send('item', 'order', item, '-visible'))
-    else
-      ret = num_or_str(tk_send('item', 'order', item))
-    end
-
-    (ret.kind_of?(Fixnum) && ret < 0)? nil: ret
-  end
-  def item_visible_order(item)
-    item_order(item, true)
-  end
-
-  def item_parent(item)
-    id = num_or_str(tk_send('item', 'parent', item))
-    Tk::TreeCtrl::Item.id2obj(self, id)
-  end
-
-  def item_prevsibling(sibling, prev=nil)
-    if prev
-      tk_send('item', 'prevsibling', sibling, prev)
-      self
-    else
-      id = num_or_str(tk_send('item', 'prevsibling', sibling))
-      Tk::TreeCtrl::Item.id2obj(self, id)
-    end
-  end
-  alias item_prev_sibling item_prevsibling
-
-  def item_range(first, last)
-    simplelist(tk_send('item', 'range', first, last))
-  end
-
-  def item_remove(item)
-    tk_send('item', 'remove', item)
-    self
-  end
-
-  def item_rnc(item)
-    list(tk_send('item', 'rnc', item))
-  end
-
-  def _item_sort_core(real_sort, item, *opts)
-    # opts ::= sort_param [, sort_param, ... ]
-    # sort_param ::= {key=>val, ...}
-    #                [type, desc, {key=>val, ...}]
-    #                param
-    opts = opts.collect{|param|
-      if param.kind_of?(Hash)
-        param = _symbolkey2str(param)
-        if param.key?('column')
-          key = '-column'
-          desc = param.delete('column')
-        elsif param.key?('element')
-          key = '-element'
-          desc = param.delete('element')
-        else
-          key = nil
-        end
-
-        if param.empty?
-          param = None
-        else
-          param = hash_kv(__conv_item_keyonly_opts(item, param))
-        end
-
-        if key
-          [key, desc].concat(param)
-        else
-          param
-        end
-
-      elsif param.kind_of?(Array)
-        if param[2].kind_of?(Hash)
-          param[2] = hash_kv(__conv_item_keyonly_opts(item, param[2]))
-        end
-        param
-
-      elsif param.kind_of?(String) && param =~ /\A[a-z]+\Z/
-        '-' << param
-
-      elsif param.kind_of?(Symbol)
-        '-' << param.to_s
-
-      else
-        param
-      end
-    }.flatten
-
-    if real_sort
-      tk_send('item', 'sort', item, *opts)
-      self
-    else
-      list(tk_send('item', 'sort', item, '-notreally', *opts))
-    end
-  end
-  private :_item_sort_core
-
-  def item_sort(item, *opts)
-    _item_sort_core(true, item, *opts)
-  end
-  def item_sort_not_really(item, *opts)
-    _item_sort_core(false, item, *opts)
-  end
-
-  def item_span(item, column=nil, *args)
-    if args.empty?
-      if column
-        list(tk_send('item', 'span', item, column))
-      else
-        simplelist(tk_send('item', 'span', item)).collect!{|elem| list(elem)}
-      end
-    else
-      tk_send('item', 'span', item, column, *args)
-      self
-    end
-  end
-  def get_item_span(item, column=nil)
-    item_span(item, column)
-  end
-  def set_item_span(item, col, num, *args)
-    item_span(item, col, num, *args)
-  end
-
-  def item_state_forcolumn(item, column, *args)
-    tk_send('item', 'state', 'forcolumn', item, column, *args)
-  end
-  alias item_state_for_column item_state_forcolumn
-
-  def item_state_get(item, *args)
-    if args.empty?
-      list(tk_send('item', 'state', 'get', item *args))
-    else
-      bool(tk_send('item', 'state', 'get', item))
-    end
-  end
-
-  def item_state_set(item, *args)
-    tk_send('item', 'state', 'set', item, *args)
-  end
-
-  def item_style_elements(item, column)
-    list(tk_send('item', 'style', 'elements', item, column)).collect!{|id|
-      Tk::TreeCtrl::Style.id2obj(self, id)
-    }
-  end
-
-  def item_style_map(item, column, style, map)
-    tk_send('item', 'style', 'map', item, column, style, map)
-    self
-  end
-
-  def item_style_set(item, column=nil, *args)
-    if args.empty?
-      if column
-        id = tk_send_without_enc('item', 'style', 'set',
-                                 _get_eval_string(item, true),
-                                 _get_eval_string(column, true))
-        Tk::TreeCtrl::Style.id2obj(self, id)
-      else
-        list(tk_send_without_enc('item', 'style', 'set',
-                                 _get_eval_string(item, true))).collect!{|id|
-          Tk::TreeCtrl::Style.id2obj(self, id)
-        }
-      end
-    else
-      tk_send_without_enc('item', 'style', 'set',
-                          _get_eval_string(item, true),
-                          _get_eval_string(column, true),
-                          *(args.flatten.map!{|arg|
-                              _get_eval_string(arg, true)
-                            }))
-      self
-    end
-  end
-
-  def item_text(item, column, txt=nil, *args)
-    if args.empty?
-      if txt
-        tk_send('item', 'text', item, column, txt)
-        self
-      else
-        tk_send('item', 'text', item, column)
-      end
-    else
-      tk_send('item', 'text', item, column, txt, *args)
-      self
-    end
-  end
-
-  def item_toggle(item)
-    tk_send('item', 'toggle', item)
-    self
-  end
-
-  def item_toggle_recurse(item)
-    tk_send('item', 'toggle', item, '-recurse')
-    self
-  end
-
-  def item_visible(item, st=None)
-    if st == None
-      bool(tk_send('item', 'visible', item))
-    else
-      tk_send('item', 'visible', item, st)
-      self
-    end
-  end
-  def item_visible?(item)
-    item_visible(item)
-  end
-
-  def marquee_anchor(*args)
-    if args.empty?
-      list(tk_send('marquee', 'anchor'))
-    else
-      tk_send('marquee', 'anchor', *args)
-      self
-    end
-  end
-
-  def marquee_coords(*args)
-    if args.empty?
-      list(tk_send('marquee', 'coords'))
-    else
-      tk_send('marquee', 'coords', *args)
-      self
-    end
-  end
-
-  def marquee_corner(*args)
-    if args.empty?
-      tk_send('marquee', 'corner')
-    else
-      tk_send('marquee', 'corner', *args)
-      self
-    end
-  end
-
-  def marquee_identify()
-    list(tk_send('marquee', 'identify')).collect!{|id|
-      Tk::TreeCtrl::Item.id2obj(self, id)
-    }
-  end
-
-  def marquee_visible(st=None)
-    if st == None
-      bool(tk_send('marquee', 'visible'))
-    else
-      tk_send('marquee', 'visible', st)
-      self
-    end
-  end
-  def marquee_visible?()
-    marquee_visible()
-  end
-
-  #def notify_bind(obj, event, cmd=Proc.new, *args)
-  #  _bind([@path, 'notify', 'bind', obj], event, cmd, *args)
-  #  self
-  #end
-  def notify_bind(obj, event, *args)
-    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _bind([@path, 'notify', 'bind', obj], event, cmd, *args)
-    self
-  end
-
-  #def notify_bind_append(obj, event, cmd=Proc.new, *args)
-  #  _bind_append([@path, 'notify', 'bind', obj], event, cmd, *args)
-  #  self
-  #end
-  def notify_bind_append(obj, event, *args)
-    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
-      cmd = args.shift
-    else
-      cmd = Proc.new
-    end
-    _bind_append([@path, 'notify', 'bind', obj], event, cmd, *args)
-    self
-  end
-
-  def notify_bind_remove(obj, event)
-    _bind_remove([@path, 'notify', 'bind', obj], event)
-    self
-  end
-
-  def notify_bindinfo(obj, event=nil)
-    _bindinfo([@path, 'notify', 'bind', obj], event)
-  end
-
-  def notify_detailnames(event)
-    list(tk_send('notify', 'detailnames', event))
-  end
-
-  def notify_eventnames()
-    list(tk_send('notify', 'eventnames'))
-  end
-
-  def notify_generate(pattern, char_map=None, percents_cmd=None)
-    pattern = "<#{pattern}>"
-    tk_send('notify', 'generate', pattern, char_map, percents_cmd)
-    self
-  end
-
-  def notify_install(pattern, percents_cmd=nil, &b)
-    pattern = "<#{pattern}>"
-    percents_cmd = Proc.new(&b) if !percents_cmd && b
-    if percents_cmd
-      procedure(tk_send('notify', 'install', pattern, percents_cmd))
-    else
-      procedure(tk_send('notify', 'install', pattern))
-    end
-  end
-
-  def notify_install_detail(event, detail, percents_cmd=nil, &b)
-    percents_cmd = Proc.new(&b) if !percents_cmd && b
-    if percents_cmd
-      tk_send('notify', 'install', 'detail', event, detail, percents_cmd)
-    else
-      tk_send('notify', 'install', 'detail', event, detail)
-    end
-  end
-
-  def notify_install_event(event, percents_cmd=nil, &b)
-    percents_cmd = Proc.new(&b) if !percents_cmd && b
-    if percents_cmd
-      tk_send('notify', 'install', 'event', event, percents_cmd)
-    else
-      tk_send('notify', 'install', 'event', event)
-    end
-  end
-
-  def notify_linkage(pattern, detail=None)
-    if detail != None
-      tk_send('notify', 'linkage', pattern, detail)
-    else
-      begin
-        if pattern.to_s.index(?-)
-          # TreeCtrl 1.1 format?
-          begin
-            tk_send('notify', 'linkage', "<#{pattern}>")
-          rescue
-            # TreeCtrl 1.0?
-            tk_send('notify', 'linkage', pattern)
-          end
-        else
-          # TreeCtrl 1.0 format?
-          begin
-            tk_send('notify', 'linkage', pattern)
-          rescue
-            # TreeCtrl 1.1?
-            tk_send('notify', 'linkage', "<#{pattern}>")
-          end
-        end
-      end
-    end
-  end
-
-  def notify_unbind(pattern=nil)
-    if pattern
-      tk_send('notify', 'unbind', "<#{pattern}>")
-    else
-      tk_send('notify', 'unbind')
-    end
-    self
-  end
-
-  def notify_uninstall(pattern)
-    pattern = "<#{pattern}>"
-    tk_send('notify', 'uninstall', pattern)
-    self
-  end
-
-  def notify_uninstall_detail(event, detail)
-    tk_send('notify', 'uninstall', 'detail', event, detail)
-    self
-  end
-
-  def notify_uninstall_event(event)
-    tk_send('notify', 'uninstall', 'event', event)
-    self
-  end
-
-  def numcolumns()
-    num_or_str(tk_send('numcolumns'))
-  end
-  alias num_columns  numcolumns
-  alias columns_size numcolumns
-
-  def numitems()
-    num_or_str(tk_send('numitems'))
-  end
-  alias num_items  numitems
-  alias items_size numitems
-
-  def orphans()
-    list(tk_send('orphans')).collect!{|id|
-      Tk::TreeCtrl::Item.id2obj(self, id)
-    }
-  end
-
-  def range(first, last)
-    list(tk_send('range', first, last)).collect!{|id|
-      Tk::TreeCtrl::Item.id2obj(self, id)
-    }
-  end
-
-  def state_define(name)
-    tk_send('state', 'define', name)
-    self
-  end
-
-  def state_linkage(name)
-    tk_send('state', 'linkage', name)
-  end
-
-  def state_names()
-    list(tk_send('state', 'names'))
-  end
-
-  def state_undefine(*names)
-    tk_send('state', 'undefine', *names)
-    self
-  end
-
-  def see(item, column=None, keys={})
-    tk_send('see', item, column, *hash_kv(keys))
-    self
-  end
-
-  def selection_add(first, last=None)
-    tk_send('selection', 'add', first, last)
-    self
-  end
-
-  def selection_anchor(item=None)
-    id = num_or_str(tk_send('selection', 'anchor', item))
-    Tk::TreeCtrl::Item.id2obj(self, id)
-  end
-
-  def selection_clear(*args) # first, last
-    tk_send('selection', 'clear', *args)
-    self
-  end
-
-  def selection_count()
-    number(tk_send('selection', 'count'))
-  end
-
-  def selection_get()
-    list(tk_send('selection', 'get')).collect!{|id|
-      Tk::TreeCtrl::Item.id2obj(self, id)
-    }
-  end
-
-  def selection_includes(item)
-    bool(tk_send('selection', 'includes', item))
-  end
-
-  def selection_modify(sel, desel)
-    tk_send('selection', 'modify', sel, desel)
-    self
-  end
-
-  def style_create(style, keys=None)
-    if keys && keys != None
-      tk_send('style', 'create', style, *hash_kv(keys))
-    else
-      tk_send('style', 'create', style)
-    end
-  end
-
-  def style_delete(*args)
-    Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL.mutex.synchronize{
-      if Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[self.path]
-        args.each{|sty|
-          Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[self.path].delete(sty)
-        }
-      end
-    }
-    tk_send('style', 'delete', *args)
-    self
-  end
-
-  def style_elements(style, *elems)
-    if elems.empty?
-      list(tk_send('style', 'elements', style)).collect!{|id|
-        Tk::TreeCtrl::Element.id2obj(self, id)
-      }
-    else
-      tk_send('style', 'elements', style, elems.flatten)
-      self
-    end
-  end
-
-  def _conv_style_layout_val(sty, val)
-    case sty.to_s
-    when 'padx', 'pady', 'ipadx', 'ipady'
-      lst = list(val)
-      (lst.size == 1)? lst[0]: lst
-    when 'detach', 'indent'
-      bool(val)
-    when 'union'
-      simplelist(val).collect!{|elem|
-        Tk::TreeCtrl::Element.id2obj(self, elem)
-      }
-    else
-      val
-    end
-  end
-  private :_conv_style_layout_val
-
-  def style_layout(style, elem, keys=None)
-    if keys && keys != None
-      if keys.kind_of?(Hash)
-        tk_send('style', 'layout', style, elem, *hash_kv(keys))
-        self
-      else
-        _conv_style_layout_val(keys,
-                               tk_send('style', 'layout',
-                                       style, elem, "-#{keys}"))
-      end
-    else
-      ret = Hash.new
-      Hash[*simplelist(tk_send('style', 'layout', style, elem))].each{|k, v|
-        k = k[1..-1]
-        ret[k] = _conv_style_layout_val(k, v)
-      }
-      ret
-    end
-  end
-  def get_style_layout(style, elem, opt=None)
-    style_layout(style, elem, opt)
-  end
-  def set_style_layout(style, elem, slot, value=None)
-    if slot.kind_of?(Hash)
-      style_layout(style, elem, slot)
-    else
-      style_layout(style, elem, {slot=>value})
-    end
-  end
-
-  def style_names()
-    list(tk_send('style', 'names')).collect!{|id|
-      Tk::TreeCtrl::Style.id2obj(self, id)
-    }
-  end
-
-  def toggle(*items)
-    tk_send('toggle', *items)
-    self
-  end
-
-  def toggle_recurse()
-    tk_send('toggle', '-recurse', *items)
-    self
-  end
-end
-
-#####################
-
-class Tk::TreeCtrl::Column < TkObject
-  TreeCtrlColumnID_TBL = TkCore::INTERP.create_table
-
-  (TreeCtrlColumnID = ['treectrl_column'.freeze, TkUtil.untrust('00000')]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  TkCore::INTERP.init_ip_env{
-    Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL.mutex.synchronize{
-      Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL.clear
-    }
-  }
-
-  def self.id2obj(tree, id)
-    tpath = tree.path
-    Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL.mutex.synchronize{
-      if Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[tpath]
-        Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[tpath][id]? \
-                   Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[tpath][id] : id
-      else
-        id
-      end
-    }
-  end
-
-  def initialize(parent, keys={})
-    @tree = parent
-    @tpath = parent.path
-
-    keys = _symbolkey2str(keys)
-
-    Tk::TreeCtrl::Column::TreeCtrlColumnID.mutex.synchronize{
-      @path = @id =
-        keys.delete('tag') ||
-        Tk::TreeCtrl::Column::TreeCtrlColumnID.join(TkCore::INTERP._ip_id_)
-      Tk::TreeCtrl::Column::TreeCtrlColumnID[1].succ!
-    }
-
-    keys['tag'] = @id
-
-    Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL.mutex.synchronize{
-      Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[@tpath] ||= {}
-      Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[@tpath][@id] = self
-    }
-
-    @tree.column_create(keys)
-  end
-
-  def id
-    @id
-  end
-
-  def to_s
-    @id.to_s.dup
-  end
-
-  def cget_tkstring(opt)
-    @tree.column_cget_tkstring(@tree.column_index(@id), opt)
-  end
-  def cget(opt)
-    @tree.column_cget(@tree.column_index(@id), opt)
-  end
-  def cget_strict(opt)
-    @tree.column_cget_strict(@tree.column_index(@id), opt)
-  end
-
-  def configure(*args)
-    @tree.column_configure(@tree.column_index(@id), *args)
-  end
-
-  def configinfo(*args)
-    @tree.column_configinfo(@tree.column_index(@id), *args)
-  end
-
-  def current_configinfo(*args)
-    @tree.current_column_configinfo(@tree.column_index(@id), *args)
-  end
-
-  def delete
-    @tree.column_delete(@tree.column_index(@id))
-    self
-  end
-
-  def index
-    @tree.column_index(@id)
-  end
-
-  def move(before)
-    @tree.column_move(@tree.column_index(@id), before)
-    self
-  end
-
-  def needed_width
-    @tree.column_needed_width(@tree.column_index(@id))
-  end
-  alias neededwidth needed_width
-
-  def current_width
-    @tree.column_width(@tree.column_index(@id))
-  end
-end
-
-#####################
-
-class Tk::TreeCtrl::Element < TkObject
-  TreeCtrlElementID_TBL = TkCore::INTERP.create_table
-
-  (TreeCtrlElementID = ['treectrl_element'.freeze, TkUtil.untrust('00000')]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-  TreeCtrlElemTypeToClass = {}
-
-  TkCore::INTERP.init_ip_env{
-    Tk::TreeCtrl::Element::TreeCtrlElementID_TBL.mutex.synchronize{
-      Tk::TreeCtrl::Element::TreeCtrlElementID_TBL.clear
-    }
-  }
-
-  def self.type2class(type)
-    TreeCtrlElemTypeToClass[type] || type
-  end
-
-  def self.id2obj(tree, id)
-    tpath = tree.path
-    Tk::TreeCtrl::Element::TreeCtrlElementID_TBL.mutex.synchronize{
-      if Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[tpath]
-        Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[tpath][id]? \
-                 Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[tpath][id] : id
-      else
-        id
-      end
-    }
-  end
-
-  def initialize(parent, type, keys=nil)
-    @tree = parent
-    @tpath = parent.path
-    @type = type.to_s
-    Tk::TreeCtrl::Element::TreeCtrlElementID.mutex.synchronize{
-      @path = @id =
-        Tk::TreeCtrl::Element::TreeCtrlElementID.join(TkCore::INTERP._ip_id_)
-      Tk::TreeCtrl::Element::TreeCtrlElementID[1].succ!
-    }
-
-    Tk::TreeCtrl::Element::TreeCtrlElementID_TBL.mutex.synchronize{
-      Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[@tpath] ||= {}
-      Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[@tpath][@id] = self
-    }
-
-    @tree.element_create(@id, @type, keys)
-  end
-
-  def id
-    @id
-  end
-
-  def to_s
-    @id.dup
-  end
-
-  def cget_tkstring(opt)
-    @tree.element_cget_tkstring(@id, opt)
-  end
-  def cget(opt)
-    @tree.element_cget(@id, opt)
-  end
-  def cget_strict(opt)
-    @tree.element_cget_strict(@id, opt)
-  end
-
-  def configure(*args)
-    @tree.element_configure(@id, *args)
-  end
-
-  def configinfo(*args)
-    @tree.element_configinfo(@id, *args)
-  end
-
-  def current_configinfo(*args)
-    @tree.current_element_configinfo(@id, *args)
-  end
-
-  def delete
-    @tree.element_delete(@id)
-    self
-  end
-
-  def element_type
-    @tree.element_type(@id)
-  end
-
-  def element_class
-    @tree.element_class(@id)
-  end
-end
-
-class Tk::TreeCtrl::BitmapElement < Tk::TreeCtrl::Element
-  TreeCtrlElemTypeToClass['bitmap'] = self
-
-  def initialize(parent, keys=nil)
-    super(parent, 'bitmap', keys)
-  end
-end
-
-class Tk::TreeCtrl::BorderElement < Tk::TreeCtrl::Element
-  TreeCtrlElemTypeToClass['border'] = self
-
-  def initialize(parent, keys=nil)
-    super(parent, 'border', keys)
-  end
-end
-
-class Tk::TreeCtrl::ImageElement < Tk::TreeCtrl::Element
-  TreeCtrlElemTypeToClass['image'] = self
-
-  def initialize(parent, keys=nil)
-    super(parent, 'image', keys)
-  end
-end
-
-class Tk::TreeCtrl::RectangleElement < Tk::TreeCtrl::Element
-  TreeCtrlElemTypeToClass['rect'] = self
-
-  def initialize(parent, keys=nil)
-    super(parent, 'rect', keys)
-  end
-end
-
-#####################
-
-class Tk::TreeCtrl::Item < TkObject
-  TreeCtrlItemID_TBL = TkCore::INTERP.create_table
-
-  TkCore::INTERP.init_ip_env{
-    Tk::TreeCtrl::Item::TreeCtrlItemID_TBL.mutex.synchronize{
-      Tk::TreeCtrl::Item::TreeCtrlItemID_TBL.clear
-    }
-  }
-
-  def self.id2obj(tree, id)
-    tpath = tree.path
-    Tk::TreeCtrl::Item::TreeCtrlItemID_TBL.mutex.synchronize{
-      if Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[tpath]
-        Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[tpath][id]? \
-                        Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[tpath][id] : id
-      else
-        id
-      end
-    }
-  end
-
-  def initialize(parent, keys={})
-    @tree = parent
-    @tpath = parent.path
-    @path = @id = @tree.item_create(keys)
-
-    Tk::TreeCtrl::Item::TreeCtrlItemID_TBL.mutex.synchronize{
-      Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[@tpath] ||= {}
-      Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[@tpath][@id] = self
-    }
-  end
-
-  def id
-    @id
-  end
-
-  def to_s
-    @id.to_s.dup
-  end
-
-  def ancestors
-    @tree.item_ancestors(@id)
-  end
-
-  def bbox(*args)
-    @tree.item_bbox(@id, *args)
-  end
-
-  def children
-    @tree.item_children(@id)
-  end
-
-  def collapse
-    @tree.item_collapse(@id)
-    self
-  end
-
-  def collapse_recurse
-    @tree.item_collapse_recurse(@id)
-    self
-  end
-
-  def complex(*args)
-    @tree.item_complex(@id, *args)
-    self
-  end
-
-  def cget_tkstring(opt)
-    @tree.item_cget_tkstring(@id, opt)
-  end
-  def cget(opt)
-    @tree.item_cget(@id, opt)
-  end
-  def cget_strict(opt)
-    @tree.item_cget_strict(@id, opt)
-  end
-
-  def configure(*args)
-    @tree.item_configure(@id, *args)
-  end
-
-  def configinfo(*args)
-    @tree.item_configinfo(@id, *args)
-  end
-
-  def current_configinfo(*args)
-    @tree.current_item_configinfo(@id, *args)
-  end
-
-  def delete
-    @tree.item_delete(@id)
-    self
-  end
-
-  def element_dump
-    @tree.item_dump(@id)
-  end
-
-  def element_dump_hash
-    @tree.item_dump_hash(@id)
-  end
-
-  def element_actual(column, elem, key)
-    @tree.item_element_actual(@id, column, elem, key)
-  end
-
-  def element_cget_tkstring(opt)
-    @tree.item_element_cget(@id, opt)
-  end
-  def element_cget_tkstring(opt)
-    @tree.item_element_cget(@id, opt)
-  end
-  def element_cget_strict(opt)
-    @tree.item_element_cget_strict(@id, opt)
-  end
-
-  def element_configure(*args)
-    @tree.item_element_configure(@id, *args)
-  end
-
-  def element_configinfo(*args)
-    @tree.item_element_configinfo(@id, *args)
-  end
-
-  def current_element_configinfo(*args)
-    @tree.current_item_element_configinfo(@id, *args)
-  end
-
-  def expand
-    @tree.item_expand(@id)
-    self
-  end
-
-  def expand_recurse
-    @tree.item_expand_recurse(@id)
-    self
-  end
-
-  def firstchild(child=nil)
-    if child
-      @tree.item_firstchild(@id, child)
-      self
-    else
-      @tree.item_firstchild(@id)
-    end
-  end
-  alias first_child firstchild
-
-  def hasbutton(st=None)
-    if st == None
-      @tree.item_hasbutton(@id)
-    else
-      @tree.item_hasbutton(@id, st)
-      self
-    end
-  end
-  alias has_button hasbutton
-
-  def hasbutton?
-    @tree.item_hasbutton(@id)
-  end
-  alias has_button? hasbutton?
-
-  def index
-    @tree.item_index(@id)
-  end
-
-  def isancestor(des)
-    @tree.item_isancestor(@id, des)
-  end
-  alias is_ancestor  isancestor
-  alias isancestor?  isancestor
-  alias is_ancestor? isancestor
-  alias ancestor?    isancestor
-
-  def isopen
-    @tree.item_isopen(@id)
-  end
-  alias is_open    isopen
-  alias isopen?    isopen
-  alias is_open?   isopen
-  alias isopened?  isopen
-  alias is_opened? isopen
-  alias open?      isopen
-
-  def lastchild(child=nil)
-    if child
-      @tree.item_lastchild(@id, child)
-      self
-    else
-      @tree.item_lastchild(@id)
-    end
-  end
-  alias last_child lastchild
-
-  def nextsibling(nxt=nil)
-    if nxt
-      @tree.item_nextsibling(@id, nxt)
-      self
-    else
-      @tree.item_nextsibling(@id)
-    end
-  end
-  alias next_sibling nextsibling
-
-  def numchildren
-    @tree.item_numchildren(@id)
-  end
-  alias num_children  numchildren
-  alias children_size numchildren
-
-  def parent_index
-    @tree.item_parent(@id)
-  end
-
-  def prevsibling(nxt=nil)
-    if nxt
-      @tree.item_prevsibling(@id, nxt)
-      self
-    else
-      @tree.item_prevsibling(@id)
-    end
-  end
-  alias prev_sibling prevsibling
-
-  def remove
-    @tree.item_remove(@id)
-  end
-
-  def rnc
-    @tree.item_rnc(@id)
-  end
-
-  def sort(*opts)
-    @tree.item_sort(@id, *opts)
-  end
-  def sort_not_really(*opts)
-    @tree.item_sort_not_really(@id, *opts)
-    self
-  end
-
-  def state_forcolumn(column, *args)
-    @tree.item_state_forcolumn(@id, column, *args)
-    self
-  end
-  alias state_for_column state_forcolumn
-
-  def state_get(*args)
-    @tree.item_state_get(@id, *args)
-  end
-
-  def state_set(*args)
-    @tree.item_state_set(@id, *args)
-    self
-  end
-
-  def style_elements(column)
-    @tree.item_style_elements(@id, column)
-  end
-
-  def style_map(column, style, map)
-    @tree.item_style_map(@id, column, style, map)
-    self
-  end
-
-  def style_set(column=nil, *args)
-    if args.empty?
-      @tree.item_style_set(@id, column)
-    else
-      @tree.item_style_set(@id, column, *args)
-      self
-    end
-  end
-
-  def item_text(column, txt=nil, *args)
-    if args.empty?
-      if txt
-        @tree.item_text(@id, column, txt)
-        self
-      else
-        @tree.item_text(@id, column)
-      end
-    else
-      @tree.item_text(@id, column, txt, *args)
-      self
-    end
-  end
-
-  def toggle
-    @tree.item_toggle(@id)
-    self
-  end
-
-  def toggle_recurse
-    @tree.item_toggle_recurse(@id)
-    self
-  end
-
-  def visible(st=None)
-    if st == None
-      @tree.item_visible(@id)
-    else
-      @tree.item_visible(@id, st)
-      self
-    end
-  end
-end
-
-#####################
-
-class Tk::TreeCtrl::Style < TkObject
-  TreeCtrlStyleID_TBL = TkCore::INTERP.create_table
-
-  (TreeCtrlStyleID = ['treectrl_style'.freeze, TkUtil.untrust('00000')]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  TkCore::INTERP.init_ip_env{
-    Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL.mutex.synchronize{
-      Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL.clear
-    }
-  }
-
-  def self.id2obj(tree, id)
-    tpath = tree.path
-    Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL.mutex.synchronize{
-      if Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[tpath]
-        Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[tpath][id]? \
-                     Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[tpath][id] : id
-      else
-        id
-      end
-    }
-  end
-
-  def initialize(parent, keys=nil)
-    @tree = parent
-    @tpath = parent.path
-
-    Tk::TreeCtrl::Style::TreeCtrlStyleID.mutex.synchronize{
-      @path = @id =
-        Tk::TreeCtrl::Style::TreeCtrlStyleID.join(TkCore::INTERP._ip_id_)
-      Tk::TreeCtrl::Style::TreeCtrlStyleID[1].succ!
-    }
-
-    Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL.mutex.synchronize{
-      Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[@tpath] ||= {}
-      Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[@tpath][@id] = self
-    }
-
-    @tree.style_create(@id, keys)
-  end
-
-  def id
-    @id
-  end
-
-  def to_s
-    @id.dup
-  end
-
-  def cget_tkstring(opt)
-    @tree.style_cget_tkstring(@id, opt)
-  end
-  def cget(opt)
-    @tree.style_cget(@id, opt)
-  end
-  def cget_strict(opt)
-    @tree.style_cget_strict(@id, opt)
-  end
-
-  def configure(*args)
-    @tree.style_configure(@id, *args)
-  end
-
-  def configinfo(*args)
-    @tree.style_configinfo(@id, *args)
-  end
-
-  def current_configinfo(*args)
-    @tree.current_style_configinfo(@id, *args)
-  end
-
-  def delete
-    @tree.style_delete(@id)
-    self
-  end
-
-  def elements(*elems)
-    if elems.empty?
-      @tree.style_elements(@id)
-    else
-      @tree.style_elements(@id, *elems)
-      self
-    end
-  end
-
-  def layout(elem, keys=None)
-    if keys && keys != None && keys.kind_of?(Hash)
-      @tree.style_layout(@id, elem, keys)
-      self
-    else
-      @tree.style_layout(@id, elem, keys)
-    end
-  end
-end
-
-module Tk::TreeCtrl::BindCallback
-  include Tk
-  extend Tk
-end
-
-class << Tk::TreeCtrl::BindCallback
-  def percentsCmd(*args)
-    tk_call('::TreeCtrl::PercentsCmd', *args)
-  end
-  def cursorCheck(w, x, y)
-    tk_call('::TreeCtrl::CursorCheck', w, x, y)
-  end
-  def cursorCheckAux(w)
-    tk_call('::TreeCtrl::CursorCheckAux', w)
-  end
-  def cursorCancel(w)
-    tk_call('::TreeCtrl::CursorCancel', w)
-  end
-  def buttonPress1(w, x, y)
-    tk_call('::TreeCtrl::ButtonPress1', w, x, y)
-  end
-  def doubleButton1(w, x, y)
-    tk_call('::TreeCtrl::DoubleButton1', w, x, y)
-  end
-  def motion1(w, x, y)
-    tk_call('::TreeCtrl::Motion1', w, x, y)
-  end
-  def leave1(w, x, y)
-    tk_call('::TreeCtrl::Leave1', w, x, y)
-  end
-  def release1(w, x, y)
-    tk_call('::TreeCtrl::Release1', w, x, y)
-  end
-  def beginSelect(w, el)
-    tk_call('::TreeCtrl::BeginSelect', w, el)
-  end
-  def motion(w, le)
-    tk_call('::TreeCtrl::Motion', w, el)
-  end
-  def beginExtend(w, el)
-    tk_call('::TreeCtrl::BeginExtend', w, el)
-  end
-  def beginToggle(w, el)
-    tk_call('::TreeCtrl::BeginToggle', w, el)
-  end
-  def cancelRepeat
-    tk_call('::TreeCtrl::CancelRepeat')
-  end
-  def autoScanCheck(w, x, y)
-    tk_call('::TreeCtrl::AutoScanCheck', w, x, y)
-  end
-  def autoScanCheckAux(w)
-    tk_call('::TreeCtrl::AutoScanCheckAux', w)
-  end
-  def autoScanCancel(w)
-    tk_call('::TreeCtrl::AutoScanCancel', w)
-  end
-  def up_down(w, n)
-    tk_call('::TreeCtrl::UpDown', w, n)
-  end
-  def left_right(w, n)
-    tk_call('::TreeCtrl::LeftRight', w, n)
-  end
-  def setActiveItem(w, idx)
-    tk_call('::TreeCtrl::SetActiveItem', w, idx)
-  end
-  def extendUpDown(w, amount)
-    tk_call('::TreeCtrl::ExtendUpDown', w, amount)
-  end
-  def dataExtend(w, el)
-    tk_call('::TreeCtrl::DataExtend', w, el)
-  end
-  def cancel(w)
-    tk_call('::TreeCtrl::Cancel', w)
-  end
-  def selectAll(w)
-    tk_call('::TreeCtrl::selectAll', w)
-  end
-  def marqueeBegin(w, x, y)
-    tk_call('::TreeCtrl::MarqueeBegin', w, x, y)
-  end
-  def marqueeUpdate(w, x, y)
-    tk_call('::TreeCtrl::MarqueeUpdate', w, x, y)
-  end
-  def marqueeEnd(w, x, y)
-    tk_call('::TreeCtrl::MarqueeEnd', w, x, y)
-  end
-  def scanMark(w, x, y)
-    tk_call('::TreeCtrl::ScanMark', w, x, y)
-  end
-  def scanDrag(w, x, y)
-    tk_call('::TreeCtrl::ScanDrag', w, x, y)
-  end
-
-  # filelist-bindings
-  def fileList_button1(w, x, y)
-    tk_call('::TreeCtrl::FileListButton1', w, x, y)
-  end
-  def fileList_motion1(w, x, y)
-    tk_call('::TreeCtrl::FileListMotion1', w, x, y)
-  end
-  def fileList_motion(w, x, y)
-    tk_call('::TreeCtrl::FileListMotion', w, x, y)
-  end
-  def fileList_leave1(w, x, y)
-    tk_call('::TreeCtrl::FileListLeave1', w, x, y)
-  end
-  def fileList_release1(w, x, y)
-    tk_call('::TreeCtrl::FileListRelease1', w, x, y)
-  end
-  def fileList_edit(w, i, s, e)
-    tk_call('::TreeCtrl::FileListEdit', w, i, s, e)
-  end
-  def fileList_editCancel(w)
-    tk_call('::TreeCtrl::FileListEditCancel', w)
-  end
-  def fileList_autoScanCheck(w, x, y)
-    tk_call('::TreeCtrl::FileListAutoScanCheck', w, x, y)
-  end
-  def fileList_autoScanCheckAux(w)
-    tk_call('::TreeCtrl::FileListAutoScanCheckAux', w)
-  end
-
-  def entryOpen(w, item, col, elem)
-    tk_call('::TreeCtrl::EntryOpen', w, item, col, elem)
-  end
-  def entryExpanderOpen(w, item, col, elem)
-    tk_call('::TreeCtrl::EntryExpanderOpen', w, item, col, elem)
-  end
-  def entryClose(w, accept)
-    tk_call('::TreeCtrl::EntryClose', w, accept)
-  end
-  def entryExpanderKeypress(w)
-    tk_call('::TreeCtrl::EntryExpanderKeypress', w)
-  end
-  def textOpen(w, item, col, elem, width=0, height=0)
-    tk_call('::TreeCtrl::TextOpen', w, item, col, elem, width, height)
-  end
-  def textExpanderOpen(w, item, col, elem, width)
-    tk_call('::TreeCtrl::TextOpen', w, item, col, elem, width)
-  end
-  def textClose(w, accept)
-    tk_call('::TreeCtrl::TextClose', w, accept)
-  end
-  def textExpanderKeypress(w)
-    tk_call('::TreeCtrl::TextExpanderKeypress', w)
-  end
-end
diff --git a/ext/tk/lib/tkextlib/trofs.rb b/ext/tk/lib/tkextlib/trofs.rb
deleted file mode 100644
index 46581a3dad..0000000000
--- a/ext/tk/lib/tkextlib/trofs.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# frozen_string_literal: false
-#
-#  trofs support
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/trofs/setup.rb'
-
-# load library
-require 'tkextlib/trofs/trofs.rb'
diff --git a/ext/tk/lib/tkextlib/trofs/setup.rb b/ext/tk/lib/tkextlib/trofs/setup.rb
deleted file mode 100644
index cc967dced6..0000000000
--- a/ext/tk/lib/tkextlib/trofs/setup.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: false
-#
-#  setup.rb   --   setup script before calling TkPackage.require()
-#
-#    If you need some setup operations (for example, add a library path
-#    to the library search path) before using Tcl/Tk library packages
-#    wrapped by Ruby scripts in this directory, please write the setup
-#    operations in this file.
-#
diff --git a/ext/tk/lib/tkextlib/trofs/trofs.rb b/ext/tk/lib/tkextlib/trofs/trofs.rb
deleted file mode 100644
index dc55ec269a..0000000000
--- a/ext/tk/lib/tkextlib/trofs/trofs.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/trofs/trofs.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/trofs/setup.rb'
-
-# TkPackage.require('trofs', '0.4')
-TkPackage.require('trofs')
-
-module Tk
-  module Trofs
-    extend TkCore
-
-    PACKAGE_NAME = 'trofs'.freeze
-    def self.package_name
-      PACKAGE_NAME
-    end
-
-    def self.package_version
-      begin
-        TkPackage.require('trofs')
-      rescue
-        ''
-      end
-    end
-
-    ##############################################
-
-    def self.create_archive(dir, archive)
-      tk_call('::trofs::archive', dir, archive)
-      archive
-    end
-
-    def self.mount(archive, mountpoint=None)
-      # returns the normalized path to mountpoint
-      tk_call('::trofs::mount', archive, mountpoint)
-    end
-
-    def self.umount(mountpoint)
-      tk_call('::trofs::umount', mountpoint)
-      mountpoint
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/version.rb b/ext/tk/lib/tkextlib/version.rb
deleted file mode 100644
index 68c8ae31a2..0000000000
--- a/ext/tk/lib/tkextlib/version.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# frozen_string_literal: false
-#
-# release date of tkextlib
-#
-module Tk
-  Tkextlib_RELEASE_DATE = '2010-02-01'.freeze
-end
diff --git a/ext/tk/lib/tkextlib/vu.rb b/ext/tk/lib/tkextlib/vu.rb
deleted file mode 100644
index 145a0b5647..0000000000
--- a/ext/tk/lib/tkextlib/vu.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-# frozen_string_literal: false
-#
-#  The vu widget set support
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/vu/setup.rb'
-
-# load package
-# TkPackage.require('vu', '2.1')
-TkPackage.require('vu')
-
-# autoload
-module Tk
-  module Vu
-    TkComm::TkExtlibAutoloadModule.unshift(self)
-
-    PACKAGE_NAME = 'vu'.freeze
-    def self.package_name
-      PACKAGE_NAME
-    end
-
-    def self.package_version
-      begin
-        TkPackage.require('vu')
-      rescue
-        ''
-      end
-    end
-
-    ##########################################
-
-    autoload :Dial,          'tkextlib/vu/dial'
-
-    autoload :Pie,           'tkextlib/vu/pie'
-    autoload :PieSlice,      'tkextlib/vu/pie'
-    autoload :NamedPieSlice, 'tkextlib/vu/pie'
-
-    autoload :Spinbox,       'tkextlib/vu/spinbox'
-
-    autoload :Bargraph,      'tkextlib/vu/bargraph'
-  end
-end
diff --git a/ext/tk/lib/tkextlib/vu/bargraph.rb b/ext/tk/lib/tkextlib/vu/bargraph.rb
deleted file mode 100644
index e1d58e9555..0000000000
--- a/ext/tk/lib/tkextlib/vu/bargraph.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-# frozen_string_literal: false
-#
-#  ::vu::bargraph widget
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-
-# create module/class
-module Tk
-  module Vu
-    class Bargraph < TkWindow
-    end
-  end
-end
-
-
-# call setup script  --  <libdir>/tkextlib/vu.rb
-require 'tkextlib/vu.rb'
-
-class Tk::Vu::Bargraph < TkWindow
-  TkCommandNames = ['::vu::bargraph'.freeze].freeze
-  WidgetClassName = 'Bargraph'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  ###############################
-
-  def __boolval_optkeys
-    ['showminmax', 'showvalue']
-  end
-  private :__boolval_optkeys
-
-  def __strval_optkeys
-    super() + [
-      'title',
-      'barbackground', 'barcolor', 'barcolour',
-      'tickcolor', 'tickcolour',
-      'textcolor', 'textcolour',
-    ]
-  end
-  private :__strval_optkeys
-
-  def __listval_optkeys
-    ['alabels', 'blabels']
-  end
-  private :__listval_optkeys
-
-  def __font_optkeys
-    ['alabfont', 'blabfont']
-  end
-  private :__font_optkeys
-
-  ###############################
-
-  def set(val = None)
-    tk_call_without_enc(@path, 'set', val)
-    self
-  end
-
-  def get()
-    num_or_str(tk_call_without_enc(@path, 'get'))
-  end
-end
diff --git a/ext/tk/lib/tkextlib/vu/charts.rb b/ext/tk/lib/tkextlib/vu/charts.rb
deleted file mode 100644
index 66d5cfd394..0000000000
--- a/ext/tk/lib/tkextlib/vu/charts.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-# frozen_string_literal: false
-#
-#  charts -- Create and manipulate canvas Add-On Items
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-require 'tk/canvas'
-
-# call setup script  --  <libdir>/tkextlib/vu.rb
-require 'tkextlib/vu.rb'
-
-module Tk
-  module Vu
-    module ChartsConfig
-      include TkItemConfigOptkeys
-      def __item_boolval_optkeys(id)
-        super(id) << 'lefttrunc' << 'autocolor'
-      end
-      private :__item_boolval_optkeys
-
-      def __item_strval_optkeys(id)
-        super(id) << 'bar' << 'color' << 'outline' <<
-          'fill' << 'scaleline' << 'stripline'
-      end
-      private :__item_strval_optkeys
-
-      def __item_listval_optkeys(id)
-        super(id) << 'values' << 'tags'
-      end
-      private :__item_listval_optkeys
-    end
-
-    class TkcSticker < TkcItem
-      include ChartsConfig
-
-      CItemTypeName = 'sticker'.freeze
-      CItemTypeToClass[CItemTypeName] = self
-    end
-
-    class TkcStripchart < TkcItem
-      include ChartsConfig
-
-      CItemTypeName = 'stripchart'.freeze
-      CItemTypeToClass[CItemTypeName] = self
-    end
-
-    class TkcBarchart < TkcItem
-      include ChartsConfig
-
-      CItemTypeName = 'barchart'.freeze
-      CItemTypeToClass[CItemTypeName] = self
-    end
-  end
-end
diff --git a/ext/tk/lib/tkextlib/vu/dial.rb b/ext/tk/lib/tkextlib/vu/dial.rb
deleted file mode 100644
index 7eb5650df0..0000000000
--- a/ext/tk/lib/tkextlib/vu/dial.rb
+++ /dev/null
@@ -1,103 +0,0 @@
-# frozen_string_literal: false
-#
-#  ::vu::dial widget
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-
-# create module/class
-module Tk
-  module Vu
-    class Dial < TkWindow
-    end
-  end
-end
-
-# call setup script  --  <libdir>/tkextlib/vu.rb
-require 'tkextlib/vu.rb'
-
-# define module/class
-class Tk::Vu::Dial < TkWindow
-  TkCommandNames = ['::vu::dial'.freeze].freeze
-  WidgetClassName = 'Dial'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  ###############################
-
-  def __methodcall_optkeys  # { key=>method, ... }
-    {'coords'=>'coords'}
-  end
-  private :__methodcall_optkeys
-
-  ###############################
-
-  def coords(val = nil)
-    if val
-      tk_send_without_enc('coords', val)
-      self
-    else
-      tk_split_list(tk_send_without_enc('coords'))
-    end
-  end
-
-  def constrain(val = None)
-    num_or_str(tk_call(@path, 'constrain', val))
-  end
-
-  def get(*args)
-    num_or_str(tk_call(@path, 'get', *args))
-  end
-
-  def identify(x, y)
-    tk_call(@path, 'identify', x, y)
-  end
-
-  def get_label(val=nil)
-    if val
-      tk_call(@path, 'label', val)
-    else
-      ret = []
-      lst = simplelist(tk_call(@path, 'label'))
-      while lst.size > 0
-        ret << ([num_or_str(lst.shift)] << lst.shift)
-      end
-    end
-  end
-
-  def set_label(val, str, *args)
-    tk_call(@path, 'label', val, str, *args)
-    self
-  end
-
-  def set_label_constrain(val, str, *args)
-    tk_call(@path, 'label', '-constrain', val, str, *args)
-    self
-  end
-
-  def get_tag(val=nil)
-    if val
-      tk_call(@path, 'tag', val)
-    else
-      ret = []
-      lst = simplelist(tk_call(@path, 'tag'))
-      while lst.size > 0
-        ret << ([num_or_str(lst.shift)] << lst.shift)
-      end
-    end
-  end
-
-  def set_tag(val, str, *args)
-    tk_call(@path, 'tag', val, str, *args)
-    self
-  end
-
-  def set_tag_constrain(val, str, *args)
-    tk_call(@path, 'tag', '-constrain', val, str, *args)
-    self
-  end
-
-  def set(val = None)
-    tk_call_without_enc(@path, 'set', val)
-    self
-  end
-end
diff --git a/ext/tk/lib/tkextlib/vu/pie.rb b/ext/tk/lib/tkextlib/vu/pie.rb
deleted file mode 100644
index fb9920cc68..0000000000
--- a/ext/tk/lib/tkextlib/vu/pie.rb
+++ /dev/null
@@ -1,287 +0,0 @@
-# frozen_string_literal: false
-#
-#  ::vu::pie widget
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-
-# create module/class
-module Tk
-  module Vu
-    module PieSliceConfigMethod
-    end
-    class Pie < TkWindow
-    end
-    class PieSlice < TkObject
-    end
-    class NamedPieSlice < PieSlice
-    end
-  end
-end
-
-# call setup script  --  <libdir>/tkextlib/vu.rb
-require 'tkextlib/vu.rb'
-
-module Tk::Vu::PieSliceConfigMethod
-  include TkItemConfigMethod
-
-  def __item_pathname(tagOrId)
-    if tagOrId.kind_of?(Tk::Vu::PieSlice)
-      self.path + ';' + tagOrId.id.to_s
-    else
-      self.path + ';' + tagOrId.to_s
-    end
-  end
-  private :__item_pathname
-end
-
-class Tk::Vu::Pie < TkWindow
-  TkCommandNames = ['::vu::pie'.freeze].freeze
-  WidgetClassName = 'Pie'.freeze
-  WidgetClassNames[WidgetClassName] ||= self
-
-  def __destroy_hook__
-    Tk::Vu::PieSlice::SliceID_TBL.delete(@path)
-  end
-
-  ###############################
-
-  include Tk::Vu::PieSliceConfigMethod
-
-  def tagid(tag)
-    if tag.kind_of?(Tk::Vu::PieSlice)
-      tag.id
-    else
-      # tag
-      _get_eval_string(tag)
-    end
-  end
-
-  ###############################
-
-  def delete(*glob_pats)
-    tk_call(@path, 'delete', *glob_pats)
-    self
-  end
-
-  def explode(slice, *args)
-    tk_call(@path, 'explode', slice, *args)
-    self
-  end
-
-  def explode_value(slice)
-    num_or_str(tk_call(@path, 'explode', slice))
-  end
-
-  def lower(slice, below=None)
-    tk_call(@path, 'lower', slice, below)
-    self
-  end
-
-  def names(*glob_pats)
-    simplelist(tk_call(@path, 'names', *glob_pats))
-  end
-  alias slices names
-
-  def order(*args)
-    tk_call(@path, 'order', *args)
-    self
-  end
-
-  def raise(slice, above=None)
-    tk_call(@path, 'raise', slice, above)
-    self
-  end
-
-  def swap(slice1, slice2)
-    tk_call(@path, 'swap', slice1, slice2)
-    self
-  end
-
-  def set(slice, *args)
-    num_or_str(tk_call(@path, 'set', slice, *args))
-  end
-  alias set_value  set
-  alias set_values set
-  alias create     set
-
-  def slice_value(slice)
-    num_or_str(tk_call(@path, 'set', slice))
-  end
-
-  def value(val = None)
-    num_or_str(tk_call_without_enc(@path, 'value'))
-  end
-  alias sum_value value
-end
-
-class Tk::Vu::PieSlice
-  SliceID_TBL = TkCore::INTERP.create_table
-
-  (Pie_Slice_ID = ['vu:pie'.freeze, TkUtil.untrust('00000')]).instance_eval{
-    @mutex = Mutex.new
-    def mutex; @mutex; end
-    freeze
-  }
-
-  TkCore::INTERP.init_ip_env{
-    SliceID_TBL.mutex.synchronize{ SliceID_TBL.clear }
-  }
-
-  def self.id2obj(pie, id)
-    pie_path = pie.path
-    SliceID_TBL.mutex.synchronize{
-      if SliceID_TBL[pie_path]
-        SliceID_TBL[pie_path][id]? SliceID_TBL[pie_path][id]: id
-      else
-        id
-      end
-    }
-  end
-
-  def initialize(parent, *args)
-    unless parent.kind_of?(Tk::Vu::Pie)
-      fail ArgumentError, "expect a Tk::Vu::Pie instance for 1st argument"
-    end
-    @parent = @pie = parent
-    @ppath = parent.path
-    Pie_Slice_ID.mutex.synchronize{
-      @path = @id = Pie_Slice_ID.join(TkCore::INTERP._ip_id_)
-      Pie_Slice_ID[1].succ!
-    }
-    SliceID_TBL.mutex.synchronize{
-      SliceID_TBL[@ppath] = {} unless SliceID_TBL[@ppath]
-      SliceID_TBL[@ppath][@id] = self
-    }
-
-    if args[-1].kind_of?(Hash)
-      keys = args.unshift
-    end
-    @pie.set(@id, *args)
-    configure(keys)
-  end
-
-  def id
-    @id
-  end
-
-  def [](key)
-    cget key
-  end
-
-  def []=(key,val)
-    configure key, val
-    val
-  end
-
-  def cget_tkstring(slot)
-    @pie.itemcget_tkstring(@id, slot)
-  end
-
-  def cget(slot)
-    @pie.itemcget(@id, slot)
-  end
-
-  def cget_strict(slot)
-    @pie.itemcget_strict(@id, slot)
-  end
-
-  def configure(*args)
-    @pie.itemconfigure(@id, *args)
-    self
-  end
-
-  def configinfo(*args)
-    @pie.itemconfiginfo(@id, *args)
-  end
-
-  def current_configinfo(*args)
-    @pie.current_itemconfiginfo(@id, *args)
-  end
-
-  def delete
-    @pie.delete(@id)
-  end
-
-  def explode(value)
-    @pie.explode(@id, value)
-    self
-  end
-
-  def explode_value
-    @pie.explode_value(@id)
-  end
-
-  def lower(other=None)
-    @pie.lower(@id, other)
-    self
-  end
-
-  def raise(other=None)
-    @pie.raise(@id, other)
-    self
-  end
-
-  def set(value)
-    @pie.set(@id, value)
-    self
-  end
-  alias set_value set
-
-  def value
-    @pie.set(@id)
-  end
-end
-
-class Tk::Vu::NamedPieSlice
-  def self.new(parent, name, *args)
-    obj = nil
-    SliceID_TBL.mutex.synchronize{
-      if SliceID_TBL[parent.path] && SliceID_TBL[parent.path][name]
-        obj = SliceID_TBL[parent.path][name]
-      else
-        #super(parent, name, *args)
-        unless parent.kind_of?(Tk::Vu::Pie)
-          fail ArgumentError, "expect a Tk::Vu::Pie instance for 1st argument"
-        end
-        obj = self.allocate
-        obj.instance_eval{
-          @parent = @pie = parent
-          @ppath = parent.path
-          @path = @id = name.to_s
-          SliceID_TBL[@ppath] = {} unless SliceID_TBL[@ppath]
-          SliceID_TBL[@ppath][@id] = self
-        }
-      end
-    }
-    obj.instance_eval{
-      if args[-1].kind_of?(Hash)
-        keys = args.unshift
-      end
-      @pie.set(@id, *args)
-      configure(keys)
-    }
-
-    obj
-  end
-
-  def initialize(parent, name, *args)
-    # dummy:: not called by 'new' method
-    unless parent.kind_of?(Tk::Vu::Pie)
-      fail ArgumentError, "expect a Tk::Vu::Pie instance for 1st argument"
-    end
-    @parent = @pie = parent
-    @ppath = parent.path
-    @path = @id = name.to_s
-    SliceID_TBL.mutex.synchronize{
-      SliceID_TBL[@ppath] = {} unless SliceID_TBL[@ppath]
-      SliceID_TBL[@ppath][@id] = self
-    }
-
-    if args[-1].kind_of?(Hash)
-      keys = args.unshift
-    end
-    @pie.set(@id, *args)
-    configure(keys)
-  end
-end
diff --git a/ext/tk/lib/tkextlib/vu/setup.rb b/ext/tk/lib/tkextlib/vu/setup.rb
deleted file mode 100644
index cc967dced6..0000000000
--- a/ext/tk/lib/tkextlib/vu/setup.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: false
-#
-#  setup.rb   --   setup script before calling TkPackage.require()
-#
-#    If you need some setup operations (for example, add a library path
-#    to the library search path) before using Tcl/Tk library packages
-#    wrapped by Ruby scripts in this directory, please write the setup
-#    operations in this file.
-#
diff --git a/ext/tk/lib/tkextlib/vu/spinbox.rb b/ext/tk/lib/tkextlib/vu/spinbox.rb
deleted file mode 100644
index 082ebd1f62..0000000000
--- a/ext/tk/lib/tkextlib/vu/spinbox.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# frozen_string_literal: false
-#
-#  ::vu::spinbox widget
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-#  a standard spinbox (<= 8.3)
-#  This is the same as the 8.4 core spinbox widget.
-#
-require 'tk'
-
-if (Tk::TK_MAJOR_VERSION < 8 ||
-    (Tk::TK_MAJOR_VERSION == 8 && Tk::TK_MINOR_VERSION < 4))
-  # call setup script  --  <libdir>/tkextlib/vu.rb
-  require 'tkextlib/vu.rb'
-
-  Tk.tk_call('namespace', 'import', '::vu::spinbox')
-end
-
-module Tk
-  module Vu
-    Spinbox = Tk::Spinbox
-  end
-end
diff --git a/ext/tk/lib/tkextlib/winico.rb b/ext/tk/lib/tkextlib/winico.rb
deleted file mode 100644
index 996fc409b8..0000000000
--- a/ext/tk/lib/tkextlib/winico.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_string_literal: false
-#
-#  winico -- Windows Icon extension support
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/tktable/setup.rb'
-
-# load library
-require 'tkextlib/winico/winico'
diff --git a/ext/tk/lib/tkextlib/winico/setup.rb b/ext/tk/lib/tkextlib/winico/setup.rb
deleted file mode 100644
index cc967dced6..0000000000
--- a/ext/tk/lib/tkextlib/winico/setup.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: false
-#
-#  setup.rb   --   setup script before calling TkPackage.require()
-#
-#    If you need some setup operations (for example, add a library path
-#    to the library search path) before using Tcl/Tk library packages
-#    wrapped by Ruby scripts in this directory, please write the setup
-#    operations in this file.
-#
diff --git a/ext/tk/lib/tkextlib/winico/winico.rb b/ext/tk/lib/tkextlib/winico/winico.rb
deleted file mode 100644
index dda0357a16..0000000000
--- a/ext/tk/lib/tkextlib/winico/winico.rb
+++ /dev/null
@@ -1,225 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkextlib/winico/winico.rb
-#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-
-require 'tk'
-
-# call setup script for general 'tkextlib' libraries
-require 'tkextlib/setup.rb'
-
-# call setup script
-require 'tkextlib/winico/setup.rb'
-
-# TkPackage.require('winico', '0.5')
-# TkPackage.require('winico', '0.6')
-TkPackage.require('winico')
-
-module Tk
-  class Winico < TkObject
-    PACKAGE_NAME = 'winico'.freeze
-    def self.package_name
-      PACKAGE_NAME
-    end
-
-    def self.package_version
-      begin
-        TkPackage.require('winico')
-      rescue
-        ''
-      end
-    end
-  end
-end
-
-class Tk::Winico
-  WinicoID_TBL = TkCore::INTERP.create_table
-
-  TkCore::INTERP.init_ip_env{
-    WinicoID_TBL.mutex.synchronize{ WinicoID_TBL.clear }
-  }
-
-  def self.id2obj(id)
-    WinicoID_TBL.mutex.synchronize{
-      (WinicoID_TBL.key?(id))? WinicoID_TBL[id] : id
-    }
-  end
-
-  def self.info
-    simplelist(Tk.tk_call('winico', 'info')).collect{|id|
-      Tk::Winico.id2obj(id)
-    }
-  end
-
-  def self.icon_info(id)
-    simplelist(Tk.tk_call('winico', 'info', id)).collect{|inf|
-      h = Hash[*list(inf)]
-      h.keys.each{|k| h[k[1..-1]] = h.delete(k)}
-    }
-  end
-
-  #################################
-
-  def self.new_from_file(file_name)
-    self.new(file_name)
-  end
-
-  def self.new_from_resource(resource_name, file_name = nil)
-    self.new(file_name, resource_name)
-  end
-
-  def initialize(file_name, resource_name=nil, winico_id=nil)
-    if resource_name
-      # from resource
-      if file_name
-        @id = Tk.tk_call('winico', 'load', resource_name, file_name)
-      else
-        @id = Tk.tk_call('winico', 'load', resource_name)
-      end
-    elsif file_name
-      # from .ico file
-      @id = Tk.tk_call('winico', 'createfrom', file_name)
-    elsif winico_id
-      @id = winico_id
-    else
-      fail ArgumentError,
-           "must be given proper information from where loading icons"
-    end
-    @path = @id
-    WinicoID_TBL.mutex.synchronize{
-      WinicoID_TBL[@id] = self
-    }
-  end
-
-  def id
-    @id
-  end
-
-  def set_window(win_id, *opts) # opts := ?'big'|'small'?, ?pos?
-    # NOTE:: the window, which is denoted by win_id, MUST BE MAPPED.
-    #        If not, then this may fail or crash.
-    tk_call('winico', 'setwindow', win_id, @id, *opts)
-  end
-
-  def delete
-    tk_call('winico', 'delete', @id)
-    WinicoID_TBL.mutex.synchronize{
-      WinicoID_TBL.delete(@id)
-    }
-    self
-  end
-  alias destroy delete
-
-  def info
-    Tk::Winico.icon_info(@id)
-  end
-
-  #################################
-
-  class Winico_callback < TkValidateCommand
-    class ValidateArgs < TkUtil::CallbackSubst
-      KEY_TBL = [
-        [ ?m, ?s, :message ],
-        [ ?i, ?x, :icon ],
-        [ ?x, ?n, :x ],
-        [ ?y, ?n, :y ],
-        [ ?X, ?n, :last_x ],
-        [ ?Y, ?n, :last_y ],
-        [ ?t, ?n, :tickcount ],
-        [ ?w, ?n, :icon_idnum ],
-        [ ?l, ?n, :msg_idnum ],
-        nil
-      ]
-
-      PROC_TBL = [
-        [ ?n, TkComm.method(:number) ],
-        [ ?s, TkComm.method(:string) ],
-        [ ?x, proc{|id|
-            Tk::Winico::WinicoID_TBL.mutex.synchronize{
-              if Tk::Winico::WinicoID_TBL.key?(id)
-                obj = Tk::Winico::WinicoID_TBL[id]
-              else
-                # Tk::Winico.new(nil, nil, id)
-                obj = Tk::Winico.allocate
-                obj.instance_eval{ @path = @id = id }
-                Tk::Winico::WinicoID_TBL[id] = obj
-              end
-              obj
-            }
-          } ],
-        nil
-      ]
-
-=begin
-      # for Ruby m17n :: ?x --> String --> char-code ( getbyte(0) )
-      KEY_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-          inf[1] = inf[1].getbyte(0) if inf[1].kind_of?(String)
-        end
-        inf
-      }
-
-      PROC_TBL.map!{|inf|
-        if inf.kind_of?(Array)
-          inf[0] = inf[0].getbyte(0) if inf[0].kind_of?(String)
-        end
-        inf
-      }
-=end
-
-      _setup_subst_table(KEY_TBL, PROC_TBL);
-
-      def self.ret_val(val)
-        val
-      end
-    end
-
-    def self._config_keys
-      ['callback']
-    end
-  end
-
-  #################################
-
-  def add_to_taskbar(keys = {})
-    keys = _symbolkey2str(keys)
-    Winico_callback._config_keys.each{|k|
-      if keys[k].kind_of?(Array)
-        cmd, *args = keys[k]
-        #keys[k] = Winico_callback.new(cmd, args.join(' '))
-        keys[k] = Winico_callback.new(cmd, *args)
-       # elsif keys[k].kind_of?(Proc)
-      elsif TkComm._callback_entry?(keys[k])
-        keys[k] = Winico_callback.new(keys[k])
-      end
-    }
-    tk_call('winico', 'taskbar', 'add', @id, *(hash_kv(keys)))
-    self
-  end
-  alias taskbar_add add_to_taskbar
-
-  def modify_taskbar(keys = {})
-    keys = _symbolkey2str(keys)
-    Winico_callback._config_keys.each{|k|
-      if keys[k].kind_of?(Array)
-        cmd, *args = keys[k]
-        #keys[k] = Winico_callback.new(cmd, args.join(' '))
-        keys[k] = Winico_callback.new(cmd, *args)
-      # elsif keys[k].kind_of?(Proc)
-      elsif TkComm._callback_entry?(keys[k])
-        keys[k] = Winico_callback.new(keys[k])
-      end
-    }
-    tk_call('winico', 'taskbar', 'modify', @id, *(hash_kv(keys)))
-    self
-  end
-  alias taskbar_modify modify_taskbar
-
-  def delete_from_taskbar
-    tk_call('winico', 'taskbar', 'delete', @id)
-    self
-  end
-  alias taskbar_delete delete_from_taskbar
-end
diff --git a/ext/tk/lib/tkfont.rb b/ext/tk/lib/tkfont.rb
deleted file mode 100644
index 6036006aac..0000000000
--- a/ext/tk/lib/tkfont.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# frozen_string_literal: false
-#
-#   tkfont.rb - load tk/font.rb
-#
-require 'tk/font'
diff --git a/ext/tk/lib/tkmacpkg.rb b/ext/tk/lib/tkmacpkg.rb
deleted file mode 100644
index 4f76c2feb8..0000000000
--- a/ext/tk/lib/tkmacpkg.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# frozen_string_literal: false
-#
-#   tkmacpkg.rb - load tk/macpkg.rb
-#
-require 'tk/macpkg'
diff --git a/ext/tk/lib/tkmenubar.rb b/ext/tk/lib/tkmenubar.rb
deleted file mode 100644
index 43109e2b67..0000000000
--- a/ext/tk/lib/tkmenubar.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# frozen_string_literal: false
-#
-#   tkmenubar.rb - load tk/menubar.rb
-#
-require 'tk/menubar'
diff --git a/ext/tk/lib/tkmngfocus.rb b/ext/tk/lib/tkmngfocus.rb
deleted file mode 100644
index 43abd210c9..0000000000
--- a/ext/tk/lib/tkmngfocus.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# frozen_string_literal: false
-#
-#   tkmngfocus.rb - load tk/mngfocus.rb
-#
-require 'tk/mngfocus'
diff --git a/ext/tk/lib/tkpalette.rb b/ext/tk/lib/tkpalette.rb
deleted file mode 100644
index f4e7321c47..0000000000
--- a/ext/tk/lib/tkpalette.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# frozen_string_literal: false
-#
-#   tkpalette.rb - load tk/palette.rb
-#
-require 'tk/palette'
diff --git a/ext/tk/lib/tkscrollbox.rb b/ext/tk/lib/tkscrollbox.rb
deleted file mode 100644
index c316ce2ea6..0000000000
--- a/ext/tk/lib/tkscrollbox.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# frozen_string_literal: false
-#
-#   tkscrollbox.rb - load tk/scrollbox.rb
-#
-require 'tk/scrollbox'
diff --git a/ext/tk/lib/tktext.rb b/ext/tk/lib/tktext.rb
deleted file mode 100644
index 8ed41ac15a..0000000000
--- a/ext/tk/lib/tktext.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# frozen_string_literal: false
-#
-#   tktext.rb - load tk/text.rb
-#
-require 'tk/text'
diff --git a/ext/tk/lib/tkvirtevent.rb b/ext/tk/lib/tkvirtevent.rb
deleted file mode 100644
index 4efa790505..0000000000
--- a/ext/tk/lib/tkvirtevent.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# frozen_string_literal: false
-#
-#   tkvirtevent.rb - load tk/virtevent.rb
-#
-require 'tk/virtevent'
diff --git a/ext/tk/lib/tkwinpkg.rb b/ext/tk/lib/tkwinpkg.rb
deleted file mode 100644
index 97c84f8ab1..0000000000
--- a/ext/tk/lib/tkwinpkg.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# frozen_string_literal: false
-#
-#   tkwinpkg.rb - load tk/winpkg.rb
-#
-require 'tk/winpkg'
diff --git a/ext/tk/old-README.tcltklib.ja b/ext/tk/old-README.tcltklib.ja
deleted file mode 100644
index e29b389402..0000000000
--- a/ext/tk/old-README.tcltklib.ja
+++ /dev/null
@@ -1,159 +0,0 @@
-(tof)
-                                    2003/06/19  Hidetoshi NAGAI
-
-本ドキュメントには古い tcltk ライブラリ，tcltklib ライブラリの説明
-が含まれていますが，その記述内容は古いものとなっています．
-
-まず，現在の Ruby/Tk の中心である tk.rb は wish を呼び出したりはせ
-ず，tcltklib ライブラリを wrap して動作するものとなっています．その
-ため，古い説明記述で述べられているようなプロセス間通信によるオーバ
-ヘッドは存在しません．
-
-現在の tcltklib ライブラリでも，Tcl/Tk の C ライブラリをリンクして
-直接に動かすことで，オーバヘッドを押さえつつ Tcl/Tk インタープリタ
-のほぼ全機能（拡張ライブラリを含む）を使える点は同じです．しかし，
-その役割はほぼ「tk.rb 以下のライブラリを効果的に働かせるためのもの」
-と見なされており，その目的でメンテナンスされています．
-
-tk.rb の高機能化に伴って，中水準のライブラリである tcltk ライブラリ
-（tcltk.rb）はその存在意義を減じており，現在ではメンテナンスは行わ
-れていません．
-
-なお，古い説明ではバインディングにおけるスクリプトの追加はできないこ
-ととなっていますが，現在の tk.rb ではこれも可能であることを補足して
-おきます．
-
-以下がライブラリの古い説明文書です．
-==============================================================
-	tcltk ライブラリ
-	tcltklib ライブラリ
-		Sep. 19, 1997	Y. Shigehiro
-
-以下, 「tcl/tk」という表記は, tclsh や wish を実現している, 一般でいう
-ところの tcl/tk を指します. 「tcltk ライブラリ」, 「tcltklib ライブラ
-リ」という表記は, 本パッケージに含まれる ruby 用のライブラリを指します.
-
-[ファイルについて]
-
-README.euc : このファイル(注意, 特徴, インストールの方法).
-MANUAL.euc : マニュアル.
-
-lib/, ext/ : ライブラリの実体.
-
-sample/ : マニュアル代わりのサンプルプログラム.
-sample/sample0.rb : tcltklib ライブラリのテスト.
-sample/sample1.rb : tcltk ライブラリのテスト.
-    tcl/tk (wish) でできそうなことを一通り書いてみました.
-sample/sample2.rb : tcltk ライブラリのサンプル.
-    maeda shugo (shugo@po.aianet.ne.jp) 氏による
-    (`rb.tk' で書かれていた) ruby のサンプルプログラム
-	http://www.aianet.or.jp/~shugo/ruby/othello.rb.gz
-    を tcltk ライブラリを使うように, 機械的に変更してみました.
-
-demo/ : 100 本の線を 100 回描くデモプログラム.
-    最初に空ループの時間を測定し, 続いて実際に線を引く時間を測定します.
-    tcl/tk は(再)描画のときに backing store を使わずに律義に 10000 本(?)
-    線を引くので, (再)描画を始めると, マシンがかなり重くなります.
-demo/lines0.tcl : wish 用のスクリプト.
-demo/lines1.rb : `tk.rb' 用のスクリプト.
-demo/lines2.rb : tcltk ライブラリ用のスクリプト.
-
-[注意]
-
-コンパイル/実行には, tcl/tk の C ライブラリが必要です.
-
-このライブラリは,
-
-	ruby-1.0-970701, ruby-1.0-970911, ruby-1.0-970919
-	FreeBSD 2.2.2-RELEASE
-	およびそのパッケージ jp-tcl-7.6.tgz, jp-tk-4.2.tgz
-
-で作成/動作確認しました. 他の環境では動作するかどうかわかりません.
-
-TclTkLib.mainloop を実行中に Control-C が効かないのは不便なので, ruby
-のソースを参考に, #include "sig.h" して trap_immediate を操作していま
-すが, ruby の README.EXT にも書いてないのに, こんなことをして良いのか
-どうかわかりません.
-
--d オプションでデバッグ情報を表示させるために, ruby のソースを参考に,
-debug という大域変数を参照していますが, ruby の README.EXT にも書いて
-ないのに, こんなことをして良いのかどうかわかりません.
-
-extconf.rb は書きましたが, (いろいろな意味で)これで良いのか良く分かり
-ません.
-
-[特徴]
-
-ruby から tcl/tk ライブラリを利用できます.
-
-tcl/tk インタプリタのスクリプトは, 機械的に tcltk ライブラリ用の ruby
-スクリプトに変換できます.
-
-(`tk.rb' との違い)
-
-1. tcl/tk インタプリタのスクリプトが, どのように, tcltk ライブラリ用の
-   ruby スクリプトに変換されるかが理解できれば, マニュアル類が無いに等
-   しい `tk.rb' とは異なり
-
-	tcl/tk のマニュアルやオンラインドキュメントを用いて
-
-   効率良くプログラミングを行うことができます.
-   記述方法がわからない, コマンドに与えるパラメータがわからない...
-     - Canvas.new { ... } と, なぜイテレータブロックを書けるの??
-     - Canvas の bbox は数値のリストを返すのに, xview は文字列を返すの??
-   と, いちいち, ライブラリのソースを追いかける必要はありません.
-
-2. 個々の機能(オプション)を個別処理によりサポートしており, そのためサ
-   ポートしていない機能は使うことができない(本当は使えないこともないの
-   ですが) `tk.rb' とは異なり, tcl/tk インタプリタで可能なことは
-
-	ほとんど
-
-   ruby からも実行できます. 現在, ruby から実行できないことが確認され
-   ているのは,
-
-	bind コマンドでスクリプトを追加する構文
-	「bind tag sequence +script」
-                            ^
-
-   のみです.
-     - `. configure -width' をしようとして, `Tk.root.height()' と書い
-      たのに, `undefined method `height'' と怒られてしまった. tk.rb を
-      読んでみて, ガーン. できないのか...
-   ということはありません.
-
-3. wish プロセスを起動しプロセス間通信で wish を利用する `tk.rb' とは
-   異なり, tcl/tk の C ライブラリをリンクし
-
-	より高速に (といっても, 思った程は速くないですが)
-
-   処理を行います.
-
-4. `tk.rb' ほど, 高水準なインターフェースを備えていないため, tcl/tk イ
-   ンタプリタの生成等
-
-	何から何まで自分で記述
-
-   しなければなりません(その代わり, tcl/tk ライブラリの仕様通り,
-   tcl/tk インタプリタを複数生成することもできますが).
-   インターフェースは(おそらく) ruby の思想に沿ったものではありません.
-   また, スクリプトの記述は
-
-	ダサダサ
-
-   です. スクリプトは, 一見, 読みづらいものとなります. が, 書く人にとっ
-   ては, それほど煩わしいものではないと思います.
-
-[インストールの方法]
-
-0. ruby のソースファイル(ruby-1.0-なんたら.tgz)を展開しておきます.
-
-1. ruby-1.0-なんたら/ext に ext/tcltklib をコピーします.
-	cp -r ext/tcltklib ???/ruby-1.0-なんたら/ext/
-
-2. ruby のインストール法に従い make 等をします.
-
-3. ruby のライブラリ置場に lib/* をコピーします.
-	cp lib/* /usr/local/lib/ruby/
-
-(eof)
diff --git a/ext/tk/old-extconf.rb b/ext/tk/old-extconf.rb
deleted file mode 100644
index a13fa4c46e..0000000000
--- a/ext/tk/old-extconf.rb
+++ /dev/null
@@ -1,441 +0,0 @@
-# frozen_string_literal: false
-# extconf.rb for tcltklib
-
-require 'mkmf'
-
-is_win32 = (/mswin|mingw|cygwin|bccwin/ =~ 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]
-  else
-    unless tcl_hdr || tk_hdr ||
-        enable_config("tcltk-framework", false) ||
-        enable_config("mac-tcltk-framework", false)
-      return false
-    end
-    paths = ["/Library/Frameworks", "/System/Library/Frameworks"]
-  end
-
-  checking_for('Tcl/Tk Framework') {
-    paths.find{|dir|
-      dir.strip!
-      dir.chomp!('/')
-      (tcl_hdr || FileTest.directory?(dir + "/Tcl.framework/") ) &&
-        (tk_hdr || FileTest.directory?(dir + "/Tk.framework/") )
-    }
-  }
-end
-
-tcl_framework_header = with_config("tcl-framework-header")
-tk_framework_header  = with_config("tk-framework-header")
-
-tcltk_framework = find_framework(tcl_framework_header, tk_framework_header)
-
-unless is_win32
-  have_library("nsl", "t_open")
-  have_library("socket", "socket")
-  have_library("dl", "dlopen")
-  have_library("m", "log")
-end
-
-tk_idir,  tk_ldir  = dir_config("tk")
-tcl_idir, tcl_ldir = dir_config("tcl")
-x11_idir, x11_ldir = dir_config("X11")
-
-tk_ldir2  = with_config("tk-lib")
-tcl_ldir2 = with_config("tcl-lib")
-x11_ldir2 = with_config("X11-lib")
-
-tk_ldir_list  = [tk_ldir2,  tk_ldir]
-tcl_ldir_list = [tcl_ldir2, tcl_ldir]
-
-tklib = with_config("tklib")
-tcllib = with_config("tcllib")
-stubs = enable_config("tcltk_stubs") || with_config("tcltk_stubs")
-
-tcltk_version = with_config("tcltkversion")
-
-use_X = with_config("X11", (! is_win32))
-
-def parse_tclConfig(file)
-  # check tclConfig.sh/tkConfig.sh
-  tbl = {}
-  IO.foreach(file){|line|
-    line.strip!
-    next if line !~ /^([^\#=][^=]*)=(['"]|)(.*)\2$/
-    key, val = $1, $3
-    tbl[key] = val.gsub(/\$\{([^}]+)\}/){|s| tbl[$1]} rescue nil
-  }
-  tbl
-end
-
-def check_tcltk_version(version)
-  return [nil, nil] unless version
-
-  version = version.strip
-
-  tclver = version.dup
-  tkver  = version.dup
-
-  major = dot = minor = dot = plvl = ext = nil
-
-  if version =~ /^(\d)(\.?)(\d)(\.?)(\d*)(.*)$/
-    major = $1; minor_dot = $2; minor = $3; plvl_dot  = $4; plvl = $5; ext = $6
-    dot = ! minor_dot.empty?
-    if plvl_dot.empty? && ! plvl.empty?
-      minor << plvl
-    end
-  elsif version =~ /^(\d)(\.?)(\d?)(.*)$/
-    major = $1; minor_dot = $2; minor = $3; ext = $4
-    dot = ! minor_dot.empty?
-  else # unknown -> believe user
-    return [tclver, tkver]
-  end
-
-  # check Tcl7.6 / Tk4.2 ?
-  if major == "7" # Tcl7.6 ( not support Tclversion < 7.6 )
-    # Tk4.2
-    tkver  = "4" + ((dot)? ".": "") + ((minor.empty)? "": "2") + ext
-  elsif major == "4" # Tk4.2 ( not support Tkversion < 4.2 )
-    # Tcl7.6
-    tclver = "7" + ((dot)? ".": "") + ((minor.empty)? "": "6") + ext
-  end
-
-  [tclver, tkver]
-end
-
-def find_tcl(tcllib, stubs, version, *opt_paths)
-  default_paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"]
-  default_paths << "/Tcl/lib"  # default for ActiveTcl
-
-  if (paths = opt_paths.compact).empty?
-    paths = default_paths
-  end
-
-  if stubs
-    func = "Tcl_InitStubs"
-    lib = "tclstub"
-  else
-    func = "Tcl_FindExecutable"
-    lib = "tcl"
-  end
-
-  if version && ! version.empty?
-    versions = [version]
-  else
-    versions = %w[8.7 8.6 8.5 8.4 8.3 8.2 8.1 8.0 7.6]
-  end
-
-  if tcllib
-    st = find_library(tcllib, func, *paths)
-  else
-    st = versions.find { |ver|
-           find_library("#{lib}#{ver}", func, *paths) or
-           find_library("#{lib}#{ver.delete('.')}", func, *paths) or
-           find_library("#{lib}#{ver}g", func, *paths) or
-           find_library("#{lib}#{ver.delete('.')}g", func, *paths) or
-           find_library("tcl#{ver}", func, *paths) or
-           find_library("tcl#{ver.delete('.')}", func, *paths) or
-           find_library("tcl#{ver}g", func, *paths) or
-           find_library("tcl#{ver.delete('.')}g", func, *paths)
-         } || (!version && find_library(lib, func, *paths))
-  end
-
-  unless st
-    puts("Warning:: cannot find Tcl library. tcltklib will not be compiled (tcltklib is disabled on your Ruby == Ruby/Tk will not work). Please check configure options.")
-  end
-  st
-end
-
-def find_tk(tklib, stubs, version, *opt_paths)
-  default_paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"]
-  default_paths << "/Tcl/lib"  # default for ActiveTcl
-
-  if (paths = opt_paths.compact).empty?
-    paths = default_paths
-  end
-
-  if stubs
-    func = "Tk_InitStubs"
-    lib = "tkstub"
-  else
-    func = "Tk_Init"
-    lib = "tk"
-  end
-
-  if version && ! version.empty?
-    versions = [version]
-  else
-    versions = %w[8.7 8.6 8.5 8.4 8.3 8.2 8.1 8.0 4.2]
-  end
-
-  if tklib
-    st = find_library(tklib, func, *paths)
-  else
-    st = versions.find { |ver|
-           find_library("#{lib}#{ver}", func, *paths) or
-           find_library("#{lib}#{ver.delete('.')}", func, *paths) or
-           find_library("#{lib}#{ver}g", func, *paths) or
-           find_library("#{lib}#{ver.delete('.')}g", func, *paths) or
-           find_library("tk#{ver}", func, *paths) or
-           find_library("tk#{ver.delete('.')}", func, *paths) or
-           find_library("tk#{ver}g", func, *paths) or
-           find_library("tk#{ver.delete('.')}g", func, *paths)
-         } || (!version && find_library(lib, func, *paths))
-  end
-
-  unless st
-    puts("Warning:: cannot find Tk library. tcltklib will not be compiled (tcltklib is disabled on your Ruby == Ruby/Tk will not work). Please check configure options.")
-  end
-  st
-end
-
-def find_tcltk_header(tclver, tkver)
-  base_dir = ['/usr/local/include', '/usr/pkg/include', '/usr/include']
-  base_dir << '/Tcl/include' # default for ActiveTcl
-
-  unless have_tcl_h = have_header('tcl.h')
-    if tclver && ! tclver.empty?
-      versions = [tclver]
-    else
-      versions = %w[8.7 8.6 8.5 8.4 8.3 8.2 8.1 8.0 7.6]
-    end
-    paths = base_dir.dup
-    versions.each{|ver| paths.concat(base_dir.map{|dir| dir + '/tcl' + ver})}
-    have_tcl_h = find_header('tcl.h', *paths)
-  end
-
-  unless have_tk_h  = have_header("tk.h")
-    if tkver && ! tkver.empty?
-      versions = [tkver]
-    else
-      versions = %w[8.7 8.6 8.5 8.4 8.3 8.2 8.1 8.0 4.2]
-    end
-    paths = base_dir.dup
-    versions.each{|ver| paths.concat(base_dir.map{|dir| dir + '/tk' + ver})}
-    have_tk_h = find_header('tk.h', *paths)
-  end
-
-  have_tcl_h && have_tk_h
-end
-
-def find_X11(*opt_paths)
-  default_paths =
-    [ "/usr/X11/lib", "/usr/lib/X11", "/usr/X11R6/lib", "/usr/openwin/lib" ]
-  paths = opt_paths.compact.concat(default_paths)
-  st = find_library("X11", "XOpenDisplay", *paths)
-  unless st
-    puts("Warning:: cannot find X11 library. tcltklib will not be compiled (tcltklib is disabled on your Ruby == Ruby/Tk will not work). Please check configure options. If your Tcl/Tk don't require X11, please try --without-X11.")
-  end
-  st
-end
-
-def pthread_check()
-  tcl_major_ver = nil
-  tcl_minor_ver = nil
-
-  # Is tcl-thread given by user ?
-  case enable_config("tcl-thread")
-  when true
-    tcl_enable_thread = true
-  when false
-    tcl_enable_thread = false
-  else
-    tcl_enable_thread = nil
-  end
-
-  if (tclConfig = with_config("tclConfig-file"))
-    if tcl_enable_thread == true
-      puts("Warning: --with-tclConfig-file option is ignored, because --enable-tcl-thread option is given.")
-    elsif tcl_enable_thread == false
-      puts("Warning: --with-tclConfig-file option is ignored, because --disable-tcl-thread option is given.")
-    else
-      # tcl-thread is unknown and tclConfig.sh is given
-      begin
-        tbl = parse_tclConfig(tclConfig)
-        if tbl['TCL_THREADS']
-          tcl_enable_thread = (tbl['TCL_THREADS'] == "1")
-        else
-          tcl_major_ver = tbl['TCL_MAJOR_VERSION'].to_i
-          tcl_minor_ver = tbl['TCL_MINOR_VERSION'].to_i
-          if tcl_major_ver < 8 || (tcl_major_ver == 8 && tcl_minor_ver == 0)
-            tcl_enable_thread = false
-          end
-        end
-
-        if tcl_enable_thread == nil
-          # cannot find definition
-          if tcl_major_ver
-            puts("Warning: '#{tclConfig}' doesn't include TCL_THREADS definition.")
-          else
-            puts("Warning: '#{tclConfig}' may not be a tclConfig file.")
-          end
-          tclConfig = false
-        end
-      rescue Exception
-        puts("Warning: fail to read '#{tclConfig}'!! --> ignore the file")
-        tclConfig = false
-      end
-    end
-  end
-
-  if tcl_enable_thread == nil && !tclConfig
-    # tcl-thread is unknown and tclConfig is unavailable
-    begin
-      try_run_available = try_run("int main() { exit(0); }")
-    rescue Exception
-      # cannot try_run. Is CROSS-COMPILE environment?
-      puts(%Q'\
-*****************************************************************************
-**
-** PTHREAD SUPPORT CHECK WARNING:
-**
-**   We cannot check the consistency of pthread support between Ruby
-**   and the Tcl/Tk library in your environment (are you perhaps
-**   cross-compiling?). If pthread support for these 2 packages is
-**   inconsistent you may find you get errors when running Ruby/Tk
-**   (e.g. hangs or segmentation faults).  We strongly recommend
-**   you to check the consistency manually.
-**
-*****************************************************************************
-')
-      return true
-    end
-  end
-
-  if tcl_enable_thread == nil
-    # tcl-thread is unknown
-    if try_run(<<EOF)
-#include <tcl.h>
-int main() {
-   Tcl_Interp *ip;
-   ip = Tcl_CreateInterp();
-   exit((Tcl_Eval(ip, "set tcl_platform(threaded)") == TCL_OK)? 0: 1);
-}
-EOF
-      tcl_enable_thread = true
-    elsif try_run(<<EOF)
-#include <tcl.h>
-static Tcl_ThreadDataKey dataKey;
-int main() { exit((Tcl_GetThreadData(&dataKey, 1) == dataKey)? 1: 0); }
-EOF
-      tcl_enable_thread = true
-    else
-      tcl_enable_thread = false
-    end
-  end
-
-  # check pthread mode
-  if (macro_defined?('HAVE_NATIVETHREAD', '#include "ruby.h"'))
-    # ruby -> enable
-    unless tcl_enable_thread
-      # ruby -> enable && tcl -> disable
-      puts(%Q'\
-*****************************************************************************
-**
-** PTHREAD SUPPORT MODE WARNING:
-**
-**   Ruby is compiled with --enable-pthread, but your Tcl/Tk library
-**   seems to be compiled without pthread support. Although you can
-**   create the tcltklib library, this combination may cause errors
-**   (e.g. hangs or segmentation faults). If you have no reason to
-**   keep the current pthread support status, we recommend you reconfigure
-**   and recompile the libraries so that both or neither support pthreads.
-**
-**   If you want change the status of pthread support, please recompile
-**   Ruby without "--enable-pthread" configure option or recompile Tcl/Tk
-**   with "--enable-threads" configure option (if your Tcl/Tk is later
-**   than or equal to Tcl/Tk 8.1).
-**
-*****************************************************************************
-')
-    end
-
-    # ruby -> enable && tcl -> enable/disable
-    if tcl_enable_thread
-      $CPPFLAGS += ' -DWITH_TCL_ENABLE_THREAD=1'
-    else
-      $CPPFLAGS += ' -DWITH_TCL_ENABLE_THREAD=0'
-    end
-
-    return true
-
-  else
-    # ruby -> disable
-    if tcl_enable_thread
-      # ruby -> disable && tcl -> enable
-      puts(%Q'\
-*****************************************************************************
-**
-** PTHREAD SUPPORT MODE ERROR:
-**
-**   Ruby is not compiled with --enable-pthread, but your Tcl/Tk
-**   library seems to be compiled with pthread support. This
-**   combination may cause frequent hang or segmentation fault
-**   errors when Ruby/Tk is working. We recommend that you NEVER
-**   create the library with such a combination of pthread support.
-**
-**   Please recompile Ruby with the "--enable-pthread" configure option
-**   or recompile Tcl/Tk with the "--disable-threads" configure option.
-**
-*****************************************************************************
-')
-      $CPPFLAGS += ' -DWITH_TCL_ENABLE_THREAD=1'
-      return false
-    else
-      # ruby -> disable && tcl -> disable
-      $CPPFLAGS += ' -DWITH_TCL_ENABLE_THREAD=0'
-      return true
-    end
-  end
-end
-
-tclver, tkver = check_tcltk_version(tcltk_version)
-
-if ( tcltk_framework ||
-       ( find_tcltk_header(tclver, tkver) &&
-           ( !use_X || find_X11(x11_ldir2, x11_ldir) ) &&
-           find_tcl(tcllib, stubs, tclver, *tcl_ldir_list) &&
-           find_tk(tklib, stubs, tkver, *tk_ldir_list) ) )
-  $CPPFLAGS += ' -DUSE_TCL_STUBS -DUSE_TK_STUBS' if stubs
-  $CPPFLAGS += ' -D_WIN32' if /cygwin/ =~ RUBY_PLATFORM
-
-  if tcltk_framework
-    if tcl_framework_header
-      $CPPFLAGS += " -I#{tcl_framework_header}"
-    else
-      $CPPFLAGS += " -I#{tcltk_framework}/Tcl.framework/Headers"
-    end
-
-    if tk_framework_header
-      $CPPFLAGS += " -I#{tk_framework_header}"
-    else
-      $CPPFLAGS += " -I#{tcltk_framework}/Tk.framework/Headers"
-    end
-
-    $LDFLAGS += ' -framework Tk -framework Tcl'
-  end
-
-  if stubs or pthread_check
-    # create Makefile
-
-    # for SUPPORT_STATUS
-    $INSTALLFILES ||= []
-    $INSTALLFILES << ["lib/tkextlib/SUPPORT_STATUS", "$(RUBYLIBDIR)", "lib"]
-
-    have_func("rb_hash_lookup", "ruby.h")
-
-    # create
-    $defs << %[-DRUBY_VERSION=\\"#{RUBY_VERSION}\\"]
-    $defs << %[-DRUBY_RELEASE_DATE=\\"#{RUBY_RELEASE_DATE}\\"]
-    create_makefile("tcltklib")
-  end
-end
diff --git a/ext/tk/sample/24hr_clock.rb b/ext/tk/sample/24hr_clock.rb
deleted file mode 100644
index 3a030ddaf2..0000000000
--- a/ext/tk/sample/24hr_clock.rb
+++ /dev/null
@@ -1,287 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-
-require 'tk'
-
-class Clock
-  def initialize(clock24 = true)
-    @clock = (clock24)? 24: 12
-
-    @size = 200
-    @cdot_size = 5
-
-    @cdot_color        = 'black'
-    @hour_hand_color   = 'black'
-    @minute_hand_color = 'gray25'
-    @second_hand_color = 'gray50'
-
-    @mark_font     = 'Helvetica -14'
-    @mark_width    = 3
-    @mark_color    = 'black'
-    @submark_color = 'gray50'
-
-    @c = TkCanvas.new(:width=>2*@size, :height=>2*@size,
-                     :scrollregion=>[-@size, -@size, @size, @size]
-                     ).pack(:fill=>:both, :expand=>true)
-
-    @tag = TkcTag.new(@c)
-    @hand_tag = TkcTag.new(@c)
-
-    @circle_coords = [[-0.9*@size, -0.9*@size], [0.9*@size, 0.9*@size]]
-    @oval = TkcOval.new(@c, @circle_coords, :fill=>'white', :tags=>[@tag])
-
-    f = TkFrame.new.pack
-    TkLabel.new(f, :text=>'CURRENT:').pack(:side=>:left)
-    @now = TkLabel.new(f, :text=>'00:00:00').pack(:side=>:left, :padx=>2)
-    TkLabel.new(f, :text=>'  ').pack(:side=>:left)
-    TkLabel.new(f, :text=>'  ').pack(:side=>:right)
-    @l = TkLabel.new(f, :text=>'00:00').pack(:side=>:right, :padx=>2)
-    TkLabel.new(f, :text=>'MOUSE-POINTER:').pack(:side=>:right)
-
-    cmd = proc{|x, y|
-      @l.text = '%02d:%02d' % coords_to_time(@c.canvasx(x), @c.canvasy(y))
-    }
-    @c.bind('Motion', cmd, '%x %y')
-    @tag.bind('Motion', cmd, '%x %y')
-
-    _create_hands
-    _create_marks
-
-    timer_proc = proc{
-      t = Time.now
-      @now.text = '%02d:%02d:%02d' % [t.hour, t.min, t.sec]
-      set_hands(t.hour, t.min, t.sec)
-    }
-
-    timer_proc.call
-    @timer = TkRTTimer.start(100, -1, timer_proc)
-  end
-
-  def _create_marks
-    @mark_tag = TkcTag.new(@c)
-
-    TkcLine.new(@c, 0, -0.90*@size, 0, -0.85*@size,
-                :tags=>[@tag, @mark_tag],
-                :width=>@mark_width, :fill=>@mark_color)
-    TkcLine.new(@c, 0.90*@size, 0, 0.85*@size, 0,
-                :tags=>[@tag, @mark_tag],
-                :width=>@mark_width, :fill=>@mark_color)
-    TkcLine.new(@c, 0, 0.90*@size, 0, 0.85*@size,
-                :tags=>[@tag, @mark_tag],
-                :width=>@mark_width, :fill=>@mark_color)
-    TkcLine.new(@c, -0.90*@size, 0, -0.85*@size, 0,
-                :tags=>[@tag, @mark_tag],
-                :width=>@mark_width, :fill=>@mark_color)
-
-    TkcText.new(@c, [0, -0.92*@size], :text=>0,
-                :anchor=>'s', :fill=>@mark_color)
-    TkcText.new(@c, [0.92*@size, 0], :text=>@clock.div(4),
-                :anchor=>'w', :fill=>@mark_color)
-    TkcText.new(@c, [0, 0.92*@size], :text=>@clock.div(2),
-                :anchor=>'n', :fill=>@mark_color)
-    TkcText.new(@c, [-0.92*@size, 0], :text=>@clock.div(4)*3,
-                :anchor=>'e', :fill=>@mark_color)
-
-    [30.0, 60.0].each{|angle|
-      rad = Math::PI * angle / 180.0
-      x_base = @size*Math::sin(rad)
-      y_base = @size*Math::cos(rad)
-
-      x1 = 0.90*x_base
-      y1 = 0.90*y_base
-
-      x2 = 0.85*x_base
-      y2 = 0.85*y_base
-
-      TkcLine.new(@c, x1, y1, x2, y2,
-                  :tags=>[@tag, @mark_tag],
-                  :width=>@mark_width, :fill=>@mark_color)
-      TkcLine.new(@c, x1, -y1, x2, -y2,
-                  :tags=>[@tag, @mark_tag],
-                  :width=>@mark_width, :fill=>@mark_color)
-      TkcLine.new(@c, -x1, y1, -x2, y2,
-                  :tags=>[@tag, @mark_tag],
-                  :width=>@mark_width, :fill=>@mark_color)
-      TkcLine.new(@c, -x1, -y1, -x2, -y2,
-                  :tags=>[@tag, @mark_tag],
-                  :width=>@mark_width, :fill=>@mark_color)
-
-      x3 = 0.92*x_base
-      y3 = 0.92*y_base
-
-      if @clock == 24
-        dh = angle.to_i/15
-      else # @clock == 12
-        dh = angle.to_i/30
-      end
-
-      TkcText.new(@c, x3, -y3, :text=>dh,
-                  :anchor=>'sw', :fill=>@mark_color)
-      TkcText.new(@c, x3, y3, :text=>@clock.div(2)-dh,
-                  :anchor=>'nw', :fill=>@mark_color)
-      TkcText.new(@c, -x3, y3, :text=>@clock.div(2)+dh,
-                  :anchor=>'ne', :fill=>@mark_color)
-      TkcText.new(@c, -x3, -y3, :text=>@clock-dh,
-                  :anchor=>'se', :fill=>@mark_color)
-    }
-
-    if @clock == 24
-      [15.0, 45.0, 75.0].each{|angle|
-        rad = Math::PI * angle / 180.0
-        x_base = @size*Math::sin(rad)
-        y_base = @size*Math::cos(rad)
-
-        x1 = 0.90*x_base
-        y1 = 0.90*y_base
-
-        x2 = 0.875*x_base
-        y2 = 0.875*y_base
-
-        TkcLine.new(@c, x1, y1, x2, y2,
-                    :tags=>[@tag, @mark_tag],
-                    :width=>@mark_width, :fill=>@submark_color)
-        TkcLine.new(@c, x1, -y1, x2, -y2,
-                    :tags=>[@tag, @mark_tag],
-                    :width=>@mark_width, :fill=>@submark_color)
-        TkcLine.new(@c, -x1, y1, -x2, y2,
-                    :tags=>[@tag, @mark_tag],
-                    :width=>@mark_width, :fill=>@submark_color)
-        TkcLine.new(@c, -x1, -y1, -x2, -y2,
-                    :tags=>[@tag, @mark_tag],
-                    :width=>@mark_width, :fill=>@submark_color)
-      }
-    end
-  end
-
-  def _create_hands
-    hour_hand_len   = 0.55*@size
-    minute_hand_len = 0.85*@size
-    second_hand_len = 0.88*@size
-
-    hour_hand_width   = 1.8*@cdot_size
-    minute_hand_width = 1.0*@cdot_size
-    second_hand_width = 1 # 0.4*@cdot_size
-
-    @hour_hand_coords = [
-      [0, -0.5*@cdot_size],
-      [hour_hand_width, -0.5*@cdot_size-hour_hand_width],
-      [hour_hand_width, -hour_hand_len+hour_hand_width],
-      [0, -hour_hand_len],
-      [-hour_hand_width, -hour_hand_len+hour_hand_width],
-      [-hour_hand_width, -0.5*@cdot_size-hour_hand_width],
-    ]
-    @minute_hand_coords = [
-      [0, -0.5*@cdot_size],
-      [minute_hand_width, -0.5*@cdot_size - minute_hand_width],
-      [minute_hand_width, -minute_hand_len+minute_hand_width],
-      [0, -minute_hand_len],
-      [-minute_hand_width, -minute_hand_len+minute_hand_width],
-      [-minute_hand_width, -0.5*@cdot_size-minute_hand_width],
-    ]
-    @second_hand_coords = [
-      [0, -0.5*@cdot_size],
-      [second_hand_width, -0.5*@cdot_size - second_hand_width],
-      [second_hand_width, -second_hand_len+second_hand_width],
-      [0, -second_hand_len],
-      [-second_hand_width, -second_hand_len+second_hand_width],
-      [-second_hand_width, -0.5*@cdot_size-second_hand_width],
-    ]
-
-    @hour_hand = TkcPolygon.new(@c, @hour_hand_coords,
-                                :tags=>[@tag, @hand_tag],
-                                :outline=>@hour_hand_color,
-                                :fill=>@hour_hand_color)
-
-    @minute_hand = TkcPolygon.new(@c, @minute_hand_coords,
-                                  :tags=>[@tag, @hand_tag],
-                                  :outline=>@minute_hand_color,
-                                  :fill=>@minute_hand_color)
-
-    @second_hand = TkcPolygon.new(@c, @second_hand_coords,
-                                  :tags=>[@tag, @hand_tag],
-                                  :outline=>@second_hand_color,
-                                  :fill=>@second_hand_color)
-
-    @center_dot = TkcOval.new(@c,
-                              [-@cdot_size, -@cdot_size],
-                              [@cdot_size, @cdot_size],
-                              :outline=>@cdot_color, :fill=>@cdot_color)
-  end
-  private :_create_hands
-
-  def _raise_hands
-    @hour_hand.raise
-    @minute_hand.raise
-    @second_hand.raise
-    @center_dot.raise
-  end
-  private :_raise_hands
-
-  def _raise_marks
-    @mark_tag.raise
-  end
-  private :_raise_marks
-
-  def set_hands(hh, mm, ss)
-    ss_angle = Math::PI * ss / 30.0
-    mm_angle = Math::PI * (mm + ss/60.0) / 30.0
-    hh_angle = Math::PI * (hh + (mm + ss/60.0)/60.0) / (@clock.div(2))
-
-    @second_hand.coords = @second_hand_coords.collect{|x, y|
-      r = Math::hypot(y, x)
-      a = Math::atan2(y, x) + ss_angle
-      [Math::cos(a) * r, Math::sin(a) * r]
-    }
-
-    @minute_hand.coords = @minute_hand_coords.collect{|x, y|
-      r = Math::hypot(y, x)
-      a = Math::atan2(y, x) + mm_angle
-      [Math::cos(a) * r, Math::sin(a) * r]
-    }
-
-    @hour_hand.coords = @hour_hand_coords.collect{|x, y|
-      r = Math::hypot(y, x)
-      a = Math::atan2(y, x) + hh_angle
-      [Math::cos(a) * r, Math::sin(a) * r]
-    }
-
-    _raise_hands
-    _raise_marks
-  end
-
-  def coords_to_time(x, y)
-    return ((y < 0)? [0, 0]: [@clock.div(2), 0])  if x == 0
-    if @clock == 24
-      offset = (x<0&&y<0)? 1800.0: 360.0
-      m_half = 720.0
-    else # @clock == 12
-      offset = (x<0&&y<0)? 900.0: 180.0
-      m_half = 360.0
-    end
-    (offset + m_half*Math.atan2(y,x)/Math::PI).round.divmod(60)
-  end
-
-  def create_pie(hh, mm, span, color='red')
-    if @clock == 24
-      start  = 90.0 - (hh*60 + mm)/4.0  # 360.0*(hh*60+mm)/(24*60)
-      extent = -span/4.0
-    else # @clock == 12
-      start  = 90.0 - (hh*60 + mm)/2.0  # 360.0*(hh*60+mm)/(12*60)
-      extent = -span/2.0
-    end
-
-    pie = TkcArc.new(@c, @circle_coords, :tags=>[@tag],
-                     :outline=>'black', 'fill'=>color,
-                     :start=>start, :extent=>extent)
-    _raise_hands
-    _raise_marks
-    pie
-  end
-end
-
-sched = Clock.new
-sched.create_pie(0,0, 60)            #  60 minutes from 00:00
-sched.create_pie(6,30, 280, 'green') # 280 minutes from 06:30
-sched.create_pie(15,20, 90, 'blue')  #  90 minutes from 15:20
-
-Tk.mainloop
diff --git a/ext/tk/sample/binding_sample.rb b/ext/tk/sample/binding_sample.rb
deleted file mode 100644
index a324a745f3..0000000000
--- a/ext/tk/sample/binding_sample.rb
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-
-require 'tk'
-
-class Button_clone < TkLabel
-  def initialize(*args)
-    @command = nil
-
-    if args[-1].kind_of?(Hash)
-      keys = _symbolkey2str(args.pop)
-      @command = keys.delete('command')
-
-      keys['highlightthickness'] = 1 unless keys.key?('highlightthickness')
-      keys['padx'] = '3m' unless keys.key?('padx')
-      keys['pady'] = '1m' unless keys.key?('pady')
-      keys['relief'] = 'raised' unless keys.key?('relief')
-
-      args.push(keys)
-    end
-
-    super(*args)
-
-    @press = false
-
-    self.bind('Enter', proc{self.background(self.activebackground)})
-    self.bind('Leave', proc{
-                @press = false
-                self.background(self.highlightbackground)
-                self.relief('raised')
-              })
-
-    self.bind('ButtonPress-1', proc{@press = true; self.relief('sunken')})
-    self.bind('ButtonRelease-1', proc{
-                self.relief('raised')
-                @command.call if @press && @command
-                @press = false
-              })
-  end
-
-  def command(cmd = Proc.new)
-    @command = cmd
-  end
-
-  def invoke
-    if @command
-      @command.call
-    else
-      ''
-    end
-  end
-end
-
-TkLabel.new(:text=><<EOT).pack
-This is a sample of 'event binding'.
-The first button is a normal button widget.
-And the second one is a normal label widget
-but with some bindings like a button widget.
-EOT
-
-lbl = TkLabel.new(:foreground=>'red').pack(:pady=>3)
-
-v = TkVariable.new(0)
-
-TkFrame.new{|f|
-  TkLabel.new(f, :text=>'click count : ').pack(:side=>:left)
-  TkLabel.new(f, :textvariable=>v).pack(:side=>:left)
-}.pack
-
-TkButton.new(:text=>'normal Button widget',
-             :command=>proc{
-               puts 'button is clicked!!'
-               lbl.text 'button is clicked!!'
-               v.numeric += 1
-             }){
-  pack(:fill=>:x, :expand=>true)
-}
-
-Button_clone.new(:text=>'Label with Button binding',
-                 :command=>proc{
-                   puts 'label is clicked!!'
-                   lbl.text 'label is clicked!!'
-                   v.numeric += 1
-                 }){
-  pack(:fill=>:x, :expand=>true)
-}
-
-Tk.mainloop
diff --git a/ext/tk/sample/bindtag_sample.rb b/ext/tk/sample/bindtag_sample.rb
deleted file mode 100644
index 7b4ac16f64..0000000000
--- a/ext/tk/sample/bindtag_sample.rb
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-
-TkLabel.new(:text=><<EOT, :justify=>:left).pack
-This is a sample of bindtags and usage of
-Tk.callback_break/Tk.callback_continue.
-Please check the work of following buttons
-(attend the difference between before/after
- pressing the bottom button), and see the
-source code.
-EOT
-
-def set_class_bind
-  TkButton.bind('ButtonPress-1',
-                proc{puts 'bind "ButtonPress-1" of TkButton class'})
-  TkButton.bind('ButtonRelease-1',
-                proc{puts 'bind "ButtonRelease-1" of TkButton class'})
-end
-
-# set root binding
-r = TkRoot.new
-r.bind('ButtonPress-1',   proc{puts 'bind "ButtonPress-1" of root widget'})
-r.bind('ButtonRelease-1', proc{puts 'bind "ButtonRelease-1" of root widget'})
-
-# set 'all' binding
-TkBindTag::ALL.bind('ButtonPress-1',
-                    proc{puts 'bind "ButtonPress-1" of the tag "all"'})
-TkBindTag::ALL.bind('ButtonRelease-1',
-                    proc{puts 'bind "ButtonRelease-1" of the tag "all"'})
-
-# create buttons
-b1 = TkButton.new(:text=>'button-1',
-                  :command=>proc{puts "command of button-1"}).pack
-b2 = TkButton.new(:text=>'button-2',
-                  :command=>proc{puts "command of button-2"}).pack
-b3 = TkButton.new(:text=>'button-3',
-                  :command=>proc{puts "command of button-3"}).pack
-b4 = TkButton.new(:text=>'button-4',
-                  :command=>proc{puts "command of button-4"}).pack
-b5 = TkButton.new(:text=>'button-5',
-                  :command=>proc{puts "command of button-5"}).pack
-
-# set button binding
-b1.bind('ButtonPress-1',   proc{puts 'bind "ButtonPress-1" of button-1'})
-b1.bind('ButtonRelease-1', proc{puts 'bind "ButtonRelease-1" of button-1'})
-
-b2.bind('ButtonPress-1',   proc{puts 'bind "ButtonPress-1" of button-2'})
-b2.bind('ButtonRelease-1', proc{puts 'bind "ButtonRelease-1" of button-2'})
-
-b3.bind('ButtonPress-1',   proc{puts 'bind "ButtonPress-1" of button-3'})
-b3.bind('ButtonRelease-1', proc{puts 'bind "ButtonRelease-1" of button-3'})
-
-b4.bind('ButtonPress-1',   proc{puts 'bind "ButtonPress-1" of button-4'})
-b4.bind('ButtonRelease-1', proc{puts 'bind "ButtonRelease-1" of button-4'})
-
-b5.bind('ButtonPress-1',   proc{puts 'bind "ButtonPress-1" of button-5'})
-b5.bind('ButtonRelease-1', proc{puts 'bind "ButtonRelease-1" of button-5'})
-
-# create bindtag and set binding
-tag1 = TkBindTag.new
-tag1.bind('ButtonPress-1',   proc{puts 'bind "ButtonPress-1" of tag1'})
-tag1.bind('ButtonRelease-1', proc{puts 'bind "ButtonRelease-1" of tag1'})
-
-tag2 = TkBindTag.new
-tag2.bind('ButtonPress-1',
-          proc{
-            puts 'bind "ButtonPress-1" of tag2'
-            puts 'call Tk.callback_continue'
-            Tk.callback_continue
-            puts 'never see this message'
-          })
-tag2.bind('ButtonRelease-1',
-          proc{
-            puts 'bind "ButtonRelease-1" of tag2'
-            puts 'call Tk.callback_continue'
-            Tk.callback_continue
-            puts 'never see this message'
-          })
-
-tag3 = TkBindTag.new
-tag3.bind('ButtonPress-1',
-          proc{
-            puts 'bind "ButtonPress-1" of tag3'
-            puts 'call Tk.callback_break'
-            Tk.callback_break
-            puts 'never see this message'
-          })
-tag3.bind('ButtonRelease-1',
-          proc{
-            puts 'bind "ButtonRelease-1" of tag3'
-            puts 'call Tk.callback_break'
-            Tk.callback_break
-            puts 'never see this message'
-          })
-
-# set bindtags
-p b1.bindtags
-
-tags = b2.bindtags
-tags[2,0] = tag1
-tags[0,0] = tag1
-b2.bindtags(tags)
-p b2.bindtags
-
-tags = b3.bindtags
-tags[2,0] = tag2
-tags[0,0] = tag2
-b3.bindtags(tags)
-p b3.bindtags
-
-tags = b4.bindtags
-tags[2,0] = tag3
-tags[0,0] = tag3
-b4.bindtags(tags)
-p b4.bindtags
-
-b5.bindtags([tag1, TkButton, tag2, b5])
-
-# create button to set button class binding
-TkButton.new(:text=>'set binding to TkButton class',
-             :command=>proc{
-               puts 'call "set_class_bind"'
-               set_class_bind
-             }).pack(:pady=>7)
-
-# start event-loop
-Tk.mainloop
diff --git a/ext/tk/sample/binstr_usage.rb b/ext/tk/sample/binstr_usage.rb
deleted file mode 100644
index 92882b8e1b..0000000000
--- a/ext/tk/sample/binstr_usage.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-
-require "tk"
-
-TkMessage.new(:width=>360, :text=><<EOM).pack
-This sample shows how to use a binary sequence between Ruby and Tk. \
-This reads the image data from the file as the binary sequence.
-
-To treat the difference of encodings between on Ruby and on Tk seamlessly, \
-Ruby/Tk converts the encoding of string arguments automatically. \
-I think it is comfortable for users on almost all situations. \
-However, when treats a binary sequence, the convert process makes troubles.
-
-Tk::BinaryString class (subclass of Tk::EncodedString class) is the class \
-to avoid such troubles. Please see the source code of this sample. \
-A Tk::BinaryString instance is used to create the image for the center button.
-EOM
-
-ImgFile=[File.dirname(__FILE__), 'images','tcllogo.gif'].join(File::Separator)
-
-ph1 = TkPhotoImage.new(:file=>ImgFile)
-p ph1.configinfo
-
-b_str = Tk::BinaryString(IO.read(ImgFile))
-p [b_str, b_str.encoding]
-
-ph2 = TkPhotoImage.new(:data=>b_str)
-p ph2.configinfo
-p ph2.data(:grayscale=>true)
-
-ph3 = TkPhotoImage.new(:palette=>256)
-ph3.put(ph2.data)
-
-ph4 = TkPhotoImage.new()
-ph4.put(ph2.data(:grayscale=>true))
-
-#p [b_str.encoding, b_str.rb_encoding]
-
-f = TkFrame.new.pack
-TkButton.new(:parent=>f, :image=>ph1, :command=>proc{exit}).pack(:side=>:left)
-TkButton.new(:parent=>f, :image=>ph2, :command=>proc{exit}).pack(:side=>:left)
-TkButton.new(:parent=>f, :image=>ph3, :command=>proc{exit}).pack(:side=>:left)
-TkButton.new(:parent=>f, :image=>ph4, :command=>proc{exit}).pack(:side=>:left)
-
-Tk.mainloop
diff --git a/ext/tk/sample/btn_with_frame.rb b/ext/tk/sample/btn_with_frame.rb
deleted file mode 100644
index 43e120b123..0000000000
--- a/ext/tk/sample/btn_with_frame.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: false
-require 'tk'
-
-class Button_with_Frame < TkButton
-  def create_self(keys)
-    @frame = TkFrame.new('widgetname'=>@path, 'background'=>'yellow')
-    install_win(@path) # create new @path which is a daughter of old @path
-    super(keys)
-    TkPack(@path, :padx=>7, :pady=>7)
-    @epath = @frame.path
-  end
-  def epath
-    @epath
-  end
-end
-
-Button_with_Frame.new(:text=>'QUIT', :command=>proc{exit}) {
-  pack(:padx=>15, :pady=>5)
-}
-
-Tk.mainloop
diff --git a/ext/tk/sample/cd_timer.rb b/ext/tk/sample/cd_timer.rb
deleted file mode 100644
index 1efe8cdb7c..0000000000
--- a/ext/tk/sample/cd_timer.rb
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-#
-#   countdown timer
-#     usage: cd_timer min [, min ... ]
-#            ( e.g. cd_timer 0.5 1 3 5 10 )
-#
-require 'tk'
-
-if ARGV.empty?
-  $stderr.puts 'Error:: No time arguments for counting down'
-  exit(1)
-end
-
-width = 10
-
-TkButton.new(:text=>'exit',
-             :command=>proc{exit}).pack(:side=>:bottom, :fill=>:x)
-
-b = TkButton.new(:text=>'start').pack(:side=>:top, :fill=>:x)
-
-f = TkFrame.new(:relief=>:ridge, :borderwidth=>2).pack(:fill=>:x)
-TkLabel.new(f, :relief=>:flat, :pady=>3,
-            :background=>'black', :foreground=>'white',
-            :text=>'  elapsed: ').pack(:fill=>:x, :side=>:left, :expand=>true)
-now = TkLabel.new(f, :width=>width, :relief=>:flat, :pady=>3, :anchor=>:w,
-                  :background=>'black', :foreground=>'white',
-                  :text=>'%4d:%02d.00' % [0, 0]).pack(:side=>:right)
-
-timers = [ TkRTTimer.new(10){|tm|
-    t = (tm.return_value || 0) + 1
-    s, u = t.divmod(100)
-    m, s = s.divmod(60)
-    now.text('%4d:%02d.%02d' % [m, s, u])
-    t
-  }.set_start_proc(0, proc{
-                     now.text('%4d:%02d.00' % [0,0])
-                     now.foreground('white')
-                     0
-                   })
-]
-
-ARGV.collect{|arg| (Float(arg) * 60).to_i}.sort.each_with_index{|time, idx|
-  f = TkFrame.new(:relief=>:ridge, :borderwidth=>2).pack(:fill=>:x)
-  TkLabel.new(f, :relief=>:flat, :pady=>3,
-              :text=>'  %4d:%02d  --> ' % (time.divmod(60))).pack(:side=>:left)
-  l = TkLabel.new(f, :width=>width, :relief=>:flat, :pady=>3, :anchor=>:w,
-                  :text=>'%4d:%02d' % (time.divmod(60))).pack(:side=>:right)
-  timers << TkRTTimer.new(1000){|tm|
-    t = (tm.return_value || time) - 1
-    if t < 0
-      l.text('%4d:%02d' % ((-t).divmod(60)))
-    else
-      l.text('%4d:%02d' % (t.divmod(60)))
-    end
-    if t.zero?
-      l.foreground('red')
-      idx.times{Tk.bell}
-    end
-    t
-  }.set_start_proc(0, proc{
-                     l.text('%4d:%02d' % (time.divmod(60)))
-                     l.foreground('black')
-                     time
-                   })
-}
-
-mode = :start
-b.command(proc{
-            if mode == :start
-              timers.each{|timer| timer.restart}
-              b.text('reset')
-              mode = :reset
-            else
-              timers.each{|timer| timer.stop.reset}
-              b.text('start')
-              mode = :start
-            end
-          })
-
-Tk.mainloop
-
diff --git a/ext/tk/sample/cmd_res_test.rb b/ext/tk/sample/cmd_res_test.rb
deleted file mode 100644
index 52c5bc7515..0000000000
--- a/ext/tk/sample/cmd_res_test.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# frozen_string_literal: false
-require 'tk'
-TkOptionDB.readfile(File.expand_path('cmd_resource',
-                                     File.dirname(__FILE__)))
-f = TkFrame.new(:class=>'BtnFrame').pack
-b = TkButton.new(:parent=>f, :widgetname=>'hello').pack
-cmd1 = TkOptionDB.new_proc_class(b, [:show_msg, :bye_msg], 3)
-cmd2 = TkOptionDB.new_proc_class(:ZZZ, [:show_msg, :bye_msg], 3, false, cmd1)
-cmd3 = TkOptionDB.new_proc_class(:ZZZ, [:show_msg, :bye_msg], 3, false, b)
-cmd4 = TkOptionDB.new_proc_class(:BTN_CMD, [:show_msg, :bye_msg], 3){
-  def self.__check_proc_string__(str)
-    "{|arg| print [arg, $SAFE].inspect, ': '; Proc.new#{str}.call(arg)}"
-  end
-}
-cmd1.show_msg('cmd1')
-cmd2.show_msg('cmd2')
-cmd3.show_msg('cmd3')
-cmd4.show_msg('cmd4')
diff --git a/ext/tk/sample/cmd_resource b/ext/tk/sample/cmd_resource
deleted file mode 100644
index 9cc4915546..0000000000
--- a/ext/tk/sample/cmd_resource
+++ /dev/null
@@ -1,5 +0,0 @@
-*BtnFrame.hello.text: HELLO
-*BtnFrame.hello.command: ruby {puts "Hello World!!"}
-*BTN_CMD.show_msg: {|arg| print "Hello, #{arg}!!\n"}
-*hello.show_msg: {|arg| print "Hello, Hello, #{arg}!!\n"}
-*hello.ZZZ.show_msg: {|arg| print "Hello, Hello, ZZZ:#{arg}!!\n"}
diff --git a/ext/tk/sample/demos-en/ChangeLog b/ext/tk/sample/demos-en/ChangeLog
deleted file mode 100644
index c3f66cf409..0000000000
--- a/ext/tk/sample/demos-en/ChangeLog
+++ /dev/null
@@ -1,64 +0,0 @@
-2002-08-29 16:30  matt
-
-	* ChangeLog: ChangeLog is auto-generated *from* CVS log.
-
-2002-08-29 16:27  matt
-
-	* ChangeLog.prev: [no log message]
-
-2002-08-28 18:07  matt
-
-	* browse1, browse2, hello, ixset, rmt, rolodex, rolodex-j, square,
-	tcolor, timer, widget: Changed #! lines to the slightly more
-	portable '#!/usr/bin/env ruby'.
-
-2002-08-28 17:56  matt
-
-	* icon.rb, items.rb, label.rb, menu.rb, ruler.rb: Changed bitmap
-	file extensions from .bmp to .xbm.
-
-2002-08-28 17:55  matt
-
-	* images/: face.bmp, face.xbm, flagdown.bmp, flagdown.xbm,
-	flagup.bmp, flagup.xbm, gray25.bmp, gray25.xbm, letters.bmp,
-	letters.xbm, noletter.bmp, noletter.xbm, pattern.bmp, pattern.xbm:
-	Changed X bitmap file extensions from .bmp to the more intuitive
-	.xbm.
-
-2002-08-28 17:35  matt
-
-	* bitmap.rb, colors.rb, cscroll.rb, ctext.rb, hello, ixset,
-	menubu.rb, patch_1.1c1, rmt, style.rb, timer, ChangeLog, README,
-	README.tkencoding, arrow.rb, bind.rb, browse1, browse2, button.rb,
-	check.rb, clrpick.rb, dialog1.rb, dialog2.rb, entry1.rb, entry2.rb,
-	filebox.rb, floor.rb, form.rb, hscale.rb, icon.rb, image1.rb,
-	image2.rb, items.rb, label.rb, menu.rb, msgbox.rb, plot.rb,
-	puzzle.rb, radio.rb, rolodex, rolodex-j, ruler.rb, sayings.rb,
-	search.rb, square, states.rb, tcolor, text.rb, tkencoding.rb,
-	twind.rb, vscale.rb, widget, doc.org/README, doc.org/README.JP,
-	doc.org/README.tk80, doc.org/license.terms,
-	doc.org/license.terms.tk80, images/earth.gif, images/earthris.gif,
-	images/face.bmp, images/flagdown.bmp, images/flagup.bmp,
-	images/gray25.bmp, images/grey.25, images/grey.5,
-	images/letters.bmp, images/noletter.bmp, images/pattern.bmp,
-	images/tcllogo.gif, images/teapot.ppm: Initial revision
-
-2002-08-28 17:35  matt
-
-	* bitmap.rb, colors.rb, cscroll.rb, ctext.rb, hello, ixset,
-	menubu.rb, patch_1.1c1, rmt, style.rb, timer, ChangeLog, README,
-	README.tkencoding, arrow.rb, bind.rb, browse1, browse2, button.rb,
-	check.rb, clrpick.rb, dialog1.rb, dialog2.rb, entry1.rb, entry2.rb,
-	filebox.rb, floor.rb, form.rb, hscale.rb, icon.rb, image1.rb,
-	image2.rb, items.rb, label.rb, menu.rb, msgbox.rb, plot.rb,
-	puzzle.rb, radio.rb, rolodex, rolodex-j, ruler.rb, sayings.rb,
-	search.rb, square, states.rb, tcolor, text.rb, tkencoding.rb,
-	twind.rb, vscale.rb, widget, doc.org/README, doc.org/README.JP,
-	doc.org/README.tk80, doc.org/license.terms,
-	doc.org/license.terms.tk80, images/earth.gif, images/earthris.gif,
-	images/face.bmp, images/flagdown.bmp, images/flagup.bmp,
-	images/gray25.bmp, images/grey.25, images/grey.5,
-	images/letters.bmp, images/noletter.bmp, images/pattern.bmp,
-	images/tcllogo.gif, images/teapot.ppm: Taking over demo package
-	from Jonathan Conway.
-
diff --git a/ext/tk/sample/demos-en/ChangeLog.prev b/ext/tk/sample/demos-en/ChangeLog.prev
deleted file mode 100644
index ba808eca8b..0000000000
--- a/ext/tk/sample/demos-en/ChangeLog.prev
+++ /dev/null
@@ -1,9 +0,0 @@
-2001-07-26      <rise@leannan.knavery.net>
-
-	* Moved files to directory ruby-tk81-demos-english in tarball.
-
-2001-07-26      <rise@knavery.net>
-
-	* Added test to widget and hello versus Tk::TCL_VERSION & Tk::JAPANIZED_TK (per Guy Decoux in [ruby-talk:18559]) before requiring tkencoding.rb.
-
-
diff --git a/ext/tk/sample/demos-en/README b/ext/tk/sample/demos-en/README
deleted file mode 100644
index 033dca33c6..0000000000
--- a/ext/tk/sample/demos-en/README
+++ /dev/null
@@ -1,138 +0,0 @@
-Current Maintainer:
-	Jonathan Conway
-	rise@knavery.net
-
-	Please direct all bug reports/requests/suggestions to the above
-	address.
-
-
-Notes:
-
-* 	The files hello and widget have been changed to test Tk::TCL_VERSION
-	and Tk::JAPANIZED_TK before requiring tkencoding.rb to prevent an
-	infinite loop.  This test was taken from a message in
-	[ruby-talk:18559] by Guy Decoux.
-
-*	The .bmp files in the images directory are X bitmaps (i.e. XBM to many
-	graphics packages), not Windows bitmaps (.bmp).  You will not be
-	able to use images exported by a graphics program as Windows
-	bitmaps with this demo collection nor will you be able to edit the
-	included images without setting the file type correctly.
-
--- Jonathan Conway, 2001-07-26
-
-
-#------------------------------------------------------------------------------
-# ==== Introduction. ====
-#
-# To create this version of the Ruby/Tk widget demo, I took the
-# ruby-tk81-demos and removed all the Kanji strings and comments.  I
-# have tried to restore the original English strings and comments
-# using the Tcl/Tk8.2.2 version of the widget demo.
-#
-# When I tried running the Kanji version, all I got was a mostly blank
-# panel with a non-functional "File" button. I disovered that if all
-# non-ASCII characters were replaced with blanks, then I could get the
-# gutted stuff running.
-#
-# Since English Ruby/Tk documentation is lacking and I needed this
-# code to see how it worked and to use as the basis of my try-it
-# prototype (The Ruby Yielding Interactive Toolkit), plus the fact
-# that no help was forthcoming for making the Kanji version work (plus
-# the fact that I can't read Kanji anyway), I decided to embark on
-# this English restoration project.
-#
-# Thanks to everyone who worked on the original Ruby/Tk widget demo
-# (and the preceding Tcl/Tk version for that matter).  The
-# comparatively simple task of changing text strings and comments has
-# made me appreciate the great amount of original work that went into
-# this.
-#
-# -- Conrad Schneiker, 2000-07-23.
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-# ==== Known bugs. ====
-#
-# ^C-ing the demo gives Ruby interrupt and stack message; clean exit needed.
-# Font settings don't work correctly.
-# Dismissing the embedded windows demo (tkwind.rb) kills the widget demo.
-# Rerunning the canvas item demo from the code widow get errors.
-# The "press me" button in the canvas item demo doesn't time out.
-# The simple 2 d plot starts up extremely slow compared to the Tcl version.
-# The first item message on the icon menu on the menu and cascades demo doesn't work.
-#------------------------------------------------------------------------------
-
-
-###################### Original README ########################################
-
-  Ruby/Tk81 widget-demo			1999/08/13
-
-					北陸先端大情報科学研究科
-					立石 <ttate@jaist.ac.jp>
-
-Tcl/Tk8.1ではunicode(UTF8)が採用され、unicodeに変換された日本語であれば
-Widgetに表示させることが可能です。本アーカイブには以前に永井さんが中心と
-なられて作成されたRuby/Tkのサンプルに修正を加え、以下の環境においてで動作
-を確認したものです。
-
-* ruby-1.3.7,ruby-1.4.0
-* tcl8.1, tk8.1
-* linux-2.2
-
-Windows(Cygwin)において、サンプルを動かすにはrubyを-Keというオプションを付
-けて起動させると良いそうです。
-					情報提供：渡辺さん
-					<eban@os.rim.or.jp>
-
-----------------------------------------------------------------------------
-  Ruby/Tk widget-demo
-                              version 1.1 ( 1998/07/24 )
-                              永井＠知能．九工大 (nagai@ai.kyutech.ac.jp)
-
-標準配布の Tcl/Tk 拡張パッケージを取り込んだ Ruby (以下 Ruby/Tk と呼びます)
-では，Tk widget を用いた GUI の作成を行うことができます．実際に GUI を作成
-していく場合には様々な実例がサンプルとして存在すると便利なのですが，Ruby/Tk
-にはそのような適当なサンプルスクリプト集合は存在しませんでした．それに対し，
-拡張パッケージの元である Tcl/Tk には，Tk widget を用いてどのようなことがで
-きるかを示すものとして widget-demo が存在しおり，Tcl/Tk を用いた GUI の作成
-を習得する際の代表的サンプルとなっています．本アーカイブは，Ruby/Tk の習得の
-ための代表的なサンプルスクリプトとすべく，Tcl/Tk の widget-demo を移植したも
-のです．
-
-本アーカイブに含まれるスクリプトを実行するためには，ruby-1.1c2 以上であるこ
-とが必要です．1.1c1 の場合は，本アーカイブに含まれる patck_1.1c1 を Ruby の
-ライブラリにあててください．組み込む Tk のバージョンは，4.2 でも 8.0 でも修
-正なく動かせるはずです．ただし，日本語版での移植となっているため，日本語化さ
-れた Tk をご利用ください．スクリプトのテストは，Tk4.2jp と Tk8.0jp の上で行
-いました (完璧にではないですが)．
-
-本アーカイブに含まれるスクリプトの多くは，元となっている Tcl/Tk 版に比較的近
-いスクリプト記述となるようにしています．そのため，Ruby/Tk のサンプルと言うに
-は，あまり Ruby らしくないとも言えるでしょう．にもかかわらず，そのような記述
-を取っている理由は，Ruby/Tk のドキュメント不足にあります．
-
-Tcl/Tk には適当な参考書が何冊か存在していますから，Ruby/Tk スクリプトを作成
-する際は，そのような Tcl/Tk の参考書で情報を補いながら作成することになると思
-います．各 widget の使用例として，Tcl/Tk の widget-demo を参照することもある
-でしょう．Ruby/Tk 版の記述を widget-demo を Tcl/Tk 版の記述に近いものにして
-おけば，その対比によって，Ruby/Tk の理解を早めることができると考えられます．
-一旦 Ruby/Tk での 各 widget の使用方法を習得してしまえば，Ruby らしいスクリ
-プトを作成することは難しくないでしょう．本アーカイブのスクリプトは，Ruby/Tk
-を最初に習得するまでの踏台として利用していただければ幸いです．
-
-widget-demo の移植にあたっては，次の方にも移植したスクリプトを提供していただ
-きました．ここに感謝の意を表します．
-
-    立石＠JAIST (ttate@jaist.ac.jp) さん
-    平松祥史 (hiramatu@cdrom.co.jp) さん
-
-平松さんによる Ruby/Tk 入門の Web page (http://www.cdrom.co.jp/~hiramatu/)
-も Ruby/Tk の習得に有用と思えますので，ぜひご参照ください．
-
-また，前橋 (maebashi@iij.ad.jp) さんをはじめとして，widget-demo の移植に際し
-て必要となった Ruby の Tk 関連ライブラリ修正について，問題点，バグの指摘をし
-ていただいた方々にも感謝致します．
-
-そして最後に最大の感謝を Ruby 設計者の まつもと ゆきひろ (matz@netlab.co.jp)
-さんに捧げたいと思います．
diff --git a/ext/tk/sample/demos-en/README.1st b/ext/tk/sample/demos-en/README.1st
deleted file mode 100644
index 2ba1e275c8..0000000000
--- a/ext/tk/sample/demos-en/README.1st
+++ /dev/null
@@ -1,18 +0,0 @@
-There are Ruby/Tk demo scripts.
-
-Files with '.rb' extension are sub-scripts which are launched 'widget'
-script. Those files don't work independently. Please call them from
-'widget' script.
-
-If you want start some sub-scripts at same time when the launcher
-script tarts, please give the sub-script names as arguments.
-(e.g. /usr/local/bin/ruby widget button.rb entry1.rb text.rb )
-You can ommit '.rb' of the sub-scripts
-(e.g. /usr/local/bin/ruby widget button entry1 text )
-
-If you don't need launcher's main window, give -n option.
-(e.g. /usr/local/bin/ruby widget -n button.rb entry1.rb text.rb )
-
-Others (browse1, hello, and so on) are standalone scripts.
-
-          2004/04/14  Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
diff --git a/ext/tk/sample/demos-en/README.tkencoding b/ext/tk/sample/demos-en/README.tkencoding
deleted file mode 100644
index cca8734a28..0000000000
--- a/ext/tk/sample/demos-en/README.tkencoding
+++ /dev/null
@@ -1,29 +0,0 @@
-This is a original document of 'tkencoding.rb'.
-The library 'tkencoding.rb' is obsolete.
-Functions of tkencoding.rb is already included into Ruby/Tk.
-
--------------------------------------------------
-tkencoding.rbを用いた日本語の表示について
-
-Copyright (C) 1999/07, Takaaki Tateishi <ttate@jaist.ac.jp>
-
-
-1. tkencoding.rbとは？
-
-tkencoding.rbはTcl/Tk8.1を利用したRuby/Tkのためのライブラリ
-です。tkencoding.rbをrequireすることによってWedgetに表示さ
-れるテキストは全てunicode(UTF8)へ変換されます。
-
-
-2. 使い方
-
-tkencoding.rbをrequireしてTk.encodingで使用している文字コード
-を指定して下さい。例えば以下のような感じになります。
-
-----
-require 'tk'
-require 'tkencoding'
-
-Tk.encoding = "utf-8"
-# Tk.encoding = "shiftjis"
----
diff --git a/ext/tk/sample/demos-en/anilabel.rb b/ext/tk/sample/demos-en/anilabel.rb
deleted file mode 100644
index a48f4a10e8..0000000000
--- a/ext/tk/sample/demos-en/anilabel.rb
+++ /dev/null
@@ -1,175 +0,0 @@
-# frozen_string_literal: false
-#
-# animated label widget demo (called by 'widget')
-#
-# based on Tcl/Tk8.5a2 widget demos
-
-if defined?($anilabel_demo) && $anilabel_demo
-  $anilabel_demo.destroy
-  $anilabel_demo = nil
-end
-
-# demo toplevel widget
-$anilabel_demo = TkToplevel.new {|w|
-  title("Animated Label Demonstration")
-  iconname("anilabel")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($anilabel_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "Four animated labels are displayed below; each of the labels on the left is animated by making the text message inside it appear to scroll, and the label on the right is animated by animating the image that it displays."
-}
-msg.pack('side'=>'top')
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $anilabel_demo
-      $anilabel_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'See Code'
-    command proc{showCode 'anilabel'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# create frame for label demo
-f_left = TkLabelFrame.new(base_frame,  :text=>'Scrolling Texts')
-f_right = TkLabelFrame.new(base_frame, :text=>'GIF Image')
-Tk.pack(f_left, f_right, 'side'=>'left', 'expand'=>'yes', 'fill'=>'both',
-        'padx'=>10, 'pady'=>10)
-
-# animated label
-class AnimatedTextLabel < TkLabel
-  def initialize(*args)
-    super(*args)
-    @timer = TkTimer.new{ _animation_callback }
-    @timer.loop_exec = -1
-    # bind('Destroy'){ @timer.stop }
-    @btag = TkBindTag.new('Destroy'){ @timer.stop }
-    self.bindtags_unshift(@btag)
-  end
-
-  def _animation_callback()
-    txt = self.text
-    self.text = (txt[1..-1] << txt[0])
-  end
-  private :_animation_callback
-
-  def start(interval)
-    @timer.set_interval(interval)
-    @timer.start
-  end
-
-  def stop
-    @timer.stop
-  end
-end
-
-# animated image
-class AnimatedImageLabel < AnimatedTextLabel
-  def initialize(*args)
-    super(*args)
-    @destroy_image = false
-    @btag.bind_append('Destroy'){
-      if @destroy_image
-        begin
-          self.image.delete
-        rescue
-        end
-      end
-    }
-  end
-  attr_accessor :destroy_image
-
-  def _animation_callback()
-    img = self.image
-
-    fmt = img.format
-    if fmt.kind_of?(Array)
-      if fmt[1].kind_of?(Hash)
-        # fmt == ['GIF', {'index'=>idx}]
-        idx = fmt[1]['index']
-      else
-        # fmt == ['GIF', '-index', idx]  :: Ruby1.8.2 returns this.
-        idx = fmt[2]
-      end
-    elsif fmt.kind_of?(String) && fmt =~ /GIF -index (\d+)/
-      idx = $1.to_i
-    else
-      idx = -1
-    end
-
-    begin
-      img.format("GIF -index #{idx + 1}")
-    rescue => e
-      img.format("GIF -index 0")
-    end
-  end
-  private :_animation_callback
-end
-
-# create labels
-l1 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:ridge,
-                           :font=>{:family=>'Courier', :size=>10})
-l2 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:groove,
-                           :font=>{:family=>'Courier', :size=>10})
-l3 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:flat,
-                           :font=>{:family=>'Courier', :size=>10}, :width=>18)
-Tk.pack(l1, l2, l3,
-        :side=>:top, :expand=>true, :anchor=>:w, :padx=>10, :pady=>10)
-
-limg = AnimatedImageLabel.new(f_right, :borderwidth=>0)
-limg.pack(:side=>:top, :expand=>true, :padx=>10, :pady=>10)
-
-# base64-encoded animated GIF file
-tclPowerdData = <<EOD
-    R0lGODlhKgBAAPQAAP//////zP//AP/MzP/Mmf/MAP+Zmf+ZZv+ZAMz//8zM
-    zMyZmcyZZsxmZsxmAMwzAJnMzJmZzJmZmZlmmZlmZplmM5kzM2aZzGZmzGZm
-    mWZmZmYzZmYzMzNmzDMzZgAzmSH+IE1hZGUgd2l0aCBHSU1QIGJ5IExARGVt
-    YWlsbHkuY29tACH5BAVkAAEALAAAAAAqAEAAAAX+YCCOZEkyTKM2jOm66yPP
-    dF03bx7YcuHIDkGBR7SZeIyhTID4FZ+4Es8nQyCe2EeUNJ0peY2s9mi7PhAM
-    ngEAMGRbUpvzSxskLh1J+Hkg134OdDIDEB+GHxtYMEQMTjMGEYeGFoomezaC
-    DZGSHFmLXTQKkh8eNQVpZ2afmDQGHaOYSoEyhhcklzVmMpuHnaZmDqiGJbg0
-    qFqvh6UNAwB7VA+OwydEjgujkgrPNhbTI8dFvNgEYcHcHx0lB1kX2IYeA2G6
-    NN0YfkXJ2BsAMuAzHB9cZMk3qoEbRzUACsRCUBK5JxsC3iMiKd8GN088SIyT
-    0RAFSROyeEg38caDiB/+JEgqxsODrZJ1BkT0oHKSmI0ceQxo94HDpg0qsuDk
-    UmRAMgu8OgwQ+uIJgUMVeGXA+IQkzEeHGvD8cIGlDXsLiRjQ+EHroQhea7xY
-    8IQBSgYYDi1IS+OFBCgaDMGVS3fGi5BPJpBaENdQ0EomKGD56IHwO39EXiSC
-    Ysgxor5+Xfgq0qByYUpiXmwuoredB2aYH4gWWda0B7SeNENpEJHC1ghi+pS4
-    AJpIAwWvKPBi+8YEht5EriEqpFfMlhEdkBNpx0HUhwypx5T4IB1MBg/Ws2sn
-    wV3MSQOkzI8fUd48Aw3dOZto71x85hHtHijYv18Gf/3GqCdDCXHNoICBobSo
-    IqBqJLyCoH8JPrLgdh88CKCFD0CGmAiGYPgffwceZh6FC2ohIIklnkhehTNY
-    4CIHHGzgwYw01ujBBhvAqKOLLq5AAk9kuSPkkKO40NB+h1gnypJIIvkBf09a
-    N5QIRz5p5ZJXJpmlIVhOGQA2TmIJZZhKKmmll2BqyWSXWUrZpQtpatlmk1c2
-    KaWRHeTZEJF8SqLDn/hhsOeQgBbqAh6DGqronxeARUIIACH5BAUeAAAALAUA
-    LgAFAAUAAAUM4CeKz/OV5YmqaRkCACH5BAUeAAEALAUALgAKAAUAAAUUICCK
-    z/OdJVCaa7p+7aOWcDvTZwgAIfkEBR4AAQAsCwAuAAkABQAABRPgA4zP95zA
-    eZqoWqqpyqLkZ38hACH5BAUKAAEALAcALgANAA4AAAU7ICA+jwiUJEqeKau+
-    r+vGaTmac63v/GP9HM7GQyx+jsgkkoRUHJ3Qx0cK/VQVTKtWwbVKn9suNunc
-    WkMAIfkEBQoAAAAsBwA3AAcABQAABRGgIHzk842j+Yjlt5KuO8JmCAAh+QQF
-    CgAAACwLADcABwAFAAAFEeAnfN9TjqP5oOWziq05lmUIACH5BAUKAAAALA8A
-    NwAHAAUAAAUPoPCJTymS3yiQj4qOcPmEACH5BAUKAAAALBMANwAHAAUAAAUR
-    oCB+z/MJX2o+I2miKimiawgAIfkEBQoAAAAsFwA3AAcABQAABRGgIHzfY47j
-    Q4qk+aHl+pZmCAAh+QQFCgAAACwbADcABwAFAAAFEaAgfs/zCV9qPiNJouo7
-    ll8IACH5BAUKAAAALB8ANwADAAUAAAUIoCB8o0iWZggAOw==
-EOD
-
-l1.text('* Slow Animation *').start(300)
-l2.text('* Fast Animation *').start(80)
-l3.text('This is a longer scrolling text in a widget that will not show the whole message at once. ').start(150)
-
-limg.destroy_image = true
-limg.image(TkPhotoImage.new(:format=>'GIF', :data=>tclPowerdData)).start(100)
diff --git a/ext/tk/sample/demos-en/aniwave.rb b/ext/tk/sample/demos-en/aniwave.rb
deleted file mode 100644
index 955f202767..0000000000
--- a/ext/tk/sample/demos-en/aniwave.rb
+++ /dev/null
@@ -1,119 +0,0 @@
-# frozen_string_literal: false
-#
-# animated wave demo (called by 'widget')
-#
-# based on Tcl/Tk8.5a2 widget demos
-
-# destroy toplevel widget for this demo script
-if defined?($aniwave_demo) && $aniwave_demo
-  $aniwave_demo.destroy
-  $aniwave_demo = nil
-end
-
-# create toplevel widget
-$aniwave_demo = TkToplevel.new {|w|
-  title("Animated Wave Demonstration")
-  iconname("aniwave")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($aniwave_demo).pack(:fill=>:both, :expand=>true)
-
-# create label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text 'This demonstration contains a canvas widget with a line item inside it. The animation routines work by adjusting the coordinates list of the line.'
-}
-msg.pack('side'=>'top')
-
-# create frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $aniwave_demo
-      $aniwave_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'See Code'
-    command proc{showCode 'aniwave'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# animated wave
-class AnimatedWaveDemo
-  def initialize(frame, dir=:left)
-    @direction = dir
-
-    # create canvas widget
-    @c = TkCanvas.new(frame, :width=>300, :height=>200,
-                      :background=>'black')
-    @c.pack(:padx=>10, :pady=>10, :expand=>true)
-
-    # Creates a coordinates list of a wave.
-    @waveCoords = []
-    @backupCoords = []
-    n = 0
-    (-10..300).step(5){|n| @waveCoords << [n, 100]; @backupCoords << [n, 100] }
-    n = 305
-    @waveCoords << [n, 0]; @backupCoords << [n, 0]
-    @waveCoords << [n+5, 200]; @backupCoords << [n+5, 200]
-    @coordsLen = @waveCoords.length
-
-    # Create a smoothed line and arrange for its coordinates to be the
-    # contents of the variable waveCoords.
-    @line = TkcLine.new(@c, @waveCoords,
-                        :width=>1, :fill=>'green', :smooth=>true)
-
-    # Main animation "loop".
-    # Theoretically 100 frames-per-second (==10ms between frames)
-    @timer = TkTimer.new(10){ basicMotion; reverser }
-
-    # Arrange for the animation loop to stop when the canvas is deleted
-    @c.bindtags_unshift(TkBindTag.new('Destroy'){ @timer.stop })
-  end
-
-  # Basic motion handler. Given what direction the wave is travelling
-  # in, it advances the y coordinates in the coordinate-list one step in
-  # that direction.
-  def basicMotion
-    @backupCoords, @waveCoords = @waveCoords, @backupCoords
-    (0...@coordsLen).each{|idx|
-      if @direction == :left
-        @waveCoords[idx][1] = @backupCoords[(idx+1 == @coordsLen)? 0: idx+1][1]
-      else
-        @waveCoords[idx][1] = @backupCoords[(idx == 0)? -1: idx-1][1]
-      end
-    }
-    @line.coords(@waveCoords)
-  end
-
-  # Oscillation handler. This detects whether to reverse the direction
-  # of the wave by checking to see if the peak of the wave has moved off
-  # the screen (whose size we know already.)
-  def reverser
-    if @waveCoords[0][1] < 10
-      @direction = :right
-    elsif @waveCoords[-1][1] < 10
-      @direction = :left
-    end
-  end
-
-  # animation control
-  def move
-    @timer.start
-  end
-
-  def stop
-    @timer.stop
-  end
-end
-
-# Start the animation processing
-AnimatedWaveDemo.new(base_frame, :left).move
diff --git a/ext/tk/sample/demos-en/arrow.rb b/ext/tk/sample/demos-en/arrow.rb
deleted file mode 100644
index 46229668c2..0000000000
--- a/ext/tk/sample/demos-en/arrow.rb
+++ /dev/null
@@ -1,250 +0,0 @@
-# frozen_string_literal: false
-# arrow.rb
-#
-# This demonstration script creates a canvas widget that displays a
-# large line with an arrowhead whose shape can be edited interactively.
-#
-# arrowhead widget demo (called by 'widget')
-#
-
-# arrowSetup --
-# This method regenerates all the text and graphics in the canvas
-# window.  It's called when the canvas is initially created, and also
-# whenever any of the parameters of the arrow head are changed
-# interactively.
-#
-# Arguments:
-# c -           Name of the canvas widget.
-
-def arrowSetup(c)
-  v = $demo_arrowInfo
-
-  # Remember the current box, if there is one.
-  tags = c.gettags('current')
-  if tags != []
-    cur = tags.find{|t| t.kind_of?(String) && t =~ /^box[1-3]$/ }
-  else
-    cur = nil
-  end
-
-  # Create the arrow and outline.
-  c.delete('all')
-  TkcLine.new(c, v.x1, v.y, v.x2, v.y,
-              { 'width'=>10 * v.width,
-                'arrowshape'=>[10*v.a, 10*v.b, 10*v.c],
-                'arrow'=>'last'
-              }.update(v.bigLineStyle) )
-  xtip = v.x2 - 10*v.b
-  deltaY = 10*v.c + 5*v.width
-  TkcLine.new(c, v.x2, v.y, xtip, v.y + deltaY,
-              v.x2 - 10*v.a, v.y, xtip, v.y - deltaY, v.x2, v.y,
-              'width'=>2, 'capstyle'=>'round', 'joinstyle'=>'round')
-
-  # Create the boxes for reshaping the line and arrowhead.
-  TkcRectangle.new(c, v.x2-10*v.a-5, v.y-5, v.x2-10*v.a+5, v.y+5,
-                   {'tags'=>['box1', $arrowTag_box]}.update(v.boxStyle) )
-  TkcRectangle.new(c, xtip-5, v.y-deltaY-5, xtip+5, v.y-deltaY+5,
-                   {'tags'=>['box2', $arrowTag_box]}.update(v.boxStyle) )
-  TkcRectangle.new(c, v.x1-5, v.y-5*v.width-5, v.x1+5, v.y-5*v.width+5,
-                   {'tags'=>['box3', $arrowTag_box]}.update(v.boxStyle) )
-  c.itemconfigure cur, v.activeStyle if cur
-
-  # Create three arrows in actual size with the same parameters
-  TkcLine.new(c, v.x2+50, 0, v.x2+50, 1000, 'width'=>2)
-  tmp = v.x2+100
-  TkcLine.new(c, tmp, v.y-125, tmp, v.y-75, 'width'=>v.width,
-              'arrow'=>'both', 'arrowshape'=>[v.a, v.b, v.c])
-  TkcLine.new(c, tmp-25, v.y, tmp+25, v.y, 'width'=>v.width,
-              'arrow'=>'both', 'arrowshape'=>[v.a, v.b, v.c])
-  TkcLine.new(c, tmp-25, v.y+75, tmp+25, v.y+125, 'width'=>v.width,
-              'arrow'=>'both', 'arrowshape'=>[v.a, v.b, v.c])
-
-  # Create a bunch of other arrows and text items showing the
-  # current dimensions.
-  tmp = v.x2+10
-  TkcLine.new(c, tmp, v.y-5*v.width, tmp, v.y-deltaY,
-              'arrow'=>'both', 'arrowshape'=>v.smallTips)
-  TkcText.new(c, v.x2+15, v.y-deltaY+5*v.c, 'text'=>v.c, 'anchor'=>'w')
-  tmp = v.x1-10
-  TkcLine.new(c, tmp, v.y-5*v.width, tmp, v.y+5*v.width,
-              'arrow'=>'both', 'arrowshape'=>v.smallTips)
-  TkcText.new(c, v.x1-15, v.y, 'text'=>v.width, 'anchor'=>'e')
-  tmp = v.y+5*v.width+10*v.c+10
-  TkcLine.new(c, v.x2-10*v.a, tmp, v.x2, tmp,
-              'arrow'=>'both', 'arrowshape'=>v.smallTips)
-  TkcText.new(c, v.x2-5*v.a, tmp+5, 'text'=>v.a, 'anchor'=>'n')
-  tmp = tmp+25
-  TkcLine.new(c, v.x2-10*v.b, tmp, v.x2, tmp,
-              'arrow'=>'both', 'arrowshape'=>v.smallTips)
-  TkcText.new(c, v.x2-5*v.b, tmp+5, 'text'=>v.b, 'anchor'=>'n')
-
-  if $tk_version =~ /^4.*/
-    TkcText.new(c, v.x1, 310, 'text'=>"'width'=>#{v.width}", 'anchor'=>'w',
-                'font'=>'-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*')
-    TkcText.new(c, v.x1, 330,
-                'text'=>"'arrowshape'=>[#{v.a}, #{v.b}, #{v.c}]",'anchor'=>'w',
-                'font'=>'-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*')
-  else
-    TkcText.new(c, v.x1, 310, 'text'=>"'width'=>#{v.width}", 'anchor'=>'w',
-                'font'=>'Helvetica 18')
-    TkcText.new(c, v.x1, 330,
-                'text'=>"'arrowshape'=>[#{v.a}, #{v.b}, #{v.c}]",
-                'anchor'=>'w', 'font'=>'Helvetica 18')
-  end
-
-  v.count += 1
-end
-
-# toplevel widget
-if defined?($arrow_demo) && $arrow_demo
-  $arrow_demo.destroy
-  $arrow_demo = nil
-end
-
-# demo toplevel widget
-$arrow_demo = TkToplevel.new {|w|
-  title("Arrowhead Editor Demonstration")
-  iconname("arrow")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($arrow_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left',
-            'text'=>"This widget allows you to experiment with different widths and arrowhead shapes for lines in canvases.  To change the line width or the shape of the arrowhead, drag any of the three boxes attached to the oversized arrow.  The arrows on the right give examples at normal scale.  The text at the bottom shows the configuration options as you'd enter them for a canvas line item."){
-  pack('side'=>'top')
-}
-
-# frame
-$arrow_buttons = TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $arrow_demo
-      $arrow_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'arrow'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$arrow_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# canvas
-$arrow_canvas = TkCanvas.new(base_frame, 'width'=>500, 'height'=>350,
-                             'relief'=>'sunken', 'borderwidth'=>2)
-$arrow_canvas.pack('expand'=>'yes', 'fill'=>'both')
-
-#
-unless Struct.const_defined?("ArrowInfo")
-  $demo_arrowInfo = Struct.new("ArrowInfo", :a, :b, :c, :width, :motionProc,
-                               :x1, :x2, :y, :smallTips, :count,
-                               :bigLineStyle, :boxStyle, :activeStyle).new
-end
-$demo_arrowInfo.a = 8
-$demo_arrowInfo.b = 10
-$demo_arrowInfo.c = 3
-$demo_arrowInfo.width = 2
-$demo_arrowInfo.motionProc = proc{}
-$demo_arrowInfo.x1 = 40
-$demo_arrowInfo.x2 = 350
-$demo_arrowInfo.y = 150
-$demo_arrowInfo.smallTips = [5, 5, 2]
-$demo_arrowInfo.count = 0
-if TkWinfo.depth($arrow_canvas) > 1
-  $demo_arrowInfo.bigLineStyle = {'fill'=>'SkyBlue1'}
-  $demo_arrowInfo.boxStyle = {'fill'=>'', 'outline'=>'black', 'width'=>1}
-  $demo_arrowInfo.activeStyle = {'fill'=>'red', 'outline'=>'black', 'width'=>1}
-else
-  $demo_arrowInfo.bigLineStyle = {'fill'=>'black',
-    'stipple'=>'@'+[$demo_dir,'..','images','grey.25'].join(File::Separator)}
-  $demo_arrowInfo.boxStyle = {'fill'=>'', 'outline'=>'black', 'width'=>1}
-  $demo_arrowInfo.activeStyle = {'fill'=>'black','outline'=>'black','width'=>1}
-end
-$arrowTag_box = TkcTag.new($arrow_canvas)
-arrowSetup $arrow_canvas
-$arrowTag_box.bind('Enter', proc{$arrow_canvas.itemconfigure('current', $demo_arrowInfo.activeStyle)})
-$arrowTag_box.bind('Leave', proc{$arrow_canvas.itemconfigure('current', $demo_arrowInfo.boxStyle)})
-$arrowTag_box.bind('B1-Enter', proc{})
-$arrowTag_box.bind('B1-Leave', proc{})
-$arrow_canvas.itembind('box1', '1',
-                       proc{$demo_arrowInfo.motionProc \
-                         = proc{|x,y| arrowMove1 $arrow_canvas, x, y}})
-$arrow_canvas.itembind('box2', '1',
-                       proc{$demo_arrowInfo.motionProc \
-                         = proc{|x,y| arrowMove2 $arrow_canvas, x, y}})
-$arrow_canvas.itembind('box3', '1',
-                       proc{$demo_arrowInfo.motionProc \
-                         = proc{|x,y| arrowMove3 $arrow_canvas, x, y}})
-$arrowTag_box.bind('B1-Motion',
-                  proc{|x,y| $demo_arrowInfo.motionProc.call(x,y)}, "%x %y")
-$arrow_canvas.bind('Any-ButtonRelease-1', proc{arrowSetup $arrow_canvas})
-
-# arrowMove1 --
-# This method is called for each mouse motion event on box1 (the
-# one at the vertex of the arrow).  It updates the controlling parameters
-# for the line and arrowhead.
-#
-# Arguments:
-# c -           The name of the canvas window.
-# x, y -        The coordinates of the mouse.
-
-def arrowMove1(c,x,y)
-  v = $demo_arrowInfo
-  newA = (v.x2+5-c.canvasx(x).round)/10
-  newA = 0 if newA < 0
-  newA = 25 if newA > 25
-  if newA != v.a
-    c.move('box1', 10*(v.a-newA), 0)
-    v.a = newA
-  end
-end
-
-# arrowMove2 --
-# This method is called for each mouse motion event on box2 (the
-# one at the trailing tip of the arrowhead).  It updates the controlling
-# parameters for the line and arrowhead.
-#
-# Arguments:
-# c -           The name of the canvas window.
-# x, y -        The coordinates of the mouse.
-
-def arrowMove2(c,x,y)
-  v = $demo_arrowInfo
-  newB = (v.x2+5-c.canvasx(x).round)/10
-  newB = 0 if newB < 0
-  newB = 25 if newB > 25
-  newC = (v.y+5-c.canvasy(y).round-5*v.width)/10
-  newC = 0 if newC < 0
-  newC = 20 if newC > 20
-  if newB != v.b || newC != v.c
-    c.move('box2', 10*(v.b-newB), 10*(v.c-newC))
-    v.b = newB
-    v.c = newC
-  end
-end
-
-# arrowMove3 --
-# This method is called for each mouse motion event on box3 (the
-# one that controls the thickness of the line).  It updates the
-# controlling parameters for the line and arrowhead.
-#
-# Arguments:
-# c -           The name of the canvas window.
-# x, y -        The coordinates of the mouse.
-
-def arrowMove3(c,x,y)
-  v = $demo_arrowInfo
-  newWidth = (v.y+2-c.canvasy(y).round)/5
-  newWidth = 0 if newWidth < 0
-  newWidth = 20 if newWidth > 20
-  if newWidth != v.width
-    c.move('box3', 0, 5*(v.width-newWidth))
-    v.width = newWidth
-  end
-end
-
diff --git a/ext/tk/sample/demos-en/bind.rb b/ext/tk/sample/demos-en/bind.rb
deleted file mode 100644
index 38f2b46eaf..0000000000
--- a/ext/tk/sample/demos-en/bind.rb
+++ /dev/null
@@ -1,128 +0,0 @@
-# frozen_string_literal: false
-# bind.rb
-#
-# This demonstration script creates a text widget with bindings set
-# up for hypertext-like effects.
-#
-# text (tag bindings) widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($bind_demo) && $bind_demo
-  $bind_demo.destroy
-  $bind_demo = nil
-end
-
-# demo toplevel widget
-$bind_demo = TkToplevel.new {|w|
-  title("Text Demonstration - Tag Bindings")
-  iconname("bind")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($bind_demo).pack(:fill=>:both, :expand=>true)
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $bind_demo
-      $bind_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'bind'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# bind
-def tag_binding_for_bind_demo(tag, enter_style, leave_style)
-  tag.bind('Any-Enter', proc{tag.configure enter_style})
-  tag.bind('Any-Leave', proc{tag.configure leave_style})
-end
-
-# text
-txt = TkText.new(base_frame){|t|
-  #
-  setgrid 'true'
-  #width  60
-  #height 24
-  font $font
-  wrap 'word'
-  TkScrollbar.new(base_frame) {|s|
-    pack('side'=>'right', 'fill'=>'y')
-    command proc{|*args| t.yview(*args)}
-    t.yscrollcommand proc{|first,last| s.set first,last}
-  }
-  pack('expand'=>'yes', 'fill'=>'both')
-
-  #
-  if TkWinfo.depth($root).to_i > 1
-    tagstyle_bold = {'background'=>'#43ce80', 'relief'=>'raised',
-                     'borderwidth'=>1}
-    tagstyle_normal = {'background'=>'', 'relief'=>'flat'}
-  else
-    tagstyle_bold = {'foreground'=>'white', 'background'=>'black'}
-    tagstyle_normal = {'foreground'=>'', 'background'=>''}
-  end
-
-  # insert text
-  insert 'insert', "The same tag mechanism that controls display styles in text widgets can also be used to associate Tcl commands with regions of text, so that mouse or keyboard actions on the text cause particular Tcl commands to be invoked.  For example, in the text below the descriptions of the canvas demonstrations have been tagged.  When you move the mouse over a demo description the description lights up, and when you press button 1 over a description then that particular demonstration is invoked.
-
-"
-  insert('end', '1. Samples of all the different types of items that can be created in canvas widgets.', (d1 = TkTextTag.new(t)) )
-  insert('end', "\n\n")
-  insert('end', '2. A simple two-dimensional plot that allows you to adjust the positions of the data points.', (d2 = TkTextTag.new(t)) )
-  insert('end', "\n\n")
-  insert('end', '3. Anchoring and justification modes for text items.',
-         (d3 = TkTextTag.new(t)) )
-  insert('end', "\n\n")
-  insert('end', '4. An editor for arrow-head shapes for line items.',
-         (d4 = TkTextTag.new(t)) )
-  insert('end', "\n\n")
-  insert('end', '5. A ruler with facilities for editing tab stops.',
-         (d5 = TkTextTag.new(t)) )
-  insert('end', "\n\n")
-  insert('end',
-         '6. A grid that demonstrates how canvases can be scrolled.',
-         (d6 = TkTextTag.new(t)) )
-
-  # binding
-  [d1, d2, d3, d4, d5, d6].each{|tag|
-    tag_binding_for_bind_demo(tag, tagstyle_bold, tagstyle_normal)
-  }
-  d1.bind('1',
-          proc{
-            eval_samplecode(`cat #{[$demo_dir,'items.rb'].join(File::Separator)}`, 'items.rb')
-          })
-  d2.bind('1',
-          proc{
-            eval_samplecode(`cat #{[$demo_dir,'plot.rb'].join(File::Separator)}`, 'plot.rb')
-          })
-  d3.bind('1',
-          proc{
-            eval_samplecode(`cat #{[$demo_dir,'ctext.rb'].join(File::Separator)}`, 'ctext.rb')
-          })
-  d4.bind('1',
-          proc{
-            eval_samplecode(`cat #{[$demo_dir,'arrow.rb'].join(File::Separator)}`, 'arrow.rb')
-          })
-  d5.bind('1',
-          proc{
-            eval_samplecode(`cat #{[$demo_dir,'ruler.rb'].join(File::Separator)}`, 'ruler.rb')
-          })
-  d6.bind('1',
-          proc{
-            eval_samplecode(`cat #{[$demo_dir,'cscroll.rb'].join(File::Separator)}`, 'cscroll.rb')
-          })
-
-  TkTextMarkInsert.new(t, '0.0')
-  configure('state','disabled')
-}
-
-txt.width  60
-txt.height 24
diff --git a/ext/tk/sample/demos-en/bitmap.rb b/ext/tk/sample/demos-en/bitmap.rb
deleted file mode 100644
index bb7a13d7b6..0000000000
--- a/ext/tk/sample/demos-en/bitmap.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-# frozen_string_literal: false
-# bitmap.rb
-#
-# This demonstration script creates a toplevel window that displays
-# all of Tk's built-in bitmaps.#
-# bitmap widget demo (called by 'widget')
-#
-
-# bitmapRow --
-# Create a row of bitmap items in a window.
-#
-# Arguments:
-# w -           The parent window that is to contain the row.
-# args -        The names of one or more bitmaps, which will be displayed
-#               in a new row across the bottom of w along with their
-#               names.
-
-def bitmapRow(w,*args)
-  TkFrame.new(w){|row|
-    pack('side'=>'top', 'fill'=>'both')
-    for bitmap in args
-      TkFrame.new(row){|base|
-        pack('side'=>'left', 'fill'=>'both', 'pady'=>'.25c', 'padx'=>'.25c')
-        TkLabel.new(base, 'text'=>bitmap, 'width'=>9).pack('side'=>'bottom')
-        Tk::Label.new(base, 'bitmap'=>bitmap).pack('side'=>'bottom')
-      }
-    end
-  }
-end
-
-# toplevel widget
-if defined?($bitmap_demo) && $bitmap_demo
-  $bitmap_demo.destroy
-  $bitmap_demo = nil
-end
-
-# demo toplevel widget
-$bitmap_demo = TkToplevel.new {|w|
-  title("Bitmap Demonstration")
-  iconname("bitmap")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($bitmap_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
-            'text'=>"This window displays all of Tk's built-in bitmaps, along with the names you can use for them in Tcl scripts."){
-  pack('side'=>'top')
-}
-
-# frame
-$bitmap_buttons = TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $bitmap_demo
-      $bitmap_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'bitmap'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$bitmap_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-TkFrame.new(base_frame){|f|
-  bitmapRow(f,'error','gray25','gray50','hourglass')
-  bitmapRow(f,'info','question','questhead','warning')
-  pack('side'=>'top', 'expand'=>'yes', 'fill'=>'both')
-}
-
diff --git a/ext/tk/sample/demos-en/browse1 b/ext/tk/sample/demos-en/browse1
deleted file mode 100644
index 568892e4a8..0000000000
--- a/ext/tk/sample/demos-en/browse1
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/env ruby
-
-# browse --
-# This script generates a directory browser, which lists the working
-# directory and allow you to open files or subdirectories by
-# double-clicking.
-
-require 'tk'
-
-# Create a scrollbar on the right side of the main window and a listbox
-# on the left side.
-
-listbox = TkListbox.new(nil, 'relief'=>'sunken',
-			'width'=>20, 'height'=>20, 'setgrid'=>'yes') {|l|
-  TkScrollbar.new(nil, 'command'=>proc{|*args| l.yview *args}) {|s|
-    pack('side'=>'right', 'fill'=>'y')
-    l.yscrollcommand(proc{|first,last| s.set(first,last)})
-  }
-
-  pack('side'=>'left', 'fill'=>'both', 'expand'=>'yes')
-}
-
-root = TkRoot.new
-root.minsize(1,1)
-
-# The procedure below is invoked to open a browser on a given file;  if the
-# file is a directory then another instance of this program is invoked; if
-# the file is a regular file then the Mx editor is invoked to display
-# the file.
-
-def browse (dir, file)
-  file = dir + File::Separator + file if dir != '.'
-  type = File.ftype(file)
-  if type == 'directory'
-    system($0 + ' ' + file + ' &')
-  else
-    if type == 'file'
-      if ENV['EDITOR']
-	system(ENV['EDITOR'] + ' ' + file + ' &')
-      else
-	system('xedit ' + file + ' &')
-      end
-    else
-      STDOUT.print "\"#{file}\" isn't a directory or regular file"
-    end
-  end
-end
-
-# Fill the listbox with a list of all the files in the directory (run
-# the "ls" command to get that information).
-
-dir = ARGV[0] ?  ARGV[0] : '.'
-open("|ls -a #{dir}", 'r'){|fid| fid.readlines}.each{|fname|
-  listbox.insert('end', fname.chomp)
-}
-
-# Set up bindings for the browser.
-
-Tk.bind_all('Control-c', proc{root.destroy})
-listbox.bind('Double-Button-1',
-	     proc{TkSelection.get.each{|f| browse dir, f}})
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-en/browse2 b/ext/tk/sample/demos-en/browse2
deleted file mode 100644
index 1a511c8d29..0000000000
--- a/ext/tk/sample/demos-en/browse2
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/usr/bin/env ruby
-
-# browse --
-# This script generates a directory browser, which lists the working
-# directory and allow you to open files or subdirectories by
-# double-clicking.
-
-require 'tk'
-
-class Browse
-  BROWSE_WIN_COUNTER = TkVariable.new(0)
-
-  def initialize(dir)
-    BROWSE_WIN_COUNTER.value = BROWSE_WIN_COUNTER.to_i + 1
-
-    # create base frame
-    base = TkToplevel.new {
-      minsize(1,1)
-      title('Browse : ' + dir)
-    }
-
-    # Create a scrollbar on the right side of the main window and a listbox
-    # on the left side.
-    list = TkListbox.new(base, 'relief'=>'sunken',
-			 'width'=>20, 'height'=>20, 'setgrid'=>'yes') {|l|
-      TkScrollbar.new(base, 'command'=>proc{|*args| l.yview *args}) {|s|
-	pack('side'=>'right', 'fill'=>'y')
-	l.yscrollcommand(proc{|first,last| s.set(first,last)})
-      }
-
-      pack('side'=>'left', 'fill'=>'both', 'expand'=>'yes')
-
-      # Fill the listbox with a list of all the files in the directory (run
-      # the "ls" command to get that information).
-      open("|ls -a #{dir}", 'r'){|fid| fid.readlines}.each{|fname|
-	l.insert('end', fname.chomp)
-      }
-
-    }
-
-    # Set up bindings for the browser.
-    base.bind('Destroy', proc{
-		Browse::BROWSE_WIN_COUNTER.value = \
-		                Browse::BROWSE_WIN_COUNTER.to_i - 1
-	      })
-    base.bind('Control-c', proc{base.destroy})
-    list.bind('Double-Button-1',
-	 proc{TkSelection.get.each{|f| self.browse dir, f}})
-  end
-
-  # The method below is invoked to open a browser on a given file;  if the
-  # file is a directory then another instance of this program is invoked; if
-  # the file is a regular file then the Mx editor is invoked to display
-  # the file.
-  def browse (dir, file)
-    file = dir + File::Separator + file if dir != '.'
-    type = File.ftype(file)
-    if type == 'directory'
-      Browse.new(file)
-    else
-      if type == 'file'
-	if ENV['EDITOR']
-	  system(ENV['EDITOR'] + ' ' + file + ' &')
-	else
-	  system('xedit ' + file + ' &')
-	end
-      else
-	STDOUT.print "\"#{file}\" isn't a directory or regular file"
-      end
-    end
-  end
-
-end
-
-Browse.new(ARGV[0] ? ARGV[0] : '.')
-
-TkRoot.new {
-  withdraw
-  Browse::BROWSE_WIN_COUNTER.trace('w', proc{exit if Browse::BROWSE_WIN_COUNTER.to_i == 0})
-}
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-en/button.rb b/ext/tk/sample/demos-en/button.rb
deleted file mode 100644
index 00331002d2..0000000000
--- a/ext/tk/sample/demos-en/button.rb
+++ /dev/null
@@ -1,85 +0,0 @@
-# frozen_string_literal: false
-# button.rb
-#
-# This demonstration script creates a toplevel window containing
-# several button widgets.
-#
-# button widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($button_demo) && $button_demo
-  $button_demo.destroy
-  $button_demo = nil
-end
-
-# demo toplevel widget
-$button_demo = TkToplevel.new {|w|
-  title("Button Demonstration")
-  iconname("button")
-  positionWindow(w)
-}
-
-# label
-msg = TkLabel.new($button_demo) {
-  font $kanji_font
-  wraplength '4i'
-  justify 'left'
-  text "If you click on any of the four buttons below, the background of the button area will change to the color indicated in the button.  You can press Tab to move among the buttons, then press Space to invoke the current button."
-}
-msg.pack('side'=>'top')
-
-# frame
-$button_buttons = Tk::Frame.new($button_demo) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $button_demo
-      $button_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'See Code'
-    command proc{showCode 'button'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# button
-TkButton.new($button_demo){
-  text "Peach Puff"
-  width 10
-  command proc{
-    $button_demo.configure('bg','PeachPuff1')
-    $button_buttons.configure('bg','PeachPuff1')
-  }
-}.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2)
-
-TkButton.new($button_demo){
-  text "Light Blue"
-  width 10
-  command proc{
-    $button_demo.configure('bg','LightBlue1')
-    $button_buttons.configure('bg','LightBlue1')
-  }
-}.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2)
-
-TkButton.new($button_demo){
-  text "Sea Green"
-  width 10
-  command proc{
-    $button_demo.configure('bg','SeaGreen2')
-    $button_buttons.configure('bg','SeaGreen2')
-  }
-}.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2)
-
-TkButton.new($button_demo){
-  text "Yellow"
-  width 10
-  command proc{
-    $button_demo.configure('bg','Yellow1')
-    $button_buttons.configure('bg','Yellow1')
-  }
-}.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2)
diff --git a/ext/tk/sample/demos-en/check.rb b/ext/tk/sample/demos-en/check.rb
deleted file mode 100644
index 3f3b07bd0a..0000000000
--- a/ext/tk/sample/demos-en/check.rb
+++ /dev/null
@@ -1,73 +0,0 @@
-# frozen_string_literal: false
-# check.rb
-#
-# This demonstration script creates a toplevel window containing
-# several checkbuttons.
-#
-# checkbutton widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($check_demo) && $check_demo
-  $check_demo.destroy
-  $check_demo = nil
-end
-
-# demo toplevel widget
-$check_demo = TkToplevel.new {|w|
-  title("Checkbutton Demonstration")
-  iconname("check")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($check_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "Three checkbuttons are displayed below.  If you click on a button, it will toggle the button's selection state and set a Tcl variable to a value indicating the state of the checkbutton.  Click the \"See Variables\" button to see the current values of the variables."
-}
-msg.pack('side'=>'top')
-
-#
-wipers = TkVariable.new(0)
-brakes = TkVariable.new(0)
-sober  = TkVariable.new(0)
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $check_demo
-      $check_demo = nil
-      $showVarsWin[tmppath.path] = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'check'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-
-  TkButton.new(frame) {
-    text 'See Variables'
-    command proc{
-      showVars(base_frame,
-               ['wipers', wipers], ['brakes', brakes], ['sober', sober])
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-
-# checkbutton
-[ TkCheckButton.new(base_frame, 'text'=>'Wipers  OK', 'variable'=>wipers),
-  TkCheckButton.new(base_frame, 'text'=>'Brakes  OK', 'variable'=>brakes),
-  TkCheckButton.new(base_frame, 'text'=>'Driver Sober', 'variable'=>sober)
-].each{|w| w.relief('flat'); w.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w')}
-
diff --git a/ext/tk/sample/demos-en/check2.rb b/ext/tk/sample/demos-en/check2.rb
deleted file mode 100644
index d68b86438a..0000000000
--- a/ext/tk/sample/demos-en/check2.rb
+++ /dev/null
@@ -1,110 +0,0 @@
-# frozen_string_literal: false
-#
-# checkbutton widget demo2 (called by 'widget')
-#
-
-# delete old toplevel widget
-if defined?($check2_demo) && $check2_demo
-  $check2_demo.destroy
-  $check2_demo = nil
-end
-
-# create demo toplevel widget
-$check2_demo = TkToplevel.new {|w|
-  title("Checkbutton Demonstration 2")
-  iconname("check2")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($check2_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "Four checkbuttons are displayed below.  If you click on a button, it will toggle the button's selection state and set a Tcl variable to a value indicating the state of the checkbutton.  The first button also follows the state of the other three.  If only some of the three are checked, the first button will display the tri-state mode. Click the \"See Variables\" button to see the current values of the variables."
-}
-msg.pack('side'=>'top')
-
-# variable
-safety = TkVariable.new(0)
-wipers = TkVariable.new(0)
-brakes = TkVariable.new(0)
-sober  = TkVariable.new(0)
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2),
-         :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         TkButton.new(frame, :text=>'See Variables',
-                      :image=>$image['view'], :compound=>:left,
-                      :command=>proc{
-                        showVars($check2_demo,
-                                 ['safety', safety], ['wipers', wipers],
-                                 ['brakes', brakes], ['sober', sober])
-                      }),
-         TkButton.new(frame, :text=>'See Code',
-                      :image=>$image['view'], :compound=>:left,
-                      :command=>proc{showCode 'check2'}),
-         TkButton.new(frame, :text=>'Dismiss',
-                      :image=>$image['delete'], :compound=>:left,
-                      :command=>proc{
-                        tmppath = $check2_demo
-                        $check2_demo = nil
-                        $showVarsWin[tmppath.path] = nil
-                        tmppath.destroy
-                      }),
-         :padx=>4, :pady=>4)
-  frame.grid_columnconfigure(0, :weight=>1)
-}.pack('side'=>'bottom', 'fill'=>'x')
-
-
-# checkbutton
-TkCheckButton.new(base_frame, :text=>'Safety Check', :variable=>safety,
-                  :relief=>:flat, :onvalue=>'all', :offvalue=>'none',
-                  :tristatevalue=>'partial'){
-  pack('side'=>'top', 'pady'=>2, 'anchor'=>'w')
-}
-
-[ TkCheckButton.new(base_frame, 'text'=>'Wipers OK', 'variable'=>wipers),
-  TkCheckButton.new(base_frame, 'text'=>'Brakes OK', 'variable'=>brakes),
-  TkCheckButton.new(base_frame, 'text'=>'Driver Sober', 'variable'=>sober)
-].each{|w|
-  w.relief('flat')
-  w.pack('side'=>'top', 'padx'=>15, 'pady'=>2, 'anchor'=>'w')
-}
-
-# tristate check
-in_check = false
-tristate_check = proc{|n1,n2,op|
-  unless in_check
-    in_check = true
-    begin
-      if n1 == safety
-        if safety == 'none'
-          wipers.value = 0
-          brakes.value = 0
-          sober.value  = 0
-        elsif safety == 'all'
-          wipers.value = 1
-          brakes.value = 1
-          sober.value  = 1
-        end
-      else
-        if wipers == 1 && brakes == 1 && sober == 1
-          safety.value = 'all'
-        elsif wipers == 1 || brakes == 1 || sober == 1
-          safety.value = 'partial'
-        else
-          safety.value = 'none'
-        end
-      end
-    ensure
-      in_check = false
-    end
-  end
-}
-
-[wipers, brakes, sober, safety].each{|v| v.trace('w', tristate_check)}
diff --git a/ext/tk/sample/demos-en/clrpick.rb b/ext/tk/sample/demos-en/clrpick.rb
deleted file mode 100644
index 081d11be4f..0000000000
--- a/ext/tk/sample/demos-en/clrpick.rb
+++ /dev/null
@@ -1,88 +0,0 @@
-# frozen_string_literal: false
-# clrpick.rb
-#
-# This demonstration script prompts the user to select a color.
-#
-# widget demo prompts the user to select a color (called by 'widget')
-#
-#  Note: don't support ttk_wrapper. work with standard widgets only.
-#
-
-# toplevel widget
-if defined?($clrpick_demo) && $clrpick_demo
-  $clrpick_demo.destroy
-  $clrpick_demo = nil
-end
-
-# demo toplevel widget
-$clrpick_demo = TkToplevel.new {|w|
-  title("Color Selection Dialogs")
-  iconname("colors")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($clrpick_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-#TkLabel.new($clrpick_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
-Tk::Label.new($clrpick_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
-            'text'=>"Press the buttons below to choose the foreground and background colors for the widgets in this window.").pack('side'=>'top')
-
-# frame
-#TkFrame.new($clrpick_demo) {|frame|
-Tk::Frame.new($clrpick_demo) {|frame|
-  # TkButton.new(frame) {
-  Tk::Button.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $clrpick_demo
-      $clrpick_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  # TkButton.new(frame) {
-  Tk::Button.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'clrpick'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# button
-# TkButton.new($clrpick_demo, 'text'=>'Set background color ...') {|b|
-Tk::Button.new($clrpick_demo, 'text'=>'Set background color ...') {|b|
-  command(proc{setColor $clrpick_demo, b, 'background',
-              ['background', 'highlightbackground']})
-  pack('side'=>'top', 'anchor'=>'c', 'pady'=>'2m')
-}
-
-# TkButton.new($clrpick_demo, 'text'=>'Set foreground color ...') {|b|
-Tk::Button.new($clrpick_demo, 'text'=>'Set foreground color ...') {|b|
-  command(proc{setColor $clrpick_demo, b, 'foreground', ['foreground']})
-  pack('side'=>'top', 'anchor'=>'c', 'pady'=>'2m')
-}
-
-def setColor(w,button,name,options)
-  w.grab
-  initialColor = button[name]
-  color = Tk.chooseColor('title'=>"Choose a #{name} color", 'parent'=>w,
-                         'initialcolor'=>initialColor)
-  if color != ""
-    setColor_helper(w,options,color)
-  end
-
-  w.grab('release')
-end
-
-def setColor_helper(w, options, color)
-  options.each{|opt|
-    begin
-      w[opt] = color
-    rescue
-    end
-  }
-  TkWinfo.children(w).each{|child|
-    setColor_helper child, options, color
-  }
-end
-
diff --git a/ext/tk/sample/demos-en/colors.rb b/ext/tk/sample/demos-en/colors.rb
deleted file mode 100644
index dca147b51e..0000000000
--- a/ext/tk/sample/demos-en/colors.rb
+++ /dev/null
@@ -1,159 +0,0 @@
-# frozen_string_literal: false
-# colors.rb
-#
-# This demonstration script creates a listbox widget that displays
-# many of the colors from the X color database.  You can click on
-# a color to change the application's palette.
-#
-# listbox widget demo 'colors' (called by 'widget')
-#
-
-# toplevel widget
-if defined?($colors_demo) && $colors_demo
-  $colors_demo.destroy
-  $colors_demo = nil
-end
-
-# demo toplevel widget
-$colors_demo = TkToplevel.new {|w|
-  title("Listbox Demonstration (colors)")
-  iconname("colors")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($colors_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "A listbox containing several color names is displayed below, along with a scrollbar.  You can scan the list either using the scrollbar or by dragging in the listbox window with button 2 pressed.  If you double-click button 1 on a color, then the application's color palette will be set to match that color"
-}
-msg.pack('side'=>'top')
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $colors_demo
-      $colors_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'colors'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-colors_lbox = nil
-TkFrame.new(base_frame, 'borderwidth'=>10) {|w|
-  s = TkScrollbar.new(w)
-  colors_lbox = TkListbox.new(w) {
-    setgrid 1
-    width  10
-    height 12
-    yscrollcommand proc{|first,last| s.set first,last}
-  }
-  s.command(proc{|*args| colors_lbox.yview(*args)})
-  s.pack('side'=>'right', 'fill'=>'y')
-  colors_lbox.pack('side'=>'left', 'expand'=>1, 'fill'=>'both')
-}.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'y')
-
-#colors_lbox.bind('Double-1', proc{TkPalette.setPalette TkSelection.get})
-colors_lbox.bind('Double-1', proc{
-                   begin
-                     TkPalette.setPalette TkSelection.get
-                   rescue => e
-                     p e
-                     Tk.tk_call_without_enc('destroy', '.___tk_set_palette')
-                   end
-                 })
-
-ins_data = [
-  'gray60','gray70','gray80','gray85','gray90','gray95',
-  'snow1','snow2','snow3','snow4','seashell1','seashell2',
-  'seashell3','seashell4','AntiqueWhite1','AntiqueWhite2',
-  'AntiqueWhite3','AntiqueWhite4','bisque1','bisque2',
-  'bisque3','bisque4','PeachPuff1','PeachPuff2',
-  'PeachPuff3','PeachPuff4','NavajoWhite1','NavajoWhite2',
-  'NavajoWhite3','NavajoWhite4','LemonChiffon1',
-  'LemonChiffon2','LemonChiffon3','LemonChiffon4',
-  'cornsilk1','cornsilk2','cornsilk3','cornsilk4',
-  'ivory1','ivory2','ivory3','ivory4','honeydew1',
-  'honeydew2','honeydew3','honeydew4','LavenderBlush1',
-  'LavenderBlush2','LavenderBlush3','LavenderBlush4',
-  'MistyRose1','MistyRose2','MistyRose3','MistyRose4',
-  'azure1','azure2','azure3','azure4','SlateBlue1',
-  'SlateBlue2','SlateBlue3','SlateBlue4','RoyalBlue1',
-  'RoyalBlue2','RoyalBlue3','RoyalBlue4','blue1','blue2',
-  'blue3','blue4','DodgerBlue1','DodgerBlue2',
-  'DodgerBlue3','DodgerBlue4','SteelBlue1','SteelBlue2',
-  'SteelBlue3','SteelBlue4','DeepSkyBlue1','DeepSkyBlue2',
-  'DeepSkyBlue3','DeepSkyBlue4','SkyBlue1','SkyBlue2',
-  'SkyBlue3','SkyBlue4','LightSkyBlue1','LightSkyBlue2',
-  'LightSkyBlue3','LightSkyBlue4','SlateGray1',
-  'SlateGray2','SlateGray3','SlateGray4',
-  'LightSteelBlue1','LightSteelBlue2','LightSteelBlue3',
-  'LightSteelBlue4','LightBlue1','LightBlue2',
-  'LightBlue3','LightBlue4','LightCyan1','LightCyan2',
-  'LightCyan3','LightCyan4','PaleTurquoise1',
-  'PaleTurquoise2','PaleTurquoise3','PaleTurquoise4',
-  'CadetBlue1','CadetBlue2','CadetBlue3','CadetBlue4',
-  'turquoise1','turquoise2','turquoise3','turquoise4',
-  'cyan1','cyan2','cyan3','cyan4','DarkSlateGray1',
-  'DarkSlateGray2','DarkSlateGray3','DarkSlateGray4',
-  'aquamarine1','aquamarine2','aquamarine3','aquamarine4',
-  'DarkSeaGreen1','DarkSeaGreen2','DarkSeaGreen3',
-  'DarkSeaGreen4','SeaGreen1','SeaGreen2','SeaGreen3',
-  'SeaGreen4','PaleGreen1','PaleGreen2','PaleGreen3',
-  'PaleGreen4','SpringGreen1','SpringGreen2',
-  'SpringGreen3','SpringGreen4','green1','green2',
-  'green3','green4','chartreuse1','chartreuse2',
-  'chartreuse3','chartreuse4','OliveDrab1','OliveDrab2',
-  'OliveDrab3','OliveDrab4','DarkOliveGreen1',
-  'DarkOliveGreen2','DarkOliveGreen3','DarkOliveGreen4',
-  'khaki1','khaki2','khaki3','khaki4','LightGoldenrod1',
-  'LightGoldenrod2','LightGoldenrod3','LightGoldenrod4',
-  'LightYellow1','LightYellow2','LightYellow3',
-  'LightYellow4','yellow1','yellow2','yellow3','yellow4',
-  'gold1','gold2','gold3','gold4','goldenrod1',
-  'goldenrod2','goldenrod3','goldenrod4','DarkGoldenrod1',
-  'DarkGoldenrod2','DarkGoldenrod3','DarkGoldenrod4',
-  'RosyBrown1','RosyBrown2','RosyBrown3','RosyBrown4',
-  'IndianRed1','IndianRed2','IndianRed3','IndianRed4',
-  'sienna1','sienna2','sienna3','sienna4','burlywood1',
-  'burlywood2','burlywood3','burlywood4','wheat1',
-  'wheat2','wheat3','wheat4','tan1','tan2','tan3','tan4',
-  'chocolate1','chocolate2','chocolate3','chocolate4',
-  'firebrick1','firebrick2','firebrick3','firebrick4',
-  'brown1','brown2','brown3','brown4','salmon1','salmon2',
-  'salmon3','salmon4','LightSalmon1','LightSalmon2',
-  'LightSalmon3','LightSalmon4','orange1','orange2',
-  'orange3','orange4','DarkOrange1','DarkOrange2',
-  'DarkOrange3','DarkOrange4','coral1','coral2','coral3',
-  'coral4','tomato1','tomato2','tomato3','tomato4',
-  'OrangeRed1','OrangeRed2','OrangeRed3','OrangeRed4',
-  'red1','red2','red3','red4','DeepPink1','DeepPink2',
-  'DeepPink3','DeepPink4','HotPink1','HotPink2',
-  'HotPink3','HotPink4','pink1','pink2','pink3','pink4',
-  'LightPink1','LightPink2','LightPink3','LightPink4',
-  'PaleVioletRed1','PaleVioletRed2','PaleVioletRed3',
-  'PaleVioletRed4','maroon1','maroon2','maroon3',
-  'maroon4','VioletRed1','VioletRed2','VioletRed3',
-  'VioletRed4','magenta1','magenta2','magenta3',
-  'magenta4','orchid1','orchid2','orchid3','orchid4',
-  'plum1','plum2','plum3','plum4','MediumOrchid1',
-  'MediumOrchid2','MediumOrchid3','MediumOrchid4',
-  'DarkOrchid1','DarkOrchid2','DarkOrchid3',
-  'DarkOrchid4','purple1','purple2','purple3','purple4',
-  'MediumPurple1','MediumPurple2','MediumPurple3',
-  'MediumPurple4','thistle1','thistle2','thistle3', 'thistle4'
-]
-
-colors_lbox.insert(0, *ins_data)
diff --git a/ext/tk/sample/demos-en/combo.rb b/ext/tk/sample/demos-en/combo.rb
deleted file mode 100644
index b8bf2d8803..0000000000
--- a/ext/tk/sample/demos-en/combo.rb
+++ /dev/null
@@ -1,97 +0,0 @@
-# frozen_string_literal: false
-# combo.rb --
-#
-# This demonstration script creates several combobox widgets.
-#
-# based on "Id: combo.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($combo_demo) && $combo_demo
-  $combo_demo.destroy
-  $combo_demo = nil
-end
-
-$combo_demo = TkToplevel.new {|w|
-  title("Combobox Demonstration")
-  iconname("combo")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($combo_demo).pack(:fill=>:both, :expand=>true)
-
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'5i', :justify=>:left,
-               :text=><<EOL).pack(:side=>:top, :fill=>:x)
-Three different combo-boxes are displayed below. \
-You can add characters to the first \
-one by pointing, clicking and typing, just as with an entry; pressing \
-Return will cause the current value to be added to the list that is \
-selectable from the drop-down list, and you can choose other values \
-by pressing the Down key, using the arrow keys to pick another one, \
-and pressing Return again. The second combo-box is fixed to a \
-particular value, and cannot be modified at all. The third one only \
-allows you to select values from its drop-down list of Australian \
-cities.
-EOL
-
-## variables
-firstValue  = TkVariable.new
-secondValue = TkVariable.new
-ozCity      = TkVariable.new
-
-## See Code / Dismiss buttons
-Ttk::Frame.new(base_frame) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         Ttk::Button.new(frame, :text=>'See Variables',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{
-                           showVars(base_frame,
-                                    ['firstVariable', firstValue],
-                                    ['secondVariable', secondValue],
-                                    ['ozCity', ozCity])
-                         }),
-         Ttk::Button.new(frame, :text=>'See Code',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{showCode 'combo'}),
-         Ttk::Button.new(frame, :text=>'Dismiss',
-                         :image=>$image['delete'], :compound=>:left,
-                         :command=>proc{
-                           $combo_demo.destroy
-                           $combo_demo = nil
-                         }),
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x)
-}
-
-frame = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
-
-australianCities = [
-  'Canberra', 'Sydney', 'Melbourne', 'Perth', 'Adelaide', 'Brisbane',
-  'Hobart', 'Darwin', 'Alice Springs'
-]
-
-
-secondValue.value = 'unchangeable'
-ozCity.value = 'Sydney'
-
-Tk.pack(Ttk::Labelframe.new(frame, :text=>'Fully Editable'){|f|
-          Ttk::Combobox.new(f, :textvariable=>firstValue){|b|
-            b.bind('Return', '%W'){|w|
-              w.values <<= w.value unless w.values.include?(w.value)
-            }
-          }.pack(:pady=>5, :padx=>10)
-        },
-
-        Ttk::LabelFrame.new(frame, :text=>'Disabled'){|f|
-          Ttk::Combobox.new(f, :textvariable=>secondValue, :state=>:disabled) .
-            pack(:pady=>5, :padx=>10)
-        },
-
-        Ttk::LabelFrame.new(frame, :text=>'Defined List Only'){|f|
-          Ttk::Combobox.new(f, :textvariable=>ozCity, :state=>:readonly,
-                            :values=>australianCities) .
-            pack(:pady=>5, :padx=>10)
-        },
-
-        :side=>:top, :pady=>5, :padx=>10)
diff --git a/ext/tk/sample/demos-en/cscroll.rb b/ext/tk/sample/demos-en/cscroll.rb
deleted file mode 100644
index eac615d035..0000000000
--- a/ext/tk/sample/demos-en/cscroll.rb
+++ /dev/null
@@ -1,137 +0,0 @@
-# frozen_string_literal: false
-# cscroll.rb
-#
-# This demonstration script creates a simple canvas that can be
-# scrolled in two dimensions.
-#
-# simple scrollable canvas widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($cscroll_demo) && $cscroll_demo
-  $cscroll_demo.destroy
-  $cscroll_demo = nil
-end
-
-# demo toplevel widget
-$cscroll_demo = TkToplevel.new {|w|
-  title("Scrollable Canvas Demonstration")
-  iconname("cscroll")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($cscroll_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'4i',
-            'justify'=>'left', 'text'=>"This window displays a canvas widget that can be scrolled either using the scrollbars or by dragging with button 2 in the canvas.  If you click button 1 on one of the rectangles, its indices will be printed on stdout."){
-  pack('side'=>'top')
-}
-
-# frame
-$cscroll_buttons = TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $cscroll_demo
-      $cscroll_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'cscroll'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$cscroll_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-unless $tk_version =~ /^4\.[01]/
-  $cscroll_grid = TkFrame.new(base_frame) {
-    pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>1)
-  }
-  TkGrid.rowconfigure($cscroll_grid, 0, 'weight'=>1, 'minsize'=>0)
-  TkGrid.columnconfigure($cscroll_grid, 0, 'weight'=>1, 'minsize'=>0)
-end
-
-# canvas
-$cscroll_canvas = TkCanvas.new(base_frame,
-                               'relief'=>'sunken', 'borderwidth'=>2,
-                               'scrollregion'=>['-11c', '-11c', '50c', '20c']
-                               ) {|c|
-  if $tk_version =~ /^4\.[01]/
-    pack('expand'=>'yes', 'fill'=>'both')
-  else
-    grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0,
-         'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-  end
-
-  TkScrollbar.new(base_frame, 'command'=>proc{|*args| c.yview(*args)}) {|vs|
-    c.yscrollcommand(proc{|first,last| vs.set first,last})
-    if $tk_version =~ /^4\.[01]/
-      pack('side'=>'right', 'fill'=>'y')
-    else
-      grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1,
-           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    end
-  }
-
-  TkScrollbar.new(base_frame, 'orient'=>'horiz',
-                  'command'=>proc{|*args| c.xview(*args)}) {|hs|
-    c.xscrollcommand(proc{|first,last| hs.set first,last})
-    if $tk_version =~ /^4\.[01]/
-      pack('side'=>'bottom', 'fill'=>'x')
-    else
-      grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0,
-           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    end
-  }
-}
-
-bg = $cscroll_canvas.configinfo('bg')[4]
-(0..19).each{|i|
-  x = -10+3*i
-  y = -10
-  (0..9).each{|j|
-    TkcRectangle.new($cscroll_canvas, "#{x}c", "#{y}c", "#{x+2}c", "#{y+2}c",
-                     'outline'=>'black', 'fill'=>bg, 'tags'=>'rect')
-    TkcText.new($cscroll_canvas, "#{x+1}c", "#{y+1}c",
-                'text'=>"#{i},#{j}", 'anchor'=>'center', 'tags'=>'text')
-    y += 3
-  }
-}
-
-$cscroll_canvas.itembind('all', 'Any-Enter', proc{scrollEnter $cscroll_canvas})
-$cscroll_canvas.itembind('all', 'Any-Leave', proc{scrollLeave $cscroll_canvas})
-$cscroll_canvas.itembind('all', '1', proc{scrollButton $cscroll_canvas})
-$cscroll_canvas.itembind('all', 'Any-Enter', proc{scrollEnter $cscroll_canvas})
-$cscroll_canvas.bind('2', proc{|x,y| $cscroll_canvas.scan_mark(x,y)}, '%x %y')
-$cscroll_canvas.bind('B2-Motion',
-                     proc{|x,y| $cscroll_canvas.scan_dragto(x,y)}, '%x %y')
-
-def scrollEnter(c)
-  id = c.find_withtag('current')[0].id
-  id -= 1 if c.gettags('current').include?('text')
-  $oldFill = c.itemconfiginfo(id, 'fill')[4]
-  if TkWinfo.depth(c) > 1
-    c.itemconfigure(id, 'fill'=>'SeaGreen1')
-  else
-    c.itemconfigure(id, 'fill'=>'black')
-    c.itemconfigure(id+1, 'fill'=>'white')
-  end
-end
-
-def scrollLeave(c)
-  id = c.find_withtag('current')[0].id
-  id -= 1 if c.gettags('current').include?('text')
-  c.itemconfigure(id, 'fill'=>$oldFill)
-  c.itemconfigure(id+1, 'fill'=>'black')
-end
-
-def scrollButton(c)
-  id = c.find_withtag('current')[0].id
-  id += 1 unless c.gettags('current').include?('text')
-  print "You buttoned at #{c.itemconfiginfo(id,'text')[4]}\n"
-end
-
diff --git a/ext/tk/sample/demos-en/ctext.rb b/ext/tk/sample/demos-en/ctext.rb
deleted file mode 100644
index fdb2f423e2..0000000000
--- a/ext/tk/sample/demos-en/ctext.rb
+++ /dev/null
@@ -1,208 +0,0 @@
-# frozen_string_literal: false
-# ctext.rb
-#
-# This demonstration script creates a canvas widget with a text
-# item that can be edited and reconfigured in various ways.
-#
-# Canvas Text widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($ctext_demo) && $ctext_demo
-  $ctext_demo.destroy
-  $ctext_demo = nil
-end
-
-# demo toplevel widget
-$ctext_demo = TkToplevel.new {|w|
-  title("Canvas Text Demonstration")
-  iconname("Text")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($ctext_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left',
-            'text'=>"This window displays a string of text to demonstrate the text facilities of canvas widgets.  You can click in the boxes to adjust the position of the text relative to its positioning point or change its justification.  The text also supports the following simple bindings for editing:
-  1. You can point, click, and type.
-  2. You can also select with button 1.
-  3. You can copy the selection to the mouse position with button 2.
-  4. Backspace and Control+h delete the selection if there is one;
-     otherwise they delete the character just before the insertion cursor.
-  5. Delete deletes the selection if there is one; otherwise it deletes
-     the character just after the insertion cursor."){
-  pack('side'=>'top')
-}
-
-# frame
-$ctext_buttons = TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $ctext_demo
-      $ctext_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'ctext'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$ctext_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# canvas
-$ctext_canvas = TkCanvas.new(base_frame, 'relief'=>'flat',
-                             'borderwidth'=>0, 'width'=>500, 'height'=>350)
-$ctext_canvas.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'both')
-
-# font
-if $tk_version =~ /^4.*/
-  textFont = '-*-Helvetica-Medium-R-Normal--*-240-*-*-*-*-*-*'
-else
-  textFont = 'Helvetica 24'
-end
-
-# canvas
-TkcRectangle.new($ctext_canvas, 245, 195, 255, 205,
-                 'outline'=>'black', 'fill'=>'red')
-
-ctag_text_param = {
-  'text'=>"This is just a string of text to demonstrate the text facilities of canvas widgets. Bindings have been been defined to support editing (see above).",
-  'width'=>440, 'anchor'=>'n', 'justify'=>'left'
-}
-if $tk_version =~ /^4.*/
-  ctag_text_param['font'] = '-*-Helvetica-Medium-R-Normal--*-240-*-*-*-*-*-*'
-else
-  ctag_text_param['font'] = 'Helvetica 24'
-end
-
-$ctag_text = TkcTag.new($ctext_canvas)
-$ctag_text.withtag(TkcText.new($ctext_canvas, 250, 200, ctag_text_param))
-
-$ctag_text.bind('1', proc{|x,y| textB1Press $ctext_canvas,x,y}, "%x %y")
-$ctag_text.bind('B1-Motion', proc{|x,y| textB1Move $ctext_canvas,x,y}, "%x %y")
-$ctag_text.bind('Shift-1',
-        proc{|x,y| $ctext_canvas.select_adjust 'current', "@#{x},#{y}"},
-        "%x %y")
-$ctag_text.bind('Shift-B1-Motion',
-                proc{|x,y| textB1Move $ctext_canvas,x,y}, "%x %y")
-$ctag_text.bind('KeyPress', proc{|a| textInsert $ctext_canvas,a}, "%A")
-$ctag_text.bind('Return', proc{textInsert $ctext_canvas,"\n"})
-$ctag_text.bind('Control-h', proc{textBs $ctext_canvas})
-$ctag_text.bind('BackSpace', proc{textBs $ctext_canvas})
-$ctag_text.bind('Delete', proc{textDel $ctext_canvas})
-$ctag_text.bind('2', proc{|x,y| textPaste $ctext_canvas, "@#{x},#{y}"},
-                "%x %y")
-
-# Next, create some items that allow the text's anchor position
-# to be edited.
-
-def mkTextConfig(w,x,y,option,value,color)
-  item = TkcRectangle.new(w, x, y, x+30, y+30,
-                          'outline'=>'black', 'fill'=>color, 'width'=>1)
-  item.bind('1', proc{$ctag_text.configure option, value})
-  w.addtag_withtag('config', item)
-end
-
-x = 50
-y = 50
-color = 'LightSkyBlue1'
-mkTextConfig $ctext_canvas, x, y, 'anchor', 'se', color
-mkTextConfig $ctext_canvas, x+30, y, 'anchor', 's', color
-mkTextConfig $ctext_canvas, x+60, y, 'anchor', 'sw', color
-mkTextConfig $ctext_canvas, x, y+30, 'anchor', 'e', color
-mkTextConfig $ctext_canvas, x+30, y+30, 'anchor', 'center', color
-mkTextConfig $ctext_canvas, x+60, y+30, 'anchor', 'w', color
-mkTextConfig $ctext_canvas, x, y+60, 'anchor', 'ne', color
-mkTextConfig $ctext_canvas, x+30, y+60, 'anchor', 'n', color
-mkTextConfig $ctext_canvas, x+60, y+60, 'anchor', 'nw', color
-item = TkcRectangle.new($ctext_canvas, x+40, y+40, x+50, y+50,
-                        'outline'=>'black', 'fill'=>'red')
-item.bind('1', proc{$ctag_text.configure 'anchor', 'center'})
-if $tk_version =~ /^4.*/
-  TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Text Position',
-              'font'=>'-*-times-medium-r-normal--*-240-*-*-*-*-*-*',
-              'anchor'=>'s', 'fill'=>'brown')
-else
-  TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Text Position',
-              'font'=>'Times 24', 'anchor'=>'s', 'fill'=>'brown')
-end
-
-# Lastly, create some items that allow the text's justification to be
-# changed.
-
-x = 350
-y = 50
-color = 'SeaGreen2'
-mkTextConfig $ctext_canvas, x, y, 'justify', 'left', color
-mkTextConfig $ctext_canvas, x+30, y, 'justify', 'center', color
-mkTextConfig $ctext_canvas, x+60, y, 'justify', 'right', color
-if $tk_version =~ /^4.*/
-  TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Justification',
-              'font'=>'-*-times-medium-r-normal--*-240-*-*-*-*-*-*',
-              'anchor'=>'s', 'fill'=>'brown')
-else
-  TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Justification',
-              'font'=>'Times 24', 'anchor'=>'s', 'fill'=>'brown')
-end
-
-$ctext_canvas.itembind('config', 'Enter', proc{textEnter $ctext_canvas})
-$ctext_canvas.itembind('config', 'Leave',
-                       proc{$ctext_canvas\
-                             .itemconfigure('current',
-                                            'fill'=>$textConfigFill)})
-
-$textConfigFill = ''
-
-def textEnter(w)
-  $textConfigFill = (w.itemconfiginfo 'current', 'fill')[4]
-  w.itemconfigure 'current', 'fill', 'black'
-end
-
-def textInsert(w, string)
-  return if string == ""
-  begin
-    $ctag_text.dchars 'sel.first', 'sel.last'
-  rescue
-  end
-  $ctag_text.insert 'insert', string
-end
-
-def textPaste(w, pos)
-  begin
-    $ctag_text.insert pos, TkSelection.get
-  rescue
-  end
-end
-
-def textB1Press(w,x,y)
-  w.icursor 'current', "@#{x},#{y}"
-  w.itemfocus 'current'
-  w.focus
-  w.select_from 'current', "@#{x},#{y}"
-end
-
-def textB1Move(w,x,y)
-  w.select_to 'current', "@#{x},#{y}"
-end
-
-def textBs(w)
-  begin
-    $ctag_text.dchars 'sel.first', 'sel.last'
-  rescue
-    char = $ctag_text.index('insert').to_i - 1
-    $ctag_text.dchars(char) if char >= 0
-  end
-end
-
-def textDel(w)
-  begin
-    $ctag_text.dchars 'sel.first', 'sel.last'
-  rescue
-    $ctag_text.dchars 'insert'
-  end
-end
-
diff --git a/ext/tk/sample/demos-en/dialog1.rb b/ext/tk/sample/demos-en/dialog1.rb
deleted file mode 100644
index 3fd56a69c3..0000000000
--- a/ext/tk/sample/demos-en/dialog1.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-# frozen_string_literal: false
-#
-# a dialog box with a local grab (called by 'widget')
-#
-class TkDialog_Demo1 < TkDialog
-  ###############
-  private
-  ###############
-  def title
-    "Dialog with local grab"
-  end
-
-  def message
-    'This is a modal dialog box.  It uses Tk\'s "grab" command to create a "local grab" on the dialog box.  The grab prevents any pointer-related events from getting to any other windows in the application until you have answered the dialog by invoking one of the buttons below.  However, you can still interact with other applications.'
-  end
-
-  def bitmap
-    'info'
-  end
-
-  def default_button
-    0
-  end
-
-  def buttons
-    # ["Dismiss", "", "Show Code"]
-    ["OK", "Cancel", "Show Code"]
-  end
-end
-
-ret =  TkDialog_Demo1.new('message_config'=>{'wraplength'=>'4i'}).value
-case ret
-when 0
-  print "You pressed OK\n"
-when 1
-  print "You pressed Cancel\n"
-when 2
-  showCode 'dialog1'
-end
diff --git a/ext/tk/sample/demos-en/dialog2.rb b/ext/tk/sample/demos-en/dialog2.rb
deleted file mode 100644
index fed14081c8..0000000000
--- a/ext/tk/sample/demos-en/dialog2.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-# frozen_string_literal: false
-#
-# a dialog box with a global grab (called by 'widget')
-#
-class TkDialog_Demo2 < TkDialog
-  ###############
-  private
-  ###############
-  def title
-    "Dialog with global grab"
-  end
-
-  def message
-    "This dialog box uses a global grab, so it prevents you from interacting with anything on your display until you invoke one of the buttons below.  Global grabs are almost always a bad idea; don't use them unless you're truly desperate."
-  end
-
-  def bitmap
-    'info'
-  end
-
-  def default_button
-    0
-  end
-
-  def buttons
-    ["OK", "Cancel", "Show Code"]
-  end
-end
-
-ret =  TkDialog_Demo2.new('message_config'=>{'wraplength'=>'4i'},
-                          'prev_command'=>proc{|dialog|
-                            Tk.after 100, proc{dialog.grab('global')}
-                          }).value
-case ret
-when 0
-  print "\You pressed OK\n"
-when 1
-  print "You pressed Cancel\n"
-when 2
-  showCode 'dialog2'
-end
-
diff --git a/ext/tk/sample/demos-en/doc.org/README b/ext/tk/sample/demos-en/doc.org/README
deleted file mode 100644
index 90677d3316..0000000000
--- a/ext/tk/sample/demos-en/doc.org/README
+++ /dev/null
@@ -1,7 +0,0 @@
-This directory contains a collection of demonstration programs that
-are translated into Japanese.  You need to use a Japanized "wish" to
-see these Japanese-translated demonstration programs.  You also need
-to put this directory ("demos.jp") at the next to "demos" since some
-of the programs refer to the image files at "demos".
-
-Please refer to the README file at "demos" for more detail.
diff --git a/ext/tk/sample/demos-en/doc.org/README.JP b/ext/tk/sample/demos-en/doc.org/README.JP
deleted file mode 100644
index 42b4929378..0000000000
--- a/ext/tk/sample/demos-en/doc.org/README.JP
+++ /dev/null
@@ -1,14 +0,0 @@
-This directory contains "widget" demo for the Japanized Tcl7.6/Tk4.2.
-Most of the messages in the original are translated to Japanese.
-But other tools in this directory are not translated.
-
-Following 2 kanji fonts are defined at the beginning of the file "widget."
-
-	-*--24-*-jisx0208.1983-0
-	-*--16-*-jisx0208.1983-0
-
-These fonts are all part of the core distribution of X11R5, so
-if you are running X11R5, you don't have to modify the file.
-
-But if you don't have these fonts, replace them with appropriate ones.
-"-*--14-*-jisx0208.1983-0" will be a good choice.
diff --git a/ext/tk/sample/demos-en/doc.org/README.tk80 b/ext/tk/sample/demos-en/doc.org/README.tk80
deleted file mode 100644
index c71f977d74..0000000000
--- a/ext/tk/sample/demos-en/doc.org/README.tk80
+++ /dev/null
@@ -1,46 +0,0 @@
-This directory contains a collection of programs to demonstrate
-the features of the Tk toolkit.  The programs are all scripts for
-"wish", a windowing shell.  If wish has been installed in /usr/local
-then you can invoke any of the programs in this directory just
-by typing its file name to your command shell.  Otherwise invoke
-wish with the file as its first argument, e.g., "wish hello".
-The rest of this file contains a brief description of each program.
-Files with names ending in ".tcl" are procedure packages used by one
-or more of the demo programs;  they can't be used as programs by
-themselves so they aren't described below.
-
-hello -		Creates a single button;  if you click on it, a message
-		is typed and the application terminates.
-
-widget -	Contains a collection of demonstrations of the widgets
-		currently available in the Tk library.  Most of the .tcl
-		files are scripts for individual demos available through
-		the "widget" program.
-
-ixset -		A simple Tk-based wrapper for the "xset" program, which
-		allows you to interactively query and set various X options
-		such as mouse acceleration and bell volume.  Thanks to
-		Pierre David for contributing this example.
-
-rolodex -	A mock-up of a simple rolodex application.  It has much of
-		the user interface for such an application but no back-end
-		database.  This program was written in response to Tom
-		LaStrange's toolkit benchmark challenge.
-
-tcolor -	A color editor.  Allows you to edit colors in several
-		different ways, and will also perform automatic updates
-		using "send".
-
-rmt -		Allows you to "hook-up" remotely to any Tk application
-		on the display.  Select an application with the menu,
-		then just type commands:  they'll go to that application.
-
-timer -		Displays a seconds timer with start and stop buttons.
-		Control-c and control-q cause it to exit.
-
-browse -	A simple directory browser.  Invoke it with and argument
-		giving the name of the directory you'd like to browse.
-		Double-click on files or subdirectories to browse them.
-		Control-c and control-q cause the program to exit.
-
-sccs id = SCCS: @(#) README 1.3 96/02/16 10:49:14
diff --git a/ext/tk/sample/demos-en/doc.org/license.terms b/ext/tk/sample/demos-en/doc.org/license.terms
deleted file mode 100644
index c0a44d3fc2..0000000000
--- a/ext/tk/sample/demos-en/doc.org/license.terms
+++ /dev/null
@@ -1,39 +0,0 @@
-This software is copyrighted by the Regents of the University of
-California, Sun Microsystems, Inc., and other parties.  The following
-terms apply to all files associated with the software unless explicitly
-disclaimed in individual files.
-
-The authors hereby grant permission to use, copy, modify, distribute,
-and license this software and its documentation for any purpose, provided
-that existing copyright notices are retained in all copies and that this
-notice is included verbatim in any distributions. No written agreement,
-license, or royalty fee is required for any of the authorized uses.
-Modifications to this software may be copyrighted by their authors
-and need not follow the licensing terms described here, provided that
-the new terms are clearly indicated on the first page of each file where
-they apply.
-
-IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
-FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
-DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
-IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
-NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
-MODIFICATIONS.
-
-GOVERNMENT USE: If you are acquiring this software on behalf of the
-U.S. government, the Government shall have only "Restricted Rights"
-in the software and related documentation as defined in the Federal
-Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
-are acquiring the software on behalf of the Department of Defense, the
-software shall be classified as "Commercial Computer Software" and the
-Government shall have only "Restricted Rights" as defined in Clause
-252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
-authors grant the U.S. Government and others acting in its behalf
-permission to use and distribute the software in accordance with the
-terms specified in this license.
diff --git a/ext/tk/sample/demos-en/doc.org/license.terms.tk80 b/ext/tk/sample/demos-en/doc.org/license.terms.tk80
deleted file mode 100644
index c0a44d3fc2..0000000000
--- a/ext/tk/sample/demos-en/doc.org/license.terms.tk80
+++ /dev/null
@@ -1,39 +0,0 @@
-This software is copyrighted by the Regents of the University of
-California, Sun Microsystems, Inc., and other parties.  The following
-terms apply to all files associated with the software unless explicitly
-disclaimed in individual files.
-
-The authors hereby grant permission to use, copy, modify, distribute,
-and license this software and its documentation for any purpose, provided
-that existing copyright notices are retained in all copies and that this
-notice is included verbatim in any distributions. No written agreement,
-license, or royalty fee is required for any of the authorized uses.
-Modifications to this software may be copyrighted by their authors
-and need not follow the licensing terms described here, provided that
-the new terms are clearly indicated on the first page of each file where
-they apply.
-
-IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
-FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
-DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
-IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
-NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
-MODIFICATIONS.
-
-GOVERNMENT USE: If you are acquiring this software on behalf of the
-U.S. government, the Government shall have only "Restricted Rights"
-in the software and related documentation as defined in the Federal
-Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
-are acquiring the software on behalf of the Department of Defense, the
-software shall be classified as "Commercial Computer Software" and the
-Government shall have only "Restricted Rights" as defined in Clause
-252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
-authors grant the U.S. Government and others acting in its behalf
-permission to use and distribute the software in accordance with the
-terms specified in this license.
diff --git a/ext/tk/sample/demos-en/entry1.rb b/ext/tk/sample/demos-en/entry1.rb
deleted file mode 100644
index d6b0af2b5d..0000000000
--- a/ext/tk/sample/demos-en/entry1.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-# frozen_string_literal: false
-#
-# entry (no scrollbars) widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($entry1_demo) && $entry1_demo
-  $entry1_demo.destroy
-  $entry1_demo = nil
-end
-
-# demo toplevel widget
-$entry1_demo = TkToplevel.new {|w|
-  title("Entry Demonstration (no scrollbars)")
-  iconname("entry1")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($entry1_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '5i'
-  justify 'left'
-  text "Three different entries are displayed below.  You can add characters by pointing, clicking and typing.  The normal Motif editing characters are supported, along with many Emacs bindings.  For example, Backspace and Control-h delete the character to the left of the insertion cursor and Delete and Control-d delete the chararacter to the right of the insertion cursor.  For entries that are too large to fit in the window all at once, you can scan through the entries by dragging with mouse button2 pressed."
-}
-msg.pack('side'=>'top')
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $entry1_demo
-      $entry1_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'entry1'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-#
-e1 = TkEntry.new(base_frame, 'relief'=>'sunken')
-e2 = TkEntry.new(base_frame, 'relief'=>'sunken')
-e3 = TkEntry.new(base_frame, 'relief'=>'sunken')
-[e1,e2,e3].each{|w| w.pack('side'=>'top', 'padx'=>10, 'pady'=>5, 'fill'=>'x')}
-
-#
-e1.insert(0, 'Initial value')
-e2.insert('end', "This entry contains a long value, much too long ")
-e2.insert('end', "to fit in the window at one time, so long in fact ")
-e2.insert('end', "that you'll have to scan or scroll to see the end.")
-e2.insert('end', "")
-
diff --git a/ext/tk/sample/demos-en/entry2.rb b/ext/tk/sample/demos-en/entry2.rb
deleted file mode 100644
index 460a0a02ea..0000000000
--- a/ext/tk/sample/demos-en/entry2.rb
+++ /dev/null
@@ -1,94 +0,0 @@
-# frozen_string_literal: false
-# entry2.rb
-#
-# This demonstration script is the same as the entry1.tcl script
-# except that it creates scrollbars for the entries.
-#
-# entry (with scrollbars) widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($entry2_demo) && $entry2_demo
-  $entry2_demo.destroy
-  $entry2_demo = nil
-end
-
-# demo toplevel widget
-$entry2_demo = TkToplevel.new {|w|
-  title("Entry Demonstration (with scrollbars)")
-  iconname("entry2")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($entry2_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '5i'
-  justify 'left'
-  text "Three different entries are displayed below, with a scrollbar for each entry.  You can add characters by pointing, clicking and typing.  The normal Motif editing characters are supported, along with many Emacs bindings.  For example, Backspace and Control-h delete the character to the left of the insertion cursor and Delete and Control-d delete the chararacter to the right of the insertion cursor.  For entries that are too large to fit in the window all at once, you can scan through the entries with the scrollbars, or by dragging with mouse button2 pressed."
-}
-msg.pack('side'=>'top')
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $entry2_demo
-      $entry2_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'entry2'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-TkFrame.new(base_frame, 'borderwidth'=>10) {|w|
-  # entry 1
-  s1 = TkScrollbar.new(w, 'relief'=>'sunken', 'orient'=>'horiz')
-  e1 = TkEntry.new(w, 'relief'=>'sunken') {
-    xscrollcommand proc{|first,last| s1.set first,last}
-  }
-  s1.command(proc{|*args| e1.xview(*args)})
-  e1.pack('side'=>'top', 'fill'=>'x')
-  s1.pack('side'=>'top', 'fill'=>'x')
-
-  # spacer
-  TkFrame.new(w, 'width'=>20, 'height'=>10).pack('side'=>'top', 'fill'=>'x')
-
-  # entry 2
-  s2 = TkScrollbar.new(w, 'relief'=>'sunken', 'orient'=>'horiz')
-  e2 = TkEntry.new(w, 'relief'=>'sunken') {
-    xscrollcommand proc{|first,last| s2.set first,last}
-  }
-  s2.command(proc{|*args| e2.xview(*args)})
-  e2.pack('side'=>'top', 'fill'=>'x')
-  s2.pack('side'=>'top', 'fill'=>'x')
-
-  # spacer
-  TkFrame.new(w, 'width'=>20, 'height'=>10).pack('side'=>'top', 'fill'=>'x')
-
-  # entry 3
-  s3 = TkScrollbar.new(w, 'relief'=>'sunken', 'orient'=>'horiz')
-  e3 = TkEntry.new(w, 'relief'=>'sunken') {
-    xscrollcommand proc{|first,last| s3.set first,last}
-  }
-  s3.command(proc{|*args| e3.xview(*args)})
-  e3.pack('side'=>'top', 'fill'=>'x')
-  s3.pack('side'=>'top', 'fill'=>'x')
-
-  #
-  e1.insert(0, 'Initial value')
-  e2.insert('end', "This entry contains a long value, much too long ")
-  e2.insert('end', "to fit in the window at one time, so long in fact ")
-  e2.insert('end', "that you'll have to scan or scroll to see the end.")
-  e2.insert('end', "")
-
-}.pack('side'=>'top', 'fill'=>'x', 'expand'=>'yes')
-
diff --git a/ext/tk/sample/demos-en/entry3.rb b/ext/tk/sample/demos-en/entry3.rb
deleted file mode 100644
index 6170fe1365..0000000000
--- a/ext/tk/sample/demos-en/entry3.rb
+++ /dev/null
@@ -1,221 +0,0 @@
-# frozen_string_literal: false
-# entry3.rb --
-#
-# This demonstration script creates several entry widgets whose
-# permitted input is constrained in some way.  It also shows off a
-# password entry.
-#
-# based on Tcl/Tk8.4.4 widget demos
-
-if defined?($entry3_demo) && $entry3_demo
-  $entry3_demo.destroy
-  $entry3_demo = nil
-end
-
-$entry3_demo = TkToplevel.new {|w|
-  title("Constrained Entry Demonstration")
-  iconname("entry3")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($entry3_demo).pack(:fill=>:both, :expand=>true)
-
-TkLabel.new(base_frame,
-            :font=>$font, :wraplength=>'5i', :justify=>:left,
-            :text=><<EOL).pack(:side=>:top)
-Four different entries are displayed below.  You can add characters \
-by pointing, clicking and typing, though each is constrained in what \
-it will accept.  The first only accepts integers or the empty string \
-(checking when focus leaves it) and will flash to indicate any \
-problem.  The second only accepts strings with fewer than ten \
-characters and sounds the bell when an attempt to go over the limit \
-is made.  The third accepts US phone numbers, mapping letters to \
-their digit equivalent and sounding the bell on encountering an \
-invalid character or if trying to type over a character that is not \
-a digit.  The fourth is a password field that accepts up to eight \
-characters (silently ignoring further ones), and displaying them as \
-asterisk characters.
-EOL
-
-TkFrame.new(base_frame){|f|
-  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
-
-  TkButton.new(f, :text=>'Dismiss', :width=>15, :command=>proc{
-                 $entry3_demo.destroy
-                 $entry3_demo = nil
-               }).pack(:side=>:left, :expand=>true)
-
-  TkButton.new(f, :text=>'See Code', :width=>15, :command=>proc{
-                 showCode 'entry3'
-               }).pack(:side=>:left, :expand=>true)
-}
-
-# focusAndFlash --
-# Error handler for entry widgets that forces the focus onto the
-# widget and makes the widget flash by exchanging the foreground and
-# background colours at intervals of 200ms (i.e. at approximately
-# 2.5Hz).
-#
-# Arguments:
-# widget -      entry widget to flash
-# fg -          Initial foreground colour
-# bg -          Initial background colour
-# count -       Counter to control the number of times flashed
-def focusAndFlash(widget, fg, bg, count=5)
-  return if count <= 0
-  if fg && !fg.empty? && bg && !bg.empty?
-    TkTimer.new(200, count,
-                proc{widget.configure(:foreground=>bg, :background=>fg)},
-                proc{widget.configure(:foreground=>fg, :background=>bg)}
-                ).start
-  else
-    # TkTimer.new(150, 3){Tk.bell}.start
-    Tk.bell
-    TkTimer.new(200, count,
-                proc{widget.configure(:foreground=>'white',
-                                      :background=>'black')},
-                proc{widget.configure(:foreground=>'black',
-                                      :background=>'white')}
-                ).at_end{begin
-                           widget.configure(:foreground=>fg,
-                                            :background=>bg)
-                         rescue
-                           # ignore
-                         end}.start
-  end
-  widget.focus(true)
-end
-
-l1 = TkLabelFrame.new(base_frame, :text=>"Integer Entry")
-TkEntry.new(l1, :validate=>:focus,
-            :vcmd=>[
-              proc{|s| s == '' || /^[+-]?\d+$/ =~ s }, '%P'
-            ]) {|e|
-  fg = e.foreground
-  bg = e.background
-  invalidcommand [proc{|w| focusAndFlash(w, fg, bg)}, '%W']
-  pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
-}
-
-l2 = TkLabelFrame.new(base_frame, :text=>"Length-Constrained Entry")
-TkEntry.new(l2, :validate=>:key, :invcmd=>proc{Tk.bell},
-            :vcmd=>[proc{|s| s.length < 10}, '%P']
-            ).pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
-
-### PHONE NUMBER ENTRY ###
-# Note that the source to this is quite a bit longer as the behaviour
-# demonstrated is a lot more ambitious than with the others.
-
-# Initial content for the third entry widget
-entry3content = TkVariable.new("1-(000)-000-0000")
-
-# Mapping from alphabetic characters to numbers.
-$phoneNumberMap = {}
-Hash[*(%w(abc 2 def 3 ghi 4 jkl 5 mno 6 pqrs 7 tuv 8 wxyz 9))].each{|chars, n|
-  chars.split('').each{|c|
-    $phoneNumberMap[c] = n
-    $phoneNumberMap[c.upcase] = n
-  }
-}
-
-# phoneSkipLeft --
-# Skip over fixed characters in a phone-number string when moving left.
-#
-# Arguments:
-# widget -      The entry widget containing the phone-number.
-def phoneSkipLeft(widget)
-  idx = widget.index('insert')
-  if idx == 8
-    # Skip back two extra characters
-    widget.cursor = idx - 2
-  elsif idx == 7 || idx == 12
-    # Skip back one extra character
-    widget.cursor = idx - 1
-  elsif idx <= 3
-    # Can't move any further
-    Tk.bell
-    Tk.callback_break
-  end
-end
-
-# phoneSkipRight --
-# Skip over fixed characters in a phone-number string when moving right.
-#
-# Arguments:
-# widget -      The entry widget containing the phone-number.
-# add - Offset to add to index before calculation (used by validation.)
-def phoneSkipRight(widget, add = 0)
-  idx = widget.index('insert')
-  if (idx + add == 5)
-    # Skip forward two extra characters
-    widget.cursor = idx + 2
-  elsif (idx + add == 6 || idx + add == 10)
-    # Skip forward one extra character
-    widget.cursor = idx + 1
-  elsif (idx + add == 15 && add == 0)
-    # Can't move any further
-    Tk.bell
-    Tk.callback_break
-  end
-end
-
-# validatePhoneChange --
-# Checks that the replacement (mapped to a digit) of the given
-# character in an entry widget at the given position will leave a
-# valid phone number in the widget.
-#
-# widget - entry widget to validate
-# vmode -  The widget's validation mode
-# idx -    The index where replacement is to occur
-# char -   The character (or string, though that will always be
-#          refused) to be overwritten at that point.
-
-def validatePhoneChange(widget, vmode, idx, char)
-  return true if idx == nil
-  Tk.after_idle(proc{widget.configure(:validate=>vmode,
-                                      :invcmd=>proc{Tk.bell})})
-  if !(idx<3 || idx==6 || idx==7 || idx==11 || idx>15) && char =~ /[0-9A-Za-z]/
-    widget.delete(idx)
-    widget.insert(idx, $phoneNumberMap[char] || char)
-    Tk.after_idle(proc{phoneSkipRight(widget, -1)})
-    return true
-    # Tk.update(true) # <- Don't work 'update' inter validation callback.
-                      #    It depends on Tcl/Tk side (tested on Tcl/Tk8.5a1).
-  end
-  return false
-end
-
-
-l3 = TkLabelFrame.new(base_frame, :text=>"US Phone-Number Entry")
-TkEntry.new(l3, :validate=>:key, :invcmd=>proc{Tk.bell},
-            :textvariable=>entry3content,
-            :vcmd=>[
-              proc{|w,v,i,s| validatePhoneChange(w,v,i,s)},
-              "%W %v %i %S"
-            ]){|e|
-  # Click to focus goes to the first editable character...
-  bind('FocusIn', proc{|d,w|
-         if d != "NotifyAncestor"
-           w.cursor = 3
-           Tk.after_idle(proc{w.selection_clear})
-         end
-       }, '%d %W')
-  bind('Left',  proc{|w| phoneSkipLeft(w)},  '%W')
-  bind('Right', proc{|w| phoneSkipRight(w)}, '%W')
-  pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
-}
-
-l4 = TkLabelFrame.new(base_frame, :text=>"Password Entry")
-TkEntry.new(l4, :validate=>:key, :show=>'*',
-            :vcmd=>[
-              proc{|s| s.length <= 8},
-              '%P'
-            ]).pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
-
-TkFrame.new(base_frame){|f|
-  lower
-  TkGrid.configure(l1, l2, :in=>f, :padx=>'3m', :pady=>'1m', :sticky=>:ew)
-  TkGrid.configure(l3, l4, :in=>f, :padx=>'3m', :pady=>'1m', :sticky=>:ew)
-  TkGrid.columnconfigure(f, [0,1], :uniform=>1)
-  pack(:fill=>:both, :expand=>true)
-}
diff --git a/ext/tk/sample/demos-en/filebox.rb b/ext/tk/sample/demos-en/filebox.rb
deleted file mode 100644
index 2bdf0aac10..0000000000
--- a/ext/tk/sample/demos-en/filebox.rb
+++ /dev/null
@@ -1,103 +0,0 @@
-# frozen_string_literal: false
-# filebox.rb
-#
-# This demonstration script prompts the user to select a file.#
-# widget demo prompts the user to select a file (called by 'widget')
-#
-
-# toplevel widget
-if defined?($filebox_demo) && $filebox_demo
-  $filebox_demo.destroy
-  $filebox_demo = nil
-end
-
-# demo toplevel widget
-$filebox_demo = TkToplevel.new {|w|
-  title("File Selection Dialogs")
-  iconname("filebox")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($filebox_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
-            'text'=>"Enter a file name in the entry box or click on the \"Browse\" buttons to select a file name using the file selection dialog.").pack('side'=>'top')
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $filebox_demo
-      $filebox_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'filebox'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-['open', 'save'].each{|type|
-  TkFrame.new(base_frame) {|f|
-    TkLabel.new(f, 'text'=>"Select a file to #{type}: ", 'anchor'=>'e')\
-    .pack('side'=>'left')
-
-    TkEntry.new(f, 'width'=>20) {|e|
-      pack('side'=>'left', 'expand'=>'yes', 'fill'=>'x')
-
-      TkButton.new(f, 'text'=>'Browse ...',
-                   'command'=>proc{fileDialog base_frame,e,type})\
-      .pack('side'=>'left')
-    }
-
-    pack('fill'=>'x', 'padx'=>'1c', 'pady'=>3)
-  }
-}
-
-$tk_strictMotif = TkVarAccess.new('tk_strictMotif')
-if ($tk_platform['platform'] == 'unix')
-  TkCheckButton.new(base_frame,
-                    'text'=>'Use Motif Style Dialog',
-                    'variable'=>$tk_strictMotif,
-                    'onvalue'=>1, 'offvalue'=>0 ).pack('anchor'=>'c')
-end
-
-def fileDialog(w,ent,operation)
-  #    Type names         Extension(s)             Mac File Type(s)
-  #
-  #--------------------------------------------------------
-  types = [
-    ['Text files',       ['.txt','.doc']          ],
-    ['Text files',       [],                      'TEXT' ],
-    ['Ruby Scripts',     ['.rb'],                 'TEXT' ],
-    ['Tcl Scripts',      ['.tcl'],                'TEXT' ],
-    ['C Source Files',   ['.c','.h']              ],
-    ['All Source Files', ['.rb','.tcl','.c','.h'] ],
-    ['Image Files',      ['.gif']                 ],
-    ['Image Files',      ['.jpeg','.jpg']         ],
-    ['Image Files',      [],                      ['GIFF','JPEG']],
-    ['All files',        '*'                      ]
-  ]
-
-  if operation == 'open'
-    file = Tk.getOpenFile('filetypes'=>types, 'parent'=>w)
-  else
-    file = Tk.getSaveFile('filetypes'=>types, 'parent'=>w,
-                          'initialfile'=>'Untitled',
-                          'defaultextension'=>'.txt')
-  end
-  if file != ""
-    ent.delete 0, 'end'
-    ent.insert 0, file
-    # ent.xview 'end'
-    Tk.update_idletasks # need this for Tk::Tile::Entry
-                        # (to find right position of 'xview').
-    ent.xview(ent.index('end'))
-  end
-end
-
diff --git a/ext/tk/sample/demos-en/floor.rb b/ext/tk/sample/demos-en/floor.rb
deleted file mode 100644
index 4b77ea6a8a..0000000000
--- a/ext/tk/sample/demos-en/floor.rb
+++ /dev/null
@@ -1,1724 +0,0 @@
-# frozen_string_literal: false
-# floor.rb
-#
-# This demonstration script creates a canvas widget that displays the
-# floorplan for DEC's Western Research Laboratory.
-#
-# floorDisplay widget demo (called by 'widget')
-#
-
-# floorDisplay --
-# Recreate the floorplan display in the canvas given by "w".  The
-# floor given by "active" is displayed on top with its office structure
-# visible.
-#
-# Arguments:
-# w -           Name of the canvas window.
-# active -      Number of active floor (1, 2, or 3).
-
-def floorDisplay(w,active)
-  return if $activeFloor == active
-
-  w.delete('all')
-  $activeFloor = active
-
-  # First go through the three floors, displaying the backgrounds for
-  # each floor.
-
-  floor_bg1(w,$floor_colors['bg1'],$floor_colors['outline1'])
-  floor_bg2(w,$floor_colors['bg2'],$floor_colors['outline2'])
-  floor_bg3(w,$floor_colors['bg3'],$floor_colors['outline3'])
-
-  # Raise the background for the active floor so that it's on top.
-
-  w.raise("floor#{active}")
-
-  # Create a dummy item just to mark this point in the display list,
-  # so we can insert highlights here.
-
-  TkcRectangle.new(w,0,100,1,101, 'fill'=>'', 'outline'=>'', 'tags'=>'marker')
-
-  # Add the walls and labels for the active floor, along with
-  # transparent polygons that define the rooms on the floor.
-  # Make sure that the room polygons are on top.
-
-  $floorLabels.clear
-  $floorItems.clear
-  send("floor_fg#{active}", w, $floor_colors['offices'])
-  w.raise('room')
-
-  # Offset the floors diagonally from each other.
-
-  w.move('floor1', '2c', '2c')
-  w.move('floor2', '1c', '1c')
-
-  # Create items for the room entry and its label.
-  TkcWindow.new(w, 600, 100, 'anchor'=>'w', 'window'=>$floor_entry)
-  TkcText.new(w, 600, 100, 'anchor'=>'e', 'text'=>"Room: ")
-  w['scrollregion'] = w.bbox('all')
-end
-
-# newRoom --
-# This method is invoked whenever the mouse enters a room
-# in the floorplan.  It changes tags so that the current room is
-# highlighted.
-#
-# Arguments:
-# w  -          The name of the canvas window.
-
-def newRoom(w)
-  id = w.find_withtag('current')[0]
-  $currentRoom.value = $floorLabels[id.id] if id != ""
-  Tk.update(true)
-end
-
-# roomChanged --
-# This method is invoked whenever the currentRoom variable changes.
-# It highlights the current room and unhighlights any previous room.
-#
-# Arguments:
-# w -           The canvas window displaying the floorplan.
-# args -        Not used.
-
-def roomChanged(w,*args)
-  w.delete('highlight')
-  item = $floorItems[$currentRoom.value]
-  return if item == nil
-  new = TkcPolygon.new(w, *(w.coords(item)))
-  new.configure('fill'=>$floor_colors['active'], 'tags'=>'highlight')
-  w.raise(new, 'marker')
-end
-
-# floor_bg1 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the background information for the first
-# floor.
-#
-# Arguments:
-# w -           The canvas window.
-# fill -        Fill color to use for the floor's background.
-# outline -     Color to use for the floor's outline.
-
-def floor_bg1(w,fill,outline)
-  TkcPolygon.new(w,347,80,349,82,351,84,353,85,363,92,375,99,386,104,
-                 386,129,398,129,398,162,484,162,484,129,559,129,559,133,725,
-                 133,725,129,802,129,802,389,644,389,644,391,559,391,559,327,
-                 508,327,508,311,484,311,484,278,395,278,395,288,400,288,404,
-                 288,409,290,413,292,418,297,421,302,422,309,421,318,417,325,
-                 411,330,405,332,397,333,344,333,340,334,336,336,335,338,332,
-                 342,331,347,332,351,334,354,336,357,341,359,340,360,335,363,
-                 331,365,326,366,304,366,304,355,258,355,258,387,60,387,60,391,
-                 0,391,0,337,3,337,3,114,8,114,8,25,30,25,30,5,93,5,98,5,104,7,
-                 110,10,116,16,119,20,122,28,123,32,123,68,220,68,220,34,221,
-                 22,223,17,227,13,231,8,236,4,242,2,246,0,260,0,283,1,300,5,
-                 321,14,335,22,348,25,365,29,363,39,358,48,352,56,337,70,
-                 344,76,347,80, 'tags'=>['floor1','bg'], 'fill'=>fill)
-  TkcLine.new(w,386,129,398,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,258,355,258,387, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,60,387,60,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,0,337,0,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,60,391,0,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,3,114,3,337, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,258,387,60,387, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,484,162,398,162, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,398,162,398,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,484,278,484,311, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,484,311,508,311, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,508,327,508,311, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,559,327,508,327, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,644,391,559,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,644,389,644,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,559,129,484,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,484,162,484,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,725,133,559,133, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,559,129,559,133, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,725,129,802,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,802,389,802,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,3,337,0,337, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,559,391,559,327, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,802,389,644,389, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,725,133,725,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,8,25,8,114, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,8,114,3,114, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,30,25,8,25, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,484,278,395,278, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,30,25,30,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,93,5,30,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,98,5,93,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,104,7,98,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,110,10,104,7, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,116,16,110,10, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,119,20,116,16, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,122,28,119,20, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,123,32,122,28, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,123,68,123,32, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,220,68,123,68, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,386,129,386,104, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,386,104,375,99, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,375,99,363,92, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,353,85,363,92, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,220,68,220,34, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,337,70,352,56, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,352,56,358,48, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,358,48,363,39, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,363,39,365,29, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,365,29,348,25, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,348,25,335,22, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,335,22,321,14, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,321,14,300,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,300,5,283,1, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,283,1,260,0, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,260,0,246,0, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,246,0,242,2, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,242,2,236,4, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,236,4,231,8, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,231,8,227,13, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,223,17,227,13, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,221,22,223,17, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,220,34,221,22, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,340,360,335,363, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,335,363,331,365, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,331,365,326,366, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,326,366,304,366, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,304,355,304,366, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,395,288,400,288, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,404,288,400,288, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,409,290,404,288, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,413,292,409,290, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,418,297,413,292, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,421,302,418,297, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,422,309,421,302, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,421,318,422,309, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,421,318,417,325, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,417,325,411,330, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,411,330,405,332, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,405,332,397,333, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,397,333,344,333, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,344,333,340,334, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,340,334,336,336, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,336,336,335,338, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,335,338,332,342, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,331,347,332,342, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,332,351,331,347, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,334,354,332,351, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,336,357,334,354, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,341,359,336,357, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,341,359,340,360, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,395,288,395,278, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,304,355,258,355, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,347,80,344,76, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,344,76,337,70, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,349,82,347,80, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,351,84,349,82, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,353,85,351,84, 'fill'=>outline, 'tags'=>['floor1','bg'])
-end
-
-# floor_bg2 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the background information for the first
-# floor.
-#
-# Arguments:
-# w -           The canvas window.
-# fill -        Fill color to use for the floor's background.
-# outline -     Color to use for the floor's outline.
-
-def floor_bg2(w,fill,outline)
-  TkcPolygon.new(w,559,129,484,129,484,162,398,162,398,129,315,129,
-                 315,133,176,133,176,129,96,129,96,133,3,133,3,339,0,339,0,391,
-                 60,391,60,387,258,387,258,329,350,329,350,311,395,311,395,280,
-                 484,280,484,311,508,311,508,327,558,327,558,391,644,391,644,
-                 367,802,367,802,129,725,129,725,133,559,133,559,129,
-                 'tags'=>['floor2','bg'], 'fill'=>fill)
-  TkcLine.new(w,350,311,350,329, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,398,129,398,162, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,802,367,802,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,802,129,725,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,725,133,725,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,559,129,559,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,559,133,725,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,484,162,484,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,559,129,484,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,802,367,644,367, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,644,367,644,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,644,391,558,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,558,327,558,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,558,327,508,327, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,508,327,508,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,484,311,508,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,484,280,484,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,398,162,484,162, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,484,280,395,280, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,395,280,395,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,258,387,60,387, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,3,133,3,339, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,3,339,0,339, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,60,391,0,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,0,339,0,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,60,387,60,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,258,329,258,387, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,350,329,258,329, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,395,311,350,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,398,129,315,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,176,133,315,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,176,129,96,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,3,133,96,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,315,133,315,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,176,133,176,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,96,133,96,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-end
-
-# floor_bg3 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the background information for the first
-# floor.
-#
-# Arguments:
-# w -           The canvas window.
-# fill -        Fill color to use for the floor's background.
-# outline -     Color to use for the floor's outline.
-
-def floor_bg3(w,fill,outline)
-  TkcPolygon.new(w,159,300,107,300,107,248,159,248,159,129,96,129,96,
-                 133,21,133,21,331,0,331,0,391,60,391,60,370,159,370,159,300,
-                 'tags'=>['floor3','bg'], 'fill'=>fill)
-  TkcPolygon.new(w,258,370,258,329,350,329,350,311,399,311,399,129,
-                 315,129,315,133,176,133,176,129,159,129,159,370,258,370,
-                 'tags'=>['floor3','bg'], 'fill'=>fill)
-  TkcLine.new(w,96,133,96,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,176,129,96,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,176,129,176,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,315,133,176,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,315,133,315,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,399,129,315,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,399,311,399,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,399,311,350,311, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,350,329,350,311, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,350,329,258,329, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,258,370,258,329, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,60,370,258,370, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,60,370,60,391, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,60,391,0,391, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,0,391,0,331, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,21,331,0,331, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,21,331,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,96,133,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,107,300,159,300,159,248,107,248,107,300,
-              'fill'=>outline, 'tags'=>['floor3','bg'])
-end
-
-# floor_fg1 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the foreground information for the first
-# floor (office outlines and numbers).
-#
-# Arguments:
-# w -           The canvas window.
-# color -       Color to use for drawing foreground information.
-
-def floor_fg1(w,color)
-  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '101'
-  $floorItems['101'] = i
-  TkcText.new(w,358,209, 'text'=>'101', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'Pub Lift1'
-  $floorItems['Pub Lift1'] = i
-  TkcText.new(w,323,223, 'text'=>'Pub Lift1', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'Priv Lift1'
-  $floorItems['Priv Lift1'] = i
-  TkcText.new(w,323,188, 'text'=>'Priv Lift1', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,42,389,42,337,1,337,1,389,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '110'
-  $floorItems['110'] = i
-  TkcText.new(w,21.5,363, 'text'=>'110', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,59,389,59,385,90,385,90,337,44,337,44,389,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '109'
-  $floorItems['109'] = i
-  TkcText.new(w,67,363, 'text'=>'109', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,51,300,51,253,6,253,6,300,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '111'
-  $floorItems['111'] = i
-  TkcText.new(w,28.5,276.5, 'text'=>'111', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,98,248,98,309,79,309,79,248,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '117B'
-  $floorItems['117B'] = i
-  TkcText.new(w,88.5,278.5, 'text'=>'117B', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,51,251,51,204,6,204,6,251,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '112'
-  $floorItems['112'] = i
-  TkcText.new(w,28.5,227.5, 'text'=>'112', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,6,156,51,156,51,203,6,203,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '113'
-  $floorItems['113'] = i
-  TkcText.new(w,28.5,179.5, 'text'=>'113', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,85,169,79,169,79,192,85,192,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '117A'
-  $floorItems['117A'] = i
-  TkcText.new(w,82,180.5, 'text'=>'117A', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,77,302,77,168,53,168,53,302,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '117'
-  $floorItems['117'] = i
-  TkcText.new(w,65,235, 'text'=>'117', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,51,155,51,115,6,115,6,155,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '114'
-  $floorItems['114'] = i
-  TkcText.new(w,28.5,135, 'text'=>'114', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,95,115,53,115,53,168,95,168,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '115'
-  $floorItems['115'] = i
-  TkcText.new(w,74,141.5, 'text'=>'115', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,87,113,87,27,10,27,10,113,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '116'
-  $floorItems['116'] = i
-  TkcText.new(w,48.5,70, 'text'=>'116', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,89,91,128,91,128,113,89,131,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '118'
-  $floorItems['118'] = i
-  TkcText.new(w,108.5,102, 'text'=>'118', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,178,128,178,132,216,132,216,91,
-                     163,91,163,112,149,112,149,128,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '120'
-  $floorItems['120'] = i
-  TkcText.new(w,189.5,111.5, 'text'=>'120', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,79,193,87,193,87,169,136,169,136,192,
-                     156,192,156,169,175,169,175,246,79,246,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '122'
-  $floorItems['122'] = i
-  TkcText.new(w,131,207.5, 'text'=>'122', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,138,169,154,169,154,191,138,191,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '121'
-  $floorItems['121'] = i
-  TkcText.new(w,146,180, 'text'=>'121', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,99,300,126,300,126,309,99,309,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '106A'
-  $floorItems['106A'] = i
-  TkcText.new(w,112.5,304.5, 'text'=>'106A', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,128,299,128,309,150,309,150,248,99,248,99,299,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '105'
-  $floorItems['105'] = i
-  TkcText.new(w,124.5,278.5, 'text'=>'105', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,174,309,174,300,152,300,152,309,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '106B'
-  $floorItems['106B'] = i
-  TkcText.new(w,163,304.5, 'text'=>'106B', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,176,299,176,309,216,309,216,248,152,248,152,299,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '104'
-  $floorItems['104'] = i
-  TkcText.new(w,184,278.5, 'text'=>'104', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,138,385,138,337,91,337,91,385,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '108'
-  $floorItems['108'] = i
-  TkcText.new(w,114.5,361, 'text'=>'108', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,256,337,140,337,140,385,256,385,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '107'
-  $floorItems['107'] = i
-  TkcText.new(w,198,361, 'text'=>'107', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,300,353,300,329,260,329,260,353,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'Smoking'
-  $floorItems['Smoking'] = i
-  TkcText.new(w,280,341, 'text'=>'Smoking', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,314,135,314,170,306,170,306,246,177,246,177,135,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '123'
-  $floorItems['123'] = i
-  TkcText.new(w,245.5,190.5, 'text'=>'123', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,217,248,301,248,301,326,257,326,257,310,217,310,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '103'
-  $floorItems['103'] = i
-  TkcText.new(w,259,287, 'text'=>'103', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,396,188,377,188,377,169,316,169,316,131,396,131,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '124'
-  $floorItems['124'] = i
-  TkcText.new(w,356,150, 'text'=>'124', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,397,226,407,226,407,189,377,189,377,246,397,246,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '125'
-  $floorItems['125'] = i
-  TkcText.new(w,392,217.5, 'text'=>'125', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,399,187,409,187,409,207,474,207,474,164,399,164,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '126'
-  $floorItems['126'] = i
-  TkcText.new(w,436.5,185.5, 'text'=>'126', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,409,209,409,229,399,229,399,253,
-                     486,253,486,239,474,239,474,209,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '127'
-  $floorItems['127'] = i
-  TkcText.new(w,436.5,'231', 'text'=>'127', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,501,164,501,174,495,174,495,188,
-                     490,188,490,204,476,204,476,164,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'MShower'
-  $floorItems['MShower'] = i
-  TkcText.new(w,488.5,'184', 'text'=>'MShower', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,497,176,513,176,513,204,492,204,492,190,497,190,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'Closet'
-  $floorItems['Closet'] = i
-  TkcText.new(w,502.5,190, 'text'=>'Closet', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,476,237,476,206,513,206,513,254,488,254,488,237,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'WShower'
-  $floorItems['WShower'] = i
-  TkcText.new(w,494.5,230, 'text'=>'WShower', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,486,131,558,131,558,135,724,135,724,166,
-                     697,166,697,275,553,275,531,254,515,254,
-                     515,174,503,174,503,161,486,161,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '130'
-  $floorItems['130'] = i
-  TkcText.new(w,638.5,205, 'text'=>'130', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,308,242,339,242,339,248,342,248,
-                     342,246,397,246,397,276,393,276,
-                     393,309,300,309,300,248,308,248,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '102'
-  $floorItems['102'] = i
-  TkcText.new(w,367.5,278.5, 'text'=>'102', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,397,255,486,255,486,276,397,276,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '128'
-  $floorItems['128'] = i
-  TkcText.new(w,441.5,265.5, 'text'=>'128', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,510,309,486,309,486,255,530,255,
-                     552,277,561,277,561,325,510,325,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '129'
-  $floorItems['129'] = i
-  TkcText.new(w,535.5,293, 'text'=>'129', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,696,281,740,281,740,387,642,387,
-                     642,389,561,389,561,277,696,277,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '133'
-  $floorItems['133'] = i
-  TkcText.new(w,628.5,335, 'text'=>'133', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,742,387,742,281,800,281,800,387,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '132'
-  $floorItems['132'] = i
-  TkcText.new(w,771,334, 'text'=>'132', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,800,168,800,280,699,280,699,168,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '134'
-  $floorItems['134'] = i
-  TkcText.new(w,749.5,224, 'text'=>'134', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,726,131,726,166,800,166,800,131,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '135'
-  $floorItems['135'] = i
-  TkcText.new(w,763,148.5, 'text'=>'135', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,340,360,335,363,331,365,326,366,304,366,
-                     304,312,396,312,396,288,400,288,404,288,
-                     409,290,413,292,418,297,421,302,422,309,
-                     421,318,417,325,411,330,405,332,397,333,
-                     344,333,340,334,336,336,335,338,332,342,
-                     331,347,332,351,334,354,336,357,341,359,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'Ramona Stair'
-  $floorItems['Ramona Stair'] = i
-  TkcText.new(w,368,323, 'text'=>'Ramona Stair', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,30,23,30,5,93,5,98,5,104,7,110,10,116,16,119,20,
-                     122,28,123,32,123,68,220,68,220,87,90,87,90,23,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'University Stair'
-  $floorItems['University Stair'] = i
-  TkcText.new(w,155,77.5, 'text'=>'University Stair', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,282,37,295,40,312,49,323,56,337,70,352,56,
-                     358,48,363,39,365,29,348,25,335,22,321,14,
-                     300,5,283,1,260,0,246,0,242,2,236,4,231,8,
-                     227,13,223,17,221,22,220,34,260,34,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'Plaza Stair'
-  $floorItems['Plaza Stair'] = i
-  TkcText.new(w,317.5,28.5, 'text'=>'Plaza Stair', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,220,34,260,34,282,37,295,40,312,49,
-                     323,56,337,70,350,83,365,94,377,100,
-                     386,104,386,128,220,128,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'Plaza Deck'
-  $floorItems['Plaza Deck'] = i
-  TkcText.new(w,303,81, 'text'=>'Plaza Deck', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,257,336,77,336,6,336,6,301,77,301,77,310,257,310,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '106'
-  $floorItems['106'] = i
-  TkcText.new(w,131.5,318.5, 'text'=>'106', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,146,110,162,110,162,91,130,91,130,115,95,115,
-                     95,128,114,128,114,151,157,151,157,153,112,153,
-                     112,130,97,130,97,168,175,168,175,131,146,131,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '119'
-  $floorItems['119'] = i
-  TkcText.new(w,143.5,133, 'text'=>'119', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  TkcLine.new(w,155,191,155,189, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,155,177,155,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,96,129,96,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,78,169,176,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,176,247,176,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,340,206,307,206, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,340,187,340,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,340,210,340,201, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,340,247,340,224, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,340,241,307,241, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,376,246,376,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,307,247,307,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,376,170,307,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,315,129,315,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,147,129,176,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,202,133,176,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,398,129,315,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,258,352,258,387, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,60,387,60,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,0,337,0,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,60,391,0,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,3,114,3,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,258,387,60,387, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,237,52,273, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,189,52,225, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,140,52,177, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,395,306,395,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,531,254,398,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,475,178,475,238, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,502,162,398,162, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,398,129,398,188, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,383,188,376,188, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,408,188,408,194, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,398,227,398,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,408,227,398,227, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,408,222,408,227, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,408,206,408,210, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,408,208,475,208, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,484,278,484,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,484,311,508,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,508,327,508,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,559,327,508,327, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,644,391,559,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,644,389,644,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,514,205,475,205, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,496,189,496,187, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,559,129,484,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,484,162,484,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,725,133,559,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,559,129,559,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,725,149,725,167, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,725,129,802,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,802,389,802,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,739,167,802,167, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,396,188,408,188, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,0,337,9,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,58,337,21,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,43,391,43,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,105,337,75,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,91,387,91,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,154,337,117,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,139,387,139,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,227,337,166,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,258,337,251,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,258,328,302,328, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,302,355,302,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,395,311,302,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,484,278,395,278, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,395,294,395,278, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,473,278,473,275, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,473,256,473,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,533,257,531,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,553,276,551,274, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,698,276,553,276, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,559,391,559,327, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,802,389,644,389, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,741,314,741,389, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,698,280,698,167, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,707,280,698,280, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,802,280,731,280, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,741,280,741,302, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,698,167,727,167, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,725,137,725,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,514,254,514,175, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,496,175,514,175, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,502,175,502,162, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,475,166,475,162, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,496,176,496,175, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,491,189,496,189, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,491,205,491,189, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,487,238,475,238, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,487,240,487,238, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,487,252,487,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,315,133,304,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,256,133,280,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,78,247,270,247, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,307,247,294,247, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,214,133,232,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,217,247,217,266, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,217,309,217,291, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,217,309,172,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,154,309,148,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,175,300,175,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,151,300,175,300, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,151,247,151,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,78,237,78,265, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,78,286,78,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,106,309,78,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,130,309,125,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,99,309,99,247, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,127,299,99,299, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,127,309,127,299, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,155,191,137,191, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,137,169,137,191, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,78,171,78,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,78,190,78,218, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,86,192,86,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,86,192,78,192, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,301,3,301, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,286,52,301, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,252,3,252, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,203,3,203, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,3,156,52,156, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,8,25,8,114, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,63,114,3,114, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,75,114,97,114, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,108,114,129,114, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,129,114,129,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,114,52,128, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,132,89,88,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,88,25,88,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,88,114,88,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,218,89,144,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,147,111,147,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,162,111,147,111, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,162,109,162,111, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,162,96,162,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,218,89,218,94, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,218,89,218,119, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,8,25,88,25, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,258,337,258,328, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,113,129,96,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,302,355,258,355, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,386,104,386,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,377,100,386,104, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,365,94,377,100, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,350,83,365,94, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,337,70,350,83, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,337,70,323,56, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,312,49,323,56, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,295,40,312,49, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,282,37,295,40, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,260,34,282,37, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,253,34,260,34, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,386,128,386,104, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,113,152,156,152, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,113,152,156,152, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,113,152,113,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-end
-
-# floor_fg2 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the foreground information for the second
-# floor (office outlines and numbers).
-#
-# Arguments:
-# w -           The canvas window.
-# color -       Color to use for drawing foreground information.
-
-def floor_fg2(w,color)
-  i = TkcPolygon.new(w,748,188,755,188,755,205,758,205,758,222,
-                     800,222,800,168,748,168,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '238'
-  $floorItems['238'] = i
-  TkcText.new(w,774,195, 'text'=>'238', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,726,188,746,188,746,166,800,166,800,131,726,131,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '237'
-  $floorItems['237'] = i
-  TkcText.new(w,763,148.5, 'text'=>'237', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,497,187,497,204,559,204,559,324,641,324,
-                     643,324,643,291,641,291,641,205,696,205,
-                     696,291,694,291,694,314,715,314,715,291,
-                     715,205,755,205,755,190,724,190,724,187,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '246'
-  $floorItems['246'] = i
-  TkcText.new(w,600,264, 'text'=>'246', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,694,279,643,279,643,314,694,314,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '247'
-  $floorItems['247'] = i
-  TkcText.new(w,668.5,296.5, 'text'=>'247', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,232,250,308,250,308,242,339,242,339,246,
-                     397,246,397,255,476,255,476,250,482,250,559,250,
-                     559,274,482,274,482,278,396,278,396,274,232,274,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '202'
-  $floorItems['202'] = i
-  TkcText.new(w,285.5,260, 'text'=>'202', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,53,228,53,338,176,338,233,338,233,196,
-                     306,196,306,180,175,180,175,169,156,169,
-                     156,196,176,196,176,228,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '206'
-  $floorItems['206'] = i
-  TkcText.new(w,143,267, 'text'=>'206', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,277,6,277,6,338,51,338,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '212'
-  $floorItems['212'] = i
-  TkcText.new(w,28.5,307.5, 'text'=>'212', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,557,276,486,276,486,309,510,309,510,325,557,325,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '245'
-  $floorItems['245'] = i
-  TkcText.new(w,521.5,300.5, 'text'=>'245', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,560,389,599,389,599,326,560,326,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '244'
-  $floorItems['244'] = i
-  TkcText.new(w,579.5,357.5, 'text'=>'244', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,601,389,601,326,643,326,643,389,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '243'
-  $floorItems['243'] = i
-  TkcText.new(w,622,357.5, 'text'=>'243', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,688,316,645,316,645,365,688,365,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '242'
-  $floorItems['242'] = i
-  TkcText.new(w,666.5,340.5, 'text'=>'242', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,802,367,759,367,759,226,802,226,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = 'Barbecue Deck'
-  $floorItems['Barbecue Deck'] = i
-  TkcText.new(w,780.5,296.5, 'text'=>'Barbecue Deck', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,755,262,755,314,717,314,717,262,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '240'
-  $floorItems['240'] = i
-  TkcText.new(w,736,288, 'text'=>'240', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,755,316,689,316,689,365,755,365,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '241'
-  $floorItems['241'] = i
-  TkcText.new(w,722,340.5, 'text'=>'241', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,755,206,717,206,717,261,755,261,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '239'
-  $floorItems['239'] = i
-  TkcText.new(w,736,233.5, 'text'=>'239', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,695,277,643,277,643,206,695,206,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '248'
-  $floorItems['248'] = i
-  TkcText.new(w,669,241.5, 'text'=>'248', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,676,135,676,185,724,185,724,135,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '236'
-  $floorItems['236'] = i
-  TkcText.new(w,700,160, 'text'=>'236', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,675,135,635,135,635,145,628,145,628,185,675,185,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '235'
-  $floorItems['235'] = i
-  TkcText.new(w,651.5,160, 'text'=>'235', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,626,143,633,143,633,135,572,135,
-                     572,143,579,143,579,185,626,185,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '234'
-  $floorItems['234'] = i
-  TkcText.new(w,606,160, 'text'=>'234', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,557,135,571,135,571,145,578,145,
-                     578,185,527,185,527,131,557,131,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '233'
-  $floorItems['233'] = i
-  TkcText.new(w,552.5,158, 'text'=>'233', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,476,249,557,249,557,205,476,205,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '230'
-  $floorItems['230'] = i
-  TkcText.new(w,516.5,227, 'text'=>'230', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,476,164,486,164,486,131,525,131,525,185,476,185,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '232'
-  $floorItems['232'] = i
-  TkcText.new(w,500.5,158, 'text'=>'232', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,476,186,495,186,495,204,476,204,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '229'
-  $floorItems['229'] = i
-  TkcText.new(w,485.5,195, 'text'=>'229', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,474,207,409,207,409,187,399,187,399,164,474,164,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '227'
-  $floorItems['227'] = i
-  TkcText.new(w,436.5,185.5, 'text'=>'227', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,399,228,399,253,474,253,474,209,409,209,409,228,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '228'
-  $floorItems['228'] = i
-  TkcText.new(w,436.5,231, 'text'=>'228', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,397,246,397,226,407,226,407,189,377,189,377,246,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '226'
-  $floorItems['226'] = i
-  TkcText.new(w,392,217.5, 'text'=>'226', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,377,169,316,169,316,131,397,131,397,188,377,188,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '225'
-  $floorItems['225'] = i
-  TkcText.new(w,356.5,150, 'text'=>'225', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,234,198,306,198,306,249,234,249,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '224'
-  $floorItems['224'] = i
-  TkcText.new(w,270,223.5, 'text'=>'224', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,270,179,306,179,306,170,314,170,314,135,270,135,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '223'
-  $floorItems['223'] = i
-  TkcText.new(w,292,157, 'text'=>'223', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,268,179,221,179,221,135,268,135,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '222'
-  $floorItems['222'] = i
-  TkcText.new(w,244.5,157, 'text'=>'222', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,177,179,219,179,219,135,177,135,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '221'
-  $floorItems['221'] = i
-  TkcText.new(w,198,157, 'text'=>'221', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,299,327,349,327,349,284,341,284,341,276,299,276,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '204'
-  $floorItems['204'] = i
-  TkcText.new(w,324,301.5, 'text'=>'204', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,234,276,297,276,297,327,257,327,257,338,234,338,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '205'
-  $floorItems['205'] = i
-  TkcText.new(w,265.5,307, 'text'=>'205', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,256,385,256,340,212,340,212,385,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '207'
-  $floorItems['207'] = i
-  TkcText.new(w,234,362.5, 'text'=>'207', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,210,340,164,340,164,385,210,385,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '208'
-  $floorItems['208'] = i
-  TkcText.new(w,187,362.5, 'text'=>'208', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,115,340,162,340,162,385,115,385,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '209'
-  $floorItems['209'] = i
-  TkcText.new(w,138.5,362.5, 'text'=>'209', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,89,228,89,156,53,156,53,228,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '217'
-  $floorItems['217'] = i
-  TkcText.new(w,71,192, 'text'=>'217', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,89,169,97,169,97,190,89,190,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '217A'
-  $floorItems['217A'] = i
-  TkcText.new(w,93,179.5, 'text'=>'217A', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,89,156,89,168,95,168,95,135,53,135,53,156,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '216'
-  $floorItems['216'] = i
-  TkcText.new(w,71,145.5, 'text'=>'216', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,179,51,135,6,135,6,179,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '215'
-  $floorItems['215'] = i
-  TkcText.new(w,28.5,157, 'text'=>'215', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,227,6,227,6,180,51,180,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '214'
-  $floorItems['214'] = i
-  TkcText.new(w,28.5,203.5, 'text'=>'214', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,275,6,275,6,229,51,229,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '213'
-  $floorItems['213'] = i
-  TkcText.new(w,28.5,252, 'text'=>'213', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,114,340,67,340,67,385,114,385,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '210'
-  $floorItems['210'] = i
-  TkcText.new(w,90.5,362.5, 'text'=>'210', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,59,389,59,385,65,385,65,340,1,340,1,389,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '211'
-  $floorItems['211'] = i
-  TkcText.new(w,33,364.5, 'text'=>'211', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,393,309,350,309,350,282,342,282,342,276,393,276,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '203'
-  $floorItems['203'] = i
-  TkcText.new(w,367.5,292.5, 'text'=>'203', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,99,191,91,191,91,226,174,226,174,198,
-                     154,198,154,192,109,192,109,169,99,169,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '220'
-  $floorItems['220'] = i
-  TkcText.new(w,132.5,208.5, 'text'=>'220', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = 'Priv Lift2'
-  $floorItems['Priv Lift2'] = i
-  TkcText.new(w,323,188, 'text'=>'Priv Lift2', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = 'Pub Lift 2'
-  $floorItems['Pub Lift 2'] = i
-  TkcText.new(w,323,223, 'text'=>'Pub Lift 2', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '218'
-  $floorItems['218'] = i
-  TkcText.new(w,136,149.5, 'text'=>'218', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '219'
-  $floorItems['219'] = i
-  TkcText.new(w,132.5,180, 'text'=>'219', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '201'
-  $floorItems['201'] = i
-  TkcText.new(w,358,209, 'text'=>'201', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  TkcLine.new(w,641,186,678,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,350,757,367, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,634,133,634,144, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,634,144,627,144, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,572,133,572,144, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,572,144,579,144, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,398,129,398,162, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,174,197,175,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,175,197,175,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,206,757,221, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,396,188,408,188, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,727,189,725,189, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,747,167,802,167, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,747,167,747,189, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,755,189,739,189, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,769,224,757,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,802,224,802,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,802,129,725,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,725,189,725,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,725,186,690,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,676,133,676,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,627,144,627,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,629,186,593,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,579,144,579,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,559,129,559,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,725,133,559,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,484,162,484,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,559,129,484,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,526,129,526,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,540,186,581,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,528,186,523,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,511,186,475,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,496,190,496,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,496,205,496,202, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,475,205,527,205, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,558,205,539,205, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,558,205,558,249, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,558,249,475,249, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,662,206,642,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,695,206,675,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,695,278,642,278, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,642,291,642,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,695,291,695,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,716,208,716,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,206,716,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,221,757,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,793,224,802,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,262,716,262, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,716,220,716,264, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,716,315,716,276, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,315,703,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,325,757,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,367,644,367, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,689,367,689,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,647,315,644,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,659,315,691,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,600,325,600,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,627,325,644,325, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,644,391,644,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,615,325,575,325, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,644,391,558,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,563,325,558,325, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,558,391,558,314, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,558,327,508,327, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,558,275,484,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,558,302,558,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,508,327,508,311, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,484,311,508,311, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,484,275,484,311, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,475,208,408,208, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,408,206,408,210, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,408,222,408,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,408,227,398,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,398,227,398,254, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,408,188,408,194, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,383,188,376,188, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,398,188,398,162, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,398,162,484,162, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,475,162,475,254, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,398,254,475,254, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,484,280,395,280, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,395,311,395,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,307,197,293,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,278,197,233,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,233,197,233,249, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,307,179,284,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,233,249,278,249, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,269,179,269,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,220,179,220,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,155,191,110,191, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,90,190,98,190, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,98,169,98,190, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,52,133,52,165, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,52,214,52,177, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,52,226,52,262, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,52,274,52,276, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,234,275,234,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,226,339,258,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,211,387,211,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,214,339,177,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,258,387,60,387, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,3,133,3,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,165,339,129,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,117,339,80,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,68,339,59,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,0,339,46,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,60,391,0,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,0,339,0,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,60,387,60,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,258,329,258,387, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,350,329,258,329, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,395,311,350,311, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,398,129,315,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,176,133,315,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,176,129,96,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,3,133,96,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,66,387,66,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,115,387,115,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,163,387,163,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,234,275,276,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,288,275,309,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,298,275,298,329, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,341,283,350,283, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,321,275,341,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,375,275,395,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,315,129,315,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,376,170,307,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,307,250,307,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,376,245,376,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,340,241,307,241, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,340,245,340,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,340,210,340,201, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,340,187,340,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,340,206,307,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,293,250,307,250, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,271,179,238,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,226,179,195,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,176,129,176,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,182,179,176,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,174,169,176,169, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,162,169,90,169, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,96,169,96,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,175,227,90,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,90,190,90,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,52,179,3,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,52,228,3,228, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,52,276,3,276, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,155,177,155,169, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,110,191,110,169, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,155,189,155,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,350,283,350,329, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,162,197,155,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,341,275,341,283, 'fill'=>color, 'tags'=>['floor2','wall'])
-end
-
-# floor_fg3 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the foreground information for the third
-# floor (office outlines and numbers).
-#
-# Arguments:
-# w -           The canvas window.
-# color -       Color to use for drawing foreground information.
-
-def floor_fg3(w,color)
-  i = TkcPolygon.new(w,89,228,89,180,70,180,70,228,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '316'
-  $floorItems['316'] = i
-  TkcText.new(w,79.5,204, 'text'=>'316', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,115,368,162,368,162,323,115,323,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '309'
-  $floorItems['309'] = i
-  TkcText.new(w,138.5,345.5, 'text'=>'309', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,164,323,164,368,211,368,211,323,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '308'
-  $floorItems['308'] = i
-  TkcText.new(w,187.5,345.5, 'text'=>'308', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,256,368,212,368,212,323,256,323,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '307'
-  $floorItems['307'] = i
-  TkcText.new(w,234,345.5, 'text'=>'307', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,244,276,297,276,297,327,260,327,260,321,244,321,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '305'
-  $floorItems['305'] = i
-  TkcText.new(w,270.5,301.5, 'text'=>'305', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,251,219,251,203,244,203,244,219,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '324B'
-  $floorItems['324B'] = i
-  TkcText.new(w,247.5,211, 'text'=>'324B', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,251,249,244,249,244,232,251,232,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '324A'
-  $floorItems['324A'] = i
-  TkcText.new(w,247.5,240.5, 'text'=>'324A', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,223,135,223,179,177,179,177,135,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '320'
-  $floorItems['320'] = i
-  TkcText.new(w,200,157, 'text'=>'320', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,114,368,114,323,67,323,67,368,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '310'
-  $floorItems['310'] = i
-  TkcText.new(w,90.5,345.5, 'text'=>'310', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,23,277,23,321,68,321,68,277,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '312'
-  $floorItems['312'] = i
-  TkcText.new(w,45.5,299, 'text'=>'312', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,23,229,68,229,68,275,23,275,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '313'
-  $floorItems['313'] = i
-  TkcText.new(w,45.5,252, 'text'=>'313', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,68,227,23,227,23,180,68,180,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '314'
-  $floorItems['314'] = i
-  TkcText.new(w,40.5,203.5, 'text'=>'314', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,95,179,95,135,23,135,23,179,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '315'
-  $floorItems['315'] = i
-  TkcText.new(w,59,157, 'text'=>'315', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,99,226,99,204,91,204,91,226,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '316B'
-  $floorItems['316B'] = i
-  TkcText.new(w,95,215, 'text'=>'316B', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,91,202,99,202,99,180,91,180,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '316A'
-  $floorItems['316A'] = i
-  TkcText.new(w,95,191, 'text'=>'316A', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,97,169,109,169,109,192,154,192,154,198,
-                     174,198,174,226,101,226,101,179,97,179,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '319'
-  $floorItems['319'] = i
-  TkcText.new(w,141.5,209, 'text'=>'319', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,65,368,58,368,58,389,1,389,1,333,23,333,23,323,65,323,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '311'
-  $floorItems['311'] = i
-  TkcText.new(w,29.5,361, 'text'=>'311', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '318'
-  $floorItems['318'] = i
-  TkcText.new(w,132.5,180, 'text'=>'318', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '317'
-  $floorItems['317'] = i
-  TkcText.new(w,136,149.5, 'text'=>'317', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,274,194,274,221,306,221,306,194,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '323'
-  $floorItems['323'] = i
-  TkcText.new(w,290,207.5, 'text'=>'323', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,306,222,274,222,274,249,306,249,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '325'
-  $floorItems['325'] = i
-  TkcText.new(w,290,235.5, 'text'=>'325', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,263,179,224,179,224,135,263,135,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '321'
-  $floorItems['321'] = i
-  TkcText.new(w,243.5,157, 'text'=>'321', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,314,169,306,169,306,192,273,192,
-                     264,181,264,135,314,135,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '322'
-  $floorItems['322'] = i
-  TkcText.new(w,293.5,163.5, 'text'=>'322', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = 'Pub Lift3'
-  $floorItems['Pub Lift3'] = i
-  TkcText.new(w,323,223, 'text'=>'Pub Lift3', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = 'Priv Lift3'
-  $floorItems['Priv Lift3'] = i
-  TkcText.new(w,323,188, 'text'=>'Priv Lift3', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,350,284,376,284,376,276,397,276,397,309,350,309,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '303'
-  $floorItems['303'] = i
-  TkcText.new(w,373.5,292.5, 'text'=>'303', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,272,203,272,249,252,249,252,230,
-                     244,230,244,221,252,221,252,203,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '324'
-  $floorItems['324'] = i
-  TkcText.new(w,262,226, 'text'=>'324', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,299,276,299,327,349,327,349,284,341,284,341,276,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '304'
-  $floorItems['304'] = i
-  TkcText.new(w,324,301.5, 'text'=>'304', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '301'
-  $floorItems['301'] = i
-  TkcText.new(w,358,209, 'text'=>'301', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,397,246,377,246,377,185,397,185,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '327'
-  $floorItems['327'] = i
-  TkcText.new(w,387,215.5, 'text'=>'327', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,316,131,316,169,377,169,377,185,397,185,397,131,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '326'
-  $floorItems['326'] = i
-  TkcText.new(w,365.5,150, 'text'=>'326', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,308,251,242,251,242,274,342,274,342,282,375, 282,
-                     375,274,397,274,397,248,339,248,339,242,308,242,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '302'
-  $floorItems['302'] = i
-  TkcText.new(w,319.5,261, 'text'=>'302', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,70,321,242,321,242,200,259,200,259,203,272,203,
-                     272,193,263,180,242,180,175,180,175,169,156,169,
-                     156,196,177,196,177,228,107,228,70,228,70,275,107,275,
-                     107,248,160,248,160,301,107,301,107,275,70,275,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '306'
-  $floorItems['306'] = i
-  TkcText.new(w,200.5,284.5, 'text'=>'306', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  TkcLine.new(w,341,275,341,283, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,162,197,155,197, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,396,247,399,247, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,399,129,399,311, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,258,202,243,202, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,350,283,350,329, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,251,231,243,231, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,243,220,251,220, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,243,250,243,202, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,155,197,155,190, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,110,192,110,169, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,155,192,110,192, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,155,177,155,169, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,176,197,176,227, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,69,280,69,274, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,21,276,69,276, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,69,262,69,226, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,21,228,69,228, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,21,179,75,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,69,179,69,214, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,90,220,90,227, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,90,204,90,202, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,90,203,100,203, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,90,187,90,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,90,227,176,227, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,100,179,100,227, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,100,179,87,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,96,179,96,129, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,162,169,96,169, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,173,169,176,169, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,182,179,176,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,176,129,176,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,195,179,226,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,224,133,224,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,264,179,264,133, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,238,179,264,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,273,207,273,193, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,273,235,273,250, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,273,224,273,219, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,273,193,307,193, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,273,222,307,222, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,273,250,307,250, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,384,247,376,247, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,340,206,307,206, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,340,187,340,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,340,210,340,201, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,340,247,340,224, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,340,241,307,241, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,376,247,376,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,307,250,307,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,376,170,307,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,315,129,315,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,376,283,366,283, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,376,283,376,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,399,275,376,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,341,275,320,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,341,283,350,283, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,298,275,298,329, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,308,275,298,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,243,322,243,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,243,275,284,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,258,322,226,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,212,370,212,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,214,322,177,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,163,370,163,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,165,322,129,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,84,322,117,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,71,322,64,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,115,322,115,370, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,66,322,66,370, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,52,322,21,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,21,331,0,331, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,21,331,21,133, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,96,133,21,133, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,176,129,96,129, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,315,133,176,133, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,315,129,399,129, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,399,311,350,311, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,350,329,258,329, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,258,322,258,370, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,60,370,258,370, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,60,370,60,391, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,0,391,0,331, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,60,391,0,391, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,307,250,307,242, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,273,250,307,250, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,258,250,243,250, 'fill'=>color, 'tags'=>['floor3','wall'])
-end
-
-# Below is the "main program" that creates the floorplan demonstration.
-
-# toplevel widget
-if defined?($floor_demo) && $floor_demo
-  $floor_demo.destroy
-  $floor_demo = nil
-end
-
-# demo toplevel widget
-$floor_demo = TkToplevel.new {|w|
-  title("Floorplan Canvas Demonstration")
-  iconname("Floorplan")
-  positionWindow(w)
-  geometry('+20+20')
-  minsize(100,100)
-}
-
-base_frame = TkFrame.new($floor_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'8i', 'justify'=>'left',
-            'text'=>"This window contains a canvas widget showing the floorplan of Digital Equipment Corporation's Western Research Laboratory.  It has three levels.  At any given time one of the levels is active, meaning that you can see its room structure.  To activate a level, click the left mouse button anywhere on it.  As the mouse moves over the active level, the room under the mouse lights up and its room number appears in the \"Room:\" entry.  You can also type a room number in the entry and the room will light up."){
-  pack('side'=>'top')
-}
-
-# frame
-$floor_buttons = TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $floor_demo
-      $floor_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'floor'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$floor_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-#
-$floorLabels = {}
-$floorItems = {}
-
-# canvas
-if $tk_version =~ /^4\.[01]/
-  $floor_canvas_frame = TkFrame.new(base_frame,'bd'=>2,'relief'=>'sunken',
-                                    'highlightthickness'=>2)
-  $floor_canvas = TkCanvas.new($floor_canvas_frame,
-                               'width'=>900, 'height'=>500, 'borderwidth'=>0,
-                               'highlightthickness'=>0) {|c|
-    TkScrollbar.new(base_frame, 'orient'=>'horiz',
-                    'command'=>proc{|*args| c.xview(*args)}){|hs|
-      c.xscrollcommand(proc{|first,last| hs.set first,last})
-      pack('side'=>'bottom', 'fill'=>'x')
-    }
-    TkScrollbar.new(base_frame, 'command'=>proc{|*args| c.yview(*args)}){|vs|
-      c.yscrollcommand(proc{|first,last| vs.set first,last})
-      pack('side'=>'right', 'fill'=>'y')
-    }
-  }
-  $floor_canvas_frame.pack('side'=>'top','fill'=>'both', 'expand'=>'yes')
-  $floor_canvas.pack('expand'=>'yes', 'fill'=>'both')
-
-else
-  TkFrame.new(base_frame) {|f|
-    pack('side'=>'top', 'fill'=>'both', 'expand'=>'yes')
-
-    h = TkScrollbar.new(f, 'highlightthickness'=>0, 'orient'=>'horizontal')
-    v = TkScrollbar.new(f, 'highlightthickness'=>0, 'orient'=>'vertical')
-
-    TkFrame.new(f, 'bd'=>2, 'relief'=>'sunken') {|f1|
-      $floor_canvas = TkCanvas.new(f1, 'width'=>900, 'height'=>500,
-                                   'borderwidth'=>0,
-                                   'highlightthickness'=>0) {
-        xscrollcommand(proc{|first,last| h.set first,last})
-        yscrollcommand(proc{|first,last| v.set first,last})
-        pack('expand'=>'yes', 'fill'=>'both')
-      }
-      grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0,
-           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    }
-
-    v.grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1,
-           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    h.grid('padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0,
-           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-
-    TkGrid.rowconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
-    TkGrid.columnconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
-
-    pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>1)
-
-    v.command(proc{|*args| $floor_canvas.yview(*args)})
-    h.command(proc{|*args| $floor_canvas.xview(*args)})
-  }
-end
-
-
-# Create an entry for displaying and typing in current room.
-
-$currentRoom = TkVariable.new
-$floor_entry = TkEntry.new($floor_canvas, 'width'=>10, 'relief'=>'sunken',
-                           'bd'=>2, 'textvariable'=>$currentRoom)
-
-# Choose colors, then fill in the floorplan.
-
-$floor_colors = {}
-if TkWinfo.depth($floor_canvas) > 1
-  $floor_colors['bg1'] = '#a9c1da'
-  $floor_colors['outline1'] = '#77889a'
-  $floor_colors['bg2'] = '#9ab0c6'
-  $floor_colors['outline2'] = '#687786'
-  $floor_colors['bg3'] = '#8ba0b3'
-  $floor_colors['outline3'] = '#596673'
-  $floor_colors['offices'] = 'Black'
-  $floor_colors['active'] = '#c4d1df'
-else
-  $floor_colors['bg1'] = 'white'
-  $floor_colors['outline1'] = 'black'
-  $floor_colors['bg2'] = 'white'
-  $floor_colors['outline2'] = 'black'
-  $floor_colors['bg3'] = 'white'
-  $floor_colors['outline3'] = 'black'
-  $floor_colors['offices'] = 'Black'
-  $floor_colors['active'] = 'black'
-end
-
-$activeFloor = ''
-floorDisplay $floor_canvas,3
-
-# Set up event bindings for canvas:
-
-$floor_canvas.itembind('floor1', '1', proc{floorDisplay $floor_canvas,1})
-$floor_canvas.itembind('floor2', '1', proc{floorDisplay $floor_canvas,2})
-$floor_canvas.itembind('floor3', '1', proc{floorDisplay $floor_canvas,3})
-$floor_canvas.itembind('room', 'Enter', proc{newRoom $floor_canvas})
-$floor_canvas.itembind('room', 'Leave', proc{$currentRoom.value = ''})
-$floor_canvas.bind('2', proc{|x,y| $floor_canvas.scan_mark x,y}, '%x %y')
-$floor_canvas.bind('B2-Motion',
-                   proc{|x,y| $floor_canvas.scan_dragto x,y}, '%x %y')
-$floor_canvas.bind('Destroy', proc{$currentRoom.unset})
-$currentRoom.value = ''
-$currentRoom.trace('w',proc{roomChanged $floor_canvas})
-
diff --git a/ext/tk/sample/demos-en/floor2.rb b/ext/tk/sample/demos-en/floor2.rb
deleted file mode 100644
index 518dd3b0fd..0000000000
--- a/ext/tk/sample/demos-en/floor2.rb
+++ /dev/null
@@ -1,1723 +0,0 @@
-# frozen_string_literal: false
-%# floor2.rb
-#
-# This demonstration script creates a canvas widget that displays the
-# floorplan for DEC's Western Research Laboratory.
-#
-# floorDisplay widget demo (called by 'widget')
-#
-
-# floorDisplay2 --
-# Recreate the floorplan display in the canvas given by "w".  The
-# floor given by "active" is displayed on top with its office structure
-# visible.
-#
-# Arguments:
-# w -           Name of the canvas window.
-# active -      Number of active floor (1, 2, or 3).
-
-def floorDisplay2(w,active)
-  return if $activeFloor2 == active
-
-  w.delete('all')
-  $activeFloor2 = active
-
-  # First go through the three floors, displaying the backgrounds for
-  # each floor.
-
-  floor2_bg1(w,$floor2_colors['bg1'],$floor2_colors['outline1'])
-  floor2_bg2(w,$floor2_colors['bg2'],$floor2_colors['outline2'])
-  floor2_bg3(w,$floor2_colors['bg3'],$floor2_colors['outline3'])
-
-  # Raise the background for the active floor so that it's on top.
-
-  w.raise("floor#{active}")
-
-  # Create a dummy item just to mark this point in the display list,
-  # so we can insert highlights here.
-
-  w.create(TkcRectangle,0,100,1,101,'fill'=>'','outline'=>'','tags'=>'marker')
-
-  # Add the walls and labels for the active floor, along with
-  # transparent polygons that define the rooms on the floor.
-  # Make sure that the room polygons are on top.
-
-  $floorLabels2.clear
-  $floorItems2.clear
-  send("floor2_fg#{active}", w, $floor2_colors['offices'])
-  w.raise('room')
-
-  # Offset the floors diagonally from each other.
-
-  w.move('floor1', '2c', '2c')
-  w.move('floor2', '1c', '1c')
-
-  # Create items for the room entry and its label.
-  w.create(TkcWindow, 600, 100, 'anchor'=>'w', 'window'=>$floor2_entry)
-  w.create(TkcText, 600, 100, 'anchor'=>'e', 'text'=>"Room: ")
-  w['scrollregion'] = w.bbox('all')
-end
-
-# newRoom2 --
-# This method is invoked whenever the mouse enters a room
-# in the floorplan.  It changes tags so that the current room is
-# highlighted.
-#
-# Arguments:
-# w  -          The name of the canvas window.
-
-def newRoom2(w)
-  id = w.find_withtag('current')[0]
-  $currentRoom2.value = $floorLabels2[id.id] if id != ""
-  Tk.update(true)
-end
-
-# roomChanged2 --
-# This method is invoked whenever the currentRoom variable changes.
-# It highlights the current room and unhighlights any previous room.
-#
-# Arguments:
-# w -           The canvas window displaying the floorplan.
-# args -        Not used.
-
-def roomChanged2(w,*args)
-  w.delete('highlight')
-  item = $floorItems2[$currentRoom2.value]
-  return if item == nil
-  new = TkcPolygon.new(w, *(w.coords(item)))
-  new.configure('fill'=>$floor2_colors['active'], 'tags'=>'highlight')
-  w.raise(new, 'marker')
-end
-
-# floor2_bg1 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the background information for the first
-# floor.
-#
-# Arguments:
-# w -           The canvas window.
-# fill -        Fill color to use for the floor's background.
-# outline -     Color to use for the floor's outline.
-
-def floor2_bg1(w,fill,outline)
-  w.create(TkcPolygon,347,80,349,82,351,84,353,85,363,92,375,99,386,104,
-                 386,129,398,129,398,162,484,162,484,129,559,129,559,133,725,
-                 133,725,129,802,129,802,389,644,389,644,391,559,391,559,327,
-                 508,327,508,311,484,311,484,278,395,278,395,288,400,288,404,
-                 288,409,290,413,292,418,297,421,302,422,309,421,318,417,325,
-                 411,330,405,332,397,333,344,333,340,334,336,336,335,338,332,
-                 342,331,347,332,351,334,354,336,357,341,359,340,360,335,363,
-                 331,365,326,366,304,366,304,355,258,355,258,387,60,387,60,391,
-                 0,391,0,337,3,337,3,114,8,114,8,25,30,25,30,5,93,5,98,5,104,7,
-                 110,10,116,16,119,20,122,28,123,32,123,68,220,68,220,34,221,
-                 22,223,17,227,13,231,8,236,4,242,2,246,0,260,0,283,1,300,5,
-                 321,14,335,22,348,25,365,29,363,39,358,48,352,56,337,70,
-                 344,76,347,80, 'tags'=>['floor1','bg'], 'fill'=>fill)
-  w.create(TkcLine,386,129,398,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,258,355,258,387, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,60,387,60,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,0,337,0,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,60,391,0,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,3,114,3,337, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,258,387,60,387, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,484,162,398,162, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,398,162,398,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,484,278,484,311, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,484,311,508,311, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,508,327,508,311, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,559,327,508,327, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,644,391,559,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,644,389,644,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,559,129,484,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,484,162,484,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,725,133,559,133, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,559,129,559,133, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,725,129,802,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,802,389,802,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,3,337,0,337, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,559,391,559,327, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,802,389,644,389, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,725,133,725,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,8,25,8,114, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,8,114,3,114, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,30,25,8,25, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,484,278,395,278, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,30,25,30,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,93,5,30,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,98,5,93,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,104,7,98,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,110,10,104,7, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,116,16,110,10, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,119,20,116,16, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,122,28,119,20, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,123,32,122,28, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,123,68,123,32, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,220,68,123,68, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,386,129,386,104, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,386,104,375,99, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,375,99,363,92, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,353,85,363,92, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,220,68,220,34, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,337,70,352,56, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,352,56,358,48, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,358,48,363,39, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,363,39,365,29, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,365,29,348,25, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,348,25,335,22, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,335,22,321,14, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,321,14,300,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,300,5,283,1, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,283,1,260,0, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,260,0,246,0, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,246,0,242,2, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,242,2,236,4, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,236,4,231,8, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,231,8,227,13, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,223,17,227,13, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,221,22,223,17, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,220,34,221,22, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,340,360,335,363, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,335,363,331,365, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,331,365,326,366, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,326,366,304,366, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,304,355,304,366, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,395,288,400,288, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,404,288,400,288, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,409,290,404,288, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,413,292,409,290, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,418,297,413,292, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,421,302,418,297, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,422,309,421,302, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,421,318,422,309, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,421,318,417,325, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,417,325,411,330, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,411,330,405,332, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,405,332,397,333, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,397,333,344,333, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,344,333,340,334, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,340,334,336,336, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,336,336,335,338, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,335,338,332,342, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,331,347,332,342, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,332,351,331,347, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,334,354,332,351, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,336,357,334,354, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,341,359,336,357, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,341,359,340,360, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,395,288,395,278, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,304,355,258,355, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,347,80,344,76, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,344,76,337,70, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,349,82,347,80, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,351,84,349,82, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,353,85,351,84, 'fill'=>outline, 'tags'=>['floor1','bg'])
-end
-
-# floor2_bg2 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the background information for the first
-# floor.
-#
-# Arguments:
-# w -           The canvas window.
-# fill -        Fill color to use for the floor's background.
-# outline -     Color to use for the floor's outline.
-
-def floor2_bg2(w,fill,outline)
-  w.create(TkcPolygon,559,129,484,129,484,162,398,162,398,129,315,129,
-                 315,133,176,133,176,129,96,129,96,133,3,133,3,339,0,339,0,391,
-                 60,391,60,387,258,387,258,329,350,329,350,311,395,311,395,280,
-                 484,280,484,311,508,311,508,327,558,327,558,391,644,391,644,
-                 367,802,367,802,129,725,129,725,133,559,133,559,129,
-                 'tags'=>['floor2','bg'], 'fill'=>fill)
-  w.create(TkcLine,350,311,350,329, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,398,129,398,162, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,802,367,802,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,802,129,725,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,725,133,725,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,559,129,559,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,559,133,725,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,484,162,484,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,559,129,484,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,802,367,644,367, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,644,367,644,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,644,391,558,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,558,327,558,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,558,327,508,327, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,508,327,508,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,484,311,508,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,484,280,484,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,398,162,484,162, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,484,280,395,280, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,395,280,395,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,258,387,60,387, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,3,133,3,339, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,3,339,0,339, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,60,391,0,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,0,339,0,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,60,387,60,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,258,329,258,387, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,350,329,258,329, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,395,311,350,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,398,129,315,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,176,133,315,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,176,129,96,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,3,133,96,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,315,133,315,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,176,133,176,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,96,133,96,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-end
-
-# floor2_bg3 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the background information for the first
-# floor.
-#
-# Arguments:
-# w -           The canvas window.
-# fill -        Fill color to use for the floor's background.
-# outline -     Color to use for the floor's outline.
-
-def floor2_bg3(w,fill,outline)
-  w.create(TkcPolygon,159,300,107,300,107,248,159,248,159,129,96,129,96,
-                 133,21,133,21,331,0,331,0,391,60,391,60,370,159,370,159,300,
-                 'tags'=>['floor3','bg'], 'fill'=>fill)
-  w.create(TkcPolygon,258,370,258,329,350,329,350,311,399,311,399,129,
-                 315,129,315,133,176,133,176,129,159,129,159,370,258,370,
-                 'tags'=>['floor3','bg'], 'fill'=>fill)
-  w.create(TkcLine,96,133,96,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,176,129,96,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,176,129,176,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,315,133,176,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,315,133,315,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,399,129,315,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,399,311,399,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,399,311,350,311, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,350,329,350,311, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,350,329,258,329, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,258,370,258,329, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,60,370,258,370, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,60,370,60,391, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,60,391,0,391, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,0,391,0,331, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,21,331,0,331, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,21,331,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,96,133,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,107,300,159,300,159,248,107,248,107,300,
-              'fill'=>outline, 'tags'=>['floor3','bg'])
-end
-
-# floor2_fg1 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the foreground information for the first
-# floor (office outlines and numbers).
-#
-# Arguments:
-# w -           The canvas window.
-# color -       Color to use for drawing foreground information.
-
-def floor2_fg1(w,color)
-  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '101'
-  $floorItems2['101'] = i
-  w.create(TkcText,358,209, 'text'=>'101', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = 'Pub Lift1'
-  $floorItems2['Pub Lift1'] = i
-  w.create(TkcText,323,223, 'text'=>'Pub Lift1', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = 'Priv Lift1'
-  $floorItems2['Priv Lift1'] = i
-  w.create(TkcText,323,188, 'text'=>'Priv Lift1', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,42,389,42,337,1,337,1,389,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '110'
-  $floorItems2['110'] = i
-  w.create(TkcText,21.5,363, 'text'=>'110', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,59,389,59,385,90,385,90,337,44,337,44,389,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '109'
-  $floorItems2['109'] = i
-  w.create(TkcText,67,363, 'text'=>'109', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,51,300,51,253,6,253,6,300,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '111'
-  $floorItems2['111'] = i
-  w.create(TkcText,28.5,276.5, 'text'=>'111', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,98,248,98,309,79,309,79,248,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '117B'
-  $floorItems2['117B'] = i
-  w.create(TkcText,88.5,278.5, 'text'=>'117B', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,51,251,51,204,6,204,6,251,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '112'
-  $floorItems2['112'] = i
-  w.create(TkcText,28.5,227.5, 'text'=>'112', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,6,156,51,156,51,203,6,203,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '113'
-  $floorItems2['113'] = i
-  w.create(TkcText,28.5,179.5, 'text'=>'113', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,85,169,79,169,79,192,85,192,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '117A'
-  $floorItems2['117A'] = i
-  w.create(TkcText,82,180.5, 'text'=>'117A', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,77,302,77,168,53,168,53,302,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '117'
-  $floorItems2['117'] = i
-  w.create(TkcText,65,235, 'text'=>'117', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,51,155,51,115,6,115,6,155,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '114'
-  $floorItems2['114'] = i
-  w.create(TkcText,28.5,135, 'text'=>'114', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,95,115,53,115,53,168,95,168,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '115'
-  $floorItems2['115'] = i
-  w.create(TkcText,74,141.5, 'text'=>'115', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,87,113,87,27,10,27,10,113,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '116'
-  $floorItems2['116'] = i
-  w.create(TkcText,48.5,70, 'text'=>'116', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,89,91,128,91,128,113,89,131,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '118'
-  $floorItems2['118'] = i
-  w.create(TkcText,108.5,102, 'text'=>'118', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,178,128,178,132,216,132,216,91,
-                     163,91,163,112,149,112,149,128,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '120'
-  $floorItems2['120'] = i
-  w.create(TkcText,189.5,111.5, 'text'=>'120', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,79,193,87,193,87,169,136,169,136,192,
-                     156,192,156,169,175,169,175,246,79,246,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '122'
-  $floorItems2['122'] = i
-  w.create(TkcText,131,207.5, 'text'=>'122', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,138,169,154,169,154,191,138,191,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '121'
-  $floorItems2['121'] = i
-  w.create(TkcText,146,180, 'text'=>'121', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,99,300,126,300,126,309,99,309,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '106A'
-  $floorItems2['106A'] = i
-  w.create(TkcText,112.5,304.5, 'text'=>'106A', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,128,299,128,309,150,309,150,248,99,248,99,299,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '105'
-  $floorItems2['105'] = i
-  w.create(TkcText,124.5,278.5, 'text'=>'105', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,174,309,174,300,152,300,152,309,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '106B'
-  $floorItems2['106B'] = i
-  w.create(TkcText,163,304.5, 'text'=>'106B', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,176,299,176,309,216,309,216,248,152,248,152,299,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '104'
-  $floorItems2['104'] = i
-  w.create(TkcText,184,278.5, 'text'=>'104', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,138,385,138,337,91,337,91,385,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '108'
-  $floorItems2['108'] = i
-  w.create(TkcText,114.5,361, 'text'=>'108', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,256,337,140,337,140,385,256,385,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '107'
-  $floorItems2['107'] = i
-  w.create(TkcText,198,361, 'text'=>'107', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,300,353,300,329,260,329,260,353,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = 'Smoking'
-  $floorItems2['Smoking'] = i
-  w.create(TkcText,280,341, 'text'=>'Smoking', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,314,135,314,170,306,170,306,246,177,246,177,135,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '123'
-  $floorItems2['123'] = i
-  w.create(TkcText,245.5,190.5, 'text'=>'123', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,217,248,301,248,301,326,257,326,257,310,217,310,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '103'
-  $floorItems2['103'] = i
-  w.create(TkcText,259,287, 'text'=>'103', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,396,188,377,188,377,169,316,169,316,131,396,131,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '124'
-  $floorItems2['124'] = i
-  w.create(TkcText,356,150, 'text'=>'124', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,397,226,407,226,407,189,377,189,377,246,397,246,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '125'
-  $floorItems2['125'] = i
-  w.create(TkcText,392,217.5, 'text'=>'125', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,399,187,409,187,409,207,474,207,474,164,399,164,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '126'
-  $floorItems2['126'] = i
-  w.create(TkcText,436.5,185.5, 'text'=>'126', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,409,209,409,229,399,229,399,253,
-                     486,253,486,239,474,239,474,209,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '127'
-  $floorItems2['127'] = i
-  w.create(TkcText,436.5,'231', 'text'=>'127', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,501,164,501,174,495,174,495,188,
-                     490,188,490,204,476,204,476,164,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = 'MShower'
-  $floorItems2['MShower'] = i
-  w.create(TkcText,488.5,'184', 'text'=>'MShower', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,497,176,513,176,513,204,492,204,492,190,497,190,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = 'Closet'
-  $floorItems2['Closet'] = i
-  w.create(TkcText,502.5,190, 'text'=>'Closet', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,476,237,476,206,513,206,513,254,488,254,488,237,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = 'WShower'
-  $floorItems2['WShower'] = i
-  w.create(TkcText,494.5,230, 'text'=>'WShower', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,486,131,558,131,558,135,724,135,724,166,
-                     697,166,697,275,553,275,531,254,515,254,
-                     515,174,503,174,503,161,486,161,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '130'
-  $floorItems2['130'] = i
-  w.create(TkcText,638.5,205, 'text'=>'130', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,308,242,339,242,339,248,342,248,
-                     342,246,397,246,397,276,393,276,
-                     393,309,300,309,300,248,308,248,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '102'
-  $floorItems2['102'] = i
-  w.create(TkcText,367.5,278.5, 'text'=>'102', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,397,255,486,255,486,276,397,276,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '128'
-  $floorItems2['128'] = i
-  w.create(TkcText,441.5,265.5, 'text'=>'128', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,510,309,486,309,486,255,530,255,
-                     552,277,561,277,561,325,510,325,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '129'
-  $floorItems2['129'] = i
-  w.create(TkcText,535.5,293, 'text'=>'129', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,696,281,740,281,740,387,642,387,
-                     642,389,561,389,561,277,696,277,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '133'
-  $floorItems2['133'] = i
-  w.create(TkcText,628.5,335, 'text'=>'133', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,742,387,742,281,800,281,800,387,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '132'
-  $floorItems2['132'] = i
-  w.create(TkcText,771,334, 'text'=>'132', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,800,168,800,280,699,280,699,168,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '134'
-  $floorItems2['134'] = i
-  w.create(TkcText,749.5,224, 'text'=>'134', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,726,131,726,166,800,166,800,131,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '135'
-  $floorItems2['135'] = i
-  w.create(TkcText,763,148.5, 'text'=>'135', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,340,360,335,363,331,365,326,366,304,366,
-                     304,312,396,312,396,288,400,288,404,288,
-                     409,290,413,292,418,297,421,302,422,309,
-                     421,318,417,325,411,330,405,332,397,333,
-                     344,333,340,334,336,336,335,338,332,342,
-                     331,347,332,351,334,354,336,357,341,359,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = 'Ramona Stair'
-  $floorItems2['Ramona Stair'] = i
-  w.create(TkcText,368,323, 'text'=>'Ramona Stair', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,30,23,30,5,93,5,98,5,104,7,110,10,116,16,119,20,
-                     122,28,123,32,123,68,220,68,220,87,90,87,90,23,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = 'University Stair'
-  $floorItems2['University Stair'] = i
-  w.create(TkcText,155,77.5, 'text'=>'University Stair', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,282,37,295,40,312,49,323,56,337,70,352,56,
-                     358,48,363,39,365,29,348,25,335,22,321,14,
-                     300,5,283,1,260,0,246,0,242,2,236,4,231,8,
-                     227,13,223,17,221,22,220,34,260,34,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = 'Plaza Stair'
-  $floorItems2['Plaza Stair'] = i
-  w.create(TkcText,317.5,28.5, 'text'=>'Plaza Stair', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,220,34,260,34,282,37,295,40,312,49,
-                     323,56,337,70,350,83,365,94,377,100,
-                     386,104,386,128,220,128,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = 'Plaza Deck'
-  $floorItems2['Plaza Deck'] = i
-  w.create(TkcText,303,81, 'text'=>'Plaza Deck', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,257,336,77,336,6,336,6,301,77,301,77,310,257,310,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '106'
-  $floorItems2['106'] = i
-  w.create(TkcText,131.5,318.5, 'text'=>'106', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,146,110,162,110,162,91,130,91,130,115,95,115,
-                     95,128,114,128,114,151,157,151,157,153,112,153,
-                     112,130,97,130,97,168,175,168,175,131,146,131,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '119'
-  $floorItems2['119'] = i
-  w.create(TkcText,143.5,133, 'text'=>'119', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  w.create(TkcLine,155,191,155,189, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,155,177,155,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,96,129,96,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,78,169,176,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,176,247,176,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,340,206,307,206, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,340,187,340,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,340,210,340,201, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,340,247,340,224, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,340,241,307,241, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,376,246,376,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,307,247,307,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,376,170,307,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,315,129,315,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,147,129,176,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,202,133,176,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,398,129,315,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,258,352,258,387, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,60,387,60,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,0,337,0,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,60,391,0,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,3,114,3,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,258,387,60,387, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,52,237,52,273, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,52,189,52,225, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,52,140,52,177, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,395,306,395,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,531,254,398,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,475,178,475,238, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,502,162,398,162, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,398,129,398,188, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,383,188,376,188, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,408,188,408,194, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,398,227,398,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,408,227,398,227, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,408,222,408,227, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,408,206,408,210, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,408,208,475,208, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,484,278,484,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,484,311,508,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,508,327,508,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,559,327,508,327, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,644,391,559,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,644,389,644,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,514,205,475,205, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,496,189,496,187, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,559,129,484,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,484,162,484,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,725,133,559,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,559,129,559,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,725,149,725,167, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,725,129,802,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,802,389,802,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,739,167,802,167, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,396,188,408,188, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,0,337,9,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,58,337,21,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,43,391,43,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,105,337,75,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,91,387,91,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,154,337,117,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,139,387,139,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,227,337,166,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,258,337,251,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,258,328,302,328, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,302,355,302,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,395,311,302,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,484,278,395,278, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,395,294,395,278, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,473,278,473,275, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,473,256,473,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,533,257,531,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,553,276,551,274, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,698,276,553,276, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,559,391,559,327, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,802,389,644,389, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,741,314,741,389, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,698,280,698,167, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,707,280,698,280, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,802,280,731,280, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,741,280,741,302, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,698,167,727,167, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,725,137,725,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,514,254,514,175, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,496,175,514,175, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,502,175,502,162, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,475,166,475,162, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,496,176,496,175, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,491,189,496,189, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,491,205,491,189, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,487,238,475,238, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,487,240,487,238, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,487,252,487,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,315,133,304,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,256,133,280,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,78,247,270,247, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,307,247,294,247, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,214,133,232,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,217,247,217,266, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,217,309,217,291, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,217,309,172,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,154,309,148,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,175,300,175,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,151,300,175,300, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,151,247,151,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,78,237,78,265, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,78,286,78,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,106,309,78,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,130,309,125,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,99,309,99,247, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,127,299,99,299, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,127,309,127,299, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,155,191,137,191, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,137,169,137,191, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,78,171,78,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,78,190,78,218, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,86,192,86,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,86,192,78,192, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,52,301,3,301, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,52,286,52,301, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,52,252,3,252, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,52,203,3,203, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,3,156,52,156, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,8,25,8,114, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,63,114,3,114, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,75,114,97,114, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,108,114,129,114, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,129,114,129,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,52,114,52,128, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,132,89,88,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,88,25,88,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,88,114,88,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,218,89,144,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,147,111,147,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,162,111,147,111, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,162,109,162,111, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,162,96,162,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,218,89,218,94, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,218,89,218,119, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,8,25,88,25, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,258,337,258,328, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,113,129,96,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,302,355,258,355, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,386,104,386,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,377,100,386,104, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,365,94,377,100, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,350,83,365,94, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,337,70,350,83, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,337,70,323,56, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,312,49,323,56, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,295,40,312,49, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,282,37,295,40, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,260,34,282,37, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,253,34,260,34, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,386,128,386,104, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,113,152,156,152, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,113,152,156,152, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,113,152,113,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-end
-
-# floor2_fg2 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the foreground information for the second
-# floor (office outlines and numbers).
-#
-# Arguments:
-# w -           The canvas window.
-# color -       Color to use for drawing foreground information.
-
-def floor2_fg2(w,color)
-  i = TkcPolygon.new(w,748,188,755,188,755,205,758,205,758,222,
-                     800,222,800,168,748,168,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '238'
-  $floorItems2['238'] = i
-  w.create(TkcText,774,195, 'text'=>'238', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,726,188,746,188,746,166,800,166,800,131,726,131,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '237'
-  $floorItems2['237'] = i
-  w.create(TkcText,763,148.5, 'text'=>'237', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,497,187,497,204,559,204,559,324,641,324,
-                     643,324,643,291,641,291,641,205,696,205,
-                     696,291,694,291,694,314,715,314,715,291,
-                     715,205,755,205,755,190,724,190,724,187,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '246'
-  $floorItems2['246'] = i
-  w.create(TkcText,600,264, 'text'=>'246', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,694,279,643,279,643,314,694,314,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '247'
-  $floorItems2['247'] = i
-  w.create(TkcText,668.5,296.5, 'text'=>'247', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,232,250,308,250,308,242,339,242,339,246,
-                     397,246,397,255,476,255,476,250,482,250,559,250,
-                     559,274,482,274,482,278,396,278,396,274,232,274,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '202'
-  $floorItems2['202'] = i
-  w.create(TkcText,285.5,260, 'text'=>'202', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,53,228,53,338,176,338,233,338,233,196,
-                     306,196,306,180,175,180,175,169,156,169,
-                     156,196,176,196,176,228,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '206'
-  $floorItems2['206'] = i
-  w.create(TkcText,143,267, 'text'=>'206', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,277,6,277,6,338,51,338,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '212'
-  $floorItems2['212'] = i
-  w.create(TkcText,28.5,307.5, 'text'=>'212', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,557,276,486,276,486,309,510,309,510,325,557,325,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '245'
-  $floorItems2['245'] = i
-  w.create(TkcText,521.5,300.5, 'text'=>'245', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,560,389,599,389,599,326,560,326,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '244'
-  $floorItems2['244'] = i
-  w.create(TkcText,579.5,357.5, 'text'=>'244', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,601,389,601,326,643,326,643,389,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '243'
-  $floorItems2['243'] = i
-  w.create(TkcText,622,357.5, 'text'=>'243', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,688,316,645,316,645,365,688,365,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '242'
-  $floorItems2['242'] = i
-  w.create(TkcText,666.5,340.5, 'text'=>'242', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,802,367,759,367,759,226,802,226,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = 'Barbecue Deck'
-  $floorItems2['Barbecue Deck'] = i
-  w.create(TkcText,780.5,296.5, 'text'=>'Barbecue Deck', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,755,262,755,314,717,314,717,262,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '240'
-  $floorItems2['240'] = i
-  w.create(TkcText,736,288, 'text'=>'240', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,755,316,689,316,689,365,755,365,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '241'
-  $floorItems2['241'] = i
-  w.create(TkcText,722,340.5, 'text'=>'241', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,755,206,717,206,717,261,755,261,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '239'
-  $floorItems2['239'] = i
-  w.create(TkcText,736,233.5, 'text'=>'239', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,695,277,643,277,643,206,695,206,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '248'
-  $floorItems2['248'] = i
-  w.create(TkcText,669,241.5, 'text'=>'248', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,676,135,676,185,724,185,724,135,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '236'
-  $floorItems2['236'] = i
-  w.create(TkcText,700,160, 'text'=>'236', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,675,135,635,135,635,145,628,145,628,185,675,185,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '235'
-  $floorItems2['235'] = i
-  w.create(TkcText,651.5,160, 'text'=>'235', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,626,143,633,143,633,135,572,135,
-                     572,143,579,143,579,185,626,185,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '234'
-  $floorItems2['234'] = i
-  w.create(TkcText,606,160, 'text'=>'234', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,557,135,571,135,571,145,578,145,
-                     578,185,527,185,527,131,557,131,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '233'
-  $floorItems2['233'] = i
-  w.create(TkcText,552.5,158, 'text'=>'233', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,476,249,557,249,557,205,476,205,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '230'
-  $floorItems2['230'] = i
-  w.create(TkcText,516.5,227, 'text'=>'230', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,476,164,486,164,486,131,525,131,525,185,476,185,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '232'
-  $floorItems2['232'] = i
-  w.create(TkcText,500.5,158, 'text'=>'232', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,476,186,495,186,495,204,476,204,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '229'
-  $floorItems2['229'] = i
-  w.create(TkcText,485.5,195, 'text'=>'229', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,474,207,409,207,409,187,399,187,399,164,474,164,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '227'
-  $floorItems2['227'] = i
-  w.create(TkcText,436.5,185.5, 'text'=>'227', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,399,228,399,253,474,253,474,209,409,209,409,228,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '228'
-  $floorItems2['228'] = i
-  w.create(TkcText,436.5,231, 'text'=>'228', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,397,246,397,226,407,226,407,189,377,189,377,246,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '226'
-  $floorItems2['226'] = i
-  w.create(TkcText,392,217.5, 'text'=>'226', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,377,169,316,169,316,131,397,131,397,188,377,188,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '225'
-  $floorItems2['225'] = i
-  w.create(TkcText,356.5,150, 'text'=>'225', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,234,198,306,198,306,249,234,249,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '224'
-  $floorItems2['224'] = i
-  w.create(TkcText,270,223.5, 'text'=>'224', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,270,179,306,179,306,170,314,170,314,135,270,135,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '223'
-  $floorItems2['223'] = i
-  w.create(TkcText,292,157, 'text'=>'223', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,268,179,221,179,221,135,268,135,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '222'
-  $floorItems2['222'] = i
-  w.create(TkcText,244.5,157, 'text'=>'222', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,177,179,219,179,219,135,177,135,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '221'
-  $floorItems2['221'] = i
-  w.create(TkcText,198,157, 'text'=>'221', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,299,327,349,327,349,284,341,284,341,276,299,276,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '204'
-  $floorItems2['204'] = i
-  w.create(TkcText,324,301.5, 'text'=>'204', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,234,276,297,276,297,327,257,327,257,338,234,338,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '205'
-  $floorItems2['205'] = i
-  w.create(TkcText,265.5,307, 'text'=>'205', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,256,385,256,340,212,340,212,385,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '207'
-  $floorItems2['207'] = i
-  w.create(TkcText,234,362.5, 'text'=>'207', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,210,340,164,340,164,385,210,385,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '208'
-  $floorItems2['208'] = i
-  w.create(TkcText,187,362.5, 'text'=>'208', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,115,340,162,340,162,385,115,385,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '209'
-  $floorItems2['209'] = i
-  w.create(TkcText,138.5,362.5, 'text'=>'209', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,89,228,89,156,53,156,53,228,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '217'
-  $floorItems2['217'] = i
-  w.create(TkcText,71,192, 'text'=>'217', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,89,169,97,169,97,190,89,190,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '217A'
-  $floorItems2['217A'] = i
-  w.create(TkcText,93,179.5, 'text'=>'217A', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,89,156,89,168,95,168,95,135,53,135,53,156,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '216'
-  $floorItems2['216'] = i
-  w.create(TkcText,71,145.5, 'text'=>'216', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,179,51,135,6,135,6,179,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '215'
-  $floorItems2['215'] = i
-  w.create(TkcText,28.5,157, 'text'=>'215', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,227,6,227,6,180,51,180,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '214'
-  $floorItems2['214'] = i
-  w.create(TkcText,28.5,203.5, 'text'=>'214', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,275,6,275,6,229,51,229,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '213'
-  $floorItems2['213'] = i
-  w.create(TkcText,28.5,252, 'text'=>'213', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,114,340,67,340,67,385,114,385,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '210'
-  $floorItems2['210'] = i
-  w.create(TkcText,90.5,362.5, 'text'=>'210', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,59,389,59,385,65,385,65,340,1,340,1,389,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '211'
-  $floorItems2['211'] = i
-  w.create(TkcText,33,364.5, 'text'=>'211', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,393,309,350,309,350,282,342,282,342,276,393,276,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '203'
-  $floorItems2['203'] = i
-  w.create(TkcText,367.5,292.5, 'text'=>'203', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,99,191,91,191,91,226,174,226,174,198,
-                     154,198,154,192,109,192,109,169,99,169,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '220'
-  $floorItems2['220'] = i
-  w.create(TkcText,132.5,208.5, 'text'=>'220', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = 'Priv Lift2'
-  $floorItems2['Priv Lift2'] = i
-  w.create(TkcText,323,188, 'text'=>'Priv Lift2', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = 'Pub Lift 2'
-  $floorItems2['Pub Lift 2'] = i
-  w.create(TkcText,323,223, 'text'=>'Pub Lift 2', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '218'
-  $floorItems2['218'] = i
-  w.create(TkcText,136,149.5, 'text'=>'218', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '219'
-  $floorItems2['219'] = i
-  w.create(TkcText,132.5,180, 'text'=>'219', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '201'
-  $floorItems2['201'] = i
-  w.create(TkcText,358,209, 'text'=>'201', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  w.create(TkcLine,641,186,678,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,757,350,757,367, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,634,133,634,144, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,634,144,627,144, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,572,133,572,144, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,572,144,579,144, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,398,129,398,162, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,174,197,175,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,175,197,175,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,757,206,757,221, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,396,188,408,188, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,727,189,725,189, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,747,167,802,167, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,747,167,747,189, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,755,189,739,189, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,769,224,757,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,802,224,802,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,802,129,725,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,725,189,725,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,725,186,690,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,676,133,676,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,627,144,627,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,629,186,593,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,579,144,579,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,559,129,559,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,725,133,559,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,484,162,484,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,559,129,484,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,526,129,526,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,540,186,581,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,528,186,523,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,511,186,475,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,496,190,496,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,496,205,496,202, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,475,205,527,205, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,558,205,539,205, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,558,205,558,249, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,558,249,475,249, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,662,206,642,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,695,206,675,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,695,278,642,278, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,642,291,642,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,695,291,695,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,716,208,716,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,757,206,716,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,757,221,757,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,793,224,802,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,757,262,716,262, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,716,220,716,264, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,716,315,716,276, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,757,315,703,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,757,325,757,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,757,367,644,367, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,689,367,689,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,647,315,644,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,659,315,691,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,600,325,600,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,627,325,644,325, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,644,391,644,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,615,325,575,325, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,644,391,558,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,563,325,558,325, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,558,391,558,314, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,558,327,508,327, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,558,275,484,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,558,302,558,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,508,327,508,311, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,484,311,508,311, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,484,275,484,311, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,475,208,408,208, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,408,206,408,210, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,408,222,408,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,408,227,398,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,398,227,398,254, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,408,188,408,194, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,383,188,376,188, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,398,188,398,162, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,398,162,484,162, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,475,162,475,254, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,398,254,475,254, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,484,280,395,280, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,395,311,395,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,307,197,293,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,278,197,233,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,233,197,233,249, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,307,179,284,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,233,249,278,249, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,269,179,269,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,220,179,220,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,155,191,110,191, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,90,190,98,190, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,98,169,98,190, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,52,133,52,165, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,52,214,52,177, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,52,226,52,262, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,52,274,52,276, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,234,275,234,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,226,339,258,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,211,387,211,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,214,339,177,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,258,387,60,387, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,3,133,3,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,165,339,129,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,117,339,80,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,68,339,59,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,0,339,46,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,60,391,0,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,0,339,0,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,60,387,60,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,258,329,258,387, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,350,329,258,329, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,395,311,350,311, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,398,129,315,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,176,133,315,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,176,129,96,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,3,133,96,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,66,387,66,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,115,387,115,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,163,387,163,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,234,275,276,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,288,275,309,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,298,275,298,329, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,341,283,350,283, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,321,275,341,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,375,275,395,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,315,129,315,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,376,170,307,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,307,250,307,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,376,245,376,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,340,241,307,241, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,340,245,340,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,340,210,340,201, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,340,187,340,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,340,206,307,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,293,250,307,250, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,271,179,238,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,226,179,195,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,176,129,176,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,182,179,176,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,174,169,176,169, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,162,169,90,169, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,96,169,96,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,175,227,90,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,90,190,90,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,52,179,3,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,52,228,3,228, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,52,276,3,276, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,155,177,155,169, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,110,191,110,169, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,155,189,155,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,350,283,350,329, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,162,197,155,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,341,275,341,283, 'fill'=>color, 'tags'=>['floor2','wall'])
-end
-
-# floor2_fg3 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the foreground information for the third
-# floor (office outlines and numbers).
-#
-# Arguments:
-# w -           The canvas window.
-# color -       Color to use for drawing foreground information.
-
-def floor2_fg3(w,color)
-  i = TkcPolygon.new(w,89,228,89,180,70,180,70,228,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '316'
-  $floorItems2['316'] = i
-  w.create(TkcText,79.5,204, 'text'=>'316', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,115,368,162,368,162,323,115,323,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '309'
-  $floorItems2['309'] = i
-  w.create(TkcText,138.5,345.5, 'text'=>'309', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,164,323,164,368,211,368,211,323,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '308'
-  $floorItems2['308'] = i
-  w.create(TkcText,187.5,345.5, 'text'=>'308', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,256,368,212,368,212,323,256,323,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '307'
-  $floorItems2['307'] = i
-  w.create(TkcText,234,345.5, 'text'=>'307', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,244,276,297,276,297,327,260,327,260,321,244,321,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '305'
-  $floorItems2['305'] = i
-  w.create(TkcText,270.5,301.5, 'text'=>'305', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,251,219,251,203,244,203,244,219,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '324B'
-  $floorItems2['324B'] = i
-  w.create(TkcText,247.5,211, 'text'=>'324B', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,251,249,244,249,244,232,251,232,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '324A'
-  $floorItems2['324A'] = i
-  w.create(TkcText,247.5,240.5, 'text'=>'324A', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,223,135,223,179,177,179,177,135,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '320'
-  $floorItems2['320'] = i
-  w.create(TkcText,200,157, 'text'=>'320', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,114,368,114,323,67,323,67,368,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '310'
-  $floorItems2['310'] = i
-  w.create(TkcText,90.5,345.5, 'text'=>'310', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,23,277,23,321,68,321,68,277,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '312'
-  $floorItems2['312'] = i
-  w.create(TkcText,45.5,299, 'text'=>'312', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,23,229,68,229,68,275,23,275,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '313'
-  $floorItems2['313'] = i
-  w.create(TkcText,45.5,252, 'text'=>'313', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,68,227,23,227,23,180,68,180,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '314'
-  $floorItems2['314'] = i
-  w.create(TkcText,40.5,203.5, 'text'=>'314', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,95,179,95,135,23,135,23,179,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '315'
-  $floorItems2['315'] = i
-  w.create(TkcText,59,157, 'text'=>'315', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,99,226,99,204,91,204,91,226,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '316B'
-  $floorItems2['316B'] = i
-  w.create(TkcText,95,215, 'text'=>'316B', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,91,202,99,202,99,180,91,180,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '316A'
-  $floorItems2['316A'] = i
-  w.create(TkcText,95,191, 'text'=>'316A', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,97,169,109,169,109,192,154,192,154,198,
-                     174,198,174,226,101,226,101,179,97,179,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '319'
-  $floorItems2['319'] = i
-  w.create(TkcText,141.5,209, 'text'=>'319', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,65,368,58,368,58,389,1,389,1,333,23,333,23,323,65,323,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '311'
-  $floorItems2['311'] = i
-  w.create(TkcText,29.5,361, 'text'=>'311', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '318'
-  $floorItems2['318'] = i
-  w.create(TkcText,132.5,180, 'text'=>'318', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '317'
-  $floorItems2['317'] = i
-  w.create(TkcText,136,149.5, 'text'=>'317', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,274,194,274,221,306,221,306,194,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '323'
-  $floorItems2['323'] = i
-  w.create(TkcText,290,207.5, 'text'=>'323', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,306,222,274,222,274,249,306,249,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '325'
-  $floorItems2['325'] = i
-  w.create(TkcText,290,235.5, 'text'=>'325', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,263,179,224,179,224,135,263,135,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '321'
-  $floorItems2['321'] = i
-  w.create(TkcText,243.5,157, 'text'=>'321', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,314,169,306,169,306,192,273,192,
-                     264,181,264,135,314,135,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '322'
-  $floorItems2['322'] = i
-  w.create(TkcText,293.5,163.5, 'text'=>'322', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = 'Pub Lift3'
-  $floorItems2['Pub Lift3'] = i
-  w.create(TkcText,323,223, 'text'=>'Pub Lift3', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = 'Priv Lift3'
-  $floorItems2['Priv Lift3'] = i
-  w.create(TkcText,323,188, 'text'=>'Priv Lift3', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,350,284,376,284,376,276,397,276,397,309,350,309,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '303'
-  $floorItems2['303'] = i
-  w.create(TkcText,373.5,292.5, 'text'=>'303', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,272,203,272,249,252,249,252,230,
-                     244,230,244,221,252,221,252,203,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '324'
-  $floorItems2['324'] = i
-  w.create(TkcText,262,226, 'text'=>'324', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,299,276,299,327,349,327,349,284,341,284,341,276,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '304'
-  $floorItems2['304'] = i
-  w.create(TkcText,324,301.5, 'text'=>'304', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '301'
-  $floorItems2['301'] = i
-  w.create(TkcText,358,209, 'text'=>'301', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,397,246,377,246,377,185,397,185,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '327'
-  $floorItems2['327'] = i
-  w.create(TkcText,387,215.5, 'text'=>'327', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,316,131,316,169,377,169,377,185,397,185,397,131,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '326'
-  $floorItems2['326'] = i
-  w.create(TkcText,365.5,150, 'text'=>'326', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,308,251,242,251,242,274,342,274,342,282,375, 282,
-                     375,274,397,274,397,248,339,248,339,242,308,242,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '302'
-  $floorItems2['302'] = i
-  w.create(TkcText,319.5,261, 'text'=>'302', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,70,321,242,321,242,200,259,200,259,203,272,203,
-                     272,193,263,180,242,180,175,180,175,169,156,169,
-                     156,196,177,196,177,228,107,228,70,228,70,275,107,275,
-                     107,248,160,248,160,301,107,301,107,275,70,275,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '306'
-  $floorItems2['306'] = i
-  w.create(TkcText,200.5,284.5, 'text'=>'306', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  w.create(TkcLine,341,275,341,283, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,162,197,155,197, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,396,247,399,247, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,399,129,399,311, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,258,202,243,202, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,350,283,350,329, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,251,231,243,231, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,243,220,251,220, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,243,250,243,202, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,155,197,155,190, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,110,192,110,169, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,155,192,110,192, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,155,177,155,169, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,176,197,176,227, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,69,280,69,274, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,21,276,69,276, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,69,262,69,226, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,21,228,69,228, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,21,179,75,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,69,179,69,214, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,90,220,90,227, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,90,204,90,202, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,90,203,100,203, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,90,187,90,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,90,227,176,227, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,100,179,100,227, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,100,179,87,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,96,179,96,129, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,162,169,96,169, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,173,169,176,169, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,182,179,176,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,176,129,176,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,195,179,226,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,224,133,224,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,264,179,264,133, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,238,179,264,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,273,207,273,193, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,273,235,273,250, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,273,224,273,219, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,273,193,307,193, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,273,222,307,222, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,273,250,307,250, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,384,247,376,247, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,340,206,307,206, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,340,187,340,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,340,210,340,201, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,340,247,340,224, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,340,241,307,241, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,376,247,376,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,307,250,307,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,376,170,307,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,315,129,315,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,376,283,366,283, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,376,283,376,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,399,275,376,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,341,275,320,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,341,283,350,283, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,298,275,298,329, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,308,275,298,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,243,322,243,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,243,275,284,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,258,322,226,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,212,370,212,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,214,322,177,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,163,370,163,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,165,322,129,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,84,322,117,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,71,322,64,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,115,322,115,370, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,66,322,66,370, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,52,322,21,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,21,331,0,331, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,21,331,21,133, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,96,133,21,133, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,176,129,96,129, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,315,133,176,133, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,315,129,399,129, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,399,311,350,311, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,350,329,258,329, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,258,322,258,370, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,60,370,258,370, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,60,370,60,391, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,0,391,0,331, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,60,391,0,391, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,307,250,307,242, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,273,250,307,250, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,258,250,243,250, 'fill'=>color, 'tags'=>['floor3','wall'])
-end
-
-# Below is the "main program" that creates the floorplan demonstration.
-
-# toplevel widget
-if defined?($floor2_demo) && $floor2_demo
-  $floor2_demo.destroy
-  $floor2_demo = nil
-end
-
-# demo toplevel widget
-$floor2_demo = TkToplevel.new {|w|
-  title("Floorplan Canvas Demonstration 2")
-  iconname("Floorplan2")
-  positionWindow(w)
-  geometry('+20+20')
-  minsize(100,100)
-}
-
-base_frame = TkFrame.new($floor2_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'8i', 'justify'=>'left',
-            'text'=>"This window contains a canvas widget showing the floorplan of Digital Equipment Corporation's Western Research Laboratory.  It has three levels.  At any given time one of the levels is active, meaning that you can see its room structure.  To activate a level, click the left mouse button anywhere on it.  As the mouse moves over the active level, the room under the mouse lights up and its room number appears in the \"Room:\" entry.  You can also type a room number in the entry and the room will light up."){
-  pack('side'=>'top')
-}
-
-# frame
-$floor2_buttons = TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $floor2_demo
-      $floor2_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'floor2'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$floor2_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-#
-$floorLabels2 = {}
-$floorItems2 = {}
-
-# canvas
-if $tk_version =~ /^4\.[01]/
-  $floor2_canvas_frame = TkFrame.new(base_frame,'bd'=>2,'relief'=>'sunken',
-                                    'highlightthickness'=>2)
-  $floor2_canvas = TkCanvas.new($floor2_canvas_frame,
-                               'width'=>900, 'height'=>500, 'borderwidth'=>0,
-                               'highlightthickness'=>0) {|c|
-    TkScrollbar.new(base_frame, 'orient'=>'horiz',
-                    'command'=>proc{|*args| c.xview(*args)}){|hs|
-      c.xscrollcommand(proc{|first,last| hs.set first,last})
-      pack('side'=>'bottom', 'fill'=>'x')
-    }
-    TkScrollbar.new(base_frame, 'command'=>proc{|*args| c.yview(*args)}){|vs|
-      c.yscrollcommand(proc{|first,last| vs.set first,last})
-      pack('side'=>'right', 'fill'=>'y')
-    }
-  }
-  $floor2_canvas_frame.pack('side'=>'top','fill'=>'both', 'expand'=>'yes')
-  $floor2_canvas.pack('expand'=>'yes', 'fill'=>'both')
-
-else
-  TkFrame.new(base_frame) {|f|
-    pack('side'=>'top', 'fill'=>'both', 'expand'=>'yes')
-
-    h = TkScrollbar.new(f, 'highlightthickness'=>0, 'orient'=>'horizontal')
-    v = TkScrollbar.new(f, 'highlightthickness'=>0, 'orient'=>'vertical')
-
-    TkFrame.new(f, 'bd'=>2, 'relief'=>'sunken') {|f1|
-      $floor2_canvas = TkCanvas.new(f1, 'width'=>900, 'height'=>500,
-                                   'borderwidth'=>0,
-                                   'highlightthickness'=>0) {
-        xscrollcommand(proc{|first,last| h.set first,last})
-        yscrollcommand(proc{|first,last| v.set first,last})
-        pack('expand'=>'yes', 'fill'=>'both')
-      }
-      grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0,
-           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    }
-
-    v.grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1,
-           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    h.grid('padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0,
-           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-
-    TkGrid.rowconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
-    TkGrid.columnconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
-
-    pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>1)
-
-    v.command(proc{|*args| $floor2_canvas.yview(*args)})
-    h.command(proc{|*args| $floor2_canvas.xview(*args)})
-  }
-end
-
-
-# Create an entry for displaying and typing in current room.
-
-$currentRoom2 = TkVariable.new
-$floor2_entry = TkEntry.new($floor2_canvas, 'width'=>10, 'relief'=>'sunken',
-                           'bd'=>2, 'textvariable'=>$currentRoom2)
-
-# Choose colors, then fill in the floorplan.
-
-$floor2_colors = {}
-if TkWinfo.depth($floor2_canvas) > 1
-  $floor2_colors['bg1'] = '#a9c1da'
-  $floor2_colors['outline1'] = '#77889a'
-  $floor2_colors['bg2'] = '#9ab0c6'
-  $floor2_colors['outline2'] = '#687786'
-  $floor2_colors['bg3'] = '#8ba0b3'
-  $floor2_colors['outline3'] = '#596673'
-  $floor2_colors['offices'] = 'Black'
-  $floor2_colors['active'] = '#c4d1df'
-else
-  $floor2_colors['bg1'] = 'white'
-  $floor2_colors['outline1'] = 'black'
-  $floor2_colors['bg2'] = 'white'
-  $floor2_colors['outline2'] = 'black'
-  $floor2_colors['bg3'] = 'white'
-  $floor2_colors['outline3'] = 'black'
-  $floor2_colors['offices'] = 'Black'
-  $floor2_colors['active'] = 'black'
-end
-
-$activeFloor2 = ''
-floorDisplay2 $floor2_canvas,3
-
-# Set up event bindings for canvas:
-
-$floor2_canvas.itembind('floor1', '1', proc{floorDisplay2 $floor2_canvas,1})
-$floor2_canvas.itembind('floor2', '1', proc{floorDisplay2 $floor2_canvas,2})
-$floor2_canvas.itembind('floor3', '1', proc{floorDisplay2 $floor2_canvas,3})
-$floor2_canvas.itembind('room', 'Enter', proc{newRoom2 $floor2_canvas})
-$floor2_canvas.itembind('room', 'Leave', proc{$currentRoom2.value = ''})
-$floor2_canvas.bind('2', proc{|x,y| $floor2_canvas.scan_mark x,y}, '%x %y')
-$floor2_canvas.bind('B2-Motion',
-                   proc{|x,y| $floor2_canvas.scan_dragto x,y}, '%x %y')
-$floor2_canvas.bind('Destroy', proc{$currentRoom2.unset})
-$currentRoom2.value = ''
-$currentRoom2.trace('w',proc{roomChanged2 $floor2_canvas})
diff --git a/ext/tk/sample/demos-en/form.rb b/ext/tk/sample/demos-en/form.rb
deleted file mode 100644
index b6c6655083..0000000000
--- a/ext/tk/sample/demos-en/form.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-# frozen_string_literal: false
-#
-# form widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($form_demo) && $form_demo
-  $form_demo.destroy
-  $form_demo = nil
-end
-
-# demo toplevel widget
-$form_demo = TkToplevel.new {|w|
-  title("Form Demonstration")
-  iconname("form")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($form_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "This window contains a simple form where you can type in the various entries and use tabs to move circularly between the entries."
-}
-msg.pack('side'=>'top', 'fill'=>'x')
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $form_demo
-      $form_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'form'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# entry
-form_data = []
-(1..5).each{|i|
-  f = TkFrame.new(base_frame, 'bd'=>2)
-  e = TkEntry.new(f, 'relief'=>'sunken', 'width'=>40)
-  l = TkLabel.new(f)
-  e.pack('side'=>'right')
-  l.pack('side'=>'left')
-  form_data[i] = {'frame'=>f, 'entry'=>e, 'label'=>l}
-}
-
-#
-form_data[1]['label'].text('Name:')
-form_data[2]['label'].text('Address:')
-form_data[5]['label'].text('Phone:')
-
-# pack
-(1..5).each{|i| form_data[i]['frame'].pack('side'=>'top', 'fill'=>'x')}
-
diff --git a/ext/tk/sample/demos-en/goldberg.rb b/ext/tk/sample/demos-en/goldberg.rb
deleted file mode 100644
index 729cdf0e94..0000000000
--- a/ext/tk/sample/demos-en/goldberg.rb
+++ /dev/null
@@ -1,2007 +0,0 @@
-# frozen_string_literal: false
-#
-# Ruby/Tk Goldverg demo (called by 'widget')
-#
-# Based on Tcl/Tk8.5a2 widget demos.
-# The following is the original comment of TkGoldberg.tcl.
-#
-#>>##+#################################################################
-#>>#
-#>># TkGoldberg.tcl
-#>># by Keith Vetter, March 13, 2003
-#>>#
-#>># "Man will always find a difficult means to perform a simple task"
-#>># Rube Goldberg
-#>>#
-#>># Reproduced here with permission.
-#>>#
-#>>##+#################################################################
-#>>#
-#>># Keith Vetter 2003-03-21: this started out as a simple little program
-#>># but was so much fun that it grew and grew. So I apologize about the
-#>># size but I just couldn't resist sharing it.
-#>>#
-#>># This is a whizzlet that does a Rube Goldberg type animation, the
-#>># design of which comes from an New Years e-card from IncrediMail.
-#>># That version had nice sound effects which I eschewed. On the other
-#>># hand, that version was in black and white (actually dark blue and
-#>># light blue) and this one is fully colorized.
-#>>#
-#>># One thing I learned from this project is that drawing filled complex
-#>># objects on a canvas is really hard. More often than not I had to
-#>># draw each item twice--once with the desired fill color but no
-#>># outline, and once with no fill but with the outline. Another trick
-#>># is erasing by drawing with the background color. Having a flood fill
-#>># command would have been extremely helpful.
-#>>#
-#>># Two wiki pages were extremely helpful: Drawing rounded rectangles
-#>># which I generalized into Drawing rounded polygons, and regular
-#>># polygons which allowed me to convert ovals and arcs into polygons
-#>># which could then be rotated (see Canvas Rotation). I also wrote
-#>># Named Colors to aid in the color selection.
-#>>#
-#>># I could comment on the code, but it's just 26 state machines with
-#>># lots of canvas create and move calls.
-
-if defined?($goldberg_demo) && $goldberg_demo
-  $goldberg_demo.destroy
-  $goldberg_demo = nil
-end
-
-# demo toplevel widget
-$goldberg_demo = TkToplevel.new {|w|
-  title("Tk Goldberg (demonstration)")
-  iconname("goldberg")
-#  positionWindow(w)
-}
-
-base_frame = TkFrame.new($goldberg_demo).pack(:fill=>:both, :expand=>true)
-
-=begin
-# label
-msg = TkLabel.new($goldberg_demo) {
-  font 'Arial 10'
-  wraplength '4i'
-  justify 'left'
-  text "This is a demonstration of just how complex you can make your animations become. Click the ball to start things moving!\n\n\"Man will always find a difficult means to perform a simple task\"\n - Rube Goldberg"
-}
-msg.pack('side'=>'top')
-=end
-
-=begin
-# frame
-TkFrame.new($goldberg_demo) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $goldberg_demo
-      $goldberg_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'See Code'
-    command proc{showCode 'goldberg'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-=end
-
-#########################################
-
-class TkGoldberg_Demo
-  def initialize(parent)
-    @parent = parent
-
-    @S = {}
-    @S['title']   = 'Tk Goldberg'
-    @S['speed']   = TkVariable.new(5)
-    @S['cnt']     = TkVariable.new(0)
-    @S['message'] = TkVariable.new("\\nWelcome\\nto\\nRuby/Tk")
-    @S['pause']   = TkVariable.new
-    @S['details'] = TkVariable.new(true)
-
-    @S['mode'] = TkVariable.new(:MSTART, :symbol)
-    #            :MSTART, :MGO, :MPAUSE, :MSSTEP, :MBSTEP, :MDONE, :MDEBUG
-
-    #         0,  1,  2,  3,  4,  5,   6,   7,   8,   9,  10
-    @speed = [1, 10, 20, 50, 80, 100, 150, 200, 300, 400, 500]
-
-    # colors
-    @C = {}
-    @C['fg'] = 'black'
-    # @C['bg'] = 'gray75'
-    @C['bg'] = 'cornflowerblue'
-
-    @C['0'] = 'white';         @C['1a'] = 'darkgreen';   @C['1b'] = 'yellow'
-    @C['2'] = 'red';           @C['3a'] = 'green';       @C['3b'] = 'darkblue'
-    @C['4'] = @C['fg'];        @C['5a'] = 'brown';       @C['5b'] = 'white'
-    @C['6'] = 'magenta';       @C['7'] = 'green';        @C['8'] = @C['fg']
-    @C['9'] = 'blue4';         @C['10a'] = 'white';      @C['10b'] = 'cyan'
-    @C['11a'] = 'yellow';      @C['11b'] = 'mediumblue'; @C['12'] = 'tan2'
-    @C['13a'] = 'yellow';      @C['13b'] = 'red';        @C['14'] = 'white'
-    @C['15a'] = 'green';       @C['15b'] = 'yellow';     @C['16'] = 'gray65'
-    @C['17'] = '#A65353';     @C['18'] = @C['fg'];      @C['19'] = 'gray50'
-    @C['20'] = 'cyan';         @C['21'] = 'gray65';      @C['22'] = @C['20']
-    @C['23a'] = 'blue';        @C['23b'] = 'red';        @C['23c'] = 'yellow'
-    @C['24a'] = 'red';         @C['24b'] = 'white';
-
-    @STEP = TkVariable.new_hash
-    @STEP.default_value_type = :numeric
-
-    @XY = {}
-
-    @XY6 = {
-      '-1'=>[366, 207], '-2'=>[349, 204], '-3'=>[359, 193], '-4'=>[375, 192],
-      '-5'=>[340, 190], '-6'=>[349, 177], '-7'=>[366, 177], '-8'=>[380, 176],
-      '-9'=>[332, 172], '-10'=>[342, 161], '-11'=>[357, 164],
-      '-12'=>[372, 163], '-13'=>[381, 149], '-14'=>[364, 151],
-      '-15'=>[349, 146], '-16'=>[333, 148], '0'=>[357, 219],
-      '1'=>[359, 261], '2'=>[359, 291], '3'=>[359, 318], '4'=>[361, 324],
-      '5'=>[365, 329], '6'=>[367, 334], '7'=>[367, 340], '8'=>[366, 346],
-      '9'=>[364, 350], '10'=>[361, 355], '11'=>[359, 370], '12'=>[359, 391],
-      '13,0'=>[360, 456], '13,1'=>[376, 456], '13,2'=>[346, 456],
-      '13,3'=>[330, 456], '13,4'=>[353, 444], '13,5'=>[368, 443],
-      '13,6'=>[339, 442], '13,7'=>[359, 431], '13,8'=>[380, 437],
-      '13,9'=>[345, 428], '13,10'=>[328, 434], '13,11'=>[373, 424],
-      '13,12'=>[331, 420], '13,13'=>[360, 417], '13,14'=>[345, 412],
-      '13,15'=>[376, 410], '13,16'=>[360, 403]
-    }
-
-    @timer = TkTimer.new(@speed[@S['speed'].numeric]){|timer|
-      timer.set_interval(go)
-    }
-
-    do_display
-    reset
-
-    # Start everything going
-    @timer.start
-  end
-
-  def do_display()
-    @ctrl = TkFrame.new(@parent, :relief=>:ridge, :bd=>2, :padx=>5, :pady=>5)
-    @screen = TkFrame.new(@parent, :bd=>2,
-                         :relief=>:raised).pack(:side=>:left, :fill=>:both,
-                                                :expand=>true)
-
-    @canvas = TkCanvas.new(@parent, :width=>850, :height=>700,
-                          :bg=>@C['bg'], :highlightthickness=>0){
-      scrollregion([0, 0, 1000, 1000]) # Kludge to move everything up
-      yview_moveto(0.05)
-    }.pack(:in=>@screen, :side=>:top, :fill=>:both, :expand=>true)
-
-    @canvas.bind('3'){ @pause.invoke }
-    @canvas.bind('Destroy'){ @timer.stop }
-
-    do_ctrl_frame
-    do_detail_frame
-
-    # msg = TkLabel.new(@parent, :bg=>@C['bg'], :fg=>'white') {
-    msg = Tk::Label.new(@parent, :bg=>@C['bg'], :fg=>'white') {
-      font 'Arial 10'
-      wraplength 600
-      justify 'left'
-      text "This is a demonstration of just how complex you can make your animations become. Click the ball to start things moving!\n\"Man will always find a difficult means to perform a simple task\" - Rube Goldberg"
-    }
-    msg.place(:in=>@canvas, :relx=>0, :rely=>0, :anchor=>:nw)
-
-    frame = TkFrame.new(@parent, :bg=>@C['bg'])
-
-    # TkButton.new(frame, :bg=>@C['bg'], :activebackground=>@C['bg']) {
-    Tk::Button.new(frame, :bg=>@C['bg'], :activebackground=>@C['bg']) {
-      text 'Dismiss'
-      command proc{
-        tmppath = $goldberg_demo
-        $goldberg_demo = nil
-        tmppath.destroy
-      }
-    }.pack('side'=>'left')
-
-    # TkButton.new(frame, :bg=>@C['bg'], :activebackground=>@C['bg']) {
-    Tk::Button.new(frame, :bg=>@C['bg'], :activebackground=>@C['bg']) {
-      text 'See Code'
-      command proc{showCode 'goldberg'}
-    }.pack('side'=>'left', 'padx'=>5)
-
-    # @show = TkButton.new(frame, :text=>'>>', :command=>proc{show_ctrl},
-    @show = Tk::Button.new(frame, :text=>'>>', :command=>proc{show_ctrl},
-                         :bg=>@C['bg'], :activebackground=>@C['bg'])
-    @show.pack('side'=>'left')
-    frame.place(:in=>@canvas, :relx=>1, :rely=>0, :anchor=>:ne)
-
-    Tk.update
-  end
-
-  def do_ctrl_frame
-    @start = Tk::Button.new(@parent, :text=>'Start', :bd=>6,
-                          :command=>proc{do_button(0)})
-    if font = @start['font']
-      @start.font(font.weight('bold'))
-    end
-
-    @pause = TkCheckbutton.new(@parent, :text=>'Pause', :font=>font,
-                               :command=>proc{do_button(1)}, :relief=>:raised,
-                               :variable=>@S['pause'])
-
-    @step  = TkButton.new(@parent, :text=>'Single Step', :font=>font,
-                          :command=>proc{do_button(2)})
-    @bstep = TkButton.new(@parent, :text=>'Big Step', :font=>font,
-                          :command=>proc{do_button(4)})
-    @reset = TkButton.new(@parent, :text=>'Reset', :font=>font,
-                          :command=>proc{do_button(3)})
-
-    @details = TkFrame.new(@parent, :bd=>2, :relief=>:ridge)
-    @detail = TkCheckbutton.new(@parent, :text=>'Details', :font=>font,
-                               :relief=>:raised, :variable=>@S['details'])
-
-    @msg_entry = TkEntry.new(@parent, :textvariable=>@S['message'],
-                             :justify=>:center)
-    @speed_scale = TkScale.new(@parent, :orient=>:horizontal,
-                               :from=>1, :to=>10, :font=>font,
-                               :variable=>@S['speed'], :bd=>2,
-                               :relief=>:ridge, :showvalue=>false)
-    @about = TkButton.new(@parent, :text=>'About',
-                          :command=>proc{about}, :font=>font)
-
-    Tk.grid(@start, :in=>@ctrl, :row=>0, :sticky=>:ew)
-    @ctrl.grid_rowconfigure(1, :minsize=>10)
-    Tk.grid(@pause, :in=>@ctrl, :row=>2, :sticky=>:ew)
-    Tk.grid(@step,  :in=>@ctrl, :sticky=>:ew)
-    Tk.grid(@bstep, :in=>@ctrl, :sticky=>:ew)
-    Tk.grid(@reset, :in=>@ctrl, :sticky=>:ew)
-    @ctrl.grid_rowconfigure(10, :minsize=>20)
-    Tk.grid(@details, :in=>@ctrl, :row=>11, :sticky=>:ew)
-    Tk.grid(@detail, :in=>@details, :row=>0, :sticky=>:ew)
-    @ctrl.grid_rowconfigure(50, :weight=>1)
-
-    @S['mode'].trace('w', proc{|*args| active_GUI(*args)})
-    @S['details'].trace('w', proc{|*args| active_GUI(*args)})
-    @S['speed'].trace('w', proc{|*args| active_GUI(*args)})
-
-    Tk.grid(@msg_entry, :in=>@ctrl, :row=>98, :sticky=>:ew, :pady=>5)
-    Tk.grid(@speed_scale, :in=>@ctrl, :row=>99, :sticky=>:ew)
-    Tk.grid(@about, :in=>@ctrl, :row=>100, :sticky=>:ew)
-
-    @reset.bind('3'){@S['mode'].value = -1}  # Debugging
-  end
-
-  def do_detail_frame
-    @f_details = TkFrame.new(@details)
-
-    @label = TkLabel.new(@f_details, :textvariable=>@S['cnt'],
-                         :bd=>1, :relief=>:solid, :bg=>'white')
-    Tk.grid(@label, '-', '-', '-', :sticky=>:ew, :row=>0)
-
-    idx = 1
-    loop {
-      break unless respond_to?("move#{idx}")
-      l = TkLabel.new(@f_details, :text=>idx, :anchor=>:e,
-                      :width=>2, :bd=>1, :relief=>:solid, :bg=>'white')
-      @STEP[idx] = 0
-      ll = TkLabel.new(@f_details, :textvariable=>@STEP.ref(idx),
-                       :width=>5, :bd=>1, :relief=>:solid, :bg=>'white')
-      row = (idx + 1)/2
-      col = ((idx + 1) & 1) * 2
-      Tk.grid(l, :sticky=>:ew, :row=>row, :column=>col)
-      Tk.grid(ll, :sticky=>:ew, :row=>row, :column=>(col + 1))
-      idx += 1
-    }
-    @f_details.grid_columnconfigure(1, :weight=>1)
-  end
-
-  def show_ctrl
-    if @ctrl.winfo_mapped?
-      @ctrl.pack_forget
-      @show.text('>>')
-    else
-      @ctrl.pack(:side=>:right, :fill=>:both, :ipady=>5)
-      @show.text('<<')
-    end
-  end
-
-  def draw_all
-    reset_step
-    @canvas.delete(:all)
-    idx = 0
-    loop{
-      m = "draw#{idx}"
-      break unless respond_to?(m)
-      send(m)
-      idx += 1
-    }
-  end
-
-  def active_GUI(var1, var2, op)
-    st = {false=>:disabled, true=>:normal}
-
-    m = @S['mode'].to_sym
-    @S['pause'].value = (m == :MPAUSE)
-    @start.state(st[m != :MGO])
-    @pause.state(st[m != :MSTART && m != :MDONE])
-    @step.state(st[m != :MGO && m != :MDONE])
-    @bstep.state(st[m != :MGO && m != :MDONE])
-    @reset.state(st[m != :MSTART])
-
-    if @S['details'].bool
-      Tk.grid(@f_details, :in=>@details, :row=>2, :sticky=>:ew)
-    else
-      Tk.grid_forget(@f_details)
-    end
-    @speed_scale.label("Speed: #{@S['speed'].value}")
-  end
-
-  def start
-    @S['mode'].value = :MGO
-  end
-
-  def do_button(what)
-    case what
-    when 0  # Start
-      reset if @S['mode'].to_sym == :MDONE
-      @S['mode'].value = :MGO
-
-    when 1  # Pause
-      @S['mode'].value = ((@S['pause'].bool)? :MPAUSE: :MGO)
-
-    when 2  # Step
-      @S['mode'].value = :MSSTEP
-
-    when 3  # Reset
-      reset
-
-    when 4  # Big step
-      @S['mode'].value = :MBSTEP
-    end
-  end
-
-  def go(who = nil)
-    now = Tk::Clock.clicks(:milliseconds)
-    if who  # Start here for debugging
-      @S['active'] = [who]
-      @S['mode'].value = :MGO
-    end
-    return if @S['mode'].to_sym == :MDEBUG  # Debugging
-    # If not paused, do the next move
-    n = next_step if @S['mode'].to_sym != :MPAUSE
-    @S['mode'].value = :MPAUSE if @S['mode'].to_sym == :MSSTEP  # Single step
-    @S['mode'].value = :MSSTEP if @S['mode'].to_sym == :MBSTEP && n  # big step
-    elapsed = Tk::Clock.clicks(:milliseconds) - now
-    delay = @speed[@S['speed'].to_i] - elapsed
-    delay = 1 if delay <= 0
-    return delay
-  end
-
-  def next_step
-    retval = false   # Return value
-
-    if @S['mode'].to_sym != :MSTART && @S['mode'].to_sym != :MDONE
-      @S['cnt'].numeric += 1
-    end
-    alive = []
-    @S['active'].each{|who|
-      who = who.to_i
-      n = send("move#{who}")
-      if (n & 1).nonzero?          # This guy still alive
-        alive << who
-      end
-      if (n & 2).nonzero?          # Next guy is active
-        alive << (who + 1)
-        retval = true
-      end
-      if (n & 4).nonzero?          # End of puzzle flag
-        @S['mode'].value = :MDONE  # Done mode
-        @S['active'] = []          # No more animation
-        return true
-      end
-    }
-    @S['active'] = alive
-    return retval
-  end
-
-  def about
-    msg = "Ruby/Tk Version ::\nby Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)\n\n"
-    msg += "Original Version ::\n"
-    msg += "#{@S['title']}\nby Keith Vetter, March 2003\n(Reproduced by kind permission of the author)\n\n"
-    msg += "Man will always find a difficult means to perform a simple task"
-    msg += "\nRube Goldberg"
-    Tk.messageBox(:message=>msg, :title=>'About')
-  end
-
-  ################################################################
-  #
-  # All the drawing and moving routines
-  #
-
-  # START HERE! banner
-  def draw0
-    color = @C['0']
-    TkcText.new(@canvas, [579, 119], :text=>'START HERE!',
-                :fill=>color, :anchor=>:w,
-                :tag=>'I0', :font=>['Times Roman', 12, :italic, :bold])
-    TkcLine.new(@canvas, [719, 119, 763, 119], :tag=>'I0', :fill=>color,
-                :width=>5, :arrow=>:last, :arrowshape=>[18, 18, 5])
-    @canvas.itembind('I0', '1'){ start }
-  end
-
-  def move0(step = nil)
-    step = get_step(0, step)
-
-    if @S['mode'].to_sym != :MSTART    # Start the ball rolling
-      move_abs('I0', [-100, -100])     # Hide the banner
-      return 2
-    end
-
-    pos = [
-      [673, 119], [678, 119], [683, 119], [688, 119],
-      [693, 119], [688, 119], [683, 119], [678, 119]
-    ]
-    step = step % pos.length
-    move_abs('I0', pos[step])
-    return 1
-  end
-
-  # Dropping ball
-  def draw1
-    color = @C['1a']
-    color2 = @C['1b']
-    TkcPolygon.new(@canvas,
-                   [ 844, 133, 800, 133, 800, 346, 820, 346,
-                     820, 168, 844, 168, 844, 133 ],
-                   :width=>3, :fill=>color, :outline=>'')
-    TkcPolygon.new(@canvas,
-                   [ 771, 133, 685, 133, 685, 168, 751, 168,
-                     751, 346, 771, 346, 771, 133 ],
-                   :width=>3, :fill=>color, :outline=>'')
-    TkcOval.new(@canvas, box(812, 122, 9),
-                :tag=>'I1', :fill=>color2, :outline=>'')
-
-    @canvas.itembind('I1', '1'){ start }
-  end
-
-  def move1(step = nil)
-    step = get_step(1, step)
-    pos = [
-      [807, 122], [802, 122], [797, 123], [793, 124], [789, 129], [785, 153],
-      [785, 203], [785, 278, :x], [785, 367], [810, 392], [816, 438],
-      [821, 503], [824, 585, :y], [838, 587], [848, 593], [857, 601],
-      [-100, -100]
-    ]
-    return 0 if step >= pos.length
-    where = pos[step]
-    move_abs('I1', where)
-    move15a if where[2] == :y
-    return 3 if where[2] == :x
-    return 1
-  end
-
-  # Lighting the match
-  def draw2
-    color = @C['2']
-
-    # Fulcrum
-    TkcPolygon.new(@canvas, [750, 369, 740, 392, 760, 392],
-                   :fill=>@C['fg'], :outline=>@C['fg'])
-
-    # Strike box
-    TkcRectangle.new(@canvas, [628, 335, 660, 383],
-                     :fill=>'', :outline=>@C['fg'])
-    (0..2).each{|y|
-      yy = 335 + y*16
-      TkcBitmap.new(@canvas, [628, yy], :bitmap=>'gray25',
-                    :anchor=>:nw, :foreground=>@C['fg'])
-      TkcBitmap.new(@canvas, [644, yy], :bitmap=>'gray25',
-                    :anchor=>:nw, :foreground=>@C['fg'])
-    }
-
-    # Lever
-    TkcLine.new(@canvas, [702, 366, 798, 366],
-                :fill=>@C['fg'], :width=>6, :tag=>'I2_0')
-
-    # R strap
-    TkcLine.new(@canvas, [712, 363, 712, 355],
-                :fill=>@C['fg'], :width=>3, :tag=>'I2_1')
-
-    # L strap
-    TkcLine.new(@canvas, [705, 363, 705, 355],
-                :fill=>@C['fg'], :width=>3, :tag=>'I2_2')
-
-    # Match stick
-    TkcLine.new(@canvas, [679, 356, 679, 360, 717, 360, 717, 356, 679, 356],
-                :fill=>@C['fg'], :width=>3, :tag=>'I2_3')
-
-    # Match head
-    TkcPolygon.new(@canvas,
-                   [ 671, 352, 677.4, 353.9, 680, 358.5, 677.4, 363.1,
-                     671, 365, 664.6, 363.1, 662, 358.5, 664.6, 353.9 ],
-                   :fill=>color, :outline=>color, :tag=>'I2_4')
-  end
-
-  def move2(step = nil)
-    step = get_step(2, step)
-
-    stages = [0, 0, 1, 2, 0, 2, 1, 0, 1, 2, 0, 2, 1]
-    xy = []
-    xy[0] = [
-      686, 333, 692, 323, 682, 316, 674, 309, 671, 295, 668, 307,
-      662, 318, 662, 328, 671, 336
-    ]
-    xy[1] = [
-      687, 331, 698, 322, 703, 295, 680, 320, 668, 297, 663, 311,
-      661, 327, 671, 335
-    ]
-    xy[2] = [
-      686, 331, 704, 322, 688, 300, 678, 283, 678, 283, 674, 298,
-      666, 309, 660, 324, 672, 336
-    ]
-
-    if step >= stages.length
-      @canvas.delete('I2')
-      return 0
-    end
-
-    if step == 0  # Rotate the match
-      beta = 20
-
-      ox, oy = anchor('I2_0', :s)  # Where to pivot
-
-      i = 0
-      until @canvas.find_withtag("I2_#{i}").empty?
-        rotate_item("I2_#{i}", ox, oy, beta)
-        i += 1
-      end
-
-      # For the flame
-      TkcPolygon.new(@canvas, [], :tag=>'I2', :smooth=>true, :fill=>@C['2'])
-
-      return 1
-    end
-    @canvas.coords('I2', xy[stages[step]])
-    return ((step == 7)? 3: 1)
-  end
-
-  # Weight and pulleys
-  def draw3
-    color = @C['3a']
-    color2 = @C['3b']
-
-    xy = [ [602, 296], [577, 174], [518, 174] ]
-    xy.each{|x, y| # 3 Pulleys
-      TkcOval.new(@canvas, box(x, y, 13),
-                  :fill=>color, :outline=>@C['fg'], :width=>3)
-      TkcOval.new(@canvas, box(x, y, 2), :fill=>@C['fg'], :outline=>@C['fg'])
-    }
-
-    # Wall to flame
-    TkcLine.new(@canvas, [750, 309, 670, 309], :tag=>'I3_s',
-                :width=>3, :fill=>@C['fg'], :smooth=>true)
-
-    # Flame to pulley 1
-    TkcLine.new(@canvas, [670, 309, 650, 309], :tag=>'I3_0',
-                :width=>3, :fill=>@C['fg'], :smooth=>true)
-    TkcLine.new(@canvas, [650, 309, 600, 309], :tag=>'I3_1',
-                :width=>3, :fill=>@C['fg'], :smooth=>true)
-
-    # Pulley 1 half way to 2
-    TkcLine.new(@canvas, [589, 296, 589, 235], :tag=>'I3_2',
-                :width=>3, :fill=>@C['fg'])
-
-    # Pulley 1 other half to 2
-    TkcLine.new(@canvas, [589, 235, 589, 174], :width=>3, :fill=>@C['fg'])
-
-    # Across the top
-    TkcLine.new(@canvas, [577, 161, 518, 161], :width=>3, :fill=>@C['fg'])
-
-    # Down to weight
-    TkcLine.new(@canvas, [505, 174, 505, 205], :tag=>'I3_w',
-                :width=>3, :fill=>@C['fg'])
-
-    # Draw the weight as 2 circles, two rectangles and 1 rounded rectangle
-    x1, y1, x2, y2 = [515, 207, 495, 207]
-    TkcOval.new(@canvas, box(x1, y1, 6),
-                :tag=>'I3_', :fill=>color2, :outline=>color2)
-    TkcOval.new(@canvas, box(x2, y2, 6),
-                :tag=>'I3_', :fill=>color2, :outline=>color2)
-    TkcRectangle.new(@canvas, x1, y1 - 6, x2, y2 + 6,
-                     :tag=>'I3_', :fill=>color2, :outline=>color2)
-
-    TkcPolygon.new(@canvas, round_rect([492, 220, 518, 263], 15),
-                   :smooth=>true, :tag=>'I3_', :fill=>color2, :outline=>color2)
-
-    TkcLine.new(@canvas, [500, 217, 511, 217],
-                :tag=>'I3_', :fill=>color2, :width=>10)
-
-    # Bottom weight target
-    TkcLine.new(@canvas, [502, 393, 522, 393, 522, 465],
-                :tag=>'I3__', :fill=>@C['fg'], :joinstyle=>:miter, :width=>10)
-  end
-
-  def move3(step = nil)
-    step = get_step(3, step)
-
-    pos = [ [505, 247], [505, 297], [505, 386.5], [505, 386.5] ]
-    rope = []
-    rope[0] = [750, 309, 729, 301, 711, 324, 690, 300]
-    rope[1] = [750, 309, 737, 292, 736, 335, 717, 315, 712, 320]
-    rope[2] = [750, 309, 737, 309, 740, 343, 736, 351, 725, 340]
-    rope[3] = [750, 309, 738, 321, 746, 345, 742, 356]
-
-    return 0 if step >= pos.length
-
-    @canvas.delete("I3_#{step}")        # Delete part of the rope
-    move_abs('I3_', pos[step])          # Move weight down
-    @canvas.coords('I3_s', rope[step])  # Flapping rope end
-    @canvas.coords('I3_w', [505, 174].concat(pos[step]))
-    if step == 2
-      @canvas.move('I3__', 0, 30)
-      return 2
-    end
-    return 1
-  end
-
-  # Cage and door
-  def draw4
-    color = @C['4']
-    x0, y0, x1, y1 = [527, 356, 611, 464]
-
-    # Horizontal bars
-    y0.step(y1, 12){|y|
-      TkcLine.new(@canvas, [x0, y, x1, y], :fill=>color, :width=>1)
-    }
-
-    # Vertical bars
-    x0.step(x1, 12){|x|
-      TkcLine.new(@canvas, [x, y0, x, y1], :fill=>color, :width=>1)
-    }
-
-    # Swing gate
-    TkcLine.new(@canvas, [518, 464, 518, 428],
-                :tag=>'I4', :fill=>color, :width=>1)
-  end
-
-  def move4(step = nil)
-    step = get_step(4, step)
-
-    angles = [-10, -20, -30, -30]
-    return 0 if step >= angles.length
-
-    rotate_item('I4', 518, 464, angles[step])
-    @canvas.raise('I4')
-
-    return((step == 3)? 3: 1)
-  end
-
-  # Mouse
-  def draw5
-    color  = @C['5a']
-    color2 = @C['5b']
-
-    xy = [377, 248, 410, 248, 410, 465, 518, 465]  # Mouse course
-    xy.concat [518, 428, 451, 428, 451, 212, 377, 212]
-
-    TkcPolygon.new(@canvas, xy, :fill=>color2, :outline=>@C['fg'], :width=>3)
-
-    xy = [
-      534.5, 445.5, 541, 440, 552, 436, 560, 436, 569, 440, 574, 446,
-      575, 452, 574, 454, 566, 456, 554, 456, 545, 456, 537, 454, 530, 452
-    ]
-    TkcPolygon.new(@canvas, xy, :tag=>['I5', 'I5_0'], :fill=>color)
-
-    TkcLine.new(@canvas, [573, 452, 592, 458, 601, 460, 613, 456], # Tail
-                :tag=>['I5', 'I5_1'], :fill=>color, :smooth=>true, :width=>3)
-
-    xy = box(540, 446, 2)   # Eye
-    xy = [540, 444, 541, 445, 541, 447, 540, 448, 538, 447, 538, 445]
-    TkcPolygon.new(@canvas, xy, :tag=>['I5', 'I5_2'], :fill=>@C['bg'],
-                   :outline=>'', :smooth=>true)
-
-    xy = [538, 454, 535, 461] # Front leg
-    TkcLine.new(@canvas, xy, :tag=>['I5', 'I5_3'], :fill=>color, :width=>2)
-
-    xy = [566, 455, 569, 462] # Back leg
-    TkcLine.new(@canvas, xy, :tag=>['I5', 'I5_4'], :fill=>color, :width=>2)
-
-    xy = [544, 455, 545, 460] # 2nd front leg
-    TkcLine.new(@canvas, xy, :tag=>['I5', 'I5_5'], :fill=>color, :width=>2)
-
-    xy = [560, 455, 558, 460] # 2nd back leg
-    TkcLine.new(@canvas, xy, :tag=>['I5', 'I5_6'], :fill=>color, :width=>2)
-  end
-
-  def move5(step = nil)
-    step = get_step(5, step)
-
-    pos = [
-      [553, 452], [533, 452], [513, 452], [493, 452], [473, 452],
-      [463, 442, 30], [445.5, 441.5, 30], [425.5, 434.5, 30], [422, 414],
-      [422, 394], [422, 374], [422, 354], [422, 334], [422, 314], [422, 294],
-      [422, 274, -30], [422, 260.5, -30, :x], [422.5, 248.5, -28], [425, 237]
-    ]
-
-    return 0 if step >= pos.length
-
-    x, y, beta, nxt = pos[step]
-    move_abs('I5', [x, y])
-    if beta
-      ox, oy = centroid('I5_0')
-      (0..6).each{|id| rotate_item("I5_#{id}", ox, oy, beta) }
-    end
-    return 3 if nxt == :x
-    return 1
-  end
-
-  # Dropping gumballs
-  def draw6
-    color = @C['6']
-    xy = [324, 130, 391, 204] # Ball holder
-    xy = round_rect(xy, 10)
-    TkcPolygon.new(@canvas, xy, :smooth=>true,
-                   :outline=>@C['fg'], :width=>3, :fill=>color)
-    xy = [339, 204, 376, 253] # Below the ball holder
-    TkcRectangle.new(@canvas, xy, :outline=>@C['fg'], :width=>3,
-                     :fill=>color, :tag=>'I6c')
-    xy = box(346, 339, 28)
-    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'') # Roter
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>2, :style=>:arc,
-               :start=>80, :extent=>205)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>2, :style=>:arc,
-               :start=>-41, :extent=>85)
-
-    xy = box(346, 339, 15) # Center of rotor
-    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>@C['fg'], :tag=>'I6m')
-    xy = [352, 312, 352, 254, 368, 254, 368, 322] # Top drop to rotor
-    TkcPolygon.new(@canvas, xy, :fill=>color, :outline=>'')
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2)
-
-    xy = [353, 240, 367, 300] # Poke bottom hole
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>'')
-    xy = [341, 190, 375, 210] # Poke another hole
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>'')
-
-    xy = [
-      368, 356, 368, 403, 389, 403, 389, 464, 320, 464, 320, 403,
-      352, 403, 352, 366
-    ]
-    TkcPolygon.new(@canvas, xy, :fill=>color, :outline=>'',
-                   :width=>2) # Below rotor
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2)
-    xy = box(275, 342, 7) # On/off rotor
-    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>@C['fg'])
-    xy = [276, 334, 342, 325] # Fan belt top
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
-    xy = [276, 349, 342, 353] # Fan belt bottom
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
-
-    xy = [337, 212, 337, 247] # What the mouse pushes
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I6_')
-    xy = [392, 212, 392, 247]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I6_')
-    xy = [337, 230, 392, 230]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>7, :tag=>'I6_')
-
-    who = -1 # All the balls
-    colors = %w(red cyan orange green blue darkblue)
-    colors *= 3
-
-    (0..16).each{|i|
-      loc = -i
-      color = colors[i]
-      x, y = @XY6["#{loc}"]
-      TkcOval.new(@canvas, box(x, y, 5),
-                  :fill=>color, :outline=>color, :tag=>"I6_b#{i}")
-    }
-    draw6a(12) # The wheel
-  end
-
-  def draw6a(beta)
-    @canvas.delete('I6_0')
-    ox, oy = [346, 339]
-    (0..3).each{|i|
-      b = beta + i * 45
-      x, y = rotate_c(28, 0, 0, 0, b)
-      xy = [ox + x, oy + y, ox - x, oy - y]
-      TkcLine.new(@canvas, xy, :tag=>'I6_0', :fill=>@C['fg'], :width=>2)
-    }
-  end
-
-  def move6(step = nil)
-    step = get_step(6, step)
-
-    return 0 if step > 62
-
-    if step < 2  # Open gate for balls to drop
-      @canvas.move('I6_', -7, 0)
-      if step == 1  # Poke a hole
-        xy = [348, 226, 365, 240]
-        TkcRectangle.new(@canvas, xy, :fill=>@canvas.itemcget('I6c', :fill),
-                         :outline=>'')
-      end
-      return 1
-    end
-
-    s = step - 1  # Do the gumball drop dance
-    (0..(((s - 1)/3).to_i)).each{|i|
-      tag = "I6_b#{i}"
-      break if @canvas.find_withtag(tag).empty?
-      loc = s - 3*i
-
-      if @XY6["#{loc},#{i}"]
-        move_abs(tag, @XY6["#{loc},#{i}"])
-      elsif @XY6["#{loc}"]
-        move_abs(tag, @XY6["#{loc}"])
-      end
-    }
-    if s % 3 == 1
-      first = (s + 2)/3
-      i = first
-      loop {
-        tag = "I6_b#{i}"
-        break if @canvas.find_withtag(tag).empty?
-        loc = first - i
-        move_abs(tag, @XY6["#{loc}"])
-        i += 1
-      }
-    end
-    if s >= 3  # Rotate the motor
-      idx = s % 3
-      draw6a(12 + s * 15)
-    end
-    return((s == 3)? 3 : 1)
-  end
-
-  # On/off switch
-  def draw7
-    color = @C['7']
-    xy = [198, 306, 277, 374]  # Box
-    TkcRectangle.new(@canvas, xy, :outline=>@C['fg'], :width=>2,
-                     :fill=>color, :tag=>'I7z')
-    @canvas.lower('I7z')
-    xy = [275, 343, 230, 349]
-    TkcLine.new(@canvas, xy, :tag=>'I7', :fill=>@C['fg'], :arrow=>:last,
-                :arrowshape=>[23, 23, 8], :width=>6)
-    xy = [225, 324]  # On button
-    x, y = xy
-    TkcOval.new(@canvas, box(x, y, 3), :fill=>@C['fg'], :outline=>@C['fg'])
-    xy = [218, 323]  # On text
-    font = ['Times Roman', 8]
-    TkcText.new(@canvas, xy, :text=>'on', :anchor=>:e,
-                :fill=>@C['fg'], :font=>font)
-    xy = [225, 350]  # Off button
-    x, y = xy
-    TkcOval.new(@canvas, box(x, y, 3), :fill=>@C['fg'], :outline=>@C['fg'])
-    xy = [218, 349]  # Off text
-    TkcText.new(@canvas, xy, :text=>'off', :anchor=>:e,
-                :fill=>@C['fg'], :font=>font)
-  end
-
-  def move7(step = nil)
-    step = get_step(7, step)
-
-    numsteps = 30
-    return 0 if step > numsteps
-    beta = 30.0 / numsteps
-    rotate_item('I7', 275, 343, beta)
-
-    return((step == numsteps)? 3: 1)
-  end
-
-  # Electricity to the fan
-  def draw8
-    sine([271, 248, 271, 306], 5, 8, :tag=>'I8_s', :fill=>@C['8'], :width=>3)
-  end
-
-  def move8(step = nil)
-    step = get_step(8, step)
-
-    return 0 if step > 3
-    if step == 0
-      sparkle(anchor('I8_s', :s), 'I8')
-      return 1
-    elsif step == 1
-      move_abs('I8', anchor('I8_s', :c))
-    elsif step == 2
-      move_abs('I8', anchor('I8_s', :n))
-    else
-      @canvas.delete('I8')
-    end
-    return((step == 2)? 3: 1)
-  end
-
-  # Fan
-  def draw9
-    color = @C['9']
-    xy = [266, 194, 310, 220]
-    TkcOval.new(@canvas, xy, :outline=>color, :fill=>color)
-    xy = [280, 209, 296, 248]
-    TkcOval.new(@canvas, xy, :outline=>color, :fill=>color)
-    xy = [
-      288, 249, 252, 249, 260, 240, 280, 234,
-      296, 234, 316, 240, 324, 249, 288, 249
-    ]
-    TkcPolygon.new(@canvas, xy, :fill=>color, :smooth=>true)
-
-    xy = [248, 205, 265, 214, 264, 205, 265, 196]  # Spinner
-    TkcPolygon.new(@canvas, xy, :fill=>color)
-
-    xy = [255, 206, 265, 234]  # Fan blades
-    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'],
-                :width=>3, :tag=>'I9_0')
-    xy = [255, 176, 265, 204]
-    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'],
-                :width=>3, :tag=>'I9_0')
-    xy = [255, 206, 265, 220]
-    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'],
-                :width=>1, :tag=>'I9_1')
-    xy = [255, 190, 265, 204]
-    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'],
-                :width=>1, :tag=>'I9_1')
-  end
-
-  def move9(step = nil)
-    step = get_step(9, step)
-
-    if (step & 1).nonzero?
-      @canvas.itemconfigure('I9_0', :width=>4)
-      @canvas.itemconfigure('I9_1', :width=>1)
-      @canvas.lower('I9_1', 'I9_0')
-    else
-      @canvas.itemconfigure('I9_0', :width=>1)
-      @canvas.itemconfigure('I9_1', :width=>4)
-      @canvas.lower('I9_0', 'I9_1')
-    end
-    return 3 if step == 0
-    return 1
-  end
-
-  # Boat
-  def draw10
-    color  = @C['10a']
-    color2 = @C['10b']
-    xy = [191, 230, 233, 230, 233, 178, 191, 178]  # Sail
-    TkcPolygon.new(@canvas, xy, :fill=>color, :width=>3, :outline=>@C['fg'],
-                   :tag=>'I10')
-    xy = box(209, 204, 31)  # Front
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :style=>:pie,
-               :start=>120, :extent=>120, :tag=>'I10')
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
-               :start=>120, :extent=>120, :tag=>'I10')
-    xy = box(249, 204, 31)  # Back
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>3,
-               :style=>:pie, :start=>120, :extent=>120, :tag=>'I10')
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
-               :start=>120, :extent=>120, :tag=>'I10')
-
-    xy = [200, 171, 200, 249]  # Mast
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I10')
-    xy = [159, 234, 182, 234]  # Bow sprit
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I10')
-    xy = [180, 234, 180, 251, 220, 251]  # Hull
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>6, :tag=>'I10')
-
-    xy = [92, 255, 221, 255]  # Waves
-    sine(xy, 2, 25, :fill=>color2, :width=>1, :tag=>'I10w')
-
-    xy = @canvas.coords('I10w')[4..-5]  # Water
-    xy.concat([222, 266, 222, 277, 99, 277])
-    TkcPolygon.new(@canvas, xy, :fill=>color2, :outline=>color2)
-    xy = [222, 266, 222, 277, 97, 277, 97, 266]  # Water bottom
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
-
-    xy = box(239, 262, 17)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
-               :start=>95, :extent=>103)
-    xy = box(76, 266, 21)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
-               :extent=>190)
-  end
-
-  def move10(step = nil)
-    step = get_step(10, step)
-
-    pos = [
-      [195, 212], [193, 212], [190, 212], [186, 212], [181, 212], [176, 212],
-      [171, 212], [166, 212], [161, 212], [156, 212], [151, 212], [147, 212],
-      [142, 212], [137, 212], [132, 212, :x], [127, 212], [121, 212],
-      [116, 212], [111, 212]
-    ]
-
-    return 0 if step >= pos.length
-
-    where = pos[step]
-    move_abs('I10', where)
-
-    return 3 if where[2] == :x
-    return 1
-  end
-
-  # 2nd ball drop
-  def draw11
-    color  = @C['11a']
-    color2 = @C['11b']
-    xy = [23, 264, 55, 591]  # Color the down tube
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>'')
-    xy = box(71, 460, 48)    # Color the outer loop
-    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'')
-
-    xy = [55, 264, 55, 458]  # Top right side
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
-    xy = [55, 504, 55, 591]  # Bottom right side
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
-    xy = box(71, 460, 48)    # Outer loop
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
-               :start=>110, :extent=>-290, :tag=>'I11i')
-    xy = box(71, 460, 16)    # Inner loop
-    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>'',
-                :width=>3, :tag=>'I11i')
-    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>@C['bg'], :width=>3)
-
-    xy = [23, 264, 23, 591]  # Left side
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
-    xy = box(1, 266, 23)     # Top left curve
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3,
-               :style=>:arc, :extent=>90)
-
-    xy = box(75, 235, 9)     # The ball
-    TkcOval.new(@canvas, xy, :fill=>color2, :outline=>'',
-                :width=>3, :tag=>'I11')
-  end
-
-  def move11(step = nil)
-    step = get_step(11, step)
-
-    pos = [
-      [75, 235], [70, 235], [65, 237], [56, 240], [46, 247], [38, 266],
-      [38, 296], [38, 333], [38, 399], [38, 475], [74, 496], [105, 472],
-      [100, 437], [65, 423], [-100, -100], [38, 505], [38, 527, :x], [38, 591]
-    ]
-
-    return 0 if step >= pos.length
-    where = pos[step]
-    move_abs('I11', where)
-    return 3 if where[2] == :x
-    return 1
-  end
-
-  # Hand
-  def draw12
-    xy = [
-      20, 637, 20, 617, 20, 610, 20, 590, 40, 590, 40, 590,
-      60, 590, 60, 610, 60, 610
-    ]
-    xy.concat([60, 610, 65, 620, 60, 631])  # Thumb
-    xy.concat([60, 631, 60, 637, 60, 662, 60, 669, 52, 669,
-                56, 669, 50, 669, 50, 662, 50, 637])
-
-    y0 = 637  # Bumps for fingers
-    y1 = 645
-    50.step(21, -10){|x|
-      x1 = x - 5
-      x2 = x - 10
-      xy << x << y0 << x1 << y1 << x2 << y0
-    }
-    TkcPolygon.new(@canvas, xy, :fill=>@C['12'], :outline=>@C['fg'],
-                   :smooth=>true, :tag=>'I12', :width=>3)
-  end
-
-  def move12(step = nil)
-    step = get_step(12, step)
-
-    pos = [[42.5, 641, :x]]
-    return 0 if step >= pos.length
-    where = pos[step]
-    move_abs('I12', where)
-    return 3 if where[2] == :x
-    return 1
-  end
-
-  # Fax
-  def draw13
-    color = @C['13a']
-    xy = [86, 663, 149, 663, 149, 704, 50, 704, 50, 681, 64, 681, 86, 671]
-    xy2 = [
-      784, 663, 721, 663, 721, 704, 820, 704, 820, 681, 806, 681, 784, 671
-    ]
-    radii = [2, 9, 9, 8, 5, 5, 2]
-
-    round_poly(@canvas, xy, radii, :width=>3,
-               :outline=>@C['fg'], :fill=>color)
-    round_poly(@canvas, xy2, radii, :width=>3,
-               :outline=>@C['fg'], :fill=>color)
-
-    xy = [56, 677]
-    x, y = xy
-    TkcRectangle.new(@canvas, box(x, y, 4), :fill=>'', :outline=>@C['fg'],
-                     :width=>3, :tag=>'I13')
-    xy = [809, 677]
-    x, y = xy
-    TkcRectangle.new(@canvas, box(x, y, 4), :fill=>'', :outline=>@C['fg'],
-                     :width=>3, :tag=>'I13R')
-
-    xy = [112, 687]  # Label
-    TkcText.new(@canvas, xy, :text=>'FAX', :fill=>@C['fg'],
-                :font=>['Times Roman', 12, :bold])
-    xy = [762, 687]
-    TkcText.new(@canvas, xy, :text=>'FAX', :fill=>@C['fg'],
-                :font=>['Times Roman', 12, :bold])
-
-    xy = [138, 663, 148, 636, 178, 636]  # Paper guide
-    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>@C['fg'], :width=>3)
-    xy = [732, 663, 722, 636, 692, 636]
-    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>@C['fg'], :width=>3)
-
-    sine([149, 688, 720, 688], 5, 15,
-         :tag=>'I13_s', :fill=>@C['fg'],  :width=>3)
-  end
-
-  def move13(step = nil)
-    step = get_step(13, step)
-
-    numsteps = 7
-
-    if step == numsteps + 2
-      move_abs('I13_star', [-100, -100])
-      @canvas.itemconfigure('I13R', :fill=>@C['13b'], :width=>2)
-      return 2
-    end
-    if step == 0  # Button down
-      @canvas.delete('I13')
-      sparkle([-100, -100], 'I13_star')  # Create off screen
-      return 1
-    end
-    x0, y0 = anchor('I13_s', :w)
-    x1, y1 = anchor('I13_s', :e)
-    x = x0 + (x1 - x0) * (step - 1) / numsteps.to_f
-    move_abs('I13_star', [x, y0])
-    return 1
-  end
-
-  # Paper in fax
-  def draw14
-    color = @C['14']
-    xy = [102, 661, 113, 632, 130, 618]  # Left paper edge
-    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color,
-                :width=>3, :tag=>'I14L_0')
-    xy = [148, 629, 125, 640, 124, 662]  # Right paper edge
-    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color,
-                :width=>3, :tag=>'I14L_1')
-    draw14a('L')
-
-    xy = [
-      768.0, 662.5, 767.991316225, 662.433786215, 767.926187912, 662.396880171
-    ]
-    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color,
-                :width=>3, :tag=>'I14R_0')
-    @canvas.lower('I14R_0')
-    # NB. these numbers are VERY sensitive, you must start with final size
-    # and shrink down to get the values
-    xy = [
-      745.947897349, 662.428358855, 745.997829056, 662.452239237, 746.0, 662.5
-    ]
-    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color,
-                :width=>3, :tag=>'I14R_1')
-    @canvas.lower('I14R_1')
-  end
-
-  def draw14a(side)
-    color = @C['14']
-    xy = @canvas.coords("I14#{side}_0")
-    xy2 = @canvas.coords("I14#{side}_1")
-    x0, y0, x1, y1, x2, y2 = xy
-    x3, y3, x4, y4, x5, y5 = xy2
-
-    zz = [
-      x0, y0, x0, y0, xy, x2, y2, x2, y2,
-      x3, y3, x3, y3, xy2, x5, y5, x5, y5
-    ].flatten
-    @canvas.delete("I14#{side}")
-    TkcPolygon.new(@canvas, zz, :tag=>"I14#{side}", :smooth=>true,
-                   :fill=>color, :outline=>color, :width=>3)
-    @canvas.lower("I14#{side}")
-  end
-
-  def move14(step = nil)
-    step = get_step(14, step)
-
-    # Paper going down
-    sc = 0.9 - 0.05*step
-    if sc < 0.3
-      @canvas.delete('I14L')
-      return 0
-    end
-
-    ox, oy = @canvas.coords('I14L_0')
-    @canvas.scale('I14L_0', ox, oy, sc, sc)
-    ox, oy = @canvas.coords('I14L_1')[-2..-1]
-    @canvas.scale('I14L_1', ox, oy, sc, sc)
-    draw14a('L')
-
-    # Paper going up
-    sc = 0.35 + 0.05*step
-    sc = 1/sc
-
-    ox, oy = @canvas.coords('I14R_0')
-    @canvas.scale('I14R_0', ox, oy, sc, sc)
-    ox, oy = @canvas.coords('I14R_1')[-2..-1]
-    @canvas.scale('I14R_1', ox, oy, sc, sc)
-    draw14a('R')
-
-    return((step == 10)? 3: 1)
-  end
-
-  # Light beam
-  def draw15
-    color = @C['15a']
-    xy = [824, 599, 824, 585, 820, 585, 829, 585]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I15a')
-    xy = [789, 599, 836, 643]
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>3)
-    xy = [778, 610, 788, 632]
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>3)
-    xy = [766, 617, 776, 625]
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>3)
-
-    xy = [633, 600, 681, 640]
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>3)
-    xy = [635, 567, 657, 599]
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>2)
-    xy = [765, 557, 784, 583]
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>2)
-
-    sine([658, 580, 765, 580], 3, 15,
-         :tag=>'I15_s', :fill=>@C['fg'], :width=>3)
-  end
-
-  def move15a
-    color = @C['15b']
-    @canvas.scale('I15a', 824, 599, 1, 0.3)  # Button down
-    xy = [765, 621, 681, 621]
-    TkcLine.new(@canvas, xy, :dash=>'-', :width=>3, :fill=>color, :tag=>'I15')
-  end
-
-  def move15(step = nil)
-    step = get_step(15, step)
-
-    numsteps = 6
-
-    if step == numsteps + 2
-      move_abs('I15_star', [-100, -100])
-      return 2
-    end
-    if step == 0  # Break the light beam
-      sparkle([-100, -100], 'I15_star')
-      xy = [765, 621, 745, 621]
-      @canvas.coords('I15', xy)
-      return 1
-    end
-    x0, y0 = anchor('I15_s', :w)
-    x1, y1 = anchor('I15_s', :e)
-    x = x0 + (x1 - x0) * (step - 1) / numsteps.to_f
-    move_abs('I15_star', [x, y0])
-    return 1
-  end
-
-  # Bell
-  def draw16
-    color = @C['16']
-    xy = [722, 485, 791, 556]
-    TkcRectangle.new(@canvas, xy, :fill=>'', :outline=>@C['fg'], :width=>3)
-    xy = box(752, 515, 25)  # Bell
-    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'black',
-                :tag=>'I16b', :width=>2)
-    xy = box(752, 515, 5)   # Bell button
-    TkcOval.new(@canvas, xy, :fill=>'black', :outline=>'black', :tag=>'I16b')
-
-    xy = [784, 523, 764, 549]  # Clapper
-    TkcLine.new(@canvas, xy, :width=>3, :tag=>'I16c', :fill=>@C['fg'])
-    xy = box(784, 523, 4)
-    TkcOval.new(@canvas, xy, :fill=>@C['fg'], :outline=>@C['fg'], :tag=>'I16d')
-  end
-
-  def move16(step = nil)
-    step = get_step(16, step)
-
-    # Note: we never stop
-    ox, oy = [760, 553]
-    if (step & 1).nonzero?
-      beta = 12
-      @canvas.move('I16b', 3, 0)
-    else
-      beta = -12
-      @canvas.move('I16b', -3, 0)
-    end
-    rotate_item('I16c', ox, oy, beta)
-    rotate_item('I16d', ox, oy, beta)
-
-    return ((step == 1)? 3: 1)
-  end
-
-  # Cat
-  def draw17
-    color = @C['17']
-
-    xy = [584, 556, 722, 556]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
-    xy = [584, 485, 722, 485]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
-
-    xy = [664, 523, 717, 549]  # Body
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :fill=>color, :width=>3,
-               :style=>:chord, :start=>128, :extent=>260, :tag=>'I17')
-
-    xy = [709, 554, 690, 543]  # Paw
-    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>color,
-                :width=>3, :tag=>'I17')
-    xy = [657, 544, 676, 555]
-    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>color,
-                :width=>3, :tag=>'I17')
-
-    xy = box(660, 535, 15)     # Lower face
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
-               :start=>150, :extent=>240, :tag=>'I17_')
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1,
-               :style=>:chord, :start=>150, :extent=>240, :tag=>'I17_')
-    xy = [674, 529, 670, 513, 662, 521, 658, 521, 650, 513, 647, 529]  # Ears
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
-    TkcPolygon.new(@canvas, xy, :fill=>color, :outline=>'', :width=>1,
-                   :tag=>['I17_', 'I17_c'])
-    xy = [652, 542, 628, 539]  # Whiskers
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
-    xy = [652, 543, 632, 545]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
-    xy = [652, 546, 632, 552]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
-
-    xy = [668, 543, 687, 538]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
-                :tag=>['I17_', 'I17_w'])
-    xy = [668, 544, 688, 546]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
-                :tag=>['I17_', 'I17_w'])
-    xy = [668, 547, 688, 553]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
-                :tag=>['I17_', 'I17_w'])
-
-    xy = [649, 530, 654, 538, 659, 530]  # Left eye
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2,
-                :smooth=>true, :tag=>'I17')
-    xy = [671, 530, 666, 538, 661, 530]  # Right eye
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2,
-                :smooth=>true, :tag=>'I17')
-    xy = [655, 543, 660, 551, 665, 543]  # Mouth
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2,
-                :smooth=>true, :tag=>'I17')
-  end
-
-  def move17(step = nil)
-    step = get_step(17, step)
-
-    if step == 0
-      @canvas.delete('I17')  # Delete most of the cat
-      xy = [655, 543, 660, 535, 665, 543]  # Mouth
-      TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
-                  :smooth=>true, :tag=>'I17_')
-      xy = box(654, 530, 4)  # Left eye
-      TkcOval.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :fill=>'',
-                  :tag=>'I17_')
-      xy = box(666, 530, 4)  # Right eye
-      TkcOval.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :fill=>'',
-                  :tag=>'I17_')
-
-      @canvas.move('I17_', 0, -20) # Move face up
-      xy = [652, 528, 652, 554]    # Front leg
-      TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
-      xy = [670, 528, 670, 554]    # 2nd front leg
-      TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
-
-      xy = [ # Body
-        675, 506, 694, 489, 715, 513, 715, 513, 715, 513, 716, 525,
-        716, 525, 716, 525, 706, 530, 695, 530, 679, 535, 668, 527,
-        668, 527, 668, 527, 675, 522, 676, 517, 677, 512
-      ]
-      TkcPolygon.new(@canvas, xy, :fill=>@canvas.itemcget('I17_c', :fill),
-                     :outline=>@C['fg'], :width=>3, :smooth=>true,
-                     :tag=>'I17_')
-      xy = [716, 514, 716, 554]  # Back leg
-      TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
-      xy = [694, 532, 694, 554]  # 2nd back leg
-      TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
-      xy = [715, 514, 718, 506, 719, 495, 716, 488]  # Tail
-      TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
-                  :smooth=>true, :tag=>'I17_')
-
-      @canvas.raise('I17w')       # Make whiskers visible
-      @canvas.move('I17_', -5, 0) # Move away from the wall a bit
-      return 2
-    end
-    return 0
-  end
-
-  # Sling shot
-  def draw18
-    color = @C['18']
-    xy = [721, 506, 627, 506]  # Sling hold
-    TkcLine.new(@canvas, xy, :width=>4, :fill=>@C['fg'], :tag=>'I18')
-
-    xy = [607, 500, 628, 513]  # Sling rock
-    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'', :tag=>'I18a')
-
-    xy = [526, 513, 606, 507, 494, 502]  # Sling band
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>4, :tag=>'I18b')
-    xy = [485, 490, 510, 540, 510, 575, 510, 540, 535, 491]  # Sling
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>6)
-  end
-
-  def move18(step = nil)
-    step = get_step(18, step)
-
-    pos = [
-      [587, 506], [537, 506], [466, 506], [376, 506], [266, 506, :x],
-      [136, 506], [16, 506], [-100, -100]
-    ]
-
-    b = []
-    b[0] = [490, 502, 719, 507, 524, 512]  # Band collapsing
-    b[1] = [
-      491, 503, 524, 557, 563, 505, 559, 496, 546, 506, 551, 525,
-      553, 536, 538, 534, 532, 519, 529, 499
-    ]
-    b[2] = [
-      491, 503, 508, 563, 542, 533, 551, 526, 561, 539, 549, 550, 530, 500
-    ]
-    b[3] = [
-      491, 503, 508, 563, 530, 554, 541, 562, 525, 568, 519, 544, 530, 501
-    ]
-
-    return 0 if step >= pos.length
-
-    if step == 0
-      @canvas.delete('I18')
-      @canvas.itemconfigure('I18b', :smooth=>true)
-    end
-    if b[step]
-      @canvas.coords('I18b', b[step])
-    end
-
-    where = pos[step]
-    move_abs('I18a', where)
-    return 3 if where[2] == :x
-    return 1
-  end
-
-  # Water pipe
-  def draw19
-    color = @C['19']
-    xx = [[249, 181], [155, 118], [86, 55], [22, 0]]
-    xx.each{|x1, x2|
-      TkcRectangle.new(@canvas, x1, 453, x2, 467,
-                       :fill=>color, :outline=>'', :tag=>'I19')
-      TkcLine.new(@canvas, x1, 453, x2, 453,
-                  :fill=>@C['fg'], :width=>1) # Pipe top
-      TkcLine.new(@canvas, x1, 467, x2, 467,
-                  :fill=>@C['fg'], :width=>1) # Pipe bottom
-    }
-    @canvas.raise('I11i')
-
-    xy = box(168, 460, 16)  # Bulge by the joint
-    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'')
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, :style=>:arc,
-               :start=>21, :extent=>136)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, :style=>:arc,
-               :start=>-21, :extent=>-130)
-
-    xy = [249, 447, 255, 473]  # First joint 26x6
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>1)
-
-    xy = box(257, 433, 34)     # Bend up
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1,
-               :style=>:pie, :start=>0, :extent=>-91)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
-               :style=>:arc, :start=>0, :extent=>-90)
-    xy = box(257, 433, 20)
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>1,
-               :style=>:pie, :start=>0, :extent=>-92)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
-               :style=>:arc, :start=>0, :extent=>-90)
-    xy = box(257, 421, 34)     # Bend left
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1,
-               :style=>:pie, :start=>0, :extent=>91)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
-               :style=>:arc, :start=>0, :extent=>90)
-    xy = box(257, 421, 20)
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>1,
-               :style=>:pie, :start=>0, :extent=>90)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
-               :style=>:arc, :start=>0, :extent=>90)
-    xy = box(243, 421, 34)     # Bend down
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1,
-               :style=>:pie, :start=>90, :extent=>90)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
-               :style=>:arc, :start=>90, :extent=>90)
-    xy = box(243, 421, 20)
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>1,
-               :style=>:pie, :start=>90, :extent=>90)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
-               :style=>:arc, :start=>90, :extent=>90)
-
-    xy = [270, 427, 296, 433]  # 2nd joint bottom
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>1)
-    xy = [270, 421, 296, 427]  # 2nd joint top
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>1)
-    xy = [249, 382, 255, 408]  # Third joint right
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>1)
-    xy = [243, 382, 249, 408]  # Third joint left
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>1)
-    xy = [203, 420, 229, 426]  # Last joint
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>1)
-
-    xy = box(168, 460, 6)      # Handle joint
-    TkcOval.new(@canvas, xy, :fill=>@C['fg'], :outline=>'', :tag=>'I19a')
-    xy = [168, 460, 168, 512]  # Handle bar
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>5, :tag=>'I19b')
-  end
-
-  def move19(step = nil)
-    step = get_step(19, step)
-
-     angles = [30, 30, 30]
-    return 2 if step == angles.length
-    ox, oy = centroid('I19a')
-    rotate_item('I19b', ox, oy, angles[step])
-
-    return 1
-  end
-
-  # Water pouring
-  def draw20
-    # do nothing
-  end
-
-  def move20(step = nil)
-    step = get_step(20, step)
-
-    pos  = [451, 462, 473, 484, 496, 504, 513, 523, 532]
-    freq  = [20,  40,  40,  40,  40,  40,  40,  40,  40]
-    pos = [
-      [451, 20], [462, 40], [473, 40], [484, 40], [496, 40],
-      [504, 40], [513, 40], [523, 40], [532, 40, :x]
-    ]
-    return 0 if step >= pos.length
-
-    @canvas.delete('I20')
-    where = pos[step]
-    y, f = where
-    h20(y, f)
-    return 3 if where[2] == :x
-    return 1
-  end
-
-  def h20(y, f)
-    color = @C['20']
-    @canvas.delete('I20')
-
-    sine([208, 428, 208, y], 4, f, :tag=>['I20', 'I20s'],
-         :width=>3, :fill=>color, :smooth=>true)
-    TkcLine.new(@canvas, @canvas.coords('I20s'), :width=>3,
-                :fill=>color, :smooth=>1, :tag=>['I20', 'I20a'])
-    TkcLine.new(@canvas, @canvas.coords('I20s'), :width=>3,
-                :fill=>color, :smooth=>1, :tag=>['I20', 'I20b'])
-    @canvas.move('I20a', 8, 0)
-    @canvas.move('I20b', 16, 0)
-  end
-
-  # Bucket
-  def draw21
-    color = @C['21']
-    xy = [217, 451, 244, 490]  # Right handle
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2, :tag=>'I21_a')
-    xy = [201, 467, 182, 490]  # Left handle
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2, :tag=>'I21_a')
-
-    xy = [245, 490, 237, 535]  # Right side
-    xy2 = [189, 535, 181, 490] # Left side
-    TkcPolygon.new(@canvas, xy + xy2, :fill=>color, :outline=>'',
-                   :tag=>['I21', 'I21f'])
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2, :tag=>'I21')
-    TkcLine.new(@canvas, xy2, :fill=>@C['fg'], :width=>2, :tag=>'I21')
-
-    xy = [182, 486, 244, 498]  # Top
-    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'', :width=>2,
-                :tag=>['I21', 'I21f'])
-    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'], :width=>2,
-                :tag=>['I21', 'I21t'])
-    xy = [189, 532, 237, 540]  # Bottom
-    TkcOval.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>2,
-                :tag=>['I21', 'I21b'])
-  end
-
-  def move21(step = nil)
-    step = get_step(21, step)
-
-    numsteps = 30
-    return 0 if step >= numsteps
-
-    x1, y1, x2, y2 = @canvas.coords('I21b')
-    # lx1, ly1, lx2, ly2 = @canvas.coords('I21t')
-    lx1, ly1, lx2, ly2 = [183, 492, 243, 504]
-
-    f = step / numsteps.to_f
-    y2 = y2 - 3
-    xx1 = x1 + (lx1 - x1) * f
-    yy1 = y1 + (ly1 - y1) * f
-    xx2 = x2 + (lx2 - x2) * f
-    yy2 = y2 + (ly2 - y2) * f
-
-    @canvas.itemconfigure('I21b', :fill=>@C['20'])
-    @canvas.delete('I21w')
-    TkcPolygon.new(@canvas, x2, y2, x1, y1, xx1, yy1, xx2, yy1,
-                   :tag=>['I21', 'I21w'], :outline=>'', :fill=>@C['20'])
-    @canvas.lower('I21w', 'I21')
-    @canvas.raise('I21b')
-    @canvas.lower('I21f')
-
-    return((step == numsteps - 1)? 3: 1)
-  end
-
-  # Bucket drop
-  def draw22
-    # do nothing
-  end
-
-  def move22(step = nil)
-    step = get_step(22, step)
-    pos = [[213, 513], [213, 523], [213, 543, :x], [213, 583], [213, 593]]
-
-    @canvas.itemconfigure('I21f', :fill=>@C['22']) if step == 0
-    return 0 if step >= pos.length
-    where = pos[step]
-    move_abs('I21', where)
-    h20(where[1], 40)
-    @canvas.delete('I21_a')  # Delete handles
-
-    return 3 if where[2] == :x
-    return 1
-  end
-
-  # Blow dart
-  def draw23
-    color  = @C['23a']
-    color2 = @C['23b']
-    color3 = @C['23c']
-
-    xy = [185, 623, 253, 650]  # Block
-    TkcRectangle.new(@canvas, xy, :fill=>'black', :outline=>@C['fg'],
-                     :width=>2, :tag=>'I23a')
-    xy = [187, 592, 241, 623]  # Balloon
-    TkcOval.new(@canvas, xy, :outline=>'', :fill=>color, :tag=>'I23b')
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :tag=>'I23b',
-               :style=>:arc, :start=>12, :extent=>336)
-    xy = [239, 604, 258, 589, 258, 625, 239, 610]  # Balloon nozzle
-    TkcPolygon.new(@canvas, xy, :outline=>'', :fill=>color, :tag=>'I23b')
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I23b')
-
-    xy = [285, 611, 250, 603]  # Dart body
-    TkcOval.new(@canvas, xy, :fill=>color2, :outline=>@C['fg'],
-                :width=>3, :tag=>'I23d')
-    xy = [249, 596, 249, 618, 264, 607, 249, 596]  # Dart tail
-    TkcPolygon.new(@canvas, xy, :fill=>color3, :outline=>@C['fg'],
-                   :width=>3, :tag=>'I23d')
-    xy = [249, 607, 268, 607]  # Dart detail
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I23d')
-    xy = [285, 607, 305, 607]  # Dart needle
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I23d')
-  end
-
-  def move23(step = nil)
-    step = get_step(23, step)
-
-    pos = [
-      [277, 607], [287, 607], [307, 607, :x], [347, 607], [407, 607],
-      [487, 607], [587, 607], [687, 607], [787, 607], [-100, -100]
-    ]
-
-    return 0 if step >= pos.length
-    if step <= 1
-      ox, oy = anchor('I23a', :n)
-      @canvas.scale('I23b', ox, oy, 0.9, 0.5)
-    end
-    where = pos[step]
-    move_abs('I23d', where)
-
-    return 3 if where[2] == :x
-    return 1
-  end
-
-  # Balloon
-  def draw24
-    color = @C['24a']
-    xy = [366, 518, 462, 665]  # Balloon
-    TkcOval.new(@canvas, xy, :fill=>color, :outline=>@C['fg'],
-                :width=>3, :tag=>'I24')
-    xy = [414, 666, 414, 729]  # String
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I24')
-    xy = [410, 666, 404, 673, 422, 673, 418, 666]  # Nozzle
-    TkcPolygon.new(@canvas, xy, :fill=>color, :outline=>@C['fg'],
-                   :width=>3, :tag=>'I24')
-
-    xy = [387, 567, 390, 549, 404, 542]  # Reflections
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true,
-                :width=>2, :tag=>'I24')
-    xy = [395, 568, 399, 554, 413, 547]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true,
-                :width=>2, :tag=>'I24')
-    xy = [403, 570, 396, 555, 381, 553]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true,
-                :width=>2, :tag=>'I24')
-    xy = [408, 564, 402, 547, 386, 545]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true,
-                :width=>2, :tag=>'I24')
-  end
-
-  def move24(step = nil)
-    step = get_step(24, step)
-
-    return 0 if step > 4
-    return 2 if step == 4
-
-    if step == 0
-      @canvas.delete('I24')  # Exploding balloon
-      xy = [
-        347, 465, 361, 557, 271, 503, 272, 503, 342, 574, 259, 594,
-        259, 593, 362, 626, 320, 737, 320, 740, 398, 691, 436, 738,
-        436, 739, 476, 679, 528, 701, 527, 702, 494, 627, 548, 613,
-        548, 613, 480, 574, 577, 473, 577, 473, 474, 538, 445, 508,
-        431, 441, 431, 440, 400, 502, 347, 465, 347, 465
-      ]
-      TkcPolygon.new(@canvas, xy, :tag=>'I24', :fill=>@C['24b'],
-                     :outline=>@C['24a'], :width=>10, :smooth=>true)
-      msg = Tk.subst(@S['message'].value)
-      TkcText.new(@canvas, centroid('I24'), :text=>msg, :tag=>['I24', 'I24t'],
-                  :justify=>:center, :font=>['Times Roman', 18, :bold])
-      return 1
-    end
-
-    @canvas.itemconfigure('I24t', :font=>['Times Roman', 18 + 6*step, :bold])
-    @canvas.move('I24', 0, -60)
-    ox, oy = centroid('I24')
-    @canvas.scale('I24', ox, oy, 1.25, 1.25)
-    return 1
-  end
-
-  # Displaying the message
-  def move25(step = nil)
-    step = get_step(25, step)
-
-    if step == 0
-      @XY['25'] = Tk::Clock.clicks(:milliseconds)
-      return 1
-    end
-    elapsed = Tk::Clock.clicks(:milliseconds) - @XY['25']
-    return 1 if elapsed < 5000
-    return 2
-  end
-
-  # Collapsing balloon
-  def move26(step = nil)
-    step = get_step(26, step)
-
-    if step >= 3
-      @canvas.delete('I24', 'I26')
-      TkcText.new(@canvas, 430, 740, :anchor=>:s, :tag=>'I26',
-                  :text=>'click to continue',
-                  :font=>['Times Roman', 24, :bold])
-      @canvas.bind('1', proc{reset})
-      return 4
-    end
-
-    ox, oy = centroid('I24')
-    @canvas.scale('I24', ox, oy, 0.8, 0.8)
-    @canvas.move('I24', 0, 60)
-    @canvas.itemconfigure('I24t', :font=>['Times Roman', 30 - 6*step, :bold])
-    return 1
-  end
-
-  ################################################################
-  #
-  # Helper functions
-  #
-  def box(x, y, r)
-    [x - r, y - r, x + r, y + r]
-  end
-
-  def move_abs(item, xy)
-    x, y = xy
-    ox, oy = centroid(item)
-    dx = x - ox
-    dy = y - oy
-    @canvas.move(item, dx, dy)
-  end
-
-  def rotate_item(item, ox, oy, beta)
-    xy = @canvas.coords(item)
-    xy2 = []
-    0.step(xy.length - 1, 2){|idx|
-      x, y = xy[idx, 2]
-      xy2.concat(rotate_c(x, y, ox, oy, beta))
-    }
-    @canvas.coords(item, xy2)
-  end
-
-  def rotate_c(x, y, ox, oy, beta)
-    # rotates vector (ox,oy)->(x,y) by beta degrees clockwise
-
-    x -= ox    # Shift to origin
-    y -= oy
-
-    beta = beta * Math.atan(1) * 4 / 180.0        # Radians
-    xx = x * Math.cos(beta) - y * Math.sin(beta)  # Rotate
-    yy = x * Math.sin(beta) + y * Math.cos(beta)
-
-    xx += ox  # Shift back
-    yy += oy
-
-    [xx, yy]
-  end
-
-  def reset
-    draw_all
-    @canvas.bind_remove('1')
-    @S['mode'].value = :MSTART
-    @S['active'] = [0]
-  end
-
-  # Each Move## keeps its state info in STEP, this retrieves and increments it
-  def get_step(who, step)
-    if step
-      @STEP[who] = step
-    else
-      if !@STEP.exist?(who) || @STEP[who] == ""
-        @STEP[who] = 0
-      else
-        @STEP[who] += 1
-      end
-    end
-    @STEP[who]
-  end
-
-  def reset_step
-    @S['cnt'].value = 0
-    @STEP.keys.each{|k| @STEP[k] = ''}
-  end
-
-  def sine(xy0, amp, freq, opts = {})
-    x0, y0, x1, y1 = xy0
-    step = 2
-    xy = []
-    if y0 == y1  # Horizontal
-      x0.step(x1, step){|x|
-        beta = (x - x0) * 2 * Math::PI / freq
-        y = y0 + amp * Math.sin(beta)
-        xy << x << y
-      }
-    else
-      y0.step(y1, step){|y|
-        beta = (y - y0) * 2 * Math::PI / freq
-        x = x0 + amp * Math.sin(beta)
-        xy << x << y
-      }
-    end
-    TkcLine.new(@canvas, xy, opts)
-  end
-
-  def round_rect(xy, radius, opts={})
-    x0, y0, x3, y3 = xy
-    r = @canvas.winfo_pixels(radius)
-    d = 2 * r
-
-    # Make sure that the radius of the curve is less than 3/8 size of the box!
-    maxr = 0.75
-    if d > maxr * (x3 - x0)
-      d = maxr * (x3 - x0)
-    end
-    if d > maxr * (y3 - y0)
-      d = maxr * (y3 - y0)
-    end
-
-    x1 = x0 + d
-    x2 = x3 - d
-    y1 = y0 + d
-    y2 = y3 - d
-
-    xy = [x0, y0, x1, y0, x2, y0, x3, y0, x3, y1, x3, y2]
-    xy.concat([x3, y3, x2, y3, x1, y3, x0, y3, x0, y2, x0, y1])
-    return xy
-  end
-
-  def round_poly(canv, xy, radii, opts)
-    lenXY = xy.length
-    lenR = radii.length
-    if lenXY != 2*lenR
-      raise "wrong number of vertices and radii"
-    end
-
-    knots = []
-    x0 = xy[-2]; y0 = xy[-1]
-    x1 = xy[0];  y1 = xy[1]
-    xy << xy[0] << xy[1]
-
-    0.step(lenXY - 1, 2){|i|
-      radius = radii[i/2]
-      r = canv.winfo_pixels(radius)
-
-      x2 = xy[i+2];  y2 = xy[i+3]
-      z = _round_poly2(x0, y0, x1, y1, x2, y2, r)
-      knots.concat(z)
-
-      x0 = x1;  y0 = y1
-      x1 = x2;  y1 = y2
-    }
-    TkcPolygon.new(canv, knots, {:smooth=>true}.update(opts))
-  end
-
-  def _round_poly2(x0, y0, x1, y1, x2, y2, radius)
-    d = 2 * radius
-    maxr = 0.75
-
-    v1x = x0 - x1
-    v1y = y0 - y1
-    v2x = x2 - x1
-    v2y = y2 - y1
-
-    vlen1 = Math.sqrt(v1x*v1x + v1y*v1y)
-    vlen2 = Math.sqrt(v2x*v2x + v2y*v2y)
-
-    if d > maxr * vlen1
-      d = maxr * vlen1
-    end
-    if d > maxr * vlen2
-      d = maxr * vlen2
-    end
-
-    xy = []
-    xy << (x1 + d * v1x / vlen1) << (y1 + d * v1y / vlen1)
-    xy << x1 << y1
-    xy << (x1 + d * v2x / vlen2) << (y1 + d * v2y / vlen2)
-
-    return xy
-  end
-
-  def sparkle(oxy, tag)
-    xy = [
-      [299, 283], [298, 302], [295, 314], [271, 331],
-      [239, 310], [242, 292], [256, 274], [281, 273]
-    ]
-    xy.each{|x, y|
-      TkcLine.new(@canvas, 271, 304, x, y,
-                  :fill=>'white', :width=>3, :tag=>tag)
-    }
-    move_abs(tag, oxy)
-  end
-
-  def centroid(item)
-    anchor(item, :c)
-  end
-
-  def anchor(item, where)
-    x1, y1, x2, y2 = @canvas.bbox(item)
-    case(where)
-    when :n
-      y = y1
-    when :s
-      y = y2
-    else
-      y = (y1 + y2) / 2.0
-    end
-    case(where)
-    when :w
-      x = x1
-    when :e
-      x = x2
-    else
-      x = (x1 + x2) / 2.0
-    end
-    return [x, y]
-  end
-end
-
-TkGoldberg_Demo.new(base_frame)
diff --git a/ext/tk/sample/demos-en/hello b/ext/tk/sample/demos-en/hello
deleted file mode 100644
index 5e86ad7e3e..0000000000
--- a/ext/tk/sample/demos-en/hello
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-require 'tk'
-
-#unless /^8\.[1-9]/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK
-#  require 'tkencoding'
-#end
-
-TkButton.new(nil,
-	'text'=>"Hello Ruby world!",
-	'font'=>TkFont.new('k14'),
-	'command'=>proc{print "Hello Ruby world!\n"; exit}
-).pack
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-en/hscale.rb b/ext/tk/sample/demos-en/hscale.rb
deleted file mode 100644
index 05a8f39362..0000000000
--- a/ext/tk/sample/demos-en/hscale.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-# frozen_string_literal: false
-require "tkcanvas"
-
-if defined?($hscale_demo) && $hscale_demo
-  $hscale_demo.destroy
-  $hscale_demo = nil
-end
-
-$hscale_demo = TkToplevel.new {|w|
-  title("Horizontal Scale Demonstration")
-  iconname("hscale")
-}
-positionWindow($hscale_demo)
-
-base_frame = TkFrame.new($hscale_demo).pack(:fill=>:both, :expand=>true)
-
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '3.5i'
-  justify 'left'
-  text "An arrow and a horizontal scale are displayed below.  If you click or drag mouse button 1 in the scale, you can change the length of the arrow."
-}
-msg.pack('side'=>'top')
-
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc {
-      tmppath = $hscale_demo
-      $hscale_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc { showCode 'hscale' }
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-
-def setWidth(w, width)
-  width = width + 21
-  x2 = width - 30
-  if x2 < 21
-    x2 = 21
-  end
-  w.coords 'poly',20,15,20,35,x2,35,x2,45,width,25,x2,5,x2,15,20,15
-  w.coords 'line',20,15,20,35,x2,35,x2,45,width,25,x2,5,x2,15,20,15
-end
-
-TkFrame.new(base_frame) {|frame|
-  canvas = TkCanvas.new(frame) {|c|
-    width 50
-    height 50
-    bd 0
-    highlightthickness 0
-    TkcPolygon.new(c, '0', '0', '1', '1', '2', '2') {
-      fill 'DeepSkyBlue'
-      tags 'poly'
-    }
-    TkcLine.new(c, '0', '0', '1', '1', '2', '2', '0', '0') {
-      fill 'black'
-      tags 'line'
-    }
-  }.pack('side'=>'top', 'expand'=>'yes', 'anchor'=>'s', 'fill'=>'x', 'padx'=>'15')
-  scale = TkScale.new(frame) {
-    orient 'horizontal'
-    length 284
-    from 0
-    to 250
-    command proc{|value| setWidth(canvas, value)}
-    tickinterval 50
-  }.pack('side'=>'bottom', 'expand'=>'yes', 'anchor'=>'n')
-  scale.set 75
-}.pack('side'=>'top', 'fill'=>'x')
diff --git a/ext/tk/sample/demos-en/icon.rb b/ext/tk/sample/demos-en/icon.rb
deleted file mode 100644
index e0cb88ad80..0000000000
--- a/ext/tk/sample/demos-en/icon.rb
+++ /dev/null
@@ -1,106 +0,0 @@
-# frozen_string_literal: false
-# icon.rb
-#
-# This demonstration script creates a toplevel window containing
-# buttons that display bitmaps instead of text.
-#
-# iconic button widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($icon_demo) && $icon_demo
-  $icon_demo.destroy
-  $icon_demo = nil
-end
-
-# demo toplevel widget
-$icon_demo = TkToplevel.new {|w|
-  title("Iconic Button Demonstration")
-  iconname("icon")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($icon_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '5i'
-  justify 'left'
-  text "This window shows three ways of using bitmaps or images in radiobuttons and checkbuttons.  On the left are two radiobuttons, each of which displays a bitmap and an indicator.  In the middle is a checkbutton that displays a different image depending on whether it is selected or not.  On the right is a checkbutton that displays a single bitmap but changes its background color to indicate whether or not it is selected. (This change is visible when the mouse pointer is not directly over the button.)"
-}
-msg.pack('side'=>'top')
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $icon_demo
-      $icon_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'icon'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# image
-flagup = \
-TkBitmapImage.new('file'=>[$demo_dir,'..',
-                           'images','flagup.xbm'].join(File::Separator),
-                  'maskfile'=>\
-                  [$demo_dir,'..','images','flagup.xbm'].join(File::Separator))
-flagdown = \
-TkBitmapImage.new('file'=>[$demo_dir,'..',
-                           'images','flagdown.xbm'].join(File::Separator),
-                  'maskfile'=>\
-                  [$demo_dir,'..',
-                    'images','flagdown.xbm'].join(File::Separator))
-
-# create variable
-letters = TkVariable.new
-
-# frame
-TkFrame.new(base_frame, 'borderwidth'=>10){|w|
-  TkFrame.new(w) {|f|
-    # TkRadioButton.new(f){
-    Tk::RadioButton.new(f){
-      bitmap '@' + [$demo_dir,'..',
-                    'images','letters.xbm'].join(File::Separator)
-      variable letters
-      value 'full'
-    }.pack('side'=>'top', 'expand'=>'yes')
-
-    # TkRadioButton.new(f){
-    Tk::RadioButton.new(f){
-      bitmap '@' + [$demo_dir,'..',
-                     'images','noletter.xbm'].join(File::Separator)
-      variable letters
-      value 'empty'
-    }.pack('side'=>'top', 'expand'=>'yes')
-
-  }.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'5m')
-
-  # TkCheckButton.new(w) {
-  Tk::CheckButton.new(w) {
-    image flagdown
-    selectimage flagup
-    indicatoron 0
-    selectcolor self['background']
-  }.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'5m')
-
-  # TkCheckButton.new(w) {
-  Tk::CheckButton.new(w) {
-    bitmap '@' + [$demo_dir,'..',
-                   'images','letters.xbm'].join(File::Separator)
-    indicatoron 0
-    selectcolor 'SeaGreen1'
-  }.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'5m')
-
-}.pack('side'=>'top')
-
diff --git a/ext/tk/sample/demos-en/image1.rb b/ext/tk/sample/demos-en/image1.rb
deleted file mode 100644
index c7c0989df8..0000000000
--- a/ext/tk/sample/demos-en/image1.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-# frozen_string_literal: false
-## image1.rb
-#
-# This demonstration script displays two image widgets.
-#
-# two image widgets demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($image1_demo) && $image1_demo
-  $image1_demo.destroy
-  $image1_demo = nil
-end
-
-# demo toplevel widget
-$image1_demo = TkToplevel.new {|w|
-  title('Image Demonstration #1')
-  iconname("Image1")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($image1_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "This demonstration displays two images, each in a separate label widget."
-}
-msg.pack('side'=>'top')
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $image1_demo
-      $image1_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'image1'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# image
-image1a = \
-TkPhotoImage.new('file'=>[$demo_dir,'..',
-                          'images','earth.gif'].join(File::Separator))
-image1b = \
-TkPhotoImage.new('file'=>[$demo_dir,'..',
-                          'images','earthris.gif'].join(File::Separator))
-
-# label
-#[ TkLabel.new(base_frame, 'image'=>image1a, 'bd'=>1, 'relief'=>'sunken'),
-#  TkLabel.new(base_frame, 'image'=>image1b, 'bd'=>1, 'relief'=>'sunken')
-#].each{|w| w.pack('side'=>'top', 'padx'=>'.5m', 'pady'=>'.5m')}
-[ Tk::Label.new(base_frame, 'image'=>image1a, 'bd'=>1, 'relief'=>'sunken'),
-  Tk::Label.new(base_frame, 'image'=>image1b, 'bd'=>1, 'relief'=>'sunken')
-].each{|w| w.pack('side'=>'top', 'padx'=>'.5m', 'pady'=>'.5m')}
-
diff --git a/ext/tk/sample/demos-en/image2.rb b/ext/tk/sample/demos-en/image2.rb
deleted file mode 100644
index dfb993e434..0000000000
--- a/ext/tk/sample/demos-en/image2.rb
+++ /dev/null
@@ -1,108 +0,0 @@
-# frozen_string_literal: false
-# image2.rb
-#
-# This demonstration script creates a simple collection of widgets
-# that allow you to select and view images in a Tk label.
-#
-# widget demo 'load image' (called by 'widget')
-#
-
-# toplevel widget
-if defined?($image2_demo) && $image2_demo
-  $image2_demo.destroy
-  $image2_demo = nil
-end
-
-# demo toplevel widget
-$image2_demo = TkToplevel.new {|w|
-  title('Image Demonstration #2')
-  iconname("Image2")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($image2_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "This demonstration allows you to view images using a Tk \"photo\" image.  First type a directory name in the listbox, then press Enter to load the directory into the listbox.  Then double-click on a file name in the listbox to see that image."
-}
-msg.pack('side'=>'top')
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $image2_demo
-      $image2_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'image2'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# create variable
-$dirName = TkVariable.new([$demo_dir,'..','images'].join(File::Separator))
-
-# image
-$image2a = TkPhotoImage.new
-
-#
-TkLabel.new(base_frame, 'text'=>'Directory:')\
-.pack('side'=>'top', 'anchor'=>'w')
-
-image2_e = TkEntry.new(base_frame) {
-  width 30
-  textvariable $dirName
-}.pack('side'=>'top', 'anchor'=>'w')
-
-TkFrame.new(base_frame, 'height'=>'3m', 'width'=>20)\
-.pack('side'=>'top', 'anchor'=>'w')
-
-TkLabel.new(base_frame, 'text'=>'File:')\
-.pack('side'=>'top', 'anchor'=>'w')
-
-TkFrame.new(base_frame){|w|
-  s = TkScrollbar.new(w)
-  l = TkListbox.new(w) {
-    width 20
-    height 10
-    yscrollcommand proc{|first,last| s.set first,last}
-  }
-  s.command(proc{|*args| l.yview(*args)})
-  l.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y')
-  s.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y')
-  #l.insert(0,'earth.gif', 'earthris.gif', 'mickey.gif', 'teapot.ppm')
-  l.insert(0,'earth.gif', 'earthris.gif', 'teapot.ppm')
-  l.bind('Double-1', proc{|x,y| loadImage $image2a,l,x,y}, '%x %y')
-
-  image2_e.bind 'Return', proc{loadDir l}
-
-}.pack('side'=>'top', 'anchor'=>'w')
-
-# image
-[ TkFrame.new(base_frame, 'height'=>'3m', 'width'=>20),
-  TkLabel.new(base_frame, 'text'=>'Image:'),
-  TkLabel.new(base_frame, 'image'=>$image2a)
-].each{|w| w.pack('side'=>'top', 'anchor'=>'w')}
-
-#
-def loadDir(w)
-  w.delete(0,'end')
-  Dir.glob([$dirName,'*'].join(File::Separator)).sort.each{|f|
-    w.insert('end',File.basename(f))
-  }
-end
-
-def loadImage(img,w,x,y)
-  img.file([$dirName, w.get("@#{x},#{y}")].join(File::Separator))
-end
-
diff --git a/ext/tk/sample/demos-en/image3.rb b/ext/tk/sample/demos-en/image3.rb
deleted file mode 100644
index 9b2be20073..0000000000
--- a/ext/tk/sample/demos-en/image3.rb
+++ /dev/null
@@ -1,126 +0,0 @@
-# frozen_string_literal: false
-# image3.rb
-#
-# This demonstration script creates a simple collection of widgets
-# that allow you to select and view images in a Tk label.
-#
-# widget demo 'load image' (called by 'widget')
-#
-
-# toplevel widget
-if defined?($image3_demo) && $image3_demo
-  $image3_demo.destroy
-  $image3_demo = nil
-end
-
-# demo toplevel widget
-$image3_demo = TkToplevel.new {|w|
-  title('Image Demonstration #3')
-  iconname("Image3")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($image3_demo).pack(:fill=>:both, :expand=>true)
-
-#
-def loadDir3(w)
-  w.delete(0,'end')
-  Dir.glob([$dirName,'*'].join(File::Separator)).sort.each{|f|
-    w.insert('end',File.basename(f))
-  }
-end
-
-# selectAndLoadDir3 --
-# This procedure pops up a dialog to ask for a directory to load into
-# the listbox and (if the user presses OK) reloads the directory
-# listbox from the directory named in the demo's entry.
-#
-# Arguments:
-# w -                   Name of the toplevel window of the demo.
-def selectAndLoadDir3(w, lbox)
-  dir = Tk.chooseDirectory(:initialdir=>$dirName.value,
-                           :parent=>w, :mustexist=>true)
-  if dir.length > 0
-    $dirName.value = dir
-    loadDir3(lbox)
-  end
-end
-
-def loadImage(w,x,y)
-  $image3a.file([$dirName, w.get("@#{x},#{y}")].join(File::Separator))
-end
-
-
-# label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "This demonstration allows you to view images using a Tk \"photo\" image.  First type a directory name in the listbox, then type Return to load the directory into the listbox.  Then double-click on a file name in the listbox to see that image."
-}
-msg.pack('side'=>'top')
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $image3_demo
-      $image3_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'image3'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# variable
-$dirName = TkVariable.new([$demo_dir,'..','images'].join(File::Separator))
-
-# image
-begin
-  $image3a.delete
-rescue
-end
-$image3a = TkPhotoImage.new
-
-#
-image3_f = TkFrame.new(base_frame).pack(:fill=>:both, :expand=>true)
-
-image3_df = TkLabelFrame.new(base_frame, :text=>'Directory:')
-
-image3_ff = TkLabelFrame.new(base_frame, :text=>'File:',
-                             :padx=>'2m', :pady=>'2m')
-image3_lbx = TkListbox.new(image3_ff, :width=>20, :height=>10) {
-  pack(:side=>:left, :fill=>:y, :expand=>true)
-  yscrollbar(TkScrollbar.new(image3_ff).pack(:side=>:left, :fill=>:y,
-                                             :expand=>true))
-  insert(0, *(%w(earth.gif earthris.gif teapot.ppm)))
-  bind('Double-1', proc{|x,y| loadImage(self, x, y)}, '%x %y')
-}
-
-image3_ent = TkEntry.new(image3_df, :width=>30, :textvariable=>$dirName){
-  pack(:side=>:left, :fill=>:both, :padx=>'2m', :pady=>'2m', :expand=>true)
-  bind('Return', proc{loadDir3(image3_lbx)})
-}
-
-TkButton.new(image3_df, :pady=>0, :padx=>'2m', :text=>"Select Dir.",
-             :command=>proc{selectAndLoadDir3(image3_ent, image3_lbx)}) {
-  pack(:side=>:left, :fill=>:y, :padx=>[0, '2m'], :pady=>'2m')
-}
-
-image3_if = TkLabelFrame.new(base_frame, :text=>'Image:') {|f|
-  # TkLabel.new(f, :image=>$image3a).pack(:padx=>'2m', :pady=>'2m')
-  Tk::Label.new(f, :image=>$image3a).pack(:padx=>'2m', :pady=>'2m')
-}
-
-Tk.grid(image3_df,  '-',
-        :sticky=>:ew, :padx=>'1m', :pady=>'1m', :in=>image3_f)
-Tk.grid(image3_ff, image3_if,
-        :sticky=>:nw, :padx=>'1m', :pady=>'1m', :in=>image3_f)
-TkGrid.columnconfigure(image3_f, 1, :weight=>1)
-
diff --git a/ext/tk/sample/demos-en/items.rb b/ext/tk/sample/demos-en/items.rb
deleted file mode 100644
index d6de1e557e..0000000000
--- a/ext/tk/sample/demos-en/items.rb
+++ /dev/null
@@ -1,382 +0,0 @@
-# frozen_string_literal: false
-# items.rb
-#
-# This demonstration script creates a canvas that displays the
-# canvas item types.
-#
-# canvas item types widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($items_demo) && $items_demo
-  $items_demo.destroy
-  $items_demo = nil
-end
-
-# demo toplevel widget
-$items_demo = TkToplevel.new {|w|
-  title("Canvas Item Demonstration")
-  iconname("Items")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($items_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-TkLabel.new(base_frame) {
-  font $font
-  wraplength '5i'
-  justify 'left'
-  text "This window contains a canvas widget with examples of the various kinds of items supported by canvases.  The following operations are supported:\n  Button-1 drag:\tmoves item under pointer.\n  Button-2 drag:\trepositions view.\n  Button-3 drag:\tstrokes out area.\n  Ctrl+f:\t\tprints items under area."
-}.pack('side'=>'top')
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $items_demo
-      $items_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'items'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-cvs = nil
-TkFrame.new(base_frame) {|cf|
-  # canvas
-  cvs = TkCanvas.new(cf) {|c|
-    focus
-    scrollregion '0c 0c 30c 24c'
-    width  '15c'
-    height '10c'
-    relief 'sunken'
-    borderwidth 2
-
-    hs = TkScrollbar.new(cf) {|s|
-      orient 'horizontal'
-      command proc{|*args| c.xview(*args)}
-      c.xscrollcommand proc{|first,last| s.set first,last}
-    }
-
-    vs = TkScrollbar.new(cf) {|s|
-      command proc{|*args| c.yview(*args)}
-      c.yscrollcommand proc{|first,last| s.set first,last}
-    }
-
-    if $tk_version =~ /^4\.[01]/
-      hs.pack('side'=>'bottom', 'fill'=>'x')
-      vs.pack('side'=>'right', 'fill'=>'y')
-      c.pack('in'=>cf, 'expand'=>'yes', 'fill'=>'both')
-
-    else
-      c.grid('in'=>cf, 'row'=>0, 'column'=>0,
-             'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-      vs.grid('row'=>0, 'column'=>1,
-              'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-      hs.grid('row'=>1, 'column'=>0,
-              'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-      TkGrid.rowconfigure(cf, 0, 'weight'=>1, 'minsize'=>0)
-      TkGrid.columnconfigure(cf, 0, 'weight'=>1, 'minsize'=>0)
-
-    end
-
-  }
-}.pack('side'=>'top', 'fill'=>'both', 'expand'=>'yes')
-
-# Display a 3x3 rectangular grid
-TkcRectangle.new(cvs, '0c', '0c', '30c', '24c', 'width'=>2)
-TkcLine.new(cvs, '0c', '8c', '30c', '8c', 'width'=>2)
-TkcLine.new(cvs, '0c', '16c', '30c', '16c', 'width'=>2)
-TkcLine.new(cvs, '10c', '0c', '10c', '24c', 'width'=>2)
-TkcLine.new(cvs, '20c', '0c', '20c', '24c', 'width'=>2)
-
-if $tk_version =~ /^4.*/
-  font1 = '-Adobe-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*'
-  font2 = '-Adobe-Helvetica-Bold-R-Normal--*-240-*-*-*-*-*-*'
-else
-  font1 = 'Helvetica 12'
-  font2 = 'Helvetica 24 bold'
-end
-if TkWinfo.depth($root).to_i > 1
-  blue   = 'DeepSkyBlue3'
-  red    = 'red'
-  bisque = 'bisque3'
-  green  = 'SeaGreen3'
-else
-  blue   = 'black'
-  red    = 'black'
-  bisque = 'black'
-  green  = 'black'
-end
-
-# tag
-$tag_item = TkcGroup.new(cvs)
-
-# Set up demos within each of the areas of the grid.
-TkcText.new(cvs, '5c', '.2c', 'text'=>'Lines', 'anchor'=>'n')
-TkcLine.new(cvs, '1c', '1c', '3c', '1c', '1c', '4c', '3c', '4c',
-            'width'=>2, 'fill'=>blue, 'capstyle'=>'butt',
-            'join'=>'miter', 'tags'=>$tag_item )
-TkcLine.new(cvs, '4.67c','1c','4.67c','4c', 'arrow'=>'last', 'tags'=>$tag_item)
-TkcLine.new(cvs, '6.33c','1c','6.33c','4c', 'arrow'=>'both', 'tags'=>$tag_item)
-TkcLine.new(cvs, '5c','6c','9c','6c','9c','1c','8c','1c','8c','4.8c','8.8c',
-            '4.8c','8.8c','1.2c','8.2c','1.2c','8.2c','4.6c','8.6c','4.6c',
-            '8.6c','1.4c','8.4c','1.4c','8.4c','4.4c',
-            'width'=>3, 'fill'=>red, 'tags'=>$tag_item )
-TkcLine.new(cvs, '1c','5c','7c','5c','7c','7c','9c','7c', 'width'=>'.5c',
-            'stipple'=>'@'+[$demo_dir,'..',
-                            'images','gray25.xbm'].join(File::Separator),
-            'arrow'=>'both', 'arrowshape'=>'15 15 7', 'tags'=>$tag_item )
-TkcLine.new(cvs, '1c','7c','1.75c','5.8c','2.5c','7c','3.25c','5.8c','4c','7c',
-            'width'=>'.5c', 'capstyle'=>'round', 'join'=>'round',
-            'tags'=>$tag_item )
-
-TkcText.new(cvs, '15c', '.2c',
-            'text'=>'Curves (smoothed lines)', 'anchor'=>'n')
-TkcLine.new(cvs, '11c','4c','11.5c','1c','13.5c','1c','14c','4c',
-            'smooth'=>'on', 'fill'=>blue, 'tags'=>$tag_item )
-TkcLine.new(cvs, '15.5c','1c','19.5c','1.5c','15.5c','4.5c','19.5c','4c',
-            'smooth'=>'on', 'arrow'=>'both', 'width'=>3, 'tags'=>$tag_item )
-TkcLine.new(cvs, '12c','6c','13.5c','4.5c','16.5c','7.5c','18c','6c',
-            '16.5c','4.5c','13.5c','7.5c','12c','6c',
-            'smooth'=>'on', 'width'=>'3m', 'capstyle'=>'round',
-            'stipple'=>'@'+[$demo_dir, '..',
-                            'images', 'gray25.xbm'].join(File::Separator),
-            'fill'=>red, 'tags'=>$tag_item )
-
-TkcText.new(cvs, '25c', '.2c', 'text'=>'Polygons', 'anchor'=>'n')
-TkcPolygon.new(cvs, '21c','1.0c','22.5c','1.75c','24c','1.0c','23.25c','2.5c',
-               '24c','4.0c','22.5c','3.25c','21c','4.0c','21.75c','2.5c',
-               'fill'=>'green', 'outline'=>'black', 'width'=>4,
-               'tags'=>$tag_item )
-TkcPolygon.new(cvs, '25c','4c','25c','4c','25c','1c','26c','1c','27c','4c',
-               '28c','1c','29c','1c','29c','4c','29c','4c',
-               'fill'=>red, 'smooth'=>'on', 'tags'=> $tag_item)
-TkcPolygon.new(cvs, '22c','4.5c','25c','4.5c','25c','6.75c','28c','6.75c',
-               '28c','5.25c','24c','5.25c','24c','6.0c','26c','6c','26c',
-               '7.5c','22c','7.5c',
-               'stipple'=>'@' + [$demo_dir, '..',
-                                 'images', 'gray25.xbm'].join(File::Separator),
-               'outline'=>'black', 'tags'=>$tag_item )
-
-TkcText.new(cvs, '5c', '8.2c', 'text'=>'Rectangles', 'anchor'=>'n')
-TkcRectangle.new(cvs, '1c','9.5c','4c','12.5c',
-                 'outline'=>red, 'width'=>'3m', 'tags'=>$tag_item)
-TkcRectangle.new(cvs, '0.5c','13.5c','4.5c','15.5c',
-                 'fill'=>green, 'tags'=>$tag_item )
-TkcRectangle.new(cvs, '6c','10c','9c','15c', 'outline'=>'',
-                 'stipple'=>'@'+[$demo_dir,'..',
-                                 'images','gray25.xbm'].join(File::Separator),
-                 'fill'=>blue, 'tags'=>$tag_item )
-
-TkcText.new(cvs, '15c', '8.2c', 'text'=>'Ovals', 'anchor'=>'n')
-TkcOval.new(cvs, '11c','9.5c','14c','12.5c',
-                 'outline'=>red, 'width'=>'3m', 'tags'=>$tag_item)
-TkcOval.new(cvs, '10.5c','13.5c','14.5c','15.5c',
-                 'fill'=>green, 'tags'=>$tag_item )
-TkcOval.new(cvs, '16c','10c','19c','15c', 'outline'=>'',
-                 'stipple'=>'@'+[$demo_dir,'..',
-                                 'images','gray25.xbm'].join(File::Separator),
-                 'fill'=>blue, 'tags'=>$tag_item )
-
-TkcText.new(cvs, '25c', '8.2c', 'text'=>'Text', 'anchor'=>'n')
-TkcRectangle.new(cvs, '22.4c','8.9c','22.6c','9.1c')
-TkcText.new(cvs, '22.5c', '9c', 'anchor'=>'n', 'font'=>font1, 'width'=>'4c',
-            'text'=>'A short string of text, word-wrapped, justified left, and anchored north (at the top).  The rectangles show the anchor points for each piece of text.', 'tags'=>$tag_item )
-TkcRectangle.new(cvs, '25.4c','10.9c','25.6c','11.1c')
-TkcText.new(cvs, '25.5c', '11c', 'anchor'=>'w', 'font'=>font1, 'fill'=>blue,
-            'text'=>"Several lines,\n each centered\nindividually,\nand all anchored\nat the left edge.", 'justify'=>'center', 'tags'=>$tag_item )
-TkcRectangle.new(cvs, '24.9c','13.9c','25.1c','14.1c')
-if $tk_version =~ /^4\.[01]/
-  TkcText.new(cvs, '25c', '14c', 'anchor'=>'c', 'font'=>font2, 'fill'=>red,
-              'stipple'=>'@' + [$demo_dir, '..',
-                                'images', 'grey.5'].join(File::Separator),
-              'text'=>'Stippled characters', 'tags'=>$tag_item )
-else
-  TkcText.new(cvs, '25c', '14c', 'anchor'=>'c', 'font'=>font2, 'fill'=>red,
-              'stipple'=>'gray50', 'text'=>'Stippled characters',
-              'tags'=>$tag_item )
-end
-
-TkcText.new(cvs, '5c', '16.2c', 'text'=>'Arcs', 'anchor'=>'n')
-TkcArc.new(cvs, '0.5c','17c','7c','20c', 'fill'=>green, 'outline'=>'black',
-           'start'=>45, 'extent'=>270, 'style'=>'pieslice', 'tags'=>$tag_item)
-#TkcArc.new(cvs, '6.5c','17c','9.5c','20c', 'width'=>'4m', 'style'=>'arc',
-#          'outline'=>blue, 'start'=>135, 'extent'=>270,
-#          'outlinestipple'=>'@' + ['images', 'grey.25'].join(File::Separator),
-#          'tags'=>$tag_item)
-TkcArc.new(cvs, '6.5c','17c','9.5c','20c', 'width'=>'4m', 'style'=>'arc',
-           'outline'=>blue, 'start'=>135, 'extent'=>270,
-           'outlinestipple'=>'@'+[$demo_dir, '..',
-                                  'images','gray25.xbm'].join(File::Separator),
-           'tags'=>$tag_item)
-TkcArc.new(cvs, '0.5c','20c','9.5c','24c', 'width'=>'4m', 'style'=>'pieslice',
-           'fill'=>'', 'outline'=>red, 'start'=>225, 'extent'=>90,
-           'tags'=>$tag_item)
-TkcArc.new(cvs, '5.5c','20.5c','9.5c','23.5c', 'width'=>'4m', 'style'=>'chord',
-           'fill'=>blue, 'outline'=>'', 'start'=>45, 'extent'=>270,
-           'tags'=>$tag_item)
-
-TkcText.new(cvs, '15c', '16.2c', 'text'=>'Bitmaps', 'anchor'=>'n')
-#TkcBitmap.new(cvs, '13c','20c',
-#             'bitmap'=>'@' + ['images', 'face'].join(File::Separator),
-#             'tags'=>$tag_item)
-TkcBitmap.new(cvs, '13c','20c',
-              'bitmap'=>'@' + [$demo_dir, '..',
-                               'images', 'face.xbm'].join(File::Separator),
-              'tags'=>$tag_item)
-#TkcBitmap.new(cvs, '17c','18.5c',
-#             'bitmap'=>'@' + ['images', 'noletters'].join(File::Separator),
-#             'tags'=>$tag_item)
-TkcBitmap.new(cvs, '17c','18.5c',
-              'bitmap'=>'@' + [$demo_dir, '..',
-                               'images', 'noletter.xbm'].join(File::Separator),
-              'tags'=>$tag_item)
-#TkcBitmap.new(cvs, '17c','21.5c',
-#             'bitmap'=>'@' + ['images', 'letters'].join(File::Separator),
-#             'tags'=>$tag_item)
-#
-TkcBitmap.new(cvs, '17c','21.5c') {
-  bitmap '@' + [$demo_dir, '..', 'images', 'letters.xbm'].join(File::Separator)
-  tags $tag_item
-}
-#TkcBitmap.new(cvs, '17c','21.5c') {
-#  bitmap '@' + ['images', 'letters'].join(File::Separator)
-#  tags $tag_item
-#}
-
-TkcText.new(cvs, '25c', '16.2c', 'text'=>'Windows', 'anchor'=>'n')
-TkButton.new(cvs) {|b|
-  text 'Press Me'
-  command proc{butPress cvs, red}
-  TkcWindow.new(cvs, '21c','18c',
-                'window'=>b, 'anchor'=>'nw', 'tags'=>$tag_item)
-}
-TkEntry.new(cvs, 'width'=>20, 'relief'=>'sunken') {|e|
-  insert 'end', 'Edit this text'
-  TkcWindow.new(cvs, '21c','21c',
-                'window'=>e, 'anchor'=>'nw', 'tags'=>$tag_item)
-}
-TkScale.new(cvs, 'from'=>0, 'to'=>100, 'length'=>'6c', 'sliderlength'=>'.4c',
-            'width'=>'.5c', 'tickinterval'=>0 ) {|scl|
-  TkcWindow.new(cvs, '28.5c','17.5c',
-                'window'=>scl, 'anchor'=>'n', 'tags'=>$tag_item)
-}
-TkcText.new(cvs, '21c', '17.9c', 'text'=>'Button:', 'anchor'=>'sw')
-TkcText.new(cvs, '21c', '20.9c', 'text'=>'Entry:', 'anchor'=>'sw')
-TkcText.new(cvs, '28.5c', '17.4c', 'text'=>'Scale:', 'anchor'=>'s')
-
-# Set up event bindings for canvas:
-cvs.itembind($tag_item, 'Any-Enter', proc{itemEnter cvs})
-cvs.itembind($tag_item, 'Any-Leave', proc{itemLeave cvs})
-cvs.bind('2', proc{|x,y| cvs.scan_mark x,y}, '%x %y')
-cvs.bind('B2-Motion', proc{|x,y| cvs.scan_dragto x,y}, '%x %y')
-cvs.bind('3', proc{|x,y| itemMark cvs,x,y}, '%x %y')
-cvs.bind('B3-Motion', proc{|x,y| itemStroke cvs,x,y}, '%x %y')
-cvs.bind('Control-f', proc{itemsUnderArea cvs})
-cvs.bind('1', proc{|x,y| itemStartDrag cvs,x,y}, '%x %y')
-cvs.bind('B1-Motion', proc{|x,y| itemDrag cvs,x,y}, '%x %y')
-# Utility methods for highlighting the item under the pointer
-
-$restoreCmd = nil
-def itemEnter (c)
-  if TkWinfo.depth(c).to_i == 1
-    $restoreCmd = nil
-    return
-  end
-  type = c.itemtype('current')
-  if type == TkcWindow
-    $restoreCmd = nil
-    return
-  end
-  if type == TkcBitmap
-    bg = (c.itemconfiginfo('current', 'background'))[4]
-    $restoreCmd = proc{c.itemconfigure 'current', 'background', bg}
-    c.itemconfigure 'current', 'background', 'SteelBlue2'
-    return
-  end
-  fill = (c.itemconfiginfo('current', 'fill'))[4]
-  if (type == TkcRectangle || type == TkcOval || type == TkcArc) && fill == []
-    outline = (c.itemconfiginfo('current', 'outline'))[4]
-    $restoreCmd = proc{c.itemconfigure 'current', 'outline', outline}
-    c.itemconfigure 'current', 'outline', 'SteelBlue2'
-  else
-    $restoreCmd = proc{c.itemconfigure 'current', 'fill', fill}
-    c.itemconfigure 'current', 'fill', 'SteelBlue2'
-  end
-end
-
-def itemLeave(c)
-  $restoreCmd.call if $restoreCmd
-end
-
-# Utility methods for stroking out a rectangle and printing what's
-# underneath the rectangle's area.
-
-def itemMark(c,x,y)
-  $areaX1 = c.canvasx(x)
-  $areaY1 = c.canvasy(y)
-  c.delete 'area'
-end
-
-def itemStroke(c,x,y)
-  x = c.canvasx(x)
-  y = c.canvasy(y)
-  if $areaX1 != x && $areaY1 != y
-    c.delete 'area'
-    c.addtag_withtag 'area', TkcRectangle.new(c, $areaX1, $areaY1, x, y,
-                                              '-outline', 'black')
-    $areaX2 = x
-    $areaY2 = y
-  end
-end
-
-def itemsUnderArea(c)
-  area = c.find_withtag('area')
-  items = []
-  c.find_enclosed($areaX1,$areaY1,$areaX2,$areaY2).each{|i|
-    items.push(i) if i.gettags.include?($tag_item)
-  }
-  print "Items enclosed by area: #{items.inspect}\n"; STDOUT.flush
-  items.clear
-  c.find_overlapping($areaX1,$areaY1,$areaX2,$areaY2).each{|i|
-    items.push(i) if i.gettags.include?($tag_item)
-  }
-  print "Items overlapping area: #{items.inspect}\n"; STDOUT.flush
-end
-
-$areaX1 = 0
-$areaY1 = 0
-$areaX2 = 0
-$areaY2 = 0
-
-# Utility methods to support dragging of items.
-
-def itemStartDrag(c,x,y)
-  $lastX = c.canvasx(x)
-  $lastY = c.canvasy(y)
-end
-
-def itemDrag(c,x,y)
-  x = c.canvasx(x)
-  y = c.canvasy(y)
-  c.move 'current', x - $lastX, y - $lastY
-  $lastX = x
-  $lastY = y
-end
-
-# Method that's invoked when the button embedded in the canvas
-# is invoked.
-
-def butPress(w,color)
-  i = TkcText.new(w, '25c', '18.1c',
-                  'text'=>'Ouch!!', 'fill'=>color, 'anchor'=>'n')
-  Tk.after(500, proc{w.delete i})
-end
diff --git a/ext/tk/sample/demos-en/ixset b/ext/tk/sample/demos-en/ixset
deleted file mode 100644
index 40a77f487c..0000000000
--- a/ext/tk/sample/demos-en/ixset
+++ /dev/null
@@ -1,333 +0,0 @@
-#!/usr/bin/env ruby
-
-# ixset --
-# A nice interface to "xset" to change X server settings
-#
-
-require 'tk'
-
-class Xsettings
-  #
-  # Button actions
-  #
-  def quit
-    @root.destroy
-  end
-
-  def ok
-    writesettings
-    quit
-  end
-
-  def cancel
-    readsettings
-    dispsettings
-  end
-
-  # apply is just "writesettings"
-
-
-  #
-  # Read current settings
-  #
-  def readsettings
-    xfd = open("|xset q", 'r')
-    xfd.readlines.each{|line|
-      fields = line.chomp.strip.split(/\s+/)
-      case fields[0]
-      when "auto"
-	if fields[1] == 'repeat:'
-	  @kbdrep = fields[2]
-	  @w_kbdrep.set(@kbdrep)
-	  @kbdcli = fields[6]
-	end
-
-      when "bell"
-	@bellvol = fields[2]
-	@bellpit = fields[5]
-	@belldur = fields[8]
-
-      when "acceleration:"
-	@mouseacc = fields[1]
-	@mousethr = fields[3]
-
-      when "prefer"
-	if fields[2] == 'yes'
-	  @screenbla = 'blank'
-	else
-	  @screenbla = 'noblank'
-	end
-	@w_screenbla.set(@screenbla)
-
-      when "timeout:"
-	@screentim = fields[1]
-	@screencyc = fields[3]
-
-      end
-    }
-
-    xfd.close
-  end
-
-  #
-  # Write settings into the X server
-  #
-  def writesettings
-    @bellvol = @w_bellvol.get
-    @bellpit = @w_bellpit.get
-    @belldur = @w_belldur.get
-
-    @kbdrep = @w_kbdrep.get
-    if @kbdrep == 'on'
-      @kbdcli = @w_kbdcli.get
-    else
-      @kbdcli = 'off'
-    end
-
-    @mouseacc = @w_mouseacc.get
-    @mousethr = @w_mousethr.get
-
-    @screentim = @w_screentim.get
-    @screencyc = @w_screencyc.get
-    @screenbla = @w_screenbla.get
-
-    system("xset \
-            b #{@bellvol} #{@bellpit} #{@belldur} \
-            c #{@kbdcli} \
-            r #{@kbdrep} \
-            m #{@mouseacc} #{@mousethr} \
-            s #{@screentim} #{@screencyc} \
-            s #{@screenbla}")
-  end
-
-  #
-  # Sends all settings to the window
-  #
-  def dispsettings
-    @w_bellvol.set(@bellvol)
-    @w_bellpit.set(@bellpit)
-    @w_belldur.set(@belldur)
-
-    @w_kbdonoff.set(@w_kbdrep.get)
-    @w_kbdcli.set(@kbdcli)
-
-    @w_mouseacc.set(@mouseacc)
-    @w_mousethr.set(@mousethr)
-
-    @w_screenblank.set(@w_screenbla.get)
-    @w_screenpat.set(@w_screenbla.get)
-
-    @w_screentim.set(@screentim)
-    @w_screencyc.set(@screencyc)
-  end
-
-  #
-  # Create all windows, and pack them
-  #
-  class LabelEntry
-    def initialize(parent, text, length)
-      @frame = TkFrame.new(parent)
-      TkLabel.new(@frame, 'text'=>text).pack('side'=>'left','expand'=>'y')
-      @entry = TkEntry.new(@frame, 'width'=>length, 'relief'=>'sunken') {
-	pack('side'=>'left','expand'=>'y')
-      }
-    end
-    def pack(keys)
-      @frame.pack(keys)
-    end
-    def get
-      @entry.value
-    end
-    def set(value)
-      @entry.delete(0,'end')
-      @entry.insert(0, value)
-    end
-  end
-
-  def createwindows
-    win = self
-
-    #
-    # Buttons
-    #
-    buttons = TkFrame.new(@root) {|f|
-      [ TkButton.new(f, 'command'=>proc{win.ok}, 'text'=>'Ok'),
-	TkButton.new(f, 'command'=>proc{win.writesettings}, 'text'=>'Apply'),
-	TkButton.new(f, 'command'=>proc{win.cancel}, 'text'=>'Cancel'),
-	TkButton.new(f, 'command'=>proc{win.quit}, 'text'=>'Quit') ].each{|b|
-	b.pack('side'=>'left', 'expand'=>'yes', 'pady'=>5)
-      }
-    }
-
-    #
-    # Bell settings
-    #
-    bell = TkFrame.new(@root, 'relief'=>'raised', 'borderwidth'=>2)
-    l = TkLabel.new(bell, 'text'=>'Bell Settings')
-    @w_bellvol = TkScale.new(bell, 'from'=>0, 'to'=>100, 'length'=>200,
-			     'tickinterval'=>20, 'orient'=>'horizontal',
-			     'label'=>"Volume (%)")
-
-    f = TkFrame.new(bell)
-    @w_bellpit = LabelEntry.new(f, "Pitch (Hz)", 6)
-    @w_bellpit.pack('side'=>'left', 'padx'=>5)
-    @w_belldur = LabelEntry.new(f, "Duration (ms)", 6)
-    @w_belldur.pack('side'=>'right', 'padx'=>5)
-
-    l.pack('side'=>'top', 'expand'=>'yes')
-    @w_bellvol.pack('side'=>'top', 'expand'=>'yes')
-    f.pack('side'=>'top', 'expand'=>'yes')
-
-    #
-    # Keyboard settings
-    #
-    kbdonoff = nil
-    kbdcli = nil
-    kbd = TkFrame.new(@root, 'relief'=>'raised', 'borderwidth'=>2)
-    l = TkLabel.new(kbd, 'text'=>'Keyboard Repeat Settings')
-    f = TkFrame.new(kbd)
-    @w_kbdonoff = TkCheckButton.new(f, 'text'=>'On', 'relief'=>'flat',
-				    'onvalue'=>'on', 'offvalue'=>'off',
-				    'variable'=>@w_kbdrep ) {
-      def self.set(value)
-	if value == 'on'
-	  self.select
-	else
-	  self.deselect
-	end
-      end
-      pack('side'=>'left', 'expand'=>'yes', 'fill'=>'both')
-    }
-    @w_kbdcli = TkScale.new(f, 'from'=>0, 'to'=>100, 'length'=>200,
-			 'tickinterval'=>20, 'orient'=>'horizontal',
-			 'label'=>'Click Volume (%)')
-    @w_kbdcli.pack('side'=>'left', 'expand'=>'yes')
-    l.pack('side'=>'top', 'expand'=>'yes')
-    f.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2, 'fill'=>'x')
-
-    #
-    # Mouse settings
-    #
-    mouse = TkFrame.new(@root, 'relief'=>'raised', 'borderwidth'=>2)
-    l = TkLabel.new(mouse, 'text'=>'Mouse Settings')
-    f = TkFrame.new(mouse)
-    @w_mouseacc = LabelEntry.new(f, 'Acceleration', 3)
-    @w_mouseacc.pack('side'=>'left')
-    @w_mousethr = LabelEntry.new(f, 'Threshold (pixels)', 3)
-    @w_mousethr.pack('side'=>'right')
-    l.pack('side'=>'top')
-    f.pack('side'=>'top', 'expand'=>'yes')
-
-    #
-    # Screen Saver settings
-    #
-    screen = TkFrame.new(@root, 'relief'=>'raised', 'borderwidth'=>2)
-    l = TkLabel.new(screen, 'text'=>'Screen-saver Settings')
-    f = TkFrame.new(screen)
-    ff1 = TkFrame.new(f)
-    [ @w_screenblank = TkRadioButton.new(ff1, 'text'=>'Blank',
-					 'relief'=>'flat',
-					 'variable'=>@w_screenbla,
-					 'value'=>'blank') {
-	def self.set(value)
-	  if value == 'blank'
-	    self.select
-	  else
-	    self.deselect
-	  end
-	end
-      },
-      @w_screenpat = TkRadioButton.new(ff1, 'text'=>'Pattern',
-				       'relief'=>'flat',
-				       'variable'=>@w_screenbla,
-				       'value'=>'noblank') {
-	def self.set(value)
-	  if value != 'blank'
-	    self.select
-	  else
-	    self.deselect
-	  end
-	end
-      }
-    ].each {|w| w.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w') }
-
-    ff2 = TkFrame.new(f)
-    [ @w_screentim = LabelEntry.new(ff2, 'Timeout (s)', 5),
-      @w_screencyc = LabelEntry.new(ff2, 'Cycle (s)', 5) ].each{|w|
-      w.pack('side'=>'top', 'pady'=>2, 'anchor'=>'e')
-    }
-
-    ff1.pack('side'=>'left')
-    ff2.pack('side'=>'left')
-
-    l.pack('side'=>'top')
-    f.pack('side'=>'top', 'expand'=>'yes')
-
-    #
-    # Main window
-    #
-    buttons.pack('side'=>'top', 'fill'=>'both')
-    bell.pack('side'=>'top', 'fill'=>'both', 'ipady'=>5, 'expand'=>'yes')
-    kbd.pack('side'=>'top', 'fill'=>'both', 'ipady'=>5, 'expand'=>'yes')
-    mouse.pack('side'=>'top', 'fill'=>'both', 'ipady'=>5, 'expand'=>'yes')
-    screen.pack('side'=>'top', 'fill'=>'both', 'ipady'=>5, 'expand'=>'yes')
-
-    #
-    # Let the user resize our window
-    #
-    @root.minsize(10,10)
-  end
-
-  def initialize
-    @root = TkRoot.new
-
-    @kbdrep = 'on'
-    @w_kbdrep = TkVariable.new(@kbdrep)
-    def @w_kbdrep.get
-      self.value
-    end
-    def @w_kbdrep.set(val)
-      self.value=val
-    end
-
-    @kbdcli = 0
-
-    @bellvol = 100
-    @bellpit = 440
-    @belldur = 100
-
-    @mouseacc = "3/1"
-    @mousethr = 4
-
-    @screenbla = "blank"
-    @w_screenbla = TkVariable.new(@screenbla)
-    def @w_screenbla.get
-      self.value
-    end
-    def @w_screenbla.set(val)
-      self.value=val
-    end
-
-    @screentim = 600
-    @screencyc = 600
-
-    #
-    # Listen what "xset" tells us...
-    #
-    readsettings
-
-    #
-    # Create all windows
-    #
-    createwindows
-
-    #
-    # Write xset parameters
-    #
-    dispsettings
-  end
-end
-
-Xsettings.new
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-en/ixset2 b/ext/tk/sample/demos-en/ixset2
deleted file mode 100644
index cb99c60793..0000000000
--- a/ext/tk/sample/demos-en/ixset2
+++ /dev/null
@@ -1,367 +0,0 @@
-#!/usr/bin/env ruby
-#
-# ixset --
-# A nice interface to "xset" to change X server settings
-#
-
-require 'tk'
-
-class Xsettings
-  #
-  # Button actions
-  #
-  def quit
-    @root.destroy
-  end
-
-  def ok
-    writesettings
-    quit
-  end
-
-  def cancel
-    readsettings
-    dispsettings
-    @btn_APPLY.state(:disabled)
-    @btn_CANCEL.state(:disabled)
-  end
-
-  # apply is just "writesettings"
-  def apply
-    writesettings
-    @btn_APPLY.state(:disabled)
-    @btn_CANCEL.state(:disabled)
-  end
-
-  #
-  # Read current settings
-  #
-  def readsettings
-    xfd = open("|xset q", 'r')
-    xfd.readlines.each{|line|
-      fields = line.chomp.strip.split(/\s+/)
-      case fields[0]
-      when "auto"
-	if fields[1] == 'repeat:'
-	  @kbdrep = fields[2]
-	  @w_kbdrep.set(@kbdrep)
-	  @kbdcli = fields[6]
-	end
-
-      when "bell"
-	@bellvol = fields[2]
-	@bellpit = fields[5]
-	@belldur = fields[8]
-
-      when "acceleration:"
-	@mouseacc = fields[1]
-	@mousethr = fields[3]
-
-      when "prefer"
-	if fields[2] == 'yes'
-	  @screenbla = 'blank'
-	else
-	  @screenbla = 'noblank'
-	end
-	@w_screenbla.set(@screenbla)
-
-      when "timeout:"
-	@screentim = fields[1]
-	@screencyc = fields[3]
-
-      end
-    }
-
-    xfd.close
-  end
-
-  #
-  # Write settings into the X server
-  #
-  def writesettings
-    @bellvol = @w_bellvol.get
-    @bellpit = @w_bellpit.get
-    @belldur = @w_belldur.get
-
-    @kbdrep = @w_kbdrep.get
-    if @kbdrep == 'on'
-      @kbdcli = @w_kbdcli.get
-    else
-      @kbdcli = 'off'
-    end
-
-    @mouseacc = @w_mouseacc.get
-    @mousethr = @w_mousethr.get
-
-    @screentim = @w_screentim.get
-    @screencyc = @w_screencyc.get
-    @screenbla = @w_screenbla.get
-
-    system("xset \
-            b #{@bellvol} #{@bellpit} #{@belldur} \
-            c #{@kbdcli} \
-            r #{@kbdrep} \
-            m #{@mouseacc} #{@mousethr} \
-            s #{@screentim} #{@screencyc} \
-            s #{@screenbla}")
-  end
-
-  #
-  # Sends all settings to the window
-  #
-  def dispsettings
-    @w_bellvol.set(@bellvol)
-    @w_bellpit.set(@bellpit)
-    @w_belldur.set(@belldur)
-
-    @w_kbdonoff.set(@w_kbdrep.get)
-    @w_kbdcli.set(@kbdcli)
-
-    @w_mouseacc.set(@mouseacc)
-    @w_mousethr.set(@mousethr)
-
-    @w_screenblank.set(@w_screenbla.get)
-    @w_screenpat.set(@w_screenbla.get)
-
-    @w_screentim.set(@screentim)
-    @w_screencyc.set(@screencyc)
-  end
-
-  #
-  # Create all windows, and pack them
-  #
-  class LabelEntry
-    def initialize(parent, text, length, range=[])
-      @frame = TkFrame.new(parent)
-      TkLabel.new(@frame, 'text'=>text).pack('side'=>'left')
-      if range.size > 0
-	@entry = TkSpinbox.new(@frame, 'width'=>length, 'relief'=>'sunken',
-			       'from'=>range[0], 'to'=>range[1])
-      else
-	@entry = TkEntry.new(@frame, 'width'=>length, 'relief'=>'sunken')
-      end
-      @entry.pack('side'=>'right','expand'=>'y', 'fill'=>'x')
-    end
-    def epath
-      @frame
-    end
-    def pack(keys)
-      @frame.pack(keys)
-    end
-    def get
-      @entry.value
-    end
-    def set(value)
-      @entry.delete(0,'end')
-      @entry.insert(0, value)
-    end
-  end
-
-  def createwindows
-    win = self
-
-    #
-    # Buttons
-    #
-    btn_frame = TkFrame.new(@root)
-    buttons = [
-      @btn_OK = TkButton.new(btn_frame, 'command'=>proc{win.ok},
-			     'default'=>'active', 'text'=>'Ok'),
-      @btn_APPLY = TkButton.new(btn_frame, 'command'=>proc{win.writesettings},
-				'default'=>'normal', 'text'=>'Apply',
-				'state'=>'disabled'),
-      @btn_CANCEL = TkButton.new(btn_frame, 'command'=>proc{win.cancel},
-				 'default'=>'normal', 'text'=>'Cancel',
-				'state'=>'disabled'),
-      @btn_QUIT = TkButton.new(btn_frame, 'command'=>proc{win.quit},
-			       'default'=>'normal', 'text'=>'Quit')
-    ]
-    buttons.each{|b| b.pack('side'=>'left', 'expand'=>'yes', 'pady'=>5) }
-
-    @root.bind('Return', proc{@btn_OK.flash; @btn_OK.invoke})
-    @root.bind('Escape', proc{@btn_QUIT.flash; @btn_QUIT.invoke})
-    @root.bind('1', proc{|w|
-		 unless buttons.index(w)
-		   @btn_APPLY.state(:normal)
-		   @btn_CANCEL.state(:normal)
-		 end
-	       }, '%W')
-    @root.bind('Key', proc{|w, k|
-		 unless buttons.index(w)
-		   case k
-		   when 'Return', 'Escape', 'Tab', /.*Shift.*/
-		     # do nothing
-		   else
-		     @btn_APPLY.state(:normal)
-		     @btn_CANCEL.state(:normal)
-		   end
-		 end
-	       }, '%W %K')
-
-    #
-    # Bell settings
-    #
-    bell = TkLabelframe.new(@root, 'text'=>'Bell Settings',
-			    'padx'=>'1.5m', 'pady'=>'1.5m')
-    @w_bellvol = TkScale.new(bell, 'from'=>0, 'to'=>100, 'length'=>200,
-			     'tickinterval'=>20, 'orient'=>'horizontal',
-			     'label'=>"Volume (%)")
-
-    f = TkFrame.new(bell)
-    @w_bellpit = LabelEntry.new(f, "Pitch (Hz)", 6, [25, 20000])
-    @w_bellpit.pack('side'=>'left', 'padx'=>5)
-    @w_belldur = LabelEntry.new(f, "Duration (ms)", 6, [1, 10000])
-    @w_belldur.pack('side'=>'right', 'padx'=>5)
-
-    @w_bellvol.pack('side'=>'top', 'expand'=>'yes')
-    f.pack('side'=>'top', 'expand'=>'yes')
-
-    #
-    # Keyboard settings
-    #
-    kbdonoff = nil
-    kbdcli = nil
-    kbd = TkLabelframe.new(@root, 'text'=>'Keyboard Repeat Settings',
-			   'padx'=>'1.5m', 'pady'=>'1.5m')
-    f = TkFrame.new(kbd)
-    @w_kbdonoff = TkCheckButton.new(f, 'text'=>'On', 'relief'=>'flat',
-				    'onvalue'=>'on', 'offvalue'=>'off',
-				    'variable'=>@w_kbdrep ) {
-      def self.set(value)
-	if value == 'on'
-	  self.select
-	else
-	  self.deselect
-	end
-      end
-      pack('side'=>'left', 'expand'=>'yes', 'fill'=>'x', 'padx'=>[0, '1m'])
-    }
-    @w_kbdcli = TkScale.new(f, 'from'=>0, 'to'=>100, 'length'=>200,
-			 'tickinterval'=>20, 'orient'=>'horizontal',
-			 'label'=>'Click Volume (%)')
-    @w_kbdcli.pack('side'=>'left', 'expand'=>'yes',
-		   'fill'=>'x', 'padx'=>['1m', 0])
-    f.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2, 'fill'=>'x')
-
-    #
-    # Mouse settings
-    #
-    mouse = TkLabelframe.new(@root, 'text'=>'Mouse Settings',
-			     'padx'=>'1.5m', 'pady'=>'1.5m')
-    f = TkFrame.new(mouse)
-    @w_mouseacc = LabelEntry.new(f, 'Acceleration', 5)
-    @w_mouseacc.pack('side'=>'left', 'padx'=>[0, '1m'])
-    @w_mousethr = LabelEntry.new(f, 'Threshold (pixels)', 3, [1, 2000])
-    @w_mousethr.pack('side'=>'right', 'padx'=>['1m', 0])
-    f.pack('side'=>'top', 'expand'=>'yes')
-
-    #
-    # Screen Saver settings
-    #
-    screen = TkLabelframe.new(@root, 'text'=>'Screen-saver Settings',
-			     'padx'=>'1.5m', 'pady'=>'1.5m')
-    @w_screenblank = TkRadioButton.new(screen, 'text'=>'Blank',
-				       'relief'=>'flat', 'anchor'=>'w',
-				       'variable'=>@w_screenbla,
-				       'value'=>'blank') {
-      def self.set(value)
-	if value == 'blank'
-	  self.select
-	else
-	  self.deselect
-	end
-      end
-    }
-
-    @w_screenpat = TkRadioButton.new(screen, 'text'=>'Pattern',
-				     'relief'=>'flat', 'anchor'=>'w',
-				     'variable'=>@w_screenbla,
-				     'value'=>'noblank') {
-      def self.set(value)
-	if value != 'blank'
-	  self.select
-	else
-	  self.deselect
-	end
-      end
-    }
-
-    @w_screentim = LabelEntry.new(screen, 'Timeout (s)', 5, [1, 100000])
-    @w_screencyc = LabelEntry.new(screen, 'Cycle (s)', 5, [1, 100000])
-
-    Tk.grid(@w_screenblank, @w_screentim, 'sticky'=>'e')
-    Tk.grid(@w_screenpat, @w_screencyc, 'sticky'=>'e')
-    TkGrid.configure(@w_screenblank, @w_screenpat, 'sticky'=>'ew')
-
-    #
-    # Main window
-    #
-    param = {
-      'side'=>'top', 'fill'=>'both', 'expand'=>'yes',
-      'padx'=>'1m', 'pady'=>'1m'
-    }
-    btn_frame.pack('side'=>'top', 'fill'=>'both')
-    bell.pack(param)
-    kbd.pack(param)
-    mouse.pack(param)
-    screen.pack(param)
-
-    #
-    # Let the user resize our window
-    #
-    @root.minsize(10,10)
-  end
-
-  def initialize(title)
-    @root = TkRoot.new('title'=>title)
-
-    @kbdrep = 'on'
-    @w_kbdrep = TkVariable.new(@kbdrep)
-    def @w_kbdrep.get
-      self.value
-    end
-    def @w_kbdrep.set(val)
-      self.value=val
-    end
-
-    @kbdcli = 0
-
-    @bellvol = 100
-    @bellpit = 440
-    @belldur = 100
-
-    @mouseacc = "3/1"
-    @mousethr = 4
-
-    @screenbla = "blank"
-    @w_screenbla = TkVariable.new(@screenbla)
-    def @w_screenbla.get
-      self.value
-    end
-    def @w_screenbla.set(val)
-      self.value=val
-    end
-
-    @screentim = 600
-    @screencyc = 600
-
-    #
-    # Listen what "xset" tells us...
-    #
-    readsettings
-
-    #
-    # Create all windows
-    #
-    createwindows
-
-    #
-    # Write xset parameters
-    #
-    dispsettings
-  end
-end
-
-Xsettings.new(File.basename($0,'.rb'))
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-en/knightstour.rb b/ext/tk/sample/demos-en/knightstour.rb
deleted file mode 100644
index 1ad82fcc9d..0000000000
--- a/ext/tk/sample/demos-en/knightstour.rb
+++ /dev/null
@@ -1,272 +0,0 @@
-# frozen_string_literal: false
-# Based on the widget demo of Tcl/Tk8.5.2
-# The following is the original copyright text.
-#----------------------------------------------------------------------------
-# Copyright (C) 2008 Pat Thoyts <patthoyts@users.sourceforge.net>
-#
-#	Calculate a Knight's tour of a chessboard.
-#
-#	This uses Warnsdorff's rule to calculate the next square each
-#	time. This specifies that the next square should be the one that
-#	has the least number of available moves.
-#
-#	Using this rule it is possible to get to a position where
-#	there are no squares available to move into. In this implementation
-#	this occurs when the starting square is d6.
-#
-#	To solve this fault an enhancement to the rule is that if we
-#	have a choice of squares with an equal score, we should choose
-#	the one nearest the edge of the board.
-#
-#	If the call to the Edgemost function is commented out you can see
-#	this occur.
-#
-#	You can drag the knight to a specific square to start if you wish.
-#	If you let it repeat then it will choose random start positions
-#	for each new tour.
-#----------------------------------------------------------------------------
-require 'tk'
-
-class Knights_Tour
-  # Return a list of accessible squares from a given square
-  def valid_moves(square)
-    moves = []
-    [
-      [-1,-2], [-2,-1], [-2,1], [-1,2], [1,2], [2,1], [2,-1], [1,-2]
-    ].each{|col_delta, row_delta|
-      col = (square % 8) + col_delta
-      row = (square.div(8)) + row_delta
-      moves << (row * 8 + col) if row > -1 && row < 8 && col > -1 && col < 8
-    }
-    moves
-  end
-
-  # Return the number of available moves for this square
-  def check_square(square)
-    valid_moves(square).find_all{|pos| ! @visited.include?(pos)}.length
-  end
-
-  # Select the next square to move to. Returns -1 if there are no available
-  # squares remaining that we can move to.
-  def next_square(square)
-    minimum = 9
-    nxt = -1
-    valid_moves(square).each{|pos|
-      unless @visited.include?(pos)
-        cnt = check_square(pos)
-        if cnt < minimum
-          minimum = cnt
-          nxt = pos
-        elsif cnt == minimum
-          nxt = edgemost(nxt, pos)
-        end
-      end
-    }
-    nxt
-  end
-
-  # Select the square nearest the edge of the board
-  def edgemost(nxt, pos)
-    col_A = 3 - ((3.5 - nxt % 8).abs.to_i)
-    col_B = 3 - ((3.5 - pos % 8).abs.to_i)
-    row_A = 3 - ((3.5 - nxt.div(8)).abs.to_i)
-    row_B = 3 - ((3.5 - pos.div(8)).abs.to_i)
-    (col_A * row_A < col_B * row_B)? nxt : pos
-  end
-
-  # Display a square number as a standard chess square notation.
-  def _N(square)
-    '%c%d' % [(97 + square % 8), (square.div(8) + 1)]
-  end
-
-  # Perform a Knight's move and schedule the next move.
-  def move_piece(last, square)
-    @log.insert(:end, "#{@visited.length}. #{_N last} -> #{_N square}\n", '')
-    @log.see(:end)
-    @board.itemconfigure(1+last, :state=>:normal, :outline=>'black')
-    @board.itemconfigure(1+square, :state=>:normal, :outline=>'red')
-    @knight.coords(@board.coords(1+square)[0..1])
-    @visited << square
-    if (nxt = next_square(square)) != -1
-      @after_id = Tk.after(@delay.numeric){move_piece(square, nxt) rescue nil}
-    else
-      @start_btn.state :normal
-      if @visited.length == 64
-        if @initial == square
-          @log.insert :end, 'Closed tour!'
-        else
-          @log.insert :end, "Success\n", {}
-          Tk.after(@delay.numeric * 2){tour(rand(64))} if @continuous.bool
-        end
-      else
-        @log.insert :end, "FAILED!\n", {}
-      end
-    end
-  end
-
-  # Begin a new tour of the board given a random start position
-  def tour(square = nil)
-    @visited.clear
-    @log.clear
-    @start_btn.state :disabled
-    1.upto(64){|n|
-      @board.itemconfigure(n, :state=>:disabled, :outline=>'black')
-    }
-    unless square
-      square = @board.find_closest(*(@knight.coords << 0 << 65))[0].to_i - 1
-    end
-    @initial = square
-    Tk.after_idle{ move_piece(@initial, @initial) rescue nil }
-  end
-
-  def _stop
-    Tk.after_cancel(@after_id) rescue nil
-  end
-
-  def _exit
-    _stop
-    $knightstour.destroy
-  end
-
-  def set_delay(new)
-    @delay.numeric = new.to_i
-  end
-
-  def drag_start(w, x, y)
-    w.dtag('selected')
-    w.addtag('selected', :withtag, 'current')
-    @dragging = [x, y]
-  end
-
-  def drag_motion(w, x, y)
-    return unless @dragging
-    w.move('selected', x - @dragging[0], y - @dragging[1])
-    @dragging = [x, y]
-  end
-
-  def drag_end(w, x, y)
-    square = w.find_closest(x, y, 0, 65)
-    w.coords('selected', w.coords(square)[0..1])
-    w.dtag('selected')
-    @dragging = nil
-  end
-
-  def make_SeeDismiss
-    ## See Code / Dismiss
-    frame = Ttk::Frame.new($knightstour)
-    sep = Ttk::Separator.new(frame)
-    Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-    TkGrid('x',
-           Ttk::Button.new(frame, :text=>'See Code',
-                           :image=>$image['view'], :compound=>:left,
-                           :command=>proc{showCode 'knightstour'}),
-           Ttk::Button.new(frame, :text=>'Dismiss',
-                           :image=>$image['delete'], :compound=>:left,
-                           :command=>proc{
-                             $knightstour.destroy
-                             $knightstour = nil
-                           }),
-           :padx=>4, :pady=>4)
-    frame.grid_columnconfigure(0, :weight=>1)
-    frame
-  end
-
-  def create_gui(parent = nil)
-    $knightstour.destroy rescue nil
-    $knightstour = Tk::Toplevel.new(parent, :title=>"Knight's tour")
-    $knightstour.withdraw
-    base_f = Ttk::Frame.new($knightstour)
-    @board = Tk::Canvas.new(base_f, :width=>240, :height=>240)
-    @log = Tk::Text.new(base_f, :width=>12, :height=>1,
-                        :font=>'Arial 8', :background=>'white')
-    scr = @log.yscrollbar(Ttk::Scrollbar.new(base_f))
-
-    @visited = []
-    @delay = TkVariable.new(600)
-    @continuous = TkVariable.new(false)
-
-    tool_f = Ttk::Frame.new($knightstour)
-    label = Ttk::Label.new(tool_f, :text=>'Speed')
-    scale = Ttk::Scale.new(tool_f, :from=>8, :to=>2000, :variable=>@delay,
-                           :command=>proc{|n| set_delay(n)})
-    check = Ttk::Checkbutton.new(tool_f, :text=>'Repeat',
-                                 :variable=>@continuous)
-    @start_btn = Ttk::Button.new(tool_f, :text=>'Start',
-                                 :command=>proc{tour()})
-    @exit_btn = Ttk::Button.new(tool_f, :text=>'Exit',
-                                :command=>proc{_exit()})
-
-    7.downto(0){|row|
-      0.upto(7){|col|
-        if ((col & 1) ^ (row & 1)).zero?
-          fill  = 'bisque'
-          dfill = 'bisque3'
-        else
-          fill  = 'tan3'
-          dfill = 'tan4'
-        end
-        coords = [col * 30 + 4, row * 30 + 4, col * 30 + 30, row * 30 + 30]
-        @board.create(TkcRectangle, coords,
-                      :fill=>fill, :disabledfill=>dfill,
-                      :width=>2, :state=>:disabled)
-      }
-    }
-
-    @knight_font = TkFont.new(:size=>-24)
-    @knight = TkcText.new(@board, 0, 0, :font=>@knight_font,
-                          :text=>Tk::UTF8_String.new('\u265e'),
-                          :anchor=>'nw', # :tags=>'knight',
-                          :fill=>'black', :activefill=>'#600000')
-    @knight.coords(@board.coords(rand(64)+1)[0..1])
-    @knight.bind('ButtonPress-1', '%W %x %y'){|w,x,y| drag_start(w,x,y)}
-    @knight.bind('Motion', '%W %x %y'){|w,x,y| drag_motion(w,x,y)}
-    @knight.bind('ButtonRelease-1', '%W %x %y'){|w,x,y| drag_end(w,x,y)}
-
-    Tk.grid(@board, @log, scr, :sticky=>'news')
-    base_f.grid_rowconfigure(0, :weight=>1)
-    base_f.grid_columnconfigure(0, :weight=>1)
-
-    Tk.grid(base_f, '-', '-', '-', '-', '-', :sticky=>'news')
-    widgets = [label, scale, check, @start_btn]
-    sg = nil
-    unless $RubyTk_WidgetDemo
-      widgets << @exit_btn
-      if Tk.windowingsystem != 'aqua'
-        #widgets.unshift(Ttk::SizeGrip.new(tool_f))
-        Ttk::SizeGrip.new(tool_f).pack(:side=>:right, :anchor=>'se')
-      end
-    end
-    Tk.pack(widgets, :side=>:right)
-    if Tk.windowingsystem == 'aqua'
-      TkPack.configure(widgets, :padx=>[4, 4], :pady=>[12, 12])
-      TkPack.configure(widgets[0], :padx=>[4, 24])
-      TkPack.configure(widgets[-1], :padx=>[16, 4])
-    end
-
-    Tk.grid(tool_f, '-', '-', '-', '-', '-', :sticky=>'ew')
-
-    if $RubyTk_WidgetDemo
-      Tk.grid(make_SeeDismiss(), '-', '-', '-', '-', '-', :sticky=>'ew')
-    end
-
-    $knightstour.grid_rowconfigure(0, :weight=>1)
-    $knightstour.grid_columnconfigure(0, :weight=>1)
-
-    $knightstour.bind('Control-F2'){TkConsole.show}
-    $knightstour.bind('Return'){@start_btn.invoke}
-    $knightstour.bind('Escape'){@exit_btn.invoke}
-    $knightstour.bind('Destroy'){ _stop }
-    $knightstour.protocol('WM_DELETE_WINDOW'){ _exit }
-
-    $knightstour.deiconify
-    $knightstour.tkwait_destroy
-  end
-
-  def initialize(parent = nil)
-    create_gui(parent)
-  end
-end
-
-Tk.root.withdraw unless $RubyTk_WidgetDemo
-Thread.new{Tk.mainloop} if __FILE__ == $0
-Knights_Tour.new
diff --git a/ext/tk/sample/demos-en/label.rb b/ext/tk/sample/demos-en/label.rb
deleted file mode 100644
index d9cfd92364..0000000000
--- a/ext/tk/sample/demos-en/label.rb
+++ /dev/null
@@ -1,73 +0,0 @@
-# frozen_string_literal: false
-# label.rb
-#
-# This demonstration script creates a toplevel window containing
-# several label widgets.
-#
-# label widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($label_demo) && $label_demo
-  $label_demo.destroy
-  $label_demo = nil
-end
-
-# demo toplevel widget
-$label_demo = TkToplevel.new {|w|
-  title("Label Demonstration")
-  iconname("label")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($label_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "Five labels are displayed below: three textual ones on the left, and a bitmap label and a text label on the right.  Labels are pretty boring because you can't do anything with them."
-}
-msg.pack('side'=>'top')
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $label_demo
-      $label_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'See Code'
-    command proc{showCode 'label'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# label demo
-f_left = TkFrame.new(base_frame)
-f_right = TkFrame.new(base_frame)
-[f_left, f_right].each{|w| w.pack('side'=>'left', 'expand'=>'yes',
-                                  'padx'=>10, 'pady'=>10, 'fill'=>'both')}
-
-# label
-[ TkLabel.new(f_left, 'text'=>'First label'),
-  TkLabel.new(f_left, 'text'=>'Second label, raised',
-              'relief'=>'raised'),
-  TkLabel.new(f_left, 'text'=>'Third label, sunken', 'relief'=>'sunken')
-].each{|w| w.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2, 'anchor'=>'w')}
-
-# TkLabel.new(f_right) {
-Tk::Label.new(f_right) {
-  bitmap('@' + [$demo_dir,'..','images','face.xbm'].join(File::Separator))
-  borderwidth 2
-  relief 'sunken'
-}.pack('side'=>'top')
-
-TkLabel.new(f_right) { text 'Tcl/Tk Proprietor' }.pack('side'=>'top')
-
diff --git a/ext/tk/sample/demos-en/labelframe.rb b/ext/tk/sample/demos-en/labelframe.rb
deleted file mode 100644
index bd2d8f335e..0000000000
--- a/ext/tk/sample/demos-en/labelframe.rb
+++ /dev/null
@@ -1,96 +0,0 @@
-# frozen_string_literal: false
-# labelframe.rb
-#
-# This demonstration script creates a toplevel window containing
-# several labelframe widgets.
-#
-# based on "Id: labelframe.tcl,v 1.2 2001/10/30 11:21:50 dkf Exp"
-
-
-if defined?($labelframe_demo) && $labelframe_demo
-  $labelframe_demo.destroy
-  $labelframe_demo = nil
-end
-
-$labelframe_demo = TkToplevel.new {|w|
-  title("Labelframe Demonstration")
-  iconname("labelframe")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($labelframe_demo).pack(:fill=>:both, :expand=>true)
-
-# Some information
-TkLabel.new(base_frame,
-            :font=>$font, :wraplength=>'4i', :justify=>:left,
-            :text=><<EOL).pack(:side=>:top)
-Labelframes are used to group related widgets together. \
-The label may be either plain text or another widget. \
-If your Tk library linked to Ruby doesn't include a 'labelframe' widget, \
-this demo doesn't work. Please use later version of Tk \
-which supports a 'labelframe' widget.
-EOL
-
-# The bottom buttons
-TkFrame.new(base_frame){|f|
-  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
-
-  TkButton.new(f, :text=>'Dismiss', :width=>15, :command=>proc{
-                 $labelframe_demo.destroy
-                 $labelframe_demo = nil
-               }).pack(:side=>:left, :expand=>true)
-
-  TkButton.new(f, :text=>'See Code', :width=>15, :command=>proc{
-                 showCode 'labelframe'
-               }).pack(:side=>:left, :expand=>true)
-}
-
-# Demo area
-w = TkFrame.new(base_frame).pack(:side=>:bottom, :fill=>:both,
-                                       :expand=>true)
-
-# A group of radiobuttons in a labelframe
-TkLabelFrame.new(w, :text=>'Value',
-                 :padx=>2, :pady=>2) {|f|
-  grid(:row=>0, :column=>0, :pady=>'2m', :padx=>'2m')
-
-  v = TkVariable.new
-  (1..4).each{|i|
-    TkRadiobutton.new(f, :text=>"This is value #{i}",
-                      :variable=>v, :value=>i) {
-      pack(:side=>:top, :fill=>:x, :pady=>2)
-    }
-  }
-}
-
-
-# Using a label window to control a group of options.
-$lfdummy = TkVariable.new(0)
-
-def lfEnableButtons(w)
-  TkWinfo.children(w).each{|child|
-    next if child.path =~ /\.cb$/
-    if $lfdummy == 1
-      child.state(:normal)
-    else
-      child.state(:disabled)
-    end
-  }
-end
-
-TkLabelFrame.new(w, :pady=>2, :padx=>2){|f|
-  TkCheckButton.new(f, :widgetname=>'cb', :variable=>$lfdummy,
-                    :text=>"Use this option.", :padx=>0) {|cb|
-    command proc{lfEnableButtons(f)}
-    f.labelwidget(cb)
-  }
-  grid(:row=>0, :column=>1, :pady=>'2m', :padx=>'2m')
-
-  %w(Option1 Option2 Option3).each{|str|
-    TkCheckbutton.new(f, :text=>str).pack(:side=>:top, :fill=>:x, :pady=>2)
-  }
-
-  lfEnableButtons(f)
-}
-
-TkGrid.columnconfigure(w, [0,1], :weight=>1)
diff --git a/ext/tk/sample/demos-en/mclist.rb b/ext/tk/sample/demos-en/mclist.rb
deleted file mode 100644
index 61ebff1805..0000000000
--- a/ext/tk/sample/demos-en/mclist.rb
+++ /dev/null
@@ -1,118 +0,0 @@
-# frozen_string_literal: false
-# mclist.rb --
-#
-# This demonstration script creates a toplevel window containing a Ttk
-# tree widget configured as a multi-column listbox.
-#
-# based on "Id: mclist.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($mclist_demo) && $mclist_demo
-  $mclist_demo.destroy
-  $mclist_demo = nil
-end
-
-$mclist_demo = TkToplevel.new {|w|
-  title("Multi-Column List")
-  iconname("mclist")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($mclist_demo).pack(:fill=>:both, :expand=>true)
-
-## Explanatory text
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i',
-               :justify=>:left, :anchor=>'n', :padding=>[10, 2, 10, 6],
-               :text=><<EOL).pack(:fill=>:x)
-Ttk is the new Tk themed widget set. \
-One of the widgets it includes is a tree widget, \
-which can be configured to display multiple columns of informational data \
-without displaying the tree itself. \
-This is a simple way to build a listbox that has multiple columns. \
-Clicking on the heading for a column will sort the data by that column. \
-You can also change the width of the columns \
-by dragging the boundary between them.
-EOL
-
-## See Code / Dismiss
-Ttk::Frame.new(base_frame) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         Ttk::Button.new(frame, :text=>'See Code',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{showCode 'mclist'}),
-         Ttk::Button.new(frame, :text=>'Dismiss',
-                         :image=>$image['delete'], :compound=>:left,
-                         :command=>proc{
-                           $mclist_demo.destroy
-                           $mclist_demo = nil
-                         }),
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x)
-}
-
-container = Ttk::Frame.new(base_frame)
-tree = Ttk::Treeview.new(base_frame, :columns=>%w(country capital currency),
-                          :show=>:headings)
-if Tk.windowingsystem != 'aqua'
-  vsb = tree.yscrollbar(Ttk::Scrollbar.new(base_frame))
-  hsb = tree.xscrollbar(Ttk::Scrollbar.new(base_frame))
-else
-  vsb = tree.yscrollbar(Tk::Scrollbar.new(base_frame))
-  hsb = tree.xscrollbar(Tk::Scrollbar.new(base_frame))
-end
-
-container.pack(:fill=>:both, :expand=>true)
-Tk.grid(tree, vsb, :in=>container, :sticky=>'nsew')
-Tk.grid(hsb,       :in=>container, :sticky=>'nsew')
-container.grid_columnconfigure(0, :weight=>1)
-container.grid_rowconfigure(0, :weight=>1)
-
-## The data we're going to insert
-data = [
-  ['Argentina', 	'Buenos Aires', 	'ARS'],
-  ['Australia',		'Canberra',		'AUD'],
-  ['Brazil', 		'Brazilia', 		'BRL'],
-  ['Canada', 		'Ottawa', 		'CAD'],
-  ['China',		'Beijing', 		'CNY'],
-  ['France',		'Paris', 		'EUR'],
-  ['Germany', 		'Berlin',		'EUR'],
-  ['India', 		'New Delhi',		'INR'],
-  ['Italy', 		'Rome', 		'EUR'],
-  ['Japan', 		'Tokyo', 		'JPY'],
-  ['Mexico', 		'Mexico City', 		'MXN'],
-  ['Russia', 		'Moscow', 		'RUB'],
-  ['South Africa',	'Pretoria', 		'ZAR'],
-  ['United Kingdom', 	'London', 		'GBP'],
-  ['United States', 	'Washington, D.C.', 	'USD'],
-]
-
-## Code to insert the data nicely
-font = Ttk::Style.lookup(tree[:style], :font)
-cols = %w(country capital currency)
-cols.zip(%w(Country Capital Currency)).each{|col, name|
-  tree.heading_configure(col, :text=>name,
-                         :command=>proc{sort_by(tree, col, false)})
-  tree.column_configure(col, :width=>TkFont.measure(font, name))
-}
-
-data.each{|country, capital, currency|
-  #tree.insert('', :end, :values=>[country, capital, currency])
-  tree.insert(nil, :end, :values=>[country, capital, currency])
-  cols.zip([country, capital, currency]).each{|col, val|
-    len = TkFont.measure(font, "#{val}  ")
-    if tree.column_cget(col, :width) < len
-      tree.column_configure(col, :width=>len)
-    end
-  }
-}
-
-## Code to do the sorting of the tree contents when clicked on
-def sort_by(tree, col, direction)
-  tree.children(nil).map!{|row| [tree.get(row, col), row.id]} .
-    sort(&((direction)? proc{|x, y| y <=> x}: proc{|x, y| x <=> y})) .
-    each_with_index{|info, idx| tree.move(info[1], nil, idx)}
-
-  tree.heading_configure(col, :command=>proc{sort_by(tree, col, ! direction)})
-end
diff --git a/ext/tk/sample/demos-en/menu.rb b/ext/tk/sample/demos-en/menu.rb
deleted file mode 100644
index db0541c608..0000000000
--- a/ext/tk/sample/demos-en/menu.rb
+++ /dev/null
@@ -1,197 +0,0 @@
-# frozen_string_literal: false
-#
-# menus widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($menu_demo) && $menu_demo
-  $menu_demo.destroy
-  $menu_demo = nil
-end
-
-# demo toplevel widget
-$menu_demo = TkToplevel.new {|w|
-  title("File Selection Dialogs")
-  iconname("menu")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($menu_demo).pack(:fill=>:both, :expand=>true)
-
-# menu frame
-$menu_frame = TkFrame.new(base_frame, 'relief'=>'raised', 'bd'=>2)
-$menu_frame.pack('side'=>'top', 'fill'=>'x')
-
-begin
-  windowingsystem = Tk.windowingsystem()
-rescue
-  windowingsystem = ""
-end
-
-# label
-TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
-  if $tk_platform['platform'] == 'macintosh' ||
-      windowingsystem == "classic" || windowingsystem == "aqua"
-    text("This window contains a menubar with cascaded menus.  You can invoke entries with an accelerator by typing Command+x, where \"x\" is the character next to the command key symbol. The rightmost menu can be torn off into a palette by dragging outside of its bounds and releasing the mouse.")
-  else
-    text("This window contains a menubar with cascaded menus.  You can post a menu from the keyboard by typing Alt+x, where \"x\" is the character underlined on the menu.  You can then traverse among the menus using the arrow keys.  When a menu is posted, you can invoke the current entry by typing space, or you can invoke any entry by typing its underlined character.  If a menu entry has an accelerator, you can invoke the entry without posting the menu just by typing the accelerator. The rightmost menu can be torn off into a palette by selecting the first item in the menu.")
-  end
-}.pack('side'=>'top')
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $menu_demo
-      $menu_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'menu'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# menu
-TkMenubutton.new($menu_frame, 'text'=>'File', 'underline'=>0) {|m|
-  pack('side'=>'left')
-  TkMenu.new(m, 'tearoff'=>false) {|file_menu|
-    m.configure('menu'=>file_menu)
-    add('command', 'label'=>'Open...', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "Open..." entry'})
-    add('command', 'label'=>'New', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "New" entry'})
-    add('command', 'label'=>'Save', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "Save" entry'})
-    add('command', 'label'=>'Save As...', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "Save As..." entry'})
-    add('separator')
-    add('command', 'label'=>'Print Setup...', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "Print Setup..." entry'})
-    add('command', 'label'=>'Print...', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "Print..." entry'})
-    add('separator')
-    add('command', 'label'=>'Dismiss Menus Demo', 'command'=>proc{$menu_demo.destroy})
-  }
-}
-
-if $tk_platform['platform'] == 'macintosh' ||
-    windowingsystem == "classic" || windowingsystem == "aqua"
-  modifier = 'Command'
-elsif $tk_platform['platform'] == 'windows'
-  modifier = 'Control'
-else
-  modifier = 'Meta'
-end
-
-TkMenubutton.new($menu_frame, 'text'=>'Basic', 'underline'=>0) {|m|
-  pack('side'=>'left')
-  TkMenu.new(m, 'tearoff'=>false) {|basic_menu|
-    m.configure('menu'=>basic_menu)
-    add('command', 'label'=>'Long entry that does nothing')
-    ['A','B','C','D','E','F','G'].each{|c|
-      add('command', 'label'=>"Print letter \"#{c}\"",
-          'underline'=>14,
-          'command'=>proc{print c,"\n"}, 'accelerator'=>"#{modifier}+#{c}")
-      $menu_demo.bind("#{modifier}-#{c.downcase}", proc{print c,"\n"})
-    }
-  }
-}
-
-TkMenubutton.new($menu_frame, 'text'=>'Cascades', 'underline'=>0) {|m|
-  pack('side'=>'left')
-  TkMenu.new(m, 'tearoff'=>false) {|cascade_menu|
-    m.configure('menu'=>cascade_menu)
-    add('command', 'label'=>'Print hello',
-        'command'=>proc{print "Hello\n"},
-        'accelerator'=>"#{modifier}+H", 'underline'=>6)
-    $menu_demo.bind("#{modifier}-h", proc{print "Hello\n"})
-    add('command', 'label'=>'Print goodbye',
-        'command'=>proc{print "Goodbye\n"},
-        'accelerator'=>"#{modifier}+G", 'underline'=>6)
-    $menu_demo.bind("#{modifier}-g", proc{print "Goodbye\n"})
-
-    TkMenu.new(cascade_menu, 'tearoff'=>false) {|cascade_check|
-      cascade_menu.add('cascade', 'label'=>'Check buttons',
-                       'menu'=>cascade_check, 'underline'=>0)
-      oil = TkVariable.new(0)
-      add('check', 'label'=>'Oil checked', 'variable'=>oil)
-      trans = TkVariable.new(0)
-      add('check', 'label'=>'Transmission checked', 'variable'=>trans)
-      brakes = TkVariable.new(0)
-      add('check', 'label'=>'Brakes checked', 'variable'=>brakes)
-      lights = TkVariable.new(0)
-      add('check', 'label'=>'Lights checked', 'variable'=>lights)
-      add('separator')
-      add('command', 'label'=>'Show current values',
-          'command'=>proc{showVars($menu_demo,
-                                   ['oil', oil],
-                                   ['trans', trans],
-                                   ['brakes', brakes],
-                                   ['lights', lights])} )
-      invoke 1
-      invoke 3
-    }
-
-    TkMenu.new(cascade_menu, 'tearoff'=>false) {|cascade_radio|
-      cascade_menu.add('cascade', 'label'=>'Radio buttons',
-                       'menu'=>cascade_radio, 'underline'=>0)
-      pointSize = TkVariable.new
-      add('radio', 'label'=>'10 point', 'variable'=>pointSize, 'value'=>10)
-      add('radio', 'label'=>'14 point', 'variable'=>pointSize, 'value'=>14)
-      add('radio', 'label'=>'18 point', 'variable'=>pointSize, 'value'=>18)
-      add('radio', 'label'=>'24 point', 'variable'=>pointSize, 'value'=>24)
-      add('radio', 'label'=>'32 point', 'variable'=>pointSize, 'value'=>32)
-      add('separator')
-      style = TkVariable.new
-      add('radio', 'label'=>'Roman', 'variable'=>style, 'value'=>'roman')
-      add('radio', 'label'=>'Bold', 'variable'=>style, 'value'=>'bold')
-      add('radio', 'label'=>'Italic', 'variable'=>style, 'value'=>'italic')
-      add('separator')
-      add('command', 'label'=>'Show current values',
-          'command'=>proc{showVars($menu_demo,
-                                   ['pointSize', pointSize],
-                                   ['style', style])} )
-      invoke 1
-      invoke 7
-    }
-  }
-}
-
-TkMenubutton.new($menu_frame, 'text'=>'Icons', 'underline'=>0) {|m|
-  pack('side'=>'left')
-  TkMenu.new(m, 'tearoff'=>false) {|icon_menu|
-    m.configure('menu'=>icon_menu)
-    add('command',
-        'bitmap'=>'@'+[$demo_dir,'..',
-                        'images','pattern.xbm'].join(File::Separator),
-        'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry',
-                                     'text'=>'The menu entry you invoked displays a bitmap rather than a text string.  Other than this, it is just like any other menu entry.',
-                                     'bitmap'=>'', 'default'=>0,
-                                     'buttons'=>'Dismiss')} )
-    ['info', 'questhead', 'error'].each{|icon|
-      add('command', 'bitmap'=>icon,
-          'command'=>proc{print "You invoked the #{icon} bitmap\n"})
-    }
-  }
-}
-
-TkMenubutton.new($menu_frame, 'text'=>'More', 'underline'=>0) {|m|
-  pack('side'=>'left')
-  TkMenu.new(m, 'tearoff'=>false) {|more_menu|
-    m.configure('menu'=>more_menu)
-    [ 'An entry','Another entry','Does nothing','Does almost nothing',
-      'Make life meaningful' ].each{|i|
-      add('command', 'label'=>i,
-          'command'=>proc{print "You invoked \"#{i}\"\n"})
-    }
-  }
-}
-
-TkMenubutton.new($menu_frame, 'text'=>'Colors', 'underline'=>0) {|m|
-  pack('side'=>'left')
-  TkMenu.new(m) {|colors_menu|
-    m.configure('menu'=>colors_menu)
-    ['red', 'orange', 'yellow', 'green', 'blue'].each{|c|
-      add('command', 'label'=>c, 'background'=>c,
-          'command'=>proc{print "You invoked \"#{c}\"\n"})
-    }
-  }
-}
diff --git a/ext/tk/sample/demos-en/menu84.rb b/ext/tk/sample/demos-en/menu84.rb
deleted file mode 100644
index 714fb3c553..0000000000
--- a/ext/tk/sample/demos-en/menu84.rb
+++ /dev/null
@@ -1,216 +0,0 @@
-# frozen_string_literal: false
-#
-# menus widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($menu84_demo) && $menu84_demo
-  $menu84_demo.destroy
-  $menu84_demo = nil
-end
-
-# demo toplevel widget
-$menu84_demo = TkToplevel.new {|w|
-  title("File Selection Dialogs")
-  iconname("menu84")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($menu84_demo).pack(:fill=>:both, :expand=>true)
-
-begin
-  windowingsystem = Tk.windowingsystem()
-rescue
-  windowingsystem = ""
-end
-
-# label
-TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
-  if $tk_platform['platform'] == 'macintosh' ||
-      windowingsystem == "classic" || windowingsystem == "aqua"
-    text("This window contains a menubar with cascaded menus.  You can invoke entries with an accelerator by typing Command+x, where \"x\" is the character next to the command key symbol. The rightmost menu can be torn off into a palette by dragging outside of its bounds and releasing the mouse.")
-  else
-    text("This window contains a menubar with cascaded menus.  You can post a menu from the keyboard by typing Alt+x, where \"x\" is the character underlined on the menu.  You can then traverse among the menus using the arrow keys.  When a menu is posted, you can invoke the current entry by typing space, or you can invoke any entry by typing its underlined character.  If a menu entry has an accelerator, you can invoke the entry without posting the menu just by typing the accelerator. The rightmost menu can be torn off into a palette by selecting the first item in the menu.")
-  end
-}.pack('side'=>'top')
-
-
-menustatus = TkVariable.new("    ")
-TkFrame.new(base_frame) {|frame|
-  TkLabel.new(frame, 'textvariable'=>menustatus, 'relief'=>'sunken',
-              'bd'=>1, 'font'=>['Helvetica', '10'],
-              'anchor'=>'w').pack('side'=>'left', 'padx'=>2,
-                                  'expand'=>true, 'fill'=>'both')
-  pack('side'=>'bottom', 'fill'=>'x', 'pady'=>2)
-}
-
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $menu84_demo
-      $menu84_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'menu84'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-
-# create menu frame
-$menu84_frame = TkMenu.new($menu84_demo, 'tearoff'=>false)
-
-# menu
-TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
-  $menu84_frame.add('cascade', 'label'=>'File', 'menu'=>m, 'underline'=>0)
-  add('command', 'label'=>'Open...', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "Open..." entry'})
-  add('command', 'label'=>'New', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "New" entry'})
-  add('command', 'label'=>'Save', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "Save" entry'})
-  add('command', 'label'=>'Save As...', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "Save As..." entry'})
-  add('separator')
-  add('command', 'label'=>'Print Setup...', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "Print Setup..." entry'})
-  add('command', 'label'=>'Print...', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "Print..." entry'})
-  add('separator')
-  add('command', 'label'=>'Dismiss Menus Demo', 'command'=>proc{$menu84_demo.destroy})
-}
-
-if $tk_platform['platform'] == 'macintosh' ||
-    windowingsystem = "classic" || windowingsystem = "aqua"
-  modifier = 'Command'
-elsif $tk_platform['platform'] == 'windows'
-  modifier = 'Control'
-else
-  modifier = 'Meta'
-end
-
-TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
-  $menu84_frame.add('cascade', 'label'=>'Basic', 'menu'=>m, 'underline'=>0)
-  add('command', 'label'=>'Long entry that does nothing')
-  ['A','B','C','D','E','F','G'].each{|c|
-    add('command', 'label'=>"Print letter \"#{c}\"",
-        'underline'=>14,
-        'command'=>proc{print c,"\n"}, 'accelerator'=>"#{modifier}+#{c}")
-    $menu84_demo.bind("#{modifier}-#{c.downcase}", proc{print c,"\n"})
-  }
-}
-
-TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
-  $menu84_frame.add('cascade', 'label'=>'Cascades', 'menu'=>m, 'underline'=>0)
-  add('command', 'label'=>'Print hello',
-      'command'=>proc{print "Hello\n"},
-      'accelerator'=>"#{modifier}+H", 'underline'=>6)
-  $menu84_demo.bind("#{modifier}-h", proc{print "Hello\n"})
-  add('command', 'label'=>'Print goodbye',
-      'command'=>proc{print "Goodbye\n"},
-      'accelerator'=>"#{modifier}+G", 'underline'=>6)
-  $menu84_demo.bind("#{modifier}-g", proc{print "Goodbye\n"})
-
-  TkMenu.new(m, 'tearoff'=>false) {|cascade_check|
-    m.add('cascade', 'label'=>'Check buttons',
-          'menu'=>cascade_check, 'underline'=>0)
-    oil = TkVariable.new(0)
-    add('check', 'label'=>'Oil checked', 'variable'=>oil)
-    trans = TkVariable.new(0)
-    add('check', 'label'=>'Transmission checked', 'variable'=>trans)
-    brakes = TkVariable.new(0)
-    add('check', 'label'=>'Brakes checked', 'variable'=>brakes)
-    lights = TkVariable.new(0)
-    add('check', 'label'=>'Lights checked', 'variable'=>lights)
-    add('separator')
-    add('command', 'label'=>'Show current values',
-        'command'=>proc{showVars($menu84_demo,
-                                 ['oil', oil],
-                                 ['trans', trans],
-                                 ['brakes', brakes],
-                                 ['lights', lights])} )
-    invoke 1
-    invoke 3
-  }
-
-  TkMenu.new(m, 'tearoff'=>false) {|cascade_radio|
-    m.add('cascade', 'label'=>'Radio buttons',
-          'menu'=>cascade_radio, 'underline'=>0)
-    pointSize = TkVariable.new
-    add('radio', 'label'=>'10 point', 'variable'=>pointSize, 'value'=>10)
-    add('radio', 'label'=>'14 point', 'variable'=>pointSize, 'value'=>14)
-    add('radio', 'label'=>'18 point', 'variable'=>pointSize, 'value'=>18)
-    add('radio', 'label'=>'24 point', 'variable'=>pointSize, 'value'=>24)
-    add('radio', 'label'=>'32 point', 'variable'=>pointSize, 'value'=>32)
-    add('separator')
-    style = TkVariable.new
-    add('radio', 'label'=>'Roman', 'variable'=>style, 'value'=>'roman')
-    add('radio', 'label'=>'Bold', 'variable'=>style, 'value'=>'bold')
-    add('radio', 'label'=>'Italic', 'variable'=>style, 'value'=>'italic')
-    add('separator')
-    add('command', 'label'=>'Show current values',
-        'command'=>proc{showVars($menu84_demo,
-                                 ['pointSize', pointSize],
-                                 ['style', style])} )
-    invoke 1
-    invoke 7
-  }
-}
-
-TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
-  $menu84_frame.add('cascade', 'label'=>'Icons', 'menu'=>m, 'underline'=>0)
-  add('command', 'hidemargin'=>1,
-      'bitmap'=>'@'+[$demo_dir,'..',
-                      'images','pattern.xbm'].join(File::Separator),
-      'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry',
-                                   'text'=>'The menu entry you invoked displays a bitmap rather than a text string.  Other than this, it is just like any other menu entry.',
-                                   'bitmap'=>'', 'default'=>0,
-                                   'buttons'=>'Dismiss')} )
-  ['info', 'questhead', 'error'].each{|icon|
-    add('command', 'bitmap'=>icon, 'hidemargin'=>1,
-        'command'=>proc{print "You invoked the #{icon} bitmap\n"})
-  }
-
-  entryconfigure(2, :columnbreak=>true)
-}
-
-TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
-  $menu84_frame.add('cascade', 'label'=>'More', 'menu'=>m, 'underline'=>0)
-  [ 'An entry','Another entry','Does nothing','Does almost nothing',
-    'Make life meaningful' ].each{|i|
-    add('command', 'label'=>i,
-        'command'=>proc{print "You invoked \"#{i}\"\n"})
-  }
-
-  m.entryconfigure('Does almost nothing',
-                   'bitmap'=>'questhead', 'compound'=>'left',
-                   'command'=>proc{
-                     TkDialog.new('title'=>'Compound Menu Entry',
-                                  'message'=>'The menu entry you invoked'+
-                                             'displays both a bitmap and '+
-                                             'a text string.  Other than '+
-                                             'this, it is just like any '+
-                                             'other menu entry.',
-                                  'buttons'=>['OK'], 'bitmap'=>'')
-                   })
-}
-
-TkMenu.new($menu84_frame) {|m|
-  $menu84_frame.add('cascade', 'label'=>'Colors', 'menu'=>m, 'underline'=>0)
-  ['red', 'orange', 'yellow', 'green', 'blue'].each{|c|
-    add('command', 'label'=>c, 'background'=>c,
-        'command'=>proc{print "You invoked \"#{c}\"\n"})
-  }
-}
-
-$menu84_demo.menu($menu84_frame)
-
-TkMenu.bind('<MenuSelect>', proc{|w|
-              begin
-                label = w.entrycget('active', 'label')
-              rescue
-                label = "    "
-              end
-              menustatus.value = label
-              Tk.update(true)
-            }, '%W')
diff --git a/ext/tk/sample/demos-en/menubu.rb b/ext/tk/sample/demos-en/menubu.rb
deleted file mode 100644
index 9ff683d09c..0000000000
--- a/ext/tk/sample/demos-en/menubu.rb
+++ /dev/null
@@ -1,238 +0,0 @@
-# frozen_string_literal: false
-# menubutton.rb
-#
-# This demonstration script creates a window with a bunch of menus
-# and cascaded menus using menubuttons.
-
-require "tkcanvas"
-
-def optionMenu(menubutton, varName, firstValue, *rest)
-  varName.value = firstValue
-  configoptions = {'textvariable'=>varName,'indicatoron'=>'on',
-    'relief'=>'raised','borderwidth'=>2,'highlightthickness'=>2,
-    'anchor'=>'c','direction'=>'flush'}
-  configoptions.each {|key, value|
-    menubutton.configure(key, value)
-  }
-  menu = TkMenu.new(menubutton) {
-    tearoff 'off'
-    add 'radio', 'label'=>firstValue, 'variable'=>varName
-  }
-  menubutton.menu(menu)
-  for i in rest
-    menu.add 'radio', 'label'=>i, 'variable'=>varName
-  end
-
-  return menu
-end
-
-if defined?($menubu_demo) && $menubu_demo
-  $menubu_demo.destroy
-  $menubu_demo = nil
-end
-
-$menubu_demo = TkToplevel.new {|w|
-  title("Menu Button Demonstration")
-  iconname("menubutton")
-}
-
-positionWindow($menubu_demo)
-
-base_frame = TkFrame.new($menubu_demo).pack(:fill=>:both, :expand=>true)
-
-# version check
-if $tk_version.to_f < 8.0
-
-# label
-TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
-    text("This is a demonstration of menubuttons. The \"Below\" menubutton pops its menu below the button; the \"Right\" button pops to the right, etc. There are two option menus directly below this text; one is just a standard menu and the other is a 16-color palette.")
-}.pack('side'=>'top')
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $menubu_demo
-      $menubu_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'menubu'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-else ; # Tk8.x
-
-body = TkFrame.new(base_frame)
-body.pack('expand'=>'yes', 'fill'=>'both')
-
-below = TkMenubutton.new(body) {
-  text "Below"
-  underline 0
-  direction 'below'
-  relief 'raised'
-}
-belowMenu = TkMenu.new(below) {
-  tearoff 0
-  add 'command', 'label'=>"Below menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Below menu.\""}
-  add 'command', 'label'=>"Below menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Below menu.\""}
-}
-below.menu(belowMenu)
-below.grid('row'=>0, 'column'=>1, 'sticky'=>'n')
-
-below = TkMenubutton.new(body) {
-  text "Below"
-  underline 0
-  direction 'below'
-  relief 'raised'
-}
-belowMenu = TkMenu.new(below) {
-  tearoff 0
-  add 'command', 'label'=>"Below menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Below menu.\""}
-  add 'command', 'label'=>"Below menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Below menu.\""}
-}
-below.menu(belowMenu)
-below.grid('row'=>0, 'column'=>1, 'sticky'=>'n')
-
-below = TkMenubutton.new(body) {
-  text "Below"
-  underline 0
-  direction 'below'
-  relief 'raised'
-}
-belowMenu = TkMenu.new(below) {
-  tearoff 0
-  add 'command', 'label'=>"Below menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Below menu.\""}
-  add 'command', 'label'=>"Below menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Below menu.\""}
-}
-below.menu(belowMenu)
-below.grid('row'=>0, 'column'=>1, 'sticky'=>'n')
-
-right = TkMenubutton.new(body) {
-  text "Right"
-  underline 0
-  direction 'right'
-  relief 'raised'
-}
-rightMenu = TkMenu.new(right) {
-  tearoff 0
-  add 'command', 'label'=>"Right menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Left menu.\""}
-  add 'command', 'label'=>"Right menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Right menu.\""}
-}
-right.menu(rightMenu)
-right.grid('row'=>1, 'column'=>0, 'sticky'=>'w')
-
-left = TkMenubutton.new(body) {
-  text "Left"
-  underline 0
-  direction 'left'
-  relief 'raised'
-}
-leftMenu = TkMenu.new(left) {
-  tearoff 0
-  add 'command', 'label'=>"Left menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Left menu.\""}
-  add 'command', 'label'=>"Left menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Left menu.\""}
-}
-left.menu(leftMenu)
-left.grid('row'=>1, 'column'=>2, 'sticky'=>'e')
-
-center = TkFrame.new(body) {
-  grid('row'=>1, 'column'=>1, 'sticky'=>'news')
-}
-
-above = TkMenubutton.new(body) {
-  text "Above"
-  underline 0
-  direction 'above'
-  relief 'raised'
-}
-aboveMenu = TkMenu.new(above) {
-  tearoff 0
-  add 'command', 'label'=>"Above menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Above menu.\""}
-  add 'command', 'label'=>"Above menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Above menu.\""}
-}
-above.menu(aboveMenu)
-above.grid('row'=>2, 'column'=>1, 'sticky'=>'s')
-
-center = TkFrame.new(body) {
-  grid('row'=>1, 'column'=>1, 'sticky'=>'news')
-}
-
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc {
-      tmppath = $menubu_demo
-      $menubu_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc { showCode 'menubu' }
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'expand'=>'yes', 'fill'=>'x', 'pady'=>'2m')
-
-msg = TkLabel.new(center) {
-#  font $font
-  wraplength '4i'
-  justify 'left'
-  text "This is a demonstration of menubuttons. The \"Below\" menubutton pops its menu below the button; the \"Right\" button pops to the right, etc. There are two option menus directly below this text; one is just a standard menu and the other is a 16-color palette."
-}
-msg.pack('side'=>'top', 'padx'=>25, 'pady'=>25)
-
-TkFrame.new(center) {|f|
-  menubuttonoptions = TkVariable.new
-  mbutton = TkMenubutton.new(f)
-  options = optionMenu(mbutton, menubuttonoptions,
-                       'one', 'two', 'three')
-  mbutton.pack('side'=>'left', 'padx'=>25, 'pady'=>25)
-  paletteColor = TkVariable.new
-  colors = ['Black','red4','DarkGreen','NavyBlue', 'gray75',
-    'Red','Green','Blue','gray50','Yellow','Cyan','Magenta',
-    'White','Brown','DarkSeaGreen','DarkViolet']
-  colorMenuButton = TkMenubutton.new(f)
-  m = optionMenu(colorMenuButton, paletteColor, *colors)
-  begin
-    windowingsystem = Tk.windowingsystem()
-  rescue
-    windowingsystem = ""
-  end
-  if windowingsystem == "classic" || windowingsystem == "aqua"
-    topBorderColor = 'Black'
-    bottomBorderColor = 'Black'
-  else
-    topBorderColor = 'gray50'
-    bottomBorderColor = 'gray75'
-  end
-  for i in 0..15
-    image = TkPhotoImage.new('height'=>16, 'width'=>16)
-    image.put(topBorderColor, 0, 0, 16, 1)
-    image.put(topBorderColor, 0, 1, 1, 16)
-    image.put(bottomBorderColor, 0, 15, 16, 16)
-    image.put(bottomBorderColor, 15, 1, 16, 16)
-    image.put(colors[i], 1, 1, 15, 15)
-
-    selectimage = TkPhotoImage.new('height'=>16, 'width'=>16)
-    selectimage.put('Black', 0, 0, 16, 2)
-    selectimage.put('Black', 0, 2, 2, 16)
-    selectimage.put('Black', 2, 14, 16, 16)
-    selectimage.put('Black', 14, 2, 16, 14)
-    selectimage.put(colors[i], 2, 2, 14, 14)
-
-    m.entryconfigure(i, 'image'=>image, 'selectimage'=>selectimage, 'hidemargin'=>'on')
-  end
-  m.configure('tearoff', 'on')
-  for c in ['Black', 'gray75', 'gray50', 'White']
-    m.entryconfigure(c, 'columnbreak'=>1)
-  end
-  colorMenuButton.pack('side'=>'left', 'padx'=>25, 'pady'=>25)
-  pack 'padx'=>25, 'pady'=>25
-}
-
-end ; # Tk8.x
diff --git a/ext/tk/sample/demos-en/msgbox.rb b/ext/tk/sample/demos-en/msgbox.rb
deleted file mode 100644
index 9a5ff51b4b..0000000000
--- a/ext/tk/sample/demos-en/msgbox.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-# frozen_string_literal: false
-# msgbox.rb
-#
-# This demonstration script creates message boxes of various type
-#
-# message boxes widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($msgbox_demo) && $msgbox_demo
-  $msgbox_demo.destroy
-  $msgbox_demo = nil
-end
-
-# demo toplevel widget
-$msgbox_demo = TkToplevel.new {|w|
-  title("Message Box Demonstration")
-  iconname("messagebox")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($msgbox_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'4i', 'justify'=>'left',
-            'text'=>"Choose the icon and type option of the message box. Then press the \"Message Box\" button to see the message box.").pack('side'=>'top')
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $msgbox_demo
-      $msgbox_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'msgbox'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Message Box'
-    command proc{showMessageBox $msgbox_demo}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-$msgbox_leftframe  = TkFrame.new(base_frame)
-$msgbox_rightframe = TkFrame.new(base_frame)
-$msgbox_leftframe .pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y',
-                        'pady'=>'.5c', 'padx'=>'.5c')
-$msgbox_rightframe.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y',
-                        'pady'=>'.5c', 'padx'=>'.5c')
-
-TkLabel.new($msgbox_leftframe, 'text'=>'Icon').pack('side'=>'top')
-TkFrame.new($msgbox_leftframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
-.pack('side'=>'top', 'fill'=>'x', 'expand'=>'no')
-
-$msgboxIcon = TkVariable.new('info')
-['error', 'info', 'question', 'warning'].each {|icon|
-  TkRadioButton.new($msgbox_leftframe, 'text'=>icon, 'variable'=>$msgboxIcon,
-                    'relief'=>'flat', 'value'=>icon, 'width'=>16,
-                    'anchor'=>'w').pack('side'=>'top', 'pady'=>2,
-                                        'anchor'=>'w', 'fill'=>'x')
-}
-
-TkLabel.new($msgbox_rightframe, 'text'=>'Type').pack('side'=>'top')
-TkFrame.new($msgbox_rightframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
-.pack('side'=>'top', 'fill'=>'x', 'expand'=>'no')
-
-$msgboxType = TkVariable.new('ok')
-['abortretryignore', 'ok', 'okcancel',
-  'retrycancel', 'yesno', 'yesnocancel'].each {|type|
-  TkRadioButton.new($msgbox_rightframe, 'text'=>type, 'variable'=>$msgboxType,
-                    'relief'=>'flat', 'value'=>type, 'width'=>16,
-                    'anchor'=>'w').pack('side'=>'top', 'pady'=>2,
-                                        'anchor'=>'w', 'fill'=>'x')
-}
-
-def showMessageBox(w)
-  button = Tk.messageBox('icon'=>$msgboxIcon.value, 'type'=>$msgboxType.value,
-                         'title'=>'Message', 'parent'=>w,
-                         'message'=>"This is a \"#{$msgboxType.value}\" type messagebox with the \"#{$msgboxIcon.value}\" icon")
-
-  Tk.messageBox('icon'=>'info', 'type'=>'ok', 'parent'=>w,
-                'message'=>"You have selected  \"#{button}\"")
-end
-
diff --git a/ext/tk/sample/demos-en/msgbox2.rb b/ext/tk/sample/demos-en/msgbox2.rb
deleted file mode 100644
index 0eb35c486d..0000000000
--- a/ext/tk/sample/demos-en/msgbox2.rb
+++ /dev/null
@@ -1,92 +0,0 @@
-# frozen_string_literal: false
-# msgbox2.rb
-#
-# This demonstration script creates message boxes of various type
-#
-# message boxes widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($msgbox2_demo) && $msgbox2_demo
-  $msgbox2_demo.destroy
-  $msgbox2_demo = nil
-end
-
-# demo toplevel widget
-$msgbox2_demo = TkToplevel.new {|w|
-  title("Message Box Demonstration")
-  iconname("messagebox")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($msgbox2_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'4i', 'justify'=>'left',
-            'text'=>"Choose the icon and type option of the message box. Then press the \"Message Box\" button to see the message box with both of a message and a detail.").pack('side'=>'top')
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $msgbox2_demo
-      $msgbox2_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'msgbox2'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Message Box'
-    command proc{showMessageBox2 $msgbox2_demo}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-$msgbox_leftframe  = TkFrame.new(base_frame)
-$msgbox_rightframe = TkFrame.new(base_frame)
-$msgbox_leftframe .pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y',
-                        'pady'=>'.5c', 'padx'=>'.5c')
-$msgbox_rightframe.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y',
-                        'pady'=>'.5c', 'padx'=>'.5c')
-
-TkLabel.new($msgbox_leftframe, 'text'=>'Icon').pack('side'=>'top')
-TkFrame.new($msgbox_leftframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
-.pack('side'=>'top', 'fill'=>'x', 'expand'=>'no')
-
-$msgboxIcon = TkVariable.new('info')
-['error', 'info', 'question', 'warning'].each {|icon|
-  TkRadioButton.new($msgbox_leftframe, 'text'=>icon, 'variable'=>$msgboxIcon,
-                    'relief'=>'flat', 'value'=>icon, 'width'=>16,
-                    'anchor'=>'w').pack('side'=>'top', 'pady'=>2,
-                                        'anchor'=>'w', 'fill'=>'x')
-}
-
-TkLabel.new($msgbox_rightframe, 'text'=>'Type').pack('side'=>'top')
-TkFrame.new($msgbox_rightframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
-.pack('side'=>'top', 'fill'=>'x', 'expand'=>'no')
-
-$msgboxType = TkVariable.new('ok')
-['abortretryignore', 'ok', 'okcancel',
-  'retrycancel', 'yesno', 'yesnocancel'].each {|type|
-  TkRadioButton.new($msgbox_rightframe, 'text'=>type, 'variable'=>$msgboxType,
-                    'relief'=>'flat', 'value'=>type, 'width'=>16,
-                    'anchor'=>'w').pack('side'=>'top', 'pady'=>2,
-                                        'anchor'=>'w', 'fill'=>'x')
-}
-
-def showMessageBox2(w)
-  button = Tk.messageBox('icon'=>$msgboxIcon.value, 'type'=>$msgboxType.value,
-                         'title'=>'Message', 'parent'=>w,
-                         'message'=>"\"#{$msgboxType.value}\" Type MessageBox",
-                         'detail'=>"This is a \"#{$msgboxType.value}\" type messagebox with the \"#{$msgboxIcon.value}\" icon. Please click one of the following button.")
-
-  Tk.messageBox('icon'=>'info', 'type'=>'ok', 'parent'=>w,
-                'message'=>"You have selected  \"#{button}\"")
-end
-
diff --git a/ext/tk/sample/demos-en/paned1.rb b/ext/tk/sample/demos-en/paned1.rb
deleted file mode 100644
index c14562a962..0000000000
--- a/ext/tk/sample/demos-en/paned1.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-# frozen_string_literal: false
-# paned1.rb
-#
-# This demonstration script creates a toplevel window containing
-# a paned window that separates two windows horizontally.
-#
-# based on "Id: paned1.tcl,v 1.1 2002/02/22 14:07:01 dkf Exp"
-
-if defined?($paned1_demo) && $paned1_demo
-  $paned1_demo.destroy
-  $paned1_demo = nil
-end
-
-$paned1_demo = TkToplevel.new {|w|
-  title("Horizontal Paned Window Demonstration")
-  iconname("paned1")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($paned1_demo).pack(:fill=>:both, :expand=>true)
-
-TkLabel.new(base_frame,
-            :font=>$font, :wraplength=>'4i', :justify=>:left,
-            :text=><<EOL).pack(:side=>:top)
-The sash between the two coloured windows below can be used to divide the area between them.  Use the left mouse button to resize without redrawing by just moving the sash, and use the middle mouse button to resize opaquely (always redrawing the windows in each position.)
-If your Tk library linked to Ruby doesn't include a 'panedwindow', this demo doesn't work. Please use later version of Tk which supports a 'panedwindow'.
-EOL
-
-# The bottom buttons
-TkFrame.new(base_frame){|f|
-  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
-
-  TkButton.new(f, :text=>'Dismiss', :width=>15, :command=>proc{
-                 $paned1_demo.destroy
-                 $paned1_demo = nil
-               }).pack(:side=>:left, :expand=>true)
-
-  TkButton.new(f, :text=>'See Code', :width=>15, :command=>proc{
-                 showCode 'paned1'
-               }).pack(:side=>:left, :expand=>true)
-}
-
-TkPanedwindow.new(base_frame, :orient=>:horizontal){|f|
-  add(Tk::Label.new(f, :text=>"This is the\nleft side", :bg=>'yellow'),
-      Tk::Label.new(f, :text=>"This is the\nright side", :bg=>'cyan'))
-
-  pack(:side=>:top, :expand=>true, :fill=>:both, :pady=>2, :padx=>'2m')
-}
diff --git a/ext/tk/sample/demos-en/paned2.rb b/ext/tk/sample/demos-en/paned2.rb
deleted file mode 100644
index 0c62235112..0000000000
--- a/ext/tk/sample/demos-en/paned2.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-# frozen_string_literal: false
-# paned2.rb --
-#
-# This demonstration script creates a toplevel window containing
-# a paned window that separates two windows vertically.
-#
-# based on "Id: paned2.tcl,v 1.1 2002/02/22 14:07:01 dkf Exp"
-
-if defined?($paned2_demo) && $paned2_demo
-  $paned2_demo.destroy
-  $paned2_demo = nil
-end
-
-$paned2_demo = TkToplevel.new {|w|
-  title("Vertical Paned Window Demonstration")
-  iconname("paned2")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($paned2_demo).pack(:fill=>:both, :expand=>true)
-
-TkLabel.new(base_frame,
-            :font=>$font, :wraplength=>'4i', :justify=>:left,
-            :text=><<EOL).pack(:side=>:top)
-The sash between the two scrolled windows below can be used to divide the area between them.  Use the left mouse button to resize without redrawing by just moving the sash, and use the middle mouse button to resize opaquely (always redrawing the windows in each position.)
-If your Tk library linked to Ruby doesn't include a 'panedwindow', this demo doesn't work. Please use later version of Tk which supports a 'panedwindow'.
-EOL
-
-# The bottom buttons
-TkFrame.new(base_frame){|f|
-  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
-
-  TkButton.new(f, :text=>'Dismiss', :width=>15, :command=>proc{
-                 $paned2_demo.destroy
-                 $paned2_demo = nil
-               }).pack(:side=>:left, :expand=>true)
-
-  TkButton.new(f, :text=>'See Code', :width=>15, :command=>proc{
-                 showCode 'paned2'
-               }).pack(:side=>:left, :expand=>true)
-}
-
-paneList = TkVariable.new  # define as normal variable (not array)
-paneList.value = [         # ruby's array --> tcl's list
-    'List of Ruby/Tk Widgets',
-    'TkButton',
-    'TkCanvas',
-    'TkCheckbutton',
-    'TkEntry',
-    'TkFrame',
-    'TkLabel',
-    'TkLabelframe',
-    'TkListbox',
-    'TkMenu',
-    'TkMenubutton',
-    'TkMessage',
-    'TkPanedwindow',
-    'TkRadiobutton',
-    'TkScale',
-    'TkScrollbar',
-    'TkSpinbox',
-    'TkText',
-    'TkToplevel'
-]
-
-# Create the pane itself
-TkPanedwindow.new(base_frame, :orient=>:vertical){|f|
-  pack(:side=>:top, :expand=>true, :fill=>:both, :pady=>2, :padx=>'2m')
-
-  add(TkFrame.new(f){|paned2_top|
-        TkListbox.new(paned2_top, :listvariable=>paneList) {
-          # Invert the first item to highlight it
-          itemconfigure(0, :background=>self.cget(:foreground),
-                           :foreground=>self.cget(:background) )
-          yscrollbar(TkScrollbar.new(paned2_top).pack(:side=>:right,
-                                                      :fill=>:y))
-          pack(:fill=>:both, :expand=>true)
-        }
-      },
-
-      TkFrame.new(f, :height=>120) {|paned2_bottom|
-        # The bottom window is a text widget with scrollbar
-        paned2_xscr = TkScrollbar.new(paned2_bottom)
-        paned2_yscr = TkScrollbar.new(paned2_bottom)
-        paned2_text = TkText.new(paned2_bottom, :width=>30, :wrap=>:non) {
-          insert('1.0', "This is just a normal text widget")
-          xscrollbar(paned2_xscr)
-          yscrollbar(paned2_yscr)
-        }
-        Tk.grid(paned2_text, paned2_yscr, :sticky=>'nsew')
-        Tk.grid(paned2_xscr, :sticky=>'nsew')
-        TkGrid.columnconfigure(paned2_bottom, 0, :weight=>1)
-        TkGrid.rowconfigure(paned2_bottom, 0, :weight=>1)
-      } )
-}
diff --git a/ext/tk/sample/demos-en/pendulum.rb b/ext/tk/sample/demos-en/pendulum.rb
deleted file mode 100644
index 833a31084f..0000000000
--- a/ext/tk/sample/demos-en/pendulum.rb
+++ /dev/null
@@ -1,241 +0,0 @@
-# frozen_string_literal: false
-#
-# This demonstration illustrates how Tcl/Tk can be used to construct
-# simulations of physical systems.
-# (called by 'widget')
-#
-# based on Tcl/Tk8.5a2 widget demos
-
-# destroy toplevel widget for this demo script
-if defined?($pendulum_demo) && $pendulum_demo
-  $pendulum_demo.destroy
-  $pendulum_demo = nil
-end
-
-# create toplevel widget
-$pendulum_demo = TkToplevel.new {|w|
-  title("Pendulum Animation Demonstration")
-  iconname("pendulum")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($pendulum_demo).pack(:fill=>:both, :expand=>true)
-
-# create label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text 'This demonstration shows how Ruby/Tk can be used to carry out animations that are linked to simulations of physical systems. In the left canvas is a graphical representation of the physical system itself, a simple pendulum, and in the right canvas is a graph of the phase space of the system, which is a plot of the angle (relative to the vertical) against the angular velocity. The pendulum bob may be repositioned by clicking and dragging anywhere on the left canvas.'
-}
-msg.pack('side'=>'top')
-
-# create frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $pendulum_demo
-      $pendulum_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'See Code'
-    command proc{showCode 'pendulum'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# animated wave
-class PendulumAnimationDemo
-  def initialize(frame)
-    # Create some structural widgets
-    @pane = TkPanedWindow.new(frame, :orient=>:horizontal).pack(:fill=>:both, :expand=>true)
-#    @pane.add(@lf1 = TkLabelFrame.new(@pane, :text=>'Pendulum Simulation'))
-#    @pane.add(@lf2 = TkLabelFrame.new(@pane, :text=>'Phase Space'))
-    @lf1 = TkLabelFrame.new(@pane, :text=>'Pendulum Simulation')
-    @lf2 = TkLabelFrame.new(@pane, :text=>'Phase Space')
-
-    # Create the canvas containing the graphical representation of the
-    # simulated system.
-    @c = TkCanvas.new(@lf1, :width=>320, :height=>200, :background=>'white',
-                      :borderwidth=>2, :relief=>:sunken)
-    TkcText.new(@c, 5, 5, :anchor=>:nw,
-                :text=>'Click to Adjust Bob Start Position')
-    # Coordinates of these items don't matter; they will be set properly below
-    @plate = TkcLine.new(@c, 0, 25, 320, 25, :width=>2, :fill=>'grey50')
-    @rod = TkcLine.new(@c, 1, 1, 1, 1, :width=>3, :fill=>'black')
-    @bob = TkcOval.new(@c, 1, 1, 2, 2,
-                       :width=>3, :fill=>'yellow', :outline=>'black')
-    TkcOval.new(@c, 155, 20, 165, 30, :fill=>'grey50', :outline=>'')
-
-    # pack
-    @c.pack(:fill=>:both, :expand=>true)
-
-    # Create the canvas containing the phase space graph; this consists of
-    # a line that gets gradually paler as it ages, which is an extremely
-    # effective visual trick.
-    @k = TkCanvas.new(@lf2, :width=>320, :height=>200, :background=>'white',
-                      :borderwidth=>2, :relief=>:sunken)
-    @y_axis = TkcLine.new(@k, 160, 200, 160, 0, :fill=>'grey75', :arrow=>:last)
-    @x_axis = TkcLine.new(@k, 0, 100, 320, 100, :fill=>'grey75', :arrow=>:last)
-
-    @graph = {}
-    90.step(0, -10){|i|
-      # Coordinates of these items don't matter;
-      # they will be set properly below
-      @graph[i] = TkcLine.new(@k, 0, 0, 1, 1, :smooth=>true, :fill=>"grey#{i}")
-    }
-
-    # labels
-    @label_theta = TkcText.new(@k, 0, 0, :anchor=>:ne,
-                               :text=>'q', :font=>'Symbol 8')
-    @label_dtheta = TkcText.new(@k, 0, 0, :anchor=>:ne,
-                               :text=>'dq', :font=>'Symbol 8')
-
-    # pack
-    @k.pack(:fill=>:both, :expand=>true)
-
-    # Initialize some variables
-    @points = []
-    @theta = 45.0
-    @dTheta = 0.0
-    @length = 150
-
-    # animation loop
-    @timer = TkTimer.new(15){ repeat }
-
-    # binding
-    @c.bindtags_unshift(btag = TkBindTag.new)
-    btag.bind('Destroy'){ @timer.stop }
-    btag.bind('1', proc{|x, y| @timer.stop; showPendulum(x.to_i, y.to_i)},
-              '%x %y')
-    btag.bind('B1-Motion', proc{|x, y| showPendulum(x.to_i, y.to_i)}, '%x %y')
-    btag.bind('ButtonRelease-1',
-              proc{|x, y| showPendulum(x.to_i, y.to_i); @timer.start },
-              '%x %y')
-
-    btag.bind('Configure', proc{|w| @plate.coords(0, 25, w.to_i, 25)}, '%w')
-
-    @k.bind('Configure', proc{|h, w|
-              h = h.to_i
-              w = w.to_i
-              @psh = h/2;
-              @psw = w/2
-              @x_axis.coords(2, @psh, w-2, @psh)
-              @y_axis.coords(@psw, h-2, @psw, 2)
-              @label_theta.coords(@psw-4, 6)
-              @label_dtheta.coords(w-6, @psh+4)
-            }, '%h %w')
-
-    # add
-    Tk.update
-    @pane.add(@lf1)
-    @pane.add(@lf2)
-
-    # init display
-    showPendulum
-
-    # animation start
-    @timer.start(500)
-  end
-
-  # This procedure makes the pendulum appear at the correct place on the
-  # canvas. If the additional arguments x, y are passed instead of computing
-  # the position of the pendulum from the length of the pendulum rod and its
-  # angle, the length and angle are computed in reverse from the given
-  # location (which is taken to be the centre of the pendulum bob.)
-  def showPendulum(x=nil, y=nil)
-    if x && y && (x != 160 || y != 25)
-      @dTheta = 0.0
-      x2 = x - 160
-      y2 = y - 25
-      @length = Math.hypot(x2, y2)
-      @theta = Math.atan2(x2,y2)*180/Math::PI
-    else
-      angle = @theta*Math::PI/180
-      x = 160 + @length*Math.sin(angle)
-      y = 25 + @length*Math.cos(angle)
-    end
-
-    @rod.coords(160, 25, x, y)
-    @bob.coords(x-15, y-15, x+15, y+15)
-  end
-
-  # Update the phase-space graph according to the current angle and the
-  # rate at which the angle is changing (the first derivative with
-  # respect to time.)
-  def showPhase
-    unless @psw && @psh
-      @psw = @k.width/2
-      @psh = @k.height/2
-    end
-    @points << @theta + @psw << -20*@dTheta + @psh
-    if @points.length > 100
-      @points = @points[-100..-1]
-    end
-    (0...100).step(10){|i|
-      first = - i
-      last = 11 - i
-      last = -1 if last >= 0
-      next if first > last
-      lst = @points[first..last]
-      @graph[i].coords(lst) if lst && lst.length >= 4
-    }
-  end
-
-  # This procedure is the "business" part of the simulation that does
-  # simple numerical integration of the formula for a simple rotational
-  # pendulum.
-  def recomputeAngle
-    scaling = 3000.0/@length/@length
-
-    # To estimate the integration accurately, we really need to
-    # compute the end-point of our time-step.  But to do *that*, we
-    # need to estimate the integration accurately!  So we try this
-    # technique, which is inaccurate, but better than doing it in a
-    # single step.  What we really want is bound up in the
-    # differential equation:
-    #       ..             - sin theta
-    #      theta + theta = -----------
-    #                         length
-    # But my math skills are not good enough to solve this!
-
-    # first estimate
-    firstDDTheta = -Math.sin(@theta * Math::PI/180) * scaling
-    midDTheta = @dTheta + firstDDTheta
-    midTheta = @theta + (@dTheta + midDTheta)/2
-    # second estimate
-    midDDTheta = -Math.sin(midTheta * Math::PI/180) * scaling
-    midDTheta = @dTheta + (firstDDTheta + midDDTheta)/2
-    midTheta = @theta + (@dTheta + midDTheta)/2
-    # Now we do a double-estimate approach for getting the final value
-    # first estimate
-    midDDTheta = -Math.sin(midTheta * Math::PI/180) * scaling
-    lastDTheta = midDTheta + midDDTheta
-    lastTheta = midTheta + (midDTheta+ lastDTheta)/2
-    # second estimate
-    lastDDTheta = -Math.sin(lastTheta * Math::PI/180) * scaling
-    lastDTheta = midDTheta + (midDDTheta + lastDDTheta)/2
-    lastTheta = midTheta + (midDTheta + lastDTheta)/2
-    # Now put the values back in our globals
-    @dTheta = lastDTheta
-    @theta = lastTheta
-  end
-
-  # This method ties together the simulation engine and the graphical
-  # display code that visualizes it.
-  def repeat
-    # Simulate
-    recomputeAngle
-
-    # Update the display
-    showPendulum
-    showPhase
-  end
-end
-
-# Start the animation processing
-PendulumAnimationDemo.new(base_frame)
diff --git a/ext/tk/sample/demos-en/plot.rb b/ext/tk/sample/demos-en/plot.rb
deleted file mode 100644
index 786695a85c..0000000000
--- a/ext/tk/sample/demos-en/plot.rb
+++ /dev/null
@@ -1,125 +0,0 @@
-# frozen_string_literal: false
-# plot.rb
-#
-# This demonstration script creates a canvas widget showing a 2-D
-# plot with data points that can be dragged with the mouse.
-#
-# 2-D plot widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($plot_demo) && $plot_demo
-  $plot_demo.destroy
-  $plot_demo = nil
-end
-
-# demo toplevel widget
-$plot_demo = TkToplevel.new {|w|
-  title("Plot Demonstration")
-  iconname("Plot")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($plot_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'4i', 'justify'=>'left',
-            'text'=>"This window displays a canvas widget containing a simple 2-dimensional plot.  You can doctor the data by dragging any of the points with mouse button 1."){
-  pack('side'=>'top')
-}
-
-# frame
-$plot_buttons = TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $plot_demo
-      $plot_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'plot'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$plot_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# font
-plotFont = '-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*'
-
-# canvas
-$plot_canvas = TkCanvas.new(base_frame,'relief'=>'raised','width'=>450,'height'=>300)
-$plot_canvas.pack('side'=>'top', 'fill'=>'x')
-
-# plot
-TkcLine.new($plot_canvas, 100, 250, 400, 250, 'width'=>2)
-TkcLine.new($plot_canvas, 100, 250, 100,  50, 'width'=>2)
-TkcText.new($plot_canvas, 225, 20,
-            'text'=>"A Simple Plot", 'font'=>plotFont, 'fill'=>'brown')
-
-(0..10).each {|i|
-  x = 100 + (i * 30)
-  TkcLine.new($plot_canvas, x, 250, x, 245, 'width'=>2)
-  TkcText.new($plot_canvas, x, 254,
-              'text'=>10*i, 'font'=>plotFont, 'anchor'=>'n')
-}
-(0..5).each {|i|
-  y = 250 - (i * 40)
-  TkcLine.new($plot_canvas, 100, y, 105, y, 'width'=>2)
-  TkcText.new($plot_canvas, 96, y,
-              'text'=>"#{i*50}.0", 'font'=>plotFont, 'anchor'=>'e')
-}
-
-for xx, yy in [[12,56],[20,94],[33,98],[32,120],[61,180],[75,160],[98,223]]
-  x = 100 + (3*xx)
-  y = 250 - (4*yy)/5
-  item = TkcOval.new($plot_canvas, x-6, y-6, x+6, y+6,
-                     'width'=>1, 'outline'=>'black', 'fill'=>'SkyBlue2')
-  item.addtag 'point'
-end
-
-$plot_canvas.itembind('point', 'Any-Enter',
-                      proc{$plot_canvas.itemconfigure 'current','fill','red'})
-$plot_canvas.itembind('point', 'Any-Leave',
-                      proc{$plot_canvas.itemconfigure 'current','fill','SkyBlue2'})
-$plot_canvas.itembind('point', '1',
-                      proc{|x,y| plotDown $plot_canvas,x,y}, "%x %y")
-$plot_canvas.itembind('point', 'ButtonRelease-1',
-                      proc{$plot_canvas.dtag 'selected'})
-$plot_canvas.bind('B1-Motion',
-                  proc{|x,y| plotMove $plot_canvas,x,y}, "%x %y")
-
-$plot = {'lastX'=>0, 'lastY'=>0}
-
-# plotDown --
-# This method is invoked when the mouse is pressed over one of the
-# data points.  It sets up state to allow the point to be dragged.
-#
-# Arguments:
-# w -           The canvas window.
-# x, y -        The coordinates of the mouse press.
-
-def plotDown (w, x, y)
-  w.dtag 'selected'
-  w.addtag_withtag 'selected', 'current'
-  w.raise 'current'
-  $plot['lastX'] = x
-  $plot['lastY'] = y
-end
-
-# plotMove --
-# This method is invoked during mouse motion events.  It drags the
-# current item.
-#
-# Arguments:
-# w -           The canvas window.
-# x, y -        The coordinates of the mouse.
-
-def plotMove (w, x, y)
-  w.move 'selected', x - $plot['lastX'], y - $plot['lastY']
-  $plot['lastX'] = x
-  $plot['lastY'] = y
-end
-
diff --git a/ext/tk/sample/demos-en/puzzle.rb b/ext/tk/sample/demos-en/puzzle.rb
deleted file mode 100644
index edefa66d73..0000000000
--- a/ext/tk/sample/demos-en/puzzle.rb
+++ /dev/null
@@ -1,135 +0,0 @@
-# frozen_string_literal: false
-# puzzle.rb
-#
-# This demonstration script creates a 15-puzzle game using a collection
-# of buttons.
-#
-# widget demo 'puzzle' (called by 'widget')
-#
-
-# toplevel widget
-if defined?($puzzle_demo) && $puzzle_demo
-  $puzzle_demo.destroy
-  $puzzle_demo = nil
-end
-
-# demo toplevel widget
-$puzzle_demo = TkToplevel.new {|w|
-  title("15-Puzzle Demonstration")
-  iconname("15-Puzzle")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($puzzle_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "A 15-puzzle appears below as a collection of buttons.  Click on any of the pieces next to the space, and that piece will slide over the space.  Continue this until the pieces are arranged in numerical order from upper-left to lower-right."
-}
-msg.pack('side'=>'top')
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $puzzle_demo
-      $puzzle_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'puzzle'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-
-# Special trick: select a darker color for the space by creating a
-# scrollbar widget and using its trough color.
-begin
-  if Tk.windowingsystem() == 'aqua'
-    frameWidth  = 168
-    frameHeight = 168
-  elsif Tk.default_widget_set == :Ttk
-    frameWidth  = 148
-    frameHeight = 124
-  else
-    frameWidth  = 120
-    frameHeight = 120
-  end
-rescue
-  frameWidth  = 120
-  frameHeight = 120
-end
-
-# depend_on_button_width = true
-depend_on_button_width = false
-
-s = TkScrollbar.new(base_frame)
-base = TkFrame.new(base_frame) {
-  width  frameWidth
-  height frameHeight
-  borderwidth 2
-  relief 'sunken'
-  bg s['troughcolor']
-}
-s.destroy
-base.pack('side'=>'top', 'padx'=>'1c', 'pady'=>'1c')
-
-def def_puzzleswitch_proc(w, num)
-  proc{puzzleSwitch w, num}
-end
-
-$xpos = {}
-$ypos = {}
-order = [3,1,6,2,5,7,15,13,4,11,8,9,14,10,12]
-(0..14).each{|i|
-  num = order[i]
-  $xpos[num] = (i % 4) * 0.25
-  $ypos[num] = (i / 4) * 0.25
-  TkButton.new(base) {|w|
-    relief 'raised'
-    text num
-    highlightthickness 0
-    command def_puzzleswitch_proc(w, num)
-    if depend_on_button_width && (w.winfo_reqwidth * 4 > base.width)
-      base.width = w.winfo_reqwidth * 4
-    end
-  }.place('relx'=>$xpos[num], 'rely'=>$ypos[num],
-          'relwidth'=>0.25, 'relheight'=>0.25)
-}
-$xpos['space'] = 0.75
-$ypos['space'] = 0.75
-
-
-# puzzleSwitch --
-# This procedure is invoked when the user clicks on a particular button;
-# if the button is next to the empty space, it moves the button into the
-# empty space.
-
-def puzzleSwitch(w, num)
-  if ( ($ypos[num] >= ($ypos['space'] - 0.01))     \
-      && ($ypos[num] <= ($ypos['space'] + 0.01))   \
-      && ($xpos[num] >= ($xpos['space'] - 0.26))   \
-      && ($xpos[num] <= ($xpos['space'] + 0.26)))  \
-    || (($xpos[num] >= ($xpos['space'] - 0.01))    \
-        && ($xpos[num] <= ($xpos['space'] + 0.01)) \
-        && ($ypos[num] >= ($ypos['space'] - 0.26)) \
-        && ($ypos[num] <= ($ypos['space'] + 0.26)))
-    tmp = $xpos['space']
-    $xpos['space'] = $xpos[num]
-    $xpos[num] = tmp
-    tmp = $ypos['space']
-    $ypos['space'] = $ypos[num]
-    $ypos[num] = tmp
-    w.place('relx'=>$xpos[num], 'rely'=>$ypos[num])
-  end
-end
-
diff --git a/ext/tk/sample/demos-en/radio.rb b/ext/tk/sample/demos-en/radio.rb
deleted file mode 100644
index d6b3ffbcbe..0000000000
--- a/ext/tk/sample/demos-en/radio.rb
+++ /dev/null
@@ -1,87 +0,0 @@
-# frozen_string_literal: false
-# radio.rb
-#
-# This demonstration script creates a toplevel window containing
-# several radiobutton widgets.
-#
-# radiobutton widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($radio_demo) && $radio_demo
-  $radio_demo.destroy
-  $radio_demo = nil
-end
-
-# demo toplevel widget
-$radio_demo = TkToplevel.new {|w|
-  title("Radiobutton Demonstration")
-  iconname("radio")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($radio_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "Two groups of radiobuttons are displayed below.  If you click on a button then the button will become selected exclusively among all the buttons in its group.  A Tcl variable is associated with each group to indicate which of the group's buttons is selected.  Click the \"See Variables\" button to see the current values of the variables."
-}
-msg.pack('side'=>'top')
-
-#
-size = TkVariable.new
-color = TkVariable.new
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $radio_demo
-      $radio_demo = nil
-      $showVarsWin[tmppath.path] = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'radio'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'See Variables'
-    command proc{
-      showVars(base_frame, ['size', size], ['color', color])
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-f_left = TkFrame.new(base_frame)
-f_right = TkFrame.new(base_frame)
-f_left.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
-f_right.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
-
-# radiobutton
-[10, 12, 18, 24].each {|sz|
-  TkRadioButton.new(f_left) {
-    text "Point Size #{sz}"
-    variable size
-    relief 'flat'
-    value sz
-  }.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w')
-}
-
-['Red', 'Green', 'Blue', 'Yellow', 'Orange', 'Purple'].each {|col|
-  TkRadioButton.new(f_right) {
-    text col
-    variable color
-    relief 'flat'
-    value col.downcase
-  }.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w')
-}
-
diff --git a/ext/tk/sample/demos-en/radio2.rb b/ext/tk/sample/demos-en/radio2.rb
deleted file mode 100644
index ece7cfdf08..0000000000
--- a/ext/tk/sample/demos-en/radio2.rb
+++ /dev/null
@@ -1,110 +0,0 @@
-# frozen_string_literal: false
-# radio2.rb
-#
-# This demonstration script creates a toplevel window containing
-# several radiobutton widgets.
-#
-# radiobutton widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($radio2_demo) && $radio2_demo
-  $radio2_demo.destroy
-  $radio2_demo = nil
-end
-
-# demo toplevel widget
-$radio2_demo = TkToplevel.new {|w|
-  title("Radiobutton Demonstration 2")
-  iconname("radio2")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($radio2_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '5i'
-  justify 'left'
-  text "Three groups of radiobuttons are displayed below.  If you click on a button then the button will become selected exclusively among all the buttons in its group.  A Tcl variable is associated with each group to indicate which of the group's buttons is selected.  Click the \"See Variables\" button to see the current values of the variables."
-}
-msg.pack('side'=>'top')
-
-#
-size = TkVariable.new
-color = TkVariable.new
-align = TkVariable.new
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $radio2_demo
-      $radio2_demo = nil
-      $showVarsWin[tmppath.path] = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'radio2'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'See Variables'
-    command proc{
-      showVars(base_frame,
-               ['size', size], ['color', color], ['compound', align])
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-f_left  = TkLabelFrame.new(base_frame, 'text'=>'Point Size',
-                           'pady'=>2, 'padx'=>2)
-f_mid   = TkLabelFrame.new(base_frame, 'text'=>'Color',
-                           'pady'=>2, 'padx'=>2)
-f_right = TkLabelFrame.new(base_frame, 'text'=>'Alignment',
-                           'pady'=>2, 'padx'=>2)
-f_left.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
-f_mid.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
-f_right.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
-
-# radiobutton
-[10, 12, 18, 24].each {|sz|
-  TkRadioButton.new(f_left) {
-    text "Point Size #{sz}"
-    variable size
-    relief 'flat'
-    value sz
-  }.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w', 'fill'=>'x')
-}
-
-['Red', 'Green', 'Blue', 'Yellow', 'Orange', 'Purple'].each {|col|
-  TkRadioButton.new(f_mid) {
-    text col
-    variable color
-    relief 'flat'
-    value col.downcase
-    anchor 'w'
-  }.pack('side'=>'top', 'pady'=>2, 'fill'=>'x')
-}
-
-# label = TkLabel.new(f_right, 'text'=>'Label', 'bitmap'=>'questhead',
-label = Tk::Label.new(f_right, 'text'=>'Label', 'bitmap'=>'questhead',
-                    'compound'=>'left')
-label.configure('width'=>TkWinfo.reqwidth(label), 'compound'=>'top')
-label.height(TkWinfo.reqheight(label))
-abtn = ['Top', 'Left', 'Right', 'Bottom'].collect{|a|
-  lower = a.downcase
-  TkRadioButton.new(f_right, 'text'=>a, 'variable'=>align, 'relief'=>'flat',
-                    'value'=>lower, 'indicatoron'=>0, 'width'=>7,
-                    'command'=>proc{label.compound(align.value)})
-}
-
-Tk.grid('x', abtn[0])
-Tk.grid(abtn[1], label, abtn[2])
-Tk.grid('x', abtn[3])
diff --git a/ext/tk/sample/demos-en/radio3.rb b/ext/tk/sample/demos-en/radio3.rb
deleted file mode 100644
index d1629c884e..0000000000
--- a/ext/tk/sample/demos-en/radio3.rb
+++ /dev/null
@@ -1,118 +0,0 @@
-# frozen_string_literal: false
-# radio3.rb
-#
-# This demonstration script creates a toplevel window containing
-# several radiobutton widgets.
-#
-# radiobutton widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($radio3_demo) && $radio3_demo
-  $radio3_demo.destroy
-  $radio3_demo = nil
-end
-
-# demo toplevel widget
-$radio3_demo = TkToplevel.new {|w|
-  title("Radiobutton Demonstration 3")
-  iconname("radio3")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($radio3_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '5i'
-  justify 'left'
-  text "Three groups of radiobuttons are displayed below.  If you click on a button then the button will become selected exclusively among all the buttons in its group.  A Tcl variable is associated with each group to indicate which of the group's buttons is selected.  When the 'Tristate' button is pressed, the radio buttons will display the tri-state mode. Selecting any radio button will return the buttons to their respective on/off state. Click the \"See Variables\" button to see the current values of the variables."
-}
-msg.grid(:row=>0, :column=>0, :columnspan=>3, :sticky=>'nsew')
-
-# variable
-size = TkVariable.new
-color = TkVariable.new
-align = TkVariable.new
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2),
-         :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         TkButton.new(frame, :text=>'See Variables',
-                      :image=>$image['view'], :compound=>:left,
-                      :command=>proc{
-                        showVars(base_frame, ['size', size],
-                                 ['color', color], ['compound', align])
-                      }),
-         TkButton.new(frame, :text=>'See Code',
-                      :image=>$image['view'], :compound=>:left,
-                      :command=>proc{showCode 'radio3'}),
-         TkButton.new(frame, :text=>'Dismiss',
-                      :image=>$image['delete'], :compound=>:left,
-                      :command=>proc{
-                        tmppath = $radio3_demo
-                        $radio3_demo = nil
-                        $showVarsWin[tmppath.path] = nil
-                        tmppath.destroy
-                      }),
-         :padx=>4, :pady=>4)
-  frame.grid_columnconfigure(0, :weight=>1)
-  TkGrid(frame, :row=>3, :column=>0, :columnspan=>3, :sticky=>'nsew')
-}
-
-# frame
-f_left  = TkLabelFrame.new(base_frame, 'text'=>'Point Size',
-                           'pady'=>2, 'padx'=>2)
-f_mid   = TkLabelFrame.new(base_frame, 'text'=>'Color',
-                           'pady'=>2, 'padx'=>2)
-f_right = TkLabelFrame.new(base_frame, 'text'=>'Alignment',
-                           'pady'=>2, 'padx'=>2)
-f_left .grid('column'=>0, 'row'=>1, 'pady'=>'.5c', 'padx'=>'.5c', 'rowspan'=>2)
-f_mid  .grid('column'=>1, 'row'=>1, 'pady'=>'.5c', 'padx'=>'.5c', 'rowspan'=>2)
-f_right.grid('column'=>2, 'row'=>1, 'pady'=>'.5c', 'padx'=>'.5c')
-
-TkButton.new(base_frame, 'text'=>'Tristate',
-             'command'=>proc{size.value = 'multi'; color.value = 'multi'}){
-  grid('column'=>2, 'row'=>2, 'pady'=>'.5c', 'padx'=>'.5c')
-}
-
-# radiobutton
-[10, 12, 14, 18, 24].each {|sz|
-  TkRadioButton.new(f_left) {
-    text "Point Size #{sz}"
-    variable size
-    relief 'flat'
-    value sz
-    tristatevalue 'multi'
-  }.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w', 'fill'=>'x')
-}
-
-['Red', 'Green', 'Blue', 'Yellow', 'Orange', 'Purple'].each {|col|
-  TkRadioButton.new(f_mid) {
-    text col
-    variable color
-    relief 'flat'
-    value col.downcase
-    anchor 'w'
-    tristatevalue 'multi'
-    command proc{f_mid.fg(color.value)}
-  }.pack('side'=>'top', 'pady'=>2, 'fill'=>'x')
-}
-
-# label = TkLabel.new(f_right, 'text'=>'Label', 'bitmap'=>'questhead',
-label = Tk::Label.new(f_right, 'text'=>'Label', 'bitmap'=>'questhead',
-                    'compound'=>'left')
-label.configure('width'=>TkWinfo.reqwidth(label), 'compound'=>'top')
-label.height(TkWinfo.reqheight(label))
-a_btn = ['Top', 'Left', 'Right', 'Bottom'].collect{|a|
-  TkRadioButton.new(f_right, 'text'=>a, 'variable'=>align, 'relief'=>'flat',
-                    'value'=>a.downcase, 'indicatoron'=>0, 'width'=>7,
-                    'command'=>proc{label.compound(align.value)})
-}
-
-Tk.grid('x', a_btn[0])
-Tk.grid(a_btn[1], label, a_btn[2])
-Tk.grid('x', a_btn[3])
diff --git a/ext/tk/sample/demos-en/rmt b/ext/tk/sample/demos-en/rmt
deleted file mode 100644
index dcfb328fc8..0000000000
--- a/ext/tk/sample/demos-en/rmt
+++ /dev/null
@@ -1,268 +0,0 @@
-#!/usr/bin/env ruby
-
-# rmt --
-# This script implements a simple remote-control mechanism for
-# Tk applications.  It allows you to select an application and
-# then type commands to that application.
-
-require 'tk'
-
-class Rmt
-  def initialize(parent=nil)
-    win = self
-
-    unless parent
-      parent = TkRoot.new
-    end
-    root = TkWinfo.toplevel(parent)
-    root.minsize(1,1)
-
-    # The instance variable below keeps track of the remote application
-    # that we're sending to.  If it's an empty string then we execute
-    # the commands locally.
-    @app = 'local'
-    @mode = 'Ruby'
-
-    # The instance variable below keeps track of whether we're in the
-    # middle of executing a command entered via the text.
-    @executing = 0
-
-    # The instance variable below keeps track of the last command executed,
-    # so it can be re-executed in response to !! commands.
-    @lastCommand = ""
-
-    # Create menu bar.  Arrange to recreate all the information in the
-    # applications sub-menu whenever it is cascaded to.
-
-    TkFrame.new(root, 'relief'=>'raised', 'bd'=>2) {|f|
-      pack('side'=>'top', 'fill'=>'x')
-      TkMenubutton.new(f, 'text'=>'File', 'underline'=>0) {|mb|
-	TkMenu.new(mb) {|mf|
-	  mb.menu(mf)
-	  TkMenu.new(mf) {|ma|
-	    postcommand proc{win.fillAppsMenu ma}
-	    mf.add('cascade', 'label'=>'Select Application',
-		   'menu'=>ma, 'underline'=>0)
-	  }
-	  add('command', 'label'=>'Quit',
-	      'command'=>proc{root.destroy}, 'underline'=>0)
-	}
-	pack('side'=>'left')
-      }
-    }
-
-    # Create text window and scrollbar.
-
-    @txt = TkText.new(root, 'relief'=>'sunken', 'bd'=>2, 'setgrid'=>true) {
-      yscrollbar(TkScrollbar.new(root){pack('side'=>'right', 'fill'=>'y')})
-      pack('side'=>'left')
-    }
-
-    @promptEnd = TkTextMark.new(@txt, 'insert')
-
-    # Create a binding to forward commands to the target application,
-    # plus modify many of the built-in bindings so that only information
-    # in the current command can be deleted (can still set the cursor
-    # earlier in the text and select and insert;  just can't delete).
-
-    @txt.bindtags([@txt, TkText, root, 'all'])
-    @txt.bind('Return', proc{
-		@txt.set_insert('end - 1c')
-		@txt.insert('insert', "\n")
-		win.invoke
-		Tk.callback_break
-	      })
-    @txt.bind('Delete', proc{
-		begin
-		  @txt.tag_remove('sel', 'sel.first', @promptEnd)
-		rescue
-		end
-		if @txt.tag_nextrange('sel', '1.0', 'end') == []
-		  if @txt.compare('insert', '<', @promptEnd)
-		    Tk.callback_break
-		  end
-		end
-	      })
-    @txt.bind('BackSpace', proc{
-		begin
-		  @txt.tag_remove('sel', 'sel.first', @promptEnd)
-		rescue
-		end
-		if @txt.tag_nextrange('sel', '1.0', 'end') == []
-		  if @txt.compare('insert', '<', @promptEnd)
-		    Tk.callback_break
-		  end
-		end
-	      })
-    @txt.bind('Control-d', proc{
-		if @txt.compare('insert', '<', @promptEnd)
-		  Tk.callback_break
-		end
-	      })
-    @txt.bind('Control-k', proc{
-		if @txt.compare('insert', '<', @promptEnd)
-		  @txt.set_insert(@promptEnd)
-		end
-	      })
-    @txt.bind('Control-t', proc{
-		if @txt.compare('insert', '<', @promptEnd)
-		  Tk.callback_break
-		end
-	      })
-    @txt.bind('Meta-d', proc{
-		if @txt.compare('insert', '<', @promptEnd)
-		  Tk.callback_break
-		end
-	      })
-    @txt.bind('Meta-BackSpace', proc{
-		if @txt.compare('insert', '<=', @promptEnd)
-		  Tk.callback_break
-		end
-	      })
-    @txt.bind('Control-h', proc{
-		if @txt.compare('insert', '<=', @promptEnd)
-		  Tk.callback_break
-		end
-	      })
-
-    @txt.tag_configure('bold', 'font'=>['Courier', 12, 'bold'])
-
-    @app = Tk.appname('rmt')
-    if (@app =~ /^rmt(.*)$/)
-      root.title("Tk Remote Controller#{$1}")
-      root.iconname("Tk Remote#{$1}")
-    end
-    prompt
-    @txt.focus
-    #@app = TkWinfo.appname(TkRoot.new)
-  end
-
-  def tkTextInsert(w,s)
-    return if s == ""
-    begin
-      if w.compare('sel.first','<=','insert') \
-	&& w.compare('sel.last','>=','insert')
-	w.tag_remove('sel', 'sel.first', @promptEnd)
-	w.delete('sel.first', 'sel.last')
-      end
-    rescue
-    end
-    w.insert('insert', s)
-    w.see('insert')
-  end
-
-  # The method below is used to print out a prompt at the
-  # insertion point (which should be at the beginning of a line
-  # right now).
-
-  def prompt
-    @txt.insert('insert', "#{@app}: ")
-    @promptEnd.set('insert')
-    @promptEnd.gravity = 'left'
-    @txt.tag_add('bold', "#{@promptEnd.path} linestart", @promptEnd)
-  end
-
-  # The method below executes a command (it takes everything on the
-  # current line after the prompt and either sends it to the remote
-  # application or executes it locally, depending on "app".
-
-  def invoke
-    cmd = @txt.get(@promptEnd, 'insert')
-    @executing += 1
-    case (@mode)
-    when 'Tcl'
-      if Tk.info('complete', cmd)
-	if (cmd == "!!\n")
-	  cmd = @lastCommand
-	else
-	  @lastCommand = cmd
-	end
-	begin
-	  msg = Tk.appsend(@app, false, cmd)
-	rescue
-	  msg = "Error: #{$!}"
-	end
-	@txt.insert('insert', msg + "\n") if msg != ""
-	prompt
-	@promptEnd.set('insert')
-      end
-
-    when 'Ruby'
-      if (cmd == "!!\n")
-	cmd = @lastCommand
-      end
-      complete = true
-      begin
-	eval("proc{#{cmd}}")
-      rescue
-	complete = false
-      end
-      if complete
-	@lastCommand = cmd
-	begin
-#	  msg = Tk.appsend(@app, false,
-#			   'ruby',
-#			   '"(' + cmd.gsub(/[][$"]/, '\\\\\&') + ').to_s"')
-	  msg = Tk.rb_appsend(@app, false, cmd)
-	rescue
-	  msg = "Error: #{$!}"
-	end
-	@txt.insert('insert', msg + "\n") if msg != ""
-	prompt
-	@promptEnd.set('insert')
-      end
-    end
-
-    @executing -= 1
-    @txt.yview_pickplace('insert')
-  end
-
-  # The following method is invoked to change the application that
-  # we're talking to.  It also updates the prompt for the current
-  # command, unless we're in the middle of executing a command from
-  # the text item (in which case a new prompt is about to be output
-  # so there's no need to change the old one).
-
-  def newApp(appName, mode)
-    @app = appName
-    @mode = mode
-    if @executing == 0
-      @promptEnd.gravity = 'right'
-      @txt.delete("#{@promptEnd.path} linestart", @promptEnd)
-      @txt.insert(@promptEnd, "#{appName}: ")
-      @txt.tag_add('bold', "#{@promptEnd.path} linestart", @promptEnd)
-      @promptEnd.gravity = 'left'
-    end
-  end
-
-  # The method below will fill in the applications sub-menu with a list
-  # of all the applications that currently exist.
-
-  def fillAppsMenu(menu)
-    win = self
-    begin
-      menu.delete(0,'last')
-    rescue
-    end
-    TkWinfo.interps.sort.each{|ip|
-      begin
-	if Tk.appsend(ip, false, 'info commands ruby') == ""
-	  mode = 'Tcl'
-	else
-	  mode = 'Ruby'
-	end
-	menu.add('command', 'label'=>format("%s    (#{mode}/Tk)", ip),
-		 'command'=>proc{win.newApp ip, mode})
-      rescue
-	menu.add('command', 'label'=>format("%s (unknown Tk)", ip),
-		 'command'=>proc{win.newApp ip, mode}, 'state'=>'disabled')
-      end
-    }
-    menu.add('command', 'label'=>format("local    (Ruby/Tk)"),
-	     'command'=>proc{win.newApp 'local', 'Ruby'})
-  end
-end
-
-Rmt.new
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-en/rolodex b/ext/tk/sample/demos-en/rolodex
deleted file mode 100644
index b4c42b6199..0000000000
--- a/ext/tk/sample/demos-en/rolodex
+++ /dev/null
@@ -1,320 +0,0 @@
-#!/usr/bin/env ruby
-#
-# rolodex --
-# This script is a part of Tom LaStrange's rolodex
-#
-# Copyright (C) 1998 by Takaaki Tateishi <ttate@jaist.ac.jp>
-# Time-stamp: "03/08/02 06:23:06 nagai"
-#
-
-require "tk"
-
-
-def show_help(topic,x=0,y=0)
-  if( topic.is_a?(TkWindow) )
-    w = TkWinfo.containing(x,y)
-    if( TkWinfo.exist?(w) )
-      topic = w
-    end
-  end
-
-  if( $helpTopics.include?(topic) )
-    msg = $helpTopics[topic]
-  else
-    msg = "Sorry, but no help is available for this topic"
-  end
-  TkDialog.new("title"=>"Rolodex Help",
-	       "message"=>"Information on #{topic}:\n\n#{msg}",
-	       "default_button"=>0,
-	       "buttons"=>["OK"])
-end
-
-def fillCard
-  clearAction
-  $root.frame.entry[1].insert(0,"Takaaki Tateishi")
-  $root.frame.entry[2].insert(0,"Japan Advanced Institute of Science and Techonology")
-  $root.frame.entry[3].insert(0,"1-1 Asahidai, Tatsunokuchi")
-  $root.frame.entry[4].insert(0,"Ishikawa 923-1292, Japan")
-  $root.frame.entry[5].insert(0,"private")
-    $root.frame.entry[6].insert(0,"***-***-****")
-  $root.frame.entry[7].insert(0,"***-***-****")
-end
-
-def addAction
-  for i in 1..7
-    STDERR.print format("%-12s %s\n",
-			RolodexFrame::LABEL[i],
-			$root.frame.entry[i].value)
-  end
-end
-
-def clearAction
-  for i in 1..7
-    $root.frame.entry[i].delete(0,"end")
-  end
-end
-
-def fileAction
-  TkDialog.new("title"=>"File Selection",
-	       "message"=>"This is a dummy file selection dialog box.\n",
-	       "default_button"=>0,
-	       "buttons"=>["OK"])
-  STDERR.print "dummy file name\n"
-end
-
-def deleteAction
-  result = TkDialog.new("title"=>"Confirm Action",
-			"message"=>"Are you sure?",
-			"default_button"=>0,
-			"buttons"=>["Cancel"])
-  if( result.value == 0 )
-    clearAction
-  end
-end
-
-
-class RolodexFrame < TkFrame
-  attr_reader :entry, :label
-
-  LABEL = ["","Name:","Address:","","","Home Phone:","Work Phone:","Fax:"]
-
-  def initialize(parent=nil,keys=nil)
-    super(parent,keys)
-    self["relief"] = "flat"
-
-    @i = []
-    @label = []
-    @entry = []
-    for i in 1..7
-      @i[i] = TkFrame.new(self)
-      @i[i].pack("side"=>"top",
-		 "pady"=>2,
-		 "anchor"=>"e")
-      @label[i] = TkLabel.new(@i[i],
-			      "text"=>LABEL[i],
-			      "anchor"=>"e")
-      @entry[i] = TkEntry.new(@i[i],
-			      "width"=>30,
-			      "relief"=>"sunken")
-      @entry[i].pack("side"=>"right")
-      @label[i].pack("side"=>"right")
-    end
-  end
-end
-
-class RolodexButtons < TkFrame
-  attr_reader :clear, :add, :search, :delete
-
-  def initialize(parent,keys=nil)
-    super(parent,keys)
-    @clear = TkButton.new(self,
-			  "text" => "Clear")
-    @add = TkButton.new(self,
-			"text" => "Add")
-    @search = TkButton.new(self,
-			   "text" => "Search")
-    @delete = TkButton.new(self,
-			   "text" => "Delete")
-    for w in [@clear,@add,@search,@delete]
-      w.pack("side"=>"left", "padx"=>2)
-    end
-  end
-end
-
-class RolodexMenuFrame < TkFrame
-  attr_reader :file_menu, :help_menu, :file, :help
-
-  def initialize(parent,keys=nil)
-    super(parent,keys)
-    configure("relief"=>"raised",
-	      "borderwidth"=>1)
-
-    @file = TkMenubutton.new(self,
-			     "text"=>"File",
-			     "underline"=>0)
-    @file_menu = TkMenu.new(@file)
-    @file_menu.add("command",
-		   "label" => "Load ...",
-		   "command" => proc{fileAction},
-		   "underline" => 0)
-    @file_menu.add("command",
-		   "label" => "Exit",
-		   "command" => proc{$root.destroy},
-		   "underline" => 0)
-    @file.menu(@file_menu)
-    @file.pack("side"=>"left")
-
-    @help = TkMenubutton.new(self,
-			     "text"=>"Help",
-			     "underline"=>0)
-    @help_menu = TkMenu.new(@help)
-    @help_menu.add("command",
-		   "label"=>"On Context...",
-		   "command"=>proc{show_help("context")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=>"On Help...",
-		   "command"=>proc{show_help("help")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=>"On Window...",
-		   "command"=>proc{show_help("window")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=>"On Keys...",
-		   "command"=>proc{show_help("keys")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=>"On version...",
-		   "command"=>proc{show_help("version")},
-		   "underline"=>3)
-    @help.menu(@help_menu)
-    @help.pack("side"=>"right")
-  end
-end
-
-class Rolodex < TkRoot
-  attr_reader :frame, :buttons, :menu
-
-  def initialize(*args)
-    super(*args)
-    @frame = RolodexFrame.new(self)
-    @frame.pack("side"=>"top",
-		"fill"=>"y",
-		"anchor"=>"center")
-    @buttons = RolodexButtons.new(self)
-    @buttons.pack("side"=>"bottom",
-		  "pady"=>2,
-		  "anchor"=>"center")
-    @menu = RolodexMenuFrame.new(self)
-    @menu.pack("before"=>@frame,
-	       "side"=>"top",
-	       "fill"=>"x")
-  end
-end
-
-$root = Rolodex.new
-
-$root.buttons.delete.configure("command"=>proc{deleteAction})
-$root.buttons.add.configure("command"=>proc{addAction})
-$root.buttons.clear.configure("command"=>proc{clearAction})
-$root.buttons.search.configure("command"=>proc{addAction; fillCard})
-
-$root.buttons.clear.configure("text"=>"Clear   Ctrl+C")
-$root.bind("Control-c",proc{clearAction})
-
-$root.buttons.add.configure("text"=>"Add   Ctrl+A")
-$root.bind("Control-a",proc{addAction})
-
-$root.buttons.search.configure("text"=>"Search   Ctrl+S")
-$root.bind("Control-s",proc{addAction; fillCard})
-
-$root.buttons.delete.configure("text"=>"Delete...   Ctrl+D")
-$root.bind("Control-d",proc{deleteAction})
-
-$root.menu.file_menu.entryconfigure(1, "accel"=>"Ctrl+F")
-$root.bind("Control-f",proc{fileAction})
-
-$root.menu.file_menu.entryconfigure(2, "accel"=>"Ctrl+Q")
-$root.bind("Control-q",proc{$root.destroy})
-
-$root.frame.entry[1].focus
-
-$root.bind("Any-F1",
-	   proc{|event| show_help(event.widget, event.x_root, event.y_root)})
-$root.bind("Any-Help",
-	   proc{|event| show_help(event.widget, event.x_root, event.y_root)})
-
-
-$helpTopics = {}
-
-$helpTopics[$root.menu.file] = <<EOF
-This is the "file" menu. It can be used to invoke\
-some overall operations on the rolodex applications,\
-such as loading a file or exiting.
-EOF
-
-$helpTopics[$root.menu.file_menu.index(0)] = <<EOF
-The "Load" entry in the "File" menu posts a dialog box\
-that you can use to select a rolodex file
-EOF
-
-$helpTopics[$root.menu.file_menu.index(1)] = <<EOF
-The "Exit" entry in the "File" menu causes the rolodex\
-application to terminate
-EOF
-
-$helpTopics[$root.frame.entry[1]] = <<EOF
-In this field of the rolodex entry you should\
-type the person's name
-EOF
-
-$helpTopics[$root.frame.entry[2]] = <<EOF
-In this field of the rolodex entry you should\
-type the first line of the person's address
-EOF
-
-$helpTopics[$root.frame.entry[3]] = <<EOF
-In this field of the rolodex entry you should\
-type the second line of the person's address
-EOF
-
-$helpTopics[$root.frame.entry[4]] = <<EOF
-In this field of the rolodex entry you should\
-type the third line of the person's address
-EOF
-
-$helpTopics[$root.frame.entry[5]] = <<EOF
-In this field of the rolodex entry you should\
-type the person's home phone number, or "private"\
-if the person doesn't want his or he number publicized
-EOF
-
-$helpTopics[$root.frame.entry[6]] = <<EOF
-In this field of the rolodex entry you should\
-type the person's work phone number
-EOF
-
-$helpTopics[$root.frame.entry[7]] = <<EOF
-In this field of the rolodex entry you should\
-type the phone number for the person's FAX machine
-EOF
-
-$helpTopics["context"] = <<EOF
-Unfortunately, this application doesn't support context-sensitive\
-help in the usual way, because when this demo was written Ruby/Tk\
-didn't have a grab mechanism and this is needed for context-sensitive\
-help. Instead, you can achieve much the same effect by simply moving\
-the mouse over the window you're curious about and pressing the\
-Help or F1 keys. You can do this anytime.
-EOF
-
-$helpTopics["help"] = <<EOF
-This application provides only very crude help. Besides the\
-entries in this menu, you can get help on individual windows\
-by moving the mouse cursor over the window and pressing the\
-Help or F1 keys.
-EOF
-
-$helpTopics["window"] = <<EOF
-This window is a dummy rolodex application created as part of\
-Tom LaStrange's toolkit benchmark. It doesn't really do anything\
-useful except to demonstrate a few features of the Ruby/Tk.
-EOF
-
-$helpTopics["keys"] = <<EOF
-The following accelerator keys are defined for this application\
-(in addition to those already available for the entry windows):
-Ctrl+A:		Add
-Ctrl+C:		Clear
-Ctrl+D:		Delete
-Ctrl+F:		Enter file name
-Ctrl+Q:		Exit application (quit)
-Ctrl+S:		Search (dummy operation)
-EOF
-
-$helpTopics["version"] = <<EOF
-This is version 1.0.1.
-EOF
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-en/ruler.rb b/ext/tk/sample/demos-en/ruler.rb
deleted file mode 100644
index d9a2c037b8..0000000000
--- a/ext/tk/sample/demos-en/ruler.rb
+++ /dev/null
@@ -1,206 +0,0 @@
-# frozen_string_literal: false
-# ruler.rb
-#
-# This demonstration script creates a canvas widget that displays a ruler
-# with tab stops that can be set, moved, and deleted.
-#
-# ruler widget demo (called by 'widget')
-#
-
-# rulerMkTab --
-# This method creates a new triangular polygon in a canvas to
-# represent a tab stop.
-#
-# Arguments:
-# c -           The canvas window.
-# x, y -        Coordinates at which to create the tab stop.
-
-def rulerMkTab(c,x,y)
-  v = $demo_rulerInfo
-  TkcPolygon.new(c, x, y, x+v.size, y+v.size, x-v.size, y+v.size)
-end
-
-# toplevel widget
-if defined?($ruler_demo) && $ruler_demo
-  $ruler_demo.destroy
-  $ruler_demo = nil
-end
-
-# demo toplevel widget
-$ruler_demo = TkToplevel.new {|w|
-  title("Ruler Demonstration")
-  iconname("ruler")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($ruler_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left',
-            'text'=>"This canvas widget shows a mock-up of a ruler.  You can create tab stops by dragging them out of the well to the right of the ruler.  You can also drag existing tab stops.  If you drag a tab stop far enough up or down so that it turns dim, it will be deleted when you release the mouse button."){
-  pack('side'=>'top')
-}
-
-# frame
-$ruler_buttons = TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $ruler_demo
-      $ruler_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'ruler'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$ruler_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# canvas
-$ruler_canvas = TkCanvas.new(base_frame, 'width'=>'14.8c', 'height'=>'2.5c')
-$ruler_canvas.pack('side'=>'top', 'fill'=>'x')
-
-#
-unless Struct.const_defined?("RulerInfo")
-  $demo_rulerInfo = Struct.new("RulerInfo", :grid, :left, :right, :x, :y,
-                               :top, :bottom, :size, :normalStyle,
-                               :activeStyle, :deleteStyle).new
-end
-$demo_rulerInfo.grid = '.25c'
-$demo_rulerInfo.left = TkWinfo.fpixels($ruler_canvas, '1c')
-$demo_rulerInfo.right = TkWinfo.fpixels($ruler_canvas, '13c')
-$demo_rulerInfo.top = TkWinfo.fpixels($ruler_canvas, '1c')
-$demo_rulerInfo.bottom = TkWinfo.fpixels($ruler_canvas, '1.5c')
-$demo_rulerInfo.size = TkWinfo.fpixels($ruler_canvas, '.2c')
-$demo_rulerInfo.normalStyle = {'fill'=>'black'}
-if TkWinfo.depth($ruler_canvas) > 1
-  $demo_rulerInfo.activeStyle = {'fill'=>'red', 'stipple'=>''}
-  $demo_rulerInfo.deleteStyle = {'fill'=>'red',
-    'stipple'=>'@'+[$demo_dir, '..',
-                     'images', 'gray25.xbm'].join(File::Separator)}
-else
-  $demo_rulerInfo.activeStyle = {'fill'=>'black', 'stipple'=>''}
-  $demo_rulerInfo.deleteStyle = {'fill'=>'black',
-    'stipple'=>'@'+[$demo_dir, '..',
-                     'images', 'gray25.xbm'].join(File::Separator)}
-end
-
-TkcLine.new($ruler_canvas,
-            '1c', '0.5c', '1c', '1c', '13c', '1c', '13c', '0.5c', 'width'=>1)
-(0..11).each{|i|
-  x = i+1
-  TkcLine.new($ruler_canvas, "#{x}c", '1c', "#{x}c", '0.6c', 'width'=>1)
-  TkcLine.new($ruler_canvas, "#{x}.25c", '1c', "#{x}.25c", '0.8c', 'width'=>1)
-  TkcLine.new($ruler_canvas, "#{x}.5c", '1c', "#{x}.5c", '0.7c', 'width'=>1)
-  TkcLine.new($ruler_canvas, "#{x}.75c", '1c', "#{x}.75c", '0.8c', 'width'=>1)
-  TkcText.new($ruler_canvas, "#{x}.15c", '0.75c', 'text'=>i, 'anchor'=>'sw')
-}
-
-$rulerTag_well = TkcTag.new($ruler_canvas)
-$ruler_canvas\
-.addtag_withtag($rulerTag_well,
-                TkcRectangle.new($ruler_canvas,
-                                 '13.2c', '1c', '13.8c', '0.5c',
-                                 'outline'=>'black',
-                                 'fill'=>($ruler_canvas\
-                                          .configinfo('background'))[4]) )
-$ruler_canvas\
-.addtag_withtag($rulerTag_well,
-                rulerMkTab($ruler_canvas,
-                           TkWinfo.pixels($ruler_canvas, '13.5c'),
-                           TkWinfo.pixels($ruler_canvas, '.65c') ) )
-
-$rulerTag_well.bind('1', proc{|x,y| rulerNewTab($ruler_canvas,x,y)}, '%x %y')
-$ruler_canvas.itembind('tab', '1',
-                       proc{|x,y| rulerSelectTab($ruler_canvas,x,y)}, '%x %y')
-$ruler_canvas.bind('B1-Motion',
-                   proc{|x,y| rulerMoveTab($ruler_canvas,x,y)}, '%x %y')
-$ruler_canvas.bind('Any-ButtonRelease-1', proc{rulerReleaseTab($ruler_canvas)})
-
-# rulerNewTab --
-# Does all the work of creating a tab stop, including creating the
-# triangle object and adding tags to it to give it tab behavior.
-#
-# Arguments:
-# c -           The canvas window.
-# x, y -        The coordinates of the tab stop.
-
-def rulerNewTab(c,x,y)
-  v = $demo_rulerInfo
-  c.addtag_withtag('active', rulerMkTab(c,x,y))
-  c.addtag_withtag('tab', 'active')
-  v.x = x
-  v.y = y
-  rulerMoveTab(c,x,y)
-end
-
-# rulerSelectTab --
-# This method is invoked when mouse button 1 is pressed over
-# a tab.  It remembers information about the tab so that it can
-# be dragged interactively.
-#
-# Arguments:
-# c -           The canvas widget.
-# x, y -        The coordinates of the mouse (identifies the point by
-#               which the tab was picked up for dragging).
-
-def rulerSelectTab(c,x,y)
-  v = $demo_rulerInfo
-  v.x = c.canvasx(x, v.grid)
-  v.y = v.top+2
-  c.addtag_withtag('active', 'current')
-  c.itemconfigure('active', v.activeStyle)
-  c.raise('active')
-end
-
-# rulerMoveTab --
-# This method is invoked during mouse motion events to drag a tab.
-# It adjusts the position of the tab, and changes its appearance if
-# it is about to be dragged out of the ruler.
-#
-# Arguments:
-# c -           The canvas widget.
-# x, y -        The coordinates of the mouse.
-
-def rulerMoveTab(c,x,y)
-  v = $demo_rulerInfo
-  return if c.find_withtag('active') == []
-  cx = c.canvasx(x,v.grid)
-  cy = c.canvasy(y)
-  cx = v.left if cx < v.left
-  cx = v.right if cx > v.right
-  if (cy >= v.top && cy <= v.bottom)
-    cy = v.top+2
-    c.itemconfigure('active', v.activeStyle)
-  else
-    cy = cy-v.size-2
-    c.itemconfigure('active', v.deleteStyle)
-  end
-  c.move('active', cx-v.x, cy-v.y)
-  v.x = cx
-  v.y = cy
-end
-
-# rulerReleaseTab --
-# This method is invoked during button release events that end
-# a tab drag operation.  It deselects the tab and deletes the tab if
-# it was dragged out of the ruler.
-#
-# Arguments:
-# c -           The canvas widget.
-# x, y -        The coordinates of the mouse.
-
-def rulerReleaseTab(c)
-  v = $demo_rulerInfo
-  return if c.find_withtag('active') == []
-  if v.y != v.top+2
-    c.delete('active')
-  else
-    c.itemconfigure('active', v.normalStyle)
-    c.dtag('active')
-  end
-end
-
diff --git a/ext/tk/sample/demos-en/sayings.rb b/ext/tk/sample/demos-en/sayings.rb
deleted file mode 100644
index e7ddfe5b5d..0000000000
--- a/ext/tk/sample/demos-en/sayings.rb
+++ /dev/null
@@ -1,107 +0,0 @@
-# frozen_string_literal: false
-# sayings.rb
-#
-# This demonstration script creates a listbox that can be scrolled
-# both horizontally and vertically.  It displays a collection of
-# well-known sayings.
-#
-# listbox widget demo 'sayings' (called by 'widget')
-#
-
-# toplevel widget
-if defined?($sayings_demo) && $sayings_demo
-  $sayings_demo.destroy
-  $sayings_demo = nil
-end
-
-# demo toplevel widget
-$sayings_demo = TkToplevel.new {|w|
-  title("Listbox Demonstration (well-known sayings)")
-  iconname("sayings")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($sayings_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "The listbox below contains a collection of well-known sayings.  You can scan the list using either of the scrollbars or by dragging in the listbox window with button 2 pressed."
-}
-msg.pack('side'=>'top')
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $sayings_demo
-      $sayings_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'sayings'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-sayings_lbox = nil
-TkFrame.new(base_frame, 'borderwidth'=>10) {|w|
-  sv = TkScrollbar.new(w)
-  sh = TkScrollbar.new(w, 'orient'=>'horizontal')
-  sayings_lbox = TkListbox.new(w) {
-    setgrid 1
-    width  20
-    height 10
-    yscrollcommand proc{|first,last| sv.set first,last}
-    xscrollcommand proc{|first,last| sh.set first,last}
-  }
-  sv.command(proc{|*args| sayings_lbox.yview(*args)})
-  sh.command(proc{|*args| sayings_lbox.xview(*args)})
-
-  if $tk_version =~ /^4\.[01]/
-    sv.pack('side'=>'right', 'fill'=>'y')
-    sh.pack('side'=>'bottom', 'fill'=>'x')
-    sayings_lbox.pack('expand'=>'yes', 'fill'=>'y')
-
-  else
-    sayings_lbox.grid('row'=>0, 'column'=>0,
-                      'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    sv.grid('row'=>0, 'column'=>1,
-            'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    sh.grid('row'=>1, 'column'=>0,
-            'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    TkGrid.rowconfigure(w, 0, 'weight'=>1, 'minsize'=>0)
-    TkGrid.columnconfigure(w, 0, 'weight'=>1, 'minsize'=>0)
-  end
-
-}.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'y')
-
-sayings_lbox.insert(0,
-"Waste not, want not",
-"Early to bed and early to rise makes a man healthy, wealthy, and wise",
-"Ask not what your country can do for you, ask what you can do for your country",
-"I shall return",
-"NOT",
-"A picture is worth a thousand words",
-"User interfaces are hard to build",
-"Thou shalt not steal",
-"A penny for your thoughts",
-"Fool me once, shame on you;  fool me twice, shame on me",
-"Every cloud has a silver lining",
-"Where there's smoke there's fire",
-"It takes one to know one",
-"Curiosity killed the cat; but satisfaction brought it back",
-"Take this job and shove it",
-"Up a creek without a paddle",
-"I'm mad as hell and I'm not going to take it any more",
-"An apple a day keeps the doctor away",
-"Don't look a gift horse in the mouth"
-)
-
diff --git a/ext/tk/sample/demos-en/search.rb b/ext/tk/sample/demos-en/search.rb
deleted file mode 100644
index 82c0d169a9..0000000000
--- a/ext/tk/sample/demos-en/search.rb
+++ /dev/null
@@ -1,188 +0,0 @@
-# frozen_string_literal: false
-# search.rb
-#
-# This demonstration script creates a collection of widgets that
-# allow you to load a file into a text widget, then perform searches
-# on that file.
-#
-# Text Search widget demo (called by 'widget')
-#
-
-# textLoadFile --
-# This method below loads a file into a text widget, discarding
-# the previous contents of the widget. Tags for the old widget are
-# not affected, however.
-#
-# Arguments:
-# w -           The window into which to load the file.  Must be a
-#               text widget.
-# file -        The name of the file to load.  Must be readable.
-
-def textLoadFile(w,file)
-  w.delete('1.0', 'end')
-  f = open(file, 'r')
-  while(!f.eof?)
-    w.insert('end', f.read(1000))
-  end
-  f.close
-end
-
-# textSearch --
-# Search for all instances of a given string in a text widget and
-# apply a given tag to each instance found.
-#
-# Arguments:
-# w -           The window in which to search.  Must be a text widget.
-# string -      The string to search for.  The search is done using
-#               exact matching only;  no special characters.
-# tag -         Tag to apply to each instance of a matching string.
-
-def textSearch(w, string, tag)
-  tag.remove('0.0', 'end')
-  return if string == ""
-  cur = '1.0'
-  loop {
-    cur, len = w.search_with_length(string, cur, 'end')
-    break if cur == ""
-    tag.add(cur, "#{cur} + #{len} char")
-    cur = w.index("#{cur} + #{len} char")
-  }
-end
-
-# textToggle --
-# This method is invoked repeatedly to invoke two commands at
-# periodic intervals.  It normally reschedules itself after each
-# execution but if an error occurs (e.g. because the window was
-# deleted) then it doesn't reschedule itself.
-#
-# Arguments:
-# cmd1 -        Command to execute when method is called.
-# sleep1 -      Ms to sleep after executing cmd1 before executing cmd2.
-# cmd2 -        Command to execute in the *next* invocation of this method.
-# sleep2 -      Ms to sleep after executing cmd2 before executing cmd1 again.
-
-def textToggle(cmd1,sleep1,cmd2,sleep2)
-  sleep_list = [sleep2, sleep1]
-  TkAfter.new(proc{sleep = sleep_list.shift; sleep_list.push(sleep); sleep},
-              -1, cmd1, cmd2).start(sleep1)
-end
-
-# toplevel widget
-if defined?($search_demo) && $search_demo
-  $search_demo.destroy
-  $search_demo = nil
-end
-
-# demo toplevel widget
-$search_demo = TkToplevel.new {|w|
-  title("Text Demonstration - Search and Highlight")
-  iconname("search")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($search_demo).pack(:fill=>:both, :expand=>true)
-
-# frame
-$search_buttons = TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $search_demo
-      $search_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'search'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$search_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-TkFrame.new(base_frame) {|f|
-  TkLabel.new(f, 'text'=>'File name:',
-              'width'=>13, 'anchor'=>'w').pack('side'=>'left')
-  $search_fileName = TkVariable.new
-  TkEntry.new(f, 'width'=>40,
-              'textvariable'=>$search_fileName) {
-    pack('side'=>'left')
-    bind('Return', proc{textLoadFile($search_text, $search_fileName.value)
-                        $search_string_entry.focus})
-    focus
-  }
-  TkButton.new(f, 'text'=>'Load File',
-               'command'=>proc{textLoadFile($search_text,
-                                            $search_fileName.value)})\
-  .pack('side'=>'left', 'pady'=>5, 'padx'=>10)
-}.pack('side'=>'top', 'fill'=>'x')
-
-TkFrame.new(base_frame) {|f|
-  TkLabel.new(f, 'text'=>'Search string:',
-              'width'=>13, 'anchor'=>'w').pack('side'=>'left')
-  $search_searchString = TkVariable.new
-  $search_string_entry = TkEntry.new(f, 'width'=>40,
-                                     'textvariable'=>$search_searchString) {
-    pack('side'=>'left')
-    bind('Return', proc{textSearch($search_text, $search_searchString.value,
-                                   $search_Tag)})
-  }
-  TkButton.new(f, 'text'=>'Highlight',
-               'command'=>proc{textSearch($search_text,
-                                          $search_searchString.value,
-                                          $search_Tag)}) {
-    pack('side'=>'left', 'pady'=>5, 'padx'=>10)
-  }
-}.pack('side'=>'top', 'fill'=>'x')
-
-$search_text = TkText.new(base_frame, 'setgrid'=>true, 'wrap'=>'word') {|t|
-  $search_Tag = TkTextTag.new(t)
-  TkScrollbar.new(base_frame, 'command'=>proc{|*args| t.yview(*args)}) {|sc|
-    t.yscrollcommand(proc{|first,last| sc.set first,last})
-    pack('side'=>'right', 'fill'=>'y')
-  }
-  pack('expand'=>'yes', 'fill'=>'both')
-}
-
-# Set up display styles for text highlighting.
-
-if TkWinfo.depth($search_demo) > 1
-  textToggle(proc{
-               $search_Tag.configure('background'=>'#ce5555',
-                                     'foreground'=>'white')
-             },
-             800,
-             proc{
-               $search_Tag.configure('background'=>'', 'foreground'=>'')
-             },
-             200 )
-else
-  textToggle(proc{
-               $search_Tag.configure('background'=>'black',
-                                     'foreground'=>'white')
-             },
-             800,
-             proc{
-               $search_Tag.configure('background'=>'', 'foreground'=>'')
-             },
-             200 )
-end
-$search_text.insert('1.0', "\
-This window demonstrates how to use the tagging facilities in text \
-widgets to implement a searching mechanism.  First, type a file name \
-in the top entry, then type <Return> or click on \"Load File\".  Then \
-type a string in the lower entry and type <Return> or click on \
-\"Load File\".  This will cause all of the instances of the string to \
-be tagged with the tag \"search\", and it will arrange for the tag\'s \
-display attributes to change to make all of the strings blink.")
-$search_text.insert('end', "\
-The current directory to load a file is \"#{Dir.pwd}\".\
-")
-$search_text.set_insert '0.0'
-
-$search_fileName.value = ''
-$search_searchString.value = ''
-
-$search_text.width = 60
-$search_text.height = 20
diff --git a/ext/tk/sample/demos-en/spin.rb b/ext/tk/sample/demos-en/spin.rb
deleted file mode 100644
index d3558d56d6..0000000000
--- a/ext/tk/sample/demos-en/spin.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-# frozen_string_literal: false
-# spin.rb --
-#
-# This demonstration script creates several spinbox widgets.
-#
-# based on Tcl/Tk8.4.4 widget demos
-
-if defined?($spin_demo) && $spin_demo
-  $spin_demo.destroy
-  $spin_demo = nil
-end
-
-$spin_demo = TkToplevel.new {|w|
-  title("Spinbox Demonstration")
-  iconname("spin")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($spin_demo).pack(:fill=>:both, :expand=>true)
-
-TkLabel.new(base_frame,
-            :font=>$font, :wraplength=>'5i', :justify=>:left,
-            :text=><<EOL).pack(:side=>:top)
-Three different spin-boxes are displayed below.  \
-You can add characters by pointing, clicking and typing.  \
-The normal Motif editing characters are supported, along with \
-many Emacs bindings.  For example, Backspace and Control-h \
-delete the character to the left of the insertion cursor and \
-Delete and Control-d delete the chararacter to the right of the \
-insertion cursor.  For values that are too large to fit in the \
-window all at once, you can scan through the value by dragging \
-with mouse button2 pressed.  Note that the first spin-box will \
-only permit you to type in integers, and the third selects from \
-a list of Australian cities.
-If your Tk library linked to Ruby doesn't include a 'spinbox' widget, \
-this demo doesn't work. Please use later version of Tk \
-which supports a 'spinbox' widget.
-EOL
-
-TkFrame.new(base_frame){|f|
-  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
-
-  TkButton.new(f, :text=>'Dismiss', :width=>15, :command=>proc{
-                 $spin_demo.destroy
-                 $spin_demo = nil
-               }).pack(:side=>:left, :expand=>true)
-
-  TkButton.new(f, :text=>'See Code', :width=>15, :command=>proc{
-                 showCode 'spin'
-               }).pack(:side=>:left, :expand=>true)
-}
-
-australianCities = [
-    'Canberra', 'Sydney', 'Melbourne', 'Perth', 'Adelaide',
-    'Brisbane', 'Hobart', 'Darwin', 'Alice Springs'
-]
-
-[
-  TkSpinbox.new(base_frame, :from=>1, :to=>10, :width=>10, :validate=>:key,
-                :validatecommand=>[
-                  proc{|s| s == '' || /^[+-]?\d+$/ =~ s }, '%P'
-                ]),
-  TkSpinbox.new(base_frame, :from=>0, :to=>3, :increment=>0.5,
-                :format=>'%05.2f', :width=>10),
-  TkSpinbox.new(base_frame, :values=>australianCities, :width=>10)
-].each{|sbox| sbox.pack(:side=>:top, :pady=>5, :padx=>10)}
diff --git a/ext/tk/sample/demos-en/square b/ext/tk/sample/demos-en/square
deleted file mode 100644
index bb66282154..0000000000
--- a/ext/tk/sample/demos-en/square
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/usr/bin/env ruby
-
-# square --
-# This script generates a demo application containing only
-# a "square" widget.  It's only usable if Tk has been compiled
-# with tkSquare.c and with the -DSQUARE_DEMO compiler switch.
-# This demo arranges the following bindings for the widget:
-#
-# Button-1 press/drag:          moves square to mouse
-# "a":                          toggle size animation on/off
-#
-
-require 'tk'
-require 'tkafter'
-
-class TkSquare<TkWindow
-  def create_self
-    begin
-      tk_call 'square', path
-    rescue
-      STDERR.print "\nSorry. Your Tk interpreter does not contain " +
-	'a "square" demonstration widget.' +
-	"\n ( See documents included the Tcl/Tk source archive. )\n\n"
-      exit
-    end
-  end
-  def size(amount=nil)
-    if amount
-      tk_send 'size', amount
-    else
-      number(tk_send('size'))
-    end
-  end
-  def position(x,y)
-    tk_send 'position', x, y
-  end
-end
-
-$s = TkSquare.new{
-  pack('expand'=>'yes', 'fill'=>'both')
-  bind('1', proc{|x,y| center(x,y)}, '%s %y')
-  bind('B1-Motion', proc{|x,y| center(x,y)}, '%s %y')
-  bind('a', proc{animate})
-  focus
-}
-TkRoot.new.minsize(1,1)
-
-# The procedure below centers the square on a given position.
-
-def center(x,y)
-  a = $s.size
-  $s.position(x-(a/2), y-(a/2))
-end
-
-# The procedures below provide a simple form of animation where
-# the box changes size in a pulsing pattern: larger, smaller, larger,
-# and so on.
-
-$inc = 0
-
-def timer_proc
-  a = $s.size
-  return if $inc == 0
-  $inc = -3 if a >= 40
-  $inc =  3 if a <= 10
-  $s.size(a+$inc)
-end
-
-$timer = TkAfter.new(30, -1, proc{timer_proc})
-
-def animate
-  if $inc == 0
-    $inc = 3
-    $timer.start
-  else
-    $inc = 0
-    $timer.stop
-  end
-end
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-en/states.rb b/ext/tk/sample/demos-en/states.rb
deleted file mode 100644
index 4eac7424e7..0000000000
--- a/ext/tk/sample/demos-en/states.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-# frozen_string_literal: false
-# states.rb
-#
-# This demonstration script creates a listbox widget that displays
-# the names of the 50 states in the United States of America.
-#
-# listbox widget demo 'states' (called by 'widget')
-#
-
-# toplevel widget
-if defined?($states_demo) && $states_demo
-  $states_demo.destroy
-  $states_demo = nil
-end
-
-# demo toplevel widget
-$states_demo = TkToplevel.new {|w|
-  title("Listbox Demonstration (states)")
-  iconname("states")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($states_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "A listbox containing the 50 states is displayed below, along with a scrollbar.  You can scan the list either using the scrollbar or by scanning.  To scan, press button 2 in the widget and drag up or down."
-}
-msg.pack('side'=>'top')
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $states_demo
-      $states_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'states'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-states_lbox = nil
-TkFrame.new(base_frame, 'borderwidth'=>'.5c') {|w|
-  s = TkScrollbar.new(w)
-  states_lbox = TkListbox.new(w) {
-    setgrid 1
-    height 12
-    yscrollcommand proc{|first,last| s.set first,last}
-  }
-  s.command(proc{|*args| states_lbox.yview(*args)})
-  s.pack('side'=>'right', 'fill'=>'y')
-  states_lbox.pack('side'=>'left', 'expand'=>1, 'fill'=>'both')
-}.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'y')
-
-ins_data = [
-  'Alabama', 'Alaska', 'Arizona', 'Arkansas', 'California',
-  'Colorado', 'Connecticut', 'Delaware', 'Florida', 'Georgia',
-  'Hawaii', 'Idaho', 'Illinois',
-  'Indiana', 'Iowa', 'Kansas', 'Kentucky', 'Louisiana', 'Maine', 'Maryland',
-  'Massachusetts', 'Michigan', 'Minnesota', 'Mississippi', 'Missouri',
-  'Montana', 'Nebraska', 'Nevada', 'New_Hampshire', 'New_Jersey', 'New_Mexico',
-  'New_York', 'North_Carolina', 'North_Dakota',
-  'Ohio', 'Oklahoma', 'Oregon', 'Pennsylvania', 'Rhode_Island',
-  'South_Carolina', 'South_Dakota',
-  'Tennessee', 'Texas', 'Utah', 'Vermont', 'Virginia', 'Washington',
-  'West_Virginia', 'Wisconsin', 'Wyoming'
-]
-
-states_lbox.insert(0, *ins_data)
-
diff --git a/ext/tk/sample/demos-en/style.rb b/ext/tk/sample/demos-en/style.rb
deleted file mode 100644
index 60185ed874..0000000000
--- a/ext/tk/sample/demos-en/style.rb
+++ /dev/null
@@ -1,232 +0,0 @@
-# frozen_string_literal: false
-# style.rb
-#
-# This demonstration script creates a text widget that illustrates the
-# various display styles that may be set for tags.
-#
-# text (display styles) widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($style_demo) && $style_demo
-  $style_demo.destroy
-  $style_demo = nil
-end
-
-# demo toplevel widget
-$style_demo = TkToplevel.new {|w|
-  title("Text Demonstration - Display Styles")
-  iconname("style")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($style_demo).pack(:fill=>:both, :expand=>true)
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $style_demo
-      $style_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'style'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# text
-txt = TkText.new(base_frame){|t|
-  #
-  setgrid 'true'
-  #width  70
-  #height 32
-  wrap 'word'
-  font $font
-  TkScrollbar.new(base_frame) {|s|
-    pack('side'=>'right', 'fill'=>'y')
-    command proc{|*args| t.yview(*args)}
-    t.yscrollcommand proc{|first,last| s.set first,last}
-  }
-  pack('expand'=>'yes', 'fill'=>'both')
-
-  #
-  family = 'Courier'
-
-  if $tk_version =~ /^4.*/
-    style_tag_bold = TkTextTag.new(t, 'font'=>'-*-Courier-Bold-O-Normal--*-120-*-*-*-*-*-*')
-    style_tag_big = TkTextTag.new(t, 'font'=>'-*-Courier-Bold-R-Normal--*-140-*-*-*-*-*-*', 'kanjifont'=>$msg_kanji_font)
-    style_tag_verybig = TkTextTag.new(t, 'font'=>'-*-Helvetica-Bold-R-Normal--*-240-*-*-*-*-*-*')
-    #    style_tag_small = TkTextTag.new(t, 'font'=>'-Adobe-Helvetica-Bold-R-Normal-*-100-*', 'kanjifont'=>$kanji_font)
-    style_tag_small = TkTextTag.new(t, 'font'=>'-Adobe-Helvetica-Bold-R-Normal-*-100-*')
-  else
-    style_tag_bold = TkTextTag.new(t, 'font'=>[family, 12, :bold, :italic])
-    style_tag_big = TkTextTag.new(t, 'font'=>[family, 14, :bold])
-    style_tag_verybig = TkTextTag.new(t, 'font'=>['Helvetica', 24, :bold])
-    style_tag_small = TkTextTag.new(t, 'font'=>'Times 8 bold')
-  end
-###
-#  case($tk_version)
-#  when /^4.*/
-#    style_tag_big = TkTextTag.new(t, 'font'=>'-*-Courier-Bold-R-Normal--*-140-*-*-*-*-*-*', 'kanjifont'=>$msg_kanji_font)
-#    style_tag_small = TkTextTag.new(t, 'font'=>'-Adobe-Helvetica-Bold-R-Normal-*-100-*', 'kanjifont'=>$kanji_font)
-#  when /^8.*/
-#    unless $style_demo_do_first
-#      $style_demo_do_first = true
-#      Tk.tk_call('font', 'create', '@bigascii',
-#                '-copy', '-*-Courier-Bold-R-Normal--*-140-*-*-*-*-*-*')
-#      Tk.tk_call('font', 'create', '@smallascii',
-#                '-copy', '-Adobe-Helvetica-Bold-R-Normal-*-100-*')
-#      Tk.tk_call('font', 'create', '@cBigFont',
-#                '-compound', '@bigascii @msg_knj')
-#      Tk.tk_call('font', 'create', '@cSmallFont',
-#                '-compound', '@smallascii @kanji')
-#    end
-#    style_tag_big = TkTextTag.new(t, 'font'=>'@cBigFont')
-#    style_tag_small = TkTextTag.new(t, 'font'=>'@cSmallFont')
-#  end
-
-  #
-  if TkWinfo.depth($root).to_i > 1
-    style_tag_color1 = TkTextTag.new(t, 'background'=>'#a0b7ce')
-    style_tag_color2 = TkTextTag.new(t, 'foreground'=>'red')
-    style_tag_raised = TkTextTag.new(t, 'relief'=>'raised', 'borderwidth'=>1)
-    style_tag_sunken = TkTextTag.new(t, 'relief'=>'sunken', 'borderwidth'=>1)
-  else
-    style_tag_color1 = TkTextTag.new(t, 'background'=>'black',
-                                     'foreground'=>'white')
-    style_tag_color2 = TkTextTag.new(t, 'background'=>'black',
-                                     'foreground'=>'white')
-    style_tag_raised = TkTextTag.new(t, 'background'=>'white',
-                                     'relief'=>'raised', 'borderwidth'=>1)
-    style_tag_sunken = TkTextTag.new(t, 'background'=>'white',
-                                     'relief'=>'sunken', 'borderwidth'=>1)
-  end
-
-  #
-  if $tk_version =~ /^4\.[01]/
-    style_tag_bgstipple = TkTextTag.new(t, 'background'=>'black',
-                                        'borderwidth'=>0,
-                                        'bgstipple'=>'gray25')
-  else
-    style_tag_bgstipple = TkTextTag.new(t, 'background'=>'black',
-                                        'borderwidth'=>0,
-                                        'bgstipple'=>'gray12')
-  end
-  style_tag_fgstipple = TkTextTag.new(t, 'fgstipple'=>'gray50')
-  style_tag_underline = TkTextTag.new(t, 'underline'=>'on')
-  style_tag_overstrike = TkTextTag.new(t, 'overstrike'=>'on')
-  style_tag_right  = TkTextTag.new(t, 'justify'=>'right')
-  style_tag_center = TkTextTag.new(t, 'justify'=>'center')
-  if $tk_version =~ /^4.*/
-    style_tag_super = TkTextTag.new(t, 'offset'=>'4p', 'font'=>'-Adobe-Courier-Medium-R-Normal--*-100-*-*-*-*-*-*')
-    style_tag_sub = TkTextTag.new(t, 'offset'=>'-2p', 'font'=>'-Adobe-Courier-Medium-R-Normal--*-100-*-*-*-*-*-*')
-  else
-    style_tag_super = TkTextTag.new(t, 'offset'=>'4p', 'font'=>[family, 10])
-    style_tag_sub = TkTextTag.new(t, 'offset'=>'-2p', 'font'=>[family, 10])
-  end
-  style_tag_margins = TkTextTag.new(t, 'lmargin1'=>'12m', 'lmargin2'=>'6m',
-                                    'rmargin'=>'10m')
-  style_tag_spacing = TkTextTag.new(t, 'spacing1'=>'10p', 'spacing2'=>'2p',
-                                    'lmargin1'=>'12m', 'lmargin2'=>'6m',
-                                    'rmargin'=>'10m')
-
-  #
-  insert('end', 'Text widgets like this one allow you to display information in a
-variety of styles.  Display styles are controlled using a mechanism
-called ')
-  insert('end', 'tags', style_tag_big)
-  insert('end', '. Tags are just textual names that you can apply to one
-or more ranges of characters within a text widget.  You can configure
-tags with various display styles.  If you do this, then the tagged
-characters will be displayed with the styles you chose.  The
-available display styles are:
-')
-  insert('end', "\n1. Font.", style_tag_big)
-  insert('end', "  You can choose any X font, ")
-  insert('end', "large", style_tag_verybig)
-  insert('end', " or ")
-  insert('end', "small", style_tag_small)
-  insert('end', ".\n")
-  insert('end', "\n2. Color.", style_tag_big)
-  insert('end', "  You can change either the ")
-  insert('end', "background", style_tag_color1)
-  insert('end', " or ")
-  insert('end', "foreground", style_tag_color2)
-  insert('end', "\ncolor, or ")
-  insert('end', "both", style_tag_color1, style_tag_color2)
-  insert('end', ".\n")
-  insert('end', "\n3. Stippling.", style_tag_big)
-  insert('end', "  You can cause either the ")
-  insert('end', "background", style_tag_bgstipple)
-  insert('end', " or ")
-  insert('end', "foreground", style_tag_fgstipple)
-  insert('end', "\ninformation to be drawn with a stipple fill instead of a solid fill.\n")
-  insert('end', "\n4. Underlining.", style_tag_big)
-  insert('end', "  You can ")
-  insert('end', "underline", style_tag_underline)
-  insert('end', " ranges of text.\n")
-  insert('end', "\n5. Overstrikes.", style_tag_big)
-  insert('end', "  You can ")
-  insert('end', "draw lines through", style_tag_overstrike)
-  insert('end', " ranges of text.\n")
-  insert('end', "\n6. 3-D effects.", style_tag_big)
-  insert('end', "  You can arrange for the background to be drawn\nwith a border that makes characters appear either\n")
-  insert('end', "raised", style_tag_raised)
-  insert('end', " or ")
-  insert('end', "sunken", style_tag_sunken)
-  insert('end', ".\n")
-  insert('end', "\n7. Justification.", style_tag_big)
-  insert('end', " You can arrange for lines to be displayed\n")
-  insert('end', "left-justified,\n")
-  insert('end', "right-justified, or\n", style_tag_right)
-  insert('end', "centered.\n", style_tag_center)
-  insert('end', "\n8. Superscripts and subscripts.", style_tag_big)
-  insert('end', " You can control the vertical\n")
-  insert('end', "position of text to generate superscript effects like 10")
-  insert('end', "n", style_tag_super)
-  insert('end', " or\nsubscript effects like X")
-  insert('end', "i", style_tag_sub)
-  insert('end', ".\n")
-  insert('end', "\n9. Margins.", style_tag_big)
-  insert('end', " You can control the amount of extra space left")
-  insert('end', " on\neach side of the text:\n")
-  insert('end', "This paragraph is an example of the use of ", style_tag_margins)
-  insert('end', "margins.  It consists of a single line of text ", style_tag_margins)
-  insert('end', "that wraps around on the screen.  There are two ", style_tag_margins)
-  insert('end', "separate left margin values, one for the first ", style_tag_margins)
-  insert('end', "display line associated with the text line, ", style_tag_margins)
-  insert('end', "and one for the subsequent display lines, which ", style_tag_margins)
-  insert('end', "occur because of wrapping.  There is also a ", style_tag_margins)
-  insert('end', "separate specification for the right margin, ", style_tag_margins)
-  insert('end', "which is used to choose wrap points for lines.\n", style_tag_margins)
-  insert('end', "\n10. Spacing.", style_tag_big)
-  insert('end', " You can control the spacing of lines with three\n")
-  insert('end', "separate parameters.  \"Spacing1\" tells how much ")
-  insert('end', "extra space to leave\nabove a line, \"spacing3\" ")
-  insert('end', "tells how much space to leave below a line,\nand ")
-  insert('end', "if a text line wraps, \"spacing2\" tells how much ")
-  insert('end', "space to leave\nbetween the display lines that ")
-  insert('end', "make up the text line.\n")
-  insert('end', "These indented paragraphs illustrate how spacing ", style_tag_spacing)
-  insert('end', "can be used.  Each paragraph is actually a ", style_tag_spacing)
-  insert('end', "single line in the text widget, which is ", style_tag_spacing)
-  insert('end', "word-wrapped by the widget.\n", style_tag_spacing)
-  insert('end', "Spacing1 is set to 10 points for this text, ", style_tag_spacing)
-  insert('end', "which results in relatively large gaps between ", style_tag_spacing)
-  insert('end', "the paragraphs.  Spacing2 is set to 2 points, ", style_tag_spacing)
-  insert('end', "which results in just a bit of extra space ", style_tag_spacing)
-  insert('end', "within a paragraph.  Spacing3 isn't used ", style_tag_spacing)
-  insert('end', "in this example.\n", style_tag_spacing)
-  insert('end', "To see where the space is, select ranges of ", style_tag_spacing)
-  insert('end', "text within these paragraphs.  The selection ", style_tag_spacing)
-  insert('end', "highlight will cover the extra space.", style_tag_spacing)
-
-}
-
-txt.width 70
-txt.height 32
diff --git a/ext/tk/sample/demos-en/tcolor b/ext/tk/sample/demos-en/tcolor
deleted file mode 100644
index 48cda6d1da..0000000000
--- a/ext/tk/sample/demos-en/tcolor
+++ /dev/null
@@ -1,526 +0,0 @@
-#!/usr/bin/env ruby
-#
-# tcolor --
-#   simple color editor which supports RGB, HSB and CYM color space
-#
-# Copyright (C) 1998 Takaaki Tateishi(ttate@jaist.ac.jp)
-# last update: Thu Jun 18 06:32:35 JST 1998
-#
-
-require "tk"
-
-
-# use TkVariable instance for the variable which is changed by Tk interpreter
-
-$colorSpace = TkVariable.new(:rgb)
-$master = nil
-$red = 65535
-$green = 0
-$blue = 0
-$color = "#ffff00000000"
-$updating = TkVariable.new(0)
-$autoUpdate = TkVariable.new(1)
-$name = TkVariable.new($color)
-$command = TkVariable.new("print(%%,\"\n\")")
-# $command = TkVariable.new("")
-$label1 = TkVariable.new("label1")
-$label2 = TkVariable.new("label2")
-$label3 = TkVariable.new("label3")
-
-
-# setup the entry of the resourc database
-if (TkVarAccess.new('tcl_platform')['platform'] == 'unix')
-  TkOptionDB.add('*Entry.background', 'white')
-end
-
-
-# methods for events
-
-def rgbToHsv(red,green,blue)
-
-  if ( red > green )
-    max = red
-    min = green
-  else
-    max = green
-    min = red
-  end
-
-  if ( blue > max )
-    max = blue
-  else
-    if ( blue < min )
-      min = blue
-    end
-  end
-
-  range = max - min
-
-  if ( max == 0 )
-    sat = 0.0
-  else
-    sat = (max-min)/max
-  end
-
-  if ( sat == 0 )
-    hue = 0.0
-  else
-    rc = (max-red)/range
-    gc = (max-green)/range
-    bc = (max-blue)/range
-    if ( red == max )
-      hue = 0.166667 * (bc - gc)
-    else
-      if ( green == max )
-	hue = 0.166667 * (2.0 + rc - bc)
-      else
-	hue = 0.166667 * (4.0 + gc - rc)
-      end
-    end
-    if ( hue < 0.0 )
-      hue = hue + 1.0
-    end
-  end
-
-  [hue,sat,max/65535]
-end
-
-
-def hsbToRgb(hue,sat,value)
-  v = 65535.0 * value
-  if( sat == 0 )
-    ans = [v,v,v]
-  else
-    hue = hue*6.0
-    if ( hue >= 6 )
-      hue = 0.0
-    end
-    i = hue.to_i
-    f = hue - i
-    p = 65535.0 * value * (1.0 - sat)
-    q = 65535.0 * value * (1.0 - (sat * f))
-    t = 65535.0 * value * (1.0 - (sat * (1.0 - f)))
-    case i
-    when 0
-      ans = [v,t,p]
-    when 1
-      ans = [q,v,p]
-    when 2
-      ans = [p,v,t]
-    when 3
-      ans = [p,q,v]
-    when 4
-      ans = [t,p,v]
-    when 5
-      ans = [v,p,q]
-    else
-      raise(eException,"i value #{i} is out of range")
-    end
-  end
-  return ans
-end
-
-
-def _null_binding
-  Module.new.instance_eval{binding}
-end
-private :_null_binding
-
-def doUpdate
-  newCmd = $command.to_s.gsub("%%","\"#{$color}\"")
-  eval(newCmd, _null_binding)
-end
-
-
-def tc_scaleChanged
-  if( $updating.to_i == 1 )
-    return
-  end
-
-  $master = :scale if $master == nil
-
-  scale1 = $root.middle.middle.scale1
-  scale2 = $root.middle.middle.scale2
-  scale3 = $root.middle.middle.scale3
-
-  case $colorSpace.value.intern
-  when :rgb
-    $red = (scale1.get * 65.535).to_i
-    $green = (scale2.get * 65.535).to_i
-    $blue = (scale3.get * 65.535).to_i
-  when :cmy
-    $red = (65535 - scale1.get * 65.535).to_i
-    $green = (65535 - scale2.get * 65.535).to_i
-    $blue = (65535 - scale3.get * 65.535).to_i
-  when :hsb
-    list = hsbToRgb(scale1.get / 1000.0,
-		    scale2.get / 1000.0,
-		    scale3.get / 1000.0)
-    $red = list[0]
-    $green = list[1]
-    $blue = list[2]
-  else
-    raise(Exception,"unknown colorSpace")
-  end
-  $color = format("#%04x%04x%04x",$red.to_i,$green.to_i,$blue.to_i)
-  $name.value = $color if $master == :scale
-  $root.middle.right.set_color($color)
-  if( $autoUpdate.to_i == 1 )
-    doUpdate
-  end
-  Tk.update(true)
-  $master = nil if $master == :scale
-end
-
-
-def tc_setScales
-  $updating.value = 1
-
-  scale1 = $root.middle.middle.scale1
-  scale2 = $root.middle.middle.scale2
-  scale3 = $root.middle.middle.scale3
-
-  case $colorSpace.value.intern
-  when :rgb
-    scale1.set($red / 65.535)
-    scale2.set($green / 65.535)
-    scale3.set($blue / 65.535)
-  when :cmy
-    scale1.set((65535 - $red) / 65.535)
-    scale2.set((65535 - $green) / 65.535)
-    scale3.set((65535 - $blue) / 65.535)
-  when :hsb
-    list = rgbToHsv($red,$green,$blue)
-    scale1.set( list[0] * 1000.0 )
-    scale2.set( list[1] * 1000.0 )
-    scale3.set( list[2] * 1000.0 )
-  else
-    raise(Exception,"unknown colorSpace")
-  end
-
-  $updating.value = 0
-end
-
-
-def tc_loadNamedColor(name)
-  $name.value = name
-  $master = :name if $master == nil
-  if name[0,1] != "#"
-    list = TkWinfo.rgb($root.middle.right.swatch,name)
-    $red = list[0]
-    $green = list[1]
-    $blue = list[2]
-  else
-    case name.length
-    when 4
-      fmt = /#(.{1})(.{1})(.{1})/
-      shift = 12
-    when 7
-      fmt = /#(.{2})(.{2})(.{2})/
-      shift = 8
-    when 10
-      fmt = /#(.{3})(.{3})(.{3})/
-      shift = 4
-    when 13
-      fmt = /#(.{4})(.{4})(.{4})/
-      shift = 0
-    else
-      raise(eException,"syntax error in color name \"#{name}\"")
-    end
-    name.scan(fmt){|strlist|
-      if strlist.length != 3
-	raise(eException,"syntax error in color name \"#{name}\"")
-      end
-      $red = strlist[0].hex
-      $green = strlist[1].hex
-      $blue = strlist[2].hex
-    }
-    $red = $red << shift
-    $green = $green << shift
-    $blue = $blue << shift
-  end
-
-  tc_setScales
-  $color = format("#%04x%04x%04x",$red,$green,$blue)
-  $root.middle.right.set_color($color)
-  if $autoUpdate.to_i == 1
-    doUpdate
-  end
-  Tk.update(true)
-  $master = nil if $master == :name
-end
-
-
-def changeColorSpace(space)
-  case space
-  when :rgb
-    $label1.value = "Red"
-    $label2.value = "Green"
-    $label3.value = "Blue"
-  when :cmy
-    $label1.value = "Cyan"
-    $label2.value = "Magenta"
-    $label3.value = "Yellow"
-  when :hsb
-    $label1.value = "Hue"
-    $label2.value = "Saturation"
-    $label3.value = "Brightness"
-  end
-  tc_setScales
-end
-
-
-# menu
-
-class TkColorMenuFrame<TkFrame
-  def initialize(parent)
-    super(parent,
-	  "relief"=>"raised",
-	  "borderwidth"=>"2")
-
-    # File menubutton
-    @file = TkMenubutton.new(self){|button|
-
-      # File menu
-      @file_menu = TkMenu.new(button){
-	add "radio",
-	  "label" => "RGB color space",
-	  "variable" => $colorSpace,
-	  "value" => :rgb,
-	  "underline" => "0",
-	  "command" => proc{changeColorSpace(:rgb)}
-	add "radio",
-	  "label" => "CMY color space",
-	  "variable" => $colorSpace,
-	  "value" => :cmy,
-	  "underline" => "0",
-	  "command" => proc{changeColorSpace(:cmy)}
-	add "radio",
-	  "label" => "HSB color space",
-	  "variable" => $colorSpace,
-	  "value" => :hsb,
-	  "underline" => "0",
-	  "command" => proc{changeColorSpace(:hsb)}
-	add "separator"
-	add "radio",
-	  "label" => "Automatic updates",
-	  "variable" => $autoUpdate,
-	  "value" => "1",
-	  "underline" => "0"
-	add "radio",
-	  "label" => "Manual updates",
-	  "variable" => $autoUpdate,
-	  "value" => "0",
-	  "underline" => "0"
-	add "separator"
-	add "command",
-	  "label" => "Exit program",
-	  "underline" => "0",
-	  "command" => proc{exit}
-      }
-
-      # assign File menu to File button
-      menu @file_menu
-
-      text "File"
-      underline "0"
-    }.pack("side"=>"left")
-
-    self
-  end
-end
-
-
-# bottom frame
-class TkColorBotFrame<TkFrame
-  def initialize(parent)
-    super(parent,
-	  "relief"=> "raised",
-	  "borderwidth"=> 2)
-
-    @commandLabel = TkLabel.new(self,
-				"text"=> "Command:")
-    @command = TkEntry.new(self,
-			   "relief"=> "sunken",
-			   "borderwidth"=> "2",
-			   "textvariable"=> $command,
-			   "font"=> "-Adobe-Courier-Medium-R-Normal--*-120-*-*-*-*-*-*")
-    @update = TkButton.new(self,
-			   "text"=> "Update",
-			   "command"=> proc{doUpdate})
-    @commandLabel.pack("side"=>"left")
-    @update.pack("side"=>"right","pady"=>".1c","padx"=>".25c")
-    @command.pack("expand"=>"yes","fill"=>"x","ipadx"=>".25c")
-
-    self
-  end
-end
-
-
-# left side frame of middle level
-class TkColorMiddleLeftFrame<TkFrame
-  def initialize(parent)
-    super(parent)
-
-    for i in ["/usr/local/lib/X11rgb.txt","/usr/lib/X11/rgb.txt",
-	"/X11/R5/lib/X11/rgb.txt","/X11/R4/lib/rgb/rgb.txt",
-	"/usr/openwin/lib/X11/rgb.txt"]
-      if !File.readable?(i)
-	next
-      end
-      f = File.open(i)
-      @scroll = TkScrollbar.new(self,
-				"orient"=>"vertical",
-				"relief"=>"sunken",
-				"borderwidth"=>"2")
-      @scroll.pack("side"=>"right","fill"=>"y")
-      @names = TkListbox.new(self,
-			     "width"=>"20",
-			     "height"=>"12",
-			     "yscrollcommand"=> proc{|first,last| @scroll.set first,last},
-			     "relief"=>"sunken",
-			     "borderwidth"=>"2",
-			     "exportselection"=>"false")
-      @scroll.command(proc{|*args| @names.yview(*args)})
-      @names.bind("Double-1",proc{
-		    tc_loadNamedColor(@names.get(@names.curselection))})
-      @names.pack("side"=>"left")
-      while (line = f.gets)
-	line.chop!
-	linelist = line.split(/[ \t]+/)
-	if linelist.length == 4
-	  @names.insert("end",linelist[3])
-	end
-      end
-      f.close
-      break
-    end
-
-    self
-  end
-end
-
-
-# middle frame of middle level
-class TkColorMiddleMiddleFrame<TkFrame
-  attr_reader :scale1, :scale2, :scale3
-
-  def initialize(parent)
-    super(parent)
-
-    @f1 = TkFrame.new(self)
-    @f2 = TkFrame.new(self)
-    @f3 = TkFrame.new(self)
-    @f4 = TkFrame.new(self)
-
-    for f in [@f1,@f2,@f3]
-      f.pack("side"=>"top","expand"=>"yes")
-    end
-    @f4.pack("side"=>"top","expand"=>"yes","fill"=>"x")
-
-    @label1 = TkLabel.new(self,"textvariable"=>$label1)
-    @scale1 = TkScale.new(self,"from"=>"0","to"=>"1000","length"=>"6c",
-			  "orient"=>"horizontal",
-			  "command"=>proc{tc_scaleChanged})
-    @scale1.pack("side"=>"top","anchor"=>"w")
-    @label1.pack("side"=>"top","anchor"=>"w")
-
-    @label2 = TkLabel.new(self,"textvariable"=>$label2)
-    @scale2 = TkScale.new(self,"from"=>"0","to"=>"1000","length"=>"6c",
-			  "orient"=>"horizontal",
-			  "command"=>proc{tc_scaleChanged})
-    @scale2.pack("side"=>"top","anchor"=>"w")
-    @label2.pack("side"=>"top","anchor"=>"w")
-
-    @label3 = TkLabel.new(self,"textvariable"=>$label3)
-    @scale3 = TkScale.new(self,"from"=>"0","to"=>"1000","length"=>"6c",
-			  "orient"=>"horizontal",
-			  "command"=>proc{tc_scaleChanged})
-    @scale3.pack("side"=>"top","anchor"=>"w")
-    @label3.pack("side"=>"top","anchor"=>"w")
-
-    @nameLabel = TkLabel.new(self,"text"=>"Name:")
-    @name = TkEntry.new(self,"relief"=>"sunken","borderwidth"=>"2",
-			"textvariable"=>$name,"width"=>"10",
-			"font"=>"-Adobe-Courier-Medium-R-Normal--*-120-*-*-*-*-*-*")
-    @nameLabel.pack("side"=>"left")
-    @name.pack("side"=>"right", "expand"=>"1", "fill"=>"x")
-    @name.bind("Return",proc{tc_loadNamedColor $name.to_s})
-
-    self
-  end
-end
-
-
-class TkColorMiddleRightFrame<TkFrame
-  attr_reader :swatch
-
-  def initialize(parent)
-    super(parent)
-    @swatch = TkFrame.new(self, "width"=>"2c", "height"=>"5c",
-			  "background"=>$color)
-    @value = TkLabel.new(self,
-			 "text"=>$color,
-			 "width"=>"13",
-			 "font"=>"-Adobe-Courier-Medium-R-Normal--*-120-*-*-*-*-*-*")
-    @swatch.pack("side"=>"top","expand"=>"yes","fill"=>"both")
-    @value.pack("side"=>"bottom","pady"=>".25c")
-
-    self
-  end
-
-  def set_color(color)
-    @swatch["background"] = color
-    @value["text"] = color
-  end
-end
-
-
-
-# middle level frame
-class TkColorMiddleFrame<TkFrame
-  attr_reader :left, :middle, :right
-
-  def initialize(parent)
-    super(parent,
-	  "relief"=> "raised",
-	  "borderwidth"=> "2")
-
-    @left = TkColorMiddleLeftFrame.new(self)
-    @left.pack("side"=>"left","padx"=>".25c","pady"=>".25c")
-
-    @middle = TkColorMiddleMiddleFrame.new(self)
-    @middle.pack("side"=>"left","expand"=>"yes","fill"=>"y")
-
-    @right = TkColorMiddleRightFrame.new(self)
-    @right.pack("side"=>"left","padx"=>".25c","pady"=>".25c","anchor"=>"s")
-
-    self
-  end
-end
-
-
-class TkColor<TkRoot
-  attr_reader :menu, :bottom, :middle
-
-  def initialize(*args)
-    super(*args)
-    @menu = TkColorMenuFrame.new(self)
-    @menu.pack("side"=>"top", "fill"=>"x")
-
-    @bottom = TkColorBotFrame.new(self)
-    @bottom.pack("side"=>"bottom","fill"=>"x")
-
-    @middle = TkColorMiddleFrame.new(self)
-    @middle.pack("side"=>"top","fill"=>"both")
-
-    self
-  end
-end
-
-
-$root = TkColor.new
-changeColorSpace :rgb
-
-# start eventloop
-Tk.mainloop
diff --git a/ext/tk/sample/demos-en/text.rb b/ext/tk/sample/demos-en/text.rb
deleted file mode 100644
index c44be395b6..0000000000
--- a/ext/tk/sample/demos-en/text.rb
+++ /dev/null
@@ -1,129 +0,0 @@
-# frozen_string_literal: false
-# text.rb
-#
-# This demonstration script creates a text widget that describes
-# the basic editing functions.
-#
-# text (basic facilities) widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($text_demo) && $text_demo
-  $text_demo.destroy
-  $text_demo = nil
-end
-
-# demo toplevel widget
-$text_demo = TkToplevel.new {|w|
-  title("Text Demonstration - Basic Facilities")
-  iconname("text")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($text_demo).pack(:fill=>:both, :expand=>true)
-
-# version check
-if ((Tk::TK_VERSION.split('.').collect{|n| n.to_i} <=> [8,4]) < 0)
-  undo_support = false
-else
-  undo_support = true
-end
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $text_demo
-      $text_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'text'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# text
-TkText.new(base_frame){|t|
-  relief 'sunken'
-  bd 2
-  setgrid 1
-  height 30
-  if undo_support
-    undo true
-    autoseparators true
-  end
-  TkScrollbar.new(base_frame) {|s|
-    pack('side'=>'right', 'fill'=>'y')
-    command proc{|*args| t.yview(*args)}
-    t.yscrollcommand proc{|first,last| s.set first,last}
-  }
-  pack('expand'=>'yes', 'fill'=>'both')
-
-  #
-  insert('0.0', <<EOT)
-This window is a text widget.  It displays one or more lines of text
-and allows you to edit the text.  Here is a summary of the things you
-can do to a text widget:
-
-1. Scrolling. Use the scrollbar to adjust the view in the text window.
-
-2. Scanning. Press mouse button 2 in the text window and drag up or down.
-This will drag the text at high speed to allow you to scan its contents.
-
-3. Insert text. Press mouse button 1 to set the insertion cursor, then
-type text.  What you type will be added to the widget.
-
-4. Select. Press mouse button 1 and drag to select a range of characters.
-Once you've released the button, you can adjust the selection by pressing
-button 1 with the shift key down.  This will reset the end of the
-selection nearest the mouse cursor and you can drag that end of the
-selection by dragging the mouse before releasing the mouse button.
-You can double-click to select whole words or triple-click to select
-whole lines.
-
-5. Delete and replace. To delete text, select the characters you'd like
-to delete and type Backspace or Delete.  Alternatively, you can type new
-text, in which case it will replace the selected text.
-
-6. Copy the selection. To copy the selection into this window, select
-what you want to copy (either here or in another application), then
-click button 2 to copy the selection to the point of the mouse cursor.
-
-7. Edit.  Text widgets support the standard Motif editing characters
-plus many Emacs editing characters.  Backspace and Control-h erase the
-character to the left of the insertion cursor.  Delete and Control-d
-erase the character to the right of the insertion cursor.  Meta-backspace
-deletes the word to the left of the insertion cursor, and Meta-d deletes
-the word to the right of the insertion cursor.  Control-k deletes from
-the insertion cursor to the end of the line, or it deletes the newline
-character if that is the only thing left on the line.  Control-o opens
-a new line by inserting a newline character to the right of the insertion
-cursor.  Control-t transposes the two characters on either side of the
-insertion cursor. #{
-      if undo_support
-        undo_text = "Control-z undoes the last editing action performed,\nand "
-        case $tk_platform['platform']
-        when "unix", "macintosh"
-          undo_text << "Control-Shift-z"
-        else # 'windows'
-          undo_text << "Control-y"
-        end
-        undo_text << "redoes undone edits."
-      else
-        ""
-      end
-}
-
-8. Resize the window.  This widget has been configured with the "setGrid"
-option on, so that if you resize the window it will always resize to an
-even number of characters high and wide.  Also, if you make the window
-narrow you can see that long lines automatically wrap around onto
-additional lines so that all the information is always visible.
-EOT
-
-  set_insert('0.0')
-}
diff --git a/ext/tk/sample/demos-en/textpeer.rb b/ext/tk/sample/demos-en/textpeer.rb
deleted file mode 100644
index 26f8f9f9b9..0000000000
--- a/ext/tk/sample/demos-en/textpeer.rb
+++ /dev/null
@@ -1,77 +0,0 @@
-# frozen_string_literal: false
-#
-# text widget peering demo (called by 'widget')
-#
-# based on Tcl/Tk8.5.0 widget demos
-
-if defined?($textpeer_demo) && $textpeer_demo
-  $textpeer_demo.destroy
-  $textpeer_demo = nil
-end
-
-# demo toplevel widget
-$textpeer_demo = TkToplevel.new {|w|
-  title("Text Widget Peering Demonstration")
-  iconname("textpeer")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($textpeer_demo).pack(:fill=>:both, :expand=>true)
-
-count = [0]
-
-## Define a widget that we peer from; it won't ever actually be shown though
-first = TkText.new(base_frame, :widgetname=>"text#{count[0] += 1}")
-first.insert :end,"This is a coupled pair of text widgets; they are peers to "
-first.insert :end,"each other. They have the same underlying data model, but "
-first.insert :end,"can show different locations, have different current edit "
-first.insert :end,"locations, and have different selections. You can also "
-first.insert :end,"create additional peers of any of these text widgets using "
-first.insert :end,"the Make Peer button beside the text widget to clone, and "
-first.insert :end,"delete a particular peer widget using the Delete Peer "
-first.insert :end,"button."
-
-Tk.update_idletasks  ## for 'first' widget
-
-## Procedures to make and kill clones; most of this is just so that the demo
-## looks nice...
-def makeClone(count, win, txt)
-  cnt = (count[0] += 1)
-  peer = TkText::Peer.new(txt, win, :widgetname=>"text#{cnt}")
-  sbar = TkScrollbar.new(win, :widgetname=>"sb#{cnt}")
-  peer.yscrollbar sbar
-  b1 = TkButton.new(win, :widgetname=>"clone#{cnt}", :text=>'Make Peer',
-                    :command=>proc{makeClone(count, win, peer)})
-  b2 = TkButton.new(win, :widgetname=>"kill#{cnt}", :text=>'Delete Peer',
-                    :command=>proc{killClone(win, cnt)})
-  row = cnt * 2
-  TkGrid.configure(peer, sbar, b1, :sticky=>'nsew', :row=>row)
-  TkGrid.configure('^',  '^',  b2, :sticky=>'nsew', :row=>(row+=1))
-  TkGrid.configure(b1,  b2, :sticky=>'new')
-  TkGrid.rowconfigure(win,  b2, :weight=>1)
-end
-
-def killClone(win, cnt)
-  Tk.destroy("#{win.path}.text#{cnt}",  "#{win.path}.sb#{cnt}",
-             "#{win.path}.clone#{cnt}", "#{win.path}.kill#{cnt}")
-end
-
-## Now set up the GUI
-makeClone(count, base_frame, first)
-makeClone(count, base_frame, first)
-first.destroy
-
-## See Code / Dismiss buttons
-TkFrame.new(base_frame){|f|
-  TkButton.new(f, :text=>'Dismiss', :width=>15, :command=>proc{
-                 $textpeer_demo.destroy
-                 $textpeer_demo = nil
-               }).pack(:side=>:left, :expand=>true)
-
-  TkButton.new(f, :text=>'See Code', :width=>15, :command=>proc{
-                 showCode 'textpeer'
-               }).pack(:side=>:left, :expand=>true)
-
-  TkGrid.configure(f, '-', '-', :sticky=>'ew', :row=>5000)
-}
-TkGrid.columnconfigure(base_frame, 0, :weight=>1)
diff --git a/ext/tk/sample/demos-en/timer b/ext/tk/sample/demos-en/timer
deleted file mode 100644
index 6cb7c87e09..0000000000
--- a/ext/tk/sample/demos-en/timer
+++ /dev/null
@@ -1,136 +0,0 @@
-#!/usr/bin/env ruby
-#
-# timer --
-# This script generates a counter with start,stop and reset buttons.
-#
-# Copyright (C) 1998 Takaaki Tateishi (ttate@jaist.ac.jp)
-# last update: Sat Jun 27 12:24:14 JST 1998
-#
-
-require "tk"
-require "thread"
-require "tkafter"
-
-$time = "0.00"
-$m = Mutex.new
-$loop = false
-
-def timer_stop
-  $loop = false
-  $m.lock
-end
-
-def timer_start
-  $loop = true
-  $m.unlock
-end
-
-def timer_reset
-  $time = "0.00"
-  $root.countframe.counter['text'] = $time
-end
-
-def timer_loop
-  if $loop
-    $time = $time.succ
-    $root.countframe.counter['text'] = $time
-  end
-  Tk.after(10,proc{timer_loop})
-end
-
-
-#
-# thread version
-#
-def timer_loop2
-  while true
-    $m.lock
-    $time = $time.succ
-    $root.countframe.counter['text'] = $time
-    sleep(0.01)
-    $m.unlock
-  end
-end
-
-#
-# TkAfter
-#
-def timer_loop3
-  if $loop
-    $time = $time.succ
-    $root.countframe.counter['text'] = $time
-  end
-end
-
-
-class CountFrame < TkFrame
-  attr_reader :counter
-
-  def initialize(parent=nil,keys=nil)
-    super(parent,keys)
-    @counter = TkLabel.new(self,
-			   'text'=>$time,
-			   'relief'=>'raised')
-    @counter.pack('fill'=>'both')
-    self
-  end
-end
-
-
-class ButtonFrame < TkFrame
-  def initialize(parent=nil,keys=nil)
-    super(parent,keys)
-=begin
-    @stop = TkButton.new(self,
-			 'text'=>'Stop',
-			 'command'=>proc{timer_stop})
-    @start = TkButton.new(self,
-			  'text'=>'Start',
-			  'command'=>proc{timer_start})
-=end
-    @stop  = TkButton.new(self, :text=>'Stop',  :state=>:disabled)
-    @start = TkButton.new(self, :text=>'Start', :state=>:normal)
-
-    @stop.command proc{
-      timer_stop
-      @start.state(:normal)
-      @stop.state(:disabled)
-    }
-    @start.command proc{
-      timer_start
-      @stop.state(:normal)
-      @start.state(:disabled)
-    }
-
-    @reset = TkButton.new(self,
-			  'text'=>'Reset',
-			  'command'=>proc{timer_reset})
-    for b in [@stop,@start,@reset]
-      b.pack('side'=>'left', 'fill'=>'both', 'expand'=>'yes')
-    end
-  end
-end
-
-
-class Timer < TkRoot
-  attr_reader :countframe
-
-  def initialize(*args)
-    super(*args)
-    @countframe = CountFrame.new(self)
-    @buttonframe = ButtonFrame.new(self)
-    for f in [@buttonframe,@countframe]
-      f.pack('side'=>'top', 'fill'=>'both')
-    end
-    self
-  end
-end
-
-
-$root = Timer.new
-
-#$thread = Thread.start{timer_loop2}
-#timer_loop
-TkAfter.new(10,-1,proc{timer_loop3}).start
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-en/tkencoding.rb b/ext/tk/sample/demos-en/tkencoding.rb
deleted file mode 100644
index 01a11ad7ed..0000000000
--- a/ext/tk/sample/demos-en/tkencoding.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-# frozen_string_literal: false
-# -*- ruby -*-
-#
-# tkencoding.rb
-# written by ttate@jaist.ac.jp
-
-class TclTkIp
-  alias __eval _eval
-  alias __invoke _invoke
-  private :__eval
-  private :__invoke
-
-  attr_accessor :encoding
-
-  def _eval(cmd)
-    if( @encoding )
-      _fromUTF8(__eval(_toUTF8(cmd,@encoding)),@encoding)
-    else
-      __eval(cmd)
-    end
-  end
-
-  def _invoke(*cmds)
-    if( @encoding )
-      cmds = cmds.collect{|cmd| _toUTF8(cmd,@encoding)}
-      _fromUTF8(__invoke(*cmds),@encoding)
-    else
-      __invoke(*cmds)
-    end
-  end
-end
-
-module Tk
-  INTERP = TkCore::INTERP
-
-  def encoding=(name)
-    INTERP.encoding = name
-  end
-
-  def encoding
-    INTERP.encoding
-  end
-end
diff --git a/ext/tk/sample/demos-en/toolbar.rb b/ext/tk/sample/demos-en/toolbar.rb
deleted file mode 100644
index 074bb94c1c..0000000000
--- a/ext/tk/sample/demos-en/toolbar.rb
+++ /dev/null
@@ -1,131 +0,0 @@
-# frozen_string_literal: false
-# toolbar.rb --
-#
-# This demonstration script creates a toolbar that can be torn off.
-#
-# based on "Id: toolbar.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($toolbar_demo) && $toolbar_demo
-  $toolbar_demo.destroy
-  $toolbar_demo = nil
-end
-
-$toolbar_demo = TkToplevel.new {|w|
-  title("Ttk Menu Buttons")
-  iconname("toolbar")
-  positionWindow(w)
-}
-
-base_frame = Ttk::Frame.new($toolbar_demo).pack(:fill=>:both, :expand=>true)
-
-if Tk.windowingsystem != 'aqua'
-  msg = Ttk::Label.new(base_frame, :wraplength=>'4i',
-                       :text=>Tk::UTF8_String.new(<<EOL))
-This is a demonstration of how to do \
-a toolbar that is styled correctly \
-and which can be torn off (this feature requires Tcl/Tk8.5). \
-The buttons are configured to be \\u201Ctoolbar style\\u201D buttons by \
-telling them that they are to use the Toolbutton style. At the left \
-end of the toolbar is a simple marker that the cursor changes to a \
-movement icon over; drag that away from the toolbar to tear off the \
-whole toolbar into a separate toplevel widget. When the dragged-off \
-toolbar is no longer needed, just close it like any normal toplevel \
-and it will reattach to the window it was torn off from.
-EOL
-else
-  msg = Ttk::Label.new(base_frame, :wraplength=>'4i',
-                       :text=>Tk::UTF8_String.new(<<EOL))
-This is a demonstration of how to do \
-a toolbar that is styled correctly. The buttons are configured to \
-be \\u201Ctoolbar style\\u201D buttons by telling them that they are \
-to use the Toolbutton style.
-EOL
-end
-
-## Set up the toolbar hull
-tbar_base = Tk::Frame.new(base_frame, # Must be a standard Tk frame!
-                          :widgetname=>'toolbar') # for window title
-sep = Ttk::Separator.new(base_frame)
-to_base = Ttk::Frame.new(tbar_base, :cursor=>'fleur')
-if Tk.windowingsystem != 'aqua'
-  to  = Ttk::Separator.new(to_base, :orient=>:vertical)
-  to2 = Ttk::Separator.new(to_base, :orient=>:vertical)
-  to.pack(:fill=>:y, :expand=>true, :padx=>2, :side=>:left)
-  to2.pack(:fill=>:y, :expand=>true, :side=>:left)
-end
-
-contents = Ttk::Frame.new(tbar_base)
-Tk.grid(to_base, contents, :sticky=>'nsew')
-tbar_base.grid_columnconfigure(contents, :weight=>1)
-contents.grid_columnconfigure(1000, :weight=>1)
-
-if Tk.windowingsystem != 'aqua'
-  ## Bindings so that the toolbar can be torn off and reattached
-  to_base.bind('B1-Motion', '%X %Y'){|x, y| tbar_base.tearoff(to_base, x, y)}
-  to.     bind('B1-Motion', '%X %Y'){|x, y| tbar_base.tearoff(to_base, x, y)}
-  to2.    bind('B1-Motion', '%X %Y'){|x, y| tbar_base.tearoff(to_base, x, y)}
-  def tbar_base.tearoff(w, x, y)
-    on_win = TkWinfo.containing(x, y)
-    return unless (on_win && on_win.path =~ /^#{@path}(\.|$)/)
-    self.grid_remove
-    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) }
-  end
-  def tbar_base.untearoff(w)
-    self.wm_forget
-    w.grid
-    self.grid
-  end
-end
-
-## Some content for the rest of the toplevel
-text = TkText.new(base_frame, :width=>40, :height=>10)
-
-## Toolbar contents
-tb_btn = Ttk::Button.new(tbar_base, :text=>'Button', :style=>'Toolbutton',
-                         :command=>proc{text.insert(:end, "Button Pressed\n")})
-tb_chk = Ttk::Checkbutton.new(tbar_base, :text=>'Check', :style=>'Toolbutton',
-                              :variable=>(check = TkVariable.new),
-                              :command=>proc{
-                                text.insert(:end, "Check is #{check.value}\n")
-                              })
-tb_mbtn = Ttk::Menubutton.new(tbar_base, :text=>'Menu')
-tb_combo = Ttk::Combobox.new(tbar_base, :value=>TkFont.families,
-                             :state=>:readonly)
-tb_mbtn.menu(menu = Tk::Menu.new(tb_mbtn))
-menu.add(:command, :label=>'Just', :command=>proc{text.insert(:end, "Just\n")})
-menu.add(:command, :label=>'An', :command=>proc{text.insert(:end, "An\n")})
-menu.add(:command, :label=>'Example',
-         :command=>proc{text.insert(:end, "Example\n")})
-tb_combo.bind('<ComboboxSelected>'){ text.font.family = tb_combo.get }
-
-## Arrange contents
-Tk.grid(tb_btn, tb_chk, tb_mbtn, tb_combo,
-        :in=>contents, :padx=>2, :sticky=>'ns')
-Tk.grid(tbar_base, :sticky=>'ew')
-Tk.grid(sep, :sticky=>'ew')
-Tk.grid(msg, :sticky=>'ew')
-Tk.grid(text, :sticky=>'nsew')
-base_frame.grid_rowconfigure(text, :weight=>1)
-base_frame.grid_columnconfigure(text, :weight=>1)
-
-## See Code / Dismiss buttons
-Ttk::Frame.new(base_frame) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         Ttk::Button.new(frame, :text=>'See Code',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{showCode 'toolbar'}),
-         Ttk::Button.new(frame, :text=>'Dismiss',
-                         :image=>$image['delete'], :compound=>:left,
-                         :command=>proc{
-                           $toolbar_demo.destroy
-                           $toolbar_demo = nil
-                         }),
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  Tk.grid(frame, :sticky=>'ew')
-}
diff --git a/ext/tk/sample/demos-en/tree.rb b/ext/tk/sample/demos-en/tree.rb
deleted file mode 100644
index e3e5527f79..0000000000
--- a/ext/tk/sample/demos-en/tree.rb
+++ /dev/null
@@ -1,120 +0,0 @@
-# frozen_string_literal: false
-# tree.rb --
-#
-# This demonstration script creates a toplevel window containing a Ttk
-# tree widget.
-#
-# based on "Id: tree.tcl,v 1.4 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($tree_demo) && $tree_demo
-  $tree_demo.destroy
-  $tree_demo = nil
-end
-
-$tree_demo = TkToplevel.new {|w|
-  title("Directory Browser")
-  iconname("tree")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($tree_demo).pack(:fill=>:both, :expand=>true)
-
-## Explanatory text
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i',
-               :justify=>:left, :anchor=>'n', :padding=>[10, 2, 10, 6],
-               :text=><<EOL).pack(:fill=>:x)
-Ttk is the new Tk themed widget set. \
-One of the widgets it includes is a tree widget, \
-which allows the user to browse a hierarchical data-set such as a filesystem. \
-The tree widget not only allows for the tree part itself, \
-but it also supports an arbitrary number of additional columns \
-which can show additional data (in this case, the size of the files \
-found in your filesystem). \
-You can also change the width of the columns \
-by dragging the boundary between them.
-EOL
-
-## See Code / Dismiss
-Ttk::Frame.new(base_frame) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         Ttk::Button.new(frame, :text=>'See Code',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{showCode 'tree'}),
-         Ttk::Button.new(frame, :text=>'Dismiss',
-                         :image=>$image['delete'], :compound=>:left,
-                         :command=>proc{
-                           $tree_demo.destroy
-                           $tree_demo = nil
-                         }),
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x)
-}
-
-## Code to populate the roots of the tree (can be more than one on Windows)
-def populate_roots(tree)
-  TkComm.simplelist(Tk.tk_call('file', 'volumes')).sort.each{|dir|
-    populate_tree(tree, tree.insert(nil, :end, :text=>dir,
-                                    :values=>[dir, 'directory']))
-  }
-end
-
-## Code to populate a node of the tree
-def populate_tree(tree, node)
-  return if tree.get(node, :type) != 'directory'
-
-  path = tree.get(node, :fullpath)
-  tree.delete(tree.children(node))
-  Dir.glob("#{path}/*").sort.each{|f|
-    type = File.ftype(f) rescue nil
-    id = tree.insert(node, :end,
-                     :text=>File.basename(f), :values=>[f, type]).id
-    if type == 'directory'
-      ## Make it so that this node is openable
-      tree.insert(id, 0, :text=>'dummy')
-      tree.itemconfigure(id, :text=>File.basename(f))
-    elsif type == 'file'
-      size = File.size(f)
-      if size >= 1024*1024*1024
-        size = '%.1f GB' % (size.to_f/1024/1024/1024)
-      elsif size >= 1024*1024
-        size = '%.1f MB' % (size.to_f/1024/1024)
-      elsif size >= 1024
-        size = '%.1f KB' % (size.to_f/1024)
-      else
-        size = '%.1f bytes' % (size.to_f/1024)
-      end
-      tree.set(id, :size, size)
-    end
-  }
-
-  # Stop this code from rerunning on the current node
-  tree.set(node, :type, 'processed_directory')
-end
-
-## Create the tree and set it up
-tree = Ttk::Treeview.new(base_frame, :columns=>%w(fullpath type size),
-                         :displaycolumns=>['size'])
-if Tk.windowingsystem != 'aqua'
-  vsb = tree.yscrollbar(Ttk::Scrollbar.new(base_frame))
-  hsb = tree.xscrollbar(Ttk::Scrollbar.new(base_frame))
-else
-  vsb = tree.yscrollbar(Tk::Scrollbar.new(base_frame))
-  hsb = tree.xscrollbar(Tk::Scrollbar.new(base_frame))
-end
-
-tree.heading_configure('#0', :text=>'Directory Structure')
-tree.heading_configure('size', :text=>'File Size')
-tree.column_configure('size', :stretch=>0, :width=>70)
-populate_roots(tree)
-tree.bind('<TreeviewOpen>', '%W'){|w| populate_tree(w, w.focus_item)}
-
-## Arrange the tree and its scrollbars in the toplevel
-container = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
-container.lower
-Tk.grid(tree, vsb, :in=>container, :sticky=>'nsew')
-Tk.grid(hsb,       :in=>container, :sticky=>'nsew')
-container.grid_columnconfigure(0, :weight=>1)
-container.grid_rowconfigure(0, :weight=>1)
diff --git a/ext/tk/sample/demos-en/ttkbut.rb b/ext/tk/sample/demos-en/ttkbut.rb
deleted file mode 100644
index e308cdd23f..0000000000
--- a/ext/tk/sample/demos-en/ttkbut.rb
+++ /dev/null
@@ -1,140 +0,0 @@
-# frozen_string_literal: false
-# ttkbut.rb
-#
-# This demonstration script creates a toplevel window containing several
-# simple Ttk widgets, such as labels, labelframes, buttons, checkbuttons and
-# radiobuttons.
-#
-# based on "Id: ttkbut.tcl,v 1.4 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($ttkbut_demo) && $ttkbut_demo
-  $ttkbut_demo.destroy
-  $ttkbut_demo = nil
-end
-
-$ttkbut_demo = TkToplevel.new {|w|
-  title("Simple Ttk Widgets")
-  iconname("ttkbut")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($ttkbut_demo).pack(:fill=>:both, :expand=>true)
-
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
-               :text=><<EOL).pack(:side=>:top, :fill=>:x)
-Ttk is the new Tk themed widget set. This is a Ttk themed label, \
-and below are three groups of Ttk widgets in Ttk labelframes. \
-The first group are all buttons that set the current application theme \
-when pressed. The second group contains three sets of checkbuttons, \
-with a separator widget between the sets. Note that the "Enabled" \
-button controls whether all the other themed widgets in this toplevel are \
-in the disabled state. The third group has a collection of linked \
-radiobuttons.
-EOL
-
-## Add buttons for setting the theme
-buttons = Ttk::Labelframe.new(base_frame, :text=>'Buttons')
-# Ttk::Style.theme_names.each{|theme|
-#   Ttk::Button.new(buttons, :text=>theme,
-#                   :command=>proc{Ttk::Style.theme_use theme}).pack(:pady=>2)
-# }
-Ttk.themes.each{|theme|
-  Ttk::Button.new(buttons, :text=>theme,
-                  :command=>proc{Ttk.set_theme theme}).pack(:pady=>2)
-}
-
-## Helper procedure for the top checkbutton
-def setState(root, value, *excepts)
-  return if excepts.member?(root)
-
-  ## Non-Ttk widgets (e.g. the toplevel) will fail, so make it silent
-  begin
-    root.state = value
-  rescue
-  end
-
-  ## Recursively invoke on all children of this root that are in the same
-  ## toplevel widget
-  root.winfo_children.each{|w|
-    setState(w, value, *excepts) if w.winfo_toplevel == root.winfo_toplevel
-  }
-end
-
-## Set up the checkbutton group
-checks = Ttk::Labelframe.new(base_frame, :text=>'Checkbuttons')
-enabled = TkVariable.new(true)
-e = Ttk::Checkbutton.new(checks, :text=>'Enabled', :variable=>enabled,
-                         :command=>proc{
-                           setState($ttkbut_demo,
-                                    ((enabled.bool)? "!disabled" : "disabled"),
-                                    e)
-                         })
-
-## See ttk_widget(n) for other possible state flags
-sep1 = Ttk::Separator.new(checks)
-sep2 = Ttk::Separator.new(checks)
-
-cheese  = TkVariable.new
-tomato  = TkVariable.new
-basil   = TkVariable.new
-oregano = TkVariable.new
-
-c1 = Ttk::Checkbutton.new(checks, :text=>'Cheese',  :variable=>cheese)
-c2 = Ttk::Checkbutton.new(checks, :text=>'Tomato',  :variable=>tomato)
-c3 = Ttk::Checkbutton.new(checks, :text=>'Basil',   :variable=>basil)
-c4 = Ttk::Checkbutton.new(checks, :text=>'Oregano', :variable=>oregano)
-
-Tk.pack(e, sep1, c1, c2, sep2, c3, c4, :fill=>:x, :pady=>2)
-
-## Set up the radiobutton group
-radios = Ttk::Labelframe.new(base_frame, :text=>'Radiobuttons')
-
-happiness = TkVariable.new
-
-r1 = Ttk::Radiobutton.new(radios, :variable=>happiness,
-                          :text=>'Great', :value=>'great')
-r2 = Ttk::Radiobutton.new(radios, :variable=>happiness,
-                          :text=>'Good', :value=>'good')
-r3 = Ttk::Radiobutton.new(radios, :variable=>happiness,
-                          :text=>'Ok', :value=>'ok')
-r4 = Ttk::Radiobutton.new(radios, :variable=>happiness,
-                          :text=>'Poor', :value=>'poor')
-r5 = Ttk::Radiobutton.new(radios, :variable=>happiness,
-                          :text=>'Awful', :value=>'awful')
-
-Tk.pack(r1, r2, r3, r4, r5, :fill=>:x, :padx=>3, :pady=>2)
-
-## See Code / Dismiss
-Ttk::Frame.new(base_frame) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         Ttk::Button.new(frame, :text=>'See Variables',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{
-                           showVars(base_frame, ['enabled', enabled],
-                                    ['cheese', cheese], ['tomato', tomato],
-                                    ['basil', basil], ['oregano', oregano],
-                                    ['happiness', happiness])
-                         }),
-         Ttk::Button.new(frame, :text=>'See Code',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{showCode 'ttkbut'}),
-         Ttk::Button.new(frame, :text=>'Dismiss',
-                         :image=>$image['delete'], :compound=>:left,
-                         :command=>proc{
-                           tmppath = $ttkbut_demo
-                           $ttkbut_demo = nil
-                           $showVarsWin[tmppath.path] = nil
-                           tmppath.destroy
-                         }),
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x, :expand=>true)
-}
-
-## Arrange things neatly
-f = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
-f.lower
-Tk.grid(buttons, checks, radios, :in=>f, :sticky=>'nwe', :pady=>2, :padx=>3)
-f.grid_columnconfigure([0, 1, 2], :weight=>1, :uniform=>:yes)
diff --git a/ext/tk/sample/demos-en/ttkmenu.rb b/ext/tk/sample/demos-en/ttkmenu.rb
deleted file mode 100644
index f84c9138d5..0000000000
--- a/ext/tk/sample/demos-en/ttkmenu.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-# frozen_string_literal: false
-# ttkmenu.rb --
-#
-# This demonstration script creates a toplevel window containing several Ttk
-# menubutton widgets.
-#
-# based on "Id: ttkmenu.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($ttkmenu_demo) && $ttkmenu_demo
-  $ttkmenu_demo.destroy
-  $ttkmenu_demo = nil
-end
-
-$ttkmenu_demo = TkToplevel.new {|w|
-  title("Ttk Menu Buttons")
-  iconname("ttkmenu")
-  positionWindow(w)
-}
-
-base_frame = Ttk::Frame.new($ttkmenu_demo).pack(:fill=>:both, :expand=>true)
-
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
-               :text=><<EOL).pack(:side=>:top, :fill=>:x)
-Ttk is the new Tk themed widget set, \
-and one widget that is available in themed form is the menubutton. \
-Below are some themed menu buttons \
-that allow you to pick the current theme in use. \
-Notice how picking a theme changes the way \
-that the menu buttons themselves look, \
-and that the central menu button is styled differently \
-(in a way that is normally suitable for toolbars). \
-However, there are no themed menus; the standard Tk menus were judged \
-to have a sufficiently good look-and-feel on all platforms, \
-especially as they are implemented as native controls in many places.
-EOL
-
-Ttk::Separator.new(base_frame).pack(:side=>:top, :fill=>:x)
-
-## See Code / Dismiss
-Ttk::Frame.new($ttkmenu_demo) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         Ttk::Button.new(frame, :text=>'See Code',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{showCode 'ttkmenu'}),
-         Ttk::Button.new(frame, :text=>'Dismiss',
-                         :image=>$image['delete'], :compound=>:left,
-                         :command=>proc{
-                           $ttkmenu_demo.destroy
-                           $ttkmenu_demo = nil
-                         }),
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x)
-}
-
-b1 = Ttk::Menubutton.new(base_frame,:text=>'Select a theme',:direction=>:above)
-b2 = Ttk::Menubutton.new(base_frame,:text=>'Select a theme',:direction=>:left)
-b3 = Ttk::Menubutton.new(base_frame,:text=>'Select a theme',:direction=>:right)
-b4 = Ttk::Menubutton.new(base_frame,:text=>'Select a theme',:direction=>:flush,
-                         :style=>Ttk::Menubutton.style('Toolbutton'))
-b5 = Ttk::Menubutton.new(base_frame,:text=>'Select a theme',:direction=>:below)
-
-b1.menu(m1 = Tk::Menu.new(b1, :tearoff=>false))
-b2.menu(m2 = Tk::Menu.new(b2, :tearoff=>false))
-b3.menu(m3 = Tk::Menu.new(b3, :tearoff=>false))
-b4.menu(m4 = Tk::Menu.new(b4, :tearoff=>false))
-b5.menu(m5 = Tk::Menu.new(b5, :tearoff=>false))
-
-Ttk.themes.each{|theme|
-  m1.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
-  m2.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
-  m3.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
-  m4.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
-  m5.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
-}
-
-f = Ttk::Frame.new(base_frame).pack(:fill=>:x)
-f1 = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
-f.lower
-
-f.grid_anchor(:center)
-TkGrid('x', b1, 'x', :in=>f, :padx=>3, :pady=>2)
-TkGrid(b2,  b4, b3,  :in=>f, :padx=>3, :pady=>2)
-TkGrid('x', b5, 'x', :in=>f, :padx=>3, :pady=>2)
diff --git a/ext/tk/sample/demos-en/ttknote.rb b/ext/tk/sample/demos-en/ttknote.rb
deleted file mode 100644
index 7540fde3ce..0000000000
--- a/ext/tk/sample/demos-en/ttknote.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-# frozen_string_literal: false
-# ttknote.rb --
-#
-# This demonstration script creates a toplevel window containing a Ttk
-# notebook widget.
-#
-# based on "Id: ttknote.tcl,v 1.5 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($ttknote_demo) && $ttknote_demo
-  $ttknote_demo.destroy
-  $ttknote_demo = nil
-end
-
-$ttknote_demo = TkToplevel.new {|w|
-  title("Ttk Notebook Widget")
-  iconname("ttknote")
-  positionWindow(w)
-}
-
-## See Code / Dismiss
-Ttk::Frame.new($ttknote_demo) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         Ttk::Button.new(frame, :text=>'See Code',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{showCode 'ttknote'}),
-         Ttk::Button.new(frame, :text=>'Dismiss',
-                         :image=>$image['delete'], :compound=>:left,
-                         :command=>proc{
-                           $ttknote_demo.destroy
-                           $ttknote_demo = nil
-                         }),
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x)
-}
-
-base_frame = Ttk::Frame.new($ttknote_demo).pack(:fill=>:both, :expand=>true)
-
-## Make the notebook and set up Ctrl+Tab traversal
-notebook = Ttk::Notebook.new(base_frame).pack(:fill=>:both, :expand=>true,
-                                              :padx=>2, :pady=>3)
-notebook.enable_traversal
-
-## Populate the first pane
-f_msg = Ttk::Frame.new(notebook)
-msg_m = Ttk::Label.new(f_msg, :font=>$font, :wraplength=>'4i',
-                       :justify=>:left, :anchor=>'n', :text=><<EOL)
-Ttk is the new Tk themed widget set. \
-One of the widgets it includes is the notebook widget, \
-which provides a set of tabs that allow the selection of a group of panels, \
-each with distinct content. \
-They are a feature of many modern user interfaces. \
-Not only can the tabs be selected with the mouse, \
-but they can also be switched between using Ctrl+Tab \
-when the notebook page heading itself is selected. \
-Note that the second tab is disabled, and cannot be selected.
-EOL
-neat = TkVariable.new
-after_id = nil
-msg_b = Ttk::Button.new(f_msg, :text=>'Neat!', :underline=>0,
-                        :command=>proc{
-                          neat.value = 'Yeah, I know...'
-                          Tk.after_cancel(after_id) if after_id
-                          after_id = Tk.after(500){neat.value = ''}
-                        })
-msg_b.winfo_toplevel.bind('Alt-n'){ msg_b.focus; msg_b.invoke }
-msg_l = Ttk::Label.new(f_msg, :textvariable=>neat)
-notebook.add(f_msg, :text=>'Description', :underline=>0, :padding=>2)
-Tk.grid(msg_m, '-', :sticky=>'new', :pady=>2)
-Tk.grid(msg_b, msg_l, :pady=>[2, 4])
-f_msg.grid_rowconfigure(1, :weight=>1)
-f_msg.grid_columnconfigure([0, 1], :weight=>1, :uniform=>1)
-
-## Populate the second pane. Note that the content doesn't really matter
-f_disabled = Ttk::Frame.new(notebook)
-notebook.add(f_disabled, :text=>'Disabled', :state=>:disabled)
-
-## Populate the third pane
-f_editor = Ttk::Frame.new(notebook)
-notebook.add(f_editor, :text=>'Text Editor', :underline=>0)
-editor_t = Tk::Text.new(f_editor, :width=>40, :height=>10, :wrap=>:char)
-if Tk.windowingsystem != 'aqua'
-  editor_s = editor_t.yscrollbar(Ttk::Scrollbar.new(f_editor))
-else
-  editor_s = editor_t.yscrollbar(Tk::Scrollbar.new(f_editor))
-end
-editor_s.pack(:side=>:right, :fill=>:y, :padx=>[0,2], :pady=>2)
-editor_t.pack(:fill=>:both, :expand=>true, :padx=>[2,0], :pady=>2)
diff --git a/ext/tk/sample/demos-en/ttkpane.rb b/ext/tk/sample/demos-en/ttkpane.rb
deleted file mode 100644
index 7eb4c29731..0000000000
--- a/ext/tk/sample/demos-en/ttkpane.rb
+++ /dev/null
@@ -1,214 +0,0 @@
-# frozen_string_literal: false
-# ttkpane.rb --
-#
-# This demonstration script creates a Ttk pane with some content.
-#
-# based on "Id: ttkpane.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($ttkpane_demo) && $ttkpane_demo
-  $ttkpane_demo.destroy
-  $ttkpane_demo = nil
-end
-
-$ttkpane_demo = TkToplevel.new {|w|
-  title("Themed Nested Panes")
-  iconname("ttkpane")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($ttkpane_demo).pack(:fill=>:both, :expand=>true)
-
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
-               :text=><<EOL).pack(:side=>:top, :fill=>:x)
-This demonstration shows off a nested set of themed paned windows. \
-Their sizes can be changed by grabbing the area \
-between each contained pane and dragging the divider.
-EOL
-
-Ttk::Separator.new(base_frame).pack(:side=>:top, :fill=>:x)
-
-## See Code / Dismiss
-Ttk::Frame.new(base_frame) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         Ttk::Button.new(frame, :text=>'See Code',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{showCode 'ttkpane'}),
-         Ttk::Button.new(frame, :text=>'Dismiss',
-                         :image=>$image['delete'], :compound=>:left,
-                         :command=>proc{
-                           $ttkpane_demo.destroy
-                           $ttkpane_demo = nil
-                         }),
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x)
-}
-
-frame = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
-
-outer = Ttk::Panedwindow.new(frame, :orient=>:horizontal)
-outer.add(in_left = Ttk::Panedwindow.new(outer, :orient=>:vertical))
-outer.add(in_right = Ttk::Panedwindow.new(outer, :orient=>:vertical))
-in_left.add(left_top = Ttk::Labelframe.new(in_left, :text=>'Button'))
-in_left.add(left_bot = Ttk::Labelframe.new(in_left, :text=>'Clocks'))
-in_right.add(right_top = Ttk::Labelframe.new(in_right, :text=>'Progress'))
-in_right.add(right_bot = Ttk::Labelframe.new(in_right, :text=>'Text'))
-if Tk.windowingsystem == 'aqua'
-  [left_top, left_bot, right_top, right_bot].each{|w| w.padding(3) }
-end
-
-# Fill the button pane
-Ttk::Button.new(left_top, :text=>'Press Me',
-                :command=>proc{
-                  Tk.messageBox(:type=>'ok', :icon=>'info', :message=>'Ouch!',
-                                :detail=>'That hurt...', :parent=>base_frame,
-                                :title=>'Button Pressed')
-                }).pack(:padx=>2, :pady=>5)
-
-
-zones_list = [
-  [':Europe/Berlin'],
-  [':America/Argentina/Buenos_Aires', ':America/Buenos_Aires'],
-  [':Africa/Johannesburg'],
-  [':Europe/London'],
-  [':America/Los_Angeles'],
-  [':Europe/Moscow'],
-  [':America/New_York'],
-  [':Asia/Singapore'],
-  [':Australia/Sydney'],
-  [':Asia/Tokyo'],
-]
-
-zones = []
-
-# Check tzinfo support
-if $tk_major_ver > 8 || ($tk_major_ver == 8 && $tk_minor_ver >= 5)
-  tzinfo = :tcl
-
-  # Force a pre-load of all the timezones needed; otherwise can end up
-  # poor-looking synch problems!
-  zones_list.each{|list|
-    list.each{|zone|
-      begin
-        Tk.tk_call('clock', 'format', '0', '-timezone', zone)
-      rescue RuntimeError
-        # ignore
-      else
-        zones << [zone, zone[%r<[^/:]+$>].tr('_', ' ')]
-        break
-      end
-    }
-  }
-
-else
-  begin
-    require 'tzinfo'
-    tzinfo = :tzinfo
-  rescue Exception
-    begin
-      require 'tzfile'
-      tzinfo = :tzfile
-    rescue Exception
-      tzinfo = nil
-    end
-  end
-
-  case tzinfo
-  when :tzinfo
-    zones_list.each{|list|
-      list.each{|zone|
-        begin
-          tz = TZInfo::Timezone.get(zone[%r<[^:]+$>])
-        rescue Exception
-          # ignore
-        else
-          zones << [tz, zone[%r<[^/:]+$>].tr('_', ' ')]
-          break
-        end
-      }
-    }
-
-  when :tzfile
-    zones_list.each{|list|
-      list.each{|zone|
-        begin
-          tz = TZFile.create(zone[%r<[^:]+$>])
-        rescue Exception
-          # ignore
-        else
-          zones << [tz, zone[%r<[^/:]+$>].tr('_', ' ')]
-          break
-        end
-      }
-    }
-
-  else
-    [ -7, -4, -2, -1, 0, +1, +3, +8, +9, +10 ].each{|zone|
-      zones << [zone, 'UTC%+03d00' % zone]
-    }
-  end
-end
-
-time = TkVariable.new_hash
-
-case tzinfo
-when :tcl
-  update_proc = proc{|now, tz, label|
-    time[label] = Tk.tk_call('clock', 'format', now.tv_sec,
-                             '-timezone', tz, '-format', '%T')
-  }
-when :tzinfo
-  update_proc = proc{|now, tz, label|
-    time[label] = tz.utc_to_local(now).strftime('%H:%M:%S')
-  }
-when :tzfile
-  update_proc = proc{|now, tz, label|
-    time[label] = tz.at(now.tv_sec).strftime('%H:%M:%S')
-  }
-else
-  update_proc = proc{|now, tz, label|
-    time[label] = (now + (tz * 3600)).strftime('%H:%M:%S')
-  }
-end
-
-# Fill the clocks pane
-zones.each_with_index{|(zone, label), idx|
-  Ttk::Separator.new(left_bot).pack(:fill=>:x) if idx > 0
-  Ttk::Label.new(left_bot, :text=>label, :anchor=>'w').pack(:fill=>:x)
-  Ttk::Label.new(left_bot, :textvariable=>time.ref(label),
-                 :anchor=>'w').pack(:fill=>:x)
-}
-
-# Timer start
-every = proc{
-  now = Time.now.utc
-  zones.each{|zone, label| update_proc.call(now, zone, label) }
-}
-TkRTTimer.new(1000, -1, every).start(0, every)
-
-# Fill the progress pane
-Ttk::Progressbar.new(right_top, :mode=>:indeterminate).pack(:fill=>:both, :expand=>true).start
-
-# Fill the text pane
-if Tk.windowingsystem != 'aqua'
-  # The trick with the ttk::frame makes the text widget look like it fits with
-  # the current Ttk theme despite not being a themed widget itself. It is done
-  # by styling the frame like an entry, turning off the border in the text
-  # widget, and putting the text widget in the frame with enough space to allow
-  # the surrounding border to show through (2 pixels seems to be enough).
-  f = Ttk::Frame.new(right_bot, :style=>Ttk::Entry)
-  txt = TkText.new(frame, :wrap=>:word, :width=>30, :borderwidth=>0)
-  txt.pack(:fill=>:both, :expand=>true, :in=>f, :pady=>2, :padx=>2)
-  scr = txt.yscrollbar(Ttk::Scrollbar.new(frame))
-  scr.pack(:side=>:right, :fill=>:y, :in=>right_bot)
-  f.pack(:fill=>:both, :expand=>true)
-  outer.pack(:fill=>:both, :expand=>true)
-else
-  txt = TkText.new(frame, :wrap=>:word, :width=>30, :borderwidth=>0)
-  scr = txt.yscrollbar(TkScrollbar.new(frame))
-  scr.pack(:side=>:right, :fill=>:y, :in=>right_bot)
-  txt.pack(:fill=>:both, :expand=>true, :in=>right_bot)
-  outer.pack(:fill=>:both, :expand=>true, :padx=>10, :pady=>[6, 10])
-end
diff --git a/ext/tk/sample/demos-en/ttkprogress.rb b/ext/tk/sample/demos-en/ttkprogress.rb
deleted file mode 100644
index 09bf398e17..0000000000
--- a/ext/tk/sample/demos-en/ttkprogress.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-# frozen_string_literal: false
-# ttkprogress.rb --
-#
-# This demonstration script creates several progress bar widgets.
-#
-# based on "Id: ttkprogress.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($ttkprogress_demo) && $ttkprogress_demo
-  $ttkprogress_demo.destroy
-  $ttkprogress_demo = nil
-end
-
-$ttkprogress_demo = TkToplevel.new {|w|
-  title("Progress Bar Demonstration")
-  iconname("ttkprogress")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($ttkprogress_demo).pack(:fill=>:both, :expand=>true)
-
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
-               :text=>Tk::UTF8_String.new(<<EOL)).pack(:side=>:top, :fill=>:x)
-Below are two progress bars. \
-The top one is a \\u201Cdeterminate\\u201D progress bar, \
-which is used for showing how far through a defined task the program has got. \
-The bottom one is an \\u201Cindeterminate\\u201D progress bar, \
-which is used to show that the program is busy \
-but does not know how long for. Both are run here in self-animated mode, \
-which can be turned on and off using the buttons underneath.
-EOL
-
-## See Code / Dismiss buttons
-Ttk::Frame.new(base_frame) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         Ttk::Button.new(frame, :text=>'See Code',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{showCode 'ttkprogress'}),
-         Ttk::Button.new(frame, :text=>'Dismiss',
-                         :image=>$image['delete'], :compound=>:left,
-                         :command=>proc{
-                           $ttkprogress_demo.destroy
-                           $ttkprogress_demo = nil
-                         }),
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x)
-}
-
-frame = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
-
-p1 = Ttk::Progressbar.new(frame, :mode=>:determinate)
-p2 = Ttk::Progressbar.new(frame, :mode=>:indeterminate)
-
-start = Ttk::Button.new(frame, :text=>'Start Progress',
-                        :command=>proc{ p1.start; p2.start })
-stop  = Ttk::Button.new(frame, :text=>'Stop Progress',
-                        :command=>proc{ p1.stop; p2.stop })
-
-Tk.grid(p1, '-', :pady=>5, :padx=>10)
-Tk.grid(p2, '-', :pady=>5, :padx=>10)
-Tk.grid(start, stop, :padx=>10, :pady=>5)
-start.grid_configure(:sticky=>'e')
-stop.grid_configure(:sticky=>'w')
-frame.grid_columnconfigure(:all, :weight=>1)
-
diff --git a/ext/tk/sample/demos-en/twind.rb b/ext/tk/sample/demos-en/twind.rb
deleted file mode 100644
index a709f0d188..0000000000
--- a/ext/tk/sample/demos-en/twind.rb
+++ /dev/null
@@ -1,292 +0,0 @@
-# frozen_string_literal: false
-# twind.rb
-#
-# This demonstration script creates a text widget with a bunch of
-# embedded windows.
-#
-# text (embedded windows) widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($twind_demo) && $twind_demo
-  $twind_demo.destroy
-  $twind_demo = nil
-end
-
-# demo toplevel widget
-$twind_demo = TkToplevel.new {|w|
-  title("Text Demonstration - Embedded Windows")
-  iconname("Embedded Windows")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($twind_demo).pack(:fill=>:both, :expand=>true)
-
-# frame
-$twind_buttons = TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc{
-      tmppath = $twind_demo
-      $twind_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc{showCode 'twind'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$twind_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-$twind_text = nil
-TkFrame.new(base_frame, 'highlightthickness'=>2, 'borderwidth'=>2,
-            'relief'=>'sunken') {|f|
-  $twind_text = TkText.new(f, 'setgrid'=>'true', 'font'=>$font,
-                          'width'=>'70', 'height'=>35, 'wrap'=>'word',
-                          'highlightthickness'=>0, 'borderwidth'=>0 ){|t|
-    TkScrollbar.new(f) {|s|
-      command proc{|*args| t.yview(*args)}
-      t.yscrollcommand proc{|first,last| s.set first,last}
-    }.pack('side'=>'right', 'fill'=>'y')
-  }.pack('expand'=>'yes', 'fill'=>'both')
-}.pack('expand'=>'yes', 'fill'=>'both')
-
-#
-$tag_center = TkTextTag.new($twind_text,
-                            'justify' =>'center',
-                            'spacing1'=>'5m',
-                            'spacing3'=>'5m'  )
-$tag_buttons = TkTextTag.new($twind_text,
-                             'lmargin1'=>'1c',
-                             'lmargin2'=>'1c',
-                             'rmargin' =>'1c',
-                             'spacing1'=>'3m',
-                             'spacing2'=>0,
-                             'spacing3'=>0 )
-
-$twind_text.insert('end', "A text widget can contain other widgets embedded ")
-$twind_text.insert('end', "it.  These are called \"embedded windows\", ")
-$twind_text.insert('end', "and they can consist of arbitrary widgets.  ")
-$twind_text.insert('end', "For example, here are two embedded button ")
-$twind_text.insert('end', "widgets.  You can click on the first button to ")
-TkTextWindow.new($twind_text, 'end',
-                 'window'=>TkButton.new($twind_text) {
-                   #text 'ON'
-                   text 'Turn On'
-                   command proc{textWindOn $twind_text,$twind_buttons}
-                   cursor 'top_left_arrow'
-                 })
-$twind_text.insert('end', " horizontal scrolling, which also turns off ")
-$twind_text.insert('end', "word wrapping.  Or, you can click on the second ")
-$twind_text.insert('end', "button to\n")
-TkTextWindow.new($twind_text, 'end',
-                 'window'=>TkButton.new($twind_text) {
-                   #text 'OFF'
-                   text 'Turn Off'
-                   command proc{textWindOff $twind_text}
-                   cursor 'top_left_arrow'
-                 })
-
-$twind_text.insert('end', " horizontal scrolling and turn back on word wrapping.\n\n")
-$twind_text.insert('end', "Or, here is another example.  If you ")
-TkTextWindow.new($twind_text, 'end',
-                 'window'=>TkButton.new($twind_text) {
-                   text 'Click Here'
-                   command proc{textWindPlot $twind_text}
-                   cursor 'top_left_arrow'
-                 })
-$twind_text.insert('end', " a canvas displaying an x-y plot will appear right here.")
-$mark_plot = TkTextMark.new($twind_text, 'insert')
-$mark_plot.gravity='left'
-$twind_text.insert('end', "  You can drag the data points around with the mouse, ")
-$twind_text.insert('end', "or you can click here to ")
-TkTextWindow.new($twind_text, 'end',
-                 'window'=>TkButton.new($twind_text) {
-                   text 'Delete'
-                   command proc{textWindDel $twind_text}
-                   cursor 'top_left_arrow'
-                 })
-
-$twind_text.insert('end', " the plot again.\n\n")
-$twind_text.insert('end', "You may also find it useful to put embedded windows in ")
-$twind_text.insert('end', "a text without any actual text.  In this case the ")
-$twind_text.insert('end', "text widget acts like a geometry manager.  For ")
-$twind_text.insert('end', "example, here is a collection of buttons laid out ")
-$twind_text.insert('end', "neatly into rows by the text widget.  These buttons ")
-$twind_text.insert('end', "can be used to change the background color of the ")
-$twind_text.insert('end', "text widget (\"Default\" restores the color to ")
-$twind_text.insert('end', "its default).  If you click on the button labeled ")
-$twind_text.insert('end', "\"Short\", it changes to a longer string so that ")
-$twind_text.insert('end', "you can see how the text widget automatically ")
-$twind_text.insert('end', "changes the layout.  Click on the button again ")
-$twind_text.insert('end', "to restore the short string.\n")
-
-
-TkTextWindow.new($twind_text, 'end',
-                 'window'=>TkButton.new($twind_text) {|b|
-                   text 'Default'
-                   command proc{embDefBg $twind_text}
-                   cursor 'top_left_arrow'
-                   $tag_buttons.add('end')
-                 },
-                 'padx'=>3 )
-embToggle = TkVariable.new('Short')
-TkTextWindow.new($twind_text, 'end',
-                 'window'=>TkCheckButton.new($twind_text) {
-                   textvariable embToggle
-                   indicatoron 0
-                   variable embToggle
-                   onvalue 'A much longer string'
-                   offvalue 'Short'
-                   cursor 'top_left_arrow'
-                   pady 5
-                   padx 2
-                 },
-                 'padx'=>3,
-                 'pady'=>2 )
-
-[ 'AntiqueWhite3', 'Bisque1', 'Bisque2', 'Bisque3', 'Bisque4',
-  'SlateBlue3', 'RoyalBlue1', 'SteelBlue2', 'DeepSkyBlue3', 'LightBlue1',
-  'DarkSlateGray1', 'Aquamarine2', 'DarkSeaGreen2', 'SeaGreen1',
-  'Yellow1', 'IndianRed1', 'IndianRed2', 'Tan1', 'Tan4'
-].each{|twind_color|
-  TkTextWindow.new($twind_text, 'end',
-                   'window'=>TkButton.new($twind_text) {
-                     text twind_color
-                     cursor 'top_left_arrow'
-                     command proc{$twind_text.bg twind_color}
-                   },
-                   'padx'=>3,
-                   'pady'=>2 )
-}
-
-#
-def textWindOn (w,f)
-  if defined? $twind_scroll
-    begin
-      $twind_scroll.destroy
-    rescue
-    end
-    $twind_scroll = nil
-  end
-
-  base = TkWinfo.parent( TkWinfo.parent(w) )
-  $twind_scroll = TkScrollbar.new(base) {|s|
-    orient 'horizontal'
-    command proc{|*args| w.xview(*args)}
-    w.xscrollcommand proc{|first,last| s.set first,last}
-    w.wrap 'none'
-    pack('after'=>f, 'side'=>'bottom', 'fill'=>'x')
-  }
-
-  return nil
-end
-
-def textWindOff (w)
-  if defined? $twind_scroll
-    begin
-      $twind_scroll.destroy
-    rescue
-    end
-    $twind_scroll = nil
-  end
-  w.xscrollcommand ''
-  w.wrap 'word'
-end
-
-def textWindPlot (t)
-  if (defined? $twind_plot) && TkWinfo.exist?($twind_plot)
-    return
-  end
-
-  $twind_plot = TkCanvas.new(t) {
-    relief 'sunken'
-    width  450
-    height 300
-    cursor 'top_left_arrow'
-  }
-
-  if $tk_version =~ /^4.*/
-    font = '-Adobe-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*'
-  else
-    font = 'Helvetica 18'
-  end
-
-  TkcLine.new($twind_plot, 100, 250, 400, 250, 'width'=>2)
-  TkcLine.new($twind_plot, 100, 250, 100,  50, 'width'=>2)
-  TkcText.new($twind_plot, 225, 20,
-              'text'=>"A Simple Plot", 'font'=>font, 'fill'=>'brown')
-
-  (0..10).each {|i|
-    x = 100 + (i * 30)
-    TkcLine.new($twind_plot, x, 250, x, 245, 'width'=>2)
-    TkcText.new($twind_plot, x, 254,
-                'text'=>10*i, 'font'=>font, 'anchor'=>'n')
-  }
-  (0..5).each {|i|
-    y = 250 - (i * 40)
-    TkcLine.new($twind_plot, 100, y, 105, y, 'width'=>2)
-    TkcText.new($twind_plot, 96, y,
-                'text'=>"#{i*50}.0", 'font'=>font, 'anchor'=>'e')
-  }
-
-  for xx, yy in [[12,56],[20,94],[33,98],[32,120],[61,180],[75,160],[98,223]]
-    x = 100 + (3*xx)
-    y = 250 - (4*yy)/5
-    item = TkcOval.new($twind_plot, x-6, y-6, x+6, y+6,
-                       'width'=>1, 'outline'=>'black', 'fill'=>'SkyBlue2')
-    item.addtag 'point'
-  end
-
-  $twind_plot.itembind('point', 'Any-Enter',
-                        proc{$twind_plot.itemconfigure 'current', 'fill', 'red'})
-  $twind_plot.itembind('point', 'Any-Leave',
-                        proc{$twind_plot.itemconfigure 'current', 'fill', 'SkyBlue2'})
-  $twind_plot.itembind('point', '1',
-                        proc{|x,y| embPlotDown $twind_plot,x,y}, "%x %y")
-  $twind_plot.itembind('point', 'ButtonRelease-1',
-                        proc{$twind_plot.dtag 'selected'})
-  $twind_plot.bind('B1-Motion',
-                    proc{|x,y| embPlotMove $twind_plot,x,y}, "%x %y")
-  while ($twind_text.get($mark_plot) =~ /[ \t\n]/)
-    $twind_text.delete $mark_plot
-  end
-  $twind_text.insert $mark_plot,"\n"
-  TkTextWindow.new($twind_text, $mark_plot, 'window'=>$twind_plot)
-  $tag_center.add $mark_plot
-  $twind_text.insert $mark_plot,"\n"
-end
-
-$embPlot = {'lastX'=>0, 'lastY'=>0}
-
-def embPlotDown (w, x, y)
-  w.dtag 'selected'
-  w.addtag_withtag 'selected', 'current'
-  w.raise 'current'
-  $embPlot['lastX'] = x
-  $embPlot['lastY'] = y
-end
-
-def embPlotMove (w, x, y)
-  w.move 'selected', x - $embPlot['lastX'], y - $embPlot['lastY']
-  $embPlot['lastX'] = x
-  $embPlot['lastY'] = y
-end
-
-def textWindDel (w)
-  if (defined? $twind_text) && TkWinfo.exist?($twind_plot)
-    $twind_text.delete $twind_plot
-    $twind_plot = nil
-    while ($twind_text.get($mark_plot) =~ /[ \t\n]/)
-      $twind_text.delete $mark_plot
-    end
-    $twind_text.insert $mark_plot,"  "
-  end
-end
-
-def embDefBg (w)
-  w['background'] = w.configinfo('background')[3]
-end
diff --git a/ext/tk/sample/demos-en/twind2.rb b/ext/tk/sample/demos-en/twind2.rb
deleted file mode 100644
index 4a59a2e613..0000000000
--- a/ext/tk/sample/demos-en/twind2.rb
+++ /dev/null
@@ -1,385 +0,0 @@
-# frozen_string_literal: false
-#
-# text (embedded windows) widget demo 2 (called by 'widget')
-#
-
-# delete toplevel widget
-if defined?($twind2_demo) && $twind2_demo
-  $twind2_demo.destroy
-  $twind2_demo = nil
-end
-
-# demo toplevel widget
-$twind2_demo = TkToplevel.new {|w|
-  title("Text Demonstration - Embedded Windows 2")
-  iconname("Embedded Windows")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($twind2_demo).pack(:fill=>:both, :expand=>true)
-
-# frame
-$twind2_buttons = TkFrame.new(base_frame) {|frame|
-  TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2),
-         :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         TkButton.new(frame, :text=>'See Code',
-                      :image=>$image['view'], :compound=>:left,
-                      :command=>proc{showCode 'twind2'}),
-         TkButton.new(frame, :text=>'Dismiss',
-                      :image=>$image['delete'], :compound=>:left,
-                      :command=>proc{
-                        tmppath = $twind2_demo
-                        $twind2_demo = nil
-                        $showVarsWin[tmppath.path] = nil
-                        tmppath.destroy
-                      }),
-         :padx=>4, :pady=>4)
-  frame.grid_columnconfigure(0, :weight=>1)
-}
-$twind2_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-$twind2_text = nil
-TkFrame.new(base_frame, 'highlightthickness'=>2, 'borderwidth'=>2,
-            'relief'=>'sunken') {|f|
-  $twind2_text = TkText.new(f, 'setgrid'=>true, 'font'=>$font,
-                            # 'width'=>'70', 'height'=>35, 'wrap'=>'word',
-                            'width'=>'70', 'height'=>35, 'wrap'=>'char',
-                            'highlightthickness'=>0, 'borderwidth'=>0 ){|t|
-    TkScrollbar.new(f) {|s|
-      command proc{|*args| t.yview(*args)}
-      t.yscrollcommand proc{|first,last| s.set first,last}
-    }.pack('side'=>'right', 'fill'=>'y')
-  }.pack('expand'=>'yes', 'fill'=>'both')
-}.pack('expand'=>'yes', 'fill'=>'both')
-
-# text tags
-$tag2_center = TkTextTag.new($twind2_text,
-                            'justify' =>'center',
-                            'spacing1'=>'5m',
-                            'spacing3'=>'5m'  )
-$tag2_buttons = TkTextTag.new($twind2_text,
-                             'lmargin1'=>'1c',
-                             'lmargin2'=>'1c',
-                             'rmargin' =>'1c',
-                             'spacing1'=>'3m',
-                             'spacing2'=>0,
-                             'spacing3'=>0 )
-
-# insert text
-$twind2_text.insert('end',
-                  'A text widget can contain many different kinds of items, ')
-$twind2_text.insert('end',
-                  "both active and passive.  It can lay these out in various ")
-$twind2_text.insert('end',
-                   "ways, with wrapping, tabs, centering, etc.  In addition, ")
-$twind2_text.insert('end',
-                    "when the contents are too big for the window, smooth ")
-$twind2_text.insert('end', "scrolling in all directions is provided.\n\n")
-
-$twind2_text.insert('end', "A text widget can contain other widgets embedded ")
-$twind2_text.insert('end', "it.  These are called \"embedded windows\", ")
-$twind2_text.insert('end', "and they can consist of arbitrary widgets.  ")
-$twind2_text.insert('end', "For example, here are two embedded button ")
-$twind2_text.insert('end', "widgets.  You can click on the first button to ")
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkButton.new($twind2_text) {
-                   text 'ON'
-                   command proc{textWindOn2 $twind2_text,$twind2_buttons}
-                   cursor 'top_left_arrow'
-                 })
-$twind2_text.insert('end', " horizontal scrolling, which also turns off ")
-$twind2_text.insert('end', "word wrapping.  Or, you can click on the second ")
-$twind2_text.insert('end', "button to\n")
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkButton.new($twind2_text) {
-                   text 'OFF'
-                   command proc{textWindOff2 $twind2_text}
-                   cursor 'top_left_arrow'
-                 })
-$twind2_text.insert('end',
-                   " horizontal scrolling and turn back on word wrapping.\n\n")
-
-$twind2_text.insert('end', "Or, here is another example.  If you ")
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkButton.new($twind2_text) {
-                   text 'Click Here'
-                   command proc{textWindPlot2 $twind2_text}
-                   cursor 'top_left_arrow'
-                 })
-$twind2_text.insert('end',
-                    " a canvas displaying an x-y plot will appear right here.")
-$mark2_plot = TkTextMark.new($twind2_text, 'insert')
-$mark2_plot.gravity='left'
-$twind2_text.insert('end',
-                    "  You can drag the data points around with the mouse, ")
-$twind2_text.insert('end', "or you can click here to ")
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkButton.new($twind2_text) {
-                   text 'Delete'
-                   command proc{textWindDel2 $twind2_text}
-                   cursor 'top_left_arrow'
-                 })
-$twind2_text.insert('end', " the plot again.\n\n")
-
-$twind2_text.insert('end',
-                    "You may also find it useful to put embedded windows in ")
-$twind2_text.insert('end',
-                    "a text without any actual text.  In this case the ")
-$twind2_text.insert('end', "text widget acts like a geometry manager.  For ")
-$twind2_text.insert('end',
-                    "example, here is a collection of buttons laid out ")
-$twind2_text.insert('end',
-                    "neatly into rows by the text widget.  These buttons ")
-$twind2_text.insert('end',
-                    "can be used to change the background color of the ")
-$twind2_text.insert('end', "text widget (\"Default\" restores the color to ")
-$twind2_text.insert('end',
-                    "its default).  If you click on the button labeled ")
-$twind2_text.insert('end', "\"Short\", it changes to a longer string so that ")
-$twind2_text.insert('end', "you can see how the text widget automatically ")
-$twind2_text.insert('end', "changes the layout.  Click on the button again ")
-$twind2_text.insert('end', "to restore the short string.\n")
-
-btn_default = TkButton.new($twind2_text) {|b|
-  text 'Default'
-  command proc{embDefBg2 $twind2_text}
-  cursor 'top_left_arrow'
-}
-TkTextWindow.new($twind2_text, 'end', 'window'=>btn_default, 'padx'=>3)
-embToggle = TkVariable.new('Short')
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkCheckButton.new($twind2_text) {
-                   textvariable embToggle
-                   indicatoron 0
-                   variable embToggle
-                   onvalue 'A much longer string'
-                   offvalue 'Short'
-                   cursor 'top_left_arrow'
-                   pady 5
-                   padx 2
-                 },
-                 'padx'=>3,
-                 'pady'=>2 )
-
-[ 'AntiqueWhite3', 'Bisque1', 'Bisque2', 'Bisque3', 'Bisque4',
-  'SlateBlue3', 'RoyalBlue1', 'SteelBlue2', 'DeepSkyBlue3', 'LightBlue1',
-  'DarkSlateGray1', 'Aquamarine2', 'DarkSeaGreen2', 'SeaGreen1',
-  'Yellow1', 'IndianRed1', 'IndianRed2', 'Tan1', 'Tan4'
-].each{|twind_color|
-  TkTextWindow.new($twind2_text, 'end',
-                   'window'=>TkButton.new($twind2_text) {
-                     text twind_color
-                     cursor 'top_left_arrow'
-                     command proc{$twind2_text.bg twind_color}
-                   },
-                   'padx'=>3,
-                   'pady'=>2 )
-}
-
-$tag2_buttons.add(btn_default, 'end')
-
-$text_normal2 = {}
-$text_normal2['border'] = $twind2_text.cget('borderwidth')
-$text_normal2['highlight'] = $twind2_text.cget('highlightthickness')
-$text_normal2['pad'] = $twind2_text.cget('padx')
-
-$twind2_text.insert('end', "\nYou can also change the usual border width and ")
-$twind2_text.insert('end', "highlightthickness and padding.\n")
-
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkButton.new($twind2_text, :text=>"Big borders",
-                                        :cursor=>'top_left_arrow',
-                                        'command'=>proc{
-                                          textWinBigB2 $twind2_text
-                                        }))
-
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkButton.new($twind2_text, :text=>"Small borders",
-                                        :cursor=>'top_left_arrow',
-                                        'command'=>proc{
-                                          textWinSmallB2 $twind2_text
-                                        }))
-
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkButton.new($twind2_text, :text=>"Big highlight",
-                                        :cursor=>'top_left_arrow',
-                                        'command'=>proc{
-                                          textWinBigH2 $twind2_text
-                                        }))
-
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkButton.new($twind2_text, :text=>"Small highlight",
-                                        :cursor=>'top_left_arrow',
-                                        'command'=>proc{
-                                          textWinSmallH2 $twind2_text
-                                        }))
-
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkButton.new($twind2_text, :text=>"Big pad",
-                                        :cursor=>'top_left_arrow',
-                                        'command'=>proc{
-                                          textWinBigP2 $twind2_text
-                                        }))
-
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkButton.new($twind2_text, :text=>"Small pad",
-                                        :cursor=>'top_left_arrow',
-                                        'command'=>proc{
-                                          textWinSmallP2 $twind2_text
-                                        }))
-
-$twind2_text.insert('end',
-                    "\n\nFinally, images fit comfortably in text widgets too:")
-
-TkTextImage.new($twind2_text, 'end',
-                'image'=>TkBitmapImage.new(:file=>[
-                                             $demo_dir, '..',
-                                             'images', 'face.xbm'
-                                           ].join(File::Separator)))
-
-# methods
-def textWinBigB2(w)
-  w.borderwidth 15
-end
-def textWinSmallB2(w)
-  w.borderwidth $text_normal2['border']
-end
-def textWinBigH2(w)
-  w.highlightthickness 15
-end
-def textWinSmallH2(w)
-  w.highlightthickness $text_normal2['highlight']
-end
-def textWinBigP2(w)
-  w.configure(:padx=>15, :pady=>15)
-end
-def textWinSmallP2(w)
-  w.configure(:padx=>$text_normal2['pad'], :pady=>$text_normal2['pad'])
-end
-
-def textWindOn2 (w,f)
-  if defined? $twind2_scroll
-    begin
-      $twind2_scroll.destroy
-    rescue
-    end
-    $twind2_scroll = nil
-  end
-
-  base = TkWinfo.parent( TkWinfo.parent(w) )
-  $twind2_scroll = TkScrollbar.new(base) {|s|
-    orient 'horizontal'
-    command proc{|*args| w.xview(*args)}
-    w.xscrollcommand proc{|first,last| s.set first,last}
-    w.wrap 'none'
-    pack('after'=>f, 'side'=>'bottom', 'fill'=>'x')
-  }
-
-  return nil
-end
-
-def textWindOff2 (w)
-  if defined? $twind2_scroll
-    begin
-      $twind2_scroll.destroy
-    rescue
-    end
-    $twind2_scroll = nil
-  end
-  w.xscrollcommand ''
-  #w.wrap 'word'
-  w.wrap 'char'
-end
-
-def textWindPlot2 (t)
-  if (defined? $twind2_plot) && (TkWinfo.exist?($twind2_plot))
-    return
-  end
-
-  $twind2_plot = TkCanvas.new(t) {
-    relief 'sunken'
-    width  450
-    height 300
-    cursor 'top_left_arrow'
-  }
-
-  #font = '-Adobe-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*'
-  font = 'Helvetica 18'
-
-  TkcLine.new($twind2_plot, 100, 250, 400, 250, 'width'=>2)
-  TkcLine.new($twind2_plot, 100, 250, 100,  50, 'width'=>2)
-  TkcText.new($twind2_plot, 225, 20,
-              'text'=>"A Simple Plot", 'font'=>font, 'fill'=>'brown')
-
-  (0..10).each {|i|
-    x = 100 + (i * 30)
-    TkcLine.new($twind2_plot, x, 250, x, 245, 'width'=>2)
-    TkcText.new($twind2_plot, x, 254,
-                'text'=>10*i, 'font'=>font, 'anchor'=>'n')
-  }
-  (0..5).each {|i|
-    y = 250 - (i * 40)
-    TkcLine.new($twind2_plot, 100, y, 105, y, 'width'=>2)
-    TkcText.new($twind2_plot, 96, y,
-                'text'=>"#{i*50}.0", 'font'=>font, 'anchor'=>'e')
-  }
-
-  for xx, yy in [[12,56],[20,94],[33,98],[32,120],[61,180],[75,160],[98,223]]
-    x = 100 + (3*xx)
-    y = 250 - (4*yy)/5
-    item = TkcOval.new($twind2_plot, x-6, y-6, x+6, y+6,
-                       'width'=>1, 'outline'=>'black', 'fill'=>'SkyBlue2')
-    item.addtag 'point'
-  end
-
-  $twind2_plot.itembind('point', 'Any-Enter',
-                        proc{$twind2_plot.itemconfigure 'current', 'fill', 'red'})
-  $twind2_plot.itembind('point', 'Any-Leave',
-                        proc{$twind2_plot.itemconfigure 'current', 'fill', 'SkyBlue2'})
-  $twind2_plot.itembind('point', '1',
-                        proc{|x,y| embPlotDown2 $twind2_plot,x,y}, "%x %y")
-  $twind2_plot.itembind('point', 'ButtonRelease-1',
-                        proc{$twind2_plot.dtag 'selected'})
-  $twind2_plot.bind('B1-Motion',
-                    proc{|x,y| embPlotMove2 $twind2_plot,x,y}, "%x %y")
-  while ($twind2_text.get($mark2_plot) =~ /[ \t\n]/)
-    $twind2_text.delete $mark2_plot
-  end
-  $twind2_text.insert $mark2_plot,"\n"
-  TkTextWindow.new($twind2_text, $mark2_plot, 'window'=>$twind2_plot)
-  $tag2_center.add $mark2_plot
-  $twind2_text.insert $mark2_plot,"\n"
-end
-
-$embPlot2 = {'lastX'=>0, 'lastY'=>0}
-
-def embPlotDown2 (w, x, y)
-  w.dtag 'selected'
-  w.addtag_withtag 'selected', 'current'
-  w.raise 'current'
-  $embPlot2['lastX'] = x
-  $embPlot2['lastY'] = y
-end
-
-def embPlotMove2 (w, x, y)
-  w.move 'selected', x - $embPlot2['lastX'], y - $embPlot2['lastY']
-  $embPlot2['lastX'] = x
-  $embPlot2['lastY'] = y
-end
-
-def textWindDel2 (w)
-  if (defined? $twind2_text) && TkWinfo.exist?($twind2_plot)
-    $twind2_text.delete $twind2_plot
-    $twind2_plot = nil
-    while ($twind2_text.get($mark2_plot) =~ /[ \t\n]/)
-      $twind2_text.delete $mark2_plot
-    end
-    $twind2_text.insert $mark2_plot,"  "
-  end
-end
-
-def embDefBg2 (w)
-  w['background'] = w.configinfo('background')[3]
-end
diff --git a/ext/tk/sample/demos-en/unicodeout.rb b/ext/tk/sample/demos-en/unicodeout.rb
deleted file mode 100644
index 910dff38b7..0000000000
--- a/ext/tk/sample/demos-en/unicodeout.rb
+++ /dev/null
@@ -1,115 +0,0 @@
-# frozen_string_literal: false
-# unicodeout.rb --
-#
-# This demonstration script shows how you can produce output (in label
-# widgets) using many different alphabets.
-#
-# based on Tcl/Tk8.4.4 widget demos
-
-if defined?($unicodeout_demo) && $unicodeout_demo
-  $unicodeout_demo.destroy
-  $unicodeout_demo = nil
-end
-
-$unicodeout_demo = TkToplevel.new {|w|
-  title("Unicode Label Demonstration")
-  iconname("unicodeout")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($unicodeout_demo).pack(:fill=>:both, :expand=>true)
-
-TkLabel.new(base_frame,
-            :font=>$font, :wraplength=>'5.4i', :justify=>:left,
-            :text=><<EOL).pack(:side=>:top)
-This is a sample of Tk's support for languages that use non-Western \
-character sets.  However, what you will actually see below depends \
-largely on what character sets you have installed, and what you see \
-for characters that are not present varies greatly between platforms as well. \
-Please try to click the 'See Code' button, \
-and click the 'Rerun Demo' button after editing \
-(the source file is not changed) \
-the definition of @@font on the Unicodeout_SampleFrame class.
-The strings are written in Tcl using UNICODE characters \
-using the \\uXXXX escape so as to do so in a portable fashion.
-
-ATTENTION:
-The strings are converted to the encoded string objects \
-(completed to rewrite Tcl's escapes) by Tk::UTF8_String method. \
-And the Tk::UTF8_String objects are passed to the label widgets.
-EOL
-
-TkFrame.new(base_frame){|f|
-  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
-
-  TkButton.new(f, :text=>'Dismiss', :width=>15, :command=>proc{
-                 $unicodeout_demo.destroy
-                 $unicodeout_demo = nil
-               }).pack(:side=>:left, :expand=>true)
-
-  TkButton.new(f, :text=>'See Code', :width=>15, :command=>proc{
-                 showCode 'unicodeout'
-               }).pack(:side=>:left, :expand=>true)
-}
-
-wait_msg = TkLabel.new(base_frame,
-                       :text=>"Please wait while loading fonts...",
-                       :font=>"Helvetica 12 italic").pack
-
-class Unicodeout_SampleFrame < TkFrame
-  @@font = $font
-  # @@font = 'Helvetica 14'
-  # @@font = 'Courier 12'
-  # @@font = 'clearlyu 16'
-  # @@font = 'fixed 12'
-  # @@font = 'Times 12'
-  # @@font = 'Newspaper 12'
-  # @@font = '{New century schoolbook} 12'
-
-  def initialize(base)
-    super(base)
-    grid_columnconfig(1, :weight=>1)
-  end
-
-  def add_sample(lang, *args)
-    sample_txt = Tk::UTF8_String(args.join(''))
-    l = TkLabel.new(self, :font=>@@font, :text=>lang+':',
-                    :anchor=>:nw, :pady=>0)
-    #s = TkLabel.new(self, :font=>@@font, :text=>sample_txt,
-    s = TkLabel.new(self, :font=>TkFont.new(@@font), :text=>sample_txt,
-                    :anchor=>:nw, :width=>30, :pady=>0)
-    Tk.grid(l, s, :sticky=>:ew, :pady=>0)
-    l.grid_config(:padx, '1m')
-  end
-end
-f = Unicodeout_SampleFrame.new(base_frame)
-f.pack(:expand=>true, :fill=>:both, :padx=>'2m', :pady=>'1m')
-
-# Processing when some characters are missing might take a while, so make
-# sure we're displaying something in the meantime...
-
-oldCursor = $unicodeout_demo.cursor
-$unicodeout_demo.cursor('watch')
-Tk.update
-
-f.add_sample('Arabic',
-             '\uFE94\uFEF4\uFE91\uFEAE\uFECC\uFEDF\uFE8D\uFE94',
-             '\uFEE4\uFEE0\uFEDC\uFEDF\uFE8D')
-f.add_sample('Trad. Chinese', '\u4E2D\u570B\u7684\u6F22\u5B57')
-f.add_sample('Simpl. Chinese', '\u6C49\u8BED')
-f.add_sample('Greek',
-             '\u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AE ',
-             '\u03B3\u03BB\u03CE\u03C3\u03C3\u03B1')
-f.add_sample('Hebrew',
-             '\u05DD\u05D9\u05DC\u05E9\u05D5\u05E8\u05D9 ',
-             '\u05DC\u05D9\u05D0\u05E8\u05E9\u05D9')
-f.add_sample('Japanese',
-             '\u65E5\u672C\u8A9E\u306E\u3072\u3089\u304C\u306A, ',
-             '\u6F22\u5B57\u3068\u30AB\u30BF\u30AB\u30CA')
-f.add_sample('Korean', '\uB300\uD55C\uBBFC\uAD6D\uC758 \uD55C\uAE00')
-f.add_sample('Russian',
-             '\u0420\u0443\u0441\u0441\u043A\u0438\u0439 ',
-             '\u044F\u0437\u044B\u043A')
-
-wait_msg.destroy
-$unicodeout_demo.cursor(oldCursor)
diff --git a/ext/tk/sample/demos-en/vscale.rb b/ext/tk/sample/demos-en/vscale.rb
deleted file mode 100644
index 2ce522f7be..0000000000
--- a/ext/tk/sample/demos-en/vscale.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-# frozen_string_literal: false
-# vscale.rb
-#
-# This demonstration script shows an example with a vertical scale.
-
-require "tkcanvas"
-
-if defined?($vscale_demo) && $vscale_demo
-  $vscale_demo.destroy
-  $vscale_demo = nil
-end
-
-$vscale_demo = TkToplevel.new {|w|
-  title("Vertical Scale Demonstration")
-  iconname("vscale")
-}
-positionWindow($vscale_demo)
-
-base_frame = TkFrame.new($vscale_demo).pack(:fill=>:both, :expand=>true)
-
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '3.5i'
-  justify 'left'
-  text "An arrow and a vertical scale are displayed below.  If you click or drag mouse button 1 in the scale, you can change the size of the arrow."
-}
-msg.pack('side'=>'top', 'padx'=>'.5c')
-
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    text 'Dismiss'
-    command proc {
-      tmppath = $vscale_demo
-      $vscale_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'Show Code'
-    command proc { showCode 'vscale' }
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-def setHeight(w, height)
-  height = height + 21
-  y2 = height - 30
-  if y2 < 21
-    y2 = 21
-  end
-  w.coords 'poly',15,20,35,20,35,y2,45,y2,25,height,5,y2,15,y2,15,20
-  w.coords 'line',15,20,35,20,35,y2,45,y2,25,height,5,y2,15,y2,15,20
-end
-
-TkFrame.new(base_frame) {|frame|
-  borderwidth 10
-  canvas = TkCanvas.new(frame) {|c|
-    width 50
-    height 50
-    bd 0
-    highlightthickness 0
-    TkcPolygon.new(c, 0, 0, 1, 1, 2, 2) {
-      fill 'SeaGreen3'
-      tags 'poly'
-    }
-    TkcLine.new(c, 0, 0, 1, 1, 2, 2, 0, 0) {
-      fill 'black'
-      tags 'line'
-    }
-  }.pack('side'=>'left',  'anchor'=>'nw', 'fill'=>'y')
-  scale = TkScale.new(frame) {
-    orient 'vertical'
-    length 284
-    from 0
-    to 250
-    command proc{|value| setHeight(canvas, value)}
-    tickinterval 50
-  }.pack('side'=>'left', 'anchor'=>'ne')
-  scale.set 75
-}.pack
diff --git a/ext/tk/sample/demos-en/widget b/ext/tk/sample/demos-en/widget
deleted file mode 100644
index fb49a746b9..0000000000
--- a/ext/tk/sample/demos-en/widget
+++ /dev/null
@@ -1,1087 +0,0 @@
-#!/usr/bin/env ruby
-
-# widget --
-# This script demonstrates the various widgets provided by Tk,
-# along with many of the features of the Tk toolkit.  This file
-# only contains code to generate the main window for the
-# application, which invokes individual demonstrations.  The
-# code for the actual demonstrations is contained in separate
-# ".rb" files is this directory, which are sourced by this script
-# as needed.
-
-require 'tk'
-# require 'tkafter'
-
-### $DEBUG=1 ##########
-
-$RubyTk_WidgetDemo = true
-
-#----------------------------------------------------------------
-# The code below create the main window, consisting of a menu bar
-# and a text widget that explains how to use the program, plus lists
-# all of the demos as hypertext items.
-#----------------------------------------------------------------
-
-# widget demo directory
-# $demo_dir = File.dirname($0)
-$demo_dir = File.dirname(__FILE__)
-
-# root
-$root = TkRoot.new{title "Ruby/Tk Widget Demonstration"}
-
-# tk
-$tk_version = Tk::TK_VERSION
-$tk_major_ver, $tk_minor_ver = $tk_version.split('.').map{|n| n.to_i}
-$tk_patchlevel = Tk::TK_PATCHLEVEL
-
-# tcl_platform
-$tk_platform = TkVarAccess.new('tcl_platform')
-
-#
-case($tk_version)
-when /^4.*/
-  $font = TkFont.new('-*-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*', nil)
-else
-  $font = TkFont.new('Helvetica -12')
-end
-
-# images
-$image = {}
-
-if $tk_major_ver >= 8
-$image['refresh'] = TkPhotoImage.new(:height=>16, :format=>'GIF', :data=><<EOD)
-    R0lGODlhEAAQAPMAAMz/zCpnKdb/1z9mPypbKBtLGy9NMPL/9Or+6+P+4j1Y
-    PwQKBP7//xMLFAYBCAEBASH5BAEAAAAALAAAAAAQABAAAwR0EAD3Gn0Vyw0e
-    ++CncU7IIAezMA/nhUqSLJizvSdCEEjy2ZIV46AwDAoDHwPYGSoEiUJAAGJ6
-    EDHBNCFINW5OqABKSFk/B9lUa94IDwIFgewFMwQDQwCZQCztTgM9Sl8SOEMG
-    KSAthiaOjBMPDhQONBiXABEAOw==
-EOD
-end
-
-if $tk_major_ver >= 8
-$image['view'] = TkPhotoImage.new(:height=>16, :format=>'GIF', :data=><<EOD)
-    R0lGODlhEAAQAPMAAMz/zP///8DAwICAgH9/fwAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAwRIcMhJB7h3hM33
-    KFjWdQQYap1QrCaGBmrRrS4nj5b53jOgbwXBKGACoYLDIuAoHCmZyYvR1rT5
-    RMAq8LqcIYGsrjPsW1XOmFUEADs=
-EOD
-end
-
-if $tk_major_ver >= 8
-$image['delete'] = TkPhotoImage.new(:height=>16, :format=>'GIF', :data=><<EOD)
-    R0lGODlhEAAOAKEAAIQAAO/n3v///////yH5BAEKAAIALAAAAAAQAA4AAAIm
-    lI9pAKHbIHNoVhYhTdjlJ2AWKG2g+CldmB6rxo2uybYhbS80eRQAOw==
-EOD
-end
-
-if $tk_major_ver >= 8
-$image['print'] = TkPhotoImage.new(:height=>19, :format=>'GIF', :data=><<EOD)
-    R0lGODlhGgATAPcAACEQOTEpQjEpUkIpc0IxY0I5c0oxjEo5SlJCY1JCe1JK
-    UlpChFpCjFpGkFpSc1paa2NKc2NKnGNja2tapWtjc29KnHNanHNjc3NjrXNr
-    jHNrnHNzc3tjpXtrtXtzhICAgIRzvYSEjIZzqox7tYyEnIyMjJSEtZSEvZSM
-    lJyMtZyMvZyUlJyUrZyUvZycnKWctaWlpa2czq2lzrWtvbWtzrW1tb21xr21
-    1sa9zs693s7OztbO3tbO597W1t7W7+fe7+fn5////+/n7+/v7+/v9////wAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAACH5BAEAAEEALAAAAAAaABMAQAj/AIMIHBhkg0GC
-    CBMGIQEiQgseQT4oeCBBAokgRYYQ0JBixg8hRIiUUEBBYYmTByBwiCBCRYwH
-    CxY8cKFw4AogRXLqLAJkQ80gCBBg3BkxZswTNGh4MGqgQQUMJRHCwMkTSE+D
-    Pn8eCKBhxIMhO3ei2OHDBw6sWSlMMMoWgwwfMDZI8GBjx44NARZwEGGi5MkS
-    PcIWKRGz5YgLbAco+KkQBQoJIRgjdGEVq+SaJajqtNrzMgsPCmoIzqmDgmWE
-    KOBuUKAAwYabYTfs4OHjY0giGyhk4MAWRI4eKyRQqPgggYUXPH4A+XBAgwoK
-    DiIsCFxjA9sFEVQQCRJCAYAFDJxiKhAxvMTonEFimrhhYinTBgWiCvxLNX3M
-    DkkpsKV5OYhjBxCMYAICAigUEAA7
-EOD
-end
-
-#
-if $tk_major_ver >= 8
-  $root.add_menubar([[['File', 0],
-                        ['About ... ', proc{aboutBox}, 0, '<F1>'],
-                        '---',
-                        ['Quit', proc{exit}, 0, 'Ctrl-Q']
-                      ]])
-else
-  TkMenubar.new($root,
-                [[['File', 0],
-                    ['About ... ', proc{aboutBox}, 0, '<F1>'],
-                    '---',
-                    ['Quit', proc{exit}, 0, 'Ctrl-Q']
-                  ]]).pack('side'=>'top', 'fill'=>'x')
-end
-$root.bind('F1', proc{aboutBox})
-$root.bind('Control-q', proc{exit})
-
-=begin
-TkFrame.new($root){|frame|
-  TkMenubutton.new(frame){|button|
-    m = TkMenu.new(button) {
-      add 'command', 'label'=>'Quit', 'command'=>proc{exit}, 'underline'=>0
-    }
-    menu m
-    text 'File'
-    underline 0
-  }.pack('side'=>'left')
-}.pack('side'=>'top', 'fill'=>'x')
-=end
-
-#
-if $tk_version =~ /^4\.[01]/
-  scr = TkScrollbar.new($root, 'orient'=>'vertical')
-  txt = TkText.new($root) {
-    wrap 'word'
-    width 70
-    height 30
-    font $font
-    setgrid 'yes'
-    yscrollcommand proc{|first,last| scr.set first,last}
-  }
-  scr.command(proc{|*args| txt.yview(*args)})
-  scr.pack('side'=>'right', 'fill'=>'y')
-  txt.pack('expand'=>'yes', 'fill'=>'both')
-else
-  textFrame = TkFrame.new($root)
-  scr = TkScrollbar.new($root, 'orient'=>'vertical',
-                        'highlightthickness'=>0, 'takefocus'=>1) {
-    pack('in'=>textFrame, 'side'=>'right', 'fill'=>'y', 'padx'=>1)
-  }
-  txt = TkText.new($root) {
-    wrap 'word'
-    width 70
-    height 30
-    font $font
-    setgrid 'yes'
-    highlightthickness 0
-    padx 4
-    pady 2
-    takefocus 0
-    bd 1
-    yscrollcommand proc{|first,last| scr.set first,last}
-  }
-  scr.command(proc{|*args| txt.yview(*args)})
-#  txt.pack('in'=>textFrame, 'expand'=>'yes', 'fill'=>'both', 'padx'=>1)
-#  txt.pack('in'=>textFrame, 'expand'=>'yes', 'fill'=>'both')
-#  textFrame.pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>2)
-  textFrame.pack('expand'=>'yes', 'fill'=>'both')
-  #  $root.withdraw.deiconify
-  Tk.update_idletasks
-  txt.pack('in'=>textFrame, 'expand'=>'yes', 'fill'=>'both')
-
-  statusBar = TkFrame.new($root) {|f|
-    if $tk_version =~ /^4.*/
-      statusfont = '-*-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*'
-    else
-      statusfont = 'Helvetica 10'
-    end
-    $statusBarLabel = \
-    TkLabel.new(f, 'text'=>"   ", 'relief'=>'sunken', 'bd'=>1, 'anchor'=>'w',
-                'font'=>statusfont) \
-        .pack('side'=>'left', 'padx'=>2, 'expand'=>'yes', 'fill'=>'both')
-    TkLabel.new(f, 'width'=>8, 'relief'=>'sunken', 'bd'=>1, 'anchor'=>'w',
-                'font'=>statusfont) \
-        .pack('side'=>'left', 'padx'=>2)
-  }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>2)
-end
-
-# Create a bunch of tags to use in the text widget, such as those for
-# section titles and demo descriptions.  Also define the bindings for
-# tags.
-
-if $tk_version =~ /^4.*/
-  tag_title = TkTextTag.new(txt, 'font'=>'-*-Helvetica-Bold-R-Normal--*-180-*-*-*-*-*-*')
-else
-  tag_title = TkTextTag.new(txt, 'font'=>'Helvetica 18 bold')
-end
-
-# We put some "space" characters to the left and right of each demo description
-# so that the descriptions are highlighted only when the mouse cursor
-# is right over them (but not when the cursor is to their left or right)
-
-tag_demospace = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c')
-
-if TkWinfo.depth($root) == 1
-  tag_demo = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c',
-                           'underline'=>1)
-  $tag_visited = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c',
-                              'underline'=>1)
-  tag_hot = TkTextTag.new(txt, 'background'=>'black', 'foreground'=>'white')
-else
-  tag_demo = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c',
-                           'foreground'=>'blue', 'underline'=>1)
-  $tag_visited = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c',
-                              'foreground'=>'#303080', 'underline'=>1)
-#  tag_hot = TkTextTag.new(txt, 'relief'=>'raised', 'borderwidth'=>1,
-#                         'background'=>'SeaGreen3')
-  tag_hot = TkTextTag.new(txt, 'borderwidth'=>1, 'foreground'=>'red')
-end
-
-#tag_demo.bind('Button-1', proc{invoke txt, txt.index('current')})
-tag_demo.bind('ButtonRelease-1',
-              proc{|x,y|invoke txt, txt.index("@#{x},#{y}")}, '%x %y')
-
-lastLine = TkVariable.new("")
-newLine  = TkVariable.new("")
-tag_demo.bind('Enter', proc{|x,y|
-                lastLine.value = txt.index("@#{x},#{y} linestart")
-                tag_hot.add(lastLine.value, "#{lastLine.value} lineend")
-                showStatus txt, txt.index("@#{x},#{y}")
-              },
-              '%x %y')
-tag_demo.bind('Leave',
-              proc{
-                tag_hot.remove('1.0','end')
-                txt.configure('cursor','xterm')
-                $statusBarLabel.configure('text'=>"")
-              })
-tag_demo.bind('Motion', proc{|x, y|
-                newLine.value = txt.index("@#{x},#{y} linestart")
-                if newLine.value != lastLine.value
-                  tag_hot.remove('1.0','end')
-                  lastLine.value = newLine.value
-                  if ( txt.tag_names("@#{x},#{y}").find{|t|
-                        t.kind_of?(String) && t =~ /^demo-/
-                      } )
-                    tag_hot.add(lastLine.value,
-                                "#{lastLine.value} lineend -1 chars")
-                  end
-                end
-                showStatus txt, txt.index("@#{x},#{y}")
-              },
-              '%x %y')
-
-# Create the text for the text widget.
-
-txt.insert('end', "Ruby/Tk Widget Demonstrations\n\n", tag_title)
-txt.insert('end', <<EOT)
-This application provides a front end for several short scripts that \
-demonstrate what you can do with Tk widgets.  Each of the numbered \
-lines below describes a demonstration;  you can click on it to invoke \
-the demonstration.  Once the demonstration window appears, you can \
-click the "See Code" button to see the Ruby/Tk code that created the \
-demonstration.  If you wish, you can edit the code and click the \
-"Rerun Demo" button in the code window to reinvoke the demonstration \
-with the modified code. \
-Don't worry about breaking the source code. \
-Your modifications are not reflected on the original file. \
-Please try many kind of changes.
-
-Some demo scripts require the recent version of Tk library \
-(e.g. Tk8.4 or later) \
-If your Tk library linked to Ruby doesn't support the functions \
-required by the demo script, the demo doesn't work. \
-In such a case, please re-compile tcltklib with the later Tk library \
-which supports the required functions.
-
-If your Tk supports Ttk (Tile) extension (included or installed), \
-please try the demo of Ttk extension (sample/tkextlib/tile/demo.rb) too.
-( Probably, Ttk extension \
-#{
-begin
-  require 'tkextlib/tile'
-  "is already installed on your environment"
-rescue
-  "is not installed on your environment yet"
-end
-}\
-. )
-Ttk extension is a standard feature of Tk8.5 or later.
-
-
-EOT
-
-txt.insert('end', "Labels, buttons, checkbuttons, and radiobuttons.\n", tag_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. Labels (text and bitmaps).\n", tag_demo, "demo-label")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. Labels and UNICODE text. (if supported)\n", tag_demo, "demo-unicodeout")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. Buttons.\n", tag_demo, "demo-button")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. Checkbuttons (select any of a group).\n", tag_demo, "demo-check")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "5. Checkbuttons (if supported).\n", tag_demo, "demo-check2")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "6. Radiobuttons (select one of a group).\n", tag_demo, "demo-radio")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "7. Radiobuttons (if supported 'compound' option).\n", tag_demo, "demo-radio2")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "8. Radiobuttons (if supported).\n", tag_demo, "demo-radio3")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "9. A 15-puzzle game made out of buttons.\n", tag_demo, "demo-puzzle")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "10. Iconic buttons that use bitmaps.\n", tag_demo, "demo-icon")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "11. Two labels displaying images.\n", tag_demo, "demo-image1")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "12. A simple user interface for viewing images.\n", tag_demo, "demo-image2")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "13. A simple user interface for viewing images. (if supported)\n", tag_demo, "demo-image3")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "14. Labelled frames (if supported)\n", tag_demo, "demo-labelframe")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "15. The simple Themed Tk widgets (require Tile/Ttk extension)\n", tag_demo, "demo-ttkbut")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-txt.insert('end', "Listboxes\n", tag_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. 50 states.\n", tag_demo, "demo-states")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. Colors: change the color scheme for the application.\n", "#{tag_demo.id} demo-colors")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. A collection of famous sayings.\n", tag_demo, "demo-sayings")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. A multi-column list of contries. (require Tile/Ttk extension)\n", tag_demo, "demo-mclist")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "5. A directory browser tree. (require Tile/Ttk extension)\n", tag_demo, "demo-tree")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-txt.insert('end', "Entries and Spin-boxes\n", tag_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. Without scrollbars.\n", tag_demo, "demo-entry1")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. With scrollbars.\n", tag_demo, "demo-entry2")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end',
-           "3. Validated entries and password fields. (if supported)\n",
-           tag_demo, "demo-entry3")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. Spin-boxes. (if supported)\n", tag_demo, "demo-spin")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "5. Combo-boxes. (require Tile/Ttk extension)\n", tag_demo, "demo-combo")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "6. Simple Rolodex-like form.\n", tag_demo, "demo-form")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-txt.insert('end', "Text\n", tag_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. Basic editable text.\n", tag_demo, "demo-text")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. Text display styles.\n", tag_demo, "demo-style")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. Hypertext (tag bindings).\n", tag_demo, "demo-bind")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. A text widget with embedded windows.\n", tag_demo, "demo-twind")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "5. A text widget with embedded windows. (if supported)\n", tag_demo, "demo-twind2")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "6. A search tool built with a text widget.\n", tag_demo, "demo-search")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "7. Peering text widgets. (if supported)\n", tag_demo, "demo-textpeer")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-txt.insert('end', "Canvases\n", tag_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. The canvas item types.\n", tag_demo, "demo-items")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. A simple 2-D plot.\n", tag_demo, "demo-plot")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. Text items in canvases.\n", tag_demo, "demo-ctext")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. An editor for arrowheads on canvas lines.\n", tag_demo, "demo-arrow")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "5. A ruler with adjustable tab stops.\n", tag_demo, "demo-ruler")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "6. A building floor plan.\n", tag_demo, "demo-floor")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "7. A building floor plan. (another way to create canvas items)\n", tag_demo, "demo-floor2")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "8. A simple scrollable canvas.\n", tag_demo, "demo-cscroll")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "9. A Knight's tour of the chess board. (require Tile/Ttk extension)\n", tag_demo, "demo-knightstour")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-txt.insert('end', "Scales and Progress Bars\n", tag_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. Vertical scale.\n", tag_demo.id, "demo-vscale")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. Horizontal scale.\n", tag_demo.id, "demo-hscale")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. Progress bar. (require Tile/Ttk extension)\n", tag_demo.id, "demo-ttkprogress")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-txt.insert('end', "Paned Windows and Notebooks\n", tag_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. Horizontal paned window. (if supported)\n", tag_demo.id, "demo-paned1")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. Vertical paned window. (if supported)\n", tag_demo.id, "demo-paned2")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. Themed nested panes. (require Tile/Ttk extension)\n", tag_demo.id, "demo-ttkpane")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. Notebook widget. (require Tile/Ttk extension)\n", tag_demo.id, "demo-ttknote")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-txt.insert('end', "Menus and Toolbars\n", tag_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. Menus and cascades.\n", tag_demo, "demo-menu")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. Menus and cascades. (if supported)\n", tag_demo, "demo-menu84")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. Menubuttons.\n", tag_demo, "demo-menubu")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. Themed menu buttons. (require Tile/Ttk extension)\n", tag_demo, "demo-ttkmenu")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "5. Themed toolbar. (require Tile/Ttk extension)\n", tag_demo, "demo-toolbar")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-txt.insert('end', "Common Dialogs\n", tag_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. Message boxes.\n", tag_demo, "demo-msgbox")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. Message boxes with detail text. (if supported)\n", tag_demo, "demo-msgbox2")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. File selection dialog.\n", tag_demo, "demo-filebox")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. Color picker.\n", tag_demo, "demo-clrpick")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-txt.insert('end', "Animation\n", tag_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. Animated labels (if supported)\n", tag_demo, "demo-anilabel")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. Animated wave (if supported)\n", tag_demo, "demo-aniwave")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. Pendulum simulation (if supported)\n", tag_demo, "demo-pendulum")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. A celebration of Rube Goldberg (if supported)\n", tag_demo, "demo-goldberg")
-
-txt.insert('end', "\n")
-txt.insert('end', "Miscellaneous\n", tag_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. The built-in bitmaps.\n", tag_demo, "demo-bitmap")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. A dialog box with a local grab.\n", tag_demo, "demo-dialog1")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. A dialog box with a global grab.\n", tag_demo, "demo-dialog2")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.state('disabled')
-scr.focus
-
-# positionWindow --
-# This procedure is invoked by most of the demos to position a
-# new demo window.
-#
-# Arguments:
-# w -           The name of the window to position.
-
-def positionWindow(w)
-  w.geometry('+300+300')
-end
-
-# showVars --
-# Displays the values of one or more variables in a window, and
-# updates the display whenever any of the variables changes.
-#
-# Arguments:
-# w -           Name of new window to create for display.
-# args -        Any number of names of variables.
-
-$showVarsWin = {}
-def showVars1(parent, *args)
-  if $showVarsWin[parent.path]
-    begin
-      $showVarsWin[parent.path].destroy
-    rescue
-    end
-  end
-  w = TkToplevel.new(parent) {|w|
-    title "Variable values"
-    base = TkFrame.new(w).pack(:fill=>:both, :expand=>true)
-    TkLabel.new(base) {
-      text "Variable values:"
-      width 20
-      anchor 'center'
-      if $tk_version =~ /^4.*/
-        font '-Adobe-helvetica-medium-r-normal--*-180-*-*-*-*-*-*'
-      else
-        font 'Helvetica 14'
-      end
-    }.pack('side'=>'top', 'fill'=>'x')
-    len = 1
-    args.each{|vnam,vbody|
-      len = vnam.to_s.length if vnam.to_s.length > len
-    }
-    args.each{|vnam,vbody|
-      TkFrame.new(w){|f|
-        #TkLabel.new(f, 'text'=>"#{vnam}: ").pack('side'=>'left')
-        TkLabel.new(f, 'text'=>"#{vnam}: ",'width'=>len+2).pack('side'=>'left')
-        TkLabel.new(f, 'textvariable'=>vbody, 'anchor'=>'w')\
-                   .pack('side'=>'left', 'expand'=>'yes', 'fill'=>'x')
-      }.pack('side'=>'top', 'anchor'=>'w', 'fill'=>'x')
-    }
-    TkButton.new(base) {
-      text "OK"
-      command proc{w.destroy}
-    }.pack('side'=>'bottom', 'pady'=>2)
-  }
-  $showVarsWin[parent.path] = w
-end
-
-def showVars2(parent, *args)
-  if $showVarsWin[parent.path]
-    begin
-      $showVarsWin[parent.path].destroy
-    rescue
-    end
-  end
-  $showVarsWin[parent.path] = TkToplevel.new(parent) {|top|
-    title "Variable values"
-
-    base = TkFrame.new(top).pack(:fill=>:both, :expand=>true)
-
-    TkLabelFrame.new(base, :text=>"Variable values:",
-                     :font=>{:family=>'Helvetica', :size=>14}){|f|
-      args.each{|vnam,vbody|
-        TkGrid(TkLabel.new(f, :text=>"#{vnam}: ", :anchor=>'w'),
-               TkLabel.new(f, :textvariable=>vbody, :anchor=>'w'),
-               :padx=>2, :pady=>2, :sticky=>'w')
-      }
-
-      f.grid(:sticky=>'news', :padx=>4)
-      f.grid_columnconfig(1, :weight=>1)
-      f.grid_rowconfig(100, :weight=>1)
-    }
-    TkButton.new(base, :text=>"OK", :width=>8, :default=>:active,
-                 :command=>proc{top.destroy}){|b|
-      top.bind('Return', proc{b.invoke})
-      top.bind('Escape', proc{b.invoke})
-
-      b.grid(:sticky=>'e', :padx=>4, :pady=>[6, 4])
-    }
-    base.grid_columnconfig(0, :weight=>1)
-    base.grid_rowconfig(0, :weight=>1)
-  }
-end
-
-if $tk_major_ver < 8
-  alias showVars showVars1
-elsif $tk_major_ver == 8 && $tk_minor_ver < 4
-  alias showVars showVars1
-else # ver >= 8.4
-  alias showVars showVars2
-end
-
-# Pseudo-Toplevel support
-module PseudoToplevel_Evaluable
-  def pseudo_toplevel_eval(body = Proc.new)
-    Thread.current[:TOPLEVEL] = self
-    begin
-      body.call
-    ensure
-      Thread.current[:TOPLEVEL] = nil
-    end
-  end
-
-  def pseudo_toplevel_evaluable?
-    @pseudo_toplevel_evaluable
-  end
-  def pseudo_toplevel_evaluable=(mode)
-    @pseudo_toplevel_evaluable = (mode)? true: false
-  end
-
-  def self.extended(mod)
-    mod.__send__(:extend_object, mod)
-    mod.instance_variable_set('@pseudo_toplevel_evaluable', true)
-  end
-end
-
-class Object
-  alias __method_missing__ method_missing
-  private :__method_missing__
-
-  def method_missing(id, *args)
-    begin
-      has_top = (top = Thread.current[:TOPLEVEL]) &&
-                   top.respond_to?(:pseudo_toplevel_evaluable?) &&
-                   top.pseudo_toplevel_evaluable? &&
-                   top.respond_to?(id)
-    rescue Exception => e
-      has_top = false
-    end
-
-    if has_top
-      top.__send__(id, *args)
-    else
-      __method_missing__(id, *args)
-    end
-  end
-end
-
-class Proc
-  def initialize(*args)
-    super
-    @__pseudo_toplevel__ = Thread.current[:TOPLEVEL]
-  end
-
-  alias __call__ call
-  def call(*args, &b)
-    if top = @__pseudo_toplevel__
-      orig_top = Thread.current[:TOPLEVEL]
-      Thread.current[:TOPLEVEL] = top
-      begin
-        __call__(*args, &b)
-      ensure
-        Thread.current[:TOPLEVEL] = orig_top
-      end
-    else
-      __call__(*args, &b)
-    end
-  end
-end
-
-def proc(&b)
-  Proc.new(&b)
-end
-def lambda(&b)
-  Proc.new(&b)
-end
-
-def _null_binding
-  Module.new.instance_eval{extend PseudoToplevel_Evaluable}
-  # binding
-  # Module.new.instance_eval{binding}
-end
-private :_null_binding
-
-def eval_samplecode(code, file=nil)
-  #eval(code)
-  #_null_binding.pseudo_toplevel_eval{ eval(code) }
-  #Thread.new{ _null_binding.pseudo_toplevel_eval{ eval(code) } }
-  Thread.new{
-    _null_binding.pseudo_toplevel_eval{
-      begin
-        if file
-          eval(code, binding, "(eval:#{file})")
-        else
-          eval(code)
-        end
-      rescue Exception=>e
-        #p e
-        TkBgError.show(e.class.inspect + ': ' + e.message + "\n" +
-                         "\n---< backtrace of Ruby side >-----\n" +
-                         e.backtrace.join("\n") +
-                         "\n---< backtrace of Tk side >-------")
-      end
-    }
-  }
-  Tk.update rescue nil
-end
-
-# invoke --
-# This procedure is called when the user clicks on a demo description.
-# It is responsible for invoking the demonstration.
-#
-# Arguments:
-# txt -         Name of text widget
-# index -       The index of the character that the user clicked on.
-def invoke(txt, idx)
-  tag = txt.tag_names(idx).find{|t| t.kind_of?(String) && t =~ /^demo-/}
-  return unless tag
-
-  cursor = txt.cget('cursor')
-  txt.cursor('watch')
-  Tk.update rescue nil
-  # eval(IO.readlines("#{[$demo_dir, tag[5..-1]].join(File::Separator)}.rb").join, _null_binding)
-  # Tk.update
-  eval_samplecode(IO.readlines("#{[$demo_dir, tag[5..-1]].join(File::Separator)}.rb").join, tag[5..-1] + '.rb')
-  txt.cursor(cursor)
-
-  $tag_visited.add("#{idx} linestart +1 chars", "#{idx} lineend +1 chars")
-end
-=begin
-def invoke (txt, idx)
-  tag = txt.tag_names(idx).find{|t| t.kind_of?(String) && t =~ /^demo-/}
-  return unless tag
-  current_cursor = txt.cget('cursor')
-  txt.cursor('watch')
-  Tk.update
-#  eval `cat #{tag[5..-1]}.rb`
-#  eval `cat #{[$demo_dir, tag[5..-1]].join(File::Separator)}.rb`
-  eval IO.readlines("#{[$demo_dir, tag[5..-1]].join(File::Separator)}.rb").join
-  Tk.update
-#  txt.cursor('xterm')
-  txt.cursor(current_cursor)
-
-  $tag_visited.add("#{idx} linestart +1 chars", "#{idx} lineend +1 chars")
-end
-=end
-# showStatus --
-#
-#       Show the name of the demo program in the status bar. This procedure
-#       is called when the user moves the cursor over a demo description.
-#
-
-def showStatus (txt, index)
-  tag = txt.tag_names(index).find{|t| t.kind_of?(String) && t =~ /^demo-/}
-  cursor = txt.cget('cursor')
-  unless tag
-    $statusBarLabel.configure('text', " ")
-    newcursor = 'xterm'
-  else
-    demoname = tag[5..-1]
-    $statusBarLabel.configure('text',
-                             "Run the \"#{demoname}\" sample program")
-    newcursor = 'hand2'
-  end
-  txt.configure('cursor'=>newcursor) if cursor != newcursor
-end
-
-# showCode --
-# This procedure creates a toplevel window that displays the code for
-# a demonstration and allows it to be edited and reinvoked.
-#
-# Arguments:
-# demo -        The name of the demonstration's window, which can be
-#               used to derive the name of the file containing its code.
-
-def showCode1(demo)
-  file = "#{demo}.rb"
-  $code_window = nil unless defined? $code_window
-  if $code_window == nil || TkWinfo.exist?($code_window) == false
-    $code_window = TkToplevel.new(nil)
-    f = TkFrame.new($code_window)
-
-    TkButton.new(f) {
-      text "Dismiss"
-      command proc{
-        $code_window.destroy
-        $code_window = nil
-      }
-    }.pack('side'=>'right', 'expand'=>'false', 'pady'=>2, 'padx'=>25)
-    TkButton.new(f) {
-      text "Rerun Demo"
-      # command proc{eval($code_text.get('1.0','end'), _null_binding)}
-      command proc{eval_samplecode($code_text.get('1.0','end'), '<viewer>')}
-    }.pack('side'=>'right', 'expand'=>'false', 'pady'=>2)
-
-    TkLabel.new(f,'text'=>'line:').pack('side'=>'left')
-    linenum =TkLabel.new(f,'text'=>'').pack('side'=>'left')
-    TkLabel.new(f,'text'=>'  pos:').pack('side'=>'left')
-    posnum =TkLabel.new(f,'text'=>'').pack('side'=>'left')
-
-    $set_linenum = proc{|w|
-      line, pos = w.index('insert').split('.')
-      linenum.text = line
-      posnum.text  = pos
-    }
-
-    f.pack('side'=>'bottom', 'expand'=>'true', 'fill'=>'x')
-
-    if $tk_version =~ /^4\.[01]/
-      s = TkScrollbar.new($code_window, 'orient'=>'vertical')
-      $code_text = TkText.new($code_window) {
-        height 40
-        setgrid 'yes'
-        yscrollcommand proc{|first,last| s.set first,last}
-      }
-      s.command(proc{|*args| $code_text.yview(*args)})
-      s.pack('side'=>'right', 'fill'=>'y')
-      $code_text.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'both')
-    else
-      TkFrame.new($code_window) {|f|
-        pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>1)
-
-        hs = TkScrollbar.new($code_window, 'highlightthickness'=>0,
-                             'orient'=>'horizontal')
-        vs = TkScrollbar.new($code_window, 'highlightthickness'=>0,
-                             'orient'=>'vertical')
-        $code_text = TkText.new($code_window) {|t|
-          height 40
-          wrap 'word'
-          xscrollcommand proc{|first,last| hs.set first,last}
-          yscrollcommand proc{|first,last| vs.set first,last}
-          setgrid 'yes'
-          highlightthickness 0
-          pady 2
-          padx 3
-          hs.command(proc{|*args| $code_text.xview(*args)})
-          vs.command(proc{|*args| $code_text.yview(*args)})
-        }
-
-        $code_text.grid('in'=>f, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0,
-                        'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-        vs.grid('in'=>f, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1,
-                'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-#       xs.grid('in'=>f, 'padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0,
-#               'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-
-# JKC 2001-07-26: segfaults under 1.7.1 (2001-06-19) [i686-linux]
-        TkGrid.rowconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
-        TkGrid.columnconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
-      }
-    end
-
-    btag = TkBindTag.new
-
-    btag.bind('Key', $set_linenum, '%W')
-    btag.bind('Button', $set_linenum, '%W')
-
-    btags = $code_text.bindtags
-    btags.insert(btags.index($code_text.class) + 1, btag)
-    $code_text.bindtags = btags
-
-  else
-    $code_window.deiconify
-    $code_window.raise
-  end
-
-  $code_window.title("Demo code: #{file}")
-  $code_window.iconname(file)
-#  fid = open(file, 'r')
-  fid = open([$demo_dir, file].join(File::Separator), 'r')
-  $code_text.delete('1.0', 'end')
-  #$code_text.insert('1.0', `cat #{file}`)
-  $code_text.insert('1.0', fid.read)
-  #$code_mark = TkTextMark.new($code_text, '1.0')
-  #$code_text.set_insert('1.0')
-  TkTextMarkInsert.new($code_text,'1.0')
-
-  $set_linenum.call($code_text)
-
-  fid.close
-end
-
-def showCode2(demo)
-  file = "#{demo}.rb"
-  $code_window = nil unless defined? $code_window
-  if $code_window == nil || TkWinfo.exist?($code_window) == false
-    $code_window = TkToplevel.new(nil)
-    tf = TkFrame.new($code_window)
-    $code_text = TkText.new(tf, :font=>'Courier 10', :height=>30,
-                            :wrap=>'word', :bd=>1, :setgrid=>true,
-                            :highlightthickness=>0, :pady=>2, :padx=>3)
-    xscr = TkScrollbar.new(tf, :bd=>1){assign($code_text)}
-    yscr = TkScrollbar.new(tf, :bd=>1){assign($code_text)}
-    TkGrid($code_text, yscr, :sticky=>'news')
-    #TkGrid(xscr)
-    tf.grid_rowconfigure(0, :weight=>1)
-    tf.grid_columnconfigure(0, :weight=>1)
-
-    bf = TkFrame.new($code_window)
-
-    lf = TkFrame.new(bf)
-    TkLabel.new(lf, :text=>'line:').pack(:side=>:left)
-    linenum =TkLabel.new(lf, :text=>'').pack(:side=>:left)
-    TkLabel.new(lf, :text=>'  pos:').pack(:side=>:left)
-    posnum =TkLabel.new(lf, :text=>'').pack(:side=>:left)
-
-    $set_linenum = proc{|w|
-      line, pos = w.index('insert').split('.')
-      linenum.text = line
-      posnum.text  = pos
-    }
-
-    b_dis = TkButton.new(bf, :text=>'Dismiss', :default=>:active,
-                         :command=>proc{
-                           $code_window.destroy
-                           $code_window = nil
-                         },
-                         :image=>$image['delete'], :compound=>:left)
-    b_prn = TkButton.new(bf, :text=>'Print Code',
-                         :command=>proc{printCode($code_text, file)},
-                         :image=>$image['print'], :compound=>:left)
-    b_run = TkButton.new(bf, :text=>'Rerun Demo',
-                         :command=>proc{
-                           # eval($code_text.get('1.0','end'), _null_binding)
-                           eval_samplecode($code_text.get('1.0','end'), '<viewer>')
-                         },
-                         :image=>$image['refresh'], :compound=>:left)
-
-    TkGrid(lf, 'x', b_run, b_prn, b_dis, :padx=>4, :pady=>[6,4])
-    bf.grid_columnconfigure(1, :weight=>1)
-
-    TkGrid(tf, :sticky=>'news')
-    TkGrid(bf, :sticky=>'ew')
-    $code_window.grid_columnconfigure(0, :weight=>1)
-    $code_window.grid_rowconfigure(0, :weight=>1)
-
-    $code_window.bind('Return', proc{|win|
-                        b_dis.invoke unless win.kind_of?(TkText)
-                      }, '%W')
-    $code_window.bindinfo('Return').each{|cmd, arg|
-      $code_window.bind_append('Escape', cmd, arg)
-    }
-
-    btag = TkBindTag.new
-
-    btag.bind('Key', $set_linenum, '%W')
-    btag.bind('Button', $set_linenum, '%W')
-    btag.bind('Configure', $set_linenum, '%W')
-
-    btags = $code_text.bindtags
-    btags.insert(btags.index($code_text.class) + 1, btag)
-    $code_text.bindtags = btags
-
-  else
-    $code_window.deiconify
-    $code_window.raise
-  end
-
-  $code_window.title("Demo code: #{file}")
-  $code_window.iconname(file)
-  fid = open([$demo_dir, file].join(File::Separator), 'r')
-  $code_text.delete('1.0', 'end')
-  $code_text.insert('1.0', fid.read)
-  TkTextMarkInsert.new($code_text,'1.0')
-
-  $set_linenum.call($code_text)
-
-  fid.close
-end
-
-if $tk_major_ver < 8
-  alias showCode showCode1
-elsif $tk_major_ver == 8 && $tk_minor_ver < 4
-  alias showCode showCode1
-else # ver >= 8.4
-  alias showCode showCode2
-end
-
-
-# printCode --
-# Prints the source code currently displayed in the See Code dialog.
-# Much thanks to Arjen Markus for this.
-#
-# Arguments:
-# txt -         Name of text widget containing code to print
-# file -        Name of the original file (implicitly for title)
-
-def printCode(txt, file)
-  code = txt.get('1.0', 'end - 1c')
-  dir = '.'
-  dir = ENV['HOME'] if ENV['HOME']
-  dir = ENV['TMP'] if ENV['TMP']
-  dir = ENV['TEMP'] if ENV['TEMP']
-
-  fname = [dir, 'tkdemo-' + file].join(File::Separator)
-  open(fname, 'w'){|fid| fid.print(code)}
-  begin
-    case Tk::TCL_PLATFORM('platform')
-    when 'unix'
-      msg = `lp -c #{fname}`
-      unless $?.exitstatus == 0
-        Tk.messageBox(:title=>'Print spooling failure',
-                      :message=>'Print spooling probably failed: ' + msg)
-      end
-    when 'windows'
-      begin
-        printTextWin32(fname)
-      rescue => e
-        Tk.messageBox(:title=>'Print spooling failure',
-                      :message=>'Print spooling probably failed: ' +
-                      e.message)
-      end
-    when 'macintosh'
-      Tk.messageBox(:title=>'Operation not Implemented',
-                    :message=>'Oops, sorry: not implemented yet!')
-    else
-      Tk.messageBox(:title=>'Operation not Implemented',
-                    :message=>'Wow! Unknown platform: ' +
-                    Tk::TCL_PLATFORM('platform'))
-    end
-  ensure
-    File.delete(fname)
-  end
-end
-
-# printTextWin32 --
-#    Print a file under Windows
-#
-# Arguments:
-# filename -            Name of the file
-#
-def printTextWin32(fname)
-  require 'win32/registry'
-  begin
-    app = Win32::Registry::HKEY_CLASSES_ROOT['.txt']
-    pcmd = nil
-    Win32::Registry::HKEY_CLASSES_ROOT.open("#{app}\\shell\\print"){|reg|
-      pcmd = reg['command']
-    }
-  rescue
-    app = Tk.tk_call('auto_execok', 'notepad.exe')
-    pcmd = "#{app} /p %1"
-  end
-
-  pcmd.gsub!('%1', fname)
-  puts pcmd
-  cmd = Tk.tk_call('auto_execok', 'start') + ' /min ' + pcmd
-
-  msg = `#{cmd}`
-  unless $?.exitstatus == 0
-    fail RuntimeError, msg
-  end
-end
-
-# aboutBox
-#
-#      Pops up a message box with an "about" message
-#
-def aboutBox
-  Tk.messageBox('icon'=>'info', 'type'=>'ok', 'title'=>'About Widget Demo',
-                'message'=>"Ruby/Tk widget demonstration Ver.1.7.1-en\n\n" +
-                           "based on demos of Tk8.1 -- 8.5  " +
-                           "( Copyright of Tcl/Tk demos:: " +
-                           "(c) 1996-1997 Sun Microsystems, Inc. / " +
-                           "(c) 1997-2000 Ajuba Solutions, Inc. / " +
-                           "(c) 2001-2007 Donal K. Fellows / " +
-                           "(c) 2002-2007 Daniel A. Steffen )\n\n" +
-                           "Your Ruby & Tk Version ::\n" +
-                           "Ruby#{RUBY_VERSION}(#{RUBY_RELEASE_DATE})[#{RUBY_PLATFORM}] / Tk#{$tk_patchlevel}#{(Tk::JAPANIZED_TK)? '-jp': ''}\n\n" +
-                           "Ruby/Tk release date :: tcltklib #{TclTkLib::RELEASE_DATE}; tk #{Tk::RELEASE_DATE}")
-end
-
-#########################################
-# start demos if given at command line
-no_launcher = false
-if ARGV[0] == '-n'
-  ARGV.shift
-  no_launcher = true if ARGV.size > 0
-else
-  # show the root widget to make it lower then demo windows
-  Tk.update rescue nil
-end
-ARGV.each{|cmd|
-  if cmd =~ /(.*).rb/
-    cmd = $1
-  end
-  #eval(IO.readlines("#{[$demo_dir, cmd].join(File::Separator)}.rb").join,
-  #     _null_binding)
-  eval_samplecode(IO.readlines("#{[$demo_dir, cmd].join(File::Separator)}.rb").join, cmd + '.rb')
-}
-if no_launcher
-  $root.withdraw  # hide root window
-  Thread.start{
-    loop do
-      count = 0
-      $root.winfo_children.each{|w|
-        count += 1 if w.kind_of?(TkToplevel)
-      }
-      $root.destroy if count == 0
-    end
-  }
-end
-
-#########################################
-# start eventloop
-Tk.mainloop
-
diff --git a/ext/tk/sample/demos-jp/README b/ext/tk/sample/demos-jp/README
deleted file mode 100644
index 4278124659..0000000000
--- a/ext/tk/sample/demos-jp/README
+++ /dev/null
@@ -1,54 +0,0 @@
-
-  Ruby/Tk widget-demo
-                              version 1.2 ( 2000/04/08 )
-                              永井＠知能．九工大 (nagai@ai.kyutech.ac.jp)
-
-標準配布の Tcl/Tk 拡張パッケージを取り込んだ Ruby (以下 Ruby/Tk と呼びます)
-では，Tk widget を用いた GUI の作成を行うことができます．実際に GUI を作成
-していく場合には様々な実例がサンプルとして存在すると便利なのですが，Ruby/Tk
-にはそのような適当なサンプルスクリプト集合は存在しませんでした．それに対し，
-拡張パッケージの元である Tcl/Tk には，Tk widget を用いてどのようなことがで
-きるかを示すものとして widget-demo が存在しおり，Tcl/Tk を用いた GUI の作成
-を習得する際の代表的サンプルとなっています．本アーカイブは，Ruby/Tk の習得の
-ための代表的なサンプルスクリプトとすべく，Tcl/Tk の widget-demo を移植したも
-のです．
-
-今回のバージョンは ruby-1.4.x に対応としておきますが，旧バージョンに比べて，
-ほとんど変更はありません．ruby-1.1c2 以上なら動くと思います．ruby-1.5.x につ
-いてはテストしていません．そのため，非互換の影響が出ることがあるかもしれませ
-んが，その場合でも少しの修正で動かせると思います．組み込む Tk のバージョンは，
-4.2 でも 8.0 でも修正なく動かせるはずです．ただし，日本語版での移植となって
-いるため，日本語化された Tk をご利用ください．スクリプトのテストは，旧バージョ
-ンの際に Tk4.2jp と Tk8.0jp の上で行っています (完璧にではないですが)．今回
-のバージョンでは ruby-1.4.x + Tk8.0jp 上での簡単なテストしか行っていませんが，
-修正というほどの修正はしていませんので問題はないと考えています．
-
-本アーカイブに含まれるスクリプトの多くは，元となっている Tcl/Tk 版に比較的近
-いスクリプト記述となるようにしています．そのため，Ruby/Tk のサンプルと言うに
-は，あまり Ruby らしくないとも言えるでしょう．にもかかわらず，そのような記述
-を取っている理由は，Ruby/Tk のドキュメント不足にあります．
-
-Tcl/Tk には適当な参考書が何冊か存在していますから，Ruby/Tk スクリプトを作成
-する際は，そのような Tcl/Tk の参考書で情報を補いながら作成することになると思
-います．各 widget の使用例として，Tcl/Tk の widget-demo を参照することもある
-でしょう．Ruby/Tk 版の記述を widget-demo を Tcl/Tk 版の記述に近いものにして
-おけば，その対比によって，Ruby/Tk の理解を早めることができると考えられます．
-一旦 Ruby/Tk での 各 widget の使用方法を習得してしまえば，Ruby らしいスクリ
-プトを作成することは難しくないでしょう．本アーカイブのスクリプトは，Ruby/Tk
-を最初に習得するまでの踏台として利用していただければ幸いです．
-
-widget-demo の移植にあたっては，次の方にも移植したスクリプトを提供していただ
-きました．ここに感謝の意を表します．
-
-    立石＠JAIST (ttate@jaist.ac.jp) さん
-    平松祥史 (hiramatu@cdrom.co.jp) さん
-
-平松さんによる Ruby/Tk 入門の Web page (http://www.cdrom.co.jp/~hiramatu/)
-も Ruby/Tk の習得に有用と思えますので，ぜひご参照ください．
-
-また，前橋 (maebashi@iij.ad.jp) さんをはじめとして，widget-demo の移植に際し
-て必要となった Ruby の Tk 関連ライブラリ修正について，問題点，バグの指摘をし
-ていただいた方々にも感謝致します．
-
-そして最後に最大の感謝を Ruby 設計者の まつもと ゆきひろ (matz@netlab.co.jp)
-さんに捧げたいと思います．
diff --git a/ext/tk/sample/demos-jp/README.1st b/ext/tk/sample/demos-jp/README.1st
deleted file mode 100644
index 68caf8b14d..0000000000
--- a/ext/tk/sample/demos-jp/README.1st
+++ /dev/null
@@ -1,20 +0,0 @@
-このディレクトリには Ruby/Tk のデモスクリプトが収められています．
-
-'.rb' という拡張子を持っているファイルは，ランチャ─スクリプトで
-ある 'widget' から呼び出されるサブスクリプトです．それぞれ独立に
-は動きません．'widget' スクリプトから呼び出してください．
-
-もしランチャ─スクリプト 'widget' の起動と同時にいくつかのサブス
-クリプトを起動したければ，そのサブスクリプトの名前を引数として与
-えてください．
-( 例: /usr/local/bin/ruby widget button.rb entry1.rb text.rb )
-サブスクリプトの拡張子 '.rb' は省略することもできます．
-( 例: /usr/local/bin/ruby widget button entry1 text )
-
-もしランチャ─スクリプトのウィンドウが必要ない場合には，'-n' オ
-プションを与えてください．
-( 例: /usr/local/bin/ruby widget -n button.rb entry1.rb text.rb )
-
-他のファイル (browse1 や hello など) は単独で動かすことが可能です．
-
-          2004/04/14  Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
diff --git a/ext/tk/sample/demos-jp/anilabel.rb b/ext/tk/sample/demos-jp/anilabel.rb
deleted file mode 100644
index ccad73ffc6..0000000000
--- a/ext/tk/sample/demos-jp/anilabel.rb
+++ /dev/null
@@ -1,178 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# animated label widget demo (called by 'widget')
-#
-# based on Tcl/Tk8.5a2 widget demos
-
-# toplevel widget が存在すれば削除する
-if defined?($anilabel_demo) && $anilabel_demo
-  $anilabel_demo.destroy
-  $anilabel_demo = nil
-end
-
-# demo 用の toplevel widget を生成
-$anilabel_demo = TkToplevel.new {|w|
-  title("Animated Label Demonstration")
-  iconname("anilabel")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($anilabel_demo).pack(:fill=>:both, :expand=>true)
-
-# label 生成
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "下には4つのアニメーションラベルが表示されています。左側にあるラベルは、内部のテキストメッセージをスクロールしたように見せることで動きを付けています。右側のラベルは、表示するイメージを変化させることで動きを与えています。"
-}
-msg.pack('side'=>'top')
-
-# frame 生成
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc{
-      tmppath = $anilabel_demo
-      $anilabel_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc{showCode 'anilabel'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# label demo 用フレーム生成
-f_left = TkLabelFrame.new(base_frame,  :text=>'Scrolling Texts')
-f_right = TkLabelFrame.new(base_frame, :text=>'GIF Image')
-Tk.pack(f_left, f_right, 'side'=>'left', 'expand'=>'yes', 'fill'=>'both',
-        'padx'=>10, 'pady'=>10)
-
-# animated label
-class AnimatedTextLabel < TkLabel
-  def initialize(*args)
-    super(*args)
-    @timer = TkTimer.new{ _animation_callback }
-    @timer.loop_exec = -1
-    # bind('Destroy'){ @timer.stop }
-    @btag = TkBindTag.new('Destroy'){ @timer.stop }
-    self.bindtags_unshift(@btag)
-  end
-
-  def _animation_callback()
-    txt = self.text
-    self.text = (txt[1..-1] << txt[0])
-  end
-  private :_animation_callback
-
-  def start(interval)
-    @timer.set_interval(interval)
-    @timer.start
-  end
-
-  def stop
-    @timer.stop
-  end
-end
-
-# animated image
-class AnimatedImageLabel < AnimatedTextLabel
-  def initialize(*args)
-    super(*args)
-    @destroy_image = false
-    @btag.bind_append('Destroy'){
-      if @destroy_image
-        begin
-          self.image.delete
-        rescue
-        end
-      end
-    }
-  end
-  attr_accessor :destroy_image
-
-  def _animation_callback()
-    img = self.image
-
-    fmt = img.format
-    if fmt.kind_of?(Array)
-      if fmt[1].kind_of?(Hash)
-        # fmt == ['GIF', {'index'=>idx}]
-        idx = fmt[1]['index']
-      else
-        # fmt == ['GIF', '-index', idx]  :: Ruby1.8.2 returns this.
-        idx = fmt[2]
-      end
-    elsif fmt.kind_of?(String) && fmt =~ /GIF -index (\d+)/
-      idx = $1.to_i
-    else
-      idx = -1
-    end
-
-    begin
-      img.format("GIF -index #{idx + 1}")
-    rescue => e
-      img.format("GIF -index 0")
-    end
-  end
-  private :_animation_callback
-end
-
-# label 生成
-l1 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:ridge,
-                           :font=>{:family=>'Courier', :size=>10})
-l2 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:groove,
-                           :font=>{:family=>'Courier', :size=>10})
-l3 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:flat,
-                           :font=>{:family=>'Courier', :size=>10}, :width=>18)
-Tk.pack(l1, l2, l3,
-        :side=>:top, :expand=>true, :anchor=>:w, :padx=>10, :pady=>10)
-
-limg = AnimatedImageLabel.new(f_right, :borderwidth=>0)
-limg.pack(:side=>:top, :expand=>true, :padx=>10, :pady=>10)
-
-# base64-encoded animated GIF file
-tclPowerdData = <<EOD
-    R0lGODlhKgBAAPQAAP//////zP//AP/MzP/Mmf/MAP+Zmf+ZZv+ZAMz//8zM
-    zMyZmcyZZsxmZsxmAMwzAJnMzJmZzJmZmZlmmZlmZplmM5kzM2aZzGZmzGZm
-    mWZmZmYzZmYzMzNmzDMzZgAzmSH+IE1hZGUgd2l0aCBHSU1QIGJ5IExARGVt
-    YWlsbHkuY29tACH5BAVkAAEALAAAAAAqAEAAAAX+YCCOZEkyTKM2jOm66yPP
-    dF03bx7YcuHIDkGBR7SZeIyhTID4FZ+4Es8nQyCe2EeUNJ0peY2s9mi7PhAM
-    ngEAMGRbUpvzSxskLh1J+Hkg134OdDIDEB+GHxtYMEQMTjMGEYeGFoomezaC
-    DZGSHFmLXTQKkh8eNQVpZ2afmDQGHaOYSoEyhhcklzVmMpuHnaZmDqiGJbg0
-    qFqvh6UNAwB7VA+OwydEjgujkgrPNhbTI8dFvNgEYcHcHx0lB1kX2IYeA2G6
-    NN0YfkXJ2BsAMuAzHB9cZMk3qoEbRzUACsRCUBK5JxsC3iMiKd8GN088SIyT
-    0RAFSROyeEg38caDiB/+JEgqxsODrZJ1BkT0oHKSmI0ceQxo94HDpg0qsuDk
-    UmRAMgu8OgwQ+uIJgUMVeGXA+IQkzEeHGvD8cIGlDXsLiRjQ+EHroQhea7xY
-    8IQBSgYYDi1IS+OFBCgaDMGVS3fGi5BPJpBaENdQ0EomKGD56IHwO39EXiSC
-    Ysgxor5+Xfgq0qByYUpiXmwuoredB2aYH4gWWda0B7SeNENpEJHC1ghi+pS4
-    AJpIAwWvKPBi+8YEht5EriEqpFfMlhEdkBNpx0HUhwypx5T4IB1MBg/Ws2sn
-    wV3MSQOkzI8fUd48Aw3dOZto71x85hHtHijYv18Gf/3GqCdDCXHNoICBobSo
-    IqBqJLyCoH8JPrLgdh88CKCFD0CGmAiGYPgffwceZh6FC2ohIIklnkhehTNY
-    4CIHHGzgwYw01ujBBhvAqKOLLq5AAk9kuSPkkKO40NB+h1gnypJIIvkBf09a
-    N5QIRz5p5ZJXJpmlIVhOGQA2TmIJZZhKKmmll2BqyWSXWUrZpQtpatlmk1c2
-    KaWRHeTZEJF8SqLDn/hhsOeQgBbqAh6DGqronxeARUIIACH5BAUeAAAALAUA
-    LgAFAAUAAAUM4CeKz/OV5YmqaRkCACH5BAUeAAEALAUALgAKAAUAAAUUICCK
-    z/OdJVCaa7p+7aOWcDvTZwgAIfkEBR4AAQAsCwAuAAkABQAABRPgA4zP95zA
-    eZqoWqqpyqLkZ38hACH5BAUKAAEALAcALgANAA4AAAU7ICA+jwiUJEqeKau+
-    r+vGaTmac63v/GP9HM7GQyx+jsgkkoRUHJ3Qx0cK/VQVTKtWwbVKn9suNunc
-    WkMAIfkEBQoAAAAsBwA3AAcABQAABRGgIHzk842j+Yjlt5KuO8JmCAAh+QQF
-    CgAAACwLADcABwAFAAAFEeAnfN9TjqP5oOWziq05lmUIACH5BAUKAAAALA8A
-    NwAHAAUAAAUPoPCJTymS3yiQj4qOcPmEACH5BAUKAAAALBMANwAHAAUAAAUR
-    oCB+z/MJX2o+I2miKimiawgAIfkEBQoAAAAsFwA3AAcABQAABRGgIHzfY47j
-    Q4qk+aHl+pZmCAAh+QQFCgAAACwbADcABwAFAAAFEaAgfs/zCV9qPiNJouo7
-    ll8IACH5BAUKAAAALB8ANwADAAUAAAUIoCB8o0iWZggAOw==
-EOD
-
-l1.text('* Slow Animation *').start(300)
-l2.text('* Fast Animation *').start(80)
-l3.text('This is a longer scrolling text in a widget that will not show the whole message at once. ').start(150)
-
-limg.destroy_image = true
-limg.image(TkPhotoImage.new(:format=>'GIF', :data=>tclPowerdData)).start(100)
diff --git a/ext/tk/sample/demos-jp/aniwave.rb b/ext/tk/sample/demos-jp/aniwave.rb
deleted file mode 100644
index 6973de7f09..0000000000
--- a/ext/tk/sample/demos-jp/aniwave.rb
+++ /dev/null
@@ -1,121 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# animated wave demo (called by 'widget')
-#
-# based on Tcl/Tk8.5a2 widget demos
-
-# destroy toplevel widget for this demo script
-if defined?($aniwave_demo) && $aniwave_demo
-  $aniwave_demo.destroy
-  $aniwave_demo = nil
-end
-
-# create toplevel widget
-$aniwave_demo = TkToplevel.new {|w|
-  title("Animated Wave Demonstration")
-  iconname("aniwave")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($aniwave_demo).pack(:fill=>:both, :expand=>true)
-
-# create label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text 'このデモでは、ラインアイテムが一つだけ描かれたキャンバスウィジェットが表示されています。アニメーション処理は、そのラインアイテムの座標値を変更することで実現しています。'
-}
-msg.pack('side'=>'top')
-
-# create frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc{
-      tmppath = $aniwave_demo
-      $aniwave_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc{showCode 'aniwave'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# animated wave
-class AnimatedWaveDemo
-  def initialize(frame, dir=:left)
-    @direction = dir
-
-    # create canvas widget
-    @c = TkCanvas.new(frame, :width=>300, :height=>200,
-                      :background=>'black')
-    @c.pack(:padx=>10, :pady=>10, :expand=>true)
-
-    # Creates a coordinates list of a wave.
-    @waveCoords = []
-    @backupCoords = []
-    n = 0
-    (-10..300).step(5){|n| @waveCoords << [n, 100]; @backupCoords << [n, 100] }
-    n = 305
-    @waveCoords << [n, 0]; @backupCoords << [n, 0]
-    @waveCoords << [n+5, 200]; @backupCoords << [n+5, 200]
-    @coordsLen = @waveCoords.length
-
-    # Create a smoothed line and arrange for its coordinates to be the
-    # contents of the variable waveCoords.
-    @line = TkcLine.new(@c, @waveCoords,
-                        :width=>1, :fill=>'green', :smooth=>true)
-
-    # Main animation "loop".
-    # Theoretically 100 frames-per-second (==10ms between frames)
-    @timer = TkTimer.new(10){ basicMotion; reverser }
-
-    # Arrange for the animation loop to stop when the canvas is deleted
-    @c.bindtags_unshift(TkBindTag.new('Destroy'){ @timer.stop })
-  end
-
-  # Basic motion handler. Given what direction the wave is travelling
-  # in, it advances the y coordinates in the coordinate-list one step in
-  # that direction.
-  def basicMotion
-    @backupCoords, @waveCoords = @waveCoords, @backupCoords
-    (0...@coordsLen).each{|idx|
-      if @direction == :left
-        @waveCoords[idx][1] = @backupCoords[(idx+1 == @coordsLen)? 0: idx+1][1]
-      else
-        @waveCoords[idx][1] = @backupCoords[(idx == 0)? -1: idx-1][1]
-      end
-    }
-    @line.coords(@waveCoords)
-  end
-
-  # Oscillation handler. This detects whether to reverse the direction
-  # of the wave by checking to see if the peak of the wave has moved off
-  # the screen (whose size we know already.)
-  def reverser
-    if @waveCoords[0][1] < 10
-      @direction = :right
-    elsif @waveCoords[-1][1] < 10
-      @direction = :left
-    end
-  end
-
-  # animation control
-  def move
-    @timer.start
-  end
-
-  def stop
-    @timer.stop
-  end
-end
-
-# Start the animation processing
-AnimatedWaveDemo.new(base_frame, :left).move
diff --git a/ext/tk/sample/demos-jp/arrow.rb b/ext/tk/sample/demos-jp/arrow.rb
deleted file mode 100644
index 12ab4af2b1..0000000000
--- a/ext/tk/sample/demos-jp/arrow.rb
+++ /dev/null
@@ -1,248 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# arrowhead widget demo (called by 'widget')
-#
-
-# arrowSetup --
-# This method regenerates all the text and graphics in the canvas
-# window.  It's called when the canvas is initially created, and also
-# whenever any of the parameters of the arrow head are changed
-# interactively.
-#
-# Arguments:
-# c -           Name of the canvas widget.
-
-def arrowSetup(c)
-  v = $demo_arrowInfo
-
-  # Remember the current box, if there is one.
-  tags = c.gettags('current')
-  if tags != []
-    cur = tags.find{|t| t.kind_of?(String) && t =~ /^box[1-3]$/ }
-  else
-    cur = nil
-  end
-
-  # Create the arrow and outline.
-  c.delete('all')
-  TkcLine.new(c, v.x1, v.y, v.x2, v.y,
-              { 'width'=>10 * v.width,
-                'arrowshape'=>[10*v.a, 10*v.b, 10*v.c],
-                'arrow'=>'last'
-              }.update(v.bigLineStyle) )
-  xtip = v.x2 - 10*v.b
-  deltaY = 10*v.c + 5*v.width
-  TkcLine.new(c, v.x2, v.y, xtip, v.y + deltaY,
-              v.x2 - 10*v.a, v.y, xtip, v.y - deltaY, v.x2, v.y,
-              'width'=>2, 'capstyle'=>'round', 'joinstyle'=>'round')
-
-  # Create the boxes for reshaping the line and arrowhead.
-  TkcRectangle.new(c, v.x2-10*v.a-5, v.y-5, v.x2-10*v.a+5, v.y+5,
-                   {'tags'=>['box1', $arrowTag_box]}.update(v.boxStyle) )
-  TkcRectangle.new(c, xtip-5, v.y-deltaY-5, xtip+5, v.y-deltaY+5,
-                   {'tags'=>['box2', $arrowTag_box]}.update(v.boxStyle) )
-  TkcRectangle.new(c, v.x1-5, v.y-5*v.width-5, v.x1+5, v.y-5*v.width+5,
-                   {'tags'=>['box3', $arrowTag_box]}.update(v.boxStyle) )
-  c.itemconfigure cur, v.activeStyle if cur
-
-  # Create three arrows in actual size with the same parameters
-  TkcLine.new(c, v.x2+50, 0, v.x2+50, 1000, 'width'=>2)
-  tmp = v.x2+100
-  TkcLine.new(c, tmp, v.y-125, tmp, v.y-75, 'width'=>v.width,
-              'arrow'=>'both', 'arrowshape'=>[v.a, v.b, v.c])
-  TkcLine.new(c, tmp-25, v.y, tmp+25, v.y, 'width'=>v.width,
-              'arrow'=>'both', 'arrowshape'=>[v.a, v.b, v.c])
-  TkcLine.new(c, tmp-25, v.y+75, tmp+25, v.y+125, 'width'=>v.width,
-              'arrow'=>'both', 'arrowshape'=>[v.a, v.b, v.c])
-
-  # Create a bunch of other arrows and text items showing the
-  # current dimensions.
-  tmp = v.x2+10
-  TkcLine.new(c, tmp, v.y-5*v.width, tmp, v.y-deltaY,
-              'arrow'=>'both', 'arrowshape'=>v.smallTips)
-  TkcText.new(c, v.x2+15, v.y-deltaY+5*v.c, 'text'=>v.c, 'anchor'=>'w')
-  tmp = v.x1-10
-  TkcLine.new(c, tmp, v.y-5*v.width, tmp, v.y+5*v.width,
-              'arrow'=>'both', 'arrowshape'=>v.smallTips)
-  TkcText.new(c, v.x1-15, v.y, 'text'=>v.width, 'anchor'=>'e')
-  tmp = v.y+5*v.width+10*v.c+10
-  TkcLine.new(c, v.x2-10*v.a, tmp, v.x2, tmp,
-              'arrow'=>'both', 'arrowshape'=>v.smallTips)
-  TkcText.new(c, v.x2-5*v.a, tmp+5, 'text'=>v.a, 'anchor'=>'n')
-  tmp = tmp+25
-  TkcLine.new(c, v.x2-10*v.b, tmp, v.x2, tmp,
-              'arrow'=>'both', 'arrowshape'=>v.smallTips)
-  TkcText.new(c, v.x2-5*v.b, tmp+5, 'text'=>v.b, 'anchor'=>'n')
-
-  if $tk_version =~ /^4.*/
-    TkcText.new(c, v.x1, 310, 'text'=>"'width'=>#{v.width}", 'anchor'=>'w',
-                'font'=>'-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*')
-    TkcText.new(c, v.x1, 330,
-                'text'=>"'arrowshape'=>[#{v.a}, #{v.b}, #{v.c}]",'anchor'=>'w',
-                'font'=>'-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*')
-  else
-    TkcText.new(c, v.x1, 310, 'text'=>"'width'=>#{v.width}", 'anchor'=>'w',
-                'font'=>'Helvetica 18')
-    TkcText.new(c, v.x1, 330,
-                'text'=>"'arrowshape'=>[#{v.a}, #{v.b}, #{v.c}]",
-                'anchor'=>'w', 'font'=>'Helvetica 18')
-  end
-
-  v.count += 1
-end
-
-# toplevel widget が存在すれば削除する
-if defined?($arrow_demo) && $arrow_demo
-  $arrow_demo.destroy
-  $arrow_demo = nil
-end
-
-# demo 用の toplevel widget を生成
-$arrow_demo = TkToplevel.new {|w|
-  title("Arrowhead Editor Demonstration")
-  iconname("arrow")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($arrow_demo).pack(:fill=>:both, :expand=>true)
-
-# label 生成
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left',
-            'text'=>"この widget で、キャンバスで使われるラインについて様々な幅や矢印の頭の形を試してみることができます。線の幅や矢印の形を変えるには、拡大された矢印についている 3つの四角をドラッグしてください。右側の矢印は普通の大きさでのサンプルを示しています。下のテキストはラインアイテムに対する設定オプションです。"){
-  pack('side'=>'top')
-}
-
-# frame 生成
-$arrow_buttons = TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc{
-      tmppath = $arrow_demo
-      $arrow_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc{showCode 'arrow'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$arrow_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# canvas 設定
-$arrow_canvas = TkCanvas.new(base_frame, 'width'=>500, 'height'=>350,
-                             'relief'=>'sunken', 'borderwidth'=>2)
-$arrow_canvas.pack('expand'=>'yes', 'fill'=>'both')
-
-# 値設定
-unless Struct.const_defined?("ArrowInfo")
-  $demo_arrowInfo = Struct.new("ArrowInfo", :a, :b, :c, :width, :motionProc,
-                               :x1, :x2, :y, :smallTips, :count,
-                               :bigLineStyle, :boxStyle, :activeStyle).new
-end
-$demo_arrowInfo.a = 8
-$demo_arrowInfo.b = 10
-$demo_arrowInfo.c = 3
-$demo_arrowInfo.width = 2
-$demo_arrowInfo.motionProc = proc{}
-$demo_arrowInfo.x1 = 40
-$demo_arrowInfo.x2 = 350
-$demo_arrowInfo.y = 150
-$demo_arrowInfo.smallTips = [5, 5, 2]
-$demo_arrowInfo.count = 0
-if TkWinfo.depth($arrow_canvas) > 1
-  $demo_arrowInfo.bigLineStyle = {'fill'=>'SkyBlue1'}
-  $demo_arrowInfo.boxStyle = {'fill'=>'', 'outline'=>'black', 'width'=>1}
-  $demo_arrowInfo.activeStyle = {'fill'=>'red', 'outline'=>'black', 'width'=>1}
-else
-  $demo_arrowInfo.bigLineStyle = {'fill'=>'black',
-    'stipple'=>'@'+[$demo_dir,'..','images','grey.25'].join(File::Separator)}
-  $demo_arrowInfo.boxStyle = {'fill'=>'', 'outline'=>'black', 'width'=>1}
-  $demo_arrowInfo.activeStyle = {'fill'=>'black','outline'=>'black','width'=>1}
-end
-$arrowTag_box = TkcTag.new($arrow_canvas)
-arrowSetup $arrow_canvas
-$arrowTag_box.bind('Enter', proc{$arrow_canvas.itemconfigure('current', $demo_arrowInfo.activeStyle)})
-$arrowTag_box.bind('Leave', proc{$arrow_canvas.itemconfigure('current', $demo_arrowInfo.boxStyle)})
-$arrowTag_box.bind('B1-Enter', proc{})
-$arrowTag_box.bind('B1-Leave', proc{})
-$arrow_canvas.itembind('box1', '1',
-                       proc{$demo_arrowInfo.motionProc \
-                         = proc{|x,y| arrowMove1 $arrow_canvas, x, y}})
-$arrow_canvas.itembind('box2', '1',
-                       proc{$demo_arrowInfo.motionProc \
-                         = proc{|x,y| arrowMove2 $arrow_canvas, x, y}})
-$arrow_canvas.itembind('box3', '1',
-                       proc{$demo_arrowInfo.motionProc \
-                         = proc{|x,y| arrowMove3 $arrow_canvas, x, y}})
-$arrowTag_box.bind('B1-Motion',
-                  proc{|x,y| $demo_arrowInfo.motionProc.call(x,y)}, "%x %y")
-$arrow_canvas.bind('Any-ButtonRelease-1', proc{arrowSetup $arrow_canvas})
-
-# arrowMove1 --
-# This method is called for each mouse motion event on box1 (the
-# one at the vertex of the arrow).  It updates the controlling parameters
-# for the line and arrowhead.
-#
-# Arguments:
-# c -           The name of the canvas window.
-# x, y -        The coordinates of the mouse.
-
-def arrowMove1(c,x,y)
-  v = $demo_arrowInfo
-  newA = (v.x2+5-c.canvasx(x).round)/10
-  newA = 0 if newA < 0
-  newA = 25 if newA > 25
-  if newA != v.a
-    c.move('box1', 10*(v.a-newA), 0)
-    v.a = newA
-  end
-end
-
-# arrowMove2 --
-# This method is called for each mouse motion event on box2 (the
-# one at the trailing tip of the arrowhead).  It updates the controlling
-# parameters for the line and arrowhead.
-#
-# Arguments:
-# c -           The name of the canvas window.
-# x, y -        The coordinates of the mouse.
-
-def arrowMove2(c,x,y)
-  v = $demo_arrowInfo
-  newB = (v.x2+5-c.canvasx(x).round)/10
-  newB = 0 if newB < 0
-  newB = 25 if newB > 25
-  newC = (v.y+5-c.canvasy(y).round-5*v.width)/10
-  newC = 0 if newC < 0
-  newC = 20 if newC > 20
-  if newB != v.b || newC != v.c
-    c.move('box2', 10*(v.b-newB), 10*(v.c-newC))
-    v.b = newB
-    v.c = newC
-  end
-end
-
-# arrowMove3 --
-# This method is called for each mouse motion event on box3 (the
-# one that controls the thickness of the line).  It updates the
-# controlling parameters for the line and arrowhead.
-#
-# Arguments:
-# c -           The name of the canvas window.
-# x, y -        The coordinates of the mouse.
-
-def arrowMove3(c,x,y)
-  v = $demo_arrowInfo
-  newWidth = (v.y+2-c.canvasy(y).round)/5
-  newWidth = 0 if newWidth < 0
-  newWidth = 20 if newWidth > 20
-  if newWidth != v.width
-    c.move('box3', 0, 5*(v.width-newWidth))
-    v.width = newWidth
-  end
-end
-
diff --git a/ext/tk/sample/demos-jp/bind.rb b/ext/tk/sample/demos-jp/bind.rb
deleted file mode 100644
index 74ddf0217a..0000000000
--- a/ext/tk/sample/demos-jp/bind.rb
+++ /dev/null
@@ -1,126 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# text (tag bindings) widget demo (called by 'widget')
-#
-
-# toplevel widget が存在すれば削除する
-if defined?($bind_demo) && $bind_demo
-  $bind_demo.destroy
-  $bind_demo = nil
-end
-
-# demo 用の toplevel widget を生成
-$bind_demo = TkToplevel.new {|w|
-  title("Text Demonstration - Tag Bindings")
-  iconname("bind")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($bind_demo).pack(:fill=>:both, :expand=>true)
-
-# frame 生成
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc{
-      tmppath = $bind_demo
-      $bind_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc{showCode 'bind'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# bind 用メソッド
-def tag_binding_for_bind_demo(tag, enter_style, leave_style)
-  tag.bind('Any-Enter', proc{tag.configure enter_style})
-  tag.bind('Any-Leave', proc{tag.configure leave_style})
-end
-
-# text 生成
-txt = TkText.new(base_frame){|t|
-  # 生成
-  setgrid 'true'
-  #width  60
-  #height 24
-  font $font
-  wrap 'word'
-  TkScrollbar.new(base_frame) {|s|
-    pack('side'=>'right', 'fill'=>'y')
-    command proc{|*args| t.yview(*args)}
-    t.yscrollcommand proc{|first,last| s.set first,last}
-  }
-  pack('expand'=>'yes', 'fill'=>'both')
-
-  # スタイル設定
-  if TkWinfo.depth($root).to_i > 1
-    tagstyle_bold = {'background'=>'#43ce80', 'relief'=>'raised',
-                     'borderwidth'=>1}
-    tagstyle_normal = {'background'=>'', 'relief'=>'flat'}
-  else
-    tagstyle_bold = {'foreground'=>'white', 'background'=>'black'}
-    tagstyle_normal = {'foreground'=>'', 'background'=>''}
-  end
-
-  # テキスト挿入
-  insert 'insert', "テキストwidgetの表示スタイルを制御するのと同じタグのメカニズムを使って、テキストにTclのコマンドを割り当てることができます。これにより、マウスやキーボードのアクションで特定のTclのコマンドが実行されるようになります。例えば、下のキャンバスのデモプログラムについての説明文にはそのようなタグがついています。マウスを説明文の上に持っていくと説明文が光り、ボタン1を押すとその説明のデモが始まります。
-
-"
-  insert('end', '1. キャンバス widget に作ることのできるアイテムの種類全てに関するサンプル。', (d1 = TkTextTag.new(t)) )
-  insert('end', "\n\n")
-  insert('end', '2. 簡単な 2次元のプロット。データを表す点を動かすことができる。', (d2 = TkTextTag.new(t)) )
-  insert('end', "\n\n")
-  insert('end', '3. テキストアイテムのアンカーと行揃え。',
-         (d3 = TkTextTag.new(t)) )
-  insert('end', "\n\n")
-  insert('end', '4. ラインアイテムのための矢印の頭の形のエディタ。',
-         (d4 = TkTextTag.new(t)) )
-  insert('end', "\n\n")
-  insert('end', '5. タブストップを変更するための機能つきのルーラー。',
-         (d5 = TkTextTag.new(t)) )
-  insert('end', "\n\n")
-  insert('end',
-         '6. キャンバスがどうやってスクロールするのかを示すグリッド。',
-         (d6 = TkTextTag.new(t)) )
-
-  # binding
-  [d1, d2, d3, d4, d5, d6].each{|tag|
-    tag_binding_for_bind_demo(tag, tagstyle_bold, tagstyle_normal)
-  }
-  d1.bind('1',
-          proc{
-            eval_samplecode(`cat #{[$demo_dir,'items.rb'].join(File::Separator)}`, 'items.rb')
-          })
-  d2.bind('1',
-          proc{
-            eval_samplecode(`cat #{[$demo_dir,'plot.rb'].join(File::Separator)}`, 'plot.rb')
-          })
-  d3.bind('1',
-          proc{
-            eval_samplecode(`cat #{[$demo_dir,'ctext.rb'].join(File::Separator)}`, 'ctext.rb')
-          })
-  d4.bind('1',
-          proc{
-            eval_samplecode(`cat #{[$demo_dir,'arrow.rb'].join(File::Separator)}`, 'arrow.rb')
-          })
-  d5.bind('1',
-          proc{
-            eval_samplecode(`cat #{[$demo_dir,'ruler.rb'].join(File::Separator)}`, 'ruler.rb')
-          })
-  d6.bind('1',
-          proc{
-            eval_samplecode(`cat #{[$demo_dir,'cscroll.rb'].join(File::Separator)}`, 'cscroll.rb')
-          })
-
-  TkTextMarkInsert.new(t, '0.0')
-  configure('state','disabled')
-}
-
-txt.width  60
-txt.height 24
diff --git a/ext/tk/sample/demos-jp/bitmap.rb b/ext/tk/sample/demos-jp/bitmap.rb
deleted file mode 100644
index 2cc9c28fbd..0000000000
--- a/ext/tk/sample/demos-jp/bitmap.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# bitmap widget demo (called by 'widget')
-#
-
-# bitmapRow --
-# Create a row of bitmap items in a window.
-#
-# Arguments:
-# w -           The parent window that is to contain the row.
-# args -        The names of one or more bitmaps, which will be displayed
-#               in a new row across the bottom of w along with their
-#               names.
-
-def bitmapRow(w,*args)
-  TkFrame.new(w){|row|
-    pack('side'=>'top', 'fill'=>'both')
-    for bitmap in args
-      TkFrame.new(row){|base|
-        pack('side'=>'left', 'fill'=>'both', 'pady'=>'.25c', 'padx'=>'.25c')
-        TkLabel.new(base, 'text'=>bitmap, 'width'=>9).pack('side'=>'bottom')
-        Tk::Label.new(base, 'bitmap'=>bitmap).pack('side'=>'bottom')
-      }
-    end
-  }
-end
-
-# toplevel widget が存在すれば削除する
-if defined?($bitmap_demo) && $bitmap_demo
-  $bitmap_demo.destroy
-  $bitmap_demo = nil
-end
-
-# demo 用の toplevel widget を生成
-$bitmap_demo = TkToplevel.new {|w|
-  title("Bitmap Demonstration")
-  iconname("bitmap")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($bitmap_demo).pack(:fill=>:both, :expand=>true)
-
-# label 生成
-TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
-            'text'=>"このウィンドウには、Tk に組み込まれたすべてのビットマップが、それらの名前と共に表示されています。Tcl のスクリプト中では、それぞれの名前を用いて参照します。"){
-  pack('side'=>'top')
-}
-
-# frame 生成
-$bitmap_buttons = TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc{
-      tmppath = $bitmap_demo
-      $bitmap_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc{showCode 'bitmap'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$bitmap_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame 設定
-TkFrame.new(base_frame){|f|
-  bitmapRow(f,'error','gray25','gray50','hourglass')
-  bitmapRow(f,'info','question','questhead','warning')
-  pack('side'=>'top', 'expand'=>'yes', 'fill'=>'both')
-}
-
diff --git a/ext/tk/sample/demos-jp/browse1 b/ext/tk/sample/demos-jp/browse1
deleted file mode 100644
index 568892e4a8..0000000000
--- a/ext/tk/sample/demos-jp/browse1
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/env ruby
-
-# browse --
-# This script generates a directory browser, which lists the working
-# directory and allow you to open files or subdirectories by
-# double-clicking.
-
-require 'tk'
-
-# Create a scrollbar on the right side of the main window and a listbox
-# on the left side.
-
-listbox = TkListbox.new(nil, 'relief'=>'sunken',
-			'width'=>20, 'height'=>20, 'setgrid'=>'yes') {|l|
-  TkScrollbar.new(nil, 'command'=>proc{|*args| l.yview *args}) {|s|
-    pack('side'=>'right', 'fill'=>'y')
-    l.yscrollcommand(proc{|first,last| s.set(first,last)})
-  }
-
-  pack('side'=>'left', 'fill'=>'both', 'expand'=>'yes')
-}
-
-root = TkRoot.new
-root.minsize(1,1)
-
-# The procedure below is invoked to open a browser on a given file;  if the
-# file is a directory then another instance of this program is invoked; if
-# the file is a regular file then the Mx editor is invoked to display
-# the file.
-
-def browse (dir, file)
-  file = dir + File::Separator + file if dir != '.'
-  type = File.ftype(file)
-  if type == 'directory'
-    system($0 + ' ' + file + ' &')
-  else
-    if type == 'file'
-      if ENV['EDITOR']
-	system(ENV['EDITOR'] + ' ' + file + ' &')
-      else
-	system('xedit ' + file + ' &')
-      end
-    else
-      STDOUT.print "\"#{file}\" isn't a directory or regular file"
-    end
-  end
-end
-
-# Fill the listbox with a list of all the files in the directory (run
-# the "ls" command to get that information).
-
-dir = ARGV[0] ?  ARGV[0] : '.'
-open("|ls -a #{dir}", 'r'){|fid| fid.readlines}.each{|fname|
-  listbox.insert('end', fname.chomp)
-}
-
-# Set up bindings for the browser.
-
-Tk.bind_all('Control-c', proc{root.destroy})
-listbox.bind('Double-Button-1',
-	     proc{TkSelection.get.each{|f| browse dir, f}})
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-jp/browse2 b/ext/tk/sample/demos-jp/browse2
deleted file mode 100644
index 1a511c8d29..0000000000
--- a/ext/tk/sample/demos-jp/browse2
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/usr/bin/env ruby
-
-# browse --
-# This script generates a directory browser, which lists the working
-# directory and allow you to open files or subdirectories by
-# double-clicking.
-
-require 'tk'
-
-class Browse
-  BROWSE_WIN_COUNTER = TkVariable.new(0)
-
-  def initialize(dir)
-    BROWSE_WIN_COUNTER.value = BROWSE_WIN_COUNTER.to_i + 1
-
-    # create base frame
-    base = TkToplevel.new {
-      minsize(1,1)
-      title('Browse : ' + dir)
-    }
-
-    # Create a scrollbar on the right side of the main window and a listbox
-    # on the left side.
-    list = TkListbox.new(base, 'relief'=>'sunken',
-			 'width'=>20, 'height'=>20, 'setgrid'=>'yes') {|l|
-      TkScrollbar.new(base, 'command'=>proc{|*args| l.yview *args}) {|s|
-	pack('side'=>'right', 'fill'=>'y')
-	l.yscrollcommand(proc{|first,last| s.set(first,last)})
-      }
-
-      pack('side'=>'left', 'fill'=>'both', 'expand'=>'yes')
-
-      # Fill the listbox with a list of all the files in the directory (run
-      # the "ls" command to get that information).
-      open("|ls -a #{dir}", 'r'){|fid| fid.readlines}.each{|fname|
-	l.insert('end', fname.chomp)
-      }
-
-    }
-
-    # Set up bindings for the browser.
-    base.bind('Destroy', proc{
-		Browse::BROWSE_WIN_COUNTER.value = \
-		                Browse::BROWSE_WIN_COUNTER.to_i - 1
-	      })
-    base.bind('Control-c', proc{base.destroy})
-    list.bind('Double-Button-1',
-	 proc{TkSelection.get.each{|f| self.browse dir, f}})
-  end
-
-  # The method below is invoked to open a browser on a given file;  if the
-  # file is a directory then another instance of this program is invoked; if
-  # the file is a regular file then the Mx editor is invoked to display
-  # the file.
-  def browse (dir, file)
-    file = dir + File::Separator + file if dir != '.'
-    type = File.ftype(file)
-    if type == 'directory'
-      Browse.new(file)
-    else
-      if type == 'file'
-	if ENV['EDITOR']
-	  system(ENV['EDITOR'] + ' ' + file + ' &')
-	else
-	  system('xedit ' + file + ' &')
-	end
-      else
-	STDOUT.print "\"#{file}\" isn't a directory or regular file"
-      end
-    end
-  end
-
-end
-
-Browse.new(ARGV[0] ? ARGV[0] : '.')
-
-TkRoot.new {
-  withdraw
-  Browse::BROWSE_WIN_COUNTER.trace('w', proc{exit if Browse::BROWSE_WIN_COUNTER.to_i == 0})
-}
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-jp/button.rb b/ext/tk/sample/demos-jp/button.rb
deleted file mode 100644
index 204f5eab86..0000000000
--- a/ext/tk/sample/demos-jp/button.rb
+++ /dev/null
@@ -1,84 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# button widget demo (called by 'widget')
-#
-#
-
-# toplevel widget が存在すれば削除する
-if defined?($button_demo) && $button_demo
-  $button_demo.destroy
-  $button_demo = nil
-end
-
-# demo 用の toplevel widget を生成
-$button_demo = TkToplevel.new {|w|
-  title("Button Demonstration")
-  iconname("button")
-  positionWindow(w)
-}
-
-# label 生成
-msg = TkLabel.new($button_demo) {
-  font $kanji_font
-  wraplength '4i'
-  justify 'left'
-  text "ボタンをクリックすると、ボタンの背景色がそのボタンに書かれている色になります。ボタンからボタンへの移動はタブを押すことでも可能です。またスペースで実行することができます。"
-}
-msg.pack('side'=>'top')
-
-# frame 生成
-$button_buttons = Tk::Frame.new($button_demo) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc{
-      tmppath = $button_demo
-      $button_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc{showCode 'button'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# button 生成
-TkButton.new($button_demo){
-  text "Peach Puff"
-  width 10
-  command proc{
-    $button_demo.configure('bg','PeachPuff1')
-    $button_buttons.configure('bg','PeachPuff1')
-  }
-}.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2)
-
-TkButton.new($button_demo){
-  text "Light Blue"
-  width 10
-  command proc{
-    $button_demo.configure('bg','LightBlue1')
-    $button_buttons.configure('bg','LightBlue1')
-  }
-}.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2)
-
-TkButton.new($button_demo){
-  text "Sea Green"
-  width 10
-  command proc{
-    $button_demo.configure('bg','SeaGreen2')
-    $button_buttons.configure('bg','SeaGreen2')
-  }
-}.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2)
-
-TkButton.new($button_demo){
-  text "Yellow"
-  width 10
-  command proc{
-    $button_demo.configure('bg','Yellow1')
-    $button_buttons.configure('bg','Yellow1')
-  }
-}.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2)
diff --git a/ext/tk/sample/demos-jp/check.rb b/ext/tk/sample/demos-jp/check.rb
deleted file mode 100644
index 04a47c8101..0000000000
--- a/ext/tk/sample/demos-jp/check.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# checkbutton widget demo (called by 'widget')
-#
-
-# toplevel widget が存在すれば削除する
-if defined?($check_demo) && $check_demo
-  $check_demo.destroy
-  $check_demo = nil
-end
-
-# demo 用の toplevel widget を生成
-$check_demo = TkToplevel.new {|w|
-  title("Checkbutton Demonstration")
-  iconname("check")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($check_demo).pack(:fill=>:both, :expand=>true)
-
-# label 生成
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "下には 3 つのチェックボタンが表示されています。クリックするとボタンの選択状態が変わり、Tcl 変数 ( TkVariable オブジェクトでアクセスできます ) にそのボタンの状態を示す値を設定します。現在の変数の値を見るには「変数参照」ボタンをクリックしてください。"
-}
-msg.pack('side'=>'top')
-
-# 変数生成
-wipers = TkVariable.new(0)
-brakes = TkVariable.new(0)
-sober  = TkVariable.new(0)
-
-# frame 生成
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc{
-      tmppath = $check_demo
-      $check_demo = nil
-      $showVarsWin[tmppath.path] = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc{showCode 'check'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-
-  TkButton.new(frame) {
-    text '変数参照'
-    command proc{
-      showVars(base_frame,
-               ['wipers', wipers], ['brakes', brakes], ['sober', sober])
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-
-# checkbutton 生成
-[ TkCheckButton.new(base_frame, 'text'=>'ワイパー OK', 'variable'=>wipers),
-  TkCheckButton.new(base_frame, 'text'=>'ブレーキ OK', 'variable'=>brakes),
-  TkCheckButton.new(base_frame, 'text'=>'運転手 素面', 'variable'=>sober)
-].each{|w| w.relief('flat'); w.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w')}
-
diff --git a/ext/tk/sample/demos-jp/check2.rb b/ext/tk/sample/demos-jp/check2.rb
deleted file mode 100644
index 609f6830d8..0000000000
--- a/ext/tk/sample/demos-jp/check2.rb
+++ /dev/null
@@ -1,111 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# checkbutton widget demo2 (called by 'widget')
-#
-
-# toplevel widget が存在すれば削除する
-if defined?($check2_demo) && $check2_demo
-  $check2_demo.destroy
-  $check2_demo = nil
-end
-
-# demo 用の toplevel widget を生成
-$check2_demo = TkToplevel.new {|w|
-  title("Checkbutton Demonstration 2")
-  iconname("check2")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($check2_demo).pack(:fill=>:both, :expand=>true)
-
-# label 生成
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "下には４つのチェックボタンが表示されています。クリックするとボタンの選択状態が変わり、Tcl変数（TkVariableオブジェクトでアクセスできます）にそのボタンの状態を示す値を設定します。最初のボタンの状態は他の３つのボタンの状態にも依存して変化します。もし３つのボタンの一部だけにチェックが付けられている場合、最初のボタンはトライステート（３状態）モードでの表示を行います。現在の変数の値を見るには「変数参照」ボタンをクリックしてください。"
-}
-msg.pack('side'=>'top')
-
-# 変数生成
-safety = TkVariable.new(0)
-wipers = TkVariable.new(0)
-brakes = TkVariable.new(0)
-sober  = TkVariable.new(0)
-
-# frame 生成
-TkFrame.new(base_frame) {|frame|
-  TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2),
-         :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         TkButton.new(frame, :text=>'変数参照',
-                      :image=>$image['view'], :compound=>:left,
-                      :command=>proc{
-                        showVars($check2_demo,
-                                 ['safety', safety], ['wipers', wipers],
-                                 ['brakes', brakes], ['sober', sober])
-                      }),
-         TkButton.new(frame, :text=>'コード参照',
-                      :image=>$image['view'], :compound=>:left,
-                      :command=>proc{showCode 'check2'}),
-         TkButton.new(frame, :text=>'閉じる',
-                      :image=>$image['delete'], :compound=>:left,
-                      :command=>proc{
-                        tmppath = $check2_demo
-                        $check2_demo = nil
-                        $showVarsWin[tmppath.path] = nil
-                        tmppath.destroy
-                      }),
-         :padx=>4, :pady=>4)
-  frame.grid_columnconfigure(0, :weight=>1)
-}.pack('side'=>'bottom', 'fill'=>'x')
-
-
-# checkbutton 生成
-TkCheckButton.new(base_frame, :text=>'安全性検査', :variable=>safety,
-                  :relief=>:flat, :onvalue=>'all', :offvalue=>'none',
-                  :tristatevalue=>'partial'){
-  pack('side'=>'top', 'pady'=>2, 'anchor'=>'w')
-}
-
-[ TkCheckButton.new(base_frame, 'text'=>'ワイパー OK', 'variable'=>wipers),
-  TkCheckButton.new(base_frame, 'text'=>'ブレーキ OK', 'variable'=>brakes),
-  TkCheckButton.new(base_frame, 'text'=>'運転手 素面', 'variable'=>sober)
-].each{|w|
-  w.relief('flat')
-  w.pack('side'=>'top', 'padx'=>15, 'pady'=>2, 'anchor'=>'w')
-}
-
-# tristate check
-in_check = false
-tristate_check = proc{|n1,n2,op|
-  unless in_check
-    in_check = true
-    begin
-      if n1 == safety
-        if safety == 'none'
-          wipers.value = 0
-          brakes.value = 0
-          sober.value  = 0
-        elsif safety == 'all'
-          wipers.value = 1
-          brakes.value = 1
-          sober.value  = 1
-        end
-      else
-        if wipers == 1 && brakes == 1 && sober == 1
-          safety.value = 'all'
-        elsif wipers == 1 || brakes == 1 || sober == 1
-          safety.value = 'partial'
-        else
-          safety.value = 'none'
-        end
-      end
-    ensure
-      in_check = false
-    end
-  end
-}
-
-[wipers, brakes, sober, safety].each{|v| v.trace('w', tristate_check)}
diff --git a/ext/tk/sample/demos-jp/clrpick.rb b/ext/tk/sample/demos-jp/clrpick.rb
deleted file mode 100644
index 31a3f25b7c..0000000000
--- a/ext/tk/sample/demos-jp/clrpick.rb
+++ /dev/null
@@ -1,85 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# widget demo prompts the user to select a color (called by 'widget')
-#
-#  Note: don't support ttk_wrapper. work with standard widgets only.
-#
-
-# toplevel widget が存在すれば削除する
-if defined?($clrpick_demo) && $clrpick_demo
-  $clrpick_demo.destroy
-  $clrpick_demo = nil
-end
-
-# demo 用の toplevel widget を生成
-$clrpick_demo = TkToplevel.new {|w|
-  title("Color Selection Dialogs")
-  iconname("colors")
-  positionWindow(w)
-}
-
-# label 生成
-#TkLabel.new($clrpick_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
-Tk::Label.new($clrpick_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
-            'text'=>"以下のボタンを押して、このウィンドウ上にあるウィジェットの前景色と背景色を選択して下さい。").pack('side'=>'top')
-
-# frame 生成
-# TkFrame.new($clrpick_demo) {|frame|
-Tk::Frame.new($clrpick_demo) {|frame|
-  # TkButton.new(frame) {
-  Tk::Button.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc{
-      tmppath = $clrpick_demo
-      $clrpick_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  # TkButton.new(frame) {
-  Tk::Button.new(frame) {
-    text 'コード参照'
-    command proc{showCode 'clrpick'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# button 生成
-# TkButton.new($clrpick_demo, 'text'=>'背景色を設定 ...') {|b|
-Tk::Button.new($clrpick_demo, 'text'=>'背景色を設定 ...') {|b|
-  command(proc{setColor $clrpick_demo, b, 'background',
-              ['background', 'highlightbackground']})
-  pack('side'=>'top', 'anchor'=>'c', 'pady'=>'2m')
-}
-
-# TkButton.new($clrpick_demo, 'text'=>'前景色を設定 ...') {|b|
-Tk::Button.new($clrpick_demo, 'text'=>'前景色を設定 ...') {|b|
-  command(proc{setColor $clrpick_demo, b, 'foreground', ['foreground']})
-  pack('side'=>'top', 'anchor'=>'c', 'pady'=>'2m')
-}
-
-def setColor(w,button,name,options)
-  w.grab
-  initialColor = button[name]
-  color = Tk.chooseColor('title'=>"Choose a #{name} color", 'parent'=>w,
-                         'initialcolor'=>initialColor)
-  if color != ""
-    setColor_helper(w,options,color)
-  end
-
-  w.grab('release')
-end
-
-def setColor_helper(w, options, color)
-  options.each{|opt|
-    begin
-      w[opt] = color
-    rescue
-    end
-  }
-  TkWinfo.children(w).each{|child|
-    setColor_helper child, options, color
-  }
-end
-
diff --git a/ext/tk/sample/demos-jp/colors.rb b/ext/tk/sample/demos-jp/colors.rb
deleted file mode 100644
index c0145daaf6..0000000000
--- a/ext/tk/sample/demos-jp/colors.rb
+++ /dev/null
@@ -1,156 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# listbox widget demo 'colors' (called by 'widget')
-#
-
-# toplevel widget が存在すれば削除する
-if defined?($colors_demo) && $colors_demo
-  $colors_demo.destroy
-  $colors_demo = nil
-end
-
-# demo 用の toplevel widget を生成
-$colors_demo = TkToplevel.new {|w|
-  title("Listbox Demonstration (colors)")
-  iconname("colors")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($colors_demo).pack(:fill=>:both, :expand=>true)
-
-# label 生成
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "下には色の名前が入ったスクロールバー付のリストボックスが表示されています。リストをスクロールさせるのはスクロールバーでもできますし、リストボックスの中でマウスのボタン2(中ボタン)を押したままドラッグしてもできます。ある色をボタン1(左ボタン)でダブルクリックするとアプリケーション全体がその色になります。"
-}
-msg.pack('side'=>'top')
-
-# frame 生成
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc{
-      tmppath = $colors_demo
-      $colors_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc{showCode 'colors'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame 生成
-colors_lbox = nil
-TkFrame.new(base_frame, 'borderwidth'=>10) {|w|
-  s = TkScrollbar.new(w)
-  colors_lbox = TkListbox.new(w) {
-    setgrid 1
-    width  10
-    height 12
-    yscrollcommand proc{|first,last| s.set first,last}
-  }
-  s.command(proc{|*args| colors_lbox.yview(*args)})
-  s.pack('side'=>'right', 'fill'=>'y')
-  colors_lbox.pack('side'=>'left', 'expand'=>1, 'fill'=>'both')
-}.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'y')
-
-#colors_lbox.bind('Double-1', proc{TkPalette.setPalette TkSelection.get})
-colors_lbox.bind('Double-1', proc{
-                   begin
-                     TkPalette.setPalette TkSelection.get
-                   rescue => e
-                     p e
-                     Tk.tk_call_without_enc('destroy', '.___tk_set_palette')
-                   end
-                   })
-
-ins_data = [
-  'gray60','gray70','gray80','gray85','gray90','gray95',
-  'snow1','snow2','snow3','snow4','seashell1','seashell2',
-  'seashell3','seashell4','AntiqueWhite1','AntiqueWhite2',
-  'AntiqueWhite3','AntiqueWhite4','bisque1','bisque2',
-  'bisque3','bisque4','PeachPuff1','PeachPuff2',
-  'PeachPuff3','PeachPuff4','NavajoWhite1','NavajoWhite2',
-  'NavajoWhite3','NavajoWhite4','LemonChiffon1',
-  'LemonChiffon2','LemonChiffon3','LemonChiffon4',
-  'cornsilk1','cornsilk2','cornsilk3','cornsilk4',
-  'ivory1','ivory2','ivory3','ivory4','honeydew1',
-  'honeydew2','honeydew3','honeydew4','LavenderBlush1',
-  'LavenderBlush2','LavenderBlush3','LavenderBlush4',
-  'MistyRose1','MistyRose2','MistyRose3','MistyRose4',
-  'azure1','azure2','azure3','azure4','SlateBlue1',
-  'SlateBlue2','SlateBlue3','SlateBlue4','RoyalBlue1',
-  'RoyalBlue2','RoyalBlue3','RoyalBlue4','blue1','blue2',
-  'blue3','blue4','DodgerBlue1','DodgerBlue2',
-  'DodgerBlue3','DodgerBlue4','SteelBlue1','SteelBlue2',
-  'SteelBlue3','SteelBlue4','DeepSkyBlue1','DeepSkyBlue2',
-  'DeepSkyBlue3','DeepSkyBlue4','SkyBlue1','SkyBlue2',
-  'SkyBlue3','SkyBlue4','LightSkyBlue1','LightSkyBlue2',
-  'LightSkyBlue3','LightSkyBlue4','SlateGray1',
-  'SlateGray2','SlateGray3','SlateGray4',
-  'LightSteelBlue1','LightSteelBlue2','LightSteelBlue3',
-  'LightSteelBlue4','LightBlue1','LightBlue2',
-  'LightBlue3','LightBlue4','LightCyan1','LightCyan2',
-  'LightCyan3','LightCyan4','PaleTurquoise1',
-  'PaleTurquoise2','PaleTurquoise3','PaleTurquoise4',
-  'CadetBlue1','CadetBlue2','CadetBlue3','CadetBlue4',
-  'turquoise1','turquoise2','turquoise3','turquoise4',
-  'cyan1','cyan2','cyan3','cyan4','DarkSlateGray1',
-  'DarkSlateGray2','DarkSlateGray3','DarkSlateGray4',
-  'aquamarine1','aquamarine2','aquamarine3','aquamarine4',
-  'DarkSeaGreen1','DarkSeaGreen2','DarkSeaGreen3',
-  'DarkSeaGreen4','SeaGreen1','SeaGreen2','SeaGreen3',
-  'SeaGreen4','PaleGreen1','PaleGreen2','PaleGreen3',
-  'PaleGreen4','SpringGreen1','SpringGreen2',
-  'SpringGreen3','SpringGreen4','green1','green2',
-  'green3','green4','chartreuse1','chartreuse2',
-  'chartreuse3','chartreuse4','OliveDrab1','OliveDrab2',
-  'OliveDrab3','OliveDrab4','DarkOliveGreen1',
-  'DarkOliveGreen2','DarkOliveGreen3','DarkOliveGreen4',
-  'khaki1','khaki2','khaki3','khaki4','LightGoldenrod1',
-  'LightGoldenrod2','LightGoldenrod3','LightGoldenrod4',
-  'LightYellow1','LightYellow2','LightYellow3',
-  'LightYellow4','yellow1','yellow2','yellow3','yellow4',
-  'gold1','gold2','gold3','gold4','goldenrod1',
-  'goldenrod2','goldenrod3','goldenrod4','DarkGoldenrod1',
-  'DarkGoldenrod2','DarkGoldenrod3','DarkGoldenrod4',
-  'RosyBrown1','RosyBrown2','RosyBrown3','RosyBrown4',
-  'IndianRed1','IndianRed2','IndianRed3','IndianRed4',
-  'sienna1','sienna2','sienna3','sienna4','burlywood1',
-  'burlywood2','burlywood3','burlywood4','wheat1',
-  'wheat2','wheat3','wheat4','tan1','tan2','tan3','tan4',
-  'chocolate1','chocolate2','chocolate3','chocolate4',
-  'firebrick1','firebrick2','firebrick3','firebrick4',
-  'brown1','brown2','brown3','brown4','salmon1','salmon2',
-  'salmon3','salmon4','LightSalmon1','LightSalmon2',
-  'LightSalmon3','LightSalmon4','orange1','orange2',
-  'orange3','orange4','DarkOrange1','DarkOrange2',
-  'DarkOrange3','DarkOrange4','coral1','coral2','coral3',
-  'coral4','tomato1','tomato2','tomato3','tomato4',
-  'OrangeRed1','OrangeRed2','OrangeRed3','OrangeRed4',
-  'red1','red2','red3','red4','DeepPink1','DeepPink2',
-  'DeepPink3','DeepPink4','HotPink1','HotPink2',
-  'HotPink3','HotPink4','pink1','pink2','pink3','pink4',
-  'LightPink1','LightPink2','LightPink3','LightPink4',
-  'PaleVioletRed1','PaleVioletRed2','PaleVioletRed3',
-  'PaleVioletRed4','maroon1','maroon2','maroon3',
-  'maroon4','VioletRed1','VioletRed2','VioletRed3',
-  'VioletRed4','magenta1','magenta2','magenta3',
-  'magenta4','orchid1','orchid2','orchid3','orchid4',
-  'plum1','plum2','plum3','plum4','MediumOrchid1',
-  'MediumOrchid2','MediumOrchid3','MediumOrchid4',
-  'DarkOrchid1','DarkOrchid2','DarkOrchid3',
-  'DarkOrchid4','purple1','purple2','purple3','purple4',
-  'MediumPurple1','MediumPurple2','MediumPurple3',
-  'MediumPurple4','thistle1','thistle2','thistle3', 'thistle4'
-]
-
-colors_lbox.insert(0, *ins_data)
diff --git a/ext/tk/sample/demos-jp/combo.rb b/ext/tk/sample/demos-jp/combo.rb
deleted file mode 100644
index 0f3e808606..0000000000
--- a/ext/tk/sample/demos-jp/combo.rb
+++ /dev/null
@@ -1,99 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# combo.rb --
-#
-# This demonstration script creates several combobox widgets.
-#
-# based on "Id: combo.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($combo_demo) && $combo_demo
-  $combo_demo.destroy
-  $combo_demo = nil
-end
-
-$combo_demo = TkToplevel.new {|w|
-  title("Combobox Demonstration")
-  iconname("combo")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($combo_demo).pack(:fill=>:both, :expand=>true)
-
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'5i', :justify=>:left,
-               :text=><<EOL).pack(:side=>:top, :fill=>:x)
-以下では3種類のコンボボックスが表示されています．\
-最初のものは，エントリウィジェットと同じ様に，\
-ポイントしたり，クリックしたり，タイプしたりすることができます．\
-また，Returnキーを入力すれば現在の値がリストに追加され，\
-ドロップダウンリストから選択することができるようになります．\
-↓(下向き矢印)キーを押して表示されたリストから\
-矢印キーで他の候補を選んでReturnキーを押せば，値を選択できます．\
-2番目のコンボボックスは特定の値に固定されており，一切変更できません．\
-3番目のものはオーストラリアの都市のドロップダウンリストから\
-選択することだけが可能となっています．
-EOL
-
-## variables
-firstValue  = TkVariable.new
-secondValue = TkVariable.new
-ozCity      = TkVariable.new
-
-## See Code / Dismiss buttons
-Ttk::Frame.new(base_frame) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         Ttk::Button.new(frame, :text=>'変数参照',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{
-                           showVars(base_frame,
-                                    ['firstVariable', firstValue],
-                                    ['secondVariable', secondValue],
-                                    ['ozCity', ozCity])
-                         }),
-         Ttk::Button.new(frame, :text=>'コード参照',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{showCode 'combo'}),
-         Ttk::Button.new(frame, :text=>'閉じる',
-                         :image=>$image['delete'], :compound=>:left,
-                         :command=>proc{
-                           $combo_demo.destroy
-                           $combo_demo = nil
-                         }),
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x)
-}
-
-frame = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
-
-australianCities = [
-  'キャンベラ', 'シドニー', 'メルボルン', 'パース', 'アデレード',
-  'ブリスベーン', 'ホバート', 'ダーウィン', 'アリス スプリングス'
-]
-
-
-secondValue.value = '変更不可'
-ozCity.value = 'シドニー'
-
-Tk.pack(Ttk::Labelframe.new(frame, :text=>'Fully Editable'){|f|
-          Ttk::Combobox.new(f, :textvariable=>firstValue){|b|
-            b.bind('Return', '%W'){|w|
-              w.values <<= w.value unless w.values.include?(w.value)
-            }
-          }.pack(:pady=>5, :padx=>10)
-        },
-
-        Ttk::LabelFrame.new(frame, :text=>'Disabled'){|f|
-          Ttk::Combobox.new(f, :textvariable=>secondValue, :state=>:disabled) .
-            pack(:pady=>5, :padx=>10)
-        },
-
-        Ttk::LabelFrame.new(frame, :text=>'Defined List Only'){|f|
-          Ttk::Combobox.new(f, :textvariable=>ozCity, :state=>:readonly,
-                            :values=>australianCities) .
-            pack(:pady=>5, :padx=>10)
-        },
-
-        :side=>:top, :pady=>5, :padx=>10)
diff --git a/ext/tk/sample/demos-jp/cscroll.rb b/ext/tk/sample/demos-jp/cscroll.rb
deleted file mode 100644
index 6cce3d4369..0000000000
--- a/ext/tk/sample/demos-jp/cscroll.rb
+++ /dev/null
@@ -1,135 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# simple scrollable canvas widget demo (called by 'widget')
-#
-
-# toplevel widget が存在すれば削除する
-if defined?($cscroll_demo) && $cscroll_demo
-  $cscroll_demo.destroy
-  $cscroll_demo = nil
-end
-
-# demo 用の toplevel widget を生成
-$cscroll_demo = TkToplevel.new {|w|
-  title("Scrollable Canvas Demonstration")
-  iconname("cscroll")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($cscroll_demo).pack(:fill=>:both, :expand=>true)
-
-# label 生成
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'4i',
-            'justify'=>'left', 'text'=>"このウィンドウにはスクロールバーやマウスのボタン2 でスクロールできるキャンバス widget が表示されています。四角の上でボタン1 をクリックすると、そのインデックスが標準出力に出力されます。"){
-  pack('side'=>'top')
-}
-
-# frame 生成
-$cscroll_buttons = TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc{
-      tmppath = $cscroll_demo
-      $cscroll_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc{showCode 'cscroll'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$cscroll_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame 設定
-unless $tk_version =~ /^4\.[01]/
-  $cscroll_grid = TkFrame.new(base_frame) {
-    pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>1)
-  }
-  TkGrid.rowconfigure($cscroll_grid, 0, 'weight'=>1, 'minsize'=>0)
-  TkGrid.columnconfigure($cscroll_grid, 0, 'weight'=>1, 'minsize'=>0)
-end
-
-# canvas 設定
-$cscroll_canvas = TkCanvas.new(base_frame,
-                               'relief'=>'sunken', 'borderwidth'=>2,
-                               'scrollregion'=>['-11c', '-11c', '50c', '20c']
-                               ) {|c|
-  if $tk_version =~ /^4\.[01]/
-    pack('expand'=>'yes', 'fill'=>'both')
-  else
-    grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0,
-         'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-  end
-
-  TkScrollbar.new(base_frame, 'command'=>proc{|*args| c.yview(*args)}) {|vs|
-    c.yscrollcommand(proc{|first,last| vs.set first,last})
-    if $tk_version =~ /^4\.[01]/
-      pack('side'=>'right', 'fill'=>'y')
-    else
-      grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1,
-           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    end
-  }
-
-  TkScrollbar.new(base_frame, 'orient'=>'horiz',
-                  'command'=>proc{|*args| c.xview(*args)}) {|hs|
-    c.xscrollcommand(proc{|first,last| hs.set first,last})
-    if $tk_version =~ /^4\.[01]/
-      pack('side'=>'bottom', 'fill'=>'x')
-    else
-      grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0,
-           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    end
-  }
-}
-
-bg = $cscroll_canvas.configinfo('bg')[4]
-(0..19).each{|i|
-  x = -10+3*i
-  y = -10
-  (0..9).each{|j|
-    TkcRectangle.new($cscroll_canvas, "#{x}c", "#{y}c", "#{x+2}c", "#{y+2}c",
-                     'outline'=>'black', 'fill'=>bg, 'tags'=>'rect')
-    TkcText.new($cscroll_canvas, "#{x+1}c", "#{y+1}c",
-                'text'=>"#{i},#{j}", 'anchor'=>'center', 'tags'=>'text')
-    y += 3
-  }
-}
-
-$cscroll_canvas.itembind('all', 'Any-Enter', proc{scrollEnter $cscroll_canvas})
-$cscroll_canvas.itembind('all', 'Any-Leave', proc{scrollLeave $cscroll_canvas})
-$cscroll_canvas.itembind('all', '1', proc{scrollButton $cscroll_canvas})
-$cscroll_canvas.itembind('all', 'Any-Enter', proc{scrollEnter $cscroll_canvas})
-$cscroll_canvas.bind('2', proc{|x,y| $cscroll_canvas.scan_mark(x,y)}, '%x %y')
-$cscroll_canvas.bind('B2-Motion',
-                     proc{|x,y| $cscroll_canvas.scan_dragto(x,y)}, '%x %y')
-
-def scrollEnter(c)
-  id = c.find_withtag('current')[0].id
-  id -= 1 if c.gettags('current').include?('text')
-  $oldFill = c.itemconfiginfo(id, 'fill')[4]
-  if TkWinfo.depth(c) > 1
-    c.itemconfigure(id, 'fill'=>'SeaGreen1')
-  else
-    c.itemconfigure(id, 'fill'=>'black')
-    c.itemconfigure(id+1, 'fill'=>'white')
-  end
-end
-
-def scrollLeave(c)
-  id = c.find_withtag('current')[0].id
-  id -= 1 if c.gettags('current').include?('text')
-  c.itemconfigure(id, 'fill'=>$oldFill)
-  c.itemconfigure(id+1, 'fill'=>'black')
-end
-
-def scrollButton(c)
-  id = c.find_withtag('current')[0].id
-  id += 1 unless c.gettags('current').include?('text')
-  print "You buttoned at #{c.itemconfiginfo(id,'text')[4]}\n"
-end
-
diff --git a/ext/tk/sample/demos-jp/ctext.rb b/ext/tk/sample/demos-jp/ctext.rb
deleted file mode 100644
index 15ec84b421..0000000000
--- a/ext/tk/sample/demos-jp/ctext.rb
+++ /dev/null
@@ -1,205 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# Canvas Text widget demo (called by 'widget')
-#
-
-# toplevel widget が存在すれば削除する
-if defined?($ctext_demo) && $ctext_demo
-  $ctext_demo.destroy
-  $ctext_demo = nil
-end
-
-# demo 用の toplevel widget を生成
-$ctext_demo = TkToplevel.new {|w|
-  title("Canvas Text Demonstration")
-  iconname("Text")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($ctext_demo).pack(:fill=>:both, :expand=>true)
-
-# label 生成
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left',
-            'text'=>"このウィンドウにはキャンバスwidgetのテキスト機能をデモするためのテキスト文字列が表示されています。マウスを四角の中に持っていき、クリックすると位置ぎめ用の点からの相対位置を変えたり、行揃えを変えたりすることができます。また以下のような編集のための簡単なバインディングをサポートしています。
-
-  1. マウスを持っていき、クリックし、入力できます。
-  2. ボタン1で選択できます。
-  3. マウスの位置にボタン2で選択したテキストをコピーできます。
-  4.バックスペースをコントロール-Hで挿入カーソルの直前の文字を削除します。
-  5. Deleteキーは挿入カーソルの直後の文字を削除します。"){
-  pack('side'=>'top')
-}
-
-# frame 生成
-$ctext_buttons = TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc{
-      tmppath = $ctext_demo
-      $ctext_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc{showCode 'ctext'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$ctext_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# canvas 生成
-$ctext_canvas = TkCanvas.new(base_frame, 'relief'=>'flat',
-                             'borderwidth'=>0, 'width'=>500, 'height'=>350)
-$ctext_canvas.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'both')
-
-# font 設定
-if $tk_version =~ /^4.*/
-  textFont = '-*-Helvetica-Medium-R-Normal--*-240-*-*-*-*-*-*'
-else
-  textFont = 'Helvetica 24'
-end
-
-# canvas 設定
-TkcRectangle.new($ctext_canvas, 245, 195, 255, 205,
-                 'outline'=>'black', 'fill'=>'red')
-
-ctag_text_param = {
-  'text'=>"これはキャンバスwidgetのテキスト機能をデモするための文字列です。\n上で述べたような編集を可能とするためのバインディングを施しています。",
-  'width'=>440, 'anchor'=>'n', 'justify'=>'left'
-}
-if $tk_version =~ /^4.*/
-  ctag_text_param['font'] = '-*-Helvetica-Medium-R-Normal--*-240-*-*-*-*-*-*'
-  ctag_text_param['kanjifont'] = '-*-r-*--24-*-jisx0208.1983-0'
-else
-  ctag_text_param['font'] = 'Helvetica 24'
-end
-$ctag_text = TkcTag.new($ctext_canvas)
-$ctag_text.withtag(TkcText.new($ctext_canvas, 250, 200, ctag_text_param))
-
-$ctag_text.bind('1', proc{|x,y| textB1Press $ctext_canvas,x,y}, "%x %y")
-$ctag_text.bind('B1-Motion', proc{|x,y| textB1Move $ctext_canvas,x,y}, "%x %y")
-$ctag_text.bind('Shift-1',
-        proc{|x,y| $ctext_canvas.select_adjust 'current', "@#{x},#{y}"},
-        "%x %y")
-$ctag_text.bind('Shift-B1-Motion',
-                proc{|x,y| textB1Move $ctext_canvas,x,y}, "%x %y")
-$ctag_text.bind('KeyPress', proc{|a| textInsert $ctext_canvas,a}, "%A")
-$ctag_text.bind('Return', proc{textInsert $ctext_canvas,"\n"})
-$ctag_text.bind('Control-h', proc{textBs $ctext_canvas})
-$ctag_text.bind('BackSpace', proc{textBs $ctext_canvas})
-$ctag_text.bind('Delete', proc{textDel $ctext_canvas})
-$ctag_text.bind('2', proc{|x,y| textPaste $ctext_canvas, "@#{x},#{y}"},
-                "%x %y")
-
-# Next, create some items that allow the text's anchor position
-# to be edited.
-
-def mkTextConfig(w,x,y,option,value,color)
-  item = TkcRectangle.new(w, x, y, x+30, y+30,
-                          'outline'=>'black', 'fill'=>color, 'width'=>1)
-  item.bind('1', proc{$ctag_text.configure option, value})
-  w.addtag_withtag('config', item)
-end
-
-x = 50
-y = 50
-color = 'LightSkyBlue1'
-mkTextConfig $ctext_canvas, x, y, 'anchor', 'se', color
-mkTextConfig $ctext_canvas, x+30, y, 'anchor', 's', color
-mkTextConfig $ctext_canvas, x+60, y, 'anchor', 'sw', color
-mkTextConfig $ctext_canvas, x, y+30, 'anchor', 'e', color
-mkTextConfig $ctext_canvas, x+30, y+30, 'anchor', 'center', color
-mkTextConfig $ctext_canvas, x+60, y+30, 'anchor', 'w', color
-mkTextConfig $ctext_canvas, x, y+60, 'anchor', 'ne', color
-mkTextConfig $ctext_canvas, x+30, y+60, 'anchor', 'n', color
-mkTextConfig $ctext_canvas, x+60, y+60, 'anchor', 'nw', color
-item = TkcRectangle.new($ctext_canvas, x+40, y+40, x+50, y+50,
-                        'outline'=>'black', 'fill'=>'red')
-item.bind('1', proc{$ctag_text.configure 'anchor', 'center'})
-if $tk_version =~ /^4.*/
-  TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Text Position',
-              'font'=>'-*-times-medium-r-normal--*-240-*-*-*-*-*-*',
-              'anchor'=>'s', 'fill'=>'brown')
-else
-  TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Text Position',
-              'font'=>'Times 24', 'anchor'=>'s', 'fill'=>'brown')
-end
-
-# Lastly, create some items that allow the text's justification to be
-# changed.
-
-x = 350
-y = 50
-color = 'SeaGreen2'
-mkTextConfig $ctext_canvas, x, y, 'justify', 'left', color
-mkTextConfig $ctext_canvas, x+30, y, 'justify', 'center', color
-mkTextConfig $ctext_canvas, x+60, y, 'justify', 'right', color
-if $tk_version =~ /^4.*/
-  TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Justification',
-              'font'=>'-*-times-medium-r-normal--*-240-*-*-*-*-*-*',
-              'anchor'=>'s', 'fill'=>'brown')
-else
-  TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Justification',
-              'font'=>'Times 24', 'anchor'=>'s', 'fill'=>'brown')
-end
-
-$ctext_canvas.itembind('config', 'Enter', proc{textEnter $ctext_canvas})
-$ctext_canvas.itembind('config', 'Leave',
-                       proc{$ctext_canvas\
-                             .itemconfigure('current',
-                                            'fill'=>$textConfigFill)})
-
-$textConfigFill = ''
-
-def textEnter(w)
-  $textConfigFill = (w.itemconfiginfo 'current', 'fill')[4]
-  w.itemconfigure 'current', 'fill', 'black'
-end
-
-def textInsert(w, string)
-  return if string == ""
-  begin
-    $ctag_text.dchars 'sel.first', 'sel.last'
-  rescue
-  end
-  $ctag_text.insert 'insert', string
-end
-
-def textPaste(w, pos)
-  begin
-    $ctag_text.insert pos, TkSelection.get
-  rescue
-  end
-end
-
-def textB1Press(w,x,y)
-  w.icursor 'current', "@#{x},#{y}"
-  w.itemfocus 'current'
-  w.focus
-  w.select_from 'current', "@#{x},#{y}"
-end
-
-def textB1Move(w,x,y)
-  w.select_to 'current', "@#{x},#{y}"
-end
-
-def textBs(w)
-  begin
-    $ctag_text.dchars 'sel.first', 'sel.last'
-  rescue
-    char = $ctag_text.index('insert').to_i - 1
-    $ctag_text.dchars(char) if char >= 0
-  end
-end
-
-def textDel(w)
-  begin
-    $ctag_text.dchars 'sel.first', 'sel.last'
-  rescue
-    $ctag_text.dchars 'insert'
-  end
-end
-
diff --git a/ext/tk/sample/demos-jp/dialog1.rb b/ext/tk/sample/demos-jp/dialog1.rb
deleted file mode 100644
index 9d54f93b35..0000000000
--- a/ext/tk/sample/demos-jp/dialog1.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# a dialog box with a local grab (called by 'widget')
-#
-class TkDialog_Demo1 < TkDialog
-  ###############
-  private
-  ###############
-  def title
-    "Dialog with local grab"
-  end
-
-  def message
-    'モーダルダイアログボックスです。Tk の "grab" コマンドを使用してダイアログボックスで「ローカルグラブ」しています。下のいずれかのボタンを実行することによって、このダイアログに答えるまで、このグラブによってアプリケーションの他のウィンドウでは、ポインタ関係のイベントを受け取ることができなくなっています。'
-  end
-
-  def bitmap
-    'info'
-  end
-
-  def default_button
-    0
-  end
-
-  def buttons
-#    "了解 キャンセル コード参照"
-    ["了解", "キャンセル", "コード参照"]
-  end
-end
-
-ret =  TkDialog_Demo1.new('message_config'=>{'wraplength'=>'4i'}).value
-case ret
-when 0
-  print "あなたは「了解」を押しましたね。\n"
-when 1
-  print "あなたは「キャンセル」を押しましたね。\n"
-when 2
-  showCode 'dialog1'
-end
diff --git a/ext/tk/sample/demos-jp/dialog2.rb b/ext/tk/sample/demos-jp/dialog2.rb
deleted file mode 100644
index c8506b6cf8..0000000000
--- a/ext/tk/sample/demos-jp/dialog2.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# a dialog box with a global grab (called by 'widget')
-#
-class TkDialog_Demo2 < TkDialog
-  ###############
-  private
-  ###############
-  def title
-    "Dialog with global grab"
-  end
-
-  def message
-    'このダイアログボックスはグローバルグラブを使用しています。下のボタンを実行するまで、ディスプレイ上のいかなるものとも対話できません。グローバルグラブを使用することは、まず良い考えではありません。どうしても必要になるまで使おうと思わないで下さい。'
-  end
-
-  def bitmap
-    'info'
-  end
-
-  def default_button
-    0
-  end
-
-  def buttons
-#    "了解 キャンセル コード参照"
-    ["了解", "キャンセル", "コード参照"]
-  end
-end
-
-ret =  TkDialog_Demo2.new('message_config'=>{'wraplength'=>'4i'},
-                          'prev_command'=>proc{|dialog|
-                            Tk.after 100, proc{dialog.grab('global')}
-                          }).value
-case ret
-when 0
-  print "あなたは「了解」を押しましたね。\n"
-when 1
-  print "あなたは「キャンセル」を押しましたね。\n"
-when 2
-  showCode 'dialog2'
-end
-
diff --git a/ext/tk/sample/demos-jp/doc.org/README b/ext/tk/sample/demos-jp/doc.org/README
deleted file mode 100644
index 90677d3316..0000000000
--- a/ext/tk/sample/demos-jp/doc.org/README
+++ /dev/null
@@ -1,7 +0,0 @@
-This directory contains a collection of demonstration programs that
-are translated into Japanese.  You need to use a Japanized "wish" to
-see these Japanese-translated demonstration programs.  You also need
-to put this directory ("demos.jp") at the next to "demos" since some
-of the programs refer to the image files at "demos".
-
-Please refer to the README file at "demos" for more detail.
diff --git a/ext/tk/sample/demos-jp/doc.org/README.JP b/ext/tk/sample/demos-jp/doc.org/README.JP
deleted file mode 100644
index 42b4929378..0000000000
--- a/ext/tk/sample/demos-jp/doc.org/README.JP
+++ /dev/null
@@ -1,14 +0,0 @@
-This directory contains "widget" demo for the Japanized Tcl7.6/Tk4.2.
-Most of the messages in the original are translated to Japanese.
-But other tools in this directory are not translated.
-
-Following 2 kanji fonts are defined at the beginning of the file "widget."
-
-	-*--24-*-jisx0208.1983-0
-	-*--16-*-jisx0208.1983-0
-
-These fonts are all part of the core distribution of X11R5, so
-if you are running X11R5, you don't have to modify the file.
-
-But if you don't have these fonts, replace them with appropriate ones.
-"-*--14-*-jisx0208.1983-0" will be a good choice.
diff --git a/ext/tk/sample/demos-jp/doc.org/README.tk80 b/ext/tk/sample/demos-jp/doc.org/README.tk80
deleted file mode 100644
index c71f977d74..0000000000
--- a/ext/tk/sample/demos-jp/doc.org/README.tk80
+++ /dev/null
@@ -1,46 +0,0 @@
-This directory contains a collection of programs to demonstrate
-the features of the Tk toolkit.  The programs are all scripts for
-"wish", a windowing shell.  If wish has been installed in /usr/local
-then you can invoke any of the programs in this directory just
-by typing its file name to your command shell.  Otherwise invoke
-wish with the file as its first argument, e.g., "wish hello".
-The rest of this file contains a brief description of each program.
-Files with names ending in ".tcl" are procedure packages used by one
-or more of the demo programs;  they can't be used as programs by
-themselves so they aren't described below.
-
-hello -		Creates a single button;  if you click on it, a message
-		is typed and the application terminates.
-
-widget -	Contains a collection of demonstrations of the widgets
-		currently available in the Tk library.  Most of the .tcl
-		files are scripts for individual demos available through
-		the "widget" program.
-
-ixset -		A simple Tk-based wrapper for the "xset" program, which
-		allows you to interactively query and set various X options
-		such as mouse acceleration and bell volume.  Thanks to
-		Pierre David for contributing this example.
-
-rolodex -	A mock-up of a simple rolodex application.  It has much of
-		the user interface for such an application but no back-end
-		database.  This program was written in response to Tom
-		LaStrange's toolkit benchmark challenge.
-
-tcolor -	A color editor.  Allows you to edit colors in several
-		different ways, and will also perform automatic updates
-		using "send".
-
-rmt -		Allows you to "hook-up" remotely to any Tk application
-		on the display.  Select an application with the menu,
-		then just type commands:  they'll go to that application.
-
-timer -		Displays a seconds timer with start and stop buttons.
-		Control-c and control-q cause it to exit.
-
-browse -	A simple directory browser.  Invoke it with and argument
-		giving the name of the directory you'd like to browse.
-		Double-click on files or subdirectories to browse them.
-		Control-c and control-q cause the program to exit.
-
-sccs id = SCCS: @(#) README 1.3 96/02/16 10:49:14
diff --git a/ext/tk/sample/demos-jp/doc.org/license.terms b/ext/tk/sample/demos-jp/doc.org/license.terms
deleted file mode 100644
index c0a44d3fc2..0000000000
--- a/ext/tk/sample/demos-jp/doc.org/license.terms
+++ /dev/null
@@ -1,39 +0,0 @@
-This software is copyrighted by the Regents of the University of
-California, Sun Microsystems, Inc., and other parties.  The following
-terms apply to all files associated with the software unless explicitly
-disclaimed in individual files.
-
-The authors hereby grant permission to use, copy, modify, distribute,
-and license this software and its documentation for any purpose, provided
-that existing copyright notices are retained in all copies and that this
-notice is included verbatim in any distributions. No written agreement,
-license, or royalty fee is required for any of the authorized uses.
-Modifications to this software may be copyrighted by their authors
-and need not follow the licensing terms described here, provided that
-the new terms are clearly indicated on the first page of each file where
-they apply.
-
-IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
-FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
-DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
-IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
-NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
-MODIFICATIONS.
-
-GOVERNMENT USE: If you are acquiring this software on behalf of the
-U.S. government, the Government shall have only "Restricted Rights"
-in the software and related documentation as defined in the Federal
-Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
-are acquiring the software on behalf of the Department of Defense, the
-software shall be classified as "Commercial Computer Software" and the
-Government shall have only "Restricted Rights" as defined in Clause
-252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
-authors grant the U.S. Government and others acting in its behalf
-permission to use and distribute the software in accordance with the
-terms specified in this license.
diff --git a/ext/tk/sample/demos-jp/doc.org/license.terms.tk80 b/ext/tk/sample/demos-jp/doc.org/license.terms.tk80
deleted file mode 100644
index c0a44d3fc2..0000000000
--- a/ext/tk/sample/demos-jp/doc.org/license.terms.tk80
+++ /dev/null
@@ -1,39 +0,0 @@
-This software is copyrighted by the Regents of the University of
-California, Sun Microsystems, Inc., and other parties.  The following
-terms apply to all files associated with the software unless explicitly
-disclaimed in individual files.
-
-The authors hereby grant permission to use, copy, modify, distribute,
-and license this software and its documentation for any purpose, provided
-that existing copyright notices are retained in all copies and that this
-notice is included verbatim in any distributions. No written agreement,
-license, or royalty fee is required for any of the authorized uses.
-Modifications to this software may be copyrighted by their authors
-and need not follow the licensing terms described here, provided that
-the new terms are clearly indicated on the first page of each file where
-they apply.
-
-IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
-FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
-DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
-IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
-NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
-MODIFICATIONS.
-
-GOVERNMENT USE: If you are acquiring this software on behalf of the
-U.S. government, the Government shall have only "Restricted Rights"
-in the software and related documentation as defined in the Federal
-Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
-are acquiring the software on behalf of the Department of Defense, the
-software shall be classified as "Commercial Computer Software" and the
-Government shall have only "Restricted Rights" as defined in Clause
-252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
-authors grant the U.S. Government and others acting in its behalf
-permission to use and distribute the software in accordance with the
-terms specified in this license.
diff --git a/ext/tk/sample/demos-jp/entry1.rb b/ext/tk/sample/demos-jp/entry1.rb
deleted file mode 100644
index 0fbbeb8259..0000000000
--- a/ext/tk/sample/demos-jp/entry1.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# entry (no scrollbars) widget demo (called by 'widget')
-#
-
-# toplevel widget が存在すれば削除する
-if defined?($entry1_demo) && $entry1_demo
-  $entry1_demo.destroy
-  $entry1_demo = nil
-end
-
-# demo 用の toplevel widget を生成
-$entry1_demo = TkToplevel.new {|w|
-  title("Entry Demonstration (no scrollbars)")
-  iconname("entry1")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($entry1_demo).pack(:fill=>:both, :expand=>true)
-
-# label 生成
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '5i'
-  justify 'left'
-  text "3種類の異なるエントリが表示されています。文字を入力するにはポインタを持って行き、クリックしてからタイプしてください。標準的なMotifの編集機能が、Emacsのキーバインドとともに、サポートされています。例えば、バックスペースとコントロール-Hはカーソルの左の文字を削除し、デリートキーとコントロール-Dはカーソルの右側の文字を削除します。長過ぎてウィンドウに入り切らないものは、マウスのボタン2を押したままドラッグすることでスクロールさせることができます。日本語を入力するのはコントロール-バックスラッシュです。kinput2が動いていれば入力することができます。"
-}
-msg.pack('side'=>'top')
-
-# frame 生成
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc{
-      tmppath = $entry1_demo
-      $entry1_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc{showCode 'entry1'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# entry 生成
-e1 = TkEntry.new(base_frame, 'relief'=>'sunken')
-e2 = TkEntry.new(base_frame, 'relief'=>'sunken')
-e3 = TkEntry.new(base_frame, 'relief'=>'sunken')
-[e1,e2,e3].each{|w| w.pack('side'=>'top', 'padx'=>10, 'pady'=>5, 'fill'=>'x')}
-
-# 初期値挿入
-e1.insert(0, '初期値')
-e2.insert('end', "このエントリには長い文字列が入っていて、")
-e2.insert('end', "長すぎてウィンドウには入り切らないので、")
-e2.insert('end', "実際の所終りまで見るにはスクロールさせなければ")
-e2.insert('end', "ならないでしょう。")
-
diff --git a/ext/tk/sample/demos-jp/entry2.rb b/ext/tk/sample/demos-jp/entry2.rb
deleted file mode 100644
index 294c82490f..0000000000
--- a/ext/tk/sample/demos-jp/entry2.rb
+++ /dev/null
@@ -1,92 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# entry (with scrollbars) widget demo (called by 'widget')
-#
-
-# toplevel widget が存在すれば削除する
-if defined?($entry2_demo) && $entry2_demo
-  $entry2_demo.destroy
-  $entry2_demo = nil
-end
-
-# demo 用の toplevel widget を生成
-$entry2_demo = TkToplevel.new {|w|
-  title("Entry Demonstration (with scrollbars)")
-  iconname("entry2")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($entry2_demo).pack(:fill=>:both, :expand=>true)
-
-# label 生成
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '5i'
-  justify 'left'
-  text "3種類の異なるエントリが各々スクロールバー付で表示されています。文字を入力するにはポインタを持って行き、クリックしてからタイプしてください。標準的なMotifの編集機能が、Emacsのキーバインドとともに、サポートされています。例えば、バックスペースとコントロール-Hはカーソルの左の文字を削除し、デリートキーとコントロール-Dはカーソルの右側の文字を削除します。長過ぎてウィンドウに入り切らないものは、マウスのボタン2を押したままドラッグすることでスクロールさせることができます。日本語を入力するのはコントロール-バックスラッシュです。kinput2が動いていれば入力することができます。"
-}
-msg.pack('side'=>'top')
-
-# frame 生成
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc{
-      tmppath = $entry2_demo
-      $entry2_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc{showCode 'entry2'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame 生成
-TkFrame.new(base_frame, 'borderwidth'=>10) {|w|
-  # entry 1
-  s1 = TkScrollbar.new(w, 'relief'=>'sunken', 'orient'=>'horiz')
-  e1 = TkEntry.new(w, 'relief'=>'sunken') {
-    xscrollcommand proc{|first,last| s1.set first,last}
-  }
-  s1.command(proc{|*args| e1.xview(*args)})
-  e1.pack('side'=>'top', 'fill'=>'x')
-  s1.pack('side'=>'top', 'fill'=>'x')
-
-  # spacer
-  TkFrame.new(w, 'width'=>20, 'height'=>10).pack('side'=>'top', 'fill'=>'x')
-
-  # entry 2
-  s2 = TkScrollbar.new(w, 'relief'=>'sunken', 'orient'=>'horiz')
-  e2 = TkEntry.new(w, 'relief'=>'sunken') {
-    xscrollcommand proc{|first,last| s2.set first,last}
-  }
-  s2.command(proc{|*args| e2.xview(*args)})
-  e2.pack('side'=>'top', 'fill'=>'x')
-  s2.pack('side'=>'top', 'fill'=>'x')
-
-  # spacer
-  TkFrame.new(w, 'width'=>20, 'height'=>10).pack('side'=>'top', 'fill'=>'x')
-
-  # entry 3
-  s3 = TkScrollbar.new(w, 'relief'=>'sunken', 'orient'=>'horiz')
-  e3 = TkEntry.new(w, 'relief'=>'sunken') {
-    xscrollcommand proc{|first,last| s3.set first,last}
-  }
-  s3.command(proc{|*args| e3.xview(*args)})
-  e3.pack('side'=>'top', 'fill'=>'x')
-  s3.pack('side'=>'top', 'fill'=>'x')
-
-  # 初期値挿入
-  e1.insert(0, '初期値')
-  e2.insert('end', "このエントリには長い文字列が入っていて、")
-  e2.insert('end', "長すぎてウィンドウには入り切らないので、")
-  e2.insert('end', "実際の所終りまで見るにはスクロールさせなければ")
-  e2.insert('end', "ならないでしょう。")
-
-}.pack('side'=>'top', 'fill'=>'x', 'expand'=>'yes')
-
diff --git a/ext/tk/sample/demos-jp/entry3.rb b/ext/tk/sample/demos-jp/entry3.rb
deleted file mode 100644
index 6f8ba943e9..0000000000
--- a/ext/tk/sample/demos-jp/entry3.rb
+++ /dev/null
@@ -1,226 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-# entry3.rb --
-#
-# This demonstration script creates several entry widgets whose
-# permitted input is constrained in some way.  It also shows off a
-# password entry.
-#
-# based on Tcl/Tk8.4.4 widget demos
-
-if defined?($entry3_demo) && $entry3_demo
-  $entry3_demo.destroy
-  $entry3_demo = nil
-end
-
-$entry3_demo = TkToplevel.new {|w|
-  title("Constrained Entry Demonstration")
-  iconname("entry3")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($entry3_demo).pack(:fill=>:both, :expand=>true)
-
-TkLabel.new(base_frame,
-            :font=>$font, :wraplength=>'5i', :justify=>:left,
-            :text=><<EOL).pack(:side=>:top)
-以下には４種類のエントリボックスが表示されています．各エントリボックスは，\
-マウスクリックで選択し文字を打ち込むことが可能ですが，それぞれがどのような\
-入力を受け付けることができるかには制約が設けられています．\
-一つめのエントリボックスは整数と見なされる文字列か入力文字がない空の状態か\
-の場合だけを受け付け，問題がある場合はエントリボックスが点滅します\
-（フォーカスが去る時にチェックされます）．\
-二つめのエントリボックスは，入力された文字列の長さが\
-１０文字未満の場合だけを受け付け，制限を越えて書き込もうとしたときには\
-ベルを鳴らして知らせます．\
-三つめは米国の電話番号を受け付けるエントリボックスです．\
-アルファベットは，電話機のダイヤル上で対応づけられている数字に変換されます．\
-不適切な文字が入力されたり数字以外の文字の位置に数字を入力しようとしたり\
-した場合には警告のベルが鳴ります．\
-四つめのエントリボックスは，８文字までの入力を受け付ける\
-パスワードフィールドです（８文字以上は特に警告を出すことなく無視されます）．\
-入力された文字はアスタリスク記号に置き換えて表示されます．
-EOL
-
-TkFrame.new(base_frame){|f|
-  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
-
-  TkButton.new(f, :text=>'閉じる', :width=>15, :command=>proc{
-                 $entry3_demo.destroy
-                 $entry3_demo = nil
-               }).pack(:side=>:left, :expand=>true)
-
-  TkButton.new(f, :text=>'コード参照', :width=>15, :command=>proc{
-                 showCode 'entry3'
-               }).pack(:side=>:left, :expand=>true)
-}
-
-# focusAndFlash --
-# Error handler for entry widgets that forces the focus onto the
-# widget and makes the widget flash by exchanging the foreground and
-# background colours at intervals of 200ms (i.e. at approximately
-# 2.5Hz).
-#
-# Arguments:
-# widget -      entry widget to flash
-# fg -          Initial foreground colour
-# bg -          Initial background colour
-# count -       Counter to control the number of times flashed
-def focusAndFlash(widget, fg, bg, count=5)
-  return if count <= 0
-  if fg && !fg.empty? && bg && !bg.empty?
-    TkTimer.new(200, count,
-                proc{widget.configure(:foreground=>bg, :background=>fg)},
-                proc{widget.configure(:foreground=>fg, :background=>bg)}
-                ).start
-  else
-    # TkTimer.new(150, 3){Tk.bell}.start
-    Tk.bell
-    TkTimer.new(200, count,
-                proc{widget.configure(:foreground=>'white',
-                                      :background=>'black')},
-                proc{widget.configure(:foreground=>'black',
-                                      :background=>'white')}
-                ).at_end{begin
-                           widget.configure(:foreground=>fg,
-                                            :background=>bg)
-                         rescue
-                           # ignore
-                         end}.start
-  end
-  widget.focus(true)
-end
-
-l1 = TkLabelFrame.new(base_frame, :text=>"整数エントリ")
-TkEntry.new(l1, :validate=>:focus,
-            :vcmd=>[
-              proc{|s| s == '' || /^[+-]?\d+$/ =~ s }, '%P'
-            ]) {|e|
-  fg = e.foreground
-  bg = e.background
-  invalidcommand [proc{|w| focusAndFlash(w, fg, bg)}, '%W']
-  pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
-}
-
-l2 = TkLabelFrame.new(base_frame, :text=>"長さ制約付きエントリ")
-TkEntry.new(l2, :validate=>:key, :invcmd=>proc{Tk.bell},
-            :vcmd=>[proc{|s| s.length < 10}, '%P']
-            ).pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
-
-### PHONE NUMBER ENTRY ###
-# Note that the source to this is quite a bit longer as the behaviour
-# demonstrated is a lot more ambitious than with the others.
-
-# Initial content for the third entry widget
-entry3content = TkVariable.new("1-(000)-000-0000")
-
-# Mapping from alphabetic characters to numbers.
-$phoneNumberMap = {}
-Hash[*(%w(abc 2 def 3 ghi 4 jkl 5 mno 6 pqrs 7 tuv 8 wxyz 9))].each{|chars, n|
-  chars.split('').each{|c|
-    $phoneNumberMap[c] = n
-    $phoneNumberMap[c.upcase] = n
-  }
-}
-
-# phoneSkipLeft --
-# Skip over fixed characters in a phone-number string when moving left.
-#
-# Arguments:
-# widget -      The entry widget containing the phone-number.
-def phoneSkipLeft(widget)
-  idx = widget.index('insert')
-  if idx == 8
-    # Skip back two extra characters
-    widget.cursor = idx - 2
-  elsif idx == 7 || idx == 12
-    # Skip back one extra character
-    widget.cursor = idx - 1
-  elsif idx <= 3
-    # Can't move any further
-    Tk.bell
-    Tk.callback_break
-  end
-end
-
-# phoneSkipRight --
-# Skip over fixed characters in a phone-number string when moving right.
-#
-# Arguments:
-# widget -      The entry widget containing the phone-number.
-# add - Offset to add to index before calculation (used by validation.)
-def phoneSkipRight(widget, add = 0)
-  idx = widget.index('insert')
-  if (idx + add == 5)
-    # Skip forward two extra characters
-    widget.cursor = idx + 2
-  elsif (idx + add == 6 || idx + add == 10)
-    # Skip forward one extra character
-    widget.cursor = idx + 1
-  elsif (idx + add == 15 && add == 0)
-    # Can't move any further
-    Tk.bell
-    Tk.callback_break
-  end
-end
-
-# validatePhoneChange --
-# Checks that the replacement (mapped to a digit) of the given
-# character in an entry widget at the given position will leave a
-# valid phone number in the widget.
-#
-# widget - entry widget to validate
-# vmode -  The widget's validation mode
-# idx -    The index where replacement is to occur
-# char -   The character (or string, though that will always be
-#          refused) to be overwritten at that point.
-
-def validatePhoneChange(widget, vmode, idx, char)
-  return true if idx == nil
-  Tk.after_idle(proc{widget.configure(:validate=>vmode,
-                                      :invcmd=>proc{Tk.bell})})
-  if !(idx<3 || idx==6 || idx==7 || idx==11 || idx>15) && char =~ /[0-9A-Za-z]/
-    widget.delete(idx)
-    widget.insert(idx, $phoneNumberMap[char] || char)
-    Tk.after_idle(proc{phoneSkipRight(widget, -1)})
-    # Tk.update(true)  # <- Don't work 'update' inter validation callback.
-                       #    It depends on Tcl/Tk side (tested on Tcl/Tk8.5a1).
-    return true
-  end
-  return false
-end
-
-
-l3 = TkLabelFrame.new(base_frame, :text=>"米国電話番号エントリ")
-TkEntry.new(l3, :validate=>:key, :invcmd=>proc{Tk.bell},
-            :textvariable=>entry3content,
-            :vcmd=>[
-              proc{|w,v,i,s| validatePhoneChange(w,v,i,s)},
-              "%W %v %i %S"
-            ]){|e|
-  # Click to focus goes to the first editable character...
-  bind('FocusIn', proc{|d,w|
-         if d != "NotifyAncestor"
-           w.cursor = 3
-           Tk.after_idle(proc{w.selection_clear})
-         end
-       }, '%d %W')
-  bind('Left',  proc{|w| phoneSkipLeft(w)},  '%W')
-  bind('Right', proc{|w| phoneSkipRight(w)}, '%W')
-  pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
-}
-
-l4 = TkLabelFrame.new(base_frame, :text=>"パスワードエントリ")
-TkEntry.new(l4, :validate=>:key, :show=>'*',
-            :vcmd=>[
-              proc{|s| s.length <= 8},
-              '%P'
-            ]).pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
-
-TkFrame.new(base_frame){|f|
-  lower
-  TkGrid.configure(l1, l2, :in=>f, :padx=>'3m', :pady=>'1m', :sticky=>:ew)
-  TkGrid.configure(l3, l4, :in=>f, :padx=>'3m', :pady=>'1m', :sticky=>:ew)
-  TkGrid.columnconfigure(f, [0,1], :uniform=>1)
-  pack(:fill=>:both, :expand=>true)
-}
diff --git a/ext/tk/sample/demos-jp/filebox.rb b/ext/tk/sample/demos-jp/filebox.rb
deleted file mode 100644
index 800dd5ddbf..0000000000
--- a/ext/tk/sample/demos-jp/filebox.rb
+++ /dev/null
@@ -1,103 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# widget demo prompts the user to select a file (called by 'widget')
-#
-
-# toplevel widget が存在すれば削除する
-if defined?($filebox_demo) && $entry2_demo
-  $filebox_demo.destroy
-  $filebox_demo = nil
-end
-
-# demo 用の toplevel widget を生成
-$filebox_demo = TkToplevel.new {|w|
-  title("File Selection Dialogs")
-  iconname("filebox")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($filebox_demo).pack(:fill=>:both, :expand=>true)
-
-# label 生成
-TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
-            'text'=>"エントリにファイル名を直接入力するか、\"Browse\" ボタンを押してファイル選択ダイアログからファイル名を選んで下さい。").pack('side'=>'top')
-
-# frame 生成
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc{
-      tmppath = $filebox_demo
-      $filebox_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc{showCode 'filebox'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame 生成
-['開く', '保存'].each{|type|
-  TkFrame.new(base_frame) {|f|
-    TkLabel.new(f, 'text'=>"ファイルを#{type}: ", 'anchor'=>'e')\
-    .pack('side'=>'left')
-
-    TkEntry.new(f, 'width'=>20) {|e|
-      pack('side'=>'left', 'expand'=>'yes', 'fill'=>'x')
-
-      TkButton.new(f, 'text'=>'Browse ...',
-                   'command'=>proc{fileDialog base_frame,e,type})\
-      .pack('side'=>'left')
-    }
-
-    pack('fill'=>'x', 'padx'=>'1c', 'pady'=>3)
-  }
-}
-
-$tk_strictMotif = TkVarAccess.new('tk_strictMotif')
-if ($tk_platform['platform'] == 'unix')
-  TkCheckButton.new(base_frame,
-                    'text'=>'Motifスタイルのダイアログを用いる',
-                    'variable'=>$tk_strictMotif,
-                    'onvalue'=>1, 'offvalue'=>0 ).pack('anchor'=>'c')
-end
-
-def fileDialog(w,ent,operation)
-  #    Type names         Extension(s)             Mac File Type(s)
-  #
-  #--------------------------------------------------------
-  types = [
-    ['Text files',       ['.txt','.doc']          ],
-    ['Text files',       [],                      'TEXT' ],
-    ['Ruby Scripts',     ['.rb'],                 'TEXT' ],
-    ['Tcl Scripts',      ['.tcl'],                'TEXT' ],
-    ['C Source Files',   ['.c','.h']              ],
-    ['All Source Files', ['.rb','.tcl','.c','.h'] ],
-    ['Image Files',      ['.gif']                 ],
-    ['Image Files',      ['.jpeg','.jpg']         ],
-    ['Image Files',      [],                      ['GIFF','JPEG']],
-    ['All files',        '*'                      ]
-  ]
-
-  if operation == '開く'
-    file = Tk.getOpenFile('filetypes'=>types, 'parent'=>w)
-  else
-    file = Tk.getSaveFile('filetypes'=>types, 'parent'=>w,
-                          'initialfile'=>'Untitled',
-                          'defaultextension'=>'.txt')
-  end
-  if file != ""
-    ent.delete 0, 'end'
-    ent.insert 0, file
-    # ent.xview 'end'
-    Tk.update_idletasks # need this for Tk::Tile::Entry
-                        # (to find right position of 'xview').
-    ent.xview(ent.index('end'))
-  end
-end
-
diff --git a/ext/tk/sample/demos-jp/floor.rb b/ext/tk/sample/demos-jp/floor.rb
deleted file mode 100644
index 8a079035c9..0000000000
--- a/ext/tk/sample/demos-jp/floor.rb
+++ /dev/null
@@ -1,1722 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# floorDisplay widget demo (called by 'widget')
-#
-
-# floorDisplay --
-# Recreate the floorplan display in the canvas given by "w".  The
-# floor given by "active" is displayed on top with its office structure
-# visible.
-#
-# Arguments:
-# w -           Name of the canvas window.
-# active -      Number of active floor (1, 2, or 3).
-
-def floorDisplay(w,active)
-  return if $activeFloor == active
-
-  w.delete('all')
-  $activeFloor = active
-
-  # First go through the three floors, displaying the backgrounds for
-  # each floor.
-
-  floor_bg1(w,$floor_colors['bg1'],$floor_colors['outline1'])
-  floor_bg2(w,$floor_colors['bg2'],$floor_colors['outline2'])
-  floor_bg3(w,$floor_colors['bg3'],$floor_colors['outline3'])
-
-  # Raise the background for the active floor so that it's on top.
-
-  w.raise("floor#{active}")
-
-  # Create a dummy item just to mark this point in the display list,
-  # so we can insert highlights here.
-
-  TkcRectangle.new(w,0,100,1,101, 'fill'=>'', 'outline'=>'', 'tags'=>'marker')
-
-  # Add the walls and labels for the active floor, along with
-  # transparent polygons that define the rooms on the floor.
-  # Make sure that the room polygons are on top.
-
-  $floorLabels.clear
-  $floorItems.clear
-  send("floor_fg#{active}", w, $floor_colors['offices'])
-  w.raise('room')
-
-  # Offset the floors diagonally from each other.
-
-  w.move('floor1', '2c', '2c')
-  w.move('floor2', '1c', '1c')
-
-  # Create items for the room entry and its label.
-  TkcWindow.new(w, 600, 100, 'anchor'=>'w', 'window'=>$floor_entry)
-  TkcText.new(w, 600, 100, 'anchor'=>'e', 'text'=>"部屋番号: ")
-  w['scrollregion'] = w.bbox('all')
-end
-
-# newRoom --
-# This method is invoked whenever the mouse enters a room
-# in the floorplan.  It changes tags so that the current room is
-# highlighted.
-#
-# Arguments:
-# w  -          The name of the canvas window.
-
-def newRoom(w)
-  id = w.find_withtag('current')[0]
-  $currentRoom.value = $floorLabels[id.id] if id != ""
-  Tk.update(true)
-end
-
-# roomChanged --
-# This method is invoked whenever the currentRoom variable changes.
-# It highlights the current room and unhighlights any previous room.
-#
-# Arguments:
-# w -           The canvas window displaying the floorplan.
-# args -        Not used.
-
-def roomChanged(w,*args)
-  w.delete('highlight')
-  item = $floorItems[$currentRoom.value]
-  return if item == nil
-  new = TkcPolygon.new(w, *(w.coords(item)))
-  new.configure('fill'=>$floor_colors['active'], 'tags'=>'highlight')
-  w.raise(new, 'marker')
-end
-
-# floor_bg1 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the background information for the first
-# floor.
-#
-# Arguments:
-# w -           The canvas window.
-# fill -        Fill color to use for the floor's background.
-# outline -     Color to use for the floor's outline.
-
-def floor_bg1(w,fill,outline)
-  TkcPolygon.new(w,347,80,349,82,351,84,353,85,363,92,375,99,386,104,
-                 386,129,398,129,398,162,484,162,484,129,559,129,559,133,725,
-                 133,725,129,802,129,802,389,644,389,644,391,559,391,559,327,
-                 508,327,508,311,484,311,484,278,395,278,395,288,400,288,404,
-                 288,409,290,413,292,418,297,421,302,422,309,421,318,417,325,
-                 411,330,405,332,397,333,344,333,340,334,336,336,335,338,332,
-                 342,331,347,332,351,334,354,336,357,341,359,340,360,335,363,
-                 331,365,326,366,304,366,304,355,258,355,258,387,60,387,60,391,
-                 0,391,0,337,3,337,3,114,8,114,8,25,30,25,30,5,93,5,98,5,104,7,
-                 110,10,116,16,119,20,122,28,123,32,123,68,220,68,220,34,221,
-                 22,223,17,227,13,231,8,236,4,242,2,246,0,260,0,283,1,300,5,
-                 321,14,335,22,348,25,365,29,363,39,358,48,352,56,337,70,
-                 344,76,347,80, 'tags'=>['floor1','bg'], 'fill'=>fill)
-  TkcLine.new(w,386,129,398,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,258,355,258,387, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,60,387,60,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,0,337,0,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,60,391,0,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,3,114,3,337, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,258,387,60,387, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,484,162,398,162, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,398,162,398,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,484,278,484,311, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,484,311,508,311, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,508,327,508,311, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,559,327,508,327, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,644,391,559,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,644,389,644,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,559,129,484,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,484,162,484,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,725,133,559,133, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,559,129,559,133, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,725,129,802,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,802,389,802,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,3,337,0,337, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,559,391,559,327, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,802,389,644,389, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,725,133,725,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,8,25,8,114, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,8,114,3,114, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,30,25,8,25, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,484,278,395,278, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,30,25,30,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,93,5,30,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,98,5,93,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,104,7,98,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,110,10,104,7, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,116,16,110,10, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,119,20,116,16, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,122,28,119,20, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,123,32,122,28, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,123,68,123,32, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,220,68,123,68, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,386,129,386,104, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,386,104,375,99, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,375,99,363,92, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,353,85,363,92, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,220,68,220,34, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,337,70,352,56, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,352,56,358,48, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,358,48,363,39, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,363,39,365,29, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,365,29,348,25, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,348,25,335,22, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,335,22,321,14, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,321,14,300,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,300,5,283,1, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,283,1,260,0, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,260,0,246,0, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,246,0,242,2, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,242,2,236,4, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,236,4,231,8, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,231,8,227,13, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,223,17,227,13, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,221,22,223,17, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,220,34,221,22, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,340,360,335,363, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,335,363,331,365, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,331,365,326,366, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,326,366,304,366, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,304,355,304,366, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,395,288,400,288, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,404,288,400,288, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,409,290,404,288, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,413,292,409,290, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,418,297,413,292, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,421,302,418,297, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,422,309,421,302, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,421,318,422,309, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,421,318,417,325, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,417,325,411,330, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,411,330,405,332, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,405,332,397,333, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,397,333,344,333, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,344,333,340,334, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,340,334,336,336, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,336,336,335,338, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,335,338,332,342, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,331,347,332,342, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,332,351,331,347, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,334,354,332,351, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,336,357,334,354, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,341,359,336,357, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,341,359,340,360, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,395,288,395,278, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,304,355,258,355, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,347,80,344,76, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,344,76,337,70, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,349,82,347,80, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,351,84,349,82, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  TkcLine.new(w,353,85,351,84, 'fill'=>outline, 'tags'=>['floor1','bg'])
-end
-
-# floor_bg2 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the background information for the first
-# floor.
-#
-# Arguments:
-# w -           The canvas window.
-# fill -        Fill color to use for the floor's background.
-# outline -     Color to use for the floor's outline.
-
-def floor_bg2(w,fill,outline)
-  TkcPolygon.new(w,559,129,484,129,484,162,398,162,398,129,315,129,
-                 315,133,176,133,176,129,96,129,96,133,3,133,3,339,0,339,0,391,
-                 60,391,60,387,258,387,258,329,350,329,350,311,395,311,395,280,
-                 484,280,484,311,508,311,508,327,558,327,558,391,644,391,644,
-                 367,802,367,802,129,725,129,725,133,559,133,559,129,
-                 'tags'=>['floor2','bg'], 'fill'=>fill)
-  TkcLine.new(w,350,311,350,329, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,398,129,398,162, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,802,367,802,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,802,129,725,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,725,133,725,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,559,129,559,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,559,133,725,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,484,162,484,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,559,129,484,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,802,367,644,367, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,644,367,644,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,644,391,558,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,558,327,558,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,558,327,508,327, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,508,327,508,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,484,311,508,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,484,280,484,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,398,162,484,162, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,484,280,395,280, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,395,280,395,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,258,387,60,387, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,3,133,3,339, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,3,339,0,339, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,60,391,0,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,0,339,0,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,60,387,60,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,258,329,258,387, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,350,329,258,329, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,395,311,350,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,398,129,315,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,176,133,315,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,176,129,96,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,3,133,96,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,315,133,315,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,176,133,176,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  TkcLine.new(w,96,133,96,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-end
-
-# floor_bg3 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the background information for the first
-# floor.
-#
-# Arguments:
-# w -           The canvas window.
-# fill -        Fill color to use for the floor's background.
-# outline -     Color to use for the floor's outline.
-
-def floor_bg3(w,fill,outline)
-  TkcPolygon.new(w,159,300,107,300,107,248,159,248,159,129,96,129,96,
-                 133,21,133,21,331,0,331,0,391,60,391,60,370,159,370,159,300,
-                 'tags'=>['floor3','bg'], 'fill'=>fill)
-  TkcPolygon.new(w,258,370,258,329,350,329,350,311,399,311,399,129,
-                 315,129,315,133,176,133,176,129,159,129,159,370,258,370,
-                 'tags'=>['floor3','bg'], 'fill'=>fill)
-  TkcLine.new(w,96,133,96,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,176,129,96,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,176,129,176,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,315,133,176,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,315,133,315,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,399,129,315,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,399,311,399,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,399,311,350,311, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,350,329,350,311, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,350,329,258,329, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,258,370,258,329, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,60,370,258,370, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,60,370,60,391, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,60,391,0,391, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,0,391,0,331, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,21,331,0,331, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,21,331,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,96,133,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  TkcLine.new(w,107,300,159,300,159,248,107,248,107,300,
-              'fill'=>outline, 'tags'=>['floor3','bg'])
-end
-
-# floor_fg1 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the foreground information for the first
-# floor (office outlines and numbers).
-#
-# Arguments:
-# w -           The canvas window.
-# color -       Color to use for drawing foreground information.
-
-def floor_fg1(w,color)
-  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '101'
-  $floorItems['101'] = i
-  TkcText.new(w,358,209, 'text'=>'101', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'Pub Lift1'
-  $floorItems['Pub Lift1'] = i
-  TkcText.new(w,323,223, 'text'=>'Pub Lift1', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'Priv Lift1'
-  $floorItems['Priv Lift1'] = i
-  TkcText.new(w,323,188, 'text'=>'Priv Lift1', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,42,389,42,337,1,337,1,389,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '110'
-  $floorItems['110'] = i
-  TkcText.new(w,21.5,363, 'text'=>'110', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,59,389,59,385,90,385,90,337,44,337,44,389,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '109'
-  $floorItems['109'] = i
-  TkcText.new(w,67,363, 'text'=>'109', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,51,300,51,253,6,253,6,300,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '111'
-  $floorItems['111'] = i
-  TkcText.new(w,28.5,276.5, 'text'=>'111', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,98,248,98,309,79,309,79,248,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '117B'
-  $floorItems['117B'] = i
-  TkcText.new(w,88.5,278.5, 'text'=>'117B', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,51,251,51,204,6,204,6,251,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '112'
-  $floorItems['112'] = i
-  TkcText.new(w,28.5,227.5, 'text'=>'112', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,6,156,51,156,51,203,6,203,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '113'
-  $floorItems['113'] = i
-  TkcText.new(w,28.5,179.5, 'text'=>'113', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,85,169,79,169,79,192,85,192,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '117A'
-  $floorItems['117A'] = i
-  TkcText.new(w,82,180.5, 'text'=>'117A', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,77,302,77,168,53,168,53,302,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '117'
-  $floorItems['117'] = i
-  TkcText.new(w,65,235, 'text'=>'117', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,51,155,51,115,6,115,6,155,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '114'
-  $floorItems['114'] = i
-  TkcText.new(w,28.5,135, 'text'=>'114', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,95,115,53,115,53,168,95,168,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '115'
-  $floorItems['115'] = i
-  TkcText.new(w,74,141.5, 'text'=>'115', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,87,113,87,27,10,27,10,113,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '116'
-  $floorItems['116'] = i
-  TkcText.new(w,48.5,70, 'text'=>'116', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,89,91,128,91,128,113,89,131,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '118'
-  $floorItems['118'] = i
-  TkcText.new(w,108.5,102, 'text'=>'118', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,178,128,178,132,216,132,216,91,
-                     163,91,163,112,149,112,149,128,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '120'
-  $floorItems['120'] = i
-  TkcText.new(w,189.5,111.5, 'text'=>'120', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,79,193,87,193,87,169,136,169,136,192,
-                     156,192,156,169,175,169,175,246,79,246,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '122'
-  $floorItems['122'] = i
-  TkcText.new(w,131,207.5, 'text'=>'122', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,138,169,154,169,154,191,138,191,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '121'
-  $floorItems['121'] = i
-  TkcText.new(w,146,180, 'text'=>'121', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,99,300,126,300,126,309,99,309,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '106A'
-  $floorItems['106A'] = i
-  TkcText.new(w,112.5,304.5, 'text'=>'106A', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,128,299,128,309,150,309,150,248,99,248,99,299,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '105'
-  $floorItems['105'] = i
-  TkcText.new(w,124.5,278.5, 'text'=>'105', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,174,309,174,300,152,300,152,309,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '106B'
-  $floorItems['106B'] = i
-  TkcText.new(w,163,304.5, 'text'=>'106B', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,176,299,176,309,216,309,216,248,152,248,152,299,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '104'
-  $floorItems['104'] = i
-  TkcText.new(w,184,278.5, 'text'=>'104', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,138,385,138,337,91,337,91,385,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '108'
-  $floorItems['108'] = i
-  TkcText.new(w,114.5,361, 'text'=>'108', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,256,337,140,337,140,385,256,385,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '107'
-  $floorItems['107'] = i
-  TkcText.new(w,198,361, 'text'=>'107', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,300,353,300,329,260,329,260,353,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'Smoking'
-  $floorItems['Smoking'] = i
-  TkcText.new(w,280,341, 'text'=>'Smoking', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,314,135,314,170,306,170,306,246,177,246,177,135,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '123'
-  $floorItems['123'] = i
-  TkcText.new(w,245.5,190.5, 'text'=>'123', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,217,248,301,248,301,326,257,326,257,310,217,310,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '103'
-  $floorItems['103'] = i
-  TkcText.new(w,259,287, 'text'=>'103', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,396,188,377,188,377,169,316,169,316,131,396,131,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '124'
-  $floorItems['124'] = i
-  TkcText.new(w,356,150, 'text'=>'124', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,397,226,407,226,407,189,377,189,377,246,397,246,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '125'
-  $floorItems['125'] = i
-  TkcText.new(w,392,217.5, 'text'=>'125', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,399,187,409,187,409,207,474,207,474,164,399,164,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '126'
-  $floorItems['126'] = i
-  TkcText.new(w,436.5,185.5, 'text'=>'126', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,409,209,409,229,399,229,399,253,
-                     486,253,486,239,474,239,474,209,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '127'
-  $floorItems['127'] = i
-  TkcText.new(w,436.5,'231', 'text'=>'127', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,501,164,501,174,495,174,495,188,
-                     490,188,490,204,476,204,476,164,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'MShower'
-  $floorItems['MShower'] = i
-  TkcText.new(w,488.5,'184', 'text'=>'MShower', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,497,176,513,176,513,204,492,204,492,190,497,190,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'Closet'
-  $floorItems['Closet'] = i
-  TkcText.new(w,502.5,190, 'text'=>'Closet', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,476,237,476,206,513,206,513,254,488,254,488,237,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'WShower'
-  $floorItems['WShower'] = i
-  TkcText.new(w,494.5,230, 'text'=>'WShower', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,486,131,558,131,558,135,724,135,724,166,
-                     697,166,697,275,553,275,531,254,515,254,
-                     515,174,503,174,503,161,486,161,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '130'
-  $floorItems['130'] = i
-  TkcText.new(w,638.5,205, 'text'=>'130', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,308,242,339,242,339,248,342,248,
-                     342,246,397,246,397,276,393,276,
-                     393,309,300,309,300,248,308,248,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '102'
-  $floorItems['102'] = i
-  TkcText.new(w,367.5,278.5, 'text'=>'102', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,397,255,486,255,486,276,397,276,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '128'
-  $floorItems['128'] = i
-  TkcText.new(w,441.5,265.5, 'text'=>'128', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,510,309,486,309,486,255,530,255,
-                     552,277,561,277,561,325,510,325,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '129'
-  $floorItems['129'] = i
-  TkcText.new(w,535.5,293, 'text'=>'129', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,696,281,740,281,740,387,642,387,
-                     642,389,561,389,561,277,696,277,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '133'
-  $floorItems['133'] = i
-  TkcText.new(w,628.5,335, 'text'=>'133', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,742,387,742,281,800,281,800,387,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '132'
-  $floorItems['132'] = i
-  TkcText.new(w,771,334, 'text'=>'132', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,800,168,800,280,699,280,699,168,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '134'
-  $floorItems['134'] = i
-  TkcText.new(w,749.5,224, 'text'=>'134', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,726,131,726,166,800,166,800,131,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '135'
-  $floorItems['135'] = i
-  TkcText.new(w,763,148.5, 'text'=>'135', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,340,360,335,363,331,365,326,366,304,366,
-                     304,312,396,312,396,288,400,288,404,288,
-                     409,290,413,292,418,297,421,302,422,309,
-                     421,318,417,325,411,330,405,332,397,333,
-                     344,333,340,334,336,336,335,338,332,342,
-                     331,347,332,351,334,354,336,357,341,359,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'Ramona Stair'
-  $floorItems['Ramona Stair'] = i
-  TkcText.new(w,368,323, 'text'=>'Ramona Stair', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,30,23,30,5,93,5,98,5,104,7,110,10,116,16,119,20,
-                     122,28,123,32,123,68,220,68,220,87,90,87,90,23,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'University Stair'
-  $floorItems['University Stair'] = i
-  TkcText.new(w,155,77.5, 'text'=>'University Stair', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,282,37,295,40,312,49,323,56,337,70,352,56,
-                     358,48,363,39,365,29,348,25,335,22,321,14,
-                     300,5,283,1,260,0,246,0,242,2,236,4,231,8,
-                     227,13,223,17,221,22,220,34,260,34,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'Plaza Stair'
-  $floorItems['Plaza Stair'] = i
-  TkcText.new(w,317.5,28.5, 'text'=>'Plaza Stair', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,220,34,260,34,282,37,295,40,312,49,
-                     323,56,337,70,350,83,365,94,377,100,
-                     386,104,386,128,220,128,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = 'Plaza Deck'
-  $floorItems['Plaza Deck'] = i
-  TkcText.new(w,303,81, 'text'=>'Plaza Deck', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,257,336,77,336,6,336,6,301,77,301,77,310,257,310,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '106'
-  $floorItems['106'] = i
-  TkcText.new(w,131.5,318.5, 'text'=>'106', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,146,110,162,110,162,91,130,91,130,115,95,115,
-                     95,128,114,128,114,151,157,151,157,153,112,153,
-                     112,130,97,130,97,168,175,168,175,131,146,131,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels[i.id] = '119'
-  $floorItems['119'] = i
-  TkcText.new(w,143.5,133, 'text'=>'119', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  TkcLine.new(w,155,191,155,189, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,155,177,155,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,96,129,96,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,78,169,176,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,176,247,176,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,340,206,307,206, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,340,187,340,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,340,210,340,201, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,340,247,340,224, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,340,241,307,241, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,376,246,376,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,307,247,307,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,376,170,307,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,315,129,315,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,147,129,176,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,202,133,176,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,398,129,315,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,258,352,258,387, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,60,387,60,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,0,337,0,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,60,391,0,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,3,114,3,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,258,387,60,387, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,237,52,273, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,189,52,225, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,140,52,177, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,395,306,395,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,531,254,398,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,475,178,475,238, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,502,162,398,162, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,398,129,398,188, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,383,188,376,188, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,408,188,408,194, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,398,227,398,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,408,227,398,227, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,408,222,408,227, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,408,206,408,210, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,408,208,475,208, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,484,278,484,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,484,311,508,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,508,327,508,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,559,327,508,327, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,644,391,559,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,644,389,644,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,514,205,475,205, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,496,189,496,187, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,559,129,484,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,484,162,484,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,725,133,559,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,559,129,559,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,725,149,725,167, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,725,129,802,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,802,389,802,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,739,167,802,167, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,396,188,408,188, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,0,337,9,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,58,337,21,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,43,391,43,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,105,337,75,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,91,387,91,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,154,337,117,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,139,387,139,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,227,337,166,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,258,337,251,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,258,328,302,328, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,302,355,302,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,395,311,302,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,484,278,395,278, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,395,294,395,278, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,473,278,473,275, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,473,256,473,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,533,257,531,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,553,276,551,274, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,698,276,553,276, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,559,391,559,327, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,802,389,644,389, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,741,314,741,389, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,698,280,698,167, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,707,280,698,280, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,802,280,731,280, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,741,280,741,302, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,698,167,727,167, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,725,137,725,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,514,254,514,175, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,496,175,514,175, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,502,175,502,162, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,475,166,475,162, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,496,176,496,175, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,491,189,496,189, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,491,205,491,189, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,487,238,475,238, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,487,240,487,238, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,487,252,487,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,315,133,304,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,256,133,280,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,78,247,270,247, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,307,247,294,247, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,214,133,232,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,217,247,217,266, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,217,309,217,291, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,217,309,172,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,154,309,148,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,175,300,175,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,151,300,175,300, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,151,247,151,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,78,237,78,265, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,78,286,78,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,106,309,78,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,130,309,125,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,99,309,99,247, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,127,299,99,299, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,127,309,127,299, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,155,191,137,191, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,137,169,137,191, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,78,171,78,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,78,190,78,218, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,86,192,86,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,86,192,78,192, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,301,3,301, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,286,52,301, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,252,3,252, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,203,3,203, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,3,156,52,156, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,8,25,8,114, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,63,114,3,114, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,75,114,97,114, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,108,114,129,114, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,129,114,129,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,52,114,52,128, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,132,89,88,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,88,25,88,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,88,114,88,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,218,89,144,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,147,111,147,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,162,111,147,111, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,162,109,162,111, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,162,96,162,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,218,89,218,94, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,218,89,218,119, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,8,25,88,25, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,258,337,258,328, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,113,129,96,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,302,355,258,355, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,386,104,386,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,377,100,386,104, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,365,94,377,100, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,350,83,365,94, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,337,70,350,83, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,337,70,323,56, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,312,49,323,56, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,295,40,312,49, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,282,37,295,40, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,260,34,282,37, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,253,34,260,34, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,386,128,386,104, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,113,152,156,152, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,113,152,156,152, 'fill'=>color, 'tags'=>['floor1','wall'])
-  TkcLine.new(w,113,152,113,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-end
-
-# floor_fg2 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the foreground information for the second
-# floor (office outlines and numbers).
-#
-# Arguments:
-# w -           The canvas window.
-# color -       Color to use for drawing foreground information.
-
-def floor_fg2(w,color)
-  i = TkcPolygon.new(w,748,188,755,188,755,205,758,205,758,222,
-                     800,222,800,168,748,168,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '238'
-  $floorItems['238'] = i
-  TkcText.new(w,774,195, 'text'=>'238', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,726,188,746,188,746,166,800,166,800,131,726,131,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '237'
-  $floorItems['237'] = i
-  TkcText.new(w,763,148.5, 'text'=>'237', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,497,187,497,204,559,204,559,324,641,324,
-                     643,324,643,291,641,291,641,205,696,205,
-                     696,291,694,291,694,314,715,314,715,291,
-                     715,205,755,205,755,190,724,190,724,187,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '246'
-  $floorItems['246'] = i
-  TkcText.new(w,600,264, 'text'=>'246', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,694,279,643,279,643,314,694,314,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '247'
-  $floorItems['247'] = i
-  TkcText.new(w,668.5,296.5, 'text'=>'247', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,232,250,308,250,308,242,339,242,339,246,
-                     397,246,397,255,476,255,476,250,482,250,559,250,
-                     559,274,482,274,482,278,396,278,396,274,232,274,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '202'
-  $floorItems['202'] = i
-  TkcText.new(w,285.5,260, 'text'=>'202', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,53,228,53,338,176,338,233,338,233,196,
-                     306,196,306,180,175,180,175,169,156,169,
-                     156,196,176,196,176,228,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '206'
-  $floorItems['206'] = i
-  TkcText.new(w,143,267, 'text'=>'206', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,277,6,277,6,338,51,338,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '212'
-  $floorItems['212'] = i
-  TkcText.new(w,28.5,307.5, 'text'=>'212', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,557,276,486,276,486,309,510,309,510,325,557,325,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '245'
-  $floorItems['245'] = i
-  TkcText.new(w,521.5,300.5, 'text'=>'245', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,560,389,599,389,599,326,560,326,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '244'
-  $floorItems['244'] = i
-  TkcText.new(w,579.5,357.5, 'text'=>'244', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,601,389,601,326,643,326,643,389,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '243'
-  $floorItems['243'] = i
-  TkcText.new(w,622,357.5, 'text'=>'243', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,688,316,645,316,645,365,688,365,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '242'
-  $floorItems['242'] = i
-  TkcText.new(w,666.5,340.5, 'text'=>'242', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,802,367,759,367,759,226,802,226,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = 'Barbecue Deck'
-  $floorItems['Barbecue Deck'] = i
-  TkcText.new(w,780.5,296.5, 'text'=>'Barbecue Deck', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,755,262,755,314,717,314,717,262,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '240'
-  $floorItems['240'] = i
-  TkcText.new(w,736,288, 'text'=>'240', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,755,316,689,316,689,365,755,365,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '241'
-  $floorItems['241'] = i
-  TkcText.new(w,722,340.5, 'text'=>'241', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,755,206,717,206,717,261,755,261,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '239'
-  $floorItems['239'] = i
-  TkcText.new(w,736,233.5, 'text'=>'239', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,695,277,643,277,643,206,695,206,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '248'
-  $floorItems['248'] = i
-  TkcText.new(w,669,241.5, 'text'=>'248', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,676,135,676,185,724,185,724,135,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '236'
-  $floorItems['236'] = i
-  TkcText.new(w,700,160, 'text'=>'236', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,675,135,635,135,635,145,628,145,628,185,675,185,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '235'
-  $floorItems['235'] = i
-  TkcText.new(w,651.5,160, 'text'=>'235', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,626,143,633,143,633,135,572,135,
-                     572,143,579,143,579,185,626,185,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '234'
-  $floorItems['234'] = i
-  TkcText.new(w,606,160, 'text'=>'234', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,557,135,571,135,571,145,578,145,
-                     578,185,527,185,527,131,557,131,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '233'
-  $floorItems['233'] = i
-  TkcText.new(w,552.5,158, 'text'=>'233', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,476,249,557,249,557,205,476,205,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '230'
-  $floorItems['230'] = i
-  TkcText.new(w,516.5,227, 'text'=>'230', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,476,164,486,164,486,131,525,131,525,185,476,185,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '232'
-  $floorItems['232'] = i
-  TkcText.new(w,500.5,158, 'text'=>'232', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,476,186,495,186,495,204,476,204,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '229'
-  $floorItems['229'] = i
-  TkcText.new(w,485.5,195, 'text'=>'229', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,474,207,409,207,409,187,399,187,399,164,474,164,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '227'
-  $floorItems['227'] = i
-  TkcText.new(w,436.5,185.5, 'text'=>'227', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,399,228,399,253,474,253,474,209,409,209,409,228,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '228'
-  $floorItems['228'] = i
-  TkcText.new(w,436.5,231, 'text'=>'228', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,397,246,397,226,407,226,407,189,377,189,377,246,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '226'
-  $floorItems['226'] = i
-  TkcText.new(w,392,217.5, 'text'=>'226', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,377,169,316,169,316,131,397,131,397,188,377,188,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '225'
-  $floorItems['225'] = i
-  TkcText.new(w,356.5,150, 'text'=>'225', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,234,198,306,198,306,249,234,249,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '224'
-  $floorItems['224'] = i
-  TkcText.new(w,270,223.5, 'text'=>'224', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,270,179,306,179,306,170,314,170,314,135,270,135,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '223'
-  $floorItems['223'] = i
-  TkcText.new(w,292,157, 'text'=>'223', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,268,179,221,179,221,135,268,135,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '222'
-  $floorItems['222'] = i
-  TkcText.new(w,244.5,157, 'text'=>'222', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,177,179,219,179,219,135,177,135,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '221'
-  $floorItems['221'] = i
-  TkcText.new(w,198,157, 'text'=>'221', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,299,327,349,327,349,284,341,284,341,276,299,276,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '204'
-  $floorItems['204'] = i
-  TkcText.new(w,324,301.5, 'text'=>'204', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,234,276,297,276,297,327,257,327,257,338,234,338,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '205'
-  $floorItems['205'] = i
-  TkcText.new(w,265.5,307, 'text'=>'205', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,256,385,256,340,212,340,212,385,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '207'
-  $floorItems['207'] = i
-  TkcText.new(w,234,362.5, 'text'=>'207', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,210,340,164,340,164,385,210,385,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '208'
-  $floorItems['208'] = i
-  TkcText.new(w,187,362.5, 'text'=>'208', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,115,340,162,340,162,385,115,385,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '209'
-  $floorItems['209'] = i
-  TkcText.new(w,138.5,362.5, 'text'=>'209', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,89,228,89,156,53,156,53,228,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '217'
-  $floorItems['217'] = i
-  TkcText.new(w,71,192, 'text'=>'217', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,89,169,97,169,97,190,89,190,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '217A'
-  $floorItems['217A'] = i
-  TkcText.new(w,93,179.5, 'text'=>'217A', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,89,156,89,168,95,168,95,135,53,135,53,156,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '216'
-  $floorItems['216'] = i
-  TkcText.new(w,71,145.5, 'text'=>'216', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,179,51,135,6,135,6,179,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '215'
-  $floorItems['215'] = i
-  TkcText.new(w,28.5,157, 'text'=>'215', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,227,6,227,6,180,51,180,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '214'
-  $floorItems['214'] = i
-  TkcText.new(w,28.5,203.5, 'text'=>'214', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,275,6,275,6,229,51,229,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '213'
-  $floorItems['213'] = i
-  TkcText.new(w,28.5,252, 'text'=>'213', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,114,340,67,340,67,385,114,385,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '210'
-  $floorItems['210'] = i
-  TkcText.new(w,90.5,362.5, 'text'=>'210', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,59,389,59,385,65,385,65,340,1,340,1,389,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '211'
-  $floorItems['211'] = i
-  TkcText.new(w,33,364.5, 'text'=>'211', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,393,309,350,309,350,282,342,282,342,276,393,276,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '203'
-  $floorItems['203'] = i
-  TkcText.new(w,367.5,292.5, 'text'=>'203', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,99,191,91,191,91,226,174,226,174,198,
-                     154,198,154,192,109,192,109,169,99,169,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '220'
-  $floorItems['220'] = i
-  TkcText.new(w,132.5,208.5, 'text'=>'220', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = 'Priv Lift2'
-  $floorItems['Priv Lift2'] = i
-  TkcText.new(w,323,188, 'text'=>'Priv Lift2', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = 'Pub Lift 2'
-  $floorItems['Pub Lift 2'] = i
-  TkcText.new(w,323,223, 'text'=>'Pub Lift 2', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '218'
-  $floorItems['218'] = i
-  TkcText.new(w,136,149.5, 'text'=>'218', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '219'
-  $floorItems['219'] = i
-  TkcText.new(w,132.5,180, 'text'=>'219', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels[i.id] = '201'
-  $floorItems['201'] = i
-  TkcText.new(w,358,209, 'text'=>'201', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  TkcLine.new(w,641,186,678,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,350,757,367, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,634,133,634,144, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,634,144,627,144, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,572,133,572,144, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,572,144,579,144, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,398,129,398,162, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,174,197,175,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,175,197,175,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,206,757,221, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,396,188,408,188, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,727,189,725,189, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,747,167,802,167, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,747,167,747,189, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,755,189,739,189, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,769,224,757,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,802,224,802,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,802,129,725,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,725,189,725,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,725,186,690,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,676,133,676,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,627,144,627,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,629,186,593,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,579,144,579,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,559,129,559,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,725,133,559,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,484,162,484,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,559,129,484,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,526,129,526,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,540,186,581,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,528,186,523,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,511,186,475,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,496,190,496,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,496,205,496,202, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,475,205,527,205, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,558,205,539,205, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,558,205,558,249, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,558,249,475,249, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,662,206,642,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,695,206,675,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,695,278,642,278, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,642,291,642,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,695,291,695,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,716,208,716,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,206,716,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,221,757,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,793,224,802,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,262,716,262, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,716,220,716,264, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,716,315,716,276, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,315,703,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,325,757,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,757,367,644,367, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,689,367,689,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,647,315,644,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,659,315,691,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,600,325,600,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,627,325,644,325, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,644,391,644,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,615,325,575,325, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,644,391,558,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,563,325,558,325, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,558,391,558,314, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,558,327,508,327, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,558,275,484,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,558,302,558,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,508,327,508,311, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,484,311,508,311, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,484,275,484,311, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,475,208,408,208, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,408,206,408,210, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,408,222,408,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,408,227,398,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,398,227,398,254, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,408,188,408,194, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,383,188,376,188, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,398,188,398,162, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,398,162,484,162, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,475,162,475,254, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,398,254,475,254, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,484,280,395,280, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,395,311,395,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,307,197,293,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,278,197,233,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,233,197,233,249, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,307,179,284,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,233,249,278,249, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,269,179,269,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,220,179,220,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,155,191,110,191, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,90,190,98,190, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,98,169,98,190, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,52,133,52,165, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,52,214,52,177, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,52,226,52,262, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,52,274,52,276, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,234,275,234,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,226,339,258,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,211,387,211,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,214,339,177,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,258,387,60,387, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,3,133,3,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,165,339,129,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,117,339,80,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,68,339,59,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,0,339,46,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,60,391,0,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,0,339,0,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,60,387,60,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,258,329,258,387, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,350,329,258,329, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,395,311,350,311, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,398,129,315,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,176,133,315,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,176,129,96,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,3,133,96,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,66,387,66,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,115,387,115,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,163,387,163,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,234,275,276,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,288,275,309,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,298,275,298,329, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,341,283,350,283, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,321,275,341,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,375,275,395,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,315,129,315,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,376,170,307,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,307,250,307,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,376,245,376,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,340,241,307,241, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,340,245,340,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,340,210,340,201, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,340,187,340,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,340,206,307,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,293,250,307,250, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,271,179,238,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,226,179,195,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,176,129,176,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,182,179,176,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,174,169,176,169, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,162,169,90,169, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,96,169,96,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,175,227,90,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,90,190,90,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,52,179,3,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,52,228,3,228, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,52,276,3,276, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,155,177,155,169, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,110,191,110,169, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,155,189,155,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,350,283,350,329, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,162,197,155,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  TkcLine.new(w,341,275,341,283, 'fill'=>color, 'tags'=>['floor2','wall'])
-end
-
-# floor_fg3 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the foreground information for the third
-# floor (office outlines and numbers).
-#
-# Arguments:
-# w -           The canvas window.
-# color -       Color to use for drawing foreground information.
-
-def floor_fg3(w,color)
-  i = TkcPolygon.new(w,89,228,89,180,70,180,70,228,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '316'
-  $floorItems['316'] = i
-  TkcText.new(w,79.5,204, 'text'=>'316', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,115,368,162,368,162,323,115,323,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '309'
-  $floorItems['309'] = i
-  TkcText.new(w,138.5,345.5, 'text'=>'309', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,164,323,164,368,211,368,211,323,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '308'
-  $floorItems['308'] = i
-  TkcText.new(w,187.5,345.5, 'text'=>'308', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,256,368,212,368,212,323,256,323,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '307'
-  $floorItems['307'] = i
-  TkcText.new(w,234,345.5, 'text'=>'307', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,244,276,297,276,297,327,260,327,260,321,244,321,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '305'
-  $floorItems['305'] = i
-  TkcText.new(w,270.5,301.5, 'text'=>'305', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,251,219,251,203,244,203,244,219,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '324B'
-  $floorItems['324B'] = i
-  TkcText.new(w,247.5,211, 'text'=>'324B', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,251,249,244,249,244,232,251,232,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '324A'
-  $floorItems['324A'] = i
-  TkcText.new(w,247.5,240.5, 'text'=>'324A', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,223,135,223,179,177,179,177,135,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '320'
-  $floorItems['320'] = i
-  TkcText.new(w,200,157, 'text'=>'320', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,114,368,114,323,67,323,67,368,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '310'
-  $floorItems['310'] = i
-  TkcText.new(w,90.5,345.5, 'text'=>'310', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,23,277,23,321,68,321,68,277,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '312'
-  $floorItems['312'] = i
-  TkcText.new(w,45.5,299, 'text'=>'312', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,23,229,68,229,68,275,23,275,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '313'
-  $floorItems['313'] = i
-  TkcText.new(w,45.5,252, 'text'=>'313', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,68,227,23,227,23,180,68,180,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '314'
-  $floorItems['314'] = i
-  TkcText.new(w,40.5,203.5, 'text'=>'314', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,95,179,95,135,23,135,23,179,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '315'
-  $floorItems['315'] = i
-  TkcText.new(w,59,157, 'text'=>'315', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,99,226,99,204,91,204,91,226,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '316B'
-  $floorItems['316B'] = i
-  TkcText.new(w,95,215, 'text'=>'316B', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,91,202,99,202,99,180,91,180,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '316A'
-  $floorItems['316A'] = i
-  TkcText.new(w,95,191, 'text'=>'316A', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,97,169,109,169,109,192,154,192,154,198,
-                     174,198,174,226,101,226,101,179,97,179,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '319'
-  $floorItems['319'] = i
-  TkcText.new(w,141.5,209, 'text'=>'319', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,65,368,58,368,58,389,1,389,1,333,23,333,23,323,65,323,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '311'
-  $floorItems['311'] = i
-  TkcText.new(w,29.5,361, 'text'=>'311', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '318'
-  $floorItems['318'] = i
-  TkcText.new(w,132.5,180, 'text'=>'318', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '317'
-  $floorItems['317'] = i
-  TkcText.new(w,136,149.5, 'text'=>'317', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,274,194,274,221,306,221,306,194,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '323'
-  $floorItems['323'] = i
-  TkcText.new(w,290,207.5, 'text'=>'323', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,306,222,274,222,274,249,306,249,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '325'
-  $floorItems['325'] = i
-  TkcText.new(w,290,235.5, 'text'=>'325', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,263,179,224,179,224,135,263,135,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '321'
-  $floorItems['321'] = i
-  TkcText.new(w,243.5,157, 'text'=>'321', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,314,169,306,169,306,192,273,192,
-                     264,181,264,135,314,135,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '322'
-  $floorItems['322'] = i
-  TkcText.new(w,293.5,163.5, 'text'=>'322', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = 'Pub Lift3'
-  $floorItems['Pub Lift3'] = i
-  TkcText.new(w,323,223, 'text'=>'Pub Lift3', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = 'Priv Lift3'
-  $floorItems['Priv Lift3'] = i
-  TkcText.new(w,323,188, 'text'=>'Priv Lift3', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,350,284,376,284,376,276,397,276,397,309,350,309,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '303'
-  $floorItems['303'] = i
-  TkcText.new(w,373.5,292.5, 'text'=>'303', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,272,203,272,249,252,249,252,230,
-                     244,230,244,221,252,221,252,203,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '324'
-  $floorItems['324'] = i
-  TkcText.new(w,262,226, 'text'=>'324', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,299,276,299,327,349,327,349,284,341,284,341,276,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '304'
-  $floorItems['304'] = i
-  TkcText.new(w,324,301.5, 'text'=>'304', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '301'
-  $floorItems['301'] = i
-  TkcText.new(w,358,209, 'text'=>'301', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,397,246,377,246,377,185,397,185,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '327'
-  $floorItems['327'] = i
-  TkcText.new(w,387,215.5, 'text'=>'327', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,316,131,316,169,377,169,377,185,397,185,397,131,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '326'
-  $floorItems['326'] = i
-  TkcText.new(w,365.5,150, 'text'=>'326', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,308,251,242,251,242,274,342,274,342,282,375, 282,
-                     375,274,397,274,397,248,339,248,339,242,308,242,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '302'
-  $floorItems['302'] = i
-  TkcText.new(w,319.5,261, 'text'=>'302', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,70,321,242,321,242,200,259,200,259,203,272,203,
-                     272,193,263,180,242,180,175,180,175,169,156,169,
-                     156,196,177,196,177,228,107,228,70,228,70,275,107,275,
-                     107,248,160,248,160,301,107,301,107,275,70,275,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels[i.id] = '306'
-  $floorItems['306'] = i
-  TkcText.new(w,200.5,284.5, 'text'=>'306', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  TkcLine.new(w,341,275,341,283, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,162,197,155,197, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,396,247,399,247, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,399,129,399,311, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,258,202,243,202, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,350,283,350,329, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,251,231,243,231, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,243,220,251,220, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,243,250,243,202, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,155,197,155,190, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,110,192,110,169, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,155,192,110,192, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,155,177,155,169, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,176,197,176,227, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,69,280,69,274, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,21,276,69,276, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,69,262,69,226, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,21,228,69,228, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,21,179,75,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,69,179,69,214, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,90,220,90,227, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,90,204,90,202, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,90,203,100,203, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,90,187,90,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,90,227,176,227, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,100,179,100,227, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,100,179,87,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,96,179,96,129, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,162,169,96,169, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,173,169,176,169, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,182,179,176,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,176,129,176,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,195,179,226,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,224,133,224,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,264,179,264,133, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,238,179,264,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,273,207,273,193, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,273,235,273,250, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,273,224,273,219, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,273,193,307,193, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,273,222,307,222, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,273,250,307,250, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,384,247,376,247, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,340,206,307,206, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,340,187,340,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,340,210,340,201, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,340,247,340,224, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,340,241,307,241, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,376,247,376,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,307,250,307,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,376,170,307,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,315,129,315,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,376,283,366,283, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,376,283,376,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,399,275,376,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,341,275,320,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,341,283,350,283, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,298,275,298,329, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,308,275,298,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,243,322,243,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,243,275,284,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,258,322,226,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,212,370,212,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,214,322,177,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,163,370,163,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,165,322,129,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,84,322,117,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,71,322,64,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,115,322,115,370, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,66,322,66,370, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,52,322,21,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,21,331,0,331, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,21,331,21,133, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,96,133,21,133, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,176,129,96,129, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,315,133,176,133, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,315,129,399,129, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,399,311,350,311, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,350,329,258,329, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,258,322,258,370, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,60,370,258,370, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,60,370,60,391, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,0,391,0,331, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,60,391,0,391, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,307,250,307,242, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,273,250,307,250, 'fill'=>color, 'tags'=>['floor3','wall'])
-  TkcLine.new(w,258,250,243,250, 'fill'=>color, 'tags'=>['floor3','wall'])
-end
-
-# Below is the "main program" that creates the floorplan demonstration.
-
-# toplevel widget が存在すれば削除する
-if defined?($floor_demo) && $floor_demo
-  $floor_demo.destroy
-  $floor_demo = nil
-end
-
-# demo 用の toplevel widget を生成
-$floor_demo = TkToplevel.new {|w|
-  title("Floorplan Canvas Demonstration")
-  iconname("Floorplan")
-  positionWindow(w)
-  geometry('+20+20')
-  minsize(100,100)
-}
-
-base_frame = TkFrame.new($floor_demo).pack(:fill=>:both, :expand=>true)
-
-# label 生成
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'8i', 'justify'=>'left',
-            'text'=>"このウィンドウにはディジタルエクイップメント社のウェスタンリサーチラボラトリ (DECWRL) の間取りが書かれたキャンバス widget が入っています。これは 3階建てで、常にそのうちの1階分が選択、つまりその間取りが表示されるようになっています。ある階を選択するには、その上でマウスの左ボタンをクリックしてください。マウスが選択されている階の上を動くと、その下にある部屋の色が変わり、部屋番号が「部屋番号:」エントリに表示されます。また、エントリに部屋番号を書くとその部屋の色が変わります。"){
-  pack('side'=>'top')
-}
-
-# frame 生成
-$floor_buttons = TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc{
-      tmppath = $floor_demo
-      $floor_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc{showCode 'floor'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$floor_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# 変数設定
-$floorLabels = {}
-$floorItems = {}
-
-# canvas 設定
-if $tk_version =~ /^4\.[01]/
-  $floor_canvas_frame = TkFrame.new(base_frame,'bd'=>2,'relief'=>'sunken',
-                                    'highlightthickness'=>2)
-  $floor_canvas = TkCanvas.new($floor_canvas_frame,
-                               'width'=>900, 'height'=>500, 'borderwidth'=>0,
-                               'highlightthickness'=>0) {|c|
-    TkScrollbar.new(base_frame, 'orient'=>'horiz',
-                    'command'=>proc{|*args| c.xview(*args)}){|hs|
-      c.xscrollcommand(proc{|first,last| hs.set first,last})
-      pack('side'=>'bottom', 'fill'=>'x')
-    }
-    TkScrollbar.new(base_frame, 'command'=>proc{|*args| c.yview(*args)}){|vs|
-      c.yscrollcommand(proc{|first,last| vs.set first,last})
-      pack('side'=>'right', 'fill'=>'y')
-    }
-  }
-  $floor_canvas_frame.pack('side'=>'top','fill'=>'both', 'expand'=>'yes')
-  $floor_canvas.pack('expand'=>'yes', 'fill'=>'both')
-
-else
-  TkFrame.new(base_frame) {|f|
-    pack('side'=>'top', 'fill'=>'both', 'expand'=>'yes')
-
-    h = TkScrollbar.new(f, 'highlightthickness'=>0, 'orient'=>'horizontal')
-    v = TkScrollbar.new(f, 'highlightthickness'=>0, 'orient'=>'vertical')
-
-    TkFrame.new(f, 'bd'=>2, 'relief'=>'sunken') {|f1|
-      $floor_canvas = TkCanvas.new(f1, 'width'=>900, 'height'=>500,
-                                   'borderwidth'=>0,
-                                   'highlightthickness'=>0) {
-        xscrollcommand(proc{|first,last| h.set first,last})
-        yscrollcommand(proc{|first,last| v.set first,last})
-        pack('expand'=>'yes', 'fill'=>'both')
-      }
-      grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0,
-           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    }
-
-    v.grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1,
-           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    h.grid('padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0,
-           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-
-    TkGrid.rowconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
-    TkGrid.columnconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
-
-    pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>1)
-
-    v.command(proc{|*args| $floor_canvas.yview(*args)})
-    h.command(proc{|*args| $floor_canvas.xview(*args)})
-  }
-end
-
-
-# Create an entry for displaying and typing in current room.
-
-$currentRoom = TkVariable.new
-$floor_entry = TkEntry.new($floor_canvas, 'width'=>10, 'relief'=>'sunken',
-                           'bd'=>2, 'textvariable'=>$currentRoom)
-
-# Choose colors, then fill in the floorplan.
-
-$floor_colors = {}
-if TkWinfo.depth($floor_canvas) > 1
-  $floor_colors['bg1'] = '#a9c1da'
-  $floor_colors['outline1'] = '#77889a'
-  $floor_colors['bg2'] = '#9ab0c6'
-  $floor_colors['outline2'] = '#687786'
-  $floor_colors['bg3'] = '#8ba0b3'
-  $floor_colors['outline3'] = '#596673'
-  $floor_colors['offices'] = 'Black'
-  $floor_colors['active'] = '#c4d1df'
-else
-  $floor_colors['bg1'] = 'white'
-  $floor_colors['outline1'] = 'black'
-  $floor_colors['bg2'] = 'white'
-  $floor_colors['outline2'] = 'black'
-  $floor_colors['bg3'] = 'white'
-  $floor_colors['outline3'] = 'black'
-  $floor_colors['offices'] = 'Black'
-  $floor_colors['active'] = 'black'
-end
-
-$activeFloor = ''
-floorDisplay $floor_canvas,3
-
-# Set up event bindings for canvas:
-
-$floor_canvas.itembind('floor1', '1', proc{floorDisplay $floor_canvas,1})
-$floor_canvas.itembind('floor2', '1', proc{floorDisplay $floor_canvas,2})
-$floor_canvas.itembind('floor3', '1', proc{floorDisplay $floor_canvas,3})
-$floor_canvas.itembind('room', 'Enter', proc{newRoom $floor_canvas})
-$floor_canvas.itembind('room', 'Leave', proc{$currentRoom.value = ''})
-$floor_canvas.bind('2', proc{|x,y| $floor_canvas.scan_mark x,y}, '%x %y')
-$floor_canvas.bind('B2-Motion',
-                   proc{|x,y| $floor_canvas.scan_dragto x,y}, '%x %y')
-$floor_canvas.bind('Destroy', proc{$currentRoom.unset})
-$currentRoom.value = ''
-$currentRoom.trace('w',proc{roomChanged $floor_canvas})
-
diff --git a/ext/tk/sample/demos-jp/floor2.rb b/ext/tk/sample/demos-jp/floor2.rb
deleted file mode 100644
index 7f294ce82e..0000000000
--- a/ext/tk/sample/demos-jp/floor2.rb
+++ /dev/null
@@ -1,1720 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# floorDisplay widget demo 2 (called by 'widget')
-#
-
-# floorDisplay2 --
-# Recreate the floorplan display in the canvas given by "w".  The
-# floor given by "active" is displayed on top with its office structure
-# visible.
-#
-# Arguments:
-# w -           Name of the canvas window.
-# active -      Number of active floor (1, 2, or 3).
-
-def floorDisplay2(w,active)
-  return if $activeFloor2 == active
-
-  w.delete('all')
-  $activeFloor2 = active
-
-  # First go through the three floors, displaying the backgrounds for
-  # each floor.
-
-  floor2_bg1(w,$floor2_colors['bg1'],$floor2_colors['outline1'])
-  floor2_bg2(w,$floor2_colors['bg2'],$floor2_colors['outline2'])
-  floor2_bg3(w,$floor2_colors['bg3'],$floor2_colors['outline3'])
-
-  # Raise the background for the active floor so that it's on top.
-
-  w.raise("floor#{active}")
-
-  # Create a dummy item just to mark this point in the display list,
-  # so we can insert highlights here.
-
-  w.create(TkcRectangle,0,100,1,101,'fill'=>'','outline'=>'','tags'=>'marker')
-
-  # Add the walls and labels for the active floor, along with
-  # transparent polygons that define the rooms on the floor.
-  # Make sure that the room polygons are on top.
-
-  $floorLabels2.clear
-  $floorItems2.clear
-  send("floor2_fg#{active}", w, $floor2_colors['offices'])
-  w.raise('room')
-
-  # Offset the floors diagonally from each other.
-
-  w.move('floor1', '2c', '2c')
-  w.move('floor2', '1c', '1c')
-
-  # Create items for the room entry and its label.
-  w.create(TkcWindow, 600, 100, 'anchor'=>'w', 'window'=>$floor2_entry)
-  w.create(TkcText, 600, 100, 'anchor'=>'e', 'text'=>"部屋番号: ")
-  w['scrollregion'] = w.bbox('all')
-end
-
-# newRoom2 --
-# This method is invoked whenever the mouse enters a room
-# in the floorplan.  It changes tags so that the current room is
-# highlighted.
-#
-# Arguments:
-# w  -          The name of the canvas window.
-
-def newRoom2(w)
-  id = w.find_withtag('current')[0]
-  $currentRoom2.value = $floorLabels2[id.id] if id != ""
-  Tk.update(true)
-end
-
-# roomChanged2 --
-# This method is invoked whenever the currentRoom variable changes.
-# It highlights the current room and unhighlights any previous room.
-#
-# Arguments:
-# w -           The canvas window displaying the floorplan.
-# args -        Not used.
-
-def roomChanged2(w,*args)
-  w.delete('highlight')
-  item = $floorItems2[$currentRoom2.value]
-  return if item == nil
-  new = TkcPolygon.new(w, *(w.coords(item)))
-  new.configure('fill'=>$floor2_colors['active'], 'tags'=>'highlight')
-  w.raise(new, 'marker')
-end
-
-# floor2_bg1 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the background information for the first
-# floor.
-#
-# Arguments:
-# w -           The canvas window.
-# fill -        Fill color to use for the floor's background.
-# outline -     Color to use for the floor's outline.
-
-def floor2_bg1(w,fill,outline)
-  w.create(TkcPolygon,347,80,349,82,351,84,353,85,363,92,375,99,386,104,
-                 386,129,398,129,398,162,484,162,484,129,559,129,559,133,725,
-                 133,725,129,802,129,802,389,644,389,644,391,559,391,559,327,
-                 508,327,508,311,484,311,484,278,395,278,395,288,400,288,404,
-                 288,409,290,413,292,418,297,421,302,422,309,421,318,417,325,
-                 411,330,405,332,397,333,344,333,340,334,336,336,335,338,332,
-                 342,331,347,332,351,334,354,336,357,341,359,340,360,335,363,
-                 331,365,326,366,304,366,304,355,258,355,258,387,60,387,60,391,
-                 0,391,0,337,3,337,3,114,8,114,8,25,30,25,30,5,93,5,98,5,104,7,
-                 110,10,116,16,119,20,122,28,123,32,123,68,220,68,220,34,221,
-                 22,223,17,227,13,231,8,236,4,242,2,246,0,260,0,283,1,300,5,
-                 321,14,335,22,348,25,365,29,363,39,358,48,352,56,337,70,
-                 344,76,347,80, 'tags'=>['floor1','bg'], 'fill'=>fill)
-  w.create(TkcLine,386,129,398,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,258,355,258,387, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,60,387,60,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,0,337,0,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,60,391,0,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,3,114,3,337, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,258,387,60,387, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,484,162,398,162, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,398,162,398,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,484,278,484,311, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,484,311,508,311, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,508,327,508,311, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,559,327,508,327, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,644,391,559,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,644,389,644,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,559,129,484,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,484,162,484,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,725,133,559,133, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,559,129,559,133, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,725,129,802,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,802,389,802,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,3,337,0,337, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,559,391,559,327, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,802,389,644,389, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,725,133,725,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,8,25,8,114, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,8,114,3,114, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,30,25,8,25, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,484,278,395,278, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,30,25,30,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,93,5,30,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,98,5,93,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,104,7,98,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,110,10,104,7, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,116,16,110,10, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,119,20,116,16, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,122,28,119,20, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,123,32,122,28, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,123,68,123,32, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,220,68,123,68, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,386,129,386,104, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,386,104,375,99, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,375,99,363,92, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,353,85,363,92, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,220,68,220,34, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,337,70,352,56, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,352,56,358,48, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,358,48,363,39, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,363,39,365,29, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,365,29,348,25, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,348,25,335,22, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,335,22,321,14, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,321,14,300,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,300,5,283,1, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,283,1,260,0, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,260,0,246,0, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,246,0,242,2, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,242,2,236,4, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,236,4,231,8, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,231,8,227,13, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,223,17,227,13, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,221,22,223,17, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,220,34,221,22, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,340,360,335,363, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,335,363,331,365, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,331,365,326,366, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,326,366,304,366, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,304,355,304,366, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,395,288,400,288, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,404,288,400,288, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,409,290,404,288, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,413,292,409,290, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,418,297,413,292, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,421,302,418,297, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,422,309,421,302, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,421,318,422,309, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,421,318,417,325, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,417,325,411,330, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,411,330,405,332, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,405,332,397,333, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,397,333,344,333, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,344,333,340,334, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,340,334,336,336, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,336,336,335,338, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,335,338,332,342, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,331,347,332,342, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,332,351,331,347, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,334,354,332,351, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,336,357,334,354, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,341,359,336,357, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,341,359,340,360, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,395,288,395,278, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,304,355,258,355, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,347,80,344,76, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,344,76,337,70, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,349,82,347,80, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,351,84,349,82, 'fill'=>outline, 'tags'=>['floor1','bg'])
-  w.create(TkcLine,353,85,351,84, 'fill'=>outline, 'tags'=>['floor1','bg'])
-end
-
-# floor2_bg2 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the background information for the first
-# floor.
-#
-# Arguments:
-# w -           The canvas window.
-# fill -        Fill color to use for the floor's background.
-# outline -     Color to use for the floor's outline.
-
-def floor2_bg2(w,fill,outline)
-  w.create(TkcPolygon,559,129,484,129,484,162,398,162,398,129,315,129,
-                 315,133,176,133,176,129,96,129,96,133,3,133,3,339,0,339,0,391,
-                 60,391,60,387,258,387,258,329,350,329,350,311,395,311,395,280,
-                 484,280,484,311,508,311,508,327,558,327,558,391,644,391,644,
-                 367,802,367,802,129,725,129,725,133,559,133,559,129,
-                 'tags'=>['floor2','bg'], 'fill'=>fill)
-  w.create(TkcLine,350,311,350,329, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,398,129,398,162, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,802,367,802,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,802,129,725,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,725,133,725,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,559,129,559,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,559,133,725,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,484,162,484,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,559,129,484,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,802,367,644,367, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,644,367,644,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,644,391,558,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,558,327,558,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,558,327,508,327, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,508,327,508,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,484,311,508,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,484,280,484,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,398,162,484,162, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,484,280,395,280, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,395,280,395,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,258,387,60,387, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,3,133,3,339, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,3,339,0,339, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,60,391,0,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,0,339,0,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,60,387,60,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,258,329,258,387, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,350,329,258,329, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,395,311,350,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,398,129,315,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,176,133,315,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,176,129,96,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,3,133,96,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,315,133,315,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,176,133,176,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-  w.create(TkcLine,96,133,96,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
-end
-
-# floor2_bg3 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the background information for the first
-# floor.
-#
-# Arguments:
-# w -           The canvas window.
-# fill -        Fill color to use for the floor's background.
-# outline -     Color to use for the floor's outline.
-
-def floor2_bg3(w,fill,outline)
-  w.create(TkcPolygon,159,300,107,300,107,248,159,248,159,129,96,129,96,
-                 133,21,133,21,331,0,331,0,391,60,391,60,370,159,370,159,300,
-                 'tags'=>['floor3','bg'], 'fill'=>fill)
-  w.create(TkcPolygon,258,370,258,329,350,329,350,311,399,311,399,129,
-                 315,129,315,133,176,133,176,129,159,129,159,370,258,370,
-                 'tags'=>['floor3','bg'], 'fill'=>fill)
-  w.create(TkcLine,96,133,96,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,176,129,96,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,176,129,176,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,315,133,176,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,315,133,315,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,399,129,315,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,399,311,399,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,399,311,350,311, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,350,329,350,311, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,350,329,258,329, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,258,370,258,329, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,60,370,258,370, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,60,370,60,391, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,60,391,0,391, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,0,391,0,331, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,21,331,0,331, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,21,331,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,96,133,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
-  w.create(TkcLine,107,300,159,300,159,248,107,248,107,300,
-              'fill'=>outline, 'tags'=>['floor3','bg'])
-end
-
-# floor2_fg1 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the foreground information for the first
-# floor (office outlines and numbers).
-#
-# Arguments:
-# w -           The canvas window.
-# color -       Color to use for drawing foreground information.
-
-def floor2_fg1(w,color)
-  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '101'
-  $floorItems2['101'] = i
-  w.create(TkcText,358,209, 'text'=>'101', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = 'Pub Lift1'
-  $floorItems2['Pub Lift1'] = i
-  w.create(TkcText,323,223, 'text'=>'Pub Lift1', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = 'Priv Lift1'
-  $floorItems2['Priv Lift1'] = i
-  w.create(TkcText,323,188, 'text'=>'Priv Lift1', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,42,389,42,337,1,337,1,389,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '110'
-  $floorItems2['110'] = i
-  w.create(TkcText,21.5,363, 'text'=>'110', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,59,389,59,385,90,385,90,337,44,337,44,389,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '109'
-  $floorItems2['109'] = i
-  w.create(TkcText,67,363, 'text'=>'109', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,51,300,51,253,6,253,6,300,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '111'
-  $floorItems2['111'] = i
-  w.create(TkcText,28.5,276.5, 'text'=>'111', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,98,248,98,309,79,309,79,248,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '117B'
-  $floorItems2['117B'] = i
-  w.create(TkcText,88.5,278.5, 'text'=>'117B', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,51,251,51,204,6,204,6,251,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '112'
-  $floorItems2['112'] = i
-  w.create(TkcText,28.5,227.5, 'text'=>'112', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,6,156,51,156,51,203,6,203,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '113'
-  $floorItems2['113'] = i
-  w.create(TkcText,28.5,179.5, 'text'=>'113', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,85,169,79,169,79,192,85,192,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '117A'
-  $floorItems2['117A'] = i
-  w.create(TkcText,82,180.5, 'text'=>'117A', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,77,302,77,168,53,168,53,302,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '117'
-  $floorItems2['117'] = i
-  w.create(TkcText,65,235, 'text'=>'117', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,51,155,51,115,6,115,6,155,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '114'
-  $floorItems2['114'] = i
-  w.create(TkcText,28.5,135, 'text'=>'114', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,95,115,53,115,53,168,95,168,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '115'
-  $floorItems2['115'] = i
-  w.create(TkcText,74,141.5, 'text'=>'115', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,87,113,87,27,10,27,10,113,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '116'
-  $floorItems2['116'] = i
-  w.create(TkcText,48.5,70, 'text'=>'116', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,89,91,128,91,128,113,89,131,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '118'
-  $floorItems2['118'] = i
-  w.create(TkcText,108.5,102, 'text'=>'118', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,178,128,178,132,216,132,216,91,
-                     163,91,163,112,149,112,149,128,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '120'
-  $floorItems2['120'] = i
-  w.create(TkcText,189.5,111.5, 'text'=>'120', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,79,193,87,193,87,169,136,169,136,192,
-                     156,192,156,169,175,169,175,246,79,246,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '122'
-  $floorItems2['122'] = i
-  w.create(TkcText,131,207.5, 'text'=>'122', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,138,169,154,169,154,191,138,191,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '121'
-  $floorItems2['121'] = i
-  w.create(TkcText,146,180, 'text'=>'121', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,99,300,126,300,126,309,99,309,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '106A'
-  $floorItems2['106A'] = i
-  w.create(TkcText,112.5,304.5, 'text'=>'106A', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,128,299,128,309,150,309,150,248,99,248,99,299,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '105'
-  $floorItems2['105'] = i
-  w.create(TkcText,124.5,278.5, 'text'=>'105', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,174,309,174,300,152,300,152,309,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '106B'
-  $floorItems2['106B'] = i
-  w.create(TkcText,163,304.5, 'text'=>'106B', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,176,299,176,309,216,309,216,248,152,248,152,299,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '104'
-  $floorItems2['104'] = i
-  w.create(TkcText,184,278.5, 'text'=>'104', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,138,385,138,337,91,337,91,385,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '108'
-  $floorItems2['108'] = i
-  w.create(TkcText,114.5,361, 'text'=>'108', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,256,337,140,337,140,385,256,385,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '107'
-  $floorItems2['107'] = i
-  w.create(TkcText,198,361, 'text'=>'107', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,300,353,300,329,260,329,260,353,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = 'Smoking'
-  $floorItems2['Smoking'] = i
-  w.create(TkcText,280,341, 'text'=>'Smoking', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,314,135,314,170,306,170,306,246,177,246,177,135,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '123'
-  $floorItems2['123'] = i
-  w.create(TkcText,245.5,190.5, 'text'=>'123', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,217,248,301,248,301,326,257,326,257,310,217,310,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '103'
-  $floorItems2['103'] = i
-  w.create(TkcText,259,287, 'text'=>'103', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,396,188,377,188,377,169,316,169,316,131,396,131,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '124'
-  $floorItems2['124'] = i
-  w.create(TkcText,356,150, 'text'=>'124', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,397,226,407,226,407,189,377,189,377,246,397,246,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '125'
-  $floorItems2['125'] = i
-  w.create(TkcText,392,217.5, 'text'=>'125', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,399,187,409,187,409,207,474,207,474,164,399,164,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '126'
-  $floorItems2['126'] = i
-  w.create(TkcText,436.5,185.5, 'text'=>'126', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,409,209,409,229,399,229,399,253,
-                     486,253,486,239,474,239,474,209,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '127'
-  $floorItems2['127'] = i
-  w.create(TkcText,436.5,'231', 'text'=>'127', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,501,164,501,174,495,174,495,188,
-                     490,188,490,204,476,204,476,164,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = 'MShower'
-  $floorItems2['MShower'] = i
-  w.create(TkcText,488.5,'184', 'text'=>'MShower', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,497,176,513,176,513,204,492,204,492,190,497,190,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = 'Closet'
-  $floorItems2['Closet'] = i
-  w.create(TkcText,502.5,190, 'text'=>'Closet', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,476,237,476,206,513,206,513,254,488,254,488,237,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = 'WShower'
-  $floorItems2['WShower'] = i
-  w.create(TkcText,494.5,230, 'text'=>'WShower', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,486,131,558,131,558,135,724,135,724,166,
-                     697,166,697,275,553,275,531,254,515,254,
-                     515,174,503,174,503,161,486,161,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '130'
-  $floorItems2['130'] = i
-  w.create(TkcText,638.5,205, 'text'=>'130', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,308,242,339,242,339,248,342,248,
-                     342,246,397,246,397,276,393,276,
-                     393,309,300,309,300,248,308,248,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '102'
-  $floorItems2['102'] = i
-  w.create(TkcText,367.5,278.5, 'text'=>'102', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,397,255,486,255,486,276,397,276,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '128'
-  $floorItems2['128'] = i
-  w.create(TkcText,441.5,265.5, 'text'=>'128', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,510,309,486,309,486,255,530,255,
-                     552,277,561,277,561,325,510,325,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '129'
-  $floorItems2['129'] = i
-  w.create(TkcText,535.5,293, 'text'=>'129', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,696,281,740,281,740,387,642,387,
-                     642,389,561,389,561,277,696,277,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '133'
-  $floorItems2['133'] = i
-  w.create(TkcText,628.5,335, 'text'=>'133', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,742,387,742,281,800,281,800,387,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '132'
-  $floorItems2['132'] = i
-  w.create(TkcText,771,334, 'text'=>'132', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,800,168,800,280,699,280,699,168,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '134'
-  $floorItems2['134'] = i
-  w.create(TkcText,749.5,224, 'text'=>'134', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,726,131,726,166,800,166,800,131,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '135'
-  $floorItems2['135'] = i
-  w.create(TkcText,763,148.5, 'text'=>'135', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,340,360,335,363,331,365,326,366,304,366,
-                     304,312,396,312,396,288,400,288,404,288,
-                     409,290,413,292,418,297,421,302,422,309,
-                     421,318,417,325,411,330,405,332,397,333,
-                     344,333,340,334,336,336,335,338,332,342,
-                     331,347,332,351,334,354,336,357,341,359,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = 'Ramona Stair'
-  $floorItems2['Ramona Stair'] = i
-  w.create(TkcText,368,323, 'text'=>'Ramona Stair', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,30,23,30,5,93,5,98,5,104,7,110,10,116,16,119,20,
-                     122,28,123,32,123,68,220,68,220,87,90,87,90,23,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = 'University Stair'
-  $floorItems2['University Stair'] = i
-  w.create(TkcText,155,77.5, 'text'=>'University Stair', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,282,37,295,40,312,49,323,56,337,70,352,56,
-                     358,48,363,39,365,29,348,25,335,22,321,14,
-                     300,5,283,1,260,0,246,0,242,2,236,4,231,8,
-                     227,13,223,17,221,22,220,34,260,34,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = 'Plaza Stair'
-  $floorItems2['Plaza Stair'] = i
-  w.create(TkcText,317.5,28.5, 'text'=>'Plaza Stair', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,220,34,260,34,282,37,295,40,312,49,
-                     323,56,337,70,350,83,365,94,377,100,
-                     386,104,386,128,220,128,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = 'Plaza Deck'
-  $floorItems2['Plaza Deck'] = i
-  w.create(TkcText,303,81, 'text'=>'Plaza Deck', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,257,336,77,336,6,336,6,301,77,301,77,310,257,310,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '106'
-  $floorItems2['106'] = i
-  w.create(TkcText,131.5,318.5, 'text'=>'106', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  i = TkcPolygon.new(w,146,110,162,110,162,91,130,91,130,115,95,115,
-                     95,128,114,128,114,151,157,151,157,153,112,153,
-                     112,130,97,130,97,168,175,168,175,131,146,131,
-                     'fill'=>'', 'tags'=>['floor1','room'])
-  $floorLabels2[i.id] = '119'
-  $floorItems2['119'] = i
-  w.create(TkcText,143.5,133, 'text'=>'119', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor1','label'])
-  w.create(TkcLine,155,191,155,189, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,155,177,155,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,96,129,96,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,78,169,176,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,176,247,176,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,340,206,307,206, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,340,187,340,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,340,210,340,201, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,340,247,340,224, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,340,241,307,241, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,376,246,376,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,307,247,307,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,376,170,307,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,315,129,315,170, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,147,129,176,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,202,133,176,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,398,129,315,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,258,352,258,387, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,60,387,60,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,0,337,0,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,60,391,0,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,3,114,3,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,258,387,60,387, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,52,237,52,273, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,52,189,52,225, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,52,140,52,177, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,395,306,395,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,531,254,398,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,475,178,475,238, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,502,162,398,162, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,398,129,398,188, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,383,188,376,188, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,408,188,408,194, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,398,227,398,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,408,227,398,227, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,408,222,408,227, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,408,206,408,210, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,408,208,475,208, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,484,278,484,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,484,311,508,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,508,327,508,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,559,327,508,327, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,644,391,559,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,644,389,644,391, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,514,205,475,205, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,496,189,496,187, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,559,129,484,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,484,162,484,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,725,133,559,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,559,129,559,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,725,149,725,167, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,725,129,802,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,802,389,802,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,739,167,802,167, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,396,188,408,188, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,0,337,9,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,58,337,21,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,43,391,43,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,105,337,75,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,91,387,91,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,154,337,117,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,139,387,139,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,227,337,166,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,258,337,251,337, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,258,328,302,328, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,302,355,302,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,395,311,302,311, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,484,278,395,278, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,395,294,395,278, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,473,278,473,275, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,473,256,473,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,533,257,531,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,553,276,551,274, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,698,276,553,276, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,559,391,559,327, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,802,389,644,389, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,741,314,741,389, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,698,280,698,167, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,707,280,698,280, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,802,280,731,280, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,741,280,741,302, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,698,167,727,167, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,725,137,725,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,514,254,514,175, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,496,175,514,175, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,502,175,502,162, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,475,166,475,162, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,496,176,496,175, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,491,189,496,189, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,491,205,491,189, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,487,238,475,238, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,487,240,487,238, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,487,252,487,254, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,315,133,304,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,256,133,280,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,78,247,270,247, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,307,247,294,247, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,214,133,232,133, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,217,247,217,266, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,217,309,217,291, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,217,309,172,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,154,309,148,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,175,300,175,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,151,300,175,300, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,151,247,151,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,78,237,78,265, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,78,286,78,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,106,309,78,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,130,309,125,309, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,99,309,99,247, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,127,299,99,299, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,127,309,127,299, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,155,191,137,191, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,137,169,137,191, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,78,171,78,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,78,190,78,218, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,86,192,86,169, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,86,192,78,192, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,52,301,3,301, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,52,286,52,301, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,52,252,3,252, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,52,203,3,203, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,3,156,52,156, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,8,25,8,114, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,63,114,3,114, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,75,114,97,114, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,108,114,129,114, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,129,114,129,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,52,114,52,128, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,132,89,88,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,88,25,88,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,88,114,88,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,218,89,144,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,147,111,147,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,162,111,147,111, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,162,109,162,111, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,162,96,162,89, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,218,89,218,94, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,218,89,218,119, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,8,25,88,25, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,258,337,258,328, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,113,129,96,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,302,355,258,355, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,386,104,386,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,377,100,386,104, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,365,94,377,100, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,350,83,365,94, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,337,70,350,83, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,337,70,323,56, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,312,49,323,56, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,295,40,312,49, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,282,37,295,40, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,260,34,282,37, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,253,34,260,34, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,386,128,386,104, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,113,152,156,152, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,113,152,156,152, 'fill'=>color, 'tags'=>['floor1','wall'])
-  w.create(TkcLine,113,152,113,129, 'fill'=>color, 'tags'=>['floor1','wall'])
-end
-
-# floor2_fg2 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the foreground information for the second
-# floor (office outlines and numbers).
-#
-# Arguments:
-# w -           The canvas window.
-# color -       Color to use for drawing foreground information.
-
-def floor2_fg2(w,color)
-  i = TkcPolygon.new(w,748,188,755,188,755,205,758,205,758,222,
-                     800,222,800,168,748,168,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '238'
-  $floorItems2['238'] = i
-  w.create(TkcText,774,195, 'text'=>'238', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,726,188,746,188,746,166,800,166,800,131,726,131,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '237'
-  $floorItems2['237'] = i
-  w.create(TkcText,763,148.5, 'text'=>'237', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,497,187,497,204,559,204,559,324,641,324,
-                     643,324,643,291,641,291,641,205,696,205,
-                     696,291,694,291,694,314,715,314,715,291,
-                     715,205,755,205,755,190,724,190,724,187,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '246'
-  $floorItems2['246'] = i
-  w.create(TkcText,600,264, 'text'=>'246', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,694,279,643,279,643,314,694,314,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '247'
-  $floorItems2['247'] = i
-  w.create(TkcText,668.5,296.5, 'text'=>'247', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,232,250,308,250,308,242,339,242,339,246,
-                     397,246,397,255,476,255,476,250,482,250,559,250,
-                     559,274,482,274,482,278,396,278,396,274,232,274,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '202'
-  $floorItems2['202'] = i
-  w.create(TkcText,285.5,260, 'text'=>'202', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,53,228,53,338,176,338,233,338,233,196,
-                     306,196,306,180,175,180,175,169,156,169,
-                     156,196,176,196,176,228,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '206'
-  $floorItems2['206'] = i
-  w.create(TkcText,143,267, 'text'=>'206', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,277,6,277,6,338,51,338,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '212'
-  $floorItems2['212'] = i
-  w.create(TkcText,28.5,307.5, 'text'=>'212', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,557,276,486,276,486,309,510,309,510,325,557,325,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '245'
-  $floorItems2['245'] = i
-  w.create(TkcText,521.5,300.5, 'text'=>'245', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,560,389,599,389,599,326,560,326,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '244'
-  $floorItems2['244'] = i
-  w.create(TkcText,579.5,357.5, 'text'=>'244', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,601,389,601,326,643,326,643,389,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '243'
-  $floorItems2['243'] = i
-  w.create(TkcText,622,357.5, 'text'=>'243', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,688,316,645,316,645,365,688,365,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '242'
-  $floorItems2['242'] = i
-  w.create(TkcText,666.5,340.5, 'text'=>'242', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,802,367,759,367,759,226,802,226,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = 'Barbecue Deck'
-  $floorItems2['Barbecue Deck'] = i
-  w.create(TkcText,780.5,296.5, 'text'=>'Barbecue Deck', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,755,262,755,314,717,314,717,262,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '240'
-  $floorItems2['240'] = i
-  w.create(TkcText,736,288, 'text'=>'240', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,755,316,689,316,689,365,755,365,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '241'
-  $floorItems2['241'] = i
-  w.create(TkcText,722,340.5, 'text'=>'241', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,755,206,717,206,717,261,755,261,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '239'
-  $floorItems2['239'] = i
-  w.create(TkcText,736,233.5, 'text'=>'239', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,695,277,643,277,643,206,695,206,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '248'
-  $floorItems2['248'] = i
-  w.create(TkcText,669,241.5, 'text'=>'248', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,676,135,676,185,724,185,724,135,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '236'
-  $floorItems2['236'] = i
-  w.create(TkcText,700,160, 'text'=>'236', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,675,135,635,135,635,145,628,145,628,185,675,185,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '235'
-  $floorItems2['235'] = i
-  w.create(TkcText,651.5,160, 'text'=>'235', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,626,143,633,143,633,135,572,135,
-                     572,143,579,143,579,185,626,185,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '234'
-  $floorItems2['234'] = i
-  w.create(TkcText,606,160, 'text'=>'234', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,557,135,571,135,571,145,578,145,
-                     578,185,527,185,527,131,557,131,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '233'
-  $floorItems2['233'] = i
-  w.create(TkcText,552.5,158, 'text'=>'233', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,476,249,557,249,557,205,476,205,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '230'
-  $floorItems2['230'] = i
-  w.create(TkcText,516.5,227, 'text'=>'230', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,476,164,486,164,486,131,525,131,525,185,476,185,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '232'
-  $floorItems2['232'] = i
-  w.create(TkcText,500.5,158, 'text'=>'232', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,476,186,495,186,495,204,476,204,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '229'
-  $floorItems2['229'] = i
-  w.create(TkcText,485.5,195, 'text'=>'229', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,474,207,409,207,409,187,399,187,399,164,474,164,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '227'
-  $floorItems2['227'] = i
-  w.create(TkcText,436.5,185.5, 'text'=>'227', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,399,228,399,253,474,253,474,209,409,209,409,228,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '228'
-  $floorItems2['228'] = i
-  w.create(TkcText,436.5,231, 'text'=>'228', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,397,246,397,226,407,226,407,189,377,189,377,246,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '226'
-  $floorItems2['226'] = i
-  w.create(TkcText,392,217.5, 'text'=>'226', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,377,169,316,169,316,131,397,131,397,188,377,188,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '225'
-  $floorItems2['225'] = i
-  w.create(TkcText,356.5,150, 'text'=>'225', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,234,198,306,198,306,249,234,249,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '224'
-  $floorItems2['224'] = i
-  w.create(TkcText,270,223.5, 'text'=>'224', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,270,179,306,179,306,170,314,170,314,135,270,135,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '223'
-  $floorItems2['223'] = i
-  w.create(TkcText,292,157, 'text'=>'223', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,268,179,221,179,221,135,268,135,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '222'
-  $floorItems2['222'] = i
-  w.create(TkcText,244.5,157, 'text'=>'222', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,177,179,219,179,219,135,177,135,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '221'
-  $floorItems2['221'] = i
-  w.create(TkcText,198,157, 'text'=>'221', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,299,327,349,327,349,284,341,284,341,276,299,276,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '204'
-  $floorItems2['204'] = i
-  w.create(TkcText,324,301.5, 'text'=>'204', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,234,276,297,276,297,327,257,327,257,338,234,338,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '205'
-  $floorItems2['205'] = i
-  w.create(TkcText,265.5,307, 'text'=>'205', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,256,385,256,340,212,340,212,385,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '207'
-  $floorItems2['207'] = i
-  w.create(TkcText,234,362.5, 'text'=>'207', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,210,340,164,340,164,385,210,385,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '208'
-  $floorItems2['208'] = i
-  w.create(TkcText,187,362.5, 'text'=>'208', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,115,340,162,340,162,385,115,385,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '209'
-  $floorItems2['209'] = i
-  w.create(TkcText,138.5,362.5, 'text'=>'209', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,89,228,89,156,53,156,53,228,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '217'
-  $floorItems2['217'] = i
-  w.create(TkcText,71,192, 'text'=>'217', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,89,169,97,169,97,190,89,190,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '217A'
-  $floorItems2['217A'] = i
-  w.create(TkcText,93,179.5, 'text'=>'217A', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,89,156,89,168,95,168,95,135,53,135,53,156,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '216'
-  $floorItems2['216'] = i
-  w.create(TkcText,71,145.5, 'text'=>'216', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,179,51,135,6,135,6,179,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '215'
-  $floorItems2['215'] = i
-  w.create(TkcText,28.5,157, 'text'=>'215', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,227,6,227,6,180,51,180,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '214'
-  $floorItems2['214'] = i
-  w.create(TkcText,28.5,203.5, 'text'=>'214', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,51,275,6,275,6,229,51,229,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '213'
-  $floorItems2['213'] = i
-  w.create(TkcText,28.5,252, 'text'=>'213', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,114,340,67,340,67,385,114,385,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '210'
-  $floorItems2['210'] = i
-  w.create(TkcText,90.5,362.5, 'text'=>'210', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,59,389,59,385,65,385,65,340,1,340,1,389,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '211'
-  $floorItems2['211'] = i
-  w.create(TkcText,33,364.5, 'text'=>'211', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,393,309,350,309,350,282,342,282,342,276,393,276,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '203'
-  $floorItems2['203'] = i
-  w.create(TkcText,367.5,292.5, 'text'=>'203', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,99,191,91,191,91,226,174,226,174,198,
-                     154,198,154,192,109,192,109,169,99,169,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '220'
-  $floorItems2['220'] = i
-  w.create(TkcText,132.5,208.5, 'text'=>'220', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = 'Priv Lift2'
-  $floorItems2['Priv Lift2'] = i
-  w.create(TkcText,323,188, 'text'=>'Priv Lift2', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = 'Pub Lift 2'
-  $floorItems2['Pub Lift 2'] = i
-  w.create(TkcText,323,223, 'text'=>'Pub Lift 2', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '218'
-  $floorItems2['218'] = i
-  w.create(TkcText,136,149.5, 'text'=>'218', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '219'
-  $floorItems2['219'] = i
-  w.create(TkcText,132.5,180, 'text'=>'219', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
-                     'fill'=>'', 'tags'=>['floor2','room'])
-  $floorLabels2[i.id] = '201'
-  $floorItems2['201'] = i
-  w.create(TkcText,358,209, 'text'=>'201', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor2','label'])
-  w.create(TkcLine,641,186,678,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,757,350,757,367, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,634,133,634,144, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,634,144,627,144, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,572,133,572,144, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,572,144,579,144, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,398,129,398,162, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,174,197,175,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,175,197,175,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,757,206,757,221, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,396,188,408,188, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,727,189,725,189, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,747,167,802,167, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,747,167,747,189, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,755,189,739,189, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,769,224,757,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,802,224,802,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,802,129,725,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,725,189,725,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,725,186,690,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,676,133,676,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,627,144,627,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,629,186,593,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,579,144,579,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,559,129,559,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,725,133,559,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,484,162,484,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,559,129,484,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,526,129,526,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,540,186,581,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,528,186,523,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,511,186,475,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,496,190,496,186, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,496,205,496,202, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,475,205,527,205, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,558,205,539,205, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,558,205,558,249, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,558,249,475,249, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,662,206,642,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,695,206,675,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,695,278,642,278, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,642,291,642,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,695,291,695,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,716,208,716,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,757,206,716,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,757,221,757,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,793,224,802,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,757,262,716,262, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,716,220,716,264, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,716,315,716,276, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,757,315,703,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,757,325,757,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,757,367,644,367, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,689,367,689,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,647,315,644,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,659,315,691,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,600,325,600,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,627,325,644,325, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,644,391,644,315, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,615,325,575,325, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,644,391,558,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,563,325,558,325, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,558,391,558,314, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,558,327,508,327, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,558,275,484,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,558,302,558,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,508,327,508,311, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,484,311,508,311, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,484,275,484,311, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,475,208,408,208, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,408,206,408,210, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,408,222,408,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,408,227,398,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,398,227,398,254, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,408,188,408,194, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,383,188,376,188, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,398,188,398,162, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,398,162,484,162, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,475,162,475,254, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,398,254,475,254, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,484,280,395,280, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,395,311,395,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,307,197,293,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,278,197,233,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,233,197,233,249, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,307,179,284,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,233,249,278,249, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,269,179,269,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,220,179,220,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,155,191,110,191, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,90,190,98,190, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,98,169,98,190, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,52,133,52,165, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,52,214,52,177, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,52,226,52,262, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,52,274,52,276, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,234,275,234,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,226,339,258,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,211,387,211,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,214,339,177,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,258,387,60,387, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,3,133,3,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,165,339,129,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,117,339,80,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,68,339,59,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,0,339,46,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,60,391,0,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,0,339,0,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,60,387,60,391, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,258,329,258,387, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,350,329,258,329, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,395,311,350,311, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,398,129,315,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,176,133,315,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,176,129,96,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,3,133,96,133, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,66,387,66,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,115,387,115,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,163,387,163,339, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,234,275,276,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,288,275,309,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,298,275,298,329, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,341,283,350,283, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,321,275,341,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,375,275,395,275, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,315,129,315,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,376,170,307,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,307,250,307,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,376,245,376,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,340,241,307,241, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,340,245,340,224, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,340,210,340,201, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,340,187,340,170, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,340,206,307,206, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,293,250,307,250, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,271,179,238,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,226,179,195,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,176,129,176,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,182,179,176,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,174,169,176,169, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,162,169,90,169, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,96,169,96,129, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,175,227,90,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,90,190,90,227, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,52,179,3,179, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,52,228,3,228, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,52,276,3,276, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,155,177,155,169, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,110,191,110,169, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,155,189,155,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,350,283,350,329, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,162,197,155,197, 'fill'=>color, 'tags'=>['floor2','wall'])
-  w.create(TkcLine,341,275,341,283, 'fill'=>color, 'tags'=>['floor2','wall'])
-end
-
-# floor2_fg3 --
-# This method represents part of the floorplan database.  When
-# invoked, it instantiates the foreground information for the third
-# floor (office outlines and numbers).
-#
-# Arguments:
-# w -           The canvas window.
-# color -       Color to use for drawing foreground information.
-
-def floor2_fg3(w,color)
-  i = TkcPolygon.new(w,89,228,89,180,70,180,70,228,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '316'
-  $floorItems2['316'] = i
-  w.create(TkcText,79.5,204, 'text'=>'316', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,115,368,162,368,162,323,115,323,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '309'
-  $floorItems2['309'] = i
-  w.create(TkcText,138.5,345.5, 'text'=>'309', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,164,323,164,368,211,368,211,323,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '308'
-  $floorItems2['308'] = i
-  w.create(TkcText,187.5,345.5, 'text'=>'308', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,256,368,212,368,212,323,256,323,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '307'
-  $floorItems2['307'] = i
-  w.create(TkcText,234,345.5, 'text'=>'307', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,244,276,297,276,297,327,260,327,260,321,244,321,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '305'
-  $floorItems2['305'] = i
-  w.create(TkcText,270.5,301.5, 'text'=>'305', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,251,219,251,203,244,203,244,219,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '324B'
-  $floorItems2['324B'] = i
-  w.create(TkcText,247.5,211, 'text'=>'324B', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,251,249,244,249,244,232,251,232,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '324A'
-  $floorItems2['324A'] = i
-  w.create(TkcText,247.5,240.5, 'text'=>'324A', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,223,135,223,179,177,179,177,135,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '320'
-  $floorItems2['320'] = i
-  w.create(TkcText,200,157, 'text'=>'320', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,114,368,114,323,67,323,67,368,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '310'
-  $floorItems2['310'] = i
-  w.create(TkcText,90.5,345.5, 'text'=>'310', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,23,277,23,321,68,321,68,277,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '312'
-  $floorItems2['312'] = i
-  w.create(TkcText,45.5,299, 'text'=>'312', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,23,229,68,229,68,275,23,275,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '313'
-  $floorItems2['313'] = i
-  w.create(TkcText,45.5,252, 'text'=>'313', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,68,227,23,227,23,180,68,180,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '314'
-  $floorItems2['314'] = i
-  w.create(TkcText,40.5,203.5, 'text'=>'314', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,95,179,95,135,23,135,23,179,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '315'
-  $floorItems2['315'] = i
-  w.create(TkcText,59,157, 'text'=>'315', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,99,226,99,204,91,204,91,226,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '316B'
-  $floorItems2['316B'] = i
-  w.create(TkcText,95,215, 'text'=>'316B', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,91,202,99,202,99,180,91,180,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '316A'
-  $floorItems2['316A'] = i
-  w.create(TkcText,95,191, 'text'=>'316A', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,97,169,109,169,109,192,154,192,154,198,
-                     174,198,174,226,101,226,101,179,97,179,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '319'
-  $floorItems2['319'] = i
-  w.create(TkcText,141.5,209, 'text'=>'319', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,65,368,58,368,58,389,1,389,1,333,23,333,23,323,65,323,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '311'
-  $floorItems2['311'] = i
-  w.create(TkcText,29.5,361, 'text'=>'311', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '318'
-  $floorItems2['318'] = i
-  w.create(TkcText,132.5,180, 'text'=>'318', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '317'
-  $floorItems2['317'] = i
-  w.create(TkcText,136,149.5, 'text'=>'317', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,274,194,274,221,306,221,306,194,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '323'
-  $floorItems2['323'] = i
-  w.create(TkcText,290,207.5, 'text'=>'323', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,306,222,274,222,274,249,306,249,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '325'
-  $floorItems2['325'] = i
-  w.create(TkcText,290,235.5, 'text'=>'325', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,263,179,224,179,224,135,263,135,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '321'
-  $floorItems2['321'] = i
-  w.create(TkcText,243.5,157, 'text'=>'321', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,314,169,306,169,306,192,273,192,
-                     264,181,264,135,314,135,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '322'
-  $floorItems2['322'] = i
-  w.create(TkcText,293.5,163.5, 'text'=>'322', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = 'Pub Lift3'
-  $floorItems2['Pub Lift3'] = i
-  w.create(TkcText,323,223, 'text'=>'Pub Lift3', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = 'Priv Lift3'
-  $floorItems2['Priv Lift3'] = i
-  w.create(TkcText,323,188, 'text'=>'Priv Lift3', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,350,284,376,284,376,276,397,276,397,309,350,309,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '303'
-  $floorItems2['303'] = i
-  w.create(TkcText,373.5,292.5, 'text'=>'303', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,272,203,272,249,252,249,252,230,
-                     244,230,244,221,252,221,252,203,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '324'
-  $floorItems2['324'] = i
-  w.create(TkcText,262,226, 'text'=>'324', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,299,276,299,327,349,327,349,284,341,284,341,276,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '304'
-  $floorItems2['304'] = i
-  w.create(TkcText,324,301.5, 'text'=>'304', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '301'
-  $floorItems2['301'] = i
-  w.create(TkcText,358,209, 'text'=>'301', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,397,246,377,246,377,185,397,185,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '327'
-  $floorItems2['327'] = i
-  w.create(TkcText,387,215.5, 'text'=>'327', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,316,131,316,169,377,169,377,185,397,185,397,131,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '326'
-  $floorItems2['326'] = i
-  w.create(TkcText,365.5,150, 'text'=>'326', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,308,251,242,251,242,274,342,274,342,282,375, 282,
-                     375,274,397,274,397,248,339,248,339,242,308,242,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '302'
-  $floorItems2['302'] = i
-  w.create(TkcText,319.5,261, 'text'=>'302', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  i = TkcPolygon.new(w,70,321,242,321,242,200,259,200,259,203,272,203,
-                     272,193,263,180,242,180,175,180,175,169,156,169,
-                     156,196,177,196,177,228,107,228,70,228,70,275,107,275,
-                     107,248,160,248,160,301,107,301,107,275,70,275,
-                     'fill'=>'', 'tags'=>['floor3','room'])
-  $floorLabels2[i.id] = '306'
-  $floorItems2['306'] = i
-  w.create(TkcText,200.5,284.5, 'text'=>'306', 'fill'=>color,
-              'anchor'=>'c', 'tags'=>['floor3','label'])
-  w.create(TkcLine,341,275,341,283, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,162,197,155,197, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,396,247,399,247, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,399,129,399,311, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,258,202,243,202, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,350,283,350,329, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,251,231,243,231, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,243,220,251,220, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,243,250,243,202, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,155,197,155,190, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,110,192,110,169, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,155,192,110,192, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,155,177,155,169, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,176,197,176,227, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,69,280,69,274, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,21,276,69,276, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,69,262,69,226, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,21,228,69,228, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,21,179,75,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,69,179,69,214, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,90,220,90,227, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,90,204,90,202, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,90,203,100,203, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,90,187,90,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,90,227,176,227, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,100,179,100,227, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,100,179,87,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,96,179,96,129, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,162,169,96,169, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,173,169,176,169, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,182,179,176,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,176,129,176,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,195,179,226,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,224,133,224,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,264,179,264,133, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,238,179,264,179, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,273,207,273,193, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,273,235,273,250, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,273,224,273,219, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,273,193,307,193, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,273,222,307,222, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,273,250,307,250, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,384,247,376,247, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,340,206,307,206, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,340,187,340,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,340,210,340,201, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,340,247,340,224, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,340,241,307,241, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,376,247,376,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,307,250,307,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,376,170,307,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,315,129,315,170, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,376,283,366,283, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,376,283,376,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,399,275,376,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,341,275,320,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,341,283,350,283, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,298,275,298,329, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,308,275,298,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,243,322,243,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,243,275,284,275, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,258,322,226,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,212,370,212,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,214,322,177,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,163,370,163,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,165,322,129,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,84,322,117,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,71,322,64,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,115,322,115,370, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,66,322,66,370, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,52,322,21,322, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,21,331,0,331, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,21,331,21,133, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,96,133,21,133, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,176,129,96,129, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,315,133,176,133, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,315,129,399,129, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,399,311,350,311, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,350,329,258,329, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,258,322,258,370, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,60,370,258,370, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,60,370,60,391, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,0,391,0,331, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,60,391,0,391, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,307,250,307,242, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,273,250,307,250, 'fill'=>color, 'tags'=>['floor3','wall'])
-  w.create(TkcLine,258,250,243,250, 'fill'=>color, 'tags'=>['floor3','wall'])
-end
-
-# Below is the "main program" that creates the floorplan demonstration.
-
-# toplevel widget が存在すれば削除する
-if defined?($floor2_demo) && $floor2_demo
-  $floor2_demo.destroy
-  $floor2_demo = nil
-end
-
-# demo 用の toplevel widget を生成
-$floor2_demo = TkToplevel.new {|w|
-  title("Floorplan Canvas Demonstration 2")
-  iconname("Floorplan2")
-  positionWindow(w)
-  geometry('+20+20')
-  minsize(100,100)
-}
-
-base_frame = TkFrame.new($floor2_demo).pack(:fill=>:both, :expand=>true)
-
-# label 生成
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'8i', 'justify'=>'left',
-            'text'=>"このウィンドウにはディジタルエクイップメント社のウェスタンリサーチラボラトリ (DECWRL) の間取りが書かれたキャンバス widget が入っています。これは 3階建てで、常にそのうちの1階分が選択、つまりその間取りが表示されるようになっています。ある階を選択するには、その上でマウスの左ボタンをクリックしてください。マウスが選択されている階の上を動くと、その下にある部屋の色が変わり、部屋番号が「部屋番号:」エントリに表示されます。また、エントリに部屋番号を書くとその部屋の色が変わります。"){
-  pack('side'=>'top')
-}
-
-# frame 生成
-$floor2_buttons = TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc{
-      tmppath = $floor2_demo
-      $floor2_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc{showCode 'floor2'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$floor2_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# 変数設定
-$floorLabels2 = {}
-$floorItems2 = {}
-
-# canvas 設定
-if $tk_version =~ /^4\.[01]/
-  $floor2_canvas_frame = TkFrame.new(base_frame,'bd'=>2,'relief'=>'sunken',
-                                    'highlightthickness'=>2)
-  $floor2_canvas = TkCanvas.new($floor2_canvas_frame,
-                               'width'=>900, 'height'=>500, 'borderwidth'=>0,
-                               'highlightthickness'=>0) {|c|
-    TkScrollbar.new(base_frame, 'orient'=>'horiz',
-                    'command'=>proc{|*args| c.xview(*args)}){|hs|
-      c.xscrollcommand(proc{|first,last| hs.set first,last})
-      pack('side'=>'bottom', 'fill'=>'x')
-    }
-    TkScrollbar.new(base_frame, 'command'=>proc{|*args| c.yview(*args)}){|vs|
-      c.yscrollcommand(proc{|first,last| vs.set first,last})
-      pack('side'=>'right', 'fill'=>'y')
-    }
-  }
-  $floor2_canvas_frame.pack('side'=>'top','fill'=>'both', 'expand'=>'yes')
-  $floor2_canvas.pack('expand'=>'yes', 'fill'=>'both')
-
-else
-  TkFrame.new(base_frame) {|f|
-    pack('side'=>'top', 'fill'=>'both', 'expand'=>'yes')
-
-    h = TkScrollbar.new(f, 'highlightthickness'=>0, 'orient'=>'horizontal')
-    v = TkScrollbar.new(f, 'highlightthickness'=>0, 'orient'=>'vertical')
-
-    TkFrame.new(f, 'bd'=>2, 'relief'=>'sunken') {|f1|
-      $floor2_canvas = TkCanvas.new(f1, 'width'=>900, 'height'=>500,
-                                   'borderwidth'=>0,
-                                   'highlightthickness'=>0) {
-        xscrollcommand(proc{|first,last| h.set first,last})
-        yscrollcommand(proc{|first,last| v.set first,last})
-        pack('expand'=>'yes', 'fill'=>'both')
-      }
-      grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0,
-           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    }
-
-    v.grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1,
-           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    h.grid('padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0,
-           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-
-    TkGrid.rowconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
-    TkGrid.columnconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
-
-    pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>1)
-
-    v.command(proc{|*args| $floor2_canvas.yview(*args)})
-    h.command(proc{|*args| $floor2_canvas.xview(*args)})
-  }
-end
-
-# Create an entry for displaying and typing in current room.
-
-$currentRoom2 = TkVariable.new
-$floor2_entry = TkEntry.new($floor2_canvas, 'width'=>10, 'relief'=>'sunken',
-                           'bd'=>2, 'textvariable'=>$currentRoom2)
-
-# Choose colors, then fill in the floorplan.
-
-$floor2_colors = {}
-if TkWinfo.depth($floor2_canvas) > 1
-  $floor2_colors['bg1'] = '#a9c1da'
-  $floor2_colors['outline1'] = '#77889a'
-  $floor2_colors['bg2'] = '#9ab0c6'
-  $floor2_colors['outline2'] = '#687786'
-  $floor2_colors['bg3'] = '#8ba0b3'
-  $floor2_colors['outline3'] = '#596673'
-  $floor2_colors['offices'] = 'Black'
-  $floor2_colors['active'] = '#c4d1df'
-else
-  $floor2_colors['bg1'] = 'white'
-  $floor2_colors['outline1'] = 'black'
-  $floor2_colors['bg2'] = 'white'
-  $floor2_colors['outline2'] = 'black'
-  $floor2_colors['bg3'] = 'white'
-  $floor2_colors['outline3'] = 'black'
-  $floor2_colors['offices'] = 'Black'
-  $floor2_colors['active'] = 'black'
-end
-
-$activeFloor2 = ''
-floorDisplay2 $floor2_canvas,3
-
-# Set up event bindings for canvas:
-
-$floor2_canvas.itembind('floor1', '1', proc{floorDisplay2 $floor2_canvas,1})
-$floor2_canvas.itembind('floor2', '1', proc{floorDisplay2 $floor2_canvas,2})
-$floor2_canvas.itembind('floor3', '1', proc{floorDisplay2 $floor2_canvas,3})
-$floor2_canvas.itembind('room', 'Enter', proc{newRoom2 $floor2_canvas})
-$floor2_canvas.itembind('room', 'Leave', proc{$currentRoom2.value = ''})
-$floor2_canvas.bind('2', proc{|x,y| $floor2_canvas.scan_mark x,y}, '%x %y')
-$floor2_canvas.bind('B2-Motion',
-                   proc{|x,y| $floor2_canvas.scan_dragto x,y}, '%x %y')
-$floor2_canvas.bind('Destroy', proc{$currentRoom2.unset})
-$currentRoom2.value = ''
-$currentRoom2.trace('w',proc{roomChanged2 $floor2_canvas})
diff --git a/ext/tk/sample/demos-jp/form.rb b/ext/tk/sample/demos-jp/form.rb
deleted file mode 100644
index 751852cbf7..0000000000
--- a/ext/tk/sample/demos-jp/form.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# form widget demo (called by 'widget')
-#
-
-# toplevel widget が存在すれば削除する
-if defined?($form_demo) && $form_demo
-  $form_demo.destroy
-  $form_demo = nil
-end
-
-# demo 用の toplevel widget を生成
-$form_demo = TkToplevel.new {|w|
-  title("Form Demonstration")
-  iconname("form")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($form_demo).pack(:fill=>:both, :expand=>true)
-
-# label 生成
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "このウィンドウは簡単なフォーム入力用になっていて、さまざまなエントリに入力ができます。タブでエントリの切替えができます。"
-}
-msg.pack('side'=>'top', 'fill'=>'x')
-
-# frame 生成
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc{
-      tmppath = $form_demo
-      $form_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc{showCode 'form'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# entry 生成
-form_data = []
-(1..5).each{|i|
-  f = TkFrame.new(base_frame, 'bd'=>2)
-  e = TkEntry.new(f, 'relief'=>'sunken', 'width'=>40)
-  l = TkLabel.new(f)
-  e.pack('side'=>'right')
-  l.pack('side'=>'left')
-  form_data[i] = {'frame'=>f, 'entry'=>e, 'label'=>l}
-}
-
-# 文字列設定
-form_data[1]['label'].text('名前:')
-form_data[2]['label'].text('住所:')
-form_data[5]['label'].text('電話:')
-
-# pack
-(1..5).each{|i| form_data[i]['frame'].pack('side'=>'top', 'fill'=>'x')}
-
diff --git a/ext/tk/sample/demos-jp/goldberg.rb b/ext/tk/sample/demos-jp/goldberg.rb
deleted file mode 100644
index a5718dae6b..0000000000
--- a/ext/tk/sample/demos-jp/goldberg.rb
+++ /dev/null
@@ -1,2012 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# Ruby/Tk Goldverg demo (called by 'widget')
-#
-# Based on Tcl/Tk8.5a2 widget demos.
-# The following is the original comment of TkGoldberg.tcl.
-#
-#>>##+#################################################################
-#>>#
-#>># TkGoldberg.tcl
-#>># by Keith Vetter, March 13, 2003
-#>>#
-#>># "Man will always find a difficult means to perform a simple task"
-#>># Rube Goldberg
-#>>#
-#>># Reproduced here with permission.
-#>>#
-#>>##+#################################################################
-#>>#
-#>># Keith Vetter 2003-03-21: this started out as a simple little program
-#>># but was so much fun that it grew and grew. So I apologize about the
-#>># size but I just couldn't resist sharing it.
-#>>#
-#>># This is a whizzlet that does a Rube Goldberg type animation, the
-#>># design of which comes from an New Years e-card from IncrediMail.
-#>># That version had nice sound effects which I eschewed. On the other
-#>># hand, that version was in black and white (actually dark blue and
-#>># light blue) and this one is fully colorized.
-#>>#
-#>># One thing I learned from this project is that drawing filled complex
-#>># objects on a canvas is really hard. More often than not I had to
-#>># draw each item twice--once with the desired fill color but no
-#>># outline, and once with no fill but with the outline. Another trick
-#>># is erasing by drawing with the background color. Having a flood fill
-#>># command would have been extremely helpful.
-#>>#
-#>># Two wiki pages were extremely helpful: Drawing rounded rectangles
-#>># which I generalized into Drawing rounded polygons, and regular
-#>># polygons which allowed me to convert ovals and arcs into polygons
-#>># which could then be rotated (see Canvas Rotation). I also wrote
-#>># Named Colors to aid in the color selection.
-#>>#
-#>># I could comment on the code, but it's just 26 state machines with
-#>># lots of canvas create and move calls.
-
-if defined?($goldberg_demo) && $goldberg_demo
-  $goldberg_demo.destroy
-  $goldberg_demo = nil
-end
-
-# demo toplevel widget
-$goldberg_demo = TkToplevel.new {|w|
-  title("Tk Goldberg (demonstration)")
-  iconname("goldberg")
-#  positionWindow(w)
-}
-
-base_frame = TkFrame.new($goldberg_demo).pack(:fill=>:both, :expand=>true)
-
-=begin
-# label
-msg = TkLabel.new($goldberg_demo) {
-  font 'Arial 10'
-  wraplength '4i'
-  justify 'left'
-  text "これは、あなたが自分のアニメーションをいかに入り組んだものにできるかを示すというだけのためのデモです。ボールをクリックすれば物が動き始めます！\n\n\"Man will always find a difficult means to perform a simple task\"\n - Rube Goldberg"
-}
-msg.pack('side'=>'top')
-=end
-
-=begin
-# frame
-TkFrame.new($goldberg_demo) {|frame|
-  TkButton.new(frame) {
-    text '閉じる'
-    command proc{
-      tmppath = $goldberg_demo
-      $goldberg_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc{showCode 'goldberg'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-=end
-
-#########################################
-
-class TkGoldberg_Demo
-  def initialize(parent)
-    @parent = parent
-
-    @S = {}
-    @S['title']   = 'Tk Goldberg'
-    @S['speed']   = TkVariable.new(5)
-    @S['cnt']     = TkVariable.new(0)
-    # @S['message'] = TkVariable.new("\\nWelcome\\nto\\nRuby/Tk")
-    @S['message'] = TkVariable.new("\\n ようこそ！\\nRuby/Tk\\nの\\n世界へ")
-    @S['pause']   = TkVariable.new
-    @S['details'] = TkVariable.new(true)
-
-    @S['mode'] = TkVariable.new(:MSTART, :symbol)
-    #            :MSTART, :MGO, :MPAUSE, :MSSTEP, :MBSTEP, :MDONE, :MDEBUG
-
-    #         0,  1,  2,  3,  4,  5,   6,   7,   8,   9,  10
-    @speed = [1, 10, 20, 50, 80, 100, 150, 200, 300, 400, 500]
-
-    # colors
-    @C = {}
-    @C['fg'] = 'black'
-    # @C['bg'] = 'gray75'
-    @C['bg'] = 'cornflowerblue'
-
-    @C['0'] = 'white';         @C['1a'] = 'darkgreen';   @C['1b'] = 'yellow'
-    @C['2'] = 'red';           @C['3a'] = 'green';       @C['3b'] = 'darkblue'
-    @C['4'] = @C['fg'];        @C['5a'] = 'brown';       @C['5b'] = 'white'
-    @C['6'] = 'magenta';       @C['7'] = 'green';        @C['8'] = @C['fg']
-    @C['9'] = 'blue4';         @C['10a'] = 'white';      @C['10b'] = 'cyan'
-    @C['11a'] = 'yellow';      @C['11b'] = 'mediumblue'; @C['12'] = 'tan2'
-    @C['13a'] = 'yellow';      @C['13b'] = 'red';        @C['14'] = 'white'
-    @C['15a'] = 'green';       @C['15b'] = 'yellow';     @C['16'] = 'gray65'
-    @C['17'] = '#A65353';     @C['18'] = @C['fg'];      @C['19'] = 'gray50'
-    @C['20'] = 'cyan';         @C['21'] = 'gray65';      @C['22'] = @C['20']
-    @C['23a'] = 'blue';        @C['23b'] = 'red';        @C['23c'] = 'yellow'
-    @C['24a'] = 'red';         @C['24b'] = 'white';
-
-    @STEP = TkVariable.new_hash
-    @STEP.default_value_type = :numeric
-
-    @XY = {}
-
-    @XY6 = {
-      '-1'=>[366, 207], '-2'=>[349, 204], '-3'=>[359, 193], '-4'=>[375, 192],
-      '-5'=>[340, 190], '-6'=>[349, 177], '-7'=>[366, 177], '-8'=>[380, 176],
-      '-9'=>[332, 172], '-10'=>[342, 161], '-11'=>[357, 164],
-      '-12'=>[372, 163], '-13'=>[381, 149], '-14'=>[364, 151],
-      '-15'=>[349, 146], '-16'=>[333, 148], '0'=>[357, 219],
-      '1'=>[359, 261], '2'=>[359, 291], '3'=>[359, 318], '4'=>[361, 324],
-      '5'=>[365, 329], '6'=>[367, 334], '7'=>[367, 340], '8'=>[366, 346],
-      '9'=>[364, 350], '10'=>[361, 355], '11'=>[359, 370], '12'=>[359, 391],
-      '13,0'=>[360, 456], '13,1'=>[376, 456], '13,2'=>[346, 456],
-      '13,3'=>[330, 456], '13,4'=>[353, 444], '13,5'=>[368, 443],
-      '13,6'=>[339, 442], '13,7'=>[359, 431], '13,8'=>[380, 437],
-      '13,9'=>[345, 428], '13,10'=>[328, 434], '13,11'=>[373, 424],
-      '13,12'=>[331, 420], '13,13'=>[360, 417], '13,14'=>[345, 412],
-      '13,15'=>[376, 410], '13,16'=>[360, 403]
-    }
-
-    @timer = TkTimer.new(@speed[@S['speed'].numeric]){|timer|
-      timer.set_interval(go)
-    }
-
-    do_display
-    reset
-
-    # Start everything going
-    @timer.start
-  end
-
-  def do_display()
-    @ctrl = TkFrame.new(@parent, :relief=>:ridge, :bd=>2, :padx=>5, :pady=>5)
-    @screen = TkFrame.new(@parent, :bd=>2,
-                         :relief=>:raised).pack(:side=>:left, :fill=>:both,
-                                                :expand=>true)
-
-    @canvas = TkCanvas.new(@parent, :width=>850, :height=>700,
-                          :bg=>@C['bg'], :highlightthickness=>0){
-      scrollregion([0, 0, 1000, 1000]) # Kludge to move everything up
-      yview_moveto(0.05)
-    }.pack(:in=>@screen, :side=>:top, :fill=>:both, :expand=>true)
-
-    @canvas.bind('3'){ @pause.invoke }
-    @canvas.bind('Destroy'){ @timer.stop }
-
-    do_ctrl_frame
-    do_detail_frame
-
-    # msg = TkLabel.new(@parent, :bg=>@C['bg'], :fg=>'white') {
-    msg = Tk::Label.new(@parent, :bg=>@C['bg'], :fg=>'white') {
-      font 'Arial 10'
-      wraplength 600
-      justify 'left'
-      text "これは、あなたが自分のアニメーションをいかに入り組んだものにできるかを示すというだけのためのデモです。ボールをクリックすれば物が動き始めます！\n\"Man will always find a difficult means to perform a simple task\" - Rube Goldberg"
-    }
-    msg.place(:in=>@canvas, :relx=>0, :rely=>0, :anchor=>:nw)
-
-    frame = TkFrame.new(@parent, :bg=>@C['bg'])
-
-    # TkButton.new(frame, :bg=>@C['bg'], :activebackground=>@C['bg']) {
-    Tk::Button.new(frame, :bg=>@C['bg'], :activebackground=>@C['bg']) {
-      text '閉じる'
-      command proc{
-        tmppath = $goldberg_demo
-        $goldberg_demo = nil
-        tmppath.destroy
-      }
-    }.pack('side'=>'left')
-
-    # TkButton.new(frame, :bg=>@C['bg'], :activebackground=>@C['bg']) {
-    Tk::Button.new(frame, :bg=>@C['bg'], :activebackground=>@C['bg']) {
-      text 'コード参照'
-      command proc{showCode 'goldberg'}
-    }.pack('side'=>'left', 'padx'=>5)
-
-    # @show = TkButton.new(frame, :text=>'>>', :command=>proc{show_ctrl},
-    @show = Tk::Button.new(frame, :text=>'>>', :command=>proc{show_ctrl},
-                         :bg=>@C['bg'], :activebackground=>@C['bg'])
-    @show.pack('side'=>'left')
-    frame.place(:in=>@canvas, :relx=>1, :rely=>0, :anchor=>:ne)
-
-    Tk.update
-  end
-
-  def do_ctrl_frame
-    @start = Tk::Button.new(@parent, :text=>'Start', :bd=>6,
-                          :command=>proc{do_button(0)})
-    if font = @start['font']
-      @start.font(font.weight('bold'))
-    end
-
-    @pause = TkCheckbutton.new(@parent, :text=>'Pause', :font=>font,
-                               :command=>proc{do_button(1)}, :relief=>:raised,
-                               :variable=>@S['pause'])
-
-    @step  = TkButton.new(@parent, :text=>'Single Step', :font=>font,
-                          :command=>proc{do_button(2)})
-    @bstep = TkButton.new(@parent, :text=>'Big Step', :font=>font,
-                          :command=>proc{do_button(4)})
-    @reset = TkButton.new(@parent, :text=>'Reset', :font=>font,
-                          :command=>proc{do_button(3)})
-
-    @details = TkFrame.new(@parent, :bd=>2, :relief=>:ridge)
-    @detail = TkCheckbutton.new(@parent, :text=>'Details', :font=>font,
-                               :relief=>:raised, :variable=>@S['details'])
-
-    @msg_entry = TkEntry.new(@parent, :textvariable=>@S['message'],
-                             :justify=>:center)
-    @speed_scale = TkScale.new(@parent, :orient=>:horizontal,
-                               :from=>1, :to=>10, :font=>font,
-                               :variable=>@S['speed'], :bd=>2,
-                               :relief=>:ridge, :showvalue=>false)
-    @about = TkButton.new(@parent, :text=>'About',
-                          :command=>proc{about}, :font=>font)
-
-    Tk.grid(@start, :in=>@ctrl, :row=>0, :sticky=>:ew)
-    @ctrl.grid_rowconfigure(1, :minsize=>10)
-    Tk.grid(@pause, :in=>@ctrl, :row=>2, :sticky=>:ew)
-    Tk.grid(@step,  :in=>@ctrl, :sticky=>:ew)
-    Tk.grid(@bstep, :in=>@ctrl, :sticky=>:ew)
-    Tk.grid(@reset, :in=>@ctrl, :sticky=>:ew)
-    @ctrl.grid_rowconfigure(10, :minsize=>20)
-    Tk.grid(@details, :in=>@ctrl, :row=>11, :sticky=>:ew)
-    Tk.grid(@detail, :in=>@details, :row=>0, :sticky=>:ew)
-    @ctrl.grid_rowconfigure(50, :weight=>1)
-
-    @S['mode'].trace('w', proc{|*args| active_GUI(*args)})
-    @S['details'].trace('w', proc{|*args| active_GUI(*args)})
-    @S['speed'].trace('w', proc{|*args| active_GUI(*args)})
-
-    Tk.grid(@msg_entry, :in=>@ctrl, :row=>98, :sticky=>:ew, :pady=>5)
-    Tk.grid(@speed_scale, :in=>@ctrl, :row=>99, :sticky=>:ew)
-    Tk.grid(@about, :in=>@ctrl, :row=>100, :sticky=>:ew)
-
-    @reset.bind('3'){@S['mode'].value = -1}  # Debugging
-  end
-
-  def do_detail_frame
-    @f_details = TkFrame.new(@details)
-
-    @label = TkLabel.new(@f_details, :textvariable=>@S['cnt'],
-                         :bd=>1, :relief=>:solid, :bg=>'white')
-    Tk.grid(@label, '-', '-', '-', :sticky=>:ew, :row=>0)
-
-    idx = 1
-    loop {
-      break unless respond_to?("move#{idx}")
-      l = TkLabel.new(@f_details, :text=>idx, :anchor=>:e,
-                      :width=>2, :bd=>1, :relief=>:solid, :bg=>'white')
-      @STEP[idx] = 0
-      ll = TkLabel.new(@f_details, :textvariable=>@STEP.ref(idx),
-                       :width=>5, :bd=>1, :relief=>:solid, :bg=>'white')
-      row = (idx + 1)/2
-      col = ((idx + 1) & 1) * 2
-      Tk.grid(l, :sticky=>:ew, :row=>row, :column=>col)
-      Tk.grid(ll, :sticky=>:ew, :row=>row, :column=>(col + 1))
-      idx += 1
-    }
-    @f_details.grid_columnconfigure(1, :weight=>1)
-  end
-
-  def show_ctrl
-    if @ctrl.winfo_mapped?
-      @ctrl.pack_forget
-      @show.text('>>')
-    else
-      @ctrl.pack(:side=>:right, :fill=>:both, :ipady=>5)
-      @show.text('<<')
-    end
-  end
-
-  def draw_all
-    reset_step
-    @canvas.delete(:all)
-    idx = 0
-    loop{
-      m = "draw#{idx}"
-      break unless respond_to?(m)
-      send(m)
-      idx += 1
-    }
-  end
-
-  def active_GUI(var1, var2, op)
-    st = {false=>:disabled, true=>:normal}
-
-    m = @S['mode'].to_sym
-    @S['pause'].value = (m == :MPAUSE)
-    @start.state(st[m != :MGO])
-    @pause.state(st[m != :MSTART && m != :MDONE])
-    @step.state(st[m != :MGO && m != :MDONE])
-    @bstep.state(st[m != :MGO && m != :MDONE])
-    @reset.state(st[m != :MSTART])
-
-    if @S['details'].bool
-      Tk.grid(@f_details, :in=>@details, :row=>2, :sticky=>:ew)
-    else
-      Tk.grid_forget(@f_details)
-    end
-    @speed_scale.label("Speed: #{@S['speed'].value}")
-  end
-
-  def start
-    @S['mode'].value = :MGO
-  end
-
-  def do_button(what)
-    case what
-    when 0  # Start
-      reset if @S['mode'].to_sym == :MDONE
-      @S['mode'].value = :MGO
-
-    when 1  # Pause
-      @S['mode'].value = ((@S['pause'].bool)? :MPAUSE: :MGO)
-
-    when 2  # Step
-      @S['mode'].value = :MSSTEP
-
-    when 3  # Reset
-      reset
-
-    when 4  # Big step
-      @S['mode'].value = :MBSTEP
-    end
-  end
-
-  def go(who = nil)
-    now = Tk::Clock.clicks(:milliseconds)
-    if who  # Start here for debugging
-      @S['active'] = [who]
-      @S['mode'].value = :MGO
-    end
-    return if @S['mode'].to_sym == :MDEBUG  # Debugging
-    # If not paused, do the next move
-    n = next_step if @S['mode'].to_sym != :MPAUSE
-    @S['mode'].value = :MPAUSE if @S['mode'].to_sym == :MSSTEP  # Single step
-    @S['mode'].value = :MSSTEP if @S['mode'].to_sym == :MBSTEP && n  # big step
-    elapsed = Tk::Clock.clicks(:milliseconds) - now
-    delay = @speed[@S['speed'].to_i] - elapsed
-    delay = 1 if delay <= 0
-    return delay
-  end
-
-  def next_step
-    retval = false   # Return value
-
-    if @S['mode'].to_sym != :MSTART && @S['mode'].to_sym != :MDONE
-      @S['cnt'].numeric += 1
-    end
-    alive = []
-    @S['active'].each{|who|
-      who = who.to_i
-      n = send("move#{who}")
-      if (n & 1).nonzero?          # This guy still alive
-        alive << who
-      end
-      if (n & 2).nonzero?          # Next guy is active
-        alive << (who + 1)
-        retval = true
-      end
-      if (n & 4).nonzero?          # End of puzzle flag
-        @S['mode'].value = :MDONE  # Done mode
-        @S['active'] = []          # No more animation
-        return true
-      end
-    }
-    @S['active'] = alive
-    return retval
-  end
-
-  def about
-    msg = "Ruby/Tk Version ::\nby Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)\n\n"
-    msg += "Original Version ::\n"
-    msg += "#{@S['title']}\nby Keith Vetter, March 2003\n(Reproduced by kind permission of the author)\n\n"
-    msg += "Man will always find a difficult means to perform a simple task"
-    msg += "\nRube Goldberg"
-    Tk.messageBox(:message=>msg, :title=>'About')
-  end
-
-  ################################################################
-  #
-  # All the drawing and moving routines
-  #
-
-  # START HERE! banner
-  def draw0
-    color = @C['0']
-    TkcText.new(@canvas,
-                # [579, 119], :text=>'START HERE!',
-                [558, 119], :text=>'ここからスタート！',
-                :fill=>color, :anchor=>:w,
-                :tag=>'I0', :font=>['Times Roman', 12, :italic, :bold])
-    TkcLine.new(@canvas, [719, 119, 763, 119], :tag=>'I0', :fill=>color,
-                :width=>5, :arrow=>:last, :arrowshape=>[18, 18, 5])
-    @canvas.itembind('I0', '1'){ start }
-  end
-
-  def move0(step = nil)
-    step = get_step(0, step)
-
-    if @S['mode'].to_sym != :MSTART    # Start the ball rolling
-      move_abs('I0', [-100, -100])     # Hide the banner
-      return 2
-    end
-
-    pos = [
-      [673, 119], [678, 119], [683, 119], [688, 119],
-      [693, 119], [688, 119], [683, 119], [678, 119]
-    ]
-    step = step % pos.length
-    move_abs('I0', pos[step])
-    return 1
-  end
-
-  # Dropping ball
-  def draw1
-    color = @C['1a']
-    color2 = @C['1b']
-    TkcPolygon.new(@canvas,
-                   [ 844, 133, 800, 133, 800, 346, 820, 346,
-                     820, 168, 844, 168, 844, 133 ],
-                   :width=>3, :fill=>color, :outline=>'')
-    TkcPolygon.new(@canvas,
-                   [ 771, 133, 685, 133, 685, 168, 751, 168,
-                     751, 346, 771, 346, 771, 133 ],
-                   :width=>3, :fill=>color, :outline=>'')
-    TkcOval.new(@canvas, box(812, 122, 9),
-                :tag=>'I1', :fill=>color2, :outline=>'')
-
-    @canvas.itembind('I1', '1'){ start }
-  end
-
-  def move1(step = nil)
-    step = get_step(1, step)
-    pos = [
-      [807, 122], [802, 122], [797, 123], [793, 124], [789, 129], [785, 153],
-      [785, 203], [785, 278, :x], [785, 367], [810, 392], [816, 438],
-      [821, 503], [824, 585, :y], [838, 587], [848, 593], [857, 601],
-      [-100, -100]
-    ]
-    return 0 if step >= pos.length
-    where = pos[step]
-    move_abs('I1', where)
-    move15a if where[2] == :y
-    return 3 if where[2] == :x
-    return 1
-  end
-
-  # Lighting the match
-  def draw2
-    color = @C['2']
-
-    # Fulcrum
-    TkcPolygon.new(@canvas, [750, 369, 740, 392, 760, 392],
-                   :fill=>@C['fg'], :outline=>@C['fg'])
-
-    # Strike box
-    TkcRectangle.new(@canvas, [628, 335, 660, 383],
-                     :fill=>'', :outline=>@C['fg'])
-    (0..2).each{|y|
-      yy = 335 + y*16
-      TkcBitmap.new(@canvas, [628, yy], :bitmap=>'gray25',
-                    :anchor=>:nw, :foreground=>@C['fg'])
-      TkcBitmap.new(@canvas, [644, yy], :bitmap=>'gray25',
-                    :anchor=>:nw, :foreground=>@C['fg'])
-    }
-
-    # Lever
-    TkcLine.new(@canvas, [702, 366, 798, 366],
-                :fill=>@C['fg'], :width=>6, :tag=>'I2_0')
-
-    # R strap
-    TkcLine.new(@canvas, [712, 363, 712, 355],
-                :fill=>@C['fg'], :width=>3, :tag=>'I2_1')
-
-    # L strap
-    TkcLine.new(@canvas, [705, 363, 705, 355],
-                :fill=>@C['fg'], :width=>3, :tag=>'I2_2')
-
-    # Match stick
-    TkcLine.new(@canvas, [679, 356, 679, 360, 717, 360, 717, 356, 679, 356],
-                :fill=>@C['fg'], :width=>3, :tag=>'I2_3')
-
-    # Match head
-    TkcPolygon.new(@canvas,
-                   [ 671, 352, 677.4, 353.9, 680, 358.5, 677.4, 363.1,
-                     671, 365, 664.6, 363.1, 662, 358.5, 664.6, 353.9 ],
-                   :fill=>color, :outline=>color, :tag=>'I2_4')
-  end
-
-  def move2(step = nil)
-    step = get_step(2, step)
-
-    stages = [0, 0, 1, 2, 0, 2, 1, 0, 1, 2, 0, 2, 1]
-    xy = []
-    xy[0] = [
-      686, 333, 692, 323, 682, 316, 674, 309, 671, 295, 668, 307,
-      662, 318, 662, 328, 671, 336
-    ]
-    xy[1] = [
-      687, 331, 698, 322, 703, 295, 680, 320, 668, 297, 663, 311,
-      661, 327, 671, 335
-    ]
-    xy[2] = [
-      686, 331, 704, 322, 688, 300, 678, 283, 678, 283, 674, 298,
-      666, 309, 660, 324, 672, 336
-    ]
-
-    if step >= stages.length
-      @canvas.delete('I2')
-      return 0
-    end
-
-    if step == 0  # Rotate the match
-      beta = 20
-
-      ox, oy = anchor('I2_0', :s)  # Where to pivot
-
-      i = 0
-      until @canvas.find_withtag("I2_#{i}").empty?
-        rotate_item("I2_#{i}", ox, oy, beta)
-        i += 1
-      end
-
-      # For the flame
-      TkcPolygon.new(@canvas, [], :tag=>'I2', :smooth=>true, :fill=>@C['2'])
-
-      return 1
-    end
-    @canvas.coords('I2', xy[stages[step]])
-    return ((step == 7)? 3: 1)
-  end
-
-  # Weight and pulleys
-  def draw3
-    color = @C['3a']
-    color2 = @C['3b']
-
-    xy = [ [602, 296], [577, 174], [518, 174] ]
-    xy.each{|x, y| # 3 Pulleys
-      TkcOval.new(@canvas, box(x, y, 13),
-                  :fill=>color, :outline=>@C['fg'], :width=>3)
-      TkcOval.new(@canvas, box(x, y, 2), :fill=>@C['fg'], :outline=>@C['fg'])
-    }
-
-    # Wall to flame
-    TkcLine.new(@canvas, [750, 309, 670, 309], :tag=>'I3_s',
-                :width=>3, :fill=>@C['fg'], :smooth=>true)
-
-    # Flame to pulley 1
-    TkcLine.new(@canvas, [670, 309, 650, 309], :tag=>'I3_0',
-                :width=>3, :fill=>@C['fg'], :smooth=>true)
-    TkcLine.new(@canvas, [650, 309, 600, 309], :tag=>'I3_1',
-                :width=>3, :fill=>@C['fg'], :smooth=>true)
-
-    # Pulley 1 half way to 2
-    TkcLine.new(@canvas, [589, 296, 589, 235], :tag=>'I3_2',
-                :width=>3, :fill=>@C['fg'])
-
-    # Pulley 1 other half to 2
-    TkcLine.new(@canvas, [589, 235, 589, 174], :width=>3, :fill=>@C['fg'])
-
-    # Across the top
-    TkcLine.new(@canvas, [577, 161, 518, 161], :width=>3, :fill=>@C['fg'])
-
-    # Down to weight
-    TkcLine.new(@canvas, [505, 174, 505, 205], :tag=>'I3_w',
-                :width=>3, :fill=>@C['fg'])
-
-    # Draw the weight as 2 circles, two rectangles and 1 rounded rectangle
-    x1, y1, x2, y2 = [515, 207, 495, 207]
-    TkcOval.new(@canvas, box(x1, y1, 6),
-                :tag=>'I3_', :fill=>color2, :outline=>color2)
-    TkcOval.new(@canvas, box(x2, y2, 6),
-                :tag=>'I3_', :fill=>color2, :outline=>color2)
-    TkcRectangle.new(@canvas, x1, y1 - 6, x2, y2 + 6,
-                     :tag=>'I3_', :fill=>color2, :outline=>color2)
-
-    TkcPolygon.new(@canvas, round_rect([492, 220, 518, 263], 15),
-                   :smooth=>true, :tag=>'I3_', :fill=>color2, :outline=>color2)
-
-    TkcLine.new(@canvas, [500, 217, 511, 217],
-                :tag=>'I3_', :fill=>color2, :width=>10)
-
-    # Bottom weight target
-    TkcLine.new(@canvas, [502, 393, 522, 393, 522, 465],
-                :tag=>'I3__', :fill=>@C['fg'], :joinstyle=>:miter, :width=>10)
-  end
-
-  def move3(step = nil)
-    step = get_step(3, step)
-
-    pos = [ [505, 247], [505, 297], [505, 386.5], [505, 386.5] ]
-    rope = []
-    rope[0] = [750, 309, 729, 301, 711, 324, 690, 300]
-    rope[1] = [750, 309, 737, 292, 736, 335, 717, 315, 712, 320]
-    rope[2] = [750, 309, 737, 309, 740, 343, 736, 351, 725, 340]
-    rope[3] = [750, 309, 738, 321, 746, 345, 742, 356]
-
-    return 0 if step >= pos.length
-
-    @canvas.delete("I3_#{step}")        # Delete part of the rope
-    move_abs('I3_', pos[step])          # Move weight down
-    @canvas.coords('I3_s', rope[step])  # Flapping rope end
-    @canvas.coords('I3_w', [505, 174].concat(pos[step]))
-    if step == 2
-      @canvas.move('I3__', 0, 30)
-      return 2
-    end
-    return 1
-  end
-
-  # Cage and door
-  def draw4
-    color = @C['4']
-    x0, y0, x1, y1 = [527, 356, 611, 464]
-
-    # Horizontal bars
-    y0.step(y1, 12){|y|
-      TkcLine.new(@canvas, [x0, y, x1, y], :fill=>color, :width=>1)
-    }
-
-    # Vertical bars
-    x0.step(x1, 12){|x|
-      TkcLine.new(@canvas, [x, y0, x, y1], :fill=>color, :width=>1)
-    }
-
-    # Swing gate
-    TkcLine.new(@canvas, [518, 464, 518, 428],
-                :tag=>'I4', :fill=>color, :width=>1)
-  end
-
-  def move4(step = nil)
-    step = get_step(4, step)
-
-    angles = [-10, -20, -30, -30]
-    return 0 if step >= angles.length
-
-    rotate_item('I4', 518, 464, angles[step])
-    @canvas.raise('I4')
-
-    return((step == 3)? 3: 1)
-  end
-
-  # Mouse
-  def draw5
-    color  = @C['5a']
-    color2 = @C['5b']
-
-    xy = [377, 248, 410, 248, 410, 465, 518, 465]  # Mouse course
-    xy.concat [518, 428, 451, 428, 451, 212, 377, 212]
-
-    TkcPolygon.new(@canvas, xy, :fill=>color2, :outline=>@C['fg'], :width=>3)
-
-    xy = [
-      534.5, 445.5, 541, 440, 552, 436, 560, 436, 569, 440, 574, 446,
-      575, 452, 574, 454, 566, 456, 554, 456, 545, 456, 537, 454, 530, 452
-    ]
-    TkcPolygon.new(@canvas, xy, :tag=>['I5', 'I5_0'], :fill=>color)
-
-    TkcLine.new(@canvas, [573, 452, 592, 458, 601, 460, 613, 456], # Tail
-                :tag=>['I5', 'I5_1'], :fill=>color, :smooth=>true, :width=>3)
-
-    xy = box(540, 446, 2)   # Eye
-    xy = [540, 444, 541, 445, 541, 447, 540, 448, 538, 447, 538, 445]
-    TkcPolygon.new(@canvas, xy, :tag=>['I5', 'I5_2'], :fill=>@C['bg'],
-                   :outline=>'', :smooth=>true)
-
-    xy = [538, 454, 535, 461] # Front leg
-    TkcLine.new(@canvas, xy, :tag=>['I5', 'I5_3'], :fill=>color, :width=>2)
-
-    xy = [566, 455, 569, 462] # Back leg
-    TkcLine.new(@canvas, xy, :tag=>['I5', 'I5_4'], :fill=>color, :width=>2)
-
-    xy = [544, 455, 545, 460] # 2nd front leg
-    TkcLine.new(@canvas, xy, :tag=>['I5', 'I5_5'], :fill=>color, :width=>2)
-
-    xy = [560, 455, 558, 460] # 2nd back leg
-    TkcLine.new(@canvas, xy, :tag=>['I5', 'I5_6'], :fill=>color, :width=>2)
-  end
-
-  def move5(step = nil)
-    step = get_step(5, step)
-
-    pos = [
-      [553, 452], [533, 452], [513, 452], [493, 452], [473, 452],
-      [463, 442, 30], [445.5, 441.5, 30], [425.5, 434.5, 30], [422, 414],
-      [422, 394], [422, 374], [422, 354], [422, 334], [422, 314], [422, 294],
-      [422, 274, -30], [422, 260.5, -30, :x], [422.5, 248.5, -28], [425, 237]
-    ]
-
-    return 0 if step >= pos.length
-
-    x, y, beta, nxt = pos[step]
-    move_abs('I5', [x, y])
-    if beta
-      ox, oy = centroid('I5_0')
-      (0..6).each{|id| rotate_item("I5_#{id}", ox, oy, beta) }
-    end
-    return 3 if nxt == :x
-    return 1
-  end
-
-  # Dropping gumballs
-  def draw6
-    color = @C['6']
-    xy = [324, 130, 391, 204] # Ball holder
-    xy = round_rect(xy, 10)
-    TkcPolygon.new(@canvas, xy, :smooth=>true,
-                   :outline=>@C['fg'], :width=>3, :fill=>color)
-    xy = [339, 204, 376, 253] # Below the ball holder
-    TkcRectangle.new(@canvas, xy, :outline=>@C['fg'], :width=>3,
-                     :fill=>color, :tag=>'I6c')
-    xy = box(346, 339, 28)
-    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'') # Roter
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>2, :style=>:arc,
-               :start=>80, :extent=>205)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>2, :style=>:arc,
-               :start=>-41, :extent=>85)
-
-    xy = box(346, 339, 15) # Center of rotor
-    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>@C['fg'], :tag=>'I6m')
-    xy = [352, 312, 352, 254, 368, 254, 368, 322] # Top drop to rotor
-    TkcPolygon.new(@canvas, xy, :fill=>color, :outline=>'')
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2)
-
-    xy = [353, 240, 367, 300] # Poke bottom hole
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>'')
-    xy = [341, 190, 375, 210] # Poke another hole
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>'')
-
-    xy = [
-      368, 356, 368, 403, 389, 403, 389, 464, 320, 464, 320, 403,
-      352, 403, 352, 366
-    ]
-    TkcPolygon.new(@canvas, xy, :fill=>color, :outline=>'',
-                   :width=>2) # Below rotor
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2)
-    xy = box(275, 342, 7) # On/off rotor
-    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>@C['fg'])
-    xy = [276, 334, 342, 325] # Fan belt top
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
-    xy = [276, 349, 342, 353] # Fan belt bottom
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
-
-    xy = [337, 212, 337, 247] # What the mouse pushes
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I6_')
-    xy = [392, 212, 392, 247]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I6_')
-    xy = [337, 230, 392, 230]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>7, :tag=>'I6_')
-
-    who = -1 # All the balls
-    colors = %w(red cyan orange green blue darkblue)
-    colors *= 3
-
-    (0..16).each{|i|
-      loc = -i
-      color = colors[i]
-      x, y = @XY6["#{loc}"]
-      TkcOval.new(@canvas, box(x, y, 5),
-                  :fill=>color, :outline=>color, :tag=>"I6_b#{i}")
-    }
-    draw6a(12) # The wheel
-  end
-
-  def draw6a(beta)
-    @canvas.delete('I6_0')
-    ox, oy = [346, 339]
-    (0..3).each{|i|
-      b = beta + i * 45
-      x, y = rotate_c(28, 0, 0, 0, b)
-      xy = [ox + x, oy + y, ox - x, oy - y]
-      TkcLine.new(@canvas, xy, :tag=>'I6_0', :fill=>@C['fg'], :width=>2)
-    }
-  end
-
-  def move6(step = nil)
-    step = get_step(6, step)
-
-    return 0 if step > 62
-
-    if step < 2  # Open gate for balls to drop
-      @canvas.move('I6_', -7, 0)
-      if step == 1  # Poke a hole
-        xy = [348, 226, 365, 240]
-        TkcRectangle.new(@canvas, xy, :fill=>@canvas.itemcget('I6c', :fill),
-                         :outline=>'')
-      end
-      return 1
-    end
-
-    s = step - 1  # Do the gumball drop dance
-    (0..(((s - 1)/3).to_i)).each{|i|
-      tag = "I6_b#{i}"
-      break if @canvas.find_withtag(tag).empty?
-      loc = s - 3*i
-
-      if @XY6["#{loc},#{i}"]
-        move_abs(tag, @XY6["#{loc},#{i}"])
-      elsif @XY6["#{loc}"]
-        move_abs(tag, @XY6["#{loc}"])
-      end
-    }
-    if s % 3 == 1
-      first = (s + 2)/3
-      i = first
-      loop {
-        tag = "I6_b#{i}"
-        break if @canvas.find_withtag(tag).empty?
-        loc = first - i
-        move_abs(tag, @XY6["#{loc}"])
-        i += 1
-      }
-    end
-    if s >= 3  # Rotate the motor
-      idx = s % 3
-      draw6a(12 + s * 15)
-    end
-    return((s == 3)? 3 : 1)
-  end
-
-  # On/off switch
-  def draw7
-    color = @C['7']
-    xy = [198, 306, 277, 374]  # Box
-    TkcRectangle.new(@canvas, xy, :outline=>@C['fg'], :width=>2,
-                     :fill=>color, :tag=>'I7z')
-    @canvas.lower('I7z')
-    xy = [275, 343, 230, 349]
-    TkcLine.new(@canvas, xy, :tag=>'I7', :fill=>@C['fg'], :arrow=>:last,
-                :arrowshape=>[23, 23, 8], :width=>6)
-    xy = [225, 324]  # On button
-    x, y = xy
-    TkcOval.new(@canvas, box(x, y, 3), :fill=>@C['fg'], :outline=>@C['fg'])
-    xy = [218, 323]  # On text
-    font = ['Times Roman', 8]
-    TkcText.new(@canvas, xy, :text=>'on', :anchor=>:e,
-                :fill=>@C['fg'], :font=>font)
-    xy = [225, 350]  # Off button
-    x, y = xy
-    TkcOval.new(@canvas, box(x, y, 3), :fill=>@C['fg'], :outline=>@C['fg'])
-    xy = [218, 349]  # Off text
-    TkcText.new(@canvas, xy, :text=>'off', :anchor=>:e,
-                :fill=>@C['fg'], :font=>font)
-  end
-
-  def move7(step = nil)
-    step = get_step(7, step)
-
-    numsteps = 30
-    return 0 if step > numsteps
-    beta = 30.0 / numsteps
-    rotate_item('I7', 275, 343, beta)
-
-    return((step == numsteps)? 3: 1)
-  end
-
-  # Electricity to the fan
-  def draw8
-    sine([271, 248, 271, 306], 5, 8, :tag=>'I8_s', :fill=>@C['8'], :width=>3)
-  end
-
-  def move8(step = nil)
-    step = get_step(8, step)
-
-    return 0 if step > 3
-    if step == 0
-      sparkle(anchor('I8_s', :s), 'I8')
-      return 1
-    elsif step == 1
-      move_abs('I8', anchor('I8_s', :c))
-    elsif step == 2
-      move_abs('I8', anchor('I8_s', :n))
-    else
-      @canvas.delete('I8')
-    end
-    return((step == 2)? 3: 1)
-  end
-
-  # Fan
-  def draw9
-    color = @C['9']
-    xy = [266, 194, 310, 220]
-    TkcOval.new(@canvas, xy, :outline=>color, :fill=>color)
-    xy = [280, 209, 296, 248]
-    TkcOval.new(@canvas, xy, :outline=>color, :fill=>color)
-    xy = [
-      288, 249, 252, 249, 260, 240, 280, 234,
-      296, 234, 316, 240, 324, 249, 288, 249
-    ]
-    TkcPolygon.new(@canvas, xy, :fill=>color, :smooth=>true)
-
-    xy = [248, 205, 265, 214, 264, 205, 265, 196]  # Spinner
-    TkcPolygon.new(@canvas, xy, :fill=>color)
-
-    xy = [255, 206, 265, 234]  # Fan blades
-    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'],
-                :width=>3, :tag=>'I9_0')
-    xy = [255, 176, 265, 204]
-    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'],
-                :width=>3, :tag=>'I9_0')
-    xy = [255, 206, 265, 220]
-    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'],
-                :width=>1, :tag=>'I9_1')
-    xy = [255, 190, 265, 204]
-    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'],
-                :width=>1, :tag=>'I9_1')
-  end
-
-  def move9(step = nil)
-    step = get_step(9, step)
-
-    if (step & 1).nonzero?
-      @canvas.itemconfigure('I9_0', :width=>4)
-      @canvas.itemconfigure('I9_1', :width=>1)
-      @canvas.lower('I9_1', 'I9_0')
-    else
-      @canvas.itemconfigure('I9_0', :width=>1)
-      @canvas.itemconfigure('I9_1', :width=>4)
-      @canvas.lower('I9_0', 'I9_1')
-    end
-    return 3 if step == 0
-    return 1
-  end
-
-  # Boat
-  def draw10
-    color  = @C['10a']
-    color2 = @C['10b']
-    xy = [191, 230, 233, 230, 233, 178, 191, 178]  # Sail
-    TkcPolygon.new(@canvas, xy, :fill=>color, :width=>3, :outline=>@C['fg'],
-                   :tag=>'I10')
-    xy = box(209, 204, 31)  # Front
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :style=>:pie,
-               :start=>120, :extent=>120, :tag=>'I10')
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
-               :start=>120, :extent=>120, :tag=>'I10')
-    xy = box(249, 204, 31)  # Back
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>3,
-               :style=>:pie, :start=>120, :extent=>120, :tag=>'I10')
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
-               :start=>120, :extent=>120, :tag=>'I10')
-
-    xy = [200, 171, 200, 249]  # Mast
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I10')
-    xy = [159, 234, 182, 234]  # Bow sprit
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I10')
-    xy = [180, 234, 180, 251, 220, 251]  # Hull
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>6, :tag=>'I10')
-
-    xy = [92, 255, 221, 255]  # Waves
-    sine(xy, 2, 25, :fill=>color2, :width=>1, :tag=>'I10w')
-
-    xy = @canvas.coords('I10w')[4..-5]  # Water
-    xy.concat([222, 266, 222, 277, 99, 277])
-    TkcPolygon.new(@canvas, xy, :fill=>color2, :outline=>color2)
-    xy = [222, 266, 222, 277, 97, 277, 97, 266]  # Water bottom
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
-
-    xy = box(239, 262, 17)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
-               :start=>95, :extent=>103)
-    xy = box(76, 266, 21)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
-               :extent=>190)
-  end
-
-  def move10(step = nil)
-    step = get_step(10, step)
-
-    pos = [
-      [195, 212], [193, 212], [190, 212], [186, 212], [181, 212], [176, 212],
-      [171, 212], [166, 212], [161, 212], [156, 212], [151, 212], [147, 212],
-      [142, 212], [137, 212], [132, 212, :x], [127, 212], [121, 212],
-      [116, 212], [111, 212]
-    ]
-
-    return 0 if step >= pos.length
-
-    where = pos[step]
-    move_abs('I10', where)
-
-    return 3 if where[2] == :x
-    return 1
-  end
-
-  # 2nd ball drop
-  def draw11
-    color  = @C['11a']
-    color2 = @C['11b']
-    xy = [23, 264, 55, 591]  # Color the down tube
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>'')
-    xy = box(71, 460, 48)    # Color the outer loop
-    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'')
-
-    xy = [55, 264, 55, 458]  # Top right side
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
-    xy = [55, 504, 55, 591]  # Bottom right side
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
-    xy = box(71, 460, 48)    # Outer loop
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
-               :start=>110, :extent=>-290, :tag=>'I11i')
-    xy = box(71, 460, 16)    # Inner loop
-    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>'',
-                :width=>3, :tag=>'I11i')
-    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>@C['bg'], :width=>3)
-
-    xy = [23, 264, 23, 591]  # Left side
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
-    xy = box(1, 266, 23)     # Top left curve
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3,
-               :style=>:arc, :extent=>90)
-
-    xy = box(75, 235, 9)     # The ball
-    TkcOval.new(@canvas, xy, :fill=>color2, :outline=>'',
-                :width=>3, :tag=>'I11')
-  end
-
-  def move11(step = nil)
-    step = get_step(11, step)
-
-    pos = [
-      [75, 235], [70, 235], [65, 237], [56, 240], [46, 247], [38, 266],
-      [38, 296], [38, 333], [38, 399], [38, 475], [74, 496], [105, 472],
-      [100, 437], [65, 423], [-100, -100], [38, 505], [38, 527, :x], [38, 591]
-    ]
-
-    return 0 if step >= pos.length
-    where = pos[step]
-    move_abs('I11', where)
-    return 3 if where[2] == :x
-    return 1
-  end
-
-  # Hand
-  def draw12
-    xy = [
-      20, 637, 20, 617, 20, 610, 20, 590, 40, 590, 40, 590,
-      60, 590, 60, 610, 60, 610
-    ]
-    xy.concat([60, 610, 65, 620, 60, 631])  # Thumb
-    xy.concat([60, 631, 60, 637, 60, 662, 60, 669, 52, 669,
-                56, 669, 50, 669, 50, 662, 50, 637])
-
-    y0 = 637  # Bumps for fingers
-    y1 = 645
-    50.step(21, -10){|x|
-      x1 = x - 5
-      x2 = x - 10
-      xy << x << y0 << x1 << y1 << x2 << y0
-    }
-    TkcPolygon.new(@canvas, xy, :fill=>@C['12'], :outline=>@C['fg'],
-                   :smooth=>true, :tag=>'I12', :width=>3)
-  end
-
-  def move12(step = nil)
-    step = get_step(12, step)
-
-    pos = [[42.5, 641, :x]]
-    return 0 if step >= pos.length
-    where = pos[step]
-    move_abs('I12', where)
-    return 3 if where[2] == :x
-    return 1
-  end
-
-  # Fax
-  def draw13
-    color = @C['13a']
-    xy = [86, 663, 149, 663, 149, 704, 50, 704, 50, 681, 64, 681, 86, 671]
-    xy2 = [
-      784, 663, 721, 663, 721, 704, 820, 704, 820, 681, 806, 681, 784, 671
-    ]
-    radii = [2, 9, 9, 8, 5, 5, 2]
-
-    round_poly(@canvas, xy, radii, :width=>3,
-               :outline=>@C['fg'], :fill=>color)
-    round_poly(@canvas, xy2, radii, :width=>3,
-               :outline=>@C['fg'], :fill=>color)
-
-    xy = [56, 677]
-    x, y = xy
-    TkcRectangle.new(@canvas, box(x, y, 4), :fill=>'', :outline=>@C['fg'],
-                     :width=>3, :tag=>'I13')
-    xy = [809, 677]
-    x, y = xy
-    TkcRectangle.new(@canvas, box(x, y, 4), :fill=>'', :outline=>@C['fg'],
-                     :width=>3, :tag=>'I13R')
-
-    xy = [112, 687]  # Label
-    TkcText.new(@canvas, xy, :text=>'FAX', :fill=>@C['fg'],
-                :font=>['Times Roman', 12, :bold])
-    xy = [762, 687]
-    TkcText.new(@canvas, xy, :text=>'FAX', :fill=>@C['fg'],
-                :font=>['Times Roman', 12, :bold])
-
-    xy = [138, 663, 148, 636, 178, 636]  # Paper guide
-    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>@C['fg'], :width=>3)
-    xy = [732, 663, 722, 636, 692, 636]
-    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>@C['fg'], :width=>3)
-
-    sine([149, 688, 720, 688], 5, 15,
-         :tag=>'I13_s', :fill=>@C['fg'],  :width=>3)
-  end
-
-  def move13(step = nil)
-    step = get_step(13, step)
-
-    numsteps = 7
-
-    if step == numsteps + 2
-      move_abs('I13_star', [-100, -100])
-      @canvas.itemconfigure('I13R', :fill=>@C['13b'], :width=>2)
-      return 2
-    end
-    if step == 0  # Button down
-      @canvas.delete('I13')
-      sparkle([-100, -100], 'I13_star')  # Create off screen
-      return 1
-    end
-    x0, y0 = anchor('I13_s', :w)
-    x1, y1 = anchor('I13_s', :e)
-    x = x0 + (x1 - x0) * (step - 1) / numsteps.to_f
-    move_abs('I13_star', [x, y0])
-    return 1
-  end
-
-  # Paper in fax
-  def draw14
-    color = @C['14']
-    xy = [102, 661, 113, 632, 130, 618]  # Left paper edge
-    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color,
-                :width=>3, :tag=>'I14L_0')
-    xy = [148, 629, 125, 640, 124, 662]  # Right paper edge
-    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color,
-                :width=>3, :tag=>'I14L_1')
-    draw14a('L')
-
-    xy = [
-      768.0, 662.5, 767.991316225, 662.433786215, 767.926187912, 662.396880171
-    ]
-    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color,
-                :width=>3, :tag=>'I14R_0')
-    @canvas.lower('I14R_0')
-    # NB. these numbers are VERY sensitive, you must start with final size
-    # and shrink down to get the values
-    xy = [
-      745.947897349, 662.428358855, 745.997829056, 662.452239237, 746.0, 662.5
-    ]
-    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color,
-                :width=>3, :tag=>'I14R_1')
-    @canvas.lower('I14R_1')
-  end
-
-  def draw14a(side)
-    color = @C['14']
-    xy = @canvas.coords("I14#{side}_0")
-    xy2 = @canvas.coords("I14#{side}_1")
-    x0, y0, x1, y1, x2, y2 = xy
-    x3, y3, x4, y4, x5, y5 = xy2
-
-    zz = [
-      x0, y0, x0, y0, xy, x2, y2, x2, y2,
-      x3, y3, x3, y3, xy2, x5, y5, x5, y5
-    ].flatten
-    @canvas.delete("I14#{side}")
-    TkcPolygon.new(@canvas, zz, :tag=>"I14#{side}", :smooth=>true,
-                   :fill=>color, :outline=>color, :width=>3)
-    @canvas.lower("I14#{side}")
-  end
-
-  def move14(step = nil)
-    step = get_step(14, step)
-
-    # Paper going down
-    sc = 0.9 - 0.05*step
-    if sc < 0.3
-      @canvas.delete('I14L')
-      return 0
-    end
-
-    ox, oy = @canvas.coords('I14L_0')
-    @canvas.scale('I14L_0', ox, oy, sc, sc)
-    ox, oy = @canvas.coords('I14L_1')[-2..-1]
-    @canvas.scale('I14L_1', ox, oy, sc, sc)
-    draw14a('L')
-
-    # Paper going up
-    sc = 0.35 + 0.05*step
-    sc = 1/sc
-
-    ox, oy = @canvas.coords('I14R_0')
-    @canvas.scale('I14R_0', ox, oy, sc, sc)
-    ox, oy = @canvas.coords('I14R_1')[-2..-1]
-    @canvas.scale('I14R_1', ox, oy, sc, sc)
-    draw14a('R')
-
-    return((step == 10)? 3: 1)
-  end
-
-  # Light beam
-  def draw15
-    color = @C['15a']
-    xy = [824, 599, 824, 585, 820, 585, 829, 585]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I15a')
-    xy = [789, 599, 836, 643]
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>3)
-    xy = [778, 610, 788, 632]
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>3)
-    xy = [766, 617, 776, 625]
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>3)
-
-    xy = [633, 600, 681, 640]
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>3)
-    xy = [635, 567, 657, 599]
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>2)
-    xy = [765, 557, 784, 583]
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>2)
-
-    sine([658, 580, 765, 580], 3, 15,
-         :tag=>'I15_s', :fill=>@C['fg'], :width=>3)
-  end
-
-  def move15a
-    color = @C['15b']
-    @canvas.scale('I15a', 824, 599, 1, 0.3)  # Button down
-    xy = [765, 621, 681, 621]
-    TkcLine.new(@canvas, xy, :dash=>'-', :width=>3, :fill=>color, :tag=>'I15')
-  end
-
-  def move15(step = nil)
-    step = get_step(15, step)
-
-    numsteps = 6
-
-    if step == numsteps + 2
-      move_abs('I15_star', [-100, -100])
-      return 2
-    end
-    if step == 0  # Break the light beam
-      sparkle([-100, -100], 'I15_star')
-      xy = [765, 621, 745, 621]
-      @canvas.coords('I15', xy)
-      return 1
-    end
-    x0, y0 = anchor('I15_s', :w)
-    x1, y1 = anchor('I15_s', :e)
-    x = x0 + (x1 - x0) * (step - 1) / numsteps.to_f
-    move_abs('I15_star', [x, y0])
-    return 1
-  end
-
-  # Bell
-  def draw16
-    color = @C['16']
-    xy = [722, 485, 791, 556]
-    TkcRectangle.new(@canvas, xy, :fill=>'', :outline=>@C['fg'], :width=>3)
-    xy = box(752, 515, 25)  # Bell
-    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'black',
-                :tag=>'I16b', :width=>2)
-    xy = box(752, 515, 5)   # Bell button
-    TkcOval.new(@canvas, xy, :fill=>'black', :outline=>'black', :tag=>'I16b')
-
-    xy = [784, 523, 764, 549]  # Clapper
-    TkcLine.new(@canvas, xy, :width=>3, :tag=>'I16c', :fill=>@C['fg'])
-    xy = box(784, 523, 4)
-    TkcOval.new(@canvas, xy, :fill=>@C['fg'], :outline=>@C['fg'], :tag=>'I16d')
-  end
-
-  def move16(step = nil)
-    step = get_step(16, step)
-
-    # Note: we never stop
-    ox, oy = [760, 553]
-    if (step & 1).nonzero?
-      beta = 12
-      @canvas.move('I16b', 3, 0)
-    else
-      beta = -12
-      @canvas.move('I16b', -3, 0)
-    end
-    rotate_item('I16c', ox, oy, beta)
-    rotate_item('I16d', ox, oy, beta)
-
-    return ((step == 1)? 3: 1)
-  end
-
-  # Cat
-  def draw17
-    color = @C['17']
-
-    xy = [584, 556, 722, 556]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
-    xy = [584, 485, 722, 485]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
-
-    xy = [664, 523, 717, 549]  # Body
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :fill=>color, :width=>3,
-               :style=>:chord, :start=>128, :extent=>260, :tag=>'I17')
-
-    xy = [709, 554, 690, 543]  # Paw
-    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>color,
-                :width=>3, :tag=>'I17')
-    xy = [657, 544, 676, 555]
-    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>color,
-                :width=>3, :tag=>'I17')
-
-    xy = box(660, 535, 15)     # Lower face
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc,
-               :start=>150, :extent=>240, :tag=>'I17_')
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1,
-               :style=>:chord, :start=>150, :extent=>240, :tag=>'I17_')
-    xy = [674, 529, 670, 513, 662, 521, 658, 521, 650, 513, 647, 529]  # Ears
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
-    TkcPolygon.new(@canvas, xy, :fill=>color, :outline=>'', :width=>1,
-                   :tag=>['I17_', 'I17_c'])
-    xy = [652, 542, 628, 539]  # Whiskers
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
-    xy = [652, 543, 632, 545]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
-    xy = [652, 546, 632, 552]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
-
-    xy = [668, 543, 687, 538]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
-                :tag=>['I17_', 'I17_w'])
-    xy = [668, 544, 688, 546]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
-                :tag=>['I17_', 'I17_w'])
-    xy = [668, 547, 688, 553]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
-                :tag=>['I17_', 'I17_w'])
-
-    xy = [649, 530, 654, 538, 659, 530]  # Left eye
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2,
-                :smooth=>true, :tag=>'I17')
-    xy = [671, 530, 666, 538, 661, 530]  # Right eye
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2,
-                :smooth=>true, :tag=>'I17')
-    xy = [655, 543, 660, 551, 665, 543]  # Mouth
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2,
-                :smooth=>true, :tag=>'I17')
-  end
-
-  def move17(step = nil)
-    step = get_step(17, step)
-
-    if step == 0
-      @canvas.delete('I17')  # Delete most of the cat
-      xy = [655, 543, 660, 535, 665, 543]  # Mouth
-      TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
-                  :smooth=>true, :tag=>'I17_')
-      xy = box(654, 530, 4)  # Left eye
-      TkcOval.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :fill=>'',
-                  :tag=>'I17_')
-      xy = box(666, 530, 4)  # Right eye
-      TkcOval.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :fill=>'',
-                  :tag=>'I17_')
-
-      @canvas.move('I17_', 0, -20) # Move face up
-      xy = [652, 528, 652, 554]    # Front leg
-      TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
-      xy = [670, 528, 670, 554]    # 2nd front leg
-      TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
-
-      xy = [ # Body
-        675, 506, 694, 489, 715, 513, 715, 513, 715, 513, 716, 525,
-        716, 525, 716, 525, 706, 530, 695, 530, 679, 535, 668, 527,
-        668, 527, 668, 527, 675, 522, 676, 517, 677, 512
-      ]
-      TkcPolygon.new(@canvas, xy, :fill=>@canvas.itemcget('I17_c', :fill),
-                     :outline=>@C['fg'], :width=>3, :smooth=>true,
-                     :tag=>'I17_')
-      xy = [716, 514, 716, 554]  # Back leg
-      TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
-      xy = [694, 532, 694, 554]  # 2nd back leg
-      TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
-      xy = [715, 514, 718, 506, 719, 495, 716, 488]  # Tail
-      TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
-                  :smooth=>true, :tag=>'I17_')
-
-      @canvas.raise('I17w')       # Make whiskers visible
-      @canvas.move('I17_', -5, 0) # Move away from the wall a bit
-      return 2
-    end
-    return 0
-  end
-
-  # Sling shot
-  def draw18
-    color = @C['18']
-    xy = [721, 506, 627, 506]  # Sling hold
-    TkcLine.new(@canvas, xy, :width=>4, :fill=>@C['fg'], :tag=>'I18')
-
-    xy = [607, 500, 628, 513]  # Sling rock
-    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'', :tag=>'I18a')
-
-    xy = [526, 513, 606, 507, 494, 502]  # Sling band
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>4, :tag=>'I18b')
-    xy = [485, 490, 510, 540, 510, 575, 510, 540, 535, 491]  # Sling
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>6)
-  end
-
-  def move18(step = nil)
-    step = get_step(18, step)
-
-    pos = [
-      [587, 506], [537, 506], [466, 506], [376, 506], [266, 506, :x],
-      [136, 506], [16, 506], [-100, -100]
-    ]
-
-    b = []
-    b[0] = [490, 502, 719, 507, 524, 512]  # Band collapsing
-    b[1] = [
-      491, 503, 524, 557, 563, 505, 559, 496, 546, 506, 551, 525,
-      553, 536, 538, 534, 532, 519, 529, 499
-    ]
-    b[2] = [
-      491, 503, 508, 563, 542, 533, 551, 526, 561, 539, 549, 550, 530, 500
-    ]
-    b[3] = [
-      491, 503, 508, 563, 530, 554, 541, 562, 525, 568, 519, 544, 530, 501
-    ]
-
-    return 0 if step >= pos.length
-
-    if step == 0
-      @canvas.delete('I18')
-      @canvas.itemconfigure('I18b', :smooth=>true)
-    end
-    if b[step]
-      @canvas.coords('I18b', b[step])
-    end
-
-    where = pos[step]
-    move_abs('I18a', where)
-    return 3 if where[2] == :x
-    return 1
-  end
-
-  # Water pipe
-  def draw19
-    color = @C['19']
-    xx = [[249, 181], [155, 118], [86, 55], [22, 0]]
-    xx.each{|x1, x2|
-      TkcRectangle.new(@canvas, x1, 453, x2, 467,
-                       :fill=>color, :outline=>'', :tag=>'I19')
-      TkcLine.new(@canvas, x1, 453, x2, 453,
-                  :fill=>@C['fg'], :width=>1) # Pipe top
-      TkcLine.new(@canvas, x1, 467, x2, 467,
-                  :fill=>@C['fg'], :width=>1) # Pipe bottom
-    }
-    @canvas.raise('I11i')
-
-    xy = box(168, 460, 16)  # Bulge by the joint
-    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'')
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, :style=>:arc,
-               :start=>21, :extent=>136)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, :style=>:arc,
-               :start=>-21, :extent=>-130)
-
-    xy = [249, 447, 255, 473]  # First joint 26x6
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>1)
-
-    xy = box(257, 433, 34)     # Bend up
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1,
-               :style=>:pie, :start=>0, :extent=>-91)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
-               :style=>:arc, :start=>0, :extent=>-90)
-    xy = box(257, 433, 20)
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>1,
-               :style=>:pie, :start=>0, :extent=>-92)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
-               :style=>:arc, :start=>0, :extent=>-90)
-    xy = box(257, 421, 34)     # Bend left
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1,
-               :style=>:pie, :start=>0, :extent=>91)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
-               :style=>:arc, :start=>0, :extent=>90)
-    xy = box(257, 421, 20)
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>1,
-               :style=>:pie, :start=>0, :extent=>90)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
-               :style=>:arc, :start=>0, :extent=>90)
-    xy = box(243, 421, 34)     # Bend down
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1,
-               :style=>:pie, :start=>90, :extent=>90)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
-               :style=>:arc, :start=>90, :extent=>90)
-    xy = box(243, 421, 20)
-    TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>1,
-               :style=>:pie, :start=>90, :extent=>90)
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1,
-               :style=>:arc, :start=>90, :extent=>90)
-
-    xy = [270, 427, 296, 433]  # 2nd joint bottom
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>1)
-    xy = [270, 421, 296, 427]  # 2nd joint top
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>1)
-    xy = [249, 382, 255, 408]  # Third joint right
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>1)
-    xy = [243, 382, 249, 408]  # Third joint left
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>1)
-    xy = [203, 420, 229, 426]  # Last joint
-    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>1)
-
-    xy = box(168, 460, 6)      # Handle joint
-    TkcOval.new(@canvas, xy, :fill=>@C['fg'], :outline=>'', :tag=>'I19a')
-    xy = [168, 460, 168, 512]  # Handle bar
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>5, :tag=>'I19b')
-  end
-
-  def move19(step = nil)
-    step = get_step(19, step)
-
-     angles = [30, 30, 30]
-    return 2 if step == angles.length
-    ox, oy = centroid('I19a')
-    rotate_item('I19b', ox, oy, angles[step])
-
-    return 1
-  end
-
-  # Water pouring
-  def draw20
-    # do nothing
-  end
-
-  def move20(step = nil)
-    step = get_step(20, step)
-
-    pos  = [451, 462, 473, 484, 496, 504, 513, 523, 532]
-    freq  = [20,  40,  40,  40,  40,  40,  40,  40,  40]
-    pos = [
-      [451, 20], [462, 40], [473, 40], [484, 40], [496, 40],
-      [504, 40], [513, 40], [523, 40], [532, 40, :x]
-    ]
-    return 0 if step >= pos.length
-
-    @canvas.delete('I20')
-    where = pos[step]
-    y, f = where
-    h20(y, f)
-    return 3 if where[2] == :x
-    return 1
-  end
-
-  def h20(y, f)
-    color = @C['20']
-    @canvas.delete('I20')
-
-    sine([208, 428, 208, y], 4, f, :tag=>['I20', 'I20s'],
-         :width=>3, :fill=>color, :smooth=>true)
-    TkcLine.new(@canvas, @canvas.coords('I20s'), :width=>3,
-                :fill=>color, :smooth=>1, :tag=>['I20', 'I20a'])
-    TkcLine.new(@canvas, @canvas.coords('I20s'), :width=>3,
-                :fill=>color, :smooth=>1, :tag=>['I20', 'I20b'])
-    @canvas.move('I20a', 8, 0)
-    @canvas.move('I20b', 16, 0)
-  end
-
-  # Bucket
-  def draw21
-    color = @C['21']
-    xy = [217, 451, 244, 490]  # Right handle
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2, :tag=>'I21_a')
-    xy = [201, 467, 182, 490]  # Left handle
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2, :tag=>'I21_a')
-
-    xy = [245, 490, 237, 535]  # Right side
-    xy2 = [189, 535, 181, 490] # Left side
-    TkcPolygon.new(@canvas, xy + xy2, :fill=>color, :outline=>'',
-                   :tag=>['I21', 'I21f'])
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2, :tag=>'I21')
-    TkcLine.new(@canvas, xy2, :fill=>@C['fg'], :width=>2, :tag=>'I21')
-
-    xy = [182, 486, 244, 498]  # Top
-    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'', :width=>2,
-                :tag=>['I21', 'I21f'])
-    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'], :width=>2,
-                :tag=>['I21', 'I21t'])
-    xy = [189, 532, 237, 540]  # Bottom
-    TkcOval.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>2,
-                :tag=>['I21', 'I21b'])
-  end
-
-  def move21(step = nil)
-    step = get_step(21, step)
-
-    numsteps = 30
-    return 0 if step >= numsteps
-
-    x1, y1, x2, y2 = @canvas.coords('I21b')
-    # lx1, ly1, lx2, ly2 = @canvas.coords('I21t')
-    lx1, ly1, lx2, ly2 = [183, 492, 243, 504]
-
-    f = step / numsteps.to_f
-    y2 = y2 - 3
-    xx1 = x1 + (lx1 - x1) * f
-    yy1 = y1 + (ly1 - y1) * f
-    xx2 = x2 + (lx2 - x2) * f
-    yy2 = y2 + (ly2 - y2) * f
-
-    @canvas.itemconfigure('I21b', :fill=>@C['20'])
-    @canvas.delete('I21w')
-    TkcPolygon.new(@canvas, x2, y2, x1, y1, xx1, yy1, xx2, yy1,
-                   :tag=>['I21', 'I21w'], :outline=>'', :fill=>@C['20'])
-    @canvas.lower('I21w', 'I21')
-    @canvas.raise('I21b')
-    @canvas.lower('I21f')
-
-    return((step == numsteps - 1)? 3: 1)
-  end
-
-  # Bucket drop
-  def draw22
-    # do nothing
-  end
-
-  def move22(step = nil)
-    step = get_step(22, step)
-    pos = [[213, 513], [213, 523], [213, 543, :x], [213, 583], [213, 593]]
-
-    @canvas.itemconfigure('I21f', :fill=>@C['22']) if step == 0
-    return 0 if step >= pos.length
-    where = pos[step]
-    move_abs('I21', where)
-    h20(where[1], 40)
-    @canvas.delete('I21_a')  # Delete handles
-
-    return 3 if where[2] == :x
-    return 1
-  end
-
-  # Blow dart
-  def draw23
-    color  = @C['23a']
-    color2 = @C['23b']
-    color3 = @C['23c']
-
-    xy = [185, 623, 253, 650]  # Block
-    TkcRectangle.new(@canvas, xy, :fill=>'black', :outline=>@C['fg'],
-                     :width=>2, :tag=>'I23a')
-    xy = [187, 592, 241, 623]  # Balloon
-    TkcOval.new(@canvas, xy, :outline=>'', :fill=>color, :tag=>'I23b')
-    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :tag=>'I23b',
-               :style=>:arc, :start=>12, :extent=>336)
-    xy = [239, 604, 258, 589, 258, 625, 239, 610]  # Balloon nozzle
-    TkcPolygon.new(@canvas, xy, :outline=>'', :fill=>color, :tag=>'I23b')
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I23b')
-
-    xy = [285, 611, 250, 603]  # Dart body
-    TkcOval.new(@canvas, xy, :fill=>color2, :outline=>@C['fg'],
-                :width=>3, :tag=>'I23d')
-    xy = [249, 596, 249, 618, 264, 607, 249, 596]  # Dart tail
-    TkcPolygon.new(@canvas, xy, :fill=>color3, :outline=>@C['fg'],
-                   :width=>3, :tag=>'I23d')
-    xy = [249, 607, 268, 607]  # Dart detail
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I23d')
-    xy = [285, 607, 305, 607]  # Dart needle
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I23d')
-  end
-
-  def move23(step = nil)
-    step = get_step(23, step)
-
-    pos = [
-      [277, 607], [287, 607], [307, 607, :x], [347, 607], [407, 607],
-      [487, 607], [587, 607], [687, 607], [787, 607], [-100, -100]
-    ]
-
-    return 0 if step >= pos.length
-    if step <= 1
-      ox, oy = anchor('I23a', :n)
-      @canvas.scale('I23b', ox, oy, 0.9, 0.5)
-    end
-    where = pos[step]
-    move_abs('I23d', where)
-
-    return 3 if where[2] == :x
-    return 1
-  end
-
-  # Balloon
-  def draw24
-    color = @C['24a']
-    xy = [366, 518, 462, 665]  # Balloon
-    TkcOval.new(@canvas, xy, :fill=>color, :outline=>@C['fg'],
-                :width=>3, :tag=>'I24')
-    xy = [414, 666, 414, 729]  # String
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I24')
-    xy = [410, 666, 404, 673, 422, 673, 418, 666]  # Nozzle
-    TkcPolygon.new(@canvas, xy, :fill=>color, :outline=>@C['fg'],
-                   :width=>3, :tag=>'I24')
-
-    xy = [387, 567, 390, 549, 404, 542]  # Reflections
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true,
-                :width=>2, :tag=>'I24')
-    xy = [395, 568, 399, 554, 413, 547]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true,
-                :width=>2, :tag=>'I24')
-    xy = [403, 570, 396, 555, 381, 553]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true,
-                :width=>2, :tag=>'I24')
-    xy = [408, 564, 402, 547, 386, 545]
-    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true,
-                :width=>2, :tag=>'I24')
-  end
-
-  def move24(step = nil)
-    step = get_step(24, step)
-
-    return 0 if step > 4
-    return 2 if step == 4
-
-    if step == 0
-      @canvas.delete('I24')  # Exploding balloon
-      xy = [
-        347, 465, 361, 557, 271, 503, 272, 503, 342, 574, 259, 594,
-        259, 593, 362, 626, 320, 737, 320, 740, 398, 691, 436, 738,
-        436, 739, 476, 679, 528, 701, 527, 702, 494, 627, 548, 613,
-        548, 613, 480, 574, 577, 473, 577, 473, 474, 538, 445, 508,
-        431, 441, 431, 440, 400, 502, 347, 465, 347, 465
-      ]
-      TkcPolygon.new(@canvas, xy, :tag=>'I24', :fill=>@C['24b'],
-                     :outline=>@C['24a'], :width=>10, :smooth=>true)
-      msg = Tk.subst(@S['message'].value)
-      TkcText.new(@canvas, centroid('I24'), :text=>msg, :tag=>['I24', 'I24t'],
-                  :justify=>:center, :font=>['Times Roman', 18, :bold])
-      return 1
-    end
-
-    @canvas.itemconfigure('I24t', :font=>['Times Roman', 18 + 6*step, :bold])
-    @canvas.move('I24', 0, -60)
-    ox, oy = centroid('I24')
-    @canvas.scale('I24', ox, oy, 1.25, 1.25)
-    return 1
-  end
-
-  # Displaying the message
-  def move25(step = nil)
-    step = get_step(25, step)
-
-    if step == 0
-      @XY['25'] = Tk::Clock.clicks(:milliseconds)
-      return 1
-    end
-    elapsed = Tk::Clock.clicks(:milliseconds) - @XY['25']
-    return 1 if elapsed < 5000
-    return 2
-  end
-
-  # Collapsing balloon
-  def move26(step = nil)
-    step = get_step(26, step)
-
-    if step >= 3
-      @canvas.delete('I24', 'I26')
-      TkcText.new(@canvas, 430, 735, :anchor=>:s, :tag=>'I26',
-                  #:text=>'click to continue',
-                  :text=>'クリックでリセットします',
-                  :font=>['Times Roman', 20, :bold])
-      @canvas.bind('1', proc{reset})
-      return 4
-    end
-
-    ox, oy = centroid('I24')
-    @canvas.scale('I24', ox, oy, 0.8, 0.8)
-    @canvas.move('I24', 0, 60)
-    @canvas.itemconfigure('I24t', :font=>['Times Roman', 30 - 6*step, :bold])
-    return 1
-  end
-
-  ################################################################
-  #
-  # Helper functions
-  #
-  def box(x, y, r)
-    [x - r, y - r, x + r, y + r]
-  end
-
-  def move_abs(item, xy)
-    x, y = xy
-    ox, oy = centroid(item)
-    dx = x - ox
-    dy = y - oy
-    @canvas.move(item, dx, dy)
-  end
-
-  def rotate_item(item, ox, oy, beta)
-    xy = @canvas.coords(item)
-    xy2 = []
-    0.step(xy.length - 1, 2){|idx|
-      x, y = xy[idx, 2]
-      xy2.concat(rotate_c(x, y, ox, oy, beta))
-    }
-    @canvas.coords(item, xy2)
-  end
-
-  def rotate_c(x, y, ox, oy, beta)
-    # rotates vector (ox,oy)->(x,y) by beta degrees clockwise
-
-    x -= ox    # Shift to origin
-    y -= oy
-
-    beta = beta * Math.atan(1) * 4 / 180.0        # Radians
-    xx = x * Math.cos(beta) - y * Math.sin(beta)  # Rotate
-    yy = x * Math.sin(beta) + y * Math.cos(beta)
-
-    xx += ox  # Shift back
-    yy += oy
-
-    [xx, yy]
-  end
-
-  def reset
-    draw_all
-    @canvas.bind_remove('1')
-    @S['mode'].value = :MSTART
-    @S['active'] = [0]
-  end
-
-  # Each Move## keeps its state info in STEP, this retrieves and increments it
-  def get_step(who, step)
-    if step
-      @STEP[who] = step
-    else
-      if !@STEP.exist?(who) || @STEP[who] == ""
-        @STEP[who] = 0
-      else
-        @STEP[who] += 1
-      end
-    end
-    @STEP[who]
-  end
-
-  def reset_step
-    @S['cnt'].value = 0
-    @STEP.keys.each{|k| @STEP[k] = ''}
-  end
-
-  def sine(xy0, amp, freq, opts = {})
-    x0, y0, x1, y1 = xy0
-    step = 2
-    xy = []
-    if y0 == y1  # Horizontal
-      x0.step(x1, step){|x|
-        beta = (x - x0) * 2 * Math::PI / freq
-        y = y0 + amp * Math.sin(beta)
-        xy << x << y
-      }
-    else
-      y0.step(y1, step){|y|
-        beta = (y - y0) * 2 * Math::PI / freq
-        x = x0 + amp * Math.sin(beta)
-        xy << x << y
-      }
-    end
-    TkcLine.new(@canvas, xy, opts)
-  end
-
-  def round_rect(xy, radius, opts={})
-    x0, y0, x3, y3 = xy
-    r = @canvas.winfo_pixels(radius)
-    d = 2 * r
-
-    # Make sure that the radius of the curve is less than 3/8 size of the box!
-    maxr = 0.75
-    if d > maxr * (x3 - x0)
-      d = maxr * (x3 - x0)
-    end
-    if d > maxr * (y3 - y0)
-      d = maxr * (y3 - y0)
-    end
-
-    x1 = x0 + d
-    x2 = x3 - d
-    y1 = y0 + d
-    y2 = y3 - d
-
-    xy = [x0, y0, x1, y0, x2, y0, x3, y0, x3, y1, x3, y2]
-    xy.concat([x3, y3, x2, y3, x1, y3, x0, y3, x0, y2, x0, y1])
-    return xy
-  end
-
-  def round_poly(canv, xy, radii, opts)
-    lenXY = xy.length
-    lenR = radii.length
-    if lenXY != 2*lenR
-      raise "wrong number of vertices and radii"
-    end
-
-    knots = []
-    x0 = xy[-2]; y0 = xy[-1]
-    x1 = xy[0];  y1 = xy[1]
-    xy << xy[0] << xy[1]
-
-    0.step(lenXY - 1, 2){|i|
-      radius = radii[i/2]
-      r = canv.winfo_pixels(radius)
-
-      x2 = xy[i+2];  y2 = xy[i+3]
-      z = _round_poly2(x0, y0, x1, y1, x2, y2, r)
-      knots.concat(z)
-
-      x0 = x1;  y0 = y1
-      x1 = x2;  y1 = y2
-    }
-    TkcPolygon.new(canv, knots, {:smooth=>true}.update(opts))
-  end
-
-  def _round_poly2(x0, y0, x1, y1, x2, y2, radius)
-    d = 2 * radius
-    maxr = 0.75
-
-    v1x = x0 - x1
-    v1y = y0 - y1
-    v2x = x2 - x1
-    v2y = y2 - y1
-
-    vlen1 = Math.sqrt(v1x*v1x + v1y*v1y)
-    vlen2 = Math.sqrt(v2x*v2x + v2y*v2y)
-
-    if d > maxr * vlen1
-      d = maxr * vlen1
-    end
-    if d > maxr * vlen2
-      d = maxr * vlen2
-    end
-
-    xy = []
-    xy << (x1 + d * v1x / vlen1) << (y1 + d * v1y / vlen1)
-    xy << x1 << y1
-    xy << (x1 + d * v2x / vlen2) << (y1 + d * v2y / vlen2)
-
-    return xy
-  end
-
-  def sparkle(oxy, tag)
-    xy = [
-      [299, 283], [298, 302], [295, 314], [271, 331],
-      [239, 310], [242, 292], [256, 274], [281, 273]
-    ]
-    xy.each{|x, y|
-      TkcLine.new(@canvas, 271, 304, x, y,
-                  :fill=>'white', :width=>3, :tag=>tag)
-    }
-    move_abs(tag, oxy)
-  end
-
-  def centroid(item)
-    anchor(item, :c)
-  end
-
-  def anchor(item, where)
-    x1, y1, x2, y2 = @canvas.bbox(item)
-    case(where)
-    when :n
-      y = y1
-    when :s
-      y = y2
-    else
-      y = (y1 + y2) / 2.0
-    end
-    case(where)
-    when :w
-      x = x1
-    when :e
-      x = x2
-    else
-      x = (x1 + x2) / 2.0
-    end
-    return [x, y]
-  end
-end
-
-TkGoldberg_Demo.new(base_frame)
diff --git a/ext/tk/sample/demos-jp/hello b/ext/tk/sample/demos-jp/hello
deleted file mode 100644
index e942f3d851..0000000000
--- a/ext/tk/sample/demos-jp/hello
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
-require 'tk'
-
-TkButton.new(nil,
-	'text'=>"こんにちは、世界",
-	'command'=>proc{print "こんにちは、世界\n"; exit}
-).pack
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-jp/hscale.rb b/ext/tk/sample/demos-jp/hscale.rb
deleted file mode 100644
index 2d2e11336f..0000000000
--- a/ext/tk/sample/demos-jp/hscale.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-require "tkcanvas"
-
-if defined?($hscale_demo) && $hscale_demo
-  $hscale_demo.destroy
-  $hscale_demo = nil
-end
-
-$hscale_demo = TkToplevel.new {|w|
-  title("Horizontal Scale Demonstration")
-  iconname("hscale")
-}
-positionWindow($hscale_demo)
-
-base_frame = TkFrame.new($hscale_demo).pack(:fill=>:both, :expand=>true)
-
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '3.5i'
-  justify 'left'
-  text "下には矢印が1つと水平なスケールが表示されています。\
-スケール上でマウスボタン1をクリック、またはドラッグすると\
-矢印の長さを変えることができます。"
-}
-msg.pack('side'=>'top')
-
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc {
-      tmppath = $hscale_demo
-      $hscale_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc { showCode 'hscale' }
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-def setWidth(w, width)
-  width = width + 21
-  x2 = width - 30
-  if x2 < 21
-    x2 = 21
-  end
-  w.coords 'poly',20,15,20,35,x2,35,x2,45,width,25,x2,5,x2,15,20,15
-  w.coords 'line',20,15,20,35,x2,35,x2,45,width,25,x2,5,x2,15,20,15
-end
-
-TkFrame.new(base_frame) {|frame|
-  canvas = TkCanvas.new(frame) {|c|
-    width 50
-    height 50
-    bd 0
-    highlightthickness 0
-    TkcPolygon.new(c, '0', '0', '1', '1', '2', '2') {
-      fill 'DeepSkyBlue'
-      tags 'poly'
-    }
-    TkcLine.new(c, '0', '0', '1', '1', '2', '2', '0', '0') {
-      fill 'black'
-      tags 'line'
-    }
-  }.pack('side'=>'top', 'expand'=>'yes', 'anchor'=>'s', 'fill'=>'x', 'padx'=>'15')
-  scale = TkScale.new(frame) {
-    orient 'horizontal'
-    length 284
-    from 0
-    to 250
-    command proc{|value| setWidth(canvas, value)}
-    tickinterval 50
-  }.pack('side'=>'bottom', 'expand'=>'yes', 'anchor'=>'n')
-  scale.set 75
-}.pack('side'=>'top', 'fill'=>'x')
diff --git a/ext/tk/sample/demos-jp/icon.rb b/ext/tk/sample/demos-jp/icon.rb
deleted file mode 100644
index 7bf6d9731b..0000000000
--- a/ext/tk/sample/demos-jp/icon.rb
+++ /dev/null
@@ -1,104 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# iconic button widget demo (called by 'widget')
-#
-
-# toplevel widget が存在すれば削除する
-if defined?($icon_demo) && $icon_demo
-  $icon_demo.destroy
-  $icon_demo = nil
-end
-
-# demo 用の toplevel widget を生成
-$icon_demo = TkToplevel.new {|w|
-  title("Iconic Button Demonstration")
-  iconname("icon")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($icon_demo).pack(:fill=>:both, :expand=>true)
-
-# label 生成
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '5i'
-  justify 'left'
-  text "このウィンドウにはラジオボタンとチェックボタン上にビットマップや画像を表示する 3 つの方法を示しています。左にあるのは2つのラジオボタンで、それぞれが、ビットマップと選択を示すインジケータでできています。中央にあるのは、選択済みかどうかによって異なる画像を表示するチェックボタンです。右側にあるのは選択済みかどうかによって背景色が変わるビットマップを表示するチェックボタンです。"
-}
-msg.pack('side'=>'top')
-
-# frame 生成
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc{
-      tmppath = $icon_demo
-      $icon_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc{showCode 'icon'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# image 生成
-flagup = \
-TkBitmapImage.new('file'=>[$demo_dir,'..',
-                           'images','flagup.xbm'].join(File::Separator),
-                  'maskfile'=>\
-                  [$demo_dir,'..','images','flagup.xbm'].join(File::Separator))
-flagdown = \
-TkBitmapImage.new('file'=>[$demo_dir,'..',
-                           'images','flagdown.xbm'].join(File::Separator),
-                  'maskfile'=>\
-                  [$demo_dir,'..',
-                    'images','flagdown.xbm'].join(File::Separator))
-
-# 変数生成
-letters = TkVariable.new
-
-# frame 生成
-TkFrame.new(base_frame, 'borderwidth'=>10){|w|
-  TkFrame.new(w) {|f|
-    # TkRadioButton.new(f){
-    Tk::RadioButton.new(f){
-      bitmap '@' + [$demo_dir,'..',
-                     'images','letters.xbm'].join(File::Separator)
-      variable letters
-      value 'full'
-    }.pack('side'=>'top', 'expand'=>'yes')
-
-    # TkRadioButton.new(f){
-    Tk::RadioButton.new(f){
-      bitmap '@' + [$demo_dir,'..',
-                     'images','noletter.xbm'].join(File::Separator)
-      variable letters
-      value 'empty'
-    }.pack('side'=>'top', 'expand'=>'yes')
-
-  }.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'5m')
-
-  # TkCheckButton.new(w) {
-  Tk::CheckButton.new(w) {
-    image flagdown
-    selectimage flagup
-    indicatoron 0
-    selectcolor self['background']
-  }.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'5m')
-
-  # TkCheckButton.new(w) {
-  Tk::CheckButton.new(w) {
-    bitmap '@' + [$demo_dir,'..',
-                   'images','letters.xbm'].join(File::Separator)
-    indicatoron 0
-    selectcolor 'SeaGreen1'
-  }.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'5m')
-
-}.pack('side'=>'top')
-
diff --git a/ext/tk/sample/demos-jp/image1.rb b/ext/tk/sample/demos-jp/image1.rb
deleted file mode 100644
index e07f1d3afc..0000000000
--- a/ext/tk/sample/demos-jp/image1.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# two image widgets demo (called by 'widget')
-#
-
-# toplevel widget が存在すれば削除する
-if defined?($image1_demo) && $image1_demo
-  $image1_demo.destroy
-  $image1_demo = nil
-end
-
-# demo 用の toplevel widget を生成
-$image1_demo = TkToplevel.new {|w|
-  title('Image Demonstration #1')
-  iconname("Image1")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($image1_demo).pack(:fill=>:both, :expand=>true)
-
-# label 生成
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "このデモでは2つのラベル上に画像をそれぞれ表示しています。"
-}
-msg.pack('side'=>'top')
-
-# frame 生成
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc{
-      tmppath = $image1_demo
-      $image1_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc{showCode 'image1'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# image 生成
-image1a = \
-TkPhotoImage.new('file'=>[$demo_dir,'..',
-                          'images','earth.gif'].join(File::Separator))
-image1b = \
-TkPhotoImage.new('file'=>[$demo_dir,'..',
-                          'images','earthris.gif'].join(File::Separator))
-
-# label 生成
-#[ TkLabel.new(base_frame, 'image'=>image1a, 'bd'=>1, 'relief'=>'sunken'),
-#  TkLabel.new(base_frame, 'image'=>image1b, 'bd'=>1, 'relief'=>'sunken')
-#].each{|w| w.pack('side'=>'top', 'padx'=>'.5m', 'pady'=>'.5m')}
-[ Tk::Label.new(base_frame, 'image'=>image1a, 'bd'=>1, 'relief'=>'sunken'),
-  Tk::Label.new(base_frame, 'image'=>image1b, 'bd'=>1, 'relief'=>'sunken')
-].each{|w| w.pack('side'=>'top', 'padx'=>'.5m', 'pady'=>'.5m')}
-
diff --git a/ext/tk/sample/demos-jp/image2.rb b/ext/tk/sample/demos-jp/image2.rb
deleted file mode 100644
index 312ec41f2a..0000000000
--- a/ext/tk/sample/demos-jp/image2.rb
+++ /dev/null
@@ -1,107 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# widget demo 'load image' (called by 'widget')
-#
-
-# toplevel widget が存在すれば削除する
-if defined?($image2_demo) && $image2_demo
-  $image2_demo.destroy
-  $image2_demo = nil
-end
-
-# demo 用の toplevel widget を生成
-$image2_demo = TkToplevel.new {|w|
-  title('Image Demonstration #2')
-  iconname("Image2")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($image2_demo).pack(:fill=>:both, :expand=>true)
-
-# label 生成
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "このデモではTkの photo image を使用して画像を見ることができます。最初にエントリ内ににディレクトリ名を入れて下さい。次に下のリストボックスにこのディレクトリをロードするため、リターンを押してください。その後、画像を選択するためにリストボックスの中のファイル名をダブルクリックして下さい。"
-}
-msg.pack('side'=>'top')
-
-# frame 生成
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc{
-      tmppath = $image2_demo
-      $image2_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc{showCode 'image2'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# 変数生成
-$dirName = TkVariable.new([$demo_dir,'..','images'].join(File::Separator))
-
-# image 生成
-$image2a = TkPhotoImage.new
-
-# ファイル名入力部
-TkLabel.new(base_frame, 'text'=>'ディレクトリ:')\
-.pack('side'=>'top', 'anchor'=>'w')
-
-image2_e = TkEntry.new(base_frame) {
-  width 30
-  textvariable $dirName
-}.pack('side'=>'top', 'anchor'=>'w')
-
-TkFrame.new(base_frame, 'height'=>'3m', 'width'=>20)\
-.pack('side'=>'top', 'anchor'=>'w')
-
-TkLabel.new(base_frame, 'text'=>'ファイル:')\
-.pack('side'=>'top', 'anchor'=>'w')
-
-TkFrame.new(base_frame){|w|
-  s = TkScrollbar.new(w)
-  l = TkListbox.new(w) {
-    width 20
-    height 10
-    yscrollcommand proc{|first,last| s.set first,last}
-  }
-  s.command(proc{|*args| l.yview(*args)})
-  l.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y')
-  s.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y')
-  #l.insert(0,'earth.gif', 'earthris.gif', 'mickey.gif', 'teapot.ppm')
-  l.insert(0,'earth.gif', 'earthris.gif', 'teapot.ppm')
-  l.bind('Double-1', proc{|x,y| loadImage $image2a,l,x,y}, '%x %y')
-
-  image2_e.bind 'Return', proc{loadDir l}
-
-}.pack('side'=>'top', 'anchor'=>'w')
-
-# image 配置
-[ TkFrame.new(base_frame, 'height'=>'3m', 'width'=>20),
-  TkLabel.new(base_frame, 'text'=>'画像:'),
-  # TkLabel.new(base_frame, 'image'=>$image2a)
-  Tk::Label.new(base_frame, 'image'=>$image2a)
-].each{|w| w.pack('side'=>'top', 'anchor'=>'w')}
-
-# メソッド定義
-def loadDir(w)
-  w.delete(0,'end')
-  Dir.glob([$dirName,'*'].join(File::Separator)).sort.each{|f|
-    w.insert('end',File.basename(f))
-  }
-end
-
-def loadImage(img,w,x,y)
-  img.file([$dirName, w.get("@#{x},#{y}")].join(File::Separator))
-end
-
diff --git a/ext/tk/sample/demos-jp/image3.rb b/ext/tk/sample/demos-jp/image3.rb
deleted file mode 100644
index e5bb1846c9..0000000000
--- a/ext/tk/sample/demos-jp/image3.rb
+++ /dev/null
@@ -1,128 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-# image3.rb
-#
-# This demonstration script creates a simple collection of widgets
-# that allow you to select and view images in a Tk label.
-#
-# widget demo 'load image' (called by 'widget')
-#
-
-# toplevel widget
-if defined?($image3_demo) && $image3_demo
-  $image3_demo.destroy
-  $image3_demo = nil
-end
-
-# demo toplevel widget
-$image3_demo = TkToplevel.new {|w|
-  title('Image Demonstration #3')
-  iconname("Image3")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($image3_demo).pack(:fill=>:both, :expand=>true)
-
-#
-def loadDir3(w)
-  w.delete(0,'end')
-  Dir.glob([$dirName,'*'].join(File::Separator)).sort.each{|f|
-    w.insert('end',File.basename(f))
-  }
-end
-
-# selectAndLoadDir3 --
-# This procedure pops up a dialog to ask for a directory to load into
-# the listbox and (if the user presses OK) reloads the directory
-# listbox from the directory named in the demo's entry.
-#
-# Arguments:
-# w -                   Name of the toplevel window of the demo.
-def selectAndLoadDir3(w, lbox)
-  dir = Tk.chooseDirectory(:initialdir=>$dirName.value,
-                           :parent=>w, :mustexist=>true)
-  if dir.length > 0
-    $dirName.value = dir
-    loadDir3(lbox)
-  end
-end
-
-def loadImage3(w,x,y)
-  $image3a.file([$dirName, w.get("@#{x},#{y}")].join(File::Separator))
-end
-
-
-# label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "このデモではTkの photo image を使用して画像を 見ることができます。最初にエントリ内ににディレクトリ名を入れて下さい。次に下のリストボックスにこのディレクトリをロードするため、リターンを押してください。その後、画像を選択するためにリストボックスの中のファイル名をダブルクリックして下さい。"
-}
-msg.pack('side'=>'top')
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc{
-      tmppath = $image3_demo
-      $image3_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc{showCode 'image3'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# variable
-$dirName = TkVariable.new([$demo_dir,'..','images'].join(File::Separator))
-
-# image
-begin
-  $image3a.delete
-rescue
-end
-$image3a = TkPhotoImage.new
-
-#
-image3_f = TkFrame.new(base_frame).pack(:fill=>:both, :expand=>true)
-
-image3_df = TkLabelFrame.new(base_frame, :text=>'ディレクトリ:')
-
-image3_ff = TkLabelFrame.new(base_frame, :text=>'ファイル:',
-                             :padx=>'2m', :pady=>'2m')
-image3_lbx = TkListbox.new(image3_ff, :width=>20, :height=>10) {
-  pack(:side=>:left, :fill=>:y, :expand=>true)
-  yscrollbar(TkScrollbar.new(image3_ff).pack(:side=>:left, :fill=>:y,
-                                             :expand=>true))
-  insert(0, *(%w(earth.gif earthris.gif teapot.ppm)))
-  bind('Double-1', proc{|x,y| loadImage3(self, x, y)}, '%x %y')
-}
-
-image3_ent = TkEntry.new(image3_df, :width=>30, :textvariable=>$dirName){
-  pack(:side=>:left, :fill=>:both, :padx=>'2m', :pady=>'2m', :expand=>true)
-  bind('Return', proc{loadDir3(image3_lbx)})
-}
-
-TkButton.new(image3_df, :pady=>0, :padx=>'2m', :text=>"ディレクトリ選択",
-             :command=>proc{selectAndLoadDir3(image3_ent, image3_lbx)}) {
-  pack(:side=>:left, :fill=>:y, :padx=>[0, '2m'], :pady=>'2m')
-}
-
-image3_if = TkLabelFrame.new(base_frame, :text=>'イメージ:') {|f|
-  # TkLabel.new(f, :image=>$image3a).pack(:padx=>'2m', :pady=>'2m')
-  Tk::Label.new(f, :image=>$image3a).pack(:padx=>'2m', :pady=>'2m')
-}
-
-Tk.grid(image3_df,  '-',
-        :sticky=>:ew, :padx=>'1m', :pady=>'1m', :in=>image3_f)
-Tk.grid(image3_ff, image3_if,
-        :sticky=>:nw, :padx=>'1m', :pady=>'1m', :in=>image3_f)
-TkGrid.columnconfigure(image3_f, 1, :weight=>1)
-
diff --git a/ext/tk/sample/demos-jp/items.rb b/ext/tk/sample/demos-jp/items.rb
deleted file mode 100644
index 9fef0bedda..0000000000
--- a/ext/tk/sample/demos-jp/items.rb
+++ /dev/null
@@ -1,380 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# canvas item types widget demo (called by 'widget')
-#
-
-# toplevel widget が存在すれば削除する
-if defined?($items_demo) && $items_demo
-  $items_demo.destroy
-  $items_demo = nil
-end
-
-# demo 用の toplevel widget を生成
-$items_demo = TkToplevel.new {|w|
-  title("Canvas Item Demonstration")
-  iconname("Items")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($items_demo).pack(:fill=>:both, :expand=>true)
-
-# label 生成
-TkLabel.new(base_frame) {
-  font $font
-  wraplength '5i'
-  justify 'left'
-  text "このウィンドウにはキャンバス widget が入っており、その中にはキャンバス widget がサポートする様々なタイプのアイテムの例が入っています。次のような操作ができます。\n  ボタン-1 ドラッグ:\tアイテムを動かす。\n  ボタン-2 ドラッグ:\t見えている部分をずらす。\n  ボタン-3 ドラッグ:\t領域を囲う。\n  コントロール-F:\t領域の下のアイテムを表示する。"
-}.pack('side'=>'top')
-
-# frame 生成
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc{
-      tmppath = $items_demo
-      $items_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc{showCode 'items'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame 生成
-cvs = nil
-TkFrame.new(base_frame) {|cf|
-  # canvas 生成
-  cvs = TkCanvas.new(cf) {|c|
-    focus
-    scrollregion '0c 0c 30c 24c'
-    width  '15c'
-    height '10c'
-    relief 'sunken'
-    borderwidth 2
-
-    hs = TkScrollbar.new(cf) {|s|
-      orient 'horizontal'
-      command proc{|*args| c.xview(*args)}
-      c.xscrollcommand proc{|first,last| s.set first,last}
-    }
-
-    vs = TkScrollbar.new(cf) {|s|
-      command proc{|*args| c.yview(*args)}
-      c.yscrollcommand proc{|first,last| s.set first,last}
-    }
-
-    if $tk_version =~ /^4\.[01]/
-      hs.pack('side'=>'bottom', 'fill'=>'x')
-      vs.pack('side'=>'right', 'fill'=>'y')
-      c.pack('in'=>cf, 'expand'=>'yes', 'fill'=>'both')
-
-    else
-      c.grid('in'=>cf, 'row'=>0, 'column'=>0,
-             'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-      vs.grid('row'=>0, 'column'=>1,
-              'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-      hs.grid('row'=>1, 'column'=>0,
-              'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-      TkGrid.rowconfigure(cf, 0, 'weight'=>1, 'minsize'=>0)
-      TkGrid.columnconfigure(cf, 0, 'weight'=>1, 'minsize'=>0)
-
-    end
-
-  }
-}.pack('side'=>'top', 'fill'=>'both', 'expand'=>'yes')
-
-# Display a 3x3 rectangular grid
-TkcRectangle.new(cvs, '0c', '0c', '30c', '24c', 'width'=>2)
-TkcLine.new(cvs, '0c', '8c', '30c', '8c', 'width'=>2)
-TkcLine.new(cvs, '0c', '16c', '30c', '16c', 'width'=>2)
-TkcLine.new(cvs, '10c', '0c', '10c', '24c', 'width'=>2)
-TkcLine.new(cvs, '20c', '0c', '20c', '24c', 'width'=>2)
-
-if $tk_version =~ /^4.*/
-  font1 = '-Adobe-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*'
-  font2 = '-Adobe-Helvetica-Bold-R-Normal--*-240-*-*-*-*-*-*'
-else
-  font1 = 'Helvetica 12'
-  font2 = 'Helvetica 24 bold'
-end
-if TkWinfo.depth($root).to_i > 1
-  blue   = 'DeepSkyBlue3'
-  red    = 'red'
-  bisque = 'bisque3'
-  green  = 'SeaGreen3'
-else
-  blue   = 'black'
-  red    = 'black'
-  bisque = 'black'
-  green  = 'black'
-end
-
-# tag オブジェクトを生成
-$tag_item = TkcGroup.new(cvs)
-
-# Set up demos within each of the areas of the grid.
-TkcText.new(cvs, '5c', '.2c', 'text'=>'ライン', 'anchor'=>'n')
-TkcLine.new(cvs, '1c', '1c', '3c', '1c', '1c', '4c', '3c', '4c',
-            'width'=>2, 'fill'=>blue, 'capstyle'=>'butt',
-            'join'=>'miter', 'tags'=>$tag_item )
-TkcLine.new(cvs, '4.67c','1c','4.67c','4c', 'arrow'=>'last', 'tags'=>$tag_item)
-TkcLine.new(cvs, '6.33c','1c','6.33c','4c', 'arrow'=>'both', 'tags'=>$tag_item)
-TkcLine.new(cvs, '5c','6c','9c','6c','9c','1c','8c','1c','8c','4.8c','8.8c',
-            '4.8c','8.8c','1.2c','8.2c','1.2c','8.2c','4.6c','8.6c','4.6c',
-            '8.6c','1.4c','8.4c','1.4c','8.4c','4.4c',
-            'width'=>3, 'fill'=>red, 'tags'=>$tag_item )
-TkcLine.new(cvs, '1c','5c','7c','5c','7c','7c','9c','7c', 'width'=>'.5c',
-            'stipple'=>'@'+[$demo_dir,'..',
-                            'images','gray25.xbm'].join(File::Separator),
-            'arrow'=>'both', 'arrowshape'=>'15 15 7', 'tags'=>$tag_item )
-TkcLine.new(cvs, '1c','7c','1.75c','5.8c','2.5c','7c','3.25c','5.8c','4c','7c',
-            'width'=>'.5c', 'capstyle'=>'round', 'join'=>'round',
-            'tags'=>$tag_item )
-
-TkcText.new(cvs, '15c', '.2c',
-            'text'=>'曲線 (滑らかにつないだ直線)', 'anchor'=>'n')
-TkcLine.new(cvs, '11c','4c','11.5c','1c','13.5c','1c','14c','4c',
-            'smooth'=>'on', 'fill'=>blue, 'tags'=>$tag_item )
-TkcLine.new(cvs, '15.5c','1c','19.5c','1.5c','15.5c','4.5c','19.5c','4c',
-            'smooth'=>'on', 'arrow'=>'both', 'width'=>3, 'tags'=>$tag_item )
-TkcLine.new(cvs, '12c','6c','13.5c','4.5c','16.5c','7.5c','18c','6c',
-            '16.5c','4.5c','13.5c','7.5c','12c','6c',
-            'smooth'=>'on', 'width'=>'3m', 'capstyle'=>'round',
-            'stipple'=>'@'+[$demo_dir, '..',
-                            'images', 'gray25.xbm'].join(File::Separator),
-            'fill'=>red, 'tags'=>$tag_item )
-
-TkcText.new(cvs, '25c', '.2c', 'text'=>'多角形', 'anchor'=>'n')
-TkcPolygon.new(cvs, '21c','1.0c','22.5c','1.75c','24c','1.0c','23.25c','2.5c',
-               '24c','4.0c','22.5c','3.25c','21c','4.0c','21.75c','2.5c',
-               'fill'=>'green', 'outline'=>'black', 'width'=>4,
-               'tags'=>$tag_item )
-TkcPolygon.new(cvs, '25c','4c','25c','4c','25c','1c','26c','1c','27c','4c',
-               '28c','1c','29c','1c','29c','4c','29c','4c',
-               'fill'=>red, 'smooth'=>'on', 'tags'=> $tag_item)
-TkcPolygon.new(cvs, '22c','4.5c','25c','4.5c','25c','6.75c','28c','6.75c',
-               '28c','5.25c','24c','5.25c','24c','6.0c','26c','6c','26c',
-               '7.5c','22c','7.5c',
-               'stipple'=>'@' + [$demo_dir, '..',
-                                 'images', 'gray25.xbm'].join(File::Separator),
-               'outline'=>'black', 'tags'=>$tag_item )
-
-TkcText.new(cvs, '5c', '8.2c', 'text'=>'矩形', 'anchor'=>'n')
-TkcRectangle.new(cvs, '1c','9.5c','4c','12.5c',
-                 'outline'=>red, 'width'=>'3m', 'tags'=>$tag_item)
-TkcRectangle.new(cvs, '0.5c','13.5c','4.5c','15.5c',
-                 'fill'=>green, 'tags'=>$tag_item )
-TkcRectangle.new(cvs, '6c','10c','9c','15c', 'outline'=>'',
-                 'stipple'=>'@'+[$demo_dir,'..',
-                                 'images','gray25.xbm'].join(File::Separator),
-                 'fill'=>blue, 'tags'=>$tag_item )
-
-TkcText.new(cvs, '15c', '8.2c', 'text'=>'楕円', 'anchor'=>'n')
-TkcOval.new(cvs, '11c','9.5c','14c','12.5c',
-                 'outline'=>red, 'width'=>'3m', 'tags'=>$tag_item)
-TkcOval.new(cvs, '10.5c','13.5c','14.5c','15.5c',
-                 'fill'=>green, 'tags'=>$tag_item )
-TkcOval.new(cvs, '16c','10c','19c','15c', 'outline'=>'',
-                 'stipple'=>'@'+[$demo_dir,'..',
-                                 'images','gray25.xbm'].join(File::Separator),
-                 'fill'=>blue, 'tags'=>$tag_item )
-
-TkcText.new(cvs, '25c', '8.2c', 'text'=>'テキスト', 'anchor'=>'n')
-TkcRectangle.new(cvs, '22.4c','8.9c','22.6c','9.1c')
-TkcText.new(cvs, '22.5c', '9c', 'anchor'=>'n', 'font'=>font1, 'width'=>'4c',
-            'text'=>'短いテキスト。ワードラップ、左揃え、アンカーは北(上)。□は各テキストのアンカーポイントを示す。', 'tags'=>$tag_item )
-TkcRectangle.new(cvs, '25.4c','10.9c','25.6c','11.1c')
-TkcText.new(cvs, '25.5c', '11c', 'anchor'=>'w', 'font'=>font1, 'fill'=>blue,
-            'text'=>"いくつかの行。\nそれぞれ独立に\n行揃え。\n全て左端がアンカーされている。", 'justify'=>'center', 'tags'=>$tag_item )
-TkcRectangle.new(cvs, '24.9c','13.9c','25.1c','14.1c')
-if $tk_version =~ /^4\.[01]/
-  TkcText.new(cvs, '25c', '14c', 'anchor'=>'c', 'font'=>font2, 'fill'=>red,
-              'stipple'=>'@' + [$demo_dir, '..',
-                                'images', 'grey.5'].join(File::Separator),
-              'text'=>'Stippled characters', 'tags'=>$tag_item )
-else
-  TkcText.new(cvs, '25c', '14c', 'anchor'=>'c', 'font'=>font2, 'fill'=>red,
-              'stipple'=>'gray50', 'text'=>'Stippled characters',
-              'tags'=>$tag_item )
-end
-
-TkcText.new(cvs, '5c', '16.2c', 'text'=>'弧', 'anchor'=>'n')
-TkcArc.new(cvs, '0.5c','17c','7c','20c', 'fill'=>green, 'outline'=>'black',
-           'start'=>45, 'extent'=>270, 'style'=>'pieslice', 'tags'=>$tag_item)
-#TkcArc.new(cvs, '6.5c','17c','9.5c','20c', 'width'=>'4m', 'style'=>'arc',
-#          'outline'=>blue, 'start'=>135, 'extent'=>270,
-#          'outlinestipple'=>'@' + ['images', 'grey.25'].join(File::Separator),
-#          'tags'=>$tag_item)
-TkcArc.new(cvs, '6.5c','17c','9.5c','20c', 'width'=>'4m', 'style'=>'arc',
-           'outline'=>blue, 'start'=>135, 'extent'=>270,
-           'outlinestipple'=>'@'+[$demo_dir, '..',
-                                  'images','gray25.xbm'].join(File::Separator),
-           'tags'=>$tag_item)
-TkcArc.new(cvs, '0.5c','20c','9.5c','24c', 'width'=>'4m', 'style'=>'pieslice',
-           'fill'=>'', 'outline'=>red, 'start'=>225, 'extent'=>90,
-           'tags'=>$tag_item)
-TkcArc.new(cvs, '5.5c','20.5c','9.5c','23.5c', 'width'=>'4m', 'style'=>'chord',
-           'fill'=>blue, 'outline'=>'', 'start'=>45, 'extent'=>270,
-           'tags'=>$tag_item)
-
-TkcText.new(cvs, '15c', '16.2c', 'text'=>'ビットマップ', 'anchor'=>'n')
-#TkcBitmap.new(cvs, '13c','20c',
-#             'bitmap'=>'@' + ['images', 'face'].join(File::Separator),
-#             'tags'=>$tag_item)
-TkcBitmap.new(cvs, '13c','20c',
-              'bitmap'=>'@' + [$demo_dir, '..',
-                               'images', 'face.xbm'].join(File::Separator),
-              'tags'=>$tag_item)
-#TkcBitmap.new(cvs, '17c','18.5c',
-#             'bitmap'=>'@' + ['images', 'noletters'].join(File::Separator),
-#             'tags'=>$tag_item)
-TkcBitmap.new(cvs, '17c','18.5c',
-              'bitmap'=>'@' + [$demo_dir, '..',
-                               'images', 'noletter.xbm'].join(File::Separator),
-              'tags'=>$tag_item)
-#TkcBitmap.new(cvs, '17c','21.5c',
-#             'bitmap'=>'@' + ['images', 'letters'].join(File::Separator),
-#             'tags'=>$tag_item)
-# ↓の形式でも可能
-TkcBitmap.new(cvs, '17c','21.5c') {
-  bitmap '@' + [$demo_dir, '..', 'images', 'letters.xbm'].join(File::Separator)
-  tags $tag_item
-}
-#TkcBitmap.new(cvs, '17c','21.5c') {
-#  bitmap '@' + ['images', 'letters'].join(File::Separator)
-#  tags $tag_item
-#}
-
-TkcText.new(cvs, '25c', '16.2c', 'text'=>'ウィンドウ', 'anchor'=>'n')
-TkButton.new(cvs) {|b|
-  text '押してね'
-  command proc{butPress cvs, red}
-  TkcWindow.new(cvs, '21c','18c',
-                'window'=>b, 'anchor'=>'nw', 'tags'=>$tag_item)
-}
-TkEntry.new(cvs, 'width'=>20, 'relief'=>'sunken') {|e|
-  insert 'end', '編集してね'
-  TkcWindow.new(cvs, '21c','21c',
-                'window'=>e, 'anchor'=>'nw', 'tags'=>$tag_item)
-}
-TkScale.new(cvs, 'from'=>0, 'to'=>100, 'length'=>'6c', 'sliderlength'=>'.4c',
-            'width'=>'.5c', 'tickinterval'=>0 ) {|scl|
-  TkcWindow.new(cvs, '28.5c','17.5c',
-                'window'=>scl, 'anchor'=>'n', 'tags'=>$tag_item)
-}
-TkcText.new(cvs, '21c', '17.9c', 'text'=>'ボタン:', 'anchor'=>'sw')
-TkcText.new(cvs, '21c', '20.9c', 'text'=>'エントリ:', 'anchor'=>'sw')
-TkcText.new(cvs, '28.5c', '17.4c', 'text'=>'スケール:', 'anchor'=>'s')
-
-# Set up event bindings for canvas:
-cvs.itembind($tag_item, 'Any-Enter', proc{itemEnter cvs})
-cvs.itembind($tag_item, 'Any-Leave', proc{itemLeave cvs})
-cvs.bind('2', proc{|x,y| cvs.scan_mark x,y}, '%x %y')
-cvs.bind('B2-Motion', proc{|x,y| cvs.scan_dragto x,y}, '%x %y')
-cvs.bind('3', proc{|x,y| itemMark cvs,x,y}, '%x %y')
-cvs.bind('B3-Motion', proc{|x,y| itemStroke cvs,x,y}, '%x %y')
-cvs.bind('Control-f', proc{itemsUnderArea cvs})
-cvs.bind('1', proc{|x,y| itemStartDrag cvs,x,y}, '%x %y')
-cvs.bind('B1-Motion', proc{|x,y| itemDrag cvs,x,y}, '%x %y')
-# Utility methods for highlighting the item under the pointer
-
-$restoreCmd = nil
-def itemEnter (c)
-  if TkWinfo.depth(c).to_i == 1
-    $restoreCmd = nil
-    return
-  end
-  type = c.itemtype('current')
-  if type == TkcWindow
-    $restoreCmd = nil
-    return
-  end
-  if type == TkcBitmap
-    bg = (c.itemconfiginfo('current', 'background'))[4]
-    $restoreCmd = proc{c.itemconfigure 'current', 'background', bg}
-    c.itemconfigure 'current', 'background', 'SteelBlue2'
-    return
-  end
-  fill = (c.itemconfiginfo('current', 'fill'))[4]
-  if (type == TkcRectangle || type == TkcOval || type == TkcArc) && fill == []
-    outline = (c.itemconfiginfo('current', 'outline'))[4]
-    $restoreCmd = proc{c.itemconfigure 'current', 'outline', outline}
-    c.itemconfigure 'current', 'outline', 'SteelBlue2'
-  else
-    $restoreCmd = proc{c.itemconfigure 'current', 'fill', fill}
-    c.itemconfigure 'current', 'fill', 'SteelBlue2'
-  end
-end
-
-def itemLeave(c)
-  $restoreCmd.call if $restoreCmd
-end
-
-# Utility methods for stroking out a rectangle and printing what's
-# underneath the rectangle's area.
-
-def itemMark(c,x,y)
-  $areaX1 = c.canvasx(x)
-  $areaY1 = c.canvasy(y)
-  c.delete 'area'
-end
-
-def itemStroke(c,x,y)
-  x = c.canvasx(x)
-  y = c.canvasy(y)
-  if $areaX1 != x && $areaY1 != y
-    c.delete 'area'
-    c.addtag_withtag 'area', TkcRectangle.new(c, $areaX1, $areaY1, x, y,
-                                              '-outline', 'black')
-    $areaX2 = x
-    $areaY2 = y
-  end
-end
-
-def itemsUnderArea(c)
-  area = c.find_withtag('area')
-  items = []
-  c.find_enclosed($areaX1,$areaY1,$areaX2,$areaY2).each{|i|
-    items.push(i) if i.gettags.include?($tag_item)
-  }
-  print "Items enclosed by area: #{items.inspect}\n"; STDOUT.flush
-  items.clear
-  c.find_overlapping($areaX1,$areaY1,$areaX2,$areaY2).each{|i|
-    items.push(i) if i.gettags.include?($tag_item)
-  }
-  print "Items overlapping area: #{items.inspect}\n"; STDOUT.flush
-end
-
-$areaX1 = 0
-$areaY1 = 0
-$areaX2 = 0
-$areaY2 = 0
-
-# Utility methods to support dragging of items.
-
-def itemStartDrag(c,x,y)
-  $lastX = c.canvasx(x)
-  $lastY = c.canvasy(y)
-end
-
-def itemDrag(c,x,y)
-  x = c.canvasx(x)
-  y = c.canvasy(y)
-  c.move('current', x - $lastX, y - $lastY)
-  $lastX = x
-  $lastY = y
-end
-
-# Method that's invoked when the button embedded in the canvas
-# is invoked.
-
-def butPress(w,color)
-  i = TkcText.new(w, '25c', '18.1c',
-                  'text'=>'いてて!!', 'fill'=>color, 'anchor'=>'n')
-  Tk.after(500, proc{w.delete i})
-end
diff --git a/ext/tk/sample/demos-jp/ixset b/ext/tk/sample/demos-jp/ixset
deleted file mode 100644
index 40a77f487c..0000000000
--- a/ext/tk/sample/demos-jp/ixset
+++ /dev/null
@@ -1,333 +0,0 @@
-#!/usr/bin/env ruby
-
-# ixset --
-# A nice interface to "xset" to change X server settings
-#
-
-require 'tk'
-
-class Xsettings
-  #
-  # Button actions
-  #
-  def quit
-    @root.destroy
-  end
-
-  def ok
-    writesettings
-    quit
-  end
-
-  def cancel
-    readsettings
-    dispsettings
-  end
-
-  # apply is just "writesettings"
-
-
-  #
-  # Read current settings
-  #
-  def readsettings
-    xfd = open("|xset q", 'r')
-    xfd.readlines.each{|line|
-      fields = line.chomp.strip.split(/\s+/)
-      case fields[0]
-      when "auto"
-	if fields[1] == 'repeat:'
-	  @kbdrep = fields[2]
-	  @w_kbdrep.set(@kbdrep)
-	  @kbdcli = fields[6]
-	end
-
-      when "bell"
-	@bellvol = fields[2]
-	@bellpit = fields[5]
-	@belldur = fields[8]
-
-      when "acceleration:"
-	@mouseacc = fields[1]
-	@mousethr = fields[3]
-
-      when "prefer"
-	if fields[2] == 'yes'
-	  @screenbla = 'blank'
-	else
-	  @screenbla = 'noblank'
-	end
-	@w_screenbla.set(@screenbla)
-
-      when "timeout:"
-	@screentim = fields[1]
-	@screencyc = fields[3]
-
-      end
-    }
-
-    xfd.close
-  end
-
-  #
-  # Write settings into the X server
-  #
-  def writesettings
-    @bellvol = @w_bellvol.get
-    @bellpit = @w_bellpit.get
-    @belldur = @w_belldur.get
-
-    @kbdrep = @w_kbdrep.get
-    if @kbdrep == 'on'
-      @kbdcli = @w_kbdcli.get
-    else
-      @kbdcli = 'off'
-    end
-
-    @mouseacc = @w_mouseacc.get
-    @mousethr = @w_mousethr.get
-
-    @screentim = @w_screentim.get
-    @screencyc = @w_screencyc.get
-    @screenbla = @w_screenbla.get
-
-    system("xset \
-            b #{@bellvol} #{@bellpit} #{@belldur} \
-            c #{@kbdcli} \
-            r #{@kbdrep} \
-            m #{@mouseacc} #{@mousethr} \
-            s #{@screentim} #{@screencyc} \
-            s #{@screenbla}")
-  end
-
-  #
-  # Sends all settings to the window
-  #
-  def dispsettings
-    @w_bellvol.set(@bellvol)
-    @w_bellpit.set(@bellpit)
-    @w_belldur.set(@belldur)
-
-    @w_kbdonoff.set(@w_kbdrep.get)
-    @w_kbdcli.set(@kbdcli)
-
-    @w_mouseacc.set(@mouseacc)
-    @w_mousethr.set(@mousethr)
-
-    @w_screenblank.set(@w_screenbla.get)
-    @w_screenpat.set(@w_screenbla.get)
-
-    @w_screentim.set(@screentim)
-    @w_screencyc.set(@screencyc)
-  end
-
-  #
-  # Create all windows, and pack them
-  #
-  class LabelEntry
-    def initialize(parent, text, length)
-      @frame = TkFrame.new(parent)
-      TkLabel.new(@frame, 'text'=>text).pack('side'=>'left','expand'=>'y')
-      @entry = TkEntry.new(@frame, 'width'=>length, 'relief'=>'sunken') {
-	pack('side'=>'left','expand'=>'y')
-      }
-    end
-    def pack(keys)
-      @frame.pack(keys)
-    end
-    def get
-      @entry.value
-    end
-    def set(value)
-      @entry.delete(0,'end')
-      @entry.insert(0, value)
-    end
-  end
-
-  def createwindows
-    win = self
-
-    #
-    # Buttons
-    #
-    buttons = TkFrame.new(@root) {|f|
-      [ TkButton.new(f, 'command'=>proc{win.ok}, 'text'=>'Ok'),
-	TkButton.new(f, 'command'=>proc{win.writesettings}, 'text'=>'Apply'),
-	TkButton.new(f, 'command'=>proc{win.cancel}, 'text'=>'Cancel'),
-	TkButton.new(f, 'command'=>proc{win.quit}, 'text'=>'Quit') ].each{|b|
-	b.pack('side'=>'left', 'expand'=>'yes', 'pady'=>5)
-      }
-    }
-
-    #
-    # Bell settings
-    #
-    bell = TkFrame.new(@root, 'relief'=>'raised', 'borderwidth'=>2)
-    l = TkLabel.new(bell, 'text'=>'Bell Settings')
-    @w_bellvol = TkScale.new(bell, 'from'=>0, 'to'=>100, 'length'=>200,
-			     'tickinterval'=>20, 'orient'=>'horizontal',
-			     'label'=>"Volume (%)")
-
-    f = TkFrame.new(bell)
-    @w_bellpit = LabelEntry.new(f, "Pitch (Hz)", 6)
-    @w_bellpit.pack('side'=>'left', 'padx'=>5)
-    @w_belldur = LabelEntry.new(f, "Duration (ms)", 6)
-    @w_belldur.pack('side'=>'right', 'padx'=>5)
-
-    l.pack('side'=>'top', 'expand'=>'yes')
-    @w_bellvol.pack('side'=>'top', 'expand'=>'yes')
-    f.pack('side'=>'top', 'expand'=>'yes')
-
-    #
-    # Keyboard settings
-    #
-    kbdonoff = nil
-    kbdcli = nil
-    kbd = TkFrame.new(@root, 'relief'=>'raised', 'borderwidth'=>2)
-    l = TkLabel.new(kbd, 'text'=>'Keyboard Repeat Settings')
-    f = TkFrame.new(kbd)
-    @w_kbdonoff = TkCheckButton.new(f, 'text'=>'On', 'relief'=>'flat',
-				    'onvalue'=>'on', 'offvalue'=>'off',
-				    'variable'=>@w_kbdrep ) {
-      def self.set(value)
-	if value == 'on'
-	  self.select
-	else
-	  self.deselect
-	end
-      end
-      pack('side'=>'left', 'expand'=>'yes', 'fill'=>'both')
-    }
-    @w_kbdcli = TkScale.new(f, 'from'=>0, 'to'=>100, 'length'=>200,
-			 'tickinterval'=>20, 'orient'=>'horizontal',
-			 'label'=>'Click Volume (%)')
-    @w_kbdcli.pack('side'=>'left', 'expand'=>'yes')
-    l.pack('side'=>'top', 'expand'=>'yes')
-    f.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2, 'fill'=>'x')
-
-    #
-    # Mouse settings
-    #
-    mouse = TkFrame.new(@root, 'relief'=>'raised', 'borderwidth'=>2)
-    l = TkLabel.new(mouse, 'text'=>'Mouse Settings')
-    f = TkFrame.new(mouse)
-    @w_mouseacc = LabelEntry.new(f, 'Acceleration', 3)
-    @w_mouseacc.pack('side'=>'left')
-    @w_mousethr = LabelEntry.new(f, 'Threshold (pixels)', 3)
-    @w_mousethr.pack('side'=>'right')
-    l.pack('side'=>'top')
-    f.pack('side'=>'top', 'expand'=>'yes')
-
-    #
-    # Screen Saver settings
-    #
-    screen = TkFrame.new(@root, 'relief'=>'raised', 'borderwidth'=>2)
-    l = TkLabel.new(screen, 'text'=>'Screen-saver Settings')
-    f = TkFrame.new(screen)
-    ff1 = TkFrame.new(f)
-    [ @w_screenblank = TkRadioButton.new(ff1, 'text'=>'Blank',
-					 'relief'=>'flat',
-					 'variable'=>@w_screenbla,
-					 'value'=>'blank') {
-	def self.set(value)
-	  if value == 'blank'
-	    self.select
-	  else
-	    self.deselect
-	  end
-	end
-      },
-      @w_screenpat = TkRadioButton.new(ff1, 'text'=>'Pattern',
-				       'relief'=>'flat',
-				       'variable'=>@w_screenbla,
-				       'value'=>'noblank') {
-	def self.set(value)
-	  if value != 'blank'
-	    self.select
-	  else
-	    self.deselect
-	  end
-	end
-      }
-    ].each {|w| w.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w') }
-
-    ff2 = TkFrame.new(f)
-    [ @w_screentim = LabelEntry.new(ff2, 'Timeout (s)', 5),
-      @w_screencyc = LabelEntry.new(ff2, 'Cycle (s)', 5) ].each{|w|
-      w.pack('side'=>'top', 'pady'=>2, 'anchor'=>'e')
-    }
-
-    ff1.pack('side'=>'left')
-    ff2.pack('side'=>'left')
-
-    l.pack('side'=>'top')
-    f.pack('side'=>'top', 'expand'=>'yes')
-
-    #
-    # Main window
-    #
-    buttons.pack('side'=>'top', 'fill'=>'both')
-    bell.pack('side'=>'top', 'fill'=>'both', 'ipady'=>5, 'expand'=>'yes')
-    kbd.pack('side'=>'top', 'fill'=>'both', 'ipady'=>5, 'expand'=>'yes')
-    mouse.pack('side'=>'top', 'fill'=>'both', 'ipady'=>5, 'expand'=>'yes')
-    screen.pack('side'=>'top', 'fill'=>'both', 'ipady'=>5, 'expand'=>'yes')
-
-    #
-    # Let the user resize our window
-    #
-    @root.minsize(10,10)
-  end
-
-  def initialize
-    @root = TkRoot.new
-
-    @kbdrep = 'on'
-    @w_kbdrep = TkVariable.new(@kbdrep)
-    def @w_kbdrep.get
-      self.value
-    end
-    def @w_kbdrep.set(val)
-      self.value=val
-    end
-
-    @kbdcli = 0
-
-    @bellvol = 100
-    @bellpit = 440
-    @belldur = 100
-
-    @mouseacc = "3/1"
-    @mousethr = 4
-
-    @screenbla = "blank"
-    @w_screenbla = TkVariable.new(@screenbla)
-    def @w_screenbla.get
-      self.value
-    end
-    def @w_screenbla.set(val)
-      self.value=val
-    end
-
-    @screentim = 600
-    @screencyc = 600
-
-    #
-    # Listen what "xset" tells us...
-    #
-    readsettings
-
-    #
-    # Create all windows
-    #
-    createwindows
-
-    #
-    # Write xset parameters
-    #
-    dispsettings
-  end
-end
-
-Xsettings.new
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-jp/ixset2 b/ext/tk/sample/demos-jp/ixset2
deleted file mode 100644
index e11ce2ac8f..0000000000
--- a/ext/tk/sample/demos-jp/ixset2
+++ /dev/null
@@ -1,369 +0,0 @@
-#!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
-#
-# ixset --
-# A nice interface to "xset" to change X server settings
-#
-
-require 'tk'
-
-class Xsettings
-  #
-  # Button actions
-  #
-  def quit
-    @root.destroy
-  end
-
-  def ok
-    writesettings
-    quit
-  end
-
-  def cancel
-    readsettings
-    dispsettings
-    @btn_APPLY.state(:disabled)
-    @btn_CANCEL.state(:disabled)
-  end
-
-  # apply is just "writesettings"
-  def apply
-    writesettings
-    @btn_APPLY.state(:disabled)
-    @btn_CANCEL.state(:disabled)
-  end
-
-  #
-  # Read current settings
-  #
-  def readsettings
-    xfd = open("|xset q", 'r')
-    xfd.readlines.each{|line|
-      fields = line.chomp.strip.split(/\s+/)
-      case fields[0]
-      when "auto"
-	if fields[1] == 'repeat:'
-	  @kbdrep = fields[2]
-	  @w_kbdrep.set(@kbdrep)
-	  @kbdcli = fields[6]
-	end
-
-      when "bell"
-	@bellvol = fields[2]
-	@bellpit = fields[5]
-	@belldur = fields[8]
-
-      when "acceleration:"
-	@mouseacc = fields[1]
-	@mousethr = fields[3]
-
-      when "prefer"
-	if fields[2] == 'yes'
-	  @screenbla = 'blank'
-	else
-	  @screenbla = 'noblank'
-	end
-	@w_screenbla.set(@screenbla)
-
-      when "timeout:"
-	@screentim = fields[1]
-	@screencyc = fields[3]
-
-      end
-    }
-
-    xfd.close
-  end
-
-  #
-  # Write settings into the X server
-  #
-  def writesettings
-    @bellvol = @w_bellvol.get
-    @bellpit = @w_bellpit.get
-    @belldur = @w_belldur.get
-
-    @kbdrep = @w_kbdrep.get
-    if @kbdrep == 'on'
-      @kbdcli = @w_kbdcli.get
-    else
-      @kbdcli = 'off'
-    end
-
-    @mouseacc = @w_mouseacc.get
-    @mousethr = @w_mousethr.get
-
-    @screentim = @w_screentim.get
-    @screencyc = @w_screencyc.get
-    @screenbla = @w_screenbla.get
-
-    system("xset \
-            b #{@bellvol} #{@bellpit} #{@belldur} \
-            c #{@kbdcli} \
-            r #{@kbdrep} \
-            m #{@mouseacc} #{@mousethr} \
-            s #{@screentim} #{@screencyc} \
-            s #{@screenbla}")
-  end
-
-  #
-  # Sends all settings to the window
-  #
-  def dispsettings
-    @w_bellvol.set(@bellvol)
-    @w_bellpit.set(@bellpit)
-    @w_belldur.set(@belldur)
-
-    @w_kbdonoff.set(@w_kbdrep.get)
-    @w_kbdcli.set(@kbdcli)
-
-    @w_mouseacc.set(@mouseacc)
-    @w_mousethr.set(@mousethr)
-
-    @w_screenblank.set(@w_screenbla.get)
-    @w_screenpat.set(@w_screenbla.get)
-
-    @w_screentim.set(@screentim)
-    @w_screencyc.set(@screencyc)
-  end
-
-  #
-  # Create all windows, and pack them
-  #
-  class LabelEntry
-    def initialize(parent, text, length, range=[])
-      @frame = TkFrame.new(parent)
-      TkLabel.new(@frame, 'text'=>text).pack('side'=>'left')
-      if range.size > 0
-	@entry = TkSpinbox.new(@frame, 'width'=>length, 'relief'=>'sunken',
-			       'from'=>range[0], 'to'=>range[1])
-      else
-	@entry = TkEntry.new(@frame, 'width'=>length, 'relief'=>'sunken')
-      end
-      @entry.pack('side'=>'right','expand'=>'y', 'fill'=>'x')
-    end
-    def epath
-      @frame
-    end
-    def pack(keys)
-      @frame.pack(keys)
-    end
-    def get
-      @entry.value
-    end
-    def set(value)
-      @entry.delete(0,'end')
-      @entry.insert(0, value)
-    end
-  end
-
-  def createwindows
-    win = self
-
-    #
-    # Buttons
-    #
-    btn_frame = TkFrame.new(@root)
-    buttons = [
-      @btn_OK = TkButton.new(btn_frame, 'command'=>proc{win.ok},
-			     'default'=>'active', 'text'=>'了解'),
-      @btn_APPLY = TkButton.new(btn_frame, 'command'=>proc{win.writesettings},
-				'default'=>'normal', 'text'=>'適用',
-				'state'=>'disabled'),
-      @btn_CANCEL = TkButton.new(btn_frame, 'command'=>proc{win.cancel},
-				 'default'=>'normal', 'text'=>'取消',
-				'state'=>'disabled'),
-      @btn_QUIT = TkButton.new(btn_frame, 'command'=>proc{win.quit},
-			       'default'=>'normal', 'text'=>'中止')
-    ]
-    buttons.each{|b| b.pack('side'=>'left', 'expand'=>'yes', 'pady'=>5) }
-
-    @root.bind('Return', proc{@btn_OK.flash; @btn_OK.invoke})
-    @root.bind('Escape', proc{@btn_QUIT.flash; @btn_QUIT.invoke})
-    @root.bind('1', proc{|w|
-		 unless buttons.index(w)
-		   @btn_APPLY.state(:normal)
-		   @btn_CANCEL.state(:normal)
-		 end
-	       }, '%W')
-    @root.bind('Key', proc{|w, k|
-		 unless buttons.index(w)
-		   case k
-		   when 'Return', 'Escape', 'Tab', /.*Shift.*/
-		     # do nothing
-		   else
-		     @btn_APPLY.state(:normal)
-		     @btn_CANCEL.state(:normal)
-		   end
-		 end
-	       }, '%W %K')
-
-    #
-    # Bell settings
-    #
-    bell = TkLabelframe.new(@root, 'text'=>'ベル設定',
-			    'padx'=>'1.5m', 'pady'=>'1.5m')
-    @w_bellvol = TkScale.new(bell, 'from'=>0, 'to'=>100, 'length'=>200,
-			     'tickinterval'=>20, 'orient'=>'horizontal',
-			     'label'=>"音量 (%)")
-
-    f = TkFrame.new(bell)
-    @w_bellpit = LabelEntry.new(f, "音程 (Hz)", 6, [25, 20000])
-    @w_bellpit.pack('side'=>'left', 'padx'=>5)
-    @w_belldur = LabelEntry.new(f, "持続時間 (ms)", 6, [1, 10000])
-    @w_belldur.pack('side'=>'right', 'padx'=>5)
-
-    @w_bellvol.pack('side'=>'top', 'expand'=>'yes')
-    f.pack('side'=>'top', 'expand'=>'yes')
-
-    #
-    # Keyboard settings
-    #
-    kbdonoff = nil
-    kbdcli = nil
-    kbd = TkLabelframe.new(@root, 'text'=>'キーボードリピート設定',
-			   'padx'=>'1.5m', 'pady'=>'1.5m')
-    f = TkFrame.new(kbd)
-    @w_kbdonoff = TkCheckButton.new(f, 'text'=>'クリック音あり',
-				    'relief'=>'flat',
-				    'onvalue'=>'on', 'offvalue'=>'off',
-				    'variable'=>@w_kbdrep ) {
-      def self.set(value)
-	if value == 'on'
-	  self.select
-	else
-	  self.deselect
-	end
-      end
-      pack('side'=>'left', 'expand'=>'yes', 'fill'=>'x', 'padx'=>[0, '1m'])
-    }
-    @w_kbdcli = TkScale.new(f, 'from'=>0, 'to'=>100, 'length'=>200,
-			 'tickinterval'=>20, 'orient'=>'horizontal',
-			 'label'=>'クリック音量 (%)')
-    @w_kbdcli.pack('side'=>'left', 'expand'=>'yes',
-		   'fill'=>'x', 'padx'=>['1m', 0])
-    f.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2, 'fill'=>'x')
-
-    #
-    # Mouse settings
-    #
-    mouse = TkLabelframe.new(@root, 'text'=>'マウス設定',
-			     'padx'=>'1.5m', 'pady'=>'1.5m')
-    f = TkFrame.new(mouse)
-    @w_mouseacc = LabelEntry.new(f, '加速量', 5)
-    @w_mouseacc.pack('side'=>'left', 'padx'=>[0, '1m'])
-    @w_mousethr = LabelEntry.new(f, '閾値 (pixels)', 3, [1, 2000])
-    @w_mousethr.pack('side'=>'right', 'padx'=>['1m', 0])
-    f.pack('side'=>'top', 'expand'=>'yes')
-
-    #
-    # Screen Saver settings
-    #
-    screen = TkLabelframe.new(@root, 'text'=>'スクリーンセーバ設定',
-			     'padx'=>'1.5m', 'pady'=>'1.5m')
-    @w_screenblank = TkRadioButton.new(screen, 'text'=>'ブランク表示',
-				       'relief'=>'flat', 'anchor'=>'w',
-				       'variable'=>@w_screenbla,
-				       'value'=>'blank') {
-      def self.set(value)
-	if value == 'blank'
-	  self.select
-	else
-	  self.deselect
-	end
-      end
-    }
-
-    @w_screenpat = TkRadioButton.new(screen, 'text'=>'パターン表示',
-				     'relief'=>'flat', 'anchor'=>'w',
-				     'variable'=>@w_screenbla,
-				     'value'=>'noblank') {
-      def self.set(value)
-	if value != 'blank'
-	  self.select
-	else
-	  self.deselect
-	end
-      end
-    }
-
-    @w_screentim = LabelEntry.new(screen, 'タイムアウト (s)', 5, [1, 100000])
-    @w_screencyc = LabelEntry.new(screen, '周期 (s)', 5, [1, 100000])
-
-    Tk.grid(@w_screenblank, @w_screentim, 'sticky'=>'e')
-    Tk.grid(@w_screenpat, @w_screencyc, 'sticky'=>'e')
-    TkGrid.configure(@w_screenblank, @w_screenpat, 'sticky'=>'ew')
-
-    #
-    # Main window
-    #
-    param = {
-      'side'=>'top', 'fill'=>'both', 'expand'=>'yes',
-      'padx'=>'1m', 'pady'=>'1m'
-    }
-    btn_frame.pack('side'=>'top', 'fill'=>'both')
-    bell.pack(param)
-    kbd.pack(param)
-    mouse.pack(param)
-    screen.pack(param)
-
-    #
-    # Let the user resize our window
-    #
-    @root.minsize(10,10)
-  end
-
-  def initialize(title)
-    @root = TkRoot.new('title'=>title)
-
-    @kbdrep = 'on'
-    @w_kbdrep = TkVariable.new(@kbdrep)
-    def @w_kbdrep.get
-      self.value
-    end
-    def @w_kbdrep.set(val)
-      self.value=val
-    end
-
-    @kbdcli = 0
-
-    @bellvol = 100
-    @bellpit = 440
-    @belldur = 100
-
-    @mouseacc = "3/1"
-    @mousethr = 4
-
-    @screenbla = "blank"
-    @w_screenbla = TkVariable.new(@screenbla)
-    def @w_screenbla.get
-      self.value
-    end
-    def @w_screenbla.set(val)
-      self.value=val
-    end
-
-    @screentim = 600
-    @screencyc = 600
-
-    #
-    # Listen what "xset" tells us...
-    #
-    readsettings
-
-    #
-    # Create all windows
-    #
-    createwindows
-
-    #
-    # Write xset parameters
-    #
-    dispsettings
-  end
-end
-
-Xsettings.new(File.basename($0,'.rb'))
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-jp/knightstour.rb b/ext/tk/sample/demos-jp/knightstour.rb
deleted file mode 100644
index f4de10b3b3..0000000000
--- a/ext/tk/sample/demos-jp/knightstour.rb
+++ /dev/null
@@ -1,274 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# Based on the widget demo of Tcl/Tk8.5.2
-# The following is the original copyright text.
-#----------------------------------------------------------------------------
-# Copyright (C) 2008 Pat Thoyts <patthoyts@users.sourceforge.net>
-#
-#	Calculate a Knight's tour of a chessboard.
-#
-#	This uses Warnsdorff's rule to calculate the next square each
-#	time. This specifies that the next square should be the one that
-#	has the least number of available moves.
-#
-#	Using this rule it is possible to get to a position where
-#	there are no squares available to move into. In this implementation
-#	this occurs when the starting square is d6.
-#
-#	To solve this fault an enhancement to the rule is that if we
-#	have a choice of squares with an equal score, we should choose
-#	the one nearest the edge of the board.
-#
-#	If the call to the Edgemost function is commented out you can see
-#	this occur.
-#
-#	You can drag the knight to a specific square to start if you wish.
-#	If you let it repeat then it will choose random start positions
-#	for each new tour.
-#----------------------------------------------------------------------------
-require 'tk'
-
-class Knights_Tour
-  # Return a list of accessible squares from a given square
-  def valid_moves(square)
-    moves = []
-    [
-      [-1,-2], [-2,-1], [-2,1], [-1,2], [1,2], [2,1], [2,-1], [1,-2]
-    ].each{|col_delta, row_delta|
-      col = (square % 8) + col_delta
-      row = (square.div(8)) + row_delta
-      moves << (row * 8 + col) if row > -1 && row < 8 && col > -1 && col < 8
-    }
-    moves
-  end
-
-  # Return the number of available moves for this square
-  def check_square(square)
-    valid_moves(square).find_all{|pos| ! @visited.include?(pos)}.length
-  end
-
-  # Select the next square to move to. Returns -1 if there are no available
-  # squares remaining that we can move to.
-  def next_square(square)
-    minimum = 9
-    nxt = -1
-    valid_moves(square).each{|pos|
-      unless @visited.include?(pos)
-        cnt = check_square(pos)
-        if cnt < minimum
-          minimum = cnt
-          nxt = pos
-        elsif cnt == minimum
-          nxt = edgemost(nxt, pos)
-        end
-      end
-    }
-    nxt
-  end
-
-  # Select the square nearest the edge of the board
-  def edgemost(nxt, pos)
-    col_A = 3 - ((3.5 - nxt % 8).abs.to_i)
-    col_B = 3 - ((3.5 - pos % 8).abs.to_i)
-    row_A = 3 - ((3.5 - nxt.div(8)).abs.to_i)
-    row_B = 3 - ((3.5 - pos.div(8)).abs.to_i)
-    (col_A * row_A < col_B * row_B)? nxt : pos
-  end
-
-  # Display a square number as a standard chess square notation.
-  def _N(square)
-    '%c%d' % [(97 + square % 8), (square.div(8) + 1)]
-  end
-
-  # Perform a Knight's move and schedule the next move.
-  def move_piece(last, square)
-    @log.insert(:end, "#{@visited.length}. #{_N last} -> #{_N square}\n", '')
-    @log.see(:end)
-    @board.itemconfigure(1+last, :state=>:normal, :outline=>'black')
-    @board.itemconfigure(1+square, :state=>:normal, :outline=>'red')
-    @knight.coords(@board.coords(1+square)[0..1])
-    @visited << square
-    if (nxt = next_square(square)) != -1
-      @after_id = Tk.after(@delay.numeric){move_piece(square, nxt) rescue nil}
-    else
-      @start_btn.state :normal
-      if @visited.length == 64
-        if @initial == square
-          @log.insert :end, '周遊(closed tour)成功！'
-        else
-          @log.insert :end, "成功\n", {}
-          Tk.after(@delay.numeric * 2){tour(rand(64))} if @continuous.bool
-        end
-      else
-        @log.insert :end, "失敗！\n", {}
-      end
-    end
-  end
-
-  # Begin a new tour of the board given a random start position
-  def tour(square = nil)
-    @visited.clear
-    @log.clear
-    @start_btn.state :disabled
-    1.upto(64){|n|
-      @board.itemconfigure(n, :state=>:disabled, :outline=>'black')
-    }
-    unless square
-      square = @board.find_closest(*(@knight.coords << 0 << 65))[0].to_i - 1
-    end
-    @initial = square
-    Tk.after_idle{ move_piece(@initial, @initial) rescue nil }
-  end
-
-  def _stop
-    Tk.after_cancel(@after_id) rescue nil
-  end
-
-  def _exit
-    _stop
-    $knightstour.destroy
-  end
-
-  def set_delay(new)
-    @delay.numeric = new.to_i
-  end
-
-  def drag_start(w, x, y)
-    w.dtag('selected')
-    w.addtag('selected', :withtag, 'current')
-    @dragging = [x, y]
-  end
-
-  def drag_motion(w, x, y)
-    return unless @dragging
-    w.move('selected', x - @dragging[0], y - @dragging[1])
-    @dragging = [x, y]
-  end
-
-  def drag_end(w, x, y)
-    square = w.find_closest(x, y, 0, 65)
-    w.coords('selected', w.coords(square)[0..1])
-    w.dtag('selected')
-    @dragging = nil
-  end
-
-  def make_SeeDismiss
-    ## See Code / Dismiss
-    frame = Ttk::Frame.new($knightstour)
-    sep = Ttk::Separator.new(frame)
-    Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-    TkGrid('x',
-           Ttk::Button.new(frame, :text=>'コード参照',
-                           :image=>$image['view'], :compound=>:left,
-                           :command=>proc{showCode 'knightstour'}),
-           Ttk::Button.new(frame, :text=>'閉じる',
-                           :image=>$image['delete'], :compound=>:left,
-                           :command=>proc{
-                             $knightstour.destroy
-                             $knightstour = nil
-                           }),
-           :padx=>4, :pady=>4)
-    frame.grid_columnconfigure(0, :weight=>1)
-    frame
-  end
-
-  def create_gui(parent = nil)
-    $knightstour.destroy rescue nil
-    $knightstour = Tk::Toplevel.new(parent, :title=>"Knight's tour")
-    $knightstour.withdraw
-    base_f = Ttk::Frame.new($knightstour)
-    @board = Tk::Canvas.new(base_f, :width=>240, :height=>240)
-    @log = Tk::Text.new(base_f, :width=>12, :height=>1,
-                        :font=>'Arial 8', :background=>'white')
-    scr = @log.yscrollbar(Ttk::Scrollbar.new(base_f))
-
-    @visited = []
-    @delay = TkVariable.new(600)
-    @continuous = TkVariable.new(false)
-
-    tool_f = Ttk::Frame.new($knightstour)
-    label = Ttk::Label.new(tool_f, :text=>'実行速度')
-    scale = Ttk::Scale.new(tool_f, :from=>8, :to=>2000, :variable=>@delay,
-                           :command=>proc{|n| set_delay(n)})
-    check = Ttk::Checkbutton.new(tool_f, :text=>'反復',
-                                 :variable=>@continuous)
-    @start_btn = Ttk::Button.new(tool_f, :text=>'開始',
-                                 :command=>proc{tour()})
-    @exit_btn = Ttk::Button.new(tool_f, :text=>'終了',
-                                :command=>proc{_exit()})
-
-    7.downto(0){|row|
-      0.upto(7){|col|
-        if ((col & 1) ^ (row & 1)).zero?
-          fill  = 'bisque'
-          dfill = 'bisque3'
-        else
-          fill  = 'tan3'
-          dfill = 'tan4'
-        end
-        coords = [col * 30 + 4, row * 30 + 4, col * 30 + 30, row * 30 + 30]
-        @board.create(TkcRectangle, coords,
-                      :fill=>fill, :disabledfill=>dfill,
-                      :width=>2, :state=>:disabled)
-      }
-    }
-
-    @knight_font = TkFont.new(:size=>-24)
-    @knight = TkcText.new(@board, 0, 0, :font=>@knight_font,
-                          :text=>Tk::UTF8_String.new('\u265e'),
-                          :anchor=>'nw', # :tags=>'knight',
-                          :fill=>'black', :activefill=>'#600000')
-    @knight.coords(@board.coords(rand(64)+1)[0..1])
-    @knight.bind('ButtonPress-1', '%W %x %y'){|w,x,y| drag_start(w,x,y)}
-    @knight.bind('Motion', '%W %x %y'){|w,x,y| drag_motion(w,x,y)}
-    @knight.bind('ButtonRelease-1', '%W %x %y'){|w,x,y| drag_end(w,x,y)}
-
-    Tk.grid(@board, @log, scr, :sticky=>'news')
-    base_f.grid_rowconfigure(0, :weight=>1)
-    base_f.grid_columnconfigure(0, :weight=>1)
-
-    Tk.grid(base_f, '-', '-', '-', '-', '-', :sticky=>'news')
-    widgets = [label, scale, check, @start_btn]
-    sg = nil
-    unless $RubyTk_WidgetDemo
-      widgets << @exit_btn
-      if Tk.windowingsystem != 'aqua'
-        #widgets.unshift(Ttk::SizeGrip.new(tool_f))
-        Ttk::SizeGrip.new(tool_f).pack(:side=>:right, :anchor=>'se')
-      end
-    end
-    Tk.pack(widgets, :side=>:right)
-    if Tk.windowingsystem == 'aqua'
-      TkPack.configure(widgets, :padx=>[4, 4], :pady=>[12, 12])
-      TkPack.configure(widgets[0], :padx=>[4, 24])
-      TkPack.configure(widgets[-1], :padx=>[16, 4])
-    end
-
-    Tk.grid(tool_f, '-', '-', '-', '-', '-', :sticky=>'ew')
-
-    if $RubyTk_WidgetDemo
-      Tk.grid(make_SeeDismiss(), '-', '-', '-', '-', '-', :sticky=>'ew')
-    end
-
-    $knightstour.grid_rowconfigure(0, :weight=>1)
-    $knightstour.grid_columnconfigure(0, :weight=>1)
-
-    $knightstour.bind('Control-F2'){TkConsole.show}
-    $knightstour.bind('Return'){@start_btn.invoke}
-    $knightstour.bind('Escape'){@exit_btn.invoke}
-    $knightstour.bind('Destroy'){ _stop }
-    $knightstour.protocol('WM_DELETE_WINDOW'){ _exit }
-
-    $knightstour.deiconify
-    $knightstour.tkwait_destroy
-  end
-
-  def initialize(parent = nil)
-    create_gui(parent)
-  end
-end
-
-Tk.root.withdraw unless $RubyTk_WidgetDemo
-Thread.new{Tk.mainloop} if __FILE__ == $0
-Knights_Tour.new
diff --git a/ext/tk/sample/demos-jp/label.rb b/ext/tk/sample/demos-jp/label.rb
deleted file mode 100644
index 6164ac1ebc..0000000000
--- a/ext/tk/sample/demos-jp/label.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# label widget demo (called by 'widget')
-#
-
-# toplevel widget が存在すれば削除する
-if defined?($label_demo) && $label_demo
-  $label_demo.destroy
-  $label_demo = nil
-end
-
-# demo 用の toplevel widget を生成
-$label_demo = TkToplevel.new {|w|
-  title("Label Demonstration")
-  iconname("label")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($label_demo).pack(:fill=>:both, :expand=>true)
-
-# label 生成
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "下には5つのラベルが表示されています。左側にはテキストラベルが3つあり、右側にはビットマップラベルとテキストラベルがあります。ラベルというのはあまり面白いものではありません。なぜなら眺める以外何もできないからです。"
-}
-msg.pack('side'=>'top')
-
-# frame 生成
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc{
-      tmppath = $label_demo
-      $label_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc{showCode 'label'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# label demo 用フレーム生成
-f_left = TkFrame.new(base_frame)
-f_right = TkFrame.new(base_frame)
-[f_left, f_right].each{|w| w.pack('side'=>'left', 'expand'=>'yes',
-                                  'padx'=>10, 'pady'=>10, 'fill'=>'both')}
-
-# label 生成
-[ TkLabel.new(f_left, 'text'=>'最初のラベル'),
-  TkLabel.new(f_left, 'text'=>'2 番目。ちょっと浮き上がらせてみました',
-              'relief'=>'raised'),
-  TkLabel.new(f_left, 'text'=>'3 番目。沈んでいます ', 'relief'=>'sunken')
-].each{|w| w.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2, 'anchor'=>'w')}
-
-# TkLabel.new(f_right) {
-Tk::Label.new(f_right) {
-  bitmap('@' + [$demo_dir,'..','images','face.xbm'].join(File::Separator))
-  borderwidth 2
-  relief 'sunken'
-}.pack('side'=>'top')
-
-TkLabel.new(f_right) { text 'Tcl/Tk 所有者' }.pack('side'=>'top')
diff --git a/ext/tk/sample/demos-jp/labelframe.rb b/ext/tk/sample/demos-jp/labelframe.rb
deleted file mode 100644
index 3dcd1dc3f1..0000000000
--- a/ext/tk/sample/demos-jp/labelframe.rb
+++ /dev/null
@@ -1,103 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# labelframe.rb
-#
-# This demonstration script creates a toplevel window containing
-# several labelframe widgets.
-#
-# based on "Id: labelframe.tcl,v 1.2 2001/10/30 11:21:50 dkf Exp"
-
-
-if defined?($labelframe_demo) && $labelframe_demo
-  $labelframe_demo.destroy
-  $labelframe_demo = nil
-end
-
-$labelframe_demo = TkToplevel.new {|w|
-  title("Labelframe Demonstration")
-  iconname("labelframe")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($labelframe_demo).pack(:fill=>:both, :expand=>true)
-
-# Some information
-TkLabel.new(base_frame,
-            :font=>$font, :wraplength=>'4i', :justify=>:left,
-            :text=><<EOL).pack(:side=>:top)
-TkLabelFrame ウィジェットは関連する widget
-群をまとめて取り扱うために用いられます。ラ
-ベルは通常の文字列でも何らかのウィジェット
-でもかまいません。もしあなたが使っている
-Ruby にリンクされている Tk ライブラリが
-labelframe ウィジェットを実装していない
-場合、このデモはうまく動かないはずです。
-その場合には labelframe ウィジェットが実装
-されているようなより新しいバージョンの Tk
-を組み合わせて試すようにしてください。
-EOL
-
-# The bottom buttons
-TkFrame.new(base_frame){|f|
-  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
-
-  TkButton.new(f, :text=>'閉じる', :width=>15, :command=>proc{
-                 $labelframe_demo.destroy
-                 $labelframe_demo = nil
-               }).pack(:side=>:left, :expand=>true)
-
-  TkButton.new(f, :text=>'コード参照', :width=>15, :command=>proc{
-                 showCode 'labelframe'
-               }).pack(:side=>:left, :expand=>true)
-}
-
-# Demo area
-w = TkFrame.new(base_frame).pack(:side=>:bottom, :fill=>:both,
-                                       :expand=>true)
-
-# A group of radiobuttons in a labelframe
-TkLabelFrame.new(w, :text=>'選択値',
-                 :padx=>2, :pady=>2) {|f|
-  grid(:row=>0, :column=>0, :pady=>'2m', :padx=>'2m')
-
-  v = TkVariable.new
-  (1..4).each{|i|
-    TkRadiobutton.new(f, :text=>"This is value #{i}",
-                      :variable=>v, :value=>i) {
-      pack(:side=>:top, :fill=>:x, :pady=>2)
-    }
-  }
-}
-
-
-# Using a label window to control a group of options.
-$lfdummy = TkVariable.new(0)
-
-def lfEnableButtons(w)
-  TkWinfo.children(w).each{|child|
-    next if child.path =~ /\.cb$/
-    if $lfdummy == 1
-      child.state(:normal)
-    else
-      child.state(:disabled)
-    end
-  }
-end
-
-TkLabelFrame.new(w, :pady=>2, :padx=>2){|f|
-  TkCheckButton.new(f, :widgetname=>'cb', :variable=>$lfdummy,
-                    :text=>"オプションを使用", :padx=>0) {|cb|
-    command proc{lfEnableButtons(f)}
-    f.labelwidget(cb)
-  }
-  grid(:row=>0, :column=>1, :pady=>'2m', :padx=>'2m')
-
-  %w(オプション1 オプション2 オプション3).each{|str|
-    TkCheckbutton.new(f, :text=>str).pack(:side=>:top, :fill=>:x, :pady=>2)
-  }
-
-  lfEnableButtons(f)
-}
-
-TkGrid.columnconfigure(w, [0,1], :weight=>1)
diff --git a/ext/tk/sample/demos-jp/mclist.rb b/ext/tk/sample/demos-jp/mclist.rb
deleted file mode 100644
index a222ed3f81..0000000000
--- a/ext/tk/sample/demos-jp/mclist.rb
+++ /dev/null
@@ -1,122 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# mclist.rb --
-#
-# This demonstration script creates a toplevel window containing a Ttk
-# tree widget configured as a multi-column listbox.
-#
-# based on "Id: mclist.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($mclist_demo) && $mclist_demo
-  $mclist_demo.destroy
-  $mclist_demo = nil
-end
-
-$mclist_demo = TkToplevel.new {|w|
-  title("Multi-Column List")
-  iconname("mclist")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($mclist_demo).pack(:fill=>:both, :expand=>true)
-
-## Explanatory text
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i',
-               :justify=>:left, :anchor=>'n', :padding=>[10, 2, 10, 6],
-               :text=><<EOL).pack(:fill=>:x)
-Ttkとは，テーマ指定可能な新しいウィジェット集合です．\
-Ttk::Treeviewウィジェットは\
-Ttkウィジェットセットに含まれるウィジェットの一つで，\
-それが保持する木構造のデータそのものまでは表示することなく，\
-示したい情報をマルチカラムで表示させることができます．
-このサンプルは，複数のカラムを持ったリストボックスを作成する簡単な例です．
-各カラムのタイトル(heading)をクリックすれば，\
-そのカラムの情報に基づいてリストの並べ替えがなされるはずです．\
-また，カラムのタイトル間の区切り部分をドラッグすることで，\
-カラムの幅を変更することも可能です．
-EOL
-
-## See Code / Dismiss
-Ttk::Frame.new(base_frame) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         Ttk::Button.new(frame, :text=>'コード参照',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{showCode 'mclist'}),
-         Ttk::Button.new(frame, :text=>'閉じる',
-                         :image=>$image['delete'], :compound=>:left,
-                         :command=>proc{
-                           $mclist_demo.destroy
-                           $mclist_demo = nil
-                         }),
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x)
-}
-
-container = Ttk::Frame.new(base_frame)
-tree = Ttk::Treeview.new(base_frame, :columns=>%w(country capital currency),
-                          :show=>:headings)
-if Tk.windowingsystem != 'aqua'
-  vsb = tree.yscrollbar(Ttk::Scrollbar.new(base_frame))
-  hsb = tree.xscrollbar(Ttk::Scrollbar.new(base_frame))
-else
-  vsb = tree.yscrollbar(Tk::Scrollbar.new(base_frame))
-  hsb = tree.xscrollbar(Tk::Scrollbar.new(base_frame))
-end
-
-container.pack(:fill=>:both, :expand=>true)
-Tk.grid(tree, vsb, :in=>container, :sticky=>'nsew')
-Tk.grid(hsb,       :in=>container, :sticky=>'nsew')
-container.grid_columnconfigure(0, :weight=>1)
-container.grid_rowconfigure(0, :weight=>1)
-
-## The data we're going to insert
-data = [
-  ['アルゼンチン', 	'ブエノスアイレス', 	'ARS'],
-  ['オーストラリア',	'キャンベラ',		'AUD'],
-  ['ブラジル', 		'ブラジリア', 		'BRL'],
-  ['カナダ', 		'オタワ', 		'CAD'],
-  ['中国',		'北京', 		'CNY'],
-  ['フランス',		'パリ', 		'EUR'],
-  ['ドイツ', 		'ベルリン',		'EUR'],
-  ['インド', 		'ニューデリー',		'INR'],
-  ['イタリア', 		'ローマ', 		'EUR'],
-  ['日本', 		'東京', 		'JPY'],
-  ['メキシコ', 		'メキシコシティ', 	'MXN'],
-  ['ロシア', 		'モスクワ', 		'RUB'],
-  ['南アフリカ',	'プレトリア', 		'ZAR'],
-  ['英国', 		'ロンドン', 		'GBP'],
-  ['アメリカ', 		'ワシントン D.C.', 	'USD'],
-]
-
-## Code to insert the data nicely
-font = Ttk::Style.lookup(tree[:style], :font)
-cols = %w(country capital currency)
-cols.zip(%w(国名 首都 通貨)).each{|col, name|
-  tree.heading_configure(col, :text=>name,
-                         :command=>proc{sort_by(tree, col, false)})
-  tree.column_configure(col, :width=>TkFont.measure(font, name))
-}
-
-data.each{|country, capital, currency|
-  #tree.insert('', :end, :values=>[country, capital, currency])
-  tree.insert(nil, :end, :values=>[country, capital, currency])
-  cols.zip([country, capital, currency]).each{|col, val|
-    len = TkFont.measure(font, "#{val}  ")
-    if tree.column_cget(col, :width) < len
-      tree.column_configure(col, :width=>len)
-    end
-  }
-}
-
-## Code to do the sorting of the tree contents when clicked on
-def sort_by(tree, col, direction)
-  tree.children(nil).map!{|row| [tree.get(row, col), row.id]} .
-    sort(&((direction)? proc{|x, y| y <=> x}: proc{|x, y| x <=> y})) .
-    each_with_index{|info, idx| tree.move(info[1], nil, idx)}
-
-  tree.heading_configure(col, :command=>proc{sort_by(tree, col, ! direction)})
-end
diff --git a/ext/tk/sample/demos-jp/menu.rb b/ext/tk/sample/demos-jp/menu.rb
deleted file mode 100644
index 012e2458d2..0000000000
--- a/ext/tk/sample/demos-jp/menu.rb
+++ /dev/null
@@ -1,202 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# menus widget demo (called by 'widget')
-#
-
-# toplevel widget が存在すれば削除する
-if defined?($menu_demo) && $menu_demo
-  $menu_demo.destroy
-  $menu_demo = nil
-end
-
-# demo 用の toplevel widget を生成
-$menu_demo = TkToplevel.new {|w|
-  title("File Selection Dialogs")
-  iconname("menu")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($menu_demo).pack(:fill=>:both, :expand=>true)
-
-# menu frame 生成
-$menu_frame = TkFrame.new(base_frame, 'relief'=>'raised', 'bd'=>2)
-$menu_frame.pack('side'=>'top', 'fill'=>'x')
-
-begin
-  windowingsystem = Tk.windowingsystem()
-rescue
-  windowingsystem = ""
-end
-
-# label 生成
-TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
-  if $tk_platform['platform'] == 'macintosh' ||
-      windowingsystem == "classic" || windowingsystem == "aqua"
-    text("このウィンドウは様々なメニューとカスケードメニューから構成されています。Command-X を入力すると、Xがコマンドキー記号に続いて表示されている文字ならば、アクセラレータを使った項目起動を行うことができます。メニュー要素中、最後のものは、そのメニューの最初の項目を選択することで独立させることができます。")
-  else
-    text("このウィンドウは様々なメニューとカスケードメニューから構成されています。Alt-X を入力すると、Xがメニューにアンダーライン付きで表示されている文字ならば、キーボードからの指定ができます。矢印キーでメニューのトラバースも可能です。メニューが指定された際には、スペースキーで実行することができます。あるいは、アンダーライン付きの文字を入力することでも実行できます。メニューのエントリがアクセラレータを持っている場合は、そのアクセラレータを入力することでメニューを指定することなしに実行することができます。メニュー要素中、最後のものは、そのメニューの最初の項目を選択することで独立させることができます。")
-  end
-}.pack('side'=>'top')
-
-# frame 生成
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc{
-      tmppath = $menu_demo
-      $menu_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc{showCode 'menu'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# menu 生成
-TkMenubutton.new($menu_frame, 'text'=>'File', 'underline'=>0) {|m|
-  pack('side'=>'left')
-  TkMenu.new(m, 'tearoff'=>false) {|file_menu|
-    m.configure('menu'=>file_menu)
-    add('command', 'label'=>'開く ...', 'command'=>proc{fail 'これは、デモですので"開く ..."に対するアクションは定義されていません。'})
-    add('command', 'label'=>'新規', 'command'=>proc{fail 'これは、デモですので"新規"に対するアクションは定義されていません。'})
-    add('command', 'label'=>'保存', 'command'=>proc{fail 'これは、デモですので"保存"に対するアクションは定義されていません。'})
-    add('command', 'label'=>'保存(指定) ...', 'command'=>proc{fail 'これは、デモですので"保存(指定) ..."に対するアクションは定義されていません。'})
-    add('separator')
-    add('command', 'label'=>'プリント設定 ...', 'command'=>proc{fail 'これは、デモですので"プリント設定 ..."に対するアクションは定義されていません。'})
-    add('command', 'label'=>'プリント ...', 'command'=>proc{fail 'これは、デモですので"プリント ..."に対するアクションは定義されていません。'})
-    add('separator')
-    add('command', 'label'=>'終了', 'command'=>proc{$menu_demo.destroy})
-  }
-}
-
-if $tk_platform['platform'] == 'macintosh' ||
-    windowingsystem == "classic" || windowingsystem == "aqua"
-  modifier = 'Command'
-elsif $tk_platform['platform'] == 'windows'
-  modifier = 'Control'
-else
-  modifier = 'Meta'
-end
-
-TkMenubutton.new($menu_frame, 'text'=>'Basic', 'underline'=>0) {|m|
-  pack('side'=>'left')
-  TkMenu.new(m, 'tearoff'=>false) {|basic_menu|
-    m.configure('menu'=>basic_menu)
-    add('command', 'label'=>'何もしない長いエントリ')
-    ['A','B','C','D','E','F','G'].each{|c|
-      # add('command', 'label'=>"文字 \"#{c}\" を印字", 'underline'=>4,
-      add('command', 'label'=>"Print letter \"#{c}\" (文字 \"#{c}\" を印字)",
-          'underline'=>14,
-          'command'=>proc{print c,"\n"}, 'accelerator'=>"#{modifier}+#{c}")
-      $menu_demo.bind("#{modifier}-#{c.downcase}", proc{print c,"\n"})
-    }
-  }
-}
-
-TkMenubutton.new($menu_frame, 'text'=>'Cascades', 'underline'=>0) {|m|
-  pack('side'=>'left')
-  TkMenu.new(m, 'tearoff'=>false) {|cascade_menu|
-    m.configure('menu'=>cascade_menu)
-    add('command', 'label'=>'Print hello(こんにちは)',
-        'command'=>proc{print "Hello(こんにちは)\n"},
-        'accelerator'=>"#{modifier}+H", 'underline'=>6)
-    $menu_demo.bind("#{modifier}-h", proc{print "Hello(こんにちは)\n"})
-    add('command', 'label'=>'Print goodbye(さようなら)',
-        'command'=>proc{print "Goodbye(さようなら)\n"},
-        'accelerator'=>"#{modifier}+G", 'underline'=>6)
-    $menu_demo.bind("#{modifier}-g", proc{print "Goodbye(さようなら)\n"})
-
-    # TkMenu.new(m, 'tearoff'=>false) {|cascade_check|
-    TkMenu.new(cascade_menu, 'tearoff'=>false) {|cascade_check|
-      cascade_menu.add('cascade', 'label'=>'Check buttons(チェックボタン)',
-                       'menu'=>cascade_check, 'underline'=>0)
-      oil = TkVariable.new(0)
-      add('check', 'label'=>'オイル点検', 'variable'=>oil)
-      trans = TkVariable.new(0)
-      add('check', 'label'=>'トランスミッション点検', 'variable'=>trans)
-      brakes = TkVariable.new(0)
-      add('check', 'label'=>'ブレーキ点検', 'variable'=>brakes)
-      lights = TkVariable.new(0)
-      add('check', 'label'=>'ライト点検', 'variable'=>lights)
-      add('separator')
-      add('command', 'label'=>'現在の値を表示',
-          'command'=>proc{showVars($menu_demo,
-                                   ['オイル点検', oil],
-                                   ['トランスミッション点検', trans],
-                                   ['ブレーキ点検', brakes],
-                                   ['ライト点検', lights])} )
-      invoke 1
-      invoke 3
-    }
-
-    #TkMenu.new(m, 'tearoff'=>false) {|cascade_radio|
-    TkMenu.new(cascade_menu, 'tearoff'=>false) {|cascade_radio|
-      cascade_menu.add('cascade', 'label'=>'Radio buttons(ラジオボタン)',
-                       'menu'=>cascade_radio, 'underline'=>0)
-      pointSize = TkVariable.new
-      add('radio', 'label'=>'10 ポイント', 'variable'=>pointSize, 'value'=>10)
-      add('radio', 'label'=>'14 ポイント', 'variable'=>pointSize, 'value'=>14)
-      add('radio', 'label'=>'18 ポイント', 'variable'=>pointSize, 'value'=>18)
-      add('radio', 'label'=>'24 ポイント', 'variable'=>pointSize, 'value'=>24)
-      add('radio', 'label'=>'32 ポイント', 'variable'=>pointSize, 'value'=>32)
-      add('separator')
-      style = TkVariable.new
-      add('radio', 'label'=>'ローマン', 'variable'=>style, 'value'=>'roman')
-      add('radio', 'label'=>'ボールド', 'variable'=>style, 'value'=>'bold')
-      add('radio', 'label'=>'イタリック', 'variable'=>style, 'value'=>'italic')
-      add('separator')
-      add('command', 'label'=>'現在の値を表示',
-          'command'=>proc{showVars($menu_demo,
-                                   ['ポイントサイズ', pointSize],
-                                   ['スタイル', style])} )
-      invoke 1
-      invoke 7
-    }
-  }
-}
-
-TkMenubutton.new($menu_frame, 'text'=>'Icons', 'underline'=>0) {|m|
-  pack('side'=>'left')
-  TkMenu.new(m, 'tearoff'=>false) {|icon_menu|
-    m.configure('menu'=>icon_menu)
-    add('command',
-        'bitmap'=>'@'+[$demo_dir,'..',
-                        'images','pattern.xbm'].join(File::Separator),
-        'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry',
-                                     'text'=>'今あなたが選択したメニューの項目はテキストではなくビットマップを表示していました。それ以外の点では他のメニュー項目と変わりません。',
-                                     'bitmap'=>'', 'default'=>0,
-                                     'buttons'=>'了解')} )
-    ['info', 'questhead', 'error'].each{|icon|
-      add('command', 'bitmap'=>icon,
-          'command'=>proc{print "You invoked the #{icon} bitmap\n"})
-    }
-  }
-}
-
-TkMenubutton.new($menu_frame, 'text'=>'More', 'underline'=>0) {|m|
-  pack('side'=>'left')
-  TkMenu.new(m, 'tearoff'=>false) {|more_menu|
-    m.configure('menu'=>more_menu)
-    [ 'エントリ','別のエントリ','何もしない','ほとんど何もしない',
-      '人生を意義あるものに' ].each{|i|
-      add('command', 'label'=>i,
-          'command'=>proc{print "You invoked \"#{i}\"\n"})
-    }
-  }
-}
-
-TkMenubutton.new($menu_frame, 'text'=>'Colors', 'underline'=>0) {|m|
-  pack('side'=>'left')
-  TkMenu.new(m) {|colors_menu|
-    m.configure('menu'=>colors_menu)
-    ['red', 'orange', 'yellow', 'green', 'blue'].each{|c|
-      add('command', 'label'=>c, 'background'=>c,
-          'command'=>proc{print "You invoked \"#{c}\"\n"})
-    }
-  }
-}
diff --git a/ext/tk/sample/demos-jp/menu84.rb b/ext/tk/sample/demos-jp/menu84.rb
deleted file mode 100644
index ab6d1b85b4..0000000000
--- a/ext/tk/sample/demos-jp/menu84.rb
+++ /dev/null
@@ -1,214 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# menus widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($menu84_demo) && $menu84_demo
-  $menu84_demo.destroy
-  $menu84_demo = nil
-end
-
-# demo toplevel widget
-$menu84_demo = TkToplevel.new {|w|
-  title("File Selection Dialogs")
-  iconname("menu84")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($menu84_demo).pack(:fill=>:both, :expand=>true)
-
-begin
-  windowingsystem = Tk.windowingsystem()
-rescue
-  windowingsystem = ""
-end
-
-# label
-TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
-  if $tk_platform['platform'] == 'macintosh' ||
-      windowingsystem == "classic" || windowingsystem == "aqua"
-    text("このウィンドウにはカスケードメニューを持つメニューバーが付けられています。Command+x ('x'はコマンドキーシンボルに続けて表示されている文字です) とタイプすることによっても項目の機能を呼び出すことができます。最後のメニューは、マウスでウィンドウの外にドラッグすることによって、独立したパレットとなるように切り放すことが可能です。")
-  else
-    text("このウィンドウにはカスケードメニューを持つメニューバーが付けられています。Alt+x ('x'はメニュー上で下線が引かれた文字です) とタイプすることによってもメニューを呼び出すことができます。矢印キーを使って、メニュー間を移動することも可能です。メニューが表示されている時には、現在位置の項目をスペースキーで選択したり、下線が引かれた文字を入力することでその項目を選択したりすることができます。もし項目にアクセラレータの指定がなされていたならば、その指定されたキー入力を行うことで、メニューを表示させることなく直接その項目の機能を呼び出せます。最後のメニューは、メニューの最初の項目を選択することによって、独立したパレットとなるように切り放すことが可能です。")
-  end
-}.pack('side'=>'top')
-
-
-menustatus = TkVariable.new("    ")
-TkFrame.new(base_frame) {|frame|
-  TkLabel.new(frame, 'textvariable'=>menustatus, 'relief'=>'sunken',
-              'bd'=>1, 'font'=>['Helvetica', '10'],
-              'anchor'=>'w').pack('side'=>'left', 'padx'=>2,
-                                  'expand'=>true, 'fill'=>'both')
-  pack('side'=>'bottom', 'fill'=>'x', 'pady'=>2)
-}
-
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc{
-      tmppath = $menu84_demo
-      $menu84_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc{showCode 'menu84'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-
-# create menu frame
-$menu84_frame = TkMenu.new($menu84_demo, 'tearoff'=>false)
-
-# menu
-TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
-  $menu84_frame.add('cascade', 'label'=>'File', 'menu'=>m, 'underline'=>0)
-  add('command', 'label'=>'Open...', 'command'=>proc{fail 'これは単なるデモですから、"Open..." 項目の機能は特に定義されてはいません。'})
-  add('command', 'label'=>'New', 'command'=>proc{fail 'これは単なるデモですから、"New" 項目の機能は特に定義されてはいません。'})
-  add('command', 'label'=>'Save', 'command'=>proc{fail 'これは単なるデモですから、"Save" 項目の機能は特に定義されてはいません。'})
-  add('command', 'label'=>'Save As...', 'command'=>proc{fail 'これは単なるデモですから、"Save As..." 項目の機能は特に定義されてはいません。'})
-  add('separator')
-  add('command', 'label'=>'Print Setup...', 'command'=>proc{fail 'これは単なるデモですから、"Print Setup..." 項目の機能は特に定義されてはいません。'})
-  add('command', 'label'=>'Print...', 'command'=>proc{fail 'これは単なるデモですから、"Print..." 項目の機能は特に定義されてはいません。'})
-  add('separator')
-  add('command', 'label'=>'Dismiss Menus Demo', 'command'=>proc{$menu84_demo.destroy})
-}
-
-if $tk_platform['platform'] == 'macintosh' ||
-    windowingsystem = "classic" || windowingsystem = "aqua"
-  modifier = 'Command'
-elsif $tk_platform['platform'] == 'windows'
-  modifier = 'Control'
-else
-  modifier = 'Meta'
-end
-
-TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
-  $menu84_frame.add('cascade', 'label'=>'Basic', 'menu'=>m, 'underline'=>0)
-  add('command', 'label'=>'Long entry that does nothing')
-  ['A','B','C','D','E','F','G'].each{|c|
-    add('command', 'label'=>"Print letter \"#{c}\"",
-        'underline'=>14,
-        'command'=>proc{print c,"\n"}, 'accelerator'=>"#{modifier}+#{c}")
-    $menu84_demo.bind("#{modifier}-#{c.downcase}", proc{print c,"\n"})
-  }
-}
-
-TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
-  $menu84_frame.add('cascade', 'label'=>'Cascades', 'menu'=>m, 'underline'=>0)
-  add('command', 'label'=>'Print hello',
-      'command'=>proc{print "Hello\n"},
-      'accelerator'=>"#{modifier}+H", 'underline'=>6)
-  $menu84_demo.bind("#{modifier}-h", proc{print "Hello\n"})
-  add('command', 'label'=>'Print goodbye',
-      'command'=>proc{print "Goodbye\n"},
-      'accelerator'=>"#{modifier}+G", 'underline'=>6)
-  $menu84_demo.bind("#{modifier}-g", proc{print "Goodbye\n"})
-
-  TkMenu.new(m, 'tearoff'=>false) {|cascade_check|
-    m.add('cascade', 'label'=>'Check button',
-          'menu'=>cascade_check, 'underline'=>0)
-    oil = TkVariable.new(0)
-    add('check', 'label'=>'オイル検査', 'variable'=>oil)
-    trans = TkVariable.new(0)
-    add('check', 'label'=>'トランスミッション検査', 'variable'=>trans)
-    brakes = TkVariable.new(0)
-    add('check', 'label'=>'ブレーキ検査', 'variable'=>brakes)
-    lights = TkVariable.new(0)
-    add('check', 'label'=>'ライト検査', 'variable'=>lights)
-    add('separator')
-    add('command', 'label'=>'Show current values',
-        'command'=>proc{showVars($menu84_demo,
-                                 ['オイル', oil],
-                                 ['トランスミッション', trans],
-                                 ['ブレーキ', brakes],
-                                 ['ライト', lights])} )
-    invoke 1
-    invoke 3
-  }
-
-  TkMenu.new(m, 'tearoff'=>false) {|cascade_radio|
-    m.add('cascade', 'label'=>'Radio buttons',
-          'menu'=>cascade_radio, 'underline'=>0)
-    pointSize = TkVariable.new
-    add('radio', 'label'=>'10 point', 'variable'=>pointSize, 'value'=>10)
-    add('radio', 'label'=>'14 point', 'variable'=>pointSize, 'value'=>14)
-    add('radio', 'label'=>'18 point', 'variable'=>pointSize, 'value'=>18)
-    add('radio', 'label'=>'24 point', 'variable'=>pointSize, 'value'=>24)
-    add('radio', 'label'=>'32 point', 'variable'=>pointSize, 'value'=>32)
-    add('separator')
-    style = TkVariable.new
-    add('radio', 'label'=>'Roman', 'variable'=>style, 'value'=>'roman')
-    add('radio', 'label'=>'Bold', 'variable'=>style, 'value'=>'bold')
-    add('radio', 'label'=>'Italic', 'variable'=>style, 'value'=>'italic')
-    add('separator')
-    add('command', 'label'=>'現在値の表示',
-        'command'=>proc{showVars($menu84_demo,
-                                 ['pointSize', pointSize],
-                                 ['style', style])} )
-    invoke 1
-    invoke 7
-  }
-}
-
-TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
-  $menu84_frame.add('cascade', 'label'=>'Icons', 'menu'=>m, 'underline'=>0)
-  add('command', 'hidemargin'=>1,
-      'bitmap'=>'@'+[$demo_dir,'..',
-                      'images','pattern.xbm'].join(File::Separator),
-      'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry',
-                                   'text'=>'あなたが選択したメニュー項目は、文字列の代わりにビットマップイメージで項目を表示したものです。それ以外の点では、ほかのメニュー項目との間で特に違いがあるわけではありません。',
-                                   'bitmap'=>'', 'default'=>0,
-                                   'buttons'=>'閉じる')} )
-  ['info', 'questhead', 'error'].each{|icon|
-    add('command', 'bitmap'=>icon, 'hidemargin'=>1,
-        'command'=>proc{print "You invoked the #{icon} bitmap\n"})
-  }
-
-  entryconfigure(2, :columnbreak=>true)
-}
-
-TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
-  $menu84_frame.add('cascade', 'label'=>'More', 'menu'=>m, 'underline'=>0)
-  [ 'An entry','Another entry','Does nothing','Does almost nothing',
-    'Make life meaningful' ].each{|i|
-    add('command', 'label'=>i,
-        'command'=>proc{print "You invoked \"#{i}\"\n"})
-  }
-
-  m.entryconfigure('Does almost nothing',
-                   'bitmap'=>'questhead', 'compound'=>'left',
-                   'command'=>proc{
-                     TkDialog.new('title'=>'Compound Menu Entry',
-                                  'message'=>'あなたが選択したメニュー項目は、ビットマップイメージと文字列とを同時に一つの項目に表示するようにしたものです。それ以外の点では、ほかのメニュー項目との間で特に違いがあるわけではありません。',
-                                  'buttons'=>['了解'], 'bitmap'=>'')
-                   })
-}
-
-TkMenu.new($menu84_frame) {|m|
-  $menu84_frame.add('cascade', 'label'=>'Colors', 'menu'=>m, 'underline'=>0)
-  ['red', 'orange', 'yellow', 'green', 'blue'].each{|c|
-    add('command', 'label'=>c, 'background'=>c,
-        'command'=>proc{print "You invoked \"#{c}\"\n"})
-  }
-}
-
-$menu84_demo.menu($menu84_frame)
-
-TkMenu.bind('<MenuSelect>', proc{|w|
-              begin
-                label = w.entrycget('active', 'label')
-              rescue
-                label = "    "
-              end
-              menustatus.value = label
-              Tk.update(true)
-            }, '%W')
diff --git a/ext/tk/sample/demos-jp/menu8x.rb b/ext/tk/sample/demos-jp/menu8x.rb
deleted file mode 100644
index c61753dd19..0000000000
--- a/ext/tk/sample/demos-jp/menu8x.rb
+++ /dev/null
@@ -1,234 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# menus widget demo (called by 'widget')
-#
-
-# toplevel widget が存在すれば削除する
-if defined?($menu8x_demo) && $menu8x_demo
-  $menu8x_demo.destroy
-  $menu8x_demo = nil
-end
-
-# demo 用の toplevel widget を生成
-$menu8x_demo = TkToplevel.new {|w|
-  title("Menu Demonstration (Tk8.x)")
-  iconname("menu")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($menu8x_demo).pack(:fill=>:both, :expand=>true)
-
-# version check
-if $tk_version.to_f < 8.0
-
-# label 生成
-TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
-    text("実行しようとしたスクリプトは Tk8.0 以上で利用できる機能を利用しているため、あなたの Ruby#{VERSION}/Tk#{$tk_version}#{(Tk::JAPANIZED_TK)? 'jp': ''} では正常に実行できません。よってデモの実行を中止しました。ただし、下のコード参照ボタンを押すことで、実行が中止されたスクリプトのソースを参照することは可能です。")
-}.pack('side'=>'top')
-
-# frame 生成
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc{
-      tmppath = $menu8x_demo
-      $menu8x_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc{showCode 'menu8x'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-else ; # Tk8.x
-
-begin
-  windowingsystem = Tk.windowingsystem()
-rescue
-  windowingsystem = ""
-end
-
-# label 生成
-TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
-  if $tk_platform['platform'] == 'macintosh' ||
-      windowingsystem == "classic" || windowingsystem == "aqua"
-    text("このウィンドウは様々なメニューとカスケードメニューから構成されています。Command-X を入力すると、Xがコマンドキー記号に続いて表示されている文字ならば、アクセラレータを使った項目起動を行うことができます。メニュー要素中、最後のものは、そのメニューの最初の項目を選択することで独立させることができます。")
-  else
-    text("このウィンドウは様々なメニューとカスケードメニューから構成されています。Alt-X を入力すると、Xがメニューにアンダーライン付きで表示されている文字ならば、キーボードからの指定ができます。矢印キーでメニューのトラバースも可能です。メニューが指定された際には、スペースキーで実行することができます。あるいは、アンダーライン付きの文字を入力することでも実行できます。メニューのエントリがアクセラレータを持っている場合は、そのアクセラレータを入力することでメニューを指定することなしに実行することができます。メニュー要素中、最後のものは、そのメニューの最初の項目を選択することで独立させることができます。")
-  end
-}.pack('side'=>'top')
-
-# 状態表示の生成
-$menu8xstatus = TkVariable.new("    ")
-TkFrame.new(base_frame) {|frame|
-  TkLabel.new(frame, 'textvariable'=>$menu8xstatus, 'relief'=>'sunken',
-              'bd'=>1, 'font'=>['Helvetica', '10'], 'anchor'=>'w')\
-  .pack('side'=>'left', 'padx'=>2, 'expand'=>'yes', 'fill'=>'both')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>2)
-
-# frame 生成
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc{
-      tmppath = $menu8x_demo
-      $menu8x_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc{showCode 'menu8x'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# menu 生成
-TkMenu.new($menu8x_demo, 'tearoff'=>false) {|m|
-  TkMenu.new(m, 'tearoff'=>false) {|file_menu|
-    m.add('cascade', 'label'=>'File', 'menu'=>file_menu, 'underline'=>0)
-    add('command', 'label'=>'開く ...', 'command'=>proc{fail 'これは、デモですので"開く ..."に対するアクションは定義されていません。'})
-    add('command', 'label'=>'新規', 'command'=>proc{fail 'これは、デモですので"新規"に対するアクションは定義されていません。'})
-    add('command', 'label'=>'保存', 'command'=>proc{fail 'これは、デモですので"保存"に対するアクションは定義されていません。'})
-    add('command', 'label'=>'保存(指定) ...', 'command'=>proc{fail 'これは、デモですので"保存(指定) ..."に対するアクションは定義されていません。'})
-    add('separator')
-    add('command', 'label'=>'プリント設定 ...', 'command'=>proc{fail 'これは、デモですので"プリント設定 ..."に対するアクションは定義されていません。'})
-    add('command', 'label'=>'プリント ...', 'command'=>proc{fail 'これは、デモですので"プリント ..."に対するアクションは定義されていません。'})
-    add('separator')
-    add('command', 'label'=>'終了', 'command'=>proc{$menu8x_demo.destroy})
-  }
-
-  if $tk_platform['platform'] == 'macintosh' ||
-      windowingsystem == "classic" || windowingsystem == "aqua"
-    modifier = 'Command'
-  elsif $tk_platform['platform'] == 'windows'
-    modifier = 'Control'
-  else
-    modifier = 'Meta'
-  end
-
-  TkMenu.new(m, 'tearoff'=>false) {|basic_menu|
-    m.add('cascade', 'label'=>'Basic', 'menu'=>basic_menu, 'underline'=>0)
-    add('command', 'label'=>'何もしない長いエントリ')
-    ['A','B','C','D','E','F','G'].each{|c|
-      # add('command', 'label'=>"文字 \"#{c}\" を印字", 'underline'=>4,
-      add('command', 'label'=>"Print letter \"#{c}\" (文字 \"#{c}\" を印字)",
-          'underline'=>14,
-          'command'=>proc{print c,"\n"}, 'accelerator'=>"#{modifier}+#{c}")
-      $menu8x_demo.bind("#{modifier}-#{c.downcase}", proc{print c,"\n"})
-    }
-  }
-
-  TkMenu.new(m, 'tearoff'=>false) {|cascade_menu|
-    m.add('cascade', 'label'=>'Cascades', 'menu'=>cascade_menu, 'underline'=>0)
-    add('command', 'label'=>'Print hello(こんにちは)',
-        'command'=>proc{print "Hello(こんにちは)\n"},
-        'accelerator'=>"#{modifier}+H", 'underline'=>6)
-    $menu8x_demo.bind("#{modifier}-h", proc{print "Hello(こんにちは)\n"})
-    add('command', 'label'=>'Print goodbye(さようなら)',
-        'command'=>proc{print "Goodbye(さようなら)\n"},
-        'accelerator'=>"#{modifier}+G", 'underline'=>6)
-    $menu8x_demo.bind("#{modifier}-g", proc{print "Goodbye(さようなら)\n"})
-
-    TkMenu.new(m, 'tearoff'=>false) {|cascade_check|
-      cascade_menu.add('cascade', 'label'=>'Check buttons(チェックボタン)',
-                       'menu'=>cascade_check, 'underline'=>0)
-      oil = TkVariable.new(0)
-      add('check', 'label'=>'オイル点検', 'variable'=>oil)
-      trans = TkVariable.new(0)
-      add('check', 'label'=>'トランスミッション点検', 'variable'=>trans)
-      brakes = TkVariable.new(0)
-      add('check', 'label'=>'ブレーキ点検', 'variable'=>brakes)
-      lights = TkVariable.new(0)
-      add('check', 'label'=>'ライト点検', 'variable'=>lights)
-      add('separator')
-      add('command', 'label'=>'現在の値を表示',
-          'command'=>proc{showVars($menu8x_demo,
-                                   ['オイル点検', oil],
-                                   ['トランスミッション点検', trans],
-                                   ['ブレーキ点検', brakes],
-                                   ['ライト点検', lights])} )
-      invoke 1
-      invoke 3
-    }
-
-    TkMenu.new(m, 'tearoff'=>false) {|cascade_radio|
-      cascade_menu.add('cascade', 'label'=>'Radio buttons(ラジオボタン)',
-                       'menu'=>cascade_radio, 'underline'=>0)
-      pointSize = TkVariable.new
-      add('radio', 'label'=>'10 ポイント', 'variable'=>pointSize, 'value'=>10)
-      add('radio', 'label'=>'14 ポイント', 'variable'=>pointSize, 'value'=>14)
-      add('radio', 'label'=>'18 ポイント', 'variable'=>pointSize, 'value'=>18)
-      add('radio', 'label'=>'24 ポイント', 'variable'=>pointSize, 'value'=>24)
-      add('radio', 'label'=>'32 ポイント', 'variable'=>pointSize, 'value'=>32)
-      add('separator')
-      style = TkVariable.new
-      add('radio', 'label'=>'ローマン', 'variable'=>style, 'value'=>'roman')
-      add('radio', 'label'=>'ボールド', 'variable'=>style, 'value'=>'bold')
-      add('radio', 'label'=>'イタリック', 'variable'=>style, 'value'=>'italic')
-      add('separator')
-      add('command', 'label'=>'現在の値を表示',
-          'command'=>proc{showVars($menu8x_demo,
-                                   ['ポイントサイズ', pointSize],
-                                   ['スタイル', style])} )
-      invoke 1
-      invoke 7
-    }
-  }
-
-  TkMenu.new(m, 'tearoff'=>false) {|icon_menu|
-    m.add('cascade', 'label'=>'Icons', 'menu'=>icon_menu, 'underline'=>0)
-    add('command',
-        'bitmap'=>'@'+[$demo_dir,'..',
-                        'images','pattern.xbm'].join(File::Separator),
-        'hidemargin'=>1,
-        'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry',
-                                     'text'=>'今あなたが選択したメニューの項目はテキストではなくビットマップを表示していました。それ以外の点では他のメニュー項目と変わりません。',
-                                     'bitmap'=>'', 'default'=>0,
-                                     'buttons'=>'了解')} )
-    ['info', 'questhead', 'error'].each{|icon|
-      add('command', 'bitmap'=>icon, 'hidemargin'=>1,
-          'command'=>proc{print "You invoked the #{icon} bitmap\n"})
-    }
-
-    entryconfigure(2, 'columnbreak'=>1)
-  }
-
-  TkMenu.new(m, 'tearoff'=>false) {|more_menu|
-    m.add('cascade', 'label'=>'More', 'menu'=>more_menu, 'underline'=>0)
-    [ 'エントリ','別のエントリ','何もしない','ほとんど何もしない',
-      '人生を意義あるものに' ].each{|i|
-      add('command', 'label'=>i,
-          'command'=>proc{print "You invoked \"#{i}\"\n"})
-    }
-  }
-
-  TkMenu.new(m) {|colors_menu|
-    m.add('cascade', 'label'=>'Colors', 'menu'=>colors_menu, 'underline'=>1)
-    ['red', 'orange', 'yellow', 'green', 'blue'].each{|c|
-      add('command', 'label'=>c, 'background'=>c,
-          'command'=>proc{print "You invoked \"#{c}\"\n"})
-    }
-  }
-
-  $menu8x_demo.configure('menu'=>m)
-}
-
-TkMenu.bind('<MenuSelect>',
-            proc{|w|
-              begin
-                label = w.entrycget('active', 'label')
-              rescue
-                label = '    '
-              end
-              $menu8xstatus.value = label
-              Tk.update('idletasks')
-            }, '%W')
-
-end ; # Tk 8.x
diff --git a/ext/tk/sample/demos-jp/menubu.rb b/ext/tk/sample/demos-jp/menubu.rb
deleted file mode 100644
index 57b1d41420..0000000000
--- a/ext/tk/sample/demos-jp/menubu.rb
+++ /dev/null
@@ -1,239 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-require "tkcanvas"
-
-def optionMenu(menubutton, varName, firstValue, *rest)
-  varName.value = firstValue
-  configoptions = {'textvariable'=>varName,'indicatoron'=>'on',
-    'relief'=>'raised','borderwidth'=>2,'highlightthickness'=>2,
-    'anchor'=>'c','direction'=>'flush'}
-  configoptions.each {|key, value|
-    menubutton.configure(key, value)
-  }
-  menu = TkMenu.new(menubutton) {
-    tearoff 'off'
-    add 'radio', 'label'=>firstValue, 'variable'=>varName
-  }
-  menubutton.menu(menu)
-  for i in rest
-    menu.add 'radio', 'label'=>i, 'variable'=>varName
-  end
-
-  return menu
-end
-
-if defined?($menubu_demo) && $menubu_demo
-  $menubu_demo.destroy
-  $menubu_demo = nil
-end
-
-$menubu_demo = TkToplevel.new {|w|
-  title("Menu Button Demonstration")
-  iconname("menubutton")
-}
-
-positionWindow($menubu_demo)
-
-base_frame = TkFrame.new($menubu_demo).pack(:fill=>:both, :expand=>true)
-
-# version check
-if $tk_version.to_f < 8.0
-
-# label 生成
-TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
-    text("実行しようとしたスクリプトは Tk8.0 以上で利用できる機能を利用しているため、あなたの Ruby#{VERSION}/Tk#{$tk_version}#{(Tk::JAPANIZED_TK)? 'jp': ''} では正常に実行できません。よってデモの実行を中止しました。ただし、下のコード参照ボタンを押すことで、実行が中止されたスクリプトのソースを参照することは可能です。")
-}.pack('side'=>'top')
-
-# frame 生成
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc{
-      tmppath = $menubu_demo
-      $menubu_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc{showCode 'menubu'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-else ; # Tk8.x
-
-body = TkFrame.new(base_frame)
-body.pack('expand'=>'yes', 'fill'=>'both')
-
-below = TkMenubutton.new(body) {
-  text "Below"
-  underline 0
-  direction 'below'
-  relief 'raised'
-}
-belowMenu = TkMenu.new(below) {
-  tearoff 0
-  add 'command', 'label'=>"Below menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Below menu.\""}
-  add 'command', 'label'=>"Below menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Below menu.\""}
-}
-below.menu(belowMenu)
-below.grid('row'=>0, 'column'=>1, 'sticky'=>'n')
-
-below = TkMenubutton.new(body) {
-  text "Below"
-  underline 0
-  direction 'below'
-  relief 'raised'
-}
-belowMenu = TkMenu.new(below) {
-  tearoff 0
-  add 'command', 'label'=>"Below menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Below menu.\""}
-  add 'command', 'label'=>"Below menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Below menu.\""}
-}
-below.menu(belowMenu)
-below.grid('row'=>0, 'column'=>1, 'sticky'=>'n')
-
-below = TkMenubutton.new(body) {
-  text "Below"
-  underline 0
-  direction 'below'
-  relief 'raised'
-}
-belowMenu = TkMenu.new(below) {
-  tearoff 0
-  add 'command', 'label'=>"Below menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Below menu.\""}
-  add 'command', 'label'=>"Below menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Below menu.\""}
-}
-below.menu(belowMenu)
-below.grid('row'=>0, 'column'=>1, 'sticky'=>'n')
-
-right = TkMenubutton.new(body) {
-  text "Right"
-  underline 0
-  direction 'right'
-  relief 'raised'
-}
-rightMenu = TkMenu.new(right) {
-  tearoff 0
-  add 'command', 'label'=>"Right menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Left menu.\""}
-  add 'command', 'label'=>"Right menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Right menu.\""}
-}
-right.menu(rightMenu)
-right.grid('row'=>1, 'column'=>0, 'sticky'=>'w')
-
-left = TkMenubutton.new(body) {
-  text "Left"
-  underline 0
-  direction 'left'
-  relief 'raised'
-}
-leftMenu = TkMenu.new(left) {
-  tearoff 0
-  add 'command', 'label'=>"Left menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Left menu.\""}
-  add 'command', 'label'=>"Left menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Left menu.\""}
-}
-left.menu(leftMenu)
-left.grid('row'=>1, 'column'=>2, 'sticky'=>'e')
-
-center = TkFrame.new(body) {
-  grid('row'=>1, 'column'=>1, 'sticky'=>'news')
-}
-
-above = TkMenubutton.new(body) {
-  text "Above"
-  underline 0
-  direction 'above'
-  relief 'raised'
-}
-aboveMenu = TkMenu.new(above) {
-  tearoff 0
-  add 'command', 'label'=>"Above menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Above menu.\""}
-  add 'command', 'label'=>"Above menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Above menu.\""}
-}
-above.menu(aboveMenu)
-above.grid('row'=>2, 'column'=>1, 'sticky'=>'s')
-
-center = TkFrame.new(body) {
-  grid('row'=>1, 'column'=>1, 'sticky'=>'news')
-}
-
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc {
-      tmppath = $menubu_demo
-      $menubu_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc { showCode 'menubu' }
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'expand'=>'yes', 'fill'=>'x', 'pady'=>'2m')
-
-msg = TkLabel.new(center) {
-#  font $font
-  wraplength '4i'
-  justify 'left'
-  text "これはメニューボタンのデモです。\"Below\"のボタンは\
-下にメニューを出し、\"Right\"のボタンは右にメニューを出して、\
-……となります。この文章の下には2つのオプションメニューがあります。\
-1つは普通のメニューで、もう1つは16色のパレットです。"
-}
-msg.pack('side'=>'top', 'padx'=>25, 'pady'=>25)
-
-TkFrame.new(center) {|f|
-  menubuttonoptions = TkVariable.new
-  mbutton = TkMenubutton.new(f)
-  options = optionMenu(mbutton, menubuttonoptions,
-                       'one', 'two', 'three')
-  mbutton.pack('side'=>'left', 'padx'=>25, 'pady'=>25)
-  paletteColor = TkVariable.new
-  colors = ['Black','red4','DarkGreen','NavyBlue', 'gray75',
-    'Red','Green','Blue','gray50','Yellow','Cyan','Magenta',
-    'White','Brown','DarkSeaGreen','DarkViolet']
-  colorMenuButton = TkMenubutton.new(f)
-  m = optionMenu(colorMenuButton, paletteColor, *colors)
-  begin
-    windowingsystem = Tk.windowingsystem()
-  rescue
-    windowingsystem = ""
-  end
-  if windowingsystem == "classic" || windowingsystem == "aqua"
-    topBorderColor = 'Black'
-    bottomBorderColor = 'Black'
-  else
-    topBorderColor = 'gray50'
-    bottomBorderColor = 'gray75'
-  end
-  for i in 0..15
-    image = TkPhotoImage.new('height'=>16, 'width'=>16)
-    image.put(topBorderColor, 0, 0, 16, 1)
-    image.put(topBorderColor, 0, 1, 1, 16)
-    image.put(bottomBorderColor, 0, 15, 16, 16)
-    image.put(bottomBorderColor, 15, 1, 16, 16)
-    image.put(colors[i], 1, 1, 15, 15)
-
-    selectimage = TkPhotoImage.new('height'=>16, 'width'=>16)
-    selectimage.put('Black', 0, 0, 16, 2)
-    selectimage.put('Black', 0, 2, 2, 16)
-    selectimage.put('Black', 2, 14, 16, 16)
-    selectimage.put('Black', 14, 2, 16, 14)
-    selectimage.put(colors[i], 2, 2, 14, 14)
-
-    m.entryconfigure(i, 'image'=>image, 'selectimage'=>selectimage, 'hidemargin'=>'on')
-  end
-  m.configure('tearoff', 'on')
-  for c in ['Black', 'gray75', 'gray50', 'White']
-    m.entryconfigure(c, 'columnbreak'=>1)
-  end
-  colorMenuButton.pack('side'=>'left', 'padx'=>25, 'pady'=>25)
-  pack 'padx'=>25, 'pady'=>25
-}
-
-end ; # Tk8.x
diff --git a/ext/tk/sample/demos-jp/msgbox.rb b/ext/tk/sample/demos-jp/msgbox.rb
deleted file mode 100644
index 45d8b8e9f9..0000000000
--- a/ext/tk/sample/demos-jp/msgbox.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# message boxes widget demo (called by 'widget')
-#
-
-# toplevel widget が存在すれば削除する
-if defined?($msgbox_demo) && $msgbox_demo
-  $msgbox_demo.destroy
-  $msgbox_demo = nil
-end
-
-# demo 用の toplevel widget を生成
-$msgbox_demo = TkToplevel.new {|w|
-  title("Message Box Demonstration")
-  iconname("messagebox")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($msgbox_demo).pack(:fill=>:both, :expand=>true)
-
-# label 生成
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'4i', 'justify'=>'left',
-            'text'=>"まず表示するアイコンとメッセージボックスの種類を選んで下さい。その後に\"メッセージボックス\"ボタンを押すと、指定したメッセージボックスが表示されます。").pack('side'=>'top')
-
-# frame 生成
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc{
-      tmppath = $msgbox_demo
-      $msgbox_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc{showCode 'msgbox'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'メッセージボックス'
-    command proc{showMessageBox $msgbox_demo}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame 生成
-$msgbox_leftframe  = TkFrame.new(base_frame)
-$msgbox_rightframe = TkFrame.new(base_frame)
-$msgbox_leftframe .pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y',
-                        'pady'=>'.5c', 'padx'=>'.5c')
-$msgbox_rightframe.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y',
-                        'pady'=>'.5c', 'padx'=>'.5c')
-
-TkLabel.new($msgbox_leftframe, 'text'=>'アイコン').pack('side'=>'top')
-TkFrame.new($msgbox_leftframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
-.pack('side'=>'top', 'fill'=>'x', 'expand'=>'no')
-
-$msgboxIcon = TkVariable.new('info')
-['error', 'info', 'question', 'warning'].each {|icon|
-  TkRadioButton.new($msgbox_leftframe, 'text'=>icon, 'variable'=>$msgboxIcon,
-                    'relief'=>'flat', 'value'=>icon, 'width'=>16,
-                    'anchor'=>'w').pack('side'=>'top', 'pady'=>2,
-                                        'anchor'=>'w', 'fill'=>'x')
-}
-
-TkLabel.new($msgbox_rightframe, 'text'=>'種類').pack('side'=>'top')
-TkFrame.new($msgbox_rightframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
-.pack('side'=>'top', 'fill'=>'x', 'expand'=>'no')
-
-$msgboxType = TkVariable.new('ok')
-['abortretryignore', 'ok', 'okcancel',
-  'retrycancel', 'yesno', 'yesnocancel'].each {|type|
-  TkRadioButton.new($msgbox_rightframe, 'text'=>type, 'variable'=>$msgboxType,
-                    'relief'=>'flat', 'value'=>type, 'width'=>16,
-                    'anchor'=>'w').pack('side'=>'top', 'pady'=>2,
-                                        'anchor'=>'w', 'fill'=>'x')
-}
-
-def showMessageBox(w)
-  button = Tk.messageBox('icon'=>$msgboxIcon.value, 'type'=>$msgboxType.value,
-                         'title'=>'Message', 'parent'=>w,
-                         'message'=>"これは\"#{$msgboxType.value}\"という種類のメッセージボックスで、\"#{$msgboxIcon.value}\"のアイコンが表示されています。")
-
-  Tk.messageBox('icon'=>'info', 'type'=>'ok', 'parent'=>w,
-                'message'=>"あなたは \"#{button}\" を押しましたね。")
-end
-
diff --git a/ext/tk/sample/demos-jp/msgbox2.rb b/ext/tk/sample/demos-jp/msgbox2.rb
deleted file mode 100644
index 51a0ca9dcc..0000000000
--- a/ext/tk/sample/demos-jp/msgbox2.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# message boxes widget demo (called by 'widget')
-#
-
-# toplevel widget が存在すれば削除する
-if defined?($msgbox2_demo) && $msgbox2_demo
-  $msgbox2_demo.destroy
-  $msgbox2_demo = nil
-end
-
-# demo 用の toplevel widget を生成
-$msgbox2_demo = TkToplevel.new {|w|
-  title("Message Box Demonstration")
-  iconname("messagebox")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($msgbox2_demo).pack(:fill=>:both, :expand=>true)
-
-# label 生成
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'4i', 'justify'=>'left',
-            'text'=>"まず表示するアイコンとメッセージボックスの種類を選んで下さい。その後に\"メッセージボックス\"ボタンを押すと、指定された形式で、メッセージと詳細テキストとを持ったメッセージボックスが表示されます。").pack('side'=>'top')
-
-# frame 生成
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc{
-      tmppath = $msgbox2_demo
-      $msgbox2_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc{showCode 'msgbox2'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'メッセージボックス'
-    command proc{showMessageBox2 $msgbox2_demo}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame 生成
-$msgbox_leftframe  = TkFrame.new(base_frame)
-$msgbox_rightframe = TkFrame.new(base_frame)
-$msgbox_leftframe .pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y',
-                        'pady'=>'.5c', 'padx'=>'.5c')
-$msgbox_rightframe.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y',
-                        'pady'=>'.5c', 'padx'=>'.5c')
-
-TkLabel.new($msgbox_leftframe, 'text'=>'アイコン').pack('side'=>'top')
-TkFrame.new($msgbox_leftframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
-.pack('side'=>'top', 'fill'=>'x', 'expand'=>'no')
-
-$msgboxIcon = TkVariable.new('info')
-['error', 'info', 'question', 'warning'].each {|icon|
-  TkRadioButton.new($msgbox_leftframe, 'text'=>icon, 'variable'=>$msgboxIcon,
-                    'relief'=>'flat', 'value'=>icon, 'width'=>16,
-                    'anchor'=>'w').pack('side'=>'top', 'pady'=>2,
-                                        'anchor'=>'w', 'fill'=>'x')
-}
-
-TkLabel.new($msgbox_rightframe, 'text'=>'種類').pack('side'=>'top')
-TkFrame.new($msgbox_rightframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
-.pack('side'=>'top', 'fill'=>'x', 'expand'=>'no')
-
-$msgboxType = TkVariable.new('ok')
-['abortretryignore', 'ok', 'okcancel',
-  'retrycancel', 'yesno', 'yesnocancel'].each {|type|
-  TkRadioButton.new($msgbox_rightframe, 'text'=>type, 'variable'=>$msgboxType,
-                    'relief'=>'flat', 'value'=>type, 'width'=>16,
-                    'anchor'=>'w').pack('side'=>'top', 'pady'=>2,
-                                        'anchor'=>'w', 'fill'=>'x')
-}
-
-def showMessageBox2(w)
-  button = Tk.messageBox('icon'=>$msgboxIcon.value, 'type'=>$msgboxType.value,
-                         'title'=>'Message', 'parent'=>w,
-                         'message'=>"\"#{$msgboxType.value}\"タイプのメッセージボックス",
-                         'detail'=>"これは\"#{$msgboxType.value}\"という種類のメッセージボックスで、\"#{$msgboxIcon.value}\"のアイコンが表示されています。下のボタンのいずれかを選択してクリックしてください。")
-
-  Tk.messageBox('icon'=>'info', 'type'=>'ok', 'parent'=>w,
-                'message'=>"あなたは \"#{button}\" を押しましたね。")
-end
-
diff --git a/ext/tk/sample/demos-jp/paned1.rb b/ext/tk/sample/demos-jp/paned1.rb
deleted file mode 100644
index 96e419bec0..0000000000
--- a/ext/tk/sample/demos-jp/paned1.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# paned1.rb
-#
-# This demonstration script creates a toplevel window containing
-# a paned window that separates two windows horizontally.
-#
-# based on "Id: paned1.tcl,v 1.1 2002/02/22 14:07:01 dkf Exp"
-
-if defined?($paned1_demo) && $paned1_demo
-  $paned1_demo.destroy
-  $paned1_demo = nil
-end
-
-$paned1_demo = TkToplevel.new {|w|
-  title("Horizontal Paned Window Demonstration")
-  iconname("paned1")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($paned1_demo).pack(:fill=>:both, :expand=>true)
-
-TkLabel.new(base_frame,
-            :font=>$font, :wraplength=>'4i', :justify=>:left,
-            :text=><<EOL).pack(:side=>:top)
-下の色付けされた二つのウィンドウの間の仕切り枠は、一つの領域をそれぞれのウィンドウのために分割するためのものです。左ボタンで仕切りを操作すると、分割サイズ変更の操作途中では再表示はなされず、確定させたときに表示が更新されます。マウスによる仕切りの操作に追随してサイズを変更した表示がなわれるようにしたい場合は、マウスの中央ボタンを使ってください。
-もしあなたが使っている Ruby にリンクされている Tk ライブラリが panedwindow を実装していない
-場合、このデモはうまく動かないはずです。その場合には panedwindow が実装されているような
-より新しいバージョンの Tk を組み合わせて試す
-ようにしてください。
-EOL
-
-# The bottom buttons
-TkFrame.new(base_frame){|f|
-  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
-
-  TkButton.new(f, :text=>'閉じる', :width=>15, :command=>proc{
-                 $paned1_demo.destroy
-                 $paned1_demo = nil
-               }).pack(:side=>:left, :expand=>true)
-
-  TkButton.new(f, :text=>'コード参照', :width=>15, :command=>proc{
-                 showCode 'paned1'
-               }).pack(:side=>:left, :expand=>true)
-}
-
-TkPanedwindow.new(base_frame, :orient=>:horizontal){|f|
-  add(Tk::Label.new(f, :text=>"This is the\nleft side", :bg=>'yellow'),
-      Tk::Label.new(f, :text=>"This is the\nright side", :bg=>'cyan'))
-
-  pack(:side=>:top, :expand=>true, :fill=>:both, :pady=>2, :padx=>'2m')
-}
diff --git a/ext/tk/sample/demos-jp/paned2.rb b/ext/tk/sample/demos-jp/paned2.rb
deleted file mode 100644
index 11a02abe73..0000000000
--- a/ext/tk/sample/demos-jp/paned2.rb
+++ /dev/null
@@ -1,101 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# paned2.rb --
-#
-# This demonstration script creates a toplevel window containing
-# a paned window that separates two windows vertically.
-#
-# based on "Id: paned2.tcl,v 1.1 2002/02/22 14:07:01 dkf Exp"
-
-if defined?($paned2_demo) && $paned2_demo
-  $paned2_demo.destroy
-  $paned2_demo = nil
-end
-
-$paned2_demo = TkToplevel.new {|w|
-  title("Vertical Paned Window Demonstration")
-  iconname("paned2")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($paned2_demo).pack(:fill=>:both, :expand=>true)
-
-TkLabel.new(base_frame,
-            :font=>$font, :wraplength=>'4i', :justify=>:left,
-            :text=><<EOL).pack(:side=>:top)
-下のスクロールバー付きのウィジェットが置かれた二つのウィンドウの間の仕切り枠は、一つの領域をそれぞれのウィンドウのために分割するためのものです。左ボタンで仕切りを操作すると、分割サイズ変更の操作途中では再表示はなされず、確定させたときに表示が更新されます。マウスによる仕切りの操作に追随してサイズを変更した表示がなわれるようにしたい場合は、マウスの中央ボタンを使ってください。
-もしあなたが使っている Ruby にリンクされている Tk ライブラリが panedwindow を実装していない
-場合、このデモはうまく動かないはずです。その場合には panedwindow が実装されているような
-より新しいバージョンの Tk を組み合わせて試す
-ようにしてください。
-EOL
-
-# The bottom buttons
-TkFrame.new(base_frame){|f|
-  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
-
-  TkButton.new(f, :text=>'閉じる', :width=>15, :command=>proc{
-                 $paned2_demo.destroy
-                 $paned2_demo = nil
-               }).pack(:side=>:left, :expand=>true)
-
-  TkButton.new(f, :text=>'コード参照', :width=>15, :command=>proc{
-                 showCode 'paned2'
-               }).pack(:side=>:left, :expand=>true)
-}
-
-paneList = TkVariable.new  # define as normal variable (not array)
-paneList.value = [         # ruby's array --> tcl's list
-    'Ruby/Tk のウィジェット一覧',
-    'TkButton',
-    'TkCanvas',
-    'TkCheckbutton',
-    'TkEntry',
-    'TkFrame',
-    'TkLabel',
-    'TkLabelframe',
-    'TkListbox',
-    'TkMenu',
-    'TkMenubutton',
-    'TkMessage',
-    'TkPanedwindow',
-    'TkRadiobutton',
-    'TkScale',
-    'TkScrollbar',
-    'TkSpinbox',
-    'TkText',
-    'TkToplevel'
-]
-
-# Create the pane itself
-TkPanedwindow.new(base_frame, :orient=>:vertical){|f|
-  pack(:side=>:top, :expand=>true, :fill=>:both, :pady=>2, :padx=>'2m')
-
-  add(TkFrame.new(f){|paned2_top|
-        TkListbox.new(paned2_top, :listvariable=>paneList) {
-          # Invert the first item to highlight it
-          itemconfigure(0, :background=>self.cget(:foreground),
-                           :foreground=>self.cget(:background) )
-          yscrollbar(TkScrollbar.new(paned2_top).pack(:side=>:right,
-                                                      :fill=>:y))
-          pack(:fill=>:both, :expand=>true)
-        }
-      },
-
-      TkFrame.new(f, :height=>120) {|paned2_bottom|
-        # The bottom window is a text widget with scrollbar
-        paned2_xscr = TkScrollbar.new(paned2_bottom)
-        paned2_yscr = TkScrollbar.new(paned2_bottom)
-        paned2_text = TkText.new(paned2_bottom, :width=>30, :wrap=>:non) {
-          insert('1.0', 'ここに配置されているのは、' +
-                        'ごく普通のテキストウィジェットです。')
-          xscrollbar(paned2_xscr)
-          yscrollbar(paned2_yscr)
-        }
-        Tk.grid(paned2_text, paned2_yscr, :sticky=>'nsew')
-        Tk.grid(paned2_xscr, :sticky=>'nsew')
-        TkGrid.columnconfigure(paned2_bottom, 0, :weight=>1)
-        TkGrid.rowconfigure(paned2_bottom, 0, :weight=>1)
-      } )
-}
diff --git a/ext/tk/sample/demos-jp/pendulum.rb b/ext/tk/sample/demos-jp/pendulum.rb
deleted file mode 100644
index 06e6933548..0000000000
--- a/ext/tk/sample/demos-jp/pendulum.rb
+++ /dev/null
@@ -1,243 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# This demonstration illustrates how Tcl/Tk can be used to construct
-# simulations of physical systems.
-# (called by 'widget')
-#
-# based on Tcl/Tk8.5a2 widget demos
-
-# destroy toplevel widget for this demo script
-if defined?($pendulum_demo) && $pendulum_demo
-  $pendulum_demo.destroy
-  $pendulum_demo = nil
-end
-
-# create toplevel widget
-$pendulum_demo = TkToplevel.new {|w|
-  title("Pendulum Animation Demonstration")
-  iconname("pendulum")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($pendulum_demo).pack(:fill=>:both, :expand=>true)
-
-# create label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text 'このデモは、物理系のシミュレーションに関わるようなアニメーション実行するために Ruby/Tk をどのように用いることができるかを示しています。左側のキャンバスは単純な振り子である物理系自体のグラフィカル表現であるのに対し、右側のキャンバスは系の位相空間のグラフ（角速度と角度とをプロットしたもの）になっています。左側のキャンバス上でクリックおよびドラッグを行って振り子の重りの位置を変えてみてください。'
-}
-msg.pack('side'=>'top')
-
-# create frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc{
-      tmppath = $pendulum_demo
-      $pendulum_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc{showCode 'pendulum'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# animated wave
-class PendulumAnimationDemo
-  def initialize(frame)
-    # Create some structural widgets
-    @pane = TkPanedWindow.new(frame, :orient=>:horizontal).pack(:fill=>:both, :expand=>true)
-#    @pane.add(@lf1 = TkLabelFrame.new(@pane, :text=>'Pendulum Simulation'))
-#    @pane.add(@lf2 = TkLabelFrame.new(@pane, :text=>'Phase Space'))
-    @lf1 = TkLabelFrame.new(@pane, :text=>'Pendulum Simulation')
-    @lf2 = TkLabelFrame.new(@pane, :text=>'Phase Space')
-
-    # Create the canvas containing the graphical representation of the
-    # simulated system.
-    @c = TkCanvas.new(@lf1, :width=>320, :height=>200, :background=>'white',
-                      :borderwidth=>2, :relief=>:sunken)
-    TkcText.new(@c, 5, 5, :anchor=>:nw,
-                :text=>'Click to Adjust Bob Start Position')
-    # Coordinates of these items don't matter; they will be set properly below
-    @plate = TkcLine.new(@c, 0, 25, 320, 25, :width=>2, :fill=>'grey50')
-    @rod = TkcLine.new(@c, 1, 1, 1, 1, :width=>3, :fill=>'black')
-    @bob = TkcOval.new(@c, 1, 1, 2, 2,
-                       :width=>3, :fill=>'yellow', :outline=>'black')
-    TkcOval.new(@c, 155, 20, 165, 30, :fill=>'grey50', :outline=>'')
-
-    # pack
-    @c.pack(:fill=>:both, :expand=>true)
-
-    # Create the canvas containing the phase space graph; this consists of
-    # a line that gets gradually paler as it ages, which is an extremely
-    # effective visual trick.
-    @k = TkCanvas.new(@lf2, :width=>320, :height=>200, :background=>'white',
-                      :borderwidth=>2, :relief=>:sunken)
-    @y_axis = TkcLine.new(@k, 160, 200, 160, 0, :fill=>'grey75', :arrow=>:last)
-    @x_axis = TkcLine.new(@k, 0, 100, 320, 100, :fill=>'grey75', :arrow=>:last)
-
-    @graph = {}
-    90.step(0, -10){|i|
-      # Coordinates of these items don't matter;
-      # they will be set properly below
-      @graph[i] = TkcLine.new(@k, 0, 0, 1, 1, :smooth=>true, :fill=>"grey#{i}")
-    }
-
-    # labels
-    @label_theta = TkcText.new(@k, 0, 0, :anchor=>:ne,
-                               :text=>'q', :font=>'Symbol 8')
-    @label_dtheta = TkcText.new(@k, 0, 0, :anchor=>:ne,
-                               :text=>'dq', :font=>'Symbol 8')
-
-    # pack
-    @k.pack(:fill=>:both, :expand=>true)
-
-    # Initialize some variables
-    @points = []
-    @theta = 45.0
-    @dTheta = 0.0
-    @length = 150
-
-    # animation loop
-    @timer = TkTimer.new(15){ repeat }
-
-    # binding
-    @c.bindtags_unshift(btag = TkBindTag.new)
-    btag.bind('Destroy'){ @timer.stop }
-    btag.bind('1', proc{|x, y| @timer.stop; showPendulum(x.to_i, y.to_i)},
-              '%x %y')
-    btag.bind('B1-Motion', proc{|x, y| showPendulum(x.to_i, y.to_i)}, '%x %y')
-    btag.bind('ButtonRelease-1',
-              proc{|x, y| showPendulum(x.to_i, y.to_i); @timer.start },
-              '%x %y')
-
-    btag.bind('Configure', proc{|w| @plate.coords(0, 25, w.to_i, 25)}, '%w')
-
-    @k.bind('Configure', proc{|h, w|
-              h = h.to_i
-              w = w.to_i
-              @psh = h/2;
-              @psw = w/2
-              @x_axis.coords(2, @psh, w-2, @psh)
-              @y_axis.coords(@psw, h-2, @psw, 2)
-              @label_theta.coords(@psw-4, 6)
-              @label_dtheta.coords(w-6, @psh+4)
-            }, '%h %w')
-
-    # add
-    Tk.update
-    @pane.add(@lf1)
-    @pane.add(@lf2)
-
-    # init display
-    showPendulum
-
-    # animation start
-    @timer.start(500)
-  end
-
-  # This procedure makes the pendulum appear at the correct place on the
-  # canvas. If the additional arguments x, y are passed instead of computing
-  # the position of the pendulum from the length of the pendulum rod and its
-  # angle, the length and angle are computed in reverse from the given
-  # location (which is taken to be the centre of the pendulum bob.)
-  def showPendulum(x=nil, y=nil)
-    if x && y && (x != 160 || y != 25)
-      @dTheta = 0.0
-      x2 = x - 160
-      y2 = y - 25
-      @length = Math.hypot(x2, y2)
-      @theta = Math.atan2(x2,y2)*180/Math::PI
-    else
-      angle = @theta*Math::PI/180
-      x = 160 + @length*Math.sin(angle)
-      y = 25 + @length*Math.cos(angle)
-    end
-
-    @rod.coords(160, 25, x, y)
-    @bob.coords(x-15, y-15, x+15, y+15)
-  end
-
-  # Update the phase-space graph according to the current angle and the
-  # rate at which the angle is changing (the first derivative with
-  # respect to time.)
-  def showPhase
-    unless @psw && @psh
-      @psw = @k.width/2
-      @psh = @k.height/2
-    end
-    @points << @theta + @psw << -20*@dTheta + @psh
-    if @points.length > 100
-      @points = @points[-100..-1]
-    end
-    (0...100).step(10){|i|
-      first = - i
-      last = 11 - i
-      last = -1 if last >= 0
-      next if first > last
-      lst = @points[first..last]
-      @graph[i].coords(lst) if lst && lst.length >= 4
-    }
-  end
-
-  # This procedure is the "business" part of the simulation that does
-  # simple numerical integration of the formula for a simple rotational
-  # pendulum.
-  def recomputeAngle
-    scaling = 3000.0/@length/@length
-
-    # To estimate the integration accurately, we really need to
-    # compute the end-point of our time-step.  But to do *that*, we
-    # need to estimate the integration accurately!  So we try this
-    # technique, which is inaccurate, but better than doing it in a
-    # single step.  What we really want is bound up in the
-    # differential equation:
-    #       ..             - sin theta
-    #      theta + theta = -----------
-    #                         length
-    # But my math skills are not good enough to solve this!
-
-    # first estimate
-    firstDDTheta = -Math.sin(@theta * Math::PI/180) * scaling
-    midDTheta = @dTheta + firstDDTheta
-    midTheta = @theta + (@dTheta + midDTheta)/2
-    # second estimate
-    midDDTheta = -Math.sin(midTheta * Math::PI/180) * scaling
-    midDTheta = @dTheta + (firstDDTheta + midDDTheta)/2
-    midTheta = @theta + (@dTheta + midDTheta)/2
-    # Now we do a double-estimate approach for getting the final value
-    # first estimate
-    midDDTheta = -Math.sin(midTheta * Math::PI/180) * scaling
-    lastDTheta = midDTheta + midDDTheta
-    lastTheta = midTheta + (midDTheta+ lastDTheta)/2
-    # second estimate
-    lastDDTheta = -Math.sin(lastTheta * Math::PI/180) * scaling
-    lastDTheta = midDTheta + (midDDTheta + lastDDTheta)/2
-    lastTheta = midTheta + (midDTheta + lastDTheta)/2
-    # Now put the values back in our globals
-    @dTheta = lastDTheta
-    @theta = lastTheta
-  end
-
-  # This method ties together the simulation engine and the graphical
-  # display code that visualizes it.
-  def repeat
-    # Simulate
-    recomputeAngle
-
-    # Update the display
-    showPendulum
-    showPhase
-  end
-end
-
-# Start the animation processing
-PendulumAnimationDemo.new(base_frame)
diff --git a/ext/tk/sample/demos-jp/plot.rb b/ext/tk/sample/demos-jp/plot.rb
deleted file mode 100644
index 85970bb5b3..0000000000
--- a/ext/tk/sample/demos-jp/plot.rb
+++ /dev/null
@@ -1,127 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# 2-D plot widget demo (called by 'widget')
-#
-
-# toplevel widget が存在すれば削除する
-if defined?($plot_demo) && $plot_demo
-  $plot_demo.destroy
-  $plot_demo = nil
-end
-
-# demo 用の toplevel widget を生成
-$plot_demo = TkToplevel.new {|w|
-  title("Plot Demonstration")
-  iconname("Plot")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($plot_demo).pack(:fill=>:both, :expand=>true)
-
-# label 生成
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'4i', 'justify'=>'left',
-            'text'=>"このウィンドウは簡単な2次元のプロットを含んだキャンバス widgetです。表示された点をマウスボタン1でドラッグしてデータをいじることができます。"){
-  pack('side'=>'top')
-}
-
-# frame 生成
-$plot_buttons = TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc{
-      tmppath = $plot_demo
-      $plot_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc{showCode 'plot'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$plot_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# font 設定
-  if $tk_version =~ /^4.*/
-    plotFont = '-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*'
-  else
-    font = 'Helvetica 18'
-  end
-
-# canvas 設定
-$plot_canvas = TkCanvas.new(base_frame,'relief'=>'raised','width'=>450,'height'=>300)
-$plot_canvas.pack('side'=>'top', 'fill'=>'x')
-
-# plot 生成
-TkcLine.new($plot_canvas, 100, 250, 400, 250, 'width'=>2)
-TkcLine.new($plot_canvas, 100, 250, 100,  50, 'width'=>2)
-TkcText.new($plot_canvas, 225, 20,
-            'text'=>"簡単なプロット", 'font'=>plotFont, 'fill'=>'brown')
-
-(0..10).each {|i|
-  x = 100 + (i * 30)
-  TkcLine.new($plot_canvas, x, 250, x, 245, 'width'=>2)
-  TkcText.new($plot_canvas, x, 254,
-              'text'=>10*i, 'font'=>plotFont, 'anchor'=>'n')
-}
-(0..5).each {|i|
-  y = 250 - (i * 40)
-  TkcLine.new($plot_canvas, 100, y, 105, y, 'width'=>2)
-  TkcText.new($plot_canvas, 96, y,
-              'text'=>"#{i*50}.0", 'font'=>plotFont, 'anchor'=>'e')
-}
-
-for xx, yy in [[12,56],[20,94],[33,98],[32,120],[61,180],[75,160],[98,223]]
-  x = 100 + (3*xx)
-  y = 250 - (4*yy)/5
-  item = TkcOval.new($plot_canvas, x-6, y-6, x+6, y+6,
-                     'width'=>1, 'outline'=>'black', 'fill'=>'SkyBlue2')
-  item.addtag 'point'
-end
-
-$plot_canvas.itembind('point', 'Any-Enter',
-                      proc{$plot_canvas.itemconfigure 'current','fill','red'})
-$plot_canvas.itembind('point', 'Any-Leave',
-                      proc{$plot_canvas.itemconfigure 'current','fill','SkyBlue2'})
-$plot_canvas.itembind('point', '1',
-                      proc{|x,y| plotDown $plot_canvas,x,y}, "%x %y")
-$plot_canvas.itembind('point', 'ButtonRelease-1',
-                      proc{$plot_canvas.dtag 'selected'})
-$plot_canvas.bind('B1-Motion',
-                  proc{|x,y| plotMove $plot_canvas,x,y}, "%x %y")
-
-$plot = {'lastX'=>0, 'lastY'=>0}
-
-# plotDown --
-# This method is invoked when the mouse is pressed over one of the
-# data points.  It sets up state to allow the point to be dragged.
-#
-# Arguments:
-# w -           The canvas window.
-# x, y -        The coordinates of the mouse press.
-
-def plotDown (w, x, y)
-  w.dtag 'selected'
-  w.addtag_withtag 'selected', 'current'
-  w.raise 'current'
-  $plot['lastX'] = x
-  $plot['lastY'] = y
-end
-
-# plotMove --
-# This method is invoked during mouse motion events.  It drags the
-# current item.
-#
-# Arguments:
-# w -           The canvas window.
-# x, y -        The coordinates of the mouse.
-
-def plotMove (w, x, y)
-  w.move 'selected', x - $plot['lastX'], y - $plot['lastY']
-  $plot['lastX'] = x
-  $plot['lastY'] = y
-end
-
diff --git a/ext/tk/sample/demos-jp/puzzle.rb b/ext/tk/sample/demos-jp/puzzle.rb
deleted file mode 100644
index 8a0803ad3d..0000000000
--- a/ext/tk/sample/demos-jp/puzzle.rb
+++ /dev/null
@@ -1,132 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# widget demo 'puzzle' (called by 'widget')
-#
-
-# toplevel widget が存在すれば削除する
-if defined?($puzzle_demo) && $puzzle_demo
-  $puzzle_demo.destroy
-  $puzzle_demo = nil
-end
-
-# demo 用の toplevel widget を生成
-$puzzle_demo = TkToplevel.new {|w|
-  title("15-Puzzle Demonstration")
-  iconname("15-Puzzle")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($puzzle_demo).pack(:fill=>:both, :expand=>true)
-
-# label 生成
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "下の15-パズルはボタンを集めてできています。空いている所の隣のピースをクリックすると、そのピースがその空いている場所にスライドします。この操作を続け、ピースがその数の順に上から下、左から右に並ぶようにしてください。"
-}
-msg.pack('side'=>'top')
-
-# frame 生成
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc{
-      tmppath = $puzzle_demo
-      $puzzle_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc{showCode 'puzzle'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame 生成
-#
-# Special trick: scrollbar widget を生成してその trough color を用いることで
-#                空白部分のための暗色を選択し，設定する
-#
-begin
-  if Tk.windowingsystem() == 'aqua'
-    frameWidth  = 168
-    frameHeight = 168
-  elsif Tk.default_widget_set == :Ttk
-    frameWidth  = 148
-    frameHeight = 124
-  else
-    frameWidth  = 120
-    frameHeight = 120
-  end
-rescue
-  frameWidth  = 120
-  frameHeight = 120
-end
-
-# depend_on_button_width = true
-depend_on_button_width = false
-
-s = TkScrollbar.new(base_frame)
-base = TkFrame.new(base_frame) {
-  width  frameWidth
-  height frameHeight
-  borderwidth 2
-  relief 'sunken'
-  bg s['troughcolor']
-}
-s.destroy
-base.pack('side'=>'top', 'padx'=>'1c', 'pady'=>'1c')
-
-# proc のスコープを閉じるため，proc 生成メソッドを用意
-# こうしておかねば，ループ中で値が変化する num の影響を受けて
-# puzzleSwitch の第 2 引数が変化してしまい，期待通りにはならない．
-def def_puzzleswitch_proc(w, num)
-  proc{puzzleSwitch w, num}
-end
-
-$xpos = {}
-$ypos = {}
-order = [3,1,6,2,5,7,15,13,4,11,8,9,14,10,12]
-(0..14).each{|i|
-  num = order[i]
-  $xpos[num] = (i % 4) * 0.25
-  $ypos[num] = (i / 4) * 0.25
-  TkButton.new(base) {|w|
-    relief 'raised'
-    text num
-    highlightthickness 0
-    command def_puzzleswitch_proc(w, num)
-    if depend_on_button_width && (w.winfo_reqwidth * 4 > base.width)
-      base.width = w.winfo_reqwidth * 4
-    end
-  }.place('relx'=>$xpos[num], 'rely'=>$ypos[num],
-          'relwidth'=>0.25, 'relheight'=>0.25)
-}
-$xpos['space'] = 0.75
-$ypos['space'] = 0.75
-
-############
-def puzzleSwitch(w, num)
-  if ( ($ypos[num] >= ($ypos['space'] - 0.01))     \
-      && ($ypos[num] <= ($ypos['space'] + 0.01))   \
-      && ($xpos[num] >= ($xpos['space'] - 0.26))   \
-      && ($xpos[num] <= ($xpos['space'] + 0.26)))  \
-    || (($xpos[num] >= ($xpos['space'] - 0.01))    \
-        && ($xpos[num] <= ($xpos['space'] + 0.01)) \
-        && ($ypos[num] >= ($ypos['space'] - 0.26)) \
-        && ($ypos[num] <= ($ypos['space'] + 0.26)))
-    tmp = $xpos['space']
-    $xpos['space'] = $xpos[num]
-    $xpos[num] = tmp
-    tmp = $ypos['space']
-    $ypos['space'] = $ypos[num]
-    $ypos[num] = tmp
-    w.place('relx'=>$xpos[num], 'rely'=>$ypos[num])
-  end
-end
-
diff --git a/ext/tk/sample/demos-jp/radio.rb b/ext/tk/sample/demos-jp/radio.rb
deleted file mode 100644
index 4d84441687..0000000000
--- a/ext/tk/sample/demos-jp/radio.rb
+++ /dev/null
@@ -1,85 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# radiobutton widget demo (called by 'widget')
-#
-
-# toplevel widget が存在すれば削除する
-if defined?($radio_demo) && $radio_demo
-  $radio_demo.destroy
-  $radio_demo = nil
-end
-
-# demo 用の toplevel widget を生成
-$radio_demo = TkToplevel.new {|w|
-  title("Radiobutton Demonstration")
-  iconname("radio")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($radio_demo).pack(:fill=>:both, :expand=>true)
-
-# label 生成
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "下には2つのラジオボタングループが表示されています。ボタンをクリックすると、そのボタンだけがそのグループの中で選択されます。各グループに対してそのグループの中のどのボタンが選択されているかを示す変数が割り当てられています。現在の変数の値を見るには「変数参照」ボタンをクリックしてください。"
-}
-msg.pack('side'=>'top')
-
-# 変数生成
-size = TkVariable.new
-color = TkVariable.new
-
-# frame 生成
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc{
-      tmppath = $radio_demo
-      $radio_demo = nil
-      $showVarsWin[tmppath.path] = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc{showCode 'radio'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '変数参照'
-    command proc{
-      showVars(base_frame, ['size', size], ['color', color])
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame 生成
-f_left = TkFrame.new(base_frame)
-f_right = TkFrame.new(base_frame)
-f_left.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
-f_right.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
-
-# radiobutton 生成
-[10, 12, 18, 24].each {|sz|
-  TkRadioButton.new(f_left) {
-    text "ポイントサイズ #{sz}"
-    variable size
-    relief 'flat'
-    value sz
-  }.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w')
-}
-
-['赤', '緑', '青', '黄', '橙', '紫'].each {|col|
-  TkRadioButton.new(f_right) {
-    text col
-    variable color
-    relief 'flat'
-    value col.downcase
-  }.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w')
-}
-
diff --git a/ext/tk/sample/demos-jp/radio2.rb b/ext/tk/sample/demos-jp/radio2.rb
deleted file mode 100644
index 4416122876..0000000000
--- a/ext/tk/sample/demos-jp/radio2.rb
+++ /dev/null
@@ -1,113 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# radio2.rb
-#
-# This demonstration script creates a toplevel window containing
-# several radiobutton widgets.
-#
-# radiobutton widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($radio2_demo) && $radio2_demo
-  $radio2_demo.destroy
-  $radio2_demo = nil
-end
-
-# demo toplevel widget
-$radio2_demo = TkToplevel.new {|w|
-  title("Radiobutton Demonstration 2")
-  iconname("radio2")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($radio2_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '5i'
-  justify 'left'
-  text "下には3つのラジオボタングループが表示されています。ボタンをクリックすると、そのボタンだけがそのグループの中で選択されます。各グループに対してそのグループの中のどのボタンが選択されているかを示す変数が割り当てられています。現在の変数の値を見るには「変数参照」ボタンをクリックしてください。"
-}
-msg.pack('side'=>'top')
-
-#
-size = TkVariable.new
-color = TkVariable.new
-align = TkVariable.new
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc{
-      tmppath = $radio2_demo
-      $radio2_demo = nil
-      $showVarsWin[tmppath.path] = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc{showCode 'radio2'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text '変数参照'
-    command proc{
-      showVars(base_frame,
-               ['size', size], ['color', color], ['compound', align])
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame
-f_left  = TkLabelFrame.new(base_frame, 'text'=>'文字サイズ',
-                           'pady'=>2, 'padx'=>2)
-f_mid   = TkLabelFrame.new(base_frame, 'text'=>'色',
-                           'pady'=>2, 'padx'=>2)
-f_right = TkLabelFrame.new(base_frame, 'text'=>'ビットマップ配置',
-                           'pady'=>2, 'padx'=>2)
-f_left.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
-f_mid.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
-f_right.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
-
-# radiobutton
-[10, 12, 18, 24].each {|sz|
-  TkRadioButton.new(f_left) {
-    text "ポイントサイズ #{sz}"
-    variable size
-    relief 'flat'
-    value sz
-  }.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w', 'fill'=>'x')
-}
-
-['赤', '緑', '青', '黄', '橙', '紫'].each {|col|
-  TkRadioButton.new(f_mid) {
-    text col
-    variable color
-    relief 'flat'
-    value col.downcase
-    anchor 'w'
-  }.pack('side'=>'top', 'pady'=>2, 'fill'=>'x')
-}
-
-# label = TkLabel.new(f_right, 'text'=>'ラベル', 'bitmap'=>'questhead',
-label = Tk::Label.new(f_right, 'text'=>'ラベル', 'bitmap'=>'questhead',
-                    'compound'=>'left')
-label.configure('width'=>TkWinfo.reqwidth(label), 'compound'=>'top')
-label.height(TkWinfo.reqheight(label))
-abtn = ['Top', 'Left', 'Right', 'Bottom'].collect{|a|
-  lower = a.downcase
-  TkRadioButton.new(f_right, 'text'=>a, 'variable'=>align, 'relief'=>'flat',
-                    'value'=>lower, 'indicatoron'=>0, 'width'=>7,
-                    'command'=>proc{label.compound(align.value)})
-}
-
-Tk.grid('x', abtn[0])
-Tk.grid(abtn[1], label, abtn[2])
-Tk.grid('x', abtn[3])
diff --git a/ext/tk/sample/demos-jp/radio3.rb b/ext/tk/sample/demos-jp/radio3.rb
deleted file mode 100644
index 3f26ffb847..0000000000
--- a/ext/tk/sample/demos-jp/radio3.rb
+++ /dev/null
@@ -1,120 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# radio3.rb
-#
-# This demonstration script creates a toplevel window containing
-# several radiobutton widgets.
-#
-# radiobutton widget demo (called by 'widget')
-#
-
-# toplevel widget
-if defined?($radio3_demo) && $radio3_demo
-  $radio3_demo.destroy
-  $radio3_demo = nil
-end
-
-# demo toplevel widget
-$radio3_demo = TkToplevel.new {|w|
-  title("Radiobutton Demonstration 3")
-  iconname("radio3")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($radio3_demo).pack(:fill=>:both, :expand=>true)
-
-# label
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '5i'
-  justify 'left'
-  text '下には3つのラジオボタングループが表示されています。ボタンをクリックすると、そのグループに属するすべてのボタンの中でクリックしたボタンだけが選択された状態になります。各グループには、そのグループの中のどのボタンが選択されているかを示す変数が割り当てられています。「トライステート」ボタンが押されたときには、ラジオボタンの表示がトライステートモードになります。いずれかのボタンを選択すれば、ボタンの状態は元のように個々のボタンのon/off状態を示すようになります。現在の変数の値を見るには「変数参照」ボタンをクリックしてください。'
-}
-msg.grid(:row=>0, :column=>0, :columnspan=>3, :sticky=>'nsew')
-
-# variable
-size = TkVariable.new
-color = TkVariable.new
-align = TkVariable.new
-
-# frame
-TkFrame.new(base_frame) {|frame|
-  TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2),
-         :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         TkButton.new(frame, :text=>'変数参照',
-                      :image=>$image['view'], :compound=>:left,
-                      :command=>proc{
-                        showVars(base_frame, ['size', size],
-                                 ['color', color], ['compound', align])
-                      }),
-         TkButton.new(frame, :text=>'コード参照',
-                      :image=>$image['view'], :compound=>:left,
-                      :command=>proc{showCode 'radio3'}),
-         TkButton.new(frame, :text=>'閉じる',
-                      :image=>$image['delete'], :compound=>:left,
-                      :command=>proc{
-                        tmppath = $radio3_demo
-                        $radio3_demo = nil
-                        $showVarsWin[tmppath.path] = nil
-                        tmppath.destroy
-                      }),
-         :padx=>4, :pady=>4)
-  frame.grid_columnconfigure(0, :weight=>1)
-  TkGrid(frame, :row=>3, :column=>0, :columnspan=>3, :sticky=>'nsew')
-}
-
-# frame
-f_left  = TkLabelFrame.new(base_frame, 'text'=>'文字サイズ',
-                           'pady'=>2, 'padx'=>2)
-f_mid   = TkLabelFrame.new(base_frame, 'text'=>'色',
-                           'pady'=>2, 'padx'=>2)
-f_right = TkLabelFrame.new(base_frame, 'text'=>'ビットマップ配置',
-                           'pady'=>2, 'padx'=>2)
-f_left .grid('column'=>0, 'row'=>1, 'pady'=>'.5c', 'padx'=>'.5c', 'rowspan'=>2)
-f_mid  .grid('column'=>1, 'row'=>1, 'pady'=>'.5c', 'padx'=>'.5c', 'rowspan'=>2)
-f_right.grid('column'=>2, 'row'=>1, 'pady'=>'.5c', 'padx'=>'.5c')
-
-TkButton.new(base_frame, 'text'=>'トライステート',
-             'command'=>proc{size.value = 'multi'; color.value = 'multi'}){
-  grid('column'=>2, 'row'=>2, 'pady'=>'.5c', 'padx'=>'.5c')
-}
-
-# radiobutton
-[10, 12, 14, 18, 24].each {|sz|
-  TkRadioButton.new(f_left) {
-    text "ポイントサイズ #{sz}"
-    variable size
-    relief 'flat'
-    value sz
-    tristatevalue 'multi'
-  }.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w', 'fill'=>'x')
-}
-
-['Red', 'Green', 'Blue', 'Yellow', 'Orange', 'Purple'].each {|col|
-  TkRadioButton.new(f_mid) {
-    text col
-    variable color
-    relief 'flat'
-    value col.downcase
-    anchor 'w'
-    tristatevalue 'multi'
-    command proc{f_mid.fg(color.value)}
-  }.pack('side'=>'top', 'pady'=>2, 'fill'=>'x')
-}
-
-# label = TkLabel.new(f_right, 'text'=>'ラベル', 'bitmap'=>'questhead',
-label = Tk::Label.new(f_right, 'text'=>'ラベル', 'bitmap'=>'questhead',
-                    'compound'=>'left')
-label.configure('width'=>TkWinfo.reqwidth(label), 'compound'=>'top')
-label.height(TkWinfo.reqheight(label))
-a_btn = ['Top', 'Left', 'Right', 'Bottom'].collect{|a|
-  TkRadioButton.new(f_right, 'text'=>a, 'variable'=>align, 'relief'=>'flat',
-                    'value'=>a.downcase, 'indicatoron'=>0, 'width'=>7,
-                    'command'=>proc{label.compound(align.value)})
-}
-
-Tk.grid('x', a_btn[0])
-Tk.grid(a_btn[1], label, a_btn[2])
-Tk.grid('x', a_btn[3])
diff --git a/ext/tk/sample/demos-jp/rmt b/ext/tk/sample/demos-jp/rmt
deleted file mode 100644
index dcfb328fc8..0000000000
--- a/ext/tk/sample/demos-jp/rmt
+++ /dev/null
@@ -1,268 +0,0 @@
-#!/usr/bin/env ruby
-
-# rmt --
-# This script implements a simple remote-control mechanism for
-# Tk applications.  It allows you to select an application and
-# then type commands to that application.
-
-require 'tk'
-
-class Rmt
-  def initialize(parent=nil)
-    win = self
-
-    unless parent
-      parent = TkRoot.new
-    end
-    root = TkWinfo.toplevel(parent)
-    root.minsize(1,1)
-
-    # The instance variable below keeps track of the remote application
-    # that we're sending to.  If it's an empty string then we execute
-    # the commands locally.
-    @app = 'local'
-    @mode = 'Ruby'
-
-    # The instance variable below keeps track of whether we're in the
-    # middle of executing a command entered via the text.
-    @executing = 0
-
-    # The instance variable below keeps track of the last command executed,
-    # so it can be re-executed in response to !! commands.
-    @lastCommand = ""
-
-    # Create menu bar.  Arrange to recreate all the information in the
-    # applications sub-menu whenever it is cascaded to.
-
-    TkFrame.new(root, 'relief'=>'raised', 'bd'=>2) {|f|
-      pack('side'=>'top', 'fill'=>'x')
-      TkMenubutton.new(f, 'text'=>'File', 'underline'=>0) {|mb|
-	TkMenu.new(mb) {|mf|
-	  mb.menu(mf)
-	  TkMenu.new(mf) {|ma|
-	    postcommand proc{win.fillAppsMenu ma}
-	    mf.add('cascade', 'label'=>'Select Application',
-		   'menu'=>ma, 'underline'=>0)
-	  }
-	  add('command', 'label'=>'Quit',
-	      'command'=>proc{root.destroy}, 'underline'=>0)
-	}
-	pack('side'=>'left')
-      }
-    }
-
-    # Create text window and scrollbar.
-
-    @txt = TkText.new(root, 'relief'=>'sunken', 'bd'=>2, 'setgrid'=>true) {
-      yscrollbar(TkScrollbar.new(root){pack('side'=>'right', 'fill'=>'y')})
-      pack('side'=>'left')
-    }
-
-    @promptEnd = TkTextMark.new(@txt, 'insert')
-
-    # Create a binding to forward commands to the target application,
-    # plus modify many of the built-in bindings so that only information
-    # in the current command can be deleted (can still set the cursor
-    # earlier in the text and select and insert;  just can't delete).
-
-    @txt.bindtags([@txt, TkText, root, 'all'])
-    @txt.bind('Return', proc{
-		@txt.set_insert('end - 1c')
-		@txt.insert('insert', "\n")
-		win.invoke
-		Tk.callback_break
-	      })
-    @txt.bind('Delete', proc{
-		begin
-		  @txt.tag_remove('sel', 'sel.first', @promptEnd)
-		rescue
-		end
-		if @txt.tag_nextrange('sel', '1.0', 'end') == []
-		  if @txt.compare('insert', '<', @promptEnd)
-		    Tk.callback_break
-		  end
-		end
-	      })
-    @txt.bind('BackSpace', proc{
-		begin
-		  @txt.tag_remove('sel', 'sel.first', @promptEnd)
-		rescue
-		end
-		if @txt.tag_nextrange('sel', '1.0', 'end') == []
-		  if @txt.compare('insert', '<', @promptEnd)
-		    Tk.callback_break
-		  end
-		end
-	      })
-    @txt.bind('Control-d', proc{
-		if @txt.compare('insert', '<', @promptEnd)
-		  Tk.callback_break
-		end
-	      })
-    @txt.bind('Control-k', proc{
-		if @txt.compare('insert', '<', @promptEnd)
-		  @txt.set_insert(@promptEnd)
-		end
-	      })
-    @txt.bind('Control-t', proc{
-		if @txt.compare('insert', '<', @promptEnd)
-		  Tk.callback_break
-		end
-	      })
-    @txt.bind('Meta-d', proc{
-		if @txt.compare('insert', '<', @promptEnd)
-		  Tk.callback_break
-		end
-	      })
-    @txt.bind('Meta-BackSpace', proc{
-		if @txt.compare('insert', '<=', @promptEnd)
-		  Tk.callback_break
-		end
-	      })
-    @txt.bind('Control-h', proc{
-		if @txt.compare('insert', '<=', @promptEnd)
-		  Tk.callback_break
-		end
-	      })
-
-    @txt.tag_configure('bold', 'font'=>['Courier', 12, 'bold'])
-
-    @app = Tk.appname('rmt')
-    if (@app =~ /^rmt(.*)$/)
-      root.title("Tk Remote Controller#{$1}")
-      root.iconname("Tk Remote#{$1}")
-    end
-    prompt
-    @txt.focus
-    #@app = TkWinfo.appname(TkRoot.new)
-  end
-
-  def tkTextInsert(w,s)
-    return if s == ""
-    begin
-      if w.compare('sel.first','<=','insert') \
-	&& w.compare('sel.last','>=','insert')
-	w.tag_remove('sel', 'sel.first', @promptEnd)
-	w.delete('sel.first', 'sel.last')
-      end
-    rescue
-    end
-    w.insert('insert', s)
-    w.see('insert')
-  end
-
-  # The method below is used to print out a prompt at the
-  # insertion point (which should be at the beginning of a line
-  # right now).
-
-  def prompt
-    @txt.insert('insert', "#{@app}: ")
-    @promptEnd.set('insert')
-    @promptEnd.gravity = 'left'
-    @txt.tag_add('bold', "#{@promptEnd.path} linestart", @promptEnd)
-  end
-
-  # The method below executes a command (it takes everything on the
-  # current line after the prompt and either sends it to the remote
-  # application or executes it locally, depending on "app".
-
-  def invoke
-    cmd = @txt.get(@promptEnd, 'insert')
-    @executing += 1
-    case (@mode)
-    when 'Tcl'
-      if Tk.info('complete', cmd)
-	if (cmd == "!!\n")
-	  cmd = @lastCommand
-	else
-	  @lastCommand = cmd
-	end
-	begin
-	  msg = Tk.appsend(@app, false, cmd)
-	rescue
-	  msg = "Error: #{$!}"
-	end
-	@txt.insert('insert', msg + "\n") if msg != ""
-	prompt
-	@promptEnd.set('insert')
-      end
-
-    when 'Ruby'
-      if (cmd == "!!\n")
-	cmd = @lastCommand
-      end
-      complete = true
-      begin
-	eval("proc{#{cmd}}")
-      rescue
-	complete = false
-      end
-      if complete
-	@lastCommand = cmd
-	begin
-#	  msg = Tk.appsend(@app, false,
-#			   'ruby',
-#			   '"(' + cmd.gsub(/[][$"]/, '\\\\\&') + ').to_s"')
-	  msg = Tk.rb_appsend(@app, false, cmd)
-	rescue
-	  msg = "Error: #{$!}"
-	end
-	@txt.insert('insert', msg + "\n") if msg != ""
-	prompt
-	@promptEnd.set('insert')
-      end
-    end
-
-    @executing -= 1
-    @txt.yview_pickplace('insert')
-  end
-
-  # The following method is invoked to change the application that
-  # we're talking to.  It also updates the prompt for the current
-  # command, unless we're in the middle of executing a command from
-  # the text item (in which case a new prompt is about to be output
-  # so there's no need to change the old one).
-
-  def newApp(appName, mode)
-    @app = appName
-    @mode = mode
-    if @executing == 0
-      @promptEnd.gravity = 'right'
-      @txt.delete("#{@promptEnd.path} linestart", @promptEnd)
-      @txt.insert(@promptEnd, "#{appName}: ")
-      @txt.tag_add('bold', "#{@promptEnd.path} linestart", @promptEnd)
-      @promptEnd.gravity = 'left'
-    end
-  end
-
-  # The method below will fill in the applications sub-menu with a list
-  # of all the applications that currently exist.
-
-  def fillAppsMenu(menu)
-    win = self
-    begin
-      menu.delete(0,'last')
-    rescue
-    end
-    TkWinfo.interps.sort.each{|ip|
-      begin
-	if Tk.appsend(ip, false, 'info commands ruby') == ""
-	  mode = 'Tcl'
-	else
-	  mode = 'Ruby'
-	end
-	menu.add('command', 'label'=>format("%s    (#{mode}/Tk)", ip),
-		 'command'=>proc{win.newApp ip, mode})
-      rescue
-	menu.add('command', 'label'=>format("%s (unknown Tk)", ip),
-		 'command'=>proc{win.newApp ip, mode}, 'state'=>'disabled')
-      end
-    }
-    menu.add('command', 'label'=>format("local    (Ruby/Tk)"),
-	     'command'=>proc{win.newApp 'local', 'Ruby'})
-  end
-end
-
-Rmt.new
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-jp/rolodex b/ext/tk/sample/demos-jp/rolodex
deleted file mode 100644
index 95c0e3b869..0000000000
--- a/ext/tk/sample/demos-jp/rolodex
+++ /dev/null
@@ -1,320 +0,0 @@
-#!/usr/bin/env ruby
-#
-# rolodex --
-# This script is a part of Tom LaStrange's rolodex
-#
-# Copyright (C) 1998 by Takaaki Tateishi <ttate@jaist.ac.jp>
-# Time-stamp: "03/08/02 12:45:21 nagai"
-#
-
-require "tk"
-
-
-def show_help(topic,x=0,y=0)
-  if( topic.is_a?(TkWindow) )
-    w = TkWinfo.containing(x,y)
-    if( TkWinfo.exist?(w) )
-      topic = w
-    end
-  end
-
-  if( $helpTopics.include?(topic) )
-    msg = $helpTopics[topic]
-  else
-    msg = "Sorry, but no help is available for this topic"
-  end
-  TkDialog.new("title"=>"Rolodex Help",
-	       "message"=>"Information on #{topic}:\n\n#{msg}",
-	       "default_button"=>0,
-	       "buttons"=>["OK"])
-end
-
-def fillCard
-  clearAction
-  $root.frame.entry[1].insert(0,"Takaaki Tateishi")
-  $root.frame.entry[2].insert(0,"Japan Advanced Institute of Science and Techonology")
-  $root.frame.entry[3].insert(0,"1-1 Asahidai, Tatsunokuchi")
-  $root.frame.entry[4].insert(0,"Ishikawa 923-1292, Japan")
-  $root.frame.entry[5].insert(0,"private")
-    $root.frame.entry[6].insert(0,"***-***-****")
-  $root.frame.entry[7].insert(0,"***-***-****")
-end
-
-def addAction
-  for i in 1..7
-    STDERR.print format("%-12s %s\n",
-			RolodexFrame::LABEL[i],
-			$root.frame.entry[i].value)
-  end
-end
-
-def clearAction
-  for i in 1..7
-    $root.frame.entry[i].delete(0,"end")
-  end
-end
-
-def fileAction
-  TkDialog.new("title"=>"File Selection",
-	       "message"=>"This is a dummy file selection dialog box.\n",
-	       "default_button"=>0,
-	       "buttons"=>["OK"])
-  STDERR.print "dummy file name\n"
-end
-
-def deleteAction
-  result = TkDialog.new("title"=>"Confirm Action",
-			"message"=>"Are you sure?",
-			"default_button"=>0,
-			"buttons"=>["Cancel"])
-  if( result.value == 0 )
-    clearAction
-  end
-end
-
-
-class RolodexFrame < TkFrame
-  attr_reader :entry, :label
-
-  LABEL = ["","Name:","Address:","","","Home Phone:","Work Phone:","Fax:"]
-
-  def initialize(parent=nil,keys=nil)
-    super(parent,keys)
-    self["relief"] = "flat"
-
-    @i = []
-    @label = []
-    @entry = []
-    for i in 1..7
-      @i[i] = TkFrame.new(self)
-      @i[i].pack("side"=>"top",
-		 "pady"=>2,
-		 "anchor"=>"e")
-      @label[i] = TkLabel.new(@i[i],
-			      "text"=>LABEL[i],
-			      "anchor"=>"e")
-      @entry[i] = TkEntry.new(@i[i],
-			      "width"=>30,
-			      "relief"=>"sunken")
-      @entry[i].pack("side"=>"right")
-      @label[i].pack("side"=>"right")
-    end
-  end
-end
-
-class RolodexButtons < TkFrame
-  attr_reader :clear, :add, :search, :delete
-
-  def initialize(parent,keys=nil)
-    super(parent,keys)
-    @clear = TkButton.new(self,
-			  "text" => "Clear")
-    @add = TkButton.new(self,
-			"text" => "Add")
-    @search = TkButton.new(self,
-			   "text" => "Search")
-    @delete = TkButton.new(self,
-			   "text" => "Delete")
-    for w in [@clear,@add,@search,@delete]
-      w.pack("side"=>"left", "padx"=>2)
-    end
-  end
-end
-
-class RolodexMenuFrame < TkFrame
-  attr_reader :file_menu, :help_menu, :file, :help
-
-  def initialize(parent,keys=nil)
-    super(parent,keys)
-    configure("relief"=>"raised",
-	      "borderwidth"=>1)
-
-    @file = TkMenubutton.new(self,
-			     "text"=>"File",
-			     "underline"=>0)
-    @file_menu = TkMenu.new(@file)
-    @file_menu.add("command",
-		   "label" => "Load ...",
-		   "command" => proc{fileAction},
-		   "underline" => 0)
-    @file_menu.add("command",
-		   "label" => "Exit",
-		   "command" => proc{$root.destroy},
-		   "underline" => 0)
-    @file.menu(@file_menu)
-    @file.pack("side"=>"left")
-
-    @help = TkMenubutton.new(self,
-			     "text"=>"Help",
-			     "underline"=>0)
-    @help_menu = TkMenu.new(@help)
-    @help_menu.add("command",
-		   "label"=>"On Context...",
-		   "command"=>proc{show_help("context")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=>"On Help...",
-		   "command"=>proc{show_help("help")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=>"On Window...",
-		   "command"=>proc{show_help("window")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=>"On Keys...",
-		   "command"=>proc{show_help("keys")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=>"On version...",
-		   "command"=>proc{show_help("version")},
-		   "underline"=>3)
-    @help.menu(@help_menu)
-    @help.pack("side"=>"right")
-  end
-end
-
-class Rolodex < TkRoot
-  attr_reader :frame, :buttons, :menu
-
-  def initialize(*args)
-    super(*args)
-    @frame = RolodexFrame.new(self)
-    @frame.pack("side"=>"top",
-		"fill"=>"y",
-		"anchor"=>"center")
-    @buttons = RolodexButtons.new(self)
-    @buttons.pack("side"=>"bottom",
-		  "pady"=>2,
-		  "anchor"=>"center")
-    @menu = RolodexMenuFrame.new(self)
-    @menu.pack("before"=>@frame,
-	       "side"=>"top",
-	       "fill"=>"x")
-  end
-end
-
-$root = Rolodex.new
-
-$root.buttons.delete.configure("command"=>proc{deleteAction})
-$root.buttons.add.configure("command"=>proc{addAction})
-$root.buttons.clear.configure("command"=>proc{clearAction})
-$root.buttons.search.configure("command"=>proc{addAction; fillCard})
-
-$root.buttons.clear.configure("text"=>"Clear   Ctrl+C")
-$root.bind("Control-c",proc{clearAction})
-
-$root.buttons.add.configure("text"=>"Add   Ctrl+A")
-$root.bind("Control-a",proc{addAction})
-
-$root.buttons.search.configure("text"=>"Search   Ctrl+S")
-$root.bind("Control-s",proc{addAction; fillCard})
-
-$root.buttons.delete.configure("text"=>"Delete...   Ctrl+D")
-$root.bind("Control-d",proc{deleteAction})
-
-$root.menu.file_menu.entryconfigure(1, "accel"=>"Ctrl+F")
-$root.bind("Control-f",proc{fileAction})
-
-$root.menu.file_menu.entryconfigure(2, "accel"=>"Ctrl+Q")
-$root.bind("Control-q",proc{$root.destroy})
-
-$root.frame.entry[1].focus
-
-$root.bind("Any-F1",
-	   proc{|event| show_help(event.widget, event.x_root, event.y_root)})
-$root.bind("Any-Help",
-	   proc{|event| show_help(event.widget, event.x_root, event.y_root)})
-
-
-$helpTopics = {}
-
-$helpTopics[$root.menu.file] = <<EOF
-This is the "file" menu. It can be used to invoke\
-some overall operations on the rolodex applications,\
-such as loading a file or exiting.
-EOF
-
-$helpTopics[$root.menu.file_menu.index(0)] = <<EOF
-The "Load" entry in the "File" menu posts a dialog box\
-that you can use to select a rolodex file
-EOF
-
-$helpTopics[$root.menu.file_menu.index(1)] = <<EOF
-The "Exit" entry in the "File" menu causes the rolodex\
-application to terminate
-EOF
-
-$helpTopics[$root.frame.entry[1]] = <<EOF
-In this field of the rolodex entry you should\
-type the person's name
-EOF
-
-$helpTopics[$root.frame.entry[2]] = <<EOF
-In this field of the rolodex entry you should\
-type the first line of the person's address
-EOF
-
-$helpTopics[$root.frame.entry[3]] = <<EOF
-In this field of the rolodex entry you should\
-type the second line of the person's address
-EOF
-
-$helpTopics[$root.frame.entry[4]] = <<EOF
-In this field of the rolodex entry you should\
-type the third line of the person's address
-EOF
-
-$helpTopics[$root.frame.entry[5]] = <<EOF
-In this field of the rolodex entry you should\
-type the person's home phone number, or "private"\
-if the person doesn't want his or he number publicized
-EOF
-
-$helpTopics[$root.frame.entry[6]] = <<EOF
-In this field of the rolodex entry you should\
-type the person's work phone number
-EOF
-
-$helpTopics[$root.frame.entry[7]] = <<EOF
-In this field of the rolodex entry you should\
-type the phone number for the person's FAX machine
-EOF
-
-$helpTopics["context"] = <<EOF
-Unfortunately, this application doesn't support context-sensitive\
-help in the usual way, because when this demo was written Ruby/Tk\
-didn't have a grab mechanism and this is needed for context-sensitive\
-help. Instead, you can achieve much the same effect by simply moving\
-the mouse over the window you're curious about and pressing the\
-Help or F1 keys. You can do this anytime.
-EOF
-
-$helpTopics["help"] = <<EOF
-This application provides only very crude help. Besides the\
-entries in this menu, you can get help on individual windows\
-by moving the mouse cursor over the window and pressing the\
-Help or F1 keys.
-EOF
-
-$helpTopics["window"] = <<EOF
-This window is a dummy rolodex application created as part of\
-Tom LaStrange's toolkit benchmark. It doesn't really do anything\
-useful except to demonstrate a few features of the Ruby/Tk.
-EOF
-
-$helpTopics["keys"] = <<EOF
-The following accelerator keys are defined for this application\
-(in addition to those already available for the entry windows):
-Ctrl+A:		Add
-Ctrl+C:		Clear
-Ctrl+D:		Delete
-Ctrl+F:		Enter file name
-Ctrl+Q:		Exit application (quit)
-Ctrl+S:		Search (dummy operation)
-EOF
-
-$helpTopics["version"] = <<EOF
-This is version 1.0.1.
-EOF
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-jp/rolodex-j b/ext/tk/sample/demos-jp/rolodex-j
deleted file mode 100644
index f6e3afdacd..0000000000
--- a/ext/tk/sample/demos-jp/rolodex-j
+++ /dev/null
@@ -1,300 +0,0 @@
-#!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
-#
-# rolodex --
-# このスクリプトは Tom LaStrange の rolodex の一部です。
-#
-# Copyright (C) 1998 by Takaaki Tateishi <ttate@jaist.ac.jp>
-# Time-stamp: "04/04/09 00:32:12 nagai"
-#
-
-require "tk"
-Tk.encoding = "utf-8"
-
-def show_help(topic,x=0,y=0)
-  if( topic.is_a?(TkWindow) )
-    w = TkWinfo.containing(x,y)
-    if( w.is_a?(TkWindow) )
-      if( TkWinfo.exist?(w) )
-	topic = w
-      end
-    end
-  end
-
-  if( $helpTopics.include?(topic) )
-    msg = $helpTopics[topic]
-  else
-    msg = "このトピックについてのヘルプはまだ使用できません"
-  end
-  TkDialog.new("title"=>"Rolodex Help",
-	       "message"=>"「#{topic}」\n\n#{msg}",
-	       "default_button"=>0,
-	       "buttons"=>["OK"])
-end
-
-def fillCard
-  clearAction
-  $root.frame.entry[1].insert(0, "立石 孝彰")
-  $root.frame.entry[2].insert(0, "923-1292 石川県")
-  $root.frame.entry[3].insert(0, "辰口町 旭台 1-1")
-  $root.frame.entry[4].insert(0, "北陸先端科学技術大学院大学")
-  $root.frame.entry[5].insert(0,"private")
-  $root.frame.entry[6].insert(0,"***-***-****")
-  $root.frame.entry[7].insert(0,"***-***-****")
-end
-
-def addAction
-  for i in 1..7
-    STDERR.print format("%-12s %s\n",
-			RolodexFrame::LABEL[i],
-			$root.frame.entry[i].value)
-  end
-end
-
-def clearAction
-  for i in 1..7
-    $root.frame.entry[i].delete(0,"end")
-  end
-end
-
-def fileAction
-  TkDialog.new("title"=>"File Selection",
-	       "message"=>"これはファイル選択ダイアログのダミーです。\n",
-	       "default_button"=>0,
-	       "buttons"=>["OK"])
-  STDERR.print "dummy file name\n"
-end
-
-def deleteAction
-  result = TkDialog.new("title"=>"Confirm Action",
-			"message"=>"よろしいですか？",
-			"default_button"=>0,
-			"buttons"=>["キャンセル"])
-  if( result.value == 0 )
-    clearAction
-  end
-end
-
-
-class RolodexFrame < TkFrame
-  attr_reader :entry, :label
-
-  LABEL = ["","名前:","住所","","","電話(自宅):","電話(会社):","Fax:"]
-
-  def initialize(parent=nil,keys=nil)
-    super(parent,keys)
-    self["relief"] = "flat"
-    @i = []
-    @label = []
-    @entry = []
-    for i in 1..7
-      @i[i] = TkFrame.new(self)
-      @i[i].pack("side"=>"top",
-		 "pady"=>2,
-		 "anchor"=>"e")
-      @label[i] = TkLabel.new(@i[i],
-			      "text"=>LABEL[i],
-			      "anchor"=>"e")
-      @entry[i] = TkEntry.new(@i[i],
-			      "width"=>30,
-			      "relief"=>"sunken")
-      @entry[i].pack("side"=>"right")
-      @label[i].pack("side"=>"right")
-    end
-  end
-end
-
-class RolodexButtons < TkFrame
-  attr_reader :clear, :add, :search, :delete
-
-  def initialize(parent,keys=nil)
-    super(parent,keys)
-    @clear = TkButton.new(self,"text" => "クリアー")
-    @add = TkButton.new(self,  "text" => "追加")
-    @search = TkButton.new(self, "text" => "検索")
-    @delete = TkButton.new(self,  "text" => "消去")
-    for w in [@clear,@add,@search,@delete]
-      w.pack("side"=>"left", "padx"=>2)
-    end
-  end
-end
-
-class RolodexMenuFrame < TkFrame
-  attr_reader :file_menu, :help_menu, :file, :help
-
-  def initialize(parent,keys=nil)
-    super(parent,keys)
-    configure("relief"=>"raised",
-	      "borderwidth"=>1)
-
-    @file = TkMenubutton.new(self,
-			     "text"=> "ファイル",
-			     "underline"=>0)
-    @file_menu = TkMenu.new(@file)
-    @file_menu.add("command",
-		   "label" => "読み込み ...",
-		   "command" => proc{fileAction},
-		   "underline" => 0)
-    @file_menu.add("command",
-		   "label" => "終了",
-		   "command" => proc{$root.destroy},
-		   "underline" => 0)
-    @file.menu(@file_menu)
-    @file.pack("side"=>"left")
-
-    @help = TkMenubutton.new(self,
-			     "text"=> "ヘルプ",
-			     "underline"=>0)
-    @help_menu = TkMenu.new(@help)
-    @help_menu.add("command",
-		   "label"=> "コンテキストについて",
-		   "command"=>proc{show_help("コンテキスト")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=> "ヘルプについて",
-		   "command"=>proc{show_help("ヘルプ")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=> "ウィンドウについて",
-		   "command"=>proc{show_help("ウィンドウ")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=> "キー操作について",
-		   "command"=>proc{show_help("キー操作")},
-		   "underline"=>3)
-    @help_menu.add("command",
-		   "label"=> "バージョン情報",
-		   "command"=>proc{show_help("バージョン情報")},
-		   "underline"=>3)
-    @help.menu(@help_menu)
-    @help.pack("side"=>"right")
-  end
-end
-
-class Rolodex < TkRoot
-  attr_reader :frame, :buttons, :menu
-
-  def initialize(*args)
-    super(*args)
-    @frame = RolodexFrame.new(self)
-    @frame.pack("side"=>"top",
-		"fill"=>"y",
-		"anchor"=>"center")
-    @buttons = RolodexButtons.new(self)
-    @buttons.pack("side"=>"bottom",
-		  "pady"=>2,
-		  "anchor"=>"center")
-    @menu = RolodexMenuFrame.new(self)
-    @menu.pack("before"=>@frame,
-	       "side"=>"top",
-	       "fill"=>"x")
-  end
-end
-
-$root = Rolodex.new
-
-$root.buttons.delete.configure("command"=>proc{deleteAction})
-$root.buttons.add.configure("command"=>proc{addAction})
-$root.buttons.clear.configure("command"=>proc{clearAction})
-$root.buttons.search.configure("command"=>proc{addAction; fillCard})
-
-$root.buttons.clear.configure("text"=> "クリアー   Ctrl+C")
-$root.bind("Control-c",proc{clearAction})
-
-$root.buttons.add.configure("text"=> "追加   Ctrl+A")
-$root.bind("Control-a",proc{addAction})
-
-$root.buttons.search.configure("text"=> "検索   Ctrl+S")
-$root.bind("Control-s",proc{addAction; fillCard})
-
-$root.buttons.delete.configure("text"=> "消去   Ctrl+D")
-$root.bind("Control-d",proc{deleteAction})
-
-$root.menu.file_menu.entryconfigure(1, "accel"=>"Ctrl+F")
-$root.bind("Control-f",proc{fileAction})
-
-$root.menu.file_menu.entryconfigure(2, "accel"=>"Ctrl+Q")
-$root.bind("Control-q",proc{$root.destroy})
-
-$root.frame.entry[1].focus
-
-$root.bind("Any-F1",
-	   proc{|event| show_help(event.widget, event.x_root, event.y_root)})
-$root.bind("Any-Help",
-	   proc{|event| show_help(event.widget, event.x_root, event.y_root)})
-
-
-$helpTopics = {}
-
-$helpTopics[$root.menu.file] = <<EOF
-これは「ファイル」メニューです。「読み込み」や「終了」などを
-行なうことができます。
-EOF
-
-$helpTopics[$root.menu.file_menu.index(0)] = <<EOF
-ファイルの読み込みを行なうときに使います。
-EOF
-
-$helpTopics[$root.menu.file_menu.index(1)] = <<EOF
-アプリケーションを終了するときに使います。
-EOF
-
-$helpTopics[$root.frame.entry[1]] = <<EOF
-名前を記入するエントリです。
-EOF
-
-$helpTopics[$root.frame.entry[2]] = <<EOF
-住所を記入するエントリです。
-EOF
-
-$helpTopics[$root.frame.entry[3]] = <<EOF
-住所を記入するエントリです。
-EOF
-
-$helpTopics[$root.frame.entry[4]] = <<EOF
-住所を記入するエントリです。
-EOF
-
-$helpTopics[$root.frame.entry[5]] = <<EOF
-自宅の電話番号を記入するエントリです。公開\
-したくないときは private と記入します。
-EOF
-
-$helpTopics[$root.frame.entry[6]] = <<EOF
-会社の電話番号を記入するエントリです。
-EOF
-
-$helpTopics[$root.frame.entry[7]] = <<EOF
-FAX番号を記入するエントリです。
-EOF
-
-$helpTopics["コンテキスト"] = <<EOF
-Ruby/Tkではgrabの機構がないためこのアプリケーションでは\
-コンテキストヘルプはサポートされていません。
-しかし同じような効果をbindとマウスの位置のWedgetを知る\
-ことで得ることができます。
-EOF
-
-$helpTopics["ヘルプ"] = <<EOF
-マウスをウィンドウにあわせてF1キーを押すことによって\
-そのヘルプを見ることができます。
-EOF
-
-$helpTopics["ウィンドウ"] = <<EOF
-このウィンドウはダミーです。
-EOF
-
-$helpTopics["キー操作"] = <<EOF
-Ctrl+A:		追加
-Ctrl+C:		クリアー
-Ctrl+D:		消去
-Ctrl+F:		ファイル選択
-Ctrl+Q:		終了
-Ctrl+S:		検索
-EOF
-
-$helpTopics["バージョン情報"] = <<EOF
-バージョンは 1.0.1j です。
-EOF
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-jp/ruler.rb b/ext/tk/sample/demos-jp/ruler.rb
deleted file mode 100644
index 734f47f142..0000000000
--- a/ext/tk/sample/demos-jp/ruler.rb
+++ /dev/null
@@ -1,204 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# ruler widget demo (called by 'widget')
-#
-
-# rulerMkTab --
-# This method creates a new triangular polygon in a canvas to
-# represent a tab stop.
-#
-# Arguments:
-# c -           The canvas window.
-# x, y -        Coordinates at which to create the tab stop.
-
-def rulerMkTab(c,x,y)
-  v = $demo_rulerInfo
-  TkcPolygon.new(c, x, y, x+v.size, y+v.size, x-v.size, y+v.size)
-end
-
-# toplevel widget が存在すれば削除する
-if defined?($ruler_demo) && $ruler_demo
-  $ruler_demo.destroy
-  $ruler_demo = nil
-end
-
-# demo 用の toplevel widget を生成
-$ruler_demo = TkToplevel.new {|w|
-  title("Ruler Demonstration")
-  iconname("ruler")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($ruler_demo).pack(:fill=>:both, :expand=>true)
-
-# label 生成
-TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left',
-            'text'=>"このキャンバスwidgetはルーラーの模型です。ルーラーの右にあるのはタブストップの井戸で、ここから引っ張ってくることによってタブストップを作ることができます。また、すでにあるタブストップを動かすこともできます。タブストップを上方または下方にかすれて表示されるまでドラッグすると、マウスボタンを離した時にそのタブストップは消えます。"){
-  pack('side'=>'top')
-}
-
-# frame 生成
-$ruler_buttons = TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc{
-      tmppath = $ruler_demo
-      $ruler_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc{showCode 'ruler'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$ruler_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# canvas 設定
-$ruler_canvas = TkCanvas.new(base_frame, 'width'=>'14.8c', 'height'=>'2.5c')
-$ruler_canvas.pack('side'=>'top', 'fill'=>'x')
-
-# 値設定
-unless Struct.const_defined?("RulerInfo")
-  $demo_rulerInfo = Struct.new("RulerInfo", :grid, :left, :right, :x, :y,
-                               :top, :bottom, :size, :normalStyle,
-                               :activeStyle, :deleteStyle).new
-end
-$demo_rulerInfo.grid = '.25c'
-$demo_rulerInfo.left = TkWinfo.fpixels($ruler_canvas, '1c')
-$demo_rulerInfo.right = TkWinfo.fpixels($ruler_canvas, '13c')
-$demo_rulerInfo.top = TkWinfo.fpixels($ruler_canvas, '1c')
-$demo_rulerInfo.bottom = TkWinfo.fpixels($ruler_canvas, '1.5c')
-$demo_rulerInfo.size = TkWinfo.fpixels($ruler_canvas, '.2c')
-$demo_rulerInfo.normalStyle = {'fill'=>'black'}
-if TkWinfo.depth($ruler_canvas) > 1
-  $demo_rulerInfo.activeStyle = {'fill'=>'red', 'stipple'=>''}
-  $demo_rulerInfo.deleteStyle = {'fill'=>'red',
-    'stipple'=>'@'+[$demo_dir, '..',
-                     'images', 'gray25.xbm'].join(File::Separator)}
-else
-  $demo_rulerInfo.activeStyle = {'fill'=>'black', 'stipple'=>''}
-  $demo_rulerInfo.deleteStyle = {'fill'=>'black',
-    'stipple'=>'@'+[$demo_dir, '..',
-                     'images', 'gray25.xbm'].join(File::Separator)}
-end
-
-TkcLine.new($ruler_canvas,
-            '1c', '0.5c', '1c', '1c', '13c', '1c', '13c', '0.5c', 'width'=>1)
-(0..11).each{|i|
-  x = i+1
-  TkcLine.new($ruler_canvas, "#{x}c", '1c', "#{x}c", '0.6c', 'width'=>1)
-  TkcLine.new($ruler_canvas, "#{x}.25c", '1c', "#{x}.25c", '0.8c', 'width'=>1)
-  TkcLine.new($ruler_canvas, "#{x}.5c", '1c', "#{x}.5c", '0.7c', 'width'=>1)
-  TkcLine.new($ruler_canvas, "#{x}.75c", '1c', "#{x}.75c", '0.8c', 'width'=>1)
-  TkcText.new($ruler_canvas, "#{x}.15c", '0.75c', 'text'=>i, 'anchor'=>'sw')
-}
-
-$rulerTag_well = TkcTag.new($ruler_canvas)
-$ruler_canvas\
-.addtag_withtag($rulerTag_well,
-                TkcRectangle.new($ruler_canvas,
-                                 '13.2c', '1c', '13.8c', '0.5c',
-                                 'outline'=>'black',
-                                 'fill'=>($ruler_canvas\
-                                          .configinfo('background'))[4]) )
-$ruler_canvas\
-.addtag_withtag($rulerTag_well,
-                rulerMkTab($ruler_canvas,
-                           TkWinfo.pixels($ruler_canvas, '13.5c'),
-                           TkWinfo.pixels($ruler_canvas, '.65c') ) )
-
-$rulerTag_well.bind('1', proc{|x,y| rulerNewTab($ruler_canvas,x,y)}, '%x %y')
-$ruler_canvas.itembind('tab', '1',
-                       proc{|x,y| rulerSelectTab($ruler_canvas,x,y)}, '%x %y')
-$ruler_canvas.bind('B1-Motion',
-                   proc{|x,y| rulerMoveTab($ruler_canvas,x,y)}, '%x %y')
-$ruler_canvas.bind('Any-ButtonRelease-1', proc{rulerReleaseTab($ruler_canvas)})
-
-# rulerNewTab --
-# Does all the work of creating a tab stop, including creating the
-# triangle object and adding tags to it to give it tab behavior.
-#
-# Arguments:
-# c -           The canvas window.
-# x, y -        The coordinates of the tab stop.
-
-def rulerNewTab(c,x,y)
-  v = $demo_rulerInfo
-  c.addtag_withtag('active', rulerMkTab(c,x,y))
-  c.addtag_withtag('tab', 'active')
-  v.x = x
-  v.y = y
-  rulerMoveTab(c,x,y)
-end
-
-# rulerSelectTab --
-# This method is invoked when mouse button 1 is pressed over
-# a tab.  It remembers information about the tab so that it can
-# be dragged interactively.
-#
-# Arguments:
-# c -           The canvas widget.
-# x, y -        The coordinates of the mouse (identifies the point by
-#               which the tab was picked up for dragging).
-
-def rulerSelectTab(c,x,y)
-  v = $demo_rulerInfo
-  v.x = c.canvasx(x, v.grid)
-  v.y = v.top+2
-  c.addtag_withtag('active', 'current')
-  c.itemconfigure('active', v.activeStyle)
-  c.raise('active')
-end
-
-# rulerMoveTab --
-# This method is invoked during mouse motion events to drag a tab.
-# It adjusts the position of the tab, and changes its appearance if
-# it is about to be dragged out of the ruler.
-#
-# Arguments:
-# c -           The canvas widget.
-# x, y -        The coordinates of the mouse.
-
-def rulerMoveTab(c,x,y)
-  v = $demo_rulerInfo
-  return if c.find_withtag('active') == []
-  cx = c.canvasx(x,v.grid)
-  cy = c.canvasy(y)
-  cx = v.left if cx < v.left
-  cx = v.right if cx > v.right
-  if (cy >= v.top && cy <= v.bottom)
-    cy = v.top+2
-    c.itemconfigure('active', v.activeStyle)
-  else
-    cy = cy-v.size-2
-    c.itemconfigure('active', v.deleteStyle)
-  end
-  c.move('active', cx-v.x, cy-v.y)
-  v.x = cx
-  v.y = cy
-end
-
-# rulerReleaseTab --
-# This method is invoked during button release events that end
-# a tab drag operation.  It deselects the tab and deletes the tab if
-# it was dragged out of the ruler.
-#
-# Arguments:
-# c -           The canvas widget.
-# x, y -        The coordinates of the mouse.
-
-def rulerReleaseTab(c)
-  v = $demo_rulerInfo
-  return if c.find_withtag('active') == []
-  if v.y != v.top+2
-    c.delete('active')
-  else
-    c.itemconfigure('active', v.normalStyle)
-    c.dtag('active')
-  end
-end
-
diff --git a/ext/tk/sample/demos-jp/sayings.rb b/ext/tk/sample/demos-jp/sayings.rb
deleted file mode 100644
index a60b0bf2e5..0000000000
--- a/ext/tk/sample/demos-jp/sayings.rb
+++ /dev/null
@@ -1,104 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# listbox widget demo 'sayings' (called by 'widget')
-#
-
-# toplevel widget が存在すれば削除する
-if defined?($sayings_demo) && $sayings_demo
-  $sayings_demo.destroy
-  $sayings_demo = nil
-end
-
-# demo 用の toplevel widget を生成
-$sayings_demo = TkToplevel.new {|w|
-  title("Listbox Demonstration (well-known sayings)")
-  iconname("sayings")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($sayings_demo).pack(:fill=>:both, :expand=>true)
-
-# label 生成
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "下のリストボックスにはいろいろな格言が入っています。リストをスクロールさせるのはスクロールバーでもできますし、リストボックスの中でマウスのボタン2(中ボタン)を押したままドラッグしてもできます。"
-}
-msg.pack('side'=>'top')
-
-# frame 生成
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc{
-      tmppath = $sayings_demo
-      $sayings_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc{showCode 'sayings'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame 生成
-sayings_lbox = nil
-TkFrame.new(base_frame, 'borderwidth'=>10) {|w|
-  sv = TkScrollbar.new(w)
-  sh = TkScrollbar.new(w, 'orient'=>'horizontal')
-  sayings_lbox = TkListbox.new(w) {
-    setgrid 1
-    width  20
-    height 10
-    yscrollcommand proc{|first,last| sv.set first,last}
-    xscrollcommand proc{|first,last| sh.set first,last}
-  }
-  sv.command(proc{|*args| sayings_lbox.yview(*args)})
-  sh.command(proc{|*args| sayings_lbox.xview(*args)})
-
-  if $tk_version =~ /^4\.[01]/
-    sv.pack('side'=>'right', 'fill'=>'y')
-    sh.pack('side'=>'bottom', 'fill'=>'x')
-    sayings_lbox.pack('expand'=>'yes', 'fill'=>'y')
-
-  else
-    sayings_lbox.grid('row'=>0, 'column'=>0,
-                      'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    sv.grid('row'=>0, 'column'=>1,
-            'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    sh.grid('row'=>1, 'column'=>0,
-            'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-    TkGrid.rowconfigure(w, 0, 'weight'=>1, 'minsize'=>0)
-    TkGrid.columnconfigure(w, 0, 'weight'=>1, 'minsize'=>0)
-  end
-
-}.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'y')
-
-sayings_lbox.insert(0,
-"Waste not, want not",
-"Early to bed and early to rise makes a man healthy, wealthy, and wise",
-"Ask not what your country can do for you, ask what you can do for your country",
-"I shall return",
-"NOT",
-"A picture is worth a thousand words",
-"User interfaces are hard to build",
-"Thou shalt not steal",
-"A penny for your thoughts",
-"Fool me once, shame on you;  fool me twice, shame on me",
-"Every cloud has a silver lining",
-"Where there's smoke there's fire",
-"It takes one to know one",
-"Curiosity killed the cat",
-"Take this job and shove it",
-"Up a creek without a paddle",
-"I'm mad as hell and I'm not going to take it any more",
-"An apple a day keeps the doctor away",
-"Don't look a gift horse in the mouth"
-)
-
diff --git a/ext/tk/sample/demos-jp/search.rb b/ext/tk/sample/demos-jp/search.rb
deleted file mode 100644
index dffccf1a48..0000000000
--- a/ext/tk/sample/demos-jp/search.rb
+++ /dev/null
@@ -1,185 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# Text Search widget demo (called by 'widget')
-#
-
-# textLoadFile --
-# This method below loads a file into a text widget, discarding
-# the previous contents of the widget. Tags for the old widget are
-# not affected, however.
-#
-# Arguments:
-# w -           The window into which to load the file.  Must be a
-#               text widget.
-# file -        The name of the file to load.  Must be readable.
-
-def textLoadFile(w,file)
-  w.delete('1.0', 'end')
-  f = open(file, 'r')
-  while(!f.eof?)
-    w.insert('end', f.read(1000))
-  end
-  f.close
-end
-
-# textSearch --
-# Search for all instances of a given string in a text widget and
-# apply a given tag to each instance found.
-#
-# Arguments:
-# w -           The window in which to search.  Must be a text widget.
-# string -      The string to search for.  The search is done using
-#               exact matching only;  no special characters.
-# tag -         Tag to apply to each instance of a matching string.
-
-def textSearch(w, string, tag)
-  tag.remove('0.0', 'end')
-  return if string == ""
-  cur = '1.0'
-  loop {
-    cur, len = w.search_with_length(string, cur, 'end')
-    break if cur == ""
-    tag.add(cur, "#{cur} + #{len} char")
-    cur = w.index("#{cur} + #{len} char")
-  }
-end
-
-# textToggle --
-# This method is invoked repeatedly to invoke two commands at
-# periodic intervals.  It normally reschedules itself after each
-# execution but if an error occurs (e.g. because the window was
-# deleted) then it doesn't reschedule itself.
-#
-# Arguments:
-# cmd1 -        Command to execute when method is called.
-# sleep1 -      Ms to sleep after executing cmd1 before executing cmd2.
-# cmd2 -        Command to execute in the *next* invocation of this method.
-# sleep2 -      Ms to sleep after executing cmd2 before executing cmd1 again.
-
-def textToggle(cmd1,sleep1,cmd2,sleep2)
-  sleep_list = [sleep2, sleep1]
-  TkAfter.new(proc{sleep = sleep_list.shift; sleep_list.push(sleep); sleep},
-              -1, cmd1, cmd2).start(sleep1)
-end
-
-# toplevel widget が存在すれば削除する
-if defined?($search_demo) && $search_demo
-  $search_demo.destroy
-  $search_demo = nil
-end
-
-# demo 用の toplevel widget を生成
-$search_demo = TkToplevel.new {|w|
-  title("Text Demonstration - Search and Highlight")
-  iconname("search")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($search_demo).pack(:fill=>:both, :expand=>true)
-
-# frame 生成
-$search_buttons = TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc{
-      tmppath = $search_demo
-      $search_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc{showCode 'search'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$search_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame 生成
-TkFrame.new(base_frame) {|f|
-  TkLabel.new(f, 'text'=>'ファイル名:',
-              'width'=>13, 'anchor'=>'w').pack('side'=>'left')
-  $search_fileName = TkVariable.new
-  TkEntry.new(f, 'width'=>40,
-              'textvariable'=>$search_fileName) {
-    pack('side'=>'left')
-    bind('Return', proc{textLoadFile($search_text, $search_fileName.value)
-                        $search_string_entry.focus})
-    focus
-  }
-  TkButton.new(f, 'text'=>'読み込み',
-               'command'=>proc{textLoadFile($search_text,
-                                            $search_fileName.value)})\
-  .pack('side'=>'left', 'pady'=>5, 'padx'=>10)
-}.pack('side'=>'top', 'fill'=>'x')
-
-TkFrame.new(base_frame) {|f|
-  TkLabel.new(f, 'text'=>'検索文字列:',
-              'width'=>13, 'anchor'=>'w').pack('side'=>'left')
-  $search_searchString = TkVariable.new
-  $search_string_entry = TkEntry.new(f, 'width'=>40,
-                                     'textvariable'=>$search_searchString) {
-    pack('side'=>'left')
-    bind('Return', proc{textSearch($search_text, $search_searchString.value,
-                                   $search_Tag)})
-  }
-  TkButton.new(f, 'text'=>'反転',
-               'command'=>proc{textSearch($search_text,
-                                          $search_searchString.value,
-                                          $search_Tag)}) {
-    pack('side'=>'left', 'pady'=>5, 'padx'=>10)
-  }
-}.pack('side'=>'top', 'fill'=>'x')
-
-$search_text = TkText.new(base_frame, 'setgrid'=>true) {|t|
-  $search_Tag = TkTextTag.new(t)
-  TkScrollbar.new(base_frame, 'command'=>proc{|*args| t.yview(*args)}) {|sc|
-    t.yscrollcommand(proc{|first,last| sc.set first,last})
-    pack('side'=>'right', 'fill'=>'y')
-  }
-  pack('expand'=>'yes', 'fill'=>'both')
-}
-
-# Set up display styles for text highlighting.
-
-if TkWinfo.depth($search_demo) > 1
-  textToggle(proc{
-               $search_Tag.configure('background'=>'#ce5555',
-                                     'foreground'=>'white')
-             },
-             800,
-             proc{
-               $search_Tag.configure('background'=>'', 'foreground'=>'')
-             },
-             200 )
-else
-  textToggle(proc{
-               $search_Tag.configure('background'=>'black',
-                                     'foreground'=>'white')
-             },
-             800,
-             proc{
-               $search_Tag.configure('background'=>'', 'foreground'=>'')
-             },
-             200 )
-end
-$search_text.insert('1.0', "\
-このウィンドウは検索機構を実現するのにテキスト widget のタグ機能がどの \
-ように使われるのかをデモするものです。まず上のエントリにファイル名を入 \
-れ、<リターン> を押すか「ロード」ボタンを押してください。次にその下の \
-エントリに文字列を入力し、<リターン> を押すか「反転」ボタンを押してく \
-ださい。するとファイル中の、検索文字列と一致する部分に全て \"search_Tag\" \
-というタグがつけられ、タグの表示属性としてその文字列が点滅するように \
-設定されます。\n")
-$search_text.insert('end', "\
-ファイル読み込みのカレントディレクトリは \"#{Dir.pwd}\" です。\
-")
-$search_text.set_insert '0.0'
-
-$search_fileName.value = ''
-$search_searchString.value = ''
-
-$search_text.width = 60
-$search_text.height = 20
diff --git a/ext/tk/sample/demos-jp/spin.rb b/ext/tk/sample/demos-jp/spin.rb
deleted file mode 100644
index 616a14e9d6..0000000000
--- a/ext/tk/sample/demos-jp/spin.rb
+++ /dev/null
@@ -1,72 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# spin.rb --
-#
-# This demonstration script creates several spinbox widgets.
-#
-# based on Tcl/Tk8.4.4 widget demos
-
-if defined?($spin_demo) && $spin_demo
-  $spin_demo.destroy
-  $spin_demo = nil
-end
-
-$spin_demo = TkToplevel.new {|w|
-  title("Spinbox Demonstration")
-  iconname("spin")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($spin_demo).pack(:fill=>:both, :expand=>true)
-
-TkLabel.new(base_frame,
-            :font=>$font, :wraplength=>'5i', :justify=>:left,
-            :text=><<EOL).pack(:side=>:top)
-下には３種類のスピンボックスが表示されています。
-それぞれ、マウスで選択して文字を入力することができます。
-編集操作としては、Emacs 形式の多くに加えて、一般的な
-Motif 形式のキー操作がサポートされています。たとえば、
-Backspace と Control-h とは入力カーソルの左側の文字を
-削除し、Delete と Control-d とは右側の文字を削除します。
-入力枠の長さを越えるような長い文字列を入力した場合には、
-マウスのボタン２を押してドラッグすることで、入力文字列
-をスキャンすることが可能です。
-なお、最初のスピンボックスは、整数値とみなされるような
-文字列しか入力が許されないことに注意してください。また、
-３番目のスピンボックスで選択候補に現れるのはオーストラ
-リアの都市名のリストとなっています。
-もしあなたが使っている Ruby にリンクされている Tk ライ
-ブラリが spinbox ウィジェットを実装していない場合、この
-デモはうまく動かないはずです。その場合には spinbox ウィ
-ジェットが実装されているようなより新しいバージョンの Tk
-を組み合わせて試すようにしてください。
-EOL
-
-TkFrame.new(base_frame){|f|
-  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
-
-  TkButton.new(f, :text=>'閉じる', :width=>15, :command=>proc{
-                 $spin_demo.destroy
-                 $spin_demo = nil
-               }).pack(:side=>:left, :expand=>true)
-
-  TkButton.new(f, :text=>'コード参照', :width=>15, :command=>proc{
-                 showCode 'spin'
-               }).pack(:side=>:left, :expand=>true)
-}
-
-australianCities = [
-    'Canberra', 'Sydney', 'Melbourne', 'Perth', 'Adelaide',
-    'Brisbane', 'Hobart', 'Darwin', 'Alice Springs'
-]
-
-[
-  TkSpinbox.new(base_frame, :from=>1, :to=>10, :width=>10, :validate=>:key,
-                :validatecommand=>[
-                  proc{|s| s == '' || /^[+-]?\d+$/ =~ s }, '%P'
-                ]),
-  TkSpinbox.new(base_frame, :from=>0, :to=>3, :increment=>0.5,
-                :format=>'%05.2f', :width=>10),
-  TkSpinbox.new(base_frame, :values=>australianCities, :width=>10)
-].each{|sbox| sbox.pack(:side=>:top, :pady=>5, :padx=>10)}
diff --git a/ext/tk/sample/demos-jp/square b/ext/tk/sample/demos-jp/square
deleted file mode 100644
index bb66282154..0000000000
--- a/ext/tk/sample/demos-jp/square
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/usr/bin/env ruby
-
-# square --
-# This script generates a demo application containing only
-# a "square" widget.  It's only usable if Tk has been compiled
-# with tkSquare.c and with the -DSQUARE_DEMO compiler switch.
-# This demo arranges the following bindings for the widget:
-#
-# Button-1 press/drag:          moves square to mouse
-# "a":                          toggle size animation on/off
-#
-
-require 'tk'
-require 'tkafter'
-
-class TkSquare<TkWindow
-  def create_self
-    begin
-      tk_call 'square', path
-    rescue
-      STDERR.print "\nSorry. Your Tk interpreter does not contain " +
-	'a "square" demonstration widget.' +
-	"\n ( See documents included the Tcl/Tk source archive. )\n\n"
-      exit
-    end
-  end
-  def size(amount=nil)
-    if amount
-      tk_send 'size', amount
-    else
-      number(tk_send('size'))
-    end
-  end
-  def position(x,y)
-    tk_send 'position', x, y
-  end
-end
-
-$s = TkSquare.new{
-  pack('expand'=>'yes', 'fill'=>'both')
-  bind('1', proc{|x,y| center(x,y)}, '%s %y')
-  bind('B1-Motion', proc{|x,y| center(x,y)}, '%s %y')
-  bind('a', proc{animate})
-  focus
-}
-TkRoot.new.minsize(1,1)
-
-# The procedure below centers the square on a given position.
-
-def center(x,y)
-  a = $s.size
-  $s.position(x-(a/2), y-(a/2))
-end
-
-# The procedures below provide a simple form of animation where
-# the box changes size in a pulsing pattern: larger, smaller, larger,
-# and so on.
-
-$inc = 0
-
-def timer_proc
-  a = $s.size
-  return if $inc == 0
-  $inc = -3 if a >= 40
-  $inc =  3 if a <= 10
-  $s.size(a+$inc)
-end
-
-$timer = TkAfter.new(30, -1, proc{timer_proc})
-
-def animate
-  if $inc == 0
-    $inc = 3
-    $timer.start
-  else
-    $inc = 0
-    $timer.stop
-  end
-end
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-jp/states.rb b/ext/tk/sample/demos-jp/states.rb
deleted file mode 100644
index 9f8fb0ef03..0000000000
--- a/ext/tk/sample/demos-jp/states.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# listbox widget demo 'states' (called by 'widget')
-#
-
-# toplevel widget が存在すれば削除する
-if defined?($states_demo) && $states_demo
-  $states_demo.destroy
-  $states_demo = nil
-end
-
-# demo 用の toplevel widget を生成
-$states_demo = TkToplevel.new {|w|
-  title("Listbox Demonstration (states)")
-  iconname("states")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($states_demo).pack(:fill=>:both, :expand=>true)
-
-# label 生成
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '4i'
-  justify 'left'
-  text "下にあるのは都道府県名が入ったスクロールバー付のリストボックスです。リストをスクロールさせるのはスクロールバーでもできますし、リストボックスの中でマウスのボタン2(中ボタン)を押したままドラッグしてもできます。"
-}
-msg.pack('side'=>'top')
-
-# frame 生成
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc{
-      tmppath = $states_demo
-      $states_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc{showCode 'states'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame 生成
-states_lbox = nil
-TkFrame.new(base_frame, 'borderwidth'=>'.5c') {|w|
-  s = TkScrollbar.new(w)
-  states_lbox = TkListbox.new(w) {
-    setgrid 1
-    height 12
-    yscrollcommand proc{|first,last| s.set first,last}
-  }
-  s.command(proc{|*args| states_lbox.yview(*args)})
-  s.pack('side'=>'right', 'fill'=>'y')
-  states_lbox.pack('side'=>'left', 'expand'=>1, 'fill'=>'both')
-}.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'y')
-
-ins_data = [
-  '愛知','青森','秋田','石川','茨城','岩手','愛媛',
-  '大分','大阪','岡山','沖縄','香川','鹿児島','神奈川',
-  '岐阜','京都','熊本','群馬','高知','埼玉','佐賀',
-  '滋賀','静岡','島根','千葉','東京','徳島','栃木',
-  '鳥取','富山','長崎','長野','奈良','新潟','兵庫',
-  '広島','福井','福岡','福島','北海道','三重','宮城',
-  '宮崎','山形','山口','山梨','和歌山'
-]
-
-states_lbox.insert(0, *ins_data)
-
diff --git a/ext/tk/sample/demos-jp/style.rb b/ext/tk/sample/demos-jp/style.rb
deleted file mode 100644
index 737c9f8994..0000000000
--- a/ext/tk/sample/demos-jp/style.rb
+++ /dev/null
@@ -1,271 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# text (display styles) widget demo (called by 'widget')
-#
-
-# toplevel widget が存在すれば削除する
-if defined?($style_demo) && $style_demo
-  $style_demo.destroy
-  $style_demo = nil
-end
-
-
-# demo 用の toplevel widget を生成
-$style_demo = TkToplevel.new {|w|
-  title("Text Demonstration - Display Styles")
-  iconname("style")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($style_demo).pack(:fill=>:both, :expand=>true)
-
-# frame 生成
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc{
-      tmppath = $style_demo
-      $style_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc{showCode 'style'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-
-# text 生成
-txt = TkText.new(base_frame){|t|
-  # 生成
-  setgrid 'true'
-  #width  70
-  #height 32
-  wrap 'word'
-  font $font
-  TkScrollbar.new(base_frame) {|s|
-    pack('side'=>'right', 'fill'=>'y')
-    command proc{|*args| t.yview(*args)}
-    t.yscrollcommand proc{|first,last| s.set first,last}
-  }
-  pack('expand'=>'yes', 'fill'=>'both')
-
-  # テキストタグ設定 (フォント関連)
-  family = 'Courier'
-
-  if $tk_version =~ /^4.*/
-    style_tag_bold = TkTextTag.new(t, 'font'=>'-*-Courier-Bold-O-Normal--*-120-*-*-*-*-*-*')
-    style_tag_big = TkTextTag.new(t, 'font'=>'-*-Courier-Bold-R-Normal--*-140-*-*-*-*-*-*', 'kanjifont'=>$msg_kanji_font)
-    style_tag_verybig = TkTextTag.new(t, 'font'=>'-*-Helvetica-Bold-R-Normal--*-240-*-*-*-*-*-*')
-    # style_tag_small = TkTextTag.new(t, 'font'=>'-Adobe-Helvetica-Bold-R-Normal-*-100-*', 'kanjifont'=>$kanji_font)
-    style_tag_small = TkTextTag.new(t, 'font'=>'-Adobe-Helvetica-Bold-R-Normal-*-100-*')
-  else
-    style_tag_bold = TkTextTag.new(t, 'font'=>[family, 12, :bold, :italic])
-    style_tag_big = TkTextTag.new(t, 'font'=>[family, 14, :bold])
-    style_tag_verybig = TkTextTag.new(t, 'font'=>['Helvetica', 24, :bold])
-    style_tag_small = TkTextTag.new(t, 'font'=>'Times 8 bold')
-  end
-###
-#  case($tk_version)
-#  when /^4.*/
-#    style_tag_big = TkTextTag.new(t, 'font'=>'-*-Courier-Bold-R-Normal--*-140-*-*-*-*-*-*', 'kanjifont'=>$msg_kanji_font)
-#    style_tag_small = TkTextTag.new(t, 'font'=>'-Adobe-Helvetica-Bold-R-Normal-*-100-*', 'kanjifont'=>$kanji_font)
-#  when /^8.*/
-#    unless $style_demo_do_first
-#      $style_demo_do_first = true
-#      Tk.tk_call('font', 'create', '@bigascii',
-#                '-copy', '-*-Courier-Bold-R-Normal--*-140-*-*-*-*-*-*')
-#      Tk.tk_call('font', 'create', '@smallascii',
-#                '-copy', '-Adobe-Helvetica-Bold-R-Normal-*-100-*')
-#      Tk.tk_call('font', 'create', '@cBigFont',
-#                '-compound', '@bigascii @msg_knj')
-#      Tk.tk_call('font', 'create', '@cSmallFont',
-#                '-compound', '@smallascii @kanji')
-#    end
-#    style_tag_big = TkTextTag.new(t, 'font'=>'@cBigFont')
-#    style_tag_small = TkTextTag.new(t, 'font'=>'@cSmallFont')
-#  end
-
-  # テキストタグ設定 (色，レリーフ関連)
-  if TkWinfo.depth($root).to_i > 1
-    style_tag_color1 = TkTextTag.new(t, 'background'=>'#a0b7ce')
-    style_tag_color2 = TkTextTag.new(t, 'foreground'=>'red')
-    style_tag_raised = TkTextTag.new(t, 'relief'=>'raised', 'borderwidth'=>1)
-    style_tag_sunken = TkTextTag.new(t, 'relief'=>'sunken', 'borderwidth'=>1)
-  else
-    style_tag_color1 = TkTextTag.new(t, 'background'=>'black',
-                                     'foreground'=>'white')
-    style_tag_color2 = TkTextTag.new(t, 'background'=>'black',
-                                     'foreground'=>'white')
-    style_tag_raised = TkTextTag.new(t, 'background'=>'white',
-                                     'relief'=>'raised', 'borderwidth'=>1)
-    style_tag_sunken = TkTextTag.new(t, 'background'=>'white',
-                                     'relief'=>'sunken', 'borderwidth'=>1)
-  end
-
-  # テキストタグ設定 (その他)
-  if $tk_version =~ /^4\.[01]/
-    style_tag_bgstipple = TkTextTag.new(t, 'background'=>'black',
-                                        'borderwidth'=>0,
-                                        'bgstipple'=>'gray25')
-  else
-    style_tag_bgstipple = TkTextTag.new(t, 'background'=>'black',
-                                        'borderwidth'=>0,
-                                        'bgstipple'=>'gray12')
-  end
-  style_tag_fgstipple = TkTextTag.new(t, 'fgstipple'=>'gray50')
-  style_tag_underline = TkTextTag.new(t, 'underline'=>'on')
-  style_tag_overstrike = TkTextTag.new(t, 'overstrike'=>'on')
-  style_tag_right  = TkTextTag.new(t, 'justify'=>'right')
-  style_tag_center = TkTextTag.new(t, 'justify'=>'center')
-  if $tk_version =~ /^4.*/
-    style_tag_super = TkTextTag.new(t, 'offset'=>'4p', 'font'=>'-Adobe-Courier-Medium-R-Normal--*-100-*-*-*-*-*-*')
-    style_tag_sub = TkTextTag.new(t, 'offset'=>'-2p', 'font'=>'-Adobe-Courier-Medium-R-Normal--*-100-*-*-*-*-*-*')
-  else
-    style_tag_super = TkTextTag.new(t, 'offset'=>'4p', 'font'=>[family, 10])
-    style_tag_sub = TkTextTag.new(t, 'offset'=>'-2p', 'font'=>[family, 10])
-  end
-  style_tag_margins = TkTextTag.new(t, 'lmargin1'=>'12m', 'lmargin2'=>'6m',
-                                    'rmargin'=>'10m')
-  style_tag_spacing = TkTextTag.new(t, 'spacing1'=>'10p', 'spacing2'=>'2p',
-                                    'lmargin1'=>'12m', 'lmargin2'=>'6m',
-                                    'rmargin'=>'10m')
-
-  # テキスト挿入
-  insert('end', 'このようにテキスト widget は情報を様々なスタイルで表示すること
-ができます。')
-  insert('end', 'タグ', style_tag_big)
-  insert('end', 'というメカニズムでコントロールされます。
-タグとはテキスト widget 内のある文字 (の範囲)に対して適用できる
-単なる名前のことです。タグは様々な表示スタイルに設定できます。
-設定すると、そのタグのついた文字は指定したスタイルで表示される
-ようになります。使用できる表示スタイルは次の通りです。
-')
-  insert('end', '
-1. フォント', style_tag_big)
-  insert('end', '    どんな X のフォントでも使えます。')
-  insert('end', 'large', style_tag_verybig)
-  insert('end', '
-とか')
-#  insert('end', '小さい', style_tag_small)
-  insert('end', 'small', style_tag_small)
-  insert('end', 'とか。
-')
-  insert('end', '
-2. 色', style_tag_big)
-  insert('end', '  ')
-  insert('end', '背景色', style_tag_color1)
-  insert('end', 'も')
-  insert('end', '前景色', style_tag_color2)
-  insert('end', 'も')
-  insert('end', '両方', style_tag_color1, style_tag_color2)
-  insert('end', 'とも変えることができます。
-')
-  insert('end', '
-3. 網かけ', style_tag_big)
-  insert('end', '  このように描画の際に')
-  insert('end', '背景も', style_tag_bgstipple)
-  insert('end', '文字も', style_tag_fgstipple)
-  insert('end', '単なる塗りつぶし
-でなく、網かけを使うことができます。
-')
-  insert('end', '
-4. 下線', style_tag_big)
-  insert('end', '  このように')
-  insert('end', '文字に下線を引く', style_tag_underline)
-  insert('end', 'ことができます。
-')
-  insert('end', '
-5. 打ち消し線', style_tag_big)
-  insert('end', '  このように')
-  insert('end', '文字に重ねて線を引く', style_tag_overstrike)
-  insert('end', 'ことができます。
-')
-  insert('end', '
-6. 3D 効果', style_tag_big)
-  insert('end', '  背景に枠をつけて、文字を')
-  insert('end', '飛び出す', style_tag_raised)
-  insert('end', 'ようにしたり')
-  insert('end', '沈む', style_tag_sunken)
-  insert('end', '
-ようにできます。
-')
-  insert('end', '
-7. 行揃え', style_tag_big)
-  insert('end', ' このように行を
-')
-  insert('end', '左に揃えたり
-')
-  insert('end', '右に揃えたり
-', style_tag_right)
-  insert('end', '真中に揃えたりできます。
-', style_tag_center)
-  insert('end', '
-8. 肩付き文字と添字', style_tag_big)
-  insert('end', '  10')
-  insert('end', 'n', style_tag_super)
-  insert('end', ' のように肩付き文字の効果や、')
-  insert('end', '
-X')
-  insert('end', 'i', style_tag_sub)
-  insert('end', 'のように添字の効果を出すことができます。
-')
-  insert('end', '
-9. マージン', style_tag_big)
-  insert('end', 'テキストの左側に余分な空白を置くことができます:
-')
-  insert('end', 'この段落はマージンの使用例です。スクリーン',
-         style_tag_margins)
-  insert('end', '上で折り返されて表示されている1行のテキストです。',
-         style_tag_margins)
-  insert('end', '左側には2種類のマージンを持ちます。', style_tag_margins)
-  insert('end', '1行目に対するものと、', style_tag_margins)
-  insert('end', '2行目以降の連続したマージン', style_tag_margins)
-  insert('end', 'です。また右側にもマージンがあります。', style_tag_margins)
-  insert('end', '行の折り返し位置を決めるために使用することができます。
-', style_tag_margins)
-  insert('end', '
-10. スペーシング', style_tag_big)
-  insert('end', '3つのパラメータで行のスペーシングを')
-  insert('end', '制御す
-ることができます。Spacing1で、行の')
-  insert('end', '上にどのくらいの空間を置くか、
-spacing3')
-  insert('end', 'で行の下にどのくらいの空間を置くか、')
-  insert('end', '行が折り返されているなら
-ば、spacing2で、')
-  insert('end', 'テキスト行を生成している行の間にどのくらい')
-  insert('end', 'の空間を置
-くかを示します。
-')
-  insert('end', 'これらのインデントされた段落はどのように',
-         style_tag_spacing)
-  insert('end', 'スペーシングがが行われるのかを示します。',
-         style_tag_spacing)
-  insert('end', '各段落は実際はテキストwidget', style_tag_spacing)
-  insert('end', 'の1行で、widgetによって折り畳まれています。
-', style_tag_spacing)
-  insert('end', 'Spacing1はこのテキストでは10pointに', style_tag_spacing)
-  insert('end', '設定されています。', style_tag_spacing)
-  insert('end', 'これにより、段落の間に大きな間隔が', style_tag_spacing)
-  insert('end', '存在しています。', style_tag_spacing)
-  insert('end', 'Spacing2は2pointに設定されています。', style_tag_spacing)
-  insert('end', 'これで段落の中にほんの少し間隔が存在しています。',
-         style_tag_spacing)
-  insert('end', 'Spacing3はこの例では使用されていません。
-', style_tag_spacing)
-  insert('end', '間隔がどこにあるかを見たければ、これらの段落の',
-         style_tag_spacing)
-  insert('end', 'なかでテキストを選択してください。選択の', style_tag_spacing)
-  insert('end', '反転した部分には余分にとられた間隔が', style_tag_spacing)
-  insert('end', '含まれています。
-', style_tag_spacing)
-
-}
-
-txt.width 70
-txt.height 32
diff --git a/ext/tk/sample/demos-jp/tcolor b/ext/tk/sample/demos-jp/tcolor
deleted file mode 100644
index f2d5458db4..0000000000
--- a/ext/tk/sample/demos-jp/tcolor
+++ /dev/null
@@ -1,534 +0,0 @@
-#!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
-#
-# tcolor --
-# このスクリプトはRGB,HSB,CYM形式をサポートする
-# 簡易カラーエディタです。
-#
-# Copyright (C) 1998 Takaaki Tateishi(ttate@jaist.ac.jp)
-# last update: Thu Jun 18 06:32:35 JST 1998
-#
-
-# まずはtk.rbを読み込む。
-
-require "tk"
-
-
-# Tkによって変更される変数はTkVariableのインスタンスを使う。
-
-$colorSpace = TkVariable.new(:rgb)
-$master = nil
-$red = 65535
-$green = 0
-$blue = 0
-$color = "#ffff00000000"
-$updating = TkVariable.new(0)
-$autoUpdate = TkVariable.new(1)
-$name = TkVariable.new($color)
-$command = TkVariable.new("print(%%,\"\n\")")
-# $command = TkVariable.new("")
-$label1 = TkVariable.new("label1")
-$label2 = TkVariable.new("label2")
-$label3 = TkVariable.new("label3")
-
-
-# リソースデータベースの設定
-if (TkVarAccess.new('tcl_platform')['platform'] == 'unix')
-  TkOptionDB.add('*Entry.background', 'white')
-end
-
-
-# 各イベント用のメソッド
-
-def rgbToHsv(red,green,blue)
-
-  if ( red > green )
-    max = red
-    min = green
-  else
-    max = green
-    min = red
-  end
-
-  if ( blue > max )
-    max = blue
-  else
-    if ( blue < min )
-      min = blue
-    end
-  end
-
-  range = max - min
-
-  if ( max == 0 )
-    sat = 0.0
-  else
-    sat = (max-min)/max
-  end
-
-  if ( sat == 0 )
-    hue = 0.0
-  else
-    rc = (max-red)/range
-    gc = (max-green)/range
-    bc = (max-blue)/range
-    if ( red == max )
-      hue = 0.166667 * (bc - gc)
-    else
-      if ( green == max )
-	hue = 0.166667 * (2.0 + rc - bc)
-      else
-	hue = 0.166667 * (4.0 + gc - rc)
-      end
-    end
-    if ( hue < 0.0 )
-      hue = hue + 1.0
-    end
-  end
-
-  [hue,sat,max/65535]
-end
-
-
-def hsbToRgb(hue,sat,value)
-  v = 65535.0 * value
-  if( sat == 0 )
-    ans = [v,v,v]
-  else
-    hue = hue*6.0
-    if ( hue >= 6 )
-      hue = 0.0
-    end
-    i = hue.to_i
-    f = hue - i
-    p = 65535.0 * value * (1.0 - sat)
-    q = 65535.0 * value * (1.0 - (sat * f))
-    t = 65535.0 * value * (1.0 - (sat * (1.0 - f)))
-    case i
-    when 0
-      ans = [v,t,p]
-    when 1
-      ans = [q,v,p]
-    when 2
-      ans = [p,v,t]
-    when 3
-      ans = [p,q,v]
-    when 4
-      ans = [t,p,v]
-    when 5
-      ans = [v,p,q]
-    else
-      raise(eException,"i value #{i} is out of range")
-    end
-  end
-  return ans
-end
-
-
-def _null_binding
-  Module.new.instance_eval{binding}
-end
-private :_null_binding
-
-def doUpdate
-  newCmd = $command.to_s.gsub("%%","\"#{$color}\"")
-  eval(newCmd, _null_binding)
-end
-
-
-def tc_scaleChanged
-  if( $updating.to_i == 1 )
-    return
-  end
-
-  $master = :scale if $master == nil
-
-  scale1 = $root.middle.middle.scale1
-  scale2 = $root.middle.middle.scale2
-  scale3 = $root.middle.middle.scale3
-
-  case $colorSpace.value.intern
-  when :rgb
-    $red = (scale1.get * 65.535).to_i
-    $green = (scale2.get * 65.535).to_i
-    $blue = (scale3.get * 65.535).to_i
-  when :cmy
-    $red = (65535 - scale1.get * 65.535).to_i
-    $green = (65535 - scale2.get * 65.535).to_i
-    $blue = (65535 - scale3.get * 65.535).to_i
-  when :hsb
-    list = hsbToRgb(scale1.get / 1000.0,
-		    scale2.get / 1000.0,
-		    scale3.get / 1000.0)
-    $red = list[0]
-    $green = list[1]
-    $blue = list[2]
-  else
-    raise(Exception,"unknown colorSpace")
-  end
-  $color = format("#%04x%04x%04x",$red.to_i,$green.to_i,$blue.to_i)
-  $name.value = $color if $master == :scale
-  $root.middle.right.set_color($color)
-  if( $autoUpdate.to_i == 1 )
-    doUpdate
-  end
-  Tk.update(true)
-  $master = nil if $master == :scale
-end
-
-
-def tc_setScales
-  $updating.value = 1
-
-  scale1 = $root.middle.middle.scale1
-  scale2 = $root.middle.middle.scale2
-  scale3 = $root.middle.middle.scale3
-
-  case $colorSpace.value.intern
-  when :rgb
-    scale1.set($red / 65.535)
-    scale2.set($green / 65.535)
-    scale3.set($blue / 65.535)
-  when :cmy
-    scale1.set((65535 - $red) / 65.535)
-    scale2.set((65535 - $green) / 65.535)
-    scale3.set((65535 - $blue) / 65.535)
-  when :hsb
-    list = rgbToHsv($red,$green,$blue)
-    scale1.set( list[0] * 1000.0 )
-    scale2.set( list[1] * 1000.0 )
-    scale3.set( list[2] * 1000.0 )
-  else
-    raise(Exception,"unknown colorSpace")
-  end
-
-  $updating.value = 0
-end
-
-
-def tc_loadNamedColor(name)
-  $name.value = name
-  $master = :name if $master == nil
-  if name[0,1] != "#"
-    list = TkWinfo.rgb($root.middle.right.swatch,name)
-    $red = list[0]
-    $green = list[1]
-    $blue = list[2]
-  else
-    case name.length
-    when 4
-      fmt = /#(.{1})(.{1})(.{1})/
-      shift = 12
-    when 7
-      fmt = /#(.{2})(.{2})(.{2})/
-      shift = 8
-    when 10
-      fmt = /#(.{3})(.{3})(.{3})/
-      shift = 4
-    when 13
-      fmt = /#(.{4})(.{4})(.{4})/
-      shift = 0
-    else
-      raise(eException,"syntax error in color name \"#{name}\"")
-    end
-    name.scan(fmt){|strlist|
-      if strlist.length != 3
-	raise(eException,"syntax error in color name \"#{name}\"")
-      end
-      $red = strlist[0].hex
-      $green = strlist[1].hex
-      $blue = strlist[2].hex
-    }
-    $red = $red << shift
-    $green = $green << shift
-    $blue = $blue << shift
-  end
-
-  tc_setScales
-  $color = format("#%04x%04x%04x",$red,$green,$blue)
-  $root.middle.right.set_color($color)
-  if $autoUpdate.to_i == 1
-    doUpdate
-  end
-  Tk.update(true)
-  $master = nil if $master == :name
-end
-
-
-def changeColorSpace(space)
-  case space
-  when :rgb
-    $label1.value = "Red"
-    $label2.value = "Green"
-    $label3.value = "Blue"
-  when :cmy
-    $label1.value = "Cyan"
-    $label2.value = "Magenta"
-    $label3.value = "Yellow"
-  when :hsb
-    $label1.value = "Hue"
-    $label2.value = "Saturation"
-    $label3.value = "Brightness"
-  end
-  tc_setScales
-end
-
-
-
-
-
-# tcolor用のメニュー
-
-class TkColorMenuFrame<TkFrame
-  def initialize(parent)
-    super(parent,
-	  "relief"=>"raised",
-	  "borderwidth"=>"2")
-
-    # Fileメニューボタンの生成
-    @file = TkMenubutton.new(self){|button|
-
-      # Fileメニューの作成
-      @file_menu = TkMenu.new(button){
-	add "radio",
-	  "label" => "RGB color space",
-	  "variable" => $colorSpace,
-	  "value" => :rgb,
-	  "underline" => "0",
-	  "command" => proc{changeColorSpace(:rgb)}
-	add "radio",
-	  "label" => "CMY color space",
-	  "variable" => $colorSpace,
-	  "value" => :cmy,
-	  "underline" => "0",
-	  "command" => proc{changeColorSpace(:cmy)}
-	add "radio",
-	  "label" => "HSB color space",
-	  "variable" => $colorSpace,
-	  "value" => :hsb,
-	  "underline" => "0",
-	  "command" => proc{changeColorSpace(:hsb)}
-	add "separator"
-	add "radio",
-	  "label" => "Automatic updates",
-	  "variable" => $autoUpdate,
-	  "value" => "1",
-	  "underline" => "0"
-	add "radio",
-	  "label" => "Manual updates",
-	  "variable" => $autoUpdate,
-	  "value" => "0",
-	  "underline" => "0"
-	add "separator"
-	add "command",
-	  "label" => "Exit program",
-	  "underline" => "0",
-	  "command" => proc{exit}
-      }
-
-      # FileメニューとFileボタンを関連付ける
-      menu @file_menu
-
-      text "File"
-      underline "0"
-    }.pack("side"=>"left")
-
-    self
-  end
-end
-
-
-# 下部のフレームのためのクラス
-class TkColorBotFrame<TkFrame
-  def initialize(parent)
-    super(parent,
-	  "relief"=> "raised",
-	  "borderwidth"=> 2)
-
-    @commandLabel = TkLabel.new(self,
-				"text"=> "Command:")
-    @command = TkEntry.new(self,
-			   "relief"=> "sunken",
-			   "borderwidth"=> "2",
-			   "textvariable"=> $command,
-			   "font"=> "-Adobe-Courier-Medium-R-Normal--*-120-*-*-*-*-*-*")
-    @update = TkButton.new(self,
-			   "text"=> "Update",
-			   "command"=> proc{doUpdate})
-    @commandLabel.pack("side"=>"left")
-    @update.pack("side"=>"right","pady"=>".1c","padx"=>".25c")
-    @command.pack("expand"=>"yes","fill"=>"x","ipadx"=>".25c")
-
-    self
-  end
-end
-
-
-# 中段左のフレーム
-class TkColorMiddleLeftFrame<TkFrame
-  def initialize(parent)
-    super(parent)
-
-    for i in ["/usr/local/lib/X11rgb.txt","/usr/lib/X11/rgb.txt",
-	"/X11/R5/lib/X11/rgb.txt","/X11/R4/lib/rgb/rgb.txt",
-	"/usr/openwin/lib/X11/rgb.txt"]
-      if !File.readable?(i)
-	next
-      end
-      f = File.open(i)
-      @scroll = TkScrollbar.new(self,
-				"orient"=>"vertical",
-				"relief"=>"sunken",
-				"borderwidth"=>"2")
-      @scroll.pack("side"=>"right","fill"=>"y")
-      @names = TkListbox.new(self,
-			     "width"=>"20",
-			     "height"=>"12",
-			     "yscrollcommand"=> proc{|first,last| @scroll.set first,last},
-			     "relief"=>"sunken",
-			     "borderwidth"=>"2",
-			     "exportselection"=>"false")
-      @scroll.command(proc{|*args| @names.yview(*args)})
-      @names.bind("Double-1",proc{
-		    tc_loadNamedColor(@names.get(@names.curselection))})
-      @names.pack("side"=>"left")
-      while (line = f.gets)
-	line.chop!
-	linelist = line.split(/[ \t]+/)
-	if linelist.length == 4
-	  @names.insert("end",linelist[3])
-	end
-      end
-      f.close
-      break
-    end
-
-    self
-  end
-end
-
-
-# 中段中央のフレーム
-class TkColorMiddleMiddleFrame<TkFrame
-  # @scale1,@scale2,@scale3を外部から参照のみ許可する。(変更不可)
-  attr_reader :scale1, :scale2, :scale3
-
-  def initialize(parent)
-    super(parent)
-
-    @f1 = TkFrame.new(self)
-    @f2 = TkFrame.new(self)
-    @f3 = TkFrame.new(self)
-    @f4 = TkFrame.new(self)
-
-    for f in [@f1,@f2,@f3]
-      f.pack("side"=>"top","expand"=>"yes")
-    end
-    @f4.pack("side"=>"top","expand"=>"yes","fill"=>"x")
-
-    @label1 = TkLabel.new(self,"textvariable"=>$label1)
-    @scale1 = TkScale.new(self,"from"=>"0","to"=>"1000","length"=>"6c",
-			  "orient"=>"horizontal",
-			  "command"=>proc{tc_scaleChanged})
-    @scale1.pack("side"=>"top","anchor"=>"w")
-    @label1.pack("side"=>"top","anchor"=>"w")
-
-    @label2 = TkLabel.new(self,"textvariable"=>$label2)
-    @scale2 = TkScale.new(self,"from"=>"0","to"=>"1000","length"=>"6c",
-			  "orient"=>"horizontal",
-			  "command"=>proc{tc_scaleChanged})
-    @scale2.pack("side"=>"top","anchor"=>"w")
-    @label2.pack("side"=>"top","anchor"=>"w")
-
-    @label3 = TkLabel.new(self,"textvariable"=>$label3)
-    @scale3 = TkScale.new(self,"from"=>"0","to"=>"1000","length"=>"6c",
-			  "orient"=>"horizontal",
-			  "command"=>proc{tc_scaleChanged})
-    @scale3.pack("side"=>"top","anchor"=>"w")
-    @label3.pack("side"=>"top","anchor"=>"w")
-
-    @nameLabel = TkLabel.new(self,"text"=>"Name:")
-    @name = TkEntry.new(self,"relief"=>"sunken","borderwidth"=>"2",
-			"textvariable"=>$name,"width"=>"10",
-			"font"=>"-Adobe-Courier-Medium-R-Normal--*-120-*-*-*-*-*-*")
-    @nameLabel.pack("side"=>"left")
-    @name.pack("side"=>"right", "expand"=>"1", "fill"=>"x")
-    @name.bind("Return",proc{tc_loadNamedColor $name.to_s})
-
-    self
-  end
-end
-
-
-class TkColorMiddleRightFrame<TkFrame
-  attr_reader :swatch
-
-  def initialize(parent)
-    super(parent)
-    @swatch = TkFrame.new(self, "width"=>"2c", "height"=>"5c",
-			  "background"=>$color)
-    @value = TkLabel.new(self,
-			 "text"=>$color,
-			 "width"=>"13",
-			 "font"=>"-Adobe-Courier-Medium-R-Normal--*-120-*-*-*-*-*-*")
-    @swatch.pack("side"=>"top","expand"=>"yes","fill"=>"both")
-    @value.pack("side"=>"bottom","pady"=>".25c")
-
-    self
-  end
-
-  def set_color(color)
-    @swatch["background"] = color
-    @value["text"] = color
-  end
-end
-
-
-
-# 中段のフレーム
-class TkColorMiddleFrame<TkFrame
-  attr_reader :left, :middle, :right
-
-  def initialize(parent)
-    super(parent,
-	  "relief"=> "raised",
-	  "borderwidth"=> "2")
-
-    @left = TkColorMiddleLeftFrame.new(self)
-    @left.pack("side"=>"left","padx"=>".25c","pady"=>".25c")
-
-    @middle = TkColorMiddleMiddleFrame.new(self)
-    @middle.pack("side"=>"left","expand"=>"yes","fill"=>"y")
-
-    @right = TkColorMiddleRightFrame.new(self)
-    @right.pack("side"=>"left","padx"=>".25c","pady"=>".25c","anchor"=>"s")
-
-    self
-  end
-end
-
-
-class TkColor<TkRoot
-  attr_reader :menu, :bottom, :middle
-
-  def initialize(*args)
-    super(*args)
-    @menu = TkColorMenuFrame.new(self)
-    @menu.pack("side"=>"top", "fill"=>"x")
-
-    @bottom = TkColorBotFrame.new(self)
-    @bottom.pack("side"=>"bottom","fill"=>"x")
-
-    @middle = TkColorMiddleFrame.new(self)
-    @middle.pack("side"=>"top","fill"=>"both")
-
-    self
-  end
-end
-
-
-$root = TkColor.new
-
-# イベントを待つ為にループに入る。
-changeColorSpace :rgb
-Tk.mainloop
diff --git a/ext/tk/sample/demos-jp/text.rb b/ext/tk/sample/demos-jp/text.rb
deleted file mode 100644
index 117f9f105a..0000000000
--- a/ext/tk/sample/demos-jp/text.rb
+++ /dev/null
@@ -1,121 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# text (basic facilities) widget demo (called by 'widget')
-#
-
-# toplevel widget が存在すれば削除する
-if defined?($text_demo) && $text_demo
-  $text_demo.destroy
-  $text_demo = nil
-end
-
-# demo 用の toplevel widget を生成
-$text_demo = TkToplevel.new {|w|
-  title("Text Demonstration - Basic Facilities")
-  iconname("text")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($text_demo).pack(:fill=>:both, :expand=>true)
-
-# version check
-if ((Tk::TK_VERSION.split('.').collect{|n| n.to_i} <=> [8,4]) < 0)
-  undo_support = false
-else
-  undo_support = true
-end
-
-# frame 生成
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc{
-      tmppath = $text_demo
-      $text_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc{showCode 'text'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# text 生成
-TkText.new(base_frame){|t|
-  # 生成
-  relief 'sunken'
-  bd 2
-  setgrid 1
-  height 30
-  TkScrollbar.new(base_frame) {|s|
-    pack('side'=>'right', 'fill'=>'y')
-    command proc{|*args| t.yview(*args)}
-    t.yscrollcommand proc{|first,last| s.set first,last}
-  }
-  pack('expand'=>'yes', 'fill'=>'both')
-
-  # テキスト挿入
-  insert('0.0', <<EOT)
-このウィンドウはテキスト widget です。1行またはそれ以上のテキストを表
-示・編集することができます。以下はテキスト widget でできる操作について
-まとめたものです。
-
-1. スクロール。スクロールバーでテキストの表示部分を動かすことができます。
-
-2. スキャニング。テキストのウィンドウでマウスボタン2 (中ボタンを) を押
-して上下にドラッグしてください。そうするとテキストが高速でドラッグされ、
-内容をざっと眺めることができます。
-
-3. テキストの挿入。マウスボタン1 (左ボタン) を押し、挿入カーソルをセッ
-トしてからテキストを入力してください。入力したものが widget に入ります。
-
-4. 選択。ある範囲の文字を選択するにはマウスボタン1 を押し、ドラッグし
-てください。一度ボタンを離したら、シフトキーを押しながらボタン1 を押す
-ことで選択範囲の調整ができます。これは選択範囲の最後をマウスカーソルに
-最も近い位置にリセットし、ボタンを離す前にマウスをドラッグすることでさ
-らに選択範囲を調整できます。ダブルクリックでワードを、またトリプルクリッ
-クで行全体を選択することができます。
-
-5. 消去と置換。テキストを消去するには、消去したい文字を選択してバック
-スペースかデリートキーを入力してください。あるいは、新しいテキストを
-入力すると選択されたテキストと置換されます。
-
-6. 選択部分のコピー。選択部分をこのウィンドウの中のどこかにコピーする
-には、まずコピーしたい所を選択(ここで、あるいは別のアプリケーションで)
-し、ボタン 2 をクリックして、挿入カーソルの位置にコピーしてください。
-
-7. 編集。テキスト widget は Emacs のキーバインドに加えて標準的なの Motif
-の編集機能をサポートしています。バックスペースとコントロール-H は挿入
-カーソルの左側の文字を削除します。デリートキーとコントロール-D は挿入
-カーソルの右側の文字を削除します。Meta-バックスペースは挿入カーソルの
-右側の単語を削除し、Meta-D は挿入カーソルの左側の単語を削除します。
-コントロール-K は挿入カーソルから行末までを削除し、その位置に改行
-しかなかった場合は、改行を削除します。#{
-      if undo_support
-        undo_text = "Control-z は最後に行った変更の取り消し(undo)を行い、"
-        case $tk_platform['platform']
-        when "unix", "macintosh"
-          undo_text << "Control-Shift-z"
-        else # 'windows'
-          undo_text << "Control-y"
-        end
-        undo_text << "はundoした変更の再適用(redo)を行います。"
-      else
-        ""
-      end
-}
-
-
-8. ウィンドウのリサイズ。この widget は "setGrid" オプションをオンにし
-てありますので、ウィンドウをリサイズする時には高さと幅は常に文字高と文
-字幅の整数倍になります。また、ウィンドウを狭くした場合には長い行が自動
-的に折り返され、常に全ての内容が見えるようになっています。
-EOT
-
-  set_insert('0.0')
-}
-
diff --git a/ext/tk/sample/demos-jp/textpeer.rb b/ext/tk/sample/demos-jp/textpeer.rb
deleted file mode 100644
index 341e6218b9..0000000000
--- a/ext/tk/sample/demos-jp/textpeer.rb
+++ /dev/null
@@ -1,83 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# text widget peering demo (called by 'widget')
-#
-# based on Tcl/Tk8.5.0 widget demos
-
-if defined?($textpeer_demo) && $textpeer_demo
-  $textpeer_demo.destroy
-  $textpeer_demo = nil
-end
-
-# demo toplevel widget
-$textpeer_demo = TkToplevel.new {|w|
-  title("Text Widget Peering Demonstration")
-  iconname("textpeer")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($textpeer_demo).pack(:fill=>:both, :expand=>true)
-
-count = [0]
-
-## Define a widget that we peer from; it won't ever actually be shown though
-first = TkText.new(base_frame, :widgetname=>"text#{count[0] += 1}")
-first.insert :end,"このデモは一つの組を成したテキストウィジェットを示します。"
-first.insert :end,"それらのテキストウィジェットは対等(ピア;peer)の関係に"
-first.insert :end,"なっています。"
-first.insert :end,"それらは、基盤となるデータモデルは共通のものを持ちますが、"
-first.insert :end,"画面表示位置、編集位置、選択範囲(selection)については"
-first.insert :end,"独立に持つことができます。"
-first.insert :end,"各テキストウィジェットの脇にある"
-first.insert :end,"「ピア(peer)の作成」ボタンを使えば、"
-first.insert :end,"新たなピアを追加することが可能です。"
-first.insert :end,"また「ピア(peer)の消去」ボタンを使えば、"
-first.insert :end,"特定のピアウィジェットを消去することもできます。"
-
-Tk.update_idletasks  ## for 'first' widget
-
-## Procedures to make and kill clones; most of this is just so that the demo
-## looks nice...
-def makeClone(count, win, txt)
-  cnt = (count[0] += 1)
-  peer = TkText::Peer.new(txt, win, :widgetname=>"text#{cnt}")
-  sbar = TkScrollbar.new(win, :widgetname=>"sb#{cnt}")
-  peer.yscrollbar sbar
-  b1 = TkButton.new(win, :widgetname=>"clone#{cnt}",
-                    :text=>'ピア(peer)の作成',
-                    :command=>proc{makeClone(count, win, peer)})
-  b2 = TkButton.new(win, :widgetname=>"kill#{cnt}",
-                    :text=>'ピア(peer)の消去',
-                    :command=>proc{killClone(win, cnt)})
-  row = cnt * 2
-  TkGrid.configure(peer, sbar, b1, :sticky=>'nsew', :row=>row)
-  TkGrid.configure('^',  '^',  b2, :sticky=>'nsew', :row=>(row+=1))
-  TkGrid.configure(b1,  b2, :sticky=>'new')
-  TkGrid.rowconfigure(win,  b2, :weight=>1)
-end
-
-def killClone(win, cnt)
-  Tk.destroy("#{win.path}.text#{cnt}",  "#{win.path}.sb#{cnt}",
-             "#{win.path}.clone#{cnt}", "#{win.path}.kill#{cnt}")
-end
-
-## Now set up the GUI
-makeClone(count, base_frame, first)
-makeClone(count, base_frame, first)
-first.destroy
-
-## See Code / Dismiss buttons
-TkFrame.new(base_frame){|f|
-  TkButton.new(f, :text=>'閉じる', :width=>15, :command=>proc{
-                 $textpeer_demo.destroy
-                 $textpeer_demo = nil
-               }).pack(:side=>:left, :expand=>true)
-
-  TkButton.new(f, :text=>'コード参照', :width=>15, :command=>proc{
-                 showCode 'textpeer'
-               }).pack(:side=>:left, :expand=>true)
-
-  TkGrid.configure(f, '-', '-', :sticky=>'ew', :row=>5000)
-}
-TkGrid.columnconfigure(base_frame, 0, :weight=>1)
diff --git a/ext/tk/sample/demos-jp/timer b/ext/tk/sample/demos-jp/timer
deleted file mode 100644
index 6cb7c87e09..0000000000
--- a/ext/tk/sample/demos-jp/timer
+++ /dev/null
@@ -1,136 +0,0 @@
-#!/usr/bin/env ruby
-#
-# timer --
-# This script generates a counter with start,stop and reset buttons.
-#
-# Copyright (C) 1998 Takaaki Tateishi (ttate@jaist.ac.jp)
-# last update: Sat Jun 27 12:24:14 JST 1998
-#
-
-require "tk"
-require "thread"
-require "tkafter"
-
-$time = "0.00"
-$m = Mutex.new
-$loop = false
-
-def timer_stop
-  $loop = false
-  $m.lock
-end
-
-def timer_start
-  $loop = true
-  $m.unlock
-end
-
-def timer_reset
-  $time = "0.00"
-  $root.countframe.counter['text'] = $time
-end
-
-def timer_loop
-  if $loop
-    $time = $time.succ
-    $root.countframe.counter['text'] = $time
-  end
-  Tk.after(10,proc{timer_loop})
-end
-
-
-#
-# thread version
-#
-def timer_loop2
-  while true
-    $m.lock
-    $time = $time.succ
-    $root.countframe.counter['text'] = $time
-    sleep(0.01)
-    $m.unlock
-  end
-end
-
-#
-# TkAfter
-#
-def timer_loop3
-  if $loop
-    $time = $time.succ
-    $root.countframe.counter['text'] = $time
-  end
-end
-
-
-class CountFrame < TkFrame
-  attr_reader :counter
-
-  def initialize(parent=nil,keys=nil)
-    super(parent,keys)
-    @counter = TkLabel.new(self,
-			   'text'=>$time,
-			   'relief'=>'raised')
-    @counter.pack('fill'=>'both')
-    self
-  end
-end
-
-
-class ButtonFrame < TkFrame
-  def initialize(parent=nil,keys=nil)
-    super(parent,keys)
-=begin
-    @stop = TkButton.new(self,
-			 'text'=>'Stop',
-			 'command'=>proc{timer_stop})
-    @start = TkButton.new(self,
-			  'text'=>'Start',
-			  'command'=>proc{timer_start})
-=end
-    @stop  = TkButton.new(self, :text=>'Stop',  :state=>:disabled)
-    @start = TkButton.new(self, :text=>'Start', :state=>:normal)
-
-    @stop.command proc{
-      timer_stop
-      @start.state(:normal)
-      @stop.state(:disabled)
-    }
-    @start.command proc{
-      timer_start
-      @stop.state(:normal)
-      @start.state(:disabled)
-    }
-
-    @reset = TkButton.new(self,
-			  'text'=>'Reset',
-			  'command'=>proc{timer_reset})
-    for b in [@stop,@start,@reset]
-      b.pack('side'=>'left', 'fill'=>'both', 'expand'=>'yes')
-    end
-  end
-end
-
-
-class Timer < TkRoot
-  attr_reader :countframe
-
-  def initialize(*args)
-    super(*args)
-    @countframe = CountFrame.new(self)
-    @buttonframe = ButtonFrame.new(self)
-    for f in [@buttonframe,@countframe]
-      f.pack('side'=>'top', 'fill'=>'both')
-    end
-    self
-  end
-end
-
-
-$root = Timer.new
-
-#$thread = Thread.start{timer_loop2}
-#timer_loop
-TkAfter.new(10,-1,proc{timer_loop3}).start
-
-Tk.mainloop
diff --git a/ext/tk/sample/demos-jp/toolbar.rb b/ext/tk/sample/demos-jp/toolbar.rb
deleted file mode 100644
index f355e8fef8..0000000000
--- a/ext/tk/sample/demos-jp/toolbar.rb
+++ /dev/null
@@ -1,137 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# toolbar.rb --
-#
-# This demonstration script creates a toolbar that can be torn off.
-#
-# based on "Id: toolbar.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($toolbar_demo) && $toolbar_demo
-  $toolbar_demo.destroy
-  $toolbar_demo = nil
-end
-
-$toolbar_demo = TkToplevel.new {|w|
-  title("Ttk Menu Buttons")
-  iconname("toolbar")
-  positionWindow(w)
-}
-
-base_frame = Ttk::Frame.new($toolbar_demo).pack(:fill=>:both, :expand=>true)
-
-if Tk.windowingsystem != 'aqua'
-  msg = Ttk::Label.new(base_frame, :wraplength=>'4i', :text=><<EOL)
-このデモでは，ツールバーをどのようにして適切にテーマ対応させるか，\
-また，どのようにして切り離し可能にするかを示しています\
-（ただし，ツールバーの切り離しにはTcl/Tk8.5以上の機能が必要です）．\
-ツールバーのボタンは，'Toolbutton'スタイルを使用するように明示することで，\
-"toolbar style"ボタンとなるように属性設定されています．\
-ツールバーの左端には簡単なマーカーが置かれています．\
-マーカー上にマウスカーソルが来ると移動アイコンにカーソルが変化します．\
-そこでツールバーを動かすようにドラッグすると，\
-ツールバー全体を切り離して独立したトップレベルウィジェットに\
-することができます．\
-切り離したツールバーが不要となった時には，\
-一般的なトップレベルウィジェットと同様に単純に閉じることで，
-再び元のウィンドウに張り付けられるでしょう．
-EOL
-else
-  msg = Ttk::Label.new(base_frame, :wraplength=>'4i', :text=><<EOL)
-このデモでは，ツールバーをどのようにして適切にテーマ対応させるかを\
-示しています．\
-ツールバーのボタンは，'Toolbutton'スタイルを使用するように明示することで，\
-"toolbar style"ボタンとなるように属性設定されています．
-EOL
-end
-
-## Set up the toolbar hull
-tbar_base = Tk::Frame.new(base_frame,  # Tk 標準の frame でなければなりません．
-                          :widgetname=>'toolbar') # ウィンドウタイトル文字列とするために，ウィジェット名を明示しています．
-sep = Ttk::Separator.new(base_frame)
-to_base = Ttk::Frame.new(tbar_base, :cursor=>'fleur')
-if Tk.windowingsystem != 'aqua'
-  to  = Ttk::Separator.new(to_base, :orient=>:vertical)
-  to2 = Ttk::Separator.new(to_base, :orient=>:vertical)
-  to.pack(:fill=>:y, :expand=>true, :padx=>2, :side=>:left)
-  to2.pack(:fill=>:y, :expand=>true, :side=>:left)
-end
-
-contents = Ttk::Frame.new(tbar_base)
-Tk.grid(to_base, contents, :sticky=>'nsew')
-tbar_base.grid_columnconfigure(contents, :weight=>1)
-contents.grid_columnconfigure(1000, :weight=>1)
-
-if Tk.windowingsystem != 'aqua'
-  ## Bindings so that the toolbar can be torn off and reattached
-  to_base.bind('B1-Motion', '%X %Y'){|x, y| tbar_base.tearoff(to_base, x, y)}
-  to.     bind('B1-Motion', '%X %Y'){|x, y| tbar_base.tearoff(to_base, x, y)}
-  to2.    bind('B1-Motion', '%X %Y'){|x, y| tbar_base.tearoff(to_base, x, y)}
-  def tbar_base.tearoff(w, x, y)
-    on_win = TkWinfo.containing(x, y)
-    return unless (on_win && on_win.path =~ /^#{@path}(\.|$)/)
-    self.grid_remove
-    w.grid_remove
-    self.wm_manage
-    # self.wm_title('Toolbar') # もしウィジェット名をウィンドウタイトルにしたくないなら，ここで設定してください
-    self.wm_protocol('WM_DELETE_WINDOW'){ self.untearoff(w) }
-  end
-  def tbar_base.untearoff(w)
-    self.wm_forget
-    w.grid
-    self.grid
-  end
-end
-
-## Some content for the rest of the toplevel
-text = TkText.new(base_frame, :width=>40, :height=>10)
-
-## Toolbar contents
-tb_btn = Ttk::Button.new(tbar_base, :text=>'ボタン', :style=>'Toolbutton',
-                         :command=>proc{
-                           text.insert(:end, "ボタンが押されました．\n")
-                         })
-tb_chk = Ttk::Checkbutton.new(tbar_base, :text=>'チェックボタン',
-                              :style=>'Toolbutton',
-                              :variable=>(check = TkVariable.new),
-                              :command=>proc{
-                                text.insert(:end, "チェックボタンの値は#{check.value}です．\n")
-                              })
-tb_mbtn = Ttk::Menubutton.new(tbar_base, :text=>'メニュー')
-tb_combo = Ttk::Combobox.new(tbar_base, :value=>TkFont.families,
-                             :state=>:readonly)
-tb_mbtn.menu(menu = Tk::Menu.new(tb_mbtn))
-menu.add(:command, :label=>'Just', :command=>proc{text.insert(:end, "Just\n")})
-menu.add(:command, :label=>'An', :command=>proc{text.insert(:end, "An\n")})
-menu.add(:command, :label=>'Example',
-         :command=>proc{text.insert(:end, "Example\n")})
-tb_combo.bind('<ComboboxSelected>'){ text.font.family = tb_combo.get }
-
-## Arrange contents
-Tk.grid(tb_btn, tb_chk, tb_mbtn, tb_combo,
-        :in=>contents, :padx=>2, :sticky=>'ns')
-Tk.grid(tbar_base, :sticky=>'ew')
-Tk.grid(sep, :sticky=>'ew')
-Tk.grid(msg, :sticky=>'ew')
-Tk.grid(text, :sticky=>'nsew')
-base_frame.grid_rowconfigure(text, :weight=>1)
-base_frame.grid_columnconfigure(text, :weight=>1)
-
-## See Code / Dismiss buttons
-Ttk::Frame.new(base_frame) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         Ttk::Button.new(frame, :text=>'コード参照',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{showCode 'toolbar'}),
-         Ttk::Button.new(frame, :text=>'閉じる',
-                         :image=>$image['delete'], :compound=>:left,
-                         :command=>proc{
-                           $toolbar_demo.destroy
-                           $toolbar_demo = nil
-                         }),
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  Tk.grid(frame, :sticky=>'ew')
-}
diff --git a/ext/tk/sample/demos-jp/tree.rb b/ext/tk/sample/demos-jp/tree.rb
deleted file mode 100644
index 48d5e5407e..0000000000
--- a/ext/tk/sample/demos-jp/tree.rb
+++ /dev/null
@@ -1,121 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# tree.rb --
-#
-# This demonstration script creates a toplevel window containing a Ttk
-# tree widget.
-#
-# based on "Id: tree.tcl,v 1.4 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($tree_demo) && $tree_demo
-  $tree_demo.destroy
-  $tree_demo = nil
-end
-
-$tree_demo = TkToplevel.new {|w|
-  title("Directory Browser")
-  iconname("tree")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($tree_demo).pack(:fill=>:both, :expand=>true)
-
-## Explanatory text
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i',
-               :justify=>:left, :anchor=>'n', :padding=>[10, 2, 10, 6],
-               :text=><<EOL).pack(:fill=>:x)
-Ttkとは，テーマ指定可能な新しいウィジェット集合です．\
-このサンプルは，ファイルシステムのような階層的なデータ集合を\
-参照できるようにしたTtk::Treeviewウィジェットを含んでいます．\
-Ttk::Treeviewウィジェットは，木構造自体の表示を可能にするだけでなく，\
-追加情報(このサンプルの場合はファイルサイズ)を表示するために\
-任意の個数の追加カラムも扱うこともできます．\
-また，カラムのタイトル間の区切り部分をドラッグすることで，\
-カラムの幅を変更することも可能です．
-EOL
-
-## See Code / Dismiss
-Ttk::Frame.new(base_frame) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         Ttk::Button.new(frame, :text=>'コード参照',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{showCode 'tree'}),
-         Ttk::Button.new(frame, :text=>'閉じる',
-                         :image=>$image['delete'], :compound=>:left,
-                         :command=>proc{
-                           $tree_demo.destroy
-                           $tree_demo = nil
-                         }),
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x)
-}
-
-## Code to populate the roots of the tree (can be more than one on Windows)
-def populate_roots(tree)
-  TkComm.simplelist(Tk.tk_call('file', 'volumes')).sort.each{|dir|
-    populate_tree(tree, tree.insert(nil, :end, :text=>dir,
-                                    :values=>[dir, 'directory']))
-  }
-end
-
-## Code to populate a node of the tree
-def populate_tree(tree, node)
-  return if tree.get(node, :type) != 'directory'
-
-  path = tree.get(node, :fullpath)
-  tree.delete(tree.children(node))
-  Dir.glob("#{path}/*").sort.each{|f|
-    type = File.ftype(f) rescue nil
-    id = tree.insert(node, :end,
-                     :text=>File.basename(f), :values=>[f, type]).id
-    if type == 'directory'
-      ## Make it so that this node is openable
-      tree.insert(id, 0, :text=>'dummy')
-      tree.itemconfigure(id, :text=>File.basename(f))
-    elsif type == 'file'
-      size = File.size(f)
-      if size >= 1024*1024*1024
-        size = '%.1f GB' % (size.to_f/1024/1024/1024)
-      elsif size >= 1024*1024
-        size = '%.1f MB' % (size.to_f/1024/1024)
-      elsif size >= 1024
-        size = '%.1f KB' % (size.to_f/1024)
-      else
-        size = '%.1f bytes' % (size.to_f/1024)
-      end
-      tree.set(id, :size, size)
-    end
-  }
-
-  # Stop this code from rerunning on the current node
-  tree.set(node, :type, 'processed_directory')
-end
-
-## Create the tree and set it up
-tree = Ttk::Treeview.new(base_frame, :columns=>%w(fullpath type size),
-                         :displaycolumns=>['size'])
-if Tk.windowingsystem != 'aqua'
-  vsb = tree.yscrollbar(Ttk::Scrollbar.new(base_frame))
-  hsb = tree.xscrollbar(Ttk::Scrollbar.new(base_frame))
-else
-  vsb = tree.yscrollbar(Tk::Scrollbar.new(base_frame))
-  hsb = tree.xscrollbar(Tk::Scrollbar.new(base_frame))
-end
-
-tree.heading_configure('#0', :text=>'Directory Structure')
-tree.heading_configure('size', :text=>'File Size')
-tree.column_configure('size', :stretch=>0, :width=>70)
-populate_roots(tree)
-tree.bind('<TreeviewOpen>', '%W'){|w| populate_tree(w, w.focus_item)}
-
-## Arrange the tree and its scrollbars in the toplevel
-container = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
-container.lower
-Tk.grid(tree, vsb, :in=>container, :sticky=>'nsew')
-Tk.grid(hsb,       :in=>container, :sticky=>'nsew')
-container.grid_columnconfigure(0, :weight=>1)
-container.grid_rowconfigure(0, :weight=>1)
diff --git a/ext/tk/sample/demos-jp/ttkbut.rb b/ext/tk/sample/demos-jp/ttkbut.rb
deleted file mode 100644
index 3a72eac377..0000000000
--- a/ext/tk/sample/demos-jp/ttkbut.rb
+++ /dev/null
@@ -1,146 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# ttkbut.rb
-#
-# This demonstration script creates a toplevel window containing several
-# simple Ttk widgets, such as labels, labelframes, buttons, checkbuttons and
-# radiobuttons.
-#
-# based on "Id: ttkbut.tcl,v 1.4 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($ttkbut_demo) && $ttkbut_demo
-  $ttkbut_demo.destroy
-  $ttkbut_demo = nil
-end
-
-$ttkbut_demo = TkToplevel.new {|w|
-  title("Simple Ttk Widgets")
-  iconname("ttkbut")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($ttkbut_demo).pack(:fill=>:both, :expand=>true)
-
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
-               :text=><<EOL).pack(:side=>:top, :fill=>:x)
-Ttkとは，テーマ指定可能な新しいウィジェット集合です．\
-今，あなたが目にしているのはTtkのテーマ化ラベルで，\
-下にはTtkのラベルフレームの中に三つのグループのTtkウィジェットが\
-表示されています．
-最初のグループは全てボタンであり，\
-それぞれクリックすれば現在のアプリケーションのテーマが設定されます．
-２番目のグループは三つのチェックボタン集合です．\
-各集合の間には，セパレータウィジェットが置かれています．\
-なお「有効化」ボタンは，このトップレベルウィジェット内の\
-他のすべてのテーマ化ウィジェットの状態(state)が"disabled"かどうかを\
-コントロールすることに注意してください．
-３番目のグループは関連付けられたラジオボタン集合となっています．
-EOL
-
-## Add buttons for setting the theme
-buttons = Ttk::Labelframe.new(base_frame, :text=>'ボタン')
-# Ttk::Style.theme_names.each{|theme|
-#   Ttk::Button.new(buttons, :text=>theme,
-#                   :command=>proc{Ttk::Style.theme_use theme}).pack(:pady=>2)
-# }
-Ttk.themes.each{|theme|
-  Ttk::Button.new(buttons, :text=>theme,
-                  :command=>proc{Ttk.set_theme theme}).pack(:pady=>2)
-}
-
-## Helper procedure for the top checkbutton
-def setState(root, value, *excepts)
-  return if excepts.member?(root)
-
-  ## Non-Ttk widgets (e.g. the toplevel) will fail, so make it silent
-  begin
-    root.state = value
-  rescue
-  end
-
-  ## Recursively invoke on all children of this root that are in the same
-  ## toplevel widget
-  root.winfo_children.each{|w|
-    setState(w, value, *excepts) if w.winfo_toplevel == root.winfo_toplevel
-  }
-end
-
-## Set up the checkbutton group
-checks = Ttk::Labelframe.new(base_frame, :text=>'チェックボタン')
-enabled = TkVariable.new(true)
-e = Ttk::Checkbutton.new(checks, :text=>'有効化', :variable=>enabled,
-                         :command=>proc{
-                           setState($ttkbut_demo,
-                                    ((enabled.bool)? "!disabled" : "disabled"),
-                                    e)
-                         })
-
-## See ttk_widget(n) for other possible state flags
-sep1 = Ttk::Separator.new(checks)
-sep2 = Ttk::Separator.new(checks)
-
-cheese  = TkVariable.new
-tomato  = TkVariable.new
-basil   = TkVariable.new
-oregano = TkVariable.new
-
-c1 = Ttk::Checkbutton.new(checks, :text=>'チーズ',   :variable=>cheese)
-c2 = Ttk::Checkbutton.new(checks, :text=>'トマト',   :variable=>tomato)
-c3 = Ttk::Checkbutton.new(checks, :text=>'バジル',   :variable=>basil)
-c4 = Ttk::Checkbutton.new(checks, :text=>'オレガノ', :variable=>oregano)
-
-Tk.pack(e, sep1, c1, c2, sep2, c3, c4, :fill=>:x, :pady=>2)
-
-## Set up the radiobutton group
-radios = Ttk::Labelframe.new(base_frame, :text=>'ラジオボタン')
-
-happiness = TkVariable.new
-
-r1 = Ttk::Radiobutton.new(radios, :variable=>happiness,
-                          :text=>'Great', :value=>'great')
-r2 = Ttk::Radiobutton.new(radios, :variable=>happiness,
-                          :text=>'Good', :value=>'good')
-r3 = Ttk::Radiobutton.new(radios, :variable=>happiness,
-                          :text=>'Ok', :value=>'ok')
-r4 = Ttk::Radiobutton.new(radios, :variable=>happiness,
-                          :text=>'Poor', :value=>'poor')
-r5 = Ttk::Radiobutton.new(radios, :variable=>happiness,
-                          :text=>'Awful', :value=>'awful')
-
-Tk.pack(r1, r2, r3, r4, r5, :fill=>:x, :padx=>3, :pady=>2)
-
-## See Code / Dismiss
-Ttk::Frame.new(base_frame) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         Ttk::Button.new(frame, :text=>'変数参照',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{
-                           showVars(base_frame, ['有効化', enabled],
-                                    ['チーズ', cheese], ['トマト', tomato],
-                                    ['バジル', basil], ['オレガノ', oregano],
-                                    ['幸福度', happiness])
-                         }),
-         Ttk::Button.new(frame, :text=>'コード参照',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{showCode 'ttkbut'}),
-         Ttk::Button.new(frame, :text=>'閉じる',
-                         :image=>$image['delete'], :compound=>:left,
-                         :command=>proc{
-                           tmppath = $ttkbut_demo
-                           $ttkbut_demo = nil
-                           $showVarsWin[tmppath.path] = nil
-                           tmppath.destroy
-                         }),
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x, :expand=>true)
-}
-
-## Arrange things neatly
-f = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
-f.lower
-Tk.grid(buttons, checks, radios, :in=>f, :sticky=>'nwe', :pady=>2, :padx=>3)
-f.grid_columnconfigure([0, 1, 2], :weight=>1, :uniform=>:yes)
diff --git a/ext/tk/sample/demos-jp/ttkmenu.rb b/ext/tk/sample/demos-jp/ttkmenu.rb
deleted file mode 100644
index b521a3f101..0000000000
--- a/ext/tk/sample/demos-jp/ttkmenu.rb
+++ /dev/null
@@ -1,92 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# ttkmenu.rb --
-#
-# This demonstration script creates a toplevel window containing several Ttk
-# menubutton widgets.
-#
-# based on "Id: ttkmenu.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($ttkmenu_demo) && $ttkmenu_demo
-  $ttkmenu_demo.destroy
-  $ttkmenu_demo = nil
-end
-
-$ttkmenu_demo = TkToplevel.new {|w|
-  title("Ttk Menu Buttons")
-  iconname("ttkmenu")
-  positionWindow(w)
-}
-
-base_frame = Ttk::Frame.new($ttkmenu_demo).pack(:fill=>:both, :expand=>true)
-
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
-               :text=><<EOL).pack(:side=>:top, :fill=>:x)
-Ttkとは，テーマ指定可能な新しいウィジェット集合です．\
-これによりテーマに対応することができるようになったウィジェットのひとつに\
-メニューボタンがあります．\
-以下では，テーマに対応したメニューボタンがいくつか表示されています．\
-それらを使って，現在使用中のテーマを変更することが可能です．\
-テーマの選択がメニューボタン自身の見掛けを変化させる様子や，\
-中央のメニューボタンだけが異なるスタイル\
-(ツールバーでの一般的な表示に適したもの)で表示されている様子に\
-注目してください．\
-なお，メニューボタンについてはテーマに対応したウィジェットがありますが，\
-メニューについてはテーマに対応したウィジェットは含まれていません．\
-その理由は，標準のTkのメニューウィジェットが\
-すべてのプラットホームで十分に良好な見掛けと操作性を持っている，\
-特に，多くの環境でその環境本来の操作体系となるように実装されていると\
-判断されたことによります．
-EOL
-
-Ttk::Separator.new(base_frame).pack(:side=>:top, :fill=>:x)
-
-## See Code / Dismiss
-Ttk::Frame.new($ttkmenu_demo) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         Ttk::Button.new(frame, :text=>'コード参照',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{showCode 'ttkmenu'}),
-         Ttk::Button.new(frame, :text=>'閉じる',
-                         :image=>$image['delete'], :compound=>:left,
-                         :command=>proc{
-                           $ttkmenu_demo.destroy
-                           $ttkmenu_demo = nil
-                         }),
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x)
-}
-
-b1 = Ttk::Menubutton.new(base_frame,:text=>'テーマを選択',:direction=>:above)
-b2 = Ttk::Menubutton.new(base_frame,:text=>'テーマを選択',:direction=>:left)
-b3 = Ttk::Menubutton.new(base_frame,:text=>'テーマを選択',:direction=>:right)
-b4 = Ttk::Menubutton.new(base_frame,:text=>'テーマを選択',:direction=>:flush,
-                         :style=>Ttk::Menubutton.style('Toolbutton'))
-b5 = Ttk::Menubutton.new(base_frame,:text=>'テーマを選択',:direction=>:below)
-
-b1.menu(m1 = Tk::Menu.new(b1, :tearoff=>false))
-b2.menu(m2 = Tk::Menu.new(b2, :tearoff=>false))
-b3.menu(m3 = Tk::Menu.new(b3, :tearoff=>false))
-b4.menu(m4 = Tk::Menu.new(b4, :tearoff=>false))
-b5.menu(m5 = Tk::Menu.new(b5, :tearoff=>false))
-
-Ttk.themes.each{|theme|
-  m1.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
-  m2.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
-  m3.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
-  m4.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
-  m5.add(:command, :label=>theme, :command=>proc{Ttk.set_theme theme})
-}
-
-f = Ttk::Frame.new(base_frame).pack(:fill=>:x)
-f1 = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
-f.lower
-
-f.grid_anchor(:center)
-TkGrid('x', b1, 'x', :in=>f, :padx=>3, :pady=>2)
-TkGrid(b2,  b4, b3,  :in=>f, :padx=>3, :pady=>2)
-TkGrid('x', b5, 'x', :in=>f, :padx=>3, :pady=>2)
diff --git a/ext/tk/sample/demos-jp/ttknote.rb b/ext/tk/sample/demos-jp/ttknote.rb
deleted file mode 100644
index 332b1017ab..0000000000
--- a/ext/tk/sample/demos-jp/ttknote.rb
+++ /dev/null
@@ -1,98 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# ttknote.rb --
-#
-# This demonstration script creates a toplevel window containing a Ttk
-# notebook widget.
-#
-# based on "Id: ttknote.tcl,v 1.5 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($ttknote_demo) && $ttknote_demo
-  $ttknote_demo.destroy
-  $ttknote_demo = nil
-end
-
-$ttknote_demo = TkToplevel.new {|w|
-  title("Ttk Notebook Widget")
-  iconname("ttknote")
-  positionWindow(w)
-}
-
-## See Code / Dismiss
-Ttk::Frame.new($ttknote_demo) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         Ttk::Button.new(frame, :text=>'コード参照',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{showCode 'ttknote'}),
-         Ttk::Button.new(frame, :text=>'閉じる',
-                         :image=>$image['delete'], :compound=>:left,
-                         :command=>proc{
-                           $ttknote_demo.destroy
-                           $ttknote_demo = nil
-                         }),
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x)
-}
-
-base_frame = Ttk::Frame.new($ttknote_demo).pack(:fill=>:both, :expand=>true)
-
-## Make the notebook and set up Ctrl+Tab traversal
-notebook = Ttk::Notebook.new(base_frame).pack(:fill=>:both, :expand=>true,
-                                              :padx=>2, :pady=>3)
-notebook.enable_traversal
-
-## Populate the first pane
-f_msg = Ttk::Frame.new(notebook)
-msg_m = Ttk::Label.new(f_msg, :font=>$font, :wraplength=>'5i',
-                       :justify=>:left, :anchor=>'n', :text=><<EOL)
-Ttkとは，テーマ指定可能な新しいウィジェット集合です．\
-その中に含まれるウィジェットのひとつにノートブックウィジェットがあります．\
-ノートブックウィジェットは，\
-個別の内容を持ったパネルからの選択を可能にするような\
-タブの集合（タブセット）を定めます．\
-タブセットは最近の多くのユーザインターフェースで見られる機能です．\
-タブの選択は，マウスによるだけでなく，\
-ノートブックウィジェットのページの見出しが選択されている時であれば\
-Ctrl+Tabキーの入力によっても行うことができます．\
-このデモでは，見出しで下線付きの文字のキーとAltキーとを組み合わせることで\
-ページを選択することができるようにも設定しています．\
-ただし，２番目のタブは無効化されて選択できないようになっていることには\
-注意してください．
-EOL
-neat = TkVariable.new
-after_id = nil
-msg_b = Ttk::Button.new(f_msg, :text=>'すてきだ！(Neat!)', :underline=>6,
-                        :command=>proc{
-                          neat.value = 'あぁ，そのとおりさ．．．'
-                          Tk.after_cancel(after_id) if after_id
-                          after_id = Tk.after(500){neat.value = ''}
-                        })
-msg_b.winfo_toplevel.bind('Alt-n'){ msg_b.focus; msg_b.invoke }
-msg_l = Ttk::Label.new(f_msg, :textvariable=>neat)
-notebook.add(f_msg, :text=>'説明(Description)', :underline=>3, :padding=>2)
-Tk.grid(msg_m, '-', :sticky=>'new', :pady=>2)
-Tk.grid(msg_b, msg_l, :pady=>[2, 4], :padx=>20)
-msg_b.grid_configure(:sticky=>'e')
-msg_l.grid_configure(:sticky=>'w')
-f_msg.grid_rowconfigure(1, :weight=>1)
-f_msg.grid_columnconfigure([0, 1], :weight=>1, :uniform=>1)
-
-## Populate the second pane. Note that the content doesn't really matter
-f_disabled = Ttk::Frame.new(notebook)
-notebook.add(f_disabled, :text=>'無効化されたタブ', :state=>:disabled)
-
-## Populate the third pane
-f_editor = Ttk::Frame.new(notebook)
-notebook.add(f_editor, :text=>'テキストエディタ(Text Editor)', :underline=>9)
-editor_t = Tk::Text.new(f_editor, :width=>40, :height=>10, :wrap=>:char)
-if Tk.windowingsystem != 'aqua'
-  editor_s = editor_t.yscrollbar(Ttk::Scrollbar.new(f_editor))
-else
-  editor_s = editor_t.yscrollbar(Tk::Scrollbar.new(f_editor))
-end
-editor_s.pack(:side=>:right, :fill=>:y, :padx=>[0,2], :pady=>2)
-editor_t.pack(:fill=>:both, :expand=>true, :padx=>[2,0], :pady=>2)
diff --git a/ext/tk/sample/demos-jp/ttkpane.rb b/ext/tk/sample/demos-jp/ttkpane.rb
deleted file mode 100644
index af7622272c..0000000000
--- a/ext/tk/sample/demos-jp/ttkpane.rb
+++ /dev/null
@@ -1,217 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# ttkpane.rb --
-#
-# This demonstration script creates a Ttk pane with some content.
-#
-# based on "Id: ttkpane.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($ttkpane_demo) && $ttkpane_demo
-  $ttkpane_demo.destroy
-  $ttkpane_demo = nil
-end
-
-$ttkpane_demo = TkToplevel.new {|w|
-  title("Themed Nested Panes")
-  iconname("ttkpane")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($ttkpane_demo).pack(:fill=>:both, :expand=>true)
-
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
-               :text=><<EOL).pack(:side=>:top, :fill=>:x)
-このデモは，埋め込み関係にあるテーマ付きペインドウィンドウを示しています．\
-それぞれの大きさは，含まれているペインの間にあるエリアをつかんで\
-境界をドラッグすることで変更できます．
-EOL
-
-Ttk::Separator.new(base_frame).pack(:side=>:top, :fill=>:x)
-
-## See Code / Dismiss
-Ttk::Frame.new(base_frame) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         Ttk::Button.new(frame, :text=>'コード参照',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{showCode 'ttkpane'}),
-         Ttk::Button.new(frame, :text=>'閉じる',
-                         :image=>$image['delete'], :compound=>:left,
-                         :command=>proc{
-                           $ttkpane_demo.destroy
-                           $ttkpane_demo = nil
-                         }),
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x)
-}
-
-frame = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
-
-outer = Ttk::Panedwindow.new(frame, :orient=>:horizontal)
-outer.add(in_left = Ttk::Panedwindow.new(outer, :orient=>:vertical))
-outer.add(in_right = Ttk::Panedwindow.new(outer, :orient=>:vertical))
-in_left.add(left_top = Ttk::Labelframe.new(in_left, :text=>'ボタン'))
-in_left.add(left_bot = Ttk::Labelframe.new(in_left, :text=>'時計'))
-in_right.add(right_top = Ttk::Labelframe.new(in_right, :text=>'プログレス'))
-in_right.add(right_bot = Ttk::Labelframe.new(in_right, :text=>'テキスト'))
-if Tk.windowingsystem == 'aqua'
-  [left_top, left_bot, right_top, right_bot].each{|w| w.padding(3) }
-end
-
-# Fill the button pane
-Ttk::Button.new(left_top, :text=>'押してね',
-                :command=>proc{
-                  Tk.messageBox(:type=>'ok', :icon=>'info',
-                                :message=>'いてて！',
-                                :detail=>'That hurt...', :parent=>base_frame,
-                                :title=>'Button Pressed')
-                }).pack(:padx=>2, :pady=>5)
-
-
-zones_list = [
-  [':Europe/Berlin'],
-  [':America/Argentina/Buenos_Aires', ':America/Buenos_Aires'],
-  [':Africa/Johannesburg'],
-  [':Europe/London'],
-  [':America/Los_Angeles'],
-  [':Europe/Moscow'],
-  [':America/New_York'],
-  [':Asia/Singapore'],
-  [':Australia/Sydney'],
-  [':Asia/Tokyo'],
-]
-
-zones = []
-
-# Check tzinfo support
-if $tk_major_ver > 8 || ($tk_major_ver == 8 && $tk_minor_ver >= 5)
-  tzinfo = :tcl
-
-  zones_list.each{|list|
-    list.each{|zone|
-      begin
-        # Force a pre-load of all the timezones needed; otherwise can end up
-        # poor-looking synch problems!
-        Tk.tk_call('clock', 'format', '0', '-timezone', zone)
-      rescue RuntimeError
-        # ignore
-      else
-        zones << [zone, zone[%r<[^/:]+$>].tr('_', ' ')]
-        break
-      end
-    }
-  }
-
-else
-  begin
-    require 'tzinfo'
-    tzinfo = :tzinfo
-  rescue Exception
-    begin
-      require 'tzfile'
-      tzinfo = :tzfile
-    rescue Exception
-      tzinfo = nil
-    end
-  end
-
-  case tzinfo
-  when :tzinfo
-    zones_list.each{|list|
-      list.each{|zone|
-        begin
-          tz = TZInfo::Timezone.get(zone[%r<[^:]+$>])
-        rescue Exception
-          # ignore
-        else
-          zones << [tz, zone[%r<[^/:]+$>].tr('_', ' ')]
-          break
-        end
-      }
-    }
-
-  when :tzfile
-    zones_list.each{|list|
-      list.each{|zone|
-        begin
-          tz = TZFile.create(zone[%r<[^:]+$>])
-        rescue Exception
-          # ignore
-        else
-          zones << [tz, zone[%r<[^/:]+$>].tr('_', ' ')]
-          break
-        end
-      }
-    }
-
-  else
-    [ -7, -4, -2, -1, 0, +1, +3, +8, +9, +10 ].each{|zone|
-      zones << [zone, 'UTC%+03d00' % zone]
-    }
-  end
-end
-
-time = TkVariable.new_hash
-
-case tzinfo
-when :tcl
-  update_proc = proc{|now, tz, label|
-    time[label] = Tk.tk_call('clock', 'format', now.tv_sec,
-                             '-timezone', tz, '-format', '%T')
-  }
-when :tzinfo
-  update_proc = proc{|now, tz, label|
-    time[label] = tz.utc_to_local(now).strftime('%H:%M:%S')
-  }
-when :tzfile
-  update_proc = proc{|now, tz, label|
-    time[label] = tz.at(now.tv_sec).strftime('%H:%M:%S')
-  }
-else
-  update_proc = proc{|now, tz, label|
-    time[label] = (now + (tz * 3600)).strftime('%H:%M:%S')
-  }
-end
-
-# Fill the clocks pane
-zones.each_with_index{|(zone, label), idx|
-  Ttk::Separator.new(left_bot).pack(:fill=>:x) if idx > 0
-  Ttk::Label.new(left_bot, :text=>label, :anchor=>'w').pack(:fill=>:x)
-  Ttk::Label.new(left_bot, :textvariable=>time.ref(label),
-                 :anchor=>'w').pack(:fill=>:x)
-}
-
-# Timer start
-every = proc{
-  now = Time.now.utc
-  zones.each{|zone, label| update_proc.call(now, zone, label) }
-}
-TkRTTimer.new(1000, -1, every).start(0, every)
-
-# Fill the progress pane
-Ttk::Progressbar.new(right_top, :mode=>:indeterminate).pack(:fill=>:both, :expand=>true).start
-
-# Fill the text pane
-if Tk.windowingsystem != 'aqua'
-  # The trick with the ttk::frame makes the text widget look like it fits with
-  # the current Ttk theme despite not being a themed widget itself. It is done
-  # by styling the frame like an entry, turning off the border in the text
-  # widget, and putting the text widget in the frame with enough space to allow
-  # the surrounding border to show through (2 pixels seems to be enough).
-  f = Ttk::Frame.new(right_bot, :style=>Ttk::Entry)
-  txt = TkText.new(frame, :wrap=>:word, :width=>30, :borderwidth=>0)
-  txt.pack(:fill=>:both, :expand=>true, :in=>f, :pady=>2, :padx=>2)
-  scr = txt.yscrollbar(Ttk::Scrollbar.new(frame))
-  scr.pack(:side=>:right, :fill=>:y, :in=>right_bot)
-  f.pack(:fill=>:both, :expand=>true)
-  outer.pack(:fill=>:both, :expand=>true)
-else
-  txt = TkText.new(frame, :wrap=>:word, :width=>30, :borderwidth=>0)
-  scr = txt.yscrollbar(TkScrollbar.new(frame))
-  scr.pack(:side=>:right, :fill=>:y, :in=>right_bot)
-  txt.pack(:fill=>:both, :expand=>true, :in=>right_bot)
-  outer.pack(:fill=>:both, :expand=>true, :padx=>10, :pady=>[6, 10])
-end
diff --git a/ext/tk/sample/demos-jp/ttkprogress.rb b/ext/tk/sample/demos-jp/ttkprogress.rb
deleted file mode 100644
index 6f0ea4c2df..0000000000
--- a/ext/tk/sample/demos-jp/ttkprogress.rb
+++ /dev/null
@@ -1,72 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# ttkprogress.rb --
-#
-# This demonstration script creates several progress bar widgets.
-#
-# based on "Id: ttkprogress.tcl,v 1.3 2007/12/13 15:27:07 dgp Exp"
-
-if defined?($ttkprogress_demo) && $ttkprogress_demo
-  $ttkprogress_demo.destroy
-  $ttkprogress_demo = nil
-end
-
-$ttkprogress_demo = TkToplevel.new {|w|
-  title("Progress Bar Demonstration")
-  iconname("ttkprogress")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($ttkprogress_demo).pack(:fill=>:both, :expand=>true)
-
-Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
-               :text=><<EOL).pack(:side=>:top, :fill=>:x)
-下にあるのは二つのプログレスバーです．\
-上のものは"determinate"タイプのプログレスバーで，\
-例えばプログラムが与えられたタスクを終了するまでにどのくらいかかるかを\
-示すときなどに用いられます．\
-下のものは"indeterminate"タイプのプログレスバーで，\
-例えばプログラムが実行中(busy)であるものの\
-終了までにどれくらいかかるかは分からないという状態を\
-示すときなどに用いられます．\
-いずれのプログレスバーも，すぐ下にあるボタンを使うことで\
-自動アニメーションモードのON/OFFを切替えることができます．
-EOL
-
-## See Code / Dismiss buttons
-Ttk::Frame.new(base_frame) {|frame|
-  sep = Ttk::Separator.new(frame)
-  Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         Ttk::Button.new(frame, :text=>'コード参照',
-                         :image=>$image['view'], :compound=>:left,
-                         :command=>proc{showCode 'ttkprogress'}),
-         Ttk::Button.new(frame, :text=>'閉じる',
-                         :image=>$image['delete'], :compound=>:left,
-                         :command=>proc{
-                           $ttkprogress_demo.destroy
-                           $ttkprogress_demo = nil
-                         }),
-         :padx=>4, :pady=>4)
-  grid_columnconfigure(0, :weight=>1)
-  pack(:side=>:bottom, :fill=>:x)
-}
-
-frame = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
-
-p1 = Ttk::Progressbar.new(frame, :mode=>:determinate)
-p2 = Ttk::Progressbar.new(frame, :mode=>:indeterminate)
-
-start = Ttk::Button.new(frame, :text=>'Start Progress',
-                        :command=>proc{ p1.start; p2.start })
-stop  = Ttk::Button.new(frame, :text=>'Stop Progress',
-                        :command=>proc{ p1.stop; p2.stop })
-
-Tk.grid(p1, '-', :pady=>5, :padx=>10)
-Tk.grid(p2, '-', :pady=>5, :padx=>10)
-Tk.grid(start, stop, :padx=>10, :pady=>5)
-start.grid_configure(:sticky=>'e')
-stop.grid_configure(:sticky=>'w')
-frame.grid_columnconfigure(:all, :weight=>1)
-
diff --git a/ext/tk/sample/demos-jp/twind.rb b/ext/tk/sample/demos-jp/twind.rb
deleted file mode 100644
index 7db7576c6e..0000000000
--- a/ext/tk/sample/demos-jp/twind.rb
+++ /dev/null
@@ -1,293 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# text (embedded windows) widget demo (called by 'widget')
-#
-
-# toplevel widget が存在すれば削除する
-if defined?($twind_demo) && $twind_demo
-  $twind_demo.destroy
-  $twind_demo = nil
-end
-
-# demo 用の toplevel widget を生成
-$twind_demo = TkToplevel.new {|w|
-  title("Text Demonstration - Embedded Windows")
-  iconname("Embedded Windows")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($twind_demo).pack(:fill=>:both, :expand=>true)
-
-# frame 生成
-$twind_buttons = TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc{
-      tmppath = $twind_demo
-      $twind_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc{showCode 'twind'}
-  }.pack('side'=>'left', 'expand'=>'yes')
-}
-$twind_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame 生成
-$twind_text = nil
-TkFrame.new(base_frame, 'highlightthickness'=>2, 'borderwidth'=>2,
-            'relief'=>'sunken') {|f|
-  $twind_text = TkText.new(f, 'setgrid'=>'true', 'font'=>$font,
-                          'width'=>'70', 'height'=>35, 'wrap'=>'word',
-                          'highlightthickness'=>0, 'borderwidth'=>0 ){|t|
-    TkScrollbar.new(f) {|s|
-      command proc{|*args| t.yview(*args)}
-      t.yscrollcommand proc{|first,last| s.set first,last}
-    }.pack('side'=>'right', 'fill'=>'y')
-  }.pack('expand'=>'yes', 'fill'=>'both')
-}.pack('expand'=>'yes', 'fill'=>'both')
-
-# タグ生成
-$tag_center = TkTextTag.new($twind_text,
-                            'justify' =>'center',
-                            'spacing1'=>'5m',
-                            'spacing3'=>'5m'  )
-$tag_buttons = TkTextTag.new($twind_text,
-                             'lmargin1'=>'1c',
-                             'lmargin2'=>'1c',
-                             'rmargin' =>'1c',
-                             'spacing1'=>'3m',
-                             'spacing2'=>0,
-                             'spacing3'=>0 )
-
-# テキストの生成
-$twind_text.insert('end',
-                  'テキストwidget上に他のwidgetを組み込むことができます。')
-$twind_text.insert('end',
-                  '組み込みウィンドウと呼ばれ、任意のwidgetが可能です。')
-$twind_text.insert('end',
-                  '例えば、ここに2つのボタンwidgetが組み込まれています。')
-$twind_text.insert('end', '最初のボタンをクリックすと水平方向のスクロールを')
-TkTextWindow.new($twind_text, 'end',
-                 'window'=>TkButton.new($twind_text) {
-                   #text 'ON'
-                   text 'オン'
-                   command proc{textWindOn $twind_text,$twind_buttons}
-                   cursor 'top_left_arrow'
-                 })
-$twind_text.insert('end', "にします。また2つめのボタンをクリックすると\n")
-$twind_text.insert('end', '水平方向のスクロールを')
-TkTextWindow.new($twind_text, 'end',
-                 'window'=>TkButton.new($twind_text) {
-                   #text 'OFF'
-                   text 'オフ'
-                   command proc{textWindOff $twind_text}
-                   cursor 'top_left_arrow'
-                 })
-$twind_text.insert('end', 'にします。')
-
-$twind_text.insert('end', 'もうひとつの例です。')
-TkTextWindow.new($twind_text, 'end',
-                 'window'=>TkButton.new($twind_text) {
-                   text 'ここをクリック'
-                   command proc{textWindPlot $twind_text}
-                   cursor 'top_left_arrow'
-                 })
-$twind_text.insert('end', 'すると、x-yプロットがここに現れます。')
-$mark_plot = TkTextMark.new($twind_text, 'insert')
-$mark_plot.gravity='left'
-$twind_text.insert('end', 'マウスでデータを描画することができます。')
-TkTextWindow.new($twind_text, 'end',
-                 'window'=>TkButton.new($twind_text) {
-                   text '消去'
-                   command proc{textWindDel $twind_text}
-                   cursor 'top_left_arrow'
-                 })
-$twind_text.insert('end', 'をクリックすると元に戻ります。
-
-')
-
-$twind_text.insert('end', '組み込みウィンドウだけをテキストwidget上に、実際の')
-$twind_text.insert('end', 'テキストはなしで組み込むことは便利です。')
-$twind_text.insert('end', 'この場合は、テキストwidgetはウィンドウマネージャの')
-$twind_text.insert('end', 'ように動作します。例えば、ここにはテキストwidgetに')
-$twind_text.insert('end', 'よってボタンがきれいに並べられています。')
-$twind_text.insert('end', 'これらのボタンで背景色を変えることができます')
-$twind_text.insert('end', '("Default"で元の色に戻すことができます)。')
-$twind_text.insert('end', '"Short"というボタンをクリックすると文字列の長さが')
-$twind_text.insert('end', '変わります。すると自動的にテキストwidgetが')
-$twind_text.insert('end', 'レイアウトを整えてくれます。')
-$twind_text.insert('end', 'もう一度同じボタンを押すと元に戻ります。
-
-')
-
-TkTextWindow.new($twind_text, 'end',
-                 'window'=>TkButton.new($twind_text) {|b|
-                   text 'デフォルト'
-                   command proc{embDefBg $twind_text}
-                   cursor 'top_left_arrow'
-                   $tag_buttons.add('end')
-                 },
-                 'padx'=>3 )
-embToggle = TkVariable.new('Short')
-TkTextWindow.new($twind_text, 'end',
-                 'window'=>TkCheckButton.new($twind_text) {
-                   textvariable embToggle
-                   indicatoron 0
-                   variable embToggle
-                   onvalue 'A much longer string'
-                   offvalue 'Short'
-                   cursor 'top_left_arrow'
-                   pady 5
-                   padx 2
-                 },
-                 'padx'=>3,
-                 'pady'=>2 )
-
-[ 'AntiqueWhite3', 'Bisque1', 'Bisque2', 'Bisque3', 'Bisque4',
-  'SlateBlue3', 'RoyalBlue1', 'SteelBlue2', 'DeepSkyBlue3', 'LightBlue1',
-  'DarkSlateGray1', 'Aquamarine2', 'DarkSeaGreen2', 'SeaGreen1',
-  'Yellow1', 'IndianRed1', 'IndianRed2', 'Tan1', 'Tan4'
-].each{|twind_color|
-  TkTextWindow.new($twind_text, 'end',
-                   'window'=>TkButton.new($twind_text) {
-                     text twind_color
-                     cursor 'top_left_arrow'
-                     command proc{$twind_text.bg twind_color}
-                   },
-                   'padx'=>3,
-                   'pady'=>2 )
-}
-
-# メソッド定義
-def textWindOn (w,f)
-  if defined? $twind_scroll
-    begin
-      $twind_scroll.destroy
-    rescue
-    end
-    $twind_scroll = nil
-  end
-
-  base = TkWinfo.parent( TkWinfo.parent(w) )
-  $twind_scroll = TkScrollbar.new(base) {|s|
-    orient 'horizontal'
-    command proc{|*args| w.xview(*args)}
-    w.xscrollcommand proc{|first,last| s.set first,last}
-    w.wrap 'none'
-    pack('after'=>f, 'side'=>'bottom', 'fill'=>'x')
-  }
-
-  return nil
-end
-
-def textWindOff (w)
-  if defined? $twind_scroll
-    begin
-      $twind_scroll.destroy
-    rescue
-    end
-    $twind_scroll = nil
-  end
-  w.xscrollcommand ''
-  w.wrap 'word'
-end
-
-def textWindPlot (t)
-  if (defined? $twind_plot) && (TkWinfo.exist?($twind_plot))
-    return
-  end
-
-  $twind_plot = TkCanvas.new(t) {
-    relief 'sunken'
-    width  450
-    height 300
-    cursor 'top_left_arrow'
-  }
-
-  if $tk_version =~ /^4.*/
-    font = '-Adobe-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*'
-  else
-    font = 'Helvetica 18'
-  end
-
-  TkcLine.new($twind_plot, 100, 250, 400, 250, 'width'=>2)
-  TkcLine.new($twind_plot, 100, 250, 100,  50, 'width'=>2)
-  TkcText.new($twind_plot, 225, 20,
-              'text'=>"A Simple Plot", 'font'=>font, 'fill'=>'brown')
-
-  (0..10).each {|i|
-    x = 100 + (i * 30)
-    TkcLine.new($twind_plot, x, 250, x, 245, 'width'=>2)
-    TkcText.new($twind_plot, x, 254,
-                'text'=>10*i, 'font'=>font, 'anchor'=>'n')
-  }
-  (0..5).each {|i|
-    y = 250 - (i * 40)
-    TkcLine.new($twind_plot, 100, y, 105, y, 'width'=>2)
-    TkcText.new($twind_plot, 96, y,
-                'text'=>"#{i*50}.0", 'font'=>font, 'anchor'=>'e')
-  }
-
-  for xx, yy in [[12,56],[20,94],[33,98],[32,120],[61,180],[75,160],[98,223]]
-    x = 100 + (3*xx)
-    y = 250 - (4*yy)/5
-    item = TkcOval.new($twind_plot, x-6, y-6, x+6, y+6,
-                       'width'=>1, 'outline'=>'black', 'fill'=>'SkyBlue2')
-    item.addtag 'point'
-  end
-
-  $twind_plot.itembind('point', 'Any-Enter',
-                        proc{$twind_plot.itemconfigure 'current', 'fill', 'red'})
-  $twind_plot.itembind('point', 'Any-Leave',
-                        proc{$twind_plot.itemconfigure 'current', 'fill', 'SkyBlue2'})
-  $twind_plot.itembind('point', '1',
-                        proc{|x,y| embPlotDown $twind_plot,x,y}, "%x %y")
-  $twind_plot.itembind('point', 'ButtonRelease-1',
-                        proc{$twind_plot.dtag 'selected'})
-  $twind_plot.bind('B1-Motion',
-                    proc{|x,y| embPlotMove $twind_plot,x,y}, "%x %y")
-  while ($twind_text.get($mark_plot) =~ /[ \t\n]/)
-    $twind_text.delete $mark_plot
-  end
-  $twind_text.insert $mark_plot,"\n"
-  TkTextWindow.new($twind_text, $mark_plot, 'window'=>$twind_plot)
-  $tag_center.add $mark_plot
-  $twind_text.insert $mark_plot,"\n"
-end
-
-$embPlot = {'lastX'=>0, 'lastY'=>0}
-
-def embPlotDown (w, x, y)
-  w.dtag 'selected'
-  w.addtag_withtag 'selected', 'current'
-  w.raise 'current'
-  $embPlot['lastX'] = x
-  $embPlot['lastY'] = y
-end
-
-def embPlotMove (w, x, y)
-  w.move 'selected', x - $embPlot['lastX'], y - $embPlot['lastY']
-  $embPlot['lastX'] = x
-  $embPlot['lastY'] = y
-end
-
-def textWindDel (w)
-  if (defined? $twind_text) && TkWinfo.exist?($twind_plot)
-    $twind_text.delete $twind_plot
-    $twind_plot = nil
-    while ($twind_text.get($mark_plot) =~ /[ \t\n]/)
-      $twind_text.delete $mark_plot
-    end
-    $twind_text.insert $mark_plot,"  "
-  end
-end
-
-def embDefBg (w)
-  w['background'] = w.configinfo('background')[3]
-end
diff --git a/ext/tk/sample/demos-jp/twind2.rb b/ext/tk/sample/demos-jp/twind2.rb
deleted file mode 100644
index c5bef5bce0..0000000000
--- a/ext/tk/sample/demos-jp/twind2.rb
+++ /dev/null
@@ -1,385 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# text (embedded windows) widget demo 2 (called by 'widget')
-#
-
-# toplevel widget が存在すれば削除する
-if defined?($twind2_demo) && $twind2_demo
-  $twind2_demo.destroy
-  $twind2_demo = nil
-end
-
-# demo 用の toplevel widget を生成
-$twind2_demo = TkToplevel.new {|w|
-  title("Text Demonstration - Embedded Windows 2")
-  iconname("Embedded Windows")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($twind2_demo).pack(:fill=>:both, :expand=>true)
-
-# frame 生成
-$twind2_buttons = TkFrame.new(base_frame) {|frame|
-  TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2),
-         :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
-  TkGrid('x',
-         TkButton.new(frame, :text=>'コード参照',
-                      :image=>$image['view'], :compound=>:left,
-                      :command=>proc{showCode 'twind2'}),
-         TkButton.new(frame, :text=>'閉じる',
-                      :image=>$image['delete'], :compound=>:left,
-                      :command=>proc{
-                        tmppath = $twind2_demo
-                        $twind2_demo = nil
-                        $showVarsWin[tmppath.path] = nil
-                        tmppath.destroy
-                      }),
-         :padx=>4, :pady=>4)
-  frame.grid_columnconfigure(0, :weight=>1)
-}
-$twind2_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-# frame 生成
-$twind2_text = nil
-TkFrame.new(base_frame, 'highlightthickness'=>2, 'borderwidth'=>2,
-            'relief'=>'sunken') {|f|
-  $twind2_text = TkText.new(f, 'setgrid'=>true, 'font'=>$font,
-                            # 'width'=>'70', 'height'=>35, 'wrap'=>'word',
-                            'width'=>'70', 'height'=>35, 'wrap'=>'char',
-                            'highlightthickness'=>0, 'borderwidth'=>0 ){|t|
-    TkScrollbar.new(f) {|s|
-      command proc{|*args| t.yview(*args)}
-      t.yscrollcommand proc{|first,last| s.set first,last}
-    }.pack('side'=>'right', 'fill'=>'y')
-  }.pack('expand'=>'yes', 'fill'=>'both')
-}.pack('expand'=>'yes', 'fill'=>'both')
-
-# タグ生成
-$tag2_center = TkTextTag.new($twind2_text,
-                            'justify' =>'center',
-                            'spacing1'=>'5m',
-                            'spacing3'=>'5m'  )
-$tag2_buttons = TkTextTag.new($twind2_text,
-                             'lmargin1'=>'1c',
-                             'lmargin2'=>'1c',
-                             'rmargin' =>'1c',
-                             'spacing1'=>'3m',
-                             'spacing2'=>0,
-                             'spacing3'=>0 )
-
-# テキストの生成
-$twind2_text.insert('end', 'テキストウィジェットには色々な種類のアイテム')
-$twind2_text.insert('end', '（動的なものや静的なものの両方があります）を')
-$twind2_text.insert('end', '数多く含めることができます。そうしたアイテムは')
-$twind2_text.insert('end', '行替え、タブ、中央揃えなどの様々な方法で')
-$twind2_text.insert('end', '配置することができます。')
-$twind2_text.insert('end', '加えて、テキストウィジェットの内容物が')
-$twind2_text.insert('end', 'ウィンドウサイズに比べて大きすぎる場合でも')
-$twind2_text.insert('end', 'すべての方向にスムーズにスクロールさせて')
-$twind2_text.insert('end', '確認することが可能です。')
-$twind2_text.insert('end', "\n\n")
-$twind2_text.insert('end', 'テキストウィジェット上には他のウィジェットを')
-$twind2_text.insert('end', '含めることもできます。こうしたものは')
-$twind2_text.insert('end', '「埋め込みウィンドウ」と呼ばれ、その中に')
-$twind2_text.insert('end', 'いかなるウィジェットでも詰め込むことができます。')
-$twind2_text.insert('end', '例えば，ここには２つの')
-$twind2_text.insert('end', 'ボタンウィジェットが埋め込まれています。')
-$twind2_text.insert('end', '最初のボタンをクリックすると、')
-$twind2_text.insert('end', '水平方向のスクロールを ')
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkButton.new($twind2_text) {
-                   #text 'ON'
-                   text 'オン'
-                   command proc{textWindOn2 $twind2_text,$twind2_buttons}
-                   cursor 'top_left_arrow'
-                 })
-$twind2_text.insert('end', "にします。また、２つめのボタンをクリックすると\n")
-$twind2_text.insert('end', '水平方向のスクロールを')
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkButton.new($twind2_text) {
-                   #text 'OFF'
-                   text 'オフ'
-                   command proc{textWindOff2 $twind2_text}
-                   cursor 'top_left_arrow'
-                 })
-$twind2_text.insert('end', "にします。\n\n")
-
-$twind2_text.insert('end', '次はもうひとつの例です。')
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkButton.new($twind2_text) {
-                   text 'ここをクリック'
-                   command proc{textWindPlot2 $twind2_text}
-                   cursor 'top_left_arrow'
-                 })
-$twind2_text.insert('end', 'すると、x-yプロットがここに現れます。')
-$mark2_plot = TkTextMark.new($twind2_text, 'insert')
-$mark2_plot.gravity='left'
-$twind2_text.insert('end', 'マウスでドラッグすることで、')
-$twind2_text.insert('end', 'プロット上のデータ点を移動することができます。')
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkButton.new($twind2_text) {
-                   text '消去'
-                   command proc{textWindDel2 $twind2_text}
-                   cursor 'top_left_arrow'
-                 })
-$twind2_text.insert('end', 'をクリックすると元に戻ります。')
-$twind2_text.insert('end', "\n\n")
-
-$twind2_text.insert('end', '表示するテキストなしに埋め込みウィンドウだけを')
-$twind2_text.insert('end', 'テキストウィジェットに含めることも有用でしょう。')
-$twind2_text.insert('end', 'この場合、テキストウィジェットは')
-$twind2_text.insert('end', 'ジオメトリマネージャのように働きます。')
-$twind2_text.insert('end', '例えば、ここにはテキストウィジェットに')
-$twind2_text.insert('end', 'よってボタンがきれいに整列して配置されています。')
-$twind2_text.insert('end', 'これらのボタンをクリックすることで、')
-$twind2_text.insert('end', 'このテキストウィジェットの背景色を')
-$twind2_text.insert('end', '変えることができます("デフォルト"ボタンで')
-$twind2_text.insert('end', '元の色に戻すことができます)。')
-$twind2_text.insert('end', '"Short"というボタンをクリックすると文字列の長さが')
-$twind2_text.insert('end', '変わり、テキストウィジェットが自動的に')
-$twind2_text.insert('end', 'レイアウトを整える様子を見ることができます。')
-$twind2_text.insert('end', 'もう一度同じボタンを押すと元に戻ります。')
-$twind2_text.insert('end', "\n")
-
-btn_default = TkButton.new($twind2_text) {|b|
-  text 'デフォルト'
-  command proc{embDefBg2 $twind2_text}
-  cursor 'top_left_arrow'
-}
-TkTextWindow.new($twind2_text, 'end', 'window'=>btn_default, 'padx'=>3)
-embToggle = TkVariable.new('Short')
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkCheckButton.new($twind2_text) {
-                   textvariable embToggle
-                   indicatoron 0
-                   variable embToggle
-                   onvalue 'A much longer string'
-                   offvalue 'Short'
-                   cursor 'top_left_arrow'
-                   pady 5
-                   padx 2
-                 },
-                 'padx'=>3,
-                 'pady'=>2 )
-
-[ 'AntiqueWhite3', 'Bisque1', 'Bisque2', 'Bisque3', 'Bisque4',
-  'SlateBlue3', 'RoyalBlue1', 'SteelBlue2', 'DeepSkyBlue3', 'LightBlue1',
-  'DarkSlateGray1', 'Aquamarine2', 'DarkSeaGreen2', 'SeaGreen1',
-  'Yellow1', 'IndianRed1', 'IndianRed2', 'Tan1', 'Tan4'
-].each{|twind_color|
-  TkTextWindow.new($twind2_text, 'end',
-                   'window'=>TkButton.new($twind2_text) {
-                     text twind_color
-                     cursor 'top_left_arrow'
-                     command proc{$twind2_text.bg twind_color}
-                   },
-                   'padx'=>3,
-                   'pady'=>2 )
-}
-
-$tag2_buttons.add(btn_default, 'end')
-
-$text_normal2 = {}
-$text_normal2['border'] = $twind2_text.cget('borderwidth')
-$text_normal2['highlight'] = $twind2_text.cget('highlightthickness')
-$text_normal2['pad'] = $twind2_text.cget('padx')
-
-$twind2_text.insert('end', "\nborder width や highlightthickness, ")
-$twind2_text.insert('end', "padding を通常の値から変更することも可能です。\n")
-
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkButton.new($twind2_text, :text=>"Big borders",
-                                        :cursor=>'top_left_arrow',
-                                        'command'=>proc{
-                                          textWinBigB2 $twind2_text
-                                        }))
-
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkButton.new($twind2_text, :text=>"Small borders",
-                                        :cursor=>'top_left_arrow',
-                                        'command'=>proc{
-                                          textWinSmallB2 $twind2_text
-                                        }))
-
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkButton.new($twind2_text, :text=>"Big highlight",
-                                        :cursor=>'top_left_arrow',
-                                        'command'=>proc{
-                                          textWinBigH2 $twind2_text
-                                        }))
-
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkButton.new($twind2_text, :text=>"Small highlight",
-                                        :cursor=>'top_left_arrow',
-                                        'command'=>proc{
-                                          textWinSmallH2 $twind2_text
-                                        }))
-
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkButton.new($twind2_text, :text=>"Big pad",
-                                        :cursor=>'top_left_arrow',
-                                        'command'=>proc{
-                                          textWinBigP2 $twind2_text
-                                        }))
-
-TkTextWindow.new($twind2_text, 'end',
-                 'window'=>TkButton.new($twind2_text, :text=>"Small pad",
-                                        :cursor=>'top_left_arrow',
-                                        'command'=>proc{
-                                          textWinSmallP2 $twind2_text
-                                        }))
-
-$twind2_text.insert('end', "\n\n更にイメージもテキストウィジェットに")
-$twind2_text.insert('end', "うまく配置できます：")
-
-TkTextImage.new($twind2_text, 'end',
-                'image'=>TkBitmapImage.new(:file=>[
-                                             $demo_dir, '..',
-                                             'images', 'face.xbm'
-                                           ].join(File::Separator)))
-
-# メソッド定義
-def textWinBigB2(w)
-  w.borderwidth 15
-end
-def textWinSmallB2(w)
-  w.borderwidth $text_normal2['border']
-end
-def textWinBigH2(w)
-  w.highlightthickness 15
-end
-def textWinSmallH2(w)
-  w.highlightthickness $text_normal2['highlight']
-end
-def textWinBigP2(w)
-  w.configure(:padx=>15, :pady=>15)
-end
-def textWinSmallP2(w)
-  w.configure(:padx=>$text_normal2['pad'], :pady=>$text_normal2['pad'])
-end
-
-def textWindOn2 (w,f)
-  if defined? $twind2_scroll
-    begin
-      $twind2_scroll.destroy
-    rescue
-    end
-    $twind2_scroll = nil
-  end
-
-  base = TkWinfo.parent( TkWinfo.parent(w) )
-  $twind2_scroll = TkScrollbar.new(base) {|s|
-    orient 'horizontal'
-    command proc{|*args| w.xview(*args)}
-    w.xscrollcommand proc{|first,last| s.set first,last}
-    w.wrap 'none'
-    pack('after'=>f, 'side'=>'bottom', 'fill'=>'x')
-  }
-
-  return nil
-end
-
-def textWindOff2 (w)
-  if defined? $twind2_scroll
-    begin
-      $twind2_scroll.destroy
-    rescue
-    end
-    $twind2_scroll = nil
-  end
-  w.xscrollcommand ''
-  #w.wrap 'word'
-  w.wrap 'char'
-end
-
-def textWindPlot2 (t)
-  if (defined? $twind2_plot) && (TkWinfo.exist?($twind2_plot))
-    return
-  end
-
-  $twind2_plot = TkCanvas.new(t) {
-    relief 'sunken'
-    width  450
-    height 300
-    cursor 'top_left_arrow'
-  }
-
-  #font = '-Adobe-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*'
-  font = 'Helvetica 18'
-
-  TkcLine.new($twind2_plot, 100, 250, 400, 250, 'width'=>2)
-  TkcLine.new($twind2_plot, 100, 250, 100,  50, 'width'=>2)
-  TkcText.new($twind2_plot, 225, 20,
-              'text'=>"A Simple Plot", 'font'=>font, 'fill'=>'brown')
-
-  (0..10).each {|i|
-    x = 100 + (i * 30)
-    TkcLine.new($twind2_plot, x, 250, x, 245, 'width'=>2)
-    TkcText.new($twind2_plot, x, 254,
-                'text'=>10*i, 'font'=>font, 'anchor'=>'n')
-  }
-  (0..5).each {|i|
-    y = 250 - (i * 40)
-    TkcLine.new($twind2_plot, 100, y, 105, y, 'width'=>2)
-    TkcText.new($twind2_plot, 96, y,
-                'text'=>"#{i*50}.0", 'font'=>font, 'anchor'=>'e')
-  }
-
-  for xx, yy in [[12,56],[20,94],[33,98],[32,120],[61,180],[75,160],[98,223]]
-    x = 100 + (3*xx)
-    y = 250 - (4*yy)/5
-    item = TkcOval.new($twind2_plot, x-6, y-6, x+6, y+6,
-                       'width'=>1, 'outline'=>'black', 'fill'=>'SkyBlue2')
-    item.addtag 'point'
-  end
-
-  $twind2_plot.itembind('point', 'Any-Enter',
-                        proc{$twind2_plot.itemconfigure 'current', 'fill', 'red'})
-  $twind2_plot.itembind('point', 'Any-Leave',
-                        proc{$twind2_plot.itemconfigure 'current', 'fill', 'SkyBlue2'})
-  $twind2_plot.itembind('point', '1',
-                        proc{|x,y| embPlotDown2 $twind2_plot,x,y}, "%x %y")
-  $twind2_plot.itembind('point', 'ButtonRelease-1',
-                        proc{$twind2_plot.dtag 'selected'})
-  $twind2_plot.bind('B1-Motion',
-                    proc{|x,y| embPlotMove2 $twind2_plot,x,y}, "%x %y")
-  while ($twind2_text.get($mark2_plot) =~ /[ \t\n]/)
-    $twind2_text.delete $mark2_plot
-  end
-  $twind2_text.insert $mark2_plot,"\n"
-  TkTextWindow.new($twind2_text, $mark2_plot, 'window'=>$twind2_plot)
-  $tag2_center.add $mark2_plot
-  $twind2_text.insert $mark2_plot,"\n"
-end
-
-$embPlot2 = {'lastX'=>0, 'lastY'=>0}
-
-def embPlotDown2 (w, x, y)
-  w.dtag 'selected'
-  w.addtag_withtag 'selected', 'current'
-  w.raise 'current'
-  $embPlot2['lastX'] = x
-  $embPlot2['lastY'] = y
-end
-
-def embPlotMove2 (w, x, y)
-  w.move 'selected', x - $embPlot2['lastX'], y - $embPlot2['lastY']
-  $embPlot2['lastX'] = x
-  $embPlot2['lastY'] = y
-end
-
-def textWindDel2 (w)
-  if (defined? $twind2_text) && TkWinfo.exist?($twind2_plot)
-    $twind2_text.delete $twind2_plot
-    $twind2_plot = nil
-    while ($twind2_text.get($mark2_plot) =~ /[ \t\n]/)
-      $twind2_text.delete $mark2_plot
-    end
-    $twind2_text.insert $mark2_plot,"  "
-  end
-end
-
-def embDefBg2 (w)
-  w['background'] = w.configinfo('background')[3]
-end
diff --git a/ext/tk/sample/demos-jp/unicodeout.rb b/ext/tk/sample/demos-jp/unicodeout.rb
deleted file mode 100644
index 966f85f331..0000000000
--- a/ext/tk/sample/demos-jp/unicodeout.rb
+++ /dev/null
@@ -1,120 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-#
-# unicodeout.rb --
-#
-# This demonstration script shows how you can produce output (in label
-# widgets) using many different alphabets.
-#
-# based on Tcl/Tk8.4.4 widget demos
-
-if defined?($unicodeout_demo) && $unicodeout_demo
-  $unicodeout_demo.destroy
-  $unicodeout_demo = nil
-end
-
-$unicodeout_demo = TkToplevel.new {|w|
-  title("Unicode Label Demonstration")
-  iconname("unicodeout")
-  positionWindow(w)
-}
-
-base_frame = TkFrame.new($unicodeout_demo).pack(:fill=>:both, :expand=>true)
-
-TkLabel.new(base_frame,
-            :font=>$font, :wraplength=>'5.4i', :justify=>:left,
-            :text=><<EOL).pack(:side=>:top)
-これは，Tkにおける非欧米文字集合を用いる言語に対するサポートについての\
-サンプルです．ただし，下の表示においてあなたが実際にどのような表示を\
-目にするかは，あなたの環境にどのような文字集合がインストールされているかに\
-大きく依存します．また，対象となる文字集合がインストールされていない場合に\
-どのような表示がなされるかもあなたの環境次第です．\
-「コード参照」ボタンを押してソースを表示し，\
-Unicodeout_SampleFrameクラスの@@fontの定義を書き換えて\
-(ファイルの内容は変更されません)\
-「再実行」ボタンのクリックを試してみてください．
-スクリプトが可搬性を持つように，文字列は\\uXXXXという\
-Tclのエスケープ表現を用いたUNICODE文字列で書かれています．\
-文字列は，Tk::UTF8_Stringメソッドによって，\
-「UTF8形式の文字列である」という\
-エンコード情報付きの文字列オブジェクト\
-(Tclのエスケープ表現の変換済み)に変換して\
-ラベルウィジェットに渡している点に注意してください．
-EOL
-#'
-
-TkFrame.new(base_frame){|f|
-  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
-
-  TkButton.new(f, :text=>'閉じる', :width=>15, :command=>proc{
-                 $unicodeout_demo.destroy
-                 $unicodeout_demo = nil
-               }).pack(:side=>:left, :expand=>true)
-
-  TkButton.new(f, :text=>'コード参照', :width=>15, :command=>proc{
-                 showCode 'unicodeout'
-               }).pack(:side=>:left, :expand=>true)
-}
-
-wait_msg = TkLabel.new(base_frame,
-                       :text=>"フォント読み込みの完了まで" +
-                              "しばらくお待ち下さい．．．",
-                       :font=>"Helvetica 12 italic").pack
-
-class Unicodeout_SampleFrame < TkFrame
-  @@font = $font
-  # @@font = 'Helvetica 14'
-  # @@font = 'Courier 12'
-  # @@font = 'clearlyu 16'
-  # @@font = 'fixed 12'
-  # @@font = 'Times 12'
-  # @@font = 'Newspaper 12'
-  # @@font = '{New century schoolbook} 12'
-
-  def initialize(base)
-    super(base)
-    grid_columnconfig(1, :weight=>1)
-  end
-
-  def add_sample(lang, *args)
-    sample_txt = Tk::UTF8_String(args.join(''))
-    l = TkLabel.new(self, :font=>@@font, :text=>lang+':',
-                    :anchor=>:nw, :pady=>0)
-    #s = TkLabel.new(self, :font=>@@font, :text=>sample_txt,
-    s = TkLabel.new(self, :font=>TkFont.new(@@font), :text=>sample_txt,
-                    :anchor=>:nw, :width=>30, :pady=>0)
-    Tk.grid(l, s, :sticky=>:ew, :pady=>0)
-    l.grid_config(:padx, '1m')
-  end
-end
-f = Unicodeout_SampleFrame.new(base_frame)
-f.pack(:expand=>true, :fill=>:both, :padx=>'2m', :pady=>'1m')
-
-# Processing when some characters are missing might take a while, so make
-# sure we're displaying something in the meantime...
-
-oldCursor = $unicodeout_demo.cursor
-$unicodeout_demo.cursor('watch')
-Tk.update
-
-f.add_sample('Arabic',
-             '\uFE94\uFEF4\uFE91\uFEAE\uFECC\uFEDF\uFE8D\uFE94',
-             '\uFEE4\uFEE0\uFEDC\uFEDF\uFE8D')
-f.add_sample('Trad. Chinese', '\u4E2D\u570B\u7684\u6F22\u5B57')
-f.add_sample('Simpl. Chinese', '\u6C49\u8BED')
-f.add_sample('Greek',
-             '\u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AE ',
-             '\u03B3\u03BB\u03CE\u03C3\u03C3\u03B1')
-f.add_sample('Hebrew',
-             '\u05DD\u05D9\u05DC\u05E9\u05D5\u05E8\u05D9 ',
-             '\u05DC\u05D9\u05D0\u05E8\u05E9\u05D9')
-f.add_sample('Japanese',
-             '\u65E5\u672C\u8A9E\u306E\u3072\u3089\u304C\u306A, ',
-             '\u6F22\u5B57\u3068\u30AB\u30BF\u30AB\u30CA')
-f.add_sample('Korean', '\uB300\uD55C\uBBFC\uAD6D\uC758 \uD55C\uAE00')
-f.add_sample('Russian',
-             '\u0420\u0443\u0441\u0441\u043A\u0438\u0439 ',
-             '\u044F\u0437\u044B\u043A')
-
-wait_msg.destroy
-$unicodeout_demo.cursor(oldCursor)
diff --git a/ext/tk/sample/demos-jp/vscale.rb b/ext/tk/sample/demos-jp/vscale.rb
deleted file mode 100644
index a502634138..0000000000
--- a/ext/tk/sample/demos-jp/vscale.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-# -*- coding: utf-8 -*-
-# frozen_string_literal: false
-require "tkcanvas"
-
-if defined?($vscale_demo) && $vscale_demo
-  $vscale_demo.destroy
-  $vscale_demo = nil
-end
-
-$vscale_demo = TkToplevel.new {|w|
-  title("Vertical Scale Demonstration")
-  iconname("vscale")
-}
-positionWindow($vscale_demo)
-
-base_frame = TkFrame.new($vscale_demo).pack(:fill=>:both, :expand=>true)
-
-msg = TkLabel.new(base_frame) {
-  font $font
-  wraplength '3.5i'
-  justify 'left'
-#  text "下には矢印が1つと乗直なスケールが表示されています。\
-#スケール上でマウスボタン1をクリック、またはドラッグすると\
-#矢印の長さを変えることができます。"
-  text "にはバーと縦型のスケールが表示されています。スケールでマウスのボタン1 をクリックするかドラッグしてバーの高さを変えることができます。終ったら「了解」ボタンを押してください。"
-}
-msg.pack('side'=>'top', 'padx'=>'.5c')
-
-TkFrame.new(base_frame) {|frame|
-  TkButton.new(frame) {
-    #text '了解'
-    text '閉じる'
-    command proc {
-      tmppath = $vscale_demo
-      $vscale_demo = nil
-      tmppath.destroy
-    }
-  }.pack('side'=>'left', 'expand'=>'yes')
-
-  TkButton.new(frame) {
-    text 'コード参照'
-    command proc { showCode 'vscale' }
-  }.pack('side'=>'left', 'expand'=>'yes')
-}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-
-def setHeight(w, height)
-  height = height + 21
-  y2 = height - 30
-  if y2 < 21
-    y2 = 21
-  end
-  w.coords 'poly',15,20,35,20,35,y2,45,y2,25,height,5,y2,15,y2,15,20
-  w.coords 'line',15,20,35,20,35,y2,45,y2,25,height,5,y2,15,y2,15,20
-end
-
-TkFrame.new(base_frame) {|frame|
-  borderwidth 10
-  canvas = TkCanvas.new(frame) {|c|
-    width 50
-    height 50
-    bd 0
-    highlightthickness 0
-    TkcPolygon.new(c, 0, 0, 1, 1, 2, 2) {
-      fill 'SeaGreen3'
-      tags 'poly'
-    }
-    TkcLine.new(c, 0, 0, 1, 1, 2, 2, 0, 0) {
-      fill 'black'
-      tags 'line'
-    }
-  }.pack('side'=>'left',  'anchor'=>'nw', 'fill'=>'y')
-  scale = TkScale.new(frame) {
-    orient 'vertical'
-    length 284
-    from 0
-    to 250
-    command proc{|value| setHeight(canvas, value)}
-    tickinterval 50
-  }.pack('side'=>'left', 'anchor'=>'ne')
-  scale.set 75
-}.pack
diff --git a/ext/tk/sample/demos-jp/widget b/ext/tk/sample/demos-jp/widget
deleted file mode 100644
index 5f5dfb9d70..0000000000
--- a/ext/tk/sample/demos-jp/widget
+++ /dev/null
@@ -1,1122 +0,0 @@
-#!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
-
-# 漢字コード設定 ( tk.rb のロード時の encoding 推定/設定に使われる )
-#if RUBY_VERSION < '1.9.0' ### !!!!!!!!!!!!!!
-unless defined?(::Encoding.default_external)
-  $KCODE = 'euc'
-else
-  DEFAULT_TK_ENCODING = 'EUC-JP'
-end
-
-# tk 関係ライブラリの読み込み
-require 'tk'
-# require 'tkafter'
-
-$RubyTk_WidgetDemo = true
-
-# widget demo directory 位置の獲得
-# $demo_dir = File.dirname($0)
-$demo_dir = File.dirname(__FILE__)
-
-# root の生成
-$root = TkRoot.new{title "Ruby/Tk Widget Demonstration"}
-
-# tk バージョンの取得
-$tk_version = Tk::TK_VERSION
-$tk_major_ver, $tk_minor_ver = $tk_version.split('.').map{|n| n.to_i}
-$tk_patchlevel = Tk::TK_PATCHLEVEL
-
-# tcl_platform 情報へのアクセスオブジェクト
-$tk_platform = TkVarAccess.new('tcl_platform')
-
-# フォント設定
-#######
-case($tk_version)
-when /^4.*/
-  $font = TkFont.new('-*-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*', nil)
-  knjfont = '-*--16-*-jisx0208.1983-0'
-  $kanji_font = TkFont.new('-*-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*',
-                           knjfont)
-  TkOption.add('*kanjiFont', knjfont, 'startupFile')
-  $msg_kanji_font=TkFont.new('-*-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*',
-                             '-*--24-*-jisx0208.1983-0')
-
-#when '8.0'
-#  $font = TkFont.new('Helvetica -12')
-#  $kanji_font = TkFont.new('Helvetica -12', 'Mincho -12')
-#  TkOption.add('*kanjiFont', knjfont, 'startupFile')
-#  $msg_kanji_font=TkFont.new('Helvetica 16', 'Gothic 16 bold')
-
-when /^8.*/
-  $font = TkFont.new('Helvetica -12')
-  $kanji_font = TkFont.new('Helvetica -12', 'Mincho -12')
-  TkOption.add('*kanjiFont', knjfont, 'startupFile')
-  $msg_kanji_font=TkFont.new('Helvetica 14 bold', 'Gothic 14 bold')
-
-else
-  $font = TkFont.new('Helvetica 14', nil)
-  knjfont = '-*--16-*-jisx0208.1983-0'
-  $kanji_font = TkFont.new('Helvetic 14', knjfont)
-  TkOption.add('*kanjiFont', knjfont, 'startupFile')
-  $msg_kanji_font=TkFont.new('Helvetica 14',
-                             '-*--24-*-jisx0208.1983-0')
-end
-#######
-
-# イメージ設定
-$image = {}
-
-if $tk_major_ver >= 8
-$image['refresh'] = TkPhotoImage.new(:height=>16, :format=>'GIF', :data=><<EOD)
-    R0lGODlhEAAQAPMAAMz/zCpnKdb/1z9mPypbKBtLGy9NMPL/9Or+6+P+4j1Y
-    PwQKBP7//xMLFAYBCAEBASH5BAEAAAAALAAAAAAQABAAAwR0EAD3Gn0Vyw0e
-    ++CncU7IIAezMA/nhUqSLJizvSdCEEjy2ZIV46AwDAoDHwPYGSoEiUJAAGJ6
-    EDHBNCFINW5OqABKSFk/B9lUa94IDwIFgewFMwQDQwCZQCztTgM9Sl8SOEMG
-    KSAthiaOjBMPDhQONBiXABEAOw==
-EOD
-end
-
-if $tk_major_ver >= 8
-$image['view'] = TkPhotoImage.new(:height=>16, :format=>'GIF', :data=><<EOD)
-    R0lGODlhEAAQAPMAAMz/zP///8DAwICAgH9/fwAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAwRIcMhJB7h3hM33
-    KFjWdQQYap1QrCaGBmrRrS4nj5b53jOgbwXBKGACoYLDIuAoHCmZyYvR1rT5
-    RMAq8LqcIYGsrjPsW1XOmFUEADs=
-EOD
-end
-
-if $tk_major_ver >= 8
-$image['delete'] = TkPhotoImage.new(:height=>16, :format=>'GIF', :data=><<EOD)
-    R0lGODlhEAAOAKEAAIQAAO/n3v///////yH5BAEKAAIALAAAAAAQAA4AAAIm
-    lI9pAKHbIHNoVhYhTdjlJ2AWKG2g+CldmB6rxo2uybYhbS80eRQAOw==
-EOD
-end
-
-if $tk_major_ver >= 8
-$image['print'] = TkPhotoImage.new(:height=>19, :format=>'GIF', :data=><<EOD)
-    R0lGODlhGgATAPcAACEQOTEpQjEpUkIpc0IxY0I5c0oxjEo5SlJCY1JCe1JK
-    UlpChFpCjFpGkFpSc1paa2NKc2NKnGNja2tapWtjc29KnHNanHNjc3NjrXNr
-    jHNrnHNzc3tjpXtrtXtzhICAgIRzvYSEjIZzqox7tYyEnIyMjJSEtZSEvZSM
-    lJyMtZyMvZyUlJyUrZyUvZycnKWctaWlpa2czq2lzrWtvbWtzrW1tb21xr21
-    1sa9zs693s7OztbO3tbO597W1t7W7+fe7+fn5////+/n7+/v7+/v9////wAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAACH5BAEAAEEALAAAAAAaABMAQAj/AIMIHBhkg0GC
-    CBMGIQEiQgseQT4oeCBBAokgRYYQ0JBixg8hRIiUUEBBYYmTByBwiCBCRYwH
-    CxY8cKFw4AogRXLqLAJkQ80gCBBg3BkxZswTNGh4MGqgQQUMJRHCwMkTSE+D
-    Pn8eCKBhxIMhO3ei2OHDBw6sWSlMMMoWgwwfMDZI8GBjx44NARZwEGGi5MkS
-    PcIWKRGz5YgLbAco+KkQBQoJIRgjdGEVq+SaJajqtNrzMgsPCmoIzqmDgmWE
-    KOBuUKAAwYabYTfs4OHjY0giGyhk4MAWRI4eKyRQqPgggYUXPH4A+XBAgwoK
-    DiIsCFxjA9sFEVQQCRJCAYAFDJxiKhAxvMTonEFimrhhYinTBgWiCvxLNX3M
-    DkkpsKV5OYhjBxCMYAICAigUEAA7
-EOD
-end
-
-# メニュー設定
-if $tk_major_ver >= 8
-  $root.add_menubar([[['File', 0],
-                        ['About ... ', proc{aboutBox}, 0, '<F1>'],
-                        '---',
-                        ['Quit', proc{exit}, 0, 'Ctrl-Q']
-                      ]])
-else
-  TkMenubar.new($root,
-                [[['File', 0],
-                    ['About ... ', proc{aboutBox}, 0, '<F1>'],
-                    '---',
-                    ['Quit', proc{exit}, 0, 'Ctrl-Q']
-                  ]]).pack('side'=>'top', 'fill'=>'x')
-end
-$root.bind('F1', proc{aboutBox})
-$root.bind('Control-q', proc{exit})
-
-=begin
-TkFrame.new($root){|frame|
-  TkMenubutton.new(frame){|button|
-    m = TkMenu.new(button) {
-      add 'command', 'label'=>'Quit', 'command'=>proc{exit}, 'underline'=>0
-    }
-    menu m
-    text 'File'
-    underline 0
-  }.pack('side'=>'left')
-}.pack('side'=>'top', 'fill'=>'x')
-=end
-
-# テキストボックスの生成
-if $tk_version =~ /^4\.[01]/
-  scr = TkScrollbar.new($root, 'orient'=>'vertical')
-  txt = TkText.new($root) {
-    #wrap 'word'
-    wrap 'char'
-    width 70
-    height 30
-    font $font
-    setgrid 'yes'
-    yscrollcommand proc{|first,last| scr.set first,last}
-  }
-  scr.command(proc{|*args| txt.yview(*args)})
-  scr.pack('side'=>'right', 'fill'=>'y')
-  txt.pack('expand'=>'yes', 'fill'=>'both')
-else
-  textFrame = TkFrame.new($root)
-  scr = TkScrollbar.new($root, 'orient'=>'vertical',
-                        'highlightthickness'=>0, 'takefocus'=>1) {
-    pack('in'=>textFrame, 'side'=>'right', 'fill'=>'y', 'padx'=>1)
-  }
-  txt = TkText.new($root) {
-    #wrap 'word'
-    wrap 'char'
-    width 70
-    height 30
-    font $font
-    setgrid 'yes'
-    highlightthickness 0
-    padx 4
-    pady 2
-    takefocus 0
-    bd 1
-    yscrollcommand proc{|first,last| scr.set first,last}
-  }
-  scr.command(proc{|*args| txt.yview(*args)})
-
-#  txt.pack('in'=>textFrame, 'expand'=>'yes', 'fill'=>'both', 'padx'=>1)
-#  txt.pack('in'=>textFrame, 'expand'=>'yes', 'fill'=>'both')
-#  textFrame.pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>2)
-  textFrame.pack('expand'=>'yes', 'fill'=>'both')
-  #  $root.withdraw.deiconify
-  Tk.update_idletasks
-  txt.pack('in'=>textFrame, 'expand'=>'yes', 'fill'=>'both')
-
-  statusBar = TkFrame.new($root) {|f|
-    if $tk_version =~ /^4.*/
-      statusfont = '-*-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*'
-    else
-      statusfont = 'Helvetica 10'
-    end
-    $statusBarLabel = \
-    TkLabel.new(f, 'text'=>"   ", 'relief'=>'sunken', 'bd'=>1, 'anchor'=>'w',
-                'font'=>statusfont) \
-    .pack('side'=>'left', 'padx'=>2, 'expand'=>'yes', 'fill'=>'both')
-    TkLabel.new(f, 'width'=>8, 'relief'=>'sunken', 'bd'=>1, 'anchor'=>'w',
-                'font'=>statusfont) \
-    .pack('side'=>'left', 'padx'=>2)
-  }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>2)
-end
-
-# テキストタグ設定
-if $tk_version =~ /^4.*/
-  tag_title = TkTextTag.new(txt, 'font'=>'-*-Helvetica-Bold-R-Normal--*-180-*-*-*-*-*-*')
-else
-  tag_title = TkTextTag.new(txt, 'font'=>'Helvetica 18 bold')
-end
-#tag_kanji_title = TkTextTag.new(txt, 'kanjifont'=>$msg_kanji_font)
-#tag_middle = TkTextTag.new(txt, 'kanjifont'=>$kanji_font)
-tag_kanji_title = TkTextTag.new(txt, 'font'=>$msg_kanji_font)
-tag_middle = TkTextTag.new(txt, 'font'=>$kanji_font)
-tag_demospace = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c')
-
-if TkWinfo.depth($root) == 1
-  tag_demo = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c',
-                           'underline'=>1)
-  $tag_visited = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c',
-                              'underline'=>1)
-  tag_hot = TkTextTag.new(txt, 'background'=>'black', 'foreground'=>'white')
-else
-  tag_demo = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c',
-                           'foreground'=>'blue', 'underline'=>1)
-  $tag_visited = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c',
-                              'foreground'=>'#303080', 'underline'=>1)
-#  tag_hot = TkTextTag.new(txt, 'relief'=>'raised', 'borderwidth'=>1,
-#                         'background'=>'SeaGreen3')
-  tag_hot = TkTextTag.new(txt, 'borderwidth'=>1, 'foreground'=>'red')
-end
-
-#tag_demo.bind('Button-1', proc{invoke txt, txt.index('current')})
-tag_demo.bind('ButtonRelease-1',
-              proc{|x,y|invoke txt, txt.index("@#{x},#{y}")}, '%x %y')
-
-lastLine = TkVariable.new("")
-newLine  = TkVariable.new("")
-tag_demo.bind('Enter', proc{|x,y|
-                lastLine.value = txt.index("@#{x},#{y} linestart")
-                tag_hot.add(lastLine.value, "#{lastLine.value} lineend")
-                showStatus txt, txt.index("@#{x},#{y}")
-              },
-              '%x %y')
-tag_demo.bind('Leave',
-              proc{
-                tag_hot.remove('1.0','end')
-                txt.configure('cursor','xterm')
-                $statusBarLabel.configure('text'=>"")
-              })
-tag_demo.bind('Motion', proc{|x, y|
-                newLine.value = txt.index("@#{x},#{y} linestart")
-                if newLine.value != lastLine.value
-                  tag_hot.remove('1.0','end')
-                  lastLine.value = newLine.value
-                  if ( txt.tag_names("@#{x},#{y}").find{|t|
-                        t.kind_of?(String) && t =~ /^demo-/
-                      } )
-                    tag_hot.add(lastLine.value,
-                                "#{lastLine.value} lineend -1 chars")
-                  end
-                end
-                showStatus txt, txt.index("@#{x},#{y}")
-              },
-              '%x %y')
-
-# テキスト生成
-txt.insert('end', 'Ruby/Tk : Widget', tag_title)
-#txt.insert('end', "  デモンストレーション\n", tag_middle)
-txt.insert('end', "  デモンストレーション\n", tag_kanji_title)
-txt.insert('end', <<"EOT")
-
-このアプリケーションは、Tk Widget を用いてどのようなことができるか\
-を示すための、いくつかの小さなスクリプトに対するフロントエンドを提\
-供しています。以下に順番に挙げられているデモンストレーションを実行\
-するにはマウスでクリックしてください。デモンストレーションのウィン\
-ドウが現れると、デモンストレーションを生成した Ruby/Tk のコードを見\
-るために、"コード参照"ボタンをクリックすることができます。あなたが\
-望むなら、そのコードを修正することができます。修正したコードでデモ\
-ンストレーションを再実行するためには、コードが書かれたウィンドウに\
-ある"デモ再実行" ボタンをクリックしてください。\
-コードを修正してもオリジナルのファイルが書き換えられることは\
-ありませんから、心配せずに色々な変更を試してみてください。
-
-一部のデモでは、比較的最近のバージョンの Tk でなければサポートして\
-いない機能を使って実装しています(例えば Tk8.4 以上など)。そのため、\
-そうした機能を持たない Tk ライブラリを使っている場合には、そうした\
-デモは正しく動きません。そのような機能が必要であれば、それをサポート\
-している Tk ライブラリを使うように tcltklib をコンパイルしなおして\
-ください。
-
-もしあなたの Tk が (最初から含むかインストールしたかにより) \
-Ttk (Tile) 拡張を利用できる状態であるなら、\
-Ttk 拡張のデモ (sample/tkextlib/tile/demo.rb) もぜひ試してみてください。
-( 多分，現在のあなたの環境には Ttk 拡張は\
-#{
-begin
-  require 'tkextlib/tile'
-  "すでに導入されています"
-rescue
-  "まだインストールされていません"
-end
-}\
-。)
-Ttk 拡張は、Tk8.5 以上では標準の機能として組み込まれています。
-
-
-EOT
-
-#txt.insert('end',"ラベル, ボタン, チェックボタン, ラジオボタン\n",tag_middle)
-txt.insert('end', "ラベル, ボタン, チェックボタン, ラジオボタン\n",
-           tag_kanji_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. ラベル (テキスト, ビットマップ)\n",
-           tag_demo, "demo-label")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. ラベルとUNICODEテキスト (機能に対応したバージョンのTkが必要)\n", tag_demo, "demo-unicodeout")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. ボタン \n", tag_demo, "demo-button")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. チェックボタン (複数を選択可能)\n",
-           tag_demo, "demo-check")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "5. ３状態チェックボタン (機能に対応したバージョンのTkが必要)\n",
-           tag_demo, "demo-check2")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "6. ラジオボタン (任意の一つを選択可能)\n",
-           tag_demo, "demo-radio")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "7. ラジオボタン (機能に対応したバージョンのTkが必要)\n",
-           tag_demo, "demo-radio2")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "8. ３状態ラジオボタン (機能に対応したバージョンのTkが必要)\n",
-           tag_demo, "demo-radio3")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "9. ボタンで作られた15-パズルゲーム\n",
-           tag_demo, "demo-puzzle")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "10. ビットマップを使用したアイコンボタン\n",
-           tag_demo, "demo-icon")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "11. 画像を表示する二つのラベル\n",
-           tag_demo, "demo-image1")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "12. 画像を見るための簡単なユーザインターフェース\n",
-           tag_demo, "demo-image2")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "13. 画像を見るための簡単なユーザインターフェース (機能に対応したバージョンのTkが必要)\n",
-           tag_demo, "demo-image3")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "14. ラベル付きフレーム (機能に対応したバージョンのTkが必要)\n",
-           tag_demo, "demo-labelframe")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "15. テーマに対応したウィジェットの簡単な例 (Tile/Ttk拡張への対応が必要)\n",
-           tag_demo, "demo-ttkbut")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-#txt.insert('end', "リストボックス\n", tag_middle)
-txt.insert('end', "リストボックス\n", tag_kanji_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. 都道府県.\n", tag_demo, "demo-states")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. 色: アプリケーションのための配色を変える\n",
-           "#{tag_demo.id} demo-colors")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. 格言集\n", tag_demo, "demo-sayings")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. 国についてのマルチカラムリスト (Tile/Ttk拡張への対応が必要)\n",
-           tag_demo, "demo-mclist")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "5. ディレクトリブラウザ (Tile/Ttk拡張への対応が必要)\n",
-           tag_demo, "demo-tree")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-#txt.insert('end', "エントリとスピンボックス\n", tag_middle)
-txt.insert('end', "エントリ\n", tag_kanji_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. スクロールバーなし\n", tag_demo, "demo-entry1")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. スクロールバーあり\n", tag_demo, "demo-entry2")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. 認証処理付きのエントリボックスとパスワードフィールド (機能に対応したバージョンのTkが必要)\n",
-           tag_demo, "demo-entry3")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. スピンボックス (機能に対応したバージョンのTkが必要)\n",
-           tag_demo, "demo-spin")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "5. コンボボックス (Tile/Ttk拡張への対応が必要)\n",
-           tag_demo, "demo-combo")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "6. 簡単なフォーム\n", tag_demo, "demo-form")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-#txt.insert('end', "テキスト\n", tag_middle)
-txt.insert('end', "テキスト\n", tag_kanji_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. 基本的なテキスト\n", tag_demo, "demo-text")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. 表示スタイル.\n", tag_demo, "demo-style")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. ハイパーテキスト(タグバインド).\n",
-           tag_demo, "demo-bind")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. ウィンドウを埋め込んだテキスト\n",
-           tag_demo, "demo-twind")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "5. ウィンドウを埋め込んだテキスト (機能に対応したバージョンのTkが必要)\n",
-           tag_demo, "demo-twind2")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "6. 検索\n", tag_demo, "demo-search")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "7. テキストウィジェットの対等化(peering) (機能に対応したバージョンのTkが必要)\n", tag_demo, "demo-textpeer")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-#txt.insert('end', "キャンバス\n", tag_middle)
-txt.insert('end', "キャンバス\n", tag_kanji_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. アイテムの型\n", tag_demo, "demo-items")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. 2 次元のプロット\n", tag_demo, "demo-plot")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. テキスト\n", tag_demo, "demo-ctext")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. 矢印の形\n", tag_demo, "demo-arrow")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "5. ルーラー\n", tag_demo, "demo-ruler")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "6. フロアプラン\n", tag_demo, "demo-floor")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "7. フロアプラン (異なるキャンバスアイテム作成方法を使用)\n", tag_demo, "demo-floor2")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "8. スクロール可能なキャンバス\n",
-           tag_demo, "demo-cscroll")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "9. チェスボード上の騎士の巡回 (Tile/Ttk拡張への対応が必要)\n",
-           tag_demo, "demo-knightstour")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-#txt.insert('end', "スケールとプログレスバー\n", tag_middle)
-txt.insert('end', "スケールとプログレスバー\n", tag_kanji_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. 垂直スケール\n", tag_demo.id, "demo-vscale")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. 水平スケール\n", tag_demo.id, "demo-hscale")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. プログレスバー (Tile/Ttk拡張への対応が必要)\n", tag_demo.id, "demo-ttkprogress")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-txt.insert('end', "ペインドウィンドウとノートブック\n", tag_kanji_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. 水平方向 (機能に対応したバージョンのTkが必要)\n",
-           tag_demo.id, "demo-paned1")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. 垂直方向 (機能に対応したバージョンのTkが必要)\n",
-           tag_demo.id, "demo-paned2")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. テーマに対応した埋め込みペイン (Tile/Ttk拡張への対応が必要)\n",
-           tag_demo.id, "demo-ttkpane")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. ノートブックウィジェット (Tile/Ttk拡張への対応が必要)\n",
-           tag_demo.id, "demo-ttknote")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-#txt.insert('end', "メニューとツールバー\n", tag_middle)
-txt.insert('end', "メニューとツールバー\n", tag_kanji_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. メニューとカスケードを含んだウィンドウ\n",
-           tag_demo, "demo-menu")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. メニューとカスケードを含んだウィンドウ (Tk8.x 専用)\n",
-           tag_demo, "demo-menu8x")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3.                 〃                (機能に対応したバージョンのTkが必要)\n",
-           tag_demo, "demo-menu84")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. メニューボタン (Tk8.x 専用)\n",
-           tag_demo, "demo-menubu")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "5. テーマに対応したメニューボタン (Tile/Ttk拡張への対応が必要)\n",
-           tag_demo.id, "demo-ttkmenu")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "6. テーマに対応したツールバー (Tile/Ttk拡張への対応が必要)\n",
-           tag_demo.id, "demo-toolbar")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-#txt.insert('end', "ダイアログウィンドウ\n", tag_middle)
-txt.insert('end', "ダイアログウィンドウ\n", tag_kanji_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. メッセージボックス\n", tag_demo, "demo-msgbox")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. 詳細テキスト付きのメッセージボックス (機能に対応したバージョンのTkが必要)\n", tag_demo, "demo-msgbox2")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. ファイル選択ダイアログ\n", tag_demo, "demo-filebox")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. 色選択ダイアログ\n", tag_demo, "demo-clrpick")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.insert('end', "\n")
-#txt.insert('end', "アニメーション\n", tag_middle)
-txt.insert('end', "アニメーション\n", tag_kanji_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. アニメーションラベル (機能に対応したバージョンのTkが必要)\n", tag_demo, "demo-anilabel")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. 波形のアニメーション (機能に対応したバージョンのTkが必要)\n", tag_demo, "demo-aniwave")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. 振り子のシミュレーション (機能に対応したバージョンのTkが必要)\n", tag_demo, "demo-pendulum")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. A celebration of Rube Goldberg (機能に対応したバージョンのTkが必要)\n", tag_demo, "demo-goldberg")
-
-txt.insert('end', "\n")
-#txt.insert('end', "その他\n", tag_middle)
-txt.insert('end', "その他\n", tag_kanji_title)
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. 組み込みのビットマップ\n", tag_demo, "demo-bitmap")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. モーダルダイアログ(ローカルグラブ)\n",
-           tag_demo, "demo-dialog1")
-txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. モーダルダイアログ(グローバルグラブ)\n",
-           tag_demo, "demo-dialog2")
-txt.insert('end', " \n ", tag_demospace)
-
-txt.state('disabled')
-scr.focus
-
-################################
-# method 定義
-################################
-def positionWindow(w)
-  w.geometry('+300+300')
-end
-
-# 親ウィジェットと，変数名と TkVariable との組(配列)の並びを渡す
-$showVarsWin = {}
-def showVars1(parent, *args)
-  if $showVarsWin[parent.path]
-    begin
-      $showVarsWin[parent.path].destroy
-    rescue
-    end
-  end
-  top = TkToplevel.new(parent) {|w|
-    title "Variable values"
-    base = TkFrame.new(w).pack(:fill=>:both, :expand=>true)
-    TkLabel.new(base) {
-      text "変数値:"
-      width 20
-      anchor 'center'
-      if $tk_version =~ /^4.*/
-        font '-Adobe-helvetica-medium-r-normal--*-180-*-*-*-*-*-*'
-      else
-        font 'Helvetica 14'
-      end
-    }.pack('side'=>'top', 'fill'=>'x')
-    len = 1
-    args.each{|vnam,vbody|
-      len = vnam.to_s.length if vnam.to_s.length > len
-    }
-    args.each{|vnam,vbody|
-      TkFrame.new(base){|f|
-        #TkLabel.new(f, 'text'=>"#{vnam}: ").pack('side'=>'left')
-        TkLabel.new(f, 'text'=>"#{vnam}: ",'width'=>len+2).pack('side'=>'left')
-        TkLabel.new(f, 'textvariable'=>vbody, 'anchor'=>'w')\
-                   .pack('side'=>'left', 'expand'=>'yes', 'fill'=>'x')
-      }.pack('side'=>'top', 'anchor'=>'w', 'fill'=>'x')
-    }
-    TkButton.new(base) {
-      text "了解"
-      command proc{w.destroy}
-    }.pack('side'=>'bottom', 'pady'=>2)
-  }
-  $showVarsWin[parent.path] = top
-end
-
-def showVars2(parent, *args)
-  if $showVarsWin[parent.path]
-    begin
-      $showVarsWin[parent.path].destroy
-    rescue
-    end
-  end
-  $showVarsWin[parent.path] = TkToplevel.new(parent) {|top|
-    title "Variable values"
-
-    base = TkFrame.new(top).pack(:fill=>:both, :expand=>true)
-
-    TkLabelFrame.new(base, :text=>"変数値:",
-                     :font=>{:family=>'Helvetica', :size=>14}){|f|
-      args.each{|vnam,vbody|
-        TkGrid(TkLabel.new(f, :text=>"#{vnam}: ", :anchor=>'w'),
-               TkLabel.new(f, :textvariable=>vbody, :anchor=>'w'),
-               :padx=>2, :pady=>2, :sticky=>'w')
-      }
-
-      f.grid(:sticky=>'news', :padx=>4)
-      f.grid_columnconfig(1, :weight=>1)
-      f.grid_rowconfig(100, :weight=>1)
-    }
-    TkButton.new(base, :text=>"了解", :width=>8, :default=>:active,
-                 :command=>proc{top.destroy}){|b|
-      top.bind('Return', proc{b.invoke})
-      top.bind('Escape', proc{b.invoke})
-
-      b.grid(:sticky=>'e', :padx=>4, :pady=>[6, 4])
-    }
-    base.grid_columnconfig(0, :weight=>1)
-    base.grid_rowconfig(0, :weight=>1)
-  }
-end
-
-if $tk_major_ver < 8
-  alias showVars showVars1
-elsif $tk_major_ver == 8 && $tk_minor_ver < 4
-  alias showVars showVars1
-else # ver >= 8.4
-  alias showVars showVars2
-end
-
-# 疑似トップレベルサポート
-module PseudoToplevel_Evaluable
-  def pseudo_toplevel_eval(body = Proc.new)
-    Thread.current[:TOPLEVEL] = self
-    begin
-      body.call
-    ensure
-      Thread.current[:TOPLEVEL] = nil
-    end
-  end
-
-  def pseudo_toplevel_evaluable?
-    @pseudo_toplevel_evaluable
-  end
-  def pseudo_toplevel_evaluable=(mode)
-    @pseudo_toplevel_evaluable = (mode)? true: false
-  end
-
-  def self.extended(mod)
-    mod.__send__(:extend_object, mod)
-    mod.instance_variable_set('@pseudo_toplevel_evaluable', true)
-  end
-end
-
-class Object
-  alias __method_missing__ method_missing
-  private :__method_missing__
-
-  def method_missing(id, *args)
-    begin
-      has_top = (top = Thread.current[:TOPLEVEL]) &&
-                   top.respond_to?(:pseudo_toplevel_evaluable?) &&
-                   top.pseudo_toplevel_evaluable? &&
-                   top.respond_to?(id)
-    rescue Exception => e
-      has_top = false
-    end
-
-    if has_top
-      top.__send__(id, *args)
-    else
-      __method_missing__(id, *args)
-    end
-  end
-end
-
-class Proc
-  def initialize(*args, &b)
-    super
-    @__pseudo_toplevel__ = Thread.current[:TOPLEVEL]
-  end
-
-  alias __call__ call
-  def call(*args, &b)
-    if top = @__pseudo_toplevel__
-      orig_top = Thread.current[:TOPLEVEL]
-      Thread.current[:TOPLEVEL] = top
-      begin
-        __call__(*args, &b)
-      ensure
-        Thread.current[:TOPLEVEL] = orig_top
-      end
-    else
-      __call__(*args, &b)
-    end
-  end
-end
-
-def proc(&b)
-  Proc.new(&b)
-end
-def lambda(&b)
-  Proc.new(&b)
-end
-
-def _null_binding
-  Module.new.instance_eval{extend PseudoToplevel_Evaluable}
-  # binding
-  # Module.new.instance_eval{binding}
-end
-private :_null_binding
-
-def eval_samplecode(code, file=nil)
-  #eval(code)
-  #_null_binding.pseudo_toplevel_eval{ eval(code) }
-  #Thread.new{ _null_binding.pseudo_toplevel_eval{ eval(code) } }
-  Thread.new{
-    _null_binding.pseudo_toplevel_eval{
-      begin
-        if file
-          eval(code, binding, "(eval:#{file})")
-        else
-          eval(code)
-        end
-      rescue Exception=>e
-        #p e
-        TkBgError.show(e.message + "\n" +
-                         "\n---< backtrace of Ruby side >-----\n" +
-                         e.backtrace.join("\n") +
-                         "\n---< backtrace of Tk side >-------")
-      end
-    }
-  }
-  Tk.update rescue nil
-end
-
-# テキスト上での click に対する動作
-def invoke(txt, idx)
-  tag = txt.tag_names(idx).find{|t| t.kind_of?(String) && t =~ /^demo-/}
-  return unless tag
-
-  cursor = txt.cget('cursor')
-  txt.cursor('watch')
-  Tk.update rescue nil
-  # eval(IO.readlines("#{[$demo_dir, tag[5..-1]].join(File::Separator)}.rb").join, _null_binding)
-  # Tk.update
-  eval_samplecode(IO.readlines("#{[$demo_dir, tag[5..-1]].join(File::Separator)}.rb").join, tag[5..-1] + '.rb')
-  txt.cursor(cursor)
-
-  $tag_visited.add("#{idx} linestart +1 chars", "#{idx} lineend +1 chars")
-end
-=begin
-def invoke (txt, idx)
-  tag = txt.tag_names(idx).find{|t| t.kind_of?(String) && t =~ /^demo-/}
-  return unless tag
-  current_cursor = txt.cget('cursor')
-  txt.cursor('watch')
-  Tk.update
-#  eval `cat #{tag[5..-1]}.rb`
-#  eval `cat #{[$demo_dir, tag[5..-1]].join(File::Separator)}.rb`
-  eval IO.readlines("#{[$demo_dir, tag[5..-1]].join(File::Separator)}.rb").join
-  Tk.update
-#  txt.cursor('xterm')
-  txt.cursor(current_cursor)
-
-  $tag_visited.add("#{idx} linestart +1 chars", "#{idx} lineend +1 chars")
-end
-=end
-
-# 状態表示
-def showStatus (txt, index)
-  tag = txt.tag_names(index).find{|t| t.kind_of?(String) && t =~ /^demo-/}
-  cursor = txt.cget('cursor')
-  unless tag
-    $statusBarLabel.configure('text', " ")
-    newcursor = 'xterm'
-  else
-    demoname = tag[5..-1]
-    $statusBarLabel.configure('text',
-                             "サンプルプログラム \"#{demoname}\" の実行 ")
-    newcursor = 'hand2'
-  end
-  txt.configure('cursor'=>newcursor) if cursor != newcursor
-end
-
-# ソースコードの表示
-def showCode1(demo)
-  file = "#{demo}.rb"
-  $code_window = nil unless defined? $code_window
-  if $code_window == nil || TkWinfo.exist?($code_window) == false
-    $code_window = TkToplevel.new(nil)
-    f = TkFrame.new($code_window)
-
-    TkButton.new(f) {
-      #text "了解"
-      text "閉じる"
-      command proc{
-        $code_window.destroy
-        $code_window = nil
-      }
-    }.pack('side'=>'right', 'expand'=>'false', 'pady'=>2)
-    TkButton.new(f) {
-      text "再実行"
-      # command proc{eval($code_text.get('1.0','end'), _null_binding)}
-      command proc{eval_samplecode($code_text.get('1.0','end'), '<viewer>')}
-    }.pack('side'=>'right', 'expand'=>'false', 'pady'=>2)
-
-    TkLabel.new(f,'text'=>'line:').pack('side'=>'left')
-    linenum =TkLabel.new(f,'text'=>'').pack('side'=>'left')
-    TkLabel.new(f,'text'=>'  pos:').pack('side'=>'left')
-    posnum =TkLabel.new(f,'text'=>'').pack('side'=>'left')
-
-    $set_linenum = proc{|w|
-      line, pos = w.index('insert').split('.')
-      linenum.text = line
-      posnum.text  = pos
-    }
-
-    f.pack('side'=>'bottom', 'expand'=>'true', 'fill'=>'x')
-
-    if $tk_version =~ /^4\.[01]/
-      s = TkScrollbar.new($code_window, 'orient'=>'vertical')
-      $code_text = TkText.new($code_window) {
-        height 40
-        setgrid 'yes'
-        yscrollcommand proc{|first,last| s.set first,last}
-      }
-      s.command(proc{|*args| $code_text.yview(*args)})
-      s.pack('side'=>'right', 'fill'=>'y')
-      $code_text.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'both')
-    else
-      TkFrame.new($code_window) {|f|
-        pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>1)
-
-        hs = TkScrollbar.new($code_window, 'highlightthickness'=>0,
-                             'orient'=>'horizontal')
-        vs = TkScrollbar.new($code_window, 'highlightthickness'=>0,
-                             'orient'=>'vertical')
-        $code_text = TkText.new($code_window) {|t|
-          height 40
-          #wrap 'word'
-          wrap 'char'
-          xscrollcommand proc{|first,last| hs.set first,last}
-          yscrollcommand proc{|first,last| vs.set first,last}
-          setgrid 'yes'
-          highlightthickness 0
-          pady 2
-          padx 3
-          hs.command(proc{|*args| $code_text.xview(*args)})
-          vs.command(proc{|*args| $code_text.yview(*args)})
-        }
-
-        $code_text.grid('in'=>f, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0,
-                        'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-        vs.grid('in'=>f, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1,
-                'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-#       xs.grid('in'=>f, 'padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0,
-#               'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-        TkGrid.rowconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
-        TkGrid.columnconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
-      }
-    end
-
-    btag = TkBindTag.new
-
-    btag.bind('Key', $set_linenum, '%W')
-    btag.bind('Button', $set_linenum, '%W')
-
-    btags = $code_text.bindtags
-    btags.insert(btags.index($code_text.class) + 1, btag)
-    $code_text.bindtags = btags
-
-  else
-    $code_window.deiconify
-    $code_window.raise
-  end
-
-  $code_window.title("Demo code: #{file}")
-  $code_window.iconname(file)
-  code = open([$demo_dir, file].join(File::Separator), 'r'){|fid| fid.read }
-  $code_text.delete('1.0', 'end')
-  code.force_encoding('EUC-JP') if defined?(::Encoding.default_external)
-  $code_text.insert('1.0', code)
-  TkTextMarkInsert.new($code_text,'1.0')
-  $set_linenum.call($code_text)
-end
-
-def showCode2(demo)
-  file = "#{demo}.rb"
-  $code_window = nil unless defined? $code_window
-  if $code_window == nil || TkWinfo.exist?($code_window) == false
-    $code_window = TkToplevel.new(nil)
-    tf = TkFrame.new($code_window)
-    $code_text = TkText.new(tf, :font=>'Courier 10', :height=>30,
-                           :wrap=>'word', :bd=>1, :setgrid=>true,
-                           :highlightthickness=>0, :pady=>2, :padx=>3)
-    xscr = TkScrollbar.new(tf, :bd=>1){assign($code_text)}
-    yscr = TkScrollbar.new(tf, :bd=>1){assign($code_text)}
-    TkGrid($code_text, yscr, :sticky=>'news')
-    #TkGrid(xscr)
-    tf.grid_rowconfigure(0, :weight=>1)
-    tf.grid_columnconfigure(0, :weight=>1)
-
-    bf = TkFrame.new($code_window)
-
-    lf = TkFrame.new(bf)
-    TkLabel.new(lf, :text=>'line:').pack(:side=>:left)
-    linenum =TkLabel.new(lf, :text=>'').pack(:side=>:left)
-    TkLabel.new(lf, :text=>'  pos:').pack(:side=>:left)
-    posnum =TkLabel.new(lf, :text=>'').pack(:side=>:left)
-
-    $set_linenum = proc{|w|
-      line, pos = w.index('insert').split('.')
-      linenum.text = line
-      posnum.text  = pos
-    }
-
-    #b_dis = TkButton.new(bf, :text=>'了解', :default=>:active,
-    b_dis = TkButton.new(bf, :text=>'閉じる', :default=>:active,
-                         :command=>proc{
-                           $code_window.destroy
-                           $code_window = nil
-                         },
-                         :image=>$image['delete'], :compound=>:left)
-    b_prn = TkButton.new(bf, :text=>'印刷',
-                         :command=>proc{printCode($code_text, file)},
-                         :image=>$image['print'], :compound=>:left)
-    b_run = TkButton.new(bf, :text=>'再実行',
-                         :command=>proc{
-                           # eval($code_text.get('1.0','end'), _null_binding)
-                           eval_samplecode($code_text.get('1.0','end'), '<viewer>')
-                         },
-                         :image=>$image['refresh'], :compound=>:left)
-
-    TkGrid(lf, 'x', b_run, b_prn, b_dis, :padx=>4, :pady=>[6,4])
-    bf.grid_columnconfigure(1, :weight=>1)
-
-    TkGrid(tf, :sticky=>'news')
-    TkGrid(bf, :sticky=>'ew')
-    $code_window.grid_columnconfigure(0, :weight=>1)
-    $code_window.grid_rowconfigure(0, :weight=>1)
-
-    $code_window.bind('Return', proc{|win|
-                        b_dis.invoke unless win.kind_of?(TkText)
-                      }, '%W')
-    $code_window.bindinfo('Return').each{|cmd, arg|
-      $code_window.bind_append('Escape', cmd, arg)
-    }
-
-    btag = TkBindTag.new
-
-    btag.bind('Key', $set_linenum, '%W')
-    btag.bind('Button', $set_linenum, '%W')
-
-    btags = $code_text.bindtags
-    btags.insert(btags.index($code_text.class) + 1, btag)
-    $code_text.bindtags = btags
-
-  else
-    $code_window.deiconify
-    $code_window.raise
-  end
-
-  $code_window.title("Demo code: #{file}")
-  $code_window.iconname(file)
-  code = open([$demo_dir, file].join(File::Separator), 'r'){|fid| fid.read }
-  $code_text.delete('1.0', 'end')
-  code.force_encoding('EUC-JP') if defined?(::Encoding.default_external)
-  $code_text.insert('1.0', code)
-  TkTextMarkInsert.new($code_text,'1.0')
-  $set_linenum.call($code_text)
-end
-
-if $tk_major_ver < 8
-  alias showCode showCode1
-elsif $tk_major_ver == 8 && $tk_minor_ver < 4
-  alias showCode showCode1
-else # ver >= 8.4
-  alias showCode showCode2
-end
-
-
-# printCode --
-# Prints the source code currently displayed in the See Code dialog.
-# Much thanks to Arjen Markus for this.
-#
-# Arguments:
-# txt -         Name of text widget containing code to print
-# file -        Name of the original file (implicitly for title)
-
-def printCode(txt, file)
-  code = txt.get('1.0', 'end - 1c')
-  dir = '.'
-  dir = ENV['HOME'] if ENV['HOME']
-  dir = ENV['TMP'] if ENV['TMP']
-  dir = ENV['TEMP'] if ENV['TEMP']
-
-  fname = [dir, 'tkdemo-' + file].join(File::Separator)
-  open(fname, 'w'){|fid| fid.print(code)}
-  begin
-    case Tk::TCL_PLATFORM('platform')
-    when 'unix'
-      msg = `lp -c #{fname}`
-      unless $?.exitstatus == 0
-        Tk.messageBox(:title=>'Print spooling failure',
-                      :message=>'エラーが発生しました．' +
-                                '印刷に失敗したものと思われます : ' + msg)
-      end
-    when 'windows'
-      begin
-        printTextWin32(fname)
-      rescue => e
-        Tk.messageBox(:title=>'Print spooling failure',
-                      :message=>'エラーが発生しました．' +
-                                '印刷に失敗したものと思われます : ' +
-                                e.message)
-      end
-    when 'macintosh'
-      Tk.messageBox(:title=>'Operation not Implemented',
-                    :message=>'印刷機能はまだ実装されていません')
-    else
-      Tk.messageBox(:title=>'Operation not Implemented',
-                    :message=>'検出された環境 ' +
-                              Tk::TCL_PLATFORM('platform') +
-                              ' は未知の環境であるため，' +
-                              '印刷機能は実装されていません: ')
-    end
-  ensure
-    File.delete(fname)
-  end
-end
-
-# printTextWin32 --
-#    Print a file under Windows
-#
-# Arguments:
-# filename -            Name of the file
-#
-def printTextWin32(fname)
-  require 'win32/registry'
-  begin
-    app = Win32::Registry::HKEY_CLASSES_ROOT['.txt']
-    pcmd = nil
-    Win32::Registry::HKEY_CLASSES_ROOT.open("#{app}\\shell\\print"){|reg|
-      pcmd = reg['command']
-    }
-  rescue
-    app = Tk.tk_call('auto_execok', 'notepad.exe')
-    pcmd = "#{app} /p %1"
-  end
-
-  pcmd.gsub!('%1', fname)
-  puts pcmd
-  cmd = Tk.tk_call('auto_execok', 'start') + ' /min ' + pcmd
-
-  msg = `#{cmd}`
-  unless $?.exitstatus == 0
-    fail RuntimeError, msg
-  end
-end
-
-# aboutBox
-#
-#      Pops up a message box with an "about" message
-#
-def aboutBox
-  Tk.messageBox('icon'=>'info', 'type'=>'ok', 'title'=>'About Widget Demo',
-                'message'=>"Ruby/Tk ウィジェットデモ Ver.1.7.1-jp\n\n" +
-                           "based on demos of Tk8.1 -- 8.5  " +
-                           "( Copyright of Tcl/Tk demos:: " +
-                           "(c) 1996-1997 Sun Microsystems, Inc. / " +
-                           "(c) 1997-2000 Ajuba Solutions, Inc. / " +
-                           "(c) 2001-2007 Donal K. Fellows / " +
-                           "(c) 2002-2007 Daniel A. Steffen )\n\n" +
-                           "Your Ruby & Tk Version ::\n" +
-                           "Ruby#{RUBY_VERSION}(#{RUBY_RELEASE_DATE})[#{RUBY_PLATFORM}] / Tk#{$tk_patchlevel}#{(Tk::JAPANIZED_TK)? '-jp': ''}\n\n" +
-                           "Ruby/Tk release date :: tcltklib #{TclTkLib::RELEASE_DATE}; tk #{Tk::RELEASE_DATE}")
-end
-
-####################################
-# 引数で指定されたデモを起動する
-no_launcher = false
-if ARGV[0] == '-n'
-  ARGV.shift
-  no_launcher = true if ARGV.size > 0
-else
-  # show the root widget to make it lower then demo windows
-  Tk.update rescue nil
-end
-ARGV.each{|cmd|
-  if cmd =~ /(.*).rb/
-    cmd = $1
-  end
-  #eval(IO.readlines("#{[$demo_dir, cmd].join(File::Separator)}.rb").join,
-  #     _null_binding)
-  eval_samplecode(IO.readlines("#{[$demo_dir, cmd].join(File::Separator)}.rb").join, cmd + '.rb')
-}
-if no_launcher
-  $root.withdraw  # hide root window
-  Thread.start{
-    loop do
-      count = 0
-      $root.winfo_children.each{|w|
-        count += 1 if w.kind_of?(TkToplevel)
-      }
-      $root.destroy if count == 0
-    end
-  }
-end
-
-################################
-# イベント待ちに入る
-Tk.mainloop
diff --git a/ext/tk/sample/editable_listbox.rb b/ext/tk/sample/editable_listbox.rb
deleted file mode 100644
index 5cbd20e0a5..0000000000
--- a/ext/tk/sample/editable_listbox.rb
+++ /dev/null
@@ -1,149 +0,0 @@
-# frozen_string_literal: false
-#
-# Tk::RbWidget::Editable_Listbox class
-#
-#   When "DoubleClick-1" on a listbox item, the entry box is opened on the
-#   item. And when hit "Return" key on the entry box after modifying the
-#   text, the entry box is closed and the item is changed. Or when hit
-#   "Escape" key, the entry box is closed without modification.
-#
-#                              by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-
-module Tk
-  module RbWidget
-    class Editable_Listbox < TkListbox
-    end
-  end
-end
-
-
-class Tk::RbWidget::Editable_Listbox < TkListbox
-  #------------------------------------
-  BindTag = TkBindTag.new_by_name(self.to_s.gsub(/::/, '#'))
-
-  BindTag.bind('FocusIn', :widget){|w|
-    w.instance_eval{
-      if idx = @ebox.pos
-        see(idx) if bbox(idx).empty?
-        @ebox.focus(true)
-      end
-    }
-  }
-
-  BindTag.bind('Double-1', :widget, :y){|w, y|
-    w.instance_eval{ _ebox_placer(nearest(y)) }
-  }
-
-  BindTag.bind('Return', :widget){|w|
-    w.instance_eval{
-      if idx = index(:active)
-        _ebox_placer(idx)
-      end
-    }
-  }
-  #------------------------------------
-
-  def configure(*args)
-    ret = super
-
-    case cget(:state)
-    when 'normal'
-      # do nothing
-    when 'disabled'
-      _ebox_erase
-    else # unknown
-      # do nothing
-
-    end
-
-    ret
-  end
-
-  def _ebox_move(idx)
-    return nil if cget(:state) == 'disabled'
-    x, y, w, h = bbox(idx)
-    return nil unless y && h
-    @ebox.place(:x => 0, :relwidth => 1.0,
-                :y => y - selectborderwidth,
-                :height => h + 2 * selectborderwidth)
-    @ebox.pos = idx
-    @ebox.focus
-  end
-
-  def _ebox_placer(idx)
-    return nil unless _ebox_move(idx)
-    @ebox.value = listvariable.list[idx]
-    @ebox.xview_moveto(self.xview[0])
-  end
-
-  def _ebox_erase
-    @ebox.place_forget
-    @ebox.pos = nil
-  end
-  private :_ebox_move, :_ebox_placer, :_ebox_erase
-
-  def _setup_ebox_bindings
-    # bindings for entry
-    @ebox.bind('Return'){
-      list = listvariable.list
-      list[@ebox.pos] = @ebox.value if @ebox.pos
-      listvariable.value = list
-      _ebox_erase
-      focus
-    }
-
-    @ebox.bind('Escape'){ _ebox_erase }
-  end
-  def _setup_listbox_bindings
-    # bindings for listbox
-    tags = bindtags
-    bindtags(tags.insert(tags.index(self) + 1, self.class::BindTag))
-  end
-  private :_setup_ebox_bindings,  :_setup_listbox_bindings
-
-  def yview(*args)
-    if !@ebox.pos || bbox(@ebox.pos).empty?
-      @ebox.place_forget
-    else
-      _ebox_move(@ebox.pos)
-    end
-    super
-  end
-
-  def create_self(keys)
-    super(keys)
-
-    unless self.listvariable
-      self.listvariable = TkVariable.new(self.get(0, :end))
-    end
-
-    @ebox = TkEntry.new(self){
-      @pos = nil
-      def self.pos; @pos; end
-      def self.pos=(idx); @pos = idx; end
-    }
-
-    _setup_ebox_bindings
-    _setup_listbox_bindings
-  end
-end
-
-if $0 == __FILE__
-  #lbox0 = TkListbox.new.pack(:side=>:left)
-  #lbox0.insert(:end,     0,1,2,3,4,5,6,7,8,9,0,1,2,3)
-
-  scr = TkScrollbar.new.pack(:side=>:right, :fill=>:y)
-
-  lbox1 = Tk::RbWidget::Editable_Listbox.new.pack(:side=>:left)
-  lbox2 = Tk::RbWidget::Editable_Listbox.new.pack(:side=>:left)
-
-  scr.assign(lbox1, lbox2)
-
-  lbox1.insert(:end, *%w(a b c d e f g h i j k l m n))
-  lbox2.insert(:end,     0,1,2,3,4,5,6,7,8,9,0,1,2,3)
-
-
-  Tk.mainloop
-end
diff --git a/ext/tk/sample/encstr_usage.rb b/ext/tk/sample/encstr_usage.rb
deleted file mode 100644
index 49a29ec19a..0000000000
--- a/ext/tk/sample/encstr_usage.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-# frozen_string_literal: false
-require 'tk'
-
-TkMessage.new(:width=>400, :text=><<EOM).pack
-This sample shows how to use Tk::EncodedString class. \
-This reads 'iso2022-kr' text (from discription of \
-Korean language environment of GNU Emacs 20.7.2) \
-and inserts the text into the text widget.
-EOM
-
-t1 = TkText.new(:height=>5).pack
-t2 = TkText.new(:height=>5).pack
-t3 = TkText.new(:height=>5).pack
-
-src_str = IO.readlines(File.join(File.dirname(__FILE__),'iso2022-kr.txt')).join
-
-t1.insert('end',
-          "use neither Tk::EncodedString class nor Tk.encoding= method\n\n")
-t1.insert('end', src_str)
-
-enc_str = Tk::EncodedString(src_str, 'iso2022-kr')
-t2.insert('end',
-          "use Tk::EncodedString class (Tk.encoding => '#{Tk.encoding}')\n\n")
-t2.insert('end', enc_str)
-
-Tk.encoding = 'iso2022-kr'
-t3.insert('end', "use Tk.encoding = 'iso2022-kr' (Tk.force_default_encoding? == #{Tk.force_default_encoding?})\n\n")
-
-t3.insert('end', src_str)
-
-Tk.mainloop
diff --git a/ext/tk/sample/figmemo_sample.rb b/ext/tk/sample/figmemo_sample.rb
deleted file mode 100644
index d947030606..0000000000
--- a/ext/tk/sample/figmemo_sample.rb
+++ /dev/null
@@ -1,457 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-
-begin
-  # try to use Img extension
-  require 'tkextlib/tkimg'
-rescue Exception
-  # cannot use Img extension --> ignore
-end
-
-
-############################
-# scrolled_canvas
-class TkScrolledCanvas < TkCanvas
-  include TkComposite
-
-  def initialize_composite(keys={})
-    @h_scr = TkScrollbar.new(@frame)
-    @v_scr = TkScrollbar.new(@frame)
-
-    @canvas = TkCanvas.new(@frame)
-    @path = @canvas.path
-
-    @canvas.xscrollbar(@h_scr)
-    @canvas.yscrollbar(@v_scr)
-
-    TkGrid.rowconfigure(@frame, 0, :weight=>1, :minsize=>0)
-    TkGrid.columnconfigure(@frame, 0, :weight=>1, :minsize=>0)
-
-    @canvas.grid(:row=>0, :column=>0, :sticky=>'news')
-    @h_scr.grid(:row=>1, :column=>0, :sticky=>'ew')
-    @v_scr.grid(:row=>0, :column=>1, :sticky=>'ns')
-
-    delegate('DEFAULT', @canvas)
-    delegate('background', @canvas, @h_scr, @v_scr)
-    delegate('activebackground', @h_scr, @v_scr)
-    delegate('troughcolor', @h_scr, @v_scr)
-    delegate('repeatdelay', @h_scr, @v_scr)
-    delegate('repeatinterval', @h_scr, @v_scr)
-    delegate('borderwidth', @frame)
-    delegate('relief', @frame)
-
-    delegate_alias('canvasborderwidth', 'borderwidth', @canvas)
-    delegate_alias('canvasrelief', 'relief', @canvas)
-
-    delegate_alias('scrollbarborderwidth', 'borderwidth', @h_scr, @v_scr)
-    delegate_alias('scrollbarrelief', 'relief', @h_scr, @v_scr)
-
-    configure(keys) unless keys.empty?
-  end
-end
-
-############################
-class PhotoCanvas < TkScrolledCanvas
-
-USAGE = <<EOT
---- WHAT IS ---
-You can write comments on the loaded image, and save it as a Postscipt
-file (original image file is not modified). Each comment is drawn as a
-set of an indicator circle, an arrow, and a memo text. See the following
-how to write comments.
-This can save the list of memo texts to another file. It may useful to
-search the saved Postscript file by the comments on them.
-This may not support multibyte characters (multibyte texts are broken on
-a Postscript file). It depends on features of canvas widgets of Tcl/Tk
-libraries linked your Ruby/Tk. If you use Tcl/Tk8.0-jp (Japanized Tcl/Tk),
-you can (possibly) get a Japanese Postscript file.
-
---- BINDINGS ---
-* Button-1 : draw comments by following steps
-    1st - Set center of a indicator circle.
-    2nd - Set head position of an arrow.
-    3rd - Set tail position of an arrow, and show an entry box.
-          Input a memo text and hit 'Enter' key to entry the comment.
-
-* Button-2-drag : scroll the canvas
-
-* Button-3 : when drawing, cancel current drawing
-
-* Double-Button-3 : delete the clicked comment (text, arrow, and circle)
-EOT
-
-  def initialize(*args)
-    super(*args)
-
-    self.highlightthickness = 0
-    self.selectborderwidth = 0
-
-    @photo = TkPhotoImage.new
-    @img = TkcImage.new(self, 0, 0, :image=>@photo)
-
-    width  = self.width
-    height = self.height
-    @scr_region = [-width, -height, width, height]
-    self.scrollregion(@scr_region)
-    self.xview_moveto(0.25)
-    self.yview_moveto(0.25)
-
-    @col = 'red'
-    @font = 'Helvetica -12'
-
-    @memo_id_num = -1
-    @memo_id_head = 'memo_'
-    @memo_id_tag = nil
-    @overlap_d = 2
-
-    @state = TkVariable.new
-    @border = 2
-    @selectborder = 1
-    @delta = @border + @selectborder
-    @entry = TkEntry.new(self, :relief=>:ridge, :borderwidth=>@border,
-                         :selectborderwidth=>@selectborder,
-                         :highlightthickness=>0)
-    @entry.bind('Return'){@state.value = 0}
-
-    @mode = old_mode = 0
-
-    _state0()
-
-    bind('2', :x, :y){|x,y| scan_mark(x,y)}
-    bind('B2-Motion', :x, :y){|x,y| scan_dragto(x,y)}
-
-    bind('3'){
-      next if (old_mode = @mode) == 0
-      @items.each{|item| item.delete }
-      _state0()
-    }
-
-    bind('Double-3', :widget, :x, :y){|w, x, y|
-      next if old_mode != 0
-      x = w.canvasx(x)
-      y = w.canvasy(y)
-      tag = nil
-      w.find_overlapping(x - @overlap_d, y - @overlap_d,
-                         x + @overlap_d, y + @overlap_d).find{|item|
-        ! (item.tags.find{|name|
-             if name =~ /^(#{@memo_id_head}\d+)$/
-               tag = $1
-             end
-           }.empty?)
-      }
-      w.delete(tag) if tag
-    }
-  end
-
-  #-----------------------------------
-  private
-  def _state0() # init
-    @mode = 0
-
-    @memo_id_num += 1
-    @memo_id_tag = @memo_id_head + @memo_id_num.to_s
-
-    @target = nil
-    @items = []
-    @mark = [0, 0]
-    bind_remove('Motion')
-    bind('ButtonRelease-1', proc{|x,y| _state1(x,y)}, '%x', '%y')
-  end
-
-  def _state1(x,y) # set center
-    @mode = 1
-
-    @target = TkcOval.new(self,
-                          [canvasx(x), canvasy(y)], [canvasx(x), canvasy(y)],
-                          :outline=>@col, :width=>3, :tags=>[@memo_id_tag])
-    @items << @target
-    @mark = [x,y]
-
-    bind('Motion', proc{|x,y| _state2(x,y)}, '%x', '%y')
-    bind('ButtonRelease-1', proc{|x,y| _state3(x,y)}, '%x', '%y')
-  end
-
-  def _state2(x,y) # create circle
-    @mode = 2
-
-    r = Integer(Math.sqrt((x-@mark[0])**2 + (y-@mark[1])**2))
-    @target.coords([canvasx(@mark[0] - r), canvasy(@mark[1] - r)],
-                   [canvasx(@mark[0] + r), canvasy(@mark[1] + r)])
-  end
-
-  def _state3(x,y) # set line start
-    @mode = 3
-
-    @target = TkcLine.new(self,
-                          [canvasx(x), canvasy(y)], [canvasx(x), canvasy(y)],
-                          :arrow=>:first, :arrowshape=>[10, 14, 5],
-                          :fill=>@col, :tags=>[@memo_id_tag])
-    @items << @target
-    @mark = [x, y]
-
-    bind('Motion', proc{|x,y| _state4(x,y)}, '%x', '%y')
-    bind('ButtonRelease-1', proc{|x,y| _state5(x,y)}, '%x', '%y')
-  end
-
-  def _state4(x,y) # create line
-    @mode = 4
-
-    @target.coords([canvasx(@mark[0]), canvasy(@mark[1])],
-                   [canvasx(x), canvasy(y)])
-  end
-
-  def _state5(x,y) # set text
-    @mode = 5
-
-    if x - @mark[0] >= 0
-      justify = 'left'
-      dx = - @delta
-
-      if y - @mark[1] >= 0
-        anchor = 'nw'
-        dy = - @delta
-      else
-        anchor = 'sw'
-        dy = @delta
-      end
-    else
-      justify = 'right'
-      dx = @delta
-
-      if y - @mark[1] >= 0
-        anchor = 'ne'
-        dy = - @delta
-      else
-        anchor = 'se'
-        dy = @delta
-      end
-    end
-
-    bind_remove('Motion')
-
-    @entry.value = ''
-    @entry.configure(:justify=>justify, :font=>@font, :foreground=>@col)
-
-    ewin = TkcWindow.new(self, [canvasx(x)+dx, canvasy(y)+dy],
-                         :window=>@entry, :state=>:normal, :anchor=>anchor,
-                         :tags=>[@memo_id_tag])
-
-    @entry.focus
-    @entry.grab
-    @state.wait
-    @entry.grab_release
-
-    ewin.delete
-
-    @target = TkcText.new(self, [canvasx(x), canvasy(y)],
-                          :anchor=>anchor, :justify=>justify,
-                          :fill=>@col, :font=>@font, :text=>@entry.value,
-                          :tags=>[@memo_id_tag])
-
-    _state0()
-  end
-
-  #-----------------------------------
-  public
-  def load_photo(filename)
-    @photo.configure(:file=>filename)
-  end
-
-  def modified?
-    ! ((find_withtag('all') - [@img]).empty?)
-  end
-
-  def fig_erase
-    (find_withtag('all') - [@img]).each{|item| item.delete}
-  end
-
-  def reset_region
-    width = @photo.width
-    height = @photo.height
-
-    if width > @scr_region[2]
-      @scr_region[0] = -width
-      @scr_region[2] = width
-    end
-
-    if height > @scr_region[3]
-      @scr_region[1] = -height
-      @scr_region[3] = height
-    end
-
-    self.scrollregion(@scr_region)
-    self.xview_moveto(0.25)
-    self.yview_moveto(0.25)
-  end
-
-  def get_texts
-    ret = []
-    find_withtag('all').each{|item|
-      if item.kind_of?(TkcText)
-        ret << item[:text]
-      end
-    }
-    ret
-  end
-end
-############################
-
-# define methods for menu
-def open_file(canvas, fname)
-  if canvas.modified?
-    ret = Tk.messageBox(:icon=>'warning',:type=>'okcancel',:default=>'cancel',
-                        :message=>'Canvas may be modified. Really erase? ')
-    return if ret == 'cancel'
-  end
-
-  filetypes = [
-    ['GIF Files', '.gif'],
-    ['GIF Files', [], 'GIFF'],
-    ['PPM Files', '.ppm'],
-    ['PGM Files', '.pgm']
-  ]
-
-  begin
-    if Tk::Img::package_version != ''
-      filetypes << ['JPEG Files', ['.jpg', '.jpeg']]
-      filetypes << ['PNG Files', '.png']
-      filetypes << ['PostScript Files', '.ps']
-      filetypes << ['PDF Files', '.pdf']
-      filetypes << ['Windows Bitmap Files', '.bmp']
-      filetypes << ['Windows Icon Files', '.ico']
-      filetypes << ['PCX Files', '.pcx']
-      filetypes << ['Pixmap Files', '.pixmap']
-      filetypes << ['SGI Files', '.sgi']
-      filetypes << ['Sun Raster Files', '.sun']
-      filetypes << ['TGA Files', '.tga']
-      filetypes << ['TIFF Files', '.tiff']
-      filetypes << ['XBM Files', '.xbm']
-      filetypes << ['XPM Files', '.xpm']
-    end
-  rescue
-  end
-
-  filetypes << ['ALL Files', '*']
-
-  fpath = Tk.getOpenFile(:filetypes=>filetypes)
-  return if fpath.empty?
-
-  begin
-    canvas.load_photo(fpath)
-  rescue => e
-    Tk.messageBox(:icon=>'error', :type=>'ok',
-                  :message=>"Fail to read '#{fpath}'.\n#{e.message}")
-  end
-
-  canvas.fig_erase
-  canvas.reset_region
-
-  fname.value = fpath
-end
-
-# --------------------------------
-def save_memo(canvas, fname)
-  initname = fname.value
-  if initname != '-'
-    initname = File.basename(initname, File.extname(initname))
-    fpath = Tk.getSaveFile(:filetypes=>[ ['Text Files', '.txt'],
-                                         ['ALL Files', '*'] ],
-                           :initialfile=>initname)
-  else
-    fpath = Tk.getSaveFile(:filetypes=>[ ['Text Files', '.txt'],
-                                         ['ALL Files', '*'] ])
-  end
-  return if fpath.empty?
-
-  begin
-    fid = open(fpath, 'w')
-  rescue => e
-    Tk.messageBox(:icon=>'error', :type=>'ok',
-                  :message=>"Fail to open '#{fname.value}'.\n#{e.message}")
-  end
-
-  begin
-    canvas.get_texts.each{|txt|
-      fid.print(txt, "\n")
-    }
-  ensure
-    fid.close
-  end
-end
-
-# --------------------------------
-def ps_print(canvas, fname)
-  initname = fname.value
-  if initname != '-'
-    initname = File.basename(initname, File.extname(initname))
-    fpath = Tk.getSaveFile(:filetypes=>[ ['Postscript Files', '.ps'],
-                                         ['ALL Files', '*'] ],
-                           :initialfile=>initname)
-  else
-    fpath = Tk.getSaveFile(:filetypes=>[ ['Postscript Files', '.ps'],
-                                         ['ALL Files', '*'] ])
-  end
-  return if fpath.empty?
-
-  bbox = canvas.bbox('all')
-  canvas.postscript(:file=>fpath, :x=>bbox[0], :y=>bbox[1],
-                    :width=>bbox[2] - bbox[0], :height=>bbox[3] - bbox[1])
-end
-
-# --------------------------------
-def quit(canvas)
-  ret = Tk.messageBox(:icon=>'warning', :type=>'okcancel',
-                      :default=>'cancel',
-                      :message=>'Really quit? ')
-  exit if ret == 'ok'
-end
-
-# --------------------------------
-# setup root
-root = TkRoot.new(:title=>'Fig Memo')
-
-# create canvas frame
-canvas = PhotoCanvas.new(root).pack(:fill=>:both, :expand=>true)
-usage_frame = TkFrame.new(root, :relief=>:ridge, :borderwidth=>2)
-hide_btn = TkButton.new(usage_frame, :text=>'hide usage',
-                        :font=>{:size=>8}, :pady=>1,
-                        :command=>proc{usage_frame.unpack})
-hide_btn.pack(:anchor=>'e', :padx=>5)
-usage = TkLabel.new(usage_frame, :text=>PhotoCanvas::USAGE,
-                    :font=>'Helvetica 8', :justify=>:left).pack
-
-show_usage = proc{
-  usage_frame.pack(:before=>canvas, :fill=>:x, :expand=>true)
-}
-
-fname = TkVariable.new('-')
-f = TkFrame.new(root, :relief=>:sunken, :borderwidth=>1).pack(:fill=>:x)
-label = TkLabel.new(f, :textvariable=>fname,
-                    :font=>{:size=>-12, :weight=>:bold},
-                    :anchor=>'w').pack(:side=>:left, :fill=>:x, :padx=>10)
-
-# create menu
-mspec = [
-  [ ['File', 0],
-    ['Show Usage',      proc{show_usage.call}, 5],
-    '---',
-    ['Open Image File', proc{open_file(canvas, fname)}, 0],
-    ['Save Memo Texts', proc{save_memo(canvas, fname)}, 0],
-    '---',
-    ['Save Postscript', proc{ps_print(canvas, fname)}, 5],
-    '---',
-    ['Quit', proc{quit(canvas)}, 0]
-  ]
-]
-root.add_menubar(mspec)
-
-# manage wm_protocol
-root.protocol(:WM_DELETE_WINDOW){quit(canvas)}
-
-# show usage
-show_usage.call
-
-# --------------------------------
-# start eventloop
-Tk.mainloop
diff --git a/ext/tk/sample/images/earth.gif b/ext/tk/sample/images/earth.gif
deleted file mode 100644
index 2c229eb110..0000000000
--- a/ext/tk/sample/images/earth.gif
+++ /dev/null
diff --git a/ext/tk/sample/images/earthris.gif b/ext/tk/sample/images/earthris.gif
deleted file mode 100644
index c4ee473727..0000000000
--- a/ext/tk/sample/images/earthris.gif
+++ /dev/null
diff --git a/ext/tk/sample/images/face.xbm b/ext/tk/sample/images/face.xbm
deleted file mode 100644
index 03d829f4d1..0000000000
--- a/ext/tk/sample/images/face.xbm
+++ /dev/null
@@ -1,173 +0,0 @@
-#define face_width 108
-#define face_height 144
-#define face_x_hot 48
-#define face_y_hot 80
-static char face_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x09,
-   0x20, 0x80, 0x24, 0x05, 0x00, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x88,
-   0x24, 0x20, 0x80, 0x24, 0x00, 0x00, 0x00, 0x10, 0x80, 0x04, 0x00, 0x01,
-   0x00, 0x01, 0x40, 0x0a, 0x09, 0x00, 0x92, 0x04, 0x80, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x10, 0x40, 0x12, 0x00, 0x00, 0x10, 0x40, 0x00, 0x00, 0x84,
-   0x24, 0x40, 0x22, 0xa8, 0x02, 0x14, 0x84, 0x92, 0x40, 0x42, 0x12, 0x04,
-   0x10, 0x00, 0x00, 0x00, 0x00, 0x52, 0x00, 0x52, 0x11, 0x00, 0x12, 0x00,
-   0x40, 0x02, 0x00, 0x20, 0x00, 0x08, 0x00, 0xaa, 0x02, 0x54, 0x85, 0x24,
-   0x00, 0x10, 0x12, 0x00, 0x00, 0x81, 0x44, 0x00, 0x90, 0x5a, 0x00, 0xea,
-   0x1b, 0x00, 0x80, 0x40, 0x40, 0x02, 0x00, 0x08, 0x00, 0x20, 0xa2, 0x05,
-   0x8a, 0xb4, 0x6e, 0x45, 0x12, 0x04, 0x08, 0x00, 0x00, 0x00, 0x10, 0x02,
-   0xa8, 0x92, 0x00, 0xda, 0x5f, 0x10, 0x00, 0x10, 0xa1, 0x04, 0x20, 0x41,
-   0x02, 0x00, 0x5a, 0x25, 0xa0, 0xff, 0xfb, 0x05, 0x41, 0x02, 0x04, 0x00,
-   0x00, 0x08, 0x40, 0x80, 0xec, 0x9b, 0xec, 0xfe, 0x7f, 0x01, 0x04, 0x20,
-   0x90, 0x02, 0x04, 0x00, 0x08, 0x20, 0xfb, 0x2e, 0xf5, 0xff, 0xff, 0x57,
-   0x00, 0x04, 0x02, 0x00, 0x00, 0x20, 0x01, 0xc1, 0x6e, 0xab, 0xfa, 0xff,
-   0xff, 0x05, 0x90, 0x20, 0x48, 0x02, 0x00, 0x04, 0x20, 0xa8, 0xdf, 0xb5,
-   0xfe, 0xff, 0xff, 0x0b, 0x01, 0x00, 0x01, 0x00, 0x80, 0x80, 0x04, 0xe0,
-   0xbb, 0xef, 0xff, 0xff, 0x7f, 0x01, 0x00, 0x04, 0x48, 0x02, 0x00, 0x20,
-   0x80, 0xf4, 0x6f, 0xfb, 0xff, 0xff, 0xff, 0x20, 0x90, 0x40, 0x02, 0x00,
-   0x00, 0x04, 0x08, 0xb8, 0xf6, 0xff, 0xff, 0xdf, 0xbe, 0x12, 0x45, 0x10,
-   0x90, 0x04, 0x90, 0x00, 0x22, 0xfa, 0xff, 0xff, 0xff, 0xbb, 0xd7, 0xe9,
-   0x3a, 0x02, 0x02, 0x00, 0x04, 0x90, 0x80, 0xfe, 0xdf, 0xf6, 0xb7, 0xef,
-   0xbe, 0x56, 0x57, 0x40, 0x48, 0x09, 0x00, 0x04, 0x00, 0xfa, 0xf5, 0xdf,
-   0xed, 0x5a, 0xd5, 0xea, 0xbd, 0x09, 0x00, 0x00, 0x40, 0x00, 0x92, 0xfe,
-   0xbf, 0x7d, 0xb7, 0x6a, 0x55, 0xbf, 0xf7, 0x02, 0x11, 0x01, 0x00, 0x91,
-   0x00, 0xff, 0xff, 0xaf, 0x55, 0x55, 0x5b, 0xeb, 0xef, 0x22, 0x04, 0x04,
-   0x04, 0x00, 0xa4, 0xff, 0xf7, 0xad, 0xaa, 0xaa, 0xaa, 0xbe, 0xfe, 0x03,
-   0x20, 0x00, 0x10, 0x44, 0x80, 0xff, 0x7f, 0x55, 0x12, 0x91, 0x2a, 0xeb,
-   0xbf, 0x0b, 0x82, 0x02, 0x00, 0x00, 0xd1, 0x7f, 0xdf, 0xa2, 0xa4, 0x54,
-   0x55, 0xfd, 0xfd, 0x47, 0x08, 0x08, 0x00, 0x21, 0xe4, 0xff, 0x37, 0x11,
-   0x09, 0xa5, 0xaa, 0xb6, 0xff, 0x0d, 0x80, 0x00, 0x00, 0x04, 0xd0, 0xff,
-   0x4f, 0x44, 0x20, 0x48, 0x55, 0xfb, 0xff, 0x27, 0x11, 0x02, 0x40, 0x40,
-   0xe2, 0xfb, 0x15, 0x11, 0x4a, 0x55, 0x4a, 0x7d, 0xf7, 0x0f, 0x00, 0x00,
-   0x04, 0x08, 0xf8, 0xdf, 0x52, 0x44, 0x01, 0x52, 0xb5, 0xfa, 0xff, 0x0f,
-   0x49, 0x02, 0x00, 0x02, 0xe9, 0xf6, 0x0a, 0x11, 0xa4, 0x88, 0x4a, 0x6d,
-   0xff, 0x5f, 0x00, 0x00, 0x10, 0x20, 0xf0, 0x2f, 0x21, 0x44, 0x10, 0x52,
-   0xb5, 0xfa, 0xff, 0x0f, 0x44, 0x04, 0x80, 0x08, 0xf8, 0xab, 0x8a, 0x00,
-   0x81, 0xa4, 0xd4, 0xd6, 0xfe, 0x2f, 0x00, 0x00, 0x04, 0x40, 0xb5, 0x2d,
-   0x21, 0x08, 0x04, 0x90, 0xaa, 0xfa, 0xff, 0x1f, 0x11, 0x01, 0x00, 0x04,
-   0xf0, 0x57, 0x0a, 0x22, 0x40, 0x4a, 0xda, 0x5e, 0xfb, 0x1f, 0x40, 0x00,
-   0x40, 0x20, 0xba, 0x95, 0x90, 0x00, 0x01, 0xa0, 0xaa, 0xea, 0xff, 0x5f,
-   0x02, 0x02, 0x00, 0x01, 0xe8, 0x57, 0x05, 0x00, 0x00, 0x12, 0xd5, 0xfe,
-   0xfd, 0x1f, 0x48, 0x00, 0x04, 0x48, 0x7a, 0x95, 0x08, 0x02, 0x10, 0x40,
-   0xaa, 0x55, 0xf7, 0x1f, 0x00, 0x09, 0x20, 0x00, 0xf8, 0x57, 0x22, 0x10,
-   0x00, 0x28, 0xa9, 0xfa, 0xff, 0x5f, 0x02, 0x00, 0x00, 0x49, 0xdd, 0x29,
-   0x01, 0x00, 0x80, 0x80, 0xaa, 0xd7, 0xff, 0x0f, 0x10, 0x00, 0x08, 0x00,
-   0xf8, 0x96, 0x08, 0x00, 0x00, 0x20, 0x54, 0xfa, 0xee, 0x3f, 0x81, 0x04,
-   0x40, 0x24, 0xfe, 0x55, 0x82, 0x00, 0x00, 0x82, 0xd2, 0xad, 0xff, 0x0f,
-   0x08, 0x00, 0x04, 0x80, 0x6c, 0x97, 0x00, 0x00, 0x02, 0x20, 0xa9, 0xf6,
-   0xdf, 0x5f, 0x00, 0x02, 0x20, 0x09, 0xfa, 0x49, 0x12, 0x00, 0x20, 0x84,
-   0x54, 0xdb, 0xfe, 0x1f, 0x91, 0x00, 0x00, 0x00, 0xf8, 0x2b, 0x00, 0x20,
-   0x00, 0x40, 0xa4, 0xf6, 0xbb, 0x1f, 0x04, 0x00, 0x44, 0x92, 0x7e, 0x95,
-   0x02, 0x00, 0x00, 0x89, 0xaa, 0xdd, 0xff, 0x1f, 0x20, 0x09, 0x10, 0x00,
-   0xf4, 0x57, 0x20, 0x01, 0x08, 0x20, 0xa9, 0x76, 0xff, 0x5f, 0x02, 0x00,
-   0x00, 0x21, 0xfc, 0x4a, 0x05, 0x00, 0x01, 0x80, 0x54, 0xdb, 0xff, 0x1e,
-   0x08, 0x02, 0x04, 0x08, 0xf9, 0x2b, 0x00, 0x00, 0x40, 0x28, 0xd2, 0xf6,
-   0xff, 0xbf, 0x80, 0x00, 0x90, 0x00, 0xbc, 0x92, 0x08, 0x10, 0x00, 0x82,
-   0x54, 0xdb, 0xff, 0x1f, 0x20, 0x00, 0x00, 0x44, 0xf9, 0x55, 0x02, 0x01,
-   0x00, 0x20, 0xaa, 0xbd, 0xfd, 0x3f, 0x08, 0x04, 0x04, 0x10, 0xf4, 0x2a,
-   0x01, 0x00, 0x22, 0x80, 0xd4, 0xf6, 0xff, 0x5f, 0x82, 0x00, 0x40, 0x02,
-   0xf8, 0x55, 0x20, 0x00, 0x00, 0x50, 0x6a, 0xdf, 0xfe, 0x3f, 0x00, 0x00,
-   0x00, 0x48, 0xe9, 0x4a, 0x05, 0x08, 0x00, 0xa5, 0xd5, 0xf5, 0xff, 0x3f,
-   0x10, 0x01, 0x10, 0x01, 0xb0, 0xab, 0x92, 0x02, 0x40, 0xf8, 0xbf, 0xde,
-   0xfe, 0x5f, 0x02, 0x04, 0x04, 0x48, 0xfa, 0xd4, 0x6f, 0x20, 0x84, 0xef,
-   0xff, 0xfb, 0xff, 0x1f, 0x20, 0x00, 0x00, 0x00, 0xe0, 0xed, 0xbf, 0x0b,
-   0xa1, 0x7e, 0xff, 0xbf, 0xfd, 0x5f, 0x04, 0x01, 0x20, 0x49, 0xd2, 0xfb,
-   0xfe, 0x55, 0xd4, 0xff, 0xff, 0xf6, 0xff, 0x07, 0x00, 0x04, 0x00, 0x00,
-   0xc0, 0xaa, 0xfb, 0x2b, 0xa2, 0xfe, 0xff, 0xdf, 0xee, 0x1f, 0x91, 0x00,
-   0x82, 0xa4, 0xa4, 0xf5, 0xff, 0x57, 0xd5, 0xff, 0xbf, 0xfd, 0xff, 0x4d,
-   0x00, 0x00, 0x20, 0x00, 0x88, 0x5b, 0xff, 0x2f, 0x69, 0xff, 0xff, 0xdb,
-   0xfe, 0x1f, 0x24, 0x02, 0x00, 0x49, 0xa2, 0xd6, 0xff, 0x5f, 0xea, 0xff,
-   0x7f, 0x7f, 0x7f, 0x0d, 0x00, 0x00, 0x10, 0x00, 0x40, 0xab, 0xf7, 0xbb,
-   0xf0, 0xdf, 0xff, 0xd5, 0xff, 0xbf, 0x82, 0x04, 0x42, 0x24, 0x91, 0xd5,
-   0xaa, 0xae, 0xd4, 0xaa, 0x52, 0x7b, 0xff, 0x15, 0x08, 0x00, 0x00, 0x01,
-   0x04, 0x55, 0xd5, 0x55, 0x70, 0x5b, 0x75, 0xdd, 0xdf, 0x1f, 0x40, 0x00,
-   0x08, 0x48, 0xa0, 0x4a, 0xa9, 0x56, 0xea, 0x56, 0xad, 0x6a, 0x7d, 0x9b,
-   0x04, 0x01, 0x00, 0x02, 0x42, 0x2a, 0xd5, 0xaa, 0xa8, 0xaa, 0xaa, 0xfa,
-   0xdf, 0x2f, 0x10, 0x04, 0x22, 0x48, 0x08, 0x45, 0x2a, 0x15, 0x68, 0x55,
-   0x55, 0xd7, 0x76, 0x1b, 0x00, 0x00, 0x00, 0x01, 0x40, 0x2a, 0x80, 0xa0,
-   0xb2, 0x09, 0x48, 0xb9, 0xdf, 0x17, 0x22, 0x01, 0x00, 0x24, 0x45, 0x8a,
-   0x24, 0x4a, 0x54, 0x51, 0x91, 0xf6, 0x6e, 0x4b, 0x00, 0x04, 0x90, 0x00,
-   0x80, 0x52, 0x00, 0x20, 0x69, 0x05, 0xa4, 0xaa, 0xff, 0x1e, 0x48, 0x00,
-   0x02, 0x92, 0x08, 0x05, 0x81, 0x94, 0xd4, 0x92, 0x40, 0xfd, 0xb6, 0x8b,
-   0x00, 0x01, 0x40, 0x00, 0x82, 0x54, 0x00, 0x48, 0x68, 0x05, 0x90, 0xa4,
-   0xef, 0x06, 0x24, 0x00, 0x08, 0x12, 0x10, 0x05, 0x00, 0x10, 0xb5, 0x01,
-   0x42, 0xfb, 0xbf, 0x43, 0x00, 0x09, 0x00, 0x40, 0x81, 0xa8, 0x08, 0x4a,
-   0xaa, 0x96, 0x90, 0xac, 0x6d, 0x15, 0x22, 0x00, 0x20, 0x09, 0x04, 0x15,
-   0x80, 0x28, 0xdc, 0x01, 0x24, 0xfb, 0xbf, 0x01, 0x80, 0x04, 0x09, 0x00,
-   0x40, 0x48, 0x02, 0x45, 0xb2, 0x2e, 0x41, 0x6d, 0xef, 0x05, 0x11, 0x00,
-   0x40, 0x52, 0x02, 0x15, 0x29, 0x2a, 0xac, 0x42, 0x54, 0xfb, 0x3b, 0x51,
-   0x84, 0x00, 0x08, 0x00, 0x20, 0x54, 0x80, 0x05, 0xb5, 0x3d, 0xa2, 0xb6,
-   0xdf, 0x00, 0x20, 0x04, 0x20, 0x49, 0x89, 0xa8, 0x6a, 0x29, 0xac, 0xd6,
-   0x54, 0xff, 0x3f, 0x84, 0x00, 0x01, 0x04, 0x10, 0x00, 0x94, 0xa8, 0x56,
-   0xda, 0x5f, 0xab, 0xd5, 0x1e, 0x10, 0x48, 0x00, 0x90, 0x82, 0x48, 0xa8,
-   0xb2, 0xac, 0xfd, 0x55, 0xd5, 0xfe, 0x9f, 0x80, 0x00, 0x0a, 0x02, 0x08,
-   0x02, 0x55, 0x5a, 0x75, 0xff, 0xaf, 0xb6, 0xf7, 0x2d, 0x12, 0x92, 0x00,
-   0x10, 0x20, 0x10, 0xa8, 0x54, 0xd5, 0xbf, 0x5d, 0xad, 0xdd, 0x0f, 0x00,
-   0x00, 0x04, 0x40, 0x09, 0x84, 0xa8, 0xaa, 0x5a, 0xed, 0xeb, 0x6a, 0xff,
-   0x9f, 0xa4, 0x24, 0x01, 0x02, 0xa0, 0x20, 0x50, 0x55, 0xd5, 0xbe, 0xae,
-   0xad, 0xfd, 0x16, 0x00, 0x10, 0x04, 0x20, 0x0a, 0x08, 0xb4, 0xaa, 0x95,
-   0xaa, 0x7b, 0xb7, 0xdb, 0x5f, 0x92, 0x04, 0x01, 0x84, 0x20, 0x21, 0x51,
-   0xd5, 0x2a, 0xa9, 0xee, 0xd5, 0xfe, 0x0d, 0x00, 0x20, 0x04, 0x10, 0x00,
-   0x08, 0x50, 0xe9, 0xd7, 0xd4, 0xfb, 0xb5, 0xff, 0x9f, 0x24, 0x09, 0x01,
-   0x42, 0x4a, 0xa2, 0x64, 0xd5, 0x55, 0x7b, 0x7f, 0xda, 0x7d, 0x4f, 0x00,
-   0x20, 0x04, 0x00, 0x80, 0x00, 0xa0, 0x2a, 0x13, 0x84, 0x6a, 0x55, 0xff,
-   0x1d, 0x48, 0x8a, 0x00, 0x94, 0x24, 0x8a, 0xc8, 0xaa, 0x42, 0x20, 0x5d,
-   0xf5, 0xff, 0x5f, 0x01, 0x00, 0x02, 0x01, 0x00, 0x20, 0xa2, 0x4a, 0x1a,
-   0x82, 0x56, 0xda, 0xbd, 0x3f, 0x92, 0x92, 0x00, 0x90, 0x92, 0x00, 0x40,
-   0x95, 0x6a, 0xf4, 0x55, 0x6d, 0xff, 0xd6, 0x00, 0x00, 0x0a, 0x04, 0x20,
-   0x14, 0x49, 0x4b, 0xaa, 0xaa, 0x56, 0xf5, 0xff, 0xbf, 0xab, 0xa4, 0x00,
-   0x20, 0x89, 0x40, 0x80, 0xaa, 0xaa, 0xaa, 0xaa, 0xde, 0xbf, 0xeb, 0x03,
-   0x00, 0x02, 0x04, 0x02, 0x0a, 0x10, 0x2b, 0x2a, 0x55, 0x5b, 0xf5, 0xff,
-   0xd7, 0x2f, 0x92, 0x00, 0x10, 0x28, 0x21, 0x01, 0x56, 0x95, 0xa0, 0x56,
-   0xdf, 0xef, 0xea, 0x87, 0x40, 0x0a, 0x42, 0x41, 0x00, 0x90, 0xaa, 0x52,
-   0xb6, 0xad, 0xfa, 0xff, 0xd5, 0x2f, 0x14, 0x00, 0x00, 0x04, 0x95, 0x04,
-   0xaa, 0xac, 0x55, 0x6b, 0xff, 0xb7, 0xea, 0x9f, 0x40, 0x02, 0x28, 0x51,
-   0x00, 0x40, 0x58, 0xd5, 0xda, 0xd6, 0x6e, 0x7f, 0xf9, 0x3f, 0x12, 0x04,
-   0x02, 0x04, 0x49, 0x25, 0x55, 0xaa, 0x77, 0xab, 0xff, 0x2b, 0xfd, 0x3f,
-   0x48, 0x01, 0x20, 0x41, 0x00, 0x00, 0x58, 0xa9, 0xda, 0xea, 0xfd, 0xaf,
-   0xfa, 0xff, 0x02, 0x04, 0x08, 0x14, 0x29, 0x49, 0x52, 0x55, 0x55, 0x55,
-   0xff, 0x8d, 0xfe, 0x3f, 0xa8, 0x00, 0x02, 0x41, 0x00, 0x02, 0xa0, 0xa2,
-   0xaa, 0xea, 0xff, 0x53, 0xfd, 0xff, 0x02, 0x04, 0x50, 0x04, 0x25, 0xa8,
-   0x54, 0x49, 0x52, 0xb5, 0xbf, 0x8a, 0xfe, 0xff, 0xa9, 0x08, 0x04, 0x50,
-   0x80, 0x02, 0xa1, 0x2a, 0x95, 0xea, 0xff, 0xa1, 0xff, 0xff, 0x03, 0x02,
-   0x90, 0x02, 0x09, 0x08, 0x44, 0x49, 0x52, 0xbd, 0x7f, 0xca, 0xff, 0xff,
-   0x2b, 0x09, 0x04, 0x48, 0x40, 0x82, 0x90, 0x56, 0xa9, 0xf6, 0xbf, 0xd0,
-   0xff, 0xff, 0x47, 0x00, 0x50, 0x02, 0x15, 0x11, 0x40, 0x95, 0xaa, 0xfd,
-   0x2f, 0xe9, 0xff, 0xff, 0x8f, 0x0a, 0x84, 0x50, 0x40, 0x84, 0x14, 0xaa,
-   0x6a, 0xff, 0x5f, 0xf2, 0xff, 0xff, 0x7f, 0x00, 0x10, 0x02, 0x09, 0x10,
-   0x40, 0x7d, 0xf7, 0xff, 0x0b, 0xfc, 0xff, 0xff, 0xaf, 0x02, 0x84, 0x50,
-   0x42, 0x85, 0x12, 0xd0, 0xdd, 0xff, 0xa7, 0xf2, 0xff, 0xff, 0xff, 0x04,
-   0x00, 0x0a, 0x08, 0x10, 0x48, 0xf8, 0xff, 0xff, 0x0a, 0xfe, 0xff, 0xff,
-   0x7f, 0x03, 0xa4, 0x80, 0xa2, 0x8a, 0x02, 0x68, 0xff, 0xff, 0x52, 0xfd,
-   0xff, 0xff, 0xff, 0x07, 0x00, 0x2a, 0x08, 0x20, 0x28, 0xdc, 0xff, 0x5f,
-   0x05, 0xff, 0xff, 0xff, 0xff, 0x0d, 0x92, 0x40, 0x22, 0x09, 0x02, 0xea,
-   0xfb, 0xaf, 0x48, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x00, 0x12, 0x81, 0xa0,
-   0x48, 0x9c, 0x6e, 0x93, 0xa2, 0xff, 0xff, 0xff, 0xff, 0x07, 0xa8, 0x40,
-   0x28, 0x0a, 0x02, 0x74, 0xb5, 0x45, 0x81, 0xff, 0xff, 0xff, 0xff, 0x0f,
-   0x02, 0x0a, 0x81, 0x20, 0x08, 0xae, 0xaa, 0x90, 0xe8, 0xff, 0xff, 0xff,
-   0xff, 0x0f, 0x90, 0x40, 0x28, 0x88, 0x12, 0x58, 0x15, 0x50, 0xd0, 0xff,
-   0xff, 0xff, 0xff, 0x0f, 0x44, 0x0a, 0x41, 0x21, 0x08, 0xae, 0x04, 0x14,
-   0xf0, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x10, 0x40, 0x14, 0x88, 0x04, 0xba,
-   0x02, 0x28, 0xe8, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x42, 0x15, 0x41, 0x21,
-   0x05, 0xad, 0x00, 0x05, 0xf8, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x10, 0x40,
-   0x24, 0x8a, 0x0e, 0x36, 0x00, 0x0a, 0xf4, 0xff, 0xff, 0xff, 0xff, 0x0f,
-   0x42, 0x25, 0x90, 0xd0, 0x8b, 0xc2, 0x41, 0x05, 0xfc, 0xff, 0xff, 0xff,
-   0xff, 0x0f, 0x10, 0x08, 0x05, 0xe8, 0x8e, 0x58, 0x80, 0x02, 0xfa, 0xff,
-   0xff, 0xff, 0xff, 0x0f, 0x4a, 0x20, 0xa8, 0xba, 0x0b, 0x2b, 0x51, 0x01,
-   0xfe, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x00, 0x8a, 0x02, 0xe8, 0xaf, 0x84,
-   0x90, 0x04, 0xfd, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x52, 0x21, 0x54, 0xbf,
-   0x1f, 0x15, 0xa5, 0x02, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x00, 0x08,
-   0x01, 0xfa, 0xb6, 0xa4, 0x52, 0x40, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f,
-   0x4a, 0xa2, 0x54, 0xef, 0x5f, 0x4b, 0xa4, 0x80, 0xff, 0xff, 0xff, 0xff,
-   0xff, 0x0f, 0x80, 0x10, 0x82, 0xfe, 0xbf, 0x92, 0x52, 0x42, 0xff, 0xff,
-   0xff, 0xff, 0xff, 0x0f, 0x12, 0x42, 0xa8, 0xbf, 0x1f, 0x24, 0x80, 0xa0,
-   0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x84, 0x28, 0x8a, 0xf7, 0x37, 0x80,
-   0x52, 0x80, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x10, 0x82, 0xe0, 0xff,
-   0x1f, 0x00, 0x20, 0xe1, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x84, 0x28,
-   0xca, 0xff, 0x1f, 0x00, 0x00, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f,
-   0x10, 0x42, 0xf0, 0xfd, 0x1b, 0x00, 0x50, 0xf0, 0xff, 0xff, 0xff, 0xff,
-   0xff, 0x0f, 0xa4, 0x10, 0xc5, 0xff, 0x1f, 0x00, 0x00, 0xe0, 0xff, 0xff,
-   0xff, 0xff, 0xff, 0x0f, 0x00, 0x22, 0xf8, 0xff, 0x0e, 0x00, 0x00, 0xf0,
-   0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0xaa, 0x88, 0xe2, 0xff, 0x0f, 0x10,
-   0x00, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x00, 0x25, 0xfa, 0xff,
-   0x0f, 0x01, 0x11, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0xff, 0xfb,
-   0xfb, 0xff, 0x7f, 0x5d, 0xd5, 0xfa, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f};
diff --git a/ext/tk/sample/images/flagdown.xbm b/ext/tk/sample/images/flagdown.xbm
deleted file mode 100644
index 55abc51825..0000000000
--- a/ext/tk/sample/images/flagdown.xbm
+++ /dev/null
@@ -1,27 +0,0 @@
-#define flagdown_width 48
-#define flagdown_height 48
-static char flagdown_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00,
-   0x00, 0x00, 0x80, 0x7f, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe1, 0x00, 0x00,
-   0x00, 0x00, 0x70, 0x80, 0x01, 0x00, 0x00, 0x00, 0x18, 0x00, 0x03, 0x00,
-   0x00, 0x00, 0x0c, 0x00, 0x03, 0x00, 0x00, 0x00, 0x06, 0x00, 0x06, 0x04,
-   0x00, 0x00, 0x03, 0x00, 0x06, 0x06, 0x00, 0x80, 0x01, 0x00, 0x06, 0x07,
-   0x00, 0xc0, 0x1f, 0x00, 0x87, 0x07, 0x00, 0xe0, 0x7f, 0x80, 0xc7, 0x07,
-   0x00, 0x70, 0xe0, 0xc0, 0xe5, 0x07, 0x00, 0x38, 0x80, 0xe1, 0x74, 0x07,
-   0x00, 0x18, 0x80, 0x71, 0x3c, 0x07, 0x00, 0x0c, 0x00, 0x3b, 0x1e, 0x03,
-   0x00, 0x0c, 0x00, 0x1f, 0x0f, 0x00, 0x00, 0x86, 0x1f, 0x8e, 0x07, 0x00,
-   0x00, 0x06, 0x06, 0xc6, 0x05, 0x00, 0x00, 0x06, 0x00, 0xc6, 0x05, 0x00,
-   0x00, 0x06, 0x00, 0xc6, 0x04, 0x00, 0x00, 0x06, 0x00, 0x06, 0x04, 0x00,
-   0x7f, 0x06, 0x00, 0x06, 0xe4, 0xff, 0x00, 0x06, 0x00, 0x06, 0x04, 0x00,
-   0x00, 0x06, 0x00, 0x06, 0x04, 0x00, 0x00, 0x06, 0x00, 0x06, 0x06, 0x00,
-   0x00, 0x06, 0x00, 0x06, 0x03, 0x00, 0x00, 0x06, 0x00, 0x86, 0x01, 0x00,
-   0x00, 0x06, 0x00, 0xc6, 0x00, 0x00, 0x00, 0x06, 0x00, 0x66, 0x00, 0x00,
-   0x00, 0x06, 0x00, 0x36, 0x00, 0x00, 0x00, 0x06, 0x00, 0x3e, 0x00, 0x00,
-   0x00, 0xfe, 0xff, 0x2f, 0x00, 0x00, 0x00, 0xfc, 0xff, 0x27, 0x00, 0x00,
-   0x00, 0x00, 0x88, 0x20, 0x00, 0x00, 0x00, 0x00, 0x88, 0x20, 0x00, 0x00,
-   0x00, 0x00, 0x88, 0x20, 0x00, 0x00, 0x00, 0x00, 0x88, 0x20, 0x00, 0x00,
-   0x00, 0x00, 0x88, 0x20, 0x00, 0x00, 0x00, 0x00, 0x88, 0x20, 0x00, 0x00,
-   0x00, 0x00, 0x88, 0x20, 0x00, 0x00, 0x00, 0x00, 0x88, 0x20, 0x00, 0x00,
-   0xf7, 0xbf, 0x8e, 0xfc, 0xdf, 0xf8, 0x9d, 0xeb, 0x9b, 0x76, 0xd2, 0x7a,
-   0x46, 0x30, 0xe2, 0x0f, 0xe1, 0x47, 0x55, 0x84, 0x48, 0x11, 0x84, 0x19};
diff --git a/ext/tk/sample/images/flagup.xbm b/ext/tk/sample/images/flagup.xbm
deleted file mode 100644
index 6eb0d846a3..0000000000
--- a/ext/tk/sample/images/flagup.xbm
+++ /dev/null
@@ -1,27 +0,0 @@
-#define flagup_width 48
-#define flagup_height 48
-static char flagup_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x7f, 0x00,
-   0x00, 0x00, 0x00, 0xe0, 0x7f, 0x00, 0x00, 0x00, 0x00, 0xef, 0x6a, 0x00,
-   0x00, 0x00, 0xc0, 0x7b, 0x75, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0x6a, 0x00,
-   0x00, 0x00, 0x30, 0x60, 0x75, 0x00, 0x00, 0x00, 0x18, 0xe0, 0x7f, 0x00,
-   0x00, 0x00, 0x0c, 0xe0, 0x7f, 0x00, 0x00, 0x00, 0x06, 0xe0, 0x04, 0x00,
-   0x00, 0x00, 0x03, 0xe0, 0x04, 0x00, 0x00, 0x80, 0x01, 0xe0, 0x06, 0x00,
-   0x00, 0xc0, 0x1f, 0xe0, 0x07, 0x00, 0x00, 0xe0, 0x7f, 0xe0, 0x07, 0x00,
-   0x00, 0x70, 0xe0, 0xe0, 0x05, 0x00, 0x00, 0x38, 0x80, 0xe1, 0x04, 0x00,
-   0x00, 0x18, 0x80, 0xf1, 0x04, 0x00, 0x00, 0x0c, 0x00, 0xfb, 0x04, 0x00,
-   0x00, 0x0c, 0x00, 0xff, 0x04, 0x00, 0x00, 0x86, 0x1f, 0xee, 0x04, 0x00,
-   0x00, 0x06, 0x06, 0xe6, 0x04, 0x00, 0x00, 0x06, 0x00, 0xe6, 0x04, 0x00,
-   0x00, 0x06, 0x00, 0xe6, 0x04, 0x00, 0x00, 0x06, 0x00, 0x66, 0x04, 0x00,
-   0x7f, 0x56, 0x52, 0x06, 0xe4, 0xff, 0x00, 0x76, 0x55, 0x06, 0x04, 0x00,
-   0x00, 0x56, 0x57, 0x06, 0x04, 0x00, 0x00, 0x56, 0x55, 0x06, 0x06, 0x00,
-   0x00, 0x56, 0xd5, 0x06, 0x03, 0x00, 0x00, 0x06, 0x00, 0x86, 0x01, 0x00,
-   0x54, 0x06, 0x00, 0xc6, 0x54, 0x55, 0xaa, 0x06, 0x00, 0x66, 0xaa, 0x2a,
-   0x54, 0x06, 0x00, 0x36, 0x55, 0x55, 0xaa, 0x06, 0x00, 0xbe, 0xaa, 0x2a,
-   0x54, 0xfe, 0xff, 0x6f, 0x55, 0x55, 0xaa, 0xfc, 0xff, 0xa7, 0xaa, 0x2a,
-   0x54, 0x01, 0x88, 0x60, 0x55, 0x55, 0xaa, 0xaa, 0x8a, 0xa0, 0xaa, 0x2a,
-   0x54, 0x55, 0x8d, 0x60, 0x55, 0x55, 0xaa, 0xaa, 0x8a, 0xa0, 0xaa, 0x2a,
-   0x54, 0x55, 0x8d, 0x60, 0x55, 0x55, 0xaa, 0xaa, 0x8a, 0xa0, 0xaa, 0x2a,
-   0x54, 0x55, 0x8d, 0x50, 0x55, 0x55, 0xaa, 0xaa, 0x8a, 0xa8, 0xaa, 0x2a,
-   0x54, 0x55, 0x95, 0x54, 0x55, 0x55, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x2a,
-   0x54, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/ext/tk/sample/images/gray25.xbm b/ext/tk/sample/images/gray25.xbm
deleted file mode 100644
index b234b3cb0b..0000000000
--- a/ext/tk/sample/images/gray25.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define grey_width 16
-#define grey_height 16
-static char grey_bits[] = {
-   0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44,
-   0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44,
-   0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44};
diff --git a/ext/tk/sample/images/grey.25 b/ext/tk/sample/images/grey.25
deleted file mode 100644
index b234b3cb0b..0000000000
--- a/ext/tk/sample/images/grey.25
+++ /dev/null
@@ -1,6 +0,0 @@
-#define grey_width 16
-#define grey_height 16
-static char grey_bits[] = {
-   0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44,
-   0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44,
-   0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44};
diff --git a/ext/tk/sample/images/grey.5 b/ext/tk/sample/images/grey.5
deleted file mode 100644
index 37688893f0..0000000000
--- a/ext/tk/sample/images/grey.5
+++ /dev/null
@@ -1,6 +0,0 @@
-#define grey_width 16
-#define grey_height 16
-static char grey_bits[] = {
-   0x55, 0x55, 0xaa, 0xaa, 0x55, 0x55, 0xaa, 0xaa, 0x55, 0x55, 0xaa, 0xaa,
-   0x55, 0x55, 0xaa, 0xaa, 0x55, 0x55, 0xaa, 0xaa, 0x55, 0x55, 0xaa, 0xaa,
-   0x55, 0x55, 0xaa, 0xaa, 0x55, 0x55, 0xaa, 0xaa};
diff --git a/ext/tk/sample/images/letters.xbm b/ext/tk/sample/images/letters.xbm
deleted file mode 100644
index 0f12568d1a..0000000000
--- a/ext/tk/sample/images/letters.xbm
+++ /dev/null
@@ -1,27 +0,0 @@
-#define letters_width 48
-#define letters_height 48
-static char letters_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0xfe, 0xff, 0xff, 0xff, 0x3f, 0x00, 0x02, 0x00, 0x00, 0x00, 0x20,
-   0x00, 0xfa, 0x00, 0x00, 0x00, 0x2e, 0x00, 0x02, 0x00, 0x00, 0x00, 0x2a,
-   0x00, 0x3a, 0x00, 0x00, 0x00, 0x2a, 0x00, 0x02, 0x00, 0x00, 0x00, 0x2e,
-   0xe0, 0xff, 0xff, 0xff, 0xff, 0x21, 0x20, 0x00, 0x00, 0x00, 0x00, 0x21,
-   0xa0, 0x03, 0x00, 0x00, 0x70, 0x21, 0x20, 0x00, 0x00, 0x00, 0x50, 0x21,
-   0xa0, 0x1f, 0x00, 0x00, 0x50, 0x21, 0x20, 0x00, 0x00, 0x00, 0x70, 0x21,
-   0xfe, 0xff, 0xff, 0xff, 0x0f, 0x21, 0x02, 0x00, 0x00, 0x00, 0x08, 0x21,
-   0xfa, 0x01, 0x00, 0x80, 0x0b, 0x21, 0x02, 0x00, 0x00, 0x80, 0x0a, 0x21,
-   0xba, 0x01, 0x00, 0x80, 0x0a, 0x21, 0x02, 0x00, 0x00, 0x80, 0x0b, 0x21,
-   0x3a, 0x00, 0x00, 0x00, 0x08, 0x21, 0x02, 0x00, 0x00, 0x00, 0x08, 0x21,
-   0x02, 0xc0, 0xfb, 0x03, 0x08, 0x21, 0x02, 0x00, 0x00, 0x00, 0x08, 0x3f,
-   0x02, 0xc0, 0xbd, 0x0f, 0x08, 0x01, 0x02, 0x00, 0x00, 0x00, 0x08, 0x01,
-   0x02, 0xc0, 0x7f, 0x7b, 0x08, 0x01, 0x02, 0x00, 0x00, 0x00, 0x08, 0x01,
-   0x02, 0x00, 0x00, 0x00, 0xf8, 0x01, 0x02, 0x00, 0x00, 0x00, 0x08, 0x00,
-   0x02, 0x00, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x00,
-   0x02, 0x00, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x00,
-   0xfe, 0xff, 0xff, 0xff, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/ext/tk/sample/images/noletter.xbm b/ext/tk/sample/images/noletter.xbm
deleted file mode 100644
index 5774124efe..0000000000
--- a/ext/tk/sample/images/noletter.xbm
+++ /dev/null
@@ -1,27 +0,0 @@
-#define noletters_width 48
-#define noletters_height 48
-static char noletters_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x1f, 0x00, 0x00,
-   0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x00, 0xc0, 0xff, 0xff, 0x07, 0x00,
-   0x00, 0xf0, 0x0f, 0xe0, 0x1f, 0x00, 0x00, 0xfc, 0x01, 0x00, 0x7f, 0x00,
-   0x00, 0x3e, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x1f, 0x00, 0x00, 0xf0, 0x01,
-   0x80, 0x07, 0x00, 0x00, 0xc0, 0x03, 0xc0, 0x03, 0x00, 0x00, 0xe0, 0x07,
-   0xe0, 0x01, 0x00, 0x00, 0xf0, 0x0f, 0xe0, 0x00, 0x00, 0x00, 0x78, 0x0e,
-   0xf0, 0x00, 0x00, 0x00, 0x3c, 0x1e, 0x70, 0x00, 0x00, 0x00, 0x1e, 0x1c,
-   0x38, 0x00, 0x00, 0x00, 0x0f, 0x38, 0x38, 0x00, 0x00, 0x80, 0x07, 0x38,
-   0x3c, 0xfc, 0xff, 0xff, 0x7f, 0x78, 0x1c, 0x04, 0x00, 0xe0, 0x41, 0x70,
-   0x1c, 0x04, 0x00, 0xf0, 0x40, 0x70, 0x1c, 0x74, 0x00, 0x78, 0x4e, 0x70,
-   0x0e, 0x04, 0x00, 0x3c, 0x4a, 0xe0, 0x0e, 0x74, 0x03, 0x1e, 0x4a, 0xe0,
-   0x0e, 0x04, 0x00, 0x0f, 0x4e, 0xe0, 0x0e, 0x04, 0x80, 0x07, 0x40, 0xe0,
-   0x0e, 0x04, 0xf8, 0x0f, 0x40, 0xe0, 0x0e, 0x04, 0xe0, 0x01, 0x40, 0xe0,
-   0x0e, 0x04, 0xf8, 0x00, 0x40, 0xe0, 0x0e, 0x04, 0x78, 0x00, 0x40, 0xe0,
-   0x0e, 0x04, 0xfc, 0xf3, 0x40, 0xe0, 0x1c, 0x04, 0x1e, 0x00, 0x40, 0x70,
-   0x1c, 0x04, 0x0f, 0x00, 0x40, 0x70, 0x1c, 0x84, 0x07, 0x00, 0x40, 0x70,
-   0x3c, 0xfc, 0xff, 0xff, 0x7f, 0x78, 0x38, 0xe0, 0x01, 0x00, 0x00, 0x38,
-   0x38, 0xf0, 0x00, 0x00, 0x00, 0x38, 0x70, 0x78, 0x00, 0x00, 0x00, 0x1c,
-   0xf0, 0x3c, 0x00, 0x00, 0x00, 0x1e, 0xe0, 0x1e, 0x00, 0x00, 0x00, 0x0e,
-   0xe0, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0xc0, 0x07, 0x00, 0x00, 0x80, 0x07,
-   0x80, 0x07, 0x00, 0x00, 0xc0, 0x03, 0x00, 0x1f, 0x00, 0x00, 0xf0, 0x01,
-   0x00, 0x3e, 0x00, 0x00, 0xf8, 0x00, 0x00, 0xfc, 0x01, 0x00, 0x7f, 0x00,
-   0x00, 0xf0, 0x0f, 0xe0, 0x1f, 0x00, 0x00, 0xc0, 0xff, 0xff, 0x07, 0x00,
-   0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0xf0, 0x1f, 0x00, 0x00};
diff --git a/ext/tk/sample/images/pattern.xbm b/ext/tk/sample/images/pattern.xbm
deleted file mode 100644
index df31baf789..0000000000
--- a/ext/tk/sample/images/pattern.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define foo_width 16
-#define foo_height 16
-static char foo_bits[] = {
-   0x60, 0x06, 0x90, 0x09, 0x90, 0x09, 0xb0, 0x0d, 0x4e, 0x72, 0x49, 0x92,
-   0x71, 0x8e, 0x8e, 0x71, 0x8e, 0x71, 0x71, 0x8e, 0x49, 0x92, 0x4e, 0x72,
-   0xb0, 0x0d, 0x90, 0x09, 0x90, 0x09, 0x60, 0x06};
diff --git a/ext/tk/sample/images/tcllogo.gif b/ext/tk/sample/images/tcllogo.gif
deleted file mode 100644
index 4603d4ff41..0000000000
--- a/ext/tk/sample/images/tcllogo.gif
+++ /dev/null
diff --git a/ext/tk/sample/images/teapot.ppm b/ext/tk/sample/images/teapot.ppm
deleted file mode 100644
index b8ab85f3a5..0000000000
--- a/ext/tk/sample/images/teapot.ppm
+++ /dev/null
@@ -1,31 +0,0 @@
-P6
-256 256
-255
-\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�[7 eOLjQLmSMoTMnSMlRMhPL_9 \�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�nSMtVMzYN~[N~[N\N\O�\O�]O�]O�]O�]O�\O�\O}[NyYNtVM\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�G-wXN}[N�]O�^O�_O�`O�`O�`O�`O�aO�aO�aO�aO�aO�aO�aO�aO�`O�_O�^O\N\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�aMLyYN�_O�aP�bP�cP�cP�dP�dP�dP�dP�dP�dP�dP�dP�dP�eP�eP�eP�eP�eP�dP�cP�_OpUM\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�wXN�_O�dP�fP�gQ�hQ�hQ�iQ�iQ�iQ�iQ�iQ�jQ�jQ�jQ�jQ�jQ�jQ�jQ�jQ�jQ�jQ�iQ�fP�`O\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�NCJiQL�bP�hQ�kQ�mR�nR�oR�oR�oR�oR�oR�oR�oR�oR�pR�pS�qS�qS�rS�rS�rS�qS�oR�jQ�]O\KK\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�fOLrUM�cP�lR�qS�tS�uT�wT�xT�xT�yT�yT�zT�zU�zU�zU�zU�zU�yT�xT�wT�tS�mR�aOhPL\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�a0	cNLqUM�\O�fQ�pS�wV�zV�|V�}V�V�VǀVɂW̅[Տe�w���ꪅĈg�qT�fQ{ZNYIK9\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�O1{G#�JkRMqUMtVN�iS�v\��d��b�zZ�vU�uT�sS�qS�nR�jQ�eP�^OrUM�Hh>!T4\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�G-V5wE"~I#�M%�U+�e7�l:�g2�b*�a(�`(�^(�])�^-�]1�S,qC$`9 R3G-\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�@)J/i>!pA"tD"wF$yH&xH&tE$wE#yG%}M+�T4S5mE*Z7!K/B*;'\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\��aO�oR�{UǀVυX<(F-a: e<!h>!j@#k@$h>"d<!c=$hD-fF2[<)K0@);'5$˂VǀV�|U_LKYIK\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\��_O�xTɂW����֒k�|X�>�f-�^(�Z'�W&�T&�N>)F-J/b; g>#nD(jB&c<!b=%jH2_A/I0!<(8&5$�J�Y�S%8&;'?)E,<:HA=HE?IJAISFJYIKXIK\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\��nR�}Uܘqʊe�vU�e,�V&�V�C
�@|>y<u:r9o7l6
-j5
-h4
-g3
-5$D,K/b; h>"wM1tK.e="a<#cA,U8&E-<(9&.!a0	b1	c1	



	
	
	

-
-+3#@)46G<:HMCIXHK\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�U*�vT�~X�{Y�k+�W&�N$|>u:p8k5
-f3
-a0	_/	].	[-	�I�\*�_(�LkRMmSMmSMnSMnSMD,R3W5mA"|O0|P1j?"c<!a=%Y7"N1F,;'NCJNCJNDJODJODJODJh>!a: X/K%
-g3
-a0	Z-	\/T*Q(�H�m8kRMmSMnTMoTMpTMpUM15G15G05G04G04GpUMpTM5^9 d<!yF#�O+�N,rC#qB"pB#k?"a: Z7 6ODJPDJPEJQEJQEJREJREJREJRFJSFJSFJSFJSFJe<!X/
-^/	V+Q(L&I$r9�TlRMnSM46G47G47G46G46G46G46G46G36G36G25G25G15G04G/4F.3F
-
-�X&pUMuWMwXNxXN<:H<:H<:H<:H<;H<;H<;H<;H=;H=;H=;H=;H>;H>;H?<H@<HA=HC>HG@ILBIREJ[JKcNLjQL�pR�uT�zU�~VȁW˂X֎c�sҎe�{V�vT�pS�kR�gQ�bP�_O�^O�]O�\O�\O�\O�\O�]O�]O�]O�]O�]O�]O�]O�]O�]O�]O�]O�\O�\O~\N}[N|ZNxXN�T%H$
-�W&rVMvWNyYNzYN|ZN}[N}[N><H?<H?<H?<H?<H?<H@<H@<H@<HA=HA=HB=HC>HE?IG@IIAIKBIODJSFJWHK�hQ�lR�pR�b(�i*�n+�|7�|6�r,�q+�p-�l+�g)�b(�sS�pS�lR�iQ�gQ�eP�cP�aP�aO�`O�`O�_O�_O�_O�_O�_O�_O�_O�_O�_O�_O�^O�^O�^O�^O�]O�]O�\O~[N{ZN�T%
-
-	
-@%<-$G?@�pfdNLuWM\NdNL\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�TFJvWN�aP./01�E}[N�]O�_O�`O�aP�bP�bP�cP�cP�cP�dP�dP�dP�eP�eP�eP�eP�fP�fQ�fQ�gQ�gQ�gQ�hQ�hQ�hQ�iQ�iQ�jQ�jQ�kQ�kR�lR�lR�Y&�\'�^'�^�b�c�e�i �g�c�b�a�`�^�]�X�['�Z'�Y&�mR�mR�mR�lR�lR�lR�kR�kQ�kQ�jQ�jQ�jQ�iQ�iQ�iQ�iQ�hQ�hQ�hQ�hQ�gQ�gQ�gQ�gQ�gQ�fQ�fQ�fQ�fP�eP�eP�dP�cP�aP�O
- B\�\�\�\�\�\�\�\�\�\�%7!!C*F#P){dY�ze��p�\OgPL\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�SFJ`LKvWN�aPm6
-

-$5 �`(�e)�nR�jQ�^OJAI\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�XIK^KKdNLhPLuWM�]O�bP�fQ�eP

m6
-�`O�cP�fQ�hQ�hQ�iQ�iQ�jQ�jQ�jQ�jQ�jQ�jQ�jQ�kQ�kQ�kQ�kR�kR�kR�kR�lR�lR�lR�lR�lR�lR�lR�mR�mR�mR�mR�g)�c(�c(�b(�V�c�e�i!�i!�d�b�`�`�_�_�^�Q�]'�_(�`(�f)�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�mR�mR�mR�mR�mR�mR�mR�mR�mR�nR�mR�mR�nR�mR�mR�mR�mR�kR�hQ�Ga0	�bP�mR�jQ�fQ�aP}[NrUMmSM�L$\�\�\�\�\�\�\�\� B B
#C, 8&H.Z7 �pR�jQ{ZN\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�QEJ[JK`LKdNLhQLqUM{ZN�_O�cP�gQ�hQ
-�bP�eP�hQ�iQ�jQ�jQ�kQ�kQ�kR�kR�kR�lR�lR�lR�lR�lR�lR�lR�lR�lR�lR�mR�mR�mR�mR�mR�mR�mR�mR�mR�nR�nR�j*�g)�e)�d)�d�X�g�h�e�c�b�b�b�U�`(�a(�a(�c(�i*�oR�oR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�oR�oR�oR�oR�oR�oR�oR�oR�oR�oR�oR�oR�nR�mR�jQ�Q%Z-	�jQ�nR�lR�hQ�dP�_OuWMpTMnSMkRLa: \�\�\�\�\�\�\� B B&D2
@*S6#G@IPDJ�hQmSM\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�VGJ]KKbMLeOLiQLlRMvWN\O�aO�eP�hQ�jQ�gQ
-!C+E'0F.4F7%8%U/lG.SFJZIK]KKZIKB=H\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�REJZJK`LKdNLgPLjQLlRMnSMpTMqUMtWMxXN{ZN~[N�]O�^O�`O�aO�bP�dP�gQ�iQ�kQ�lR�nR�pS�rS�sS�tT�uT�vT�wT�xT�yT�yT�yT�yT�yT�xT�vT�rS�nR�hQ�|U�|U�|U�|U�|U�|U�|U�|U�|U�|U�|U�|U�|U�|U�}U�}U�}U�}U�}U�}U�}U�~U�~U�~V�~V�VŀWƁX�a(�lR�rS�vT�yT�zU�|U�~V�XƂ[Ɇ_΋dӑjԓmԓnБlʌhĆd��_�{[�vW�sU�pS�nR�kR�iQ�hQ�gQ�fQ�eP�dP�bP�aO�_O�^O�\O|ZNxXNsVMpTMnTMmSMjQL�C B)D&/F-3F47G6%>"Y7 kA$YIK]KK^KKSFJ\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�VGJ\KKbMLeOLhPLkRLmSMnTMpTMrUMuWNyYN|ZN\N�]O�_O�`O�aP�bP�cP�eP�fP�hQ�jQ�lR�nR�oS�qT�sT�uU�vU�wV�xV�yV�yU�zU�zU�{U�{U�{U�|U�|U�|U�|U�|U�{U�{U�{U�zU�zT�yT�yT�xT�wT�vT�vT�vT�vT�wT�wT�wT�xT�yT�zT�zU�{U�{U�|U�|U�}U�VŀWǂYɄ\͈_ьdٔl�u�|쩂ſt명榁ޟ{՗sˎl†d�^�yZ�uW�qU�oS�lR�kR�jQ�iQ�hQ�gQ�fQ�eP�dP�cP�aP�`O�^O�]O}[NyYNuWMpTMoTMmSMkRLgPL&D#.E,3F46G;'<(D"iB(VGJ]KK`LK[JKB>H\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�NCJYIK^LKcNLfOLiQLkRMmSMoTMqUMsVMvXNzYN}[N�\O�^O�_O�`O�aP�cP�dP�eP�fQ�gQ�hQ�iQ�kR�mS�oT�rU�tW�wY�zZ�}\�]��^��^��^‚^\��Z�Y�X�~W�~W�~V�~V�~V�~V�~U�~U�~U�~U�U�U�V�V�V�V�VƀVƀVǀWǁWȂXɃZ˅[͇^ЊaӍdؒiܗn�t�z�����������������驅�~֘vˏmÇf��`�z[�vX�rU�pT�oS�nS�lR�kR�kR�jQ�iQ�hQ�fQ�eP�dP�cP�bP�`O�_O�]O~[NzYNvWNpTMoTMnSMkRMhQLo7,2F36G99HC+@ ]8 nA"\JK`ML_LKSFJ\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�SFJ[JK`LKdNLgPLjQLlRMnSMpTMqUMtVMwXNzZN}[N�]O�^O�_O�aO�bP�cP�dP�eP�fQ�gQ�hQ�iQ�jR�lR�mS�oU�rW�vZ�{]��a��fŊjˏnГqӕsՖsՖrՖqՔoӒmяjύg͊cˈaɆ^Ȅ\ǂ[ƁYŀXŀW�W�W�V�V�WŀWƀWǁXȂYɃ[ʅ\͇_ϊaҍeՑhٕmݙq�v�z�}꧀멃몄騃奀ߠ|ٛwӕȑmƉh��c�~^�yZ�vX�tW�sV�qU�pT�oS�nS�mR�lR�kR�jQ�iQ�hQ�gQ�fP�eP�cP�bP�aO�_O�^O\N{ZNwXNsVMoTMnSMlRMiQL~I#26G99G?<HA*E$	i@$ZIKaMLbML[JK;:H\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�WHJ]KKbMLeOLhPLjRLlSMnTMpTMrUMuWMxXN{ZN~\N�]O�^O�`O�aO�bP�cP�dP�eP�fQ�gQ�hQ�iQ�kR�lS�mT�oU�rW�uZ�y]�~a��fŠl˒sԚzܡ�㧆諉뮋������묈訄�~ߞyڙt֕oҐjΌfˈbȅ_ƃ\ŁZĀY�X�W�~W�~W�~W�XÀXĀYŁZƃ\Dž^Ɇ`ˈb̊d͋f΍gΎiΎjΎj͎jˌiljgÆd��a�^�}]�|\�{[�yZ�xY�vX�tW�sV�qU�pT�oS�nS�mR�lR�kR�jQ�iQ�hQ�gQ�fP�eP�dP�bP�aO�_O�^O�\O|ZNxXNtVMpTMnSMmSMjQLgPL99G?<HG-E&b;!YIK`MLdOM`LKNCJ\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\��lR�yT�~UʂXʃY�X�{W�tU�W'�[(�hQ�lR�cP�\OhQL\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�NCJYIK^LKcNLfOLiQLkRLmSMoTMqUMrVMvWNyYN|ZN\N�]O�_O�`O�aP�bP�cP�dP�fP�gQ�hQ�iQ�jR�kR�lS�nT�pU�sW�vZ�z]�b��gŠlɑsИy؞ޤ�㩊譍챐ﳑﳑ뭊穅⣀ݞzؘtғn΍iɉdƅ`Â]��[�~Y�}X�|W�|V�{V�{V�{V�{V�{V�|W�|W�}X�}Y�~Z�~Z�~Z�}[�}[�}[�~\�~\�~]�~]�~]�~]�}]�|\�z[�yZ�wY�vX�tW�sV�rU�pT�oS�nS�mR�lR�kR�jQ�iQ�hQ�gQ�fQ�eP�dP�cP�aP�`O�^O�]O}[NyYNuWNpTMnTMmSMkRLhPL|H$D>IQ2P+XHK_LLfQOcNLXIK\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\��qS�yT�~VΈ`遲ޜv��]�qS�L�G|>g3
-S)?*%.�hQ�hQ�eP�`OuWM\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�SFJ[JK`LKdNLgPLjQLlRMnSMoTMqUMsVMwXNzYN}[N�\O�^O�_O�`O�aP�bP�dP�eP�fP�gQ�hQ�iQ�jR�kR�lS�nT�pV�sX�vZ�z^�b��gËmʒsјz؟�ޤ�㩊譍ꯏ및ꯎ謋娇ं۞|֙wѓq̎lljgÅb��_�\�}Z�{X�zW�yV�yU�xU�xU�xT�xT�xU�xU�xU�yV�yV�yW�zW�{X�{Y�|Z�}[�}[�}\�~\�~]�~]�}]�|\�{\�z[�yZ�wY�vX�tW�sV�rU�pT�oS�nS�mR�lR�kR�jQ�iQ�hQ�gQ�fQ�eP�dP�cP�bP�`O�_O�]O~[NzZNvWNrUMoTMmSMlRMiQLeOLJAIJ(h>!]KKfQOgQN_LKD>I\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\��iQ�tS�yT�{U�YΌeרּ���՗u�|\�Z'�L�D
|>
-
-
&3#.$-% .% .& /&!,#,#@70A71XNHXNHWNHWNHZRLYQLYQLXQLWQLWPLUOLSNLQMKOLJMJJ0//.-.,,-&(+"(!'			
-%' %$#" ! !$


						



diff --git a/ext/tk/sample/irbtk.rb b/ext/tk/sample/irbtk.rb
deleted file mode 100644
index 8665b20539..0000000000
--- a/ext/tk/sample/irbtk.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/local/bin/ruby
-# frozen_string_literal: false
-#
-#   irbtk.rb - irb with Ruby/Tk
-#
-#   If you want to use 'multi-tk.rb', give option '--multi-tk'.
-#   And if you want to use 'remote-tk.rb', give option '--remote-tk'.
-#   If you want both, you don't need to give both options, because
-#   'remote-tk.rb' includes 'multi-tk.rb'.
-#   ( There is no trouble even if you give both options. )
-#
-require 'remote-tk' if ARGV.delete('--remote-tk')
-require 'multi-tk'  if ARGV.delete('--multi-tk')
-
-require "tk"
-module Tk
-  MAINLOOP = Thread.new{ mainloop }
-end
-
-require "irb"
-
-if __FILE__ == $0
-  IRB.start(__FILE__)
-else
-  # check -e option
-  if /^-e$/ =~ $0
-    IRB.start(__FILE__)
-  else
-    IRB.setup(__FILE__)
-  end
-end
diff --git a/ext/tk/sample/irbtkw.rbw b/ext/tk/sample/irbtkw.rbw
deleted file mode 100644
index b75ebca48d..0000000000
--- a/ext/tk/sample/irbtkw.rbw
+++ /dev/null
@@ -1,156 +0,0 @@
-#!/usr/bin/env ruby
-#
-#  irbtkw.rb : IRB console with Ruby/Tk
-#
-#                                 by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-release = '2008/03/08'
-
-require 'tk'
-begin
-  require 'tktextio'
-rescue LoadError
-  require File.join(File.dirname(File.expand_path(__FILE__)), 'tktextio.rb')
-end
-
-require 'irb'
-
-if TkCore::WITH_ENCODING
-else
-  # $KCODE setup
-  case Tk.encoding
-  when 'shiftjis', 'cp932'
-    $KCODE='SJIS'
-  when 'euc-jp'
-    $KCODE='EUC'
-  when 'utf-8', 'unicode'
-    $KCODE='UTF8'
-  else
-    # unknown
-  end
-end
-
-# console setup
-top = TkToplevel.new(:title=>'IRB console')
-top.protocol(:WM_DELETE_WINDOW){ Tk.exit }
-
-case (Tk.windowingsystem)
-when 'win32'
-  fnt = ['MS Gothic', '-12']
-else
-  fnt = ['courier', '-12']
-end
-
-console = TkTextIO.new(top, :mode=>:console,
-                       :width=>80).pack(:side=>:left,
-                                        :expand=>true, :fill=>:both)
-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
-}
-
-# window position control
-root = Tk.root
-
-r_x = root.winfo_rootx
-r_y = root.winfo_rooty
-r_w = root.winfo_width
-
-t_x = top.winfo_rootx
-t_y = top.winfo_rooty
-t_w = top.winfo_width
-
-delta = 10
-
-ratio = 0.8
-s_w = (ratio * root.winfo_screenwidth).to_i
-
-if r_x < t_x
-  r_x, t_x = t_x, r_x
-end
-if t_x + t_w + r_w + delta < s_w
-  r_x = t_x + t_w + delta
-elsif t_w + r_w + delta < s_w
-  r_x = s_w - r_w
-  t_x = r_x - t_w
-else
-  r_x = s_w - r_w
-  t_x = 0
-end
-
-root.geometry("+#{r_x}+#{r_y}")
-top.geometry("+#{t_x}+#{t_y}")
-
-root.raise
-console.focus
-
-# I/O setup
-$stdin  = console
-$stdout = console
-$stderr = console
-
-# dummy for rubyw.exe on Windows
-def STDIN.tty?
-  true
-end
-
-# IRB setup
-IRB.init_config(nil)
-IRB.conf[:USE_READLINE] = false
-IRB.init_error
-irb = IRB::Irb.new
-IRB.conf[:MAIN_CONTEXT] = irb.context
-
-class IRB::StdioInputMethod
-  def gets
-    prompt = "\n" << @prompt
-    $stdin.instance_eval{
-      flush
-      @prompt = prompt
-      _set_console_line
-      @prompt = nil
-      _see_pos
-    }
-
-    @line[@line_no += 1] = $stdin.gets
-  end
-end
-
-# IRB start
-$stdout.print("*** IRB console on Ruby/Tk (#{release})  ")
-irb_thread = Thread.new{
-  catch(:IRB_EXIT){
-    loop {
-      begin
-        irb.eval_input
-      rescue Exception
-      end
-    }
-  }
-}
-
-console.bind('Control-c'){
-  console.insert('end', "^C\n")
-  irb_thread.raise RubyLex::TerminateLineInput
-}
-
-irb_thread.join
-
-# exit
-ev_loop.kill
-Tk.exit
diff --git a/ext/tk/sample/iso2022-kr.txt b/ext/tk/sample/iso2022-kr.txt
deleted file mode 100644
index 2e3fe6ea2a..0000000000
--- a/ext/tk/sample/iso2022-kr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Sample text:
-$)C  Hangul (GQ1[)	>H3gGO<<?d, >H3gGO=J4O1n
diff --git a/ext/tk/sample/menubar1.rb b/ext/tk/sample/menubar1.rb
deleted file mode 100644
index a468fb6ea4..0000000000
--- a/ext/tk/sample/menubar1.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-# frozen_string_literal: false
-#
-# menubar sample 1 : use frame and menubuttons
-#
-
-require 'tk'
-
-radio_var = TkVariable.new('y')
-
-menu_spec = [
-  [['File', 0],
-    {:label=>'Open', :command=>proc{puts('Open clicked')}, :underline=>0},
-    '---',
-    ['Check_A', TkVariable.new(true), 6],
-    {:type=>'checkbutton', :label=>'Check_B',
-                :variable=>TkVariable.new, :underline=>6},
-    '---',
-    ['Radio_X', [radio_var, 'x'], 6, '', {:foreground=>'black'}],
-    ['Radio_Y', [radio_var, 'y'], 6],
-    ['Radio_Z', [radio_var, 'z'], 6],
-    '---',
-    ['cascade', [
-                   ['sss', proc{p 'sss'}, 0],
-                   ['ttt', proc{p 'ttt'}, 0],
-                   ['uuu', proc{p 'uuu'}, 0],
-                   ['vvv', proc{p 'vvv'}, 0],
-                ],
-      0, '',
-      {:font=>'Courier 16 italic',
-       :menu_config=>{:font=>'Times -18 bold', :foreground=>'black'}}],
-    '---',
-    ['Quit', proc{exit}, 0]],
-
-  [['Edit', 0],
-    ['Cut', proc{puts('Cut clicked')}, 2],
-    ['Copy', proc{puts('Copy clicked')}, 0],
-    ['Paste', proc{puts('Paste clicked')}, 0]],
-
-  [['Help', 0, {:menu_name=>'help'}],
-    ['About This', proc{puts('Ruby/Tk menubar sample 1')}, 6]]
-]
-
-menubar = TkMenubar.new(nil, menu_spec,
-                       'tearoff'=>false,
-                       'foreground'=>'grey40',
-                       'activeforeground'=>'red',
-                       'font'=>'Helvetica 12 bold')
-menubar.pack('side'=>'top', 'fill'=>'x')
-
-TkText.new(:wrap=>'word').pack.insert('1.0', 'Please read the sample source, and check how to override default configure options of menu entries on a menu_spec. Maybe, on windows, this menubar does not work properly about keyboard shortcuts. Then, please use "menu" option of root/toplevel widget (see sample/menubar2.rb).')
-
-Tk.mainloop
diff --git a/ext/tk/sample/menubar2.rb b/ext/tk/sample/menubar2.rb
deleted file mode 100644
index e10a282f93..0000000000
--- a/ext/tk/sample/menubar2.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-# frozen_string_literal: false
-#
-# menubar sample 2 : use 'menu' option of root/toplevel widget
-#
-
-require 'tk'
-
-radio_var = TkVariable.new('y')
-
-menu_spec = [
-  [['File', 0],
-    {:label=>'Open', :command=>proc{puts('Open clicked')}, :underline=>0},
-    '---',
-    ['Check_A', TkVariable.new(true), 6],
-    {:type=>'checkbutton', :label=>'Check_B',
-                :variable=>TkVariable.new, :underline=>6},
-    '---',
-    ['Radio_X', [radio_var, 'x'], 6, '', {:foreground=>'black'}],
-    ['Radio_Y', [radio_var, 'y'], 6],
-    ['Radio_Z', [radio_var, 'z'], 6],
-    '---',
-    ['cascade', [
-                   ['sss', proc{p 'sss'}, 0],
-                   ['ttt', proc{p 'ttt'}, 0],
-                   ['uuu', proc{p 'uuu'}, 0],
-                   ['vvv', proc{p 'vvv'}, 0],
-                ],
-      0, '',
-      {:font=>'Courier 16 italic',
-       :menu_config=>{:font=>'Times -18 bold', :foreground=>'black'}}],
-    '---',
-    ['Quit', proc{exit}, 0]],
-
-  [['Edit', 0],
-    ['Cut', proc{puts('Cut clicked')}, 2],
-    ['Copy', proc{puts('Copy clicked')}, 0],
-    ['Paste', proc{puts('Paste clicked')}, 0]],
-
-  [['Help', 0, {:menu_name=>'help'}],
-    ['About This', proc{puts('Ruby/Tk menubar sample 2')}, 6]]
-]
-
-mbar = Tk.root.add_menubar(menu_spec,
-                           # followings are default configure options
-                           'tearoff'=>'false',
-                           'foreground'=>'grey40',
-                           'activeforeground'=>'red',
-                           'font'=>'Helvetica 12 bold')
-# This (default configure options) is NOT same the following.
-#
-#  mbar = Tk.root.add_menubar(menu_spec)
-#  mbar.configure('foreground'=>'grey40', 'activeforeground'=>'red',
-#                 'font'=>'Helvetica 12 bold')
-
-TkText.new(:wrap=>'word').pack.insert('1.0', 'Please read the sample source, and check how to override default configure options of menu entries on a menu_spec.')
-
-Tk.mainloop
diff --git a/ext/tk/sample/menubar3.rb b/ext/tk/sample/menubar3.rb
deleted file mode 100644
index 740f9d3b5e..0000000000
--- a/ext/tk/sample/menubar3.rb
+++ /dev/null
@@ -1,73 +0,0 @@
-# frozen_string_literal: false
-#
-# menubar sample 3 : vertical layout menubar; use frame and menubuttons
-#
-
-require 'tk'
-
-radio_var = TkVariable.new('y')
-
-menu_spec = [
-  [['&File', true], # when underline option is true, '&' index is the position
-    {:label=>'Open', :command=>proc{puts('Open clicked')}, :underline=>0},
-    '---',
-    ['Check_A', TkVariable.new(true), 6],
-    {:type=>'checkbutton', :label=>'Check_B',
-                :variable=>TkVariable.new, :underline=>6},
-    '---',
-    ['Radio_X', [radio_var, 'x'], /[XYZ]/, '', {:foreground=>'black'}],
-    ['Radio_Y', [radio_var, 'y'], /[XYZ]/],
-    ['Radio_Z', [radio_var, 'z'], /[XYZ]/], # use Regexp for underline position
-    '---',
-    ['cascade', [
-                   ['sss', proc{p 'sss'}, 0],
-                   ['ttt', proc{p 'ttt'}, 0],
-                   ['uuu', proc{p 'uuu'}, 0],
-                   ['vvv', proc{p 'vvv'}, 0],
-                ],
-      0, '',
-      {:font=>'Courier 16 italic',
-       :menu_config=>{:font=>'Times -18 bold', :foreground=>'black'}}],
-    '---',
-    ['Quit', proc{exit}, 0]],
-
-  [['Edit', 0],
-    ['Cut', proc{puts('Cut clicked')}, 2],
-    ['Copy', proc{puts('Copy clicked')}, 0],
-    ['Paste', proc{puts('Paste clicked')}, 0]],
-
-  [['Help', 0, {:menu_name=>'help'}],
-    ['About This', proc{puts('Ruby/Tk menubar sample 3')}, "This"]]
-                                      # use string index for underline position
-]
-
-layout_proc = 'vertical'
-# The following procedure is same to 'layout_proc'=>'vertical'
-=begin
-layout_proc = proc{|parent, mbtn|
-  mbtn.direction :right
-  mbtn.pack(:side=>:top, :fill=>:x)
-
-  menu = mbtn.menu
-  cmd = proc{|m, dir|
-    Tk::Menu::TkInternalFunction.next_menu(m, dir) rescue nil
-    # ignore error when the internal function doesn't exist
-  }
-  menu.bind('Tab', cmd, :widget, 'forward')
-  menu.bind('Alt-Tab', cmd, :widget, 'backward')
-}
-=end
-
-menubar = TkMenubar.new(nil, menu_spec,
-                        'layout_proc'=>layout_proc,
-                        'tearoff'=>false,
-                        'foreground'=>'grey40',
-                        'activeforeground'=>'red',
-                        'font'=>'Helvetica 12 bold')
-menubar.pack('side'=>'left', 'fill'=>'y')
-
-TkText.new(:wrap=>'word').pack.insert('1.0', 'This sample script generates "Menu Sidebar".
-If "::tk::MenuNextMenuon" function is available  your Tcl/Tk library, you will be able to move to the next menu by Tab key on the posted menu, or the previous menu by Alt + Tab key.
-Please read the sample source, and check how to override default configure options of menu entries on a menu_spec. Maybe, on windows, this menubar does not work properly about keyboard shortcuts. Then, please use "menu" option of root/toplevel widget (see sample/menubar3.rb).')
-
-Tk.mainloop
diff --git a/ext/tk/sample/msgs_rb/README b/ext/tk/sample/msgs_rb/README
deleted file mode 100644
index 781dda93ef..0000000000
--- a/ext/tk/sample/msgs_rb/README
+++ /dev/null
@@ -1,3 +0,0 @@
-Message catalogs in this directory depend on Tcl/Tk's message catalogs.
-Texts of each locale are copied from Tcl/Tk8.5a1 widget demos.
-Please refer to '../msgs_tk/README'.
diff --git a/ext/tk/sample/msgs_rb/cs.msg b/ext/tk/sample/msgs_rb/cs.msg
deleted file mode 100644
index 199f2a73bd..0000000000
--- a/ext/tk/sample/msgs_rb/cs.msg
+++ /dev/null
@@ -1,84 +0,0 @@
-TkMsgCatalog.new('::tkmsgcat_demo') {
-    cs "Application Error", "Chyba programu"
-    cs "Blue", "Modr\341"
-    cs "Color", "Barva"
-    cs "Delete", "Smazat"
-    cs "Error", "Chyba"
-    cs "Exit", "Konec"
-    cs "Green", "Zelen\341"
-    cs "Red", "\\u010cerven\341"
-    cs "blue", "modr\341"
-    cs "green", "zelen\341"
-    cs "red", "\\u010derven\341"
-}
-
-TkMsgCatalog.new('::tk') {
-    cs "&Abort", "&P\\u0159eru\\u0161it"
-    cs "About...", "O programu..."
-    cs "All Files", "V\\u0161echny soubory"
-    cs "Application Error", "Chyba programu"
-    cs "&Blue", "&Modr\341"
-    cs "&Cancel", "&Zru\\u0161it"
-    cs "Cannot change to the directory \"%1\$s\".\nPermission denied.", "Nemohu zm\\u011bnit atku\341ln\355 adres\341\\u0159 na \"%1\$s\".\nP\\u0159\355stup odm\355tnut."
-    cs "Choose Directory", "V\375b\\u011br adres\341\\u0159e"
-    cs "Clear", "Smazat"
-    cs "Color", "Barva"
-    cs "Console", "Konzole"
-    cs "Copy", "Kop\355rovat"
-    cs "Cut", "Vy\\u0159\355znout"
-    cs "Delete", "Smazat"
-    cs "Details >>", "Detaily >>"
-    cs "Directory \"%1\$s\" does not exist.", "Adres\341\\u0159 \"%1\$s\" neexistuje."
-    cs "&Directory:", "&Adres\341\\u0159:"
-    cs "Error: %1\$s", "Chyba: %1\$s"
-    cs "Exit", "Konec"
-    cs "File \"%1\$s\" already exists.\n\n", "Soubor \"%1\$s\" ji\\u017e existuje.\n\n"
-    cs "File \"%1\$s\" already exists.\nDo you want to overwrite it?", "Soubor \"%1\$s\" ji\\u017e existuje.\nChcete jej p\\u0159epsat?"
-    cs "File \"%1\$s\" does not exist.", "Soubor \"%1\$s\" neexistuje."
-    cs "File &name:", "&Jm\351no souboru:"
-    cs "File &names:", "&Jm\351na soubor\\u016f:"
-    cs "Files of &type:", "&Typy soubor\\u016f:"
-    cs "Fi&les:", "Sou&bory:"
-    cs "&Filter", "&Filtr"
-    cs "Fil&ter:", "Fil&tr:"
-    cs "&Green", "Ze&len\341"
-    cs "Hi"
-    cs "Hide Console", "Skr\375t konsolu"
-    cs "&Ignore", "&Ignorovat"
-    cs "Invalid file name \"%1\$s\".", "\\u0160patn\351 jm\351no souboru \"%1\$s\"."
-    cs "Log Files", "Log soubory"
-    cs "&No", "&Ne"
-    cs "&OK"
-    cs "Ok"
-    cs "Open", "Otev\\u0159\355t"
-    cs "&Open", "&Otev\\u0159\355t"
-    cs "Open Multiple Files", "Otev\\u0159\355t v\355ce soubor\\u016f"
-    cs "Paste", "Vlo\\u017eit"
-    cs "Quit", "Skon\\u010dit"
-    cs "&Red", " \\u010ce&rven\341"
-    cs "Replace existing file?", "Nahradit st\341vaj\355c\355 soubor?"
-    cs "&Retry", "Z&novu"
-    cs "&Save", "&Ulo\\u017eit"
-    cs "Save As", "Ulo\\u017eit jako"
-    cs "Save To Log", "Ulo\\u017eit do logu"
-    cs "Select Log File", "Vybrat log soubor"
-    cs "Select a file to source", "Vybrat soubor k nahr\341n\355"
-    cs "&Selection:", "&V\375b\\u011br:"
-    cs "Skip Messages", "P\\u0159esko\\u010dit zpr\341vy"
-    cs "Source...", "Nahr\341t..."
-    cs "Tcl Scripts", "Tcl skripty"
-    cs "Tcl for Windows", "Tcl pro Windows"
-    cs "Text Files", "Textov\351 soubory"
-    cs "&Yes", "&Ano"
-    cs "abort", "p\\u0159eru\\u0161it"
-    cs "blue", "modr\341"
-    cs "cancel", "zru\\u0161it"
-    cs "extension", "p\\u0159\355pona"
-    cs "extensions", "p\\u0159\355pony"
-    cs "green", "zelen\341"
-    cs "ignore", "ignorovat"
-    cs "ok"
-    cs "red", "\\u010derven\341"
-    cs "retry", "znovu"
-    cs "yes", "ano"
-}
diff --git a/ext/tk/sample/msgs_rb/de.msg b/ext/tk/sample/msgs_rb/de.msg
deleted file mode 100644
index 283874df42..0000000000
--- a/ext/tk/sample/msgs_rb/de.msg
+++ /dev/null
@@ -1,88 +0,0 @@
-TkMsgCatalog.new('::tkmsgcat_demo') {
-    de "Application Error", "Applikationsfehler"
-    de "Blue", "Blau"
-    de "Color", "Farbe"
-    de "Delete", "L\\u00f6schen"
-    de "Error", "Fehler"
-    de "Exit", "Ende"
-    de "Green", "Gr\\u00fcn"
-    de "Red", "Rot"
-    de "blue", "blau"
-    de "green", "gr\\u00fcn"
-    de "red", "rot"
-}
-
-TkMsgCatalog.new('::tk') {
-    de "&Abort", "&Abbruch"
-    de "&About...", "&\\u00dcber..."
-    de "All Files", "Alle Dateien"
-    de "Application Error", "Applikationsfehler"
-    de "&Blue", "&Blau"
-    de "&Cancel", "&Abbruch"
-    de "Cannot change to the directory \"%1\$s\".\nPermission denied.", "Kann nicht in das Verzeichnis \"%1\$s\" wechseln.\nKeine Rechte vorhanden."
-    de "Choose Directory", "W\\u00e4hle Verzeichnis"
-    de "&Clear", "&R\\u00fccksetzen"
-    de "&Clear Console", "&Konsole l\\u00f6schen"
-    de "Color", "Farbe"
-    de "Console", "Konsole"
-    de "&Copy", "&Kopieren"
-    de "Cu&t", "Aus&schneiden"
-    de "&Delete", "&L\\u00f6schen"
-    de "Details >>"
-    de "Directory \"%1\$s\" does not exist.", "Das Verzeichnis \"%1\$s\" existiert nicht."
-    de "&Directory:", "&Verzeichnis:"
-    de "&Edit", "&Bearbieten"
-    de "Error: %1\$s", "Fehler: %1\$s"
-    de "E&xit", "&Ende"
-    de "&File", "&Datei"
-    de "File \"%1\$s\" already exists.\nDo you want to overwrite it?", "Die Datei \"%1\$s\" ist bereits vorhanden.\nWollen sie diese Datei \\u00fcberschreiben ?"
-    de "File \"%1\$s\" already exists.\n\n", "Die Datei \"%1\$s\" ist bereits vorhanden.\n\n"
-    de "File \"%1\$s\" does not exist.", "Die Datei \"%1\$s\" existiert nicht."
-    de "File &name:", "Datei&name:"
-    de "File &names:", "Datei&namen:"
-    de "Files of &type:", "Dateien des &Typs:"
-    de "Fi&les:", "Dat&eien:"
-    de "&Filter"
-    de "Fil&ter:"
-    de "&Green", "&Gr\\u00fcn"
-    de "&Help", "&Hilfe"
-    de "Hi", "Hallo"
-    de "&Hide Console", "&Konsole unsichtbar machen"
-    de "&Ignore", "&Ignorieren"
-    de "Invalid file name \"%1\$s\".", "Ung\\u00fcltiger Dateiname \"%1\$s\"."
-    de "Log Files", "Protokolldatei"
-    de "&No", "&Nein"
-    de "OK"
-    de "Ok"
-    de "Open", "\\u00d6ffnen"
-    de "&Open", "\\u00d6&ffnen"
-    de "Open Multiple Files"
-    de "P&aste", "E&inf\\u00fcgen"
-    de "&Quit", "&Beenden"
-    de "&Red", "&Rot"
-    de "Replace existing file?", "Existierende Datei ersetzen?"
-    de "&Retry", "&Wiederholen"
-    de "&Save", "&Speichern"
-    de "Save As", "Speichern unter"
-    de "Save To Log", "In Protokoll speichern"
-    de "Select Log File", "Protokolldatei ausw\\u00e4hlen"
-    de "Select a file to source", "Auszuf\\u00fchrende Datei ausw\\u00e4hlen"
-    de "&Selection:", "Auswah&l:"
-    de "Skip Messages", "Weitere Nachrichten \\u00fcberspringen"
-    de "&Source...", "&Ausf\\u00fchren..."
-    de "Tcl Scripts", "Tcl-Skripte"
-    de "Tcl for Windows", "Tcl f\\u00fcr Windows"
-    de "Text Files", "Textdateien"
-    de "&Yes", "&Ja"
-    de "abort", "abbrechen"
-    de "blue", "blau"
-    de "cancel", "abbrechen"
-    de "extension", "Erweiterung"
-    de "extensions", "Erweiterungen"
-    de "green", "gr\\u00fcn"
-    de "ignore", "ignorieren"
-    de "ok"
-    de "red", "rot"
-    de "retry", "wiederholen"
-    de "yes", "ja"
-}
diff --git a/ext/tk/sample/msgs_rb/el.msg b/ext/tk/sample/msgs_rb/el.msg
deleted file mode 100644
index f314ae03eb..0000000000
--- a/ext/tk/sample/msgs_rb/el.msg
+++ /dev/null
@@ -1,98 +0,0 @@
-TkMsgCatalog.new('::tkmsgcat_demo') {
-    el 'Application Error',  '\u039b\u03ac\u03b8\u03bf\u03c2 \u0395\u03c6\u03b1\u03c1\u03bc\u03bf\u03b3\u03ae\u03c2'
-    el 'Blue',     '\u039c\u03c0\u03bb\u03b5'
-    el 'Color',    '\u03a7\u03c1\u03ce\u03bc\u03b1'
-    el 'Delete',   '\u0394\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae'
-    el 'Error',    '\u039b\u03ac\u03b8\u03bf\u03c2'
-    el 'Exit',     '\u0388\u03be\u03bf\u03b4\u03bf\u03c2'
-    el 'Green',    '\u03a0\u03c1\u03ac\u03c3\u03b9\u03bd\u03bf'
-    el 'Red',      '\u039a\u03cc\u03ba\u03ba\u03b9\u03bd\u03bf'
-    el 'blue',     '\u03bc\u03c0\u03bb\u03b5'
-    el 'green',    '\u03c0\u03c1\u03ac\u03c3\u03b9\u03bd\u03bf'
-    el 'red',      '\u03ba\u03cc\u03ba\u03ba\u03b9\u03bd\u03bf'
-}
-
-TkMsgCatalog.new('::tk') {
-    el '&Abort',             '\u03a4\u03b5\u03c1\u03bc\u03b1\u03c4\u03b9\u03c3\u03bc\u03cc\u03c2'
-    el 'About...',           '\u03a3\u03c7\u03b5\u03c4\u03b9\u03ba\u03ac...'
-    el 'All Files',          '\u038c\u03bb\u03b1 \u03c4\u03b1 \u0391\u03c1\u03c7\u03b5\u03af\u03b1'
-    el 'Application Error',  '\u039b\u03ac\u03b8\u03bf\u03c2 \u0395\u03c6\u03b1\u03c1\u03bc\u03bf\u03b3\u03ae\u03c2'
-    el '&Blue',              '\u039c\u03c0\u03bb\u03b5'
-    el '&Cancel',            '\u0391\u03ba\u03cd\u03c1\u03c9\u03c3\u03b7'
-    el 'Cannot change to the directory "%1\$s".' "\n" 'Permission denied.', \
-          '\u0394\u03b5\u03bd \u03b5\u03af\u03bd\u03b1\u03b9 \u03b4\u03c5\u03bd\u03b1\u03c4\u03ae \u03b7 \u03b1\u03bb\u03bb\u03b1\u03b3\u03ae \u03ba\u03b1\u03c4\u03b1\u03bb\u03cc\u03b3\u03bf\u03c5 \u03c3\u03b5 "%1\$s".' \
-          "\n" \
-          '\u0397 \u03c0\u03c1\u03cc\u03c3\u03b2\u03b1\u03c3\u03b7 \u03b4\u03b5\u03bd \u03b5\u03c0\u03b9\u03c4\u03c1\u03ad\u03c0\u03b5\u03c4\u03b1\u03b9.'
-    el 'Choose Directory',   '\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae \u039a\u03b1\u03c4\u03b1\u03bb\u03cc\u03b3\u03bf\u03c5'
-    el 'Clear',              '\u039a\u03b1\u03b8\u03b1\u03c1\u03b9\u03c3\u03bc\u03cc\u03c2'
-    el 'Color',              '\u03a7\u03c1\u03ce\u03bc\u03b1'
-    el 'Console',            '\u039a\u03bf\u03bd\u03c3\u03cc\u03bb\u03b1'
-    el 'Copy',               '\u0391\u03bd\u03c4\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae'
-    el 'Cut',                '\u0391\u03c0\u03bf\u03ba\u03bf\u03c0\u03ae'
-    el 'Delete',             '\u0394\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae'
-    el 'Details >>',         '\u039b\u03b5\u03c0\u03c4\u03bf\u03bc\u03ad\u03c1\u03b5\u03b9\u03b5\u03c2 >>'
-    el 'Directory "%1\$s", does not exist.', \
-          '\u039f \u03ba\u03b1\u03c4\u03ac\u03bb\u03bf\u03b3\u03bf\u03c2 \'%1\$s\' \u03b4\u03b5\u03bd \u03c5\u03c0\u03ac\u03c1\u03c7\u03b5\u03b9.'
-    el '&Directory:',        '&\u039a\u03b1\u03c4\u03ac\u03bb\u03bf\u03b3\u03bf\u03c2:'
-    el 'Error: %1\$s',       '\u039b\u03ac\u03b8\u03bf\u03c2: %1\$s'
-    el 'Exit',               '\u0388\u03be\u03bf\u03b4\u03bf\u03c2'
-    el 'File "%1\$s" already exists.' "\n" 'Do you want to overwrite it?', \
-          '\u03a4\u03bf \u03b1\u03c1\u03c7\u03b5\u03af\u03bf "%1\$s" \u03ae\u03b4\u03b7 \u03c5\u03c0\u03ac\u03c1\u03c7\u03b5\u03b9.' \
-          "\n" \
-          '\u0398\u03ad\u03bb\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03b5\u03c0\u03b9\u03ba\u03b1\u03bb\u03c5\u03c6\u03b8\u03b5\u03af;'
-    el 'File "%1\$s" already exists.' "\n\n",  \
-          '\u03a4\u03bf \u03b1\u03c1\u03c7\u03b5\u03af\u03bf "%1\$s" \u03ae\u03b4\u03b7 \u03c5\u03c0\u03ac\u03c1\u03c7\u03b5\u03b9.' "\n\n"
-    el 'File "%1\$s" does not exist.', \
-          '\u03a4\u03bf \u03b1\u03c1\u03c7\u03b5\u03af\u03bf "%1\$s" \u03b4\u03b5\u03bd \u03c5\u03c0\u03ac\u03c1\u03c7\u03b5\u03b9.'
-    el 'File &name:',        '\u038c&\u03bd\u03bf\u03bc\u03b1 \u03b1\u03c1\u03c7\u03b5\u03af\u03bf\u03c5:'
-    el 'File &names:',       '\u038c&\u03bd\u03bf\u03bc\u03b1 \u03b1\u03c1\u03c7\u03b5\u03af\u03c9\u03bd:'
-    el 'Files of &type:',    '\u0391\u03c1\u03c7\u03b5\u03af\u03b1 \u03c4\u03bf\u03c5 &\u03c4\u03cd\u03c0\u03bf\u03c5:'
-    el 'Fi&les:',            '\u0391\u03c1\u03c7\u03b5\u03af\u03b1:'
-    el '&Filter',            '\u03a6\u03af\u03bb\u03c4\u03c1\u03bf'
-    el 'Fil&ter:',           '\u03a6\u03af\u03bb\u03c4\u03c1\u03bf:'
-    el '&Green',             '\u03a0\u03c1\u03ac\u03c3\u03b9\u03bd\u03bf'
-    el 'Hi',                 '\u0393\u03b5\u03b9\u03b1'
-    el 'Hide Console',       '\u0391\u03c0\u03cc\u03ba\u03c1\u03c5\u03c8\u03b7 \u03ba\u03bf\u03bd\u03c3\u03cc\u03bb\u03b1\u03c2'
-    el '&Ignore',            '\u0391\u03b3\u03bd\u03cc\u03b7\u03c3\u03b7'
-    el 'Invalid file name "%1\$s".', \
-          '\u0386\u03ba\u03c5\u03c1\u03bf \u03cc\u03bd\u03bf\u03bc\u03b1 \u03b1\u03c1\u03c7\u03b5\u03af\u03bf\u03c5 "%1\$s".'
-    el 'Log Files',          '\u0391\u03c1\u03c7\u03b5\u03af\u03b1 \u039a\u03b1\u03c4\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae\u03c2'
-    el '&No',                '\u038c\u03c7\u03b9'
-    el '&OK',                '\u0395\u03bd\u03c4\u03ac\u03be\u03b5\u03b9'
-    el '&Ok',                '\u0395\u03bd\u03c4\u03ac\u03be\u03b5\u03b9'
-    el 'Open',               '\u0386\u03bd\u03bf\u03b9\u03b3\u03bc\u03b1'
-    el '&Open',              '\u0386\u03bd\u03bf\u03b9\u03b3\u03bc\u03b1'
-    el 'Open Multiple Files', \
-          '\u0386\u03bd\u03bf\u03b9\u03b3\u03bc\u03b1 \u03c0\u03bf\u03bb\u03bb\u03b1\u03c0\u03bb\u03ce\u03bd \u03b1\u03c1\u03c7\u03b5\u03af\u03c9\u03bd'
-    el 'Paste',              '\u0395\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7'
-    el 'Quit',               '\u0388\u03be\u03bf\u03b4\u03bf\u03c2'
-    el '&Red',               '\u039a\u03cc\u03ba\u03ba\u03b9\u03bd\u03bf'
-    el 'Replace existing file?', \
-          '\u0395\u03c0\u03b9\u03ba\u03ac\u03bb\u03c5\u03c8\u03b7 \u03c5\u03c0\u03ac\u03c1\u03c7\u03bf\u03bd\u03c4\u03bf\u03c2 \u03b1\u03c1\u03c7\u03b5\u03af\u03bf\u03c5;'
-    el '&Retry',             '\u03a0\u03c1\u03bf\u03c3\u03c0\u03ac\u03b8\u03b7\u03c3\u03b5 \u03be\u03b1\u03bd\u03ac'
-    el '&Save',              '\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7'
-    el 'Save As',            '\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7 \u03c3\u03b1\u03bd'
-    el 'Save To Log',        '\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7 \u03c3\u03c4\u03bf \u03b1\u03c1\u03c7\u03b5\u03af\u03bf \u03ba\u03b1\u03c4\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae\u03c2'
-    el 'Select Log File',    '\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae \u03b1\u03c1\u03c7\u03b5\u03af\u03bf\u03c5 \u03ba\u03b1\u03c4\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae\u03c2'
-    el 'Select a file to source', \
-          '\u0395\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03b1\u03c1\u03c7\u03b5\u03af\u03bf \u03b3\u03b9\u03b1 \u03b5\u03ba\u03c4\u03ad\u03bb\u03b5\u03c3\u03b7'
-    el '&Selection:',        '\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae:'
-    el 'Skip Messages',      '\u0391\u03c0\u03bf\u03c6\u03c5\u03b3\u03ae \u03bc\u03c5\u03bd\u03b7\u03bc\u03ac\u03c4\u03c9\u03bd'
-    el 'Source...',          '\u0395\u03ba\u03c4\u03ad\u03bb\u03b5\u03c3\u03b7...'
-    el 'Tcl Scripts',        'Tcl Scripts'
-    el 'Tcl for Windows',    'Tcl \u03b3\u03b9\u03b1 Windows'
-    el 'Text Files',         '\u0391\u03c1\u03c7\u03b5\u03af\u03b1 \u039a\u03b5\u03b9\u03bc\u03ad\u03bd\u03bf\u03c5'
-    el '&Yes',               '\u039d\u03b1\u03b9'
-    el 'abort',              '\u03c4\u03b5\u03c1\u03bc\u03b1\u03c4\u03b9\u03c3\u03bc\u03cc\u03c2'
-    el 'blue',               '\u03bc\u03c0\u03bb\u03b5'
-    el 'cancel',             '\u03b1\u03ba\u03cd\u03c1\u03c9\u03c3\u03b7'
-    el 'extension',          '\u03b5\u03c0\u03ad\u03ba\u03c4\u03b1\u03c3\u03b7'
-    el 'extensions',         '\u03b5\u03c0\u03b5\u03ba\u03c4\u03ac\u03c3\u03b5\u03b9\u03c2'
-    el 'green',              '\u03c0\u03c1\u03ac\u03c3\u03b9\u03bd\u03bf'
-    el 'ignore',             '\u03b1\u03b3\u03bd\u03cc\u03b7\u03c3\u03b7'
-    el 'ok',                 '\u03b5\u03bd\u03c4\u03ac\u03be\u03b5\u03b9'
-    el 'red',                '\u03ba\u03cc\u03ba\u03ba\u03b9\u03bd\u03bf'
-    el 'retry',              '\u03c0\u03c1\u03bf\u03c3\u03c0\u03ac\u03b8\u03b7\u03c3\u03b5 \u03be\u03b1\u03bd\u03ac'
-    el 'yes',                '\u03bd\u03b1\u03b9'
-}
-
diff --git a/ext/tk/sample/msgs_rb/en.msg b/ext/tk/sample/msgs_rb/en.msg
deleted file mode 100644
index 9b70239511..0000000000
--- a/ext/tk/sample/msgs_rb/en.msg
+++ /dev/null
@@ -1,83 +0,0 @@
-TkMsgCatalog.new('::tkmsgcat_demo') {
-    en "Application Error"
-    en "Blue"
-    en "Color"
-    en "Delete"
-    en "Error"
-    en "Green"
-    en "Red"
-    en "blue"
-    en "green"
-    en "red"
-}
-
-TkMsgCatalog.new('::tk') {
-    en "&Abort"
-    en "About..."
-    en "All Files"
-    en "Application Error"
-    en "&Blue"
-    en "&Cancel"
-    en "Cannot change to the directory \"%1\$s\".\nPermission denied."
-    en "Choose Directory"
-    en "Clear"
-    en "Color"
-    en "Console"
-    en "Copy"
-    en "Cut"
-    en "Delete"
-    en "Details >>"
-    en "Directory \"%1\$s\" does not exist."
-    en "&Directory:"
-    en "Error: %1\$s"
-    en "Exit"
-    en "File \"%1\$s\" already exists.\nDo you want to overwrite it?"
-    en "File \"%1\$s\" already exists.\n\n"
-    en "File \"%1\$s\" does not exist."
-    en "File &name:"
-    en "File &names:"
-    en "Files of &type:"
-    en "Fi&les:"
-    en "&Filter"
-    en "Fil&ter:"
-    en "&Green"
-    en "Hi"
-    en "Hide Console"
-    en "&Ignore"
-    en "Invalid file name \"%1\$s\"."
-    en "Log Files"
-    en "&No"
-    en "&OK"
-    en "Ok"
-    en "Open"
-    en "&Open"
-    en "Open Multiple Files"
-    en "Paste"
-    en "Quit"
-    en "&Red"
-    en "Replace existing file?"
-    en "&Retry"
-    en "&Save"
-    en "Save As"
-    en "Save To Log"
-    en "Select Log File"
-    en "Select a file to source"
-    en "&Selection:"
-    en "Skip Messages"
-    en "Source..."
-    en "Tcl Scripts"
-    en "Tcl for Windows"
-    en "Text Files"
-    en "&Yes"
-    en "abort"
-    en "blue"
-    en "cancel"
-    en "extension"
-    en "extensions"
-    en "green"
-    en "ignore"
-    en "ok"
-    en "red"
-    en "retry"
-    en "yes"
-}
diff --git a/ext/tk/sample/msgs_rb/en_gb.msg b/ext/tk/sample/msgs_rb/en_gb.msg
deleted file mode 100644
index 97c58959b1..0000000000
--- a/ext/tk/sample/msgs_rb/en_gb.msg
+++ /dev/null
@@ -1,7 +0,0 @@
-TkMsgCatalog.new('::tkmsgcat_demo') {
-    en_gb 'Color', 'Colour'
-}
-
-TkMsgCatalog.new('::tk') {
-    en_gb 'Color', 'Colour'
-}
diff --git a/ext/tk/sample/msgs_rb/eo.msg b/ext/tk/sample/msgs_rb/eo.msg
deleted file mode 100644
index 1630df5e83..0000000000
--- a/ext/tk/sample/msgs_rb/eo.msg
+++ /dev/null
@@ -1,87 +0,0 @@
-TkMsgCatalog.new('::tkmsgcat_demo') {
-    eo 'Application Error', 'Aplikoerraro'
-    eo 'Blue', 'Blua'
-    eo 'Color', 'Farbo'
-    eo 'Delete', 'Forprenu'
-    eo 'Error', 'Eraro'
-    eo 'Exit', 'Eliru'
-    eo 'Green', 'Verda'
-    eo 'Red', 'Rosa'
-    eo 'blue', 'blua'
-    eo 'green', 'verda'
-    eo 'red', 'ru\u011da'
-}
-
-TkMsgCatalog.new('::tk') {
-    eo '&Abort', '&\u0108esigo'
-    eo '&About...', 'Pri...'
-    eo 'All Files', '\u0108ioj dosieroj'
-    eo 'Application Error', 'Aplikoerraro'
-    eo '&Blue', '&Blua'
-    eo '&Cancel', '&Rezignu'
-    eo 'Cannot change to the directory "%1\$s".' "\n" 'Permission denied.', 'Neeble \u0109angi al dosierulon "%1\$s".' "\n" 'Vi ne rajtas tion.'
-    eo 'Choose Directory', 'Elektu Dosierujo'
-    eo '&Clear', '&Klaru'
-    eo '&Clear Console', '&Klaru konzolon'
-    eo 'Color', 'Farbo'
-    eo 'Console', 'Konzolo'
-    eo '&Copy', '&Kopiu'
-    eo 'Cu&t', '&Enpo\u015digu'
-    eo '&Delete', '&Forprenu'
-    eo 'Details >>', 'Detaloj >>'
-    eo 'Directory "%1\$s" does not exist.', 'La dosierujo "%1\$s" ne ekzistas.'
-    eo '&Directory:', '&Dosierujo:'
-    eo '&Edit', '&Redaktu'
-    eo 'Error: %1\$s', 'Eraro: %1\$s'
-    eo 'E&xit', '&Eliru'
-    eo '&File', '&Dosiero'
-    eo 'File "%1\$s" already exists.' "\n" 'Do you want to overwrite it?', 'La dosiero "%1\$s" jam ekzistas.' "\n" '\u0108u vi volas anstata\u00fbigi la dosieron?'
-    eo 'File "%1\$s" already exists.' "\n\n", 'La dosiero "%1\$s" jam egzistas.' "\n\n"
-    eo 'File "%1\$s" does not exist.', 'La dosierp "%1\$s" ne estas.'
-    eo 'File &name:', 'Dosiero&nomo:'
-    eo 'File &names:', 'Dosiero&nomoj:'
-    eo 'Files of &type:', 'Dosieroj de &Typo:'
-    eo 'Fi&les:', 'Do&sieroj:'
-    eo '&Filter', '&Filtrilo'
-    eo 'Fil&ter:', '&Filtrilo:'
-    eo '&Green', '&Verda'
-    eo '&Help', '&Helpu'
-    eo 'Hi', 'Saluton'
-    eo '&Hide Console', '&Ka\u015du konzolon'
-    eo '&Ignore', '&Ignoru'
-    eo 'Invalid file name "%1\$s".', 'Malvalida dosieronomo "%1\$s".'
-    eo 'Log Files', 'Protokolo'
-    eo '&No', '&Ne'
-    eo 'OK'
-    eo 'Ok'
-    eo 'Open', 'Malfermu'
-    eo '&Open', '&Malfermu'
-    eo 'Open Multiple Files', 'Melfermu multan dosierojn'
-    eo 'P&aste', '&Elpo\u015digi'
-    eo '&Quit', '&Finigu'
-    eo '&Red', '&Rosa'
-    eo 'Replace existing file?', '\u0108u anstata\u00fbu ekzistantan dosieron?'
-    eo '&Retry', '&Ripetu'
-    eo '&Save', '&Savu'
-    eo 'Save As', 'Savu kiel'
-    eo 'Save To Log', 'Savu en protokolon'
-    eo 'Select Log File', 'Elektu prokolodosieron'
-    eo 'Select a file to source', 'Elektu dosieron por interpreti'
-    eo '&Selection:', '&Elekto:'
-    eo 'Skip Messages', 'transsaltu pluajn mesa\u011dojn'
-    eo '&Source...', '&Fontoprogramo...'
-    eo 'Tcl Scripts', 'Tcl-skriptoj'
-    eo 'Tcl for Windows', 'Tcl por vindoso'
-    eo 'Text Files', 'Tekstodosierojn'
-    eo '&Yes', '&Jes'
-    eo 'abort', '\u0109esigo'
-    eo 'blue', 'blua'
-    eo 'cancel', 'rezignu'
-    eo 'extension', 'ekspansio'
-    eo 'extensions', 'ekspansioj'
-    eo 'green', 'verda'
-    eo 'ignore', 'ignorieren'
-    eo 'red', 'ru\u011da'
-    eo 'retry', 'ripetu'
-    eo 'yes', 'jes'
-}
diff --git a/ext/tk/sample/msgs_rb/es.msg b/ext/tk/sample/msgs_rb/es.msg
deleted file mode 100644
index 38ca28fb8f..0000000000
--- a/ext/tk/sample/msgs_rb/es.msg
+++ /dev/null
@@ -1,84 +0,0 @@
-TkMsgCatalog.new('::tkmsgcat_demo') {
-    es "Application Error", "Error de la aplicaci\\u00f3n"
-    es "Blue", "Azul"
-    es "Color", "Color"
-    es "Delete", "Borrar"
-    es "Error", "Error"
-    es "Exit", "Salir"
-    es "Green", "Verde"
-    es "Red", "Rojo"
-    es "blue", "azul"
-    es "green", "verde"
-    es "red", "rojo"
-}
-
-TkMsgCatalog.new('::tk') {
-    es "&Abort", "&Abortar"
-    es "About...", "Acerca de ..."
-    es "All Files", "Todos los archivos"
-    es "Application Error", "Error de la aplicaci\\u00f3n"
-    es "&Blue", "&Azul"
-    es "&Cancel", "&Cancelar"
-    es "Cannot change to the directory \"%1\$s\".\nPermission denied.", "No es posible acceder al directorio \"%1\$s\".\nPermiso denegado."
-    es "Choose Directory", "Elegir directorio"
-    es "Clear", "Borrar"
-    es "Color", "Color"
-    es "Console", "Consola"
-    es "Copy", "Copiar"
-    es "Cut", "Cortar"
-    es "Delete", "Borrar"
-    es "Details >>", "Detalles >>"
-    es "Directory \"%1\$s\" does not exist.", "El directorio \"%1\$s\" no existe."
-    es "&Directory:", "&Directorio:"
-    es "Error: %1\$s", "Error: %1\$s"
-    es "Exit", "Salir"
-    es "File \"%1\$s\" already exists.\nDo you want to overwrite it?", "El archivo \"%1\$s\" ya existe.\nDesea sobreescribirlo?"
-    es "File \"%1\$s\" already exists.\n\n", "El archivo \"%1\$s\" ya existe.\n\n"
-    es "File \"%1\$s\" does not exist.", "El archivo \"%1\$s\" no existe."
-    es "File &name:", "&Nombre de archivo:"
-    es "File &names:", "&Nombres de archivo:"
-    es "Files of &type:", "Archivos de &tipo:"
-    es "Fi&les:", "&Archivos:"
-    es "&Filter", "&Filtro"
-    es "Fil&ter:", "Fil&tro:"
-    es "&Green", "&Verde"
-    es "Hi", "Hola"
-    es "Hide Console", "Esconder la consola"
-    es "&Ignore", "&Ignorar"
-    es "Invalid file name \"%1\$s\".", "Nombre de archivo inv\\u00e1lido \"%1\$s\"."
-    es "Log Files", "Ficheros de traza"
-    es "&No", "&No"
-    es "&OK", "&OK"
-    es "Ok", "Ok"
-    es "Open", "Abrir"
-    es "&Open", "&Abrir"
-    es "Open Multiple Files", "Abrir m\\u00faltiples archivos"
-    es "Paste", "Pegar"
-    es "Quit", "Abandonar"
-    es "&Red", "&Rojo"
-    es "Replace existing file?", "Reemplazar el archivo existente?"
-    es "&Retry", "&Reintentar"
-    es "&Save", "&Salvar"
-    es "Save As", "Salvar como"
-    es "Save To Log", "Salvar al archivo de traza"
-    es "Select Log File", "Elegir un archivo de traza"
-    es "Select a file to source", "Seleccionar un archivo a evaluar"
-    es "&Selection:", "&Selecci\\u00f3n:"
-    es "Skip Messages", "Omitir los mensajes"
-    es "Source...", "Evaluar..."
-    es "Tcl Scripts", "Scripts Tcl"
-    es "Tcl for Windows", "Tcl para Windows"
-    es "Text Files", "Archivos de texto"
-    es "&Yes", "&S\\u00ed"
-    es "abort", "abortar"
-    es "blue", "azul"
-    es "cancel", "cancelar"
-    es "extension", "extensi\\u00f3n"
-    es "extensions", "extensiones"
-    es "green", "verde"
-    es "ignore", "ignorar"
-    es "ok", "ok"
-    es "red", "rojo"
-    es "retry", "reintentar"
-    es "yes", "s\\u00ed"
-}
diff --git a/ext/tk/sample/msgs_rb/fr.msg b/ext/tk/sample/msgs_rb/fr.msg
deleted file mode 100644
index ea85cf1a39..0000000000
--- a/ext/tk/sample/msgs_rb/fr.msg
+++ /dev/null
@@ -1,84 +0,0 @@
-TkMsgCatalog.new('::tkmsgcat_demo') {
-    fr 'Application Error', "Erreur d'application"
-    fr 'Blue', 'Bleu'
-    fr 'Color', 'Couleur'
-    fr 'Delete', 'Effacer'
-    fr 'Error', 'Erreur'
-    fr 'Exit', 'Quitter'
-    fr 'Green', 'Vert'
-    fr 'Red', 'Rouge'
-    fr 'blue', 'bleu'
-    fr 'green', 'vert'
-    fr 'red', 'rouge'
-}
-
-TkMsgCatalog.new('::tk') {
-    fr '&Abort', '&Annuler'
-    fr 'About...', '\u00c0 propos...'
-    fr 'All Files', 'Tous les fichiers'
-    fr 'Application Error', "Erreur d'application"
-    fr '&Blue', '&Bleu'
-    fr '&Cancel', '&Annuler'
-    fr 'Cannot change to the directory "%1\$s".' "\n" 'Permission denied.', 'Impossible d\'acc\u00e9der au r\u00e9pertoire "%1\$s".' "\n" 'Permission refus\u00e9e.'
-    fr 'Choose Directory', 'Choisir r\u00e9pertoire'
-    fr 'Clear', 'Effacer'
-    fr 'Color', 'Couleur'
-    fr 'Console'
-    fr 'Copy', 'Copier'
-    fr 'Cut', 'Couper'
-    fr 'Delete', 'Effacer'
-    fr 'Details >>', 'D\u00e9tails >>'
-    fr 'Directory "%1\$s" does not exist.', 'Le r\u00e9pertoire "%1\$s" n\'existe pas.'
-    fr '&Directory:', '&R\u00e9pertoire:'
-    fr 'Error: %1\$s', 'Erreur: %1\$s'
-    fr 'Exit', 'Quitter'
-    fr 'File "%1\$s" already exists.' "\n" 'Do you want to overwrite it?', 'Le fichier "%1\$s" existe d\u00e9j\u00e0.' "\n" 'Voulez-vous l\'\u00e9craser?'
-    fr 'File "%1\$s" already exists.' "\n\n", 'Le fichier "%1\$s" existe d\u00e9j\u00e0.' "\n\n"
-    fr 'File "%1\$s" does not exist.', 'Le fichier "%1\$s" n\'existe pas.'
-    fr 'File &name:', '&Nom de fichier:'
-    fr 'File &names:', '&Noms de fichiers:'
-    fr 'Files of &type:', '&Type de fichiers:'
-    fr 'Fi&les:', 'Fich&iers:'
-    fr '&Filter', '&Filtre'
-    fr 'Fil&ter:', 'Fil&tre:'
-    fr '&Green', '&Vert'
-    fr 'Hi', 'Salut'
-    fr 'Hide Console', 'Cacher la Console'
-    fr '&Ignore', '&Ignorer'
-    fr 'Invalid file name "%1\$s".', 'Nom de fichier invalide "%1\$s".'
-    fr 'Log Files', 'Fichiers de trace'
-    fr '&No', '&Non'
-    fr '&OK'
-    fr 'Ok'
-    fr 'Open', 'Ouvrir'
-    fr '&Open', '&Ouvrir'
-    fr 'Open Multiple Files', 'Ouvrir plusieurs fichiers'
-    fr 'Paste', 'Coller'
-    fr 'Quit', 'Quitter'
-    fr '&Red', '&Rouge'
-    fr 'Replace existing file?', 'Remplacer le fichier existant?'
-    fr '&Retry', '&R\u00e9-essayer'
-    fr '&Save', '&Sauvegarder'
-    fr 'Save As', 'Sauvegarder sous'
-    fr 'Save To Log', 'Sauvegarde au fichier de trace'
-    fr 'Select Log File', 'Choisir un fichier de trace'
-    fr 'Select a file to source', 'Choisir un fichier \u00e0 \u00e9valuer'
-    fr '&Selection:', '&S\u00e9lection:'
-    fr 'Skip Messages', 'Omettre les messages'
-    fr 'Source...', '\u00c9valuer...'
-    fr 'Tcl Scripts', 'Scripts Tcl'
-    fr 'Tcl for Windows', 'Tcl pour Windows'
-    fr 'Text Files', 'Fichiers texte'
-    fr '&Yes', '&Oui'
-    fr 'abort', 'abandonner'
-    fr 'blue', 'bleu'
-    fr 'cancel', 'annuler'
-    fr 'extension'
-    fr 'extensions'
-    fr 'green', 'vert'
-    fr 'ignore', 'ignorer'
-    fr 'ok'
-    fr 'red', 'rouge'
-    fr 'retry', 'r\u00e9essayer'
-    fr 'yes', 'oui'
-}
diff --git a/ext/tk/sample/msgs_rb/it.msg b/ext/tk/sample/msgs_rb/it.msg
deleted file mode 100644
index a180bdbd99..0000000000
--- a/ext/tk/sample/msgs_rb/it.msg
+++ /dev/null
@@ -1,84 +0,0 @@
-TkMsgCatalog.new('::tkmsgcat_demo') {
-    it "Application Error", "Errore dell' applicazione"
-    it "Blue", "Blu"
-    it "Color", "Colore"
-    it "Delete", "Incolla"
-    it "Error", "Errore"
-    it "Exit", "Esci"
-    it "Green", "Verde"
-    it "Red", "Rosso"
-    it "blue", "blu"
-    it "green", "verde"
-    it "red", "rosso"
-}
-
-TkMsgCatalog.new('::tk') {
-    it "&Abort", "&Interrompi"
-    it "About...", "Informazioni ..."
-    it "All Files", "Tutti i file"
-    it "Application Error", "Errore dell' applicazione"
-    it "&Blue", "&Blu"
-    it "&Cancel", "&Annulla"
-    it "Cannot change to the directory \"%1\$s\".\nPermission denied.", "Impossibile accedere alla directory \"%1\$s\".\nPermesso negato."
-    it "Choose Directory", "Scegli directory"
-    it "Clear", "Azzera"
-    it "Color", "Colore"
-    it "Console"
-    it "Copy", "Copia"
-    it "Cut", "Taglia"
-    it "Delete", "Incolla"
-    it "Details >>", "Dettagli >>"
-    it "Directory \"%1\$s\" does not exist.", "La directory \"%1\$s\" non esiste."
-    it "&Directory:"
-    it "Error: %1\$s", "Errore: %1\$s"
-    it "Exit", "Esci"
-    it "File \"%1\$s\" already exists.\nDo you want to overwrite it?", "Il file \"%1\$s\" esiste gi\\u00e0.\nVuoi sovrascriverlo?"
-    it "File \"%1\$s\" already exists.\n\n", "Il file \"%1\$s\" esiste gi\\u00e0.\n\n"
-    it "File \"%1\$s\" does not exist.", "Il file \"%1\$s\" non esiste."
-    it "File &name:", "&Nome del file:"
-    it "File &names:", "&Nomi dei file:"
-    it "Files of &type:", "File di &tipo:"
-    it "Fi&les:", "Fi&le:"
-    it "&Filter", "&Filtro"
-    it "Fil&ter:", "Fil&tro:"
-    it "&Green", "&Verde"
-    it "Hi", "Salve"
-    it "Hide Console", "Nascondi la console"
-    it "&Ignore", "&Ignora"
-    it "Invalid file name \"%1\$s\".", "Nome di file non valido \"%1\$s\"."
-    it "Log Files", "File di log"
-    it "&No"
-    it "&OK"
-    it "Ok"
-    it "&Open", "A&pri"
-    it "Open", "Apri"
-    it "Open Multiple Files", "Apri file multipli"
-    it "Paste", "Incolla"
-    it "Quit", "Esci"
-    it "&Red", "&Rosso"
-    it "Replace existing file?", "Sostituisci il file esistente?"
-    it "&Retry", "&Riprova"
-    it "&Save", "&Salva"
-    it "Save As", "Salva come"
-    it "Save To Log", "Salva il log"
-    it "Select Log File", "Scegli un file di log"
-    it "Select a file to source", "Scegli un file da eseguire"
-    it "&Selection:", "&Selezione:"
-    it "Skip Messages", "Salta i messaggi"
-    it "Source...", "Esegui..."
-    it "Tcl Scripts", "Scripts Tcl"
-    it "Tcl for Windows", "Tcl per Windows"
-    it "Text Files", "File di testo"
-    it "&Yes", "&Si"
-    it "abort", "interrompi"
-    it "blue", "blu"
-    it "cancel", "annulla"
-    it "extension", "estensione"
-    it "extensions", "estensioni"
-    it "green", "verde"
-    it "ignore", "ignora"
-    it "ok"
-    it "red", "rosso"
-    it "retry", "riprova"
-    it "yes", "si"
-}
diff --git a/ext/tk/sample/msgs_rb/ja.msg b/ext/tk/sample/msgs_rb/ja.msg
deleted file mode 100644
index 40587c1f1d..0000000000
--- a/ext/tk/sample/msgs_rb/ja.msg
+++ /dev/null
@@ -1,13 +0,0 @@
-TkMsgCatalog.new('::tkmsgcat_demo') {
-    ja 'Application Error', '\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30A8\u30E9\u30FC'
-    ja 'Blue',   '\u9752'
-    ja 'Color',  '\u80CC\u666F\u8272'
-    ja 'Delete', '\u6D88\u53BB'
-    ja 'Error',  '\u30A8\u30E9\u30FC'
-    ja 'Exit',   '\u7D42\u4E86'
-    ja 'Green',  '\u7DD1'
-    ja 'Red',    '\u8D64'
-    ja 'blue',   '\u9752'
-    ja 'green',  '\u7DD1'
-    ja 'red',    '\u8D64'
-}
diff --git a/ext/tk/sample/msgs_rb/nl.msg b/ext/tk/sample/msgs_rb/nl.msg
deleted file mode 100644
index 24e41dae86..0000000000
--- a/ext/tk/sample/msgs_rb/nl.msg
+++ /dev/null
@@ -1,123 +0,0 @@
-TkMsgCatalog.new('::tkmsgcat_demo') {
-    nl "Application Error", "Toepassingsfout"
-    nl "Blue", "Blauw"
-    nl "Color", "Kleur"
-    nl "Delete", "Wissen"
-    nl "Error", "Fout"
-    nl "Exit", "Be\\u00ebindigen"
-    nl "Green", "Groen"
-    nl "Red", "Rood"
-    nl "blue", "blauw"
-    nl "green", "groen"
-    nl "red", "rood"
-}
-
-TkMsgCatalog.new('::tk') {
-    nl "\"%1\$s\" must be an absolute pathname", "\"%1\$s\" moet een absolute pad-naam zijn"
-    nl "%1\$s is not a toplevel window", "%1\$s is geen toplevel window"
-    nl ", or", ", of"
-    nl "-default, -icon, -message, -parent, -title, or -type", "-default, -icon, -message, -parent, -title, of -type"
-    nl "-initialdir, -mustexist, -parent, or -title", "-initialdir, -mustexist, -parent, of -title"
-    nl "&Abort", "&Afbreken"
-    nl "About...", "Over..."
-    nl "All Files", "Alle Bestanden"
-    nl "Application Error", "Toepassingsfout"
-    nl "&Blue", "&Blauw"
-    nl "&Cancel", "&Annuleren"
-    nl "Cannot change to the directory \"%1\$s\".\nPermission denied.", "Kan niet naar map \"%1\$s\" gaan.\nU heeft hiervoor geen toestemming."
-    nl "Choose Directory", "Kies map"
-    nl "Clear", "Wissen"
-    nl "Clear entry, Press OK; Enter %1\$s, press OK", "Wis veld, Druk op OK; typ %1\$s in, druk op OK"
-    nl "&Clear Console", "&Wis Console"
-    nl "Color", "Kleur"
-    nl "Console"
-    nl "Copy", "Kopi\\u00ebren"
-    nl "Cut", "Knippen"
-    nl "Delete", "Wissen"
-    nl "Details"
-    nl "Details >>"
-    nl "Directory \"%1\$s\" does not exist.", "Map \"%1\$s\" bestaat niet."
-    nl "&Directory:", "&Map:"
-    nl "Edit", "Bewerken"
-    nl "Enter \"%1\$s\", press OK", "Typ \"%1\$s\", druk op OK"
-    nl "Enter \"%1\$s\", press OK, enter \"%2\$s\", press OK", "Typ \"%1\$s\", druk op OK, typ \"%2\$s\", druk op OK"
-    nl "Error: %1\$s", "Fout: %1\$s"
-    nl "Exit", "Be\\u00ebindigen"
-    nl "File", "Bestand"
-    nl "File \"%1\$s\" already exists.\n\n", "Bestand \"%1\$s\" bestaat al.\n\n"
-    nl "File \"%1\$s\" already exists.\nDo you want to overwrite it?", "Bestand \"%1\$s\" bestaat al.\nWilt u het overschrijven?"
-    nl "File \"%1\$s\" does not exist.", "Bestand \"%1\$s\" bestaat niet."
-    nl "File &name:", "Bestands&naam:"
-    nl "File &names:", "Bestands&namen:"
-    nl "Files of &type:", "Bestanden van het &type:"
-    nl "Fi&les:", "&Bestanden:"
-    nl "&Filter"
-    nl "Fil&ter:"
-    nl "&Green", "&Groen"
-    nl "Hi", "H\\u00e9"
-    nl "Hide Console", "Verberg Console"
-    nl "&Ignore", "&Negeren"
-    nl "Invalid file name \"%1\$s\".", "Ongeldige bestandsnaam \"%1\$s\"."
-    nl "Log Files", "Log Bestanden"
-    nl "&No", "&Nee"
-    nl "&OK"
-    nl "Ok"
-    nl "&Open", "&Openen"
-    nl "Open", "Openen"
-    nl "Open Multiple Files", "Open meerdere bestanden"
-    nl "Paste", "Plakken"
-    nl "Please press %1\$s", "Druk op %1\$s, A.U.B."
-    nl "Please press ok", "Druk op ok, A.U.B."
-    nl "Press Cancel", "Druk op Annuleren"
-    nl "Press Ok", "Druk op Ok"
-    nl "Quit", "Stoppen"
-    nl "&Red", "&Rood"
-    nl "Replace existing file?", "Vervang bestaand bestand?"
-    nl "&Retry", "&Herhalen"
-    nl "&Save", "Op&slaan"
-    nl "Save As", "Opslaan als"
-    nl "Save To Log", "Opslaan naar Log"
-    nl "Select Log File", "Selecteer Log bestand"
-    nl "Select a file to source", "Selecteer bronbestand"
-    nl "&Selection:", "&Selectie:"
-    nl "Skip Messages", "Berichten overslaan"
-    nl "Source...", "Bron..."
-    nl "Tcl Scripts"
-    nl "Tcl for Windows", "Tcl voor Windows"
-    nl "Text Files", "Tekstbestanden"
-    nl "&Yes", "&Ja"
-    nl "abort", "afbreken"
-    nl "abort, retry, ignore, ok, cancel, no, or yes", "afbreken, opnieuw, negeren, ok, annuleren, nee, of ja"
-    nl "abortretryignore, ok, okcancel, retrycancel, yesno, or yesnocancel", "abortretryignore, ok, okcancel, retrycancel, yesno, of yesnocancel"
-    nl "bad %1\$s value \"%2\$s\": must be %3\$s", "verkeerde %1\$s waarde \"%2\$s\": moet zijn %3\$s"
-    nl "bad file type \"%1\$s\", should be", "verkeerd bestandstype \"%1\$s\", moet zijn"
-    nl "bad option \"%1\$s\": should be %2\$s", "verkeerde optie \"%1\$s\": moet zijn %2\$s"
-    nl "bad window path name \"%1\$s\"", "verkeerde window-padnaam \"%1\$s\""
-    nl "blue", "blauw"
-    nl "can't post %1\$s:  it isn't a descendant of %2\$s (this is a new requirement in Tk versions 3.0 and later)", "kan %1\$s niet verzenden:  het is geen afstammeling van %2\$s (dit is een nieuwe eis in Tk versies 3.0 en later)"
-    nl "cancel", "annuleren"
-    nl "default button index greater than number of buttons specified for tk_dialog", "default knop index is groter dan het aantal knoppen beschikbaar voor tk_dialog"
-    nl "display name to use (current one otherwise)", "te gebruiken schermnaam (anders huidige scherm)"
-    nl "error, info, question, or warning", "error, info, question, of warning"
-    nl "extension"
-    nl "extensions"
-    nl "focus group \"%1\$s\" doesn't exist", "focusgroep \"%1\$s\" bestaat niet"
-    nl "green", "groen"
-    nl "history event %1\$s"
-    nl "ignore", "negeren"
-    nl "invalid default button \"%1\$s\"", "ongeldige default knop \"%1\$s\""
-    nl "macType"
-    nl "macTypes"
-    nl "must specify a background color", "een achtergrondkleur is verplicht"
-    nl "name of the slave interpreter", "naam van de slaaf-interpreter"
-    nl "no winfo screen . nor env(DISPLAY)", "geen winfo scherm . noch env(DISPLAY)"
-    nl "ok"
-    nl "red", "rood"
-    nl "retry", "opnieuw"
-    nl "should contain 5 or 4 elements", "moet 4 of 5 elementen bevatten"
-    nl "spec"
-    nl "tk_chooseDirectory command", "tk_chooseDirectory opdracht"
-    nl "tk_chooseDirectory command, cancel gives null", "tk_chooseDirectory opdracht, annuleren geeft lege waarde"
-    nl "tk_chooseDirectory command, initialdir", "tk_chooseDirectory opdracht, initi\\u00eble map"
-    nl "yes", "ja"
-}
diff --git a/ext/tk/sample/msgs_rb/pl.msg b/ext/tk/sample/msgs_rb/pl.msg
deleted file mode 100644
index 0b3b4445c2..0000000000
--- a/ext/tk/sample/msgs_rb/pl.msg
+++ /dev/null
@@ -1,87 +0,0 @@
-TkMsgCatalog.new('::tkmsgcat_demo') {
-    pl 'Application Error', 'Bl\u0105d w Programie'
-    pl 'Blue', 'Niebieski'
-    pl 'Color', 'Kolor'
-    pl 'Delete', 'Usu\u0144'
-    pl 'Error', 'B\u0142\u0105d'
-    pl 'Exit', 'Zako\u0144cz'
-    pl 'Green', 'Zielony'
-    pl 'Red', 'Czerwonz'
-    pl 'blue', 'niebieski'
-    pl 'green', 'zielony'
-    pl 'red', 'czerwony'
-}
-
-TkMsgCatalog.new('::tk') {
-    pl '&Abort', '&Anuluj'
-    pl '&About...', 'O Programie...'
-    pl 'All Files', 'Wszystkie pliki'
-    pl 'Application Error', 'Bl\u0105d w Programie'
-    pl '&Blue', '&Niebieski'
-    pl '&Cancel', '&Anuluj'
-    pl 'Cannot change to the directory "%1\$s".' "\n" 'Permission denied.', 'Katalog "%1\$s" nie mo\u017ce zosta\u0107 odczytany lub nie istnieje.'
-    pl 'Choose Directory', 'Wybierz katalog'
-    pl '&Clear', '&Wyczy\u015b\u0107'
-    pl '&Clear Console', '&Wyczy\u015b\u0107 konsol\u0119'
-    pl 'Color', 'Kolor'
-    pl 'Console', 'Konsola'
-    pl '&Copy', '&Kopiuj'
-    pl 'Cu&t', '&Wytnij'
-    pl '&Delete', '&Usu\u0144'
-    pl 'Details >>', 'Detale >>'
-    pl 'Directory "%1\$s" does not exist.', 'Katalog "%1\$s" nie istniej.'
-    pl '&Directory:', '&Katalog:'
-    pl '&Edit', '&Edytuj'
-    pl 'Error: %1\$s', 'B\u0142\u0105d: %1\$s'
-    pl 'E&xit', '&Zako\u0144cz'
-    pl '&File', '&Plik'
-    pl 'File "%1\$s" already exists.' "\n" 'Do you want to overwrite it?', 'Plik "%1\$s" ju\u017c istnieje.' "\n" 'Czy chcesz go zast\u0105pi\u0107?'
-    pl 'File "%1\$s" already exists.' "\n\n", 'Plik "%1\$s" ju\u017c istnieje. ' "\n\n"
-    pl 'File "%1\$s" does not exist.', 'Plik "%1\$s" nie istnieje.'
-    pl 'File &name:', 'Nazwa &pliku:'
-    pl 'File &names:', 'Nazwy &plik\u00f3w:'
-    pl 'Files of &type:', 'Pliki &typu:'
-    pl 'Fi&les:', 'Pli&ki:'
-    pl '&Filter', '&Filter'
-    pl 'Fil&ter:', '&Filter:'
-    pl '&Green', '&Zielony'
-    pl '&Help', '&Pomoc'
-    pl 'Hi', 'Witaj'
-    pl '&Hide Console', '&Schowaj konsol\u0119'
-    pl '&Ignore', '&Ignoruj'
-    pl 'Invalid file name "%1\$s".', 'Niew\u0142a\u015bciwa nazwa pliku "%1\$s".'
-    pl 'Log Files', 'Protoko\u0142uj'
-    pl '&No', '&Nie'
-    pl 'OK'
-    pl 'Ok'
-    pl 'Open', 'Wczytaj'
-    pl '&Open', '&Wczytaj'
-    pl 'Open Multiple Files', 'Wczytuj wiele plik\u00f3w'
-    pl 'P&aste', '&Wklej'
-    pl '&Quit', '&Zako\u0144cz'
-    pl '&Red', '&Czerwonz'
-    pl 'Replace existing file?', 'Czy zost\u0105pi\u0107 instniej\u0105cy plik?'
-    pl '&Retry', '&Powt\u00f3rz'
-    pl '&Save', '&Zapisz'
-    pl 'Save As', 'Zapisz jako'
-    pl 'Save To Log', 'Wpisz do protoko\u0142u'
-    pl 'Select Log File', 'Wybierz plik proko\u0142u'
-    pl 'Select a file to source', 'Wybierz plik do wykonania'
-    pl '&Selection:', '&Wyb\u00f3r:'
-    pl 'Skip Messages', 'Omi\u0144 pozosta\u0142e komunikaty'
-    pl '&Source...', '&Kod \u017ar\u00f3d\u0142owy...'
-    pl 'Tcl Scripts', 'Tcl-skrypty'
-    pl 'Tcl for Windows', 'Tcl dla Okienek (Windows)'
-    pl 'Text Files', 'Pliki Tekstowe'
-    pl '&Yes', '&Tak'
-    pl 'abort', 'zako\u0144cz'
-    pl 'blue', 'niebieski'
-    pl 'cancel', 'anuluj'
-    pl 'extension', 'rozszerzenie'
-    pl 'extensions', 'rozszerzenia'
-    pl 'green', 'zielony'
-    pl 'ignore', 'ignoruj'
-    pl 'red', 'czerwony'
-    pl 'retry', 'potw\u00f3rz'
-    pl 'yes', 'tak'
-}
diff --git a/ext/tk/sample/msgs_rb/ru.msg b/ext/tk/sample/msgs_rb/ru.msg
deleted file mode 100644
index 752cd42619..0000000000
--- a/ext/tk/sample/msgs_rb/ru.msg
+++ /dev/null
@@ -1,87 +0,0 @@
-TkMsgCatalog.new('::tkmsgcat_demo') {
-    ru 'Application Error', '\u041e\u0448\u0438\u0431\u043a\u0430 \u0432 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u0435'
-    ru 'Blue', ' \u0413\u043e\u043b\u0443\u0431\u043e\u0439'
-    ru 'Color', '\u0426\u0432\u0435\u0442'
-    ru 'Delete', '\u0423\u0434\u0430\u043b\u0438\u0442\u044c'
-    ru 'Error', '\u041e\u0448\u0438\u0431\u043a\u0430'
-    ru 'Exit', '\u0412\u044b\u0445\u043e\u0434'
-    ru 'Green', '\u0417\u0435\u043b\u0435\u043d\u044b\u0439'
-    ru 'Red', '\u041a\u0440\u0430\u0441\u043d\u044b\u0439'
-    ru 'blue', ' \u0433\u043e\u043b\u0443\u0431\u043e\u0439'
-    ru 'green', ' \u0437\u0435\u043b\u0435\u043d\u044b\u0439'
-    ru 'red', ' \u043a\u0440\u0430\u0441\u043d\u044b\u0439'
-}
-
-TkMsgCatalog.new('::tk') {
-    ru '&Abort', '&\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c'
-    ru 'About...', '\u041f\u0440\u043e...'
-    ru 'All Files', '\u0412\u0441\u0435 \u0444\u0430\u0439\u043b\u044b'
-    ru 'Application Error', '\u041e\u0448\u0438\u0431\u043a\u0430 \u0432 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u0435'
-    ru '&Blue', ' &\u0413\u043e\u043b\u0443\u0431\u043e\u0439'
-    ru '&Cancel', '\u041e\u0442&\u043c\u0435\u043d\u0430'
-    ru 'Cannot change to the directory "%1\$s".' "\n" 'Permission denied.' \
-                        '\u041d\u0435 \u043c\u043e\u0433\u0443 \u043f\u0435\u0440\u0435\u0439\u0442\u0438 \u0432 \u043a\u0430\u0442\u0430\u043b\u043e\u0433 "%1\$s".' "\n" '\u041d\u0435\u0434\u043e\u0441\u0442\u0430\u0442\u043e\u0447\u043d\u043e \u043f\u0440\u0430\u0432 \u0434\u043e\u0441\u0442\u0443\u043f\u0430'
-    ru 'Choose Directory', '\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u043a\u0430\u0442\u0430\u043b\u043e\u0433'
-    ru 'Clear', '\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u044c'
-    ru 'Color', '\u0426\u0432\u0435\u0442'
-    ru 'Console', '\u041a\u043e\u043d\u0441\u043e\u043b\u044c'
-    ru 'Copy', '\u041a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c'
-    ru 'Cut', '\u0412\u044b\u0440\u0435\u0437\u0430\u0442\u044c'
-    ru 'Delete', '\u0423\u0434\u0430\u043b\u0438\u0442\u044c'
-    ru 'Details >>', '\u041f\u043e\u0434\u0440\u043e\u0431\u043d\u0435\u0435 >>'
-    ru 'Directory "%1\$s" does not exist.', '\u041a\u0430\u0442\u0430\u043b\u043e\u0433\u0430 "%1\$s" \u043d\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442.'
-    ru '&Directory:', '&\u041a\u0430\u0442\u0430\u043b\u043e\u0433:'
-    ru 'Error: %1\$s', '\u041e\u0448\u0438\u0431\u043a\u0430: %1\$s'
-    ru 'Exit', '\u0412\u044b\u0445\u043e\u0434'
-    ru 'File "%1\$s" already exists.' "\n" 'Do you want to overwrite it?' \
-                            '\u0424\u0430\u0439\u043b "%1\$s" \u0443\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442.' "\n" '\u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c \u0435\u0433\u043e?'
-    ru 'File "%1\$s" already exists.' "\n\n", '\u0424\u0430\u0439\u043b "%1\$s" \u0443\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442.' "\n\n"
-    ru 'File "%1\$s" does not exist.', '\u0424\u0430\u0439\u043b "%1\$s" \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d.'
-    ru 'File &name:', '&\u0418\u043c\u044f \u0444\u0430\u0439\u043b\u0430:'
-    ru 'File &names:', '&\u0418\u043c\u0435\u043d\u0430 \u0444\u0430\u0439\u043b\u043e\u0432:'
-    ru 'Files of &type:', '&\u0422\u0438\u043f \u0444\u0430\u0439\u043b\u043e\u0432:'
-    ru 'Fi&les:', '\u0424\u0430\u0439&\u043b\u044b:'
-    ru '&Filter', '&\u0424\u0438\u043b\u044c\u0442\u0440'
-    ru 'Fil&ter:', '\u0424\u0438\u043b\u044c&\u0442\u0440:'
-    ru '&Green', ' &\u0417\u0435\u043b\u0435\u043d\u044b\u0439'
-    ru 'Hi', '\u041f\u0440\u0438\u0432\u0435\u0442'
-    ru 'Hide Console', '\u0421\u043f\u0440\u044f\u0442\u0430\u0442\u044c \u043a\u043e\u043d\u0441\u043e\u043b\u044c'
-    ru '&Ignore', '&\u0418\u0433\u043d\u043e\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c'
-    ru 'Invalid file name "%1\$s".', '\u041d\u0435\u0432\u0435\u0440\u043d\u043e\u0435 \u0438\u043c\u044f \u0444\u0430\u0439\u043b\u0430 "%1\$s".'
-    ru 'Log Files', '\u0424\u0430\u0439\u043b\u044b \u0436\u0443\u0440\u043d\u0430\u043b\u0430'
-    ru '&No', '&\u041d\u0435\u0442'
-    ru '&OK', '&\u041e\u041a'
-    ru 'Ok', '\u0414\u0430'
-    ru 'Open', '\u041e\u0442\u043a\u0440\u044b\u0442\u044c'
-    ru '&Open', '&\u041e\u0442\u043a\u0440\u044b\u0442\u044c'
-    ru 'Open Multiple Files', '\u041e\u0442\u043a\u0440\u044b\u0442\u044c \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e \u0444\u0430\u0439\u043b\u043e\u0432'
-    ru 'Paste', '\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c'
-    ru 'Quit', '\u0412\u044b\u0445\u043e\u0434'
-    ru '&Red', ' &\u041a\u0440\u0430\u0441\u043d\u044b\u0439'
-    ru 'Replace existing file?', '\u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044e\u0449\u0438\u0439 \u0444\u0430\u0439\u043b?'
-    ru '&Retry', '&\u041f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u044c'
-    ru '&Save', '&\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c'
-    ru 'Save As', '\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u043a\u0430\u043a'
-    ru 'Save To Log', '\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u0432 \u0436\u0443\u0440\u043d\u0430\u043b'
-    ru 'Select Log File', '\u0412\u044b\u0431\u0440\u0430\u0442\u044c \u0436\u0443\u0440\u043d\u0430\u043b'
-    ru 'Select a file to source', '\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0444\u0430\u0439\u043b \u0434\u043b\u044f \u0438\u043d\u0442\u0435\u0440\u043f\u0440\u0435\u0442\u0430\u0446\u0438\u0438'
-    ru '&Selection:', '&Selection:'
-    ru 'Skip Messages', '\u041f\u0440\u043e\u043f\u0443\u0441\u0442\u0438\u0442\u044c \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f'
-    ru 'Source...', '\u0418\u043d\u0442\u0435\u0440\u043f\u0440\u0435\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0444\u0430\u0439\u043b...'
-    ru 'Tcl Scripts', '\u041f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u0430 \u043d\u0430 \u044f\u0437\u044b\u043a\u0435 TCL'
-    ru 'Tcl for Windows', 'TCL \u0434\u043b\u044f Windows'
-    ru 'Text Files', '\u0422\u0435\u043a\u0441\u0442\u043e\u0432\u044b\u0435 \u0444\u0430\u0439\u043b\u044b'
-    ru '&Yes', '&\u0414\u0430'
-    ru 'abort', '\u043e\u0442\u043c\u0435\u043d\u0430'
-    ru 'blue', ' \u0433\u043e\u043b\u0443\u0431\u043e\u0439'
-    ru 'cancel', '\u043e\u0442\u043c\u0435\u043d\u0430'
-    ru 'extension', '\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u0435'
-    ru 'extensions', '\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u044f'
-    ru 'green', ' \u0437\u0435\u043b\u0435\u043d\u044b\u0439'
-    ru 'ignore', '\u043f\u0440\u043e\u043f\u0443\u0441\u0442\u0438\u0442\u044c'
-    ru 'ok', '\u043e\u043a'
-    ru 'red', ' \u043a\u0440\u0430\u0441\u043d\u044b\u0439'
-    ru 'retry', '\u043f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u044c'
-    ru 'yes', '\u0434\u0430'
-}
-
diff --git a/ext/tk/sample/msgs_rb2/README b/ext/tk/sample/msgs_rb2/README
deleted file mode 100644
index f6a904b3b6..0000000000
--- a/ext/tk/sample/msgs_rb2/README
+++ /dev/null
@@ -1,5 +0,0 @@
-Message catalogs in this directory are written in encodings except
-UTF-8. As if you have a trouble to edit UTF-8 text, you can write
-message catalogs in your familier encoding.
-
-Please see '../msgs_rb/README' too.
diff --git a/ext/tk/sample/msgs_rb2/de.msg b/ext/tk/sample/msgs_rb2/de.msg
deleted file mode 100644
index 0d6c82d9e5..0000000000
--- a/ext/tk/sample/msgs_rb2/de.msg
+++ /dev/null
@@ -1,88 +0,0 @@
-TkMsgCatalog.new('::tkmsgcat_demo') {
-    de 'Application Error', 'Applikationsfehler'
-    de 'Blue', 'Blau'
-    de 'Color', 'Farbe'
-    de 'Delete', 'L�schen', 'iso8859-1'
-    de 'Error', 'Fehler'
-    de 'Exit', 'Ende'
-    de 'Green', 'Gr�n', 'iso8859-1'
-    de 'Red', 'Rot'
-    de 'blue', 'blau'
-    de 'green', 'gr�n', 'iso8859-1'
-    de 'red', 'rot'
-}
-
-TkMsgCatalog.new('::tk') {
-    de "&Abort", "&Abbruch"
-    de "&About...", "&�ber...", 'iso8859-1'
-    de "All Files", "Alle Dateien"
-    de "Application Error", "Applikationsfehler"
-    de "&Blue", "&Blau"
-    de "&Cancel", "&Abbruch"
-    de "Cannot change to the directory \"%1\$s\".\nPermission denied.", "Kann nicht in das Verzeichnis \"%1\$s\" wechseln.\nKeine Rechte vorhanden."
-    de "Choose Directory", "W�hle Verzeichnis", 'iso8859-1'
-    de "&Clear", "&R�cksetzen", 'iso8859-1'
-    de "&Clear Console", "&Konsole l�schen", 'iso8859-1'
-    de "Color", "Farbe"
-    de "Console", "Konsole"
-    de "&Copy", "&Kopieren"
-    de "Cu&t", "Aus&schneiden"
-    de '&Delete', '&L�schen', 'iso8859-1'
-    de "Details >>"
-    de "Directory \"%1\$s\" does not exist.", "Das Verzeichnis \"%1\$s\" existiert nicht."
-    de "&Directory:", "&Verzeichnis:"
-    de "&Edit", "&Bearbieten"
-    de "Error: %1\$s", "Fehler: %1\$s"
-    de "E&xit", "&Ende"
-    de "&File", "&Datei"
-    de "File \"%1\$s\" already exists.\nDo you want to overwrite it?", "Die Datei \"%1\$s\" ist bereits vorhanden.\nWollen sie diese Datei �berschreiben ?", 'iso8859-1'
-    de "File \"%1\$s\" already exists.\n\n", "Die Datei \"%1\$s\" ist bereits vorhanden.\n\n"
-    de "File \"%1\$s\" does not exist.", "Die Datei \"%1\$s\" existiert nicht."
-    de "File &name:", "Datei&name:"
-    de "File &names:", "Datei&namen:"
-    de "Files of &type:", "Dateien des &Typs:"
-    de "Fi&les:", "Dat&eien:"
-    de "&Filter"
-    de "Fil&ter:"
-    de '&Green', '&Gr�n', 'iso8859-1'
-    de "&Help", "&Hilfe"
-    de "Hi", "Hallo"
-    de "&Hide Console", "&Konsole unsichtbar machen"
-    de "&Ignore", "&Ignorieren"
-    de "Invalid file name \"%1\$s\".", "Ung�ltiger Dateiname \"%1\$s\".", 'iso8859-1'
-    de "Log Files", "Protokolldatei"
-    de "&No", "&Nein"
-    de "OK"
-    de "Ok"
-    de "Open", "�ffnen", 'iso8859-1'
-    de "&Open", "�&ffnen", 'iso8859-1'
-    de "Open Multiple Files"
-    de "P&aste", "E&inf�gen", 'iso8859-1'
-    de "&Quit", "&Beenden"
-    de "&Red", "&Rot"
-    de "Replace existing file?", "Existierende Datei ersetzen?"
-    de "&Retry", "&Wiederholen"
-    de "&Save", "&Speichern"
-    de "Save As", "Speichern unter"
-    de "Save To Log", "In Protokoll speichern"
-    de "Select Log File", "Protokolldatei ausw�hlen", 'iso8859-1'
-    de "Select a file to source", "Auszuf�hrende Datei ausw�hlen", 'iso8859-1'
-    de "&Selection:", "Auswah&l:"
-    de "Skip Messages", "Weitere Nachrichten �berspringen", 'iso8859-1'
-    de "&Source...", "&Ausf�hren...", 'iso8859-1'
-    de "Tcl Scripts", "Tcl-Skripte"
-    de "Tcl for Windows", "Tcl f�r Windows", 'iso8859-1'
-    de "Text Files", "Textdateien"
-    de "&Yes", "&Ja"
-    de "abort", "abbrechen"
-    de "blue", "blau"
-    de "cancel", "abbrechen"
-    de "extension", "Erweiterung"
-    de "extensions", "Erweiterungen"
-    de 'green', 'gr�n', 'iso8859-1'
-    de "ignore", "ignorieren"
-    de "ok"
-    de "red", "rot"
-    de "retry", "wiederholen"
-    de "yes", "ja"
-}
diff --git a/ext/tk/sample/msgs_rb2/ja.msg b/ext/tk/sample/msgs_rb2/ja.msg
deleted file mode 100644
index 54a105b61f..0000000000
--- a/ext/tk/sample/msgs_rb2/ja.msg
+++ /dev/null
@@ -1,85 +0,0 @@
-TkMsgCatalog.new('::tkmsgcat_demo') {
-    ja 'Application Error', 'アプリケーションエラー', 'utf-8'
-    ja 'Blue',   '青',     'utf-8'
-    ja 'Color',  '色選択', 'utf-8'
-    ja 'Delete', '消去',   'utf-8'
-    ja 'Error',  'エラー', 'utf-8'
-    ja 'Exit',   '終了',   'utf-8'
-    ja 'Green',  '緑',     'utf-8'
-    ja 'Red',    '赤',     'utf-8'
-    ja 'blue',   '青',     'utf-8'
-    ja 'green',  '緑',     'utf-8'
-    ja 'red',    '赤',     'utf-8'
-}
-
-TkMsgCatalog.new('::tk') {
-    ja "&Abort", '中止', 'utf-8'
-    ja "About..."
-    ja "All Files", 'すべてのファイル', 'utf-8'
-    ja "Application Error", 'アプリケーションエラー', 'utf-8'
-    ja "&Blue", '青', 'utf-8'
-    ja "&Cancel", '取り消し', 'utf-8'
-    ja "Cannot change to the directory \"%1\$s\".\nPermission denied.", "ディレクトリ \"%1\$s\" に変更できません．\n許可がありません．", 'utf-8'
-    ja "Choose Directory", 'ディレクトリを選択', 'utf-8'
-    ja "Clear", '消去', 'utf-8'
-    ja "Color", '色', 'utf-8'
-    ja "Console", 'コンソール', 'utf-8'
-    ja "Copy", 'コピー', 'utf-8'
-    ja "Cut", '切り取り', 'utf-8'
-    ja "Delete", '消去', 'utf-8'
-    ja "Details >>", '詳細 >>', 'utf-8'
-    ja "Directory \"%1\$s\" does not exist.", '"%1$s" というディレクトリは存在しません．', 'utf-8'
-    ja "&Directory:", 'ディレクトリ', 'utf-8'
-    ja "Error: %1\$s"
-    ja "Exit", '終了', 'utf-8'
-    ja "File \"%1\$s\" already exists.\nDo you want to overwrite it?", "\"%1\$s\" というファイルは既に存在しています．\n書き換えますか？", 'utf-8'
-    ja "File \"%1\$s\" already exists.\n\n", "\"%1\$s\" というファイルは既に存在しています．\n\n", 'utf-8'
-    ja "File \"%1\$s\" does not exist.", '"%1$s" というファイルは存在しません．', 'utf-8'
-    ja "File &name:", 'ファイル名', 'utf-8'
-    ja "File &names:", 'ファイル名', 'utf-8'
-    ja "Files of &type:", 'ファイル形式', 'utf-8'
-    ja "Fi&les:", 'ファイル', 'utf-8'
-    ja "&Filter", 'フィルター', 'utf-8'
-    ja "Fil&ter:", 'フィルター', 'utf-8'
-    ja "&Green", '緑', 'utf-8'
-    ja "Hi", 'こんにちは', 'utf-8'
-    ja "Hide Console", 'コンソールを隠す', 'utf-8'
-    ja "&Ignore", '無視', 'utf-8'
-    ja "Invalid file name \"%1\$s\".", '"%1$s" は不正なファイル名です．', 'utf-8'
-    ja "Log Files", 'ログファイル', 'utf-8'
-    ja "&No", 'いいえ', 'utf-8'
-    ja "&OK", '了解', 'utf-8'
-    ja "OK", '了解', 'utf-8'
-    ja "Ok", '了解', 'utf-8'
-    ja "Open", '開く', 'utf-8'
-    ja "&Open", '開く', 'utf-8'
-    ja "Open Multiple Files", '複数のファイルを開く', 'utf-8'
-    ja "Paste", '貼り付け', 'utf-8'
-    ja "Quit", '終了', 'utf-8'
-    ja "&Red", '赤', 'utf-8'
-    ja "Replace existing file?", '既存のファイルを置き換えますか？', 'utf-8'
-    ja "&Retry", '再実行', 'utf-8'
-    ja "&Save", '保存', 'utf-8'
-    ja "Save As", '名前を付けて保存', 'utf-8'
-    ja "Save To Log", 'ログを保存', 'utf-8'
-    ja "Select Log File", 'ログファイルを選択', 'utf-8'
-    ja "Select a file to source", 'ソースファイルを選択', 'utf-8'
-    ja "&Selection:", '選択', 'utf-8'
-    ja "Skip Messages", 'メッセージをとばす', 'utf-8'
-    ja "Source...", 'ソース...', 'utf-8'
-    ja "Tcl Scripts", 'Tcl スクリプト', 'utf-8'
-    ja "Tcl for Windows"
-    ja "Text Files", 'テキストファイル', 'utf-8'
-    ja "&Yes", 'はい', 'utf-8'
-    ja "abort", '中止', 'utf-8'
-    ja "blue", '青', 'utf-8'
-    ja "cancel", '取り消し', 'utf-8'
-    ja "extension", '拡張子', 'utf-8'
-    ja "extensions", '拡張子', 'utf-8'
-    ja "green", '緑', 'utf-8'
-    ja "ignore", '無視', 'utf-8'
-    ja "ok", '了解', 'utf-8'
-    ja "red", '赤', 'utf-8'
-    ja "retry", '再実行', 'utf-8'
-    ja "yes", 'はい', 'utf-8'
-}
diff --git a/ext/tk/sample/msgs_tk/README b/ext/tk/sample/msgs_tk/README
deleted file mode 100644
index 949ee7a896..0000000000
--- a/ext/tk/sample/msgs_tk/README
+++ /dev/null
@@ -1,4 +0,0 @@
-Almost all of Message-Catalog files in this directory are quoted
-from Tcl/Tk8.5a1 source archive (only a little are modified for
-'tkmsgcat-load_tk.rb'). Please read the file 'license.terms' in
-this directory (That was included in demo directory of Tcl/Tk8.5a1).
diff --git a/ext/tk/sample/msgs_tk/cs.msg b/ext/tk/sample/msgs_tk/cs.msg
deleted file mode 100644
index 697070985e..0000000000
--- a/ext/tk/sample/msgs_tk/cs.msg
+++ /dev/null
@@ -1,84 +0,0 @@
-namespace eval ::tkmsgcat_demo {
-    ::msgcat::mcset cs "Application Error" "Chyba programu"
-    ::msgcat::mcset cs "Blue" "Modr\341"
-    ::msgcat::mcset cs "Color" "Barva"
-    ::msgcat::mcset cs "Delete" "Smazat"
-    ::msgcat::mcset cs "Error" "Chyba"
-    ::msgcat::mcset cs "Exit" "Konec"
-    ::msgcat::mcset cs "Green" "Zelen\341"
-    ::msgcat::mcset cs "Red" "\u010cerven\341"
-    ::msgcat::mcset cs "blue" "modr\341"
-    ::msgcat::mcset cs "green" "zelen\341"
-    ::msgcat::mcset cs "red" "\u010derven\341"
-}
-
-namespace eval ::tk {
-    ::msgcat::mcset cs "&Abort" "&P\u0159eru\u0161it"
-    ::msgcat::mcset cs "About..." "O programu..."
-    ::msgcat::mcset cs "All Files" "V\u0161echny soubory"
-    ::msgcat::mcset cs "Application Error" "Chyba programu"
-    ::msgcat::mcset cs "&Blue" "&Modr\341"
-    ::msgcat::mcset cs "&Cancel" "&Zru\u0161it"
-    ::msgcat::mcset cs "Cannot change to the directory \"%1\$s\".\nPermission denied." "Nemohu zm\u011bnit atku\341ln\355 adres\341\u0159 na \"%1\$s\".\nP\u0159\355stup odm\355tnut."
-    ::msgcat::mcset cs "Choose Directory" "V\375b\u011br adres\341\u0159e"
-    ::msgcat::mcset cs "Clear" "Smazat"
-    ::msgcat::mcset cs "Color" "Barva"
-    ::msgcat::mcset cs "Console" "Konzole"
-    ::msgcat::mcset cs "Copy" "Kop\355rovat"
-    ::msgcat::mcset cs "Cut" "Vy\u0159\355znout"
-    ::msgcat::mcset cs "Delete" "Smazat"
-    ::msgcat::mcset cs "Details >>" "Detaily >>"
-    ::msgcat::mcset cs "Directory \"%1\$s\" does not exist." "Adres\341\u0159 \"%1\$s\" neexistuje."
-    ::msgcat::mcset cs "&Directory:" "&Adres\341\u0159:"
-    ::msgcat::mcset cs "Error: %1\$s" "Chyba: %1\$s"
-    ::msgcat::mcset cs "Exit" "Konec"
-    ::msgcat::mcset cs "File \"%1\$s\" already exists.\n\n" "Soubor \"%1\$s\" ji\u017e existuje.\n\n"
-    ::msgcat::mcset cs "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Soubor \"%1\$s\" ji\u017e existuje.\nChcete jej p\u0159epsat?"
-    ::msgcat::mcset cs "File \"%1\$s\" does not exist." "Soubor \"%1\$s\" neexistuje."
-    ::msgcat::mcset cs "File &name:" "&Jm\351no souboru:"
-    ::msgcat::mcset cs "File &names:" "&Jm\351na soubor\u016f:"
-    ::msgcat::mcset cs "Files of &type:" "&Typy soubor\u016f:"
-    ::msgcat::mcset cs "Fi&les:" "Sou&bory:"
-    ::msgcat::mcset cs "&Filter" "&Filtr"
-    ::msgcat::mcset cs "Fil&ter:" "Fil&tr:"
-    ::msgcat::mcset cs "&Green" "Ze&len\341"
-    ::msgcat::mcset cs "Hi"
-    ::msgcat::mcset cs "Hide Console" "Skr\375t konsolu"
-    ::msgcat::mcset cs "&Ignore" "&Ignorovat"
-    ::msgcat::mcset cs "Invalid file name \"%1\$s\"." "\u0160patn\351 jm\351no souboru \"%1\$s\"."
-    ::msgcat::mcset cs "Log Files" "Log soubory"
-    ::msgcat::mcset cs "&No" "&Ne"
-    ::msgcat::mcset cs "&OK"
-    ::msgcat::mcset cs "Ok"
-    ::msgcat::mcset cs "Open" "Otev\u0159\355t"
-    ::msgcat::mcset cs "&Open" "&Otev\u0159\355t"
-    ::msgcat::mcset cs "Open Multiple Files" "Otev\u0159\355t v\355ce soubor\u016f"
-    ::msgcat::mcset cs "Paste" "Vlo\u017eit"
-    ::msgcat::mcset cs "Quit" "Skon\u010dit"
-    ::msgcat::mcset cs "&Red" " \u010ce&rven\341"
-    ::msgcat::mcset cs "Replace existing file?" "Nahradit st\341vaj\355c\355 soubor?"
-    ::msgcat::mcset cs "&Retry" "Z&novu"
-    ::msgcat::mcset cs "&Save" "&Ulo\u017eit"
-    ::msgcat::mcset cs "Save As" "Ulo\u017eit jako"
-    ::msgcat::mcset cs "Save To Log" "Ulo\u017eit do logu"
-    ::msgcat::mcset cs "Select Log File" "Vybrat log soubor"
-    ::msgcat::mcset cs "Select a file to source" "Vybrat soubor k nahr\341n\355"
-    ::msgcat::mcset cs "&Selection:" "&V\375b\u011br:"
-    ::msgcat::mcset cs "Skip Messages" "P\u0159esko\u010dit zpr\341vy"
-    ::msgcat::mcset cs "Source..." "Nahr\341t..."
-    ::msgcat::mcset cs "Tcl Scripts" "Tcl skripty"
-    ::msgcat::mcset cs "Tcl for Windows" "Tcl pro Windows"
-    ::msgcat::mcset cs "Text Files" "Textov\351 soubory"
-    ::msgcat::mcset cs "&Yes" "&Ano"
-    ::msgcat::mcset cs "abort" "p\u0159eru\u0161it"
-    ::msgcat::mcset cs "blue" "modr\341"
-    ::msgcat::mcset cs "cancel" "zru\u0161it"
-    ::msgcat::mcset cs "extension" "p\u0159\355pona"
-    ::msgcat::mcset cs "extensions" "p\u0159\355pony"
-    ::msgcat::mcset cs "green" "zelen\341"
-    ::msgcat::mcset cs "ignore" "ignorovat"
-    ::msgcat::mcset cs "ok"
-    ::msgcat::mcset cs "red" "\u010derven\341"
-    ::msgcat::mcset cs "retry" "znovu"
-    ::msgcat::mcset cs "yes" "ano"
-}
diff --git a/ext/tk/sample/msgs_tk/de.msg b/ext/tk/sample/msgs_tk/de.msg
deleted file mode 100644
index 437f2ed9e7..0000000000
--- a/ext/tk/sample/msgs_tk/de.msg
+++ /dev/null
@@ -1,88 +0,0 @@
-namespace eval ::tkmsgcat_demo {
-    ::msgcat::mcset de "Application Error" "Applikationsfehler"
-    ::msgcat::mcset de "Blue" "Blau"
-    ::msgcat::mcset de "Color" "Farbe"
-    ::msgcat::mcset de "Delete" "L\u00f6schen"
-    ::msgcat::mcset de "Error" "Fehler"
-    ::msgcat::mcset de "Exit" "Ende"
-    ::msgcat::mcset de "Green" "Gr\u00fcn"
-    ::msgcat::mcset de "Red" "Rot"
-    ::msgcat::mcset de "blue" "blau"
-    ::msgcat::mcset de "green" "gr\u00fcn"
-    ::msgcat::mcset de "red" "rot"
-}
-
-namespace eval ::tk {
-    ::msgcat::mcset de "&Abort" "&Abbruch"
-    ::msgcat::mcset de "&About..." "&\u00dcber..."
-    ::msgcat::mcset de "All Files" "Alle Dateien"
-    ::msgcat::mcset de "Application Error" "Applikationsfehler"
-    ::msgcat::mcset de "&Blue" "&Blau"
-    ::msgcat::mcset de "&Cancel" "&Abbruch"
-    ::msgcat::mcset de "Cannot change to the directory \"%1\$s\".\nPermission denied." "Kann nicht in das Verzeichnis \"%1\$s\" wechseln.\nKeine Rechte vorhanden."
-    ::msgcat::mcset de "Choose Directory" "W\u00e4hle Verzeichnis"
-    ::msgcat::mcset de "&Clear" "&R\u00fccksetzen"
-    ::msgcat::mcset de "&Clear Console" "&Konsole l\u00f6schen"
-    ::msgcat::mcset de "Color" "Farbe"
-    ::msgcat::mcset de "Console" "Konsole"
-    ::msgcat::mcset de "&Copy" "&Kopieren"
-    ::msgcat::mcset de "Cu&t" "Aus&schneiden"
-    ::msgcat::mcset de "&Delete" "&L\u00f6schen"
-    ::msgcat::mcset de "Details >>"
-    ::msgcat::mcset de "Directory \"%1\$s\" does not exist." "Das Verzeichnis \"%1\$s\" existiert nicht."
-    ::msgcat::mcset de "&Directory:" "&Verzeichnis:"
-    ::msgcat::mcset de "&Edit" "&Bearbieten"
-    ::msgcat::mcset de "Error: %1\$s" "Fehler: %1\$s"
-    ::msgcat::mcset de "E&xit" "&Ende"
-    ::msgcat::mcset de "&File" "&Datei"
-    ::msgcat::mcset de "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Die Datei \"%1\$s\" ist bereits vorhanden.\nWollen sie diese Datei \u00fcberschreiben ?"
-    ::msgcat::mcset de "File \"%1\$s\" already exists.\n\n" "Die Datei \"%1\$s\" ist bereits vorhanden.\n\n"
-    ::msgcat::mcset de "File \"%1\$s\" does not exist." "Die Datei \"%1\$s\" existiert nicht."
-    ::msgcat::mcset de "File &name:" "Datei&name:"
-    ::msgcat::mcset de "File &names:" "Datei&namen:"
-    ::msgcat::mcset de "Files of &type:" "Dateien des &Typs:"
-    ::msgcat::mcset de "Fi&les:" "Dat&eien:"
-    ::msgcat::mcset de "&Filter"
-    ::msgcat::mcset de "Fil&ter:"
-    ::msgcat::mcset de "&Green" "&Gr\u00fcn"
-    ::msgcat::mcset de "&Help" "&Hilfe"
-    ::msgcat::mcset de "Hi" "Hallo"
-    ::msgcat::mcset de "&Hide Console" "&Konsole unsichtbar machen"
-    ::msgcat::mcset de "&Ignore" "&Ignorieren"
-    ::msgcat::mcset de "Invalid file name \"%1\$s\"." "Ung\u00fcltiger Dateiname \"%1\$s\"."
-    ::msgcat::mcset de "Log Files" "Protokolldatei"
-    ::msgcat::mcset de "&No" "&Nein"
-    ::msgcat::mcset de "OK"
-    ::msgcat::mcset de "Ok"
-    ::msgcat::mcset de "Open" "\u00d6ffnen"
-    ::msgcat::mcset de "&Open" "\u00d6&ffnen"
-    ::msgcat::mcset de "Open Multiple Files"
-    ::msgcat::mcset de "P&aste" "E&inf\u00fcgen"
-    ::msgcat::mcset de "&Quit" "&Beenden"
-    ::msgcat::mcset de "&Red" "&Rot"
-    ::msgcat::mcset de "Replace existing file?" "Existierende Datei ersetzen?"
-    ::msgcat::mcset de "&Retry" "&Wiederholen"
-    ::msgcat::mcset de "&Save" "&Speichern"
-    ::msgcat::mcset de "Save As" "Speichern unter"
-    ::msgcat::mcset de "Save To Log" "In Protokoll speichern"
-    ::msgcat::mcset de "Select Log File" "Protokolldatei ausw\u00e4hlen"
-    ::msgcat::mcset de "Select a file to source" "Auszuf\u00fchrende Datei ausw\u00e4hlen"
-    ::msgcat::mcset de "&Selection:" "Auswah&l:"
-    ::msgcat::mcset de "Skip Messages" "Weitere Nachrichten \u00fcberspringen"
-    ::msgcat::mcset de "&Source..." "&Ausf\u00fchren..."
-    ::msgcat::mcset de "Tcl Scripts" "Tcl-Skripte"
-    ::msgcat::mcset de "Tcl for Windows" "Tcl f\u00fcr Windows"
-    ::msgcat::mcset de "Text Files" "Textdateien"
-    ::msgcat::mcset de "&Yes" "&Ja"
-    ::msgcat::mcset de "abort" "abbrechen"
-    ::msgcat::mcset de "blue" "blau"
-    ::msgcat::mcset de "cancel" "abbrechen"
-    ::msgcat::mcset de "extension" "Erweiterung"
-    ::msgcat::mcset de "extensions" "Erweiterungen"
-    ::msgcat::mcset de "green" "gr\u00fcn"
-    ::msgcat::mcset de "ignore" "ignorieren"
-    ::msgcat::mcset de "ok"
-    ::msgcat::mcset de "red" "rot"
-    ::msgcat::mcset de "retry" "wiederholen"
-    ::msgcat::mcset de "yes" "ja"
-}
diff --git a/ext/tk/sample/msgs_tk/el.msg b/ext/tk/sample/msgs_tk/el.msg
deleted file mode 100644
index ee75af3ced..0000000000
--- a/ext/tk/sample/msgs_tk/el.msg
+++ /dev/null
@@ -1,103 +0,0 @@
-namespace eval ::tkmsgcat_demo {
-    ::msgcat::mcset el "Application Error"  "\u039b\u03ac\u03b8\u03bf\u03c2 \u0395\u03c6\u03b1\u03c1\u03bc\u03bf\u03b3\u03ae\u03c2"
-    ::msgcat::mcset el "Blue"     "\u039c\u03c0\u03bb\u03b5"
-    ::msgcat::mcset el "Color"    "\u03a7\u03c1\u03ce\u03bc\u03b1"
-    ::msgcat::mcset el "Delete"   "\u0394\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae"
-    ::msgcat::mcset el "Error"	  "\u039b\u03ac\u03b8\u03bf\u03c2"
-    ::msgcat::mcset el "Exit"     "\u0388\u03be\u03bf\u03b4\u03bf\u03c2"
-    ::msgcat::mcset el "Green"    "\u03a0\u03c1\u03ac\u03c3\u03b9\u03bd\u03bf"
-    ::msgcat::mcset el "Red"      "\u039a\u03cc\u03ba\u03ba\u03b9\u03bd\u03bf"
-    ::msgcat::mcset el "blue"     "\u03bc\u03c0\u03bb\u03b5"
-    ::msgcat::mcset el "green"    "\u03c0\u03c1\u03ac\u03c3\u03b9\u03bd\u03bf"
-    ::msgcat::mcset el "red"      "\u03ba\u03cc\u03ba\u03ba\u03b9\u03bd\u03bf"
-}
-
-
-# followings are same to original file included into Tk8.5a1's widget demos.
-
-## Messages for the Greek (Hellenic - "el") language.
-## Please report any changes/suggestions to:
-##    petasis@iit.demokritos.gr
-
-namespace eval ::tk {
-    ::msgcat::mcset el "&Abort"              "\u03a4\u03b5\u03c1\u03bc\u03b1\u03c4\u03b9\u03c3\u03bc\u03cc\u03c2"
-    ::msgcat::mcset el "About..."           "\u03a3\u03c7\u03b5\u03c4\u03b9\u03ba\u03ac..."
-    ::msgcat::mcset el "All Files"          "\u038c\u03bb\u03b1 \u03c4\u03b1 \u0391\u03c1\u03c7\u03b5\u03af\u03b1"
-    ::msgcat::mcset el "Application Error"  "\u039b\u03ac\u03b8\u03bf\u03c2 \u0395\u03c6\u03b1\u03c1\u03bc\u03bf\u03b3\u03ae\u03c2"
-    ::msgcat::mcset el "&Blue"               "\u039c\u03c0\u03bb\u03b5"
-    ::msgcat::mcset el "&Cancel"             "\u0391\u03ba\u03cd\u03c1\u03c9\u03c3\u03b7"
-    ::msgcat::mcset el \
-"Cannot change to the directory \"%1\$s\".\nPermission denied." \
-"\u0394\u03b5\u03bd \u03b5\u03af\u03bd\u03b1\u03b9 \u03b4\u03c5\u03bd\u03b1\u03c4\u03ae \u03b7 \u03b1\u03bb\u03bb\u03b1\u03b3\u03ae \u03ba\u03b1\u03c4\u03b1\u03bb\u03cc\u03b3\u03bf\u03c5 \u03c3\u03b5 \"%1\$s\".\n\u0397 \u03c0\u03c1\u03cc\u03c3\u03b2\u03b1\u03c3\u03b7 \u03b4\u03b5\u03bd \u03b5\u03c0\u03b9\u03c4\u03c1\u03ad\u03c0\u03b5\u03c4\u03b1\u03b9."
-    ::msgcat::mcset el "Choose Directory"   "\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae \u039a\u03b1\u03c4\u03b1\u03bb\u03cc\u03b3\u03bf\u03c5"
-    ::msgcat::mcset el "Clear"              "\u039a\u03b1\u03b8\u03b1\u03c1\u03b9\u03c3\u03bc\u03cc\u03c2"
-    ::msgcat::mcset el "Color"              "\u03a7\u03c1\u03ce\u03bc\u03b1"
-    ::msgcat::mcset el "Console"            "\u039a\u03bf\u03bd\u03c3\u03cc\u03bb\u03b1"
-    ::msgcat::mcset el "Copy"               "\u0391\u03bd\u03c4\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae"
-    ::msgcat::mcset el "Cut"                "\u0391\u03c0\u03bf\u03ba\u03bf\u03c0\u03ae"
-    ::msgcat::mcset el "Delete"             "\u0394\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae"
-    ::msgcat::mcset el "Details >>"         "\u039b\u03b5\u03c0\u03c4\u03bf\u03bc\u03ad\u03c1\u03b5\u03b9\u03b5\u03c2 >>"
-    ::msgcat::mcset el "Directory \"%1\$s\" does not exist." \
-                                        "\u039f \u03ba\u03b1\u03c4\u03ac\u03bb\u03bf\u03b3\u03bf\u03c2 \"%1\$s\" \u03b4\u03b5\u03bd \u03c5\u03c0\u03ac\u03c1\u03c7\u03b5\u03b9."
-    ::msgcat::mcset el "&Directory:"         "&\u039a\u03b1\u03c4\u03ac\u03bb\u03bf\u03b3\u03bf\u03c2:"
-    ::msgcat::mcset el "Error: %1\$s"       "\u039b\u03ac\u03b8\u03bf\u03c2: %1\$s"
-    ::msgcat::mcset el "Exit"               "\u0388\u03be\u03bf\u03b4\u03bf\u03c2"
-    ::msgcat::mcset el \
-               "File \"%1\$s\" already exists.\nDo you want to overwrite it?" \
-               "\u03a4\u03bf \u03b1\u03c1\u03c7\u03b5\u03af\u03bf \"%1\$s\" \u03ae\u03b4\u03b7 \u03c5\u03c0\u03ac\u03c1\u03c7\u03b5\u03b9.\n\u0398\u03ad\u03bb\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03b5\u03c0\u03b9\u03ba\u03b1\u03bb\u03c5\u03c6\u03b8\u03b5\u03af;"
-    ::msgcat::mcset el "File \"%1\$s\" already exists.\n\n" \
-                   "\u03a4\u03bf \u03b1\u03c1\u03c7\u03b5\u03af\u03bf \"%1\$s\" \u03ae\u03b4\u03b7 \u03c5\u03c0\u03ac\u03c1\u03c7\u03b5\u03b9.\n\n"
-    ::msgcat::mcset el "File \"%1\$s\" does not exist." \
-                   "\u03a4\u03bf \u03b1\u03c1\u03c7\u03b5\u03af\u03bf \"%1\$s\" \u03b4\u03b5\u03bd \u03c5\u03c0\u03ac\u03c1\u03c7\u03b5\u03b9."
-    ::msgcat::mcset el "File &name:"         "\u038c&\u03bd\u03bf\u03bc\u03b1 \u03b1\u03c1\u03c7\u03b5\u03af\u03bf\u03c5:"
-    ::msgcat::mcset el "File &names:"        "\u038c&\u03bd\u03bf\u03bc\u03b1 \u03b1\u03c1\u03c7\u03b5\u03af\u03c9\u03bd:"
-    ::msgcat::mcset el "Files of &type:"     "\u0391\u03c1\u03c7\u03b5\u03af\u03b1 \u03c4\u03bf\u03c5 &\u03c4\u03cd\u03c0\u03bf\u03c5:"
-    ::msgcat::mcset el "Fi&les:"             "\u0391\u03c1\u03c7\u03b5\u03af\u03b1:"
-    ::msgcat::mcset el "&Filter"             "\u03a6\u03af\u03bb\u03c4\u03c1\u03bf"
-    ::msgcat::mcset el "Fil&ter:"            "\u03a6\u03af\u03bb\u03c4\u03c1\u03bf:"
-    ::msgcat::mcset el "&Green"              "\u03a0\u03c1\u03ac\u03c3\u03b9\u03bd\u03bf"
-    ::msgcat::mcset el "Hi"                 "\u0393\u03b5\u03b9\u03b1"
-    ::msgcat::mcset el "Hide Console"       "\u0391\u03c0\u03cc\u03ba\u03c1\u03c5\u03c8\u03b7 \u03ba\u03bf\u03bd\u03c3\u03cc\u03bb\u03b1\u03c2"
-    ::msgcat::mcset el "&Ignore"             "\u0391\u03b3\u03bd\u03cc\u03b7\u03c3\u03b7"
-    ::msgcat::mcset el "Invalid file name \"%1\$s\"." \
-                   "\u0386\u03ba\u03c5\u03c1\u03bf \u03cc\u03bd\u03bf\u03bc\u03b1 \u03b1\u03c1\u03c7\u03b5\u03af\u03bf\u03c5 \"%1\$s\"."
-    ::msgcat::mcset el "Log Files"          "\u0391\u03c1\u03c7\u03b5\u03af\u03b1 \u039a\u03b1\u03c4\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae\u03c2"
-    ::msgcat::mcset el "&No"                 "\u038c\u03c7\u03b9"
-    ::msgcat::mcset el "&OK"                 "\u0395\u03bd\u03c4\u03ac\u03be\u03b5\u03b9"
-    ::msgcat::mcset el "&Ok"                 "\u0395\u03bd\u03c4\u03ac\u03be\u03b5\u03b9"
-    ::msgcat::mcset el "Open"               "\u0386\u03bd\u03bf\u03b9\u03b3\u03bc\u03b1"
-    ::msgcat::mcset el "&Open"               "\u0386\u03bd\u03bf\u03b9\u03b3\u03bc\u03b1"
-    ::msgcat::mcset el "Open Multiple Files" \
-                                        "\u0386\u03bd\u03bf\u03b9\u03b3\u03bc\u03b1 \u03c0\u03bf\u03bb\u03bb\u03b1\u03c0\u03bb\u03ce\u03bd \u03b1\u03c1\u03c7\u03b5\u03af\u03c9\u03bd"
-    ::msgcat::mcset el "Paste"              "\u0395\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7"
-    ::msgcat::mcset el "Quit"               "\u0388\u03be\u03bf\u03b4\u03bf\u03c2"
-    ::msgcat::mcset el "&Red"                "\u039a\u03cc\u03ba\u03ba\u03b9\u03bd\u03bf"
-    ::msgcat::mcset el "Replace existing file?" \
-                                        "\u0395\u03c0\u03b9\u03ba\u03ac\u03bb\u03c5\u03c8\u03b7 \u03c5\u03c0\u03ac\u03c1\u03c7\u03bf\u03bd\u03c4\u03bf\u03c2 \u03b1\u03c1\u03c7\u03b5\u03af\u03bf\u03c5;"
-    ::msgcat::mcset el "&Retry"              "\u03a0\u03c1\u03bf\u03c3\u03c0\u03ac\u03b8\u03b7\u03c3\u03b5 \u03be\u03b1\u03bd\u03ac"
-    ::msgcat::mcset el "&Save"               "\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7"
-    ::msgcat::mcset el "Save As"            "\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7 \u03c3\u03b1\u03bd"
-    ::msgcat::mcset el "Save To Log"        "\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7 \u03c3\u03c4\u03bf \u03b1\u03c1\u03c7\u03b5\u03af\u03bf \u03ba\u03b1\u03c4\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae\u03c2"
-    ::msgcat::mcset el "Select Log File"    "\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae \u03b1\u03c1\u03c7\u03b5\u03af\u03bf\u03c5 \u03ba\u03b1\u03c4\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae\u03c2"
-    ::msgcat::mcset el "Select a file to source" \
-                                        "\u0395\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03b1\u03c1\u03c7\u03b5\u03af\u03bf \u03b3\u03b9\u03b1 \u03b5\u03ba\u03c4\u03ad\u03bb\u03b5\u03c3\u03b7"
-    ::msgcat::mcset el "&Selection:"         "\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae:"
-    ::msgcat::mcset el "Skip Messages"      "\u0391\u03c0\u03bf\u03c6\u03c5\u03b3\u03ae \u03bc\u03c5\u03bd\u03b7\u03bc\u03ac\u03c4\u03c9\u03bd"
-    ::msgcat::mcset el "Source..."          "\u0395\u03ba\u03c4\u03ad\u03bb\u03b5\u03c3\u03b7..."
-    ::msgcat::mcset el "Tcl Scripts"        "Tcl Scripts"
-    ::msgcat::mcset el "Tcl for Windows"    "Tcl \u03b3\u03b9\u03b1 Windows"
-    ::msgcat::mcset el "Text Files"         "\u0391\u03c1\u03c7\u03b5\u03af\u03b1 \u039a\u03b5\u03b9\u03bc\u03ad\u03bd\u03bf\u03c5"
-    ::msgcat::mcset el "&Yes"                "\u039d\u03b1\u03b9"
-    ::msgcat::mcset el "abort"              "\u03c4\u03b5\u03c1\u03bc\u03b1\u03c4\u03b9\u03c3\u03bc\u03cc\u03c2"
-    ::msgcat::mcset el "blue"               "\u03bc\u03c0\u03bb\u03b5"
-    ::msgcat::mcset el "cancel"             "\u03b1\u03ba\u03cd\u03c1\u03c9\u03c3\u03b7"
-    ::msgcat::mcset el "extension"          "\u03b5\u03c0\u03ad\u03ba\u03c4\u03b1\u03c3\u03b7"
-    ::msgcat::mcset el "extensions"         "\u03b5\u03c0\u03b5\u03ba\u03c4\u03ac\u03c3\u03b5\u03b9\u03c2"
-    ::msgcat::mcset el "green"              "\u03c0\u03c1\u03ac\u03c3\u03b9\u03bd\u03bf"
-    ::msgcat::mcset el "ignore"             "\u03b1\u03b3\u03bd\u03cc\u03b7\u03c3\u03b7"
-    ::msgcat::mcset el "ok"                 "\u03b5\u03bd\u03c4\u03ac\u03be\u03b5\u03b9"
-    ::msgcat::mcset el "red"                "\u03ba\u03cc\u03ba\u03ba\u03b9\u03bd\u03bf"
-    ::msgcat::mcset el "retry"              "\u03c0\u03c1\u03bf\u03c3\u03c0\u03ac\u03b8\u03b7\u03c3\u03b5 \u03be\u03b1\u03bd\u03ac"
-    ::msgcat::mcset el "yes"                "\u03bd\u03b1\u03b9"
-}
-
diff --git a/ext/tk/sample/msgs_tk/en.msg b/ext/tk/sample/msgs_tk/en.msg
deleted file mode 100644
index de586d195e..0000000000
--- a/ext/tk/sample/msgs_tk/en.msg
+++ /dev/null
@@ -1,83 +0,0 @@
-namespace eval ::tkmsgcat_demo {
-    ::msgcat::mcset en "Application Error"
-    ::msgcat::mcset en "Blue"
-    ::msgcat::mcset en "Color"
-    ::msgcat::mcset en "Delete"
-    ::msgcat::mcset en "Error"
-    ::msgcat::mcset en "Green"
-    ::msgcat::mcset en "Red"
-    ::msgcat::mcset en "blue"
-    ::msgcat::mcset en "green"
-    ::msgcat::mcset en "red"
-}
-
-namespace eval ::tk {
-    ::msgcat::mcset en "&Abort"
-    ::msgcat::mcset en "About..."
-    ::msgcat::mcset en "All Files"
-    ::msgcat::mcset en "Application Error"
-    ::msgcat::mcset en "&Blue"
-    ::msgcat::mcset en "&Cancel"
-    ::msgcat::mcset en "Cannot change to the directory \"%1\$s\".\nPermission denied."
-    ::msgcat::mcset en "Choose Directory"
-    ::msgcat::mcset en "Clear"
-    ::msgcat::mcset en "Color"
-    ::msgcat::mcset en "Console"
-    ::msgcat::mcset en "Copy"
-    ::msgcat::mcset en "Cut"
-    ::msgcat::mcset en "Delete"
-    ::msgcat::mcset en "Details >>"
-    ::msgcat::mcset en "Directory \"%1\$s\" does not exist."
-    ::msgcat::mcset en "&Directory:"
-    ::msgcat::mcset en "Error: %1\$s"
-    ::msgcat::mcset en "Exit"
-    ::msgcat::mcset en "File \"%1\$s\" already exists.\nDo you want to overwrite it?"
-    ::msgcat::mcset en "File \"%1\$s\" already exists.\n\n"
-    ::msgcat::mcset en "File \"%1\$s\" does not exist."
-    ::msgcat::mcset en "File &name:"
-    ::msgcat::mcset en "File &names:"
-    ::msgcat::mcset en "Files of &type:"
-    ::msgcat::mcset en "Fi&les:"
-    ::msgcat::mcset en "&Filter"
-    ::msgcat::mcset en "Fil&ter:"
-    ::msgcat::mcset en "&Green"
-    ::msgcat::mcset en "Hi"
-    ::msgcat::mcset en "Hide Console"
-    ::msgcat::mcset en "&Ignore"
-    ::msgcat::mcset en "Invalid file name \"%1\$s\"."
-    ::msgcat::mcset en "Log Files"
-    ::msgcat::mcset en "&No"
-    ::msgcat::mcset en "&OK"
-    ::msgcat::mcset en "Ok"
-    ::msgcat::mcset en "Open"
-    ::msgcat::mcset en "&Open"
-    ::msgcat::mcset en "Open Multiple Files"
-    ::msgcat::mcset en "Paste"
-    ::msgcat::mcset en "Quit"
-    ::msgcat::mcset en "&Red"
-    ::msgcat::mcset en "Replace existing file?"
-    ::msgcat::mcset en "&Retry"
-    ::msgcat::mcset en "&Save"
-    ::msgcat::mcset en "Save As"
-    ::msgcat::mcset en "Save To Log"
-    ::msgcat::mcset en "Select Log File"
-    ::msgcat::mcset en "Select a file to source"
-    ::msgcat::mcset en "&Selection:"
-    ::msgcat::mcset en "Skip Messages"
-    ::msgcat::mcset en "Source..."
-    ::msgcat::mcset en "Tcl Scripts"
-    ::msgcat::mcset en "Tcl for Windows"
-    ::msgcat::mcset en "Text Files"
-    ::msgcat::mcset en "&Yes"
-    ::msgcat::mcset en "abort"
-    ::msgcat::mcset en "blue"
-    ::msgcat::mcset en "cancel"
-    ::msgcat::mcset en "extension"
-    ::msgcat::mcset en "extensions"
-    ::msgcat::mcset en "green"
-    ::msgcat::mcset en "ignore"
-    ::msgcat::mcset en "ok"
-    ::msgcat::mcset en "red"
-    ::msgcat::mcset en "retry"
-    ::msgcat::mcset en "yes"
-}
diff --git a/ext/tk/sample/msgs_tk/en_gb.msg b/ext/tk/sample/msgs_tk/en_gb.msg
deleted file mode 100644
index 1aa5b49380..0000000000
--- a/ext/tk/sample/msgs_tk/en_gb.msg
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace eval ::tkmsgcat_demo {
-    ::msgcat::mcset en_gb Color Colour
-}
-
-namespace eval ::tk {
-    ::msgcat::mcset en_gb Color Colour
-}
diff --git a/ext/tk/sample/msgs_tk/eo.msg b/ext/tk/sample/msgs_tk/eo.msg
deleted file mode 100644
index e683cef297..0000000000
--- a/ext/tk/sample/msgs_tk/eo.msg
+++ /dev/null
@@ -1,87 +0,0 @@
-namespace eval ::tkmsgcat_demo {
-    ::msgcat::mcset eo "Application Error" "Aplikoerraro"
-    ::msgcat::mcset eo "Blue" "Blua"
-    ::msgcat::mcset eo "Color" "Farbo"
-    ::msgcat::mcset eo "Delete" "Forprenu"
-    ::msgcat::mcset eo "Error" "Eraro"
-    ::msgcat::mcset eo "Exit" "Eliru"
-    ::msgcat::mcset eo "Green" "Verda"
-    ::msgcat::mcset eo "Red" "Rosa"
-    ::msgcat::mcset eo "blue" "blua"
-    ::msgcat::mcset eo "green" "verda"
-    ::msgcat::mcset eo "red" "ru\u011da"
-}
-
-namespace eval ::tk {
-    ::msgcat::mcset eo "&Abort" "&\u0108esigo"
-    ::msgcat::mcset eo "&About..." "Pri..."
-    ::msgcat::mcset eo "All Files" "\u0108ioj dosieroj"
-    ::msgcat::mcset eo "Application Error" "Aplikoerraro"
-    ::msgcat::mcset eo "&Blue" "&Blua"
-    ::msgcat::mcset eo "&Cancel" "&Rezignu"
-    ::msgcat::mcset eo "Cannot change to the directory \"%1\$s\".\nPermission denied." "Neeble \u0109angi al dosierulon \"%1\$s\".\nVi ne rajtas tion."
-    ::msgcat::mcset eo "Choose Directory" "Elektu Dosierujo"
-    ::msgcat::mcset eo "&Clear" "&Klaru"
-    ::msgcat::mcset eo "&Clear Console" "&Klaru konzolon"
-    ::msgcat::mcset eo "Color" "Farbo"
-    ::msgcat::mcset eo "Console" "Konzolo"
-    ::msgcat::mcset eo "&Copy" "&Kopiu"
-    ::msgcat::mcset eo "Cu&t" "&Enpo\u015digu"
-    ::msgcat::mcset eo "&Delete" "&Forprenu"
-    ::msgcat::mcset eo "Details >>" "Detaloj >>"
-    ::msgcat::mcset eo "Directory \"%1\$s\" does not exist." "La dosierujo \"%1\$s\" ne ekzistas."
-    ::msgcat::mcset eo "&Directory:" "&Dosierujo:"
-    ::msgcat::mcset eo "&Edit" "&Redaktu"
-    ::msgcat::mcset eo "Error: %1\$s" "Eraro: %1\$s"
-    ::msgcat::mcset eo "E&xit" "&Eliru"
-    ::msgcat::mcset eo "&File" "&Dosiero"
-    ::msgcat::mcset eo "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "La dosiero \"%1\$s\" jam ekzistas.\n\u0108u vi volas anstata\u00fbigi la dosieron?"
-    ::msgcat::mcset eo "File \"%1\$s\" already exists.\n\n" "La dosiero \"%1\$s\" jam egzistas. \n\n"
-    ::msgcat::mcset eo "File \"%1\$s\" does not exist." "La dosierp \"%1\$s\" ne estas."
-    ::msgcat::mcset eo "File &name:" "Dosiero&nomo:"
-    ::msgcat::mcset eo "File &names:" "Dosiero&nomoj:"
-    ::msgcat::mcset eo "Files of &type:" "Dosieroj de &Typo:"
-    ::msgcat::mcset eo "Fi&les:" "Do&sieroj:"
-    ::msgcat::mcset eo "&Filter" "&Filtrilo"
-    ::msgcat::mcset eo "Fil&ter:" "&Filtrilo:"
-    ::msgcat::mcset eo "&Green" "&Verda"
-    ::msgcat::mcset eo "&Help" "&Helpu"
-    ::msgcat::mcset eo "Hi" "Saluton"
-    ::msgcat::mcset eo "&Hide Console" "&Ka\u015du konzolon"
-    ::msgcat::mcset eo "&Ignore" "&Ignoru"
-    ::msgcat::mcset eo "Invalid file name \"%1\$s\"." "Malvalida dosieronomo \"%1\$s\"."
-    ::msgcat::mcset eo "Log Files" "Protokolo"
-    ::msgcat::mcset eo "&No" "&Ne"
-    ::msgcat::mcset eo "OK"
-    ::msgcat::mcset eo "Ok"
-    ::msgcat::mcset eo "Open" "Malfermu"
-    ::msgcat::mcset eo "&Open" "&Malfermu"
-    ::msgcat::mcset eo "Open Multiple Files" "Melfermu multan dosierojn"
-    ::msgcat::mcset eo "P&aste" "&Elpo\u015digi"
-    ::msgcat::mcset eo "&Quit" "&Finigu"
-    ::msgcat::mcset eo "&Red" "&Rosa"
-    ::msgcat::mcset eo "Replace existing file?" "\u0108u anstata\u00fbu ekzistantan dosieron?"
-    ::msgcat::mcset eo "&Retry" "&Ripetu"
-    ::msgcat::mcset eo "&Save" "&Savu"
-    ::msgcat::mcset eo "Save As" "Savu kiel"
-    ::msgcat::mcset eo "Save To Log" "Savu en protokolon"
-    ::msgcat::mcset eo "Select Log File" "Elektu prokolodosieron"
-    ::msgcat::mcset eo "Select a file to source" "Elektu dosieron por interpreti"
-    ::msgcat::mcset eo "&Selection:" "&Elekto:"
-    ::msgcat::mcset eo "Skip Messages" "transsaltu pluajn mesa\u011dojn"
-    ::msgcat::mcset eo "&Source..." "&Fontoprogramo..."
-    ::msgcat::mcset eo "Tcl Scripts" "Tcl-skriptoj"
-    ::msgcat::mcset eo "Tcl for Windows" "Tcl por vindoso"
-    ::msgcat::mcset eo "Text Files" "Tekstodosierojn"
-    ::msgcat::mcset eo "&Yes" "&Jes"
-    ::msgcat::mcset eo "abort" "\u0109esigo"
-    ::msgcat::mcset eo "blue" "blua"
-    ::msgcat::mcset eo "cancel" "rezignu"
-    ::msgcat::mcset eo "extension" "ekspansio"
-    ::msgcat::mcset eo "extensions" "ekspansioj"
-    ::msgcat::mcset eo "green" "verda"
-    ::msgcat::mcset eo "ignore" "ignorieren"
-    ::msgcat::mcset eo "red" "ru\u011da"
-    ::msgcat::mcset eo "retry" "ripetu"
-    ::msgcat::mcset eo "yes" "jes"
-}
diff --git a/ext/tk/sample/msgs_tk/es.msg b/ext/tk/sample/msgs_tk/es.msg
deleted file mode 100644
index 62ce33d5cc..0000000000
--- a/ext/tk/sample/msgs_tk/es.msg
+++ /dev/null
@@ -1,84 +0,0 @@
-namespace eval ::tkmsgcat_demo {
-    ::msgcat::mcset es "Application Error" "Error de la aplicaci\u00f3n"
-    ::msgcat::mcset es "Blue" "Azul"
-    ::msgcat::mcset es "Color" "Color"
-    ::msgcat::mcset es "Delete" "Borrar"
-    ::msgcat::mcset es "Error" "Error"
-    ::msgcat::mcset es "Exit" "Salir"
-    ::msgcat::mcset es "Green" "Verde"
-    ::msgcat::mcset es "Red" "Rojo"
-    ::msgcat::mcset es "blue" "azul"
-    ::msgcat::mcset es "green" "verde"
-    ::msgcat::mcset es "red" "rojo"
-}
-
-namespace eval ::tk {
-    ::msgcat::mcset es "&Abort" "&Abortar"
-    ::msgcat::mcset es "About..." "Acerca de ..."
-    ::msgcat::mcset es "All Files" "Todos los archivos"
-    ::msgcat::mcset es "Application Error" "Error de la aplicaci\u00f3n"
-    ::msgcat::mcset es "&Blue" "&Azul"
-    ::msgcat::mcset es "&Cancel" "&Cancelar"
-    ::msgcat::mcset es "Cannot change to the directory \"%1\$s\".\nPermission denied." "No es posible acceder al directorio \"%1\$s\".\nPermiso denegado."
-    ::msgcat::mcset es "Choose Directory" "Elegir directorio"
-    ::msgcat::mcset es "Clear" "Borrar"
-    ::msgcat::mcset es "Color" "Color"
-    ::msgcat::mcset es "Console" "Consola"
-    ::msgcat::mcset es "Copy" "Copiar"
-    ::msgcat::mcset es "Cut" "Cortar"
-    ::msgcat::mcset es "Delete" "Borrar"
-    ::msgcat::mcset es "Details >>" "Detalles >>"
-    ::msgcat::mcset es "Directory \"%1\$s\" does not exist." "El directorio \"%1\$s\" no existe."
-    ::msgcat::mcset es "&Directory:" "&Directorio:"
-    ::msgcat::mcset es "Error: %1\$s" "Error: %1\$s"
-    ::msgcat::mcset es "Exit" "Salir"
-    ::msgcat::mcset es "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "El archivo \"%1\$s\" ya existe.\nDesea sobreescribirlo?"
-    ::msgcat::mcset es "File \"%1\$s\" already exists.\n\n" "El archivo \"%1\$s\" ya existe.\n\n"
-    ::msgcat::mcset es "File \"%1\$s\" does not exist." "El archivo \"%1\$s\" no existe."
-    ::msgcat::mcset es "File &name:" "&Nombre de archivo:"
-    ::msgcat::mcset es "File &names:" "&Nombres de archivo:"
-    ::msgcat::mcset es "Files of &type:" "Archivos de &tipo:"
-    ::msgcat::mcset es "Fi&les:" "&Archivos:"
-    ::msgcat::mcset es "&Filter" "&Filtro"
-    ::msgcat::mcset es "Fil&ter:" "Fil&tro:"
-    ::msgcat::mcset es "&Green" "&Verde"
-    ::msgcat::mcset es "Hi" "Hola"
-    ::msgcat::mcset es "Hide Console" "Esconder la consola"
-    ::msgcat::mcset es "&Ignore" "&Ignorar"
-    ::msgcat::mcset es "Invalid file name \"%1\$s\"." "Nombre de archivo inv\u00e1lido \"%1\$s\"."
-    ::msgcat::mcset es "Log Files" "Ficheros de traza"
-    ::msgcat::mcset es "&No" "&No"
-    ::msgcat::mcset es "&OK" "&OK"
-    ::msgcat::mcset es "Ok" "Ok"
-    ::msgcat::mcset es "Open" "Abrir"
-    ::msgcat::mcset es "&Open" "&Abrir"
-    ::msgcat::mcset es "Open Multiple Files" "Abrir m\u00faltiples archivos"
-    ::msgcat::mcset es "Paste" "Pegar"
-    ::msgcat::mcset es "Quit" "Abandonar"
-    ::msgcat::mcset es "&Red" "&Rojo"
-    ::msgcat::mcset es "Replace existing file?" "Reemplazar el archivo existente?"
-    ::msgcat::mcset es "&Retry" "&Reintentar"
-    ::msgcat::mcset es "&Save" "&Salvar"
-    ::msgcat::mcset es "Save As" "Salvar como"
-    ::msgcat::mcset es "Save To Log" "Salvar al archivo de traza"
-    ::msgcat::mcset es "Select Log File" "Elegir un archivo de traza"
-    ::msgcat::mcset es "Select a file to source" "Seleccionar un archivo a evaluar"
-    ::msgcat::mcset es "&Selection:" "&Selecci\u00f3n:"
-    ::msgcat::mcset es "Skip Messages" "Omitir los mensajes"
-    ::msgcat::mcset es "Source..." "Evaluar..."
-    ::msgcat::mcset es "Tcl Scripts" "Scripts Tcl"
-    ::msgcat::mcset es "Tcl for Windows" "Tcl para Windows"
-    ::msgcat::mcset es "Text Files" "Archivos de texto"
-    ::msgcat::mcset es "&Yes" "&S\u00ed"
-    ::msgcat::mcset es "abort" "abortar"
-    ::msgcat::mcset es "blue" "azul"
-    ::msgcat::mcset es "cancel" "cancelar"
-    ::msgcat::mcset es "extension" "extensi\u00f3n"
-    ::msgcat::mcset es "extensions" "extensiones"
-    ::msgcat::mcset es "green" "verde"
-    ::msgcat::mcset es "ignore" "ignorar"
-    ::msgcat::mcset es "ok" "ok"
-    ::msgcat::mcset es "red" "rojo"
-    ::msgcat::mcset es "retry" "reintentar"
-    ::msgcat::mcset es "yes" "s\u00ed"
-}
diff --git a/ext/tk/sample/msgs_tk/fr.msg b/ext/tk/sample/msgs_tk/fr.msg
deleted file mode 100644
index ebbba48ca1..0000000000
--- a/ext/tk/sample/msgs_tk/fr.msg
+++ /dev/null
@@ -1,84 +0,0 @@
-namespace eval ::tkmsgcat_demo {
-    ::msgcat::mcset fr "Application Error" "Erreur d'application"
-    ::msgcat::mcset fr "Blue" "Bleu"
-    ::msgcat::mcset fr "Color" "Couleur"
-    ::msgcat::mcset fr "Delete" "Effacer"
-    ::msgcat::mcset fr "Error" "Erreur"
-    ::msgcat::mcset fr "Exit" "Quitter"
-    ::msgcat::mcset fr "Green" "Vert"
-    ::msgcat::mcset fr "Red" "Rouge"
-    ::msgcat::mcset fr "blue" "bleu"
-    ::msgcat::mcset fr "green" "vert"
-    ::msgcat::mcset fr "red" "rouge"
-}
-
-namespace eval ::tk {
-    ::msgcat::mcset fr "&Abort" "&Annuler"
-    ::msgcat::mcset fr "About..." "\u00c0 propos..."
-    ::msgcat::mcset fr "All Files" "Tous les fichiers"
-    ::msgcat::mcset fr "Application Error" "Erreur d'application"
-    ::msgcat::mcset fr "&Blue" "&Bleu"
-    ::msgcat::mcset fr "&Cancel" "&Annuler"
-    ::msgcat::mcset fr "Cannot change to the directory \"%1\$s\".\nPermission denied." "Impossible d'acc\u00e9der au r\u00e9pertoire \"%1\$s\".\nPermission refus\u00e9e."
-    ::msgcat::mcset fr "Choose Directory" "Choisir r\u00e9pertoire"
-    ::msgcat::mcset fr "Clear" "Effacer"
-    ::msgcat::mcset fr "Color" "Couleur"
-    ::msgcat::mcset fr "Console"
-    ::msgcat::mcset fr "Copy" "Copier"
-    ::msgcat::mcset fr "Cut" "Couper"
-    ::msgcat::mcset fr "Delete" "Effacer"
-    ::msgcat::mcset fr "Details >>" "D\u00e9tails >>"
-    ::msgcat::mcset fr "Directory \"%1\$s\" does not exist." "Le r\u00e9pertoire \"%1\$s\" n'existe pas."
-    ::msgcat::mcset fr "&Directory:" "&R\u00e9pertoire:"
-    ::msgcat::mcset fr "Error: %1\$s" "Erreur: %1\$s"
-    ::msgcat::mcset fr "Exit" "Quitter"
-    ::msgcat::mcset fr "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Le fichier \"%1\$s\" existe d\u00e9j\u00e0.\nVoulez-vous l'\u00e9craser?"
-    ::msgcat::mcset fr "File \"%1\$s\" already exists.\n\n" "Le fichier \"%1\$s\" existe d\u00e9j\u00e0.\n\n"
-    ::msgcat::mcset fr "File \"%1\$s\" does not exist." "Le fichier \"%1\$s\" n'existe pas."
-    ::msgcat::mcset fr "File &name:" "&Nom de fichier:"
-    ::msgcat::mcset fr "File &names:" "&Noms de fichiers:"
-    ::msgcat::mcset fr "Files of &type:" "&Type de fichiers:"
-    ::msgcat::mcset fr "Fi&les:" "Fich&iers:"
-    ::msgcat::mcset fr "&Filter" "&Filtre"
-    ::msgcat::mcset fr "Fil&ter:" "Fil&tre:"
-    ::msgcat::mcset fr "&Green" "&Vert"
-    ::msgcat::mcset fr "Hi" "Salut"
-    ::msgcat::mcset fr "Hide Console" "Cacher la Console"
-    ::msgcat::mcset fr "&Ignore" "&Ignorer"
-    ::msgcat::mcset fr "Invalid file name \"%1\$s\"." "Nom de fichier invalide \"%1\$s\"."
-    ::msgcat::mcset fr "Log Files" "Fichiers de trace"
-    ::msgcat::mcset fr "&No" "&Non"
-    ::msgcat::mcset fr "&OK"
-    ::msgcat::mcset fr "Ok"
-    ::msgcat::mcset fr "Open" "Ouvrir"
-    ::msgcat::mcset fr "&Open" "&Ouvrir"
-    ::msgcat::mcset fr "Open Multiple Files" "Ouvrir plusieurs fichiers"
-    ::msgcat::mcset fr "Paste" "Coller"
-    ::msgcat::mcset fr "Quit" "Quitter"
-    ::msgcat::mcset fr "&Red" "&Rouge"
-    ::msgcat::mcset fr "Replace existing file?" "Remplacer le fichier existant?"
-    ::msgcat::mcset fr "&Retry" "&R\u00e9-essayer"
-    ::msgcat::mcset fr "&Save" "&Sauvegarder"
-    ::msgcat::mcset fr "Save As" "Sauvegarder sous"
-    ::msgcat::mcset fr "Save To Log" "Sauvegarde au fichier de trace"
-    ::msgcat::mcset fr "Select Log File" "Choisir un fichier de trace"
-    ::msgcat::mcset fr "Select a file to source" "Choisir un fichier \u00e0 \u00e9valuer"
-    ::msgcat::mcset fr "&Selection:" "&S\u00e9lection:"
-    ::msgcat::mcset fr "Skip Messages" "Omettre les messages"
-    ::msgcat::mcset fr "Source..." "\u00c9valuer..."
-    ::msgcat::mcset fr "Tcl Scripts" "Scripts Tcl"
-    ::msgcat::mcset fr "Tcl for Windows" "Tcl pour Windows"
-    ::msgcat::mcset fr "Text Files" "Fichiers texte"
-    ::msgcat::mcset fr "&Yes" "&Oui"
-    ::msgcat::mcset fr "abort" "abandonner"
-    ::msgcat::mcset fr "blue" "bleu"
-    ::msgcat::mcset fr "cancel" "annuler"
-    ::msgcat::mcset fr "extension"
-    ::msgcat::mcset fr "extensions"
-    ::msgcat::mcset fr "green" "vert"
-    ::msgcat::mcset fr "ignore" "ignorer"
-    ::msgcat::mcset fr "ok"
-    ::msgcat::mcset fr "red" "rouge"
-    ::msgcat::mcset fr "retry" "r\u00e9essayer"
-    ::msgcat::mcset fr "yes" "oui"
-}
diff --git a/ext/tk/sample/msgs_tk/it.msg b/ext/tk/sample/msgs_tk/it.msg
deleted file mode 100644
index b144fcc073..0000000000
--- a/ext/tk/sample/msgs_tk/it.msg
+++ /dev/null
@@ -1,84 +0,0 @@
-namespace eval ::tkmsgcat_demo {
-    ::msgcat::mcset it "Application Error" "Errore dell' applicazione"
-    ::msgcat::mcset it "Blue" "Blu"
-    ::msgcat::mcset it "Color" "Colore"
-    ::msgcat::mcset it "Delete" "Incolla"
-    ::msgcat::mcset it "Error" "Errore"
-    ::msgcat::mcset it "Exit" "Esci"
-    ::msgcat::mcset it "Green" "Verde"
-    ::msgcat::mcset it "Red" "Rosso"
-    ::msgcat::mcset it "blue" "blu"
-    ::msgcat::mcset it "green" "verde"
-    ::msgcat::mcset it "red" "rosso"
-}
-
-namespace eval ::tk {
-    ::msgcat::mcset it "&Abort" "&Interrompi"
-    ::msgcat::mcset it "About..." "Informazioni ..."
-    ::msgcat::mcset it "All Files" "Tutti i file"
-    ::msgcat::mcset it "Application Error" "Errore dell' applicazione"
-    ::msgcat::mcset it "&Blue" "&Blu"
-    ::msgcat::mcset it "&Cancel" "&Annulla"
-    ::msgcat::mcset it "Cannot change to the directory \"%1\$s\".\nPermission denied." "Impossibile accedere alla directory \"%1\$s\".\nPermesso negato."
-    ::msgcat::mcset it "Choose Directory" "Scegli directory"
-    ::msgcat::mcset it "Clear" "Azzera"
-    ::msgcat::mcset it "Color" "Colore"
-    ::msgcat::mcset it "Console"
-    ::msgcat::mcset it "Copy" "Copia"
-    ::msgcat::mcset it "Cut" "Taglia"
-    ::msgcat::mcset it "Delete" "Incolla"
-    ::msgcat::mcset it "Details >>" "Dettagli >>"
-    ::msgcat::mcset it "Directory \"%1\$s\" does not exist." "La directory \"%1\$s\" non esiste."
-    ::msgcat::mcset it "&Directory:"
-    ::msgcat::mcset it "Error: %1\$s" "Errore: %1\$s"
-    ::msgcat::mcset it "Exit" "Esci"
-    ::msgcat::mcset it "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Il file \"%1\$s\" esiste gi\u00e0.\nVuoi sovrascriverlo?"
-    ::msgcat::mcset it "File \"%1\$s\" already exists.\n\n" "Il file \"%1\$s\" esiste gi\u00e0.\n\n"
-    ::msgcat::mcset it "File \"%1\$s\" does not exist." "Il file \"%1\$s\" non esiste."
-    ::msgcat::mcset it "File &name:" "&Nome del file:"
-    ::msgcat::mcset it "File &names:" "&Nomi dei file:"
-    ::msgcat::mcset it "Files of &type:" "File di &tipo:"
-    ::msgcat::mcset it "Fi&les:" "Fi&le:"
-    ::msgcat::mcset it "&Filter" "&Filtro"
-    ::msgcat::mcset it "Fil&ter:" "Fil&tro:"
-    ::msgcat::mcset it "&Green" "&Verde"
-    ::msgcat::mcset it "Hi" "Salve"
-    ::msgcat::mcset it "Hide Console" "Nascondi la console"
-    ::msgcat::mcset it "&Ignore" "&Ignora"
-    ::msgcat::mcset it "Invalid file name \"%1\$s\"." "Nome di file non valido \"%1\$s\"."
-    ::msgcat::mcset it "Log Files" "File di log"
-    ::msgcat::mcset it "&No"
-    ::msgcat::mcset it "&OK"
-    ::msgcat::mcset it "Ok"
-    ::msgcat::mcset it "&Open" "A&pri"
-    ::msgcat::mcset it "Open" "Apri"
-    ::msgcat::mcset it "Open Multiple Files" "Apri file multipli"
-    ::msgcat::mcset it "Paste" "Incolla"
-    ::msgcat::mcset it "Quit" "Esci"
-    ::msgcat::mcset it "&Red" "&Rosso"
-    ::msgcat::mcset it "Replace existing file?" "Sostituisci il file esistente?"
-    ::msgcat::mcset it "&Retry" "&Riprova"
-    ::msgcat::mcset it "&Save" "&Salva"
-    ::msgcat::mcset it "Save As" "Salva come"
-    ::msgcat::mcset it "Save To Log" "Salva il log"
-    ::msgcat::mcset it "Select Log File" "Scegli un file di log"
-    ::msgcat::mcset it "Select a file to source" "Scegli un file da eseguire"
-    ::msgcat::mcset it "&Selection:" "&Selezione:"
-    ::msgcat::mcset it "Skip Messages" "Salta i messaggi"
-    ::msgcat::mcset it "Source..." "Esegui..."
-    ::msgcat::mcset it "Tcl Scripts" "Scripts Tcl"
-    ::msgcat::mcset it "Tcl for Windows" "Tcl per Windows"
-    ::msgcat::mcset it "Text Files" "File di testo"
-    ::msgcat::mcset it "&Yes" "&Si"
-    ::msgcat::mcset it "abort" "interrompi"
-    ::msgcat::mcset it "blue" "blu"
-    ::msgcat::mcset it "cancel" "annulla"
-    ::msgcat::mcset it "extension" "estensione"
-    ::msgcat::mcset it "extensions" "estensioni"
-    ::msgcat::mcset it "green" "verde"
-    ::msgcat::mcset it "ignore" "ignora"
-    ::msgcat::mcset it "ok"
-    ::msgcat::mcset it "red" "rosso"
-    ::msgcat::mcset it "retry" "riprova"
-    ::msgcat::mcset it "yes" "si"
-}
diff --git a/ext/tk/sample/msgs_tk/ja.msg b/ext/tk/sample/msgs_tk/ja.msg
deleted file mode 100644
index 44a25839db..0000000000
--- a/ext/tk/sample/msgs_tk/ja.msg
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace eval ::tkmsgcat_demo {
-    ::msgcat::mcset ja "Application Error"  "\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30A8\u30E9\u30FC"
-    ::msgcat::mcset ja "Blue"    "\u9752"
-    ::msgcat::mcset ja "Color"   "\u80CC\u666F\u8272"
-    ::msgcat::mcset ja "Delete"  "\u6D88\u53BB"
-    ::msgcat::mcset ja "Error"   "\u30A8\u30E9\u30FC"
-    ::msgcat::mcset ja "Exit"    "\u7D42\u4E86"
-    ::msgcat::mcset ja "Green"   "\u7DD1"
-    ::msgcat::mcset ja "Red"     "\u8D64"
-    ::msgcat::mcset ja "blue"    "\u9752"
-    ::msgcat::mcset ja "green"   "\u7DD1"
-    ::msgcat::mcset ja "red"     "\u8D64"
-}
diff --git a/ext/tk/sample/msgs_tk/license.terms b/ext/tk/sample/msgs_tk/license.terms
deleted file mode 100644
index c0a44d3fc2..0000000000
--- a/ext/tk/sample/msgs_tk/license.terms
+++ /dev/null
@@ -1,39 +0,0 @@
-This software is copyrighted by the Regents of the University of
-California, Sun Microsystems, Inc., and other parties.  The following
-terms apply to all files associated with the software unless explicitly
-disclaimed in individual files.
-
-The authors hereby grant permission to use, copy, modify, distribute,
-and license this software and its documentation for any purpose, provided
-that existing copyright notices are retained in all copies and that this
-notice is included verbatim in any distributions. No written agreement,
-license, or royalty fee is required for any of the authorized uses.
-Modifications to this software may be copyrighted by their authors
-and need not follow the licensing terms described here, provided that
-the new terms are clearly indicated on the first page of each file where
-they apply.
-
-IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
-FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
-DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
-IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
-NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
-MODIFICATIONS.
-
-GOVERNMENT USE: If you are acquiring this software on behalf of the
-U.S. government, the Government shall have only "Restricted Rights"
-in the software and related documentation as defined in the Federal
-Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
-are acquiring the software on behalf of the Department of Defense, the
-software shall be classified as "Commercial Computer Software" and the
-Government shall have only "Restricted Rights" as defined in Clause
-252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
-authors grant the U.S. Government and others acting in its behalf
-permission to use and distribute the software in accordance with the
-terms specified in this license.
diff --git a/ext/tk/sample/msgs_tk/nl.msg b/ext/tk/sample/msgs_tk/nl.msg
deleted file mode 100644
index d9642e808c..0000000000
--- a/ext/tk/sample/msgs_tk/nl.msg
+++ /dev/null
@@ -1,123 +0,0 @@
-namespace eval ::tkmsgcat_demo {
-    ::msgcat::mcset nl "Application Error" "Toepassingsfout"
-    ::msgcat::mcset nl "Blue" "Blauw"
-    ::msgcat::mcset nl "Color" "Kleur"
-    ::msgcat::mcset nl "Delete" "Wissen"
-    ::msgcat::mcset nl "Error" "Fout"
-    ::msgcat::mcset nl "Exit" "Be\u00ebindigen"
-    ::msgcat::mcset nl "Green" "Groen"
-    ::msgcat::mcset nl "Red" "Rood"
-    ::msgcat::mcset nl "blue" "blauw"
-    ::msgcat::mcset nl "green" "groen"
-    ::msgcat::mcset nl "red" "rood"
-}
-
-namespace eval ::tk {
-    ::msgcat::mcset nl "\"%1\$s\" must be an absolute pathname" "\"%1\$s\" moet een absolute pad-naam zijn"
-    ::msgcat::mcset nl "%1\$s is not a toplevel window" "%1\$s is geen toplevel window"
-    ::msgcat::mcset nl ", or" ", of"
-    ::msgcat::mcset nl "-default, -icon, -message, -parent, -title, or -type" "-default, -icon, -message, -parent, -title, of -type"
-    ::msgcat::mcset nl "-initialdir, -mustexist, -parent, or -title" "-initialdir, -mustexist, -parent, of -title"
-    ::msgcat::mcset nl "&Abort" "&Afbreken"
-    ::msgcat::mcset nl "About..." "Over..."
-    ::msgcat::mcset nl "All Files" "Alle Bestanden"
-    ::msgcat::mcset nl "Application Error" "Toepassingsfout"
-    ::msgcat::mcset nl "&Blue" "&Blauw"
-    ::msgcat::mcset nl "&Cancel" "&Annuleren"
-    ::msgcat::mcset nl "Cannot change to the directory \"%1\$s\".\nPermission denied." "Kan niet naar map \"%1\$s\" gaan.\nU heeft hiervoor geen toestemming."
-    ::msgcat::mcset nl "Choose Directory" "Kies map"
-    ::msgcat::mcset nl "Clear" "Wissen"
-    ::msgcat::mcset nl "Clear entry, Press OK; Enter %1\$s, press OK" "Wis veld, Druk op OK; typ %1\$s in, druk op OK"
-    ::msgcat::mcset nl "&Clear Console" "&Wis Console"
-    ::msgcat::mcset nl "Color" "Kleur"
-    ::msgcat::mcset nl "Console"
-    ::msgcat::mcset nl "Copy" "Kopi\u00ebren"
-    ::msgcat::mcset nl "Cut" "Knippen"
-    ::msgcat::mcset nl "Delete" "Wissen"
-    ::msgcat::mcset nl "Details"
-    ::msgcat::mcset nl "Details >>"
-    ::msgcat::mcset nl "Directory \"%1\$s\" does not exist." "Map \"%1\$s\" bestaat niet."
-    ::msgcat::mcset nl "&Directory:" "&Map:"
-    ::msgcat::mcset nl "Edit" "Bewerken"
-    ::msgcat::mcset nl "Enter \"%1\$s\", press OK" "Typ \"%1\$s\", druk op OK"
-    ::msgcat::mcset nl "Enter \"%1\$s\", press OK, enter \"%2\$s\", press OK" "Typ \"%1\$s\", druk op OK, typ \"%2\$s\", druk op OK"
-    ::msgcat::mcset nl "Error: %1\$s" "Fout: %1\$s"
-    ::msgcat::mcset nl "Exit" "Be\u00ebindigen"
-    ::msgcat::mcset nl "File" "Bestand"
-    ::msgcat::mcset nl "File \"%1\$s\" already exists.\n\n" "Bestand \"%1\$s\" bestaat al.\n\n"
-    ::msgcat::mcset nl "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Bestand \"%1\$s\" bestaat al.\nWilt u het overschrijven?"
-    ::msgcat::mcset nl "File \"%1\$s\" does not exist." "Bestand \"%1\$s\" bestaat niet."
-    ::msgcat::mcset nl "File &name:" "Bestands&naam:"
-    ::msgcat::mcset nl "File &names:" "Bestands&namen:"
-    ::msgcat::mcset nl "Files of &type:" "Bestanden van het &type:"
-    ::msgcat::mcset nl "Fi&les:" "&Bestanden:"
-    ::msgcat::mcset nl "&Filter"
-    ::msgcat::mcset nl "Fil&ter:"
-    ::msgcat::mcset nl "&Green" "&Groen"
-    ::msgcat::mcset nl "Hi" "H\u00e9"
-    ::msgcat::mcset nl "Hide Console" "Verberg Console"
-    ::msgcat::mcset nl "&Ignore" "&Negeren"
-    ::msgcat::mcset nl "Invalid file name \"%1\$s\"." "Ongeldige bestandsnaam \"%1\$s\"."
-    ::msgcat::mcset nl "Log Files" "Log Bestanden"
-    ::msgcat::mcset nl "&No" "&Nee"
-    ::msgcat::mcset nl "&OK"
-    ::msgcat::mcset nl "Ok"
-    ::msgcat::mcset nl "&Open" "&Openen"
-    ::msgcat::mcset nl "Open" "Openen"
-    ::msgcat::mcset nl "Open Multiple Files" "Open meerdere bestanden"
-    ::msgcat::mcset nl "Paste" "Plakken"
-    ::msgcat::mcset nl "Please press %1\$s" "Druk op %1\$s, A.U.B."
-    ::msgcat::mcset nl "Please press ok" "Druk op ok, A.U.B."
-    ::msgcat::mcset nl "Press Cancel" "Druk op Annuleren"
-    ::msgcat::mcset nl "Press Ok" "Druk op Ok"
-    ::msgcat::mcset nl "Quit" "Stoppen"
-    ::msgcat::mcset nl "&Red" "&Rood"
-    ::msgcat::mcset nl "Replace existing file?" "Vervang bestaand bestand?"
-    ::msgcat::mcset nl "&Retry" "&Herhalen"
-    ::msgcat::mcset nl "&Save" "Op&slaan"
-    ::msgcat::mcset nl "Save As" "Opslaan als"
-    ::msgcat::mcset nl "Save To Log" "Opslaan naar Log"
-    ::msgcat::mcset nl "Select Log File" "Selecteer Log bestand"
-    ::msgcat::mcset nl "Select a file to source" "Selecteer bronbestand"
-    ::msgcat::mcset nl "&Selection:" "&Selectie:"
-    ::msgcat::mcset nl "Skip Messages" "Berichten overslaan"
-    ::msgcat::mcset nl "Source..." "Bron..."
-    ::msgcat::mcset nl "Tcl Scripts"
-    ::msgcat::mcset nl "Tcl for Windows" "Tcl voor Windows"
-    ::msgcat::mcset nl "Text Files" "Tekstbestanden"
-    ::msgcat::mcset nl "&Yes" "&Ja"
-    ::msgcat::mcset nl "abort" "afbreken"
-    ::msgcat::mcset nl "abort, retry, ignore, ok, cancel, no, or yes" "afbreken, opnieuw, negeren, ok, annuleren, nee, of ja"
-    ::msgcat::mcset nl "abortretryignore, ok, okcancel, retrycancel, yesno, or yesnocancel" "abortretryignore, ok, okcancel, retrycancel, yesno, of yesnocancel"
-    ::msgcat::mcset nl "bad %1\$s value \"%2\$s\": must be %3\$s" "verkeerde %1\$s waarde \"%2\$s\": moet zijn %3\$s"
-    ::msgcat::mcset nl "bad file type \"%1\$s\", should be" "verkeerd bestandstype \"%1\$s\", moet zijn"
-    ::msgcat::mcset nl "bad option \"%1\$s\": should be %2\$s" "verkeerde optie \"%1\$s\": moet zijn %2\$s"
-    ::msgcat::mcset nl "bad window path name \"%1\$s\"" "verkeerde window-padnaam \"%1\$s\""
-    ::msgcat::mcset nl "blue" "blauw"
-    ::msgcat::mcset nl "can't post %1\$s:  it isn't a descendant of %2\$s (this is a new requirement in Tk versions 3.0 and later)" "kan %1\$s niet verzenden:  het is geen afstammeling van %2\$s (dit is een nieuwe eis in Tk versies 3.0 en later)"
-    ::msgcat::mcset nl "cancel" "annuleren"
-    ::msgcat::mcset nl "default button index greater than number of buttons specified for tk_dialog" "default knop index is groter dan het aantal knoppen beschikbaar voor tk_dialog"
-    ::msgcat::mcset nl "display name to use (current one otherwise)" "te gebruiken schermnaam (anders huidige scherm)"
-    ::msgcat::mcset nl "error, info, question, or warning" "error, info, question, of warning"
-    ::msgcat::mcset nl "extension"
-    ::msgcat::mcset nl "extensions"
-    ::msgcat::mcset nl "focus group \"%1\$s\" doesn't exist" "focusgroep \"%1\$s\" bestaat niet"
-    ::msgcat::mcset nl "green" "groen"
-    ::msgcat::mcset nl "history event %1\$s"
-    ::msgcat::mcset nl "ignore" "negeren"
-    ::msgcat::mcset nl "invalid default button \"%1\$s\"" "ongeldige default knop \"%1\$s\""
-    ::msgcat::mcset nl "macType"
-    ::msgcat::mcset nl "macTypes"
-    ::msgcat::mcset nl "must specify a background color" "een achtergrondkleur is verplicht"
-    ::msgcat::mcset nl "name of the slave interpreter" "naam van de slaaf-interpreter"
-    ::msgcat::mcset nl "no winfo screen . nor env(DISPLAY)" "geen winfo scherm . noch env(DISPLAY)"
-    ::msgcat::mcset nl "ok"
-    ::msgcat::mcset nl "red" "rood"
-    ::msgcat::mcset nl "retry" "opnieuw"
-    ::msgcat::mcset nl "should contain 5 or 4 elements" "moet 4 of 5 elementen bevatten"
-    ::msgcat::mcset nl "spec"
-    ::msgcat::mcset nl "tk_chooseDirectory command" "tk_chooseDirectory opdracht"
-    ::msgcat::mcset nl "tk_chooseDirectory command, cancel gives null" "tk_chooseDirectory opdracht, annuleren geeft lege waarde"
-    ::msgcat::mcset nl "tk_chooseDirectory command, initialdir" "tk_chooseDirectory opdracht, initi\u00eble map"
-    ::msgcat::mcset nl "yes" "ja"
-}
diff --git a/ext/tk/sample/msgs_tk/pl.msg b/ext/tk/sample/msgs_tk/pl.msg
deleted file mode 100644
index 2699e42bdf..0000000000
--- a/ext/tk/sample/msgs_tk/pl.msg
+++ /dev/null
@@ -1,87 +0,0 @@
-namespace eval ::tkmsgcat_demo {
-    ::msgcat::mcset pl "Application Error" "Bl\u0105d w Programie"
-    ::msgcat::mcset pl "Blue" "Niebieski"
-    ::msgcat::mcset pl "Color" "Kolor"
-    ::msgcat::mcset pl "Delete" "Usu\u0144"
-    ::msgcat::mcset pl "Error" "B\u0142\u0105d"
-    ::msgcat::mcset pl "Exit" "Zako\u0144cz"
-    ::msgcat::mcset pl "Green" "Zielony"
-    ::msgcat::mcset pl "Red" "Czerwonz"
-    ::msgcat::mcset pl "blue" "niebieski"
-    ::msgcat::mcset pl "green" "zielony"
-    ::msgcat::mcset pl "red" "czerwony"
-}
-
-namespace eval ::tk {
-    ::msgcat::mcset pl "&Abort" "&Anuluj"
-    ::msgcat::mcset pl "&About..." "O Programie..."
-    ::msgcat::mcset pl "All Files" "Wszystkie pliki"
-    ::msgcat::mcset pl "Application Error" "Bl\u0105d w Programie"
-    ::msgcat::mcset pl "&Blue" "&Niebieski"
-    ::msgcat::mcset pl "&Cancel" "&Anuluj"
-    ::msgcat::mcset pl "Cannot change to the directory \"%1\$s\".\nPermission denied." "Katalog \"%1\$s\" nie mo\u017ce zosta\u0107 odczytany lub nie istnieje."
-    ::msgcat::mcset pl "Choose Directory" "Wybierz katalog"
-    ::msgcat::mcset pl "&Clear" "&Wyczy\u015b\u0107"
-    ::msgcat::mcset pl "&Clear Console" "&Wyczy\u015b\u0107 konsol\u0119"
-    ::msgcat::mcset pl "Color" "Kolor"
-    ::msgcat::mcset pl "Console" "Konsola"
-    ::msgcat::mcset pl "&Copy" "&Kopiuj"
-    ::msgcat::mcset pl "Cu&t" "&Wytnij"
-    ::msgcat::mcset pl "&Delete" "&Usu\u0144"
-    ::msgcat::mcset pl "Details >>" "Detale >>"
-    ::msgcat::mcset pl "Directory \"%1\$s\" does not exist." "Katalog \"%1\$s\" nie istniej."
-    ::msgcat::mcset pl "&Directory:" "&Katalog:"
-    ::msgcat::mcset pl "&Edit" "&Edytuj"
-    ::msgcat::mcset pl "Error: %1\$s" "B\u0142\u0105d: %1\$s"
-    ::msgcat::mcset pl "E&xit" "&Zako\u0144cz"
-    ::msgcat::mcset pl "&File" "&Plik"
-    ::msgcat::mcset pl "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Plik \"%1\$s\" ju\u017c istnieje.\nCzy chcesz go zast\u0105pi\u0107?"
-    ::msgcat::mcset pl "File \"%1\$s\" already exists.\n\n" "Plik \"%1\$s\" ju\u017c istnieje. \n\n"
-    ::msgcat::mcset pl "File \"%1\$s\" does not exist." "Plik \"%1\$s\" nie istnieje."
-    ::msgcat::mcset pl "File &name:" "Nazwa &pliku:"
-    ::msgcat::mcset pl "File &names:" "Nazwy &plik\u00f3w:"
-    ::msgcat::mcset pl "Files of &type:" "Pliki &typu:"
-    ::msgcat::mcset pl "Fi&les:" "Pli&ki:"
-    ::msgcat::mcset pl "&Filter" "&Filter"
-    ::msgcat::mcset pl "Fil&ter:" "&Filter:"
-    ::msgcat::mcset pl "&Green" "&Zielony"
-    ::msgcat::mcset pl "&Help" "&Pomoc"
-    ::msgcat::mcset pl "Hi" "Witaj"
-    ::msgcat::mcset pl "&Hide Console" "&Schowaj konsol\u0119"
-    ::msgcat::mcset pl "&Ignore" "&Ignoruj"
-    ::msgcat::mcset pl "Invalid file name \"%1\$s\"." "Niew\u0142a\u015bciwa nazwa pliku \"%1\$s\"."
-    ::msgcat::mcset pl "Log Files" "Protoko\u0142uj"
-    ::msgcat::mcset pl "&No" "&Nie"
-    ::msgcat::mcset pl "OK"
-    ::msgcat::mcset pl "Ok"
-    ::msgcat::mcset pl "Open" "Wczytaj"
-    ::msgcat::mcset pl "&Open" "&Wczytaj"
-    ::msgcat::mcset pl "Open Multiple Files" "Wczytuj wiele plik\u00f3w"
-    ::msgcat::mcset pl "P&aste" "&Wklej"
-    ::msgcat::mcset pl "&Quit" "&Zako\u0144cz"
-    ::msgcat::mcset pl "&Red" "&Czerwonz"
-    ::msgcat::mcset pl "Replace existing file?" "Czy zost\u0105pi\u0107 instniej\u0105cy plik?"
-    ::msgcat::mcset pl "&Retry" "&Powt\u00f3rz"
-    ::msgcat::mcset pl "&Save" "&Zapisz"
-    ::msgcat::mcset pl "Save As" "Zapisz jako"
-    ::msgcat::mcset pl "Save To Log" "Wpisz do protoko\u0142u"
-    ::msgcat::mcset pl "Select Log File" "Wybierz plik proko\u0142u"
-    ::msgcat::mcset pl "Select a file to source" "Wybierz plik do wykonania"
-    ::msgcat::mcset pl "&Selection:" "&Wyb\u00f3r:"
-    ::msgcat::mcset pl "Skip Messages" "Omi\u0144 pozosta\u0142e komunikaty"
-    ::msgcat::mcset pl "&Source..." "&Kod \u017ar\u00f3d\u0142owy..."
-    ::msgcat::mcset pl "Tcl Scripts" "Tcl-skrypty"
-    ::msgcat::mcset pl "Tcl for Windows" "Tcl dla Okienek (Windows)"
-    ::msgcat::mcset pl "Text Files" "Pliki Tekstowe"
-    ::msgcat::mcset pl "&Yes" "&Tak"
-    ::msgcat::mcset pl "abort" "zako\u0144cz"
-    ::msgcat::mcset pl "blue" "niebieski"
-    ::msgcat::mcset pl "cancel" "anuluj"
-    ::msgcat::mcset pl "extension" "rozszerzenie"
-    ::msgcat::mcset pl "extensions" "rozszerzenia"
-    ::msgcat::mcset pl "green" "zielony"
-    ::msgcat::mcset pl "ignore" "ignoruj"
-    ::msgcat::mcset pl "red" "czerwony"
-    ::msgcat::mcset pl "retry" "potw\u00f3rz"
-    ::msgcat::mcset pl "yes" "tak"
-}
diff --git a/ext/tk/sample/msgs_tk/ru.msg b/ext/tk/sample/msgs_tk/ru.msg
deleted file mode 100644
index db009a4a52..0000000000
--- a/ext/tk/sample/msgs_tk/ru.msg
+++ /dev/null
@@ -1,87 +0,0 @@
-namespace eval ::tkmsgcat_demo {
-    ::msgcat::mcset ru "Application Error" "\u041e\u0448\u0438\u0431\u043a\u0430 \u0432 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u0435"
-    ::msgcat::mcset ru "Blue" " \u0413\u043e\u043b\u0443\u0431\u043e\u0439"
-    ::msgcat::mcset ru "Color" "\u0426\u0432\u0435\u0442"
-    ::msgcat::mcset ru "Delete" "\u0423\u0434\u0430\u043b\u0438\u0442\u044c"
-    ::msgcat::mcset ru "Error" "\u041e\u0448\u0438\u0431\u043a\u0430"
-    ::msgcat::mcset ru "Exit" "\u0412\u044b\u0445\u043e\u0434"
-    ::msgcat::mcset ru "Green" "\u0417\u0435\u043b\u0435\u043d\u044b\u0439"
-    ::msgcat::mcset ru "Red" "\u041a\u0440\u0430\u0441\u043d\u044b\u0439"
-    ::msgcat::mcset ru "blue" " \u0433\u043e\u043b\u0443\u0431\u043e\u0439"
-    ::msgcat::mcset ru "green" " \u0437\u0435\u043b\u0435\u043d\u044b\u0439"
-    ::msgcat::mcset ru "red" " \u043a\u0440\u0430\u0441\u043d\u044b\u0439"
-}
-
-namespace eval ::tk {
-    ::msgcat::mcset ru "&Abort" "&\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c"
-    ::msgcat::mcset ru "About..." "\u041f\u0440\u043e..."
-    ::msgcat::mcset ru "All Files" "\u0412\u0441\u0435 \u0444\u0430\u0439\u043b\u044b"
-    ::msgcat::mcset ru "Application Error" "\u041e\u0448\u0438\u0431\u043a\u0430 \u0432 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u0435"
-    ::msgcat::mcset ru "&Blue" " &\u0413\u043e\u043b\u0443\u0431\u043e\u0439"
-    ::msgcat::mcset ru "&Cancel" "\u041e\u0442&\u043c\u0435\u043d\u0430"
-    ::msgcat::mcset ru "Cannot change to the directory \"%1\$s\".\nPermission denied." \
-			"\u041d\u0435 \u043c\u043e\u0433\u0443 \u043f\u0435\u0440\u0435\u0439\u0442\u0438 \u0432 \u043a\u0430\u0442\u0430\u043b\u043e\u0433 \"%1\$s\".\n\u041d\u0435\u0434\u043e\u0441\u0442\u0430\u0442\u043e\u0447\u043d\u043e \u043f\u0440\u0430\u0432 \u0434\u043e\u0441\u0442\u0443\u043f\u0430"
-    ::msgcat::mcset ru "Choose Directory" "\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u043a\u0430\u0442\u0430\u043b\u043e\u0433"
-    ::msgcat::mcset ru "Clear" "\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u044c"
-    ::msgcat::mcset ru "Color" "\u0426\u0432\u0435\u0442"
-    ::msgcat::mcset ru "Console" "\u041a\u043e\u043d\u0441\u043e\u043b\u044c"
-    ::msgcat::mcset ru "Copy" "\u041a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c"
-    ::msgcat::mcset ru "Cut" "\u0412\u044b\u0440\u0435\u0437\u0430\u0442\u044c"
-    ::msgcat::mcset ru "Delete" "\u0423\u0434\u0430\u043b\u0438\u0442\u044c"
-    ::msgcat::mcset ru "Details >>" "\u041f\u043e\u0434\u0440\u043e\u0431\u043d\u0435\u0435 >>"
-    ::msgcat::mcset ru "Directory \"%1\$s\" does not exist." "\u041a\u0430\u0442\u0430\u043b\u043e\u0433\u0430 \"%1\$s\" \u043d\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442."
-    ::msgcat::mcset ru "&Directory:" "&\u041a\u0430\u0442\u0430\u043b\u043e\u0433:"
-    ::msgcat::mcset ru "Error: %1\$s" "\u041e\u0448\u0438\u0431\u043a\u0430: %1\$s"
-    ::msgcat::mcset ru "Exit" "\u0412\u044b\u0445\u043e\u0434"
-    ::msgcat::mcset ru "File \"%1\$s\" already exists.\nDo you want to overwrite it?" \
-			    "\u0424\u0430\u0439\u043b \"%1\$s\" \u0443\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442.\n\u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c \u0435\u0433\u043e?"
-    ::msgcat::mcset ru "File \"%1\$s\" already exists.\n\n" "\u0424\u0430\u0439\u043b \"%1\$s\" \u0443\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442.\n\n"
-    ::msgcat::mcset ru "File \"%1\$s\" does not exist." "\u0424\u0430\u0439\u043b \"%1\$s\" \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d."
-    ::msgcat::mcset ru "File &name:" "&\u0418\u043c\u044f \u0444\u0430\u0439\u043b\u0430:"
-    ::msgcat::mcset ru "File &names:" "&\u0418\u043c\u0435\u043d\u0430 \u0444\u0430\u0439\u043b\u043e\u0432:"
-    ::msgcat::mcset ru "Files of &type:" "&\u0422\u0438\u043f \u0444\u0430\u0439\u043b\u043e\u0432:"
-    ::msgcat::mcset ru "Fi&les:" "\u0424\u0430\u0439&\u043b\u044b:"
-    ::msgcat::mcset ru "&Filter" "&\u0424\u0438\u043b\u044c\u0442\u0440"
-    ::msgcat::mcset ru "Fil&ter:" "\u0424\u0438\u043b\u044c&\u0442\u0440:"
-    ::msgcat::mcset ru "&Green" " &\u0417\u0435\u043b\u0435\u043d\u044b\u0439"
-    ::msgcat::mcset ru "Hi" "\u041f\u0440\u0438\u0432\u0435\u0442"
-    ::msgcat::mcset ru "Hide Console" "\u0421\u043f\u0440\u044f\u0442\u0430\u0442\u044c \u043a\u043e\u043d\u0441\u043e\u043b\u044c"
-    ::msgcat::mcset ru "&Ignore" "&\u0418\u0433\u043d\u043e\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c"
-    ::msgcat::mcset ru "Invalid file name \"%1\$s\"." "\u041d\u0435\u0432\u0435\u0440\u043d\u043e\u0435 \u0438\u043c\u044f \u0444\u0430\u0439\u043b\u0430 \"%1\$s\"."
-    ::msgcat::mcset ru "Log Files" "\u0424\u0430\u0439\u043b\u044b \u0436\u0443\u0440\u043d\u0430\u043b\u0430"
-    ::msgcat::mcset ru "&No" "&\u041d\u0435\u0442"
-    ::msgcat::mcset ru "&OK" "&\u041e\u041a"
-    ::msgcat::mcset ru "Ok" "\u0414\u0430"
-    ::msgcat::mcset ru "Open" "\u041e\u0442\u043a\u0440\u044b\u0442\u044c"
-    ::msgcat::mcset ru "&Open" "&\u041e\u0442\u043a\u0440\u044b\u0442\u044c"
-    ::msgcat::mcset ru "Open Multiple Files" "\u041e\u0442\u043a\u0440\u044b\u0442\u044c \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e \u0444\u0430\u0439\u043b\u043e\u0432"
-    ::msgcat::mcset ru "Paste" "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c"
-    ::msgcat::mcset ru "Quit" "\u0412\u044b\u0445\u043e\u0434"
-    ::msgcat::mcset ru "&Red" " &\u041a\u0440\u0430\u0441\u043d\u044b\u0439"
-    ::msgcat::mcset ru "Replace existing file?" "\u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044e\u0449\u0438\u0439 \u0444\u0430\u0439\u043b?"
-    ::msgcat::mcset ru "&Retry" "&\u041f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u044c"
-    ::msgcat::mcset ru "&Save" "&\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c"
-    ::msgcat::mcset ru "Save As" "\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u043a\u0430\u043a"
-    ::msgcat::mcset ru "Save To Log" "\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u0432 \u0436\u0443\u0440\u043d\u0430\u043b"
-    ::msgcat::mcset ru "Select Log File" "\u0412\u044b\u0431\u0440\u0430\u0442\u044c \u0436\u0443\u0440\u043d\u0430\u043b"
-    ::msgcat::mcset ru "Select a file to source" "\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0444\u0430\u0439\u043b \u0434\u043b\u044f \u0438\u043d\u0442\u0435\u0440\u043f\u0440\u0435\u0442\u0430\u0446\u0438\u0438"
-    ::msgcat::mcset ru "&Selection:" "&Selection:"
-    ::msgcat::mcset ru "Skip Messages" "\u041f\u0440\u043e\u043f\u0443\u0441\u0442\u0438\u0442\u044c \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f"
-    ::msgcat::mcset ru "Source..." "\u0418\u043d\u0442\u0435\u0440\u043f\u0440\u0435\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0444\u0430\u0439\u043b..."
-    ::msgcat::mcset ru "Tcl Scripts" "\u041f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u0430 \u043d\u0430 \u044f\u0437\u044b\u043a\u0435 TCL"
-    ::msgcat::mcset ru "Tcl for Windows" "TCL \u0434\u043b\u044f Windows"
-    ::msgcat::mcset ru "Text Files" "\u0422\u0435\u043a\u0441\u0442\u043e\u0432\u044b\u0435 \u0444\u0430\u0439\u043b\u044b"
-    ::msgcat::mcset ru "&Yes" "&\u0414\u0430"
-    ::msgcat::mcset ru "abort" "\u043e\u0442\u043c\u0435\u043d\u0430"
-    ::msgcat::mcset ru "blue" " \u0433\u043e\u043b\u0443\u0431\u043e\u0439"
-    ::msgcat::mcset ru "cancel" "\u043e\u0442\u043c\u0435\u043d\u0430"
-    ::msgcat::mcset ru "extension" "\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u0435"
-    ::msgcat::mcset ru "extensions" "\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u044f"
-    ::msgcat::mcset ru "green" " \u0437\u0435\u043b\u0435\u043d\u044b\u0439"
-    ::msgcat::mcset ru "ignore" "\u043f\u0440\u043e\u043f\u0443\u0441\u0442\u0438\u0442\u044c"
-    ::msgcat::mcset ru "ok" "\u043e\u043a"
-    ::msgcat::mcset ru "red" " \u043a\u0440\u0430\u0441\u043d\u044b\u0439"
-    ::msgcat::mcset ru "retry" "\u043f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u044c"
-    ::msgcat::mcset ru "yes" "\u0434\u0430"
-}
-
diff --git a/ext/tk/sample/multi-ip_sample.rb b/ext/tk/sample/multi-ip_sample.rb
deleted file mode 100644
index fb7a8afb5b..0000000000
--- a/ext/tk/sample/multi-ip_sample.rb
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-# This script is a sample of MultiTkIp class
-
-require "multi-tk"
-
-# create slave interpreters
-trusted_slave = MultiTkIp.new_slave
-safe_slave1   = MultiTkIp.new_safeTk
-safe_slave2   = MultiTkIp.new_safeTk('fill'=>:none, 'expand'=>false)
-#safe_slave2   = MultiTkIp.new_safeTk('fill'=>:none)
-#safe_slave2   = MultiTkIp.new_safeTk('expand'=>false)
-
-cmd = Proc.new{|txt|
-  #####################
-  ## from TkTimer2.rb
-
-  if TkCore::INTERP.safe?
-    # safeTk doesn't have permission to call 'wm' command
-  else
-    root = TkRoot.new(:title=>'timer sample')
-  end
-  label = TkLabel.new(:parent=>root, :relief=>:raised, :width=>10) \
-                  .pack(:side=>:bottom, :fill=>:both)
-
-  tick = proc{|aobj|
-    cnt = aobj.return_value + 5
-    label.text format("%d.%02d", *(cnt.divmod(100)))
-    cnt
-  }
-
-  timer = TkTimer.new(50, -1, tick).start(0, proc{ label.text('0.00'); 0 })
-
-=begin
-  TkButton.new(:text=>'Start') {
-    command proc{ timer.continue unless timer.running? }
-    pack(:side=>:left, :fill=>:both, :expand=>true)
-  }
-  TkButton.new(:text=>'Restart') {
-    command proc{ timer.restart(0, proc{ label.text('0.00'); 0 }) }
-    pack('side'=>'right','fill'=>'both','expand'=>'yes')
-  }
-  TkButton.new(:text=>'Stop') {
-    command proc{ timer.stop if timer.running? }
-    pack('side'=>'right','fill'=>'both','expand'=>'yes')
-  }
-=end
-  b_start = TkButton.new(:text=>'Start', :state=>:disabled) {
-    pack(:side=>:left, :fill=>:both, :expand=>true)
-  }
-
-  b_stop  = TkButton.new(:text=>'Stop', :state=>:normal) {
-    pack('side'=>'left', 'fill'=>'both', 'expand'=>'yes')
-  }
-
-  b_start.command {
-    timer.continue
-    b_stop.state(:normal)
-    b_start.state(:disabled)
-  }
-
-  b_stop.command {
-    timer.stop
-    b_start.state(:normal)
-    b_stop.state(:disabled)
-  }
-
-  TkButton.new(:text=>'Reset', :state=>:normal) {
-    command { timer.reset }
-    pack('side'=>'right', 'fill'=>'both', 'expand'=>'yes')
-  }
-
-  ev_quit = TkVirtualEvent.new('Control-c', 'Control-q')
-  Tk.root.bind(ev_quit, proc{Tk.exit}).focus
-}
-
-# call on the default master interpreter
-trusted_slave.eval_proc(cmd, 'trusted')  # label -> .w00012
-safe_slave1.eval_proc(cmd, 'safe1')      # label -> .w00016
-safe_slave2.eval_proc(cmd, 'safe2')      # label -> .w00020
-cmd.call('master')                       # label -> .w00024
-
-#second_master = MultiTkIp.new(&cmd)
-#second_master = MultiTkIp.new(:safe=>2){p [:second_master, $SAFE]}
-
-TkTimer.new(2000, -1, proc{p ['safe1', safe_slave1.deleted?]}).start
-TkTimer.new(2000, -1, proc{p ['safe2', safe_slave2.deleted?]}).start
-TkTimer.new(2000, -1, proc{p ['trusted', trusted_slave.deleted?]}).start
-
-TkTimer.new(5000, 1,
-            proc{
-              safe_slave1.eval_proc{Tk.root.destroy}
-              safe_slave1.delete
-              print "*** The safe_slave1 is deleted by the timer.\n"
-            }).start
-
-TkTimer.new(10000, 1,
-            proc{
-              trusted_slave.eval_proc{Tk.root.destroy}
-              trusted_slave.delete
-              print "*** The trusted_slave is deleted by the timer.\n"
-            }).start
-
-Tk.mainloop
diff --git a/ext/tk/sample/multi-ip_sample2.rb b/ext/tk/sample/multi-ip_sample2.rb
deleted file mode 100644
index ae2cb35e96..0000000000
--- a/ext/tk/sample/multi-ip_sample2.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-# frozen_string_literal: false
-require 'multi-tk.rb'
-
-th = Thread.new{Tk.mainloop}
-
-TkLabel.new(:text=>'this is a primary master').pack
-
-ip1 = MultiTkIp.new_slave(:safe=>1)
-ip2 = MultiTkIp.new_slave(:safe=>2)
-
-cmd = proc{|s|
-  require 'tk'
-
-  TkButton.new(:text=>'b1: p self', :command=>proc{p self}).pack(:fill=>:x)
-  sleep s
-  TkButton.new(:text=>'b2: p $SAFE', :command=>proc{p $SAFE}).pack(:fill=>:x)
-  sleep s
-  TkButton.new(:text=>'b3: p MultiTkIp.ip_name',
-               :command=>proc{p MultiTkIp.ip_name}).pack(:fill=>:x)
-  sleep s
-  TkButton.new(:text=>'EXIT', :command=>proc{exit}).pack(:fill=>:x)
-
-  Tk.mainloop
-}
-
-Thread.new{ip1.eval_proc(cmd, 1.1)}
-Thread.new{ip2.eval_proc(cmd, 0.3)}
-cmd.call(0.7)
-
-th.join
diff --git a/ext/tk/sample/optobj_sample.rb b/ext/tk/sample/optobj_sample.rb
deleted file mode 100644
index 5e4806f8fb..0000000000
--- a/ext/tk/sample/optobj_sample.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-#
-#  sample script of Tk::OptionObj
-#
-require "tk"
-
-optobj = Tk::OptionObj.new('foreground'=>'red', 'background'=>'black')
-
-f = TkFrame.new.pack(:side=>:left, :anchor=>:n, :padx=>5, :pady=>30)
-
-b1 = TkButton.new(f, :text=>'AAA').pack(:fill=>:x)
-b2 = TkButton.new(f, :text=>'BBB').pack(:fill=>:x)
-b3 = TkButton.new(f, :text=>'CCC').pack(:fill=>:x)
-
-optobj.assign( b1,
-              [ b2, 'configure',
-                { 'foreground'=>'background',
-                  'background'=>'foreground' } ],
-              [ b3, nil,
-                { 'foreground'=>'background',
-                  'activeforeground'=>nil,
-                  'background'=>['foreground', 'activeforeground'] } ] )
-
-optobj.update('activeforeground'=>'yellow')
-
-TkButton.new(f){
-  configure( optobj.assign(self) + {:text=>'DDD'} )
-  pack(:fill=>:x)
-}
-
-TkButton.new(f){
-  configure( optobj.assign([self, nil,
-                             {'foreground'=>'activeforeground',
-                              'background'=>'foreground',
-                              'activeforeground'=>'background'}]) \
-             + {:text=>'EEE', :relief=>:groove, :borderwidth=>5} )
-  pack(:fill=>:x)
-}
-
-optobj.notify  # To apply the convert_key ( 3rd element of widget info
-               # (that is, {'foreground'=>'activeforeground', ,,, } )
-               # of the 'EEE' button
-
-TkButton.new(f, :text=>'toggle',
-             :command=>proc{
-               fg = optobj['foreground']
-               bg = optobj['background']
-               optobj.configure('foreground'=>bg, 'background'=>fg)
-             }).pack(:fill=>:x, :pady=>10)
-
-TkButton.new(f, :text=>'exit',
-                :command=>proc{exit}).pack(:fill=>:x, :pady=>10)
-
-TkFrame.new{|f|
-  pack(:side=>:right, :expand=>true, :fill=>:both)
-  TkLabel.new(f, :text=>'source::').pack(:anchor=>:w)
-  TkFrame.new(f){|ff|
-    TkText.new(ff){
-      yscrollbar(TkScrollbar.new(ff){pack(:fill=>:y, :side=>:right)})
-      insert('end', File.read(__FILE__))
-      pack(:side=>:left, :expand=>true, :fill=>:both)
-    }
-    pack(:expand=>true, :fill=>:both)
-  }
-}
-
-Tk.mainloop
diff --git a/ext/tk/sample/propagate.rb b/ext/tk/sample/propagate.rb
deleted file mode 100644
index 10e0ed8236..0000000000
--- a/ext/tk/sample/propagate.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-
-TkLabel.new(:text=>"Please click the bottom frame").pack
-
-f = TkFrame.new(:width=>400, :height=>100, :background=>'yellow',
-                :relief=>'ridge', :borderwidth=>5).pack
-
-# TkPack.propagate(f, false) # <== important!!
-f.pack_propagate(false)      # <== important!!
-
-list = (1..3).collect{|n|
-  TkButton.new(f, :text=>"button#{'-X'*n}"){
-    command proc{
-      puts "button#{'-X'*n}"
-      self.unpack
-    }
-  }
-}
-
-list.unshift(nil)
-
-f.bind('1', proc{
-         w = list.shift
-         w.unpack if w
-         list.push(w)
-         list[0].pack(:expand=>true, :anchor=>:center) if list[0]
-       })
-
-Tk.mainloop
diff --git a/ext/tk/sample/remote-ip_sample.rb b/ext/tk/sample/remote-ip_sample.rb
deleted file mode 100644
index 13aa3b84f9..0000000000
--- a/ext/tk/sample/remote-ip_sample.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'remote-tk'
-
-puts <<EOM
-This sample controls the other Tk interpreter (Ruby/Tk, Tcl/Tk, and so on)
-which running on the other process. For this purpose, Ruby/Tk uses Tcl/Tk's
-'send' command. Availability of the command depends on your GUI environment.
-If this script doesn't work, please check your environment (see Tcl/Tk FAQ).
-EOM
-#'
-
-unless (wish = TkWinfo.interps.find{|ip| ip =~ /^wish/})
-  puts ''
-  puts 'Please start "wish" (Tcl/Tk shell) before running this sample script.'
-  exit 1
-end
-
-ip = RemoteTkIp.new(wish)
-ip.eval_proc{TkButton.new(:command=>proc{puts 'This procedure is on the controller-ip (Ruby/Tk)'}, :text=>'print on Ruby/Tk (controller-ip)').pack(:fill=>:x)}
-ip.eval_proc{TkButton.new(:command=>'puts {This procedure is on the remote-ip (wish)}', :text=>'print on wish (remote-ip)').pack(:fill=>:x)}
-
-# If your remote-ip is Ruby/Tk, you can control the remote Ruby by
-# 'ruby' or 'ruby_eval' or 'ruby_cmd' on the Tk interpreter.
-if ip.is_rubytk?
-  ip.eval_proc{TkButton.new(:command=>'ruby {p 111; p Array.new(3,"ruby")}', :text=>'ruby cmd on the remote-ip').pack(:fill=>:x)}
-end
-
-ip.eval_proc{TkButton.new(:command=>'exit', :text=>'QUIT').pack(:fill=>:x)}
-
-TkButton.new(:command=>proc{exit}, :text=>'QUIT',
-             :padx=>10, :pady=>7).pack(:padx=>10, :pady=>7)
-
-Tk.mainloop
diff --git a/ext/tk/sample/remote-ip_sample2.rb b/ext/tk/sample/remote-ip_sample2.rb
deleted file mode 100644
index 567e60411e..0000000000
--- a/ext/tk/sample/remote-ip_sample2.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-
-require 'remote-tk'
-
-# start sub-process
-ip_name = 'remote_ip'
-ip_list = TkWinfo.interps
-fork{
-  exec "/usr/bin/env ruby -r tk -e \"Tk.appname('#{ip_name}');Tk.mainloop\""
-}
-sleep 1 until (app = (TkWinfo.interps - ip_list)[0]) && app =~ /^#{ip_name}/
-p TkWinfo.interps
-
-# create RemoteTkIp object
-ip = RemoteTkIp.new(app)
-
-# setup remote-ip window
-btns = []
-ip.eval_proc{
-  btns <<
-    TkButton.new(:command=>proc{
-                   puts 'This procedure is on the controller-ip (Ruby-side)'
-                 },
-                 :text=>'print on controller-ip (Ruby-side)').pack(:fill=>:x)
-
-  btns <<
-    TkButton.new(:command=>
-                   'puts {This procedure is on the remote-ip (Tk-side)}',
-                 :text=>'print on remote-ip (Tk-side)').pack(:fill=>:x)
-
-  btns <<
-    TkButton.new(:command=>
-                   'ruby {
-                     puts "This procedure is on the remote-ip (Ruby-side)"
-                     p Array.new(3,"ruby")
-                    }',
-                 :text=>'ruby cmd on the remote-ip').pack(:fill=>:x)
-
-  TkButton.new(:command=>'exit', :text=>'QUIT').pack(:fill=>:x)
-}
-
-# setup controller-ip window
-btns.each_with_index{|btn, idx|
-  # The scope of the eval-block of 'eval_proc' method is different from
-  # the enternal. If you want to pass local values to the eval-block,
-  # use arguments of eval_proc method. They are passed to block-arguments.
-  TkButton.new(:command=>proc{ip.eval_proc(btn){|b| b.flash}},
-               :text=>"flash button-#{idx}",
-               :padx=>10).pack(:padx=>10, :pady=>2)
-}
-
-TkButton.new(:command=>proc{exit}, :text=>'QUIT',
-             :padx=>10, :pady=>7).pack(:padx=>10, :pady=>7)
-
-# start eventloop
-Tk.mainloop
diff --git a/ext/tk/sample/resource.en b/ext/tk/sample/resource.en
deleted file mode 100644
index 39b4013971..0000000000
--- a/ext/tk/sample/resource.en
+++ /dev/null
@@ -1,13 +0,0 @@
-!
-!  see Tcl/Tk's "options" manual for "Database Name" and "Database Class"
-!
-*BtnFrame.borderWidth: 5
-*BtnFrame.relief: ridge
-*BtnFrame.Button.background: wheat
-*BtnFrame.Button.foreground: red
-*hello.text: HELLO
-*quit.text: QUIT
-*BTN_CMD.show_msg: {|arg| print "($SAFE=#{$SAFE}) ";\
-                          print "Hello!! This is a sample of #{arg}.";\
-                          print "(<<< $SAFE=#{$SAFE})\n"}
-*BTN_CMD.bye_msg:  {print "($SAFE=#{$SAFE} >>>) Good-bye��(<<< $SAFE=#{$SAFE})\n"}
diff --git a/ext/tk/sample/resource.ja b/ext/tk/sample/resource.ja
deleted file mode 100644
index 59d4ffaf40..0000000000
--- a/ext/tk/sample/resource.ja
+++ /dev/null
@@ -1,13 +0,0 @@
-!
-!  see Tcl/Tk's "options" manual for "Database Name" and "Database Class"
-!
-*BtnFrame.borderWidth: 5
-*BtnFrame.relief: ridge
-*BtnFrame.Button.background: wheat
-*BtnFrame.Button.foreground: red
-*hello.text: こんにちは
-*quit.text: 終了
-*BTN_CMD.show_msg: {|arg| print "($SAFE=#{$SAFE} >>>) ";\
-                          print "こんにちは！！ #{arg} のサンプルです．";\
-                          print "(<<< $SAFE=#{$SAFE})\n"}
-*BTN_CMD.bye_msg:  {print "($SAFE=#{$SAFE} >>>) さようなら．(<<< $SAFE=#{$SAFE})\n"}
diff --git a/ext/tk/sample/safe-tk.rb b/ext/tk/sample/safe-tk.rb
deleted file mode 100755
index a8a85d3288..0000000000
--- a/ext/tk/sample/safe-tk.rb
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-# This script is a sample of MultiTkIp class
-
-require "multi-tk"
-
-###############################
-
-TkLabel.new(:text=>'This is the Default Master Ipnterpreter').pack(:padx=>5, :pady=>3)
-TkButton.new(:text=>'QUIT', :command=>proc{exit}).pack(:pady=>3)
-TkFrame.new(:borderwidth=>2, :height=>3,
-            :relief=>:sunken).pack(:fill=>:x, :expand=>true,
-                                   :padx=>10, :pady=>7)
-
-safe0_p = proc{|*args| p args}
-
-###############################
-
-puts "---- create a safe slave IP with Ruby's safe-level == 1 ----------"
-ip = MultiTkIp.new_safe_slave(1){|*args| safe0_p["safe_slave safe_level == #{$SAFE}", args]}
-
-puts "\n---- create procs ----------"
-puts 'x = proc{p [\'proc x\', "$SAFE==#{$SAFE}"]; exit}'
-#x = proc{p ['proc x', "$SAFE==#{$SAFE}"]; exit}
-x = proc{p ['proc x', "$SAFE==#{$SAFE}"]; exit}
-TkLabel.new(:text=>'x = proc{p [\'proc x\', "$SAFE==#{$SAFE}"]; exit}',
-            :anchor=>:w).pack(:fill=>:x)
-
-puts 'y = proc{|label| p [\'proc y\', "$SAFE==#{$SAFE}", label]; label.text($SAFE)}'
-y = proc{|label| p ['proc y', "$SAFE==#{$SAFE}", label]; label.text($SAFE)}
-TkLabel.new(:text=>'y = proc{|label| p [\'proc y\', "$SAFE==#{$SAFE}", label]; label.text($SAFE)}',
-            :anchor=>:w).pack(:fill=>:x)
-
-puts 'z = proc{p [\'proc z\', "$SAFE==#{$SAFE}"]; exit}'
-z = proc{p ['proc z', "$SAFE==#{$SAFE}"]; exit}
-TkLabel.new(:text=>'z = proc{p [\'proc z\', "$SAFE==#{$SAFE}"]; exit}',
-            :anchor=>:w).pack(:fill=>:x)
-
-puts "\n---- call 1st eval_proc ----------"
-print 'lbl = '
-p lbl = ip.eval_proc{
-  TkLabel.new(:text=>"1st eval_proc : $SAFE == #{$SAFE}").pack
-
-  f = TkFrame.new.pack
-  TkLabel.new(f, :text=>"$SAFE == ").pack(:side=>:left)
-  # TkLabel.new(f, :text=>" (<-- 'lbl' widget is here)").pack(:side=>:right)
-  l = TkLabel.new(f).pack(:side=>:right)
-
-  TkButton.new(:text=>':command=>proc{l.text($SAFE)}',
-               :command=>proc{l.text($SAFE)}).pack(:fill=>:x, :padx=>5)
-  TkButton.new(:text=>':command=>x', :command=>x).pack(:fill=>:x, :padx=>5)
-  TkButton.new(:text=>':command=>proc{exit}',
-               :command=>proc{
-                 safe0_p["'exit' is called at $SAFE=#{$SAFE}"];exit}
-               ).pack(:fill=>:x, :padx=>5)
-  TkFrame.new(:borderwidth=>2, :height=>3,
-              :relief=>:sunken).pack(:fill=>:x, :expand=>true,
-                                     :padx=>10, :pady=>7)
-  l # return the label widget
-}
-
-puts "\n---- change the safe slave IP's safe-level ==> 3 ----------"
-ip.safe_level = 3
-
-puts "\n---- call 2nd eval_proc ----------"
-p ip.eval_proc(proc{
-                 TkLabel.new(:text=>"2nd eval_proc : $SAFE == #{$SAFE}").pack
-                 f = TkFrame.new.pack
-                 TkLabel.new(f, :text=>"$SAFE == ").pack(:side=>:left)
-                 l = TkLabel.new(f, :text=>$SAFE).pack(:side=>:right)
-                 TkButton.new(:text=>':command=>proc{l.text($SAFE)}',
-                              :command=>proc{l.text($SAFE)}).pack(:fill=>:x,
-                                                                  :padx=>5)
-                 TkButton.new(:text=>':command=>proc{y.call(l)}',
-                              :command=>proc{y.call(l)}).pack(:fill=>:x,
-                                                              :padx=>5)
-                 TkButton.new(:text=>':command=>proc{Proc.new(&y).call(l)}',
-                              :command=>proc{
-                                Proc.new(&y).call(l)
-                              }).pack(:fill=>:x, :padx=>5)
-                 TkButton.new(:text=>':command=>proc{MultiTkIp._proc_on_current_safelevel(y).call(l)}',
-                              :command=>proc{
-                                MultiTkIp._proc_on_current_safelevel(y).call(l)
-                              }).pack(:fill=>:x, :padx=>5)
-if false && Object.const_defined?(:RubyVM) && ::RubyVM.class == Class
-                 TkButton.new(:text=>':command=>proc{Thread.new(l, &y).value}',
-                              :command=>proc{
-                                Thread.new(l, &y).value
-                              }).pack(:fill=>:x, :padx=>5)
-else
-  # KNOWN BUG::
-  #   Current multi-tk.rb cannot support long term threads on callbacks.
-  #   Such a thread freezes the Ruby/Tk process.
-end
-                 TkButton.new(:text=>':command=>proc{z.call}',
-                              :command=>proc{z.call}).pack(:fill=>:x, :padx=>5)
-                 TkFrame.new(:borderwidth=>2, :height=>3,
-                             :relief=>:sunken).pack(:fill=>:x, :expand=>true,
-                                                    :padx=>10, :pady=>7)
-               })
-
-puts "\n---- call 1st and 2nd eval_str ----------"
-p bind = ip.eval_str('
-  TkLabel.new(:text=>"1st and 2nd eval_str : $SAFE == #{$SAFE}").pack
-  f = TkFrame.new.pack
-  TkLabel.new(f, :text=>"$SAFE == ").pack(:side=>:left)
-  l = TkLabel.new(f, :text=>$SAFE).pack(:side=>:right)
-  TkButton.new(:text=>":command=>proc{y.call(l)}",
-               :command=>proc{y.call(l)}).pack(:fill=>:x, :padx=>5)
-  binding
-', binding)
-
-p ip.eval_str("
-  TkButton.new(:text=>':command=>proc{ l.text = $SAFE }',
-               :command=>proc{ l.text = $SAFE }).pack(:fill=>:x, :padx=>5)
-  TkFrame.new(:borderwidth=>2, :height=>3,
-              :relief=>:sunken).pack(:fill=>:x, :expand=>true,
-                                     :padx=>10, :pady=>7)
-", bind)
-
-puts "\n---- call 3rd and 4th eval_proc ----------"
-p ip.eval_proc{
-  TkLabel.new(:text=>"3rd and 4th eval_proc : $SAFE == #{$SAFE}").pack
-}
-p ip.eval_proc{
-  TkButton.new(:text=>':command=>proc{ lbl.text = $SAFE }',
-               :command=>proc{ lbl.text = $SAFE }).pack(:fill=>:x, :padx=>5)
-}
-
-puts "\n---- start event-loop ( current $SAFE == #{$SAFE} ) ----------"
-
-Tk.mainloop
diff --git a/ext/tk/sample/scrollframe.rb b/ext/tk/sample/scrollframe.rb
deleted file mode 100644
index 346f88aadd..0000000000
--- a/ext/tk/sample/scrollframe.rb
+++ /dev/null
@@ -1,250 +0,0 @@
-# frozen_string_literal: false
-#
-#  Tk::RbWidget::ScrollFrame class
-#
-#    This widget class is a frame widget with scrollbars.
-#    The ScrollFrame doesn't propagate the size of embedded widgets.
-#    When it is configured, scrollregion of the container is changed.
-#
-#    Scrollbars can be toggled by Tk::RbWidget::ScrollFrame#vscroll & hscroll.
-#    If horizontal or vertical scrollbar is turned off, the horizontal
-#    or vertical size of embedded widgets is propagated.
-#
-#                         Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-
-module Tk::RbWidget; end
-
-class Tk::RbWidget::ScrollFrame < TkFrame
-  include TkComposite
-
-  DEFAULT_WIDTH  = 200
-  DEFAULT_HEIGHT = 200
-
-  def initialize_composite(keys={})
-    @frame.configure(:width=>DEFAULT_WIDTH, :height=>DEFAULT_HEIGHT)
-
-    # create scrollbars
-    @h_scroll = TkScrollbar.new(@frame, 'orient'=>'horizontal')
-    @v_scroll = TkScrollbar.new(@frame, 'orient'=>'vertical')
-
-    # create a canvas widget
-    @canvas = TkCanvas.new(@frame,
-                           :borderwidth=>0, :selectborderwidth=>0,
-                           :highlightthickness=>0)
-
-    # alignment
-    TkGrid.rowconfigure(@frame, 0, 'weight'=>1, 'minsize'=>0)
-    TkGrid.columnconfigure(@frame, 0, 'weight'=>1, 'minsize'=>0)
-    @canvas.grid('row'=>0, 'column'=>0, 'sticky'=>'news')
-    @frame.grid_propagate(false)
-
-    # assign scrollbars
-    @canvas.xscrollbar(@h_scroll)
-    @canvas.yscrollbar(@v_scroll)
-
-    # convert hash keys
-    keys = _symbolkey2str(keys)
-
-    # check options for the frame
-    framekeys = {}
-    if keys.key?('classname')
-       keys['class'] = keys.delete('classname')
-    end
-    if @classname = keys.delete('class')
-      framekeys['class'] = @classname
-    end
-    if @colormap  = keys.delete('colormap')
-      framekeys['colormap'] = @colormap
-    end
-    if @container = keys.delete('container')
-      framekeys['container'] = @container
-    end
-    if @visual    = keys.delete('visual')
-      framekeys['visual'] = @visual
-    end
-    if @classname.kind_of? TkBindTag
-      @db_class = @classname
-      @classname = @classname.id
-    elsif @classname
-      @db_class = TkDatabaseClass.new(@classname)
-    else
-      @db_class = self.class
-      @classname = @db_class::WidgetClassName
-    end
-
-    # create base frame
-    @base = TkFrame.new(@canvas, framekeys)
-
-    # embed base frame
-    @cwin = TkcWindow.new(@canvas, [0, 0], :window=>@base, :anchor=>'nw')
-    @canvas.scrollregion(@cwin.bbox)
-
-    # binding to reset scrollregion
-    @base.bind('Configure'){ _reset_scrollregion(nil, nil) }
-
-    # set default receiver of method calls
-    @path = @base.path
-
-    # scrollbars ON
-    vscroll(keys.delete('vscroll'){true})
-    hscroll(keys.delete('hscroll'){true})
-
-    # please check the differences of the following definitions
-    option_methods(
-      :scrollbarwidth
-    )
-
-    # set receiver widgets for configure methods (with alias)
-    delegate_alias('scrollbarrelief', 'relief', @h_scroll, @v_scroll)
-
-    # set receiver widgets for configure methods
-    delegate('DEFAULT', @base)
-    delegate('background', @frame, @base, @canvas, @h_scroll, @v_scroll)
-    delegate('width', @frame)
-    delegate('height', @frame)
-    delegate('activebackground', @h_scroll, @v_scroll)
-    delegate('troughcolor', @h_scroll, @v_scroll)
-    delegate('repeatdelay', @h_scroll, @v_scroll)
-    delegate('repeatinterval', @h_scroll, @v_scroll)
-    delegate('borderwidth', @frame)
-    delegate('relief', @frame)
-
-    # do configure
-    configure keys unless keys.empty?
-  end
-
-  # callback for Configure event
-  def _reset_scrollregion(h_mod=nil, v_mod=nil)
-    cx1, cy1, cx2, cy2 = @canvas.scrollregion
-    x1, y1, x2, y2 = @cwin.bbox
-    @canvas.scrollregion([x1, y1, x2, y2])
-
-    if h_mod.nil? && v_mod.nil?
-      if x2 != cx2 && TkGrid.info(@h_scroll).size == 0
-        @frame.grid_propagate(true)
-        @canvas.width  = x2
-        Tk.update_idletasks
-        @frame.grid_propagate(false)
-      end
-      if y2 != cy2 && TkGrid.info(@v_scroll).size == 0
-        @frame.grid_propagate(true)
-        @canvas.height = y2
-        Tk.update_idletasks
-        @frame.grid_propagate(false)
-      end
-    else
-      @h_scroll.ungrid if h_mod == false
-      @v_scroll.ungrid if v_mod == false
-
-      h_flag = (TkGrid.info(@h_scroll).size == 0)
-      v_flag = (TkGrid.info(@v_scroll).size == 0)
-
-      @frame.grid_propagate(true)
-
-      @canvas.width  = (h_flag)? x2: @canvas.winfo_width
-      @canvas.height = (v_flag)? y2: @canvas.winfo_height
-
-      @h_scroll.grid('row'=>1, 'column'=>0, 'sticky'=>'ew') if h_mod
-      @v_scroll.grid('row'=>0, 'column'=>1, 'sticky'=>'ns') if v_mod
-
-      Tk.update_idletasks
-
-      @frame.grid_propagate(false)
-    end
-  end
-  private :_reset_scrollregion
-
-  # forbid to change binding of @base frame
-  def bind(*args)
-    @frame.bind(*args)
-  end
-  def bind_append(*args)
-    @frame.bind_append(*args)
-  end
-  def bind_remove(*args)
-    @frame.bind_remove(*args)
-  end
-  def bindinfo(*args)
-    @frame.bindinfo(*args)
-  end
-
-  # set width of scrollbar
-  def scrollbarwidth(width = nil)
-    if width
-      @h_scroll.width(width)
-      @v_scroll.width(width)
-    else
-      @h_scroll.width
-    end
-  end
-
-  # vertical scrollbar : ON/OFF
-  def vscroll(mode)
-    Tk.update_idletasks
-    st = TkGrid.info(@v_scroll)
-    if mode && st.size == 0 then
-      @v_scroll.grid('row'=>0, 'column'=>1, 'sticky'=>'ns')
-      _reset_scrollregion(nil, true)
-    elsif !mode && st.size != 0 then
-      _reset_scrollregion(nil, false)
-    else
-      _reset_scrollregion(nil, nil)
-    end
-    self
-  end
-
-  # horizontal scrollbar : ON/OFF
-  def hscroll(mode)
-    Tk.update_idletasks
-    st = TkGrid.info(@h_scroll)
-    if mode && st.size == 0 then
-      _reset_scrollregion(true, nil)
-    elsif !mode && st.size != 0 then
-      _reset_scrollregion(false, nil)
-    else
-      _reset_scrollregion(nil, nil)
-    end
-    self
-  end
-end
-
-# test
-if __FILE__ == $0
-  f = Tk::RbWidget::ScrollFrame.new(:scrollbarwidth=>10,
-                                    :width=>300, :height=>200)
-  f.pack(:expand=>true, :fill=>:both)
-
-  TkButton.new(f, :text=>'foo button', :command=>proc{puts 'foo'}).pack
-  TkButton.new(f, :text=>'baaar button', :command=>proc{puts 'baaar'}).pack
-  TkButton.new(f, :text=>'baz button', :command=>proc{puts 'baz'}).pack
-  TkButton.new(f, :text=>'hoge hoge button',
-               :command=>proc{puts 'hoge hoge'}).pack(:side=>:bottom)
-
-  # f.hscroll(false)
-
-  # add a text widget
-  Tk.after(3000){
-    t = TkText.new(f).pack(:expand=>true, :fill=>:both)
-    t.insert(:end, "An example of Tk::RbWidget::ScrollFrame widget.\n\n")
-    t.insert(:end, "Here is a text widget.\n")
-    t.insert(:end, "Please resize the application window, ")
-    t.insert(:end, "and try the scrollbars ")
-    t.insert(:end, "to move the view of packed widgets.\n")
-  }
-
-  # remove a vertical scrollbar, and then the scrollframe is not scrollable.
-  Tk.after(6000){ f.vscroll(false) }
-
-  # add a vertical scrollbar, and make the scrollframe scrollable.
-  Tk.after(9000){ f.vscroll(true) }
-
-  # remove a horizontal scrollbar, and then the scrollframe is not scrollable.
-  Tk.after(12000){ f.hscroll(false) }
-
-  # add a horizontal scrollbar, and make the scrollframe scrollable.
-  Tk.after(15000){ f.hscroll(true) }
-
-  Tk.mainloop
-end
diff --git a/ext/tk/sample/tcltklib/batsu.gif b/ext/tk/sample/tcltklib/batsu.gif
deleted file mode 100644
index 880cc73e09..0000000000
--- a/ext/tk/sample/tcltklib/batsu.gif
+++ /dev/null
diff --git a/ext/tk/sample/tcltklib/lines0.tcl b/ext/tk/sample/tcltklib/lines0.tcl
deleted file mode 100644
index 8ed3c5e1c1..0000000000
--- a/ext/tk/sample/tcltklib/lines0.tcl
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /usr/local/bin/wish
-
-proc drawlines {} {
-    puts [clock format [clock seconds]]
-
-    for {set j 0} {$j < 100} {incr j} {
-	puts -nonewline "*"
-	flush stdout
-	if {$j & 1} {
-	    set c "blue"
-	} {
-	    set c "red"
-	}
-	for {set i 0} {$i < 100} {incr i} {
-#	    .a create line $i 0 0 [expr 500 - $i] -fill $c
-	}
-    }
-
-    puts [clock format [clock seconds]]
-
-    for {set j 0} {$j < 100} {incr j} {
-	puts -nonewline "*"
-	flush stdout
-	if {$j & 1} {
-	    set c "blue"
-	} {
-	    set c "red"
-	}
-	for {set i 0} {$i < 100} {incr i} {
-	    .a create line $i 0 0 [expr 500 - $i] -fill $c
-	}
-    }
-
-    puts [clock format [clock seconds]]
-#    destroy .
-}
-
-canvas .a -height 500 -width 500
-button .b -text draw -command drawlines
-pack .a .b -side left
-
-# eof
diff --git a/ext/tk/sample/tcltklib/lines1.rb b/ext/tk/sample/tcltklib/lines1.rb
deleted file mode 100644
index 57e3d33f6f..0000000000
--- a/ext/tk/sample/tcltklib/lines1.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-#! /usr/local/bin/ruby
-# frozen_string_literal: false
-
-require "tcltk"
-
-def drawlines()
-  print Time.now, "\n"
-
-  for j in 0 .. 99
-    print "*"
-    $stdout.flush
-    if (j & 1) != 0
-      col = "blue"
-    else
-      col = "red"
-    end
-    for i in 0 .. 99
-#      $a.e("create line", i, 0, 0, 500 - i, "-fill", col)
-    end
-  end
-
-  print Time.now, "\n"
-
-  for j in 0 .. 99
-    print "*"
-    $stdout.flush
-    if (j & 1) != 0
-      col = "blue"
-    else
-      col = "red"
-    end
-    for i in 0 .. 99
-      $a.e("create line", i, 0, 0, 500 - i, "-fill", col)
-    end
-  end
-
-  print Time.now, "\n"
-#  $ip.commands()["destroy"].e($root)
-end
-
-$ip = TclTkInterpreter.new()
-$root = $ip.rootwidget()
-$a = TclTkWidget.new($ip, $root, "canvas", "-height 500 -width 500")
-$c = TclTkCallback.new($ip, proc{drawlines()})
-$b = TclTkWidget.new($ip, $root, "button", "-text draw -command", $c)
-
-$ip.commands()["pack"].e($a, $b, "-side left")
-
-TclTk.mainloop
-
-# eof
diff --git a/ext/tk/sample/tcltklib/lines2.rb b/ext/tk/sample/tcltklib/lines2.rb
deleted file mode 100644
index 7ae54d9ea9..0000000000
--- a/ext/tk/sample/tcltklib/lines2.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-#! /usr/local/bin/ruby
-# frozen_string_literal: false
-
-require "tk"
-
-def drawlines()
-  print Time.now, "\n"
-
-  for j in 0 .. 99
-    print "*"
-    $stdout.flush
-    if (j & 1) != 0
-      col = "blue"
-    else
-      col = "red"
-    end
-    for i in 0 .. 99
-#      TkcLine.new($a, i, 0, 0, 500 - i, "-fill", col)
-    end
-  end
-
-  print Time.now, "\n"
-
-  for j in 0 .. 99
-    print "*"
-    $stdout.flush
-    if (j & 1) != 0
-      col = "blue"
-    else
-      col = "red"
-    end
-    for i in 0 .. 99
-      TkcLine.new($a, i, 0, 0, 500 - i, "-fill", col)
-    end
-  end
-
-  print Time.now, "\n"
-#  Tk.root.destroy
-end
-
-$a = TkCanvas.new{
-  height(500)
-  width(500)
-}
-
-$b = TkButton.new{
-  text("draw")
-  command(proc{drawlines()})
-}
-
-TkPack.configure($a, $b, {"side"=>"left"})
-
-Tk.mainloop
-
-# eof
diff --git a/ext/tk/sample/tcltklib/lines3.rb b/ext/tk/sample/tcltklib/lines3.rb
deleted file mode 100644
index d79bb12ef3..0000000000
--- a/ext/tk/sample/tcltklib/lines3.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-#! /usr/local/bin/ruby
-# frozen_string_literal: false
-
-require "tk"
-
-def drawlines()
-  print Time.now, "\n"
-
-  for j in 0 .. 99
-    print "*"
-    $stdout.flush
-    if (j & 1) != 0
-      col = "blue"
-    else
-      col = "red"
-    end
-    for i in 0 .. 99
-#      $a.create(TkcLine, i, 0, 0, 500 - i, "fill"=>col)
-    end
-  end
-
-  print Time.now, "\n"
-
-  for j in 0 .. 99
-    print "*"
-    $stdout.flush
-    if (j & 1) != 0
-      col = "blue"
-    else
-      col = "red"
-    end
-    for i in 0 .. 99
-      $a.create(TkcLine, i, 0, 0, 500 - i, "fill"=>col)
-    end
-  end
-
-  print Time.now, "\n"
-#  Tk.root.destroy
-end
-
-$a = TkCanvas.new{
-  height(500)
-  width(500)
-}
-
-$b = TkButton.new{
-  text("draw")
-  command(proc{drawlines()})
-}
-
-TkPack.configure($a, $b, {"side"=>"left"})
-
-Tk.mainloop
-
-# eof
diff --git a/ext/tk/sample/tcltklib/lines4.rb b/ext/tk/sample/tcltklib/lines4.rb
deleted file mode 100644
index 37ffc0ee74..0000000000
--- a/ext/tk/sample/tcltklib/lines4.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-#! /usr/local/bin/ruby
-# frozen_string_literal: false
-
-require "tk"
-
-def drawlines()
-  print Time.now, "\n"
-
-  for j in 0 .. 99
-    print "*"
-    $stdout.flush
-    if (j & 1) != 0
-      col = "blue"
-    else
-      col = "red"
-    end
-    for i in 0 .. 99
-#      TkCore::INTERP.__invoke($a.path, "create", "line", i.to_s, '0', '0', (500 - i).to_s, "-fill", col)
-    end
-  end
-
-  print Time.now, "\n"
-
-  for j in 0 .. 99
-    print "*"
-    $stdout.flush
-    if (j & 1) != 0
-      col = "blue"
-    else
-      col = "red"
-    end
-    for i in 0 .. 99
-      TkCore::INTERP.__invoke($a.path, "create", "line", i.to_s, '0', '0', (500 - i).to_s, "-fill", col)
-    end
-  end
-
-  print Time.now, "\n"
-#  Tk.root.destroy
-end
-
-$a = TkCanvas.new{
-  height(500)
-  width(500)
-}
-
-$b = TkButton.new{
-  text("draw")
-  command(proc{drawlines()})
-}
-
-TkPack.configure($a, $b, {"side"=>"left"})
-
-Tk.mainloop
-
-# eof
diff --git a/ext/tk/sample/tcltklib/maru.gif b/ext/tk/sample/tcltklib/maru.gif
deleted file mode 100644
index 2c0202892e..0000000000
--- a/ext/tk/sample/tcltklib/maru.gif
+++ /dev/null
diff --git a/ext/tk/sample/tcltklib/safeTk.rb b/ext/tk/sample/tcltklib/safeTk.rb
deleted file mode 100644
index 5fac9e2e23..0000000000
--- a/ext/tk/sample/tcltklib/safeTk.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tcltklib'
-
-master = TclTkIp.new
-slave_name = 'slave0'
-slave = master.create_slave(slave_name, true)
-master._eval("::safe::interpInit #{slave_name}")
-master._eval("::safe::loadTk #{slave_name}")
-
-master._invoke('label', '.l1', '-text', 'master')
-master._invoke('pack', '.l1', '-padx', '30', '-pady', '50')
-master._eval('label .l2 -text {root widget of master-ip}')
-master._eval('pack .l2 -padx 30 -pady 50')
-
-slave._invoke('label', '.l1', '-text', 'slave')
-slave._invoke('pack', '.l1', '-padx', '30', '-pady', '50')
-slave._eval('label .l2 -text {root widget of slave-ip}')
-slave._eval('pack .l2 -padx 30 -pady 20')
-slave._eval('label .l3 -text {( container frame widget of master-ip )}')
-slave._eval('pack .l3 -padx 30 -pady 20')
-
-TclTkLib.mainloop
diff --git a/ext/tk/sample/tcltklib/sample0.rb b/ext/tk/sample/tcltklib/sample0.rb
deleted file mode 100644
index 0cc2de4878..0000000000
--- a/ext/tk/sample/tcltklib/sample0.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /usr/local/bin/ruby -vd
-# frozen_string_literal: false
-
-# tcltklib ライブラリのテスト
-
-require "tcltklib"
-
-def test
-  # インタプリタを生成する
-  ip1 = TclTkIp.new()
-
-  # 評価してみる
-  print ip1._return_value().inspect, "\n"
-  print ip1._eval("puts {abc}").inspect, "\n"
-
-  # ボタンを作ってみる
-  print ip1._return_value().inspect, "\n"
-  print ip1._eval("button .lab -text exit -command \"destroy .\"").inspect,
-    "\n"
-  print ip1._return_value().inspect, "\n"
-  print ip1._eval("pack .lab").inspect, "\n"
-  print ip1._return_value().inspect, "\n"
-
-  # インタプリタから ruby コマンドを評価してみる
-#  print ip1._eval(%q/ruby {print "print by ruby\n"}/).inspect, "\n"
-  print ip1._eval(%q+puts [ruby {print "print by ruby\n"; "puts by tcl/tk"}]+).inspect, "\n"
-  print ip1._return_value().inspect, "\n"
-
-  # もう一つインタプリタを生成してみる
-  ip2 = TclTkIp.new()
-  ip2._eval("button .lab -text test -command \"puts test ; destroy .\"")
-  ip2._eval("pack .lab")
-
-  TclTkLib.mainloop
-end
-
-test
-GC.start
-
-print "exit\n"
diff --git a/ext/tk/sample/tcltklib/sample1.rb b/ext/tk/sample/tcltklib/sample1.rb
deleted file mode 100644
index b4ad6436bd..0000000000
--- a/ext/tk/sample/tcltklib/sample1.rb
+++ /dev/null
@@ -1,635 +0,0 @@
-#! /usr/local/bin/ruby -d
-# -*- encoding: utf-8 -*-
-# frozen_string_literal: false
-# -d オプションを付けると, デバッグ情報を表示する.
-
-# tcltk ライブラリのサンプル
-
-# まず, ライブラリを require する.
-require "tcltk"
-
-# 以下は, Test1 のインスタンスの initialize() で,
-# tcl/tk に関する処理を行う例である.
-# 必ずしもそのようにする必要は無く,
-# (もし, そうしたければ) class の外で tcl/tk に関する処理を行っても良い.
-
-class Test1
-  # 初期化(インタプリタを生成してウィジェットを生成する).
-  def initialize()
-
-    #### 使う前のおまじない
-
-    # インタプリタの生成.
-    ip = TclTkInterpreter.new()
-    # コマンドに対応するオブジェクトを c に設定しておく.
-    c = ip.commands()
-    # 使用するコマンドに対応するオブジェクトは変数に入れておく.
-    append, bind, button, destroy, incr, info, label, place, set, wm =
-      c.values_at(
-      "append", "bind", "button", "destroy", "incr", "info", "label", "place",
-      "set", "wm")
-
-    #### tcl/tk のコマンドに対応するオブジェクト(TclTkCommand)の操作
-
-    # 実行する時は, e() メソッドを使う.
-    # (以下は, tcl/tk における info command r* を実行.)
-    print info.e("command", "r*"), "\n"
-    # 引数は, まとめた文字列にしても同じ.
-    print info.e("command r*"), "\n"
-    # 変数を用いなくとも実行できるが, 見ためが悪い.
-    print c["info"].e("command", "r*"), "\n"
-    # インタプリタのメソッドとしても実行できるが, 効率が悪い.
-    print ip.info("command", "r*"), "\n"
-
-    ####
-
-    # 以下, 生成したオブジェクトは変数に代入しておかないと
-    # GC の対象になってしまう.
-
-    #### tcl/tk の変数に対応するオブジェクト(TclTkVariable)の操作
-
-    # 生成と同時に値を設定する.
-    v1 = TclTkVariable.new(ip, "20")
-    # 読み出しは get メソッドを使う.
-    print v1.get(), "\n"
-    # 設定は set メソッドを使う.
-    v1.set(40)
-    print v1.get(), "\n"
-    # set コマンドを使って読み出し, 設定は可能だが見ためが悪い.
-    # e() メソッド等の引数に直接 TclTkObject や数値を書いても良い.
-    set.e(v1, 30)
-    print set.e(v1), "\n"
-    # tcl/tk のコマンドで変数を操作できる.
-    incr.e(v1)
-    print v1.get(), "\n"
-    append.e(v1, 10)
-    print v1.get(), "\n"
-
-    #### tcl/tk のウィジェットに対応するオブジェクト(TclTkWidget)の操作
-
-    # ルートウィジェットを取り出す.
-    root = ip.rootwidget()
-    # ウィジェットの操作.
-    root.e("configure -height 300 -width 300")
-    # タイトルを付けるときは wm を使う.
-    wm.e("title", root, $0)
-    # 親ウィジェットとコマンドを指定して, ウィジェットを作る.
-    l1 = TclTkWidget.new(ip, root, label, "-text {type `x' to print}")
-    # place すると表示される.
-    place.e(l1, "-x 0 -rely 0.0 -relwidth 1 -relheight 0.1")
-    # コマンド名は文字列で指定しても良いが, 見ためが悪い.
-    # (コマンド名は独立した引数でなければならない.)
-    l2 = TclTkWidget.new(ip, root, "label")
-    # ウィジェットの操作.
-    l2.e("configure -text {type `q' to exit}")
-    place.e(l2, "-x 0 -rely 0.1 -relwidth 1 -relheight 0.1")
-
-    #### tcl/tk のコールバックに対応するオブジェクト(TclTkCallback)の操作
-
-    # コールバックを生成する.
-    c1 = TclTkCallback.new(ip, proc{sample(ip, root)})
-    # コールバックを持つウィジェットを生成する.
-    b1 = TclTkWidget.new(ip, root, button, "-text sample -command", c1)
-    place.e(b1, "-x 0 -rely 0.2 -relwidth 1 -relheight 0.1")
-    # イベントループを抜けるには destroy.e(root) する.
-    c2 = TclTkCallback.new(ip, proc{destroy.e(root)})
-    b2 = TclTkWidget.new(ip, root, button, "-text exit -command", c2)
-    place.e(b2, "-x 0 -rely 0.3 -relwidth 1 -relheight 0.1")
-
-    #### イベントのバインド
-    # script の追加 (bind tag sequence +script) は今のところできない.
-    # (イテレータ変数の設定がうまくいかない.)
-
-    # 基本的にはウィジェットに対するコールバックと同じ.
-    c3 = TclTkCallback.new(ip, proc{print("q pressed\n"); destroy.e(root)})
-    bind.e(root, "q", c3)
-    # bind コマンドで % 置換によりパラメータを受け取りたいときは,
-    # proc{} の後ろに文字列で指定すると,
-    # 置換結果をイテレータ変数を通して受け取ることができる.
-    # ただし proc{} の後ろの文字列は,
-    # bind コマンドに与えるコールバック以外で指定してはいけない.
-    c4 = TclTkCallback.new(ip, proc{|i| print("#{i} pressed\n")}, "%A")
-    bind.e(root, "x", c4)
-    # TclTkCallback を GC の対象にしたければ,
-    # dcb() (または deletecallbackkeys()) する必要がある.
-    cb = [c1, c2, c3, c4]
-    c5 = TclTkCallback.new(ip, proc{|w| TclTk.dcb(cb, root, w)}, "%W")
-    bind.e(root, "<Destroy>", c5)
-    cb.push(c5)
-
-    #### tcl/tk のイメージに対応するオブジェクト(TclTkImage)の操作
-
-    # データを指定して生成する.
-    i1 = TclTkImage.new(ip, "photo", "-file maru.gif")
-    # ラベルに張り付けてみる.
-    l3 = TclTkWidget.new(ip, root, label, "-relief raised -image", i1)
-    place.e(l3, "-x 0 -rely 0.4 -relwidth 0.2 -relheight 0.2")
-    # 空のイメージを生成して後で操作する.
-    i2 = TclTkImage.new(ip, "photo")
-    # イメージを操作する.
-    i2.e("copy", i1)
-    i2.e("configure -gamma 0.5")
-    l4 = TclTkWidget.new(ip, root, label, "-relief raised -image", i2)
-    place.e(l4, "-relx 0.2 -rely 0.4 -relwidth 0.2 -relheight 0.2")
-
-    ####
-  end
-
-  # サンプルのためのウィジェットを生成する.
-  def sample(ip, parent)
-    bind, button, destroy, grid, toplevel, wm = ip.commands().values_at(
-      "bind", "button", "destroy", "grid", "toplevel", "wm")
-
-    ## toplevel
-
-    # 新しいウインドウを開くには, toplevel を使う.
-    t1 = TclTkWidget.new(ip, parent, toplevel)
-    # タイトルを付けておく
-    wm.e("title", t1, "sample")
-
-    # ウィジェットが破壊されたとき, コールバックが GC の対象になるようにする.
-    cb = []
-    cb.push(c = TclTkCallback.new(ip, proc{|w| TclTk.dcb(cb, t1, w)}, "%W"))
-    bind.e(t1, "<Destroy>", c)
-
-    # ボタンの生成.
-    wid = []
-    # toplevel ウィジェットを破壊するには destroy する.
-    cb.push(c = TclTkCallback.new(ip, proc{destroy.e(t1)}))
-    wid.push(TclTkWidget.new(ip, t1, button, "-text close -command", c))
-    cb.push(c = TclTkCallback.new(ip, proc{test_label(ip, t1)}))
-    wid.push(TclTkWidget.new(ip, t1, button, "-text label -command", c))
-    cb.push(c = TclTkCallback.new(ip, proc{test_button(ip, t1)}))
-    wid.push(TclTkWidget.new(ip, t1, button, "-text button -command", c))
-    cb.push(c = TclTkCallback.new(ip, proc{test_checkbutton(ip, t1)}))
-    wid.push(TclTkWidget.new(ip, t1, button, "-text checkbutton -command", c))
-    cb.push(c = TclTkCallback.new(ip, proc{test_radiobutton(ip, t1)}))
-    wid.push(TclTkWidget.new(ip, t1, button, "-text radiobutton -command", c))
-    cb.push(c = TclTkCallback.new(ip, proc{test_scale(ip, t1)}))
-    wid.push(TclTkWidget.new(ip, t1, button, "-text scale -command", c))
-    cb.push(c = TclTkCallback.new(ip, proc{test_entry(ip, t1)}))
-    wid.push(TclTkWidget.new(ip, t1, button, "-text entry -command", c))
-    cb.push(c = TclTkCallback.new(ip, proc{test_text(ip, t1)}))
-    wid.push(TclTkWidget.new(ip, t1, button, "-text text -command", c))
-    cb.push(c = TclTkCallback.new(ip, proc{test_raise(ip, t1)}))
-    wid.push(TclTkWidget.new(ip, t1, button, "-text raise/lower -command", c))
-    cb.push(c = TclTkCallback.new(ip, proc{test_modal(ip, t1)}))
-    wid.push(TclTkWidget.new(ip, t1, button, "-text message/modal -command",
-      c))
-    cb.push(c = TclTkCallback.new(ip, proc{test_menu(ip, t1)}))
-    wid.push(TclTkWidget.new(ip, t1, button, "-text menu -command", c))
-    cb.push(c = TclTkCallback.new(ip, proc{test_listbox(ip, t1)}))
-    wid.push(TclTkWidget.new(ip, t1, button, "-text listbox/scrollbar",
-      "-command", c))
-    cb.push(c = TclTkCallback.new(ip, proc{test_canvas(ip, t1)}))
-    wid.push(TclTkWidget.new(ip, t1, button, "-text canvas -command", c))
-
-    # grid で表示する.
-    ro = co = 0
-    wid.each{|w|
-      grid.e(w, "-row", ro, "-column", co, "-sticky news")
-      ro += 1
-      if ro == 7
-        ro = 0
-        co += 1
-      end
-    }
-  end
-
-  # inittoplevel(ip, parent, title)
-  #   以下の処理をまとめて行う.
-  #       1. toplevel ウィジェットを作成する.
-  #       2. コールバックを登録する配列を用意し, toplevel ウィジェットの
-  #         <Destroy> イベントにコールバックを削除する手続きを登録する.
-  #       3. クローズボタンを作る.
-  #     作成した toplevel ウィジェット, クローズボタン, コールバック登録用変数
-  #     を返す.
-  #   ip: インタプリタ
-  #   parent: 親ウィジェット
-  #   title: toplevel ウィジェットのウインドウのタイトル
-  def inittoplevel(ip, parent, title)
-    bind, button, destroy, toplevel, wm = ip.commands().values_at(
-      "bind", "button", "destroy", "toplevel", "wm")
-
-    # 新しいウインドウを開くには, toplevel を使う.
-    t1 = TclTkWidget.new(ip, parent, toplevel)
-    # タイトルを付けておく
-    wm.e("title", t1, title)
-
-    # ウィジェットが破壊されたとき, コールバックが GC の対象になるようにする.
-    cb = []
-    cb.push(c = TclTkCallback.new(ip, proc{|w| TclTk.dcb(cb, t1, w)}, "%W"))
-    bind.e(t1, "<Destroy>", c)
-    # close ボタンを作っておく.
-    # toplevel ウィジェットを破壊するには destroy する.
-    cb.push(c = TclTkCallback.new(ip, proc{destroy.e(t1)}))
-    b1 = TclTkWidget.new(ip, t1, button, "-text close -command", c)
-
-    return t1, b1, cb
-  end
-
-  # label のサンプル.
-  def test_label(ip, parent)
-    button, global, label, pack = ip.commands().values_at(
-      "button", "global", "label", "pack")
-    t1, b1, cb = inittoplevel(ip, parent, "label")
-
-    ## label
-
-    # いろいろな形のラベル.
-    l1 = TclTkWidget.new(ip, t1, label, "-text {default(flat)}")
-    l2 = TclTkWidget.new(ip, t1, label, "-text raised -relief raised")
-    l3 = TclTkWidget.new(ip, t1, label, "-text sunken -relief sunken")
-    l4 = TclTkWidget.new(ip, t1, label, "-text groove -relief groove")
-    l5 = TclTkWidget.new(ip, t1, label, "-text ridge -relief ridge")
-    l6 = TclTkWidget.new(ip, t1, label, "-bitmap error")
-    l7 = TclTkWidget.new(ip, t1, label, "-bitmap questhead")
-
-    # pack しても表示される.
-    pack.e(b1, l1, l2, l3, l4, l5, l6, l7, "-pady 3")
-
-    ## -textvariable
-
-    # tcltk ライブラリの実装では, コールバックは tcl/tk の``手続き''を通して
-    # 呼ばれる. したがって, コールバックの中で(大域)変数にアクセスするときは,
-    # global する必要がある.
-    # global する前に変数に値を設定してしまうとエラーになるので,
-    # tcl/tk における表現形だけ生成して, 実際に値を設定しないように,
-    # 2 番目の引数には nil を与える.
-    v1 = TclTkVariable.new(ip, nil)
-    global.e(v1)
-    v1.set(100)
-    # -textvariable で変数を設定する.
-    l6 = TclTkWidget.new(ip, t1, label, "-textvariable", v1)
-    # コールバックの中から変数を操作する.
-    cb.push(c = TclTkCallback.new(ip, proc{
-      global.e(v1); v1.set(v1.get().to_i + 10)}))
-    b2 = TclTkWidget.new(ip, t1, button, "-text +10 -command", c)
-    cb.push(c = TclTkCallback.new(ip, proc{
-      global.e(v1); v1.set(v1.get().to_i - 10)}))
-    b3 = TclTkWidget.new(ip, t1, button, "-text -10 -command", c)
-    pack.e(l6, b2, b3)
-  end
-
-  # button のサンプル.
-  def test_button(ip, parent)
-    button, pack = ip.commands().values_at("button", "pack")
-    t1, b1, cb = inittoplevel(ip, parent, "button")
-
-    ## button
-
-    # コールバック内で参照する変数は先に宣言しておかなければならない.
-    b3 = b4 = nil
-    cb.push(c = TclTkCallback.new(ip, proc{b3.e("flash"); b4.e("flash")}))
-    b2 = TclTkWidget.new(ip, t1, button, "-text flash -command", c)
-    cb.push(c = TclTkCallback.new(ip, proc{b2.e("configure -state normal")}))
-    b3 = TclTkWidget.new(ip, t1, button, "-text normal -command", c)
-    cb.push(c = TclTkCallback.new(ip, proc{b2.e("configure -state disabled")}))
-    b4 = TclTkWidget.new(ip, t1, button, "-text disable -command", c)
-    pack.e(b1, b2, b3, b4)
-  end
-
-  # checkbutton のサンプル.
-  def test_checkbutton(ip, parent)
-    checkbutton, global, pack = ip.commands().values_at(
-      "checkbutton", "global", "pack")
-    t1, b1, cb = inittoplevel(ip, parent, "checkbutton")
-
-    ## checkbutton
-
-    v1 = TclTkVariable.new(ip, nil)
-    global.e(v1)
-    # -variable で変数を設定する.
-    ch1 = TclTkWidget.new(ip, t1, checkbutton, "-onvalue on -offvalue off",
-      "-textvariable", v1, "-variable", v1)
-    pack.e(b1, ch1)
-  end
-
-  # radiobutton のサンプル.
-  def test_radiobutton(ip, parent)
-    global, label, pack, radiobutton = ip.commands().values_at(
-      "global", "label", "pack", "radiobutton")
-    t1, b1, cb = inittoplevel(ip, parent, "radiobutton")
-
-    ## radiobutton
-
-    v1 = TclTkVariable.new(ip, nil)
-    global.e(v1)
-    # ヌルストリングは "{}" で指定する.
-    v1.set("{}")
-    l1 = TclTkWidget.new(ip, t1, label, "-textvariable", v1)
-    # -variable で同じ変数を指定すると同じグループになる.
-    ra1 = TclTkWidget.new(ip, t1, radiobutton,
-      "-text radio1 -value r1 -variable", v1)
-    ra2 = TclTkWidget.new(ip, t1, radiobutton,
-      "-text radio2 -value r2 -variable", v1)
-    cb.push(c = TclTkCallback.new(ip, proc{global.e(v1); v1.set("{}")}))
-    ra3 = TclTkWidget.new(ip, t1, radiobutton,
-      "-text clear -value r3 -variable", v1, "-command", c)
-    pack.e(b1, l1, ra1, ra2, ra3)
-  end
-
-  # scale のサンプル.
-  def test_scale(ip, parent)
-    global, pack, scale = ip.commands().values_at(
-      "global", "pack", "scale")
-    t1, b1, cb = inittoplevel(ip, parent, "scale")
-
-    ## scale
-
-    v1 = TclTkVariable.new(ip, nil)
-    global.e(v1)
-    v1.set(219)
-    # コールバック内で参照する変数は先に宣言しておかなければならない.
-    sca1 = nil
-    cb.push(c = TclTkCallback.new(ip, proc{global.e(v1); v = v1.get();
-      sca1.e("configure -background", format("#%02x%02x%02x", v, v, v))}))
-    sca1 = TclTkWidget.new(ip, t1, scale,
-      "-label scale -orient h -from 0 -to 255 -variable", v1, "-command", c)
-    pack.e(b1, sca1)
-  end
-
-  # entry のサンプル.
-  def test_entry(ip, parent)
-    button, entry, global, pack = ip.commands().values_at(
-      "button", "entry", "global", "pack")
-    t1, b1, cb = inittoplevel(ip, parent, "entry")
-
-    ## entry
-
-    v1 = TclTkVariable.new(ip, nil)
-    global.e(v1)
-    # ヌルストリングは "{}" で指定する.
-    v1.set("{}")
-    en1 = TclTkWidget.new(ip, t1, entry, "-textvariable", v1)
-    cb.push(c = TclTkCallback.new(ip, proc{
-      global.e(v1); print(v1.get(), "\n"); v1.set("{}")}))
-    b2 = TclTkWidget.new(ip, t1, button, "-text print -command", c)
-    pack.e(b1, en1, b2)
-  end
-
-  # text のサンプル.
-  def test_text(ip, parent)
-    button, pack, text = ip.commands().values_at(
-      "button", "pack", "text")
-    t1, b1, cb = inittoplevel(ip, parent, "text")
-
-    ## text
-
-    te1 = TclTkWidget.new(ip, t1, text)
-    cb.push(c = TclTkCallback.new(ip, proc{
-      # 1 行目の 0 文字目から最後までを表示し, 削除する.
-      print(te1.e("get 1.0 end")); te1.e("delete 1.0 end")}))
-    b2 = TclTkWidget.new(ip, t1, button, "-text print -command", c)
-    pack.e(b1, te1, b2)
-  end
-
-  # raise/lower のサンプル.
-  def test_raise(ip, parent)
-    button, frame, lower, pack, raise = ip.commands().values_at(
-      "button", "frame", "lower", "pack", "raise")
-    t1, b1, cb = inittoplevel(ip, parent, "raise/lower")
-
-    ## raise/lower
-
-    # button を隠すテストのために, frame を使う.
-    f1 = TclTkWidget.new(ip, t1, frame)
-    # コールバック内で参照する変数は先に宣言しておかなければならない.
-    b2 = nil
-    cb.push(c = TclTkCallback.new(ip, proc{raise.e(f1, b2)}))
-    b2 = TclTkWidget.new(ip, t1, button, "-text raise -command", c)
-    cb.push(c = TclTkCallback.new(ip, proc{lower.e(f1, b2)}))
-    b3 = TclTkWidget.new(ip, t1, button, "-text lower -command", c)
-    lower.e(f1, b3)
-
-    pack.e(b2, b3, "-in", f1)
-    pack.e(b1, f1)
-  end
-
-  # modal なウィジェットのサンプル.
-  def test_modal(ip, parent)
-    button, frame, message, pack, tk_chooseColor, tk_getOpenFile,
-      tk_messageBox = ip.commands().values_at(
-      "button", "frame", "message", "pack", "tk_chooseColor",
-      "tk_getOpenFile", "tk_messageBox")
-    # 最初に load されていないライブラリは ip.commands() に存在しないので,
-    # TclTkLibCommand を生成する必要がある.
-    tk_dialog = TclTkLibCommand.new(ip, "tk_dialog")
-    t1, b1, cb = inittoplevel(ip, parent, "message/modal")
-
-    ## message
-
-    mes = "これは message ウィジェットのテストです."
-    mes += "以下は modal なウィジェットのテストです."
-    me1 = TclTkWidget.new(ip, t1, message, "-text {#{mes}}")
-
-    ## modal
-
-    # tk_messageBox
-    cb.push(c = TclTkCallback.new(ip, proc{
-      print tk_messageBox.e("-type yesnocancel -message messageBox",
-      "-icon error -default cancel -title messageBox"), "\n"}))
-    b2 = TclTkWidget.new(ip, t1, button, "-text messageBox -command", c)
-    # tk_dialog
-    cb.push(c = TclTkCallback.new(ip, proc{
-      # ウィジェット名を生成するためにダミーの frame を生成.
-      print tk_dialog.e(TclTkWidget.new(ip, t1, frame),
-      "dialog dialog error 2 yes no cancel"), "\n"}))
-    b3 = TclTkWidget.new(ip, t1, button, "-text dialog -command", c)
-    # tk_chooseColor
-    cb.push(c = TclTkCallback.new(ip, proc{
-      print tk_chooseColor.e("-title chooseColor"), "\n"}))
-    b4 = TclTkWidget.new(ip, t1, button, "-text chooseColor -command", c)
-    # tk_getOpenFile
-    cb.push(c = TclTkCallback.new(ip, proc{
-      print tk_getOpenFile.e("-defaultextension .rb",
-      "-filetypes {{{Ruby Script} {.rb}} {{All Files} {*}}}",
-      "-title getOpenFile"), "\n"}))
-    b5 = TclTkWidget.new(ip, t1, button, "-text getOpenFile -command", c)
-
-    pack.e(b1, me1, b2, b3, b4, b5)
-  end
-
-  # menu のサンプル.
-  def test_menu(ip, parent)
-    global, menu, menubutton, pack = ip.commands().values_at(
-      "global", "menu", "menubutton", "pack")
-    tk_optionMenu = TclTkLibCommand.new(ip, "tk_optionMenu")
-    t1, b1, cb = inittoplevel(ip, parent, "menu")
-
-    ## menu
-
-    # menubutton を生成する.
-    mb1 = TclTkWidget.new(ip, t1, menubutton, "-text menu")
-    # menu を生成する.
-    me1 = TclTkWidget.new(ip, mb1, menu)
-    # mb1 から me1 が起動されるようにする.
-    mb1.e("configure -menu", me1)
-
-    # cascade で起動される menu を生成する.
-    me11 = TclTkWidget.new(ip, me1, menu)
-    # radiobutton のサンプル.
-    v1 = TclTkVariable.new(ip, nil); global.e(v1); v1.set("r1")
-    me11.e("add radiobutton -label radio1 -value r1 -variable", v1)
-    me11.e("add radiobutton -label radio2 -value r2 -variable", v1)
-    me11.e("add radiobutton -label radio3 -value r3 -variable", v1)
-    # cascade により mb11 が起動されるようにする.
-    me1.e("add cascade -label cascade -menu", me11)
-
-    # checkbutton のサンプル.
-    v2 = TclTkVariable.new(ip, nil); global.e(v2); v2.set("none")
-    me1.e("add checkbutton -label check -variable", v2)
-    # separator のサンプル.
-    me1.e("add separator")
-    # command のサンプル.
-    v3 = nil
-    cb.push(c = TclTkCallback.new(ip, proc{
-      global.e(v1, v2, v3); print "v1: ", v1.get(), ", v2: ", v2.get(),
-      ", v3: ", v3.get(), "\n"}))
-    me1.e("add command -label print -command", c)
-
-    ## tk_optionMenu
-
-    v3 = TclTkVariable.new(ip, nil); global.e(v3); v3.set("opt2")
-    om1 = TclTkWidget.new(ip, t1, tk_optionMenu, v3, "opt1 opt2 opt3 opt4")
-
-    pack.e(b1, mb1, om1, "-side left")
-  end
-
-  # listbox のサンプル.
-  def test_listbox(ip, parent)
-    clipboard, frame, grid, listbox, lower, menu, menubutton, pack, scrollbar,
-      selection = ip.commands().values_at(
-      "clipboard", "frame", "grid", "listbox", "lower", "menu", "menubutton",
-      "pack", "scrollbar", "selection")
-    t1, b1, cb = inittoplevel(ip, parent, "listbox")
-
-    ## listbox/scrollbar
-
-    f1 = TclTkWidget.new(ip, t1, frame)
-    # コールバック内で参照する変数は先に宣言しておかなければならない.
-    li1 = sc1 = sc2 = nil
-    # 実行時に, 後ろにパラメータがつくコールバックは,
-    # イテレータ変数でそのパラメータを受け取ることができる.
-    # (複数のパラメータはひとつの文字列にまとめられる.)
-    cb.push(c1 = TclTkCallback.new(ip, proc{|i| li1.e("xview", i)}))
-    cb.push(c2 = TclTkCallback.new(ip, proc{|i| li1.e("yview", i)}))
-    cb.push(c3 = TclTkCallback.new(ip, proc{|i| sc1.e("set", i)}))
-    cb.push(c4 = TclTkCallback.new(ip, proc{|i| sc2.e("set", i)}))
-    # listbox
-    li1 = TclTkWidget.new(ip, f1, listbox,
-      "-xscrollcommand", c3, "-yscrollcommand", c4,
-      "-selectmode extended -exportselection true")
-    for i in 1..20
-      li1.e("insert end {line #{i} line #{i} line #{i} line #{i} line #{i}}")
-    end
-    # scrollbar
-    sc1 = TclTkWidget.new(ip, f1, scrollbar, "-orient horizontal -command", c1)
-    sc2 = TclTkWidget.new(ip, f1, scrollbar, "-orient vertical -command", c2)
-
-    ## selection/clipboard
-
-    mb1 = TclTkWidget.new(ip, t1, menubutton, "-text edit")
-    me1 = TclTkWidget.new(ip, mb1, menu)
-    mb1.e("configure -menu", me1)
-    cb.push(c = TclTkCallback.new(ip, proc{
-      # clipboard をクリア.
-      clipboard.e("clear")
-      # selection から文字列を読み込み clipboard に追加する.
-      clipboard.e("append {#{selection.e('get')}}")}))
-    me1.e("add command -label {selection -> clipboard} -command",c)
-    cb.push(c = TclTkCallback.new(ip, proc{
-      # li1 をクリア.
-      li1.e("delete 0 end")
-      # clipboard から文字列を取り出し, 1 行ずつ
-      selection.e("get -selection CLIPBOARD").split(/\n/).each{|line|
-        # li1 に挿入する.
-        li1.e("insert end {#{line}}")}}))
-    me1.e("add command -label {clipboard -> listbox} -command",c)
-
-    grid.e(li1, "-row 0 -column 0 -sticky news")
-    grid.e(sc1, "-row 1 -column 0 -sticky ew")
-    grid.e(sc2, "-row 0 -column 1 -sticky ns")
-    grid.e("rowconfigure", f1, "0 -weight 100")
-    grid.e("columnconfigure", f1, "0 -weight 100")
-    f2 = TclTkWidget.new(ip, t1, frame)
-    lower.e(f2, b1)
-    pack.e(b1, mb1, "-in", f2, "-side left")
-    pack.e(f2, f1)
-  end
-
-  # canvas のサンプル.
-  def test_canvas(ip, parent)
-    canvas, lower, pack = ip.commands().values_at("canvas", "lower", "pack")
-    t1, b1, cb = inittoplevel(ip, parent, "canvas")
-
-    ## canvas
-
-    ca1 = TclTkWidget.new(ip, t1, canvas, "-width 400 -height 300")
-    lower.e(ca1, b1)
-    # rectangle を作る.
-    idr = ca1.e("create rectangle 10 10 20 20")
-    # oval を作る.
-    ca1.e("create oval 60 10 100 50")
-    # polygon を作る.
-    ca1.e("create polygon 110 10 110 30 140 10")
-    # line を作る.
-    ca1.e("create line 150 10 150 30 190 10")
-    # arc を作る.
-    ca1.e("create arc 200 10 250 50 -start 0 -extent 90 -style pieslice")
-    # i1 は本当は, どこかで破壊しなければならないが, 面倒なので放ってある.
-    i1 = TclTkImage.new(ip, "photo", "-file maru.gif")
-    # image を作る.
-    ca1.e("create image 100 100 -image", i1)
-    # bitmap を作る.
-    ca1.e("create bitmap 260 50 -bitmap questhead")
-    # text を作る.
-    ca1.e("create text 320 50 -text {drag rectangle}")
-    # window を作る(クローズボタン).
-    ca1.e("create window 200 200 -window", b1)
-
-    # bind により rectangle を drag できるようにする.
-    cb.push(c = TclTkCallback.new(ip, proc{|i|
-      # i に x と y を受け取るので, 取り出す.
-      x, y = i.split(/ /); x = x.to_f; y = y.to_f
-      # 座標を変更する.
-      ca1.e("coords current #{x - 5} #{y - 5} #{x + 5} #{y + 5}")},
-      # x, y 座標を空白で区切ったものをイテレータ変数へ渡すように指定.
-      "%x %y"))
-    # rectangle に bind する.
-    ca1.e("bind", idr, "<B1-Motion>", c)
-
-    pack.e(ca1)
-  end
-end
-
-# test driver
-
-if ARGV.size == 0
-  print "#{$0} n で, n 個のインタプリタを起動します.\n"
-  n = 1
-else
-  n = ARGV[0].to_i
-end
-
-print "start\n"
-ip = []
-
-# インタプリタ, ウィジェット等の生成.
-for i in 1 .. n
-  ip.push(Test1.new())
-end
-
-# 用意ができたらイベントループに入る.
-TclTk.mainloop()
-print "exit from mainloop\n"
-
-# インタプリタが GC されるかのテスト.
-ip = []
-print "GC.start\n" if $DEBUG
-GC.start() if $DEBUG
-print "end\n"
-
-exit
-
-# end
diff --git a/ext/tk/sample/tcltklib/sample2.rb b/ext/tk/sample/tcltklib/sample2.rb
deleted file mode 100644
index 378c2d3eb7..0000000000
--- a/ext/tk/sample/tcltklib/sample2.rb
+++ /dev/null
@@ -1,452 +0,0 @@
-#!/usr/local/bin/ruby
-# frozen_string_literal: false
-#----------------------> pretty simple othello game <-----------------------
-# othello.rb
-#
-# version 0.3
-# maeda shugo (shuto@po.aianet.ne.jp)
-#---------------------------------------------------------------------------
-
-#       Sep. 17, 1997   modified by Y. Shigehiro for tcltk library
-#          maeda shugo (shugo@po.aianet.ne.jp) 氏による
-#          (ruby/tk で書かれていた) ruby のサンプルプログラム
-#               http://www.aianet.or.jp/~shugo/ruby/othello.rb.gz
-#          を tcltk ライブラリを使うように, 機械的に変更してみました.
-#
-#          なるべくオリジナルと同じになるようにしてあります.
-
-require "observer"
-require "tcltk"
-$ip = TclTkInterpreter.new()
-$root = $ip.rootwidget()
-$button, $canvas, $checkbutton, $frame, $label, $pack, $update, $wm =
-   $ip.commands().values_at(
-   "button", "canvas", "checkbutton", "frame", "label", "pack", "update", "wm")
-
-class Othello
-
-   EMPTY = 0
-   BLACK = 1
-   WHITE = - BLACK
-
-   attr :in_com_turn
-   attr :game_over
-
-   class Board
-
-      include Observable
-
-      DIRECTIONS = [
-         [-1, -1], [-1, 0], [-1, 1],
-         [ 0, -1],          [ 0, 1],
-         [ 1, -1], [ 1, 0], [ 1, 1]
-      ]
-
-      attr_accessor :com_disk
-
-      def initialize(othello)
-         @othello = othello
-         reset
-      end
-
-      def notify_observers(*arg)
-         if @observer_peers != nil
-            super(*arg)
-         end
-      end
-
-      def reset
-         @data = [
-            [EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY],
-            [EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY],
-            [EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY],
-            [EMPTY, EMPTY, EMPTY, WHITE, BLACK, EMPTY, EMPTY, EMPTY],
-            [EMPTY, EMPTY, EMPTY, BLACK, WHITE, EMPTY, EMPTY, EMPTY],
-            [EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY],
-            [EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY],
-            [EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY]
-         ]
-         changed
-         notify_observers
-      end
-
-      def man_disk
-         return - @com_disk
-      end
-
-      def other_disk(disk)
-         return - disk
-      end
-
-      def get_disk(row, col)
-         return @data[row][col]
-      end
-
-      def reverse_to(row, col, my_disk, dir_y, dir_x)
-         y = row
-         x = col
-         begin
-            y += dir_y
-            x += dir_x
-            if y < 0 || x < 0 || y > 7 || x > 7 ||
-                  @data[y][x] == EMPTY
-               return
-            end
-         end until @data[y][x] == my_disk
-         begin
-            @data[y][x] = my_disk
-            changed
-            notify_observers(y, x)
-            y -= dir_y
-            x -= dir_x
-         end until y == row && x == col
-      end
-
-      def put_disk(row, col, disk)
-         @data[row][col] = disk
-         changed
-         notify_observers(row, col)
-         DIRECTIONS.each do |dir|
-            reverse_to(row, col, disk, *dir)
-         end
-      end
-
-      def count_disk(disk)
-         num = 0
-         @data.each do |rows|
-            rows.each do |d|
-               if d == disk
-                  num += 1
-               end
-            end
-         end
-         return num
-      end
-
-      def count_point_to(row, col, my_disk, dir_y, dir_x)
-         return 0 if @data[row][col] != EMPTY
-         count = 0
-         loop do
-            row += dir_y
-            col += dir_x
-            break if row < 0 || col < 0 || row > 7 || col > 7
-            case @data[row][col]
-            when my_disk
-               return count
-            when other_disk(my_disk)
-               count += 1
-            when EMPTY
-               break
-            end
-         end
-         return 0
-      end
-
-      def count_point(row, col, my_disk)
-         count = 0
-         DIRECTIONS.each do |dir|
-            count += count_point_to(row, col, my_disk, *dir)
-         end
-         return count
-      end
-
-      def corner?(row, col)
-         return (row == 0 && col == 0) ||
-            (row == 0 && col == 7) ||
-            (row == 7 && col == 0) ||
-            (row == 7 && col == 7)
-      end
-
-      def search(my_disk)
-         max = 0
-         max_row = nil
-         max_col = nil
-         for row in 0 .. 7
-            for col in 0 .. 7
-               buf = count_point(row, col, my_disk)
-               if (corner?(row, col) && buf > 0) || max < buf
-                  max = buf
-                  max_row = row
-                  max_col = col
-               end
-            end
-         end
-         return max_row, max_col
-      end
-   end #--------------------------> class Board ends here
-
-   class BoardView < TclTkWidget
-
-      BACK_GROUND_COLOR = "DarkGreen"
-      HILIT_BG_COLOR = "green"
-      BORDER_COLOR = "black"
-      BLACK_COLOR = "black"
-      WHITE_COLOR = "white"
-      STOP_COLOR = "red"
-
-      attr :left
-      attr :top
-      attr :right
-      attr :bottom
-
-      class Square
-
-         attr :oval, TRUE
-         attr :row
-         attr :col
-
-         def initialize(view, row, col)
-            @view = view
-            @id = @view.e("create rectangle",
-                          *(view.tk_rect(view.left + col,
-                                         view.top + row,
-                                         view.left + col + 1,
-                                         view.top + row + 1) \
-                            << "-fill #{BACK_GROUND_COLOR}") )
-            @row = row
-            @col = col
-            @view.e("itemconfigure", @id,
-              "-width 0.5m -outline #{BORDER_COLOR}")
-            @view.e("bind", @id, "<Any-Enter>", TclTkCallback.new($ip, proc{
-               if @oval == nil
-                  view.e("itemconfigure", @id, "-fill #{HILIT_BG_COLOR}")
-               end
-            }))
-            @view.e("bind", @id, "<Any-Leave>", TclTkCallback.new($ip, proc{
-               view.e("itemconfigure", @id, "-fill #{BACK_GROUND_COLOR}")
-            }))
-            @view.e("bind", @id, "<ButtonRelease-1>", TclTkCallback.new($ip,
-               proc{
-               view.click_square(self)
-            }))
-         end
-
-         def blink(color)
-            @view.e("itemconfigure", @id, "-fill #{color}")
-            $update.e()
-            sleep(0.1)
-            @view.e("itemconfigure", @id, "-fill #{BACK_GROUND_COLOR}")
-         end
-      end #-----------------------> class Square ends here
-
-      def initialize(othello, board)
-         super($ip, $root, $canvas)
-         @othello = othello
-         @board = board
-         @board.add_observer(self)
-
-         @squares = Array.new(8)
-         for i in 0 .. 7
-            @squares[i] = Array.new(8)
-         end
-         @left = 1
-         @top = 0.5
-         @right = @left + 8
-         @bottom = @top + 8
-
-         i = self.e("create rectangle", *tk_rect(@left, @top, @right, @bottom))
-         self.e("itemconfigure", i,
-            "-width 1m -outline #{BORDER_COLOR} -fill #{BACK_GROUND_COLOR}")
-
-         for row in 0 .. 7
-            for col in 0 .. 7
-               @squares[row][col] = Square.new(self, row, col)
-            end
-         end
-
-         update
-      end
-
-      def tk_rect(left, top, right, bottom)
-         return left.to_s + "c", top.to_s + "c",
-            right.to_s + "c", bottom.to_s + "c"
-      end
-
-      def clear
-         each_square do |square|
-            if square.oval != nil
-               self.e("delete", square.oval)
-               square.oval = nil
-            end
-         end
-      end
-
-      def draw_disk(row, col, disk)
-         if disk == EMPTY
-            if @squares[row][col].oval != nil
-               self.e("delete", @squares[row][col].oval)
-               @squares[row][col].oval = nil
-            end
-            return
-         end
-
-         $update.e()
-         sleep(0.05)
-         oval = @squares[row][col].oval
-         if oval == nil
-            oval = self.e("create oval", *tk_rect(@left + col + 0.2,
-                                           @top + row + 0.2,
-                                           @left + col + 0.8,
-                                           @top + row + 0.8))
-            @squares[row][col].oval = oval
-         end
-         case disk
-         when BLACK
-            color = BLACK_COLOR
-         when WHITE
-            color = WHITE_COLOR
-         else
-            fail format("Unknown disk type: %d", disk)
-         end
-         self.e("itemconfigure", oval, "-outline #{color} -fill #{color}")
-      end
-
-      def update(row = nil, col = nil)
-         if row && col
-            draw_disk(row, col, @board.get_disk(row, col))
-         else
-            each_square do |square|
-               draw_disk(square.row, square.col,
-                         @board.get_disk(square.row, square.col))
-            end
-         end
-         @othello.show_point
-      end
-
-      def each_square
-         @squares.each do |rows|
-            rows.each do |square|
-               yield(square)
-            end
-         end
-      end
-
-      def click_square(square)
-         if @othello.in_com_turn || @othello.game_over ||
-               @board.count_point(square.row,
-                                  square.col,
-                                  @board.man_disk) == 0
-            square.blink(STOP_COLOR)
-            return
-         end
-         @board.put_disk(square.row, square.col, @board.man_disk)
-         @othello.com_turn
-      end
-
-      private :draw_disk
-      public :update
-   end #----------------------> class BoardView ends here
-
-   def initialize
-      @msg_label = TclTkWidget.new($ip, $root, $label)
-      $pack.e(@msg_label)
-
-      @board = Board.new(self)
-      @board_view = BoardView.new(self, @board)
-      #### added by Y. Shigehiro
-      ## board_view の大きさを設定する.
-      x1, y1, x2, y2 = @board_view.e("bbox all").split(/ /).collect{|i| i.to_f}
-      @board_view.e("configure -width", x2 - x1)
-      @board_view.e("configure -height", y2 - y1)
-      ## scrollregion を設定する.
-      @board_view.e("configure -scrollregion {", @board_view.e("bbox all"),
-         "}")
-      #### ここまで
-      $pack.e(@board_view, "-fill both -expand true")
-
-      panel = TclTkWidget.new($ip, $root, $frame)
-
-      @play_black = TclTkWidget.new($ip, panel, $checkbutton,
-        "-text {com is black} -command", TclTkCallback.new($ip, proc{
-         switch_side
-      }))
-      $pack.e(@play_black, "-side left")
-
-      quit = TclTkWidget.new($ip, panel, $button, "-text Quit -command",
-         TclTkCallback.new($ip, proc{
-         exit
-      }))
-      $pack.e(quit, "-side right -fill x")
-
-      reset = TclTkWidget.new($ip, panel, $button, "-text Reset -command",
-         TclTkCallback.new($ip, proc{
-         reset_game
-      }))
-      $pack.e(reset, "-side right -fill x")
-
-      $pack.e(panel, "-side bottom -fill x")
-
-#      root = Tk.root
-      $wm.e("title", $root, "Othello")
-      $wm.e("iconname", $root, "Othello")
-
-      @board.com_disk = WHITE
-      @game_over = FALSE
-
-      TclTk.mainloop
-   end
-
-   def switch_side
-      if @in_com_turn
-         @play_black.e("toggle")
-      else
-         @board.com_disk = @board.man_disk
-         com_turn unless @game_over
-      end
-   end
-
-   def reset_game
-      if @board.com_disk == BLACK
-         @board.com_disk = WHITE
-         @play_black.e("toggle")
-      end
-      @board_view.clear
-      @board.reset
-      $wm.e("title", $root, "Othello")
-      @game_over = FALSE
-   end
-
-   def com_turn
-      @in_com_turn = TRUE
-      $update.e()
-      sleep(0.5)
-      begin
-         com_disk = @board.count_disk(@board.com_disk)
-         man_disk = @board.count_disk(@board.man_disk)
-         if @board.count_disk(EMPTY) == 0
-            if man_disk == com_disk
-               $wm.e("title", $root, "{Othello - Draw!}")
-            elsif man_disk > com_disk
-               $wm.e("title", $root, "{Othello - You Win!}")
-            else
-               $wm.e("title", $root, "{Othello - You Loose!}")
-            end
-            @game_over = TRUE
-            break
-         elsif com_disk == 0
-            $wm.e("title", $root, "{Othello - You Win!}")
-            @game_over = TRUE
-            break
-         elsif man_disk == 0
-            $wm.e("title", $root, "{Othello - You Loose!}")
-            @game_over = TRUE
-            break
-         end
-         row, col = @board.search(@board.com_disk)
-         break if row == nil || col == nil
-         @board.put_disk(row, col, @board.com_disk)
-      end while @board.search(@board.man_disk) == [nil, nil]
-      @in_com_turn = FALSE
-   end
-
-   def show_point
-      black = @board.count_disk(BLACK)
-      white = @board.count_disk(WHITE)
-      @msg_label.e("configure -text",
-         %Q/{#{format("BLACK: %.2d    WHITE: %.2d", black, white)}}/)
-   end
-end #----------------------> class Othello ends here
-
-Othello.new
-
-#----------------------------------------------> othello.rb ends here
diff --git a/ext/tk/sample/tkalignbox.rb b/ext/tk/sample/tkalignbox.rb
deleted file mode 100644
index 89aae111b7..0000000000
--- a/ext/tk/sample/tkalignbox.rb
+++ /dev/null
@@ -1,236 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkalignbox.rb : align widgets with same width/height
-#
-#                                            by Hidetoshi NAGAI
-#
-#  The box size depends on 'reqheight' and 'reqwidth' of contained widgets.
-#  If you want to give the box size when those requested sizes are 0,
-#  please set box.propagate = false (See the test routine at the tail of
-#  this file).
-
-require 'tk'
-
-module Tk
-  module RbWidget
-    class AlignBox < TkFrame
-    end
-  end
-end
-
-class Tk::RbWidget::AlignBox < TkFrame
-  def initialize(*args)
-    if self.class == Tk::RbWidget::AlignBox
-      fail RuntimeError, "Tk::AlignBox is an abstract class"
-    end
-    @padx = 0
-    @pady = 0
-    if args[-1].kind_of? Hash
-      keys = _symbolkey2str(args.pop)
-      @padx = keys.delete('padx') || 0
-      @pady = keys.delete('pady') || 0
-      args.push(keys)
-    end
-    super(*args)
-    @max_width = 0
-    @max_height = 0
-    @propagate = true
-    @widgets = []
-  end
-
-  def _set_framesize
-    fail RuntimeError, "Tk::AlignBox is an abstract class"
-  end
-  private :_set_framesize
-
-  def _place_config(widget, idx, cnt)
-    fail RuntimeError, "Tk::AlignBox is an abstract class"
-  end
-  private :_place_config
-
-  def align
-    widgets = []
-    @widgets.each{|w| widgets << w if w.winfo_exist?}
-    @widgets = widgets
-    cnt = @widgets.size.to_f
-    @widgets.each_with_index{|w, idx| _place_config(w, idx, cnt)}
-    @widgets = widgets
-    _set_framesize if @propagate
-    self
-  end
-
-  def add(*widgets)
-    widgets.each{|w|
-      unless w.kind_of? TkWindow
-        fail RuntimeError, "#{w.inspect} is not a widget instance."
-      end
-      @widgets.delete(w)
-      @widgets << w
-      sz = w.winfo_reqwidth
-      @max_width = sz if @max_width < sz
-      sz = w.winfo_reqheight
-      @max_height = sz if @max_height < sz
-    }
-    align
-  end
-
-  def <<(widget)
-    add(widget)
-  end
-
-  def insert(idx, widget)
-    unless widget.kind_of? TkWindow
-      fail RuntimeError, "#{widget.inspect} is not a widget instance."
-    end
-    @widgets.delete(widget)
-    @widgets[idx,0] = widget
-    sz = widget.winfo_reqwidth
-    @max_width = sz if @max_width < sz
-    sz = widget.winfo_reqheight
-    @max_height = sz if @max_height < sz
-    align
-  end
-
-  def delete(idx)
-    ret = @widgets.delete_at(idx)
-    @req_size = 0
-    @widget.each{|w|
-      sz = w.winfo_reqwidth
-      @max_width = sz if @max_width < sz
-      sz = w.winfo_reqheight
-      @max_height = sz if @max_height < sz
-    }
-    align
-    ret
-  end
-
-  def padx(size = nil)
-    if size
-      @padx = size
-      align
-    else
-      @padx
-    end
-  end
-
-  def pady(size = nil)
-    if size
-      @pady = size
-      align
-    else
-      @pady
-    end
-  end
-
-  attr_accessor :propagate
-end
-
-class Tk::RbWidget::HBox < Tk::RbWidget::AlignBox
-  def _set_framesize
-    bd = self.borderwidth
-    self.width((@max_width + 2*@padx) * @widgets.size + 2*bd)
-    self.height(@max_height + 2*@pady + 2*bd)
-  end
-  private :_set_framesize
-
-  def _place_config(widget, idx, cnt)
-    widget.place_in(self,
-                    'relx'=>idx/cnt, 'x'=>@padx,
-                    'rely'=>0, 'y'=>@pady,
-                    'relwidth'=>1.0/cnt, 'width'=>-2*@padx,
-                    'relheight'=>1.0, 'height'=>-2*@pady)
-  end
-  private :_place_config
-end
-Tk::RbWidget::HLBox = Tk::RbWidget::HBox
-
-class Tk::RbWidget::HRBox < Tk::RbWidget::HBox
-  def _place_config(widget, idx, cnt)
-    widget.place_in(self,
-                    'relx'=>(cnt - idx - 1)/cnt, 'x'=>@padx,
-                    'rely'=>0, 'y'=>@pady,
-                    'relwidth'=>1.0/cnt, 'width'=>-2*@padx,
-                    'relheight'=>1.0, 'height'=>-2*@pady)
-  end
-  private :_place_config
-end
-
-class Tk::RbWidget::VBox < Tk::RbWidget::AlignBox
-  def _set_framesize
-    bd = self.borderwidth
-    self.width(@max_width + 2*@padx + 2*bd)
-    self.height((@max_height + 2*@pady) * @widgets.size + 2*bd)
-  end
-  private :_set_framesize
-
-  def _place_config(widget, idx, cnt)
-    widget.place_in(self,
-                    'relx'=>0, 'x'=>@padx,
-                    'rely'=>idx/cnt, 'y'=>@pady,
-                    'relwidth'=>1.0, 'width'=>-2*@padx,
-                    'relheight'=>1.0/cnt, 'height'=>-2*@pady)
-  end
-  private :_place_config
-end
-Tk::RbWidget::VTBox = Tk::RbWidget::VBox
-
-class Tk::RbWidget::VBBox < Tk::RbWidget::VBox
-  def _place_config(widget, idx, cnt)
-    widget.place_in(self,
-                    'relx'=>0, 'x'=>@padx,
-                    'rely'=>(cnt - idx - 1)/cnt, 'y'=>@pady,
-                    'relwidth'=>1.0, 'width'=>-2*@padx,
-                    'relheight'=>1.0/cnt, 'height'=>-2*@pady)
-  end
-  private :_place_config
-end
-
-################################################
-# test
-################################################
-if __FILE__ == $0
-  f = Tk::RbWidget::HBox.new(:borderwidth=>3, :relief=>'ridge').pack
-  f.add(TkButton.new(f, :text=>'a'),
-        TkButton.new(f, :text=>'aa', :font=>'Helvetica 16'),
-        TkButton.new(f, :text=>'aaa'),
-        TkButton.new(f, :text=>'aaaa'))
-
-  f = Tk::RbWidget::HBox.new(:borderwidth=>3, :relief=>'ridge',
-                             :padx=>7, :pady=>3, :background=>'yellow').pack
-  f.add(TkButton.new(f, :text=>'a'),
-        TkButton.new(f, :text=>'aa', :font=>'Helvetica 16'),
-        TkButton.new(f, :text=>'aaa'),
-        TkButton.new(f, :text=>'aaaa'))
-
-  f = Tk::RbWidget::VBox.new(:borderwidth=>5,
-                             :relief=>'groove').pack(:fill=>:y, :expand=>true)
-  f.add(TkButton.new(f, :text=>'a'),
-        TkButton.new(f, :text=>'aa', :font=>'Helvetica 30'),
-        TkButton.new(f, :text=>'aaa'),
-        TkButton.new(f, :text=>'aaaa'))
-
-  f = Tk::RbWidget::HRBox.new(:borderwidth=>3,
-                              :relief=>'raised').pack(:fill=>:x)
-  f.add(TkButton.new(f, :text=>'a'),
-        TkButton.new(f, :text=>'aa'),
-        TkButton.new(f, :text=>'aaa'))
-
-  f = Tk::RbWidget::VBBox.new(:borderwidth=>3,
-                              :relief=>'ridge').pack(:fill=>:x)
-  f.propagate = false
-  f.height 100
-  f.add(TkFrame.new(f){|ff|
-          TkButton.new(ff, :text=>'a').pack(:pady=>4, :padx=>6,
-                                            :fill=>:both, :expand=>true)
-        },
-        TkFrame.new(f){|ff|
-          TkButton.new(ff, :text=>'aa').pack(:pady=>4, :padx=>6,
-                                             :fill=>:both, :expand=>true)
-        },
-        TkFrame.new(f){|ff|
-          TkButton.new(ff, :text=>'aaaa').pack(:pady=>4, :padx=>6,
-                                               :fill=>:both, :expand=>true)
-        })
-
-  Tk.mainloop
-end
diff --git a/ext/tk/sample/tkballoonhelp.rb b/ext/tk/sample/tkballoonhelp.rb
deleted file mode 100644
index f6f2c8ab0c..0000000000
--- a/ext/tk/sample/tkballoonhelp.rb
+++ /dev/null
@@ -1,221 +0,0 @@
-# frozen_string_literal: false
-#
-# tkballoonhelp.rb : simple balloon help widget
-#                       by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-# Add a balloon help to a widget.
-# This widget has only poor features. If you need more useful features,
-# please try to use the Tix extension of Tcl/Tk under Ruby/Tk.
-#
-# The interval time to display a balloon help is defined 'interval' option
-# (default is 750ms).
-#
-require 'tk'
-
-module Tk
-  module RbWidget
-    class BalloonHelp<TkLabel
-    end
-  end
-end
-class Tk::RbWidget::BalloonHelp<TkLabel
-  DEFAULT_FOREGROUND = 'black'
-  DEFAULT_BACKGROUND = 'white'
-  DEFAULT_INTERVAL   = 750
-
-  def _balloon_binding(interval)
-    @timer = TkAfter.new(interval, 1, proc{show})
-    def @timer.interval(val)
-      @sleep_time = val
-    end
-    @bindtag = TkBindTag.new
-    @bindtag.bind('Enter',  proc{@timer.start})
-    @bindtag.bind('Motion', proc{@timer.restart; erase})
-    @bindtag.bind('Any-ButtonPress', proc{@timer.restart; erase})
-    @bindtag.bind('Leave',  proc{@timer.stop; erase})
-    tags = @parent.bindtags
-    idx = tags.index(@parent)
-    unless idx
-      ppath = TkComm.window(@parent.path)
-      idx = tags.index(ppath) || 0
-    end
-    tags[idx,0] = @bindtag
-    @parent.bindtags(tags)
-  end
-  private :_balloon_binding
-
-  def initialize(parent=nil, keys={})
-    @parent = parent || Tk.root
-
-    @frame = TkToplevel.new(@parent)
-    @frame.withdraw
-    @frame.overrideredirect(true)
-    @frame.transient(TkWinfo.toplevel(@parent))
-    @epath = @frame.path
-
-    if keys
-      keys = _symbolkey2str(keys)
-    else
-      keys = {}
-    end
-
-    @command = keys.delete('command')
-
-    @interval = keys.delete('interval'){DEFAULT_INTERVAL}
-    _balloon_binding(@interval)
-
-    # @label = TkLabel.new(@frame, 'background'=>'bisque').pack
-    @label = TkLabel.new(@frame,
-                         'foreground'=>DEFAULT_FOREGROUND,
-                         'background'=>DEFAULT_BACKGROUND).pack
-    @label.configure(_symbolkey2str(keys)) unless keys.empty?
-    @path = @label
-  end
-
-  def epath
-    @epath
-  end
-
-  def interval(val)
-    if val
-      @timer.interval(val)
-    else
-      @interval
-    end
-  end
-
-  def command(cmd = Proc.new)
-    @command = cmd
-    self
-  end
-
-  def show
-    x = TkWinfo.pointerx(@parent)
-    y = TkWinfo.pointery(@parent)
-    @frame.geometry("+#{x+1}+#{y+1}")
-
-    if @command
-      case @command.arity
-      when 0
-        @command.call
-      when 2
-        @command.call(x - TkWinfo.rootx(@parent), y - TkWinfo.rooty(@parent))
-      when 3
-        @command.call(x - TkWinfo.rootx(@parent), y - TkWinfo.rooty(@parent),
-                      self)
-      else
-        @command.call(x - TkWinfo.rootx(@parent), y - TkWinfo.rooty(@parent),
-                      self, @parent)
-      end
-    end
-
-    @frame.deiconify
-    @frame.raise
-
-    begin
-      @org_cursor = @parent.cget('cursor')
-    rescue
-      @org_cursor = @parent['cursor']
-    end
-    begin
-      @parent.configure('cursor', 'crosshair')
-    rescue
-      @parent.cursor('crosshair')
-    end
-  end
-
-  def erase
-    begin
-      @parent.configure('cursor', @org_cursor)
-    rescue
-      @parent.cursor(@org_cursor)
-    end
-    @frame.withdraw
-  end
-
-  def destroy
-    @frame.destroy
-  end
-end
-
-################################################
-# test
-################################################
-if __FILE__ == $0
-  TkButton.new('text'=>'This button has a balloon help') {|b|
-    pack('fill'=>'x')
-    Tk::RbWidget::BalloonHelp.new(b, 'text'=>' Message ')
-  }
-  TkButton.new('text'=>'This button has another balloon help') {|b|
-    pack('fill'=>'x')
-    Tk::RbWidget::BalloonHelp.new(b,
-                        'text'=>"CONFIGURED MESSAGE\nchange colors, and so on",
-                        'interval'=>200, 'font'=>'courier',
-                        'background'=>'gray', 'foreground'=>'red')
-  }
-
-  sb = TkScrollbox.new.pack(:fill=>:x)
-  sb.insert(:end, *%w(aaa bbb ccc ddd eee fff ggg hhh iii jjj kkk lll mmm))
-=begin
-  # CASE1 : command takes no argument
-  bh = Tk::RbWidget::BalloonHelp.new(sb, :interval=>500,
-                           :relief=>:ridge, :background=>'white',
-                           :command=>proc{
-                             y = TkWinfo.pointery(sb) - TkWinfo.rooty(sb)
-                             bh.text "current index == #{sb.nearest(y)}"
-                           })
-=end
-=begin
-  # CASE2 : command takes 2 arguments
-  bh = Tk::RbWidget::BalloonHelp.new(sb, :interval=>500,
-                           :relief=>:ridge, :background=>'white',
-                           :command=>proc{|x, y|
-                             bh.text "current index == #{sb.nearest(y)}"
-                           })
-=end
-=begin
-  # CASE3 : command takes 3 arguments
-  Tk::RbWidget::BalloonHelp.new(sb, :interval=>500,
-                      :relief=>:ridge, :background=>'white',
-                      :command=>proc{|x, y, bhelp|
-                        bhelp.text "current index == #{sb.nearest(y)}"
-                      })
-=end
-=begin
-  # CASE4a : command is a Proc object and takes 4 arguments
-  cmd = proc{|x, y, bhelp, parent|
-    bhelp.text "current index == #{parent.nearest(y)}"
-  }
-
-  Tk::RbWidget::BalloonHelp.new(sb, :interval=>500,
-                      :relief=>:ridge, :background=>'white',
-                      :command=>cmd)
-
-  sb2 = TkScrollbox.new.pack(:fill=>:x)
-  sb2.insert(:end, *%w(AAA BBB CCC DDD EEE FFF GGG HHH III JJJ KKK LLL MMM))
-  Tk::RbWidget::BalloonHelp.new(sb2, :interval=>500,
-                      :padx=>5, :relief=>:raised,
-                      :background=>'gray25', :foreground=>'white',
-                      :command=>cmd)
-=end
-#=begin
-  # CASE4b : command is a Method object and takes 4 arguments
-  def set_msg(x, y, bhelp, parent)
-    bhelp.text "current index == #{parent.nearest(y)}"
-  end
-  cmd = self.method(:set_msg)
-
-  Tk::RbWidget::BalloonHelp.new(sb, :interval=>500,
-                                :relief=>:ridge, :background=>'white',
-                                :command=>cmd)
-
-  sb2 = TkScrollbox.new.pack(:fill=>:x)
-  sb2.insert(:end, *%w(AAA BBB CCC DDD EEE FFF GGG HHH III JJJ KKK LLL MMM))
-  Tk::RbWidget::BalloonHelp.new(sb2, :interval=>500,
-                                :padx=>5, :relief=>:raised,
-                                :background=>'gray25', :foreground=>'white',
-                                :command=>cmd)
-#=end
-
-  Tk.mainloop
-end
diff --git a/ext/tk/sample/tkbiff.rb b/ext/tk/sample/tkbiff.rb
deleted file mode 100644
index 8dc586a8ff..0000000000
--- a/ext/tk/sample/tkbiff.rb
+++ /dev/null
@@ -1,156 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-
-if ARGV[0] != '-d'
-  unless $DEBUG
-    exit if fork
-  end
-else
-  ARGV.shift
-end
-
-if ARGV.length == 0
-  if ENV['MAIL']
-    $spool = ENV['MAIL']
-  else
-    $spool = '/var/spool/mail/' + ENV['USER']
-  end
-else
-  $spool = ARGV[0]
-end
-
-require "base64"
-
-class Mail
-  def Mail.new(f)
-    if !f.kind_of?(IO)
-      f = open(f, "r")
-      me = super
-      f.close
-    else
-      me = super
-    end
-    return me
-  end
-
-  def initialize(f)
-    @header = {}
-    @body = []
-    while line = f.gets()
-      line.chop!
-      next if /^From / =~ line  # skip From-line
-      break if /^$/ =~ line     # end of header
-      if /^(\S+):\s*(.*)/ =~ line
-        @header[attr = $1.capitalize] = $2
-      elsif attr
-        sub(/^\s*/, '')
-        @header[attr] += "\n" + $_
-      end
-    end
-
-    return unless $_
-
-    while line = f.gets()
-      break if /^From / =~ line
-      @body.push($_)
-    end
-  end
-
-  def header
-    return @header
-  end
-
-  def body
-    return @body
-  end
-
-end
-
-require "tkscrollbox"
-
-my_appname = Tk.appname('tkbiff')
-$top = TkRoot.new
-if ((TkWinfo.interps($top) - [my_appname]).find{|ip| ip =~ /^tkbiff/})
-  STDERR.print("Probably other 'tkbiff's are running. Bye.\n")
-  exit
-end
-
-$top.withdraw
-$list = TkScrollbox.new($top) {
-  relief 'raised'
-  width 80
-  height 8
-  setgrid 'yes'
-  pack
-}
-TkButton.new($top) {
-  text 'Dismiss'
-  command proc {$top.withdraw}
-  pack('fill'=>'both','expand'=>'yes')
-}
-$top.bind "Control-c", proc{exit}
-$top.bind "Control-q", proc{exit}
-$top.bind "space", proc{exit}
-
-$spool_size = 0
-$check_time = Time.now
-
-def check
-  $check_time = Time.now
-  size = File.size($spool)
-  if size and size != $spool_size
-    $spool_size = size
-    pop_up if size > 0
-  end
-  Tk.after 5000, proc{check}
-end
-
-if defined? Thread
-  Thread.start do
-    loop do
-      sleep 600
-      if Time.now - $check_time > 200
-        Tk.after 5000, proc{check}
-      end
-    end
-  end
-end
-
-def pop_up
-  outcount = 0;
-  $list.delete 0, 'end'
-  f = open($spool, "r")
-  while !f.eof?
-    mail = Mail.new(f)
-    date, from, subj =  mail.header['Date'], mail.header['From'], mail.header['Subject']
-    next if !date
-    y = m = d = 0
-    if date
-      date = Date.parse(date)
-      y, m, d = date.year, date.month, date.mday
-    end
-    from = "sombody@somewhere" if ! from
-    subj = "(nil)" if ! subj
-    from = decode_b(from)
-    subj = decode_b(subj)
-    $list.insert 'end', format('%-02d/%02d/%02d [%-28.28s] %s',y,m,d,from,subj)
-    outcount += 1
-  end
-  f.close
-  if outcount == 0
-    $list.insert 'end', "You have no mail."
-  else
-    $list.see 'end'
-  end
-  $top.deiconify
-  Tk.after 2000, proc{$top.iconify}
-end
-
-$list.insert 'end', "You have no mail."
-check
-Tk.after 2000, proc{$top.iconify}
-begin
-  Tk.mainloop
-rescue
-  `echo #$! > /tmp/tkbiff`
-end
diff --git a/ext/tk/sample/tkbrowse.rb b/ext/tk/sample/tkbrowse.rb
deleted file mode 100644
index f083a8ac77..0000000000
--- a/ext/tk/sample/tkbrowse.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-#
-# This script generates a directory browser, which lists the working
-# directory and allows you to open files or subdirectories by
-# double-clicking.
-
-# Create a scrollbar on the right side of the main window and a listbox
-# on the left side.
-
-require "tkscrollbox"
-
-# The procedure below is invoked to open a browser on a given file;  if the
-# file is a directory then another instance of this program is invoked; if
-# the file is a regular file then the Mx editor is invoked to display
-# the file.
-
-$dirlist = {}
-
-def browsedir (dir)
-  if $dirlist.key? dir
-    $dirlist[dir]
-  else
-    top = if $dirlist.size > 0 then TkToplevel.new else nil end
-    list = TkScrollbox.new(top) {
-      relief 'raised'
-      width 20
-      height 20
-      setgrid 'yes'
-      pack
-    }
-    list.insert 'end', *`ls #{dir}`.split
-
-    # Set up bindings for the browser.
-
-    list.focus
-    list.bind "Control-q", proc{exit}
-    list.bind "Control-c", proc{exit}
-    list.bind "Control-p", proc{
-      print "selection <", TkSelection.get, ">\n"
-    }
-
-    list.bind "Double-Button-1", proc{
-      for i in TkSelection.get.split
-        print "clicked ", i, "\n"
-        browse dir, i
-      end
-    }
-    $dirlist[dir] = list
-  end
-end
-
-def browse (dir, file)
-  file="#{dir}/#{file}"
-  if File.directory? file
-    browsedir(file)
-  else
-    if File.file? file
-      if ENV['EDITOR']
-        system format("%s %s&", ENV['EDITOR'], file)
-      else
-        system "xedit #{file}&"
-      end
-    else
-      STDERR.print "\"#{file}\" isn't a directory or regular file"
-    end
-  end
-end
-
-# Fill the listbox with a list of all the files in the directory (run
-# the "ls" command to get that information).
-
-if ARGV.length>0
-  dir = ARGV[0]
-else
-  dir="."
-end
-
-browsedir(dir)
-Tk.mainloop
diff --git a/ext/tk/sample/tkcombobox.rb b/ext/tk/sample/tkcombobox.rb
deleted file mode 100644
index 17adbc9f9e..0000000000
--- a/ext/tk/sample/tkcombobox.rb
+++ /dev/null
@@ -1,498 +0,0 @@
-# frozen_string_literal: false
-#
-#  tkcombobox.rb : auto scrollbox & combobox
-#
-#                         by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-
-module Tk
-  module RbWidget
-    class AutoScrollListbox < TkListbox
-    end
-    class Combobox < TkEntry
-    end
-  end
-end
-
-class Tk::RbWidget::AutoScrollListbox
-  include TkComposite
-
-  @@up_bmp = TkBitmapImage.new(:data=><<EOD)
-#define up_arrow_width 9
-#define up_arrow_height 9
-static unsigned char up_arrow_bits[] = {
-   0x00, 0x00, 0x10, 0x00, 0x10, 0x00, 0x38, 0x00, 0x38, 0x00, 0x7c, 0x00,
-   0x7c, 0x00, 0xfe, 0x00, 0x00, 0x00};
-EOD
-
-  @@down_bmp = TkBitmapImage.new(:data=><<EOD)
-#define up_arrow_width 9
-#define up_arrow_height 9
-static unsigned char down_arrow_bits[] = {
-   0x00, 0x00, 0xfe, 0x00, 0x7c, 0x00, 0x7c, 0x00, 0x38, 0x00, 0x38, 0x00,
-   0x10, 0x00, 0x10, 0x00, 0x00, 0x00};
-EOD
-
-  ############################
-  private
-  ############################
-  def initialize_composite(keys={})
-    keys = _symbolkey2str(keys)
-
-    @initwait = keys.delete('startwait'){300}
-    @interval = keys.delete('interval'){150}
-    @initwait -= @interval
-    @initwait = 0 if @initwait < 0
-
-    @lbox = TkListbox.new(@frame, :borderwidth=>0)
-    @path = @lbox.path
-    TkPack.propagate(@lbox, false)
-
-    @scr = TkScrollbar.new(@frame, :width=>10)
-
-    @lbox.yscrollcommand(proc{|*args| @scr.set(*args); _config_proc})
-    @scr.command(proc{|*args| @lbox.yview(*args); _config_proc})
-
-    @up_arrow   = TkLabel.new(@lbox, :image=>@@up_bmp,
-                              :relief=>:raised, :borderwidth=>1)
-    @down_arrow = TkLabel.new(@lbox, :image=>@@down_bmp,
-                              :relief=>:raised, :borderwidth=>1)
-
-    _init_binding
-
-    @lbox.pack(:side=>:left, :fill=>:both, :expand=>:true)
-
-    delegate('DEFAULT', @lbox)
-    delegate('background', @frame, @scr)
-    delegate('activebackground', @scr)
-    delegate('troughcolor', @scr)
-    delegate('repeatdelay', @scr)
-    delegate('repeatinterval', @scr)
-    delegate('relief', @frame)
-    delegate('borderwidth', @frame)
-
-    delegate_alias('arrowrelief', 'relief', @up_arrow, @down_arrow)
-    delegate_alias('arrowborderwidth', 'borderwidth', @up_arrow, @down_arrow)
-
-    scrollbar(keys.delete('scrollbar')){false}
-
-    configure keys unless keys.empty?
-  end
-
-  def _show_up_arrow
-    unless @up_arrow.winfo_mapped?
-      @up_arrow.pack(:side=>:top, :fill=>:x)
-    end
-  end
-
-  def _show_down_arrow
-    unless @down_arrow.winfo_mapped?
-      @down_arrow.pack(:side=>:bottom, :fill=>:x)
-    end
-  end
-
-  def _set_sel(idx)
-      @lbox.activate(idx)
-      @lbox.selection_clear(0, 'end')
-      @lbox.selection_set(idx)
-  end
-
-  def _check_sel(cidx, tidx = nil, bidx = nil)
-    _set_sel(cidx)
-    unless tidx
-      tidx = @lbox.nearest(0)
-      tidx += 1 if tidx > 0
-    end
-    unless bidx
-      bidx = @lbox.nearest(10000)
-      bidx -= 1 if bidx < @lbox.index('end') - 1
-    end
-    if cidx > bidx
-      _set_sel(bidx)
-    end
-    if cidx < tidx
-      _set_sel(tidx)
-    end
-  end
-
-  def _up_proc
-    cidx = @lbox.curselection[0]
-    idx = @lbox.nearest(0)
-    if idx >= 0
-      @lbox.see(idx - 1)
-      _set_sel(idx)
-      @up_arrow.pack_forget if idx == 1
-      @up_timer.stop if idx == 0
-      _show_down_arrow if @lbox.bbox('end') == []
-    end
-    if cidx && cidx > 0 && (idx == 0 || cidx == @lbox.nearest(10000))
-      _set_sel(cidx - 1)
-    end
-  end
-
-  def _down_proc
-    cidx = @lbox.curselection[0]
-    eidx = @lbox.index('end') - 1
-    idx = @lbox.nearest(10000)
-    if idx <= eidx
-      @lbox.see(idx + 1)
-      _set_sel(cidx + 1) if cidx < eidx
-      @down_arrow.pack_forget if idx + 1 == eidx
-      @down_timer.stop if idx == eidx
-      _show_up_arrow if @lbox.bbox(0) == []
-    end
-    if cidx && cidx < eidx && (eidx == idx || cidx == @lbox.nearest(0))
-      _set_sel(cidx + 1)
-    end
-  end
-
-  def _key_UP_proc
-    cidx = @lbox.curselection[0]
-    _set_sel(cidx = @lbox.index('activate')) unless cidx
-    cidx -= 1
-    if cidx == 0
-      @up_arrow.pack_forget
-    elsif cidx == @lbox.nearest(0)
-      @lbox.see(cidx - 1)
-    end
-  end
-
-  def _key_DOWN_proc
-    cidx = @lbox.curselection[0]
-    _set_sel(cidx = @lbox.index('activate')) unless cidx
-    cidx += 1
-    if cidx == @lbox.index('end') - 1
-      @down_arrow.pack_forget
-    elsif cidx == @lbox.nearest(10000)
-      @lbox.see(cidx + 1)
-    end
-  end
-
-  def _config_proc
-    if @lbox.size == 0
-      @up_arrow.pack_forget
-      @down_arrow.pack_forget
-      return
-    end
-    tidx = @lbox.nearest(0)
-    bidx = @lbox.nearest(10000)
-    if tidx > 0
-      _show_up_arrow
-      tidx += 1
-    else
-      @up_arrow.pack_forget unless @up_timer.running?
-    end
-    if bidx < @lbox.index('end') - 1
-      _show_down_arrow
-      bidx -= 1
-    else
-      @down_arrow.pack_forget unless @down_timer.running?
-    end
-    cidx = @lbox.curselection[0]
-    _check_sel(cidx, tidx, bidx) if cidx
-  end
-
-  def _init_binding
-    @up_timer = TkAfter.new(@interval, -1, proc{_up_proc})
-    @down_timer = TkAfter.new(@interval, -1, proc{_down_proc})
-
-    @up_timer.set_start_proc(@initwait, proc{})
-    @down_timer.set_start_proc(@initwait, proc{})
-
-    @up_arrow.bind('Enter', proc{@up_timer.start})
-    @up_arrow.bind('Leave', proc{@up_timer.stop if @up_arrow.winfo_mapped?})
-    @down_arrow.bind('Enter', proc{@down_timer.start})
-    @down_arrow.bind('Leave', proc{@down_timer.stop if @down_arrow.winfo_mapped?})
-
-    @lbox.bind('Configure', proc{_config_proc})
-    @lbox.bind('Enter', proc{|y| _set_sel(@lbox.nearest(y))}, '%y')
-    @lbox.bind('Motion', proc{|y|
-                 @up_timer.stop if @up_timer.running?
-                 @down_timer.stop if @down_timer.running?
-                 _check_sel(@lbox.nearest(y))
-               }, '%y')
-
-    @lbox.bind('Up', proc{_key_UP_proc})
-    @lbox.bind('Down', proc{_key_DOWN_proc})
-  end
-
-  ############################
-  public
-  ############################
-  def scrollbar(mode)
-    if mode
-      @scr.pack(:side=>:right, :fill=>:y)
-    else
-      @scr.pack_forget
-    end
-  end
-end
-
-################################################
-
-class Tk::RbWidget::Combobox < TkEntry
-  include TkComposite
-
-  @@down_btn_bmp = TkBitmapImage.new(:data=><<EOD)
-#define down_arrow_width 11
-#define down_arrow_height 11
-static unsigned char down_arrow_bits[] = {
-   0x00, 0x00, 0xfe, 0x03, 0xfc, 0x01, 0xfc, 0x01, 0xf8, 0x00, 0xf8, 0x00,
-   0x70, 0x00, 0x70, 0x00, 0x20, 0x00, 0x20, 0x00, 0x00, 0x00};
-EOD
-
-  @@up_btn_bmp = TkBitmapImage.new(:data=><<EOD)
-#define up_arrow_width 11
-#define up_arrow_height 11
-static unsigned char up_arrow_bits[] = {
-   0x00, 0x00, 0x20, 0x00, 0x20, 0x00, 0x70, 0x00, 0x70, 0x00, 0xf8, 0x00,
-   0xf8, 0x00, 0xfc, 0x01, 0xfc, 0x01, 0xfe, 0x03, 0x00, 0x00};
-EOD
-
-  def _button_proc(dir = true)
-    return if @ent.state == 'disabled'
-    @btn.relief(:sunken)
-    x = @frame.winfo_rootx
-    y = @frame.winfo_rooty
-    if dir
-      @top.geometry("+#{x}+#{y + @frame.winfo_height}")
-    else
-      @btn.image(@@up_btn_bmp)
-      @top.geometry("+#{x}+#{y - @top.winfo_reqheight}")
-    end
-    @top.deiconify
-    @lst.focus
-
-    if (idx = values.index(@ent.value))
-      @lst.see(idx - 1)
-      @lst.activate(idx)
-      @lst.selection_set(idx)
-    elsif @lst.size > 0
-      @lst.see(0)
-      @lst.activate(0)
-      @lst.selection_set(0)
-    end
-    @top.grab
-
-    begin
-      @wait_var.tkwait
-      if (idx = @wait_var.to_i) >= 0
-        # @ent.value = @lst.get(idx)
-        _set_entry_value(@lst.get(idx))
-      end
-      @top.withdraw
-      @btn.relief(:raised)
-      @btn.image(@@down_btn_bmp)
-    rescue
-    ensure
-      begin
-        @top.grab(:release)
-        @ent.focus
-      rescue
-      end
-    end
-  end
-  private :_button_proc
-
-  def _init_bindings
-    @btn.bind('1', proc{_button_proc(true)})
-    @btn.bind('3', proc{_button_proc(false)})
-
-    @lst.bind('1', proc{|y| @wait_var.value = @lst.nearest(y)}, '%y')
-    @lst.bind('Return', proc{@wait_var.value = @lst.curselection[0]})
-
-    cancel = TkVirtualEvent.new('2', '3', 'Escape')
-    @lst.bind(cancel, proc{@wait_var.value = -1})
-  end
-  private :_init_bindings
-
-  def _set_entry_value(val)
-    @ent.textvariable.value = val
-  end
-  private :_set_entry_value
-
-  #----------------------------------------------------
-
-  def _state_control(value = None)
-    if value == None
-      # get
-      @ent.state
-    else
-      # set
-      @ent.state(value.to_s)
-      case value = @ent.state # regulate 'state' string
-      when 'normal', 'readonly'
-        @btn.state 'normal'
-      when 'disabled'
-        @btn.state 'disabled'
-      else
-        # unknown : do nothing
-      end
-    end
-  end
-  private :_state_control
-
-  def __methodcall_optkeys  # { key=>method, ... }
-    {'state' => :_state_control}
-  end
-  private :__methodcall_optkeys
-
-  #----------------------------------------------------
-
-  def _textvariable_control(var = None)
-    if var == None
-      # get
-      ((var = @ent.textvariable) === @default_var)? nil: var
-    else
-      # set
-      @var = var
-      tk_send('configure', '-textvariable', (@var)? var: @default_var)
-    end
-  end
-  private :_textvariable_control
-
-  #----------------------------------------------------
-
-  def initialize_composite(keys={})
-    keys = _symbolkey2str(keys)
-
-    @btn = TkLabel.new(@frame, :relief=>:raised, :borderwidth=>2,
-                       :image=>@@down_btn_bmp).pack(:side=>:right,
-                                                    :ipadx=>2, :fill=>:y)
-    @ent = TkEntry.new(@frame).pack(:side=>:left)
-    @path = @ent.path
-
-    @top = TkToplevel.new(@btn, :borderwidth=>1, :relief=>:raised) {
-      withdraw
-      transient
-      overrideredirect(true)
-    }
-
-    startwait = keys.delete('startwait'){300}
-    interval = keys.delete('interval'){150}
-    @lst = Tk::RbWidget::AutoScrollListbox.new(@top, :scrollbar=>true,
-                                               :startwait=>startwait,
-                                               :interval=>interval)
-    @lst.pack(:fill=>:both, :expand=>true)
-    @ent_list = []
-
-    @wait_var = TkVariable.new
-    @var = @default_var = TkVariable.new
-
-    @ent.textvariable @default_var
-
-    _init_bindings
-
-    option_methods('textvariable' => :_textvariable_control)
-
-    delegate('DEFAULT', @ent)
-    delegate('height', @lst)
-    delegate('relief', @frame)
-    delegate('borderwidth', @frame)
-
-    delegate('arrowrelief', @lst)
-    delegate('arrowborderwidth', @lst)
-
-    delegate('state', false)
-
-    if mode = keys.delete('scrollbar')
-      scrollbar(mode)
-    end
-
-    configure keys unless keys.empty?
-  end
-  private :initialize_composite
-
-  def scrollbar(mode)
-    @lst.scrollbar(mode)
-  end
-
-  def _reset_width
-    len = @ent.width
-    @lst.get(0, 'end').each{|l| len = l.length if l.length > len}
-    @lst.width(len + 1)
-  end
-  private :_reset_width
-
-  def add(ent)
-    ent = ent.to_s
-    unless @ent_list.index(ent)
-      @ent_list << ent
-      @lst.insert('end', ent)
-    end
-    _reset_width
-    self
-  end
-
-  def remove(ent)
-    ent = ent.to_s
-    @ent_list.delete(ent)
-    if idx = @lst.get(0, 'end').index(ent)
-      @lst.delete(idx)
-    end
-    _reset_width
-    self
-  end
-
-  def values(ary = nil)
-    if ary
-      @lst.delete(0, 'end')
-      @ent_list.clear
-      ary.each{|ent| add(ent)}
-      _reset_width
-      self
-    else
-      @lst.get(0, 'end')
-    end
-  end
-
-  def see(idx)
-    @lst.see(@lst.index(idx) - 1)
-  end
-
-  def list_index(idx)
-    @lst.index(idx)
-  end
-end
-
-
-################################################
-# test
-################################################
-if __FILE__ == $0
-# e0 = Tk::RbWidget::Combobox.new.pack
-# e0.values(%w(aa bb cc dd ee ff gg hh ii jj kk ll mm nn oo pp qq rr ss tt uu))
-
-  v = TkVariable.new
-  e = Tk::RbWidget::Combobox.new(:height=>7, :scrollbar=>true,
-                                 :textvariable=>v,
-                                 :arrowrelief=>:flat, :arrowborderwidth=>0,
-                                 :startwait=>400, :interval=>200).pack
-  e.values(%w(aa bb cc dd ee ff gg hh ii jj kk ll mm nn oo pp qq rr ss tt uu))
-  #e.see(e.list_index('end') - 2)
-  e.value = 'cc'
-  TkFrame.new{|f|
-    fnt = TkFont.new('Helvetica 10')
-    TkLabel.new(f, :font=>fnt, :text=>'TkCombobox value :').pack(:side=>:left)
-    TkLabel.new(f, :font=>fnt, :textvariable=>v).pack(:side=>:left)
-  }.pack
-
-  TkFrame.new(:relief=>:raised, :borderwidth=>2,
-              :height=>3).pack(:fill=>:x, :expand=>true, :padx=>5, :pady=>3)
-
-  l = Tk::RbWidget::AutoScrollListbox.new(nil, :relief=>:groove,
-                                          :borderwidth=>4,:height=>7,
-                                          :width=>20).pack(:fill=>:both,
-                                                           :expand=>true)
-  (0..20).each{|i| l.insert('end', "line #{i}")}
-
-  TkFrame.new(:relief=>:ridge, :borderwidth=>3){
-    TkButton.new(self, :text=>'ON',
-                 :command=>proc{l.scrollbar(true)}).pack(:side=>:left)
-    TkButton.new(self, :text=>'OFF',
-                 :command=>proc{l.scrollbar(false)}).pack(:side=>:right)
-    pack(:fill=>:x)
-  }
-  Tk.mainloop
-end
diff --git a/ext/tk/sample/tkdialog.rb b/ext/tk/sample/tkdialog.rb
deleted file mode 100644
index f0f7d2ccb5..0000000000
--- a/ext/tk/sample/tkdialog.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require "tk"
-
-root = TkFrame.new
-top = TkFrame.new(root) {
-  relief 'raised'
-  border 1
-}
-msg = TkMessage.new(top) {
-  text "File main.c hasn't been saved to disk since \
-it was last modified.  What should I do?"
-  justify 'center'
-  aspect 200
-  font '-Adobe-helvetica-medium-r-normal--*-240*'
-  pack('padx'=>5, 'pady'=>5, 'expand'=>'yes')
-}
-top.pack('fill'=>'both')
-root.pack
-
-bot = TkFrame.new(root) {
-  relief 'raised'
-  border 1
-}
-
-TkFrame.new(bot) { |left|
-  relief 'sunken'
-  border 1
-  pack('side'=>'left', 'expand'=>'yes', 'padx'=>10, 'pady'=> 10)
-  TkButton.new(left) {
-    text "Save File"
-    command "quit 'save'"
-    pack('expand'=>'yes','padx'=>6,'pady'=> 6)
-    top.bind "Enter", proc{state 'active'}
-    msg.bind "Enter", proc{state 'active'}
-    bot.bind "Enter", proc{state 'active'}
-    top.bind "Leave", proc{state 'normal'}
-    msg.bind "Leave", proc{state 'normal'}
-    bot.bind "Leave", proc{state 'normal'}
-    Tk.root.bind "ButtonRelease-1", proc{quit 'save'}
-    Tk.root.bind "Return", proc{quit 'save'}
-  }
-}
-TkButton.new(bot) {
-  text "Quit Anyway"
-  command "quit 'quit'"
-  pack('side'=>'left', 'expand'=>'yes', 'padx'=>10)
-}
-TkButton.new(bot) {
-  text "Return To Editor"
-  command "quit 'return'"
-  pack('side'=>'left', 'expand'=>'yes', 'padx'=>10)
-}
-bot.pack
-root.pack('side'=>'top', 'fill'=>'both', 'expand'=>'yes')
-
-def quit(button)
-  print "You pressed the \"#{button}\" button;  bye-bye!\n"
-  exit
-end
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/ICONS/Orig_LICENSE.txt b/ext/tk/sample/tkextlib/ICONS/Orig_LICENSE.txt
deleted file mode 100644
index 71e359559a..0000000000
--- a/ext/tk/sample/tkextlib/ICONS/Orig_LICENSE.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-
-  #########################################################################
-  ### The following text is the original file of the Tcl/Tk extension.  ###
-  ### Icon data files ( those are 'tkIcons', 'tkIcons-sample.kde', and  ###
-  ### 'tkIcons.kde' ) are quoted from the source archive of ICONS       ###
-  ### extension. As the following document describes, those icon images ###
-  ### are not applied the license.                                      ###
-  #########################################################################
-
-
-IMPORTANT LICENSE INFORMATION
-=============================
-
-The following terms (based on the standard TCL/TK license) apply to all files
-contained in this package, <b>except</b> the icon images.
-
-The icon images can be freely distributed. If you require clarification of
-copyright/license details for the images, please contact the appropriate
-creator/maintainer.
-
-ICONS: LICENSE TERMS
-====================
-
-This software (ICONS) is Copyright 2002 by Adrian Davis (adrian@satisoft.com).
-The following terms apply to all files associated with the software except
-where noted above. 
-
-The author hereby grants permission to use, copy, modify, distribute,
-and license this software and its documentation for any purpose, provided
-that existing copyright notices are retained in all copies and that
-this notice is included verbatim in any distributions. No written agreement,
-license, or royalty fee is required for any of the authorized uses.
-Modifications to this software may be copyrighted by their authors
-and need not follow the licensing terms described here, provided that
-the new terms are clearly indicated on the first page of each file
-where they apply. 
-
-IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
-FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
-DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE POSSIBILITY
-OF SUCH DAMAGE. 
-
-THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE
-IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
-NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
-OR MODIFICATIONS. 
-
-GOVERNMENT USE: If you are acquiring this software on behalf of the
-U.S. government, the Government shall have only "Restricted Rights"
-in the software and related documentation as defined in the Federal
-Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you
-are acquiring the software on behalf of the Department of Defense,
-the software shall be classified as "Commercial Computer Software"
-and the Government shall have only "Restricted Rights" as defined in
-Clause 252.227-7013 (c) (1) of DFARs. Notwithstanding the foregoing,
-the authors grant the U.S. Government and others acting in its behalf
-permission to use and distribute the software in accordance with the
-terms specified in this license.
diff --git a/ext/tk/sample/tkextlib/ICONS/tkIcons b/ext/tk/sample/tkextlib/ICONS/tkIcons
deleted file mode 100644
index 0d5b2c8695..0000000000
--- a/ext/tk/sample/tkextlib/ICONS/tkIcons
+++ /dev/null
@@ -1,195 +0,0 @@
-actattach16:act act16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBPz+/AQCBAAAACH5BAEAAAAALAAAAAAQABAAAAI2hAOCxg2h0nJHyEshi9HpxU1GOCLdZoKpQ15nibUoprKp9lh2oucUxsBRXsJh4Hjs/QTMpr8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-actbookmark16:act act16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBCwqLLSytLy+vERGRFRWVDQ2NKSmpAQCBKyurMTGxISChJyanHR2dIyKjGxubHRydGRmZIyOjFxeXHx6fAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVbICACwWieY1CibCCsrBkMb0zchSEcNYskCtqBBzshFkOGQFk0IRqOxqPBODRHCMhCQKteRc9FI/KQWGOIyFYgkDC+gPR4snCcfRGKOIKIgSMQE31+f4OEYCZ+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-actbookmarknew16:act act16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBCwqLLSytLy6vERGRFRWVDQyNKSipAQCBMTGxKyurISChJSSlJyanHR2dIyKjPz+xISGhPz+BGxubMTCBHx+fPz+/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVfICACwWieY1CibCCsrBkMb0zchTEcNYsIiYHiwIOdEAvigdFQGE0Ix4NBbSAgsWjk+jBIAlcUYrJASChnSXZSoUDelKfoKpFALJA61ueGI2IAZmhogGFmCGGAgXsifiEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-actcheck16:act act16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBMT+xATCBASCBARCBAQCBEQCBAAAACH5BAEAAAAALAAAAAAQABAAAAM2CLrc/itAF8RkdVyVye4FpzUgJwijORCGUhDDOZbLG6Nd2xjwibIQ2y80sRGIl4IBuWk6Af4EACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-actcross16:act act16 16:photo:16 16:R0lGODlhEAAQAIIAAASC/PwCBMQCBEQCBIQCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMuCLrc/hCGFyYLQjQsquLDQ2ScEEJjZkYfyQKlJa2j7AQnMM7NfucLze1FLD78CQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-actexit16:act act16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBDQyNHR2dCH5BAEAAAAALAAAAAAQABAAAAI4hI+pFrHb3nEg1iWiDiINCwYDko0V9XUTda6I1TIsUMpGinyzbB6ZeGuoEr+GUDL4CXqSphPhLwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-acthelp16:act act16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQ6XAQCBCyCvARSjAQ+ZGSm1ARCbEyWzESOxIy63ARalAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAQ/EEgQqhUz00GEJx2WFUY3BZw5HYh4cu6mSkEy06B72LHkiYFST0NRLIaa4I0oQyZhTKInSq2eAlaaMAuYEv0RACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-actitemadd16:act act16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBARCZPz+/Mzq9BTC3ITC1HSyzGSivAw+XBSStIS6zHy2zAQCDFyatAQOHFSStEyOtAQSJBSq1DR2nCxunCRmlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVbICCOQTmeaCAMRIC+AVu47xkTBl2Ld16XQNYBQTQBVIOkMHFQJBeMI4tAbSSu2IRDSnhAvFfI97sFRM6RwOMacbjLKckVvgvIJ5EdSU7J648VgXQ7Dmd/hyJ+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-actitemdelete16:act act16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBARCZPz+/Mzq9BTC3AQCDAQOHFSStAQSJAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAQwEMhJq704681n+GAISoEwnGg6EAUQrEQsz4ThEkeu77kNIAagMEj0dY7IpHI58UcAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-actlock16:act act16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaVAQCBKSipDQyNMTCxISChFxaLFxSJEQ+FExGHCQiDBwaDGxiLHxyNHRuPIR+TIyGZJSSfFxaRFxWJGRiLJyaXNzWpNTOnMzGnLy2hJSKTGReLKyqjPTu1NzarMS+jLSyfKyibJySXIyGVCQeDLSytPT29Ozu7OTi5NTS1KyurJSSjGxqVFxaXLS2tKSebOzuzLSufJSOXExGLGRiTExONAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaTQIBwGCgGhkhkQDBoEpLKQoBACAyOUID1qTVwoQGvMPxNFgVjAxp6QCQUicSCwVgkG44HJCKRRCYUCAxIFRYXhxgZGhYbHINEHR4fGCAhIiMkFSVKJicoKSoFKwMsLZtDLison6GjLA92qCueoAUvpC2xQhWqrLYDErmEMDEXlDIwMxAHukI0NS01EzY2NAmPAH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-actredo16:act act16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBxOHBxSHBRGHKzCtNzu3MTSzBQ2FLzSxIzCjCSKFCyeHDzCLAxGHAwuFDSCNBxKLES+NHSmfBQ6FBxWJAQaDAQWFAw+HDSyLJzOnISyjMTexAQOBAwmDAw+FMzizAQODDymNKzWrAQKDAwaDEy6TFTGTFSyXDyKTAQCBAwiFBQyHAwSFAwmHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ2QIBwSCwaj0hAICBICgcDQsEgaB4PiIRiW0AEiE3sdsFgcK2CBsCheEAcjgYjoigwJRM2pUK0XDAKGRobDRwKHUcegAsfExUdIEcVCgshImojfEUkCiUmJygHACkqHEQpqKkpogAgK5FOQywtprFDKRwptrZ+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-actreload16:act act16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBCRaJBxWJBxOHBRGBCxeLLTatCSKFCymJBQ6BAwmBNzu3AQCBAQOBCRSJKzWrGy+ZDy+NBxSHFSmTBxWHLTWtCyaHCSSFCx6PETKNBQ+FBwaHCRKJMTixLy6vExOTKyqrFxaXDQyNDw+PBQSFHx6fCwuLJyenDQ2NISChLSytJSSlFxeXAwODCQmJBweHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaBQIBQGBAMBALCcCksGA4IQkJBUDIDC6gVwGhshY5HlMn9DiCRL1MyYE8iiapaSKlALBdMRiPckDkdeXt9HgxkGhWDXB4fH4ZMGnxcICEiI45kQiQkDCUmJZskmUIiJyiPQgyoQwwpH35LqqgMKiEjq5obqh8rLCMtowAkLqovuH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-actrun16:act act16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/ISChKSipMTCxLS2tLy+vMzOzMTGxNTS1AAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARlEMgJQqDYyiDGrR8oWJxnCcQXDMU4GEYqFN4UEHB+FEhtv7EBIYEohkjBkwJBqggEMB+ncHhaBsDUZmbAXq67EecQ02x2CMWzkAs504gCO3qcDZjkl11FMJVIN0cqHSpuGYYSfhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-actstop16:act act16 16:photo:16 16:R0lGODlhEAAQAIUAAASC/Gw6NGQuLHQ6NGQmJFweHFQaFPTm5PTa3PTW1Oy+vOS6tNSinKReVDQWFPz+/Nx6fNyCfNyGhNR+dMxybMRiXLxGRIwWFNx2dNx+fNx2bMxuZLQWFBwWFPTu7Pzy9NRqZNRuZMRSVLwmJGwWFNR2dMQiHPTKxMxmXMQyLMxmZNx6dMxiXMRSRMRaVKxybMxaVEQWFMQuJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaaQIAQEBAMCAWDYcgkHhAJxYLRcDQBggckIplQKpaLdRh4YDIaSWa94Vw6woAHgv6AMKGPaMQhwQMJJRkfhHmEJhdvRCcgGSCEkCgpbnAECiorGYYfLCItlAAFCygQj5AfbYlwBQwVE5AukG6KBi8tMC0fLi0pHxyzcAAxFxwmMny/wEwOxMm/qlcdJCSJ1H5XQh3a28HY3kx+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-actundo16:act act16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBxSHBxOHMTSzNzu3KzCtBRGHCSKFIzCjLzSxBQ2FAxGHDzCLCyeHBQ+FHSmfAwuFBxKLDSCNMzizISyjJzOnDSyLAw+FAQSDAQeDBxWJAwmDAQOBKzWrDymNAQaDAQODAwaDDyKTFSyXFTGTEy6TAQCBAQKDAwiFBQyHAwSFAwmHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ1QIBwSCwaj0hiQCBICpcDQsFgGAaIguhhi0gohIsrQEDYMhiNrRfgeAQC5fMCAolIDhD2hFI5WC4YRBkaBxsOE2l/RxsHHA4dHmkfRyAbIQ4iIyQlB5NFGCAACiakpSZEJyinTgAcKSesACorgU4mJ6uxR35BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-actunlock16:act act16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaVAQCBKSipDQyNMTCxISChFxaLFxSJExGHEQ+FCQiDBwaDBweDGxiLHxyNHRuPIR+RIyGZJSSfFxaRGxmLJyaXNzWpNTOnMzGnMS+jJSKTGReLKyqjPTu1NzarLSufKyibJySXIyGVGxiNFxaXLSytPT29Ozu7OTi5NTS1KyurGxqVCQeDJSSjLS2tNTW1KSmpGRiLKSebOzuzJSOXExONExGLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaVQIBwOAwYA8SkMCAYOAnKYiFAIAQGyOgVCggYuEovVxztMpdnwAGRSCgUCwOjIeQ6HpCIZDKRUNYMRBUWF4UYGRoWGxyBRR0eHxgaICEiIyR0QyUmJygpKgUrAxMsLUQlKyieoKIuEAunK52fBS8DLiywQySpnjC1Mbi6QjIzNBeSIBY1EQfDQgosLAEUNjY3Co1DfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-appbook16:app app16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBAQCBDyKhDSChGSinFSWlEySjCx+fHSqrGSipESOjCR6dKTGxISytIy6vFSalBxydAQeHHyurAxubARmZCR+fBx2dDyKjPz+/MzKzLTS1IyOjAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVkICCOZGmKQXCWqTCoa0oUxnDAZIrsSaEMCxwgwGggHI3E47eA4AKRogQxcy0mFFhgEW3MCoOKBZsdUrhFxSUMyT7P3bAlhcnk4BoHvb4RBuABGHwpJn+BGX1CLAGJKzmKjpF+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-appbookopen16:app app16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBExCNGSenHRmVCwqJPTq1GxeTHRqXPz+/DwyJPTq3Ny+lOzexPzy5HRuVFSWlNzClPTexIR2ZOzevPz29AxqbPz6/IR+ZDyKjPTy5IyCZPz27ESOjJySfDSGhPTm1PTizJSKdDSChNzWxMS2nIR6ZKyijNzOrOzWtIx+bLSifNTGrMy6lIx+ZCRWRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaeQEAAQCwWBYJiYEAoGAFIw0E5QCScAIVikUgQqNargtFwdB9KSDhxiEjMiUlgHlB3E48IpdKdLCxzEAQJFxUTblwJGH9zGQgVGhUbbhxdG4wBHQQaCwaTb10emB8EBiAhInp8CSKYIw8kDRSfDiUmJ4xCIxMoKSoRJRMrJyy5uhMtLisTLCQkC8bHGBMj1daARgEjLyN03kPZc09FfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-appboxes16:app app16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMT+xAT+BASCBATCBMT+/AT+/ASChATCxPz+xPz+BISCBMTCBAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEEgZwrwYBCFqvhs3DNYXjChRlWBRjIRqGN4UuEUczMZxsDeXykdEsDQVVSLhQxhBCkVlmXA+KVHFYhFYOoHbMGN6pTQaW8YYiQmcG+q16a0+Zipw+4e9B/gjACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-appbox16:app app16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPz+xISCBMTCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANECKoR6ys2IVqokF08yMTA1gwkYX5WQK5ma4VceTYPxXnBWdtY6+0834/Bowgzm6APWRQcH4TiMhPK2WYRiZWW7XK7/gQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-appbrowser16:app app16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxONCROfCRKfKx6LNy+bNTOpGSS1DRupAwyXBRSnPTSjPTqvOzqzMzSvHSSlKy6ZDxutAxCpBQ2XBxepLTKvPzqzPzy5OTShLS2dLSqRFR2jBRerBQ+jOTixOzetNS2XHx6XDR2tCRexBwyTDyKzOTavPzq1OzKdCx23BRKtCQ6VCQmHFSa7IyirOzSnGSGpIR+bFSO1DyK7DR+5CRixBw2VDQuHFye7IS27NzGXISuhEyS5DR25BRWxBQ+lBQyXCQqPCxSfGyu7GyerKy2ZFR+rERqfCRmxBROtBQ+fBwuTBwmNDSW9JyabLyqRIx+TExSXBQ6bAQCBBQ6ZBxapDR+zBxq3LyaLJySRHxqPGxeNBxGbCRmrHRyRERONDRKNDQ2JCQuLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAeygACCg4SFhgABAQIDh4MBBAUGBwgDCYcKCwwNDg8QERIThRQVFhcNGBkaGxwdoYMDHhcXHxggISIjEiSvJSYXJwsoISkpIyorLIIDLS4WLzAxMjM0NSo2N8o4OS46OzwzPSk+P0BBgkI8Q0NERUZHCEhJSktMgwk4Qy1NTk9QUVJLphCiUsWKlStYsmjZQiJgIS4KuijQ4iXAFxYCDVFJwGUFmDBhMjYSw0KMyEYoBfkJBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-appcalc16:app app16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBISChPz+/AQCBCH5BAEAAAAALAAAAAAQABAAAAI4hI9pwe0Ogpi00hHF2LzzzFlTsIHD45SSx6oCeW4wjK2tl83y7t64pIsJaxrfh2bEAJIlhRPhLwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-appclock16:app app16 16:photo:16 16:R0lGODlhEAAQAIIAALy+vAQCBPwCBMQCBIQCBISChPz+/MTCxCH5BAAAAAAALAAAAAAQABAAAANbCLHcrSLKOZcYmDSCsR1aUABAsXDDJwJGa5SBFwgaWxbCG3CWaBwG3C8Y67FawpYiNQscg65fsVkYuoAmJs1pBR522lQB6ILJLqHRwQQOZzYdZnw+dzruDIA/AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-appdate16:app app16 16:photo:16 16:R0lGODlhEAAQAIQAAASC/AQCBPzerPyqXMRaBIQCBISChPz+/KSipMTCxPz+BMTCBPwCBPz+xPzCxMQCBISCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVxICCOQGCeJjkGwkC8RFEEavkax2G8dB0QuRyhhzoBg8MSYsncJXKJZIDZHCoWP1ogGIwGrtnSgUFmHLyNRHhrdpjRamnO/SYkromHdnxwnwkKVxByZW8DgQsQM2JcfwZXO0MBCZSVBgMuLzJaRZ0pfiEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-apppencil16:app app16 16:photo:16 16:R0lGODlhEAAQAIMAAASC/IQCBMQCBPzCxAQCBPz+/MTCxISChDQyNKSipEQCBAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARDEMhJZRBD1H2z3lMnjKCFjUJQimOgcmcbELCXzjXq0hV785WCQYcDFQjDXeloMByKG6YTAdwIDAlqSZJSVFeKLcUfAQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-appsheet16:app app16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBAT+/Pz+/KSipPz+BAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANFCBDc7iqIKUW98WkWpx1DAIphR41ouWya+YVpoBAaCKtMoRfsyue8WGC3YxBii5+RtiEWmASFdDVs6GRTKfCa7UK6AH8CACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-apptool16:app app16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBISChGRmZMTCxKSipLS2tHx6fPz+/OTm5FxaXOzu7DQyNMzOzAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAReEMhAq7wYBDECKVSGBcbRfcEYauSZXgFCrEEXgDCSeIEyzKSXZoBYVCoJVIqBGByKu0Cy8QHxmgNngWCkGgqsGWFseu6oMApoXHAWhWnKrv0UqeYDe0YO10/6fhJ+EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-apptools16:app app16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBExKTERCRAQCBOzu7Nze3MzKzLy+vCxqZBQ2NJyanKyqrGRiZDRydKza3FRWVPT29LSytDw6PMTm5EySjCxaXGRaJFSanCRSVGxqbPTmvMSqVJTW1GSurHS6vOzq7KSipISChFRKHJSGNPz23GxKFBQ6PKyurCwqLMyufJx2RAQGBJSWlEwyDIRiLNy+lLSKVDwmDJRuNOTOrLyabGRCFDx2dKSCVOzWtHzCxOTGnNSyhAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAahQIBwCAgIBAOiUiggFAyHASKxDAwUC8Zg0HAglA9IZPGQABoTSqJCFTIOEIsFgHBcEhhHUpKJFCwaGxYYHB0VEx4IEh8gIQwiIyQbJRMcHokmEicfDygAkCkqJQgIGG0rLElCLS4vMCWqQwMCQg0UMTIzNDVLQjaIGDE3ODQlS785CEkxKjowvEOHybG4O6JDCdNKuDUxRAmxRDHeveUAfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-appuser16:app app16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/MTCxISChMT+/ATCxASChFxaXAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEMg5gw00yyDGIAR1YUDggeFWFIZhnSBZrsZxdIOFEGTA2oeBAHeyuGwvzxBlYdUOLROMFzDQntJPrNoqAKUBaqnV+k57ZORruykHDj2LqIzUVKp1u0iuB/gjACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-appusers16:app app16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMTCxISChAT+BMRaBPyqXARCBPz+/FxaXAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARLEIRJa5Ui673nsGAgeKE1Bl9AUEXbiqTlFlZaGUZoszm4BzhDAVf5BYbAXI+TAR6CS2ZGSZSEiIIqYIsSIEaJ7GRrlY7J1lKA7I8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-appwp16:app app16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBKSinJyOfPz27Pzy7AwKDExOTJyWlERCRKSelPz69LyyrKymnPz+/MS2fDQyJAQCBOTazLSiXOzivMS2jKSSVOzmxPz25NzSpPTu5KyebOzixNTGjOTWpMSydMSybCwqFGReVKyaXNzSnGxeNJSCVMS2nPz23MSuZIR+bJyShLyqnOTOtGxiXIR6XOTSvIx6RMSubIyCdKSalMS6pOTWxMzKvKSabJyKTOzezHxuPGRmZKyurMTCvPTq3AAAACH5BAEAAAAALAAAAAAQABAAAAajQIBwCAgIiEhiYEA4FgwHRDKhIBAWz4OhgGQ0FAPHA7qFEBONb0Qy0ULeQ2+aUrFcMI+3GYBOZzQbHB0eHyAhIQByDREiEwMjFRIkJQImAgJ+jScjHigkKSorLC0AKg2NFSMoki4qCy+IQgITKDAxkjIzNDWkQxQoJaskMgk2Eb1DNzgoOCoHDDY5yEIwJToAOzw9ET7TQiREAhkZ3kmy5QB+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-cal1day16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBAQC/AQCjPz+/MTCxKSipAAAACH5BAEAAAEALAAAAAAQABAAAANOCLrMEUDIOUS9AFLLhx8LIRZjKYZmMRCkaChFLHty/AIiS3y6q+QtT49wq8VotRtQJGwRf6Zmrlj7DJLQXsupTJmeEIN4TB5nII20wp8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-cal5days16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBAQC/AQCjPz+/MTCxKSipAAAACH5BAEAAAEALAAAAAAQABAAAANMCLrMEUDIOUS9AFLLhx8LIRZjKYbj55GioRRwoQ5x4QIiIdMmcec7jy53q81qP9OO5VMAj8RXTFWzOZW95HDLdEEM4LA4nIE0zgp/AgAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-cal7days16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBAQC/AQCjPz+/MTCxKSipAAAACH5BAEAAAEALAAAAAAQABAAAANPCLrMEUDIOUS9AFLLhx8LIRZjKYbj55GioRRwoQ5x4QIiwcp0fucsj873qvGMv5Jw2FIACUsW4WakGW1O046I05qmGYBhTC6TM5CGWuFPAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-calappointment16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIMAAAQCBPwCBAQC/AQCjPz+/MTCxPz+BISCBISChKSipAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAARbEMhJaQhA6D1E/wDGeeRgDhOhFoTBEi+REgdrIHScSEVvAD9Xr7cDqGSGpFEnQSqTv2NxCFQOiU1VEAiTZmstHFg1vQKuw+LxxfYaV/AuOQRI2O/4ewhT6Uv8EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-calbell16:cal cal16 16:photo:16 16:R0lGODlhDwAOAIIAAPwCBISCBPz+BIQCBMTCxISChPz+/AQCBCH5BAEAAAAALAAAAAAPAA4AAAM+CLrR+zCIAWsgLVRGRBhOVQiG94WPVAbHaZHYAWqRYLbge88RsbInGuBCEhRYrZYm4xk4nYdoKzKIbiKHawIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-callist16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIMAAAQCBPwCBAQC/AQCjPz+/KSipPzerMRaBEQCBAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAARDEMhJaQhA6D1E/wDGeeRgDhOhruyatjBRSIRxxOsMEAdC0BUZDcfSEYvDo3Bn++2Cxt7RqFxWhZiCdsvdhjCVsMQfAQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-calmonth16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBAQC/AQCjPz+/MTCxKSipAAAACH5BAEAAAEALAAAAAAQABAAAANSCLrMEUDIOUS9AFLLhx8LIRZjKYbiRxLFIBpK0Q6z7MkwkJIe8b0KEeuWchFysuStVsjtfMbeMQitWpG25YfmNK1WU53XNIUYzug0OgNpuBX+BAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-caltoday16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIMAAAQCBPwCBAQC/AQCjPz+/MTCxKSipPyCBMRaBPyqXAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAARTEMhJaQhA6D1E/wDGeeRgDhOhFmurpi5LyIQhFfiBIAfuFzaAioBIJBCummRYPCaDPh3vhwsOZdihNfa8Ub/AJXemFZPPNBvGwG672yFMZS7xRwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-caltodo16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIMAAAQCBAT+BAQC/AQCjPz+/MTCxPzCxKSipPwCBMQCBIQCBAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAARaEMhJaQhA6D1E/wDGeeRgDhOhFmurpi5LyMYhFXiuFwZiA6qZYbbqJX5BIw2RAPxwAAWCyWMCCsiXFGEEErKz6LQZfOqiTR1YJiGq1rFyyHmo2+/1EKbCl/gjACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-connecting16:connect connect16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBPz+BMTCBISCBAQCBPz+/MTCxMTGxISChFxaXMzGzKSipAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEMhJZbihUiz60FPnfaA0iBpBVGdHEYWxToEoSHBRHHM9AgSEQRcj+AYkYAJxIPKQFUJiOdTJQFIDU6dYzKKFhTCM+E5g4mXaDAyrlogEG+DGTecA7wsP8EcAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-connectno16:connect connect16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBPz+BMTCBAQCBERCBPz+/MTCxMTGxISChFxaXMzGzKSipAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARPEMhJq704axBEHoPUEdhQGMNYFuwxkKInDYjBniEnwMCQIIebSzXx/WwsFK+YMABZikWuYlrUCtZpEYv4WRPaHhb064YB41kCfJFSQBh/BAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-connectyes16:connect connect16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/KSipDQyNMTCxMTGxISChFxaXMzGzAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEMhJZxCjgsAtDtUlCOA1gJQ4kl/IDatAoF7xxkS6GgEBr6jAobCyBX42SQBxMOx6A8MhiGASR8YDgrYsNEeJ0zaEGZY7uoH2oB6nOUwtbdLaVOeTUwo/8UcAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-devcdmount16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXISChNTS1MzKzMTGxMy+vNSytAQCBOzq7OTi5Nza3Oy6vPy2tOTStPz6/Ozu7Nze3MTKxOS2tOzOvNTqvLT2tDw+BPTy9MzOzLS2tPy+tLz+tLz2tLSynLzqvLzavLTOtNTW1KSipPz+/LzKvMTCxDQyNASCBARCBDTSJIT+bAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAa0QIBQGBAYA8Ok0DggFAwHBEIJECQUi8GT0XBMh9YHJDKQTBqUiuUCVmAeiYzmsKlwOt/AAKFIFAIIFx4WHyAhUwIDIgsZFyMkFxchJSYmiBkSBBoIJJwIGgOhiCYFJSEnFyQjFwNZewABISAfFiYnCAEmCREIrwAIFhwVGwcaBAkPGApsQsAVFA0GBQMRbxBTKM0ODQwTEq192ClDgROkBHvYKuNJUu5CKCorX1RDKCkpUn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-devcdunmount16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXISChNTS1MzKzMTGxMy+vNSytAQCBOzq7OTi5Nza3Oy6vPy2tOTStPz6/Ozu7Nze3MTKxOS2tNzmvLT2tDw+BPTy9MzOzLS2tPy+tLz+tLz2tLSynLzqvLzavLTOtNTW1KSipPz+/MTCxLy6vDQyNOTm5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAapQIBQGBAYA8Ok0DggFAwHBEIJECQUi8GT0XBMh9YHJDKQTLqUigWsuDwSmMxBQ9lwvoEBQpEoBBAWHRseHyBTAgMhCxgWIiMWFiASJCSHEgQSGQgjmwglGKCHBQUSICYWIyIWAwshIVMBIB8eFSQmCAEFCREIekIIFRsUGgcZEgkPFydrvxUUDg0GBSEREGJfv9AMEySsJxDYQ4DcEhh64UpS6lTs7QB+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-devdiskmount16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBDQyNIRuVKyCXMSKROzSrOzKpOTGnLSafLySZKxuLMSOVPTWvPzixLSehNyibOzOrGxaVJx+XOzGnFw2FJRuPKx+TPTSrHRWPKyKZPTOpHxOJKyKXFw+HKSipISChMTCxFxaXIRiPNSWXExOTOS2hLR+PLRyLPTWtMyOTASCBARCBPz+/DTSJIyKjIT+bAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaTQIBwCAgYA8SkMCAYDARI5ZJQMBwQiWgyoFgwrA3HQ7scQAqFAcEQOUi0zAkFUSFYLghMBloUCDQNGxwdHhwHekcfICEhICIfIxkLJBABJUYCICABIhAOBiYnKJaXmH4CGSkYCCqkSAEfTKenrkOwsrQll0IrS7G5uwArLLaxLbXCLsTFLyDBKy4wZEVHvCwsRn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-devdiskunmount16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBDQyNIRuVKyCXMSKRPTWtOzKpOTGnLSafLySZKxuLMSOVOzOrPzm1LSehNyibGxaVJx+XOzGnFw2FJRuPKx+TPTSrHRWPKyKZPTWvHxOJKyKXFw+HPTOpKSipISChMTCxFxaXIRiPHxaNLRyLNSWXExOTPzixOS2hLR+PMyOTPz+/IyKjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaIQIBwCAgYA8SkMCAYDARI5ZJQMBwQiWgyoFgwGgiD46FdDiCFwoDQAEe0TMkEQSFULIcLBloUCDIaDRscHRsNHhhHHyAhISAiHyMkJSYQASdGAiAgASIQKA0pKguXmJl+AiQGFwgrpUgBH0yoqK9DsbO1J5hbsrq8SrgstlJFHy0gwMVFR1J+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-devfloppymount16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBAQCBMTCxARmZPz+/FSWlLSytKSipERCRIyOjISChOTm5HRydNza3GRiZFRSVASCBARCBDTSJIT+bAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVrICCOQBCQKBkIw5mqLFG47zoQ+FwbN57TosDhgPD5dMEEIqE04kwlBWKBUEiNVYFpyqAyGEUCgqEtERiNNMLhQKzLQYJg7n7Y4aMAwbCUPvAQeWNgfzQQETAIhSMQEogwgBITQEGGEREmfiEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-devfloppyunmount16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMTCxARmZPz+/FSWlLSytKSipERCRIyOjISChOTm5HRydNza3GRiZFRSVCH5BAEAAAAALAAAAAAQABAAAARcEMgJQqCYBjFu1hxReN82EOhYGieaklJwHIjrqnGCJLqNWhUFYoFQCG1FgWXIIDIYNQKCoawQGI0swuFAbKsxgmDsfZjBkwDBsNM90Jot9A3DbBD0Dwiur9QnfhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-devnetwork16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBAQCBISChPz+/Nza3ARaZESanCyKlARudARGTLy+vNzq7ARmbMTCxARufAROVMzOzKSipARyfOzq7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVmICAGZFmKQiACweCSBImq41AYB5IodLq2hwWO0ejRWDac48Gb/QKNqNRoqspmrVcAUuIJBANS8sBIFCORUgooPEh4J8B67NgdsVBp9C5XWfl9LRMTCyReX19hARNojWlWLH+AAH4hACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-devpc16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBISChHx+fPz+/AQCBAQC/AT+/AQCxAQChAT+BLy+vAR+BAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARYEIAgqK1YzsG754QUDERpmkEpkkXrtoK6EcVgHIibhnNx564Yb0TDvQq7FQ34EiqPOhnREqhWSUPsyZSQAbbg7GcMEgwUiYVivTa1R+y4XEGoWO/4AMAfAQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-devscanner16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/MT+/ASChARCRATCxMTCxFxaXKSipDQyNAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARTEMgJgqWBVivEldkUdKSXhVjZfenommglDERh3Tc4E4ZRHAGgkEPr9X6H5AHBERSMRyWzkug8jQXFEhWoOo8dRYxqLXSmGjIJnVaz29Q3fAP3RwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-devscreen16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXFRSVPz+/PT29OTm5OTi5DQyNDw+PERGRExKTHx+fISChIyKjHRydFxeXDQ2NCQmJBQSFAQCBERCRMTGxHR2dGRiZExOTDw6PCQiJAwODCwuLFRWVOzu7BweHAwKDCwqLHx6fBQWFGxqbGRmZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAanQIBwSCwKAwKkMslEAgSDqDRKqBYKhkNgcDggEorkMrDQchkNhuOhgEQkk0l5S2lUGpYLJqPZTAwMHB0DCmhqAW0Rfh5zAxgOkBcCFAcfIBMECxwBBAEPFw8dChkhcBMDDAcdnQqtFKSWcQMimx4dGRkQBxGxsg6bBQEawx8jl3GnJFoFHRNXVVNRJYIFDAsL1tgiDiQXFx0HABwcXeQH5OjkRutEfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-devspeaker16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBFxaXAT+/DQyNATCxMTCxPz+/AQCBKSipASChAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARWEMgJQqCXziDG2JoUEENhZBkmHIWJVptAmqcIW/Js1MiF56TBzkckAAcHoa9nMRKeA4TyJk0knsHhTeK5khBaH2VwLYVh40TJhQ6RzeIQV32Quz8hfwQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-editcopy16:edit edit16 16:photo:16 16:R0lGODlhEAAQAIUAAFxaXPwCBNze3GxubERCRPz+/Pz29Pzy5OTe3LS2tAQCBPTq3PTizLyulKyqrOzexLymhLy+vPTy9OzWvLyifMTCxHRydOzSrLyihPz6/OTKpLyabOzu7OTm5MS2nMSqjKSipDQyNJyenLSytOTi5NTS1JyanNTW1JSWlLy6vKyurAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAAaUQIBwCAgYj0eAYLkcEJBIZWFaGBie0ICUOnBiowKq4YBIKIbJcGG8YDQUDoHTKGU/HhBFpHrVIiQHbQ8TFAoVBRZeSoEIgxcYhhkSAmZKghcXGht6EhwdDmcRHh4NHxgbmwkcCwIgZwqwsbAhCR0CCiIKWQAOCQkjJAolJrpQShK2wicoxVEJKSMqDiAizLuysiF+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-editcut16:edit edit16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBPz+/ISChCH5BAEAAAAALAAAAAAQABAAAAIwhI9pwaHrGFRBNDdPlYB3bWHQ1YXPtYln+iCpmqCDp6El7Ylsp6ssR1uYSKuW0V8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-editdelete16:edit edit16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbPT29GxubMzOzDQyNIyKjHRydERCROTi3IyKhPz29Ox6bPzCxPzy7PTm3NS6rIQCBMxCNPTq3PTi1PTezMyynPTm1PTaxOzWvMyulOzGrMymhPTq5OzOtNTKxNTOzNTCtNS+rMSehAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaKQAAgQCwahcihYMkcBAiBpLJApRoOBWgyIKhSEQkFgrBAcr1URiPhKAsDD3QB8RhA3FM0IlLHnyUTVBMSFBUWfl0XGBMTGBcZGodmcQWKjpAbHIgIBY2LHRoempOdjooTGx8giIOPFYofISJ+DyMXI6AfFySyfiUmJSUnKBYcICIpfgELzM3OZX5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-edit16:edit edit16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxaVMR+RPzKjNze3AQCBMR6RPzGjPyODPz+/MzOzPyKDPyKBPz29OTWzPyGDPyGBOx6BOza1OR2BKROBNSOXKRKBBwOBOzu7PTWxPzizOySZPyCDFxaXOy2lNRyRMxmJCQOBPTm1OzStPTKrMR+XIRWLFxGNCQSBDQyNIRSNDQuJERGRLyqlNzSvIx6ZKRuVEw6LLSyrLymhKSShBwaFFROTJyWjMS+vNzW1OTazNzKrHRqXOzezOTOpPTq3OzWvOTStLyedMS+rLy2pMSynMSulAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAewgAAAAYSFhoQCA4IBBI2OjgUGBwiLBAmXlpcKkgsMlZcJBA0JDpIPEBGVjwkSBgOnExSfmBIVBxAMExYXswkYGRobHLq8gh2PHhoeHyAWIYKzIiMkJSYnKCnQg5YNHtQqKywtK9qMBC4vMDEBMjIz2dCMDTQ1Njc4OToz5PEEOzw3ZPToMcLHO23HfogQ0QMIkCA+hPBbhAPHECJFjMyYIUQIvEUpUqwQOXKkSEF+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-editpaste16:edit edit16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBCQiFHRqNIx+LFxSBDw6PKSaRPz+/NTOjKyiZDw+POTe3AQCBIR2HPT23Ly2dIR2FMTCxLS2tCQmJKSipExGLHx+fHR2dJyenJyanJSSlERCRGRmZNTW1ERGRNze3GxubBweHMzOzJSWlIyOjHRydPz29MzKzIyKjPTq3Ly2rLy+vISGhPzy5LymhISChPTizOzWvKyurPTexOzSrDQyNHx6fCwuLGxqbOzKpMSabAQGBMS2nLyulMSidAAAACH5BAEAAAAALAAAAAAQABAAAAa7QIBQGBAMCMMkoMAsGA6IBKFZECoWDEbDgXgYIIRIRDJZMigUMKHCrlgul7KCgcloNJu8fsMpFzoZgRoeHx0fHwsgGyEACiIjIxokhAeVByUmG0snkpIbC5YHF4obBREkJCgon5YmKQsqDAUrqiwsrAcmLSkpLrISLC/CrCYOKTAxvgUywhYvGx+6xzM0vjUSNhdvn7zIMdUMNxw4IByKH8fINDk6DABZWTsbYzw9Li4+7UoAHvD+4X6CAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-editshred16:edit edit16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbGxubMzOzPz69DQyNIyKjERCRPz29PT29OTi3IyKhPz27PTu5PTy5Pz6/Pzy7PTq3OzexLyqlPTm1PTizOzavLyqjOzWvOzaxLyifOzizOTOpAQCBOzezAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaEQAAgQCwahcihYMkcBAiBpLJApRoOBWgyIKhWEQkFYYHkeqkMxKFBFpq9jgdkEGlPqwrJhCIY2N8FFRYUFxcYGX9dgRKEGhiHiYEOhBcbGBwdiQEOARcBGwEeAZllAgEUnQEfoQEgmp4hrCKtrwEYsrRlTiMBJAG8syN/IyMAxMXHSH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-edittrash16:edit edit16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBKSipFxaXPz+/MTCxISChDQyNCH5BAEAAAAALAAAAAAQABAAAANQCKrRsZA5EYZ7K5BdugkdlQVCsRHdoGLMRwqw8UWvIKvGwTICQdmGgY7W+92GEJKPdNwBlMYgMlNkSp3QgOxKXAKFWE0UHHlObI3yyFH2JwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-fileclose16:file file16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBCQiJBwaHAQCBDQyNDw6PFxaXFRSVERGRCwqLAwODGRiZHx6fPz+/GxqbAwKDCQmJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVaICCOZGmeqBgEwjCkRGEcSKK4JrEcBrMgAdeLVDg0GguGsYEbBQyGYyN6FDoPDIf0+LCKBIgetQERDgGDBGIpNY8GioAU0m6KXFw883w3+/l9f4AkfimGIn4hACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-filedocument16:file file16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJSWjPz+/Ozq7GxqbJyanPT29HRydMzOzDQyNIyKjERCROTi3Pz69PTy7Pzy7PTu5Ozm3LyqlJyWlJSSjJSOhOzi1LyulPz27PTq3PTm1OzezLyqjIyKhJSKfOzaxPz29OzizLyidIyGdIyCdOTOpLymhOzavOTStMTCtMS+rMS6pMSynMSulLyedAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaQQIAQECgajcNkQMBkDgKEQFK4LFgLhkMBIVUKroWEYlEgMLxbBKLQUBwc52HgAQ4LBo049atWQyIPA3pEdFcQEhMUFYNVagQWFxgZGoxfYRsTHB0eH5UJCJAYICEinUoPIxIcHCQkIiIllQYEGCEhJicoKYwPmiQeKisrKLFKLCwtLi8wHyUlMYwM0tPUDH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-filefind16:file file16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBCQmJDw+PBQSFAQCBMza3NTm5MTW1HyChOT29Ozq7MTq7Kze5Kzm7Oz6/NTy9Iza5GzGzKzS1Nzy9Nz29Kzq9HTGzHTK1Lza3AwKDLzu9JTi7HTW5GTCzITO1Mzq7Hza5FTK1ESyvHzKzKzW3DQyNDyqtDw6PIzW5HzGzAT+/Dw+RKyurNTOzMTGxMS+tJSGdATCxHRydLSqpLymnLSijBweHERCRNze3Pz69PTy9Oze1OTSxOTGrMSqlLy+vPTu5OzSvMymjNTGvNS+tMy2pMyunMSefAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAe4gACCAAECA4OIiAIEBQYHBAKJgwIICQoLDA0IkZIECQ4PCxARCwSSAxITFA8VEBYXGBmJAQYLGhUbHB0eH7KIGRIMEBAgISIjJKaIJQQLFxERIialkieUGigpKRoIBCqJKyyLBwvJAioEyoICLS4v6QQwMQQyLuqLli8zNDU2BCf1lN3AkUPHDh49fAQAAEnGD1MCCALZEaSHkIUMBQS8wWMIkSJGhBzBmFEGgRsBUqpMiSgdAD+BAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-filenew16:file file16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbPz6/GxubNTKxDQyNIyKhHRydERCROTi3PT29Pz29Pzy7PTq3My2pPzu5PTi1NS+rPTq5PTezMyynPTm1Pz69OzWvMyqjPTu5PTm3OzOtOzGrMSehNTCtNS+tAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ/QAAgQCwWhUhhQMBkDgKEQFIpKFgLhgMiOl1eC4iEYrtIer+MxsFRRgYe3wLkMWC0qXE5/T6sfiMSExR8Z1YRFRMWF4RwYIcYFhkahH6AGBuRk2YCCBwSFZgdHR6UgB8gkR0hpJsSGCAZoiEiI4QKtyQlFBQeHrVmC8HCw21+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-fileopen16:file file16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBOSmZPzSnPzChPzGhPyuZEwyHExOTFROTFxaVFRSTMSGTPT29Ozu7Nze3NTS1MzKzMTGxLy6vLS2tLSytDQyNOTm5OTi5Ly+vKyqrKSmpIyOjLR+RNTW1MzOzJyenGxqZBweHKSinJSWlExKTMTCxKyurGxubBQSFAwKDJyanERCRERGRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaRQIBwGCgGhkhkEWA8HpNPojFJFU6ryitTiw0IBgRBkxsYFAiGtDodDZwPCERCEV8sEk0CI9FoOB4BEBESExQVFgEEBw8PFxcYEBIZGhscCEwdCxAPGA8eHxkUGyAhIkwHEREQqxEZExUjJCVWCBAZJhEmGRUnoygpQioZGxsnxsQrHByzQiJxz3EsLSwWpkJ+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-fileprint16:file file16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFRKNAQCBPz+/MTCxExKLPTq5Pz29Pz6/OzezPT29PTu7PTy7NzClOzm1PTu5LSabJyanPTm3FxaXOzCjOTKrOzi1OzaxOTSvJyenGRmZLyyTKSipDQyNERCROTi5Hx+fMzKzJSSlIyOjISChLS2tAT+BDw6PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaYQIBwKAwIBMTkMDAYEApIpVBgOCAOg4RRGlAoEAuGIdGITgWOq4LxcCQgZkEkIHksHgYJOR6ZQCgVFhYJFxgTBVMZihoCfxUYDWUbUBGKGREcjBoQEB2TAB4CAx+Vl5WMhyACHiEhH6IfIiMktCQgE0cZJQStr6O2t6EARxO6vK6iEx4dZsMCxbsmBB4nzUTEutVSSUdmfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-filesave16:file file16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBFRSVMTCxKyurPz+/JSWlFRWVJyenKSipJSSlOzu7ISChISGhIyOjHR2dJyanIyKjHx6fMzOzGRiZAQGBFxeXGRmZHRydGxqbAwODOTm5ExOTERGRExKTHx+fGxubNza3Dw+PDQ2NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaAQIAQECgOj0jBgFAoBpBHpaFAbRqRh0F1a30ClAhuNZHwZhViqgFhJizSjIZXQCAoHOKHYw5xRBiAElQTFAoVQgINFBYXGBkZFxYHGRqIDBQbmRwdHgKeH2YgHpmkIR0HAhFeTqSZIhwCFIdIrBsjAgcPXlBERZ4Gu7xCRZVDfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-folder16:folder folder16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBwWHMzKzOzq7ERCRExGTCwqLARqnAQ+ZHR2dKyqrNTOzHx2fCQiJMTi9NTu9HzC3AxmnAQ+XPTm7Dy67DymzITC3IzG5AxypHRydKymrMzOzOzu7BweHByy9AyGtFyy1IzG3NTu/ARupFRSVByazBR6rAyGvFyuzJTK3MTm9BR+tAxWhHS61MTi7Pz+/IymvCxulBRelAx2rHS63Pz6/PTy9PTu9Nza3ISitBRupFSixNTS1CxqnDQyNMzGzOTi5MTCxMTGxGxubGxqbLy2vLSutGRiZLy6vLSytKyurDQuNFxaXKSipDw6PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfDgACCAAECg4eIAAMEBQYHCImDBgkKCwwNBQIBBw4Bhw8QERITFJYEFQUFnoIPFhcYoRkaFBscHR4Ggh8gIRciEiMQJBkltCa6JyUoKSkXKhIrLCQYuQAPLS4TEyUhKb0qLzDVAjEFMjMuNBMoNcw21QY3ODkFOjs82RM1PfDzFRU3fOggcM7Fj2pAgggRokOHDx9DhhAZUqQaISBGhjwMEvEIkiIHEgUAkgSJkiNLmFSMJChAEydPGBSBwvJQgAc0/QQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-folderhtml16:folder folder16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBERGRBQWFMzKzOzq7CwqLDw6NARqnAQ+XHR2dKyqrOTm5ExKTERCRHRydMTi7NTu9HS+1KSmpBweHDy67DyixHS61ITG3AxypByu7DxinBw+ZERmdIySjITC3ARypExOTDRurIR2RPTSdJyulEyGvBw+bFSyzJTK3LzKvPzivOTixNTChLSybGyCfCRSnBQqRASGtFyuzDw+PCRShPzy5OzerOTShKyaTEx6pCxerGRufBR+rOTezPTShNy6bER+1BxCfBQuRAxelFSixBw2VISq3GySrPTWlHyanIyitFSO3IymtCRujAxWhCRqlCQ6XGyWvNS2bFyGvDxuvCRSpLy+vMS+vGxqbFyO1GSi3EyO1FRaVCQuPLS2tDxyzKyWNFxaNCQyPGxubCxajERSVExKNJyenAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfZgACCAAECg4eIAAMEBQICBomDBwgJCgsEDA0BDg8BhwYQERKUDxOYDAyeghQVFhehGBmVlwwOqxobHB0eH6EfIAkPIYIiIyQlJhsnKBcpvrYiKissLS4vMDEyFjOvNAA1LDY3ODk6Oyc8PTIyFzQ1Jj42P0A6QTtCQ0REIEUORkdIkihZwsSekBhNnDyBciCKiSNSplDRUcWKkRhXCGDJYgiGli1cpuTocsILjytfFmRpACAGRTBhRogZgzHlAjKGWnIoY+bMgRgBDHRBo/LAIZoxuhwKatRPIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-folderlocked16:folder folder16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBQSFMzKzOTm5CwuLERCRARqnAQ+XHR2dKSmpOzm5GxqbCQiJMTi7NTu9HS+1HRydOTm1Ozq7Dy67DyixHS61ITC3AxypERGRBweHByu7ASGtFyy1DSOtDRmfExOTBSazBR+rCwqLAxWhAxelByGtDSaxAwODHy+1Dw+PPT29IyqvCxujOzu7NTW1Nza3ExGJJyebKyqfMTCpFRSPOTi5DQqHOTezDw2NMTGxKyqhMTGrGxmXDQ2NMTCxMTGpHx6bHx2bBQWFIyOXDQuDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfDgACCAAECg4eIAAMEBQICBomDBwgJCgsEDAKFDQGHDg8QEZQSlxMUDJ2CDhUWF6AYGZWXFBqCGxwdFh4XGK8fIAohtiIIIx25EZwBDREHgiQjJSYmGScoKSoRKQ8rggIsDC0uJS4oGygoAyjdAAcsLxQUMDEyMzQ1EzapBy8MDDc36tFwgONFjlQ6dgCEEZBHDx8+ctRIRehHAyAwZASZIGRIEBoUBwUwIGMCiwFEaBQJichIjo9FZLBsacRIAB0A/AQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-foldernew16:folder folder16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBPz+hPz+BOSmZPzSnPzChFxaXMTCBPyuZPz+xPzGhEwyHExOTPz+/MSGTFROTPT29OTm5KyurDQyNNza3Ozq5Nze3LR+RLy+vJyenMzKzNTS1Ly6vJSWlFRSTMzOzMTGxLS2tKSmpGxubBQSFAwKDKSinJyanIyOjCQiJERCRERGRBweHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaNQIBwSCwaj8ikcokMCIqBaEDoBAQG1meAUDAQpIcBQoy1dg2JdBqhECgQ1IWB0WgcBIOBwIHXBwwPEBEREhIBbG4IExR/DBUVFhIXV2NjDVYYDY8SFU4ZVxpVAQwbGxynGxkdTh6XVh8gGSGzGSITIxokJUImGSMTwLcnKCkprgAqDSt1zCssKxQtQ35BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-folderopen16:folder folder16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBQWFOzi1Ozq7ERCRCwqLPz+/PT29Ozu7OTm5FRSVHRydIR+fISCfMTCvAQ6XARqnJSKfIx6XPz6/MzKxJTa9Mzq9JzO5PTy7OzizJSOhIyCdOTi5Dy65FTC7HS2zMzm7OTSvNTCnIRyVNza3Dw+PASq5BSGrFyqzMyyjMzOzAR+zBRejBxqnBx+rHRmTPTy9IyqvDRylFxaXNze3DRujAQ2VLSyrDQ2NNTW1NTS1AQ6VJyenGxqbMTGxLy6vGRiZKyurKyqrKSmpDw6PDw6NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfCgACCAAECg4eIAAMEBQYCB4mHAQgJCgsLDAEGDQGIkw4PBQkJBYwQnRESEREIoRMUE6IVChYGERcYGaoRGhsbHBQdHgu2HyAhGSK6qxsjJCUmJwARKCkpKsjKqislLNIRLS4vLykw2MkRMRAGhDIJMzTiLzDXETUQ0gAGCgU2HjM35N3AkYMdAB0EbCjcwcPCDBguevjIR0jHDwgWLACBECRIBB8GJekQMiRIjhxEIlBMFOBADR9FIhiJ5OnAEQB+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-mailforward16:mail mail16 16:photo:16 16:R0lGODlhEAAQAIYAAIx+fIRydHxubHxmZGxiXHRmZFxOTFxGPFxKTPwCBLymlMy+pOze3PTq3PTu5Pzy7LSmnOTaxOzm5LyqlNzOtPz69Pz27MzCtLyqrPT27IRubPzuzNTGvNTCxLSelPz25Bw+ZFxKPPzy1Pz65LyupBxKdCxWfPTm1Pz23LyinBxGbGzO5DRafBxWfBxajCymxHTS5BxSdBxKbFTK3EzG1CSGvCyKvCSSxCSavGTO5GRaVPzqzFzK5EzG3BSCtAwiPGxaVPTivPzy3NzKpBxObCRefBxqlPTmzJR2bKyahAwyRPzmvOTOpKyObNS+nPz21AQOFKyOfPzuxAQCBGRORLSadPzyzLymjMy2lOzetDwuJFRCPEw6NEQ6LEQyLEQ6NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAkALAAAAAAQABAAAAfhgAABAgIDBAQFBgcIBwmOCQIKCwwNDg8OEBESjY8CDBMUFRYVFxgZDJyOGhsPChwVHR4fFSAhjwkaIiMOJBQQDRUVJSa3GicoHw4pEA8SGSorLI8tLtQu19gqLzDECTEyMzQ14zY1Njc3ODkqCTo7MjIxNCs5PD03PjctPwlAQUIihhBpQbCIihtG+CUocASFkAhIkogQ8kFJwkcFlogIkoRJEydPnkBR6GiAxiQLgiiIIkXElFQJqESoMsRKkAhXqkhhApNKFSxZggTJ4nHIEJhaDhzYwoVLFy1avHyB6ScQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-mailget16:mail mail16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAxKdBRSfCyGvFSm1BxKfCSWzCyWzBRCXCRKfBwuRAQGDDw6PHy23Cym1CSSxByCxBxunBQSFKyurMTCxExihNza3NTW1JSSlMzKzFxaXLS2tNze3KSipCQmJGxmbNTS1KSepLy2vISGhJSWlHx+fERGRPz6/IyKjDw+POzq7JyenMzOzKSmpCwuLDQyNIyOjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaeQIBwGBAIAsOkUjAgFJRQQMHgjC4PBIEVgAh4D4aEYrGAMhINxwPyiCgYSsmEUmk82grLRZJkYCgXaAEKFxYZcEISGhsZFxwFeY0WHR5CDB8dGCAXG5shGxQicBIMpSMUGxgTGSQlpQwSJicnEwwdI7gdKAwTsykpKiobr8QMKxeHDBcsGRvOzxsT0i0uL9HSHdkT2ZkoMJXF4a8AfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-mail16:mail mail16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBGxaVOTe1Oze3OTWxOTWvNzStNzKpEQ6LOTezPz+/Pzy7Pz69Pz27Pz25Pz21PzuzPzuxEQyLLyinLSmnPz67Pz23LSafKyObDwuJMzCtLSelPzy1My6nLymjNTCxLyqnPzq1LyihKyOfOzavOzetEQ6NPTq3NzOtLymnNTGxJR2bOTOpPTivNTGvLymlKSShKyahEw+NOTe3PTm1Pzu1Pzy3FRCPPz65LSadFxGPOzm3PzqzPTmzPzmvEw6NCH5BAEAAAAALAAAAAAQABAAAAaqQIBwSCwaj8ikMhloOp/QpmAgqAoIhELBUDgcEIGEYrFgNBoLx+IBiRwkgQnFoWAwKhWLhX3BZAILGhsCDXgODhwdGB5vgAofICBlDiEiIx4kJSYBJ2UoEykqHSMrLC0nLWAnFS4UCycvMAcEMR0RLTIBMwaSahw0NTYtFwclNwEdLws4eoc2DxwQOR06ASk7PBAhIRE9Pj0tLSUY1T8I5gjn6Qgy7D8SfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-mailreplyall16:mail mail16 16:photo:16 16:R0lGODlhEAAQAIYAAIx+fIRubHxubHxqbHxmZGxeXHRmZGROTFRCPFxKTFxGPPwCBLymlMy6pOTa1PTq3PTu5Pz27Dw+POzi3PTm1OTWvPz25FRSVERCRLympPzuzPTu7NTGvFxaXKSmpPzu1Pz65Hx6fHxqZPzq1Pz23HR2dBw+ZHx+fISChJSWlDQmJHRydCxWfBxGbJyenExKTHRiXPzqzPzy3CQmJDRafGTO5ExOTERKTGxWVCRSfHTS5CymxBxajBxWfPTmvPzy1CyixCSaxCySxDSaxDSWxDSSvDyaxGS21PTmzPz21AwiPBRejCSavByGtCSezEzG3FzK5FzG3GzO5FTK3CQ2bPTixBxqlCRefBxSdBxSfBx2nCQ+dHxmXPzmvLSafAwmRAwyRPzyzDw6POzavNzKpAQOFPzuxBwWTBw2ZGRORLyWdMy2lOzetPTivAQCBKyObOTOpAweNBwWVEQyLEw2LEQ2LDwuJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAsALAAAAAAQABAAAAf4gAABAgMEBQUGBwgJCguOCwEMDQ4PEBESDA4TjY8DFAwVERYXGBkRm4+QGhsMHB0eGB8bDpyOARogEBceIRgXv8COIiMkGB4lJSYnIcwoKb/DGyoXKywtKS4pHinMLzAxJDIzNDUtNjcv6B0hLzgfMh85OjstPDw99zwd7T4/LTVAgggZQqSIECNHevSAgSSJkiVMmjh5AiWKlClAiFARUeVHFSVWmLS40gNLlh5agGzh0kWDlwZfrIDREKaCAjEqrFA5MMYLmTAxlJTxYoZMozNozqRRs4ZNmy5s3LwhA0dBnDNn5MxBoAABnTp17IitowDrmQV+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-mailreply16:mail mail16 16:photo:16 16:R0lGODlhEAAQAIYAAIx+fIRubHxubHxqbHxmZGxeXHRmZGROTEw+NFxKTFxGPPwCBLymnMy6pOTa1PTm1Pzy7LymlOzi3HxqZOTWvPz69Pz25My+tLympFRGRHxuZPzu1LymjNTGvNTCxBw+ZPz23PzuzPz65PTu5NzOtCxWfBxKbPzq1DRafGTO5BxGbPzy9HTS5CymxBxajHRiXPzqzCyixCSaxCySxDSaxDSSvGS21GxWVAwmRBRejCSavByGtCSezEzG3FzK5FzG3CQ2bPzuxAwiPBxqlBxKdCRefBxWfBxSdBxSfBx2nCQ+dPzy1CRqlAwyRDQmJPTmvPTixLSafOTOpAQOFPz21BwWTBw2ZPzmvNS6nPTivAQCBAweNBwWVNzKpPzyzLyihGRORLyWdMy2lOzetKyObEQyLEw6NEw2LDwuJEQ2LAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAsALAAAAAAQABAAAAfqgAABAgMEBQUGBwgJCguOCwEMDQ4PEJYRDhKNjxMPDBQVFhAXGBUSGY8LGhsQHB0VHh8gFQ6bjgEhIiMMJCUmFbS2CwMnG6IoKSorI7WpEycWFiUsLSou1yXXji8wFiopMTIzNDUz4zbZNxsbODk6Ozw9Pj8pPzEzQDdB60JDOkRFjBw5giRJDCWdlmxwIIRJExAWKDRyMgTIiydLoESRImQKlSUSF1SxUoXAlSBRsGSJoCVICIlbqlThcoBClC5eYFD4EiVIFwUyqywAE0ZMlqNjpJDpIkUBl0dlFChAYOZMmTJoyqQR5icQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-mailsend16:mail mail16 16:photo:16 16:R0lGODlhEAAQAIYAAIx+fIRubHxubHxqbHxmZGxeXHRmZGROTFRCPFxKTFxGPPwCBHxqZLyqlMy6pOze3PTq3PTu5Pz27Pzy7LyinOTaxOzi3Ozq3LymlOTOtPz69Pzy5My+tLympPzqzNTGvLSelPzy3BxGbBQ6VPzuzPz65LyupNzOtPz+/GzO5BRejPzq1Pz23LymjHTS5CyixCSavBxqlPz25LymnGTO5CymxCSaxByGtHRiXPzy1CySxCSezGxWVPzuxKyOhMy6nDSaxEzG3PTivNzKpKyOfPzu1FzK5PTmzJR2ZLyihLSWfKyObOzmzPzmvDyaxOzavLSafGRORMy2lOzetDwuJEw6NEw2LEQyLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAsALAAAAAAQABAAAAfUgAABAgMEBQUGBwgJCguOCwwNDg8QERITFBUWjY8DFxgZGhsaHB0aD5yODB4TGB+kICEaIiOPCwEkJRcmJyYPKCIpKrWqKywTmC0SIi4vMDHEDCsyMg8zEyI0NTY3z7U4Hhs5Mx+0IyI6OyPrIzw9Gys+PxIy2EBBxAs8Qjk5Q0RFWFxAZySfgSMsilRAkiRECHQ08hHgJ0TJkCU/mECU2ISEkowUlpAQ4QTfowNPoAzJIeRJCyjm8kVRIkWIzSkXhwxJtYAKgp9VrFi5QoWKFZ5+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-nav1downarrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIYhI+py+0PUZi0zmTtypflV0VdRJbm6fgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-nav1leftarrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAP///wAAACH5BAEAAAAALAAAAAAQABAAAAIdhI+pyxqdwoNGTmgvy9px/IEWBWRkKZ2oWrKu4hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-nav1rightarrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIdhI+pyxCtwoNHTmpvy3rxnnwQh1mUI52o6rCu6hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-nav1uparrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIYhI+py+0PWwhxzmetzFpxnnxfRJbmufgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-nav2downarrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIfhI+pq+EPXYpxUckoO3AjbF3dJwahllXe6AFgC8d+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-nav2leftarrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAImhI+pyxf5VohmSlsxmpjTzAHeN5ak6UHpqKRi2GpwvH3Q3eT64RcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-nav2rightarrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAImhI+pq5HOAjQyVnqfhHue7oAaKH5kiW0AmnLqaHomkj02g+e6XwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-nav2uparrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIghI+pyxfR0HsRzNnuXVqn3mVQZWFRyIDjp65Ga5Ly4hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-navback16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBRSdBRObCQ2TBxObISevAQCBNzu/BRGZPz6/FzC3Pz+/HTS5ByyzJze7Mzq9ITC3AQWLAyWvBSavFyuxAwaLAwSHBRafBSOrDzW5AyixCS61ETW3CzG1AQeLAweLAxefBSStEze7CSWtCyatBSCnBRWfAwmPBRWdByixAQSHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZiQIBwSCwah4HjUTBQFgkFg3MoKBykU0QhoUAIAuAksbpgNByPxQMSGVsVDYlkIqdUiJYLJqORbDgcHRseRR8gISIaEyMkGCVYRBEmeyAnlgaQkSgpmU4RAZ1OKqFOpFNGfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-navdown16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBRObCRKZBxCXAwyTKTK3Ozy/NTm9GSivAQWHNzu/FzC3IzO5CySrAQOHAyuzETS3CSWtAyOtETa5Aw2VLze7ByWtBy61BSavAxWdBRCXAwqPAQCBDR+nKTe7FS+1Eze7ByixBRmjPz+/AyexAyixAQKFBRqjAQGDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZeQIBwSCwaj0hAYCkYEJLKguGASEADigWj4bgaHpBINykwSCYRa5HCFFQsF0xGo9lwhpSOwfORYC4gISJ3RAQdIyQYJSAlImNrh4uNJkl5CoKUUBQnjlB4KJ6hokN+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-navforward16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAwyTBRObAw2VDR+nCRKZOzy/KTe7Pz+/KTK3Nzu/Lze7FS+1AyexAyuzBSavAyOtBSmzOTy/BRqjNTm9IzO5ETS3ETa5By61AyixByixBRmjAQGDBxCXGSivCySrCSWtBTC3AQOHAQWHAxWdEze7AQKFBRCXAwqPAQCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZjQIBwSCwahYGjUjBQGgWEpHNYMBCaT4G2UDggos+EwmBYMBpf6VBgYDgeEMgjIpmoAQVKxXLBPDIXGhscRB0eHyAgDSGBGyJFASMiIiMkJYImUwAnmJqbjp4AKCmhAKSlTn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-navhome16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBDw6PBQWFCQiJAQCBFxeXMTCxJyanDwyLDQqLFRSVLSytJSSlISChCQmJERGRFRWVGxubKSmpJyenGRmZLy+vOzq7OTi5Ly6vGRiZPTy9Pz6/OTm5ExOTPT29BwaHNza3NS6tJRqRGQqBNy6pIyKjDwGBPTe1JSWlDQyNOTGrNRiBGwmBIRaLNymdLxWBHxGFNySXCwqLKyqrNR6LKxGBNTS1NTW1Jw+BEweDDQ2NAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaoQIBwCAgIiEjAgAAoGA6I5DBBUBgWjIZDqnwYGgVIoTGQQgyRiGRCgZCR1nTFcsFkHm9hBp2paDYbHAsZHW9eERkYGh4eGx4ag3gfSgMTIBshIiMkGyAlCCZTEpciJyQjGxcoKUQBEhcbIiorLB4XEltDrhcaLS4vtbcJra8bMDHAGrcyrTMXHjA0NSypEsO6EzY3IzU4OdoTzK0BCAkDMgkIOjJlAH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-navup16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBRObAwSHBRSdISevBRWfAweLNzu/BSOrAQWLPz6/FzC3DzW5BxObHTS5ByyzAyixEze7BSStBRWdAyWvByixAQSHCQ2TAQCBBRGZJze7CS61BSavAxefMzq9ETW3CSWtAwmPPz+/CzG1ITC3FyuxBSCnAQeLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZfQIBwSCwaj8hhQJAkDggFQxMQIBwQhUSyqlgwsFpjg6BwPCARySSstC4eFAqEURlYhoMLBpPRUDYcHXt7RgUeFB8gIU0BIoiKjAcUIwiLSQUkJRsmGIwJJwmEU6OkfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-playeject16:play play16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIbhI+py+0R3IFQUtruXVqn3kkWyIARR4rqKvoFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-playend16:play play16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIjhI+py8Eb3ENRggrxjRnrVIWcIoYd91FaenysMU6wTNeLXwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-playpause16:play play16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIfhI+py+1vgoxzyUCxrZd18ClfmIyVyJ1lqkHuC0N+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-playstart16:play play16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIjhI+pyxudwlNyguqkqRZh3h0gl43hpoElqlHt9UKw7NG27BcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-playstop16:play play16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIahI+py+1vgpySUWpvXXqrHmSaeJEYhKYq6hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-textblock16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIahI+py40Bo5SOzRvrwlgrfnkJOIkPaaaJXwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-textbold16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIihI+py70BowPQ1HZpwNv212Vg9IGHmIjoWa4ey5DSRNd+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-textbottom16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIVhI+py+0Po5y0hYtzrkB7zH0fN/kFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-textcenter16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIbhI+pm+EPIZsnRkqtDnhu1zHfFSpjaY4PavgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-textitalic16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIahI+py+0BgztwUmmjBXX3jE0auHHhM5Yq4xcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-textleft16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIbhI+pm+EPIZsgRoqr3Vnt102fFSJjUC6nlPoFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-textmiddle16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIXhI+py+0PT5i01pisphjt3UmfFZYm5hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-textmove16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIbhI+pm+EPIZsg2kfZvblXbwTg10WlA4rjyvgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-textright16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIahI+pm+EPIZstSrqsDhhv1ylfFE5jiYwX6hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-textsortdec16:text text16 16:photo:16 16:R0lGODlhEAAQAIIAAAT+BPwCBAQCBAQC/FxaXAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM5CBDM+uKp8KiMsmaAs82dtnGeCHnNp4TjNQ4jq8CbDNOroIe3ROyEx2A4vOgkOBzgFxQ6Xa0owJ8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-textsortinc16:text text16 16:photo:16 16:R0lGODlhEAAQAIIAAAT+BAQC/AQCBPwCBFxaXAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM4CAqxLm61CGBs81FMrQxgpnhKJlaXFJHUGg0w7DrDUmvtPQo8qyuEHoHW6hEVv+DQFvuhWtCFPwEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-text16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIlhI8Jwe2/AmpTynqPTXSqrnBM+I0kdmpmGmUp+K4nPMvhYx9+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-texttop16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIWhI9pwe2uYnq0yQtqxbz7D4biSIZ+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-textunder16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIjhI+pu+FxXoOIKpds1oBH7hlYxYxRCaIZ01lhJbHy9tTv7BcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-viewchoose16:view view16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBDQyNAQCBPz+/PzerAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMzCLrcGlAs6UAYgwLdLtEcI4ygQo7VVp2oupGpG4vmaUVTemX523qlFcw0a4RqNlkx5k8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-viewdetailed16:view view16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBDQyNAQCBPz+/PzerAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMmCLrc/i1IAVkYg1Z1iRYUKCqitp1oikqBWV3ZOnhkWNagqu+qnwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-viewicon16:view view16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBDQyNAQCBPz+/PzerAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMwCLrcG1AwGOQbw6qANeCEB3pCSZpO6pgowJZqLKuUGE0dnuEhf8IL1kz1shSHDX8CACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-viewmag-16:view view16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBCQmJDw+PAwODAQCBMza3NTm5MTW1HyChOTy9Mzq7Kze5Kzm7OT29Oz6/Nzy9Lzu7JTW3GTCzLza3NTy9Nz29Ize7HTGzHzK1AwKDMTq7Kzq9JTi7HTW5HzGzMzu9KzS1IzW5Iza5FTK1ESyvLTa3HTK1GzGzGzG1DyqtIzK1AT+/AQGBATCxHRydMTCxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ+QIAQEBAMhkikgFAwHAiC5FCASCQUCwYiKiU0HA9IRAIhSAcTSuXBsFwwk0wyYNBANpyOxPMxIzMgCyEiHSMkGCV+SAQQJicoJCllUgBUECEeKhAIBCuUSxMKIFArBIpJBCxmLQQuL6eUAFCusJSzr7Kmpl0CtLGLvbW2Zn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-viewmag16:view view16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBCQmJDw+PAwODAQCBMza3NTm5MTW1HyChOTy9Mzq7Kze5Kzm7OT29Oz6/Nzy9Lzu7JTW3GTCzLza3NTy9Nz29Ize7HTGzHzK1AwKDMTq7Kzq9JTi7HTW5HzGzMzu9KzS1IzW5Iza5FTK1ESyvLTa3HTK1GzGzGzG1DyqtIzK1AT+/AQGBATCxHRydMTCxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ8QIAQEBAMhkikgFAwHAiC5FCASCQUCwYiKiU0HA9IRAIhSAcTSuXBsFwwk0wyYNBANpyOxPMxIzMgCyEiHSMkGCV+SAQQJicoJCllUgBUECEeKhAIBCuUSxMKIFArBIpJBCxmLQQuL6eUAFCusJSzr7GLArS5Q7O1tmZ+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-viewmag+16:view view16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBCQmJDw+PAwODAQCBMza3NTm5MTW1HyChOTy9Mzq7Kze5Kzm7OT29Oz6/Nzy9Lzu7JTW3GTCzLza3NTy9Nz29Ize7HTGzHzK1AwKDMTq7Kzq9JTi7HTW5HzGzMzu9KzS1IzW5Iza5FTK1ESyvLTa3HTK1GzGzGzG1DyqtIzK1AT+/AQGBATCxHRydMTCxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaBQIAQEBAMhkikgFAwHAiC5FCASCQUCwYiKiU0HA9IRAIhSAcTSuXBsFwwk0wyYNBANpyOxPMxIzMgCyEiHSMkGCV+SAQQJicoJCllUgBUECEeKhAIBCuUSxMKIFArBIpJBCxmLQQuL6cAsLECrqeys7WxpqZdtK9Ct8C0fsHAZn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-viewmulticolumn16:view view16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBDQyNAQCBPz+/PzerAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMwCLrc/ixI0WSgKoyBl+beQFACpo1AqXbKCr1wLAMWS08hGG3dSZqin4sxnBmPD38CACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-viewtext16:view view16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIchI+py40BTQSwuovp3DXkv1ia1IHmIXLiyWJ+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-viewtree16:view view16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBDQyNPz+/PzerAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAAMuCLHcri4yGISlj4kxcANgNRBQCIbL6U1Su7bB62rXvGydG25kqpwfIGxILBr9CQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-actattach22:act act22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBMTCxPz+/DQyNKSipAQCBISChFxaXDw6PAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARrEMgJgqA4zzus/gLhFd5HCcZAXqsphYPUdhcYFNRcZnvdtpnDqPTbUWgAJKBYwzBlw+bRo3xmkNWoBgm0OrVLn3GC9RgCk8DhUw7c0rHPr4CDu5SYQNyEt7uSY3p/UAKFhYKDSQOLiwgFdhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-actbookmark22:act act22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBCQmJCwqLMTGxAQCBBwaHMTCxLSytERGRFRWVLy+vKyqrKSmpHR2dJSSlJyanISGhGxubIyOjKyurGxqbFxeXGRmZHx+fKSipLy6vGRiZLS2tFRSVHRydJSWlHx6fCH5BAEAAAAALAAAAAAWABYAAAWWICCOZGmewamaQrq+wUC8azHINGocOI38iIRAceDNaISFYklkGHOEhoNBfUAOhuOLEJE8HoPiRKFdESiQBqViuTDIUAsEcyAeGJmyiqC5RCwJGg0YcEh9D0V3Dxt6JwQVDRYVHBUdi40mjw0PTgwQHgeYJQQJfxUXFxAOoTkFpQ0fsRSimQkWEQ0VtI62HLt7vjl7JQYhACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-actbookmarknew22:act act22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBCwqLCQiJCQmJMTGxAQCBLy+vLSytERGRFRWVKyurKyqrLS2tKSmpHR2dJSWlKSipISGhGxubIyOjGxqbIyKjFxaXGRmZHx+fPz+NGRiZPz+ZPz+HMTCBKSiHPz+jFxeXPz+XPz+tPz+zPz+/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAamQIBwSCwaj4Gj0hgQLJ+AAaEAVQoI06pRYDhkoYgwIhEgKBTfZ2FhaBsYDS8VWnA8Go0FJIKeqyUTDw8EDHBpSwUUFQ4UFhcYDQYFfkoFFxEQDG8KEAUZlEeWGBIakw4FG1STiBoYBRwdBR4fHgUdHKBEBSCnIR8iIyIfIblFu6ceIyQjtcXGCbLKzAUKzrq+wMLEVa+xs7W31kOTk6nkWuOf6Ea5QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-actexit22:act act22 22:photo:22 22:R0lGODlhFgAWAIEAAPwCBAQCBHR2dDQyNCH5BAEAAAAALAAAAAAWABYAAAJOhI+py90RnIMyRUOxhDfzJkACdoXBuEDDkQFDi5go0MrKx16kns80b7qdELCgBYaEGWwL5nG1ePFiKp9A6kuYRNuho8vxVrrZivmMRtMLACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-acthelp22:act act22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBCQuNBwiJAwiLAwaJAwSHAwSFIy+3ERynCw2PCQuPAwmPCxOZCxWdJzG3FSazBwmNAQKDAQGBDRmhBQyTDxujDR2rIy21AwWJDyGxCxmjAwmNDRihAQOFDxmhCxunBQWFAwaLCRahDR6rESGvDQ2PCRWdDRunDSGvCRSdAwWHCwuLDSOzHSmxDyKxBxCZBwqNHSu1DyOzAQSHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAahQIBwCAgIBAPCoGAgOoeBAyKhWCwYDUf0CX1AIhLiJEGpBLiAAaRxdgYsl7Ybk8igBZoN5xmAdDxoanp8HyANISF8EBsiXBMjJBolBEQmGHFoRScbKHIKDykqK5lFAZRCnyknTaROLA8tq61OChgtKqyzQgEYEJi6UC4vI3LAASkbMBPARAEBdszR0sACEaPSMTIQM8W6KzNl3bo0NOJDdEEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-actlock22:act act22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBHRudFxaXExGTERCRAwGDGxubPz+/Pz2/Ozm7Nza3NTS1KympFRSVHR2dNTO1JSSlKyqrKSipDQyNMTGxDw+PLSutKymrMTCxAQCBHRqLBQODJyanDQuFFxSJFRSJFRGJERCHExCHISChHxyLEQ6HGRaJExKHLSmbLy2fOzitPz23KSiZHxuNHxyNJSOTNTOnMTCjLSudKSaXJSKRJyOTOTetNzWpHxuPOTi5MzKzLS2tFxWXOzq7Ly6vOTe5Ix+RLSqdNzSpLyydKyqbKyiZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4IBAgMEBQKEjI0GBwgJCgsMDY2XjwkOAgQBDxCLl4QNCaGCBBGWooINCAqqrBKgqwATFKaDFRYVtBMXsIMNGBm0GRADjQIJxKIaGxwdHh8gISIhGyMZzIwkGholJiYfJiAfJyEZISDbg90oKCkqKwcHKyooLC0f7IIuLzD2YMSQgW8GDRri+AFoUMOGvRsxUhSsQQPHvmQSchyQtEAHhh0WJHDQcJERjwsKDvRI0BGDjwgicXhQyCOjSgUKPO6AObIkIQESfmxk6REDT4s0bfaYpDNkT4VAha5s+TLmzEYtatwIOHAiDZIKNQAJYk9IjCFEisyoocFEB4UACtBpm0t3LiF4gQAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-actredo22:act act22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBCReDJzGjMzivOTu3Pz+/JTWbHy+VHTCTMTivPT69BxGDESuJDyiHESiHEymJIzKZAQCBFS2LFzKNGzWPDRqHCxqDFSqLHy2XESCHAwaBAQOBBQqBDyWJHyqZDyKFGSiVESeJBQ6BAwSBGTGPFyWPFSSLEyOLESGJBQiDAwiBBQmDCRGFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAaoQIBwSCwaj8hkMcBkKpcBwYAwEDif0YLhwEUkFItFMkAwMBoOR+PxgHwjRDggamhIJpQ8ZbKGKOQLcgEFdhUWEYgRF3sNfhELBHALAhgZFhobRBwREhQdEAIEHpIKHwsaSJwUDQgQIJINARxKESESDQ0dgCIjSpAkDAwPco+ZSJAlJicnKHIAIrNHidOIQxunT0kpCyrZSCss0d5Fj6jjRonn6uvs2QZBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-actreload22:act act22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBCRSFCRSHBw+DBxCFCQ6FBwyDBQWBBxGFCxyLGTChMzqzLzmvHzKjDyOTER+RERyNDSqXNzy3LzivFS+fCyCPBQmBCQiBBxKFBQqDOTy3LTitES2dDR+PCxuJOT25KTarCx+PESSTCxKHDSeVCyKRNT21ESWVDSGPBQyDAQCBBQSFDRuLDSyZDySTGzChCRiJKSmpExKTDS2ZGzGhLy+vGxqbISChDSKRMzKzGxubDQ2NIyOjCQiJCwqLBQWFCwuLKSipERCRERGRHR2dAwKDDw6PFRWVIyKjCQmJFRSVBwaHKyurAQGBExOTBweHFxeXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf9gACCg4IBAgMEBQYHhI2ECAkKCwwNDg8QBAOOhAQREhMUFQgWBxcHGBmbggkaGxwPB4yDB6SbBJIKHQaqtY0eHyAhsqrDgx4aCiKpqoQHAyMjJBMKJaSxzAAHIRsmJgonKA0LHSmDKiuOBywRLSQuLyEwwyoxMuiN6iUzNBXy5jU2bsgoJugABBz95uXQsUMGD3vpPPgTpKIGwx4+HMr4kW4YkCA2hAzxAQSIECI+imBTwVIFESNHerRUgc0cEiFHkjiiyYzeDiVLdvLcySSkkKGEWiZVweSGkIHMmvQosoQlkaZOjvhosvKJjIAxoOAsgpRZkQNLnvSoqspAIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-actrun22:act act22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBAwKDAwKBCQiHNze3AQCBBwWFDw6NPTy9PTy/Dw2NKyytOTi3LS2tMTKzMzOxLy+tLy+vBQODNze5NTS1JyalIyCbIx6VIRyVISGfJyelOTq7EQ+NMTGxKyurGxeRLyKPOSmROSuVOy2XOSiTLzCzNTOzDw+NCwqLHxuVOy6bPzGfOSuXNTW1LSyrMSWRNymTOSmTKSCTPTGjPzSnPzWnMyaVBQSDMTCxPz+/KyahNSeRHxeLJRyTPzmtPzarOy6fJyajNza1Ly6vLyulFRCJPzirPTOlMS2pNTSzMTCvJyenBQWFNzKtPz6vPzyvPzqtOzGlOTe1AwGBFxWTLy6tPTm1PzSpPzutPz2xPTSnOTSxOy2dPzapPzerOzm5IR+dPzu5Pzu1PzqxPzy5Pz+9GRiXGxuZKympHR2bOTm5Pz6/MzSzBwaFJSSjCQmHPz2/AwODAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4SFhoeEAQKIjIIDBAQDjYMFBoMHCAkKgwYFhwULDAUKCg0ODxCkBQgRnoUSExMUDxUWFxgZGpAbFIuGHB0eHyAhIiMkIB8lJieIKCUpJCTGIyorLCktKIUDpC4YLzAxIjIyMzQ1NhgdpJI3ODktJTowOyM8Ejc9Pj9AQUIEclAocCMIBQhDiOwgoaKIoCI+jBxBkkSJkCWemIyq0GSHCBVHihRx8gRKFCmpKhGaQqWKFYZXsGR5kkXLFgRUXBUqkCGCFS5AjnTx0sXKlyA6CRVgAAHMAilhxIwhU6ZFkBY5kgKYUoXBAzMKzixZ4AJNGgVm1KxhM0WpmQpUMtooaOPGxAM3Nw60oYLGjNYCbzYJOgAnRzNBJ95oPYQCgpJtkwzFoULlRuRPiy9fNhAIACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-actstop22:act act22 22:photo:22 22:R0lGODlhFgAWAIUAAASC/CQKDBwKDCwODNyKjPzq7My+vIxiXAQCBOSOjPz6/OSelNySjNyGhMR+fLRaTGQ2LPz+/Nx+dNR2bNRybMxuZMxeXMxiZLQSFJQaHFwqJNyKhOSCfNyCfNR6dMxmXMxWVMRORLQODOR+fOSSjNR2dMQ2LJQWFMRWTLwWDNSCfMxeVLwaFKQODNR+fNx+fMxiXKQSDOSWlMRSTMxaVMQ6NMxORMQyJOTS1MxqXLwWFLRORMxKPMQaHMxKTLQWFCH5BAEAAAAALAAAAAAWABYAAAb2QIBwSCwajwGBcikIHIsDQmFKNRwQT2EgoVgsGOCG4wHBIgmRhWRCqVQsF0xGYyYGNgoGh9PpeCQfICEic3UAAWgLIxwRJBsbHSUREyYYJ3RDAQULexGejhueESgpl3WaCxsqJKKsChEUKywtmFoFDC4vCayikzCyMbWHt38NCTKiHhUfMyzBdQIFKsodob0VNDWzwppuKxMRrx6iNjcitNA4bh+iEzkwojc66JkOOxcf7G35PBE9KS1MEUGgIQOIFfk++KjRw9wJgUUIZvhRoyLDFCliQDQisUWLGCJOeNx4hKCGkyhPGnqCoKVLl1liypyZxUAQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-actundo22:act act22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBCReDJzGjMzivOTu3PT69MTivHy+VJTWbIzKZEymJESmFESiHDyiHESqLAQCBFzKNGzWPFS2LNTmzCxqDDRqHPz+/KTGnBQqBAQOBAwaBESCHHy2XBxGDOzy7HTCTEyyJDSqFHzWTAwSBBQ6BIy+dESKJFySPFSSNAwiBCRGFBQmDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAalQIBwSCwaj8ikMsBkKotMwYAwEDiXgYLhwD0gCFZiQKxNKBYMRqPh+D6G16y5AYnYIxBJAyF4AwITTAUJdBESD4gPFBV6Fn6ABBcJDIYPGEQZGhQbHAIdfx4JHw2VSBodGwWfAR4LDSALfkgYAQurBiAhICKfSSMkvQElGyYnGyi9Rxkdj4nOskUYyU9FpxnURikdGtjRKivdRKfQ2Inh5+jpRwZBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-actunlock22:act act22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBGxqbFxaXExOTEQ+RAQCBPz+/PTy9Ozq7Nza3NTS1KSipFRSVOTi5Hx2fJSSlKyqrJyenJyWnDw6PMzKzKyurDQyNFxWXMTCxJyanHRuLHxuLGReJFxSLFROJFxWJExCHERCHBQODISChHxyLHRqNIRyNHRmLLSqbKyiZLy6fOTarPz67Pzy3OzitKymZFxSJJySTNTSnPTy3NzSpMTChLSydKyqbKSaXJySVIyGRGReLPz23NTOnMzCjHxuPLy2vKSmpOTe5LS2tLSutHxuNHRuPMS+xFxWLIR+RDw2HFRKJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4SDAQIDBAUChY2EAQYHCAkKCwyOjZANDgIEAQoPjJiDAg2iggQQp5gMBwmrDBESl6MTFKuoFQSjABYRF40CGAW8BRm7hQwNxBobHB0eHx4gISIjBdiEAhYFJBslHOHSHh4hBSHlxIUmJygpKissBiwtLi8pGjDqhBoxMjMuaNSwcSMFjhw6dnjYRyrGCh4ueviw4Q5HDB0/PjAUJCBCAwMIGiiggAEIBFk/FgYLIgRkggQkhxAJkqGExkYMFnxsIGRkSQgLHhRRWUjAggQgG8AsSWRBBiP6VrYMOfKIyaBDNwLo+HHSUplOSyDRqiEHjRkretRQkcLgxayNF0wksQGQxsSKMTIq0QpgCba/gAE7IhMIACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-appbook22:app app22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBDyGhCyCfFSWlESOjDyKjDSGhCx+fGSinGSenFyanEySjHSqpHSqrGympEySlBx2dISytHyyrCR6dKTGxHyurHSurHyytGSipCR6fARmZFSalEyWlBRubAxubBRydDyKhDSChLSytPz+/MzKzIyOjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbFQIBwSCwaj8ikMhBQIpmCQdM5ZBIKhgNiugwkFAsCI7pNMhuOxkNBgBgEiAi3GkBLJpJHYgEpaClyREwVFhcSEhgOGQoMfgMaERtcARQBFRMYExZ6HB0FUYAekkIBHxqWFmlrC1haESAfG6MBGx+VFRgKYH0hInGRklO0ppYXCwwMWQiQHkwjgrWnFRdYZHIBJCTP0LaWGAcDW9jZ2nMAw9IWTOQkJSZMRsOV49nu8E+19PbmR7TY+1TovONH5V7Ag0QMBAEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-appbookopen22:app app22 22:photo:22 22:R0lGODlhFgAWAIYAAAQCBAQ2NPwCBHSurIS2tBx2dBweHPz+/Ozm1GxiTGyqpPz6/Pz69GSqpOzaxPzy5HxuVLSmlOTazPz27PT29NzClPTexHxuXLSmjAxqbFSinPTy9KyehNy+lPTy5Pz29HxyXNzWxKSahOzexPzy7IR2ZOTWtESenPTy7KSWfIyCbKyijAQGBDyalPTu3KSSdDSOjJyOdCSGhPzu3OzizJSGdPTq1PTq3JySdMy6lAyKhOzWtOzi1OTOrJyKbMS2nJySfMS+rAwCBNzOrNTCpNzKpJSGZKyafLSifLyylIx+ZHx6ZDSChAQuLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAIALAAAAAAWABYAAAf/gAABAoSFhoeHAAMAiI2IAAQFjI6EAAaJkQeTjwAICYkKBQcLm5WdBwyfhgChB66bp64HCQC1lQ2irqQCAA4PowsLEBESE4wAuLIHFAAVFr+uDBcYxRm1GrmuGxwdFh4Mrh8gGCET1gDYyhsiFSMkDAsMDCUYJhvnJ9kHKCnODwwfPlBQsULCPRYAWogK9sHFiwoOPEyQh0JFPXO1YBSYwBEFghjdHkwQOYGgwQwIZRR44GHGDBogabhAsYEEihrUMAIoUMCEDRs3HODIYQHFA6MPcJA7KICFjgw7eIzo4cOfiwc/gKwIUm2SkKdDdlDt4AABDaU/iIRwwbTSUyJFOow4S3Hkx9oNDDZgXPU0h1wcSIgEGUw4ibVET5WoWMKksePHpdxmyKADAEIWly9HJtQkQJMmlAgZCAQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-apppencil22:app app22 22:photo:22 22:R0lGODlhFgAWAIMAAASC/IQCBPwCBPyChMQCBPzCxAQCBPz+/MzKzISChKyqrDQyNEQCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARYEMhJ6wxiEMtpIAWxddwXiqRlikSQeiAbuC+wirNR322gv7zcLobzDU+9XypoBBKTR1lz+RTWDgip8nUwZK1XLyIx5XoVicX2RUAo1DVKi7GOBxjxfNwQAQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-apptool22:app app22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBAQCBISChFxaXNze3NTS1Ly6vKSipNTO1Ly2vNza3Pz+/MzOzOTe5DQyNOzu7MTCxGRmZMTGxPTy9Ozm7Hx6fPTu9MzGzGxmbAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAW1ICCOZGmeaEoGbBsI6joMRGEcbQwESDIrtVtAF1gwDLNaAmfKiVgLBJKgwB1KxQZrBHU0FAXmavFoQLYiB6TxFXMj5AZBwnJI2I3wcNWALyYEcgoKXxRhOHs7XxEVCwsWFgoUDRYUFwwQB25ZCxiNjo6GkwUXN2NsCxEYqhUHoQ0MEglYRQQXErcHrI55FycuB2YSmoyOBTEtB2sXuhU6XAENC2a6z9AKCwq+1tAN3E2J3ySkIQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-connecting22:connect connect22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBPz+BMTCBISCBAQCBPz+/MTCxOTi5AQGBNze3Ly6vISChNza3FxaXKSipAAAACH5BAEAAAAALAAAAAAWABYAAAR4EMhJqwzY6omD+MNGdR8YilNZnug0qGzrqrL1lnV1fyJBVB6VQEMoGH4ADGwQkxQPBwMiKGA2J8VEAnq0tgiKg5aL/C7C2gTjKCM0zowDQ8tuNQznNL7cKzjOUQsNfER+gguIg19+Pm6ChBZFDmWNi5M5FIyYFHQRACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-connectno22:connect connect22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBPz+BMTCBERCBAQCBPz+/MTCxOTi5Nze3OTm5Ly6vNza3ISChFxaXKSipAAAACH5BAEAAAAALAAAAAAWABYAAARiEMhJq7046827/+AVCKE0Dh9BAGdaGISAToFGFMcBU+11I4hDYseSZQiKwwKoI/QwBIYiuFDCZseGdIlYEjUNg1SpY6w2N4cUIW6cjwW1lsFwo+MqgtZuw0/ydw5vH34lBhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-connectyes22:connect connect22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBAQCBKyirPz+/KymrOTi5KSipMzCzNza3OTe5Ozi7MzGzPTq9OTm5ISChMS+xFxaXNze3GReZIyCjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAWLICCOZGmeaBkAQpoGg7C6JizTQT7CxPwOwFWgYPChYIXkIHC4uQKGAiKRKCyNpxxUUVViVYNFLkqtLo+DAkMMLXQPXwAy2WCTF4544FGtKuwPDhB6DnxuUmyCcXIQhV1uYoMuEAcOBxEKCHg6TzGFCJUSizuejROKOAM9OY2SnUU7nD89NCcDsLUnIQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-devscreen22:dev dev22 22:photo:22 22:R0lGODlhFgAWAIcAAPwCBAQCBPTy9PTu9Ozq7OTi5Nze3OTe5Nza3NzW3NTS1MzOzMzKzMzGzMTCxMTGxOzm7AwGDBQOFBQSFCQeHCwmLCwuLDQyNDw6PERCRFROVEQ+RDQ2NLy+vKSipISChGxqbExKTOzu7OTm5Pz+/GRiZMS+xLy6vBQWFLy2vCwiHFQ+NMSmfNSyhIxmTDwuLJx+bLS2tCwmHMyyhMyqfPTqpPzyvLSWbLSWfPzitIx+ZDw2PAwKDCQiJGxWRPTmrPTerMyuhPzqtPz63PTWnPz6zNy+nIRiVDQuLKyWbOTanPz21NS2jNS6lDQqJHRaTPzmrPTSnPzyxOTClPz2xNSuhPTqxPzuvOzSpAQGDOTKnMy2jOzSrPTu1NzKnOzOnBwWHJRuXLSWdPTatPzqvNzClCwmJOzSnOTOnPTuxOzKlOzerOzarOzitJR6ZNTO1IxmXPTWrNSyjPzOjPTSpLSehHRqZOzirOTCjPS+fPzGhOy6bOzKhGROPMy2lPz+1PzmtKRyRHRiNNTCdPz+zNzCjEQ2NKySdDQmJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAj/AAEIHEiwoMGBARIqXMhQIUIBAwYQIFCggIEDCBIoULBgAYMGDgIIDEBAwMSKBRBk3NjxAciQIwdACBBBwgQKFSxcwJBBwwYMHBx0EAmA5EwPH0CEsCChoYgOQ0cSGCHhA4kSS5syJGDiBNEAFVGUKKEBAwWFFM6SNJHi64gDFEKE4FBBggoKK1i0cPECxokYXw0gsECYggQZM2jAqGHjBo4cOtqOxLhDAg8ePXz8ABJEyBAWRIoYOfJipEoMCZEkuaFkSAslS5jUGJKkSRAnRREo0JDwCZQoTKQAmUKlihQrVa5gKZ1lI+oAK7QM2cJlSZMuU4Z4+TJEx0iNOwKAggkjZkyOFmS8kClzpcUQLRRGbjRD4MgZNEzSqKG+ZgobI2248dUbDDDwABzcxSEHEFpgEcUcdMRRhx1fFejAAx0cgcYdSxiBRx566LEHH0d8QFRRNC3Uhx985CHEH0MAEkhCBxWkgiCDFEFIEYUYUmONMhyCRxVH/PgjBYioYJAdAQEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-editcopy22:edit edit22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBBQSFPz+/DQyNISChDw6PMzKzMTGxERGRIyKjFxaXMTCvKSmpHR2dPz6/Pz29PTq3MS2rPz69MTCxFxWVHx6dJyWjNzSzPz27Pzy7Pzu5PTm3NTKvIR+fJyGfHxuZHxqXNTCtPTq5PTi1PTezNS+rExOTFRORMyylPTaxOzWxOzSvNze3NTOxMy2nMyulMyqjAQCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbYQIBwSCwahYGkUnk0BgTQ6IAQaBKfUWhBYKhaAU+CgXAQIAyChLeJzSIQhcH6GFaM0QtGY5kstqEODw8QEQELAhJTc08KBBMEFBUWDRcBE1pca20SGBkaEBscAY5maFRIAgoLHRQRHh8gIQFlZnByqA8ZGSIQIyQjJQEmYgJ5p2ACrK4gJx4gKIZZAgdeAQ4ZI9kjKSor0AwEjeAs1S0cHAslLi4vMDDRWeRIfEsxMeET4ATyVoYLC5fizXEiAR84BeMG+pEm8EsAFhAjSlR4hR6fLxiF0AkCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-editcut22:edit edit22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBAQCBAwCBPz+/OTi5JyanOzq7DQyNGxqbAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARbEMhJq704gxBE0Bf3cZo4kRJqBQNRfBucyudgvJS6VaxLzyMa6/bLiWA9HOg4VIIkL5vzuRkcpkvRIIAorphJLzBW84WEuRZWp6uaT7J2Sh1Hit3OY/ZO7WvsEQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-editdelete22:edit edit22 22:photo:22 22:R0lGODlhFgAWAIYAAASC/FRSVExKTERCRDw6PDQyNCwuLBweHBwaHAwODAwKDAQCBExOTNze3NTW1MTGxLS2tJyanPz+/Ozu7BQSFCwqLDw+POTi5PTu7MzKxIR+fCQmJPz6/Oze1NTGvPz69Pzy7Pz29LyyrPy+vPyupPTm1BQWFIQCBPwCBMS6rPzSzNTOxPTi1NS+rPTezNzOxPTizOzWxMy2pOzaxMy2nPTaxOzOtMyynOzSvMyqjPx+fOzGpMSihPTq3OzKrOTCpNzKxNTCtAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf8gACCAQIDBAUGBwgJCgsLgpCRAAwNlZYODxALEY+SkAMNEqKjEw0UD5yegqCjrRMVEqidkgWhraMWF7GptLa3EgEWFRSOnhW+vxgZEBqzkBvItxwdHryRCNGjHyAhHSLOgtgSI60c2yQjJd+eJqEnKK0hJCgnJSngAO0SF+8qEvL0VrBogW+BLX4oVKgIyMIFQU8KfDV4R+8FDBcxZBREthAFiRIsOsygsVEUh4Un3pGoUcPGjZInK65QicPlxg8oX5RwqNJGjo0hdJwQ6EIkjRM6dvDYCKIHSBc1Ztjw4eOH0oIrsgIJEqSFDBo0cuTgsdSTo7No0xYTZCcQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-edit22:edit edit22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBISGhISChHx+fHx6fHR2dGxqbGxubGRmZGRiZFxeXFxaXFRSVIxSLPyuXMzKzMzKxMTCtExOTPzqrPz+/NTS1MS+tOSaVPyWNPz6/IxeNPzavPyKBNTW1PyCBPyGBJxmNPzOpLx6PNRqBMSCRNySTPyCDPSGBMxiBKROBHRydPSylOyydMxmBJxKBAwODPS2lPTq3OyabJxGBPTy5PTGrOyOXPR+DPz69PzmzPzevNxuPORqLMReFPzy7MyCXKxiNIRKHBQWFNTOxPzixJRaPFxONHRqVPz27PTy7PzStCwqJDQyLJSGdIx6ZPz29PTu5HRmTLSKbMSGZHROPFxKPJSKfJyShKyehMyuhDQmHEQuJJyOfLSijMSynMS6pLSefDQyNHx2bKSahLyqhLymhOzi1FRGNIR+bNzKtOTOtOTKrOTKpLyedAQCBFRWVPTq5NzOvLyunLSmlNTCrOTOrNzGrLyidMS+rLyynKyijLymjLyqjAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gAAAAQECAwQFBQYHBggJCgsLDAwADQ6CAQ8QD5ydEJ+gERKWE4ICDxSpqhWqqhYNFxMYphCtqaytGRoXGxgcggSoth25u70eH8APFR0VzMzNziAXIRjIvwAFwq3EqSLUGB/iI4LathS4JCXVJh8nKCmCKrXDFCss1eIfLS4v8ssdmgWsAGNDDBnt3s3wJ+jAtlUhaNSwccNEi4WCBBl4SAHHihw6ZOzg0QNjRgAG6KXK4CNEjBU/gDQI8kLISQAIADobAoMIzCINjLw4YvNkAno4kCRRUuNHESNLmDRxUjSjAlRPfECJImUKlSpMrFzBIqWqoKtJaWSJomULAy5XXrp4+QKGYcYFoCBEWRImi5gmY7CQyVLGriAGD2jEMHMmCxc0Xb6kUbOGTRs3N988gLM4jpw5Y+iwqcOGjZ07mE8yiGABz5c8c/Ts4cOnDJkybS7fdMO7t+/fvDMaCAQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-editpaste22:edit edit22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBBQWFDw6FHRuFGRaBFxSBAQCBAQKBCQiBIx6HPz6/NTOfKyiXDQuFOTm5Pz+/Ozu7PTq5Pz63PTyxNTOjKSeRExGLMTGxMzKzNTS1NTW1Dw2NKSmpKyqrKSipJyanNzWlLy6ZLSuVIx6FISChIyKhJSSlCQiJLS2tDw6NDQyNCQiFCQmHBQSDGRiZHRydGxubHx6dGxqbFxeXGRmZFxaXCwuLOzq7KyurHx+fDwmFEQuFCweFCQWDBQODBwaHBweHKSinJSWlOTi5JyepHR2dDw6PBQSFNze3ERGRIyKjIyOjISGhPz29Pzy7MS2rMzOzFRWVHx2dHxybDQiFPz27Pzu5PTq3PTm1NTCtJyGdHxuZHxqXPzq3PTaxNS6pFxWVFRKRNS2nPTi1PTStNSulNzOxNSynMymhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCgwABAgMEBYSLggaOjgcICQoLDA2Pj4MGDg8QEZ4FDxITFBUWFxcYGRobjQ8cHR4fCQ8gCyEiFSMWJCUkJieNEB4dKB4pKissK8wrLS4vMDHBAAYQHx8dFx0fJDIzNDU0M+IyHzaNNyg43Ng5Ojs7Ojw9Pj9AMkCNDiZB/h9CSOx4QLCgihItqBkYgqIDESElitAYWJCgkQcXjjRCgi1Ihw4BB5LAQOLCgyQYHihpUU3DBw5ElpAgAYNixSRJjKjQaECDCRPZPDB5IbIGSQwKLnh4wbInLA4kmJB4oaPiAwVNnER40hRK1BIAaVatUZJEFCkmpmjgCeWDCalFe4q4oFKwSRUrEa5gycLzwq8lUnPQ4PEgSpYcUZ5o2cIlS1O/JHLEDdfjQZMIVrpgweLFy5e+M6WSmBGlxYMYYBRzCaOFi5imHWBIfOEiShLTVjaP6eyFTBmN1TA5OvLDjJksWb58OVMGDRqWjAYdmU79SIvpjqJr104nEAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-editshred22:edit edit22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBFRSVExKTERCRDw6PDQyNCwuLBweHBwaHAwODAwKDAQCBExOTNze3NTW1MTGxLS2tJyanOze1Pz+/Ozu7BQSFCwqLDw+POTi5MzKxPTu7LyyrIR+fCQmJPz6/Pz69Pzy7Pz29OzaxPTu5PTq3PTm3My6pPzu5PTq5NS+rPTm1PTi1PTezOzWxPz27MyynOzSvMyulOzOtOzKrMymhOzGpAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbpQIAwIBgMCAXDAZFQLBbCqJTRqFobjgdkEYFKowPJZEyeUBqVR/crHDTKZYplovZKCW84+YKZZNZSBXl6EwEEBhVPXxZihGMaGRscdkIdg4QeEnVfCH2OHyAhIhuUAAiXZSEhIyQlJqWnjiEnKCWupRWoYyEgJK0SKaUKjam0JCorLMFfC6iqx8giLa/MGAsT1wsuCyULKwssC9RSzdkfCyALKuALLQsvpeXYIQso3gsiCzALMfENC+dGcMNHUAY/f+jq3ctncMYCGggFrsvHcEGNh/EyPFmg8cmrJxAVkVO0EUDJklHoBAEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-edittrash22:edit edit22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBERGRExOTDQyNISChBQSFCQiJCwuLPT29Nze3GxqbDw6PGxubHR2dJyanLSytJSWlJSSlOzq7Pz6/Nza3Ly6vFRWVBQWFIyKjMTCxHx6fIyOjLS2tOTi5PTy9OTm5Hx+fNTW1KyurKSmpJyenExKTMzKzKSipFxeXCwqLMzOzKyqrMTGxLy+vHRydBwaHNTS1DQ2NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAb8QIBwSCwaj8KAMoA8LgUDQsFwQByay4RiwWg4GA9IRGk0SCYJSsUCsVwwGQ1EsmESD5xOp+L5gDwhBRIZDhcDdkMGDgEiIxAkJQ8Ok5MmAohDAQ1xJxUlKCUlEg0pKpiZJRoLCxmtCw1eURhOcR4rbQ8cGRwLAwgGtBYTDywtGRKjvQTARgEZLhMcKC0OrQMvAirMRc7CHCTU1g2+20TO0NIn1RwDCya/wdHT1Rnt5LToKOq79trx0tR02YPX7Jm8fRxMOIhSLhOJE/LCJSTlr5kFEBQsWDiR4UGGBgsuHDg1BEYAfTE6oEBR4AIBAiS5yWBAAAGBAyaPGAgCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-fileclose22:file file22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBERGRERCRDw6PCwqLExOTFRWVHRydGxqbGRiZCQiJISChIyKjHx6fDQyNBwaHJSWlKSipBQWFJyanPz+/JSSlCQmJAwKDCwuLBweHBQSFGxubExKTISGhDQ2NFxeXFRSVDw+PAwODAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbZQIBwSCwaj8jkMSAYDAgEJbFgOBwQCUOAoJAaFgvGonHIBhyP5BcSgUAYDWxggD4WFmx3e3HQngkSRgYMEBMUFG4MCId0BGlEAQeEhocVDYcUdBYKF0QCB3gRlJgUAQEYBBkaRAMbDZMMpAYcT46rQwMJrgsdC6QcfwoPnUMOBgkIV6SHHg6bw0QEAQYfBpggBZjPGsRD0gEchxwCIR6HChnQRQ8DIU4DTR4Em+ncRw8O+fmoXPXdRg+gQLFgIYM/KRIkoDP4QMKFf0o0aBAh4qGUixgzCrETBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-filefind22:file file22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBBQSFJyanLS6vLzCxISChNTe3OTu9Oz6/Nzy9Nzy/NTy/OT2/Nzi5Mzu9Lzq9KTe7LTq9PT+/Pz+/Nz2/Mzu/Kzm9Jza5HzK1LTi9PTu9IzW5ITO3FxaXNT2/KTi7Iza7GzC1LzW3FRSVMzO1MTq7HTS3Fy6zFS2vKzm7Lze5MTGzHzS5FTG1Ey2xEyyvJze7JzW3ITa5FTK3EymrGS+zFxWXKymrMzi7ESirEyqvLSyrKze7MzOzMTCxKSepAz+/NzW3MzKzBwWHLzS3ERCRAzi3KyurNze3MzGzLy2vLSutCQiJAyytHRydOTe5MTGxLy6tLyqpKyelJSCdOze3NS+tLyupLSmnKSOhCwuLPzy9Pzu7Oze1OzazOTOvMyihOTi5PTm3Pzi1PTazPTWxOzOtNSunDQyNPzy7Pzu5OzKrNzSzNzGvNS6rMyynMymjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCgwGFhYOIiYQBAgMEAwKHiokBBQYHCAkKCwwFAZOEBQ0IDAsODxARCZ6gAAEGEhMSFBUWFxgZCJ+TjBoMEpkRERscGBGRih0BBAgeFBQOER8gISEfIruIIwEkCCUVwhcgJicoKSrZg9srCRkRGdMsLS4vMNiK2wIKMRsbMiwzXtCocSydIBs3AuCIwIFDiBMucugAoWvSiB2VNPDg0ELHwA0MkCXr4aNSggg8NoDIQOFHgBtAkgURMiDAEAFEVBCJFKCIkSMGOyDRkETJEkOFmABoUsRJQkQdnkzQACWKlBtTplBR6qopxkFRJ0ytYuWKFCxZtBBq+hRA2AlbRrh08fLlCxi1a51g+dQhDFwuYsaQKWPmDBpKXgNETaNGjJgyhNfcVdTTiWI2XpK0cePmzRk4YA5T5otGixY0qFOXbgXAQCAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-filenew22:file file22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBExOTERCRDw6PCwuLBwaHAwODAQCBOze1NTW1OTi5Nze3MTGxLS2tJyanPz+/Ozu7OTi3BQSFCwqLDw+PDQyNFRSVPTu7MzKxLyyrIR+fCQmJPz6/NTOxPz69Pzy7PTu5Pz29Pzu5PTq5PTm1My6pBQWFPTq3PTm3NS+rAwKDPTi1PTezOzWxMy2pPz27PTazOzSvMyynOzaxOzOtPTaxOzKrMyqjOzGpMymhPTizOTCpNzSzNTGvMymjMSihCH5BAEAAAAALAAAAAAWABYAAAboQIBwSCwaiYGAYEAgFAqGg/Q4DCASCsTiymgcHAcqQLB4mM+QiIQBppLPcMjkwQ4bB2X4maKgt4sVCHpnFhQTElNFE3mDDxcYGRp2RBuMgxwIHX9EBZZwHh8gCBmTQ52NISEiIyQlpUImng8hHyInKAgprwAqgnC0IKwrLLpGB4wctLYkwy0uuwd9Z8AnJywsLcVFx2YcL7UnJCwwLTEy0GXJoSgrCCwzNDTnxgjeH9UrKzXwNDY36LRGhEOwLx4NHDmgJbh3QoeOgv127EhojEeHDj16pEhRQoZHHzl+QJNCsqTJSXaCAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-fileopen22:file file22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBAQCBCQWDCwaDDwmFPSubPzGhPzCfPy2dOSmZPzKlPzSnPzOlPzKjBQODPzChPzWnPy2bPSmXPyuZOyeXIRSLEQuFEwyHEQqFDQiFCweDKRuPFRSTPT29PTy9Ozq7OTi3Nze3NTW1MzOzMTGxMTCxLy6tLSytKyurDQyNMzKxOTm5OTi5Nza1NTS1MTCvLS2tLSyrKSmpJyenJSWlIyKjHx+fFxeXBwaHKxuPMzKzLy6vIyOjHx6fDw6NPy6dGxubLy+vISChCQmJNza3KyqrBQSFLR2RKSinJyanGxqZAwGBJSSlCwqLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4SFhoeDAYqKiIeLj4wBjQCMhY+NkoiLk5qbhQIDoJyGBAUGBwgEo4MECQoLDA2pDrS1tKQPEAwHERITE77AvxKqhAQNDA8UFRYXFs8YBAQZGqGPxw0RGxwdHR4eHyAhIiMkJSYnKCgpBAYPEhcqHyssLS4kLzAxMjM0NTY3cBA4UCAHBw8gVnhgEcKFjhc7UPDj0cMHAAI/KFgY4YLFio/jRpTYsW8GDyCSCEQw2DChOHIqgsCQSEPIEEEEJFhAoUNECCJEyOk4d6KIyRtGcB7hIJKjixEjHu4oimSGEIs4d8IIUoKECnNB0ElMwkNJJgBLlJBAcQKGiR07KGAURVGViY0mhIwwSTKjr99+THjUoIg0r48hTRIrRtxkiOMhDgrZCQQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-fileprint22:file file22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBFxaXDQyNFxSTPTizOzi1FxORDw2NExKLPTi1Pzy9Pz6/FRWVPz29Pz2/PTy7PTu9OzezPzu5OzavAQCBPzy7PTm3OzazOzKrPTu5FxSRERCRGReXPTq5Pzu7ExGTMS+xKSmpOTKpPTq3JSCDNzSfHRydLyadOzCjOzOtOzSvLyyTMTCxKSipGRiZFROLPz+/KyurJyenJyWnGxmbLSabOzClOzm7LSutJSWlJSSlJyanGxqbNze3OTm5IyGjNTO1Nza3NzW3OTe5IyKjHx6fMzGzMTGxMzOzNTW1IR+hISGhKymrLy6vLSytERGRGxubKyqrLy2vLS2tDQ2NEQ+RASKBAT+BFxeXHRudAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4QBAgOEiYqEAgQFBgcGi5MICQoLmAQDh5OEDA2YCw4ODxARApKUCaGYEAsSCRMUnQysCwoVEhYXGLOLCBCgDqK5GQUXGooCAhscBB0euBUZEAUJvQgIgx8gIR8iCSPiHuIFEREDJCXaANwhJhsnKCnWERcRKiopFCvsBywhQrRwQWGAPAz5EhpQ9wIABRgKYsiYMTEEDQocatiwkUIEP18fbkCAAcMBjhwzdOyQwYNCgBMfKJSgMItBjxs+btwgCSGGjhw/ZoRgQKGZCRMUPgABEgSIkCE3SZok8qNqkR85NtDUEcPIkaVAkCR5SrJBDCVKlmzQ6pCCiRlMTJo4YUH3K5AeMBYYWctW0BOaUH60cBJFypQmII6wyEpFQBVFMSm4UAI3hJUrOGh8oOJrklYKWIromJGDR99Ogz5j4ZGlM+pEnwmBCwQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-filesave22:file file22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBGxqbAQCBLy+vERCRExKTHRydIyKjMTCxFxaXGRiZFRSVFRWVPz6/Nze3Nzm5Pz+/JyanDw+PExOTHR2dMTGxBQWFLSytHx+fISChOzy9Ly6vAQGBJSWlMzKzAwODJSSlHx6fIyOjOTi5DQ2NISGhGxubCwuLOzq7ERGRFxeXNTW1CwqLPT29Dw6PGRmZKSmpAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAb/QIBQGBAMj8ikUDAgFAzKKCBwQCQUCcICKh0SEAhGw5EIZAmBrgCxeDQgcDJWyz0GIggJfL+XGwQJRxNgC3yGDwwUFUZDFhdthnwMGAZNQwEZFwQakXANBBQbHIIdERIBnRAOiR4ERx8gsSEMBBmGCyEGG3YGBwcgIr8UCwQHECOgG4xCtRkEJAvBJRklJgkSFBQeJ68hJiEoESkFKiEZIbkGARsLlwEGExENGhorGSkpFAYm66NDLAECpGiBYsUIFA8wLHBBQMWLVkdUCFCwaYVFBOymkVCgYEMgOykEpICBccMBAhhELFigTEqAAgIIwCiQ4eRKDyS6EAlJIAI0EpaudF4iIKDAAn9CkRT5eMROEAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-foldernew22:folder folder22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBNzaTPT2FISCBCQaDPz+BExKBDwmFPSubPzChPzCfPy2dPz6BMzOTAQCBOSmZPzKlPzSnPzOlPzKjBQODPz+rPz+3PzWnPyuZPSmXNyaXPTyhISCLIRSLEQuFEwyHPy2bKRuPFRSTPT29PTy9Ozq7Pz+xJyanDQyNPzGhMzKzOTi3Nza3OTiVBQWFDwqFKxuPOTi5JSSjISChHR2dGRmZFxeXPS2dNTSzNTS1OTm5KSipLS2tLSytKyqpIyKhGRiZNze3NTW1MTGxMTCvLy6tIyKjCQmJMTCxMzOzMzKxJyenHx6fLR2RLy6vJSSlHx+fDw6NLy+vIyOjAwGBGxqZKyurCwuLBQSFJSWlCwqLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4SFhoeIiYqLjI2MAY6HAgOHBJYEhJCDBQaDmgcICQoLB4MGDA0OAQUBDg2cAAcPEBESE6QUuQasFRYVq5SxCRcSCggYGRjIGgYbFs8bHIMHExIJGR0eHx7cB83PFhsDDuTUEyAhIiMjJCQluwEmvsAnKAcp1x4qKyUrLLupWrByxcnFiwQIYIggEaNEiRgBZMyYQaNADRs2REA6cCODBxw5+OnQgWMHjx4+BND4MQOIg1gI0gUREkTHiplDhhApEoCGkRlHBL3I8MEHEhz+WAhJogTJySVMfthwIehAExE5jubAkYQpESc8fOx4AiXKNA8+ekhBgqSpzh5hPHcsmVLjpSAqVZBY6VGkiJMiPQKLnTvjCiEsWU4o3nGC8YksMmT8YCmC6iAXKLRc2cz5yGYtR0JjKWQgEAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-mailforward22:mail mail22 22:photo:22 22:R0lGODlhFgAWAIcAAJR6fIxydIxubIRqbIRmZHxeXHRaXHRWVGxSVGROTFxGRFxCRFQ+PEw6PEw2NEQuLPwCBJR2dLyijPTixPz69Pzq3Pzy3Pzu5PTu7Ozi1LyelOzavPz+/DwqLLyafPTmvPz67Pz29Pzy7LSWlPzmzPz6/LyajPTitOTSzMyurPz25PTatPTi3KyOjPzuxAwqVDQiJHxiZPTetKySlPzqvPz27BQ6bAwmTPTexLyinNzGxDRunPzy5KySjCQ+ZNzq9KTO7JzC3Nzq/Ozu/LzW7FSm1BR6vGSWvFyq1AyGxAxytAx6vBSKxAxSjMyujLSunES+5BSi1ByGvAQCBNzCrOTaxNTOvMS6rKyelCx6rBx6tBQKDOTWvPzu1PTq1OzezAQOHAxGdBROhAQGFPzy1NzOvIRqXLyynOzarPz21Jx2XPTWrLSShAw2XKSCbPzuzAwePAQCDPzyzPzqzPTmxOzWtAwGBKyObOTSrNzGrKyGbOzatEQyNKyCZOzWrOTGpNS2lCweHCQaHCQWFBwSFBQODAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABAALAAAAAAWABYAAAj/AAEEEDCAQAEDBxAkULCAQQMHDyBInBhBwgQKFSpY0HgBQwYNGzh0mDhRAAUPHziACEGBpYgRJDiUGEkSwoCQJk6opNASRQoOFETQJDkggwoOJlYApcCihQuVL2DUhBDjhIqjJmRwwDCDhswaNm5MjYHjKggOOU7o0CGTA9gdYknG2KCCBw8VJVL0uBgihAUfP+CSNGCjsI/DiBPbAMJBsEQbQYQM+UG5smUiRYw0jlvYxhEkSYyIHm1EyRLTTH40EZvAyZPOR4pAmU07ipIkUKQ0mQIhAZUqVq5gKXzkSBYtyLVEyd1ki8QFXLp4+WJFQowbYLJnD5NbzJiJCjaQnhnvpYwZM0/OPFlvQ/f3iQvQpBlvQc0aCWy4VKnCpY0Y5yQxgEYXZFjghgwZUOHGCW90YQEccUwloBwGyjAHHXUoSAMZb0xhx1QOoMHDHSfIwSEOdTjhAQ1d4MFbTQ6Q4MYacrzxhhx04JCHHhvQsMeLJPHRBxpr+LHCGnusgccfgKixQR1ATtTBlDDAEIggggxCCCGFbLGFHVFKZEdAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-mailget22:mail mail22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBBQ6bCQ+ZAwePKTC5Ozu/NTi9GSWvAwSJGSu3JS+5CR+rAQOHPTy/AyKzES23AwOHCw+bOTq/BR6xES+5AwmTBw6ZMTW9Ax6tByi1BRGdAw2XAQCBDQuNDRupKzS9FSm1BR2vBym3EzC7CSGxBROhNTW1Pz+/OTm5NTO1AQGFNzW3Ozq7Ozm7IyKjJyWnMzOzNzq9Nze3OTa5Ly6vCQiJGReZISChKyqrAwqVBRWlOTi5MS6xJSWlNza3OTe5Ly2vGxmbKymrIyGjMzGzISGhKSepCQmJDw6PHR2dJSOlPTy9MTGxLy+vLS2tMzKzLSutMTCxLSytKSipJyenKyurJyanCwqLCwmLCwuLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4IBhgIBA4SLjAABBAUGBwiNlY4FCQoLDJaNAQ0ODwsQnYwREhMUE5ylFYYRFhcYGRgaGxsDHJUdFR4SHyAhEyIjJCUcuo0cJr0nExihxgwoyYscKSnMHicOIw4lKissLdWDHC4vMCu9McYqMjMyNOUANTY3OPEoOTolDCszdrSgwaMcBxs9TMxYOCMHBx8zfPj48QNINQ5BbMBIIUShDIUoTAhR94PHPEEHbQwZckOGjBQviMxYUWQIDCMmdXE4gqRnkiFETAxR8iKFjJU2evZEdmLJkgJIbqS4wXJIUapImj5FtuSEVyRVV1IVi4RIChhEkLVAgcJHEqVwVJUmYdKkiRNkALMRecKECRG/ff8CEQJFCA5kMKJEoUHDCQ/HkB9LmWKECpUeyKoIMSLEyosen0OD7iH2xg1dV7BkqXGlBpbWNTq4Zn2khu0aAAwEAgAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-mail22:mail mail22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBDQyNCwqLCQiJBwaHBQSFAwKDAQCBDw6PPz+/Pz69Pz27PTy7PTy5PTu5PTu3PTu1PTq1PTqzOzmzPzuvOzitPTmvOzivAQGBDw+POzevPz67Pz25Pz23Pzy1PzyzPzqvOTavERCRKSilPz21OTevIR+ZExKTOTi3JyanLS2tPz6/Pz65KyihJSKbMS6lExOTNTW1JSWlJSKZMSylNTOrNTKpFRSVPz29MTCxPTmzKymjIyCdOTWxOzexOTWrBQWFFRWVOzu7MzKxJyalOzatLSulMzKtOzmxOTarFxaXKyqnPTmtIyGdIR+bOzetOzixBweHGRiZOzm3NzWzNzSrOTetGRmZOzizOTexOzm1JSKdGxqbHRydJySdHR2dOzapHx6fKyijOTixCwuLHx+fFxeXERGRDQ2NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4SFhoeIiYqLAQECjwORAwSUBZYFBpkHmwgJCgsMDA0OD6UQERITFBMVFhcVGBkangq1ChsLGxwcHQ0dHR4fICEGIiMSCbS3uLq8wCQUJSYGJygpKhQJKyvLLM4Nwi0uLwUwDQsxMtmeuQveHR8UMzQ1NgU3Dgo41jk6ns0cKOzgYaOHjx9AgjTAUUvIECLZNmxoUISHkSM9KiBJQkCJA4kKEoBQoWJJAiYtmjh5AmVCsCJRpHzckKCCySlUUvBYUqUHDysSPnxIEuXKA5pPRiRwxwFLFhRaIEDYUoEChCcDuECoOWKFuwW7nHkg4WELkw8/BHRRwESpt10dU8SSHevlRxIBX6C0WBE27q8GZMkKbTADjIAwYlb4GLMYShYoPTRo6FGiSJEKPyzMIFMmzJcvXbhwkSLFjJkbQW6cOHNGhAgEAdAsmk27tm0ABgIBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-mailreplyall22:mail mail22 22:photo:22 22:R0lGODlhFgAWAIcAAJR6fIxydIxubIRqbIRmZHxeXHRaXHRWVGxSVGROTFxGRFxCRFQ+PEw6PEw2NEQuLPwCBLyejPTixPz29PTu3Pzu5Pzy7Ozi1LyelPTavPz+/DwqLPz67PTetPz69ERCRLSWlPTmzPz6/OzexLyajPzqvDw+PDQ2NMyurDQiJPz23PTatJyenAQCBPTevPz25LSajOzq7HxiZPTexPz65JyanBQ6bKSmpBwuTOTi5OzaxBRCdHySvGRiZHx6fBQSFERGRNzq9IyOjHx+fGxqbPzu3BwaHFSq3Aw6XAxKfPzy3Gy63ByWzJzO7Mzi9OzavBRytAx6vCSazGRKTPzy1AQKHBRGdBRyrDy63ES+3Cym1CR6rBwWVAQSLAx+xCyCtBRmnPzuzAQWLAwePPzyzKSCbAQOJByGvOTWvPTmxBQODFQ6PPTWrPzqzOzatAwGBKyObLSWfPTivKyCZEQyNKyGZOzWrOzWtOTSrOTGpNS2lJx2XDQmJCweHCQaHCQWFBwSFBQKDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABAALAAAAAAWABYAAAj/AAEEEDCAQAEDBxAkULCAQQMHDyBInBgggoQJFCpkzGjhAoYMGjZMpMghQgcNFjh4mODhA4gQGkSIHAmBwAgNJEpo8KDSxAkUGjhMSEGz5gUVIiKs2PmBRQudHiwQpUnAxYsXImB0aBqjBcuoU0fKmPGChgUNH2qIqGHjg9u3bicWIFs2rYgbNnDkyGFhb8cccQ3ouJqWQo0dPFr0WMy4h48LFj4gsKriB5AeNngEaSGks+chPnwQOXFAh4oXRYxk9nAEyY7XO2wksWHDx5ATCDIoUXEBsYclTJo4cWJhuIjhSXacSPBEiZLMQY4wgRKluvXqUpyIsDElAxUqVaxcwcGCPQuWLOixaNHCZAsXBU+oqKDSxQqULF6ifNmyn/8VMOtxwcAK36kQRhdJQIFFEmKM4eCDYGyhhYAEkqFEGSuYYcUZLaDxXRpqSNRCEu6twYaFZXTQhgRd2NCCG9918AYELTjoXgNuKAFHB2RQEUYHVbQQRwlUpPHGGFwkyQUEDsgxx4lh9BhCBy2U8UQJcrSg5JIQ0FEHG3bc0QGYK+CRhx57PEGlkhM9sAEffKTQhx9+/AEIIIGoEUgLLRRFR0AAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-mailreply22:mail mail22 22:photo:22 22:R0lGODlhFgAWAIcAAJR6fIxydIxubIRqbIRmZHxeXHRaXHRWVGxSVGROTFxGRFxCRFQ+PEw6PEw2NEQuLPwCBMSihPTixPz69PTq5Pzy1Pzu5PTq1Pzy7Pzu7Ozi1LyelPTavPz+/DwqLLSajPTetPz27LSWlPzmzPz6/PTexPz67Pz29OTSzMyurPz25LyajBRCdPzuvDQmJOzexPTevOzq5BQ6bBwuTDQiJHxiZPz23Pz65LyinPzmvBxCbHySvAQCBOTi3OTq9CweHOzaxFSq3Aw6XGy63ByWzJzO7Mzi9OzavNzq9BRytAx6vBR6tPzy3AwOHDy63Ax+xCSazCym1CR6rBwWVOzizAQSLES+3CyCtBRyrBRmnGRKTPzu1MzGtAxKfAQWLAwePPTizMy6nByGvNzWxOzWrNzOtBQKDJR2ZNS2lPTmvBQODPTatKSCbOTaxLyqlAQKHFQ6PPzyzPzqzPTu1PTivOzWtKyObPzuzOTOtLSWfPzqvAwGBKyCZPTWrPTmxNzKrEQyNOzatOTGpJx2XCQaHCQWFBwSFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABAALAAAAAAWABYAAAj/AAEEEDCAQAEDBxAkULCAQQMHDyBInBgggoQJFCpYuIDBQgYNGzh08DCR4oQPIDqEmDBhJQYRIzqQIFkSAoESJCKkDGFiwgkUKTpMwECz5IASKjqsSMlSA4sWQjG4qGnzhYoQSmF0iCFjBgmWGWhQrVHCxg2sOHLo2MGjB0sLYmsWQHq1p4wdPtqemGDhB1UDQFSouKHi7oQgQmSwUMyYxcQDZQWz2EFiCJEiRoyQyLzZyGIIB47YKLwDSRAiSZSoXq1kCRHNLBK8YGKjCYskTp4ogeKkt+8oUaBImZKAAxMmVKrctqL7ihTnz7FkAT5FC4cKFbZwadIFdxcvX8KLss8iJcoUBUcq2KgAJoxyMTy4jCFTxoxEHl2GLyCDncmWM2hUIQMPY2CXhhoTfTEcA2tgVwEba7Thxhs88FdBD/ZB8MUUHMJBRhw2sAGCHBKU4UaFc1RAhxnhcdhhHUzYAUIcFdxRAh4R5KGHinu4OIVEDqTBRx81xhGHHzD8wQYQetDRI4cTAcIHGWT0EQgZa1ApCBqDcBAID1Q94IEHLtBAAyGEFGKIIWqYYQYPYNZkQEAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-mailsend22:mail mail22 22:photo:22 22:R0lGODlhFgAWAIcAAIR6fIRydHxubHRqbHRmZGxeXGxaXGRWVFxSVFxOTFRGRExCREw+PEQ6PDw2NDwuLPwCBLSijOzixPz69PTq3PTu5PTu3PTu7OTi1KyelOzavPz+/DQqLPz67LSafOzetPz27Pz29KyajPTmzPz6/NzSzLyurCwiJPz25Ozi3JyOjPzuxBRGbAwSHOzexPz23KSSlPzqvBROdISavBxSdAwaLHRiZLSinNTGxMy+vBxGZNzu9BSGrAwWJMSyrKSSjFy61ETO3BRWfPz65PTqzHTK3ByqzBSWxEzW5AQWJOTWxBRCXOTu9BSOvDzO3ByavBRKbOzaxOzizKSWlCQ2TAQCBJza7BRWdNzSxJSCbMzq9BSOtCSKrAwiPOTavPzy3LymlCySrAwmPFRKTPzy1NTGrPzu1JR+bOzatPzyzCy61ByGpOzWtJyCbPTmvPzuzIS+3FymxCSuzBR6nJyCZOTWvKSObMSujOzivAwKDOTSrNzKrJyGbDwyNOzWrMy2lIx2XBwWFBQSFBQODAwGBAQGBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABAALAAAAAAWABYAAAj/AAEEEDCAQAEDBxAkULCAQQMHDyBInBgggoQJFCpYqMDxAoYMGjZwmEixg4cPGzqA6BBiAggRIzaQGEkSwgAMJCKgnNBhQogSJlKGOFHTpgYUG0TsnJBCxQoSE1i0KErAxYsOJJRuuAAjhkwZM2jUqGnDBQoUHTbciIEjx4YNOmbs4CGjB8kCZlGAALHBx4+YcTcACcJDyFSJBo6iGNIhhQkiG8BOKGLkCBK6SSQisHoWhZIbG5bMYALECI8mTZw8gTL1QJQXZ6VMiUylSpUlVpoYaXLFtm0EGmCjwJLlA2O9MrRsccKlC8kEXr7AdgEmwtkhX2SQ2BIkjBiSYzSQr/nyhUKZLIrJJOcexvlEBV7IvCBjRkmAMzHOaufhxDvJBWiQISAFxUUQQRovJNeEGmu4JxEDbKQhXxsfuFDGGW68IQMcccgxRxUkNRDhC3R8QMQIdZwXQ11JJGFbiB+QYccHaaTxhgt13OFBDGTgkUdRDrhAhx5k2JjGCB/swYcXMXwAYk190OGHHx/4wUaVepTxByAaoPEkSQ5wwMEJZAZipiCDDJIHIYV8OZEdAQEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-nav1downarrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBBQSFAQGBDQyNExKTHx6fGxqbFxeXGRiZFRWVDw+PAwKDJSWlOzu7LSytJyenJSSlISGhISChIyOjFxaXDw6PPz+/MTCxLS2tIyKjKSmpKSipJyanAwODDQ2NHRydERCRFRSVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAZzQIBwSCwaj8ikcslsOp/OgHRKlQoCgymRUDAcEIkwYgxWFBYERpHQcDwgEclEQmk8DhWL2kiIXDBwExMNGRoJaUkEEH8bEQ0cGgcWAksEHX8QHBKSHk1sfxMHH5ROBBsOICGkT2wiq1CIULKztLW2t0h2QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-nav1leftarrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNAQCBExKTJSSlHx6fAQGBOzu7GxqbJyenPz+/LSytFxaXMTCxGRiZKSmpISGhFxeXISChAwKDFRWVHRydJSWlBQSFERCRIyKjDQ2NIyOjLS2tDw6PBwaHFRSVDw+PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAZ5QIBwSCwaj8ikchgQLJGBgfNZDBAKBirRekBMtYGEYsHIgsWNhOO7tCrShDU18Hg/CJAIG0o4wCUQcksTFBUSCRYSEnpUFxgIGQkJGYyNGggbHBaVjR2QCxEeWkITHQ4IH3tPFwEMA2ajAKUgqlQTTbFEE7W5vUgGQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-nav1rightarrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNGReZAQCBMTCxGRiZMzGzOTm5LSytPTy9Pz+/CwqLOTi5Ly6vCwmLMzKzJyanJSSlBQWFKymrIyGjCQeJJyWnISChISGhHx2fKyurDw6PAwODHx6fHRydDw2PERCRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAZ2QIBwSCwaj8hkMRBQKgOCgRMZIBSk06XhEM0SA4iE4uoVLhCMhqLrdSAekMgYO5VM4BQ521mxIC4UFxBWdEkSERYYFxETGQGFSBKCGBEaGRuQSBwdeZaPXpsQCB6YZQMdEI6ZSgMepKusHh+wrCC0rLdlursGQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-nav1uparrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBFxeXDw+PMTGxHRudPz+/JSSlLSytIyKjHR2dISChIyGjIyOjLSutLy6vKSepJyanISGhJSOlOzm7Ozu7MzGzKyurJyenDQyNGReZKSmpIR+hCwuLCQiJBwaHBQSFAwKDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAZtQIBwSCwaj8ikcslsOp9QYyAQFQYEAyr0Sihkn1fDAeHVLsOJNELxVaITC0bDUU6GH5AIQ8KYrNtFVxQVFBYWFxgRCREYdUQZGhYEDwgIGxAHCQocCgWOQhmhGR0epR8gqCFTq1Wtrq+wsUt0QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-nav2downarrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBAQGBBwaHDQyNExKTHx6fGxqbFxeXGRiZFRSVDw+PAwKDJSWlOzu7LSytJyenJSSlISGhISChIyOjFRWVDw6PPz+/MTCxLS2tGRmZDQ2NAwODJyanKSmpKSipIyKjHRydBQSFERCRExOTFxaXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAasQIBwSCwah4FkQKBsDpoBIqFgOCASCYRWm1AUFgRGkdBwPCARiWRCaTwOFYvYSIhcMOiJpJGZaDYcR0IEHXceEQ0fICEWIoJDhHcQHxIHgI9SEHeVG46YUh8OISOen1INCqWmUnOYTUxQAU9NUlRWWFtbCiRgrYNlZ2lriG8lYUd1khETE24gCZeCkRgeFBAQIAeNn9OTlXKrBJoYnKrcoaPmpmSpq3S+7u50QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-nav2leftarrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNAQCBExKTJSSlHx6fAQGBOzu7GxqbJyenPz+/LSytFxaXMTCxGRiZKSmpISGhFxeXISChAwKDFRWVHRydJSWlBQSFERCRIyKjDQ2NIyOjLS2tDw6PBwaHFRSVDw+PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAavQIBwSCwaj8gkMiBYNpeDZzEQXRIKBmPgmtUSDgipcAsWjxOKBaN7Tq+n6EbCIQ3E5+KtQk6gjwl7CX11D3sPBBARTQGFDYeJT2R8EhB0koKUfgATFBUSCRYSEoqcnqCiikMXGAgZCQkZqautr7FiFxoIGxwWqQC4ury+qh2tCxEexMbIRhMdDggfYs7Q0kcXAQwDbELY2txEziBmmx3jSRNMR+nk4e2b70ry80QGQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-nav2rightarrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNFxeXAQCBMTGxOzm7CwqLLy2vPTy9Pz+/Ly6vCQiJLSytLS2tLSutOTi5MzGzKSepIyKjJSOlKSmpMzKzJyanIyOjBwaHIyGjISGhJSSlISChBQSFJyenIR+hGxubDw+PHRydHR2dEQ+RHx6fERCRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAa6QIBwSCwaj8hkIIBcJgEBweAYnTYJUmMAa9USClniFtwlGg6IRFhoUKTXwwWj0FB3F46Hwl6UQyISfAB+EROCQgsUFRYSF3yJEIyBaxgWDBkaGRtclQwSHBIbEGEdGx4fGhcOICEDGBsWHBmqIq1CHRIWGRMMIyRTHRy6Er22tyONq8YdJRe0xkIDwr2/QwMfliMmZQADIxasZd4e4UYDIr7c59rc0eVFA+/m0EQD9PDt0flP/P3+BkEAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-nav2uparrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBGReZDQyNMTCxHx6fPz+/JyWnKyurHx2fDw6PJSSlISGhIyKjIyGjISChLy6vJyanOTm5PTy9OTi5MzKzLSytKSepMTGxMzGzLS2tLSutKymrHRydCQiJCwmLBwWHAwODLy2vHx+fAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAajQIBwSCwaj8RAAMkUBgSDZdP4JBSi06TAcEAkFNLp07BgLLzY5njRcDzO3zB1C4lEGI83Wj58SiYUFRUWdg0XEXFFAwIYGRoWGxwRZQUFHZdgRAObmx4fHiChISFKpVlKWUdPaalOAlasp1sHG4myZGZ7Yltsbgu1mUhjdRF5egmxfQJ/gYOFdrZDi40iFgiSCw8jBQmYcpydn6Ego6WorUwGQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-navback22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAw2VCRGZAxCZGyavExmjHyatOTy9CxihISevPz+/KzO3BRylAw+XAQCBDRWbPz6/FzC3CSuzDyexJzO5Mzq9CxSdAQOFISmxNzu9HTS5BSmxAyexDSuzJTa7Mzu9Kzi7GS21CRmjAQOHHSWtLze7AyWvHzG3BRihAQKFCTO3BS+1AyixBSWvBSOtBSStAQWJBSixDzW5BTC3BSqzBS21CTC1ETW3AQSHEze7BRqlBRmjAQCDBR+pBRefBRSdCH5BAEAAAAALAAAAAAWABYAAAalQIBwSCwaj8ikMqBcMpvHgGAANQYIhWdVGDAcENQtIJBQLBgNx0MQaDuQXcghIplQDhBIxXKJYiAZGhscHR4VHyAhIiNWJBklGhIbJoQnFCcTKIxFKSgbKissJi0mJi4vLiYoMEcXKDEyMzQ1Nje2NisoOEg4KDU5K6g6OwwoKAN9SCOeMmgwz884PEq9PT4NYkPLP9jZQikN3d4AKVrjKePp3gZBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-navdown22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAw2VCRKZDRSbBxCXJTC1Mzi7Nzq9NTm9Bx2nAQCBNzu9JzG3Hy+1HzG3IzO5BRmjPz6/LTe7Dy61AyStCTC1FzC1AyGrETS3ETC1ETa5BRulAyuzBRylAw+XMTe7Gy+3CSqzAyexBTC3DR+nIS21KTW5Nzu/KzO3FzC3Pz+/ByixEze7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAaRQIBwSCwaj8ikcnkMBAQDgjPAFAYKhsMBkVBUAYEFo+F4QLzVQEQyoVTOX/XBcsHA0+vMRbNBMwkRDhxuHX5GTlIeHh8gISIjFAEeiVRECiQlDAUmgxQjIhwiJHdFlycoKSIUFCEjGiGkRpcqCxYijxorsUezcxYsuoZJsxLAu0qXB7DCTJfHVQrMX9PU1Uh0QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-navforward22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAw2VAQCBBxCXDR+nIS21Aw+XJTC1Nzu/KzO3Pz+/Nzq9Pz6/MTe7KTW5FzC1Nzu9CRKZMzi7IzK3Lzi7LTe7HzG3Gy+3AyuzAyexFzC3DRSbHy+1Dy61CSqzAySvAyStLze7IzO5AyGrETa5ByixBRmjCTC1ETS3BTC3Bx2nAyWvEze7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAaYQIBwSCwaj8hkMqBsBgTN5IAAjRoDBaq1aDggtMuAWDzoJhTgY+CwYLgZDccDwkgXI5IJZVGxXDAZGnR2QxsLHB0PHRgeHyAZDyFfVUQDCyIgIyCPIB+QJCUmlEMBEiInKCQnKSkeKSQeomoqJrUmKiArKSwZsmoCwMEBGCyxo1EGHr3HUQEEvltCBtDRAAbMW0zV29xDBkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-navhome22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBAQCBCQiJNze3ERCROTi5MzGzLy6vDw6PKyqrKyurBQSFGRiZGxqbGRmZISChEQ+RExKTExOTHRydDQyNOTe5FROVLSurCwqLMTCxPT29Pz6/LSutFxeXLyytLSytPz+/JSWlKympPTq7KSipNzW3BwaHHx6fKx2VJRWNHQmBFweDOzq7Ly+vNTW1JxWNLSajPTe1Ny6pKxWJNTS1IyOjJRmbPTi3OzKrNSSXMSGVHQiBHx+fJSSlPzy9IxOVOzWxOSyjNSCPLxeDJyWnIRGTOTGtMxmDLRWBHwqBIxGTLRSDDQuNNSunKxKBGwyNMSafMxqHMReDKRGDPTu9LxuPLxaDJQ+DIR+hGQqNIQyBGQiBNTO1EQKBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4QBAYSIiYQCAwQCiokEhwACBQYHBAiQhAiHlQYJCgkEC5uCkp8MDQ4NDwylmwgQlgQRERIEBBOkmxQVBgQWFwUFFxEEDLyJGAUZtQoFGhsFHLYdyoOVHsEf0SAbIAUex8mwlAUhtSIFG+3uIyTWvAIGJMEkJe76GyXbEeWUBJg4USKaBhQpVKzYoIFFiwYUBBJa8MAFCw0vYMSQMWOhBhoTKCQSUKMEiw02buDIoWOHBg0GeIhEFKAHDR8afgAJImSIioYliMws1MPkhiJGchxBkmTDCBo1hg4KQMTiBiUyhBxZ8pNFiR5MEtU0WqSJVidJNDyNKraHC5xPNKBEkTLlJ5WvUgWNvfikyhArV34+7ZEXQAAsB2iUyHLlihYtW0pwOYAFgyJDmDNr7jIIWiAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-navup22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAw2VAQCBHSWtBRmjAQOHISmxNzu9BSmxBRihHyatPz6/Lze7CTO3BSixHTS5BTC3DzW5ByyzPz+/OTy9AyexEze7ByixGyavKzO3FzC3AyWvBS+1BR+pAQKFCRGZExmjCxihBRylCSuzBSWvBS21BSOtBRSdAw+XAxCZDyexDSyzCTC1JzO5JTa7DSuzETW3BRqlAQWJDRWbOT2/Mzq9HzG3JzS5Kzi7BSStGS21CxSdCRmjAQOFAQSHAAAACH5BAEAAAAALAAAAAAWABYAAAaeQIBwSCwaj8ikcqkMCJjHwIBQgBIDhgMiUbUGFAtGw0GFfheHByQi4S6/E8pDUoFYLm5kAEPJaBAVGxIcER0JHlEfICEiIxUkGyUmIgknKIhXASkonCorgSwmKQGcKE9IAi0uLxUwMTJWMzQ1NiYwBLBQHws1N7avXgs4NjkcCblMATU6KhvGyG87PAnUKV1MAj0+2zIFp1bg4eJJdkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-playeject22:play play22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNAwKDJSWlFRSVBQSFKymrOzq7HRydERCRPz+/MzGzISGhJyenKSmpGxqbJyWnJSOlKSepLy2vIyOjGRiZPTu9IyGjLSutFxaXExOTHx2fGReZAQCBAQGBBwaHCQiJLSytKyurJSSlFxeXNze3LS2tIyKjFxWXHRudAwGDBQOFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAa1QIBwSCwaj8ikcqkMCJjHwIBQgBIDhgMiUbVKFQsGItBdBhpgh4PxIJvRC8cA4oiMy8bvQhJhMAYTFBVOURAWEw0QFxcMERAYCBluVxobDxkVHJocmBwEGgmEQx0dHh0CpKmkH6odVlanBR8FtAIFtiCkSB0LISEiGCIGIxAPDySuRwIOBwrOzwoHJRHJRh0jJgMj2gMnERQUCNVFHQQoCBvo6CkICATjRB0qp7b1K6qv+foyQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-playend22:play play22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNFxeXAQCBMTCxGReZBQSFOzm7AwKDKymrJSSlFRSVCwqLLy6vPTy9OTe5Ozq7CQiJLSytOTi5BwaHPz+/HRydMzKzKSepJSOlKSipJyanIyGjIyKjKyurISGhMzGzJyWnHR2dISChIyOjLSutDw+PERCRHx6fJSWlIR+hJyenGRmZHx2fAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAa6QIBwSCwaj8ikMBBQKgOCgRMZIBSkxYHWoDVWD9EigpBQLLBERsPxCA8NDUhjgTBGJJNGG02RVBQWdUV3FxgZe0IGfoAGdhoXGxwdiAYef4FGFBoeHB8dGSBRihUhIo1FBhkbIyMkJRYmAwYal4JEBh2RChIWJ1IIGxUZFqdECCgkHR6wWAYpFR2YWSobvL5vFgfDaEMDIivMRBEsD9HcQgMWvecDLB0tZ0btsfJa9vLXU/X6/P3+b0EAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-playpause22:play play22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBAQCBAwODMTCxKSmpJSWlFRSVAQGBBwaHLSutOzq7Ly6vCQeJPz+/Hx2fBQWFGxubLSytJSOlBQOFAwKDJSSlJyWnIyOjHRydNze3GRiZAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAWBICCOZGmeaKqubOumQSDEgRjPMSoMRGEcol3vh0IkFAtDDWBEKlGMRKPgEIii0yrqIS1ArADu9KuLNCSOSdCMVp8ohEZFC4DL6SaBpXGh6/l4JX8XZACDhXkYCn1LAoqMUBAZEhBLDJKUSyYBGmhPAJyemiU0NDaloy+qq6ytI8whACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-playstart22:play play22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNAQCBExOTAwKDAQGBJSSlHx+fBQSFMTCxKymrFRSVOzu7GxqbLSytLy6vJyanPz+/GReZBwaHHRydKSepKSipGRiZJyWnAwODLSutKSmpISChPTu9ISGhFxaXJSWlIyGjJSOlERCRIyKjDw2PIyOjLy2vOzm7Dw6PLS2tCQmJOTe5GxmbDQ2NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAa7QIBwSCwaj8ik0hgQLJGBgbMoqBIKU2LAcMgOEQmFYeEFbBmNMgDhYDwWBC0k4pCoJ46IgRIXBioRCRYXamwRGBQIfgaBFhiERhkaenxmCoEbBhyQRYaIGVsdghgem4UWegcEBB8UHhsgIaZGBBgRIpUIIxQhChginEQIIBEklWslFyYnBsFfFCi4WQgpFBwqFxNGKxcsxl4IAS0NZEYCF3vlwgEfUuZV8JEuI2pPAARN9kcE9fr+SwaCAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-playstop22:play play22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBAwKDBQSFBwaHCQmJJSSlISChJSOlJSWlGxqbGRiZNTS1PTy9Pz+/Ozm7OTi5FRSVIyKjOTe5MTCxIR+hExOTHR2dLy6vLSytLy2vHRydFxWXIyGjIyOjPz2/FRWVHx6fExKTMzOzJyanKSmpKyqrKSipAQGBLSutHx2fDw6PAwODAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAa1QIBwSCwaj8ikcslsAgKCAWEQjQ4KgSwyYDAcugZEQqFYYJECA6PhaLcfEEUkgJZAGJB8fkKpWOhHAxcOGBQZGBoaGQgbHIBGAhUOGR0SBxISBh4Xf0iCHxQSlRIIXhsgj0UCIaCXmJgHGyKpRJ+hmB5dHQqOaCENIx0epBIkBhdzngoPGCQlJifQJBvJRygRKRcKGxcXGypys1srEREc5SLnICLiR1koLFVUWfRO9vf4+UwyQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-textblock22:text text22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAImhI+py30Bo5zBWUWzvNzo33GfFl5jVlonlTrr1DbvFi9vjeeNUQAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-textbold22:text text22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAIxhI+py+0Powm0VnknjVkH2AEhE45LZ55Wqn6e65TsMc5eYosbksswubJIhsSiccgvAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-textcenter22:text text22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAImhI+py30Bo5zBWUbz3Sh7yIWfFHKjVl4nmFrr1Lpr7LwkjeeIUQAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-textitalic22:text text22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAImhI+py+0P4wqUSlQvttrkDnyaOHIdeaGRupplAIauVM3xjeeOUQAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-textleft22:text text22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAImhI+pyw0Bo5zB2UXz3Sp7yG2fFJajVjonmIor2TJvfL0wjecIXQAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-textright22:text text22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAImhI+py30Bo5zBWUfz3SZ7yIXdF4kWqZkbCqoMO7kXLC+wVOe6YRQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-text22:text text22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBAQCBBwaHAwKDBQSFLy+vLS2tJSWlBQWFKyqrFRSVCwqLDQyNNTS1GxqbFxaXJyanIyOjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAVcICCOZGmKQSoMaZsShBsQBdAapHvgaIDUqUPJlRjSbAoT0fRDKgODRbF0PLUYjZO2F2Bst9evNix+dsvDlGKK5jraudQb7qbX6a2HEJ+ycyF+LRE8ZTI+fX5oGCEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-textunder22:text text22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAIvhI+py+0PowmUnhpeVVnb1DkbCI1I2JhX+Z0sOr2cTHpwK7a4rUr+hAnufsTirwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-viewchoose22:view view22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBAQCBFRSVExKTDQyNPz69PTq5Pz+/OzaxOTKpAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARTEMhJq70466Cl+AMxBVwnFIVRAmQHCIeBrC1L3tQgJ/SaEbeeC1PLBHE2ybFI9A1HzstHEIK6YCmhDTmBybQaHYJn7QC5zKeytIQe1+pKNE6P2yMAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-viewdetailed22:view view22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBFRSVExKTDQyNPz+/Pz69PTq5AQCBOzaxOTKpAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAQ+EMhJq7046817+MLQUQFRGMc4lQaSAkcMx3QltMmrDrSu/sCgEPgJhIiFk89DaL1qPRnlhsgBebWhdstVESIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-viewicon22:view view22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBFRSVExKTDQyNPz69PTq5AQCBPz+/OzaxOTKpAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARWEMhJq7046z2DF0PlBeAVEERhiKhqHgWyUgEsX0KczFOO7JeBYciTCImc5ITIXDKHyqhU9AnRqq9UEVDTvmLbGhin2/qAliOUot5OLc81IO5+2+8WewQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-viewmag-22:view view22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBBQSFJyanKy2tLzCxHyChNTa3Nzq7Nz29Nzy9Mzy9MTu9OTy9Nzi5Oz6/OT29MTi5Kzi7NTy9KTm7JzW3ITO1Lzq7IzW5HzK1LS+vMTq7Jze7ITW3GTCzGS+zLTS1MzOzLzq9Kzm7Jze5ITW5HTS3FS2vLze5EzCzEyyvEyutJTa5NTu9ITa5FTK1ESirLTm7Mzi5FS6xEy2vESerESmtFSutESmrKyqrAz+/Dw+RAzi3ASutHRydAQCBAAAACH5BAEAAAAALAAAAAAWABYAAAbKQIBQGCgWh8jksCgYEAaCozIZKBgOiIRiwSgEpstCw/HYQiKRhBcMCBgQDodkMaFU0t9pQHCIyy0TFxgYEVF6GQ4LCQkaERscHR4RH3lUIAkWCyEiIyQlHiYjEJVIAQQJJ2gjJSUoKSorlHoCLBQcHC0lLikvHjCGejEiHBgeMjM0NRwPpFQFDBHFNjceHAjAYFWoI7cnCVE4OWxtex8QH1EBOjs4zUpGUjw6Pe3j2fP19u/47vrq9P3s/avno2BBf/MCClSob4iBIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-viewmag22:view view22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBBQSFJyanKy2tLzCxHyChNTa3Nzq7Nz29Nzy9Mzy9MTu9OTy9Nzi5Oz6/OT29MTi5Kzi7NTy9KTm7JzW3ITO1Lzq7IzW5HzK1LS+vMTq7Jze7ITW3GTCzGS+zLTS1MzOzLzq9Kzm7Jze5ITW5HTS3FS2vLze5EzCzEyyvEyutJTa5NTu9ITa5FTK1ESirLTm7Mzi5FS6xEy2vESerESmtFSutESmrKyqrAz+/Dw+RAzi3ASutHRydAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbIQIBQGCgWh8jksCgYEAaCozIZKBgOiIRiwSgEpstCw/HYQiKRhBcMCBgQDodkMaFU0t9pQHCIyy0TFxgYEVF6GQ4LCQkaERscHR4RH3lUIAkWCyEiIyQlHiYjEJVIAQQJJ2gjJSUoKSorlHoCLBQcHC0lLikvHjCGejEiHBgeMjM0NRwPpFQFDBHFNjceHAjAYFWoI7cnCVE4OWxtex8QH1EBOjs4zUpGUjw6Pe3j2fP19u/47vrq9P3s/cunr9S8gAIRFhTCLAgAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-viewmag+22:view view22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBBQSFJyanKy2tLzCxHyChNTa3Nzq7Nz29Nzy9Mzy9MTu9OTy9Nzi5Oz6/OT29MTi5Kzi7NTy9KTm7JzW3ITO1Lzq7IzW5HzK1LS+vMTq7Jze7ITW3GTCzGS+zLTS1MzOzLzq9Kzm7Jze5ITW5HTS3FS2vLze5EzCzEyyvEyutJTa5NTu9ITa5FTK1ESirLTm7Mzi5FS6xEy2vESerESmtFSutESmrKyqrAz+/Dw+RAzi3ASutHRydAQCBAAAACH5BAEAAAAALAAAAAAWABYAAAbQQIBQGCgWh8jksCgYEAaCozIZKBgOiIRiwSgEpstCw/HYQiKRhBcMCBgQDodkMaFU0t9pQHCIyy0TFxgYEVF6GQ4LCQkaERscHR4RH3lUIAkWCyEiIyQlHiYjEJVIAQQJJ2gjJSUoKSorlHoCLBQcHC0lLikvHjCGejEiHBgeMjM0NRwPpFQFDBHFNjceHAjAYFWoI7cnCVE4OWxtex8QH1EBOjs4zUpGUjw6Pe3j2fP19u/4zT766vRI+fvHD4CPgwcJ9qg0UB85JA0dDjEQBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-viewmulticolumn22:view view22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBFRSVExKTDQyNPz+/Pz69PTq5AQCBOzaxOTKpAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARTEMhJq7046813+MJQfUF4BURhHGO6noSBsEcNoDJtS4KcsJQe4ncZ1HYT47HDbDqfUAnJRJmKLIGCCjjJbmE5wBI3EyOFxKCPS1EiJW52dE6vZyIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-viewtext22:view view22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAIkhI+py+0Po2ShBlOxzbP7n2yaJoLm+ZTcxqHuC6hXzML2HVEFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-viewtree22:view view22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBAQCBFRSVExKTDQyNPz+/Pz69Pzu5PTq5OzaxBQOFOzKpFRWVFxWXOzexPTexCH5BAEAAAAALAAAAAAWABYAAARPEMhJq704g6A779kHCORAgNskFMYhakE8FkjyBcoWv+JwJItXaELYCTFHlCSpZKKcoB5jYHpOGgUadLKbIRw3jhEzQDyCSuI4zW673yhDBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
diff --git a/ext/tk/sample/tkextlib/ICONS/tkIcons-sample.kde b/ext/tk/sample/tkextlib/ICONS/tkIcons-sample.kde
deleted file mode 100644
index 51f76a0488..0000000000
--- a/ext/tk/sample/tkextlib/ICONS/tkIcons-sample.kde
+++ /dev/null
@@ -1,658 +0,0 @@
-1downarrow-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIYhI+py+0PUZi0zmTtypflV0VdRJbm6fgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-1leftarrow-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAP///wAAACH5BAEAAAAALAAAAAAQABAAAAIdhI+pyxqdwoNGTmgvy9px/IEWBWRkKZ2oWrKu4hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-1rightarrow-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIdhI+pyxCtwoNHTmpvy3rxnnwQh1mUI52o6rCu6hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-1uparrow-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIYhI+py+0PWwhxzmetzFpxnnxfRJbmufgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-2downarrow-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIfhI+pq+EPXYpxUckoO3AjbF3dJwahllXe6AFgC8d+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-2leftarrow-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAImhI+pyxf5VohmSlsxmpjTzAHeN5ak6UHpqKRi2GpwvH3Q3eT64RcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-2rightarrow-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAImhI+pq5HOAjQyVnqfhHue7oAaKH5kiW0AmnLqaHomkj02g+e6XwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-2uparrow-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIghI+pyxfR0HsRzNnuXVqn3mVQZWFRyIDjp65Ga5Ly4hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-abs-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBIQChAQCBBQSFCH5BAEAAAAALAAAAAAQABAAAAIwhI95ocn2GlySTiME1iC+DIKdNWxANl4HaqWr055cy6Bs6dahmJsyXVFFJJ7gyF8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-airbrush-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIMAAASC/AQCBPzCxMQCBIQCBPz+/MTCxKSipFxaXDQyNISChAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARUEMhJZxCjanBH3hY2EFJgVt0YcEW7liLxBoVxzPHL2msqUzSeT2c5HBC5jQmROKgAhCgKEVBQo6YAqVQIHBQ93ZbmBWt+nDJRgiYMvmuoThWXT/wRACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-attach-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBPz+/AQCBAAAACH5BAEAAAAALAAAAAAQABAAAAI2hAOCxg2h0nJHyEshi9HpxU1GOCLdZoKpQ15nibUoprKp9lh2oucUxsBRXsJh4Hjs/QTMpr8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-back-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBRSdBRObCQ2TBxObISevAQCBNzu/BRGZPz6/FzC3Pz+/HTS5ByyzJze7Mzq9ITC3AQWLAyWvBSavFyuxAwaLAwSHBRafBSOrDzW5AyixCS61ETW3CzG1AQeLAweLAxefBSStEze7CSWtCyatBSCnBRWfAwmPBRWdByixAQSHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZiQIBwSCwah4HjUTBQFgkFg3MoKBykU0QhoUAIAuAksbpgNByPxQMSGVsVDYlkIqdUiJYLJqORbDgcHRseRR8gISIaEyMkGCVYRBEmeyAnlgaQkSgpmU4RAZ1OKqFOpFNGfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-blend-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBARCRAQCBASChATCxATCBASCBAAAACH5BAEAAAAALAAAAAAQABAAAANHCLrc/izISauYI5NduvlXMIjEQBSnUYCYxnmsSJrouhqh6J4wLo0mWuqWy5heN58seBrGdEdeMgQsNW0ggXbL7Qog4HDDnwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-bookmark_add-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBCwqLLSytLy6vERGRFRWVDQyNKSipAQCBMTGxKyurISChJSSlJyanHR2dIyKjPz+xISGhPz+BGxubMTCBHx+fPz+/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVfICACwWieY1CibCCsrBkMb0zchTEcNYsIiYHiwIOdEAvigdFQGE0Ix4NBbSAgsWjk+jBIAlcUYrJASChnSXZSoUDelKfoKpFALJA61ueGI2IAZmhogGFmCGGAgXsifiEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-bookmark_folder-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBExKTBQWFOTi5OTm5CwqLPz+/PTy9Ozu7FRSVNza3PT29KSmpAQ6XARqnNTS1JyenGRiZJTa9Mzq9JzO5MTGxIyOjKSipFxeXMzOzDw+PDy65FTC7HS2zMzm7MzKzKSenASq5Bx+rBSGrFyqzLSytDw6NAR+zBRejBxqnLSyrERCRIyqvDRujKyurMTCvOzq7AQ2VDQ2NNze3KyqrGxqbLS2tLy6vCwuLDw6PAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAawQIAQEBAMh4GjcEAoCAQGYSCpDBwQiQJBEVhQj1YGo1DoNqZTx8PhODAWZUik0ZAkHRNKZe0IWC4RGBkBGhsOHB0eFR97bBdcICEbAA4iIyQlioxrGhEmJ5QoKSoqJCOZiw4rGixEYi0uo6WYDi8wkwAsCTFksLIuMi+tADMLNAsLEBAgLSMpMjW4RCc2MCAgFjA3MA4R0kgzGS84Ny8vDqBKSDkKETUOOurqAQagfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-bookmark-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBCwqLLSytLy+vERGRFRWVDQ2NKSmpAQCBKyurMTGxISChJyanHR2dIyKjGxubHRydGRmZIyOjFxeXHx6fAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVbICACwWieY1CibCCsrBkMb0zchSEcNYskCtqBBzshFkOGQFk0IRqOxqPBODRHCMhCQKteRc9FI/KQWGOIyFYgkDC+gPR4snCcfRGKOIKIgSMQE31+f4OEYCZ+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-bookmark_toolbar-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBCwqLLSytLy6vERGRFRWVDQ2NKSipAQCBKyqrMTCxKyurISGhJSSlJyanHR2dIyKjGxubIyOjISChHx+fPz+/MTGxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVpICACwWieY1CibCCsrBkMb0zchTEcNYskCsXiwIOdEAzioeFIGE2IB6RBbT5HiAhEIpk6Y9kJBMJoHK6iLIU8kZxFlXhlIp/XJ4BKUIGoWIJ9f3x5e32FeoB5goGAfokTCJEIFJKTlX4hACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-bottom-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBRObCRKZBxCXAwyTKTK3Ozy/NTm9GSivAQWHNzu/FzC3IzO5CySrAQOHAyuzETS3CSWtAyOtETa5Aw2VLze7ByWtBy61BSavAxWdBRCXAwqPAQCBDR+nKTe7FS+1Eze7ByixBRmjPz+/AyexAyixAQKFBRqjAQGDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZhQIBwSCwaj0hAYCkYEJLKguGASEADigWj4bgaHpBINykwSCYRa5HCFFQsF0xGo9lwhpSOwfORYC4gISJ3RAQdIyQYJSAlImNrh4uNJkl5CoKUUBQnjlB4KFAcoqOknkh+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-brace-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBIQChAQCBBQSFCH5BAEAAAAALAAAAAAQABAAAAI2hI9pEXq8mnsNzggsEMJwbHGimFXS4HUfpKUIq3QJ036vuakyWvbjCJLYbL2WgyW5WIw3g78AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-brackets-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBIQChAQCBBQSFCH5BAEAAAAALAAAAAAQABAAAAIzhI8JwXocllMxTlSREGY/2W2iJ1nAEAJklpCfeXAJG8sY6JGowY7jW0sBL0NiqTGBAPwFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-charset-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAInhI+pqxH8kFsvsgtm1vvEaoBZSH6j5FSaRY4me4pyq1ochuf6fvgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-colorize-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIQAAPz+BAQCBPz+/MTCxISC/AQChMTC/ERCBPyqXMRaBATCxASChPzerKSipMT+/MQCBATCBASCBARCRISChMT+xDQyNAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVnICAGgWieZyCQKGuqZPkGgwyv60gONRDvNlqt9Pv5BgRCYVj8IQ3L4qE4KFiZzRiP90MgEj+FYtGLIRiJQaMxUDjIxFoi8YBAIo3FQjIJ7iAUERNqDTI6PBGJfT0oFVpsMSgzkSh+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-colorpicker-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBARCBDQyNMT+xATCBASCBPz+/FxaXISChAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAQ/EMhJZRCjahBIMdlmeV8gBl3xCabWGarBihwBz+eB2O0WHIFEp1f5BU1EilFI4wCZtGWy+JwWj00OynrNTvwRACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-completion-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPz+/Ly+vHx+fAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM/CLrcGjBKCYK4+NoMs+jWIBIdZ50QuWGgMASD+oGnO5beR+x7UE3AyGKV0wxnpeSxyDoGN74Hszl8QhxYhj8BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-configure-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBISChGRmZMTCxKSipLS2tHx6fPz+/OTm5FxaXOzu7DQyNMzOzAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAReEMhAq7wYBDECKVSGBcbRfcEYauSZXgFCrEEXgDCSeIEyzKSXZoBYVCoJVIqBGByKu0Cy8QHxmgNngWCkGgqsGWFseu6oMApoXHAWhWnKrv0UqeYDe0YO10/6fhJ+EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-connect_creating-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBPz+BMTCBISCBAQCBPz+/MTCxMTGxISChFxaXMzGzKSipAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEMhJZbihUiz60FPnfaA0iBpBVGdHEYWxToEoSHBRHHM9AgSEQRcj+AYkYAJxIPKQFUJiOdTJQFIDU6dYzKKFhTCM+E5g4mXaDAyrlogEG+DGTecA7wsP8EcAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-connect_established-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/KSipDQyNMTCxMTGxISChFxaXMzGzAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEMhJZxCjgsAtDtUlCOA1gJQ4kl/IDatAoF7xxkS6GgEBr6jAobCyBX42SQBxMOx6A8MhiGASR8YDgrYsNEeJ0zaEGZY7uoH2oB6nOUwtbdLaVOeTUwo/8UcAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-connect_no-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBPz+BMTCBAQCBERCBPz+/MTCxMTGxISChFxaXMzGzKSipAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARPEMhJq704axBEHoPUEdhQGMNYFuwxkKInDYjBniEnwMCQIIebSzXx/WwsFK+YMABZikWuYlrUCtZpEYv4WRPaHhb064YB41kCfJFSQBh/BAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-contents2-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBAQCBDyKhDSChGSinFSWlEySjCx+fHSqrGSipESOjCR6dKTGxISytIy6vFSalBxydAQeHHyurAxubARmZCR+fBx2dDyKjPz+/MzKzLTS1IyOjAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVkICCOZGmKQXCWqTCoa0oUxnDAZIrsSaEMCxwgwGggHI3E47eA4AKRogQxcy0mFFhgEW3MCoOKBZsdUrhFxSUMyT7P3bAlhcnk4BoHvb4RBuABGHwpJn+BGX1CLAGJKzmKjpF+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-contents-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBExCNGSenHRmVCwqJPTq1GxeTHRqXPz+/DwyJPTq3Ny+lOzexPzy5HRuVFSWlNzClPTexIR2ZOzevPz29AxqbPz6/IR+ZDyKjPTy5IyCZPz27ESOjJySfDSGhPTm1PTizJSKdDSChNzWxMS2nIR6ZKyijNzOrOzWtIx+bLSifNTGrMy6lIx+ZCRWRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaeQEAAQCwWBYJiYEAoGAFIw0E5QCScAIVikUgQqNargtFwdB9KSDhxiEjMiUlgHlB3E48IpdKdLCxzEAQJFxUTblwJGH9zGQgVGhUbbhxdG4wBHQQaCwaTb10emB8EBiAhInp8CSKYIw8kDRSfDiUmJ4xCIxMoKSoRJRMrJyy5uhMtLisTLCQkC8bHGBMj1daARgEjLyN03kPZc09FfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-contexthelp-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQChAQCBAAAACH5BAEAAAAALAAAAAAQABAAAAIzhH+hIeiwVmtOUcjENaxqjVjhByaBSZZVl24Y1V6iEVMzkD4bqD700bshgh1fzwd0IfwFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-crop-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBMT+xATCBASCBISChPz+/AAAACH5BAEAAAAALAAAAAAQABAAAAM0CLrc/iG+FsQgYapKbp7c4IFCZ2FQOQQE6oSl9Koxabrz/eVDDXat3atAlEEMSKFmyfAnAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-decrypted-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaVAQCBKSipDQyNMTCxISChFxaLFxSJExGHEQ+FCQiDBwaDBweDGxiLHxyNHRuPIR+RIyGZJSSfFxaRGxmLJyaXNzWpNTOnMzGnMS+jJSKTGReLKyqjPTu1NzarLSufKyibJySXIyGVGxiNFxaXLSytPT29Ozu7OTi5NTS1KyurGxqVCQeDJSSjLS2tNTW1KSmpGRiLKSebOzuzJSOXExONExGLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaVQIBwOAwYA8SkMCAYOAnKYiFAIAQGyOgVCggYuEovVxztMpdnwAGRSCgUCwOjIeQ6HpCIZDKRUNYMRBUWF4UYGRoWGxyBRR0eHxgaICEiIyR0QyUmJygpKgUrAxMsLUQlKyieoKIuEAunK52fBS8DLiywQySpnjC1Mbi6QjIzNBeSIBY1EQfDQgosLAEUNjY3Co1DfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-down-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBRObCRKZBxCXAwyTKTK3Ozy/NTm9GSivAQWHNzu/FzC3IzO5CySrAQOHAyuzETS3CSWtAyOtETa5Aw2VLze7ByWtBy61BSavAxWdBRCXAwqPAQCBDR+nKTe7FS+1Eze7ByixBRmjPz+/AyexAyixAQKFBRqjAQGDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZeQIBwSCwaj0hAYCkYEJLKguGASEADigWj4bgaHpBINykwSCYRa5HCFFQsF0xGo9lwhpSOwfORYC4gISJ3RAQdIyQYJSAlImNrh4uNJkl5CoKUUBQnjlB4KJ6hokN+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-editclear-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBPz+/ISChCH5BAEAAAAALAAAAAAQABAAAAIuhI+pm+EPnwmi2msDoLgLzQWDV4HlSJof6qki+W0n7LKdCpdyrm/Rr2EIhwp/AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-editcopy-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAFxaXPwCBNze3GxubERCRPz+/Pz29Pzy5OTe3LS2tAQCBPTq3PTizLyulKyqrOzexLymhLy+vPTy9OzWvLyifMTCxHRydOzSrLyihPz6/OTKpLyabOzu7OTm5MS2nMSqjKSipDQyNJyenLSytOTi5NTS1JyanNTW1JSWlLy6vKyurAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAAaUQIBwCAgYj0eAYLkcEJBIZWFaGBie0ICUOnBiowKq4YBIKIbJcGG8YDQUDoHTKGU/HhBFpHrVIiQHbQ8TFAoVBRZeSoEIgxcYhhkSAmZKghcXGht6EhwdDmcRHh4NHxgbmwkcCwIgZwqwsbAhCR0CCiIKWQAOCQkjJAolJrpQShK2wicoxVEJKSMqDiAizLuysiF+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-editcut-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBPz+/ISChCH5BAEAAAAALAAAAAAQABAAAAIwhI9pwaHrGFRBNDdPlYB3bWHQ1YXPtYln+iCpmqCDp6El7Ylsp6ssR1uYSKuW0V8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-editdelete-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbPT29GxubMzOzDQyNIyKjHRydERCROTi3IyKhPz29Ox6bPzCxPzy7PTm3NS6rIQCBMxCNPTq3PTi1PTezMyynPTm1PTaxOzWvMyulOzGrMymhPTq5OzOtNTKxNTOzNTCtNS+rMSehAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaKQAAgQCwahcihYMkcBAiBpLJApRoOBWgyIKhSEQkFgrBAcr1URiPhKAsDD3QB8RhA3FM0IlLHnyUTVBMSFBUWfl0XGBMTGBcZGodmcQWKjpAbHIgIBY2LHRoempOdjooTGx8giIOPFYofISJ+DyMXI6AfFySyfiUmJSUnKBYcICIpfgELzM3OZX5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-edit-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxaVMR+RPzKjNze3AQCBMR6RPzGjPyODPz+/MzOzPyKDPyKBPz29OTWzPyGDPyGBOx6BOza1OR2BKROBNSOXKRKBBwOBOzu7PTWxPzizOySZPyCDFxaXOy2lNRyRMxmJCQOBPTm1OzStPTKrMR+XIRWLFxGNCQSBDQyNIRSNDQuJERGRLyqlNzSvIx6ZKRuVEw6LLSyrLymhKSShBwaFFROTJyWjMS+vNzW1OTazNzKrHRqXOzezOTOpPTq3OzWvOTStLyedMS+rLy2pMSynMSulAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAewgAAAAYSFhoQCA4IBBI2OjgUGBwiLBAmXlpcKkgsMlZcJBA0JDpIPEBGVjwkSBgOnExSfmBIVBxAMExYXswkYGRobHLq8gh2PHhoeHyAWIYKzIiMkJSYnKCnQg5YNHtQqKywtK9qMBC4vMDEBMjIz2dCMDTQ1Njc4OToz5PEEOzw3ZPToMcLHO23HfogQ0QMIkCA+hPBbhAPHECJFjMyYIUQIvEUpUqwQOXKkSEF+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-editpaste-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBCQiFHRqNIx+LFxSBDw6PKSaRPz+/NTOjKyiZDw+POTe3AQCBIR2HPT23Ly2dIR2FMTCxLS2tCQmJKSipExGLHx+fHR2dJyenJyanJSSlERCRGRmZNTW1ERGRNze3GxubBweHMzOzJSWlIyOjHRydPz29MzKzIyKjPTq3Ly2rLy+vISGhPzy5LymhISChPTizOzWvKyurPTexOzSrDQyNHx6fCwuLGxqbOzKpMSabAQGBMS2nLyulMSidAAAACH5BAEAAAAALAAAAAAQABAAAAa7QIBQGBAMCMMkoMAsGA6IBKFZECoWDEbDgXgYIIRIRDJZMigUMKHCrlgul7KCgcloNJu8fsMpFzoZgRoeHx0fHwsgGyEACiIjIxokhAeVByUmG0snkpIbC5YHF4obBREkJCgon5YmKQsqDAUrqiwsrAcmLSkpLrISLC/CrCYOKTAxvgUywhYvGx+6xzM0vjUSNhdvn7zIMdUMNxw4IByKH8fINDk6DABZWTsbYzw9Li4+7UoAHvD+4X6CAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-editshred-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbGxubMzOzPz69DQyNIyKjERCRPz29PT29OTi3IyKhPz27PTu5PTy5Pz6/Pzy7PTq3OzexLyqlPTm1PTizOzavLyqjOzWvOzaxLyifOzizOTOpAQCBOzezAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaEQAAgQCwahcihYMkcBAiBpLJApRoOBWgyIKhWEQkFYYHkeqkMxKFBFpq9jgdkEGlPqwrJhCIY2N8FFRYUFxcYGX9dgRKEGhiHiYEOhBcbGBwdiQEOARcBGwEeAZllAgEUnQEfoQEgmp4hrCKtrwEYsrRlTiMBJAG8syN/IyMAxMXHSH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-edittrash-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBKSipFxaXPz+/MTCxISChDQyNCH5BAEAAAAALAAAAAAQABAAAANQCKrRsZA5EYZ7K5BdugkdlQVCsRHdoGLMRwqw8UWvIKvGwTICQdmGgY7W+92GEJKPdNwBlMYgMlNkSp3QgOxKXAKFWE0UHHlObI3yyFH2JwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-encrypted-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaVAQCBKSipDQyNMTCxISChFxaLFxSJEQ+FExGHCQiDBwaDGxiLHxyNHRuPIR+TIyGZJSSfFxaRFxWJGRiLJyaXNzWpNTOnMzGnLy2hJSKTGReLKyqjPTu1NzarMS+jLSyfKyibJySXIyGVCQeDLSytPT29Ozu7OTi5NTS1KyurJSSjGxqVFxaXLS2tKSebOzuzLSufJSOXExGLGRiTExONAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaTQIBwGCgGhkhkQDBoEpLKQoBACAyOUID1qTVwoQGvMPxNFgVjAxp6QCQUicSCwVgkG44HJCKRRCYUCAxIFRYXhxgZGhYbHINEHR4fGCAhIiMkFSVKJicoKSoFKwMsLZtDLison6GjLA92qCueoAUvpC2xQhWqrLYDErmEMDEXlDIwMxAHukI0NS01EzY2NAmPAH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-eraser-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIMAAAT+BMTC/AQCBISC/AQChPzCxPz+/MQCBIQCBAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAQ/EMhJZRA120GwnsEgdh8QiqKXnSi5oqNKsbFWGEYrT8Vx4JydpOf7uSrEIkIISPqWtkIS+pH2qCUptgTYavwRACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-exec-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBEQ+PBwaHLy+vMzOzGxqZHx+dKyqnKymnIR+dNTW1MTCxJyOfLySVMSaVMSeVMSebJyWhOSmTOSuVNyubPS+dKSWhHR2dDw+PIyKhNymTNSaTEw+JOy+fPzSnLSyrISChDQyNDw6NMzKzLy2rMyiXGxWLAQCBHRqTPzerNy+lMzGvCwuLAwKDDQyLJyWlNy6jPTGhGxaRGxiRPz2vOTStLy2tFRSTMS+tOzGlPzmtPTixGRiXCwqJLy6tOTWxPTq1MzKxMzOxISCfHRybLS2tHR2bCQmJExORMTCvMTGxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAeogACCg4SFhoIBAYeDAogDA4oAjYQCBAEFBgcICQUBCpODAQsMDQ4PEBGWhgUMDxITFBUUFheDGAYZCA0aGxwcHR4QHwwgISILIyQlGiYnJygpKisEIywALS4vMBoxMjM0KTU2LC2ENzg5wDo6Owo8hT0+Lx8/OztAQR9C1oInQz4FMBAp8sEIhgIEMpwYdASJCwAYkihR5OLGkUUAMmTACK8Hx4+C/AQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-exit-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBDQyNHR2dCH5BAEAAAAALAAAAAAQABAAAAI4hI+pFrHb3nEg1iWiDiINCwYDko0V9XUTda6I1TIsUMpGinyzbB6ZeGuoEr+GUDL4CXqSphPhLwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-fileclose-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBCQiJBwaHAQCBDQyNDw6PFxaXFRSVERGRCwqLAwODGRiZHx6fPz+/GxqbAwKDCQmJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVaICCOZGmeqBgEwjCkRGEcSKK4JrEcBrMgAdeLVDg0GguGsYEbBQyGYyN6FDoPDIf0+LCKBIgetQERDgGDBGIpNY8GioAU0m6KXFw883w3+/l9f4AkfimGIn4hACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-filefind-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBCQmJDw+PBQSFAQCBMza3NTm5MTW1HyChOT29Ozq7MTq7Kze5Kzm7Oz6/NTy9Iza5GzGzKzS1Nzy9Nz29Kzq9HTGzHTK1Lza3AwKDLzu9JTi7HTW5GTCzITO1Mzq7Hza5FTK1ESyvHzKzKzW3DQyNDyqtDw6PIzW5HzGzAT+/Dw+RKyurNTOzMTGxMS+tJSGdATCxHRydLSqpLymnLSijBweHERCRNze3Pz69PTy9Oze1OTSxOTGrMSqlLy+vPTu5OzSvMymjNTGvNS+tMy2pMyunMSefAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAe4gACCAAECA4OIiAIEBQYHBAKJgwIICQoLDA0IkZIECQ4PCxARCwSSAxITFA8VEBYXGBmJAQYLGhUbHB0eH7KIGRIMEBAgISIjJKaIJQQLFxERIialkieUGigpKRoIBCqJKyyLBwvJAioEyoICLS4v6QQwMQQyLuqLli8zNDU2BCf1lN3AkUPHDh49fAQAAEnGD1MCCALZEaSHkIUMBQS8wWMIkSJGhBzBmFEGgRsBUqpMiSgdAD+BAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-filenew-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbPz6/GxubNTKxDQyNIyKhHRydERCROTi3PT29Pz29Pzy7PTq3My2pPzu5PTi1NS+rPTq5PTezMyynPTm1Pz69OzWvMyqjPTu5PTm3OzOtOzGrMSehNTCtNS+tAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ/QAAgQCwWhUhhQMBkDgKEQFIpKFgLhgMiOl1eC4iEYrtIer+MxsFRRgYe3wLkMWC0qXE5/T6sfiMSExR8Z1YRFRMWF4RwYIcYFhkahH6AGBuRk2YCCBwSFZgdHR6UgB8gkR0hpJsSGCAZoiEiI4QKtyQlFBQeHrVmC8HCw21+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-fileopen-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBOSmZPzSnPzChPzGhPyuZEwyHExOTFROTFxaVFRSTMSGTPT29Ozu7Nze3NTS1MzKzMTGxLy6vLS2tLSytDQyNOTm5OTi5Ly+vKyqrKSmpIyOjLR+RNTW1MzOzJyenGxqZBweHKSinJSWlExKTMTCxKyurGxubBQSFAwKDJyanERCRERGRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaRQIBwGCgGhkhkEWA8HpNPojFJFU6ryitTiw0IBgRBkxsYFAiGtDodDZwPCERCEV8sEk0CI9FoOB4BEBESExQVFgEEBw8PFxcYEBIZGhscCEwdCxAPGA8eHxkUGyAhIkwHEREQqxEZExUjJCVWCBAZJhEmGRUnoygpQioZGxsnxsQrHByzQiJxz3EsLSwWpkJ+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-fileprint-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFRKNAQCBPz+/MTCxExKLPTq5Pz29Pz6/OzezPT29PTu7PTy7NzClOzm1PTu5LSabJyanPTm3FxaXOzCjOTKrOzi1OzaxOTSvJyenGRmZLyyTKSipDQyNERCROTi5Hx+fMzKzJSSlIyOjISChLS2tAT+BDw6PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaYQIBwKAwIBMTkMDAYEApIpVBgOCAOg4RRGlAoEAuGIdGITgWOq4LxcCQgZkEkIHksHgYJOR6ZQCgVFhYJFxgTBVMZihoCfxUYDWUbUBGKGREcjBoQEB2TAB4CAx+Vl5WMhyACHiEhH6IfIiMktCQgE0cZJQStr6O2t6EARxO6vK6iEx4dZsMCxbsmBB4nzUTEutVSSUdmfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-filequickprint-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIMAAASC/AQCBPz+/ISChERCBDQyNPz+xPz+BFxaXPwCBMTCxAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARWEMhAq5UYBME7D9kkBMNGjqHmeWBoDhwsEIS7coVx1NhbCrmdzROk9SyU4GEJ2twECISOUNokEopsVrobKCgCrZa73IHFYy4VyZ5WNIO4vBhvse8gfwQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-filesave-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBFRSVMTCxKyurPz+/JSWlFRWVJyenKSipJSSlOzu7ISChISGhIyOjHR2dJyanIyKjHx6fMzOzGRiZAQGBFxeXGRmZHRydGxqbAwODOTm5ExOTERGRExKTHx+fGxubNza3Dw+PDQ2NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaAQIAQECgOj0jBgFAoBpBHpaFAbRqRh0F1a30ClAhuNZHwZhViqgFhJizSjIZXQCAoHOKHYw5xRBiAElQTFAoVQgINFBYXGBkZFxYHGRqIDBQbmRwdHgKeH2YgHpmkIR0HAhFeTqSZIhwCFIdIrBsjAgcPXlBERZ4Gu7xCRZVDfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-fill-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIMAAASC/AQCBMT+xASCBMQCBATCBPwCBIQCBISCBAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARSEMhJq50hXBvE0JsUEMXwhYFBmOeVDsVqgpS6luRc32RR6hLCTSCQ/VqEwwDhK5Z+Ao3wEPAViL6BR6PSZKyCa6uLAbcAZEznLDHQ1BZDiOKPAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-filter-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBKSipMTCxISChMTGxAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM3CLrcDiGGt6IQQ7pI8PjSVHUeqFVBNxRfFjXSZYqwENoUNFx4rve+wI6WEwKLQ5/CSCw2lQ9/AgAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-find-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBCQmJDw+PAwODAQCBMza3NTm5MTW1ISChOTy9Mzq7Kze5Kzm7HyChOT29Oz6/Nzy9Lzu7JTW3GTCzERCRLza3NTy9Nz29Mzu9Kzq9Ize7HTGzHzK1AwKDMTq7JTi7HTW5HzGzKzS1IzW5Hza5FTK1ESyvLTa3HTK1GzG1DyqtLzu9IzK1AT+/Dw+RAQGBATCxHRydMTCxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaSQIAQEBAMhkjBUEAoGA4EJXKJSCQUC0ZDCmg0hATHAxKRTCIEYYMiMFYsF0xGs+FUOl0BJRAweCIRHyATIRhpRAEAHSILIyQgJSYhJ4dIBBEoISkmKiuVSQgRIyEsEQgELVNCLgQVCiJRLQSfli9pMAQxMrRcQ1G6tAC9AL+7al+qxALACG1Kw8oxBGt7yWBpfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-finish-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAwyTBRObAw2VDR+nAQCBCRKZOzy/KTe7Pz+/KTK3Nzu/Lze7FS+1AyexAyuzBSavAyOtBSmzOTy/BRqjNTm9IzO5ETS3ETa5By61AyixByixBRmjAQGDBxCXGSivCySrCSWtBTC3AQOHAQWHAxWdEze7AQKFBRCXAwqPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZtQIBwSCwahYGjUjBQGgWE5LCgNBwITSFVKOgKDAZEIqodChSLw4HRcIyTW4Dg0HhAIhGIZEIJxA0VFhcYGRAaGBscHXEeHyAhIQ4iiBwjAHEBJCMjJCUmiSdlRyigU0oolURxRSmrTpevsUN+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-flag-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAASC/AQCBMTCxPz+/MQCBPzCxPwCBAAAACH5BAEAAAAALAAAAAAQABAAAAM5CLrcruG9QCULokqKR44NJQykQGgXSRaEcYJLsLLu6wSFoRMvCuk1kO9ni8GMt6MForQMl89NxJ8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-folder_new-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBPz+hPz+BOSmZPzSnPzChFxaXMTCBPyuZPz+xPzGhEwyHExOTPz+/MSGTFROTPT29OTm5KyurDQyNNza3Ozq5Nze3LR+RLy+vJyenMzKzNTS1Ly6vJSWlFRSTMzOzMTGxLS2tKSmpGxubBQSFAwKDKSinJyanIyOjCQiJERCRERGRBweHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaNQIBwSCwaj8ikcokMCIqBaEDoBAQG1meAUDAQpIcBQoy1dg2JdBqhECgQ1IWB0WgcBIOBwIHXBwwPEBEREhIBbG4IExR/DBUVFhIXV2NjDVYYDY8SFU4ZVxpVAQwbGxynGxkdTh6XVh8gGSGzGSITIxokJUImGSMTwLcnKCkprgAqDSt1zCssKxQtQ35BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-forward-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAwyTBRObAw2VDR+nCRKZOzy/KTe7Pz+/KTK3Nzu/Lze7FS+1AyexAyuzBSavAyOtBSmzOTy/BRqjNTm9IzO5ETS3ETa5By61AyixByixBRmjAQGDBxCXGSivCySrCSWtBTC3AQOHAQWHAxWdEze7AQKFBRCXAwqPAQCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZjQIBwSCwahYGjUjBQGgWEpHNYMBCaT4G2UDggos+EwmBYMBpf6VBgYDgeEMgjIpmoAQVKxXLBPDIXGhscRB0eHyAgDSGBGyJFASMiIiMkJYImUwAnmJqbjp4AKCmhAKSlTn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-frac-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBAQGBIQChCH5BAEAAAAALAAAAAAQABAAAAInhA9hig0SAmQOxeouPrFTzHzbCAzmiZ4k2S1ryHKsoo3tptXg3fgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-frameprint-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFRKNAQCBPz+/MTCxExKLPTq5Pz29Pz6/OzezPTy7PT29NzClPTu7PTu5PTm3LSabJyanOzi1FxaXOzCjOTKrOTSvJyenGRmZLyyTKSipDQyNERCROTi5MzKzIyOjLS2tAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaPQIBwKAwIBMTkMDAYEApIpVBgOCAOg4RRGlAsEAqFIcGITqnWRcPxSEDMgkhAonA4DO3yMD6BUCoSCYIWEwVTF4gYAhAMFRUMZRlQEYgXERqKGBAQG5IAHAIDHYiUEUcDpwIcHh4doR0fH02zqAIXIASsrqi0TQBHE7e5HqG0Zr8CwSC9qFJHxbRSU7W1fkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-gear-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBISChMTCxDQyNFxaXKSipPz+/CH5BAEAAAAALAAAAAAQABAAAANdCLobwbAFMciLwBFSihBEFHSG8QnmpQQEBX6loI5G5QTlcMgrZSmEmsGxKqRWNV3hMrFlBtDoA1eTEaKHJdMYhR6+gxkF++UMGbiDzvDVioyHAJSHcchuGLQq4k8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-gohome-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBDw6PBQWFCQiJAQCBFxeXMTCxJyanDwyLDQqLFRSVLSytJSSlISChCQmJERGRFRWVGxubKSmpJyenGRmZLy+vOzq7OTi5Ly6vGRiZPTy9Pz6/OTm5ExOTPT29BwaHNza3NS6tJRqRGQqBNy6pIyKjDwGBPTe1JSWlDQyNOTGrNRiBGwmBIRaLNymdLxWBHxGFNySXCwqLKyqrNR6LKxGBNTS1NTW1Jw+BEweDDQ2NAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaoQIBwCAgIiEjAgAAoGA6I5DBBUBgWjIZDqnwYGgVIoTGQQgyRiGRCgZCR1nTFcsFkHm9hBp2paDYbHAsZHW9eERkYGh4eGx4ag3gfSgMTIBshIiMkGyAlCCZTEpciJyQjGxcoKUQBEhcbIiorLB4XEltDrhcaLS4vtbcJra8bMDHAGrcyrTMXHjA0NSypEsO6EzY3IzU4OdoTzK0BCAkDMgkIOjJlAH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-goto-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBEQCBAAAACH5BAEAAAAALAAAAAAQABAAAAIohI8RyKciVnMwTlrlDfkm5QFgaHBWMo0lp22dZ57wO8vpGrLk2iJ+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-help-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQ6XAQCBCyCvARSjAQ+ZGSm1ARCbEyWzESOxIy63ARalAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAQ/EEgQqhUz00GEJx2WFUY3BZw5HYh4cu6mSkEy06B72LHkiYFST0NRLIaa4I0oQyZhTKInSq2eAlaaMAuYEv0RACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-history-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBEQ2LEw6POTSrOzWtNS2lAQCBOzatPTm3PTq3MyyjEw+NOzm1Pz29Pz+/Pz6/Pz27FRGPFxKRPTu3Pzy7Pz69Pz67KSGbPzy3Pzu3PTizPzu1Pzq1PTmzOzaxPTixPTmxOzWvOTOtKyWdOTGpOTStNS+nIRmVLymhNzCnOzavLyefAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaHQIBwGCgOj0jBgFAwGJDJAyJBUDihwgWj4XhAqhEJNDKhVLwUSUDyPJIrlgYlLSG0hYELhgLJTBJOd1kaGxgYHB0egkQfHBwgHyEigkUBIwMkBwcEJSZ3ARYWJCcnKCYpJJ5HAQUqFhSjJysoKItOCgehJBISI4tCtyERa79HTrx2WEiBUH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-idea-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+BPzerPz+xPyqXPz+/ISChFxaXKSipDQyNAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARMEEgZap14BjG6CJkmEMVQCF+4mQPBpthWtuYJxkJJGK6dbQRCgMBB3XCDzQamMhpDGlvuCFUyoQDLBUsJHBDUKuKQCKsUCIVZtc34IwAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-int-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBIQChAQCBAwODAQGBAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMwCKqx/iw0CNukzuJ8d1yCAAziIyliCKjck1ZuaV4igZ1r+raongE4j8YT6QiJC38CACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-locationbar_erase-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBPz+/AAAACH5BAEAAAAALAAAAAAQABAAAAIshI+py40Bo1SywgSFiDq+oG3hZHDhVpUmagFrl7pgN3oqPNuqpe+8Awwi/AUAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-lock-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaVAQCBKSipDQyNMTCxISChFxaLFxSJEQ+FExGHCQiDBwaDGxiLHxyNHRuPIR+TIyGZJSSfFxaRFxWJGRiLJyaXNzWpNTOnMzGnLy2hJSKTGReLKyqjPTu1NzarMS+jLSyfKyibJySXIyGVCQeDLSytPT29Ozu7OTi5NTS1KyurJSSjGxqVFxaXLS2tKSebOzuzLSufJSOXExGLGRiTExONAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaTQIBwGCgGhkhkQDBoEpLKQoBACAyOUID1qTVwoQGvMPxNFgVjAxp6QCQUicSCwVgkG44HJCKRRCYUCAxIFRYXhxgZGhYbHINEHR4fGCAhIiMkFSVKJicoKSoFKwMsLZtDLison6GjLA92qCueoAUvpC2xQhWqrLYDErmEMDEXlDIwMxAHukI0NS01EzY2NAmPAH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-lsub-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBIQChAAAACH5BAEAAAAALAAAAAAQABAAAAImhI+pFu2+QpxKVppsxkh3fnhh9DyGcC6IwLbqir4HK58tLcfx6xcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-lsup-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBIQChAQCBAAAACH5BAEAAAAALAAAAAAQABAAAAIlhI95YawYonwp0uoukFO7rCXCSJKPcKYKuqqii7BvS892XJZ+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-mail_forward-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIYAAIx+fIRydHxubHxmZGxiXHRmZFxOTFxGPFxKTPwCBLymlMy+pOze3PTq3PTu5Pzy7LSmnOTaxOzm5LyqlNzOtPz69Pz27MzCtLyqrPT27IRubPzuzNTGvNTCxLSelPz25Bw+ZFxKPPzy1Pz65LyupBxKdCxWfPTm1Pz23LyinBxGbGzO5DRafBxWfBxajCymxHTS5BxSdBxKbFTK3EzG1CSGvCyKvCSSxCSavGTO5GRaVPzqzFzK5EzG3BSCtAwiPGxaVPTivPzy3NzKpBxObCRefBxqlPTmzJR2bKyahAwyRPzmvOTOpKyObNS+nPz21AQOFKyOfPzuxAQCBGRORLSadPzyzLymjMy2lOzetDwuJFRCPEw6NEQ6LEQyLEQ6NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAkALAAAAAAQABAAAAfhgAABAgIDBAQFBgcIBwmOCQIKCwwNDg8OEBESjY8CDBMUFRYVFxgZDJyOGhsPChwVHR4fFSAhjwkaIiMOJBQQDRUVJSa3GicoHw4pEA8SGSorLI8tLtQu19gqLzDECTEyMzQ14zY1Njc3ODkqCTo7MjIxNCs5PD03PjctPwlAQUIihhBpQbCIihtG+CUocASFkAhIkogQ8kFJwkcFlogIkoRJEydPnkBR6GiAxiQLgiiIIkXElFQJqESoMsRKkAhXqkhhApNKFSxZggTJ4nHIEJhaDhzYwoVLFy1avHyB6ScQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-mail_generic-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBGxaVOTe1Oze3OTWxOTWvNzStNzKpEQ6LOTezPz+/Pzy7Pz69Pz27Pz25Pz21PzuzPzuxEQyLLyinLSmnPz67Pz23LSafKyObDwuJMzCtLSelPzy1My6nLymjNTCxLyqnPzq1LyihKyOfOzavOzetEQ6NPTq3NzOtLymnNTGxJR2bOTOpPTivNTGvLymlKSShKyahEw+NOTe3PTm1Pzu1Pzy3FRCPPz65LSadFxGPOzm3PzqzPTmzPzmvEw6NCH5BAEAAAAALAAAAAAQABAAAAaqQIBwSCwaj8ikMhloOp/QpmAgqAoIhELBUDgcEIGEYrFgNBoLx+IBiRwkgQnFoWAwKhWLhX3BZAILGhsCDXgODhwdGB5vgAofICBlDiEiIx4kJSYBJ2UoEykqHSMrLC0nLWAnFS4UCycvMAcEMR0RLTIBMwaSahw0NTYtFwclNwEdLws4eoc2DxwQOR06ASk7PBAhIRE9Pj0tLSUY1T8I5gjn6Qgy7D8SfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-mail_get-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAxKdBRSfCyGvFSm1BxKfCSWzCyWzBRCXCRKfBwuRAQGDDw6PHy23Cym1CSSxByCxBxunBQSFKyurMTCxExihNza3NTW1JSSlMzKzFxaXLS2tNze3KSipCQmJGxmbNTS1KSepLy2vISGhJSWlHx+fERGRPz6/IyKjDw+POzq7JyenMzOzKSmpCwuLDQyNIyOjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaeQIBwGBAIAsOkUjAgFJRQQMHgjC4PBIEVgAh4D4aEYrGAMhINxwPyiCgYSsmEUmk82grLRZJkYCgXaAEKFxYZcEISGhsZFxwFeY0WHR5CDB8dGCAXG5shGxQicBIMpSMUGxgTGSQlpQwSJicnEwwdI7gdKAwTsykpKiobr8QMKxeHDBcsGRvOzxsT0i0uL9HSHdkT2ZkoMJXF4a8AfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-mail_replyall-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIYAAIx+fIRubHxubHxqbHxmZGxeXHRmZGROTFRCPFxKTFxGPPwCBLymlMy6pOTa1PTq3PTu5Pz27Dw+POzi3PTm1OTWvPz25FRSVERCRLympPzuzPTu7NTGvFxaXKSmpPzu1Pz65Hx6fHxqZPzq1Pz23HR2dBw+ZHx+fISChJSWlDQmJHRydCxWfBxGbJyenExKTHRiXPzqzPzy3CQmJDRafGTO5ExOTERKTGxWVCRSfHTS5CymxBxajBxWfPTmvPzy1CyixCSaxCySxDSaxDSWxDSSvDyaxGS21PTmzPz21AwiPBRejCSavByGtCSezEzG3FzK5FzG3GzO5FTK3CQ2bPTixBxqlCRefBxSdBxSfBx2nCQ+dHxmXPzmvLSafAwmRAwyRPzyzDw6POzavNzKpAQOFPzuxBwWTBw2ZGRORLyWdMy2lOzetPTivAQCBKyObOTOpAweNBwWVEQyLEw2LEQ2LDwuJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAsALAAAAAAQABAAAAf4gAABAgMEBQUGBwgJCguOCwEMDQ4PEBESDA4TjY8DFAwVERYXGBkRm4+QGhsMHB0eGB8bDpyOARogEBceIRgXv8COIiMkGB4lJSYnIcwoKb/DGyoXKywtKS4pHinMLzAxJDIzNDUtNjcv6B0hLzgfMh85OjstPDw99zwd7T4/LTVAgggZQqSIECNHevSAgSSJkiVMmjh5AiWKlClAiFARUeVHFSVWmLS40gNLlh5agGzh0kWDlwZfrIDREKaCAjEqrFA5MMYLmTAxlJTxYoZMozNozqRRs4ZNmy5s3LwhA0dBnDNn5MxBoAABnTp17IitowDrmQV+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-mail_reply-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIYAAIx+fIRubHxubHxqbHxmZGxeXHRmZGROTEw+NFxKTFxGPPwCBLymnMy6pOTa1PTm1Pzy7LymlOzi3HxqZOTWvPz69Pz25My+tLympFRGRHxuZPzu1LymjNTGvNTCxBw+ZPz23PzuzPz65PTu5NzOtCxWfBxKbPzq1DRafGTO5BxGbPzy9HTS5CymxBxajHRiXPzqzCyixCSaxCySxDSaxDSSvGS21GxWVAwmRBRejCSavByGtCSezEzG3FzK5FzG3CQ2bPzuxAwiPBxqlBxKdCRefBxWfBxSdBxSfBx2nCQ+dPzy1CRqlAwyRDQmJPTmvPTixLSafOTOpAQOFPz21BwWTBw2ZPzmvNS6nPTivAQCBAweNBwWVNzKpPzyzLyihGRORLyWdMy2lOzetKyObEQyLEw6NEw2LDwuJEQ2LAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAsALAAAAAAQABAAAAfqgAABAgMEBQUGBwgJCguOCwEMDQ4PEJYRDhKNjxMPDBQVFhAXGBUSGY8LGhsQHB0VHh8gFQ6bjgEhIiMMJCUmFbS2CwMnG6IoKSorI7WpEycWFiUsLSou1yXXji8wFiopMTIzNDUz4zbZNxsbODk6Ozw9Pj8pPzEzQDdB60JDOkRFjBw5giRJDCWdlmxwIIRJExAWKDRyMgTIiydLoESRImQKlSUSF1SxUoXAlSBRsGSJoCVICIlbqlThcoBClC5eYFD4EiVIFwUyqywAE0ZMlqNjpJDpIkUBl0dlFChAYOZMmTJoyqQR5icQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-mail_send-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIYAAIx+fIRubHxubHxqbHxmZGxeXHRmZGROTFRCPFxKTFxGPPwCBHxqZLyqlMy6pOze3PTq3PTu5Pz27Pzy7LyinOTaxOzi3Ozq3LymlOTOtPz69Pzy5My+tLympPzqzNTGvLSelPzy3BxGbBQ6VPzuzPz65LyupNzOtPz+/GzO5BRejPzq1Pz23LymjHTS5CyixCSavBxqlPz25LymnGTO5CymxCSaxByGtHRiXPzy1CySxCSezGxWVPzuxKyOhMy6nDSaxEzG3PTivNzKpKyOfPzu1FzK5PTmzJR2ZLyihLSWfKyObOzmzPzmvDyaxOzavLSafGRORMy2lOzetDwuJEw6NEw2LEQyLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAsALAAAAAAQABAAAAfUgAABAgMEBQUGBwgJCguOCwwNDg8QERITFBUWjY8DFxgZGhsaHB0aD5yODB4TGB+kICEaIiOPCwEkJRcmJyYPKCIpKrWqKywTmC0SIi4vMDHEDCsyMg8zEyI0NTY3z7U4Hhs5Mx+0IyI6OyPrIzw9Gys+PxIy2EBBxAs8Qjk5Q0RFWFxAZySfgSMsilRAkiRECHQ08hHgJ0TJkCU/mECU2ISEkowUlpAQ4QTfowNPoAzJIeRJCyjm8kVRIkWIzSkXhwxJtYAKgp9VrFi5QoWKFZ5+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-matrix-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBIQChCH5BAEAAAAALAAAAAAQABAAAAIrhI9pwQHt4Jru2Vsjna919lXKeEimh6UZp1lrCEvkfILyirOby3q1OEv4CwAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-misc-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBISChMTCxDQyNFxaXKSipPz+/CH5BAEAAAAALAAAAAAQABAAAANdCLobwbAFMciLwBFSihBEFHSG8QnmpQQEBX6loI5G5QTlcMgrZSmEmsGxKqRWNV3hMrFlBtDoA1eTEaKHJdMYhR6+gxkF++UMGbiDzvDVioyHAJSHcchuGLQq4k8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-move-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAImhA8RyKja2HtRrmrxNfDszm3JMpXmiULg6Hyto4kYO49Tfdc04xcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-news_subscribe-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIMAAASC/ERCBDQyNAQCBPz+/FxaXIQCBMQCBKSipMTCxATCBMT+xISChASCBAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARsEEgZxLxYDlJsvsJGDN0nFQRhpKR3DSJxrGMphYQgpDI9WLhdTtjjAFApXZI30m2UQwICVigcEzzolKAYIAIFBAKbQjQX3YGGISZvFtzFQr1uDxT4PH0yYE8FCg0/Jn0MAwsNOiY3IQMBEn4RACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-news_unsubscribe-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIMAAASC/ERCBDQyNAQCBPz+/FxaXIQCBMQCBMTCxPzCxKSipAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARiEEgZxLxYDlJsvsJGDN0nFQRhpKR3DSJxrGMphYQgpDI9WLhdTtjjAFApXZI30m2UwxjsiOApB4kNLFtQKKopxeCQxR4GAJIXPCInzmhN9zvCljNq8ZvswmzhZHEfOhpofhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-next-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBFwyXAQCBOze9BwCHNx21LQCvPSi5NRi7AAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAQ3EMhJqwUhAMG7DQOxdVwFFuI1nYZIethwIK0aFwjtwrfh15cAYUjcvWyvkm1Z4TGfkyN0avFHAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-ok-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBMT+xATCBASCBARCBAQCBEQCBAAAACH5BAEAAAAALAAAAAAQABAAAAM2CLrc/itAF8RkdVyVye4FpzUgJwijORCGUhDDOZbLG6Nd2xjwibIQ2y80sRGIl4IBuWk6Af4EACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-openterm-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXFRSVPz+/PT29OTm5OTi5DQyNDw+PERGRExKTHx+fISChIyKjHRydFxeXDQ2NCQmJBQSFAQCBERCRMTGxHR2dGRiZExOTDw6PCQiJAwODCwuLFRWVOzu7BweHAwKDCwqLHx6fBQWFGxqbGRmZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAanQIBwSCwKAwKkMslEAgSDqDRKqBYKhkNgcDggEorkMrDQchkNhuOhgEQkk0l5S2lUGpYLJqPZTAwMHB0DCmhqAW0Rfh5zAxgOkBcCFAcfIBMECxwBBAEPFw8dChkhcBMDDAcdnQqtFKSWcQMimx4dGRkQBxGxsg6bBQEawx8jl3GnJFoFHRNXVVNRJYIFDAsL1tgiDiQXFx0HABwcXeQH5OjkRutEfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-paintbrush-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBMTC/AQChPz+/MTCxKSipDQyNCH5BAEAAAAALAAAAAAQABAAAAM7CLrMIS2qN2Sj1U4xugaYZxFE1wUaURQnKpFBYQTuFRiyXDsCd8y7RYhmCQ2IkiHywmkFN84ibfrxJwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-paren-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBIQChAQCBBQSFCH5BAEAAAAALAAAAAAQABAAAAI3hI+JEQq8mnvyzSOhEWJ3CgLcOILV4IlfUx1cwirfYiEvXL83arANSer5UipM5tIzXjRCh8ZfAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-pencil-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIMAAASC/IQCBMQCBPzCxAQCBPz+/MTCxISChDQyNKSipEQCBAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARDEMhJZRBD1H2z3lMnjKCFjUJQimOgcmcbELCXzjXq0hV785WCQYcDFQjDXeloMByKG6YTAdwIDAlqSZJSVFeKLcUfAQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-player_eject-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIbhI+py+0R3IFQUtruXVqn3kkWyIARR4rqKvoFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-player_end-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIjhI+py8Eb3ENRggrxjRnrVIWcIoYd91FaenysMU6wTNeLXwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-player_pause-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIfhI+py+1vgoxzyUCxrZd18ClfmIyVyJ1lqkHuC0N+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-player_start-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIjhI+pyxudwlNyguqkqRZh3h0gl43hpoElqlHt9UKw7NG27BcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-player_stop-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIahI+py+1vgpySUWpvXXqrHmSaeJEYhKYq6hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-previous-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBFwyXOzC7PTq9OTK7IQyhBwCHNRi7LQCzPSi5IQ6jLwKzORy7AAAAAAAACH5BAEAAAAALAAAAAAQABAAAAQ8EMhJKwg4W5o1EGAIbt8wEERhHJ0mIEmiLAH5IYxi1JcnvTOeTdDYcVo1gfHY+hxs0IkvSpV2qtgswB8BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-prod-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBIQChCH5BAEAAAAALAAAAAAQABAAAAIihI+py50Bo4SKHlsDwk9fn21gJzIcV37miKpuZ0nOTBt+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-queue-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBMTC/Pz+/CH5BAEAAAAALAAAAAAQABAAAAI5hI+pFrEahGgPtCinS2GMlknU0Xkflm2l6YEiw8aRGssTXLe3lZsznvuRViwholEcLZCfynGT8BcAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-redo-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBxOHBxSHBRGHKzCtNzu3MTSzBQ2FLzSxIzCjCSKFCyeHDzCLAxGHAwuFDSCNBxKLES+NHSmfBQ6FBxWJAQaDAQWFAw+HDSyLJzOnISyjMTexAQOBAwmDAw+FMzizAQODDymNKzWrAQKDAwaDEy6TFTGTFSyXDyKTAQCBAwiFBQyHAwSFAwmHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ2QIBwSCwaj0hAICBICgcDQsEgaB4PiIRiW0AEiE3sdsFgcK2CBsCheEAcjgYjoigwJRM2pUK0XDAKGRobDRwKHUcegAsfExUdIEcVCgshImojfEUkCiUmJygHACkqHEQpqKkpogAgK5FOQywtprFDKRwptrZ+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-reload-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBCRaJBxWJBxOHBRGBCxeLLTatCSKFCymJBQ6BAwmBNzu3AQCBAQOBCRSJKzWrGy+ZDy+NBxSHFSmTBxWHLTWtCyaHCSSFCx6PETKNBQ+FBwaHCRKJMTixLy6vExOTKyqrFxaXDQyNDw+PBQSFHx6fCwuLJyenDQ2NISChLSytJSSlFxeXAwODCQmJBweHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaBQIBQGBAMBALCcCksGA4IQkJBUDIDC6gVwGhshY5HlMn9DiCRL1MyYE8iiapaSKlALBdMRiPckDkdeXt9HgxkGhWDXB4fH4ZMGnxcICEiI45kQiQkDCUmJZskmUIiJyiPQgyoQwwpH35LqqgMKiEjq5obqh8rLCMtowAkLqovuH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-remove-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAASC/PwCBMQCBEQCBIQCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMuCLrc/hCGFyYLQjQsquLDQ2ScEEJjZkYfyQKlJa2j7AQnMM7NfucLze1FLD78CQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-revert-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIQAAAQCBPwCBPz+/PTizCQeHDQyNBweHAQGBAwKBDQ2NPzu5PTi3ERGRCQiJHR2dPTi1CwqLPz6/Mya/Mxm/GQCzFRWVGRmZAwODFxeXExOTExKTERCRBQWFMTCxKSipMzKzCH5BAEAAAEALAAAAAAQABAAAAV9ICCOQWkGIiqsQloCKCqy7UC8MC4URSsMhsDBNWOJEK4TYJfoGU8vmmJBGI5SyyYj0XDQjMvVQwBxRCQTilowFGwrjG5kTo+0x4OdpcLvV0YXIhcGGH0ZFRobOSccfB2PHR4FiyYAGQwdAI8eEAdQKBsZmR+RBpSVVyMHfiEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-rotate_ccw-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBFxaXIQChEQCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM0CLrcHjA6JcK4ET68MrNDoIgjOYbdJ4IXagIa3IqVFAMEOqpfn067ErBxG0qGsCJyyQT4EwAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-rotate_cw-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBIQChFxaXEQCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMzCLrcHjA6FaG4YbS6At5BR31UKI4mADGhd31rpbmCuZ6qQLA8XvqT2+QhHLKKxqSy4U8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-rotate-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBFxaXIQChEQCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM0CLrcHjA6JcK4ET68MrNDoIgjOYbdJ4IXagIa3IqVFAMEOqpfn067ErBxG0qGsCJyyQT4EwAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-rsub-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBIQChAAAACH5BAEAAAAALAAAAAAQABAAAAInhI8Jwd26YJBUTVvT1Rlt3x2f6DjQeQiGigLCC7crK7+yC9sty/oFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-rsup-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBIQChAQCBAAAACH5BAEAAAAALAAAAAAQABAAAAImhI+pGtZ7gpwQyWofnnQ7I4SiuAjlqZgpmqgti7gxfMh1OY6LXwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-run-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/ISChKSipMTCxLS2tLy+vMzOzMTGxNTS1AAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARlEMgJQqDYyiDGrR8oWJxnCcQXDMU4GEYqFN4UEHB+FEhtv7EBIYEohkjBkwJBqggEMB+ncHhaBsDUZmbAXq67EecQ02x2CMWzkAs504gCO3qcDZjkl11FMJVIN0cqHSpuGYYSfhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-signature-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIMAAFxaXPwCBAQCBDQyNPz+/KSipERCBAQChISCBMTCBPz+xMTC/AQC/MTCxPzerAAAACH5BAEAAAEALAAAAAAQABAAAARwEMhJZwgCiM17DoMkEGRpAmGhmSxhAOrakim6DgeLJApRhCPCgJRT8AhGEVFIQigAxgSQsBgwms8oIrDKDZNGxJY7GuYQULHhQj4shAmAuNAQsFc9xY4uUNgvMiQOBIMOfncjeUhICocXAx6RfwF+EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-spellcheck-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAASC/AQCBPzCxPwCBMQCBIQCBAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM7CLrcGuHBNZ+NIOJ9O4MTaH2e1nDoiFYZJjgwIAzwy8yEgy84RhWDQa4HCwAHxJgxSPApC83YyQnwJwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-sqrt-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBIQChAQCBAwODAQGBAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMyCLrcDiHK6eIL9WmsmwWCAAyiwkGKGILihzLq8p1s9onE9a48Iy28ko/WgRCLyGTDnwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-stamp-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPz+xMTCBISCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANCCLrR+zAIMQKMguh6GR2g1QEBCBLiGGjo+DSpS3IqXNqxNAnwzisSk3BowRltM8IAZVMqi84lLNoqUVfLrOhoVPgTACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-start-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBRSdBRObCQ2TAQCBBxObISevNzu/BRGZPz6/FzC3Pz+/HTS5ByyzJze7Mzq9ITC3AQWLAyWvBSavFyuxAwaLAQSHBRWfBSOrDzW5AyixCS61ETW3CzG1AQeLAweLAxefBSStEze7CSWtCyatBSCnAwmPBRWdByixAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZrQIBwSCwah4HjUTBQEogFw/M4BQgMh2pxijAkFAhBYJwUPq8LRsPxWDwgkSHhelA0JJIJnlKRWy4YGRoSGxwcHRsecgAfICEiGhMjJBglVVMRgBkgJp0El0MRJyhaRFqipUoAFqmqrapHfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-stop-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAASC/Gw6NGQuLHQ6NGQmJFweHFQaFPTm5PTa3PTW1Oy+vOS6tNSinKReVDQWFPz+/Nx6fNyCfNyGhNR+dMxybMRiXLxGRIwWFNx2dNx+fNx2bMxuZLQWFBwWFPTu7Pzy9NRqZNRuZMRSVLwmJGwWFNR2dMQiHPTKxMxmXMQyLMxmZNx6dMxiXMRSRMRaVKxybMxaVEQWFMQuJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaaQIAQEBAMCAWDYcgkHhAJxYLRcDQBggckIplQKpaLdRh4YDIaSWa94Vw6woAHgv6AMKGPaMQhwQMJJRkfhHmEJhdvRCcgGSCEkCgpbnAECiorGYYfLCItlAAFCygQj5AfbYlwBQwVE5AukG6KBi8tMC0fLi0pHxyzcAAxFxwmMny/wEwOxMm/qlcdJCSJ1H5XQh3a28HY3kx+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-sum-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBIQChCH5BAEAAAAALAAAAAAQABAAAAIdhI+py60BowyPJriwQ3qb7oGNyJCZtZHixHpu4xcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-text_block-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIahI+py40Bo5SOzRvrwlgrfnkJOIkPaaaJXwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-text_bold-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIihI+py70BowPQ1HZpwNv212Vg9IGHmIjoWa4ey5DSRNd+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-text-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIlhI8Jwe2/AmpTynqPTXSqrnBM+I0kdmpmGmUp+K4nPMvhYx9+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-text_italic-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIahI+py+0BgztwUmmjBXX3jE0auHHhM5Yq4xcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-text_under-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIjhI+pu+FxXoOIKpds1oBH7hlYxYxRCaIZ01lhJbHy9tTv7BcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-toggle_log-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBATCxMTCBPz+xPz+/ERCBASChISCBARCRAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEIQJqpXBBjFI1oGncYU4EUXxSWQZlum6DXDQpeo0tR6KqqgdLXiLBWepHgyYIxF/TKHv9XvtDDfb0So5YHuTgThYCXgH4Q6hqvEGEIm4PLGSyHX4OkZv8UcAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-top-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBBRObAQSHBRSdISevBRWfAweLNzu/BSOrAQWLPz6/FzC3DzW5BxObHTS5ByyzAyixEze7BSStBRWdAyWvByixCQ2TBRGZJze7CS61BSavAxefMzq9ETW3CSWtAwmPPz+/CzG1ITC3FyuxBSCnAQeLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZjQIBwSCwSA8ik0kgUDJhGQsFwgA4FBUTCoLBiF4zGtmt0FBYPSEQyoZCvWQakUok0LISnkHBBYjIVGhscS0UGHRUeHyBWAAIhiYuNAggVIgmMVgYjJBolAZMKJgpIjaanRH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-transform-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBMTCBPz+/Pz+xFxaXAQChAAAACH5BAEAAAAALAAAAAAQABAAAANOCLrcEDAGt4K4F46wmcVCQIzE4F1DukksehVkiUlDYcdfCAyEGI+D2aP3G+UmPF/MAJpwnpuNgMmcKHKgabWSvRi+ums3a32wzmWKw58AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-undo-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBxSHBxOHMTSzNzu3KzCtBRGHCSKFIzCjLzSxBQ2FAxGHDzCLCyeHBQ+FHSmfAwuFBxKLDSCNMzizISyjJzOnDSyLAw+FAQSDAQeDBxWJAwmDAQOBKzWrDymNAQaDAQODAwaDDyKTFSyXFTGTEy6TAQCBAQKDAwiFBQyHAwSFAwmHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ1QIBwSCwaj0hiQCBICpcDQsFgGAaIguhhi0gohIsrQEDYMhiNrRfgeAQC5fMCAolIDhD2hFI5WC4YRBkaBxsOE2l/RxsHHA4dHmkfRyAbIQ4iIyQlB5NFGCAACiakpSZEJyinTgAcKSesACorgU4mJ6uxR35BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-unlock-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaVAQCBKSipDQyNMTCxISChFxaLFxSJExGHEQ+FCQiDBwaDBweDGxiLHxyNHRuPIR+RIyGZJSSfFxaRGxmLJyaXNzWpNTOnMzGnMS+jJSKTGReLKyqjPTu1NzarLSufKyibJySXIyGVGxiNFxaXLSytPT29Ozu7OTi5NTS1KyurGxqVCQeDJSSjLS2tNTW1KSmpGRiLKSebOzuzJSOXExONExGLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaVQIBwOAwYA8SkMCAYOAnKYiFAIAQGyOgVCggYuEovVxztMpdnwAGRSCgUCwOjIeQ6HpCIZDKRUNYMRBUWF4UYGRoWGxyBRR0eHxgaICEiIyR0QyUmJygpKgUrAxMsLUQlKyieoKIuEAunK52fBS8DLiywQySpnjC1Mbi6QjIzNBeSIBY1EQfDQgosLAEUNjY3Co1DfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-up-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBRObAwSHBRSdISevBRWfAweLNzu/BSOrAQWLPz6/FzC3DzW5BxObHTS5ByyzAyixEze7BSStBRWdAyWvByixAQSHCQ2TAQCBBRGZJze7CS61BSavAxefMzq9ETW3CSWtAwmPPz+/CzG1ITC3FyuxBSCnAQeLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZfQIBwSCwaj8hhQJAkDggFQxMQIBwQhUSyqlgwsFpjg6BwPCARySSstC4eFAqEURlYhoMLBpPRUDYcHXt7RgUeFB8gIU0BIoiKjAcUIwiLSQUkJRsmGIwJJwmEU6OkfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-view_choose-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBDQyNAQCBPz+/PzerAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMzCLrcGlAs6UAYgwLdLtEcI4ygQo7VVp2oupGpG4vmaUVTemX523qlFcw0a4RqNlkx5k8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-view_detailed-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBDQyNAQCBPz+/PzerAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMmCLrc/i1IAVkYg1Z1iRYUKCqitp1oikqBWV3ZOnhkWNagqu+qnwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-view_icon-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBDQyNAQCBPz+/PzerAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMwCLrcG1AwGOQbw6qANeCEB3pCSZpO6pgowJZqLKuUGE0dnuEhf8IL1kz1shSHDX8CACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-viewmag--16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBCQmJDw+PAwODAQCBMza3NTm5MTW1HyChOTy9Mzq7Kze5Kzm7OT29Oz6/Nzy9Lzu7JTW3GTCzLza3NTy9Nz29Ize7HTGzHzK1AwKDMTq7Kzq9JTi7HTW5HzGzMzu9KzS1IzW5Iza5FTK1ESyvLTa3HTK1GzGzGzG1DyqtIzK1AT+/AQGBATCxHRydMTCxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ+QIAQEBAMhkikgFAwHAiC5FCASCQUCwYiKiU0HA9IRAIhSAcTSuXBsFwwk0wyYNBANpyOxPMxIzMgCyEiHSMkGCV+SAQQJicoJCllUgBUECEeKhAIBCuUSxMKIFArBIpJBCxmLQQuL6eUAFCusJSzr7Kmpl0CtLGLvbW2Zn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-viewmag-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBCQmJDw+PAwODAQCBMza3NTm5MTW1HyChOTy9Mzq7Kze5Kzm7OT29Oz6/Nzy9Lzu7JTW3GTCzLza3NTy9Nz29Ize7HTGzHzK1AwKDMTq7Kzq9JTi7HTW5HzGzMzu9KzS1IzW5Iza5FTK1ESyvLTa3HTK1GzGzGzG1DyqtIzK1AT+/AQGBATCxHRydMTCxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ8QIAQEBAMhkikgFAwHAiC5FCASCQUCwYiKiU0HA9IRAIhSAcTSuXBsFwwk0wyYNBANpyOxPMxIzMgCyEiHSMkGCV+SAQQJicoJCllUgBUECEeKhAIBCuUSxMKIFArBIpJBCxmLQQuL6eUAFCusJSzr7GLArS5Q7O1tmZ+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-viewmag+-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBCQmJDw+PAwODAQCBMza3NTm5MTW1HyChOTy9Mzq7Kze5Kzm7OT29Oz6/Nzy9Lzu7JTW3GTCzLza3NTy9Nz29Ize7HTGzHzK1AwKDMTq7Kzq9JTi7HTW5HzGzMzu9KzS1IzW5Iza5FTK1ESyvLTa3HTK1GzGzGzG1DyqtIzK1AT+/AQGBATCxHRydMTCxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaBQIAQEBAMhkikgFAwHAiC5FCASCQUCwYiKiU0HA9IRAIhSAcTSuXBsFwwk0wyYNBANpyOxPMxIzMgCyEiHSMkGCV+SAQQJicoJCllUgBUECEeKhAIBCuUSxMKIFArBIpJBCxmLQQuL6cAsLECrqeys7WxpqZdtK9Ct8C0fsHAZn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-view_multicolumn-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBDQyNAQCBPz+/PzerAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMwCLrc/ixI0WSgKoyBl+beQFACpo1AqXbKCr1wLAMWS08hGG3dSZqin4sxnBmPD38CACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-view_text-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIchI+py40BTQSwuovp3DXkv1ia1IHmIXLiyWJ+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-view_tree-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBDQyNPz+/PzerAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAAMuCLHcri4yGISlj4kxcANgNRBQCIbL6U1Su7bB62rXvGydG25kqpwfIGxILBr9CQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-window_fullscreen-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIQAAASC/AQCBNTW1MzOzMTGxLy6vKyurJyenHR2dOTm5Pz+/IQCBOTm1Pz+9Pz+7Pz+5OTmzOTmxOTm3Pz+3OTmvAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVuICCOZAkEaKquqzAQRWEYR32gSK7vO5oowKAQmPAtjkPFccEwLoaNhuPYDCSeT2B0+lhAfMHF1kF+PL5W7ZhrjqAk4gW53J0s3AG4nP6Y2BcUKAxLZn1+S4EBDAwQEIsUDBQRFJSJLJcoJpojfiEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-window_new-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAFxaXGRmZFRWVGQmhFwmfFxeXOTm5MTCxLyWzLySzKyCvKSCvJxyrJRmrIxipIxWpNze3AQCBMTGxJRWtJRatIxOrIRCpHw+pHw6nHQ2lGwulOzu7Pz+/Pz+9Ozu5Pz+7NzexPz+5Pz+hPz+3NzevPz+BMTCBNzetMTCDPz+xNze1NzezPwCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAACwALAAAAAAQABAAAAaVQEBAMCAUj0aCYFkwHBAJhWLBYDQcD8ghIjhIJhRKxXLBZDQaiYQLABDe8PiSu+HY7/dOh+PhQvB4eh8fIH6Adh2DHyGFAn+BiQAiISMkhnmSIQAlI5KXHIkfAiUmpCUnhoKLISgpIikmAlwqtCArkiUlIhwiuSKyEcHCESausMEsycrJEaaly9ARIizN1NPQ0dfJfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-window_nofullscreen-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIQAAASC/AQCBNTW1MzOzMTGxLy6vKyurJyenHR2dIQCBPz+/OTm5Pz+9OTm1Pz+7OTmzPz+5OTmxPz+3OTmvOTm3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVsICCOZAkEaKquqzAQRWEYR32gSK7vO5oowKAQmEAtfr9hgpFoGBWJpDDqcAaOUSHDEU08nkOG2AGBfK/aMYQMiRi7Ywe5674yE3I2JCqZoChLeGwSEgmFfgFNDQ8NjQ0TEROSRSyVKSaYI34hACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-wizard-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+xPz+BMTCBPz+/MTCxISChDQyNAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAREEMhJg6BYWhAGv5k2EKMXToSgEqc1DEIhvGAWpOvJFSXZyoXOxxY0BDahQDGg4xgOxmbgiWDqpoeqlGrVcZuSbLfpjwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-abbrowser-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBKSipMTCxISChPyqXPzerPz+xPz+/FxaXAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARhEMgJQqC4Xms1tkIgDEMYXpMYEEJRCIT6Ea5R2DHFtQZBG6dNoHQrsAyH14DDWiENBsQhBtskEs4Dohe4oiqE5So2zElECEKCrCYgQmcRVnRKnFIdC0L4/az7GXiBg4N+EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-access-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBGRufLzi7PT6/NTq9OTy9MTm7LTW5LTS5LTO5KzC1FyGrExSXHzG3Gy+3FSStPz+/ESGpFSmxEySvEyKrER6nERylExqjFSSrKze7EyCrDxulKzG3GSuzGSitEyWvER2nEx6pKzO5DxmhLze7DxqjExihERadLS6xERulEyOrLTC1KzK3ERWbERujFRefGR+nKTO3LS6zLS+zFRmbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAAAAAAALAAAAAAQABAAAAa1QEBgSCwWhYIBocA0CA6IhEKwYAQKDccDAolIJpSK5aKwFhyYDGSQoWgqm4uFYyV0PAeIIPIeayZlVw4OFV19FxoSGoFnH1tcayASIRciVgYfEWoQIxcLk4gHlxQCnJBcJBUSdAEHhQediSV5ExWBBxYQGSZelLkHJyhWsHmSISkHKpsrViwWJ1xPXCAtesIBCiUaGHm6LiYvLybXMAQCMQosBwcoMjIzMTQMAC0M9vf49wB+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-acroread-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIEAAASC/PwCBPz+/AAAACH5BAEAAAAALAAAAAAQABAAAAIlhI+pELshmkOhzmTvyZrFDglRxVEiGUoUualtx7gOC36gDGt+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-agent-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBKSipISChPz+BMTCBISCBERCBCH5BAEAAAAALAAAAAAQABAAAANLCLrcHkFBt4IY8EYKYCAT9xVBYRhbM5KFeaRVy56oSsgQ/TLrB567ym10ChiCnRIRaJx8lDdd86UkEWjHaURZwlKRHpM0xPOYGf4EACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-aktion-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBPz+/AAAACH5BAEAAAAALAAAAAAQABAAAAI5hG+hIuigAmMvLTlfnJiePQndt4SMFFioeaagaEbvySlQF6I2BLPRwYntDLlaylH8VXLDpaiJ8BcAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-alevt-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAASC/Pz+/AQCBAT+BPwCBAT+/Pz+BMTCxCH5BAEAAAAALAAAAAAQABAAAANFCLrc/i3ISadQYQhSehFecAGiYJ6oiJmaZrymSrKCJhinXLYmHo+l2skn0KGOPwyBUHPhOrqKVIWsmhqHyqhhPUG+Cn8CACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-applixware-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBKSipAAAACH5BAEAAAAALAAAAAAQABAAAAIyhI+pGbsBHYtHCGARbMhms1HVB0TieJhcl23liXkinAmhy7732UL9GnsZeixczChB+AsAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-ark-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAASC/PwCBAQCBPyCBPzerAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANCCLoQwTBK6dy8WNQgptAbB33DQGzlx3xE65RpBwgtCw9sR7e1gO8EGYs3DMoUH5rPqFylSrzaygcjHqdQVUYL8ScAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-arts-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAAQCBPz+/KSipPwCBISChAT+BARCBMTCxDQyNAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAMALAAAAAAQABAAAARTEIQ5xbgYAwJksFhhaFTVdeLpURYwAOL7cp6gpmcZHEQPGyIOLRAkiI4GTqmIDG5QwGihuRIBU8boasLzZbEd082QK7VkrvTwo2pvP5m4GxHP+CMAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-background-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIYAAAQCBJx6NJR2LIxyNJR6NKSORKyaTJyGRJyORKSWTJyKRKSWRKyOPKSKPHRKLEwiFDwSDEQeDGxGJLSeTKSSRKyaVLyaPLyaTGQqFFwyHGwyFEQWFDQKDDQKFEwmFMSiTMyiVJRuNLx+LOS2VOy2ZNSKTFQeFGRGJLyqXMymVOSiVOy6ZOymZKxyTEQODDQOFLymVKxuNMRyJOSeNMx2FLxiJLRiHFQaDDwOFDQODFw+HLSiVHxSLFQiFIQ+HKxmNJxOLJRSLIxGHDwODGw+HNSSPOSWNNRyFOyyVOSOPARihNSORKRSFLR6TPz+/MTCxKTi9JTW7GSy1Lx2THw+FNSOXJRWNISChASq3ASWxARynEQaFMx+JJRSJFRWVARafARSdHxeLFw6HPz+7Pz+5GxKJDwSFIRSNHxGNPz+3MSCPNSWTMyGNPz+9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAAAAAAALAAAAAAQABAAAAfXgACCg4SFggECAgMEBQYHBwgJCAoLggsMDA0ODxAREg0TCxQVghYWFxgZGhscHR4LE7GCHyAhIiMkJSatJyi+giApGCokKywtLhwvBzAwgiMxGDIzNDU2Nzg5OjsTghc8PT4/QEFC2EMeCZUARKpFRkdISUr09YIYET0qS0wqTUpOnkCJIkWQhxsbpsigUsWKkidXsGTRIkjHgy0YuMjoYkKJFy9KvoARFEZMBAg3UkIA6MTJGDKCBpQ5aebMGTQsx4xJU/FBBIxq1rAB4KTNS56Gkg7yEwgAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-bell-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBEwuFLR6PLRqJHQ6DNyuhLx6LKxiHDwiDMSOXLx2NKxaHAQCBHxSLGw+FKRyLFRSHLR6NIRKFExGHNTStOzm1KyqfIRmNHx6PIyGRFxeJNzavOzq1MTGpKymfKyqhKSmdGxqNDw+FPTy7KyuhNzevISGTJSSXLy6jOzq3Ly+lJyabHRyNCQmDKSifAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ6QIBwGCgOj8iAYEAIIJ+BguGAeCYTigXDegw0DI4tl/gQj4WB8hkAgUQeEsaEC6FULBdMRjN/QjYcHR4fICEiVn8jFCAkHxiHfiUjHRYfHyZmR4kdICAeJ5lCECgVKSorJysrLC1IEBgVFSgunSAaoWwTIi28DL5HfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-blender-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBDwiDPSyNOyKLDweBFQuDFQyDPSeNEQmDIxSHFQ2DEQqDARWjARGdASO5AR6xAQiPOymNAQ2XARqtAQKHOSmNEQiDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVqICCOQBCQKBkIA5G+63C+RW3UrIsSQt8fA+CMREAQgIkaUEdSsBK6hZBUeJ4YjRLQIKoOBgVAw/GAAAqRk+EJBkgmDQrAUDGxTAMBAgCR89oFOgF5YQAWdy8EeTeILyV5jY5nBAGFkpJ+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-clock-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIQAAASC/AQCBPzerPyqXMRaBIQCBISChPz+/KSipMTCxPz+BMTCBPwCBPz+xPzCxMQCBISCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVxICCOQGCeJjkGwkC8RFEEavkax2G8dB0QuRyhhzoBg8MSYsncJXKJZIDZHCoWP1ogGIwGrtnSgUFmHLyNRHhrdpjRamnO/SYkromHdnxwnwkKVxByZW8DgQsQM2JcfwZXO0MBCZSVBgMuLzJaRZ0pfiEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-colors-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPz+BAQCBAQC/MQCxATCxATCBPyqXPwCBPzerAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARWEMgZ6rwYBCFsvtXWeWA1DBU3ggRhomJQBm14dlJYFFXrbjKNwVDZ9Vw4TWWoKyCDgcNhyXQClVLpMmANIRAhLdGa+36j07GrfM4GiKTAGfsOlmYZfwQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-cookie-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBNzeDJR+BOzmVNSqPOSmBNSCBKRCJFwuBOSOjMRSTLRaXFQODMxiXOS6vIwiJGwKDHx6fKyqrMSOjNRWVLRaVFwCBJyanJSKhHRydPTy9PT29OyytIQSFPz+/JSSlOTGxIQyLMTGxNTW1Nze3Ozq7OTe3FxSTGxqZNza3Ozu7OTm5MzKzLy6vLS2tNTS1FRKPGxWRMSypJyOhKSOfPTu7LyupFQ6HMzOzEw+NJR2XKyOdFxGNHRSNJx6XGRCLHRCDMy+tGxONDwaBHRiVDwyLEQuHJRyVJyCZLSilIxiPIRePHxOJIRWJFwyFEwqDCwWBBQOBDweBKSCbHRKLHRKHIROHGQyBFwyDDQaBIxqTHxOLGQ2DDwiDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAe4gACCgwABAoSIiAMEiY0ABQaHjoQHCJOECQoLDJeCDQ4PEJMRERITFBUWFxgZhKQaGhsKHB0WHrcfEQARGxu3HiAKIRgiIyQlJicoGym+KissLRIuIi8jJTAwJjEyGzIYKxszNDU2Nzg5MDY6OyQ8PT4jP0BBQkNERUZHOkhJSktMZDQBcsTJEyhRpOybcuSIEipVrFxBgEVKFigATkiRgkSLki1UgFzh8kRKFEQbN3aR0qULIT+BAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-date-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIQAAASC/AQCBPzerPyqXMRaBIQCBISChPz+/KSipMTCxPz+BMTCBPwCBPz+xPzCxMQCBISCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVxICCOQGCeJjkGwkC8RFEEavkax2G8dB0QuRyhhzoBg8MSYsncJXKJZIDZHCoWP1ogGIwGrtnSgUFmHLyNRHhrdpjRamnO/SYkromHdnxwnwkKVxByZW8DgQsQM2JcfwZXO0MBCZSVBgMuLzJaRZ0pfiEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-dlgedit-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBMTCxFxaXKSipPz+/AQChAAAACH5BAEAAAAALAAAAAAQABAAAANLCLHcrSLKOVccAuvMLf2Rlw0bYRKFGBGZWQioRc4kPKfB+qFFL9ODF+EmKxh6vZOreETCbLiMESkcxnIgATXK2XgFqmxI4SgvAP4EACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-emacs-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBDQyNKSipPz+/FxaXISChMTCxCH5BAEAAAAALAAAAAAQABAAAANJCBASoXCFoVi8VdL6HHQeB4YjSAxnYQygSLzoSTjbEs9vMF86cbyH34NX+AELQ4zO+Nopm6cBC1PBEQwG6gd3SGo7Xa1STIb4EwAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-email-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBGRWVAQCBOTWvKSShDwyLOTazOTaxPTuzLSilOzi1OzezPzy7Pzu1NTKtKySfPzy5Ozm3Pzy3PTq1NTCrMS2rNzWvNzOvMy+rLSmlPz69LSejIx2bPz29ISChPz6/Oze1HR2dOTi5Pz+/EQyLJyanKSipOTm5MTCxHx+fAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaGQIBwSAQEAoJi8RgYEApK49FgOCAS0CFTsVAwEA2CIysMJB6QCEQyoVQsZOMFk3loJoeNAk4MGBQOFAQcDw8IfFoLDB0cEBMICIRxAV6NEB4aHwICk4wLIBYhIiObSxwLBSQkJaOlfQUFpCYnIyMoSVGbtQK3UQCbKCYprkq8m8S+uL4AfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-energy-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBBQSFASiBHS2/JzK/KzW/JzO/ASWBATCBASKBHy+/Hy6/ByuHASCBAR+BATOBARyBIzC/MS+BASeBASOBARaBFym/Pz6BASuBEyW5AR2BJS+7Gyq7PT2BARKBDyC1FSS3IR+BJyaBLy2BPz+BCxuxAQ+BDw+BOzmBARiBCxyxBxetPTyBAQCPAxOpAQ6BAQ6jAQ2fAQ2hLy6BAQubAQydAQmXAQmVAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAahQIBwSCwaj0hAYBkQBJDLAaFgOBCWxcAAkVAsGIyG4/EUBh4ICCIicUAgkwTZjKBULISL3oHJzAMaDhscHYEODhMeExEfSyAhGxsgICIYHiMWJCUYSyYYJw8kIigoKSomKxgmSywYfC0YGCJ8rSwuS7EYJBYYLi+xE5tkARMoMCoYEzEiJDIzMjQiSzExMxGkNTY2NTc4NTNPTOLjWElHfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-enhanced_browsing-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBOTWzIyCrFRSTMy+tCQmVOzi3ExKhAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARFEMhJq6UhyHy3GNmnAeNEFAZwpuRRBiIMkkOBjKuKTsHtgbISybTLYX6hGc+lSxk3tVtMVOkFck9MMNjB7jqkEQdMlvgjACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-filetypes-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMT+/ISChKSipPz+/PyqXMTCxFxaXPzerPz+xAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARfEEgZqg0zV8EHF5XWEUMxkBwGBB9REIZLfBgrkEaen+l6F4cYgpA4vEC+ASIYSxQRnlrncEgoFFQP0laCHpSmnk+AEJQ8ZeRkw0mDVJT3JZQZw+trC77Ouu8pfn8AfhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-fonts-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAASC/AQCBPz+/KSipMTCxPwCBFxaXMQCBCH5BAEAAAAALAAAAAAQABAAAANBCLoQ/C+I4GAMY1ZGN80UJ2jA0BFbUxhjF6BWsQroawEyWhN37vKxQo0ChPhOPaGDIhhADr5FinE4TG5PrBbiTwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-gimp-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBISChPz+/FxaXMTCxAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM6CLrc/izAJVWoD4MgtL2R0F2k6HFiOgjDSRBq0FLUKxYDTmKBnf6gGqz3egWFhEvSQ9kxJ9CotOFPAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-go-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBERGRFRSVDw6PDQ2NDw+PPz+/ERCROTi5Pz6/AQCBKyurERGPOzq7ISGhNTS1DQyNLSytExKTLy+vKx+RGRiZPTipEQ6LOzu7PT29JSOjOzWlEw+LIyKjIx+dLy6vOy6ZEwuFHQ+DCwqLGQ6HNSWPMymfIxmPMyqjKSipCwuLMzKzHx+fBweHOTm5GxubJSSlAQGBHR2dAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAadQIBwGAgIiMXhgAAoGAwH4QCRKAgVCwSB8AwwCo2n9ZpwMMSFhyEBGQoLEa5BMnkO3G/Kef2sMIdfCxYXT2oGGAIHCk0ZCBobHE8dHk8MFR+LgSAhXSIRdmNCBxScBiObCAYZI25wJE8SJSYECVVDCg8dERchJygPKSqsQgQNKwQFCw8fLC0KLi+LxH9YMDFX0ngAzzLZ2m4K3kN+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-gv-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBPz+/AAAACH5BAEAAAAALAAAAAAQABAAAAIxhI+pwaHZ2jNMWMFmvXk1GznHF4DhWF4cJlKpynpwB73ms3Etiq00EAr+hJGJ0eAvAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-gvim-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBAT+BPz+/ASCBMTCxISChAQChCH5BAEAAAAALAAAAAAQABAAAANUCBDMEqupNWoNJNgBV/mfwYCFqASgmA1h57VaO71lXLtPytZEBggZ0E7Vy2BQJEaRcDghP6iGb/IsNKBWKghZzb5EUau4g1KFz1QId+ydRRZwiD8BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-help_index-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPz+BAQCBPwCBAQC/IQCBATCxMT+/Pz+/ISChAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARTEIRJJZ1ACjF3GGAYaKNFDNfXldLJqmQWcKhcW6tkl1NhFJhdRmIwHIq8m8R3LAIlykCxiZQNl8XsU3eVZg0Y2LD3CyAQlassbEaz1N32Gz5m+SMAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-hwinfo-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBBQ+XBRCZAw+XAw6XBRCXCRObCxihCxqjCRijBRSfAwyVCxehDx6nER+pPz+/BxKZAwmPFyWtGyevCRSbBxWfAxGbHSqxGSatCxulBxahBRKbAQiNEyKrBRKdAw6ZAwiNESSLCyCDBxWBDRulBwyRHS6ZDSWHCyKFDQyNCxqlAQmRAwiPMzalPyCBMQCBCx+DAwuRBQqPITCdFxaXCyOFAQeNAwmRAxKdPz6/GyyVMTCxKSirAQCBGzKZAwqTAweNFyuRDyeJFzCTITOdAQiPAQaNHzCbES6NEy6PESyNDyqLDymJPz+xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfBgACCAAECAwSDiYMFBgcICQoLC4qCBQwNDg8PEJERlAYNEhOaFBUWnokBBw4SFxgOGRobCxyJBQkNHZoPpR4fICEiIiMBCSSYmgoKFgslJicoKQQKCSoZmgW+KywtLi8pMDEbFRqaAcwyMyc0NSkiNjc4ObsrKyU6Ozw97j4lNhGSfsgAEkQIDxr7YAwh0qKIDSM2jgRpgbDHPhFIMiZRsoTJkhMgobUDMKKkySYjUKockYJSypcrWypKQbOmTT+BAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-icons-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIQAAASC/AQCBPz+/ISChIQChFxaXKSipPzCxPzC/MQCBISCBPyqXMT+/MTCxPwCBMQCxMT+xPz+xMTCBPzerPz+BAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAV+IBCMZBkAqCgMa8uyJxoMRFHUtz3Eqk0MBhxBwJsRaqTcLhUQ3AyHAMI0EtEI0pGrpU38SANFQazYGY+LqUChYDQUxCbB8YjOFJAIpGEePOpZAhITIxJxAg8JDwQPMxISERESfXSVTRIQAZKHLyuOFI8US1RNnTApqCJUAH4hACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-iconthemes-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIQAAASC/AQCBPz+xISCBPz+/ISChPz+BIQChFxaXMRaBPyqXIQCBPzC/MT+/MTCxMQCxPzCxMT+xMTCBPzerMQCBPwCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAWLIBCMwhgMJqCKRBEIpWAMBRGsQXG8sIAiLpwNZpAFEAcbjlc0OI9BVcAWSDgHT9MtF1AsZrmamNpNBAyjwgCxpo0U5h1jOhg0HAMbPHB4QNIDEQIRDi5xfgFzBBITIxJUBQ8UD305EhIwEi45FQ+dFVMSES+PIy2nLgUSBpcGQVomqKc3K7WwIwB+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-input_devices_settings-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/MTCxHx+fISChKSipKSirATCxAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARQEMgQpL03iEEx1gOxdR5YbCJXZUbqjusUhGitZkFri0VFUodXoTfjWCi6oY8Skxl6k4FhxZRRRxMC1TBdWn0CAbcZQFAH4WnGjDPiPICYPwIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-kab-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBISChFxaXKSipDQyNAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANICLocHiyqIMQYUE5Ses8S1V0FGInFIJTalKpsS5FxKDxB/EzV4GUBQsXR87BQnRtNtxphfJ9FAAqbRqUXVfPaMH5MDRx44U8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-kappfinder-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBExOTDw+PExKTPz+/ISChAQCBPz6/FRSVIyKjJSSlIyOjGRmZNTS1Ozq7Ozu7AxyzPTy9ERCRBQWFIyqxPT29AQ2vOTi5IzG7DR2zNze3Nza3BQSFISy5CRyvBQenISmvBQitMzOzAQGBAw6rDR61Hx6fMzKzAz+/IzW7ASyvCwuLMTGxMTCxBwWFDQyNAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAahQAAgEBAYj0ahckAoEJ5QgkE5fBYO0SeCOigkFE2DeEFgUAUNBwGBeBAcCMHirF4gnhBCBCE5PydqBBQVFhdTSgJPBk8YGRQaG4dCiQQcDh0eHyAhIiN+BHYXJCUNIggmfhUOAQgbJ6YCKGcVKSUaChwGHCYqCyuIDhkhGyIsLcccCL6TFxsNJ8fRLS7KvyNi2GIrAQwK1AsvVOJULi4AfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-karm-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPz+BAQCBPz+/ISChMTC/MTCxPzCxMQCBPwCBAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARTEIRJa5Ui66H3FETHdcTwdcIofkVbUIJbmAEoZl95aoXxUrNdpnAIDFomgRA3yxxhIdxAlaKhAgUNYshyYVGxnMZInS6VzVSQPG0bkWaJZT4B+CMAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-kcalc-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPz+BAQCBATCxARCRASChAT+BMTCxFxaXEQCBPzCxPwCBAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARPEIBAq5U4iM17wJMwjORIfJkYFCs7nKA2rJQLp0Su66ikGcAg8OYTGA6BA/KAIIYsFudPGJQal8uAFVqxUg2JxBYbUGh7k5J6BppwKyB/BAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-kcharselect-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBISChPz+/MTCxAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANBCLrR+zCIGWCcI1cLpNCa5YHZsCmj2QTlxrZmmRFVSs4E7X13TqMTXsl36gSHuSIQQ+QYP0kncPCTokzWh3LhTwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-kchart-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAASC/AQCBPz+/ATCBAS6BPyqXPzerPz6/Pz+BPwC/MQCBAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARcEMgJQqB4WiFulhvXfaEwiJ4mEgExFCMVcENgBEXepdVhG7dcABGr/IJCQ8ICAt4IUIuSKAW2XMOD0qC42AIHV4277YIqKHKCy5txbIoyDy2Nr80yjyVwn5OYfhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-kcmdevices-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPyCBPyqXPzerPz+xPz+/AAAACH5BAEAAAAALAAAAAAQABAAAANMCLrcHjA6BcW4Q8AWLL7EFSwdOIRoOAKBiZ5EPJYvBMeDba5BQfg52ik4KPgKOVYqZiwYjLzb7/c0JCnSo3VFasFEXE5kMymbzwp/AgAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-kcmdf-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMT+xAT+BASCBATCBMT+/AT+/ASChATCxPz+xPz+BISCBMTCBAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEEgZwrwYBCFqvhs3DNYXjChRlWBRjIRqGN4UuEUczMZxsDeXykdEsDQVVSLhQxhBCkVlmXA+KVHFYhFYOoHbMGN6pTQaW8YYiQmcG+q16a0+Zipw+4e9B/gjACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-kcmdrkonqi-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPzerPz+/PyqXMTCxPz+xAAAACH5BAEAAAAALAAAAAAQABAAAANKCAoRy+6pIESkVuLaKl8b53lOaA3EyIXBUBjpWHKDYNhxNrWv/aaRiWBwKwoIDZCH2EN+TMQjyzR0yhgqiyo4vT4wl48E8g0C/AkAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-kcmkicker-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBFxaXPz+/ISChMTCxPzerPyqXDQyNAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEEgQqr11AjG6/4FGDEVZBOapWSXbToFhoKkZUjJGEEJvyUDDYQaKATElBOJklB0OgY5SWgnmpFJm4PkMjDxLFYXFGSCyN8mocDaD0xsSO6wUS6K1FBzDD/gjACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-kcmkwm-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBCRiXCRaVPz+/CRmZFRWVISGhMTCxESSjPT29DR6dDyOhDyCfPTy9CxqZOzu7Ozq7ERubOTm5ARehAxefPz6/ByaxBSOvBSGrAxynAxqlBR6nBRylAxmhARWdFxaXCH5BAEAAAAALAAAAAAQABAAAAWHICCKQTCeqCgMhJCihXEYSPuKRWIoC6PYsEZikHA4FA4CEJdoJh4QgXRwiOAeQudDIpEZIpPwhCImhyGGAmBSOVgumExG055w1ZPZhpPpUDwzExBqAAUDhxUVTQ0QEgWOOIcDiU1QjoSFFYiKDZYFmAWJlE9bkCM5iouWpiIfBa6frrKYAH4hACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-kcmmemory-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBISChAQCBMTCxCH5BAEAAAAALAAAAAAQABAAAAI6hA+Bu+HCmgiiRuNoHZBRXQlc84TmcHzm2WVryE1YvMaZIdbVd2zw7lj4bDKGbxK8hHgX3K2JUDD8BQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-kcmmidi-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBFxaXKSipMTCxPz+/AAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM7CLEL/pDJAONs1V2W1ebWJ46kKJxomi5D2QZEwRSyVMNyngf7Eg8FYHAIZMRoyCSNMSA0n85oszTxJwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-kcmpartitions-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMT+xAT+BASCBATCBMT+/AT+/ASChATCxPz+xPz+BISCBMTCBAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEEgZwrwYBCFqvhs3DNYXjChRlWBRjIRqGN4UuEUczMZxsDeXykdEsDQVVSLhQxhBCkVlmXA+KVHFYhFYOoHbMGN6pTQaW8YYiQmcG+q16a0+Zipw+4e9B/gjACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-kcmpci-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAADQyNATCBASCBKSipFxaXAQCBMTC/ISChAQC/IQCBPyCBPz+xPwCBMTCxPz+/AAAACH5BAEAAAwALAAAAAAQABAAAARVEMhJqww4a33F+EL4jUI3EEXoEWzaFbAKzyUQeLihDqrpHQhBQkHyqY49iWCxbDKfJQbASYUCpJbslcHter+NQ3gsLo8bBYd6zWYf0u24GjWr22f+CAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-kcmprocessor-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBKSipMTCxISChFxaXDQyNAAAACH5BAEAAAAALAAAAAAQABAAAAM7CLrc/jDGQCWgIleH88jCdgXgB4JVQJxsVgQXIQvrWdwwJc/0jcOG0Y7gqwQVQR3R+EgyJcGjZUoF+BMAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-kcmscsi-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPz+/MTCxKSipISChAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANCCLoQwZAFIV6UYgxi79Qa52WDE3bKV6YOpFpO3L5pJcckLBB8/wQEDezWAQpZqIWxFNAUkqkg6HmJOqGuArUqwfoTACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-kcmsound-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQC/AQCxFxaXAQChAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM7CLrcDiE+F4SQU4UBLH6VoHjT1okQR6mnuTYuJMWaGlkXW2u4QOipRYDws82AjJsHKez9MgrigAkF+BMAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-kcmsystem-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBGxqFAQCBPz+/PTqtOTOfMSyPNze3Ozi5KyeLMTCxMzGzKSipOTe5MTGxAAAACH5BAEAAAAALAAAAAAQABAAAARfEMhJQah4ihFunsFAEIVXCVJACIJhoBK6CerawsA8HAhbuAnYZrBDKBYMWpCy4S2QSRazyBIwrrjcoNFQzK4KR1bQcHhZjGM2BgWLMYJ2enForHPJtNj+kfHvcB8AfhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-kcmx-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIAAAASC/PwCBCH5BAEAAAAALAAAAAAQABAAAAIlhI+pm+HB4HkS1flszOCq7C2Qw0wdJ2Lk16BGeK5dSZX2jS9+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-kcontrol-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAASC/CRyBBxSBExOTNzipOTijOz67NT21LzutJTmlGzaXPz+/OTi5AQCBLy+JKSiJES2NES2LESyLDQyNLy+vLzWhLzWjLS2tGRiZDymJASChIQCBDyuLLzShDyiJMQ2LATCxMQKDDSaHDSWFCQ6tMT+/PzCxLzuvCyKDDSSFKyqrMTCxGzabDw+PISChASSBAT+BDzOPNTW3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAacQEBgSAwIBsikkFAwHBAJhWBBpTIaAccDAolEJIKJWEzBMiuWCyYjaLjd5exDIsE02A1NY9OIMzkcHRkebW99WFoVahkfbSANIYdCBh52IiOFb2VCByIWIh0kbSUNJpIBJ6CgKJlwDUIJKSooswIUt7crrwEsKC2+rC7CLzAuuzEoycmtbgAAAtDR0DLGztYALbm426/Wht9vzn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-kcron-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIQAADxePARCBAQuBNTS1OTi3LSytAQeBMTC/Pz+/AQCBOTi5MTCtISCZAQiBISCfKSipFRWZGRiZERCRHRyZMTOxDxOPMTCxIyCjCQiJAQOBLS2tAAAAAAAAAAAAAAAAAAAACH5BAAAAAAALAAAAAAQABAAAAWFIBCMpCCQpDgQLFusLVEYAXEgOJIQOXIkNF5v19MFWQrCgsFYxIC1InEYvOWmuF9QKrw2aoSkYtksOBwEaBeXeEAiiIdD8rUNJw8EBUGobIcQFggXLglgCohLGA95CQMOGVFDEQ4YGhERdAEWCZ2dDwsSEHMOEA0ABqmqGRkGDQ2pDRV+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-kdevelop-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBGSKXEx6RFR+RFSORISidJzCjJS+hISydHSqZDxuNIyuhKzOpLTSrKTGlHyybGyqVDx2LHyedKzKpLzWtMzexLzavIS2fFyWTDyCLCxiHNTmzPT29PT69NTm1GSWVESKNCRmFOz27Pz69PT27MTKxJymnIS6dESGNDR6HFyCTIy2fNzm1Ozy5JyenISKhISOhMTKvESGLBxaFOzy7JSWlIySjCx2FBxGDIyOjOTu5BQ+DFSGRDR+JCx6FBxODDx2NGyaXCRyFCx2HCRqFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAexgACCg4SFhgABAgMEh4MFBQYHCAkCCocLDA0MDgcPEAQRhRITFBUWDAcXEBgZGoQIFBscHRweBgkfICGDAQcUIiMdJCUmJxgoKbsAKissLSQuLzAxFgQyKTOCKgk0NS/fNiQtBBk3OIIEEC0cMDkvJiQ6ICk3O4M8FCQcNjAcJBM9fPwgBCQICxI0XtBgQeCGEHuEFGCYwILFBAJCHh7SEGJIRiI/IDaagSNko5OF/AQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-kdisknav-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBERCBBQWFPz+xPz+BISCBERCRPz+/OTm5HRydAQ+XHR2dKSmpNTS1Hy+1AxypNTu9ITC3ARypExOTFSyzHS61JTK3MTi7CwqLBR+rASGtDyixFyuzDw+PAxWhAxmnBRypISitCRujAxelAxmlFSixMzKzCRqlMzOzMTGxMS+vGxubLy+vLy6vKyurCwuLGRiZLSytFxaXJyenGxqbDw6PDw6NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAafQIAQEBAYh0jkQEAoFAxJ5EGAaAoSh8BBEUBSrQtGw5EodwHfgsBgeEAWijGW2XTaDRHJJExBrwl1AhUWFxgRDwdCGWkCGhsbHB0WGB5CjB8fICGOGxaJaWwGIiMfJCUTJh50dk4ODiejHyiff2oGDikqK7osiUIGai0pJyouxi+9v2pEMDEyLTIyDckCy0gBMDM0DTU2flFDARk3AH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-kdmconfig-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/MTCxISChMT+/ATCxASChFxaXAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEMg5gw00yyDGIAR1YUDggeFWFIZhnSBZrsZxdIOFEGTA2oeBAHeyuGwvzxBlYdUOLROMFzDQntJPrNoqAKUBaqnV+k57ZORruykHDj2LqIzUVKp1u0iuB/gjACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-kdvi-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBPz+/MTCxCH5BAEAAAAALAAAAAAQABAAAAJCRI4ZwCYPo1gsiIHHxY86KXmWdiGkCA1Wp6Htc07NOsEv2oVyldLHbuBgEhORJhOxGEkkiLJybCZ3iqrD08hmF/4CACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-keditbookmarks-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBCwqLLSytLy+vERGRFRWVDQ2NKSmpAQCBKyurMTGxISChJyanHR2dIyKjGxubHRydGRmZIyOjFxeXHx6fAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVbICACwWieY1CibCCsrBkMb0zchSEcNYskCtqBBzshFkOGQFk0IRqOxqPBODRHCMhCQKteRc9FI/KQWGOIyFYgkDC+gPR4snCcfRGKOIKIgSMQE31+f4OEYCZ+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-kedit-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBASCBPz+xPyqXERCBARCBISChMTCxPz+/FxaXAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARXEMgpQ6B4WnGzDgJHWWMYdkAwEF1QFKe2oqDZztr7GpfKjrvAAeFDpQq8ISIRYBotSoTUkiC2ostqYps49BSKIVfaBbcC4MMWcTAbU+iw21NBk+gjuj8CACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-key_bindings-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBISChPz+/MTCxAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANMCAoRy2IEuYIQDsrBld0NN4XaJF5iCppWxBGtCscEAbkDfH2wh+ogiudD5AhvoZWoJEFtckBTE1dzKKfQjMtUjfQUzizjeBN7HgB/AgAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-keyboard-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBISChPz+/MTCxAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANBCLrR+zCIGWCcI1cLpNCa5YHZsCmj2QTlxrZmmRFVSs4E7X13TqMTXsl36gSHuSIQQ+QYP0kncPCTokzWh3LhTwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-keyboard_layout-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPz+BAQCBPwCBMT+/AQC/Pz+/PzCxKSipISChAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARSEEgZqr1hUjFIEQXBZVogDt/XYWxgoEVFzEUt3MGNm7SND4aarPfBFQYCQmtpiTErh+ahMK1SqVHoYcvtUptX67SWDXTPXWltva5q0WfEs+WPAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-keystone-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBMTCxISChPz+/MT+/AAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM/CBDcHkoFQasVUIrBe8fRNDwMAWpjUThmtmxk0IYwOaPx/V6XG3hAjmsRa0Qkg6NSOVo6F0nG88g4TUNDpT8BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-kfax-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAASC/AQCBPz+/MTCxISChERCBFxaXPwCBAT+BARCRAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARVEMhJQ6C4imEzDkLIXR4ADqFAThYRoFu4ti6YbhfdFm+aEzWgAWhB5QyGAMEwWA4PlpyFCWwOkAhCgla1EqxXKbD7vSJnyuUXyV5JuOxtqZV0z+3+CAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-kfind-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBExOTDw+PExKTPz+/ISChAQCBPz6/FRSVIyKjJSSlIyOjGRmZNTS1Ozq7Ozu7AxyzPTy9ERCRBQWFIyqxPT29AQ2vOTi5IzG7DR2zNze3Nza3BQSFISy5CRyvBQenISmvBQitMzOzAQGBAw6rDR61Hx6fMzKzAz+/IzW7ASyvCwuLMTGxMTCxBwWFDQyNAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAahQAAgEBAYj0ahckAoEJ5QgkE5fBYO0SeCOigkFE2DeEFgUAUNBwGBeBAcCMHirF4gnhBCBCE5PydqBBQVFhdTSgJPBk8YGRQaG4dCiQQcDh0eHyAhIiN+BHYXJCUNIggmfhUOAQgbJ6YCKGcVKSUaChwGHCYqCyuIDhkhGyIsLcccCL6TFxsNJ8fRLS7KvyNi2GIrAQwK1AsvVOJULi4AfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-kfloppy-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPz+BAQCBISChKSipFxaXPyCBAQChMQCBPz+/AQC/MTCxATCxAQCxAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARWEMgZgggz5zAIBp9GFV8oSqRkikFanapBVgccGAiJBDWL74jd4UUxGBI/IcJQMigSimPSsMDcEFCFVkptKhCDgSBB7m4sA2y5eqqMF2YYKMBgys8nfwQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-kfm-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBGRiZERGRPz+/MTCxAQCBMTGxPzerLy+vLy6vPyqXLS2tLSytKyurKyqrKSmpKSipJyenISChJyanJSWlJSSlIyOjIyKjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAV+IBCMZCAIQKoGw0C8MFEUqmgYrTwXL50GhtegcCgedr4AIpEYHhQKopEWSCwYw1fUeBQxGo3hiBCIUR2OxyAwG8OoD0hkICFABMiZKBKZ0GNkPiIUFBUuEoiIMisVFRZ/MWwqAheVfxICdZIpmZZ1kYIAMxcuJWWhKXl5Kn4hACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-kfm_home-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBDw6PBQWFCQiJAQCBFxeXMTCxJyanDwyLDQqLFRSVLSytJSSlISChCQmJERGRFRWVGxubKSmpJyenGRmZLy+vOzq7OTi5Ly6vGRiZPTy9Pz6/OTm5ExOTPT29BwaHNza3NS6tJRqRGQqBNy6pIyKjDwGBPTe1JSWlDQyNOTGrNRiBGwmBIRaLNymdLxWBHxGFNySXCwqLKyqrNR6LKxGBNTS1NTW1Jw+BEweDDQ2NAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaoQIBwCAgIiEjAgAAoGA6I5DBBUBgWjIZDqnwYGgVIoTGQQgyRiGRCgZCR1nTFcsFkHm9hBp2paDYbHAsZHW9eERkYGh4eGx4ag3gfSgMTIBshIiMkGyAlCCZTEpciJyQjGxcoKUQBEhcbIiorLB4XEltDrhcaLS4vtbcJra8bMDHAGrcyrTMXHjA0NSypEsO6EzY3IzU4OdoTzK0BCAkDMgkIOjJlAH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-kfract-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBAQCxAAAACH5BAEAAAAALAAAAAAQABAAAAInhI+pyxudwoNACiFbuBzHt3XeEYbiBF5mN5HpyayqVrY0hdj4vvgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-kghostview-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBPz+/MTCxCH5BAEAAAAALAAAAAAQABAAAAJCRI4ZwCYPo1gsiIHHxY86KXmWdiGkCA1Wp6Htc07NOsEv2oVyldLHbuBgEhORJhOxGEkkiLJybCZ3iqrD08hmF/4CACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-khelpcenter-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAASC/FRWVExOTKwCBJQCBIwaHFRSVPz6/LxSVOSqrNyanIQKDHwKDHwCBPz+/OTm5Ozu7JwCBMRKTMxubLxCRNTW1IyOjDQyNEwCBGQCBJyanMRaXNyOjKQODIRydKQqLOzCxEQCBNze3Ly6vJQKDDQ2NIQCBCwCBGwCBFwCBDw6PNyipDwCBKSipEQ6PDw+PJR2dMRiZHwSFPz29BQSFIwODJwuLMTGxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAabQIBwSCwaAQHBgFA4Cg2BwwGRUCwYxobD8YBEBpLJoEGMUA4VywWTaUQOmstww+l45MKM5/DAf0AIDSFFBiIHI3IEHCSDRgEOFSUAJhQNJ0coYikAKpB4RQwrJiycWy0uRQ2AKKQAL3wwKEMCMDEdGEMvWxIKDTICIzMQKZdDKQ0dMSAxBzMPGjRGGCkoNTYaNzTRThgnJ9pFfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-khexedit-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMTC/Pz+/MTCxFxaXPz+xPyCBKSipAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARZEEgZ6rw4CB3wrJUggt03nANIoCUQoDDcvqJAaHXqunBxywFDZWArDHy4lOEwTBEKgYJRyeQJEIEnYrQsvU63abBKIYq2m+4s5mTeTLVRSFdmyy6kvGXijwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-kicker-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPz+/FxaXMTCxDQyNAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANECLrcEDDKGYQV4+qbie9eGIJEVxTe+QmjUFgnXLLr615oF8x2v0I8DWpF2GV6slkLKSMdYT4nS0WgSkXYAWUbcXgX/gQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-kiconedit-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIQAAPwC/AQCBMRaBPyqXPzerPyCBPzCxPwCBPz+xMTCBPz+BISCBMT+xATCBAT+BASCBMTC/AQCxAQC/AQChAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVkICCOpBicZQoEwjAE6hgQQwvH81AU8OnfuR3QYDgcgAKhjGj8+UgzQkHHw+2mQlQpgEAkFInEYnGDhr/h8VPGYDQcjcZj/iiv4u84vQ6FQCISERETgxN2AX6AgoQThlBOkCR+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-killustrator-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBAT+/Pz+/KSipPzerPyqXAAAACH5BAEAAAAALAAAAAAQABAAAANHCLrcGzBK+YK4OAcAx4AXIURj4J2fJYhWh35pOHKoG8+mFxS5HimmXU8HBH4MQyJD+FI+kM3Ug9eENALQk9VhDW4c1y/YnwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-kit-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCxCH5BAEAAAAALAAAAAAQABAAAAIghI+pFrHbXmpRMmoBxXB75IWcKIKk022ZunJtdlSw5BcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-kjots-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPzerISChPz+/MTCxMTC/AAAACH5BAEAAAAALAAAAAAQABAAAAM8CAHc7kGsR1mc9d1Md/icIgXDB1YXMZQnZBJEIbdKABPGTbSfnuc8mw8W1OlotYER2fgod5iMKRqiNvwJACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-klaptopdaemon-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/KSipAT+BISChFxaXPz+BMRaBPyCBMTCBDQyNAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARtEIBAq5w1TBGEGIM2ESTlVUNhaAFJUAcXgAXCZkFyJEoiIArWYQjj+Xi2yfBA0SU6CuAts4MCk4EdcxbznFhOCsjrWUxRhbRBBk48Z6kCZ2GeuN9xucF8FqcEBnt1OW4saSp7IoRPEjgiGBV+EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-klipper-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFQyDEwuFEQuDISGhFRSVEQqFEQuFPz+/PTy7Nze3PT29Ozu7DQyNJx6VIxuRIRiLEwuDIxSFHxSHKSipLSytGRiZGRCHDwmFOzm3HxOHIRWHOTazHRCFHxOFEwyFNTKvHROHFxeXJRqLIxWFFw6DFQ2DNTCrIRaJJxuPMSynHRKHIxqRMSqjGRGHMSifJxeFKyGXHxKFLyaXKyObGxGFEwyDKyOXIxeHKSOdFQ6FIx2THRKFFw+FKx6NKRmFKxuFLyCPLyOTLyabLSefLyijFw6FJRmJIxWHHRGFFQ2FAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfFgAAAAQIDBAWIiAMGA4IABwgJCgUICwwKDQ4PEBGCEQsSEwUUFQQWDRepGJ4ZEggIDbENrxobAZ4cHa+7uxAeH4IGICEIIsbGFggjJCWCJicovLwpIcAAGCorCBbc3AoILB2rgy2u0q8OLrcAJS8wr8nJrzEy6yUz79sivDQ1jQA2buB4tU8eghw6xgnYwePcqxcdbAjq4eMHECA+ggiZMYRIESPjShyBgQPJBB48OsiokaTDOoACItgwYULJhw8BbIzzEwgAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-kljettool-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/MTCxKSipISChFxaXATCBDQyNATCxASChAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAReEMg5Q6CYBiFsxhvXXZklimRlDWenBQNRzKJRXCsxHPFcIDGcILYbGHqzAY41NCQSiuNgMLPAmNTElFoFWKecqe8mCRAIq6nt5imb0TC2wZByny3zdslMr3+8fgB+EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-klpq-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMTCxFxaXISChPz+/ISCBPz+BKSipAT+BAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEMhJqwUh3xqEz8EWDKT3aVNAFAVBDqYQYitbjARhGDJt34Nc4SBAZAomoDAhKAwyTZZp5XE+O0lp9QVFeLNWUpflJXheTww2ijiLKSBPW/C+xOmzjQRU8UcAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-kmail-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPyqXPz+/PzerMTCxFxaXIQCBPyCBAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAReEMgJgrWU4iAGIUFWFYMldF+okUPJeeAUDEY7FFzXqnNdkIGDgHAKzWgsDuJAFBhbtd1peTAWDFjpaZg6skonYfOZzC3HlduuMj1UZUDZ6RMblTTDokylQYsyFwB+EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-kmenuedit-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMTCxAT+/ATCxASChPyqXPz+xMRaBISChAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARLEMhAq5UY2B3yFGDIYcFgnuNErGwQCl1VzHSJBsbBUSxBIbnEC0YrxICHhFKZCiATlldn8gSlNE7YEurRQHdd19Aa3m6nmV0F448AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-kmid-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAASC/AQCBKSipISChMTCxPz+BAT+BFxaXPwCBATCxARCRAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARUEMgJgqVYWsFv3lwoeFMwEIQYkkFhouoQlIFhHvCgz9oxjoeDblc6+Q4B4ZBXCSBQx+GIZhNAOURaACsYypq0kNeSSLC2uxm5fGZqAgqFO0OjT/wRACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-kmidi-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBPz+/Lz+/CH5BAEAAAAALAAAAAAQABAAAAIzhI+By7oBo5RH2GvDRRhre0xiVHXZVpqfEI5iKkQxalzQIIPGhI+pSAN4cjqA68VIHvwFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-kmix-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBFxaXAT+/DQyNATCxMTCxPz+/AQCBKSipASChAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARWEMgJQqCXziDG2JoUEENhZBkmHIWJVptAmqcIW/Js1MiF56TBzkckAAcHoa9nMRKeA4TyJk0knsHhTeK5khBaH2VwLYVh40TJhQ6RzeIQV32Quz8hfwQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-knewsticker-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBMTCBPz+xPzCxISCBKSipISChCH5BAEAAAEALAAAAAAQABAAAANTCBCsysEpseQDI08KSPdYNmwUYSraUDRC64iAMbIuLGtOS423BhKFmgj2C+5EhsOoWEsOnB0FsKl0jnLUp3IG0O2sMNpRVHBAJpjyA8KOmNsMfwIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-knode-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIYAABwaDAQCBPwCBDw6NERCFJSWJAwGBLy+rPz+7IyOJJyeLBQWDIRqZIxydPzCxDQuHPTWzOSypBweDKyqLJyWJKySjPTOxKSCfOyCfOyKhJSSJJSSLFRWTDw+NOSqnOR+dOyWjOzGvNza1ERGFJSWLLy+ZPTGvOTOxOSSjOy6rLSypJSWjKSinAwODHR2HISCJOTWtPTe1Pz+9Ozu5IyKfNzazPy6tExCHMzKfPTy7KyupKSmnEQ2HHx+HKSiLKSiJPz65OzuzOTmrKSmLIyKJLS2TPTyxOzuvNTSlLy6fHx6RLy+RJyaNLS2NNTSnLy6lLy6dMzKpGxqXCQiDKyuNMS+PLy6VMTGPMzKrOzq1CwmDLy+PMzGTNTWxMzOxERCPKSiNCQmJERCRERCHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAIALAAAAAAQABAAAAffgAABAoQBhoOEAgOGBAUEAocBBoOLBwgBBAkKBAsMAQ0ODwOWEBEBEhMUFAQVFhejCBYYGRCGGhsKFBwdlh4fICEIIoMjBRQkJSYnKCkWCCorLIMtLgUvCjAxMjIzNCw1KoY2NxovFDjbMjk6OjuHNjw9Pj8lMggIQEFCATaDBD4JhhApgsDIESFIkigxJGDEkiJFmDQB4uQJFBxPokgRMIVKkypFrFxBgCVjlnuXtARQUGTLFS4yunipgRLBF0I3moChgsQeAg5hxDBMNCUAlyAcOCBKxJTQmKVNBfgJBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-knotes-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAASC/AQCBISChMTCxPz+xPwCBPz+/ISCBPz+BMTCBIQCBAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARIEMhJZQg1z6vzxR0VCKE4gCE2lhcRnF1LuAInBjNRfDMn64WCQRCcHS6IRE6nyB0Sx0ACkcwloFiflKp8Pm2bbRblkYJZHX8EACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-knotify-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPz+/Pz+BPyqXMRaBAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMyCLoQznAFIUKE09krZ+VS9XBaMBBbZKIBUaSYa40kTIPNhyvazje+G2gFI8l8jaLCnwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-konqueror-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxONCROfCRKfKx6LNy+bNTOpGSS1DRupAwyXBRSnPTSjPTqvOzqzMzSvHSSlKy6ZDxutAxCpBQ2XBxepLTKvPzqzPzy5OTShLS2dLSqRFR2jBRerBQ+jOTixOzetNS2XHx6XDR2tCRexBwyTDyKzOTavPzq1OzKdCx23BRKtCQ6VCQmHFSa7IyirOzSnGSGpIR+bFSO1DyK7DR+5CRixBw2VDQuHFye7IS27NzGXISuhEyS5DR25BRWxBQ+lBQyXCQqPCxSfGyu7GyerKy2ZFR+rERqfCRmxBROtBQ+fBwuTBwmNDSW9JyabLyqRIx+TExSXBQ6bAQCBBQ6ZBxapDR+zBxq3LyaLJySRHxqPGxeNBxGbCRmrHRyRERONDRKNDQ2JCQuLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAeygACCg4SFhgABAQIDh4MBBAUGBwgDCYcKCwwNDg8QERIThRQVFhcNGBkaGxwdoYMDHhcXHxggISIjEiSvJSYXJwsoISkpIyorLIIDLS4WLzAxMjM0NSo2N8o4OS46OzwzPSk+P0BBgkI8Q0NERUZHCEhJSktMgwk4Qy1NTk9QUVJLphCiUsWKlStYsmjZQiJgIS4KuijQ4iXAFxYCDVFJwGUFmDBhMjYSw0KMyEYoBfkJBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-konsole-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXFRSVPz+/PT29OTm5OTi5DQyNDw+PERGRExKTHx+fISChIyKjHRydFxeXDQ2NCQmJBQSFAQCBERCRMTGxHR2dGRiZExOTDw6PCQiJAwODCwuLFRWVOzu7BweHAwKDCwqLHx6fBQWFGxqbGRmZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAanQIBwSCwKAwKkMslEAgSDqDRKqBYKhkNgcDggEorkMrDQchkNhuOhgEQkk0l5S2lUGpYLJqPZTAwMHB0DCmhqAW0Rfh5zAxgOkBcCFAcfIBMECxwBBAEPFw8dChkhcBMDDAcdnQqtFKSWcQMimx4dGRkQBxGxsg6bBQEawx8jl3GnJFoFHRNXVVNRJYIFDAsL1tgiDiQXFx0HABwcXeQH5OjkRutEfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-korganizer-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBASCBISChFxaXPz+/Pz+vKSipLy+/MTCxPz+BPyqXLxaBAQ+BPy+vAAAACH5BAEAAAAALAAAAAAQABAAAARmEIRJqw1ikM37FsFQjMZ4lAVKBESBjCYsFiuBkkk5KG1dJL+CZjBYMES+l2x3RCBqtxHBOFD6DkHmAQj0yXgzmFdIhY2erBJBwTiczDSWq0Eg1gvYrvyHxcMdUEojYWIYHocbDX4RACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-korn-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAASC/AQCBMTCxPz+/PwCBMQCBFxaXISChKSipAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARSEMgQpL03CEExDkO4dR6ghSFBkJa2CSlRcNX0voNQ5Ebn3pvdAWHo/W6IHUJwGFCAm+SrSTm+ZgcY6XnDhlim3wwxKNYymiX17HmCSxO4/OKPAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-kpackage-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPz+xERCBMTCBISCBDQyNAAAACH5BAEAAAAALAAAAAAQABAAAANPCLoR+7AJ0SALYkxd79za12FgOTlAQBDhRxUFqrKEG8PyOqwEfMeKwGDI8zVGul0vFsAFdaxB43ecKZfUKm1lZD6ERZgBZWn0OpYvGeJPAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-kpager-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAAQCBPwCBFxaXISChASChATCxKSipMTCxDQyNERCBPz+/MTC/AAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAARWEMhJZ7hADFI4+RpwBYBxFJ1HmMiYJUgiJPI8Bwmp7HyvyBOfMCHR+QwzhAAhMvZKSFgRIOwtJczqboFoBasGGVNUKVNGaEyTlEYL1sX2pYXOyO8XfwQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-kpaint-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIQAAPz+BAQCBMTCxPz+/PwCBPzCxPz+xPyqXASCBMQCxAQC/AQChPyCBATCBMT+/ATCxASChIQCBKSipISChAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAV1ICCOYxCI5kmigTCYBKGW7WAH8QyYrn3LNFesYDgEjCVXIRYzGgWqgA2BICQUx9pMSkUssgsbFOWighW+7c24KDAKDccjCjVCHAEGo/GYl+wPLwwRfF8oT2mDAwuGWVJiARERAxITJkhaJhMSlJY7NDQpAH4hACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-kpixmap2bitmap-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIQAAPwC/AQCBMRaBPyqXPzerPyCBPzCxPwCBPz+xMTCBPz+BISCBMT+xATCBAT+BASCBMTC/AQCxAQC/AQChAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVkICCOpBicZQoEwjAE6hgQQwvH81AU8OnfuR3QYDgcgAKhjGj8+UgzQkHHw+2mQlQpgEAkFInEYnGDhr/h8VPGYDQcjcZj/iiv4u84vQ6FQCISERETgxN2AX6AgoQThlBOkCR+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-kpm-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMTCxKSipPz+/ISChAQChMTCBATCBPyqXAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARbEIBAa5BYUsHF+FQ2EUTHfUOoFQVpeuAVGAbrnmg603U7FD8UxXDgGQgoYMyAIBoSyI9Sx2seoj/lRlDFTmUBDs0L0gg2CGwFs93oWJdMOwCPiybhguout2f8EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-kppp-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIYAAAT+BGSOhERadDxKbDRKZExWXKzG/KzO9KS+tER+lBQyNERaVOTu5PT6/OTy9Lza5LTatISylHSilCQ6LNzq9MTa/LzevKzKzIS6dBwuZISi9MzizLTW3Iyy1IymjHyGbCwuLDRGXHya3HSe9Jy+/MTe5Pz+nPzmhOTSbGyGXGx+XCwyLHyinISe/NzifFRKTFRqXCQmJExSVFyafFyC9MTCvAQCBMTCxExKTDw+PMTGxLy+vNTS1Ly6vMzOzNza3MzKzHRybERCPDQyNPzCxPQODHR6dAwODAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAengACCggECAwQBg4qDBQIGBwgJCouDCwwNDg8QERITlIUUDhUWFxgBC4mKGRoGFQcbHB0eHyCLISIjJCUmJygpKiuLEywjLRYuLy8pMDGLATIzNMk1Nck2lCDJN9TcLziKOTg63DvcPD0ygjk+P9zcQDVBQekAQkMgPjzcPfLy1wAgiBQBAYIHkH5BbPwTBGKIQBBBjAQBsXCRDYJGZFSkJOhIM45+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-kpresenter-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwC/AQCBMQCxPwCBAT+/MTCBASChATCxPz+BPz+/ASCBAT+BKSipAQC/AQChARCBCH5BAEAAAAALAAAAAAQABAAAARhEMhJq70YhM2D5UIYDARHBUWxEcRgHKgncWyLuPEc1MOAJLfBRsNSEBYbH8kw3BEUyABjZHzJdsiGI6AYLBQG5qykDSy+jwdLpimj1aVhe7tIr00a6Q4uP02dfRVygRZ+EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-kruler-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBFRGDPTijPzmnKSGDOzWdPTahOTGXOzOZOTKXNzCTNy6RNS2NMyqHNSuJCH5BAEAAAAALAAAAAAQABAAAARkEMhJKwg4643FEIQHimHRfaiYmoFxvMLhwi5r3IaA37rBIomgABhEDBM/hHLJVCBYCwFjYVxQBdYFi8GQertSLqshaJgFZbK5wXI4BO63W/Bwt+HzON7BKvj/gIAcgxoWhhN+EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-kscd-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAASC/AQCBKSipFxaXARCRPyqXPwCBAT+BMTCxMT+/AT+/PzCxASCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARbEIRJa5Ui672nsNYgegFhFoRhCuJAEgcsE+wYfHIc0y3JbT2QsOJCGG+/zyShMCICregEsUgEnNCe6/rsPkPTY2LxZLEOh4DEqbBmRQyGen0kjgB4ySSPp+D9EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-kscreensaver-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXAQCBOzu7Ozq7OTi5Pz+7Pz+xISChHx+fMTCBARWlARepOTm5ISCBNze3ARalARanKSmpARSlHzC9ARGfLy+vKSipARKhAROhARKfJyenNTW1AROjARSjMTCxJyanNTS1JSWlMzOzNza3MzKzJSSlMTGxLy6vLSytKyqrAT+BIyOjPz+/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAalQEBgOBQYj0fhYEAoCAyHqPRgDAyIggPikOAeFFVCYMHImqnfaiPAKH8VcLij+ghAGJFFlnuUCAJ1ExR5AnACFRUWF39/CxETXQoYGRoaFht/HAEdE2AeGRgVFBUfIH8hmx4doBihGokifyMPAiQcISEjJR+7HyZ/JScfFigpKSoSFxsiKywCAEjR0QDU1AIJFi0tFgnP1dYJ4QgJ4+Xe1tLTAH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-ksirc-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIQAAAT+BMROTPz+/KQGBFxaXAQCBDQyNGSGzDRivAw6lAQmbCRGlAw2jHSS1BxGpAwiVGyO1CRWvBRKtJSq3AxCrEx2xAxGtAw+pAw6nDRmxAQmZAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVYICCOQBCQKCoMaRsMbCvPNE3cRA0QRWEciIQigQLyfAtGqtFwPI6GFgQReex60WJEYr36UpOtQgQlUQAVieUyLoskY8Bhi3liEZJ6MaOmWCgJGjYGhCl+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-ksnapshot-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAASC/AQCBATCBFxaXISChAT+BASCBAT+/PwCBPzCxAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARLEMhJKw3YViw6HkRgBUVnCkG4GUV5otthsO6A3KJEHm6R3AOYTtAy2QqzHCDwMpiSk8DsxIFGpc6T9YJ9GpSb7laDSYI1yzNa448AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-kspreadcalc-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPz+BAQCBATCxARCRASChAT+BMTCxFxaXEQCBPzCxPwCBAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARPEIBAq5U4iM17wJMwjORIfJkYFCs7nKA2rJQLp0Su66ikGcAg8OYTGA6BA/KAIIYsFudPGJQal8uAFVqxUg2JxBYbUGh7k5J6BppwKyB/BAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-kspread-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBAT+/Pz+/KSipPz+BAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANFCBDc7iqIKUW98WkWpx1DAIphR41ouWya+YVpoBAaCKtMoRfsyue8WGC3YxBii5+RtiEWmASFdDVs6GRTKfCa7UK6AH8CACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-ksysctrl-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBISChHx+fPz+/AQCBAQC/AT+/AQCxAQChAT+BLy+vAR+BAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARYEIAgqK1YzsG754QUDERpmkEpkkXrtoK6EcVgHIibhnNx564Yb0TDvQq7FQ34EiqPOhnREqhWSUPsyZSQAbbg7GcMEgwUiYVivTa1R+y4XEGoWO/4AMAfAQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-ksysguard-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBExKTERCRERGRAQCBFxeXKSinIyOjJSWlKyurKyqrKSqxPTy9LSmxNzS1Nzm7JyitJyipMzOzLS2tOz6/OzW1Ozy9Oy6vNyCjNRydMR+lNza3LSurFReZMTG3Pz29OSmrMx6hDw6PKS2zMTCvOyytOSWnMzi5MTa3NTS1LzCvNTe5Pzm7PTK1PS6vOSapMyKjNTy9KzCzMzS1GxqbISKxOzq7Ozm5Oza3MyytLzS1Nz29OTy9LTS5GyGtOTe3MzKzOT29OTm5KS2vKSurNzy9LTW5OTi5Mza7NTm5KS61KyytOT2/HyChHSChHx6fNTy/LzKzMTCxLS+vMze5KSmpLzS3Ky61JSSlLTGzLTa5FRSVJyanKSipJSWnJyWlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfagACCggECAQEDBIOLAAEFBgcHCAgJAYqLAQoICwwNDg8QERKXjQYTFBUWFxgZGhsJHJcdHB4fHxUgrCEiIyQCjRwWthUlJiG7IycoKQQBKisfLC0uLzACJzExMjMBNBI1Njc4FTkBOjs8PT4/3UBBQjc8FkNEQTtFRUZHhyQySEkHOAyxgOCcEhkSLC1ZwSRGEx1OnBx4EgNKFCmKAkyh0uNADBpDOpyQ0YNEAEJVIFjBZg/bFRIRSAXAwiFLDyNaesiYEJMRgS1cupDg4OXLFlI+DwkQgBSAn0AAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-ksysv-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPz+/MTCxISChIQCBAT+BAAAACH5BAEAAAAALAAAAAAQABAAAANWCLoQzlA5IVyIK1S9L7PDsFHBIJXDFFaViYYEUQpy6orEqq12Aw+FmkjQQxEKwQCBSCz5BrGYkuc06nKU4s8gW4q0UAN3+q3CZJfJRhJ6fDwZOGbhTwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-ktalkd-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBKSipMTCxARCRFxaXASChDQyNATCxISChAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARYEMgZqqXU6gCuDIJQDQTBBQX3hUFpmN2hFaxhIPCJDrRo46dPglf7BTvDXsB2OwaSCd8tZ0kWgZ3Uk+hDvHRV5bfyybACPNmkY2EVZKpM5UBPre8fD94fAQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-kthememgr-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBASCBATCBAQCBDQyNPz+/MTCBPz+xISCBAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAReEMhJaw1V6Bs0HgIWYFMnhSERkiU6ekM1FO9IGMcxIFK3jgGDzRADhAypQipI7A0OId1IaGhKntHDjWogTLCB3JbpvULD2ir5i0SPDYjy9ZgWDuQUwqBLLFq+ehZ+EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-ktimemon-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPz+BHSG5PxSVDRW9PwuLPQKDFze1AQi7CH5BAEAAAAALAAAAAAQABAAAANDCLrc/lCFGeKi1YktAH5c92mcR4HloA4P4RLAyjovLLdvvD5FX+gqgGFoUPh+N2IRcAQcngch0ehzQqVDas/6xBb9CQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-ktip-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBGxubFxeXAQCBOzu7OTi5NTS1PT29Pz6/Ozq7Nza3PTy9Pz+/Nze3MzKzMzOzOTm5MTCxLS2tKSipNTW1Ly+vKyqrMTGxJyenISChAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVwICCOQRkIY0oORFEYqCoGw4EcSaHEarAgDESu4RioBIMfA1doPIwpZGJBhTQMEWh04GoqDBLtCKkYNL5hGUAwoZQfFYs46lBQLnK1SICJUCR5egMZGBgZcyoDGAwTh3oiAxMMhogpioyOjwADnIh+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-kuser-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMTCxISChAT+BMRaBPyqXARCBPz+/FxaXAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARLEIRJa5Ui673nsGAgeKE1Bl9AUEXbiqTlFlZaGUZoszm4BzhDAVf5BYbAXI+TAR6CS2ZGSZSEiIIqYIsSIEaJ7GRrlY7J1lKA7I8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-kview-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIQAAPz+BAQCBPz+/PzCxFxaXPwCBPyCBPzerPz+xASCBMTC/PyqXATCxMT+/ATCBASChIQCBAQChISChMTCxKSipARCRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAV0ICCOYxCQaBkIwpmKJsu6qDkIREDMZFwUAYNwRVuxgLfDAUGEsRIJo2LRapUE0ABDsa1aAcZoo+stsnIMwcDQcDQUV9MjF4Q4GJFiQJJuGSYOFHkwezJ+ExUUEicmYDITARATAoomLiuQJhKTlTRgepYBfiEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-kwin-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAAQCBPwCBFxaXISChASChATCxKSipMTCxDQyNERCBPz+/MTC/AAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAARWEMhJZ7hADFI4+RpwBYBxFJ1HmMiYJUgiJPI8Bwmp7HyvyBOfMCHR+QwzhAAhMvZKSFgRIOwtJczqboFoBasGGVNUKVNGaEyTlEYL1sX2pYXOyO8XfwQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-kword-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPz+BAQCBPz+/FxaXISChPwCBEQCBIQCBMQCBMTC/ASChARCRAQC/AQChMTCxAAAACH5BAEAAAAALAAAAAAQABAAAARiEMgpQ6B4WnGzDkLIeVs4DAIBWFcpnKJVzCUcz8ZxVOKN/AWNKRQo5HQYELHwQxQSHR7HqDuwMIRisxBQLBbRFdUaYCwYjUZHywIxGI53K0jolRkJdLkhtKwaeWpJYW0AfhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-kwrite-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBKSinJyOfPz27Pzy7AwKDExOTJyWlERCRKSelPz69LyyrKymnPz+/MS2fDQyJAQCBOTazLSiXOzivMS2jKSSVOzmxPz25NzSpPTu5KyebOzixNTGjOTWpMSydMSybCwqFGReVKyaXNzSnGxeNJSCVMS2nPz23MSuZIR+bJyShLyqnOTOtGxiXIR6XOTSvIx6RMSubIyCdKSalMS6pOTWxMzKvKSabJyKTOzezHxuPGRmZKyurMTCvPTq3AAAACH5BAEAAAAALAAAAAAQABAAAAajQIBwCAgIiEhiYEA4FgwHRDKhIBAWz4OhgGQ0FAPHA7qFEBONb0Qy0ULeQ2+aUrFcMI+3GYBOZzQbHB0eHyAhIQByDREiEwMjFRIkJQImAgJ+jScjHigkKSorLC0AKg2NFSMoki4qCy+IQgITKDAxkjIzNDWkQxQoJaskMgk2Eb1DNzgoOCoHDDY5yEIwJToAOzw9ET7TQiREAhkZ3kmy5QB+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-laptop_battery-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/KSipAT+BISChFxaXPz+BMRaBPyCBMTCBDQyNAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARtEIBAq5w1TBGEGIM2ESTlVUNhaAFJUAcXgAXCZkFyJEoiIArWYQjj+Xi2yfBA0SU6CuAts4MCk4EdcxbznFhOCsjrWUxRhbRBBk48Z6kCZ2GeuN9xucF8FqcEBnt1OW4saSp7IoRPEjgiGBV+EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-laptop_pcmcia-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwC/AQCBMRaBMTCxPyqXKSipFxaXASChISChMTCBPz+BPz+/PwCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARfEMhJaw3Y2iDGyJoUEIVRfIHGEcaBHCc4jcWbGG2cAuuhKIZE4mX68EgI3M/wORgQGAHr4HICD4NCKoBIJqsv7w6DKDgNi0VuN+O+GIxFl00hlxjakIhbo4cwfnoWfhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-locale-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAASC/AQCBPz+/MTCxISChMxKTKSipFxaXERGRGxqbCQiJDQ2NJQaHMwmJDQyNFRSVOR6fGwSFNxSVKQqLFQODJwaHOyGhOySlNRCRMSuBPz65PzupPyCBJyOLMxyJOTKRLSiNIR6JExCFGxaHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaPQEBgGAAYhcWjUMAUEAMDQtIIZRauBaZhKhwIsFjBgFu9HgKHrHNI9QYQCQQarWB313D5Ik68BxgIDQwOCgcJD2wBWwENEBANEQwMEBITFEIOQhWNkhENFhcYl0l/GRobHB0MGBAeo1QdHxsaICEfpyAiQlQhICMiHyMgs8FKASMjRiK/yLrGStDRXNFGfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-looknfeel-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIQAAASC/ERGRExKTLy+vKSmpAQCBPTy9Pz+/IwKFLQWNPT29GwOFExOTIyKPHx2NPz2pIQSHLwWNMzGXFxaLLSytERCHCQmJNze3GxubLS2tHR2dAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAWNICCKgVCWYwoEwUAMhXEQhhocRuHCMpIgiJVBptC9DojDIrFYwRS4wgGJZAIYuwL00Ej6FjOGEXZwPByQCNjAyrnKj4NkAqYUBIIoXC5pVGYUFgIXU2Z8fgdGFhgZiRqHf1EDFgCJGAcafX9aUSIFlxoFBX8vMYmemKJSY6Ijn6oHF26tKbAEGCaUKX4hACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-lyx-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBAQChARCRKSipASChFxaXISChPyCBATCxPyqXMT+/Pz+xPzerPz+/AAAACH5BAEAAAAALAAAAAAQABAAAARZEMg5Q6C4BnGzHsRgeVZRGIbYaekxuAFijUGRBOqMKPxlJQsLQxjoVWyWBsMxNEp+iRuj2VvVCklHLCZjiRrawGFmNQUajQ129RwYyCMSau2pcNh1AB7jjwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-mathematica-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBISChPwC/FxaXIQCBAQCxAQC/KSipAQChPyqXPyCBEQCBARCBASCBDQyNCH5BAEAAAAALAAAAAAQABAAAARlEMhJ6wxChiFFCBUhENtQGIcBUghWDsHxWck7wMpKfXz/ZYBAYeCpKRQLWwkjMCpQJQ3TE8gdUgxPUMDlflINhzfocJB6BNEDqLnKpgRLTJZjBuIUAf1TExR0EyRASWmAFocAfhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-mouse-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAAQCBPwCBDQyNKSipPz+/MTCxISChPzCxATCBISC/MTC/AAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAARSEIRJqw0Sg32rAANBFNwlhIQhGkNGAaSaouW0iYUBEIdYgzsUIqHAuWAoQlGEE9gMJKaU8IPupqLWy3qVkioAFqkLc9nCg3G5oxFr2ecavOOPAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-mozilla-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAASC/JxqBHRKBGw6BHwuBHQuBKwmBKQmBIRWBGRGBMQeBKwaBHxSBFQ6BDwaBEwqBEQuBGQuBFQOBGwSBGxGBHQ+BOQiBPQmBLQaBKQaBCQGBIwWBLQeBDwKBHQSBGQ+BIRaBHweBIQWBNQiBKQeBJw6BPxGBNQuBLwiBPwmBKweBIQiBJQmBHwyBIxeBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZzQIBwSCwahYHA8SgYLI2EwpMoMBwQU2FCsRAYGQ3HwwGJSCYPCNnRoAgrlgsmo8hkLJpNpEjhbBYdHhYZEh9HICEiGRMjJAxPJSYmJxkoSocjKSorExYNSwMXLAwgDhYVSwUtRAMORwGfRR8uRpdGWEJ+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-multimedia-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBAQCBIR+hKSipPz+/MTCxMRaBMTGxOTe5MzGzNyytPyqrPyurLz+tKzqrPTy9LSytNTS1Pz6/Nze3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAWAICCKQWmOKFAKQ9uWacAOJcEWQjDKrxHYJZxONRAQaL+c76DjyY4D4A+RC9B8xkPiQKCySsjAQZAojHMva9pk8iGrCsWC0Wg4HCvT4wApyO0FEAcRJhKGhzUEioolDw8TgYQBEYITCIQqE4IRCnQOEXyYJAFxCwt1dzAxbCcjfiEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-nedit-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAAQChPwCBAQCBPz+/MTCxKSipFxaXAAAACH5BAEAAAEALAAAAAAQABAAAANDCBoK8TAC8Vy8QUyGr9BaFwmDZonZp66sIhBwLBMFlRl4rhv1IxiDoHDYuw1yw2Dxl0wugTqnjdkUPmezJWv7QXX8CQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-netscape-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIYAAEyStPwCBNTKrHRqPAxSfLR6VNzWvAQCBEyOrFxGPMSWdKx6XPz69Ozm1PTy7NTOtOTOxKRqRGxCJPz6/MzGnMS6jDwmHEyGpPz+/Hx2bGxiPOTexFxWNLSmhMy6jLyGXNSqjHxSLLyuhMSyhLSqhDQeDJyWdJyOVNTKtPTu5KSONMS+rLyqdMy+lFxSNOTezKySPEw+FEQ6JKSOPDw6LNSylHxSNKyWPLSeXExGLDQuFIRiRCRCVEwyJAwODLyyjIx+TNzaxMy+jBwaHNzGvMS2hMS2jKSWXGw+JFw6LKR2XCQ6TDw2HAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAAfVgAABg4QCA4SIBAQFiAYHiIQICQoLAQwNDg0PgxARg4oSChMOBg0UAgYVBRaDFxcIGA4ZGhscHB0eHISKoxkfARsHICEiI7oBrg0kGiUfpCEBJiIngygbKQ0bG5kjKisbFSwtAi4HLx0cBwYiMDEyJh4zMjSKKBQuNTY3Mb8vODk6kLky0GEHjxUyeiigMMPHJ0UCKvw4sQFIECEqhgQUSCSChRFFWhg5MkMjkk9JlJRY4uIEixk5fOhAsuOkqyFLXF1oQYOJTiQIAigaqohCD6JD/QQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-noatun-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBCQ2PARehAwODASCtASi5ASq7JTK5PT29MzS1JyipISGjAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARlEMgJgrg3zDHkCEQoEhrnVYXBDUVRdmagHjT7AnExHPtg3LldzYXr4FA6juHnMXZkqaiGMpEtOdOmETpAIEy473fV9Xphq7P6DEgMFIpFWm1sJ+4JBec8SFAnd3pveH+AeHcSfhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-package_applications-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAFxaXGRmZFRWVARehAxehFxeXOTm5MTGxKze7JzO3ITC1HSyzGSmvFSWtESKpCx6nBxulNze3MTCxAQCBByezByWxBSOtBSGrAx2nAxqlARijARafARWdARSdARKbARGZARCXOzu7Pz+/Pz+9Ozu5Nza3Pz+7NzexPz+5NzivGxqbGxubNze1NS+vPTCvMzKzLz6vLzevPwCBNzevAwOBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAADIALAAAAAAQABAAAAamQEBAMCAMikfjQMAsGA6IhGLBaDgeEEJEMhFIJBRKxXLBYDKajeTQBQAGG05n7vl8QABBNyTq+/8iIyRdJSJrgCMjJiYnhCIHEn+JiygpXQaGB32JKgErKiuNAoV+iQIGLBItLhOOgYkrmAYvLikwl6+Lo5gTtjFdLMHCKy8vEyITxV2tzBMFMTCWIgYlEzLX2NcwMy4vstngAS4tLyUGNODprdl+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-package_development-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAASC/GxKFAQCBNSyhFQ2FOTGnJRuNOzWtPz23FRWVERGRJSGNMyyZHRydOzu7PTy9Ly6vOzq7Nza3JyanMTCxHQCBLxWVKQaHOTm5NyOjMxqbJQSFHwGBDw+POTi5LQiJJwWFPz+/Pz6/PT29NyWlMReXNyenLQqLIwSFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ9QIBwSCQGBMWkMDAgKIuBgsH5FBIO0+oSka0mFAsGtdpwLMbPxONBgCDJEQkEMnkn1RLKRGF3+CtCDRJ7AoUSEgAWFw+AChB8hYUYGRobHIwAHZGbHh8gayEhIqGiIw9+GBgSJBoliiGUrhcOJq0WJyAbKBUhnrocDr4ofkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-package_editors-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBLS2tHx6fOTm5Ozq7OTi5Hx+fPTy9Ozu7PT29Ly+vMTCxPz6/IRuPHROLPz+/LyOdLSCTNSmnOS6vPzmzISGhExOTJSCZPTSxPTKtPS6jPSujNyKZGxqbDQyNDw+PHRaTKRqVLRqRLxqTMxmPOR6NKyurDQqLExCRFxKLKRSFNza3KyqrKSmpDQ6PGwyBNze3NTS1LSytAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaWQIBwSCwahwFA8kgMOAVLpjMgGBCixamgECAYsELtoUAuXJtPRCCRMBu44ecBoVC0F2aC8qkIKBAICQx5X3INh3UMbQMOD05/AQ0QDQoMERITFBUVThZ1Cg0XFxgZGhobHB1KHp4NCR8gISIjJCQlJmGsCAULAicoKSoqDytIrAkGBCwMLS4vKTBNrAUJCzEBMjMuM35BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-package_favourite-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAASC/AQCBPz+xISCBMTCBPyCBMQCBIQCBPwCBPzCxAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARYEEgZwrQzVyFq6Bj1gQOxgcBYDSzhnl7Azm7tpWT7VhdHmoFXzweqmYZE4I5C5AQKhkMAYbCMfM9EIWBAIKzNLNRbTRHCBUT6ewn6TOlyJuX2sOftS8YfAQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-package_games-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAASC/AQCBPz+xISCBMTCBPwCBMTCxMQCBPz+/KSipISChAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEEgZwrQzVyFq6Bj1gQMxgsBYDSxhqunKtu5bpSQdFDfFkS9DgHD5cTwBIdFnFLiSw2IzGGX+AocDNHQ6GhCJQCJsGRqThm/CoMBUCNc1W9HWmD2Jdsh+CfkjACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-package-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPz+xISCBMTCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANECKoR6ys2IVqokF08yMTA1gwkYX5WQK5ma4VceTYPxXnBWdtY6+0834/Bowgzm6APWRQcH4TiMhPK2WYRiZWW7XK7/gQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-package_graphics-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIYAAASC/MQmJPz+/LwuLLw2NLQiJNTKVNTOZOyydNRaXMxGRJQmJFQuXFRypFySdHS+VLTOfNzWhJQeHFwCBGyGtHyqlIzKdPTapAQCBGRCbKTSjOzqxLzG3MzmxJyanBQSFJSSlBwaHCQmJGxqbFxaXNzmxPzmzOSenExKTLSytAwKDAQGBMTS5LzerOSaTFRWVHR2dJzOhLTKdNyiNDw6PFxeXDw+PLSmvKS2zIyynLzSjNTKXNSGNIx2lIx6tISavNzSbLwmJHRWfNzWfIRurIyexOSmPJweHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAejgACCg4SFAYWIgwECAQMEA4mCBYwGBwgICQoFhowLDA0ODxARCAQSkp0TgwwUFRYHFxeLARITGIUZFBobEgUBC7aRHB0eBcC3iRgfGAIgISKRGCMeIhgkJSYniBkoKSgqKywtES6bgy8iMCgYyhwxMjOb7Bg0NTYr7Dc4OTo7PPIrQoRgJ6iHjx8xgMwIEgmAkIMxhsw4lYgBkSI5LEQwcsRPIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-package_multimedia-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxaXHx+fHR2dGxubISChNTS1MzKzLS2tLSmpNSytAQCBOzu7Ozm1Nza3MTGxNS+vOy6vPy2tOTStOzq7Pz6/Nze3MTCxOzOvNTqvLT2tDw+BOTm5MzOzPy+tLz+tLz2tOTi5LSynLz6tPz+/NTW1KSipMy6THx6fMTKxKyOLNTGVPTmbLTOtBQOBBQSBKySLHReFLzKvLzavAQGBCQiDNzKVOTSXLSWLNzGVLyiPNTCTOTaZLymPMSqROzebOzeZMSuPBwaDMyyRFRKHAwKBOzibMSmPMy6RLSaNLyaNDwyFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfKgACCgwECAwQBg4qCBQUGBwgJCgsLiwAFDA0OBg8QERITlYMFFBUMFgYXEBIYGRoboxwMFRQdCAoeGR8glAABBgshFA8BCxsiI5QklY4lJQYbJiQbypQnACgpB5ALy92UKissAAQXDyktlBUuLzALMeG+MjPKNDU2LDc47yqC1Qs5dODYwYJHj3f/Yrxb4QPHiR9Aqr0I4kNFDCExdgxRQaSItyA8jJw4YvFFjBdCGtCotECFjhssVgRR8W8QkgVJlOBb8k3UID+BAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-package_network-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBPz+/CRKfERCRAQCBFxONKx6LDw+PDR2rAwyXMzOzOzq7AwKDHSSlKy2ZDxutAxCpExOTBRavBQ+fBQ2XOTi5OzWhFRSVBw2VGRmZDw6POzKdCQ6ZBRKrCQmHAwODIyirGSGpIR+bCRixBRKtCQ6VDQ2JBw2XIS27DRKNISuhESK5DR+5BQ+jCQqPCxSfFSa5Gyu7GyerOzetBw+XBwuTBwmNFSa7Eye7DSW9JyabLyqRBQ+dBRerDR+zDx+3Bxq3LyaLJySRHxqPGxeNBRSnCRmrHRyRERONDw+NCQuLCwqHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAeygACCg4SFhoeEAQGJigIChQEDBIIFBgEHBAgCCYMBCgQBCwyhDA0ODxCcAAqRihGXiooSExSCsYoVDBYEFwEEEBiCrBmgGgUbigMcHRgeth8gAR8hIgQECyMkJSaCAicoICkqASssvi0YLoIvMDExMg4zrjQTNTaDCTcxODk6OwQYJmCYNIhHDx8/gAQRMoRIDRcEBwkoYqTIkSMFkNiISCjBCR40UiQxwdGQEg9LSvoJBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-package_settings-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBISChGRmZMTCxKSipLS2tHx6fPz+/OTm5FxaXOzu7DQyNMzOzAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAReEMhAq7wYBDECKVSGBcbRfcEYauSZXgFCrEEXgDCSeIEyzKSXZoBYVCoJVIqBGByKu0Cy8QHxmgNngWCkGgqsGWFseu6oMApoXHAWhWnKrv0UqeYDe0YO10/6fhJ+EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-package_system-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBGxqFAQCBPz+/PTqtOTOfMSyPNze3Ozi5KyeLMTCxMzGzKSipOTe5MTGxAAAACH5BAEAAAAALAAAAAAQABAAAARfEMhJQah4ihFunsFAEIVXCVJACIJhoBK6CerawsA8HAhbuAnYZrBDKBYMWpCy4S2QSRazyBIwrrjcoNFQzK4KR1bQcHhZjGM2BgWLMYJ2enForHPJtNj+kfHvcB8AfhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-package_toys-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBJxyLJRqJGxKFIReHKR6NJx2NMSmbEwyFKyGTMSibFw6FMSqdCQWDIxeHNS6hAQCBDQiDNS+jOzexCwiDCQiHLyeXFxGHLSWXJwuJGweFHQiFMx2bLRGNGQeFNTClOzSrLxKPLQ+LLxOPGxOHIxmLEwWDOzatNS+lKyKTIRiJJx2PIRmPJRuNKyGRIReJJxuLKyKRMSqbKSCPEw6HNzKnAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAauQIAQEBAMhITCcTg0CA6IhGJwICyYwgWjEQg4HIgHBCuMBCCSM6FBHiIOk4cg0hYiKAFFxUJBtC8YGQgBFhAaBVdMAw8bHB0eHh0cGh9LAAMgAxAhHiKPIxAkH1cXEiVjJiQnKCljECoWCAgEFGUrKBYsYwARKnQIRxG0Ky0QtAAIvwcuAwQpLxDCGDAIMTKyMSczs7sQATQz2mMIMyAXu0IQNDUu6AgQ6EPwu35BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-package_utilities-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBExKTERCRAQCBOzu7Nze3MzKzLy+vCxqZBQ2NJyanKyqrGRiZDRydKza3FRWVPT29LSytDw6PMTm5EySjCxaXGRaJFSanCRSVGxqbPTmvMSqVJTW1GSurHS6vOzq7KSipISChFRKHJSGNPz23GxKFBQ6PKyurCwqLMyufJx2RAQGBJSWlEwyDIRiLNy+lLSKVDwmDJRuNOTOrLyabGRCFDx2dKSCVOzWtHzCxOTGnNSyhAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAahQIBwCAgIBAOiUiggFAyHASKxDAwUC8Zg0HAglA9IZPGQABoTSqJCFTIOEIsFgHBcEhhHUpKJFCwaGxYYHB0VEx4IEh8gIQwiIyQbJRMcHokmEicfDygAkCkqJQgIGG0rLElCLS4vMCWqQwMCQg0UMTIzNDVLQjaIGDE3ODQlS785CEkxKjowvEOHybG4O6JDCdNKuDUxRAmxRDHeveUAfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-package_wordprocessing-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBHx6fPT29FxaXPTy9AQCBHRydPT25Pz6/ERGRIR6PJyORHR2LDQyNLy+vNTW1Ozq7Ozu7LSiVKSiTIyKJJyenMTCxMTGxNTGlNTSjLyyRExGTExKTBwaHOzivMy+XBQWFExOTNzOhIyKjFxeXDQuNMSyjNzOnBQSFNTGjDQuLCQiJAwODCwqLGRmZHR2dAwKDCwmJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAafQIAwQCwWhcihYMkUDJLIAKG5fEILhoOAgGAmCgXFgsEoNByOxwMCiTTAEsmEAq5ULJbLxQEuYCQZGn0JGwkcCR1gCUIeHyCJfX2JIUIHIiANCQMGIwYkCSUgi0KPHSYdJyAnKCkdHQ1IrhgdGCC1s7UqSCsdKLi0wL2xHY/FxMcssS0JIS4vIy8uIQktHUkgKygsMNwwKCAxUOLjAH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-panel-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPz+/FxaXMTCxDQyNAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANECLrcEDDKGYQV4+qbie9eGIJEVxTe+QmjUFgnXLLr615oF8x2v0I8DWpF2GV6slkLKSMdYT4nS0WgSkXYAWUbcXgX/gQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-panel_settings-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBMTCxPz+/PzerISChPyqXAAAACH5BAEAAAAALAAAAAAQABAAAANKCLobwRAG4SJw7w5BswoEkQXbRn0h5ggF14FhbIhb68SiOgnbLRsPEovjwwVLRIdhCfwMiR/VZ1A7WS4tntWyynquq+01+h1//AkAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-password-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPz+/MTCBPz+BISCBPz+xAAAACH5BAEAAAAALAAAAAAQABAAAANECLrcGi6CIAKUKwxSb/ZasXWPMFwBQRQiZwlqAVnEGbRwKz/ndMep3QNUqKV6kpQh6HFoCIaBMDmQTpOsJsaC6XoZ/gQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-penguin-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPz+/ISChPz+BMTCBISCBAAAACH5BAEAAAAALAAAAAAQABAAAANHCLrRsTC6F6UId1TYiNtMQRQNqARDOlAgJrzlhr7vqlUufbHMoMO8k+8XY4yGtc9pREIORKRTYVoYDgxUVmBqmGCLJzDYnwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-pixie-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBFxaXPz+/DQyNAQCBKSipPz+xPzerPyqXPyCBERCBISCBMTCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARdEMg5Q6C4BjEGyZIlCEFHfJQonEERnB8sE6RxIMkAnGtPBzacjqBQLBiMxS+Y2xmRx+WtSTgmkwQLcwhNKqRCz3VRBOeGvh5wqpPMzO3JQFBguWAYxeiNwnRAEn4RACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-plan-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMTCxPz+/Pz+xMTCBISChASCBMRaBAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEIRJKwU4iD23FwEmDeAwBGYaZiehWutEFK6JqtlM7KZhHhOJbuizIUKBHVGFOOaUPgPlGEsSDNjbKWBgcT0oX5CV2qakIg24OTGA0sxjeSWpUC2ivESf90cAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-proxy-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPz+/KSipFxaXAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANGCAHcziuIuFy44045WxhZpkxCB4GEKA1lpIAiVG7XB1bjPMHxqds3y++S6nGOL1ikpYlkbBSZM/oYfXBVaS8LuXCr2IY/AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-pybliographic-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBMTG5OTi7Nze/NTS5LSuxOTm/MTCxGxaFIRmFJR6JLy+zOzq9IRqJJR2HLSaNKSirNTOxKySLIR6VLS2vOzu/LSqhNzOXHxqNMzK1KSGJHxmFKSabLy2pIx2JJyCJIRyNNS+VAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZhQIBwSCwaj8WAEplULpkAZ0AQgEaVA4K0alQWDAdEQrHgNguMRsHxgJiJgcEg0pA4Jk84ZVCoWC4TGG9CAQkZGnUIG3lDAQocCh0eFB+MjRsgIAsLIYNwASKCnk2WVkR+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-realplayer-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIYAAAwWVBwC7BwC9BQC3BQOvBQCtBQCrBQCvBQO1AwKPAwOVBwC/AwGnAwCXAQGNAQCJAQCHAQGLAQGTAwKjBwG7AQCNAQKRAQGDAQCBAQGJAQGPAQGFAQKVAQGBGRiZBweHFxaXDw+PExKRBQSFERGPFxeXCQqJLy+vAwCjJSanFRSVLzCxJSSjIyGhGxubNTW1KyurAQGHAwODKyqrHR2dBwO7AwSZCwqRDQyLCwuLAQKFAwSjAQCLAQCFAQCDAwSbAwGbBQKvBQCzBQC1AQSNBQKtAwOdBQKnBQCxAQabCwOLDQSNAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAAAAAAALAAAAAAQABAAAAe/gAABAgGFAwQFBgcIgwEJCguRDA0ODxCXERITFBUWCwMNDxcYpKUYGRobFQEcFx0dGLCxrx6kFQcYHyAhIiIhIyQlJiekESgYHikqKywtLi0vIDCkMQQbLiQyMzQgLDQzJSCkMjU2NzIYOCYyOSYmH+gYOjUBOzw9PT6mGD4P/AORahj4IaECBFI9gAQhJSSSw0g2fGggsEAIw4eRhhBhEGBBgCKkjAgZSRLFESFIRibZx5KlkpYtlbyEuW+Jn0AAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-remote-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBDQyNISChJyGPGReLAQCBMy+hERCHKSipAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARFEEgZqp0Y1KxD9twEapg1kqhwBgKFvqIIjgMRdy4wFIaNbiiCYXDIAUcH328EQsxiIBXAqWn9MtTSTZLNybizEweY8UcAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-samba-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAAQCBDQyNFRWVASC/Pz+/PTW1OyytNTW9LSy7PTGxOSenNx2dMTG9Jye5OSKjNxiZMw6PIyK5GRi3AwODMwmJLQCBCQmzPS+DPTejPTaJLR+DPT21OzqtNT21MTCxPTyxOTmnNzedMTyxPz6/ISChOTijNzaZMzOPIzijMzKJLS2BPT29Nza3PTmxKSipOzu7LyGJPTKRNSeDFxaXERCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAMALAAAAAAQABAAAAacQIBwCAgIBsjkAEAoGJgHxFC5TCgWAEajyFUCHA8IICJhTggAr4NSGVsAF8wlnSQWBYLMRUNHMjccTB0AGh5dfh8gIQAiAAJCIyRCfiUmJwEokARok0slKSqPApukAZNDRpqbkZMjSROOI5srLAGwS34tGgEuBCMvAjCBA64ALRgxuyzAMnItQmgaMRcypjMByNR9QjQ0adzeaX5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-scsi-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPz+/MTCxKSipISChAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANCCLoQwZAFIV6UYgxi79Qa52WDE3bKV6YOpFpO3L5pJcckLBB8/wQEDezWAQpZqIWxFNAUkqkg6HmJOqGuArUqwfoTACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-style-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBAQCBOzqBLS2BPz+HPz+rPz+BPz+lPz+zPz+9Pz+1Pz+nPz+hNyuhPz+pIQCBMTCBIQyBPz+/MTCxFwmfCQiJIxOrHw6nJRWtJxmvJxuvJxyvAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVvICACwWieYiCUwVCiKVEEhjHA6YEcxooHBURCsXihaAYGglEzngKBhsMmMDhH0YcBAu16SY2IKiApm81RMXTCblPelDCrXJlI6hSL5SJOSewVdRMUGHtGZICChHsmZHeAgxkaG41/bWxnjV6bUH4hACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-terminal-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBMTCxISChPz+/MT+/AAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM/CBDcHkoFQasVUIrBe8fRNDwMAWpjUThmtmxk0IYwOaPx/V6XG3hAjmsRa0Qkg6NSOVo6F0nG88g4TUNDpT8BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-wabi-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/ISChPz+xAQC/AQCxPz+BFxaXAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARUEMhJgw20XsHxvIEwcKQHBESaDkShmqhKsMb7tW1RHPwOH4ZdYcBDGH+8A2JgLH2MzZHAJgmRBAgZAabNqg7cJMGb5BKSZF4Yfb5Uzmp3piqfS/wRACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-window_list-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBCRiXCRaVPz+/CRmZFRWVISGhMTCxESSjPT29DR6dDyOhDyCfPTy9CxqZOzu7Ozq7ERubOTm5ARehAxefPz6/ByaxBSOvBSGrAxynAxqlBR6nBRylAxmhARWdFxaXCH5BAEAAAAALAAAAAAQABAAAAWHICCKQTCeqCgMhJCihXEYSPuKRWIoC6PYsEZikHA4FA4CEJdoJh4QgXRwiOAeQudDIpEZIpPwhCImhyGGAmBSOVgumExG055w1ZPZhpPpUDwzExBqAAUDhxUVTQ0QEgWOOIcDiU1QjoSFFYiKDZYFmAWJlE9bkCM5iouWpiIfBa6frrKYAH4hACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-winprops-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAAQCBPz+/ASChATCxISChFxaXKSipPz+xMTCxMTCBPwCBAAAAAAAAAAAAAAAAAAAACH5BAEAAAoALAAAAAAQABAAAARXEMhJqwxAjM23wBMhjGQJEFKhriwrGUcsE3JsvPWBFAAiT7BaIYAA/HAxWk9CO9wAwd0SkJA9g8NiomnDoYqnHDAGroqRyVy3F2i7326LnKKo2+94hT8CACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-wp-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBAQCBAQCxAQChKSipPz+xPz+/ARCRFxaXEQCBMTCxPyqXDQyNPzerISChISCBASCBERCBMTC/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAV1ICCOZDkGgSgMg0AUZWAExyHc7YCQclLYtxtieAoUEApFUIBgnRYMhUHRCDYcDoUIRUhOlYLkYwcIDLvSpAsBiYx0CPQUgXNv4V0ZWEByDBgRcTMGDislTX+CMgISJk1+AQ4zWiYiCCiRDmRbmJ2eKZWhAH4hACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-xapp-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBISChAQCBAAAACH5BAEAAAAALAAAAAAQABAAAAIyhI9pIa0nYAtPUGlTRszJ10UA8xiNRZZmJKoA25boqW7npeHvlKRHyIn9aKYaz6XwFwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-xcalc-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBISChPz+/AQCBCH5BAEAAAAALAAAAAAQABAAAAI4hI9pwe0Ogpi00hHF2LzzzFlTsIHD45SSx6oCeW4wjK2tl83y7t64pIsJaxrfh2bEAJIlhRPhLwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-xclipboard-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPz+/MTCxPz+xPzerMRaBISChCH5BAEAAAAALAAAAAAQABAAAANICLoQwdBJIaRjgYbBR66Lo1nfowTER61aWGRd1y5GyrLm+QrxMJ81FQ4T2MV+jUPwBgpVdrdcQ6AUIj8Ha/N06Hq/UpLY5E8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-xclock-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAALy+vAQCBPwCBMQCBIQCBISChPz+/MTCxCH5BAAAAAAALAAAAAAQABAAAANbCLHcrSLKOZcYmDSCsR1aUABAsXDDJwJGa5SBFwgaWxbCG3CWaBwG3C8Y67FawpYiNQscg65fsVkYuoAmJs1pBR522lQB6ILJLqHRwQQOZzYdZnw+dzruDIA/AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-xconsole-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPz+/ISChMTCxAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM7CLrcGjBKCYK4OGcohv/gxw2aRgyjYJXCmVpr5loke82dfaO03vI5Ha5mwxGOyOSRF2qKKpMoxEFl+BMAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-xedit-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAASC/AQCBMRaBPyCBMQCBMTCxPz+BPz+/KSipFxaXPzerPyqXIQCBARCRDQyNISChCH5BAEAAAAALAAAAAAQABAAAARnEMg5gw00yyDGIJi2FUHhDWEWeEXrgaphHEOBJF8KBLKyLINEIAHbyA6/hbDACDSMBt9PIBA6n4HfIElFXTeKg2LbtTSeu7BiPegIvuA1mwrfOB5r4PusCjimZmgUF4F8IhJnhiJ+EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-xemacs-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBDQyNKSipPz+/FxaXISChMTCxCH5BAEAAAAALAAAAAAQABAAAANJCBASoXCFoVi8VdL6HHQeB4YjSAxnYQygSLzoSTjbEs9vMF86cbyH34NX+AELQ4zO+Nopm6cBC1PBEQwG6gd3SGo7Xa1STIb4EwAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-xeyes-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBPz+/ISChCH5BAEAAAAALAAAAAAQABAAAAI4hI+py50Bw4lyBiEggFjvi2VcqIFhdnaDSabZKrbjS3W1OHz2CkJD/vHlKD/Er2g4Ah3MptPgLwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-xfig-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPz+BMTCBISCBARCBATCBASCBCH5BAEAAAAALAAAAAAQABAAAANQCLocwbAJ8SIMYgwHHO9Opk2V5xGEplZK0alaui0eDLOB8QTykOKGQ6mnKQWFPILDN8sdng7l69c5CjuKAHNnZb2KnUOhcG3MsmMv7aK2+BMAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-xfmail-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPyqXMRaBPz+/AAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANACLHcAVCJSWcYLwaxSPAXBj2bswyiIlUWSr5muGhbdaZjTd1ZzvKMFaOFcbCIpiOnGGs2FM5gLkLrTalQLMCfAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-xload-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAImhI+py+3hEoxnUmBpyBjNzWXfJnkGKJ4dBlbjS7Jni9Zsjec66hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-xmag-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBKSipMTCxPz+/IQCBPyCBMRaBCH5BAEAAAAALAAAAAAQABAAAANICKrR+6+JIRxkc4RBww1TQBBNB21io2rRRKpltaDvis4hvJmzBmuslo+zkZ0yu0rBcwJ1AgXD8gJQMaJTaqRwyGqvzO9M4U8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-xosview-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwC/AQCBPz+/MTCxAQChPyCBAT+BPz+BAT+/PwCBAQC/AAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARFEIRJa5Ui663HFEQojqEXCAVhrCxLmGB4kCJM03aIHEdC5rfaJ6UotlavT3AEIxaNLuAyd2wlT0thYMDter0BiWU8AfgjACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-xpaint-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBAQCBPzerMQCBPz+/AQCxPz+BMTCBASCBPyCBPzC/PyqXMQCxIQChKSipMRaBDQyNAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVtICCOYmCaZGoKLBuMbykMA1EURFwCgWAQwKBAxxMQDocgAjEkrYAsoS6QGEYJCgWhWVq4tgJGY+iAVbcBB5jLq/aMbzJsYXK0Arky7JFY+BcJDyckDgEPh4d1aUSFJ2l6ARApDpSUKkQpmSJ+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-xv-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAASC/AQCBPyqXPz+xPyCBPwCBAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM8CLrc/jC+oIK9Lgg7RuietWhCSWkkVZUbEBBnWxXFSVP1eLt7kPM3X86nEhJrtx/P0tuNilCVZEqtNvwJACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-3floppy_mount-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBAQCBMTCxARmZPz+/FSWlLSytKSipERCRIyOjISChOTm5HRydNza3GRiZFRSVASCBARCBDTSJIT+bAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVrICCOQBCQKBkIw5mqLFG47zoQ+FwbN57TosDhgPD5dMEEIqE04kwlBWKBUEiNVYFpyqAyGEUCgqEtERiNNMLhQKzLQYJg7n7Y4aMAwbCUPvAQeWNgfzQQETAIhSMQEogwgBITQEGGEREmfiEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-3floppy_unmount-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMTCxARmZPz+/FSWlLSytKSipERCRIyOjISChOTm5HRydNza3GRiZFRSVCH5BAEAAAAALAAAAAAQABAAAARcEMgJQqCYBjFu1hxReN82EOhYGieaklJwHIjrqnGCJLqNWhUFYoFQCG1FgWXIIDIYNQKCoawQGI0swuFAbKsxgmDsfZjBkwDBsNM90Jot9A3DbBD0Dwiur9QnfhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-5floppy_mount-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBFxaXPz+/DQyNISChASCBARCBMT+xAT+BAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARMEMgJQqCYBiFu1sIwdJ+0hSKZnZw4ehPLoW88c0Q7X7JABLlbp+eT/UyzgpADqwgKxKYpeIMZQNWJ4YBhWRHcrgpgQCSkJu3hYPFHAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-5floppy_unmount-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBFxaXPz+/DQyNISChAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM+CLoQwZAFIV6UYox61cwaF32UtlkLSYFnulJEuT6qQATxW9W2enurgo6CaggKvKIn91K6mh0gMepydqwAfwIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-cdaudio_mount-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXISChNTS1MzKzMTGxMy+vNSytAQCBOzq7OTi5Nza3Oy6vPy2tOTStPz6/Ozu7Nze3MTKxOS2tOzOvNTqvLT2tDw+BPTy9MzOzLS2tPy+tLz+tLz2tLSynLzqvLzavLTOtNTW1KSipPz+/LzKvMTCxDQyNASCBARCBDTSJIT+bAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAa0QIBQGBAYA8Ok0DggFAwHBEIJECQUi8GT0XBMh9YHJDKQTBqUiuUCVmAeiYzmsKlwOt/AAKFIFAIIFx4WHyAhUwIDIgsZFyMkFxchJSYmiBkSBBoIJJwIGgOhiCYFJSEnFyQjFwNZewABISAfFiYnCAEmCREIrwAIFhwVGwcaBAkPGApsQsAVFA0GBQMRbxBTKM0ODQwTEq192ClDgROkBHvYKuNJUu5CKCorX1RDKCkpUn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-cdaudio_unmount-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXISChNTS1MzKzMTGxMy+vNSytAQCBOzq7OTi5Nza3Oy6vPy2tOTStPz6/Ozu7Nze3MTKxOS2tNzmvLT2tDw+BPTy9MzOzLS2tPy+tLz+tLz2tLSynLzqvLzavLTOtNTW1KSipPz+/MTCxLy6vDQyNOTm5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAapQIBQGBAYA8Ok0DggFAwHBEIJECQUi8GT0XBMh9YHJDKQTLqUigWsuDwSmMxBQ9lwvoEBQpEoBBAWHRseHyBTAgMhCxgWIiMWFiASJCSHEgQSGQgjmwglGKCHBQUSICYWIyIWAwshIVMBIB8eFSQmCAEFCREIekIIFRsUGgcZEgkPFydrvxUUDg0GBSEREGJfv9AMEySsJxDYQ4DcEhh64UpS6lTs7QB+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-cdrom_mount-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXISChNTS1MzKzMTGxMy+vNSytAQCBOzq7OTi5Nza3Oy6vPy2tOTStPz6/Ozu7Nze3MTKxOS2tOzOvNTqvLT2tDw+BPTy9MzOzLS2tPy+tLz+tLz2tLSynLzqvLzavLTOtNTW1KSipPz+/LzKvMTCxDQyNASCBARCBDTSJIT+bAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAa0QIBQGBAYA8Ok0DggFAwHBEIJECQUi8GT0XBMh9YHJDKQTBqUiuUCVmAeiYzmsKlwOt/AAKFIFAIIFx4WHyAhUwIDIgsZFyMkFxchJSYmiBkSBBoIJJwIGgOhiCYFJSEnFyQjFwNZewABISAfFiYnCAEmCREIrwAIFhwVGwcaBAkPGApsQsAVFA0GBQMRbxBTKM0ODQwTEq192ClDgROkBHvYKuNJUu5CKCorX1RDKCkpUn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-cdrom_unmount-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXISChNTS1MzKzMTGxMy+vNSytAQCBOzq7OTi5Nza3Oy6vPy2tOTStPz6/Ozu7Nze3MTKxOS2tNzmvLT2tDw+BPTy9MzOzLS2tPy+tLz+tLz2tLSynLzqvLzavLTOtNTW1KSipPz+/MTCxLy6vDQyNOTm5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAapQIBQGBAYA8Ok0DggFAwHBEIJECQUi8GT0XBMh9YHJDKQTLqUigWsuDwSmMxBQ9lwvoEBQpEoBBAWHRseHyBTAgMhCxgWIiMWFiASJCSHEgQSGQgjmwglGKCHBQUSICYWIyIWAwshIVMBIB8eFSQmCAEFCREIekIIFRsUGgcZEgkPFydrvxUUDg0GBSEREGJfv9AMEySsJxDYQ4DcEhh64UpS6lTs7QB+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-cdwriter_mount-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBFxaXISChERCBMTCxKSipAQCBMTCBPzCxPz+xPzerMT+xDQyNMTC/ASCBPyqXPz+BARCBAT+BAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAWIICCKgWAGYyoKA+EWhGGogOAaB6Lr8ygUCYWCkEMoEovBSHZUFI8LGYloODJkhWijMbMdiAwBQEbYxmpExFlkgN3QrliXAcvNAuVt4coYKtQ9BlwLCQQFMAlVSmwEUX8IB1UJiQAObEE6BA9VEDMOEUsDDzoHkZ4LoCkyqyIOCxI9NCOfETJ+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-cdwriter_unmount-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBFxaXISChERCBMTCxKSipAQCBMTCBPzCxPz+xPzerMT+xDQyNMTC/PyqXPz+BCH5BAEAAAAALAAAAAAQABAAAAR3EEgZhA0zSzGIL4RhaIDgGQeiquMkFImiECmiJMswibdS3wsRhWa4MUSFYKMxMh1oDAFARFiGSjTEVWIAnbCeUJMBSo0C1WXhyJgptC0Dc5EgFECJoo5LCL4RB0UJeRkGMSoEDkUPLYUDDioHgY0kIpYkmJkAfhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-dvd_mount-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXISChNTS1MzKzMTGxMy+vNSytAQCBOzq7OTi5Nza3Oy6vPy2tOTStPz6/Ozu7Nze3MTKxOS2tOzOvNTqvLT2tDw+BPTy9MzOzLS2tPy+tLz+tLz2tLSynLzqvLzavLTOtNTW1KSipPz+/LzKvMTCxDQyNASCBARCBDTSJIT+bAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAa0QIBQGBAYA8Ok0DggFAwHBEIJECQUi8GT0XBMh9YHJDKQTBqUiuUCVmAeiYzmsKlwOt/AAKFIFAIIFx4WHyAhUwIDIgsZFyMkFxchJSYmiBkSBBoIJJwIGgOhiCYFJSEnFyQjFwNZewABISAfFiYnCAEmCREIrwAIFhwVGwcaBAkPGApsQsAVFA0GBQMRbxBTKM0ODQwTEq192ClDgROkBHvYKuNJUu5CKCorX1RDKCkpUn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-dvd_unmount-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXISChNTS1MzKzMTGxMy+vNSytAQCBOzq7OTi5Nza3Oy6vPy2tOTStPz6/Ozu7Nze3MTKxOS2tNzmvLT2tDw+BPTy9MzOzLS2tPy+tLz+tLz2tLSynLzqvLzavLTOtNTW1KSipPz+/MTCxLy6vDQyNOTm5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAapQIBQGBAYA8Ok0DggFAwHBEIJECQUi8GT0XBMh9YHJDKQTLqUigWsuDwSmMxBQ9lwvoEBQpEoBBAWHRseHyBTAgMhCxgWIiMWFiASJCSHEgQSGQgjmwglGKCHBQUSICYWIyIWAwshIVMBIB8eFSQmCAEFCREIekIIFRsUGgcZEgkPFydrvxUUDg0GBSEREGJfv9AMEySsJxDYQ4DcEhh64UpS6lTs7QB+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-hdd_mount-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBDQyNIRuVKyCXMSKROzSrOzKpOTGnLSafLySZKxuLMSOVPTWvPzixLSehNyibOzOrGxaVJx+XOzGnFw2FJRuPKx+TPTSrHRWPKyKZPTOpHxOJKyKXFw+HKSipISChMTCxFxaXIRiPNSWXExOTOS2hLR+PLRyLPTWtMyOTASCBARCBPz+/DTSJIyKjIT+bAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaTQIBwCAgYA8SkMCAYDARI5ZJQMBwQiWgyoFgwrA3HQ7scQAqFAcEQOUi0zAkFUSFYLghMBloUCDQNGxwdHhwHekcfICEhICIfIxkLJBABJUYCICABIhAOBiYnKJaXmH4CGSkYCCqkSAEfTKenrkOwsrQll0IrS7G5uwArLLaxLbXCLsTFLyDBKy4wZEVHvCwsRn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-hdd_unmount-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBDQyNIRuVKyCXMSKRPTWtOzKpOTGnLSafLySZKxuLMSOVOzOrPzm1LSehNyibGxaVJx+XOzGnFw2FJRuPKx+TPTSrHRWPKyKZPTWvHxOJKyKXFw+HPTOpKSipISChMTCxFxaXIRiPHxaNLRyLNSWXExOTPzixOS2hLR+PMyOTPz+/IyKjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaIQIBwCAgYA8SkMCAYDARI5ZJQMBwQiWgyoFgwGgiD46FdDiCFwoDQAEe0TMkEQSFULIcLBloUCDIaDRscHRsNHhhHHyAhISAiHyMkJSYQASdGAiAgASIQKA0pKguXmJl+AiQGFwgrpUgBH0yoqK9DsbO1J5hbsrq8SrgstlJFHy0gwMVFR1J+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-memory-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBISChAQCBMTCxCH5BAEAAAAALAAAAAAQABAAAAI6hA+Bu+HCmgiiRuNoHZBRXQlc84TmcHzm2WVryE1YvMaZIdbVd2zw7lj4bDKGbxK8hHgX3K2JUDD8BQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-mo_mount-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBKSipDQyNPz+/MTC/PzC/ISChASCBARCBMT+xAT+BAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARTEMgJQqCYBjFu1hxBeN82iCIJDgWaYhtntC4ZCzItdhWOD7mdwHLrAAczoKViIh6Vto5lcDjglppp9UpCTALULRaASGS5E4TCnB2rFyqJO5Gw+CMAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-mo_unmount-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBKSipDQyNPz+/MTC/PzC/ISChCH5BAEAAAAALAAAAAAQABAAAANHCLoQwZAFMV6UlBB759Aahw0FGEITZZQmlwoqq1UNDA/xLDhvhQ8rnKPh4f2EropjcDjAhpJl8ylaBJhTaCelvRC7XqLXnwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-nfs_mount-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBExKTGRmZPz+/ExOTMTCxAQCBDw6PCwqLIyCRHxyNCQiJOzmxMSybFxSHHRmLIx+NFROHERCRFxaXASCBARCBDTSJIT+bAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVWICCOZGmeaEoGKiCwwUAI5zsUBnAUQ0CLNhxLFEDwDAnFzTAsBRYJRsORSwUeDUiEWYtJIhFj7+eKCUdPHmxyNj0nFABXRam0RBSLvZW/VFN1FQYGfiEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-nfs_unmount-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBExKTGRmZPz+/ExOTMTCxAQCBDw6PCwqLIyCRHxyNCQiJOzmxMSybFxSHHRmLIx+NFROHERCRFxaXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVLICCOZGmeaEoGKiCwwUAI5zsUBnAUQ0CLNhxLFEDwDAnFzTAsBRYJRsORSwUeDUiEWYtJIhFj7+eKCUdPHmxyNj0nOa6q2qrbW/4QACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-printer1-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBFRWVPz+/Ly+vISChMTCxFxaXPT29DQyNJSSlHR2dERCRFRSVERGRBSmnExOTExKTAT+/NTW1MzOzMzKzMTGxLy6vLS2tGRiZFxeXOTm5IyKjISGhLSytKyqrGRmZNTS1Nze3Nza3Hx6fKSmpKSipAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaUQIBwSCwaA0ikkRgQDJCE5LFgOAicUKUwUCAgBuDE9RkFcL3ggbgQUCwYyIIA8VU32ASDwoEcIAoHCQkHbA8EBBARSX0DXQEPEgQCDYpJExQVAWCHBwcNDUkKChQWBBcYARkanaABExsbHB0FGB4fIKoHAWYhpCIBIyQLJSAJGbtbULUTISa4yEVJJSbO0EtmUkR+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-printer2-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBKSipAQCBPz+xPz+/MTCBISCBISChMTCxFxaXAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEMggqrwYVDGGzRLXEZ0HhgMpFIXxZZzRBsHxXquAUHqCCBgB6YcoFhNAXMWISCQOv6Dt6DMmQwQntHjwXTVL6mH83Ry31qBO8CSQSmVg2GM74aAVij2UTPojACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-scanner-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/MT+/ASChARCRATCxMTCxFxaXKSipDQyNAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARTEMgJgqWBVivEldkUdKSXhVjZfenommglDERh3Tc4E4ZRHAGgkEPr9X6H5AHBERSMRyWzkug8jQXFEhWoOo8dRYxqLXSmGjIJnVaz29Q3fAP3RwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-tablet-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBMTC/Pz+/MTCxFxaXKSipAAAACH5BAEAAAAALAAAAAAQABAAAANECLrc/iosCUEQlEYdRp6dZ4lgKBBEp1kmmpLRMBQu6qWLEdYBn+81F0wnC8oCK+LAQDgGDIaG0vOMPnRIaEUBtW6//gQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-zip_mount-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIMAAPz+BAQCBFxaXMTCxPz+/ASChPwCBKSipASCBARCBMT+xAT+BAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARTEMgJQqCYBiFs1lwwdF8VEsR4YVuXoirYFcWbkmY31wPqma2ZwReqBEODQutwEY04oeWqMniGOEzW4HAVZAEImVSCSLDGYIX5/EMoFtNSOWHxRwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-zip_unmount-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIIAAPz+BAQCBFxaXMTCxPz+/ASChPwCBKSipCH5BAEAAAAALAAAAAAQABAAAANICLoQwZAFIVyUNIx6WybE9kBTFYIiVhXFGXJetbYDaHnlathZk2eDQunw0GwomeGoMThmKETS4PAURCMlZccHXXYct60Y4E8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-blockdevice-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMT+xAT+BASCBMT+/ATCBAT+/ARCRPz+xARCBPz+BATCxISCBDQyNMTCBCH5BAEAAAAALAAAAAAQABAAAARhEMgZwrwYBCFsvhs3eF8wDMJAVBVmnupazKRmGDFxzMVBBjcDQXfYHRA/QmKpKBYRSMoysVgwGEeoJ1ClLhpXhlbiqJobjcA1Sn48qug06+JwP+I1UMCNzmcqaR8lghN+EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-chardevice-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIIAAASC/AQCBMTCxISChPz+/MQCBPwCBAAAACH5BAEAAAAALAAAAAAQABAAAANCCBDcHkoFQasVUIrBe8fRNDwMAWojMTZmtmzByp6v7LQhTOLadbkxj3AUWZAcxcUgyYwQm8wYoOCCLgoGK5Nq9ScAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-desktop-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBExKTDQyNHRydFRWVKyqpGxubExOTERCRLy6vFxaXBweHFRKPFxeXAQCBIyKjCwqLMS+tKyurDw+PNze3ERGPPTu5Pz+/Pz6/Nza3MzOzKSipISChOzq7NTW1Ly+vHx2ZOzm3Ix2XJx2XIyOjKyqrJSSlPTexPTixKR2VKxyPCQiJPTy9JSWlHRmTOzSrMzKzJyCbKR+XCwuLOTi5CQmJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaeQIBwKAwIiEjkgJBsAgoGwcE5RCQUgAWj0WwcHA8FRLhAcIcKhyIiMSwcwglc2ABTDA2Eo9KQoy0PFxgYGRobDxwBDHRgF44YHQ4bHgkfHBUMHQ8gFp2dISIjEQwfBwIkJR0mICcoJycpKgweCisAEAcPGSwtLi8vsQkNtkMrBxswCQ8uMTINY0kzBCQwNB/DVAArBC0NNdlDM9BDfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-file_broken-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBFxaXDQyNAQCBMTCxPz+/KSipPz+xPzerAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARWEEgQahVijMmD/oRAbBw1FCgaFFrppeo5didsZTSMDoRBSi/dgfUz6Va7HPIQGB6KnpW0EEB4Oshp5ZlTFRBfFs3ZLDihtTAYwZ14nGbzoS3JfO4ffwQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-file_important-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBExGTKQqLPz+/KQqNAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM7CLoQwZAFIV6Es15Jqd2ZtzXUMIhXZqJYaZ5aK7zwp6h0zc05i+c6Eg8oCnWOR0eHQGEKnEWHdDoF+BMAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-file_locked-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBFxaXDQyNAQCBMTCxPz+/KSipPz+xISCBERCBAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARTEEgQahVijMmD/oRAbBw1FCgaFFrppeo5didsZTSMDoRBSi/dgfUz6Sq7XGp1CByKQZUUWjsgrtcENYXNUodWhAahVRa65G9hmGgnnpzMZ/7xRwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-folder_blue-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBwWHMzKzOzq7ERCRExGTCwqLARqnAQ+ZHR2dKyqrNTOzHx2fCQiJMTi9NTu9HzC3AxmnAQ+XPTm7Dy67DymzITC3IzG5AxypHRydKymrMzOzOzu7BweHByy9AyGtFyy1IzG3NTu/ARupFRSVByazBR6rAyGvFyuzJTK3MTm9BR+tAxWhHS61MTi7Pz+/IymvCxulBRelAx2rHS63Pz6/PTy9PTu9Nza3ISitBRupFSixNTS1CxqnDQyNMzGzOTi5MTCxMTGxGxubGxqbLy2vLSutGRiZLy6vLSytKyurDQuNFxaXKSipDw6PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfDgACCAAECg4eIAAMEBQYHCImDBgkKCwwNBQIBBw4Bhw8QERITFJYEFQUFnoIPFhcYoRkaFBscHR4Ggh8gIRciEiMQJBkltCa6JyUoKSkXKhIrLCQYuQAPLS4TEyUhKb0qLzDVAjEFMjMuNBMoNcw21QY3ODkFOjs82RM1PfDzFRU3fOggcM7Fj2pAgggRokOHDx9DhhAZUqQaISBGhjwMEvEIkiIHEgUAkgSJkiNLmFSMJChAEydPGBSBwvJQgAc0/QQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-folder_blue_open-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBQWFOzi1Ozq7ERCRCwqLPz+/PT29Ozu7OTm5FRSVHRydIR+fISCfMTCvAQ6XARqnJSKfIx6XPz6/MzKxJTa9Mzq9JzO5PTy7OzizJSOhIyCdOTi5Dy65FTC7HS2zMzm7OTSvNTCnIRyVNza3Dw+PASq5BSGrFyqzMyyjMzOzAR+zBRejBxqnBx+rHRmTPTy9IyqvDRylFxaXNze3DRujAQ2VLSyrDQ2NNTW1NTS1AQ6VJyenGxqbMTGxLy6vGRiZKyurKyqrKSmpDw6PDw6NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfCgACCAAECg4eIAAMEBQYCB4mHAQgJCgsLDAEGDQGIkw4PBQkJBYwQnRESEREIoRMUE6IVChYGERcYGaoRGhsbHBQdHgu2HyAhGSK6qxsjJCUmJwARKCkpKsjKqislLNIRLS4vLykw2MkRMRAGhDIJMzTiLzDXETUQ0gAGCgU2HjM35N3AkYMdAB0EbCjcwcPCDBguevjIR0jHDwgWLACBECRIBB8GJekQMiRIjhxEIlBMFOBADR9FIhiJ5OnAEQB+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-folder_cyan-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBwWHNTKzOzq7ExGTCwqLERCRBSKjBRSVGxubKymrNTS1Hx2fCQiJMzq7NTy7IzKxHR2dFTW1Ey2rITKzNzy9JTSzBySlHRydKSipDTW1ByelGzCvIzOzByOjFRSVCy2rCSalGS+tJzSzBxudCR6hCSCjITGxMTm5Pz+/JSutDyChBxydCyOlITKxPz6/PTy9Nza3ISqrGSyrOzm7MzKzDQyNMzGzNze3OTi5MTCxNTO1Ly6vLSutGRiZKyurHRudDw6PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAe2gACCAAECg4eIAAMEBQYGB4mDCAkKCwwNjYUOAYcPEBESlBMMjAUFnIIPFBUWEBcYGQoaG5gGggMcHRUeFh+fGCCVIakiICMduiQWJa4fCKkdJicoCcjJKSrPAAIrBSwtLtMv1jDaCDEyMgUzNC3SKCA12gYFMjY2KzMzN98uLdo4cujYoa9BAx4IeSywJSgAjgU8evTIgdDHj4WJHAL54cPiDyAMIzkMsSGIkCGREAU4gAOAn0AAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-folder_cyan_open-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBQWFNze3Ozq7ERCRCwqLPz+/PT29Ozu7OTm5FRSVHRydIR+fIyCdMzGxAxOTBSGhIx6XJSKfMzKzERGRAxOVKTq5Mzy7KTW1Ozi1OzizEzSxGTWzHzCvNTq5OTSvNTCnIRyVNTS1BzKvCSalGy6tAQ6XMyyjMzOzDw+PByqtCR6fCyGjHRmTMS+vJSytDyChCyWlGReVOTi5AxGRKyurDQ2NNza3NTW1AxKTJyenGxqbMTCxMTGxLy6vLS2tLSurKyqrCwuLFxaXKSmpDw6PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfEgACCAAECg4eIAAMEBQYCB4mHAQgJCgsLDAEGDQGIkw4PBQkJBZcQnRESEREIDwoPExSipBUWFxgZGhIXFwkbHBQToQQGFx0eHxoguhEXHCEiIyQGABclJiYnycsSKCkjKisAESwtLi7Y2soXLzDUAaMxMuYuM9kXNDDiAAYFBTU15NGTYeMGNQA4ahAgkEMHiQoxZrTYwWMfIRw9fKio8MMHECAReByUhIPGDSBBhAyJYDFRACJFeBi5cCSSpwM4APgJBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-folder-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBwWHMzKzOzq7ERCRExGTCwqLARqnAQ+ZHR2dKyqrNTOzHx2fCQiJMTi9NTu9HzC3AxmnAQ+XPTm7Dy67DymzITC3IzG5AxypHRydKymrMzOzOzu7BweHByy9AyGtFyy1IzG3NTu/ARupFRSVByazBR6rAyGvFyuzJTK3MTm9BR+tAxWhHS61MTi7Pz+/IymvCxulBRelAx2rHS63Pz6/PTy9PTu9Nza3ISitBRupFSixNTS1CxqnDQyNMzGzOTi5MTCxMTGxGxubGxqbLy2vLSutGRiZLy6vLSytKyurDQuNFxaXKSipDw6PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfDgACCAAECg4eIAAMEBQYHCImDBgkKCwwNBQIBBw4Bhw8QERITFJYEFQUFnoIPFhcYoRkaFBscHR4Ggh8gIRciEiMQJBkltCa6JyUoKSkXKhIrLCQYuQAPLS4TEyUhKb0qLzDVAjEFMjMuNBMoNcw21QY3ODkFOjs82RM1PfDzFRU3fOggcM7Fj2pAgggRokOHDx9DhhAZUqQaISBGhjwMEvEIkiIHEgUAkgSJkiNLmFSMJChAEydPGBSBwvJQgAc0/QQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-folder_green-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBwWHNTK1Ozq7ExGTCwqLERCRByGRBROLGxubKymrNTS1Hx2fCQiJMzm1NTy3ITGnKSipFzShFSydIzKnMzq1Nzy5JzSrByKTBweHDzOdCSaTGy+jJTOrFRSVDSuZCySVMzq3IzKpBxuRCR+TCSCVGy6hPz+/JSunDyCXCSOTCyWVCyeVPz6/PTy9IyqlCSCTGSuhPTu9Ozm7Nza3Dx+VBxyRDQyNMzGzNze3OTi5MTGxMTCxLy6vLSutGRiZLSytDQuNKyqrHRudDw6PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAe+gACCAAECg4eIAAMEBQYGB4mDCAkKCwwNjYUOAYcPEBESlA4TjAUFnIIPFBUWFxgZGpWXjYIbHB0VHhKtER+UCyC1ISIdxbkSGSMYJAiCByIlJicaxbgoEhDNAAYpBSorJScnLC0uHRLaCC8wMAUNMeAnMgkz2gY0NDUFKTYNBDE3cKzQlkPHDh42djRo0KNhjwUGBgXIscAHgQY6fPz4AQRioolBhGwUIiRIxEiEhoCYQKSIEZSHAhzIAcBPIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-folder_green_open-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBQWFNze3Ozq7ERCRCwqLPz+/PTy9PT29FRSVHRydIR+fISCfOzu7OTm5OTi5MzGxAxOLByCRJSKfIRyVERGRKTmvNTu3KTWvOzi1OzizIx6XIyCdFTOfGzSjITClAxGJOTSvNTCnNTW1Dw+PAxKJCTCVCyWVGy2jAQ6XMyyjMzKzByuZCR+TCyGVNTm3HRmTLy6vJSypESCXGReVLSurDQ2NNTS1MzOzKSipGRiZMTGxMTCxJyanDQyNLSytKyqrCwuLDw6PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfCgACCAAECg4eIAAMEBQYCB4mHAQgJCowLAQYMAYiTDQ4FCgoPEBESnBMUExMIoBUWFaEKBRIXExgZGqoTChscFR0epQYTHyAhGrkUIhMcIyQWJSYAJygpKSrIyissFi0GABMuLzAv19kaMRMyM+ABojQ15ObYEzYz0wAGBQUbBPHkYNQQcQMcABwEEhLIkUMHjRQvTuzIRwgHjx45evTwMWPGiR8GJQGxcWNGkBtCTlBMFGDIgh9CJhCJ1OkADgB+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-folder_grey-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBExKTBwWHMzKzOzq7ERCRExGTCwqLHx2fKyqrNTS1PTy9CQiJNza3OTi5GxubJSSlISChLSytFxWXDQuNKSipBweHISGhFxaXIR+hLSutFROVHR2dFRSVGReZKymrLy6vFxeXNTW1Pz+/KSepERGRPz6/PTu9Ozm7DQyNMzGzMTCxMTGxGxqbNTO1Ly2vHRydKyurHRudDw6PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAawQIAQEBAMj0jAgFAwHBDJoUGASCgWDEMxETg2HA8FFaJgFgpdYSMiUYAnlErCsmgKL5iMJqJwPzYcCB0eahAZH4gSESAhYAoGQggiBh4eFB8iehEWI5AABiQFFpMeHCIiiCWeJicMDAUOEZMcHBkSngYMKCkpJA4OBCWTk0IqKw8PvwsLLCwtLBCeRCouLC8vK80wGzEHSQEqHxMhMBMyLtLfKh4WCjM0UUgBCCoAfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-folder_grey_open-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBExOTBQWFNze3Ozq7ERGRCwqLPz+/PTy9Ozu7OTi5HRydIR+fISCfPT29Pz6/PTy7MTCxCwuLJSKfIx6XMzKzDQyNOzizJSOhIyCdOTm5Dw+PJSSlKSipLy+vOzi1OTSvNTCnIRyVNTW1GRiZFxaXAQ6XMyyjNTS1GRmZFxeXHRmTFRWVKSmpKyurMzOzGxqbMTGxLS2tJyenKyqrDw6PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAauQIAQEBAMj0jAgFAwCA7JYwCRUCwWgoCBEUBOG47CAxJhSrqT5wERplQoC8ijYDEcJASJ4HKIYDAZFRoFGxwXHR4eH3lqICEiIyQcAAcMJSaIeHonKCMpkxMqAismKyuIixMsH5MBDw8eJS0mJpcdByYSkwAcEQUEBC4lo7UHL7sXwMAkKTAeogceu0QXMRIwFjISMxITNNNDARcmLx8zNTUH4F64NDUTNlHsk35BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-folder_home-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBDw6PBQWFCQiJAQCBFxeXMTCxJyanDwyLDQqLFRSVLSytJSSlISChCQmJERGRFRWVGxubKSmpJyenGRmZLy+vOzq7OTi5Ly6vGRiZPTy9Pz6/OTm5ExOTPT29BwaHNza3NS6tKx6XGQqBNy6pIyKjDwGBOzOvJSWlDQyNIRaLNRiBGwmBNyidLxWBHxGFNySXCwqLKyqrNR6LKxGBNTS1NTW1Jw+BEweDDQ2NAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaoQIBwCAgIiEjAgAAoGA6I5DBBUBgWjIZDqnwYGgVIoTGQQgyRiGRCgZCR1nTFcsFkHm9hBp2paDYbHAsZHW9eERkYGh4eGx4ag3gfSgMTIBshIiMkGyAlCCZTEpciJyQjGxcoKUQBEhcbKiQrLB4XEltDrhcaKi0utbcJra8bLzDAGrcxrTIXHi8zNCypEsO6EzU2IzQ3ONoTzK0BCAkDMQkIOTFlAH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-folder_html-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBERGRBQWFMzKzOzq7CwqLDw6NARqnAQ+XHR2dKyqrOTm5ExKTERCRHRydMTi7NTu9HS+1KSmpBweHDy67DyixHS61ITG3AxypByu7DxinBw+ZERmdIySjITC3ARypExOTDRurIR2RPTSdJyulEyGvBw+bFSyzJTK3LzKvPzivOTixNTChLSybGyCfCRSnBQqRASGtFyuzDw+PCRShPzy5OzerOTShKyaTEx6pCxerGRufBR+rOTezPTShNy6bER+1BxCfBQuRAxelFSixBw2VISq3GySrPTWlHyanIyitFSO3IymtCRujAxWhCRqlCQ6XGyWvNS2bFyGvDxuvCRSpLy+vMS+vGxqbFyO1GSi3EyO1FRaVCQuPLS2tDxyzKyWNFxaNCQyPGxubCxajERSVExKNJyenAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfZgACCAAECg4eIAAMEBQICBomDBwgJCgsEDA0BDg8BhwYQERKUDxOYDAyeghQVFhehGBmVlwwOqxobHB0eH6EfIAkPIYIiIyQlJhsnKBcpvrYiKissLS4vMDEyFjOvNAA1LDY3ODk6Oyc8PTIyFzQ1Jj42P0A6QTtCQ0REIEUORkdIkihZwsSekBhNnDyBciCKiSNSplDRUcWKkRhXCGDJYgiGli1cpuTocsILjytfFmRpACAGRTBhRogZgzHlAjKGWnIoY+bMgRgBDHRBo/LAIZoxuhwKatRPIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-folder_image-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPz+BAQCBExKTBQWFMzKzOTm5CwuLERCRARqnAQ+XHR2dKSmpHRydCQiJMTi7NTu9HS+1Dy67DyixITC3BR2pBweHByu7ASGtFSyzHS61AxypExOTBSazBRupJQOFBSCtDxKfKTa9AxelNz61MTaxDw+PPzGpLweHJTO3ESu3DRilFymXCxKRBRypBR+rDwCBNxmVORiRKQWFCyKvJTWhDSOPCRONFSixDQaHNROPNQ2JLRubHTC5DR6rHx6fFSqRCRyLGRmXGxqbIymtCRujAxWhMySjMQ2JMyqrKTW5ERijJSenFSGXGRmZLy+vMTGxMTCvERGRMxCNOzq7NTe5LSurISKhHR2fLy6vLS2tKyurGxubCwqLOSKfOzy9Nza3KSmrIyGjGxmZKyqrIRqZIyKjFxaXJyenDw6PDw6NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAffgACCAAECg4eIAAMEBQICBomDBwgJCguMAoUMAYcNDg8QlAyXBaWcgg0REhCfExSVpIYAFRYXEhgZE60aCQwbghUcHRQXtri6DxMHgh4fICEiIyTFtxkOJQAeJicoKSojKywtLsUZJS8wMTIpMyA0NTYKIiIaNwc4OTo7PD0+P0BBhAwhUkTFAQNGjiBJomQJExsMmjh5AkVIFANQpEyhsqSKlStXmmDJomVLFC5Gunj5QiALmDAKxGSpMsYiAC5kqjhZUOaKmUdmzoAJgkaQgQYCmogJEmRQAC5pAPgJBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-folder_important-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBExGTKQqLPz+/KQqNAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM7CLoQwZAFIV6Es15Jqd2ZtzXUMIhXZqJYaZ5aK7zwp6h0zc05i+c6Eg8oCnWOR0eHQGEKnEWHdDoF+BMAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-folder_locked-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBQSFMzKzOTm5CwuLERCRARqnAQ+XHR2dKSmpOzm5GxqbCQiJMTi7NTu9HS+1HRydOTm1Ozq7Dy67DyixHS61ITC3AxypERGRBweHByu7ASGtFyy1DSOtDRmfExOTBSazBR+rCwqLAxWhAxelByGtDSaxAwODHy+1Dw+PPT29IyqvCxujOzu7NTW1Nza3ExGJJyebKyqfMTCpFRSPOTi5DQqHOTezDw2NMTGxKyqhMTGrGxmXDQ2NMTCxMTGpHx6bHx2bBQWFIyOXDQuDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfDgACCAAECg4eIAAMEBQICBomDBwgJCgsEDAKFDQGHDg8QEZQSlxMUDJ2CDhUWF6AYGZWXFBqCGxwdFh4XGK8fIAohtiIIIx25EZwBDREHgiQjJSYmGScoKSoRKQ8rggIsDC0uJS4oGygoAyjdAAcsLxQUMDEyMzQ1EzapBy8MDDc36tFwgONFjlQ6dgCEEZBHDx8+ctRIRehHAyAwZASZIGRIEBoUBwUwIGMCiwFEaBQJichIjo9FZLBsacRIAB0A/AQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-folder_man-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBQWFMzKzOzq5ERCRCwqLARqnAQ+XHR2dKSmpHRydCQiJMTi7NTu9HS+1KyqrMzOzOTi5Ozu5Dy67DyixHS61ITC3ARypOzq7ERGRFRWVJyanByu7ASGtFyy1Hy+1FRSVOzu7BSazBR+rFSyzJTK3Dw+PFxaXPTy7LSyrAxWhAxelLy6vMTGxNTS1Ly6tFyuzMS+vPz69NTW1MTCvIyOjPT29OTm5HRybFSixLy+tLS2tISGhGxubIymtCRujCRqlHx6fNza1GRiZMTCxGxqZLy+vFxeXLSytKyurGxqbISChFxeZDw6PDw6NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAffgACCAAECg4eIAAMEBQYCB4mDBggJCguMBgEGDAGHDQ4PEJQKERITFBOdgg0VFhegGBmVlxobABwdHh8WIBchsLIKIiIjCyQZJR+7JhcnoBAoKSoqKywtLi8wMbsyrwYpGhowHTMqNCqkyR8XKBwTNTY3KjgFOTopLS0ZO98wPD0+JhR490MAkCAshHyTsCLCEAlEYEgoIsCIjRlHDNzy0UFBDBtIbBzZ4KJHBB0aAQhIoqCHESQ9dAjooWQJE1uCBBRpkoSDExEcUnRYwOTJIQECNmwQwEFQgANQAPgJBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-folder_open-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBQWFOzi1Ozq7ERCRCwqLPz+/PT29Ozu7OTm5FRSVHRydIR+fISCfMTCvAQ6XARqnJSKfIx6XPz6/MzKxJTa9Mzq9JzO5PTy7OzizJSOhIyCdOTi5Dy65FTC7HS2zMzm7OTSvNTCnIRyVNza3Dw+PASq5BSGrFyqzMyyjMzOzAR+zBRejBxqnBx+rHRmTPTy9IyqvDRylFxaXNze3DRujAQ2VLSyrDQ2NNTW1NTS1AQ6VJyenGxqbMTGxLy6vGRiZKyurKyqrKSmpDw6PDw6NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfCgACCAAECg4eIAAMEBQYCB4mHAQgJCgsLDAEGDQGIkw4PBQkJBYwQnRESEREIoRMUE6IVChYGERcYGaoRGhsbHBQdHgu2HyAhGSK6qxsjJCUmJwARKCkpKsjKqislLNIRLS4vLykw2MkRMRAGhDIJMzTiLzDXETUQ0gAGCgU2HjM35N3AkYMdAB0EbCjcwcPCDBguevjIR0jHDwgWLACBECRIBB8GJekQMiRIjhxEIlBMFOBADR9FIhiJ5OnAEQB+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-folder_orange-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBwWHNTO1Ozq7ExGTDQuNERCRJxmDFw6DGxubKymrMzOzOzu7Hx2fCwqLOzaxPTm1NSyfKSipBweHOSmRMSKRNy2jJxuFFw+DKyqrOSeJKxqFMyaXNSyhNSufFRSVMSCJKRyHLRuFMSORNy6nPTezHxaFIxmFJxqDJxyHPz+/LyqjJR2NPz6/NTS1KyehIxqNJRmDLyWXPTu9PTy9Ozm7Nza3MzKzMzK1OTi5MTCxMTGxDQ2NMzGzLy+vLy2vKyurGRiZLSytLy6vFxaXHRudDw6PDQyNAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAe/gACCAAECg4eIAAMEBQYGB4mDCAkKCwwNDgYBBg8BhxAREhOUDxSMBQWeghUWFxOhGBkaCxuMBqscHRceHyCwCbMhqyIZIx0kJR4gJicSIAiCECMoKSorKyS6yhHQAAYsBS0uKSkZHSsdHc+CCC8vqDAxMtQzJDTdBjU2NwUsODg5Wsxz0e2ADhw7/sEgwKOHwwW3BAXwsYAHARg/eAAJIgRiogAHhhApEoSIkCERI4E0QmHDESSREAWAkASAn0AAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-folder_orange_open-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBQWFOTm5ERCRCwqLPz+/PTy9PTy7OTi5FRSVHRydISCfIR+fPT29Ozu7MTCxFw+BJxqBFQ+BJSOhIRyVMTGxPzSlPzmxOTGnOzizIx6XIyCdOyeLPSuTNSubOTSvNTCnNza3Dw+POSGBLRyDMyeXAQ6XMyyjMzKzMyWBKx6FJx2FHRmTLy+xDw6PLyqjJR2LJRyDFxaXOzq7JRuLEw2BKyurDQyNNze3NTW1NTS1MzOzJyenDQ2NGxqbLy6vJyanGRiZLS2tKyqrCwuLKSmpAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfEgACCAAECg4eIAAMEBAUCBomHAQcICQoECwEFDAGIkw0OBA8PEIwRnRITFBIHDRAVFhWipBcFEhgZGhMSEg8bGxUcHQQKth4fIBoburwbISIWIyQAEiUmJicnyrooKRYqBdQrEywt1yfJGxQuLzCEozEyM+XnEjQv4QAFEDUKCjE2JrRoYeMGjmkAchAYoWPEDh49YrBQ5SMfoR9AXvRQcSFCkBcUhFgcFCDHEBxBiOAoQgFhpABGaPg4IiFHJE8GbPoJBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-folder_red-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBExKTBwWHMzKzOzm7ERCRExGTCwqLIw6FFQiDHx2fKyqrOzu7CQiJOzOxPTe1MySfKymrOzq7Nx2TLxmTNSelJQ+FMzOzNxiNKw+HMR6ZMyWhNSajHRydFRSVLxSLJRKJKRKJKQ+HNSWhNSmnHQ6FIRGHJRCHPz6/LSajIRONPTu9Nza3KyShLR6ZPz+/DQyNOTi5NTS1MTCxGxubGxqbMzGzLy6vLSytGRiZHRudDw6PAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAanQIAQEBAMj0jAgFAwHBDJoSGhWDAIDUHgsAgcHQ9IhLqQMAsTr9BBqUTClktVgmkYhIOMprLhdOBUHh9rICEiIyN8JCVwdwAOIiYnJyiHiRtvjgYpBSorJgknIpYRmikpLAUtLp+hIy+aLKkFMC0tGJ4mK44xBDKqLTMEBDTFNY5EMTY0MzM3NDg4OR7IQwExOjnROTk6B1FC1x8SEjs84EcBCDEAfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-folder_red_open-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBQWFOTi5OTm5CwqLPz+/PTy9Ozu7Nze3Ozq7HRydISCfPT29PTy7MTGxFQiDIw6FJSKfIx6XPz6/MzKzERGRNyypPTWzOzi1OzizIyCdDw+PNRuTNyCZMSSfOzW1OTSvNTCnIRyVNTS1ERCRMxGFJxGJIRKJLyCbAQ6XMyyjLRWFHRmTLy+xLSelIxWPEQeBGReVIxOJIRSPKyurDQyNNTW1JxOLEwiDKSipGRiZMTCxLy6vJyenLS2tCwuLFxaXKSmpDQ2NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAe+gACCAAECg4eIAAMEBQICBomHAQcICQoLAoUMAYiTDQ0LDg4PCgQQnBESEREHoBMUEwUVDgsWFxEYGRiqEQ8aG68cBQQdER4fIBghu6saIiMkJSYAEScoKSrJyxIrLNEd1C0p1ygo2coRLi/gAaIwMSnx5SoyM+uCHQ8LChrv8TQ1ZNiYBuCGgoMKcJSwACNHCh07wAkK0IFHj4UQevjwEeGHREk3ZtjwAcSGjQgfEwUIIuTHEJSROhkgAsBPIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-folder_sound-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBQWFMzOzOTm5ERCRCwqLARqnAQ+XHR2dKyqrMzKzHRydCQiJMTi7NTu9HS61KSmpDy67DyexExSVITC3AxypBweHByu7FRiZDRiZHy+1ARypExaXBy2xGRqZFSyzJTK3AQ+RByqtASCtASGtFyuzDw+PATC1ByGlFxeXISGhJSWlFRWVAxmlBR2pBR+rAQ2PAS2xHS2vMTCxJyenLS2tCRujAxWhAxelFSixAQaHARibARudAR2hEySnPTy9Nza3GRiZNTS1IymtCRqlARWXDyCjPz6/MTGxLy+vMS+vGxqbAQiJARaZEx+hLy6vKyurERGRBQuNCw6PISanFxaXDw6PCQ2NDRGRDw6NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfYgACCAAECg4eIAAMEBQYCB4mDBggJCgsMBQIBBg0Bhw4PEBGUDRKMBQWegg4TFBUVEBYXlZeNghgZGhsCFRyhFh0JDRWCAx4fGg0gCiERIqEcBoIjHyQeDcMlJhQnEQ8oANQpKissLS4vMDEmJhEoMjPxNDU2Ny44OTo6FzsGPD0+fgABEUTIECIMiuAzIk3GkR5IbgRJMoSAkiVKmDSRBsDJEyg1hBQYUqNGlBtSGkwZRGUDEyILWCxYcmPBgiYrB1WxEsBTgANXbCwYggVRFi2Ifm4B4CcQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-folder_tar-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBQWFMzKzOTm5ERCRCwqLARqnAQ+XHR2dKSmpHRydCQiJMTi7NTu9Hy+1ARypDy67DyixHS61ITC3Ozq7BweHJySbJyWbAxypExOTPz21KyqjPz67OzmxFSyzJTK3LSujASGtDw+PKSehPz69Pz23OzitPTqvOzerKSaZBR2pBR+rKSefMy+dKyeTIR2NAxWhAxelFSixJyadOzirLyubLyqVJySPHRmJIymtCRujCRqlPTqzOzW5OzSzNzSrLyqXLSeTJSGNMTGxMS+vLy6vGxqbJSKZOzOxNzGtNzOhKSSRIR+LGReHLy+vKyurOTWlHxyJFxSFLS2tKyqrERGRHRuRNzKfNTGdGxeJGxiNFxaXJyenDw6PDw6NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfcgACCAAECg4eIAAMEBQYCB4mDBggJCguMAgEGDAGHDQ4PEBEJDJcFp52CDRITFKAVo6UEFgaCFxgZGRgUFa8apBsAuhwdHh+5IBQhrwYZIh3PHdAdGSMTyQ4kJR4mJycdKCkqKywtIyMUJC4cKR7EKC8wMTIzMxE0BjUmJjY2NzgwcuggsIOHjB7NfPwAEkTIkBxEdBQxUuQIEgNJgihZwgRGEyJOnhyBciTKxSRSpDBh0iRGjClUjlSJYgXJFQBYbmTREmOLDi4BDnTxsgDJl0E5uXBBFBQMAD+BAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-folder_txt-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAMR6RPwCBAQCBExKTPzGjBQWFMzOzOTm5ERCRCwqLPyGBPzKjARqnAQ+XHR2dKSmpMzKzHRydPyGDNTu9Hy+1OR2BNSOXHS+1MTi7ITC3AxypOzq7KRKBPyCDOySZPzizPTWxFSyzHS61ITG3FROTCQSBMxmJNRyROy2lOy2nASGtDyixJTK3FxGNIRWLMR+XPzStPTKrBRupBR+tFyuzDw+PDQuJIRSNAxWhAxmnBR2pBR+rPT29FxaVEw6LKRuVIx6ZISitCRujAxelAxmlFSixOzu7JyWjBwaFKSShNTW1MTGxDQ2NMTCxNze3Nza3HRqXMS+vGxubGRiZLSytCwuLERGRJyenGxqbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAAfLgAABgwIDg4eIAQSCBQYHCAMJiYMKCwAMDQ4PEAcDAggRApQSlhMUmJqOBweiFQoKBBYXGBMZGpkPBhsIHBUdHh8gISIjtCOoJCUcJicoHykqK8MstBQIASUtLi8wMTIzKtE0Ihg1gwg2Ny8xKDg5OjvhItcBCDw9Pj9AQUI4Q0QMipirZ2TDERJIkihZwg+HEHpMmjg58OQIFANLomSUQi+AACZTohiAkDEKFSocJwmoMoWKSSoPpFiZdEhAgh5XHmBhQjORTZ5+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-folder_video-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExOTBQWFMzKzOTm5ERCRCwqLARqnAQ+XHR2dKSmpHRydCQiJMTi7NTu9Hy+1Hx6dJyenLy6vIyOjDy67DyixHS61ITC3ARypOzq7ERGRFxaPKyqrBweHByu7ASGtFSyzITG3KSOPKyurBSazBR+rJTK3HS+1Hx6ZNzObAxWhAxelAxmlBRupBR+tFyuzDw+POzibNzOZIyqvCRujLyiPJyCPJSWlNTS1ISitFSixHxiFGxeJFxWLExKNCRqlDw2BFROHHxqPMSqVISChMzOzGxqZISCbLSaRKSWTFxWPNzGZNTCZLy+vLSytGxubJSSfGRiTMyyVLymTLyiRMSqTEQ+JGxqbNS+XNzKZOTWbLy2ZFxaXDw6PIyGbOzidOzifMy6XCwmFGxmXDw6LAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfigACCAAECg4eIAAMEBQYCB4mDBggJCguMAgEGDAGHDQ4PEJQREowFBZ0TFA0VFhegGBkJEZcaGxwdHh8gFiEXGKAiowIjHCQlCCYgvL4noCgGKSoGCyssLS4vyxYwrzEyM9MSNDUrK9jKIBcGNiMjNwY4Gjk65dcIOwY8PT0+PwYUAuTIQaDeCiAGgggZMoQDEQNFchghMIHiEQNIkihZwoRJkx8RCDhxMuEJFAMGokiZQoRKFStXjpQk0QHLBgDRrEzJomULlwFHukhYgMWLIANfwIAJw+WKmDFkAjQoA8BPIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-folder_violet-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBExKTBwWHMzKzOzq7ERCRExGTCwqLHQWhEQOVHR2dKyqrNTS1PTy9Hx2fCQiJOTK7OzW9LyKzGxubLRW1JxOtLyCzMSS1HwijKSipLQ61HwinKxuvHQajFRSVJQytIQqlKRqvMSe1GQebHQihLSCxNzG5Pz+/KyStHQ6hPz6/PTu9Nza3KSGrJxmrOzm7MzOzDw6PDQyNOTi5MzGzMTCxGxqbLy6vLSytHRudGRiZLy2vDQuNFxaXDQ6NCH5BAEAAAAALAAAAAAQABAAAAaoQIAQEBAMj0jAgFAwHBDJoSGhWDAaDkPxEThCIpIJlcJgFgpdIaRiuYAxGcVD02gKBxuOpXPBvD1VH2ogISEceiIXI2ATBmohJAklGYaIJieOAAIoBSkqJCUlHJUmmQYrDiwFLS6foRwvpqkwMCstDTGtJCoyQjMELTQttw01Nsc3B0MBMxQ2DSfGNjg5OplHzDs5ODw5DMlRQgE9PhoMOjPh2BA/AH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-folder_violet_open-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBQWFOTi5OTm5CwqLPz+/PTy7Ozu7HRydISCfPT29Ozq7Nze3MTGxEQOTGwahDwKRJSKfIx6XOzi1Pz6/MTKxNSi5OTS7Mym1OzizJSOhIyCdDw+PKxSzLRq1LSCxOTSvNTCnIRyVNTW1JwixHwqlKRutOTS5AQ6XMyyjNTS1JwerHQmfIQylHRmTLzCvKyWtHRChHwuhFxaXERCRHQ+fLSytDQ2NKSmpGxqbLy6vDwOTJyenDQyNKyqrCwuLDw6PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfDgACCAAECg4eIAAMEBQICBomHAQcICYwChQoBiJMLCwUMBw0NDg+bEBESEAcLDRMUExUMFggXAhAYGRoREBAIGxscFB0EBB4QHyAhGrq8EBsiIyQlHgAQJicnKMspuyorJCzVEi0uLy7Z2xopEDAx1QEMDDIzLjTZ2hI174I2CQ0EHMi4ge7EDQk4qgHI4aChAxYsLsg4J0GHQkI5dsSIeCFGDB49fFwcFOBHDRw8cOAAAmEkpyA1fOjoISQSJwPV/AQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-folder_wordprocessing-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExOTBQSFMzKzOTm5ERCRDQuLARqnAQ+XHRydKSmpExKTCQiHMTi7NTu9HS+1HR2dCQiJDy67DyixHS61ITC3AxypKyqrBweHGxqbGRmZFxaXFRSVERGRPz+/ITG3JyalOze1PTm3Ozi1PTm1Hx2bJTK3IyOjPTy9CQqJFyuzDw+PNTGnDQyNPTq3Ozq7MS2hASGtKyaXCwqHBwaHFxWTKyahLSijKyehHRmXHRqNFSixHxyNAwKDERCPAQGBCwqLIymtCRujAxWhCRqlMS+vMTGxIyCVJSSfLy6vLS2tLSytGxubCwqJExGJEQ+JBQWFJyanDw6NDQ2NBQaFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfUgACCAAECg4eIAAMEBQIGB4mDBggJCguMDAEGCgGHDQ4PEJQRlwWmnYISExQVoBYXCREYjAaCGREaGxwdHh8PIJQKhgAhIiMkJSQkJhUnrrUGKCkf1B8pGyoUK60sLSouIS8vMCUhBw0xMjIVBjM0NTY3ODk5Og0NOwgXPCw9AD4BBvwwMABIgCBChhApUqtBhgw1INaIWMPIESMaGiIRsbFjkhpKlmDQYKgGx5MdDyxhgqFJLSdPoMiU+YRGFA5SRk4RRCWDix9TnFRxISiAE6J+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-folder_yellow-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBwWHMzKzOzq7ExGTCwqLERCRJSSDFxWDGxubKyqrNTS1Hx2fCQiJOzqzPTy1NTKfHRydOTWTMSyTNTKjNzOjJyWFHR2dKymrOTaLKyaFLyyRMS6ZFRSVLy2JKSeHNTOnNTKhHR2FISGHIyKHKyeFOzmxPz+/LS2lIyCNJSWJMzKfPz6/PTy9Nze3KyqhLS2XPTu9Ozm7Nza3MzK1LSyjIyONDQyNOTi5NTO1MTGxMTCxMzGzLy6vLSutGRiZLy2vKyurKSipAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAe0gACCAAECg4eIAAMEBQYGB4mDCAkKCwwNjYUOAYcPEBESlBMMjAUFnIIPFBUWnxcYChkajAaCAxscHR4SrREWlBkfqSAYIRy5uyKfIwipISQlJhgnx7oSKM0ABikFKivQCSwn1C3ZCC4vLwUwMd/RGDLZBjPqNCk1NTY33zjZOQQ1dOBrsIMHjx49FtQSFCDHgh47GvhA+AOIwkQNgwARUnHIxUiEcnwgwmBBDpCHAjw46ScQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-folder_yellow_open-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBQWFNze3Ozq7ERCRCwqLPz+/PTy9PT29FRSVHRydIR+fISCfOzu7OTm5MTCxFRWBIyOFFRSBJSKfIRyVOzqnPTuzNzapOzi1OzizIx6XIyCdNzORNzSZMTCfOzqzOTSvNTCnNTW1NTGFKSaHLy6ZAQ6XMyyjMzKzDw+PLS+DHyGHIySJHRmTLy+xLS2lIyKPISGJGReVOTi5ISGNExKBKyqrDQyNNza3NTS1JyeJKSipGxqbMzOzLS2tJyanKyurLy6vKyutCwuLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfDgACCAAECg4eIAAMEBQYCB4mHAQgJCowLAQYMAYiTDQ4FCgoPEBARnBITFBIIoBUWFaEKBREGFBcYGaoUChobFRwdBRAGEh4fIBkhuqsbIiMWJAYAFCUmJifJG7ooKRYqK9QsLS4T19kZGxIvMNMBojEyMy4u5xQ0EeEABgUFBDUxbJBzYeMGjmkAchBYqGPHjggxeMy40UMfoRw+IvxQoSICEBgUgiCUlIOGkCFAiOCgYDFRgCILgqxsGYnQgRwA/AQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-ftp-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxaXNze3LSyrJyanPz+/Ozq7GxqbDxinBw+ZERmdIySjHRydMzOzPT29CwuNDRurIR2RPTSdJyulEyGvBw+bLzCxIyKhGxubERCRLzKvPzivPTmxNTChLSybGyCfCRSnBQqPLy6vLy2rCRShOTixPzy5OzerOTShLyaVEx6nCxerGRyhOTi3OzaxPTShNy6bEx6rER6zDRitBxCfPTq3LyulBw2VISq3GySrPTWlHyanIyitFSO3PTm1Ozi1LyqjDQyNCQ6XHSq3GyWvDxuvCRSpLSqpOzezAQCBCxGZCRKZExGLDQuHAwaLBQWHKymnOzexARCBJzOnGy2bDyePCxKJOzWvLymhAx6DAyGDDROLOTOpHRmVLyidLyedAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfRgACCAAGFhoaDiQECjIwDAQQBiYKLBZYFBgcFkZMICQoLlwwNDgQPghAREhMUCBUWBRcMGBmnEBobHB0eHyAhIg4CIxenJCUmJygpKisVLAIGLSMPJBQuJi8wMTIzNCEWJjU2Dzc4OTo7PD0yK94DPj9AQUIUQ0QwFDFFRjchRz5IbARJEkLJkiVMmDRx8uQBlCgbgDyQMmUKlYpTqlSsYsXFFSwTK2bRMmWkyCxbuICkmKVlySwvpXTh4mWilJs4c3bB8uXLqUEBHggdSvSBn0AAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-link-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBFxaXPz+/AQCBKSipAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMgCLrc/jDKSau9OL/AuwxCKAzfOIwlcZIRKLJQMMyz5CcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-network-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBAQCBISChPz+/Nza3ARaZESanCyKlARudARGTLy+vNzq7ARmbMTCxARufAROVMzOzKSipARyfOzq7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVmICAGZFmKQiACweCSBImq41AYB5IodLq2hwWO0ejRWDac48Gb/QKNqNRoqspmrVcAUuIJBANS8sBIFCORUgooPEh4J8B67NgdsVBp9C5XWfl9LRMTCyReX19hARNojWlWLH+AAH4hACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-pipe-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBISChMTCxPz+/ARCBFxaXASChCH5BAEAAAAALAAAAAAQABAAAAM2CLoazpAFIV6UYZB6Yd5BtwRbEYqkYIqAQRir6KpnN8cdCddXivcbAy+S2qEOAuPx8MtZRP4EACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-shredder-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBERCBAQCBMTCBPz+xFxaXPz+/AQChISCBISC/DQyNPz+BARCRAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARcEMgZhBUzgzuIH4G2FYThnZUlCab5Ed0hC6nZ3Yh8JIKyLjCYboeZKIK6BDHTGwyViopEoWAkdwfqoKhIKLFUwXY79coUtLG4CFAcOOstWyNWyEXMO57p2/vxfhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-socket-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+xMTCBFxaXKSipDQyNPz+/MTCxISChAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARKEMgZpr1SjFqx1QHoTaA4AuV2EmmHEUUxsKoHB7FMGPbhI7gCgnchII6+AyJBtBhjx0KC2TsIp9QXcpm1HafNEQF8mhAOCdfEHwEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-trashcan_empty-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBKSipERCBARCRPz+/MTCxISChFxaXAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARREEgZapiYWjGIvVNQjEZ5BKUAApVgjEWJzCtAnIGgC8eZ5bre7ICosQQFVY9Y/CGVwiYmlwwsac7qVRp6WqNGKpQZ9m7DojH2t+lVMtMP3B8BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-trashcan_full-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/Pz+xATCxMTCxMTCBKSipPyqXISCBFxaXISChAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARbEIAQJJU4BzEoIdSFbcNQnIVhBJ02GAeFIGxZjUl8KoHRagfeYqgo3kaxQOEwXPAyk4Mgtgg6jxYp1foETgPEKzSgBXOx0W9VIfZu2d3R5t3WhA5BEdQSQgP8EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-www-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxaXNze3LSyrJyanPz+/Ozq7GxqbDxinBw+ZERmdIySjHRydMzOzPT29CwuNDRurIR2RPTSdJyulEyGvBw+bLzCxIyKhGxubERCPLzKvPzivOTixNTChLSybGyCfCRSnBQqPLy6vOTi3Ly2rCRShPzy5OzerLyaVEx6nCxerGRyhOTezPTShNy6bEx6rER6zDRitBxCfPTu5PTq3LyqjBw2VISq3GySrPTWlHyanIyitFSO3LSqpPTm1DQyNCQ6XHSq3GyWvDxuvCRSpKyurOzizAQCBCxGZCRKZExGLDQuHAwaLBQWHKymnPTmxOzaxHx+fMTCvOzWvLymhHRmVExGPOTOpExOTERCRLyedBwaHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfWgACCAAGFhoaDiQECjIwDAQQBiYKLBZYFBgcFkZMICQoLlwwNDgQPghAREhMUCBUWBRcMGBmnEBobHB0eHyAhIg4jJBenJRwmJxIoKSoVKwIGwg8lFCwmLS4vMDEyIRYzNDUPNjc4OTo7PDAq3T0+Pj0/QBRBQi4UL0NENiFFPkbijoRAkiSJEiVLmDR54OQJFHEPREQRIWWihYlRMkCZQuXBgyIBihSpIjLAowBWroj7gaUIlpYvXWLJUuWKlgdbHvz44XHnzgdVami5qUinR50/efoJBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-zip-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBIQChPzC/AQCBMQCxAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMeCBCh/i+IAesShNo4+v5gKI5kaZ7oxzCilLVvq/kJACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-cal1day-16:korganizer korganizer16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBAQC/AQCjPz+/MTCxKSipAAAACH5BAEAAAEALAAAAAAQABAAAANOCLrMEUDIOUS9AFLLhx8LIRZjKYZmMRCkaChFLHty/AIiS3y6q+QtT49wq8VotRtQJGwRf6Zmrlj7DJLQXsupTJmeEIN4TB5nII20wp8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-cal5days-16:korganizer korganizer16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBAQC/AQCjPz+/MTCxKSipAAAACH5BAEAAAEALAAAAAAQABAAAANMCLrMEUDIOUS9AFLLhx8LIRZjKYbj55GioRRwoQ5x4QIiIdMmcec7jy53q81qP9OO5VMAj8RXTFWzOZW95HDLdEEM4LA4nIE0zgp/AgAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-cal7days-16:korganizer korganizer16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBAQC/AQCjPz+/MTCxKSipAAAACH5BAEAAAEALAAAAAAQABAAAANPCLrMEUDIOUS9AFLLhx8LIRZjKYbj55GioRRwoQ5x4QIiwcp0fucsj873qvGMv5Jw2FIACUsW4WakGW1O046I05qmGYBhTC6TM5CGWuFPAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-calappointment-16:korganizer korganizer16 16:photo:16 16:R0lGODlhEAAQAIMAAAQCBPwCBAQC/AQCjPz+/MTCxPz+BISCBISChKSipAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAARbEMhJaQhA6D1E/wDGeeRgDhOhFoTBEi+REgdrIHScSEVvAD9Xr7cDqGSGpFEnQSqTv2NxCFQOiU1VEAiTZmstHFg1vQKuw+LxxfYaV/AuOQRI2O/4ewhT6Uv8EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-calbell-16:korganizer korganizer16 16:photo:16 16:R0lGODlhDwAOAIIAAPwCBISCBPz+BIQCBMTCxISChPz+/AQCBCH5BAEAAAAALAAAAAAPAA4AAAM+CLrR+zCIAWsgLVRGRBhOVQiG94WPVAbHaZHYAWqRYLbge88RsbInGuBCEhRYrZYm4xk4nYdoKzKIbiKHawIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-callist-16:korganizer korganizer16 16:photo:16 16:R0lGODlhEAAQAIMAAAQCBPwCBAQC/AQCjPz+/KSipPzerMRaBEQCBAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAARDEMhJaQhA6D1E/wDGeeRgDhOhruyatjBRSIRxxOsMEAdC0BUZDcfSEYvDo3Bn++2Cxt7RqFxWhZiCdsvdhjCVsMQfAQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-calmonth-16:korganizer korganizer16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBAQC/AQCjPz+/MTCxKSipAAAACH5BAEAAAEALAAAAAAQABAAAANSCLrMEUDIOUS9AFLLhx8LIRZjKYbiRxLFIBpK0Q6z7MkwkJIe8b0KEeuWchFysuStVsjtfMbeMQitWpG25YfmNK1WU53XNIUYzug0OgNpuBX+BAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-caltoday-16:korganizer korganizer16 16:photo:16 16:R0lGODlhEAAQAIMAAAQCBPwCBAQC/AQCjPz+/MTCxKSipPyCBMRaBPyqXAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAARTEMhJaQhA6D1E/wDGeeRgDhOhFmurpi5LyIQhFfiBIAfuFzaAioBIJBCummRYPCaDPh3vhwsOZdihNfa8Ub/AJXemFZPPNBvGwG672yFMZS7xRwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-caltodo-16:korganizer korganizer16 16:photo:16 16:R0lGODlhEAAQAIMAAAQCBAT+BAQC/AQCjPz+/MTCxPzCxKSipPwCBMQCBIQCBAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAARaEMhJaQhA6D1E/wDGeeRgDhOhFmurpi5LyMYhFXiuFwZiA6qZYbbqJX5BIw2RAPxwAAWCyWMCCsiXFGEEErKz6LQZfOqiTR1YJiGq1rFyyHmo2+/1EKbCl/gjACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-adjustcol-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBGRiZAQCBPz+/CH5BAEAAAAALAAAAAAQABAAAAI7hI8JAWL+IgvwUSSY2Lz7VTXXkS2NdJ6TwiSaB3PNQNdCbc/4cO9OjwPmhDQiTxfcHY1MpE35g0IB/gIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-adjustrow-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBGRiZAQCBPz+/CH5BAEAAAAALAAAAAAQABAAAAI5hI8JEcItooxG1oEzBoJ7oWlHd4VbNZpbx3LqUFGuajTPhI8kSLfsO0rRUCXT5wPkyHhGhsOJs/gLACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-black_sum-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIdhI+py60BY2QwhVYdytpw/WFXF1LjcW6S1LVu6xcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-border_all-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAAQCBPwCBCH5BAEAAAEALAAAAAAQABAAAAIjhI+pq+FuHjwyRInqfRkDTXkgQ5YLOH6it00pyqqcPJk26RcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-border_bottom-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAAQCBPwCBCH5BAEAAAEALAAAAAAQABAAAAInRIynGe0PFTQz2kdxzHf72iSiRDpc2F1niaafBroYQNe2fdx6HfgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-border_fall-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAAQCBPwCBCH5BAEAAAEALAAAAAAQABAAAAIrRIyneRYP4wPUKWmr3E5b+DVh9GkYuFALiqnsJp6nObYZB5ow2a3Jvwv6CwAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-border_horizontal-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAAQCBPwCBCH5BAEAAAEALAAAAAAQABAAAAImRIynGe0PFTQz2kdxzHf7CoTiSB7kKUpa1Vlc86rtSjvxnOSL4hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-border_inside-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAAQCBPwCBCH5BAEAAAEALAAAAAAQABAAAAIrRIygxxYPF4zzyenqxfVk2m0g9lnKiabqqoYl43YwGcqiFWv22zRnD/AXAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-border_left-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAAQCBPwCBCH5BAEAAAEALAAAAAAQABAAAAInBHKJmxYPY3TyVCozsjMbrk3gM27KyZDlioVQS3qwO7Nl6KC6q/kFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-border_outline-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAAQCBPwCBCH5BAEAAAEALAAAAAAQABAAAAIrhI8ZybgQYoTy2YqtwVTunVVfN3HQsaTnc5Kp2Ibw5Zm0PHJ2w7O8I5P5CwAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-border_remove-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAAQCBPwCBCH5BAEAAAEALAAAAAAQABAAAAIjRIynGe0PFTQz2kdxzHf72iSiRDpc2F1niaafBrraSMuQXwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-border_right-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAAQCBPwCBCH5BAEAAAEALAAAAAAQABAAAAInRIynaOEPH5hRRVrzbJBLn32g1TXJuWBdpYYiy47hBl+yRqH6HfoFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-border_top-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAAQCBPwCBCH5BAEAAAEALAAAAAAQABAAAAImhI8ZyRgPo3xgVnmnprbvnUEhx1XmgpLRmH7e+rowFssleuaBXwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-border_up-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAAQCBPwCBCH5BAEAAAEALAAAAAAQABAAAAItRIynwOEPH0vRuGkjnFKjpmgX2FVkuBwNhapZKZ3VyMKcGJPv5eJmAkz5RP4CACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-border_vertical-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAAQCBPwCBCH5BAEAAAEALAAAAAAQABAAAAIrRIygxxYPF4zzyenqxfVk2m0g9llmsiCmVjJh65Jh59GtGMuzqqQNDQz4CwAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-cell_edit-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBPz+/ISChCH5BAEAAAAALAAAAAAQABAAAAIshI+pm+EPnwmi2msDoLgLzQWDV4HlSJof6qki+W0nrMKlbN9bxGvMDwwG/QUAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-cell_layout-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPz+/PzerMTCxPyqXHx+fAAAACH5BAEAAAAALAAAAAAQABAAAANCCLrc/i3ISacKIuutA8ACxWUeJg0DqBHhd6ZiRpQBag9F2n13FRis0q1QUAmCvFuKRTAYWhIi0bhz+SqQrHbL9ScAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-chart-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBAQCxAQC/AT+/MTC/Pz+BAAAACH5BAEAAAAALAAAAAAQABAAAANMCLocHiyuIASU6lE7Xx7DdgEBQVwBKE4mqlZjeT4vl7VFkYZUjOuGkMFiuJ1yKUNAWTQGkEKDknUESpdXkkYjnWIWzOVX0SyPJwx/AgAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-comment-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPz+BPz+/Hx+BAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM5CLrc/i3ISacKYuStuwhAMBATKRHkAGJeu60qagqmuHK4B6Pn3N0u147Ha8FyOVCowlRCntAo1J8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-deletecell-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIIAAASC/AQCBPz+/PwCBMQCBISChAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANICLrc/i3ISacKIuutA8BcKAwfNwwmQYDZoJ6tWrBZoRKuXIb2XRS7UG4wC25yOIGHFvu9PJ8KcRbQOVzAheoxbRCyDOKj4E8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-delete_table-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIIAAASC/AQCBPz+/PwCBMQCBISChAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANPCLHcDDCIOSUVAaqLeY5O+G2XRQVDdA0DNxCEwrwEu9AFORVw3ee6Cu8HFKFgA2AQQ6uNTJNXYZgCNZKFBay4IhQuMBUFW/LKZlkHoOBPAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-dissociatecell-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIEAAASC/AQCBPz+/PwCBCH5BAEAAAAALAAAAAAQABAAAAI0hI+pm+EPoQlC0GqxnfV2HUzR6HDWgA5Bqppr+qIhcMUqO5Oki+M87KN1ejCRTsJIKhP+AgAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-first_letter_upper-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIohI+py72RIJOHRmBt3QaGz2GVBGJfKW4aiXhX2sHxbKKneDv6zht+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-fontsizedown-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAInhI+pELHqmIkQNZrwfXYvzE1fBUrWoZniOjWdp0agjLL2i7rhDvgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-fontsizeup-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAImhI+pEeoNIFyIzXStw3q/T4VVhJHHlDGjgZ6n1bLyCrqPyuJe4hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-funct-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAImhI+py60R3IkRVHQzo9BwD1qhqGneRU4gSqlVJ8Zy0mKPhOe6XwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-insertcell-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBPz+/Pz+BATCBAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAAM7CLoa/k7IKQCEdNobc+UOMCijCD5jGjAMOowrIc/Wm77ATIe2leuETcrEYpSOJ88HpNxwmqdi40Tl+BMAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-inserttable-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBPz+/AAAACH5BAEAAAAALAAAAAAQABAAAAIuRI6JwCH/HBSBmUlxbarvO0nQJ0aa5XWodjZsiKbJGrbgaMuzW8M87jPoDgx/AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-lower-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIqhI+pELHqmIkQNZrwfXYvzE0QKGniQWmNhbYSeqXn6zJOBJLTuuuh4i8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-mergecell-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBPz+/ATCBCH5BAEAAAAALAAAAAAQABAAAAIyhI+pm+EPoQlC0GqxnfV2HUzR6HDWgKZpCFyBCrMurMoPvZovPsgd39MBbaQI44hU+AsAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-money-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIIAAASC/AQCBPz+BPwCBASCBATCBAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM+CLrcHMHJIEaUD16sqIUcQAne5pQaBglkZS6lxb6dRoIAQTzuphcFXWeW0xl/utIPGDQOSUdnA7IUhoocfwIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-oscilloscope-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBOTm5Hx+fLy+vAQCfAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANKCLrcGjDK+IS9494AgrbEJ3CeUBRWpp2daaHhhZKuq75jh8pxTRaEQbAgFAIHv1VvR/vsdrnSCmdpagYnjfXS27Q+N29nQuYA/AkAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-percent-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIkhI+py70RUHxxQmosu6BOdWkNR35PVm1etqEsaKXnwTn2DfgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-precminus-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBPz+/AAAACH5BAEAAAAALAAAAAAQABAAAAIthH8RiJvrmHogVoXNtFRDpjUf6JWkeUoXlpGBAMfC+cowbd+uwL54/rMFZf4CACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-precplus-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBPz+/AAAACH5BAEAAAAALAAAAAAQABAAAAI2hG8Rp4y9IGgszqhyspLueYHih43hiX7Iui5XprGTQNeCPNNBje86L9vBdr2a7xY0AllHm78AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-removecell-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIEAAAQCBASC/Pz+/PwCBCH5BAEAAAEALAAAAAAQABAAAAI5hG+hq+IvAGPwydlqxAohvnjHMChkR6YDcKaougZqCMdyGYqSG+jXKQtoNkGTUHPBDJMTH+jJ8RcAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-removecomment-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIIAAASC/AQCBPz+BPz+/Hx+BPwCBMQCBISChCH5BAEAAAAALAAAAAAQABAAAANVCLrc/i3ISacKYuStuwhAMBATKRHkUIScUBSeahhigBbzK+HGgXmHmYHXC41MqKDwcGDFMryCz4gi3YQwkKiFY+ZAoYrUF5g1HV3G7DFuFBvSx8GfAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-resizecol-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBFxaXAQCBDQyNPz+/AAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMyCLrcG0A4CZ90saohuv+XEgxYxkDhQp2lyIBwKhB0bct2TuB6zfe7F5D26xV1x9zFnwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-resizerow-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBFxaXAQCBPz+/CH5BAEAAAAALAAAAAAQABAAAAIyhI+pmxHinph0GnqH3hoIDwocd3zZ2F0lmoInWq5s/I60xw5hmF8WPnNAhJUK44hM+AsAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-series-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBGRiZAAAACH5BAEAAAAALAAAAAAQABAAAAIjhI+py+0fUGRhGrswVtr1FgiGsGlhZVWAuarr9byyB8f24hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-sort_decrease-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIIAAAT+BPwCBAQCBAQC/FxaXAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM5CBDM+uKp8KiMsmaAs82dtnGeCHnNp4TjNQ4jq8CbDNOroIe3ROyEx2A4vOgkOBzgFxQ6Xa0owJ8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-sort_incr-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIIAAAT+BAQC/AQCBPwCBFxaXAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM4CAqxLm61CGBs81FMrQxgpnhKJlaXFJHUGg0w7DrDUmvtPQo8qyuEHoHW6hEVv+DQFvuhWtCFPwEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-special_paste-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+xPz+BNTS1MzGLMRaBMzOzPz+rPyqXPz+/MzGNDQyNKSipAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARoEMgJQhBySGx7IEQwFKMWGKgRHNZRIAJSVAm6usIwCEo+BDWVJ/CKzYAplWJZItGSgSVPZBEgU9EFQyGyWoK25XJ4DTO2iob6CxVLe2ys4rw9e8HKd8ybVJ7ndgEVQz09e1YUEmQefhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-strike_out-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBGRiZAAAACH5BAEAAAAALAAAAAAQABAAAAIghI+py+0BgwOS1gXnuS/b6ClCpCUcclJMmKIGWcby5BcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-text_bottom-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIVhI+py+0Po5y0hYtzrkB7zH0fN/kFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-text_center-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIbhI+pm+EPIZsnRkqtDnhu1zHfFSpjaY4PavgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-text_left-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIbhI+pm+EPIZsgRoqr3Vnt102fFSJjUC6nlPoFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-text_middle-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIXhI+py+0PT5i01pisphjt3UmfFZYm5hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-text_multirow-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIbhI+pm+EPIZsg2kfZvblXbwTg10WlA4rjyvgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-text_right-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIahI+pm+EPIZstSrqsDhhv1ylfFE5jiYwX6hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-text_top-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIWhI9pwe2uYnq0yQtqxbz7D4biSIZ+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-upper-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAImhI+pEeoNIFyIzXStw3q/dR2hhEVcJqamuq6Z9brlNtKMeHuKXwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-vertical_text-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIihI+pFrHqQHynTRrvyxQ12YWQWJGMpC0f2E1psr4eaj5+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-applix-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFRSVFxaXFxeXNze3Ly2rJyanOTi3Pz+/Ozq7HRydFxaVISGhGxubMzOzDQuLExKTCwqLIyKjGxqbERCRCwuLJSSlOTi5BQSFPT29IyKhDQyNISChDw6PBweHMS6pPz69Pz29PTq3Ozm3MSynMTGxAwKDPTu5Ozi1LyulExOTCQiJPTm1OzezLyqlLSyrDw2NOTazOzizOzaxLyqjKSipBwaHOTStLymhLymfGRmXNzKtOTOpLyidMTCtMS+rCH5BAEAAAAALAAAAAAQABAAAAa9QIAQEBAMikfjcCkgOJ2FgCGwFAYOiCwioUAYFtUrgtFFNBzeB5OAgESyEsWEUjFYAJYJ4hLBoDMHBRobAAaGehwdHnoZCQcfEUKHCBQBAxsgISIjJIRCeSUmHAYmJSInKCmRkgYqGw4ZKxMiLC0unoUvFBQQMBQRMTIzNBVDFjUrGwO9Nh8zNzi4BhM2LyIvGhgLNzc5akM6DsEyMjsfPDw9uAALPj4/HyQ0ND31q0ICFRv6FTAb/xE2+AkCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-binary2-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFRSVFxaXFxeXFRWVNze3Ly2tJyalHR2dISCfLSyrPTy9Pz+/Ozq7GxubJyanKSmpMTCxMzKzLy6vNTS1JSSlCwuLLy6tMzGxOTi3KSipKyurHx6fOTi5IyKjGxqbERGRDQyNMzOzOzu7GxmZIyKhHRydLS2tNTW1ERCROzm5MS6pIyOjDw+PPTu5PTq3LSqnOTazOzi1GRmZJSWlCQeHPTm1OzizLyqjISGhExOTGxqZDw6PNzSxOzaxGRiZExKTCQiHEQ+NLyulOzavOzWvLymhHRybLyypNTGtOTOpOzexLyidMTCtMS+rMSynLyedAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfqgACCAAECAwQCiIiDjAIFj48GAgcBjIIICQoLDAwNDgwPA4MIBhAREgkTmw4UDBUWAxcYFAUZGggbHB0eDh8gIQkiHSMeFRoUDyQRIxkGJRYmFScTKCcHCCkgJyoNGSsWHCwKCCgIASAgLQoZLi8wISUbEyQUJAEDKQEKMS8yMBYeZmCgMcEcghog9tm4gSNEjgEPdEDYEQJEDR4aetzwgcPCjw8VfiAAwqNFECFDehApYiSEoCMQBVjQkQBJkpVKjFhgNGBGzSRLVhZRwsTloAFNmjhZ8WQIDiZQoOwcFMCCVQshrmYN4ScQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-binary-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbPz69HRydMzOzDQyNIyKhERCRPT29GxubPTy7Pzy7PTu5Ozm3LyulPTq3Ozi1OzezLyqjPz27OzaxLymhPz29OTStLyifPTm1OzavOTOpLyedMS+rMS6pMSynAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaJQIAQECgajcNkQMBkDgKEQFK4LFgLhgMiOq0WDgVEQrFdKAXfhJWRODTMQ6+64BAMGHAq+pB4hCF2eURoVwgREhMUgl5/EBUWimdWB4cVDxcYiwJiGQcVfBobmhwPEgkWFg8dmWcQEgcWFw99HpoVFR8XGiAhISKLI8EkJRgYGyK/SgvLzM0LfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-colorscm-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIcAAPz+BFxaXNze3Ly2rJyanPz+/Ozq7GxqbJxaLLxOFLQ+HLQ6NMSOnOzi5GxubMzOzDQyNMx6JOSSXOSedNx+ZMxaXLQ6ZKRalNzW3IyKjERCRNSWPPTKnNReNMRGVLxalJRGpHRanNTS3PTy9OTi3ISGfLySNOzCfPTatOy2dNxuFMw6DJxGrHROvEROnHyKrMSmTOzanNzShOSqRNyCFMxCHJxGnFxavDxqxCRmrCxijPTq3Ozm3LyulLyyZOTenNTGZMS6VISKbCyCzASGxAR6rBxmhKyqpOzi1JyuXLTShJzKdHS+XES2XCy6pDSy3Bym3AySxAR2pBxadKyinPTm1OzezLyqjGSWTHS6ZFy+ZCyyVCS2dDy61Dyq1CSOtBRqjExqZKyilOzaxLymhDyeTCSuVByyZCS6hDS2vDSatCx2lCxabIR+dBSKTByeZCSmhCymnCyanCR6hNTCrOTOpLyedCxmVCR+bCR2bCRmZExqbMy+pOTStKSelKyejMSynLyqlLymfLyifAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAjqAAEIBBCgoEGDAxMGEMCQ4YAABAIkFLiwgMUCBg4UiJgQQQIFCxg0sOjgwUYIAiNImEChgoULGApkcHBAA8oNHDhI6ODhA4gQIkaQGFACgokTKFKoWGGBRQsXLwQIHQABRgwZM2jUsHEDRw4dA3bw6AHBxw8ZQIIIGUKESBEjR3YgIZtEyRImTZw8gRJFyhQqVaxcgYAli5YtXJx08fIFTBgxVsaQQVnGzBk0TtKoWcOmzZExklECcPMGThw5czqLoYOijh3RAO7gyaNnTxsxfOr0cQ2boBg/f44AChRI0KDXCiEoX84cgp+AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-core-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAASC/PzuBFxaVNza3Ly2tJyanPyuBPQCBPz+/Ozq7GxqbFRSVHx6dKSmpHRybMzOzDQyNGRiZHRydHx2fExKRCwqLPTy9ISGhERCRCwuLERGTIyOjBQSFGReXJSSlFRSTDQ2NAwKDNze3OTi3Ly2rFxaXAQCBFxeXMzKxOzm3LyqlDw6NCQiJFROTLy2pDw+PGRiXMS2pOzi1CwqJBwaHAwODAQGDJSOhOzWvLymhKSajNTGrJyWhOTOpLSyrKymlKSelMS+rLyidMTCtMS6tMS6pMSynLyedAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfVgAAAAQAChoeHgoqCAgOOjgQCBQKCBoMABwMImwgJCggFC4sGDAQNDZoIDg+gEAcABhESEwoUFQsWFw4KGBmCGhsFGwoLEBwYCRYEFxCEHRceFwofIBwhDSIjJBCCCxISDiUaGRwmJygpKr4AGAIl4issISYtLuncgi8YLxAs5SYwYshQgQ8AixksaNSwYYLDDRc4chS0USMEQxMhHOjYEbEggBUWTQhwwANiD4mLBPj4AYTHjyA9cPQQsq7bkCFEihhRkSPHkSMeBUDIAGFo0aMZ/AQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-deb-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIUAAASC/FxaXNza3Nze3Ly2rJyanPz+/Ozu7GxqbPz6/JwCBMw+PMQCBLQCBNx6fPT29GxubMzOzIyKhDQyNLwqLLRWVLxaXNyurERCRMzKxOzq5Ozq7MQ2NMRmZLwCDOTi3Ly2tMReXOS2tMTCvPTu5Ozm3LyulMSSlNTOxPTq3Ozi1OSytPTm1OzezLyqjNyqpLxaVNzSxOzaxPTy9Ozm1OzexOzavLymhOzWvOTOpOTStLyidMyShMSulLyifLyedCH5BAEAAAAALAAAAAAQABAAAAa0QIAQECgajcNkQDAYCASEQCGQFC4NWMMBkZhWFQtGw/EwQCIGyWSoaFAqFgblIkEgMGthQ5HRbAQcFAcaBGp6DQEJCx0XFx4ZGx8geQ1ECyECByIMIyQlJnkMRBwnBwYODSgpKqB6RCIcK6gEKiwtLpQKiS8WMAQxKi0yuEOICTM0LSo0NTY2N3kAbhoHBzQ0zjg50EkKHC80LCo2ODo5O9FEBCE8Pe49Pj8/6QET9vf4E35BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-document2-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJSWjPz+/Ozq7GxqbJyanPT29HRydMzOzDQyNIyKjERCROTi3Pz69PTy7Pzy7PTu5Ozm3LyqlJyWlJSSjJSOhOzi1LyulPz27PTq3PTm1OzezLyqjIyKhJSKfOzaxPz29OzizLyidIyGdIyCdOTOpLymhOzavOTStMTCtMS+rMS6pMSynMSulLyedAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaQQIAQECgajcNkQMBkDgKEQFK4LFgLhkMBIVUKroWEYlEgMLxbBKLQUBwc52HgAQ4LBo049atWQyIPA3pEdFcQEhMUFYNVagQWFxgZGoxfYRsTHB0eH5UJCJAYICEinUoPIxIcHCQkIiIllQYEGCEhJicoKYwPmiQeKisrKLFKLCwtLi8wHyUlMYwM0tPUDH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-document-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbPz69HRydMzOzDQyNIyKhERCRFQ6LJSKfNTOxJSOhPT29PTy7PTu5Ozm3LyulOzi1PTq3OzezLyqjOzavPz29Pzy7OzWvLymhOTOpOzaxOTStLyedMS+rMTCtMS6pMSynAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaLQIAQECgajcNkQMBkDgKEQFK4LFgLhgMiOq0WCAREQrFdKAVXKyNxaJgBjgck4khLBAPGm4r+ghETeHtEfVaAFBUWg15gjReKZ4YTFBgYGRpvcQoPDggRnwwMG5hnHB2UFxcbHh+LAh0YDA+zDyCtZ5UXIRsiIiAjiyQlJCYnGhofI8BKC83Ozwt+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-dvi-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAASC/FxaXNze3Ly2pJyanKyijPz+/Ozq7GxubIx+RIRyLHRyVGxqbMzOzDQyNHxyTHRqNGxiJHRiLJySVIyKhERCRGQmLMy6ZNS+TMSuPLSePIRaNGReLHRuTPT29FxOFKymdIRmLHRiHGxKLDQuDPTy7Ly2tHQqLLwyPIxqVGw6LIx2LGRSHDwyDDwyFNTOxOzm3LyqlIQuNLy+zKSGdKSSfJRSRKSSNExKJLSmnOzi1LyulIyCZIxiPJyGLExGFOTSvOzezLyqjLyyXAQCBNzGRLyeREw+DFRONNzSvOzaxGxqVKSelJSCNEQ6DFRKFKSajMS2pNzOtOTStLyidEQ+FLSunOTOpIyKdMSulLymhLyedAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfVgACCAAGFhoaDiQECjIwDAQQBiYIBBQUGmAcIBpGTCQqgC5gMDZwOgw8KEBESEwkGFAgMFacAFhcYGRobEBwdHgIDFKcWHwYgBiEhIiMkAyUCJg4nKCgp1SorLC0uBC8wMQ4yMzQnNTM2Nx84LTkNOjunNjY88z0+Hz8kOUBBQqdDiHQoYiREhBZHkORIouSfIAghjCiI8IHEEiYDgAApUAtAEwgfnDzBASWKFCBTqHQE8ONIFRwErFxRcuWKSkU8sBTIkSWLFi1btqwM4KCo0aMO/AQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-font_bitmap-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAASC/FRWVFxaXNze3Ly2tJyanPz+/Ozq7GxubGxqbNTS1DQyNPS+vPw2NNQeHFw6PPTy9IyKjERCRPzi5PyGhHRWVOTi5PT29OTi3IyKhPza3LySlLQGBGQCBNza3Pz69PTy7MS6pKRubPy6vGQ2NKRSVIxmZPTq3LyqjLQqLHRydPxydHwCBNTSzPTu5Ozi1MSynKQCBOQ+PKwCBIReXJwCBExOTMzGtOzezOzWvEQeHLSytOR+fIxaTOzexLymhEwCBDweHNTOzPTm1LRORIQ6PJyOfOTOpOTe1OTSvLyedMTCtMS+rLyulLyifAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAe6gACCAAEChYeGg4oCA42NBAEFAYqCAQMGmAYHCAaSlJaZmAkKnQuKAQwNDg8QBhEJCRKmgwITFA4VFgYXGAQZs5UaGxwdHgYfIAMhwAAiIyQlHCYgECcnKMwpKSoKKywtLicvMMwcHDEyMjM0L+3YgzUsNgH0HCw3ODnvgjU6OwMvBvCQ0cNHjh+zOgAJIqTaECJFOhg5gvAUEmsvksBAAeOIEmYBbixhEgJGExROlHw8taCly5cL/AQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-font_truetype-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFRSTFxaXFxeXNze3Ly6vJyanPz+/Ozq7GxubHx6fCwuLDQyNIyKjKSmpPTy9PT29HRydMzOzCQmJAQCBKyqrFRSVLy+vGRiZNTS1GxqbERCRMzKzJyenOTm5JSWlLy2rIyKhMzK9KSm1Kyq3OTi3OTi5JyezBQSJExOTLy6/CwuXLy+5LyulMTC3LSytHx+7Ly2pLSyxLyqlNza3Gxq1OTWxMS6pLyqjPzy7OzexPTq3LyynOzWvLymhPTy7DQ2bOTOpGRmhERCfNzGpLyedMTCtMy+rAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfIgACCAAECA4WHhoOLAgSOjgUBBgGLggEEB5kHCAkHBgKCCgsKBgwNDg8HEBESngwAExQVBhYXGBmZDREaGwuDHB0CHh+4qgQgIa+CBMEiIyQiJNAlIMoAJgYDJygpKisWLAMtvoIe2S4pLzArMTIBM9YHBRUeNAQ1KwU2NzjWFAwDDEDIgS+GDh39Fl3ykGMHPh46evggJ2gAgR87HAKZYSOID2uECGQUMkRIAiJBioAUYMTIkRs8cODwUUSlQgY4GSzQuVOnn0AAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-font_type1-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAASC/FxaXNze3Ly2rJyanExKRPz+/Ozq7GRmZPz6/HRydMzOzDQyNJRmZPSmpIQuLGwWFKxeXPTy7IyKhNxSVGxCRLy6vPQ+PPT29GQ2LPTCxOROTPz69KQ2NPSGhPTq3Ozm5LyqlGwODPxiZOzi1LyulLwKDORydBQSDOx+fNw+PNS2tOzi3PTm1OzezLyqjNQaHPRubJx+fMS6rOzizOzaxMwuLKQWFHRaXOQuLJSShNzOvOzavOzWvLymfCwiHHx6dOzexOTOpOTStLyedMTCtMS+rMS6pMSulLymhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfFgACCAAGFhoaDiQECjIwDAQQBiYIFAgaXBgcIBgQFk4uYBgkKC5wMiQ0ODxAOERITCggFp4MUFRYCFxUCGAIDE7QAFBkWCRobChIcEr60HR0IHAYeHQQYEh8gIbQbIgjGIw8WEtgkJacmJyjfKSoFKywfLS4vpzAxEAgnHSYyJjMkaNSoB0CEChs3cMjIYULHDho8evig9aPiAQFAHAap0UPIREXYPpAIEnGIECLBABQoYmTGESRIfCQhglIRg5s4czLwEwgAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-gf-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIMAAPz+BFxaXDQyNAQCBMTCxPz+/ISChKSipERCBMTC/Pz+xPzerMQCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARwEEgQahVijMmD/oRAbBw1FCgaFFrppeo5UtILWxlAGNWZHocA4bAxGAnDg9GA8LQCxGTQoHwVNYYEMEHtKYrEA0tctVIOo0Fl2Ct8AQLlKMnzLFg1KIHBCGoUbiR5VSd3C28TThpubgqIEhkfkh9+EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-html-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFRaVNze3Ly2tJyanPz+/Ozq7GxqbDxinBw+ZERmdIySjMzOzPT29DQyNDRurIR2RPTSdJyulFSGxLzCxIyKjHRydERCRLzKvPzivPTmxNTChLSybGyCfCRSpBQqRLy6vPTy7OTi3IyKhCRShOTixPzy5OzerOTShLyaVEx6nCxerGRyhOzi1LSyrEyGvOzaxPTShNy6bEx6rDxyzDRitCRCfPTq3LyulBw2VISq3GySrPTWlHyanIyitEyO1ER6zBxCfLSqnCQ6XHSq3GyWvFyGvDxuvLSqpPTm1OzezLyqjCxajFyO1GSi3NS2bKyaTCQuPGRufOzexLSmlER2vKyWNFxaNHx6dLyunOzWvLymfERSVExKNDRCNKyilMy+pOTOpLyifFxaVLyidMSynMSulLyedAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfYgACCAAGFhoaDiQECjIwDAQQBiYKLBZYFBgcFkZMICQoLlwcMDQQOgg8QERITnhQFFRYHF6cPGBkaGxwdHh8gISIDI6ckJSYnKCkqKwksAiEtLg4kLzAhMTIzNDU2HxQ3NzgOOTo7PD0+P0A1QR8uNy1CDkMvREUyRjNHHjkfSElKlpxi0sTJjydQAiSIIkXIFBhUTn14UIWGFQhXHHzAkgWGli2nAHxIwIRLFy8bv4DREkZMSEEfYo4hQAVMGJZkXhIaIERImTJmlogRc0ZnAAdIkyp14CcQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-image-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPz+BFxaXNze3Nza3Nza1LS2tJyanPz+/PTu5GRqZOTi3HRydMzOzDQyNJQOFDxKfKTW5OTy/OT23MTaxISKhGxmZERCRCwuLJQSFPzGpLweHJTO3ESu3DRilNz61FymXCxKRMTCxPTy7Ly2rIyKhDwCBORiRKQWFEy23CyKvJTWhDSOPCRONDQaHNROPNQ2JLRubHTC5DR6rHR+jFSqRCRyLGxqbOzm3LyulCwqLMySjMQ2JMyqrERijJSenFSGXGRmXMS6tPTq3Ozi1MS+vMxCNKyqrHR2dPTm1OzezOSKfNTe5KSmpIyGjLy2pOzWvLyqjIRqZIyKjHR2fExKTHx2bLyynOzexLymhERGRGRmZKSWhMS6pOTOpLyedMTCtMS6rMSulLymfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfcgACCAAGFhoaDiQECAwICBAUBBgGJggEEB5kHCAkHk5UBCpqZCwyeDYIOAA8QERITmRQLFRYXABgZGhscHR4fICEiAiMkDSUmJicoKQ8qKywLAwgKIxctLi8wMTIzNDUJNiEINzgNOTo7PBA9Pj/QQEFCQzg5F0RFEQQ+RhRHswVIkpS7oEMJgiUhCjBpcqSCkyFPoNjKEYVJCCNSpgSgUsXKlSdYUAG4kCOLlgpAgFTZwuVJFyy2Bi0gEsSJzZYuvYi09OULGC44wmAR48VLDkU5zClt0OACUz+BAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-info-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxaXNze3Ly2rJyanDROXHSSpISetPz+/Nzm7GxqbGyGnMTS3MzW3JyuvERujLzG1HRydMzOzPT29DQyNMze5Iy2zLTS3Cx+pCRijLS+zIyKhGxubERCRFR6lGSivFyavISuxAxajBRejAxGdDxihJyyvCR6pBRqnAxelAxOfPTu5OTi3IyqvFSOtJy+1IyyzFxyhOzm3LyqlGySrAxejAQ6ZFxqfMzKxPTq3Ozi1LyulCxulAQuVISKjMzGvPTm1OzezLyqjBwmLBROdExOTKSinNTOvOzexBQeLAw2XAQmTCwyPLy2pOzaxOTWxLyedCQmJAQKFAQWJKSalOzavOzWvOTOpLymhKyqpMS+rOTStMSulLymfLyidAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfVgACCAAGFhoaDiQECjIwDAQQBiYIFBgcImAkKCJGJCwwNDg8QmBESEwQUgg4VFhcYGBkaCBsRHB2qHgwfIAghIiMkAhMCAxsUJSYhJygiKc4qCysrLAPILS4oLwgwKcExEisyMxQFNBg1Nb7ONjc4OTo7yAU8IiIIDiIqPT4/QEFCVA0hooJBAg0eehQxciQIEnKCktiYqGQJEwJNnCB5AkWVoChSpkwpQmXAkypWrmDxKAhSlixaTlrZcqWjIi0/BmjhsgNLFy82BwWgQDQK0aNE/QQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-kmultiple-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBFxaXPz+/AQCBISChPz+xMTCxPzerKSipAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARWEIRJgb04iLEJwaAmjMTwgVbAjeaESmNcGMGrxmOhDqE8HAOVJ7MSFH4qhOmiOQIPNIGB4JJwnIaDaFaTUL4iYxc0MJidQVvROc4Yfz+a+g3V2sAVfwQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-log-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxaXNze3Ly2rJyanPz+/OTm5GxqbMTCxARiTARSPARCNAQ6LAQyJGx+fGxubMzOzDQyNCxGPARyVARqTARaRLSyBCRGHFRuZIyKhERCRDRuXAx+ZPz+BIyOBFRybOTi3AyGbAx2XExaDBROLOzm3PTy7DRORDyeXBx2VEymVHyuJGRyDPTu5LyqlFyGTBxaNAxqVDR6PARKNPTq3Ozi1LyulCRuTCxeNBSCZDxmJEx6bOzWvPTm1OzezLyqjCSSdCSmhBySdBR+ZARqVEx+bNzSxOzizESCdAQCBNzOvOzexLymhOTStOTOpMS6pLyedMS+rAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfIgACCAAGFhoaDiQECjIwDAQQBiYKLBZYFBgcFkYIICQkKCgsLDA0ODxCbEQASExQJFRYXpBgZDwcaqxscrgkdHqMfBiADGasIIRwiHSMdJB0YJSYCA6snKCkqFgorHSwdIC0lLqsvvx0wMTIWMxgCNDU2xzcdOBw5EzoKOzw9Pj/WgAQRIiTEkAlEihg5wgMgACRBkpwQIpGDRCVLeDCJACGJx48gAzRxspHQoZNPRkJZNSjAkygDntiwwYQJlJWKIujcyTOCn0AAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-make-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxWVFxaVOTi3Nza3LS2tJyalGRmZMTCxPTy9Pz69Pz+/Ozq7GxubJyWnFRWVHx6fHRydMzKzDQyNHx2bHx+dIyKjERCRGRiZKyilLSifMTCtLy+tISGhOS2bPzerPzuvOzetJSSjFxaXOzu7PTy7MS6pGxqbKSWdPS+dMSidOTerPzqtISCfKyurOzq5LSqnMzKxPS6ZEw6HJSKbOTStHR2dMzGvPTq3OzizLyulFRSTOyyVNymXOy+dKyqpPTm1OzezLyqjJyCTOSqTOSmRLSupNzSxOzaxOzexOzWvOTOpKyinMS6rNTGrLyedMSynAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfagACCAAEChoeGg4oCAwQEjQUCBgGKggcICQoKCwwNCg4CiwQPCBAFmRESCwYTghQCEgYHDBUSChYNDRetGAQZGhscHAIFDAoDHB2tAQYeHyAhIiMIJAolBCYTAicoKSorLBItGC4DLy8wExExKjIzNB81CBI2Nzg5Oq07KDw9Ph4mdgj4IQFIECGtHrgYQqRIjQoPjBzJkQMJQgANkrngYGFAhB8UkyjR0EpQAAkUKkQQkCGHEiVLLg6y8IDJhiZOXsJ8UtLkhpsmoAgRouIJT0UPJihdynSCn0AAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-man-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxaXFRWVNze3OTi3Ly2tJyanNza1Pz+/Ozq7GxubMzOzDQyNOzq5KSmpNTS1IyKjGxqbERCRPTy7PT29LSytOTi5MTCvMTCxLy6vMS6rISChLy+vPz69HR2dLSyrLy2rNTW1IyOjOzu7OTm5HRybHx2ZNTOxLyulLS2tIyKhHRuVMS+tHx6fGRmZLyqjISGhJyenMTCtGxqZGxmVMS2pFxeZGxiTMSynLymhHx6dGRiZFxeXFRSVLyifGxmTKSSfLyidMS+rLyedAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfDgACCAAEChYeGg4oBAwMEjQUCBgGKggEHCJkICQoIBgKKkgSamQoLngyWDQ4PpAgQChESqQACExQVFgkXGA8ZBBobtAENDQsGHB0dEx4fBCC0AhYhGCIjFA0kJSYnKMMPHCkqFg0DIQorLN6WCx8OLQsHIQsuKxovtIQwMR4ZHDIYZtCogU+RjQAeUmDAkELBDRw58hHSsWMDjx4XV6DwIZGYCRc/aNz4AeRFkI4sZAipgePFCx9BhkgUwKCmzZsM/AQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-metafont-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxaXNze3Ly2rJSWlPz+/Ozq7GxqbKSajPT29GxubNTS1DQyNIyKjERCROzi5Ly+vKyqrKSipKSmpKyurISChKyinHRybISGhGRiXJyanIyOjFxeXJyenJSSjMzGxMzOzMTGxLS2tISGjExOTLyulMTCxISWpGx6jExifFxufJyepJymrFRSVLSupLyqjERKROza1OTKzNS6vGRmZLy6vPz29Hx6dMTCvHRydJSKfOTStLymhNTCxLSOjKx6fMS6pLyifLSytHx+fOzWvOTOpLyedMSulLyidAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfDgACCAAGFhoaDiQECjIwDAQQBiYKLBZYFBgcFCJKKApcFCQoLBQQMnqAFDQoHDqeDAQ8QERITBhQVFhWnF4IVsxgKGRobHB0DrxUeHyAhIiMeGCQVFCWvACYCJygWKSoTFxcD1oMJGissJiwjFC0ZLi+nMBoLMTIPFDMzDS00FvEAYlyQUMNGiBs4OuQgoWMHj2sDe/j44aNCBh1AdgS5BoCGBhNChlxAQGRHESMcYXCI5sHCkRdIkKBUxKCmzZsM/AQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-midi-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Nza3Ly2tJyanPz69Pz+/ISChOzm3GxqbKSipAQCBHRydMzOzDQyNIyKhERCRPT29OTi3PTu5PTy7LyqjOzi1OzezOzWvLyidOzaxOTOpMS6pMSynLymhLyedAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaOQIAQECgajcOjUTAYEAKFgDBgOFQNiMHhkFAYosQFg2HNbg0Nx/dB3W7NW0hDEWEjxm+BWzIhINhVbnBUFH12eAeDFRQUFoBuiVoGRRQXjgGQiQQLCwELBZaHZJGMARgLGZeZCARRUKgaom8DCAEZGwscqm5YrZyfHLFKRQQdHhYWHxogD0NED9DR0g9+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-mime_empty-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbPz69HRydMzOzDQyNIyKhERCRPT29PTy7Pzy7PTu5Ozm3LyulPTq3Ozi1PTm1OzezLyqjOzexOzavPz29OzWvLymhOzizOTOpOTStLyedMS+rMTCtMSynLymfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaBQIAQECgajcNkQMBkDgKEQFK4LFgLhgMiOq1eEQnFdqEUXK2MxKFBHnqvDsGA0aaaz4iHvE68WxEQERITfG+ADxQVhGV/DxEWFBcYhQIIgBEUFBkak2UbgYkZHBwdlIgUHh4aHB+lZZkVF6sgHyGFIiMiAyQYGCUhtkoLw8TFC35BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-misc_doc-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFRSVFxaXFxeXFRWVOTi3NzW1Nze3Ly2rJyanPz+/Ozq7GxqbMzOzDQyNHRydExKRERGRExKTERCRCQiJIyKjCwuLGxubDw+PDw6PDQ2NBweHAQCBPT29IyKhNz+3HzmfDTCNASaBBxaHCQmJPz69PTu5JTqlGTOZCSmJAR+BBxSHOzm3LyqlFTKVASCBARmBBxGHNTSzPTq3Ozi1MSynAyeDAROBCQ+JBQSFNTOxPTm1OzezLyqjCwuNAQyBCQ2JMzGtOzexAwODOzaxOzWvLymhMzCrOTOpNTKvMS+rLyifMTCtLyulLyedAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfcgACCAAECAwQCiIiDjAMFBgeRCAMJAYyCAQUKmwoLDAoJA5eZnJsMDaAOAA8BEBESExETFAsVDwwTFgAXAhgOGBkaGhscHQUIHqoDAR8gISIjJBQGJSbHugMSJygpKisU0x0mLC2qAhEuKS8wMRsbMiYzNDW6ARM26zc4ORQ6Mzs8evgAACGDChg3fgDhF6SAECE9VEXQYKGiDwtDKAQRQqSIEV25KGzIQZIDhSNFiiAxomoQAwM6kgRRgiQlkiW6BgVIwkQJghpNeixx4qQlJiAWHCh1kFSpBT+BAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-netscape_doc-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxaXNTW1Nze3Ly2rJyanPz+/Ozq7GxubPz6/OTi1Ozq3GxiTMzOzCwuLMSijGROLLSqjGRiZOze1LSOdIyKjEw+NHxGJNSqjMTGxPTy7Ozm1NzWxLSSfFw+LMzKvHRuVKyeZHxybOTazOTi3Ly2tDQyNOzm3MS6jFxaRPTu5LyulOzi1KSehMTCxKSOdHxuRMzCpJSGXOTStLyqlHRqRIR2TFRKLLyedLyqdGxWLIR6XOzezJyCZJySbEQqHKyKdFRONJSKfOzaxNTCpKSWbJSSjExKNHxuNOzWvLymhIyKhOTOpHRydHx6bIR+dOTOrLyidAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfVgACCAAGFhoaDiQECA40CBAEFAYmCAQMGmAYHCAmSlAEKCwyZCA2dDoIPEIsREgkTFBUICBaoABcYGRobHAodHhkDBBW2AB8fIBwMESEiIxokJSaDJxAUKAwQESkaKicrqBssLS4vBzAfMTIRMwo00zU2LTc4OToQOzU3DDwr04Ixeljw8QNIiCBCYgyJUIxIESMfjuxAwoDDkCRK/j244CNHjhBIPDxYMoPJA1sXIDRxkuOIkycXHsyAEqUYoRk7GDAh8uJFDhw4/lUy4aCo0aJE/QQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-news-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIMAAASC/AQCBERCBPz+/FxaXIQCBMQCBMTCxISChKSipDQyNAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARXEEgZwrxYikFsvtUwBN0nEWIhkh4YiIOhjiX1hqIsHlb4jr8VwoJa/XCCBG4ZZA2bRxEi0QkgeLAloUZKYGEDhLgG6H5JBEFrYg4ItmsMCaGomFyEiz8CACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-pdf-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAASC/FxaXNze3Nza3LyypJSSlPz+/Pz69Pzq5Ozq7GxqbJyanNyGhNx6dGxubMzOzDQyNERCRPz6/My+vLxaVJxeXKSmpNTGxIyKjNTS1OTi5OzCxLRSVMTCxKyWjOTi3Ly2tIyKhLxmZLSWlOTe3MzKzOza3MyytNyOjAQCBKyqrOzm3LyulPSajMRWXOSGhOyGhKxiXOzi1OxyXKRORIxSTNTKzMy6vLyenLRubLwqLMxiZNSurJRybOzezLyqjJxCRGxSTLy6vGQiJMw+LJR+dMzCrOzaxIyOjKyurHxydNxWPNTCrOTStLymhIR2dKyKhIxuZIR+dJyShOTOpHRmZKSKhJyCdKyilMSulNTCpLyedMS+rMS6pLyidAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfQgACCAAGFhoaDiQECAwKMBAEFAYmCAQMGBwgHCQoGC5OKAgYMDZcODwYFEIkREhMUFRYXGA4OEauCGRkaGxwZHR4ZHyAhuAAdCQgiFR8aHSMkHwS4JRomIicoJykqHh0rLKstLhQcFC8wMR0FHgQy4TM0HDU2Nzg5Ojs8PQQ+P6tAggjRVaLEjiFEihg58k+QBSQdQCTpoITIkhBMmjgxVsBCxydQokiZYoTKxkRVrFy5EgJLFi1NqGwxRohLBy5dsmT54cXLTEUQggodCsFPIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-pk-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIMAAASC/IQChFxaXDQyNAQCBPzC/MTCxMQCxPz+/ISChKSipERCBMTC/Pz+xPzerMQCBCH5BAEAAAAALAAAAAAQABAAAAR6EIAQhLVjECJlKISwjcZgcFNxhATiugKyTaP4wu0JiOyNXBqAIWFpvRQKgUHBSTgNS4UzseBxBMxoMiG1NTcJBpLBLTaaTIVM3fXuFKeQMmk7AwbSU5QocsgkFnAPD0kbFBQdO1hELQ4fK4lWLQ0IASsoEhojIwEjfhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-postscript-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxWVFRWVFxaXOTi3Nze3LS2tKSajPT29Pz+/Ozq7GxqbJyanISChPz6/HRydNTS1CwqLMTCxISGhOzu7ERCRDQyNERGRLy2rIyKhExOTAQCBKyqrOTm5KSmpHR2dNza3AQGBNzSxOzm3LyulBweHBQSFKSilOzaxAwKDOzezDw6PJSSlDw+PKSelNzOvLymhAwODNzGrOTStLyqjExKRHRqZLymfMTCvMS+tMS6rLyynMS6pOTOpLyifMTCtMS+rMS2pMSynLyidLyedAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfPgACCAAECA4aIA4OLAgSOBQQGAgcBi4KNCAmaCgsJDAKWjQkNCA4JDxCeEYwSDQ4TFKMPCxUWAA0BEQ0GDggQDxcIBBgZthobExwICB0eFRsSHcOrER8QCwYIIA8bIRwiIyS2JSYVHgsQzhsbJygEJKsl6ykeH9zrJyIq4gAp6xsrWLT45+IFChi2YqwLwcLEvxgHZMygsarBOgsCBGioUcNGxBk3bA0SgCOHjh0oeczo4WPVoAA/fgAJIoQGjSFEiIgUNCCCBZ8Wggq14CcQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-readme-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxaXNze3Ly2rJyanDROXHSSpISetPz+/Nzm7GxqbGyGnMTS3MzW3JyuvERujLzG1HRydMzOzPT29DQyNMze5Iy2zLTS3Cx+pCRijLS+zIyKhGxubERCRFR6lGSivFyavISuxAxajBRejAxGdDxihJyyvCR6pBRqnAxelAxOfPTu5OTi3IyqvFSOtJy+1IyyzFxyhOzm3LyqlGySrAxejAQ6ZFxqfMzKxPTq3Ozi1LyulCxulAQuVISKjMzGvPTm1OzezLyqjBwmLBROdExOTKSinNTOvOzexBQeLAw2XAQmTCwyPLy2pOzaxOTWxLyedCQmJAQKFAQWJKSalOzavOzWvOTOpLymhKyqpMS+rOTStMSulLymfLyidAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfVgACCAAGFhoaDiQECjIwDAQQBiYIFBgcImAkKCJGJCwwNDg8QmBESEwQUgg4VFhcYGBkaCBsRHB2qHgwfIAghIiMkAhMCAxsUJSYhJygiKc4qCysrLAPILS4oLwgwKcExEisyMxQFNBg1Nb7ONjc4OTo7yAU8IiIIDiIqPT4/QEFCVA0hooJBAg0eehQxciQIEnKCktiYqGQJEwJNnCB5AkWVoChSpkwpQmXAkypWrmDxKAhSlixaTlrZcqWjIi0/BmjhsgNLFy82BwWgQDQK0aNE/QQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-recycled-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxaXNze3Ly2rJyanGRmZKyqrMTGxPz+/Ozq7KSinOTi3LzatLTGpJSSlMzKzGxubMzWzPT29DQyNMS+rOTy5KzWlEymLDSSDKTClIyKjGxqbERCRGx+bNzu1Hy+ZESeHDSWDCyKDCyGFMTKxHx6fOTi5ISCfFRuVKzGnJzKjDSOFJy2lNTSzJSSjPTy7Ozm3FR6RJzChGSqRFSePHyqdMzOzLSytNTOvLyulExyREyWPESSJMS+vKyurMzKxPTq3Ozi1BxeDDSCHNTS1Ly+vHx+dIyOfPTm1OzezLyqjBw6FBxmDFSKRMzGxERONOzavBQ6DBROBHSOdCxeLDRCJKSelOzexOzWvLymfCw6LBxGHFRiTOTOpERGRKyqpMy+rLyedMTCtLy2pMSynMSulAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfWgACCAAGFhoaDiQECjIwDAQQBiYIFBgcImAkFCJGJCgsMDQ4PmBAREgQTghQVFhcYGZYIGhAbHKodHh8gISIjJCUCEiYDJxMoKSogGCsjLC0GLgkvMAMTMTIzIjQ1LDYHNxo4CTA5Ezo7PDstEQ8HPT4nP0BB5jpCQxFE7kU3RkcHkCRRomoJkyYHnBQZ0OEJARxJoBAUFEWKjilUolSxMiDJFSxZVAnSEmVLFC4EBnzE0iVkIi8EvnwBs5JlGJGCAogRQ2EMmTJZsoS5qWiC0aNIJ/gJBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-resource-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFRSVFxaXFxeXFRWVOTi3NzW1Nze3Ly2rJyanPz+/Ozq7GxqbMzOzDQyNHRydExKRERGRExKTERCRCQiJIyKjCwuLGxubDw+PDw6PDQ2NBweHAQCBPT29IyKhNz+3HzmfDTCNASaBBxaHCQmJPz69PTu5JTqlGTOZCSmJAR+BBxSHOzm3LyqlFTKVASCBARmBBxGHNTSzPTq3Ozi1MSynAyeDAROBCQ+JBQSFNTOxPTm1OzezLyqjCwuNAQyBCQ2JMzGtOzexAwODOzaxOzWvLymhMzCrOTOpNTKvMS+rLyifMTCtLyulLyedAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfcgACCAAECAwQCiIiDjAMFBgeRCAMJAYyCAQUKmwoLDAoJA5eZnJsMDaAOAA8BEBESExETFAsVDwwTFgAXAhgOGBkaGhscHQUIHqoDAR8gISIjJBQGJSbHugMSJygpKisU0x0mLC2qAhEuKS8wMRsbMiYzNDW6ARM26zc4ORQ6Mzs8evgAACGDChg3fgDhF6SAECE9VEXQYKGiDwtDKAQRQqSIEV25KGzIQZIDhSNFiiAxomoQAwM6kgRRgiQlkiW6BgVIwkQJghpNeixx4qQlJiAWHCh1kFSpBT+BAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-rpm-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIUAAASC/FRaVNze3Ly2tJyanFRSVOTi3PT29Pz+/Ozq7GxqbFxaXHRydNzazDQyNIyKjERCRGRmZExOTLyipOSytLy6vIyCfBweHMzOzNS+vMRqZMRSTNzGxAQCBLxCPMzGvLyulCQmJPz69IxKRIwWFLSGfLyynAwODERGRMTGxGRiXLyqjHR6dIyOjBQWFLSqnNTCpNTKtLyidPTm1OzezOzavOzWvOTOpMTCtMy+rMSynLymfLyedAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAazQIAQECgajcNkQMBkDgKEQFJYMBwQ2ITiEJ0uDFjsgdHgOpIFQRj7UCggZyEksIgoJBPKwVCxnBUXEgwYBgkGGRobHAYDDgUdFx1fawceHh8gDiEdnEthIgcjJCUmDh0nKJwdCCmcKh0WJiumQh0sFR0tFyYuLycwK5u1nBYsFwMuJicTs0MdEhUpDRkxMRkwMDJxQl8zBjM0NTY3N9poKTg5JjorKzsyPNtEDvT19CH0fkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-shellscript2-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxaXNze3LyypJyanPz+/Ozq7GxqbPT29HRydMzOzPz69DQyNHRaJKyONJR2LJyCJKyCHKSCHMSqZNTOvIyKjGxubERCRGxSFIxyRKR+HMyeHOTCLMSOHLyWFMzGtIyKhHx2bKSGZNyiFHxeDOTi3Ly2rMyudOTCpOTKxLyqjJR2VJxuDLSGHLSunPTu5Ozm3LyulJx6NNSyXOTCjOzWvPzi3MyqhGxSLFQ2DLSKLNSqTPTWtPzq7NS2nIxyVIx6ZOzezFxCFOy2POSyROTGlPTazPTWxLSiZLSSVMy+rOzaxKyCJMyeNOSyTNy+dLymXLyePNyqPKSWfOTStLymfKR6HMyaPMyaNJR6TMy6pFxKLHxWFKR2FIxiDOTOpLyedMTCtIyCbMSulAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfQgACCAAGFhoaDiQECjIwDAQQBiYKLBZYFBgcFkZOVlwgJCgsEDIINDg8QERITFAUVFgcXpYIYGRobHB0eHwgCAyC0giEiIg8bIyQCCCUmtCInKCkpKissLS4vMDGlMjM0NQsINjc4OQ0U26U6OzQ8CAg9Pj8uQBRBKgxCQ0QzRUY2jiDRkURJkCX5ADBp4uQJjRNQokhpMSUIlSqlcFjpQOQKESlYWmTRQuUirS1cumy04qWBlhpUvoARRihMGDFaBoxRUQXMTEUMggodysBPIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-shellscript-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFRWVFxaXNza3OTi3Nze3Ly2tJyanPz+/Ozq7GxubNzSxMzOzMTGxHRybDQyNLy+vHRydHx6fKSipISChIyKjGxqbERCRCwuLLy6vGRiZExKTCQiJAwKDLSytLy2rJSSlHx+fDw6PKyqrBQWFPTu5Ozm3LyulLS2tCQmJAQCBPTq3Ozi1MSynCwqLAQGBOTazOzizOzezLyqjBweHNzSvOzaxKyurHRuZNzOtLymhDw+PIyCdOzWvOTOpLyidNzKtOTStLyifMTCtMS+rLyedAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfZgACCAAEChYeGg4oCAwQFjgYBBwGKggEECJkICQoIkwADCwwNDY2mDA4Lng8QDhESsLARExQVDhYXGBkWExIaGw8cHR4SCQQfFQ8eFgUgIQEiwiMSBMYfGB4atwEXDyQd0wQlJicPKAHoFyIpJCoeDgMrLC0YKBsX6i4kL+4OMDEyZijr5oLGNxUqUCioEcPGDAwjPNyI6MEDChQjcOSwsUDHgw07RIgI4KCkAgs8cvTw8eOBogAxQtXIASTISiEuBwUYMoRIixYnZggpUgTDywdIkWJIitRPIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-sound-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxaXFRWVExSVNze3Ozi1Ly2rJSWlPz+/Gx6dNTS1Ozq7GxubGxqbDRmbDQyNFRiXBy6xFRmZLy6vIyKjERCRAQ+RBy2xByqtHRydIyOjPT29PTy9OTi3ISGhAQ2PATC1ByGlPz6/MS2pAS2xHS2vMTCxJyenLS2tPTq3Ozm3LSmnAQaHARibARudAR2hEySnOTm5MzGvLyulARKTARWXDyCjOzaxAQiJEx+hNza3MzCtOzexOzavLymhBQuNCxqdLy+vKSelOzWvLymfDxOVISipAQCBNzOtOTOpFRybKSejMS6pOTStLyedMS+rAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfLgACCAAEChYeGg4oDBAUEjwYBBwGKggEICQkKCAsMCJOVAw0OA4wIDZsHD4oQERINDRMIFA0MFauCFhcYARkJGhscHRMeuB8RICEQHgcaBCIcBSOrHyTWJSYnKB4KHCkqK6ssLS4vMA0LMRoyKe0zuDQ1LTYoHBwU7Ck374M4NTkmdHDIsKMAjx4+cAn6ASSIAhRCdvDgMYSIQkJFjBzJsALJjSFJLCoSUKCIkiVMegxpksTJxQATnjwZMWMGER9OXI58wLOnzwd+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-source_c-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbIyKjMTCtPT29GxubMzOzPz69DQyNHRydERCROTi3IyKhIyOjPzy7PTu5Ozm3LyqjPz29PTq3Ozi1LyqlPTm1OzizOzWvLymhGxudGRmdFxedFRWdERKdDQ+dHR2dFxidAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaHQIAQECgajcNkQMBkDgKEQFK4LFgLhkMhOl0iElbFgtEgOJQC8BXxOEDOw0DkGhYMJHCq4FuYJBQUEQN5RGlWYBQVFheEVWEYFRkaG40RXw2JGX6MaIiRHGCccQKAkRodHh4fjQ+tICEiIyQkJY0mJg8FJwWzJbVKD7gnI7K+v3EOycrLDn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-source_cpp-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbIyKjMTCtPT29GxubMzOzPz69DQyNHR2bERCROTi3IyKhIyOjPTy7Pz29PTq3Ozm3LyqlPTu5Ozi1LyulPzy7LyqjPTm1OzizOzWvLymhHRydHR2ZHR2XHRyTHRyRHRyPHR2dAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaHQIAQECgajcNkQMBkDgKEQFK4LFgLhkMhOl0iElbFgtEgOJQC8BXxOEDOw0DkGhYMJHCq4FuYJBQUEQN5RGlWYBUWFxiEVWEVGRYaG40RXw0ckV8djYaZFh5gnGgKnx4fICAhjSIPrSMkJCUmJ6woBQ8FJAUlJ7VKDygPD7G9vo0OycrLDn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-source_f-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbIyKjMTCtPT29GxubMzOzPz69DQyNGR2ZERCROTi3IyKhIyOjPTy7PTm1LyqlPzy7PTq3LyulLyqjPTu5OzexOzWvLymhHRydHR2bFx2XFx2VFR2TEx2RHR2dFR2VAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaHQIAQECgajcNkQMBkDgKEQFK4LFgLhkMhOl0iElbFgtEgOJQC8BXxOEDOw0DkGo4MJHCq4FuYJBQUdnlEaVZgCgYVFoNVYRcYGBEZjBFfDRePEgkajIUXGxgVYJxoCp+hHBwdHowfIK4PDyEiIyStJSUFDwUmJiS2Sq8PILG+v4wOycrLDn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-source-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbIyKjMS+rPT29GxubMzOzPz69DQyNMTCtHRydERCROTi3IyKhIyOjPzy7PTu5Ozm3LyqjPz29PTq3Ozi1MSynPz27PTm1OzizOzaxOzWvLymhLyifOzexLyedLymfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaJQIAQECgajcNkQMBkDgKEQFK4LFgLhkMhOl0iElbFgtEgOJSCx7WAgBwi52FAsi4oBINJnCpAqCkPChUSA3tEEmoFahUWFxiGSwphGRYaGxyQEn4NHZVfj2iLlR5qoHICGYyWHyAhIpB9Dxp+IYAjsGokaiFqJZAJDwkDHBwYJiW+Sg7LzM0OfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-source_h-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxubPT29IyKjMTCtMzOzDQyNHRydERCROTi3IyChIyOjPzy7Pz27PTu5Ozm3LyulPz29PTq3Ozi1Pz69LymhOzizLyqjPTm1OzWvIyGhIR6dIRubIRmZHxaVHxSTHxCPIRydIReXHxWVHxKRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaIQIAQECgajcNkQMBkDgKEQFK4LFgLhgMiOl0mFFbEYVEgMJQC8DXRODjOw8DjGhYMIHCq4FuIKBASDwN5RGlWYBMUFRaEVWEXFBgZjEoPXxoSkX4bjYaZGBxgHZ2AkR4cHx+cSiAJCRAhIiMkJSaNCREgBScFKCkqtkq4sLK0JsFxDMrLzAx+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-source_java-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFRWVFxaXNza3OTi3Nze3Ly2tJyanPz+/Ozq7GxubFRWXHRydMzOzDQyLIyKjGxqbERCRCwuLHx6dKSinKymnLyyrNza1PTy9Ly2rIyKhDQyNGReXKyejKSWhIx+bJSCdIRuZCQiJISCfGxaPJSKdHxuVHReRHxiVHxeVGRGPKSajMS+tMSynAQCBFxeXGROLFxCLFxCNFw6LGxiXFxiZMTCtOzi1ERGRLSytJSWlERKTNzSxOzaxKymlOTi5JSSjISChBwaFNzGrLyqjKSmpDw+PMS+rOTStLyqlLyifGRmZKyqpLyidAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfWgACCAAEChYeGg4oCAwQFjgYBBwGKggEECJkICQoIk5ULmJoIDA2eDoqXowgPDBAREoIRExQVFhYEBA0XGBkaGwAcHR4dHx4gIRMGDBcEFg4iIyQlJicoISkqISssBC0OLi8lMDAxMiozNDUUNjctEjg5OjklDCEcOy4OFDw9Pg4QfuQAEgTCDglCHAQYMaQHEVRFBhRhIACHAyMLIHg4guShIAg6KDwYMYHBhBVJhiBRgmrQkhxMKlBo0ULlkCYtLbGwYYNmCyJNguYk5KBoUQlGi/oJBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-source_l-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbIyKjMTCtPT29GxubMzOzPz69DQyNHRydERCROTi3IyKhIyOjPzy7PTu5Ozm3LyqjPz29PTq3Ozi1LyqlPTm1OzizOzWvLymhGxudGRmdFxedFRWdERKdDQ+dHR2dFxidAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaHQIAQECgajcNkQMBkDgKEQFK4LFgLhkMhOl0iElbFgtEgOJQC8BXxOEDOw0DkGhYMJHCq4FuYJBQUEQN5RGlWYBQVFheEVWEYFRkaG40RXw2JGX6MaIiRHGCccQKAkRodHh4fjQ+tICEiIyQkJY0mJg8FJwWzJbVKD7gnI7K+v3EOycrLDn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-source_moc-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIQAAPz+BKSipISChERCBPz+/AQCBMTC/MTCxISC/FxaXDQyNASChARCRPzCxAQC/PzerMRaBPyCBPyqXISCBPwC/MQCxIQChATCxMT+xATCBASCBIQCBARCBPwCBMQCBMTCBCH5BAEAAAAALAAAAAAQABAAAAWOICACQRkI6DCuJOG+JysGL1wIMm0YNHEUBNwqsDMgEL5AIqEYIhZPxqtwUI0CzwRDSih4E6KGeLl1vB4FMAASkTC1icmjmxZBKBXL4YLJaAoPgWoQEBsbGX4JHHR1Ih0eChkTGoqADQ9qMwR+GhwcXlSZAAJzDQNogZeiAUBeaAcNHw2iAygocQkCuQN+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-source_o-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbIyKjMTCtPT29GxubMzOzPz69DQyNGR2ZERCROTi3IyKhIyOjPTy7PTm1LyqlPzy7PTq3LyulLyqjPTu5OzexOzWvLymhHRydHR2bFx2XFx2VFR2TEx2RHR2dFR2VAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaHQIAQECgajcNkQMBkDgKEQFK4LFgLhkMhOl0iElbFgtEgOJQC8BXxOEDOw0DkGo4MJHCq4FuYJBQUdnlEaVZgCgYVFoNVYRcYGBEZjBFfDRePEgkajIUXGxgVYJxoCp+hHBwdHowfIK4PDyEiIyStJSUFDwUmJiS2Sq8PILG+v4wOycrLDn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-source_p-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMTCxDQyNPz+/FxaXKSipPz+xPzerISChATCBARCBASCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARVEEgQqrUz3yqGCJlUESRZEFVooWZAfJpbEkU9gNMqo4KBi7vSAfWjyFxIUnEkJAwPy9EugEDFSE+nMzojVKvLREGsKCgWjMVybDaj0eH2OZ2Objb+CAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-source_pl-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbIyKjMS+rPT29GxubMzOzPz69DQyNMTCtHRydERCROTi3IyKhIyOjPzy7PTu5Ozm3LyqjPz29PTq3Ozi1MSynPz27PTm1OzizOzaxOzWvLymhLyifOzexLyedLymfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaJQIAQECgajcNkQMBkDgKEQFK4LFgLhkMhOl0iElbFgtEgOJSCx7WAgBwi52FAsi4oBINJnCpAqCkPChUSA3tEEmoFahUWFxiGSwphGRYaGxyQEn4NHZVfj2iLlR5qoHICGYyWHyAhIpB9Dxp+IYAjsGokaiFqJZAJDwkDHBwYJiW+Sg7LzM0OfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-source_py-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxaXNza1Nze3Ly2rJyanPz+/Ozq7GxqbPz6/NTSzDQyNKSujIyKhHRydERCRGR2PHyaLLzObIyqNKzCZIymRKy6jPTy7OTi3ISChFx+HISaNKyuPJyaBKTCRKS+VISiVGyKJHSGPLzWdKS+TMzefISCJHRiBGySJJSyNLTGbKzKRHSaHJSWhLyulHSKNJy6RKzCXISWRLTOZJSuVIyuJGyOHHyWLOzaxJSqTGyGJJSmXHySPJS+JHSOHIy2JHR2XLyqlERaHGSGHFRqJHSOJGR+JFxmPNTOxIySbHyORHSWJPTm1ISiHHyiJFRuHMSqjPTu5OzexFx6LMTCtMS+rJyidISqJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfKgACCAAGFhoaDiQECAwMCAgQBBQGJggEDBpkGBwgJk5WXmgYJCAqeC4kFAwysCQYNDggPqIMQERITFBUWFxgEGagaGhsVHB0eH8ggvQQLISIjJCUmJygpKissLRcuCy8wMSMqMhszMzQ1Njc43QA5Njo0Ozw9Pig/LCxAQbRCOkM2iBQxgsLGjyJH+CXKoEABkiRKWCxhQYQBLUsYLhxgwkRJEydPoFwkhCEKRylKbNSYIlIRASpVCFj5UeMKhJaDAizYybPnAj+BAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-source_s-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbIyKjMTCtPT29GxubMzOzPz69DQyNHRydERCROTi3IyKhIyOjPzy7PTu5Ozm3LyqjPz29PTq3Ozi1LyqlPTm1OzizOzWvLymhGxudGRmdFxedFRWdERKdDQ+dHR2dFxidAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaHQIAQECgajcNkQMBkDgKEQFK4LFgLhkMhOl0iElbFgtEgOJQC8BXxOEDOw0DkGhYMJHCq4FuYJBQUEQN5RGlWYBQVFheEVWEYFRkaG40RXw2JGX6MaIiRHGCccQKAkRodHh4fjQ+tICEiIyQkJY0mJg8FJwWzJbVKD7gnI7K+v3EOycrLDn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-source_y-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxubPT29IyKjMTCtMzOzDQyNHRydERCROTi3IyChIyOjPzy7Pz27PTu5Ozm3LyulPz29PTq3Ozi1Pz69LymhOzizLyqjPTm1OzWvIyGhIR6dIRubIRmZHxaVHxSTHxCPIRydIReXHxWVHxKRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaIQIAQECgajcNkQMBkDgKEQFK4LFgLhgMiOl0mFFbEYVEgMJQC8DXRODjOw8DjGhYMIHCq4FuIKBASDwN5RGlWYBMUFRaEVWEXFBgZjEoPXxoSkX4bjYaZGBxgHZ2AkR4cHx+cSiAJCRAhIiMkJSaNCREgBScFKCkqtkq4sLK0JsFxDMrLzAx+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-tar-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxaXNze3Ly2tJyanPz+/Ozq7GxqbJySbJyadPT29Pz69GxubMzOzDQyNPz21LSujPz25OzmxNTS1IyKhERCRKyqjLy2rKSehPz67Pz23OzerKSaZMzGxPTy7PTqvOzirMy+dKyeTIR2NPTq3LyubLyqVJySPHxyJOzi1LyunPTqzOzW5OzSzNzOrJSGNGxiNLy2pPTm1OzezLyqjJSKZOTStOzOxNzGtOTSjKSSRIR+LGReHLyynOzexLymhOTWlNzOhFxSFHRuRNzKfNTGdHxuLGxeJIyCbMy6pLyifLyqlNS+pOTOpLyedHRydJySfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfLgACCAAGFhoaDiQECjIwDAQQBiYKLBZYFBgcFkZMICAkICgULDA0LBA6Cnw8QERKgExQHDBWpCBAQFrm4EAkKAhcUqRgRGRqsGxIbHB0eAgOpCRofCw8WICEiIwMkJBDRCwsgICUmIico3CkqtissLS7mJy8wMTIzNKk1Njc4OSI6Xuzg0WOGjx/6gOQIEkTHiB0ohKjwYQOhoCEliBQxcuQIDCRJbNhQkmoQRhgflzAR2cRJSUFPekDpQbMHjR9OXCpywLOnTwd+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-tex-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMTCxDQyNPz+/FxaXAQChKSipPz+xPzerAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARgEEgQqrUz3yqGCJlUESRZEFU4lkQREJ/2skU9BEaezzmRCwccwDCc+XwIFGhI0ZEMxiURxzIQkghp0+qjJlDDHdRnQPSyGu4oEfguRTrs9fqmWAjfPHpSkWMReyIbg34RACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-tgz-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBIQChFxaXMQCxNze3Ly2tJyanPzC/Pz+/OTi3GxubJySbJyWbPT29MzOzPz69DQyNPz21LSujPz67OzmxJyadNTS1IyKjGxqbERCRKyqjLymhLy2rIyKhKSehPz23Pz+9OTevOzmtKSaZMzGxPTu5PTqzMy+dKyeTIR2NPTq3LyulOzirLyubLyqVJySPHxyJOzi1OzW5OzOxNzOrJSGNHRmJOzezJSKZOTSjGReHLyunOzaxOTWlNzOhKSSRIR+LFxSFLyynOzWvHRuRNzKfNTGdGxeJGxiNIyCbMy6pNS+pNzSrAQCBHRydLSunMSynAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfYgACCAQKFhoaCiQOEBI2NBQIGAooHjAiXCAkKCJIAAZ8BCwsMCw2XCg4PBhCCohESExQVCxYXChgZrAsSvBIaGxIbDA0JHB2sHh8gHx8SISIiIyQlBBysFR8mzBIiJygpBSUqK9cPEywiLS4oLzAFKjHkAAwmMjM06y81NgUmNxuscNCYQSIHuxopdOy4wQMgABw9cvjw8SMFEBhBhPAY4hAAkRZFjKQ4cgRJEiWgAiTy2AKJSSFLmAQ4MKDJSidPFggRAmXFhgADNthMJACC0aMQAjRZ6icQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-txt-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxaVPzKjMR6RNze3Ly2tJyanPyODPz+/Ozq7GxqbPyKBPyGDPzGjPT29HRydMzOzDQuJOx6BPyGBPyKDOTWzIyKjERGRDQyNKROBOR2BOzezIyKhBwOBKRKBNSOXOza1CQOBPyCDOySZPzizPTWxPTy7Pz69Pz29PTq3LyqlMxmJNRyROy2lPTu5OTi3MSulFxGNIRWLMR+XPTKrOzStPTm3IRSNOzizOzavLymhLSyrEw6LKRuVIx6ZNzSvOzexNzWxNzW1FROTBwaFKSShOzWvOTOpOTazJyWjHRqXNzKrOTStLyifMS+vMS+rMS6pLymfLyedAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfOgACCAAGFhoaDAgOCAQSOjgUBBgGCB4qEBAiaCAkKCJMACwwNA42bCA4PEA4GERITFKQVpwgWDwoXGBkaE6MDG6cOBAUcGB0eGgsTDR8gmw4OGwURACHIIiMkJSYIJygpKSoYgtYrLC0kLdAuKS8w1IIdMTIzNDUbLjYpG+KDABcRbtRrYWMDjhw6xg0KsCMAjx4+fmwAEiShvwBCChgYQqSIkRpHdMBjZCIFkh1JlCxhcqSJQkZOnjyBAgOGjihSpLwkhAFDBJ9Ae0bwEwgAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-unknown-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXIyKjNTW1Nze3LS2tJyanER2RGS+VPz+/PTu5GxqbPz69BQ6BCxeLFSqRPT29HRydMzOzDQyNERmPKSypCRWHIyKhERCRDyGPKz2nESiLBxGHCyCHGxubPz6/PTy7Ozi1Ly2rKSipOzm3LyqlKSWhCRyFOzizLymhNTKtNzOvOzaxOTStPz27OzWvOTOpLSupLyedMS+rMS6pMSulLyqjLymfLyifAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAamQIAQECgajcOkYEBoDgoBQyAJOCCuiENCsWBIh9aGw9F4HCARiXciRDQoBUnlYRlcIgsMG5CxXAgMGhscBRAEBRd7AB0eBBoIgxUfICEiikSPgyMMIAokJZcBkBybJgomIaBJAZoMpyCmqkMBFCcVCrgKKAwpoSorKqchKCwtvasIFBIhLiYvLzDHsxQNMcMKLDAwMqEz3jQ1NTY3ONyrE+jp6hN+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-vcalendar-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBFxaXDQyNAQCBMTCxPz+/ISChAQChKSipAQC/Pz+xPzerPyqXMRaBAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARyEEgQahVijMmD/oRAbBw1FCgaFFrpEbB6jt1g3OpFAscxwATUiIAgBRKJXiqIYJEMBQNSWSAYgptrMDo9FJqKrHArTR4WLGisSkbebE12gXFFGRBFyd3eaFSvbx1xCDBXC2E1e1EECo07ABkaBh4fGn4RACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-vcard-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBFxaXDQyNAQCBMTCxPz+/ISChKSipISC/ERCBMTC/Pz+xPzerAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARvEEgQahVijMmD/oRAbBw1FCgaFFrppeo5drKhXqQUEIfREyweqWIoHo4GDYtkGxwQ0CjitEkUrCyfYjtdbJoFW/agmLJWWZSY3B0EbGJ4uAwcHlK2HpTg7YgHBgQjDH0THoGBCwULjDkAGR+RH34RACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-video-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxaTFxaXIxuHJyCLHx6ZLy6vJSSlNze3Ly2rMy2RNS+TKyqrMzKzPz+/Ozq7GxubJyanLSePKySNKSSPNTS1JSWlDQyNMSqPLSmVNzKZJyenIyKjHRydGxqbERCROTWXNS6XOzidNzOZPT29MS6rISChLSulMy2TLyeNKSOPJyCPOTi3JSSfHxiFGxaJFxWLFROLPTu5Ozm3ISCdDw2BFRKHHxqPFxWPLymTMzCvPTq3OzezKSWTMzCbNzGZExKNHx6dLyqjMy6XMSqTMSmTEQ+JHRybMSynISCbMyyVOTWbLy2ZBQWFGxqZOzifDw6LCwiDISCZJR6LIRqJBwWDExKRHRuXHxmJGxeJFxSHCQiFFRGFGRSHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfhgACCAAECAoWHhoMDBAUGBwiRkQkCBwGCCgsLBQwNDp8ODxAOEQIAChITFJwVoA4QnhYXEhgZBRoFG62fHB0eHxcgIQUiIyO5uyQIJSYXJwUoKSoUKwEWniQkLCUXHy0DLi8vMDEfBw0kMjMnFwAfNDU2Nzc4OTgmOjs87ILvEj04NPj4ASRICR5C2vVrEWAIEQwSihg5giThIHdJiCgJMWIJkyZOLA4K8CHJkycimEAJEcWJQkECEHyQEqIHFAJTqFSxcjGAjhIfrlzAkkWLDS1bel5Y+mELly5YCEyQ4CcQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-wordprocessing-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFRSVFxaXFxWTNze3Ly2rJyanPz+/Ozq7GxqbHR2dHRydGRmZERGRMzOzCwqLJyWjOzi1Oze1PTm1PTm3IyKjDQyNERCPPTy7HRmXCwqJPT29DQ2NNTGnOzm3PTq3CQqJMS2hDQuLKyaXCQmHBwaHKyahLSijKyehBQaFCQiHHRqNPTu5LyulCwuLHxyNAQGBBQSFERCRBweHOzezIyCVJSSfOzavLyqjOzexOzWvLymhExGJEQ+JExCJExGLCwqHOTOpDw6POTStLyifMTCtMSynMSulLyedAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfWgACCAAECAwIChYeDjAIEj48FAgYBjIIBBAeaBwgJBwYDjAoLDIkNmgsOnw+CEBESExQSEgsHFQsJDRYAFxWbmhgZGhsEBRUcHQ8cEB4fzhAWICEYxSIjJCUDJicnKBkpKissFC0uLwAwMDEyFzHpDxgfES27DyozMyX6+TMTEzQtWJWoIYGgQRsl/t3AsStFQRoGIYrIkUPHDhcANPDo0cMHxx9AUtzQEWQHKwAcSDy4IAQbh5FDghDZNShAkZsFjBzBgaQnh0YcHojgIMIFBwtBXfgJBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-1downarrow-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBBQSFAQGBDQyNExKTHx6fGxqbFxeXGRiZFRWVDw+PAwKDJSWlOzu7LSytJyenJSSlISGhISChIyOjFxaXDw6PPz+/MTCxLS2tIyKjKSmpKSipJyanAwODDQ2NHRydERCRFRSVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAZzQIBwSCwaj8ikcslsOp/OgHRKlQoCgymRUDAcEIkwYgxWFBYERpHQcDwgEclEQmk8DhWL2kiIXDBwExMNGRoJaUkEEH8bEQ0cGgcWAksEHX8QHBKSHk1sfxMHH5ROBBsOICGkT2wiq1CIULKztLW2t0h2QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-1leftarrow-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNAQCBExKTJSSlHx6fAQGBOzu7GxqbJyenPz+/LSytFxaXMTCxGRiZKSmpISGhFxeXISChAwKDFRWVHRydJSWlBQSFERCRIyKjDQ2NIyOjLS2tDw6PBwaHFRSVDw+PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAZ5QIBwSCwaj8ikchgQLJGBgfNZDBAKBirRekBMtYGEYsHIgsWNhOO7tCrShDU18Hg/CJAIG0o4wCUQcksTFBUSCRYSEnpUFxgIGQkJGYyNGggbHBaVjR2QCxEeWkITHQ4IH3tPFwEMA2ajAKUgqlQTTbFEE7W5vUgGQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-1rightarrow-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNGReZAQCBMTCxGRiZMzGzOTm5LSytPTy9Pz+/CwqLOTi5Ly6vCwmLMzKzJyanJSSlBQWFKymrIyGjCQeJJyWnISChISGhHx2fKyurDw6PAwODHx6fHRydDw2PERCRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAZ2QIBwSCwaj8hkMRBQKgOCgRMZIBSk06XhEM0SA4iE4uoVLhCMhqLrdSAekMgYO5VM4BQ521mxIC4UFxBWdEkSERYYFxETGQGFSBKCGBEaGRuQSBwdeZaPXpsQCB6YZQMdEI6ZSgMepKusHh+wrCC0rLdlursGQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-1uparrow-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBFxeXDw+PMTGxHRudPz+/JSSlLSytIyKjHR2dISChIyGjIyOjLSutLy6vKSepJyanISGhJSOlOzm7Ozu7MzGzKyurJyenDQyNGReZKSmpIR+hCwuLCQiJBwaHBQSFAwKDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAZtQIBwSCwaj8ikcslsOp9QYyAQFQYEAyr0Sihkn1fDAeHVLsOJNELxVaITC0bDUU6GH5AIQ8KYrNtFVxQVFBYWFxgRCREYdUQZGhYEDwgIGxAHCQocCgWOQhmhGR0epR8gqCFTq1Wtrq+wsUt0QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-2downarrow-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBAQGBBwaHDQyNExKTHx6fGxqbFxeXGRiZFRSVDw+PAwKDJSWlOzu7LSytJyenJSSlISGhISChIyOjFRWVDw6PPz+/MTCxLS2tGRmZDQ2NAwODJyanKSmpKSipIyKjHRydBQSFERCRExOTFxaXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAasQIBwSCwah4FkQKBsDpoBIqFgOCASCYRWm1AUFgRGkdBwPCARiWRCaTwOFYvYSIhcMOiJpJGZaDYcR0IEHXceEQ0fICEWIoJDhHcQHxIHgI9SEHeVG46YUh8OISOen1INCqWmUnOYTUxQAU9NUlRWWFtbCiRgrYNlZ2lriG8lYUd1khETE24gCZeCkRgeFBAQIAeNn9OTlXKrBJoYnKrcoaPmpmSpq3S+7u50QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-2leftarrow-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNAQCBExKTJSSlHx6fAQGBOzu7GxqbJyenPz+/LSytFxaXMTCxGRiZKSmpISGhFxeXISChAwKDFRWVHRydJSWlBQSFERCRIyKjDQ2NIyOjLS2tDw6PBwaHFRSVDw+PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAavQIBwSCwaj8gkMiBYNpeDZzEQXRIKBmPgmtUSDgipcAsWjxOKBaN7Tq+n6EbCIQ3E5+KtQk6gjwl7CX11D3sPBBARTQGFDYeJT2R8EhB0koKUfgATFBUSCRYSEoqcnqCiikMXGAgZCQkZqautr7FiFxoIGxwWqQC4ury+qh2tCxEexMbIRhMdDggfYs7Q0kcXAQwDbELY2txEziBmmx3jSRNMR+nk4e2b70ry80QGQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-2rightarrow-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNFxeXAQCBMTGxOzm7CwqLLy2vPTy9Pz+/Ly6vCQiJLSytLS2tLSutOTi5MzGzKSepIyKjJSOlKSmpMzKzJyanIyOjBwaHIyGjISGhJSSlISChBQSFJyenIR+hGxubDw+PHRydHR2dEQ+RHx6fERCRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAa6QIBwSCwaj8hkIIBcJgEBweAYnTYJUmMAa9USClniFtwlGg6IRFhoUKTXwwWj0FB3F46Hwl6UQyISfAB+EROCQgsUFRYSF3yJEIyBaxgWDBkaGRtclQwSHBIbEGEdGx4fGhcOICEDGBsWHBmqIq1CHRIWGRMMIyRTHRy6Er22tyONq8YdJRe0xkIDwr2/QwMfliMmZQADIxasZd4e4UYDIr7c59rc0eVFA+/m0EQD9PDt0flP/P3+BkEAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-2uparrow-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBGReZDQyNMTCxHx6fPz+/JyWnKyurHx2fDw6PJSSlISGhIyKjIyGjISChLy6vJyanOTm5PTy9OTi5MzKzLSytKSepMTGxMzGzLS2tLSutKymrHRydCQiJCwmLBwWHAwODLy2vHx+fAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAajQIBwSCwaj8RAAMkUBgSDZdP4JBSi06TAcEAkFNLp07BgLLzY5njRcDzO3zB1C4lEGI83Wj58SiYUFRUWdg0XEXFFAwIYGRoWGxwRZQUFHZdgRAObmx4fHiChISFKpVlKWUdPaalOAlasp1sHG4myZGZ7Yltsbgu1mUhjdRF5egmxfQJ/gYOFdrZDi40iFgiSCw8jBQmYcpydn6Ego6WorUwGQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-abs-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIEAAPwCBIQChAQCBBQSFCH5BAEAAAAALAAAAAAWABYAAAJLhI+pF+vW4HMR1InqxbJzBiLCeIxCaIkneQJk6rkl+2qlONzeNi+2YvKhEIOW4iczvJSoSDDIbCpbq2oGBXUtd59r7IPshsHdB70AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-airbrush-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIMAAASC/AQCBPyChMwCBIQCBPz+/MzKzKyqrISChDQyNPwCBAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAR8EMhJKw3BahvEyNvWDV+ojQMBAhgmeukaFHSxTqh6FYZx3CyYbtf7XYRAFs8nQ56WxiBpyOEdjLkkrnA9IAKGqXbnTYAP1NDMe0Z8JYR4nPP1seEqTHpWZMupVHx2by03Q4JXbxuBfYoaaVZ3i4YKbo4WaQAKBCxjcEAGEQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-appearance-22:actions actions22 22:photo:22 22:R0lGODlhFwAWAIYAAPz+BAQCBBweHPTy7Ozq5ExKRPTu5NzStLy2lCQmJAQGBOTezNTKrLyylNTKpOzm3NzWvOzm1MTCpNzaxISuvBSGvLy+pKSehOTexISutKTa7IzS7GSarJTW9HTK7CyazBRypMzGpDw2LOTaxEyKpCSSxARGbERCROTizMS6nDx2jARajIR+bOzi1OTi1MzCnLy6lOSupNx6dGS2rJS6pMy+pOS2pNxGTKwaLDSmpHTOzES2tIyuhLSmjPyqrMw6RLSOhLzSrGyqbFSmXJSyhNTOtGTCvLzm5CyOjEQ+NPRqbOxOVKyKfMzizKzepFyuZJSqlBR6fCRmZJSKdDw6NLxqZLQiNIwyNLSejDSCRJzWnEyiVHySbBRiZDQyJMSijGS6ZHSCZJyafDRmPISKbJyifDw6LAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAXABYAAAf/gACCg4SFhoYBAgGHjIQBAwQEBYwBlYiQAwYGi4UBBwcInIIJA6WRBAqdCwcMDA2pggEEDpUODwSiAAEQnwwHnI8RwBIGsLoLExQVFg4XiwEPD6IKGBjAExkaGxUcocfSgwHV1uITFR0eHyAhIroRERLAC/PVIxMkJSUgJvHH1RAKTixAgQzZhAkpVKwwwYKWrgnzFrRY4IIgBoMTRryQAGPjs4zzYsgYQdIgsgMzaNRw0CCBLgn2bNzAceMgSZITcujYwaNGj2sjcPjw8QNIECFDiEgoYuSIDiQOkoSTMAGHkiU4mAhp4uQJDyhRjOSQMiUXFQdVrOC4giWLFidbRri8QBKlyxQviIp8udKjRhYwYLKEedFAjJgvucI5cFBEgoMxkMm82PjFmCERix1wLCNmcg8viRGZ6aHZcQ8zoRtVWp16UCAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-attach-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBMTCxPz+/DQyNKSipAQCBISChFxaXDw6PAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARrEMgJgqA4zzus/gLhFd5HCcZAXqsphYPUdhcYFNRcZnvdtpnDqPTbUWgAJKBYwzBlw+bRo3xmkNWoBgm0OrVLn3GC9RgCk8DhUw7c0rHPr4CDu5SYQNyEt7uSY3p/UAKFhYKDSQOLiwgFdhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-back-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAw2VCRGZAxCZGyavExmjHyatOTy9CxihISevPz+/KzO3BRylAw+XAQCBDRWbPz6/FzC3CSuzDyexJzO5Mzq9CxSdAQOFISmxNzu9HTS5BSmxAyexDSuzJTa7Mzu9Kzi7GS21CRmjAQOHHSWtLze7AyWvHzG3BRihAQKFCTO3BS+1AyixBSWvBSOtBSStAQWJBSixDzW5BTC3BSqzBS21CTC1ETW3AQSHEze7BRqlBRmjAQCDBR+pBRefBRSdCH5BAEAAAAALAAAAAAWABYAAAalQIBwSCwaj8ikMqBcMpvHgGAANQYIhWdVGDAcENQtIJBQLBgNx0MQaDuQXcghIplQDhBIxXKJYiAZGhscHR4VHyAhIiNWJBklGhIbJoQnFCcTKIxFKSgbKissJi0mJi4vLiYoMEcXKDEyMzQ1Nje2NisoOEg4KDU5K6g6OwwoKAN9SCOeMmgwz884PEq9PT4NYkPLP9jZQikN3d4AKVrjKePp3gZBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-blend-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQmJAQyNAQ6PARGRARSVARmZARubARuXARmTARiPAReLARaHARKBAROBAQCBERydESChESOjESanESmpESytES+vETKzETKtETCpES+lES2fESybESqXESiRAQ+PARiZARybASGhASWlASmpAS6tASynASqhASiZASaTASSNASKHAR+BARiBARydAR+fAS2tARKTDRaXARaXASOjASKdASCZAR+TAR2PARuJARqFAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAa3QIBwSCwaj8ikcslcBp6CAaFQMBwOiIRiwWg4HA9hAAKJSCaUiuVywWQ0G07H4wkDxp8CKCQakUolJicoKSorLC12eHouL34lMIKEhoiKEFMgLn0kMIGDhSyVYhADjJuAkoWHiaMEMXuOnJ6Tq5alBpp+nSeflKx3l6a6s6CiwKWZm52pvpaue8rEzaPIubLMta2Mscu9ob8BMgIfBDPJNDQ1Njc4OTotDXYP8/T19vZN+fr7SXRBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-bookmark_add-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBCwqLCQiJCQmJMTGxAQCBLy+vLSytERGRFRWVKyurKyqrLS2tKSmpHR2dJSWlKSipISGhGxubIyOjGxqbIyKjFxaXGRmZHx+fPz+NGRiZPz+ZPz+HMTCBKSiHPz+jFxeXPz+XPz+tPz+zPz+/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAamQIBwSCwaj4Gj0hgQLJ+AAaEAVQoI06pRYDhkoYgwIhEgKBTfZ2FhaBsYDS8VWnA8Go0FJIKeqyUTDw8EDHBpSwUUFQ4UFhcYDQYFfkoFFxEQDG8KEAUZlEeWGBIakw4FG1STiBoYBRwdBR4fHgUdHKBEBSCnIR8iIyIfIblFu6ceIyQjtcXGCbLKzAUKzrq+wMLEVa+xs7W31kOTk6nkWuOf6Ea5QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-bookmark-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBCQmJCwqLMTGxAQCBBwaHMTCxLSytERGRFRWVLy+vKyqrKSmpHR2dJSSlJyanISGhGxubIyOjKyurGxqbFxeXGRmZHx+fKSipLy6vGRiZLS2tFRSVHRydJSWlHx6fCH5BAEAAAAALAAAAAAWABYAAAWWICCOZGmewamaQrq+wUC8azHINGocOI38iIRAceDNaISFYklkGHOEhoNBfUAOhuOLEJE8HoPiRKFdESiQBqViuTDIUAsEcyAeGJmyiqC5RCwJGg0YcEh9D0V3Dxt6JwQVDRYVHBUdi40mjw0PTgwQHgeYJQQJfxUXFxAOoTkFpQ0fsRSimQkWEQ0VtI62HLt7vjl7JQYhACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-border_all-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAI+hI+pyw0Bo5wR0TttUJDv0yWhRopfaYzguaKt6aasrGFYbVPxM/O7Snv9WEAfTIgMKpNGWU63emYc1GrVUAAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-border_bottom-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAIyhI+pyw3xIpwyOgOv1dvl+2lhMzIlyZ1KQLUVm8Zch4ozbcq6l7L+D4QhgsTf7Xi0FwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-border_fall-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAI/hI+pyw3xIpwypgBRdg/v9h2eyBnZCIKYxX2oEsJruVKjHS8vk3duKZnpHKjeRSTU0HYpTcxWgRqB1KrVYC8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-border_horizontal-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAIyhI+pyw3xIpwyOgOv1dvl+2lhMzIlyZ1KwLbuyybw7KY216Einpv377FRhhUV78igFwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-border_inside-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAI7hI+pyw3xIgxTRvcg1oku3njbBx4liV3dqYbsSsXyLBr0Pad1iCovsmOwgjbdz9TrGHWWSeWZikoXhgIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-border_left-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAI6hI+pyw0Rnox0ygNXdG9z43Xal30gUiYhk5LoenJQRVtti5FwE+Kx4+O9RrIda6gwDmvMi+kJjTIMBQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-border_outline-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAI8hI+pyw0Bo5ww0SttcKci/ymgMTZl+Yjbt3Jn26lautX0A+OizHJkjsrper7XbkZ0ATEYDZPii0qnU3sBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-border_remove-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAIthI+pyw3xIpwyOgOv1dvl+2lhMzIlyZ1KQLUVm8Zch4ozbcq6F7s+fgsKb4YCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-border_right-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAI7hI+pyw3xIpzyQRdVuIZj+3nHhogOiZng+I1qoqIdRVfbWy5y1u5M7MFphB1dsDULGXO15goJjUoRhgIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-border_top-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAIyhI+pyw0Bo5ww0SvdCdrw7oGfNnZlczIpKorc+8RwZbZgXOc2uevOqpjJhrCb8QgwFAAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-border_up-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAI/hI+pyw3xIpwyOgNRyPq+zTkcuIQKaV3T1pgHinmfm7AUedMa64Vw3bLJMr9TiZcSFUsnkw54q0Rl1KrVYSgAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-border_vertical-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAI6hI+pyw3xIgxTRvcg1oku3njbBx4liV3dqYbsalFeJTp1iCovcjNsb9iZhMFcJwXUxTJLYuoJjR7sBQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-bottom-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAw2VCRKZDRSbBxCXJTC1Mzi7Nzq9NTm9Bx2nAQCBNzu9JzG3Hy+1HzG3IzO5BRmjPz6/LTe7Dy61AyStCTC1FzC1AyGrETS3ETC1ETa5BRulAyuzBRylAw+XMTe7Gy+3CSqzAyexBTC3DR+nIS21KTW5Nzu/KzO3FzC3Pz+/ByixEze7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAaXQIBwSCwaj8ikcnkMBAQDgjPAFAYKhsMBkVBUAYEFo+F4QLzVQEQyoVTOX/XBcsHA0+vMRbNBMwkRDhxuHX5GTlIeHh8gISIjFAEeiVRECiQlDAUmgxQjIhwiJHdFlycoKSIUFCEjGiGkRpcqCxYijxorsUezcxYsuoZJsxLAu0qXB7DCTJfHvArR0tPSSNTX1V/a20J2QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-brace-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIEAAPwCBIQChAQCBBQSFCH5BAEAAAAALAAAAAAWABYAAAJRhI+pGbHYVHzQnUnrtXn7/gEYIJRHKRgYZraGuXLp28LcNL/Dqd4cYmJYRqegsKcY5DRIUhHYFDlQJGMuVn1ljdhqjhoiZrogKbMjFh/LHUMBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-brackets-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIEAAPwCBIQChAQCBBQSFCH5BAEAAAAALAAAAAAWABYAAAJRhI+pyw0Bg3vxwImu0Zha2XkbaAjmYQrjh6qnCpwcB8evTGp1PKDrnzglZqTWDsg5DI5IUE1Yatpc0BrRFr2xfiljJlecXEPjDjG5iIRDCHsBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-centrejust-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAIhhI+py+1vgpy0TogztlT7j3CiBJbZWJlqg4rry7jw/BoFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-charset-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIIAAPwCBAQCBAQGBFxaXAwKDBQWFAAAAAAAACH5BAEAAAAALAAAAAAWABYAAANLCLrc/jDKuQK1zmKo3/YVJSpBSZYmKaTkAAwYoQwFELjvpisyaTM7H6AH+3lQMZQwExrOOiBh7/cJGokaXHGpQVaUo7B4TC6bw4AEACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-colorize-22:actions actions22 22:photo:22 22:R0lGODlhFwAWAIYAAPz+BAQCBBweHPTy7Ozq5ExKRPTu5NzStLy2lCQmJAQGBOTezNTKrLyylNTKpOzm3NzWvOzm1MTCpNzaxISuvBSGvLy+pKSehOTexISutKTa7IzS7GSarJTW9HTK7CyazBRypMzGpDw2LOTaxEyKpCSSxARGbERCROTizMS6nDx2jARajIR+bOzi1OTi1MzCnLy6lOSupNx6dGS2rJS6pMy+pOS2pNxGTKwaLDSmpHTOzES2tIyuhLSmjPyqrMw6RLSOhLzSrGyqbFSmXJSyhNTOtGTCvLzm5CyOjEQ+NPRqbOxOVKyKfMzizKzepFyuZJSqlBR6fCRmZJSKdDw6NLxqZLQiNIwyNLSejDSCRJzWnEyiVHySbBRiZDQyJMSijGS6ZHSCZJyafDRmPISKbJyifDw6LAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAXABYAAAf/gACCg4SFhoYBAgGHjIQBAwQEBYwBlYiQAwYGi4UBBwcInIIJA6WRBAqdCwcMDA2pggEEDpUODwSiAAEQnwwHnI8RwBIGsLoLExQVFg4XiwEPD6IKGBjAExkaGxUcocfSgwHV1uITFR0eHyAhIroRERLAC/PVIxMkJSUgJvHH1RAKTixAgQzZhAkpVKwwwYKWrgnzFrRY4IIgBoMTRryQAGPjs4zzYsgYQdIgsgMzaNRw0CCBLgn2bNzAceMgSZITcujYwaNGj2sjcPjw8QNIECFDiEgoYuSIDiQOkoSTMAGHkiU4mAhp4uQJDyhRjOSQMiUXFQdVrOC4giWLFidbRri8QBKlyxQviIp8udKjRhYwYLKEedFAjJgvucI5cFBEgoMxkMm82PjFmCERix1wLCNmcg8viRGZ6aHZcQ8zoRtVWp16UCAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-colorpicker-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBAQCBMT+xASaBASyBASCBARCBPz+/KyqrISChAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARZEMhJ6wzBahvEyNvWEcMXcgJBFuApjavRhlgaz6J9u5dQDAUZ73VA+FhDQOAQQCQEQt6ymcjgREznlZatJpXdLZYq1ky137M3qS5zwl8lOR5IIDBx5TpviAAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-configure-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBAQCBISChFxaXNze3NTS1Ly6vKSipNTO1Ly2vNza3Pz+/MzOzOTe5DQyNOzu7MTCxGRmZMTGxPTy9Ozm7Hx6fPTu9MzGzGxmbAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAW1ICCOZGmeaEoGbBsI6joMRGEcbQwESDIrtVtAF1gwDLNaAmfKiVgLBJKgwB1KxQZrBHU0FAXmavFoQLYiB6TxFXMj5AZBwnJI2I3wcNWALyYEcgoKXxRhOHs7XxEVCwsWFgoUDRYUFwwQB25ZCxiNjo6GkwUXN2NsCxEYqhUHoQ0MEglYRQQXErcHrI55FycuB2YSmoyOBTEtB2sXuhU6XAENC2a6z9AKCwq+1tAN3E2J3ySkIQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-connect_creating-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBPz+BMTCBISCBAQCBPz+/MTCxOTi5AQGBNze3Ly6vISChNza3FxaXKSipAAAACH5BAEAAAAALAAAAAAWABYAAAR4EMhJqwzY6omD+MNGdR8YilNZnug0qGzrqrL1lnV1fyJBVB6VQEMoGH4ADGwQkxQPBwMiKGA2J8VEAnq0tgiKg5aL/C7C2gTjKCM0zowDQ8tuNQznNL7cKzjOUQsNfER+gguIg19+Pm6ChBZFDmWNi5M5FIyYFHQRACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-connect_established-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBAQCBKyirPz+/KymrOTi5KSipMzCzNza3OTe5Ozi7MzGzPTq9OTm5ISChMS+xFxaXNze3GReZIyCjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAWLICCOZGmeaBkAQpoGg7C6JizTQT7CxPwOwFWgYPChYIXkIHC4uQKGAiKRKCyNpxxUUVViVYNFLkqtLo+DAkMMLXQPXwAy2WCTF4544FGtKuwPDhB6DnxuUmyCcXIQhV1uYoMuEAcOBxEKCHg6TzGFCJUSizuejROKOAM9OY2SnUU7nD89NCcDsLUnIQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-connect_no-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBPz+BMTCBERCBAQCBPz+/MTCxOTi5Nze3OTm5Ly6vNza3ISChFxaXKSipAAAACH5BAEAAAAALAAAAAAWABYAAARiEMhJq7046827/+AVCKE0Dh9BAGdaGISAToFGFMcBU+11I4hDYseSZQiKwwKoI/QwBIYiuFDCZseGdIlYEjUNg1SpY6w2N4cUIW6cjwW1lsFwo+MqgtZuw0/ydw5vH34lBhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-contents2-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBDyGhCyCfFSWlESOjDyKjDSGhCx+fGSinGSenFyanEySjHSqpHSqrGympEySlBx2dISytHyyrCR6dKTGxHyurHSurHyytGSipCR6fARmZFSalEyWlBRubAxubBRydDyKhDSChLSytPz+/MzKzIyOjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbFQIBwSCwaj8ikMhBQIpmCQdM5ZBIKhgNiugwkFAsCI7pNMhuOxkNBgBgEiAi3GkBLJpJHYgEpaClyREwVFhcSEhgOGQoMfgMaERtcARQBFRMYExZ6HB0FUYAekkIBHxqWFmlrC1haESAfG6MBGx+VFRgKYH0hInGRklO0ppYXCwwMWQiQHkwjgrWnFRdYZHIBJCTP0LaWGAcDW9jZ2nMAw9IWTOQkJSZMRsOV49nu8E+19PbmR7TY+1TovONH5V7Ag0QMBAEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-contents-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIYAAAQCBAQ2NPwCBHSurIS2tBx2dBweHPz+/Ozm1GxiTGyqpPz6/Pz69GSqpOzaxPzy5HxuVLSmlOTazPz27PT29NzClPTexHxuXLSmjAxqbFSinPTy9KyehNy+lPTy5Pz29HxyXNzWxKSahOzexPzy7IR2ZOTWtESenPTy7KSWfIyCbKyijAQGBDyalPTu3KSSdDSOjJyOdCSGhPzu3OzizJSGdPTq1PTq3JySdMy6lAyKhOzWtOzi1OTOrJyKbMS2nJySfMS+rAwCBNzOrNTCpNzKpJSGZKyafLSifLyylIx+ZHx6ZDSChAQuLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAIALAAAAAAWABYAAAf/gAABAoSFhoeHAAMAiI2IAAQFjI6EAAaJkQeTjwAICYkKBQcLm5WdBwyfhgChB66bp64HCQC1lQ2irqQCAA4PowsLEBESE4wAuLIHFAAVFr+uDBcYxRm1GrmuGxwdFh4Mrh8gGCET1gDYyhsiFSMkDAsMDCUYJhvnJ9kHKCnODwwfPlBQsULCPRYAWogK9sHFiwoOPEyQh0JFPXO1YBSYwBEFghjdHkwQOYGgwQwIZRR44GHGDBogabhAsYEEihrUMAIoUMCEDRs3HODIYQHFA6MPcJA7KICFjgw7eIzo4cOfiwc/gKwIUm2SkKdDdlDt4AABDaU/iIRwwbTSUyJFOow4S3Hkx9oNDDZgXPU0h1wcSIgEGUw4ibVET5WoWMKksePHpdxmyKADAEIWly9HJtQkQJMmlAgZCAQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-contexthelp-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIEAAPwCBAQCBAQChAAAACH5BAEAAAAALAAAAAAWABYAAAJQhI8Qy5F/ghBsLuOgpHHy+0hZ94HINiqWwoQrtjYpNqJ0A8Hcjbs73yPNZEHVDygTJohJWqiZe0JPM5ajtXxFMkXnklqNgsPiWzmHPatzhgIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-crop-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBAQCBMT+xASyBASCBASaBISChMTCxPz+/AAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARUEMhJq704681r+EFHBcIwEKFImmfKkURhoh1cyO0rxEWZa7bezIUJ7gg04O62A22MyeeyF1XymrUSs5pZmbA61u+FLBOBhrThozq4D2cgYo6IawwRACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-decrypted-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBGxqbFxaXExOTEQ+RAQCBPz+/PTy9Ozq7Nza3NTS1KSipFRSVOTi5Hx2fJSSlKyqrJyenJyWnDw6PMzKzKyurDQyNFxWXMTCxJyanHRuLHxuLGReJFxSLFROJFxWJExCHERCHBQODISChHxyLHRqNIRyNHRmLLSqbKyiZLy6fOTarPz67Pzy3OzitKymZFxSJJySTNTSnPTy3NzSpMTChLSydKyqbKSaXJySVIyGRGReLPz23NTOnMzCjHxuPLy2vKSmpOTe5LS2tLSutHxuNHRuPMS+xFxWLIR+RDw2HFRKJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4SDAQIDBAUChY2EAQYHCAkKCwyOjZANDgIEAQoPjJiDAg2iggQQp5gMBwmrDBESl6MTFKuoFQSjABYRF40CGAW8BRm7hQwNxBobHB0eHx4gISIjBdiEAhYFJBslHOHSHh4hBSHlxIUmJygpKissBiwtLi8pGjDqhBoxMjMuaNSwcSMFjhw6dnjYRyrGCh4ueviw4Q5HDB0/PjAUJCBCAwMIGiiggAEIBFk/FgYLIgRkggQkhxAJkqGExkYMFnxsIGRkSQgLHhRRWUjAggQgG8AsSWRBBiP6VrYMOfKIyaBDNwLo+HHSUplOSyDRqiEHjRkretRQkcLgxayNF0wksQGQxsSKMTIq0QpgCba/gAE7whEIACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-down-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAw2VCRKZDRSbBxCXJTC1Mzi7Nzq9NTm9Bx2nAQCBNzu9JzG3Hy+1HzG3IzO5BRmjPz6/LTe7Dy61AyStCTC1FzC1AyGrETS3ETC1ETa5BRulAyuzBRylAw+XMTe7Gy+3CSqzAyexBTC3DR+nIS21KTW5Nzu/KzO3FzC3Pz+/ByixEze7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAaRQIBwSCwaj8ikcnkMBAQDgjPAFAYKhsMBkVBUAYEFo+F4QLzVQEQyoVTOX/XBcsHA0+vMRbNBMwkRDhxuHX5GTlIeHh8gISIjFAEeiVRECiQlDAUmgxQjIhwiJHdFlycoKSIUFCEjGiGkRpcqCxYijxorsUezcxYsuoZJsxLAu0qXB7DCTJfHVQrMX9PU1Uh0QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-editclear-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIEAAPwCBAQCBPz+/ISChCH5BAEAAAAALAAAAAAWABYAAAJBhI+py+0PYZi0WnqC2Lx7HhjaR3YhMArBUHpnuramCLLy9tY3TuP2nfPtVD3VTxY0DpNDHqo5E12mlYj1is1e7QUAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-editcopy-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBBQSFPz+/DQyNISChDw6PMzKzMTGxERGRIyKjFxaXMTCvKSmpHR2dPz6/Pz29PTq3MS2rPz69MTCxFxWVHx6dJyWjNzSzPz27Pzy7Pzu5PTm3NTKvIR+fJyGfHxuZHxqXNTCtPTq5PTi1PTezNS+rExOTFRORMyylPTaxOzWxOzSvNze3NTOxMy2nMyulMyqjAQCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbYQIBwSCwahYGkUnk0BgTQ6IAQaBKfUWhBYKhaAU+CgXAQIAyChLeJzSIQhcH6GFaM0QtGY5kstqEODw8QEQELAhJTc08KBBMEFBUWDRcBE1pca20SGBkaEBscAY5maFRIAgoLHRQRHh8gIQFlZnByqA8ZGSIQIyQjJQEmYgJ5p2ACrK4gJx4gKIZZAgdeAQ4ZI9kjKSor0AwEjeAs1S0cHAslLi4vMDDRWeRIfEsxMeET4ATyVoYLC5fizXEiAR84BeMG+pEm8EsAFhAjSlR4hR6fLxiF0AkCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-editcut-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBAQCBAwCBPz+/OTi5JyanOzq7DQyNGxqbAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARbEMhJq704gxBE0Bf3cZo4kRJqBQNRfBucyudgvJS6VaxLzyMa6/bLiWA9HOg4VIIkL5vzuRkcpkvRIIAorphJLzBW84WEuRZWp6uaT7J2Sh1Hit3OY/ZO7WvsEQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-editdelete-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIYAAASC/FRSVExKTERCRDw6PDQyNCwuLBweHBwaHAwODAwKDAQCBExOTNze3NTW1MTGxLS2tJyanPz+/Ozu7BQSFCwqLDw+POTi5PTu7MzKxIR+fCQmJPz6/Oze1NTGvPz69Pzy7Pz29LyyrPy+vPyupPTm1BQWFIQCBPwCBMS6rPzSzNTOxPTi1NS+rPTezNzOxPTizOzWxMy2pOzaxMy2nPTaxOzOtMyynOzSvMyqjPx+fOzGpMSihPTq3OzKrOTCpNzKxNTCtAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf8gACCAQIDBAUGBwgJCgsLgpCRAAwNlZYODxALEY+SkAMNEqKjEw0UD5yegqCjrRMVEqidkgWhraMWF7GptLa3EgEWFRSOnhW+vxgZEBqzkBvItxwdHryRCNGjHyAhHSLOgtgSI60c2yQjJd+eJqEnKK0hJCgnJSngAO0SF+8qEvL0VrBogW+BLX4oVKgIyMIFQU8KfDV4R+8FDBcxZBREthAFiRIsOsygsVEUh4Un3pGoUcPGjZInK65QicPlxg8oX5RwqNJGjo0hdJwQ6EIkjRM6dvDYCKIHSBc1Ztjw4eOH0oIrsgIJEqSFDBo0cuTgsdSTo7No0xYTZCcQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-edit-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBISGhISChHx+fHx6fHR2dGxqbGxubGRmZGRiZFxeXFxaXFRSVIxSLPyuXMzKzMzKxMTCtExOTPzqrPz+/NTS1MS+tOSaVPyWNPz6/IxeNPzavPyKBNTW1PyCBPyGBJxmNPzOpLx6PNRqBMSCRNySTPyCDPSGBMxiBKROBHRydPSylOyydMxmBJxKBAwODPS2lPTq3OyabJxGBPTy5PTGrOyOXPR+DPz69PzmzPzevNxuPORqLMReFPzy7MyCXKxiNIRKHBQWFNTOxPzixJRaPFxONHRqVPz27PTy7PzStCwqJDQyLJSGdIx6ZPz29PTu5HRmTLSKbMSGZHROPFxKPJSKfJyShKyehMyuhDQmHEQuJJyOfLSijMSynMS6pLSefDQyNHx2bKSahLyqhLymhOzi1FRGNIR+bNzKtOTOtOTKrOTKpLyedAQCBFRWVPTq5NzOvLyunLSmlNTCrOTOrNzGrLyidMS+rLyynKyijLymjLyqjAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gAAAAQECAwQFBQYHBggJCgsLDAwADQ6CAQ8QD5ydEJ+gERKWE4ICDxSpqhWqqhYNFxMYphCtqaytGRoXGxgcggSoth25u70eH8APFR0VzMzNziAXIRjIvwAFwq3EqSLUGB/iI4LathS4JCXVJh8nKCmCKrXDFCss1eIfLS4v8ssdmgWsAGNDDBnt3s3wJ+jAtlUhaNSwccNEi4WCBBl4SAHHihw6ZOzg0QNjRgAG6KXK4CNEjBU/gDQI8kLISQAIADobAoMIzCINjLw4YvNkAno4kCRRUuNHESNLmDRxUjSjAlRPfECJImUKlSpMrFzBIqWqoKtJaWSJomULAy5XXrp4+QKGYcYFoCBEWRImi5gmY7CQyVLGriAGD2jEMHMmCxc0Xb6kUbOGTRs3N988gLM4jpw5Y+iwqcOGjZ07mE8yiGABz5c8c/Ts4cOnDJkybS7fdMO7t+/fvDMaCAQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-editpaste-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBBQWFDw6FHRuFGRaBFxSBAQCBAQKBCQiBIx6HPz6/NTOfKyiXDQuFOTm5Pz+/Ozu7PTq5Pz63PTyxNTOjKSeRExGLMTGxMzKzNTS1NTW1Dw2NKSmpKyqrKSipJyanNzWlLy6ZLSuVIx6FISChIyKhJSSlCQiJLS2tDw6NDQyNCQiFCQmHBQSDGRiZHRydGxubHx6dGxqbFxeXGRmZFxaXCwuLOzq7KyurHx+fDwmFEQuFCweFCQWDBQODBwaHBweHKSinJSWlOTi5JyepHR2dDw6PBQSFNze3ERGRIyKjIyOjISGhPz29Pzy7MS2rMzOzFRWVHx2dHxybDQiFPz27Pzu5PTq3PTm1NTCtJyGdHxuZHxqXPzq3PTaxNS6pFxWVFRKRNS2nPTi1PTStNSulNzOxNSynMymhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCgwABAgMEBYSLggaOjgcICQoLDA2Pj4MGDg8QEZ4FDxITFBUWFxcYGRobjQ8cHR4fCQ8gCyEiFSMWJCUkJieNEB4dKB4pKissK8wrLS4vMDHBAAYQHx8dFx0fJDIzNDU0M+IyHzaNNyg43Ng5Ojs7Ojw9Pj9AMkCNDiZB/h9CSOx4QLCgihItqBkYgqIDESElitAYWJCgkQcXjjRCgi1Ihw4BB5LAQOLCgyQYHihpUU3DBw5ElpAgAYNixSRJjKjQaECDCRPZPDB5IbIGSQwKLnh4wbInLA4kmJB4oaPiAwVNnER40hRK1BIAaVatUZJEFCkmpmjgCeWDCalFe4q4oFKwSRUrEa5gycLzwq8lUnPQ4PEgSpYcUZ5o2cIlS1O/JHLEDdfjQZMIVrpgweLFy5e+M6WSmBGlxYMYYBRzCaOFi5imHWBIfOEiShLTVjaP6eyFTBmN1TA5OvLDjJksWb58OVMGDRqWjAYdmU79SIvpjqJr104nEAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-editshred-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBFRSVExKTERCRDw6PDQyNCwuLBweHBwaHAwODAwKDAQCBExOTNze3NTW1MTGxLS2tJyanOze1Pz+/Ozu7BQSFCwqLDw+POTi5MzKxPTu7LyyrIR+fCQmJPz6/Pz69Pzy7Pz29OzaxPTu5PTq3PTm3My6pPzu5PTq5NS+rPTm1PTi1PTezOzWxPz27MyynOzSvMyulOzOtOzKrMymhOzGpAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbpQIAwIBgMCAXDAZFQLBbCqJTRqFobjgdkEYFKowPJZEyeUBqVR/crHDTKZYplovZKCW84+YKZZNZSBXl6EwEEBhVPXxZihGMaGRscdkIdg4QeEnVfCH2OHyAhIhuUAAiXZSEhIyQlJqWnjiEnKCWupRWoYyEgJK0SKaUKjam0JCorLMFfC6iqx8giLa/MGAsT1wsuCyULKwssC9RSzdkfCyALKuALLQsvpeXYIQso3gsiCzALMfENC+dGcMNHUAY/f+jq3ctncMYCGggFrsvHcEGNh/EyPFmg8cmrJxAVkVO0EUDJklHoBAEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-edittrash-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBERGRExOTDQyNISChBQSFCQiJCwuLPT29Nze3GxqbDw6PGxubHR2dJyanLSytJSWlJSSlOzq7Pz6/Nza3Ly6vFRWVBQWFIyKjMTCxHx6fIyOjLS2tOTi5PTy9OTm5Hx+fNTW1KyurKSmpJyenExKTMzKzKSipFxeXCwqLMzOzKyqrMTGxLy+vHRydBwaHNTS1DQ2NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAb8QIBwSCwaj8KAMoA8LgUDQsFwQByay4RiwWg4GA9IRGk0SCYJSsUCsVwwGQ1EsmESD5xOp+L5gDwhBRIZDhcDdkMGDgEiIxAkJQ8Ok5MmAohDAQ1xJxUlKCUlEg0pKpiZJRoLCxmtCw1eURhOcR4rbQ8cGRwLAwgGtBYTDywtGRKjvQTARgEZLhMcKC0OrQMvAirMRc7CHCTU1g2+20TO0NIn1RwDCya/wdHT1Rnt5LToKOq79trx0tR02YPX7Jm8fRxMOIhSLhOJE/LCJSTlr5kFEBQsWDiR4UGGBgsuHDg1BEYAfTE6oEBR4AIBAiS5yWBAAAGBAyaPGAgCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-encrypted-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBHRudFxaXExGTERCRAwGDGxubPz+/Pz2/Ozm7Nza3NTS1KympFRSVHR2dNTO1JSSlKyqrKSipDQyNMTGxDw+PLSutKymrMTCxAQCBHRqLBQODJyanDQuFFxSJFRSJFRGJERCHExCHISChHxyLEQ6HGRaJExKHLSmbLy2fOzitPz23KSiZHxuNHxyNJSOTNTOnMTCjLSudKSaXJSKRJyOTOTetNzWpHxuPOTi5MzKzLS2tFxWXOzq7Ly6vOTe5Ix+RLSqdNzSpLyydKyqbKyiZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4IBAgMEBQKEjI0GBwgJCgsMDY2XjwkOAgQBDxCLl4QNCaGCBBGWooINCAqqrBKgqwATFKaDFRYVtBMXsIMNGBm0GRADjQIJxKIaGxwdHh8gISIhGyMZzIwkGholJiYfJiAfJyEZISDbg90oKCkqKwcHKyooLC0f7IIuLzD2YMSQgW8GDRri+AFoUMOGvRsxUhSsQQPHvmQSchyQtEAHhh0WJHDQcJERjwsKDvRI0BGDjwgicXhQyCOjSgUKPO6AObIkIQESfmxk6REDT4s0bfaYpDNkT4VAha5s+TLmzEYtatwIOHAiDZIKNQAJYk9IjCFEisyoocFEB4UACtBpm0t3LiEsgQAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-eraser-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBMTC/AQChAQCBISC/PzCxPz+/MQCBIQCBAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARfEMhJKwhi2F0DIRnHeR+oiRRZmqikrmD7wgI6r+EI4+d2l7lNwWDYsTiFw4FI61mSymXxE3xGo8xqBXpVGrQUbveAcG7H0bKowEar12wx2SyMp+lI+7s1ie/5fX8tBhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-exec-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBAwKDAwKBCQiHNze3AQCBBwWFDw6NPTy9PTy/Dw2NKyytOTi3LS2tMTKzMzOxLy+tLy+vBQODNze5NTS1JyalIyCbIx6VIRyVISGfJyelOTq7EQ+NMTGxKyurGxeRLyKPOSmROSuVOy2XOSiTLzCzNTOzDw+NCwqLHxuVOy6bPzGfOSuXNTW1LSyrMSWRNymTOSmTKSCTPTGjPzSnPzWnMyaVBQSDMTCxPz+/KyahNSeRHxeLJRyTPzmtPzarOy6fJyajNza1Ly6vLyulFRCJPzirPTOlMS2pNTSzMTCvJyenBQWFNzKtPz6vPzyvPzqtOzGlOTe1AwGBFxWTLy6tPTm1PzSpPzutPz2xPTSnOTSxOy2dPzapPzerOzm5IR+dPzu5Pzu1PzqxPzy5Pz+9GRiXGxuZKympHR2bOTm5Pz6/MzSzBwaFJSSjCQmHPz2/AwODAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4SFhoeEAQKIjIIDBAQDjYMFBoMHCAkKgwYFhwULDAUKCg0ODxCkBQgRnoUSExMUDxUWFxgZGpAbFIuGHB0eHyAhIiMkIB8lJieIKCUpJCTGIyorLCktKIUDpC4YLzAxIjIyMzQ1NhgdpJI3ODktJTowOyM8Ejc9Pj9AQUIEclAocCMIBQhDiOwgoaKIoCI+jBxBkkSJkCWemIyq0GSHCBVHihRx8gRKFCmpKhGaQqWKFYZXsGR5kkXLFgRUXBUqkCGCFS5AjnTx0sXKlyA6CRVgAAHMAilhxIwhU6ZFkBY5kgKYUoXBAzMKzixZ4AJNGgVm1KxhM0WpmQpUMtooaOPGxAM3Nw60oYLGjNYCbzYJOgAnRzNBJ95oPYQCgpJtkwzFoULlRuRPiy9fNhAIACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-exit-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIEAAPwCBAQCBHR2dDQyNCH5BAEAAAAALAAAAAAWABYAAAJOhI+py90RnIMyRUOxhDfzJkACdoXBuEDDkQFDi5go0MrKx16kns80b7qdELCgBYaEGWwL5nG1ePFiKp9A6kuYRNuho8vxVrrZivmMRtMLACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-fileclose-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBERGRERCRDw6PCwqLExOTFRWVHRydGxqbGRiZCQiJISChIyKjHx6fDQyNBwaHJSWlKSipBQWFJyanPz+/JSSlCQmJAwKDCwuLBweHBQSFGxubExKTISGhDQ2NFxeXFRSVDw+PAwODAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbZQIBwSCwaj8jkMSAYDAgEJbFgOBwQCUOAoJAaFgvGonHIBhyP5BcSgUAYDWxggD4WFmx3e3HQngkSRgYMEBMUFG4MCId0BGlEAQeEhocVDYcUdBYKF0QCB3gRlJgUAQEYBBkaRAMbDZMMpAYcT46rQwMJrgsdC6QcfwoPnUMOBgkIV6SHHg6bw0QEAQYfBpggBZjPGsRD0gEchxwCIR6HChnQRQ8DIU4DTR4Em+ncRw8O+fmoXPXdRg+gQLFgIYM/KRIkoDP4QMKFf0o0aBAh4qGUixgzCrETBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-filefind-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBBQSFJyanLS6vLzCxISChNTe3OTu9Oz6/Nzy9Nzy/NTy/OT2/Nzi5Mzu9Lzq9KTe7LTq9PT+/Pz+/Nz2/Mzu/Kzm9Jza5HzK1LTi9PTu9IzW5ITO3FxaXNT2/KTi7Iza7GzC1LzW3FRSVMzO1MTq7HTS3Fy6zFS2vKzm7Lze5MTGzHzS5FTG1Ey2xEyyvJze7JzW3ITa5FTK3EymrGS+zFxWXKymrMzi7ESirEyqvLSyrKze7MzOzMTCxKSepAz+/NzW3MzKzBwWHLzS3ERCRAzi3KyurNze3MzGzLy2vLSutCQiJAyytHRydOTe5MTGxLy6tLyqpKyelJSCdOze3NS+tLyupLSmnKSOhCwuLPzy9Pzu7Oze1OzazOTOvMyihOTi5PTm3Pzi1PTazPTWxOzOtNSunDQyNPzy7Pzu5OzKrNzSzNzGvNS6rMyynMymjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCgwGFhYOIiYQBAgMEAwKHiokBBQYHCAkKCwwFAZOEBQ0IDAsODxARCZ6gAAEGEhMSFBUWFxgZCJ+TjBoMEpkRERscGBGRih0BBAgeFBQOER8gISEfIruIIwEkCCUVwhcgJicoKSrZg9srCRkRGdMsLS4vMNiK2wIKMRsbMiwzXtCocSydIBs3AuCIwIFDiBMucugAoWvSiB2VNPDg0ELHwA0MkCXr4aNSggg8NoDIQOFHgBtAkgURMiDAEAFEVBCJFKCIkSMGOyDRkETJEkOFmABoUsRJQkQdnkzQACWKlBtTplBR6qopxkFRJ0ytYuWKFCxZtBBq+hRA2AlbRrh08fLlCxi1a51g+dQhDFwuYsaQKWPmDBpKXgNETaNGjJgyhNfcVdTTiWI2XpK0cePmzRk4YA5T5otGixY0qFOXbgXAQCAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-filenew-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBExOTERCRDw6PCwuLBwaHAwODAQCBOze1NTW1OTi5Nze3MTGxLS2tJyanPz+/Ozu7OTi3BQSFCwqLDw+PDQyNFRSVPTu7MzKxLyyrIR+fCQmJPz6/NTOxPz69Pzy7PTu5Pz29Pzu5PTq5PTm1My6pBQWFPTq3PTm3NS+rAwKDPTi1PTezOzWxMy2pPz27PTazOzSvMyynOzaxOzOtPTaxOzKrMyqjOzGpMymhPTizOTCpNzSzNTGvMymjMSihCH5BAEAAAAALAAAAAAWABYAAAboQIBwSCwaiYGAYEAgFAqGg/Q4DCASCsTiymgcHAcqQLB4mM+QiIQBppLPcMjkwQ4bB2X4maKgt4sVCHpnFhQTElNFE3mDDxcYGRp2RBuMgxwIHX9EBZZwHh8gCBmTQ52NISEiIyQlpUImng8hHyInKAgprwAqgnC0IKwrLLpGB4wctLYkwy0uuwd9Z8AnJywsLcVFx2YcL7UnJCwwLTEy0GXJoSgrCCwzNDTnxgjeH9UrKzXwNDY36LRGhEOwLx4NHDmgJbh3QoeOgv127EhojEeHDj16pEhRQoZHHzl+QJNCsqTJSXaCAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-fileopen-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBAQCBCQWDCwaDDwmFPSubPzGhPzCfPy2dOSmZPzKlPzSnPzOlPzKjBQODPzChPzWnPy2bPSmXPyuZOyeXIRSLEQuFEwyHEQqFDQiFCweDKRuPFRSTPT29PTy9Ozq7OTi3Nze3NTW1MzOzMTGxMTCxLy6tLSytKyurDQyNMzKxOTm5OTi5Nza1NTS1MTCvLS2tLSyrKSmpJyenJSWlIyKjHx+fFxeXBwaHKxuPMzKzLy6vIyOjHx6fDw6NPy6dGxubLy+vISChCQmJNza3KyqrBQSFLR2RKSinJyanGxqZAwGBJSSlCwqLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4SFhoeDAYqKiIeLj4wBjQCMhY+NkoiLk5qbhQIDoJyGBAUGBwgEo4MECQoLDA2pDrS1tKQPEAwHERITE77AvxKqhAQNDA8UFRYXFs8YBAQZGqGPxw0RGxwdHR4eHyAhIiMkJSYnKCgpBAYPEhcqHyssLS4kLzAxMjM0NTY3cBA4UCAHBw8gVnhgEcKFjhc7UPDj0cMHAAI/KFgY4YLFio/jRpTYsW8GDyCSCEQw2DChOHIqgsCQSEPIEEEEJFhAoUNECCJEyOk4d6KIyRtGcB7hIJKjixEjHu4oimSGEIs4d8IIUoKECnNB0ElMwkNJJgBLlJBAcQKGiR07KGAURVGViY0mhIwwSTKjr99+THjUoIg0r48hTRIrRtxkiOMhDgrZCQQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-fileprint-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBFxaXDQyNFxSTPTizOzi1FxORDw2NExKLPTi1Pzy9Pz6/FRWVPz29Pz2/PTy7PTu9OzezPzu5OzavAQCBPzy7PTm3OzazOzKrPTu5FxSRERCRGReXPTq5Pzu7ExGTMS+xKSmpOTKpPTq3JSCDNzSfHRydLyadOzCjOzOtOzSvLyyTMTCxKSipGRiZFROLPz+/KyurJyenJyWnGxmbLSabOzClOzm7LSutJSWlJSSlJyanGxqbNze3OTm5IyGjNTO1Nza3NzW3OTe5IyKjHx6fMzGzMTGxMzOzNTW1IR+hISGhKymrLy6vLSytERGRGxubKyqrLy2vLS2tDQ2NEQ+RASKBAT+BFxeXHRudAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4QBAgOEiYqEAgQFBgcGi5MICQoLmAQDh5OEDA2YCw4ODxARApKUCaGYEAsSCRMUnQysCwoVEhYXGLOLCBCgDqK5GQUXGooCAhscBB0euBUZEAUJvQgIgx8gIR8iCSPiHuIFEREDJCXaANwhJhsnKCnWERcRKiopFCvsBywhQrRwQWGAPAz5EhpQ9wIABRgKYsiYMTEEDQocatiwkUIEP18fbkCAAcMBjhwzdOyQwYNCgBMfKJSgMItBjxs+btwgCSGGjhw/ZoRgQKGZCRMUPgABEgSIkCE3SZok8qNqkR85NtDUEcPIkaVAkCR5SrJBDCVKlmzQ6pCCiRlMTJo4YUH3K5AeMBYYWctW0BOaUH60cBJFypQmII6wyEpFQBVFMSm4UAI3hJUrOGh8oOJrklYKWIromJGDR99Ogz5j4ZGlM+pEnwmBCwQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-filesave-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBGxqbAQCBLy+vERCRExKTHRydIyKjMTCxFxaXGRiZFRSVFRWVPz6/Nze3Nzm5Pz+/JyanDw+PExOTHR2dMTGxBQWFLSytHx+fISChOzy9Ly6vAQGBJSWlMzKzAwODJSSlHx6fIyOjOTi5DQ2NISGhGxubCwuLOzq7ERGRFxeXNTW1CwqLPT29Dw6PGRmZKSmpAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAb/QIBQGBAMj8ikUDAgFAzKKCBwQCQUCcICKh0SEAhGw5EIZAmBrgCxeDQgcDJWyz0GIggJfL+XGwQJRxNgC3yGDwwUFUZDFhdthnwMGAZNQwEZFwQakXANBBQbHIIdERIBnRAOiR4ERx8gsSEMBBmGCyEGG3YGBwcgIr8UCwQHECOgG4xCtRkEJAvBJRklJgkSFBQeJ68hJiEoESkFKiEZIbkGARsLlwEGExENGhorGSkpFAYm66NDLAECpGiBYsUIFA8wLHBBQMWLVkdUCFCwaYVFBOymkVCgYEMgOykEpICBccMBAhhELFigTEqAAgIIwCiQ4eRKDyS6EAlJIAI0EpaudF4iIKDAAn9CkRT5eMROEAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-fill-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIMAAASC/AQCBMT+xASCBMQCBASaBPyChASyBATCBPwCBARmBAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAASCEMhJq704axB2DkLnVeAwiCNHDMWZcsbaul5ZyCaKBcZwFDcgDRNbHX7AmW4SMx2MSOFQQlitEAhosrVcDQQE7NMXzVGqA6xAgCUckabQpJoIYBFsxBspUKBiHQEHaoNvBQJTgBIBdnh5B4hLihONeJBTc0uMaphMS4uRGQYfny9EEQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-filter-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBAQCBAwKDMzKzMTGxNTS1MzOzAQGBLS2tLy+vKyqrLSytLy6vMTCxBQWFKyurCQmJBweHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAV7ICCOZGmeaHoGbKuOAjsQhVG764EgyT7YhaCBVQogFMhFImEABoUBknFxRDAazac2Kg00djystkA0sQ4BgzgYK6+Ch/bBseOmAmMD4gF5ifBCDwoRfiOABgyEhYYFCA6LUo19kH+Nj5QAaQh2kHibmJkFBJydpKCnfnYhACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-find-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBBQSFJSWlFxaXJyanKy2tLzCxDw+PHyChNTa3Nzq7Nz29NTy9Mzu9OT29Nzi5Oz6/Mzy9Kzi7Jze5Lze5Nzy9JyenIyKjHR2dMTu9Kzm7JzW3ITW3ISChGxubERGROz+/Lzq9IzW5HzK1LTm7FRSVHTS3GS+zLTS1DQ2NMzOzMTq7Lzq7ITW5FS2vMTi5ExOTKTm7EzCzEy2vEyutJTa5FTK1ESirGy+zMzi5ESerESmtITa5OTy9KTe5KyqrAz+/Azi3ASutERCRExKTFRWVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCggGFhYOIAAIDiYUEBQYFAoeJAweKhAgJCgsLDA0OCAGJg4wBCA8QDhENEhMUFaKDFhcYgwEJCxAQDBkaGxwSFaMAFh0eAx8AAQIKECAODCEaIiMjJJMAtQMlygEGEBkVva4mJycTKKMYJd0pyyoOKyssGhMtIycuGi/EMB/vlhmoQEFDjHsmZMygUUMdqWUCGgCbYMKEjRk3cEjI9jBADg3Wzs3QsYOHA2IdO1SQkI/GjRMtFhBA2RFBDwk+OASrMPMHkIe3AhBA8QLFzAAHgvyg2dEQMSEHPCwltQgooSFSmVpSxKjjh6wPtwINgHVqsVpWESEFeywZ17RkED2s40YEgFirlIq4SwvUQCAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-finish-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAw2VAQCBBxCXDR+nIS21Aw+XJTC1Nzu/KzO3Pz+/Nzq9Pz6/MTe7KTW5FzC1Nzu9CRKZMzi7IzK3Lzi7LTe7HzG3Gy+3AyuzAyexFzC3DRSbHy+1Dy61CSqzAySvAyStLze7IzO5AyGrEze7BRmjCTC1ETS3ETa5BTC3Bx2nAyWvAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAakQIBwSCwaj8hkMqBsBgTN5IAAJQqqykCBasUmDQcEV3gtBs7oATihGJeJgcOCQWc0HA8Ig/seRiQTFAsVFhcYGRp6VH1CGwscHQ8dGB4fIBkPIWKMAAMLIiAjIJcgH5gkGSWcARIiJicoJikpHikoHqqrKiW8JSogKymoqgCrV8cCARgkuFWcRwYeqVjPRgEExEPVRQbZ2l5IBuBRQ0zk5+hRBkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-folder_new-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBNzaTPT2FISCBCQaDPz+BExKBDwmFPSubPzChPzCfPy2dPz6BMzOTAQCBOSmZPzKlPzSnPzOlPzKjBQODPz+rPz+3PzWnPyuZPSmXNyaXPTyhISCLIRSLEQuFEwyHPy2bKRuPFRSTPT29PTy9Ozq7Pz+xJyanDQyNPzGhMzKzOTi3Nza3OTiVBQWFDwqFKxuPOTi5JSSjISChHR2dGRmZFxeXPS2dNTSzNTS1OTm5KSipLS2tLSytKyqpIyKhGRiZNze3NTW1MTGxMTCvLy6tIyKjCQmJMTCxMzOzMzKxJyenHx6fLR2RLy6vJSSlHx+fDw6NLy+vIyOjAwGBGxqZKyurCwuLBQSFJSWlCwqLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4SFhoeIiYqLjI2MAY6HAgOHBJYEhJCDBQaDmgcICQoLB4MGDA0OAQUBDg2cAAcPEBESE6QUuQasFRYVq5SxCRcSCggYGRjIGgYbFs8bHIMHExIJGR0eHx7cB83PFhsDDuTUEyAhIiMjJCQluwEmvsAnKAcp1x4qKyUrLLupWrByxcnFiwQIYIggEaNEiRgBZMyYQaNADRs2REA6cCODBxw5+OnQgWMHjx4+BND4MQOIg1gI0gUREkTHiplDhhApEoCGkRlHBL3I8MEHEhz+WAhJogTJySVMfthwIehAExE5jubAkYQpESc8fOx4AiXKNA8+ekhBgqSpzh5hPHcsmVLjpSAqVZBY6VGkiJMiPQKLnTvjCiEsWU4o3nGC8YksMmT8YCmC6iAXKLRc2cz5yGYtR0JjKWQgEAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-forward-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAw2VAQCBBxCXDR+nIS21Aw+XJTC1Nzu/KzO3Pz+/Nzq9Pz6/MTe7KTW5FzC1Nzu9CRKZMzi7IzK3Lzi7LTe7HzG3Gy+3AyuzAyexFzC3DRSbHy+1Dy61CSqzAySvAyStLze7IzO5AyGrETa5ByixBRmjCTC1ETS3BTC3Bx2nAyWvEze7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAaYQIBwSCwaj8hkMqBsBgTN5IAAjRoDBaq1aDggtMuAWDzoJhTgY+CwYLgZDccDwkgXI5IJZVGxXDAZGnR2QxsLHB0PHRgeHyAZDyFfVUQDCyIgIyCPIB+QJCUmlEMBEiInKCQnKSkeKSQeomoqJrUmKiArKSwZsmoCwMEBGCyxo1EGHr3HUQEEvltCBtDRAAbMW0zV29xDBkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-frac-22:actions actions22 22:photo:22 22:R0lGODlhFwAWAIIAAPwCBAQCBAwODAwKDAQGBIQChAAAAAAAACH5BAEAAAAALAAAAAAXABYAAANICLrc/iwEJSEUQA45LcOKMHWeU5XWiUYZsZClOIjj+naqrS9F7/9A326YCYBypREOpMPBVifjkBRw7SpIG+eJIg2IWC5UikoAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-frameprint-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBFxaXDQyNFxSTPTizOzi1FxORDw2NExKLPTi1Pzy9Pz6/FRWVPz29Pz2/PTu9PTu5OzezPzu5OzavAQCBPzy7PTm3OzazOzOtPTu7ERCRGReXPzu7PTq5OzKrExGTMS+xKSmpOTKpPTq3JSCDNzSfHRydLyadOzCjOzSvLyyTMTCxKSipGxmbOzClFROLPz+/LSutJSWlJyWnOzm7JSSlJyenOTe5OTi5MzKzASKBAT+BNzW3OTm5KyurMzGzMTGxMzOzNTW1KyqrLy2vERGRGxubIyGjLSytGRiZISChAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4QBAgOEiYqEAgQFBgcGi5MICQoLmAQDh5OEDA2YCw4LDxARApKUCaGYDwsSCRMUnQysCxUKEhYXGLOLCBCgow4VEhkFF6mMAhobBRAcChUVGR0FCR4UCAiDHyAhHyIJCRAjHOUJEREDJCXcAN4hJhonKBjXESn5Kdkq7wcrQoRg0YLCgBMuRFxIwTCFgXYvAFCA0SCGjBkYQxQMUE8EBhEUVPj6QOMBDBgLLM6oYYMFhYkvYcSkwOAGDho3TyqIUaPGyZ9AKXzIoWMHDx44bvQ4+WAi0KA1fPwAEiTIjyBCkDp9KlMiBRMzhhAhsqLsD64/fQEo8tLIERZIH8Ru5arow8skSmTMDdpJQ0y0XTsJ2gtU8GCZMBMbCAQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-funct-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAI+hI+py+0PIwhUohpMXfl6103h1nTUNproEU6am62v1pLsPX/siO9Jiou9TD2XyHfMGUs65aVmiUqn1CrCUAAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-gear-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBBQSFCQiJERGRBwaHFxeXHx+fDw+PGRmZExOTGxubKSipDQyNHx6fIyKjJSSlJyanISGhISChLS2tIyOjHR2dAwKDAQGBJyenAQCBCwqLLy+vKyqrAwODMTGxKyurFRWVLSytLy6vMTCxMzOzGRiZNTW1CwuLMzKzFxaXJSWlOTm5Nze3Ozu7OTi5Ozq7GxqbDw6PHRydAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAb/QIBwSBwGBMVkMjAgFAwHBFJpPB4SiQJCsWAQqEJB4prdNhQNx7QYIFwLD0ikQZdMHgelOPGYULQVDg4QEAVfRAEBBwUTEE0WFwcYhAuNF0QDBQULDwwZGUIaEAuVGxgBRAIFEhwHHUQMCxwTHAVrAAwFFRwKFkQZsxseDqBDGXMSHwfFQiAhIiMeJApEBwcOcahDJcLSJCYcGkQKcRAnQhkF0SgmEykHXkObox8q1iEjKN8rENqYD7MmeBCmzwSLFS1I3AqzYIPDESS+sWCxgQMLEgOSJKjozeAKFyskCDigQFwSBhJMjDDhAlyLFyVA+dIzAUUKEi0eaNhAIg8YGiEMenkwASNDDBkLqRQAEEAkup9KDkEFgC4IACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-gohome-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBAQCBCQiJNze3ERCROTi5MzGzLy6vDw6PKyqrKyurBQSFGRiZGxqbGRmZISChEQ+RExKTExOTHRydDQyNOTe5FROVLSurCwqLMTCxPT29Pz6/LSutFxeXLyytLSytPz+/JSWlKympPTq7KSipNzW3BwaHHx6fKx2VJRWNHQmBFweDOzq7Ly+vNTW1JxWNLSajPTe1Ny6pKxWJNTS1IyOjJRmbPTi3OzKrNSSXMSGVHQiBHx+fJSSlPzy9IxOVOzWxOSyjNSCPLxeDJyWnIRGTOTGtMxmDLRWBHwqBIxGTLRSDDQuNNSunKxKBGwyNMSafMxqHMReDKRGDPTu9LxuPLxaDJQ+DIR+hGQqNIQyBGQiBNTO1EQKBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4QBAYSIiYQCAwQCiokEhwACBQYHBAiQhAiHlQYJCgkEC5uCkp8MDQ4NDwylmwgQlgQRERIEBBOkmxQVBgQWFwUFFxEEDLyJGAUZtQoFGhsFHLYdyoOVHsEf0SAbIAUex8mwlAUhtSIFG+3uIyTWvAIGJMEkJe76GyXbEeWUBJg4USKaBhQpVKzYoIFFiwYUBBJa8MAFCw0vYMSQMWOhBhoTKCQSUKMEiw02buDIoWOHBg0GeIhEFKAHDR8afgAJImSIioYliMws1MPkhiJGchxBkmTDCBo1hg4KQMTiBiUyhBxZ8pNFiR5MEtU0WqSJVidJNDyNKraHC5xPNKBEkTLlJ5WvUgWNvfikyhArV34+7ZEXQAAsB2iUyHLlihYtW0pwOYAFgyJDmDNr7jIIWiAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-goto-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBBQSDAwODAQCBCwiHDQuJExCNFRCNAwGBDwuJEw+NFxKPBQODEQ6LFxOPEw6NCwmHDQmJBwaFCQaFEQ2LCQeFDwyJBwWFDwyLDQqJAwKBAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAWSICCOJBkEQqmWA1EYR4Gsq5Aoy2EYKU0yDcPCkSP4SgShw2FoDI6jQeNxYD6MUBFCEXxAelkRgxCRhEWQiW/wXE2CataAUmiXKo+Fwg6YWxQWfCQEAxckUgoYDRSCR4gKB4ZnFVwUCgUMZ30KCRQUhJpzBRQQjUcSnmyaM32mPgQNmZpRBwmSsxAZBBqzUa4iBiEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-help-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBCQuNBwiJAwiLAwaJAwSHAwSFIy+3ERynCw2PCQuPAwmPCxOZCxWdJzG3FSazBwmNAQKDAQGBDRmhBQyTDxujDR2rIy21AwWJDyGxCxmjAwmNDRihAQOFDxmhCxunBQWFAwaLCRahDR6rESGvDQ2PCRWdDRunDSGvCRSdAwWHCwuLDSOzHSmxDyKxBxCZBwqNHSu1DyOzAQSHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAahQIBwCAgIBAPCoGAgOoeBAyKhWCwYDUf0CX1AIhLiJEGpBLiAAaRxdgYsl7Ybk8igBZoN5xmAdDxoanp8HyANISF8EBsiXBMjJBolBEQmGHFoRScbKHIKDykqK5lFAZRCnyknTaROLA8tq61OChgtKqyzQgEYEJi6UC4vI3LAASkbMBPARAEBdszR0sACEaPSMTIQM8W6KzNl3bo0NOJDdEEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-int-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIIAAPwCBIQChAQCBBwaHAQGBAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAANJCLrc/iDAuYKlU0r8NHfXB24iEyrCIAjAynakQLQuDS+vrTcnI1M9HyaIykFOKwUhZ6zEWC5oU9GrRY+kkqdUiXCdWW74SzYkAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-leftjust-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAIihI+py+1vgpy0Tohzs1T7z3CiBJbQWJnqg4rre7jwTBtGAQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-locationbar_erase-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIEAAPwCBAQCBPz+/AAAACH5BAEAAAAALAAAAAAWABYAAAJChI+py+0PX5i0VmbzVboHPgmCJVoJJY5haR5VGsCa+6ZqZ2Sy95E2n0OVdi2A8EacIIS+YpC3WUIpi6kygs1qsYYCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-lock-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBHRudFxaXExGTERCRAwGDGxubPz+/Pz2/Ozm7Nza3NTS1KympFRSVHR2dNTO1JSSlKyqrKSipDQyNMTGxDw+PLSutKymrMTCxAQCBHRqLBQODJyanDQuFFxSJFRSJFRGJERCHExCHISChHxyLEQ6HGRaJExKHLSmbLy2fOzitPz23KSiZHxuNHxyNJSOTNTOnMTCjLSudKSaXJSKRJyOTOTetNzWpHxuPOTi5MzKzLS2tFxWXOzq7Ly6vOTe5Ix+RLSqdNzSpLyydKyqbKyiZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4IBAgMEBQKEjI0GBwgJCgsMDY2XjwkOAgQBDxCLl4QNCaGCBBGWooINCAqqrBKgqwATFKaDFRYVtBMXsIMNGBm0GRADjQIJxKIaGxwdHh8gISIhGyMZzIwkGholJiYfJiAfJyEZISDbg90oKCkqKwcHKyooLC0f7IIuLzD2YMSQgW8GDRri+AFoUMOGvRsxUhSsQQPHvmQSchyQtEAHhh0WJHDQcJERjwsKDvRI0BGDjwgicXhQyCOjSgUKPO6AObIkIQESfmxk6REDT4s0bfaYpDNkT4VAha5s+TLmzEYtatwIOHAiDZIKNQAJYk9IjCFEisyoocFEB4UACtBpm0t3LiF4gQAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-lsub-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIEAAPwCBAQCBIQChAAAACH5BAEAAAAALAAAAAAWABYAAAI9hI+pe+EPHTNhgjox04srn4CI2FgkZaaZurGd+5nRfAiCYVuJzfN6jbvdfrshEZE7ApNGXa+nZDaVVIOhAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-lsup-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIEAAPwCBIQChAQCBAAAACH5BAEAAAAALAAAAAAWABYAAAI5hI+pF2G9YpszKgcgtgtyuX2I44UcRYkM5qmWAMcyzAn1/eKRnfe7vuD9fEGgQlgkHo2JmRPpStgLACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-mail_forward-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIcAAJR6fIxydIxubIRqbIRmZHxeXHRaXHRWVGxSVGROTFxGRFxCRFQ+PEw6PEw2NEQuLPwCBJR2dLyijPTixPz69Pzq3Pzy3Pzu5PTu7Ozi1LyelOzavPz+/DwqLLyafPTmvPz67Pz29Pzy7LSWlPzmzPz6/LyajPTitOTSzMyurPz25PTatPTi3KyOjPzuxAwqVDQiJHxiZPTetKySlPzqvPz27BQ6bAwmTPTexLyinNzGxDRunPzy5KySjCQ+ZNzq9KTO7JzC3Nzq/Ozu/LzW7FSm1BR6vGSWvFyq1AyGxAxytAx6vBSKxAxSjMyujLSunES+5BSi1ByGvAQCBNzCrOTaxNTOvMS6rKyelCx6rBx6tBQKDOTWvPzu1PTq1OzezAQOHAxGdBROhAQGFPzy1NzOvIRqXLyynOzarPz21Jx2XPTWrLSShAw2XKSCbPzuzAwePAQCDPzyzPzqzPTmxOzWtAwGBKyObOTSrNzGrKyGbOzatEQyNKyCZOzWrOTGpNS2lCweHCQaHCQWFBwSFBQODAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABAALAAAAAAWABYAAAj/AAEEEDCAQAEDBxAkULCAQQMHDyBInBhBwgQKFSpY0HgBQwYNGzh0mDhRAAUPHziACEGBpYgRJDiUGEkSwoCQJk6opNASRQoOFETQJDkggwoOJlYApcCihQuVL2DUhBDjhIqjJmRwwDCDhswaNm5MjYHjKggOOU7o0CGTA9gdYknG2KCCBw8VJVL0uBgihAUfP+CSNGCjsI/DiBPbAMJBsEQbQYQM+UG5smUiRYw0jlvYxhEkSYyIHm1EyRLTTH40EZvAyZPOR4pAmU07ipIkUKQ0mQIhAZUqVq5gKXzkSBYtyLVEyd1ki8QFXLp4+WJFQowbYLJnD5NbzJiJCjaQnhnvpYwZM0/OPFlvQ/f3iQvQpBlvQc0aCWy4VKnCpY0Y5yQxgEYXZFjghgwZUOHGCW90YQEccUwloBwGyjAHHXUoSAMZb0xhx1QOoMHDHSfIwSEOdTjhAQ1d4MFbTQ6Q4MYacrzxhhx04JCHHhvQsMeLJPHRBxpr+LHCGnusgccfgKixQR1ATtTBlDDAEIggggxCCCGFbLGFHVFKZEdAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-mail_generic-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBDQyNCwqLCQiJBwaHBQSFAwKDAQCBDw6PPz+/Pz69Pz27PTy7PTy5PTu5PTu3PTu1PTq1PTqzOzmzPzuvOzitPTmvOzivAQGBDw+POzevPz67Pz25Pz23Pzy1PzyzPzqvOTavERCRKSilPz21OTevIR+ZExKTOTi3JyanLS2tPz6/Pz65KyihJSKbMS6lExOTNTW1JSWlJSKZMSylNTOrNTKpFRSVPz29MTCxPTmzKymjIyCdOTWxOzexOTWrBQWFFRWVOzu7MzKxJyalOzatLSulMzKtOzmxOTarFxaXKyqnPTmtIyGdIR+bOzetOzixBweHGRiZOzm3NzWzNzSrOTetGRmZOzizOTexOzm1JSKdGxqbHRydJySdHR2dOzapHx6fKyijOTixCwuLHx+fFxeXERGRDQ2NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4SFhoeIiYqLAQECjwORAwSUBZYFBpkHmwgJCgsMDA0OD6UQERITFBMVFhcVGBkangq1ChsLGxwcHQ0dHR4fICEGIiMSCbS3uLq8wCQUJSYGJygpKhQJKyvLLM4Nwi0uLwUwDQsxMtmeuQveHR8UMzQ1NgU3Dgo41jk6ns0cKOzgYaOHjx9AgjTAUUvIECLZNmxoUISHkSM9KiBJQkCJA4kKEoBQoWJJAiYtmjh5AmVCsCJRpHzckKCCySlUUvBYUqUHDysSPnxIEuXKA5pPRiRwxwFLFhRaIEDYUoEChCcDuECoOWKFuwW7nHkg4WELkw8/BHRRwESpt10dU8SSHevlRxIBX6C0WBE27q8GZMkKbTADjIAwYlb4GLMYShYoPTRo6FGiSJEKPyzMIFMmzJcvXbhwkSLFjJkbQW6cOHNGhAgEAdAsmk27tm0ABgIBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-mail_get-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBBQ6bCQ+ZAwePKTC5Ozu/NTi9GSWvAwSJGSu3JS+5CR+rAQOHPTy/AyKzES23AwOHCw+bOTq/BR6xES+5AwmTBw6ZMTW9Ax6tByi1BRGdAw2XAQCBDQuNDRupKzS9FSm1BR2vBym3EzC7CSGxBROhNTW1Pz+/OTm5NTO1AQGFNzW3Ozq7Ozm7IyKjJyWnMzOzNzq9Nze3OTa5Ly6vCQiJGReZISChKyqrAwqVBRWlOTi5MS6xJSWlNza3OTe5Ly2vGxmbKymrIyGjMzGzISGhKSepCQmJDw6PHR2dJSOlPTy9MTGxLy+vLS2tMzKzLSutMTCxLSytKSipJyenKyurJyanCwqLCwmLCwuLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4IBhgIBA4SLjAABBAUGBwiNlY4FCQoLDJaNAQ0ODwsQnYwREhMUE5ylFYYRFhcYGRgaGxsDHJUdFR4SHyAhEyIjJCUcuo0cJr0nExihxgwoyYscKSnMHicOIw4lKissLdWDHC4vMCu9McYqMjMyNOUANTY3OPEoOTolDCszdrSgwaMcBxs9TMxYOCMHBx8zfPj48QNINQ5BbMBIIUShDIUoTAhR94PHPEEHbQwZckOGjBQviMxYUWQIDCMmdXE4gqRnkiFETAxR8iKFjJU2evZEdmLJkgJIbqS4wXJIUapImj5FtuSEVyRVV1IVi4RIChhEkLVAgcJHEqVwVJUmYdKkiRNkALMRecKECRG/ff8CEQJFCA5kMKJEoUHDCQ/HkB9LmWKECpUeyKoIMSLEyosen0OD7iH2xg1dV7BkqXGlBpbWNTq4Zn2khu0aAAwEAgAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-mail_replyall-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIcAAJR6fIxydIxubIRqbIRmZHxeXHRaXHRWVGxSVGROTFxGRFxCRFQ+PEw6PEw2NEQuLPwCBLyejPTixPz29PTu3Pzu5Pzy7Ozi1LyelPTavPz+/DwqLPz67PTetPz69ERCRLSWlPTmzPz6/OzexLyajPzqvDw+PDQ2NMyurDQiJPz23PTatJyenAQCBPTevPz25LSajOzq7HxiZPTexPz65JyanBQ6bKSmpBwuTOTi5OzaxBRCdHySvGRiZHx6fBQSFERGRNzq9IyOjHx+fGxqbPzu3BwaHFSq3Aw6XAxKfPzy3Gy63ByWzJzO7Mzi9OzavBRytAx6vCSazGRKTPzy1AQKHBRGdBRyrDy63ES+3Cym1CR6rBwWVAQSLAx+xCyCtBRmnPzuzAQWLAwePPzyzKSCbAQOJByGvOTWvPTmxBQODFQ6PPTWrPzqzOzatAwGBKyObLSWfPTivKyCZEQyNKyGZOzWrOzWtOTSrOTGpNS2lJx2XDQmJCweHCQaHCQWFBwSFBQKDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABAALAAAAAAWABYAAAj/AAEEEDCAQAEDBxAkULCAQQMHDyBInBgggoQJFCpkzGjhAoYMGjZMpMghQgcNFjh4mODhA4gQGkSIHAmBwAgNJEpo8KDSxAkUGjhMSEGz5gUVIiKs2PmBRQudHiwQpUnAxYsXImB0aBqjBcuoU0fKmPGChgUNH2qIqGHjg9u3bicWIFs2rYgbNnDkyGFhb8cccQ3ouJqWQo0dPFr0WMy4h48LFj4gsKriB5AeNngEaSGks+chPnwQOXFAh4oXRYxk9nAEyY7XO2wksWHDx5ATCDIoUXEBsYclTJo4cWJhuIjhSXacSPBEiZLMQY4wgRKluvXqUpyIsDElAxUqVaxcwcGCPQuWLOixaNHCZAsXBU+oqKDSxQqULF6ifNmyn/8VMOtxwcAK36kQRhdJQIFFEmKM4eCDYGyhhYAEkqFEGSuYYcUZLaDxXRpqSNRCEu6twYaFZXTQhgRd2NCCG9918AYELTjoXgNuKAFHB2RQEUYHVbQQRwlUpPHGGFwkyQUEDsgxx4lh9BhCBy2U8UQJcrSg5JIQ0FEHG3bc0QGYK+CRhx57PEGlkhM9sAEffKTQhx9+/AEIIIGoEUgLLRRFR0AAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-mail_reply-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIcAAJR6fIxydIxubIRqbIRmZHxeXHRaXHRWVGxSVGROTFxGRFxCRFQ+PEw6PEw2NEQuLPwCBMSihPTixPz69PTq5Pzy1Pzu5PTq1Pzy7Pzu7Ozi1LyelPTavPz+/DwqLLSajPTetPz27LSWlPzmzPz6/PTexPz67Pz29OTSzMyurPz25LyajBRCdPzuvDQmJOzexPTevOzq5BQ6bBwuTDQiJHxiZPz23Pz65LyinPzmvBxCbHySvAQCBOTi3OTq9CweHOzaxFSq3Aw6XGy63ByWzJzO7Mzi9OzavNzq9BRytAx6vBR6tPzy3AwOHDy63Ax+xCSazCym1CR6rBwWVOzizAQSLES+3CyCtBRyrBRmnGRKTPzu1MzGtAxKfAQWLAwePPTizMy6nByGvNzWxOzWrNzOtBQKDJR2ZNS2lPTmvBQODPTatKSCbOTaxLyqlAQKHFQ6PPzyzPzqzPTu1PTivOzWtKyObPzuzOTOtLSWfPzqvAwGBKyCZPTWrPTmxNzKrEQyNOzatOTGpJx2XCQaHCQWFBwSFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABAALAAAAAAWABYAAAj/AAEEEDCAQAEDBxAkULCAQQMHDyBInBgggoQJFCpYuIDBQgYNGzh08DCR4oQPIDqEmDBhJQYRIzqQIFkSAoESJCKkDGFiwgkUKTpMwECz5IASKjqsSMlSA4sWQjG4qGnzhYoQSmF0iCFjBgmWGWhQrVHCxg2sOHLo2MGjB0sLYmsWQHq1p4wdPtqemGDhB1UDQFSouKHi7oQgQmSwUMyYxcQDZQWz2EFiCJEiRoyQyLzZyGIIB47YKLwDSRAiSZSoXq1kCRHNLBK8YGKjCYskTp4ogeKkt+8oUaBImZKAAxMmVKrctqL7ihTnz7FkAT5FC4cKFbZwadIFdxcvX8KLss8iJcoUBUcq2KgAJoxyMTy4jCFTxoxEHl2GLyCDncmWM2hUIQMPY2CXhhoTfTEcA2tgVwEba7Thxhs88FdBD/ZB8MUUHMJBRhw2sAGCHBKU4UaFc1RAhxnhcdhhHUzYAUIcFdxRAh4R5KGHinu4OIVEDqTBRx81xhGHHzD8wQYQetDRI4cTAcIHGWT0EQgZa1ApCBqDcBAID1Q94IEHLtBAAyGEFGKIIWqYYQYPYNZkQEAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-mail_send-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIcAAIR6fIRydHxubHRqbHRmZGxeXGxaXGRWVFxSVFxOTFRGRExCREw+PEQ6PDw2NDwuLPwCBLSijOzixPz69PTq3PTu5PTu3PTu7OTi1KyelOzavPz+/DQqLPz67LSafOzetPz27Pz29KyajPTmzPz6/NzSzLyurCwiJPz25Ozi3JyOjPzuxBRGbAwSHOzexPz23KSSlPzqvBROdISavBxSdAwaLHRiZLSinNTGxMy+vBxGZNzu9BSGrAwWJMSyrKSSjFy61ETO3BRWfPz65PTqzHTK3ByqzBSWxEzW5AQWJOTWxBRCXOTu9BSOvDzO3ByavBRKbOzaxOzizKSWlCQ2TAQCBJza7BRWdNzSxJSCbMzq9BSOtCSKrAwiPOTavPzy3LymlCySrAwmPFRKTPzy1NTGrPzu1JR+bOzatPzyzCy61ByGpOzWtJyCbPTmvPzuzIS+3FymxCSuzBR6nJyCZOTWvKSObMSujOzivAwKDOTSrNzKrJyGbDwyNOzWrMy2lIx2XBwWFBQSFBQODAwGBAQGBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABAALAAAAAAWABYAAAj/AAEEEDCAQAEDBxAkULCAQQMHDyBInBgggoQJFCpYqMDxAoYMGjZwmEixg4cPGzqA6BBiAggRIzaQGEkSwgAMJCKgnNBhQogSJlKGOFHTpgYUG0TsnJBCxQoSE1i0KErAxYsOJJRuuAAjhkwZM2jUqGnDBQoUHTbciIEjx4YNOmbs4CGjB8kCZlGAALHBx4+YcTcACcJDyFSJBo6iGNIhhQkiG8BOKGLkCBK6SSQisHoWhZIbG5bMYALECI8mTZw8gTL1QJQXZ6VMiUylSpUlVpoYaXLFtm0EGmCjwJLlA2O9MrRsccKlC8kEXr7AdgEmwtkhX2SQ2BIkjBiSYzSQr/nyhUKZLIrJJOcexvlEBV7IvCBjRkmAMzHOaufhxDvJBWiQISAFxUUQQRovJNeEGmu4JxEDbKQhXxsfuFDGGW68IQMcccgxRxUkNRDhC3R8QMQIdZwXQ11JJGFbiB+QYccHaaTxhgt13OFBDGTgkUdRDrhAhx5k2JjGCB/swYcXMXwAYk190OGHHx/4wUaVepTxByAaoPEkSQ5wwMEJZAZipiCDDJIHIYV8OZEdAQEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-matrix-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBIQChCH5BAEAAAAALAAAAAAWABYAAAJHhI+pyw0Bw4sTVmmw1C/3/20ex2VUtJ2Uwx7oBb9eR45ziNfgy6tW2+pZhJicjXbTiZA7X2q4AjqIsajSuDsuty5n9SddGAoAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-message_get-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBFxatHx+/Hx69GRixFRWtHR29FxaxHx6/Gxq9ExKxGRm/FRW9Dw+xFxavFxazFRS1ExO9ERC/DQy5CQmzBwaxBQSpCwqLMS+xBwatExK/DQy9CQm/BQW3AQCjJyavAQCBMzGzAwOtDQ21DQy/Cwq/BQW9AwK5JSStOTi5AwKDKyurMTGxLS2xISGpNTS1IyKjJyanMTCxAQC1MzKzNza3MzOzCQiJGxqbHx6fKyqrLy61NTO1JSSlNTW1NzW3Nze3HRydKSipISChDw6PLy+vFxaXPTy9ISGhPz+/Ly6vLSytJSWlHx+fCQmJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4IBAgIDBISLjIWHiY2RggWHBgeSkYYICQqYjQUICwwNnoMFDg8QDBESExQVFpgXGBkQERoSGxwdHh8gkiAhGCIjJCUmJx4oKb+NKissIS0iHcgeLi8pzI0gMDEyLzIiM9c0NTU2zYQ3ODk6L/A7yvDnPBjqgiA5PTYvPvU+fvh4AeQFDXwgggTBwEIIOB8sakB0iO7gIH05hvToIeQFBo4eNwoJEaIZiAtEUgbhWGQjRxk9hhhJSeQXiCM4jxBxyXMjEiI5bR5JQnRnT5dDiNCgIcNmCiBAfAShSZVmECVKltgc+MIGCxlgw4pdskKHEJtMZRTJuqStW7dCImLEYGLTrJC4PeYy0asXxpAhTZpdGHzBSWHDiBPfWCzIQCAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-misc-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBBQSFCQiJERGRBwaHFxeXHx+fDw+PGRmZExOTGxubKSipDQyNHx6fIyKjJSSlJyanISGhISChLS2tIyOjHR2dAwKDAQGBJyenAQCBCwqLLy+vKyqrAwODMTGxKyurFRWVLSytLy6vMTCxMzOzGRiZNTW1CwuLMzKzFxaXJSWlOTm5Nze3Ozu7OTi5Ozq7GxqbDw6PHRydAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAb/QIBwSBwGBMVkMjAgFAwHBFJpPB4SiQJCsWAQqEJB4prdNhQNx7QYIFwLD0ikQZdMHgelOPGYULQVDg4QEAVfRAEBBwUTEE0WFwcYhAuNF0QDBQULDwwZGUIaEAuVGxgBRAIFEhwHHUQMCxwTHAVrAAwFFRwKFkQZsxseDqBDGXMSHwfFQiAhIiMeJApEBwcOcahDJcLSJCYcGkQKcRAnQhkF0SgmEykHXkObox8q1iEjKN8rENqYD7MmeBCmzwSLFS1I3AqzYIPDESS+sWCxgQMLEgOSJKjozeAKFyskCDigQFwSBhJMjDDhAlyLFyVA+dIzAUUKEi0eaNhAIg8YGiEMenkwASNDDBkLqRQAEEAkup9KDkEFACUIACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-move-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAI6hI8RyJ26nAQQzlbrdWrP7nHRNh5gwpxmaZxWylJdRtf2fcux2rr7n8LsQrxQzyhE9mhIplKjPE5wBQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-news_subscribe-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAASC/Dw6PAQCBHRydPT29GxqbCQiJPz+9PTy9JwCBKwqLPz6/GRiZERCRPz+/FRSVDQyNBQSFBwaHDQ2NKSipJyanHx+fMzOzNza3FTCFGRmZCwqLAwODLzqpCwuLExOTLzqrFTGFAQGBES+BETCBEzCDDSqBBQ+BLTqnBRCBFRWVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAb0QIBwCAgIiMgkckAoHJVQgEFAOCCc0WThcEgoDgvGMztFJLiJ83Ws3C4ODIY1jUCIlQ0Bd+FwMLZmCXV3Qw8CCAICfW9wBQhddVgAEIcCCwuJDlxWBQx1AhFPjlyJlwISj1ZWBJQTAImIerGqVwgEiAwUR46ysAeJcKoEoYkTVLGPvrWVDBUWEwEXF1aziMGfAhhiAhAVFdKPyMux2YkAEc3fF3WcdQTAGYkQQxAF3uAIGggbCBwCHfEEeEBiIB0+BB8cgHAQogMIKPXurRMxgkQJExjZELT3jUGDEyhMpDhxIouUOB8qqAhZ0iS9CJMStTQQBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-next-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBAQCBOze9ORy7Pzy/PSi5LQCvNSG1JQ2nNx21LQCzMRGzNRy3KQCpLwKzAAAACH5BAEAAAAALAAAAAAWABYAAARTEMhJq704axC671WAfR8VCOKUbudApCBHksVgHO+5agFiHwVBAuYZ+RQLBmLHatgMS8mMyREsDI7oRipEeLWsKVG8Fce26EspzeaR2vDQNE7PGCIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-openterm-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIcAAPwCBAQCBPTy9PTu9Ozq7OTi5Nze3OTe5Nza3NzW3NTS1MzOzMzKzMzGzMTCxMTGxOzm7AwGDBQOFBQSFCQeHCwmLCwuLDQyNDw6PERCRFROVEQ+RDQ2NLy+vKSipISChGxqbExKTOzu7OTm5Pz+/GRiZMS+xLy6vBQWFLy2vCwiHFQ+NMSmfNSyhIxmTDwuLJx+bLS2tCwmHMyyhMyqfPTqpPzyvLSWbLSWfPzitIx+ZDw2PAwKDCQiJGxWRPTmrPTerMyuhPzqtPz63PTWnPz6zNy+nIRiVDQuLKyWbOTanPz21NS2jNS6lDQqJHRaTPzmrPTSnPzyxOTClPz2xNSuhPTqxPzuvOzSpAQGDOTKnMy2jOzSrPTu1NzKnOzOnBwWHJRuXLSWdPTatPzqvNzClCwmJOzSnOTOnPTuxOzKlOzerOzarOzitJR6ZNTO1IxmXPTWrNSyjPzOjPTSpLSehHRqZOzirOTCjPS+fPzGhOy6bOzKhGROPMy2lPz+1PzmtKRyRHRiNNTCdPz+zNzCjEQ2NKySdDQmJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAj/AAEIHEiwoMGBARIqXMhQIUIBAwYQIFCggIEDCBIoULBgAYMGDgIIDEBAwMSKBRBk3NjxAciQIwdACBBBwgQKFSxcwJBBwwYMHBx0EAmA5EwPH0CEsCChoYgOQ0cSGCHhA4kSS5syJGDiBNEAFVGUKKEBAwWFFM6SNJHi64gDFEKE4FBBggoKK1i0cPECxokYXw0gsECYggQZM2jAqGHjBo4cOtqOxLhDAg8ePXz8ABJEyBAWRIoYOfJipEoMCZEkuaFkSAslS5jUGJKkSRAnRREo0JDwCZQoTKQAmUKlihQrVa5gKZ1lI+oAK7QM2cJlSZMuU4Z4+TJEx0iNOwKAggkjZkyOFmS8kClzpcUQLRRGbjRD4MgZNEzSqKG+ZgobI2248dUbDDDwABzcxSEHEFpgEcUcdMRRhx1fFejAAx0cgcYdSxiBRx566LEHH0d8QFRRNC3Uhx985CHEH0MAEkhCBxWkgiCDFEFIEYUYUmONMhyCRxVH/PgjBYioYJAdAQEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-paintbrush-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBAQCBMTC/AQCtAQCdPz+/MzKzOzu7KyqrCwuLAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARZEMhJ6wxiDMsp1lvHfRohWuRAmOeVlUTQSukqz3U8A/nd9rtCAWTbAQoGg0q3OyANCOYPA0UgfCdMJnHFimre72sZ7pBWiTLqRUirK5hV7A0P2O3GvD5PjwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-paren-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIEAAPwCBIQChAQCBBQSFCH5BAEAAAAALAAAAAAWABYAAAJThI+pGou9oDuS1hlqnkxu/niVQB6kYHzAiJYoUK7paLrxpr6GMJjWeqlFGirEaQhcDHQJnEQX2/1kMBv08Yu1ttNkFRr1ikHjIiYYjDjSWLIbUAAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-pencil-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIMAAASC/IQCBPwCBPyChMQCBPzCxAQCBPz+/MzKzISChKyqrDQyNEQCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARYEMhJ6wxiEMtpIAWxddwXiqRlikSQeiAbuC+wirNR322gv7zcLobzDU+9XypoBBKTR1lz+RTWDgip8nUwZK1XLyIx5XoVicX2RUAo1DVKi7GOBxjxfNwQAQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-percent-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAIzhI+py+0P4wkU1XfDhBdo/zndF4qh1pkGKYFk2XpTqoJr9G5YfmOz3hixfBZa7IhMJg0FACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-player_eject-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNAwKDJSWlFRSVBQSFKymrOzq7HRydERCRPz+/MzGzISGhJyenKSmpGxqbJyWnJSOlKSepLy2vIyOjGRiZPTu9IyGjLSutFxaXExOTHx2fGReZAQCBAQGBBwaHCQiJLSytKyurJSSlFxeXNze3LS2tIyKjFxWXHRudAwGDBQOFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAa1QIBwSCwaj8ikcqkMCJjHwIBQgBIDhgMiUbVKFQsGItBdBhpgh4PxIJvRC8cA4oiMy8bvQhJhMAYTFBVOURAWEw0QFxcMERAYCBluVxobDxkVHJocmBwEGgmEQx0dHh0CpKmkH6odVlanBR8FtAIFtiCkSB0LISEiGCIGIxAPDySuRwIOBwrOzwoHJRHJRh0jJgMj2gMnERQUCNVFHQQoCBvo6CkICATjRB0qp7b1K6qv+foyQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-player_end-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNFxeXAQCBMTCxGReZBQSFOzm7AwKDKymrJSSlFRSVCwqLLy6vPTy9OTe5Ozq7CQiJLSytOTi5BwaHPz+/HRydMzKzKSepJSOlKSipJyanIyGjIyKjKyurISGhMzGzJyWnHR2dISChIyOjLSutDw+PERCRHx6fJSWlIR+hJyenGRmZHx2fAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAa6QIBwSCwaj8ikMBBQKgOCgRMZIBSkxYHWoDVWD9EigpBQLLBERsPxCA8NDUhjgTBGJJNGG02RVBQWdUV3FxgZe0IGfoAGdhoXGxwdiAYef4FGFBoeHB8dGSBRihUhIo1FBhkbIyMkJRYmAwYal4JEBh2RChIWJ1IIGxUZFqdECCgkHR6wWAYpFR2YWSobvL5vFgfDaEMDIivMRBEsD9HcQgMWvecDLB0tZ0btsfJa9vLXU/X6/P3+b0EAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-player_pause-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBAQCBAwODMTCxKSmpJSWlFRSVAQGBBwaHLSutOzq7Ly6vCQeJPz+/Hx2fBQWFGxubLSytJSOlBQOFAwKDJSSlJyWnIyOjHRydNze3GRiZAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAWBICCOZGmeaKqubOumQSDEgRjPMSoMRGEcol3vh0IkFAtDDWBEKlGMRKPgEIii0yrqIS1ArADu9KuLNCSOSdCMVp8ohEZFC4DL6SaBpXGh6/l4JX8XZACDhXkYCn1LAoqMUBAZEhBLDJKUSyYBGmhPAJyemiU0NDaloy+qq6ytI8whACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-player_start-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNAQCBExOTAwKDAQGBJSSlHx+fBQSFMTCxKymrFRSVOzu7GxqbLSytLy6vJyanPz+/GReZBwaHHRydKSepKSipGRiZJyWnAwODLSutKSmpISChPTu9ISGhFxaXJSWlIyGjJSOlERCRIyKjDw2PIyOjLy2vOzm7Dw6PLS2tCQmJOTe5GxmbDQ2NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAa7QIBwSCwaj8ik0hgQLJGBgbMoqBIKU2LAcMgOEQmFYeEFbBmNMgDhYDwWBC0k4pCoJ46IgRIXBioRCRYXamwRGBQIfgaBFhiERhkaenxmCoEbBhyQRYaIGVsdghgem4UWegcEBB8UHhsgIaZGBBgRIpUIIxQhChginEQIIBEklWslFyYnBsFfFCi4WQgpFBwqFxNGKxcsxl4IAS0NZEYCF3vlwgEfUuZV8JEuI2pPAARN9kcE9fr+SwaCAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-player_stop-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBAwKDBQSFBwaHCQmJJSSlISChJSOlJSWlGxqbGRiZNTS1PTy9Pz+/Ozm7OTi5FRSVIyKjOTe5MTCxIR+hExOTHR2dLy6vLSytLy2vHRydFxWXIyGjIyOjPz2/FRWVHx6fExKTMzOzJyanKSmpKyqrKSipAQGBLSutHx2fDw6PAwODAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAa1QIBwSCwaj8ikcslsAgKCAWEQjQ4KgSwyYDAcugZEQqFYYJECA6PhaLcfEEUkgJZAGJB8fkKpWOhHAxcOGBQZGBoaGQgbHIBGAhUOGR0SBxISBh4Xf0iCHxQSlRIIXhsgj0UCIaCXmJgHGyKpRJ+hmB5dHQqOaCENIx0epBIkBhdzngoPGCQlJifQJBvJRygRKRcKGxcXGypys1srEREc5SLnICLiR1koLFVUWfRO9vf4+UwyQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-prec_minus-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIEAAPwCBAQCBKSipPz+/CH5BAEAAAAALAAAAAAWABYAAAJAhI+py62RgnRnGguZ3BlTYIHdl13jh3goFpIleggvTK8ctw76Pswav/MtAkCd8NHj9HLFY6S4JEGdqdumtjAUAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-prec_plus-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIEAAPwCBAQCBKSipPz+/CH5BAEAAAAALAAAAAAWABYAAAJHhI+py22hgjwSonktxBZU7GnhkyXc6JmmeDpnG2lg1YCOInT3zrvfxwsMhsSBrkYUDo8MpTEZNH6M0SV058xWi1Tsj9ZjGAoAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-previous-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBAQCBOzC7PTq9NSG1MxW3LQCzNRi7MRGzLQCvPz2/NRq3ORy7HQCdJwClAAAACH5BAEAAAAALAAAAAAWABYAAARUEMhJq70Yh813rl1HheInBYIwrEJwktxJFEbRmuOBJIXivp5LQLcj+HCnBaPBMBhdMBBjw0w8ccEA0/EzdQHaHywmnIyDyDSIrG4LQ+64OSqvx+kRACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-prod-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBIQChCH5BAEAAAAALAAAAAAWABYAAAI7hI+py+1/gpy0hlVRZlP19mmSE0YjeIoXuqpkarYYbJQeDdiJrrs77gvOZDVg7Eb8JXtFSpMJiUoB9AIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-queue-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIIAAPwCBAQCBKSipMTC/Pz+/AAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAANfCLrc/jDKEGQMQlDLKM5aZQXDQIHZ9nhleaLqEhAE1bofKCozXZO3l0bmK9qCQ2LRCDQlAb3lkoTZQaVS6jOKpWmt3O5X2fU6wWXfuBM2mmINCpbKkavho56VI9s7DAkAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-redo-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBCReDJzGjMzivOTu3Pz+/JTWbHy+VHTCTMTivPT69BxGDESuJDyiHESiHEymJIzKZAQCBFS2LFzKNGzWPDRqHCxqDFSqLHy2XESCHAwaBAQOBBQqBDyWJHyqZDyKFGSiVESeJBQ6BAwSBGTGPFyWPFSSLEyOLESGJBQiDAwiBBQmDCRGFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAaoQIBwSCwaj8hkMcBkKpcBwYAwEDif0YLhwEUkFItFMkAwMBoOR+PxgHwjRDggamhIJpQ8ZbKGKOQLcgEFdhUWEYgRF3sNfhELBHALAhgZFhobRBwREhQdEAIEHpIKHwsaSJwUDQgQIJINARxKESESDQ0dgCIjSpAkDAwPco+ZSJAlJicnKHIAIrNHidOIQxunT0kpCyrZSCss0d5Fj6jjRonn6uvs2QZBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-reload-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBCRSFCRSHBw+DBxCFCQ6FBwyDBQWBBxGFCxyLGTChMzqzLzmvHzKjDyOTER+RERyNDSqXNzy3LzivFS+fCyCPBQmBCQiBBxKFBQqDOTy3LTitES2dDR+PCxuJOT25KTarCx+PESSTCxKHDSeVCyKRNT21ESWVDSGPBQyDAQCBBQSFDRuLDSyZDySTGzChCRiJKSmpExKTDS2ZGzGhLy+vGxqbISChDSKRMzKzGxubDQ2NIyOjCQiJCwqLBQWFCwuLKSipERCRERGRHR2dAwKDDw6PFRWVIyKjCQmJFRSVBwaHKyurAQGBExOTBweHFxeXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf9gACCg4IBAgMEBQYHhI2ECAkKCwwNDg8QBAOOhAQREhMUFQgWBxcHGBmbggkaGxwPB4yDB6SbBJIKHQaqtY0eHyAhsqrDgx4aCiKpqoQHAyMjJBMKJaSxzAAHIRsmJgonKA0LHSmDKiuOBywRLSQuLyEwwyoxMuiN6iUzNBXy5jU2bsgoJugABBz95uXQsUMGD3vpPPgTpKIGwx4+HMr4kW4YkCA2hAzxAQSIECI+imBTwVIFESNHerRUgc0cEiFHkjiiyYzeDiVLdvLcySSkkKGEWiZVweSGkIHMmvQosoQlkaZOjvhosvKJjIAxoOAsgpRZkQNLnvSoqspAIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-revert-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAAQCBPwCBPz+/BQSFPTy9CQiJNTW1ERCRLSytAQGBISChMzKzFRWVDQyNCwqLMTCxFxeXOTm1KSipPz69BweHHR2dJSWlMya/Mxm/GQCzOzWxGRmZPzOzMzOzMzOnExOTDw6PNze3Ozq7OTi5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAWABYAAAbrQIBwSAwYAwDjUCloOgUDQlJJFCKfzoLAMF0ih9jmASGQfq3IBECgYC8YCsah4Rgc7+Bw2fCY4pNrCg8QboIIEX5HXXoEjWZ3eAIMgxITcRRVmVdOE50TBRV6TkJsD3EWDBUOoRcXGBmwsAJqT44aoKJNtAoVDAwWFRUFGwKxxhkCQhMEyxEcGrfEuWoGBgsdDwseHhQQvt++Hx8HmUQU4OHiICAJkHcDDB8hBCIj1QYfDomQAOIiHwxCPBiYr507JeNGAOQz8IC+g0YKrAtxAMQDBBgPFDB4EACIAwIHDkQAAhNEKuUStDMQBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-rightjust-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAIhhI+py+1vgpy0Toizjvbur3WiBJbhSJnqgorri7nwDBoFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-rsub-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIEAAPwCBAQCBIQChAAAACH5BAEAAAAALAAAAAAWABYAAAI+hI+pFu3f1gmSVUBrlnt19SUhMk5XaWnnqrYc+2rQfNWHIBi4feP+zssBdkJez5gAIodDYbH2+yGBymXCUAAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-rsup-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIEAAPwCBIQChAQCBAAAACH5BAEAAAAALAAAAAAWABYAAAI6hI+pyxBhXlOv1omggxon6VFdGG1laFmkyQLCC8fvJNB2U+M3k/P70gP+FEHiMFFEHhFJJk0GXUkNBQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-run-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBOzq5MzOzPTy9KyurNze3PTy7IyOjOTi5MTGxNza3MTCxMzKzHx+fOTm5NTSzNTS1NTW1FxaXAQGBLy+vJSWlGxqbGRmZIyKhDw6PAQGDJyenAwKDLy6vLSytBQSFLy6tKyqrHR2dLS2tJyanJSSlISGhKSmpCQiJISGjCwqLBwaHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbcQIBwSCwaj8RAAMkUBgSDZdMpBQQIharyGDAclsoDYhtIKKrDwMEgUBMWiwSj3HCg0w+DfgGJQAYSDRMUTAELBhJ8fw0KFXdJBwkLEhYXGAUNDBUZj0pXkxYaARsIDRUMHJ5pAgQHkxEYUh0JFR4fHAVZTgMFCAt+sUIgBB4hIggOI1pKCQO8CB0gAgYkJGNbRQEKEYwNCa7VIhOPaRAKCpoV1QUl5E5mDJrFJAW4JuRlCuMnKB+94yVQ2DGi7QSYABcQgACTDF+VFChULJsiZIUCiRS5sMjIsQidIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-showmenu-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBAQCBBwaHERCRIyKjBQi/ERO7HR+1Ly+1Pz+/Ozq7MTCxOzu7NTS1AAAAAAAACH5BAEAAAAALAAAAAAWABYAAARkEMhJq7046z2D/2AoDAQVFGiqqsaBmGH8jWWX3Hiu3+YdKglPMIDrDXc+Is92zAmFi5pECWIkjySj0EkUZplb3JP4nV65WCmAqhR3yeo2Emmc0zsyGc3U6Pv/gAAKHISFhoQGEQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-signature-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIYAAISGhISChHx+fHx6fHR2dHRydGxubGxqbGRmZGRiZFxeXFxaXFRWVFRSVExOTPwCBAQCBMzKzMzOzMTCtMS2dJSCTCwqLPz+/PTu1MzCtERCRMSydPTqxPz+9Pz6/MS+rNzKlKSSVOTarPz69ISCtGxurJyaxPT29MS6pOzmvNzSnHRyrPz29OTi5LyqXOzavMy6fFxanHR2rOzq5JyKTOzizPTqzKyWVGxqpPTy7LymZGRipLSy1PTu5KSSZFRKLExKTGRaNPz27PTq3LSiXPTq1GRWNDQ2NMTC3FxSNLymXGxqrPzy7IRyPDQyNCQmJGRinJSCdHxuVBQSDPTy5PTm1IR2RJyOfKSSfBweHGRenFxepNzGrKyejNS+pNTCnNzCpLyedBwaFBQWFNzOrOTOtOTOrBQSFOzStOTKpAwKBMS+tMS6rMS2nMSylMSulLymhLymfAQGBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAA8ALAAAAAAWABYAAAf/gAAAAQIDBAUGBwgJCgsMDQ4OD5MPEAEREpmYmJqaE5IPFBUWAxEXp6ipqJ+TFRgVBaaqsxcZGhUVGxwdBrK0qB4fFSAhIiMYCLIkJSa0JygVKSIhKSoJvhcrqh4sLRUuKR4vITAL2DGpMiMzNBs1FzYiKjcMER6oOKglLDkVOinwRMCAAcKBrx33eMTwkKPHPx8/RGxwEaICkIMXcOBgMaJfCgw/fMCgWCGIhoMlSOQQkmMIkSJGUoysGOTBEVlIZMTg16NHhSJJZCqhOenmqSU5cDDB0JJIzJlNak5yYoqHDBY7hmgN8aPGhhslKU16EgHJDiY9oGz9EcJFkChSaKaIfUC2I5UhMarU+GElyJUrWHzIFZslAtqWVbRs4dIFi5cvYMKImTsmQs8qVVrUePGCDJcyZkCEGUzpTAQMmGts5ozGTJo0XEbPVTNhDRsUbdy82Q0HTpwwwNXMlQOhuPHjyIWLNRAIACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-spellcheck-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIQAAASC/AQCBFxaXBQWFAwKDPzCxPwaHPwiJNQGBOxKTPQ6PNQCBGwCBPQ+POwCBPwqLMwCBHwCBBwCBFQCBLQCBPwCBBQCBCQCBPQCBOQCBDQCBFwCBJQCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAWGICCOZGmeaAoErMi+4xuQgQAI8yoKw2rfOZ1LRIgJh0hhDncsyXKypNMIKAKbNGpwFjxukcza7jt8xmCAgkpVMKxRhQOCnTAVFAtGqtBwLEgFDxAREigBExQVFRAibYNdJhaIigmODBdvF4gYDwoZDBpvIhKIGYOFoi4bHBGQogESqKlvBiEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-sqrt-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIIAAPwCBIQChAQCBBwaHAQGBAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAANPCLrc/jDCQKutkcqQJeCP5k3g6IjCIAjAynYt0brzUn7gW++i0i8CGcNiuyl0NlyysYKhXgQdUvmcNZtDTo/mmvo+ptMvjDOSzWey+mFIAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-start-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAw2VAQCBCRGZAxCZGyavExmjHyatOTy9CxihISevPz+/KzO3BRylAw+XDRWbPz6/FzC3CSuzDyexJzO5Mzq9CxSdAQOFISmxNzu9HTS5BSmxAyexDSuzJTa7Mzu9Kzi7GS21CRmjAQOHHSWtLze7AyWvHzG3BRihCTO3BS+1AyixBSWvBSOtBSStAQWJDzW5BTC3BSqzBS21CTC1ETW3AQSHEze7BRqlBRmjAQCDBR+pBRefBRSdAQKFAAAACH5BAEAAAAALAAAAAAWABYAAAa0QIBwSCwaj8ikMqBcMpsCQTEwIDQBUWKgYHgqs8LAAZGwQqWAgGLBaDgEj0Fgjh5mxRBERDKhICAQFRYXRVEBGBAZGhscHR4VHyAhIiOFAiQZJRoSGyaNJxQnEyiVRFEoGykqKyYsJiYtLi0mKC+WFygrMDEyMzQ1wDQqKDaWADYoMzcqsjg5DSgoBISmaCOoMG4v29s2OsZCyDs8DldgQtc95WdFPg7rV0Y+XvHt9ff4SXRBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-stop-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAASC/CQKDBwKDCwODNyKjPzq7My+vIxiXAQCBOSOjPz6/OSelNySjNyGhMR+fLRaTGQ2LPz+/Nx+dNR2bNRybMxuZMxeXMxiZLQSFJQaHFwqJNyKhOSCfNyCfNR6dMxmXMxWVMRORLQODOR+fOSSjNR2dMQ2LJQWFMRWTLwWDNSCfMxeVLwaFKQODNR+fNx+fMxiXKQSDOSWlMRSTMxaVMQ6NMxORMQyJOTS1MxqXLwWFLRORMxKPMQaHMxKTLQWFCH5BAEAAAAALAAAAAAWABYAAAb2QIBwSCwajwGBcikIHIsDQmFKNRwQT2EgoVgsGOCG4wHBIgmRhWRCqVQsF0xGYyYGNgoGh9PpeCQfICEic3UAAWgLIxwRJBsbHSUREyYYJ3RDAQULexGejhueESgpl3WaCxsqJKKsChEUKywtmFoFDC4vCayikzCyMbWHt38NCTKiHhUfMyzBdQIFKsodob0VNDWzwppuKxMRrx6iNjcitNA4bh+iEzkwojc66JkOOxcf7G35PBE9KS1MEUGgIQOIFfk++KjRw9wJgUUIZvhRoyLDFCliQDQisUWLGCJOeNx4hKCGkyhPGnqCoKVLl1liypyZxUAQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-sum-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBIQChCH5BAEAAAAALAAAAAAWABYAAAIyhI+py+1/gpyUMrvm1bdhFTgfhIykYZ4pyZ2o5EZwDLSurc7ZFnqZDgLKKsQe7QihFwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-text_block-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAImhI+py30Bo5zBWUWzvNzo33GfFl5jVlonlTrr1DbvFi9vjeeNUQAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-text_bold-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAIxhI+py+0Powm0VnknjVkH2AEhE45LZ55Wqn6e65TsMc5eYosbksswubJIhsSiccgvAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-text_center-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAImhI+py30Bo5zBWUbz3Sh7yIWfFHKjVl4nmFrr1Lpr7LwkjeeIUQAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-text-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBAQCBBwaHAwKDBQSFLy+vLS2tJSWlBQWFKyqrFRSVCwqLDQyNNTS1GxqbFxaXJyanIyOjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAVcICCOZGmKQSoMaZsShBsQBdAapHvgaIDUqUPJlRjSbAoT0fRDKgODRbF0PLUYjZO2F2Bst9evNix+dsvDlGKK5jraudQb7qbX6a2HEJ+ycyF+LRE8ZTI+fX5oGCEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-text_italic-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAImhI+py+0P4wqUSlQvttrkDnyaOHIdeaGRupplAIauVM3xjeeOUQAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-text_left-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAImhI+pyw0Bo5zB2UXz3Sp7yG2fFJajVjonmIor2TJvfL0wjecIXQAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-text_right-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAImhI+py30Bo5zBWUfz3SZ7yIXdF4kWqZkbCqoMO7kXLC+wVOe6YRQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-text_under-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAIvhI+py+0PowmUnhpeVVnb1DkbCI1I2JhX+Z0sOr2cTHpwK7a4rUr+hAnufsTirwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-toggle_log-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIYAAAQCBAQ2NPwCBATW1KSWfBweHATS1Pz+/Ozm1GxiTATOzPz6/Pz69ATGxKSahOzaxPzy5HxuVLSmlOTazPz27AS+vPT29NzClPTexHxuXLSmjAyKhPTy9KyehNy+lPTy5Pz29HxyXNzWxAS2tOzexPzy7IR6ZASytPTy7ASurPTu3KSSdIx+bASqrJyOdIyCbASmpJySfPzu3OzizJyKbKyijASipJSGdOTWtPTq1PTq3NS+lJySdOzWtOzi1My6lMS+rOTOrMS2nNTGrNTCpNzKpJSGZKyafLSifIx+ZHx6ZFR6bFR+dAQyNAQuLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAIALAAAAAAWABYAAAf/gAABAoSFhoeHAAMAiI2IigSMjoQABYkGBAeSjwAICYkKmQublJ0HDJ+GAA0OB66bpq4HCQC1lA2ZrqMCAA8QBwvBERITFIwAFa2yFgAXGL+uDBkaxRu1FQQLshwdHhgfDK4gIRoiFNYAI8quHA4XJCUMCwwMJhLm6Ce5rigEzhAMQICwYKLcuVopWgUDoWLFhQcfKNCjwOLeQQAtCFDYiAKBC28QKITk8MIgOhgxIHyQIWOGi4cfIHAogYJGjWq1bNzAkSOHjgc0dmBAgQKCUR43S1jjVeFGDx8PcNAAKePDjxg1gOCThOxFEBxBgpJQMQGpkCETEIBYSqkpkSJGOYTyOCJkgg4OIDaybXvjh5ELLpAMUYEAgQ7COPbyTWJEiY3HkCOTaruESYVamDPbQtTESedJhOgEAgAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-top-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBAw2VHSWtBRihAQOHISmxNzu9BSmxHyatPz6/Lze7CTO3AyixAQSHHTS5BTC3DzW5ByyzPz+/OTy9AyexEze7GyavKzO3FzC3AyWvBSqzBR+pAQKFCRGZExmjCxihBRylCSuzBSWvBS21BSStBRSdAw+XAxCZDyexDSuzCTC1BSOtJzO5JTa7ETW3BRqlAQWJDRWbOT2/Mzq9HzG3BRmjJzS5Kzi7GS21BS+1CxSdCRmjAQOFAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAaoQIBwSCwaj8jkMMBsOp3Ip7SpHAoGhELVKDAcENmtNaFYMBoEh1hAPjwgEUlYyZ5QHpIKxALWIgUXFBgZCBUaG3AcBB1HAh4fICEiFRUjJCUhBCYnjEQCAignoikqhissKAKiJwFJAS0uKhovMDFiADIzNDUsLza2Yh4KNDcsEbW3Ago4NSUrBMBbAjQ5KRo60Mk7PATdKH5bAT0xDg4xPa236uvsShRBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-undo-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBCReDJzGjMzivOTu3PT69MTivHy+VJTWbIzKZEymJESmFESiHDyiHESqLAQCBFzKNGzWPFS2LNTmzCxqDDRqHPz+/KTGnBQqBAQOBAwaBESCHHy2XBxGDOzy7HTCTEyyJDSqFHzWTAwSBBQ6BIy+dESKJFySPFSSNAwiBCRGFBQmDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAalQIBwSCwaj8ikMsBkKotMwYAwEDiXgYLhwD0gCFZiQKxNKBYMRqPh+D6G16y5AYnYIxBJAyF4AwITTAUJdBESD4gPFBV6Fn6ABBcJDIYPGEQZGhQbHAIdfx4JHw2VSBodGwWfAR4LDSALfkgYAQurBiAhICKfSSMkvQElGyYnGyi9Rxkdj4nOskUYyU9FpxnURikdGtjRKivdRKfQ2Inh5+jpRwZBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-up-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAw2VAQCBHSWtBRmjAQOHISmxNzu9BSmxBRihHyatPz6/Lze7CTO3BSixHTS5BTC3DzW5ByyzPz+/OTy9AyexEze7ByixGyavKzO3FzC3AyWvBS+1BR+pAQKFCRGZExmjCxihBRylCSuzBSWvBS21BSOtBRSdAw+XAxCZDyexDSyzCTC1JzO5JTa7DSuzETW3BRqlAQWJDRWbOT2/Mzq9HzG3JzS5Kzi7BSStGS21CxSdCRmjAQOFAQSHAAAACH5BAEAAAAALAAAAAAWABYAAAaeQIBwSCwaj8ikcqkMCJjHwIBQgBIDhgMiUbUGFAtGw0GFfheHByQi4S6/E8pDUoFYLm5kAEPJaBAVGxIcER0JHlEfICEiIxUkGyUmIgknKIhXASkonCorgSwmKQGcKE9IAi0uLxUwMTJWMzQ1NiYwBLBQHws1N7avXgs4NjkcCblMATU6KhvGyG87PAnUKV1MAj0+2zIFp1bg4eJJdkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-view_choose-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBAQCBFRSVExKTDQyNPz69PTq5Pz+/OzaxOTKpAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARTEMhJq70466Cl+AMxBVwnFIVRAmQHCIeBrC1L3tQgJ/SaEbeeC1PLBHE2ybFI9A1HzstHEIK6YCmhDTmBybQaHYJn7QC5zKeytIQe1+pKNE6P2yMAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-view_detailed-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBFRSVExKTDQyNPz+/Pz69PTq5AQCBOzaxOTKpAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAQ+EMhJq7046817+MLQUQFRGMc4lQaSAkcMx3QltMmrDrSu/sCgEPgJhIiFk89DaL1qPRnlhsgBebWhdstVESIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-view_icon-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBFRSVExKTDQyNPz69PTq5AQCBPz+/OzaxOTKpAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARWEMhJq7046z2DF0PlBeAVEERhiKhqHgWyUgEsX0KczFOO7JeBYciTCImc5ITIXDKHyqhU9AnRqq9UEVDTvmLbGhin2/qAliOUot5OLc81IO5+2+8WewQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-viewmag--22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBBQSFJyanKy2tLzCxHyChNTa3Nzq7Nz29Nzy9Mzy9MTu9OTy9Nzi5Oz6/OT29MTi5Kzi7NTy9KTm7JzW3ITO1Lzq7IzW5HzK1LS+vMTq7Jze7ITW3GTCzGS+zLTS1MzOzLzq9Kzm7Jze5ITW5HTS3FS2vLze5EzCzEyyvEyutJTa5NTu9ITa5FTK1ESirLTm7Mzi5FS6xEy2vESerESmtFSutESmrKyqrAz+/Dw+RAzi3ASutHRydAQCBAAAACH5BAEAAAAALAAAAAAWABYAAAbKQIBQGCgWh8jksCgYEAaCozIZKBgOiIRiwSgEpstCw/HYQiKRhBcMCBgQDodkMaFU0t9pQHCIyy0TFxgYEVF6GQ4LCQkaERscHR4RH3lUIAkWCyEiIyQlHiYjEJVIAQQJJ2gjJSUoKSorlHoCLBQcHC0lLikvHjCGejEiHBgeMjM0NRwPpFQFDBHFNjceHAjAYFWoI7cnCVE4OWxtex8QH1EBOjs4zUpGUjw6Pe3j2fP19u/47vrq9P3s/avno2BBf/MCClSob4iBIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-viewmag-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBBQSFJyanKy2tLzCxHyChNTa3Nzq7Nz29Nzy9Mzy9MTu9OTy9Nzi5Oz6/OT29MTi5Kzi7NTy9KTm7JzW3ITO1Lzq7IzW5HzK1LS+vMTq7Jze7ITW3GTCzGS+zLTS1MzOzLzq9Kzm7Jze5ITW5HTS3FS2vLze5EzCzEyyvEyutJTa5NTu9ITa5FTK1ESirLTm7Mzi5FS6xEy2vESerESmtFSutESmrKyqrAz+/Dw+RAzi3ASutHRydAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbIQIBQGCgWh8jksCgYEAaCozIZKBgOiIRiwSgEpstCw/HYQiKRhBcMCBgQDodkMaFU0t9pQHCIyy0TFxgYEVF6GQ4LCQkaERscHR4RH3lUIAkWCyEiIyQlHiYjEJVIAQQJJ2gjJSUoKSorlHoCLBQcHC0lLikvHjCGejEiHBgeMjM0NRwPpFQFDBHFNjceHAjAYFWoI7cnCVE4OWxtex8QH1EBOjs4zUpGUjw6Pe3j2fP19u/47vrq9P3s/cunr9S8gAIRFhTCLAgAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-viewmag+-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBBQSFJyanKy2tLzCxHyChNTa3Nzq7Nz29Nzy9Mzy9MTu9OTy9Nzi5Oz6/OT29MTi5Kzi7NTy9KTm7JzW3ITO1Lzq7IzW5HzK1LS+vMTq7Jze7ITW3GTCzGS+zLTS1MzOzLzq9Kzm7Jze5ITW5HTS3FS2vLze5EzCzEyyvEyutJTa5NTu9ITa5FTK1ESirLTm7Mzi5FS6xEy2vESerESmtFSutESmrKyqrAz+/Dw+RAzi3ASutHRydAQCBAAAACH5BAEAAAAALAAAAAAWABYAAAbQQIBQGCgWh8jksCgYEAaCozIZKBgOiIRiwSgEpstCw/HYQiKRhBcMCBgQDodkMaFU0t9pQHCIyy0TFxgYEVF6GQ4LCQkaERscHR4RH3lUIAkWCyEiIyQlHiYjEJVIAQQJJ2gjJSUoKSorlHoCLBQcHC0lLikvHjCGejEiHBgeMjM0NRwPpFQFDBHFNjceHAjAYFWoI7cnCVE4OWxtex8QH1EBOjs4zUpGUjw6Pe3j2fP19u/4zT766vRI+fvHD4CPgwcJ9qg0UB85JA0dDjEQBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-view_multicolumn-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBFRSVExKTDQyNPz+/Pz69PTq5AQCBOzaxOTKpAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARTEMhJq7046813+MJQfUF4BURhHGO6noSBsEcNoDJtS4KcsJQe4ncZ1HYT47HDbDqfUAnJRJmKLIGCCjjJbmE5wBI3EyOFxKCPS1EiJW52dE6vZyIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-view_sidetree-22:actions actions22 22:photo:22 22:R0lGODlhFgAVAIUAAPwCBFRWVFxWXFxaXExKTNTO1NTS1Nze3Hx6fLSutMzGzLy6vMTCxDQyNMzOzPT29Pz6/Pz+/PTu9Ozq7OTi5Pz2/Ozm7MzKzGxmbIyKjAQCBPTy9FROVFRSVPTq5OzOpMS+xPzu5OTKpExOTJSOlOzu7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABUAAAb/QIBwSCwaAQFBcqlsLgcBAnFQqBqqhwIiUVB4F4wGMeB4QMyPSCFQkEwmlMlCPKRC7pCKmjpxTyxzUwVmEBF6FxiDbxZyUnUFdxERhQUZbX4TDBlEAgUVkQ8DogEDAqYBTwEaAw54eQNusRMPs319Gp0PFZ8PAhMRGpLCwxOrFw/IFRuwwMICHAIEkhK4lxK0A7/Bkh0RHtvFAwp9D27MGugRAh4f29TithIW2c2SBOjgqwxv/AIS9cOEvQPBiBEFetsidOhAQFqEcCDgWLBAwR9AARFCuMPFAMwCEAsQpuMQQkS+EQ1SNkBAwuKwe+kiUDuSzU0JPyUm5HSj4Qi+Bp9A8QEIAgAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-view_text-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAIkhI+py+0Po2ShBlOxzbP7n2yaJoLm+ZTcxqHuC6hXzML2HVEFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-view_tree-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBAQCBFRSVExKTDQyNPz+/Pz69Pzu5PTq5OzaxBQOFOzKpFRWVFxWXOzexPTexCH5BAEAAAAALAAAAAAWABYAAARPEMhJq704g6A779kHCORAgNskFMYhakE8FkjyBcoWv+JwJItXaELYCTFHlCSpZKKcoB5jYHpOGgUadLKbIRw3jhEzQDyCSuI4zW673yhDBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-window_fullscreen-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBAQCBNTW1NTS1MzOzMTGxLy+vLy6vLS2tKyurKyqrKSmpKSipJyenMzKzMTCxLSytFxaXPz+/Pz+9Pz+7IQCBMzOvMzOtPz+1MzOrPz+5Pz+3MzOpMzOnMzOxAAAACH5BAEAAAAALAAAAAAWABYAAAWxICCOZGmeKBqsbOu+rjAQRFEYxoEkibIwjUZMRnAUHjkEpPcLriLQqHQ6XRUk2Kw2O+lSKIUVoUKubLflikVcPnO75cvKkXZL4HG2pK31lilqc1lmfRNfgBQYGBlidl5fGhobGxqMAQNnXYaQkZOLjVgVmpsUkRoVnpZje2SkphtlGBUcbH+br5NptAF0rYe4G4plHSseaaW4irLDcxYOFtDRFhnU1B3X1zDa2indIwYhACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-window_nofullscreen-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBNTW1NTS1MzOzMTGxLy+vLy6vLS2tKyurKyqrKSmpKSipJyenMzKzMTCxLSytFxaXPz+/Pz+9Pz+7IQCBMzOvMzOtPz+5Pz+3MzOrPz+1Pz+zMzOpPz+xMzOxMzOnAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbKQIBwSCwaj0hkYMlsOp9OwYBAKBQMhgMikVAsGI1GVEpwFB5ZBKT7DS8j8Lh8Pl8WJPiJfr/PTygUBUsEEhV4h4h+ExUUFoMVkIWJhxWLkBeDhZCGiXqbFRiYAYSanId7mxihSwOlphJ6gJ8ZGksOiqd/gKoYGRmipIh7gBSqvhkbtaOuw7sYn8mseJuxxcabGxwdmZ/EvL6f2o+Qz869yBUem9sBH4sYf7znG/Qb6h4gSx8fDh8W/wA1CBTYoSCIfFASQknCcIiBIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-wizard-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBNzaTPz6BAQCBPz+BExKBMzOTPz+rPz+3ISCBPTyhISCLISChPz+xOTiVPz+/MTCxKSipKyqrExOTDw+PDQyNAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAV+ICCOZAkEZqoKqoqKAzHAb1sIxhAQwWAQhRaJd0AcdgkhqaBAOBUL5WjAaD6TUqog0DAildqcg+cDtgaPACTCiM0AOhV6sG4DWOAHnf2uyfV1b1lsgVIwEgwTFHaGA2yKFYJgiJCSQo6JFJGGcJSalkKPn5wimZukAJWoIgYhACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
diff --git a/ext/tk/sample/tkextlib/ICONS/tkIcons.kde b/ext/tk/sample/tkextlib/ICONS/tkIcons.kde
deleted file mode 100644
index 0d5b2c8695..0000000000
--- a/ext/tk/sample/tkextlib/ICONS/tkIcons.kde
+++ /dev/null
@@ -1,195 +0,0 @@
-actattach16:act act16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBPz+/AQCBAAAACH5BAEAAAAALAAAAAAQABAAAAI2hAOCxg2h0nJHyEshi9HpxU1GOCLdZoKpQ15nibUoprKp9lh2oucUxsBRXsJh4Hjs/QTMpr8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-actbookmark16:act act16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBCwqLLSytLy+vERGRFRWVDQ2NKSmpAQCBKyurMTGxISChJyanHR2dIyKjGxubHRydGRmZIyOjFxeXHx6fAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVbICACwWieY1CibCCsrBkMb0zchSEcNYskCtqBBzshFkOGQFk0IRqOxqPBODRHCMhCQKteRc9FI/KQWGOIyFYgkDC+gPR4snCcfRGKOIKIgSMQE31+f4OEYCZ+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-actbookmarknew16:act act16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBCwqLLSytLy6vERGRFRWVDQyNKSipAQCBMTGxKyurISChJSSlJyanHR2dIyKjPz+xISGhPz+BGxubMTCBHx+fPz+/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVfICACwWieY1CibCCsrBkMb0zchTEcNYsIiYHiwIOdEAvigdFQGE0Ix4NBbSAgsWjk+jBIAlcUYrJASChnSXZSoUDelKfoKpFALJA61ueGI2IAZmhogGFmCGGAgXsifiEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-actcheck16:act act16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBMT+xATCBASCBARCBAQCBEQCBAAAACH5BAEAAAAALAAAAAAQABAAAAM2CLrc/itAF8RkdVyVye4FpzUgJwijORCGUhDDOZbLG6Nd2xjwibIQ2y80sRGIl4IBuWk6Af4EACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-actcross16:act act16 16:photo:16 16:R0lGODlhEAAQAIIAAASC/PwCBMQCBEQCBIQCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMuCLrc/hCGFyYLQjQsquLDQ2ScEEJjZkYfyQKlJa2j7AQnMM7NfucLze1FLD78CQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-actexit16:act act16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBDQyNHR2dCH5BAEAAAAALAAAAAAQABAAAAI4hI+pFrHb3nEg1iWiDiINCwYDko0V9XUTda6I1TIsUMpGinyzbB6ZeGuoEr+GUDL4CXqSphPhLwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-acthelp16:act act16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQ6XAQCBCyCvARSjAQ+ZGSm1ARCbEyWzESOxIy63ARalAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAQ/EEgQqhUz00GEJx2WFUY3BZw5HYh4cu6mSkEy06B72LHkiYFST0NRLIaa4I0oQyZhTKInSq2eAlaaMAuYEv0RACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-actitemadd16:act act16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBARCZPz+/Mzq9BTC3ITC1HSyzGSivAw+XBSStIS6zHy2zAQCDFyatAQOHFSStEyOtAQSJBSq1DR2nCxunCRmlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVbICCOQTmeaCAMRIC+AVu47xkTBl2Ld16XQNYBQTQBVIOkMHFQJBeMI4tAbSSu2IRDSnhAvFfI97sFRM6RwOMacbjLKckVvgvIJ5EdSU7J648VgXQ7Dmd/hyJ+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-actitemdelete16:act act16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBARCZPz+/Mzq9BTC3AQCDAQOHFSStAQSJAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAQwEMhJq704681n+GAISoEwnGg6EAUQrEQsz4ThEkeu77kNIAagMEj0dY7IpHI58UcAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-actlock16:act act16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaVAQCBKSipDQyNMTCxISChFxaLFxSJEQ+FExGHCQiDBwaDGxiLHxyNHRuPIR+TIyGZJSSfFxaRFxWJGRiLJyaXNzWpNTOnMzGnLy2hJSKTGReLKyqjPTu1NzarMS+jLSyfKyibJySXIyGVCQeDLSytPT29Ozu7OTi5NTS1KyurJSSjGxqVFxaXLS2tKSebOzuzLSufJSOXExGLGRiTExONAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaTQIBwGCgGhkhkQDBoEpLKQoBACAyOUID1qTVwoQGvMPxNFgVjAxp6QCQUicSCwVgkG44HJCKRRCYUCAxIFRYXhxgZGhYbHINEHR4fGCAhIiMkFSVKJicoKSoFKwMsLZtDLison6GjLA92qCueoAUvpC2xQhWqrLYDErmEMDEXlDIwMxAHukI0NS01EzY2NAmPAH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-actredo16:act act16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBxOHBxSHBRGHKzCtNzu3MTSzBQ2FLzSxIzCjCSKFCyeHDzCLAxGHAwuFDSCNBxKLES+NHSmfBQ6FBxWJAQaDAQWFAw+HDSyLJzOnISyjMTexAQOBAwmDAw+FMzizAQODDymNKzWrAQKDAwaDEy6TFTGTFSyXDyKTAQCBAwiFBQyHAwSFAwmHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ2QIBwSCwaj0hAICBICgcDQsEgaB4PiIRiW0AEiE3sdsFgcK2CBsCheEAcjgYjoigwJRM2pUK0XDAKGRobDRwKHUcegAsfExUdIEcVCgshImojfEUkCiUmJygHACkqHEQpqKkpogAgK5FOQywtprFDKRwptrZ+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-actreload16:act act16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBCRaJBxWJBxOHBRGBCxeLLTatCSKFCymJBQ6BAwmBNzu3AQCBAQOBCRSJKzWrGy+ZDy+NBxSHFSmTBxWHLTWtCyaHCSSFCx6PETKNBQ+FBwaHCRKJMTixLy6vExOTKyqrFxaXDQyNDw+PBQSFHx6fCwuLJyenDQ2NISChLSytJSSlFxeXAwODCQmJBweHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaBQIBQGBAMBALCcCksGA4IQkJBUDIDC6gVwGhshY5HlMn9DiCRL1MyYE8iiapaSKlALBdMRiPckDkdeXt9HgxkGhWDXB4fH4ZMGnxcICEiI45kQiQkDCUmJZskmUIiJyiPQgyoQwwpH35LqqgMKiEjq5obqh8rLCMtowAkLqovuH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-actrun16:act act16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/ISChKSipMTCxLS2tLy+vMzOzMTGxNTS1AAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARlEMgJQqDYyiDGrR8oWJxnCcQXDMU4GEYqFN4UEHB+FEhtv7EBIYEohkjBkwJBqggEMB+ncHhaBsDUZmbAXq67EecQ02x2CMWzkAs504gCO3qcDZjkl11FMJVIN0cqHSpuGYYSfhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-actstop16:act act16 16:photo:16 16:R0lGODlhEAAQAIUAAASC/Gw6NGQuLHQ6NGQmJFweHFQaFPTm5PTa3PTW1Oy+vOS6tNSinKReVDQWFPz+/Nx6fNyCfNyGhNR+dMxybMRiXLxGRIwWFNx2dNx+fNx2bMxuZLQWFBwWFPTu7Pzy9NRqZNRuZMRSVLwmJGwWFNR2dMQiHPTKxMxmXMQyLMxmZNx6dMxiXMRSRMRaVKxybMxaVEQWFMQuJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaaQIAQEBAMCAWDYcgkHhAJxYLRcDQBggckIplQKpaLdRh4YDIaSWa94Vw6woAHgv6AMKGPaMQhwQMJJRkfhHmEJhdvRCcgGSCEkCgpbnAECiorGYYfLCItlAAFCygQj5AfbYlwBQwVE5AukG6KBi8tMC0fLi0pHxyzcAAxFxwmMny/wEwOxMm/qlcdJCSJ1H5XQh3a28HY3kx+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-actundo16:act act16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBxSHBxOHMTSzNzu3KzCtBRGHCSKFIzCjLzSxBQ2FAxGHDzCLCyeHBQ+FHSmfAwuFBxKLDSCNMzizISyjJzOnDSyLAw+FAQSDAQeDBxWJAwmDAQOBKzWrDymNAQaDAQODAwaDDyKTFSyXFTGTEy6TAQCBAQKDAwiFBQyHAwSFAwmHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ1QIBwSCwaj0hiQCBICpcDQsFgGAaIguhhi0gohIsrQEDYMhiNrRfgeAQC5fMCAolIDhD2hFI5WC4YRBkaBxsOE2l/RxsHHA4dHmkfRyAbIQ4iIyQlB5NFGCAACiakpSZEJyinTgAcKSesACorgU4mJ6uxR35BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-actunlock16:act act16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaVAQCBKSipDQyNMTCxISChFxaLFxSJExGHEQ+FCQiDBwaDBweDGxiLHxyNHRuPIR+RIyGZJSSfFxaRGxmLJyaXNzWpNTOnMzGnMS+jJSKTGReLKyqjPTu1NzarLSufKyibJySXIyGVGxiNFxaXLSytPT29Ozu7OTi5NTS1KyurGxqVCQeDJSSjLS2tNTW1KSmpGRiLKSebOzuzJSOXExONExGLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaVQIBwOAwYA8SkMCAYOAnKYiFAIAQGyOgVCggYuEovVxztMpdnwAGRSCgUCwOjIeQ6HpCIZDKRUNYMRBUWF4UYGRoWGxyBRR0eHxgaICEiIyR0QyUmJygpKgUrAxMsLUQlKyieoKIuEAunK52fBS8DLiywQySpnjC1Mbi6QjIzNBeSIBY1EQfDQgosLAEUNjY3Co1DfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-appbook16:app app16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBAQCBDyKhDSChGSinFSWlEySjCx+fHSqrGSipESOjCR6dKTGxISytIy6vFSalBxydAQeHHyurAxubARmZCR+fBx2dDyKjPz+/MzKzLTS1IyOjAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVkICCOZGmKQXCWqTCoa0oUxnDAZIrsSaEMCxwgwGggHI3E47eA4AKRogQxcy0mFFhgEW3MCoOKBZsdUrhFxSUMyT7P3bAlhcnk4BoHvb4RBuABGHwpJn+BGX1CLAGJKzmKjpF+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-appbookopen16:app app16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBExCNGSenHRmVCwqJPTq1GxeTHRqXPz+/DwyJPTq3Ny+lOzexPzy5HRuVFSWlNzClPTexIR2ZOzevPz29AxqbPz6/IR+ZDyKjPTy5IyCZPz27ESOjJySfDSGhPTm1PTizJSKdDSChNzWxMS2nIR6ZKyijNzOrOzWtIx+bLSifNTGrMy6lIx+ZCRWRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaeQEAAQCwWBYJiYEAoGAFIw0E5QCScAIVikUgQqNargtFwdB9KSDhxiEjMiUlgHlB3E48IpdKdLCxzEAQJFxUTblwJGH9zGQgVGhUbbhxdG4wBHQQaCwaTb10emB8EBiAhInp8CSKYIw8kDRSfDiUmJ4xCIxMoKSoRJRMrJyy5uhMtLisTLCQkC8bHGBMj1daARgEjLyN03kPZc09FfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-appboxes16:app app16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMT+xAT+BASCBATCBMT+/AT+/ASChATCxPz+xPz+BISCBMTCBAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEEgZwrwYBCFqvhs3DNYXjChRlWBRjIRqGN4UuEUczMZxsDeXykdEsDQVVSLhQxhBCkVlmXA+KVHFYhFYOoHbMGN6pTQaW8YYiQmcG+q16a0+Zipw+4e9B/gjACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-appbox16:app app16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPz+xISCBMTCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANECKoR6ys2IVqokF08yMTA1gwkYX5WQK5ma4VceTYPxXnBWdtY6+0834/Bowgzm6APWRQcH4TiMhPK2WYRiZWW7XK7/gQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-appbrowser16:app app16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxONCROfCRKfKx6LNy+bNTOpGSS1DRupAwyXBRSnPTSjPTqvOzqzMzSvHSSlKy6ZDxutAxCpBQ2XBxepLTKvPzqzPzy5OTShLS2dLSqRFR2jBRerBQ+jOTixOzetNS2XHx6XDR2tCRexBwyTDyKzOTavPzq1OzKdCx23BRKtCQ6VCQmHFSa7IyirOzSnGSGpIR+bFSO1DyK7DR+5CRixBw2VDQuHFye7IS27NzGXISuhEyS5DR25BRWxBQ+lBQyXCQqPCxSfGyu7GyerKy2ZFR+rERqfCRmxBROtBQ+fBwuTBwmNDSW9JyabLyqRIx+TExSXBQ6bAQCBBQ6ZBxapDR+zBxq3LyaLJySRHxqPGxeNBxGbCRmrHRyRERONDRKNDQ2JCQuLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAeygACCg4SFhgABAQIDh4MBBAUGBwgDCYcKCwwNDg8QERIThRQVFhcNGBkaGxwdoYMDHhcXHxggISIjEiSvJSYXJwsoISkpIyorLIIDLS4WLzAxMjM0NSo2N8o4OS46OzwzPSk+P0BBgkI8Q0NERUZHCEhJSktMgwk4Qy1NTk9QUVJLphCiUsWKlStYsmjZQiJgIS4KuijQ4iXAFxYCDVFJwGUFmDBhMjYSw0KMyEYoBfkJBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-appcalc16:app app16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBISChPz+/AQCBCH5BAEAAAAALAAAAAAQABAAAAI4hI9pwe0Ogpi00hHF2LzzzFlTsIHD45SSx6oCeW4wjK2tl83y7t64pIsJaxrfh2bEAJIlhRPhLwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-appclock16:app app16 16:photo:16 16:R0lGODlhEAAQAIIAALy+vAQCBPwCBMQCBIQCBISChPz+/MTCxCH5BAAAAAAALAAAAAAQABAAAANbCLHcrSLKOZcYmDSCsR1aUABAsXDDJwJGa5SBFwgaWxbCG3CWaBwG3C8Y67FawpYiNQscg65fsVkYuoAmJs1pBR522lQB6ILJLqHRwQQOZzYdZnw+dzruDIA/AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-appdate16:app app16 16:photo:16 16:R0lGODlhEAAQAIQAAASC/AQCBPzerPyqXMRaBIQCBISChPz+/KSipMTCxPz+BMTCBPwCBPz+xPzCxMQCBISCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVxICCOQGCeJjkGwkC8RFEEavkax2G8dB0QuRyhhzoBg8MSYsncJXKJZIDZHCoWP1ogGIwGrtnSgUFmHLyNRHhrdpjRamnO/SYkromHdnxwnwkKVxByZW8DgQsQM2JcfwZXO0MBCZSVBgMuLzJaRZ0pfiEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-apppencil16:app app16 16:photo:16 16:R0lGODlhEAAQAIMAAASC/IQCBMQCBPzCxAQCBPz+/MTCxISChDQyNKSipEQCBAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARDEMhJZRBD1H2z3lMnjKCFjUJQimOgcmcbELCXzjXq0hV785WCQYcDFQjDXeloMByKG6YTAdwIDAlqSZJSVFeKLcUfAQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-appsheet16:app app16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBAT+/Pz+/KSipPz+BAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANFCBDc7iqIKUW98WkWpx1DAIphR41ouWya+YVpoBAaCKtMoRfsyue8WGC3YxBii5+RtiEWmASFdDVs6GRTKfCa7UK6AH8CACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-apptool16:app app16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBISChGRmZMTCxKSipLS2tHx6fPz+/OTm5FxaXOzu7DQyNMzOzAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAReEMhAq7wYBDECKVSGBcbRfcEYauSZXgFCrEEXgDCSeIEyzKSXZoBYVCoJVIqBGByKu0Cy8QHxmgNngWCkGgqsGWFseu6oMApoXHAWhWnKrv0UqeYDe0YO10/6fhJ+EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-apptools16:app app16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBExKTERCRAQCBOzu7Nze3MzKzLy+vCxqZBQ2NJyanKyqrGRiZDRydKza3FRWVPT29LSytDw6PMTm5EySjCxaXGRaJFSanCRSVGxqbPTmvMSqVJTW1GSurHS6vOzq7KSipISChFRKHJSGNPz23GxKFBQ6PKyurCwqLMyufJx2RAQGBJSWlEwyDIRiLNy+lLSKVDwmDJRuNOTOrLyabGRCFDx2dKSCVOzWtHzCxOTGnNSyhAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAahQIBwCAgIBAOiUiggFAyHASKxDAwUC8Zg0HAglA9IZPGQABoTSqJCFTIOEIsFgHBcEhhHUpKJFCwaGxYYHB0VEx4IEh8gIQwiIyQbJRMcHokmEicfDygAkCkqJQgIGG0rLElCLS4vMCWqQwMCQg0UMTIzNDVLQjaIGDE3ODQlS785CEkxKjowvEOHybG4O6JDCdNKuDUxRAmxRDHeveUAfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-appuser16:app app16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/MTCxISChMT+/ATCxASChFxaXAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEMg5gw00yyDGIAR1YUDggeFWFIZhnSBZrsZxdIOFEGTA2oeBAHeyuGwvzxBlYdUOLROMFzDQntJPrNoqAKUBaqnV+k57ZORruykHDj2LqIzUVKp1u0iuB/gjACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-appusers16:app app16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMTCxISChAT+BMRaBPyqXARCBPz+/FxaXAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARLEIRJa5Ui673nsGAgeKE1Bl9AUEXbiqTlFlZaGUZoszm4BzhDAVf5BYbAXI+TAR6CS2ZGSZSEiIIqYIsSIEaJ7GRrlY7J1lKA7I8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-appwp16:app app16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBKSinJyOfPz27Pzy7AwKDExOTJyWlERCRKSelPz69LyyrKymnPz+/MS2fDQyJAQCBOTazLSiXOzivMS2jKSSVOzmxPz25NzSpPTu5KyebOzixNTGjOTWpMSydMSybCwqFGReVKyaXNzSnGxeNJSCVMS2nPz23MSuZIR+bJyShLyqnOTOtGxiXIR6XOTSvIx6RMSubIyCdKSalMS6pOTWxMzKvKSabJyKTOzezHxuPGRmZKyurMTCvPTq3AAAACH5BAEAAAAALAAAAAAQABAAAAajQIBwCAgIiEhiYEA4FgwHRDKhIBAWz4OhgGQ0FAPHA7qFEBONb0Qy0ULeQ2+aUrFcMI+3GYBOZzQbHB0eHyAhIQByDREiEwMjFRIkJQImAgJ+jScjHigkKSorLC0AKg2NFSMoki4qCy+IQgITKDAxkjIzNDWkQxQoJaskMgk2Eb1DNzgoOCoHDDY5yEIwJToAOzw9ET7TQiREAhkZ3kmy5QB+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-cal1day16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBAQC/AQCjPz+/MTCxKSipAAAACH5BAEAAAEALAAAAAAQABAAAANOCLrMEUDIOUS9AFLLhx8LIRZjKYZmMRCkaChFLHty/AIiS3y6q+QtT49wq8VotRtQJGwRf6Zmrlj7DJLQXsupTJmeEIN4TB5nII20wp8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-cal5days16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBAQC/AQCjPz+/MTCxKSipAAAACH5BAEAAAEALAAAAAAQABAAAANMCLrMEUDIOUS9AFLLhx8LIRZjKYbj55GioRRwoQ5x4QIiIdMmcec7jy53q81qP9OO5VMAj8RXTFWzOZW95HDLdEEM4LA4nIE0zgp/AgAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-cal7days16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBAQC/AQCjPz+/MTCxKSipAAAACH5BAEAAAEALAAAAAAQABAAAANPCLrMEUDIOUS9AFLLhx8LIRZjKYbj55GioRRwoQ5x4QIiwcp0fucsj873qvGMv5Jw2FIACUsW4WakGW1O046I05qmGYBhTC6TM5CGWuFPAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-calappointment16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIMAAAQCBPwCBAQC/AQCjPz+/MTCxPz+BISCBISChKSipAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAARbEMhJaQhA6D1E/wDGeeRgDhOhFoTBEi+REgdrIHScSEVvAD9Xr7cDqGSGpFEnQSqTv2NxCFQOiU1VEAiTZmstHFg1vQKuw+LxxfYaV/AuOQRI2O/4ewhT6Uv8EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-calbell16:cal cal16 16:photo:16 16:R0lGODlhDwAOAIIAAPwCBISCBPz+BIQCBMTCxISChPz+/AQCBCH5BAEAAAAALAAAAAAPAA4AAAM+CLrR+zCIAWsgLVRGRBhOVQiG94WPVAbHaZHYAWqRYLbge88RsbInGuBCEhRYrZYm4xk4nYdoKzKIbiKHawIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-callist16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIMAAAQCBPwCBAQC/AQCjPz+/KSipPzerMRaBEQCBAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAARDEMhJaQhA6D1E/wDGeeRgDhOhruyatjBRSIRxxOsMEAdC0BUZDcfSEYvDo3Bn++2Cxt7RqFxWhZiCdsvdhjCVsMQfAQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-calmonth16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBAQC/AQCjPz+/MTCxKSipAAAACH5BAEAAAEALAAAAAAQABAAAANSCLrMEUDIOUS9AFLLhx8LIRZjKYbiRxLFIBpK0Q6z7MkwkJIe8b0KEeuWchFysuStVsjtfMbeMQitWpG25YfmNK1WU53XNIUYzug0OgNpuBX+BAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-caltoday16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIMAAAQCBPwCBAQC/AQCjPz+/MTCxKSipPyCBMRaBPyqXAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAARTEMhJaQhA6D1E/wDGeeRgDhOhFmurpi5LyIQhFfiBIAfuFzaAioBIJBCummRYPCaDPh3vhwsOZdihNfa8Ub/AJXemFZPPNBvGwG672yFMZS7xRwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-caltodo16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIMAAAQCBAT+BAQC/AQCjPz+/MTCxPzCxKSipPwCBMQCBIQCBAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAARaEMhJaQhA6D1E/wDGeeRgDhOhFmurpi5LyMYhFXiuFwZiA6qZYbbqJX5BIw2RAPxwAAWCyWMCCsiXFGEEErKz6LQZfOqiTR1YJiGq1rFyyHmo2+/1EKbCl/gjACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-connecting16:connect connect16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBPz+BMTCBISCBAQCBPz+/MTCxMTGxISChFxaXMzGzKSipAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEMhJZbihUiz60FPnfaA0iBpBVGdHEYWxToEoSHBRHHM9AgSEQRcj+AYkYAJxIPKQFUJiOdTJQFIDU6dYzKKFhTCM+E5g4mXaDAyrlogEG+DGTecA7wsP8EcAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-connectno16:connect connect16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBPz+BMTCBAQCBERCBPz+/MTCxMTGxISChFxaXMzGzKSipAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARPEMhJq704axBEHoPUEdhQGMNYFuwxkKInDYjBniEnwMCQIIebSzXx/WwsFK+YMABZikWuYlrUCtZpEYv4WRPaHhb064YB41kCfJFSQBh/BAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-connectyes16:connect connect16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/KSipDQyNMTCxMTGxISChFxaXMzGzAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEMhJZxCjgsAtDtUlCOA1gJQ4kl/IDatAoF7xxkS6GgEBr6jAobCyBX42SQBxMOx6A8MhiGASR8YDgrYsNEeJ0zaEGZY7uoH2oB6nOUwtbdLaVOeTUwo/8UcAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-devcdmount16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXISChNTS1MzKzMTGxMy+vNSytAQCBOzq7OTi5Nza3Oy6vPy2tOTStPz6/Ozu7Nze3MTKxOS2tOzOvNTqvLT2tDw+BPTy9MzOzLS2tPy+tLz+tLz2tLSynLzqvLzavLTOtNTW1KSipPz+/LzKvMTCxDQyNASCBARCBDTSJIT+bAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAa0QIBQGBAYA8Ok0DggFAwHBEIJECQUi8GT0XBMh9YHJDKQTBqUiuUCVmAeiYzmsKlwOt/AAKFIFAIIFx4WHyAhUwIDIgsZFyMkFxchJSYmiBkSBBoIJJwIGgOhiCYFJSEnFyQjFwNZewABISAfFiYnCAEmCREIrwAIFhwVGwcaBAkPGApsQsAVFA0GBQMRbxBTKM0ODQwTEq192ClDgROkBHvYKuNJUu5CKCorX1RDKCkpUn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-devcdunmount16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXISChNTS1MzKzMTGxMy+vNSytAQCBOzq7OTi5Nza3Oy6vPy2tOTStPz6/Ozu7Nze3MTKxOS2tNzmvLT2tDw+BPTy9MzOzLS2tPy+tLz+tLz2tLSynLzqvLzavLTOtNTW1KSipPz+/MTCxLy6vDQyNOTm5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAapQIBQGBAYA8Ok0DggFAwHBEIJECQUi8GT0XBMh9YHJDKQTLqUigWsuDwSmMxBQ9lwvoEBQpEoBBAWHRseHyBTAgMhCxgWIiMWFiASJCSHEgQSGQgjmwglGKCHBQUSICYWIyIWAwshIVMBIB8eFSQmCAEFCREIekIIFRsUGgcZEgkPFydrvxUUDg0GBSEREGJfv9AMEySsJxDYQ4DcEhh64UpS6lTs7QB+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-devdiskmount16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBDQyNIRuVKyCXMSKROzSrOzKpOTGnLSafLySZKxuLMSOVPTWvPzixLSehNyibOzOrGxaVJx+XOzGnFw2FJRuPKx+TPTSrHRWPKyKZPTOpHxOJKyKXFw+HKSipISChMTCxFxaXIRiPNSWXExOTOS2hLR+PLRyLPTWtMyOTASCBARCBPz+/DTSJIyKjIT+bAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaTQIBwCAgYA8SkMCAYDARI5ZJQMBwQiWgyoFgwrA3HQ7scQAqFAcEQOUi0zAkFUSFYLghMBloUCDQNGxwdHhwHekcfICEhICIfIxkLJBABJUYCICABIhAOBiYnKJaXmH4CGSkYCCqkSAEfTKenrkOwsrQll0IrS7G5uwArLLaxLbXCLsTFLyDBKy4wZEVHvCwsRn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-devdiskunmount16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBDQyNIRuVKyCXMSKRPTWtOzKpOTGnLSafLySZKxuLMSOVOzOrPzm1LSehNyibGxaVJx+XOzGnFw2FJRuPKx+TPTSrHRWPKyKZPTWvHxOJKyKXFw+HPTOpKSipISChMTCxFxaXIRiPHxaNLRyLNSWXExOTPzixOS2hLR+PMyOTPz+/IyKjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaIQIBwCAgYA8SkMCAYDARI5ZJQMBwQiWgyoFgwGgiD46FdDiCFwoDQAEe0TMkEQSFULIcLBloUCDIaDRscHRsNHhhHHyAhISAiHyMkJSYQASdGAiAgASIQKA0pKguXmJl+AiQGFwgrpUgBH0yoqK9DsbO1J5hbsrq8SrgstlJFHy0gwMVFR1J+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-devfloppymount16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBAQCBMTCxARmZPz+/FSWlLSytKSipERCRIyOjISChOTm5HRydNza3GRiZFRSVASCBARCBDTSJIT+bAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVrICCOQBCQKBkIw5mqLFG47zoQ+FwbN57TosDhgPD5dMEEIqE04kwlBWKBUEiNVYFpyqAyGEUCgqEtERiNNMLhQKzLQYJg7n7Y4aMAwbCUPvAQeWNgfzQQETAIhSMQEogwgBITQEGGEREmfiEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-devfloppyunmount16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMTCxARmZPz+/FSWlLSytKSipERCRIyOjISChOTm5HRydNza3GRiZFRSVCH5BAEAAAAALAAAAAAQABAAAARcEMgJQqCYBjFu1hxReN82EOhYGieaklJwHIjrqnGCJLqNWhUFYoFQCG1FgWXIIDIYNQKCoawQGI0swuFAbKsxgmDsfZjBkwDBsNM90Jot9A3DbBD0Dwiur9QnfhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-devnetwork16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBAQCBISChPz+/Nza3ARaZESanCyKlARudARGTLy+vNzq7ARmbMTCxARufAROVMzOzKSipARyfOzq7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVmICAGZFmKQiACweCSBImq41AYB5IodLq2hwWO0ejRWDac48Gb/QKNqNRoqspmrVcAUuIJBANS8sBIFCORUgooPEh4J8B67NgdsVBp9C5XWfl9LRMTCyReX19hARNojWlWLH+AAH4hACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-devpc16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBISChHx+fPz+/AQCBAQC/AT+/AQCxAQChAT+BLy+vAR+BAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARYEIAgqK1YzsG754QUDERpmkEpkkXrtoK6EcVgHIibhnNx564Yb0TDvQq7FQ34EiqPOhnREqhWSUPsyZSQAbbg7GcMEgwUiYVivTa1R+y4XEGoWO/4AMAfAQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-devscanner16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/MT+/ASChARCRATCxMTCxFxaXKSipDQyNAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARTEMgJgqWBVivEldkUdKSXhVjZfenommglDERh3Tc4E4ZRHAGgkEPr9X6H5AHBERSMRyWzkug8jQXFEhWoOo8dRYxqLXSmGjIJnVaz29Q3fAP3RwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-devscreen16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXFRSVPz+/PT29OTm5OTi5DQyNDw+PERGRExKTHx+fISChIyKjHRydFxeXDQ2NCQmJBQSFAQCBERCRMTGxHR2dGRiZExOTDw6PCQiJAwODCwuLFRWVOzu7BweHAwKDCwqLHx6fBQWFGxqbGRmZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAanQIBwSCwKAwKkMslEAgSDqDRKqBYKhkNgcDggEorkMrDQchkNhuOhgEQkk0l5S2lUGpYLJqPZTAwMHB0DCmhqAW0Rfh5zAxgOkBcCFAcfIBMECxwBBAEPFw8dChkhcBMDDAcdnQqtFKSWcQMimx4dGRkQBxGxsg6bBQEawx8jl3GnJFoFHRNXVVNRJYIFDAsL1tgiDiQXFx0HABwcXeQH5OjkRutEfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-devspeaker16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBFxaXAT+/DQyNATCxMTCxPz+/AQCBKSipASChAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARWEMgJQqCXziDG2JoUEENhZBkmHIWJVptAmqcIW/Js1MiF56TBzkckAAcHoa9nMRKeA4TyJk0knsHhTeK5khBaH2VwLYVh40TJhQ6RzeIQV32Quz8hfwQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-editcopy16:edit edit16 16:photo:16 16:R0lGODlhEAAQAIUAAFxaXPwCBNze3GxubERCRPz+/Pz29Pzy5OTe3LS2tAQCBPTq3PTizLyulKyqrOzexLymhLy+vPTy9OzWvLyifMTCxHRydOzSrLyihPz6/OTKpLyabOzu7OTm5MS2nMSqjKSipDQyNJyenLSytOTi5NTS1JyanNTW1JSWlLy6vKyurAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAAaUQIBwCAgYj0eAYLkcEJBIZWFaGBie0ICUOnBiowKq4YBIKIbJcGG8YDQUDoHTKGU/HhBFpHrVIiQHbQ8TFAoVBRZeSoEIgxcYhhkSAmZKghcXGht6EhwdDmcRHh4NHxgbmwkcCwIgZwqwsbAhCR0CCiIKWQAOCQkjJAolJrpQShK2wicoxVEJKSMqDiAizLuysiF+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-editcut16:edit edit16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBPz+/ISChCH5BAEAAAAALAAAAAAQABAAAAIwhI9pwaHrGFRBNDdPlYB3bWHQ1YXPtYln+iCpmqCDp6El7Ylsp6ssR1uYSKuW0V8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-editdelete16:edit edit16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbPT29GxubMzOzDQyNIyKjHRydERCROTi3IyKhPz29Ox6bPzCxPzy7PTm3NS6rIQCBMxCNPTq3PTi1PTezMyynPTm1PTaxOzWvMyulOzGrMymhPTq5OzOtNTKxNTOzNTCtNS+rMSehAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaKQAAgQCwahcihYMkcBAiBpLJApRoOBWgyIKhSEQkFgrBAcr1URiPhKAsDD3QB8RhA3FM0IlLHnyUTVBMSFBUWfl0XGBMTGBcZGodmcQWKjpAbHIgIBY2LHRoempOdjooTGx8giIOPFYofISJ+DyMXI6AfFySyfiUmJSUnKBYcICIpfgELzM3OZX5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-edit16:edit edit16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxaVMR+RPzKjNze3AQCBMR6RPzGjPyODPz+/MzOzPyKDPyKBPz29OTWzPyGDPyGBOx6BOza1OR2BKROBNSOXKRKBBwOBOzu7PTWxPzizOySZPyCDFxaXOy2lNRyRMxmJCQOBPTm1OzStPTKrMR+XIRWLFxGNCQSBDQyNIRSNDQuJERGRLyqlNzSvIx6ZKRuVEw6LLSyrLymhKSShBwaFFROTJyWjMS+vNzW1OTazNzKrHRqXOzezOTOpPTq3OzWvOTStLyedMS+rLy2pMSynMSulAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAewgAAAAYSFhoQCA4IBBI2OjgUGBwiLBAmXlpcKkgsMlZcJBA0JDpIPEBGVjwkSBgOnExSfmBIVBxAMExYXswkYGRobHLq8gh2PHhoeHyAWIYKzIiMkJSYnKCnQg5YNHtQqKywtK9qMBC4vMDEBMjIz2dCMDTQ1Njc4OToz5PEEOzw3ZPToMcLHO23HfogQ0QMIkCA+hPBbhAPHECJFjMyYIUQIvEUpUqwQOXKkSEF+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-editpaste16:edit edit16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBCQiFHRqNIx+LFxSBDw6PKSaRPz+/NTOjKyiZDw+POTe3AQCBIR2HPT23Ly2dIR2FMTCxLS2tCQmJKSipExGLHx+fHR2dJyenJyanJSSlERCRGRmZNTW1ERGRNze3GxubBweHMzOzJSWlIyOjHRydPz29MzKzIyKjPTq3Ly2rLy+vISGhPzy5LymhISChPTizOzWvKyurPTexOzSrDQyNHx6fCwuLGxqbOzKpMSabAQGBMS2nLyulMSidAAAACH5BAEAAAAALAAAAAAQABAAAAa7QIBQGBAMCMMkoMAsGA6IBKFZECoWDEbDgXgYIIRIRDJZMigUMKHCrlgul7KCgcloNJu8fsMpFzoZgRoeHx0fHwsgGyEACiIjIxokhAeVByUmG0snkpIbC5YHF4obBREkJCgon5YmKQsqDAUrqiwsrAcmLSkpLrISLC/CrCYOKTAxvgUywhYvGx+6xzM0vjUSNhdvn7zIMdUMNxw4IByKH8fINDk6DABZWTsbYzw9Li4+7UoAHvD+4X6CAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-editshred16:edit edit16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbGxubMzOzPz69DQyNIyKjERCRPz29PT29OTi3IyKhPz27PTu5PTy5Pz6/Pzy7PTq3OzexLyqlPTm1PTizOzavLyqjOzWvOzaxLyifOzizOTOpAQCBOzezAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaEQAAgQCwahcihYMkcBAiBpLJApRoOBWgyIKhWEQkFYYHkeqkMxKFBFpq9jgdkEGlPqwrJhCIY2N8FFRYUFxcYGX9dgRKEGhiHiYEOhBcbGBwdiQEOARcBGwEeAZllAgEUnQEfoQEgmp4hrCKtrwEYsrRlTiMBJAG8syN/IyMAxMXHSH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-edittrash16:edit edit16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBKSipFxaXPz+/MTCxISChDQyNCH5BAEAAAAALAAAAAAQABAAAANQCKrRsZA5EYZ7K5BdugkdlQVCsRHdoGLMRwqw8UWvIKvGwTICQdmGgY7W+92GEJKPdNwBlMYgMlNkSp3QgOxKXAKFWE0UHHlObI3yyFH2JwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-fileclose16:file file16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBCQiJBwaHAQCBDQyNDw6PFxaXFRSVERGRCwqLAwODGRiZHx6fPz+/GxqbAwKDCQmJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVaICCOZGmeqBgEwjCkRGEcSKK4JrEcBrMgAdeLVDg0GguGsYEbBQyGYyN6FDoPDIf0+LCKBIgetQERDgGDBGIpNY8GioAU0m6KXFw883w3+/l9f4AkfimGIn4hACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-filedocument16:file file16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJSWjPz+/Ozq7GxqbJyanPT29HRydMzOzDQyNIyKjERCROTi3Pz69PTy7Pzy7PTu5Ozm3LyqlJyWlJSSjJSOhOzi1LyulPz27PTq3PTm1OzezLyqjIyKhJSKfOzaxPz29OzizLyidIyGdIyCdOTOpLymhOzavOTStMTCtMS+rMS6pMSynMSulLyedAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaQQIAQECgajcNkQMBkDgKEQFK4LFgLhkMBIVUKroWEYlEgMLxbBKLQUBwc52HgAQ4LBo049atWQyIPA3pEdFcQEhMUFYNVagQWFxgZGoxfYRsTHB0eH5UJCJAYICEinUoPIxIcHCQkIiIllQYEGCEhJicoKYwPmiQeKisrKLFKLCwtLi8wHyUlMYwM0tPUDH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-filefind16:file file16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBCQmJDw+PBQSFAQCBMza3NTm5MTW1HyChOT29Ozq7MTq7Kze5Kzm7Oz6/NTy9Iza5GzGzKzS1Nzy9Nz29Kzq9HTGzHTK1Lza3AwKDLzu9JTi7HTW5GTCzITO1Mzq7Hza5FTK1ESyvHzKzKzW3DQyNDyqtDw6PIzW5HzGzAT+/Dw+RKyurNTOzMTGxMS+tJSGdATCxHRydLSqpLymnLSijBweHERCRNze3Pz69PTy9Oze1OTSxOTGrMSqlLy+vPTu5OzSvMymjNTGvNS+tMy2pMyunMSefAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAe4gACCAAECA4OIiAIEBQYHBAKJgwIICQoLDA0IkZIECQ4PCxARCwSSAxITFA8VEBYXGBmJAQYLGhUbHB0eH7KIGRIMEBAgISIjJKaIJQQLFxERIialkieUGigpKRoIBCqJKyyLBwvJAioEyoICLS4v6QQwMQQyLuqLli8zNDU2BCf1lN3AkUPHDh49fAQAAEnGD1MCCALZEaSHkIUMBQS8wWMIkSJGhBzBmFEGgRsBUqpMiSgdAD+BAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-filenew16:file file16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbPz6/GxubNTKxDQyNIyKhHRydERCROTi3PT29Pz29Pzy7PTq3My2pPzu5PTi1NS+rPTq5PTezMyynPTm1Pz69OzWvMyqjPTu5PTm3OzOtOzGrMSehNTCtNS+tAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ/QAAgQCwWhUhhQMBkDgKEQFIpKFgLhgMiOl1eC4iEYrtIer+MxsFRRgYe3wLkMWC0qXE5/T6sfiMSExR8Z1YRFRMWF4RwYIcYFhkahH6AGBuRk2YCCBwSFZgdHR6UgB8gkR0hpJsSGCAZoiEiI4QKtyQlFBQeHrVmC8HCw21+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-fileopen16:file file16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBOSmZPzSnPzChPzGhPyuZEwyHExOTFROTFxaVFRSTMSGTPT29Ozu7Nze3NTS1MzKzMTGxLy6vLS2tLSytDQyNOTm5OTi5Ly+vKyqrKSmpIyOjLR+RNTW1MzOzJyenGxqZBweHKSinJSWlExKTMTCxKyurGxubBQSFAwKDJyanERCRERGRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaRQIBwGCgGhkhkEWA8HpNPojFJFU6ryitTiw0IBgRBkxsYFAiGtDodDZwPCERCEV8sEk0CI9FoOB4BEBESExQVFgEEBw8PFxcYEBIZGhscCEwdCxAPGA8eHxkUGyAhIkwHEREQqxEZExUjJCVWCBAZJhEmGRUnoygpQioZGxsnxsQrHByzQiJxz3EsLSwWpkJ+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-fileprint16:file file16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFRKNAQCBPz+/MTCxExKLPTq5Pz29Pz6/OzezPT29PTu7PTy7NzClOzm1PTu5LSabJyanPTm3FxaXOzCjOTKrOzi1OzaxOTSvJyenGRmZLyyTKSipDQyNERCROTi5Hx+fMzKzJSSlIyOjISChLS2tAT+BDw6PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaYQIBwKAwIBMTkMDAYEApIpVBgOCAOg4RRGlAoEAuGIdGITgWOq4LxcCQgZkEkIHksHgYJOR6ZQCgVFhYJFxgTBVMZihoCfxUYDWUbUBGKGREcjBoQEB2TAB4CAx+Vl5WMhyACHiEhH6IfIiMktCQgE0cZJQStr6O2t6EARxO6vK6iEx4dZsMCxbsmBB4nzUTEutVSSUdmfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-filesave16:file file16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBFRSVMTCxKyurPz+/JSWlFRWVJyenKSipJSSlOzu7ISChISGhIyOjHR2dJyanIyKjHx6fMzOzGRiZAQGBFxeXGRmZHRydGxqbAwODOTm5ExOTERGRExKTHx+fGxubNza3Dw+PDQ2NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaAQIAQECgOj0jBgFAoBpBHpaFAbRqRh0F1a30ClAhuNZHwZhViqgFhJizSjIZXQCAoHOKHYw5xRBiAElQTFAoVQgINFBYXGBkZFxYHGRqIDBQbmRwdHgKeH2YgHpmkIR0HAhFeTqSZIhwCFIdIrBsjAgcPXlBERZ4Gu7xCRZVDfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-folder16:folder folder16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBwWHMzKzOzq7ERCRExGTCwqLARqnAQ+ZHR2dKyqrNTOzHx2fCQiJMTi9NTu9HzC3AxmnAQ+XPTm7Dy67DymzITC3IzG5AxypHRydKymrMzOzOzu7BweHByy9AyGtFyy1IzG3NTu/ARupFRSVByazBR6rAyGvFyuzJTK3MTm9BR+tAxWhHS61MTi7Pz+/IymvCxulBRelAx2rHS63Pz6/PTy9PTu9Nza3ISitBRupFSixNTS1CxqnDQyNMzGzOTi5MTCxMTGxGxubGxqbLy2vLSutGRiZLy6vLSytKyurDQuNFxaXKSipDw6PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfDgACCAAECg4eIAAMEBQYHCImDBgkKCwwNBQIBBw4Bhw8QERITFJYEFQUFnoIPFhcYoRkaFBscHR4Ggh8gIRciEiMQJBkltCa6JyUoKSkXKhIrLCQYuQAPLS4TEyUhKb0qLzDVAjEFMjMuNBMoNcw21QY3ODkFOjs82RM1PfDzFRU3fOggcM7Fj2pAgggRokOHDx9DhhAZUqQaISBGhjwMEvEIkiIHEgUAkgSJkiNLmFSMJChAEydPGBSBwvJQgAc0/QQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-folderhtml16:folder folder16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBERGRBQWFMzKzOzq7CwqLDw6NARqnAQ+XHR2dKyqrOTm5ExKTERCRHRydMTi7NTu9HS+1KSmpBweHDy67DyixHS61ITG3AxypByu7DxinBw+ZERmdIySjITC3ARypExOTDRurIR2RPTSdJyulEyGvBw+bFSyzJTK3LzKvPzivOTixNTChLSybGyCfCRSnBQqRASGtFyuzDw+PCRShPzy5OzerOTShKyaTEx6pCxerGRufBR+rOTezPTShNy6bER+1BxCfBQuRAxelFSixBw2VISq3GySrPTWlHyanIyitFSO3IymtCRujAxWhCRqlCQ6XGyWvNS2bFyGvDxuvCRSpLy+vMS+vGxqbFyO1GSi3EyO1FRaVCQuPLS2tDxyzKyWNFxaNCQyPGxubCxajERSVExKNJyenAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfZgACCAAECg4eIAAMEBQICBomDBwgJCgsEDA0BDg8BhwYQERKUDxOYDAyeghQVFhehGBmVlwwOqxobHB0eH6EfIAkPIYIiIyQlJhsnKBcpvrYiKissLS4vMDEyFjOvNAA1LDY3ODk6Oyc8PTIyFzQ1Jj42P0A6QTtCQ0REIEUORkdIkihZwsSekBhNnDyBciCKiSNSplDRUcWKkRhXCGDJYgiGli1cpuTocsILjytfFmRpACAGRTBhRogZgzHlAjKGWnIoY+bMgRgBDHRBo/LAIZoxuhwKatRPIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-folderlocked16:folder folder16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBQSFMzKzOTm5CwuLERCRARqnAQ+XHR2dKSmpOzm5GxqbCQiJMTi7NTu9HS+1HRydOTm1Ozq7Dy67DyixHS61ITC3AxypERGRBweHByu7ASGtFyy1DSOtDRmfExOTBSazBR+rCwqLAxWhAxelByGtDSaxAwODHy+1Dw+PPT29IyqvCxujOzu7NTW1Nza3ExGJJyebKyqfMTCpFRSPOTi5DQqHOTezDw2NMTGxKyqhMTGrGxmXDQ2NMTCxMTGpHx6bHx2bBQWFIyOXDQuDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfDgACCAAECg4eIAAMEBQICBomDBwgJCgsEDAKFDQGHDg8QEZQSlxMUDJ2CDhUWF6AYGZWXFBqCGxwdFh4XGK8fIAohtiIIIx25EZwBDREHgiQjJSYmGScoKSoRKQ8rggIsDC0uJS4oGygoAyjdAAcsLxQUMDEyMzQ1EzapBy8MDDc36tFwgONFjlQ6dgCEEZBHDx8+ctRIRehHAyAwZASZIGRIEBoUBwUwIGMCiwFEaBQJichIjo9FZLBsacRIAB0A/AQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-foldernew16:folder folder16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBPz+hPz+BOSmZPzSnPzChFxaXMTCBPyuZPz+xPzGhEwyHExOTPz+/MSGTFROTPT29OTm5KyurDQyNNza3Ozq5Nze3LR+RLy+vJyenMzKzNTS1Ly6vJSWlFRSTMzOzMTGxLS2tKSmpGxubBQSFAwKDKSinJyanIyOjCQiJERCRERGRBweHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaNQIBwSCwaj8ikcokMCIqBaEDoBAQG1meAUDAQpIcBQoy1dg2JdBqhECgQ1IWB0WgcBIOBwIHXBwwPEBEREhIBbG4IExR/DBUVFhIXV2NjDVYYDY8SFU4ZVxpVAQwbGxynGxkdTh6XVh8gGSGzGSITIxokJUImGSMTwLcnKCkprgAqDSt1zCssKxQtQ35BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-folderopen16:folder folder16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBQWFOzi1Ozq7ERCRCwqLPz+/PT29Ozu7OTm5FRSVHRydIR+fISCfMTCvAQ6XARqnJSKfIx6XPz6/MzKxJTa9Mzq9JzO5PTy7OzizJSOhIyCdOTi5Dy65FTC7HS2zMzm7OTSvNTCnIRyVNza3Dw+PASq5BSGrFyqzMyyjMzOzAR+zBRejBxqnBx+rHRmTPTy9IyqvDRylFxaXNze3DRujAQ2VLSyrDQ2NNTW1NTS1AQ6VJyenGxqbMTGxLy6vGRiZKyurKyqrKSmpDw6PDw6NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfCgACCAAECg4eIAAMEBQYCB4mHAQgJCgsLDAEGDQGIkw4PBQkJBYwQnRESEREIoRMUE6IVChYGERcYGaoRGhsbHBQdHgu2HyAhGSK6qxsjJCUmJwARKCkpKsjKqislLNIRLS4vLykw2MkRMRAGhDIJMzTiLzDXETUQ0gAGCgU2HjM35N3AkYMdAB0EbCjcwcPCDBguevjIR0jHDwgWLACBECRIBB8GJekQMiRIjhxEIlBMFOBADR9FIhiJ5OnAEQB+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-mailforward16:mail mail16 16:photo:16 16:R0lGODlhEAAQAIYAAIx+fIRydHxubHxmZGxiXHRmZFxOTFxGPFxKTPwCBLymlMy+pOze3PTq3PTu5Pzy7LSmnOTaxOzm5LyqlNzOtPz69Pz27MzCtLyqrPT27IRubPzuzNTGvNTCxLSelPz25Bw+ZFxKPPzy1Pz65LyupBxKdCxWfPTm1Pz23LyinBxGbGzO5DRafBxWfBxajCymxHTS5BxSdBxKbFTK3EzG1CSGvCyKvCSSxCSavGTO5GRaVPzqzFzK5EzG3BSCtAwiPGxaVPTivPzy3NzKpBxObCRefBxqlPTmzJR2bKyahAwyRPzmvOTOpKyObNS+nPz21AQOFKyOfPzuxAQCBGRORLSadPzyzLymjMy2lOzetDwuJFRCPEw6NEQ6LEQyLEQ6NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAkALAAAAAAQABAAAAfhgAABAgIDBAQFBgcIBwmOCQIKCwwNDg8OEBESjY8CDBMUFRYVFxgZDJyOGhsPChwVHR4fFSAhjwkaIiMOJBQQDRUVJSa3GicoHw4pEA8SGSorLI8tLtQu19gqLzDECTEyMzQ14zY1Njc3ODkqCTo7MjIxNCs5PD03PjctPwlAQUIihhBpQbCIihtG+CUocASFkAhIkogQ8kFJwkcFlogIkoRJEydPnkBR6GiAxiQLgiiIIkXElFQJqESoMsRKkAhXqkhhApNKFSxZggTJ4nHIEJhaDhzYwoVLFy1avHyB6ScQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-mailget16:mail mail16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAxKdBRSfCyGvFSm1BxKfCSWzCyWzBRCXCRKfBwuRAQGDDw6PHy23Cym1CSSxByCxBxunBQSFKyurMTCxExihNza3NTW1JSSlMzKzFxaXLS2tNze3KSipCQmJGxmbNTS1KSepLy2vISGhJSWlHx+fERGRPz6/IyKjDw+POzq7JyenMzOzKSmpCwuLDQyNIyOjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaeQIBwGBAIAsOkUjAgFJRQQMHgjC4PBIEVgAh4D4aEYrGAMhINxwPyiCgYSsmEUmk82grLRZJkYCgXaAEKFxYZcEISGhsZFxwFeY0WHR5CDB8dGCAXG5shGxQicBIMpSMUGxgTGSQlpQwSJicnEwwdI7gdKAwTsykpKiobr8QMKxeHDBcsGRvOzxsT0i0uL9HSHdkT2ZkoMJXF4a8AfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-mail16:mail mail16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBGxaVOTe1Oze3OTWxOTWvNzStNzKpEQ6LOTezPz+/Pzy7Pz69Pz27Pz25Pz21PzuzPzuxEQyLLyinLSmnPz67Pz23LSafKyObDwuJMzCtLSelPzy1My6nLymjNTCxLyqnPzq1LyihKyOfOzavOzetEQ6NPTq3NzOtLymnNTGxJR2bOTOpPTivNTGvLymlKSShKyahEw+NOTe3PTm1Pzu1Pzy3FRCPPz65LSadFxGPOzm3PzqzPTmzPzmvEw6NCH5BAEAAAAALAAAAAAQABAAAAaqQIBwSCwaj8ikMhloOp/QpmAgqAoIhELBUDgcEIGEYrFgNBoLx+IBiRwkgQnFoWAwKhWLhX3BZAILGhsCDXgODhwdGB5vgAofICBlDiEiIx4kJSYBJ2UoEykqHSMrLC0nLWAnFS4UCycvMAcEMR0RLTIBMwaSahw0NTYtFwclNwEdLws4eoc2DxwQOR06ASk7PBAhIRE9Pj0tLSUY1T8I5gjn6Qgy7D8SfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-mailreplyall16:mail mail16 16:photo:16 16:R0lGODlhEAAQAIYAAIx+fIRubHxubHxqbHxmZGxeXHRmZGROTFRCPFxKTFxGPPwCBLymlMy6pOTa1PTq3PTu5Pz27Dw+POzi3PTm1OTWvPz25FRSVERCRLympPzuzPTu7NTGvFxaXKSmpPzu1Pz65Hx6fHxqZPzq1Pz23HR2dBw+ZHx+fISChJSWlDQmJHRydCxWfBxGbJyenExKTHRiXPzqzPzy3CQmJDRafGTO5ExOTERKTGxWVCRSfHTS5CymxBxajBxWfPTmvPzy1CyixCSaxCySxDSaxDSWxDSSvDyaxGS21PTmzPz21AwiPBRejCSavByGtCSezEzG3FzK5FzG3GzO5FTK3CQ2bPTixBxqlCRefBxSdBxSfBx2nCQ+dHxmXPzmvLSafAwmRAwyRPzyzDw6POzavNzKpAQOFPzuxBwWTBw2ZGRORLyWdMy2lOzetPTivAQCBKyObOTOpAweNBwWVEQyLEw2LEQ2LDwuJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAsALAAAAAAQABAAAAf4gAABAgMEBQUGBwgJCguOCwEMDQ4PEBESDA4TjY8DFAwVERYXGBkRm4+QGhsMHB0eGB8bDpyOARogEBceIRgXv8COIiMkGB4lJSYnIcwoKb/DGyoXKywtKS4pHinMLzAxJDIzNDUtNjcv6B0hLzgfMh85OjstPDw99zwd7T4/LTVAgggZQqSIECNHevSAgSSJkiVMmjh5AiWKlClAiFARUeVHFSVWmLS40gNLlh5agGzh0kWDlwZfrIDREKaCAjEqrFA5MMYLmTAxlJTxYoZMozNozqRRs4ZNmy5s3LwhA0dBnDNn5MxBoAABnTp17IitowDrmQV+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-mailreply16:mail mail16 16:photo:16 16:R0lGODlhEAAQAIYAAIx+fIRubHxubHxqbHxmZGxeXHRmZGROTEw+NFxKTFxGPPwCBLymnMy6pOTa1PTm1Pzy7LymlOzi3HxqZOTWvPz69Pz25My+tLympFRGRHxuZPzu1LymjNTGvNTCxBw+ZPz23PzuzPz65PTu5NzOtCxWfBxKbPzq1DRafGTO5BxGbPzy9HTS5CymxBxajHRiXPzqzCyixCSaxCySxDSaxDSSvGS21GxWVAwmRBRejCSavByGtCSezEzG3FzK5FzG3CQ2bPzuxAwiPBxqlBxKdCRefBxWfBxSdBxSfBx2nCQ+dPzy1CRqlAwyRDQmJPTmvPTixLSafOTOpAQOFPz21BwWTBw2ZPzmvNS6nPTivAQCBAweNBwWVNzKpPzyzLyihGRORLyWdMy2lOzetKyObEQyLEw6NEw2LDwuJEQ2LAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAsALAAAAAAQABAAAAfqgAABAgMEBQUGBwgJCguOCwEMDQ4PEJYRDhKNjxMPDBQVFhAXGBUSGY8LGhsQHB0VHh8gFQ6bjgEhIiMMJCUmFbS2CwMnG6IoKSorI7WpEycWFiUsLSou1yXXji8wFiopMTIzNDUz4zbZNxsbODk6Ozw9Pj8pPzEzQDdB60JDOkRFjBw5giRJDCWdlmxwIIRJExAWKDRyMgTIiydLoESRImQKlSUSF1SxUoXAlSBRsGSJoCVICIlbqlThcoBClC5eYFD4EiVIFwUyqywAE0ZMlqNjpJDpIkUBl0dlFChAYOZMmTJoyqQR5icQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-mailsend16:mail mail16 16:photo:16 16:R0lGODlhEAAQAIYAAIx+fIRubHxubHxqbHxmZGxeXHRmZGROTFRCPFxKTFxGPPwCBHxqZLyqlMy6pOze3PTq3PTu5Pz27Pzy7LyinOTaxOzi3Ozq3LymlOTOtPz69Pzy5My+tLympPzqzNTGvLSelPzy3BxGbBQ6VPzuzPz65LyupNzOtPz+/GzO5BRejPzq1Pz23LymjHTS5CyixCSavBxqlPz25LymnGTO5CymxCSaxByGtHRiXPzy1CySxCSezGxWVPzuxKyOhMy6nDSaxEzG3PTivNzKpKyOfPzu1FzK5PTmzJR2ZLyihLSWfKyObOzmzPzmvDyaxOzavLSafGRORMy2lOzetDwuJEw6NEw2LEQyLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAsALAAAAAAQABAAAAfUgAABAgMEBQUGBwgJCguOCwwNDg8QERITFBUWjY8DFxgZGhsaHB0aD5yODB4TGB+kICEaIiOPCwEkJRcmJyYPKCIpKrWqKywTmC0SIi4vMDHEDCsyMg8zEyI0NTY3z7U4Hhs5Mx+0IyI6OyPrIzw9Gys+PxIy2EBBxAs8Qjk5Q0RFWFxAZySfgSMsilRAkiRECHQ08hHgJ0TJkCU/mECU2ISEkowUlpAQ4QTfowNPoAzJIeRJCyjm8kVRIkWIzSkXhwxJtYAKgp9VrFi5QoWKFZ5+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-nav1downarrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIYhI+py+0PUZi0zmTtypflV0VdRJbm6fgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-nav1leftarrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAP///wAAACH5BAEAAAAALAAAAAAQABAAAAIdhI+pyxqdwoNGTmgvy9px/IEWBWRkKZ2oWrKu4hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-nav1rightarrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIdhI+pyxCtwoNHTmpvy3rxnnwQh1mUI52o6rCu6hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-nav1uparrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIYhI+py+0PWwhxzmetzFpxnnxfRJbmufgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-nav2downarrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIfhI+pq+EPXYpxUckoO3AjbF3dJwahllXe6AFgC8d+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-nav2leftarrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAImhI+pyxf5VohmSlsxmpjTzAHeN5ak6UHpqKRi2GpwvH3Q3eT64RcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-nav2rightarrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAImhI+pq5HOAjQyVnqfhHue7oAaKH5kiW0AmnLqaHomkj02g+e6XwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-nav2uparrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIghI+pyxfR0HsRzNnuXVqn3mVQZWFRyIDjp65Ga5Ly4hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-navback16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBRSdBRObCQ2TBxObISevAQCBNzu/BRGZPz6/FzC3Pz+/HTS5ByyzJze7Mzq9ITC3AQWLAyWvBSavFyuxAwaLAwSHBRafBSOrDzW5AyixCS61ETW3CzG1AQeLAweLAxefBSStEze7CSWtCyatBSCnBRWfAwmPBRWdByixAQSHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZiQIBwSCwah4HjUTBQFgkFg3MoKBykU0QhoUAIAuAksbpgNByPxQMSGVsVDYlkIqdUiJYLJqORbDgcHRseRR8gISIaEyMkGCVYRBEmeyAnlgaQkSgpmU4RAZ1OKqFOpFNGfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-navdown16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBRObCRKZBxCXAwyTKTK3Ozy/NTm9GSivAQWHNzu/FzC3IzO5CySrAQOHAyuzETS3CSWtAyOtETa5Aw2VLze7ByWtBy61BSavAxWdBRCXAwqPAQCBDR+nKTe7FS+1Eze7ByixBRmjPz+/AyexAyixAQKFBRqjAQGDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZeQIBwSCwaj0hAYCkYEJLKguGASEADigWj4bgaHpBINykwSCYRa5HCFFQsF0xGo9lwhpSOwfORYC4gISJ3RAQdIyQYJSAlImNrh4uNJkl5CoKUUBQnjlB4KJ6hokN+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-navforward16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAwyTBRObAw2VDR+nCRKZOzy/KTe7Pz+/KTK3Nzu/Lze7FS+1AyexAyuzBSavAyOtBSmzOTy/BRqjNTm9IzO5ETS3ETa5By61AyixByixBRmjAQGDBxCXGSivCySrCSWtBTC3AQOHAQWHAxWdEze7AQKFBRCXAwqPAQCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZjQIBwSCwahYGjUjBQGgWEpHNYMBCaT4G2UDggos+EwmBYMBpf6VBgYDgeEMgjIpmoAQVKxXLBPDIXGhscRB0eHyAgDSGBGyJFASMiIiMkJYImUwAnmJqbjp4AKCmhAKSlTn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-navhome16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBDw6PBQWFCQiJAQCBFxeXMTCxJyanDwyLDQqLFRSVLSytJSSlISChCQmJERGRFRWVGxubKSmpJyenGRmZLy+vOzq7OTi5Ly6vGRiZPTy9Pz6/OTm5ExOTPT29BwaHNza3NS6tJRqRGQqBNy6pIyKjDwGBPTe1JSWlDQyNOTGrNRiBGwmBIRaLNymdLxWBHxGFNySXCwqLKyqrNR6LKxGBNTS1NTW1Jw+BEweDDQ2NAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaoQIBwCAgIiEjAgAAoGA6I5DBBUBgWjIZDqnwYGgVIoTGQQgyRiGRCgZCR1nTFcsFkHm9hBp2paDYbHAsZHW9eERkYGh4eGx4ag3gfSgMTIBshIiMkGyAlCCZTEpciJyQjGxcoKUQBEhcbIiorLB4XEltDrhcaLS4vtbcJra8bMDHAGrcyrTMXHjA0NSypEsO6EzY3IzU4OdoTzK0BCAkDMgkIOjJlAH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-navup16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBRObAwSHBRSdISevBRWfAweLNzu/BSOrAQWLPz6/FzC3DzW5BxObHTS5ByyzAyixEze7BSStBRWdAyWvByixAQSHCQ2TAQCBBRGZJze7CS61BSavAxefMzq9ETW3CSWtAwmPPz+/CzG1ITC3FyuxBSCnAQeLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZfQIBwSCwaj8hhQJAkDggFQxMQIBwQhUSyqlgwsFpjg6BwPCARySSstC4eFAqEURlYhoMLBpPRUDYcHXt7RgUeFB8gIU0BIoiKjAcUIwiLSQUkJRsmGIwJJwmEU6OkfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-playeject16:play play16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIbhI+py+0R3IFQUtruXVqn3kkWyIARR4rqKvoFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-playend16:play play16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIjhI+py8Eb3ENRggrxjRnrVIWcIoYd91FaenysMU6wTNeLXwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-playpause16:play play16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIfhI+py+1vgoxzyUCxrZd18ClfmIyVyJ1lqkHuC0N+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-playstart16:play play16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIjhI+pyxudwlNyguqkqRZh3h0gl43hpoElqlHt9UKw7NG27BcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-playstop16:play play16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIahI+py+1vgpySUWpvXXqrHmSaeJEYhKYq6hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-textblock16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIahI+py40Bo5SOzRvrwlgrfnkJOIkPaaaJXwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-textbold16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIihI+py70BowPQ1HZpwNv212Vg9IGHmIjoWa4ey5DSRNd+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-textbottom16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIVhI+py+0Po5y0hYtzrkB7zH0fN/kFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-textcenter16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIbhI+pm+EPIZsnRkqtDnhu1zHfFSpjaY4PavgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-textitalic16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIahI+py+0BgztwUmmjBXX3jE0auHHhM5Yq4xcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-textleft16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIbhI+pm+EPIZsgRoqr3Vnt102fFSJjUC6nlPoFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-textmiddle16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIXhI+py+0PT5i01pisphjt3UmfFZYm5hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-textmove16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIbhI+pm+EPIZsg2kfZvblXbwTg10WlA4rjyvgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-textright16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIahI+pm+EPIZstSrqsDhhv1ylfFE5jiYwX6hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-textsortdec16:text text16 16:photo:16 16:R0lGODlhEAAQAIIAAAT+BPwCBAQCBAQC/FxaXAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM5CBDM+uKp8KiMsmaAs82dtnGeCHnNp4TjNQ4jq8CbDNOroIe3ROyEx2A4vOgkOBzgFxQ6Xa0owJ8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-textsortinc16:text text16 16:photo:16 16:R0lGODlhEAAQAIIAAAT+BAQC/AQCBPwCBFxaXAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM4CAqxLm61CGBs81FMrQxgpnhKJlaXFJHUGg0w7DrDUmvtPQo8qyuEHoHW6hEVv+DQFvuhWtCFPwEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-text16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIlhI8Jwe2/AmpTynqPTXSqrnBM+I0kdmpmGmUp+K4nPMvhYx9+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-texttop16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIWhI9pwe2uYnq0yQtqxbz7D4biSIZ+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-textunder16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIjhI+pu+FxXoOIKpds1oBH7hlYxYxRCaIZ01lhJbHy9tTv7BcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-viewchoose16:view view16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBDQyNAQCBPz+/PzerAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMzCLrcGlAs6UAYgwLdLtEcI4ygQo7VVp2oupGpG4vmaUVTemX523qlFcw0a4RqNlkx5k8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-viewdetailed16:view view16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBDQyNAQCBPz+/PzerAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMmCLrc/i1IAVkYg1Z1iRYUKCqitp1oikqBWV3ZOnhkWNagqu+qnwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-viewicon16:view view16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBDQyNAQCBPz+/PzerAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMwCLrcG1AwGOQbw6qANeCEB3pCSZpO6pgowJZqLKuUGE0dnuEhf8IL1kz1shSHDX8CACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-viewmag-16:view view16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBCQmJDw+PAwODAQCBMza3NTm5MTW1HyChOTy9Mzq7Kze5Kzm7OT29Oz6/Nzy9Lzu7JTW3GTCzLza3NTy9Nz29Ize7HTGzHzK1AwKDMTq7Kzq9JTi7HTW5HzGzMzu9KzS1IzW5Iza5FTK1ESyvLTa3HTK1GzGzGzG1DyqtIzK1AT+/AQGBATCxHRydMTCxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ+QIAQEBAMhkikgFAwHAiC5FCASCQUCwYiKiU0HA9IRAIhSAcTSuXBsFwwk0wyYNBANpyOxPMxIzMgCyEiHSMkGCV+SAQQJicoJCllUgBUECEeKhAIBCuUSxMKIFArBIpJBCxmLQQuL6eUAFCusJSzr7Kmpl0CtLGLvbW2Zn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-viewmag16:view view16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBCQmJDw+PAwODAQCBMza3NTm5MTW1HyChOTy9Mzq7Kze5Kzm7OT29Oz6/Nzy9Lzu7JTW3GTCzLza3NTy9Nz29Ize7HTGzHzK1AwKDMTq7Kzq9JTi7HTW5HzGzMzu9KzS1IzW5Iza5FTK1ESyvLTa3HTK1GzGzGzG1DyqtIzK1AT+/AQGBATCxHRydMTCxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ8QIAQEBAMhkikgFAwHAiC5FCASCQUCwYiKiU0HA9IRAIhSAcTSuXBsFwwk0wyYNBANpyOxPMxIzMgCyEiHSMkGCV+SAQQJicoJCllUgBUECEeKhAIBCuUSxMKIFArBIpJBCxmLQQuL6eUAFCusJSzr7GLArS5Q7O1tmZ+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-viewmag+16:view view16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBCQmJDw+PAwODAQCBMza3NTm5MTW1HyChOTy9Mzq7Kze5Kzm7OT29Oz6/Nzy9Lzu7JTW3GTCzLza3NTy9Nz29Ize7HTGzHzK1AwKDMTq7Kzq9JTi7HTW5HzGzMzu9KzS1IzW5Iza5FTK1ESyvLTa3HTK1GzGzGzG1DyqtIzK1AT+/AQGBATCxHRydMTCxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaBQIAQEBAMhkikgFAwHAiC5FCASCQUCwYiKiU0HA9IRAIhSAcTSuXBsFwwk0wyYNBANpyOxPMxIzMgCyEiHSMkGCV+SAQQJicoJCllUgBUECEeKhAIBCuUSxMKIFArBIpJBCxmLQQuL6cAsLECrqeys7WxpqZdtK9Ct8C0fsHAZn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-viewmulticolumn16:view view16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBDQyNAQCBPz+/PzerAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMwCLrc/ixI0WSgKoyBl+beQFACpo1AqXbKCr1wLAMWS08hGG3dSZqin4sxnBmPD38CACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-viewtext16:view view16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIchI+py40BTQSwuovp3DXkv1ia1IHmIXLiyWJ+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-viewtree16:view view16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBDQyNPz+/PzerAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAAMuCLHcri4yGISlj4kxcANgNRBQCIbL6U1Su7bB62rXvGydG25kqpwfIGxILBr9CQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-actattach22:act act22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBMTCxPz+/DQyNKSipAQCBISChFxaXDw6PAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARrEMgJgqA4zzus/gLhFd5HCcZAXqsphYPUdhcYFNRcZnvdtpnDqPTbUWgAJKBYwzBlw+bRo3xmkNWoBgm0OrVLn3GC9RgCk8DhUw7c0rHPr4CDu5SYQNyEt7uSY3p/UAKFhYKDSQOLiwgFdhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-actbookmark22:act act22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBCQmJCwqLMTGxAQCBBwaHMTCxLSytERGRFRWVLy+vKyqrKSmpHR2dJSSlJyanISGhGxubIyOjKyurGxqbFxeXGRmZHx+fKSipLy6vGRiZLS2tFRSVHRydJSWlHx6fCH5BAEAAAAALAAAAAAWABYAAAWWICCOZGmewamaQrq+wUC8azHINGocOI38iIRAceDNaISFYklkGHOEhoNBfUAOhuOLEJE8HoPiRKFdESiQBqViuTDIUAsEcyAeGJmyiqC5RCwJGg0YcEh9D0V3Dxt6JwQVDRYVHBUdi40mjw0PTgwQHgeYJQQJfxUXFxAOoTkFpQ0fsRSimQkWEQ0VtI62HLt7vjl7JQYhACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-actbookmarknew22:act act22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBCwqLCQiJCQmJMTGxAQCBLy+vLSytERGRFRWVKyurKyqrLS2tKSmpHR2dJSWlKSipISGhGxubIyOjGxqbIyKjFxaXGRmZHx+fPz+NGRiZPz+ZPz+HMTCBKSiHPz+jFxeXPz+XPz+tPz+zPz+/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAamQIBwSCwaj4Gj0hgQLJ+AAaEAVQoI06pRYDhkoYgwIhEgKBTfZ2FhaBsYDS8VWnA8Go0FJIKeqyUTDw8EDHBpSwUUFQ4UFhcYDQYFfkoFFxEQDG8KEAUZlEeWGBIakw4FG1STiBoYBRwdBR4fHgUdHKBEBSCnIR8iIyIfIblFu6ceIyQjtcXGCbLKzAUKzrq+wMLEVa+xs7W31kOTk6nkWuOf6Ea5QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-actexit22:act act22 22:photo:22 22:R0lGODlhFgAWAIEAAPwCBAQCBHR2dDQyNCH5BAEAAAAALAAAAAAWABYAAAJOhI+py90RnIMyRUOxhDfzJkACdoXBuEDDkQFDi5go0MrKx16kns80b7qdELCgBYaEGWwL5nG1ePFiKp9A6kuYRNuho8vxVrrZivmMRtMLACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-acthelp22:act act22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBCQuNBwiJAwiLAwaJAwSHAwSFIy+3ERynCw2PCQuPAwmPCxOZCxWdJzG3FSazBwmNAQKDAQGBDRmhBQyTDxujDR2rIy21AwWJDyGxCxmjAwmNDRihAQOFDxmhCxunBQWFAwaLCRahDR6rESGvDQ2PCRWdDRunDSGvCRSdAwWHCwuLDSOzHSmxDyKxBxCZBwqNHSu1DyOzAQSHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAahQIBwCAgIBAPCoGAgOoeBAyKhWCwYDUf0CX1AIhLiJEGpBLiAAaRxdgYsl7Ybk8igBZoN5xmAdDxoanp8HyANISF8EBsiXBMjJBolBEQmGHFoRScbKHIKDykqK5lFAZRCnyknTaROLA8tq61OChgtKqyzQgEYEJi6UC4vI3LAASkbMBPARAEBdszR0sACEaPSMTIQM8W6KzNl3bo0NOJDdEEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-actlock22:act act22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBHRudFxaXExGTERCRAwGDGxubPz+/Pz2/Ozm7Nza3NTS1KympFRSVHR2dNTO1JSSlKyqrKSipDQyNMTGxDw+PLSutKymrMTCxAQCBHRqLBQODJyanDQuFFxSJFRSJFRGJERCHExCHISChHxyLEQ6HGRaJExKHLSmbLy2fOzitPz23KSiZHxuNHxyNJSOTNTOnMTCjLSudKSaXJSKRJyOTOTetNzWpHxuPOTi5MzKzLS2tFxWXOzq7Ly6vOTe5Ix+RLSqdNzSpLyydKyqbKyiZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4IBAgMEBQKEjI0GBwgJCgsMDY2XjwkOAgQBDxCLl4QNCaGCBBGWooINCAqqrBKgqwATFKaDFRYVtBMXsIMNGBm0GRADjQIJxKIaGxwdHh8gISIhGyMZzIwkGholJiYfJiAfJyEZISDbg90oKCkqKwcHKyooLC0f7IIuLzD2YMSQgW8GDRri+AFoUMOGvRsxUhSsQQPHvmQSchyQtEAHhh0WJHDQcJERjwsKDvRI0BGDjwgicXhQyCOjSgUKPO6AObIkIQESfmxk6REDT4s0bfaYpDNkT4VAha5s+TLmzEYtatwIOHAiDZIKNQAJYk9IjCFEisyoocFEB4UACtBpm0t3LiF4gQAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-actredo22:act act22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBCReDJzGjMzivOTu3Pz+/JTWbHy+VHTCTMTivPT69BxGDESuJDyiHESiHEymJIzKZAQCBFS2LFzKNGzWPDRqHCxqDFSqLHy2XESCHAwaBAQOBBQqBDyWJHyqZDyKFGSiVESeJBQ6BAwSBGTGPFyWPFSSLEyOLESGJBQiDAwiBBQmDCRGFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAaoQIBwSCwaj8hkMcBkKpcBwYAwEDif0YLhwEUkFItFMkAwMBoOR+PxgHwjRDggamhIJpQ8ZbKGKOQLcgEFdhUWEYgRF3sNfhELBHALAhgZFhobRBwREhQdEAIEHpIKHwsaSJwUDQgQIJINARxKESESDQ0dgCIjSpAkDAwPco+ZSJAlJicnKHIAIrNHidOIQxunT0kpCyrZSCss0d5Fj6jjRonn6uvs2QZBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-actreload22:act act22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBCRSFCRSHBw+DBxCFCQ6FBwyDBQWBBxGFCxyLGTChMzqzLzmvHzKjDyOTER+RERyNDSqXNzy3LzivFS+fCyCPBQmBCQiBBxKFBQqDOTy3LTitES2dDR+PCxuJOT25KTarCx+PESSTCxKHDSeVCyKRNT21ESWVDSGPBQyDAQCBBQSFDRuLDSyZDySTGzChCRiJKSmpExKTDS2ZGzGhLy+vGxqbISChDSKRMzKzGxubDQ2NIyOjCQiJCwqLBQWFCwuLKSipERCRERGRHR2dAwKDDw6PFRWVIyKjCQmJFRSVBwaHKyurAQGBExOTBweHFxeXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf9gACCg4IBAgMEBQYHhI2ECAkKCwwNDg8QBAOOhAQREhMUFQgWBxcHGBmbggkaGxwPB4yDB6SbBJIKHQaqtY0eHyAhsqrDgx4aCiKpqoQHAyMjJBMKJaSxzAAHIRsmJgonKA0LHSmDKiuOBywRLSQuLyEwwyoxMuiN6iUzNBXy5jU2bsgoJugABBz95uXQsUMGD3vpPPgTpKIGwx4+HMr4kW4YkCA2hAzxAQSIECI+imBTwVIFESNHerRUgc0cEiFHkjiiyYzeDiVLdvLcySSkkKGEWiZVweSGkIHMmvQosoQlkaZOjvhosvKJjIAxoOAsgpRZkQNLnvSoqspAIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-actrun22:act act22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBAwKDAwKBCQiHNze3AQCBBwWFDw6NPTy9PTy/Dw2NKyytOTi3LS2tMTKzMzOxLy+tLy+vBQODNze5NTS1JyalIyCbIx6VIRyVISGfJyelOTq7EQ+NMTGxKyurGxeRLyKPOSmROSuVOy2XOSiTLzCzNTOzDw+NCwqLHxuVOy6bPzGfOSuXNTW1LSyrMSWRNymTOSmTKSCTPTGjPzSnPzWnMyaVBQSDMTCxPz+/KyahNSeRHxeLJRyTPzmtPzarOy6fJyajNza1Ly6vLyulFRCJPzirPTOlMS2pNTSzMTCvJyenBQWFNzKtPz6vPzyvPzqtOzGlOTe1AwGBFxWTLy6tPTm1PzSpPzutPz2xPTSnOTSxOy2dPzapPzerOzm5IR+dPzu5Pzu1PzqxPzy5Pz+9GRiXGxuZKympHR2bOTm5Pz6/MzSzBwaFJSSjCQmHPz2/AwODAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4SFhoeEAQKIjIIDBAQDjYMFBoMHCAkKgwYFhwULDAUKCg0ODxCkBQgRnoUSExMUDxUWFxgZGpAbFIuGHB0eHyAhIiMkIB8lJieIKCUpJCTGIyorLCktKIUDpC4YLzAxIjIyMzQ1NhgdpJI3ODktJTowOyM8Ejc9Pj9AQUIEclAocCMIBQhDiOwgoaKIoCI+jBxBkkSJkCWemIyq0GSHCBVHihRx8gRKFCmpKhGaQqWKFYZXsGR5kkXLFgRUXBUqkCGCFS5AjnTx0sXKlyA6CRVgAAHMAilhxIwhU6ZFkBY5kgKYUoXBAzMKzixZ4AJNGgVm1KxhM0WpmQpUMtooaOPGxAM3Nw60oYLGjNYCbzYJOgAnRzNBJ95oPYQCgpJtkwzFoULlRuRPiy9fNhAIACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-actstop22:act act22 22:photo:22 22:R0lGODlhFgAWAIUAAASC/CQKDBwKDCwODNyKjPzq7My+vIxiXAQCBOSOjPz6/OSelNySjNyGhMR+fLRaTGQ2LPz+/Nx+dNR2bNRybMxuZMxeXMxiZLQSFJQaHFwqJNyKhOSCfNyCfNR6dMxmXMxWVMRORLQODOR+fOSSjNR2dMQ2LJQWFMRWTLwWDNSCfMxeVLwaFKQODNR+fNx+fMxiXKQSDOSWlMRSTMxaVMQ6NMxORMQyJOTS1MxqXLwWFLRORMxKPMQaHMxKTLQWFCH5BAEAAAAALAAAAAAWABYAAAb2QIBwSCwajwGBcikIHIsDQmFKNRwQT2EgoVgsGOCG4wHBIgmRhWRCqVQsF0xGYyYGNgoGh9PpeCQfICEic3UAAWgLIxwRJBsbHSUREyYYJ3RDAQULexGejhueESgpl3WaCxsqJKKsChEUKywtmFoFDC4vCayikzCyMbWHt38NCTKiHhUfMyzBdQIFKsodob0VNDWzwppuKxMRrx6iNjcitNA4bh+iEzkwojc66JkOOxcf7G35PBE9KS1MEUGgIQOIFfk++KjRw9wJgUUIZvhRoyLDFCliQDQisUWLGCJOeNx4hKCGkyhPGnqCoKVLl1liypyZxUAQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-actundo22:act act22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBCReDJzGjMzivOTu3PT69MTivHy+VJTWbIzKZEymJESmFESiHDyiHESqLAQCBFzKNGzWPFS2LNTmzCxqDDRqHPz+/KTGnBQqBAQOBAwaBESCHHy2XBxGDOzy7HTCTEyyJDSqFHzWTAwSBBQ6BIy+dESKJFySPFSSNAwiBCRGFBQmDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAalQIBwSCwaj8ikMsBkKotMwYAwEDiXgYLhwD0gCFZiQKxNKBYMRqPh+D6G16y5AYnYIxBJAyF4AwITTAUJdBESD4gPFBV6Fn6ABBcJDIYPGEQZGhQbHAIdfx4JHw2VSBodGwWfAR4LDSALfkgYAQurBiAhICKfSSMkvQElGyYnGyi9Rxkdj4nOskUYyU9FpxnURikdGtjRKivdRKfQ2Inh5+jpRwZBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-actunlock22:act act22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBGxqbFxaXExOTEQ+RAQCBPz+/PTy9Ozq7Nza3NTS1KSipFRSVOTi5Hx2fJSSlKyqrJyenJyWnDw6PMzKzKyurDQyNFxWXMTCxJyanHRuLHxuLGReJFxSLFROJFxWJExCHERCHBQODISChHxyLHRqNIRyNHRmLLSqbKyiZLy6fOTarPz67Pzy3OzitKymZFxSJJySTNTSnPTy3NzSpMTChLSydKyqbKSaXJySVIyGRGReLPz23NTOnMzCjHxuPLy2vKSmpOTe5LS2tLSutHxuNHRuPMS+xFxWLIR+RDw2HFRKJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4SDAQIDBAUChY2EAQYHCAkKCwyOjZANDgIEAQoPjJiDAg2iggQQp5gMBwmrDBESl6MTFKuoFQSjABYRF40CGAW8BRm7hQwNxBobHB0eHx4gISIjBdiEAhYFJBslHOHSHh4hBSHlxIUmJygpKissBiwtLi8pGjDqhBoxMjMuaNSwcSMFjhw6dnjYRyrGCh4ueviw4Q5HDB0/PjAUJCBCAwMIGiiggAEIBFk/FgYLIgRkggQkhxAJkqGExkYMFnxsIGRkSQgLHhRRWUjAggQgG8AsSWRBBiP6VrYMOfKIyaBDNwLo+HHSUplOSyDRqiEHjRkretRQkcLgxayNF0wksQGQxsSKMTIq0QpgCba/gAE7IhMIACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-appbook22:app app22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBDyGhCyCfFSWlESOjDyKjDSGhCx+fGSinGSenFyanEySjHSqpHSqrGympEySlBx2dISytHyyrCR6dKTGxHyurHSurHyytGSipCR6fARmZFSalEyWlBRubAxubBRydDyKhDSChLSytPz+/MzKzIyOjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbFQIBwSCwaj8ikMhBQIpmCQdM5ZBIKhgNiugwkFAsCI7pNMhuOxkNBgBgEiAi3GkBLJpJHYgEpaClyREwVFhcSEhgOGQoMfgMaERtcARQBFRMYExZ6HB0FUYAekkIBHxqWFmlrC1haESAfG6MBGx+VFRgKYH0hInGRklO0ppYXCwwMWQiQHkwjgrWnFRdYZHIBJCTP0LaWGAcDW9jZ2nMAw9IWTOQkJSZMRsOV49nu8E+19PbmR7TY+1TovONH5V7Ag0QMBAEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-appbookopen22:app app22 22:photo:22 22:R0lGODlhFgAWAIYAAAQCBAQ2NPwCBHSurIS2tBx2dBweHPz+/Ozm1GxiTGyqpPz6/Pz69GSqpOzaxPzy5HxuVLSmlOTazPz27PT29NzClPTexHxuXLSmjAxqbFSinPTy9KyehNy+lPTy5Pz29HxyXNzWxKSahOzexPzy7IR2ZOTWtESenPTy7KSWfIyCbKyijAQGBDyalPTu3KSSdDSOjJyOdCSGhPzu3OzizJSGdPTq1PTq3JySdMy6lAyKhOzWtOzi1OTOrJyKbMS2nJySfMS+rAwCBNzOrNTCpNzKpJSGZKyafLSifLyylIx+ZHx6ZDSChAQuLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAIALAAAAAAWABYAAAf/gAABAoSFhoeHAAMAiI2IAAQFjI6EAAaJkQeTjwAICYkKBQcLm5WdBwyfhgChB66bp64HCQC1lQ2irqQCAA4PowsLEBESE4wAuLIHFAAVFr+uDBcYxRm1GrmuGxwdFh4Mrh8gGCET1gDYyhsiFSMkDAsMDCUYJhvnJ9kHKCnODwwfPlBQsULCPRYAWogK9sHFiwoOPEyQh0JFPXO1YBSYwBEFghjdHkwQOYGgwQwIZRR44GHGDBogabhAsYEEihrUMAIoUMCEDRs3HODIYQHFA6MPcJA7KICFjgw7eIzo4cOfiwc/gKwIUm2SkKdDdlDt4AABDaU/iIRwwbTSUyJFOow4S3Hkx9oNDDZgXPU0h1wcSIgEGUw4ibVET5WoWMKksePHpdxmyKADAEIWly9HJtQkQJMmlAgZCAQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-apppencil22:app app22 22:photo:22 22:R0lGODlhFgAWAIMAAASC/IQCBPwCBPyChMQCBPzCxAQCBPz+/MzKzISChKyqrDQyNEQCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARYEMhJ6wxiEMtpIAWxddwXiqRlikSQeiAbuC+wirNR322gv7zcLobzDU+9XypoBBKTR1lz+RTWDgip8nUwZK1XLyIx5XoVicX2RUAo1DVKi7GOBxjxfNwQAQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-apptool22:app app22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBAQCBISChFxaXNze3NTS1Ly6vKSipNTO1Ly2vNza3Pz+/MzOzOTe5DQyNOzu7MTCxGRmZMTGxPTy9Ozm7Hx6fPTu9MzGzGxmbAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAW1ICCOZGmeaEoGbBsI6joMRGEcbQwESDIrtVtAF1gwDLNaAmfKiVgLBJKgwB1KxQZrBHU0FAXmavFoQLYiB6TxFXMj5AZBwnJI2I3wcNWALyYEcgoKXxRhOHs7XxEVCwsWFgoUDRYUFwwQB25ZCxiNjo6GkwUXN2NsCxEYqhUHoQ0MEglYRQQXErcHrI55FycuB2YSmoyOBTEtB2sXuhU6XAENC2a6z9AKCwq+1tAN3E2J3ySkIQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-connecting22:connect connect22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBPz+BMTCBISCBAQCBPz+/MTCxOTi5AQGBNze3Ly6vISChNza3FxaXKSipAAAACH5BAEAAAAALAAAAAAWABYAAAR4EMhJqwzY6omD+MNGdR8YilNZnug0qGzrqrL1lnV1fyJBVB6VQEMoGH4ADGwQkxQPBwMiKGA2J8VEAnq0tgiKg5aL/C7C2gTjKCM0zowDQ8tuNQznNL7cKzjOUQsNfER+gguIg19+Pm6ChBZFDmWNi5M5FIyYFHQRACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-connectno22:connect connect22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBPz+BMTCBERCBAQCBPz+/MTCxOTi5Nze3OTm5Ly6vNza3ISChFxaXKSipAAAACH5BAEAAAAALAAAAAAWABYAAARiEMhJq7046827/+AVCKE0Dh9BAGdaGISAToFGFMcBU+11I4hDYseSZQiKwwKoI/QwBIYiuFDCZseGdIlYEjUNg1SpY6w2N4cUIW6cjwW1lsFwo+MqgtZuw0/ydw5vH34lBhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-connectyes22:connect connect22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBAQCBKyirPz+/KymrOTi5KSipMzCzNza3OTe5Ozi7MzGzPTq9OTm5ISChMS+xFxaXNze3GReZIyCjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAWLICCOZGmeaBkAQpoGg7C6JizTQT7CxPwOwFWgYPChYIXkIHC4uQKGAiKRKCyNpxxUUVViVYNFLkqtLo+DAkMMLXQPXwAy2WCTF4544FGtKuwPDhB6DnxuUmyCcXIQhV1uYoMuEAcOBxEKCHg6TzGFCJUSizuejROKOAM9OY2SnUU7nD89NCcDsLUnIQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-devscreen22:dev dev22 22:photo:22 22:R0lGODlhFgAWAIcAAPwCBAQCBPTy9PTu9Ozq7OTi5Nze3OTe5Nza3NzW3NTS1MzOzMzKzMzGzMTCxMTGxOzm7AwGDBQOFBQSFCQeHCwmLCwuLDQyNDw6PERCRFROVEQ+RDQ2NLy+vKSipISChGxqbExKTOzu7OTm5Pz+/GRiZMS+xLy6vBQWFLy2vCwiHFQ+NMSmfNSyhIxmTDwuLJx+bLS2tCwmHMyyhMyqfPTqpPzyvLSWbLSWfPzitIx+ZDw2PAwKDCQiJGxWRPTmrPTerMyuhPzqtPz63PTWnPz6zNy+nIRiVDQuLKyWbOTanPz21NS2jNS6lDQqJHRaTPzmrPTSnPzyxOTClPz2xNSuhPTqxPzuvOzSpAQGDOTKnMy2jOzSrPTu1NzKnOzOnBwWHJRuXLSWdPTatPzqvNzClCwmJOzSnOTOnPTuxOzKlOzerOzarOzitJR6ZNTO1IxmXPTWrNSyjPzOjPTSpLSehHRqZOzirOTCjPS+fPzGhOy6bOzKhGROPMy2lPz+1PzmtKRyRHRiNNTCdPz+zNzCjEQ2NKySdDQmJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAj/AAEIHEiwoMGBARIqXMhQIUIBAwYQIFCggIEDCBIoULBgAYMGDgIIDEBAwMSKBRBk3NjxAciQIwdACBBBwgQKFSxcwJBBwwYMHBx0EAmA5EwPH0CEsCChoYgOQ0cSGCHhA4kSS5syJGDiBNEAFVGUKKEBAwWFFM6SNJHi64gDFEKE4FBBggoKK1i0cPECxokYXw0gsECYggQZM2jAqGHjBo4cOtqOxLhDAg8ePXz8ABJEyBAWRIoYOfJipEoMCZEkuaFkSAslS5jUGJKkSRAnRREo0JDwCZQoTKQAmUKlihQrVa5gKZ1lI+oAK7QM2cJlSZMuU4Z4+TJEx0iNOwKAggkjZkyOFmS8kClzpcUQLRRGbjRD4MgZNEzSqKG+ZgobI2248dUbDDDwABzcxSEHEFpgEcUcdMRRhx1fFejAAx0cgcYdSxiBRx566LEHH0d8QFRRNC3Uhx985CHEH0MAEkhCBxWkgiCDFEFIEYUYUmONMhyCRxVH/PgjBYioYJAdAQEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-editcopy22:edit edit22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBBQSFPz+/DQyNISChDw6PMzKzMTGxERGRIyKjFxaXMTCvKSmpHR2dPz6/Pz29PTq3MS2rPz69MTCxFxWVHx6dJyWjNzSzPz27Pzy7Pzu5PTm3NTKvIR+fJyGfHxuZHxqXNTCtPTq5PTi1PTezNS+rExOTFRORMyylPTaxOzWxOzSvNze3NTOxMy2nMyulMyqjAQCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbYQIBwSCwahYGkUnk0BgTQ6IAQaBKfUWhBYKhaAU+CgXAQIAyChLeJzSIQhcH6GFaM0QtGY5kstqEODw8QEQELAhJTc08KBBMEFBUWDRcBE1pca20SGBkaEBscAY5maFRIAgoLHRQRHh8gIQFlZnByqA8ZGSIQIyQjJQEmYgJ5p2ACrK4gJx4gKIZZAgdeAQ4ZI9kjKSor0AwEjeAs1S0cHAslLi4vMDDRWeRIfEsxMeET4ATyVoYLC5fizXEiAR84BeMG+pEm8EsAFhAjSlR4hR6fLxiF0AkCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-editcut22:edit edit22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBAQCBAwCBPz+/OTi5JyanOzq7DQyNGxqbAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARbEMhJq704gxBE0Bf3cZo4kRJqBQNRfBucyudgvJS6VaxLzyMa6/bLiWA9HOg4VIIkL5vzuRkcpkvRIIAorphJLzBW84WEuRZWp6uaT7J2Sh1Hit3OY/ZO7WvsEQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-editdelete22:edit edit22 22:photo:22 22:R0lGODlhFgAWAIYAAASC/FRSVExKTERCRDw6PDQyNCwuLBweHBwaHAwODAwKDAQCBExOTNze3NTW1MTGxLS2tJyanPz+/Ozu7BQSFCwqLDw+POTi5PTu7MzKxIR+fCQmJPz6/Oze1NTGvPz69Pzy7Pz29LyyrPy+vPyupPTm1BQWFIQCBPwCBMS6rPzSzNTOxPTi1NS+rPTezNzOxPTizOzWxMy2pOzaxMy2nPTaxOzOtMyynOzSvMyqjPx+fOzGpMSihPTq3OzKrOTCpNzKxNTCtAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf8gACCAQIDBAUGBwgJCgsLgpCRAAwNlZYODxALEY+SkAMNEqKjEw0UD5yegqCjrRMVEqidkgWhraMWF7GptLa3EgEWFRSOnhW+vxgZEBqzkBvItxwdHryRCNGjHyAhHSLOgtgSI60c2yQjJd+eJqEnKK0hJCgnJSngAO0SF+8qEvL0VrBogW+BLX4oVKgIyMIFQU8KfDV4R+8FDBcxZBREthAFiRIsOsygsVEUh4Un3pGoUcPGjZInK65QicPlxg8oX5RwqNJGjo0hdJwQ6EIkjRM6dvDYCKIHSBc1Ztjw4eOH0oIrsgIJEqSFDBo0cuTgsdSTo7No0xYTZCcQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-edit22:edit edit22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBISGhISChHx+fHx6fHR2dGxqbGxubGRmZGRiZFxeXFxaXFRSVIxSLPyuXMzKzMzKxMTCtExOTPzqrPz+/NTS1MS+tOSaVPyWNPz6/IxeNPzavPyKBNTW1PyCBPyGBJxmNPzOpLx6PNRqBMSCRNySTPyCDPSGBMxiBKROBHRydPSylOyydMxmBJxKBAwODPS2lPTq3OyabJxGBPTy5PTGrOyOXPR+DPz69PzmzPzevNxuPORqLMReFPzy7MyCXKxiNIRKHBQWFNTOxPzixJRaPFxONHRqVPz27PTy7PzStCwqJDQyLJSGdIx6ZPz29PTu5HRmTLSKbMSGZHROPFxKPJSKfJyShKyehMyuhDQmHEQuJJyOfLSijMSynMS6pLSefDQyNHx2bKSahLyqhLymhOzi1FRGNIR+bNzKtOTOtOTKrOTKpLyedAQCBFRWVPTq5NzOvLyunLSmlNTCrOTOrNzGrLyidMS+rLyynKyijLymjLyqjAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gAAAAQECAwQFBQYHBggJCgsLDAwADQ6CAQ8QD5ydEJ+gERKWE4ICDxSpqhWqqhYNFxMYphCtqaytGRoXGxgcggSoth25u70eH8APFR0VzMzNziAXIRjIvwAFwq3EqSLUGB/iI4LathS4JCXVJh8nKCmCKrXDFCss1eIfLS4v8ssdmgWsAGNDDBnt3s3wJ+jAtlUhaNSwccNEi4WCBBl4SAHHihw6ZOzg0QNjRgAG6KXK4CNEjBU/gDQI8kLISQAIADobAoMIzCINjLw4YvNkAno4kCRRUuNHESNLmDRxUjSjAlRPfECJImUKlSpMrFzBIqWqoKtJaWSJomULAy5XXrp4+QKGYcYFoCBEWRImi5gmY7CQyVLGriAGD2jEMHMmCxc0Xb6kUbOGTRs3N988gLM4jpw5Y+iwqcOGjZ07mE8yiGABz5c8c/Ts4cOnDJkybS7fdMO7t+/fvDMaCAQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-editpaste22:edit edit22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBBQWFDw6FHRuFGRaBFxSBAQCBAQKBCQiBIx6HPz6/NTOfKyiXDQuFOTm5Pz+/Ozu7PTq5Pz63PTyxNTOjKSeRExGLMTGxMzKzNTS1NTW1Dw2NKSmpKyqrKSipJyanNzWlLy6ZLSuVIx6FISChIyKhJSSlCQiJLS2tDw6NDQyNCQiFCQmHBQSDGRiZHRydGxubHx6dGxqbFxeXGRmZFxaXCwuLOzq7KyurHx+fDwmFEQuFCweFCQWDBQODBwaHBweHKSinJSWlOTi5JyepHR2dDw6PBQSFNze3ERGRIyKjIyOjISGhPz29Pzy7MS2rMzOzFRWVHx2dHxybDQiFPz27Pzu5PTq3PTm1NTCtJyGdHxuZHxqXPzq3PTaxNS6pFxWVFRKRNS2nPTi1PTStNSulNzOxNSynMymhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCgwABAgMEBYSLggaOjgcICQoLDA2Pj4MGDg8QEZ4FDxITFBUWFxcYGRobjQ8cHR4fCQ8gCyEiFSMWJCUkJieNEB4dKB4pKissK8wrLS4vMDHBAAYQHx8dFx0fJDIzNDU0M+IyHzaNNyg43Ng5Ojs7Ojw9Pj9AMkCNDiZB/h9CSOx4QLCgihItqBkYgqIDESElitAYWJCgkQcXjjRCgi1Ihw4BB5LAQOLCgyQYHihpUU3DBw5ElpAgAYNixSRJjKjQaECDCRPZPDB5IbIGSQwKLnh4wbInLA4kmJB4oaPiAwVNnER40hRK1BIAaVatUZJEFCkmpmjgCeWDCalFe4q4oFKwSRUrEa5gycLzwq8lUnPQ4PEgSpYcUZ5o2cIlS1O/JHLEDdfjQZMIVrpgweLFy5e+M6WSmBGlxYMYYBRzCaOFi5imHWBIfOEiShLTVjaP6eyFTBmN1TA5OvLDjJksWb58OVMGDRqWjAYdmU79SIvpjqJr104nEAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-editshred22:edit edit22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBFRSVExKTERCRDw6PDQyNCwuLBweHBwaHAwODAwKDAQCBExOTNze3NTW1MTGxLS2tJyanOze1Pz+/Ozu7BQSFCwqLDw+POTi5MzKxPTu7LyyrIR+fCQmJPz6/Pz69Pzy7Pz29OzaxPTu5PTq3PTm3My6pPzu5PTq5NS+rPTm1PTi1PTezOzWxPz27MyynOzSvMyulOzOtOzKrMymhOzGpAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbpQIAwIBgMCAXDAZFQLBbCqJTRqFobjgdkEYFKowPJZEyeUBqVR/crHDTKZYplovZKCW84+YKZZNZSBXl6EwEEBhVPXxZihGMaGRscdkIdg4QeEnVfCH2OHyAhIhuUAAiXZSEhIyQlJqWnjiEnKCWupRWoYyEgJK0SKaUKjam0JCorLMFfC6iqx8giLa/MGAsT1wsuCyULKwssC9RSzdkfCyALKuALLQsvpeXYIQso3gsiCzALMfENC+dGcMNHUAY/f+jq3ctncMYCGggFrsvHcEGNh/EyPFmg8cmrJxAVkVO0EUDJklHoBAEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-edittrash22:edit edit22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBERGRExOTDQyNISChBQSFCQiJCwuLPT29Nze3GxqbDw6PGxubHR2dJyanLSytJSWlJSSlOzq7Pz6/Nza3Ly6vFRWVBQWFIyKjMTCxHx6fIyOjLS2tOTi5PTy9OTm5Hx+fNTW1KyurKSmpJyenExKTMzKzKSipFxeXCwqLMzOzKyqrMTGxLy+vHRydBwaHNTS1DQ2NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAb8QIBwSCwaj8KAMoA8LgUDQsFwQByay4RiwWg4GA9IRGk0SCYJSsUCsVwwGQ1EsmESD5xOp+L5gDwhBRIZDhcDdkMGDgEiIxAkJQ8Ok5MmAohDAQ1xJxUlKCUlEg0pKpiZJRoLCxmtCw1eURhOcR4rbQ8cGRwLAwgGtBYTDywtGRKjvQTARgEZLhMcKC0OrQMvAirMRc7CHCTU1g2+20TO0NIn1RwDCya/wdHT1Rnt5LToKOq79trx0tR02YPX7Jm8fRxMOIhSLhOJE/LCJSTlr5kFEBQsWDiR4UGGBgsuHDg1BEYAfTE6oEBR4AIBAiS5yWBAAAGBAyaPGAgCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-fileclose22:file file22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBERGRERCRDw6PCwqLExOTFRWVHRydGxqbGRiZCQiJISChIyKjHx6fDQyNBwaHJSWlKSipBQWFJyanPz+/JSSlCQmJAwKDCwuLBweHBQSFGxubExKTISGhDQ2NFxeXFRSVDw+PAwODAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbZQIBwSCwaj8jkMSAYDAgEJbFgOBwQCUOAoJAaFgvGonHIBhyP5BcSgUAYDWxggD4WFmx3e3HQngkSRgYMEBMUFG4MCId0BGlEAQeEhocVDYcUdBYKF0QCB3gRlJgUAQEYBBkaRAMbDZMMpAYcT46rQwMJrgsdC6QcfwoPnUMOBgkIV6SHHg6bw0QEAQYfBpggBZjPGsRD0gEchxwCIR6HChnQRQ8DIU4DTR4Em+ncRw8O+fmoXPXdRg+gQLFgIYM/KRIkoDP4QMKFf0o0aBAh4qGUixgzCrETBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-filefind22:file file22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBBQSFJyanLS6vLzCxISChNTe3OTu9Oz6/Nzy9Nzy/NTy/OT2/Nzi5Mzu9Lzq9KTe7LTq9PT+/Pz+/Nz2/Mzu/Kzm9Jza5HzK1LTi9PTu9IzW5ITO3FxaXNT2/KTi7Iza7GzC1LzW3FRSVMzO1MTq7HTS3Fy6zFS2vKzm7Lze5MTGzHzS5FTG1Ey2xEyyvJze7JzW3ITa5FTK3EymrGS+zFxWXKymrMzi7ESirEyqvLSyrKze7MzOzMTCxKSepAz+/NzW3MzKzBwWHLzS3ERCRAzi3KyurNze3MzGzLy2vLSutCQiJAyytHRydOTe5MTGxLy6tLyqpKyelJSCdOze3NS+tLyupLSmnKSOhCwuLPzy9Pzu7Oze1OzazOTOvMyihOTi5PTm3Pzi1PTazPTWxOzOtNSunDQyNPzy7Pzu5OzKrNzSzNzGvNS6rMyynMymjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCgwGFhYOIiYQBAgMEAwKHiokBBQYHCAkKCwwFAZOEBQ0IDAsODxARCZ6gAAEGEhMSFBUWFxgZCJ+TjBoMEpkRERscGBGRih0BBAgeFBQOER8gISEfIruIIwEkCCUVwhcgJicoKSrZg9srCRkRGdMsLS4vMNiK2wIKMRsbMiwzXtCocSydIBs3AuCIwIFDiBMucugAoWvSiB2VNPDg0ELHwA0MkCXr4aNSggg8NoDIQOFHgBtAkgURMiDAEAFEVBCJFKCIkSMGOyDRkETJEkOFmABoUsRJQkQdnkzQACWKlBtTplBR6qopxkFRJ0ytYuWKFCxZtBBq+hRA2AlbRrh08fLlCxi1a51g+dQhDFwuYsaQKWPmDBpKXgNETaNGjJgyhNfcVdTTiWI2XpK0cePmzRk4YA5T5otGixY0qFOXbgXAQCAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-filenew22:file file22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBExOTERCRDw6PCwuLBwaHAwODAQCBOze1NTW1OTi5Nze3MTGxLS2tJyanPz+/Ozu7OTi3BQSFCwqLDw+PDQyNFRSVPTu7MzKxLyyrIR+fCQmJPz6/NTOxPz69Pzy7PTu5Pz29Pzu5PTq5PTm1My6pBQWFPTq3PTm3NS+rAwKDPTi1PTezOzWxMy2pPz27PTazOzSvMyynOzaxOzOtPTaxOzKrMyqjOzGpMymhPTizOTCpNzSzNTGvMymjMSihCH5BAEAAAAALAAAAAAWABYAAAboQIBwSCwaiYGAYEAgFAqGg/Q4DCASCsTiymgcHAcqQLB4mM+QiIQBppLPcMjkwQ4bB2X4maKgt4sVCHpnFhQTElNFE3mDDxcYGRp2RBuMgxwIHX9EBZZwHh8gCBmTQ52NISEiIyQlpUImng8hHyInKAgprwAqgnC0IKwrLLpGB4wctLYkwy0uuwd9Z8AnJywsLcVFx2YcL7UnJCwwLTEy0GXJoSgrCCwzNDTnxgjeH9UrKzXwNDY36LRGhEOwLx4NHDmgJbh3QoeOgv127EhojEeHDj16pEhRQoZHHzl+QJNCsqTJSXaCAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-fileopen22:file file22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBAQCBCQWDCwaDDwmFPSubPzGhPzCfPy2dOSmZPzKlPzSnPzOlPzKjBQODPzChPzWnPy2bPSmXPyuZOyeXIRSLEQuFEwyHEQqFDQiFCweDKRuPFRSTPT29PTy9Ozq7OTi3Nze3NTW1MzOzMTGxMTCxLy6tLSytKyurDQyNMzKxOTm5OTi5Nza1NTS1MTCvLS2tLSyrKSmpJyenJSWlIyKjHx+fFxeXBwaHKxuPMzKzLy6vIyOjHx6fDw6NPy6dGxubLy+vISChCQmJNza3KyqrBQSFLR2RKSinJyanGxqZAwGBJSSlCwqLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4SFhoeDAYqKiIeLj4wBjQCMhY+NkoiLk5qbhQIDoJyGBAUGBwgEo4MECQoLDA2pDrS1tKQPEAwHERITE77AvxKqhAQNDA8UFRYXFs8YBAQZGqGPxw0RGxwdHR4eHyAhIiMkJSYnKCgpBAYPEhcqHyssLS4kLzAxMjM0NTY3cBA4UCAHBw8gVnhgEcKFjhc7UPDj0cMHAAI/KFgY4YLFio/jRpTYsW8GDyCSCEQw2DChOHIqgsCQSEPIEEEEJFhAoUNECCJEyOk4d6KIyRtGcB7hIJKjixEjHu4oimSGEIs4d8IIUoKECnNB0ElMwkNJJgBLlJBAcQKGiR07KGAURVGViY0mhIwwSTKjr99+THjUoIg0r48hTRIrRtxkiOMhDgrZCQQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-fileprint22:file file22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBFxaXDQyNFxSTPTizOzi1FxORDw2NExKLPTi1Pzy9Pz6/FRWVPz29Pz2/PTy7PTu9OzezPzu5OzavAQCBPzy7PTm3OzazOzKrPTu5FxSRERCRGReXPTq5Pzu7ExGTMS+xKSmpOTKpPTq3JSCDNzSfHRydLyadOzCjOzOtOzSvLyyTMTCxKSipGRiZFROLPz+/KyurJyenJyWnGxmbLSabOzClOzm7LSutJSWlJSSlJyanGxqbNze3OTm5IyGjNTO1Nza3NzW3OTe5IyKjHx6fMzGzMTGxMzOzNTW1IR+hISGhKymrLy6vLSytERGRGxubKyqrLy2vLS2tDQ2NEQ+RASKBAT+BFxeXHRudAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4QBAgOEiYqEAgQFBgcGi5MICQoLmAQDh5OEDA2YCw4ODxARApKUCaGYEAsSCRMUnQysCwoVEhYXGLOLCBCgDqK5GQUXGooCAhscBB0euBUZEAUJvQgIgx8gIR8iCSPiHuIFEREDJCXaANwhJhsnKCnWERcRKiopFCvsBywhQrRwQWGAPAz5EhpQ9wIABRgKYsiYMTEEDQocatiwkUIEP18fbkCAAcMBjhwzdOyQwYNCgBMfKJSgMItBjxs+btwgCSGGjhw/ZoRgQKGZCRMUPgABEgSIkCE3SZok8qNqkR85NtDUEcPIkaVAkCR5SrJBDCVKlmzQ6pCCiRlMTJo4YUH3K5AeMBYYWctW0BOaUH60cBJFypQmII6wyEpFQBVFMSm4UAI3hJUrOGh8oOJrklYKWIromJGDR99Ogz5j4ZGlM+pEnwmBCwQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-filesave22:file file22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBGxqbAQCBLy+vERCRExKTHRydIyKjMTCxFxaXGRiZFRSVFRWVPz6/Nze3Nzm5Pz+/JyanDw+PExOTHR2dMTGxBQWFLSytHx+fISChOzy9Ly6vAQGBJSWlMzKzAwODJSSlHx6fIyOjOTi5DQ2NISGhGxubCwuLOzq7ERGRFxeXNTW1CwqLPT29Dw6PGRmZKSmpAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAb/QIBQGBAMj8ikUDAgFAzKKCBwQCQUCcICKh0SEAhGw5EIZAmBrgCxeDQgcDJWyz0GIggJfL+XGwQJRxNgC3yGDwwUFUZDFhdthnwMGAZNQwEZFwQakXANBBQbHIIdERIBnRAOiR4ERx8gsSEMBBmGCyEGG3YGBwcgIr8UCwQHECOgG4xCtRkEJAvBJRklJgkSFBQeJ68hJiEoESkFKiEZIbkGARsLlwEGExENGhorGSkpFAYm66NDLAECpGiBYsUIFA8wLHBBQMWLVkdUCFCwaYVFBOymkVCgYEMgOykEpICBccMBAhhELFigTEqAAgIIwCiQ4eRKDyS6EAlJIAI0EpaudF4iIKDAAn9CkRT5eMROEAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-foldernew22:folder folder22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBNzaTPT2FISCBCQaDPz+BExKBDwmFPSubPzChPzCfPy2dPz6BMzOTAQCBOSmZPzKlPzSnPzOlPzKjBQODPz+rPz+3PzWnPyuZPSmXNyaXPTyhISCLIRSLEQuFEwyHPy2bKRuPFRSTPT29PTy9Ozq7Pz+xJyanDQyNPzGhMzKzOTi3Nza3OTiVBQWFDwqFKxuPOTi5JSSjISChHR2dGRmZFxeXPS2dNTSzNTS1OTm5KSipLS2tLSytKyqpIyKhGRiZNze3NTW1MTGxMTCvLy6tIyKjCQmJMTCxMzOzMzKxJyenHx6fLR2RLy6vJSSlHx+fDw6NLy+vIyOjAwGBGxqZKyurCwuLBQSFJSWlCwqLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4SFhoeIiYqLjI2MAY6HAgOHBJYEhJCDBQaDmgcICQoLB4MGDA0OAQUBDg2cAAcPEBESE6QUuQasFRYVq5SxCRcSCggYGRjIGgYbFs8bHIMHExIJGR0eHx7cB83PFhsDDuTUEyAhIiMjJCQluwEmvsAnKAcp1x4qKyUrLLupWrByxcnFiwQIYIggEaNEiRgBZMyYQaNADRs2REA6cCODBxw5+OnQgWMHjx4+BND4MQOIg1gI0gUREkTHiplDhhApEoCGkRlHBL3I8MEHEhz+WAhJogTJySVMfthwIehAExE5jubAkYQpESc8fOx4AiXKNA8+ekhBgqSpzh5hPHcsmVLjpSAqVZBY6VGkiJMiPQKLnTvjCiEsWU4o3nGC8YksMmT8YCmC6iAXKLRc2cz5yGYtR0JjKWQgEAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-mailforward22:mail mail22 22:photo:22 22:R0lGODlhFgAWAIcAAJR6fIxydIxubIRqbIRmZHxeXHRaXHRWVGxSVGROTFxGRFxCRFQ+PEw6PEw2NEQuLPwCBJR2dLyijPTixPz69Pzq3Pzy3Pzu5PTu7Ozi1LyelOzavPz+/DwqLLyafPTmvPz67Pz29Pzy7LSWlPzmzPz6/LyajPTitOTSzMyurPz25PTatPTi3KyOjPzuxAwqVDQiJHxiZPTetKySlPzqvPz27BQ6bAwmTPTexLyinNzGxDRunPzy5KySjCQ+ZNzq9KTO7JzC3Nzq/Ozu/LzW7FSm1BR6vGSWvFyq1AyGxAxytAx6vBSKxAxSjMyujLSunES+5BSi1ByGvAQCBNzCrOTaxNTOvMS6rKyelCx6rBx6tBQKDOTWvPzu1PTq1OzezAQOHAxGdBROhAQGFPzy1NzOvIRqXLyynOzarPz21Jx2XPTWrLSShAw2XKSCbPzuzAwePAQCDPzyzPzqzPTmxOzWtAwGBKyObOTSrNzGrKyGbOzatEQyNKyCZOzWrOTGpNS2lCweHCQaHCQWFBwSFBQODAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABAALAAAAAAWABYAAAj/AAEEEDCAQAEDBxAkULCAQQMHDyBInBhBwgQKFSpY0HgBQwYNGzh0mDhRAAUPHziACEGBpYgRJDiUGEkSwoCQJk6opNASRQoOFETQJDkggwoOJlYApcCihQuVL2DUhBDjhIqjJmRwwDCDhswaNm5MjYHjKggOOU7o0CGTA9gdYknG2KCCBw8VJVL0uBgihAUfP+CSNGCjsI/DiBPbAMJBsEQbQYQM+UG5smUiRYw0jlvYxhEkSYyIHm1EyRLTTH40EZvAyZPOR4pAmU07ipIkUKQ0mQIhAZUqVq5gKXzkSBYtyLVEyd1ki8QFXLp4+WJFQowbYLJnD5NbzJiJCjaQnhnvpYwZM0/OPFlvQ/f3iQvQpBlvQc0aCWy4VKnCpY0Y5yQxgEYXZFjghgwZUOHGCW90YQEccUwloBwGyjAHHXUoSAMZb0xhx1QOoMHDHSfIwSEOdTjhAQ1d4MFbTQ6Q4MYacrzxhhx04JCHHhvQsMeLJPHRBxpr+LHCGnusgccfgKixQR1ATtTBlDDAEIggggxCCCGFbLGFHVFKZEdAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-mailget22:mail mail22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBBQ6bCQ+ZAwePKTC5Ozu/NTi9GSWvAwSJGSu3JS+5CR+rAQOHPTy/AyKzES23AwOHCw+bOTq/BR6xES+5AwmTBw6ZMTW9Ax6tByi1BRGdAw2XAQCBDQuNDRupKzS9FSm1BR2vBym3EzC7CSGxBROhNTW1Pz+/OTm5NTO1AQGFNzW3Ozq7Ozm7IyKjJyWnMzOzNzq9Nze3OTa5Ly6vCQiJGReZISChKyqrAwqVBRWlOTi5MS6xJSWlNza3OTe5Ly2vGxmbKymrIyGjMzGzISGhKSepCQmJDw6PHR2dJSOlPTy9MTGxLy+vLS2tMzKzLSutMTCxLSytKSipJyenKyurJyanCwqLCwmLCwuLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4IBhgIBA4SLjAABBAUGBwiNlY4FCQoLDJaNAQ0ODwsQnYwREhMUE5ylFYYRFhcYGRgaGxsDHJUdFR4SHyAhEyIjJCUcuo0cJr0nExihxgwoyYscKSnMHicOIw4lKissLdWDHC4vMCu9McYqMjMyNOUANTY3OPEoOTolDCszdrSgwaMcBxs9TMxYOCMHBx8zfPj48QNINQ5BbMBIIUShDIUoTAhR94PHPEEHbQwZckOGjBQviMxYUWQIDCMmdXE4gqRnkiFETAxR8iKFjJU2evZEdmLJkgJIbqS4wXJIUapImj5FtuSEVyRVV1IVi4RIChhEkLVAgcJHEqVwVJUmYdKkiRNkALMRecKECRG/ff8CEQJFCA5kMKJEoUHDCQ/HkB9LmWKECpUeyKoIMSLEyosen0OD7iH2xg1dV7BkqXGlBpbWNTq4Zn2khu0aAAwEAgAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-mail22:mail mail22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBDQyNCwqLCQiJBwaHBQSFAwKDAQCBDw6PPz+/Pz69Pz27PTy7PTy5PTu5PTu3PTu1PTq1PTqzOzmzPzuvOzitPTmvOzivAQGBDw+POzevPz67Pz25Pz23Pzy1PzyzPzqvOTavERCRKSilPz21OTevIR+ZExKTOTi3JyanLS2tPz6/Pz65KyihJSKbMS6lExOTNTW1JSWlJSKZMSylNTOrNTKpFRSVPz29MTCxPTmzKymjIyCdOTWxOzexOTWrBQWFFRWVOzu7MzKxJyalOzatLSulMzKtOzmxOTarFxaXKyqnPTmtIyGdIR+bOzetOzixBweHGRiZOzm3NzWzNzSrOTetGRmZOzizOTexOzm1JSKdGxqbHRydJySdHR2dOzapHx6fKyijOTixCwuLHx+fFxeXERGRDQ2NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4SFhoeIiYqLAQECjwORAwSUBZYFBpkHmwgJCgsMDA0OD6UQERITFBMVFhcVGBkangq1ChsLGxwcHQ0dHR4fICEGIiMSCbS3uLq8wCQUJSYGJygpKhQJKyvLLM4Nwi0uLwUwDQsxMtmeuQveHR8UMzQ1NgU3Dgo41jk6ns0cKOzgYaOHjx9AgjTAUUvIECLZNmxoUISHkSM9KiBJQkCJA4kKEoBQoWJJAiYtmjh5AmVCsCJRpHzckKCCySlUUvBYUqUHDysSPnxIEuXKA5pPRiRwxwFLFhRaIEDYUoEChCcDuECoOWKFuwW7nHkg4WELkw8/BHRRwESpt10dU8SSHevlRxIBX6C0WBE27q8GZMkKbTADjIAwYlb4GLMYShYoPTRo6FGiSJEKPyzMIFMmzJcvXbhwkSLFjJkbQW6cOHNGhAgEAdAsmk27tm0ABgIBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-mailreplyall22:mail mail22 22:photo:22 22:R0lGODlhFgAWAIcAAJR6fIxydIxubIRqbIRmZHxeXHRaXHRWVGxSVGROTFxGRFxCRFQ+PEw6PEw2NEQuLPwCBLyejPTixPz29PTu3Pzu5Pzy7Ozi1LyelPTavPz+/DwqLPz67PTetPz69ERCRLSWlPTmzPz6/OzexLyajPzqvDw+PDQ2NMyurDQiJPz23PTatJyenAQCBPTevPz25LSajOzq7HxiZPTexPz65JyanBQ6bKSmpBwuTOTi5OzaxBRCdHySvGRiZHx6fBQSFERGRNzq9IyOjHx+fGxqbPzu3BwaHFSq3Aw6XAxKfPzy3Gy63ByWzJzO7Mzi9OzavBRytAx6vCSazGRKTPzy1AQKHBRGdBRyrDy63ES+3Cym1CR6rBwWVAQSLAx+xCyCtBRmnPzuzAQWLAwePPzyzKSCbAQOJByGvOTWvPTmxBQODFQ6PPTWrPzqzOzatAwGBKyObLSWfPTivKyCZEQyNKyGZOzWrOzWtOTSrOTGpNS2lJx2XDQmJCweHCQaHCQWFBwSFBQKDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABAALAAAAAAWABYAAAj/AAEEEDCAQAEDBxAkULCAQQMHDyBInBgggoQJFCpkzGjhAoYMGjZMpMghQgcNFjh4mODhA4gQGkSIHAmBwAgNJEpo8KDSxAkUGjhMSEGz5gUVIiKs2PmBRQudHiwQpUnAxYsXImB0aBqjBcuoU0fKmPGChgUNH2qIqGHjg9u3bicWIFs2rYgbNnDkyGFhb8cccQ3ouJqWQo0dPFr0WMy4h48LFj4gsKriB5AeNngEaSGks+chPnwQOXFAh4oXRYxk9nAEyY7XO2wksWHDx5ATCDIoUXEBsYclTJo4cWJhuIjhSXacSPBEiZLMQY4wgRKluvXqUpyIsDElAxUqVaxcwcGCPQuWLOixaNHCZAsXBU+oqKDSxQqULF6ifNmyn/8VMOtxwcAK36kQRhdJQIFFEmKM4eCDYGyhhYAEkqFEGSuYYcUZLaDxXRpqSNRCEu6twYaFZXTQhgRd2NCCG9918AYELTjoXgNuKAFHB2RQEUYHVbQQRwlUpPHGGFwkyQUEDsgxx4lh9BhCBy2U8UQJcrSg5JIQ0FEHG3bc0QGYK+CRhx57PEGlkhM9sAEffKTQhx9+/AEIIIGoEUgLLRRFR0AAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-mailreply22:mail mail22 22:photo:22 22:R0lGODlhFgAWAIcAAJR6fIxydIxubIRqbIRmZHxeXHRaXHRWVGxSVGROTFxGRFxCRFQ+PEw6PEw2NEQuLPwCBMSihPTixPz69PTq5Pzy1Pzu5PTq1Pzy7Pzu7Ozi1LyelPTavPz+/DwqLLSajPTetPz27LSWlPzmzPz6/PTexPz67Pz29OTSzMyurPz25LyajBRCdPzuvDQmJOzexPTevOzq5BQ6bBwuTDQiJHxiZPz23Pz65LyinPzmvBxCbHySvAQCBOTi3OTq9CweHOzaxFSq3Aw6XGy63ByWzJzO7Mzi9OzavNzq9BRytAx6vBR6tPzy3AwOHDy63Ax+xCSazCym1CR6rBwWVOzizAQSLES+3CyCtBRyrBRmnGRKTPzu1MzGtAxKfAQWLAwePPTizMy6nByGvNzWxOzWrNzOtBQKDJR2ZNS2lPTmvBQODPTatKSCbOTaxLyqlAQKHFQ6PPzyzPzqzPTu1PTivOzWtKyObPzuzOTOtLSWfPzqvAwGBKyCZPTWrPTmxNzKrEQyNOzatOTGpJx2XCQaHCQWFBwSFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABAALAAAAAAWABYAAAj/AAEEEDCAQAEDBxAkULCAQQMHDyBInBgggoQJFCpYuIDBQgYNGzh08DCR4oQPIDqEmDBhJQYRIzqQIFkSAoESJCKkDGFiwgkUKTpMwECz5IASKjqsSMlSA4sWQjG4qGnzhYoQSmF0iCFjBgmWGWhQrVHCxg2sOHLo2MGjB0sLYmsWQHq1p4wdPtqemGDhB1UDQFSouKHi7oQgQmSwUMyYxcQDZQWz2EFiCJEiRoyQyLzZyGIIB47YKLwDSRAiSZSoXq1kCRHNLBK8YGKjCYskTp4ogeKkt+8oUaBImZKAAxMmVKrctqL7ihTnz7FkAT5FC4cKFbZwadIFdxcvX8KLss8iJcoUBUcq2KgAJoxyMTy4jCFTxoxEHl2GLyCDncmWM2hUIQMPY2CXhhoTfTEcA2tgVwEba7Thxhs88FdBD/ZB8MUUHMJBRhw2sAGCHBKU4UaFc1RAhxnhcdhhHUzYAUIcFdxRAh4R5KGHinu4OIVEDqTBRx81xhGHHzD8wQYQetDRI4cTAcIHGWT0EQgZa1ApCBqDcBAID1Q94IEHLtBAAyGEFGKIIWqYYQYPYNZkQEAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-mailsend22:mail mail22 22:photo:22 22:R0lGODlhFgAWAIcAAIR6fIRydHxubHRqbHRmZGxeXGxaXGRWVFxSVFxOTFRGRExCREw+PEQ6PDw2NDwuLPwCBLSijOzixPz69PTq3PTu5PTu3PTu7OTi1KyelOzavPz+/DQqLPz67LSafOzetPz27Pz29KyajPTmzPz6/NzSzLyurCwiJPz25Ozi3JyOjPzuxBRGbAwSHOzexPz23KSSlPzqvBROdISavBxSdAwaLHRiZLSinNTGxMy+vBxGZNzu9BSGrAwWJMSyrKSSjFy61ETO3BRWfPz65PTqzHTK3ByqzBSWxEzW5AQWJOTWxBRCXOTu9BSOvDzO3ByavBRKbOzaxOzizKSWlCQ2TAQCBJza7BRWdNzSxJSCbMzq9BSOtCSKrAwiPOTavPzy3LymlCySrAwmPFRKTPzy1NTGrPzu1JR+bOzatPzyzCy61ByGpOzWtJyCbPTmvPzuzIS+3FymxCSuzBR6nJyCZOTWvKSObMSujOzivAwKDOTSrNzKrJyGbDwyNOzWrMy2lIx2XBwWFBQSFBQODAwGBAQGBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABAALAAAAAAWABYAAAj/AAEEEDCAQAEDBxAkULCAQQMHDyBInBgggoQJFCpYqMDxAoYMGjZwmEixg4cPGzqA6BBiAggRIzaQGEkSwgAMJCKgnNBhQogSJlKGOFHTpgYUG0TsnJBCxQoSE1i0KErAxYsOJJRuuAAjhkwZM2jUqGnDBQoUHTbciIEjx4YNOmbs4CGjB8kCZlGAALHBx4+YcTcACcJDyFSJBo6iGNIhhQkiG8BOKGLkCBK6SSQisHoWhZIbG5bMYALECI8mTZw8gTL1QJQXZ6VMiUylSpUlVpoYaXLFtm0EGmCjwJLlA2O9MrRsccKlC8kEXr7AdgEmwtkhX2SQ2BIkjBiSYzSQr/nyhUKZLIrJJOcexvlEBV7IvCBjRkmAMzHOaufhxDvJBWiQISAFxUUQQRovJNeEGmu4JxEDbKQhXxsfuFDGGW68IQMcccgxRxUkNRDhC3R8QMQIdZwXQ11JJGFbiB+QYccHaaTxhgt13OFBDGTgkUdRDrhAhx5k2JjGCB/swYcXMXwAYk190OGHHx/4wUaVepTxByAaoPEkSQ5wwMEJZAZipiCDDJIHIYV8OZEdAQEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-nav1downarrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBBQSFAQGBDQyNExKTHx6fGxqbFxeXGRiZFRWVDw+PAwKDJSWlOzu7LSytJyenJSSlISGhISChIyOjFxaXDw6PPz+/MTCxLS2tIyKjKSmpKSipJyanAwODDQ2NHRydERCRFRSVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAZzQIBwSCwaj8ikcslsOp/OgHRKlQoCgymRUDAcEIkwYgxWFBYERpHQcDwgEclEQmk8DhWL2kiIXDBwExMNGRoJaUkEEH8bEQ0cGgcWAksEHX8QHBKSHk1sfxMHH5ROBBsOICGkT2wiq1CIULKztLW2t0h2QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-nav1leftarrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNAQCBExKTJSSlHx6fAQGBOzu7GxqbJyenPz+/LSytFxaXMTCxGRiZKSmpISGhFxeXISChAwKDFRWVHRydJSWlBQSFERCRIyKjDQ2NIyOjLS2tDw6PBwaHFRSVDw+PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAZ5QIBwSCwaj8ikchgQLJGBgfNZDBAKBirRekBMtYGEYsHIgsWNhOO7tCrShDU18Hg/CJAIG0o4wCUQcksTFBUSCRYSEnpUFxgIGQkJGYyNGggbHBaVjR2QCxEeWkITHQ4IH3tPFwEMA2ajAKUgqlQTTbFEE7W5vUgGQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-nav1rightarrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNGReZAQCBMTCxGRiZMzGzOTm5LSytPTy9Pz+/CwqLOTi5Ly6vCwmLMzKzJyanJSSlBQWFKymrIyGjCQeJJyWnISChISGhHx2fKyurDw6PAwODHx6fHRydDw2PERCRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAZ2QIBwSCwaj8hkMRBQKgOCgRMZIBSk06XhEM0SA4iE4uoVLhCMhqLrdSAekMgYO5VM4BQ521mxIC4UFxBWdEkSERYYFxETGQGFSBKCGBEaGRuQSBwdeZaPXpsQCB6YZQMdEI6ZSgMepKusHh+wrCC0rLdlursGQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-nav1uparrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBFxeXDw+PMTGxHRudPz+/JSSlLSytIyKjHR2dISChIyGjIyOjLSutLy6vKSepJyanISGhJSOlOzm7Ozu7MzGzKyurJyenDQyNGReZKSmpIR+hCwuLCQiJBwaHBQSFAwKDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAZtQIBwSCwaj8ikcslsOp9QYyAQFQYEAyr0Sihkn1fDAeHVLsOJNELxVaITC0bDUU6GH5AIQ8KYrNtFVxQVFBYWFxgRCREYdUQZGhYEDwgIGxAHCQocCgWOQhmhGR0epR8gqCFTq1Wtrq+wsUt0QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-nav2downarrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBAQGBBwaHDQyNExKTHx6fGxqbFxeXGRiZFRSVDw+PAwKDJSWlOzu7LSytJyenJSSlISGhISChIyOjFRWVDw6PPz+/MTCxLS2tGRmZDQ2NAwODJyanKSmpKSipIyKjHRydBQSFERCRExOTFxaXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAasQIBwSCwah4FkQKBsDpoBIqFgOCASCYRWm1AUFgRGkdBwPCARiWRCaTwOFYvYSIhcMOiJpJGZaDYcR0IEHXceEQ0fICEWIoJDhHcQHxIHgI9SEHeVG46YUh8OISOen1INCqWmUnOYTUxQAU9NUlRWWFtbCiRgrYNlZ2lriG8lYUd1khETE24gCZeCkRgeFBAQIAeNn9OTlXKrBJoYnKrcoaPmpmSpq3S+7u50QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-nav2leftarrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNAQCBExKTJSSlHx6fAQGBOzu7GxqbJyenPz+/LSytFxaXMTCxGRiZKSmpISGhFxeXISChAwKDFRWVHRydJSWlBQSFERCRIyKjDQ2NIyOjLS2tDw6PBwaHFRSVDw+PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAavQIBwSCwaj8gkMiBYNpeDZzEQXRIKBmPgmtUSDgipcAsWjxOKBaN7Tq+n6EbCIQ3E5+KtQk6gjwl7CX11D3sPBBARTQGFDYeJT2R8EhB0koKUfgATFBUSCRYSEoqcnqCiikMXGAgZCQkZqautr7FiFxoIGxwWqQC4ury+qh2tCxEexMbIRhMdDggfYs7Q0kcXAQwDbELY2txEziBmmx3jSRNMR+nk4e2b70ry80QGQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-nav2rightarrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNFxeXAQCBMTGxOzm7CwqLLy2vPTy9Pz+/Ly6vCQiJLSytLS2tLSutOTi5MzGzKSepIyKjJSOlKSmpMzKzJyanIyOjBwaHIyGjISGhJSSlISChBQSFJyenIR+hGxubDw+PHRydHR2dEQ+RHx6fERCRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAa6QIBwSCwaj8hkIIBcJgEBweAYnTYJUmMAa9USClniFtwlGg6IRFhoUKTXwwWj0FB3F46Hwl6UQyISfAB+EROCQgsUFRYSF3yJEIyBaxgWDBkaGRtclQwSHBIbEGEdGx4fGhcOICEDGBsWHBmqIq1CHRIWGRMMIyRTHRy6Er22tyONq8YdJRe0xkIDwr2/QwMfliMmZQADIxasZd4e4UYDIr7c59rc0eVFA+/m0EQD9PDt0flP/P3+BkEAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-nav2uparrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBGReZDQyNMTCxHx6fPz+/JyWnKyurHx2fDw6PJSSlISGhIyKjIyGjISChLy6vJyanOTm5PTy9OTi5MzKzLSytKSepMTGxMzGzLS2tLSutKymrHRydCQiJCwmLBwWHAwODLy2vHx+fAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAajQIBwSCwaj8RAAMkUBgSDZdP4JBSi06TAcEAkFNLp07BgLLzY5njRcDzO3zB1C4lEGI83Wj58SiYUFRUWdg0XEXFFAwIYGRoWGxwRZQUFHZdgRAObmx4fHiChISFKpVlKWUdPaalOAlasp1sHG4myZGZ7Yltsbgu1mUhjdRF5egmxfQJ/gYOFdrZDi40iFgiSCw8jBQmYcpydn6Ego6WorUwGQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-navback22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAw2VCRGZAxCZGyavExmjHyatOTy9CxihISevPz+/KzO3BRylAw+XAQCBDRWbPz6/FzC3CSuzDyexJzO5Mzq9CxSdAQOFISmxNzu9HTS5BSmxAyexDSuzJTa7Mzu9Kzi7GS21CRmjAQOHHSWtLze7AyWvHzG3BRihAQKFCTO3BS+1AyixBSWvBSOtBSStAQWJBSixDzW5BTC3BSqzBS21CTC1ETW3AQSHEze7BRqlBRmjAQCDBR+pBRefBRSdCH5BAEAAAAALAAAAAAWABYAAAalQIBwSCwaj8ikMqBcMpvHgGAANQYIhWdVGDAcENQtIJBQLBgNx0MQaDuQXcghIplQDhBIxXKJYiAZGhscHR4VHyAhIiNWJBklGhIbJoQnFCcTKIxFKSgbKissJi0mJi4vLiYoMEcXKDEyMzQ1Nje2NisoOEg4KDU5K6g6OwwoKAN9SCOeMmgwz884PEq9PT4NYkPLP9jZQikN3d4AKVrjKePp3gZBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-navdown22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAw2VCRKZDRSbBxCXJTC1Mzi7Nzq9NTm9Bx2nAQCBNzu9JzG3Hy+1HzG3IzO5BRmjPz6/LTe7Dy61AyStCTC1FzC1AyGrETS3ETC1ETa5BRulAyuzBRylAw+XMTe7Gy+3CSqzAyexBTC3DR+nIS21KTW5Nzu/KzO3FzC3Pz+/ByixEze7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAaRQIBwSCwaj8ikcnkMBAQDgjPAFAYKhsMBkVBUAYEFo+F4QLzVQEQyoVTOX/XBcsHA0+vMRbNBMwkRDhxuHX5GTlIeHh8gISIjFAEeiVRECiQlDAUmgxQjIhwiJHdFlycoKSIUFCEjGiGkRpcqCxYijxorsUezcxYsuoZJsxLAu0qXB7DCTJfHVQrMX9PU1Uh0QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-navforward22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAw2VAQCBBxCXDR+nIS21Aw+XJTC1Nzu/KzO3Pz+/Nzq9Pz6/MTe7KTW5FzC1Nzu9CRKZMzi7IzK3Lzi7LTe7HzG3Gy+3AyuzAyexFzC3DRSbHy+1Dy61CSqzAySvAyStLze7IzO5AyGrETa5ByixBRmjCTC1ETS3BTC3Bx2nAyWvEze7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAaYQIBwSCwaj8hkMqBsBgTN5IAAjRoDBaq1aDggtMuAWDzoJhTgY+CwYLgZDccDwkgXI5IJZVGxXDAZGnR2QxsLHB0PHRgeHyAZDyFfVUQDCyIgIyCPIB+QJCUmlEMBEiInKCQnKSkeKSQeomoqJrUmKiArKSwZsmoCwMEBGCyxo1EGHr3HUQEEvltCBtDRAAbMW0zV29xDBkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-navhome22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBAQCBCQiJNze3ERCROTi5MzGzLy6vDw6PKyqrKyurBQSFGRiZGxqbGRmZISChEQ+RExKTExOTHRydDQyNOTe5FROVLSurCwqLMTCxPT29Pz6/LSutFxeXLyytLSytPz+/JSWlKympPTq7KSipNzW3BwaHHx6fKx2VJRWNHQmBFweDOzq7Ly+vNTW1JxWNLSajPTe1Ny6pKxWJNTS1IyOjJRmbPTi3OzKrNSSXMSGVHQiBHx+fJSSlPzy9IxOVOzWxOSyjNSCPLxeDJyWnIRGTOTGtMxmDLRWBHwqBIxGTLRSDDQuNNSunKxKBGwyNMSafMxqHMReDKRGDPTu9LxuPLxaDJQ+DIR+hGQqNIQyBGQiBNTO1EQKBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4QBAYSIiYQCAwQCiokEhwACBQYHBAiQhAiHlQYJCgkEC5uCkp8MDQ4NDwylmwgQlgQRERIEBBOkmxQVBgQWFwUFFxEEDLyJGAUZtQoFGhsFHLYdyoOVHsEf0SAbIAUex8mwlAUhtSIFG+3uIyTWvAIGJMEkJe76GyXbEeWUBJg4USKaBhQpVKzYoIFFiwYUBBJa8MAFCw0vYMSQMWOhBhoTKCQSUKMEiw02buDIoWOHBg0GeIhEFKAHDR8afgAJImSIioYliMws1MPkhiJGchxBkmTDCBo1hg4KQMTiBiUyhBxZ8pNFiR5MEtU0WqSJVidJNDyNKraHC5xPNKBEkTLlJ5WvUgWNvfikyhArV34+7ZEXQAAsB2iUyHLlihYtW0pwOYAFgyJDmDNr7jIIWiAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-navup22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAw2VAQCBHSWtBRmjAQOHISmxNzu9BSmxBRihHyatPz6/Lze7CTO3BSixHTS5BTC3DzW5ByyzPz+/OTy9AyexEze7ByixGyavKzO3FzC3AyWvBS+1BR+pAQKFCRGZExmjCxihBRylCSuzBSWvBS21BSOtBRSdAw+XAxCZDyexDSyzCTC1JzO5JTa7DSuzETW3BRqlAQWJDRWbOT2/Mzq9HzG3JzS5Kzi7BSStGS21CxSdCRmjAQOFAQSHAAAACH5BAEAAAAALAAAAAAWABYAAAaeQIBwSCwaj8ikcqkMCJjHwIBQgBIDhgMiUbUGFAtGw0GFfheHByQi4S6/E8pDUoFYLm5kAEPJaBAVGxIcER0JHlEfICEiIxUkGyUmIgknKIhXASkonCorgSwmKQGcKE9IAi0uLxUwMTJWMzQ1NiYwBLBQHws1N7avXgs4NjkcCblMATU6KhvGyG87PAnUKV1MAj0+2zIFp1bg4eJJdkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-playeject22:play play22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNAwKDJSWlFRSVBQSFKymrOzq7HRydERCRPz+/MzGzISGhJyenKSmpGxqbJyWnJSOlKSepLy2vIyOjGRiZPTu9IyGjLSutFxaXExOTHx2fGReZAQCBAQGBBwaHCQiJLSytKyurJSSlFxeXNze3LS2tIyKjFxWXHRudAwGDBQOFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAa1QIBwSCwaj8ikcqkMCJjHwIBQgBIDhgMiUbVKFQsGItBdBhpgh4PxIJvRC8cA4oiMy8bvQhJhMAYTFBVOURAWEw0QFxcMERAYCBluVxobDxkVHJocmBwEGgmEQx0dHh0CpKmkH6odVlanBR8FtAIFtiCkSB0LISEiGCIGIxAPDySuRwIOBwrOzwoHJRHJRh0jJgMj2gMnERQUCNVFHQQoCBvo6CkICATjRB0qp7b1K6qv+foyQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-playend22:play play22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNFxeXAQCBMTCxGReZBQSFOzm7AwKDKymrJSSlFRSVCwqLLy6vPTy9OTe5Ozq7CQiJLSytOTi5BwaHPz+/HRydMzKzKSepJSOlKSipJyanIyGjIyKjKyurISGhMzGzJyWnHR2dISChIyOjLSutDw+PERCRHx6fJSWlIR+hJyenGRmZHx2fAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAa6QIBwSCwaj8ikMBBQKgOCgRMZIBSkxYHWoDVWD9EigpBQLLBERsPxCA8NDUhjgTBGJJNGG02RVBQWdUV3FxgZe0IGfoAGdhoXGxwdiAYef4FGFBoeHB8dGSBRihUhIo1FBhkbIyMkJRYmAwYal4JEBh2RChIWJ1IIGxUZFqdECCgkHR6wWAYpFR2YWSobvL5vFgfDaEMDIivMRBEsD9HcQgMWvecDLB0tZ0btsfJa9vLXU/X6/P3+b0EAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-playpause22:play play22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBAQCBAwODMTCxKSmpJSWlFRSVAQGBBwaHLSutOzq7Ly6vCQeJPz+/Hx2fBQWFGxubLSytJSOlBQOFAwKDJSSlJyWnIyOjHRydNze3GRiZAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAWBICCOZGmeaKqubOumQSDEgRjPMSoMRGEcol3vh0IkFAtDDWBEKlGMRKPgEIii0yrqIS1ArADu9KuLNCSOSdCMVp8ohEZFC4DL6SaBpXGh6/l4JX8XZACDhXkYCn1LAoqMUBAZEhBLDJKUSyYBGmhPAJyemiU0NDaloy+qq6ytI8whACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-playstart22:play play22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNAQCBExOTAwKDAQGBJSSlHx+fBQSFMTCxKymrFRSVOzu7GxqbLSytLy6vJyanPz+/GReZBwaHHRydKSepKSipGRiZJyWnAwODLSutKSmpISChPTu9ISGhFxaXJSWlIyGjJSOlERCRIyKjDw2PIyOjLy2vOzm7Dw6PLS2tCQmJOTe5GxmbDQ2NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAa7QIBwSCwaj8ik0hgQLJGBgbMoqBIKU2LAcMgOEQmFYeEFbBmNMgDhYDwWBC0k4pCoJ46IgRIXBioRCRYXamwRGBQIfgaBFhiERhkaenxmCoEbBhyQRYaIGVsdghgem4UWegcEBB8UHhsgIaZGBBgRIpUIIxQhChginEQIIBEklWslFyYnBsFfFCi4WQgpFBwqFxNGKxcsxl4IAS0NZEYCF3vlwgEfUuZV8JEuI2pPAARN9kcE9fr+SwaCAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-playstop22:play play22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBAwKDBQSFBwaHCQmJJSSlISChJSOlJSWlGxqbGRiZNTS1PTy9Pz+/Ozm7OTi5FRSVIyKjOTe5MTCxIR+hExOTHR2dLy6vLSytLy2vHRydFxWXIyGjIyOjPz2/FRWVHx6fExKTMzOzJyanKSmpKyqrKSipAQGBLSutHx2fDw6PAwODAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAa1QIBwSCwaj8ikcslsAgKCAWEQjQ4KgSwyYDAcugZEQqFYYJECA6PhaLcfEEUkgJZAGJB8fkKpWOhHAxcOGBQZGBoaGQgbHIBGAhUOGR0SBxISBh4Xf0iCHxQSlRIIXhsgj0UCIaCXmJgHGyKpRJ+hmB5dHQqOaCENIx0epBIkBhdzngoPGCQlJifQJBvJRygRKRcKGxcXGypys1srEREc5SLnICLiR1koLFVUWfRO9vf4+UwyQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-textblock22:text text22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAImhI+py30Bo5zBWUWzvNzo33GfFl5jVlonlTrr1DbvFi9vjeeNUQAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-textbold22:text text22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAIxhI+py+0Powm0VnknjVkH2AEhE45LZ55Wqn6e65TsMc5eYosbksswubJIhsSiccgvAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-textcenter22:text text22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAImhI+py30Bo5zBWUbz3Sh7yIWfFHKjVl4nmFrr1Lpr7LwkjeeIUQAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-textitalic22:text text22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAImhI+py+0P4wqUSlQvttrkDnyaOHIdeaGRupplAIauVM3xjeeOUQAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-textleft22:text text22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAImhI+pyw0Bo5zB2UXz3Sp7yG2fFJajVjonmIor2TJvfL0wjecIXQAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-textright22:text text22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAImhI+py30Bo5zBWUfz3SZ7yIXdF4kWqZkbCqoMO7kXLC+wVOe6YRQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-text22:text text22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBAQCBBwaHAwKDBQSFLy+vLS2tJSWlBQWFKyqrFRSVCwqLDQyNNTS1GxqbFxaXJyanIyOjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAVcICCOZGmKQSoMaZsShBsQBdAapHvgaIDUqUPJlRjSbAoT0fRDKgODRbF0PLUYjZO2F2Bst9evNix+dsvDlGKK5jraudQb7qbX6a2HEJ+ycyF+LRE8ZTI+fX5oGCEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-textunder22:text text22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAIvhI+py+0PowmUnhpeVVnb1DkbCI1I2JhX+Z0sOr2cTHpwK7a4rUr+hAnufsTirwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-viewchoose22:view view22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBAQCBFRSVExKTDQyNPz69PTq5Pz+/OzaxOTKpAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARTEMhJq70466Cl+AMxBVwnFIVRAmQHCIeBrC1L3tQgJ/SaEbeeC1PLBHE2ybFI9A1HzstHEIK6YCmhDTmBybQaHYJn7QC5zKeytIQe1+pKNE6P2yMAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-viewdetailed22:view view22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBFRSVExKTDQyNPz+/Pz69PTq5AQCBOzaxOTKpAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAQ+EMhJq7046817+MLQUQFRGMc4lQaSAkcMx3QltMmrDrSu/sCgEPgJhIiFk89DaL1qPRnlhsgBebWhdstVESIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-viewicon22:view view22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBFRSVExKTDQyNPz69PTq5AQCBPz+/OzaxOTKpAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARWEMhJq7046z2DF0PlBeAVEERhiKhqHgWyUgEsX0KczFOO7JeBYciTCImc5ITIXDKHyqhU9AnRqq9UEVDTvmLbGhin2/qAliOUot5OLc81IO5+2+8WewQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-viewmag-22:view view22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBBQSFJyanKy2tLzCxHyChNTa3Nzq7Nz29Nzy9Mzy9MTu9OTy9Nzi5Oz6/OT29MTi5Kzi7NTy9KTm7JzW3ITO1Lzq7IzW5HzK1LS+vMTq7Jze7ITW3GTCzGS+zLTS1MzOzLzq9Kzm7Jze5ITW5HTS3FS2vLze5EzCzEyyvEyutJTa5NTu9ITa5FTK1ESirLTm7Mzi5FS6xEy2vESerESmtFSutESmrKyqrAz+/Dw+RAzi3ASutHRydAQCBAAAACH5BAEAAAAALAAAAAAWABYAAAbKQIBQGCgWh8jksCgYEAaCozIZKBgOiIRiwSgEpstCw/HYQiKRhBcMCBgQDodkMaFU0t9pQHCIyy0TFxgYEVF6GQ4LCQkaERscHR4RH3lUIAkWCyEiIyQlHiYjEJVIAQQJJ2gjJSUoKSorlHoCLBQcHC0lLikvHjCGejEiHBgeMjM0NRwPpFQFDBHFNjceHAjAYFWoI7cnCVE4OWxtex8QH1EBOjs4zUpGUjw6Pe3j2fP19u/47vrq9P3s/avno2BBf/MCClSob4iBIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-viewmag22:view view22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBBQSFJyanKy2tLzCxHyChNTa3Nzq7Nz29Nzy9Mzy9MTu9OTy9Nzi5Oz6/OT29MTi5Kzi7NTy9KTm7JzW3ITO1Lzq7IzW5HzK1LS+vMTq7Jze7ITW3GTCzGS+zLTS1MzOzLzq9Kzm7Jze5ITW5HTS3FS2vLze5EzCzEyyvEyutJTa5NTu9ITa5FTK1ESirLTm7Mzi5FS6xEy2vESerESmtFSutESmrKyqrAz+/Dw+RAzi3ASutHRydAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbIQIBQGCgWh8jksCgYEAaCozIZKBgOiIRiwSgEpstCw/HYQiKRhBcMCBgQDodkMaFU0t9pQHCIyy0TFxgYEVF6GQ4LCQkaERscHR4RH3lUIAkWCyEiIyQlHiYjEJVIAQQJJ2gjJSUoKSorlHoCLBQcHC0lLikvHjCGejEiHBgeMjM0NRwPpFQFDBHFNjceHAjAYFWoI7cnCVE4OWxtex8QH1EBOjs4zUpGUjw6Pe3j2fP19u/47vrq9P3s/cunr9S8gAIRFhTCLAgAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-viewmag+22:view view22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBBQSFJyanKy2tLzCxHyChNTa3Nzq7Nz29Nzy9Mzy9MTu9OTy9Nzi5Oz6/OT29MTi5Kzi7NTy9KTm7JzW3ITO1Lzq7IzW5HzK1LS+vMTq7Jze7ITW3GTCzGS+zLTS1MzOzLzq9Kzm7Jze5ITW5HTS3FS2vLze5EzCzEyyvEyutJTa5NTu9ITa5FTK1ESirLTm7Mzi5FS6xEy2vESerESmtFSutESmrKyqrAz+/Dw+RAzi3ASutHRydAQCBAAAACH5BAEAAAAALAAAAAAWABYAAAbQQIBQGCgWh8jksCgYEAaCozIZKBgOiIRiwSgEpstCw/HYQiKRhBcMCBgQDodkMaFU0t9pQHCIyy0TFxgYEVF6GQ4LCQkaERscHR4RH3lUIAkWCyEiIyQlHiYjEJVIAQQJJ2gjJSUoKSorlHoCLBQcHC0lLikvHjCGejEiHBgeMjM0NRwPpFQFDBHFNjceHAjAYFWoI7cnCVE4OWxtex8QH1EBOjs4zUpGUjw6Pe3j2fP19u/4zT766vRI+fvHD4CPgwcJ9qg0UB85JA0dDjEQBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
-viewmulticolumn22:view view22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBFRSVExKTDQyNPz+/Pz69PTq5AQCBOzaxOTKpAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARTEMhJq7046813+MJQfUF4BURhHGO6noSBsEcNoDJtS4KcsJQe4ncZ1HYT47HDbDqfUAnJRJmKLIGCCjjJbmE5wBI3EyOFxKCPS1EiJW52dE6vZyIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
-viewtext22:view view22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAIkhI+py+0Po2ShBlOxzbP7n2yaJoLm+ZTcxqHuC6hXzML2HVEFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
-viewtree22:view view22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBAQCBFRSVExKTDQyNPz+/Pz69Pzu5PTq5OzaxBQOFOzKpFRWVFxWXOzexPTexCH5BAEAAAAALAAAAAAWABYAAARPEMhJq704g6A779kHCORAgNskFMYhakE8FkjyBcoWv+JwJItXaELYCTFHlCSpZKKcoB5jYHpOGgUadLKbIRw3jhEzQDyCSuI4zW673yhDBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
diff --git a/ext/tk/sample/tkextlib/ICONS/viewIcons.rb b/ext/tk/sample/tkextlib/ICONS/viewIcons.rb
deleted file mode 100644
index 7ed3c267e4..0000000000
--- a/ext/tk/sample/tkextlib/ICONS/viewIcons.rb
+++ /dev/null
@@ -1,330 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-#
-#   viewIcons.rb
-#
-#     --  Display icons from icon library.
-#
-#     --  Copy the clicked icon data (command string of creating
-#         a TkPhotoImage instance) to the clipboard.
-#
-require 'tk'
-require 'tkextlib/ICONS'
-
-class ViewIcons
-  #####################################
-  private
-  #####################################
-  def _create_controls
-    @controls = base = TkFrame.new
-    columns = TkFrame.new(base)
-    line1 = TkFrame.new(base, :height=>2, :borderwidth=>1, :relief=>:sunken)
-    line2 = TkFrame.new(base, :height=>2, :borderwidth=>1, :relief=>:sunken)
-
-    lbl_library = TkLabel.new(base, :font=>@boldfont, :text=>'Library')
-    lbl_groups  = TkLabel.new(base, :font=>@boldfont, :text=>'Groups')
-    lbl_columns = TkLabel.new(base, :font=>@boldfont, :text=>'Columns')
-
-    ent_library = TkEntry.new(base, :width=>50, :textvariable=>@library)
-    ent_groups  = TkEntry.new(base, :width=>50, :textvariable=>@groups)
-
-    btn_browse = TkButton.new(base, :text=>'Browse',
-                                    :command=>method(:select_icons))
-    btn_view   = TkButton.new(base, :text=>'View',
-                                    :command=>method(:display_icons))
-    btn_exit   = TkButton.new(base, :text=>'Exit', :command=>proc{exit})
-
-    @column_btns = {}
-    6.step(20, 2){|i|
-      @column_btns[i] = TkButton.new(columns,
-                                     :text=>i.to_s, :width=>2,
-                                     :command=>proc{set_columns(i)}
-                                     ).pack(:side=>:left)
-    }
-    @column_btns[@columns][:relief] = :sunken
-
-    lbl_library.grid(:row=>0, :column=>0, :padx=>4)
-    ent_library.grid(:row=>0, :column=>1)
-    btn_browse.grid(:row=>0, :column=>2, :padx=>4, :pady=>2, :sticky=>:ew)
-
-    line1.grid(:row=>1, :column=>0, :pady=>2, :columnspan=>3, :sticky=>:ew)
-
-    lbl_groups.grid(:row=>2, :column=>0, :padx=>4)
-    ent_groups.grid(:row=>2, :column=>1)
-    btn_view.grid(:row=>2, :column=>2, :padx=>4, :pady=>2, :sticky=>:ew)
-
-    line1.grid(:row=>3, :column=>0, :pady=>2, :columnspan=>3, :sticky=>:ew)
-
-    lbl_columns.grid(:row=>4, :column=>0, :padx=>4)
-    columns.grid(:row=>4, :column=>1, :padx=>2, :sticky=>:ew)
-    btn_exit.grid(:row=>4, :column=>2, :padx=>4, :pady=>2, :sticky=>:ew)
-
-    base.pack
-
-    ent_library.bind('Return', method(:display_icons), '')
-    ent_groups.bind('Return', method(:display_icons), '')
-  end
-
-  def _create_display
-    base = TkFrame.new(:borderwidth=>2, :relief=>:sunken)
-
-    @icons_window = icons = TkCanvas.new(base)
-    xscr = icons.xscrollbar(TkScrollbar.new(base))
-    yscr = icons.yscrollbar(TkScrollbar.new(base))
-
-    icons.grid(:row=>0, :column=>0, :sticky=>:news)
-    yscr.grid(:row=>0, :column=>1, :sticky=>:ns)
-    xscr.grid(:row=>1, :column=>0, :sticky=>:ew)
-    base.grid_columnconfigure(0, :weight=>1)
-    base.grid_columnconfigure(1, :weight=>0)
-    base.grid_rowconfigure(0, :weight=>1)
-    base.grid_rowconfigure(1, :weight=>0)
-    # yscr.pack(:side=>:right, :fill=>:y)
-    # xscr.pack(:side=>:bottom, :fill=>:x)
-    # icons.pack(:side=>:left, :fill=>:both, :expand=>true)
-
-    @icons_layout = TkFrame.new(icons).pack
-    TkcWindow.create(icons, 0, 0, :anchor=>:nw, :window=>@icons_layout)
-    @icons_layout.bind('Configure', method(:layout_resize), '')
-
-    base.pack(:expand=>true, :fill=>:both)
-  end
-
-  def _create_info_window
-    @info_window = TkToplevel.new(:background=>'lightyellow', :borderwidth=>1,
-                                  :relief=>:solid){|w|
-      lbl_name = TkLabel.new(w, :text=>'Name', :background=>'lightyellow',
-                             :font=>@boldfont, :justify=>:left)
-      lbl_grps = TkLabel.new(w, :text=>'Groups', :background=>'lightyellow',
-                             :font=>@boldfont, :justify=>:left)
-      lbl_type = TkLabel.new(w, :text=>'Type', :background=>'lightyellow',
-                             :font=>@boldfont, :justify=>:left)
-      lbl_size = TkLabel.new(w, :text=>'Size', :background=>'lightyellow',
-                             :font=>@boldfont, :justify=>:left)
-
-      lbl_name.grid(:row=>0, :column=>0, :sticky=>:w)
-      lbl_grps.grid(:row=>1, :column=>0, :sticky=>:w)
-      lbl_type.grid(:row=>2, :column=>0, :sticky=>:w)
-      lbl_size.grid(:row=>3, :column=>0, :sticky=>:w)
-
-      @name = TkLabel.new(w, :background=>'lightyellow', :justify=>:left)
-      @grps = TkLabel.new(w, :background=>'lightyellow', :justify=>:left)
-      @type = TkLabel.new(w, :background=>'lightyellow', :justify=>:left)
-      @size = TkLabel.new(w, :background=>'lightyellow', :justify=>:left)
-
-      @name.grid(:row=>0, :column=>1, :sticky=>:w)
-      @grps.grid(:row=>1, :column=>1, :sticky=>:w)
-      @type.grid(:row=>2, :column=>1, :sticky=>:w)
-      @size.grid(:row=>3, :column=>1, :sticky=>:w)
-
-      def name(txt)
-        @name['text'] = txt
-      end
-      def groups(txt)
-        @grps['text'] = txt
-      end
-      def type(txt)
-        @type['text'] = txt
-      end
-      def size(txt)
-        @size['text'] = txt
-      end
-
-      overrideredirect(true)
-      withdraw
-    }
-  end
-
-  def initialize(init_path = Tk::LIBRARY)
-    init_path = Tk::LIBRARY unless init_path
-    init_path = File.expand_path(init_path)
-    if File.directory?(init_path)
-      @initial_dir  = init_path
-      @initial_file = 'tkIcons'
-    else
-      @initial_dir  = File.dirname(init_path)
-      @initial_file = File.basename(init_path)
-    end
-
-    if Tk::PLATFORM['platform'] == 'unix'
-      TkOption.add('*HighlightThickness', 0)
-    end
-
-    @columns = 14
-    @command = ""
-
-    @delay_timer = nil
-
-    dummy = TkLabel.new
-    @font = dummy.font
-    @boldfont = TkFont.new(@font, :weight=>:bold)
-    @icons = {}
-    @icon_name = {}
-    @icon_info = {}
-
-    @library = TkVariable.new(File.join(@initial_dir, @initial_file))
-    @groups  = TkVariable.new('*')
-
-    _create_controls
-
-    _create_display
-
-    _create_info_window
-
-    Tk.root.title('viewIcons')
-    layout_resize
-    Tk.root.resizable(false, true)
-
-    display_icons
-  end
-
-  def init_info(item, name)
-    @icon_name[item] = name
-
-    item.bind('Button-1', method(:clip_info),  '%W')
-    item.bind('Enter',    method(:delay_info), '%W')
-    item.bind('Leave',    method(:cancel_info), '')
-  end
-
-  def delay_info(item)
-    cancel_info
-    @delay_timer = TkTimer.new(200, 1, proc{ show_info(item) }).start
-  end
-
-  def cancel_info
-    if @delay_timer
-      @delay_timer.cancel
-      @delay_timer = nil
-    end
-    @info_window.withdraw
-  end
-
-  def show_info(item)
-    name, groups, type, size = @icon_info[@icon_name[item]]
-    @info_window.name(name)
-    @info_window.groups(groups)
-    @info_window.type(type)
-    @info_window.size(size)
-
-    info_x = item.winfo_rootx + 10
-    info_y = item.winfo_rooty + item.winfo_height
-
-    @info_window.geometry("+#{info_x}+#{info_y}")
-    @info_window.deiconify
-
-    @info_window.raise
-
-    @delay_timer = nil
-  end
-
-  def primary_transfer(offset, max_chars)
-    @command
-  end
-
-  def lost_selection
-    @command = ""
-  end
-
-  def clip_info(item)
-    name = @icon_name[item]
-    data_width = 60
-
-    cmd = "#{name} = TkPhotoImage.new(:data=><<'EOD')\n"
-
-    icon_data = Tk::ICONS.query(name, :file=>@library.value, :items=>'d')[0][0]
-
-    icon_data.scan(/.{1,#{data_width}}/m){|s| cmd << '   ' << s << "\n"}
-
-    cmd << "EOD\n"
-
-    @command = cmd
-
-    TkClipboard.clear
-    TkClipboard.append(@command)
-
-    if Tk::PLATFORM['platform'] == 'unix'
-      TkSelection.handle(Tk.root, method(:primary_transfer),
-                         :selection=>'PRIMARY')
-      TkSelection.set_owner(Tk.root, :selection=>'PRIMARY',
-                            :command=>method(:lost_selection))
-    end
-
-    Tk.bell
-  end
-
-  def layout_resize
-    Tk.update
-    bbox = @icons_window.bbox('all')
-    width = @controls.winfo_width - @icons_window.yscrollbar.winfo_width - 8
-
-    @icons_window.configure(:width=>width, :scrollregion=>bbox,
-                            :xscrollincrement=>'0.1i',
-                            :yscrollincrement=>'0.1i')
-  end
-
-  def select_icons
-    new_lib = Tk.getOpenFile(:initialdir=>@initial_dir,
-                             :initialfile=>'tkIcons',
-                             :title=>'Select Icon Library',
-                             :filetypes=>[
-                               ['Icon Libraries', ['tkIcons*']],
-                               ['All Files', ['*']]
-                             ])
-
-    @library.value = new_lib if new_lib.length != 0
-    display_icons
-  end
-
-  def display_icons
-    column = 0
-    limit = @columns - 1
-    row = 0
-
-    unless File.exist?(@library.value)
-      Tk.messageBox(:icon=>'warning', :message=>'File does not exist',
-                    :title=>'viewIcons')
-      return
-    end
-
-    cursor = Tk.root[:cursor]
-    Tk.root[:cursor] = 'watch'
-
-    Tk::ICONS.delete(@icons)
-
-    @icons_frame.destroy if @icons_frame
-    @icons_frame = TkFrame.new(@icons_layout).pack
-
-    @icons = Tk::ICONS.create(:file=>@library.value, :group=>@groups.value)
-
-    Tk::ICONS.query(:file=>@library.value, :group=>@groups.value).each{|inf|
-      name = inf[0]
-      @icon_info[name] = inf
-
-      lbl = TkLabel.new(@icons_frame, :image=>"::icon::#{name}")
-      lbl.grid(:column=>column, :row=>row, :padx=>3, :pady=>3)
-      # lbl.grid_columnconfigure column
-
-      init_info(lbl, name)
-
-      if column == limit
-        column = 0
-        row += 1
-      else
-        column += 1
-      end
-    }
-
-    Tk.root[:cursor] = cursor
-  end
-
-  def set_columns(columns)
-    @columns = columns
-    6.step(20, 2){|i| @column_btns[i][:relief] = :raised }
-    @column_btns[@columns][:relief] = :sunken
-    display_icons
-  end
-end
-
-ViewIcons.new(ARGV[0])
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/blt/barchart5.rb b/ext/tk/sample/tkextlib/blt/barchart5.rb
deleted file mode 100644
index f818ffc375..0000000000
--- a/ext/tk/sample/tkextlib/blt/barchart5.rb
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/blt'
-
-load File.join(File.dirname(File.expand_path(__FILE__)),
-               'scripts', 'stipples.rb')
-
-TkOption.add('*graph.x.Title', 'X Axis Label')
-TkOption.add('*graph.y.Title', 'Y Axis Label')
-TkOption.add('*graph.title', 'A Simple Barchart')
-TkOption.add('*graph.x.Font', 'Times 10')
-TkOption.add('*graph.Element.Relief', :raised)
-
-visual = Tk.root.winfo_screenvisual
-if visual != 'staticgray' && visual != 'grayscale'
-  TkOption.add('*graph.LineMarker.color', 'yellow')
-  TkOption.add('*graph.Element.Background', 'white')
-  TkOption.add('*graph.Legend.activeForeground', 'pink')
-  TkOption.add('*print.background', 'yellow')
-  TkOption.add('*quit.background',  'red')
-  TkOption.add('*graph.background', 'palegreen')
-  TkOption.add('*graph.plotBackground', 'lightblue')
-end
-
-htext = Tk::BLT::Htext.new(:widgetname=>'.htext', :text=><<EOD)
-    This is an example of the barchart widget.  The barchart has
-    many components; x and y axis, legend, crosshairs, elements, etc.
-    To create a postscript file "bar.ps", press the %%
-
-    ruby {
-    b = TkButton.new(Tk::BLT::Htext::Htext_Widget.window,
-                     :widgetname=>'print', :text=>'Print',
-                     :command=>proc{
-                        $graph.postsript(:output=>'bar.ps')
-                     })
-    Tk::BLT::Htext::Htext_Widget.window.append(b)
-    }
-
-%% button.
-%%
-
-    ruby {
-    $graph = Tk::BLT::Barchart.new(:widgetname=>'.htext.graph',
-                                   :relief=>:raised, :borderwidth=>2)
-    $graph.xaxis_configure(:rotate=>90, :stepsize=>0)
-    Tk::BLT::Htext::Htext_Widget.window.append($graph,
-                                               :fill=>:both, :padx=>4)
-    }
-
-%%
-    Hit the %%
-
-    ruby {
-    b = TkButton.new(Tk::BLT::Htext::Htext_Widget.window,
-                     :widgetname=>'quit', :text=>'Quit',
-                     :command=>proc{ exit })
-    Tk::BLT::Htext::Htext_Widget.window.append(b)
-    }
-
-%% button when you've seen enough.%%
-
-    ruby {
-    l = TkLabel.new(Tk::BLT::Htext::Htext_Widget.window, :bitmap=>'BLT')
-    Tk::BLT::Htext::Htext_Widget.window.append(l, :padx=>20)
-    }
-
-%%
-EOD
-
-names = %w(One Two Three Four Five Six Seven Eight)
-if visual == 'staticgray' || visual == 'grayscale'
-  fgcolors = %w(white white white white white white white white)
-  bgcolors = %w(black black black black black black black black)
-else
-  fgcolors = %w(yellow orange red magenta purple blue cyan green)
-  bgcolors = %w(yellow4 orange4 red4 magenta4 purple4 blue4 cyan4 green4)
-end
-
-numColors = names.length
-
-Tk::TCL_PRECISION.value = 15
-
-x = Tk::BLT::Vector.new
-y = Tk::BLT::Vector.new
-x.seq(-5.0, 5.0, 0.2)
-y.expr("sin(#{x})")
-barWidth = 0.19
-
-$graph.element_create('sin', :relief=>:raised, :borderwidth=>1,
-                      :x=>x, :y=>y, :barwidth=>barWidth)
-
-Tk::BLT::Table.add(Tk.root, htext, :fill=>:both)
-
-Tk.root.minsize(0, 0)
-
-Tk::BLT.zoom_stack($graph)
-Tk::BLT.crosshairs($graph)
-Tk::BLT.active_legend($graph)
-Tk::BLT.closest_point($graph)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/blt/calendar.rb b/ext/tk/sample/tkextlib/blt/calendar.rb
deleted file mode 100644
index c7989cec36..0000000000
--- a/ext/tk/sample/tkextlib/blt/calendar.rb
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-
-require 'tk'
-require 'tkextlib/blt'
-
-require 'date'
-
-dir = File.join(File.dirname(File.expand_path(__FILE__)), 'images')
-file = File.join(dir, 'chalk.gif')
-active = File.join(dir, 'rain.gif')
-
-texture1 = TkPhotoImage.new(:file=>file)
-texture2 = TkPhotoImage.new(:file=>active)
-
-TkOption.add('*Tile', texture1)
-
-TkOption.add('*HighlightThickness', 0)
-TkOption.add('*calendar.weekframe*Tile', texture2)
-TkOption.add('*Calendar.Label.borderWidth', 0)
-TkOption.add('*Calendar.Label.relief', :sunken)
-TkOption.add('*Calendar.Frame.borderWidth', 2)
-TkOption.add('*Calendar.Frame.relief', :raised)
-TkOption.add('*Calendar.Label.font', 'Helvetica 11')
-TkOption.add('*Calendar.Label.foreground', 'navyblue')
-TkOption.add('*button.foreground', 'navyblue')
-TkOption.add('*background', 'grey85')
-TkOption.add('*Label.ipadX', 200)
-
-TkOption.add('*tile', texture2)
-
-class BLT_Calendar_sample
-  @@monthInfo = [
-    nil,  # dummy
-    ['January', 31],
-    ['February', 28],
-    ['March', 31],
-    ['April', 30],
-    ['May', 31],
-    ['June', 30],
-    ['July', 31],
-    ['August', 31],
-    ['September', 30],
-    ['October', 31],
-    ['November', 30],
-    ['December', 31]
-  ]
-
-  @@abbrDays = [ 'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat' ]
-
-  def initialize()
-    today = Date.today
-
-    if TkComm.bool(Tk.info(:commands, '.calendar'))
-      Tk.destroy('.calendar')
-    end
-    cal = Tk::BLT::Tile::Frame.new(:widgetname=>'.calendar',
-                                   :classname=>'Calendar',
-                                   :width=>'3i', :height=>'3i')
-
-    mon = Tk::BLT::Tile::Label.new(cal, :font=>'Courier 14 bold',
-                                   :text=>"#{@@monthInfo[today.month][0]} " +
-                                          "#{today.year}")
-    Tk::BLT::Table.add(cal, mon, [1, 0], :cspan=>7, :pady=>10)
-
-    week_f = Tk::BLT::Tile::Frame.new(cal, :widgetname=>'weekframe',
-                                      :relief=>:sunken, :borderwidth=>1)
-    Tk::BLT::Table.add(cal, week_f, [2, 0], :columnspan=>7, :fill=>:both)
-
-    @@abbrDays.each_with_index{|dayName, idx|
-      Tk::BLT::Table.add(cal,
-                         Tk::BLT::Tile::Label.new(cal, :text=>dayName,
-                                                  :font=>'Helvetica 12'),
-                         [2, idx], :pady=>2, :padx=>2)
-    }
-
-    Tk::BLT::Table.itemconfigure(cal, 'c*', 'r2', :pad=>4)
-
-    numDays = @@monthInfo[today.month][1]
-    week = 0
-    cnt = 1
-
-    wkday = today.wday - ((today.day - 1) % 7)
-    wkday += 7 if wkday < 0
-
-    while cnt <= numDays
-      Tk::BLT::Table.add(cal,
-                         Tk::BLT::Tile::Label.new(cal, :text=>cnt){
-                           self.configure(:borderwidth=>1,
-                                          :relief=>:sunken) if cnt == today.day
-                         },
-                         [week+3, wkday], :fill=>:both, :ipadx=>10, :ipady=>4)
-      cnt += 1
-      wkday += 1
-      if wkday == 7
-        week += 1
-        wkday = 0
-      end
-    end
-
-    Tk::BLT::Tile::Frame.new(cal, :borderwidth=>1, :relief=>:sunken){|f|
-      Tk::BLT::Table.add(f,
-                         Tk::BLT::Tile::Button.new(f, :widgetname=>'button',
-                                                   :command=>proc{exit},
-                                                   :borderwidth=>2,
-                                                   :text=>'Quit'),
-                         :padx=>4, :pady=>4)
-      Tk::BLT::Table.add(cal, f, [week+4, 5], :cspan=>2, :pady=>4)
-    }
-
-    Tk::BLT::Table.add(Tk.root, cal, :fill=>:both)
-    Tk::BLT::Table.itemconfigure(cal, 'r0', :resize=>:none)
-  end
-end
-
-BLT_Calendar_sample.new
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/blt/graph6.rb b/ext/tk/sample/tkextlib/blt/graph6.rb
deleted file mode 100644
index 26baa527ef..0000000000
--- a/ext/tk/sample/tkextlib/blt/graph6.rb
+++ /dev/null
@@ -1,2223 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-
-require 'tk'
-require 'tkextlib/blt'
-
-Tk::TCL_PRECISION.value = 15
-
-[
-  ['*Graph.Width', '10i'],
-  ['*Graph.leftMargin', '.75i'],
-  ['*Graph.Height', '6i'],
-  ['*Graph.plotBackground', 'black'],
-  ['*LineMarker.color', 'white'],
-  ['*LineMarker.Dashes', 5],
-  ['*TextMarker.foreground', 'white'],
-  ['*TextMarker.Background', ''],
-
-  ['*Graph.x.hide', true],
-  ['*Graph.x.title', ''],
-  ['*Graph.y.rotate', 90],
-  # ['*Graph.y.stepSize', 2.0],
-  ['*Graph.title', ''],
-  ['*graph.Title', 'Example s27'],
-  ['*graph.x.hide', false],
-  ['*graph.topMargin', 0],
-  ['*graph.bottomMargin', 0],
-  ['*x.Title', 'Time'],
-  ['*y.Title', 'Signals'],
-  ['*Pixels', 1],
-
-  ['*Reduce', 0.5],
-  ['*bufferElements', false],
-
-  ['*Element.color', 'green4'],
-  ['*Element.ScaleSymbols', true],
-  ['*Element.Color', 'grey70'],
-  ['*Element.Symbol', :none],
-  ['*Element.LineWidth', 1],
-  # ['*Element.Smooth', :natural],
-  ['*Element.Smooth', :catrom],
-
-  ['*activeLine.LineWidth', 2],
-  ['*activeLine.Color', 'white'],
-  ['*activeLine.Color', 'green1'],
-
-  # ['*Legend.Hide', true],
-  ['*Legend.Position', :right],
-  ['*Legend.Relief', :flat],
-  ['*Legend.activeRelief', :sunken],
-  ['*Legend.borderWidth', 2],
-  #['*Legend.Font', '-*-helvetica-medium-r-*-*-10-*-*-*-*-*-*-*'],
-  ['*Legend.Font', 'Helvetica -10'],
-  ['*Grid.hide', false],
-  ['*Grid.dashes', [1, 5]],
-
-  # ['*foreground', 'white'],
-  ['*zoomOutline.outline', 'yellow'],
-].each{|k, v| TkOption.add(k, v)}
-
-##############################
-
-class BLT_Graph_Demo
-  def initialize
-    @graph = Tk::BLT::Graph.new(:widgetname=>'graph')
-
-    @root = Tk.root
-    @root.minsize(0, 0)
-
-    _set_vectors()
-    (1..39).each{|i| @graph.element_create("V#{i}", :x=>@x, :y=>@v[i])}
-
-    @top = Tk::BLT::Tile::Toplevel.new
-=begin
-    legend = Tk::BLT::Graph.new(@top, :widgetname=>'legend',
-                                :without_creating=>true)
-    @graph.legend_configure(:position=>legend)
-=end
-    # legend = @graph.legend_window_create(@top, :widgetname=>'legend')
-    legend = @graph.legend_window_create(@top)
-    legend.pack(:fill=>:both, :expand=>true)
-
-    Tk::BLT::Table.add(@root, @graph, [0,0], :fill=>:both)
-
-    @quit_btn = Tk::BLT::Tile::Button.new(:text=>' quit ', :background=>'red',
-                                          :command=>proc{exit})
-    Tk::BLT::Table.add(@root, @quit_btn, [1,0], :anchor=>:e, :padx=>10)
-
-    @graph.zoom_stack
-    @graph.crosshairs
-    @graph.closest_point
-    @graph.print_key
-
-    @graph.legend_bind(:all, 'ButtonRelease-1',
-                       proc{|w| highlightTrace(w)}, '%W')
-    @graph.legend_bind(:all, 'ButtonRelease-3',
-                       proc{|w|
-                         w.legend_deactivate('*')
-                         active = w.element_activate
-                         w.element_deactivate(*active)
-                       }, '%W')
-  end
-
-  private
-
-  def _set_vectors
-    @x = Tk::BLT::Vector.new(:variable=>'')
-    @v = []
-    (1..39).each{|i| @v[i] = Tk::BLT::Vector.new(:variable=>'')}
-
-    @x.set(<<-'EOD')
-    0 1e-10 2e-10 3e-10 4e-10 5e-10 6e-10 7e-10 8e-10 9e-10
-    1e-09 1.1e-09 1.2e-09 1.3e-09 1.4e-09 1.5e-09 1.6e-09 1.7e-09
-    1.8e-09 1.9e-09 2e-09 2.1e-09 2.2e-09 2.3e-09 2.4e-09 2.5e-09
-    2.6e-09 2.7e-09 2.8e-09 2.9e-09 3e-09 3.1e-09 3.2e-09 3.3e-09
-    3.4e-09 3.5e-09 3.6e-09 3.7e-09 3.8e-09 3.9e-09 4e-09 4.1e-09
-    4.2e-09 4.3e-09 4.4e-09 4.5e-09 4.6e-09 4.7e-09 4.8e-09
-    4.9e-09 5e-09 5.1e-09 5.2e-09 5.3e-09 5.4e-09 5.5e-09 5.6e-09
-    5.7e-09 5.8e-09 5.9e-09 6e-09 6.1e-09 6.2e-09 6.3e-09 6.4e-09
-    6.5e-09 6.6e-09 6.7e-09 6.8e-09 6.9e-09 7e-09 7.1e-09 7.2e-09
-    7.3e-09 7.4e-09 7.5e-09 7.6e-09 7.7e-09 7.8e-09 7.9e-09
-    8e-09 8.1e-09 8.2e-09 8.3e-09 8.4e-09 8.5e-09 8.6e-09 8.7e-09
-    8.8e-09 8.9e-09 9e-09 9.1e-09 9.2e-09 9.3e-09 9.4e-09 9.5e-09
-    9.6e-09 9.7e-09 9.8e-09 9.9e-09 1e-08 1.01e-08 1.02e-08
-    1.03e-08 1.04e-08 1.05e-08 1.06e-08 1.07e-08 1.08e-08 1.09e-08
-    1.1e-08 1.11e-08 1.12e-08 1.13e-08 1.14e-08 1.15e-08 1.16e-08
-    1.17e-08 1.18e-08 1.19e-08 1.2e-08 1.21e-08 1.22e-08 1.23e-08
-    1.24e-08 1.25e-08 1.26e-08 1.27e-08 1.28e-08 1.29e-08 1.3e-08
-    1.31e-08 1.32e-08 1.33e-08 1.34e-08 1.35e-08 1.36e-08 1.37e-08
-    1.38e-08 1.39e-08 1.4e-08 1.41e-08 1.42e-08 1.43e-08 1.44e-08
-    1.45e-08 1.46e-08 1.47e-08 1.48e-08 1.49e-08 1.5e-08 1.51e-08
-    1.52e-08 1.53e-08 1.54e-08 1.55e-08 1.56e-08 1.57e-08 1.58e-08
-    1.59e-08 1.6e-08 1.61e-08 1.62e-08 1.63e-08 1.64e-08 1.65e-08
-    1.66e-08 1.67e-08 1.68e-08 1.69e-08 1.7e-08 1.71e-08 1.72e-08
-    1.73e-08 1.74e-08 1.75e-08 1.76e-08 1.77e-08 1.78e-08 1.79e-08
-    1.8e-08 1.81e-08 1.82e-08 1.83e-08 1.84e-08 1.85e-08 1.86e-08
-    1.87e-08 1.88e-08 1.89e-08 1.9e-08 1.91e-08 1.92e-08 1.93e-08
-    1.94e-08 1.95e-08 1.96e-08 1.97e-08 1.98e-08 1.99e-08 2e-08
-    2.01e-08 2.02e-08 2.03e-08 2.04e-08 2.05e-08 2.06e-08 2.07e-08
-    2.08e-08 2.09e-08 2.1e-08 2.11e-08 2.12e-08 2.13e-08 2.14e-08
-    2.15e-08 2.16e-08 2.17e-08 2.18e-08 2.19e-08 2.2e-08 2.21e-08
-    2.22e-08 2.23e-08 2.24e-08 2.25e-08 2.26e-08 2.27e-08 2.28e-08
-    2.29e-08 2.3e-08 2.31e-08 2.32e-08 2.33e-08 2.34e-08 2.35e-08
-    2.36e-08 2.37e-08 2.38e-08 2.39e-08 2.4e-08 2.41e-08 2.42e-08
-    2.43e-08 2.44e-08 2.45e-08 2.46e-08 2.47e-08 2.48e-08 2.49e-08
-    2.5e-08 2.51e-08 2.52e-08 2.53e-08 2.54e-08 2.55e-08 2.56e-08
-    2.57e-08 2.58e-08 2.59e-08 2.6e-08 2.61e-08 2.62e-08 2.63e-08
-    2.64e-08 2.65e-08 2.66e-08 2.67e-08 2.68e-08 2.69e-08 2.7e-08
-    2.71e-08 2.72e-08 2.73e-08 2.74e-08 2.75e-08 2.76e-08 2.77e-08
-    2.78e-08 2.79e-08 2.8e-08 2.81e-08 2.82e-08 2.83e-08 2.84e-08
-    2.85e-08 2.86e-08 2.87e-08 2.88e-08 2.89e-08 2.9e-08 2.91e-08
-    2.92e-08 2.93e-08 2.94e-08 2.95e-08 2.96e-08 2.97e-08 2.98e-08
-    2.99e-08 3e-08 3.01e-08 3.02e-08 3.03e-08 3.04e-08 3.05e-08
-    3.06e-08 3.07e-08 3.08e-08 3.09e-08 3.1e-08 3.11e-08 3.12e-08
-    3.13e-08 3.14e-08 3.15e-08 3.16e-08 3.17e-08 3.18e-08 3.19e-08
-    3.2e-08 3.21e-08 3.22e-08 3.23e-08 3.24e-08 3.25e-08 3.26e-08
-    3.27e-08 3.28e-08 3.29e-08 3.3e-08 3.31e-08 3.32e-08 3.33e-08
-    3.34e-08 3.35e-08 3.36e-08 3.37e-08 3.38e-08 3.39e-08 3.4e-08
-    3.41e-08 3.42e-08 3.43e-08 3.44e-08 3.45e-08 3.46e-08 3.47e-08
-    3.48e-08 3.49e-08 3.5e-08 3.51e-08 3.52e-08 3.53e-08 3.54e-08
-    3.55e-08 3.56e-08 3.57e-08 3.58e-08 3.59e-08 3.6e-08
-    EOD
-
-    @v[1].set(<<-'EOD')
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    EOD
-
-    @v[2].set(<<-'EOD')
-    0 1 2 3 4 5 5 5 5 5 5 5 5 5 5 5 4 3 2 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 1 2 3 4 5 5 5 5 5 5 5 5 5 5 5 4 3 2 1
-    5.32907e-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 1 2 3 4 5 5
-    5 5 5 5 5 5 5 5 5 4 3 2 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
-    EOD
-
-    @v[3].set(<<-'EOD')
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 4 3 2 1 8.88178e-16
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-    0 0 0 0 0 0 0 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 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 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 3 2 1 2.13718e-14 0 0 0 0 0 0 0
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-    0 0 0 0
-    EOD
-
-    @v[4].set(<<-'EOD')
-    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 5 5
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    5 5 5 5 5 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 3 2 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 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 5 5 5 5 5 5 5 5 5 5 5 5 5
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    EOD
-
-    @v[5].set(<<-'EOD')
-    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 5 5
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    5 5 5 5 5 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 3 2 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 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 5 5 5 5 5 5 5 5 5 5 5 5 5
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    EOD
-
-    @v[6].set(<<-'EOD')
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 4 3 2 1 8.88178e-16
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-    0 0 0 0 0 0 0 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 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 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 3 2 1 2.13718e-14 0 0 0 0 0 0 0
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-    0 0 0 0
-    EOD
-
-    @v[7].set(<<-'EOD')
-    5 5.16904 4.84159 3.34542 0.317102 0.103304 0.0275721 0.0221534
-    0.017689 0.0142639 0.0113974 0.00918238 0.00742541 0.00616602
-    0.00481195 0.00397049 -0.0659889 -0.025671 0.165495 0.986891
-    3.05229 4.55511 4.91611 4.98192 4.99428 4.99833 4.99095
-    4.97295 4.95493 4.93428 4.90723 4.94799 4.98584 4.99566
-    4.99813 4.99907 4.99947 4.99965 4.99976 4.99984 4.99989
-    4.99992 4.99994 4.99996 4.99998 5.00002 5.00006 5.00002
-    4.99996 4.99994 4.99999 5.00003 5.00002 5 4.99997 4.99997
-    4.99997 4.99997 4.99997 4.99996 4.99997 4.99997 4.99998
-    4.99998 4.99999 5 5 5 5 5 5 5.00001 5.00001 5.00001 5.00001
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
-    5.00001 5.00001 5 5 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999
-    4.99999 4.99999 4.99998 4.99998 4.99998 4.99999 4.99999
-    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
-    4.99999 4.99999 4.99999 4.99999 4.99999 5 5 5 5 5 5 5 5.16575
-    4.69986 2.43862 0.0230224 0.035229 -0.0210607 -0.0292766
-    -0.0172693 -0.00271479 -0.000912251 -0.000349106 -0.000116866
-    -4.24733e-05 -1.39536e-05 -3.01179e-05 -0.0657192 -0.0204835
-    0.183378 1.07181 3.118 4.46472 4.84158 4.94795 4.98173 4.99236
-    4.99762 5.01939 5.0433 5.05332 5.04959 5.03955 5.02851 5.02052
-    5.01422 5.00965 5.00631 5.00405 5.00248 5.00083 5.00012
-    5.00209 5.00387 5.00347 4.99917 4.99213 4.98411 4.97521
-    4.96332 4.94601 4.9304 4.94633 4.97936 4.99264 4.99685 4.99857
-    4.99925 4.99954 4.9997 4.99973 4.9997 4.99973 4.99979 4.99983
-    4.99986 4.99988 4.9999 4.9999 4.99992 4.99993 4.99994 4.99995
-    4.99996 4.99996 4.99997 4.99997 4.99998 4.99998 4.99998
-    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
-    5 5 5 5.00001 5.00001 5.00001 5.00001 5.00002 5.00002 5.00002
-    5.00002 5.00001 5.00001 5.00001 5 5 5 5 5 5 5 5 4.99999
-    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
-    4.99999 4.99999 4.99999 5 5 5.14242 4.76101 3.16003 0.299374
-    0.0645506 -0.000498424 -2.45108e-05 -2.27986e-05 -5.24401e-05
-    -4.9884e-05 -4.92491e-05 -2.93354e-05 -3.21402e-05 -2.11851e-05
-    -3.37925e-05 -0.0657892 -0.020563 0.182582 1.06058 3.12484
-    4.46552 4.84146 4.95102 4.98556 4.99472 4.99806 4.99909
-    4.99955 4.99976 4.99994 4.99992 5.00029 4.99967 4.99849
-    4.99736 4.99884 5.00099 5.00377 5.00215 4.99994 4.99893
-    4.99788 4.99862 5.00055 5.00134 5.00127 5.00073 5.00039
-    5.00018 5.00006 5.00001 4.99985 5.00026 5.00018 5.00003
-    4.99981 4.99985 4.99987 4.99985 4.99982 4.99982 4.99982
-    4.99983 4.99985 4.99987 4.99989 4.99991 4.99992 4.99994
-    4.99995 4.99995 4.99994 4.99994 4.99996 4.99999 5.00002
-    5.00008 5.00009 5.00006 5.00001 5 4.99999 4.99998 4.99997
-    4.99996 4.99997 4.99997 4.99998 4.99998 4.99999 4.99999
-    4.99999 5 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
-    5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 4.99998 4.99998
-    4.99998
-    EOD
-
-    @v[8].set(<<-'EOD')
-    5 5.03758 5.04711 4.96911 4.20882 3.96295 4.01117 4.15521
-    4.2967 4.42274 4.5295 4.6176 4.69014 4.74831 4.7966 4.83537
-    4.80526 4.787 4.79295 4.88588 5.08978 5.15615 5.10778 5.07718
-    5.06652 5.08225 4.9744 4.52977 3.77452 2.69426 1.15294 0.245509
-    0.0981544 0.0567527 0.0367487 0.0252578 0.0180599 0.0133837
-    0.0101497 0.0078616 0.00620186 0.00499056 0.0041027 0.00344223
-    0.00295808 0.00260089 0.00229887 0.00200817 0.00176397 0.00160116
-    0.00147381 0.00134645 0.00125029 0.00116043 0.00107371 0.00101981
-    0.000965921 0.000912028 0.000858135 0.000804242 0.000761669
-    0.00072672 0.000691771 0.000656823 0.000621874 0.000588722
-    0.00057041 0.000552098 0.000533785 0.000515473 0.000497162
-    0.00047885 0.000460537 0.000442226 0.000423914 0.000405601
-    0.000388399 0.000378694 0.000368989 0.000359284 0.00034958
-    0.000339875 0.00033017 0.000320465 0.00031076 0.000301055
-    0.00029135 0.000282207 0.000276247 0.000270287 0.000264327
-    0.000258367 0.000252407 0.000246447 0.000240487 0.000234527
-    0.000228567 0.000222607 0.000217086 0.000213696 0.000210307
-    0.000206918 0.000203528 0.000200139 0.00019675 0.00019336
-    0.000189971 0.000186582 0.000183192 0.000179803 0.000176414
-    0.000173025 0.000169635 0.000166246 0.000162857 0.000159467
-    0.000156078 0.000152689 0.000149299 0.00014591 0.00014255
-    0.0316021 0.163272 0.348732 0.603651 0.35745 0.135965 0.0707354
-    0.0314595 0.0201047 0.00994945 0.00389601 0.00138839 0.00060778
-    0.000329648 0.000492396 -0.0732035 -0.0844077 -0.0789062
-    -0.0390837 0.0197559 0.0183094 -0.00180099 -0.0189565 -0.0424144
-    -0.0735904 -0.0892423 0.285039 1.13702 2.10809 2.95826 3.60164
-    4.0435 4.35771 4.57254 4.71769 4.81329 4.87534 4.91487 4.94264
-    4.97375 5.01526 5.06517 5.10154 5.06259 4.89005 4.5787 4.12226
-    3.46151 2.49023 1.2586 0.32725 0.116753 0.0701865 0.0455509
-    0.0286914 0.0178176 0.0117599 0.00902715 0.00760583 0.00637745
-    0.00543811 0.00439377 0.00352448 0.0030151 0.00285771 0.002465
-    0.00203114 0.00173004 0.0014839 0.00125177 0.00105327 0.000894905
-    0.000766372 0.000658894 0.000569105 0.000492114 0.000427938
-    0.000370217 0.000314758 0.000266569 0.000233726 0.000209048
-    0.000191957 0.000177169 0.000166604 0.000161 0.000157314
-    0.000143828 0.000130342 0.000116857 0.000103371 8.98855e-05
-    7.63998e-05 6.29141e-05 5.76583e-05 5.30027e-05 4.8347e-05
-    4.36913e-05 3.90357e-05 3.438e-05 2.97243e-05 2.72507e-05
-    2.59083e-05 2.45659e-05 2.32235e-05 2.18811e-05 2.05387e-05
-    1.91963e-05 1.78539e-05 1.65115e-05 1.51691e-05 1.38267e-05
-    1.24843e-05 1.11419e-05 9.79954e-06 8.51574e-06 7.69807e-06
-    6.8804e-06 6.06273e-06 5.24506e-06 0.0287318 0.0317111 -0.0320087
-    -0.103609 0.0369639 0.0121128 0.00961197 0.00934971 0.00820853
-    0.00699769 0.00607002 0.00535541 0.00476552 0.00427601 0.00376357
-    -0.073012 -0.0866964 -0.0809538 -0.038005 0.0277001 0.0188906
-    0.00614597 0.00373629 0.00489787 0.0146573 0.0191052 0.0151708
-    0.0124224 0.0105859 0.00879272 0.00729464 0.0070047 0.00449575
-    -0.00626652 -0.0252417 -0.0147287 0.022538 0.0822905 0.0947372
-    0.0657516 0.0445506 0.0316753 0.0220971 0.0158101 0.0140971
-    0.0161498 0.0139876 0.0122447 0.0106994 0.009397 0.00822236
-    0.00686509 0.00797431 0.00751269 0.00671173 0.00595243 0.00524633
-    0.00459528 0.00401688 0.00350109 0.00303954 0.00260569 0.00222792
-    0.00191033 0.00163917 0.00140949 0.00121464 0.0010471 0.000900638
-    0.000768847 0.000645236 0.000524807 0.000460275 0.000442237
-    0.000446775 0.000397026 0.000301585 0.000228994 0.000190894
-    0.000166569 0.000152261 0.000137953 0.000123644 0.000109336
-    9.50281e-05 8.56557e-05 7.78437e-05 7.00318e-05 6.22198e-05
-    5.44079e-05 4.87539e-05 4.57761e-05 4.27982e-05 3.98203e-05
-    3.68425e-05 3.38646e-05 3.08868e-05 2.79089e-05 2.4931e-05
-    2.19532e-05 1.89753e-05 1.75244e-05 1.64095e-05 1.52946e-05
-    1.41797e-05 1.30648e-05 1.19499e-05 1.0835e-05 9.72011e-06
-    8.60521e-06 7.4903e-06 6.5117e-06 6.10334e-06 5.69497e-06
-    5.2866e-06 4.87824e-06 4.46987e-06 4.06151e-06 3.65314e-06
-    3.24477e-06
-    EOD
-
-    @v[9].set(<<-'EOD')
-    1.86175 1.99708 2.07867 2.01211 2.43309 3.27194 3.63896
-    3.90426 4.11074 4.27932 4.41496 4.52543 4.61491 4.68862
-    4.7479 4.79666 4.72895 4.68886 4.70354 4.81353 5.01568 5.14184
-    5.10482 5.07362 5.05143 5.03638 5.02323 5.01465 5.00853
-    5.00383 4.99985 5.00454 5.00652 5.00546 5.00411 5.003 5.00214
-    5.00151 5.00106 5.00073 5.0005 5.00034 5.00023 5.00015 5.0001
-    5.00005 5 5.00001 5.00005 5.00005 5.00003 5 4.99998 4.99996
-    4.99994 4.99995 4.99997 4.99998 5 5.00001 5.00002 5.00002
-    5.00003 5.00003 5.00003 5.00003 5.00003 5.00003 5.00002
-    5.00002 5.00001 5.00001 5.00001 5 5 5 4.99999 4.99999 4.99999
-    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99998
-    4.99998 4.99998 4.99999 4.99999 4.99999 4.99999 5 5 5 5
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
-    5.00001 5.00001 5.00001 5.00001 5.17392 4.94828 3.78491
-    1.52079 0.608874 0.244031 0.127087 0.0552995 0.0361032 0.0169025
-    0.006364 0.00217624 0.000921391 0.000457305 0.000786754
-    -0.120016 -0.148054 -0.15898 -0.0801463 0.16463 0.174017
-    0.0799249 0.0318788 0.0129696 0.00483397 0.0025677 0.0042079
-    0.00350003 0.00178404 -8.72902e-05 -0.00128497 -0.00142213
-    -0.00130018 -0.00106874 -0.000789207 -0.000824335 -0.00104518
-    -0.00136799 -0.004366 -0.0102621 -0.0109254 -0.00649259
-    -0.00194842 0.00029793 0.00148673 0.00221085 0.00228291
-    0.00185261 0.00139687 0.00148183 0.00562266 0.00844119 0.00754627
-    0.00657396 0.00591212 0.00539269 0.0049282 0.00448417 0.0040572
-    0.00363719 0.00320392 0.00279607 0.00243938 0.00211505 0.00182302
-    0.00156254 0.0013341 0.00113834 0.000971865 0.00082776 0.000706193
-    0.000602499 0.000515059 0.000441401 0.00037897 0.000325459
-    0.00028083 0.000242096 0.000207274 0.000176444 0.000150372
-    0.000126407 0.000103373 9.05522e-05 8.53555e-05 8.63685e-05
-    9.02593e-05 8.37346e-05 7.72099e-05 7.06852e-05 6.41605e-05
-    5.76358e-05 5.11112e-05 4.45865e-05 4.08176e-05 3.72497e-05
-    3.36818e-05 3.01138e-05 2.65459e-05 2.2978e-05 1.94101e-05
-    1.76154e-05 1.67399e-05 1.58645e-05 1.4989e-05 1.41136e-05
-    1.32381e-05 1.23626e-05 1.14872e-05 1.06117e-05 9.73629e-06
-    8.86083e-06 7.98538e-06 7.10993e-06 6.23447e-06 5.44363e-06
-    5.32578e-06 5.20792e-06 5.09007e-06 4.97222e-06 0.0784323
-    0.0474527 -0.0764232 -0.151146 0.0615785 0.0144489 0.00974161
-    0.00947176 0.00849005 0.00728201 0.00630581 0.00554032 0.00487809
-    0.00441504 0.00384139 -0.118943 -0.149894 -0.161173 -0.0825299
-    0.171686 0.176912 0.0816085 0.0335236 0.013791 0.0056976
-    0.00238833 0.00105348 0.000526199 0.00025969 0.000396026
-    0.000837835 0.00170131 0.00196699 -0.000553314 -0.0061621
-    -0.0111895 -0.0142698 -0.0124608 -0.00795847 -0.00467822
-    -0.0043058 -0.00874449 -0.0118584 -0.00871386 -0.00377892
-    1.95244e-05 0.00218952 0.00325486 0.00386497 0.00422837
-    0.00446883 0.00447065 0.00486647 0.00547838 0.00565398 0.00559092
-    0.00538752 0.00507015 0.00466305 0.00420756 0.00373465 0.00328404
-    0.00287059 0.00250057 0.00216124 0.00184861 0.00156815 0.00134624
-    0.00117857 0.00103412 0.0008948 0.000761012 0.000619853
-    0.000462614 0.000319965 0.000287666 0.000356415 0.000379946
-    0.000339183 0.00027972 0.000252982 0.000226244 0.000199507
-    0.000172769 0.000146031 0.000130097 0.000117578 0.000105059
-    9.25401e-05 8.00213e-05 7.11204e-05 6.67061e-05 6.22918e-05
-    5.78775e-05 5.34632e-05 4.90489e-05 4.46346e-05 4.02203e-05
-    3.5806e-05 3.13916e-05 2.69773e-05 2.4827e-05 2.31747e-05
-    2.15225e-05 1.98702e-05 1.8218e-05 1.65658e-05 1.49135e-05
-    1.32613e-05 1.1609e-05 9.95678e-06 8.50108e-06 7.86765e-06
-    7.23422e-06 6.60079e-06 5.96736e-06 5.33393e-06 4.7005e-06
-    4.06707e-06 3.43363e-06
-    EOD
-
-    @v[10].set(<<-'EOD')
-    1.86175 1.99308 2.16619 2.46661 3.09359 3.76864 4.31299
-    4.65564 4.83425 4.92153 4.96157 4.98063 4.98649 4.99039
-    4.9945 4.9972 4.96206 4.89882 4.83865 4.83202 4.91016 5.04479
-    5.06078 5.04827 5.03474 5.0246 5.01639 5.00996 5.00569 5.00239
-    5.00043 5.00296 5.00437 5.00382 5.00287 5.00208 5.00148
-    5.00104 5.00073 5.0005 5.00034 5.00023 5.00016 5.00011 5.00008
-    5.00007 5.00007 5.00004 5 4.99998 4.99998 4.99997 4.99998
-    4.99999 5 5 5.00001 5.00001 5.00001 5.00002 5.00002 5.00001
-    5.00001 5.00001 5.00001 5 5 5 5 5 5 4.99999 4.99999 4.99999
-    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
-    4.99999 4.99999 5 5 5 5 5 5 5 5 5 5.00001 5.00001 5.00001
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
-    5.00001 5.00001 5.00001 5.00001 5 5 5 5 5 5 5 5 5.10081
-    5.10949 4.98359 5.00733 5.15145 4.37298 2.36126 0.470759
-    0.0577238 0.0115884 0.00262611 0.000671499 0.000389038 0.000291291
-    0.000317347 -0.0167823 -0.0158344 -0.0140559 0.0104849 0.0865874
-    0.107813 0.0524688 0.0214369 0.00876443 0.00341595 0.00170778
-    0.00259042 0.0022241 0.00118519 1.10217e-06 -0.000784506
-    -0.000948169 -0.000856256 -0.000696719 -0.000485987 -0.000724787
-    -0.000981491 -0.001454 -0.00552498 -0.0114992 -0.0105266
-    -0.00543527 -0.000982798 0.00127356 0.00224212 0.00275439
-    0.00281098 0.0025471 0.00230368 0.00222576 0.00485522 0.00729453
-    0.00691796 0.0062615 0.00573987 0.0052688 0.00481185 0.00436934
-    0.00394326 0.00352712 0.00309978 0.00270038 0.00235335 0.00203742
-    0.00175256 0.00150067 0.00128126 0.00109323 0.000933619
-    0.000795113 0.000678182 0.00057843 0.000494345 0.000423609
-    0.000363821 0.000312766 0.000269856 0.000232389 0.000198382
-    0.000168126 0.00014267 0.000119293 9.69034e-05 8.5669e-05
-    8.26828e-05 8.64066e-05 9.26665e-05 8.5454e-05 7.82416e-05
-    7.10291e-05 6.38167e-05 5.66043e-05 4.93918e-05 4.21794e-05
-    3.86073e-05 3.53007e-05 3.19941e-05 2.86876e-05 2.5381e-05
-    2.20744e-05 1.87678e-05 1.70933e-05 1.62648e-05 1.54363e-05
-    1.46079e-05 1.37794e-05 1.2951e-05 1.21225e-05 1.12941e-05
-    1.04656e-05 9.63716e-06 8.80871e-06 7.98026e-06 7.1518e-06
-    6.32335e-06 5.5374e-06 5.08959e-06 4.64178e-06 4.19397e-06
-    3.74616e-06 0.0438026 0.0242078 -0.0602019 -0.0840866 0.00148461
-    -0.00292489 0.000442098 0.00219489 0.00281478 0.00290756
-    0.00277945 0.00263896 0.00240099 0.00223283 0.001947 -0.0153629
-    -0.0148815 -0.0128673 0.0126017 0.0905161 0.11051 0.0538958
-    0.022562 0.00935726 0.00397422 0.00172534 0.000790207 0.000416322
-    0.000191632 0.000469721 0.0009779 0.00192566 0.00200688
-    -0.0016502 -0.00733932 -0.0128113 -0.0147608 -0.0115456
-    -0.00668995 -0.00401368 -0.00463908 -0.0101197 -0.0118993
-    -0.0076276 -0.00262656 0.000813059 0.00264455 0.00350796
-    0.00399494 0.0043049 0.00451658 0.00444739 0.00503842 0.00559516
-    0.00568213 0.00556459 0.0053176 0.00496654 0.00454337 0.00408592
-    0.00362171 0.00317793 0.00277001 0.00240394 0.00207009 0.00176575
-    0.00149725 0.00129045 0.00114257 0.00101135 0.000871672
-    0.000723764 0.000580438 0.000427507 0.000296956 0.000281834
-    0.000376628 0.000412266 0.000367547 0.000295305 0.000264513
-    0.000233721 0.000202929 0.000172137 0.000141345 0.000124721
-    0.000112577 0.000100433 8.82893e-05 7.61453e-05 6.75517e-05
-    6.33609e-05 5.91701e-05 5.49792e-05 5.07884e-05 4.65976e-05
-    4.24067e-05 3.82159e-05 3.40251e-05 2.98342e-05 2.56434e-05
-    2.36401e-05 2.21181e-05 2.05961e-05 1.90741e-05 1.75521e-05
-    1.60301e-05 1.45081e-05 1.29861e-05 1.14641e-05 9.94208e-06
-    8.59252e-06 7.96439e-06 7.33626e-06 6.70813e-06 6.07999e-06
-    5.45186e-06 4.82373e-06 4.1956e-06 3.56747e-06
-    EOD
-
-    @v[11].set(<<-'EOD')
-    1.86175 1.73419 1.42874 1.04055 0.943004 0.268275 0.0826455
-    0.0388346 0.0214104 0.0135431 0.00961322 0.00712846 0.00588262
-    0.00432397 0.00377774 0.00270134 -0.00393731 -0.00542187
-    -0.00126596 0.0113777 0.0134522 0.00477056 -0.00211067 -0.00229253
-    -0.00173355 -0.00122404 -0.00113426 -0.000744931 -0.000520112
-    -0.000410048 -0.000220439 0.000508104 5.15856e-05 -0.000112593
-    -0.000118917 -9.57394e-05 -7.15727e-05 -5.11847e-05 -3.58275e-05
-    -2.47166e-05 -1.68866e-05 -1.14082e-05 -7.66646e-06 -5.12139e-06
-    -3.63426e-06 -3.01815e-06 -2.64862e-06 -1.4947e-06 -1.91403e-07
-    -2.5763e-08 -7.73699e-07 -1.52164e-06 -1.07268e-06 -3.81696e-07
-    2.6727e-07 4.75489e-07 6.83708e-07 8.91926e-07 1.10014e-06
-    1.30836e-06 1.2482e-06 1.00726e-06 7.66311e-07 5.25364e-07
-    2.84417e-07 6.27857e-08 7.43904e-10 -6.12979e-08 -1.2334e-07
-    -1.85382e-07 -2.47423e-07 -3.09465e-07 -3.71507e-07 -4.33549e-07
-    -4.95591e-07 -5.57633e-07 -6.04571e-07 -5.4944e-07 -4.9431e-07
-    -4.3918e-07 -3.84049e-07 -3.28919e-07 -2.73789e-07 -2.18659e-07
-    -1.63528e-07 -1.08398e-07 -5.32678e-08 1.062e-09 5.08502e-08
-    1.00638e-07 1.50427e-07 2.00215e-07 2.50003e-07 2.99791e-07
-    3.4958e-07 3.99368e-07 4.49156e-07 4.98944e-07 5.34512e-07
-    5.01032e-07 4.67553e-07 4.34073e-07 4.00593e-07 3.67113e-07
-    3.33633e-07 3.00153e-07 2.66674e-07 2.33194e-07 1.99714e-07
-    1.66234e-07 1.32754e-07 9.92744e-08 6.57945e-08 3.23147e-08
-    -1.16513e-09 -3.4645e-08 -6.81248e-08 -1.01605e-07 -1.35084e-07
-    -1.68564e-07 -2.18729e-07 0.0114926 -0.0245378 -0.111828
-    0.0964775 1.61491 3.22668 4.22041 4.54492 4.82845 4.94868
-    4.98588 4.99609 4.9981 4.99908 4.99788 4.98395 4.99294 4.99724
-    5.01939 5.0471 5.00902 4.98194 4.98496 4.99188 4.99623 4.99862
-    5.00025 4.99974 4.99953 4.99946 4.99958 5.00012 4.99997
-    4.99992 4.99988 4.99985 4.9998 4.9997 4.9988 4.99806 4.99982
-    5.00143 5.00159 5.00098 5.00053 5.00028 5.00007 4.99977
-    4.99992 5.00005 5.00133 5.0009 4.99993 4.99972 4.99975 4.9998
-    4.99982 4.99983 4.99983 4.99983 4.99983 4.99984 4.99986
-    4.99987 4.99989 4.9999 4.99991 4.99992 4.99994 4.99995 4.99995
-    4.99996 4.99997 4.99997 4.99998 4.99998 4.99998 4.99998
-    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
-    5 5 5 5.00001 5.00001 5.00001 5.00002 5.00002 5.00002 5.00002
-    5.00002 5.00001 5.00001 5.00001 5 5 5 5 5 5 5 5 4.99999
-    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
-    4.99999 4.99999 4.99999 5 5 5.01457 4.99482 4.96561 4.99326
-    5.03452 5.00424 5.00101 5.00045 5.00004 4.99965 4.99997
-    4.99994 4.99958 4.99999 4.99936 4.9839 4.99248 4.99717 5.01976
-    5.04869 5.0087 4.98143 4.98488 4.99199 4.99622 4.9983 4.99928
-    4.99971 4.99986 5.00031 5.00022 5.00035 5.0001 4.99884 4.99811
-    4.99803 4.99887 5.00078 5.00151 5.00116 5.00007 4.99843
-    4.99915 5.00107 5.00168 5.00141 5.00092 5.00055 5.0003 5.00016
-    5.0001 5.00001 5.00016 5.0002 5.00009 4.99993 4.99975 4.99984
-    4.99991 4.99991 4.99982 4.99974 4.99974 4.99985 4.99995
-    4.99999 4.99998 5.00004 5.00013 5.00015 5.00007 4.99988
-    4.99982 4.99985 4.99995 5.00006 5.0002 5.00025 5.0002 5.00009
-    5.00006 5.00004 5.00002 5 4.99998 4.99997 4.99998 4.99998
-    4.99999 4.99999 4.99999 5 5 5 5 5 5.00001 5.00001 5.00001
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
-    5.00001 5.00001 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999
-    4.99998 4.99998 4.99998
-    EOD
-
-    @v[12].set(<<-'EOD')
-    5 5.16975 4.78685 2.94241 0.126698 0.0487004 -0.00422591
-    -0.00130689 -0.000486756 -0.000195875 -0.000108988 -6.66736e-05
-    -7.26005e-05 -5.63608e-05 -3.81859e-05 -2.123e-05 -0.0646846
-    -0.0184474 0.182248 1.06731 3.10988 4.46133 4.84133 4.95113
-    4.98364 4.99455 4.99694 4.99727 4.9994 4.99975 5.0001 5.00132
-    5.00089 5.00039 5.00019 5.00011 5.00006 5.00005 5.00004
-    5.00001 4.99992 4.99992 5.00002 5.00013 5.00017 5.00009
-    4.99992 4.99991 4.99994 4.99996 4.99998 4.99999 5.00001
-    5.00004 5.00006 5.00005 5.00004 5.00003 5.00002 5.00001
-    5 4.99999 4.99999 4.99998 4.99998 4.99997 4.99997 4.99998
-    4.99998 4.99998 4.99998 4.99999 4.99999 4.99999 4.99999
-    5 5 5 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
-    5.00002 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
-    5.00001 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 4.99999 4.99999
-    4.99999 4.99999 4.99999 4.99999 4.99999 5 5.14699 4.78074
-    3.19424 0.305663 0.0611255 -0.00179951 -0.0012032 0.000405978
-    0.000989399 0.000445194 0.000191447 8.30476e-05 3.96236e-05
-    1.91866e-05 1.70665e-05 -0.0655239 -0.0210234 0.1827 1.06848
-    3.11554 4.46518 4.84212 4.94853 4.98244 4.99434 4.9997 5.00081
-    5.00009 4.99972 4.99985 4.99974 4.9995 4.99949 4.99958 4.99973
-    4.99948 4.99914 4.99874 4.99946 5.00309 5.0091 5.01576 5.01835
-    5.01852 5.0176 5.01625 5.01479 5.01345 5.01264 5.011 5.01092
-    5.01344 5.01363 5.01289 5.01184 5.01071 5.00956 5.00848
-    5.00751 5.00663 5.00577 5.00497 5.00427 5.00365 5.0031 5.00264
-    5.00224 5.00191 5.00163 5.00138 5.00117 5.00099 5.00083
-    5.00071 5.00061 5.00053 5.00045 5.00037 5.00029 5.00022
-    5.00019 5.0002 5.00023 5.00024 5.00023 5.00023 5.00022 5.0002
-    5.00018 5.00016 5.00014 5.00011 5.00009 5.00007 5.00006
-    5.00005 5.00005 5.00004 5.00003 5.00002 5.00001 5.00001
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
-    5.00002 5.00002 5.00002 5.00002 5.00002 5.00002 5.00002
-    5.00002 5.00001 5.00001 5.00001 5.14298 4.79809 3.32704
-    0.498385 0.105773 0.0160646 0.0319912 0.0299434 0.0240102
-    0.0185844 0.0130411 0.0106532 0.00864871 0.00744519 0.00660887
-    -0.0612913 -0.0203719 0.174998 0.991787 3.06292 4.60005
-    4.93058 4.98917 5.00033 4.9999 4.99909 4.9966 4.9955 4.99488
-    4.99374 4.9943 5.00131 5.00506 4.99311 4.96288 4.93567 4.92439
-    4.94236 4.9732 4.98864 4.99458 5.00031 5.00694 5.01525 5.01945
-    5.01998 5.01953 5.01874 5.01766 5.0164 5.01509 5.01326 5.01423
-    5.01455 5.01361 5.01245 5.01122 5.01002 5.00888 5.00783
-    5.00687 5.00596 5.00514 5.00442 5.00379 5.00325 5.00279
-    5.0024 5.00208 5.0018 5.00153 5.00126 5.00107 5.00094 5.00085
-    5.00078 5.00072 5.00063 5.00053 5.00042 5.00038 5.00034
-    5.0003 5.00027 5.00023 5.00021 5.00019 5.00017 5.00015 5.00013
-    5.00012 5.00011 5.0001 5.0001 5.00009 5.00008 5.00007 5.00007
-    5.00006 5.00005 5.00005 5.00004 5.00004 5.00003 5.00003
-    5.00002 5.00002 5.00002 5.00001 5.00001 5 5 5 5.00001 5.00001
-    5.00001 5.00002 5.00002 5.00002 5.00002
-    EOD
-
-    @v[13].set(<<-'EOD')
-    9.73784e-10 0.0189926 0.0926769 0.206309 0.111533 0.0953491
-    0.0426966 0.0214177 0.0117943 0.00741442 0.00528816 0.00398417
-    0.0032967 0.00266499 0.00206647 0.00158788 -0.0371391 -0.0439528
-    -0.0408653 -0.0188706 0.0150241 0.0126852 0.00209817 -0.000239206
-    -5.31488e-05 0.000876324 -0.00451221 -0.0165223 -0.0284127
-    -0.0427584 -0.0502453 -0.0257366 -0.00903938 -0.00376456
-    -0.00233385 -0.00169922 -0.00130397 -0.00102542 -0.000811435
-    -0.000648115 -0.000529266 -0.00043795 -0.00036574 -0.00030716
-    -0.00026221 -0.000229662 -0.000205112 -0.000181038 -0.000162045
-    -0.000148988 -0.000137633 -0.000126278 -0.000115562 -0.000104976
-    -9.49324e-05 -9.0585e-05 -8.62375e-05 -8.18901e-05 -7.75426e-05
-    -7.31952e-05 -6.93752e-05 -6.59106e-05 -6.24461e-05 -5.89815e-05
-    -5.55169e-05 -5.22412e-05 -5.05263e-05 -4.88114e-05 -4.70966e-05
-    -4.53817e-05 -4.36668e-05 -4.19519e-05 -4.0237e-05 -3.85222e-05
-    -3.68073e-05 -3.50924e-05 -3.34782e-05 -3.25442e-05 -3.16102e-05
-    -3.06763e-05 -2.97423e-05 -2.88083e-05 -2.78744e-05 -2.69404e-05
-    -2.60064e-05 -2.50725e-05 -2.41385e-05 -2.32635e-05 -2.27232e-05
-    -2.21829e-05 -2.16426e-05 -2.11023e-05 -2.0562e-05 -2.00217e-05
-    -1.94814e-05 -1.89411e-05 -1.84007e-05 -1.78604e-05 -1.73647e-05
-    -1.70853e-05 -1.68059e-05 -1.65265e-05 -1.62471e-05 -1.59677e-05
-    -1.56883e-05 -1.54089e-05 -1.51295e-05 -1.48501e-05 -1.45707e-05
-    -1.42913e-05 -1.40119e-05 -1.37325e-05 -1.34531e-05 -1.31737e-05
-    -1.28943e-05 -1.26149e-05 -1.23355e-05 -1.20561e-05 -1.17767e-05
-    -1.14973e-05 -1.10954e-05 0.0152675 0.0228237 -0.00460678
-    -0.0341525 0.0232109 -0.0138039 -0.0416538 -0.0458764 -0.0201967
-    -0.00878316 -0.00379173 -0.00164621 -0.000785131 -0.00037575
-    -0.000352375 -0.0545586 -0.0746881 -0.0771865 -0.05386 -0.0022199
-    0.0136703 0.00633526 0.00138826 -0.00108934 0.0038886 0.0298077
-    0.0475776 0.0481003 0.0464167 0.047818 0.042789 0.035207
-    0.0264423 0.0193959 0.0151614 0.00624257 -0.00913057 -0.0310696
-    -0.0430238 0.016426 0.189762 0.49025 0.820116 1.13919 1.43549
-    1.70658 1.95183 2.17414 2.38506 2.5657 2.73958 2.97905 3.21403
-    3.43025 3.62645 3.8028 3.96002 4.09996 4.22443 4.33427 4.42886
-    4.51097 4.5817 4.64326 4.6957 4.74132 4.7797 4.81298 4.84102
-    4.86512 4.88523 4.90224 4.91649 4.92846 4.93868 4.94755
-    4.95483 4.96114 4.96682 4.97161 4.97502 4.9776 4.97944 4.98141
-    4.98319 4.98467 4.98585 4.9869 4.98796 4.98902 4.99008 4.99114
-    4.9922 4.99326 4.9938 4.99429 4.99479 4.99528 4.99578 4.99628
-    4.99677 4.99704 4.99718 4.99733 4.99747 4.99762 4.99777
-    4.99791 4.99806 4.9982 4.99835 4.9985 4.99864 4.99879 4.99893
-    4.99907 4.99916 4.99925 4.99934 4.99943 5.01473 4.92293
-    4.61974 4.0316 3.7835 3.74195 3.78344 3.87272 3.97386 4.07319
-    4.16686 4.25256 4.33126 4.40264 4.46697 4.49249 4.51807
-    4.55803 4.64055 4.78574 4.86074 4.88334 4.8999 4.91455 4.92814
-    4.93926 4.94761 4.95433 4.95907 4.9654 4.98317 5.0208 5.05134
-    4.85852 4.16041 3.00077 1.68376 0.672707 0.240838 0.0794725
-    -0.0106347 -0.00879443 0.107196 0.368163 0.701424 1.03581
-    1.3601 1.6678 1.95731 2.22701 2.47544 2.69099 2.92327 3.16648
-    3.3877 3.59067 3.77344 3.93584 4.08066 4.20863 4.32065 4.41791
-    4.50211 4.57423 4.63614 4.68888 4.73377 4.7721 4.80519 4.83338
-    4.85732 4.87815 4.89514 4.90927 4.92108 4.93122 4.94014
-    4.94845 4.95601 4.96251 4.96576 4.969 4.97225 4.9755 4.97874
-    4.98087 4.98265 4.98442 4.9862 4.98797 4.98924 4.9899 4.99055
-    4.9912 4.99186 4.99251 4.99316 4.99381 4.99447 4.99512 4.99577
-    4.99609 4.99634 4.99659 4.99683 4.99708 4.99732 4.99757
-    4.99782 4.99806 4.99831 4.99853 4.99863 4.99873 4.99883
-    4.99893 4.99903 4.99913 4.99923 4.99933
-    EOD
-
-    @v[14].set(<<-'EOD')
-    1.86175 2.00147 1.85141 1.0654 0.275481 0.205547 0.0712627
-    0.0313387 0.0151431 0.00864531 0.00593861 0.00438111 0.0037479
-    0.00305857 0.00221221 0.0017081 -0.0896128 -0.109079 -0.121356
-    -0.0542001 0.175821 0.177442 0.0814591 0.0333042 0.0134909
-    0.00625777 0.00100092 -0.00552776 -0.00411139 -0.00150395
-    -0.000564784 3.48169e-05 -0.000287014 -0.000538515 -0.000456537
-    -0.000325677 -0.000275468 -0.000166452 -8.27481e-05 -8.28704e-05
-    -7.47644e-05 -4.60552e-05 -2.61481e-06 2.26359e-05 2.53852e-05
-    -1.39853e-06 -4.23456e-05 -4.0907e-05 -2.8501e-05 -1.5945e-05
-    -9.01122e-06 -2.07747e-06 1.49328e-06 4.38398e-06 6.84248e-06
-    4.76711e-06 2.69173e-06 6.16362e-07 -1.45901e-06 -3.53438e-06
-    -4.14256e-06 -3.76238e-06 -3.3822e-06 -3.00202e-06 -2.62184e-06
-    -2.24878e-06 -1.93456e-06 -1.62033e-06 -1.3061e-06 -9.91867e-07
-    -6.77638e-07 -3.63409e-07 -4.91792e-08 2.6505e-07 5.7928e-07
-    8.93509e-07 1.16076e-06 1.11055e-06 1.06034e-06 1.01014e-06
-    9.59927e-07 9.09719e-07 8.59511e-07 8.09302e-07 7.59094e-07
-    7.08886e-07 6.58678e-07 5.99251e-07 4.87523e-07 3.75795e-07
-    2.64068e-07 1.5234e-07 4.06119e-08 -7.1116e-08 -1.82844e-07
-    -2.94572e-07 -4.063e-07 -5.18027e-07 -6.08517e-07 -5.95879e-07
-    -5.83241e-07 -5.70604e-07 -5.57966e-07 -5.45328e-07 -5.3269e-07
-    -5.20053e-07 -5.07415e-07 -4.94777e-07 -4.8214e-07 -4.69502e-07
-    -4.56864e-07 -4.44226e-07 -4.31589e-07 -4.18951e-07 -4.06313e-07
-    -3.93676e-07 -3.81038e-07 -3.684e-07 -3.55762e-07 -3.43125e-07
-    1.06736e-05 0.0797407 0.0437947 -0.0645098 -0.0877312 0.0653203
-    -0.00621184 -0.0353188 -0.0491378 -0.0251957 -0.0110996
-    -0.00481123 -0.0020941 -0.000998038 -0.000478747 -0.000445332
-    -0.102046 -0.135753 -0.154351 -0.0827509 0.163348 0.174012
-    0.0794822 0.0310624 0.0112213 0.00249061 0.00130764 0.00181315
-    0.00163875 0.00101454 0.000497435 0.000195258 5.31901e-05
-    2.4607e-05 6.62736e-05 7.90718e-05 4.0372e-05 -0.000141184
-    -0.000280623 5.5608e-05 0.000799565 0.000920189 0.000931616
-    0.000494527 0.000162303 -8.24884e-05 -0.000183938 -0.000203899
-    -0.000144788 -9.87063e-05 -0.000227929 2.93932e-05 0.000208563
-    1.88958e-06 -7.6335e-05 -0.000172472 -0.000165656 -0.000145889
-    -0.000177311 -0.000191058 -0.000168287 -0.00015755 -0.00013142
-    -8.10488e-05 -6.36115e-05 -7.8699e-05 -8.11282e-05 -7.98625e-05
-    -5.98807e-05 -3.40879e-05 -1.95464e-05 -1.79247e-05 -4.45514e-05
-    -7.47995e-05 -8.7682e-05 -7.50806e-05 -3.25561e-05 -4.34114e-05
-    -7.69099e-05 -0.000141101 -0.00018743 -0.000148471 -5.06546e-05
-    0.000120195 0.000177635 0.000177052 0.000146344 9.75126e-05
-    8.31233e-05 6.8734e-05 5.43447e-05 3.99554e-05 2.55661e-05
-    1.11768e-05 -3.21253e-06 -3.88937e-06 -3.56628e-06 -3.24318e-06
-    -2.92008e-06 -2.59699e-06 -2.27389e-06 -1.9508e-06 -1.73227e-06
-    -1.56796e-06 -1.40365e-06 -1.23934e-06 -1.07503e-06 -9.10722e-07
-    -7.46412e-07 -5.82101e-07 -4.1779e-07 -2.5348e-07 -8.91694e-08
-    7.51412e-08 2.39452e-07 4.03762e-07 5.95733e-07 1.00771e-06
-    1.41969e-06 1.83167e-06 2.24365e-06 0.0828257 0.231038 0.465438
-    1.54516 2.8461 3.19221 3.40395 3.6382 3.80758 3.93848 4.04882
-    4.15428 4.247 4.32917 4.40235 4.36941 4.397 4.48862 4.64552
-    4.86595 5.03475 5.0348 5.02627 5.01967 5.01542 5.00925 4.98613
-    4.9519 4.91581 4.87357 4.82302 4.80403 4.82565 4.86102 4.89483
-    4.92253 4.94428 4.96257 4.97608 4.98373 4.98823 4.99182
-    4.99437 4.99635 4.99745 4.99802 4.99843 4.99873 4.99895
-    4.99912 4.99925 4.99931 4.99962 4.99973 4.99972 4.99971
-    4.9997 4.99969 4.9997 4.99971 4.99973 4.99974 4.99976 4.99978
-    4.9998 4.99982 4.99985 4.99987 4.99989 4.9999 4.99991 4.99991
-    4.99993 4.99994 4.99997 5.00001 5.00006 5.00008 5.00006
-    5.00002 5 4.99999 4.99998 4.99997 4.99995 4.99995 4.99995
-    4.99995 4.99995 4.99995 4.99995 4.99996 4.99997 4.99997
-    4.99998 4.99999 5 5 5.00001 5.00002 5.00002 5.00002 5.00002
-    5.00002 5.00002 5.00002 5.00002 5.00002 5.00002 5.00001
-    5.00001 5.00001 5.00001 5.00001 5 5 5 4.99999 4.99999 4.99999
-    EOD
-
-    @v[15].set(<<-'EOD')
-    1.86175 2.00199 2.08919 1.84314 1.08254 0.214737 0.0377351
-    0.00952455 0.00232763 0.000563614 0.000263477 0.000148642
-    0.000285086 0.000242592 7.34699e-05 -1.53467e-05 -0.0161874
-    -0.0157876 -0.0141194 0.0132576 0.0903272 0.109938 0.0535295
-    0.0224216 0.00940945 0.00466825 -0.000649972 -0.00654752
-    -0.00333248 -0.00103671 -0.000508276 -5.8896e-05 -0.00043938
-    -0.000544704 -0.00044444 -0.000307093 -0.00024517 -0.000154538
-    -8.78602e-05 -7.10461e-05 -6.06485e-05 -3.91039e-05 -8.45988e-06
-    9.43442e-06 1.28351e-05 -2.16734e-06 -2.6142e-05 -2.54768e-05
-    -1.88997e-05 -1.17906e-05 -7.3808e-06 -2.97101e-06 1.19146e-07
-    2.94246e-06 5.38942e-06 3.88851e-06 2.38761e-06 8.86704e-07
-    -6.14201e-07 -2.11511e-06 -2.59565e-06 -2.38885e-06 -2.18205e-06
-    -1.97525e-06 -1.76845e-06 -1.56241e-06 -1.36258e-06 -1.16276e-06
-    -9.62939e-07 -7.63116e-07 -5.63293e-07 -3.6347e-07 -1.63647e-07
-    3.61756e-08 2.35999e-07 4.35822e-07 6.07653e-07 5.90323e-07
-    5.72994e-07 5.55665e-07 5.38336e-07 5.21007e-07 5.03678e-07
-    4.86349e-07 4.6902e-07 4.51691e-07 4.34361e-07 4.11899e-07
-    3.60315e-07 3.08731e-07 2.57146e-07 2.05562e-07 1.53977e-07
-    1.02393e-07 5.08082e-08 -7.76222e-10 -5.23607e-08 -1.03945e-07
-    -1.47815e-07 -1.54225e-07 -1.60635e-07 -1.67045e-07 -1.73455e-07
-    -1.79864e-07 -1.86274e-07 -1.92684e-07 -1.99094e-07 -2.05504e-07
-    -2.11914e-07 -2.18324e-07 -2.24734e-07 -2.31144e-07 -2.37554e-07
-    -2.43964e-07 -2.50373e-07 -2.56783e-07 -2.63193e-07 -2.69603e-07
-    -2.76013e-07 -2.82423e-07 2.92534e-06 0.0446777 0.024278
-    -0.0518987 -0.0636547 0.00983929 -0.000518204 -0.000265194
-    0.000154772 0.000299538 3.12715e-05 -3.18225e-05 -2.48268e-05
-    -1.16701e-05 -6.05117e-06 7.61116e-06 -0.0163668 -0.0158244
-    -0.0141177 0.0100085 0.0857144 0.107784 0.051862 0.0204448
-    0.00629858 0.000967736 0.00121674 0.00190276 0.00154009
-    0.000860922 0.000410386 0.000164585 3.99493e-05 1.93797e-05
-    5.67594e-05 0.000110126 2.49925e-05 -7.17815e-05 -0.000142299
-    -1.63109e-05 0.000439529 0.000562489 0.000594599 0.000326164
-    0.000126423 -4.26063e-05 -0.000122927 -0.000114152 -6.72706e-05
-    -6.41242e-05 -0.000135588 2.61507e-05 0.000134036 6.43734e-06
-    -4.6223e-05 -0.000112047 -0.000101388 -8.67847e-05 -0.000117664
-    -0.000133957 -0.000116558 -0.000100873 -7.65448e-05 -4.44964e-05
-    -3.6677e-05 -5.26632e-05 -5.45172e-05 -5.13545e-05 -3.73869e-05
-    -1.99732e-05 -1.0907e-05 -1.10081e-05 -3.02609e-05 -5.18517e-05
-    -6.13597e-05 -5.30706e-05 -2.39572e-05 -3.24146e-05 -5.70062e-05
-    -0.000103448 -0.000135376 -0.0001024 -2.39007e-05 0.000110929
-    0.000151226 0.000142044 0.000105922 5.62834e-05 4.78476e-05
-    3.94117e-05 3.09759e-05 2.25401e-05 1.41042e-05 5.66837e-06
-    -2.76747e-06 -3.08639e-06 -2.81341e-06 -2.54043e-06 -2.26745e-06
-    -1.99447e-06 -1.72149e-06 -1.44851e-06 -1.26226e-06 -1.12096e-06
-    -9.79661e-07 -8.38363e-07 -6.97065e-07 -5.55768e-07 -4.1447e-07
-    -2.73173e-07 -1.31875e-07 9.42259e-09 1.5072e-07 2.92018e-07
-    4.33315e-07 5.74613e-07 7.10363e-07 8.01984e-07 8.93604e-07
-    9.85225e-07 1.07685e-06 0.04474 0.0928765 0.141327 0.0176048
-    -0.071675 -0.0124613 0.989022 2.28104 3.40619 4.21417 4.67173
-    4.87438 4.96044 4.98996 4.99858 4.96672 4.89502 4.79391
-    4.76433 4.8387 4.98612 5.0161 5.01722 5.01437 5.01256 4.99827
-    4.95807 4.9209 4.88217 4.83006 4.78461 4.80759 4.85548 4.89604
-    4.9254 4.94617 4.96126 4.97374 4.98255 4.98792 4.99126 4.99361
-    4.99554 4.99699 4.99792 4.99846 4.99881 4.99905 4.99924
-    4.99938 4.99949 4.99955 4.9997 4.9998 4.99982 4.99982 4.99982
-    4.99982 4.99982 4.99983 4.99984 4.99985 4.99986 4.99987
-    4.99988 4.99989 4.9999 4.99992 4.99993 4.99994 4.99995 4.99995
-    4.99996 4.99996 4.99998 4.99999 5.00001 5.00002 5.00002
-    5.00001 5.00001 5 4.99999 4.99999 4.99998 4.99998 4.99998
-    4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998
-    4.99999 4.99999 4.99999 4.99999 5 5 5 5 5 5 5.00001 5.00001
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
-    EOD
-
-    @v[16].set(<<-'EOD')
-    1.86175 1.73073 1.50572 1.89001 3.39004 4.36034 4.79012
-    4.93798 4.98305 4.99539 4.9979 4.99904 4.99772 4.9983 4.99935
-    4.99975 4.98837 4.99456 4.99728 5.01838 5.04568 5.00759
-    4.98112 4.98479 4.99197 4.99641 4.99747 4.99775 5.00043
-    5.0007 5.00035 5.00023 4.99976 5.00002 5.00007 5.0002 4.99993
-    5.00003 5.00021 5.00006 4.99993 4.99992 5.00002 5.00013
-    5.00017 5.00009 4.99992 4.99991 4.99993 4.99996 4.99998
-    4.99999 5.00001 5.00003 5.00005 5.00004 5.00004 5.00003
-    5.00002 5.00001 5 4.99999 4.99999 4.99998 4.99998 4.99997
-    4.99997 4.99998 4.99998 4.99998 4.99998 4.99999 4.99999
-    4.99999 4.99999 5 5 5 5 5 5 5.00001 5.00001 5.00001 5.00001
-    5.00001 5.00001 5.00002 5.00001 5.00001 5.00001 5.00001
-    5.00001 5.00001 5.00001 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    5 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
-    4.99999 5 5.01498 4.99342 4.96899 5.00301 5.02627 4.9977
-    4.99548 4.99757 5.00277 5.00245 5.0014 5.00069 5.00032 5.00014
-    5.00009 4.9867 4.99262 4.99607 5.01805 5.04713 5.00927 4.98184
-    4.98483 4.9914 4.99616 4.99902 4.9999 4.99987 4.99979 4.99981
-    4.99989 4.99994 4.99998 5.0002 5.00001 5.00008 5.00008 5.0001
-    5.00021 5.00032 5.00025 5.00019 5.00006 5.00007 4.99994
-    4.99997 4.99999 5.00023 5.00008 4.99993 4.99998 4.99986
-    4.99982 5.00003 4.99985 4.99996 5.00014 5 4.99984 4.99979
-    4.99982 4.99993 5.00008 5.00011 5.00002 4.99996 4.9999 4.99994
-    5.00001 5.00007 5.00009 4.99995 4.99978 4.99971 4.99976
-    4.99997 4.99996 4.99989 4.99972 4.99955 4.99953 4.99959
-    4.99976 4.9999 5.00005 5.00023 5.00039 5.00034 5.00029 5.00024
-    5.00019 5.00014 5.00009 5.00004 5.00003 5.00002 5.00001
-    5 5 4.99999 4.99998 4.99998 4.99998 4.99998 4.99998 4.99999
-    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 5 5 5 5
-    5.00001 5.00002 5.00003 5.00004 5.01564 5.03395 5.04932
-    5.11868 3.92502 1.31888 0.163888 0.0946876 0.0789578 0.0565084
-    0.0260333 0.0156986 0.00907667 0.00613629 0.00468417 -0.00174008
-    -0.0021422 0.000586962 0.0124937 0.0147977 0.00838454 0.00039383
-    -0.000522021 -0.000426598 -0.000290214 -0.00173713 -0.00384132
-    -0.00382945 -0.00429219 -0.00580193 -0.00393246 0.0017543
-    0.00423045 0.00408931 0.0031976 0.00245457 0.00187293 0.00159068
-    0.00105697 0.000609902 0.000358825 0.000334125 0.000212708
-    0.000168116 8.97349e-05 5.21578e-05 3.84527e-05 2.93033e-05
-    2.10067e-05 1.59954e-05 1.13917e-05 5.49738e-06 2.77217e-05
-    6.51259e-06 -6.65468e-06 2.09837e-06 -6.617e-06 -4.80187e-06
-    1.55031e-06 4.26536e-06 7.69457e-07 -1.46213e-06 -7.25202e-07
-    3.26501e-06 6.55807e-06 7.524e-06 6.07209e-06 6.00701e-06
-    5.41166e-06 3.86573e-06 1.10651e-06 -2.74603e-06 -2.18566e-06
-    2.3658e-06 8.59956e-06 8.35046e-06 2.90621e-06 -8.75982e-07
-    -1.87189e-06 -2.1528e-06 -1.94875e-06 -1.74471e-06 -1.54067e-06
-    -1.33662e-06 -1.13258e-06 -8.40567e-07 -5.20743e-07 -2.00918e-07
-    1.18906e-07 4.38731e-07 6.11382e-07 6.01529e-07 5.91675e-07
-    5.81822e-07 5.71968e-07 5.62115e-07 5.52261e-07 5.42407e-07
-    5.32554e-07 5.227e-07 5.12847e-07 4.72812e-07 4.26137e-07
-    3.79462e-07 3.32786e-07 2.86111e-07 2.39436e-07 1.92761e-07
-    1.46086e-07 9.94107e-08 5.27356e-08 -2.77779e-10 -7.98079e-08
-    -1.59338e-07 -2.38868e-07 -3.18398e-07 -3.97928e-07 -4.77458e-07
-    -5.56988e-07 -6.36519e-07
-    EOD
-
-    @v[17].set(<<-'EOD')
-    5 5.16963 4.84136 3.33754 0.316206 0.103113 0.0273341 0.0221102
-    0.0177008 0.0143758 0.0115203 0.00929231 0.00752716 0.00625439
-    0.00489872 0.00403656 -0.0657317 -0.0256467 0.165394 0.985963
-    3.05067 4.55799 4.89728 4.92464 4.8882 4.90592 4.97315 4.99241
-    4.99694 4.99845 4.99905 4.99939 4.99959 4.99971 4.9998 4.99986
-    4.9999 4.99993 4.99995 4.99996 4.99997 4.99998 4.99998 4.99999
-    4.99999 4.99999 4.99999 4.99999 5 5.00001 5.00003 5.00005
-    5.00004 5.00002 5 4.99999 4.99999 4.99998 4.99998 4.99997
-    4.99997 4.99998 4.99998 4.99999 4.99999 5 5 5 5 5 5.00001
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00002 5.00001
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5 5 5 5
-    5 5 5 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99998
-    4.99998 4.99998 4.99999 4.99999 4.99999 4.99999 4.99999
-    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
-    4.99999 4.99999 5 5 5 5 5 5 5.00025 5.1657 4.69981 2.43895
-    0.0229743 0.0351406 -0.0211974 -0.0312063 -0.0160331 -0.0021718
-    -0.000766597 -0.000251052 -5.49363e-05 -3.36364e-06 -2.01983e-06
-    -9.70575e-06 -0.0657007 -0.0205247 0.183332 1.07163 3.11839
-    4.46213 4.84163 4.95195 4.99159 5.02084 5.04029 5.04138
-    5.0271 5.00445 4.97957 4.95702 4.95231 4.97819 4.99191 4.9963
-    4.99822 4.99878 4.99903 4.99925 4.99942 4.9995 4.99954 4.99957
-    4.99961 4.99966 4.9997 4.99974 4.99977 4.99981 4.99983 4.99986
-    4.99988 4.9999 4.99991 4.99992 4.99994 4.99995 4.99995 4.99996
-    4.99997 4.99997 4.99998 4.99998 4.99998 4.99999 4.99999
-    4.99999 4.99999 4.99999 4.99999 4.99999 5 5 5 5 5 5 5 5
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5.00001 5.00001 5.00001
-    5.00002 5.00002 5.00002 5.00002 5.00002 5.00002 5.00002
-    5.00002 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
-    5.00001 5 5 5 4.99999 4.99998 4.99997 4.99996 5.14239 4.76219
-    3.16574 0.299969 0.0631609 -0.00118611 -0.00026052 -5.96333e-05
-    -1.44904e-05 -4.3859e-06 -2.99454e-06 1.10547e-06 4.84662e-06
-    1.30971e-05 2.23082e-05 -0.0655844 -0.0204818 0.182507 1.05954
-    3.12277 4.46735 4.83915 4.94512 4.97679 4.98654 4.9966 5.00833
-    5.00776 5.00432 5.00199 5.00086 5.00033 5.00008 5 5.00001
-    5 5.00005 5.00002 4.99981 4.99991 4.99998 4.99979 4.99979
-    4.99984 4.9998 4.9998 5.00006 5.00002 5.00001 5 5 4.99992
-    4.99998 4.99999 5.00002 5.00014 4.99999 4.99987 4.99993
-    5.00003 5.00011 5.00005 4.99996 4.99987 4.99985 4.99994
-    5.00009 5.0001 5 4.99993 4.99997 5.00008 5.00015 5.00021
-    5.00021 5.00007 4.99978 4.99965 4.99973 4.9999 4.99992 4.99995
-    4.99997 4.99999 5.00001 5.00002 5.00001 5.00001 5.00001
-    5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
-    4.99998 4.99998 4.99999 4.99999 4.99999 4.99999 4.99999
-    4.99999 4.99999 5 5 5 5 5 5.00001 5.00001 5.00001 5.00002
-    5.00002 5.00002
-    EOD
-
-    @v[18].set(<<-'EOD')
-    5 5.0333 5.02472 4.92559 4.18383 3.93923 3.9961 4.14293
-    4.28591 4.41336 4.52157 4.61101 4.68472 4.7439 4.79294 4.83239
-    4.80697 4.78808 4.79322 4.8838 5.08529 5.21863 4.88852 3.90198
-    2.14586 0.383977 0.101103 0.0525711 0.0318287 0.020895 0.0146908
-    0.010831 0.00830272 0.00656377 0.00532066 0.00440078 0.00369956
-    0.00315713 0.00272614 0.00237965 0.00209659 0.00186339 0.00167014
-    0.0015081 0.00137172 0.00125607 0.00115393 0.00106076 0.000980166
-    0.000918015 0.000862837 0.00080766 0.000763488 0.000721541
-    0.000680825 0.000653026 0.000625226 0.000597426 0.000569627
-    0.000541827 0.000519087 0.000499756 0.000480424 0.000461093
-    0.000441761 0.000423291 0.000411941 0.00040059 0.00038924
-    0.000377889 0.000366539 0.000355188 0.000343838 0.000332487
-    0.000321137 0.000309786 0.000299055 0.000292509 0.000285963
-    0.000279417 0.000272871 0.000266325 0.000259779 0.000253233
-    0.000246686 0.00024014 0.000233594 0.000227387 0.0002231
-    0.000218813 0.000214526 0.00021024 0.000205953 0.000201666
-    0.000197379 0.000193092 0.000188805 0.000184519 0.000180526
-    0.000177963 0.0001754 0.000172837 0.000170274 0.000167711
-    0.000165148 0.000162585 0.000160022 0.000157459 0.000154895
-    0.000152332 0.000149769 0.000147206 0.000144643 0.00014208
-    0.000139517 0.000136954 0.000134391 0.000131828 0.000129265
-    0.000126702 0.000132838 0.0311184 0.163151 0.34986 0.604501
-    0.357125 0.136137 0.0711304 0.0346959 0.0212674 0.00872193
-    0.00252206 0.000455269 7.59332e-05 2.91532e-05 0.000320562
-    -0.0720911 -0.0840491 -0.0791345 -0.0404143 0.0182035 -0.0235871
-    -0.0426072 -0.0597501 0.00824773 0.481404 1.32496 2.11949
-    2.57317 2.58202 2.15054 1.33786 0.45702 0.153772 0.0913584
-    0.0604989 0.0421591 0.0271456 0.0170021 0.0115815 0.00907886
-    0.00742466 0.00626096 0.00531127 0.00450501 0.00381927 0.00323718
-    0.00274374 0.00232494 0.00196885 0.00166686 0.00141134 0.00119437
-    0.0010109 0.000855534 0.000723378 0.000611408 0.000516704
-    0.000436769 0.000369523 0.000313026 0.00026526 0.000223976
-    0.000188972 0.000159042 0.000134148 0.000112688 9.49738e-05
-    7.97877e-05 6.721e-05 5.65115e-05 4.77194e-05 4.03591e-05
-    3.42848e-05 2.92627e-05 2.50435e-05 2.1412e-05 1.84532e-05
-    1.58624e-05 1.34673e-05 1.14461e-05 1.00935e-05 9.12375e-06
-    8.50202e-06 7.81431e-06 7.20729e-06 6.73936e-06 6.3702e-06
-    5.90049e-06 5.43077e-06 4.96105e-06 4.49133e-06 4.02162e-06
-    3.5519e-06 3.08218e-06 2.79099e-06 2.51281e-06 2.23463e-06
-    1.95645e-06 1.67827e-06 1.40009e-06 1.12191e-06 1.01376e-06
-    9.9375e-07 9.73741e-07 9.53733e-07 9.33724e-07 9.13715e-07
-    8.93707e-07 8.73698e-07 8.5369e-07 8.33681e-07 8.13673e-07
-    7.93664e-07 7.73655e-07 7.53647e-07 7.21781e-07 5.956e-07
-    4.69419e-07 3.43239e-07 2.17058e-07 0.0284032 0.0374438
-    -0.0157543 -0.0680497 0.0504768 0.0100294 0.00222261 0.000528697
-    0.000132929 3.99489e-05 2.46066e-05 4.56327e-06 -6.54853e-06
-    1.33783e-05 -3.68221e-05 -0.0724498 -0.0843663 -0.0792935
-    -0.0406426 0.0200019 0.0426259 0.0220753 0.00668555 -0.000968483
-    0.024662 0.0383437 0.0911513 0.087848 0.0602076 0.0390559
-    0.0260573 0.0180444 0.012974 0.00985409 0.00788132 0.0064228
-    0.005545 0.00453571 0.00364245 0.00310278 0.00270523 0.00236439
-    0.0020945 0.00186808 0.00167493 0.00151731 0.00138594 0.00126945
-    0.00116695 0.0010762 0.000996366 0.000928387 0.000864414
-    0.000808258 0.000759574 0.000713865 0.000666712 0.000632716
-    0.000601262 0.000572163 0.000543986 0.000515253 0.0004897
-    0.000468112 0.000449313 0.000432981 0.000417911 0.000401307
-    0.000382712 0.000366678 0.000355736 0.000349171 0.000335727
-    0.000317091 0.000296086 0.000283543 0.000277366 0.000272233
-    0.000267001 0.000263147 0.000256699 0.000250251 0.000243803
-    0.000237355 0.000230907 0.000225424 0.000220247 0.000215069
-    0.000209892 0.000204714 0.000200213 0.000196548 0.000192884
-    0.00018922 0.000185556 0.000181892 0.000178228 0.000174564
-    0.0001709 0.000167236 0.000163572 0.000160824 0.000158279
-    0.000155733 0.000153187 0.000150641 0.000148095 0.000145549
-    0.000143003 0.000140457 0.000137911 0.000135457 0.000133386
-    0.000131315 0.000129245 0.000127174 0.000125103 0.000123032
-    0.000120961 0.000118891
-    EOD
-
-    @v[19].set(<<-'EOD')
-    1.86175 1.99994 2.0833 2.01627 2.42503 3.25769 3.62134 3.88827
-    4.09688 4.26773 4.40529 4.51734 4.60827 4.68313 4.74346
-    4.79302 4.72815 4.68959 4.70421 4.81316 5.01375 5.14493
-    5.10305 5.0699 5.04484 5.03751 5.03348 5.02504 5.01799 5.01271
-    5.00895 5.00628 5.0044 5.00309 5.00216 5.00151 5.00105 5.00073
-    5.00051 5.00034 5.00023 5.00015 5.0001 5.00007 5.00003 4.99998
-    4.99993 4.99993 4.99995 4.99999 5.00001 5.00003 5.00002
-    5.00001 5 5 5 5 4.99999 4.99999 4.99999 5 5 5 5 5 5 5 5
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5.00017 5.17398
-    4.94779 3.78508 1.52302 0.608808 0.244311 0.126053 0.0597175
-    0.038422 0.0158174 0.00481338 0.00107847 0.000301256 0.000114861
-    0.00059489 -0.118904 -0.147478 -0.158986 -0.080544 0.165361
-    0.171378 0.0776087 0.0435738 0.0428235 0.0423755 0.0347695
-    0.0225061 0.0155539 0.0121357 0.0107997 0.0103976 0.0124406
-    0.016814 0.0167556 0.0149852 0.01459 0.0141182 0.0131934
-    0.0120286 0.0108692 0.0097184 0.00855881 0.00744912 0.00643877
-    0.00554044 0.00475165 0.00406535 0.00347158 0.00295981 0.00251995
-    0.00214318 0.00182101 0.00154613 0.00131196 0.0011119 0.000941587
-    0.000796999 0.000674582 0.000571283 0.000484276 0.000410649
-    0.000347005 0.000292984 0.000246715 0.000208143 0.00017489
-    0.000147412 0.000123854 0.000104332 8.77229e-05 7.40686e-05
-    6.2637e-05 5.32e-05 4.53946e-05 3.88343e-05 3.31864e-05
-    2.85905e-05 2.45725e-05 2.08671e-05 1.77301e-05 1.55911e-05
-    1.40153e-05 1.29421e-05 1.18693e-05 1.09815e-05 1.03484e-05
-    9.87664e-06 9.14446e-06 8.41228e-06 7.68011e-06 6.94793e-06
-    6.21575e-06 5.48357e-06 4.7514e-06 4.38454e-06 4.04432e-06
-    3.7041e-06 3.36388e-06 3.02366e-06 2.68344e-06 2.34322e-06
-    2.15196e-06 2.03791e-06 1.92386e-06 1.80982e-06 1.69577e-06
-    1.58173e-06 1.46768e-06 1.35363e-06 1.23959e-06 1.12554e-06
-    1.0115e-06 8.9745e-07 7.83404e-07 6.69358e-07 4.76113e-07
-    -3.47071e-07 -1.17025e-06 -1.99344e-06 -2.81662e-06 0.0783754
-    0.0500262 -0.0659563 -0.120914 0.0815957 0.0154255 0.00347177
-    0.000840357 0.000214582 6.54655e-05 3.91709e-05 8.07396e-06
-    -4.44265e-07 1.74384e-05 -4.52725e-05 -0.119379 -0.147984
-    -0.159247 -0.0824604 0.169014 0.177628 0.0758742 0.010558
-    -0.0346506 -0.0710288 -0.0838952 -0.0599521 -0.034568 -0.0181615
-    -0.00968034 -0.00547115 -0.00333511 -0.00232468 -0.00181159
-    -0.00143841 -0.00116601 -0.000839755 -0.000569764 -0.000578683
-    -0.000490551 -0.000411712 -0.000437859 -0.000408185 -0.000356644
-    -0.000311332 -0.000269006 -0.000221396 -0.000210054 -0.0001923
-    -0.000175122 -0.000161039 -0.0001428 -0.000126123 -0.000127893
-    -8.14516e-05 -0.000120166 -0.000154909 -0.000112733 -8.40377e-05
-    -7.11342e-05 -8.09538e-05 -9.77789e-05 -9.82402e-05 -7.73531e-05
-    -5.28255e-05 -3.1096e-05 -1.87967e-05 -1.96552e-05 -4.16655e-05
-    -5.77185e-05 -5.24142e-05 -2.83153e-05 -1.90012e-05 -1.54415e-05
-    -2.52569e-05 -6.23747e-05 -0.000130543 -0.000149394 -0.000110886
-    -4.35517e-05 -4.17084e-05 -3.98651e-05 -3.80218e-05 -3.61785e-05
-    -3.43352e-05 -3.36249e-05 -3.32729e-05 -3.29208e-05 -3.25687e-05
-    -3.22166e-05 -3.17143e-05 -3.10258e-05 -3.03372e-05 -2.96486e-05
-    -2.89601e-05 -2.82715e-05 -2.75829e-05 -2.68944e-05 -2.62058e-05
-    -2.55173e-05 -2.48287e-05 -2.43043e-05 -2.38159e-05 -2.33276e-05
-    -2.28393e-05 -2.2351e-05 -2.18626e-05 -2.13743e-05 -2.0886e-05
-    -2.03977e-05 -1.99093e-05 -1.945e-05 -1.91122e-05 -1.87744e-05
-    -1.84366e-05 -1.80987e-05 -1.77609e-05 -1.74231e-05 -1.70853e-05
-    -1.67474e-05
-    EOD
-
-    @v[20].set(<<-'EOD')
-    1.86175 1.99724 2.17266 2.48439 3.15933 3.85231 4.38091
-    4.69033 4.85034 4.92851 4.96453 4.98188 4.98736 4.991 4.99482
-    4.9973 4.96422 4.89989 4.83907 4.83151 4.90868 5.04854 5.06104
-    5.04571 5.03219 5.03025 5.02273 5.01707 5.0123 5.0087 5.00611
-    5.00429 5.00301 5.00211 5.00148 5.00103 5.00072 5.0005 5.00035
-    5.00024 5.00016 5.00011 5.00007 5.00005 5.00003 5.00001
-    4.99999 4.99998 4.99998 4.99998 4.99998 4.99998 4.99999
-    5 5 5.00001 5.00001 5.00002 5.00002 5.00002 5.00002 5.00002
-    5.00002 5.00001 5.00001 5 5 5 5 5 5 4.99999 4.99999 4.99999
-    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
-    4.99999 4.99999 4.99999 5 5 5 5 5 5 5 5 5.00001 5.00001
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5 5 5 5
-    5 5 4.99981 5.10081 5.10903 4.98404 5.00999 5.14946 4.36501
-    2.23938 0.325144 0.00660272 -0.0102186 -0.0082401 -0.00556785
-    -0.00374178 -0.00264763 -0.00202823 -0.0182241 -0.0169551
-    -0.0150395 0.0103736 0.0877592 0.104382 0.0515938 0.0373818
-    0.0411547 0.0397009 0.0308946 0.0205793 0.0154037 0.0129191
-    0.0119327 0.011527 0.0124295 0.0161152 0.0161076 0.0145391
-    0.0144541 0.0139287 0.0129215 0.0117239 0.0105795 0.00942983
-    0.00827423 0.00718354 0.00619954 0.00532868 0.00456631 0.00390448
-    0.00333254 0.00284003 0.00241714 0.00205524 0.0017458 0.00148202
-    0.00125739 0.0010655 0.000902213 0.000763611 0.000646279
-    0.000547291 0.000463934 0.000393401 0.000332424 0.000280655
-    0.000236328 0.000199386 0.000167536 0.000141218 0.000118654
-    9.99559e-05 8.40479e-05 7.09694e-05 6.00188e-05 5.09786e-05
-    4.3502e-05 3.72191e-05 3.18114e-05 2.74071e-05 2.35539e-05
-    1.99967e-05 1.69871e-05 1.49449e-05 1.3451e-05 1.24492e-05
-    1.14256e-05 1.05669e-05 9.94487e-06 9.47514e-06 8.77318e-06
-    8.07123e-06 7.36927e-06 6.66731e-06 5.96536e-06 5.2634e-06
-    4.56144e-06 4.23044e-06 3.92649e-06 3.62254e-06 3.31858e-06
-    3.01463e-06 2.71068e-06 2.40673e-06 2.23063e-06 2.12082e-06
-    2.01102e-06 1.90121e-06 1.7914e-06 1.68159e-06 1.57178e-06
-    1.46197e-06 1.35216e-06 1.24235e-06 1.13255e-06 1.02274e-06
-    9.12929e-07 8.0312e-07 6.33171e-07 -1.51288e-08 -6.63428e-07
-    -1.31173e-06 -1.96003e-06 0.0437517 0.0265689 -0.0515377
-    -0.0658688 0.010727 -0.000511921 -8.36924e-05 2.13278e-05
-    1.45207e-05 4.54862e-06 -6.14726e-06 2.0062e-06 1.02709e-06
-    1.4152e-05 -3.08225e-05 -0.0166501 -0.0157139 -0.013957
-    0.0107537 0.0873717 0.111302 0.0454129 -0.00530142 -0.0468336
-    -0.0790063 -0.0826944 -0.0534753 -0.0288705 -0.0149009 -0.00801592
-    -0.0046342 -0.00291835 -0.00213019 -0.00170055 -0.001352
-    -0.00110593 -0.000742655 -0.000532042 -0.000544742 -0.000479206
-    -0.000407307 -0.000403575 -0.000366209 -0.000324161 -0.000286183
-    -0.000247579 -0.000214281 -0.000203435 -0.000186896 -0.000171033
-    -0.00015779 -0.000145259 -0.000128069 -0.000122647 -9.89398e-05
-    -0.000114926 -0.000132195 -0.000107872 -8.91015e-05 -7.87996e-05
-    -8.14061e-05 -8.9098e-05 -8.83368e-05 -7.6122e-05 -6.14668e-05
-    -4.75402e-05 -3.81855e-05 -3.69696e-05 -4.78656e-05 -5.61346e-05
-    -5.35007e-05 -4.1459e-05 -3.35411e-05 -2.52374e-05 -2.37479e-05
-    -4.6406e-05 -9.41884e-05 -0.000109222 -8.52676e-05 -4.25166e-05
-    -4.10125e-05 -3.95085e-05 -3.80045e-05 -3.65004e-05 -3.49964e-05
-    -3.41627e-05 -3.3541e-05 -3.29193e-05 -3.22976e-05 -3.16758e-05
-    -3.10334e-05 -3.03653e-05 -2.96971e-05 -2.9029e-05 -2.83609e-05
-    -2.76928e-05 -2.70246e-05 -2.63565e-05 -2.56884e-05 -2.50203e-05
-    -2.43521e-05 -2.38716e-05 -2.34324e-05 -2.29932e-05 -2.25539e-05
-    -2.21147e-05 -2.16755e-05 -2.12362e-05 -2.0797e-05 -2.03578e-05
-    -1.99186e-05 -1.95079e-05 -1.9217e-05 -1.8926e-05 -1.8635e-05
-    -1.8344e-05 -1.8053e-05 -1.7762e-05 -1.74711e-05 -1.71801e-05
-    EOD
-
-    @v[21].set(<<-'EOD')
-    1.86175 1.73273 1.42016 1.02483 0.944013 0.274107 0.0823742
-    0.0379366 0.020816 0.0132952 0.00955525 0.00717008 0.00592286
-    0.00437379 0.00383557 0.00273694 -0.0037467 -0.0054191 -0.00131454
-    0.0112179 0.0133918 0.00519747 -0.00260113 -0.00252847 -0.00181292
-    0.000183398 -0.000667607 -0.000750747 -0.000594314 -0.000433904
-    -0.000308985 -0.000217858 -0.000152926 -0.000107454 -7.54076e-05
-    -5.2675e-05 -3.66299e-05 -2.54341e-05 -1.75095e-05 -1.18848e-05
-    -7.97289e-06 -5.30239e-06 -3.53615e-06 -2.38504e-06 -2.40158e-06
-    -3.84485e-06 -5.29435e-06 -2.57099e-06 1.95189e-06 3.55083e-06
-    2.06179e-06 5.72753e-07 3.30469e-07 3.40296e-07 3.60221e-07
-    4.86081e-07 6.1194e-07 7.37799e-07 8.63659e-07 9.89518e-07
-    9.21274e-07 7.22275e-07 5.23276e-07 3.24277e-07 1.25278e-07
-    -5.59467e-08 -9.03265e-08 -1.24706e-07 -1.59086e-07 -1.93466e-07
-    -2.27846e-07 -2.62226e-07 -2.96605e-07 -3.30985e-07 -3.65365e-07
-    -3.99745e-07 -4.24266e-07 -3.82163e-07 -3.40061e-07 -2.97959e-07
-    -2.55857e-07 -2.13755e-07 -1.71652e-07 -1.2955e-07 -8.7448e-08
-    -4.53457e-08 -3.24353e-09 3.76901e-08 7.19937e-08 1.06297e-07
-    1.40601e-07 1.74904e-07 2.09208e-07 2.43512e-07 2.77815e-07
-    3.12119e-07 3.46422e-07 3.80726e-07 4.04507e-07 3.77191e-07
-    3.49876e-07 3.22561e-07 2.95246e-07 2.67931e-07 2.40616e-07
-    2.13301e-07 1.85986e-07 1.58671e-07 1.31356e-07 1.04041e-07
-    7.67256e-08 4.94105e-08 2.20955e-08 -5.21962e-09 -3.25347e-08
-    -5.98498e-08 -8.71649e-08 -1.1448e-07 -1.41795e-07 -1.6911e-07
-    7.87893e-06 0.0114592 -0.0245712 -0.111637 0.0961324 1.61168
-    3.22343 4.20442 4.53535 4.83834 4.95464 4.98874 4.99746
-    4.99883 4.99948 4.99815 4.98431 4.99298 4.99718 5.01948
-    5.04749 5.008 4.98243 4.98985 4.99781 4.99887 4.99679 4.99616
-    4.99743 4.99859 4.99936 4.99972 5.00058 5.00123 5.0002 4.99945
-    4.99983 4.9998 4.99966 4.99958 4.99956 4.99956 4.99956 4.99958
-    4.99961 4.99965 4.99969 4.99973 4.99977 4.9998 4.99983 4.99985
-    4.99987 4.99989 4.99991 4.99992 4.99993 4.99994 4.99995
-    4.99996 4.99997 4.99997 4.99998 4.99998 4.99998 4.99999
-    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 5 5 5 5
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5.00001 5.00001
-    5.00001 5.00002 5.00002 5.00002 5.00002 5.00002 5.00002
-    5.00002 5.00002 5.00001 5.00001 5.00001 5.00001 5.00001
-    5.00001 5.00001 5 5 5 4.99999 4.99998 4.99997 4.99996 5.01454
-    4.99566 4.96796 4.99819 5.03232 5.00034 4.99867 4.99937
-    4.99977 4.99992 4.99997 4.99999 5.00001 5.00021 4.99974
-    4.98462 4.99301 4.99723 5.01936 5.04807 5.00929 4.9789 4.97876
-    4.98244 4.9863 4.99575 5.0069 5.00863 5.00624 5.00357 5.0019
-    5.00098 5.00048 5.00025 5.00016 5.00011 5.00013 5.00009
-    4.99982 4.99994 5.00005 4.99994 4.99988 4.99989 4.99997
-    5.00003 5.00005 5.00002 5.00001 5.00001 5.00001 4.99993
-    4.99999 5 5.00021 4.99997 4.99981 5 5.00009 5.0001 5.00001
-    4.99991 4.9999 5 5.00011 5.00017 5.00018 5.00018 5.00014
-    5.00007 4.99999 4.9999 4.9999 5.00001 5.00016 5.00014 4.99999
-    4.99993 4.99999 5.00009 5.00007 5.00006 5.00004 5.00003
-    5.00001 5.00001 5 4.99999 4.99998 4.99997 4.99997 4.99997
-    4.99998 4.99998 4.99998 4.99998 4.99999 4.99999 4.99999
-    5 5 5 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001 5.00002
-    5.00002 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
-    5 5
-    EOD
-
-    @v[22].set(<<-'EOD')
-    7.10441e-10 0.00107105 0.000637109 -0.00236346 -0.018079
-    -0.0120077 -0.00217059 0.00266679 0.00403383 0.00403836
-    0.00356705 0.00303303 0.00244716 0.00198586 0.0016855 0.00136497
-    -3.96022e-05 -0.000367409 -3.77079e-05 0.00194085 0.00506964
-    -0.0400214 -0.0402572 0.0524434 0.286234 0.803011 1.44795
-    2.02473 2.54768 3.02748 3.4415 3.78287 4.09667 4.35152 4.53987
-    4.67614 4.77407 4.84319 4.89227 4.92702 4.95119 4.96764
-    4.97846 4.98557 4.98982 4.99209 4.99371 4.99569 4.99727
-    4.99802 4.99834 4.99867 4.99892 4.99915 4.99936 4.99939
-    4.99943 4.99946 4.9995 4.99953 4.99957 4.9996 4.99963 4.99967
-    4.9997 4.99973 4.99974 4.99975 4.99976 4.99977 4.99978 4.9998
-    4.99981 4.99982 4.99983 4.99984 4.99985 4.99986 4.99986
-    4.99986 4.99987 4.99987 4.99988 4.99988 4.99989 4.99989
-    4.9999 4.9999 4.9999 4.9999 4.99991 4.99991 4.99991 4.99991
-    4.99992 4.99992 4.99992 4.99992 4.99993 4.99993 4.99993
-    4.99993 4.99993 4.99993 4.99993 4.99993 4.99994 4.99994
-    4.99994 4.99994 4.99994 4.99994 4.99994 4.99994 4.99995
-    4.99995 4.99995 4.99995 4.99995 4.99995 4.99995 5.00145
-    5.00659 5.01209 5.01931 5.00279 4.99273 4.99217 4.99295
-    4.99471 4.99594 4.99696 4.9978 4.99844 4.99891 4.99924 4.99635
-    4.99699 4.99813 5.00068 5.00307 5.0588 4.96365 4.54012 3.6307
-    2.35176 1.0322 0.354379 0.115986 0.0435668 0.0245112 0.020786
-    0.0164656 0.0118409 0.00849698 0.00597078 0.0040105 0.0026076
-    0.0016597 0.00118185 0.00121067 0.00153587 0.00174836 0.00136519
-    -0.000189116 -0.00315555 -0.00646603 -0.00898042 -0.010203
-    -0.0110896 -0.0123764 -0.00953841 -0.00225795 0.000818314
-    0.00152252 0.00150269 0.00119025 0.000767068 0.000308852
-    -3.79272e-05 -0.00019691 -0.000186642 -9.73653e-05 -8.49784e-06
-    2.04147e-05 -9.91086e-06 -1.55959e-05 -1.80499e-05 -1.77097e-05
-    -1.51548e-05 -1.1978e-05 -9.84916e-06 -1.29728e-05 -1.67235e-05
-    -1.74153e-05 -1.39958e-05 -5.92272e-06 -8.08216e-06 -1.53077e-05
-    -2.92531e-05 -3.91049e-05 -2.98935e-05 -7.32122e-06 3.18534e-05
-    4.39134e-05 4.18753e-05 3.22759e-05 1.86766e-05 1.58432e-05
-    1.30098e-05 1.01765e-05 7.34312e-06 4.50975e-06 1.67639e-06
-    -1.15697e-06 -1.23877e-06 -1.11991e-06 -1.00106e-06 -8.82208e-07
-    -7.63355e-07 -6.44502e-07 -5.2565e-07 -4.29318e-07 -3.44661e-07
-    -2.60004e-07 -1.75347e-07 -9.06904e-08 -6.03349e-09 7.86234e-08
-    1.6328e-07 2.47937e-07 3.32594e-07 4.17251e-07 5.01908e-07
-    5.86565e-07 6.71222e-07 7.36123e-07 6.43886e-07 5.5165e-07
-    4.59414e-07 3.67178e-07 0.000334759 -4.60833e-05 -0.00106139
-    -0.00166624 0.000859563 0.00102606 0.00410037 0.00419931
-    0.00518997 0.00459791 0.00503125 0.00523877 0.00452158 0.00339924
-    0.00233399 0.000876915 0.000546439 0.000444299 0.000983968
-    0.00119304 -0.0429422 -0.0403983 0.0534896 0.288013 0.807345
-    1.44247 2.03448 2.57021 3.05049 3.47332 3.8131 4.1009 4.34677
-    4.53512 4.67127 4.76531 4.82526 4.86593 4.89586 4.91904
-    4.93806 4.95348 4.96597 4.97629 4.9843 4.98983 4.99335 4.9957
-    4.99741 4.99864 4.99946 4.99994 5.00047 5.00073 5.00086
-    5.00092 5.00094 5.00091 5.00087 5.00081 5.00074 5.00067
-    5.00059 5.00052 5.00046 5.0004 5.00034 5.0003 5.00026 5.00022
-    5.00019 5.00016 5.00014 5.00012 5.0001 5.00009 5.00007 5.00006
-    5.00006 5.00005 5.00004 5.00004 5.00004 5.00003 5.00003
-    5.00003 5.00002 5.00002 5.00002 5.00002 5.00001 5.00001
-    5.00001 5.00001 5.00001 5 5 5 5 4.99999 4.99999 4.99999
-    4.99999 4.99999 4.99999 5 5 5 5 5 5 5 5 5 5.00001 5.00001
-    5.00001 5.00001 5.00002 5.00002
-    EOD
-
-    @v[23].set(<<-'EOD')
-    5 5.00284 5.01266 5.01895 4.98936 4.99575 4.99217 4.99545
-    4.99775 4.99894 4.99946 4.99968 4.99975 4.99977 4.99986
-    4.9999 4.99528 4.99808 5.00039 5.00392 5.00512 4.99985 4.99863
-    4.99942 4.99992 5.00017 4.99897 4.99803 4.99784 4.99739
-    4.99883 5.00365 5.00298 5.00133 5.00048 5.00019 5.00008
-    5.00005 5.00004 5.00003 5.00002 5.00002 5.00001 5.00001
-    5.00001 5.00001 5.00001 5 5 4.99999 4.99997 4.99995 4.99996
-    4.99998 5 5.00001 5.00001 5.00002 5.00002 5.00003 5.00003
-    5.00002 5.00002 5.00001 5.00001 5 5 5 5 5 4.99999 4.99999
-    4.99999 4.99999 4.99999 4.99999 4.99998 4.99999 4.99999
-    4.99999 4.99999 4.99999 4.99999 4.99999 5 5 5 5 5 5 5 5.00001
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00002
-    5.00002 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
-    5.00001 5 5 5 5 5 5 5 5.00217 5.00108 4.99547 4.99658 5.00667
-    4.99641 4.99532 4.99938 5.00328 5.00222 5.00114 5.00052
-    5.00024 5.00011 5.00009 4.99285 4.99591 4.99897 5.00403
-    5.00786 5.00318 4.99942 4.9992 4.99949 5.001 5.00408 5.00319
-    5.00063 4.99995 5.00014 4.99982 4.99832 4.99838 4.99865
-    4.99912 4.99836 4.99735 4.99606 4.99814 5.00958 5.02973
-    5.05293 5.06103 4.99342 4.80726 4.50744 4.07509 3.41358
-    2.37924 1.03194 0.261552 0.142392 0.0904482 0.0555071 0.0322869
-    0.018289 0.0113802 0.00875182 0.00757055 0.00629906 0.00523
-    0.00403349 0.0031953 0.00280864 0.00286119 0.00250389 0.00202815
-    0.001723 0.00147312 0.0012411 0.00104401 0.000886204 0.000758277
-    0.000651915 0.00056348 0.000487966 0.000424048 0.000365613
-    0.000308178 0.000258725 0.000228061 0.000207976 0.000198491
-    0.00018518 0.000172716 0.000163197 0.000155007 0.000141734
-    0.000128461 0.000115188 0.000101915 8.86417e-05 7.53686e-05
-    6.20956e-05 5.69164e-05 5.23275e-05 4.77385e-05 4.31495e-05
-    3.85605e-05 3.39716e-05 2.93826e-05 2.69449e-05 2.56224e-05
-    2.42999e-05 2.29774e-05 2.16549e-05 2.03324e-05 1.90099e-05
-    1.76873e-05 1.63648e-05 1.50423e-05 1.37198e-05 1.23973e-05
-    1.10748e-05 9.75232e-06 8.48447e-06 7.65129e-06 6.81811e-06
-    5.98494e-06 5.15176e-06 0.00056893 -0.00787906 -0.0217381
-    -0.0370066 -0.00770505 0.00659312 0.00975477 0.00949456
-    0.00777552 0.00655645 0.00568776 0.00508782 0.00458121 0.00410187
-    0.00365665 0.0015121 0.00160863 0.00263181 0.00638941 0.00772607
-    0.00225583 0.0010843 0.000882939 0.000801563 0.00075632
-    0.000554992 0.000435131 0.0003474 0.000217667 0.000491602
-    0.0012267 0.00250446 0.000212058 -0.0174972 -0.0527527 -0.0479071
-    0.194908 1.45838 3.40677 4.49242 4.86894 4.97215 5.01218
-    5.04342 5.06228 5.03069 4.87169 4.57056 4.11523 3.38264
-    2.19691 0.715839 0.172818 0.102162 0.0627162 0.0363388 0.020289
-    0.0119414 0.00826608 0.0066417 0.00549092 0.00492505 0.00439443
-    0.0037156 0.00306471 0.00247451 0.00195965 0.0014822 0.0010815
-    0.000904464 0.0010514 0.00152308 0.00120752 0.000228447
-    -0.00102833 -0.00116644 -0.00042067 4.78758e-05 5.09599e-05
-    -4.45756e-05 -3.22966e-06 3.81163e-05 7.94622e-05 0.000120808
-    0.000162154 0.000161895 0.000148481 0.000135068 0.000121654
-    0.000108241 9.81453e-05 9.2164e-05 8.61827e-05 8.02014e-05
-    7.42201e-05 6.82388e-05 6.22576e-05 5.62763e-05 5.0295e-05
-    4.43137e-05 3.83324e-05 3.54323e-05 3.321e-05 3.09877e-05
-    2.87654e-05 2.65431e-05 2.43209e-05 2.20986e-05 1.98763e-05
-    1.7654e-05 1.54317e-05 1.34612e-05 1.25441e-05 1.1627e-05
-    1.07099e-05 9.79276e-06 8.87564e-06 7.95851e-06 7.04139e-06
-    6.12427e-06
-    EOD
-
-    @v[24].set(<<-'EOD')
-    5 5.01099 5.00866 4.97845 4.92369 4.9273 4.97413 4.9929
-    4.99826 4.99958 4.99978 5.00005 4.99968 4.99959 5.00014
-    4.99979 4.99914 4.99982 5.00023 5.00295 5.00664 4.99854
-    4.99647 5.00438 5.01722 5.03681 5.04766 5.04799 5.04867
-    5.04873 5.04685 5.04413 5.0367 5.02505 5.01726 5.01183 5.00806
-    5.00549 5.00371 5.00246 5.00162 5.00105 5.00069 5.00045
-    5.00031 5.00024 5.00019 5.00012 5.00007 5.00004 5.00001
-    4.99998 4.99999 4.99999 5 5.00001 5.00001 5.00002 5.00002
-    5.00003 5.00003 5.00003 5.00002 5.00002 5.00001 5.00001
-    5.00001 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 4.99999
-    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
-    5 5 5 5 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
-    5.00001 5.00002 5.00001 5.00001 5.00001 5.00001 5.00001
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
-    5.00001 5.00001 5.00001 5 5 5 5 5 5 5 5.00418 4.99953 4.99152
-    4.99807 5.00497 5.00112 5.00055 5.00038 5.00018 5.00006
-    5.00006 5.00007 5.00006 5.00004 5.00004 4.99853 4.99945
-    4.99998 5.00304 5.00935 5.00742 4.99181 4.97421 4.93603
-    4.8853 4.8927 4.93984 4.97458 4.99039 4.99614 4.99801 4.99851
-    4.99869 4.99924 5.00108 5.00181 5.00119 5.00059 5.00031
-    5.00022 5.00018 5.00011 5.00001 5.00006 4.99981 4.99977
-    4.99982 5.00012 4.99993 5.00008 5.00043 5.00048 5.00024
-    5.00008 4.99984 4.99993 5.00011 4.99996 4.9998 4.99977 4.9998
-    4.99993 5.00008 5.00011 5.00002 4.99995 4.99989 4.99993
-    5 5.00007 5.00009 4.99994 4.99977 4.9997 4.99975 4.99996
-    4.99996 4.99988 4.9997 4.99952 4.9995 4.99956 4.99973 4.99988
-    5.00005 5.00025 5.00042 5.00036 5.00031 5.00025 5.0002 5.00014
-    5.00009 5.00003 5.00002 5.00001 5.00001 5 4.99999 4.99998
-    4.99998 4.99997 4.99998 4.99998 4.99998 4.99998 4.99998
-    4.99998 4.99998 4.99999 4.99999 4.99999 4.99999 4.99999
-    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 5.00284
-    5.00442 5.00381 4.98997 4.99092 5.00733 5.07791 4.98237
-    4.86434 4.76835 4.74067 4.79278 4.85094 4.90068 4.93603
-    4.95698 4.96984 4.97856 4.98869 4.99904 5.0005 4.99524 5.00181
-    5.01878 5.05177 5.07986 4.98917 4.56217 3.68 2.3539 1.18541
-    0.505772 0.221044 0.115287 0.0760938 0.0589194 0.0476784
-    0.0457213 0.0412911 0.033889 0.0259741 0.0191452 0.0139018
-    0.0100235 0.00711788 0.00497657 0.00349368 0.00250021 0.00176179
-    0.00121843 0.000838368 0.000582711 0.000423458 0.000294608
-    0.000201251 0.000133748 8.6227e-05 5.44252e-05 3.30514e-05
-    1.93926e-05 1.09814e-05 5.29857e-06 1.92247e-06 3.08708e-07
-    -3.74311e-07 -6.11121e-07 -7.27807e-07 -4.87604e-07 -4.80493e-07
-    -9.15925e-07 -2.03774e-06 -4.01128e-06 -2.46644e-06 2.10626e-06
-    8.22422e-06 1.04922e-05 9.83047e-06 7.27106e-06 3.29654e-06
-    -2.06736e-06 -2.18019e-06 -2.29303e-06 -2.40586e-06 -2.51869e-06
-    -2.63153e-06 -2.24615e-06 -1.70325e-06 -1.16036e-06 -6.17468e-07
-    -7.45754e-08 2.45198e-07 2.88285e-07 3.31373e-07 3.7446e-07
-    4.17548e-07 4.60635e-07 5.03723e-07 5.4681e-07 5.89898e-07
-    6.32985e-07 6.76073e-07 6.19054e-07 5.4001e-07 4.60967e-07
-    3.81923e-07 3.02879e-07 2.23836e-07 1.44792e-07 6.57488e-08
-    -1.32948e-08 -9.23383e-08 -1.6698e-07 -2.23206e-07 -2.79432e-07
-    -3.35658e-07 -3.91884e-07 -4.48109e-07 -5.04335e-07 -5.60561e-07
-    -6.16787e-07
-    EOD
-
-    @v[25].set(<<-'EOD')
-    1.34824 1.35838 1.36465 1.34675 1.29167 1.23161 1.2201 1.2185
-    1.2181 1.21798 1.21793 1.21788 1.21785 1.21782 1.21779 1.21776
-    1.21655 1.21656 1.21669 1.21871 1.22421 1.22247 1.21858
-    1.2228 1.23803 1.27737 1.10647 0.395248 0.0600669 0.027687
-    0.0192374 0.015425 0.0130881 0.00977445 0.00696598 0.00491122
-    0.00341952 0.00237078 0.00162339 0.00109178 0.000726647
-    0.000478886 0.00031568 0.000207902 0.000143494 0.000109768
-    8.62987e-05 5.69775e-05 3.36547e-05 2.30356e-05 1.86108e-05
-    1.41861e-05 1.08293e-05 7.68835e-06 4.79593e-06 4.51019e-06
-    4.22444e-06 3.9387e-06 3.65295e-06 3.36721e-06 3.04559e-06
-    2.69981e-06 2.35403e-06 2.00825e-06 1.66247e-06 1.34508e-06
-    1.26225e-06 1.17941e-06 1.09657e-06 1.01373e-06 9.30893e-07
-    8.48054e-07 7.65216e-07 6.82378e-07 5.9954e-07 5.16702e-07
-    4.37489e-07 3.82774e-07 3.2806e-07 2.73346e-07 2.18632e-07
-    1.63917e-07 1.09203e-07 5.4489e-08 -2.2523e-10 -5.49395e-08
-    -1.09654e-07 -1.52862e-07 -1.3079e-07 -1.08718e-07 -8.6646e-08
-    -6.45739e-08 -4.25019e-08 -2.04298e-08 1.64229e-09 2.37144e-08
-    4.57864e-08 6.78585e-08 8.71693e-08 9.30725e-08 9.89758e-08
-    1.04879e-07 1.10782e-07 1.16685e-07 1.22589e-07 1.28492e-07
-    1.34395e-07 1.40298e-07 1.46201e-07 1.52105e-07 1.58008e-07
-    1.63911e-07 1.69814e-07 1.75718e-07 1.81621e-07 1.87524e-07
-    1.93427e-07 1.9933e-07 2.05234e-07 2.11137e-07 2.19788e-07
-    0.000393944 -0.000218983 -0.00105784 0.00172403 -0.00027134
-    -0.000204147 8.79968e-06 5.93762e-05 5.83554e-05 4.13815e-05
-    3.71369e-05 3.03372e-05 2.25336e-05 1.5986e-05 1.07284e-05
-    -7.5239e-05 5.60593e-05 6.97571e-05 0.000667617 0.000960856
-    0.00131749 -0.00759564 -0.0217897 -0.0450321 -0.076646 -0.128569
-    -0.186391 -0.202175 -0.206953 -0.2082 -0.208416 -0.208669
-    -0.208934 -0.209111 -0.209234 -0.209329 -0.209389 -0.209416
-    -0.2094 -0.209329 -0.20926 -0.209204 -0.209208 -0.209285
-    -0.209454 -0.209641 -0.20977 -0.209811 -0.209833 -0.209887
-    -0.209653 -0.209127 -0.208893 -0.208811 -0.208777 -0.208758
-    -0.208747 -0.20874 -0.208726 -0.208697 -0.208657 -0.208611
-    -0.208565 -0.208524 -0.208488 -0.208451 -0.208412 -0.208373
-    -0.208333 -0.208294 -0.208256 -0.208219 -0.208183 -0.208145
-    -0.208107 -0.208066 -0.208029 -0.207993 -0.207959 -0.207923
-    -0.207883 -0.207838 -0.207789 -0.207747 -0.20771 -0.207675
-    -0.207642 -0.207605 -0.207568 -0.207531 -0.207494 -0.207457
-    -0.20742 -0.207383 -0.207346 -0.207308 -0.207271 -0.207233
-    -0.207196 -0.207158 -0.207121 -0.207084 -0.207046 -0.207009
-    -0.206972 -0.206935 -0.206898 -0.206861 -0.206823 -0.206786
-    -0.206749 -0.206712 -0.206675 -0.206638 -0.2066 -0.206563
-    -0.206526 -0.206489 -0.206452 -0.206415 -0.203384 -0.20015
-    -0.196872 -0.205024 -0.210727 -0.206779 -0.0685263 0.586138
-    1.4665 2.22945 2.77554 3.076 3.24926 3.34515 3.40164 3.43006
-    3.43713 3.43075 3.42886 3.4384 3.46567 3.49025 3.51287 3.53821
-    3.57841 3.39846 2.80753 2.22947 1.7549 1.30429 0.707786
-    0.303206 0.131352 0.0671706 0.0429955 0.032461 0.0257161
-    0.0239521 0.0217397 0.0179705 0.0138745 0.0102813 0.00749643
-    0.0054328 0.00386817 0.0027004 0.00189442 0.00135552 0.000954715
-    0.000659981 0.000453435 0.000313993 0.000231347 0.000159665
-    0.000108122 7.10528e-05 4.50233e-05 2.77892e-05 1.62765e-05
-    8.9893e-06 4.5471e-06 1.54614e-06 -1.6542e-07 -8.68508e-07
-    -1.04369e-06 -9.63086e-07 -8.44294e-07 -6.57339e-07 -7.35885e-07
-    -9.80056e-07 -1.39772e-06 -2.10199e-06 -1.37474e-06 6.13269e-07
-    3.3028e-06 4.60941e-06 4.91053e-06 4.14186e-06 2.45258e-06
-    -8.7388e-09 -3.59647e-07 -7.10554e-07 -1.06146e-06 -1.41237e-06
-    -1.76328e-06 -1.63073e-06 -1.34534e-06 -1.05995e-06 -7.74561e-07
-    -4.8917e-07 -2.95733e-07 -2.16326e-07 -1.3692e-07 -5.75135e-08
-    2.18929e-08 1.01299e-07 1.80706e-07 2.60112e-07 3.39519e-07
-    4.18925e-07 4.98332e-07 4.83984e-07 4.4901e-07 4.14035e-07
-    3.79061e-07 3.44087e-07 3.09112e-07 2.74138e-07 2.39163e-07
-    2.04189e-07 1.69215e-07 1.26002e-07 4.83213e-08 -2.9359e-08
-    -1.07039e-07 -1.8472e-07 -2.624e-07 -3.4008e-07 -4.1776e-07
-    -4.95441e-07
-    EOD
-
-    @v[26].set(<<-'EOD')
-    7.10441e-10 0.000309731 -0.000308186 -0.001694 -0.00360784
-    8.40909e-05 0.00203175 0.0012896 0.000596548 0.000277191
-    0.000161134 0.000120439 8.4915e-05 9.49929e-05 6.18812e-05
-    1.65433e-05 1.89682e-05 3.97578e-05 4.95446e-05 0.000225325
-    0.000214579 -0.00230134 -0.000451102 0.00997237 0.0341443
-    0.0449314 0.0424411 0.0341996 0.0315315 0.0308892 0.0291614
-    0.024365 0.0190282 0.0188976 0.017238 0.0138526 0.0105645
-    0.00778548 0.00561753 0.0039871 0.00279554 0.00194075 0.0013468
-    0.000934775 0.000664723 0.000498911 0.000377384 0.000254183
-    0.000163421 0.000120773 9.65058e-05 7.22384e-05 5.60316e-05
-    4.14549e-05 2.79516e-05 2.57096e-05 2.34677e-05 2.12257e-05
-    1.89837e-05 1.67417e-05 1.46737e-05 1.27228e-05 1.07719e-05
-    8.82099e-06 6.87009e-06 5.0896e-06 4.71705e-06 4.34451e-06
-    3.97196e-06 3.59941e-06 3.22686e-06 2.85431e-06 2.48176e-06
-    2.10921e-06 1.73666e-06 1.36411e-06 1.02855e-06 9.42931e-07
-    8.57316e-07 7.71701e-07 6.86086e-07 6.00471e-07 5.14856e-07
-    4.29241e-07 3.43626e-07 2.58011e-07 1.72396e-07 9.85409e-08
-    9.14091e-08 8.42773e-08 7.71456e-08 7.00138e-08 6.2882e-08
-    5.57503e-08 4.86185e-08 4.14867e-08 3.4355e-08 2.72232e-08
-    2.05821e-08 1.63235e-08 1.2065e-08 7.80643e-09 3.54786e-09
-    -7.10696e-10 -4.96926e-09 -9.22782e-09 -1.34864e-08 -1.77449e-08
-    -2.20035e-08 -2.62621e-08 -3.05206e-08 -3.47792e-08 -3.90378e-08
-    -4.32963e-08 -4.75549e-08 -5.18134e-08 -5.6072e-08 -6.03306e-08
-    -6.45891e-08 -6.88477e-08 -8.76373e-06 0.000131607 -0.00021685
-    -0.000433027 0.00047234 0.000211593 -0.000189601 3.2492e-05
-    0.000575955 7.72235e-05 -0.000285172 -0.000242061 -0.000135112
-    -3.50117e-05 -2.75868e-05 5.48974e-05 1.80604e-07 5.48911e-05
-    3.97478e-05 0.000192909 0.000297932 0.00402253 -0.0122366
-    -0.047853 -0.0963082 -0.108071 -0.0567275 -0.0239271 -0.0178628
-    -0.0233027 -0.031853 -0.0400843 -0.0482725 -0.0576154 -0.0627218
-    -0.0511236 -0.0279524 -0.0150986 -0.00931091 -0.00652876
-    -0.00479286 -0.00344346 -0.00249578 -0.0019532 -0.00157977
-    -0.00131848 -0.00111251 -0.000939229 -0.000797445 -0.000708384
-    -0.000630452 -0.000539722 -0.000508862 -0.000480596 -0.000439484
-    -0.000407217 -0.000363866 -0.000329506 -0.000318642 -0.000307362
-    -0.000286511 -0.000266253 -0.000242943 -0.000218107 -0.000204661
-    -0.00020241 -0.000194435 -0.000185062 -0.000173042 -0.000160549
-    -0.000151407 -0.000145626 -0.000145976 -0.000147342 -0.000145288
-    -0.000137979 -0.000124481 -0.000123218 -0.000127453 -0.000139006
-    -0.000145486 -0.000129764 -9.82749e-05 -4.72596e-05 -3.08671e-05
-    -3.28834e-05 -4.52254e-05 -6.25389e-05 -6.32516e-05 -6.39643e-05
-    -6.4677e-05 -6.53897e-05 -6.61023e-05 -6.6815e-05 -6.75277e-05
-    -6.61005e-05 -6.45173e-05 -6.29341e-05 -6.13509e-05 -5.97676e-05
-    -5.81844e-05 -5.66012e-05 -5.54231e-05 -5.4455e-05 -5.3487e-05
-    -5.25189e-05 -5.15508e-05 -5.05828e-05 -4.96147e-05 -4.86466e-05
-    -4.76785e-05 -4.67105e-05 -4.57424e-05 -4.47743e-05 -4.38063e-05
-    -4.28382e-05 -4.18821e-05 -4.10211e-05 -4.016e-05 -3.9299e-05
-    -3.8438e-05 4.29885e-05 5.14113e-05 -0.000127986 -0.000611463
-    -0.000149428 0.000882394 0.00297059 -0.00405825 -0.00591067
-    -0.00546997 -0.00158744 0.00190677 0.00298403 0.00268595
-    0.00196161 0.00130289 0.000783347 0.000520683 0.000565306
-    0.00053419 -0.00224696 -0.000920818 0.0132755 0.0322504
-    0.0442808 0.0638615 0.0701007 0.0539356 0.0247771 0.056244
-    0.294266 0.831368 1.45424 2.02898 2.54559 2.9937 3.35333
-    3.72609 4.06363 4.32789 4.52413 4.66504 4.7652 4.83637 4.88631
-    4.92109 4.94464 4.96046 4.97218 4.98079 4.98679 4.99076
-    4.99361 4.99555 4.99686 4.99783 4.99853 4.99902 4.99936
-    4.99959 4.99973 4.99983 4.9999 4.99993 4.99996 4.99998 5
-    5.00001 5 4.99999 4.99997 4.99994 4.99993 4.99994 4.99996
-    4.99999 5.00004 5.00006 5.00005 5.00003 5.00002 5.00001
-    5 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
-    5 5 5 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
-    5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 4.99999 4.99998
-    EOD
-
-    @v[27].set(<<-'EOD')
-    5 4.99984 4.99796 4.99478 4.9889 4.98738 4.98896 4.99087
-    4.99262 4.99419 4.99552 4.99659 4.99743 4.99807 4.99855
-    4.9989 4.99894 4.99908 4.99935 5.00001 5.0007 5.00132 5.00032
-    4.99976 5.00134 5.00339 5.00315 5.00157 5.00091 5.00058
-    5.00012 4.99944 4.99886 4.9994 4.99934 4.99899 4.99876 4.99868
-    4.99872 4.99883 4.99898 4.99914 4.9993 4.99944 4.99956 4.99967
-    4.99976 4.99982 4.99986 4.9999 4.99993 4.99997 4.99997 4.99998
-    4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998
-    4.99999 4.99999 4.99999 4.99999 5 5 5 5 5 5 5 5 5 5 5 5
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5.00009 5.00028 5.00015 4.99983
-    5.00036 4.99996 4.99834 4.99783 5.00383 5.00734 5.00387
-    5.00058 4.99893 4.99836 4.99832 4.99854 4.99873 4.99905
-    4.99927 4.99952 4.99969 4.99834 4.99536 4.99163 4.99073
-    5.0053 5.03631 5.03103 4.9008 4.62503 4.21887 3.70902 3.09967
-    2.35791 1.41912 0.519675 0.210458 0.131362 0.0980819 0.0708209
-    0.0471701 0.0323272 0.0253535 0.0199144 0.0152615 0.0117228
-    0.00917696 0.00738117 0.00609292 0.00512664 0.00436184 0.0037961
-    0.00331639 0.00289006 0.0025477 0.00226529 0.00202925 0.00182793
-    0.00165474 0.00150531 0.00137529 0.00125983 0.00115603 0.00106455
-    0.000982977 0.000911255 0.000846819 0.000790092 0.000738698
-    0.000692816 0.00065107 0.000613595 0.000579642 0.000548935
-    0.00052106 0.000495598 0.000472174 0.000450849 0.000431118
-    0.000412667 0.000395868 0.000381319 0.000368487 0.000357327
-    0.000344212 0.000330334 0.00031622 0.000303298 0.000295809
-    0.00028832 0.000280831 0.000273342 0.000265853 0.000258364
-    0.000250875 0.000245118 0.000239488 0.000233857 0.000228227
-    0.000222596 0.000216966 0.000211336 0.000207047 0.000203455
-    0.000199863 0.00019627 0.000192678 0.000189085 0.000185493
-    0.0001819 0.000178308 0.000174716 0.000171123 0.000167531
-    0.000163938 0.000160346 0.000156835 0.000153973 0.00015111
-    0.000148248 0.000145385 0.000296579 -3.96718e-05 -0.000449085
-    0.000323433 0.000750086 0.000268264 0.000149028 -0.000100249
-    7.00956e-05 0.00012605 0.00022592 0.000193036 0.000120453
-    8.07865e-05 7.65771e-05 -3.27828e-05 0.000116759 0.000169498
-    0.000409804 0.000414965 0.00092323 -0.00590633 -0.0175477
-    -0.032433 -0.0559842 -0.0820373 0.0688484 0.626629 1.32929
-    2.01657 2.60925 3.12329 3.38952 3.14128 2.38463 1.23802
-    0.316019 0.107832 0.0694707 0.051837 0.035247 0.0209999
-    0.0116618 0.00967674 0.00789182 0.00574566 0.00386872 0.00258612
-    0.00167126 0.00104169 0.000641093 0.000401246 0.000277928
-    0.000171775 0.000102266 5.89376e-05 3.29258e-05 1.80463e-05
-    1.0057e-05 6.4571e-06 5.10093e-06 4.06791e-06 3.62716e-06
-    3.63321e-06 3.99625e-06 4.64368e-06 5.20886e-06 4.77728e-06
-    3.23919e-06 1.14113e-06 -1.29416e-06 -4.15607e-06 -1.88532e-06
-    5.24411e-06 1.38678e-05 1.28823e-05 3.6758e-06 -2.52285e-06
-    -3.97133e-06 -4.03071e-06 -3.37154e-06 -2.71238e-06 -2.05321e-06
-    -1.39404e-06 -7.34872e-07 -3.73325e-07 -1.05873e-07 1.61578e-07
-    4.2903e-07 6.96482e-07 8.18468e-07 7.60065e-07 7.01662e-07
-    6.43258e-07 5.84855e-07 5.26452e-07 4.68049e-07 4.09646e-07
-    3.51243e-07 2.9284e-07 2.34437e-07 1.71213e-07 1.06928e-07
-    4.2644e-08 -2.16403e-08 -8.59247e-08 -1.50209e-07 -2.14493e-07
-    -2.78778e-07 -3.43062e-07 -4.07346e-07 -4.55065e-07 -4.3348e-07
-    -4.11896e-07 -3.90311e-07 -3.68726e-07 -3.47141e-07 -3.25556e-07
-    -3.03971e-07 -2.82386e-07
-    EOD
-
-    @v[28].set(<<-'EOD')
-    0.368163 0.361756 0.327463 0.269513 0.149476 0.0805716 0.0501146
-    0.03403 0.0230886 0.0160474 0.0116071 0.00870013 0.00679614
-    0.00542384 0.00432512 0.00340653 -0.00129719 -0.00399429
-    -0.00318719 0.00443085 0.0150156 0.0334147 0.0132288 -0.0189751
-    -0.0508377 -0.0252174 -0.0142489 -0.00675908 -0.0038653
-    -0.00243423 -0.00168891 -0.00120901 -0.000900426 -0.000685575
-    -0.000557595 -0.000457268 -0.000377427 -0.000315269 -0.000266613
-    -0.000228397 -0.000198283 -0.000174248 -0.000154886 -0.00013892
-    -0.000125864 -0.000115189 -0.000105841 -9.66611e-05 -8.84262e-05
-    -8.23872e-05 -7.74668e-05 -7.25463e-05 -6.79992e-05 -6.35276e-05
-    -5.92413e-05 -5.68994e-05 -5.45574e-05 -5.22154e-05 -4.98735e-05
-    -4.75315e-05 -4.54981e-05 -4.36726e-05 -4.18471e-05 -4.00216e-05
-    -3.81961e-05 -3.64559e-05 -3.54209e-05 -3.43858e-05 -3.33508e-05
-    -3.23157e-05 -3.12807e-05 -3.02456e-05 -2.92105e-05 -2.81755e-05
-    -2.71404e-05 -2.61054e-05 -2.51232e-05 -2.44984e-05 -2.38736e-05
-    -2.32487e-05 -2.26239e-05 -2.19991e-05 -2.13742e-05 -2.07494e-05
-    -2.01246e-05 -1.94998e-05 -1.88749e-05 -1.82865e-05 -1.79044e-05
-    -1.75224e-05 -1.71403e-05 -1.67582e-05 -1.63762e-05 -1.59941e-05
-    -1.56121e-05 -1.523e-05 -1.4848e-05 -1.44659e-05 -1.41138e-05
-    -1.39075e-05 -1.37011e-05 -1.34947e-05 -1.32883e-05 -1.30819e-05
-    -1.28755e-05 -1.26691e-05 -1.24627e-05 -1.22563e-05 -1.205e-05
-    -1.18436e-05 -1.16372e-05 -1.14308e-05 -1.12244e-05 -1.1018e-05
-    -1.08116e-05 -1.06052e-05 -1.03988e-05 -1.01924e-05 -9.98605e-06
-    -9.77966e-06 -2.85319e-05 0.00281092 0.00180106 -0.000981083
-    0.00551926 -0.00119763 -0.0295069 -0.0367677 0.064749 0.119022
-    0.0882007 0.0552062 0.03418 0.0223243 0.015545 0.011949
-    0.00757134 0.00667655 0.00583243 0.00644443 0.00650959 -0.0302575
-    -0.0437806 -0.0355466 0.0381776 0.282109 0.674178 1.07582
-    1.45189 1.789 2.08649 2.34663 2.57245 2.81211 3.04778 3.2523
-    3.45877 3.65593 3.83396 3.9923 4.13368 4.25864 4.36719 4.46064
-    4.54086 4.60962 4.66835 4.71838 4.76094 4.79716 4.82796
-    4.85413 4.87634 4.89518 4.91116 4.92476 4.93631 4.94608
-    4.95434 4.9613 4.96715 4.97211 4.97638 4.98001 4.98312 4.98571
-    4.98795 4.98979 4.99138 4.99269 4.99381 4.99474 4.99551
-    4.99615 4.99668 4.99713 4.99752 4.99783 4.99811 4.99836
-    4.99858 4.99873 4.99884 4.99892 4.999 4.99907 4.99912 4.99916
-    4.99921 4.99926 4.99932 4.99937 4.99942 4.99948 4.99953
-    4.99956 4.99958 4.99961 4.99963 4.99966 4.99968 4.99971
-    4.99972 4.99973 4.99974 4.99975 4.99976 4.99977 4.99978
-    4.99979 4.9998 4.9998 4.99981 4.99982 4.99983 4.99984 4.99985
-    4.99986 4.99986 4.99987 4.99987 5.00498 5.00354 4.99359
-    4.98981 5.00498 5.00099 5.00041 5.00022 5.00015 5.00012
-    5.0001 5.00008 5.00005 5.00003 5 4.99431 4.99459 4.99591
-    5.00087 5.01029 5.03935 4.92784 4.51643 3.78356 2.68745
-    1.43417 0.583128 0.205094 0.0777337 0.0391566 0.02723 0.023883
-    0.018808 0.010165 0.00254623 -0.00377463 -0.0038097 0.00144145
-    0.00267231 0.00193045 0.00144538 0.00121758 0.00112893 0.00109424
-    0.0010226 0.000948072 0.000882573 0.000826996 0.000776391
-    0.000729719 0.000686499 0.000647333 0.000610108 0.000575631
-    0.000545069 0.000515485 0.000488514 0.000465316 0.000443215
-    0.000422454 0.00040292 0.00038488 0.000368472 0.000353628
-    0.000339643 0.000326197 0.000313483 0.000302884 0.000294038
-    0.000284003 0.000270941 0.000254925 0.000246511 0.000244089
-    0.000245538 0.000242099 0.000235728 0.000227482 0.000218001
-    0.000207257 0.000202127 0.000196997 0.000191868 0.000186738
-    0.000181608 0.00017758 0.000173899 0.000170219 0.000166538
-    0.000162857 0.000159576 0.00015679 0.000154005 0.000151219
-    0.000148433 0.000145647 0.000142861 0.000140076 0.00013729
-    0.000134504 0.000131718 0.000129603 0.000127635 0.000125668
-    0.0001237 0.000121732 0.000119765 0.000117797 0.000115829
-    0.000113862 0.000111894 0.000109993 0.000108372 0.000106751
-    0.00010513 0.000103509 0.000101887 0.000100266 9.86449e-05
-    9.70237e-05
-    EOD
-
-    @v[29].set(<<-'EOD')
-    5 4.99899 4.99654 4.99327 4.9863 4.98954 4.99212 4.99378
-    4.9951 4.99624 4.99715 4.99786 4.99839 4.99879 4.99909 4.99931
-    4.99922 4.99933 4.99971 5.00064 5.00084 5.00123 4.99865
-    4.99853 4.99983 5.00457 5.00242 5.00105 5.00062 5.00042
-    4.99971 4.9994 4.9992 4.9996 4.99955 4.99932 4.99918 4.99915
-    4.99919 4.99927 4.99937 4.99948 4.99957 4.99966 4.99974
-    4.9998 4.99985 4.99989 4.99992 4.99993 4.99994 4.99994 4.99996
-    4.99998 5 5 5.00001 5.00001 5.00001 5.00002 5.00002 5.00001
-    5.00001 5.00001 5 5 5 5 4.99999 4.99999 4.99999 4.99999
-    4.99999 4.99999 4.99999 4.99998 4.99998 4.99999 4.99999
-    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 5 5 5 5
-    5 5 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
-    5.00002 5.00002 5.00001 5.00001 5.00001 5.00001 5.00001
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
-    5.00001 5.00001 5 5 5 5 5 5 4.9997 4.99998 4.99954 4.99963
-    5.00059 4.99945 4.99732 4.99957 5.00919 5.00558 5.00033
-    4.99851 4.9983 4.99854 4.99871 4.99928 4.99914 4.99939 4.99952
-    4.9998 4.99976 4.99744 4.99598 4.99478 4.99806 5.01911 5.04602
-    5.05469 5.01317 4.89484 4.69655 4.42036 4.06069 3.60793
-    3.12531 2.72975 2.45187 2.25081 2.09841 1.98509 1.90211
-    1.84084 1.79411 1.7574 1.72763 1.70283 1.68188 1.66389 1.64823
-    1.63438 1.62201 1.61088 1.60081 1.59163 1.58323 1.57549
-    1.56835 1.56173 1.55558 1.54985 1.54451 1.53951 1.53479
-    1.53035 1.52615 1.5222 1.51845 1.5149 1.51153 1.50834 1.50529
-    1.5024 1.49964 1.497 1.49449 1.49208 1.48977 1.48755 1.48542
-    1.48336 1.48138 1.47948 1.47765 1.4759 1.47419 1.47255 1.47096
-    1.46949 1.46823 1.46696 1.4657 1.46444 1.46317 1.46191 1.46065
-    1.45956 1.4585 1.45743 1.45636 1.45529 1.45422 1.45315 1.45226
-    1.45145 1.45064 1.44983 1.44902 1.44821 1.4474 1.44659 1.44579
-    1.44498 1.44417 1.44336 1.44255 1.44174 1.44094 1.44019
-    1.43944 1.43868 1.43793 1.43765 1.43679 1.43515 1.43405
-    1.43478 1.43387 1.43345 1.43184 1.43086 1.43021 1.43003
-    1.42988 1.42944 1.42883 1.42818 1.42702 1.42642 1.42595
-    1.42586 1.42616 1.42783 1.41733 1.38106 1.30738 1.3877 2.09819
-    3.05285 3.58059 3.77601 3.87609 4.02557 4.24887 4.4608 4.60411
-    4.72109 4.8255 4.90465 4.97379 5.01253 5.01532 5.01239 5.0092
-    5.00665 5.00474 5.00333 5.00232 5.00163 5.00117 5.00082
-    5.00057 5.00039 5.00027 5.00019 5.00013 5.00009 5.00006
-    5.00004 5.00003 5.00002 5.00001 5.00001 5 5 5 4.99998 4.99995
-    4.99992 4.99996 5.00005 5.00012 5.00008 4.99996 4.9999 4.99985
-    4.99986 4.99997 5.00021 5.0003 5.00024 5.00009 5.00007 5.00005
-    5.00003 5.00001 4.99998 4.99998 4.99998 4.99999 4.99999
-    5 5 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
-    5.00002 5.00002 5.00001 5.00001 5.00001 5.00001 5.00001
-    5.00001 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 4.99998
-    4.99998 4.99998
-    EOD
-
-    @v[30].set(<<-'EOD')
-    7.10441e-10 5.70385e-05 0.000226143 0.000131916 -0.000887764
-    -8.01837e-05 -3.49653e-05 9.40039e-05 0.000118663 0.000108025
-    8.6059e-05 6.33268e-05 4.99295e-05 3.16843e-05 3.60692e-05
-    2.07572e-05 -8.6375e-05 3.44583e-05 8.07397e-05 0.000196296
-    0.000115615 -7.12768e-05 -0.000129812 -4.18679e-05 7.94364e-05
-    0.000182034 -5.41226e-05 -0.000451819 -0.000713937 -0.00129863
-    -0.00262186 -0.00213417 -0.00133767 0.000775698 0.000969902
-    0.000549281 0.000280946 0.000140321 8.6919e-05 7.22446e-05
-    6.5631e-05 6.45263e-05 6.63087e-05 7.17391e-05 7.59042e-05
-    7.59172e-05 7.03353e-05 6.33558e-05 5.31136e-05 4.64278e-05
-    4.40594e-05 4.16909e-05 4.05674e-05 3.96957e-05 3.87875e-05
-    3.74977e-05 3.62079e-05 3.49181e-05 3.36283e-05 3.23385e-05
-    3.12427e-05 3.02775e-05 2.93124e-05 2.83472e-05 2.7382e-05
-    2.64613e-05 2.59077e-05 2.5354e-05 2.48004e-05 2.42468e-05
-    2.36931e-05 2.31395e-05 2.25859e-05 2.20322e-05 2.14786e-05
-    2.0925e-05 2.03916e-05 1.9995e-05 1.95984e-05 1.92019e-05
-    1.88053e-05 1.84087e-05 1.80122e-05 1.76156e-05 1.7219e-05
-    1.68225e-05 1.64259e-05 1.6051e-05 1.57991e-05 1.55471e-05
-    1.52952e-05 1.50433e-05 1.47913e-05 1.45394e-05 1.42875e-05
-    1.40356e-05 1.37836e-05 1.35317e-05 1.32978e-05 1.31513e-05
-    1.30048e-05 1.28583e-05 1.27118e-05 1.25653e-05 1.24188e-05
-    1.22724e-05 1.21259e-05 1.19794e-05 1.18329e-05 1.16864e-05
-    1.15399e-05 1.13934e-05 1.12469e-05 1.11005e-05 1.0954e-05
-    1.08075e-05 1.0661e-05 1.05145e-05 1.0368e-05 1.02215e-05
-    1.76447e-05 7.21516e-05 -3.59786e-05 -0.000159618 0.000156236
-    0.000135106 -0.000336402 -0.000302283 0.000699323 0.000473866
-    -0.000156146 -0.000225625 -0.000123592 -3.78116e-05 8.47472e-06
-    2.43387e-06 -7.44762e-05 7.80111e-05 9.43608e-05 0.000170159
-    8.83919e-05 -0.00018802 -0.000373512 -0.000390597 0.000156875
-    0.0032343 0.00776304 -0.000566905 -0.00760695 -0.0159226
-    -0.0245989 -0.0331402 -0.0100902 0.067837 0.266702 0.910818
-    1.82282 2.69714 3.43247 3.98325 4.32893 4.51529 4.67087
-    4.79288 4.87574 4.92797 4.95902 4.97655 4.98622 4.99195
-    4.99526 4.99735 4.9991 4.99974 4.99982 4.99974 4.99961 4.9995
-    4.99943 4.9994 4.9994 4.99942 4.99944 4.99948 4.99952 4.99956
-    4.99961 4.99965 4.9997 4.99974 4.99977 4.99981 4.99983 4.99986
-    4.99988 4.9999 4.99991 4.99992 4.99993 4.99994 4.99995 4.99995
-    4.99996 4.99997 4.99997 4.99998 4.99998 4.99999 4.99999
-    4.99999 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001 5
-    5 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
-    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
-    4.99999 4.99999 5 5.00019 4.99888 4.99663 4.99457 4.99902
-    5.00229 5.00323 5.00302 5.0023 5.0015 5.00085 5.00041 5.00013
-    4.99993 4.99979 4.99948 4.99954 4.99983 5.00055 5.00109
-    5.00009 4.9987 4.998 4.99755 4.99676 4.99618 5.01091 5.05272
-    5.04156 4.80112 4.27692 3.42343 2.23953 0.967179 0.429813
-    0.540757 1.32991 2.32147 3.14903 3.78143 4.22325 4.47978
-    4.59448 4.69875 4.79798 4.87419 4.92339 4.95249 4.97174
-    4.98408 4.99124 4.99478 4.99729 4.99868 4.9992 4.99941 4.99947
-    4.99946 4.99943 4.9994 4.99939 4.9994 4.99942 4.99946 4.99951
-    4.99956 4.99961 4.99967 4.99973 4.99977 4.9998 4.99981 4.99983
-    4.99984 4.99987 4.99992 5.00001 5.00005 5.00001 4.99994
-    4.99995 4.99995 4.99996 4.99996 4.99996 4.99997 4.99997
-    4.99997 4.99998 4.99998 4.99998 4.99998 4.99999 4.99999
-    4.99999 4.99999 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001
-    5.00001 5 5 5 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999
-    4.99998 4.99998 4.99998
-    EOD
-
-    @v[31].set(<<-'EOD')
-    1.8179e-09 -5.28841e-06 -1.44913e-05 -3.62932e-05 -9.75719e-05
-    0.000141781 3.73396e-05 -1.65603e-05 -1.5271e-05 -6.73884e-06
-    4.40157e-06 -4.85345e-06 -1.02964e-05 2.03126e-05 -1.89457e-05
-    -8.75564e-06 7.67422e-06 4.71103e-06 1.29798e-05 6.13469e-06
-    -1.14363e-05 -0.0394563 -0.0477298 -0.0622012 -0.0519225
-    0.262499 0.943611 1.67052 2.31017 2.84028 3.28467 3.61582
-    3.85887 4.13011 4.36511 4.54063 4.67013 4.76408 4.83263
-    4.8825 4.91837 4.94373 4.96117 4.97318 4.98093 4.98562 4.98906
-    4.99267 4.99539 4.99666 4.99731 4.99797 4.99844 4.99887
-    4.99927 4.99933 4.99938 4.99944 4.99949 4.99955 4.9996 4.99965
-    4.9997 4.99975 4.9998 4.99985 4.99986 4.99987 4.99989 4.9999
-    4.99991 4.99992 4.99993 4.99995 4.99996 4.99997 4.99998
-    4.99998 4.99999 4.99999 4.99999 4.99999 5 5 5 5 5.00001
-    5.00001 5.00001 5 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999
-    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
-    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
-    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
-    4.99999 4.99997 5.00002 5.00004 5.0001 5.0001 4.99987 5.00009
-    5.00021 5.00002 5.00004 4.99988 5.00013 4.99993 5.00026
-    4.99973 5 5.00006 5.00009 5.00004 5.00004 5.04854 4.82711
-    4.04208 2.64155 0.838902 0.19014 0.0982549 0.0723197 0.0576863
-    0.0427644 0.0301979 0.020146 0.0135728 0.00980358 0.00774482
-    0.00586604 0.0036687 0.00211511 0.00121906 0.000647581 0.000828436
-    0.00190938 0.00224254 0.00199956 0.00165488 0.00135612 0.00113715
-    0.000984181 0.000877175 0.000789973 0.000741139 0.000689338
-    0.000625676 0.000586082 0.000550152 0.000529573 0.000505606
-    0.000482117 0.000460574 0.000441649 0.000424674 0.000408398
-    0.000391914 0.000376272 0.000361487 0.000348181 0.000336045
-    0.000324466 0.000313545 0.000303046 0.000293056 0.00028356
-    0.000274586 0.000266155 0.000258279 0.000250938 0.000243789
-    0.000236912 0.000230244 0.000224186 0.000219291 0.000215346
-    0.000212468 0.000207291 0.000200862 0.00019368 0.000186767
-    0.000183515 0.000180263 0.00017701 0.000173758 0.000170506
-    0.000167253 0.000164001 0.000161164 0.000158357 0.00015555
-    0.000152743 0.000149936 0.000147129 0.000144322 0.000142066
-    0.000140096 0.000138127 0.000136157 0.000134187 0.000132218
-    0.000130248 0.000128278 0.000126308 0.000124339 0.000122369
-    0.000120399 0.000118429 0.00011646 0.000114527 0.000112892
-    0.000111258 0.000109623 0.000107988 0.000103598 6.86052e-05
-    3.337e-05 7.00783e-05 0.000218764 0.000221318 0.000118593
-    -0.000113962 5.78552e-05 9.42068e-05 0.000237037 0.000171302
-    0.0001033 6.16066e-05 5.52908e-05 6.30233e-05 7.01897e-05
-    8.48573e-05 0.000106859 8.37213e-05 -0.0391541 -0.047722
-    -0.0618454 -0.0169804 0.345725 1.03426 1.74825 2.37152 2.88737
-    3.32173 3.66761 3.9707 4.17762 3.98832 3.30483 2.09737 0.710892
-    0.148159 0.0707463 0.0555808 0.045618 0.0319116 0.0199589
-    0.0133357 0.00898528 0.00586075 0.00375478 0.00245443 0.00156038
-    0.000962344 0.000590953 0.000375107 0.000250243 0.00015882
-    0.000100203 6.18122e-05 3.7372e-05 2.23009e-05 1.32569e-05
-    8.29437e-06 5.72457e-06 3.96832e-06 2.98935e-06 2.59699e-06
-    2.75024e-06 3.38689e-06 4.0453e-06 3.50095e-06 1.64988e-06
-    -3.84371e-07 -2.03828e-06 -3.46401e-06 -1.24301e-06 4.63458e-06
-    1.14104e-05 1.02619e-05 2.15487e-06 -2.98487e-06 -3.67221e-06
-    -2.94279e-06 -2.58649e-06 -2.23019e-06 -1.87389e-06 -1.5176e-06
-    -1.1613e-06 -7.92127e-07 -4.18889e-07 -4.56502e-08 3.27588e-07
-    7.00827e-07 8.79539e-07 8.17025e-07 7.5451e-07 6.91996e-07
-    6.29481e-07 5.66966e-07 5.04452e-07 4.41937e-07 3.79422e-07
-    3.16908e-07 2.54393e-07 1.90078e-07 1.25366e-07 6.0654e-08
-    -4.05776e-09 -6.87696e-08 -1.33481e-07 -1.98193e-07 -2.62905e-07
-    -3.27617e-07 -3.92329e-07 -4.40392e-07 -4.18802e-07 -3.97213e-07
-    -3.75624e-07 -3.54035e-07 -3.32446e-07 -3.10856e-07 -2.89267e-07
-    -2.67678e-07
-    EOD
-
-    @v[32].set(<<-'EOD')
-    1.10294 1.10297 1.10291 1.10277 1.10259 1.10294 1.10313
-    1.10306 1.10299 1.10296 1.10295 1.10295 1.10294 1.10294
-    1.10294 1.10294 1.10294 1.10294 1.10294 1.10296 1.10296
-    1.00547 0.998599 1.5201 2.49297 3.31258 3.73162 3.84757
-    3.92505 4.02965 4.16599 4.30294 4.41541 4.52886 4.64414
-    4.73865 4.81065 4.86391 4.90315 4.93188 4.95258 4.96726
-    4.97738 4.98436 4.98888 4.99162 4.99363 4.99573 4.99731
-    4.99804 4.99843 4.99881 4.99909 4.99934 4.99957 4.9996 4.99964
-    4.99967 4.9997 4.99973 4.99977 4.9998 4.99983 4.99986 4.99988
-    4.99991 4.99992 4.99992 4.99993 4.99994 4.99994 4.99995
-    4.99996 4.99996 4.99997 4.99997 4.99998 4.99998 4.99999
-    4.99999 4.99999 4.99999 5 5 5 5.00001 5.00001 5.00001 5.00001
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
-    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 4.99999 4.99999 4.99999
-    4.99999 4.99999 4.99999 4.99999 5.00028 4.99988 4.99968
-    5.00019 4.99987 5.00021 4.99973 4.99977 4.99996 4.99997
-    5.0002 4.99957 5.00026 4.99947 5.00074 5.00003 4.99987 4.99979
-    5.00008 4.99997 5.08794 5.05993 4.76875 3.99197 3.10174
-    2.5197 2.21771 2.04 1.92235 1.83874 1.77592 1.72665 1.686
-    1.65276 1.6286 1.61299 1.60039 1.58934 1.57954 1.57083 1.56306
-    1.55604 1.54963 1.54375 1.53832 1.53331 1.52865 1.52432
-    1.52026 1.51645 1.51287 1.50949 1.50629 1.50327 1.50039
-    1.49766 1.49505 1.49257 1.49019 1.48792 1.48574 1.48365
-    1.48164 1.47971 1.47784 1.47604 1.47431 1.47264 1.47102
-    1.46945 1.46794 1.46647 1.46505 1.46367 1.46233 1.46103
-    1.45976 1.45853 1.45733 1.45616 1.45502 1.45392 1.45284
-    1.45179 1.45076 1.44975 1.4488 1.44795 1.44711 1.44626 1.44541
-    1.44457 1.44372 1.44287 1.44212 1.44138 1.44063 1.43989
-    1.43914 1.4384 1.43766 1.43701 1.43641 1.43581 1.43522 1.43462
-    1.43402 1.43342 1.43282 1.43223 1.43163 1.43103 1.43043
-    1.42984 1.42924 1.42865 1.42808 1.42752 1.42695 1.42639
-    1.42584 1.42529 1.42472 1.42412 1.42365 1.42326 1.42304
-    1.42162 1.42082 1.42032 1.42029 1.42026 1.41995 1.41947
-    1.41894 1.41841 1.4179 1.41742 1.41699 1.41656 1.32097 1.30963
-    1.78765 2.64656 3.35764 3.747 3.86589 3.94217 4.04185 4.18453
-    4.3561 4.53439 4.68621 4.74905 4.77848 4.84629 4.91261 4.97541
-    5.01284 5.01548 5.01248 5.00924 5.00666 5.00475 5.00334
-    5.00234 5.00164 5.00118 5.00083 5.00058 5.0004 5.00028 5.00019
-    5.00013 5.00009 5.00007 5.00004 5.00003 5.00002 5.00001
-    5.00001 5.00001 5 5 4.99999 4.99995 4.99992 4.99996 5.00006
-    5.00012 5.00009 4.99997 4.9999 4.99985 4.99986 4.99997 5.00021
-    5.00031 5.00024 5.0001 5.00007 5.00005 5.00003 5.00001 4.99998
-    4.99998 4.99999 4.99999 4.99999 5 5 5 5 5 5.00001 5.00001
-    5.00001 5.00001 5.00001 5.00001 5.00002 5.00002 5.00001
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5 5 5 5
-    5 4.99999 4.99999 4.99999 4.99998 4.99998 4.99998
-    EOD
-
-    @v[33].set(<<-'EOD')
-    5 5.00012 5.00023 5.0003 4.99972 4.99988 4.99984 4.99991
-    4.99996 4.99999 5.00008 5.00009 4.99986 5.00003 5.00007
-    4.99995 4.9999 4.99997 5.00013 5.00014 5.00013 4.99701 4.99763
-    4.99742 4.99998 5.02836 5.07262 4.96856 4.57267 3.85637
-    2.79544 1.45942 0.408016 0.084885 0.0271375 0.0119294 0.00707546
-    0.0051087 0.00373035 0.00264737 0.00186477 0.00130379 0.000915857
-    0.000653121 0.000483893 0.000380852 0.000302362 0.000219498
-    0.000154435 0.000121928 0.000104026 8.61242e-05 7.48526e-05
-    6.49216e-05 5.56238e-05 5.29689e-05 5.03139e-05 4.7659e-05
-    4.5004e-05 4.23491e-05 4.00356e-05 3.79522e-05 3.58687e-05
-    3.37852e-05 3.17018e-05 2.97592e-05 2.89804e-05 2.82016e-05
-    2.74228e-05 2.66441e-05 2.58653e-05 2.50865e-05 2.43077e-05
-    2.35289e-05 2.27501e-05 2.19714e-05 2.12346e-05 2.07821e-05
-    2.03295e-05 1.98769e-05 1.94244e-05 1.89718e-05 1.85192e-05
-    1.80667e-05 1.76141e-05 1.71615e-05 1.6709e-05 1.62828e-05
-    1.60061e-05 1.57294e-05 1.54527e-05 1.5176e-05 1.48993e-05
-    1.46226e-05 1.43459e-05 1.40692e-05 1.37925e-05 1.35158e-05
-    1.3262e-05 1.31191e-05 1.29761e-05 1.28332e-05 1.26903e-05
-    1.25474e-05 1.24045e-05 1.22615e-05 1.21186e-05 1.19757e-05
-    1.18328e-05 1.16898e-05 1.15469e-05 1.1404e-05 1.12611e-05
-    1.11182e-05 1.09752e-05 1.08323e-05 1.06894e-05 1.05465e-05
-    1.04036e-05 1.02606e-05 1.00185e-05 3.8343e-05 -3.06781e-05
-    -0.000111758 0.000111673 0.000130815 -0.000210491 -0.000231304
-    0.000310226 0.000265303 3.0878e-05 -4.48405e-05 -1.2852e-05
-    -7.84469e-06 3.29986e-05 -1.23286e-05 -6.07871e-05 5.35082e-05
-    7.69194e-05 0.000126221 6.57178e-05 0.00223349 -0.0148854
-    -0.0476636 -0.0491447 0.220125 1.11174 2.03988 2.90209 3.61069
-    4.13554 4.50679 4.71501 4.83916 4.91027 4.95284 4.98086
-    4.99151 4.98651 4.97113 4.95075 4.93102 4.93683 4.95457
-    4.97071 4.98212 4.98948 4.99386 4.99636 4.99785 4.9987 4.99927
-    4.99989 5.00014 5.00007 4.99988 4.99982 4.99976 4.99973
-    4.99972 4.99972 4.99973 4.99974 4.99975 4.99977 4.99979
-    4.99981 4.99984 4.99986 4.99988 4.99989 4.99991 4.99992
-    4.99993 4.99994 4.99995 4.99996 4.99996 4.99997 4.99997
-    4.99998 4.99998 4.99998 4.99998 4.99999 4.99999 4.99999
-    4.99999 5 5 5 5.00001 5.00001 5.00001 5.00002 5.00001 5.00001
-    5.00001 5.00001 5.00001 5 5 5 5 5 5 5 5 4.99999 4.99999
-    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999
-    4.99999 4.99999 4.99999 5 5.00012 4.99946 4.99839 4.99733
-    4.99948 5.00114 5.00158 5.00147 5.00113 5.00073 5.00043
-    5.0002 5.00006 4.99995 4.99986 4.99973 4.99976 4.9999 5.00029
-    5.00055 4.99704 4.99734 4.9972 5.00278 5.03354 5.07184 4.94057
-    4.51936 3.75638 2.60982 1.23803 0.315016 0.0796102 0.0252894
-    0.0165723 0.0827785 0.491298 1.40686 2.33436 3.1251 3.7691
-    4.22201 4.49976 4.68115 4.80513 4.88509 4.93208 4.95861
-    4.97579 4.98655 4.99268 4.99571 4.99771 4.99881 4.99929
-    4.99954 4.99965 4.9997 4.99971 4.99971 4.99971 4.99971 4.99972
-    4.99974 4.99976 4.99978 4.99981 4.99984 4.99987 4.99989
-    4.99991 4.99991 4.99992 4.99992 4.99993 4.99997 5.00003
-    5.00006 5.00004 5.00001 5 4.99999 4.99998 4.99998 4.99997
-    4.99997 4.99997 4.99998 4.99998 4.99998 4.99999 4.99999
-    4.99999 4.99999 5 5 5 5 5.00001 5.00001 5.00001 5.00001
-    5.00001 5.00001 5.00001 5.00001 5.00001 5 5 5 5 5 5 5 4.99999
-    4.99999 4.99999 4.99999 4.99998 4.99998
-    EOD
-
-    @v[34].set(<<-'EOD')
-    5 5.00207 5.00813 5.01486 5.00156 5.0018 4.99861 4.99844
-    4.99888 4.9993 4.99956 4.99971 4.99979 4.99983 4.99987 4.99989
-    4.99671 4.9974 4.99864 5.00131 5.00377 5.0021 5.00039 4.99993
-    5.00004 5.0009 5.00109 4.99636 4.98617 4.96778 4.92047 4.89528
-    4.91112 4.9559 4.98286 4.99369 4.99812 4.99951 4.99994 5.00014
-    5.00008 4.99994 4.99984 4.99989 4.99998 5.00004 5.00004
-    5.00006 5.00005 5.00001 4.99997 4.99992 4.99993 4.99994
-    4.99996 4.99996 4.99996 4.99996 4.99996 4.99996 4.99996
-    4.99996 4.99996 4.99996 4.99996 4.99996 4.99996 4.99996
-    4.99997 4.99997 4.99997 4.99997 4.99997 4.99997 4.99997
-    4.99997 4.99997 4.99997 4.99997 4.99997 4.99997 4.99997
-    4.99997 4.99997 4.99997 4.99997 4.99997 4.99997 4.99997
-    4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998
-    4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998
-    4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998
-    4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998
-    4.99998 4.99998 4.99998 4.99998 5.00131 5.00072 4.9977 4.99811
-    5.00325 4.99647 4.98948 4.99459 5.00262 5.00276 5.00156
-    5.00072 5.0003 5.00013 4.99995 4.99668 4.99775 4.99917 5.00173
-    5.00386 5.00188 4.99888 4.99757 4.99951 5.01712 5.0557 5.07088
-    5.07704 5.07758 5.06958 5.04223 5.03331 5.0279 5.03408 5.07611
-    5.01911 4.68594 3.99152 2.92195 1.69878 0.809 0.344091 0.154663
-    0.0788717 0.0467212 0.0336168 0.0280514 0.0254947 0.024173
-    0.0223567 0.0220555 0.0271514 0.0295872 0.0296052 0.0283971
-    0.0264726 0.0241813 0.0218244 0.0195349 0.017368 0.0152495
-    0.013295 0.0115444 0.00996982 0.00857091 0.00733891 0.00627261
-    0.0053494 0.00456316 0.00388373 0.00331073 0.00282181 0.00240991
-    0.00206389 0.00177187 0.00152283 0.00131167 0.00112558 0.000954373
-    0.000805726 0.00069326 0.000600991 0.000525743 0.00047355
-    0.00044359 0.000434815 0.000436053 0.000402511 0.000368969
-    0.000335427 0.000301886 0.000268344 0.000234802 0.00020126
-    0.000184967 0.000169932 0.000154896 0.000139861 0.000124825
-    0.00010979 9.47546e-05 8.67896e-05 8.24901e-05 7.81906e-05
-    7.38911e-05 6.95915e-05 6.5292e-05 6.09925e-05 5.66929e-05
-    5.23934e-05 4.80939e-05 4.37943e-05 3.94948e-05 3.51953e-05
-    3.08957e-05 2.67968e-05 2.42936e-05 2.17904e-05 1.92872e-05
-    1.6784e-05 0.00125927 -0.00794344 -0.0305499 -0.0621697
-    -0.0463796 -0.0224608 -0.00538381 0.00546086 0.0108675 0.012883
-    0.0131787 0.0127271 0.0119702 0.0110398 0.0100635 0.00649617
-    0.00489388 0.00545863 0.0098351 0.0167428 0.0126563 0.00697542
-    0.00427027 0.00330002 0.00390774 0.00408999 -0.00259143
-    -0.0160578 -0.0451849 -0.0409651 0.1301 0.597429 1.3848
-    2.63426 3.81272 4.51373 4.8412 4.98731 4.88165 4.37165 3.40034
-    2.17681 1.12217 0.505129 0.219703 0.104992 0.0622333 0.0448317
-    0.0355782 0.0311867 0.0293529 0.0274615 0.0288739 0.0307845
-    0.0304909 0.029245 0.0273602 0.0251006 0.022697 0.0202765
-    0.0179357 0.0157106 0.0136562 0.0117951 0.0101273 0.00865784
-    0.00739394 0.00634364 0.00551356 0.00480538 0.00415747 0.00356084
-    0.00297585 0.00236711 0.00181853 0.00160713 0.00169822 0.00166542
-    0.00145504 0.00120252 0.00109259 0.000982658 0.00087273
-    0.000762802 0.000652874 0.000584068 0.000528263 0.000472458
-    0.000416653 0.000360848 0.000321155 0.000301442 0.000281729
-    0.000262016 0.000242303 0.00022259 0.000202877 0.000183164
-    0.000163451 0.000143738 0.000124025 0.000114582 0.000107399
-    0.000100216 9.30332e-05 8.58502e-05 7.86672e-05 7.14841e-05
-    6.43011e-05 5.7118e-05 4.9935e-05 4.35378e-05 4.04281e-05
-    3.73184e-05 3.42088e-05 3.10991e-05 2.79894e-05 2.48798e-05
-    2.17701e-05 1.86604e-05
-    EOD
-
-    @v[35].set(<<-'EOD')
-    7.24585e-12 2.21843e-05 3.20014e-05 1.25076e-05 -2.44947e-05
-    1.8425e-05 5.50546e-06 3.53025e-05 -1.07551e-05 -3.94383e-06
-    -2.27848e-06 -9.04789e-05 7.44215e-05 -2.7662e-05 0.000200038
-    -2.11998e-05 -2.09011e-05 2.37098e-05 2.18751e-05 -2.28422e-05
-    -6.23659e-05 3.58241e-05 1.76386e-05 -4.28311e-05 0.000355626
-    0.00156903 0.00100999 -0.0085304 -0.02067 -0.0389485 -0.0651568
-    -0.128475 -0.314362 -0.406837 -0.421558 -0.421277 -0.418176
-    -0.414481 -0.410845 -0.407348 -0.403971 -0.400716 -0.397582
-    -0.394563 -0.391658 -0.388866 -0.386178 -0.383585 -0.381094
-    -0.378789 -0.376569 -0.37435 -0.372256 -0.370188 -0.36815
-    -0.366422 -0.364694 -0.362967 -0.361239 -0.359511 -0.357888
-    -0.356334 -0.354781 -0.353227 -0.351674 -0.350152 -0.348888
-    -0.347625 -0.346361 -0.345098 -0.343834 -0.342571 -0.341307
-    -0.340044 -0.33878 -0.337517 -0.336279 -0.335215 -0.334152
-    -0.333088 -0.332024 -0.330961 -0.329897 -0.328833 -0.32777
-    -0.326706 -0.325642 -0.324601 -0.323683 -0.322766 -0.321849
-    -0.320932 -0.320014 -0.319097 -0.31818 -0.317263 -0.316345
-    -0.315428 -0.314545 -0.313825 -0.313106 -0.312387 -0.311667
-    -0.310948 -0.310228 -0.309509 -0.308789 -0.30807 -0.307351
-    -0.306631 -0.305912 -0.305192 -0.304473 -0.303754 -0.303034
-    -0.302315 -0.301595 -0.300876 -0.300157 -0.299437 -0.298716
-    -0.29798 -0.297329 -0.296691 -0.295837 -0.29516 -0.294725
-    -0.294044 -0.292917 -0.292351 -0.291965 -0.291365 -0.290687
-    -0.290027 -0.289376 -0.288772 -0.288193 -0.287505 -0.286892
-    -0.28626 -0.285714 -0.284545 -0.289246 -0.298717 -0.298492
-    -0.214163 0.181451 0.0749974 0.0454707 0.0292987 0.0196837
-    0.0124119 0.00884715 0.00527181 0.00585821 0.0296361 0.169856
-    0.361207 0.538856 0.67469 0.685933 0.392802 0.17772 0.0813085
-    0.0424601 0.0246654 0.0175258 0.0144256 0.0129859 0.012205
-    0.0112846 0.010933 0.0134813 0.0147254 0.0147981 0.0142156
-    0.0132732 0.0121355 0.0109587 0.00981238 0.00872731 0.00767007
-    0.00669346 0.00581341 0.00502167 0.00431819 0.00369842 0.00316168
-    0.00269663 0.00230035 0.00195801 0.00166928 0.00142286 0.00121522
-    0.00104072 0.000893384 0.000767675 0.000661268 0.000567659
-    0.000481766 0.000407101 0.000350044 0.000302721 0.000263424
-    0.000236813 0.00022199 0.000218182 0.000219548 0.0002027
-    0.000185853 0.000169006 0.000152158 0.000135311 0.000118463
-    0.000101616 9.33782e-05 8.57685e-05 7.81588e-05 7.0549e-05
-    6.29393e-05 5.53296e-05 4.77199e-05 4.36954e-05 4.15296e-05
-    3.93637e-05 3.71978e-05 3.50319e-05 3.28661e-05 3.07002e-05
-    2.85343e-05 2.63685e-05 2.42026e-05 2.20367e-05 1.98709e-05
-    1.7705e-05 1.55391e-05 1.34772e-05 1.22416e-05 1.10061e-05
-    9.77055e-06 8.535e-06 0.000631271 -0.00362586 -0.0146235
-    -0.0308486 -0.0237466 -0.0117522 -0.00304171 0.00251033
-    0.00531986 0.0063897 0.00657351 0.00636494 0.00599705 0.00553442
-    0.00505994 0.00330925 0.00246671 0.0027006 0.00473161 0.00830333
-    0.00649147 0.00356815 0.00217448 0.00187579 0.00270447 0.00219543
-    -0.00546118 -0.0179576 -0.0445306 -0.0649309 0.0197935 0.473629
-    0.87268 0.269542 0.0086094 0.0844602 0.606456 1.04929 0.906014
-    0.916205 0.919425 0.872867 0.556244 0.262457 0.11838 0.0571226
-    0.0333451 0.0237133 0.0185096 0.0159617 0.0148663 0.0138683
-    0.0144081 0.0153797 0.0152551 0.0146487 0.0137192 0.0125973
-    0.0113996 0.0101903 0.00901851 0.00790495 0.00687502 0.00593994
-    0.00510092 0.00436111 0.00372439 0.0031945 0.00277537 0.00241888
-    0.002095 0.00179943 0.00150419 0.00119264 0.00090934 0.000802394
-    0.000852816 0.000838368 0.000730842 0.000601028 0.000546616
-    0.000492205 0.000437793 0.000383381 0.000328969 0.00029454
-    0.000266428 0.000238317 0.000210205 0.000182093 0.000162091
-    0.000152145 0.000142198 0.000132252 0.000122306 0.000112359
-    0.000102413 9.24665e-05 8.25201e-05 7.25738e-05 6.26274e-05
-    5.78553e-05 5.42216e-05 5.05878e-05 4.69541e-05 4.33204e-05
-    3.96867e-05 3.60529e-05 3.24192e-05 2.87855e-05 2.51518e-05
-    2.19153e-05 2.03406e-05 1.8766e-05 1.71913e-05 1.56167e-05
-    1.4042e-05 1.24674e-05 1.08927e-05 9.31806e-06
-    EOD
-
-    @v[36].set(<<-'EOD')
-    5 5.01426 5.02852 5.01923 4.77685 4.56471 4.52338 4.56813
-    4.63122 4.693 4.74776 4.79385 4.83258 4.86358 4.88918 4.91021
-    4.90553 4.89733 4.89554 4.91953 5.00757 5.07101 5.06318
-    5.05241 5.05535 5.08042 5.07251 4.90973 4.56136 3.98637
-    3.237 2.67216 2.33678 2.13529 2.00544 1.91429 1.84638 1.79461
-    1.75338 1.71958 1.69175 1.6686 1.64918 1.63258 1.61836 1.60607
-    1.59506 1.58483 1.57575 1.56847 1.56193 1.55538 1.54968
-    1.54416 1.5388 1.53523 1.53165 1.52807 1.52449 1.52091 1.51771
-    1.51477 1.51182 1.50888 1.50593 1.50309 1.50113 1.49917
-    1.4972 1.49524 1.49328 1.49132 1.48935 1.48739 1.48543 1.48346
-    1.48157 1.48012 1.47868 1.47724 1.47579 1.47435 1.47291
-    1.47146 1.47002 1.46857 1.46713 1.46574 1.46462 1.4635 1.46238
-    1.46126 1.46014 1.45902 1.4579 1.45678 1.45567 1.45455 1.45349
-    1.45275 1.45201 1.45127 1.45053 1.44979 1.44905 1.44831
-    1.44757 1.44683 1.44609 1.44535 1.44461 1.44387 1.44313
-    1.44239 1.44165 1.44091 1.44017 1.43943 1.43869 1.43795
-    1.43721 1.43874 1.43976 1.43619 1.43182 1.43726 1.43084
-    1.42587 1.42383 1.42642 1.42728 1.42736 1.4271 1.42669 1.42621
-    1.42569 1.41703 1.41244 1.41019 1.41199 1.41833 1.42502
-    1.41504 1.37535 1.28381 1.44779 2.33713 3.25835 3.67554
-    3.84975 4.01125 4.2253 4.45433 4.62215 4.74478 4.82998 4.8868
-    4.92396 4.94768 4.96498 4.98537 5.0128 5.04467 5.06722 5.06535
-    5.01475 4.91956 4.80647 4.7242 4.7059 4.73552 4.76379 4.81684
-    4.87376 4.92276 4.96112 4.9884 5.0045 5.00999 5.00933 5.00619
-    5.00384 5.00342 5.00373 5.00362 5.00309 5.00272 5.00239
-    5.00204 5.00172 5.00146 5.00124 5.00105 5.00089 5.00076
-    5.00065 5.00057 5.00048 5.00041 5.00034 5.00028 5.00023
-    5.00019 5.00015 5.00015 5.00016 5.0002 5.00023 5.00021 5.00019
-    5.00017 5.00015 5.00012 5.0001 5.00008 5.00007 5.00006 5.00005
-    5.00004 5.00003 5.00002 5.00001 5.00001 5.00001 5.00001
-    5.00001 5.00001 5.00001 5.00002 5.00002 5.00002 5.00002
-    5.00002 5.00002 5.00002 5.00002 5.00002 5.00002 5.00001
-    5.00001 5.00001 5.00062 4.99506 4.9835 4.96726 4.9728 4.97877
-    4.98675 4.9966 5.00406 5.00679 5.00629 5.00561 5.00487 5.00429
-    5.00384 5.002 5.00164 5.00229 5.00484 5.00769 5.00019 5.00242
-    5.01319 5.0335 5.07265 5.10129 5.11485 5.12551 5.13953 5.16048
-    5.18862 5.22811 5.25656 5.25627 5.19975 4.9139 4.24745 3.43732
-    2.8202 2.43224 2.17409 2.01333 1.93951 1.94622 1.98861 2.02217
-    2.05383 2.08376 2.11184 2.13793 2.16191 2.18267 2.20502
-    2.22837 2.24958 2.26901 2.28648 2.302 2.31582 2.32802 2.33869
-    2.34795 2.35596 2.36282 2.3687 2.37371 2.37797 2.38161 2.38476
-    2.38743 2.3897 2.39168 2.39329 2.39463 2.39575 2.39671 2.39756
-    2.39835 2.39907 2.39968 2.39999 2.4003 2.40061 2.40091 2.40122
-    2.40142 2.40159 2.40176 2.40193 2.4021 2.40222 2.40228 2.40234
-    2.4024 2.40247 2.40253 2.40259 2.40265 2.40271 2.40277 2.40284
-    2.40287 2.40289 2.40291 2.40294 2.40296 2.40298 2.40301
-    2.40303 2.40305 2.40308 2.4031 2.40311 2.40312 2.40313 2.40314
-    2.40315 2.40316 2.40317 2.40318
-    EOD
-
-    @v[37].set(<<-'EOD')
-    5 5.01732 5.03181 5.05944 5.12686 5.20725 5.28103 5.31254
-    5.32901 5.33709 5.3408 5.34257 5.34311 5.34347 5.34386 5.34411
-    5.3406 5.33484 5.32942 5.32904 5.33644 5.34869 5.35001 5.34882
-    5.34758 5.34672 5.34599 5.34496 5.34364 5.34165 5.33712
-    5.33502 5.3366 5.34067 5.34306 5.34398 5.34434 5.34442 5.34443
-    5.34443 5.34441 5.34439 5.34437 5.34437 5.34438 5.34438
-    5.34438 5.34438 5.34438 5.34437 5.34437 5.34436 5.34436
-    5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437
-    5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437
-    5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437
-    5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437
-    5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437
-    5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437
-    5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437
-    5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437
-    5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437
-    5.34437 5.34437 5.34437 5.34437 5.34437 5.35377 5.35451
-    5.34265 5.34488 5.35861 5.28622 4.90033 4.75027 4.89731
-    4.97098 4.99293 4.99832 4.99909 4.99956 4.99858 4.99829
-    4.9998 5.00035 5.0038 5.00989 5.00251 4.99438 4.9953 4.99761
-    4.99985 5.00152 5.0011 5.00046 4.99996 4.99925 4.99862 4.99919
-    4.99961 5.00048 5.00234 4.99654 4.98235 4.95936 4.83738
-    4.53021 4.21004 4.00593 3.91207 3.88059 3.87822 3.89117
-    3.91278 3.94044 3.97376 4.01152 4.05052 4.10679 4.17908
-    4.25673 4.33414 4.40875 4.47879 4.54342 4.60258 4.65595
-    4.70291 4.74414 4.78018 4.81185 4.83915 4.86291 4.88301
-    4.90048 4.91528 4.92802 4.9387 4.94777 4.95539 4.9618 4.96725
-    4.97195 4.97588 4.97932 4.98247 4.98512 4.98697 4.98831
-    4.98919 4.99015 4.99101 4.99169 4.99222 4.99282 4.99341
-    4.994 4.9946 4.99519 4.99578 4.99638 4.99667 4.99693 4.9972
-    4.99747 4.99773 4.998 4.99827 4.99841 4.99849 4.99856 4.99864
-    4.99872 4.9988 4.99888 4.99896 4.99904 4.99911 4.99919 4.99927
-    4.99935 4.99943 4.9995 4.99955 4.9996 4.99965 4.9997 5.00736
-    4.98252 4.87516 4.66727 4.49142 4.43103 4.4301 4.4571 4.49729
-    4.5407 4.5835 4.62363 4.66114 4.69577 4.72738 4.74632 4.75971
-    4.77576 4.80671 4.87073 4.91665 4.93252 4.94418 4.95331
-    4.96094 4.96727 4.97148 4.97471 4.97612 4.98276 5.00247
-    5.04086 5.08628 5.10673 5.08887 5.0564 5.02767 5.01336 4.99685
-    4.97422 4.90866 4.67035 4.33117 4.07888 3.94432 3.89105
-    3.88174 3.89292 3.91442 3.94564 3.98708 4.0355 4.09134 4.16315
-    4.24088 4.31918 4.39527 4.46693 4.53337 4.59405 4.6486 4.69693
-    4.73938 4.77617 4.80809 4.83551 4.85895 4.87894 4.89596
-    4.91081 4.92417 4.93651 4.94552 4.95198 4.9565 4.96096 4.96523
-    4.96972 4.97428 4.97868 4.98064 4.9826 4.98455 4.98651 4.98847
-    4.98967 4.99064 4.9916 4.99257 4.99353 4.99422 4.99457 4.99493
-    4.99528 4.99563 4.99598 4.99633 4.99668 4.99703 4.99738
-    4.99773 4.9979 4.99804 4.99817 4.9983 4.99843 4.99856 4.99869
-    4.99883 4.99896 4.99909 4.99921 4.99926 4.99931 4.99937
-    4.99942 4.99948 4.99953 4.99959 4.99964
-    EOD
-
-    @v[38].set(<<-'EOD')
-    4.49849 4.53282 4.58329 4.66625 4.83345 4.97823 5.0207 5.01816
-    5.01116 5.00595 5.00296 5.00148 5.00073 5.00062 5.00033
-    5.0003 4.99864 4.99661 4.99652 4.99928 5.00361 5.12573 5.17251
-    5.22612 5.33479 5.44503 5.44432 5.44379 5.44334 5.443 5.44276
-    5.44258 5.44246 5.44238 5.44232 5.44228 5.44225 5.44223
-    5.44221 5.4422 5.44219 5.44219 5.44218 5.44218 5.44218 5.44218
-    5.44217 5.44217 5.44217 5.44217 5.44217 5.44217 5.44217
-    5.44217 5.44217 5.44217 5.44217 5.44217 5.44217 5.44217
-    5.44217 5.44217 5.44217 5.44217 5.44217 5.44217 5.44216
-    5.44216 5.44216 5.44216 5.44216 5.44216 5.44216 5.44216
-    5.44216 5.44216 5.44216 5.44216 5.44216 5.44216 5.44216
-    5.44216 5.44216 5.44216 5.44216 5.44215 5.44215 5.44215
-    5.44215 5.44215 5.44215 5.44215 5.44215 5.44215 5.44215
-    5.44215 5.44215 5.44215 5.44215 5.44215 5.44215 5.44215
-    5.44215 5.44215 5.44215 5.44215 5.44215 5.44215 5.44215
-    5.44214 5.44214 5.44214 5.44214 5.44214 5.44214 5.44214
-    5.44214 5.44214 5.44214 5.44214 5.44212 5.45159 5.45236
-    5.44064 5.44307 5.45616 5.38122 4.77163 3.53297 2.74466
-    2.34448 2.11802 1.9783 1.88656 1.82001 1.77389 1.72955 1.69632
-    1.66971 1.6526 1.65236 1.56034 1.53764 1.97139 2.75096 3.39212
-    3.74042 3.82345 3.85696 3.88547 3.91862 3.9585 4.00467 4.05903
-    4.1254 4.19533 4.26791 4.34517 4.42112 4.49238 4.55807 4.6179
-    4.6713 4.71815 4.75889 4.79418 4.82456 4.85062 4.87291 4.89196
-    4.90823 4.92209 4.93388 4.9439 4.95242 4.95968 4.96585 4.97108
-    4.9755 4.97923 4.98237 4.98503 4.98732 4.98927 4.99094 4.99233
-    4.99353 4.99452 4.99538 4.99608 4.99668 4.99718 4.9976 4.99794
-    4.99822 4.99847 4.99867 4.99884 4.99899 4.99913 4.99924
-    4.99932 4.99938 4.99943 4.99947 4.99951 4.99953 4.99955
-    4.99958 4.99961 4.99964 4.99967 4.99969 4.99972 4.99975
-    4.99977 4.99978 4.99979 4.99981 4.99982 4.99983 4.99985
-    4.99986 4.99986 4.99987 4.99987 4.99988 4.99988 4.99988
-    4.99989 4.99989 4.9999 4.9999 4.99991 4.99991 4.99992 4.99992
-    4.99993 4.99993 4.99993 4.99994 5.00381 5.00064 4.99246
-    4.99823 5.00349 5.00076 5.00033 5.00015 5.00009 5.00007
-    5.00005 5.00004 5.00003 5.00002 4.99988 4.99732 4.99728
-    4.9978 5.00187 5.00927 5.08712 5.07654 4.92855 4.4863 3.76162
-    3.00049 2.49834 2.20883 2.03492 1.92384 1.84676 1.79021
-    1.74716 1.7132 1.68576 1.66309 1.64406 1.62785 1.61383 1.60162
-    1.59081 1.58117 1.57253 1.56473 1.55765 1.55117 1.54527
-    1.53988 1.53485 1.53012 1.5257 1.5216 1.51773 1.51411 1.51071
-    1.50746 1.50438 1.50146 1.49868 1.49603 1.4935 1.49109 1.48878
-    1.48657 1.48445 1.48242 1.48046 1.47858 1.47677 1.47502
-    1.47333 1.4717 1.47012 1.46859 1.46711 1.46568 1.46428 1.46292
-    1.4616 1.46034 1.45923 1.45812 1.45701 1.4559 1.45479 1.45378
-    1.45279 1.45181 1.45082 1.44983 1.44893 1.44813 1.44732
-    1.44652 1.44571 1.44491 1.4441 1.4433 1.44249 1.44169 1.44089
-    1.44019 1.43951 1.43883 1.43815 1.43747 1.4368 1.43612 1.43544
-    1.43476 1.43408 1.43342 1.43283 1.43223 1.43163 1.43104
-    1.43044 1.42984 1.42924 1.42865
-    EOD
-
-    @v[39].set(<<-'EOD')
-    5 5.01048 5.01221 4.98887 4.76261 4.54943 4.51564 4.56249
-    4.62621 4.68843 4.74374 4.79044 4.82972 4.86127 4.88724
-    4.90862 4.90791 4.89858 4.89589 4.91767 5.00405 5.16956
-    5.12391 4.7557 3.87953 3.01124 2.48482 2.20424 2.03812 1.92679
-    1.84956 1.79256 1.74907 1.71487 1.68724 1.6644 1.64513 1.6287
-    1.61446 1.60197 1.59095 1.58117 1.57245 1.5646 1.55752 1.55109
-    1.54516 1.53958 1.53444 1.53008 1.52606 1.52205 1.51843
-    1.5149 1.51146 1.50893 1.50639 1.50387 1.50133 1.4988 1.49651
-    1.49436 1.49222 1.49007 1.48793 1.48585 1.48433 1.4828 1.48128
-    1.47975 1.47823 1.4767 1.47518 1.47365 1.47213 1.4706 1.46912
-    1.46795 1.46678 1.46561 1.46444 1.46327 1.4621 1.46093 1.45976
-    1.45859 1.45741 1.45628 1.45534 1.45441 1.45347 1.45254
-    1.4516 1.45067 1.44973 1.4488 1.44786 1.44693 1.44604 1.44539
-    1.44475 1.4441 1.44345 1.44281 1.44216 1.44151 1.44086 1.44022
-    1.43957 1.43892 1.43828 1.43763 1.43698 1.43633 1.43569
-    1.43504 1.43439 1.43375 1.4331 1.43245 1.4318 1.43157 1.43089
-    1.43001 1.43042 1.42899 1.42439 1.42216 1.43447 1.44048
-    1.43705 1.43314 1.43039 1.42861 1.42739 1.42651 1.42548
-    1.42488 1.4243 1.42392 1.4235 1.32443 1.31149 1.78169 2.64844
-    3.43211 3.95252 4.20231 4.3746 4.49948 4.58929 4.65742 4.71183
-    4.77057 4.83196 4.88354 4.92894 4.96625 4.99235 5.00651
-    5.00941 5.00813 5.00689 5.00588 5.00504 5.00431 5.00368
-    5.00314 5.00268 5.00228 5.00194 5.00165 5.0014 5.00118 5.001
-    5.00085 5.00072 5.00061 5.00052 5.00044 5.00037 5.00031
-    5.00027 5.00022 5.00019 5.00016 5.00013 5.00011 5.00009
-    5.00008 5.00007 5.00006 5.00005 5.00004 5.00003 5.00003
-    5.00003 5.00002 5.00002 5.00002 5.00001 5.00001 5.00001
-    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001
-    5.00001 5.00001 5 5 5 5 5 4.99999 4.99999 4.99999 4.99998
-    4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 4.99999
-    4.99999 4.99999 4.99999 4.99999 4.99999 5 5 5 5 5.00001
-    5.00002 5.00003 5.00004 5.00022 4.99974 4.99942 4.99997
-    5.00063 5.00002 5.00003 4.99994 4.99998 4.99999 5 5 5 5
-    5 4.99981 4.99998 5.00004 5.00036 5.00049 5.12012 5.16315
-    5.19712 5.21835 4.87874 4.10151 3.31555 2.74207 2.38075
-    2.15872 2.01614 1.91886 1.84852 1.79401 1.75052 1.71508
-    1.68672 1.66467 1.64602 1.62985 1.61576 1.60343 1.59256
-    1.58287 1.57418 1.56632 1.55922 1.55282 1.54687 1.54132
-    1.53618 1.53143 1.52698 1.52282 1.51895 1.51527 1.5118 1.50851
-    1.5054 1.50244 1.49963 1.49695 1.4944 1.49196 1.48963 1.4874
-    1.48527 1.48322 1.48124 1.47934 1.47751 1.47574 1.47403
-    1.47239 1.4708 1.46926 1.46777 1.46632 1.46491 1.46355 1.46237
-    1.4612 1.46002 1.45884 1.45766 1.45659 1.45555 1.45451 1.45346
-    1.45242 1.45147 1.45062 1.44978 1.44894 1.44809 1.44725
-    1.4464 1.44556 1.44472 1.44387 1.44303 1.4423 1.44159 1.44088
-    1.44017 1.43947 1.43876 1.43805 1.43734 1.43664 1.43593
-    1.43524 1.43462 1.434 1.43338 1.43276 1.43213 1.43151 1.43089
-    1.43027
-    EOD
-  end
-
-  def highlightTrace(graph)
-    entry = graph.legend_get(:current)
-    active_list = graph.legend_activate
-    if active_list.include?(entry)
-      graph.legend_deactivate(entry)
-      graph.element_deactivate(entry)
-    else
-      graph.legend_activate(entry)
-      graph.element_activate(entry)
-    end
-  end
-
-end
-
-BLT_Graph_Demo.new
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/blt/graph7.rb b/ext/tk/sample/tkextlib/blt/graph7.rb
deleted file mode 100644
index 0e68388596..0000000000
--- a/ext/tk/sample/tkextlib/blt/graph7.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/blt'
-
-length = 250000
-graph = Tk::BLT::Graph.new(:title=>"Scatter Plot\n#{length} points")
-graph.xaxis_configure(:loose=>false, :title=>'X Axis Label')
-graph.yaxis_configure(:title=>'Y Axis Label')
-graph.legend_configure(:activerelief=>:sunken, :background=>'')
-
-Tk::BLT::Table.add(Tk.root, graph, [0,0], :fill=>:both)
-
-v_x = Tk::BLT::Vector.new(length)
-v_y = Tk::BLT::Vector.new(length)
-v_x.expr("random(#{v_x})")
-v_y.expr("random(#{v_y})")
-v_x.sort(v_y)
-
-plot = Tk::BLT::PlotComponent::Element.new(graph, :symbol=>:square,
-                                           :color=>'green4', :fill=>'green2',
-                                           :linewidth=>0, :outlinewidth=>1,
-                                           :pixels=>4, :label=>'plot',
-                                           :xdata=>v_x, :ydata=>v_y)
-
-Tk.root.minsize(0, 0)
-
-#graph.zoom_stack
-#graph.crosshairs
-#graph.active_legend
-#graph.closest_point
-Tk::BLT.zoom_stack(graph)
-Tk::BLT.crosshairs(graph)
-Tk::BLT.active_legend(graph)
-Tk::BLT.closest_point(graph)
-
-Tk::BLT::Busy.hold(graph)
-Tk.update
-Tk::BLT::Busy.release(graph)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/blt/graph7a.rb b/ext/tk/sample/tkextlib/blt/graph7a.rb
deleted file mode 100644
index aa744f1f74..0000000000
--- a/ext/tk/sample/tkextlib/blt/graph7a.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/blt'
-
-file = File.join(File.dirname(File.expand_path(__FILE__)),
-                 'images', 'buckskin.gif')
-bgTexture = TkPhotoImage.new(:file=>file)
-
-TkOption.add('*Graph.Tile', bgTexture)
-TkOption.add('*Label.Tile', bgTexture)
-TkOption.add('*Frame.Tile', bgTexture)
-TkOption.add('*Htext.Tile', bgTexture)
-TkOption.add('*TileOffset', 0)
-TkOption.add('*HighlightThickness',   0)
-TkOption.add('*Element.ScaleSybols',  false)
-TkOption.add('*Element.Smooth',       :linear)
-TkOption.add('*activeLine.Color',     'yellow4')
-TkOption.add('*activeLine.Fill',      'yellow')
-TkOption.add('*activeLine.LineWidth', 0)
-TkOption.add('*Element.Pixels',       3)
-TkOption.add('*Graph.halo',           '7i')
-
-if Tk.root.winfo_screenvisual != 'staticgray'
-  TkOption.add('*print.background', 'yellow')
-  TkOption.add('*quit.background',  'red')
-end
-
-length = 250000
-graph = Tk::BLT::Graph.new(:title=>"Scatter Plot\n#{length} points")
-graph.xaxis_configure(:loose=>false, :title=>'X Axis Label')
-graph.yaxis_configure(:title=>'Y Axis Label')
-graph.legend_configure(:activerelief=>:sunken, :background=>'')
-
-Tk::BLT::Table.add(Tk.root, graph, [0,0], :fill=>:both)
-
-v_x = Tk::BLT::Vector.new(length)
-v_y = Tk::BLT::Vector.new(length)
-v_x.expr("random(#{v_x})")
-v_y.expr("random(#{v_y})")
-v_x.sort(v_y)
-
-plot = Tk::BLT::PlotComponent::Element.new(graph, :symbol=>:square,
-                                           :color=>'green4', :fill=>'green2',
-                                           :linewidth=>0, :outlinewidth=>1,
-                                           :pixels=>4, :label=>'plot',
-                                           :xdata=>v_x, :ydata=>v_y)
-
-Tk.root.minsize(0, 0)
-
-#graph.zoom_stack
-#graph.crosshairs
-#graph.active_legend
-#graph.closest_point
-Tk::BLT.zoom_stack(graph)
-Tk::BLT.crosshairs(graph)
-Tk::BLT.active_legend(graph)
-Tk::BLT.closest_point(graph)
-
-Tk::BLT::Busy.hold(graph)
-Tk.update
-Tk::BLT::Busy.release(graph)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/blt/graph7b.rb b/ext/tk/sample/tkextlib/blt/graph7b.rb
deleted file mode 100644
index 5b30c4bac0..0000000000
--- a/ext/tk/sample/tkextlib/blt/graph7b.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/blt'
-
-length = 250000
-graph = Tk::BLT::Graph.new(:title=>"Scatter Plot\n#{length} points")
-graph.xaxis_configure(:loose=>false, :title=>'X Axis Label')
-graph.yaxis_configure(:title=>'Y Axis Label')
-graph.legend_configure(:activerelief=>:sunken, :background=>'')
-
-Tk::BLT::Table.add(Tk.root, graph, [0,0], :fill=>:both)
-
-x = Array.new(length)
-y = Array.new(length)
-(0...length).each{|i|
-  x[i] = rand
-  y[i] = rand
-}
-
-plot = Tk::BLT::PlotComponent::Element.new(graph, :symbol=>:square,
-                                           :color=>'green4', :fill=>'green2',
-                                           :linewidth=>0, :outlinewidth=>1,
-                                           :pixels=>4, :label=>'plot',
-                                           :xdata=>x, :ydata=>y)
-
-Tk.root.minsize(0, 0)
-
-#graph.zoom_stack
-#graph.crosshairs
-#graph.active_legend
-#graph.closest_point
-Tk::BLT.zoom_stack(graph)
-Tk::BLT.crosshairs(graph)
-Tk::BLT.active_legend(graph)
-Tk::BLT.closest_point(graph)
-
-Tk::BLT::Busy.hold(graph)
-Tk.update
-Tk::BLT::Busy.release(graph)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/blt/graph7c.rb b/ext/tk/sample/tkextlib/blt/graph7c.rb
deleted file mode 100644
index 8cbf3223f1..0000000000
--- a/ext/tk/sample/tkextlib/blt/graph7c.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/blt'
-
-length = 250000
-graph = Tk::BLT::Graph.new(:title=>"Scatter Plot\n#{length} points")
-graph.xaxis_configure(:loose=>false, :title=>'X Axis Label')
-graph.yaxis_configure(:title=>'Y Axis Label')
-graph.legend_configure(:activerelief=>:sunken, :background=>'')
-
-Tk::BLT::Table.add(Tk.root, graph, [0,0], :fill=>:both)
-
-v_x = Tk::BLT::Vector.new(length)
-v_y = Tk::BLT::Vector.new(length)
-x = Array.new(length)
-y = Array.new(length)
-(0...length).each{|i|
-  x[i] = rand
-  y[i] = rand
-}
-v_x.set(x)
-v_y.set(y)
-
-plot = Tk::BLT::PlotComponent::Element.new(graph, :symbol=>:square,
-                                           :color=>'green4', :fill=>'green2',
-                                           :linewidth=>0, :outlinewidth=>1,
-                                           :pixels=>4, :label=>'plot',
-                                           :xdata=>v_x, :ydata=>v_y)
-
-Tk.root.minsize(0, 0)
-
-#graph.zoom_stack
-#graph.crosshairs
-#graph.active_legend
-#graph.closest_point
-Tk::BLT.zoom_stack(graph)
-Tk::BLT.crosshairs(graph)
-Tk::BLT.active_legend(graph)
-Tk::BLT.closest_point(graph)
-
-Tk::BLT::Busy.hold(graph)
-Tk.update
-Tk::BLT::Busy.release(graph)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/blt/images/buckskin.gif b/ext/tk/sample/tkextlib/blt/images/buckskin.gif
deleted file mode 100644
index e2d7be9d62..0000000000
--- a/ext/tk/sample/tkextlib/blt/images/buckskin.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/blt/images/chalk.gif b/ext/tk/sample/tkextlib/blt/images/chalk.gif
deleted file mode 100644
index 30d29a7221..0000000000
--- a/ext/tk/sample/tkextlib/blt/images/chalk.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/blt/images/qv100.t.gif b/ext/tk/sample/tkextlib/blt/images/qv100.t.gif
deleted file mode 100644
index 1e738ee86b..0000000000
--- a/ext/tk/sample/tkextlib/blt/images/qv100.t.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/blt/images/rain.gif b/ext/tk/sample/tkextlib/blt/images/rain.gif
deleted file mode 100644
index d7bb417939..0000000000
--- a/ext/tk/sample/tkextlib/blt/images/rain.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/blt/images/sample.gif b/ext/tk/sample/tkextlib/blt/images/sample.gif
deleted file mode 100644
index 1d8a4010c3..0000000000
--- a/ext/tk/sample/tkextlib/blt/images/sample.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/blt/pareto.rb b/ext/tk/sample/tkextlib/blt/pareto.rb
deleted file mode 100644
index e68cde7992..0000000000
--- a/ext/tk/sample/tkextlib/blt/pareto.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-
-require 'tk'
-require 'tkextlib/blt'
-
-# Example of a pareto chart.
-#
-# The pareto chart mixes line and bar elements in the same graph.
-# Each processing operating is represented by a bar element.  The
-# total accumulated defects is displayed with a single line element.
-b = Tk::BLT::Barchart.new(:title=>'Defects Found During Inspection',
-                          :font=>'Helvetica 12', :plotpady=>[12, 4],
-                          :width=>'6i', :height=>'5i')
-Tk::BLT::Table.add(Tk.root, b, :fill=>:both)
-
-data = [
-  ["Spot Weld",  82,   'yellow'],
-  ["Lathe",      49,   'orange'],
-  ["Gear Cut",   38,   'green'],
-  ["Drill",      24,   'blue'],
-  ["Grind",      17,   'red'],
-  ["Lapping",    12,   'brown'],
-  ["Press",       8,   'purple'],
-  ["De-burr",     4,   'pink'],
-  ["Packaging",   3,   'cyan'],
-  ["Other",      12,   'magenta']
-]
-
-# Create an X-Y graph line element to trace the accumulated defects.
-b.line_create('accum', :label=>'', :symbol=>:none, :color=>'red')
-
-# Define a bitmap to be used to stipple the background of each bar.
-pattern1 = Tk::BLT::Bitmap.define([ [4, 4], [1, 2, 4, 8] ])
-
-# For each process, create a bar element to display the magnitude.
-count = 0
-sum   = 0
-ydata = [0]
-xdata = [0]
-labels = []
-
-data.each{|label, value, color|
-  count += 1
-  b.element_create(label, :xdata=>count, :ydata=>value, :foreground=>color,
-                   :relief=>:solid, :borderwidth=>1, :stipple=>pattern1,
-                   :background=>'lightblue')
-  labels[count] = label
-  # Get the total number of defects.
-  sum += value
-  ydata << sum
-  xdata << count
-}
-
-# Configure the coordinates of the accumulated defects,
-# now that we know what they are.
-b.element_configure('accum', :xdata=>xdata, :ydata=>ydata)
-
-# Add text markers to label the percentage of total at each point.
-xdata.zip(ydata){|x, y|
-  percent = (y * 100.0) / sum
-  if x == 0
-    text = ' 0%'
-  else
-    text = '%.1f' % percent
-  end
-  b.marker_create(:text, :coords=>[x, y], :text=>text, :font=>'Helvetica 10',
-                  :foreground=>'red4', :anchor=>:center, :yoffset=>-5)
-}
-
-# Display an auxiliary y-axis for percentages.
-b.axis_configure('y2', :hide=>false, :min=>0.0, :max=>100.0,
-                 :title=>'Percentage')
-
-# Title the y-axis
-b.axis_configure('y', :title=>'Defects')
-
-# Configure the x-axis to display the process names, instead of numbers.
-b.axis_configure('x', :title=>'Process', :rotate=>90, :subdivisions=>0,
-                 :command=>proc{|w, val|
-                   val = val.round
-                   labels[val]? labels[val]: val
-                  })
-
-# No legend needed.
-b.legend_configure(:hide=>true)
-
-# Configure the grid lines.
-b.gridline_configure(:mapx=>:x, :color=>'lightblue')
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/blt/plot1.rb b/ext/tk/sample/tkextlib/blt/plot1.rb
deleted file mode 100644
index 95797c96b7..0000000000
--- a/ext/tk/sample/tkextlib/blt/plot1.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/blt'
-
-graph = Tk::BLT::Graph.new.pack
-plot = Tk::BLT::PlotComponent::Element.new(graph, :linewidth=>0, :label=>'foo')
-plot.data([[1.0, 3.4], [1.1, 2.8], [1.2, 3.1], [1.4, 2.9]].flatten)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/blt/plot1b.rb b/ext/tk/sample/tkextlib/blt/plot1b.rb
deleted file mode 100644
index 96adbd792b..0000000000
--- a/ext/tk/sample/tkextlib/blt/plot1b.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/blt'
-
-graph = Tk::BLT::Graph.new.pack
-plot = graph.element_create
-plot.configure(:linewidth=>0, :label=>'foo',
-               :data=>[[1.0, 3.4], [1.1, 2.8], [1.2, 3.1], [1.4, 2.9]].flatten)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/blt/readme.txt b/ext/tk/sample/tkextlib/blt/readme.txt
deleted file mode 100644
index 8ac1044b0b..0000000000
--- a/ext/tk/sample/tkextlib/blt/readme.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-The scripts and image files in this directory are based on demo files
-of Tcl/Tk's BLT extension.
diff --git a/ext/tk/sample/tkextlib/blt/scripts/stipples.rb b/ext/tk/sample/tkextlib/blt/scripts/stipples.rb
deleted file mode 100644
index 2a4943e032..0000000000
--- a/ext/tk/sample/tkextlib/blt/scripts/stipples.rb
+++ /dev/null
@@ -1,157 +0,0 @@
-# frozen_string_literal: false
-$stipples = {} unless $stipples
-
-$stipples['bdiagonal1'] = Tk::BLT::Bitmap.new(<<EOD)
-#define bdiagonal1_width 8
-#define bdiagonal1_height 8
-static unsigned char bdiagonal1_bits[] = {
-   0x88, 0x44, 0x22, 0x11, 0x88, 0x44, 0x22, 0x11};
-EOD
-
-$stipples['bdiagonal2'] = Tk::BLT::Bitmap.new(<<EOD)
-#define bdiagonal2_width 8
-#define bdiagonal2_height 8
-static unsigned char bdiagonal2_bits[] = {
-   0x08, 0x04, 0x02, 0x01, 0x80, 0x40, 0x20, 0x10};
-EOD
-
-$stipples['checker2'] = Tk::BLT::Bitmap.new(<<EOD)
-#define checker2_width 8
-#define checker2_height 8
-static unsigned char checker2_bits[] = {
-   0x33, 0x33, 0xcc, 0xcc, 0x33, 0x33, 0xcc, 0xcc};
-EOD
-
-
-$stipples['checker3'] = Tk::BLT::Bitmap.new(<<EOD)
-#define checker3_width 8
-#define checker3_height 8
-static unsigned char checker3_bits[] = {
-   0x0f, 0x0f, 0x0f, 0x0f, 0xf0, 0xf0, 0xf0, 0xf0};
-EOD
-
-$stipples['cross1'] = Tk::BLT::Bitmap.new(<<EOD)
-#define cross1_width 8
-#define cross1_height 8
-static unsigned char cross_bits[] = {
-   0xff, 0xaa, 0xff, 0xaa, 0xff, 0xaa, 0xff, 0xaa};
-EOD
-
-$stipples['cross2'] = Tk::BLT::Bitmap.new(<<EOD)
-#define cross2_width 8
-#define cross2_height 8
-static unsigned char cross2_bits[] = {
-   0xff, 0x88, 0x88, 0x88, 0xff, 0x88, 0x88, 0x88};
-EOD
-
-$stipples['cross3'] = Tk::BLT::Bitmap.new(<<EOD)
-#define cross3_width 8
-#define cross3_height 8
-static unsigned char cross3_bits[] = {
-   0xff, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01};
-EOD
-
-$stipples['crossdiag'] = Tk::BLT::Bitmap.new(<<EOD)
-#define crossdiag_width 8
-#define crossdiag_height 8
-static unsigned char crossdiag2_bits[] = {
-   0x18, 0x24, 0x42, 0x81, 0x81, 0x42, 0x24, 0x18};
-EOD
-
-$stipples['dot1'] = Tk::BLT::Bitmap.new(<<EOD)
-#define dot1_width 8
-#define dot1_height 8
-static unsigned char dot1_bits[] = {
-   0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa};
-EOD
-
-$stipples['dot2'] = Tk::BLT::Bitmap.new(<<EOD)
-#define dot2_width 8
-#define dot2_height 8
-static unsigned char dot2_bits[] = {
-   0x55, 0x00, 0x55, 0x00, 0x55, 0x00, 0x55, 0x00};
-EOD
-
-$stipples['dot3'] = Tk::BLT::Bitmap.new(<<EOD)
-#define dot3_width 8
-#define dot3_height 8
-static unsigned char dot3_bits[] = {
-   0x11, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00};
-EOD
-
-$stipples['dot4'] = Tk::BLT::Bitmap.new(<<EOD)
-#define dot4_width 8
-#define dot4_height 8
-static unsigned char dot4_bits[] = {
-   0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-EOD
-
-$stipples['fdiagonal1'] = Tk::BLT::Bitmap.new(<<EOD)
-#define fdiagonal1_width 8
-#define fdiagonal1_height 8
-static unsigned char fdiagonal1_bits[] = {
-   0x11, 0x22, 0x44, 0x88, 0x11, 0x22, 0x44, 0x88};
-EOD
-
-$stipples['fdiagonal2'] = Tk::BLT::Bitmap.new(<<EOD)
-#define fdiagonal2_width 8
-#define fdiagonal2_height 8
-static unsigned char fdiagonal2_bits[] = {
-   0x10, 0x20, 0x40, 0x80, 0x01, 0x02, 0x04, 0x08};
-EOD
-
-$stipples['hline1'] = Tk::BLT::Bitmap.new(<<EOD)
-#define hline1_width 8
-#define hline1_height 8
-static unsigned char hline1_bits[] = {
-   0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00};
-EOD
-
-$stipples['hline2'] = Tk::BLT::Bitmap.new(<<EOD)
-#define hline2_width 8
-#define hline2_height 8
-static unsigned char hline2_bits[] = {
-   0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00};
-EOD
-
-$stipples['lbottom'] = Tk::BLT::Bitmap.new(<<EOD)
-#define lbottom_width 8
-#define lbottom_height 8
-static unsigned char lbottom_bits[] = {
-   0x00, 0x11, 0x11, 0x77, 0x00, 0x11, 0x11, 0x77};
-EOD
-
-$stipples['ltop'] = Tk::BLT::Bitmap.new(<<EOD)
-#define ltop_width 8
-#define ltop_height 8
-static unsigned char ltop_bits[] = {
-   0xee, 0x88, 0x88, 0x00, 0xee, 0x88, 0x88, 0x00};
-EOD
-
-$stipples['rbottom'] = Tk::BLT::Bitmap.new(<<EOD)
-#define rbottom_width 8
-#define rbottom_height 8
-static unsigned char rbottom_bits[] = {
-   0x00, 0x88, 0x88, 0xee, 0x00, 0x88, 0x88, 0xee};
-EOD
-
-$stipples['rtop'] = Tk::BLT::Bitmap.new(<<EOD)
-#define rtop_width 8
-#define rtop_height 8
-static unsigned char rtop_bits[] = {
-   0x77, 0x11, 0x11, 0x00, 0x77, 0x11, 0x11, 0x00};
-EOD
-
-$stipples['vline1'] = Tk::BLT::Bitmap.new(<<EOD)
-#define vline1_width 8
-#define vline1_height 8
-static unsigned char vline1_bits[] = {
-   0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55};
-EOD
-
-$stipples['vline2'] = Tk::BLT::Bitmap.new(<<EOD)
-#define vline2_width 8
-#define vline2_height 8
-static unsigned char vline2_bits[] = {
-   0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33};
-EOD
diff --git a/ext/tk/sample/tkextlib/blt/winop1.rb b/ext/tk/sample/tkextlib/blt/winop1.rb
deleted file mode 100644
index 32c01cad6b..0000000000
--- a/ext/tk/sample/tkextlib/blt/winop1.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/blt'
-
-file = File.join(File.dirname(File.expand_path(__FILE__)),
-                 'images', 'sample.gif')
-if File.exist?(file)
-  src = TkPhotoImage.new(:file=>file)
-else
-  fail RuntimeError, 'no image file'
-end
-
-width = src.width
-height = src.height
-
-TkOption.add('*Label.font', '*helvetica*10*')
-TkOption.add('*Label.background', 'white')
-
-l_img0 = TkLabel.new(:image=>src)
-l_hdr0 = TkLabel.new(:text=>"#{width} x #{height}")
-l_ftr0 = TkLabel.new(:text=>'100%')
-Tk.root.background('white')
-
-(2..10).each{|i|
-  iw = width/i
-  ih = height/i
-  r = '%6g'%(100.0/i)
-  dst = TkPhotoImage.new(:width=>iw, :height=>ih)
-  Tk::BLT::Winop.image_resample(src, dst, :sinc)
-  l_hdr = TkLabel.new(:text=>"#{iw} x #{ih}")
-  l_ftr = TkLabel.new(:text=>"#{r}%")
-  l_img = TkLabel.new(:image=>dst)
-  Tk::BLT::Table.add(Tk.root,
-                     [0,i], l_hdr,
-                     [1,i], l_img,
-                     [2,i], l_ftr)
-  Tk.update
-}
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/blt/winop2.rb b/ext/tk/sample/tkextlib/blt/winop2.rb
deleted file mode 100644
index cc708573ab..0000000000
--- a/ext/tk/sample/tkextlib/blt/winop2.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/blt'
-
-file = File.join(File.dirname(File.expand_path(__FILE__)),
-                 'images', 'qv100.t.gif')
-if File.exist?(file)
-  src = TkPhotoImage.new(:file=>file)
-else
-  fail RuntimeError, 'no image file'
-end
-
-width = src.width
-height = src.height
-
-TkOption.add('*Label.font', '*helvetica*10*')
-TkOption.add('*Label.background', 'white')
-
-[0, 90, 180, 270, 360, 45].each_with_index{|r, i|
-  dest = TkPhotoImage.new
-  Tk::BLT::Winop.image_rotate(src, dest, r)
-  l_txt = TkLabel.new(:text=>"#{r} degrees")
-  l_img = TkLabel.new(:image=>dest)
-  Tk::BLT::Table.add(Tk.root, [0,i], l_img, [1,i], l_txt)
-  Tk.update
-}
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/bwidget/Orig_LICENSE.txt b/ext/tk/sample/tkextlib/bwidget/Orig_LICENSE.txt
deleted file mode 100644
index 16ddca4e3c..0000000000
--- a/ext/tk/sample/tkextlib/bwidget/Orig_LICENSE.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-
-  ######################################################################
-  ###  The following text is the original 'LICENSE.txt' of BWidget   ###
-  ###  extension.                                                    ###
-  ###  Original Tcl source files are not include in this directory,  ###
-  ###  because of all of them are rewritten to Ruby files.           ###
-  ###  However, the bitmap data files ('bwidgtet.xbm' and 'x1.xbm')  ###
-  ###  included in this directory are quoted from BWidget source     ###
-  ###  archive. So, those bitmaps are under the following license.   ###
-  ######################################################################
-
-
-BWidget ToolKit
-Copyright (c) 1998-1999 UNIFIX.
-Copyright (c) 2001-2002 ActiveState Corp.
-
-The following terms apply to all files associated with the software
-unless explicitly disclaimed in individual files.
-
-The authors hereby grant permission to use, copy, modify, distribute,
-and license this software and its documentation for any purpose, provided
-that existing copyright notices are retained in all copies and that this
-notice is included verbatim in any distributions. No written agreement,
-license, or royalty fee is required for any of the authorized uses.
-Modifications to this software may be copyrighted by their authors
-and need not follow the licensing terms described here, provided that
-the new terms are clearly indicated on the first page of each file where
-they apply.
-
-IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
-FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
-DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
-IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
-NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
-MODIFICATIONS.
-
-GOVERNMENT USE: If you are acquiring this software on behalf of the
-U.S. government, the Government shall have only "Restricted Rights"
-in the software and related documentation as defined in the Federal
-Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
-are acquiring the software on behalf of the Department of Defense, the
-software shall be classified as "Commercial Computer Software" and the
-Government shall have only "Restricted Rights" as defined in Clause
-252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
-authors grant the U.S. Government and others acting in its behalf
-permission to use and distribute the software in accordance with the
-terms specified in this license.
diff --git a/ext/tk/sample/tkextlib/bwidget/basic.rb b/ext/tk/sample/tkextlib/bwidget/basic.rb
deleted file mode 100644
index 11122ac941..0000000000
--- a/ext/tk/sample/tkextlib/bwidget/basic.rb
+++ /dev/null
@@ -1,199 +0,0 @@
-# frozen_string_literal: false
-#
-#  basic demo  ---  called from demo.rb
-#
-unless Object.const_defined?('DemoVar')
-  fail RuntimeError, "This is NOT a stand alone script. This script is called from 'demo.rb'. "
-end
-
-module DemoBasic
-  @@var   = TkVariable.new_hash
-  @@after = nil
-  @@count = 0
-
-  def self.create(nb)
-    frame = nb.insert('end', 'demoBasic', :text=>'Basic')
-    topf  = TkFrame.new(frame)
-
-    titf1 = Tk::BWidget::TitleFrame.new(topf, :text=>'Label')
-    titf2 = Tk::BWidget::TitleFrame.new(topf, :text=>'Entry')
-
-    titf3 = Tk::BWidget::TitleFrame.new(frame, :text=>'Button and ArrowButton')
-
-    _label(titf1.get_frame)
-    _entry(titf2.get_frame)
-    _button(titf3.get_frame)
-
-    Tk.pack(titf1, titf2, :side=>:left, :fill=>:both, :padx=>4, :expand=>true)
-    topf.pack(:pady=>2, :fill=>:x)
-    titf3.pack(:pady=>2, :padx=>4, :fill=>:x)
-  end
-
-  def self._label(parent)
-    lab = Tk::BWidget::Label.new(parent, :text=>'This is a Label widget',
-                                 :helptext=>'Label widget')
-    chk = TkCheckbutton.new(parent, :text=>'Disabled',
-                            :variable=>@@var.ref(lab, 'state'),
-                            :onvalue=>'disabled', :offvalue=>'normal',
-                            :command=>proc{lab[:state] = @@var[lab, 'state']})
-    lab.pack(:anchor=>:w, :pady=>4)
-    chk.pack(:anchor=>:w)
-  end
-
-  def self._entry(parent)
-    ent = Tk::BWidget::Entry.new(parent, :text=>'Press enter',
-                                 :helptext=>'Entry widget',
-                                 :command=>proc{
-                                   @@var['entcmd'] = 'command called'
-                                   Tk.after(500, proc{@@var['entcmd'] = ''})
-                                 })
-
-    chk1 = TkCheckbutton.new(parent, :text=>'Disabled',
-                             :variable=>@@var.ref(ent, 'state'),
-                             :onvalue=>'disabled', :offvalue=>'normal',
-                             :command=>proc{ent.state = @@var[ent, 'state']})
-
-    chk2 = TkCheckbutton.new(parent, :text=>'Non editable',
-                             :variable=>@@var.ref(ent, 'editable'),
-                             :onvalue=>false, :offvalue=>true,
-                             :command=>proc{
-                               ent.editable = @@var[ent, 'editable']
-                             })
-
-    lab = TkLabel.new(parent, :textvariable=>@@var.ref('entcmd'),
-                      :foreground=>'red')
-
-    ent.pack(:pady=>4, :anchor=>:w)
-    Tk.pack(chk1, chk2, :anchor=>:w)
-    lab.pack(:pady=>4)
-  end
-
-  def self._button(parent)
-    frame = TkFrame.new(parent)
-    but  = Tk::BWidget::Button.new(frame, :text=>'Press me!',
-                                   :repeatdelay=>300,
-                                   :command=>proc{_butcmd('command')},
-                                   :helptext=>'This is a Button widget')
-
-    sep1 = Tk::BWidget::Separator.new(frame, :orient=>:vertical)
-    arr1 = Tk::BWidget::ArrowButton.new(frame, :type=>:button,
-                :width=>25, :height=>25, :repeatdelay=>300,
-                :command=>proc{_butcmd('command')},
-                :helptext=>"This is an ArrowButton widget\nof type button")
-
-    sep2 = Tk::BWidget::Separator.new(frame, :orient=>:vertical)
-    arr2 = Tk::BWidget::ArrowButton.new(frame, :type=>:arrow,
-                :width=>25, :height=>25, :relief=>:sunken,
-                :ipadx=>0, :ipady=>0, :repeatdelay=>300,
-                :command=>proc{_butcmd('command')},
-                :helptext=>"This is an ArrowButton widget\nof type arrow")
-
-    but.pack(:side=>:left, :padx=>4)
-    sep1.pack(:side=>:left, :padx=>4, :fill=>:y)
-    arr1.pack(:side=>:left, :padx=>4)
-    sep2.pack(:side=>:left, :padx=>4, :fill=>:y)
-    arr2.pack(:side=>:left, :padx=>4)
-    frame.pack
-
-    Tk::BWidget::Separator.new(parent,
-                               :orient=>:horizontal).pack(:fill=>:x, :pady=>10)
-
-    labf1 = Tk::BWidget::LabelFrame.new(parent, :text=>'Command',
-                                        :side=>:top, :anchor=>:w,
-                                        :relief=>:sunken, :borderwidth=>1)
-    subf = labf1.get_frame
-    chk1 = TkCheckbutton.new(subf, :text=>'Disabled',
-                             :variable=>@@var.ref('bstate'),
-                             :onvalue=>'disabled', :offvalue=>'normal',
-                             :command=>proc{_bstate(@@var['bstate'],
-                                                     but, arr1, arr2)})
-    chk2 = TkCheckbutton.new(subf, :text=>"Use armcommand/\ndisarmcommand",
-                             :variable=>@@var.ref('barmcmd'),
-                             :command=>proc{_barmcmd(@@var['barmcmd'],
-                                                     but, arr1, arr2)})
-    Tk.pack(chk1, chk2, :anchor=>:w)
-
-    label = TkLabel.new(parent, :textvariable=>@@var.ref('butcmd'),
-                        :foreground=>'red').pack(:side=>:bottom, :pady=>4)
-
-    labf2 = Tk::BWidget::LabelFrame.new(parent, :text=>'Direction',
-                                        :side=>:top, :anchor=>:w,
-                                        :relief=>:sunken, :borderwidth=>1)
-    subf = labf2.get_frame
-    @@var['bside'] = :top
-    [:top, :left, :bottom, :right].each{|dir|
-      TkRadiobutton.new(subf, :text=>"#{dir} arrow",
-                        :variable=>@@var.ref('bside'), :value=>dir,
-                        :command=>proc{_bside(@@var['bside'], arr1, arr2)}
-                        ).pack(:anchor=>:w)
-    }
-
-    labf3 = Tk::BWidget::LabelFrame.new(parent, :text=>'Relief',
-                                        :side=>:top, :anchor=>:w,
-                                        :relief=>:sunken, :borderwidth=>1)
-    subf = labf3.get_frame
-    @@var['brelief'] = :raised
-    [ %w(raised sunken ridge groove), %w(flat solid link)].each{|lrelief|
-      f = TkFrame.new(subf)
-      lrelief.each{|relief|
-        TkRadiobutton.new(f, :text=>relief,
-                          :variable=>@@var.ref('brelief'), :value=>relief,
-                          :command=>proc{
-                            _brelief(@@var['brelief'], but, arr1, arr2)
-                          }).pack(:anchor=>:w)
-      }
-      f.pack(:side=>:left, :padx=>2, :anchor=>:n)
-    }
-    Tk.pack(labf1, labf2, labf3, :side=>:left, :fill=>:y, :padx=>4)
-  end
-
-  def self._bstate(state, but, arr1, arr2)
-    [but, arr1, arr2].each{|b| b[:state] = state}
-  end
-
-  def self._brelief(relief, but, arr1, arr2)
-    but[:relief] = relief
-    if relief.to_s != 'link'
-      [arr1, arr2].each{|arr| arr[:relief] = relief}
-    end
-  end
-
-  def self._bside(side, *args)
-    args.each{|arr| arr[:dir] = side}
-  end
-
-  def self._barmcmd(value, but, arr1, arr2)
-    if TkComm.bool(value)
-      but.configure(:armcommand=>proc{_butcmd('arm')},
-                    :disarmcommand=>proc{_butcmd('disarm')},
-                    :command=>'')
-      [arr1, arr2].each{|arr|
-        arr.configure(:armcommand=>proc{_butcmd('arm')},
-                      :disarmcommand=>proc{_butcmd('disarm')},
-                      :command=>'')
-      }
-    else
-      but.configure(:armcommand=>'', :disarmcommand=>'',
-                    :command=>proc{_butcmd('command')})
-      [arr1, arr2].each{|arr|
-        arr.configure(:armcommand=>'', :disarmcommand=>'',
-                      :command=>proc{_butcmd('command')})
-      }
-    end
-  end
-
-  def self._butcmd(reason)
-    unless @@after
-      @@after = TkTimer.new(500, 1, proc{@@var['butcmd'] = ''})
-    end
-    @@after.stop
-    if (reason == 'arm')
-      @@count += 1
-      @@var['butcmd'] = "#{reason} command called (#{@@count})"
-    else
-      @@count = 0
-      @@var['butcmd'] = "#{reason} command called"
-    end
-    @@after.start
-  end
-end
diff --git a/ext/tk/sample/tkextlib/bwidget/bwidget.xbm b/ext/tk/sample/tkextlib/bwidget/bwidget.xbm
deleted file mode 100644
index 5451ebb9c0..0000000000
--- a/ext/tk/sample/tkextlib/bwidget/bwidget.xbm
+++ /dev/null
@@ -1,46 +0,0 @@
-#define bwidget_width 76
-#define bwidget_height 64
-static char bwidget_bits[] = {
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xf0,0x00,0xb6,0x6d,0xdb,0x16,0x00,0x00,0x00,0x00,0xf0,
- 0x00,0xdb,0xb6,0x6d,0xab,0x00,0x00,0x00,0x00,0xf0,0x00,0x55,0x55,0x55,0x75,
- 0x01,0x00,0x00,0x00,0xf0,0x00,0x6d,0xdb,0xb6,0xad,0x02,0x00,0x00,0x00,0xf0,
- 0x00,0xb6,0x6d,0xdb,0xb6,0x05,0x00,0x00,0x00,0xf0,0x00,0x55,0x55,0x55,0x55,
- 0x05,0x00,0x00,0x00,0xf0,0x00,0xda,0xb6,0xad,0x6d,0x0b,0x00,0x00,0x00,0xf0,
- 0x00,0x6b,0x03,0xc0,0xb6,0x05,0x00,0x00,0x00,0xf0,0x00,0x56,0x05,0x00,0x55,
- 0x0d,0x00,0x00,0x00,0xf0,0x00,0xbb,0x05,0x80,0xdb,0x06,0x00,0x00,0x00,0xf0,
- 0x00,0xca,0x06,0x00,0x6c,0x0b,0x00,0x00,0x00,0xf0,0x00,0xb6,0x02,0x00,0xaa,
- 0x0a,0x00,0x00,0x00,0xf0,0x00,0xab,0x05,0x00,0x6c,0x0b,0x00,0x00,0x00,0xf0,
- 0x00,0xdd,0x06,0x00,0xb6,0x05,0x00,0x00,0x00,0xf0,0x00,0xaa,0x02,0x00,0x55,
- 0x05,0x00,0x00,0x00,0xf0,0x00,0xb7,0x05,0xc0,0xda,0x02,0x00,0x00,0x00,0xf0,
- 0x00,0xd9,0x06,0x50,0x6b,0x01,0x00,0x00,0x00,0xf0,0x00,0x56,0xb5,0xad,0xad,
- 0x00,0x00,0x00,0x00,0xf0,0x00,0xdb,0xd6,0x76,0x15,0x00,0x00,0x00,0x00,0xf0,
- 0x00,0x6a,0xab,0xaa,0x2d,0x00,0x00,0x00,0x00,0xf0,0x00,0x56,0x75,0xad,0xb6,
- 0x02,0x00,0x00,0x00,0xf0,0x00,0xbb,0xad,0xd6,0xaa,0x05,0x00,0x00,0x00,0xf0,
- 0x00,0xca,0xb6,0x6b,0xdb,0x2a,0x00,0x00,0x00,0xf0,0x00,0x77,0xd5,0x5c,0x6d,
- 0x2d,0x00,0x00,0x00,0xf0,0x00,0x99,0x05,0x00,0xaa,0x56,0x00,0x00,0x00,0xf0,
- 0x00,0xee,0x06,0x00,0x6c,0xbb,0x00,0x00,0x00,0xf0,0x00,0xaa,0x02,0x00,0xb0,
- 0x55,0x00,0x00,0x00,0xf0,0x00,0x55,0x05,0x00,0xa8,0xd6,0x00,0x00,0x00,0xf0,
- 0x00,0xee,0x06,0x00,0xd0,0x6a,0x00,0x00,0x00,0xf0,0x00,0x55,0x03,0x00,0x68,
- 0xb7,0xfc,0x00,0x7e,0xf0,0x00,0x6d,0x05,0x00,0xa8,0xaa,0xfc,0x80,0x7e,0xf0,
- 0x00,0xb6,0x05,0x00,0x50,0xbb,0xfe,0x01,0x7e,0xf0,0x00,0x55,0x05,0x00,0x78,
- 0xad,0xfe,0x81,0x1f,0xf0,0x00,0xb6,0x05,0x00,0xa4,0xb5,0xfe,0x81,0x1f,0xf0,
- 0x00,0x5b,0x05,0x80,0xba,0x56,0xfe,0x83,0x1f,0xf0,0x00,0xaa,0x6b,0x5b,0xd5,
- 0x5a,0xff,0x85,0x1f,0xf0,0x00,0xdb,0x5a,0xad,0x57,0x2b,0xff,0xc7,0x0f,0xf0,
- 0x00,0x6d,0xad,0xd5,0x6a,0x0d,0xff,0xc7,0x0f,0xf0,0x00,0xaa,0xd6,0xb6,0xba,
- 0x05,0xdf,0xc7,0x0f,0xf0,0x00,0xb7,0xb5,0x5a,0xab,0x8a,0xdf,0xcf,0x0f,0xf0,
- 0x00,0xd9,0x5a,0xab,0x6d,0x8f,0xcf,0xef,0x07,0xf0,0x00,0x56,0xad,0x75,0xb5,
- 0xaf,0x8f,0xef,0x07,0xf0,0x00,0xb5,0xeb,0x5a,0x00,0x9f,0xcf,0xef,0x07,0xf0,
- 0x00,0x00,0x00,0x00,0x00,0xff,0x8f,0xff,0x07,0xf0,0x00,0x00,0x00,0x00,0x00,
- 0xfe,0x87,0xff,0x03,0xf0,0x00,0x00,0x00,0x00,0x00,0xff,0x03,0xff,0x03,0xf0,
- 0x00,0x00,0x00,0x00,0x00,0xfe,0x03,0xff,0x03,0xf0,0x00,0x00,0x00,0x00,0x00,
- 0xfe,0x03,0xff,0x01,0xf0,0x00,0x00,0x00,0x00,0x00,0xfc,0x01,0xff,0x03,0xf0,
- 0x00,0x00,0x00,0x00,0x00,0xfe,0x01,0xfe,0x01,0xf0,0x00,0x00,0x00,0x00,0x00,
- 0xfc,0x01,0xfe,0x01,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0};
diff --git a/ext/tk/sample/tkextlib/bwidget/demo.rb b/ext/tk/sample/tkextlib/bwidget/demo.rb
deleted file mode 100644
index 5fe54eebbd..0000000000
--- a/ext/tk/sample/tkextlib/bwidget/demo.rb
+++ /dev/null
@@ -1,244 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/bwidget'
-
-module DemoVar
-  @_wfont    = nil
-  @notebook  = nil
-  @mainframe = nil
-  @status    = TkVariable.new
-  @prgtext   = TkVariable.new
-  @prgindic  = TkVariable.new
-  @font      = nil
-  @font_name = nil
-  @toolbar1  = TkVariable.new(true)
-  @toolbar2  = TkVariable.new(true)
-end
-class << DemoVar
-  attr_accessor :_wfont, :notebook, :mainframe, :font, :font_name
-  attr_reader   :status, :prgtext, :prgindic, :toolbar1, :toolbar2
-end
-
-class BWidget_Demo
-  DEMODIR = File.dirname(File.expand_path(__FILE__))
-
-  %w(manager basic select dnd tree tmpldlg).each{|f|
-    require File.join(DEMODIR, f << '.rb')
-  }
-
-  def initialize
-    TkOption.add('*TitleFrame.l.font', 'helvetica 11 bold italic')
-
-    root = TkRoot.new(:title=>'BWidget demo')
-    root.withdraw
-
-    _create
-
-    Tk::BWidget.place(root, 0, 0, :center)
-    root.deiconify
-    root.raise
-    root.focus(true)
-
-    root.geometry(root.geometry)
-  end
-
-  def _create
-    DemoVar.prgtext.value = 'Please wait while loading font...'
-    DemoVar.prgindic.value = -1
-
-    intro = _create_intro
-
-    Tk.update
-
-    Tk::BWidget::SelectFont.load_font
-
-    descmenu = [
-      '&File', 'all', 'file', 0, [
-        ['command', 'E&xit', [], 'Exit BWidget demo', [],
-          {:command=>proc{exit}}]
-      ],
-      '&Options', 'all', 'options', 0, [
-        ['checkbutton', 'Toolbar &1', ['all', 'option'],
-          'Show/hide toolbar 1', [],
-          { :variable=>DemoVar.toolbar1,
-            :command=>proc{
-              DemoVar.mainframe.show_toolbar(0, DemoVar.toolbar1.value)
-            }
-          }
-        ],
-        ['checkbutton', 'Toolbar &2', ['all', 'option'],
-          'Show/hide toolbar 2', [],
-          { :variable=>DemoVar.toolbar2,
-            :command=>proc{
-              DemoVar.mainframe.show_toolbar(1, DemoVar.toolbar2.value)
-            }
-          }
-        ]
-      ]
-    ]
-
-    DemoVar.prgtext.value = 'Creating MainFrame...'
-    DemoVar.prgindic.value = 0
-
-    DemoVar.mainframe = Tk::BWidget::MainFrame.new(
-                                :menu=>descmenu,
-                                :textvariable=>DemoVar.status,
-                                :progressvar=>DemoVar.prgindic
-                        )
-
-    # toolbar 1 creation
-    DemoVar.prgindic.numeric += 1
-
-    DemoVar.mainframe.add_toolbar{|tb1|
-      Tk::BWidget::ButtonBox.new(tb1, :spacing=>0, :padx=>1, :pady=>1){|bbox|
-        add(:image=>Tk::BWidget::Bitmap.new('new'),
-            :highlightthickness=>0, :takefocus=>0, :relief=>:link,
-            :borderwidth=>1, :padx=>1, :pady=>1,
-            :command=>proc{puts 'select "Create a new file" icon'},
-            :helptext=>"Create a new file")
-
-        add(:image=>Tk::BWidget::Bitmap.new('open'),
-            :highlightthickness=>0, :takefocus=>0, :relief=>:link,
-            :borderwidth=>1, :padx=>1, :pady=>1,
-            :command=>proc{puts 'select "Open an existing file" icon'},
-            :helptext=>"Open an existing file")
-
-        add(:image=>Tk::BWidget::Bitmap.new('save'),
-            :highlightthickness=>0, :takefocus=>0, :relief=>:link,
-            :borderwidth=>1, :padx=>1, :pady=>1,
-            :command=>proc{puts 'select "Save file" icon'},
-            :helptext=>"Save file")
-
-        pack(:side=>:left, :anchor=>:w)
-      }
-
-      Tk::BWidget::Separator.new(tb1, :orient=>:vertical){
-        pack(:side=>:left, :fill=>:y, :padx=>4, :anchor=>:w)
-      }
-
-      DemoVar.prgindic.numeric += 1
-
-      Tk::BWidget::ButtonBox.new(tb1, :spacing=>0, :padx=>1, :pady=>1){|bbox|
-        add(:image=>Tk::BWidget::Bitmap.new('cut'),
-            :highlightthickness=>0, :takefocus=>0, :relief=>:link,
-            :borderwidth=>1, :padx=>1, :pady=>1,
-            :command=>proc{puts 'select "Cut selection" icon'},
-            :helptext=>"Cut selection")
-
-        add(:image=>Tk::BWidget::Bitmap.new('copy'),
-            :highlightthickness=>0, :takefocus=>0, :relief=>:link,
-            :borderwidth=>1, :padx=>1, :pady=>1,
-            :command=>proc{puts 'select "Copy selection" icon'},
-            :helptext=>"Copy selection")
-
-        add(:image=>Tk::BWidget::Bitmap.new('paste'),
-            :highlightthickness=>0, :takefocus=>0, :relief=>:link,
-            :borderwidth=>1, :padx=>1, :pady=>1,
-            :command=>proc{puts 'select "Paste selection" icon'},
-            :helptext=>"Paste selection")
-
-        pack(:side=>:left, :anchor=>:w)
-      }
-    }
-
-    # toolbar 2 creation
-    DemoVar.prgindic.numeric += 1
-
-    tb2 = DemoVar.mainframe.add_toolbar
-    DemoVar._wfont = Tk::BWidget::SelectFont::Toolbar.new(tb2,
-                       :command=>proc{update_font(DemoVar._wfont[:font])}
-                     )
-    DemoVar.font = DemoVar._wfont[:font]
-    DemoVar._wfont.pack(:side=>:left, :anchor=>:w)
-
-    DemoVar.mainframe.add_indicator(
-      :text=>"BWidget #{Tk::BWidget.package_version}"
-    )
-    DemoVar.mainframe.add_indicator(:textvariable=>'tk_patchLevel')
-
-    # NoteBook creation
-    DemoVar.notebook = Tk::BWidget::NoteBook.new(DemoVar.mainframe.get_frame)
-
-    DemoVar.prgtext.value = "Creating Manager..."
-    DemoVar.prgindic.numeric += 1
-    DemoManager.create(DemoVar.notebook)
-
-    DemoVar.prgtext.value = "Creating Basic..."
-    DemoVar.prgindic.numeric += 1
-    DemoBasic.create(DemoVar.notebook)
-
-    DemoVar.prgtext.value = "Creating Select..."
-    DemoVar.prgindic.numeric += 1
-    DemoSelect.create(DemoVar.notebook)
-
-    DemoVar.prgtext.value = "Creating Dialog..."
-    DemoVar.prgindic.numeric += 1
-    DemoDialog.create(DemoVar.notebook)
-
-    DemoVar.prgtext.value = "Creating Drag and Drop..."
-    DemoVar.prgindic.numeric += 1
-    DemoDnD.create(DemoVar.notebook)
-
-    DemoVar.prgtext.value = "Creating Tree..."
-    DemoVar.prgindic.numeric += 1
-    DemoTree.create(DemoVar.notebook)
-
-    DemoVar.prgtext.value = "Done"
-    DemoVar.prgindic.numeric += 1
-
-    DemoVar.notebook.compute_size
-    DemoVar.notebook.pack(:fill=>:both, :expand=>true, :padx=>4, :pady=>4)
-    DemoVar.notebook.raise(DemoVar.notebook.get_page(0))
-
-    DemoVar.mainframe.pack(:fill=>:both, :expand=>true)
-
-    Tk.update_idletasks
-
-    intro.destroy
-  end
-
-  def update_font(newfont)
-    root = Tk.root
-    root[:cursor] = 'watch'
-    if newfont != '' && DemoVar.font != newfont
-      DemoVar._wfont[:font] = newfont
-      DemoVar.notebook[:font] = newfont
-      DemoVar.font = newfont
-    end
-    root[:cursor] = ''
-  end
-
-  def _create_intro
-    top = TkToplevel.new(:relief=>:raised, :borderwidth=>2)
-    top.withdraw
-    top.overrideredirect(true)
-
-    ximg  = TkLabel.new(top, :bitmap=>"@#{File.join(DEMODIR,'x1.xbm')}",
-                        :foreground=>'grey90', :background=>'white')
-    bwimg = TkLabel.new(ximg, :bitmap=>"@#{File.join(DEMODIR,'bwidget.xbm')}",
-                        :foreground=>'grey90', :background=>'white')
-    frame = TkFrame.new(ximg, :background=>'white')
-    TkLabel.new(frame, :text=>'Loading demo',
-                :background=>'white', :font=>'times 8').pack
-    TkLabel.new(frame, :textvariable=>DemoVar.prgtext,
-                :background=>'white', :font=>'times 8', :width=>35).pack
-    Tk::BWidget::ProgressBar.new(frame, :width=>50, :height=>10,
-                                 :background=>'white',
-                                 :variable=>DemoVar.prgindic,
-                                 :maximum=>10).pack
-    frame.place(:x=>0, :y=>0, :anchor=>:nw)
-    bwimg.place(:relx=>1, :rely=>1, :anchor=>:se)
-    ximg.pack
-    Tk::BWidget.place(top, 0, 0, :center)
-    top.deiconify
-
-    top
-  end
-end
-
-module DemoVar
-  Demo = BWidget_Demo.new
-end
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/bwidget/dnd.rb b/ext/tk/sample/tkextlib/bwidget/dnd.rb
deleted file mode 100644
index 326288bade..0000000000
--- a/ext/tk/sample/tkextlib/bwidget/dnd.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-# frozen_string_literal: false
-#
-#  dnd demo  ---  called from demo.rb
-#
-unless Object.const_defined?('DemoVar')
-  fail RuntimeError, "This is NOT a stand alone script. This script is called from 'demo.rb'. "
-end
-
-module DemoDnD
-  def self.create(nb)
-    frame = nb.insert('end', 'demoDnD', :text=>'Drag and Drop')
-
-    titf1 = Tk::BWidget::TitleFrame.new(frame, :text=>'Drag source')
-    subf = titf1.get_frame
-
-    ent1 = Tk::BWidget::LabelEntry.new(subf, :label=>'Entry',
-                                       :labelwidth=>14, :dragenabled=>true,
-                                       :dragevent=>3)
-    labf1 = Tk::BWidget::LabelFrame.new(subf, :text=>'Label (text)',
-                                        :width=>14)
-    f = labf1.get_frame
-    lab = Tk::BWidget::Label.new(f, :text=>'Drag this text',
-                                 :dragenabled=>true, :dragevent=>3).pack
-
-    labf2 = Tk::BWidget::LabelFrame.new(subf, :text=>'Label (bitmap)',
-                                        :width=>14)
-    f = labf2.get_frame
-    lab = Tk::BWidget::Label.new(f, :bitmap=>'info',
-                                 :dragenabled=>true, :dragevent=>3).pack
-
-    Tk.pack(ent1, labf1, labf2, :side=>:top, :fill=>:x, :pady=>4)
-
-    titf2 = Tk::BWidget::TitleFrame.new(frame, :text=>'Drop targets')
-    subf = titf2.get_frame
-
-    ent1 = Tk::BWidget::LabelEntry.new(subf, :label=>'Entry',
-                                       :labelwidth=>14, :dropenabled=>true)
-    labf1 = Tk::BWidget::LabelFrame.new(subf, :text=>'Label', :width=>14)
-    f = labf1.get_frame
-    lab = Tk::BWidget::Label.new(f, :dropenabled=>true,
-                                 :highlightthickness=>1).pack(:fill=>:x)
-    Tk.pack(ent1, labf1, :side=>:top, :fill=>:x, :pady=>4)
-    Tk.pack(titf1, titf2, :pady=>4)
-
-    frame
-  end
-end
diff --git a/ext/tk/sample/tkextlib/bwidget/manager.rb b/ext/tk/sample/tkextlib/bwidget/manager.rb
deleted file mode 100644
index caa2fbef7a..0000000000
--- a/ext/tk/sample/tkextlib/bwidget/manager.rb
+++ /dev/null
@@ -1,151 +0,0 @@
-# frozen_string_literal: false
-#
-#  manager demo  ---  called from demo.rb
-#
-unless Object.const_defined?('DemoVar')
-  fail RuntimeError, "This is NOT a stand alone script. This script is called from 'demo.rb'. "
-end
-
-module DemoManager
-  @@progress    = TkVariable.new(false)
-  @@status      = TkVariable.new('Compute in progress...')
-  @@homogeneous = TkVariable.new(false)
-  @@constw      = TkVariable.new
-  @@afterobj    = nil
-
-  def self.create(nb)
-    frame = nb.insert('end', 'demoManager', :text=>'Manager')
-
-    topf = TkFrame.new(frame)
-    titf1 = Tk::BWidget::TitleFrame.new(topf, :text=>"MainFrame")
-    titf2 = Tk::BWidget::TitleFrame.new(topf, :text=>"NoteBook")
-    titf3 = Tk::BWidget::TitleFrame.new(frame, :text=>"Paned & ScrolledWindow")
-
-    _mainframe(titf1.get_frame)
-    _notebook(titf2.get_frame)
-    _paned(titf3.get_frame)
-
-    Tk.pack(titf1, titf2, :padx=>4, :side=>:left, :fill=>:both, :expand=>true)
-    Tk.pack(topf, :fill=>:x, :pady=>2)
-    Tk.pack(titf3, :pady=>2, :padx=>4, :fill=>:both, :expand=>true)
-
-    frame
-  end
-
-  def self._mainframe(parent)
-    labf1 = Tk::BWidget::LabelFrame.new(parent, :text=>'Toolbar',
-                                        :side=>:top, :anchor=>:w,
-                                        :relief=>:sunken, :borderwidth=>2)
-    subf = labf1.get_frame
-    chk1 = TkCheckbutton.new(subf, :text=>'View toolbar 1',
-                             :variable=>DemoVar.toolbar1,
-                             :command=>proc{
-                               DemoVar.mainframe.show_toolbar(
-                                  0, DemoVar.toolbar1.value
-                               )
-                             })
-    chk2 = TkCheckbutton.new(subf, :text=>'View toolbar 2',
-                             :variable=>DemoVar.toolbar2,
-                             :command=>proc{
-                               DemoVar.mainframe.show_toolbar(
-                                  1, DemoVar.toolbar2.value
-                               )
-                             })
-
-    Tk.pack(chk1, chk2, :anchor=>:w, :fill=>:x)
-    labf1.pack(:fill=>:both)
-
-    labf2 = Tk::BWidget::LabelFrame.new(parent, :text=>'Status bar',
-                                        :side=>:top, :anchor=>:w,
-                                        :relief=>:sunken, :borderwidth=>2)
-    subf = labf2.get_frame
-    chk1 = TkCheckbutton.new(subf, :text=>"Show Progress\nindicator",
-                             :justify=>:left, :variable=>@@progress,
-                             :command=>proc{ _show_progress })
-    chk1.pack(:anchor=>:w, :fill=>:x)
-
-    Tk.pack(labf1, labf2, :side=>:left, :padx=>4, :fill=>:both)
-  end
-
-  def self._notebook(parent)
-    TkCheckbutton.new(parent, :text=>'Homogeneous label',
-                      :variable=>@@homogeneous,
-                      :command=>proc{
-                        DemoVar.notebook[:homogeneous] = @@homogeneous.value
-                      }).pack(:side=>:left, :anchor=>:n, :fill=>:x)
-  end
-
-  def self._paned(parent)
-    pw1   = Tk::BWidget::PanedWindow.new(parent, :side=>:top)
-    pane  = pw1.add(:minsize=>100)
-
-    pw2   = Tk::BWidget::PanedWindow.new(pane, :side=>:left)
-    pane1 = pw2.add(:minsize=>100)
-    pane2 = pw2.add(:minsize=>100)
-
-    pane3 = pw1.add(:minsize=>100)
-
-    [pane1, pane2].each{|pane|
-      sw = Tk::BWidget::ScrolledWindow.new(pane)
-      lb = TkListbox.new(sw, :height=>8, :width=>20, :highlightthickness=>0)
-      (1..8).each{|i| lb.insert('end', "Value #{i}") }
-      sw.set_widget(lb)
-      sw.pack(:fill=>:both, :expand=>true)
-    }
-
-    sw = Tk::BWidget::ScrolledWindow.new(pane3, :relief=>:sunken,
-                                         :borderwidth=>2)
-    sf = Tk::BWidget::ScrollableFrame.new(sw)
-    sw.set_widget(sf)
-    subf = sf.get_frame
-    lab = TkLabel.new(subf, :text=>'This is a ScrollableFrame')
-    chk = TkCheckbutton.new(subf, :text=>'Constrained with',
-                            :variable=>@@constw, :command=>proc{
-                              sf['constrainedwidth'] = @@constw.value
-                            })
-    lab.pack
-    chk.pack(:anchor=>:w)
-    chk.bind('FocusIn', proc{sf.see(chk)})
-    (0..20).each{|i|
-      ent = TkEntry.new(subf, :width=>50).pack(:fill=>:x, :pady=>4)
-      ent.bind('FocusIn', proc{sf.see(ent)})
-      ent.insert('end', "Text field #{i}")
-    }
-
-    Tk.pack(sw, pw2, pw1, :fill=>:both, :expand=>true)
-  end
-
-  def self._show_progress
-    unless @@afterobj
-      @@afterobj = TkTimer.new(30, -1, proc{_update_progress})
-    end
-    if @@progress.bool
-      DemoVar.status.value = 'Compute in progress...'
-      DemoVar.prgindic.value = 0
-      DemoVar.mainframe.show_statusbar(:progression)
-      @@afterobj.start unless @@afterobj.running?
-    else
-      DemoVar.status.value = ''
-      DemoVar.mainframe.show_statusbar(:status)
-      @@afterobj.stop
-    end
-  end
-
-  def self._update_progress
-    if @@progress.bool
-      if DemoVar.prgindic.numeric < 100
-        DemoVar.prgindic.numeric += 5
-      else
-        @@progress.value = false
-        DemoVar.mainframe.show_statusbar(:status)
-        DemoVar.status.value = 'Done'
-        @@afterobj.stop
-        Tk.after(500, proc{ DemoVar.status.value = '' })
-      end
-    else
-      @@afterobj.stop
-    end
-  end
-
-end
-
diff --git a/ext/tk/sample/tkextlib/bwidget/select.rb b/ext/tk/sample/tkextlib/bwidget/select.rb
deleted file mode 100644
index b32a69d837..0000000000
--- a/ext/tk/sample/tkextlib/bwidget/select.rb
+++ /dev/null
@@ -1,83 +0,0 @@
-# frozen_string_literal: false
-#
-#  select demo  ---  called from demo.rb
-#
-unless Object.const_defined?('DemoVar')
-  fail RuntimeError, "This is NOT a stand alone script. This script is called from 'demo.rb'. "
-end
-
-module DemoSelect
-  @@var = TkVariable.new_hash
-
-  def self.create(nb)
-    frame = nb.insert('end', 'demoSelect', :text=>'Spin & Combo')
-
-    titf1 = Tk::BWidget::TitleFrame.new(frame, :text=>'SpinBox')
-    subf = titf1.get_frame
-    spin = Tk::BWidget::SpinBox.new(subf, :range=>[1, 100, 1],
-                                    :textvariable=>@@var.ref('spin', 'var'),
-                                    :helptext=>'This is the SpinBox')
-    ent = Tk::BWidget::LabelEntry.new(subf, :label=>'Linked var',
-                                      :labelwidth=>10, :labelanchor=>:w,
-                                      :textvariable=>@@var.ref('spin', 'var'),
-                                      :editable=>0,
-                                      :helptext=>"This is an Entry reflecting\nthe linked var of SpinBox")
-    labf = Tk::BWidget::LabelFrame.new(subf, :text=>'Options',
-                                       :side=>:top, :anchor=>:w,
-                                       :relief=>:sunken, :borderwidth=>1,
-                                       :helptext=>'Modify some options of SpinBox')
-    subf = labf.get_frame
-    chk1 = TkCheckbutton.new(subf, :text=>'Non editable',
-                             :variable=>@@var.ref('spin', 'editable'),
-                             :onvalue=>false, :offvalue=>true,
-                             :command=>proc{
-                               spin.editable(@@var['spin', 'editable'])
-                             })
-    chk2 = TkCheckbutton.new(subf, :text=>'Disabled',
-                             :variable=>@@var.ref('spin', 'state'),
-                             :onvalue=>'disabled', :offvalue=>'normal',
-                             :command=>proc{
-                               spin.state(@@var['spin', 'state'])
-                             })
-    Tk.pack(chk1, chk2, :side=>:left, :anchor=>:w)
-    Tk.pack(spin, ent, labf, :pady=>4, :fill=>:x)
-    titf1.pack
-
-    titf2 = Tk::BWidget::TitleFrame.new(frame, :text=>'ComboBox')
-    subf = titf2.get_frame
-    combo = Tk::BWidget::ComboBox.new(subf,
-                                      :textvariable=>@@var.ref('combo', 'var'),
-                                      :values=>[
-                                        'first value', 'second value',
-                                        'third value', 'fourth value',
-                                        'fifth value'
-                                      ],
-                                      :helptext=>'This is the ComboBox')
-    ent = Tk::BWidget::LabelEntry.new(subf, :label=>'Linked var',
-                                      :labelwidth=>10, :labelanchor=>:w,
-                                      :textvariable=>@@var.ref('combo', 'var'),
-                                      :editable=>0, :helptext=>"This is an Entry reflecting\nthe linked var of ComboBox")
-    labf = Tk::BWidget::LabelFrame.new(subf, :text=>'Options', :side=>:top,
-                                       :anchor=>:w, :relief=>:sunken,
-                                       :borderwidth=>1, :helptext=>'Modify some options of ComboBox')
-    subf = labf.get_frame
-    chk1 = TkCheckbutton.new(subf, :text=>'Non editable',
-                             :variable=>@@var.ref('combo', 'editable'),
-                             :onvalue=>false, :offvalue=>true,
-                             :command=>proc{
-                               combo.editable(@@var['combo', 'editable'])
-                             })
-    chk2 = TkCheckbutton.new(subf, :text=>'Disabled',
-                             :variable=>@@var.ref('combo', 'state'),
-                             :onvalue=>'disabled', :offvalue=>'normal',
-                             :command=>proc{
-                               combo.state(@@var['combo', 'state'])
-                             })
-
-    Tk.pack(chk1, chk2, :side=>:left, :anchor=>:w)
-    Tk.pack(combo, ent, labf, :pady=>4, :fill=>:x)
-    Tk.pack(titf1, titf2, :pady=>4)
-
-    frame
-  end
-end
diff --git a/ext/tk/sample/tkextlib/bwidget/tmpldlg.rb b/ext/tk/sample/tkextlib/bwidget/tmpldlg.rb
deleted file mode 100644
index 1496cbce2f..0000000000
--- a/ext/tk/sample/tkextlib/bwidget/tmpldlg.rb
+++ /dev/null
@@ -1,222 +0,0 @@
-# frozen_string_literal: false
-#
-#  templdlg demo  ---  called from demo.rb
-#
-unless Object.const_defined?('DemoVar')
-  fail RuntimeError, "This is NOT a stand alone script. This script is called from 'demo.rb'. "
-end
-
-module DemoDialog
-  @@tmpl      = TkVariable.new_hash
-  @@msg       = TkVariable.new_hash
-  @@msgdlg    = nil
-  @@progmsg   = TkVariable.new
-  @@progval   = TkVariable.new
-  @@progdlg   = nil
-  @@resources = TkVariable.new('en')
-
-  def self.create(nb)
-    frame = nb.insert('end', 'demoDlg', :text=>'Dialog')
-
-    titf1 = Tk::BWidget::TitleFrame.new(frame, :text=>'Resources')
-    titf2 = Tk::BWidget::TitleFrame.new(frame, :text=>'Template Dialog')
-    titf3 = Tk::BWidget::TitleFrame.new(frame, :text=>'Message Dialog')
-    titf4 = Tk::BWidget::TitleFrame.new(frame, :text=>'Other dialog')
-
-    subf = titf1.get_frame
-    cmd = proc{ TkOption.read_file(File.join(Tk::BWidget::LIBRARY, 'lang',
-                                             @@resources.value + '.rc')) }
-    Tk.pack(TkRadiobutton.new(subf, :text=>'English', :value=>'en',
-                              :variable=>@@resources, :command=>cmd),
-            TkRadiobutton.new(subf, :text=>'French', :value=>'fr',
-                              :variable=>@@resources, :command=>cmd),
-            TkRadiobutton.new(subf, :text=>'German', :value=>'de',
-                              :variable=>@@resources, :command=>cmd),
-            :side=>:left)
-
-    _tmpldlg(titf2.get_frame)
-    _msgdlg(titf3.get_frame)
-    _stddlg(titf4.get_frame)
-
-    titf1.pack(:fill=>:x, :pady=>2, :padx=>2)
-    titf4.pack(:side=>:bottom, :fill=>:x, :pady=>2, :padx=>2)
-    Tk.pack(titf2, titf3, :side=>:left, :padx=>2, :fill=>:both, :expand=>true)
-  end
-
-  def self._tmpldlg(parent)
-    @@tmpl['side'] = :bottom
-    @@tmpl['anchor'] = :c
-
-    labf1 = Tk::BWidget::LabelFrame.new(parent, :text=>'Button side',
-                                        :side=>:top, :anchor=>:w,
-                                        :relief=>:sunken, :borderwidth=>1)
-    subf = labf1.get_frame
-    Tk.pack(TkRadiobutton.new(subf, :text=>'Bottom', :value=>:bottom,
-                              :variable=>@@tmpl.ref('side'), :anchor=>:w),
-            TkRadiobutton.new(subf, :text=>'Left', :value=>:left,
-                              :variable=>@@tmpl.ref('side'), :anchor=>:w),
-            TkRadiobutton.new(subf, :text=>'Right', :value=>:right,
-                              :variable=>@@tmpl.ref('side'), :anchor=>:w),
-            TkRadiobutton.new(subf, :text=>'Top', :value=>:top,
-                              :variable=>@@tmpl.ref('side'), :anchor=>:w),
-            :fill=>:x, :anchor=>:w)
-
-    labf2 = Tk::BWidget::LabelFrame.new(parent, :text=>'Button anchor',
-                                        :side=>:top, :anchor=>:w,
-                                        :relief=>:sunken, :borderwidth=>1)
-    subf = labf2.get_frame
-    Tk.pack(TkRadiobutton.new(subf, :text=>'North', :value=>:n,
-                              :variable=>@@tmpl.ref('anchor'), :anchor=>:w),
-            TkRadiobutton.new(subf, :text=>'West', :value=>:w,
-                              :variable=>@@tmpl.ref('anchor'), :anchor=>:w),
-            TkRadiobutton.new(subf, :text=>'East', :value=>:e,
-                              :variable=>@@tmpl.ref('anchor'), :anchor=>:w),
-            TkRadiobutton.new(subf, :text=>'South', :value=>:s,
-                              :variable=>@@tmpl.ref('anchor'), :anchor=>:w),
-            TkRadiobutton.new(subf, :text=>'Center', :value=>:c,
-                              :variable=>@@tmpl.ref('anchor'), :anchor=>:w),
-            :fill=>:x, :anchor=>:w)
-
-    sep = Tk::BWidget::Separator.new(parent, :orient=>:horizontal)
-    button = TkButton.new(parent, :text=>'Show', :command=>proc{_show_tmpldlg})
-
-    button.pack(:side=>:bottom)
-    sep.pack(:side=>:bottom, :fill=>:x, :pady=>10)
-    Tk.pack(labf1, labf2, :side=>:left, :padx=>4, :anchor=>:n)
-  end
-
-  def self._msgdlg(parent)
-    @@msg['type'] = 'ok'
-    @@msg['icon'] = 'info'
-
-    labf1 = Tk::BWidget::LabelFrame.new(parent, :text=>'Type', :side=>:top,
-                                        :anchor=>:w, :relief=>:sunken,
-                                        :borderwidth=>1)
-    subf = labf1.get_frame
-    Tk.pack(TkRadiobutton.new(subf, :text=>'Ok', :value=>'ok',
-                              :variable=>@@msg.ref('type'), :anchor=>:w),
-            TkRadiobutton.new(subf, :text=>'Ok, Cancel', :value=>'okcancel',
-                              :variable=>@@msg.ref('type'), :anchor=>:w),
-            TkRadiobutton.new(subf, :text=>'Retry, Cancel',
-                              :value=>'retrycancel',
-                              :variable=>@@msg.ref('type'), :anchor=>:w),
-            TkRadiobutton.new(subf, :text=>'Yes, No', :value=>'yesno',
-                              :variable=>@@msg.ref('type'), :anchor=>:w),
-            TkRadiobutton.new(subf, :text=>'Yes, No, Cancel',
-                              :value=>'yesnocancel',
-                              :variable=>@@msg.ref('type'), :anchor=>:w),
-            TkRadiobutton.new(subf, :text=>'Abort, Retry, Ignore',
-                              :value=>'abortretryignore',
-                              :variable=>@@msg.ref('type'), :anchor=>:w),
-            :fill=>:x, :anchor=>:w)
-
-    Tk.pack(TkRadiobutton.new(subf, :text=>'User', :value=>'user',
-                              :variable=>@@msg.ref('type'), :anchor=>:w),
-            Tk::BWidget::Entry.new(subf, :textvariable=>@@msg.ref('buttons')),
-            :side=>:left)
-
-    labf2 = Tk::BWidget::LabelFrame.new(parent, :text=>'Icon', :side=>:top,
-                                        :anchor=>:w, :relief=>:sunken,
-                                        :borderwidth=>1)
-    subf = labf2.get_frame
-    Tk.pack(TkRadiobutton.new(subf, :text=>'Information', :value=>'info',
-                              :variable=>@@msg.ref('icon'), :anchor=>:w),
-            TkRadiobutton.new(subf, :text=>'Question',    :value=>'question',
-                              :variable=>@@msg.ref('icon'), :anchor=>:w),
-            TkRadiobutton.new(subf, :text=>'Warning',     :value=>'warning',
-                              :variable=>@@msg.ref('icon'), :anchor=>:w),
-            TkRadiobutton.new(subf, :text=>'Error',       :value=>'error',
-                              :variable=>@@msg.ref('icon'), :anchor=>:w),
-            :fill=>:x, :anchor=>:w)
-
-    sep = Tk::BWidget::Separator.new(parent, :orient=>:horizontal)
-    button = TkButton.new(parent, :text=>'Show', :command=>proc{_show_msgdlg})
-
-    button.pack(:side=>:bottom)
-    sep.pack(:side=>:bottom, :fill=>:x, :pady=>10)
-    Tk.pack(labf1, labf2, :side=>:left, :padx=>4, :anchor=>:n)
-  end
-
-  def self._stddlg(parent)
-    Tk.pack(TkButton.new(parent, :text=>'Select a color '){|w|
-              command(proc{DemoDialog._show_color(w)})
-            },
-            TkButton.new(parent, :text=>'Font selector dialog',
-                         :command=>proc{_show_fontdlg}),
-            TkButton.new(parent, :text=>'Progression dialog',
-                         :command=>proc{_show_progdlg}),
-            TkButton.new(parent, :text=>'Password dialog',
-                         :command=>proc{_show_passdlg}),
-            :side=>:left, :padx=>5, :anchor=>:w)
-  end
-
-  def self._show_color(w)
-    dlg = Tk::BWidget::SelectColor.new(w, :color=>w.background)
-    color = dlg.menu([:below, w])
-    unless color.empty?
-      w.background(color)
-    end
-  end
-
-  def self._show_tmpldlg
-    dlg = Tk::BWidget::Dialog.new(:relative=>Tk.root, :modal=>:local,
-                                  :separator=>true, :title=>'Template dialog',
-                                  :side=>@@tmpl['side'],
-                                  :anchor=>@@tmpl['anchor'],
-                                  :default=>0, :cancel=>1)
-    dlg.add('name'=>'ok')
-    dlg.add('name'=>'cancel')
-    TkMessage.new(dlg.get_frame, :text=>"Template\nDialog", :justify=>:center,
-                  :anchor=>:c, :width=>80).pack(:fill=>:both, :expand=>true,
-                                                :padx=>100, :pady=>100)
-    dlg.draw
-    dlg.destroy
-  end
-
-  def self._show_msgdlg
-    @@msgdlg.destroy if @@msgdlg
-    @@msgdlg = Tk::BWidget::MessageDlg.new(:relative=>Tk.root,
-                                           :message=>'Message for MessageBox',
-                                           :type=>@@msg['type'],
-                                           :icon=>@@msg['icon'],
-                                           :buttons=>@@msg['buttons'])
-    @@msgdlg.create
-  end
-
-  def self._show_fontdlg
-    font = Tk::BWidget::SelectFont.new(:relative=>Tk.root,
-                                       :font=>DemoVar.font).create
-    DemoVar::Demo.update_font(font)
-  end
-
-  def self._show_progdlg
-    @@progmsg.value = "Compute in progress..."
-    @@progval.value = 0
-
-    @@progdlg = Tk::BWidget::ProgressDlg.new(:relative=>Tk.root,
-                                             :title=>'Wait...',
-                                             :type=>'infinite', :width=>20,
-                                             :textvariable=>@@progmsg,
-                                             :variable=>@@progval,
-                                             :stop=>'Stop') {
-      command(proc{self.destroy})
-      create
-    }
-    _update_progdlg
-  end
-
-  def self._update_progdlg
-    TkTimer.new(20, -1, proc{
-                  if @@progdlg && @@progdlg.winfo_exist?
-                    @@progval.value = 2
-                  else
-                    stop
-                  end
-                }).start
-  end
-
-  def self._show_passdlg
-    Tk::BWidget::PasswdDlg.new(:relative=>Tk.root).create
-  end
-end
-
diff --git a/ext/tk/sample/tkextlib/bwidget/tree.rb b/ext/tk/sample/tkextlib/bwidget/tree.rb
deleted file mode 100644
index 8a2566f9c9..0000000000
--- a/ext/tk/sample/tkextlib/bwidget/tree.rb
+++ /dev/null
@@ -1,290 +0,0 @@
-# frozen_string_literal: false
-#
-#  templdlg demo  ---  called from demo.rb
-#
-unless Object.const_defined?('DemoVar')
-  fail RuntimeError, "This is NOT a stand alone script. This script is called from 'demo.rb'. "
-end
-
-module DemoTree
-  @@count = 0
-  @@dblclick = false
-  @@top = nil
-
-  def self.create(nb)
-    frame = nb.insert('end', 'demoTree', :text=>'Tree')
-    pw = Tk::BWidget::PanedWindow.new(frame, :side=>:top)
-
-    pane = pw.add(:weight=>1)
-    title = Tk::BWidget::TitleFrame.new(pane, :text=>'Directory tree')
-    sw = Tk::BWidget::ScrolledWindow.new(title.get_frame,
-                                         :relief=>:sunken, :borderwidth=>2)
-    tree = Tk::BWidget::Tree.new(sw, :relief=>:flat, :borderwidth=>0,
-                                 :width=>15, :highlightthickness=>0,
-                                 :redraw=>false, :dropenabled=>true,
-                                 :dragenabled=>true, :dragevent=>3,
-                                 :droptypes=>[
-                                   'TREE_NODE', [
-                                     :copy, [],
-                                     :move, [],
-                                     :link, []
-                                   ],
-                                   'LISTBOX_ITEM', [
-                                     :copy, [],
-                                     :move, [],
-                                     :link, []
-                                   ]
-                                 ],
-                                 :opencmd=>proc{|node|
-                                   moddir(1, tree, node)
-                                 },
-                                 :closecmd=>proc{|node|
-                                   moddir(0, tree, node)
-                                 })
-    sw.set_widget(tree)
-
-    sw.pack(:side=>:top, :expand=>true, :fill=>:both)
-    title.pack(:fill=>:both, :expand=>true)
-
-    pane = pw.add(:weight=>2)
-    lf = Tk::BWidget::TitleFrame.new(pane, :text=>'Content')
-    sw = Tk::BWidget::ScrolledWindow.new(lf.get_frame,
-                                         :scrollbar=>:horizontal,
-                                         :auto=>:none, :relief=>:sunken,
-                                         :borderwidth=>2)
-
-    list = Tk::BWidget::ListBox.new(sw, :relief=>:flat, :borderwidth=>0,
-                                    :highlightthickness=>0, :width=>20,
-                                    :multicolumn=>true, :redraw=>false,
-                                    :dragevent=>3, :dropenabled=>true,
-                                    :dragenabled=>true,
-                                 :droptypes=>[
-                                      'TREE_NODE', [
-                                        :copy, [],
-                                        :move, [],
-                                        :link, []
-                                      ],
-                                      'LISTBOX_ITEM', [
-                                        :copy, [],
-                                        :move, [],
-                                        :link, []
-                                      ]
-                                    ])
-    sw.set_widget(list)
-
-    Tk.pack(sw, lf, :fill=>:both, :expand=>true)
-
-    pw.pack(:fill=>:both, :expand=>true)
-
-    tree.textbind('ButtonPress-1',
-                  proc{|node, ev| select('tree', 1, tree, list, node)})
-    tree.textbind('Double-ButtonPress-1',
-                  proc{|node, ev| select('tree', 2, tree, list, node)})
-
-    list.textbind('ButtonPress-1',
-                  proc{|node, ev| select('list', 1, tree, list, node)})
-    list.textbind('Double-ButtonPress-1',
-                  proc{|node, ev| select('list', 2, tree, list, node)})
-
-    list.imagebind('Double-ButtonPress-1',
-                   proc{|node, ev| select('list', 2, tree, list, node)})
-
-    nb.itemconfigure('demoTree',
-                     :createcmd=>proc{|*args| init(tree, list, *args)},
-                     :raisecmd=>proc{
-                       Tk.root.geometry =~
-                         /\d+x\d+([+-]{1,2}\d+)([+-]{1,2}\d+)/
-                       global_w = ($1 || 0).to_i
-                       global_h = ($2 || 0).to_i
-                       if @@top
-                         Tk::BWidget.place(@@top, 0, 0, :at,
-                            global_w - Tk.root.winfo_screenwidth, global_h)
-                         @@top.deiconify
-                         Tk.root.bind('Unmap', proc{@@top.withdraw})
-                         Tk.root.bind('Map',   proc{@@top.deiconify})
-                         Tk.root.bind('Configure', proc{|w|
-                                if w == Tk.root
-                                  Tk.root.geometry =~
-                                    /\d+x\d+([+-]{1,2}\d+)([+-]{1,2}\d+)/
-                                  global_w = ($1 || 0).to_i
-                                  global_h = ($2 || 0).to_i
-                                  Tk::BWidget.place(@@top, 0, 0, :at,
-                                       global_w - Tk.root.winfo_screenwidth,
-                                       global_h)
-                                end
-                         }, '%W')
-                       end
-                     },
-                     :leavecmd=>proc{
-                       @@top.withdraw if @@top
-                       Tk.root.bind_remove('Unmap')
-                       Tk.root.bind_remove('Map')
-                       Tk.root.bind_remove('Configure')
-                       true
-                     })
-  end
-
-  def self.init(tree, list, *args)
-    @@count = 0
-    if Tk::PLATFORM['platform'] == 'unix'
-      rootdir = File.expand_path('~')
-    else
-      rootdir = 'c:'
-    end
-
-    tree.insert('end', 'root', 'home',
-                :text=>rootdir, :data=>rootdir, :open=>true,
-                :image=>Tk::BWidget::Bitmap.new('openfold'))
-    getdir(tree, 'home', rootdir)
-    select('tree', 1, tree, list, 'home')
-    tree.redraw(true)
-    list.redraw(true)
-
-    @@top = TkToplevel.new
-    @@top.withdraw
-    @@top.protocol('WM_DELETE_WINDOW'){
-      # don't kill me
-    }
-    @@top.resizable(false, false)
-    @@top.title('Drag rectangle to scroll directory tree')
-    @@top.transient(Tk.root)
-    Tk::BWidget::ScrollView.new(@@top, :window=>tree, :fill=>'white',
-                                :width=>300, :height=>300, :relief=>:sunken,
-                                :bd=>1).pack(:fill=>:both, :expand=>true)
-  end
-
-  def self.getdir(tree, node, path)
-    lentries = Dir.glob(File.join(path, '*')).sort
-    lfiles = []
-    lentries.each{|f|
-      basename = File.basename(f)
-      if File.directory?(f)
-        Tk::BWidget::Tree::Node.new(tree, node,
-                                    :index=>'end', :text=>basename,
-                                    :image=>Tk::BWidget::Bitmap.new('folder'),
-                                    :drawcross=>:always, :data=>f)
-        @@count += 1
-      else
-        lfiles << basename
-      end
-    }
-    tree.itemconfigure(node, :drawcross=>:auto, :data=>lfiles)
-  end
-
-  def self.moddir(idx, tree, node)
-    if (idx != 0 && tree.itemcget(node, :drawcross).to_s == 'always')
-      getdir(tree, node, tree.itemcget(node, :data))
-      if tree.nodes(node).empty?
-        tree.itemconfigure(node, :image=>Tk::BWidget::Bitmap.new('folder'))
-      else
-        tree.itemconfigure(node, :image=>Tk::BWidget::Bitmap.new('openfold'))
-      end
-    else
-      img = %w(folder openfold)[idx] || 'openfold'
-      tree.itemconfigure(node, :image=>Tk::BWidget::Bitmap.new(img))
-    end
-  end
-
-  def self.select(where, num, tree, list, node)
-    @@dblclick = true
-    if num == 1
-      if (where == 'tree' &&
-          tree.selection_get.find{|x|
-            TkUtil._get_eval_string(x) == TkUtil._get_eval_string(node)
-          })
-        @@dblclick = false
-        Tk.after(500, proc{edit('tree', tree, list, node)})
-        return
-      end
-      if (where == 'list' &&
-          list.selection_get.find{|x|
-            TkUtil._get_eval_string(x) == TkUtil._get_eval_string(node)
-          })
-        @@dblclick = false
-        Tk.after(500, proc{edit('list', tree, list, node)})
-        return
-      end
-      if where == 'tree'
-        select_node(tree, list, node)
-      else
-        list.selection_set(node)
-      end
-    elsif (where == 'list' && tree.exist?(node))
-      parent = tree.parent(node)
-      while TkUtil._get_eval_string(parent) != 'root'
-        tree.itemconfigure(parent, :open=>true)
-        parent = tree.parent(parent)
-      end
-      select_node(tree, list, node)
-    end
-  end
-
-  def self.select_node(tree, list, node)
-    tree.selection_set(node)
-    Tk.update
-    list.delete(*(list.items(0, 'end')))
-
-    dir = tree.itemcget(node, :data)
-    if tree.itemcget(node, :drawcross).to_s == 'always'
-      getdir(tree, node, dir)
-      dir = tree.itemcget(node, :data)
-    end
-
-    tree.nodes(node).each{|subnode|
-      list.insert('end', subnode,
-                  :text=>tree.itemcget(subnode, :text),
-                  :image=>Tk::BWidget::Bitmap.new('folder'))
-    }
-
-    TkComm.simplelist(dir).each{|f|
-      Tk::BWidget::ListBox::Item.new(list, 'end', :text=>f,
-                                     :image=>Tk::BWidget::Bitmap.new('file'))
-    }
-  end
-
-  def self.edit(where, tree, list, node)
-    return if @@dblclick
-
-    if (where == 'tree' &&
-        tree.selection_get.find{|x|
-          TkUtil._get_eval_string(x) == TkUtil._get_eval_string(node)
-        })
-      res = tree.edit(node, tree.itemcget(node, :text))
-      if res != ''
-        tree.itemconfigure(node, :text=>res)
-        if list.exist?(node)
-          list.itemconfigure(node, :text=>res)
-        end
-        tree.selection_set(node)
-      end
-      return
-    end
-
-    if (where == 'list')
-      res = list.edit(node, list.igemcget(node, :text))
-      if res != ''
-        list.itemconfigure(node, :text=>res)
-        if tree.exist?(node)
-          tree.itemconfigure(node, :text=>res)
-        else
-          cursel = tree.selection_get[0]
-          index  = list.index(node) - tree.nodes(cursel).size
-          data   = TkComm.simplelist(tree.itemcget(cursel, :data))
-          data[index] = res
-          tree.itemconfigure(cursel, :date=>data)
-        end
-        list.selection_set(node)
-      end
-    end
-  end
-
-  def self.expand(tree, but)
-    unless (cur = tree.selection_get).empty?
-      if TkComm.bool(but)
-        tree.opentree(cur)
-      else
-        tree.closetree(cur)
-      end
-    end
-  end
-end
diff --git a/ext/tk/sample/tkextlib/bwidget/x1.xbm b/ext/tk/sample/tkextlib/bwidget/x1.xbm
deleted file mode 100644
index 6137a118f8..0000000000
--- a/ext/tk/sample/tkextlib/bwidget/x1.xbm
+++ /dev/null
@@ -1,2258 +0,0 @@
-#define x1_width 626
-#define x1_height 428
-static char x1_bits[] = {
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0x03,0x80,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0xe0,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00,
- 0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,
- 0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x80,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x80,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x03,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,
- 0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,
- 0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,
- 0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x03,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0xfc,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,
- 0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x3f,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xfc,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,
- 0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x03,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,
- 0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xe0,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,
- 0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x1f,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7c,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0xfc,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xc0,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,
- 0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x0f,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xfe,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0xfc,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x80,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,
- 0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0x03,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x07,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0x01,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xfc,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0xfc,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xfe,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x1f,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0x3f,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0xfc,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xf0,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,
- 0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xfc,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0x0f,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0x07,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0xfc,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xe0,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,
- 0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x03,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0x03,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,
- 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0xfc,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x80,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x0f,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x0f,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0x7f,0x00,0x00,0x00,
- 0x00,0xf8,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0xfc,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,
- 0x7f,0x00,0x00,0x00,0x00,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0xfc,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xfe,0xff,0xff,0x3f,0x00,0x00,0x00,0xc0,0xff,0xff,0x03,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x3f,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0xe0,0xff,0xff,
- 0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0x1f,0x00,0x00,
- 0x00,0xf0,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0xfc,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,
- 0xff,0x1f,0x00,0x00,0x00,0xfc,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,
- 0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xf0,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0xfe,0xff,0xff,0x3f,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0xfe,0xff,
- 0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0x0f,0x00,
- 0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0xfc,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,
- 0xff,0xff,0x07,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x01,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xc0,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0x01,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x03,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0xe0,0xff,
- 0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,
- 0xf8,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0xfc,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0x03,
- 0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,
- 0x00,0x00,0x00,0x00,0xfe,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0xfc,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,
- 0xff,0xff,0xff,0x01,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x80,0xff,0x07,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x07,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,
- 0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xc0,0xff,0x07,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x07,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0xf8,
- 0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,
- 0xe0,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0xfc,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,
- 0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,
- 0x00,0x00,0x00,0x00,0xf8,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0xfc,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,
- 0xff,0xff,0xff,0xff,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0xfc,0xff,0x0f,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x0f,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,
- 0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x80,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0xfe,0xff,0x0f,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,
- 0xfe,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,
- 0x00,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0xfc,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,
- 0x7f,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x07,0x00,0x00,0x00,0x80,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,
- 0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,
- 0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,
- 0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0xc0,0xff,0xff,0x1f,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x1f,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0xe0,0xff,0xff,
- 0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,
- 0x00,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,
- 0x00,0xf0,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0xfc,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,
- 0xff,0x3f,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,
- 0xff,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x3f,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,
- 0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,
- 0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0x1f,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x7f,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x80,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0xfe,0xff,
- 0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0xfc,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,
- 0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,
- 0x00,0x00,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0xfc,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x1f,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,
- 0xff,0x1f,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x7f,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xf0,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0x1f,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0xe0,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0xe0,0xff,
- 0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfc,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,
- 0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0x07,0x00,
- 0x00,0x00,0xe0,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfc,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x0f,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,
- 0xff,0xff,0x03,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xe0,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0x1f,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0xf0,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xfc,
- 0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfd,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x07,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0x00,
- 0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xfd,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x07,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,
- 0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xfd,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0xf0,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x80,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,
- 0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfd,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,
- 0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x80,
- 0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfd,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x07,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0x1f,
- 0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xfd,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0xf8,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,
- 0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,
- 0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0x07,0x00,0x00,0x00,
- 0xf8,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x03,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,
- 0x03,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xfe,0xff,0xff,0x01,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0xfc,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0x01,0x00,0x00,0x00,0xfe,0xff,0xff,
- 0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,
- 0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0x00,0x00,0x00,
- 0x00,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x03,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,
- 0x7f,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xfc,0xff,0x7f,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0xfc,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0x3f,0x00,0x00,0x00,0xc0,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x03,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0x1f,0x00,0x00,
- 0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x03,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,
- 0xff,0x1f,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0xfc,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xf0,0xff,0x0f,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,
- 0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0x07,0x00,0x00,0x00,0xf8,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x03,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0x07,0x00,
- 0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xe0,0xff,0x03,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0xfe,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xe0,0xff,0x01,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,
- 0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0x01,0x00,0x00,0x00,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x07,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0x00,
- 0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,
- 0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x80,0x7f,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x03,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0xfe,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x80,0x7f,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,
- 0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x3f,0x00,0x00,0x00,0xe0,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x80,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x0f,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3f,
- 0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,
- 0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x80,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x1f,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x07,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x80,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0e,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x1f,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0e,0x00,0x00,0x00,
- 0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x3f,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x06,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0xf0,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0xfc,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xfd,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfd,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfd,
- 0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xfd,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfd,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfd,0x00,0x00,0x00,
- 0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xfd,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xfc,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfc,0x00,0x00,0x00,0x00,0x00,0xf8,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfc,0x00,0x00,
- 0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xfc,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xfc,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0xfc,0x00,0x00,0x00,0x00,0x00,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0xfc,0x00,
- 0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x7f,0xfc,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x7f,0xfc,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0xfc,0x00,0x00,0x00,0x00,
- 0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0xfc,
- 0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x3f,0xfc,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0xfc,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0xfc,0x00,0x00,0x00,
- 0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,
- 0xfc,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x1f,0xfc,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0xfc,0x00,0x00,0x00,0x00,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0xfc,0x00,0x00,
- 0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x0f,0xfc,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x0f,0xfc,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0xfc,0x00,0x00,0x00,0xe0,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0xfc,0x00,
- 0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x07,0xfc,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x07,0xfc,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0xfc,0x00,0x00,0x00,0xf8,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0xfc,
- 0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x03,0xfc,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x01,0xfc,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0xfc,0x00,0x00,0x00,
- 0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,
- 0xfc,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x00,0xfc,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0xfc,0x00,0x00,0x80,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0xfc,0x00,0x00,
- 0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,
- 0x00,0xfc,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x3f,0x00,0xfc,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0xfc,0x00,0x00,0xe0,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0xfc,0x00,
- 0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x1f,0x00,0xfc,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x1f,0x00,0xfc,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0xfc,0x00,0x00,0xf8,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0xfc,
- 0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x0f,0x00,0xfc,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x07,0x00,0xfc,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0xfc,0x00,0x00,0xfe,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,
- 0xfc,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x03,0x00,0xfc,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0xfc,0x00,0x80,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0xfc,0x00,0x80,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,
- 0x00,0xfc,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x00,0x00,0xfc,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0xfc,0x00,0xe0,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0xfc,0x00,
- 0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,
- 0x00,0x00,0xfc,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x3f,0x00,0x00,0xfc,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0xfc,0x00,0xf0,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0xfc,
- 0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x0f,0x00,0x00,0xfc,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x07,0x00,0x00,0xfc,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0xfc,0x00,0xfc,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,
- 0xfc,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x03,0x00,0x00,0xfc,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0xfc,0x00,0xfe,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0xfc,0x00,0xfe,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,
- 0x00,0xfc,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x7f,0x00,0x00,0x00,0xfc,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0xfc,0x00,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0xfc,0x80,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,
- 0x00,0x00,0xfc,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x1f,0x00,0x00,0x00,0xfc,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0xfc,0xc0,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0xfc,
- 0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,
- 0x00,0x00,0x00,0xfc,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x03,0x00,0x00,0x00,0xfc,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0xfc,0xe0,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,
- 0xfc,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x01,0x00,0x00,0x00,0xfc,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xfc,0xf0,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0xfc,0xf0,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,
- 0x00,0xfc,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x3f,0x00,0x00,0x00,0x00,0xfc,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0xfc,0xf8,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0xfc,0xf8,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,
- 0x00,0x00,0xfc,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x07,0x00,0x00,0x00,0x00,0xfc,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0xfc,0xf8,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0xfc,
- 0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,
- 0x00,0x00,0x00,0xfc,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0xfc,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0xfc,0xfc,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,
- 0xfc,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,
- 0x00,0x00,0x00,0x00,0xfc,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0xfc,0xfe,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0xfc,0xfe,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,
- 0x00,0xfc,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,
- 0x00,0x00,0x00,0x00,0x00,0xfc,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0xfc,0xfe,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0xfc,0xfe,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x7f,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0xfc,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x7f,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0xf8,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x03,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x0f,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,
- 0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0xe0,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x01,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,
- 0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x03,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x07,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,
- 0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,
- 0x00,0x00,0x80,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0xc0,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x03,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x7f,0x00,0x00,0x00,0xc0,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,
- 0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0xc0,0x0f,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x01,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0xe0,
- 0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x80,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,
- 0x00,0x00,0x00,0xf0,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x80,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0xf8,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0xfc,0x3f,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,
- 0xfc,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x80,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x01,0x00,0x00,0x00,0xfe,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x80,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,
- 0x7f,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x80,0xff,0x7f,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,
- 0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,
- 0x80,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x80,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x3f,0x00,0x00,0x00,0xc0,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,
- 0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0xe0,0xff,0xff,0x01,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,
- 0xff,0x7f,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0xf0,0xff,0xff,
- 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,
- 0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,
- 0x00,0xf8,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0xc0,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x07,0x00,0x00,0x00,0xf8,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,
- 0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0xfc,0xff,0xff,0x03,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,
- 0xff,0xff,0x3f,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0xfe,0xff,
- 0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xf0,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,
- 0x00,0x00,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0xc0,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x7f,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0x1f,
- 0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0x0f,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,
- 0xff,0xff,0xff,0x1f,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0xc0,0xff,
- 0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,
- 0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,
- 0x00,0x00,0xe0,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0xe0,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xfc,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x0f,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,
- 0x0f,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0x1f,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,
- 0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xfe,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0xf8,
- 0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0xe0,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xfc,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0x01,
- 0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0x07,0x00,0x00,
- 0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xfc,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,
- 0xff,0x07,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xfe,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xf0,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,
- 0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xfc,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xfc,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,
- 0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0xf0,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xfc,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0x1f,
- 0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0x03,0x00,
- 0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xfc,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,
- 0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,
- 0xff,0xff,0x03,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xfc,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,
- 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xe0,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xfc,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,
- 0xe0,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0xf8,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xfc,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,
- 0x03,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0x00,
- 0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,
- 0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0x01,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,
- 0xff,0xff,0xff,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xf8,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,
- 0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,
- 0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,
- 0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0x3f,0x00,0x00,0x00,0xfc,
- 0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xfc,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,
- 0x3f,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0x3f,
- 0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,
- 0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xf8,0xff,0xff,0x1f,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xf0,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x80,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0x0f,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,
- 0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xfc,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0x07,0x00,0x00,
- 0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0x07,0x00,0x00,0x00,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xfc,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,
- 0xff,0x01,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,
- 0x01,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xe0,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xfe,0x7f,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xc0,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0xf8,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x1f,0x00,0x00,0x00,0x80,0xff,0xff,0xff,
- 0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xfc,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,
- 0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x80,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xfc,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,
- 0xff,0x1f,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x80,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x80,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0x03,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x80,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,
- 0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xfc,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0x03,0x00,
- 0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,
- 0xff,0xff,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xc0,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0x1f,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,
- 0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0xf0,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,
- 0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xfc,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0x1f,0x00,
- 0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,
- 0xff,0xff,0x07,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0xfc,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xe0,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0x7f,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xfc,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,
- 0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,
- 0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xfc,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0x7f,0x00,
- 0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0xf8,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,
- 0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0x07,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0xf0,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xc0,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,
- 0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xfc,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0x01,0x00,0x00,0x00,0x00,
- 0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x7f,0x00,
- 0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x80,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0xe0,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xfe,0x1f,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,
- 0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xf0,0x01,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,
- 0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xfc,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xc0,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x80,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0x7f,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,
- 0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,
- 0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xfc,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xf8,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0xfc,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0x01,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xfc,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,
- 0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xfe,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0xf0,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,
- 0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0x07,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xfc,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,
- 0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xc0,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0xc0,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,
- 0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0x0f,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xfc,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,
- 0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,
- 0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xf8,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0xfe,
- 0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,
- 0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x1f,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x80,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,
- 0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xfc,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0x3f,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xf0,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x80,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xf8,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,
- 0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xfc,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7e,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,
- 0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0xf8,
- 0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x80,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,
- 0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0x01,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x70,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,
- 0x80,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,
- 0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,
- 0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,
- 0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,
- 0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xfc,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x80,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0x1f,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,
- 0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,
- 0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x80,0x0f,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0xc0,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x80,
- 0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0xfc};
diff --git a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/Orig_LICENSE.txt b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/Orig_LICENSE.txt
deleted file mode 100644
index 8392da7cec..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/Orig_LICENSE.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-
-  #######################################################################
-  ###  The following text is the original 'license.terms' of iwidgets ###
-  ###  extension.                                                     ###
-  ###  Original Tcl source files are not include in this directory,   ###
-  ###  because of all of them are rewritten to Ruby files.            ###
-  ###  However, the image data files in the 'images' directory are    ###
-  ###  quoted from iwidgets source archive.                           ###
-  #######################################################################
-
-
-This software is copyrighted by DSC Technologies and private individual
-contributors.  The copyright holder is specifically listed in the header
-of each file.  The following terms apply to all files associated with the
-software unless explicitly disclaimed in individual files by private
-contributors.
-
-Copyright 1997 DSC Technologies Corporation
-
-Permission to use, copy, modify, distribute and license this software and
-its documentation for any purpose, and without fee or written agreement
-with DSC, is hereby granted, provided that the above copyright notice
-appears in all copies and that both the copyright notice and warranty
-disclaimer below appear in supporting documentation, and that the names of
-DSC Technologies Corporation or DSC Communications Corporation not be used
-in advertising or publicity pertaining to the software without specific,
-written prior permission.
-
-DSC DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, AND NON-INFRINGEMENT.
-THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND
-DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES,
-ENHANCEMENTS, OR MODIFICATIONS. IN NO EVENT SHALL DSC BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
-RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-CONTRACT, NEGLIGENCE OR OTHER TORTUOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-RESTRICTED RIGHTS: Use, duplication or disclosure by the government
-is subject to the restrictions as set forth in subparagraph (c) (1) (ii)
-of the Rights in Technical Data and Computer Software Clause as DFARS
-252.227-7013 and FAR 52.227-19.
diff --git a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/box.xbm b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/box.xbm
deleted file mode 100644
index 7498e15de2..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/box.xbm
+++ /dev/null
@@ -1,14 +0,0 @@
-#define Tool_32_box_width 32
-#define Tool_32_box_height 32
-static unsigned char Tool_32_box_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0xe0, 0xff, 0xff, 0x0f, 0x20, 0x00, 0x00, 0x08,
-  0x20, 0x00, 0x00, 0x08, 0x20, 0x00, 0x00, 0x08, 0x20, 0x00, 0x00, 0x08,
-  0x20, 0x00, 0x00, 0x08, 0x20, 0x00, 0x00, 0x08, 0x20, 0x00, 0x00, 0x08,
-  0x20, 0x00, 0x00, 0x08, 0x20, 0x00, 0x00, 0x08, 0x20, 0x00, 0x00, 0x08,
-  0x20, 0x00, 0x00, 0x08, 0x20, 0x00, 0x00, 0x08, 0x20, 0x00, 0x00, 0x08,
-  0x20, 0x00, 0x00, 0x08, 0x20, 0x00, 0x00, 0x08, 0x20, 0x00, 0x00, 0x08,
-  0xe0, 0xff, 0xff, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
diff --git a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/clear.gif b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/clear.gif
deleted file mode 100644
index bd45628aa7..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/clear.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/close.gif b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/close.gif
deleted file mode 100644
index f91b9e9d1e..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/close.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/copy.gif b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/copy.gif
deleted file mode 100644
index 7319f1dcb0..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/copy.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/cut.gif b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/cut.gif
deleted file mode 100644
index 4258b17591..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/cut.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/exit.gif b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/exit.gif
deleted file mode 100644
index e462be033f..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/exit.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/find.gif b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/find.gif
deleted file mode 100644
index dddcb8044b..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/find.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/help.gif b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/help.gif
deleted file mode 100644
index bc8f18c00d..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/help.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/line.xbm b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/line.xbm
deleted file mode 100644
index 4622ae978b..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/line.xbm
+++ /dev/null
@@ -1,14 +0,0 @@
-#define lineOp_width 32
-#define lineOp_height 32
-static unsigned char lineOp_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00,
-   0xf0, 0x00, 0x00, 0x00, 0xe0, 0x01, 0x00, 0x00, 0xc0, 0x03, 0x00, 0x00,
-   0x80, 0x07, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00,
-   0x00, 0x3c, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00,
-   0x00, 0xe0, 0x01, 0x00, 0x00, 0xc0, 0x03, 0x00, 0x00, 0x80, 0x07, 0x00,
-   0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x3c, 0x00,
-   0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0xe0, 0x01,
-   0x00, 0x00, 0xc0, 0x03, 0x00, 0x00, 0x80, 0x07, 0x00, 0x00, 0x00, 0x0f,
-   0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/mag.gif b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/mag.gif
deleted file mode 100644
index 4a5be66e76..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/mag.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/new.gif b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/new.gif
deleted file mode 100644
index 9c68ad35f5..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/new.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/open.gif b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/open.gif
deleted file mode 100644
index bed862c8c4..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/open.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/oval.xbm b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/oval.xbm
deleted file mode 100644
index 856bd43785..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/oval.xbm
+++ /dev/null
@@ -1,14 +0,0 @@
-#define ovalOp_width 32
-#define ovalOp_height 32
-static unsigned char ovalOp_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x0f, 0x00,
-   0x00, 0x1c, 0x70, 0x00, 0x00, 0x03, 0x80, 0x01, 0x80, 0x00, 0x00, 0x02,
-   0x40, 0x00, 0x00, 0x04, 0x20, 0x00, 0x00, 0x08, 0x10, 0x00, 0x00, 0x10,
-   0x10, 0x00, 0x00, 0x10, 0x08, 0x00, 0x00, 0x20, 0x08, 0x00, 0x00, 0x20,
-   0x08, 0x00, 0x00, 0x20, 0x08, 0x00, 0x00, 0x20, 0x10, 0x00, 0x00, 0x10,
-   0x10, 0x00, 0x00, 0x10, 0x20, 0x00, 0x00, 0x08, 0x40, 0x00, 0x00, 0x04,
-   0x80, 0x00, 0x00, 0x02, 0x00, 0x03, 0x80, 0x01, 0x00, 0x1c, 0x70, 0x00,
-   0x00, 0xe0, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/paste.gif b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/paste.gif
deleted file mode 100644
index 9974f23bf5..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/paste.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/points.xbm b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/points.xbm
deleted file mode 100644
index c50aa4c5f3..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/points.xbm
+++ /dev/null
@@ -1,14 +0,0 @@
-#define dotPencilOp_width 32
-#define dotPencilOp_height 32
-static unsigned char dotPencilOp_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x12, 0x00,
-  0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x80, 0x04, 0x00,
-  0x00, 0x80, 0x04, 0x00, 0x00, 0x40, 0x02, 0x00, 0x00, 0x40, 0x02, 0x00,
-  0x00, 0x20, 0x01, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00, 0x90, 0x00, 0x00,
-  0x00, 0x90, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00,
-  0x00, 0x24, 0x00, 0x18, 0x00, 0x24, 0x00, 0x18, 0x00, 0x12, 0x00, 0x00,
-  0x00, 0x12, 0x00, 0x30, 0x00, 0x0e, 0x00, 0x30, 0x00, 0x06, 0x00, 0x00,
-  0x00, 0x06, 0x0c, 0x30, 0x00, 0x00, 0x0c, 0x30, 0x00, 0x30, 0xa0, 0x01,
-  0x00, 0x60, 0xb0, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
diff --git a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/poly.gif b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/poly.gif
deleted file mode 100644
index 2b595bb9b7..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/poly.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/print.gif b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/print.gif
deleted file mode 100644
index d321f17457..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/print.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/ruler.gif b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/ruler.gif
deleted file mode 100644
index 00d26febf6..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/ruler.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/save.gif b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/save.gif
deleted file mode 100644
index d1ceb1a5c4..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/save.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/select.gif b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/select.gif
deleted file mode 100644
index f885c9ca5f..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/select.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/text.xbm b/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/text.xbm
deleted file mode 100644
index ffb0686303..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/text.xbm
+++ /dev/null
@@ -1,14 +0,0 @@
-#define font_edit_width 32
-#define font_edit_height 32
-static unsigned char font_edit_bits[] = {
-  0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x1c,
-  0x00, 0x00, 0x00, 0x6e, 0x00, 0x00, 0x00, 0x77, 0x00, 0x00, 0x80, 0x7b,
-  0x00, 0x00, 0x80, 0x7e, 0x00, 0x00, 0xc0, 0xfd, 0x00, 0x00, 0x60, 0xfb,
-  0x00, 0x00, 0xb0, 0xf7, 0x00, 0x00, 0xd0, 0xef, 0x00, 0x00, 0xf8, 0xdf,
-  0x00, 0x00, 0xd4, 0x7f, 0x00, 0x00, 0xaa, 0x1f, 0x00, 0x00, 0x15, 0x0f,
-  0x00, 0x80, 0x82, 0x06, 0x03, 0x40, 0x01, 0x01, 0x07, 0xa0, 0x80, 0x00,
-  0x0f, 0x10, 0x40, 0x00, 0x1f, 0x08, 0x20, 0x00, 0x3b, 0xe4, 0x1f, 0x00,
-  0x73, 0x1a, 0x00, 0x00, 0xe3, 0x07, 0x00, 0x00, 0xc3, 0x01, 0x00, 0x00,
-  0xe3, 0x03, 0x00, 0x00, 0x7b, 0x07, 0x00, 0x00, 0x1f, 0x06, 0x00, 0x00,
-  0x07, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
-  0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/buttonbox.rb b/ext/tk/sample/tkextlib/iwidgets/sample/buttonbox.rb
deleted file mode 100644
index c64c3f0247..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/buttonbox.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-# sample 1
-p bb1 = Tk::Iwidgets::Buttonbox.new
-p bb1.add('Yes',   :text=>'Yes',   :command=>proc{puts 'Yes'})
-p bb1.add('No',    :text=>'No',    :command=>proc{puts 'No'})
-p bb1.add('Maybe', :text=>'Maybe', :command=>proc{puts 'Maybe'})
-bb1.default('Yes')
-bb1.pack(:expand=>true, :fill=>:both, :pady=>5)
-print "\n"
-
-# sample 2
-p bb2 = Tk::Iwidgets::Buttonbox.new
-p btn1 = bb2.add(:text=>'Yes',   :command=>proc{puts 'Yes'})
-p btn2 = bb2.add(:text=>'No',    :command=>proc{puts 'No'})
-p btn3 = bb2.add(:text=>'Maybe', :command=>proc{puts 'Maybe'})
-bb2.default(btn1)
-bb2.pack(:expand=>true, :fill=>:both, :pady=>5)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/calendar.rb b/ext/tk/sample/tkextlib/iwidgets/sample/calendar.rb
deleted file mode 100644
index 4093997029..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/calendar.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-Tk::Iwidgets::Calendar.new(:command=>proc{|arg| puts(arg.date)},
-                           :weekendbackground=>'mistyrose',
-                           :weekdaybackground=>'ghostwhite',
-                           :outline=>'black', :startday=>'wednesday',
-                           :days=>%w(We Th Fr Sa Su Mo Tu)).pack
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/canvasprintbox.rb b/ext/tk/sample/tkextlib/iwidgets/sample/canvasprintbox.rb
deleted file mode 100644
index 1680aae695..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/canvasprintbox.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-Tk::Iwidgets::Canvasprintbox.new(:orient=>:landscape, :stretch=>1) \
-  .pack(:padx=>10, :pady=>10, :fill=>:both, :expand=>true)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/canvasprintdialog.rb b/ext/tk/sample/tkextlib/iwidgets/sample/canvasprintdialog.rb
deleted file mode 100644
index 1bedf2c543..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/canvasprintdialog.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-Tk::Iwidgets::Canvasprintdialog.new.activate
-
-Tk.mainloop
-
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/checkbox.rb b/ext/tk/sample/tkextlib/iwidgets/sample/checkbox.rb
deleted file mode 100644
index bd0a21fd7f..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/checkbox.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-cb = Tk::Iwidgets::Checkbox.new
-cb.add('bold',      :text=>'Bold')
-cb.add('italic',    :text=>'Italic')
-cb.add('underline', :text=>'Underline')
-cb.select('underline')
-cb.pack(:expand=>true, :fill=>:both, :padx=>10, :pady=>10)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/combobox.rb b/ext/tk/sample/tkextlib/iwidgets/sample/combobox.rb
deleted file mode 100644
index 1ce2c9085e..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/combobox.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-#
-# Non-editable Dropdown Combobox
-#
-cb1 = Tk::Iwidgets::Combobox.new(:labeltext=>'Month:',
-                                 :selectioncommand=>proc{
-                                   puts(cb1.get_curselection)
-                                 },
-                                 :editable=>false, :listheight=>185,
-                                 :popupcursor=>'hand1')
-
-cb1.insert_list('end', *%w(Jan Feb Mar Apr May June Jul Aug Sept Oct Nov Dec))
-
-
-#
-# Editable Dropdown Combobox
-#
-cb2 = Tk::Iwidgets::Combobox.new(:labeltext=>'Operating System:',
-                                 :selectioncommand=>proc{
-                                   puts(cb2.get_curselection)
-                                 })
-
-cb2.insert_list('end', *%w(Linux HP-UX SunOS Solaris Irix))
-cb2.insert_entry('end', 'L')
-
-cb1.pack(:padx=>10, :pady=>10, :fill=>:x)
-cb2.pack(:padx=>10, :pady=>10, :fill=>:x)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/dateentry.rb b/ext/tk/sample/tkextlib/iwidgets/sample/dateentry.rb
deleted file mode 100644
index 873f702cb5..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/dateentry.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-Tk::Iwidgets::Dateentry.new.pack
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/datefield.rb b/ext/tk/sample/tkextlib/iwidgets/sample/datefield.rb
deleted file mode 100644
index 30c72a1351..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/datefield.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-df = Tk::Iwidgets::Datefield.new(:command=>proc{puts(df.get)})
-df.pack(:fill=>:x, :expand=>true, :padx=>10,  :pady=>10)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/dialog.rb b/ext/tk/sample/tkextlib/iwidgets/sample/dialog.rb
deleted file mode 100644
index f9ceffb201..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/dialog.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-Thread.new{Tk.mainloop}
-
-d = Tk::Iwidgets::Dialog.new(:modality=>:application)
-
-d.buttonconfigure('OK', :command=>proc{puts 'OK'; d.deactivate true})
-d.buttonconfigure('Apply', :command=>proc{puts 'Apply'})
-d.buttonconfigure('Cancel', :command=>proc{puts 'Cancel'; d.deactivate false})
-d.buttonconfigure('Help', :command=>proc{puts 'Help'})
-
-TkListbox.new(d.child_site, :relief=>:sunken).pack(:expand=>true, :fill=>:both)
-
-if TkComm.bool(d.activate)
-  puts "Exit via OK button"
-else
-  puts "Exit via Cancel button"
-end
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/dialogshell.rb b/ext/tk/sample/tkextlib/iwidgets/sample/dialogshell.rb
deleted file mode 100644
index 240768a259..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/dialogshell.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-ds = Tk::Iwidgets::Dialogshell.new(:modality=>:none)
-
-ds.add('OK', :text=>'OK', :command=>proc{puts 'OK'; ds.deactivate})
-ds.add('Cancel', :text=>'Cancel', :command=>proc{puts 'Cancel'; ds.deactivate})
-ds.default('OK')
-
-TkButton.new(:text=>'ACTIVATE', :padx=>7, :pady=>7,
-             :command=>proc{puts ds.activate}).pack(:padx=>10, :pady=>10)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/disjointlistbox.rb b/ext/tk/sample/tkextlib/iwidgets/sample/disjointlistbox.rb
deleted file mode 100644
index 151a06f8da..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/disjointlistbox.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-djl = Tk::Iwidgets::Disjointlistbox.new.pack(:fill=>:both, :expand=>true,
-                                             :padx=>10,  :pady=>10)
-djl.set_lhs(*[0,2,4,5])
-djl.set_rhs(3,6)
-
-djl.insert_lhs(1,7,8)
-djl.insert_rhs(9)
-
-p djl.get_lhs
-p djl.get_rhs
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-1.rb b/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-1.rb
deleted file mode 100644
index 1bb68d7434..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-1.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-#########################################################
-#
-#  use Tk::UTF8_String() for a utf8 character
-#
-#########################################################
-require 'tk'
-require 'tkextlib/iwidgets'
-
-TkOption.add('*textBackground', 'white')
-
-ef  = Tk::Iwidgets::Entryfield.new(:command=>proc{puts "Return Pressed"})
-
-fef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Fixed:',
-                                   :fixed=>10, :width=>12)
-
-nef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Numeric:',
-                                   :validate=>:numeric, :width=>12)
-
-aef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Alphabetic:',
-                                   :validate=>:alphabetic, :width=>12,
-                                   :invalid=>proc{
-                                     puts "Alphabetic contents invalid"
-                                   })
-
-pef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Password:', :width=>12,
-                                   :show=>Tk::UTF8_String("\267"),
-                                                         ## <=== utf8 character
-                                   :command=>proc{puts "Return Pressed"})
-
-Tk::Iwidgets::Labeledwidget.alignlabels(ef, fef, nef, aef, pef)
-
-ef.pack(:fil=>:x,  :expand=>true, :padx=>10, :pady=>5)
-fef.pack(:fil=>:x,  :expand=>true, :padx=>10, :pady=>5)
-nef.pack(:fil=>:x,  :expand=>true, :padx=>10, :pady=>5)
-aef.pack(:fil=>:x,  :expand=>true, :padx=>10, :pady=>5)
-pef.pack(:fil=>:x,  :expand=>true, :padx=>10, :pady=>5)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-2.rb b/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-2.rb
deleted file mode 100644
index 0b75e56f9a..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-2.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-#########################################################
-#
-#  set $KCODE to 'utf' for a utf8 character
-#
-#########################################################
-unless defined?(::Encoding.default_external)
-  $KCODE='utf'
-else
-  DEFAULT_TK_ENCODING = 'UTF-8'
-end
-
-require 'tk'
-require 'tkextlib/iwidgets'
-
-TkOption.add('*textBackground', 'white')
-
-ef  = Tk::Iwidgets::Entryfield.new(:command=>proc{puts "Return Pressed"})
-
-fef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Fixed:',
-                                   :fixed=>10, :width=>12)
-
-nef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Numeric:',
-                                   :validate=>:numeric, :width=>12)
-
-aef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Alphabetic:',
-                                   :validate=>:alphabetic, :width=>12,
-                                   :invalid=>proc{
-                                     puts "Alphabetic contents invalid"
-                                   })
-
-pef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Password:', :width=>12,
-                                   :show=>"\267",  ## <=== utf8 character
-                                   :command=>proc{puts "Return Pressed"})
-
-Tk::Iwidgets::Labeledwidget.alignlabels(ef, fef, nef, aef, pef)
-
-ef.pack(:fil=>:x,  :expand=>true, :padx=>10, :pady=>5)
-fef.pack(:fil=>:x,  :expand=>true, :padx=>10, :pady=>5)
-nef.pack(:fil=>:x,  :expand=>true, :padx=>10, :pady=>5)
-aef.pack(:fil=>:x,  :expand=>true, :padx=>10, :pady=>5)
-pef.pack(:fil=>:x,  :expand=>true, :padx=>10, :pady=>5)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-3.rb b/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-3.rb
deleted file mode 100644
index 2aad4da2d8..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-3.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-#########################################################
-#
-#  set Tk.encoding = 'utf-8' for a utf8 character
-#
-#########################################################
-require 'tk'
-require 'tkextlib/iwidgets'
-
-Tk.encoding = 'utf-8'
-
-TkOption.add('*textBackground', 'white')
-
-ef  = Tk::Iwidgets::Entryfield.new(:command=>proc{puts "Return Pressed"})
-
-fef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Fixed:',
-                                   :fixed=>10, :width=>12)
-
-nef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Numeric:',
-                                   :validate=>:numeric, :width=>12)
-
-aef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Alphabetic:',
-                                   :validate=>:alphabetic, :width=>12,
-                                   :invalid=>proc{
-                                     puts "Alphabetic contents invalid"
-                                   })
-
-pef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Password:', :width=>12,
-                                   :show=>"\267",  ## <=== utf8 character
-                                   :command=>proc{puts "Return Pressed"})
-
-Tk::Iwidgets::Labeledwidget.alignlabels(ef, fef, nef, aef, pef)
-
-ef.pack(:fil=>:x,  :expand=>true, :padx=>10, :pady=>5)
-fef.pack(:fil=>:x,  :expand=>true, :padx=>10, :pady=>5)
-nef.pack(:fil=>:x,  :expand=>true, :padx=>10, :pady=>5)
-aef.pack(:fil=>:x,  :expand=>true, :padx=>10, :pady=>5)
-pef.pack(:fil=>:x,  :expand=>true, :padx=>10, :pady=>5)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/extbutton.rb b/ext/tk/sample/tkextlib/iwidgets/sample/extbutton.rb
deleted file mode 100644
index fbacebc563..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/extbutton.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-Tk::Iwidgets::Extbutton.new(:text=>'Bitmap example', :bitmap=>'info',
-                            :background=>'bisque',  :activeforeground=>'red',
-                            :bitmapforeground=>'blue', :defaultring=>true,
-                            :command=>proc{
-                              puts "Bisque is beautiful"
-                            }).pack(:expand=>true)
-
-#img = TkPhotoImage.new(:file=>File.join(File.dirname(File.expand_path(__FILE__)), '../../../images/earthris.gif'))
-img = TkPhotoImage.new(:file=>File.join(File.dirname(File.expand_path(__FILE__)), '../catalog_demo/images/clear.gif'))
-
-Tk::Iwidgets::Extbutton.new(:text=>'Image example', :relief=>:ridge,
-                            :image=>img, :imagepos=>:e, :font=>'9x15bold',
-                            :activebackground=>'lightyellow',
-                            :background=>'lightgreen').pack(:expand=>true)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/extfileselectionbox.rb b/ext/tk/sample/tkextlib/iwidgets/sample/extfileselectionbox.rb
deleted file mode 100644
index 2eb0c7aca0..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/extfileselectionbox.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-Tk::Iwidgets::Extfileselectionbox.new.pack(:padx=>10, :pady=>10,
-                                           :fill=>:both, :expand=>true)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/extfileselectiondialog.rb b/ext/tk/sample/tkextlib/iwidgets/sample/extfileselectiondialog.rb
deleted file mode 100644
index 24a32da49a..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/extfileselectiondialog.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-mainloop = Thread.new{Tk.mainloop}
-
-#
-# Non-modal example
-#
-nmfsd = Tk::Iwidgets::Extfileselectiondialog.new(:title=>'Non-Modal')
-nmfsd.buttonconfigure('OK', :command=>proc{
-                        puts "You selected #{nmfsd.get}"
-                        nmfsd.deactivate
-                      })
-nmfsd.activate
-
-#
-# Modal example
-#
-mfsd = Tk::Iwidgets::Extfileselectiondialog.new(:modality=>:application)
-mfsd.center
-if TkComm.bool(mfsd.activate)
-  puts "You selected #{mfsd.get}"
-else
-  puts "You cancelled the dialog"
-end
-
-
-mainloop.join
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/feedback.rb b/ext/tk/sample/tkextlib/iwidgets/sample/feedback.rb
deleted file mode 100644
index 27fe625a5d..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/feedback.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-Tk::Iwidgets::Feedback.new(:labeltext=>'Status', :steps=>20){|fb|
-  pack(:padx=>10, :pady=>10, :fill=>:both, :expand=>true)
-  TkTimer.new(500, 20, proc{fb.step}).start(2500)
-}
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/fileselectionbox.rb b/ext/tk/sample/tkextlib/iwidgets/sample/fileselectionbox.rb
deleted file mode 100644
index c87ee27a6c..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/fileselectionbox.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-Tk::Iwidgets::Fileselectionbox.new.pack(:padx=>10, :pady=>10,
-                                        :fill=>:both, :expand=>true)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/fileselectiondialog.rb b/ext/tk/sample/tkextlib/iwidgets/sample/fileselectiondialog.rb
deleted file mode 100644
index 1585bd4639..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/fileselectiondialog.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-mainloop = Thread.new{Tk.mainloop}
-
-#
-# Non-modal example
-#
-nmfsd = Tk::Iwidgets::Fileselectiondialog.new(:title=>'Non-Modal')
-nmfsd.buttonconfigure('OK', :command=>proc{
-                        puts "You selected #{nmfsd.get}"
-                        nmfsd.deactivate
-                      })
-nmfsd.activate
-
-#
-# Modal example
-#
-mfsd = Tk::Iwidgets::Fileselectiondialog.new(:modality=>:application)
-mfsd.center
-if TkComm.bool(mfsd.activate)
-  puts "You selected #{mfsd.get}"
-else
-  puts "You cancelled the dialog"
-end
-
-mainloop.join
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/finddialog.rb b/ext/tk/sample/tkextlib/iwidgets/sample/finddialog.rb
deleted file mode 100644
index a32a08ffbf..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/finddialog.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-mainloop = Thread.new{Tk.mainloop}
-
-st = Tk::Iwidgets::Scrolledtext.new.pack
-st.insert('end', "Now is the time for all good men\n")
-st.insert('end', "to come to the aid of their country")
-
-fd = Tk::Iwidgets::Finddialog.new(:textwidget=>st)
-fd.center(st)
-fd.activate
-
-mainloop.join
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/hierarchy.rb b/ext/tk/sample/tkextlib/iwidgets/sample/hierarchy.rb
deleted file mode 100644
index bb65a66b4d..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/hierarchy.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-def get_files(file)
-  dir = (file.empty?)? ENV['HOME'] : TkComm._fromUTF8(file)
-  Dir.chdir(dir) rescue return ''
-  Dir['*'].sort.collect{|f|
-    [TkComm._toUTF8(File.join(dir, f)), TkComm._toUTF8(f)]
-  }
-end
-
-Tk::Iwidgets::Hierarchy.new(:querycommand=>proc{|arg| get_files(arg.node)},
-                            :visibleitems=>'30x15',
-                            :labeltext=>ENV['HOME']).pack(:side=>:left,
-                                                          :expand=>true,
-                                                          :fill=>:both)
-
-# Tk::Iwidgets::Hierarchy.new(:querycommand=>[proc{|n| get_files(n)}, '%n'],
-#                           :visibleitems=>'30x15',
-#                           :labeltext=>ENV['HOME']).pack(:side=>:left,
-#                                                         :expand=>true,
-#                                                         :fill=>:both)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/hyperhelp.rb b/ext/tk/sample/tkextlib/iwidgets/sample/hyperhelp.rb
deleted file mode 100644
index dcda4030f3..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/hyperhelp.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-mainloop = Thread.new{Tk.mainloop}
-
-dir  = '/usr/local/ActiveTcl/demos/IWidgets/html/'
-href = [ 'hyperhelp.n', 'buttonbox.n', 'calendar.n' ]
-
-hh = Tk::Iwidgets::Hyperhelp.new(:topics=>href, :helpdir=>dir)
-hh.show_topic('hyperhelp.n')
-hh.activate
-
-mainloop.join
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/labeledframe.rb b/ext/tk/sample/tkextlib/iwidgets/sample/labeledframe.rb
deleted file mode 100644
index 52bf957208..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/labeledframe.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-lf = Tk::Iwidgets::Labeledframe.new(:labeltext=>'Entry Frame', :labelpos=>:n)
-lf.pack(:fill=>:both, :expand=>true, :padx=>10, :pady=>10)
-
-cs = lf.child_site
-
-Tk::Iwidgets::Entryfield.new(cs, :labeltext=>'Name:').pack(:side=>:top, :fill=>:x)
-Tk::Iwidgets::Spinint.new(cs, :labeltext=>'Number:').pack(:side=>:top, :fill=>:x)
-Tk::Iwidgets::Pushbutton.new(cs, :text=>'Details:').pack(:side=>:top, :fill=>:x)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/labeledwidget.rb b/ext/tk/sample/tkextlib/iwidgets/sample/labeledwidget.rb
deleted file mode 100644
index 8b45d2bcb0..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/labeledwidget.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-lw = Tk::Iwidgets::Labeledwidget.new(:labeltext=>'Canvas Widget',
-                                     :labelpos=>:s)
-lw.pack(:fill=>:both, :expand=>true, :padx=>10, :pady=>10)
-
-cw = TkCanvas.new(lw.child_site, :relief=>:raised, :width=>200, :height=>200,
-                  :borderwidth=>3, :background=>:white)
-cw.pack(:padx=>10, :pady=>10)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/mainwindow.rb b/ext/tk/sample/tkextlib/iwidgets/sample/mainwindow.rb
deleted file mode 100644
index 3e5e511a1e..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/mainwindow.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-mw = Tk::Iwidgets::Mainwindow.new
-
-mw.menubar.add(:menubutton, 'file', :text=>'File', :underline=>0,
-               :padx=>8, :pady=>2, :menu=>[
-                 [:options, {:tearoff=>false}],
-
-                 [:command, 'new', {
-                     :label=>'New', :underline=>0,
-                     :helpstr=>'Create a new file'
-                   }
-                 ],
-
-                 [:command, 'open', {
-                     :label=>'Open ...', :underline=>0,
-                     :helpstr=>'Open an existing file'
-                   }
-                 ],
-
-                 [:command, 'save', {
-                     :label=>'Save', :underline=>0,
-                     :helpstr=>'Save the current file'
-                   }
-                 ],
-
-                 [:command, 'saveas', {
-                     :label=>'Save As', :underline=>5,
-                     :helpstr=>'Save the file as a different name'
-                   }
-                 ],
-
-                 [:command, 'print', {
-                     :label=>'Print', :underline=>0,
-                     :helpstr=>'Print the file'
-                   }
-                 ],
-
-                 [:separator, 'sep1'],
-
-                 [:command, 'close', {
-                     :label=>'Close', :underline=>0,
-                     :helpstr=>'Close the file'
-                   }
-                 ],
-
-                 [:separator, 'sep2'],
-
-                 [:command, 'exit', {
-                     :label=>'Exit', :underline=>1,
-                     :helpstr=>'Exit this application'
-                   }
-                 ],
-
-                 nil
-               ])
-
-Tk::Iwidgets::Scrolledtext.new(mw.child_site).pack(:fill=>:both, :expand=>true)
-
-mw.activate
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/menubar.rb b/ext/tk/sample/tkextlib/iwidgets/sample/menubar.rb
deleted file mode 100644
index 389a622966..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/menubar.rb
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-helpvar = TkVariable.new
-viewmode = TkVariable.new
-
-menu_spec = [
-  [:menubutton, 'file', {
-      :text=>'File', :menu=>[
-        [:options, {:tearoff=>false}],
-
-        [:command, 'new', {
-            :label=>'New', :helpstr=>'Open new document',
-            :command=>proc{puts 'NEW'}
-          }
-        ],
-
-        [:command, 'close', {
-            :label=>'Close', :helpstr=>'Close current document',
-            :command=>proc{puts 'CLOSE'}
-          }
-        ],
-
-        [:separator, 'sep1'],
-
-        [:command, 'exit', {
-            :label=>'Exit', :helpstr=>'Exit application',
-            :command=>proc{exit}
-          }
-        ]
-      ]
-    }
-  ],
-
-  [:menubutton, 'edit', {
-      :text=>'Edit', :menu=>[
-        [:options, {:tearoff=>false}],
-
-        [:command, 'undo', {
-            :label=>'Undo', :underline=>0,
-            :helpstr=>'Undo last command',
-            :command=>proc{puts 'UNDO'}
-          }
-        ],
-
-        [:separator, 'sep2'],
-
-        [:command, 'cut', {
-            :label=>'Cut', :underline=>1,
-            :helpstr=>'Cut selection to clipboard',
-            :command=>proc{puts 'CUT'}
-          }
-        ],
-
-        [:command, 'copy', {
-            :label=>'Copy', :underline=>1,
-            :helpstr=>'Copy selection to clipboard',
-            :command=>proc{puts 'COPY'}
-          }
-        ],
-
-        [:command, 'paste', {
-            :label=>'Paste', :underline=>0,
-            :helpstr=>'Paste clipboard contents',
-            :command=>proc{puts 'PASTE'}
-          }
-        ]
-      ]
-    }
-  ],
-
-  [:menubutton, 'options', {
-      :text=>'Options', :menu=>[
-        [:options, {:tearoff=>false, :selectcolor=>'blue'}],
-
-        [:radiobutton, 'byName', {
-            :variable=>viewmode, :value=>'NAME',
-            :label=>'by Name', :helpstr=>'View files by name order',
-            :command=>proc{puts 'NAME'}
-          }
-        ],
-
-        [:radiobutton, 'byDate', {
-            :variable=>viewmode, :value=>'DATE',
-            :label=>'by Date', :helpstr=>'View files by date order',
-            :command=>proc{puts 'DATE'}
-          }
-        ],
-
-        [:cascade, 'prefs', {
-            :label=>'Preferences', :menu=>[
-              [:command, 'colors', {
-                  :label=>'Colors...', :helpstr=>'Change text colors',
-                  :command=>proc{puts 'COLORS'}
-                }
-              ],
-
-              [:command, 'fonts', {
-                  :label=>'Fonts...', :helpstr=>'Change text font',
-                  :command=>proc{puts 'COLORS'}
-                }
-              ]
-            ]
-          }
-        ]
-      ]
-    }
-  ]
-]
-
-#mb = Tk::Iwidgets::Menubar.new(:helpvariable=>helpvar,
-#                              :menubuttons=>menu_spec)
-mb = Tk::Iwidgets::Menubar.new(:helpvariable=>helpvar)
-mb.configure(:menubuttons=>menu_spec)
-
-fr = TkFrame.new(:width=>300, :height=>300)
-ef = TkEntry.new(:textvariable=>helpvar)
-
-mb.pack(:anchor=>:nw, :fill=>:x, :expand=>true)
-fr.pack(:fill=>:both, :expand=>true)
-ef.pack(:anchor=>:sw, :fill=>:x, :expand=>true)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/menubar2.rb b/ext/tk/sample/tkextlib/iwidgets/sample/menubar2.rb
deleted file mode 100644
index c3fd8bc35d..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/menubar2.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-helpvar = TkVariable.new
-viewmode = TkVariable.new
-
-mb = Tk::Iwidgets::Menubar.new
-mb.menubuttons = [
-  [:menubutton, 'file', {
-      :text=>'File', :menu=>[
-        [:command,   'new',   {:label=>'New'}],
-        [:command,   'close', {:label=>'Close'}],
-        [:separator, 'sep1'],
-        [:command,   'quit',  {:label=>'Quit'}]
-      ]
-    }
-  ],
-  [:menubutton, 'edit', {:text=>'Edit'}]
-]
-
-mb.add(:command, '.edit.undo', :label=>'Undo', :underline=>0)
-mb.add(:separator, '.edit.sep2')
-mb.add(:command, '.edit.cut',   :label=>'Cut',   :underline=>1)
-mb.add(:command, '.edit.copy',  :label=>'Copy',  :underline=>1)
-mb.add(:command, '.edit.paste', :label=>'Paste', :underline=>0)
-
-mb.add(:menubutton, '.options', :text=>'Options', :menu=>[
-         [:radiobutton, 'byName', {
-             :variable=>viewmode, :value=>'NAME', :label=>'by Name'}
-         ],
-         [:radiobutton, 'byDate', {
-             :variable=>viewmode, :value=>'DATE', :label=>'by Date'}
-         ]
-       ])
-
-mb.add(:cascade, '.options.prefs', :label=>'Preferences', :menu=>[
-         [:command, 'colors', {:label=>'Colors...'}],
-         [:command, 'fonts',  {:label=>'Fonts...'}]
-       ])
-
-mb.pack(:side=>:left, :anchor=>:nw, :fill=>:x, :expand=>true)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/messagebox1.rb b/ext/tk/sample/tkextlib/iwidgets/sample/messagebox1.rb
deleted file mode 100644
index 8f51ab754f..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/messagebox1.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-mb = Tk::Iwidgets::Messagebox.new(:hscrollmode=>:dynamic,
-                                  :labeltext=>'Messages', :labelpos=>:n,
-                                  :height=>120, :width=>550,
-                                  :savedir=>'/tmp', :textbackground=>'#d9d9d9')
-mb.pack(:padx=>5, :pady=>5, :fill=>:both, :expand=>true)
-
-mb.type_add('ERROR', :background=>'red', :foreground=>'white', :bell=>true)
-mb.type_add('WARNING', :background=>'yellow', :foreground=>'black')
-mb.type_add('INFO', :background=>'white', :foreground=>'black')
-
-mb.issue('This is an error message in red with a beep', 'ERROR')
-mb.issue('This warning message in yellow', 'WARNING')
-mb.issue('This is an informational message', 'INFO')
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/messagebox2.rb b/ext/tk/sample/tkextlib/iwidgets/sample/messagebox2.rb
deleted file mode 100644
index 9bb15ebec2..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/messagebox2.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-mb = Tk::Iwidgets::Messagebox.new(:hscrollmode=>:dynamic,
-                                  :labeltext=>'Messages', :labelpos=>:n,
-                                  :height=>120, :width=>550,
-                                  :savedir=>'/tmp', :textbackground=>'#d9d9d9')
-mb.pack(:padx=>5, :pady=>5, :fill=>:both, :expand=>true)
-
-error   = mb.type_add(:background=>'red', :foreground=>'white', :bell=>true)
-warning = mb.type_add(:background=>'yellow', :foreground=>'black')
-info    = mb.type_add(:background=>'white', :foreground=>'black')
-
-mb.issue('This is an error message in red with a beep', error)
-mb.issue('This warning message in yellow', warning)
-mb.issue('This is an informational message', info)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/messagedialog.rb b/ext/tk/sample/tkextlib/iwidgets/sample/messagedialog.rb
deleted file mode 100644
index ca73ed54d2..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/messagedialog.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-mainloop = Thread.new{Tk.mainloop}
-
-#
-# Standard question message dialog used for confirmation.
-#
-md = Tk::Iwidgets::Messagedialog.new(:title=>'Message Dialog',
-                                     :text=>'Are you sure ? ',
-                                     :bitmap=>'questhead', :modality=>:global)
-
-md.buttonconfigure('OK', :text=>'Yes')
-md.buttonconfigure('Cancel', :text=>'No')
-
-if TkComm.bool(md.activate)
-  md.text('Are you really sure ? ')
-  if TkComm.bool(md.activate)
-    puts 'Yes'
-  else
-    puts 'No'
-  end
-else
-  puts 'No'
-end
-
-md.destroy
-
-#
-# Copyright notice with automatic deactivation.
-#
-bmp = '@' + File.join(File.dirname(File.expand_path(__FILE__)), '../catalog_demo/images/text.xbm')
-
-cr = Tk::Iwidgets::Messagedialog.new(:title=>'Copyright',
-                                     :bitmap=>bmp, :imagepos=>:n,
-                                     :text=>"Copyright 200x XXX Corporation\nAll rights reserved")
-
-cr.hide('Cancel')
-
-cr.activate
-Tk.after(7000, proc{cr.deactivate; Tk.root.destroy})
-
-mainloop.join
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/notebook.rb b/ext/tk/sample/tkextlib/iwidgets/sample/notebook.rb
deleted file mode 100644
index 4305db4f5c..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/notebook.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-# Create the tabnotebook widget and pack it.
-nb = Tk::Iwidgets::Notebook.new(:width=>100, :height=>100)
-nb.pack(:anchor=>:nw, :fill=>:both, :expand=>true,
-        :side=>:left, :padx=>10, :pady=>10)
-
-# Add two pages to the tabnotebook,
-# labelled "Page One" and "Page Two"
-nb.add(:label=>'Page One')
-nb.add(:label=>'Page Two')
-
-# Get the child site frames of these two pages.
-page1CS = nb.child_site(0)
-page2CS = nb.child_site('Page Two')
-
-# Create buttons on each page of the tabnotebook.
-TkButton.new(page1CS, :text=>'Button One').pack
-TkButton.new(page2CS, :text=>'Button Two').pack
-
-# Select the first page of the tabnotebook.
-nb.select(0)
-
-# Create the scrollbar and associate the scrollbar
-# and the notebook together, then pack the scrollbar
-nb.scrollbar(TkScrollbar.new).pack(:fill=>:y, :expand=>true, :pady=>10)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/notebook2.rb b/ext/tk/sample/tkextlib/iwidgets/sample/notebook2.rb
deleted file mode 100644
index a3b00b2a87..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/notebook2.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-# Create the tabnotebook widget and pack it.
-nb = Tk::Iwidgets::Notebook.new(:width=>100, :height=>100)
-nb.pack(:anchor=>:nw, :fill=>:both, :expand=>true,
-        :side=>:top, :padx=>10, :pady=>0)
-
-# Add two pages to the tabnotebook,
-# labelled "Page One" and "Page Two"
-nb.add(:label=>'Page One')
-nb.add(:label=>'Page Two')
-
-# Get the child site frames of these two pages.
-page1CS = nb.child_site(0)
-page2CS = nb.child_site('Page Two')
-
-# Create buttons on each page of the tabnotebook.
-TkButton.new(page1CS, :text=>'Button One').pack
-TkButton.new(page2CS, :text=>'Button Two').pack
-
-# Select the first page of the tabnotebook.
-nb.select(0)
-
-# Create the scrollbar and associate the scrollbar
-# and the notebook together, then pack the scrollbar
-nb.xscrollbar(TkScrollbar.new).pack(:fill=>:x, :expand=>true, :padx=>10)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/optionmenu.rb b/ext/tk/sample/tkextlib/iwidgets/sample/optionmenu.rb
deleted file mode 100644
index 2dc7eaf411..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/optionmenu.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-om = Tk::Iwidgets::Optionmenu.new(:labelmargin=>5, :labelpos=>:w,
-                                  :labeltext=>"Operating System :")
-
-om.insert('end', 'Unix', 'VMS', 'Linux', 'OS/2', 'Windows NT', 'DOS')
-om.sort_ascending
-om.select('Linux')
-
-om.pack(:padx=>10, :pady=>10)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/panedwindow.rb b/ext/tk/sample/tkextlib/iwidgets/sample/panedwindow.rb
deleted file mode 100644
index ba36319f85..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/panedwindow.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-pw = Tk::Iwidgets::Panedwindow.new(:width=>300, :height=>300)
-
-pw.add('top')
-pw.add('middle', :margin=>10)
-pw.add('bottom', :margin=>10, :minimum=>10)
-
-pw.pack(:fill=>:both, :expand=>true)
-
-pw.child_site_list.each{|pane|
-  TkButton.new(pane, :text=>pane.path, :relief=>:raised,
-               :borderwidth=>2).pack(:fill=>:both, :expand=>true)
-}
-
-pw.fraction(50,30,20)
-pw.paneconfigure(0, :minimum=>20)
-pw.paneconfigure('bottom', :margin=>15)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/panedwindow2.rb b/ext/tk/sample/tkextlib/iwidgets/sample/panedwindow2.rb
deleted file mode 100644
index 4abd5f4a45..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/panedwindow2.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-pw = Tk::Iwidgets::Panedwindow.new(:width=>300, :height=>300)
-
-top = pw.add
-middle = pw.add(:margin=>10)
-bottom = pw.add(:margin=>10, :minimum=>10)
-
-pw.pack(:fill=>:both, :expand=>true)
-
-pw.child_site_list.each{|pane|
-  TkButton.new(pane, :text=>pane.path, :relief=>:raised,
-               :borderwidth=>2).pack(:fill=>:both, :expand=>true)
-}
-
-pw.fraction(50,30,20)
-pw.paneconfigure(0, :minimum=>20)  # 0 == pw.index(top)
-pw.paneconfigure(bottom, :margin=>15)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/promptdialog.rb b/ext/tk/sample/tkextlib/iwidgets/sample/promptdialog.rb
deleted file mode 100644
index 7f011f4833..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/promptdialog.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-mainloop = Thread.new{Tk.mainloop}
-
-TkOption.add('*textBackground', 'white')
-
-pd = Tk::Iwidgets::Promptdialog.new(:modality=>:global, :title=>'Password',
-                                    :labeltext=>'Password:', :show=>'*')
-pd.hide('Apply')
-
-if TkComm.bool(pd.activate)
-  puts "Password entered: #{pd.get}"
-else
-  puts "Password prompt cancelled"
-end
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/pushbutton.rb b/ext/tk/sample/tkextlib/iwidgets/sample/pushbutton.rb
deleted file mode 100644
index 5d3bdc7efd..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/pushbutton.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-Tk::Iwidgets::Pushbutton.new(:text=>'Hello',
-                             :command=>proc{puts 'Hello World'},
-                             :defaultring=>true).pack(:padx=>10, :pady=>10)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/radiobox.rb b/ext/tk/sample/tkextlib/iwidgets/sample/radiobox.rb
deleted file mode 100644
index 470ed8cee5..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/radiobox.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-rb = Tk::Iwidgets::Radiobox.new(:labeltext=>'Fonts')
-rb.add('times',     :text=>'Times')
-rb.add('helvetica', :text=>'Helvetica')
-rb.add('courier',   :text=>'Courier')
-rb.add('symbol',    :text=>'Symbol')
-rb.select('courier')
-rb.pack(:expand=>true, :fill=>:both, :padx=>10, :pady=>10)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/scrolledcanvas.rb b/ext/tk/sample/tkextlib/iwidgets/sample/scrolledcanvas.rb
deleted file mode 100644
index 85e6a47b1a..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/scrolledcanvas.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-sc = Tk::Iwidgets::Scrolledcanvas.new
-
-sc.create(TkcRectangle, 100, 100, 400, 400, :fill=>'red')
-TkcRectangle.new(sc, 300, 300, 600, 600, :fill=>'green')
-TkcRectangle.new(sc, [[200, 200], [500, 500]], :fill=>'blue')
-
-sc.pack(:expand=>true, :fill=>:both, :padx=>10, :pady=>10)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/scrolledframe.rb b/ext/tk/sample/tkextlib/iwidgets/sample/scrolledframe.rb
deleted file mode 100644
index 91d22131c0..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/scrolledframe.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-sf = Tk::Iwidgets::Scrolledframe.new(:width=>150, :height=>180,
-                                     :labeltext=>'scrolledframe')
-cs = sf.child_site
-
-TkButton.new(cs, :text=>'Hello').pack(:pady=>10)
-TkButton.new(cs, :text=>'World').pack(:pady=>10)
-TkButton.new(cs, :text=>'This is a test').pack(:pady=>10)
-TkButton.new(cs, :text=>'This is a really big button').pack(:pady=>10)
-TkButton.new(cs, :text=>'This is another really big button').pack(:pady=>10)
-TkButton.new(cs, :text=>'This is the last really big button').pack(:pady=>10)
-
-sf.pack(:expand=>true, :fill=>:both, :padx=>10, :pady=>10)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/scrolledhtml.rb b/ext/tk/sample/tkextlib/iwidgets/sample/scrolledhtml.rb
deleted file mode 100644
index f825483b2c..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/scrolledhtml.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-TkOption.add('*textBackground', 'white')
-
-sh = Tk::Iwidgets::Scrolledhtml.new(:fontname=>'helvetica',
-                                    :linkcommand=>proc{|href|
-                                      sh.import_link(href)
-                                    })
-sh.pack(:expand=>true, :fill=>:both, :padx=>10, :pady=>10)
-
-sh.import(Tk.getOpenFile(:title=>'select HTML document'))
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/scrolledlistbox.rb b/ext/tk/sample/tkextlib/iwidgets/sample/scrolledlistbox.rb
deleted file mode 100644
index 3872fb7d40..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/scrolledlistbox.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-TkOption.add('*textBackground', 'white')
-
-slb = Tk::Iwidgets::Scrolledlistbox.new(:selectmode=>:single,
-                                        :vscrollmode=>:static,
-                                        :hscrollmode=>:dynamic,
-                                        :labeltext=>'List',
-                                        :selectioncommand=>proc{
-                                          puts(slb.get_curselection)
-                                        },
-                                        :dblclickcommand=>proc{
-                                          puts('Double Click')
-                                          puts(slb.get_curselection)
-                                        })
-slb.pack(:expand=>true, :fill=>:both, :padx=>10, :pady=>10)
-
-slb.insert('end', *['Hello', 'Out There', 'World'])
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/scrolledtext.rb b/ext/tk/sample/tkextlib/iwidgets/sample/scrolledtext.rb
deleted file mode 100644
index 4965039371..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/scrolledtext.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-st = Tk::Iwidgets::Scrolledtext.new(:hscrollmode=>:dynamic, :wrap=>:none,
-                                    :labeltext=>'Password File')
-st.pack(:expand=>true, :fill=>:both, :padx=>10, :pady=>10)
-
-st.import('/etc/passwd')
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/selectionbox.rb b/ext/tk/sample/tkextlib/iwidgets/sample/selectionbox.rb
deleted file mode 100644
index 8c0b68a22e..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/selectionbox.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-TkOption.add('*textBackground', 'white')
-
-sb = Tk::Iwidgets::Selectionbox.new.pack(:padx=>10, :pady=>10,
-                                         :fill=>:both, :expand=>true)
-
-sb.insert_items('end', *['Hello', 'Out There', 'World'])
-
-TkLabel.new(sb.child_site,
-            :text=>'Child Site is Here').pack(:fill=>:x, :padx=>10, :pady=>10)
-
-sb.insert_items(2, 'Cruel Cruel')
-
-sb.selection_set(1)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/selectiondialog.rb b/ext/tk/sample/tkextlib/iwidgets/sample/selectiondialog.rb
deleted file mode 100644
index 9fbf8b7d2a..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/selectiondialog.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-mainloop = Thread.new{Tk.mainloop}
-
-TkButton.new(:text=>'QUIT',
-             :command=>proc{Tk.root.destroy}).pack(:padx=>10, :pady=>10)
-
-Tk::Iwidgets::Selectiondialog.new.activate
-
-mainloop.join
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/shell.rb b/ext/tk/sample/tkextlib/iwidgets/sample/shell.rb
deleted file mode 100644
index 4cbf4416c0..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/shell.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-sh = Tk::Iwidgets::Shell.new(:modality=>:application,
-                             :padx=>20, :pady=>20, :title=>'Shell')
-
-TkButton.new(:text=>'ACTIVATE', :padx=>7, :pady=>7,
-             :command=>proc{puts sh.activate}).pack(:padx=>10, :pady=>10)
-
-TkLabel.new(sh.child_site, :text=>'SHELL').pack
-TkButton.new(sh.child_site, :text=>'YES',
-             :command=>proc{sh.deactivate 'press YES'}).pack(:fill=>:x)
-TkButton.new(sh.child_site, :text=>'NO',
-             :command=>proc{sh.deactivate 'press NO'}).pack(:fill=>:x)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/spindate.rb b/ext/tk/sample/tkextlib/iwidgets/sample/spindate.rb
deleted file mode 100644
index 38d9b49c86..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/spindate.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-Tk::Iwidgets::Spindate.new.pack(:padx=>10, :pady=>10)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/spinint.rb b/ext/tk/sample/tkextlib/iwidgets/sample/spinint.rb
deleted file mode 100644
index 1887f46e05..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/spinint.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-TkOption.add('*textBackground', 'white')
-
-Tk::Iwidgets::Spinint.new(:labeltext=>'Temperature', :labelpos=>:w, :width=>5,
-                          :fixed=>true, :range=>[32, 212]).pack(:pady=>10)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/spinner.rb b/ext/tk/sample/tkextlib/iwidgets/sample/spinner.rb
deleted file mode 100644
index 2e64bdfb08..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/spinner.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-class Spinner_demo < TkWindow
-  Months = %w(January February March April May June July August September October November December)
-
-  def block_input(c)
-    false
-  end
-
-  def spin_month(step)
-    index = Months.index(@spinner.get) + step
-    index = 11 if index < 0
-    index = 0 if index > 11
-
-    @spinner.value = Months[index]
-  end
-
-  def initialize(parent=nil)
-    @spinner = Tk::Iwidgets::Spinner.new(parent, :labeltext=>'Month : ',
-                                         :width=>10, :fixed=>10,
-                                         :validate=>proc{|c| block_input},
-                                         :decrement=>proc{spin_month -1},
-                                         :increment=>proc{spin_month 1})
-    @path = @spinner
-    @spinner.insert(0, Months[0])
-  end
-end
-
-Spinner_demo.new.pack(:padx=>10, :pady=>10)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/spintime.rb b/ext/tk/sample/tkextlib/iwidgets/sample/spintime.rb
deleted file mode 100644
index 597e7d014c..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/spintime.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-Tk::Iwidgets::Spintime.new.pack(:padx=>10, :pady=>10)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/tabnotebook.rb b/ext/tk/sample/tkextlib/iwidgets/sample/tabnotebook.rb
deleted file mode 100644
index 0c94cd1738..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/tabnotebook.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-# Create the tabnotebook widget and pack it.
-tn = Tk::Iwidgets::Tabnotebook.new(:width=>300, :height=>100)
-tn.pack(:anchor=>:nw, :fill=>:both, :expand=>true,
-        :side=>:left, :padx=>10, :pady=>10)
-
-# Add two pages to the tabnotebook,
-# labelled "Page One" and "Page Two"
-tn.add(:label=>'Page One')
-tn.add(:label=>'Page Two')
-
-# Get the child site frames of these two pages.
-page1CS = tn.child_site(0)
-page2CS = tn.child_site('Page Two')
-
-# Create buttons on each page of the tabnotebook.
-TkButton.new(page1CS, :text=>'Button One').pack
-TkButton.new(page2CS, :text=>'Button Two').pack
-
-# Select the first page of the tabnotebook.
-tn.select(0)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/tabnotebook2.rb b/ext/tk/sample/tkextlib/iwidgets/sample/tabnotebook2.rb
deleted file mode 100644
index 57f9e46214..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/tabnotebook2.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-# Create the tabnotebook widget and pack it.
-tn = Tk::Iwidgets::Tabnotebook.new(:width=>300, :height=>100)
-tn.pack(:anchor=>:nw, :fill=>:both, :expand=>true,
-        :side=>:top, :padx=>10, :pady=>0)
-
-# Add two pages to the tabnotebook,
-# labelled "Page One" and "Page Two"
-tn.add(:label=>'Page One')
-tn.add(:label=>'Page Two')
-
-# Get the child site frames of these two pages.
-page1CS = tn.child_site(0)
-page2CS = tn.child_site('Page Two')
-
-# Create buttons on each page of the tabnotebook.
-TkButton.new(page1CS, :text=>'Button One').pack
-TkButton.new(page2CS, :text=>'Button Two').pack
-
-# Select the first page of the tabnotebook.
-tn.select(0)
-
-# Create the scrollbar
-# and the notebook together, then pack the scrollbar
-tn.xscrollbar(TkScrollbar.new).pack(:fill=>:x, :expand=>true, :padx=>10)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/tabset.rb b/ext/tk/sample/tkextlib/iwidgets/sample/tabset.rb
deleted file mode 100644
index 99d5ac6071..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/tabset.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-# Create a listbox with two items (one and two)
-l = TkListbox.new(:selectmode=>:single, :exportselection=>false).pack
-l.insert('end', 'one')
-l.insert('end', 'two')
-l.selection_set(0)
-
-# Define a proc that knows how to select an item
-# from a list given an index from the tabset -command callback.
-selectItem = proc{|item|
-  l.selection_clear(l.curselection)
-  l.selection_set(item)
-  l.see(item)
-}
-
-# Create a tabset, set its -command to call selectItem
-# Add two labels to the tabset (one and two).
-ts = Tk::Iwidgets::Tabset.new(:command=>selectItem)
-ts.add(:label=>1)
-ts.add(:label=>2)
-ts.select(0)
-ts.pack(:fill=>:x, :expand=>true)
-
-# Define a proc that knows how to select a tab
-# given a y pixel coordinate from the list..
-selectTab = proc{|y| ts.select(l.nearest(y)) }
-
-# bind button 1 press to the selectTab procedure.
-l.bind('ButtonPress-1', proc{|y| selectTab.call(y) }, '%y')
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/timeentry.rb b/ext/tk/sample/tkextlib/iwidgets/sample/timeentry.rb
deleted file mode 100644
index 5841f0aadf..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/timeentry.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-Tk::Iwidgets::Timeentry.new.pack
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/timefield.rb b/ext/tk/sample/tkextlib/iwidgets/sample/timefield.rb
deleted file mode 100644
index e2824b17aa..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/timefield.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-tf = Tk::Iwidgets::Timefield.new(:command=>proc{puts(tf.get)})
-tf.pack(:fill=>:x, :expand=>true, :padx=>10,  :pady=>10)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/toolbar.rb b/ext/tk/sample/tkextlib/iwidgets/sample/toolbar.rb
deleted file mode 100644
index 3cbaec210b..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/toolbar.rb
+++ /dev/null
@@ -1,153 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-##########################################
-# icon images
-editcopy22 = TkPhotoImage.new(:data=><<'EOD')
-   R0lGODlhFgAWAIUAAPwCBBQSFPz+/DQyNISChDw6PMzKzMTGxERGRIyKjFxa
-   XMTCvKSmpHR2dPz6/Pz29PTq3MS2rPz69MTCxFxWVHx6dJyWjNzSzPz27Pzy
-   7Pzu5PTm3NTKvIR+fJyGfHxuZHxqXNTCtPTq5PTi1PTezNS+rExOTFRORMyy
-   lPTaxOzWxOzSvNze3NTOxMy2nMyulMyqjAQCBAAAAAAAAAAAAAAAAAAAAAAA
-   AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbY
-   QIBwSCwahYGkUnk0BgTQ6IAQaBKfUWhBYKhaAU+CgXAQIAyChLeJzSIQhcH6
-   GFaM0QtGY5kstqEODw8QEQELAhJTc08KBBMEFBUWDRcBE1pca20SGBkaEBsc
-   AY5maFRIAgoLHRQRHh8gIQFlZnByqA8ZGSIQIyQjJQEmYgJ5p2ACrK4gJx4g
-   KIZZAgdeAQ4ZI9kjKSor0AwEjeAs1S0cHAslLi4vMDDRWeRIfEsxMeET4ATy
-   VoYLC5fizXEiAR84BeMG+pEm8EsAFhAjSlR4hR6fLxiF0AkCACH+aENyZWF0
-   ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5
-   OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2
-   ZWxjb3IuY29tADs=
-EOD
-
-editcut22 = TkPhotoImage.new(:data=><<'EOD')
-   R0lGODlhFgAWAIMAAPwCBAQCBAwCBPz+/OTi5JyanOzq7DQyNGxqbAAAAAAA
-   AAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARbEMhJq704gxBE
-   0Bf3cZo4kRJqBQNRfBucyudgvJS6VaxLzyMa6/bLiWA9HOg4VIIkL5vzuRkc
-   pkvRIIAorphJLzBW84WEuRZWp6uaT7J2Sh1Hit3OY/ZO7WvsEQAh/mhDcmVh
-   dGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAx
-   OTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRl
-   dmVsY29yLmNvbQA7
-EOD
-
-editpaste22 = TkPhotoImage.new(:data=><<'EOD')
-   R0lGODlhFgAWAIYAAPwCBBQWFDw6FHRuFGRaBFxSBAQCBAQKBCQiBIx6HPz6
-   /NTOfKyiXDQuFOTm5Pz+/Ozu7PTq5Pz63PTyxNTOjKSeRExGLMTGxMzKzNTS
-   1NTW1Dw2NKSmpKyqrKSipJyanNzWlLy6ZLSuVIx6FISChIyKhJSSlCQiJLS2
-   tDw6NDQyNCQiFCQmHBQSDGRiZHRydGxubHx6dGxqbFxeXGRmZFxaXCwuLOzq
-   7KyurHx+fDwmFEQuFCweFCQWDBQODBwaHBweHKSinJSWlOTi5JyepHR2dDw6
-   PBQSFNze3ERGRIyKjIyOjISGhPz29Pzy7MS2rMzOzFRWVHx2dHxybDQiFPz2
-   7Pzu5PTq3PTm1NTCtJyGdHxuZHxqXPzq3PTaxNS6pFxWVFRKRNS2nPTi1PTS
-   tNSulNzOxNSynMymhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-   AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAA
-   LAAAAAAWABYAAAf/gACCgwABAgMEBYSLggaOjgcICQoLDA2Pj4MGDg8QEZ4F
-   DxITFBUWFxcYGRobjQ8cHR4fCQ8gCyEiFSMWJCUkJieNEB4dKB4pKissK8wr
-   LS4vMDHBAAYQHx8dFx0fJDIzNDU0M+IyHzaNNyg43Ng5Ojs7Ojw9Pj9AMkCN
-   DiZB/h9CSOx4QLCgihItqBkYgqIDESElitAYWJCgkQcXjjRCgi1Ihw4BB5LA
-   QOLCgyQYHihpUU3DBw5ElpAgAYNixSRJjKjQaECDCRPZPDB5IbIGSQwKLnh4
-   wbInLA4kmJB4oaPiAwVNnER40hRK1BIAaVatUZJEFCkmpmjgCeWDCalFe4q4
-   oFKwSRUrEa5gycLzwq8lUnPQ4PEgSpYcUZ5o2cIlS1O/JHLEDdfjQZMIVrpg
-   weLFy5e+M6WSmBGlxYMYYBRzCaOFi5imHWBIfOEiShLTVjaP6eyFTBmN1TA5
-   OvLDjJksWb58OVMGDRqWjAYdmU79SIvpjqJr104nEAAh/mhDcmVhdGVkIGJ5
-   IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5
-   OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29y
-   LmNvbQA7
-EOD
-
-editdelete22 = TkPhotoImage.new(:data=><<'EOD')
-   R0lGODlhFgAWAIYAAASC/FRSVExKTERCRDw6PDQyNCwuLBweHBwaHAwODAwK
-   DAQCBExOTNze3NTW1MTGxLS2tJyanPz+/Ozu7BQSFCwqLDw+POTi5PTu7MzK
-   xIR+fCQmJPz6/Oze1NTGvPz69Pzy7Pz29LyyrPy+vPyupPTm1BQWFIQCBPwC
-   BMS6rPzSzNTOxPTi1NS+rPTezNzOxPTizOzWxMy2pOzaxMy2nPTaxOzOtMyy
-   nOzSvMyqjPx+fOzGpMSihPTq3OzKrOTCpNzKxNTCtAAAAAAAAAAAAAAAAAAA
-   AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-   AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-   AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-   AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAA
-   LAAAAAAWABYAAAf8gACCAQIDBAUGBwgJCgsLgpCRAAwNlZYODxALEY+SkAMN
-   EqKjEw0UD5yegqCjrRMVEqidkgWhraMWF7GptLa3EgEWFRSOnhW+vxgZEBqz
-   kBvItxwdHryRCNGjHyAhHSLOgtgSI60c2yQjJd+eJqEnKK0hJCgnJSngAO0S
-   F+8qEvL0VrBogW+BLX4oVKgIyMIFQU8KfDV4R+8FDBcxZBREthAFiRIsOsyg
-   sVEUh4Un3pGoUcPGjZInK65QicPlxg8oX5RwqNJGjo0hdJwQ6EIkjRM6dvDY
-   CKIHSBc1Ztjw4eOH0oIrsgIJEqSFDBo0cuTgsdSTo7No0xYTZCcQACH+aENy
-   ZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29y
-   IDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cu
-   ZGV2ZWxjb3IuY29tADs=
-EOD
-
-text22 = TkPhotoImage.new(:data=><<'EOD')
-   R0lGODlhFgAWAIQAAPwCBAQCBBwaHAwKDBQSFLy+vLS2tJSWlBQWFKyqrFRS
-   VCwqLDQyNNTS1GxqbFxaXJyanIyOjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-   AAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAVcICCOZGmK
-   QSoMaZsShBsQBdAapHvgaIDUqUPJlRjSbAoT0fRDKgODRbF0PLUYjZO2F2Bs
-   t9evNix+dsvDlGKK5jraudQb7qbX6a2HEJ+ycyF+LRE8ZTI+fX5oGCEAIf5o
-   Q3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxD
-   b3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3
-   dy5kZXZlbGNvci5jb20AOw==
-EOD
-
-##########################################
-
-bmp_dir = File.join(File.dirname(File.expand_path(__FILE__)),
-                    '../catalog_demo/images')
-
-##########################################
-
-status_var = TkVariable.new
-radio_var  = TkVariable.new
-check_var1 = TkVariable.new
-check_var2 = TkVariable.new
-
-tb = Tk::Iwidgets::Toolbar.new(:helpvariable=>status_var)
-
-##########################################
-
-tb.add(:button, :helpstr=>'Copy It', :image=>editcopy22,
-       :balloonstr=>'Copy', :command=>proc{puts 'Copy It'})
-
-tb.add(:button, :helpstr=>'Cut It', :image=>editcut22,
-       :balloonstr=>'Cut', :command=>proc{puts 'Cut It'})
-
-tb.add(:button, :helpstr=>'Paste It', :image=>editpaste22,
-       :balloonstr=>'Paste', :command=>proc{puts 'Paste It'})
-
-tb.add(:button, :helpstr=>'Delete It', :image=>editdelete22,
-       :balloonstr=>'Delete', :command=>proc{puts 'Delete It'})
-
-#--------------------------------
-
-tb.add(:frame, :borderwidth=>1, :width=>10, :height=>10)
-
-#--------------------------------
-
-tb.add(:radiobutton, :variable=>radio_var, :value=>'Box',
-       :bitmap=>"@#{bmp_dir}/box.xbm",
-       :helpstr=>'Radio Button #1', :balloonstr=>'Radio',
-       :command=>proc{puts 'Radio Button "Box"'})
-
-tb.add(:radiobutton, :variable=>radio_var, :value=>'Line',
-       :bitmap=>"@#{bmp_dir}/line.xbm",
-       :helpstr=>'Radio Button #2', :balloonstr=>'Radio',
-       :command=>proc{puts 'Radio Button "Line"'})
-
-tb.add(:radiobutton, :variable=>radio_var, :value=>'Oval',
-       :bitmap=>"@#{bmp_dir}/oval.xbm",
-       :helpstr=>'Radio Button #3', :balloonstr=>'Radio',
-       :command=>proc{puts 'Radio Button "Oval"'})
-
-#--------------------------------
-
-tb.add(:frame, :borderwidth=>1, :width=>10, :height=>10)
-
-#--------------------------------
-
-tb.add(:checkbutton, :variable=>check_var1, :onvalue=>'yes', :offvalue=>'no',
-       :image=>text22, :command=>proc{puts 'Checkbutton 1'})
-
-tb.add(:checkbutton, :variable=>check_var2, :onvalue=>'yes', :offvalue=>'no',
-       :bitmap=>"@#{bmp_dir}/points.xbm", :command=>proc{puts 'Checkbutton 2'})
-
-tb.pack(:side=>:top, :anchor=>:nw)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/watch.rb b/ext/tk/sample/tkextlib/iwidgets/sample/watch.rb
deleted file mode 100644
index b06f173eee..0000000000
--- a/ext/tk/sample/tkextlib/iwidgets/sample/watch.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-require 'tk'
-require 'tkextlib/iwidgets'
-
-Thread.new{
-  trap('INT') {puts 'catch SIGINT'}
-  sleep 5
-  trap('INT', 'DEFAULT')
-}
-
-Tk::Iwidgets::Watch.new(:state=>:disabled, :showampm=>:no,
-                        :width=>155, :height=>155){|w|
-  w.pack(:padx=>10, :pady=>10, :fill=>:both, :expand=>true)
-  # TkTimer.new(1000, -1, proc{w.show; Tk.update}).start
-  TkTimer.new(25, -1, proc{w.show; Tk.update}).start
-}
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/tcllib/Orig_LICENSE.txt b/ext/tk/sample/tkextlib/tcllib/Orig_LICENSE.txt
deleted file mode 100644
index 975f23e3f1..0000000000
--- a/ext/tk/sample/tkextlib/tcllib/Orig_LICENSE.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-
-  >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-  >>>  The following text is the original 'license.term' of tklib    <<<
-  >>>  extension.                                                    <<<
-  >>>  Original Tcl files are not include in this directory, because <<<
-  >>>  of all of them are rewritten to Ruby files.                   <<<
-  >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-
-This software is copyrighted by Ajuba Solutions and other parties.
-The following terms apply to all files associated with the software unless
-explicitly disclaimed in individual files.
-
-The authors hereby grant permission to use, copy, modify, distribute,
-and license this software and its documentation for any purpose, provided
-that existing copyright notices are retained in all copies and that this
-notice is included verbatim in any distributions. No written agreement,
-license, or royalty fee is required for any of the authorized uses.
-Modifications to this software may be copyrighted by their authors
-and need not follow the licensing terms described here, provided that
-the new terms are clearly indicated on the first page of each file where
-they apply.
-
-IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
-FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
-DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
-IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
-NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
-MODIFICATIONS.
-
-GOVERNMENT USE: If you are acquiring this software on behalf of the
-U.S. government, the Government shall have only "Restricted Rights"
-in the software and related documentation as defined in the Federal
-Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
-are acquiring the software on behalf of the Department of Defense, the
-software shall be classified as "Commercial Computer Software" and the
-Government shall have only "Restricted Rights" as defined in Clause
-252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
-authors grant the U.S. Government and others acting in its behalf
-permission to use and distribute the software in accordance with the
-terms specified in this license.
diff --git a/ext/tk/sample/tkextlib/tcllib/datefield.rb b/ext/tk/sample/tkextlib/tcllib/datefield.rb
deleted file mode 100644
index 101950da1a..0000000000
--- a/ext/tk/sample/tkextlib/tcllib/datefield.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/ruby
-# frozen_string_literal: false
-
-require 'tk'
-require 'tkextlib/tcllib/datefield'
-require 'parsedate'
-
-Tk.root.title('Datefield example')
-
-
-my_date1 = TkVariable.new
-my_date2 = TkVariable.new
-my_date1.trace('w'){
-  begin
-    t = Time.local(*(ParseDate.parsedate(my_date1.value)))
-    my_date2.value = t.strftime('%A')
-  rescue
-    # ignore error
-  end
-}
-
-df = Tk::Tcllib::Datefield.new(:textvariable=>my_date1)
-Tk.grid(TkLabel.new(:text=>'Enter a date:', :anchor=>:e), df, :sticky=>:ew)
-Tk.grid(TkLabel.new(:text=>'That date is a:', :anchor=>:e),
-        TkLabel.new(:textvariable=>my_date2, :relief=>:sunken, :width=>12),
-        :sticky=>:ew)
-
-df.set_focus
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/tcllib/plotdemos1.rb b/ext/tk/sample/tkextlib/tcllib/plotdemos1.rb
deleted file mode 100644
index 89166c1c30..0000000000
--- a/ext/tk/sample/tkextlib/tcllib/plotdemos1.rb
+++ /dev/null
@@ -1,159 +0,0 @@
-#!/usr/bin/ruby
-# frozen_string_literal: false
-
-require 'tk'
-require 'tkextlib/tcllib/plotchart'
-
-###############################
-
-c1 = TkCanvas.new(:background=>'white', :width=>400, :height=>200)
-c2 = TkCanvas.new(:background=>'white', :width=>400, :height=>200)
-c3 = TkCanvas.new(:background=>'white', :width=>400, :height=>200)
-Tk.pack(c1,c2,c3, :fill=>:both, :side=>:top)
-
-h = TkToplevel.new(:title=>'h')
-hc1 = TkCanvas.new(h, :background=>'white', :width=>400, :height=>200)
-hc2 = TkCanvas.new(h, :background=>'white', :width=>400, :height=>200)
-Tk.pack(hc1,hc2, :fill=>:both, :side=>:top)
-
-v = TkToplevel.new(:title=>'v')
-vc1 = TkCanvas.new(v, :background=>'white', :width=>400, :height=>200)
-vc2 = TkCanvas.new(v, :background=>'white', :width=>400, :height=>200)
-vc3 = TkCanvas.new(v, :background=>'white', :width=>400, :height=>200)
-Tk.pack(vc1,vc2,vc3, :fill=>:both, :side=>:top)
-
-###############################
-
-s = Tk::Tcllib::Plotchart::XYPlot.new(c1, [0.0, 100.0, 10.0],
-                                          [0.0, 100.0, 20.0])
-
-
-xd =    5.0
-yd =   20.0
-xold =  0.0
-yold = 50.0
-
-s.dataconfig('series1', :color=>'red')
-
-(0..19).each{|i|
-  xnew = xold + xd
-  ynew = yold + (rand() - 0.5) * yd
-  ynew2 = yold + (rand() - 0.5) * 2.0 * yd
-  s.plot('series1', xnew, ynew)
-  s.plot('series2', xnew, ynew2)
-  xold = xnew
-  yold = ynew
-}
-
-s.xtext "X-coordinate"
-s.ytext "Y-data"
-s.title "Aha!"
-
-c1.wait_visibility
-
-s.save_plot "aha.ps"
-
-###############################
-
-s = Tk::Tcllib::Plotchart::Piechart.new(c2)
-
-s.plot([ ["Long names", 10], ["Short names", 30],
-         ["Average", 40],    ["Ultra-short names", 5] ])
-
-#
-# Note: title should be shifted up
-#       - distinguish a separate title area
-#
-s.title "Okay - this works"
-
-###############################
-
-s = Tk::Tcllib::Plotchart::PolarPlot.new(c3, [3.0, 1.0])
-
-0.step(359, 10){|angle|
-  rad = 1.0+Math.cos(angle*Math::PI/180.0)
-  s.plot('cardioid', rad, angle)
-}
-
-s.title "Cardioid"
-
-###############################
-
-s = Tk::Tcllib::Plotchart::Barchart.new(hc1, %w(A B C D E),
-                                        [0.0, 10.0, 2.0], 2)
-
-s.plot('series1', [1.0, 4.0, 6.0, 1.0, 7.0], 'red')
-s.plot('series2', [0.0, 3.0, 7.0, 9.3, 2.0], 'green')
-s.title "Arbitrary data"
-
-###############################
-
-s = Tk::Tcllib::Plotchart::Barchart.new(hc2, %w(A B C D E),
-                                        [0.0, 20.0, 5.0], :stacked)
-
-s.plot('series1', [1.0, 4.0, 6.0, 1.0, 7.0], 'red')
-s.plot('series2', [0.0, 3.0, 7.0, 9.3, 2.0], 'green')
-s.title "Stacked diagram"
-
-###############################
-
-s = Tk::Tcllib::Plotchart::HorizontalBarchart.new(vc1, [0.0, 10.0, 2.0],
-                                                  %w(A B C D E), 2)
-
-s.plot('series1', [1.0, 4.0, 6.0, 1.0, 7.0], 'red')
-s.plot('series2', [0.0, 3.0, 7.0, 9.3, 2.0], 'green')
-s.title "Arbitrary data"
-
-###############################
-
-s = Tk::Tcllib::Plotchart::HorizontalBarchart.new(vc2, [0.0, 20.0, 5.0],
-                                                  %w(A B C D E), :stacked)
-
-s.plot('series1', [1.0, 4.0, 6.0, 1.0, 7.0], 'red')
-s.plot('series2', [0.0, 3.0, 7.0, 9.3, 2.0], 'green')
-s.title "Stacked diagram"
-
-###############################
-
-s = Tk::Tcllib::Plotchart::Timechart.new(vc3, "1 january 2004",
-                                              "31 december 2004", 4)
-
-s.period("Spring", "1 march 2004", "1 june 2004", 'green')
-s.period("Summer", "1 june 2004", "1 september 2004", 'yellow')
-s.vertline("1 jan", "1 january 2004")
-s.vertline("1 apr", "1 april 2004")
-s.vertline("1 jul", "1 july 2004")
-s.vertline("1 oct", "1 october 2004")
-s.milestone("Longest day", "21 july 2004")
-s.title "Seasons (northern hemisphere)"
-
-###############################
-
-z = TkToplevel.new(:title=>'3D')
-
-zc1 = TkCanvas.new(z, :background=>'white', :width=>400, :height=>300)
-zc2 = TkCanvas.new(z, :background=>'white', :width=>400, :height=>250)
-Tk.pack(zc1,zc2)
-
-s = Tk::Tcllib::Plotchart::Plot3D.new(zc1,
-                                      [0, 10, 3], [-10, 10, 10], [0, 10, 2.5])
-
-s.title "3D Plot"
-s.plot_function{|x, y|
-  # cowboyhat
-  x1 = x.to_f/9.0
-  y1 = y.to_f/9.0
-  3.0 * (1.0-(x1*x1+y1*y1))*(1.0-(x1*x1+y1*y1))
-}
-
-s = Tk::Tcllib::Plotchart::Plot3D.new(zc2,
-                                      [0, 10, 3], [-10, 10, 10], [0, 10, 2.5])
-s.title "3D Plot - data "
-s.colour("green", "black")
-s.plot_data([ [1.0, 2.0, 1.0, 0.0],
-              [1.1, 3.0, 1.1, -0.5],
-              [3.0, 1.0, 4.0, 5.0] ])
-
-###############################
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/tcllib/plotdemos2.rb b/ext/tk/sample/tkextlib/tcllib/plotdemos2.rb
deleted file mode 100644
index 58c5b1928b..0000000000
--- a/ext/tk/sample/tkextlib/tcllib/plotdemos2.rb
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/usr/bin/ruby
-# frozen_string_literal: false
-
-require 'tk'
-require 'tkextlib/tcllib/plotchart'
-
-###############################
-
-c1 = TkCanvas.new(:background=>'white', :width=>400, :height=>200)
-c2 = TkCanvas.new(:background=>'white', :width=>400, :height=>200)
-Tk.pack(c1,c2, :fill=>:both, :side=>:top)
-
-###############################
-# Set up a strip chart
-###############################
-slipchart = Tk::Tcllib::Plotchart::Stripchart.new(c1, [0.0, 100.0, 10.0],
-                                                      [0.0, 100.0, 20.0])
-
-TkTimer.new(500, -1, proc{|obj| # obj --> TkTimer object
-              slipchart, xold, xd, yold, yd = obj.return_value
-              xnew = xold + xd
-              ynew = yold + (rand() - 0.5) * yd
-              ynew2 = yold + (rand() - 0.5) * 2.0 * yd
-              slipchart.plot('series1', xnew, ynew)
-              slipchart.plot('series2', xnew, ynew2)
-              obj.stop if xnew >= 200
-              [slipchart, xnew, xd, ynew, yd] # return_value
-            }).start(100, proc{
-                       # init return_value
-                       [slipchart, 0.0, 15.0, 50.0, 30.0]
-                     })
-
-slipchart.title "Aha!"
-
-###############################
-# Set up an isometric plot
-###############################
-s = Tk::Tcllib::Plotchart::IsometricPlot.new(c2, [0.0, 100.0], [0.0, 200.0],
-                                             :noaxes)
-
-s.set_zoom_pan
-
-s.plot('rectangle',        [10.0, 10.0, 50.0, 50.0], 'green')
-s.plot('filled-rectangle', [20.0, 20.0, 40.0, 40.0], 'red')
-s.plot('filled-circle',    [70.0, 70.0, 40.0], 'yellow')
-s.plot('circle',           [70.0, 70.0, 42.0])
-
-###############################
-# Check the symbols
-###############################
-h = TkToplevel.new(:title=>'h')
-c = TkCanvas.new(h, :bg=>'white', :width=>400, :height=>200).pack(:fill=>:both)
-
-s = Tk::Tcllib::Plotchart::XYPlot.new(c, [0.0, 100.0, 10.0],
-                                         [0.0, 100.0, 20.0])
-s.dataconfig('series1', :colour=>'red',   :type=>:symbol)
-s.dataconfig('series2', :colour=>'green', :type=>:both)
-
-s.yconfig(:format=>"%12.2e")
-
-x = 5.0
-%w(plus cross circle up down dot upfilled downfilled).each{|sym|
-  s.dataconfig('series1', :symbol=>sym)
-  s.dataconfig('series2', :symbol=>sym)
-  s.plot('series1', x, 50.0)
-  s.plot('series2', x, 20)
-  x += 10
-}
-
-##############################
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/tcllib/plotdemos3.rb b/ext/tk/sample/tkextlib/tcllib/plotdemos3.rb
deleted file mode 100644
index 816e38b6a6..0000000000
--- a/ext/tk/sample/tkextlib/tcllib/plotdemos3.rb
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/usr/bin/ruby
-# frozen_string_literal: false
-
-require 'tk'
-require 'tkextlib/tcllib/plotchart'
-
-###############################
-# Set up a strip chart
-###############################
-
-Tk::Tcllib::Plotchart::Stripchart.new([0.0, 100.0, 10.0],
-                                      [0.0, 100.0, 20.0],
-                                      :background=>'white',
-                                      :width=>400, :height=>200){|chart|
-  title "Aha!"
-  pack(:fill=>:both, :side=>:top)
-
-  series1 = Tk::Tcllib::Plotchart::PlotSeries.new(chart)
-  series2 = Tk::Tcllib::Plotchart::PlotSeries.new(chart)
-
-  xd = 15.0
-  yd = 30.0
-
-  TkTimer.new(500, -1, proc{|obj| # obj --> TkTimer object
-                xold, yold = obj.return_value
-                xnew = xold + xd
-                ynew = yold + (rand() - 0.5) * yd
-                ynew2 = yold + (rand() - 0.5) * 2.0 * yd
-
-                series1.plot(xnew, ynew)
-                series2.plot(xnew, ynew2)
-
-                obj.stop if xnew >= 200
-
-                [xnew, ynew] # return_value
-              }).start(100, proc{ [0.0, 50.0] }) # init return_value
-}
-
-###############################
-# Set up an isometric plot
-###############################
-Tk::Tcllib::Plotchart::IsometricPlot.new([0.0, 100.0], [0.0, 200.0], :noaxes,
-                                         :background=>'white',
-                                         :width=>400, :height=>200){|chart|
-  pack(:fill=>:both, :side=>:top)
-  set_zoom_pan
-
-  chart.plot('rectangle',        [10.0, 10.0, 50.0, 50.0], 'green')
-  chart.plot('filled-rectangle', [20.0, 20.0, 40.0, 40.0], 'red')
-  chart.plot('filled-circle',    [70.0, 70.0, 40.0], 'yellow')
-  chart.plot('circle',           [70.0, 70.0, 42.0])
-}
-
-###############################
-# Check the symbols
-###############################
-TkToplevel.new(:title=>'h'){|h|
-  Tk::Tcllib::Plotchart::XYPlot.new(h, [0.0, 100.0, 10.0],
-                                       [0.0, 100.0, 20.0],
-                                    :bg=>'white',
-                                    :width=>400, :height=>200){|chart|
-    pack(:fill=>:both)
-
-    yconfig(:format=>"%12.2e")
-
-    series1 = Tk::Tcllib::Plotchart::PlotSeries.new(chart, :colour=>'red',
-                                                    :type=>:symbol)
-    series2 = Tk::Tcllib::Plotchart::PlotSeries.new(chart, :colour=>'green',
-                                                    :type=>:both)
-
-    x = 5.0
-    %w(plus cross circle up down dot upfilled downfilled).each{|sym|
-      series1.dataconfig(:symbol=>sym)
-      series2.dataconfig(:symbol=>sym)
-      series1.plot(x, 50.0)
-      series2.plot(x, 20)
-      x += 10
-    }
-  }
-}
-
-##############################
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/tcllib/xyplot.rb b/ext/tk/sample/tkextlib/tcllib/xyplot.rb
deleted file mode 100644
index 3d71c3bf9f..0000000000
--- a/ext/tk/sample/tkextlib/tcllib/xyplot.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/ruby
-# frozen_string_literal: false
-
-require 'tk'
-require 'tkextlib/tcllib/plotchart'
-
-TkCanvas.new(:background=>'white', :width=>400, :height=>200){|c|
-  pack(:fill=>:both)
-  Tk::Tcllib::Plotchart::XYPlot.new(c, [0.0, 100.0, 10.0],
-                                       [0.0, 100.0, 20.0]){
-    [ [0.0, 32.0], [10.0, 50.0], [25.0, 60.0], [78.0, 11.0] ].each{|x, y|
-      plot('series1', x, y)
-    }
-    title("Data series")
-  }
-}
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/tile/Orig_LICENSE.txt b/ext/tk/sample/tkextlib/tile/Orig_LICENSE.txt
deleted file mode 100644
index 2326ef21fa..0000000000
--- a/ext/tk/sample/tkextlib/tile/Orig_LICENSE.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-
-  ######################################################################
-  ###  The following text is the original 'license.terms' of tile    ###
-  ###  extension.                                                    ###
-  ######################################################################
-
-
-LICENSE ("MIT-style")
-
-This software is Copyright (C) 2003 Joe English and other parties.
-
-The following terms apply to all files associated with this software
-unless explicitly disclaimed in individual files.  
-
-The author(s) hereby grant permission to use, copy, modify, distribute,
-and license this software and its documentation for any purpose, provided
-that existing copyright notices are retained in all copies and that this
-notice is included in any distributions. No written agreement,
-license, or royalty fee is required for any of the authorized uses.
-Modifications to this software may be copyrighted by their authors
-and need not follow the licensing terms described here, provided that
-the new terms are clearly indicated on the first page of each file where
-they apply.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS for a PARTICULAR PURPOSE.  IN NO EVENT
-shall the AUTHORS of THIS SOFTWARE be LIABLE to ANY PARTY for
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, or CONSEQUENTIAL DAMAGES
-arising out of the USE of THIS SOFTWARE and its DOCUMENTATION.
diff --git a/ext/tk/sample/tkextlib/tile/demo.rb b/ext/tk/sample/tkextlib/tile/demo.rb
deleted file mode 100644
index 8348ecdb58..0000000000
--- a/ext/tk/sample/tkextlib/tile/demo.rb
+++ /dev/null
@@ -1,984 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-#
-# Demo for 'tile' package.
-#
-require 'tk'
-
-demodir = File.dirname($0)
-themesdir = File.join(demodir, 'themes')
-Tk::AUTO_PATH.lappend('.', demodir, themesdir)
-
-Dir.foreach(themesdir){|name|
-  next if name == '.' || name == '..'
-  dir = File.join(themesdir, name)
-  Tk::AUTO_PATH.lappend(dir) if File.directory?(dir)
-}
-
-require 'tkextlib/tile'
-
-def version?(ver)
-  TkPackage.vcompare(Tk::Tile.package_version, ver) >= 0
-end
-
-# define Tcl/Tk procedures for compatibility
-Tk::Tile.__define_LoadImages_proc_for_compatibility__!
-Tk::Tile::Style.__define_wrapper_proc_for_compatibility__!
-
-unless Tk::Tile::Style.theme_names.include?('step')
-  Tk::Tile::Style.theme_create('step')
-end
-
-Tk.load_tclscript(File.join(demodir, 'toolbutton.tcl'))
-Tk.load_tclscript(File.join(demodir, 'repeater.tcl'))
-
-# This forces an update of the available packages list. It's required
-# for package names to find the themes in demos/themes/*.tcl
-## Tk.tk_call(TkPackage.unknown_proc, 'Tcl', TkPackage.provide('Tcl'))
-##  --> This doesn't work.
-##      Because, unknown_proc may be "command + some arguments".
-Tk.ip_eval("#{TkPackage.unknown_proc}  Tcl #{TkPackage.provide('Tcl')}")
-
-TkRoot.new{
-  title 'Tile demo'
-  iconname 'Tile demo'
-}
-
-# The descriptive names of the builtin themes.
-$THEMELIST = [
-  ['default', 'Default'],
-  ['classic', 'Classic'],
-  ['alt', 'Revitalized'],
-  ['winnative', 'Windows native'],
-  ['xpnative', 'XP Native'],
-  ['aqua', 'Aqua'],
-]
-
-$V = TkVariable.new_hash(:THEME      => 'default',
-                         :COMPOUND   => 'top',
-                         :CONSOLE    => false,
-                         :MENURADIO1 => 'One',
-                         :MENUCHECK1 => true,
-                         :PBMODE     => 'determinate',
-                         :SELECTED   => true,
-                         :CHOICE     => 2)
-
-# Add in any available loadable themes.
-TkPackage.names.find_all{|n| n =~ /^(tile|ttk)::theme::/}.each{|pkg|
-  name = pkg.split('::')[-1]
-  unless $THEMELIST.assoc(name)
-    $THEMELIST << [name, Tk.tk_call('string', 'totitle', name)]
-  end
-}
-
-# Add theme definition written by ruby
-$RUBY_THEMELIST = []
-begin
-  load(File.join(demodir, 'themes', 'kroc.rb'), true)
-rescue => e
-raise e
-  $RUBY_THEMELIST << ['kroc-rb', 'Kroc (by Ruby)', false]
-else
-  $RUBY_THEMELIST << ['kroc-rb', 'Kroc (by Ruby)', true]
-end
-
-def makeThemeControl(parent)
-  c = Tk::Tile::Labelframe.new(parent, :text=>'Theme')
-  $THEMELIST.each{|theme, name|
-    b = Tk::Tile::Radiobutton.new(c, :text=>name, :value=>theme,
-                                  :variable=>$V.ref(:THEME),
-                                  :command=>proc{setTheme(theme)})
-    b.grid(:sticky=>:ew)
-    unless (TkPackage.names.find{|n| n =~ /(tile|ttk)::theme::#{theme}/})
-      b.ttk_state(:disabled)
-    end
-  }
-  $RUBY_THEMELIST.each{|theme, name, available|
-    b = Tk::Tile::Radiobutton.new(c, :text=>name, :value=>theme,
-                                  :variable=>$V.ref(:THEME),
-                                  :command=>proc{setTheme(theme)})
-    b.grid(:sticky=>:ew)
-    b.ttk_state(:disabled) unless available
-  }
-  c
-end
-
-def makeThemeMenu(parent)
-  m = TkMenu.new(parent)
-  $THEMELIST.each{|theme, name|
-    m.add(:radiobutton, :label=>name, :variable=>$V.ref(:THEME),
-          :value=>theme, :command=>proc{setTheme(theme)})
-    unless (TkPackage.names.find{|n| n =~ /(tile|ttk)::theme::#{theme}/})
-      m.entryconfigure(:end, :state=>:disabled)
-    end
-  }
-  $RUBY_THEMELIST.each{|theme, name, available|
-    m.add(:radiobutton, :label=>name, :variable=>$V.ref(:THEME),
-          :value=>theme, :command=>proc{setTheme(theme)})
-    m.entryconfigure(:end, :state=>:disabled) unless available
-  }
-  m
-end
-
-def setTheme(theme)
-  if (pkg = TkPackage.names.find{|n| n =~ /(tile|ttk)::theme::#{theme}/})
-    unless Tk::Tile::Style.theme_names.find{|n| n == theme}
-      TkPackage.require(pkg)
-    end
-  end
-  Tk::Tile::Style.theme_use(theme)
-end
-
-#
-# Load icons...
-#
-$BUTTONS = ['open', 'new', 'save']
-$CHECKBOXES = ['bold', 'italic']
-$ICON = {}
-
-def loadIcons(file)
-  Tk.load_tclscript(file)
-  img_data = TkVarAccess.new('ImgData')
-  img_data.keys.each{|icon|
-    $ICON[icon] = TkPhotoImage.new(:data=>img_data[icon])
-  }
-end
-
-loadIcons(File.join(demodir, 'iconlib.tcl'))
-
-#
-# Utilities:
-#
-def foreachWidget(wins, cmd)
-  wins.each{|w|
-    cmd.call(w)
-    foreachWidget(w.winfo_children, cmd)
-  }
-end
-
-# sbstub
-#	Used as the :command option for a scrollbar,
-#	updates the scrollbar's position.
-#
-def sbstub(sb, cmd, num, units = 'units')
-  num = TkComm.number(num)
-  case cmd.to_s
-  when 'moveto'
-    sb.set(num, num+0.5)
-
-  when 'scroll'
-    if units.to_s == 'pages'
-      delta = 0.2
-    else
-      delta = 0.05
-    end
-    current = sb.get
-    sb.set(current[0] + delta * num, current[1] + delta * num)
-  end
-end
-
-# ... for debugging:
-TkBindTag::ALL.bind('ButtonPress-3', proc{|w| $W = w}, '%W')
-TkBindTag::ALL.bind('Control-ButtonPress-3', proc{|w| w.set_focus}, '%W')
-
-def showHelp()
-  Tk.messageBox(:message=>'No help yet...')
-end
-
-#
-# See toolbutton.tcl.
-TkOption.add('*Toolbar.relief', :groove)
-TkOption.add('*Toolbar.borderWidth', 2)
-
-TkOption.add('*Toolbar.Button.Pad', 2)
-
-$ROOT = Tk.root
-$BASE = $ROOT
-Tk.destroy(*($ROOT.winfo_children))
-
-$TOOLBARS = []
-
-#
-# Toolbar button standard vs. tile comparison:
-#
-def makeToolbars
-  #
-  # Tile toolbar:
-  #
-  tb = Tk::Tile::Frame.new($BASE, :class=>'Toolbar')
-  $TOOLBARS << tb
-  i = 0
-  $BUTTONS.each{|icon|
-    i += 1
-    Tk::Tile::Button.new(tb, :text=>icon, :image=>$ICON[icon],
-                         :compound=>$V[:COMPOUND],
-                         :style=>:Toolbutton).grid(:row=>0, :column=>i,
-                                                   :sticky=>:news)
-  }
-  $CHECKBOXES.each{|icon|
-    i += 1
-    Tk::Tile::Checkbutton.new(tb, :text=>icon, :image=>$ICON[icon],
-                              :variable=>$V.ref(icon),
-                              :compound=>$V[:COMPOUND],
-                              :style=>:Toolbutton).grid(:row=>0, :column=>i,
-                                                        :sticky=>:news)
-  }
-
-  mb = Tk::Tile::Menubutton.new(tb, :text=>'toolbar', :image=>$ICON['file'],
-                                :compound=>$V[:COMPOUND])
-  mb.configure(:menu=>makeCompoundMenu(mb))
-  i += 1
-  mb.grid(:row=>0, :column=>i, :sticky=>:news)
-
-  i += 1
-  tb.grid_columnconfigure(i, :weight=>1)
-
-  #
-  # Standard toolbar:
-  #
-  tb = TkFrame.new($BASE, :class=>'Toolbar')
-  $TOOLBARS << tb
-  i = 0
-  $BUTTONS.each{|icon|
-    i += 1
-    TkButton.new(tb, :text=>icon, :image=>$ICON[icon],
-                 :compound=>$V[:COMPOUND], :relief=>:flat,
-                 :overrelief=>:raised).grid(:row=>0, :column=>i,
-                                            :sticky=>:news)
-  }
-  $CHECKBOXES.each{|icon|
-    i += 1
-    TkCheckbutton.new(tb, :text=>icon, :image=>$ICON[icon],
-                      :variable=>$V.ref(icon), :compound=>$V[:COMPOUND],
-                      :indicatoron=>false, :selectcolor=>'', :relief=>:flat,
-                      :overrelief=>:raised).grid(:row=>0, :column=>i,
-                                                 :sticky=>:news)
-  }
-
-  mb = TkMenubutton.new(tb, :text=>'toolbar', :image=>$ICON['file'],
-                        :compound=>$V[:COMPOUND])
-  mb.configure(:menu=>makeCompoundMenu(mb))
-  i += 1
-  mb.grid(:row=>0, :column=>i, :sticky=>:news)
-
-  i += 1
-  tb.grid_columnconfigure(i, :weight=>1)
-end
-
-#
-# Toolbar :compound control:
-#
-def makeCompoundMenu(mb)
-  menu = TkMenu.new(mb)
-  %w(text image none top bottom left right center).each{|str|
-    menu.add(:radiobutton, :label=>Tk.tk_call('string', 'totitle', str),
-             :variable=>$V.ref(:COMPOUND), :value=>str,
-             :command=>proc{ changeToolbars() })
-  }
-  menu
-end
-
-makeToolbars()
-
-## CONTROLS
-control = Tk::Tile::Frame.new($BASE)
-
-#
-# Overall theme control:
-#
-makeThemeControl(control).grid(:sticky=>:news, :padx=>6, :ipadx=>6)
-control.grid_rowconfigure(99, :weight=>1)
-
-def changeToolbars
-  foreachWidget($TOOLBARS,
-                proc{|w|
-                  begin
-                    w.compound($V[:COMPOUND])
-                  rescue
-                  end
-                })
-end
-
-def scrolledWidget(parent, klass, themed, *args)
-  if themed
-    f = Tk::Tile::Frame.new(parent)
-    t = klass.new(f, *args)
-    vs = Tk::Tile::Scrollbar.new(f)
-    hs = Tk::Tile::Scrollbar.new(f)
-  else
-    f = TkFrame.new(parent)
-    t = klass.new(f, *args)
-    vs = TkScrollbar.new(f)
-    hs = TkScrollbar.new(f)
-  end
-  t.yscrollbar(vs)
-  t.xscrollbar(hs)
-
-  TkGrid.configure(t, vs, :sticky=>:news)
-  TkGrid.configure(hs, 'x', :sticky=>:news)
-  TkGrid.rowconfigure(f, 0, :weight=>1)
-  TkGrid.columnconfigure(f, 0, :weight=>1)
-
-  [f, t]
-end
-
-#
-# Notebook demonstration:
-#
-def makeNotebook
-  nb = Tk::Tile::Notebook.new($BASE, :padding=>6)
-  nb.enable_traversal
-  client = Tk::Tile::Frame.new(nb)
-  nb.add(client, :text=>'Demo', :underline=>0)
-  nb.select(client)
-
-  scales = Tk::Tile::Frame.new(nb)
-  nb.add(scales, :text=>'Scales')
-  combo = Tk::Tile::Frame.new(nb)
-  nb.add(combo, :text=>'Combobox', :underline=>7)
-  tree = Tk::Tile::Frame.new(nb)
-  nb.add(tree, :text=>'Tree')
-  others = Tk::Tile::Frame.new(nb)
-  nb.add(others, :text=>'Others', :underline=>4)
-
-  [nb, client, scales, combo, tree, others]
-end
-
-nb, client, scales, combo, tree, others = makeNotebook()
-
-#
-# Side-by side check, radio, and menu button comparison:
-#
-def fillMenu(menu)
-  %w(above below left right flush).each{|dir|
-    menu.add(:command, :label=>Tk.tk_call('string', 'totitle', dir),
-             :command=>proc{ menu.winfo_parent.direction(dir) })
-  }
-  menu.add(:cascade, :label=>'Submenu', :menu=>(submenu = TkMenu.new(menu)))
-  submenu.add(:command, :label=>'Subcommand 1')
-  submenu.add(:command, :label=>'Subcommand 2')
-  submenu.add(:command, :label=>'Subcommand 3')
-
-  menu.add(:separator)
-  menu.add(:command, :label=>'Quit', :command=>proc{Tk.root.destroy})
-end
-
-l = Tk::Tile::Labelframe.new(client, :text=>'Themed', :padding=>6)
-r = TkLabelframe.new(client, :text=>'Standard', :padx=>6, :pady=>6)
-
-## Styled frame
-cb = Tk::Tile::Checkbutton.new(l, :text=>'Checkbutton',
-                               :variable=>$V.ref(:SELECTED), :underline=>2)
-rb1 = Tk::Tile::Radiobutton.new(l, :text=>'One', :variable=>$V.ref(:CHOICE),
-                                :value=>1, :underline=>0)
-rb2 = Tk::Tile::Radiobutton.new(l, :text=>'Two', :variable=>$V.ref(:CHOICE),
-                                :value=>2)
-rb3 = Tk::Tile::Radiobutton.new(l, :text=>'Three',
-                                :variable=>$V.ref(:CHOICE),
-                                :value=>3, :underline=>0)
-btn = Tk::Tile::Button.new(l, :text=>'Button', :underline=>0)
-
-mb = Tk::Tile::Menubutton.new(l, :text=>'Menubutton', :underline=>2)
-m = TkMenu.new(mb)
-mb.menu(m)
-fillMenu(m)
-
-$entryText = TkVariable.new('Entry widget')
-e = Tk::Tile::Entry.new(l, :textvariable=>$entryText)
-e.selection_range(6, :end)
-
-ltext_f, ltext = scrolledWidget(l, TkText, true,
-                                :width=>12, :height=>5, :wrap=>:none)
-# NOTE TO MAINTAINERS:
-# The checkbuttons are -sticky ew / -expand x  on purpose:
-# it demonstrates one of the differences between TCheckbuttons
-# and standard checkbuttons.
-#
-Tk.grid(cb, :sticky=>:ew)
-Tk.grid(rb1, :sticky=>:ew)
-Tk.grid(rb2, :sticky=>:ew)
-Tk.grid(rb3, :sticky=>:ew)
-Tk.grid(btn, :sticky=>:ew, :padx=>2, :pady=>2)
-Tk.grid(mb, :sticky=>:ew, :padx=>2, :pady=>2)
-Tk.grid(e, :sticky=>:ew, :padx=>2, :pady=>2)
-Tk.grid(ltext_f, :sticky=>:news)
-
-TkGrid.columnconfigure(l, 0, :weight=>1)
-TkGrid.rowconfigure(l, 7, :weight=>1) # text widget (grid is a PITA)
-
-## Orig frame
-cb = TkCheckbutton.new(r, :text=>'Checkbutton', :variable=>$V.ref(:SELECTED))
-rb1 = TkRadiobutton.new(r, :text=>'One',
-                        :variable=>$V.ref(:CHOICE), :value=>1)
-rb2 = TkRadiobutton.new(r, :text=>'Two', :variable=>$V.ref(:CHOICE),
-                        :value=>2, :underline=>1)
-rb3 = TkRadiobutton.new(r, :text=>'Three',
-                        :variable=>$V.ref(:CHOICE), :value=>3)
-btn = TkButton.new(r, :text=>'Button')
-
-mb = TkMenubutton.new(r, :text=>'Menubutton', :underline=>3, :takefocus=>true)
-m = TkMenu.new(mb)
-mb.menu(m)
-$V[:rmbIndicatoron] = mb.indicatoron
-m.add(:checkbutton, :label=>'Indicator?', #'
-      :variable=>$V.ref(:rmbIndicatoron),
-      :command=>proc{mb.indicatoron($V[:rmbIndicatoron])})
-m.add(:separator)
-fillMenu(m)
-
-e = TkEntry.new(r, :textvariable=>$entryText)
-
-rtext_f, rtext = scrolledWidget(r, TkText, false,
-                                :width=>12, :height=>5, :wrap=>:none)
-
-Tk.grid(cb, :sticky=>:ew)
-Tk.grid(rb1, :sticky=>:ew)
-Tk.grid(rb2, :sticky=>:ew)
-Tk.grid(rb3, :sticky=>:ew)
-Tk.grid(btn, :sticky=>:ew, :padx=>2, :pady=>2)
-Tk.grid(mb, :sticky=>:ew, :padx=>2, :pady=>2)
-Tk.grid(e, :sticky=>:ew, :padx=>2, :pady=>2)
-Tk.grid(rtext_f, :sticky=>:news)
-
-TkGrid.columnconfigure(l, 0, :weight=>1)
-TkGrid.rowconfigure(l, 7, :weight=>1) # text widget (grid is a PITA)
-
-Tk.grid(l, r, :sticky=>:news, :padx=>6, :pady=>6)
-TkGrid.rowconfigure(client, 0, :weight=>1)
-TkGrid.columnconfigure(client, [0, 1], :weight=>1)
-
-#
-# Add some text to the text boxes:
-#
-msgs = [
-"The cat crept into the crypt, crapped and crept out again",
-"Peter Piper picked a peck of pickled peppers",
-"How much wood would a woodchuck chuck if a woodchuck could chuck wood",
-"He thrusts his fists against the posts and still insists he sees the ghosts",
-"Who put the bomb in the bom-b-bom-b-bom,",
-"Is this your sister's sixth zither, sir?",
-"Who put the ram in the ramalamadingdong?",
-"I am not the pheasant plucker, I'm the pheasant plucker's mate."
-]
-
-nmsgs = msgs.size
-(0...50).each{|n|
-  msg = msgs[n % nmsgs]
-  ltext.insert(:end, "#{n}: #{msg}\n")
-  rtext.insert(:end, "#{n}: #{msg}\n")
-}
-#
-# Scales and sliders pane:
-#
-l = Tk::Tile::Labelframe.new(scales, :text=>'Themed', :padding=>6)
-r = TkLabelframe.new(scales, :text=>'Standard', :padx=>6, :pady=>6)
-
-if version?('0.6')
-
-  # thremed frame
-  scale = Tk::Tile::Scale.new(l, :orient=>:horizontal, :from=>0, :to=>100,
-          :variable=>$V.ref(:SCALE))
-  vscale = Tk::Tile::Scale.new(l, :orient=>:vertical, :from=>0, :to=>100,
-          :variable=>$V.ref(:VSCALE))
-  progress = Tk::Tile::Progressbar.new(l, :orient=>:horizontal, :maximum=>100)
-  vprogress = Tk::Tile::Progressbar.new(l, :orient=>:vertical, :maximum=>100)
-
-  if true
-    def progress.inverted(w, value)
-      if w.mode == 'indeterminate'
-        w.value(value)
-      else
-        w.value(w.maximum - value)
-      end
-    end
-    scale.command {|value| progress.value(value)}
-    vscale.command {|value| progress.inverted(vprogress, value) }
-  else
-    # This would also work, but the Tk scale widgets
-    # in the right hand pane cause some interference when
-    # in autoincrement/indeterminate mode.
-    #
-    progress.variable $V.ref(:SCALE)
-    vprogress.variable $V.ref(:VSCALE)
-  end
-
-  scale.set(50)
-  vscale.set(50)
-
-  lmode = Tk::Tile::Label.new(l, :text=>'Progress bar mode')
-  pbmode0 = Tk::Tile::Radiobutton.new(l, :variable=>$V.ref(:PBMODE),
-          :text=>'determinate', :value=>'determinate',
-          :command=>proc{pbMode(progress, vprogress)})
-  pbmode1 = Tk::Tile::Radiobutton.new(l, :variable=>$V.ref(:PBMODE),
-          :text=>'indeterminate', :value=>'indeterminate',
-          :command=>proc{pbMode(progress, vprogress)})
-  def pbMode(progress, vprogress)
-    if vprogress.mode != $V[:PBMODE]
-      vprogress.value(vprogress.maximum - vprogress.value)
-    end
-
-    progress.mode $V[:PBMODE]
-    vprogress.mode $V[:PBMODE]
-  end
-
-  start = Tk::Tile::Button.new(l, :text=>"Start",
-          :command=>proc{pbStart(progress, vprogress)})
-  def pbStart(progress, vprogress)
-    # $V[:PBMODE] = 'indeterminate'
-    pbMode(progress, vprogress)
-    progress.start 10
-    vprogress.start
-  end
-
-  stop = Tk::Tile::Button.new(l, :text=>'Stop',
-          :command=>proc{pbStop(progress, vprogress)})
-  def pbStop(progress, vprogress)
-    progress.stop
-    vprogress.stop
-  end
-
-  Tk.grid(scale, :columnspan=>2, :sticky=>'ew')
-  Tk.grid(progress, :columnspan=>2, :sticky=>'ew')
-  Tk.grid(vscale, vprogress, :sticky=>'nws')
-
-  Tk.grid(lmode, :sticky=>'we', :columnspan=>2)
-  Tk.grid(pbmode0, :sticky=>'we', :columnspan=>2)
-  Tk.grid(pbmode1, :sticky=>'we', :columnspan=>2)
-  Tk.grid(start, :sticky=>'we', :columnspan=>2)
-  Tk.grid(stop, :sticky=>'we', :columnspan=>2)
-
-  l.grid_columnconfigure(0, :weight=>1)
-  l.grid_columnconfigure(1, :weight=>1)
-  l.grid_rowconfigure(99, :weight=>1)
-
-  # standard frame
-  TkScale.new(r, :orient=>:horizontal, :from=>0, :to=>100,
-          :variable=>$V.ref(:SCALE)).grid(:sticky=>'news')
-  TkScale.new(r, :orient=>:vertical, :from=>0, :to=>100,
-          :variable=>$V.ref(:VSCALE)).grid(:sticky=>'nws')
-
-  r.grid_columnconfigure(0, :weight=>1)
-  r.grid_columnconfigure(1, :weight=>1)
-  r.grid_rowconfigure(99, :weight=>1)
-
-else # tile 0.5 or earlier
-
-  # themed frame
-  scale = Tk::Tile::Scale.new(l, :variable=>$V.ref(:SCALE),
-          :orient=>:horizontal, :from=>0, :to=>100)
-  vscale = Tk::Tile::Scale.new(l, :variable=>$V.ref(:VSCALE),
-          :orient=>:vertical, :from=>-25, :to=>25)
-
-  progress = Tk::Tile::Progress.new(l,
-          :orient=>:horizontal, :from=>0, :to=>100)
-  vprogress = Tk::Tile::Progress.new(l,
-          :orient=>:vertical, :from=>-25, :to=>25)
-
-  if true
-    scale.command{|value| progress.set(value)}
-    vscale.command{|value| vprogress.set(value)}
-  else # this would also work. (via TkVariable#trace)
-    v1 = scale.variable
-    v2 = vscale.variable
-    v1.trace('w', proc{ progress.set(v1.value) })
-    v2.trace('w', proc{ vprogress.set(v2.value) })
-  end
-
-  Tk.grid(scale, :columnspan=>2, :sticky=>:ew)
-  Tk.grid(progress, :columnspan=>2, :sticky=>:ew)
-  Tk.grid(vscale, vprogress, :sticky=>:nws)
-  TkGrid.columnconfigure(l, 0, :weight=>1)
-  TkGrid.columnconfigure(l, 1, :weight=>1)
-
-  # standard frame
-  TkScale.new(r, :variable=>$V.ref(:SCALE),
-          :orient=>:horizontal, :from=>0, :to=>100).grid(:sticky=>'news')
-  TkScale.new(r, :variable=>$V.ref(:VSCALE),
-          :orient=>:vertical, :from=>-25, :to=>25).grid(:sticky=>'nws')
-
-  TkGrid.columnconfigure(r, 0, :weight=>1)
-  TkGrid.columnconfigure(r, 1, :weight=>1)
-end
-
-# layout frames
-Tk.grid(l, r, :sticky=>'nwes', :padx=>6, :pady=>6)
-scales.grid_columnconfigure(0, :weight=>1)
-scales.grid_columnconfigure(1, :weight=>1)
-scales.grid_rowconfigure(0, :weight=>1)
-
-#
-# Command box:
-#
-cmd = Tk::Tile::Frame.new($BASE)
-b_close = Tk::Tile::Button.new(cmd, :text=>'Close',
-                               :underline=>0, :default=>:normal,
-                               :command=>proc{Tk.root.destroy})
-b_help = Tk::Tile::Button.new(cmd, :text=>'Help', :underline=>0,
-                              :default=>:normal, :command=>proc{showHelp()})
-Tk.grid('x', b_close, b_help, :pady=>[6, 4], :padx=>4)
-TkGrid.columnconfigure(cmd, 0, :weight=>1)
-
-#
-# Set up accelerators:
-#
-$ROOT.bind('KeyPress-Escape', proc{Tk.event_generate(b_close, '<Invoke>')})
-$ROOT.bind('<Help>', proc{Tk.event_generate(b_help, '<Invoke>')})
-Tk::Tile::KeyNav.enableMnemonics($ROOT)
-Tk::Tile::KeyNav.defaultButton(b_help)
-
-Tk.grid($TOOLBARS[0], '-', :sticky=>:ew)
-Tk.grid($TOOLBARS[1], '-', :sticky=>:ew)
-Tk.grid(control,      nb,  :sticky=>:news)
-Tk.grid(cmd,          '-', :sticky=>:ew)
-TkGrid.columnconfigure($ROOT, 1, :weight=>1)
-TkGrid.rowconfigure($ROOT, 2, :weight=>1)
-
-#
-# Add a menu
-#
-menu = TkMenu.new($BASE)
-$ROOT.menu(menu)
-m_file = TkMenu.new(menu, :tearoff=>0)
-menu.add(:cascade, :label=>'File', :underline=>0, :menu=>m_file)
-m_file.add(:command, :label=>'Open', :underline=>0,
-           :compound=>:left, :image=>$ICON['open'])
-m_file.add(:command, :label=>'Save', :underline=>0,
-           :compound=>:left, :image=>$ICON['save'])
-m_file.add(:separator)
-m_f_test = TkMenu.new(menu, :tearoff=>0)
-m_file.add(:cascade, :label=>'Test submenu', :underline=>0, :menu=>m_f_test)
-m_file.add(:checkbutton, :label=>'Text check', :underline=>5,
-           :variable=>$V.ref(:MENUCHECK1))
-m_file.insert(:end, :separator)
-
-if Tk.windowingsystem != 'x11'
-  TkConsole.create
-  m_file.insert(:end, :checkbutton, :label=>'Console', :underline=>5,
-                :variable=>$V.ref(:CONSOLE), :command=>proc{toggle_console()})
-  def toggle_console
-    if TkComm.bool($V[:CONSOLE])
-      TkConsole.show
-    else
-      TkConsole.hide
-    end
-  end
-end
-
-m_file.add(:command, :label=>'Exit', :underline=>1,
-           :command=>proc{Tk.event_generate(b_close, '<Invoke>')})
-
-%w(One Two Three Four).each{|lbl|
-  m_f_test.add(:radiobutton, :label=>lbl, :variable=>$V.ref(:MENURADIO1))
-}
-
-# Add Theme menu.
-#
-menu.add(:cascade, :label=>'Theme', :underline=>3,
-         :menu=>makeThemeMenu(menu))
-
-setTheme($V[:THEME])
-
-#
-# Combobox demo pane:
-#
-values = %w(list abc def ghi jkl mno pqr stu vwx yz)
-2.times {|i|
-  cb = Tk::Tile::Combobox.new(
-    combo, :values=>values, :textvariable=>$V.ref(:COMBO))
-  cb.pack(:side=>:top, :padx=>2, :pady=>2, :expand=>false, :fill=>:x)
-  if i == 1
-    cb.ttk_state :readonly
-    begin
-      cb.current = 3 # ignore if unsupported (tile0.4)
-    rescue
-    end
-  end
-}
-
-#
-# Treeview widget demo pane:
-#
-if version?('0.5')
-
-  treeview = nil # avoid 'undefined' error
-  scrollbar = Tk::Tile::Scrollbar.new(tree,
-      :command=>proc{|*args| treeview.yview(*args)})
-  treeview = Tk::Tile::Treeview.new(tree, :columns=>%w(Class), :padding=>4,
-      :yscrollcommand=>proc{|*args| scrollbar.set(*args)})
-
-  Tk.grid(treeview, scrollbar, :sticky=>'news')
-  tree.grid_columnconfigure(0, :weight=>1)
-  tree.grid_rowconfigure(0, :weight=>1)
-  tree.grid_propagate(0)
-
-  # Add initial tree node:
-  # Later nodes will be added in <<TreeviewOpen>> binding.
-  treeview.insert('', 0, :id=>'.', :text=>'Main Window', :open=>false,
-      :values=>[TkWinfo.classname('.')])
-  treeview.headingconfigure('#0', :text=>'Widget')
-  treeview.headingconfigure('Class', :text=>'Class')
-  treeview.bind('<TreeviewOpen>', proc{fillTree(treeview)})
-
-  def fillTree(treeview)
-    id = treeview.focus_item
-    unless TkWinfo.exist?(id)
-      treeview.delete(id)
-    end
-    # Replace tree item children with current list of child windows.
-    treeview.delete(treeview.children(id))
-    for child in TkWinfo.children(id)
-      treeview.insert(id, :end, :id=>child, :text=>TkWinfo.appname(child),
-          :open=>false, :values=>[TkWinfo.classname(child)])
-      unless TkWinfo.children(child).empty?
-        # insert dummy child to show [+] indicator
-        treeview.insert(child, :end)
-      end
-    end
-  end
-
-else
-  Tk::Tile::Label.new(tree,
-      :text=>'Treeview is supported on tile 0.5 or later...').pack
-end
-
-#
-# Other demos:
-#
-$Timers = {:StateMonitor=>nil, :FocusMonitor=>nil}
-
-begin
-  msg = Tk::Tile::Label.new(others, :justify=>:left, :wraplength=>300)
-rescue
-  msg = TkMessage.new(others, :aspect=>200)
-end
-
-$Desc = {}
-
-showDescription = TkBindTag.new
-showDescription.bind('Enter', proc{|w| msg.text($Desc[w.path])}, '%W')
-showDescription.bind('Leave', proc{|w| msg.text('')}, '%W')
-
-[
-  [ :trackStates, "Widget states...",
-    "Display/modify widget state bits" ],
-
-  [ :scrollbarResizeDemo,  "Scrollbar resize behavior...",
-    "Shows how Tile and standard scrollbars differ when they're sized too large" ],
-
-  [ :trackFocus, "Track keyboard focus..." ,
-    "Display the name of the widget that currently has focus" ],
-
-  [ :repeatDemo, "Repeating buttons...",
-    "Demonstrates custom classes (see demos/repeater.tcl)" ]
-
-].each{|demo_cmd, label, description|
-  b = Tk::Tile::Button.new(others, :text=>label,
-                           :command=>proc{ self.__send__(demo_cmd) })
-  $Desc[b.path] = description
-  b.bindtags <<= showDescription
-
-  b.pack(:side=>:top, :expand=>false, :fill=>:x, :padx=>6, :pady=>6)
-}
-
-msg.pack(:side=>:bottom, :expand=>true, :fill=>:both)
-
-
-#
-# Scrollbar resize demo:
-#
-$scrollbars = nil
-
-def scrollbarResizeDemo
-  if $scrollbars
-    begin
-      $scrollbars.destroy
-    rescue
-    end
-  end
-  $scrollbars = TkToplevel.new(:title=>'Scrollbars', :geometry=>'200x200')
-  f = TkFrame.new($scrollbars, :height=>200)
-  tsb = Tk::Tile::Scrollbar.new(f, :command=>proc{|*args| sbstub(tsb, *args)})
-  sb = TkScrollbar.new(f, :command=>proc{|*args| sbstub(sb, *args)})
-  Tk.grid(tsb, sb, :sticky=>:news)
-
-  sb.set(0, 0.5)  # prevent backwards-compatibility mode for old SB
-
-  f.grid_columnconfigure(0, :weight=>1)
-  f.grid_columnconfigure(1, :weight=>1)
-  f.grid_rowconfigure(0, :weight=>1)
-
-  f.pack(:expand=>true, :fill=>:both)
-end
-
-#
-# Track focus demo:
-#
-$FocusInf = TkVariable.new_hash
-$focus = nil
-
-def trackFocus
-  if $focus
-    begin
-      $focus.destroy
-    rescue
-    end
-  end
-  $focus = TkToplevel.new(:title=>'Keyboard focus')
-  i = 0
-  [
-    ["Focus widget:", :Widget],
-    ["Class:", :WidgetClass],
-    ["Next:", :WidgetNext],
-    ["Grab:", :Grab],
-    ["Status:", :GrabStatus]
-  ].each{|label, var_index|
-    Tk.grid(Tk::Tile::Label.new($focus, :text=>label, :anchor=>:e),
-            Tk::Tile::Label.new($focus,
-                                :textvariable=>$FocusInf.ref(var_index),
-                                :width=>40, :anchor=>:w, :relief=>:groove),
-            :sticky=>:ew)
-    i += 1
-  }
-  $focus.grid_columnconfigure(1, :weight=>1)
-  $focus.grid_rowconfigure(i, :weight=>1)
-
-  $focus.bind('Destroy', proc{Tk.after_cancel($Timers[:FocusMonitor])})
-  focusMonitor
-end
-
-def focusMonitor
-  $FocusInf[:Widget] = focus_win = Tk.focus
-  if focus_win
-    $FocusInf[:WidgetClass] = focus_win.winfo_classname
-    $FocusInf[:WidgetNext] = Tk.focus_next(focus_win)
-  else
-    $FocusInf[:WidgetClass] = $FocusInf[:WidgetNext] = ''
-  end
-
-  $FocusInf[:Grab] = grab_wins = Tk.current_grabs
-  unless grab_wins.empty?
-    $FocusInf[:GrabStatus] = grab_wins[0].grab_status
-  else
-    $FocusInf[:GrabStatus] = ''
-  end
-
-  $Timers[:FocusMonitor] = Tk.after(200, proc{ focusMonitor() })
-end
-
-#
-# Widget state demo:
-#
-$Widget = TkVariable.new
-
-TkBindTag::ALL.bind('Control-Shift-ButtonPress-1',
-                    proc{|w|
-                      $Widget.value = w
-                      updateStates()
-                      Tk.callback_break
-                    }, '%W')
-$states_list = %w(active disabled focus pressed selected
-                  background indeterminate invalid default)
-$states_btns = {}
-$states = nil
-
-$State = TkVariable.new_hash
-
-def trackStates
-  if $states
-    begin
-      $state.destroy
-    rescue
-    end
-  end
-  $states = TkToplevel.new(:title=>'Widget states')
-
-  l_inf = Tk::Tile::Label.new($states, :text=>"Press Control-Shift-Button-1 on any widget")
-
-  l_lw = Tk::Tile::Label.new($states, :text=>'Widget:',
-                             :anchor=>:e, :relief=>:groove)
-  l_w = Tk::Tile::Label.new($states, :textvariable=>$Widget,
-                             :anchor=>:w, :relief=>:groove)
-
-  Tk.grid(l_inf, '-', :sticky=>:ew, :padx=>6, :pady=>6)
-  Tk.grid(l_lw, l_w, :sticky=>:ew)
-
-  $states_list.each{|st|
-    cb = Tk::Tile::Checkbutton.new($states, :text=>st,
-                                   :variable=>$State.ref(st),
-                                   :command=>proc{ changeState(st) })
-    $states_btns[st] = cb
-    Tk.grid('x', cb, :sticky=>:nsew)
-  }
-
-  $states.grid_columnconfigure(1, :weight=>1)
-
-  f_cmd = Tk::Tile::Frame.new($states)
-  Tk.grid('x', f_cmd, :sticky=>:nse)
-
-  b_close = Tk::Tile::Button.new(f_cmd, :text=>'Close',
-                                 :command=>proc{ $states.destroy })
-  Tk.grid('x', b_close, :padx=>4, :pady=>[6,4])
-  f_cmd.grid_columnconfigure(0, :weight=>1)
-
-  $states.bind('KeyPress-Escape', proc{Tk.event_generate(b_close, '<Invoke>')})
-
-  $states.bind('Destroy', proc{Tk.after_cancel($Timers[:StateMonitor])})
-  stateMonitor()
-end
-
-def stateMonitor
-  updateStates() if $Widget.value != ''
-  $Timers[:StateMonitor] = Tk.after(200, proc{ stateMonitor() })
-end
-
-def updateStates
-  $states_list.each{|st|
-    begin
-      $State[st] = $Widget.window.ttk_instate(st)
-    rescue
-      $states_btns[st].ttk_state('disabled')
-    else
-      $states_btns[st].ttk_state('!disabled')
-    end
-  }
-end
-
-def changeState(st)
-  if $Widget.value != ''
-    if $State.bool_element(st)
-      $Widget.window.ttk_state(st)
-    else
-      $Widget.window.ttk_state("!#{st}")
-    end
-  end
-end
-
-#
-# Repeating buttons demo:
-#
-def repeatDemo
-  if defined?($repeatDemo) && $repeatDemo.exist?
-    $repeatDemo.deiconify; return
-  end
-  $repeatDemo = TkToplevel.new(:title=>'Repeating button')
-
-  f = Tk::Tile::Frame.new($repeatDemo)
-  b = Tk::Tile::Button.new(f, :class=>'Repeater', :text=>'Press and hold')
-  if version?('0.6')
-    p = Tk::Tile::Progressbar.new(f, :orient=>:horizontal, :maximum=>10)
-  else # progressbar is not supported
-    p = Tk::Tile::Progress.new(f, :orient=>:horizontal, :from=>0, :to=>10)
-    def p.step
-      i = self.get + 1
-      i = self.from if i > self.to
-      self.set(i)
-    end
-  end
-  b.command {p.step}
-
-  b.pack(:side=>:left, :expand=>false, :fill=>:none, :padx=>6, :pady=>6)
-  p.pack(:side=>:right, :expand=>true, :fill=>:x, :padx=>6, :pady=>6)
-  f.pack(:expand=>true, :fill=>:both)
-end
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/tile/iconlib.tcl b/ext/tk/sample/tkextlib/tile/iconlib.tcl
deleted file mode 100644
index 9a93ece504..0000000000
--- a/ext/tk/sample/tkextlib/tile/iconlib.tcl
+++ /dev/null
@@ -1,110 +0,0 @@
-array set ImgData {
-bold {R0lGODlhEAAQAJEAANnZ2QAAAP///////yH5BAEAAAAALAAAAAAQABAAAAI6hI+py60U3wj+
-RYQFJYRvEWFBCeFbRFhQQvhG8YPgX0RYUEL4FhEWlBC+RYQFJYQPFN8IPqYut/8hBQA7}
-copy {R0lGODlhEAAQAJEAANnZ2QAAAP///wAAhCH5BAEAAAAALAAAAAAQABAAAAJUhI8JFJ/gY4iI
-UEL4FyIiFIXgW0iEUDgfACBI9pzMAAGRiIghWSMDECR7JEKGtkFIRFBG+TIQKDQxtgzcDcmX
-IfgwQrFlCD4MyZch+EDzj+Bj6mYBADs=}
-cut {R0lGODlhEAAQAJEAANnZ2QAAAAAAhP///yH5BAEAAAAALAAAAAAQABAAAAJFhI+pcUHwEeIi
-E0gACIKPEAFBIXy0gMg8EhM+YmQiKSL4eAIiJMI/EQEhQGYGYiQIQAg+iAkIATIzECMBIgT/
-RBARERlSADs=}
-dragfile {R0lGODlhGAAYAKIAANnZ2TMzM////wAAAJmZmf///////////yH5BAEAAAAALAAAAAAYABgA
-AAPACBi63IqgC4GiyxwogaAbKLrMgSKBoBoousyBogEACIGiyxwoKgGAECI4uiyCExMTOACB
-osuNpDoAGCI4uiyCIkREOACBosutSDoAgSI4usyCIjQAGCi63Iw0ACEoOLrMgiI0ABgoutyM
-NAAhKDi6zIIiNAAYKLrcjDQAISg4usyCIjQAGCi63Iw0AIGiiqPLIyhCA4CBosvNSAMQKKo4
-ujyCIjQAGCi63Iw0AIGiy81IAxCBpMu9GAMAgKPL3QgJADs=}
-dragicon {R0lGODlhGAAYALMAANnZ2TMzM/////8zM8zMzGYAAAAAAJmZmQCZMwAzZgCZzGZmZv//////
-/////////yH5BAEAAAAALAAAAAAYABgAAAT/EMAgJ60SAjlBgEJOSoMIEMgZoJCT0iADBFIG
-KOSkNMwAAABhwiHnIEKIIIQQAQIZhBBwyDmKEMIEE0yABoAghIBDzlGEENDIaQAIQgg45BwF
-CinPOccAECYcUiKEEBFCiHPgMQAEIcQYYyABBUGIQCHlMQCEScZAAhKEEApCECGOARAEIQQp
-BRGIpAyCJCGOASBAISdEcqJAVBLiGABggELOAJGUKyiVhDgGABigkJMEhNAKSqkEhTgGgCCl
-FCQEGIJSSiUhjgEgQCEnJVBJmYQ4BoAAhZyTQCVnEuIYAAIUckoCk5xSiGMACFDISSs9BoBg
-rRXQMQAEKOSklR4DEUAI8MhJ6wwGAACgkZNWCkAEADs=}
-error {R0lGODlhIAAgAKIAANnZ2YQAAP8AAISEhP///////////////yH5BAEAAAAALAAAAAAgACAA
-AAP/CLoMGLqKoMvtGIqiqxEYCLrcioGiyxwIusyBgaLLLRiBoMsQKLrcjYGgu4Giy+2CAkFX
-A0WX2wXFIOgGii7trkCEohsDCACBoktEKLpKhISiGwAIECiqSKooukiqKKoxgACBooukKiIo
-SKooujGDECi6iqQqsopEV2MQAkV3kXQZRXdjEAJFl5F0FUWXY3ACRZcFSRdFlyVwJlB0WZB0
-UXRZAmcCRZeRdBVFl2NwAkV3kXQZRXdjcAJFV5FURVaR6GoMDgSKLpKqiKAgqaLoxgwOBIoq
-kiqKLpIqimrM4ECg6BIRiq4SIaHoxgyCBoou7a5AhKIbMzgAAIGiy+2CTWJmBhAAAkWX2wXF
-zCDoBooud2PMDIKuRqDocgtGzMwg6O4Eii5z4Kgi6DIMhqLoagQGjiqCLvPgYOgqji6CLrfi
-6DIj6HI7jq4i6DIkADs=}
-file {R0lGODlhCwANAJEAANnZ2QAAAP///////yH5BAEAAAAALAAAAAALAA0AAAIyhI9G8Q0AguSH
-AMQdxQgxEyEFQfItICQokYgEBMm3gBCKLRIQJN8CQii2SECQfAug+FgAOw==}
-folder {R0lGODlhEAANAKIAANnZ2YSEhMbGxv//AP///wAAAP///////yH5BAEAAAAALAAAAAAQAA0A
-AANjCIqhiqDLITgyEgi6GoIjIyMYugCBpMsaWBA0giMjIzgyUYBBMjIoIyODEgVBODIygiMj
-E1gQJIMyMjIoI1GAQSMjODIyghMFQSgjI4MyMhJYEDSCIyMjODJRgKHLXAiApcucADs=}
-hourglass {R0lGODlhIAAgAKIAANnZ2YAAAAAAAP8AAP///8DAwICAgP///yH5BAEAAAAALAAAAAAgACAA
-AAPZCLrc/jDKSau9OGcUuqyCoMvNGENVhaMrCLrcjaLLgqDL7WhFVIVVZoKgy+1oRUSFVWaC
-oMvtaEVEhVVmgqDL7WhFRIVVZoKgy+1oVVaCJWaCoMvtgKxISrBMEHS5fZEVSRkKgi63NzIq
-EwRdbndkVCYIutzeyIqqDAVBl9sXWRFJYZkg6HI7ICsiKqwyEwRdbkcrIhKsMhMEXW5HKyIp
-lDITBF1uRysyEiwxEwRdbkcrIyuUEhMEXW5H0WVB0OVujKGqwtEVBF1uRtHlRdDl9odRTlrt
-xRmjBAA7}
-info {R0lGODlhIAAgAKIAANnZ2YSEhMbGxv///wAA/wAAAP///////yH5BAEAAAAALAAAAAAgACAA
-AAP/CLoMGLqKoMvtGCo4uhKBgaDLDRghOLqsghEIuryBgqPLPSiBoMsQOLojhEQkOLpTCLob
-OLqKpIujq4WgC4Gju0i6OLpbCKohOLorhEQkOLorhaAQOLrc3qgCIARHl9sbSQUEji4j6RKO
-Lk9hQODosiKp4ujyFIbi6LIiqeLo8hSG4uiyIqni6PIUhuLosiKp4ujyFIYKji4PkiqOLkth
-BASOLg+SKo4uV2AEhODoMpIqju5KYShA4Ogqku7i6E4FRgAAYOHocvugiohAUC0cXe7GiohA
-0IUSHF3uQamICATdrULB0WUVrIqIQNBlCCwVHF2pwsJQRdDlDYyoKsHRPMLQDQRdbsDQqBmc
-wlBF0OV2jJqZwggEXW5vVDMVgaDL7Y5qKgJBl9sfVUUg6HL7AxSKoMvtr1AEgi5DAgA7}
-italic {R0lGODlhEAAQAJEAANnZ2QAAAP///////yH5BAEAAAAALAAAAAAQABAAAAIrhI+py+1A4hN8
-hIjINBITPlpEZBqJCR8tIjKNxISPFhGZQOITfExdbv9FCgA7}
-new {R0lGODlhEAAQAJEAANnZ2QAAAP///////yH5BAEAAAAALAAAAAAQABAAAAJFhI95FN8IvgXJ
-jyD4ECQ/JAh+kPyICIIdJP+CYAfJvyDYQfIvCHaQ/AuCHST/gmAHyb8g2EHyLwh2kPwLgk3x
-MQg+pu4WADs=}
-open {R0lGODlhEAAQAKIAANnZ2QAAAP//AP///4SEAP///////////yH5BAEAAAAALAAAAAAQABAA
-AANZCLrczigUQZc1EDQgEHSZAwMgIhB0NQIDQkYwdANBNUZwZGQEJxBUQwZlZGRQAkE1RnAE
-Q5dVcCSQdDcAYySQdDcAISSQdDcAASKQdDcAAQBDlwNBl9sfApQAOw==}
-openfold {R0lGODlhEAANAKIAANnZ2YSEhP///8bGxv//AAAAAP///////yH5BAEAAAAALAAAAAAQAA0A
-AANgCIqhiqDLgaIaCLoagkNDIxi6AIFCQ0M4KKpRgCFDQzg0NIQThaHLSxgVKLochRMVMkhD
-Q4M0VBFYEDKEQ0NDOFFRgCE0NEhDQ4MVBRAoNDSEQ0NRWAAYuqyFBQBYurwJADs=}
-overstrike {R0lGODlhEAAQAJEAANnZ2QAAAP///////yH5BAEAAAAALAAAAAAQABAAAAI3hI+py80Uh+Aj
-RFhQCP8iMILgWwRGEHyLwAiCbxEYQfCB4iPBhwiMIPgXYREEHyEiguBj6nI7FQA7}
-palette {R0lGODlhEAAQAKIAANnZ2QAAAP//AP////8A/4QAhP8AAAD//yH5BAEAAAAALAAAAAAQABAA
-AANtCLrcjqGBoMsRKCMTgaALMSgDAYMSCKoxgAFBITgSAIAQEhUIARCAEgAQOBAwghMQEwga
-MoIjIxAIEgCAEBEyKBAgg4GgGxAIYTGCgaALcRgQIIGgCwEYICODgaALITgyEoGguxiqCLrc
-/lChBAA7}
-passwd {R0lGODlhIAAgAMQAANnZ2QAAAICAgICAAP///7CwsMDAwMjIAPjIAOjo6Pj4AODg4HBwcMj4
-ANjY2JiYANDQ0MjIyPj4yKCgoMiYAMjImDAwAMjIMJiYmJCQkP//////////////////////
-/yH5BAEAAAAALAAAAAAgACAAAAX/ICCOIhiIIgiII1maZSCMQnCeJyAIQiAIAiAMwxCcJwkk
-EAQRCIUwGMSBDEEAAuJIlgKRJEEgGAMRBIGiDENQlqNAJAsYCEwgEEEgBAHSIEMAAuJIAgKR
-LEsgGEMgCEJgBMqhHENQlgJILMsSCMRABEFgGAESHMcRgIA4kgKxOIsTBAOhKAITKEGDHMhD
-kqIAEqAjisJAgIooBkpwNMcTgIA4jgLhOBAkEAOhKIoSKEGDIMcTkKQICgQEQQIxEIqiBEpw
-IMdxPAEIiCMJCEQUMUQ0EIqiHIfSIM3xBGUpCiABCUQyEMqhHMiBHMjxBCAgjuQoEAKxRANB
-HMqhHM1x/zxDUJajQIACsUTDQBAEIR3IcQRDAALiSIoCYQiEE03gII7HQR3BEICAOJICYRSC
-QDjRNE1CAAzVQR3WE5AkAAqEUQiFQEARBAUAAAzHQR3BEICAOI4CUQhFIBAREwXjUFUHdQRD
-QJJAABbCFAhEJBgBAADAMAwXdQRDAALiCAhEIRQCYRiCEZDjUFFHMAQkIBAFOAmTQBiFUAQg
-II7AUFXUEQwBCQjEJExBkBRCEZCjMIBD9RxDAALiGEzCFBBYIRTBOI7AQB1DMIoCMQkYGAjL
-JEwBCIgjOVDDEJCAQGACJiTTJEwBSY5BEJAiSCCwTAiCZBKmAATEkSzNQBCCYCDBJgELTNMk
-g0AMEgwTAhAQR7I0zYARgvM8TyAIznMMAQA7}
-paste {R0lGODlhEAAQAKIAANnZ2QAAAP//AISEAISEhP///wAAhP///yH5BAEAAAAALAAAAAAQABAA
-AANwCLrcjqGBoKsYqiKrCDSGBkMiJJCGAgCDKBB0gwYDIKYwdJUIAyBokIaGBmloAhBiaAgH
-TdcCEIKGBsmwVM0AIYaGcAxL1coQgoYGySoisMzMAoeGxrB01QJpaMiwMHTLAEPVsHTVEHTR
-dBlBlxswAQA7}
-print {R0lGODlhEAAQAKIAANnZ2QAAAP///4SEhP//AP///////////yH5BAEAAAAALAAAAAAQABAA
-AANZCLrcjqG7CLqBoquBoBuCoSqBoBsouhoIuiEYqrKBoIGiqwEYEIChyxAIEYGgywEYgKHL
-DAgRCLozgwABARgIukSEABEBGLq8gAEQCLobgAEAgKHLgaDLzZgAOw==}
-question {R0lGODlhIAAgAKIAANnZ2YSEhMbGxv///wAAAAAA/////////yH5BAEAAAAALAAAAAAgACAA
-AAP/CLoMGLqKoMvtGCo4uhKBgaDLDRghOLqsghEIuryBgqPLPSiBoMsQOLrcjYSgu4GjO4Kl
-Kzi6Qwi6EDi6I4UyU1VYgqM7hKAagqM7VTg6VYWFoztCCAqBo6tVWDVThVU4ukqBACE4ulqF
-VSNVWIWjq0IYEDi6K4UlU1VYOLpMgRA4uryCpTi6PIShOLq8hVU4uqyEoTi6vIUlOLqshKE4
-uryFhaPLSxgqOLrc3kgoAgJHl0ewSnB0eQhDIQRHl6uwCkeXhTAUIHB0uQqrcHSZAiMAAJBw
-dFcKS3B0lwIjAkGVcHS5GykiAkEXSHB0uQeFIiIQdJcIBUeXVZAoIgJBT5chkFRwdIUICUMV
-QZc3MIKIBEcJQzcQdLkBQ4NmcAhDFUGX2zFoZggjEHS5vRHNUASCLrc7oqEIBF1uf0QUgaDL
-7Q9QKIIut79CEQi6DAkAOw==}
-redo {R0lGODlhEAAQAJEAANnZ2QAAhP///////yH5BAEAAAAALAAAAAAQABAAAAIvhI+py+1vSByC
-jxAYQXDMwsyAggQAQBB8iwgMgg8REQgUwqbYBDsIPqYutz+MgBQAOw==}
-save {R0lGODlhEAAQAJEAANnZ2QAAAISEAP///yH5BAEAAAAALAAAAAAQABAAAAJWhI9pFB8RIIRC
-+BYQFqQQvkWEBSmEbyFhQQrhW0hYkEL4FhIWpBC+hYQFSYxvIgFAoXy0AAiSGP8kAIIkxgcI
-CSBEQvEBQgIIkVB8gJAAAhgfj+BjWgEAOw==}
-underline {R0lGODlhEAAQAJEAANnZ2QAAAP///////yH5BAEAAAAALAAAAAAQABAAAAI3hI+py60UBy4I
-vkVcBMG/iIsg+BdxEQT/Ii6C4F/ERRD8i7gIgn8RF0HwkWITfExFin8EH1OXCwA7}
-undo {R0lGODlhEAAQAJEAANnZ2QAAhP///////yH5BAEAAAAALAAAAAAQABAAAAIuhI+py+2vSByC
-HxdxQCHsCIg7oAAAEUHwLTAiKIQPgRSbYMfd3VEIH1OX2x8mUgA7}
-warning {R0lGODlhIAAgAKIAANnZ2YSEAP//AMbGxgAAAISEhP///////yH5BAEAAAAALAAAAAAgACAA
-AAP/CLq8gREIutz+KESGEHS5vVGIiAxSIehy+6JAUaUqBF1uBxQoukOFhaDL7RgoukKFhaDL
-3RgoujqEVQi63IyBortUWAi63IuBostDWIWgy60YIjKERCMiSFUIutyAISKCpCoiOFSFoMsd
-KCpIqiKCQlUIusyBooqkKiIoQ1UIuryBooqkiqJKVQi6rIGii6SKojpUWAi6DIGiG0RIgaJL
-VQi6HCi6MoREg6I7VFgIuhsoukqEhKKrVFgIuhoouhuEgaKrQ1iFoAuBortDOCi6S4WFoBso
-uiyEostDWIWgGii63K6IqgAAIVB0WQaJBkV3h7AKAAJFl4WQiFB0mQoLRyBQdFkJiQhFl4ew
-CgJFl3WQaFB0WQirIFB0ud0RVVWg6HJ7o6GqAgwUXW5fNFRVhQCBpMvti0oVABCwdLndEehi
-6XI7I4AEADs=}
-}
diff --git a/ext/tk/sample/tkextlib/tile/readme.txt b/ext/tk/sample/tkextlib/tile/readme.txt
deleted file mode 100644
index 6c4a5cf543..0000000000
--- a/ext/tk/sample/tkextlib/tile/readme.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-All of *.tcl and under themes/ directory (except kroc.rb) are
-quoted from Tcl/Tk's Tile extension. Please read Orig_LICENSE.txt.
diff --git a/ext/tk/sample/tkextlib/tile/repeater.tcl b/ext/tk/sample/tkextlib/tile/repeater.tcl
deleted file mode 100644
index 43beb9430a..0000000000
--- a/ext/tk/sample/tkextlib/tile/repeater.tcl
+++ /dev/null
@@ -1,117 +0,0 @@
-#
-# $Id$
-#
-# Demonstration of custom classes.
-#
-# The Tile button doesn't have built-in support for autorepeat.
-# Instead of adding -repeatdelay and -repeatinterval options,
-# and all the extra binding scripts required to deal with them,
-# we create a custom widget class for autorepeating buttons.
-#
-# Usage:
-#	ttk::button .b -class Repeater [... other options ...]
-#
-# TODO:
-#	Use system settings for repeat interval and initial delay.
-#
-# Notes:
-#	Repeater buttons work more like scrollbar arrows than
-#	Tk repeating buttons: they fire once immediately when
-#	first pressed, and $State(delay) specifies the initial
-#	interval before the button starts autorepeating.
-#
-
-namespace eval tile::Repeater {
-    variable State
-    set State(timer) 	{}	;# [after] id of repeat script
-    set State(interval)	100	;# interval between repetitions
-    set State(delay)	300	;# delay after initial invocation
-}
-
-### Class bindings.
-#
-
-bind Repeater <Enter>		{ %W state active }
-bind Repeater <Leave>		{ %W state !active }
-
-bind Repeater <Key-space> 	{ tile::Repeater::Activate %W }
-bind Repeater <<Invoke>> 	{ tile::Repeater::Activate %W }
-
-bind Repeater <ButtonPress-1> 	{ tile::Repeater::Press %W }
-bind Repeater <ButtonRelease-1> { tile::Repeater::Release %W }
-bind Repeater <B1-Leave> 	{ tile::Repeater::Pause %W }
-bind Repeater <B1-Enter> 	{ tile::Repeater::Resume %W } ;# @@@ see below
-
-# @@@ Workaround for metacity-induced bug:
-bind Repeater <B1-Enter> \
-    { if {"%d" ne "NotifyUngrab"} { tile::Repeater::Resume %W } }
-
-### Binding procedures.
-#
-
-## Activate -- Keyboard activation binding.
-#	Simulate clicking the button, and invoke the command once.
-#
-proc tile::Repeater::Activate {w} {
-    $w instate disabled { return }
-    set oldState [$w state pressed]
-    update idletasks; after 100
-    $w state $oldState
-    after idle [list $w invoke]
-}
-
-## Press -- ButtonPress-1 binding.
-#	Invoke the command once and start autorepeating after
-#	$State(delay) milliseconds.
-#
-proc tile::Repeater::Press {w} {
-    variable State
-    $w instate disabled { return }
-    $w state pressed
-    $w invoke
-    after cancel $State(timer)
-    set State(timer) [after $State(delay) [list tile::Repeater::Repeat $w]]
-}
-
-## Release -- ButtonRelease binding.
-#	Stop repeating.
-#
-proc tile::Repeater::Release {w} {
-    variable State
-    $w state !pressed
-    after cancel $State(timer)
-}
-
-## Pause -- B1-Leave binding
-#	Temporarily suspend autorepeat.
-#
-proc tile::Repeater::Pause {w} {
-    variable State
-    $w state !pressed
-    after cancel $State(timer)
-}
-
-## Resume -- B1-Enter binding
-#	Resume autorepeat.
-#
-proc tile::Repeater::Resume {w} {
-    variable State
-    $w instate disabled { return }
-    $w state pressed
-    $w invoke
-    after cancel $State(timer)
-    set State(timer) [after $State(interval) [list tile::Repeater::Repeat $w]]
-}
-
-## Repeat -- Timer script
-#	Invoke the command and reschedule another repetition
-#	after $State(interval) milliseconds.
-#
-proc tile::Repeater::Repeat {w} {
-    variable State
-    $w instate disabled { return }
-    $w invoke
-    set State(timer) [after $State(interval) [list tile::Repeater::Repeat $w]]
-}
-
-#*EOF*
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue.tcl b/ext/tk/sample/tkextlib/tile/themes/blue/blue.tcl
deleted file mode 100644
index 68733e8ad2..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue.tcl
+++ /dev/null
@@ -1,149 +0,0 @@
-# blue.tcl - Copyright (C) 2004 Pat Thoyts <patthoyts@users.sourceforge.net>
-#
-# blue.tcl,v 1.27 2005/10/08 14:56:57 jenglish Exp
-#
-#
-
-namespace eval tile::theme::blue {
-
-    package provide tile::theme::blue 0.7
-
-    set imgdir [file join [file dirname [info script]] blue]
-    array set I [tile::LoadImages $imgdir *.gif]
-
-    array set colors {
-	-frame  	"#6699cc"
-	-lighter	"#bcd2e8"
-	-window	 	"#e6f3ff"
-	-selectbg	"#ffff33"
-	-selectfg	"#000000"
-	-disabledfg	"#666666"
-    }
-
-    style theme create blue -settings {
-
-	style default . \
-	    -borderwidth 	1 \
-	    -background 	$colors(-frame) \
-	    -fieldbackground	$colors(-window) \
-	    -troughcolor	$colors(-lighter) \
-	    -selectbackground	$colors(-selectbg) \
-	    -selectforeground	$colors(-selectfg) \
-	    ;
-	style map . -foreground [list disabled $colors(-disabledfg)]
-
-	## Buttons.
-	#
-	style default TButton -padding "10 0"
-	style layout TButton {
-	    Button.button -children {
-		Button.focus -children {
-		    Button.padding -children {
-			Button.label
-		    }
-		}
-	    }
-	}
-
-	style element create button image $I(button-n) \
-	    -map [list pressed $I(button-p)  active $I(button-h)] \
-	    -border 4 -sticky ew
-
-	style element create Checkbutton.indicator image $I(check-nu) \
-	    -width 24 -sticky w -map [list \
-		{!disabled active selected} $I(check-hc) \
-		{!disabled active} $I(check-hu) \
-		{!disabled selected} $I(check-nc) ]
-
-	style element create Radiobutton.indicator image $I(radio-nu) \
-	    -width 24 -sticky w -map [list \
-		{!disabled active selected} $I(radio-hc) \
-		{!disabled active} $I(radio-hu) \
-		selected $I(radio-nc) ]
-
-	style default TMenubutton -relief raised -padding {10 2}
-
-	## Toolbar buttons.
-	#
-	style default Toolbutton \
-	    -width 0 -relief flat -borderwidth 2 -padding 4 \
-	    -background $colors(-frame) -foreground #000000 ;
-	style map Toolbutton -background [list active $colors(-selectbg)]
-	style map Toolbutton -foreground [list active $colors(-selectfg)]
-	style map Toolbutton -relief {
-	    disabled 	flat
-	    selected	sunken
-	    pressed 	sunken
-	    active  	raised
-	}
-
-	## Entry widgets.
-	#
-	style default TEntry \
-	    -selectborderwidth 1 -padding 2 -insertwidth 2 -font TkTextFont
-	style default TCombobox \
-	    -selectborderwidth 1 -padding 2 -insertwidth 2 -font TkTextFont
-
-	## Notebooks.
-	#
-	style default TNotebook.Tab -padding {4 2 4 2}
-	style map TNotebook.Tab \
-	    -background \
-		[list selected $colors(-frame) active $colors(-lighter)] \
-	    -padding [list selected {4 4 4 2}]
-
-	## Labelframes.
-	#
-	style default TLabelframe -borderwidth 2 -relief groove
-
-	## Scrollbars.
-	#
-	style layout Vertical.TScrollbar {
-	    Scrollbar.trough -children {
-		Scrollbar.uparrow -side top
-		Scrollbar.downarrow -side bottom
-		Scrollbar.uparrow -side bottom
-		Vertical.Scrollbar.thumb -side top -expand true -sticky ns
-	    }
-	}
-
-	style layout Horizontal.TScrollbar {
-	    Scrollbar.trough -children {
-		Scrollbar.leftarrow -side left
-		Scrollbar.rightarrow -side right
-		Scrollbar.leftarrow -side right
-		Horizontal.Scrollbar.thumb -side left -expand true -sticky we
-	    }
-	}
-
-	style element create Horizontal.Scrollbar.thumb image $I(sb-thumb) \
-	    -map [list {pressed !disabled} $I(sb-thumb-p)] -border 3
-
-	style element create Vertical.Scrollbar.thumb image $I(sb-vthumb) \
-	    -map [list {pressed !disabled} $I(sb-vthumb-p)] -border 3
-
-	foreach dir {up down left right} {
-	    style element create ${dir}arrow image $I(arrow${dir}) \
-		-map [list \
-		    disabled $I(arrow${dir}) \
-		    pressed $I(arrow${dir}-p) \
-		    active $I(arrow${dir}-h)] \
-	        -border 1 -sticky {}
-	}
-
-	## Scales.
-	#
-	style element create Scale.slider \
-	    image $I(slider) -map [list {pressed !disabled} $I(slider-p)]
-
-	style element create Vertical.Scale.slider \
-	    image $I(vslider) -map [list {pressed !disabled} $I(vslider-p)]
-
-	style element create Horizontal.Progress.bar \
-	    image $I(sb-thumb) -border 2
-	style element create Vertical.Progress.bar \
-	    image $I(sb-vthumb) -border 2
-
-    }
-}
-
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowdown-h.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowdown-h.gif
deleted file mode 100644
index 3c1be9d880..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowdown-h.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowdown-p.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowdown-p.gif
deleted file mode 100644
index 1cb36ec554..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowdown-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowdown.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowdown.gif
deleted file mode 100644
index e363c362ed..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowdown.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowleft-h.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowleft-h.gif
deleted file mode 100644
index cbc3db2756..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowleft-h.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowleft-p.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowleft-p.gif
deleted file mode 100644
index 14d541b03e..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowleft-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowleft.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowleft.gif
deleted file mode 100644
index 32584a34b2..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowleft.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowright-h.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowright-h.gif
deleted file mode 100644
index 913e9da94b..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowright-h.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowright-p.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowright-p.gif
deleted file mode 100644
index d02208fcf7..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowright-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowright.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowright.gif
deleted file mode 100644
index 2b0f1fd07b..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowright.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowup-h.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowup-h.gif
deleted file mode 100644
index 6059bae094..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowup-h.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowup-p.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowup-p.gif
deleted file mode 100644
index 20b6a824f4..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowup-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowup.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowup.gif
deleted file mode 100644
index 5857616228..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowup.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/button-h.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/button-h.gif
deleted file mode 100644
index 0947f43b90..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/button-h.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/button-n.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/button-n.gif
deleted file mode 100644
index d9845283a5..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/button-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/button-n.xcf b/ext/tk/sample/tkextlib/tile/themes/blue/blue/button-n.xcf
deleted file mode 100644
index e38ed19e61..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/button-n.xcf
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/button-p.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/button-p.gif
deleted file mode 100644
index e819b1b951..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/button-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/check-hc.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/check-hc.gif
deleted file mode 100644
index b753aead97..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/check-hc.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/check-hu.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/check-hu.gif
deleted file mode 100644
index 74dbb799a2..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/check-hu.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/check-nc.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/check-nc.gif
deleted file mode 100644
index 8f3d9114a3..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/check-nc.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/check-nu.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/check-nu.gif
deleted file mode 100644
index 6f360ffd62..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/check-nu.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/radio-hc.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/radio-hc.gif
deleted file mode 100644
index f7c21fb0c3..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/radio-hc.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/radio-hu.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/radio-hu.gif
deleted file mode 100644
index a006630388..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/radio-hu.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/radio-nc.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/radio-nc.gif
deleted file mode 100644
index 0281de37d8..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/radio-nc.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/radio-nu.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/radio-nu.gif
deleted file mode 100644
index 58ec60c1db..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/radio-nu.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/sb-thumb-p.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/sb-thumb-p.gif
deleted file mode 100644
index 6cfaa416d1..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/sb-thumb-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/sb-thumb.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/sb-thumb.gif
deleted file mode 100644
index d9bfc0a7be..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/sb-thumb.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/sb-vthumb-p.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/sb-vthumb-p.gif
deleted file mode 100644
index 930d7fd9ff..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/sb-vthumb-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/sb-vthumb.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/sb-vthumb.gif
deleted file mode 100644
index 060be5dd41..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/sb-vthumb.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/slider-p.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/slider-p.gif
deleted file mode 100644
index c1c089de3e..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/slider-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/slider.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/slider.gif
deleted file mode 100644
index 1805c2dc7c..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/slider.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/vslider-p.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/vslider-p.gif
deleted file mode 100644
index bc37b31c3d..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/vslider-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue/vslider.gif b/ext/tk/sample/tkextlib/tile/themes/blue/blue/vslider.gif
deleted file mode 100644
index d3745c7f62..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue/vslider.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/pkgIndex.tcl b/ext/tk/sample/tkextlib/tile/themes/blue/pkgIndex.tcl
deleted file mode 100644
index 4facac70d8..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/blue/pkgIndex.tcl
+++ /dev/null
@@ -1,6 +0,0 @@
-# Package index for tile demo pixmap themes.
-
-if {[file isdirectory [file join $dir blue]]} {
-    package ifneeded tile::theme::blue 0.7 \
-        [list source [file join $dir blue.tcl]]
-}
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik.tcl b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik.tcl
deleted file mode 100644
index 60c59be0ca..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik.tcl
+++ /dev/null
@@ -1,194 +0,0 @@
-# keramik.tcl -
-#
-# A sample pixmap theme for the tile package.
-#
-#  Copyright (c) 2004 Googie
-#  Copyright (c) 2004 Pat Thoyts <patthoyts@users.sourceforge.net>
-#
-# $Id$
-
-package require Tk 8.4;                 # minimum version for Tile
-package require tile 0.5;               # depends upon tile 0.5
-
-namespace eval tile {
-    namespace eval theme {
-        namespace eval keramik {
-            variable version 0.3.2
-        }
-    }
-}
-
-namespace eval tile::theme::keramik {
-
-    variable imgdir [file join [file dirname [info script]] keramik]
-    variable I
-    array set I [tile::LoadImages $imgdir *.gif]
-
-    variable colors
-    array set colors {
-        -frame      "#cccccc"
-        -lighter    "#cccccc"
-        -window     "#ffffff"
-        -selectbg   "#eeeeee"
-        -selectfg   "#000000"
-        -disabledfg "#aaaaaa"
-    }
-
-    style theme create keramik -parent alt -settings {
-
-
-        # -----------------------------------------------------------------
-        # Theme defaults
-        #
-        style default . \
-            -borderwidth 1 \
-            -background $colors(-frame) \
-            -troughcolor $colors(-lighter) \
-            -font TkDefaultFont \
-            ;
-
-        style map . -foreground [list disabled $colors(-disabledfg)]
-
-        # -----------------------------------------------------------------
-        # Button elements
-        #  - the button has a large rounded border and needs a bit of
-        #    horizontal padding.
-        #  - the checkbutton and radiobutton have the focus drawn around
-        #    the whole widget - hence the new layouts.
-        #
-        style layout TButton {
-            Button.background
-            Button.button -children {
-                Button.focus -children {
-                    Button.label
-                }
-            }
-        }
-        style layout Toolbutton {
-            Toolbutton.background
-            Toolbutton.button -children {
-                Toolbutton.focus -children {
-                    Toolbutton.label
-                }
-            }
-        }
-        style element create button image $I(button-n) \
-            -border {8 6 8 16} -padding {6 6} -sticky news \
-            -map [list {pressed !disabled} $I(button-p) \
-                      {active !selected}  $I(button-h) \
-                      selected $I(button-s) \
-                      disabled $I(button-d)]
-        style default TButton -padding {10 6}
-
-        style element create Toolbutton.button image $I(tbar-n) \
-            -border {2 8 2 16} -padding {2 2} -sticky news \
-            -map [list {pressed !disabled} $I(tbar-p) \
-                      {active !selected}   $I(tbar-a) \
-                      selected             $I(tbar-p)]
-
-        style element create Checkbutton.indicator image $I(check-u) \
-            -width 20 -sticky w \
-            -map [list selected $I(check-c)]
-
-        style element create Radiobutton.indicator image $I(radio-u) \
-            -width 20 -sticky w \
-            -map [list  selected $I(radio-c)]
-
-        # The layout for the menubutton is modified to have a button element
-        # drawn on top of the background. This means we can have transparent
-        # pixels in the button element. Also, the pixmap has a special
-        # region on the right for the arrow. So we draw the indicator as a
-        # sibling element to the button, and draw it after (ie on top of) the
-        # button image.
-        style layout TMenubutton {
-            Menubutton.background
-            Menubutton.button -children {
-                Menubutton.focus -children {
-                    Menubutton.padding -children {
-                        Menubutton.label -side left -expand true
-                    }
-                }
-            }
-            Menubutton.indicator -side right
-        }
-        style element create Menubutton.button image $I(mbut-n) \
-            -map [list {active !disabled} $I(mbut-a) \
-                      {pressed !disabled} $I(mbut-a) \
-                      {disabled}          $I(mbut-d)] \
-            -border {7 10 29 15} -padding {7 4 29 4} -sticky news
-        style element create Menubutton.indicator image $I(mbut-arrow-n) \
-            -width 11 -sticky w -padding {0 0 18 0}
-
-        # -----------------------------------------------------------------
-        # Scrollbars, scale and progress elements
-        #  - the scrollbar has three arrow buttons, two at the bottom and
-        #    one at the top.
-        #
-        style layout Vertical.TScrollbar {
-            Scrollbar.background
-            Scrollbar.trough -children {
-                Scrollbar.uparrow -side top
-                Scrollbar.downarrow -side bottom
-                Scrollbar.uparrow -side bottom
-                Vertical.Scrollbar.thumb -side top -expand true -sticky ns
-            }
-        }
-
-        style layout Horizontal.TScrollbar {
-            Scrollbar.background
-            Scrollbar.trough -children {
-                Scrollbar.leftarrow -side left
-                Scrollbar.rightarrow -side right
-                Scrollbar.leftarrow -side right
-                Horizontal.Scrollbar.thumb -side left -expand true -sticky we
-            }
-        }
-
-        style default TScrollbar -width 16
-
-        style element create Horizontal.Scrollbar.thumb image $I(hsb-n) \
-            -border {6 4} -width 15 -height 16 -sticky news \
-            -map [list {pressed !disabled} $I(hsb-p)]
-
-        style element create Vertical.Scrollbar.thumb image $I(vsb-n) \
-            -border {4 6} -width 16 -height 15 -sticky news \
-            -map [list {pressed !disabled} $I(vsb-p)]
-
-        style element create Scale.slider image $I(hslider-n) \
-            -border 3
-
-        style element create Vertical.Scale.slider image $I(vslider-n) \
-            -border 3
-
-        style element create Horizontal.Progress.bar image $I(hsb-n) \
-            -border {6 4}
-
-        style element create Vertical.Progress.bar image $I(vsb-n) \
-            -border {4 6}
-
-        style element create uparrow image $I(arrowup-n) \
-            -map [list {pressed !disabled} $I(arrowup-p)]
-
-        style element create downarrow image $I(arrowdown-n) \
-            -map [list {pressed !disabled} $I(arrowdown-p)]
-
-        style element create rightarrow image $I(arrowright-n) \
-            -map [list {pressed !disabled} $I(arrowright-p)]
-
-        style element create leftarrow image $I(arrowleft-n) \
-            -map [list {pressed !disabled} $I(arrowleft-p)]
-
-        # -----------------------------------------------------------------
-        # Notebook elements
-        #
-        style element create tab image $I(tab-n) \
-            -map [list selected $I(tab-p) active $I(tab-p)] \
-            -border {6 6 6 2} -height 12
-
-	## Labelframes.
-	#
-	style default TLabelframe -borderwidth 2 -relief groove
-    }
-}
-
-package provide tile::theme::keramik $::tile::theme::keramik::version
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowdown-n.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowdown-n.gif
deleted file mode 100644
index 2d84f29c60..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowdown-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowdown-p.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowdown-p.gif
deleted file mode 100644
index 52ee752641..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowdown-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowleft-n.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowleft-n.gif
deleted file mode 100644
index ff309c56f2..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowleft-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowleft-p.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowleft-p.gif
deleted file mode 100644
index 2159f274a5..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowleft-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowright-n.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowright-n.gif
deleted file mode 100644
index 905fa7ed1d..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowright-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowright-p.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowright-p.gif
deleted file mode 100644
index 0323332f30..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowright-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowup-n.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowup-n.gif
deleted file mode 100644
index 20dcadb30e..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowup-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowup-p.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowup-p.gif
deleted file mode 100644
index 129169e4c4..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowup-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-d.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-d.gif
deleted file mode 100644
index fe9bf98f81..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-d.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-h.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-h.gif
deleted file mode 100644
index 210734d1ae..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-h.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-n.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-n.gif
deleted file mode 100644
index 5e1eafa854..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-p.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-p.gif
deleted file mode 100644
index bfd74889f8..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-s.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-s.gif
deleted file mode 100644
index 1095ed7583..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-s.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/check-c.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/check-c.gif
deleted file mode 100644
index 06e8795df8..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/check-c.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/check-u.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/check-u.gif
deleted file mode 100644
index 3c02fcbe81..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/check-u.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/hsb-n.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/hsb-n.gif
deleted file mode 100644
index 1d93973c75..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/hsb-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/hsb-p.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/hsb-p.gif
deleted file mode 100644
index 18fbae08ab..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/hsb-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/hslider-n.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/hslider-n.gif
deleted file mode 100644
index 334e8e4a40..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/hslider-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/mbut-a.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/mbut-a.gif
deleted file mode 100644
index 2e2f1c2f10..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/mbut-a.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/mbut-arrow-n.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/mbut-arrow-n.gif
deleted file mode 100644
index 48197cbfc9..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/mbut-arrow-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/mbut-d.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/mbut-d.gif
deleted file mode 100644
index 4a294b4984..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/mbut-d.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/mbut-n.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/mbut-n.gif
deleted file mode 100644
index 65c0e4efa2..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/mbut-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/radio-c.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/radio-c.gif
deleted file mode 100644
index c8257c9336..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/radio-c.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/radio-u.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/radio-u.gif
deleted file mode 100644
index 215a73821c..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/radio-u.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tab-n.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tab-n.gif
deleted file mode 100644
index 03099a95be..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tab-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tab-p.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tab-p.gif
deleted file mode 100644
index abec6aba40..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tab-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tbar-a.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tbar-a.gif
deleted file mode 100644
index 2c223ba2c5..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tbar-a.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tbar-n.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tbar-n.gif
deleted file mode 100644
index 77ef8a26cf..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tbar-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tbar-p.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tbar-p.gif
deleted file mode 100644
index 3179b87ad9..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tbar-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/vsb-n.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/vsb-n.gif
deleted file mode 100644
index be01e4a72a..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/vsb-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/vsb-p.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/vsb-p.gif
deleted file mode 100644
index 0bb39e91ff..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/vsb-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/vslider-n.gif b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/vslider-n.gif
deleted file mode 100644
index cf03d7f325..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/vslider-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/pkgIndex.tcl b/ext/tk/sample/tkextlib/tile/themes/keramik/pkgIndex.tcl
deleted file mode 100644
index cedec328f8..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/pkgIndex.tcl
+++ /dev/null
@@ -1,15 +0,0 @@
-# pkgIndex.tcl for additional tile pixmap themes.
-#
-# We don't provide the package is the image subdirectory isn't present,
-# or we don't have the right version of Tcl/Tk
-#
-# To use this automatically within tile, the tile-using application should
-# use tile::availableThemes and tile::setTheme
-#
-# $Id$
-
-if {![file isdirectory [file join $dir keramik]]} { return }
-if {![package vsatisfies [package provide Tcl] 8.4]} { return }
-
-package ifneeded tile::theme::keramik 0.3.2 \
-    [list source [file join $dir keramik.tcl]]
diff --git a/ext/tk/sample/tkextlib/tile/themes/kroc.rb b/ext/tk/sample/tkextlib/tile/themes/kroc.rb
deleted file mode 100644
index 3b8569275b..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/kroc.rb
+++ /dev/null
@@ -1,227 +0,0 @@
-# frozen_string_literal: false
-#
-# kroc.rb
-#
-# based on:
-#   >> kroc.tcl - Copyright (C) 2004 David Zolli <kroc@kroc.tk>
-#
-
-imgdir = File.join(File.dirname(__FILE__), 'kroc', 'kroc')
-$images = Tk::Tile.load_images(imgdir, '*.gif')
-
-if TkPackage.vcompare(Tk::Tile.package_version, '0.5') >= 0
-  $TNotebook_Tab = Tk::Tile::TNotebook.style('Tab')
-else
-  $TNotebook_Tab = 'Tab.TNotebook'
-end
-
-def kroc_rb_settings
-  # Tk::Tile::Style.default(TkRoot, :background=>'#FCB64F',
-  #                         :troughcolor=>'#F8C278', :borderwidth=>1)
-  #   or
-  # Tk::Tile::Style.default(Tk.root, :background=>'#FCB64F',
-  #                         :troughcolor=>'#F8C278', :borderwidth=>1)
-  #   or
-  # Tk::Tile::Style.default('.', :background=>'#FCB64F',
-  #                         :troughcolor=>'#F8C278', :borderwidth=>1)
-  #   or
-  # Tk::Tile::Style.default(nil, :background=>'#FCB64F',
-  #                         :troughcolor=>'#F8C278', :borderwidth=>1)
-  #   or
-  Tk::Tile::Style.default(:background=>'#FCB64F', :troughcolor=>'#F8C278',
-                          :borderwidth=>1)
-  # Tk::Tile::Style.default(TkRoot, :font=>Tk::Tile::Font::Default,
-  #                         :borderwidth=>1)
-  #   or
-  # Tk::Tile::Style.default(Tk.root, :font=>Tk::Tile::Font::Default,
-  #                         :borderwidth=>1)
-  #   or
-  # Tk::Tile::Style.default('.', :font=>Tk::Tile::Font::Default,
-  #                         :borderwidth=>1)
-  #   or
-  # Tk::Tile::Style.default(nil, :font=>Tk::Tile::Font::Default,
-  #                         :borderwidth=>1)
-  #   or
-  Tk::Tile::Style.default(:font=>Tk::Tile::Font::Default, :borderwidth=>1)
-
-  # Tk::Tile::Style.map(TkRoot, :background=>[:active, '#694418'])
-  #   or
-  # Tk::Tile::Style.map(Tk.root, :background=>[:active, '#694418'])
-  #   or
-  # Tk::Tile::Style.map('.', :background=>[:active, '#694418'])
-  #   or
-  # Tk::Tile::Style.map(nil, :background=>[:active, '#694418'])
-  #   or
-  Tk::Tile::Style.map(:background=>[:active, '#694418'])
-  Tk::Tile::Style.map(:foreground=>[:disabled, '#B2B2B2', :active, '#FFE7CB'])
-
-  # Tk::Tile::Style.default('TButton', :padding=>[10,4])
-  Tk::Tile::Style.default(Tk::Tile::TButton, :padding=>[10,4])
-
-  # Tk::Tile::Style.default('TNotebook.Tab',
-  Tk::Tile::Style.default($TNotebook_Tab,
-                          :padding=>[10, 3], :font=>Tk::Tile::Font::Default)
-  # Tk::Tile::Style.map('TNotebook.Tab',
-  Tk::Tile::Style.map($TNotebook_Tab,
-                      :background=>[:selected, '#FCB64F', '', '#FFE6BA'],
-                      :foreground=>['', 'black'],
-                      :padding=>[:selected, [10, 6, 10, 3]])
-
-  # Tk::Tile::Style.map('TScrollbar',
-  Tk::Tile::Style.map(Tk::Tile::TScrollbar,
-                      :background=>[:pressed, '#694418'],
-                      :arrowcolor=>[:pressed, '#FEF7CB'],
-                      :relief=>[:pressed, :sunken])
-
-  # Tk::Tile::Style.layout('Vertical.TScrollbar',
-  Tk::Tile::Style.layout(Tk::Tile.style('Vertical', Tk::Tile::TScrollbar),
-                         ['Scrollbar.trough', {:children=>[
-                             'Scrollbar.uparrow',   {:side=>:top},
-                             'Scrollbar.downarrow', {:side=>:bottom},
-                             'Scrollbar.uparrow',   {:side=>:bottom},
-                             'Scrollbar.thumb',  {:side=>:top, :expand=>true}
-                           ]}
-                         ])
-
-  # Tk::Tile::Style.layout('Horizontal.TScrollbar',
-  Tk::Tile::Style.layout(Tk::Tile.style('Horizontal', Tk::Tile::TScrollbar),
-                         ['Scrollbar.trough', {:children=>[
-                             'Scrollbar.leftarrow',   {:side=>:left},
-                             'Scrollbar.rightarrow', {:side=>:right},
-                             'Scrollbar.leftarrow',   {:side=>:right},
-                             'Scrollbar.thumb',  {:side=>:left, :expand=>true}
-                           ]}
-                         ])
-
-  #
-  # Elements:
-  #
-  if Tk::Tile::TILE_SPEC_VERSION_ID >= 8
-    Tk::Tile::Style.element_create('Button.button',
-                                   :image,
-                                   [ $images['button-n'],
-                                     :pressed, $images['button-p'],
-                                     :active,  $images['button-h'],
-                                   ], :border=>3, :sticky=>:ew)
-
-    Tk::Tile::Style.element_create('Checkbutton.indicator',
-                                   :image,
-                                   [ $images['check-nu'],
-                                     [:pressed, :selected],$images['check-nc'],
-                                     :pressed,             $images['check-nu'],
-                                     [:active, :selected], $images['check-hc'],
-                                     :active,              $images['check-hu'],
-                                     :selected,            $images['check-nc'],
-                                   ], :sticky=>:w)
-
-    Tk::Tile::Style.element_create('Radiobutton.indicator',
-                                   :image,
-                                   [ $images['radio-nu'],
-                                     [:pressed,:selected],$images['radio-nc'],
-                                     :pressed,            $images['radio-nu'],
-                                     [:active,:selected], $images['radio-hc'],
-                                     :active,             $images['radio-hu'],
-                                     :selected,           $images['radio-nc'],
-                                   ], :sticky=>:w)
-
-  elsif TkPackage.vcompare(Tk::Tile.package_version, '0.5') >= 0
-    Tk::Tile::Style.element_create('Button.button',
-                                   :image, $images['button-n'],
-                                   :map=>[
-                                     :pressed, $images['button-p'],
-                                     :active,  $images['button-h'],
-                                   ], :border=>3, :sticky=>:ew)
-
-    Tk::Tile::Style.element_create('Checkbutton.indicator',
-                                   :image, $images['check-nu'],
-                                   :map=>[
-                                     [:pressed, :selected],$images['check-nc'],
-                                     :pressed,             $images['check-nu'],
-                                     [:active, :selected], $images['check-hc'],
-                                     :active,              $images['check-hu'],
-                                     :selected,            $images['check-nc'],
-                                   ], :sticky=>:w)
-
-    Tk::Tile::Style.element_create('Radiobutton.indicator',
-                                   :image, $images['radio-nu'],
-                                   :map=>[
-                                     [:pressed, :selected],$images['radio-nc'],
-                                     :pressed,             $images['radio-nu'],
-                                     [:active, :selected], $images['radio-hc'],
-                                     :active,              $images['radio-hu'],
-                                     :selected,            $images['radio-nc'],
-                                   ], :sticky=>:w)
-
-  else # tile 0.4 or earlier
-    Tk::Tile::Style.element_create('Button.button', :pixmap,
-                                   :images=>[
-                                     :pressed, $images['button-p'],
-                                     :active,  $images['button-h'],
-                                     '',       $images['button-n']
-                                   ], :border=>3, :tiling=>:tile)
-
-    Tk::Tile::Style.element_create('Checkbutton.indicator', :pixmap,
-                                   :images=>[
-                                     [:pressed, :selected],$images['check-nc'],
-                                     :pressed,             $images['check-nu'],
-                                     [:active, :selected], $images['check-hc'],
-                                     :active,              $images['check-hu'],
-                                     :selected,            $images['check-nc'],
-                                     '',                   $images['check-nu'],
-                                   ], :tiling=>:fixed)
-
-    Tk::Tile::Style.element_create('Radiobutton.indicator', :pixmap,
-                                   :images=>[
-                                     [:pressed, :selected],$images['radio-nc'],
-                                     :pressed,             $images['radio-nu'],
-                                     [:active, :selected], $images['radio-hc'],
-                                     :active,              $images['radio-hu'],
-                                     :selected,            $images['radio-nc'],
-                                     '',                   $images['radio-nu'],
-                                   ], :tiling=>:fixed)
-
-  end
-
-  #
-  # Settings:
-  #
-  # Tk::Tile::Style.layout(Tk::Tile::TButton,
-  Tk::Tile::Style.layout('TButton', [
-      'Button.button', {:children=>[
-           'Button.focus', {:children=>[
-                'Button.padding', {:children=>[
-                    'Button.label', {:expand=>true, :sticky=>''}
-                ]}
-           ]}
-      ]}
-  ])
-
-  # Tk::Tile::Style.layout(Tk::Tile::TCheckbutton,
-  Tk::Tile::Style.layout('TCheckbutton', [
-      'Checkbutton.background', # this is not needed in tile 0.5 or later
-      'Checkbutton.border', {:children=>[
-           'Checkbutton.padding', {:children=>[
-                'Checkbutton.indicator', {:side=>:left},
-                'Checkbutton.focus', {:side=>:left, :children=>[
-                    'Checkbutton.label'
-                ]}
-           ]}
-      ]}
-  ])
-
-  # Tk::Tile::Style.layout(Tk::Tile::TRadiobutton,
-  Tk::Tile::Style.layout('TRadiobutton', [
-      'Radiobutton.background', # this is not needed in tile 0.5 or later
-      'Radiobutton.border', {:children=>[
-           'Radiobutton.padding', {:children=>[
-                'Radiobutton.indicator', {:side=>:left},
-                'Radiobutton.focus', {:expand=>true, :sticky=>:w, :children=>[
-                    'Radiobutton.label', {:side=>:right, :expand=>true}
-                ]}
-           ]}
-      ]}
-  ])
-end
-
-Tk::Tile::Style.theme_create('kroc-rb', :parent=>'alt',
-                             :settings=>proc{ kroc_rb_settings() })
diff --git a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc.tcl b/ext/tk/sample/tkextlib/tile/themes/kroc/kroc.tcl
deleted file mode 100644
index b2cd79679a..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc.tcl
+++ /dev/null
@@ -1,163 +0,0 @@
-# kroc.tcl - Copyright (C) 2004 David Zolli <kroc@kroc.tk>
-#
-# A sample pixmap theme for the tile package.
-
-#package require tile::pixmap
-
-namespace eval tile {
-    namespace eval kroc {
-        variable version 0.0.1
-    }
-}
-
-namespace eval tile::kroc {
-
-    set imgdir [file join [file dirname [info script]] kroc]
-    array set Images [tile::LoadImages $imgdir *.gif]
-
-    if {[package vsatisfies [package provide tile] 0.5]} {
-        set TNoteBook_Tab TNotebook.Tab
-    } else {
-        set TNoteBook_Tab Tab.TNotebook
-    }
-
-    style theme create kroc -parent alt -settings {
-
-        style default . -background #FCB64F -troughcolor #F8C278 -borderwidth 1
-	style default . -font TkDefaultFont -borderwidth 1
-        style map . -background [list active #694418]
-        style map . -foreground [list disabled #B2B2B2 active #FFE7CB]
-
-        style default TButton -padding "10 4"
-
-        style default $TNoteBook_Tab -padding {10 3} -font TkDefaultFont
-        style map $TNoteBook_Tab \
-                -background [list selected #FCB64F {} #FFE6BA] \
-                -foreground [list {} black] \
-                -padding [list selected {10 6 10 3}]
-
-        style map TScrollbar \
-		-background	{ pressed #694418} \
-                -arrowcolor	{ pressed #FFE7CB } \
-                -relief		{ pressed sunken } \
-                ;
-
-        style layout Vertical.TScrollbar {
-            Scrollbar.trough -children {
-                Scrollbar.uparrow -side top
-                Scrollbar.downarrow -side bottom
-                Scrollbar.uparrow -side bottom
-                Scrollbar.thumb -side top -expand true
-            }
-        }
-
-        style layout Horizontal.TScrollbar {
-            Scrollbar.trough -children {
-                Scrollbar.leftarrow -side left
-                Scrollbar.rightarrow -side right
-                Scrollbar.leftarrow -side right
-                Scrollbar.thumb -side left -expand true
-            }
-        }
-
-        #
-        # Elements:
-        #
-        if {[package vsatisfies [package provide tile] 0.5]} {
-
-            style element create Button.button image $Images(button-n) \
-                -map [list  \
-                    pressed		$Images(button-p) \
-                    active		$Images(button-h) \
-                    ] -border 3 -sticky ew
-
-            style element create Checkbutton.indicator image $Images(check-nu) \
-                -map [list \
-                    {pressed selected}	$Images(check-nc) \
-                    pressed		$Images(check-nu) \
-                    {active selected}	$Images(check-hc) \
-                    active		$Images(check-hu) \
-                    selected		$Images(check-nc) \
-                    ] -sticky w
-
-            style element create Radiobutton.indicator image $Images(radio-nu) \
-                -map [list \
-                    {pressed selected}	$Images(radio-nc) \
-                    pressed		$Images(radio-nu) \
-                    {active selected}	$Images(radio-hc) \
-                    active		$Images(radio-hu) \
-                    selected		$Images(radio-nc) \
-                    ] -sticky w
-
-        } else {
-
-            style element create Button.button pixmap -images [list  \
-                    pressed		$Images(button-p) \
-                    active		$Images(button-h) \
-                    {}			$Images(button-n) \
-                    ] -border 3 -tiling tile
-
-            style element create Checkbutton.indicator pixmap -images [list \
-                    {pressed selected}	$Images(check-nc) \
-                    pressed		$Images(check-nu) \
-                    {active selected}	$Images(check-hc) \
-                    active		$Images(check-hu) \
-                    selected		$Images(check-nc) \
-                    {}			$Images(check-nu) \
-                    ] -tiling fixed
-
-            style element create Radiobutton.indicator pixmap -images [list \
-                    {pressed selected}	$Images(radio-nc) \
-                    pressed		$Images(radio-nu) \
-                    {active selected}	$Images(radio-hc) \
-                    active		$Images(radio-hu) \
-                    selected		$Images(radio-nc) \
-                    {}			$Images(radio-nu) \
-                    ] -tiling fixed
-
-        }
-
-        #
-        # Settings: (*button.background is not needed in tile 0.5 or above)
-        #
-        style layout TButton {
-	    Button.button -children {
-		Button.focus -children {
-		    Button.padding -children {
-			Button.label -expand true -sticky {}
-		    }
-		}
-	    }
-        }
-
-        style layout TCheckbutton {
-	    Checkbutton.border -children {
-		Checkbutton.background
-		Checkbutton.padding -children {
-		    Checkbutton.indicator -side left
-		    Checkbutton.focus -side left -children {
-			Checkbutton.label
-		    }
-		}
-            }
-        }
-
-        style layout TRadiobutton {
-            Radiobutton.border -children {
-                Radiobutton.background
-                Radiobutton.padding -children  {
-                    Radiobutton.indicator -side left
-                    Radiobutton.focus -expand true -sticky w -children {
-                        Radiobutton.label -side right -expand true
-                    }
-                }
-            }
-        }
-
-    } }
-
-# -------------------------------------------------------------------------
-
-package provide tile::theme::kroc $::tile::kroc::version
-
-# -------------------------------------------------------------------------
diff --git a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/button-h.gif b/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/button-h.gif
deleted file mode 100644
index e7a140dede..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/button-h.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/button-n.gif b/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/button-n.gif
deleted file mode 100644
index 78b506ddeb..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/button-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/button-p.gif b/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/button-p.gif
deleted file mode 100644
index a5a4e90be1..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/button-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/check-hc.gif b/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/check-hc.gif
deleted file mode 100644
index 41503c5ebd..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/check-hc.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/check-hu.gif b/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/check-hu.gif
deleted file mode 100644
index b3e512ca67..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/check-hu.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/check-nc.gif b/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/check-nc.gif
deleted file mode 100644
index a28c288fce..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/check-nc.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/check-nu.gif b/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/check-nu.gif
deleted file mode 100644
index 5c23931bbc..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/check-nu.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/radio-hc.gif b/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/radio-hc.gif
deleted file mode 100644
index 359fe1cc8b..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/radio-hc.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/radio-hu.gif b/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/radio-hu.gif
deleted file mode 100644
index 9f46b37926..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/radio-hu.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/radio-nc.gif b/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/radio-nc.gif
deleted file mode 100644
index 6437f33a7a..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/radio-nc.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/radio-nu.gif b/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/radio-nu.gif
deleted file mode 100644
index 2d2aac8597..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/radio-nu.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/kroc/pkgIndex.tcl b/ext/tk/sample/tkextlib/tile/themes/kroc/pkgIndex.tcl
deleted file mode 100644
index de4f3d4555..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/kroc/pkgIndex.tcl
+++ /dev/null
@@ -1,15 +0,0 @@
-# pkgIndex.tcl for additional tile pixmap themes.
-#
-# We don't provide the package is the image subdirectory isn't present,
-# or we don't have the right version of Tcl/Tk
-#
-# To use this automatically within tile, the tile-using application should
-# use tile::availableThemes and tile::setTheme
-#
-# $Id$
-
-if {![file isdirectory [file join $dir kroc]]} { return }
-if {![package vsatisfies [package provide Tcl] 8.4]} { return }
-
-package ifneeded tile::theme::kroc 0.0.1 \
-    [list source [file join $dir kroc.tcl]]
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/pkgIndex.tcl b/ext/tk/sample/tkextlib/tile/themes/plastik/pkgIndex.tcl
deleted file mode 100644
index f402a73f10..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/pkgIndex.tcl
+++ /dev/null
@@ -1,16 +0,0 @@
-# pkgIndex.tcl for additional tile pixmap themes.
-#
-# We don't provide the package is the image subdirectory isn't present,
-# or we don't have the right version of Tcl/Tk
-#
-# To use this automatically within tile, the tile-using application should
-# use tile::availableThemes and tile::setTheme
-#
-# $Id$
-
-if {![file isdirectory [file join $dir plastik]]} { return }
-if {![package vsatisfies [package provide Tcl] 8.4]} { return }
-
-package ifneeded tile::theme::plastik 0.3.1 \
-    [list source [file join $dir plastik.tcl]]
-
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik.tcl b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik.tcl
deleted file mode 100644
index ea6ed74162..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik.tcl
+++ /dev/null
@@ -1,125 +0,0 @@
-# plastik.tcl - Copyright (C) 2004 Googie
-#
-# A sample pixmap theme for the tile package.
-#
-#  Copyright (c) 2004 Googie
-#  Copyright (c) 2005 Pat Thoyts <patthoyts@users.sourceforge.net>
-#
-# $Id$
-
-package require Tk 8.4
-package require tile 0.5
-
-namespace eval tile::theme::plastik {
-
-    variable version 0.3.1
-    package provide tile::theme::plastik $version
-
-    variable imgdir [file join [file dirname [info script]] plastik]
-    variable Images;
-    array set Images [tile::LoadImages $imgdir *.gif]
-
-    variable colors
-    array set colors {
-    	-frame 		"#cccccc"
-	-disabledfg	"#aaaaaa"
-	-selectbg	"#657a9e"
-	-selectfg	"#ffffff"
-    }
-
-style theme create plastik -parent default -settings {
-    style default . \
-    	-background $colors(-frame) \
-	-troughcolor $colors(-frame) \
-	-selectbackground $colors(-selectbg) \
-	-selectforeground $colors(-selectfg) \
-	-font TkDefaultFont \
-	-borderwidth 1 \
-	;
-
-    style map . -foreground [list disabled $colors(-disabledfg)]
-
-    #
-    # Layouts:
-    #
-    style layout Vertical.TScrollbar {
-        Scrollbar.background
-        Scrollbar.trough -children {
-            Scrollbar.uparrow -side top
-            Scrollbar.downarrow -side bottom
-            Scrollbar.uparrow -side bottom
-            Vertical.Scrollbar.thumb -side top -expand true -sticky ns
-        }
-    }
-
-    style layout Horizontal.TScrollbar {
-        Scrollbar.background
-        Scrollbar.trough -children {
-            Scrollbar.leftarrow -side left
-            Scrollbar.rightarrow -side right
-            Scrollbar.leftarrow -side right
-            Horizontal.Scrollbar.thumb -side left -expand true -sticky we
-        }
-    }
-
-    style layout TButton {
-        Button.button -children {
-	    Button.focus -children {
-		Button.padding -children {
-		    Button.label -side left -expand true
-		}
-	    }
-	}
-    }
-
-    #
-    # Elements:
-    #
-    style element create Button.button image $Images(button-n) \
-    	-border 4 -sticky ew \
-    	-map [list pressed $Images(button-p)  active $Images(button-h)]
-
-    style element create Checkbutton.indicator image $Images(check-nu) \
-	-sticky {} -map [list \
-	    {active selected}     $Images(check-hc) \
-	    {pressed selected}    $Images(check-pc) \
-	    active                $Images(check-hu) \
-	    selected              $Images(check-nc) \
-	]
-
-    style element create Radiobutton.indicator image $Images(radio-nu) \
-	-sticky {} -map [list \
-	    {active selected}     $Images(radio-hc) \
-	    {pressed selected}    $Images(radio-pc) \
-	    active                $Images(radio-hu) \
-	    selected              $Images(radio-nc) \
-	]
-
-    style element create Horizontal.Scrollbar.thumb \
-    	image $Images(hsb-n) -border 3 -sticky ew
-    style element create Vertical.Scrollbar.thumb \
-    	image $Images(vsb-n) -border 3 -sticky ns
-
-    style element create Scale.slider \
-    	image $Images(hslider-n) -sticky {}
-    style element create Vertical.Scale.slider \
-    	image $Images(vslider-n) -sticky {}
-
-    style element create Scrollbar.uparrow image $Images(arrowup-n) \
-    	-map [list pressed $Images(arrowup-p)] -sticky {}
-    style element create Scrollbar.downarrow image $Images(arrowdown-n) \
-    	-map [list pressed $Images(arrowdown-p)] -sticky {}
-    style element create Scrollbar.leftarrow image $Images(arrowleft-n) \
-    	-map [list pressed $Images(arrowleft-p)] -sticky {}
-    style element create Scrollbar.rightarrow image $Images(arrowright-n) \
-    	-map [list pressed $Images(arrowright-p)] -sticky {}
-
-    #
-    # Settings:
-    #
-    style default TButton -width -10
-    style default TNotebook.Tab -padding {6 2 6 2}
-    style default TLabelframe -borderwidth 2 -relief groove
-
-} }
-
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowdown-n.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowdown-n.gif
deleted file mode 100644
index d914e7a3d3..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowdown-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowdown-p.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowdown-p.gif
deleted file mode 100644
index abffaa49f6..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowdown-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowleft-n.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowleft-n.gif
deleted file mode 100644
index 9939ae1d50..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowleft-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowleft-p.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowleft-p.gif
deleted file mode 100644
index 1a45ef2e4b..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowleft-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowright-n.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowright-n.gif
deleted file mode 100644
index f4b563fed2..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowright-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowright-p.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowright-p.gif
deleted file mode 100644
index 5459d5e615..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowright-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowup-n.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowup-n.gif
deleted file mode 100644
index 118290cd95..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowup-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowup-p.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowup-p.gif
deleted file mode 100644
index 89f9b38c73..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowup-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/button-h.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/button-h.gif
deleted file mode 100644
index 548f3769df..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/button-h.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/button-n.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/button-n.gif
deleted file mode 100644
index 49a25909f3..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/button-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/button-p.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/button-p.gif
deleted file mode 100644
index e83f7ed985..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/button-p.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-hc.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-hc.gif
deleted file mode 100644
index b279fa50d8..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-hc.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-hu.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-hu.gif
deleted file mode 100644
index 5b4fb4f037..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-hu.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-nc.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-nc.gif
deleted file mode 100644
index b139e02a09..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-nc.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-nu.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-nu.gif
deleted file mode 100644
index fbe391f9d8..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-nu.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-pc.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-pc.gif
deleted file mode 100644
index 75a3bd635c..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-pc.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/hsb-n.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/hsb-n.gif
deleted file mode 100644
index b8ea07ea92..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/hsb-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/hslider-n.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/hslider-n.gif
deleted file mode 100644
index ce8f28404f..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/hslider-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-hc.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-hc.gif
deleted file mode 100644
index 33917715b0..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-hc.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-hu.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-hu.gif
deleted file mode 100644
index 88925d0e1d..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-hu.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-nc.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-nc.gif
deleted file mode 100644
index f8723d367a..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-nc.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-nu.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-nu.gif
deleted file mode 100644
index fb5140e6a1..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-nu.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-pc.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-pc.gif
deleted file mode 100644
index 176225d9e1..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-pc.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/vsb-n.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/vsb-n.gif
deleted file mode 100644
index 85bac4579e..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/vsb-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/vslider-n.gif b/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/vslider-n.gif
deleted file mode 100644
index cf887f9855..0000000000
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/vslider-n.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tile/toolbutton.tcl b/ext/tk/sample/tkextlib/tile/toolbutton.tcl
deleted file mode 100644
index 91e9ad18bb..0000000000
--- a/ext/tk/sample/tkextlib/tile/toolbutton.tcl
+++ /dev/null
@@ -1,152 +0,0 @@
-#
-# $Id$
-#
-# Demonstration of custom widget styles.
-#
-
-#
-# ~ BACKGROUND
-#
-# Checkbuttons in toolbars have a very different appearance
-# than regular checkbuttons: there's no indicator, they
-# "pop up" when the mouse is over them, and they appear sunken
-# when selected.
-#
-# Tk added partial support for toolbar-style buttons in 8.4
-# with the "-overrelief" option, and TIP #82 added further
-# support with the "-offrelief" option.  So to get a toolbar-style
-# checkbutton, you can configure it with:
-#
-# checkbutton .cb \
-#     -indicatoron false -selectcolor {} -relief flat -overrelief raised
-#
-# Behind the scenes, Tk has a lot of rather complicated logic
-# to implement this checkbutton style; see library/button.tcl,
-# generic/tkButton.c, and the platform-specific files unix/tkUnixButton.c
-# et al. for the full details.
-#
-# The tile widget set has a better way: custom styles.
-# Since the appearance is completely controlled by the theme engine,
-# we can define a new "Toolbutton" style and just use:
-#
-# checkbutton .cb -style Toolbutton
-#
-#
-# ~ DEMONSTRATION
-#
-# The tile built-in themes (default, "alt", windows, and XP)
-# already include Toolbutton styles.  This script will add
-# them to the "step" and "blue" themes as a demonstration.
-#
-# (Note: Pushbuttons and radiobuttons can also use the "Toolbutton"
-# style; see demo.tcl.)
-#
-
-style theme settings "step" {
-
-#
-# First, we use [style layout] to define what elements to
-# use and how they're arranged.  Toolbuttons are pretty
-# simple, consisting of a border, some internal padding,
-# and a label.  (See also the TScrollbar layout definition
-# in demos/blue.tcl for a more complicated layout spec.)
-#
-    style layout Toolbutton {
-        Toolbutton.background
-        Toolbutton.border -children {
-            Toolbutton.padding -children {
-                Toolbutton.label
-            }
-        }
-    }
-
-# (Actually the above isn't strictly necessary, since the same layout
-# is defined in the default theme; we could have inherited it
-# instead.)
-#
-# Next, specify default values for element options.
-# For many options (like -background), the defaults
-# inherited from the parent style are sufficient.
-#
-    style default Toolbutton -width 0 -padding 1 -relief flat -borderwidth 2
-
-#
-# Finally, use [style map] to specify state-specific
-# resource values.  We want a flat relief if the widget is
-# disabled, sunken if it's selected (on) or pressed,
-# and raised when it's active (the mouse pointer is
-# over the widget).  Each state-value pair is checked
-# in order, and the first matching state takes precedence.
-#
-    style map Toolbutton -relief {
-	disabled 	flat
-	selected	sunken
-	pressed 	sunken
-	active		raised
-    }
-}
-
-#
-# Now for the "blue" theme.  (Since the purpose of this
-# theme is to show what *can* be done, not necessarily what
-# *should* be done, the following makes some questionable
-# design decisions from an aesthetic standpoint.)
-#
-if {![catch {package require tile::theme::blue}]} {
-style theme settings "blue" {
-
-    #
-    # Default values:
-    #
-    style default Toolbutton \
-    	-width 0 -relief flat -borderwidth 2 \
-	-background #6699CC -foreground #000000 ;
-
-    #
-    # Configure state-specific values for -relief, as before:
-    #
-    style map Toolbutton -relief {
-	disabled 	flat
-	selected	sunken
-	pressed 	sunken
-	active		raised
-    }
-
-    #
-    # Adjust the -padding at the same time, to enhance
-    # the raised/sunken illusion:
-    #
-    style default Toolbutton -padding 4
-    style map Toolbutton -padding {
-	disabled	{4}
-	selected	{6 6 2 2}
-	pressed		{6 6 2 2}
-	active		{2 2 6 6}
-    }
-
-    #
-    # ... and change the foreground and background colors
-    # when the mouse cursor is over the widget:
-    #
-    style map Toolbutton -background {
-	active  	#008800
-    } -foreground {
-	active  	#FFFFFF
-    }
-}
-
-}
-
-#
-# ~ A final note:
-#
-# TIP #82 also says: "When -indicatoron is off and the button itself
-# is on, the relief continues to be hard-coded to sunken. For symmetry,
-# we might consider adding another -onrelief option to cover this
-# case. But it is difficult to imagine ever wanting to change the
-# value of -onrelief so it has been omitted from this TIP.
-# If there as strong desire to have -onrelief, it can be added later."
-# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-#
-# The Tile project aims to make sure that this never needs to happen.
-#
diff --git a/ext/tk/sample/tkextlib/tkHTML/Orig_COPYRIGHT.txt b/ext/tk/sample/tkextlib/tkHTML/Orig_COPYRIGHT.txt
deleted file mode 100644
index 2b3757bb23..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/Orig_COPYRIGHT.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-The following text is the original 'COPYRIGHT' file of tkHTML. 
-
------------------------------------------------------------------------
-Most of the source code for the Tk Html widget has been place in the
-public domain.  You can do with it whatever you want.  However, some
-files have been copied from other sources and contain copyrights.
-A copyright notice appears separately at the top of each source file.
------------------------------------------------------------------------
-
-In this sample, HTML documents are quoted in the 'tests' directory of
-tkHTML source tree. There were no copyright notice in the directory. 
diff --git a/ext/tk/sample/tkextlib/tkHTML/README b/ext/tk/sample/tkextlib/tkHTML/README
deleted file mode 100644
index 0b9f799cbd..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/README
+++ /dev/null
@@ -1,12 +0,0 @@
-
-   [ TkHtml widget example ]
-
-The directory page1 -- page4 are referd from "test" directory of
-original TkHtml extension's source archive.
-( see http://www.hwaci.com/sw/tkhtml/index.html )
-
-You can see the HTML documents on the 'hv.rb' or 'ss.rb' sample script.
-
- e.g.
-   LD_LIBRARY_PATH=/usr/local/ActiveTcl/lib:$LD_LIBRARY_PATH /usr/local/bin/ruby ./hv.rb page1/index.html
-
diff --git a/ext/tk/sample/tkextlib/tkHTML/hv.rb b/ext/tk/sample/tkextlib/tkHTML/hv.rb
deleted file mode 100644
index 0f6e595d82..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/hv.rb
+++ /dev/null
@@ -1,314 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-#
-# This script implements the "hv" application.  Type "hv FILE" to
-# view FILE as HTML.
-#
-# This application is used for testing the HTML widget.  It can
-# also server as an example of how to use the HTML widget.
-#
-require 'tk'
-require 'tkextlib/tkHTML'
-
-root = TkRoot.new(:title=>'HTML File Viewer', :iconname=>'HV')
-
-file = ARGV[0]
-
-#
-# These images are used in place of GIFs or of form elements
-#
-biggray = TkPhotoImage.new(:data=><<'EOD')
-    R0lGODdhPAA+APAAALi4uAAAACwAAAAAPAA+AAACQISPqcvtD6OctNqLs968+w+G4kiW5omm
-    6sq27gvH8kzX9o3n+s73/g8MCofEovGITCqXzKbzCY1Kp9Sq9YrNFgsAO///
-EOD
-
-smgray = TkPhotoImage.new(:data=><<'EOD')
-    R0lGODdhOAAYAPAAALi4uAAAACwAAAAAOAAYAAACI4SPqcvtD6OctNqLs968+w+G4kiW5omm
-    6sq27gvH8kzX9m0VADv/
-EOD
-
-nogifbig = TkPhotoImage.new(:data=><<'EOD')
-    R0lGODdhJAAkAPEAAACQkADQ0PgAAAAAACwAAAAAJAAkAAACmISPqcsQD6OcdJqKM71PeK15
-    AsSJH0iZY1CqqKSurfsGsex08XuTuU7L9HywHWZILAaVJssvgoREk5PolFo1XrHZ29IZ8oo0
-    HKEYVDYbyc/jFhz2otvdcyZdF68qeKh2DZd3AtS0QWcDSDgWKJXY+MXS9qY4+JA2+Vho+YPp
-    FzSjiTIEWslDQ1rDhPOY2sXVOgeb2kBbu1AAADv/
-EOD
-
-nogifsm = TkPhotoImage.new(:data=><<'EOD')
-    R0lGODdhEAAQAPEAAACQkADQ0PgAAAAAACwAAAAAEAAQAAACNISPacHtD4IQz80QJ60as25d
-    3idKZdR0IIOm2ta0Lhw/Lz2S1JqvK8ozbTKlEIVYceWSjwIAO///
-EOD
-
-#
-# define variables
-#
-ul_hyper = TkVariable.new(0)
-show_tbl = TkVariable.new(0)
-show_img = TkVariable.new(1)
-
-#
-# A font chooser routine.
-#
-# html[:fontcommand] = pick_font
-pick_font = proc{|size, attrs|
-  puts "FontCmd: #{size} #{attrs}"
-  [ ((attrs =~ /fixed/)? 'courier': 'charter'),
-    (12 * (1.2**(size.to_f - 4.0))).to_i,
-    ((attrs =~ /italic/)? 'italic': 'roman'),
-    ((attrs =~ /bold/)? 'bold': 'normal') ].join(' ')
-}
-
-#
-# This routine is called for each form element
-#
-form_cmd = proc{|n, cmd, style, *args|
-  # puts "FormCmd: $n $cmd $args"
-  case cmd
-  when 'select', 'textarea', 'input'
-    TkLabel.new(:widgetname=>args[0], :image=>nogifsm)
-  end
-}
-
-#
-# This routine is called for every <IMG> markup
-#
-images   = {}
-old_imgs = {}
-big_imgs = {}
-
-hotkey   = {}
-
-move_big_image = proc{|b|
-  if big_imgs.key?(b)
-    b.copy(big_imgs[b])
-    big_imgs[b].delete
-    big_imgs.delete(b)
-    Tk.update
-  end
-}
-
-image_cmd = proc{|*args|
-  if show_img.bool
-    smgray
-  else
-    fn = args[0]
-
-    if old_imgs.key?(fn)
-      images[fn] = old_imgs[fn]
-      old_imgs.delete(fn)
-      images[fn]
-
-    else
-      begin
-        img = TkPhotoImage.new(:file=>fn)
-      rescue
-        smgray
-      else
-        if img.width * img.height > 20000
-          b = TkPhotoImage.new(:width=>img.width, :height=>img.height)
-          big_imgs[b] = img
-          img = b
-          Tk.after_idle(proc{ move_big_image.call(b) })
-        end
-
-        images[fn] = img
-        img
-      end
-    end
-  end
-}
-
-#
-# This routine is called for every <SCRIPT> markup
-#
-script_cmd = proc{|*args|
-  # puts "ScriptCmd: #{args.inspect}"
-}
-
-# This routine is called for every <APPLET> markup
-#
-applet_cmd = proc{|w, arglist|
-  # puts "AppletCmd: w=#{w} arglist=#{arglist}"
-  TkLabel.new(w, :text=>"The Applet #{w}", :bd=>2, :relief=>raised)
-}
-
-#
-# Construct the main HTML viewer
-#
-html = Tk::HTML_Widget.new(:padx=>5, :pady=>9,
-                           :formcommand=>form_cmd,
-                           :imagecommand=>image_cmd,
-                           :scriptcommand=>script_cmd,
-                           :appletcommand=>applet_cmd,
-                           :underlinehyperlinks=>0,
-                           :bg=>'white', :tablerelief=>:raised)
-vscr = html.yscrollbar(TkScrollbar.new)
-hscr = html.xscrollbar(TkScrollbar.new)
-
-Tk.grid(html, vscr, :sticky=>:news)
-Tk.grid(hscr,       :sticky=>:ew)
-Tk.root.grid_columnconfigure(0, :weight=>1)
-Tk.root.grid_columnconfigure(1, :weight=>0)
-Tk.root.grid_rowconfigure(0, :weight=>1)
-Tk.root.grid_rowconfigure(1, :weight=>0)
-
-#
-# This procedure is called when the user clicks on a hyperlink.
-#
-priv = {}
-last_file = ''
-
-# Read a file
-#
-read_file = proc{|name|
-  begin
-    fp = open(name, 'r')
-    ret = fp.read(File.size(name))
-  rescue
-    ret = nil
-    fp = nil
-    Tk.messageBox(:icon=>'error', :message=>"fail to open '#{name}'",
-                  :type=>:ok)
-  ensure
-    fp.close if fp
-  end
-  ret
-}
-
-# Clear the screen.
-#
-clear_screen = proc{
-  html.clear
-  old_imgs.clear
-  big_imgs.clear
-  hotkey.clear
-  images.each{|k, v| old_imgs[k] = v }
-  images.clear
-}
-
-# Load a file into the HTML widget
-#
-load_file = proc{|name|
-  if (doc = read_file.call(name))
-    clear_screen.call
-    last_file = name
-    html.configure(:base=>name)
-    html.parse(doc)
-    old_imgs.clear
-  end
-}
-
-href_binding = proc{|x, y|
-  # koba & dg marking text
-  html.selection_clear
-  priv['mark'] = "@#{x},#{y}"
-  lst = html.href(x, y)
-
-  unless lst.size.zero?
-    lnk, target = lst
-
-    if lnk != ""
-      if lnk =~ /^#{last_file}#(.*)$/
-        html.yview($1)
-      else
-        load_file.call(lnk)
-      end
-    end
-  end
-}
-html.clipping_window.bind('1', href_binding, '%x %y')
-
-# marking text with the mouse and copying to the clipboard just with tkhtml2.0 working
-html.clipping_window.bind('B1-Motion', proc{|w, x, y|
-                            w.selection_set(priv['mark'], "@#{x},#{y}")
-                            TkClipboard.clear
-                            # avoid tkhtml0.0 errors
-                            # anyone can fix this for tkhtml0.0
-                            begin
-                              TkClipboard.append(TkSelection.get)
-                            rescue
-                            end
-                          }, '%W %x %y')
-
-# This procedure is called when the user selects the File/Open
-# menu option.
-#
-last_dir = Dir.pwd
-sel_load = proc{
-  filetypes = [
-    ['Html Files', ['.html', '.htm']],
-    ['All Files', '*']
-  ]
-
-  f = Tk.getOpenFile(:initialdir=>last_dir, :filetypes=>filetypes)
-  if f != ''
-    load_file.call(f)
-    last_dir = File.dirname(f)
-  end
-}
-
-# Refresh the current file.
-#
-refresh = proc{|*args|
-  load_file.call(last_file)
-}
-
-# This binding changes the cursor when the mouse move over
-# top of a hyperlink.
-#
-Tk::HTML_Widget::ClippingWindow.bind('Motion', proc{|w, x, y|
-                                       parent = w.winfo_parent
-                                       url = parent.href(x, y)
-                                       unless url.empty?
-                                         parent[:cursor] = 'hand2'
-                                       else
-                                         parent[:cursor] = ''
-                                       end
-                                     }, '%W %x %y')
-#
-# Setup menu
-#
-menu_spec = [
-  [['File', 0],
-    ['Open',    sel_load, 0],
-    ['Refresh', refresh,   0],
-    '---',
-    ['Exit', proc{exit}, 1]],
-
-  [['View', 0],
-    ['Underline Hyperlinks', ul_hyper],
-    ['Show Table Structure', show_tbl],
-    ['Show Images',          show_img]]
-]
-
-mbar = Tk.root.add_menubar(menu_spec)
-
-#
-# Setup trace
-#
-ul_hyper.trace('w', proc{
-                 html[:underlinehyperlinks] = ul_hyper.value
-                 refresh.call
-               })
-
-show_tbl.trace('w', proc{
-                 if show_tbl.bool
-                   html[:tablerelief] = :flat
-                 else
-                   html[:tablerelief] = :raised
-                 end
-                 refresh.call
-               })
-
-show_img.trace('w', refresh)
-
-# If an argument was specified, read it into the HTML widget.
-#
-Tk.update
-if file && file != ""
-  load_file.call(file)
-end
-
-#####################################
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/tkHTML/page1/image1 b/ext/tk/sample/tkextlib/tkHTML/page1/image1
deleted file mode 100644
index 31e96b6797..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page1/image1
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page1/image10 b/ext/tk/sample/tkextlib/tkHTML/page1/image10
deleted file mode 100644
index 80a8f81686..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page1/image10
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page1/image11 b/ext/tk/sample/tkextlib/tkHTML/page1/image11
deleted file mode 100644
index e8cb01d450..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page1/image11
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page1/image12 b/ext/tk/sample/tkextlib/tkHTML/page1/image12
deleted file mode 100644
index c317bbd5cc..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page1/image12
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page1/image13 b/ext/tk/sample/tkextlib/tkHTML/page1/image13
deleted file mode 100644
index ac4b3cd594..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page1/image13
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page1/image14 b/ext/tk/sample/tkextlib/tkHTML/page1/image14
deleted file mode 100644
index c3b02558e3..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page1/image14
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page1/image2 b/ext/tk/sample/tkextlib/tkHTML/page1/image2
deleted file mode 100644
index da26d7092e..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page1/image2
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page1/image3 b/ext/tk/sample/tkextlib/tkHTML/page1/image3
deleted file mode 100644
index d91cdfafab..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page1/image3
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page1/image4 b/ext/tk/sample/tkextlib/tkHTML/page1/image4
deleted file mode 100644
index 5fdf70c0e5..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page1/image4
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page1/image5 b/ext/tk/sample/tkextlib/tkHTML/page1/image5
deleted file mode 100644
index 67cd14d78d..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page1/image5
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page1/image6 b/ext/tk/sample/tkextlib/tkHTML/page1/image6
deleted file mode 100644
index 9e05aa0f36..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page1/image6
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page1/image7 b/ext/tk/sample/tkextlib/tkHTML/page1/image7
deleted file mode 100644
index 879656d45c..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page1/image7
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page1/image8 b/ext/tk/sample/tkextlib/tkHTML/page1/image8
deleted file mode 100644
index 8c647c4f00..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page1/image8
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page1/image9 b/ext/tk/sample/tkextlib/tkHTML/page1/image9
deleted file mode 100644
index 3a7707589b..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page1/image9
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page1/index.html b/ext/tk/sample/tkextlib/tkHTML/page1/index.html
deleted file mode 100644
index af87289c28..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page1/index.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<HTML><HEAD><TITLE>Slashdot:News for Nerds. Stuff that Matters.</TITLE>  </HEAD>
-<BODY bgcolor="#000000" text="#000000" link="#006666" vlink="#000000">
-<center><a href="http://209.207.224.220/redir.pl?1463" target="_top"><img src="image1" alt="Click Here to enter the Sweepstakes" border="2" width="468" height="60"></a></center> <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0"><TR><TD WIDTH="1"><SCRIPT LANGUAGE="JAVASCRIPT">
-<!-- now="now" ="" new="new" Date();="Date();" tail="tail" ="" now.getTime();="now.getTime();" document.write("<IMG="document.write("<IMG" SRC="http://209.207.224.245/Slashdot/pc.gif?/slashhead.inc,"+" tail="tail" +="+" "=""" WIDTH="1" HEIGHT="1><BR>");" -->
-</SCRIPT>
-<NOSCRIPT>
-<IMG SRC="image2" WIDTH="1" HEIGHT="1">
-</NOSCRIPT></TD></TR></TABLE><P>
-<TABLE bgcolor="#FFFFFF" cellpadding="0" cellspacing="0" border="0" width="99%" align="center">
- <TR>
-  <TD valign="top" align="left" valign="top"><A href="http://slashdot.org/"><IMG src="image3" width="275" height="72" border="0" alt="Welcome to Slashdot"></A></TD>
-   <TD><A href="http://slashdot.org/search.pl?topic=linux"><IMG SRC="image4" width="60" height="70" border="0" alt="Linux"></A></TD>
-<TD><A href="http://slashdot.org/search.pl?topic=news"><IMG SRC="image5" width="34" height="44" border="0" alt="News"></A></TD>
-<TD><A href="http://slashdot.org/search.pl?topic=usa"><IMG SRC="image6" width="80" height="61" border="0" alt="United States"></A></TD>
-<TD><A href="http://slashdot.org/search.pl?topic=ed"><IMG SRC="image7" width="87" height="64" border="0" alt="Education"></A></TD>
-<TD><A href="http://slashdot.org/search.pl?topic=space"><IMG SRC="image8" width="73" height="59" border="0" alt="Space"></A></TD>
-
-</TR></TABLE>
-<TABLE width="99%" align="center" cellpadding="0" cellspacing="0" border="0" bgcolor="#FFFFFF"><TR>
-<TD valign="top" rowspan="5"><NOBR><FONT size="2"><B>
-&nbsp;<A href="/faq.shtml">faq</A> <BR>
-&nbsp;<A href="/code.shtml">code</A> <BR>
-&nbsp;<A href="/awards.shtml">awards</A> <BR>
-&nbsp;<A href="http://Andover.Net/privacy.html">privacy</A> <BR>
-&nbsp;<A href="http://slashnet.org">slashNET</A> <BR>
-&nbsp;<A href="/search.pl">older stuff</A> <BR>
-&nbsp;<A href="http://cmdrtaco.net">rob's page</A> <BR>
-&nbsp;<A href="/users.pl?op=preferences">preferences</A> <BR>
-&nbsp;<A href="http://Andover.Net">andover.net</A> <BR>
-&nbsp;<A href="/submit.pl">submit story</A> <BR>
-&nbsp;<A href="/advertising.shtml">advertising</A> <BR>
-&nbsp;<A href="/supporters.shtml">supporters</A> <BR>
-&nbsp;<A href="/pollBooth.pl">past polls</A> <BR>
-&nbsp;<A href="/topics.shtml">topics</A> <BR>
-&nbsp;<A href="/about.shtml">about</A> <BR>
-&nbsp;<A href="/jobs.shtml">jobs</A> <BR>
-&nbsp;<A href="/hof.shtml">hof</A>
-
-</B></FONT></NOBR>
- <P><TABLE border="0" cellpadding="1" cellspacing="0" align="center" bgcolor="#CCCCCC"><TR>
-  <TD><FONT size="2" color="#000000"><B> Sections</B></FONT></TD></TR>
- <TR><TD><TABLE border="0" cellspacing="1" cellpadding="1" bgcolor="#FFFFFF" width="100%"><TR><TD><FONT color="#000000" size="2"><NOBR>
-1/23<BR>
-<B><A href="http://slashdot.org/index.pl?section=apache">apache</A></B><BR>
-1/29 (3)<BR>
-<B><A href="http://slashdot.org/index.pl?section=askslashdot">askslashdot</A></B><BR>
-1/27<BR>
-<B><A href="http://slashdot.org/index.pl?section=awards">awards</A></B><BR>
-1/29 (2)<BR>
-<B><A href="http://slashdot.org/index.pl?section=books">books</A></B><BR>
-1/27<BR>
-<B><A href="http://slashdot.org/index.pl?section=bsd">bsd</A></B><BR>
-1/28 (2)<BR>
-<B><A href="http://slashdot.org/index.pl?section=features">features</A></B><BR>
-1/28 (2)<BR>
-<B><A href="http://slashdot.org/index.pl?section=interviews">interviews</A></B><BR>
-1/19<BR>
-<B><A href="http://slashdot.org/index.pl?section=radio">radio</A></B><BR>
-1/27 (2)<BR>
-<B><A href="http://slashdot.org/index.pl?section=science">science</A></B><BR>
-1/28 (3)<BR>
-<B><A href="http://slashdot.org/index.pl?section=yro">yro</A></B><BR> </NOBR></FONT></TD></TR></TABLE><TR>
-  <TD><A href="http://andover.net"><FONT size="2" color="#000000"><B>Andover.Net</B></FONT></A></TD></TR>
- <TR><TD><TABLE border="0" cellspacing="1" cellpadding="1" bgcolor="#FFFFFF"><TR><TD>
-<FONT color="#000000" size="2"><NOBR><A href="http://www.andovernews.com">AndoverNews</A><BR><A href="http://www.askreggie.com">Ask Reggie</A><BR><A href="http://www.davecentral.com">DaveCentral</A><BR><A href="http://www.freecode.com">FreeCode</A><BR><A href="http://www.mediabuilder.com">MediaBuilder</A><BR> </NOBR></FONT></TD></TR></TABLE></TD></TR></TABLE></P>
- <P></P>
-</TD><TD valign="top" align="left"><FONT color="#000000"> <TABLE width="99%" cellpadding="0" cellspacing="0" border="0"><TR><TD valign="top" bgcolor="#006666"><IMG src="image9" width="13" height="16" alt="" align="top"><FONT size="4" color="#FFFFFF" face="arial,helvetica"><B>Who Bought Linux.Net?</B></FONT></TD> </TR></TABLE><A href="http://slashdot.org/search.pl?topic=linux"><IMG src="image4" width="60" height="70" border="0" align="right" hspace="20" vspace="10" alt="Linux"></A> <B>Posted by <A href="http://CmdrTaco.net">CmdrTaco</A> on Saturday January 29, @10:52AM</B><BR> <FONT size="2"><B>from the this-game-again dept.</B></FONT><BR> So Fred VanKampen (who has to hold the record for most money made by reselling two domain names) e-mailed us to say that the Domain Name for 'Linux.Net' has been sold. He won't say to whom, but it supposedly will be announced at LinuxWorld next week. Of course we have no idea what he got for the entry, but the rumors were that he made several million when he sold <A href="http://www.linux.com">Linux.com</A> to <A href="http://www.valinux.com">VA Linux</A>. Hopefully he'll take me for a ride in his yacht. ;) <P><B>( </B><A href="http://slashdot.org/articles/00/01/29/0837235.shtml"><B>Read More...</B></A> | <B><A href="http://slashdot.org/article.pl?sid=00/01/29/0837235&mode=thread&threshold=0">58</A> of <A href="http://slashdot.org/article.pl?sid=00/01/29/0837235&mode=thread&threshold=-1">62</A> </B>comments <B>)</B> <P><TABLE width="99%" cellpadding="0" cellspacing="0" border="0"><TR><TD valign="top" bgcolor="#006666"><IMG src="image9" width="13" height="16" alt="" align="top"><FONT size="4" color="#FFFFFF" face="arial,helvetica"><B>Book Reviews: E-Mails from (Over?) The Edge</B></FONT></TD> </TR></TABLE><A href="http://slashdot.org/search.pl?topic=news"><IMG src="image5" width="34" height="44" border="0" align="right" hspace="20" vspace="10" alt="News"></A> <B>Posted by <A href="http://hemos.net">Hemos</A> on Saturday January 29, @10:43AM</B><BR> <FONT size="2"><B>from the touching-story dept.</B></FONT><BR> I'd like to thank the author of this book for sending it to me. Nick's written a book that's touching and endearing, and one that's well worth reading for everyone who's ever had social struggles to deal with. As well, his involvement with the fine folks of <a href="http://www.thevenue.org">TheVenue</a>. I'll warn you - it's not a tech text. But it's still worth reading. Click below to read more. <P><B>( </B><A href="http://slashdot.org/books/00/01/24/1146250.shtml"><B>Read More...</B></A> | <A href="http://slashdot.org/article.pl?sid=00/01/24/1146250&mode=nocomment">6197 bytes in body</A> | <B><A href="http://slashdot.org/article.pl?sid=00/01/24/1146250&mode=thread&threshold=0">6</A> of <A href="http://slashdot.org/article.pl?sid=00/01/24/1146250&mode=thread&threshold=-1">22</A> </B>comments <B>)</B> <P><TABLE width="99%" cellpadding="0" cellspacing="0" border="0"><TR><TD valign="top" bgcolor="#006666"><IMG src="image9" width="13" height="16" alt="" align="top"><FONT size="4" color="#FFFFFF" face="arial,helvetica"><B>Linux Kernel 2.3.41</B></FONT></TD> </TR></TABLE><A href="http://slashdot.org/search.pl?topic=linux"><IMG src="image4" width="60" height="70" border="0" align="right" hspace="20" vspace="10" alt="Linux"></A> <B>Posted by <A href="http://CmdrTaco.net">CmdrTaco</A> on Saturday January 29, @10:21AM</B><BR> <FONT size="2"><B>from the download-compile-reboot-repeat dept.</B></FONT><BR> <A href="mailto:bwhitehead@nospam.acm.org">sdriver</A> writes <I>"For those of us who enjoy *panic*, *oops*, and suddenly seeing their video BIOS... the newest version is out! Be the first on your block to submit a new patch! ;) "</I> If you don't know where to get it, you probably should stick to your warm and cuddly 2.2.x kernel *grin*. Now outta my way, I wanna crash my laptop! <P><B>( </B><A href="http://slashdot.org/articles/00/01/29/0834223.shtml"><B>Read More...</B></A> | <B><A href="http://slashdot.org/article.pl?sid=00/01/29/0834223&mode=thread&threshold=0">52</A> of <A href="http://slashdot.org/article.pl?sid=00/01/29/0834223&mode=thread&threshold=-1">57</A> </B>comments <B>)</B> <P><TABLE width="99%" cellpadding="0" cellspacing="0" border="0"><TR><TD valign="top" bgcolor="#006666"><IMG src="image9" width="13" height="16" alt="" align="top"><FONT size="4" color="#FFFFFF" face="arial,helvetica"><B>Congress Still Figuring Out E-Mail</B></FONT></TD> </TR></TABLE><A href="http://slashdot.org/search.pl?topic=usa"><IMG src="image6" width="80" height="61" border="0" align="right" hspace="20" vspace="10" alt="United States"></A> <B>Posted by <A href="mailto:roblimo@slashdot.org">Roblimo</A> on Saturday January 29, @07:28AM</B><BR> <FONT size="2"><B>from the voice-of-the-people-can-get-awfully-loud dept.</B></FONT><BR> Jett writes <I>" <A href="http://www.vote.com/">Vote.com</A> has <A href="http://www.vote.com/magazine/editorials/editorial1843752.phtml">an interesting article</A> in their Webmag Fifth Estate about how congressmen have responded to the popularity of e-mail in their daily operations. Quote: 'Of the 440 voting and non-voting House of Representatives members, 22 have no e-mail at all. Even House Speaker Dennis Hastert is wired only halfway -- his office receives e-mail, but does not respond to it. And while all U.S. senators have e-mail, they, like their House counterparts, routinely shun non-constituent mail -- even though they chair committees whose decisions affect the entire country.'"</I> <P><B>( </B><A href="http://slashdot.org/articles/00/01/28/2311232.shtml"><B>Read More...</B></A> | <B><A href="http://slashdot.org/article.pl?sid=00/01/28/2311232&mode=thread&threshold=0">66</A> of <A href="http://slashdot.org/article.pl?sid=00/01/28/2311232&mode=thread&threshold=-1">66</A> </B>comments <B>)</B> <P><TABLE width="99%" cellpadding="0" cellspacing="0" border="0"><TR><TD valign="top" bgcolor="#006666"><IMG src="image9" width="13" height="16" alt="" align="top"><FONT size="4" color="#FFFFFF" face="arial,helvetica"><B>Ask Slashdot: Sci Fi Literature 101?</B></FONT></TD> </TR></TABLE><A href="http://slashdot.org/search.pl?topic=ed"><IMG src="image7" width="87" height="64" border="0" align="right" hspace="20" vspace="10" alt="Education"></A> <B>Posted by <A href="http://exit118.com/">Cliff</A> on Saturday January 29, @06:56AM</B><BR> <FONT size="2"><B>from the recommendations-wanted dept.</B></FONT><BR> ohlaadee asks: <I>"My niece (she's 13) wants to start reading science fiction. I do too. I gave us both Asimov's </I>_The Foundation_<I>&nbsp; for Christmas. We'll read it together. I suppose we could spend the rest of our lives just reading Asimov, but I'm wondering what books and movies you folks would come up with? What does the /. recommended Science Fiction 101 list include?"</I> <P><B>( </B><A href="http://slashdot.org/askslashdot/00/01/22/1946244.shtml"><B>Read More...</B></A> | <B><A href="http://slashdot.org/article.pl?sid=00/01/22/1946244&mode=thread&threshold=0">345</A> of <A href="http://slashdot.org/article.pl?sid=00/01/22/1946244&mode=thread&threshold=-1">345</A> </B>comments <B>)</B> <P><TABLE width="99%" cellpadding="0" cellspacing="0" border="0"><TR><TD valign="top" bgcolor="#006666"><IMG src="image9" width="13" height="16" alt="" align="top"><FONT size="4" color="#FFFFFF" face="arial,helvetica"><B>Could Distributed.Net Help the Mars Polar Lander?</B></FONT></TD> </TR></TABLE><A href="http://slashdot.org/search.pl?topic=space"><IMG src="image8" width="73" height="59" border="0" align="right" hspace="20" vspace="10" alt="Space"></A> <B>Posted by <A href="mailto:roblimo@slashdot.org">Roblimo</A> on Saturday January 29, @03:35AM</B><BR> <FONT size="2"><B>from the food-for-thought dept.</B></FONT><BR> Anonymous Coward writes <I>"This official JPL <A href="http://mpfwww.jpl.nasa.gov/msp98/news/mpl000127.html">press release</A> describes the current attempt to listen for faint signals from the Mars Lander. They get three windows a day, and it takes 18 hours to process data because the signal is so weak (if it's really there). Too bad they don't have a deal with <A href="http://www.distributed.net"> distributed.net</A>."</I> Interesting thought. Is anyone at distributed.net or JPL interested in pursuing it? <P><B>( </B><A href="http://slashdot.org/articles/00/01/28/2318246.shtml"><B>Read More...</B></A> | <B><A href="http://slashdot.org/article.pl?sid=00/01/28/2318246&mode=thread&threshold=0">99</A> of <A href="http://slashdot.org/article.pl?sid=00/01/28/2318246&mode=thread&threshold=-1">102</A> </B>comments <B>)</B> <P><TABLE width="99%" cellpadding="0" cellspacing="0" border="0"><TR><TD valign="top" bgcolor="#006666"><IMG src="image9" width="13" height="16" alt="" align="top"><FONT size="4" color="#FFFFFF" face="arial,helvetica"><B>iCrave TV Loses Battle against U.S. Broadcasters</B></FONT></TD> </TR></TABLE><A href="http://slashdot.org/search.pl?topic=tv"><IMG src="image10" width="50" height="50" border="0" align="right" hspace="20" vspace="10" alt="Television"></A> <B>Posted by <A href="mailto:roblimo@slashdot.org">Roblimo</A> on Saturday January 29, @12:21AM</B><BR> <FONT size="2"><B>from the shut-down-just-before-the-super-bowl dept.</B></FONT><BR> <A href="mailto:doran@brandx.net">Doran</A> writes <I>"C|Net has <a href="http://news.cnet.com/news/0-1004-200-1535528.html">this story</a> about how the Canadian company <a href="http://www.icravetv.com">iCraveTV.com</a> has lost its latest battle in U.S. courts over whether it can rebroadcast TV signals over the Web. The broadcasters say it's theft, while iCraveTV sez it's just doing what's legal for other cable TV companies in Canada (ie. rebroadcasting TV). Of course, by framing the streaming video iCraveTV is doing more than just rebroadcasting, they're also adding more commercial content, which the broadcasters feel dilutes their TV commercials. "</I> <P><B>( </B><A href="http://slashdot.org/articles/00/01/29/0010203.shtml"><B>Read More...</B></A> | <B><A href="http://slashdot.org/article.pl?sid=00/01/29/0010203&mode=thread&threshold=0">152</A> of <A href="http://slashdot.org/article.pl?sid=00/01/29/0010203&mode=thread&threshold=-1">170</A> </B>comments <B>)</B> <P><TABLE width="99%" cellpadding="0" cellspacing="0" border="0"><TR><TD valign="top" bgcolor="#006666"><IMG src="image9" width="13" height="16" alt="" align="top"><FONT size="4" color="#FFFFFF" face="arial,helvetica"><B>Win2k Security holes found</B></FONT></TD> </TR></TABLE><A href="http://slashdot.org/search.pl?topic=microsoft"><IMG src="image11" width="75" height="55" border="0" align="right" hspace="20" vspace="10" alt="Microsoft"></A> <B>Posted by <A href="mailto:heunique@slashdot.org">HeUnique</A> on Friday January 28, @04:58PM</B><BR> <FONT size="2"><B>from the and-it's-not-even-out-yet dept.</B></FONT><BR> According to a story posted by <a href="http://www.zdnn.com">ZDNN</a>, <a href="http://www.zdnet.com/zdnn/stories/news/0,4586,2429334,00.html?chkpt=zdnntop">two security holes</a> have been found on Windows 2000, and that's even before the official release of Windows 2000! Administrators who rush to incorporate the patch from MS beware - according to one of the talkback posts on ZDNN, the patch creates a new problem with Windows 2000 news server service. <P><B>( </B><A href="http://slashdot.org/articles/00/01/28/1653228.shtml"><B>Read More...</B></A> | <B><A href="http://slashdot.org/article.pl?sid=00/01/28/1653228&mode=thread&threshold=0">510</A> of <A href="http://slashdot.org/article.pl?sid=00/01/28/1653228&mode=thread&threshold=-1">534</A> </B>comments <B>)</B> <P><TABLE width="99%" cellpadding="0" cellspacing="0" border="0"><TR><TD valign="top" bgcolor="#006666"><IMG src="image9" width="13" height="16" alt="" align="top"><FONT size="4" color="#FFFFFF" face="arial,helvetica"><B>Encryption Debate at Mitnick Trial</B></FONT></TD> </TR></TABLE><A href="http://slashdot.org/search.pl?topic=encryption"><IMG src="image12" width="80" height="70" border="0" align="right" hspace="20" vspace="10" alt="Encryption"></A> <B>Posted by <A href="http://hemos.net">Hemos</A> on Friday January 28, @03:33PM</B><BR> <FONT size="2"><B>from the gimmie-the-data dept.</B></FONT><BR> A number of people have written about <A HREF="http://nytimes.com/library/tech/00/01/cyber/cyberlaw/28law.html">the latest twist</a> in the Mitnick case. Kevin wants to get his data back, but the government is refusing to do so until he gives them the key. Apparently, the government is unable to crack the encryption that he's got on it - you'd think after having the data for five years, they'd be able to brute-force the darn thing. It's a NYT article - free login required. <P><B>( </B><A href="http://slashdot.org/articles/00/01/28/1320253.shtml"><B>Read More...</B></A> | <B><A href="http://slashdot.org/article.pl?sid=00/01/28/1320253&mode=thread&threshold=0">504</A> of <A href="http://slashdot.org/article.pl?sid=00/01/28/1320253&mode=thread&threshold=-1">521</A> </B>comments <B>)</B> <P><TABLE width="99%" cellpadding="0" cellspacing="0" border="0"><TR><TD valign="top" bgcolor="#006666"><IMG src="image9" width="13" height="16" alt="" align="top"><FONT size="4" color="#FFFFFF" face="arial,helvetica"><B>Forum: Future Ports of Games to Linux</B></FONT></TD> </TR></TABLE><A href="http://slashdot.org/search.pl?topic=games"><IMG src="image13" width="80" height="56" border="0" align="right" hspace="20" vspace="10" alt="Games"></A> <B>Posted by <A href="http://CmdrTaco.net">CmdrTaco</A> on Friday January 28, @02:26PM</B><BR> <FONT size="2"><B>from the it's-been-awhile dept.</B></FONT><BR> It's been a long time since I posted an open forum like this, but I'm curious what people think on this one. What games do you most want to see ported to Linux in the next few months? Of course, for me personally it's StarCraft and Diablo 2, but I'm curious what games have come out or are due soon that people would most like to see a port of (and note that WINE doesn't count. ;) <P><B>( </B><A href="http://slashdot.org/articles/00/01/28/1257211.shtml"><B>Read More...</B></A> | <B><A href="http://slashdot.org/article.pl?sid=00/01/28/1257211&mode=thread&threshold=0">648</A> of <A href="http://slashdot.org/article.pl?sid=00/01/28/1257211&mode=thread&threshold=-1">652</A> </B>comments <B>)</B> <P></TD><TD width="210" align="center" valign="top"><TABLE cellpadding="1" cellspacing="0" border="0" width="200" align="center"> <TR bgcolor="#006666"> <TD valign="top"><FONT size="4" color="#FFFFFF" face="arial,helvetica"><B><A HREF="/index.pl?section=features"><FONT COLOR="#FFFFFF">Features</FONT></A></B></FONT></TD> </TR><TR><TD bgcolor="#CCCCCC"><FONT color="#000000" size="2"><A href="/vote.pl">Voting has begun</A> for the $100k <A href="/index.pl?section=awards">Slashdot Beanie Awards</A>. Talk amongst yourselves and choose who deserves the cash. <P>The latest installment of <A href="http://www.thesync.com/geeks">Geeks in Space</A> is up at <A href="http://www.thesync.com">The Sync</A>. Listen to CmdrTaco, Hemos, and Nate talk about the latest events to happen - or not happen in the computer world. <P>Perhaps you are seeking Jon Katz's series of articles related to recent events in Colorado. These articles include <A href="/article.pl?sid=99/04/25/1438249">Voices from the Hellmouth</A>, <A href="/article.pl?sid=99/04/27/0310247">More Stories from the Hellmouth</A> or <A href="/article.pl?sid=99/04/29/0124247">The Price of Being Different</A>, <P>For something different, try reading a little essay <A href="/article.pl?sid=99/03/31/0137221">Thoughts from the Furnace</A> about the internet, and flame. <p> And for a bit of an amusing take on the Open Source world, check out <a href="/article.pl?sid=99/08/24/1327256&mode=thread">Open Source as an Ant Farm</a> <P><B>Update: 01/03 03:10</B> by <B><A href="http://cowboyneal.org">CowboyNeal</a></B>: <P align="right"><B><A href="/features/">Past Features</A></B> <!-- end="end" features="features" block="block" --></FONT></TD> </TR> </TABLE><P> <TABLE cellpadding="1" cellspacing="0" border="0" width="200" align="center"> <TR bgcolor="#006666"> <TD valign="top"><FONT size="4" color="#FFFFFF" face="arial,helvetica"><B><A HREF="http://slashdot.org/index.pl?section=askslashdot"><FONT COLOR="#FFFFFF">Ask Slashdot</FONT></A></B></FONT></TD> </TR><TR><TD bgcolor="#CCCCCC"><FONT color="#000000" size="2"><li><A HREF="http://slashdot.org/article.pl?sid=00/01/22/1946244">Sci Fi Literature 101?</A> <li><A HREF="http://slashdot.org/article.pl?sid=00/01/22/192226">Linux and Satellite Internet Services</A> <li><A HREF="http://slashdot.org/article.pl?sid=00/01/22/1843258">Open Defensive Patents?</A> <li><A HREF="http://slashdot.org/article.pl?sid=00/01/22/1825252">Technologies That Shaped the Last Century?</A> <li><A HREF="http://slashdot.org/article.pl?sid=00/01/22/1958212">Disk Repair Tools for Linux?</A> <li><A HREF="http://slashdot.org/article.pl?sid=00/01/22/1955215">Why Can't the Command-Line be More Standardized?</A> <li><A HREF="http://slashdot.org/article.pl?sid=00/01/22/1928235">Packet Radio Networking with PalmOS?</A> <li><A HREF="http://slashdot.org/article.pl?sid=00/01/22/1817211">Cheap Rackmount Enclosures/Systems?</A> <li><A HREF="http://slashdot.org/article.pl?sid=00/01/22/1950249">Open Source Software and Tax Breaks?</A> <li><A HREF="http://slashdot.org/article.pl?sid=00/01/22/1917207">Building an Upgradable Dual Processor System</A> <P> if you have a question for Ask Slashdot, send it to <A href="mailto:askslashdot@slashdot.org">askslashdot@slashdot.org</A></FONT></TD> </TR> </TABLE><P> <TABLE cellpadding="1" cellspacing="0" border="0" width="200" align="center"> <TR bgcolor="#006666"> <TD valign="top"><FONT size="4" color="#FFFFFF" face="arial,helvetica"><B><A HREF="/users.pl"><FONT COLOR="#FFFFFF">Slashdot Login</FONT></A></B></FONT></TD> </TR><TR><TD bgcolor="#CCCCCC"><FONT color="#000000" size="2"><FORM action="/users.pl" METHOD="POST"> <B>Nickname:</B><BR> <INPUT type="text" name="unickname" size="20" value=""><BR> <B>Password:</B><BR> <INPUT type="hidden" name="returnto" value="index.pl"> <INPUT type="password" name="upasswd" size="20"><BR> <INPUT type="submit" name="op" value="userlogin"> </FORM> Don't have an account yet? <A href="/users.pl">Go Create One</A>. A user account will allow you to customize all these <A href="/cheesyportal.shtml">nutty little boxes</A>, tailor the stories you see, as well as remember your comment viewing preferences.</FONT></TD> </TR> </TABLE><P> <TABLE cellpadding="1" cellspacing="0" border="0" width="200" align="center"> <TR bgcolor="#006666"> <TD valign="top"><FONT size="4" color="#FFFFFF" face="arial,helvetica"><B>Slashdot Poll</B></FONT></TD> </TR><TR><TD bgcolor="#CCCCCC"><FONT color="#000000" size="2"><FORM action="http://slashdot.org/pollBooth.pl"> <INPUT type="hidden" name="qid" value="techadvance"> <B>The Tech Advance I Most Want Is:</B><BR><INPUT type="radio" name="aid" value="1">Nanotechnology<BR><INPUT type="radio" name="aid" value="2">Cold Fusion<BR><INPUT type="radio" name="aid" value="3">Powerful Fuel Cells<BR><INPUT type="radio" name="aid" value="4">Hard Wiring my Body<BR><INPUT type="radio" name="aid" value="5">Universal Strong Crypto<BR><INPUT type="radio" name="aid" value="6">Interstellar Travel<BR><INPUT type="radio" name="aid" value="7">Cybernetic Body Armor<BR><INPUT type="radio" name="aid" value="8">ColecoVision<BR><INPUT type="submit" value="Vote"> [ <A href="http://slashdot.org/pollBooth.pl?qid=techadvance&aid=-1"><B>Results</B></A> | <A href="http://slashdot.org/pollBooth.pl?"><B>Polls</B></A> ] <BR>Comments:<B>656</B> | Votes:<B>29121</B></FORM> </FONT></TD> </TR> </TABLE><P> <TABLE cellpadding="1" cellspacing="0" border="0" width="200" align="center"> <TR bgcolor="#006666"> <TD valign="top"><FONT size="4" color="#FFFFFF" face="arial,helvetica"><B>Older Stuff</B></FONT></TD> </TR><TR><TD bgcolor="#CCCCCC"><FONT color="#000000" size="2"><P><B><A href="http://slashdot.org/index.pl?section=&issue=730512&mode=thread"><FONT size="4">Friday</FONT></A> January 28</B> <LI><A href="http://slashdot.org/articles/00/01/28/1110258.shtml">Abstract Programming and GPL Enforcement</A> (235) <LI><A href="http://slashdot.org/interviews/00/01/28/1225206.shtml">Interview: FreeDOS Leader Jim Hall Answers</A> (86) <LI><A href="http://slashdot.org/articles/00/01/28/116240.shtml">Open Source's Achilles Heel</A> (466) <LI><A href="http://slashdot.org/features/00/01/26/1915230.shtml">The Virtue of Communal Instincts</A> (237) <LI><A href="http://slashdot.org/articles/00/01/28/0723223.shtml">Gartner Group Debunking Open Source Myths</A> (165) <LI><A href="http://slashdot.org/yro/00/01/28/0917229.shtml">DoubleClick Taken to Court</A> (310) <LI><A href="http://slashdot.org/articles/00/01/28/0718209.shtml">Updated Slash & Server 51</A> (81) <LI><A href="http://slashdot.org/articles/00/01/28/089230.shtml">XMMS 1.0.0 Released</A> (128) <LI><A href="http://slashdot.org/askslashdot/00/01/22/192226.shtml">Linux and Satellite Internet Services</A> (138) <LI><A href="http://slashdot.org/articles/00/01/27/1811221.shtml">UN Wants to Combat Online Racism</A> (531) <P><B><A href="http://slashdot.org/index.pl?section=&issue=730511&mode=thread"><FONT size="4">Thursday</FONT></A> January 27</B> <LI><A href="http://slashdot.org/yro/00/01/27/2330205.shtml">Crackdowns, Fools and the MPAA</A> (351) <LI><A href="http://slashdot.org/articles/00/01/27/0832215.shtml">Heroes of Might and Magic III Demo Released</A> (157) <LI><A href="http://slashdot.org/science/00/01/27/1345241.shtml">Sandia Labs Venture Into Nanotechnology</A> (117) <LI><A href="http://slashdot.org/articles/00/01/27/0931237.shtml">CA Announces Program Ports to Linux</A> (195) <LI><A href="http://slashdot.org/interviews/00/01/27/1118251.shtml">Interview: Larry Augustin Finally Answers</A> (210) <LI><A href="http://slashdot.org/awards/00/01/27/0855252.shtml">Final Call for Voting in Slashdot's Beanie Awards</A> (178) <LI><A href="http://slashdot.org/features/00/01/26/197211.shtml">Transmeta Code Morphing != Just In Time</A> (449) <LI><A href="http://slashdot.org/books/00/01/24/1150256.shtml">Intrusion Detection</A> (65) <LI><A href="http://slashdot.org/science/00/01/27/0824239.shtml">Using Enzymes to Help Fight CO2 Build-Up</A> (165) <LI><A href="http://slashdot.org/articles/00/01/27/0712217.shtml">Jon Johansen on ABC World News Tonight</A> (415) <P align="right"><BR><A href="http://slashdot.org/search.pl?section=&min=30"><B>Older Articles</B></A><BR><A href="http://slashdot.org/index.pl?section=&mode=thread&issue=730512"><B>Yesterday's Edition</B></A> </FONT></TD> </TR> </TABLE><P> <TABLE cellpadding="1" cellspacing="0" border="0" width="200" align="center"> <TR bgcolor="#006666"> <TD valign="top"><FONT size="4" color="#FFFFFF" face="arial,helvetica"><B><A HREF="/index.pl?section=books"><FONT COLOR="#FFFFFF">Book Reviews</FONT></A></B></FONT></TD> </TR><TR><TD bgcolor="#CCCCCC"><FONT color="#000000" size="2"><p>Jon Katz, Resident Gasbag, has a new, very appropriate book coming out soon, <a href="http://www.thinkgeek.com">Geeks</a>. Preorder now and receive the book early. <p>For probably the best fiction read around, check out Neal Stephenson's <cite><a href="/article.pl?sid=99/06/23/139229&mode=thread">Cryptonomicon</a></cite>, an engaging read about WWII, cryptography and buried treasure. And data vaults. <p>If you've been doing a lot of work in Perl, you've probably figured out you really need <cite><a href="/article.pl?sid=99/05/10/2238254&mode=thread">Perl in a Nutshell</a></cite> or <cite><a href="/article.pl?sid=99/01/29/1035246&mode=thread">The Perl Cookbook</a></cite>. If you're still learning, grab <cite><a href="/books/older/980526096229.shtml">Programming Perl</a></cite>. <p>And if you want to learn more about how to become a better coder, grab <cite><a href="/article.pl?sid=99/06/28/1417229&mode=thread">The Unified Software Development Process</a></cite> or <cite><a href="/article.pl?sid=99/04/08/1512209&mode=thread">The Practice of Programming</cite></a> Additionally, check out <cite><a href="http://slashdot.org/article.pl?sid=99/09/16/1333202&mode=thread">Refactoring: Improving the Design of Existing Code</a></cite> . <p>Developing a large application? Grab Eric Greenberg's excellent <cite><a href="/article.pl?sid=99/07/13/1943258&mode=thread">Network Application Frameworks</cite></a>. <P>Visit <A href="/index.pl?section=books">Our Book Reviews Section</A> for more. <br> <B>Update: 11/12 05:19</B> by <B><A href="mailto:hemos@slashdot.org">H</A></B>:</FONT></TD> </TR> </TABLE><P> <TABLE cellpadding="1" cellspacing="0" border="0" width="200" align="center"> <TR bgcolor="#006666"> <TD valign="top"><FONT size="4" color="#FFFFFF" face="arial,helvetica"><B>Quick Links</B></FONT></TD> </TR><TR><TD bgcolor="#CCCCCC"><FONT color="#000000" size="2"><B>Cool Sites:</B> <LI><A href="http://www.linux.com">Linux.com</A> (What <B>is</B> Linux?) <LI><A href="http://everything.blockstackers.com">Everything</A> (Blow your Mind) <LI><A href="http://www.geekculture.com/geekycomics/Aftery2k/aftery2kmain.html">After Y2k</A> (<I>This</I> is Post-Apocalyptic?) <LI><A href="http://www.userfriendly.org">User Friendly</A> (Laugh) <LI><A href="http://themes.org">Themes.org</A> (Make X Perty) <P><B>Support Slashdot:</B> <LI><A href="http://www.thinkgeek.com">ThinkGeek</A> (Clothe Yourself in Slashdot) <LI><A href="http://cdnow.com/from=sr-302791">CDnow</A> (Support <A href="http://www.cdnow.com/gift/malda@slashdot.org">Rob's Who Habit</A>) <LI><A href="http://adfu.slashdot.org">Slashdot Advertiser Index</A></FONT></TD> </TR> </TABLE><P> <TABLE cellpadding="1" cellspacing="0" border="0" width="200" align="center"> <TR bgcolor="#006666"> <TD valign="top"><FONT size="4" color="#FFFFFF" face="arial,helvetica"><B><A HREF="http://freshmeat.net"><FONT COLOR="#FFFFFF">Freshmeat</FONT></A></B></FONT></TD> </TR><TR><TD bgcolor="#CCCCCC"><FONT color="#000000" size="2"><P><FONT size="4" color="#006666"><B>January</B></FONT><BR> <LI><A href="http://freshmeat.net/news/2000/01/29/949208399.html">We should get this out of the door now</A> <LI><A href="http://freshmeat.net/news/2000/01/29/949159642.html">Is Linux for Crazies?</A> <LI><A href="http://freshmeat.net/news/2000/01/29/949156343.html">SQN Linux 1.6</A> <LI><A href="http://freshmeat.net/news/2000/01/29/949156277.html">Limo 0.3.2</A> <LI><A href="http://freshmeat.net/news/2000/01/29/949156237.html">Fusion GS 1.3</A> <LI><A href="http://freshmeat.net/news/2000/01/29/949145887.html">MMR 1.5.4</A> <LI><A href="http://freshmeat.net/news/2000/01/29/949142835.html">KUPS 0.3.4</A> <LI><A href="http://freshmeat.net/news/2000/01/29/949142815.html">3DSE patch for XMMS 4</A> <LI><A href="http://freshmeat.net/news/2000/01/29/949139763.html">Linux 2.3.41</A> <LI><A href="http://freshmeat.net/news/2000/01/29/949139751.html">Free Code for Linux S/390</A> <FORM METHOD="post" ACTION="http://core.freshmeat.net/search.php3"> <FONT size="3" color="#006666"><B>Search Freshmeat:</B></FONT><BR> <INPUT TYPE="hidden" NAME="link" VALUE="freshmeat.net"> <INPUT TYPE="text" NAME="query"> </FORM> <P align="right"><A href="http://freshmeat.net"><B>More Meat...</B></A></FONT></TD> </TR> </TABLE><P> </FONT></TD>
-         </TR>
-        </TABLE><TABLE cellpadding="0" cellspacing="0" border="0" width="99%" align="center" bgcolor="ffffff">
-            <TR>
-             <TD colspan="4" align="center"><IMG src="image14" alt="" width="80%" height="1" hspace="10" vspace="30"></TD>
-            </TR><TR>
-             <TD align="center"><FONT size="2" face="arial,helvetica">
-  <FORM method="GET" action="http://slashdot.org/search.pl">
-         <INPUT type="name" name="query" value="" width="20" size="20" length="20">
-        <INPUT type="submit" value="Search">
-  </FORM>
-  </FONT>
-  </TD>
-  <TD bgcolor="#ffffff" width="25">  &nbsp; </TD>
-  <TD align="center">
-    <FONT size="2" face="arial,helvetica"><I>Wasn't there something about a PASCAL programmer knowing the value of
-everything and the Wirth of nothing?
-<TD>&nbsp;</TD></I></FONT>
-    </FONT>
-  </TD></TR>
-  <TR><TD colspan="4" align="center">
-  <FONT size="1" color="#006666" face="arial,helvetica">
-
- All trademarks and copyrights on this
-  page are owned by their respective owners.  Comments
-  are owned by the Poster.
-  The Rest 1997-2000 <A href="http://Andover.Net">Andover.Net</A>.
-</FONT></CENTER>
-             </TD>
-            </TR>
-           </TABLE>
-        <CENTER>
-          <FONT size="2" color="#006666">
-
-         [ <A href="http://slashdot.org/"><Font color="#ffffff">home</FONT></A> |
-         <A href="http://slashdot.org/awards.shtml"><Font color="#ffffff">awards</FONT></A> |
-         <A href="http://slashdot.org/supporters.shtml"><FONT color="#ffffff">supporters</FONT></A> |
-         <A href="http://CmdrTaco.net"><FONT color="#ffffff">rob's homepage</FONT></A> |
-         <A href="http://slashdot.org/submit.pl"><FONT color="#ffffff">contribute story</FONT></A> |
-         <A href="http://slashdot.org/search.pl"><FONT color="#ffffff">older articles</FONT></A> |
-         <A href="http://Andover.Net"><FONT color="#ffffff">Andover.Net</FONT></A> |
-         <A href="http://slashdot.org/advertising.shtml"><FONT color="#ffffff">advertising</FONT></A> |
-         <A href="http://slashdot.org/pollBooth.pl"><FONT color="#ffffff">past polls</FONT></A> |
-         <A href="http://slashdot.org/about.shtml"><FONT color="#ffffff">about</FONT></A> |
-         <A href="http://slashdot.org/faq.shtml"><FONT color="#ffffff">faq</FONT></A> ]
-           </FONT>
-          </CENTER>
-</BODY>
-</HTML>
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image1 b/ext/tk/sample/tkextlib/tkHTML/page2/image1
deleted file mode 100644
index 2ed6ddcfe1..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image1
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image10 b/ext/tk/sample/tkextlib/tkHTML/page2/image10
deleted file mode 100644
index 3021b68990..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image10
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image11 b/ext/tk/sample/tkextlib/tkHTML/page2/image11
deleted file mode 100644
index 41d1fe3666..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image11
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image12 b/ext/tk/sample/tkextlib/tkHTML/page2/image12
deleted file mode 100644
index 655a686541..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image12
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image13 b/ext/tk/sample/tkextlib/tkHTML/page2/image13
deleted file mode 100644
index 97d5950e8c..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image13
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image14 b/ext/tk/sample/tkextlib/tkHTML/page2/image14
deleted file mode 100644
index 6d73ad833c..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image14
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image15 b/ext/tk/sample/tkextlib/tkHTML/page2/image15
deleted file mode 100644
index 90cc3b2b16..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image15
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image16 b/ext/tk/sample/tkextlib/tkHTML/page2/image16
deleted file mode 100644
index 93aa853cf1..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image16
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image17 b/ext/tk/sample/tkextlib/tkHTML/page2/image17
deleted file mode 100644
index f46f0308cd..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image17
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image18 b/ext/tk/sample/tkextlib/tkHTML/page2/image18
deleted file mode 100644
index 3badd5e909..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image18
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image19 b/ext/tk/sample/tkextlib/tkHTML/page2/image19
deleted file mode 100644
index bd4f6d9677..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image19
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image2 b/ext/tk/sample/tkextlib/tkHTML/page2/image2
deleted file mode 100644
index 7566dda25d..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image2
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image20 b/ext/tk/sample/tkextlib/tkHTML/page2/image20
deleted file mode 100644
index 358fa95f63..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image20
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image21 b/ext/tk/sample/tkextlib/tkHTML/page2/image21
deleted file mode 100644
index c81aa52588..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image21
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image22 b/ext/tk/sample/tkextlib/tkHTML/page2/image22
deleted file mode 100644
index 6cbd63022a..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image22
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image23 b/ext/tk/sample/tkextlib/tkHTML/page2/image23
deleted file mode 100644
index e8173a7456..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image23
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image24 b/ext/tk/sample/tkextlib/tkHTML/page2/image24
deleted file mode 100644
index bffd4b4956..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image24
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image25 b/ext/tk/sample/tkextlib/tkHTML/page2/image25
deleted file mode 100644
index c656fa4f30..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image25
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image26 b/ext/tk/sample/tkextlib/tkHTML/page2/image26
deleted file mode 100644
index bc93fdb259..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image26
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image27 b/ext/tk/sample/tkextlib/tkHTML/page2/image27
deleted file mode 100644
index 6ad0eff1e7..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image27
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image28 b/ext/tk/sample/tkextlib/tkHTML/page2/image28
deleted file mode 100644
index 88f0d7cea6..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image28
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image29 b/ext/tk/sample/tkextlib/tkHTML/page2/image29
deleted file mode 100644
index e0704183b3..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image29
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image3 b/ext/tk/sample/tkextlib/tkHTML/page2/image3
deleted file mode 100644
index ac3fa33e6f..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image3
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image30 b/ext/tk/sample/tkextlib/tkHTML/page2/image30
deleted file mode 100644
index 4a41950434..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image30
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image31 b/ext/tk/sample/tkextlib/tkHTML/page2/image31
deleted file mode 100644
index 60f13ed564..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image31
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image32 b/ext/tk/sample/tkextlib/tkHTML/page2/image32
deleted file mode 100644
index 04ddc4e8d7..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image32
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image33 b/ext/tk/sample/tkextlib/tkHTML/page2/image33
deleted file mode 100644
index c1ecfff6c4..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image33
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image34 b/ext/tk/sample/tkextlib/tkHTML/page2/image34
deleted file mode 100644
index 3dfd5d76e2..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image34
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image35 b/ext/tk/sample/tkextlib/tkHTML/page2/image35
deleted file mode 100644
index aea44f3017..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image35
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image36 b/ext/tk/sample/tkextlib/tkHTML/page2/image36
deleted file mode 100644
index baef0e0380..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image36
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image37 b/ext/tk/sample/tkextlib/tkHTML/page2/image37
deleted file mode 100644
index 6c6ba52b45..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image37
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image38 b/ext/tk/sample/tkextlib/tkHTML/page2/image38
deleted file mode 100644
index e298e04b29..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image38
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image39 b/ext/tk/sample/tkextlib/tkHTML/page2/image39
deleted file mode 100644
index e16e2f10d5..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image39
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image4 b/ext/tk/sample/tkextlib/tkHTML/page2/image4
deleted file mode 100644
index 9e5e46b7e5..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image4
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image5 b/ext/tk/sample/tkextlib/tkHTML/page2/image5
deleted file mode 100644
index 646a6d9a51..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image5
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image6 b/ext/tk/sample/tkextlib/tkHTML/page2/image6
deleted file mode 100644
index 7df417c710..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image6
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image7 b/ext/tk/sample/tkextlib/tkHTML/page2/image7
deleted file mode 100644
index 0e6ac10aff..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image7
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image8 b/ext/tk/sample/tkextlib/tkHTML/page2/image8
deleted file mode 100644
index ba7fb476b9..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image8
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/image9 b/ext/tk/sample/tkextlib/tkHTML/page2/image9
deleted file mode 100644
index b1cad73ae9..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/image9
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/index.html b/ext/tk/sample/tkextlib/tkHTML/page2/index.html
deleted file mode 100644
index 1c67be6c0b..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page2/index.html
+++ /dev/null
@@ -1,433 +0,0 @@
-<html>
-<head>
-  <title>Tcl Resource Center</title>
-</head>
-
-<body bgcolor="white" text="black">
-
-    <!-- MenuTopLevel Resource Software Extensions -->
-    <table border="0" cellpadding="0" cellspacing="0">
-      <tr>
-        <td width="120" valign="TOP"><a href="/"><img src="image1" width="120" height="79" alt="Scriptics" border="0"></a></td>
-        <td valign="top" width="548">
-
-          <!-- Table to hold tabs -->
-          <table cellpadding="0" cellspacing="0" border="0" width="548">
-            <tr>
-              <td valign="top" align="right" colspan="15" width="548"><a name="TOP"><img src="image2" width="548" height="9" alt="Tcl/Tk" border="0"></a></td>
-            </tr>
-            <tr>
-              <td valign="top" align="right" colspan="15" width="548"><img src="image3" width="482" height="34" alt="Scripting Solutions for eBusiness Integration" border="0"></td>
-            </tr>
-            <tr>
-              <td width="18" valign="TOP"><img src="image4" width="18" height="36" alt="" border="0"></td>
-              <td width="58"><a href="/products/" onMouseOver="msover(4, 'http://images.scriptics.com/images/ProductsMouseOff.gif') ; return true ;" onMouseOut="msover(4, 'http://images.scriptics.com/images/ProductsOff.gif') ; return true ;"><img src="image5" width="58" height="36" alt="Products" border="0"></a></td>
-              <td width="14" valign="TOP"><img src="image6" width="14" height="36" alt="" border="0"></td>
-              <td width="69"><a href="/customers/" onMouseOver="msover(6, 'http://images.scriptics.com/images/CustomersMouseOff.gif') ; return true ;" onMouseOut="msover(6, 'http://images.scriptics.com/images/CustomersOff.gif') ; return true ;"><img src="image7" width="69" height="36" alt="Customers" border="0"></a></td>
-              <td width="14" valign="TOP"><img src="image6" width="14" height="36" alt="" border="0"></td>
-              <td width="60"><a href="/partners/" onMouseOver="msover(8, 'http://images.scriptics.com/images/PartnersMouseOff.gif') ; return true ;" onMouseOut="msover(8, 'http://images.scriptics.com/images/PartnersOff.gif') ; return true ;"><img src="image8" width="60" height="36" alt="Partners" border="0"></a></td>
-              <td width="14" valign="TOP"><img src="image6" width="14" height="36" alt="" border="0"></td>
-              <td width="56"><a href="/services/" onMouseOver="msover(10, 'http://images.scriptics.com/images/ServicesMouseOff.gif') ; return true ;" onMouseOut="msover(10, 'http://images.scriptics.com/images/ServicesOff.gif') ; return true ;"><img src="image9" width="56" height="36" alt="Services" border="0"></a></td>
-              <td width="14" valign="TOP"><img src="image10" width="14" height="36" alt="" border="0"></td>
-              <td width="88"><a href="/resource/" onMouseOver="msover(12, 'http://images.scriptics.com/images/ResourceMouseOn.gif') ; return true ;" onMouseOut="msover(12, 'http://images.scriptics.com/images/ResourceOn.gif') ; return true ;"><img src="image11" width="88" height="36" alt="Tcl Resources" border="0"></a></td>
-              <td width="14" valign="TOP"><img src="image12" width="14" height="36" alt="" border="0"></td>
-              <td width="57"><a href="/company/" onMouseOver="msover(14, 'http://images.scriptics.com/images/CompanyMouseOff.gif') ; return true ;" onMouseOut="msover(14, 'http://images.scriptics.com/images/CompanyOff.gif') ; return true ;"><img src="image13" width="57" height="36" alt="Company" border="0"></a></td>
-              <td width="8" valign="TOP"><img src="image14" width="8" height="36" alt="" border="0"></td>
-              <td width="50" valign="TOP"><img src="image15" width="50" height="36" alt="" border="0"></td>
-              <td width="14" valign="TOP"><img src="image16" width="14" height="36" alt="" border="0"></td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-    </table> <script language="Javascript">
-   <!--
-	function msover(num, file )
-	{
-	    old = (((navigator.appName=='Netscape') &&
-	              (parseInt(navigator.appVersion)<=3.0 )))
-	  if ( !old ) {
-		document.images[num].src=file
-	  }
-        }
-	//-->
-   </SCRIPT>
-
-<!-- MenuSubLevel Resource Software Extensions Tk -->
-
-<table cellpadding="0" cellspacing="0" border="0">
-
-<!-- Left Hand Column-->
-
-<tr><td valign="top" width="120"><table cellpadding="0" cellspacing="0" border="0" width="120">
-    <tr>
-      <td width="120" valign="TOP"><img src="image17" width="120" height="4" alt="" border="0"></td>
-    </tr>
-    <tr>
-      <td width="120" valign="TOP"><a href="/resource/software/"><img src="image18" width="120" height="11" alt="Software" border="0"></a></td>
-    </tr>
-    <tr>
-      <td width="120" valign="TOP"><img src="image19" width="120" height="4" alt="" border="0"></td>
-    </tr>
-    <tr>
-      <td width="120" valign="TOP"><a href="/resource/software/tcltk/"><img src="image20" width="120" height="11" alt="Tcl/Tk Core" border="0"></a></td>
-    </tr>
-    <tr>
-      <td width="120" valign="TOP"><img src="image19" width="120" height="4" alt="" border="0"></td>
-    </tr>
-    <tr>
-      <td width="120" valign="TOP"><a href="/resource/software/applications/"><img src="image21" width="120" height="11" alt="Applications" border="0"></a></td>
-    </tr>
-    <tr>
-      <td width="120" valign="TOP"><img src="image22" width="120" height="4" alt="" border="0"></td>
-    </tr>
-    <tr>
-      <td width="120" valign="TOP"><a href="/resource/software/extensions/"><img src="image23" width="120" height="11" alt="Extensions" border="0"></a></td>
-    </tr>
-    <tr>
-      <td width="120" valign="TOP"><img src="image24" width="120" height="6" alt="" border="0"></td>
-    </tr>
-    <tr>
-      <td width="120" valign="TOP"><a href="/resource/software/patches/"><img src="image25" width="120" height="11" alt="Patches" border="0"></a></td>
-    </tr>
-    <tr>
-      <td width="120" valign="TOP"><img src="image19" width="120" height="4" alt="" border="0"></td>
-    </tr>
-    <tr>
-      <td width="120" valign="TOP"><a href="/resource/software/java/"><img src="image26" width="120" height="11" alt="Tcl &amp; Java" border="0"></a></td>
-    </tr>
-    <tr>
-      <td width="120" valign="TOP"><img src="image19" width="120" height="4" alt="" border="0"></td>
-    </tr>
-    <tr>
-      <td width="120" valign="TOP"><a href="/resource/software/ports/"><img src="image27" width="120" height="11" alt="Tcl/Tk Ports" border="0"></a></td>
-    </tr>
-    <tr>
-      <td width="120" valign="TOP"><img src="image19" width="120" height="4" alt="" border="0"></td>
-    </tr>
-    <tr>
-      <td width="120" valign="TOP"><a href="/resource/software/tools/"><img src="image28" width="120" height="11" alt="Tools" border="0"></a></td>
-    </tr>
-    <tr>
-      <td width="120" valign="TOP"><img src="image29" width="120" height="6" alt="" border="0"></td>
-    </tr>
-    <tr>
-      <td width="120" valign="TOP"><a href="/resource/doc/"><img src="image30" width="120" height="11" alt="Documentation" border="0"></a></td>
-    </tr>
-    <tr>
-      <td width="120" valign="TOP"><img src="image31" width="120" height="5" alt="" border="0"></td>
-    </tr>
-    <tr>
-      <td width="120" valign="TOP"><a href="/resource/community/"><img src="image32" width="120" height="11" alt="Community" border="0"></a></td>
-    </tr>
-    <tr>
-      <td width="120" valign="TOP"><img src="image31" width="120" height="5" alt="" border="0"></td>
-    </tr>
-    <tr>
-      <td width="120" valign="TOP"><a href="/live/bydate"><img src="image33" width="120" height="11" alt="What's New" border="0"></a></td>
-    </tr>
-    <tr>
-      <td width="120" valign="TOP"><img src="image31" width="120" height="5" alt="" border="0"></td>
-    </tr>
-    <tr>
-      <td width="120" valign="TOP"><a href="/forms/urlnote.html"><img src="image34" width="120" height="11" alt="Add URL" border="0"></a></td>
-    </tr>
-    <tr>
-      <td width="120" valign="TOP"><img src="image31" width="120" height="5" alt="" border="0"></td>
-    </tr>
-    <tr>
-      <td width="120" valign="TOP"><a href="/live/keyword"><img src="image35" width="120" height="11" alt="Keyword Search" border="0"></a></td>
-    </tr>
-    <tr>
-      <td width="120" valign="TOP"><img src="image31" width="120" height="5" alt="" border="0"></td>
-    </tr>
-    <tr>
-      <td width="120" valign="TOP"><a href="/live/sitemap"><img src="image36" width="120" height="11" alt="Index" border="0"></a></td>
-    </tr>
-    <tr>
-      <td width="120" valign="TOP"><img src="image37" width="120" height="6" alt="" border="0"></td>
-    </tr>
-</table><!-- End Left Column --></td><!-- Right Hand Column --><td valign="top" width="548" align="left"><table cellpadding="0" cellspacing="0" border="0" width="548">
-    <tr>
-      <td width="295" valign="TOP"><img src="image38" width="295" height="42" alt="Resource" border="0"></td>
-      <td width="187" valign="bottom" align="right"><FORM action="/live/keyword"><img src="image39" width="46" height="24" alt="" border="0"><INPUT TYPE="TEXT" SIZE="10" MAXLENGTH="35" NAME="keywords"><INPUT type="IMAGE" border="0" img="img" src="http://images.scriptics.com/images/Go.gif" value="submit" width="33" height="24"></FORM>
-    </tr>
-  </table>
-  <!-- 2 Columns for spacer -->
-  <table cellpadding="0" cellspacing="0" border="0" width="548">
-    <tr>
-      <!-- Spacer Column -->
-      <td valign="top" width="10">
-      &nbsp;
-      </td>
-
-
-      <td valign="top" width="548"><font face="Geneva, Helvetica, Arial" size="2"><h1>Tcl Resource Center</h1>
-<font size="+1"><a href="/resource/">Top</a>&gt;<a href="/resource/software/" ="">Software Central</a>&gt;<a href="/resource/software/extensions/" ="">Extensions</a>&gt;Tk Widgets</font><font size="-1"><br>Viewed by name (<a href="/resource/software/extensions/tk/?sortby=date">By date</a>)</font><br>
-<p>Tk is a toolkit for building graphical user interfaces with Tcl.
-    Your Tcl/Tk scripts run on UNIX, Windows, and Macintosh.<p>
-<font face="Geneva, Helvetica, Arial"><ul></ul></font><dl>
-<dt><b><a href="http://marge.phys.washington.edu/%7Ezager/blt80-unoff-exe.zip" ="">BLT 8.0 Unofficial zip and DLL</a></b>
-<dd>This is a compiled version of BLT 8.0 "unofficial" for
-the Windows platform. <a href="/live/annotate?url=http%3a%2f%2fmarge%2ephys%2ewashington%2eedu%2f%257Ezager%2fblt80%2dunoff%2dexe%2ezip">Edit</a>
- <i><font size="-1">(September 24, 1999 06:31)</font></i><dt><b><a href="ftp://ftp.neosoft.com/languages/tcl/sorted/unknown/blt8.0p2-unoff.tgz" ="">BLT 8.0p2 Unofficial tar file</a><a name="bltunoff"></a></b>
-<dd>This is a contributed patch to make BLT compatible with Tcl/Tk 8.0p2.  While still "unofficial", it is widely used.
-    Make sure you get the 8.0p2 version because the 8.0 version does
-    not compile under windows.
-    There is also a <a href="ftp://ftp.neosoft.com/languages/sorted/devel/blt2.3-8.1.tar.gz">2.3-8.1 version</a> that has been patched to work with 8.1.
-    <a href="ftp://ftp.neosoft.com/languages/tcl/sorted/unknown/blt8.0p2-unoff.README">README file</a>. <a href="/live/annotate?url=ftp%3a%2f%2fftp%2eneosoft%2ecom%2flanguages%2ftcl%2fsorted%2funknown%2fblt8%2e0p2%2dunoff%2etgz">Edit</a>
- <i><font size="-1">(August 30, 1999 06:38)</font></i><dt><b><a href="http://www.tcltk.com/blt/" ="">BLT Home Page</a></b>
-<dd>
-			Author <b>George Howlett</b>, Version <b>2.3</b>,
-			Works with <b>Tk 4.1 through Tk 8.1</b>
-<br><a href="ftp://ftp.tcltk.com/pub/blt/">Download</a>, <a href="ftp://ftp.tcltk.com/pub/blt/BLT2.3.tar.gz">BLT2.3.tar.gz</a>, <a href="ftp://ftp.tcltk.com/pub/blt/BLT2.4h.tar.gz">BLT2.4h.tar.gz</a>, <a href="ftp://ftp.tcltk.com/pub/blt/BLT2.4i.tar.gz">BLT2.4i.tar.gz</a>, <a href="ftp://ftp.tcltk.com/pub/blt/blt2.4i-for-8.0.exe">blt2.4i-for-8.0.exe</a>, <a href="ftp://ftp.tcltk.com/pub/blt/blt2.4i-for-8.1.exe">blt2.4i-for-8.1.exe</a><br>BLT is a set of widgets for Tk, including a graph widget,
-bar chart, drag&drop, a simple command tracer, and much more.
-The 2.4 release, which is still under development, works with 8.0
-or higher.
-There are also an "<a href="#bltunoff">unofficial</a>" release for 8.0p2
-and 8.1a2 that were not done by the author. <a href="/live/annotate?url=http%3a%2f%2fwww%2etcltk%2ecom%2fblt%2f">Edit</a>
- <i><font size="-1">(October 26, 1999 09:43)</font></i><dt><b><a href="http://www.unifix-online.com/BWidget/index.html" ="">BWidget</a></b>
-<dd>A set of native Tk 8.x Widgets using Tcl8.x namespaces.
-The ToolKit is available under Unix/X11 and Windows.
-The BWidget(s) have a professional look&feel as in other
-well known Toolkits (Tix or Incr Widget) but the concept is
-radically different because everything is native
-so no platform compilation, no compiled extension
-library are needed. The code is 100 Pure Tcl/Tk.
-More 30 components : Notebook, PageManager, Tree, PanedWindow, ButtonBox,
-ScrollView, ComboBox, SpinBox, ListBox, SelectFont, SelectColor,
-ProgressBare ... <a href="/live/annotate?url=http%3a%2f%2fwww%2eunifix%2donline%2ecom%2fBWidget%2findex%2ehtml">Edit</a>
- <i><font size="-1">(September 06, 1999 09:58)</font></i><dt><b><a href="http://purl.oclc.org/net/nijtmans/dash.html" ="">Dash Patch for Tk</a></b>
-<dd>This patch has many enhancements to the Tk and its canvas
-widget, including dashed lines, smoothed polygons,
-and performance enhancements. <a href="/live/annotate?url=http%3a%2f%2fpurl%2eoclc%2eorg%2fnet%2fnijtmans%2fdash%2ehtml">Edit</a>
- <i><font size="-1">(November 21, 1999 06:33)</font></i><dt><b><a href="http://www.hwaci.com/sw/et" ="">Embedded Tk (et)</a></b>
-<dd>
-			Author <b><a href="mailto:drh@acm.org" ="">Richard Hipp</a></b>, Version <b>8.0b5</b>,
-			Works with <b>Tk 4.0, 4.1, 4.2, 8.0</b>
-<br>Download: <a href="http://www.hwaci.com/sw/et/et80b5.tar.gz">et80b5.tar.gz</a><br>Embedded Tk or ``ET'' is tool for making stand-alone executables out of a mixture of C or C++ and Tcl/Tk.
-Using ET you can invoke a short Tcl/Tk script in the middle of a C routine, or you can invoke a C routine in the
-middle of a Tcl/Tk script. ET also bundles external Tcl/Tk scripts (including the standard Tcl/Tk startup scripts)
-into the executable so that the executable can be run on another binary-compatible computer that doesn't have
-Tcl/Tk installed.  <a href="/live/annotate?url=http%3a%2f%2fwww%2ehwaci%2ecom%2fsw%2fet">Edit</a>
- <i><font size="-1">(August 19, 1999 15:35)</font></i><dt><b><a href="http://www.purl.org/net/hobbs/tcl/script/tkcon/" ="">Enhanced Tk Console (TkCon)</a></b>
-<dd>
-			Author <b><a href="mailto:jeffrey.hobbs@oen.siemens.de" ="">Jeff Hobbs</a></b>, Version <b>1.3</b>,
-			Works with <b>Tk 4.1 through Tk 8.1</b>
-<br>Download: <a href="http://www.purl.org/net/hobbs/tcl/script/tkcon/tkcon.tar.gz">tkcon.tar.gz</a><br>TkCon is a replacement for the standard console that comes with Tk (on Windows/Mac, but also works on
-
-Unix). The console itself provides many more features than the standard console.  <a href="/live/annotate?url=http%3a%2f%2fwww%2epurl%2eorg%2fnet%2fhobbs%2ftcl%2fscript%2ftkcon%2f">Edit</a>
- <i><font size="-1">(August 23, 1999 12:06)</font></i><dt><b><a href="http://www.scriptmeridian.org/projects/tk/" ="">Frontier-Tk ScriptMeridian project</a></b>
-<dd>This project seeks to integrate the Tk toolkit
-with the Frontier scripting language. <a href="/live/annotate?url=http%3a%2f%2fwww%2escriptmeridian%2eorg%2fprojects%2ftk%2f">Edit</a>
- <i><font size="-1">(August 19, 1999 15:36)</font></i><dt><b><a href="http://purl.oclc.org/net/nijtmans/img.html" ="">Img image format extension</a></b>
-<dd>This package enhances Tk, adding support for many other Image formats:
-BMP, XBM, XPM, GIF (with transparency), PNG,
-JPEG, TIFF and postscript.
-This is implemented as a shared library that can be dynamically loaded into
-Tcl/Tk.
- <a href="/live/annotate?url=http%3a%2f%2fpurl%2eoclc%2eorg%2fnet%2fnijtmans%2fimg%2ehtml">Edit</a>
- <i><font size="-1">(November 21, 1999 06:35)</font></i><dt><b><a href="http://purl.oclc.org/net/oakley/tcl/mclistbox/index.html" ="">mclistbox - a multi-column listbox widget</a></b>
-<dd>mclistbox is a multi-column listbox that is
-written in pure tcl and runs on all platforms
-that support tcl/tk 8.0 or higher. This widget
-requires no other extensions; it is completely
-standalone. <a href="/live/annotate?url=http%3a%2f%2fpurl%2eoclc%2eorg%2fnet%2foakley%2ftcl%2fmclistbox%2findex%2ehtml">Edit</a>
- <i><font size="-1">(August 19, 1999 15:37)</font></i><dt><b><a href="http://home.t-online.de/home/dshepherd/tkview.htm" ="">MFC views C++ class for embedding Tk</a></b>
-<dd>The idea of embedding Tk in MFC windows always seemed very enticing but information was sparse and contradictory - on a
- scale between "very easy" and "not yet possible". The only thing for it was to have a go and lo, it wasn't that hard after all.
- CTkView is a C++ class which can be used in MFC SDI or MDI applications. An instance of CTkView hosts an embedded Tk
- toplevel widget and performs some management chores for the widget so that it can size, update and react correctly to Windows
- events.   <a href="/live/annotate?url=http%3a%2f%2fhome%2et%2donline%2ede%2fhome%2fdshepherd%2ftkview%2ehtm">Edit</a>
- <i><font size="-1">(August 19, 1999 15:38)</font></i><dt><b><a href="http://www.cs.umd.edu/hcil/pad++" ="">Pad++</a></b>
-<dd>
-			Author <b><a href="mailto:pad-info@cs.umd.edu" ="">Ben Bederson et al</a></b>, Version <b>0.9p1</b>,
-			Works with <b>8.0</b>
-<br>Download: <a href="http://www.cs.umd.edu/hcil/pad++/download.html">download.html</a><br>Pad++ is a Tk widget that provides a Zoomable User Interface (ZUI) that supports real-time interactive zoomable graphics in a fashion similar to the Tk Canvas widget.  Pad++ supports tens of thousands of objects which include text, images, graphics, portals, lenses, simple html (and more), including transparency and rotation. <a href="/live/annotate?url=http%3a%2f%2fwww%2ecs%2eumd%2eedu%2fhcil%2fpad%2b%2b">Edit</a>
- <i><font size="-1">(August 19, 1999 15:39)</font></i><dt><b><a href="http://home.t-online.de/home/sesam.com/freeware.htm" ="">Progressbar</a></b>
-<dd>Progressbar is a megawidget written in pure tcl (ie: no compiling required - runs on all platforms Macintosh, Unix, Windows).
-Its primary purpose is to show the progress of any action in percent. <a href="/live/annotate?url=http%3a%2f%2fhome%2et%2donline%2ede%2fhome%2fsesam%2ecom%2ffreeware%2ehtm">Edit</a>
- <i><font size="-1">(January 24, 2000 09:19)</font></i><dt><b><a href="http://jfontain.free.fr/" ="">scwoop (Simple Composite Widget Object Oriented Package)</a></b>
-<dd>Scwoop is a composite widget (also known as mega widget) extension to the great Tk widget library. Scwoop is
-entirely written in Tcl using the stooop (Simple Tcl Only Object Oriented Programming) extension. <a href="/live/annotate?url=http%3a%2f%2fjfontain%2efree%2efr%2f">Edit</a>
- <i><font size="-1">(January 09, 2000 02:10)</font></i><dt><b><a href="http://www2.clearlight.com/~oakley/tcl/supertext.html" ="">Supertext - tk text widget with unlimited undo</a></b>
-<dd>
-			Author <b><a href="mailto:oakley@channelpoint.com" ="">Bryan Oakley</a></b>, Version <b>1.0b1</b>,
-			Works with <b>Tcl 8.0</b>
-<br>Download: <a href="http://www2.clearlight.com/~oakley/tcl/supertext.tcl">supertext.tcl</a><br>Supertext is a package that provides a tk text widget with full undo and the ability to execute procedures both before and after a text
-widget command has been processed. Supertext may be used as-is, or for the brave it may be used in place of the standard text
-widget.  <a href="/live/annotate?url=http%3a%2f%2fwww2%2eclearlight%2ecom%2f%7eoakley%2ftcl%2fsupertext%2ehtml">Edit</a>
- <i><font size="-1">(August 23, 1999 12:06)</font></i><dt><b><a href="http://www.hwaci.com/sw/tk/nbpi.html" ="">Tabbed Notebook Widget</a></b>
-<dd>
-			Author <b><a href="mailto:drh@acm.org" ="">Richard Hipp</a></b>, Version <b>1.0</b>,
-			Works with <b>Tk 4.1 or later.</b>
-<br>Download: <a href="http://www.hwaci.com/sw/tk/notebook.tcl">notebook.tcl</a><br>This implements a tabbed notebook using
-a canvas widget and embedded frames.
-This is pure Tcl
-code - not a C extension. <a href="/live/annotate?url=http%3a%2f%2fwww%2ehwaci%2ecom%2fsw%2ftk%2fnbpi%2ehtml">Edit</a>
- <i><font size="-1">(August 23, 1999 12:08)</font></i><dt><b><a href="http://www.tcltk.com/ellson/ftp/Gdtclft2.0.README" ="">Tcl GD - graphics</a></b>
-<dd>
-			Author <b>John Ellson and Spencer Thomas</b>, Version <b>2.0</b>,
-			Works with <b>8.0 and higher</b>
-<br>Download: <a href="http://www.tcltk.com/ellson/ftp/Gdtclft2.0.tar.gz">Gdtclft2.0.tar.gz</a><br>
-	Thomas Boutell's Gd package provides a convenient way to generate
-	    PNG images with a C program. If you prefer Tcl for CGI
-		applications, you'll want the TCL GD extension. <a href="/live/annotate?url=http%3a%2f%2fwww%2etcltk%2ecom%2fellson%2fftp%2fGdtclft2%2e0%2eREADME">Edit</a>
- <i><font size="-1">(August 19, 1999 14:52)</font></i><dt><b><a href="http://www.stratasys.com/software/metagui" ="">The Meta-GUI Tools</a></b>
-<dd>The Meta-GUI tools provide a framework for quickly building full
-GUI applications. The GUI is rendered by a run-time engine
-based on a hierarchical set of definitions you provide. At the bottom
-of the hierarchy are abstract data types such as length, angle,
-string, etc., and these are used to progressively build up frames,
-dialogs, toolbars, menus, and operations. <a href="/live/annotate?url=http%3a%2f%2fwww%2estratasys%2ecom%2fsoftware%2fmetagui">Edit</a>
- <i><font size="-1">(August 23, 1999 12:10)</font></i><dt><b><a href="http://jfontain.free.fr/" ="">Tkpiechart Home Page</a></b>
-<dd>Tkpiechart is a Tcl-only extension that allows the programmer to create and dynamically update 2D or 3D pie
-charts in a Tcl/Tk application.  This uses the stooop package and builds
-pie charts on a Tk canvas. <a href="/live/annotate?url=http%3a%2f%2fjfontain%2efree%2efr%2f">Edit</a>
- <i><font size="-1">(January 09, 2000 02:12)</font></i><dt><b><a href="http://www.cygnus.com/~irox/tkprint/" ="">TkPrint</a></b>
-<dd>TkPrint is an extension that allows you to print from a
-        Tk widget. <a href="/live/annotate?url=http%3a%2f%2fwww%2ecygnus%2ecom%2f%7eirox%2ftkprint%2f">Edit</a>
- <i><font size="-1">(October 11, 1999 09:58)</font></i><dt><b><a href="http://www.purl.org/net/hobbs/tcl/capp/" ="">TkTable Home Page</a></b>
-<dd>The TkTable widget.  The <code>table</code> command creates a
-2-dimensional grid of cells. The table can use a Tcl array variable or Tcl
-
-command for data storage and retrieval. <a href="/live/annotate?url=http%3a%2f%2fwww%2epurl%2eorg%2fnet%2fhobbs%2ftcl%2fcapp%2f">Edit</a>
- <i><font size="-1">(November 18, 1999 09:25)</font></i><dt><b><a href="http://ftp.austintx.net/users/jatucker/TkTextmatrix/default.htm" ="">TkTextMatrix (spreadsheet)</a></b>
-<dd>
-			Author <b><a href="mailto:jatucker@austin.dsccc.com" ="">John Arthur Tucker</a></b>, Version <b>4.1</b>,
-			Works with <b>Tk 4.1</b>
-<br>Download: <a href="http://ftp.austintx.net/users/jatucker/TkTextmatrix/download.htm">download.htm</a>, <a href="http://ftp.austintx.net/users/jatucker/TkTextmatrix/textmatrix4.1.tar.gz">textmatrix4.1.tar.gz</a><br>A Tcl/Tk spreadsheet widget, TkTextmatrix, which is implemented in C++ and is
-             basically a Tk Canvas widget plus extra behavior for manipulating rows and columns of cell
-             items many times faster than with a plain Tk Canvas.  It actually inserts text nearly as fast
-             as the Tk Text widget.  If you work with or are interested in creating your own Tcl/Tk widgets
-             in C++,  you might want to take a look at the C++ widget library included with this
-             distribution. <a href="/live/annotate?url=http%3a%2f%2fftp%2eaustintx%2enet%2fusers%2fjatucker%2fTkTextmatrix%2fdefault%2ehtm">Edit</a>
- <i><font size="-1">(August 23, 1999 12:14)</font></i><dt><b><a href="http://www.cs.umd.edu/~bederson/Togl.html" ="">ToGL - a Tk Open GL widget</a></b>
-<dd>Togl is a Tk widget for OpenGL rendering. Togl is based on OGLTK, originally written by Benjamin Bederson at the
-University of New Mexico (who has since moved to the University of Maryland). Togl adds the new features:
-<ul>
-<li>     color-index mode support including color allocation functions
-<li>     support for requesting stencil, accumulation, alpha buffers, etc
-<li>     multiple OpenGL drawing widgets
-<li>     OpenGL extension testing from Tcl
-<li>     simple, portable font support
-<li>     overlay plane support
-</ul>
-Togl allows one to create and manage a special Tk/OpenGL widget with Tcl and render into it with a C program. That is,
-a typical Togl program will have Tcl code for managing the user interface and a C program for computations and
-OpenGL rendering.  <a href="/live/annotate?url=http%3a%2f%2fwww%2ecs%2eumd%2eedu%2f%7ebederson%2fTogl%2ehtml">Edit</a>
- <i><font size="-1">(August 23, 1999 12:14)</font></i><dt><b><a href="http://www.hwaci.com/sw/tk/treepi.html" ="">Tree Widget</a></b>
-<dd>This implements a tree display in a canvas widget.
-It is similar in layout to that of the
-Windows explorer file viewer.  This is pure Tcl
-code - not a C extension. <a href="/live/annotate?url=http%3a%2f%2fwww%2ehwaci%2ecom%2fsw%2ftk%2ftreepi%2ehtml">Edit</a>
- <i><font size="-1">(September 29, 1999 14:37)</font></i><dt><b><a href="http://www.du.edu/~mschwart/tcl-tk.htm" ="">Windows Extensions for Tcl/Tk (Michael Schwartz)</a></b>
-<dd>This site has pointers to several extensions specific to the
-Windows platform.  The extensions provide printing,
-a MAPI interface to send email, and an interface to manipulate
-.INI files, among other things. <a href="/live/annotate?url=http%3a%2f%2fwww%2edu%2eedu%2f%7emschwart%2ftcl%2dtk%2ehtm">Edit</a>
- <i><font size="-1">(October 07, 1999 10:50)</font></i><dt><b><a href="http://www.tcltk.com/iwidgets/" ="">[incr Widgets] Home Page</a></b>
-<dd>[incr Widgets] is a set of megawidgets (combo boxes, etc.) that are
-upon the [incr Tcl] object system and the [incr Tk] megawidget
-framework.  This comes bundled with the
-<a href="http://www.tcltk.com/itcl/">[incr Tcl]</a> distributions. <a href="/live/annotate?url=http%3a%2f%2fwww%2etcltk%2ecom%2fiwidgets%2f">Edit</a>
- <i><font size="-1">(September 05, 1999 16:08)</font></i><dt><b><a href="http://www1.clearlight.com/~oakley/tcl/combobox/index.html" ="">combobox</a></b>
-<dd>
-			Author <b><a href="mailto:oakley@channelpoint.com" ="">Bryan Oakley</a></b>, Version <b>1.03</b>,
-			Works with <b>8.x</b>
-<br>Download: <a href="http://www1.clearlight.com/~oakley/tcl/combobox/combobox.tcl">combobox.tcl</a><br>combobox is a pure-tcl implementation of a combobox widget. It is
-entirely self contained and does not require any other OO or megawidget
-extension. It supports both editable and non-editable entries, and
-provides the ability to call a procedure anytime the value of the combobox
-changes. <a href="/live/annotate?url=http%3a%2f%2fwww1%2eclearlight%2ecom%2f%7eoakley%2ftcl%2fcombobox%2findex%2ehtml">Edit</a>
- <i><font size="-1">(August 23, 1999 12:15)</font></i><dt><b><a href="http://www.multimania.com/droche/rnotebook/index.html" ="">Rnotebook</a></b>
-<dd>
-			Author <b><a href="mailto:dan@lectra.com" ="">Daniel Roche</a></b>, Version <b>1.0</b>,
-			Works with <b>8.0 or higher</b>
-<br>Download: <a href="http://www.multimania.com/droche/rnotebook/index.html">index.html</a><br>This implements a resizeable notebook
-widget in pure tcl/tk <a href="/live/annotate?url=http%3a%2f%2fwww%2emultimania%2ecom%2fdroche%2frnotebook%2findex%2ehtml">Edit</a>
- <i><font size="-1">(August 19, 1999 15:39)</font></i><dt><b><a href="http://www.tregar.com/samdi.html" ="">saMDI v1.0a1 Multi-Document Interface Extension</a></b>
-<dd>A multi-document interface (MDI) extension for TCL/Tk 8.0.
-This is a common interface format in Microsoft Windows that lets a parent window contain multiple child windows.
-In effect you get a window manager inside a window!
-Uses and includes the STOOOP object-oriented extension by
-Jean-Luc Fontaine.
-saMDI v1.0a1 GPL Copyright 1998 Sam Tregar. <a href="/live/annotate?url=http%3a%2f%2fwww%2etregar%2ecom%2fsamdi%2ehtml">Edit</a>
- <i><font size="-1">(August 23, 1999 12:07)</font></i><dt><b><a href="http://tix.mne.com/htdocs/tix/index.html" ="">Tix Support Site</a></b>
-<dd>
-			Author <b><a href="mailto:tix@mne.com" ="">Ioi Lam, (adopted by Gregg Squires)</a></b>, Version <b>4.1</b>,
-			Works with <b>Tcl 7.4 through Tcl 8.0</b>
-<br><a href="ftp://ftp.tix.mne.com/pub/tix/">Download</a>, <a href="ftp://ftp.tix.mne.com/pub/tix/Tix4.1.0.006.tar.gz">Tix4.1.0.006.tar.gz</a>, <a href="ftp://ftp.tix.mne.com/pub/tix/Tix41p6.zip">Tix41p6.zip</a>, <a href="ftp://ftp.tix.mne.com/pub/tix/win41p6bin.zip">win41p6bin.zip</a><br><b>Tix has found a new home!</b>
- <br>
- Tix provides over 40 new Tk including the
-combo box, file selection dialogs, paned widget,
-notebook, hierarchical list, directory tree, and more.
-  <a href="/live/annotate?url=http%3a%2f%2ftix%2emne%2ecom%2fhtdocs%2ftix%2findex%2ehtml">Edit</a>
- <i><font size="-1">(August 23, 1999 12:11)</font></i><dt><b><a href="ftp://ftp.archive.eso.org/pub/tree" ="">Tk Tree Widget (C++)</a></b>
-<dd>Tk Tree widget for Tcl8.0.3.
-
-This version contains (optional) support for \[incr Tcl\] and \[incr Tk\]
-version 3.0.
-<br>
-With the tree widget, you can display a tree in a Tk canvas. The nodes
-can be made up of any number of canvas items or even other Tk widgets.
-You create the objects that make up a node and the line that connects
-it to its parent and pass them to the tree widget. After this the tree
-widget manages the positions of the nodes and end points of the tree
-lines.  Operations are available for inserting, moving and removing
-nodes and subtrees and for querrying the position of a node in the
-tree. The tree can be displayed horizontally or vertically.
- <a href="/live/annotate?url=ftp%3a%2f%2fftp%2earchive%2eeso%2eorg%2fpub%2ftree">Edit</a>
- <i><font size="-1">(August 25, 1999 03:14)</font></i><dt><b><a href="http://www.purl.org/net/hobbs/tcl/script/widget/" ="">widget, simple megawidget package</a></b>
-<dd>
-			Author <b><a href="mailto:jeffrey.hobbs@oen.siemens.de" ="">Jeffrey Hobbs</a></b>, Version <b>0.9</b>,
-			Works with <b>Tcl/Tk 8.0 or higher</b>
-<br>Download: <a href="http://www.purl.org/net/hobbs/tcl/script/widget/widget-0.9.tar.gz">widget-0.9.tar.gz</a><br>This is a package of
- megawidgets (i.e., compound widgets) that work almost exactly like Tk widgets.
- You can also build your own new megawidgets.
-Includes: combobox, hierarchy, console, progressbar,
-tabnotebook, validating entry, pane geometry manager, baloon help. <a href="/live/annotate?url=http%3a%2f%2fwww%2epurl%2eorg%2fnet%2fhobbs%2ftcl%2fscript%2fwidget%2f">Edit</a>
- <i><font size="-1">(August 23, 1999 12:16)</font></i></dl>
-<hr><p><center><font size="-1" face="Geneva, Helvetica, Arial"><br><a href="#TOP"><b>Top</b></a><br><!-- key ResourceSoftwareExtensions --><a href="/">Home</a>
- | <a href="/products/">Products</a>
- | <a href="/customers/">Customers</a>
- | <a href="/partners/">Partners</a>
- | <a href="/services/">Services</a>
- | <a href="/resource/">Tcl Resources</a>
- | <a href="/company/">Company</a>
-<br><a href="/live/keyword">Search</a>
- | <a href="/live/map">Site Map</a>
- | <a href="/company/feedback.html?url=%2fresource%2fsoftware%2fextensions%2ftk%2f">Feedback</a>
- | <a href="/company/contact.html">Contact Us</a>
- | <a href="mailto:info@scriptics.com">info@scriptics.com</a>
-
- <SCRIPT LANGUAGE="Javascript">
-<!--
-         browser = (((navigator.appName == "Netscape") &&(parseInt(navigator.appVersion) >= 3 )) || ((navigator.appName =="Microsoft Internet Explorer") && (parseInt(navigator.appVersion) >= 4 )))
-
-  if ( browser )
-   {
-        over = new MakeImageArray(10)
-        over[0].src = "http://images.scriptics.com/images/ProductsMouseOff.gif"
-        over[1].src = "http://images.scriptics.com/images/CustomersMouseOff.gif"
-        over[2].src = "http://images.scriptics.com/images/PartnersMouseOff.gif"
-        over[3].src = "http://images.scriptics.com/images/ServicesMouseOff.gif"
-        over[4].src = "http://images.scriptics.com/images/ResourceMouseOff.gif"
-        over[5].src = "http://images.scriptics.com/images/CompanyMouseOff.gif"
-        over[6].src = "http://images.scriptics.com/images/homeMainRollover1.gif"
-        over[7].src = "http://images.scriptics.com/images/homeMainRollover2.gif"
-        over[8].src = "http://images.scriptics.com/images/homeMainRollover3.gif"
-        over[9].src = "http://images.scriptics.com/images/homeMainRollover3.gif"
-
-  }
-
-  function MakeImageArray(n)  {
-        this.length = n
-        for (var i = 0; i<=n; i++)="i++)" {="{" this[i]="this[i]" ="" new="new" Image()="Image()" }="}" return="return" this="this" }="}" //="//" --="--">
-  </SCRIPT><br>
-    <font size="2">
-    &copy; 1998-2000 Scriptics Corporation.  All rights reserved.
-    <a href="/legal_notice.html">Legal Notice</a> | <A href="" /privacy.html="/privacy.html">
-    Privacy Statement</a>
-    </td></tr></table></td></tr></table>
-</Body>
-</Html>
diff --git a/ext/tk/sample/tkextlib/tkHTML/page3/image1 b/ext/tk/sample/tkextlib/tkHTML/page3/image1
deleted file mode 100644
index 814d1e8f08..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page3/image1
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page3/image10 b/ext/tk/sample/tkextlib/tkHTML/page3/image10
deleted file mode 100644
index 45001faf05..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page3/image10
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page3/image11 b/ext/tk/sample/tkextlib/tkHTML/page3/image11
deleted file mode 100644
index 7c4c170f21..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page3/image11
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page3/image12 b/ext/tk/sample/tkextlib/tkHTML/page3/image12
deleted file mode 100644
index 903e7344a6..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page3/image12
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page3/image13 b/ext/tk/sample/tkextlib/tkHTML/page3/image13
deleted file mode 100644
index 226d4f68c2..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page3/image13
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page3/image14 b/ext/tk/sample/tkextlib/tkHTML/page3/image14
deleted file mode 100644
index 8e8c71814c..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page3/image14
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page3/image2 b/ext/tk/sample/tkextlib/tkHTML/page3/image2
deleted file mode 100644
index 2ddeb3258c..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page3/image2
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page3/image3 b/ext/tk/sample/tkextlib/tkHTML/page3/image3
deleted file mode 100644
index 1651ba7e41..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page3/image3
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page3/image4 b/ext/tk/sample/tkextlib/tkHTML/page3/image4
deleted file mode 100644
index b565c8dd0e..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page3/image4
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page3/image5 b/ext/tk/sample/tkextlib/tkHTML/page3/image5
deleted file mode 100644
index e1268b81c0..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page3/image5
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page3/image6 b/ext/tk/sample/tkextlib/tkHTML/page3/image6
deleted file mode 100644
index 1a6b260b40..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page3/image6
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page3/image7 b/ext/tk/sample/tkextlib/tkHTML/page3/image7
deleted file mode 100644
index cec7aa04d8..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page3/image7
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page3/image8 b/ext/tk/sample/tkextlib/tkHTML/page3/image8
deleted file mode 100644
index ad0d748d65..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page3/image8
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page3/image9 b/ext/tk/sample/tkextlib/tkHTML/page3/image9
deleted file mode 100644
index 46ade3018b..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page3/image9
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page3/index.html b/ext/tk/sample/tkextlib/tkHTML/page3/index.html
deleted file mode 100644
index a04470e659..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page3/index.html
+++ /dev/null
@@ -1,2787 +0,0 @@
-<html><body bgcolor="white">
-<hr>
-<h1 align="center">Embedding Tcl in C/C++ Applications</h1>
-
-    <table width="100%">
-    <tr><td valign="top" align="left" width="46%">
-    <b>Presented At:</b>
-  <blockquote>
-     The&nbsp;Tcl2K&nbsp;Conference<br>
-     Austin, Texas<br>
-     <nobr>9:00am, February 15, 2000</nobr><br>
-  </blockquote>
-    </td>
-    <td width="5%">&nbsp;</td>
-    <td valign="top" align="left" width="46%">
-    <b>Instructor:</b>
-  <blockquote>
-     D. Richard Hipp<br>
-     drh@hwaci.com<br>
-     http://www.hwaci.com/drh/<br>
-     704.948.4565
-  </blockquote>
-    </td></tr>
-    </table><p>
-  <center><table border="2">
-  <tr><td>
-  <p align="center">
-  Copies of these notes, example source code,<br>and other
-  resources related to this tutorial<br>are available online at
-  <a href="http://www.hwaci.com/tcl2k/">
-  http://www.hwaci.com/tcl2k/</a></p>
-  <p align="center"><small>$Id$</small></p></td></tr>
-  </table>
-  </center>
-</p>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">Tutorial Outline</h2>
-<p><ul><li>Introduction</li>
-<li>Building It Yourself</li>
-<ul><li>"Hello, World!" using Tcl</li>
-<li>Tcl scripts as C strings</li>
-<li>Adding new Tcl commands</li>
-<li>A tour of the Tcl API</li>
-<li>Tcl initialization scripts</li>
-<li>Adding Tk</li>
-</ul><li>Tools Survey</li>
-<li>Mktclapp</li>
-<ul><li>"Hello World" using mktclapp</li>
-<li>Adding C code</li>
-<li>Other Features</li>
-<li>Invoking Tcl from C</li>
-<li>Running mktclapp directly</li>
-<li>Real-world examples</li>
-</ul><li>Summary</li>
-</ul></p>
-<br clear="both"><p><hr></p>
-<h2 align="center">Embedding Tcl in C/C++ Applications</h2>
-<p><ul><li>You know how to program in Tcl/Tk</li></ul><ul><li>You know how to program in C/C++</li></ul><ul><li>This tutorial is about how to do both at the same time.</li></ul></p>
-<br clear="both"><p><hr></p>
-<h2 align="center">Why Mix C With Tcl/Tk?</h2>
-<p><ul><li>Use C for the things C is good at and Tcl for the things
-  Tcl is good at.</li></ul><ul><li>Generate standalone executables.
-  <ul><li>Eliminate the need to install Tcl/Tk.</li>
-  <li>Prevent problems when the wrong version of Tcl/Tk is installed.</li>
-  </ul></li></ul><ul><li>Prevent end users from changing the source code.
-  <ul><li>Keeps users from creating new bugs.</li>
-  <li>Protects proprietary code.</li>
-  </ul></li></ul><ul><li>Office politics</li></ul><ul><li>Use Tcl/Tk as a portability layer for a large C program</li></ul><ul><li>Use Tcl as a testing interface</li></ul></p>
-<br clear="both"><p><hr></p>
-<h2 align="center">Why Mix C With Tcl/Tk?</h2>
-<p><blockquote><big><b>
-  "Use C for the things C is good at and use Tcl/Tk for the things
-  Tcl/Tk is good at."
-  </b></blockquote></p><p>
-
-    <table width="100%">
-    <tr><td valign="top" align="left" width="46%">
-    <b>C is good at:</b>
-  <ul>
-  <li>Speed</li>
-  <li>Complex data structures</li>
-  <li>Computation</li>
-  <li>Interacting with hardware</li>
-  <li>Byte-by-byte data analysis</li>
-  </ul>
-    </td>
-    <td width="5%">&nbsp;</td>
-    <td valign="top" align="left" width="46%">
-    <b>Tcl/Tk is good at:</b>
-  <ul>
-  <li>Building a user interface</li>
-  <li>Manipulation of strings</li>
-  <li>Portability</li>
-  <li>Opening sockets</li>
-  <li>Handling events</li>
-  </ul>
-    </td></tr>
-    </table>
-<br clear="both"><p><hr></p>
-<h2 align="center">Programming Models</h2>
-<table width="100%">
-<tr><td valign="top" width="49%">
-
-  <p><b>Mainstream Tcl Programming Model:</b></p>
-</td>
-<td width="2%">&nbsp;</td>
-<td valign="top" width="49%">
-
-  <p><b>Embedded Tcl Programming Model:&nbsp;&nbsp;</b></p>
-</td></tr>
-<tr><td valign="top" width="49%">
-
-  <ul><li>Add bits of C code to a large Tcl program</li></ul>
-</td>
-<td width="2%">&nbsp;</td>
-<td valign="top" width="49%">
-
-  <ul><li>Add bits of Tcl code to a large C program</li></ul>
-</td></tr>
-<tr><td valign="top" width="49%">
-
-  <ul><li>Main Tcl script loads extensions written in C</li></ul>
-</td>
-<td width="2%">&nbsp;</td>
-<td valign="top" width="49%">
-
-  <ul><li>Main C procedure invokes the Tcl interpreter</li></ul>
-</td></tr>
-<tr><td valign="top" width="49%">
-
-  <ul><li>Tcl/Tk is a programming language</li></ul>
-</td>
-<td width="2%">&nbsp;</td>
-<td valign="top" width="49%">
-
-  <ul><li>Tcl/Tk is a C library</li></ul>
-</td></tr>
-<tr><td valign="top" width="49%">
-
-  <center><img src="image1"><br>
-  Most of the Tcl2K conference is about</center>
-</td>
-<td width="2%">&nbsp;</td>
-<td valign="top" width="49%">
-
-  <center><img src="image1"><br>
-  This tutorial is about</center>
-</td></tr>
-</table>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">"Hello, World!" Using The Tcl Library</h2>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>#include&nbsp;&lt;tcl.h></tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Always include &lt;tcl.h></td>
-</tr>
-<tr><td valign="center">
-<small><tt>int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
-&nbsp;&nbsp;Tcl_Interp&nbsp;*interp;</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;interp&nbsp;=&nbsp;Tcl_CreateInterp();</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Create a new Tcl interpreter</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;Tcl_Eval(interp,&nbsp;"puts&nbsp;{Hello,&nbsp;World!}");</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Execute a Tcl command.</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;return&nbsp;0;<br>
-}</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-</table>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">Compiling "Hello, World!"</h2>
-<p><p><b>Unix:</b></p>
-  <blockquote><tt>
-  $ gcc hello.c -ltcl -lm -ldl<br>
-  $ ./a.out<br>
-  Hello, World!</tt></blockquote>
-
-  <p><b>Windows using Cygwin:</b></p>
-  <blockquote><tt>
-  C:> gcc hello.c -ltcl80 -lm<br>
-  C:> a.exe<br>
-  Hello, World!</tt></blockquote>
-
-  <p><b>Windows using Mingw32:</b></p>
-  <blockquote><tt>
-  C:> gcc -mno-cygwin hello.c -ltcl82 -lm<br>
-  </tt></blockquote>
-<table><tr><td valign="top"><img src="image3"></td>
-<td valign="top"><b>Also works with VC++</b></td></tr></table></p>
-<br clear="both"><p><hr></p>
-<h2 align="center">Where Does <tt>-ltcl</tt> Come From On Unix?</h2>
-<p><p>Build it yourself using these steps:</p></p><p>
-<p><ul><li>Get tcl8.2.2.tar.gz from Scriptics</li></ul><ul><li><tt>zcat tcl8.2.2.tar.gz | tar vx </tt></li></ul><ul><li><tt>cd tcl8.2.2/unix</tt></li></ul><ul><li><tt>./configure --disable-shared</tt></li></ul><ul><li><tt>make</tt></li></ul><ul><li>Move <b>libtcl8.2.a</b> to your lib directory.</li></ul><ul><li>Copy <b>../generic/tcl.h</b> into /usr/include.</li></ul></p>
-<br clear="both"><p><hr></p>
-<h2 align="center">What Other Libraries Are Required For Unix?</h2>
-<p><ul><li>The sequence of <b>-l</b> options after <b>-ltcl</b>
-  varies from system to system</li></ul><ul><li>Observe what libraries the TCL makefile inserts when
-  it is building <b>tclsh</b></li></ul><ul><li>Examples in this talk are for RedHat Linux 6.0 for Intel</li></ul></p>
-<br clear="both"><p><hr></p>
-<h2 align="center">How To Compile Under Unix Without Installing Tcl</h2>
-<p><p>Specify the *.a file directly:</p>
-  <blockquote><pre>
-  $ gcc -I../tcl8.2.2/generic hello.c \
-      ../tcl8.2.2/unix/libtcl8.2.a -lm -ldl
-  $ strip a.out
-  $ ./a.out
-  Hello, World!</pre></blockquote>
-
-  <p>Or, tell the C compiler where to look for *.a files:</p>
-  <blockquote><pre>
-  $ gcc -I../tcl8.2.2/generic hello.c \
-      -L../tcl8.2.2/unix -ltcl -lm -ldl
-  $ strip a.out
-  $ ./a.out
-  Hello, World!</pre></blockquote>
-<table><tr><td valign="top"><img src="image3"></td>
-<td valign="top"><b>The <tt>-I../tcl8.2.2</tt> argument
-  tells the compiler where to
-  find <tt>&lt;tcl.h&gt;</tt>.</p></b></td></tr></table></p>
-<br clear="both"><p><hr></p>
-<h2 align="center">What's "Cygwin"?</h2>
-<p><ul><li>An implementation of GCC/G++ and all development tools
-  for Windows95/98/NT/2000</li></ul><ul><li>Available for free download at
-  <blockquote>
-  <tt>http://sourceware.cygnus.com/cygwin/</tt>
-  </blockquote></li></ul><ul><li>Also available shrink-wrapped at your local software retailer or
-  online at
-  <blockquote>
-  <tt>http://www.cygnus.com/cygwin/index.html</tt>
-  </blockquote></li></ul><ul><li>Programs compiled using Cygwin require a special
-  DLL (<b>cygwin1.dll</b>) that provides a POSIX system API</li></ul><ul><li>Cygwin1.dll cannot be shipped with proprietary programs
-  without purchasing a license from Cygnus.</li></ul><ul><li>Mingw32 is the same compiler as Cygwin, but generates
-  binaries that do not use cygwin1.dll</li></ul></p>
-<br clear="both"><p><hr></p>
-<h2 align="center">Where Does <tt>-ltcl82</tt> Come From On Windows?</h2>
-<p><p>Build it like this:</p></p><p>
-<p><ul><li>Get <b>tcl82.lib</b> and <b>tcl82.dll</b> from Scriptics.</li></ul><ul><li><tt>echo EXPORTS >tcl82.def</tt></li></ul><ul><li><tt>nm tcl82.lib | grep 'T _' | sed 's/.* T _//' >>tcl82.def</tt></li></ul><ul><li><tt>dlltool --def tcl82.def --dllname tcl82.dll --output-lib libtcl82.a</tt></li></ul><ul><li>Move <b>libtcl82.a</b> to the lib directory and <b>tcl82.dll</b>
-  to the bin directory.</li></ul></p>
-<br clear="both"><p><hr></p>
-<h2 align="center">Where Does Your Code Go?</h2>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>#include&nbsp;&lt;tcl.h><br>
-&nbsp;<br>
-int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
-&nbsp;&nbsp;Tcl_Interp&nbsp;*interp;<br>
-&nbsp;&nbsp;interp&nbsp;=&nbsp;Tcl_CreateInterp();</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;/*&nbsp;Your&nbsp;application&nbsp;code&nbsp;goes&nbsp;here&nbsp;*/</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Insert C code here to do whatever it is your program is
-  suppose to do</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;return&nbsp;0;<br>
-}</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-</table>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">Building A Simple TCLSH</h2>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>#include&nbsp;&lt;tcl.h><br>
-&nbsp;<br>
-int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
-&nbsp;&nbsp;Tcl_Interp&nbsp;*interp;<br>
-&nbsp;&nbsp;char&nbsp;*z;<br>
-&nbsp;&nbsp;char&nbsp;zLine[2000];<br>
-&nbsp;&nbsp;interp&nbsp;=&nbsp;Tcl_CreateInterp();</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;while(&nbsp;fgets(zLine,sizeof(zLine),stdin)&nbsp;){</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Get one line of input</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;&nbsp;&nbsp;Tcl_Eval(interp,&nbsp;zLine);</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Execute the input as Tcl.</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;&nbsp;&nbsp;z&nbsp;=&nbsp;Tcl_GetStringResult(interp);<br>
-&nbsp;&nbsp;&nbsp;&nbsp;if(&nbsp;z[0]&nbsp;){<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;printf("����P�X�\n",&nbsp;z);<br>
-&nbsp;&nbsp;&nbsp;&nbsp;}</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Print result if not empty</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;}<br>
-&nbsp;&nbsp;return&nbsp;0;<br>
-}</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-</table>
-<p><table><tr><td valign="top"><img src="image3"></td>
-<td valign="top"><b>What if user types more than 2000 characters?</b></td></tr></table>
-</p>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">Building A Simple TCLSH</h2>
-<p>Use TCL to handle input.  Allows input lines of unlimited length.</p><p>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>#include&nbsp;&lt;tcl.h><br>
-&nbsp;<br>
-/*&nbsp;Tcl&nbsp;code&nbsp;to&nbsp;implement&nbsp;the<br>
-**&nbsp;input&nbsp;loop&nbsp;*/<br>
-static&nbsp;char&nbsp;zLoop[]&nbsp;=&nbsp;<br>
-&nbsp;&nbsp;"while&nbsp;{![eof&nbsp;stdin]}&nbsp;{\n"</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;"&nbsp;&nbsp;set&nbsp;line&nbsp;[gets&nbsp;stdin]\n"</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Get one line of input</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;"&nbsp;&nbsp;set&nbsp;result&nbsp;[eval&nbsp;$line]\n"</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Execute input as Tcl</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;"&nbsp;&nbsp;if&nbsp;{$result!=\"\"}&nbsp;{puts&nbsp;$result}\n"</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Print result</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;"}\n"<br>
-;<br>
-&nbsp;<br>
-<br>
-int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
-&nbsp;&nbsp;Tcl_Interp&nbsp;*interp;<br>
-&nbsp;&nbsp;interp&nbsp;=&nbsp;Tcl_CreateInterp();</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;Tcl_Eval(interp,&nbsp;zLoop);</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Run the Tcl input loop</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;return&nbsp;0;<br>
-}</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-</table>
-<p><table><tr><td valign="top"><img src="image3"></td>
-<td valign="top"><b>But what about commands that span multiple lines of input?</b></td></tr></table>
-</p>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">Better Handling Of Command-Line Input</h2>
-<p>The file "input.tcl"</p><p>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>set&nbsp;line&nbsp;{}<br>
-while&nbsp;{![eof&nbsp;stdin]}&nbsp;{</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;if&nbsp;{$line!=""}&nbsp;{<br>
-&nbsp;&nbsp;&nbsp;&nbsp;puts&nbsp;-nonewline&nbsp;">&nbsp;"<br>
-&nbsp;&nbsp;}&nbsp;else&nbsp;{<br>
-&nbsp;&nbsp;&nbsp;&nbsp;puts&nbsp;-nonewline&nbsp;"%&nbsp;"<br>
-&nbsp;&nbsp;}<br>
-&nbsp;&nbsp;flush&nbsp;stdout</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Prompt for user input.  The prompt is normally &quot;%&quot;
-  but changes to &quot;&gt;&quot; if the current line is a continuation.</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;append&nbsp;line&nbsp;[gets&nbsp;stdin]<br>
-&nbsp;&nbsp;if&nbsp;{[info&nbsp;complete&nbsp;$line]}&nbsp;{</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;{[catch&nbsp;{uplevel&nbsp;#0&nbsp;$line}&nbsp;result]}&nbsp;{</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">If the command is complete, execute it.</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;puts&nbsp;stderr&nbsp;"Error:&nbsp;$result"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;}&nbsp;elseif&nbsp;{$result!=""}&nbsp;{<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;puts&nbsp;$result<br>
-&nbsp;&nbsp;&nbsp;&nbsp;}<br>
-&nbsp;&nbsp;&nbsp;&nbsp;set&nbsp;line&nbsp;{}</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;}&nbsp;else&nbsp;{<br>
-&nbsp;&nbsp;&nbsp;&nbsp;append&nbsp;line&nbsp;\n<br>
-&nbsp;&nbsp;}</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">If the command is incomplete, append a newline and get
-  another line of text.</td>
-</tr>
-<tr><td valign="center">
-<small><tt>}</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-</table>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">Better Handling Of Command-Line Input</h2>
-<p>The file "input.c"</p><p>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>#include&nbsp;&lt;tcl.h><br>
-&nbsp;<br>
-int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
-&nbsp;&nbsp;Tcl_Interp&nbsp;*interp;<br>
-&nbsp;&nbsp;interp&nbsp;=&nbsp;Tcl_CreateInterp();</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;Tcl_Eval(interp,&nbsp;"source&nbsp;input.tcl");</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Read and execute the input loop</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;return&nbsp;0;<br>
-}</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-</table>
-<p><table><tr><td valign="top"><img src="image3"></td>
-<td valign="top"><b>But now the program is not standalone!</b></td></tr></table>
-</p>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">Converting Scripts Into C Strings</h2>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>static&nbsp;char&nbsp;zInputLoop[]&nbsp;=&nbsp;<br>
-&nbsp;&nbsp;"set&nbsp;line&nbsp;{}\n"<br>
-&nbsp;&nbsp;"while&nbsp;{![eof&nbsp;stdin]}&nbsp;{\n"<br>
-&nbsp;&nbsp;"&nbsp;&nbsp;if&nbsp;{$line!=\"\"}&nbsp;{\n"<br>
-&nbsp;&nbsp;"&nbsp;&nbsp;&nbsp;&nbsp;puts&nbsp;-nonewline&nbsp;\">&nbsp;\"\n"<br>
-&nbsp;&nbsp;"&nbsp;&nbsp;}&nbsp;else&nbsp;{\n"<br>
-&nbsp;&nbsp;"&nbsp;&nbsp;&nbsp;&nbsp;puts&nbsp;-nonewline&nbsp;\"%&nbsp;\"\n"<br>
-&nbsp;&nbsp;"&nbsp;&nbsp;}\n"<br>
-&nbsp;&nbsp;"&nbsp;&nbsp;flush&nbsp;stdout\n"<br>
-&nbsp;&nbsp;"&nbsp;&nbsp;append&nbsp;line&nbsp;[gets&nbsp;stdin]\n"<br>
-&nbsp;&nbsp;"&nbsp;&nbsp;if&nbsp;{[info&nbsp;complete&nbsp;$line]}&nbsp;{\n"<br>
-&nbsp;&nbsp;"&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;{[catch&nbsp;{uplevel&nbsp;#0&nbsp;$line}&nbsp;result]}&nbsp;{\n"<br>
-&nbsp;&nbsp;"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;puts&nbsp;stderr&nbsp;\"Error:&nbsp;$result\"\n"<br>
-&nbsp;&nbsp;"&nbsp;&nbsp;&nbsp;&nbsp;}&nbsp;elseif&nbsp;{$result!=\"\"}&nbsp;{\n"<br>
-&nbsp;&nbsp;"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;puts&nbsp;$result\n"<br>
-&nbsp;&nbsp;"&nbsp;&nbsp;&nbsp;&nbsp;}\n"<br>
-&nbsp;&nbsp;"&nbsp;&nbsp;&nbsp;&nbsp;set&nbsp;line&nbsp;{}\n"<br>
-&nbsp;&nbsp;"&nbsp;&nbsp;}&nbsp;else&nbsp;{\n"<br>
-&nbsp;&nbsp;"&nbsp;&nbsp;&nbsp;&nbsp;append&nbsp;line&nbsp;\\n\n"<br>
-&nbsp;&nbsp;"&nbsp;&nbsp;}\n"<br>
-&nbsp;&nbsp;"}\n"<br>
-;</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-</table>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">Compile Tcl Scripts Into C Programs</h2>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>#include&nbsp;&lt;tcl.h><br>
-</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt><br>
-static&nbsp;char&nbsp;zInputLoop[]&nbsp;=&nbsp;<br>
-&nbsp;&nbsp;/*&nbsp;Actual&nbsp;code&nbsp;omitted&nbsp;*/<br>
-;</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Copy and paste the converted Tcl script here</td>
-</tr>
-<tr><td valign="center">
-<small><tt><br>
-int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
-&nbsp;&nbsp;Tcl_Interp&nbsp;*interp;<br>
-&nbsp;&nbsp;interp&nbsp;=&nbsp;Tcl_CreateInterp();</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;Tcl_Eval(interp,&nbsp;zInputLoop);</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Execute the Tcl code</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;return&nbsp;0;<br>
-}</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-</table>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">Converting Scripts To Strings<br>Using SED Or TCLSH</h2>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>sed&nbsp;-e&nbsp;'s/\\/\\\\/g'&nbsp;\&nbsp;</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Convert <b>\</b> into <b>\\</b></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;-e&nbsp;'s/"/\\"/g'&nbsp;\&nbsp;</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Convert <b>"</b> into <b>\"</b></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;-e&nbsp;'s/^/&nbsp;&nbsp;"/'&nbsp;\&nbsp;</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Add <b>"</b> to start of each line</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;-e&nbsp;'s/$/\\n"/'&nbsp;input.tcl</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Add <b>\n"</b> to end of each line</td>
-</tr>
-<tr><td valign="center">
-<small><tt><br>
-&nbsp;<br>
-<br>
-&nbsp;<br>
-<br>
-while&nbsp;{![eof&nbsp;stdin]}&nbsp;{<br>
-&nbsp;&nbsp;set&nbsp;line&nbsp;[gets&nbsp;stdin]</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;regsub&nbsp;-all&nbsp;{\}&nbsp;$line&nbsp;{&amp;&amp;}&nbsp;line</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Convert <b>\</b> into <b>\\</b></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;regsub&nbsp;-all&nbsp;{"}&nbsp;$line&nbsp;{\"}&nbsp;line</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Convert <b>"</b> into <b>\"</b></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;puts&nbsp;"\"$line\\n\""</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Add <b>"</b> in front and <b>\n"</b> at the end</td>
-</tr>
-<tr><td valign="center">
-<small><tt>}</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-</table>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">Converting Scripts Into C Strings</h2>
-<p>You may want to save space by removing comments and extra whitespace
-  from scripts.</p><p>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>static&nbsp;char&nbsp;zInputLoop[]&nbsp;=&nbsp;<br>
-&nbsp;&nbsp;"set&nbsp;line&nbsp;{}\n"<br>
-&nbsp;&nbsp;"while&nbsp;{![eof&nbsp;stdin]}&nbsp;{\n"<br>
-&nbsp;&nbsp;"if&nbsp;{$line!=\"\"}&nbsp;{\n"<br>
-&nbsp;&nbsp;"puts&nbsp;-nonewline&nbsp;\">&nbsp;\"\n"<br>
-&nbsp;&nbsp;"}&nbsp;else&nbsp;{\n"<br>
-&nbsp;&nbsp;"puts&nbsp;-nonewline&nbsp;\"%&nbsp;\"\n"<br>
-&nbsp;&nbsp;"}\n"<br>
-&nbsp;&nbsp;"flush&nbsp;stdout\n"<br>
-&nbsp;&nbsp;"append&nbsp;line&nbsp;[gets&nbsp;stdin]\n"<br>
-&nbsp;&nbsp;"if&nbsp;{[info&nbsp;complete&nbsp;$line]}&nbsp;{\n"<br>
-&nbsp;&nbsp;"if&nbsp;{[catch&nbsp;{uplevel&nbsp;#0&nbsp;$line}&nbsp;result]}&nbsp;{\n"<br>
-&nbsp;&nbsp;"puts&nbsp;stderr&nbsp;\"Error:&nbsp;$result\"\n"<br>
-&nbsp;&nbsp;"}&nbsp;elseif&nbsp;{$result!=\"\"}&nbsp;{\n"<br>
-&nbsp;&nbsp;"puts&nbsp;$result\n"<br>
-&nbsp;&nbsp;"}\n"<br>
-&nbsp;&nbsp;"set&nbsp;line&nbsp;{}\n"<br>
-&nbsp;&nbsp;"}&nbsp;else&nbsp;{\n"<br>
-&nbsp;&nbsp;"append&nbsp;line&nbsp;\\n\n"<br>
-&nbsp;&nbsp;"}\n"<br>
-&nbsp;&nbsp;"}\n"<br>
-;</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-</table>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">Converting Scripts To Strings</h2>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>sed&nbsp;-e&nbsp;'s/\\/\\\\/g'&nbsp;\&nbsp;<br>
-&nbsp;&nbsp;-e&nbsp;'s/"/\\"/g'&nbsp;\&nbsp;</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;-e&nbsp;'/^&nbsp;*#/d'&nbsp;\&nbsp;</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Delete lines that begin with #</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;-e&nbsp;'/^&nbsp;*$/d'&nbsp;\&nbsp;</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Delete blank lines</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;-e&nbsp;'s/^&nbsp;*/&nbsp;&nbsp;"/'&nbsp;\&nbsp;</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Delete leading spaces</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;-e&nbsp;'s/$/\\n"/'&nbsp;input.tcl<br>
-&nbsp;<br>
-<br>
-&nbsp;<br>
-<br>
-&nbsp;<br>
-while&nbsp;{![eof&nbsp;stdin]}&nbsp;{<br>
-&nbsp;&nbsp;set&nbsp;line&nbsp;[gets&nbsp;stdin]</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;set&nbsp;line&nbsp;[string&nbsp;trimleft&nbsp;$line]</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Remove leading space</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;if&nbsp;{$line==""}&nbsp;continue</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Delete blank lines</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;if&nbsp;{[string&nbsp;index&nbsp;$line&nbsp;0]=="#"}&nbsp;{<br>
-&nbsp;&nbsp;&nbsp;&nbsp;continue<br>
-&nbsp;&nbsp;}</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Delete lines starting with #</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;regsub&nbsp;-all&nbsp;{\}&nbsp;$line&nbsp;{&amp;&amp;}&nbsp;line<br>
-&nbsp;&nbsp;regsub&nbsp;-all&nbsp;{"}&nbsp;$line&nbsp;{\"}&nbsp;line<br>
-&nbsp;&nbsp;puts&nbsp;"\"$line\\n\""<br>
-}</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-</table>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">Removing Comments Or Leading Space<br>Will Break Some Tcl Scripts!</h2>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>image&nbsp;create&nbsp;bitmap&nbsp;smiley&nbsp;-data&nbsp;{</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>#define&nbsp;smile_width&nbsp;15<br>
-#define&nbsp;smile_height&nbsp;15</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">These lines begin with # but are not comment</td>
-</tr>
-<tr><td valign="center">
-<small><tt>static&nbsp;unsigned&nbsp;char&nbsp;smile_bits[]&nbsp;=&nbsp;{<br>
-&nbsp;&nbsp;&nbsp;0xc0,&nbsp;0x01,&nbsp;0x30,&nbsp;0x06,&nbsp;0x0c,&nbsp;0x18,<br>
-&nbsp;&nbsp;&nbsp;0x04,&nbsp;0x10,&nbsp;0x22,&nbsp;0x22,&nbsp;0x52,&nbsp;0x25,<br>
-&nbsp;&nbsp;&nbsp;0x01,&nbsp;0x40,&nbsp;0x01,&nbsp;0x40,&nbsp;0x01,&nbsp;0x40,<br>
-&nbsp;&nbsp;&nbsp;0x12,&nbsp;0x24,&nbsp;0xe2,&nbsp;0x23,&nbsp;0x04,&nbsp;0x10,<br>
-&nbsp;&nbsp;&nbsp;0x0c,&nbsp;0x18,&nbsp;0x30,&nbsp;0x06,&nbsp;0xc0,&nbsp;0x01};<br>
-}<br>
-&nbsp;<br>
-<br>
-&nbsp;<br>
-text&nbsp;.t<br>
-pack&nbsp;.t<br>
-.t&nbsp;insert&nbsp;end&nbsp;[string&nbsp;trim&nbsp;{</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>She&nbsp;walks&nbsp;in&nbsp;beauty,&nbsp;like&nbsp;the&nbsp;night<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Of&nbsp;cloudless&nbsp;climes&nbsp;and&nbsp;starry&nbsp;skies;<br>
-And&nbsp;all&nbsp;that's&nbsp;best&nbsp;of&nbsp;dark&nbsp;and&nbsp;bright<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Meet&nbsp;in&nbsp;her&nbsp;aspect&nbsp;and&nbsp;her&nbsp;eyes;</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Indentation is deleted on lines 2
-  and 4</td>
-</tr>
-<tr><td valign="center">
-<small><tt>}]&nbsp;<br>
-&nbsp;<br>
-</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-</table>
-<p><table><tr><td valign="top"><img src="image3"></td>
-<td valign="top"><b>Problems like these are rare</b></td></tr></table>
-</p>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">Adding A "continue" Command</h2>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>set&nbsp;line&nbsp;{}<br>
-while&nbsp;{![eof&nbsp;stdin]}&nbsp;{<br>
-&nbsp;&nbsp;if&nbsp;{$line!=""}&nbsp;{<br>
-&nbsp;&nbsp;&nbsp;&nbsp;puts&nbsp;-nonewline&nbsp;">&nbsp;"<br>
-&nbsp;&nbsp;}&nbsp;else&nbsp;{<br>
-&nbsp;&nbsp;&nbsp;&nbsp;puts&nbsp;-nonewline&nbsp;"%&nbsp;"<br>
-&nbsp;&nbsp;}<br>
-&nbsp;&nbsp;flush&nbsp;stdout<br>
-&nbsp;&nbsp;append&nbsp;line&nbsp;[gets&nbsp;stdin]<br>
-&nbsp;&nbsp;if&nbsp;{[info&nbsp;complete&nbsp;$line]}&nbsp;{</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;{[lindex&nbsp;$line&nbsp;0]=="continue"}&nbsp;{<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;break;</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Break out of the loop if the command
-  is "continue"</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;&nbsp;&nbsp;}&nbsp;elseif&nbsp;{[catch&nbsp;{uplevel&nbsp;#0&nbsp;$line}&nbsp;result]}&nbsp;{<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;puts&nbsp;stderr&nbsp;"Error:&nbsp;$result"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;}&nbsp;elseif&nbsp;{$result!=""}&nbsp;{<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;puts&nbsp;$result<br>
-&nbsp;&nbsp;&nbsp;&nbsp;}<br>
-&nbsp;&nbsp;&nbsp;&nbsp;set&nbsp;line&nbsp;{}<br>
-&nbsp;&nbsp;}&nbsp;else&nbsp;{<br>
-&nbsp;&nbsp;&nbsp;&nbsp;append&nbsp;line&nbsp;\n<br>
-&nbsp;&nbsp;}<br>
-}</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-</table>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">Stop For Tcl Input At Various Points<br>In A C Program</h2>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>#include&nbsp;&lt;tcl.h><br>
-&nbsp;<br>
-static&nbsp;char&nbsp;zInputLoop[]&nbsp;=&nbsp;<br>
-&nbsp;&nbsp;/*&nbsp;Tcl&nbsp;Input&nbsp;loop&nbsp;as&nbsp;a&nbsp;C&nbsp;string&nbsp;*/<br>
-;<br>
-&nbsp;<br>
-int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
-&nbsp;&nbsp;Tcl_Interp&nbsp;*interp;<br>
-&nbsp;&nbsp;interp&nbsp;=&nbsp;Tcl_CreateInterp();</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;/*&nbsp;Application&nbsp;C&nbsp;code&nbsp;*/</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Do some computation</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;Tcl_Eval(interp,&nbsp;zInputLoop);</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Stop for some Tcl input</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;/*&nbsp;More&nbsp;application&nbsp;C&nbsp;code&nbsp;*/</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Do more computation</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;Tcl_Eval(interp,&nbsp;zInputLoop);</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Stop for more Tcl input</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;/*&nbsp;Finish&nbsp;up&nbsp;the&nbsp;application&nbsp;*/</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Finish the computation</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;return&nbsp;0;<br>
-}</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-</table>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">Using Tcl For Testing</h2>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>#include&nbsp;&lt;tcl.h><br>
-&nbsp;<br>
-static&nbsp;char&nbsp;zInputLoop[]&nbsp;=&nbsp;<br>
-&nbsp;&nbsp;/*&nbsp;Tcl&nbsp;Input&nbsp;loop&nbsp;as&nbsp;a&nbsp;C&nbsp;string&nbsp;*/<br>
-;<br>
-&nbsp;<br>
-</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
-#ifdef&nbsp;TESTING<br>
-&nbsp;&nbsp;Tcl_Interp&nbsp;*interp;</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Create interpreter only if TESTING
- is defined</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;interp&nbsp;=&nbsp;Tcl_CreateInterp();<br>
-#endif<br>
-&nbsp;&nbsp;/*&nbsp;Application&nbsp;C&nbsp;code&nbsp;*/</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>#ifdef&nbsp;TESTING<br>
-&nbsp;&nbsp;Tcl_Eval(interp,&nbsp;zInputLoop);<br>
-#endif</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Accept command-line input only if TESTING
-  is defined</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;/*&nbsp;More&nbsp;application&nbsp;C&nbsp;code&nbsp;*/<br>
-#ifdef&nbsp;TESTING<br>
-&nbsp;&nbsp;Tcl_Eval(interp,&nbsp;zInputLoop);<br>
-#endif<br>
-&nbsp;&nbsp;/*&nbsp;Finish&nbsp;up&nbsp;the&nbsp;application&nbsp;*/<br>
-&nbsp;&nbsp;return&nbsp;0;<br>
-}</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-</table>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">Creating A New Tcl Command In C</h2>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>#include&nbsp;&lt;tcl.h><br>
-&nbsp;<br>
-int&nbsp;NewCmd(</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;void&nbsp;*clientData,<br>
-&nbsp;&nbsp;Tcl_Interp&nbsp;*interp,<br>
-&nbsp;&nbsp;int&nbsp;argc,<br>
-&nbsp;&nbsp;char&nbsp;**argv</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">The Tcl command is implemented as
-  a C function with four arguments.</td>
-</tr>
-<tr><td valign="center">
-<small><tt>){<br>
-&nbsp;&nbsp;printf("Hello,&nbsp;World!\n");</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;return&nbsp;TCL_OK;</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Returns TCL_OK or TCL_ERROR</td>
-</tr>
-<tr><td valign="center">
-<small><tt>}<br>
-&nbsp;<br>
-static&nbsp;char&nbsp;zInputLoop[]&nbsp;=&nbsp;<br>
-&nbsp;&nbsp;/*&nbsp;Tcl&nbsp;code&nbsp;omitted...&nbsp;*/<br>
-;<br>
-&nbsp;<br>
-int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
-&nbsp;&nbsp;Tcl_Interp&nbsp;*interp;<br>
-&nbsp;&nbsp;interp&nbsp;=&nbsp;Tcl_CreateInterp();</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;Tcl_CreateCommand(interp,&nbsp;"helloworld",<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;NewCmd,&nbsp;0,&nbsp;0);</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Tell the interpreter which C function to call when the
-  "helloworld" Tcl command is executed</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;Tcl_Eval(interp,&nbsp;zInputLoop);<br>
-&nbsp;&nbsp;return&nbsp;0;<br>
-}</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-</table>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">Linkage From Tcl To C</h2>
-<p><p align="center"><img src="image4"></p></p><p><ul><li>3rd parameter of Tcl_CreateCommand() is a pointer to the C subroutine
- that implements the command.</li></ul><ul><li>4th parameter to Tcl_CreateCommand() becomes the 1st parameter to
- the C routine whenever the Tcl command is executed.</li></ul><ul><li>1st parameter to Tcl_CreateCommand() must be a valid Tcl interpreter.
- The same pointer appears as the second parameter to the C routine
- whenever the Tcl command is executed.</li></ul></p>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">Linkage From Tcl To C</h2>
-<p><p align="center"><img src="image5"></p></p><p><ul><li>5th parameter of Tcl_CreateCommand() is a pointer to the C subroutine
- that is called when the Tcl command is deleted.</li></ul><ul><li>4th parameter to Tcl_CreateCommand() becomes the 1st parameter to
- the C routine.</li></ul></p>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">When To Use A Delete Proc</h2>
-<p>Examples of where the delete proc is used in standard Tcl/Tk:</p><p>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>button&nbsp;.b&nbsp;-text&nbsp;Hello<br>
-pack&nbsp;.b</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>rename&nbsp;.b&nbsp;{}</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Deleting the <b>.b</b> command causes the button to be destroyed</td>
-</tr>
-<tr><td valign="center">
-<small><tt><br>
-&nbsp;<br>
-</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>image&nbsp;create&nbsp;photo&nbsp;smiley&nbsp;\&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;-file&nbsp;smiley.gif</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>rename&nbsp;smiley&nbsp;{}</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Deleting the <b>smiley</b> command destroys the image and reclaims the
-  memory used to hold the image</td>
-</tr>
-</table>
-<p><ul><li>Always use a delete proc if the clientData is a pointer to
-  malloced memory or some other resource that needs freeing</li></ul><ul><li>Delete procs are never used in the Tcl core but are used
-  extensively in Tk</li></ul></p>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">Linkage From Tcl To C</h2>
-<p>The <tt>argc</tt> and <tt>argv</tt> parameters work just like in
- <tt>main()</tt></p><p>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>helloworld&nbsp;one&nbsp;{two&nbsp;three}&nbsp;four</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><tt>argc = 4<br>
-  argv[0] = "helloworld"<br>
-  argv[1] = "one"<br>
-  argv[2] = "two three"<br>
-  argv[3] = "four"<br>
-  argv[4] = NULL</tt></td>
-</tr>
-</table>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">A Short-Cut</h2>
-<p>In a program with many new Tcl commands implemented in C, it becomes
-  tedious to type the same four parameters over and over again.  So
-  we define a short-cut.</p><p>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>#define&nbsp;TCLARGS&nbsp;\&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;void&nbsp;*clientData,&nbsp;\&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Tcl_Interp&nbsp;*interp,&nbsp;\&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;int&nbsp;argc,&nbsp;\&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;char&nbsp;*argv</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Define TCLARGS once in a header file</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;<br>
-&nbsp;<br>
-&nbsp;</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>int&nbsp;NewCmd(TCLARGS){</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Use the TCLARGS macro to define new C functions
-  that implement Tcl commands.</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;&nbsp;/*&nbsp;implementation...&nbsp;*/<br>
-}</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-</table>
-<p><table><tr><td valign="top"><img src="image3"></td>
-<td valign="top"><b>For brevity, we will use the TCLARGS macro during the
-  rest of this talk.</b></td></tr></table>
-</p>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">Returning A Value From C Back To Tcl</h2>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>int&nbsp;NewCmd(TCLARGS){</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Note that the C function returns an "int"</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;return&nbsp;TCL_OK;</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Return value is TCL_OK or TCL_ERROR</td>
-</tr>
-<tr><td valign="center">
-<small><tt>}</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-</table>
-<p><ul><li>TCL_OK and TCL_ERROR are defined in &lt;tcl.h&gt;</li></ul><ul><li>Other valid return values TCL_RETURN, TCL_BREAK and TCL_CONTINUE
-  are rarely used</li></ul><ul><li>Common mistake: forgetting to return TCL_OK</li></ul></p>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">Returning A Value From C Back To Tcl</h2>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>int&nbsp;NewCmd(TCLARGS){</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;Tcl_SetResult(interp,"Hello!",TCL_STATIC);</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Set the result to "Hello!"</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;return&nbsp;TCL_OK;<br>
-}</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-</table>
-<p><ul><li>Result should be the text of an error message if you
-  return TCL_ERROR.</li></ul><ul><li>3rd argument to Tcl_SetResult() can be TCL_STATIC,
-  TCL_DYNAMIC, TCL_VOLATILE, or a function pointer.</li></ul><ul><li>Also consider using Tcl_AppendResult().</li></ul><ul><li>Direct access to <tt>interp->result</tt> is deprecated.</li></ul><ul><li>See the man pages for details.</li></ul></p>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">The Tcl_Obj Interface</h2>
-<p><ul><li>A new way to write Tcl commands in C code</li></ul><ul><li>First introduced in Tcl8.0</li></ul><ul><li>Can be much faster, especially for lists or numeric values.</li></ul><ul><li>Able to handle arbitrary binary data.</li></ul><ul><li>More difficult to program.</li></ul></p>
-<br clear="both"><p><hr></p>
-<h2 align="center">The Tcl_Obj Interface</h2>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>int&nbsp;NewObjCmd(<br>
-&nbsp;&nbsp;void&nbsp;*clientData,<br>
-&nbsp;&nbsp;Tcl_Interp&nbsp;*interp,<br>
-&nbsp;&nbsp;int&nbsp;objc,</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;Tcl_Obj&nbsp;*const*&nbsp;objv</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">4th parameter is an array Tcl_Objs, not an array of strings</td>
-</tr>
-<tr><td valign="center">
-<small><tt>){<br>
-&nbsp;&nbsp;/*&nbsp;Implementation...&nbsp;*/<br>
-&nbsp;&nbsp;return&nbsp;TCL_OK;<br>
-}<br>
-&nbsp;<br>
-static&nbsp;char&nbsp;zInputLoop[]&nbsp;=&nbsp;<br>
-&nbsp;&nbsp;/*&nbsp;Tcl&nbsp;code&nbsp;omitted...&nbsp;*/<br>
-;<br>
-&nbsp;<br>
-int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
-&nbsp;&nbsp;Tcl_Interp&nbsp;*interp;<br>
-&nbsp;&nbsp;interp&nbsp;=&nbsp;Tcl_CreateInterp();</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;Tcl_CreateObjCommand(interp,&nbsp;"newcmd",<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;NewObjCmd,&nbsp;0,&nbsp;0);</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Use a different function to register the command</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;Tcl_Eval(interp,&nbsp;zInputLoop);<br>
-&nbsp;&nbsp;return&nbsp;0;<br>
-}</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-</table>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">The Tcl_Obj Interface</h2>
-<p><ul><li>There are countless access methods for reading information from and
-  placing information in Tcl_Objs.  Always use the access methods.</li></ul><ul><li>Details provided at Lee Bernhard's talk this afternoon.</li></ul><ul><li>Definitely use Tcl_Objs if you are writing a new Tcl extension.</li></ul><ul><li>Tcl_Objs address some of the weaknesses of Tcl relative to C/C++.
-  <ul>
-  <li> Tcl_Objs are faster </li>
-  <li> Tcl_Objs work with binary data </li>
-  </ul>
-  But C/C++ is faster still and better for working with binary data.</li></ul><ul><li>When mixing C/C++ with Tcl/Tk the benefits of Tcl_Objs are
-  less important.  Using Tcl_Objs in this context may not be
-  worth the extra trouble.</li></ul><ul><li>This talk will focus on the string interface.</li></ul></p>
-<br clear="both"><p><hr></p>
-<h2 align="center">Nickel Tour Of The Tcl API</h2>
-<p><p><b>Memory allocation functions</b></p>
-<center><table width="90%"><tr>
-<td width="32%" valign="top"><small><tt>
-  Tcl_Alloc<br>
-</tt></small></td>
-<td width="32%" valign="top"><small><tt>
-  Tcl_Free<br>
-</tt></small></td>
-<td width="32%" valign="top"><small><tt>
-  Tcl_Realloc<br>
-</tt></small></td>
-</table></center><p><b>Functions useful in the implementation of new  Tcl commands</b></p>
-<center><table width="90%"><tr>
-<td width="32%" valign="top"><small><tt>
-  Tcl_AppendElement<br>
-  Tcl_AppendResult<br>
-  Tcl_GetBoolean<br>
-</tt></small></td>
-<td width="32%" valign="top"><small><tt>
-  Tcl_GetDouble<br>
-  Tcl_GetInt<br>
-  Tcl_GetStringResult<br>
-</tt></small></td>
-<td width="32%" valign="top"><small><tt>
-  Tcl_ResetResult<br>
-  Tcl_SetResult<br>
-</tt></small></td>
-</table></center><p><b>Functions for controlling the Tcl interpreter</b></p>
-<center><table width="90%"><tr>
-<td width="32%" valign="top"><small><tt>
-  Tcl_CreateCommand<br>
-  Tcl_CreateInterp<br>
-</tt></small></td>
-<td width="32%" valign="top"><small><tt>
-  Tcl_CreateObjCommand<br>
-  Tcl_DeleteCommand<br>
-</tt></small></td>
-<td width="32%" valign="top"><small><tt>
-  Tcl_DeleteInterp<br>
-  Tcl_Exit<br>
-</tt></small></td>
-</table></center></p>
-<br clear="both"><p><hr></p>
-<h2 align="center">Nickel Tour Of The Tcl API</h2>
-<p><p><b>I/O functions</b></p>
-<center><table width="90%"><tr>
-<td width="32%" valign="top"><small><tt>
-  Tcl_Close<br>
-  Tcl_Eof<br>
-  Tcl_Flush<br>
-  Tcl_GetChannel<br>
-  Tcl_GetChannelMode<br>
-  Tcl_GetChannelName<br>
-</tt></small></td>
-<td width="32%" valign="top"><small><tt>
-  Tcl_Gets<br>
-  Tcl_OpenCommandChannel<br>
-  Tcl_OpenFileChannel<br>
-  Tcl_OpenTcpClient<br>
-  Tcl_OpenTcpServer<br>
-  Tcl_Read<br>
-</tt></small></td>
-<td width="32%" valign="top"><small><tt>
-  Tcl_Seek<br>
-  Tcl_Tell<br>
-  Tcl_Ungets<br>
-  Tcl_Write<br>
-  Tcl_WriteChars<br>
-</tt></small></td>
-</table></center><p><b>Names and meanings of system error codes</b></p>
-<center><table width="90%"><tr>
-<td width="32%" valign="top"><small><tt>
-  Tcl_ErrnoId<br>
-  Tcl_ErrnoMsg<br>
-</tt></small></td>
-<td width="32%" valign="top"><small><tt>
-  Tcl_GetErrno<br>
-  Tcl_SetErrno<br>
-</tt></small></td>
-<td width="32%" valign="top"><small><tt>
-  Tcl_SignalId<br>
-  Tcl_SignalMsg<br>
-</tt></small></td>
-</table></center></p>
-<br clear="both"><p><hr></p>
-<h2 align="center">Nickel Tour Of The Tcl API</h2>
-<p><p><b>General Operating System Calls</b></p>
-<center><table width="90%"><tr>
-<td width="32%" valign="top"><small><tt>
-  Tcl_Access<br>
-  Tcl_Chdir<br>
-  Tcl_GetCwd<br>
-</tt></small></td>
-<td width="32%" valign="top"><small><tt>
-  Tcl_GetHostName<br>
-  Tcl_GetNameOfExecutable<br>
-  Tcl_Sleep<br>
-</tt></small></td>
-<td width="32%" valign="top"><small><tt>
-  Tcl_Stat<br>
-</tt></small></td>
-</table></center><p><b>String Manipulation And Comparison</b></p>
-<center><table width="90%"><tr>
-<td width="32%" valign="top"><small><tt>
-  Tcl_Concat<br>
-  Tcl_Merge<br>
-</tt></small></td>
-<td width="32%" valign="top"><small><tt>
-  Tcl_SplitList<br>
-  Tcl_StringCaseMatch<br>
-</tt></small></td>
-<td width="32%" valign="top"><small><tt>
-  Tcl_StringMatch<br>
-</tt></small></td>
-</table></center><p><b>Dynamically Resizable Strings</b></p>
-<center><table width="90%"><tr>
-<td width="49%" valign="top"><small><tt>
-  Tcl_DStringAppend<br>
-  Tcl_DStringAppendElement<br>
-  Tcl_DStringEndSublist<br>
-  Tcl_DStringInit<br>
-  Tcl_DStringLength<br>
-</tt></small></td>
-<td width="49%" valign="top"><small><tt>
-  Tcl_DStringResult<br>
-  Tcl_DStringSetLength<br>
-  Tcl_DStringStartSublist<br>
-  Tcl_DStringValue<br>
-</tt></small></td>
-</table></center></p>
-<br clear="both"><p><hr></p>
-<h2 align="center">Nickel Tour Of The Tcl API</h2>
-<p><p><b>Event Handlers</b></p>
-<center><table width="90%"><tr>
-<td width="49%" valign="top"><small><tt>
-  Tcl_CancelIdleCall<br>
-  Tcl_CreateChannelHandler<br>
-  Tcl_CreateTimerHandler<br>
-  Tcl_DeleteChannelHandler<br>
-</tt></small></td>
-<td width="49%" valign="top"><small><tt>
-  Tcl_DeleteTimerHandler<br>
-  Tcl_DoOneEvent<br>
-  Tcl_DoWhenIdle<br>
-</tt></small></td>
-</table></center><p><b>Functions For Reading And Writing Tcl Variables</b></p>
-<center><table width="90%"><tr>
-<td width="32%" valign="top"><small><tt>
-  Tcl_GetVar<br>
-  Tcl_GetVar2<br>
-  Tcl_LinkVar<br>
-  Tcl_SetVar<br>
-  Tcl_SetVar2<br>
-</tt></small></td>
-<td width="32%" valign="top"><small><tt>
-  Tcl_TraceVar<br>
-  Tcl_TraceVar2<br>
-  Tcl_UnlinkVar<br>
-  Tcl_UnsetVar<br>
-  Tcl_UnsetVar2<br>
-</tt></small></td>
-<td width="32%" valign="top"><small><tt>
-  Tcl_UntraceVar<br>
-  Tcl_UntraceVar2<br>
-  Tcl_UpdateLinkedVar<br>
-</tt></small></td>
-</table></center><p><b>Functions For Executing Tcl Code</b></p>
-<center><table width="90%"><tr>
-<td width="32%" valign="top"><small><tt>
-  Tcl_Eval<br>
-  Tcl_EvalFile<br>
-</tt></small></td>
-<td width="32%" valign="top"><small><tt>
-  Tcl_EvalObj<br>
-  Tcl_GlobalEval<br>
-</tt></small></td>
-<td width="32%" valign="top"><small><tt>
-  Tcl_GlobalEvalObj<br>
-  Tcl_VarEval<br>
-</tt></small></td>
-</table></center></p>
-<br clear="both"><p><hr></p>
-<h2 align="center">Nickel Tour Of The Tcl API</h2>
-<p><p><b>Functions For Dealing With Unicode</b></p>
-<center><table width="90%"><tr>
-<td width="49%" valign="top"><small><tt>
-  Tcl_NumUtfChars<br>
-  Tcl_UniCharAtIndex<br>
-  Tcl_UniCharIsAlnum<br>
-  Tcl_UniCharIsAlpha<br>
-  Tcl_UniCharIsControl<br>
-  Tcl_UniCharIsDigit<br>
-  Tcl_UniCharIsGraph<br>
-  Tcl_UniCharIsLower<br>
-  Tcl_UniCharIsPrint<br>
-  Tcl_UniCharIsPunct<br>
-  Tcl_UniCharIsSpace<br>
-  Tcl_UniCharIsUpper<br>
-  Tcl_UniCharIsWordChar<br>
-  Tcl_UniCharLen<br>
-  Tcl_UniCharNcmp<br>
-  Tcl_UniCharToLower<br>
-  Tcl_UniCharToTitle<br>
-</tt></small></td>
-<td width="49%" valign="top"><small><tt>
-  Tcl_UniCharToUpper<br>
-  Tcl_UniCharToUtf<br>
-  Tcl_UniCharToUtfDString<br>
-  Tcl_UtfAtIndex<br>
-  Tcl_UtfBackslash<br>
-  Tcl_UtfCharComplete<br>
-  Tcl_UtfFindFirst<br>
-  Tcl_UtfFindLast<br>
-  Tcl_UtfNcasecmp<br>
-  Tcl_UtfNcmp<br>
-  Tcl_UtfNext<br>
-  Tcl_UtfPrev<br>
-  Tcl_UtfToLower<br>
-  Tcl_UtfToTitle<br>
-  Tcl_UtfToUniChar<br>
-  Tcl_UtfToUniCharDString<br>
-  Tcl_UtfToUpper<br>
-</tt></small></td>
-</table></center>
-  <p><b>Functions For Dealing With Tcl_Objs</b></p>
-  <blockquote><i>Too numerous to list...</i></blockquote></p>
-<br clear="both"><p><hr></p>
-<h2 align="center">Documentation Of The Tcl API</h2>
-<p><ul><li>Tcl comes with excellent man pages</li></ul><ul><li>"Use the source, Luke"</li></ul><ul><li>See <tt>tclDecl.h</tt> for a list of API functions</li></ul><ul><li>The header comments on the implementation of API functions usually
-  gives a good description of what the function does and how it should
-  be used.</li></ul><ul><li>Most API functions are used within Tcl and Tk.  Use grep to locate
-  examples.</li></ul></p>
-<br clear="both"><p><hr></p>
-<h2 align="center">Initialization Scripts</h2>
-<p><ul><li>Run the mini TCLSH implemented above and execute the <tt>parray</tt> command</li></ul><ul><li>It doesn't work!  What's wrong? </p></li></li></ul><ul><li><tt>parray</tt> is really a Tcl proc that is read in when the
- interpreter is initialized. </p></li></li></ul><ul><li><tt>parray</tt> (and several other commands) are stored in a
-  handful of &quot;Initialization Scripts&quot; </p></li></li></ul><ul><li>All the initialization scripts are stored in the
- &quot;Tcl Library&quot; - a directory on the host
- computer. </p></li></li></ul><table><tr><td valign="top"><img src="image3"></td>
-<td valign="top"><b>Invoke the Tcl_Init() function to locate and read the
- Tcl initialization scripts.</b></td></tr></table></p>
-<br clear="both"><p><hr></p>
-<h2 align="center">The <tt>Tcl_Init()</tt> Function</h2>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>#include&nbsp;&lt;tcl.h><br>
-&nbsp;<br>
-static&nbsp;char&nbsp;zInputLoop[]&nbsp;=&nbsp;<br>
-&nbsp;&nbsp;/*&nbsp;Tcl&nbsp;code&nbsp;omitted...&nbsp;*/<br>
-;<br>
-&nbsp;<br>
-int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
-&nbsp;&nbsp;Tcl_Interp&nbsp;*interp;<br>
-&nbsp;&nbsp;interp&nbsp;=&nbsp;Tcl_CreateInterp();</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;Tcl_Init(interp);</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Locate and read the initialization scripts</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;/*&nbsp;Call&nbsp;Tcl_CreateCommand()?&nbsp;*/<br>
-&nbsp;&nbsp;Tcl_Eval(interp,&nbsp;zInputLoop);<br>
-&nbsp;&nbsp;return&nbsp;0;<br>
-}</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-</table>
-<p><table><tr><td valign="top"><img src="image3"></td>
-<td valign="top"><b>But Tcl_Init() can fail. We need to check its return value...</b></td></tr></table>
-</p>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">The <tt>Tcl_Init()</tt> Function</h2>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>#include&nbsp;&lt;tcl.h><br>
-&nbsp;<br>
-static&nbsp;char&nbsp;zInputLoop[]&nbsp;=&nbsp;<br>
-&nbsp;&nbsp;/*&nbsp;Tcl&nbsp;code&nbsp;omitted...&nbsp;*/<br>
-;<br>
-&nbsp;<br>
-int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
-&nbsp;&nbsp;Tcl_Interp&nbsp;*interp;<br>
-&nbsp;&nbsp;interp&nbsp;=&nbsp;Tcl_CreateInterp();</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;if(&nbsp;Tcl_Init(interp)!=TCL_OK&nbsp;){<br>
-&nbsp;&nbsp;&nbsp;&nbsp;fprintf(stderr,"Tcl_Init()&nbsp;failed:&nbsp;����P�X�",<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Tcl_GetStringResult(interp));<br>
-&nbsp;&nbsp;}</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Print error message if Tcl_Init() fails</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;/*&nbsp;Call&nbsp;Tcl_CreateCommand()?&nbsp;*/<br>
-&nbsp;&nbsp;Tcl_Eval(interp,&nbsp;zInputLoop);<br>
-&nbsp;&nbsp;return&nbsp;0;<br>
-}</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-</table>
-<p><table><tr><td valign="top"><img src="image3"></td>
-<td valign="top"><b>But now the program is not standalone.</b></td></tr></table>
-</p>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">How <tt>Tcl_Init()</tt> Works</h2>
-<p><ul><li>Computes the value of variable <tt>tcl_libPath</tt>.</li></ul><ul><li>Invokes the procedure named &quot;<tt>tclInit</tt>&quot;</li></ul><ul><li>A default <tt>tclInit</tt> procedure is built into Tcl.
-  You can define an alternative <tt>tclInit</tt> procedure
-  prior to calling <tt>Tcl_Init()</tt>.</li></ul></p>
-<br clear="both"><p><hr></p>
-<h2 align="center">The Default <tt>initTcl</tt> Procedure</h2>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>set&nbsp;errors&nbsp;{}<br>
-set&nbsp;dirs&nbsp;{}<br>
-if&nbsp;{[info&nbsp;exists&nbsp;tcl_library]}&nbsp;{<br>
-&nbsp;&nbsp;lappend&nbsp;dirs&nbsp;$tcl_library<br>
-}&nbsp;else&nbsp;{<br>
-&nbsp;&nbsp;if&nbsp;{[info&nbsp;exists&nbsp;env(TCL_LIBRARY)]}&nbsp;{<br>
-&nbsp;&nbsp;&nbsp;&nbsp;lappend&nbsp;dirs&nbsp;$env(TCL_LIBRARY)<br>
-&nbsp;&nbsp;}<br>
-&nbsp;&nbsp;lappend&nbsp;dirs&nbsp;$tclDefaultLibrary<br>
-&nbsp;&nbsp;unset&nbsp;tclDefaultLibrary<br>
-&nbsp;&nbsp;set&nbsp;dirs&nbsp;[concat&nbsp;$dirs&nbsp;$tcl_libPath]<br>
-}<br>
-foreach&nbsp;i&nbsp;$dirs&nbsp;{<br>
-&nbsp;&nbsp;set&nbsp;tcl_library&nbsp;$i<br>
-&nbsp;&nbsp;set&nbsp;tclfile&nbsp;[file&nbsp;join&nbsp;$i&nbsp;init.tcl]<br>
-&nbsp;&nbsp;if&nbsp;{[file&nbsp;exists&nbsp;$tclfile]}&nbsp;{<br>
-&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;{![catch&nbsp;{uplevel&nbsp;#0&nbsp;[list&nbsp;source&nbsp;$tclfile]}&nbsp;msg]}&nbsp;{<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return<br>
-&nbsp;&nbsp;&nbsp;&nbsp;}&nbsp;else&nbsp;{<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;append&nbsp;errors&nbsp;"$tclfile:&nbsp;$msg\n$errorInfo\n"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;}<br>
-&nbsp;&nbsp;}<br>
-}<br>
-error&nbsp;"Can't&nbsp;find&nbsp;a&nbsp;usable&nbsp;init.tcl&nbsp;..."</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-</table>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">The Default Initialization Sequence</h2>
-<p><ul><li>The <tt>tclInit</tt> procedure locates and sources the <tt>init.tcl</tt>
-  script.  The directory that contains <tt>init.tcl</tt> is stored in
-  the <tt>tcl_library</tt> variable.</li></ul><ul><li>The <tt>init.tcl</tt> script creates an <tt>unknown</tt> procedure.
-  The <tt>unknown</tt> procedure will run whenever Tcl encounters an
-  unknown command.</li></ul><ul><li>The <tt>unknown</tt> procedure consults the file <tt>tclIndex</tt> in the
-  <tt>tcl_library</tt> directory to see if the command is defined by one of
-  the initialization scripts.</li></ul><ul><li>The <tt>unknown</tt> procedure sources any needed initialization scripts
-  and retries the command.</li></ul><table><tr><td valign="top"><img src="image3"></td>
-<td valign="top"><b>Commands defined in the initialization scripts are loaded
-  on demand.</b></td></tr></table></p>
-<br clear="both"><p><hr></p>
-<h2 align="center">Standalone Initialization Techniques</h2>
-<p><p><b>Manually execute all initialization scripts</b></p>
-<ul><li>Convert all initialization scripts into C strings and
-  put them in the executable.</li></ul><ul><li>Call <tt>Tcl_Eval()</tt> on each initialization script and omit the
-  call to <tt>Tcl_Init()</tt></li></ul><ul><li>Or, redefine <tt>tclInit</tt> so that it does not attempt to source
-  <tt>init.tcl</tt> then call <tt>Tcl_Eval()</tt> on each initialization
-  script after <tt>Tcl_Init()</tt> returns.</li></ul><table><tr><td valign="top"><img src="image3"></td>
-<td valign="top"><b>This approach is not recommended</b></td></tr></table></p>
-<br clear="both"><p><hr></p>
-<h2 align="center">Standalone Initialization Techniques</h2>
-<p><p><b>Redefining the builtin <tt>source</tt> command</b></p>
-<ul><li>Convert all initialization scripts into C strings and
-  put them in the executable.</li></ul><ul><li>Create a new <tt>source</tt> command that
-  calls <tt>Tcl_Eval()</tt> on the appropriate built-in string
-  instead of reading from the disk.</li></ul><ul><li>Read from disk if the named file is not one that is built in.</li></ul></p>
-<br clear="both"><p><hr></p>
-<h2 align="center">Redefining <tt>source</tt></h2>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>static&nbsp;char&nbsp;zInitTcl[]&nbsp;=&nbsp;"...";<br>
-static&nbsp;char&nbsp;zParrayTcl[]&nbsp;=&nbsp;"...";</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Scripts <tt>init.tcl</tt> and <tt>parray.tcl</tt></td>
-</tr>
-<tr><td valign="center">
-<small><tt><br>
-int&nbsp;NewSourceCmd(TCLARGS){</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;if(&nbsp;!strcmp(argv[1],"/builtin/init.tcl")&nbsp;)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;Tcl_Eval(interp,&nbsp;zInitTcl);<br>
-&nbsp;&nbsp;if(&nbsp;!strcmp(argv[1],"/builtin/parray.tcl")&nbsp;)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;Tcl_Eval(interp,&nbsp;zParrayTcl);</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Call <tt>Tcl_Eval()</tt> on builtin strings if the names match</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;return&nbsp;Tcl_EvalFile(interp,&nbsp;argv[1]);</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Call <tt>Tcl_EvalFile()</tt> if no match</td>
-</tr>
-<tr><td valign="center">
-<small><tt>}<br>
-&nbsp;<br>
-int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
-&nbsp;&nbsp;Tcl_Interp&nbsp;*interp;</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;setenv("TCL_LIBRARY","/builtin");</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Causes <tt>tclInit</tt> to look for <tt>init.tcl</tt> in <tt>/builtin</tt></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;interp&nbsp;=&nbsp;Tcl_CreateInterp();</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;Tcl_CreateCommand(interp,&nbsp;"source",<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;NewSourceCmd,&nbsp;0,&nbsp;0);</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Redefine <tt>source</tt></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;Tcl_Init(interp);<br>
-&nbsp;&nbsp;Tcl_Eval(interp,&nbsp;zInputLoop);<br>
-&nbsp;&nbsp;return&nbsp;0;<br>
-}</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-</table>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">Redefining <tt>source</tt></h2>
-<p><ul><li>This approach works for all versions of Tcl and Tk.</li></ul><ul><li>Also need to redefine the "<tt>file exists</tt>" Tcl command since it
-  too is used by <tt>tclInit</tt>.</li></ul><ul><li>To verify that the program is really standalone, remove the call
-  to <tt>Tcl_EvalFile()</tt>.</li></ul></p>
-<br clear="both"><p><hr></p>
-<h2 align="center">Standalone Initialization Techniques</h2>
-<p><p><b>Use the <tt>Tcl</tt>*<tt>InsertProc()</tt> functions</b></p>
-<ul><li>Three routines that overload basic file I/O operations:
-  <ul>
-  <li> <tt>TclStatInsertProc()</tt> </li>
-  <li> <tt>TclAccessInsertProc()</tt> </li>
-  <li> <tt>TclOpenFileChannelInsertProc()</tt> </li>
-  </ul></li></ul><ul><li>Allows us to implement a virtual filesystem that overlays the
-  real filesystem.</li></ul><ul><li>The virtual filesystem contains all the initialization scripts
-  as compiled-in strings.  The initialization scripts look like
-  they are resident on disk even though they are built in.</li></ul><ul><li>These functions first appeared in Tcl8.0.3.
-  Presumably to support TclPro Wrapper.</li></ul><ul><li>The only documentation is comments on the code.
-  See the Tcl source file <tt>generic/tclIOUtil.c</tt></li></ul></p>
-<br clear="both"><p><hr></p>
-<h2 align="center">The <tt>TclStatInsertProc()</tt> Function</h2>
-<p><ul><li>Sole argument is a pointer to a function whose interface is the
-  same as <tt>stat()</tt></li></ul><ul><li>Functions are stacked. Tcl tries each <tt>stat</tt> function on the
-  list, beginning with the most recently inserted, until one succeeds.</li></ul></p>
-<br clear="both"><p><hr></p>
-<h2 align="center">The <tt>TclStatInsertProc()</tt> Function</h2>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>#include&nbsp;&lt;tclInt.h></tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Rather than <tt>&lt;tcl.h&gt;</tt>!</td>
-</tr>
-<tr><td valign="center">
-<small><tt><br>
-static&nbsp;int<br>
-BltinFileStat(char&nbsp;*path,struct&nbsp;stat&nbsp;*buf){<br>
-&nbsp;&nbsp;char&nbsp;*zData;<br>
-&nbsp;&nbsp;int&nbsp;nData;</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;zData&nbsp;=&nbsp;FindBuiltinFile(path,&nbsp;0,&nbsp;&amp;nData);</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Check if <tt>path</tt> is a builtin</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;if(&nbsp;zData==0&nbsp;){<br>
-&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;-1;<br>
-&nbsp;&nbsp;}</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Fail if <tt>path</tt> is not a builtin</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;memset(buf,&nbsp;0,&nbsp;sizeof(*buf));<br>
-&nbsp;&nbsp;buf->st_mode&nbsp;=&nbsp;0400;<br>
-&nbsp;&nbsp;buf->st_size&nbsp;=&nbsp;nData;</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;return&nbsp;0;</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Success if it is builtin</td>
-</tr>
-<tr><td valign="center">
-<small><tt>}<br>
-&nbsp;<br>
-int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
-&nbsp;&nbsp;Tcl_Interp&nbsp;*interp;</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;TclStatInsertProc(BltinFileStat);</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Register new <tt>stat</tt> function</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;interp&nbsp;=&nbsp;Tcl_CreateInterp();<br>
-&nbsp;&nbsp;Tcl_Init(interp);<br>
-&nbsp;&nbsp;Tcl_Eval(interp,&nbsp;zInputLoop);<br>
-&nbsp;&nbsp;return&nbsp;0;<br>
-}</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-</table>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">The <tt>TclAccessInsertProc()</tt> Function</h2>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>#include&nbsp;&lt;tclInt.h></tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Rather than <tt>&lt;tcl.h&gt;</tt>!</td>
-</tr>
-<tr><td valign="center">
-<small><tt><br>
-/*&nbsp;BltinFileStat()&nbsp;not&nbsp;shown...&nbsp;*/<br>
-&nbsp;<br>
-static&nbsp;int<br>
-BltinFileAccess(char&nbsp;*path,&nbsp;int&nbsp;mode){<br>
-&nbsp;&nbsp;char&nbsp;*zData;</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;if(&nbsp;mode&nbsp;&amp;&nbsp;3&nbsp;)&nbsp;return&nbsp;-1;</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">All builtins are read-only</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;zData&nbsp;=&nbsp;FindBuiltinFile(path,&nbsp;0,&nbsp;&amp;nData);</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Check if <tt>path</tt> is a builtin</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;if(&nbsp;zData==0&nbsp;)&nbsp;return&nbsp;-1;</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Fail if <tt>path</tt> is not a builtin</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;return&nbsp;0;</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Success if it is builtin</td>
-</tr>
-<tr><td valign="center">
-<small><tt>}<br>
-&nbsp;<br>
-int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
-&nbsp;&nbsp;Tcl_Interp&nbsp;*interp;</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;TclStatInsertProc(BltinFileStat);<br>
-&nbsp;&nbsp;TclAccessInsertProc(BltinFileAccess);</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Register new <tt>stat</tt> and <tt>access</tt> functions</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;interp&nbsp;=&nbsp;Tcl_CreateInterp();<br>
-&nbsp;&nbsp;Tcl_Init(interp);<br>
-&nbsp;&nbsp;Tcl_Eval(interp,&nbsp;zInputLoop);<br>
-&nbsp;&nbsp;return&nbsp;0;<br>
-}</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-</table>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">The <tt>TclOpenFileChannelInsertProc()</tt> Function</h2>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>static&nbsp;Tcl_Channel&nbsp;BuiltinFileOpen(<br>
-&nbsp;&nbsp;Tcl_Interp&nbsp;*interp,&nbsp;&nbsp;&nbsp;/*&nbsp;The&nbsp;TCL&nbsp;interpreter&nbsp;doing&nbsp;the&nbsp;open&nbsp;*/<br>
-&nbsp;&nbsp;char&nbsp;*zFilename,&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;/*&nbsp;Name&nbsp;of&nbsp;the&nbsp;file&nbsp;to&nbsp;open&nbsp;*/<br>
-&nbsp;&nbsp;char&nbsp;*modeString,&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;/*&nbsp;Mode&nbsp;string&nbsp;for&nbsp;the&nbsp;open&nbsp;(ignored)&nbsp;*/<br>
-&nbsp;&nbsp;int&nbsp;permissions&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;/*&nbsp;Permissions&nbsp;for&nbsp;a&nbsp;newly&nbsp;created&nbsp;file&nbsp;(ignored)&nbsp;*/<br>
-){<br>
-&nbsp;&nbsp;char&nbsp;*zData;<br>
-&nbsp;&nbsp;BuiltinFileStruct&nbsp;*p;<br>
-&nbsp;&nbsp;int&nbsp;nData;<br>
-&nbsp;&nbsp;char&nbsp;zName[50];<br>
-&nbsp;&nbsp;Tcl_Channel&nbsp;chan;<br>
-&nbsp;&nbsp;static&nbsp;int&nbsp;count&nbsp;=&nbsp;1;<br>
-&nbsp;<br>
-&nbsp;&nbsp;zData&nbsp;=&nbsp;FindBuiltinFile(zFilename,&nbsp;1,&nbsp;&amp;nData);<br>
-&nbsp;&nbsp;if(&nbsp;zData==0&nbsp;)&nbsp;return&nbsp;NULL;<br>
-&nbsp;&nbsp;p&nbsp;=&nbsp;(BuiltinFileStruct*)Tcl_Alloc(&nbsp;sizeof(BuiltinFileStruct)&nbsp;);<br>
-&nbsp;&nbsp;if(&nbsp;p==0&nbsp;)&nbsp;return&nbsp;NULL;<br>
-&nbsp;&nbsp;p->zData&nbsp;=&nbsp;zData;<br>
-&nbsp;&nbsp;p->nData&nbsp;=&nbsp;nData;<br>
-&nbsp;&nbsp;p->cursor&nbsp;=&nbsp;0;<br>
-&nbsp;&nbsp;sprintf(zName,"etbi_bffffc7c_8049b04",((int)BuiltinFileOpen)>>12,count++);<br>
-&nbsp;&nbsp;chan&nbsp;=&nbsp;Tcl_CreateChannel(&amp;builtinChannelType,&nbsp;zName,&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(ClientData)p,&nbsp;TCL_READABLE);<br>
-&nbsp;&nbsp;return&nbsp;chan;<br>
-}</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-</table>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">The <tt>TclOpenFileChannelInsertProc()</tt> Function</h2>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>static&nbsp;Tcl_ChannelType&nbsp;builtinChannelType&nbsp;=&nbsp;{<br>
-&nbsp;&nbsp;"builtin",&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;/*&nbsp;Type&nbsp;name.&nbsp;*/<br>
-&nbsp;&nbsp;NULL,&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;/*&nbsp;Always&nbsp;non-blocking.*/<br>
-&nbsp;&nbsp;BuiltinFileClose,&nbsp;&nbsp;&nbsp;/*&nbsp;Close&nbsp;proc.&nbsp;*/<br>
-&nbsp;&nbsp;BuiltinFileInput,&nbsp;&nbsp;&nbsp;/*&nbsp;Input&nbsp;proc.&nbsp;*/<br>
-&nbsp;&nbsp;BuiltinFileOutput,&nbsp;&nbsp;/*&nbsp;Output&nbsp;proc.&nbsp;*/<br>
-&nbsp;&nbsp;BuiltinFileSeek,&nbsp;&nbsp;&nbsp;&nbsp;/*&nbsp;Seek&nbsp;proc.&nbsp;*/<br>
-&nbsp;&nbsp;NULL,&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;/*&nbsp;Set&nbsp;option&nbsp;proc.&nbsp;*/<br>
-&nbsp;&nbsp;NULL,&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;/*&nbsp;Get&nbsp;option&nbsp;proc.&nbsp;*/<br>
-&nbsp;&nbsp;BuiltinFileWatch,&nbsp;&nbsp;&nbsp;/*&nbsp;Watch&nbsp;for&nbsp;events&nbsp;on&nbsp;console.&nbsp;*/<br>
-&nbsp;&nbsp;BuiltinFileHandle,&nbsp;&nbsp;/*&nbsp;Get&nbsp;a&nbsp;handle&nbsp;from&nbsp;the&nbsp;device.&nbsp;*/<br>
-};</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-</table>
-<p>
-  <p>For additional information see:</p>
-  <ul>
-  <li>The man page for <tt>Tcl_CreateChannel()</tt></li>
-  <li>Tk source code file <tt>generic/tkConsole.c</tt></li>
-  </ul>
-</p>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">Initializing Tk</h2>
-<p><ul><li>All the same initialization script issues as Tcl</li></ul><ul><li>Tk initialization scripts are in a different directory
-  than the Tcl initialization scripts - the "Tk Library"</li></ul><ul><li>Call <tt>Tk_Init()</tt> after <tt>Tcl_Init()</tt></li></ul><ul><li>Must have an event loop or Tk will not work!</li></ul></p>
-<br clear="both"><p><hr></p>
-<h2 align="center">Implementing An Event Loop</h2>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>button&nbsp;.b&nbsp;-text&nbsp;Hello&nbsp;-command&nbsp;exit<br>
-pack&nbsp;.b</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Create a Tk interface</td>
-</tr>
-<tr><td valign="center">
-<small><tt><br>
-</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>bind&nbsp;.&nbsp;&lt;Destroy>&nbsp;{<br>
-&nbsp;&nbsp;if&nbsp;{![winfo&nbsp;exists&nbsp;.]}&nbsp;exit<br>
-}</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Close the application when the main window
-  is destroyed</td>
-</tr>
-<tr><td valign="center">
-<small><tt><br>
-</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>while&nbsp;1&nbsp;{vwait&nbsp;forever}</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">The event loop</td>
-</tr>
-</table>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">"Hello, World!" Using Tk</h2>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>#include&nbsp;&lt;tk.h><br>
-&nbsp;<br>
-</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>static&nbsp;char&nbsp;zHello[]&nbsp;=&nbsp;</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">The application code</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;"button&nbsp;.b&nbsp;"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;"-text&nbsp;{Hello,&nbsp;World}&nbsp;"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;"-command&nbsp;exit\n"<br>
-&nbsp;&nbsp;"pack&nbsp;.b\n";<br>
-&nbsp;<br>
-</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>static&nbsp;char&nbsp;zEventLoop[]&nbsp;=</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">The event loop</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;"bind&nbsp;.&nbsp;&lt;Destroy>&nbsp;{\n"<br>
-&nbsp;&nbsp;"&nbsp;&nbsp;if&nbsp;{![winfo&nbsp;exists&nbsp;.]}&nbsp;exit\n"<br>
-&nbsp;&nbsp;"}\n"<br>
-&nbsp;&nbsp;"while&nbsp;1&nbsp;{vwait&nbsp;forever}\n";<br>
-&nbsp;<br>
-<br>
-int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
-&nbsp;&nbsp;Tcl_Interp&nbsp;*interp;<br>
-&nbsp;&nbsp;interp&nbsp;=&nbsp;Tcl_CreateInterp();</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;Tcl_Init(interp);<br>
-&nbsp;&nbsp;Tk_Init(interp);</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">We really should check the return values of the init functions...</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;Tcl_Eval(interp,&nbsp;zHello);</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;Tcl_Eval(interp,&nbsp;zEventLoop);</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">The event loop never returns</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;/*NOTREACHED*/<br>
-}</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-</table>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">Compiling "Hello, World!" For Tk</h2>
-<p><p><b>Unix:</b></p>
-  <blockquote><pre>
-  $ gcc hello.c -ltk -L/usr/X11R6/lib \
-        -lX11 -ltcl -lm -ldl
-  $ ./a.out</pre></blockquote>
-
-  <p><b>Windows using Cygwin:</b></p>
-  <blockquote><pre>
-  C:> gcc hello.c -mwindows -ltk80 -ltcl80 -lm
-  C:> a.exe</pre></blockquote>
-
-  <p><b>Windows using Mingw32:</b></p>
-  <blockquote><pre>
-  C:> gcc -mno-cygwin hello.c -mwindows \
-           -ltk82 -ltcl82 -lm
-  C:> a.exe</pre></blockquote></p>
-<br clear="both"><p><hr></p>
-<h2 align="center">Making The Program Standalone</h2>
-<p><p>To make a Tcl application standalone you have to convert the following
-     initialization scripts to C strings and compile them into the
-     executable:</p>
-  <table><tr>
-  <td valign="top"><tt>
-    &nbsp;&nbsp;auto.tcl<br>
-    &nbsp;&nbsp;history.tcl<br>
-    &nbsp;&nbsp;init.tcl
-  </tt></td>
-  <td valign="top"><tt>
-    &nbsp;&nbsp;ldAout.tcl<br>
-    &nbsp;&nbsp;package.tcl
-  </tt></td>
-  <td valign="top"><tt>
-    &nbsp;&nbsp;parray.tcl<br>
-    &nbsp;&nbsp;safe.tcl
-  </tt></td>
-  <td valign="top"><tt>
-    &nbsp;&nbsp;tclIndex<br>
-    &nbsp;&nbsp;word.tcl
-  </tt></td>
-  </tr></table>
-
-  <p>To make a Tk application standalone requires these additional
-     initialization scripts from the Tk Library:</p>
-  <table><tr>
-  <td valign="top"><tt>
-    &nbsp;&nbsp;bgerror.tcl<br>
-    &nbsp;&nbsp;button.tcl<br>
-    &nbsp;&nbsp;clrpick.tcl<br>
-    &nbsp;&nbsp;comdlg.tcl<br>
-    &nbsp;&nbsp;console.tcl<br>
-    &nbsp;&nbsp;dialog.tcl
-  </tt></td>
-  <td valign="top"><tt>
-    &nbsp;&nbsp;entry.tcl<br>
-    &nbsp;&nbsp;focus.tcl<br>
-    &nbsp;&nbsp;listbox.tcl<br>
-    &nbsp;&nbsp;menu.tcl<br>
-    &nbsp;&nbsp;msgbox.tcl<br>
-    &nbsp;&nbsp;optMenu.tcl
-  </tt></td>
-  <td valign="top"><tt>
-    &nbsp;&nbsp;palette.tcl<br>
-    &nbsp;&nbsp;safetk.tcl<br>
-    &nbsp;&nbsp;scale.tcl<br>
-    &nbsp;&nbsp;scrlbar.tcl<br>
-    &nbsp;&nbsp;tclIndex<br>
-    &nbsp;&nbsp;tearoff.tcl
-  </tt></td>
-  <td valign="top"><tt>
-    &nbsp;&nbsp;text.tcl<br>
-    &nbsp;&nbsp;tk.tcl<br>
-    &nbsp;&nbsp;tkfbox.tcl<br>
-    &nbsp;&nbsp;xmfbox.tcl
-  </tt></td>
-  </tr></table>
-
-  <p>Total of about 13K lines and 400K bytes of text or 9K lines and
-     250K bytes if you strip comments and leading spaces</p></p>
-<br clear="both"><p><hr></p>
-<h2 align="center">A Review Of The Features We Want</h2>
-<p><ol type="A">
-  <li value="1">
-  Combine C/C++ with Tcl/Tk into a single executable.</dd>
-  </li></ol>
-
-  <ol type="A">
-  <li value="2">
-  The executable should be standalone.  It must not depend
-  on files not normally found on the system.
-  </li></ol>
-
-  <ol type="A">
-  <li value="3">
-  It should be difficult for end users to alter the program
-  (and introduce bugs).
-  </li></ol></p>
-<br clear="both"><p><hr></p>
-<h2 align="center">Available Programming Aids</h2>
-<p><p>Several tools are available.  The chart below shows which tools
- help achieve which objectives.</p>
-
- <center><table border="2">
- <tr>
-   <td></td>
-   <td colspan="3" align="center">
-      <b>Features The Tool Helps To Achieve</b></td>
- </tr>
- <tr>
-   <td align="center"><b>Tool Name</b></td>
-   <td align="center">Mix C and Tcl</td>
-   <td align="center">Standalone</td>
-   <td align="center">Hide Source</td>
- </tr>
- <tr>
-   <td>SWIG</td>
-   <td align="center"><img src="image6"></td>
-   <td>&nbsp;</td>
-   <td>&nbsp;</td>
- </tr>
- <tr>
-   <td>TclPro Wrapper</td>
-   <td>&nbsp;</td>
-   <td align="center"><img src="image6"></td>
-   <td align="center"><img src="image6"></td>
- </tr>
- <tr>
-   <td>FreeWrap</td>
-   <td>&nbsp;</td>
-   <td align="center"><img src="image6"></td>
-   <td align="center"><img src="image6"></td>
- </tr>
- <tr>
-   <td>Wrap</td>
-   <td>&nbsp;</td>
-   <td align="center"><img src="image6"></td>
-   <td>&nbsp;</td>
- </tr>
- <tr>
-   <td>mktclapp</td>
-   <td align="center"><img src="image6"></td>
-   <td align="center"><img src="image6"></td>
-   <td align="center"><img src="image6"></td>
- </tr>
- </table></center></p>
-<br clear="both"><p><hr></p>
-<h2 align="center">SWIG</h2>
-<table><tr><td valign="top"><img src="image7"></td>
-<td valign="top"><p><ul><li>Creates an interface between an existing C/C++ library and a high-level
-  programming language.  Support for:
-  <ul>
-  <li> Tcl/Tk </li>
-  <li> Perl </li>
-  <li> Python </li>
-  <li> Java </li>
-  <li> Eiffel </li>
-  <li> Guile </li>
-  </ul></li></ul><ul><li>No changes required to C/C++ code.  Can be used with legacy libraries.</li></ul><ul><li>Generates an extension, not a standalone binary</li></ul><ul><li>The tutorial on SWIG was yesterday afternoon.</li></ul><ul><li>http://www.swig.org/</li></ul></p></td></tr></table>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">Wrapper Programs</h2>
-<table><tr><td valign="top"><img src="image8"></td>
-<td valign="top"><p><ul><li>Convert a pure Tcl/Tk program into a standalone binary</li></ul><ul><li>Several wrapper programs are available:
-  <ul>
-  <li> TclPro Wrapper - http://www.scriptics.com/ </li>
-  <li> FreeWrap - http://www.albany.net/~dlabelle/freewrap/freewrap.html </li>
-  <li> Wrap - http://members1.chello.nl/~j.nijtmans/wrap.html </li>
-  </ul></li></ul><ul><li>No C compiler required!</li></ul><ul><li>TclPro will convert Tcl script into bytecode so that it cannot be
-  easily read by the end user.  FreeWrap encrypts the scripts.</li></ul><ul><li>FreeWrap uses compression on its executable.
-  Wrap uses compression on both the executable and on the bundled script files.</li></ul><ul><li>Usually include extensions like winico and/or BLT</li></ul></p></td></tr></table>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">mktclapp</h2>
-<table><tr><td valign="top"><img src="image9"></td>
-<td valign="top"><p><ul><li>Mix C/C++ with Tcl/Tk into a standalone binary</li></ul>
-<ul><li><tt>mktclapp</tt> generates an application initialization file
-  that contains Tcl scripts as strings and makes all necessary calls
-  to <tt>Tcl_Init</tt>, <tt>Tcl_CreateCommand</tt>,
-  <tt>Tcl</tt>*<tt>InsertProc</tt>, etc.</li></ul><ul><li>Features to make it easier to write new Tcl command in C</li></ul><ul><li><tt>xmktclapp.tcl</tt> provides a GUI interface to <tt>mktclapp</tt></li></ul><ul><li>http://www.hwaci.com/sw/mktclapp/</li></ul></p></td></tr></table>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">"Hello, World!" Using Mktclapp</h2>
-<p><ul><li>Download <tt>mktclapp.c</tt> and <tt>xmktclapp.tcl</tt> from
-  http://www.hwaci.com/sw/mktclapp/</li></ul><ul><li>Compile <tt>mktclapp</tt>:
-  <blockquote><pre>
-  cc -o mktclapp mktclapp.c
-  </pre></blockquote></li></ul><ul><li>Create "Hello, World!" as a Tcl script in file <tt>hw.tcl</tt>:
-  <blockquote><pre>
-  button .b -text {Hello, World!} -command exit
-  pack .b
-  </pre></blockquote></li></ul><ul><li>Launch xmktclapp:
-  <blockquote><pre>
-  wish xmktclapp.tcl
-  </pre></blockquote></li></ul></p>
-<br clear="both"><p><hr></p>
-<h2 align="center">"Hello, World!" Using Mktclapp</h2>
-<table width="100%"><tr><td valign="top"><p><ul><li>Set "Command Line Input?" to "None"</li></ul><ul><li>Set "Standalone?" to "Yes"</li></ul><ul><li>Enter "<tt>hw.mta</tt>" for the Configuration File</li></ul><ul><li>Enter "<tt>hw.c</tt>" for the Output C File</li></ul></p></td>
-<td valign="top" align="right"><img src="image10"></td></tr></table>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">"Hello, World!" Using Mktclapp</h2>
-<table width="100%"><tr><td valign="top"><p><ul><li>Go to the "Tcl Scripts" page</li></ul><ul><li>Press "Insert" and add <tt>hw.tcl</tt> to the list of
-  Tcl scripts</li></ul><ul><li>Change the "Startup Script" to be <tt>hw.tcl</tt>.</li></ul><ul><li>Select File/Build and File/Exit</li></ul></p></td>
-<td valign="top" align="right"><img src="image11"></td></tr></table>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">"Hello, World!" Using Mktclapp</h2>
-<p><ul><li>Mktclapp generates <tt>hw.c</tt>.
-  Compile it something like this:
-  <pre>
-  cc hw.c -ltk -L/usr/X11R6/lib -lX11 -ltcl -lm -ldl
-  </pre></li></ul><ul><li>Or, if using Cygwin:
-  <pre>
-  gcc hw.c -mwindows -ltk80 -ltcl80 -lm
-  </pre></li></ul><ul><li>Or, if using Mingw32:
-  <pre>
-  gcc -mno-cygwin hw.c -mwindows -ltk82 -ltcl82 -lm
-  </pre></li></ul><ul><li>And you're done!</li></ul></p>
-<br clear="both"><p><hr></p>
-<h2 align="center">Adding C Code To Your Program</h2>
-<p>Put the new C code in a new source file named "<tt>add.c</tt>"</p><p>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>#include&nbsp;"hw.h"</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Generated by mktclapp</td>
-</tr>
-<tr><td valign="center">
-<small><tt></tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>int&nbsp;ET_COMMAND_add(ET_TCLARGS){</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><tt>ET_TCLARGS</tt> is a macro defined in <tt>hw.h</tt></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;int&nbsp;a,&nbsp;b;<br>
-&nbsp;&nbsp;char&nbsp;zResult[30];<br>
-&nbsp;&nbsp;a&nbsp;=&nbsp;atoi(argv[1]);<br>
-&nbsp;&nbsp;b&nbsp;=&nbsp;atoi(argv[2]);<br>
-&nbsp;&nbsp;sprintf(zResult,&nbsp;"-1073742724",&nbsp;a+b);<br>
-&nbsp;&nbsp;Tcl_SetResult(interp,&nbsp;zResult,&nbsp;TCL_VOLATILE);<br>
-&nbsp;&nbsp;return&nbsp;TCL_OK;<br>
-}</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-</table>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">Adding C Code To Your Program</h2>
-<table width="100%"><tr><td valign="top"><p><ul><li>Go to the "C/C++ Modules" page of xmktclapp.tcl</li></ul>
-<ul><li>Press "Insert" and add <tt>add.c</tt> to the list of
-  C/C++ modules</p></li></ul></li></ul><ul><li>Select File/Build and File/Exit</li></ul></p></td>
-<td valign="top" align="right"><img src="image12"></td></tr></table>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">Adding C Code To Your Program</h2>
-<p><ul><li>Compile as follows:
-  <pre>
-  cc add.c hw.c -ltk -L/usr/X11R6/lib -ltcl -lm -ldl
-  </pre></li></ul><ul><li>Or construct a Makefile that compiles <tt>add.c</tt> into <tt>add.o</tt>
-  and <tt>hw.c</tt> into <tt>hw.o</tt> and then links them.</li></ul><ul><li>Compile the same way for Windows except use the usual Windows
-  libraries and options...</li></ul><table><tr><td valign="top"><img src="image3"></td>
-<td valign="top"><b>Don't have to worry with <tt>Tcl_CreateCommand()</tt> - Mktclapp takes
-  care of that automatically.</b></td></tr></table></p>
-<br clear="both"><p><hr></p>
-<h2 align="center">Checking Parameters In The <tt>add</tt> Command</h2>
-<p>Modify <tt>add.c</tt> to insure the <tt>add</tt> command
-  is called with exactly two integer arguments</p><p>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>#include&nbsp;"hw.h"<br>
-&nbsp;<br>
-int&nbsp;ET_COMMAND_add(ET_TCLARGS){<br>
-&nbsp;&nbsp;int&nbsp;a,&nbsp;b;<br>
-&nbsp;&nbsp;char&nbsp;zResult[30];</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;if(&nbsp;argc!=3&nbsp;){<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Tcl_AppendResult(interp,<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"wrong&nbsp;#&nbsp;args:&nbsp;should&nbsp;be:&nbsp;\"",<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;argv[0],&nbsp;"&nbsp;VALUE&nbsp;VALUE\"",&nbsp;0);<br>
-&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;TCL_ERROR;<br>
-&nbsp;&nbsp;}</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Report an error if there are not exactly
-  2 arguments</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;if(&nbsp;Tcl_GetInt(interp,&nbsp;argv[1],&nbsp;&amp;a)!=TCL_OK&nbsp;){<br>
-&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;TCL_ERROR;<br>
-&nbsp;&nbsp;}</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Report an error if the first argument is
-  not an integer</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;if(&nbsp;Tcl_GetInt(interp,&nbsp;argv[2],&nbsp;&amp;b)!=TCL_OK&nbsp;){<br>
-&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;TCL_ERROR;<br>
-&nbsp;&nbsp;}</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Do the same for the second argument</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;sprintf(zResult,&nbsp;"-1073742724",&nbsp;a+b);<br>
-&nbsp;&nbsp;Tcl_SetResult(interp,&nbsp;zResult,&nbsp;TCL_VOLATILE);<br>
-&nbsp;&nbsp;return&nbsp;TCL_OK;<br>
-}</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-</table>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">Using The Tcl_Obj Interface</h2>
-<p>In the file <tt>objadd.c</tt> put this code:</p><p>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>#include&nbsp;"hw.h"</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt><br>
-int&nbsp;ET_OBJCOMMAND_add2(ET_OBJARGS){<br>
-&nbsp;&nbsp;int&nbsp;a,&nbsp;b;</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Use "<tt>ET_OBJCOMMAND</tt>" instead of "<tt>ET_COMMAND</tt>" and
-  "<tt>ET_OBJARGS</tt>" instead of "<tt>ET_TCLARGS</tt>"</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;if(&nbsp;objc!=3&nbsp;){<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Tcl_WrongNumArgs(interp,&nbsp;1,&nbsp;objv,<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"number&nbsp;number");<br>
-&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;TCL_ERROR;<br>
-&nbsp;&nbsp;}</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">A special routine for "wrong # args" error</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;if(&nbsp;Tcl_GetIntFromObj(interp,&nbsp;objv[1],&nbsp;&amp;a)&nbsp;){</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Instead of <tt>Tcl_GetInt</tt></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;TCL_ERROR;<br>
-&nbsp;&nbsp;}<br>
-&nbsp;&nbsp;if(&nbsp;Tcl_GetIntFromObj(interp,&nbsp;objv[2],&nbsp;&amp;b)&nbsp;){<br>
-&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;TCL_ERROR;<br>
-&nbsp;&nbsp;}</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;Tcl_SetIntObj(Tcl_GetObjResult(interp),&nbsp;a+b);</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Result stored as integer, not a string</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;return&nbsp;TCL_OK;<br>
-}</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-</table>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">Speed Of Tcl_Obj Versus "char*"  Interfaces</h2>
-<p><ul><li>Compile both <tt>add</tt> and <tt>add2</tt> into the same executable.</li></ul><ul><li>Compare their speeds:
-  <pre>
-   time {add 123456 654321} 10000
-  <font color="blue">26 microseconds per iteration</font>
-   time {add2 123456 654321} 10000
-  <font color="blue">4 microseconds per iteration</font>
-  </pre></li></ul><ul><li>The Tcl_Obj version is 650 faster!</li></ul><ul><li>Replace the addition with a "real" computation that takes
-  10 milliseconds.</li></ul><ul><li>Now the Tcl_Obj version is only 0.2 faster!</li></ul><table><tr><td valign="top"><img src="image3"></td>
-<td valign="top"><b>In many real-world problems, the Tcl_Obj interface has no noticeable
-  speed advantage over the string interface.</b></td></tr></table></p>
-<br clear="both"><p><hr></p>
-<h2 align="center">More About Built-in Tcl Scripts</h2>
-<table><tr><td valign="top"><img src="image11"></td>
-<td valign="top"><p><ul><li>Comments and leading white-space are removed from the
-  script by default.  Use the "Don't Strip Comments"
-  button to change this.</li></ul><ul><li>The file name must exactly match the name that is
-  used by the <tt>source</tt> command.</li></ul></p></td></tr></table>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">Locations Of Libraries</h2>
-<table><tr><td valign="top"><img src="image13"></td>
-<td valign="top"><p><ul><li>Tells mktclapp where to look for script libraries.</li></ul><ul><li>All Tcl scripts in the indicated directories are
-  compiled into the <tt>appinit.c</tt> file.</li></ul><ul><li>Comments and extra white-space are removed.
-  There is no way to turn this off.</li></ul></p></td></tr></table>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">Built-in Binary Data Files</h2>
-<table><tr><td valign="top"><img src="image14"></td>
-<td valign="top"><p><ul><li>Arbitrary files become part of the virtual filesystem</li></ul><ul><li>No comment or white-space removal is attempted</li></ul><ul><li>Useful for images or other binary data</li></ul></p></td></tr></table>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">New Commands In Namespaces</h2>
-<p>Two underscores (__)  are replaced by two colons (::) in
-  command names, thus giving the ability to define new commands
-  in a namespace</p><p>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>#include&nbsp;&lt;hw.h></tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt><br>
-int&nbsp;ET_COMMAND_adder__add(ET_TCLARGS){<br>
-&nbsp;&nbsp;int&nbsp;a,&nbsp;b;</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Creates the Tcl command called "<tt>adder::add</tt>"</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;char&nbsp;*zResult[30];<br>
-&nbsp;&nbsp;if(&nbsp;argc!=3&nbsp;){<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Tcl_AppendResult(interp,<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"wrong&nbsp;#&nbsp;args:&nbsp;should&nbsp;be:&nbsp;\"",<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;argv[0],&nbsp;"&nbsp;VALUE&nbsp;VALUE\"",&nbsp;0);<br>
-&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;TCL_ERROR;<br>
-&nbsp;&nbsp;}<br>
-&nbsp;&nbsp;if(&nbsp;Tcl_GetInt(interp,&nbsp;argv[1],&nbsp;&amp;a)!=TCL_OK&nbsp;){<br>
-&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;TCL_ERROR;<br>
-&nbsp;&nbsp;}<br>
-&nbsp;&nbsp;if(&nbsp;Tcl_GetInt(interp,&nbsp;argv[1],&nbsp;&amp;b)!=TCL_OK&nbsp;){<br>
-&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;TCL_ERROR;<br>
-&nbsp;&nbsp;}<br>
-&nbsp;&nbsp;sprintf(zResult,&nbsp;"-1073742724",&nbsp;a+b);<br>
-&nbsp;&nbsp;Tcl_SetResult(interp,&nbsp;zResult,&nbsp;TCL_VOLATILE);<br>
-&nbsp;&nbsp;return&nbsp;TCL_OK;<br>
-}</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-</table>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">Adding Your Own <tt>main()</tt></h2>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
-&nbsp;&nbsp;/*&nbsp;Application&nbsp;specific&nbsp;initialization&nbsp;*/</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;Et_Init(argc,&nbsp;argv);</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Never returns!</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;/*NOTREACHED*/<br>
-&nbsp;&nbsp;return&nbsp;0;<br>
-}</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-</table>
-<p><table><tr><td valign="top"><img src="image3"></td>
-<td valign="top"><b>The "Autofork" feature is disabled if you supply your own <tt>main()</tt></b></td></tr></table>
-</p>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">Initializing The Tcl Interpreter</h2>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>#include&nbsp;&lt;tcl.h><br>
-&nbsp;<br>
-int&nbsp;counter&nbsp;=&nbsp;0;<br>
-&nbsp;<br>
-int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
-&nbsp;&nbsp;&nbsp;Et_Init(argc,&nbsp;argv);<br>
-&nbsp;&nbsp;&nbsp;/*NOTREACHED*/<br>
-&nbsp;&nbsp;&nbsp;return&nbsp;0;<br>
-}<br>
-&nbsp;<br>
-int&nbsp;Et_AppInit(Tcl_Interp&nbsp;*interp){</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;if(&nbsp;Blt_Init(Interp)&nbsp;){<br>
-&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;TCL_ERROR;<br>
-&nbsp;&nbsp;}</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Example: Initialize an extension</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;Tcl_LinkVar(interp,&nbsp;"counter",&nbsp;&amp;counter,<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TCL_LINK_INT);</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Or link a C variable to a Tcl variable</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;return&nbsp;TCL_OK;</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Return TCL_OK if successful</td>
-</tr>
-<tr><td valign="center">
-<small><tt>}</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-</table>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">Writing Your Own Event Loop</h2>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>#include&nbsp;&lt;tcl.h><br>
-</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>void&nbsp;Et_CustomMainLoop(Tcl_Interp&nbsp;*interp){</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Replaces the default event loop</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;return;</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Ex: Return without handling any events.</td>
-</tr>
-<tr><td valign="center">
-<small><tt>}<br>
-&nbsp;<br>
-int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;Et_Init(argc,&nbsp;argv);</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">This now returns after initializing Tcl</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;/*&nbsp;Application&nbsp;code&nbsp;here&nbsp;*/<br>
-&nbsp;&nbsp;return&nbsp;0;<br>
-}</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-</table>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">Writing Your Own Event Loop</h2>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>#include&nbsp;&lt;tcl.h><br>
-&nbsp;<br>
-void&nbsp;Et_CustomMainLoop(Tcl_Interp&nbsp;*interp){</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;for(;;){<br>
-&nbsp;&nbsp;&nbsp;&nbsp;Tcl_DoOneEvent(TCL_ALL_EVENTS|TCL_DONT_WAIT);<br>
-&nbsp;&nbsp;&nbsp;&nbsp;/*&nbsp;Other&nbsp;processing...&nbsp;*/<br>
-&nbsp;&nbsp;}</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Intermix processing and event handling</td>
-</tr>
-<tr><td valign="center">
-<small><tt>}<br>
-&nbsp;<br>
-int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;Et_Init(argc,&nbsp;argv);</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Never returns</td>
-</tr>
-<tr><td valign="center">
-<small><tt>&nbsp;&nbsp;/*NOTREACHED*/<br>
-&nbsp;&nbsp;return&nbsp;0;<br>
-}</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-</table>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">Mktclapp Initialization Sequence</h2>
-<p><ul><li>Initialization starts when the <tt>Et_Init()</tt>
-  function is called either by client code or by
-  the <tt>main()</tt> that mktclapp generates</li></ul><ul><li>Create the main Tcl interpreter</li></ul><ul><li>Construct the virtual filesystem overlay by redefining
-  the <tt>source</tt> command and by using the
-  <tt>Tcl</tt>*<tt>InsertProc()</tt> functions</li></ul><ul><li>Call <tt>Et_PreInit()</tt> if the client defines it</li></ul><ul><li>Call <tt>Tcl_Init()</tt> and <tt>Tk_Init()</tt></li></ul><ul><li>Call <tt>Tcl_CreateCommand()</tt> and <tt>Tcl_CreateObjCommand()</tt>
-  for every <tt>ET_COMMAND_</tt>* and <tt>ET_OBJCOMMAND_</tt>* function
-  in the client code</li></ul><ul><li>Call <tt>Et_AppInit()</tt> if the client defines it</li></ul><ul><li>Run the main Tcl script if there is one</li></ul><ul><li>Call <tt>Et_CustomMainLoop()</tt> if defined by client code or
-  else run the built-in event loop</li></ul></p>
-<br clear="both"><p><hr></p>
-<h2 align="center">Invoking Tcl From C</h2>
-<p><ul><li>Use one of the built-in evaluation functions:
-  <center><table width="80%">
-  <tr><td valign="top" width="50%"><ul>
-     <li> Tcl_Eval() </li>
-     <li> Tcl_VarEval() </li>
-     <li> Tcl_EvalFile() </li>
-     <li> Tcl_GlobalEval() </li>
-     </ul></td>
-  <td valign="top" width="50%"><ul>
-     <li> Tcl_EvalObj() </li>
-     <li> Tcl_GlobalEvalObj() </li>
-   </ul></td></tr>
-  </table></center></li></ul><ul><li>Mktclapp provides evaluation functions with variable argument
-  lists as in <tt>printf()</tt>:
-  <ul>
-  <li> Et_EvalF() </li>
-  <li> Et_GlobalEvalF() </li>
-  </ul></li></ul><ul><li>Mktclapp provides a global variable <tt>Et_Interp</tt> which is
-  a pointer to the main interpreter</li></ul></p>
-<br clear="both"><p><hr></p>
-<h2 align="center">Invoking Tcl From C</h2>
-<p>Example:  A C function that pops up an error message dialog box</p><p>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>#include&nbsp;"appinit.h"<br>
-&nbsp;<br>
-void&nbsp;ErrMsg(char&nbsp;*zMsg){<br>
-&nbsp;&nbsp;Tcl_SetVar(Et_Interp,&nbsp;"zMsg",&nbsp;zMsg,&nbsp;TCL_GLOBAL_ONLY);<br>
-&nbsp;&nbsp;Tcl_GlobalEval(Et_Interp,&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;"tk_messageBox&nbsp;-icon&nbsp;error&nbsp;-msg&nbsp;$zMsg&nbsp;-type&nbsp;ok");<br>
-&nbsp;&nbsp;Tcl_UnsetVar(Et_Interp,&nbsp;"zMsg",&nbsp;TCL_GLOBAL_ONLY);<br>
-}</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-</table>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">Invoking Tcl From C</h2>
-<p>The same C function implemented using <tt>Et_EvalF()</tt> instead
-  of <tt>Tcl_GlobalEval()</tt></p><p>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>#include&nbsp;"appinit.h"<br>
-&nbsp;<br>
-void&nbsp;ErrMsg(char&nbsp;*zMsg){<br>
-&nbsp;&nbsp;Et_EvalF(Et_Interp,&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;"tk_messageBox&nbsp;-icon&nbsp;error&nbsp;-msg&nbsp;{����P�X�}&nbsp;-type&nbsp;ok",<br>
-&nbsp;&nbsp;&nbsp;&nbsp;zMsg);<br>
-}</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-</table>
-<p>
-  <ul><li>
-  Suppose the function is called as follows:
-  <blockquote>
-    <tt>ErrMsg("Syntax error near \"}\"");</tt>
-  </blockquote>
-  </li></ul>
-
-  <ul><li>
-  The command that gets executed is:
-  <pre>
-    tk_messageBox -icon error -msg \
-        {Syntax error near "}"} -type ok
-  </pre>
-  </li></ul>
-
-  <ul><li>
-  But this is an ill-formed Tcl command!
-  </li></ul>
-</p>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">Invoking Tcl From C</h2>
-<p>Use the "<tt></tt>" format to generate a quoted string</p><p>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>#include&nbsp;"appinit.h"<br>
-&nbsp;<br>
-void&nbsp;ErrMsg(char&nbsp;*zMsg){<br>
-&nbsp;&nbsp;Et_EvalF(Et_Interp,&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;"tk_messageBox&nbsp;-icon&nbsp;error&nbsp;-msg&nbsp;\"%\"&nbsp;-type&nbsp;ok",<br>
-&nbsp;&nbsp;&nbsp;&nbsp;zMsg);<br>
-}</tt></small></td>
-<td></td><td></td><td></td><td></td>
-</tr>
-</table>
-<p><ul><li>The <tt></tt> puts a backslash before all characters that
-  are special to Tcl</li></ul><ul><li>The Tcl command becomes:
-  <pre>
-    tk_messageBox -icon error -msg \
-        "Syntax error near \"\}\"" -type ok
-  </pre></li></ul></p>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">Other Functions Provided By Mktclapp</h2>
-<p><ul><li><tt>void Et_ResultF(Tcl_Interp*, ...);</tt></li></ul><ul><li><tt>char *Et_DStringAppendF(Tcl_DString*, ...);</tt></li></ul><ul><li><tt>int Et_AppendObjF(Tcl_Obj*, ...);</tt></li></ul><ul><li><tt>char *mprintf(const char *format, ...);<br>
-  char *vmprintf(const char *format, va_list);</tt></li></ul><ul><li><tt>void Et_NewBuiltinFile(char *filename, char *data, int amt);</tt></li></ul></p>
-<br clear="both"><p><hr></p>
-<h2 align="center">Operating Mktclapp From The Command Line</h2>
-<p><ul><li>Generate the <tt>appinit.h</tt> header file like this:
-  <blockquote>
-  <tt>mktclapp -header &gt;appinit.h</tt>
-  </blockquote></li></ul><ul><li>Generate the <tt>appinit.c</tt> file like this:
-  <blockquote>
-  <tt>mktclapp -f appinit.mta >appinit.c</tt>
-  </blockquote></li></ul><ul><li>The <tt>*.mta</tt> file is just a list of command-line options</li></ul><ul><li>Enter
-  <blockquote>
-  <tt>mktclapp -help</tt>
-  </blockquote>
-  to get a list of available options</li></ul><ul><li>Look at MTA files generated by xmktclapp.tcl for examples</li></ul></p>
-<br clear="both"><p><hr></p>
-<h2 align="center">Format Of An MTA File</h2>
-<table cellspacing="0" cellpadding="0" border="0">
-<tr><td valign="center">
-<small><tt>#&nbsp;Configuration&nbsp;file&nbsp;generated&nbsp;by&nbsp;xmktclapp<br>
-#&nbsp;Hand&nbsp;editing&nbsp;is&nbsp;not&nbsp;recommended<br>
-#</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Comments begin with one #</td>
-</tr>
-<tr><td valign="center">
-<small><tt>##&nbsp;Autofork&nbsp;No<br>
-##&nbsp;CFile:add.c&nbsp;1<br>
-##&nbsp;CFile:objadd.c&nbsp;1<br>
-##&nbsp;CmdLine&nbsp;Console<br>
-##&nbsp;ConfigFile&nbsp;hw.mta<br>
-##&nbsp;Data:check.gif&nbsp;1<br>
-##&nbsp;MainScript&nbsp;hw.tcl<br>
-##&nbsp;Mode&nbsp;Tcl/Tk<br>
-##&nbsp;NoSource&nbsp;No<br>
-##&nbsp;OutputFile&nbsp;hw.c<br>
-##&nbsp;Shroud&nbsp;No<br>
-##&nbsp;Standalone&nbsp;Yes<br>
-##&nbsp;TclFile:hw.tcl&nbsp;1<br>
-##&nbsp;TclLib&nbsp;/usr/lib/tcl8.0<br>
-##&nbsp;TkLib&nbsp;/usr/lib/tk8.0</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">Lines beginning with two #s are used
-  by xmktclapp.tcl and ignored by mktclapp</td>
-</tr>
-<tr><td valign="center">
-<small><tt>-console<br>
--main-script&nbsp;"hw.tcl"<br>
--tcl-library&nbsp;"/usr/lib/tcl8.0"<br>
--tk-library&nbsp;"/usr/lib/tk8.0"<br>
-"add.c"<br>
-"objadd.c"<br>
--i&nbsp;"check.gif"<br>
--strip-tcl&nbsp;"hw.tcl"</tt></small></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center"><img src="image2"></td>
-<td>&nbsp;&nbsp;</td>
-<td valign="center">All other lines are read by mktclapp and
-  ignored by xmktclapp.tcl</td>
-</tr>
-</table>
-
-<br clear="both"><p><hr></p>
-<h2 align="center">Summary</h2>
-<p><ul><li>Use Tcl for the things Tcl is good at and use C/C++ for the things that
-  C/C++ is good at</li></ul><ul><li>Use wrapper programs to make pure Tcl programs standalone</li></ul><ul><li>Use mktclapp to combine Tcl/Tk with C/C++ into a standalone</li></ul></p>
-<br clear="both"><p><hr></p>
diff --git a/ext/tk/sample/tkextlib/tkHTML/page4/image1 b/ext/tk/sample/tkextlib/tkHTML/page4/image1
deleted file mode 100644
index da26d7092e..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page4/image1
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page4/image2 b/ext/tk/sample/tkextlib/tkHTML/page4/image2
deleted file mode 100644
index e176a96a55..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page4/image2
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page4/image3 b/ext/tk/sample/tkextlib/tkHTML/page4/image3
deleted file mode 100644
index e829d3712c..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page4/image3
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page4/image4 b/ext/tk/sample/tkextlib/tkHTML/page4/image4
deleted file mode 100644
index f14ea13547..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page4/image4
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page4/image5 b/ext/tk/sample/tkextlib/tkHTML/page4/image5
deleted file mode 100644
index 4ef6277226..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page4/image5
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page4/image6 b/ext/tk/sample/tkextlib/tkHTML/page4/image6
deleted file mode 100644
index 1adb261b40..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page4/image6
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page4/image7 b/ext/tk/sample/tkextlib/tkHTML/page4/image7
deleted file mode 100644
index ba0d26ec18..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page4/image7
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page4/image8 b/ext/tk/sample/tkextlib/tkHTML/page4/image8
deleted file mode 100644
index 8b81d58e27..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page4/image8
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page4/image9 b/ext/tk/sample/tkextlib/tkHTML/page4/image9
deleted file mode 100644
index f0a352f9d0..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page4/image9
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tkHTML/page4/index.html b/ext/tk/sample/tkextlib/tkHTML/page4/index.html
deleted file mode 100644
index 588ae5ccd7..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/page4/index.html
+++ /dev/null
@@ -1,768 +0,0 @@
-<!DOCTYPE HTML="HTML" PUBLIC="PUBLIC" "-//W3C//DTD=""-//W3C//DTD" HTML="HTML" 4.0="4.0" Transitional//EN"="Transitional//EN"">
-<HTML>
-<HEAD>
-<TITLE>[fm] welcome to freshmeat.net</TITLE>
-<STYLE TYPE="text/css"><!-- A:link {text-decoration: none}A:visited{text-decoration:none}A:active{text-decoration:none}--></STYLE>
-</HEAD>
-<BODY MARGINWIDTH="0" MARGINHEIGHT="0" LEFTMARGIN="0" RIGHTMARGIN="0" TOPMARGIN="0" BGCOLOR="#FFFFFF" TEXT="#000000" LINK="#336699" VLINK="#336699" ALINK="#336699">
-<BR><CENTER><TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0"><TR><TD WIDTH="1"><SCRIPT LANGUAGE="JAVASCRIPT">
-<!--
-now = new Date();
-tail = now.getTime();
-document.write("<IMG SRC='http://209.207.224.246/FreshMeat/Core/pc.gif?/index.php3," + tail + "' WIDTH=1 HEIGHT=1><BR>");
-//-->
-</SCRIPT>
-<NOSCRIPT>
-<IMG SRC="image1" WIDTH="1" HEIGHT="1"><BR>
-</NOSCRIPT></TD></TR></TABLE>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0"><TR><TD WIDTH="468"><SCRIPT LANGUAGE="JAVASCRIPT">
-<!--
-now = new Date();
-tail = now.getTime();
-AltText = "\"Please click here.\"";
-document.write("<A HREF='http://ads.freshmeat.net/cgi-bin/ad_click.pl?index,tsof0001en'>")
-document.write("<IMG SRC='http://ads.freshmeat.net/tsof0001en.gif?" + tail + "' WIDTH=468 HEIGHT=60 ALT=" + AltText + "></A><BR>");
-//-->
-</SCRIPT>
-<NOSCRIPT>
-<A HREF="http://ads.freshmeat.net/cgi-bin/ad_click.pl?index,tsof0001en"><IMG SRC="image2" WIDTH="468" HEIGHT="60" ALT="Please click here."></A><BR>
-</NOSCRIPT></TD></TR></TABLE>
-
-<TABLE CELLSPACING="0" CELLPADDING="2" BORDER="0" WIDTH="97%"><TR>
-<TD ALIGN="left" VALIGN="bottom"><A HREF="/"><IMG SRC="image3" BORDER="0" ALT="freshmeat.net" WIDTH="300" HEIGHT="65"></A></TD>
-<TD VALIGN="bottom" ALIGN="left" ROWSPAN="2"><FONT FACE="Lucida,Verdana,Helvetica,Arial">
-<FORM METHOD="get" ACTION="/search.php3">
-<SMALL>find: <INPUT TYPE="text" SIZE="15" NAME="query"></SMALL></FORM></FONT></TD>
-<TD ALIGN="right" VALIGN="bottom"><FONT FACE="Lucida,Verdana,Helvetica,Arial">
-<A HREF="http://www.linux.com"><FONT COLOR="#000000"><B><SMALL>linux.com partner</SMALL></B></FONT></A><BR>
-<TABLE CELLSPACING="0" CELLPADDING="1" BORDER="0" WIDTH="100%"><TR>
-<TD ALIGN="right"><SMALL><NOBR><FONT FACE="Lucida,Verdana,Helvetica,Arial"><B><A HREF="/">news</A> |<BR>
-<A HREF="/appindex/">appindex</A> |<BR>
-<A HREF="/editorials/">editorials</A> |</B></FONT></NOBR></SMALL></TD>
-<TD ALIGN="right"><SMALL><NOBR><FONT FACE="Lucida,Verdana,Helvetica,Arial"><B><A HREF="/lounge/">lounge</A> |<BR>
-<A HREF="/contrib.php3">contribute</A> |<BR>
-<A HREF="/feedback.php3">feedback</A> |</B></FONT></NOBR></SMALL></TD>
-<TD ALIGN="right"><SMALL><NOBR><FONT FACE="Lucida,Verdana,Helvetica,Arial"><B><A HREF="/about.php3">about</A> |<BR>
-<A HREF="/awards.php3">awards</A> |<BR>
-<A HREF="/faq.php3">FAQ</A> |</B></FONT></NOBR></SMALL></TD>
-</TR></TABLE></TD>
-</TR></TABLE>
-<TABLE WIDTH="100%" CELLPADDING="0" CELLSPACING="0" BORDER="0">
-<TR BGCOLOR="#000000"><TD><IMG SRC="image4" WIDTH="1" HEIGHT="2" ALT=""></TD></TR></TABLE>
-<TABLE CELLSPACING="0" CELLPADDING="3" BORDER="0" WIDTH="100%" BGCOLOR="#BBDDFF">
-<TR><TD ALIGN="center" VALIGN="top">
-<BR>
-<FONT FACE="Lucida,Verdana,Helvetica,Arial">
-
-
-<SMALL><B>sort by: [ <A HREF="/news/2000/01/29/">date</A> | <A HREF="/news/list.php3?day=/2000/01/29/&orderby=name">name</A> | <A HREF="/news/list.php3?day=/2000/01/29/&orderby=urgency">urgency</A> ]</B></SMALL><BR></TD><TD>&nbsp;</TD></TR><TR><TD VALIGN="top" ALIGN="center"><FONT FACE="Lucida,Verdana,Helvetica,Arial"><TABLE CELLSPACING="0" CELLPADDING="2" WIDTH="97%" BORDER="0" BGCOLOR="#000000"><TR><TD COLSPAN="2">
-<TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#FFFFFF">
-<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
-<B><FONT SIZE="+2">We should get this out of the door now</FONT></B><BR>
-<SMALL><B><A HREF="mailto:scoop@freshmeat.net">scoop</A> - January 29th 2000, 23:59 EST</B></SMALL>
-<P>Everyone else is talking about it, so we should announce it ourselves
-before you start to think it's a government hoax. <A HREF="http://server51.freshmeat.net/">Server 51</A> is our new hosting service for Open Source projects, based on Super Cool Space Alien Technology(TM). We hadn't planned to announce it quite so soon, and it's still in the alpha stage as we work day and night at integrating SCSAT with our terrestrial systems, but feel free to take a look around and see what's going on. When we're out of the testing stage and ready to make room for your project, we'll send word via your implants. Be listening.
-
-
-
-<P ALIGN="right"><B>[ <A HREF="/news/2000/01/29/949208399.html">comments (8)</A> ]</B>
-</FONT></TD></TR></TABLE></TD></TR><TR><TD VALIGN="middle">
-&nbsp;<FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#FFFFFF"><B><SMALL>Category: freshmeat
-</SMALL></B></FONT></FONT></TD><TD ALIGN="right">
- 	<A HREF="http://server51.freshmeat.net"><IMG SRC="image5" WIDTH="21" HEIGHT="21" BORDER="0" ALT="homepage"></A>  &nbsp;
-</TD></TR></TABLE>
-<HR WIDTH="0" SIZE="0">
-
-
-<TABLE CELLSPACING="0" CELLPADDING="2" WIDTH="97%" BORDER="0" BGCOLOR="#000000"><TR><TD COLSPAN="2">
-<TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#FFFFFF">
-<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
-<B><FONT SIZE="+2">Is Linux for Crazies?</FONT></B><BR>
-<SMALL><B><A HREF="mailto:jeff.covey@pobox.com">jeff covey</A> - January 29th 2000, 23:59 EST</B></SMALL>
-<P>Ray Woodcock writes: "In terms relevant to Linux, this freshmeat
-editorial glances at the tendency of mainstream viewpoints to dismiss
-other viewpoints as 'fringe,' the propensity of dissident movements to
-splinter into factions before they can effectively counter their
-primary adversaries, and the difficulty of creating stability without
-squelching curiosity."
-<P ALIGN="right"><B>[ <A HREF="/news/2000/01/29/949208340.html">comments (2), 2065 words in body</A> ]</B>
-</FONT></TD></TR></TABLE></TD></TR><TR><TD VALIGN="middle">
-&nbsp;<FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#FFFFFF"><B><SMALL>Category: Editorial
-</SMALL></B></FONT></FONT></TD><TD ALIGN="right">
-   &nbsp;
-</TD></TR></TABLE>
-<HR WIDTH="0" SIZE="0">
-
-
-<TABLE CELLSPACING="0" CELLPADDING="2" WIDTH="97%" BORDER="0" BGCOLOR="#000000"><TR><TD COLSPAN="2">
-<TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#FFFFFF">
-<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
-<B><FONT SIZE="+2">RabbIT 2.0.2</FONT></B><BR>
-<SMALL><B><A HREF="mailto:d94-rol@nada.kth.se">Ernimril</A> - January 29th 2000, 18:29 EST</B></SMALL>
-<DIV ALIGN="justify"><P>RabbIt is the mutating, caching webproxy which is used to speed up surfing over slow links like modems. It does this by removing advertising and background images and scaling down images to low quality JPEGs. RabbIT is written in Java and should be able to run on any platform. It does depend upon an image converter if imagescaleing is on. The recommended image converter is "convert" from the ImageMagick package.</DIV>
-<P><B>Changes:</B> Fixes have been made for a few bugs concerning keep alive and the HTTP response header, a bug with NT and cache directories, a bug concerning requests without a response body, a bug in GZIPHandler that caused it to not gzip already compressed (gzip or compress) streams, a bug in HTTPHeader regarding response phrases that are multiline, and a few bugs in ImageHandler and NCache. GZIPHandler has been built as an intermediate(*) to FilterHandler (this means that it is possible to gzip text/plain, etc., without filtering those streams) uuencoding has been added to the Coder, RabbIT now uses HTTP/1.1, HTMLParser now compiles cleanly with Jikes, and GeneralHeader has been created to allow for HTTPFooter (which is useful when sending chunked data).
-<P><B>Urgency:</B> low
-<P ALIGN="right"><B>[ <A HREF="/news/2000/01/29/949188564.html">comments (0)</A> ]</B>
-</FONT></TD></TR></TABLE></TD></TR><TR><TD VALIGN="middle">
-&nbsp;<FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#FFFFFF"><B><SMALL>License: freely distributable</SMALL></B><BR>
-<B><SMALL>&nbsp;Category: <A HREF="/appindex/daemons/proxy.html"><FONT COLOR="#FFFFFF">Daemons/Proxy</FONT></A></SMALL></B></FONT></FONT></TD><TD ALIGN="right">
-<A HREF="http://apps.freshmeat.net/download/902659138/"><IMG SRC="image6" WIDTH="21" HEIGHT="21" BORDER="0" ALT="download"></A> <A HREF="http://apps.freshmeat.net/homepage/902659138/"><IMG SRC="image5" WIDTH="21" HEIGHT="21" BORDER="0" ALT="homepage"></A>  	<A HREF="/appindex/1998/08/09/902659138.html"><IMG SRC="image7" WIDTH="21" HEIGHT="21" BORDER="0" ALT="appindex record"></A> &nbsp;
-</TD></TR></TABLE>
-<HR WIDTH="0" SIZE="0">
-
-
-<TABLE CELLSPACING="0" CELLPADDING="2" WIDTH="97%" BORDER="0" BGCOLOR="#000000"><TR><TD COLSPAN="2">
-<TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#FFFFFF">
-<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
-<B><FONT SIZE="+2">nmpg 1.1.3</FONT></B><BR>
-<SMALL><B><A HREF="mailto:narkos@linuxmail.org">Joel Lindau</A> - January 29th 2000, 18:18 EST</B></SMALL>
-<DIV ALIGN="justify"><P>nmpg is a small command-driven frontend and network-jukebox for mpg123.</DIV>
-<P><B>Changes:</B> Bugfixes, better memory management, a new .nmpgrc parser, and new options.
-<P><B>Urgency:</B> low
-<P ALIGN="right"><B>[ <A HREF="/news/2000/01/29/949187896.html">comments (0)</A> ]</B>
-</FONT></TD></TR></TABLE></TD></TR><TR><TD VALIGN="middle">
-&nbsp;<FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#FFFFFF"><B><SMALL>License: OpenSource</SMALL></B><BR>
-<B><SMALL>&nbsp;Category: <A HREF="/appindex/console/sound.html"><FONT COLOR="#FFFFFF">Console/Sound</FONT></A></SMALL></B></FONT></FONT></TD><TD ALIGN="right">
-<A HREF="http://apps.freshmeat.net/download/935430877/"><IMG SRC="image6" WIDTH="21" HEIGHT="21" BORDER="0" ALT="download"></A> <A HREF="http://apps.freshmeat.net/homepage/935430877/"><IMG SRC="image5" WIDTH="21" HEIGHT="21" BORDER="0" ALT="homepage"></A> <A HREF="http://apps.freshmeat.net/changelog/935430877/"><IMG SRC="image8" WIDTH="21" HEIGHT="21" BORDER="0" ALT="changelog"></A> 	<A HREF="/appindex/1999/08/23/935430877.html"><IMG SRC="image7" WIDTH="21" HEIGHT="21" BORDER="0" ALT="appindex record"></A> &nbsp;
-</TD></TR></TABLE>
-<HR WIDTH="0" SIZE="0">
-
-
-<TABLE CELLSPACING="0" CELLPADDING="2" WIDTH="97%" BORDER="0" BGCOLOR="#000000"><TR><TD COLSPAN="2">
-<TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#FFFFFF">
-<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
-<B><FONT SIZE="+2">mod_dtcl 0.7.3</FONT></B><BR>
-<SMALL><B><A HREF="mailto:davidw@prosa.it">David Welton</A> - January 29th 2000, 18:11 EST</B></SMALL>
-<DIV ALIGN="justify"><P>Mod_dtcl is a free/open source implementation of server-parsed Tcl under Apache. It allows you to tightly integrate HTML with Tcl, a widely-used scripting language with many years of development invested in it. There are also many external Tcl modules that you can load into mod_dtcl, to create images, access databases, etc.</DIV>
-<P><B>Changes:</B> A major overhaul of header handling and internal buffering, and the addition of the ability to handle binary data.
-<P><B>Urgency:</B> low
-<P ALIGN="right"><B>[ <A HREF="/news/2000/01/29/949187471.html">comments (0)</A> ]</B>
-</FONT></TD></TR></TABLE></TD></TR><TR><TD VALIGN="middle">
-&nbsp;<FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#FFFFFF"><B><SMALL>License: GPL</SMALL></B><BR>
-<B><SMALL>&nbsp;Category: <A HREF="/appindex/web/development.html"><FONT COLOR="#FFFFFF">Web/Development</FONT></A></SMALL></B></FONT></FONT></TD><TD ALIGN="right">
-<A HREF="http://apps.freshmeat.net/download/917925309/"><IMG SRC="image6" WIDTH="21" HEIGHT="21" BORDER="0" ALT="download"></A> <A HREF="http://apps.freshmeat.net/homepage/917925309/"><IMG SRC="image5" WIDTH="21" HEIGHT="21" BORDER="0" ALT="homepage"></A> <A HREF="http://apps.freshmeat.net/changelog/917925309/"><IMG SRC="image8" WIDTH="21" HEIGHT="21" BORDER="0" ALT="changelog"></A> 	<A HREF="/appindex/1999/02/01/917925309.html"><IMG SRC="image7" WIDTH="21" HEIGHT="21" BORDER="0" ALT="appindex record"></A> &nbsp;
-</TD></TR></TABLE>
-<HR WIDTH="0" SIZE="0">
-
-
-<TABLE CELLSPACING="0" CELLPADDING="2" WIDTH="97%" BORDER="0" BGCOLOR="#000000"><TR><TD COLSPAN="2">
-<TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#FFFFFF">
-<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
-<B><FONT SIZE="+2">CoreLinux++ 0.4.6</FONT></B><BR>
-<SMALL><B><A HREF="mailto:frankc@users.sourceforge.net">Frank V. Castellucci</A> - January 29th 2000, 18:07 EST</B></SMALL>
-<DIV ALIGN="justify"><P>CoreLinux++ is an initiative to normalize methods and conventions for OOA/OOD/C++ development for Linux, materialized in a set of Open Source C++ class libraries (libcorelinux++ and libcoreframework++) to support common patterns and exploit the C++ standards.</DIV>
-<P><B>Changes:</B> This release adds AbstractFactory and AssociativeIterator analysis, design, implementations, test code, a CVS daily tarball, a Patch Submission facility and updated FAQ, Web Pages, and defect reporting guidelines.
-<P><B>Urgency:</B> medium
-<P ALIGN="right"><B>[ <A HREF="/news/2000/01/29/949187233.html">comments (0)</A> ]</B>
-</FONT></TD></TR></TABLE></TD></TR><TR><TD VALIGN="middle">
-&nbsp;<FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#FFFFFF"><B><SMALL>License: LGPL</SMALL></B><BR>
-<B><SMALL>&nbsp;Category: <A HREF="/appindex/development/libraries.html"><FONT COLOR="#FFFFFF">Development/Libraries</FONT></A></SMALL></B></FONT></FONT></TD><TD ALIGN="right">
-<A HREF="http://apps.freshmeat.net/download/944077775/"><IMG SRC="image6" WIDTH="21" HEIGHT="21" BORDER="0" ALT="download"></A> <A HREF="http://apps.freshmeat.net/homepage/944077775/"><IMG SRC="image5" WIDTH="21" HEIGHT="21" BORDER="0" ALT="homepage"></A> <A HREF="http://apps.freshmeat.net/changelog/944077775/"><IMG SRC="image8" WIDTH="21" HEIGHT="21" BORDER="0" ALT="changelog"></A> 	<A HREF="/appindex/1999/12/01/944077775.html"><IMG SRC="image7" WIDTH="21" HEIGHT="21" BORDER="0" ALT="appindex record"></A> &nbsp;
-</TD></TR></TABLE>
-<HR WIDTH="0" SIZE="0">
-
-
-<TABLE CELLSPACING="0" CELLPADDING="2" WIDTH="97%" BORDER="0" BGCOLOR="#000000"><TR><TD COLSPAN="2">
-<TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#FFFFFF">
-<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
-<B><FONT SIZE="+2">scribe 0.2</FONT></B><BR>
-<SMALL><B><A HREF="mailto:kahlage@logoncafe.net">ChromeBob</A> - January 29th 2000, 12:12 EST</B></SMALL>
-<DIV ALIGN="justify"><P>scribe writes functions prototypes for your C code, so you don't have to. It also compares unique functions between source code files and will 'extern' when appropriate. C++ methods support is also planned.</DIV>
-<P><B>Changes:</B> A fix for an fflush() bug and better documentation.
-<P><B>Urgency:</B> low
-<P ALIGN="right"><B>[ <A HREF="/news/2000/01/29/949165962.html">comments (0)</A> ]</B>
-</FONT></TD></TR></TABLE></TD></TR><TR><TD VALIGN="middle">
-&nbsp;<FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#FFFFFF"><B><SMALL>License: GPL</SMALL></B><BR>
-<B><SMALL>&nbsp;Category: <A HREF="/appindex/development/tools.html"><FONT COLOR="#FFFFFF">Development/Tools</FONT></A></SMALL></B></FONT></FONT></TD><TD ALIGN="right">
-<A HREF="http://apps.freshmeat.net/download/946661656/"><IMG SRC="image6" WIDTH="21" HEIGHT="21" BORDER="0" ALT="download"></A> <A HREF="http://apps.freshmeat.net/homepage/946661656/"><IMG SRC="image5" WIDTH="21" HEIGHT="21" BORDER="0" ALT="homepage"></A>  	<A HREF="/appindex/1999/12/31/946661656.html"><IMG SRC="image7" WIDTH="21" HEIGHT="21" BORDER="0" ALT="appindex record"></A> &nbsp;
-</TD></TR></TABLE>
-<HR WIDTH="0" SIZE="0">
-
-
-<TABLE CELLSPACING="0" CELLPADDING="2" WIDTH="97%" BORDER="0" BGCOLOR="#000000"><TR><TD COLSPAN="2">
-<TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#FFFFFF">
-<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
-<B><FONT SIZE="+2">E theme updater 0.1</FONT></B><BR>
-<SMALL><B><A HREF="mailto:hallvar@ii.uib.no">Hallvar Helleseth</A> - January 29th 2000, 12:04 EST</B></SMALL>
-<DIV ALIGN="justify"><P>E theme Updater is a bash script to automatically update all of your Enlightenment themes from e.themes.org.</DIV>
-<P><B>Changes:</B> Initial release.
-
-<P ALIGN="right"><B>[ <A HREF="/news/2000/01/29/949165472.html">comments (0)</A> ]</B>
-</FONT></TD></TR></TABLE></TD></TR><TR><TD VALIGN="middle">
-&nbsp;<FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#FFFFFF"><B><SMALL>License: GPL</SMALL></B><BR>
-<B><SMALL>&nbsp;Category: <A HREF="/appindex/console/misc.html"><FONT COLOR="#FFFFFF">Console/Misc</FONT></A></SMALL></B></FONT></FONT></TD><TD ALIGN="right">
-<A HREF="http://apps.freshmeat.net/download/949164501/"><IMG SRC="image6" WIDTH="21" HEIGHT="21" BORDER="0" ALT="download"></A> <A HREF="http://apps.freshmeat.net/homepage/949164501/"><IMG SRC="image5" WIDTH="21" HEIGHT="21" BORDER="0" ALT="homepage"></A>  	<A HREF="/appindex/2000/01/29/949164501.html"><IMG SRC="image7" WIDTH="21" HEIGHT="21" BORDER="0" ALT="appindex record"></A> &nbsp;
-</TD></TR></TABLE>
-<HR WIDTH="0" SIZE="0">
-
-
-<TABLE CELLSPACING="0" CELLPADDING="2" WIDTH="97%" BORDER="0" BGCOLOR="#000000"><TR><TD COLSPAN="2">
-<TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#FFFFFF">
-<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
-<B><FONT SIZE="+2">Powertweak-Linux 0.1.7</FONT></B><BR>
-<SMALL><B><A HREF="mailto:dave@denial.force9.co.uk">Dave Jones</A> - January 29th 2000, 12:03 EST</B></SMALL>
-<DIV ALIGN="justify"><P>Powertweak-Linux is a port of the Microsoft Windows tool of the same name rewritten from the ground up. Its main function is to tune your system to its optimal performance settings. Currently, it tunes PCI chipsets and can set /proc/sys entries.</DIV>
-<P><B>Changes:</B> A major GUI overhaul, the ability to generate configuration files, extended PCI information tabs, extra information support for the Matrox G200, and numerous other bugfixes & improvements.
-<P><B>Urgency:</B> low
-<P ALIGN="right"><B>[ <A HREF="/news/2000/01/29/949165416.html">comments (2)</A> ]</B>
-</FONT></TD></TR></TABLE></TD></TR><TR><TD VALIGN="middle">
-&nbsp;<FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#FFFFFF"><B><SMALL>License: GPL</SMALL></B><BR>
-<B><SMALL>&nbsp;Category: <A HREF="/appindex/console/system.html"><FONT COLOR="#FFFFFF">Console/System</FONT></A></SMALL></B></FONT></FONT></TD><TD ALIGN="right">
-<A HREF="http://apps.freshmeat.net/download/930836224/"><IMG SRC="image6" WIDTH="21" HEIGHT="21" BORDER="0" ALT="download"></A> <A HREF="http://apps.freshmeat.net/homepage/930836224/"><IMG SRC="image5" WIDTH="21" HEIGHT="21" BORDER="0" ALT="homepage"></A> <A HREF="http://apps.freshmeat.net/changelog/930836224/"><IMG SRC="image8" WIDTH="21" HEIGHT="21" BORDER="0" ALT="changelog"></A> 	<A HREF="/appindex/1999/07/01/930836224.html"><IMG SRC="image7" WIDTH="21" HEIGHT="21" BORDER="0" ALT="appindex record"></A> &nbsp;
-</TD></TR></TABLE>
-<HR WIDTH="0" SIZE="0">
-
-
-<TABLE CELLSPACING="0" CELLPADDING="2" WIDTH="97%" BORDER="0" BGCOLOR="#000000"><TR><TD COLSPAN="2">
-<TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#FFFFFF">
-<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
-<B><FONT SIZE="+2">Pexeso Beta</FONT></B><BR>
-<SMALL><B><A HREF="mailto:pavolkrigler@pobox.sk">Pavol Krigler</A> - January 29th 2000, 11:55 EST</B></SMALL>
-<DIV ALIGN="justify"><P>pexeso is a simple graphic card game for one or two players.</DIV>
-<P><B>Changes:</B> Initial public release.
-
-<P ALIGN="right"><B>[ <A HREF="/news/2000/01/29/949164956.html">comments (0)</A> ]</B>
-</FONT></TD></TR></TABLE></TD></TR><TR><TD VALIGN="middle">
-&nbsp;<FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#FFFFFF"><B><SMALL>License: Freeware</SMALL></B><BR>
-<B><SMALL>&nbsp;Category: <A HREF="/appindex/console/games.html"><FONT COLOR="#FFFFFF">Console/Games</FONT></A></SMALL></B></FONT></FONT></TD><TD ALIGN="right">
-<A HREF="http://apps.freshmeat.net/download/949141436/"><IMG SRC="image6" WIDTH="21" HEIGHT="21" BORDER="0" ALT="download"></A> <A HREF="http://apps.freshmeat.net/homepage/949141436/"><IMG SRC="image5" WIDTH="21" HEIGHT="21" BORDER="0" ALT="homepage"></A>  	<A HREF="/appindex/2000/01/29/949141436.html"><IMG SRC="image7" WIDTH="21" HEIGHT="21" BORDER="0" ALT="appindex record"></A> &nbsp;
-</TD></TR></TABLE>
-<HR WIDTH="0" SIZE="0">
-
-
-<TABLE CELLSPACING="0" CELLPADDING="2" WIDTH="97%" BORDER="0" BGCOLOR="#000000"><TR><TD COLSPAN="2">
-<TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#FFFFFF">
-<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
-<B><FONT SIZE="+2">XZX 2.9.2</FONT></B><BR>
-<SMALL><B><A HREF="mailto:Erik.Kunze@fantasy.muc.de">E. Kunze</A> - January 29th 2000, 11:54 EST</B></SMALL>
-<DIV ALIGN="justify"><P>XZX is a portable emulator of ZX Spectrum 48K/128K/+3 (8-bit home computers made by Sir Clive Sinclair) and Pentagon/Scorpion (Spectrum clones made in Russia) for machines running UNIX and the X Window system. XZX is completely written in C and emulates Spectrum 48K, 128K, +2 and +3, Pentagon and Scorpion, Interface I with up to 8 microdrives, Multiface 128 and Multiface 3, BetaDisk 128 interface by Technology Research Ltd with 4 disk drives, +D interface by Miles Gordon Technology with 2 disk drives, Kempston mouse, Kempston joystick and built-in machine code monitor.</DIV>
-<P><B>Changes:</B> Lots of feature improvement and bug fixes. Most parts of the audio support has been rewritten for different UNICES.
-<P><B>Urgency:</B> low
-<P ALIGN="right"><B>[ <A HREF="/news/2000/01/29/949164896.html">comments (0)</A> ]</B>
-</FONT></TD></TR></TABLE></TD></TR><TR><TD VALIGN="middle">
-&nbsp;<FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#FFFFFF"><B><SMALL>License: Shareware</SMALL></B><BR>
-<B><SMALL>&nbsp;Category: <A HREF="/appindex/x11/emulators.html"><FONT COLOR="#FFFFFF">X11/Emulators</FONT></A></SMALL></B></FONT></FONT></TD><TD ALIGN="right">
-<A HREF="http://apps.freshmeat.net/download/936956384/"><IMG SRC="image6" WIDTH="21" HEIGHT="21" BORDER="0" ALT="download"></A> <A HREF="http://apps.freshmeat.net/homepage/936956384/"><IMG SRC="image5" WIDTH="21" HEIGHT="21" BORDER="0" ALT="homepage"></A> <A HREF="http://apps.freshmeat.net/changelog/936956384/"><IMG SRC="image8" WIDTH="21" HEIGHT="21" BORDER="0" ALT="changelog"></A> 	<A HREF="/appindex/1999/09/10/936956384.html"><IMG SRC="image7" WIDTH="21" HEIGHT="21" BORDER="0" ALT="appindex record"></A> &nbsp;
-</TD></TR></TABLE>
-<HR WIDTH="0" SIZE="0">
-
-
-<TABLE CELLSPACING="0" CELLPADDING="2" WIDTH="97%" BORDER="0" BGCOLOR="#000000"><TR><TD COLSPAN="2">
-<TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#FFFFFF">
-<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
-<B><FONT SIZE="+2">DistroLib 0.4</FONT></B><BR>
-<SMALL><B><A HREF="mailto:phir@gcu-squad.org">PhiR</A> - January 29th 2000, 11:54 EST</B></SMALL>
-<DIV ALIGN="justify"><P>DistroLib is an abstraction library designed to make the development of distributed application easier. Its main target is currently compute-bound tasks based on a one server, many clients model (much like distributed.net), but it is quite generic and could be used for any client/server app. It is lightweight, easy-to-use, and relies heavily on threads.</DIV>
-<P><B>Changes:</B> Important bug fixes and command history support.
-<P><B>Urgency:</B> low
-<P ALIGN="right"><B>[ <A HREF="/news/2000/01/29/949164869.html">comments (0)</A> ]</B>
-</FONT></TD></TR></TABLE></TD></TR><TR><TD VALIGN="middle">
-&nbsp;<FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#FFFFFF"><B><SMALL>License: GPL</SMALL></B><BR>
-<B><SMALL>&nbsp;Category: <A HREF="/appindex/development/libraries.html"><FONT COLOR="#FFFFFF">Development/Libraries</FONT></A></SMALL></B></FONT></FONT></TD><TD ALIGN="right">
-<A HREF="http://apps.freshmeat.net/download/942588431/"><IMG SRC="image6" WIDTH="21" HEIGHT="21" BORDER="0" ALT="download"></A> <A HREF="http://apps.freshmeat.net/homepage/942588431/"><IMG SRC="image5" WIDTH="21" HEIGHT="21" BORDER="0" ALT="homepage"></A> <A HREF="http://apps.freshmeat.net/changelog/942588431/"><IMG SRC="image8" WIDTH="21" HEIGHT="21" BORDER="0" ALT="changelog"></A> 	<A HREF="/appindex/1999/11/14/942588431.html"><IMG SRC="image7" WIDTH="21" HEIGHT="21" BORDER="0" ALT="appindex record"></A> &nbsp;
-</TD></TR></TABLE>
-<HR WIDTH="0" SIZE="0">
-
-
-<TABLE CELLSPACING="0" CELLPADDING="2" WIDTH="97%" BORDER="0" BGCOLOR="#000000"><TR><TD COLSPAN="2">
-<TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#FFFFFF">
-<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
-<B><FONT SIZE="+2">ToutDoux 1.1.7</FONT></B><BR>
-<SMALL><B><A HREF="mailto:yeupou@altern.org">yeupou</A> - January 29th 2000, 11:54 EST</B></SMALL>
-<DIV ALIGN="justify"><P>ToutDoux is a project manager which lets you design a plan of action using a tree structure, with translations in French and English.</DIV>
-<P><B>Changes:</B> A new menu and XML standard for save files.
-<P><B>Urgency:</B> low
-<P ALIGN="right"><B>[ <A HREF="/news/2000/01/29/949164843.html">comments (0)</A> ]</B>
-</FONT></TD></TR></TABLE></TD></TR><TR><TD VALIGN="middle">
-&nbsp;<FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#FFFFFF"><B><SMALL>License: GPL</SMALL></B><BR>
-<B><SMALL>&nbsp;Category: <A HREF="/appindex/gnome/tools.html"><FONT COLOR="#FFFFFF">GNOME/Tools</FONT></A></SMALL></B></FONT></FONT></TD><TD ALIGN="right">
-<A HREF="http://apps.freshmeat.net/download/944433411/"><IMG SRC="image6" WIDTH="21" HEIGHT="21" BORDER="0" ALT="download"></A> <A HREF="http://apps.freshmeat.net/homepage/944433411/"><IMG SRC="image5" WIDTH="21" HEIGHT="21" BORDER="0" ALT="homepage"></A>  	<A HREF="/appindex/1999/12/05/944433411.html"><IMG SRC="image7" WIDTH="21" HEIGHT="21" BORDER="0" ALT="appindex record"></A> &nbsp;
-</TD></TR></TABLE>
-<HR WIDTH="0" SIZE="0">
-
-
-<TABLE CELLSPACING="0" CELLPADDING="2" WIDTH="97%" BORDER="0" BGCOLOR="#000000"><TR><TD COLSPAN="2">
-<TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#FFFFFF">
-<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
-<B><FONT SIZE="+2">goMP 1.0.3</FONT></B><BR>
-<SMALL><B><A HREF="mailto:dioxine@poulet.org">Gautier</A> - January 29th 2000, 11:52 EST</B></SMALL>
-<DIV ALIGN="justify"><P>goMP is a set of CGI scripts that allows you to remotely control, via a Web browser, a computer acting as an MP3 jukebox. This program is very useful for someone who's got a dedicated computer with a lot of MP3 files but that doesn't have any output and input devices except network and sound card. It's main advantages are built-in cataloging, fast access to music, and no special software needed on the client side.</DIV>
-<P><B>Changes:</B> Bugfixes, a password-protected config page, basic search function, easier installation thanks to an install script, and relocation of HTML docs and CGIs to a subdirectory.
-<P><B>Urgency:</B> medium
-<P ALIGN="right"><B>[ <A HREF="/news/2000/01/29/949164772.html">comments (0)</A> ]</B>
-</FONT></TD></TR></TABLE></TD></TR><TR><TD VALIGN="middle">
-&nbsp;<FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#FFFFFF"><B><SMALL>License: Artistic</SMALL></B><BR>
-<B><SMALL>&nbsp;Category: <A HREF="/appindex/web/tools.html"><FONT COLOR="#FFFFFF">Web/Tools</FONT></A></SMALL></B></FONT></FONT></TD><TD ALIGN="right">
-<A HREF="http://apps.freshmeat.net/download/948492962/"><IMG SRC="image6" WIDTH="21" HEIGHT="21" BORDER="0" ALT="download"></A> <A HREF="http://apps.freshmeat.net/homepage/948492962/"><IMG SRC="image5" WIDTH="21" HEIGHT="21" BORDER="0" ALT="homepage"></A> <A HREF="http://apps.freshmeat.net/changelog/948492962/"><IMG SRC="image8" WIDTH="21" HEIGHT="21" BORDER="0" ALT="changelog"></A> 	<A HREF="/appindex/2000/01/21/948492962.html"><IMG SRC="image7" WIDTH="21" HEIGHT="21" BORDER="0" ALT="appindex record"></A> &nbsp;
-</TD></TR></TABLE>
-<HR WIDTH="0" SIZE="0">
-
-
-<TABLE CELLSPACING="0" CELLPADDING="2" WIDTH="97%" BORDER="0" BGCOLOR="#000000"><TR><TD COLSPAN="2">
-<TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#FFFFFF">
-<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
-<B><FONT SIZE="+2">APSEND 1.40</FONT></B><BR>
-<SMALL><B><A HREF="mailto:sventek@gmx.net">M.K.</A> - January 29th 2000, 11:50 EST</B></SMALL>
-<DIV ALIGN="justify"><P>APSEND is a TCP/IP packet sender to test firewalls and other network applications. It also includes a syn flood option, the land DoS attack, and a DoS attack against tcpdump running on a UNIX-based system. Future updates will include support for a scripting language to construct TCP packets and a few more options and protocols like UDP and ICMP. A port of APSEND from Perl to C is planned as well.</DIV>
-<P><B>Changes:</B> The stream attack, bugfixes, and rewrites for parts of the code.
-<P><B>Urgency:</B> low
-<P ALIGN="right"><B>[ <A HREF="/news/2000/01/29/949164633.html">comments (0)</A> ]</B>
-</FONT></TD></TR></TABLE></TD></TR><TR><TD VALIGN="middle">
-&nbsp;<FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#FFFFFF"><B><SMALL>License: GPL</SMALL></B><BR>
-<B><SMALL>&nbsp;Category: <A HREF="/appindex/console/networking.html"><FONT COLOR="#FFFFFF">Console/Networking</FONT></A></SMALL></B></FONT></FONT></TD><TD ALIGN="right">
-<A HREF="http://apps.freshmeat.net/download/941654429/"><IMG SRC="image6" WIDTH="21" HEIGHT="21" BORDER="0" ALT="download"></A> <A HREF="http://apps.freshmeat.net/homepage/941654429/"><IMG SRC="image5" WIDTH="21" HEIGHT="21" BORDER="0" ALT="homepage"></A> <A HREF="http://apps.freshmeat.net/changelog/941654429/"><IMG SRC="image8" WIDTH="21" HEIGHT="21" BORDER="0" ALT="changelog"></A> 	<A HREF="/appindex/1999/11/03/941654429.html"><IMG SRC="image7" WIDTH="21" HEIGHT="21" BORDER="0" ALT="appindex record"></A> &nbsp;
-</TD></TR></TABLE>
-<HR WIDTH="0" SIZE="0">
-
-
-<TABLE CELLSPACING="0" CELLPADDING="2" WIDTH="97%" BORDER="0" BGCOLOR="#000000"><TR><TD COLSPAN="2">
-<TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#FFFFFF">
-<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
-<B><FONT SIZE="+2">ecasound 1.6.12r10</FONT></B><BR>
-<SMALL><B><A HREF="mailto:kaiv@wakkanet.fi">Kai Vehmanen</A> - January 29th 2000, 11:48 EST</B></SMALL>
-<DIV ALIGN="justify"><P>Ecasound is a software package designed for multitrack audio processing. It can be used for simple tasks like audio playback, recording and format conversions, as well as for multitrack effect processing, mixing, recording and signal recycling. Ecasound supports a wide range of audio inputs, outputs and effect algorithms. Ecasound has a chain-based design that allows effects to be easily combined both in series and in parallel. Oscillators and MIDI-CCs can be used for controlling effect parameters. Includes a versatile console mode interface, a Qt-based X-interface and various command-line utils suitable for batch processing.</DIV>
-<P><B>Changes:</B> Support for 24- and 32-bit audio formats and for ALSA 0.5, multichannel noisegate, a new 2nd order lowpass filter, some ia-mode commands, and various bugfixes and low-level improvements.
-<P><B>Urgency:</B> low
-<P ALIGN="right"><B>[ <A HREF="/news/2000/01/29/949164529.html">comments (0)</A> ]</B>
-</FONT></TD></TR></TABLE></TD></TR><TR><TD VALIGN="middle">
-&nbsp;<FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#FFFFFF"><B><SMALL>License: GPL</SMALL></B><BR>
-<B><SMALL>&nbsp;Category: <A HREF="/appindex/console/sound.html"><FONT COLOR="#FFFFFF">Console/Sound</FONT></A></SMALL></B></FONT></FONT></TD><TD ALIGN="right">
-<A HREF="http://apps.freshmeat.net/download/931819147/"><IMG SRC="image6" WIDTH="21" HEIGHT="21" BORDER="0" ALT="download"></A> <A HREF="http://apps.freshmeat.net/homepage/931819147/"><IMG SRC="image5" WIDTH="21" HEIGHT="21" BORDER="0" ALT="homepage"></A> <A HREF="http://apps.freshmeat.net/changelog/931819147/"><IMG SRC="image8" WIDTH="21" HEIGHT="21" BORDER="0" ALT="changelog"></A> 	<A HREF="/appindex/1999/07/12/931819147.html"><IMG SRC="image7" WIDTH="21" HEIGHT="21" BORDER="0" ALT="appindex record"></A> &nbsp;
-</TD></TR></TABLE>
-<HR WIDTH="0" SIZE="0">
-
-
-<TABLE CELLSPACING="0" CELLPADDING="2" WIDTH="97%" BORDER="0" BGCOLOR="#000000"><TR><TD COLSPAN="2">
-<TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#FFFFFF">
-<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
-<B><FONT SIZE="+2">SCEZ 20000129</FONT></B><BR>
-<SMALL><B><A HREF="mailto:m032@mbsks.franken.de">endergone Zwiebeltuete</A> - January 29th 2000, 11:46 EST</B></SMALL>
-<DIV ALIGN="justify"><P>SCEZ is a library that should make the handling of smart cards (not memory cards) and card readers as simple as possible and be at the same time small and easily portable. Currently supported are Dumb Mouse, CT-API and Towitoko readers and Schlumberger Cryptoflex, Gemplus GPK4000, GSM SIM and Telesec SigG cards. A PKCS#15 implementation is in the design phase. There are ports to PalmOS and MS-Windows available.</DIV>
-<P><B>Changes:</B> More card and reader drivers, and an application to read out GSM SIM card (phone book and SMS) and write it to the card.
-<P><B>Urgency:</B> low
-<P ALIGN="right"><B>[ <A HREF="/news/2000/01/29/949164394.html">comments (0)</A> ]</B>
-</FONT></TD></TR></TABLE></TD></TR><TR><TD VALIGN="middle">
-&nbsp;<FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#FFFFFF"><B><SMALL>License: BSD type</SMALL></B><BR>
-<B><SMALL>&nbsp;Category: <A HREF="/appindex/development/libraries.html"><FONT COLOR="#FFFFFF">Development/Libraries</FONT></A></SMALL></B></FONT></FONT></TD><TD ALIGN="right">
-<A HREF="http://apps.freshmeat.net/download/939677525/"><IMG SRC="image6" WIDTH="21" HEIGHT="21" BORDER="0" ALT="download"></A> <A HREF="http://apps.freshmeat.net/homepage/939677525/"><IMG SRC="image5" WIDTH="21" HEIGHT="21" BORDER="0" ALT="homepage"></A>  	<A HREF="/appindex/1999/10/11/939677525.html"><IMG SRC="image7" WIDTH="21" HEIGHT="21" BORDER="0" ALT="appindex record"></A> &nbsp;
-</TD></TR></TABLE>
-<HR WIDTH="0" SIZE="0">
-
-
-<TABLE CELLSPACING="0" CELLPADDING="2" WIDTH="97%" BORDER="0" BGCOLOR="#000000"><TR><TD COLSPAN="2">
-<TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#FFFFFF">
-<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
-<B><FONT SIZE="+2">Comicq 0.2.0</FONT></B><BR>
-<SMALL><B><A HREF="mailto:terminal6@submail.net">Terminal6</A> - January 29th 2000, 11:45 EST</B></SMALL>
-<DIV ALIGN="justify"><P>COMICQ is a command line ICQ messaging tool that allows a user to connect to ICQ using your UIN and password, then sends a message to the destination UIN.</DIV>
-<P><B>Changes:</B> Several bugfixes, icq99a compliance, and a new option --ip that allows you to get any user's IP by their UIN.
-<P><B>Urgency:</B> low
-<P ALIGN="right"><B>[ <A HREF="/news/2000/01/29/949164350.html">comments (0)</A> ]</B>
-</FONT></TD></TR></TABLE></TD></TR><TR><TD VALIGN="middle">
-&nbsp;<FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#FFFFFF"><B><SMALL>License: GPL</SMALL></B><BR>
-<B><SMALL>&nbsp;Category: <A HREF="/appindex/console/communication.html"><FONT COLOR="#FFFFFF">Console/Communication</FONT></A></SMALL></B></FONT></FONT></TD><TD ALIGN="right">
-<A HREF="http://apps.freshmeat.net/download/948389309/"><IMG SRC="image6" WIDTH="21" HEIGHT="21" BORDER="0" ALT="download"></A> <A HREF="http://apps.freshmeat.net/homepage/948389309/"><IMG SRC="image5" WIDTH="21" HEIGHT="21" BORDER="0" ALT="homepage"></A>  	<A HREF="/appindex/2000/01/20/948389309.html"><IMG SRC="image7" WIDTH="21" HEIGHT="21" BORDER="0" ALT="appindex record"></A> &nbsp;
-</TD></TR></TABLE>
-<HR WIDTH="0" SIZE="0">
-
-
-<TABLE CELLSPACING="0" CELLPADDING="2" WIDTH="97%" BORDER="0" BGCOLOR="#000000"><TR><TD COLSPAN="2">
-<TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#FFFFFF">
-<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
-<B><FONT SIZE="+2">senv 0.2</FONT></B><BR>
-<SMALL><B><A HREF="mailto:kojak@ids.pl">Zbyszek Sobiecki</A> - January 29th 2000, 11:44 EST</B></SMALL>
-<DIV ALIGN="justify"><P>Senv allows you to run programs with a specified environment. It can set uid, gid, root directory, working directory, limits, and environment variables. It is useful in init scripts and as a shell for users for setting resource limits and environment variables. You can create sets of configurations and specify the one to use from command line.</DIV>
-<P><B>Changes:</B> Login shell limits and environment setting for users, permanent resource limits for specified groups of users and environment variables, and other minor bugfixes.
-<P><B>Urgency:</B> low
-<P ALIGN="right"><B>[ <A HREF="/news/2000/01/29/949164259.html">comments (0)</A> ]</B>
-</FONT></TD></TR></TABLE></TD></TR><TR><TD VALIGN="middle">
-&nbsp;<FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#FFFFFF"><B><SMALL>License: GPL</SMALL></B><BR>
-<B><SMALL>&nbsp;Category: <A HREF="/appindex/console/administration.html"><FONT COLOR="#FFFFFF">Console/Administration</FONT></A></SMALL></B></FONT></FONT></TD><TD ALIGN="right">
-<A HREF="http://apps.freshmeat.net/download/944953892/"><IMG SRC="image6" WIDTH="21" HEIGHT="21" BORDER="0" ALT="download"></A>  <A HREF="http://apps.freshmeat.net/changelog/944953892/"><IMG SRC="image8" WIDTH="21" HEIGHT="21" BORDER="0" ALT="changelog"></A> 	<A HREF="/appindex/1999/12/11/944953892.html"><IMG SRC="image7" WIDTH="21" HEIGHT="21" BORDER="0" ALT="appindex record"></A> &nbsp;
-</TD></TR></TABLE>
-<HR WIDTH="0" SIZE="0">
-
-
-<TABLE CELLSPACING="0" CELLPADDING="2" WIDTH="97%" BORDER="0" BGCOLOR="#000000"><TR><TD COLSPAN="2">
-<TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#FFFFFF">
-<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
-<B><FONT SIZE="+2">XZX 2.9.2</FONT></B><BR>
-<SMALL><B><A HREF="mailto:Erik.Kunze@fantasy.muc.de">E. Kunze</A> - January 29th 2000, 10:55 EST</B></SMALL>
-<DIV ALIGN="justify"><P>XZX is a portable emulator of ZX Spectrum 48K/128K/+3 (8-bit home computers made by Sir Clive Sinclair) and Pentagon/Scorpion (Spectrum clones made in Russia) for machines running UNIX and the X Window system. XZX is completely written in C and emulates Spectrum 48K, 128K, +2 and +3, Pentagon and Scorpion, Interface I with up to 8 microdrives, Multiface 128 and Multiface 3, BetaDisk 128 interface by Technology Research Ltd with 4 disk drives, +D interface by Miles Gordon Technology with 2 disk drives, Kempston mouse, Kempston joystick and built-in machine code monitor.</DIV>
-<P><B>Changes:</B> Lots of feature improvement and bug fixes. Most parts of the audio support has been rewritten for different UNICES.
-<P><B>Urgency:</B> low
-<P ALIGN="right"><B>[ <A HREF="/news/2000/01/29/949161354.html">comments (0)</A> ]</B>
-</FONT></TD></TR></TABLE></TD></TR><TR><TD VALIGN="middle">
-&nbsp;<FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#FFFFFF"><B><SMALL>License: Shareware</SMALL></B><BR>
-<B><SMALL>&nbsp;Category: <A HREF="/appindex/x11/emulators.html"><FONT COLOR="#FFFFFF">X11/Emulators</FONT></A></SMALL></B></FONT></FONT></TD><TD ALIGN="right">
-<A HREF="http://apps.freshmeat.net/download/936956384/"><IMG SRC="image6" WIDTH="21" HEIGHT="21" BORDER="0" ALT="download"></A> <A HREF="http://apps.freshmeat.net/homepage/936956384/"><IMG SRC="image5" WIDTH="21" HEIGHT="21" BORDER="0" ALT="homepage"></A> <A HREF="http://apps.freshmeat.net/changelog/936956384/"><IMG SRC="image8" WIDTH="21" HEIGHT="21" BORDER="0" ALT="changelog"></A> 	<A HREF="/appindex/1999/09/10/936956384.html"><IMG SRC="image7" WIDTH="21" HEIGHT="21" BORDER="0" ALT="appindex record"></A> &nbsp;
-</TD></TR></TABLE>
-<HR WIDTH="0" SIZE="0">
-
-
-<P><SMALL><CENTER><B>[ <A HREF="/news/2000/01/29/">full page for today</A> | <A HREF="/news/2000/01/28/">yesterday's edition</A> ]</SMALL></B></CENTER></FONT></TD><TD WIDTH="27%" VALIGN="top" ALIGN="center"><FONT FACE="Lucida,Verdana,Helvetica,Arial">
-
-<TABLE BORDER="0" CELLPADDING="1" CELLSPACING="0" BGCOLOR="#000000" WIDTH="97%"><TR><TD>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="1" CELLPADDING="3">
-<TR><TD ALIGN="center" BGCOLOR="#EEEEEE"><B><FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#000000">navigator</FONT></FONT></B></TD></TR><TR><TD BGCOLOR="#FFFFFF"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial">
-- <A HREF="/news/2000/01/29/"><FONT COLOR="#000000">full page for today</FONT></A><BR>
-- <A HREF="/news/2000/01/28/"><FONT COLOR="#000000">yesterday's edition</FONT></A><BR>
-- <A HREF="news://news.freshmeat.net/"><FONT COLOR="#000000"><B>new:</B> fm news via NNTP</FONT></A><BR>
-&nbsp;</FONT></SMALL></TD></TR></TABLE></TD></TR></TABLE><P>
-<TABLE BORDER="0" CELLPADDING="1" CELLSPACING="0" BGCOLOR="#000000" WIDTH="97%"><TR><TD>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="1" CELLPADDING="3">
-<TR><TD ALIGN="center" BGCOLOR="#EEEEEE"><B><FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#000000">eye catcher</FONT></FONT></B></TD></TR><TR><TD BGCOLOR="#FFFFFF"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial">
-<B>Free Shirts</B><BR>We give away a free freshmeat t-shirt every week for the best comment added to an application announcement or story posted on freshmeat.
-<P><B>#freshmeat</B><BR>If you want to chat about what's new on freshmeat and hang out with other fm lounge lizards and the fm staff, head over to #freshmeat on irc.freshmeat.net, part of <A HREF="http://openprojects.nu/">The Open Projects Network</A>.
-&nbsp;</FONT></SMALL></TD></TR></TABLE></TD></TR></TABLE><P>
-<TABLE BORDER="0" CELLPADDING="1" CELLSPACING="0" BGCOLOR="#000000" WIDTH="97%"><TR><TD>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="1" CELLPADDING="3">
-<TR><TD ALIGN="center" BGCOLOR="#EEEEEE"><B><FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#000000">site notes</FONT></FONT></B></TD></TR><TR><TD BGCOLOR="#FFFFFF"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial">
-- <A HREF="/news/2000/01/29/949208399.html"><FONT COLOR="#000000">We should get this out of the door now (Jan 29th)</FONT></A><BR>
-- <A HREF="/news/2000/01/01/946704535.html"><FONT COLOR="#000000">freshmeat Y2K report (Jan 01st)</FONT></A><BR>
-- <A HREF="/news/1999/08/16/934862340.html"><FONT COLOR="#000000">Assorted freshmeat notes (Aug 16th)</FONT></A><BR>
-&nbsp;</FONT></SMALL></TD></TR></TABLE></TD></TR></TABLE><P>
-<TABLE BORDER="0" CELLPADDING="1" CELLSPACING="0" BGCOLOR="#000000" WIDTH="97%"><TR><TD>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="1" CELLPADDING="3">
-<TR><TD ALIGN="center" BGCOLOR="#EEEEEE"><B><FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#000000">recent editorials</FONT></FONT></B></TD></TR><TR><TD BGCOLOR="#FFFFFF"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial">
-- <A HREF="/news/2000/01/29/949208340.html"><FONT COLOR="#000000">Is Linux for Crazies? (Jan 29th)</FONT></A><BR>
-- <A HREF="/news/2000/01/22/948603540.html"><FONT COLOR="#000000">A New Business Plan for Free Software (Jan 22nd)</FONT></A><BR>
-- <A HREF="/news/2000/01/15/947998740.html"><FONT COLOR="#000000">Is Linux Going to Reunite the UNIX Market? (Jan 15th)</FONT></A><BR>
-&nbsp;</FONT></SMALL></TD></TR></TABLE></TD></TR></TABLE><P>
-<TABLE BORDER="0" CELLPADDING="1" CELLSPACING="0" BGCOLOR="#000000" WIDTH="97%"><TR><TD>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="1" CELLPADDING="3">
-<TR><TD ALIGN="center" BGCOLOR="#EEEEEE"><B><FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#000000">andover.net</FONT></FONT></B></TD></TR><TR><TD BGCOLOR="#FFFFFF"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial">
-<BR><CENTER><A HREF="http://andover.net"><IMG SRC="image9" BORDER="0" WIDTH="150" HEIGHT="43" ALT="Mirror Logo"></A></CENTER><P>
-- <A HREF="http://www.animfactory.com/"><FONT COLOR="#000000">Animation Factory</FONT></A><BR>
-- <A HREF="http://www.davecentral.com/"><FONT COLOR="#000000">DaveCentral</FONT></A><BR>
-- <A HREF="http://www.freecode.com/"><FONT COLOR="#000000">FreeCode</FONT></A><BR>
-- <A HREF="http://www.InternetTrafficReport.com/"><FONT COLOR="#000000">Internet Traffic Report</FONT></A><BR>
-- <A HREF="http://www.ITManagersJournal.com/"><FONT COLOR="#000000">IT Manager's Journal</FONT></A><BR>
-- <A HREF="http://www.mediabuilder.com/"><FONT COLOR="#000000">MediaBuilder</FONT></A><BR>
-- <A HREF="http://slashdot.org/"><FONT COLOR="#000000">Slashdot</FONT></A><BR>
-- <A HREF="http://www.slaughterhouse.com/"><FONT COLOR="#000000">Slaughterhouse</FONT></A><BR>
-- <A HREF="http://www.techmailings.com/"><FONT COLOR="#000000">TechMailings</FONT></A><BR>
-- <A HREF="http://www.techsightings.com/"><FONT COLOR="#000000">TechSightings</FONT></A><BR>
-<BR><CENTER><B>E-Commerce</B></CENTER><P>
-- <A HREF="http://www.thinkgeek.com"><FONT COLOR="#000000">ThinkGeek (Stuff for smart masses)</FONT></A><BR>
-&nbsp;</FONT></SMALL></TD></TR></TABLE></TD></TR></TABLE><P>
-<TABLE BORDER="0" CELLPADDING="1" CELLSPACING="0" BGCOLOR="#000000" WIDTH="97%"><TR><TD>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="1" CELLPADDING="3">
-<TR><TD ALIGN="center" BGCOLOR="#EEEEEE"><B><FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#000000">supported sites</FONT></FONT></B></TD></TR><TR><TD BGCOLOR="#FFFFFF"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial">
-- <A HREF="http://www.userfriendly.org"><FONT COLOR="#000000">Userfriendly.org</FONT></A><BR>
-- <A HREF="http://www.securityfocus.com"><FONT COLOR="#000000">SecurityFocus</FONT></A><BR>
-- <A HREF="http://copyleft.net"><FONT COLOR="#000000">copyleft</FONT></A><BR>
-- <A HREF="http://filewatcher.org"><FONT COLOR="#000000">Filewatcher</FONT></A><BR>
-- <A HREF="http://www.linux.com"><FONT COLOR="#000000">Linux.com</FONT></A><BR>
-- <A HREF="http://www.linuxtelephony.org"><FONT COLOR="#000000">LinuxTelephony</FONT></A><BR>
-- <A HREF="http://www.linuxtoday.com"><FONT COLOR="#000000">LinuxToday</FONT></A><BR>
-- <A HREF="http://openprojects.nu/services/irc.html"><FONT COLOR="#000000">Openprojects</FONT></A><BR>
-- <A HREF="http://www.32bitsonline.com"><FONT COLOR="#000000">32bitsonline</FONT></A><BR>
-- <A HREF="http://www.gnu.org"><FONT COLOR="#000000">The GNU Project</FONT></A><BR>
-&nbsp;</FONT></SMALL></TD></TR></TABLE></TD></TR></TABLE><P>
-<TABLE BORDER="0" CELLPADDING="1" CELLSPACING="0" BGCOLOR="#000000" WIDTH="97%"><TR><TD>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="1" CELLPADDING="3">
-<TR><TD ALIGN="center" BGCOLOR="#EEEEEE"><B><FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#000000"><a href="/news/2000/01/29/"><font color="#000000">saturday</font></a></FONT></FONT></B></TD></TR><TR><TD BGCOLOR="#FFFFFF"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial">
-- <A HREF="/news/2000/01/29/949208399.html"><FONT COLOR="#000000">We should get this out of the door now</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949208340.html"><FONT COLOR="#000000">Is Linux for Crazies?</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949188564.html"><FONT COLOR="#000000">RabbIT 2.0.2</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949187896.html"><FONT COLOR="#000000">nmpg 1.1.3</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949187471.html"><FONT COLOR="#000000">mod_dtcl 0.7.3</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949187233.html"><FONT COLOR="#000000">CoreLinux++ 0.4.6</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949165962.html"><FONT COLOR="#000000">scribe 0.2</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949165472.html"><FONT COLOR="#000000">E theme updater 0.1</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949165416.html"><FONT COLOR="#000000">Powertweak-Linux 0.1.7</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949164956.html"><FONT COLOR="#000000">Pexeso Beta</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949164896.html"><FONT COLOR="#000000">XZX 2.9.2</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949164869.html"><FONT COLOR="#000000">DistroLib 0.4</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949164843.html"><FONT COLOR="#000000">ToutDoux 1.1.7</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949164772.html"><FONT COLOR="#000000">goMP 1.0.3</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949164633.html"><FONT COLOR="#000000">APSEND 1.40</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949164529.html"><FONT COLOR="#000000">ecasound 1.6.12r10</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949164394.html"><FONT COLOR="#000000">SCEZ 20000129</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949164350.html"><FONT COLOR="#000000">Comicq 0.2.0</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949164259.html"><FONT COLOR="#000000">senv 0.2</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949161354.html"><FONT COLOR="#000000">XZX 2.9.2</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949161036.html"><FONT COLOR="#000000">log4j 0.7.5</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949156343.html"><FONT COLOR="#000000">SQN Linux 1.6</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949156277.html"><FONT COLOR="#000000">Limo 0.3.2</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949156237.html"><FONT COLOR="#000000">Fusion GS 1.3</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949145887.html"><FONT COLOR="#000000">MMR 1.5.4</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949142835.html"><FONT COLOR="#000000">KUPS 0.3.4</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949142815.html"><FONT COLOR="#000000">3DSE patch for XMMS 4</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949139763.html"><FONT COLOR="#000000">Linux 2.3.41</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949139751.html"><FONT COLOR="#000000">Free Code for Linux S/390</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949135979.html"><FONT COLOR="#000000">CircleMUD 3.0 beta patchlevel 17</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949135938.html"><FONT COLOR="#000000">NiL Isn't Liero 000128</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949135913.html"><FONT COLOR="#000000">OpenSSH Unix Port 1.2.2</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949135889.html"><FONT COLOR="#000000">KBoxes! 1.3</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949135867.html"><FONT COLOR="#000000">phpLanParty 0.23</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949135509.html"><FONT COLOR="#000000">DGen/SDL 1.20</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949135482.html"><FONT COLOR="#000000">EdcomLib 1.0 alpha 5</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949135309.html"><FONT COLOR="#000000">Etherboot 4.4.2</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949135205.html"><FONT COLOR="#000000">BLADE 0.18.0</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949135115.html"><FONT COLOR="#000000">Sapphire 0.13.7</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949135070.html"><FONT COLOR="#000000">ippl 1.99.3</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949134977.html"><FONT COLOR="#000000">Saint 1.5patch1</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949134943.html"><FONT COLOR="#000000">Zircon 1.18.232</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949134927.html"><FONT COLOR="#000000">nmap 2.3BETA14</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949134901.html"><FONT COLOR="#000000">xterm patch #124</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949134817.html"><FONT COLOR="#000000">MyThreads-Links v0.5.2</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949134633.html"><FONT COLOR="#000000">sudo 1.6.2p1</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949134552.html"><FONT COLOR="#000000">MIT Photonic-Bands 0.10</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949134246.html"><FONT COLOR="#000000">Launcher 0.86</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949134179.html"><FONT COLOR="#000000">nano 0.8.1</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949134103.html"><FONT COLOR="#000000">Gtk-- 1.1.8</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949134049.html"><FONT COLOR="#000000">tkchooser 0.65</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949133420.html"><FONT COLOR="#000000">XShipWars 1.33a</FONT></A><BR>
-- <A HREF="/news/2000/01/29/949133280.html"><FONT COLOR="#000000">Lamerpad 0.1</FONT></A><BR>
-&nbsp;</FONT></SMALL></TD></TR></TABLE></TD></TR></TABLE><P>
-<TABLE BORDER="0" CELLPADDING="1" CELLSPACING="0" BGCOLOR="#000000" WIDTH="97%"><TR><TD>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="1" CELLPADDING="3">
-<TR><TD ALIGN="center" BGCOLOR="#EEEEEE"><B><FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#000000"><a href="/news/2000/01/28/"><font color="#000000">friday</font></a></FONT></FONT></B></TD></TR><TR><TD BGCOLOR="#FFFFFF"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial">
-- <A HREF="/news/2000/01/28/949117833.html"><FONT COLOR="#000000">fsv 0.9</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949117711.html"><FONT COLOR="#000000">popsneaker 0.1.1</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949114716.html"><FONT COLOR="#000000">eyep-updater.sh 1.0</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949113240.html"><FONT COLOR="#000000">W3Mail 0.5.0</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949113214.html"><FONT COLOR="#000000">The Urgent Decision 0.9.9</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949112269.html"><FONT COLOR="#000000">LTSP 1.02</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949112198.html"><FONT COLOR="#000000">Production BASIC 0.2.12</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949112123.html"><FONT COLOR="#000000">Postfix 19991231-pl03</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949109732.html"><FONT COLOR="#000000">Mp3 Commander 0.7</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949109324.html"><FONT COLOR="#000000">iManager 1.0.1b</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949108399.html"><FONT COLOR="#000000">Eterm 0.9</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949108308.html"><FONT COLOR="#000000">dqd_dirindex 1.0</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949108087.html"><FONT COLOR="#000000">Tidings 1.0.4</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949108026.html"><FONT COLOR="#000000">localscan 2.1</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949107922.html"><FONT COLOR="#000000">WMKeyboard 0.3</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949107834.html"><FONT COLOR="#000000">fcmp 1.0.2</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949107767.html"><FONT COLOR="#000000">Akkord 0.3.1</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949107649.html"><FONT COLOR="#000000">HiM 0.1.1</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949106305.html"><FONT COLOR="#000000">cdrecord 1.8</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949103400.html"><FONT COLOR="#000000">eMixer 0.05.5</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949103187.html"><FONT COLOR="#000000">FreeVSD 1.4.0</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949103096.html"><FONT COLOR="#000000">Common C++ Libraries 0.0</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949095155.html"><FONT COLOR="#000000">Moonshine 1.0beta2</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949095112.html"><FONT COLOR="#000000">swim 0.3.5</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949095009.html"><FONT COLOR="#000000">Xmame/xmess 0.36b15.1</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949094448.html"><FONT COLOR="#000000">pcmcia-cs 3.1.9</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949091509.html"><FONT COLOR="#000000">gPS 0.5.2</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949091415.html"><FONT COLOR="#000000">Snort 1.5.1</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949090436.html"><FONT COLOR="#000000">Pygmy Linux 0.7 beta</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949090237.html"><FONT COLOR="#000000">Intro to Bash Programming HOWTO 0.3</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949084379.html"><FONT COLOR="#000000">GNU Pth 1.3b2</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949084356.html"><FONT COLOR="#000000">Laonux 0.1</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949084304.html"><FONT COLOR="#000000">x-wvdial 0.12</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949084188.html"><FONT COLOR="#000000">Intro to Bash Programming HOWTO 0.3</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949084106.html"><FONT COLOR="#000000">Catalog 1.02</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949084062.html"><FONT COLOR="#000000">harvest 1.5.20-kj-0.9</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949068306.html"><FONT COLOR="#000000">wmseti 0.3.0a</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949057272.html"><FONT COLOR="#000000">RIG 1.02</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949057019.html"><FONT COLOR="#000000">FreeAddr 0.2</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949056939.html"><FONT COLOR="#000000">GtkAda 1.2.5</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949056664.html"><FONT COLOR="#000000">dot.conf 0.6.0</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949055099.html"><FONT COLOR="#000000">dep.pl 1.28.0</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949054980.html"><FONT COLOR="#000000">Prae's Scripts 1.1</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949044301.html"><FONT COLOR="#000000">Project Clock 0.1</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949044285.html"><FONT COLOR="#000000">Xtheater 0.2.1</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949040013.html"><FONT COLOR="#000000">i-no Chart 0.1</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949039945.html"><FONT COLOR="#000000">spliff 0.8.1</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949038953.html"><FONT COLOR="#000000">Regexx 0.95</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949038316.html"><FONT COLOR="#000000">RBook 0.5.0</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949036742.html"><FONT COLOR="#000000">RIG 1.01</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949036714.html"><FONT COLOR="#000000">wchat 1.2.0</FONT></A><BR>
-- <A HREF="/news/2000/01/28/949036428.html"><FONT COLOR="#000000">PCCS MySQLDatabase Admin Tool 1.2.2</FONT></A><BR>
-&nbsp;</FONT></SMALL></TD></TR></TABLE></TD></TR></TABLE><P>
-<TABLE BORDER="0" CELLPADDING="1" CELLSPACING="0" BGCOLOR="#000000" WIDTH="97%"><TR><TD>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="1" CELLPADDING="3">
-<TR><TD ALIGN="center" BGCOLOR="#EEEEEE"><B><FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#000000"><a href="/news/2000/01/27/"><font color="#000000">thursday</font></a></FONT></FONT></B></TD></TR><TR><TD BGCOLOR="#FFFFFF"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial">
-- <A HREF="/news/2000/01/27/949033332.html"><FONT COLOR="#000000">CADUBI 1.1b1</FONT></A><BR>
-- <A HREF="/news/2000/01/27/949032987.html"><FONT COLOR="#000000">Angus' Chess Clock 0.8.1</FONT></A><BR>
-- <A HREF="/news/2000/01/27/949032555.html"><FONT COLOR="#000000">MP3 Report Generator 1.0.0</FONT></A><BR>
-- <A HREF="/news/2000/01/27/949032518.html"><FONT COLOR="#000000">4DOM 0.9.2</FONT></A><BR>
-- <A HREF="/news/2000/01/27/949032386.html"><FONT COLOR="#000000">4XSLT 0.8.2</FONT></A><BR>
-- <A HREF="/news/2000/01/27/949031346.html"><FONT COLOR="#000000">OpenNaken 1.10</FONT></A><BR>
-- <A HREF="/news/2000/01/27/949025747.html"><FONT COLOR="#000000">iManager 1.0b</FONT></A><BR>
-- <A HREF="/news/2000/01/27/949025168.html"><FONT COLOR="#000000">QuakeForge 0.1.0</FONT></A><BR>
-- <A HREF="/news/2000/01/27/949023271.html"><FONT COLOR="#000000">pylice 0.7.0</FONT></A><BR>
-- <A HREF="/news/2000/01/27/949023250.html"><FONT COLOR="#000000">Solfege 0.6.0</FONT></A><BR>
-- <A HREF="/news/2000/01/27/949023151.html"><FONT COLOR="#000000">xinetd 2.1.8.7p1</FONT></A><BR>
-- <A HREF="/news/2000/01/27/949022849.html"><FONT COLOR="#000000">jac 0.13</FONT></A><BR>
-- <A HREF="/news/2000/01/27/949022803.html"><FONT COLOR="#000000">Xmms 1.0.0</FONT></A><BR>
-- <A HREF="/news/2000/01/27/949022319.html"><FONT COLOR="#000000">KSrnd 0.97</FONT></A><BR>
-- <A HREF="/news/2000/01/27/949021877.html"><FONT COLOR="#000000">getpg / UW-IMAP 0.54</FONT></A><BR>
-- <A HREF="/news/2000/01/27/949021849.html"><FONT COLOR="#000000">getpg 0.53</FONT></A><BR>
-- <A HREF="/news/2000/01/27/949021824.html"><FONT COLOR="#000000">setserial 2.17</FONT></A><BR>
-- <A HREF="/news/2000/01/27/949021250.html"><FONT COLOR="#000000">Pan 0.7.3</FONT></A><BR>
-- <A HREF="/news/2000/01/27/949021216.html"><FONT COLOR="#000000">jwhois 2.4.1</FONT></A><BR>
-- <A HREF="/news/2000/01/27/949021126.html"><FONT COLOR="#000000">Kmp3 1.0</FONT></A><BR>
-- <A HREF="/news/2000/01/27/949020964.html"><FONT COLOR="#000000">xPine 0.0.12</FONT></A><BR>
-- <A HREF="/news/2000/01/27/949019905.html"><FONT COLOR="#000000">Avenger's News System 2.1 Alpha</FONT></A><BR>
-- <A HREF="/news/2000/01/27/949019709.html"><FONT COLOR="#000000">RIG 1.0</FONT></A><BR>
-- <A HREF="/news/2000/01/27/949019321.html"><FONT COLOR="#000000">scroller 1.0</FONT></A><BR>
-- <A HREF="/news/2000/01/27/949018347.html"><FONT COLOR="#000000">Perl EyeP Client 0.1</FONT></A><BR>
-- <A HREF="/news/2000/01/27/949017796.html"><FONT COLOR="#000000">sfront 0.54</FONT></A><BR>
-- <A HREF="/news/2000/01/27/949017631.html"><FONT COLOR="#000000">XFrisk 1.2</FONT></A><BR>
-- <A HREF="/news/2000/01/27/949016202.html"><FONT COLOR="#000000">Moffy 0.0.1</FONT></A><BR>
-- <A HREF="/news/2000/01/27/949015348.html"><FONT COLOR="#000000">Solid POP3 0.14</FONT></A><BR>
-- <A HREF="/news/2000/01/27/949014200.html"><FONT COLOR="#000000">php3guest 1.5</FONT></A><BR>
-- <A HREF="/news/2000/01/27/949013630.html"><FONT COLOR="#000000">crUD 01.27.2000</FONT></A><BR>
-- <A HREF="/news/2000/01/27/949013380.html"><FONT COLOR="#000000">crUD 01.27.2000</FONT></A><BR>
-- <A HREF="/news/2000/01/27/949012979.html"><FONT COLOR="#000000">Free Pascal Compiler 0.99.14</FONT></A><BR>
-- <A HREF="/news/2000/01/27/949012771.html"><FONT COLOR="#000000">gtk-font-hack 0.2-gtk-1.2.6</FONT></A><BR>
-- <A HREF="/news/2000/01/27/949009233.html"><FONT COLOR="#000000">Linux 2.2.15pre5</FONT></A><BR>
-- <A HREF="/news/2000/01/27/949005620.html"><FONT COLOR="#000000">krunseti 0.2.1</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948996446.html"><FONT COLOR="#000000">CompuPic 5.0.1036</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948995905.html"><FONT COLOR="#000000">gfontview 0.3.3</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948995819.html"><FONT COLOR="#000000">authlocal 1.0.2</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948995600.html"><FONT COLOR="#000000">bigwig 1.1</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948995501.html"><FONT COLOR="#000000">CAFire 0.0.11</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948995429.html"><FONT COLOR="#000000">ANVLOGIN 2.0</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948994944.html"><FONT COLOR="#000000">sawmill.el 1.9</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948994810.html"><FONT COLOR="#000000">Perlsh 20000127</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948994776.html"><FONT COLOR="#000000">sitescooper 2.1.2</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948994691.html"><FONT COLOR="#000000">MHDns 1.4</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948994419.html"><FONT COLOR="#000000">JChemPaint 0.5</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948994364.html"><FONT COLOR="#000000">Filesystems HOWTO 0.7.3</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948994343.html"><FONT COLOR="#000000">KSnes9x 1.2</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948993513.html"><FONT COLOR="#000000">Mozilla M13</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948993439.html"><FONT COLOR="#000000">edna 0.3</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948993409.html"><FONT COLOR="#000000">GMasqdialer 0.99.8</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948993341.html"><FONT COLOR="#000000">spliff 0.8</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948992808.html"><FONT COLOR="#000000">MultiSeti 0.3</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948970667.html"><FONT COLOR="#000000">rude 0.50</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948970605.html"><FONT COLOR="#000000">cgi-util++ 0.0</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948970479.html"><FONT COLOR="#000000">Cricket 0.72</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948970458.html"><FONT COLOR="#000000">nuni 0.04</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948970379.html"><FONT COLOR="#000000">Ksetiwatch 0.3.0</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948970358.html"><FONT COLOR="#000000">SiteMgrYAP 0.1.2</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948970322.html"><FONT COLOR="#000000">phpLanParty 0.21</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948970285.html"><FONT COLOR="#000000">Glitter Newsreader 0.1</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948970263.html"><FONT COLOR="#000000">Fastresolve 2.4</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948970164.html"><FONT COLOR="#000000">ColdSync 1.1.2</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948970080.html"><FONT COLOR="#000000">DDD 3.2</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948970032.html"><FONT COLOR="#000000">X Northern Captain 4.2.1</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948969919.html"><FONT COLOR="#000000">abcde 1.0.2</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948969659.html"><FONT COLOR="#000000">Gnapster 1.3.2</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948969551.html"><FONT COLOR="#000000">xmix 1.0 Alpha</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948969488.html"><FONT COLOR="#000000">gtktetcolor 0.3</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948969412.html"><FONT COLOR="#000000">muttzilla 0.40</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948969395.html"><FONT COLOR="#000000">muttzilla 0.40</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948969337.html"><FONT COLOR="#000000">asp2php 0.73.6</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948969217.html"><FONT COLOR="#000000">mod_ticket 1.0</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948969078.html"><FONT COLOR="#000000">MegaHAL for Eggdrop .01</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948968456.html"><FONT COLOR="#000000">Jetty 2.3.5</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948968386.html"><FONT COLOR="#000000">xlpotdb 1.0</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948968341.html"><FONT COLOR="#000000">Koala Complete MUD Server 0.1.1a</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948968255.html"><FONT COLOR="#000000">mcountd 0.4</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948967933.html"><FONT COLOR="#000000">cdbackup 0.5.0</FONT></A><BR>
-- <A HREF="/news/2000/01/27/948967908.html"><FONT COLOR="#000000">The Java SSH/Telnet Application/Applet 2.0 RC1</FONT></A><BR>
-&nbsp;</FONT></SMALL></TD></TR></TABLE></TD></TR></TABLE><P>
-<TABLE BORDER="0" CELLPADDING="1" CELLSPACING="0" BGCOLOR="#000000" WIDTH="97%"><TR><TD>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="1" CELLPADDING="3">
-<TR><TD ALIGN="center" BGCOLOR="#EEEEEE"><B><FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#000000"><a href="http://slashdot.org"><font color="#000000">slashdot</font></a></FONT></FONT></B></TD></TR><TR><TD BGCOLOR="#FFFFFF"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial">
-- <A HREF="http://slashdot.org/article.pl?sid=00/01/29/1534255"><FONT COLOR="#000000">Petition Apple for Linux QuickTime</FONT></A><BR>
-- <A HREF="http://slashdot.org/article.pl?sid=00/01/29/1223249"><FONT COLOR="#000000">GNUstep 0.6.5 freeze</FONT></A><BR>
-- <A HREF="http://slashdot.org/article.pl?sid=00/01/28/2324203"><FONT COLOR="#000000">YETI@Home</FONT></A><BR>
-- <A HREF="http://slashdot.org/article.pl?sid=00/01/29/1024215"><FONT COLOR="#000000">Documents Unsealed in Microsoft/Caldera Case</FONT></A><BR>
-- <A HREF="http://slashdot.org/article.pl?sid=00/01/29/0837235"><FONT COLOR="#000000">Who Bought Linux.Net?</FONT></A><BR>
-- <A HREF="http://slashdot.org/article.pl?sid=00/01/24/1146250"><FONT COLOR="#000000">E-Mails from (Over?) The Edge</FONT></A><BR>
-- <A HREF="http://slashdot.org/article.pl?sid=00/01/29/0834223"><FONT COLOR="#000000">Linux Kernel 2.3.41</FONT></A><BR>
-- <A HREF="http://slashdot.org/article.pl?sid=00/01/28/2311232"><FONT COLOR="#000000">Congress Still Figuring Out E-Mail</FONT></A><BR>
-- <A HREF="http://slashdot.org/article.pl?sid=00/01/22/1946244"><FONT COLOR="#000000">Sci Fi Literature 101?</FONT></A><BR>
-- <A HREF="http://slashdot.org/article.pl?sid=00/01/28/2318246"><FONT COLOR="#000000">Could Distributed.Net Help the Mars Polar Lander?</FONT></A><BR>
-&nbsp;</FONT></SMALL></TD></TR></TABLE></TD></TR></TABLE><P>
-<TABLE BORDER="0" CELLPADDING="1" CELLSPACING="0" BGCOLOR="#000000" WIDTH="97%"><TR><TD>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="1" CELLPADDING="3">
-<TR><TD ALIGN="center" BGCOLOR="#EEEEEE"><B><FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#000000"><a href="http://www.securityfocus.com"><font color="#000000">securityfocus</font></a></FONT></FONT></B></TD></TR><TR><TD BGCOLOR="#FFFFFF"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial">
-- <A HREF="http://www.securityfocus.com/level2/?go=news&id=http://www.zdnet.com/zdnn/stories/news/0,4586,2429334,00.html?chkpt=zdnntop"><FONT COLOR="#000000">Win2000 security hole a 'major threat'</FONT></A><BR>
-- <A HREF="http://www.securityfocus.com/level2/?go=news&id=http://www.computerworld.com/home/print.nsf/all/000128e45a"><FONT COLOR="#000000">Visa acknowledges cracker break-ins</FONT></A><BR>
-- <A HREF="http://www.securityfocus.com/level2/?go=news&id=http://www.zdnet.com/sr/stories/column/0,4712,2429536,00.html"><FONT COLOR="#000000">What's Wrong With Microsoft  Security?</FONT></A><BR>
-- <A HREF="http://www.securityfocus.com/level2/?go=news&id=http://www.zdnet.com/pcweek/stories/news/0,4153,2429334,00.html"><FONT COLOR="#000000">Microsoft posts first Win2K security patch</FONT></A><BR>
-- <A HREF="http://www.securityfocus.com/level2/?go=tools&id=1018"><FONT COLOR="#000000">Libnids 1.12</FONT></A><BR>
-- <A HREF="http://www.securityfocus.com/level2/?go=news&id=http://www.theregister.co.uk/000127-000005.html"><FONT COLOR="#000000">New hack attack is greater threat than imagined</FONT></A><BR>
-- <A HREF="http://www.securityfocus.com/level2/?go=news&id=http://www.mercurycenter.com/svtech/news/indepth/docs/hacker012700.htm"><FONT COLOR="#000000">Student charged with hacking</FONT></A><BR>
-- <A HREF="http://www.securityfocus.com/level2/?go=library&id=63"><FONT COLOR="#000000">Building and Managing Virtual Private Networks (book)</FONT></A><BR>
-- <A HREF="http://www.securityfocus.com/level2/?go=library&id=111"><FONT COLOR="#000000">Threats, Vulnerabilities and Real-Worl Responses: The Foundations of the TruSecure Process</FONT></A><BR>
-- <A HREF="http://www.securityfocus.com/level2/?go=library&id=1701"><FONT COLOR="#000000">The Hundredth Window : Protecting Your Privacy and Security in the Age of the Internet (boo</FONT></A><BR>
-&nbsp;</FONT></SMALL></TD></TR></TABLE></TD></TR></TABLE><P>
-<TABLE BORDER="0" CELLPADDING="1" CELLSPACING="0" BGCOLOR="#000000" WIDTH="97%"><TR><TD>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="1" CELLPADDING="3">
-<TR><TD ALIGN="center" BGCOLOR="#EEEEEE"><B><FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#000000"><a href="http://www.bebits.com"><font color="#000000">bebits</font></a></FONT></FONT></B></TD></TR><TR><TD BGCOLOR="#FFFFFF"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial">
-- <A HREF="http://www.bebits.com/app/706/"><FONT COLOR="#000000">Pe 3.0a3</FONT></A><BR>
-- <A HREF="http://www.bebits.com/app/757/"><FONT COLOR="#000000">Rarscript 1.5</FONT></A><BR>
-- <A HREF="http://www.bebits.com/app/736/"><FONT COLOR="#000000">CD Manager 0.66a beta</FONT></A><BR>
-- <A HREF="http://www.bebits.com/app/174/"><FONT COLOR="#000000">TraX 1.1</FONT></A><BR>
-- <A HREF="http://www.bebits.com/app/785/"><FONT COLOR="#000000">BeMath 1.2.2</FONT></A><BR>
-- <A HREF="http://www.bebits.com/app/784/"><FONT COLOR="#000000">simple blackjack 1</FONT></A><BR>
-- <A HREF="http://www.bebits.com/app/758/"><FONT COLOR="#000000">HtmlTree 0.5.3</FONT></A><BR>
-- <A HREF="http://www.bebits.com/app/783/"><FONT COLOR="#000000">Yacp 0.1</FONT></A><BR>
-- <A HREF="http://www.bebits.com/app/222/"><FONT COLOR="#000000">TicTacToe 1.5</FONT></A><BR>
-- <A HREF="http://www.bebits.com/app/706/"><FONT COLOR="#000000">Pe 3.0a2</FONT></A><BR>
-&nbsp;</FONT></SMALL></TD></TR></TABLE></TD></TR></TABLE><P>
-<TABLE BORDER="0" CELLPADDING="1" CELLSPACING="0" BGCOLOR="#000000" WIDTH="97%"><TR><TD>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="1" CELLPADDING="3">
-<TR><TD ALIGN="center" BGCOLOR="#EEEEEE"><B><FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#000000"><a href="http://linuxtoday.com"><font color="#000000">linuxtoday</font></a></FONT></FONT></B></TD></TR><TR><TD BGCOLOR="#FFFFFF"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial">
-- <A HREF="http://linuxtoday.com/story.php3?sn=15878"><FONT COLOR="#000000">Linux Journal: KDE--The Next Generation</FONT></A><BR>
-- <A HREF="http://linuxtoday.com/story.php3?sn=15876"><FONT COLOR="#000000">Kernel Cousin gimp-devel #11 Is Out</FONT></A><BR>
-- <A HREF="http://linuxtoday.com/story.php3?sn=15875"><FONT COLOR="#000000">Infoworld: Corel Linux OS ideal for the desktop</FONT></A><BR>
-- <A HREF="http://linuxtoday.com/story.php3?sn=15874"><FONT COLOR="#000000">Technology Evaluation: IBM Jumps on the Linux Bandwagon with Both Feet, Sort Of</FONT></A><BR>
-- <A HREF="http://linuxtoday.com/story.php3?sn=15873"><FONT COLOR="#000000">Tobias H�vekamp: European Union acknowledges</FONT></A><BR>
-- <A HREF=""><FONT COLOR="#000000">&</FONT></A><BR>
-- <A HREF=""><FONT COLOR="#000000">#34;Open Source Software</FONT></A><BR>
-- <A HREF=""><FONT COLOR="#000000">&</FONT></A><BR>
-- <A HREF=""><FONT COLOR="#000000">#34;</FONT></A><BR>
-&nbsp;</FONT></SMALL></TD></TR></TABLE></TD></TR></TABLE><P>
-<TABLE BORDER="0" CELLPADDING="1" CELLSPACING="0" BGCOLOR="#000000" WIDTH="97%"><TR><TD>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="1" CELLPADDING="3">
-<TR><TD ALIGN="center" BGCOLOR="#EEEEEE"><B><FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#000000"><a href="http://www.linuxtelephony.org"><font color="#000000">linuxtelephony</font></a></FONT></FONT></B></TD></TR><TR><TD BGCOLOR="#FFFFFF"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial">
-- <A HREF="http://www.linuxtelephony.org/article.cgi?i=208&r=0"><FONT COLOR="#000000">Traverse Technologies releases NETspider-U in US</FONT></A><BR>
-- <A HREF="http://www.linuxtelephony.org/article.cgi?i=207&r=0"><FONT COLOR="#000000">Quicknet releases new GPL'd Linux Drivers!</FONT></A><BR>
-- <A HREF="http://www.linuxtelephony.org/article.cgi?i=206&r=0"><FONT COLOR="#000000">Natural Microsystems Delivers Carrier-Class Linux</FONT></A><BR>
-- <A HREF="http://www.linuxtelephony.org/article.cgi?i=205&r=0"><FONT COLOR="#000000">Quicknet is hiring programmers of all kinds!</FONT></A><BR>
-- <A HREF="http://www.linuxtelephony.org/article.cgi?i=204&r=0"><FONT COLOR="#000000">Babylon MLPPP Software Released under GPL</FONT></A><BR>
-- <A HREF="http://www.linuxtelephony.org/article.cgi?i=202&r=0"><FONT COLOR="#000000">Linux Telephony Server Project?</FONT></A><BR>
-- <A HREF="http://www.linuxtelephony.org/article.cgi?i=203&r=0"><FONT COLOR="#000000">Vovida Networks to Hire Telephony Software Engineers</FONT></A><BR>
-- <A HREF="http://www.linuxtelephony.org/article.cgi?i=200&r=0"><FONT COLOR="#000000">SPIRO-Linux Introduces Web-Enabled Phone Administration</FONT></A><BR>
-- <A HREF="http://www.linuxtelephony.org/article.cgi?i=199&r=0"><FONT COLOR="#000000">LinuxTelephony sponsors area at LinuxFest 2000</FONT></A><BR>
-- <A HREF="http://www.linuxtelephony.org/article.cgi?i=198&r=0"><FONT COLOR="#000000">GSM-Mobile Switching Center (MSC) with Linux-PC</FONT></A><BR>
-&nbsp;</FONT></SMALL></TD></TR></TABLE></TD></TR></TABLE><P>
-<TABLE BORDER="0" CELLPADDING="1" CELLSPACING="0" BGCOLOR="#000000" WIDTH="97%"><TR><TD>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="1" CELLPADDING="3">
-<TR><TD ALIGN="center" BGCOLOR="#EEEEEE"><B><FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#000000"><a href="http://www.32bitsonline.com"><font color="#000000">32bitsonline</font></a></FONT></FONT></B></TD></TR><TR><TD BGCOLOR="#FFFFFF"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial">
-- <A HREF="http://www.32bitsonline.com/article.php3?file=issues/200001/homeworld&page=1
-"><FONT COLOR="#000000">Game: Homeworld</FONT></A><BR>
-- <A HREF="http://www.32bitsonline.com/news.php3?news=news/200001/nb200001271a&page=1
-"><FONT COLOR="#000000">DVD Lawsuit Spreads Its Own 'Trade Secrets'</FONT></A><BR>
-- <A HREF="http://www.32bitsonline.com/news.php3?news=news/200001/nb200001272&page=1
-"><FONT COLOR="#000000">Register.com Adds 'One-step' Domain Registration</FONT></A><BR>
-- <A HREF="http://www.32bitsonline.com/article.php3?file=issues/200001/webevent&page=1
-"><FONT COLOR="#000000">WebEvent: Keeping you organized</FONT></A><BR>
-- <A HREF="http://www.32bitsonline.com/news.php3?news=news/200001/nb200001273a&page=1
-"><FONT COLOR="#000000">Y2K Officers Defend $100 Bil Investment</FONT></A><BR>
-- <A HREF="http://www.32bitsonline.com/article.php3?file=issues/200001/jan2000_john_berger&page=1
-"><FONT COLOR="#000000">DON'T BE FOOLED</FONT></A><BR>
-- <A HREF="http://www.32bitsonline.com/news.php3?news=news/200001/nb200001274&page=1
-"><FONT COLOR="#000000">Microsoft Scorns Think-Tank's Breakup Idea</FONT></A><BR>
-- <A HREF="http://www.32bitsonline.com/news.php3?news=news/200001/nb200001275a&page=1
-"><FONT COLOR="#000000">Yahoo Accused Of Stalking Internet Users</FONT></A><BR>
-- <A HREF="http://www.32bitsonline.com/news.php3?news=news/200001/nb200001276a&page=1
-"><FONT COLOR="#000000">eToys.com Settles Spat With Swiss Artist Group</FONT></A><BR>
-- <A HREF="http://www.32bitsonline.com/
-"><FONT COLOR="#000000">[more articles/news]</FONT></A><BR>
-&nbsp;</FONT></SMALL></TD></TR></TABLE></TD></TR></TABLE><P>
-<BR><BR></FONT>
-</TD></TR></TABLE>
-<TABLE WIDTH="100%" CELLPADDING="0" CELLSPACING="0" BORDER="0">
-<TR BGCOLOR="#000000"><TD><IMG SRC="image4" WIDTH="1" HEIGHT="2" ALT=""></TD></TR></TABLE>
-</CENTER>
-<TABLE CELLSPACING="0" CELLPADDING="2" WIDTH="100%" BORDER="0"><TR>
-<TD VALIGN="top" ALIGN="center"><FONT FACE="Lucida,Verdana,Helvetica,Arial"><SMALL>copyright � 1997-2000 <A HREF="http://andover.net">Andover.Net</A> -
-icons courtesy of <A HREF="mailto:tigert@gimp.org">tigert@gimp.org</A> -
-code revision <A HREF="http://freshmeat.net/ChangeLog">20000101</A> -
-our <A HREF="http://www.andover.net/privacy.html">privacy policy</A></SMALL></FONT></TD>
-</TR></TABLE>
-</BODY>
-</HTML>
-
-
diff --git a/ext/tk/sample/tkextlib/tkHTML/ss.rb b/ext/tk/sample/tkextlib/tkHTML/ss.rb
deleted file mode 100644
index 6531fef0e1..0000000000
--- a/ext/tk/sample/tkextlib/tkHTML/ss.rb
+++ /dev/null
@@ -1,437 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-#
-# This script implements the "ss" application.  "ss" implements
-# a presentation slide-show based on HTML slides.
-#
-require 'tk'
-require 'tkextlib/tkHTML'
-
-file = ARGV[0]
-
-class TkHTML_File_Viewer
-  include TkComm
-
-# These are images to use with the actual image specified in a
-# "<img>" markup can't be found.
-#
-@@biggray = TkPhotoImage.new(:data=><<'EOD')
-    R0lGODdhPAA+APAAALi4uAAAACwAAAAAPAA+AAACQISPqcvtD6OctNqLs968+w+G4kiW5omm
-    6sq27gvH8kzX9o3n+s73/g8MCofEovGITCqXzKbzCY1Kp9Sq9YrNFgsAO///
-EOD
-
-@@smgray = TkPhotoImage.new(:data=><<'EOD')
-    R0lGODdhOAAYAPAAALi4uAAAACwAAAAAOAAYAAACI4SPqcvtD6OctNqLs968+w+G4kiW5omm
-    6sq27gvH8kzX9m0VADv/
-EOD
-
-  def initialize(file = nil)
-    @root  = TkRoot.new(:title=>'HTML File Viewer', :iconname=>'HV')
-    @fswin = nil
-
-    @html = nil
-    @html_fs = nil
-
-    @hotkey = {}
-
-    @applet_arg = TkVarAccess.new_hash('AppletArg')
-
-    @images   = {}
-    @old_imgs = {}
-    @big_imgs = {}
-
-    @last_dir = Dir.pwd
-
-    @last_file = ''
-
-    @key_block = false
-
-    Tk::HTML_Widget::ClippingWindow.bind('1',
-                                         proc{|w, ksym| key_press(w, ksym)},
-                                         '%W Down')
-    Tk::HTML_Widget::ClippingWindow.bind('3',
-                                         proc{|w, ksym| key_press(w, ksym)},
-                                         '%W Up')
-    Tk::HTML_Widget::ClippingWindow.bind('2',
-                                         proc{|w, ksym| key_press(w, ksym)},
-                                         '%W Down')
-
-    Tk::HTML_Widget::ClippingWindow.bind('KeyPress',
-                                         proc{|w, ksym| key_press(w, ksym)},
-                                         '%W %K')
-
-    ############################################
-    #
-    # Build the half-size view of the page
-    #
-    menu_spec = [
-      [['File', 0],
-        ['Open',        proc{sel_load()},   0],
-        ['Full Screen', proc{fullscreen()}, 0],
-        ['Refresh',     proc{refresh()},    0],
-        '---',
-        ['Exit', proc{exit}, 1]]
-    ]
-
-    mbar = @root.add_menubar(menu_spec)
-
-    @html = Tk::HTML_Widget.new(:width=>512, :height=>384,
-                                :padx=>5, :pady=>9,
-                                :formcommand=>proc{|*args| form_cmd(*args)},
-                                :imagecommand=>proc{|*args|
-                                  image_cmd(1, *args)
-                                },
-                                :scriptcommand=>proc{|*args|
-                                  script_cmd(*args)
-                                },
-                                :appletcommand=>proc{|*args|
-                                  applet_cmd(*args)
-                                },
-                                :hyperlinkcommand=>proc{|*args|
-                                  hyper_cmd(*args)
-                                },
-                                :fontcommand=>proc{|*args|
-                                  pick_font(*args)
-                                },
-                                :appletcommand=>proc{|*args|
-                                  run_applet('small', *args)
-                                },
-                                :bg=>'white', :tablerelief=>:raised)
-
-    @html.token_handler('meta', proc{|*args| meta(@html, *args)})
-
-    vscr = @html.yscrollbar(TkScrollbar.new)
-    hscr = @html.xscrollbar(TkScrollbar.new)
-
-    Tk.grid(@html, vscr, :sticky=>:news)
-    Tk.grid(hscr,       :sticky=>:ew)
-    @root.grid_columnconfigure(0, :weight=>1)
-    @root.grid_columnconfigure(1, :weight=>0)
-    @root.grid_rowconfigure(0, :weight=>1)
-    @root.grid_rowconfigure(1, :weight=>0)
-
-    ############################################
-
-    @html.clipwin.focus
-
-    # If an argument was specified, read it into the HTML widget.
-    #
-    Tk.update
-    if file && file != ""
-      load_file(file)
-    end
-  end
-
-  #
-  # A font chooser routine.
-  #
-  # html[:fontcommand] = pick_font
-  def pick_font(size, attrs)
-    # puts "FontCmd: #{size} #{attrs}"
-    [ ((attrs =~ /fixed/)? 'courier': 'charter'),
-      (12 * (1.2**(size.to_f - 4.0))).to_i,
-      ((attrs =~ /italic/)? 'italic': 'roman'),
-      ((attrs =~ /bold/)? 'bold': 'normal') ].join(' ')
-  end
-
-  # This routine is called to pick fonts for the fullscreen view.
-  #
-  def pick_font_fs(size, attrs)
-    baseFontSize = 24
-
-    # puts "FontCmd: #{size} #{attrs}"
-    [ ((attrs =~ /fixed/)? 'courier': 'charter'),
-      (baseFontSize * (1.2**(size.to_f - 4.0))).to_i,
-      ((attrs =~ /italic/)? 'italic': 'roman'),
-      ((attrs =~ /bold/)? 'bold': 'normal')  ].join(' ')
-  end
-
-  #
-  #
-  def hyper_cmd(*args)
-    puts "HyperlinkCommand: #{args.inspect}"
-  end
-
-  # This routine is called to run an applet
-  #
-  def run_applet(size, w, arglist)
-    applet_arg.value = Hash[*simplelist(arglist)]
-
-    return unless @applet_arg.key?('src')
-
-    src = @html.remove(@applet_arg['src'])
-
-    @applet_arg['window'] = w
-    @applet_arg['fontsize'] = size
-
-    begin
-      Tk.load_tclscript(src)
-    rescue => e
-      puts "Applet error: #{e.message}"
-    end
-  end
-
-  #
-  #
-  def form_cmd(n, cmd, *args)
-    # p [n, cmd, *args]
-  end
-
-  #
-  #
-  def move_big_image(b)
-    return unless @big_imgs.key?(b)
-    b.copy(@big_imgs[b])
-    @big_imgs[b].delete
-    @big_imgs.delete(b)
-  end
-
-  def image_cmd(hs, *args)
-    fn = args[0]
-
-    if @old_imgs.key?(fn)
-      return (@images[fn] = @old_imgs.delete(fn))
-    end
-
-    begin
-      img = TkPhotoImage.new(:file=>fn)
-    rescue
-      return ((hs)? @@smallgray: @@biggray)
-    end
-
-    if hs
-      img2 = TkPhotoImage.new
-      img2.copy(img, :subsample=>[2,2])
-      img.delete
-      img = img2
-    end
-
-    if img.width * img.height > 20000
-      b = TkPhotoImage.new(:width=>img.width, :height=>img.height)
-      @big_imgs[b] = img
-      img = b
-      Tk.after_idle(proc{ move_big_image(b) })
-    end
-
-    @images[fn] = img
-
-    img
-  end
-
-  #
-  # This routine is called for every <SCRIPT> markup
-  #
-  def script_cmd(*args)
-    # puts "ScriptCmd: #{args.inspect}"
-  end
-
-  # This routine is called for every <APPLET> markup
-  #
-  def applet_cmd(w, arglist)
-    # puts "AppletCmd: w=#{w} arglist=#{arglist}"
-    #TkLabel.new(w, :text=>"The Applet #{w}", :bd=>2, :relief=>raised)
-  end
-
-  # This binding fires when there is a click on a hyperlink
-  #
-  def href_binding(w, x, y)
-    lst = w.href(x, y)
-    unless lst.empty?
-      process_url(lst)
-    end
-  end
-
-  #
-  #
-  def sel_load
-    filetypes = [
-      ['Html Files', ['.html', '.htm']],
-      ['All Files', '*']
-    ]
-
-    f = Tk.getOpenFile(:initialdir=>@last_dir, :filetypes=>filetypes)
-    if f != ''
-      load_file(f)
-      @last_dir = File.dirname(f)
-    end
-  end
-
-  # Clear the screen.
-  #
-  def clear_screen
-    if @html_fs && @html_fs.exist?
-      w = @html_fs
-    else
-      w = @html
-    end
-    w.clear
-    @old_imgs.clear
-    @big_imgs.clear
-    @hotkey.clear
-    @images.each{|k, v| @old_imgs[k] = v }
-    @images.clear
-  end
-
-  # Read a file
-  #
-  def read_file(name)
-    begin
-      fp = open(name, 'r')
-      ret = fp.read(File.size(name))
-    rescue
-      ret = nil
-      fp = nil
-      Tk.messageBox(:icon=>'error', :message=>"fail to open '#{name}'",
-                    :type=>:ok)
-    ensure
-      fp.close if fp
-    end
-    ret
-  end
-
-  # Process the given URL
-  #
-  def process_url(url)
-    case url[0]
-    when /^file:/
-      load_file(url[0][5..-1])
-    when /^exec:/
-      Tk.ip_eval(url[0][5..-1].tr('\\', ' '))
-    else
-      load_file(url[0])
-    end
-  end
-
-  # Load a file into the HTML widget
-  #
-  def load_file(name)
-    return unless (doc = read_file(name))
-    clear_screen()
-    @last_file = name
-    if @html_fs && @html_fs.exist?
-      w = @html_fs
-    else
-      w = @html
-    end
-    w.configure(:base=>name)
-    w.parse(doc)
-    w.configure(:cursor=>'top_left_arrow')
-    @old_imgs.clear
-  end
-
-  # Refresh the current file.
-  #
-  def refresh(*args)
-    load_file(@last_file) if @last_file
-  end
-
-  # This routine is called whenever a "<meta>" markup is seen.
-  #
-  def meta(w, tag, alist)
-    v = Hash[*simplelist(alist)]
-
-    if v.key?('key') && v.key?('href')
-      @hotkey[v['key']] = w.resolve(v['href'])
-    end
-
-    if v.key?('next')
-      @hotkey['Down'] =v['next']
-    end
-
-    if v.key?('prev')
-      @hotkey['Up'] =v['prev']
-    end
-
-    if v.key?('other')
-      @hotkey['o'] =v['other']
-    end
-  end
-
-  # Go from full-screen mode back to window mode.
-  #
-  def fullscreen_off
-    @fswin.destroy
-    @root.deiconify
-    Tk.update
-    @root.raise
-    @html.clipwin.focus
-    clear_screen()
-    @old_imgs.clear
-    refresh()
-  end
-
-  # Go from window mode to full-screen mode.
-  #
-  def fullscreen
-    if @fswin && @fswin.exist?
-      @fswin.deiconify
-      Tk.update
-      @fswin.raise
-      return
-    end
-
-    width  =  @root.winfo_screenwidth
-    height =  @root.winfo_screenheight
-    @fswin = TkToplevel.new(:overrideredirect=>true,
-                            :geometry=>"#{width}x#{height}+0+0")
-
-    @html_fs = Tk::HTML_Widget.new(@fswin, :padx=>5, :pady=>9,
-                                   :formcommand=>proc{|*args|
-                                     form_cmd(*args)
-                                   },
-                                   :imagecommand=>proc{|*args|
-                                     image_cmd(0, *args)
-                                   },
-                                   :scriptcommand=>proc{|*args|
-                                     script_cmd(*args)
-                                   },
-                                   :appletcommand=>proc{|*args|
-                                     applet_cmd(*args)
-                                   },
-                                   :hyperlinkcommand=>proc{|*args|
-                                     hyper_cmd(*args)
-                                   },
-                                   :appletcommand=>proc{|*args|
-                                     run_applet('big', *args)
-                                   },
-                                   :fontcommand=>proc{|*args|
-                                     pick_font_fs(*args)
-                                   },
-                                   :bg=>'white', :tablerelief=>:raised,
-                                   :cursor=>:tcross) {
-      pack(:fill=>:both, :expand=>true)
-      token_handler('meta', proc{|*args| meta(self, *args)})
-    }
-
-    clear_screen()
-    @old_imgs.clear
-    refresh()
-    Tk.update
-    @html_fs.clipwin.focus
-  end
-
-  #
-  #
-  def key_press(w, keysym)
-    return if @key_block
-    @key_block = true
-    Tk.after(250, proc{@key_block = false})
-
-    if @hotkey.key?(keysym)
-      process_url(@hotkey[keysym])
-    end
-    case keysym
-    when 'Escape'
-      if @fswin && @fswin.exist?
-        fullscreen_off()
-      else
-        fullscreen()
-      end
-    end
-  end
-end
-############################################
-
-TkHTML_File_Viewer.new(file)
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/tkimg/demo.rb b/ext/tk/sample/tkextlib/tkimg/demo.rb
deleted file mode 100644
index 0f0d585fc7..0000000000
--- a/ext/tk/sample/tkextlib/tkimg/demo.rb
+++ /dev/null
@@ -1,1479 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-#
-#  Tk::Img demo
-#
-#    --  This script is based on demo.tcl of Tcl/Tk's 'Img' extension.
-#        Image data in this script is those of demo.tcl.
-#        Please read 'license_terms_of_Img_extension' file.
-#
-require 'tk'
-require 'tkextlib/tkimg'
-
-#
-# Make the Image format available.
-#
-class TkImg_demo
-  def initialize
-    img_version = Tk::Img.package_version
-
-    @typeFrame = Hash.new
-    @imgPriv = Hash.new
-
-    root = TkRoot.new(:title=>'Tests for available image formats')
-
-    root.winfo_children.each{|w| w.destroy}
-    TkImage.names{|img| img.delete}
-
-    f = TkFrame.new
-    TkButton.new(f, :text=>'Dismiss', :command=>proc{exit}).pack(:side=>:left)
-    f.pack(:side=>:top, :expand=>:y, :fill=>:both)
-
-    TkMessage.new(:aspect=>900, :text=>format('This page shows the available image formats of the Img extension (Img version %s, using Tcl/Tk %s)', img_version, Tk::TK_PATCHLEVEL)).pack(:side=>:top, :expand=>:y, :fill=>:both)
-  end
-
-##############################
-
-  def update_animated_gif(w, method, num)
-    return unless @imgPriv[w]
-
-    if @imgPriv[w][:args]
-      im = TkPhotoImage.new
-      im.copy(@imgPriv[w][num])
-      num += 1
-      begin
-        im.configure(@imgPriv[w][:args].merge(:format=>[:gif, {:index=>num}]))
-        im.configure(:data=>'', :file=>'') #free storage
-        @imgPriv[w][num] = im
-      rescue
-        @imgPriv[w].delete(:args)
-        if num > 1
-          num = 0
-          im = @imgPriv[w][num]
-        else
-          # this is not an animated GIF; just stop
-          @imgPriv[w].delete(0)
-          return
-        end
-      end
-    else
-      num += 1
-      num = 0 unless @imgPriv[w][num]
-      im = @imgPriv[w][num]
-    end
-    begin
-      w.__send__(method, im)
-      Tk.update_idletasks
-      Tk.after(20, proc{update_animated_gif(w, method, num)})
-    rescue
-      @imgPriv[w].delete(:args)
-      @imgPriv[w].each{|im|
-        @im.delete
-        @imgPriv.delete(im)
-      }
-    end
-  end
-
-  def show_animated_gif(keys)
-    w = TkLabel.new
-    begin
-      im = TkPhotoImage.new(keys.merge(:format=>[:gif, {:index=>0}]))
-      im.configure(:data=>'', :file=>'', :format=>'') #free storage
-      w.image(im)
-      @imgPriv[w] ||= Hash.new
-      @imgPriv[w][0] = im
-      @imgPriv[w][:args] = keys
-      Tk.update_idletasks
-      Tk.after(20, proc{update_animated_gif(w, :image, 0)})
-    rescue => e
-      w.configure(:text=>"error displaying animated gif:\n#{e.message}",
-                  :image=>'', :relief=>:ridge)
-    end
-    w.pack
-  end
-
-  def show_image(fmt, type, data)
-    fmt = fmt.to_s.capitalize
-    unless @typeFrame[fmt]
-      @typeFrame[fmt] = TkFrame.new.pack(:side=>:top, :expand=>true, :fill=>:x)
-      TkLabel.new(@typeFrame[fmt], :text=>"#{fmt} :  ").pack(:side=>:left)
-    end
-    begin
-      f = TkFrame.new(@typeFrame[fmt],
-                      :borderwidth=>2, :relief=>:ridge).pack(:side=>:left)
-      im = TkPhotoImage.new(:data=>data)
-      im['data'] = ''
-      TkLabel.new(f, :image=>im).pack
-      TkLabel.new(f, :text=>type, :borderwidth=>0, :pady=>0, :padx=>2,
-                  :font=>'Helvetica 8').pack
-    rescue => e
-      TkMessage.new(f, :text=>"error displaying #{type} image: #{e.message}",
-                    :aspect=>250).pack
-    end
-    Tk.update
-  end
-
-end
-
-##############
-
-demo = TkImg_demo.new
-
-##############
-
-demo.show_animated_gif(:data=><<'ENDofIMG')
-R0lGODlhYgIEAIIAAQAAACQAJEkASW0AbZIAkrYAttsA2/8A/yH/C05FVFNDQVBFMi4wAwEA
-AAAh+QQABgD/ACwAAAAAYgIEAAIDuUg63CMwwiCCvQAHwLv/YCiOZGmeaKqubOu+pZXNV03d
-kuAwysLoucjNlpFtYMikcslsOp+ijbRow1EiD12jtyA4INnJZGg8HmfQtHrNbrPP6KqlEgRq
-B17vzi6ukKVmHXBuhIWGh4RTcXJ0QQ8OeVx6XzlWVTRoiJqbnJ0tGmUXdDhgd1uTP2FCo5dT
-g56wsbKaoYBzVlimPJJ7QX9EirPCw8RttTZ1ul29Er81mMXR0tMvxzXJO1wAACH5BAAGAP8A
-LAAAAABiAgQAAgPdCLrc/jDKSau9OOuNAwjgB46kEJjnKazr0A5wTBDDbBc4buz74f/AoHBI
-LBqPSCGPh7M5abQYTOBysVYprAlFCo0+YI9CzCmbz+i0es1uu9/wOFrsqYtE3S73yq9SpTBP
-BDk5PEmHiImKRQYHTISDNjWTMX9UfFuZIFwkY3RhcqGio6SlpqeoqRt2dXmuWyqZV1Z/UjM1
-ToQFS46Lvr/AQUu6BYK4gJe0V7Eprl+sXqrS09TV1tfYbKxhziqxmFOAgYKDOrs9wenqSY07
-uznklFKXmCzN3aB22fv81AAAIfkEAAYA/wAspgAAABgBBAACA+YIEQrNS61Jg1hX6C2GHiBI
-DERpFkShFkZrHHAsz3Rt06/Lrqk5jqFQ58PheI5B0s+HWrFch9dtSp26dDyULwnqeIoay+Qi
-rkAcZ4YDrVY/IOaxGGz0IkPLknN3rfr/MToGTilaJSRcR3RgikF5JyuDfYCUVFeDKj0mSkle
-Q4sYcXFvaA1rDxIScKIZYUVfiUA+PU6Tlbc4US07PJs/nYqLQ4kieZkqki24yzJXe5qziEHD
-dHNloqqpbqfcbquiGK2MH0mzkJG2zLfOhObSQsHC1OVKTLVQUurrWL1biZ9grIFLs2YbNwAh
-+QQABgD/ACyHAAAAVwEEAAID/ggQy94uyCloFTgPsYf/AyGOYmGaRnoYR+u+cCzPcZqeJyl6
-xMdhm4zwUgkUJ8iFkqFgKptQCQRJMRqJwqAPtCMVCDhDwcaimc9mslhs0vXeoJ9caL1Q748n
-tMl89PFURURXQx4cH11eYChjKmiPkC5kOGCVIyCYWkN2VoB8fXtOS34RgJybGkCZbosnZJGw
-aCw3bF9tXSFxhqhXnb5JSUt6CsKlxneDqHIdqyEjOI0qZbHUMGq1bs6Yh3NDdb93U1Ki41Hi
-poSEqYZcuYphr9XykjbQrLnbHbwYEkd4xQ2GERvoZxQ6LIUOrWLlKtq8h5Ps6ci0SxknQOVE
-Ddy4HvGPQVMIC1Hk4QZavIfUZq3J8YUEPl0WL3qaIIwjMQAh+QQABgD/ACxlAAAAmwEEAAID
-/ggRCr1qSSlWDVXorYfwQxgSxECSBVGsheEaB3zMdG3feF7DbsumJ5JJJPpwjhnLZMloPp4M
-h3RKrVqv2KxW2nRGmBQlBnP0dD7EYfDne8l08DjcbfgFhaW0cX8ciy9LD05RUREOhQ2GYEoa
-ZGQbIGlDJmsqPy9ymZo0PD11Kyp3anogfX5igamGh1utrq+uhFBQYBm2j5CSIncnLHWYm8Fx
-bj52QZOSSBeNp2BfEIVeU4PUi0mOSJFoaXcpvnTC4TnExiejRdrK2IsSgrKIsPHyr4OJ7GHL
-thxmkSN4vZdauIghriCnF2yAmBOCzoiZPkkAOav3JEs0d+z0ZdPFMgvFJWAGCxL7pPBYHiJ8
-TElcNGuey5cwW97Dp6yDpBK82LgJaXAki47IGqq7xm4WPCoAACH5BAAGAP8ALEYAAADZAQQA
-AgP+GKC7yiHKGYSo1Wo9xPgfMYhEWRZoYaiGcbxwLM90Tbf4ihKFSYqgjnBDjFwuGMoD0Fgy
-n9CodEqtWq/YrHa7hTgaTSXySCZ6PMFQyJdC5Vy2uFz+VqV8pFH6czYfM0pKYF4MYE0OD4ET
-Y4BEfHt6eDt2OAdwc5iZLzhtO3iQIBYdGhgWpYoTYUxOXK2ur7CxrV5fqBR/GWZDaT9sPG4s
-l5rDNi4tdpOfQGlno6SmSEkUiISDT4mJtYpkubq7Qb0mbSuVwsTnmzltPJ96oY9+uNGKiLWy
-9/j5+l3YqrZl3UT12YPnxLg36BLCULdOmbt38bjNC3TISSEqSyRQE1M8yo8QXiMk/XJTSaFC
-hg19gIp4auI0Vhf3yZxJUx8EbP/K6EIDLqSvgy1MJlSno0cPlcsg+gEkTZBGVlMAACH5BAAG
-AP8ALCYAAAAXAgQAAgP+CAHaHQtKKGioV+itRx/gQIBESRTnWRRGexhHLM90bd9127Jrao7A
-kMfDKVommMnisYwwHM+odEqtWq/YrHbL7Xq/YIaTCVEoj5YiZ8gmiX6l1UrnguHu+DvdIEeh
-4EJsAkRqGBoXZxJmEU2NYo9mYoyJFRwZG22Bbz99LHR5oKEydDxyPiUimiCDrIeViK9ni4wP
-kGG3uLm6u7y9tmO1iRKuGZeYmUDJJn18OqLPoKQ9fyZuga2Er4fCioqRTVFlZWTcxJVFQx9u
-yioqPM7Q8TbSptRBI0KthRvF3OLitnwJHEiwoMErk5jMOmMIVqFMIdjFmeMJhh15GF/o6HRK
-qhq+VayyWYLlr5GTcVjAlTS0DyIJOBPlfMqI0WKzeoA+htCnph+3SFAOCh1KtGivk/+EnWs5
-KJDEFMzg0ZS3BydMVSL5aStJ6woAIfkEAAYA/wAsBwAAAFUCBAACA/4ICqEd8MUJRQ0i65GH
-F55HEMM4FkShFgZrHHAsz3Rt10aer6s5lqEQqKPRYI6WI+XBYDYYi+diSq1ar9isdsvter/g
-sHhMLkebUEhziUkai8ROMOQ78Vy6m37Pf+1aPXUlJEJCcG9ubGpOaWlPUowSSxYZbW1FHCBz
-g3V3eC98oaIwfi07KCkmQIQfH4eUsBdLa4tnUma4ubq7vL2+v1mPUGiKE7GVh4V0Pz53pjmj
-0X06LD2oqqxBG4dKiRS0TrdTkcURlBWwmJqaIqsmqDw6oNL0NPKeddnaHJlwl0qKGgkTB6yg
-wYMIEyq8Qm5RsXOW4PCbGIREp3jy5tXbWE4KUCBsm4aI5HYuSUBJDoZZgQTu4aVkm5ZdVCFv
-o01SB/589AFkzshXAE8KXEi0qNGjSMlEajnpJcxN+exUy3OTIzUeUXvue4WsXC0mWAAAIfkE
-AAYA/wAsAAAAAGICBAACA/4YotIuA8JBKxkk60KKN6BxiEdpnmiqrmhoeF6naVXdRI/DBAq/
-8MAAQDgsEgHIpHLJbDqf0Kh0Sq1ar9isdsvterdEIW8IJAfPv0XOEalZZjJYwcWq2++i0Fwu
-m2HcbWs5PWoMgm01F4obci90d5CRJS5yHBw0GX8UEpw6D4RnY0FGYUVfp6ipqqusra6vXKVk
-pqFBhYM5gYkYcJWOIZLBdnovMH2YbjcSOLc+hA2GyoB/cBmWe8DC2ivExpdw05vMn4W1o2Wi
-sOrr7O3u7/BVoujz5mrQhxNuF7zWHTCPtgmcNALEHmPg+NnohOvHs3yILPRjBBAYiYHaXBRD
-6CtnmiBP5mqZGhmvpMmTKFOqbBJGTEgg+D5GlFjt2pyAGIVR4lNNU7JxnhwCACH5BAAGAP8A
-LAAAAABiAgQAAgPtWLZ7/jDKSaU5rOhCuu9DKA5CKJRnGgjB6rJt3AIxDdzBbet87//AoHBI
-LBqPyKRyyWw6n9CodOrL8ay5rFa2YsG8qRNJXAoRRB8CZ6NgYCrweJxhUNjd8rz+QWevPwMg
-ImUoYWEtX1wzNFg2jVSQkZKTlJWWl5iZTo+OW4qIMYZhJKQjgWlqbHQXe61wFwt2bQ2utROw
-sX6oZqYoY4YvLp81WY47msjJysvMzc7PxjPEw2DVKWOmvKceaxurtuB8GLl1Dazhtn0bqGdn
-vb/AXsPE0dD29/j5+vvLVtHzJ7qIKpSNXSpVtNCly1AAACH5BAAGAP8ALAAAAABiAgQAAgPV
-eLq8diYWUwqxJJOx9/iDEIpCaZpBmQZs6wYAC8QwPd94ru987//AoHBILBqPyKRyyWw6n9Ao
-Elaj0l4tlYC1PZVCoHBnnLFUJpF0Y81uOyCTc0Wj4YRBJO9qu8LKqjaAUoOEhYaHiImKi4yN
-TzUxN1STflxZXiZgInccdGZyaQ9uo24PoXFmdHacJCOYKXx8lZRXM5COuLm6u7y9vr+KtJSz
-e1perpwZnRqfaGqk0GunZxd0yh54mq8qxFaRwODh4uPk5eaEVVbdxpibm3fWZXLOotEAADs=
-ENDofIMG
-
-demo.show_image('bmp', '1-bit', <<'ENDofIMG')
-Qk3OAQAAAAAAAD4AAAAoAAAAIgAAADIAAAABAAEAAAAAAJABAABtCwAAbQsAAAIAAAACAAAA
-MzPMAMwzMwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAZmTKAAAAAABIRIwAAAAAAEZAigAAAAAAQECIAAAAAAAAAAgAAAAAAAAEAA
-AAAAAAABQAAAAAAAAAPAAAAAAAAAB+AAAAAAAAAC4AAAAAAAAALgAAAAAAAAAsAAAAAAAAAC
-wAAAAAAAAALgAAAAAAAABuAAAAAAAAAG4AAAAAAAAAbgAAAAAAAABuAAAAAAAAAG4AAAAAAA
-AAfgAAAAAAAAA+AAAAAAAAADcAAAAAAAAAPwAAAAAAAAA/AAAAAAAAAD+AAAAAAAAAP4AAAA
-AAAAA/gAAAAAAAAD4AAAAAAAAAHgAAAAAAAAAfAAAAAAAAAA+AAAAAAAAAB8AAAAAAAAADgA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-ENDofIMG
-
-demo.show_image('bmp', '4-bit', <<'ENDofIMG')
-Qk1aBAAAAAAAAHIAAAAoAAAAIgAAADIAAAABAAQAAAAAAOgDAABtCwAAbQsAAA8AAAAPAAAA
-////AAD//wDMzP8AmZn/AGaZ/wAzM8wAmZnMAGaZzAAzZswAzMyZAJmZmQDMZjMAZjNmADMz
-ZgBmMzMABWMgAAAAAAAAAAAAAAAAAAAAAAAFVVVVVVVVVVVVVVVVVVVVUAAAAAVVVVVVVVVV
-VVVVVVVVVVVQAAAABVVVVVVVVVVVVVVVVVVVVVAAAAAFVVVVVVVVVVVVVVVVVVVVUAAAAAVV
-VVVVVVVVVVVVVVVVVVWAAAAABVVVVVVVVVVVVVVVVVVVVVAAAAAFVVBVU3VSVVNVB1UFBVVV
-UAAAAAVVUFU1VVNVVVUFVQBVVVVgAAAABVVQVVUFU1VVVQVVBVVVVTAAAAAIVVBVVVVTVXVV
-BVUFVVVVMAAAAAVVVVVVVVFVFVVVVQVVVVUgAAAABVVVVVVVVVUFVVVVVVVVVSAAAAAHVVVV
-VVVVW5tVVVVVVVVVAAAAAAZVVVVVVVW8u2VVVVVVVVUAAAAAA1VVVVVVW7W7tVVVVVVVVQAA
-AAADVVVVVVWCtbuzVVVVVVVVAAAAAANVVVVVVVW1vrJVVVVVVVUAAAAAAlVVVVVVWLW7UFVV
-VVVVVQAAAAACVVVVVVVatbtVVVVVVVVVAAAAAABVVVVVVVq3u8NVVVVVVVUAAAAAAFVVVVVV
-XrS74VVVVVVVVQAAAAAAVVVVVVWLtbuyVVVVVVVVAAAAAABVVVVVVUu1u7BVVVVVVVUAAAAA
-AFVVVVVVO7W7sFVVVVVVVQAAAAAAVVVVVVUbtbu6VVVVVVVVAAAAAABVVVVVVSu9u1VVVVVV
-VVUAAAAAAFVVVVVVJb67tVVVVVVVVQAAAAAAVVVVVVVVu6u7VVVVVVVVAAAAAABVVVVVVVW7
-u7slVVVVVVUAAAAAAFVVVVVVVbu7u1VVVVVVVQAAAAACVVVVVVVVu7u7wlRVVVVVAAAAAAJV
-VVVVVVW7u7uwV1VVVVUAAAAAA1VVVVVVVbu7u7BVhVVVVSAAAAADVVVVVYVVu7vFAFUVVVVV
-MAAAAAZVVVVVhVUbu7VVVRVXVVVgAAAAB1VVVVVVVVu7u1VVFVFVVVAAAAAFVVVVVVhVVLu7
-xVVVVVVVgAAAAAVVVVVVUVVVK7u1VVVVVVVQAAAACFVVVVhRVVVQq7VVVVVVVVAAAAAFVVVV
-VFV1VVUgBVVVVVVVUAAAAAVVVVVUVRVVVVVVVVVVVVVQAAAABVVVVViFUVVVVVVVVVVVVVAA
-AAAFVVVVVRVUFVVVVVVVVVVVUAAAAAVVVVVVVVVVVVVVVVVVVVVQAAAABVVVVVVVVVVVVVVV
-VVVVVVIAAAAFVVVVVVVVVVVVVVVVVVVVUQAAAAVVVVVVVVVVVVVVVTdVVVVWAAAAAAAhNnWF
-VVVVVVcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==}
-ENDofIMG
-
-if false
-demo.show_image('bmp', '4-bit-RLE', <<'ENDofIMG')
-Qk1sAwAAAAAAAHYAAAAoAAAAIgAAADIAAAABAAQAAgAAAPYCAAAAAAAAAAAAABAAAAAQAAAA
-////AMzM/wAA//8AmZn/AJmZzABmmcwAMzPMADNmzABmmf8AmZmZAMxmMwBmM2YAZjMzADMz
-ZgDMzJkAAAAAAAAGBkMQABwAAAACBh5mAmAAAAIGHmYCYAAAAgYeZgJgAAACBh5mAmAAAAIG
-HmYCcAAAAgYeZgJgAAAAIgZmYGZjVmFmY2YFZgYGZmZgAAAAACIGZmBmNmZjZmZmBmYAZmZm
-QAAAAAAiBmZgZmYGY2ZmZgZmBmZmZjAAAAAAIgdmYGZmZmNmVmYGZgZmZmYwAAAAAgYKZgAW
-YmYmZmZmBmZmZhAAAAACBg5mAgYOZgIQAAACBQxmAARq6g5mAgAAAAIEDGYABquqRgAMZgIA
-AAACAwpmAAhqpqqmDGYCAAAAAgMKZgAIcaaqowxmAgAAAAIDDGYABqasoQAMZgIAAAACAQpm
-AAhnpqpgDGYCAAAAAgEKZgAGaaaqAA5mAgAAAAIACmYACGmlqrMMZgIAAAACAApmAAhsqKrC
-DGYCAAAAAgAKZgAIeqaqoQxmAgAAAAIACmYACIqmqqAMZgIAAAACAApmAAg6pqqgDGYCAAAA
-AgAKZgAIKqaqqQxmAgAAAAIACmYABhqtqgAOZgIAAAACAApmAAgWrKqmDGYCAAAAAgAMZgAG
-qpqqAAxmAgAAAAIADGYACKqqqhYKZgIAAAACAAxmAAaqqqoADGYCAAAAAgEMZgAKqqqqsWgA
-CGYCAAAAAgEMZgAKqqqqoGUACGYCAAAAAgMMZgAUqqqqoGZ2ZmZmEAAAAgMIZgAYdmaqqrYA
-ZiZmZmYwAAACBAhmABh2ZiqqpmZmJmVmZkAAAAIFDGYAFGqqqmZmJmJmZmAAAAIGCGYADGdm
-aKqqtgpmAnAAAAIGCGYADGJmZhqqpgpmAmAAAAAWB2ZmZmdiZmZgmqYACmYCYAAAABYGZmZm
-aGZWZmYQBgAKZgJgAAAADgZmZmZoZiYAEmYCYAAAAA4GZmZmZ3ZiABJmAmAAAAIGCGYABiZo
-JgAQZgJgAAACBh5mAmAAAAIGHmYCYQAAAgYeZgJiAAACBhZmAAo1ZmZmZAAAAAAMAAASNFZ2
-CGYCZQwAAAAiAAAB
-ENDofIMG
-end
-
-demo.show_image('bmp', '8-bit', <<'ENDofIMG')
-Qk0CCAAAAAAAAPoAAAAoAAAAIgAAADIAAAABAAgAAAAAAAgHAABtCwAAbQsAADEAAAAxAAAA
-////AMz//wAA//8AzMz/AJnM/wAAzP8AmZn/AGaZ/wAAmf8AZmb/ADNm/wAzM/8A/8zMAMzM
-zACZmcwAZpnMAACZzABmZswAM2bMAABmzAAzM8wAADPMAAAAzAD/zJkAzMyZAMyZmQCZmZkA
-ZmaZAGYzmQAzM5kAzJlmAJlmZgBmZmYAZjNmADMzZgDMmTMAmWYzAJkzMwBmMzMAmWYAAJkz
-AAAAAN0A7u7uAN3d3QC7u7sAqqqqAIiIiAB3d3cAVVVVAAARDgYDKgAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAVFRUVFRUVFRUVFBQUFBQUFRUVFRUVFRUVFRUVFRUVFQAAAAAV
-FRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFQAAAAAVFRUVFRUVFRUVFRUVFRUVFRUV
-FRUVFRUVFRUVFRUVFAAAAAAVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFAAAAAAV
-FRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVEgAAAAAVFRUVFhUVFRYVFRUWFRUVERUV
-FhUVFRYVFhUVFRUVEQAAAAAUFRUWABEVFQYPFhUDERUWBhUVKg8VFAAUABQVFRUVEQAAAAAU
-FRUWABYVBhQWFRUGFBUWERUWABYVFgAAFRUVFRUVDgAAAAAUFRUVABUVFBEAFhUGFBUUFRUV
-ABUVFgARFRUVFRUVBgAAAAASFRUWABUVFRUVFRUGFBUPFhUWABYVFgAVFBUVFRUVBgAAAAAR
-FRUVFhUVFRUVFRUEFBUEFhUVFhUVFQAWFRUVFRUVAwAAAAARFRUVFRUVFRUVFRUVFRUrHRUV
-FRUVFRUVFRUVFRUVAwAAAAAPFRUVFRUVFRUVFRUVFCQYKBUVFRUVFRUVFRUVFRUVKgAAAAAO
-FRUVFRUVFRUVFRUUJyEeKA4VFRUVFRUVFRUVFRUVAAAAAAAGFRUVFRUVFRUVFRYeKB0kKCQU
-FRUVFRUVFRUVFRUVAAAAAAAGFRUVFRUVFRUVFRIDKBQnKCgGFRUVFRUVFRUVFRUVAAAAAAAG
-FRUVFRUVFRUVFRUVJxEnJigDFRUVFRUVFRUVFRUVAAAAAAADFRUVFRUVFRUVFRUSKBEnKAkq
-FRUVFRUVFRUVFRUVAAAAAAADFRUVFRUVFRUVFRUuJxEoKBEWFRUVFRUVFRUVFRUVAAAAAAAr
-FRUVFRUVFRUVFRYvKA8oKCEGFRUVFRUVFRUVFRUVAAAAAAAqFRUVFRUVFRUVFRQmKAcoKCYE
-FRUVFRUVFRUVFRUVAAAAAAAAFRUVFRUVFRUVFRIoJwkoKCgDFRUVFRUVFRUVFRUVAAAAAAAA
-FRUVFRUVFRUVFQcoJxEnKCgBFRUVFRUVFRUVFRUUAAAAAAAAFRUVFRUVFRUVFQYoKBQnKCgq
-FhUVFRUVFRUVFRUUAAAAAAAAFRUVFRUVFRUVFQQoKBQkKCgsFhUVFRUVFRUVFRUUAAAAAAAA
-FRUVFRUVFRUVFQMkKCIjKB0RFRUVFRUVFRUVFRUUAAAAAAAAFRUVFRUVFRUVFQMUKCYeKCgV
-FRUVFRUVFRUVFRUVAAAAAAAAFRUVFRUVFRUVFRUVKCgaKCgnFRUVFRUVFRUVFRUVAAAAAAAA
-FRUVFRUVFRUVFRUUKCgkKCgoAxYVFRUVFRUVFRUVAAAAAAArFRUVFRUVFRUVFRURKCgoKCgo
-ERQVFRUVFRUVFRUVAAAAAAADFRUVFRUVFRUVFRURKCgoKCgoIQMWCBUVFRUVFRUVAAAAAAAD
-FRUVFRUVFRUVFRURKCgoKCgoKAAWEBYVFRUVFRUVKgAAAAAGFRUVFRUVFRUVFRUUJygoKCgo
-KAAWFRMVFRUVFRUVAwAAAAAGFRUVFRUVFRUTFhUWHigoKCEUKgAWFgIVFRUVFRUVBgAAAAAO
-FRUVFRUVFRUTFRUVBCgoKCgUFRYVFgIWFRAWFRUVDgAAAAAPFRUVFRUVFRUVFRUVFR4oKCgo
-FRUVFQIVFQUVFRUVEQAAAAARFRUVFRUVFRUVExUVFQckKCgoIRUVFRYVFRUVFRUVEgAAAAAR
-FRUVFRUVFRUWAhYVFRYDJygoKB0VFRUVFRUVFRUVFAAAAAASFRUVFRUVFRMVBRUVFRUWKhko
-KBQVFRUVFRUVFRUVFQAAAAAUFRUVFRUVFQgWFRAVFRUVFgMAKxYVFRUVFRUVFRUVFQAAAAAU
-FRUVFRUVFQgWFQIWFRUVFRUWFhUVFRUVFRUVFRUVFQAAAAAUFRUVFRUVFRMTFRUFFhUVFRUV
-FRUVFRUVFRUVFRUVFQAAAAAVFRUVFRUVFRYFFhUIAhYVFRUVFRUVFRUVFRUVFRUVFQAAAAAV
-FRUVFRUVFRUVFRUVFhUVFRUVFRUVFRUVFRUVFRUVFQAAAAAVFRUVFRUVFRUVFRUVFRUVFRUV
-FRUVFRUVFRUVFRUVFQMAAAAVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFQQAAAAV
-FRUVFRUVFRUVFRUVFRUVFRUVFRUVFAYPEREUFBQVFQ4AAAAAACoDBAYODxESFBQVFRUVFRUV
-FQ8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
-ENDofIMG
-
-if false
-demo.show_image('bmp', '8-bit-RLE', <<'ENDofIMG')
-Qk22CAAAAAAAADYEAAAoAAAAIgAAADIAAAABAAgAAQAAAIAEAAAAAAAAAAAAAAABAAAAAQAA
-////AO7u7gDMzP8Amcz/AJmZ/wCZmcwAZpnMAGZmzAAzZswAMzPMAAAzzAAAAMwAAMz/AACZ
-/wAA//8AAGbMAACZzADd3d0AzJmZAJkzAACZZgAAMzOZAGaZ/wCZZjMAZjNmAMyZZgCZmZkA
-ZjMzADMzZgDMmTMAu7u7AMz//wBmZv8Ad3d3AIiIiADMzJkAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAG
-AAcFBAIBHAAAAAEACgoGCRAKAQAAAAEAIAoBAAAAAQAfCgEJAQAAAAEAHwoBCQEAAAABAB8K
-AQgBAAAAAQAECgAWCwoKCgsKCgoLCgoKBwoKCwoKCgsKCwUKAQcBAAAAABwACQoKCwAHCgoE
-BgsKAgcKCwQKCgEGCgkACQAJBAoBBwEAAAAAGgAJCgoLAAsKBAkLCgoECQoLBwoLAAsKCwAA
-BgoBBQEAAAAAGgAJCgoKAAoKCQcACwoECQoJCgoKAAoKCwAHBgoBBAEAAAAABgAICgoLAAcK
-AA4ECQoGCwoLAAsKCwAKCQUKAQQBAAAAAAYABwoKCgsHCgANAwkKAwsKCgsKCgoACwAGCgEC
-AQAAAAEAAQcOCgERARUOCgECAQAAAAEAAQYMCgAECRcjEw4KAQEBAAAAAQABBQsKAAYJFBgZ
-EwUNCgEAAQAAAAEAAQQKCgAICxkTFRcTFwkMCgEAAQAAAAEAAQQKCgAICAITCRQTEwQMCgEA
-AQAAAAEAAQQMCgAGFAcUGxMCDAoBAAEAAAABAAECCwoABwgTBxQTIAEADAoBAAEAAAABAAEC
-CwoAByIUBxMTBwsADAoBAAEAAAABAAERCgoACAshEwYTExgEDAoBAAEAAAABAAEBCgoACAkb
-ExYTExsDDAoBAAEAAAABAAEACgoACAgTFCATExMCDAoBAAEAAAABAAEACgoACBYTFAcUExMf
-CwoAAwkAAAAAAAEAAQAKCgAJBBMTCRQTEwELAAoKAAMJAAAAAAABAAEACgoACQMTEwkXExMe
-CwAKCgADCQAAAAAAAQABAAoKAAgCFxMcHRMVBwsKAAMJAAAAAAABAAEACgoABwIJExsZExMA
-DQoBAAEAAAABAAEADAoABhMTGhMTFAwKAQABAAAAAQABAAsKAAkJExMXExMTAgsACgoBAAEA
-AAABAAERCwoBBwYTAQcBCQoKAQABAAAAAQABAgsKAQcGEwAEGAILDQgKAQABAAAAAQABAgsK
-AQcHEwAEAAsQCwcKAQEBAAAAAQABBAsKAQkBFAYTAAQACwoPBwoBAgEAAAABAAEECAoADw8L
-CgsZExMTGAkBAAsLDgAHCgEEAQAAAAEAAQUICgAFDwoKCgMABBMADwkKCwoLDgsKEAsKCgoF
-AAAAAAEAAQYNCgEZBBMECgAEDgoKDAQKAQcBAAAAAQABBwkKAA4PCgoKFhcTExMYCgoKCwcK
-AQgBAAAAAQABBwgKAAwLDgsKCgsCFBMTExUKCgEJAQAAAAEAAQgHCgADDwoMAAQKAAYLARIT
-EwkLCgEAAAABAAEJBwoABA0LChAECgAFCwIAEQsACwoBAAAAAQABCQcKAAUNCwoOCwAFCgEL
-AQsMCgEAAAABAAEJBwoABg8PCgoMCxIKAQAAAAEACAoABwsMCwoNDgsAEQoBAAAAAQANCgEL
-EgoBAAAAAQAgCgECAAABACAKAQMAAAEAFgoACwkEBgcHCQkJCgoFAAAAAA0AAAABAgMEBQYH
-CAkJAAgKAQYMAAAAIgAAAQ==
-ENDofIMG
-end
-
-demo.show_image('bmp', '32-bit', <<'ENDofIMG')
-Qk2GFAAAAAAAADYAAAAoAAAAIgAAADIAAAABABgAAAAAAFAUAABtCwAAbQsAAAAAAAAAAAAA
-////ZmbMmZnMmZn/zMz/7u7u////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////AAD///8A
-M8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wzM8wzM8wzM8wzM8wzM8wzM8wAM8wAM8wA
-M8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8z///8AAP///wAzzAAz
-zAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAz
-zAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzP///wAA////ADPMADPMADPM
-ADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPM
-ADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMMzPM////AAD///8AM8wAM8wAM8wAM8wA
-M8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wA
-M8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wzM8z///8AAP///wAzzAAzzAAzzAAzzAAzzAAz
-zAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAz
-zAAzzAAzzAAzzAAzzAAzzAAzzAAzzDNmzP///wAA////ADPMADPMADPMADPMAADMADPMADPM
-ADPMAADMADPMADPMADPMAADMADPMADPMADPMZmbMADPMADPMAADMADPMADPMADPMAADMADPM
-AADMADPMADPMADPMADPMADPMZmbM////AAD///8zM8wAM8wAM8wAAMz///9mZswAM8wAM8yZ
-mf9mmcwAAMwAM8zMzP9mZswAM8wAAMyZmf8AM8wAM8zu7u5mmcwAM8wzM8z///8zM8z///8z
-M8wAM8wAM8wAM8wAM8xmZsz///8AAP///zMzzAAzzAAzzAAAzP///wAAzAAzzJmZ/zMzzAAA
-zAAzzAAzzJmZ/zMzzAAzzAAAzGZmzAAzzAAAzP///wAAzAAzzAAAzP///////wAzzAAzzAAz
-zAAzzAAzzAAzzJmZzP///wAA////MzPMADPMADPMADPM////ADPMADPMMzPMZmbM////AADM
-ADPMmZn/MzPMADPMMzPMADPMADPMADPM////ADPMADPMAADM////ZmbMADPMADPMADPMADPM
-ADPMADPMmZn/////AAD///8zZswAM8wAM8wAAMz///8AM8wAM8wAM8wAM8wAM8wAM8wAM8yZ
-mf8zM8wAM8xmmcwAAMwAM8wAAMz///8AAMwAM8wAAMz///8AM8wzM8wAM8wAM8wAM8wAM8wA
-M8yZmf////8AAP///2ZmzAAzzAAzzAAzzAAAzAAzzAAzzAAzzAAzzAAzzAAzzAAzzJnM/zMz
-zAAzzJnM/wAAzAAzzAAzzAAAzAAzzAAzzAAzzP///wAAzAAzzAAzzAAzzAAzzAAzzAAzzMzM
-/////wAA////ZmbMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPM
-3d3dMzOZADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMzMz/////
-AAD///9mmcwAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wzM8yZZjPMzJmZ
-MwAAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8zu7u7///8AAP//
-/5mZzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzDMzzJlmAGYzZsyZZpkzAJmZ
-zAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzP///////wAA////mZn/
-ADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMAADMzJlmmTMAMzOZmWYzmTMAmWYzMzPM
-ADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPM////////AAD///+Zmf8AM8wA
-M8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wzZszMzP+ZMwAzM8yZZgCZMwCZMwCZmf8AM8wA
-M8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8z///////8AAP///5mZ/wAzzAAzzAAz
-zAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzJlmAGZmzJlmAGYzM5kzAMzM/wAzzAAzzAAz
-zAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzP///////wAA////zMz/ADPMADPMADPMADPM
-ADPMADPMADPMADPMADPMADPMADPMM2bMmTMAZmbMmWYAmTMAZmb/7u7uADPMADPMADPMADPM
-ADPMADPMADPMADPMADPMADPMADPMADPM////////AAD////MzP8AM8wAM8wAM8wAM8wAM8wA
-M8wAM8wAM8wAM8wAM8wAM8yIiIiZZgBmZsyZMwCZMwBmZswAAMwAM8wAM8wAM8wAM8wAM8wA
-M8wAM8wAM8wAM8wAM8wAM8wAM8z///////8AAP///93d3QAzzAAzzAAzzAAzzAAzzAAzzAAz
-zAAzzAAzzAAzzAAAzHd3d5kzAGaZzJkzAJkzAGYzZpmZ/wAzzAAzzAAzzAAzzAAzzAAzzAAz
-zAAzzAAzzAAzzAAzzAAzzP///////wAA////7u7uADPMADPMADPMADPMADPMADPMADPMADPM
-ADPMADPMMzPMZjMzmTMAZpn/mTMAmTMAZjMzmcz/ADPMADPMADPMADPMADPMADPMADPMADPM
-ADPMADPMADPMADPM////////AAD///////8AM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wA
-M8wzZsyZMwCZZgBmZv+ZMwCZMwCZMwDMzP8AM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wA
-M8wAM8wAM8z///////8AAP///////wAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzGaZ
-/5kzAJlmAGZmzJlmAJkzAJkzAMz//wAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAz
-zDMzzP///////wAA////////ADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMmZn/mTMA
-mTMAMzPMmWYAmTMAmTMA7u7uAADMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMMzPM
-////////AAD///////8AM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8yZzP+ZMwCZMwAz
-M8yZZjOZMwCZMwC7u7sAAMwAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wzM8z/////
-//8AAP///////wAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzMzM/5lmM5kzADMzZsyZ
-M5kzADMzmWZmzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzDMzzP///////wAA
-////////ADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMzMz/MzPMmTMAZjMzzJlmmTMA
-mTMAADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPM////////AAD/////
-//8AM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8yZMwCZMwCZmZmZMwCZMwCZ
-ZgAAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8z///////8AAP///////wAz
-zAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzDMzzJkzAJkzAJlmM5kzAJkzAJkzAMzM
-/wAAzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzP///////wAA////3d3dADPMADPM
-ADPMADPMADPMADPMADPMADPMADPMADPMADPMZmbMmTMAmTMAmTMAmTMAmTMAmTMAZmbMMzPM
-ADPMADPMADPMADPMADPMADPMADPMADPMADPMADPM////////AAD////MzP8AM8wAM8wAM8wA
-M8wAM8wAM8wAM8wAM8wAM8wAM8wAM8xmZsyZMwCZMwCZMwCZMwCZMwCZMwBmM2bMzP8AAMwA
-mf8AM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8z///////8AAP///8zM/wAzzAAzzAAzzAAzzAAz
-zAAzzAAzzAAzzAAzzAAzzAAzzGZmzJkzAJkzAJkzAJkzAJkzAJkzAJkzAP///wAAzACZzAAA
-zAAzzAAzzAAzzAAzzAAzzAAzzAAzzO7u7v///wAA////mZn/ADPMADPMADPMADPMADPMADPM
-ADPMADPMADPMADPMADPMMzPMmWYAmTMAmTMAmTMAmTMAmTMAmTMA////AADMADPMAGbMADPM
-ADPMADPMADPMADPMADPMADPMzMz/////AAD///+Zmf8AM8wAM8wAM8wAM8wAM8wAM8wAM8wA
-M8wAZswAAMwAM8wAAMzMmWaZMwCZMwCZMwBmM2YzM8zu7u7///8AAMwAAMwA//8AM8wAM8wA
-M8wAM8wAM8wAM8wAM8yZmf////8AAP///5mZzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzABm
-zAAzzAAzzAAzzJnM/5kzAJkzAJkzAJkzADMzzAAzzAAAzAAzzAAAzAD//wAAzAAzzACZzAAA
-zAAzzAAzzAAzzJmZzP///wAA////ZpnMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPM
-ADPMADPMADPMzJlmmTMAmTMAmTMAmTMAADPMADPMADPMADPMAP//ADPMADPMAMz/ADPMADPM
-ADPMADPMZmbM////AAD///9mZswAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAZswAM8wA
-M8wAM8xmmf+ZZjOZMwCZMwCZMwBmM2YAM8wAM8wAM8wAAMwAM8wAM8wAM8wAM8wAM8wAM8wA
-M8wzZsz///8AAP///2ZmzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAAzAD//wAAzAAzzAAz
-zAAAzMzM/5lmAJkzAJkzAJkzADMzmQAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzDMz
-zP///wAA////M2bMADPMADPMADPMADPMADPMADPMADPMAGbMADPMAMz/ADPMADPMADPMADPM
-AADM7u7uzJmZmTMAmTMAMzPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPM////
-AAD///8zM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAmf8AAMwAM8wAmcwAM8wAM8wAM8wAM8wA
-AMzMzP/////d3d0AAMwAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8z///8AAP//
-/zMzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzACZ/wAAzAAzzAD//wAAzAAzzAAzzAAzzAAzzAAz
-zAAAzAAAzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzP///wAA////MzPM
-ADPMADPMADPMADPMADPMADPMADPMAGbMAGbMADPMADPMAMz/AADMADPMADPMADPMADPMADPM
-ADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPM////AAD///8AM8wAM8wA
-M8wAM8wAM8wAM8wAM8wAM8wAAMwAzP8AAMwAM8wAmf8A//8AAMwAM8wAM8wAM8wAM8wAM8wA
-M8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8z///8AAP///wAzzAAzzAAzzAAz
-zAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAAzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAz
-zAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzP///wAA////ADPMADPMADPMADPMADPM
-ADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPM
-ADPMADPMADPMADPMADPMADPMADPMADPMADPMzMz/AAD///8AM8wAM8wAM8wAM8wAM8wAM8wA
-M8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wA
-M8wAM8wAM8wAM8wAM8wAM8wAM8wAM8yZzP8AAP///wAzzAAzzAAzzAAzzAAzzAAzzAAzzAAz
-zAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzDMzzJmZ/2aZzGZm
-zGZmzDMzzDMzzDMzzAAzzAAzzJmZzAAA////////////7u7uzMz/mcz/mZn/mZnMZpnMZmbM
-M2bMMzPMMzPMADPMADPMADPMADPMADPMADPMADPMADPMZpnM////////////////////////
-////////////////////////AAD/////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-//////////////////8AAA==
-ENDofIMG
-
-demo.show_image('gif', 'gif87a', <<'ENDofIMG')
-R0lGODdhQAAoAPcAAAAAADgoOHBgYJiIkIB4iJCAiIB4gGBIUGhggKiYmLCYoLiooHBocMCA
-eJBocLCYmMCooKiQkKCAgGBASIiAiGhYeLiQiIhoaJhwcJh4gMCYkMCgoMCoqKiQiEBAWEg4
-QMiwoMioqMComLCIiFhAWIBgaJhweHBgcLiQkIiAgDg4UIhwgHhgYJh4cMiooFBQcGBYeJiA
-iIBwgIh4iKCAiKB4eHhYYGhIWKiIiEhAWFBIYEhAaEhIaHBYcHBgeFBQeHBogHBQYHBQWGBA
-UFhQaGBYaFhYeKCIkLCQmHhYaGBIWLCYiFBAYEhAYFhQYFBIaFhYcKCIiKCQkKiIkLCIgHBQ
-aIhwcJiAeIBgcJBwcLCQiKiAeKB4gHhwgNCwqMiwqIBoeHBYaJh4eMCYmJBweGhYYNC4qEg4
-UEA4WGBQWEBAYFBQaHBoeFhQcGhgeGhYcMiwsJB4cGBIYNjIwEAwSMCgmHhocFBAWNDAuNDI
-uIBweGBYcHhoeDgwQGhgaKCIgNjQuKiAgNjIuKiIgKCAeKCQiEhIWFBIUGBQaNC4sGBQcGBY
-YMi4sGhYWFhIYFhIaFhQWHhoaLCQkDg4SHBgaJB4gJB4eLiYmLiomGhYaEhIYFhYaIh4gHho
-gGhgcIBoaGBIaHhgcNDAsFBAUGhQYLigoLioqJiIgGhQaFA4SFhIWHhweFBIWJiAgIh4eFhI
-UHBYYIhweEg4WLiYkDg4WGBQYEA4SEA4UMCwqIhocHhgaJB4iJCAgFhASEBAUEhAUIBocFhA
-UKCQmHhgeEgwSNjQwEg4SLCgmDgwUGhQWLCgoEAwUFBASLigmEAwQGhIUFg4SIhoeEgwQKiY
-kFA4UDgwSJiIiIBwcKiQmLCooLCYkDgoQP//////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-/////////////////////////////////ywAAAAAQAAoAAAI/gABCBxIsKDBggEEDBhAoICB
-AwcjSpxIMSKCBAoWIGDQoIGDBxAURJBAoKLJkwcnUKgQoYEFlxcwdOyYoYGGDRw6eEDJc+IH
-CSBCiHg5YiaJEjM7mjgBAkUKAip6Sh24YqYGmUkbYGDRwoWGlxocvIABI4aMGVN70qiRNSkL
-Gzda4BhhIoeOHTx6+PjxwwcCIGlPouiI4WUDFkFYCLlhYwiLBkU73iBShAgRAkaMHCGAIDBF
-JBpmXkiiZMiQCagzLEFRgi0GDUyaONHx5MkLKFFCSOns+eCUBlRKVIErxIYVG1ewsMiixYSW
-LVxQkIDRpDqRJF1gVPDyhQDg3gSB/mQAwyKMmBJjpoAhU6bKCjMgMGxZAuIMmjRq0KhpsmbN
-EjZtuHEEAgQ4Ad5ACLxRQhkZwBHHGHKMAcccdFxhBgpU1FGDHUzc0QESduDhxRx56DEHHnvs
-4R0ffRzYhREwYOHHH4BUEQgZYYlgoSBfjCHIBh0MAoEdAxBSiCGHIJLIHHCYwEEFQHRhx4Ew
-LLCHIm4sIggjc9RhgQhzgEAIIGSEAAIgjShhwhwN4MGEI4/sAIkjSEQiCRJYuAHEJL0RwMge
-ejzBBiV6VGKJFpcMskUcFyQygoiEbAABJn9kogkaa+RgwCZEMEEEBlNw4gMbiPQ2QyeefAKK
-GpT0cAIk/jjEgQIKggAiiAMgUAFZIkiEIkokozyigyakLFLBGzb8IcUDPXjSGxArlGJKKKcg
-sQAqdojAlQMaCDLGHIlk8EkqiFhQBxJL5BAGE0yo4gQaTBTAQAYc2NGDZ4UAYcoOhfBxwiql
-nFGGDQ3UwMIFGsyBAgs19MBKDg0IQUoroqCRgweO5OCKJjo4osEYBXjySmAE/JBCDHBMUUkT
-T6AxiktgvXTDDbDEUoEsF8ySQxl8LJEGLTugUUQtllBQyyqW8DFyWggY8UYoHPBxxh1O0PDA
-GA0g1ZEQQphQwhus2GJDEGh4cAstbjSBBhF7aEJEEzwYQUQnaQSWHQ+o4BIG/i5gPFIKHl8k
-ZYENGOSiixysqHHGLYbE4IQTt1TQhA6o8KDJGjy8YJkiJPOlCAw7OPKEB7LccYsQoUFWxwSq
-2EFJETo8ogoaThSRwy2y4KEGBaDwUIQfu1DiwyOBNc3DGrzI0cYdnNyRQx+vuCRIAyD0wokS
-aehgSw60+GIILbSoYMstpvwywxM88PAEETwQQTIMCOwBBjAdfMFIFBcEQ4IIDdTaAjAJgMQd
-UnGGJJTtdpMI3yRUAAEP4AUIT9DECRxhN2EoIAZ7IAUkAhECDgwDDLYgxgREgQk8FMNWcxAF
-BwjRhztEQRWtoIQdbHGGHOCBFmqAgRr2kIm6pWUC/p3wwRFAMYM/6IIUR0gAE+Rwh2DIwRgo
-wEMe5jAHQQhCFHFoBAAycYxXxMER27MBMtTACtkU4QyeUYACStGEO8QADA/wRAAEIoMsiOEK
-NxACCEAgiDwIAg+l+EQyAnCKDljAFLbghTHKp4Yi9IBznlEGBxLhiGUsgQOM+EQWAPABKkBC
-DBEIRC/iIApbCQICgxhCMERAiBZYwRLMmIAxFgAK7r3gCb1hAwXwYIUogKIMQSBEHprhDCVc
-4BNVnAMgABEm+hTgGYcoAzQWIAIsTOABaSBEFNIAiSfIAjwIYEQIZIGFMIAhDW/IAy6igYNE
-fEEUiWDEJcRgjBsEgRTM/pDDH5jRAUbgwhQJcIUkaAAEWvziQAjgQCnukIBW6KEWVsDDLFhA
-hQuEwAUjAMEsZnGBPwhBAtI4AAMaEYEOfAIAyjjGNOKgByLM8UADUAYnEmCJLwQBB3jAhRYG
-gTAN4CALWajDEWBxAV1MIBIMcIItjCEQSEShEqoYBTUOJBBbFACAqWjGBl5BhS+gQAs4mEYH
-COHPXmCBEBMYxjQC0IhbVEMglEgDKX5xBgpSVSAEqAAnTtGMB4CBEApAAS6yMIhmlMISlmjG
-IKxxjFnc4AgCsIMqXMEJXujhF7eABFPvKhAEsMENqliAFHpBCRvUAQKm4IAVxBCFBSijFA8Y
-2MQAjDENUrjCClaohB2KAAlWcJYgCLjGABKAjVYsIBsJuEQEmoGJbJjiuNpIQDY4UYAC8EEP
-kegEA9zwBk38tiAIMEB0swGBbGDjGM2QhDIeMItsONe9MrWGMKxhXU8Q4aDfLcgkCpCCCCRA
-G0hQQAKU4d4FGDgbyiBuBAZQAArIAAZ7yEF+IwIER8wAGxherwKOcQllTGMaSJBCBGLAi1Os
-gBJ2nbBEoFCAAUQhCtiIQASEIeMB0IAG1rAsH5ywDRWbJACdmEFDdlGAGMyAxF1gAwzuQNWA
-AAA7
-ENDofIMG
-
-demo.show_image('gif', 'gif89a', <<'ENDofIMG')
-R0lGODlhQAAoAPcAAMnJyTgoOHBgYJiIkIB4iJCAiIB4gGBIUGhggKiYmLCYoLiooHBocMCA
-eJBocLCYmMCooKiQkKCAgGBASIiAiGhYeLiQiIhoaJhwcJh4gMCYkMCgoMCoqKiQiEBAWEg4
-QMiwoMioqMComLCIiFhAWIBgaJhweHBgcLiQkIiAgDg4UIhwgHhgYJh4cMiooFBQcGBYeJiA
-iIBwgIh4iKCAiKB4eHhYYGhIWKiIiEhAWFBIYEhAaEhIaHBYcHBgeFBQeHBogHBQYHBQWGBA
-UFhQaGBYaFhYeKCIkLCQmHhYaGBIWLCYiFBAYEhAYFhQYFBIaFhYcKCIiKCQkKiIkLCIgHBQ
-aIhwcJiAeIBgcJBwcLCQiKiAeKB4gHhwgNCwqMiwqIBoeHBYaJh4eMCYmJBweGhYYNC4qEg4
-UEA4WGBQWEBAYFBQaHBoeFhQcGhgeGhYcMiwsJB4cGBIYNjIwEAwSMCgmHhocFBAWNDAuNDI
-uIBweGBYcHhoeDgwQGhgaKCIgNjQuKiAgNjIuKiIgKCAeKCQiEhIWFBIUGBQaNC4sGBQcGBY
-YMi4sGhYWFhIYFhIaFhQWHhoaLCQkDg4SHBgaJB4gJB4eLiYmLiomGhYaEhIYFhYaIh4gHho
-gGhgcIBoaGBIaHhgcNDAsFBAUGhQYLigoLioqJiIgGhQaFA4SFhIWHhweFBIWJiAgIh4eFhI
-UHBYYIhweEg4WLiYkDg4WGBQYEA4SEA4UMCwqIhocHhgaJB4iJCAgFhASEBAUEhAUIBocFhA
-UKCQmHhgeEgwSNjQwEg4SLCgmDgwUGhQWLCgoEAwUFBASLigmEAwQGhIUFg4SIhoeEgwQKiY
-kFA4UDgwSJiIiIBwcKiQmLCooLCYkDgoQP//////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-/////////////////////////////////yH5BAEAAAAALAAAAABAACgAAAj+AAEIHEiwoMGC
-AQQMGECggIEDByNKnEgxIoIEChYgYNCggYMHEBREkECgosmTBydQqBChgQWXFzB07JihgYYN
-HDp4QMlz4gcJIEKIeDliJokSMzuaOAECRQoCKnpKHbhipgaZSRtgYNHChYaXGhy8gAEjhowZ
-U3vSqJE1KQsbN1rgGGEih44dPHr4+PHDBwIgaU+i6IjhZQMWQVgIuWFjCIsGRTveIFKECBEC
-RowcIYAgMEUkGmZeSKJkyJAJqDMsQVGCLQYNTJo40fHkyQsoUUJI6ez54JQGVEpUgSvEhhUb
-V7CwyKLFhJYtXFCQgNGkOpEkXWBU8PKFAODeBIH+ZADDIoyYEmOmgCFTpsoKMyAwbFkC4gya
-NGrQqGmyZs0SNm24cQQCBDgB3kAIvFFCGRnAEccYcowBxxx0XGEGClTUUYMdTNzRARJ24OHF
-HHnoMQcee+zhHR99HNiFETBg4ccfgFQRCBlhiWChIF+MIcgGHQwCgR0DEFKIIYcgksgccJjA
-QQVAdGHHgTAssIcibiwiCCNz1GGBCHOAQAggZIQAAiCNKGHCHA3gwYQjj+wAiSNIRCIJEli4
-AcQkvRHAyB56PMEGJXpUYokWlwyyRRwXJDKCiIRsAAEmf2SiCRpr5GDAJkQwQQQGU3DiAxuI
-9DZDJ558AooalPRwAiT+OMSBAgqCACKIAyBQAVkiSIQiSiSjPKKDJqQsUsEbNvwhxQM9eNIb
-ECuUYkoopyCxACp2iMCVAxoIMsYciWTwSSqIWFAHEkvkEAYTTKjiBBpMFMBABhzY0YNnhQBh
-yg6F8HHCKqWcUYYNDdTAwgUazIECCzX0wEoODQhBSiuioJGDB47k4IomOjiiwRgFePJKYAT8
-kEIMcExRSRNPoDGKS2C9dMMNsMRSgSwXzJJDGXwskQYtO6BRRC2WUFDLKpbwMXJaCBjxRigc
-8HHGHU7Q8MAYDSDVkRBCmFDCG6zYYkMQaHhwCy1uNIEGEXtoQkQTPBhBRCdpBJYdD6jgEgb+
-LmA8UgoeXyRlgQ0Y5KKLHKyoccYthsTghBO3VNCEDqjwoMkaPLxgmSIk86UIDDs48oQHstxx
-ixChQVbHBKrYQUkROjyiChpOFJHDLbLgoQYFoPBQhB+7UOLDI4E1zcMavMjRxh2c3JFDH6+4
-JEgDIPTCiRJp6GBLDrT4YggttKhgyy2m/DLDEzzw8AQRPBBBMgwI7AEGMB18wUgUFwRDgggN
-1NoCMAmAxB1ScYYklO12kwjfJFQAAQ/gBQhP0MQJHGE3YSggBnsgBSQCEQIODAMMtiDGBESB
-CTwUw1ZzEAUHCNGHO0RBFa2ghB1scYYc4IEWaoCBGvaQibqlZQL+nfDBEUAxgz/oghRHSAAT
-5HCHYMjBGCjAQx7mMAdBCEIUcWgEADJxjFfEwRHbswEy1MAK2RThDJ5RgAJK0YQ7xAAMD/BE
-AAQigyyI4Qo3EAIIQCCIPAgCD6X4RDICcIoOWMAUtuCFMcqnhiL0gHOeUQYHEuGIZSyBA4z4
-RBYA8AEqQEIMEQhEL+IgClsJAgKDGEIwRECIFljBEsyYgDEWAAruveAJvWEDBfBghSiAogxB
-IEQemuEMJVzgE1WcAyAAESb6FOAZhygDNBYgAixM4AFpIEQU0gCJJ8gCPAhgRAhkgYUwgCEN
-b8gDLqKBg0R8QRSJYMQlxGCMGwSBFMz+kMMfmNEBRuDCFAlwhSRoAARa/OJACOBAKe6QgFbo
-oRZWwMMsWECFC4TABSMAwSxmcYE/CEEC0jgAAxoRgQ58AgDKOMY04qAHIszxQANQBicSYIkv
-BAEHeMCFFgaBMA3gIAtZqMMRYHEBXUwgEgxwgi2MIRBIRKESqhgFNQ4kEFsUAICpaMYGXkGF
-L6BACziYRgcI4c9eYIEQExjGNALQiFtUQyCUSAMpfnEGClJVIASoACdO0YwHgIEQCkABLrIw
-iGaUwhKWaMYgrHGMWdzgCAKwgypcwQle6OEXt4AEU+8qEASwwQ2qWIAUekEJG9QBAqbggBXE
-EIUFKKMUDxjYxACMMQ1SuMIKVqiEHYoACVZwliAIuMYAEoCNViwgGwm4RASagYlsmOK42khA
-NjhRgALwQQ+R6AQD3PAGTfy2IAgwQHSzAYFsYOMYzZCEMh4wi2w4170ytYYwrGFdTxDhoN8t
-yCQKkIIIJEAbSFBAApTh3gUYOBvKIG4EBlAACsgABnvIQX4jAgRHzAAbGF6vAo5xCWVMYxpI
-kEIEYsCLU6yAEnadsESgUIABRCEK2IhABIQh4wHQgAbWsCwfnLANFZskAJ2YQUN2UYAYzIDE
-XWADDO5A1YAAADs=
-ENDofIMG
-
-teapot = <<'ENDofIMG'
-",
-".. c #998074",
-"#. c #84aadc",
-"a. c #c47e55",
-"b. c #4c6ea0",
-"c. c #d48a64",
-"d. c #ecccbc",
-"e. c #8c6252",
-"f. c #b1a094",
-"g. c #714628",
-"h. c #af8a76",
-"i. c #2c5284",
-"j. c #98745f",
-"k. c #8f5124",
-"l. c #844614",
-"m. c #5074a6",
-"n. c #aeb2b9",
-"o. c #3e291c",
-"p. c #44689b",
-"q. c #4c2705",
-"r. c #1b2b43",
-"s. c #e1c8bb",
-"t. c #dd782d",
-"u. c #9c5824",
-"v. c #547aac",
-"w. c #906e5a",
-"x. c #545253",
-"y. c #e07e33",
-"z. c #bcaeac",
-"A. c #aeb6bc",
-"B. c #6f737b",
-"C. c #7e5942",
-"D. c #b55e1a",
-"E. c #7c5134",
-"F. c #8c7a70",
-"G. c #62524d",
-"H. c #bc8a6c",
-"I. c #936754",
-"J. c #6e6d75",
-"K. c #8cb0e2",
-"L. c #d4beb4",
-"M. c #2a201a",
-"N. c #c48664",
-"O. c #412105",
-"P. c #a95a19",
-"Q. c #747a7c",
-"R. c #2a2e33",
-"S. c #484c53",
-"T. c #8690a1",
-"U. c #6c524c",
-"V. c #505967",
-"W. c #040204",
-"X. c #8cb6e4",
-"Y. c #8f4912",
-"Z. c #846e5c",
-"0. c #244a7c",
-"1. c #dcc2b6",
-"2. c #33261b",
-"3. c #81736c",
-"4. c #3c3b46",
-"5. c #735f53",
-"6. c #545e69",
-"7. c #bc7c58",
-"8. c #4c2f1d",
-"9. c #a4806b",
-".# c #604c4c",
-"## c #d4916b",
-"a# c #5c80b2",
-"b# c #e3d3cd",
-"c# c #c8ad9a",
-"d# c #bf6c2e",
-"e# c #08121c",
-"f# c #9c5e34",
-"g# c #9298a1",
-"h# c #8b7f7c",
-"i# c #835f44",
-"j# c #a46e54",
-"k# c #474649",
-"l# c #a65d26",
-"m# c #be6420",
-"n# c #7c9ed2",
-"o# c #ac622c",
-"p# c #726e6c",
-"q# c #e1a684",
-"r# c #a48676",
-"s# c #54464c",
-"t# c #a0a4ac",
-"u# c #b37b5a",
-"v# c #947a70",
-"w# c #543d31",
-"x# c #743e12",
-"y# c #98bcee",
-"z# c #d49e7c",
-"A# c #64320c",
-"B# c #d4cac6",
-"C# c #2c3642",
-"D# c #6e686b",
-"E# c #5c463e",
-"F# c #7f7575",
-"G# c #bcb2b0",
-"H# c #979dac",
-"I# c #a47a61",
-"J# c #8c9094",
-"K# c #1c262c",
-"L# c #d3c3bc",
-"M# c #9cc2f4",
-"N# c #af7455",
-"O# c #fcad5f",
-"P# c #6486b8",
-"Q# c #d4742d",
-"R# c #6d4e3d",
-"S# c #242224",
-"T# c #3b444c",
-"U# c #181515",
-"V# c #6e4024",
-"W# c #749bcc",
-"X# c #afabac",
-"Y# c #7e6a64",
-"Z# c #343634",
-"0# c #e8ac8a",
-"1# c #343a44",
-"2# c #b18f7a",
-"3# c #dda07f",
-"4# c #6f380d",
-"5# c #2f5684",
-"6# c #a08d86",
-"7# c #5f6068",
-"8# c #625751",
-"9# c #16253b",
-".a c #94b6e9",
-"#a c #dfcec8",
-"aa c #3c6194",
-"ba c #ecdad3",
-"ca c #948a89",
-"da c #a4c8fa",
-"ea c #bcb6b8",
-"fa c #604432",
-"ga c #cc6d29",
-"ha c #949ea4",
-"ia c #413024",
-"ja c #a48a7a",
-"ka c #9a867d",
-"la c #1c1a1c",
-"ma c #342116",
-"na c #bc8364",
-"oa c #9c8674",
-"pa c #844e25",
-"qa c #3c4a5c",
-"ra c #582c0d",
-"sa c #c7835a",
-"ta c #613c24",
-"ua c #614b41",
-"va c #adaeb5",
-"wa c #805c4c",
-"xa c #0a0b0f",
-"ya c #c4b2ac",
-"za c #648abc",
-"Aa c #af846a",
-"Ba c #c68a69",
-"Ca c #483c39",
-"Da c #7f400d",
-"Ea c #646e74",
-"Fa c #a85515",
-"Ga c #042244",
-"Ha c #816759",
-"Ia c #95817c",
-"Ja c #9c9aa1",
-"Ka c #9c6b54",
-"La c #7e4924",
-"Ma c #0c1a2c",
-"Na c #5f595f",
-"Oa c #6f615e",
-"Pa c #474149",
-"Qa c #8c9aac",
-"Ra c #cbbeb8",
-"Sa c #806e68",
-"Ta c #82624e",
-"Ua c #949294",
-"Va c #b4652c",
-"Wa c #9c9ea4",
-"Xa c #72574c",
-"Ya c #2a303e",
-"Za c #bc9175",
-"0a c #9c7a64",
-"1a c #261a13",
-"2a c #aca6ac",
-"3a c #341a04",
-"4a c #593520",
-"5a c #d49878",
-"6a c #26282c",
-"7a c #475261",
-"8a c #3f3535",
-"9a c #63676f",
-".b c #a47255",
-"#b c #bc967c",
-"ab c #52433a",
-"bb c #80a4d6",
-"cb c #544c4c",
-"db c #bc723c",
-"eb c #645e54",
-"fb c #a4abb4",
-"gb c #c89070",
-"hb c #8c7469",
-"ib c #c7b8b3",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                            wawae.e.wa                                                          ",
-"                                                          .#j#N#7.a.db.#                                                        ",
-"                                                            8.g.x#C.o.                                                          ",
-"                                                  N#DaA#raY.Xa4aV#4aPas#q.W.W.6a                                                ",
-"                                            i#O.l.4.4.4.4.4.s#wa7.N#wawaXawawawaA#q.C.                                          ",
-"                                        3a3a4#wawawae.e.e.I.j#m#d#VaN#KaI.e.e.e.e.waDaO..#j#j#N#N#j#fa                          ",
-"                                        O.A#wae.e.I.e.I.I.Kal#m#m#D.u.KaKaKaKaI.e.I.e.Da3aXaE#C#W.o.C.                          ",
-"                                      w#e.k.I.I.Kaf#KaKaKaKal#m#m#D.l#j#Kaj#KaKaKaKaKaFai#u.    GaDaI.                          ",
-"                                      .#waKaI.KaKaj#j#j#j#j#VaD.m#FaVaj#j#j#j#j#j#j#KaKae.U.    9#o.Ka                          ",
-"                                      .#Xae.Kaj#j#N#N#N#N#N#j#N#j#N#N#N#N#N#dbdbN#N#N#I.waU.  e#M.taPa                          ",
-"                                    .#U.Xawae.Kaj#N#7.dbj#a.a.a.a.a.a.a.j#7.sa##naj#I.e.waXaU.Yama.#                            ",
-"                                    .#U.Xawae.I.Ka.bna3#0#3###sasaa.sac.##Ba7.u#N#Kaf#f#waXaU.4.s#Pa                            ",
-"      j#N#5aW.Y.u#j#R#            8a.#XaXae.e.I.KaN#naz#0#q#gb7.7.N#N#N#u#nau#N#N#Kaf#f#e.waU.LaU.                              ",
-"        4.Hahb.bI.j#KaY.          s#U.XaXawae.KaKaN#na3#0#3#gbna7.N#u#u#N#7.u#N#.bj#KaI.e.waXa.#                                ",
-"              G.2#e.KaI.E#        .#U.Xawae.P.Kaj#N#H.z#q#3#gb7.7.7.7.N#N#u#u#N#.bj#KaI.e.TaXaU.0.                              ",
-"                Ca.#e.j#Va  5#aa0.MaU.Xawak.d#I.j#I#N.5a3#5aBa7.dbN#N#dbN#N#u#I#j#KaKaI.e.waXaU.0.i.p.                          ",
-"                  abU.I.KapaaaaaxaGaU.C.wau.VaKaj#I#na5a5agbN.u#N#7.N#N#N#N#N#.bj#KaKaI.e.waXa.#R#m.m.m.p.                      ",
-"            zaW#0.0.s#waKam#0.0.e#GaU.C.k.l#I.KaKa.bnagbgbBa7.u#7.N#N#N#N#N#.bj#j#KaKaI.e.waXa.#.#b.m.m.i.i.0.                  ",
-"    5#aaW#W#n#aaaa0.U..#e.Kau.ta4aLak.k.u.o#e.KaKa.bu#H.H.nau#N#N#N#N#N#N#j#N#j#KaKaI.I.e.waXa.#fab.m.i.i.i.i.i.0.              ",
-"p.p.p.aan#W#0.0.0.0.p.uaU.KaKal#o#d#gal#o#o#e.I.Kaj#N#Aau#u#N#N#N#.bN#N#j#.bj#j#KaKaI.I.e.waXa.#E#m.m.v.m.i.i.m.n#bbn#          ",
-"p.p.n#n#n#p.0.0.0.0.0.xa.#waKaKagaQ#t.y.d#dbi#e.I.Ka.bN#I#N#N#N#N#.bN#N#j#N#j#KaKaI.f#e.waXaU.U.w#5#m.m.i.i.i.m.bbbbbbbbaa      ",
-"n#n#n#n#n#n#0.aaaap.aaaas#s#waKaj#na##O#dbl#wae.I.I.j.j#j#j#j#j#j#j#.bj#j#j#KaKaKaI.e.e.waXaE.Hai.m.m.i.i.i.i.p.p.bbb.b.p.p.aa  ",
-"p.bbn#bbp.p.p.p.p.p.aaaaaaua..#be.Kaj#j#u.XawaTae.I.KaKaKaKaj#j#j#j#j#KaKaKaKaKaI.I.i#waXawaR#uav.m.m.v.v.i.b.bbbbbbbbp.p.b.p.p.",
-"bbp.p.p.p.p.p.n#p.0.0.0.0.p.8#Oa2#ZaZaZak.XaXawae.e.e.I.KaKaKaj#KaKaKaKaI.w.I.I.I.e.waXa0aXa5.5#i.m.m.v.v.p.p.#.#.#.#.#.#.b.bb#.",
-"bbW#p.p.p.n#bbbbp.0.0.0.0.0.0.0.x.D#3.3.w.waU.wawae.e.e.e.f#I.I.I.I.I.I.I.f#e.e.wawaXae.w.ua4.5#5#i.7ai.b.b.b.p.b.#.#.#.p.b.b.#.",
-"p.bbp.bbbbp.p.p.p.0.0.6.p.p.p.0.0.0.0.9#R#wae.9.j.wawae.Tae.e.e.e.I.e.Tai#e.wawaw.Aaw.hbOa6aC#5#m.v.v.#.p.p.b.b.p.#.#.b.b.p.p.b.",
-"0.0.0.p.p.p.p.aa0.0.p.p.p.p.p.p.0.0.p.qaT#s#Z.0a..h.I#I#ZaZaI#gbI#.bH..b.bH.h.j.r#HaU.PaV.V.Na1#v.m.K.K.K.#.b.#.#.#.#.K.p.b.m.p.",
-"0.0.0.0.p.0.0.0.0.0.0.p.p.p.p.0.0.p.p.qaqaqa2.iaR#HaY#ja2#2#I#Za2#0a2#2#h.jaoaF.8#V.6aC#C#C#CaNab.bbbbK.#.b.b.b.#.K.K.#.#.#.X.#.",
-"b.b.p.p.p.0.i.0.0.0.0.p.0.0.0.i.0.0.qaqak#6aR.6a3aiawaY#OaOaOaD#Iah#D#OaF#cbPa6a6aW.V.6.1#C#7ap#b.b.b.b.b.b.b.b.b.K.K.#.b.b.b.b.",
-"bb#.#.#.#.b.b.i.0.p.p.p.0.b.b.0.0.0.qar.YaYaYaR.K#Z#E.xa1a2.S#.#x.x.S.R.laU#1#W.W.9a6.J#J#T.7av#K.K.K.K.b.b.m.m.b.m.K.b.p.m.b.b.",
-"#.#.#.#.#.#.K.#.#.#.#.#.#.b.b.b.#.p.qaqaYaR.YaR.Pa6ak#S#lalaW.W.xaW.W.W.W.U#U#ebT.hag#g#haT.7ac#K.K.K.K.K.K.b.b.#.K.K.K.K.m.b.b.",
-"#.#.#.b.b.b.b.#.#.bb#.#.#.b.K.bbK.#.T.T.J#R.YaS.S.x.ebebR.2.S#S#S#T#S#S#S.9a7aEaEafbhag#6.7aV.m.K.K.K.K.X.K.m.X.K.K..a.aX.K.b.m.",
-"b.b.p.b.p.b.p.K.K.K.b.b.b.b.#.#.#.#.T.T.J#UaJ#J#g#g#haWaWa7#9a2at#fbA.t#9a6.9aJ.EaEafbV.6.V.Nam.b.m..a.am.b.m.m.m.K.X.K..a.a.am.",
-"  p.b.p.p.b.p.K.b.b.p.b.b.b.b.K.#.K.7a7aV.9aWat#X#WahaH#ha6.t#n.n.n.n.fbfb9a9an.t#t#fbfb7aV.7#m.m.m..am.m.m.m.m.m.m..a.a.am.m.m.",
-"  b.p.b.#.#.#.#.#.b.b.b.b.b.b.K.Pax.V.7aNa7#7#t#vafbB.B.B.B.B.n.A.A.A.fbfb9aA.t#t#fbfbQaH#7#D#m.X..a.a.aX.v.v.v.v.m.m..am.v.m.m.",
-"    #.K.K.K.K.K.#.b.b.b.b.K.K.K.T.S.V.9aB.ebNaV.p#9a9aB.D#9a9aB.A.A.A.9aB.B.Eafbn.t#g#hat#X#m..ay#y#y#y#.ay#v.v.v..aX.y#.av.v.v.",
-"    #.K.K.#.K.K.K.K.K.K.K.K.K.QaT.V.7#Ea9af.f.2at#OaD#F#Q.J.9aEaB.Ea9a6.Ea9aEaV.H#H#t#2aD#J.v.m.y#y#y#y#X..ay#y#y#y#y#y#.ay#.av.",
-"      K.K.K.K.b.b.b.b.K.K.K.K.g#g#t#D#fbWag#c#X#2a2aeb7#D#Q.vaA.2at#p#9a6.V.7#7#9avaSaSaSav.m.v.v.y#.ay#X.v.v.v.v.y#y#y#y#y#y#y#",
-"      K.K.b.m.b.b.b.b.K.K.K.K.Ja7#7#6.2az.#ac#z.G#eaG#p#2a2a2at#t#t#t#7#9aD#J.SaL#RaRaF#v.v.v.v.v.v.y#m.v.v.a#a#v.v.M#M#M#y#y#  ",
-"        b.b.m.b.m.b.b.b.K.X.7#7#7#7#D#3.1.z.yac#yaibh#caB#L#eaz.z.z.z.z.F#h##ab##aL#ibibv.a#m.m.v.y#M#y#a#v.v.v.a#a#a#a#M#      ",
-"        p.b.m.b.b.m.b.b.m.b.7#9a9aSahb..m..ayayahbhbF.h#Ias.RaRaibibL.L#kab#bab#1.L.L.y#y#a#v.v.M#y#y#M#y#v.a#a#a#v.a#a#        ",
-"          b.m.b.b.X.K..aK.b.7#D#F#hbv#m.b.m.m.F.F.F.v#v#F.v#L.L.L.L#..ka6#h.s.1.L#1.y#M#y#daM#M#day#y#M#M#M#a#a#a#a#            ",
-"          p.b.X.X.X.X.X.X.X.9aD#6#..m..aX.y#m.m.F.v#v#v#....1.Ia....kakar#r#r#1.s.M#M#y#a#a#a#M#M#y#y#daM#dadada                ",
-"            .a.aX..aX..aX..aD#SaF..ay#y#.aX..am.m.........s.s.9.9.r#r#r#r#kakar#M#M#a#a#a#a#a#a#M#M#M#M#dadada                  ",
-"            K.X..a.a.a.a.aH#vab#1.y#X.X.y#y#y#y#v.v...s.d.d.d.s.r#r#h.jajajar#a#M#v.a#a#a#a#a#a#P#dadadaM#                      "};
-ENDofIMG
-
-demo.show_image('xpm', 'color', "/* XPM */
-static char * teapot[] = {
-\"64 48 204 2\",
-\"   c #145ec4#{teapot}")
-
-demo.show_image('xpm', 'transparent', "/* XPM */
-static char * teapot[] = {
-\"64 48 204 2\",
-\"   s None c None#{teapot}")
-
-demo.show_image('xbm', 'bitmap', <<'ENDofIMG')
-#define flagup_width 48
-#define flagup_height 48
-static char flagup_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x7f, 0x00,
-   0x00, 0x00, 0x00, 0xe0, 0x7f, 0x00, 0x00, 0x00, 0x00, 0xef, 0x6a, 0x00,
-   0x00, 0x00, 0xc0, 0x7b, 0x75, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0x6a, 0x00,
-   0x00, 0x00, 0x30, 0x60, 0x75, 0x00, 0x00, 0x00, 0x18, 0xe0, 0x7f, 0x00,
-   0x00, 0x00, 0x0c, 0xe0, 0x7f, 0x00, 0x00, 0x00, 0x06, 0xe0, 0x04, 0x00,
-   0x00, 0x00, 0x03, 0xe0, 0x04, 0x00, 0x00, 0x80, 0x01, 0xe0, 0x06, 0x00,
-   0x00, 0xc0, 0x1f, 0xe0, 0x07, 0x00, 0x00, 0xe0, 0x7f, 0xe0, 0x07, 0x00,
-   0x00, 0x70, 0xe0, 0xe0, 0x05, 0x00, 0x00, 0x38, 0x80, 0xe1, 0x04, 0x00,
-   0x00, 0x18, 0x80, 0xf1, 0x04, 0x00, 0x00, 0x0c, 0x00, 0xfb, 0x04, 0x00,
-   0x00, 0x0c, 0x00, 0xff, 0x04, 0x00, 0x00, 0x86, 0x1f, 0xee, 0x04, 0x00,
-   0x00, 0x06, 0x06, 0xe6, 0x04, 0x00, 0x00, 0x06, 0x00, 0xe6, 0x04, 0x00,
-   0x00, 0x06, 0x00, 0xe6, 0x04, 0x00, 0x00, 0x06, 0x00, 0x66, 0x04, 0x00,
-   0x7f, 0x56, 0x52, 0x06, 0xe4, 0xff, 0x00, 0x76, 0x55, 0x06, 0x04, 0x00,
-   0x00, 0x56, 0x57, 0x06, 0x04, 0x00, 0x00, 0x56, 0x55, 0x06, 0x06, 0x00,
-   0x00, 0x56, 0xd5, 0x06, 0x03, 0x00, 0x00, 0x06, 0x00, 0x86, 0x01, 0x00,
-   0x54, 0x06, 0x00, 0xc6, 0x54, 0x55, 0xaa, 0x06, 0x00, 0x66, 0xaa, 0x2a,
-   0x54, 0x06, 0x00, 0x36, 0x55, 0x55, 0xaa, 0x06, 0x00, 0xbe, 0xaa, 0x2a,
-   0x54, 0xfe, 0xff, 0x6f, 0x55, 0x55, 0xaa, 0xfc, 0xff, 0xa7, 0xaa, 0x2a,
-   0x54, 0x01, 0x88, 0x60, 0x55, 0x55, 0xaa, 0xaa, 0x8a, 0xa0, 0xaa, 0x2a,
-   0x54, 0x55, 0x8d, 0x60, 0x55, 0x55, 0xaa, 0xaa, 0x8a, 0xa0, 0xaa, 0x2a,
-   0x54, 0x55, 0x8d, 0x60, 0x55, 0x55, 0xaa, 0xaa, 0x8a, 0xa0, 0xaa, 0x2a,
-   0x54, 0x55, 0x8d, 0x50, 0x55, 0x55, 0xaa, 0xaa, 0x8a, 0xa8, 0xaa, 0x2a,
-   0x54, 0x55, 0x95, 0x54, 0x55, 0x55, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x2a,
-   0x54, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-ENDofIMG
-
-demo.show_image('png', 'color', <<'ENDofIMG')
-iVBORw0KGgoAAAANSUhEUgAAAC4AAAAjCAIAAAETQp8oAAAIVklEQVR4nNVXPYgbSRb+xm7B
-K5CgC07QtaCDOvBCDeyAFAxIwQYdbKCBDeTgQBMqtOGCcTYOvXDBODjwHBzsBHcwExzMBAtW
-4GN7YQ1ScKAOBNPBLFcLHugGC7pgBf0WeuGC1vz6h7XZ4O5DIJp69dX3qr969Rp4A3erv69H
-YQn8aasDxh0Aw66JTtPU5ZIIhLsAvIZXw9rLJItfvd74vVzNepPx3Rh2DQAPwPFO3zqenaaO
-GcAdAAdRkuf50TQxyv8Q0gqh0ZWYNQDD0GRpHrbVJHFRYvtGE9H9nr7/dAwg8OkugLldmFaz
-1fDLtXKj1eytt76fv9JKKkkmaE5/yFbMD0IzDA2A3UEbQFsHH6bs7rsGvt0dnC9yu1heRTwZ
-dKPkHMDhTj9OXp0tXpelCBp0F8DXo/DLjp5ni+3uxou5fXT/c5Tl/HwxPcvO3dIDkOXFxGYA
-0tz+5/neNJooRSqVqi1DE3iXqyhJp2n+1dODooBjVpKKAm2t7gAIpCACgHUlD6IkXFfj2HaN
-YnBs3Ur2oK0BHO/030zqDgBmVpIAVPv924AI7cDvt3X16L0/usKzUcjAo4MIwKjftjb1SRAR
-g6/UVjje6T8bhXvDlZ/3Rt3Di/QOJ6fa9wEMu6arJJFwXGSOT6b2NsvEppPTNMnSZ6Owa4I0
-5Ulsn+8OAIABIh34WvuCKIotAN/Hg377293BDRZFBCDNmQABxNbN0vwwig93BrHNJnHS1TLL
-nE/U7xqfJBhp6m5rAdDTSkkaz6xWUitSvhCCRk9Pjnf6StHR1BYFGGwUSYLRgZKUZO4Gi1Ey
-shYAEQE4iJJwPSgKMLD1dEwQAI6myf2n469O4rZWSorxzD48iFAdxcsXEZ1aJfyJtbF1/bYO
-TaCV/ACD+PRrI//3MOzeOC+/yrvX4RM96Lcz50ah8Wm1EXfePwdAaIKvR/1RaKrHve0wSTMA
-RYHMrU7A26vTs2HY39Tj2AJAWdYEDqOkBPaGYbJ4XTKWS14syyRdnF33S1v7Twbdb3cHO/02
-gJP4FMVFCpKIiIFh15Agm7rM5Qykeb5a5pJlFJrT1B1ESdjWD/pmkmRK0ZNRtxpNUzfsmszl
-He0nNo2SbBzbyrWhCa4yapuWcywEqFZblmXLl2se/JpQ0h/HPypJZ855pbeh1d++m5vA37yn
-7in55+3eX17EZXmhRQkBIM/ZprkkAlAwj2d2Z9ADUDBCo9e1ZObK0NUsAno6uMpIXnhX+jSz
-WeZYK+kTJok9ffZA+qKtVV5wASYSBBARAbHNK8YVi80LBjsUbSUlyCcIwDEe7o/jxFa+cK5w
-edEzgZJUERWMauiCJXMdHez2e0+jxLq8ykJJGvXbjw8nWx2tCFGSHU+tUTItWCuSAiDW/jUt
-xxNLwMOjKCDSSkpJWVEUBZjZOpfmeWWvqc2Ysd0zVU49rR4eRVcsjpkgKmICigJ7J7GSlOYM
-4NHR1KZ5Fbm9P54kqSTR0XLromhcnSMGtCQGADqaxv22BiG68FXljgpPx/Etr1+dI1+AiHyi
-/SgGsN0zkogvRg+iBL8Gxzv9qlP4eFye8f8/mOBG87b2rrjfHMc7/cTlKKClJEJi87ZRW1+d
-XAZ8cNV9P9o6eDzojGN73RfPdwdpxvvjWeBLZrbSFQU62mfm63N/GymBTx2tQqOVpP1xEiUr
-u/fbOuxom7loZisjEVFeMDPGcWayj5XSb+vtnk7zQiv55GSyagcBAFW7l2SpL3Wlwye639OD
-rnHMB9GMIHySjlcbQQQi2NT5hIub6EJKtbG54ywviJAzJ9Z1dNA1KrZpynwysePYjmM7Co0v
-5eNBL0rS/atzTbkrtPI7WgEYdo0QSHN2jnPmwgFUZAygmNjs5mu5wg3b+oRHg24BuEoqMwP9
-ts6ZT2ZWCwJB+X7qeNDWmXM508ODVYnqmkAAu6P7+4djx4VPomeCtlbMvPVG79PVwVZXE4TR
-FCf545Mpbl3QXKL/WWtdSbtY4sJULSkWeWE+qb9IUikEL1n9rv7P6Q+b91SNsB1+/v08WXLZ
-8LyG8DbX1XfJebEsG1RrNuvlz7UFMzNMS36mpJLStOQ9JQXVXi+WX2xq55YP//GyWv12r/Dl
-5qcN8uz5AkAJnKZ506/XBVyBl/GP1bfd5sYn38/Ts9R58DqfNj/f3PhjGB6+mJIg5zhc18uC
-Pc9rCmop0fLrLxNb92oM1D14WP0AqIZYlgBwdqtBvY604CRnm7MAfCGUL2c26xrdM0oH0qVF
-1fjHNus9OuA8VUgPdwZEAFj7xMwMntnMpnnmOPBldR0QkZQkJVXI8sIE/uVX6u1dMcpvNRtl
-WTYEbbb8L3t/yF6X4/mZzYqax3WvweBwo5XY5e/qxMuyLPngu6Srm8uyXFcytouWlH+fzL1f
-vB/yZVPWWlK2pHDlUklyy7LRIM/zxFq5VoNjbjUbZVl7MbdvkcI/8eanzWWJhVvOX7lv/n02
-P89Vs9HAWp0aUlKNUfcECSzc8l7L9+u1+bn7JrZfbLSIoJpkAvnXf83P3dItueF5Rknlk1cT
-S8bPv/BPZck/lbJBql43SjouyxKVlLcU/mejkFEcRtYEghlEJASKAlIgL+CYcy62jE7ZEcgx
-XxZWE/ijsFP1G9cJCXgy7PpCAOACKedaSkEAsL1/Ffm2ElfAKGkCJyWBwcWqDhDRUbQqJI/6
-nTRxDEQzezkvydzjk2hvO7xeuAAw8Oho+paFbuItUqQkgACkqVOSSICIolliL+hHoUkd5znW
-FVl3o2Ax4+FB5BMB7yhkHyQFgGPurfs2ZRCc42tVFcPQnNr8/V2Qe1dBfS9ue2Vv2CUhiGia
-2Oczm7mPIf04/BfyDD1tMD0WfgAAAABJRU5ErkJggg==
-ENDofIMG
-
-demo.show_image('png', 'grayscale', <<'ENDofIMG')
-iVBORw0KGgoAAAANSUhEUgAAAC4AAAAjCAAAAAG5S1ejAAAEJElEQVR4nKWTXUwcZRiFH2YG
-ZpiBLsx2wW6ZpU1YC+3axWClf7ZKY5NVozHRxIYaL0xq1YuGeOFVRW40TXthk4aLxsT/xJjG
-+tdiGkUl1nQV6rYokuy2IFugy8/irp3dHXYGvFiwBdQ08Vx9+d73Oznfe84LAIjQNv+ELdBy
-aVqTRBSh/8p6aGMZWpDomBwwETg7020sL0NjG0XsTTT9GmlSdreji1xZ555bvzmyVvcNAI/s
-pRX/8lfi4uHoREIEnrnEKwNjcxUibdt+39PX6gwNTEkkB0l+3VPtdgclQI8fs0zd8gvoMkZX
-MBywY3B0Ox0FKoGcTvtKhQuQa5tBuvXmkHOCx4Y1xS7o6Qg29vFi6DvMe79paRjP5sIgAL/1
-jxwKJC4ewS72+kp7WfX4UQRgFUlBjA1/2R7t25DQdpbZiQJPU5V1xVMuqW+9ykc+X37WKJLC
-AmD8gkJX0HIOS3S3f+B3h48jAVNI0Viztbub4wCdC+rUf/3J7eEBOgr6l0Dbr4TUpffBl0Jw
-cARr5qYvL2wPM1d8bv65a3kzPTKKBHU7AuFT53eAS3FaSsdyynQcRGiNxXaVff9wfa+Of/rB
-T66OpgkmRNiYkkssj6CuDusJ6s4YDTUHTjsCuEiNauQu7MNqXJ8LekGoRwAVXNGkV+1/33Wn
-mVdERYx5EWDCttbJqpQ5NqCRSgV0UbE0BBjzP/XpBDn90Te3ll3q8aXXqGIVAvSInau8rrSV
-m5iaY9DaU6TUdyKAKVUhWh/qSU6Owmv9mv9wIQ+OxynqbpZ6IQ6cAgrzURXtc/ZoDnQtGWFH
-6z/OW/t/dhkARbfR2DGer5avbnyZZWleCv/+C13AkYmP3bkxqy73X+y6v9F9NgLNW8Sf7DJs
-yzI+X8ne3DK99r0YoDNSEUHbdb95RiozLWR5TM2ABP79fyRlc8gfiKZ7wuFQ5dOR01CU8vpp
-kZMp05St+UFrga4IQN3npMg7W2/8UCm5k9uT2TcgID7/rqkF/LnDANTvkNYNvlMIZn6L73re
-YfWMEdEynm8bSkIXs3Lppki21G3fsGpr3bU1yvS21InFHO8sjTMfryzNXIxbmyPXhPrm0Bkl
-fXdGKr/DfVl2ZEEQqJhl9O91SF+fFMtWR+8KeKdsogdSxe3ynCdnR0dn3IqmuFyKkqwxFtmN
-alutu2/qx3FRsZuGXFm7a8OsL+r5ikSFx53Vb5RJomBWO30L7WaDNTN8fthTrLrmZHnGVz58
-4Z4ST81nU3/Khl6SnbWy5ZVGxu5btOmQfa7GUmRLzZhmU0oyu8B4SOwEEJ/VsFJVCq/ftCm/
-xnDZOVC+gCd/dnqB+NsH1QzgnLzFxoX2CoGELiu9kxBKpo1JAOv4ygwvhsDcNC6lTgF7h25u
-g7mivaD9QKlyOZxcUVyJvwDv65E2xA9RYAAAAABJRU5ErkJggg==
-ENDofIMG
-
-demo.show_image('png', 'transparent color', <<'ENDofIMG')
-iVBORw0KGgoAAAANSUhEUgAAAC4AAAAjCAYAAAGcIAh/AAAIl0lEQVR4nOWYIXDjyNLHf7p6
-oMU0TIIDtcxhNhT0Mi9LoD+2y7JsF+6xhG3YBSYsYWt2gg6zWcS+gSM2w9RsPiDbiS/Z/e7u
-3b33ql5Xqcoujbp7unv+/+6B70i2//HLskn3G8f8xLJaO34COJ3WqX30+BgwIiCML7oYiKps
-Xcw+362pjDyp+Z6t/19Op3UC+AfA3fk8uahsHj1RFdgZv247QgjcPnRZXRV/3txBmtqmvecZ
-wGlTp94HmknFuou0nWNeW0SEdzPLu8tVBlAWkg4hnE9smtkSFyMAE1tx0z5y1rxh6zzDALcP
-3WE975s6nTbjlj8tJmn8qPwnAvh75NdPi9TUo5Wfnr/4spgeTN+cz5MtJF2u1kDO1JbpH/CU
-4AfnuTht0sfbNrNVxWJW03aOresz2KWwDwNr1wPgg+N/v12kh3ZNVQmVN1QTk5q6HBfvpTLC
-ow/8fHnNMEBUpTLCMIwh/QmgNDmyq7k3leG67bLmTcVq67JpXaEoWxefdryY2ARjVX0vMj8B
-6M4ccEjz3yoipElZpPnOQ+A4IL9Hvi6bpMDH6zYDWM4nyTlPITkigqKHtUdJvzufp6/LJl2c
-Ph3ci+U03TyL0836EVuMB+10WqdpZRDJiTrQR+X+wWWvKl87z/rR0/Wer8smTesyea+st45v
-nxajAR1jYMsiWVuQi9BuHQBFAe/nk/Trbu2R8mqXfx8UAXJg6yIbH7hpt9ycL9LW9ay3HVNr
-6PtIIcJ8WlOIAQXv4+thAZjZisoIq43DVgZbCVWRk+fC8vKeu/M5VSXcPrhsGEBR6kowArUt
-qYzQ9fGl8roytG7coux2MRZwyaiI7O3lKhNyYASNd5er7Of7bTaxFZXJWW0cH3bJPqrRr8sm
-tY+OKi9YO8fWxWw+sampS2xl/nxNF8LfjEz/qXI6fYkdf/iE/lYKkfR+PqGPkWVTp2IPZ7xS
-ij+Spi7TL8t5Wu6YBODirKHzI/AOA/Tx6fj/MPtfT5tEzqG0bCGpObHctB0K2cVpk1wMhKCo
-KlFBBFbbEQIOnk9skb4spunXT4t0Ph+57X77CMOzEBjZgRPZ6bROkgvOR/oYUMCHcFB8pHzZ
-1Dz6yHXb0Uws7+d1Wnc9VSV8WT6xmPeR02md+hg4sQWd87Rdn622Luv6mO3DB88S6nce5jm4
-PiIiLKY1nQ8Uec6ymaTrdpuZWpKPgQLBB8VFzeqySLYyByfPrlbHnlf5eKRDUJzfdVXAoMpq
-4zhfzHb/oaktb6xBVWnq8qAYQICZLY+Vm6cKwhTCxvX0UbGVoRBYd47Hr++TKXImtiIMyoAi
-kiOMWCTA1gX2xg7KXRhQlMjApDIYhEJG2I0KH65WbDvHvo5jHIhhYFaPSLg3MCiHNU/K+8iJ
-Lfk0n3HZdrgYDmGojLCcT/h8s+btiaUSaLs+u3tw1JXBD4qtBJMDotjiN57frR0CfLhtKUWw
-lcEYoR+GEW5VcTFmPoQDSz64PlOFs1kNjGU6sxUfbtvjOo+qmZAfrArjibu431KZsTIAPt4+
-ZM6HQ37OrlbZuvMYyTmxhrfPYPkIWxSwRnaeCbcP22w+sQnhwJPAgWn2crnavnrSj7ClyMek
-FCJcteMHZ7MaszuV+3XXbffHSePufJ72be1fKoXIfycT1WXxYuP/NBH9lXJ3Pk9dDDCANQYR
-6FxgUle8/fn+aO2/zPGJLdPnxQmrrXtRyN8+LZLvlavVhrIYsdaZyDDAiS1Q1Rf6/lbHy0LS
-ia1oaktlhKtVR9u5oyGzObG4PtJu3GEIEhHCoKjCattT93+h4/OJTWcziw8DtjJ8uV+zdfEo
-kvuZqes9hbEHpwuR9G5mWUxroirX7QYhpxBD1NHhcQPj43ykEFJUXgLiPpUhKn0YEIGgSudG
-/pjWFVvn8arcrx2rrctWWzc2WMbweTGj7Xy6OgJHIcQBWxWc2AoYp5w8H2eLGJWgyhABGRgD
-Ow62qj9up168LIT0cTFlAOK+KdNxOptPLEGV+43D5uNtS1UU+KgsJpY+RoIKH66fqGJalykH
-Pi3fcXWzIupAITmzumRiK1T1iFqey9SW6e3UIuTUVth2gc/3D8f8tpeoZAKc7JsQfRopVZUY
-BuZvSjY+oAq+j1SFcLnaIiKYAu4+LVNZjNgdd7yoGoiMTA8j3blecVFpapvmE5sWE5v2v+cT
-m0yRs+l6alsQox6cftVxANl1XTw7zY8+4MKA5BAH6H3k28axcYHC5Pg4cN12PLpAZeDq4xl3
-X86Tj0pQuG87Fic1tjTjEKdgCqjLAhiQ3WaKMZGHB8bgBB3P1Q8d34sflC4oLig5UOQ5VWHY
-uJ5pbZnVFbY0RD8cRv2t65l9vM40eCo8N+eLHVoothBUFUXZuB7nA31UysIc+gERwZjxkd3/
-PgzUZcHza7dXHd+3OnU1Lp7XJeeLE3SAm3WH6weiBoTxbqK2hkrM2BnqOHecXa6yR9fjY+Rs
-9gYfFB+VtfP4fmDrw+GurXlTYQzYaozx3mGT7xr5GMeLpOKph37V8XbjUFVyGSPUdj2fb9fc
-PDwiuWCLEbqMEQyC98pkRxS1LZjWI4L8z3WbqSoi0JyU2FLoo2YPrs9cH7POBQZVqkKoqwoQ
-8nxEsxAUEcEWBVNb4eMxln8XcsZboIGb1lGXOapjJPJ8bEpNDmF3pRZ04G1t8RoRZIfNT+xY
-l0VaNif7zvmFTYH05XRKsTtbOoDXgDWGfFfoZ1fH332fgIbxVqQuI8aMJaDD065FhNv2CbM/
-zk+S7yK6y9hz6fqYfb5v08VZ84JIYLxd+Xj78F1XXpPvOm7M07n2Po6Tzq6pbjcdLurB+LKp
-R/QI8KaSo3cH55Tsw3W7a3FfUvgflR9SflRl9qbAeQUZCenqN2PDaVOnRxd+9wQQ9eWm/oy8
-quTidJokH280HzrHt42jfyWK/075P4AQnUfVTZNLAAAAAElFTkSuQmCC
-ENDofIMG
-
-demo.show_image('png', 'transparent grayscale', <<'ENDofIMG')
-iVBORw0KGgoAAAANSUhEUgAAAC4AAAAjCAQAAAE2KcD0AAAFPElEQVR4nMXWXYicZxUH8N+z
-M3HezCy76axJzJrtR8jWVVc29IMtTTG6hUqqqL1QWlrxQmirXpTihRdSY4pUSws1IIEWBesH
-CAZFapNaSISgpUurJra2i7u2IWs+dpNMnbWzndfM9Hixs5tNmrYJCv7vHvi///ec85z/OQ/L
-kODeeMZ1fq+LsTjolIqixAejx3jqj5EFknfEWFBke5zwkga62O01+9LAO38INsW9QeKmmHG1
-vzrgapkttiWqkWA0hsziSr/1CX+T25fAp+Km4PZg8F2CfCseipGga+HwxYBvxur4hWQoigtp
-T7grHk3rbXHAVKJIzQRq9sZ+a/XpixHFBZGqaQ/LNVTlBnVRVcKAPWnEeBrWMrXw7+uD7WfF
-3EVTFdvSxaaiFJfFaGAxlLfinmj7fuIzcUhFpmUZfXvUND2a+Gr0uT+x1+cxFhsc1zDvQOrE
-CC97wWH3xHDM+JMHg5YV+uNSKz2PHrfEQ2eK24OaLgVTDnnKtpj0Rx8wo+IG3VpmLFNnSNW4
-futUZb7tW9b6Xcq1rFe2QdU/ztAHvIgMe9KIXDvdl4rYl7aln6VBfcbtSEupnkTRpKk0Grkt
-9mHHUsV3nl378kV31f8SH1/qkbe91UVU4hanbI0ylhXybIzE12JrwN0OI/caOqPgDL4SK+xI
-rI5rPK2d7opZdU3zSsYXC7kxNhs2blf6g82gV6adxmKlo5oyp0yf6Zmtpu1xrc/Gi9a6O2DG
-WJyy0SsOpvE0nRiJjvq/UHJUZovDun0ynkyVOKak5kQaiH7c7IFF9V7UHVFB07NuQ26TKzSN
-RH+nJkOL9HIn3kk1/cpe8NPodaWG0zIFmYIp/Yv0WS25y5WUFc172EsqqKsbVlWQyVUW6UcN
-utWvzVow9Kf9wHW6HUz7XWrOOmUFaxbp+xXs1KNfrzm5ptl00puYSLkbJZkhO1OH3khFa1CQ
-+7mqGh5LR8AD6QUVg+5Ly3qmbbW2ZF8ajaLnwXTnpnctu/lOz5RlKp5I3KiinWDP2w+k7XH7
-hVuk8v9008DSz9/VTBeG7XHMaWuVvOJDvv7fiA/GHZ5dKvODMeuX+jQdlduoucS7yMVQjUGb
-9Nndmd6jca2C57R0oyWXG/BEuoDIR2PMKe/3E1MdehWHrXIgUYmP+piGJxV1a8hRUnJUOebP
-NONg3OGfakoaXjVo2KQ5+42ncVvjEl9wIH6VFhKt6zeIsSipqWtoKMmFCfk5dVg6luM2bXWc
-1nad1z3jEkV9aq5X84bvJRiOgi/7sYaKYYOaHcssYCg2K7rchMfTslk6nwqu6EjTVHeVQ3Iz
-qnbJ9PhuVIM65v1bjrbjTtoUo3F9bIrRGI1eL9tgzuPL9ymsxGkwbVbJvBnjpqxSs9srqr7h
-kaiZt9cN+mVaeqwXCtrKCgoKOG7ewlPgnC0w57gTCrq916SPGNbvpBYm3ZnqVtim5E2rNbVM
-OuI1fTIVmV69Mpma9RYedcvEj2DAgKvcqmmvY15X1LJBr4qW1XF/+rtTblRTM2HWIbMY0WMd
-Mpmyklnz+s4Vf05TpumgH9ons1q3XiUzNmq6wjAeSU3vcY33qaWJdDS96g1Vl0lKGuoyawyp
-ndstcE+0PG29XKYkVzavoeFqdUWNjicH4maFZW+DQnxJBbm6NTJ853wmOm2dAb1aHQtnfpPg
-c/Fn7c4oZjr9KO5eMgrt9Jjz4yzxVbowo6ok87wTCbZGzZyBzgnytOOCBu859m/4sGOK6ktL
-4qZ49byboHEBU2kZ5c5YKfMX42oX/849L/4D4jD0vGNZ6YMAAAAASUVORK5CYII=
-ENDofIMG
-
-demo.show_image('jpeg', 'color', <<'ENDofIMG')
-/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRof
-Hh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwh
-MjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAAR
-CAAmADkDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAA
-AgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkK
-FhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWG
-h4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl
-5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREA
-AgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYk
-NOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOE
-hYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk
-5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwDzLyJSuV5FIsUm4DAzW1Ywpb3sbPhoQ4LA
-jPGea6jWdH0W6EdxYLJA78gICUb169KIq8JTutDWnSnUmqcFds4y2e5jkzGrOVGTt7Ct2aae
-ZFzGSR6cmni1t4RiFWCseRknJHf+f51MsZG4JHwP4hXmVaqctEfVYDLqsKbTla+43S7NZLkr
-dHamMEgg9R6isDVtDu7KdjFGZoOodOcD3rowWIVRkbDuUHI3DFbWnOs1n9pIIMZwwIzyBxwe
-v/16ujWs9iK+VQqfFN3W3Yo6Pp/n6LbXFx9rWeCNifLbjac9T6YxXN+a/wDzy/SvedC13S5/
-DtnZ3ckZmMQSVVTK8cYJ6HI96tfZvC3/AD42/wD35NdfM5dT5Pdtp3PBtEji1CVTtyR1U9vc
-11WpXOnRW9rYwWxB6O+/n2OOgrm40EZyg2n2rTm8M6xp+lrrk1q76bIu4hcMwB74zkD3/TFV
-KcXRcFHXudWGm6deM+axUmCQytGjrIi8Kyg81NFKrxqogVsMWk5OH78j8/YfnQ1hKlrbXU8F
-xCk43ws67d4/L3H5j1rLurqVLhhno2RXlKErn2f1qEIKV7xL77QN21VxwMdqdLdvBpbpDveS
-5cJGiHBzyMj8/wBB61i3OoySJjhR3C0+71FYYfIjncSgbSUOMj0J/mBW1OlJSuzz8fmsY0nG
-kvQ6qO4ubaLyt8fnR/Idh3AEdfyNQeVrH/QQuf8Avv8A+tWd4fu0j0dePnEjIM+vU/zqz/aq
-f8/J/wC/h/xotNSaifEO6bsVo1yy8DmvetkF3HbaW0INuYFMiYwpXA4wKKK7Y7HWtzSvNPs7
-ywezurdJLYrjyyOgx29D6EcivGviF4EtfDlnFqVpeSvFLMsPkSKCVJVjncO3y9MfjRRRUirX
-NKdWcfdi9DhbW3YRS3a7cW+GOepycDA+vWsaS3AcqScjvRRUU9zOcnLVlqx8+Elll43qoH1r
-K2L70UVaerMluf/Z
-ENDofIMG
-
-demo.show_image('jpeg', 'grayscale', <<'ENDofIMG')
-/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRof
-Hh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/wAALCAAmADkBAREA/8QAHwAA
-AQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQR
-BRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RF
-RkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ip
-qrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/9oACAEB
-AAA/APMvIlK5XkUixSbgMDNX7Z7mOTMas5UZO3sK3Zpp5kXMZJHpyan0uzWS5K3R2pjBIIPU
-eorA1bQ7uynYxRmaDqHTnA966/R9P8/Rba4uPtazwRsT5bcbTnqfTGK5vzX/AOeX6VFYwpb3
-sbPhoQ4LAjPGea6jWdH0W6EdxYLJA78gICUb169KzBa28IxCrBWPIyTkjv8Az/OpljI3BI+B
-/EKcCxCqMjYdyg5G4Yra051ms/tJBBjOGBGeQOOD1/8Ar16PoWu6XP4ds7O7kjMxiCSqqZXj
-jBPQ5HvVr7N4W/58bf8A78mvBtEji1CVTtyR1U9vc11WpXOnRW9rYwWxB6O+/n2OOgrDmCQy
-tGjrIi8Kyg81NFKrxqogVsMWk5OH78j8/YfnUT7QN21VxwMdqdLdvBpbpDveS5cJGiHBzyMj
-8/0HrWnHcXNtF5W+Pzo/kOw7gCOv5GoPK1j/AKCFz/33/wDWrIjQRnKDafatObwzrGn6WuuT
-Wrvpsi7iFwzAHvjOQPf9MVE1hKlrbXU8FxCk43ws67d4/L3H5j1rLurqVLhhno2RVa51GSRM
-cKO4Wn3eorDD5Ec7iUDaShxkehP8wK0vD92kejrx84kZBn16n+dWf7VT/n5P/fw/41WjXLLw
-Oa962QXcdtpbQg25gUyJjClcDjArSvNPs7ywezurdJLYrjyyOgx29D6EcivGviF4EtfDlnFq
-VpeSvFLMsPkSKCVJVjncO3y9MfjXC2tuwilu124t8Mc9Tk4GB9etY0luA5Uk5HerVj58JLLL
-xvVQPrWVsX3r/9k=
-ENDofIMG
-
-demo.show_image('jpeg', 'progressive color', <<'ENDofIMG')
-/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRof
-Hh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwh
-MjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wgAR
-CAAmADkDASIAAhEBAxEB/8QAGgAAAgMBAQAAAAAAAAAAAAAAAAQDBQYBAv/EABkBAAIDAQAA
-AAAAAAAAAAAAAAECAAMFBP/aAAwDAQACEAMQAAABzA7aRqV/vvl1eIWLrCCt3stuTgrWtaNs
-PsV5dljqXX57XwtLMSLehdazjQjUSQBZVQK//8QAHhAAAgIDAQEBAQAAAAAAAAAAAQIAAwQR
-EiEQBRP/2gAIAQEAAQUC0ZoxegSSZUm2toZDTXuncQcvdTS05UTXyv1KL6jj84spAsNjVhT4
-QfIW1UGZRq6DyHGurq4PLMemsJjWaGO2qf6wTxg9aOn6GCuOir4VibHz/8QAHxEAAgEEAgMA
-AAAAAAAAAAAAAQIAAwQQERIxEyFB/9oACAEDAQE/AVUseIlC3YL3HtQ3ZxTPFwdzygDfyV7o
-BdLlWI9CE7x//8QAGxEAAwEBAAMAAAAAAAAAAAAAAAECESEQEjH/2gAIAQIBAT8BXxsqukWb
-o2vTMMZMvTu8EUifH//EACgQAAEDAwIDCQAAAAAAAAAAAAIAAREQITESUQMiMhMjM0FScYGR
-of/aAAgBAQAGPwKllhcys0shItUs3ksJtkxBLKyxTVsgAnaYuugfqggwqMrHvS2SwotLLxCp
-27j3boSdiacVhnuvldX7QeFHLF1oIZHZNxBN4d4h05emmaf/xAAgEAEAAwACAgIDAAAAAAAA
-AAABABEhMUFRcWGBEJHx/9oACAEBAAE/IcshZFgLXiHkBRkjX2ZMMXcupaDQ7fZRlXxwzq2m
-HKvtNw8afMR+4nAyQDPwUhn1PcOblWCA4SAgq7fyjXNBFYupQJoHCzZ/Qg6ZDC0rzWJF3bSr
-hl7gHj1CvvTIIebEpAaSnHFp1UQioh8wNbjHv6jUa7TSpzzsEon/2gAMAwEAAgADAAAAEIb7
-MuvRaP43Yv/EABoRAQADAQEBAAAAAAAAAAAAAAEAETEhUXH/2gAIAQMBAT8QGjax8NL2bzZn
-k1Ubj8VKe1w5H5Gxahs6xyN0w2f/xAAaEQEBAQEBAQEAAAAAAAAAAAABABEhMUFR/9oACAEC
-AQE/EBu05G8Fg+WvqUj1+xtC02FE8QZt6h63/8QAJBABAAICAgIBBAMAAAAAAAAAAQARITFB
-UWGRcaGx0fCB4fH/2gAIAQEAAT8QvtkSkKLl8RFvQllJTrLEKYaUR2dkTm2mejzMlLHRa9vV
-VP3kopAoS8XmEZJwK929QBQEyWtpz9/cQpiOEFAWXobKVLxEVQS8hjDv+46IjecMUumzzP8A
-cRqyTa48sXGOt/w1ogxTIDmGiosjXPJ78HuVGgwVxK9tt03ks9/Q7nZ8b0E36Z+z/EFWbeJY
-AwKAPNXYefpUHWepPryezuBl6sSs4HJFYsll1Z0v3CYYxDfe37zz/b8yzAZldCmppUMURDFp
-Y0Vx09JklKrxFSl046V/MBjlFe22ij53AGls5lpwah8z5p//2Q==
-ENDofIMG
-
-demo.show_image('jpeg', 'progressive grayscale', <<'ENDofIMG')
-/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRof
-Hh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/wgALCAAmADkBAREA/8QAGgAA
-AgMBAQAAAAAAAAAAAAAAAgQDBQYBAP/aAAgBAQAAAAHMenfNC3rRtFT67pJcFaomPWQTaBWP
-rMsW9ZxtElKr/8QAHhAAAgIDAQEBAQAAAAAAAAAAAQIAAwQREiEQBRP/2gAIAQEAAQUC0Zox
-egSSZUm2toZDTXuncQcvdTS05UTXyv1KL6jj84spAsNjVhT4QfIW1UGZRq6DyHGurq4PLMem
-sJjWaGO2qf6wTxg9aOn6GCuOir4VibHz/8QAKBAAAQMDAgMJAAAAAAAAAAAAAgABERAhMRJR
-AyIyEyMzQVJxgZGh/9oACAEBAAY/AqWWFzKzSyEi1SzeSwm2TEEsrLFNWyACdpi66B+qCDCo
-yse9LZLCi0svEKnbuPduhJ2JpxWGe6+V1ftB4UcsXWghkdk3EE3h3iHTl6aZp//EACAQAQAD
-AAICAgMAAAAAAAAAAAEAESExQVFxYYEQkfH/2gAIAQEAAT8hyyFkWAteIeQFGSNfZkwxdy6l
-oNDt9lGVfHDOraYcq+03Dxp8xH7icDJAM/BSGfU9w5uVYIDhICCrt/KNc0EVi6lAmgcLNn9C
-DpkMLSvNYkXdtKuGXuAePUK+9Mgh5sSkBpKccWnVRCKiHzA1uMe/qNRrtNKnPOwSif/aAAgB
-AQAAABCrPPK25v/EACQQAQACAgICAQQDAAAAAAAAAAEAESExQVFhkXGhsdHwgeHx/9oACAEB
-AAE/EL7ZEpCi5fERb0JZSU6yxCmGlEdnZE5tpno8zJSx0Wvb1VT95KKQKEvF5hGScCvdvUAU
-BMlrac/f3EKYjhBQFl6GylS8RFUEvIYw7/uOiI3nDFLps8z/AHEask2uPLFxjrf8NaIMUyA5
-hoqLI1zye/B7lRoMFcSvbbdN5LPf0O52fG9BN+mfs/xBVm3iWAMCgDzV2Hn6VB1nqT68ns7g
-ZerErOByRWLJZdWdL9wmGMQ33t+88/2/MswGZXQpqaVDFEQxaWNFcdPSZJSq8RUpdOOlfzAY
-5RXttoo+dwBpbOZacGofM+af/9k=
-ENDofIMG
-
-demo.show_image('tiff', 'uncompressed', <<'ENDofIMG')
-TU0AKgAAHggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAADb///bttu2tv+Sttu2ttvb2/8AJEkAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////b//+229u2
-29vb2/+2ttttttu2ttu22//b//8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAJAC229skbZLb//+2tv8AJEkkbZJtkrbb///b//9tktvb//8A
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACSttu2
-29u2ttvb2/8AAAC229skbZIAACSSttu229uSttsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAAAAAAAAAJCQAJCSSttsAAACS
-ttvb//8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAASUkAAABJbZIAACQkAACStrYASQDb2/8AAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////29v//9v/29v///8AAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AABtJACSbSS2bUnbkm22km3btm22kkn/25L//9ttJAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACSSSSSSSTbkm2SSSSSSSSSJACSSSS2
-bUm2bUm2bUn/27b//9v/////////////27b/tm3btm3//9v/27b//////////////9skAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAkAABJAAAAAACSSSRJAABtJABtJACSbSSSSSTbtm22km3btm3btm3btm22km3/
-km22bUn/25L/27b/25Lbtm3btpLbkm3/27bbtpLbtm22km3/25L/27b//7b/27b//////9v/
-/////9v/////tpL/km1tJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABtAABJAABJAABJAACSJCRJ
-AABtJABtAACSSSRtJACSbSSSSSTbkm222222km22bUm2kknbtpLb25K2km22kknbtpLbtm3b
-tpLbtm22km3btpK2km3btpLb25L//9v/25L/25Lb29v//7b/27b//7b/27b/25Lb29v/27bb
-tpL//9v//////7b///////////////+2bUkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAABJAABJAABJAABJAABJJACSSSSSJABtSQCSSSSSSSSSSSSSJCSSSSS2
-bUmSSSSSJABtJABtAACSSSS2kkm2bUnbkkm2kkn/25K2kknbtm22km3bkm22km3/tm3btm3b
-tm3btpLbkm22km22kkm2kknbtm3bkpL/25L/27b//7b/27b//7b/////tm3btpL/27b/tm3b
-tpLbtm3//7b/25L//9v/////////////////////2/8AAAAAAAAAAAAAAACSSSQkAABtJABJ
-AABtJABJAABJAABJAACSSSRtSQBtJABtSSS2kkmSJCSSJCSSSSSSSSSSSSSSSSSSSSSSSSRt
-JACSSSSSSSS2bUm2km3//9u2bUm2bUm2bUm2SSS2bUm2bUm2km2SSSSSSSTbtm3btpL/25K2
-km3btkm2km3btm22km3bkm3btpL/25K2tm3bkm22km3btm22bUm2bUm2bUm2kkm2bUnbtm22
-tm3bkm3b25L//9v///////////8ADgEAAAMAAAABAEAAAAEBAAMAAAABACgAAAECAAMAAAAD
-AAAetgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAESAAMAAAABAAEAAAEV
-AAMAAAABAAMAAAEWAAMAAAABACgAAAEXAAQAAAABAAAeAAEaAAUAAAABAAAevAEbAAUAAAAB
-AAAexAEcAAMAAAABAAEAAAEoAAMAAAABAAIAAAAAAAAACAAIAAgSwAAAAAQAABLAAAAABAAA
-ENDofIMG
-
-demo.show_image('tiff', 'packbits compressed', <<'ENDofIMG')
-TU0AKgAABAqBAMEAgQDBAIEAwQCBAMEAgQDBAIEAwQCBAMEAgQDBAIEAwQCBAMEAgQDBAIEA
-wQCBAMEAgQDBAIEAwQCbAAvb///bttu2tv+Sttv/tv7bA/8AJEm8AKEA/v8G2///ttvbtv3b
-Df+2ttttttu2ttu22//b//+/AKMACCQAttvbJG2S2////7YR/wAkSSRtkm2Sttv//9v//22S
-/9v//8IAoQADkrbbtv/b/7b+2wD//gARttvbJG2SAAAkkrbbttvbkrbbwgCcAAAk9wD/JAUA
-JCSSttv+AAGStv/b///CAJcA/0n+AAJJbZL/AP8k/wAIkra2AEkA29v/wgCBAMEAgQDBAIEA
-wQCBAMEAgQDBAIEAwQCBAMEAgQDBAIEAwQCBAMEAgQDBAIEAwQD9///b//8B2///2/7/gQDQ
-AB5tJACSbSS2bUnbkm22km3btm22kkn/25L//9ttJAAkgQDgACOSSSSSSSTbkm2SSSSSSSSS
-JACSSSS2bUm2bUm2bUn/27b//9v3/w3btv+2bdu2bf//2//btvb/AdskigADJAAASfwAU5JJ
-JEkAAG0kAG0kAJJtJJJJJNu2bbaSbdu2bdu2bdu2bbaSbf+SbbZtSf/bkv/btv/bktu2bdu2
-ktuSbf/bttu2ktu2bbaSbf/bkv/btv//tv/btvz/ANv8/wDb/f8GtpL/km1tJLUAYm0AAEkA
-AEkAAEkAAJIkJEkAAG0kAG0AAJJJJG0kAJJtJJJJJNuSbbbbbbaSbbZtSbaSSdu2ktvbkraS
-bbaSSdu2ktu2bdu2ktu2bbaSbdu2kraSbdu2ktvbkv//2//bkv/bkv7b//8Mtv/btv//tv/b
-tv/bkv7bCP/bttu2kv//2/z/ALb1/wK2bUnXAH9JAABJAABJAABJAABJJACSSSSSJABtSQCS
-SSSSSSSSSSSSJCSSSSS2bUmSSSSSJABtJABtAACSSSS2kkm2bUnbkkm2kkn/25K2kknbtm22
-km3bkm22km3/tm3btm3btm3btpLbkm22km22kkm2kknbtm3bkpL/25L/27b//7b/2wO2//+2
-/f8Ztm3btpL/27b/tm3btpLbtm3//7b/25L//9vx/wHb//UAAZJJ/yT/AH9tJABJAABtJABJ
-AABJAABJAACSSSRtSQBtJABtSSS2kkmSJCSSJCSSSSSSSSSSSSSSSSSSSSSSSSRtJACSSSSS
-SSS2bUm2km3//9u2bUm2bUm2bUm2SSS2bUm2bUm2km2SSSSSSSTbtm3btpL/25K2km3btkm2
-km3btm22km3bkjBt27aS/9uStrZt25JttpJt27Zttm1Jtm1Jtm1JtpJJtm1J27ZttrZt25Jt
-29uS///b+P8ADgEAAAMAAAABAEAAAAEBAAMAAAABACgAAAECAAMAAAADAAAEuAEDAAMAAAAB
-gAUAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAESAAMAAAABAAEAAAEVAAMAAAABAAMAAAEW
-AAMAAAABACgAAAEXAAQAAAABAAAEAgEaAAUAAAABAAAEvgEbAAUAAAABAAAExgEcAAMAAAAB
-AAEAAAEoAAMAAAABAAIAAAAAAAAACAAIAAgSwAAAAAQAABLAAAAABAAA
-ENDofIMG
-
-if false
-demo.show_image('tiff', 'pixarlog compressed', <<'ENDofIMG')
-TU0AKgAAA3Z4nO2aIWzbUBCGz7HjYyVTNDAp0CgKDRorCauiSGFjRmWRxs0rlQ2FlUWKrLKQ
-sIDK1BoyjFRUjZSF7f13eYnjpZOmdeuU3Wc1se+dn17uf/ee5SuRYRiGYRiGYRiGYRiGYRiG
-YRg/YxVt3EG04IpLJkqocJ8VD6S1746ELsOP8UNMxO1J9MbDPQs2EvOKcV66uOsZoo34lwxb
-JraMfEsif+S06Lrj74/5XNi2iG6jdbCKruMRz3gdfKUbF/OFi/c0vHbzfNvqBDl1giENKHdt
-492dI/7sdIElMRV+i0l0G62igcx3ZMBhnUFc0ebV4fZzeBfDfx2ofyGr1DycOt+3/RXnALIB
-63rTqnYo9SVYBxptVS11+WDz//WZh/MQ8Z5E8/AiwjdmPnTg9qfg1sV+Hn7gabiK3gWbSDPl
-rcdsGIZhGIZhGIZhGIZhnCebXc1IKxeJ2LSGkbija+8G/zAXEd4LDqkTbFuo091T312l8iYd
-79JhK7ngGY+dNSfoklKP38eX4VOMt73NN77Gr4B3tP4NOeLbCWY84qfYt18x4ntPUCd133XG
-zv+RSOp5RD57DlRSiSo5Y59RY1HQV2fH1KRyunbDy/D/0VRjr3HVirQqMuJJxO2UvDY+R4hm
-DKUe3RXywudIHbVrdBe8lNzJJfK08y2kQr5k7RfXS0ZeZaJNIfYl+35S8dF7j1fI8dHV8fmC
-P7P23OO7+Dl8/idVvZCYz7hpz6VyNHKz/6ACxj8kqLNk5MWxIrkoktKhP0Re49uX+qtWxUtn
-1cjP2Nvhi8/h7vyg7FDUXLKe+7o6tEKs/bgrGUEiFfdTeqji6qN1evSaiLYH34X4/piVaOnx
-Qzx1Gr72f03MX9xdEdlcVh5dhZaMLBkS1XJCuZJxo1XXKOwWsOld6nPQbiC9asT70l+5+93Q
-cMFY//rSk1eBaj7IgaoxW3wGlXu710X7QetwpxnRqTxSEHlEupJZk+x3v2xnIRk1VMvk3oJp
-32tz7a2Du7svVNl0tUFdmtt+NiNWOuf1vE6+m/8aUR/5bSuTqBYu06/2UTjeLU7h8+h+r6nf
-ZfAMMKYbUaTH3+Lj+1Tf+n4E/6K2c+kKqS26Py0k7xDTmcz+tPZ04VUmyTLvX4p/wdR4Gsm4
-uV54beCT1Z5edCVNpc/TSn0HoOsh4gAOAQAAAwAAAAEAQAAAAQEAAwAAAAEAKAAAAQIAAwAA
-AAMAAAQkAQMAAwAAAAGAjQAAAQYAAwAAAAEAAgAAAREABAAAAAEAAAAIARIAAwAAAAEAAQAA
-ARUAAwAAAAEAAwAAARYAAwAAAAEAKAAAARcABAAAAAEAAANuARoABQAAAAEAAAQqARsABQAA
-AAEAAAQyARwAAwAAAAEAAQAAASgAAwAAAAEAAgAAAAAAAAAIAAgACBLAAAAABAAAEsAAAAAE
-AAA=
-ENDofIMG
-end
-
-if false
-demo.show_image('tiff', 'logluv compressed', <<'ENDofIMG')
-TU0AKgAAAAgADgEAAAMAAAABAEAAAAEBAAMAAAABACgAAAECAAMAAAADAAAAtgEDAAMAAAAB
-h3QAAAEGAAMAAAABAAIAAAERAAQAAAABAAAAAAESAAMAAAABAAEAAAEVAAMAAAABAAMAAAEW
-AAMAAAABACgAAAEXAAQAAAABAAAAAAEaAAUAAAABAAAAvAEbAAUAAAABAAAAxAEcAAMAAAAB
-AAEAAAEoAAMAAAABAAIAAAAAAAAAEAAQABASwAAAAAQAABLAAAAABAAA
-ENDofIMG
-end
-
-demo.show_image('tiff', 'jpeg compressed', <<'ENDofIMG')
-TU0AKgAABID/2P/AABEIACgAQAMAEQABEQACEQD/2gAMAwAAAQACAAA/APn+vn+vn+iiiiii
-iiiiiiiiiiiiiiiiiiiiiiiiiiitK28O63e28VxaaNqE8ExIilitXZXIODtIGDyCOPStO18O
-a5e28VxaaNqNxBLny5IrV3V8Eg4IGDyCPqDWtZ+FvEOo2kd3Y6Dql1bS/wCrmgs5HR+SOCBg
-8gj6g1m1mkEEgggjqDWUysjFWUqwOCCMEGikpKKKKKKKKKKKKKKUHBB449RRXdXHxU16+nt5
-Ll1j8li5MDOTIxdWJYOzKSMMF3KwG4jHTHo83xl8QXs8U92Y1aJWASAMAxZkO472ZSQA4G5W
-A3YwRjb6mfjj4guZ4pblYYhEr/u7VWHmMzIcszuwyAHC5Vgu7G054x/GPiGDxNqtvqEcLRz/
-AGcR3LFAvmSB3wwwTxsKcEnbjaCQorA8e+J7bxbrdvqcEDRzfZViunaNU82QM3zgAnjaUGCT
-jG0HAFcx8QfFlt4z1221aK18i4+yrFdt5ap50iu+HwCTymzgkkY25IUE87XLVydFFFFFFFFF
-FFFFFFFFFFFFFFFFFFe2vceH9WtktdR8KaRGsEu53hjW2Z8ZH3o1jP8AeG32B6/d7l/E9hqU
-ENvqHhjSkWKUNKUt47Z2IJHDRiM+oK5xx7Db0t34mjvrWK3u9F0vEcoeUxWkdvI2MjAaJUOO
-eV6d/TFlfhp4BvnlmZtYtCHG6G3uUKJk9F3Izce7ZP542IfDXgG5trm4uv7YtJlOfJhnURAs
-TiNMxuxwM43NkgZ61p2lh4Lube5muodVhmDMdlvdII0JJwqgxuxA46tkj8cT23wi+HtwIsat
-raF/veZcQx4PoN0QJ+vA4zV+x8C/Dm6it92rauJJOH33McIVs8gb4cnjvwDjOfS5p+geAZoo
-BcXuqmWRQGYXEcKo2eRhoiTgc54HB554zofgFayMfM8XeSp+ZC2nggr0/wCeo7+38jitB8H9
-OLAXfi9bVXXfG72PyuucZB8z1BH4fXEUHw70/wDdte+IzaxyLvjZrLO5ckZA3jnIx6Z79cNm
-+AEUkFwNO8YQXF3EuRFLYtGh/wB5w7bRjnODS3HwYtJYpF0fxfbXlzHgvHNZvEqg9CWVnwMc
-5x0/HEt18NNPc+VpPimG7uVAaRJ7NokQHHJZWf37c44zms4fs++JyCf7Y8P/AC5zi5lOB68R
-9ODVdfgZr7KP+J54fDEkbBcysw9yBGePft3qOH4S6lLGr/2/oCgnH/HxK2PQnbGeD69B3xkZ
-w7z4N+MrW8lgjs7O5RGwJor+FUf3AdlbGeOQOlYM/wAL/E0V08McdhOik7ZV1CGNZAP4gJGV
-sfUDofSsV/Aeti9kt4jYShSdsxvookcDuPNZTjnuAfbg1n6h8MPGumiMy+HbybzM4+x7brGM
-Z3eUW29e+M846GoL34aeMrHZu8P3dxuyM2O26C4x97yi23qOuM0tz8PPFlvs2aLNeb8/8g90
-vNuMfe8ktt68ZxnnHQ1//9kAAA8BAAADAAAAAQBAAAABAQADAAAAAQAoAAABAgADAAAAAwAA
-BToBAwADAAAAAQAHAAABBgADAAAAAQACAAABEQAEAAAAAQAAAAgBEgADAAAAAQABAAABFQAD
-AAAAAQADAAABFgADAAAAAQAoAAABFwAEAAAAAQAABHcBGgAFAAAAAQAABUABGwAFAAAAAQAA
-BUgBHAADAAAAAQABAAABKAADAAAAAQACAAABWwAHAAABIQAABVAAAAAAAAgACAAIEsAAAAAE
-AAASwAAAAAQAAP/Y/9sAQwAIBgYHBgUIBwcHCQkICgwUDQwLCwwZEhMPFB0aHx4dGhwcICQu
-JyAiLCMcHCg3KSwwMTQ0NB8nOT04MjwuMzQy/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQF
-BgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0Kx
-wRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlq
-c3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT
-1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/9k=
-ENDofIMG
-
-demo.show_image('tiff', 'deflate compressed', <<'ENDofIMG')
-TU0AKgAAAah4nO2Y643EMAiEXQzNUIyboRiaoRh2ADuP+7N70knZkxhZlmNH2fkMRPGO0Wq1
-Wq1Wq9Vqtb5L5m5qqi7Rm5kP4qdNfSSHc3dYDtfmMD8TQS3mn3b3TjRgm6YEgsaeYzwRg4TC
-9PcjRMLYzpmxcABW8+ifNviJ6DIktLKN/vv3/xRHwXJuPoV5HTwqKK1Wq9VqtVqtz+VxwMjv
-8ej/39fUpCGTdLLJVJmm6NlNQIQlev+AhyVMaDBfA6GYAU41nFrzqLSFSw3GjJf6ZeEpUvwu
-bxDOcFREAkpXRKph7IjRzOjAvEnOC9jzcC7rnlp13YB29ip4wvxT1Jn+qwlthMQ5QWDbwlsE
-RTis4uQX+cZl+zCPQfWWGZgsEkfHhaML3KyQN901lIjwL/6a4GvL5EEK4QErneKSKqPW0qaD
-+awarnpJlkTIOnI9Aic1o1LsuEHuMdIyHTgrPyVTVKsM/YfuRzY4odxz3v2KBfaf021aDQqi
-E2q3SYs0QxN1cdSOHnW0i8uWyYoR79dFIK95nedr5HhObRRmctXuUC9uNR31AAAOAQAAAwAA
-AAEAQAAAAQEAAwAAAAEAKAAAAQIAAwAAAAMAAAJWAQMAAwAAAAGAsgAAAQYAAwAAAAEAAgAA
-AREABAAAAAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEAAwAAARYAAwAAAAEAKAAAARcABAAA
-AAEAAAGfARoABQAAAAEAAAJcARsABQAAAAEAAAJkARwAAwAAAAEAAQAAASgAAwAAAAEAAgAA
-AAAAAAAIAAgACBLAAAAABAAAEsAAAAAEAAA=
-ENDofIMG
-
-if Tk::PLATFORM['platform'] != 'windows'
-demo.show_image('other', 'postscript', <<'ENDofIMG')
-%!PS-Adobe-3
-%%Title: postscript.ps
-%%BoundingBox: 66 648 146 720
-%%Pages: 1
-%%DocumentProcSets: Adobe_distill 0.96
-%%EndComments
-%%BeginProcSet: Adobe_distill 0.96
-/PROLOGUE 30 40 add dict def
- % 30 procedure entries + room for 40 cached font dictionaries
- PROLOGUE begin
- /clip { } def    % causes problems. remove if "clip" is needed
- /bdef { bind def } bind def	/ldef { load def } bdef
- /T { moveto show } bdef	/A { moveto ashow } bdef
- /W { moveto widthshow } bdef	/AW { moveto awidthshow } bdef
- /f /fill ldef			/R { { rlineto } repeat } bdef
- /r /rlineto ldef		/L { { lineto } repeat } bdef
- /m /moveto ldef		/l { moveto lineto stroke } bdef
- /x { 0 rlineto } bdef		/y { 0 exch rlineto } bdef
- /c /curveto ldef		/cp /closepath ldef
- /s /stroke ldef		/w /setlinewidth ldef
- /g /setgray ldef		/j /setlinejoin ldef
- /d /setdash ldef		/F /setfont ldef
- /C /setcmykcolor where { /setcmykcolor get }{ %ifelse
-   { %def
-     1 sub 3 { 3 index add neg dup 0 lt { pop 0 } if 3 1 roll } repeat
-     setrgbcolor
-   } bind
- } ifelse def
- /selectfont where { pop }{ %ifelse
-     /selectfont { exch findfont exch scalefont setfont } bdef
- } ifelse
- /MF { exch findfont exch makefont setfont } bdef
- /FF /selectfont ldef
- /DF { selectfont currentfont def } bdef
- /BEGINPAGE { pop /pagesave save def } bdef
- /ENDPAGE { pop pagesave restore showpage } def
- /REMAP { %def
-   FontDirectory 2 index known { pop pop pop } { %ifelse
-     findfont dup length dict begin
-       { 1 index /FID ne {def}{pop pop} ifelse } forall
-       exch dup length 0 gt { /Encoding exch def }{ pop } ifelse
-     currentdict end definefont pop
-   } ifelse
- } bdef
- /RECODE { %def
-    3 -1 roll 1 index findfont /Encoding get 256 array copy exch
-    0 exch { %forall
-     dup type/nametype eq
-       { 3 {2 index} repeat put pop 1 add }{ exch pop }ifelse
-    } forall pop 3 1 roll REMAP
- } bdef
- end %PROLOGUE
-%%EndProcSet: Adobe_distill 0.96
-%%EndProlog
-%%BeginSetup
-PROLOGUE begin
-%%EndSetup
-%%Page: 1 1
-1 BEGINPAGE
-1 g
-2 setlinecap
-144 53 m
-390 x
--19 y
--390 x
-eofill
-0 g
-1.268 w
-0 setlinecap
-4 setmiterlimit
-[] 0 d
-109.698 714.182 m
-111.525 713.672 112.472 713.234 113.624 712.431 c
--22.3128 -25.8381 r
-97.4019 682.652 103.794 672.84 100.329 664.844 c
-102.034 675.687 90.7436 683.82 84.1099 684.842 c
-25.588 29.3407 r
-f
-1.0361 w
-f
-f
-91.8805 654.468 m
-96.0255 654.285 100.155 654.188 104.481 654.188 c
-113.804 654.188 122.752 654.636 131.141 655.44 c
-134.222 655.737 136.724 658.133 137.108 661.279 c
-137.79 666.855 138.107 672.696 138.107 678.705 c
-138.107 684.714 137.79 690.555 137.108 696.131 c
-136.724 699.277 134.222 701.674 131.141 701.97 c
-127.476 702.321 123.704 702.604 119.84 702.813 c
-119.84 702.813 103.842 668.373 102.231 664.827 c
-99.8549 659.595 96.601 655.765 91.8805 654.468 c
-f
-0.7851 w
-77.8202 655.44 m
-74.7171 655.948 72.2887 657.716 71.8525 661.279 c
-71.1725 666.855 70.8549 672.696 70.8549 678.705 c
-70.8549 684.714 71.1725 690.555 71.8525 696.131 c
-72.2381 699.277 74.7417 701.674 77.8202 701.97 c
-82.1335 702.383 86.5932 702.702 91.1764 702.916 c
-8.16241 9.07727 r
-99.2863 711.98 101.266 712.345 102.996 711.921 c
--28.4564 -32.9334 r
-80.6983 681.906 98.7446 677.354 98.7446 666.708 c
-98.7446 655.332 86.3243 654.054 77.8202 655.44 c
-f
-0.0843 w
-139.67 644.154 m
-140.194 644.154 140.619 644.576 140.619 645.098 c
-140.619 645.619 140.194 646.042 139.67 646.042 c
-139.146 646.042 138.721 645.619 138.721 645.098 c
-138.721 644.576 139.146 644.154 139.67 644.154 c
-1 ENDPAGE
-%%Trailer
-end %PROLOGUE
-%%Pages: 1
-%%EOF
-ENDofIMG
-end
-
-if false
-demo.show_image('other', 'pdf', <<'ENDofIMG')
-JVBERi0xLjIKJcfsj6IKNCAwIG9iago8PC9MZW5ndGggNSAwIFIvRmlsdGVyIC9GbGF0ZURl
-Y29kZT4+CnN0cmVhbQp4nF1TSY7cQAy7+xX1AkFbaXlG3jBAgAAzh/z/Esp2uyeDPhhUayEp
-FZMsnt/9/fg6/h6y/hzCHdS1UlyodH0dIrJJNyIWlLpE1OcLrGQOjLg6MOIm6+NoMULWiopN
-bevz6HRiaUQ0aKMHW1L7itQitGA2UvwdDuhoIaw8zSN3UOVqTnILNLAiXQVy3NNvCvQs+M57
-Zv4Gj6LivWK7UxS0dDCknBGl2jNY6MKoKmBkljwYfQUD2d8ZqjkKgINASEyEfCq208nc0Fon
-YSdZIiFy7IldQmbACe4FraKUfVYkzEAgarhgIBJyvIGi+IYrCWqm4I6UJ4mvV4PmfTW4J3TI
-tZCHQzdmDqeLY7Jgpf6IAG7KKVAsLAMBxWIEqrEvuAAc8xXp2Rtgkdhp038B7PfcCyQZ5WDV
-oXIuWGdCI387SO/GjezVgcZyuRaAP1b3gXVmopb1ZfXXkSM/z6Imx+4xpHAsseGHgD2abFzu
-2+qEzjwjl9fJN4vb6zd+ef1Ebq+fDrfZz4zH7GFhc0O32cPSJR+zXzIes0vnMPZlNk73ejWT
-gFNDYs/IOM3tkTXmGUbMsaPF9cAwq8KuyNwxFMc4gJY+d47S0Td/68nSNxkiUNpz159H8Twg
-g1LkcKyGBe6TkQYL3jhwTDwreSJ7gw9eZeBY3GZpPBU/FjY7/HX8A9+h3WJlbmRzdHJlYW0K
-ZW5kb2JqCjUgMCBvYmoKNTE2CmVuZG9iagozIDAgb2JqCjw8Ci9UeXBlIC9QYWdlCi9NZWRp
-YUJveCBbMCAwIDYxMiA3OTJdCi9QYXJlbnQgMiAwIFIKL1Jlc291cmNlcyA8PCAvUHJvY1Nl
-dCBbL1BERl0KPj4KL0NvbnRlbnRzIDQgMCBSCj4+CmVuZG9iagoyIDAgb2JqCjw8IC9UeXBl
-IC9QYWdlcyAvS2lkcyBbCjMgMCBSCl0gL0NvdW50IDEKPj4KZW5kb2JqCjEgMCBvYmoKPDwg
-L1R5cGUgL0NhdGFsb2cgL1BhZ2VzIDIgMCBSCj4+CmVuZG9iago2IDAgb2JqCjw8IC9DcmVh
-dGlvbkRhdGUgKEQ6MTk5NzEyMDUyMjU2MzcpCi9Qcm9kdWNlciAoQWxhZGRpbiBHaG9zdHNj
-cmlwdCA1LjEwKQo+PgplbmRvYmoKeHJlZgowIDcKMDAwMDAwMDAwMCA2NTUzNSBmIAowMDAw
-MDAwNzk5IDAwMDAwIG4gCjAwMDAwMDA3NDAgMDAwMDAgbiAKMDAwMDAwMDYyMCAwMDAwMCBu
-IAowMDAwMDAwMDE1IDAwMDAwIG4gCjAwMDAwMDA2MDEgMDAwMDAgbiAKMDAwMDAwMDg0OCAw
-MDAwMCBuIAp0cmFpbGVyCjw8IC9TaXplIDcgL1Jvb3QgMSAwIFIgL0luZm8gNiAwIFIKPj4K
-c3RhcnR4cmVmCjkzOQolJUVPRgo=
-ENDofIMG
-end
-
-#######################
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/tkimg/license_terms_of_Img_extension b/ext/tk/sample/tkextlib/tkimg/license_terms_of_Img_extension
deleted file mode 100644
index 23238e9c66..0000000000
--- a/ext/tk/sample/tkextlib/tkimg/license_terms_of_Img_extension
+++ /dev/null
@@ -1,41 +0,0 @@
-This software is copyrighted by Jan Nijtmans (the maintainer)
-and a lot of other people who contributed code (most notably
-Andreas Kupries, Thomas G. Lane, Ioi K. Lam, Mario Weilguni
-and Roger E Critchlow Jr).
-The following terms apply to all files associated with the
-software unless explicitly disclaimed in individual files.
-
-The authors hereby grant permission to use, copy, modify, distribute,
-and license this software and its documentation for any purpose, provided
-that existing copyright notices are retained in all copies and that this
-notice is included verbatim in any distributions. No written agreement,
-license, or royalty fee is required for any of the authorized uses.
-Modifications to this software may be copyrighted by their authors
-and need not follow the licensing terms described here, provided that
-the new terms are clearly indicated on the first page of each file where
-they apply.
-
-IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
-FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
-DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
-IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
-NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
-MODIFICATIONS.
-
-GOVERNMENT USE: If you are acquiring this software on behalf of the
-U.S. government, the Government shall have only "Restricted Rights"
-in the software and related documentation as defined in the Federal
-Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
-are acquiring the software on behalf of the Department of Defense, the
-software shall be classified as "Commercial Computer Software" and the
-Government shall have only "Restricted Rights" as defined in Clause
-252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
-authors grant the U.S. Government and others acting in its behalf
-permission to use and distribute the software in accordance with the
-terms specified in this license.
diff --git a/ext/tk/sample/tkextlib/tkimg/readme.txt b/ext/tk/sample/tkextlib/tkimg/readme.txt
deleted file mode 100644
index 8fd1a3e67d..0000000000
--- a/ext/tk/sample/tkextlib/tkimg/readme.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-The script 'demo.rb' is based on 'demo.tcl' of Tcl/Tk's 'Img' extension.
-Image data in 'demo.rb' is those of 'demo.tcl'.
-Please read 'license_terms_of_Img_extension' file.
diff --git a/ext/tk/sample/tkextlib/tktable/Orig_LICENSE.txt b/ext/tk/sample/tkextlib/tktable/Orig_LICENSE.txt
deleted file mode 100644
index b06b0b463b..0000000000
--- a/ext/tk/sample/tkextlib/tktable/Orig_LICENSE.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-
-  #######################################################################
-  ###  The following text is the original 'license.txt' of tktable    ###
-  ###  extension.                                                     ###
-  ###  Original Tcl source files are not include in this directory,   ###
-  ###  because of all of them are rewritten to Ruby files.            ###
-  ###  However, the image data file is quoted from iwidgets source    ###
-  ###  archive.                                                       ###
-  #######################################################################
-
-
-		   * COPYRIGHT AND LICENSE TERMS *
-
-(This file blatantly stolen from Tcl/Tk license and adapted - thus assume
-it falls under similar license terms).
-
-This software is copyrighted by Jeffrey Hobbs <jeff.hobbs@acm.org>.  The
-following terms apply to all files associated with the software unless
-explicitly disclaimed in individual files.
-
-The authors hereby grant permission to use, copy, modify, distribute, and
-license this software and its documentation for any purpose, provided that
-existing copyright notices are retained in all copies and that this notice
-is included verbatim in any distributions.  No written agreement, license,
-or royalty fee is required for any of the authorized uses.
-
-IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
-OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY DERIVATIVES THEREOF,
-EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE IS
-PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE NO
-OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
-MODIFICATIONS.
-
-RESTRICTED RIGHTS: Use, duplication or disclosure by the U.S. government
-is subject to the restrictions as set forth in subparagraph (c) (1) (ii)
-of the Rights in Technical Data and Computer Software Clause as DFARS
-252.227-7013 and FAR 52.227-19.
-
-SPECIAL NOTES:
-
-This software also falls under the bourbon_ware clause:
-
-    Should you find this software useful in your daily work, you should
-    feel obliged to take the author out for a drink if the opportunity
-    presents itself.  The user may feel exempt from this clause if they
-    are under 21 or think the author has already partaken of too many
-    drinks.
diff --git a/ext/tk/sample/tkextlib/tktable/basic.rb b/ext/tk/sample/tkextlib/tktable/basic.rb
deleted file mode 100644
index eed5351a8a..0000000000
--- a/ext/tk/sample/tkextlib/tktable/basic.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-##
-## basic.rb
-##
-## This demo shows the basic use of the table widget
-##
-## ( based on 'basic.tcl' included source archive of tktable extension )
-##
-require 'tk'
-require 'tkextlib/tktable'
-
-ary  = TkVariable.new_hash
-rows = 8
-cols = 8
-
-# fill table variable
-((-(rows))..rows).each{|x|
-  ((-(cols))..cols).each{|y|
-    ary[x,y] = "r#{x},c#{y}"
-  }
-}
-
-lbl = TkLabel.new(:text=>"TkTable v1 Example")
-
-table = Tk::TkTable.new(:rows=>rows, :cols=>cols, :variable=>ary,
-                        :width=>6, :height=>6,
-                        :titlerows=>1, :titlecols=>2,
-                        :roworigin=>-1, :colorigin=>-2,
-                        :rowstretchmode=>:last, :colstretchmode=>:last,
-                        :rowtagcommand=>proc{|row|
-                          row = Integer(row)
-                          (row>0 && row%2 == 1)? 'OddRow': ''
-                        },
-                        :coltagcommand=>proc{|col|
-                          col = Integer(col)
-                          (col>0 && col%2 == 1)? 'OddCol': ''
-                        },
-                        :selectmode=>:extended, :sparsearray=>false)
-
-sx = table.xscrollbar(TkScrollbar.new)
-sy = table.yscrollbar(TkScrollbar.new)
-
-btn = TkButton.new(:text=>'Exit', :command=>proc{exit})
-
-Tk.grid(lbl, '-', :sticky=>:ew)
-Tk.grid(table, sy, :sticky=>:news)
-Tk.grid(sx, :sticky=>:ew)
-Tk.grid(btn, :sticky=>:ew, :columnspan=>2)
-
-Tk.root.grid_columnconfig(0, :weight=>1)
-Tk.root.grid_rowconfig(1, :weight=>1)
-
-table.tag_configure('OddRow', :bg=>'orange', :fg=>'purple')
-table.tag_configure('OddCol', :bg=>'brown', :fg=>'pink')
-
-table.set_width([-2, 7], [-1, 7], [1, 5], [2, 8], [4, 14])
-
-puts "Table is #{table.path} with array #{(table['variable'])}"
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/tktable/buttons.rb b/ext/tk/sample/tkextlib/tktable/buttons.rb
deleted file mode 100644
index a1fc720b40..0000000000
--- a/ext/tk/sample/tkextlib/tktable/buttons.rb
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-##
-## buttons.rb
-##
-## demonstrates the simulation of a button array
-##
-## ( based on 'buttons.tcl' included source archive of tktable extension )
-##
-require 'tk'
-require 'tkextlib/tktable'
-
-# create the table
-tab  = TkVariable.new_hash
-rows = 20
-cols = 20
-
-table = Tk::TkTable.new(:rows=>rows + 1, :cols=>cols + 1,
-                        :variable=>tab, :titlerows=>1, :titlecols=>1,
-                        :roworigin=>-1, :colorigin=>-1,
-                        :colwidth=>4, :width=>8, :height=>8,
-                        :cursor=>'top_left_arrow', :borderwidth=>2,
-                        :flashmode=>false, :state=>:disabled)
-
-sx = table.xscrollbar(TkScrollbar.new)
-sy = table.yscrollbar(TkScrollbar.new)
-
-Tk.grid(table, sy, :sticky=>:news)
-Tk.grid(sx, :sticky=>:ew)
-
-Tk.root.grid_columnconfig(0, :weight=>1)
-Tk.root.grid_rowconfig(0, :weight=>1)
-
-# set up tags for the various states of the buttons
-table.tag_configure('OFF', :bg=>'red',    :relief=>:raised)
-table.tag_configure('ON',  :bg=>'green',  :relief=>:sunken)
-table.tag_configure('sel', :bg=>'gray75', :relief=>:flat)
-
-# clean up if mouse leaves the widget
-table.bind('Leave', proc{|w| w.selection_clear_all}, '%W')
-
-# highlight the cell under the mouse
-table.bind('Motion', proc{|w, x, y|
-             Tk.callback_break if w.selection_include?(TkComm._at(x,y))
-             w.selection_clear_all
-             w.selection_set(TkComm._at(x,y))
-             Tk.callback_break
-             ## "break" prevents the call to tkTableCheckBorder
-           }, '%W %x %y')
-
-# mousebutton 1 toggles the value of the cell
-# use of "selection includes" would work here
-table.bind('1', proc{|w, x, y|
-             #rc = w.curselection[0]
-             rc = w.index(TkComm._at(x,y))
-             if tab[rc] == 'ON'
-               tab[rc] = 'OFF'
-               w.tag_cell('OFF', rc)
-             else
-               tab[rc] = 'ON'
-               w.tag_cell('ON', rc)
-             end}, '%W %x %y')
-
-
-# initialize the array, titles, and celltags
-0.step(rows){|i|
-  tab[i,-1] = i
-  0.step(cols){|j|
-    if i == 0
-      tab[-1,j] = j
-    end
-    tab[i,j] = "OFF"
-    table.tag_cell('OFF', "#{i},#{j}")
-  }
-}
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/tktable/command.rb b/ext/tk/sample/tkextlib/tktable/command.rb
deleted file mode 100644
index 05ee47aa17..0000000000
--- a/ext/tk/sample/tkextlib/tktable/command.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-##
-## command.rb
-##
-## This demo shows the use of the table widget's -command options
-##
-## ( based on 'command.tcl' included source archive of tktable extension )
-##
-require 'tk'
-require 'tkextlib/tktable'
-
-# create the table
-data = TkVariable.new_hash
-rows = 10
-cols = 10
-
-# fill table variable
-((-(rows))..rows).each{|x|
-  ((-(cols))..cols).each{|y|
-    data[x,y] = "#{x} x #{y}"
-  }
-}
-
-lbl = TkLabel.new(:text=>"TkTable :command Example")
-cur_var = TkVariable.new
-current = TkLabel.new(:textvariable=>cur_var, :width=>5)
-ent_var = TkVariable.new
-entry = TkEntry.new(:textvariable=>ent_var)
-
-table = Tk::TkTable.new(:rows=>rows, :cols=>cols,
-                        :command=>[proc{|mode, cell, val|
-                          if (mode == :w)
-                            data[cell] = val
-                          else
-                            begin
-                              data[cell]  # exist
-                            rescue
-                              ''          # not exist
-                            end
-                          end
-                        }, '%i %C %s'],
-                        :width=>6, :height=>6,
-                        :titlerows=>1, :titlecols=>1,
-                        :roworigin=>-1, :colorigin=>-1,
-                        :rowstretchmode=>:last, :colstretchmode=>:last,
-                        :rowtagcommand=>proc{|row|
-                          row = Integer(row)
-                          (row>0 && row%2 == 1)? 'OddRow': ''
-                        },
-                        :coltagcommand=>proc{|col|
-                          col = Integer(col)
-                          (col>0 && col%2 == 1)? 'OddCol': ''
-                        },
-                        :selectmode=>:extended, :flashmode=>true,
-                        :rowstretch=>:unset, :colstretch=>:unset,
-                        :browsecommand=>[proc{|w, s|
-                          cur_var.value = s
-                          ent_var.value = w.get(s)
-                        }, '%W %S'],
-                        :validate=>true,
-                        :validatecommand=>proc{|e|
-                          ent_var.value = e.new_value; true
-                        })
-=begin
-                        :validatecommand=>[
-                          proc{|s|
-                            ent_var.value = s; true
-                          }, '%S'])
-=end
-
-sx = table.xscrollbar(TkScrollbar.new)
-sy = table.yscrollbar(TkScrollbar.new)
-
-entry.bind('Return', proc{|w| table.curvalue = w.value}, '%W')
-
-Tk.grid(lbl, '-', '-', :sticky=>:ew)
-Tk.grid(current, entry, '-', :sticky=>:ew)
-Tk.grid(table, '-', sy, :sticky=>:news)
-Tk.grid(sx, '-', :sticky=>:ew)
-
-Tk.root.grid_columnconfig(1, :weight=>1)
-Tk.root.grid_rowconfig(2, :weight=>1)
-
-table.tag_configure('OddRow', :bg=>'orange', :fg=>'purple')
-table.tag_configure('OddCol', :bg=>'brown', :fg=>'pink')
-
-puts "Table is #{table.path}"
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/tktable/debug.rb b/ext/tk/sample/tkextlib/tktable/debug.rb
deleted file mode 100644
index 831b3a1846..0000000000
--- a/ext/tk/sample/tkextlib/tktable/debug.rb
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-##
-## debug.rb
-##
-## This demo uses most features of the table widget
-##
-## ( based on 'debug.tcl' included source archive of tktable extension )
-##
-require 'tk'
-require 'tkextlib/tktable'
-
-# create the table
-ary  = TkVariable.new_hash
-rows = 25
-cols = 20
-
-# fill table variable
-((-(rows))..rows).each{|x|
-  ((-(cols))..cols).each{|y|
-    ary[x,y] = "r#{x},c#{y}"
-  }
-}
-
-lbl = TkLabel.new(:text=>"TkTable v2 Example")
-
-table = Tk::TkTable.new(:rows=>rows, :cols=>cols, :variable=>ary,
-                        :width=>6, :height=>6,
-                        :titlerows=>1, :titlecols=>2,
-                        :roworigin=>-5, :colorigin=>-2,
-                        :coltagcommand=>proc{|col|
-                          col = Integer(col)
-                          (col>0 && col%2 == 1)? 'OddCol': ''
-                        },
-                        :selectmode=>:extended, :flashmode=>true,
-                        :rowstretch=>:unset, :colstretch=>:unset,
-                        :selecttitles=>false, :drawmode=>:single)
-
-sx = table.xscrollbar(TkScrollbar.new)
-sy = table.yscrollbar(TkScrollbar.new)
-
-btn = TkButton.new(:text=>'Exit', :command=>proc{exit})
-
-Tk.grid(lbl, '-', :sticky=>:ew)
-Tk.grid(table, sy, :sticky=>:news)
-Tk.grid(sx, :sticky=>:ew)
-Tk.grid(btn, :sticky=>:ew, :columnspan=>2)
-
-Tk.root.grid_columnconfig(0, :weight=>1)
-Tk.root.grid_rowconfig(1, :weight=>1)
-
-table.tag_configure('OddCol', :bg=>'brown', :fg=>'pink')
-table.tag_configure('title',  :bg=>'red',   :fg=>'green', :relief=>:sunken)
-table.tag_configure('dis',    :state=>:disabled)
-
-first = table[:colorigin]
-%w(n s e w nw ne sw se c).each_with_index{|anchor, idx|
-  table.tag_configure(anchor, :anchor=>anchor)
-  table.tag_row(anchor, idx)
-  table.set([idx,first], anchor)
-}
-courier = TkFont.new(:family=>'Courier', :size=>10)
-table.tag_configure('s', :font=>courier, :justify=>:center)
-
-logo = TkPhotoImage.new(:file=>File.join(File.dirname(File.expand_path(__FILE__)), 'tcllogo.gif'))
-table.tag_configure('logo', :image=>logo, :showtext=>true)
-table.tag_cell('logo', [1,2], [2,3], [4,1])
-table.tag_cell('dis', [2,1], [1,-1], [3,0])
-table.set_width([-2,8], [-1,9], [0, 12], [4, 14])
-
-table.set([1,1], "multi-line\ntext\nmight be\ninteresting",
-          [3,2], "more\nmulti-line\nplaying\n",
-          [2,2], "null\0byte")
-
-# This is in the row span
-l = TkLabel.new(table, :text=>'Window s', :bg=>'yellow')
-table.window_configure([6,0], :sticky=>:s, :window=>l)
-
-# This is in the row titles
-l = TkLabel.new(table, :text=>'Window ne', :bg=>'yellow')
-table.window_configure([4,-1], :sticky=>:ne, :window=>l)
-
-# This will get swallowed by a span
-l = TkLabel.new(table, :text=>'Window ew', :bg=>'yellow')
-table.window_configure([5,3], :sticky=>:ew, :window=>l)
-
-# This is in the col titles
-l = TkLabel.new(table, :text=>'Window news', :bg=>'yellow')
-table.window_configure([-5,1], :sticky=>:news, :window=>l)
-
-l = TkLabel.new(table.winfo_parent, :text=>'Sibling l', :bg=>'orange')
-table.window_configure([5,1], :sticky=>:news, :window=>l)
-
-if table.span_list.empty?
-  table.set_spans([-1,-2], [0,3], [1,2], [0,5], [3,2], [2,2], [6,0], [4,0])
-end
-
-puts "Table is #{table.path} with array #{(table['variable'])}"
-
-# table.postscript(:file=>'out.ps', :first=>:origin, :last=>[2,2])
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/tktable/dynarows.rb b/ext/tk/sample/tkextlib/tktable/dynarows.rb
deleted file mode 100644
index ae3349daba..0000000000
--- a/ext/tk/sample/tkextlib/tktable/dynarows.rb
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-##
-## dynarows.rb
-##
-## This demos shows the use of the validation mechanism of the table
-## and uses the table's cache (no -command or -variable) with a cute
-## dynamic row routine.
-##
-## ( based on 'dynarows.tcl' included source archive of tktable extension )
-##
-require 'tk'
-require 'tkextlib/tktable'
-
-def table_validate(w, idx)
-  return unless idx =~ /^(\d+),(\d+)$/
-  row = Integer($1)
-  col = Integer($2)
-  val = w.get(idx)
-
- [w, idx]
-  nrows = w[:rows]
-  return if row == nrows - 1 && val == ''
-
-  begin
-    time = Tk.tk_call('clock', 'scan', val)
-    date = []
-    Tk.tk_call('clock', 'format', time,
-               :format=>'%m %d %Y').split(' ').each{|item|
-      date << item.sub(/^\s*0*/,'')
-    }
-    w.set(idx, date.join('/'))
-    if row == nrows - 1
-      if w.get([row,1]) != '' && w.get([row,2]) != ''
-        w.tag_row_reset(row)
-        w.set([row,0], row)
-        nrows += 1
-        row += 1
-        w.configure(:rows=>nrows)
-        w.tag_row('unset', row)
-        w.set([row,0], '*')
-        w.see([row,1])
-        w.activate([row,1])
-      end
-    end
-  rescue
-    Tk.bell
-    w.activate(idx)
-    w.selection_clear_all
-    w.selection_set(:active)
-    w.see(:active)
-  end
-end
-
-
-lbl = TkLabel.new(:text=>"Dynamic Date Validated Rows")
-
-table = Tk::TkTable.new(:rows=>2, :cols=>3, :cache=>1, :selecttype=>:row,
-                        :titlerows=>1, :titlecols=>1, :height=>5,
-                        :colstretch=>:unset, :rowstretch=>:unset,
-                        :autoclear=>true,
-                        :browsecommand=>[
-                          proc{|w,s| table_validate(w, s)},
-                          '%W %s'
-                        ])
-table.set([0,1], 'Begin', [0,2], 'End', [1,0], '*')
-table.tag_configure('unset', :fg=>'#008811')
-table.tag_configure('title', :fg=>'red')
-table.tag_row('unset', 1)
-table.set_width(0,3)
-
-sx = table.xscrollbar(TkScrollbar.new)
-sy = table.yscrollbar(TkScrollbar.new)
-
-Tk.grid(lbl, '-', :sticky=>:ew)
-Tk.grid(table, sy, :sticky=>:news)
-Tk.grid(sx, :sticky=>:ew)
-
-Tk.root.grid_columnconfig(0, :weight=>1)
-Tk.root.grid_rowconfig(1, :weight=>1)
-
-rtn_proc = proc{|w|
-  r = w.row_index(:active)
-  c = w.col_index(:active)
-
-  if c == 2
-    r += 1
-    w.activate([r,1])
-  else
-    c += 1
-    w.activate([r,c])
-  end
-  w.see(:active)
-  Tk.callback_break
-}
-
-table.bind('Return', rtn_proc, '%W')
-table.bind('KP_Enter', rtn_proc, '%W')
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/tktable/maxsize.rb b/ext/tk/sample/tkextlib/tktable/maxsize.rb
deleted file mode 100644
index 51aa619126..0000000000
--- a/ext/tk/sample/tkextlib/tktable/maxsize.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-##
-## maxsize.rb
-##
-## This demo uses a really big table.  The big startup time is in
-## filling the table's Tcl array var.
-##
-## ( based on 'maxsize.tcl' included source archive of tktable extension )
-##
-require 'tk'
-require 'tkextlib/tktable'
-
-ary  = TkVariable.new_hash
-rows = 40000
-cols = 10
-
-# fill table variable
-((-(rows))..rows).each{|x|
-  ((-(cols))..cols).each{|y|
-    ary[x,y] = "#{x},#{y}"
-  }
-}
-
-lbl = TkLabel.new(:text=>"TkTable v2 Example")
-
-table = Tk::TkTable.new(:rows=>rows, :cols=>cols, :variable=>ary,
-                        :width=>6, :height=>8,
-                        :titlerows=>1, :titlecols=>1,
-                        :coltagcommand=>proc{|col|
-                          col = Integer(col)
-                          (col>0 && col%2 == 1)? 'OddCol': ''
-                        },
-                        :selectmode=>:extended,
-                        :colstretch=>:unset, :rowstretch=>:unset,
-                        :selecttitles=>false, :drawmode=>:slow)
-
-sx = table.xscrollbar(TkScrollbar.new)
-sy = table.yscrollbar(TkScrollbar.new)
-
-btn = TkButton.new(:text=>'Exit', :command=>proc{exit})
-
-Tk.grid(lbl, '-', :sticky=>:ew)
-Tk.grid(table, sy, :sticky=>:news)
-Tk.grid(sx, :sticky=>:ew)
-Tk.grid(btn, :sticky=>:ew, :columnspan=>2)
-
-Tk.root.grid_columnconfig(0, :weight=>1)
-Tk.root.grid_rowconfig(1, :weight=>1)
-
-table.tag_configure('OddCol', :bg=>'brown', :fg=>'pink')
-table.tag_configure('title',  :bg=>'red',   :fg=>'blue', :relief=>:sunken)
-table.tag_configure('dis',    :state=>:disabled)
-
-first = table[:colorigin]
-%w(n s e w nw ne sw se c).each_with_index{|anchor, idx|
-  table.tag_configure(anchor, :anchor=>anchor)
-  table.tag_row(anchor, idx)
-  table.set([idx,first], anchor)
-}
-courier = TkFont.new(:family=>'Courier', :size=>10)
-table.tag_configure('s', :font=>courier, :justify=>:center)
-
-table.set_width([-2, 8], [-1, 9], [0, 12], [4, 14])
-
-puts "Table is #{table.path} with array #{(table['variable'])}"
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/tktable/spreadsheet.rb b/ext/tk/sample/tkextlib/tktable/spreadsheet.rb
deleted file mode 100644
index a801045d41..0000000000
--- a/ext/tk/sample/tkextlib/tktable/spreadsheet.rb
+++ /dev/null
@@ -1,138 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-##
-## spreadsheet.rb
-##
-## This demos shows how you can simulate a 3D table
-## and has other basic features to begin a basic spreadsheet
-##
-## ( based on 'spreadsheet.tcl' included source archive of tktable extension )
-##
-require 'tk'
-require 'tkextlib/tktable'
-
-rows = 10
-cols = 10
-cur_var = TkVariable.new
-table_list = Hash.new{|hash, key| hash[key] = TkVariable.new_hash}
-page = TkVariable.new('AA')
-color = Hash.new('pink')
-color['AA'] = 'orange'
-color['BB'] = 'blue'
-color['CC'] = 'green'
-
-def colorize(num)
-  num = Integer(num)
-  return 'colored' if (num > 0 && num % 2 == 1)
-end
-
-def fill_table(tbl_list, page, r=10, c=10)
-  ary = tbl_list[page]
-
-  (0...r).each{|i|
-    (0...c).each{|j|
-      if i!=0 && j!=0
-        ary[i,j] = "#{page} #{i},#{j}"
-      elsif i!=0
-        ary[i,j] = i.to_s
-      else
-        ary[i,j] = (64+j).chr
-      end
-    }
-  }
-end
-
-def changepage(tbl_list, tbl, ent, col, var, elem, op)
-  if elem != ''
-    page = var[elem]
-  else
-    page = var.value
-  end
-  if tbl[:variable] != tbl_list[page].id
-    tbl.selection_clear_all
-    tbl.variable(tbl_list[page])
-    ent.textvariable(tbl_list[page].ref('active'))
-    tbl.activate('origin')
-    tbl.tag_configure('colored', :bg=>col[page])
-    tbl.see('active')
-  end
-end
-
-lbl = TkLabel.new(:text=>"TkTable v1 Spreadsheet Example")
-
-current = TkLabel.new(:textvariable=>cur_var, :width=>5)
-entry = TkEntry.new(:textvariable=>table_list[page.value].ref('active'))
-lpage = TkLabel.new(:text=>'PAGE:', :width=>6, :anchor=>:e)
-optmenu = TkOptionMenubutton.new(page, *(%w(AA BB CC DD)))
-
-fill_table(table_list, page.value)
-fill_table(table_list, 'BB', Integer(rows/2), Integer(cols/2))
-
-table = Tk::TkTable.new(:rows=>rows, :cols=>cols, :width=>5, :height=>5,
-                        :variable=>table_list[page.value],
-                        :titlerows=>1, :titlecols=>1,
-                        :coltagcommand=>proc{|n| colorize(n)},
-                        :flashmode=>true, :selectmode=>:extended,
-                        :colstretch=>:unset, :rowstretch=>:unset,
-                        :browsecommand=>proc{|e| cur_var.value = e.new_index})
-
-page.trace(:w, proc{|var, elem, op|
-             changepage(table_list, table, entry, color, var, elem, op)
-           })
-
-table.tag_configure('colored', :bg=>color[page.value])
-table.tag_configure('title',   :fg=>'red', :relief=>:groove)
-table.tag_configure('blue',    :bg=>'blue')
-table.tag_configure('green',   :bg=>'green')
-
-table.tag_cell('green', [6,3], [5,7], [4,9])
-table.tag_cell('blue', [8,8])
-table.tag_row('blue', 7)
-table.tag_col('blue', 6, 8)
-table.set_width([0, 3], [2, 7])
-
-sx = table.xscrollbar(TkScrollbar.new)
-sy = table.yscrollbar(TkScrollbar.new)
-
-btn = TkButton.new(:text=>'Exit', :command=>proc{exit})
-
-Tk.grid(lbl, '-', '-', '-', '-', :sticky=>:ew)
-Tk.grid(current, entry, lpage, optmenu, '-', :sticky=>:ew)
-Tk.grid(table, '-', '-', '-', sy, :sticky=>:ns)
-Tk.grid(sx, '-', '-', '-', :sticky=>:ew)
-Tk.grid(btn, '-', '-', '-', '-', :sticky=>:ew)
-
-Tk.root.grid_columnconfig(1, :weight=>1)
-Tk.root.grid_rowconfig(2, :weight=>1)
-
-table.grid_configure(:sticky=>:news)
-
-entry.bind('Return', proc{
-             r = table.row_index(:active)
-             c = table.col_index(:active)
-             rmax = table[:rows]
-             cmax = table[:cols]
-
-             c += 1
-             if c == cmax
-               c = table[:titlecols]
-               r += 1
-               if r == rmax
-                 r = table[:titlerows]
-               end
-             end
-             table.activate([r, c])
-             table.see('active')
-           })
-
-menu = TkMenu.new
-m_file = TkMenu.new(menu)
-Tk.root.menu(menu)
-menu.add(:cascade, :label=>'File', :underline=>0, :menu=>m_file)
-m_file.add(:command, :label=>'Fill Array',
-           :command=>proc{ fill_table(table_list, page.value) })
-m_file.add(:command, :label=>'Quit', :command=>proc{exit})
-
-puts "Table is #{table.path} with array #{(table['variable'])}"
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/tktable/tcllogo.gif b/ext/tk/sample/tkextlib/tktable/tcllogo.gif
deleted file mode 100644
index 4603d4ff41..0000000000
--- a/ext/tk/sample/tkextlib/tktable/tcllogo.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/tktable/valid.rb b/ext/tk/sample/tkextlib/tktable/valid.rb
deleted file mode 100644
index f11e511884..0000000000
--- a/ext/tk/sample/tkextlib/tktable/valid.rb
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-##
-## valid.rb
-##
-## This demos shows the use of the validation mechanism of the table
-## and uses the table's cache (no -command or -variable)
-##
-## ( based on 'valid.tcl' included source archive of tktable extension )
-##
-require 'tk'
-require 'tkextlib/tktable'
-
-rows = 10
-cols = 10
-
-def colorize(num)
-  num = Integer(num)
-  return 'colored' if (num > 0 && num % 2 == 1)
-end
-
-def fill_headers(w, r=10, c=10)
-  (1..(r-1)).each{|i| w.set([i,0], i.to_s)}
-
-  (1..(c-1)).each{|j|
-    if j % 3 == 1
-      w.set([0,j], 'AlphaNum')
-    elsif j % 2 == 1
-      w.set([0,j], 'Alpha')
-    elsif j != 0
-      w.set([0,j], 'Real')
-    end
-  }
-end
-
-def validate_proc(c, val)
-  if c % 3 == 1
-    # AlphaNum
-    regexp = /^[A-Za-z0-9 ]*$/
-  elsif c % 2 == 1
-    # Alpha
-    regexp = /^[A-Za-z ]*$/
-  elsif c != 0
-    # 'Real'
-    regexp = /^[-+]?[0-9]*\.?[0-9]*([0-9]\.?e[-+]?[0-9]*)?$/
-  end
-  if val =~ regexp
-    return true
-  else
-    Tk.bell
-    return false
-  end
-end
-
-lbl = TkLabel.new(:text=>"TkTable v1 Validated Table Example")
-
-table = Tk::TkTable.new(:rows=>rows, :cols=>cols, :cache=>1,
-                        :width=>5, :height=>5, :titlerows=>1, :titlecols=>1,
-                        :coltagcommand=>proc{|n| colorize(n)},
-                        :flashmode=>true, :selectmode=>:extended,
-                        :colstretch=>:unset, :rowstretch=>:unset,
-                        :validate=>true,
-                        :validatecommand=>proc{|e|
-                          unless e.widget.tag_include?('title', e.index)
-                            validate_proc(e.column, e.new_value)
-                          end } )
-
-fill_headers(table)
-
-table.tag_configure('colored', :bg=>'lightblue')
-table.tag_configure('title',   :fg=>'red')
-table.set_width(0,3)
-
-sx = table.xscrollbar(TkScrollbar.new)
-sy = table.yscrollbar(TkScrollbar.new)
-
-btn = TkButton.new(:text=>'Exit', :command=>proc{exit})
-
-Tk.grid(lbl, '-', :sticky=>:ew)
-Tk.grid(table, sy, :sticky=>:news)
-Tk.grid(sx, :sticky=>:ew)
-Tk.grid(btn, '-', :sticky=>:ew)
-
-Tk.root.grid_columnconfig(0, :weight=>1)
-Tk.root.grid_rowconfig(1, :weight=>1)
-
-puts "Table is #{table.path}"
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/treectrl/bitmaps.rb b/ext/tk/sample/tkextlib/treectrl/bitmaps.rb
deleted file mode 100644
index a42e7ac541..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/bitmaps.rb
+++ /dev/null
@@ -1,77 +0,0 @@
-# frozen_string_literal: false
-#
-# Demo: Bitmaps
-#
-def demoBitmaps(t)
-  #if $Version_1_1_OrLater
-  if @has_bgimg
-    t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false,
-                :selectmode=>:browse, :orient=>:horizontal, :wrap=>'5 items',
-                :showheader=>false, :backgroundimage=>@images['sky'])
-  else
-    t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false,
-                :selectmode=>:browse, :orient=>:horizontal, :wrap=>'5 items',
-                :showheader=>false)
-  end
-
-  if $HasColumnCreate
-    t.column_create(:itembackground=>['gray90', []])
-  else
-    t.column_configure(0, :itembackground=>['gray90', []])
-  end
-
-  t.element_create('elemTxt', :text,
-                   :fill=>[@SystemHighlightText, ['selected', 'focus']])
-  t.element_create('elemSelTxt', :rect, :showfocus=>true,
-                   :fill=>[@SystemHighlight, ['selected', 'focus']])
-  t.element_create('elemSelBmp', :rect, :outlinewidth=>4,
-                   :outline=>[@SystemHighlight, ['selected', 'focus']])
-  t.element_create('elemBmp', :bitmap,
-                   :foreground=>[@SystemHighlight, ['selected', 'focus']],
-                   :background=>'linen',
-                   :bitmap=>['question' ['selected']])
-
-  s = t.style_create('STYLE', :orient=>:vertical)
-  t.style_elements(s, ['elemSelBmp', 'elemBmp', 'elemSelTxt', 'elemTxt'])
-  t.style_layout(s, 'elemSelBmp', :union=>'elemBmp', :ipadx=>6, :ipady=>6)
-  t.style_layout(s, 'elemBmp',    :pady=>[0, 6], :expand=>:we)
-  t.style_layout(s, 'elemSelTxt', :union=>'elemTxt', :ipadx=>2)
-  t.style_layout(s, 'elemTxt',    :expand=>:we)
-
-  # Set default item style
-  if $Version_1_1_OrLater
-    t.defaultstyle = [s]
-  end
-
-  bitmap_names = %w(error gray75 gray50 gray25 gray12
-                    hourglass info questhead question warning)
-
-  bitmap_names.each{|name|
-    i = t.item_create
-    unless $Version_1_1_OrLater
-      t.item_style_set(i, 0, s)
-    end
-    t.item_text(i, 0, name)
-    t.item_element_configure(i, 0, 'elemBmp', :bitmap=>name)
-    t.item_lastchild(:root, i)
-  }
-
-  bitmap_names.each{|name|
-    i = t.item_create
-    t.item_style_set(i, 0, s)
-    t.item_text(i, 0, name)
-    if true
-      t.item_element_configure(i, 0, 'elemBmp', :bitmap=>name,
-                               :foreground=>['brown', ''],
-                               :background=>['', ''])
-    else
-      t.item_element_configure(i, 0, 'elemBmp', :bitmap=>name,
-                               :foreground=>[
-                                 @SystemHighlight, ['selected', 'focus'],
-                                 'brown', []
-                               ],
-                               :background=>['', []])
-    end
-    t.item_lastchild(:root, i)
-  }
-end
diff --git a/ext/tk/sample/tkextlib/treectrl/demo.rb b/ext/tk/sample/tkextlib/treectrl/demo.rb
deleted file mode 100644
index cd277cf2a9..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/demo.rb
+++ /dev/null
@@ -1,1306 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-
-require 'tk'
-require 'tkextlib/treectrl'
-
-$ScriptDir = File.dirname(File.expand_path(__FILE__))
-
-$HasColumnCreate = Tk::TreeCtrl::HasColumnCreateCommand
-
-$Version_1_1_OrLater = (TkPackage.vcompare(Tk::TreeCtrl.package_version, '1.1') >= 0)
-
-#if Hash.instance_methods.include?(:key)
-if TkCore::WITH_RUBY_VM  ### Ruby 1.9 !!!!
-  # ruby 1.9.x --> use Hash#key
-  # Because Hash#index show warning "Hash#index is deprecated; use Hash#key".
-else
-  # ruby 1.8.x --> use Hash#index
-  class Hash
-    alias key index
-  end
-end
-
-class TkTreeCtrl_demo
-  def initialize(dir)
-    @ScriptDir = dir || '.'
-
-    @thisPlatform = Tk::PLATFORM['platform']
-    if @thisPlatform == 'unix' && Tk.windowingsystem == 'aqua'
-      @thisPlatform = 'macosx'
-    end
-
-    @RandomN = [500]
-
-    @images = Hash.new
-    @sel_images = Hash.new
-
-    @popup = Hash.new
-    @mTree = Hash.new
-    @mHeader = Hash.new
-
-    @non_clear_list = []
-
-    @demoCmd = Hash.new
-    @demoFile = Hash.new
-
-    # Get default colors
-    w = TkListbox.new
-    @SystemButtonFace    = w[:highlightbackground]
-    @SystemHighlight     = w[:selectbackground]
-    @SystemHighlightText = w[:selectforeground]
-    w.destroy
-
-    ####################
-
-    make_source_window()
-    make_menubar()
-    make_main_window()
-
-    if $Version_1_1_OrLater
-      begin
-        @tree2[:backgroundimage]
-        @has_bgimg = true
-      rescue
-        @has_bgimg = false
-      end
-    else
-      @has_bgimg = false
-    end
-
-    ####################
-
-    make_list_popup()
-    make_header_popup()
-
-    init_pics('sky')
-
-    ####################
-
-    @tree2.bind('ButtonPress-3',
-                proc{|w, x, y, rootx, rooty|
-                  show_list_popup(w, x, y, rootx, rooty)
-                }, '%W %x %y %X %Y')
-
-    # Allow "scan" bindings
-    if @thisPlatform == 'windows'
-      @tree2.bind_remove('Control-ButtonPress-3')
-    end
-
-    ####################
-
-    init_demo_scripts_module()
-    load_demo_scripts()
-    init_demo_list()
-
-    ####################
-
-    @tree1.notify_bind(@tree1, 'Selection',
-                       proc{|c, t|
-                         if c == 1
-                           item = t.selection_get[0]
-                           demo_set(@demoCmd[item], @demoFile[item])
-                         end
-                       }, '%c %T')
-
-    # When one item is selected in the demo list, display the styles in
-    # that item.
-    # See DemoClear for why the tag "DontDelete" is used
-    @tree2.notify_bind('DontDelete', 'Selection',
-                       proc{|c, t|
-                         display_styles_in_item(t.selection_get[0]) if c == 1
-                       }, '%c %T')
-  end
-
-  ##########################
-
-  def init_pics(*args)
-    args.each{|pat|
-      unless TkImage.names.find{|img| (name = @images.key(img)) && File.fnmatch(pat, name)}
-        Dir.glob(File.join(@ScriptDir, 'pics', "#{pat}.gif")).each{|file|
-          name = File.basename(file, '.gif')
-          img = TkPhotoImage.new(:file=>file)
-          @images[name] = img
-          @sel_images[name] = TkPhotoImage.new
-          @sel_images[name].copy(img)
-          Tk::TreeCtrl.image_tint(@sel_images[name], @SystemHighlight, 128)
-        }
-      end
-    }
-  end
-
-  ##########################
-
-  private
-
-  def make_menubar
-    menuspec = [
-      [['File']]
-    ]
-    if Tk::PLATFORM['platform'] != 'unix'
-      TkConsole.create
-      TkConsole.eval('.console conf -height 8')
-      menuspec[0] << ['Console', proc{
-          if TkComm.bool(TkConsole.eval('winfo ismapped .'))
-            TkConsole.hide
-          else
-            TkConsole.show
-          end
-        }]
-    end
-    menuspec[0] << ['View Source', proc{toggle_source_window()}]
-    menuspec[0] << ['Quit', proc{exit}]
-    Tk.root.add_menubar(menuspec)
-  end
-
-  def make_source_window
-    @src_top = TkToplevel.new
-    f = TkFrame.new(@src_top, :borderwidth=>0)
-    case @thisPlatform
-    when 'unix'
-      font = TkFont.new(['Courier', -12])
-    else
-      font = TkFont.new(['Courier', 9])
-    end
-
-    @src_txt = TkText.new(f, :font=>font, :tabs=>font.measure('1234'),
-                          :wrap=>:none)
-    xscr = @src_txt.xscrollbar(TkScrollbar.new(f))
-    yscr = @src_txt.yscrollbar(TkScrollbar.new(f))
-
-    f.pack(:expand=>true, :fill=>:both)
-    f.grid_columnconfigure(0, :weight=>1)
-    f.grid_rowconfigure(0, :weight=>1)
-    @src_txt.grid(:row=>0, :column=>0, :sticky=>:news)
-    xscr.grid(:row=>1, :column=>0, :sticky=>:we)
-    yscr.grid(:row=>0, :column=>1, :sticky=>:ns)
-
-    @src_top.protocol('WM_DELETE_WINDOW', proc{@src_top.withdraw})
-    @src_top.geometry('-0+0')
-    @src_top.withdraw
-  end
-
-  def show_source(file)
-    @src_top.title("Demo Source: #{file}")
-    @src_txt.value = IO.read(File.join(@ScriptDir, file))
-    @src_txt.set_insert('1.0')
-  end
-
-  def toggle_source_window
-    if @src_top.winfo_mapped?
-      @src_top.withdraw
-    else
-      @src_top.deiconify
-    end
-  end
-
-  def tree_plus_scrollbars_in_a_frame(parent, h, v)
-    f = TkFrame.new(parent, :borderwidth=>1, :relief=>:sunken)
-    case @thisPlatform
-    when 'unix'
-      font = TkFont.new(['Helvetica', -12])
-    else
-      # There is a bug on my Win98 box with Tk_MeasureChars() and
-      # MS Sans Serif 8.
-      font = TkFont.new(['MS Sans', 8])
-    end
-
-    tree = Tk::TreeCtrl.new(f, :highlightthickness=>0,
-                            :borderwidth=>0, :font=>font)
-    tree[:xscrollincrement] = 20
-    tree.debug_configure(:enable=>false, :display=>false)
-
-    if h
-      h_scr = TkScrollbar.new(f, :orient=>:horizontal,
-                              :command=>proc{|*args| tree.xview(*args)})
-      tree.notify_bind(h_scr, 'Scroll-x',
-                       proc{|w, l, u| w.set(l, u)}, '%W %l %u')
-      h_scr.bind('ButtonPress-1', proc{tree.set_focus})
-    end
-
-    if v
-      v_scr = TkScrollbar.new(f, :orient=>:vertical,
-                              :command=>proc{|*args| tree.yview(*args)})
-      tree.notify_bind(v_scr, 'Scroll-y',
-                       proc{|w, l, u| w.set(l, u)}, '%W %l %u')
-      v_scr.bind('ButtonPress-1', proc{tree.set_focus})
-    end
-
-    f.grid_columnconfigure(0, :weight=>1)
-    f.grid_rowconfigure(0, :weight=>1)
-    tree.grid(:row=>0, :column=>0, :sticky=>:news)
-    h_scr.grid(:row=>1, :column=>0, :sticky=>:we) if h
-    v_scr.grid(:row=>0, :column=>1, :sticky=>:ns) if v
-
-    [f, tree]
-  end
-
-  def make_main_window
-    Tk.root.title('Tk::TreeCtrl Demo')
-
-    case @thisPlatform
-    when 'macosx'
-      Tk.root.geometry('+40+40')
-    else
-      Tk.root.geometry('+0+30')
-    end
-
-    pane1 = TkPanedWindow.new(:orient=>:vertical, :borderwidth=>0)
-    pane2 = TkPanedWindow.new(:orient=>:horizontal, :borderwidth=>0)
-
-    # Tree + scrollbar: demos
-    f1, @tree1 = tree_plus_scrollbars_in_a_frame(nil, false, true)
-    @tree1.configure(:showbuttons=>false, :showlines=>:false,
-                    :showroot=>false, :height=>100)
-    if $HasColumnCreate
-      @tree1.column_create(:text=>'List of Demos',
-                           :expand=>true, :button=>false)
-    else
-      @tree1.column_configure(0, :text=>'List of Demos',
-                              :expand=>true, :button=>false)
-    end
-
-    # Tree + scrollbar: styles + elements in list
-    f4, @tree4 = tree_plus_scrollbars_in_a_frame(nil, false, true)
-    @tree4.configure(:showroot=>false, :height=>140)
-    if $HasColumnCreate
-      @tree4.column_create(:text=>'Elements and Styles',
-                           :expand=>true, :button=>false)
-    else
-      @tree4.column_configure(0, :text=>'Elements and Styles',
-                              :expand=>true, :button=>false)
-    end
-
-    # Tree + scrollbar: styles + elements in selected item
-    f3, @tree3 = tree_plus_scrollbars_in_a_frame(nil, false, true)
-    @tree3.configure(:showroot=>false)
-    if $HasColumnCreate
-      @tree3.column_create(:text=>'Styles in Item',
-                           :expand=>true, :button=>false)
-    else
-      @tree3.column_configure(0, :text=>'Styles in Item',
-                              :expand=>true, :button=>false)
-    end
-
-    pane1.add(f1, f4, f3, :height=>150)
-    pane1.pack(:expand=>true, :fill=>:both)
-
-    # Frame on right
-    f2_base = TkFrame.new
-
-    # Tree + scrollbars
-    f2, @tree2 = tree_plus_scrollbars_in_a_frame(f2_base, true, true)
-    @tree2.configure(:indent=>19)
-    @tree2.debug_configure(:enable=>false, :display=>true,
-                           :erasecolor=>'pink', :displaydelay=>30)
-
-    # Give it a big border to debug drawing
-    @tree2.configure(:borderwidth=>6, :relief=>:ridge, :highlightthickness=>3)
-
-    f2_base.grid_columnconfigure(0, :weight=>1)
-    f2_base.grid_rowconfigure(0, :weight=>1)
-    f2.grid(:row=>0, :column=>0, :sticky=>:news, :pady=>0)
-
-    pane2.add(pane1, :width=>200)
-    pane2.add(f2_base, :width=>450)
-
-    pane2.pack(:expand=>true, :fill=>:both)
-
-    ###
-    # A treectrl widget can generate the following built-in events:
-    # <ActiveItem> called when the active item changes
-    # <Collapse-before> called before an item is closed
-    # <Collapse-after> called after an item is closed
-    # <Expand-before> called before an item is opened
-    # <Expand-after> called after an item is opened
-    # <Selection> called when items are added to or removed from the selection
-    # <Scroll-x> called when horizontal scroll position changes
-    # <Scroll-y> called when vertical scroll position changes
-    #
-    # The application programmer can define custom events to be
-    # generated by the "T notify generate" command. The following events
-    # are generated by the example bindings.
-
-    @tree2.notify_install_event('Header')
-    @tree2.notify_install_detail('Header', 'invoke')
-
-    @tree2.notify_install_event('Drag')
-    @tree2.notify_install_detail('Drag', 'begin')
-    @tree2.notify_install_detail('Drag', 'end')
-    @tree2.notify_install_detail('Drag', 'receive')
-
-    @tree2.notify_install_event('Edit')
-    @tree2.notify_install_detail('Edit', 'accept')
-  end
-
-  def make_list_popup
-    @popup[:bgimg] = TkVariable.new
-    @popup[:bgmode] = TkVariable.new
-    @popup[:debug] = Hash.new{|h, k| h[k] = TkVariable.new}
-    @popup[:doublebuffer] = TkVariable.new
-    @popup[:linestyle] = TkVariable.new
-    @popup[:orient] = TkVariable.new
-    @popup[:selectmode] = TkVariable.new
-    @popup[:show] = Hash.new{|h, k| h[k] = TkVariable.new}
-
-    menuspec = [
-      [ 'Collapse', [], nil, '', {:menu_config=>{:tearoff=>false}} ],
-
-      [ 'Expand',   [], nil, '', {:menu_config=>{:tearoff=>false}} ]
-    ]
-
-    # if $Version_1_1_OrLater
-    if @has_bgimg
-      menuspec << \
-      [ 'Background Image',
-        [
-          [ 'none', [@popup[:bgimg], 'none'], nil, '',
-            {:command=>proc{@tree2.backgroundimage = ''}} ],
-          [ 'sky',  [@popup[:bgimg], 'sky'],  nil, '',
-            {:command=>proc{
-                @tree2.backgroundimage = @images[@popup[:bgimg].value]}} ]
-        ],
-        nil, '', {:menu_config=>{:tearoff=>false}}
-      ]
-    end
-
-    menuspec.concat([
-      [ 'Background Mode',
-        %w(column index row visindex).collect{|val|
-          [ val, [@popup[:bgmode], val] , nil, '',
-            {:command=>proc{@tree2.backgroundmode = @popup[:bgmode].value}} ]
-        },
-        nil, '', {:menu_config=>{:tearoff=>false}}
-      ],
-
-      [ 'Debug',
-        [
-          [ 'Data',    @popup[:debug][:data],    nil, '',
-            {:command=>proc{
-                @tree2.debug_configure(:data=>@popup[:debug][:data].value)
-              }
-            } ],
-          [ 'Display', @popup[:debug][:display], nil, '',
-            {:command=>proc{
-                @tree2.debug_configure(:display=>@popup[:debug][:display].value)
-              }
-            } ],
-          [ 'Enable',  @popup[:debug][:enable],  nil, '',
-            {:command=>proc{
-                @tree2.debug_configure(:enable=>@popup[:debug][:enable].value)
-              }
-            } ]
-        ],
-        nil, '', {:menu_config=>{:tearoff=>false}}
-      ],
-
-      [ 'Buffering',
-        [
-          [ 'none',   [@popup[:doublebuffer], 'none'],   nil, '',
-            {:command=>proc{
-                @tree2.doublebuffer = @popup[:doublebuffer].value
-              }
-            } ],
-          [ 'item',   [@popup[:doublebuffer], 'item'],   nil, '',
-            {:command=>proc{
-                @tree2.doublebuffer = @popup[:doublebuffer].value
-              }
-            } ],
-          [ 'window', [@popup[:doublebuffer], 'window'], nil, '',
-            {:command=>proc{
-                @tree2.doublebuffer = @popup[:doublebuffer].value
-              }
-            } ]
-        ],
-        nil, '', {:menu_config=>{:tearoff=>false}}
-      ],
-
-      [ 'Line style',
-        [
-          [ 'dot',   [@popup[:linestyle], 'dot'],   nil, '',
-            {:command=>proc{@tree2.linestyle = @popup[:linestyle].value}} ],
-          [ 'solid', [@popup[:linestyle], 'solid'], nil, '',
-            {:command=>proc{@tree2.linestyle = @popup[:linestyle].value}} ]
-        ],
-        nil, '', {:menu_config=>{:tearoff=>false}}
-      ],
-
-      [ 'Orient',
-        [
-          [ 'Horizontal', [@popup[:orient], 'horizontal'], nil, '',
-            {:command=>proc{@tree2.orient = @popup[:orient].value}} ],
-          [ 'Vertical',   [@popup[:orient], 'vertical'],   nil, '',
-            {:command=>proc{@tree2.orient = @popup[:orient].value}} ]
-        ],
-        nil, '', {:menu_config=>{:tearoff=>false}}
-      ],
-
-      [ 'Selectmode',
-        %w(list browse extended multiple single).collect{|val|
-          [ val, [@popup[:selectmode], val] , nil, '',
-            {:command=>proc{@tree2.selectmode = @popup[:selectmode].value}} ]
-        },
-        nil, '', {:menu_config=>{:tearoff=>false}}
-      ],
-
-      [ 'Show',
-        [
-          [ 'Buttons', @popup[:show][:buttons], nil, '',
-            {:command=>proc{
-                @tree2.showbuttons = @popup[:show][:buttons].value
-              }
-            } ],
-          [ 'Header', @popup[:show][:header], nil, '',
-            {:command=>proc{
-                @tree2.showheader = @popup[:show][:header].value
-              }
-            } ],
-          [ 'Lines', @popup[:show][:lines], nil, '',
-            {:command=>proc{
-                @tree2.showlines = @popup[:show][:lines].value
-              }
-            } ],
-          [ 'Root', @popup[:show][:root], nil, '',
-            {:command=>proc{
-                @tree2.showroot = @popup[:show][:root].value
-              }
-            } ],
-          [ 'Root Button', @popup[:show][:rootbutton], nil, '',
-            {:command=>proc{
-                @tree2.showrootbutton = @popup[:show][:rootbutton].value
-              }
-            } ]
-        ],
-        nil, '', {:menu_config=>{:tearoff=>false}}
-      ],
-
-      [ 'Visible', [], nil, '', {:menu_config=>{:tearoff=>false}} ]
-    ])
-
-    m = TkMenu.new_menuspec(menuspec, @tree2, false)
-    @non_clear_list << m
-    @mTree[@tree2] = m
-  end
-
-  def show_list_popup(w, x, y, rootx, rooty)
-    id = w.identify(x, y)
-    unless id.empty?
-      if id[0] == 'header'
-        col = id[1]
-        @popup[:column].value = col
-        @popup[:arrow].value = w.column_cget(col, :arrow)
-        @popup[:arrowside].value = w.column_cget(col, :arrowside)
-        @popup[:arrowgravity].value = w.column_cget(col, :arrowgravity)
-        @popup[:expand].value = w.column_cget(col, :expand)
-        @popup[:squeeze].value = w.column_cget(col, :squeeze)
-        @popup[:justify].value = w.column_cget(col, :justify)
-        @mHeader[w].popup(rootx, rooty)
-        return
-      end
-    end
-
-    m = @mTree[w].entrycget('Collapse', :menu)
-    m.delete(0, :end)
-    if $Version_1_1_OrLater
-      m.add_command(:label=>'All', :command=>proc{w.item_collapse(:all)})
-    else
-      m.add_command(:label=>'All', :command=>proc{w.collapse(:all)})
-    end
-    unless id.empty?
-      if id[0] == 'item'
-        item = id[1]
-        if $Version_1_1_OrLater
-          m.add_command(:label=>"Item #{item}",
-                        :command=>proc{w.item_collapse(item)})
-          m.add_command(:label=>"Item #{item} (recurse)",
-                        :command=>proc{w.item_collapse_recurse(item)})
-        else
-          m.add_command(:label=>"Item #{item}",
-                        :command=>proc{w.collapse(item)})
-          m.add_command(:label=>"Item #{item} (recurse)",
-                        :command=>proc{w.collapse_recurse(item)})
-        end
-      end
-    end
-
-    m = @mTree[w].entrycget('Expand', :menu)
-    m.delete(0, :end)
-    if $Version_1_1_OrLater
-      m.add_command(:label=>'All', :command=>proc{w.item_expand(:all)})
-    else
-      m.add_command(:label=>'All', :command=>proc{w.expand(:all)})
-    end
-    unless id.empty?
-      if id[0] == 'item'
-        item = id[1]
-        if $Version_1_1_OrLater
-          m.add_command(:label=>"Item #{item}",
-                        :command=>proc{w.item_expand(item)})
-          m.add_command(:label=>"Item #{item} (recurse)",
-                        :command=>proc{w.item_expand_recurse(item)})
-        else
-          m.add_command(:label=>"Item #{item}",
-                        :command=>proc{w.expand(item)})
-          m.add_command(:label=>"Item #{item} (recurse)",
-                        :command=>proc{w.expand_recurse(item)})
-        end
-      end
-    end
-
-    [:data, :display, :enable].each{|k|
-      @popup[:debug][k].value = w.debug_cget(k)
-    }
-    # if $Version_1_1_OrLater
-    if @has_bgimg
-      @popup[:bgimg].value = @images.key(w[:backgroundimage])
-    end
-    @popup[:bgmode].value = w[:backgroundmode]
-    @popup[:doublebuffer].value = w[:doublebuffer]
-    @popup[:linestyle].value = w[:linestyle]
-    @popup[:orient].value = w[:orient]
-    @popup[:selectmode].value = w[:selectmode]
-    @popup[:show][:buttons].value = w[:showbuttons]
-    @popup[:show][:header].value = w[:showheader]
-    @popup[:show][:lines].value = w[:showlines]
-    @popup[:show][:root].value = w[:showroot]
-    @popup[:show][:rootbutton].value = w[:showrootbutton]
-
-    m = @mTree[w].entrycget('Visible', :menu)
-    m.delete(0, :end)
-    @popup[:visible] = []
-    (0...(w.numcolumns)).each{|i|
-      @popup[:visible][i] = TkVariable.new(w.column_cget(i, :visible))
-      txt = w.column_cget(i, :text)
-      img_name = w.column_cget(i, :image)
-      img_name = @images.key(img_name) if img_name.kind_of?(TkImage)
-      m.add_checkbutton(:variable=>@popup[:visible][i],
-                        :label=>"Column #{i} \"#{txt}\" [#{img_name}]",
-                        :command=>proc{w.column_configure(i, :visible=>@popup[:visible][i].value)})
-    }
-
-    @mTree[w].popup(rootx, rooty)
-  end
-
-  def make_header_popup
-    @popup[:column] = TkVariable.new unless @popup[:column]
-    @popup[:arrow] = TkVariable.new
-    @popup[:arrowside] = TkVariable.new
-    @popup[:arrowgravity] = TkVariable.new
-    @popup[:expand] = TkVariable.new
-    @popup[:squeeze] = TkVariable.new
-    @popup[:justify] = TkVariable.new
-
-    menuspec = [
-      [ 'Arrow',
-        [
-          [ 'None', [@popup[:arrow], 'none'], nil, '',
-            {:command=>proc{
-                @tree2.column_configure(@popup[:column].value, :arrow=>:none)
-              }
-            } ],
-          [ 'Up', [@popup[:arrow], 'up'], nil, '',
-            {:command=>proc{
-                @tree2.column_configure(@popup[:column].value, :arrow=>:up)
-              }
-            } ],
-          [ 'Down', [@popup[:arrow], 'down'], nil, '',
-            {:command=>proc{
-                @tree2.column_configure(@popup[:column].value, :arrow=>:down)
-              }
-            } ],
-
-          '---',
-
-          [ 'Side Left', [@popup[:arrowside], 'left'], nil, '',
-            {:command=>proc{
-                @tree2.column_configure(@popup[:column].value,
-                                        :arrowside=>:left)
-              }
-            } ],
-          [ 'Side Right', [@popup[:arrowside], 'right'], nil, '',
-            {:command=>proc{
-                @tree2.column_configure(@popup[:column].value,
-                                        :arrowside=>:right)
-              }
-            } ],
-
-          '---',
-
-          [ 'Gravity Left', [@popup[:arrowgravity], 'left'], nil, '',
-            {:command=>proc{
-                @tree2.column_configure(@popup[:column].value,
-                                        :arrowgravity=>:left)
-              }
-            } ],
-          [ 'Gravity Right', [@popup[:arrowgravity], 'right'], nil, '',
-            {:command=>proc{
-                @tree2.column_configure(@popup[:column].value,
-                                        :arrowgravity=>:right)
-              }
-            } ],
-        ],
-        nil, '', {:menu_config=>{:tearoff=>false}} ],
-
-      [ 'Expand',  @popup[:expand],  nil, '',
-        {:command=>proc{
-            @tree2.column_configure(@popup[:column].value,
-                                    :expand=>@popup[:expand].value)
-          }
-        } ],
-
-      [ 'Squeeze', @popup[:squeeze], nil, '',
-        {:command=>proc{
-            @tree2.column_configure(@popup[:column].value,
-                                    :squeeze=>@popup[:squeeze].value)
-          }
-        } ],
-
-      [ 'Justify',
-        [
-          [ 'Left', [@popup[:justify], 'left'], nil, '',
-            {:command=>proc{
-                @tree2.column_configure(@popup[:column].value, :justify=>:left)
-              }
-            } ],
-          [ 'Center', [@popup[:justify], 'center'], nil, '',
-            {:command=>proc{
-                @tree2.column_configure(@popup[:column].value,
-                                        :justify=>:center)
-              }
-            } ],
-          [ 'Right', [@popup[:justify], 'right'], nil, '',
-            {:command=>proc{
-                @tree2.column_configure(@popup[:column].value,
-                                        :justify=>:right)
-              }
-            } ]
-        ],
-        nil, '', {:menu_config=>{:tearoff=>false}} ]
-    ]
-
-    m = TkMenu.new_menuspec(menuspec, @tree2, false)
-    @non_clear_list << m
-    @mHeader[@tree2] = m
-  end
-
-  ###########################
-
-  def init_demo_scripts_module
-    @demo_scripts = Module.new
-
-    master = self
-
-    has_bgimg = @has_bgimg
-
-    scriptDir = @ScriptDir
-
-    thisPlatform = @thisPlatform
-
-    randomN = @RandomN
-
-    images = @images
-    sel_images = @sel_images
-
-    systemButtonFace = @SystemButtonFace
-    systemHighlight  = @SystemHighlight
-    systemHighlightText = @SystemHighlightText
-
-    def master._pub_display_styles_in_item(item)
-      display_styles_in_item(item)
-    end
-    proc_disp_styles_in_item = proc{|item|
-      master._pub_display_styles_in_item(item)
-    }
-
-    @demo_scripts.instance_eval{
-      @master = master
-
-      @has_bgimg = has_bgimg
-
-      @display_styles_in_item = proc_disp_styles_in_item
-
-      @Priv = TkVarAccess.new('::TreeCtrl::Priv')
-
-      @ScriptDir = scriptDir
-
-      @thisPlatform = thisPlatform
-
-      @RandomN = randomN
-
-      @images = images
-      @sel_images = sel_images
-
-      @SystemButtonFace = systemButtonFace
-      @SystemHighlight  = systemHighlight
-      @SystemHighlightText = systemHighlightText
-    }
-
-    class << @demo_scripts
-      def _get_binding
-        binding
-      end
-      private :_get_binding
-
-      def load_demo(file)
-        puts "load \"#{file}\"" if $DEBUG
-        begin
-          eval(IO.readlines(file).join, _get_binding())
-        rescue Exception => e
-          bt = e.backtrace
-
-          if bt[0] =~ /^([^:]+):(\d+):/
-            errline = $2.to_i
-          else
-            raise e
-          end
-
-          if bt[1] =~ /^([^:]+):(\d+):/
-            bt.unshift("#{file}:#{errline - $2.to_i + 1}")
-            raise e
-          else
-            raise e
-          end
-        end
-      end
-
-      def init_pics(*args)
-        @master.init_pics(*args)
-      end
-    end
-  end
-
-  def load_demo_scripts
-    # demo sources
-    [
-      'bitmaps',
-      'explorer',
-      'help',
-      'imovie',
-      'layout',
-      'mailwasher',
-      'outlook-folders',
-      'outlook-newgroup',
-      'random',
-      'www-options'
-    ].each{|f|
-      @demo_scripts.load_demo(File.join(@ScriptDir, "#{f}.rb"))
-    }
-  end
-
-  ###########################
-
-  def init_demo_list
-    @tree1.element_create('e1', :text,
-                          :fill=>[@SystemHighlightText, ['selected', 'focus']])
-    @tree1.element_create('e2', :rect, :showfocus=>true,
-                          :fill=>[
-                            @SystemHighlight, ['selected', 'focus'],
-                            'gray', ['selected', '!focus'],
-                          ])
-    @tree1.style_create('s1')
-    @tree1.style_elements('s1', ['e2', 'e1'])
-
-    # Tk listbox has linespace + 1 height
-    @tree1.style_layout('s1', 'e2', :union=>['e1'],
-                        :ipadx=>2, :ipady=>[0, 1], :iexpand=>:e)
-
-    if $Version_1_1_OrLater
-      @tree1.defaultstyle = 's1'
-    end
-
-    ###
-    [
-      ["Random #{@RandomN[0]} Items", :demoRandom, 'random.rb'],
-      ["Random #{@RandomN[0]} Items, Button Images", :demoRandom2, 'random.rb'],
-      ["Outlook Express (Folders)", :demoOutlookFolders, 'outlook-folders.rb'],
-      ["Outlook Express (Newsgroup)", :demoOutlookNewsgroup, 'outlook-newgroup.rb'],
-      ["Explorer (Details)", :demoExplorerDetails, 'explorer.rb'],
-      ["Explorer (List)", :demoExplorerList, 'explorer.rb'],
-      ["Explorer (Large icons)", :demoExplorerLargeIcons, 'explorer.rb'],
-      ["Explorer (Small icons)", :demoExplorerSmallIcons, 'explorer.rb'],
-      ["Internet Options", :demoInternetOptions, 'www-options.rb'],
-      ["Help Contents", :demoHelpContents, 'help.rb'],
-      ["Layout", :demoLayout, 'layout.rb'],
-      ["MailWasher", :demoMailWasher, 'mailwasher.rb'],
-      ["Bitmaps", :demoBitmaps, 'bitmaps.rb'],
-      ["iMovie", :demoIMovie, 'imovie.rb']
-    ].each{|label, cmd, file|
-      item = @tree1.item_create
-      @tree1.item_lastchild(:root, item)
-      unless $Version_1_1_OrLater
-        @tree1.item_style_set(item, 0, 's1')
-      end
-      @tree1.item_text(item, 0, label)
-      @demoCmd[item] = cmd
-      @demoFile[item] = file
-    }
-
-    @tree1.yview_moveto(0.0)
-  end
-
-  def demo_set(cmd, file)
-    demo_clear()
-    clicks = Tk::Clock.clicks
-    @demo_scripts.__send__(cmd, @tree2)
-    clicks = Tk::Clock.clicks - clicks
-    puts "set list in #{'%.2g'%(clicks/1000000.0)} seconds (#{clicks} clicks)"
-    @tree2.xview_moveto(0)
-    @tree2.yview_moveto(0)
-    Tk.update
-    display_styles_in_list()
-    show_source(file)
-  end
-
-  def display_styles_in_list
-    # Create elements and styles the first time this is called
-    if @tree4.style_names.empty?
-      @tree4.element_create('e1', :text,
-                            :fill=>[@SystemHighlightText,['selected','focus']])
-      @tree4.element_create('e2', :text,
-                            :fill=>[
-                              @SystemHighlightText, ['selected','focus'],
-                              '', ['selected','!focus'],
-                              'blue', []
-                            ])
-      @tree4.element_create('e3', :rect, :showfocus=>true,
-                            :fill=>[
-                              @SystemHighlight, ['selected','focus'],
-                              'gray', ['selected', '!focus']
-                            ])
-
-      @tree4.style_create('s1')
-      @tree4.style_elements('s1', ['e3', 'e1'])
-      @tree4.style_layout('s1', 'e3', :union=>['e1'], :ipadx=>1, :ipady=>[0,1])
-
-      @tree4.style_create('s2')
-      @tree4.style_elements('s2', ['e3', 'e1', 'e2'])
-      @tree4.style_layout('s2', 'e1', :padx=>[0,4])
-      @tree4.style_layout('s2', 'e3', :union=>['e1', 'e2'],
-                          :ipadx=>1, :ipady=>[0,1])
-    end
-
-    # Clear the list
-    @tree4.item_delete(:all)
-
-    # One item for each element in the demo list
-    @tree2.element_names.sort.each{|elem|
-      if $Version_1_1_OrLater
-        item = @tree4.item_create(:button=>true)
-        @tree4.item_collapse(item)
-      else
-        item = @tree4.item_create
-        @tree4.item_hasbutton(item, true)
-        @tree4.collapse(item)
-      end
-      @tree4.item_style_set(item, 0, 's1')
-      @tree4.item_text(item, 0,
-                       "Element #{elem} (#{@tree2.element_type(elem)})")
-
-      # One item for each configuration option for this element
-      @tree2.element_configinfo(elem).each{|name, x, y, default, current|
-        item2 = @tree4.item_create
-
-        if default == current
-          @tree4.item_style_set(item2, 0, 's1')
-          @tree4.item_complex(item2, [
-                                ['e1', {:text=>"#{name} #{current.inspect}"}]
-                              ])
-        else
-          @tree4.item_style_set(item2, 0, 's2')
-          @tree4.item_complex(item2, [
-                                ['e1', {:text=>name}],
-                                ['e2', {:text=>current.inspect}]
-                              ])
-        end
-
-        @tree4.item_lastchild(item, item2)
-      }
-
-      @tree4.item_lastchild(:root, item)
-    }
-
-    # One item for each style in the demo list
-    @tree2.style_names.sort.each{|sty|
-      if $Version_1_1_OrLater
-        item = @tree4.item_create(:button=>true)
-        @tree4.item_collapse(item)
-      else
-        item = @tree4.item_create
-        @tree4.item_hasbutton(item, true)
-        @tree4.collapse(item)
-      end
-      @tree4.item_style_set(item, 0, 's1')
-      @tree4.item_text(item, 0, "Style #{sty}")
-
-      # One item for each element in the style
-      @tree2.style_elements(sty).each{|elem|
-        if $Version_1_1_OrLater
-          item2 = @tree4.item_create(:button=>true)
-          @tree4.item_collapse(item2)
-        else
-          item2 = @tree4.item_create
-          @tree4.item_hasbutton(item2, true)
-          @tree4.collapse(item2)
-        end
-        @tree4.item_style_set(item2, 0, 's1')
-        @tree4.item_text(item2, 0,
-                         "Element #{elem} (#{@tree2.element_type(elem)})")
-
-        # One item for each layout option for this element in this style
-        @tree2.style_layout(sty, elem).each{|k, v|
-          item3 = @tree4.item_create
-          unless $Version_1_1_OrLater
-            @tree4.item_hasbutton(item3, false)
-          end
-          @tree4.item_style_set(item3, 0, 's1')
-          @tree4.item_text(item3, 0, "#{k} #{v.inspect}")
-          @tree4.item_lastchild(item2, item3)
-        }
-
-        @tree4.item_lastchild(item, item2)
-      }
-
-      @tree4.item_lastchild(:root, item)
-    }
-
-    @tree4.xview_moveto(0)
-    @tree4.yview_moveto(0)
-  end
-
-  def display_styles_in_item(item)
-    @tree3.column_configure(0, :text=>"Styles in item #{@tree2.index(item)}")
-
-    # Create elements and styles the first time this is called
-    if @tree3.style_names.empty?
-      @tree3.element_create('e1', :text,
-                            :fill=>[@SystemHighlightText,['selected','focus']])
-      @tree3.element_create('e2', :text,
-                            :fill=>[
-                              @SystemHighlightText, ['selected','focus'],
-                              '', ['selected','!focus'],
-                              'blue', []
-                            ])
-      @tree3.element_create('e3', :rect, :showfocus=>true,
-                            :fill=>[
-                              @SystemHighlight, ['selected','focus'],
-                              'gray', ['selected', '!focus']
-                            ])
-
-      @tree3.style_create('s1')
-      @tree3.style_elements('s1', ['e3', 'e1'])
-      @tree3.style_layout('s1', 'e3', :union=>['e1'], :ipadx=>1, :ipady=>[0,1])
-
-      @tree3.style_create('s2')
-      @tree3.style_elements('s2', ['e3', 'e1', 'e2'])
-      @tree3.style_layout('s2', 'e1', :padx=>[0,4])
-      @tree3.style_layout('s2', 'e3', :union=>['e1', 'e2'],
-                          :ipadx=>1, :ipady=>[0,1])
-    end
-    # Clear the list
-    @tree3.item_delete(:all)
-
-    # One item for each item-column
-    column = 0
-    @tree2.item_style_set(item).each{|sty|
-      item2 = @tree3.item_create
-      if $Version_1_1_OrLater
-        @tree3.item_collapse(item2)
-      else
-        @tree3.collapse(item2)
-      end
-      @tree3.item_style_set(item2, 0, 's1')
-      @tree3.item_element_configure(item2, 0, 'e1',
-                                    :text=>"Column #{column}: Style #{sty}")
-
-      button = false
-
-      # One item for each element in this style
-      unless sty.to_s.empty?
-        @tree2.item_style_elements(item, column).each{|elem|
-          button = true
-          if $Version_1_1_OrLater
-            item3 = @tree3.item_create(:button=>true)
-          else
-            item3 = @tree3.item_create
-            @tree3.item_hasbutton(item3, true)
-          end
-          if $Version_1_1_OrLater
-            @tree3.item_collapse(item3)
-          else
-            @tree3.collapse(item3)
-          end
-          @tree3.item_style_set(item3, 0, 's1')
-          @tree3.item_element_configure(item3, 0, 'e1',
-                                        :text=>"Element #{elem} (#{@tree2.element_type(elem)})")
-
-          # One item for each configuration option in this element
-          @tree2.item_element_configinfo(item, column, elem) \
-          .each{|name, x, y, default, current|
-            item4 = @tree3.item_create
-            masterDefault = @tree2.element_cget(elem, name)
-            sameAsMaster = (masterDefault == current)
-            if !sameAsMaster && current == ''
-              sameAsMaster = true
-              current = masterDefault
-            end
-
-            if sameAsMaster
-              @tree3.item_style_set(item4, 0, 's1')
-              @tree3.item_complex(item4, [
-                                    ['e1',
-                                      {:text=>"#{name} #{current.inspect}"}]
-                                  ])
-            else
-              @tree3.item_style_set(item4, 0, 's2')
-              @tree3.item_complex(item4, [
-                                    ['e1', {:text=>name}],
-                                    ['e2', {:text=>current.inspect}]
-                                  ])
-            end
-            @tree3.item_lastchild(item3, item4)
-          }
-          @tree3.item_lastchild(item2, item3)
-        }
-        if $Version_1_1_OrLater
-          @tree3.item_configure(item2, :button=>true) if button
-        else
-          @tree3.item_hasbutton(item2, true) if button
-        end
-      end
-      @tree3.item_lastchild(:root, item2)
-      column += 1
-    }
-
-    @tree3.xview_moveto(0)
-    @tree3.yview_moveto(0)
-  end
-
-  def demo_clear
-    # Clear the demo list
-    @tree2.item_delete(:all)
-
-    # Clear all bindings on the demo list added by the previous demo.
-    # This is why DontDelete is used for the <Selection> binding.
-    @tree2.notify_bindinfo(@tree2).each{|ev|
-      @tree2.notify_bind_remove(@tree2, ev)
-    }
-
-    # Clear all run-time states
-    @tree2.state_names.each{|st| @tree2.state_undefine(st) }
-
-    # Clear the styles-in-item list
-    @tree3.item_delete(:all)
-
-    # Delete columns in demo list
-    while (@tree2.numcolumns > 0)
-      @tree2.column_delete(0)
-    end
-
-    # Delete all styles in demo list
-    @tree2.style_delete(*(@tree2.style_names))
-
-    # Delete all elements in demo list
-    @tree2.element_delete(*(@tree2.element_names))
-
-    if $Version_1_1_OrLater
-      @tree2.item_configure(:root, :button=>false)
-      @tree2.item_expand(:root)
-    else
-      @tree2.item_hasbutton(:root, false)
-      @tree2.expand(:root)
-    end
-
-    # Restore some happy defaults to the demo list
-    # if $Version_1_1_OrLater
-    if @has_bgimg
-      @tree2.configure(:orient=>:vertical, :wrap=>'',
-                       :xscrollincrement=>0, :yscrollincrement=>0,
-                       :itemheight=>0, :showheader=>true,
-                       :background=>'white', :scrollmargin=>0,
-                       :xscrolldelay=>50, :yscrolldelay=>50,
-                       :openbuttonimage=>'', :closedbuttonimage=>'',
-                       :backgroundmode=>:row, :treecolumn=>0, :indent=>19,
-                       :defaultstyle=>'', :backgroundimage=>'')
-    else
-      @tree2.configure(:orient=>:vertical, :wrap=>'',
-                       :xscrollincrement=>0, :yscrollincrement=>0,
-                       :itemheight=>0, :showheader=>true,
-                       :background=>'white', :scrollmargin=>0,
-                       :xscrolldelay=>50, :yscrolldelay=>50,
-                       :openbuttonimage=>'', :closedbuttonimage=>'',
-                       :backgroundmode=>:row, :treecolumn=>0, :indent=>19)
-    end
-
-    # Restore default bindings to the demo list
-    @tree2.bindtags = [ @tree2, Tk::TreeCtrl, @tree2.winfo_toplevel, :all ]
-
-    @tree2.winfo_children.each{|w|
-      w.destroy unless @non_clear_list.include?(w)
-    }
-  end
-end
-
-TkTreeCtrl_demo.new($ScriptDir)
-
-##############################################
-
-def cursor_window(top = nil)
-  top.destroy if top.kind_of?(TkWindow) && top.winfo_exist?
-  top = TkToplevel.new(:title=>'Cursor Window')
-
-  c = TkCanvas.new(top, :background=>'white',
-                   :width=>50*10, :highlightthickness=>0,
-                   :borderwidth=>0).pack(:expand=>true, :fill=>:both)
-  cursors = %w(
-	X_cursor
-	arrow
-	based_arrow_down
-	based_arrow_up
-	boat
-	bogosity
-	bottom_left_corner
-	bottom_right_corner
-	bottom_side
-	bottom_tee
-	box_spiral
-	center_ptr
-	circle
-	clock
-	coffee_mug
-	cross
-	cross_reverse
-	crosshair
-	diamond_cross
-	dot
-	dotbox
-	double_arrow
-	draft_large
-	draft_small
-	draped_box
-	exchange
-	fleur
-	gobbler
-	gumby
-	hand1
-	hand2
-	heart
-	icon
-	iron_cross
-	left_ptr
-	left_side
-	left_tee
-	leftbutton
-	ll_angle
-	lr_angle
-	man
-	middlebutton
-	mouse
-	pencil
-	pirate
-	plus
-	question_arrow
-	right_ptr
-	right_side
-	right_tee
-	rightbutton
-	rtl_logo
-	sailboat
-	sb_down_arrow
-	sb_h_double_arrow
-	sb_left_arrow
-	sb_right_arrow
-	sb_up_arrow
-	sb_v_double_arrow
-	shuttle
-	sizing
-	spider
-	spraycan
-	star
-	target
-	tcross
-	top_left_arrow
-	top_left_corner
-	top_right_corner
-	top_side
-	top_tee
-	trek
-	ul_angle
-	umbrella
-	ur_angle
-	watch
-	xterm
-    )
-
-  orig_cursor = c.cursor
-  col = 0
-  row = 0
-
-  cursors.each{|cur|
-    x = col * 50
-    y = row * 40
-
-    begin
-      c.cursor = cur
-
-      r = TkcRectangle.new(c, x, y, x+50, y+40,
-                           :fill=>'gray90', :outline=>'black', :width=>2)
-      t = TkcText.new(c, x+50/2, y+4, :text=>cur, :anchor=>:n, :width=>42)
-
-      col += 1
-      if col >= 10
-        col = 0
-        row += 1
-      end
-
-      r.bind('Enter', proc{c.cursor = cur; r.fill = 'linen'})
-      r.bind('Leave', proc{c.cursor = ''; r.fill = 'gray90'})
-
-      t.bind('Enter', proc{c.cursor = cur})
-      t.bind('Leave', proc{c.cursor = ''})
-    rescue
-      c.cursor = orig_cursor
-    end
-  }
-
-  c.cursor = orig_cursor
-  c.height = (row + 1) * 40
-end
-
-cursor_window()
-
-##############################################
-
-# A little screen magnifier for X11
-if Tk::PLATFORM['platform'] == 'unix' && Tk.windowingsystem != 'aqua'
-  def show_loupe(setting=nil)
-    loupe = (setting.kind_of?(Hash))? setting: {}
-    loupe[:zoom] = 3 unless loupe[:zoom]
-    loupe[:x] = 0 unless loupe[:x]
-    loupe[:y] = 0 unless loupe[:y]
-    loupe[:auto] = true unless loupe[:auto]
-    loupe[:delay] = 500 unless loupe[:delay]
-    loupe[:image] =
-      TkPhotoImage.new(:width=>150, :height=>150) unless loupe[:image]
-
-    top = TkToplevel.new(:geometry=>'-0+30',
-                         :title=>'A little screen magnifier for X11')
-    TkLabel.new(top, :image=>loupe[:image]).pack
-
-    TkTimer.new(proc{loupe[:delay]}, -1, proc{
-                  x, y = TkWinfo.pointerxy(Tk.root)
-                  if loupe[:auto] || loupe[:x] != x || loupe[:y] != y
-                    w = loupe[:image].width
-                    h = loupe[:image].height
-                    Tk::TreeCtrl.loupe(loupe[:image], x, y, w, h, loupe[:zoom])
-                    loupe[:x] = x
-                    loupe[:y] = y
-                  end
-                }).start
-  end
-
-  show_loupe()
-end
-
-##############################################
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/treectrl/explorer.rb b/ext/tk/sample/tkextlib/treectrl/explorer.rb
deleted file mode 100644
index 3b54bf269c..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/explorer.rb
+++ /dev/null
@@ -1,431 +0,0 @@
-# frozen_string_literal: false
-
-def demoExplorerAux(t, dir_proc, file_proc)
-  base_dir = File.dirname(File.dirname(@ScriptDir))
-
-  clicks = Tk::Clock.clicks
-  globDirs = Dir.glob(File.join(base_dir, '*')).find_all{|file|
-    FileTest.directory?(file)
-  }
-  clickGlobDirs = Tk::Clock.clicks - clicks
-
-  clicks = Tk::Clock.clicks
-  list = globDirs.sort
-  clickSortDirs = Tk::Clock.clicks - clicks
-
-  clicks = Tk::Clock.clicks
-  list.each{|file| dir_proc.call(file)}
-  clickAddDirs = Tk::Clock.clicks - clicks
-
-  clicks = Tk::Clock.clicks
-  globFiles = Dir.glob(File.join(base_dir, '*')).find_all{|file|
-    FileTest.file?(file)
-  }
-  clickGlobFiles = Tk::Clock.clicks - clicks
-
-  clicks = Tk::Clock.clicks
-  list = globFiles.sort
-  clickSortFiles = Tk::Clock.clicks - clicks
-
-  clicks = Tk::Clock.clicks
-  list.each{|file| file_proc.call(file)}
-  clickAddFiles = Tk::Clock.clicks - clicks
-
-  gd = '%.2g' % (clickGlobDirs / 1000000.0)
-  sd = '%.2g' % (clickSortDirs / 1000000.0)
-  ad = '%.2g' % (clickAddDirs  / 1000000.0)
-  gf = '%.2g' % (clickGlobFiles / 1000000.0)
-  sf = '%.2g' % (clickSortFiles / 1000000.0)
-  af = '%.2g' % (clickAddFiles  / 1000000.0)
-
-  puts "dirs(#{globDirs.length}) glob/sort/add #{gd}/#{sd}/#{ad}    files(#{globFiles.length}) glob/sort/add #{gf}/#{sf}/#{af}"
-
-  @Priv[:DirCnt, t] = globDirs.length
-end
-
-#
-# Demo: explorer files
-#
-def demoExplorerDetails(t)
-  height = t.font.metrics(:linespace)
-  height = 18 if height < 18
-
-  t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false,
-              :itemheight=>height, :selectmode=>:extended,
-              :xscrollincrement=>20, :scrollmargin=>16,
-              :xscrolldelay=>[500, 50], :yscrolldelay=>[500, 50])
-
-  init_pics('small-*')
-
-  if $HasColumnCreate
-    t.column_create(:text=>'Name', :tag=>'name',
-                    :width=>200, :arrow=>:up, :arrowpad=>6)
-    t.column_create(:text=>'Size', :tag=>'size', :justify=>:right,
-                    :width=>60, :arrowside=>:left, :arrowgravity=>:right)
-    t.column_create(:text=>'Type', :tag=>'type', :width=>120)
-    t.column_create(:text=>'Modified', :tag=>'modified', :width=>130)
-  else
-    t.column_configure(0, :text=>'Name', :tag=>'name',
-                       :width=>200, :arrow=>:up, :arrowpad=>6)
-    t.column_configure(1, :text=>'Size', :tag=>'size', :justify=>:right,
-                       :width=>60, :arrowside=>:left, :arrowgravity=>:right)
-    t.column_configure(2, :text=>'Type', :tag=>'type', :width=>120)
-    t.column_configure(3, :text=>'Modified', :tag=>'modified', :width=>130)
-  end
-
-  t.element_create('e1', :image,
-                   :image=>[
-                     @sel_images['small-folder'], ['selected'],
-                     @images['small-folder'], []
-                   ])
-  t.element_create('e2', :text, :lines=>1,
-                   :fill=>[@SystemHighlightText, ['selected', 'focus']])
-  t.element_create('txtType', :text, :lines=>1)
-  t.element_create('txtSize', :text, :lines=>1,
-                   :datatype=>:integer, :format=>'%dKB')
-  t.element_create('txtDate', :text, :lines=>1,
-                   :datatype=>:time, :format=>'%d/%m/%y %I:%M %p')
-  t.element_create('e4', :rect, :showfocus=>true,
-                   :fill=>[
-                     @SystemHighlight, ['selected', 'focus'],
-                     'gray', ['selected', '!focus']
-                   ])
-
-  # image + text
-  s = t.style_create('styName', :orient=>:horizontal)
-  t.style_elements(s, ['e4', 'e1', 'e2'])
-  t.style_layout(s, 'e1', :expand=>:ns)
-  t.style_layout(s, 'e2', :padx=>[2,0], :squeeze=>:x, :expand=>:ns)
-  t.style_layout(s, 'e4', :union=>['e2'], :iexpand=>:ns, :ipadx=>2)
-
-  # column 1: text
-  s = t.style_create('stySize')
-  t.style_elements(s, ['txtSize'])
-  t.style_layout(s, 'txtSize', :padx=>6, :squeeze=>:x, :expand=>:ns)
-
-  # column 2: text
-  s = t.style_create('styType')
-  t.style_elements(s, ['txtType'])
-  t.style_layout(s, 'txtType', :padx=>6, :squeeze=>:x, :expand=>:ns)
-
-  # column 3: text
-  s = t.style_create('styDate')
-  t.style_elements(s, ['txtDate'])
-  t.style_layout(s, 'txtDate', :padx=>6, :squeeze=>:x, :expand=>:ns)
-
-  @Priv[:edit, t] = ['e2']
-  @Priv[:sensitive, t] = [ ['name', 'styName', 'e1', 'e2'] ]
-  @Priv[:dragimage, t] = [ ['name', 'styName', 'e1', 'e2'] ]
-
-  t.notify_bind(t, 'Edit-accept',
-                proc{|w, i, tt| w.item_text(i, 0, tt)}, '%T %I %t')
-
-  dir_proc = proc{|file|
-    item = t.item_create
-    t.item_style_set(item, 0, 'styName', 2, 'styType', 3, 'styDate')
-    t.item_complex(item,
-                   [['e2', {:text=>File.basename(file)}]],
-                   [],
-                   [['txtType', {:text=>'Folder'}]],
-                   [['txtDate', {:data=>File.mtime(file).tv_sec}]])
-    t.item_lastchild(:root, item)
-  }
-
-  file_proc = proc{|file|
-    item = t.item_create
-    t.item_style_set(item, 0, 'styName', 1, 'stySize',
-                           2, 'styType', 3, 'styDate')
-
-    ext = File.extname(file)
-    case ext
-    when '.dll'
-      img = 'small-dll'
-    when '.exe'
-      img = 'small-exe'
-    when '.txt'
-      img = 'small-txt'
-    else
-      img = 'small-file'
-    end
-
-    type = ext.upcase
-    type = type[1..-1] << ' ' unless type.empty?
-    type << 'File'
-
-    t.item_complex(item,
-                   [
-                     ['e1', {:image=>[@sel_images[img], ['selected'],
-                                      @images[img], []]}],
-                     ['e2', {:text=>File.basename(file)}]
-                   ],
-                   [ ['txtSize', {:data=>File.size(file)/1024 + 1}] ],
-                   [ ['txtType', {:text=>type}] ],
-                   [ ['txtDate', {:data=>File.mtime(file).tv_sec}] ]
-                   )
-    t.item_lastchild(:root, item)
-  }
-
-  demoExplorerAux(t, dir_proc, file_proc)
-
-  @SortColumn = 0
-  t.notify_bind(t, 'Header-invoke',
-                proc{|w, c| explorerHeaderInvoke(t, w, c)}, '%T %C')
-
-  t.bindtags = [ t, 'TreeCtrlFileList', Tk::TreeCtrl, t.winfo_toplevel, :all ]
-end
-
-def explorerHeaderInvoke(t, w, c)
-  if (c == @SortColumn)
-    if t.column_cget(@SortColumn, :arrow) == 'down'
-      order = :increasing
-      arrow = :up
-    else
-      order = :decreasing
-      arrow = :down
-    end
-  else
-    if t.column_cget(@SortColumn, :arrow) == 'down'
-      order = :decreasing
-      arrow = :down
-    else
-      order = :increasing
-      arrow = :up
-    end
-    t.column_configure(@SortColumn, :arrow=>:none)
-    @SortColumn = c
-  end
-
-  t.column_configure(c, :arrow=>arrow)
-  dirCount = TkComm.number(@Priv[:DirCnt, t])
-  lastDir = dirCount - 1
-  case t.column_cget(c, :tag)
-  when 'name'
-    if dirCount > 0
-      t.item_sort(:root, order, {:last=>"root child #{lastDir}"},
-                  {:column=>c, :dictionary=>true})
-    end
-    if dirCount < t.numitems - 1
-      t.item_sort(:root, order, {:first=>"root child #{dirCount}"},
-                  {:column=>c, :dictionary=>true})
-    end
-
-  when 'size'
-    if dirCount < t.numitems - 1
-      t.item_sort(:root, order, {:first=>"root child #{dirCount}"},
-                  {:column=>c, :integer=>true},
-                  {:column=>'name', :dictionary=>true})
-    end
-
-  when 'type'
-    if dirCount < t.numitems - 1
-      t.item_sort(:root, order, {:first=>"root child #{dirCount}"},
-                  {:column=>c, :dictionary=>true},
-                  {:column=>'name', :dictionary=>true})
-    end
-
-  when 'modified'
-    if dirCount > 0
-      t.item_sort(:root, order, {:last=>"root child #{lastDir}"},
-                  {:column=>c, :integer=>true},
-                  {:column=>'name', :dictionary=>true})
-    end
-    if dirCount < t.numitems - 1
-      t.item_sort(:root, order, {:first=>"root child #{dirCount}"},
-                  {:column=>c, :integer=>true},
-                  {:column=>'name', :dictionary=>true})
-    end
-
-  end
-end
-
-def demoExplorerLargeIcons(t)
-  # Item height is 32 for icon, 4 padding, 3 lines of text
-  itemHeight = 32 + 4 + t.font.metrics(:linespace) * 3
-
-  t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false,
-              :selectmode=>:extended, :wrap=>:window, :orient=>:horizontal,
-              :itemheight=>itemHeight, :showheader=>false, :scrollmargin=>16,
-              :xscrolldelay=>[500, 50], :yscrolldelay=>[500, 50])
-
-  init_pics('big-*')
-
-  if $HasColumnCreate
-    t.column_create(:width=>75)
-  else
-    t.column_configure(0, :width=>75)
-  end
-
-  t.element_create('elemImg', :image,
-                   :image=>[
-                     @sel_images['big-folder'], ['selected'],
-                     @images['big-folder'], []
-                   ])
-  t.element_create('elemTxt', :text, :justify=>:center,
-                   :lines=>1, :width=>71, :wrap=>:word,
-                   :fill=>[@SystemHighlightText, ['selected', 'focus']])
-  t.element_create('elemSel', :rect, :showfocus=>true,
-                   :fill=>[
-                     @SystemHighlight, ['selected', 'focus'],
-                     'gray', ['selected']
-                   ])
-
-  # image + text
-  s = t.style_create('STYLE', :orient=>:vertical)
-  t.style_elements(s, ['elemSel', 'elemImg', 'elemTxt'])
-  t.style_layout(s, 'elemImg', :expand=>:we)
-  t.style_layout(s, 'elemTxt',
-                 :pady=>[4,0], :padx=>2, :squeeze=>:x, :expand=>:we)
-  t.style_layout(s, 'elemSel', :union=>['elemTxt'])
-
-  @Priv[:edit, t] = ['elemTxt']
-  @Priv[:sensitive, t] = [ [0, 'STYLE', 'elemImg', 'elemTxt'] ]
-  @Priv[:dragimage, t] = [ [0, 'STYLE', 'elemImg', 'elemTxt'] ]
-
-  t.notify_bind(t, 'Edit-accept',
-                proc{|w, i, tt| w.item_text(i, 0, tt)}, '%T %I %t')
-
-  dir_proc = proc{|file|
-    item = t.item_create
-    t.item_style_set(item, 0, 'STYLE')
-    t.item_text(item, 0, File.basename(file))
-    t.item_lastchild(:root, item)
-  }
-
-  file_proc = proc{|file|
-    item = t.item_create
-    t.item_style_set(item, 0, 'STYLE')
-
-    ext = File.extname(file)
-    case ext
-    when '.dll'
-      img = 'big-dll'
-    when '.exe'
-      img = 'big-exe'
-    when '.txt'
-      img = 'big-txt'
-    else
-      img = 'big-file'
-    end
-
-    type = ext.upcase
-    type = type[1..-1] << ' ' unless type.empty?
-    type << 'File'
-
-    t.item_complex(item,
-                   [
-                     ['elemImg', {:image=>[@sel_images[img], ['selected'],
-                                           @images[img], []]}],
-                     ['elemTxt', {:text=>File.basename(file)}]
-                   ])
-    t.item_lastchild(:root, item)
-  }
-
-  demoExplorerAux(t, dir_proc, file_proc)
-
-  t.activate(t.index('root firstchild'))
-
-  t.notify_bind(t, 'ActiveItem',
-                proc{|w, a, c|
-                  w.item_element_configure(a, 0, 'elemTxt', :lines=>'')
-                  w.item_element_configure(c, 0, 'elemTxt', :lines=>3)
-                }, '%T %p %c')
-
-  t.bindtags = [ t, 'TreeCtrlFileList', Tk::TreeCtrl, t.winfo_toplevel, :all ]
-end
-
-# Tree is horizontal, wrapping occurs at right edge of window, each item
-# is as wide as the smallest needed multiple of 110 pixels
-def demoExplorerSmallIcons(t)
-  demoExplorerList(t)
-  t.configure(:orient=>:horizontal, :xscrollincrement=>0)
-  t.column_configure(0, :width=>'', :stepwidth=>110, :widthhack=>false)
-end
-
-# Tree is vertical, wrapping occurs at bottom of window, each range has the
-# same width (as wide as the longest item), xscrollincrement is by range
-def demoExplorerList(t)
-  height = t.font.metrics(:linespace) + 2
-  height = 18 if height < 18
-
-  t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false,
-              :itemheight=>height, :selectmode=>:extended, :wrap=>:window,
-              :showheader=>false, :scrollmargin=>16,
-              :xscrolldelay=>[500, 50], :yscrolldelay=>[500, 50])
-
-  init_pics('small-*')
-
-  if $HasColumnCreate
-    t.column_create(:widthhack=>true)
-  else
-    t.column_configure(0, :widthhack=>true)
-  end
-
-  t.element_create('elemImg', :image,
-                   :image=>[
-                     @sel_images['small-folder'], ['selected'],
-                     @images['small-folder'], []
-                   ])
-  t.element_create('elemTxt', :text, :lines=>1,
-                   :fill=>[@SystemHighlightText, ['selected', 'focus']])
-  t.element_create('elemSel', :rect, :showfocus=>true,
-                   :fill=>[
-                     @SystemHighlight, ['selected', 'focus'],
-                     'gray', ['selected', '!focus']
-                   ])
-
-  # image + text
-  s = t.style_create('STYLE')
-  t.style_elements(s, ['elemSel', 'elemImg', 'elemTxt'])
-  t.style_layout(s, 'elemImg', :expand=>:ns)
-  t.style_layout(s, 'elemTxt', :squeeze=>:x, :expand=>:ns, :padx=>[2,0])
-  t.style_layout(s, 'elemSel', :union=>['elemTxt'], :iexpand=>:ns, :ipadx=>2)
-
-  @Priv[:edit, t] = ['elemTxt']
-  @Priv[:sensitive, t] = [ [0, 'STYLE', 'elemImg', 'elemTxt'] ]
-  @Priv[:dragimage, t] = [ [0, 'STYLE', 'elemImg', 'elemTxt'] ]
-
-  t.notify_bind(t, 'Edit-accept',
-                proc{|w, i, tt| w.item_text(i, 0, tt)}, '%T %I %t')
-
-  dir_proc = proc{|file|
-    item = t.item_create
-    t.item_style_set(item, 0, 'STYLE')
-    t.item_text(item, 0, File.basename(file))
-    t.item_lastchild(:root, item)
-  }
-
-  file_proc = proc{|file|
-    item = t.item_create
-    t.item_style_set(item, 0, 'STYLE')
-
-    ext = File.extname(file)
-    case ext
-    when '.dll'
-      img = 'small-dll'
-    when '.exe'
-      img = 'small-exe'
-    when '.txt'
-      img = 'small-txt'
-    else
-      img = 'small-file'
-    end
-
-    type = ext.upcase
-    type = type[1..-1] << ' ' unless type.empty?
-    type << 'File'
-
-    t.item_complex(item,
-                   [
-                     ['elemImg', {:image=>[@sel_images[img], ['selected'],
-                                           @images[img], []]}],
-                     ['elemTxt', {:text=>File.basename(file)}]
-                   ])
-    t.item_lastchild(:root, item)
-  }
-
-  demoExplorerAux(t, dir_proc, file_proc)
-
-  t.activate(t.item_firstchild(:root))
-
-  t.bindtags = [ t, 'TreeCtrlFileList', Tk::TreeCtrl, t.winfo_toplevel, :all ]
-end
diff --git a/ext/tk/sample/tkextlib/treectrl/help.rb b/ext/tk/sample/tkextlib/treectrl/help.rb
deleted file mode 100644
index 251330277b..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/help.rb
+++ /dev/null
@@ -1,405 +0,0 @@
-# frozen_string_literal: false
-#
-# Demo: Help contents
-#
-def demoHelpContents(t)
-  height = t.font.metrics(:linespace)
-  height = 18 if height < 18
-  t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false,
-              :itemheight=>height, :selectmode=>:browse)
-
-  init_pics('help-*')
-
-  if $Version_1_1_OrLater
-    t.column_create(:text=>'Help Contents')
-  else # TreeCtrl 1.0
-    t.column_configure(0, :text=>'Help Contents')
-  end
-
-  # Define a new item state
-  t.state_define('mouseover')
-
-  t.element_create('e1', :image, :image=>@images['help-page'])
-  t.element_create('e2', :image, :image=>[
-                     @images['help-book-open'], ['open'],
-                     @images['help-book-closed'], [],
-                   ])
-  t.element_create('e3', :text,
-                   :font=>[t.font.dup.underline(true), ['mouseover']],
-                   :fill=>[
-                     @SystemHighlightText, ['selected', 'focus'],
-                     'blue', ['mouseover']
-                   ])
-  t.element_create('e4', :rect, :showfocus=>true,
-                   :fill=>[@SystemHighlight, ['selected', 'focus']])
-
-  # book
-  s = t.style_create('s1')
-  t.style_elements(s, ['e4', 'e1', 'e3'])
-  t.style_layout(s, 'e1', :padx=>[0,4], :expand=>:ns)
-  t.style_layout(s, 'e3', :expand=>:ns)
-  t.style_layout(s, 'e4', :union=>['e3'], :iexpand=>:ns, :ipadx=>2)
-
-  # page
-  s = t.style_create('s2')
-  t.style_elements(s, ['e4', 'e2', 'e3'])
-  t.style_layout(s, 'e2', :padx=>[0,4], :expand=>:ns)
-  t.style_layout(s, 'e3', :expand=>:ns)
-  t.style_layout(s, 'e4', :union=>['e3'], :iexpand=>:ns, :ipadx=>2)
-
-  parentList = [:root, '', '', '', '', '', '']
-  parent = :root
-  [
-     [0, 's1', "Welcome to Help"],
-     [0, 's2', "Introducing Windows 98"],
-        [1, 's2', "How to Use Help"],
-           [2, 's1', "Find a topic"],
-           [2, 's1', "Get more out of help"],
-        [1, 's2', "Register Your Software"],
-           [2, 's1', "Registering Windows 98 online"],
-        [1, 's2', "What's New in Windows 98"],
-           [2, 's1', "Innovative, easy-to-use features"],
-           [2, 's1', "Improved reliability"],
-           [2, 's1', "A faster operating system"],
-           [2, 's1', "True Web integration"],
-           [2, 's1', "More entertaining and fun"],
-        [1, 's2', "If You're New to Windows 98"],
-           [2, 's2', "Tips for Macintosh Users"],
-              [3, 's1', "Why does the mouse have two buttons?"]
-  ].each{|depth, style, text|
-    item = t.item_create
-    t.item_style_set(item, 0, style)
-    t.item_element_configure(item, 0, 'e3', :text=>text)
-    if $Version_1_1_OrLater
-      t.item_collapse(item)
-    else # TreeCtrl 1.0
-      t.collapse(item)
-    end
-    t.item_lastchild(parentList[depth], item)
-    depth += 1
-    parentList[depth] = item
-  }
-
-  treeCtrlHelp = TkBindTag.new
-
-  treeCtrlHelp.bind('Double-ButtonPress-1',
-                    proc{|w, x, y|
-                      if w.identify(x, y)[0] == 'header'
-                        Tk::TreeCtrl::BindCallback.doubleButton1(w, x, y)
-                      else
-                        helpButton1(w, x, y)
-                      end
-                      Tk.callback_break
-                    }, '%W %x %y')
-
-  treeCtrlHelp.bind('ButtonPress-1',
-                    proc{|w, x, y|
-                      helpButton1(w, x, y)
-                      Tk.callback_break
-                    }, '%W %x %y')
-
-  treeCtrlHelp.bind('Button1-Motion',
-                    proc{|w, x, y|
-                      helpMotion1(w, x, y)
-                      Tk.callback_break
-                    }, '%W %x %y')
-
-  treeCtrlHelp.bind('Button1-Leave',
-                    proc{|w, x, y|
-                      helpLeave1(w, x, y)
-                      Tk.callback_break
-                    }, '%W %x %y')
-
-  treeCtrlHelp.bind('ButtonRelease-1',
-                    proc{|w, x, y|
-                      helpRelease1(w, x, y)
-                      Tk.callback_break
-                    }, '%W %x %y')
-
-  treeCtrlHelp.bind('Motion', proc{|w, x, y| helpMotion(w, x, y) }, '%W %x %y')
-
-  treeCtrlHelp.bind('Leave', proc{|w, x, y| helpMotion(w, x, y) }, '%W %x %y')
-
-  treeCtrlHelp.bind('KeyPress-Return',
-                    proc{|w, x, y|
-                      if w.selection_get.length == 1
-                        if $Version_1_1_OrLater
-                          w.item_toggle(w.selection_get[0])
-                        else # TreeCtrl 1.0
-                          w.toggle(w.selection_get[0])
-                        end
-                      end
-                      Tk.callback_break
-                    }, '%W %x %y')
-
-  @Priv[:help, :prev] = ''
-
-  t.bindtags = [ t, treeCtrlHelp, Tk::TreeCtrl, t.winfo_toplevel, :all ]
-end
-
-# This is an alternate implementation that does not define a new item state
-# to change the appearance of the item under the cursor.
-def demoHelpContents2(t)
-  height = t.font.metrics(:linespace)
-  height = 18 if height < 18
-  t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false,
-              :itemheight=>height, :selectmode=>:browse)
-
-  init_pics('help-*')
-
-  if $Version_1_1_OrLater
-    t.column_create(:text=>'Help Contents')
-  else # TreeCtrl 1.0
-    t.column_configure(0, :text=>'Help Contents')
-  end
-
-  t.element_create('e1', :image, :image=>@images['help-page'])
-  t.element_create('e2', :image, :image=>[
-                     @images['help-book-open'], ['open'],
-                     @images['help-book-closed'], [],
-                   ])
-  t.element_create('e3', :text,
-                   :fill=>[
-                     @SystemHighlightText, ['selected', 'focus'],
-                     'blue', []
-                   ])
-  t.element_create('e4', :rect, :showfocus=>true,
-                   :fill=>[@SystemHighligh, ['selected', 'focus']])
-  t.element_create('e5', :text, :font=>t.font.dup.underline(true),
-                   :fill=>[
-                     @SystemHighlightText, ['selected', 'focus'],
-                     'blue', []
-                   ])
-
-  # book
-  s = t.style_create('s1')
-  t.style_elements(s, ['e4', 'e1', 'e3'])
-  t.style_layout(s, 'e1', :padx=>[0,4], :expand=>:ns)
-  t.style_layout(s, 'e3', :expand=>:ns)
-  t.style_layout(s, 'e4', :union=>['e3'], :iexpand=>:ns, :ipadx=>2)
-
-  # page
-  s = t.style_create('s2')
-  t.style_elements(s, ['e4', 'e2', 'e3'])
-  t.style_layout(s, 'e2', :padx=>[0,4], :expand=>:ns)
-  t.style_layout(s, 'e3', :expand=>:ns)
-  t.style_layout(s, 'e4', :union=>['e3'], :iexpand=>:ns, :ipadx=>2)
-
-  # book (focus)
-  s = t.style_create('s1.f')
-  t.style_elements(s, ['e4', 'e1', 'e5'])
-  t.style_layout(s, 'e1', :padx=>[0,4], :expand=>:ns)
-  t.style_layout(s, 'e5', :expand=>:ns)
-  t.style_layout(s, 'e4', :union=>['e5'], :iexpand=>:ns, :ipadx=>2)
-
-  # page (focus)
-  s = t.style_create('s2')
-  t.style_elements(s, ['e4', 'e2', 'e5'])
-  t.style_layout(s, 'e2', :padx=>[0,4], :expand=>:ns)
-  t.style_layout(s, 'e5', :expand=>:ns)
-  t.style_layout(s, 'e4', :union=>['e5'], :iexpand=>:ns, :ipadx=>2)
-
-  parentList = [:root, '', '', '', '', '', '']
-  parent = :root
-  [
-     [0, 's1', "Welcome to Help"],
-     [0, 's2', "Introducing Windows 98"],
-        [1, 's2', "How to Use Help"],
-           [2, 's1' "Find a topic"],
-           [2, 's1', "Get more out of help"],
-        [1, 's2', "Register Your Software"],
-           [2, 's1', "Registering Windows 98 online"],
-        [1, 's2', "What's New in Windows 98"],
-           [2, 's1', "Innovative, easy-to-use features"],
-           [2, 's1', "Improved reliability"],
-           [2, 's1', "A faster operating system"],
-           [2, 's1', "True Web integration"],
-           [2, 's1', "More entertaining and fun"],
-        [1, 's2', "If You're New to Windows 98"],
-           [2, 's2', "Tips for Macintosh Users"],
-              [3, 's1', "Why does the mouse have two buttons?"]
-  ].each{|depth, style, text|
-    item = t.item_create
-    t.item_style_set(item, 0, style)
-    t.item_element_configure(item, 0, 'e3', :text=>text)
-    if $Version_1_1_OrLater
-      t.item_collapse(item)
-    else # TreeCtrl 1.0
-      t.collapse(item)
-    end
-    t.item_lastchild(parentList[depth], item)
-    depth += 1
-    parentList[depth] = item
-  }
-
-  treeCtrlHelp = TkBindTag.new
-
-  treeCtrlHelp.bind('Double-ButtonPress-1',
-                    proc{|w, x, y|
-                      if w.identify(x, y)[0] == 'header'
-                        Tk::TreeCtrl::BindCallback.doubleButton1(w, x, y)
-                      else
-                        helpButton1(w, x, y)
-                      end
-                      Tk.callback_break
-                    }, '%W %x %y')
-
-  treeCtrlHelp.bind('ButtonPress-1',
-                    proc{|w, x, y|
-                      helpButton1(w, x, y)
-                      Tk.callback_break
-                    }, '%W %x %y')
-
-  treeCtrlHelp.bind('Button1-Motion',
-                    proc{|w, x, y|
-                      helpMotion1(w, x, y)
-                      Tk.callback_break
-                    }, '%W %x %y')
-
-  treeCtrlHelp.bind('Button1-Leave',
-                    proc{|w, x, y|
-                      helpLeave1(w, x, y)
-                      Tk.callback_break
-                    }, '%W %x %y')
-
-  treeCtrlHelp.bind('ButtonRelease-1',
-                    proc{|w, x, y|
-                      helpRelease1(w, x, y)
-                      Tk.callback_break
-                    }, '%W %x %y')
-
-  treeCtrlHelp.bind('Motion', proc{|w, x, y| helpMotion(w, x, y) }, '%W %x %y')
-
-  treeCtrlHelp.bind('Leave', proc{|w, x, y| helpMotion(w, x, y) }, '%W %x %y')
-
-  treeCtrlHelp.bind('KeyPress-Return',
-                    proc{|w, x, y|
-                      if w.selection_get.length == 1
-                        w.item_toggle(w.selection_get[0])
-                      end
-                      Tk.callback_break
-                    }, '%W %x %y')
-
-  @Priv[:help, :prev] = ''
-
-  t.bindtags = [ t, treeCtrlHelp, Tk::TreeCtrl, t.winfo_toplevel, :all ]
-end
-
-def helpButton1(w, x, y)
-  w.set_focus
-  id = w.identify(x, y)
-  @Priv['buttonMode'] = ''
-  if id[0] == 'header'
-    Tk::TreeCtrl::BindCallback.buttonPress1(w, x, y)
-  elsif id[0] == 'item'
-    item = id[1]
-    # didn't click an element
-    return if id.length != 6
-    if w.selection_includes(item)
-      w.toggle(item)
-      return
-    end
-    if w.selection_get.length > 0
-      item2 = w.selection_get[0]
-      if $Version_1_1_OrLater
-        w.item_collapse(item2)
-      else # TreeCtrl 1.0
-        w.collapse(item2)
-      end
-      w.item_ancestors(item2).each{|i|
-        if $Version_1_1_OrLater
-          w.item_collapse(i) if w.compare(item, '!=', i)
-        else # TreeCtrl 1.0
-          w.collapse(i) if w.compare(item, '!=', i)
-        end
-      }
-    end
-    w.activate(item)
-    if $Version_1_1_OrLater
-      w.item_ancestors(item).each{|i|
-        w.item_expand(i)
-      }
-      w.item_toggle(item)
-    else # TreeCtrl 1.0
-      w.expand(*(w.item_ancestors(item)))
-      w.toggle(item)
-    end
-    w.selection_modify(item, :all)
-  end
-end
-
-def helpMotion1(w, x, y)
-  case @Priv['buttonMode']
-  when 'resize', 'header'
-    Tk::TreeCtrl::BindCallback.motion1(w, x, y)
-  end
-end
-
-def helpLeave1(w, x, y)
-  # This is called when I do ButtonPress-1 on Unix for some reason,
-  # and buttonMode is undefined.
-  return unless @Priv.exist?('buttonMode')
-  case @Priv['buttonMode']
-  when 'header'
-    w.column_configure(@Priv['column'], :sunken=>false)
-  end
-end
-
-def helpRelease1(w, x, y)
-  case @Priv['buttonMode']
-  when 'resize', 'header'
-    Tk::TreeCtrl::BindCallback.release1(w, x, y)
-  end
-  @Priv['buttonMode'] = ''
-end
-
-def helpMotion(w, x, y)
-  id = w.identify(x, y)
-  if id.empty?
-  elsif id[0] == 'header'
-  elsif id[0] == 'item'
-    item = id[1]
-    if id.length == 6
-      if @Priv[:help, :prev] != TkComm._get_eval_string(item)
-        if @Priv[:help, :prev] != ''
-          w.item_state_set(@Priv[:help, :prev], '!mouseover')
-        end
-        w.item_state_set(item, 'mouseover')
-        @Priv[:help, :prev] = item
-      end
-      return
-    end
-  end
-  if @Priv[:help, :prev] != ''
-    w.item_state_set(@Priv[:help, :prev], '!mouseover')
-    @Priv[:help, :prev] = ''
-  end
-end
-
-# Alternate implementation doesn't rely on mouseover state
-def helpMotion2(w, x, y)
-  id = w.identify(x, y)
-  if id[0] == 'header'
-  elsif !id.empty?
-    item = id[1]
-    if id.length == 6
-      if @Priv[:help, :prev] != TkComm._get_eval_string(item)
-        if @Priv[:help, :prev] != ''
-          style = w.item_style_set(@Priv[:help, :prev], 0)
-          style.sub!(/\.f$/, '')
-          w.item_style_map(@Priv[:help, :prev], 0, style, ['e5', 'e3'])
-        end
-        style = w.item_style_set(item, 0)
-        w.item_style_map(item, 0, style + '.f', ['e3', 'e5'])
-        @Priv[:help, :prev] = item
-      end
-      return
-    end
-  end
-  if @Priv[:help, :prev] != ''
-    style = w.item_style_set(@Priv[:help, :prev], 0)
-    style.sub!(/\.f$/, '')
-    w.item_style_map(@Priv[:help, :prev], 0, style, ['e5', 'e3'])
-    @Priv[:help, :prev] = ''
-  end
-end
diff --git a/ext/tk/sample/tkextlib/treectrl/imovie.rb b/ext/tk/sample/tkextlib/treectrl/imovie.rb
deleted file mode 100644
index 4419496ac4..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/imovie.rb
+++ /dev/null
@@ -1,131 +0,0 @@
-# frozen_string_literal: false
-#
-# Demo: iMovie
-#
-def demoIMovie(t)
-  t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false,
-              :selectmode=>:browse, :orient=>:horizontal, :wrap=>:window,
-              :showheader=>false, :background=>'#dcdcdc')
-
-  if $HasColumnCreate
-    t.column_create
-  end
-
-  init_pics('imovie-*')
-
-  case @thisPlatform
-  when 'macintosh', 'macosx'
-    font1 = TkFont.new(['Geneva', 9])
-    font2 = TkFont.new(['Geneva', 10])
-  when 'unix'
-    font1 = TkFont.new(['Helvetica', -12])
-    font2 = TkFont.new(['Helvetica', -14])
-  else
-    font1 = TkFont.new(['Helvetica', 8])
-    font2 = TkFont.new(['Helvetica', 10])
-  end
-
-  t.element_create('elemTime', :text, :font=>font1)
-  t.element_create('elemName', :text, :font=>font2, :lines=>1, :width=>80)
-  t.element_create('elemRect', :rect, :outline=>'#827878', :outlinewidth=>1,
-                   :fill=>['#ffdc5a', ['selected'], 'white', []])
-  t.element_create('elemImg', :image)
-  t.element_create('elemShadow', :rect, :outline=>'gray', :outlinewidth=>1,
-                   :open=>:wn)
-
-  s = t.style_create('STYLE', :orient=>:vertical)
-  t.style_elements(s, [
-                     'elemShadow', 'elemRect', 'elemTime',
-                     'elemImg', 'elemName'
-                   ])
-  t.style_layout(s, 'elemShadow', :detach=>true,
-                 :padx=>[1,2], :pady=>[1,2], :iexpand=>:es)
-  t.style_layout(s, 'elemTime', :padx=>[2,0])
-  t.style_layout(s, 'elemImg', :pady=>[0,1])
-  t.style_layout(s, 'elemName', :expand=>:we, :ipady=>[0,2], :padx=>[0,3],
-                 :squeeze=>:x)
-  t.style_layout(s, 'elemRect', :union=>['elemTime', 'elemImg', 'elemName'],
-                 :ipadx=>6, :padx=>[0,3], :pady=>[0,3])
-
-  # Set default item style
-  if $Version_1_1_OrLater
-    t.defaultstyle([s])
-  end
-
-  (0..4).each{|i|
-    [
-      ['15:20', 'Clip 1', @images['imovie-01']],
-      ['19:18', 'Clip 2', @images['imovie-02']],
-      ['07:20', 'Clip 3', @images['imovie-03']],
-      ['07:20', 'Clip 4', @images['imovie-04']],
-      ['07:20', 'Clip 5', @images['imovie-05']],
-      ['07:20', 'Clip 6', @images['imovie-06']],
-      ['07:20', 'Clip 7', @images['imovie-07']]
-    ].each{|time, name, image|
-      item = t.item_create
-      unless $Version_1_1_OrLater
-        t.item_style_set(item, 0, s)
-      end
-      t.item_element_configure(item, 0, 'elemTime', :text=>time)
-      t.item_element_configure(item, 0, 'elemName', :text=>name)
-      t.item_element_configure(item, 0, 'elemImg', :image=>image)
-      t.item_lastchild(:root, item)
-    }
-  }
-
-  t.notify_bind(t, 'Edit-accept', proc{|w, i, c, e, tt|
-                  w.item_element_configure(i, c, e, :text=>tt)
-                }, '%T %I %C %E %t')
-
-  iMovie = TkBindTag.new
-  iMovie.bind('ButtonPress-1', proc{|w, x, y|
-                iMovieButton1(w, x, y)
-              }, '%W %x %y')
-
-  t.bindtags = [t, iMovie, Tk::TreeCtrl, t.winfo_toplevel, TkBindTag::ALL]
-end
-
-def iMovieButton1(w, x, y)
-  w.set_focus
-  id = w.identify(x,y)
-
-  if id.empty?
-    # Click outside any item
-
-  elsif id[0] == 'header'
-    # Click in header
-    Tk::TreeCtrl::BindCallback.buttonPress1(w, x, y)
-
-  elsif id[0] == 'item'
-    # Click in item
-    Tk::TreeCtrl::BindCallback.buttonPress1(w, x, y)
-    Tk.update
-    where, item, arg1, arg2, arg3, arg4 = id
-    case arg1
-    when 'column'
-      i = id[1]
-      if id.length == 6
-        e = id[-1]
-        if e == 'elemName'
-          exists = TkWinfo.exist?(w.path + '.entry')
-          Tk::TreeCtrl::BindCallback.entryOpen(w, i, 0, e)
-          ent = TkComm.window(w.path + '.entry')
-          unless exists
-            ent.configure(:borderwidth=>0, :justify=>:center,
-                          :background=>'#ffdc5a')
-            x1, y1, x2, y2 = w.item_bbox(i, 0, e)
-            ent.place(:y=>y1 - 1)
-          end
-          ent.selection_clear
-          x1, y1, x2, y2 = w.item_bbox(i)
-          ent.place(:x=>x1 + 1, :width=>x2 - x1 - 5)
-          puts "@#{x - (x1 + 1)}"
-          # ent.icursor = ent.index("@#{x - (x1 + 1)}")
-          ent.icursor = ent.index(TkComm._at(x - (x1 + 1)))
-        end
-      end
-    end
-  end
-
-  Tk.callback_break
-end
diff --git a/ext/tk/sample/tkextlib/treectrl/layout.rb b/ext/tk/sample/tkextlib/treectrl/layout.rb
deleted file mode 100644
index 50c332641b..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/layout.rb
+++ /dev/null
@@ -1,160 +0,0 @@
-# frozen_string_literal: false
-#
-# Demo: Layout
-#
-def demoLayout(t)
-  t.configure(:showroot=>false, :showrootbutton=>true, :showbuttons=>true,
-              :showlines=>true, :itemheight=>0, :selectmode=>:browse)
-
-  if $HasColumnCreate
-    t.column_create(:text=>'Layout')
-  else
-    t.column_configure(0, :text=>'Layout')
-  end
-
-  t.element_create('e1', :rect, :width=>30, :height=>30, :fill=>'gray20')
-  t.element_create('e2', :rect, :width=>30, :height=>30, :fill=>'gray40',
-                   :outline=>'blue', :outlinewidth=>3)
-  t.element_create('e3', :rect, :fill=>'gray60')
-  t.element_create('e4', :rect, :showfocus=>true,
-                   :fill=>[
-                     @SystemHighlight, ['selected', 'focus'], 'gray80', []
-                   ])
-  t.element_create('e5', :rect, :fill=>'{sky blue}', :width=>20, :height=>20)
-  t.element_create('e6', :rect, :fill=>'{sea green}', :width=>30, :height=>16)
-  t.element_create('e7', :rect, :fill=>'{sky blue}', :width=>30, :height=>16)
-  t.element_create('e8', :rect, :fill=>'gray70', :height=>1)
-
-  s = t.style_create('s1')
-  t.style_elements(s, ['e4', 'e3', 'e1', 'e2', 'e5', 'e6', 'e7'])
-  t.style_layout(s, 'e1', :padx=>[28, 4], :pady=>4)
-  t.style_layout(s, 'e2', :expand=>:es, :padx=>[0, 38])
-  t.style_layout(s, 'e3', :union=>['e1', 'e2'], :ipadx=>4, :ipady=>4, :pady=>2)
-  t.style_layout(s, 'e4', :detach=>true, :iexpand=>:es)
-  t.style_layout(s, 'e5', :detach=>true, :padx=>[2,0], :pady=>2, :iexpand=>:s)
-  t.style_layout(s, 'e6', :detach=>true, :expand=>:ws,
-                 :padx=>[0,2], :pady=>[2,0])
-  t.style_layout(s, 'e7', :detach=>true, :expand=>:wn,
-                 :padx=>[0,2], :pady=>[0,2])
-
-  if $Version_1_1_OrLater
-    i = t.item_create(:button=>true)
-  else
-    i = t.item_create
-    t.item_hasbutton(i, true)
-  end
-  t.item_style_set(i, 0, s)
-  t.item_lastchild(:root, i)
-  parent = i
-
-  i = t.item_create()
-  unless $Version_1_1_OrLater
-    t.item_hasbutton(i, false)
-  end
-  t.item_style_set(i, 0, s)
-  t.item_lastchild(parent, i)
-
-  ###
-
-  s = t.style_create('s2')
-  t.style_elements(s, ['e4', 'e3', 'e1'])
-  t.style_layout(s, 'e1', :padx=>8, :pady=>8, :iexpand=>:e)
-  t.style_layout(s, 'e3', :union=>['e1'], :ipadx=>[20,4], :ipady=>[4,12])
-  t.style_layout(s, 'e4', :detach=>true, :iexpand=>:es)
-
-  if $Version_1_1_OrLater
-    i = t.item_create(:button=>true)
-  else
-    i = t.item_create
-    t.item_hasbutton(i, true)
-  end
-  t.item_style_set(i, 0, s)
-  t.item_lastchild(:root, i)
-
-  i2 = t.item_create()
-  unless $Version_1_1_OrLater
-    t.item_hasbutton(i2, false)
-  end
-  t.item_style_set(i2, 0, s)
-  t.item_lastchild(i, i2)
-
-  ###
-
-  s = t.style_create('s3')
-  t.style_elements(s, ['e4', 'e3', 'e1', 'e5', 'e6'])
-  t.style_layout(s, 'e4', :union=>['e1', 'e6'], :ipadx=>8, :ipady=>[8,0])
-  t.style_layout(s, 'e3', :union=>['e1', 'e5'], :ipadx=>4, :ipady=>4)
-  t.style_layout(s, 'e5', :ipady=>[0,20])
-
-  if $Version_1_1_OrLater
-    i = t.item_create(:button=>true)
-  else
-    i = t.item_create
-    t.item_hasbutton(i, true)
-  end
-  t.item_style_set(i, 0, s)
-  t.item_lastchild(:root, i)
-
-  i2 = t.item_create()
-  unless $Version_1_1_OrLater
-    t.item_hasbutton(i2, false)
-  end
-  t.item_style_set(i2, 0, s)
-  t.item_lastchild(i, i2)
-
-  ###
-
-  t.element_create('eb', :border, :background=>@SystemButtonFace,
-                   :relief=>[:sunken, ['selected'], :raised, []],
-                   :thickness=>2, :filled=>true)
-  t.element_create('et', :text)
-
-  text = "Here is a text element surrounded by a border element.\nResize the column to watch me wrap."
-
-  s = t.style_create('e4')
-  t.style_elements(s, ['eb', 'et'])
-  t.style_layout(s, 'eb', :union=>['et'], :ipadx=>2, :ipady=>2)
-  t.style_layout(s, 'et', :squeeze=>:x)
-
-  if $Version_1_1_OrLater
-    i = t.item_create(:button=>true)
-  else
-    i = t.item_create
-    t.item_hasbutton(i, true)
-  end
-  t.item_style_set(i, 0, s)
-  t.item_text(i, 0, text)
-  t.item_lastchild(:root, i)
-  parent = i
-
-  i = t.item_create()
-  unless $Version_1_1_OrLater
-    t.item_hasbutton(i, false)
-  end
-  t.item_style_set(i, 0, s)
-  t.item_text(i, 0, text)
-  t.item_lastchild(parent, i)
-
-  ###
-
-  styleNum = 5
-  [
-    [:horizontal, [:s, :ns, :n]],
-    [:vertical,   [:e, :we, :w]]
-  ].each{|orient, expandList|
-    expandList.each{|expand|
-      s = t.style_create("s#{styleNum}", :orient=>orient)
-      t.style_elements(s, ['e4', 'e8', 'e2', 'e5', 'e6'])
-      t.style_layout(s, 'e4', :detach=>true, :iexpand=>:es)
-      t.style_layout(s, 'e8', :detach=>true, :expand=>:n, :iexpand=>:e)
-      t.style_layout(s, 'e2', :expand=>expand)
-      t.style_layout(s, 'e5', :expand=>expand)
-      t.style_layout(s, 'e6', :expand=>expand)
-      styleNum += 1
-
-      i = t.item_create()
-      t.item_style_set(i, 0, s)
-      t.item_lastchild(:root, i)
-    }
-  }
-end
diff --git a/ext/tk/sample/tkextlib/treectrl/mailwasher.rb b/ext/tk/sample/tkextlib/treectrl/mailwasher.rb
deleted file mode 100644
index 81ffe743b6..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/mailwasher.rb
+++ /dev/null
@@ -1,270 +0,0 @@
-# frozen_string_literal: false
-#
-# Demo: MailWasher
-#
-def demoMailWasher(t)
-  init_pics('*checked')
-
-  height = t.font.metrics(:linespace) + 2
-  height = 18 if height < 18
-
-  t.configure(:showroot=>false, :showrootbutton=>false, :showbuttons=>false,
-              :showlines=>false, :itemheight=>height, :selectmode=>:browse,
-              :xscrollincrement=>1)
-
-  pad = 4
-
-  if $Version_1_1_OrLater
-    t.column_create(:text=>'Delete', :textpadx=>pad, :tag=>'delete')
-    t.column_create(:text=>'Bounce', :textpadx=>pad, :tag=>'bounce')
-    t.column_create(:text=>'Status', :width=>80, :textpadx=>pad,
-                    :tag=>'status')
-    t.column_create(:text=>'Size', :width=>40, :textpadx=>pad,
-                    :justify=>:right, :tag=>'size')
-    t.column_create(:text=>'From', :width=>140, :textpadx=>pad, :tag=>'from')
-    t.column_create(:text=>'Subject', :width=>240, :textpadx=>pad,
-                    :tag=>'subject')
-    t.column_create(:text=>'Received', :textpadx=>pad, :arrow=>:up,
-                    :arrowpad=>[4,0], :tag=>'received')
-    t.column_create(:text=>'Attachments', :textpadx=>pad, :tag=>'attachments')
-
-    t.state_define('CHECK')
-
-    t.element_create('imgCheck', :image, :image=>[
-                       @images['checked'], ['CHECK'], @images['unchecked'], []
-                     ])
-
-  else # TreeCtrl 1.0
-    t.column_configure(0, :text=>'Delete', :textpadx=>pad, :tag=>'delete')
-    t.column_configure(1, :text=>'Bounce', :textpadx=>pad, :tag=>'bounce')
-    t.column_configure(2, :text=>'Status', :width=>80, :textpadx=>pad,
-                       :tag=>'status')
-    t.column_configure(3, :text=>'Size', :width=>40, :textpadx=>pad,
-                       :justify=>:right, :tag=>'size')
-    t.column_configure(4, :text=>'From', :width=>140, :textpadx=>pad,
-                       :tag=>'from')
-    t.column_configure(5, :text=>'Subject', :width=>240, :textpadx=>pad,
-                       :tag=>'subject')
-    t.column_configure(6, :text=>'Received', :textpadx=>pad, :arrow=>:up,
-                       :arrowpad=>[4,0], :tag=>'received')
-    t.column_configure(7, :text=>'Attachments', :textpadx=>pad,
-                       :tag=>'attachments')
-
-    t.element_create('imgOff', :image, :image=>@images['unchecked'])
-    t.element_create('imgOn', :image, :image=>@images['checked'])
-  end
-
-  t.element_create('border', :rect, :open=>:nw, :outline=>'gray',
-                   :outlinewidth=>1, :fill=>[@SystemHighlight, ['selected']])
-  t.element_create('txtAny', :text, :lines=>1,
-                   :fill=>[@SystemHighlightText, ['selected']])
-  t.element_create('txtNone', :text, :text=>'none', :lines=>1,
-                   :fill=>[@SystemHighlightText, ['selected']])
-  t.element_create('txtYes', :text, :text=>'yes', :lines=>1,
-                   :fill=>[@SystemHighlightText, ['selected']])
-  t.element_create('txtNormal', :text, :text=>'Normal', :lines=>1,
-                   :fill=>[@SystemHighlightText, ['selected'], '#006800', []])
-  t.element_create('txtPossSpam', :text, :text=>'Possible Spam', :lines=>1,
-                   :fill=>[@SystemHighlightText, ['selected'], '#787800', []])
-  t.element_create('txtProbSpam', :text, :text=>'Probably Spam', :lines=>1,
-                   :fill=>[@SystemHighlightText, ['selected'], '#FF9000', []])
-  t.element_create('txtBlacklist', :text, :text=>'Blacklisted', :lines=>1,
-                   :fill=>[@SystemHighlightText, ['selected'], '#FF5800', []])
-
-  if $Version_1_1_OrLater
-    s = t.style_create('styCheck')
-    t.style_elements(s, ['border', 'imgCheck'])
-    t.style_layout(s, 'border', :detach=>true, :iexpand=>:es)
-    t.style_layout(s, 'imgCheck', :expand=>:news)
-  else
-    ['Off', 'On'].each{|name|
-      s = t.style_create('sty' << name)
-      i = 'img' << name
-      t.style_elements(s, ['border', i])
-      t.style_layout(s, 'border', :detach=>true, :iexpand=>:es)
-      t.style_layout(s, i, :expand=>:news)
-    }
-  end
-
-  pad = 4
-
-  %w(Any None Yes Normal PossSpam ProbSpam Blacklist).each{|name|
-    s = t.style_create('sty' << name)
-    e = 'txt' << name
-    t.style_elements(s, ['border', e])
-    t.style_layout(s, 'border', :detach=>true, :iexpand=>:es)
-    t.style_layout(s, e, :padx=>pad, :squeeze=>:x, :expand=>:ns)
-  }
-
-  [
-    ['baldy@spammer.com',  "Your hair is thinning"],
-    ['flat@spammer.com', "Your breasts are too small"],
-    ['tiny@spammer.com',  "Your penis is too small"],
-    ['dumbass@spammer.com', "You are not very smart"],
-    ['bankrobber@spammer.com', "You need more money"],
-    ['loser@spammer.com', "You need better friends"],
-    ['gossip@spammer.com', "Find out what your coworkers think about you"],
-    ['whoami@spammer.com', "Find out what you think about yourself"],
-    ['downsized@spammer.com', "You need a better job"],
-    ['poorhouse@spammer.com', "Your mortgage is a joke"],
-    ['spam4ever@spammer.com', "You need more spam"]
-  ].each{|frm, subj|
-    item = t.item_create
-    status = ['styNormal','styPossSpam','styProbSpam','styBlacklist'][rand(4)]
-    attachments = ['styNone','styYes'][rand(2)]
-
-    if $Version_1_1_OrLater
-      delete = [false, true][rand(2)]
-      bounce = [false, true][rand(2)]
-      t.item_style_set(item,
-                       0, 'styCheck', 1, 'styCheck', 2, status, 3, 'styAny',
-                       4, 'styAny', 5, 'styAny', 6, 'styAny', 7, attachments)
-      t.item_state_forcolumn(item, 'delete', 'CHECK') if delete
-      t.item_state_forcolumn(item, 'bounce', 'CHECK') if bounce
-
-    else # TreeCtrl 1.0
-      delete = ['styOn', 'styOff'][rand(2)]
-      bounce = ['styOn', 'styOff'][rand(2)]
-      t.item_style_set(item,
-                       0, delete, 1, bounce, 2, status, 3, 'styAny',
-                       4, 'styAny', 5, 'styAny', 6, 'styAny', 7, attachments)
-    end
-
-    bytes = 512 + rand(1024 * 12)
-    size = "#{bytes / 1024 + 1}KB"
-    seconds = Tk::Clock.seconds - rand(100000)
-    received = Tk::Clock.format(seconds, '%d/%m/%y %I:%M %p')
-    t.item_text(item, 3, size, 4, frm, 5, subj, 6, received)
-    t.item_lastchild(:root, item)
-  }
-
-  sortColumn = 6
-  t.notify_bind(t, 'Header-invoke',
-                proc{|c, w|
-                  if c == sortColumn
-                    if w.column_cget(sortColumn, :arrow) == 'down'
-                      order = :increasing
-                      arrow = :up
-                    else
-                      order = :decreasing
-                      arrow = :down
-                    end
-                  else
-                    if w.column_cget(sortColumn, :arrow) == 'down'
-                      order = :decreasing
-                      arrow = :down
-                    else
-                      order = :increasing
-                      arrow = :up
-                    end
-                    w.column_configure(sortColumn, :arrow=>:none)
-                    sortColumn = c
-                  end
-                  w.column_configure(c, :arrow=>arrow)
-                  case w.column_cget(c, :tag)
-                  when 'bounce', 'delete'
-                    w.item_sort(:root, order,
-                                {
-                                  :column=>c,
-                                  :command=>proc{|item1, item2|
-                                    compareOnOff(w, c, item1, item2)
-                                  }
-                                },
-                                { :column=>'subject', :dictionary=>true })
-                  when 'status'
-                    w.item_sort(:root, order,
-                                { :column=>c, :dictionary=>true })
-                  when 'from'
-                    w.item_sort(:root, order,
-                                { :column=>c, :dictionary=>true },
-                                { :column=>'subject', :dictionary=>true })
-                  when 'subject'
-                    w.item_sort(:root, order,
-                                { :column=>c, :dictionary=>true })
-                  when 'size'
-                    w.item_sort(:root, order,
-                                { :column=>c, :dictionary=>true },
-                                { :column=>'subject', :dictionary=>true })
-                  when 'received'
-                    w.item_sort(:root, order,
-                                { :column=>c, :dictionary=>true },
-                                { :column=>'subject', :dictionary=>true })
-                  when 'attachments'
-                    w.item_sort(:root, order,
-                                { :column=>c, :dictionary=>true },
-                                { :column=>'subject', :dictionary=>true })
-                  end
-                }, '%C %T')
-
-  mailWasher = TkBindTag.new
-
-  if $Version_1_1_OrLater
-    mailWasher.bind('ButtonPress-1',
-                    proc{|w, x, y|
-                      id = w.identify(x, y)
-                      if id.empty?
-                      elsif id[0] == 'header'
-                      else
-                        what, item, where, arg1, arg2, arg3 = id
-                        if where == 'column'
-                          tag = w.column_cget(arg1, :tag)
-                          if tag == 'delete' || tag == 'bounce'
-                            w.item_state_forcolumn(item, arg1, '~CHECK')
-                          end
-                        end
-                      end
-                    }, '%W %x %y')
-  else # TreeCtrl 1.0
-    mailWasher.bind('ButtonPress-1',
-                    proc{|w, x, y|
-                      id = w.identify(x, y)
-                      if id.empty?
-                      elsif id[0] == 'header'
-                      else
-                        what, item, where, arg1, arg2, arg3 = id
-                        if where == 'column'
-                          tag = w.column_cget(arg1, :tag)
-                          if tag == 'delete' || tag == 'bounce'
-                            style = w.item_style_set(item, arg1)
-                            if style == 'styOn'
-                              style = 'styOff'
-                            else
-                              style = 'styOn'
-                            end
-                            w.item_style_set(item, arg1, style)
-                            @display_styles_in_item.call(item)
-                          end
-                        end
-                      end
-                    }, '%W %x %y')
-  end
-
-  t.bindtags = [t, mailWasher, Tk::TreeCtrl, t.winfo_toplevel, TkBindTag::ALL]
-end
-
-if $Version_1_1_OrLater
-  def compareOnOff(w, c, item1, item2)
-    s1 = w.item_state_forcolumn(item1, c)
-    s2 = w.item_state_forcolumn(item2, c)
-    if (s1 == s2)
-      0
-    elsif (s1 == 'CHECK')
-      -1
-    else
-      1
-    end
-  end
-
-else # TreeCtrl 1.0
-  def compareOnOff(w, c, item1, item2)
-    s1 = w.item_style_set(item1, c)
-    s2 = w.item_style_set(item2, c)
-    if (s1 == s2)
-      0
-    elsif (s1 == 'styOff')
-      -1
-    else
-      1
-    end
-  end
-end
diff --git a/ext/tk/sample/tkextlib/treectrl/outlook-folders.rb b/ext/tk/sample/tkextlib/treectrl/outlook-folders.rb
deleted file mode 100644
index 8707251ee9..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/outlook-folders.rb
+++ /dev/null
@@ -1,125 +0,0 @@
-# frozen_string_literal: false
-#
-# Demo: Outlook Express folder list
-#
-def demoOutlookFolders(t)
-  init_pics('outlook-*')
-
-  height = t.font.metrics(:linespace) + 2
-  height = 18 if height < 18
-
-  t.configure(:itemheight=>height, :selectmode=>:browse, :showlines=>true,
-              :showroot=>true, :showrootbutton=>false, :showbuttons=>true)
-
-  if $HasColumnCreate
-    t.column_create(:text=>'Folders')
-  else
-    t.column_configure(0, :text=>'Folders')
-  end
-
-  t.element_create('e1', :image)
-  t.element_create('e2', :text, :lines=>1,
-                   :fill=>[@SystemHighlightText, ['selected', 'focus']])
-  t.element_create('e3', :text, :lines=>1, :font=>t.font.dup.weight(:bold),
-                   :fill=>[@SystemHighlightText, ['selected', 'focus']])
-  t.element_create('e4', :text, :fill=>'blue')
-  t.element_create('e5', :image, :image=>@images['outlook-folder'])
-  t.element_create('e6', :rect, :showfocus=>true,
-                   :fill=>[
-                     @SystemHighlight, ['selected', 'focus'],
-                     'gray', ['selected', '!focus']
-                   ])
-
-  # image + text
-  s = t.style_create('s1')
-  t.style_elements(s, ['e6', 'e1', 'e2'])
-  t.style_layout(s, 'e1', :expand=>:ns)
-  t.style_layout(s, 'e2', :padx=>[4,0], :expand=>:ns, :squeeze=>:x)
-  t.style_layout(s, 'e6', :union=>['e2'], :iexpand=>:ns, :ipadx=>2)
-
-  # image + text + text
-  s = t.style_create('s2')
-  t.style_elements(s, ['e6', 'e1', 'e3', 'e4'])
-  t.style_layout(s, 'e1', :expand=>:ns)
-  t.style_layout(s, 'e3', :padx=>4, :expand=>:ns, :squeeze=>:x)
-  t.style_layout(s, 'e4', :expand=>:ns)
-  t.style_layout(s, 'e6', :union=>['e3'], :iexpand=>:ns, :ipadx=>2)
-
-  # folder + text
-  s = t.style_create('s3')
-  t.style_elements(s, ['e6', 'e5', 'e2'])
-  t.style_layout(s, 'e5', :expand=>:ns)
-  t.style_layout(s, 'e2', :padx=>[4,0], :expand=>:ns, :squeeze=>:x)
-  t.style_layout(s, 'e6', :union=>['e2'], :iexpand=>:ns, :ipadx=>2)
-
-  # folder + text + text
-  s = t.style_create('s4')
-  t.style_elements(s, ['e6', 'e5', 'e3', 'e4'])
-  t.style_layout(s, 'e5', :expand=>:ns)
-  t.style_layout(s, 'e3', :padx=>4, :expand=>:ns, :squeeze=>:x)
-  t.style_layout(s, 'e4', :expand=>:ns)
-  t.style_layout(s, 'e6', :union=>['e3'], :iexpand=>:ns, :ipadx=>2)
-
-  t.item_style_set(:root, 0, 's1')
-  t.item_complex(:root,
-                 [
-                   ['e1', {:image=>@images['outlook-main']}],
-                   ['e2', {:text=>'Outlook Express'}]
-                 ])
-
-  parentList = [:root, '', '', '', '', '', '']
-  parent = :root
-  [
-     [0, :local, "Local Folders", true, 0],
-        [1, :inbox, 'Inbox', false, 5],
-        [1, :outbox, 'Outbox', false, 0],
-        [1, :sent, "Sent Items", false, 0],
-        [1, :deleted, "Deleted Items", false, 50],
-        [1, :draft, 'Drafts', false, 0],
-        [1, :folder, "Messages to Dad", false, 0],
-        [1, :folder, "Messages to Sis", false, 0],
-        [1, :folder, "Messages to Me", false, 0],
-           [2, :folder, "2001", false, 0],
-           [2, :folder, "2000", false, 0],
-           [2, :folder, "1999", false, 0],
-     [0, :server, "news.gmane.org", true, 0],
-        [1, :group, "gmane.comp.lang.lua.general", false, 498]
-  ].each{|depth, img, text, button, unread|
-    if $Version_1_1_OrLater
-      item = t.item_create(:button=>button)
-    else
-      item = t.item_create
-      t.item_hasbutton(item, button)
-    end
-    if img == :folder
-      if unread != 0
-        t.item_style_set(item, 0, 's4')
-        t.item_complex(item,
-                       [['e3', {:text=>text}], ['e4', {:text=>"(#{unread})"}]])
-      else
-        t.item_style_set(item, 0, 's3')
-        t.item_complex(item, [['e2', {:text=>text}]])
-      end
-    else
-      if unread != 0
-        t.item_style_set(item, 0, 's2')
-        t.item_complex(item,
-                       [
-                         ['e1', {:image=>@images["outlook-#{img}"]}],
-                         ['e3', {:text=>text}],
-                         ['e4', {:text=>"(#{unread})"}]
-                       ])
-      else
-        t.item_style_set(item, 0, 's1')
-        t.item_complex(item,
-                       [
-                         ['e1', {:image=>@images["outlook-#{img}"]}],
-                         ['e2', {:text=>text}]
-                       ])
-      end
-    end
-    t.item_lastchild(parentList[depth], item)
-    depth += 1
-    parentList[depth] = item
-  }
-end
diff --git a/ext/tk/sample/tkextlib/treectrl/outlook-newgroup.rb b/ext/tk/sample/tkextlib/treectrl/outlook-newgroup.rb
deleted file mode 100644
index 3d8f015206..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/outlook-newgroup.rb
+++ /dev/null
@@ -1,449 +0,0 @@
-# frozen_string_literal: false
-#
-# Demo: Outlook Express newsgroup messages
-#
-def demoOutlookNewsgroup(t)
-  init_pics('outlook-*')
-
-  height = t.font.metrics(:linespace)
-  height = 18 if height < 18
-  t.configure(:itemheight=>height, :selectmode=>:browse, :showlines=>false,
-              :showroot=>false, :showrootbutton=>false, :showbuttons=>true)
-
-  if $Version_1_1_OrLater
-    t.column_create(:image=>@images['outlook-clip'], :tag=>'clip')
-    t.column_create(:image=>@images['outlook-arrow'], :tag=>'arrow')
-    t.column_create(:image=>@images['outlook-watch'], :tag=>'watch')
-    t.column_create(:text=>'Subject', :width=>250, :tag=>'subject')
-    t.column_create(:text=>'From', :width=>150, :tag=>'from')
-    t.column_create(:text=>'Sent', :width=>150, :tag=>'sent')
-    t.column_create(:text=>'Size', :width=>60, :justify=>:right, :tag=>'size')
-  else # TreeCtrl 1.0
-    t.column_configure(0, :image=>@images['outlook-clip'], :tag=>'clip')
-    t.column_configure(1, :image=>@images['outlook-arrow'], :tag=>'arrow')
-    t.column_configure(2, :image=>@images['outlook-watch'], :tag=>'watch')
-    t.column_configure(3, :text=>'Subject', :width=>250, :tag=>'subject')
-    t.column_configure(4, :text=>'From', :width=>150, :tag=>'from')
-    t.column_configure(5, :text=>'Sent', :width=>150, :tag=>'sent')
-    t.column_configure(6, :text=>'Size', :width=>60, :justify=>:right,
-                       :tag=>'size')
-  end
-
-  # Would be nice if I could specify a column -tag too
-  t.treecolumn = 3
-
-  # State for a read message
-  t.state_define('read')
-
-  # State for a message with unread descendants
-  t.state_define('unread')
-
-  t.element_create('elemImg', :image,
-                   :image=>[
-                     @sel_images['outlook-read-2'],
-                          ['selected', 'read', 'unread', '!open'],
-                     @images['outlook-read-2'], ['read', 'unread', '!open'],
-                     @sel_images['outlook-read'], ['selected', 'read'],
-                     @images['outlook-read'], ['read'],
-                     @sel_images['outlook-unread'], ['selected'],
-                     @images['outlook-unread'], []
-                   ])
-  t.element_create('elemTxt', :text, :lines=>1,
-                   :fill=>[@SystemHighlightText, ['selected', 'focus']],
-                   :font=>[
-                     t.font.dup.weight(:bold), ['read', 'unread', '!open'],
-                     t.font.dup.weight(:bold), ['!read']
-                   ])
-  t.element_create('sel.e', :rect, :open=>:e, :showfocus=>true,
-                   :fill=>[
-                     @SystemHighlight, ['selected', 'focus'],
-                     'gray',  ['selected', '!focus']
-                   ])
-  t.element_create('sel.w', :rect, :open=>:w, :showfocus=>true,
-                   :fill=>[
-                     @SystemHighlight, ['selected', 'focus'],
-                     'gray',  ['selected', '!focus']
-                   ])
-  t.element_create('sel.we', :rect, :open=>:we, :showfocus=>true,
-                   :fill=>[
-                     @SystemHighlight, ['selected', 'focus'],
-                     'gray',  ['selected', '!focus']
-                   ])
-
-  # Image + text
-  s = t.style_create('s1')
-  t.style_elements(s, ['sel.e', 'elemImg', 'elemTxt'])
-  t.style_layout(s, 'elemImg', :expand=>:ns)
-  t.style_layout(s, 'elemTxt', :padx=>[2,6], :squeeze=>:x, :expand=>:ns)
-  t.style_layout(s, 'sel.e', :union=>['elemTxt'],
-                 :iexpand=>:nes, :ipadx=>[2,0])
-
-  # Text
-  s = t.style_create('s2.we')
-  t.style_elements(s, ['sel.we', 'elemTxt'])
-  t.style_layout(s, 'elemTxt', :padx=>6, :squeeze=>:x, :expand=>:ns)
-  t.style_layout(s, 'sel.we', :detach=>true, :iexpand=>:es)
-
-  # Text
-  s = t.style_create('s2.w')
-  t.style_elements(s, ['sel.w', 'elemTxt'])
-  t.style_layout(s, 'elemTxt', :padx=>6, :squeeze=>:x, :expand=>:ns)
-  t.style_layout(s, 'sel.w', :detach=>true, :iexpand=>:es)
-
-  # Set default item style
-  if $Version_1_1_OrLater
-    t.defaultstyle = ['', '', '', 's1', 's2.we', 's2.we', 's2.w']
-  end
-
-  msgCnt = 100
-  thread = 0
-
-  @Message = Hash.new{|k, v| k[v] = Hash.new}
-  @Message[:count][0] = 0
-
-  items = [t.index(:root)]
-
-  (1...(msgCnt)).each{|i|
-    item_i = t.item_create
-    item_j = nil
-    j = nil
-    loop {
-      j = rand(i)
-      item_j = items[j]
-      break if j == 0
-      next if t.depth(item_j) == 5
-      next if @Message[:count][@Message[:thread][item_j]] == 15
-      break
-    }
-    t.item_lastchild(item_j, item_i)
-
-    @Message[:read][item_i] = (rand(2) == 0)
-    if j == 0
-      thread += 1
-      @Message[:thread][item_i] = thread
-      @Message[:seconds][item_i] = (Tk::Clock.seconds - rand(500000))
-      @Message[:seconds2][item_i] = @Message[:seconds][item_i]
-      @Message[:count][thread] = 1
-    else
-      @Message[:thread][item_i] = @Message[:thread][item_j]
-      @Message[:seconds][item_i] = (@Message[:seconds2][item_j] + rand(10000))
-      @Message[:seconds2][item_i] = @Message[:seconds][item_i]
-      @Message[:seconds2][item_j] = @Message[:seconds][item_i]
-      @Message[:count][@Message[:thread][item_j]] += 1
-    end
-    items << item_i
-  }
-
-  (1...(msgCnt)).each{|i|
-    item_i = items[i]
-    subject = "This is thread number #{@Message[:thread][item_i]}"
-    from = 'somebody@somewhere.net'
-    sent = Tk::Clock.format(@Message[:seconds][item_i], "%d/%m/%y %I:%M %p")
-    size = "#{1 + rand(10)}KB"
-
-    # This message has been read
-    t.item_state_set(item_i, 'read') if @Message[:read][item_i]
-
-    # This message has unread descendants
-    t.item_state_set(item_i, 'unread')  if anyUnreadDescendants(t, item_i)
-
-    if t.item_numchildren(item_i) > 0
-      if $Version_1_1_OrLater
-        t.item_configure(item_i, :button=>true)
-      else # TreeCtrl 1.0
-        t.item_hasbutton(item_i, true)
-      end
-
-      # Collapse some messages
-      if $Version_1_1_OrLater
-        t.item_collapse(item_i) if rand(2) == 0
-      else # TreeCtrl 1.0
-        t.collapse(item_i) if rand(2) == 0
-      end
-    end
-
-    unless $Version_1_1_OrLater
-      t.item_style_set(item_i, 3, 's1', 4, 's2.we', 5, 's2.we', 6, 's2.w')
-    end
-    t.item_text(item_i, 3, subject, 4, from, 5, sent, 6, size)
-  }
-
-  # Do something when the selection changes
-  t.notify_bind(t, 'Selection',
-                proc{|w|
-                  if w.selection_count == 1
-                    # One item is selected
-                    if @Message[:afterId][:id]
-                      Tk.after_cancel(@Message[:afterId][:id])
-                    end
-                    @Message[:afterId][:item] = w.selection_get[0]
-                    @Message[:afterId][:id] = Tk.after(500, proc{
-                                                         messageReadDelayed(w)
-                                                       })
-                  end
-                }, '%T')
-end
-
-def messageReadDelayed(t)
-  @Message[:afterId].delete(:id)
-  i = @Message[:afterId][:item]
-  return unless t.selection_includes(i)
-
-  # This message is not read
-  unless @Message[:read][i]
-    # Read the message
-    t.item_state_set(i, 'read')
-    @Message[:read][i] = true
-
-    # Check ancestors (except root)
-    t.item_ancestors(i)[0..-2].each{|i2|
-      # This ancestor has no more unread descendants
-      t.item_state_set(i2, '!unread') unless anyUnreadDescendants(t, i2)
-    }
-  end
-end
-
-# Alternate implementation which does not rely on run-time states
-def demoOutlookNewsgroup2(t)
-  init_pics('outlook-*')
-
-  height = t.font.metrics(:linespace)
-  height = 18 if height < 18
-  t.configure(:itemheight=>height, :selectmode=>:browse, :showlines=>false,
-              :showroot=>false, :showrootbutton=>false, :showbuttons=>true)
-
-  if $Version_1_1_OrLater
-    t.column_create(:image=>@images['outlook-clip'], :tag=>'clip')
-    t.column_create(:image=>@images['outlook-arrow'], :tag=>'arrow')
-    t.column_create(:image=>@images['outlook-watch'], :tag=>'watch')
-    t.column_create(:text=>'Subject', :width=>250, :tag=>'subject')
-    t.column_create(:text=>'From', :width=>150, :tag=>'from')
-    t.column_create(:text=>'Sent', :width=>150, :tag=>'sent')
-    t.column_create(:text=>'Size', :width=>60, :justify=>:right, :tag=>'size')
-  else # TreeCtrl 1.0
-    t.column_configure(0, :image=>@images['outlook-clip'], :tag=>'clip')
-    t.column_configure(1, :image=>@images['outlook-arrow'], :tag=>'arrow')
-    t.column_configure(2, :image=>@images['outlook-watch'], :tag=>'watch')
-    t.column_configure(3, :text=>'Subject', :width=>250, :tag=>'subject')
-    t.column_configure(4, :text=>'From', :width=>150, :tag=>'from')
-    t.column_configure(5, :text=>'Sent', :width=>150, :tag=>'sent')
-    t.column_configure(6, :text=>'Size', :width=>60, :justify=>:right,
-                       :tag=>'size')
-  end
-
-  t.treecolumn = 3
-
-  t.element_create('image.unread', :image, :image=>@images['outlook-unread'])
-  t.element_create('image.read', :image, :image=>@images['outlook-read'])
-  t.element_create('image.read2', :image, :image=>@images['outlook-read-2'])
-  t.element_create('text.read', :text, :lines=>1,
-                   :fill=>[@SystemHighlightText, ['selected', 'focus']])
-  t.element_create('text.unread', :text, :lines=>1,
-                   :fill=>[@SystemHighlightText, ['selected', 'focus']],
-                   :font=>t.font.dup.weight(:bold))
-  t.element_create('sel.e', :rect, :open=>:e, :showfocus=>true,
-                   :fill=>[
-                     @SystemHighlight, ['selected', 'focus'],
-                     'gray',  ['selected', '!focus']
-                   ])
-  t.element_create('sel.w', :rect, :open=>:w, :showfocus=>true,
-                   :fill=>[
-                     @SystemHighlight, ['selected', 'focus'],
-                     'gray',  ['selected', '!focus']
-                   ])
-  t.element_create('sel.we', :rect, :open=>:we, :showfocus=>true,
-                   :fill=>[
-                     @SystemHighlight, ['selected', 'focus'],
-                     'gray',  ['selected', '!focus']
-                   ])
-
-  # Image + text
-  s = t.style_create('unread')
-  t.style_elements(s, ['sel.e', 'image.unread', 'text.unread'])
-  t.style_layout(s, 'image.unread', :expand=>:ns)
-  t.style_layout(s, 'text.unread', :padx=>[2,6], :squeeze=>:x, :expand=>:ns)
-  t.style_layout(s, 'sel.e', :union=>['text.unread'],
-                 :iexpand=>:nes, :ipadx=>[2,0])
-
-  # Image + text
-  s = t.style_create('read')
-  t.style_elements(s, ['sel.e', 'image.read', 'text.read'])
-  t.style_layout(s, 'image.read', :expand=>:ns)
-  t.style_layout(s, 'text.read', :padx=>[2,6], :squeeze=>:x, :expand=>:ns)
-  t.style_layout(s, 'sel.e', :union=>['text.read'],
-                 :iexpand=>:nes, :ipadx=>[2,0])
-
-  # Image + text
-  s = t.style_create('read2')
-  t.style_elements(s, ['sel.e', 'image.read2', 'text.unread'])
-  t.style_layout(s, 'image.read2', :expand=>:ns)
-  t.style_layout(s, 'text.unread', :padx=>[2,6], :squeeze=>:x, :expand=>:ns)
-  t.style_layout(s, 'sel.e', :union=>['text.unread'],
-                 :iexpand=>:nes, :ipadx=>[2,0])
-
-  # Text
-  s = t.style_create('unread.we')
-  t.style_elements(s, ['sel.we', 'text.unread'])
-  t.style_layout(s, 'text.unread', :padx=>6, :squeeze=>:x, :expand=>:ns)
-  t.style_layout(s, 'sel.we', :detach=>true, :iexpand=>:es)
-
-  # Text
-  s = t.style_create('read.we')
-  t.style_elements(s, ['sel.we', 'text.read'])
-  t.style_layout(s, 'text.read', :padx=>6, :squeeze=>:x, :expand=>:ns)
-  t.style_layout(s, 'sel.we', :detach=>true, :iexpand=>:es)
-
-  # Text
-  s = t.style_create('unread.w')
-  t.style_elements(s, ['sel.w', 'text.unread'])
-  t.style_layout(s, 'text.unread', :padx=>6, :squeeze=>:x, :expand=>:ns)
-  t.style_layout(s, 'sel.w', :detach=>true, :iexpand=>:es)
-
-  # Text
-  s = t.style_create('read.w')
-  t.style_elements(s, ['sel.w', 'text.read'])
-  t.style_layout(s, 'text.read', :padx=>6, :squeeze=>:x, :expand=>:ns)
-  t.style_layout(s, 'sel.w', :detach=>true, :iexpand=>:es)
-
-  msgCnt = 100
-  thread = 0
-
-  @Message = Hash.new{|k, v| k[v] = Hash.new}
-  @Message[:count][0] = 0
-
-  (1...(msgCnt)).each{|i|
-    t.item_create
-    j = nil
-    loop {
-      j = rand(i)
-      break if j == 0
-      next if t.depth(j) == 5
-      next if @Message[:count][@Message[:thread][j]] == 15
-      break
-    }
-    t.item_lastchild(j, i)
-
-    @Message[:read][i] = (rand(2) == 0)
-    if j == 0
-      thread += 1
-      @Message[:thread][i] = thread
-      @Message[:seconds][i] = (Tk::Clock.seconds - rand(500000))
-      @Message[:seconds2][i] = @Message[:seconds][i]
-      @Message[:count][thread] = 1
-    else
-      @Message[:thread][i] = @Message[:thread][j]
-      @Message[:seconds][i] = (@Message[:seconds2][j] + rand(10000))
-      @Message[:seconds2][i] = @Message[:seconds][i]
-      @Message[:seconds2][j] = @Message[:seconds][i]
-      @Message[:count][@Message[:thread][j]] += 1
-    end
-  }
-
-  (1...(msgCnt)).each{|i|
-    subject = "This is thread number #{@Message[:thread][i]}"
-    from = 'somebody@somewhere.net'
-    sent = Tk::Clock.format(@Message[:seconds][i], "%d/%m/%y %I:%M %p")
-    size = "#{1 + rand(10)}KB"
-    if @Message[:read][i]
-      style = 'read'
-      style2 = 'read2'
-    else
-      style = 'unread'
-      style2 = 'unread2'
-    end
-    t.item_style_set(i, 3, style, 4, "#{style2}.we", 5, "#{style2}.we",
-                     6, "#{style2}.w")
-    t.item_text(i, 3, subject, 4, from, 5, sent, 6, size)
-    if t.item_numchildren(i) > 0
-      t.item_configure(item_i, :button=>true)
-    end
-  }
-
-  # Do something when the selection changes
-  t.notify_bind(t, 'Selection',
-                proc{|w|
-                  if w.selection_count == 1
-                    i = t.selection_get[0]
-                    unless @Message[:read][i]
-                      if t.item_isopen(i) || !anyUnreadDescendants(t, i)
-                        # unread -> read
-                        t.item_style_map(i, 'subject', 'read',
-                                         ['text.unread', 'text.read'])
-                        t.item_style_map(i, 'from', 'read.we',
-                                         ['text.unread', 'text.read'])
-                        t.item_style_map(i, 'sent', 'read.we',
-                                         ['text.unread', 'text.read'])
-                        t.item_style_map(i, 'size', 'read.w',
-                                         ['text.unread', 'text.read'])
-                      else
-                        # unread -> read2
-                        t.item_style_map(i, 'subject', 'read2',
-                                         ['text.unread', 'text.unread'])
-                      end
-
-                      @Message[:read][i] = true
-                      @display_styles_in_item.call(i)
-                    end
-                  end
-                }, '%T')
-
-  t.notify_bind(t, 'Expand-after',
-                proc{|w, i|
-                  if @Message[:read][i] && anyUnreadDescendants(t, i)
-                    # read2 -> read
-                    t.item_style_map(i, 'subject', 'read',
-                                     ['text.unread', 'text.read'])
-                    # unread -> read
-                    t.item_style_map(i, 'from', 'read.we',
-                                     ['text.unread', 'text.read'])
-                    t.item_style_map(i, 'sent', 'read.we',
-                                     ['text.unread', 'text.read'])
-                    t.item_style_map(i, 'size', 'read.w',
-                                     ['text.unread', 'text.read'])
-                  end
-                }, '%T %I')
-
-  t.notify_bind(t, 'Collapse-after',
-                proc{|w, i|
-                  if @Message[:read][i] && anyUnreadDescendants(t, i)
-                    # read -> read2
-                    t.item_style_map(i, 'subject', 'read2',
-                                     ['text.read', 'text.unread'])
-                    # read -> unread
-                    t.item_style_map(i, 'from', 'unread.we',
-                                     ['text.read', 'text.unread'])
-                    t.item_style_map(i, 'sent', 'unread.we',
-                                     ['text.read', 'text.unread'])
-                    t.item_style_map(i, 'size', 'unread.w',
-                                     ['text.read', 'text.unread'])
-                  end
-                }, '%T %I')
-
-  (1...(msgCnt)).each{|i|
-    if rand(2) == 0
-      if t.item_numchildren(i) > 0
-        if $Version_1_1_OrLater
-          t.item_collapse(i)
-        else # TreeCtrl 1.0
-          t.collapse(i)
-        end
-      end
-    end
-  }
-end
-
-def anyUnreadDescendants(t, i)
-  itemList = []
-  item = t.item_firstchild(i)
-  itemList.push(item) if item != ''
-
-  while item = itemList.pop
-    return true unless @Message[:read][item]
-
-    item2 = t.item_nextsibling(item)
-    itemList.push(item2) if item2 != ''
-    item2 = t.item_firstchild(item)
-    itemList.push(item2) if item2 != ''
-  end
-  false
-end
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/big-dll.gif b/ext/tk/sample/tkextlib/treectrl/pics/big-dll.gif
deleted file mode 100644
index 09170c0e26..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/big-dll.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/big-exe.gif b/ext/tk/sample/tkextlib/treectrl/pics/big-exe.gif
deleted file mode 100644
index e19aac1a2d..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/big-exe.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/big-file.gif b/ext/tk/sample/tkextlib/treectrl/pics/big-file.gif
deleted file mode 100644
index 6c752312a3..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/big-file.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/big-folder.gif b/ext/tk/sample/tkextlib/treectrl/pics/big-folder.gif
deleted file mode 100644
index 186c9749fd..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/big-folder.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/big-txt.gif b/ext/tk/sample/tkextlib/treectrl/pics/big-txt.gif
deleted file mode 100644
index a93492586e..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/big-txt.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/checked.gif b/ext/tk/sample/tkextlib/treectrl/pics/checked.gif
deleted file mode 100644
index 3b9b176ab3..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/checked.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/file.gif b/ext/tk/sample/tkextlib/treectrl/pics/file.gif
deleted file mode 100644
index a64c2a06bd..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/file.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/folder-closed.gif b/ext/tk/sample/tkextlib/treectrl/pics/folder-closed.gif
deleted file mode 100644
index 0a064376c9..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/folder-closed.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/folder-open.gif b/ext/tk/sample/tkextlib/treectrl/pics/folder-open.gif
deleted file mode 100644
index 3fac27ffd9..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/folder-open.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/help-book-closed.gif b/ext/tk/sample/tkextlib/treectrl/pics/help-book-closed.gif
deleted file mode 100644
index 0a0497bfa3..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/help-book-closed.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/help-book-open.gif b/ext/tk/sample/tkextlib/treectrl/pics/help-book-open.gif
deleted file mode 100644
index 40656c5194..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/help-book-open.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/help-page.gif b/ext/tk/sample/tkextlib/treectrl/pics/help-page.gif
deleted file mode 100644
index e1ce1d72f5..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/help-page.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/imovie-01.gif b/ext/tk/sample/tkextlib/treectrl/pics/imovie-01.gif
deleted file mode 100644
index 5fd9215551..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/imovie-01.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/imovie-02.gif b/ext/tk/sample/tkextlib/treectrl/pics/imovie-02.gif
deleted file mode 100644
index 3d2d1c17c2..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/imovie-02.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/imovie-03.gif b/ext/tk/sample/tkextlib/treectrl/pics/imovie-03.gif
deleted file mode 100644
index 9fccf12b51..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/imovie-03.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/imovie-04.gif b/ext/tk/sample/tkextlib/treectrl/pics/imovie-04.gif
deleted file mode 100644
index eff851c9bb..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/imovie-04.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/imovie-05.gif b/ext/tk/sample/tkextlib/treectrl/pics/imovie-05.gif
deleted file mode 100644
index ad00c827f6..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/imovie-05.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/imovie-06.gif b/ext/tk/sample/tkextlib/treectrl/pics/imovie-06.gif
deleted file mode 100644
index 238bf162ac..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/imovie-06.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/imovie-07.gif b/ext/tk/sample/tkextlib/treectrl/pics/imovie-07.gif
deleted file mode 100644
index a9287e1b1c..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/imovie-07.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/internet-check-off.gif b/ext/tk/sample/tkextlib/treectrl/pics/internet-check-off.gif
deleted file mode 100644
index e64866a394..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/internet-check-off.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/internet-check-on.gif b/ext/tk/sample/tkextlib/treectrl/pics/internet-check-on.gif
deleted file mode 100644
index cf652beff2..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/internet-check-on.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/internet-print.gif b/ext/tk/sample/tkextlib/treectrl/pics/internet-print.gif
deleted file mode 100644
index 7ac25b10e9..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/internet-print.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/internet-radio-off.gif b/ext/tk/sample/tkextlib/treectrl/pics/internet-radio-off.gif
deleted file mode 100644
index 90ef62971f..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/internet-radio-off.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/internet-radio-on.gif b/ext/tk/sample/tkextlib/treectrl/pics/internet-radio-on.gif
deleted file mode 100644
index 9de742c198..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/internet-radio-on.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/internet-search.gif b/ext/tk/sample/tkextlib/treectrl/pics/internet-search.gif
deleted file mode 100644
index 1f9a047701..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/internet-search.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/internet-security.gif b/ext/tk/sample/tkextlib/treectrl/pics/internet-security.gif
deleted file mode 100644
index 86d3943786..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/internet-security.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/mac-collapse.gif b/ext/tk/sample/tkextlib/treectrl/pics/mac-collapse.gif
deleted file mode 100644
index 81302c80c1..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/mac-collapse.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/mac-expand.gif b/ext/tk/sample/tkextlib/treectrl/pics/mac-expand.gif
deleted file mode 100644
index 0a2cd80040..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/mac-expand.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/outlook-arrow.gif b/ext/tk/sample/tkextlib/treectrl/pics/outlook-arrow.gif
deleted file mode 100644
index b1c2afd426..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/outlook-arrow.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/outlook-clip.gif b/ext/tk/sample/tkextlib/treectrl/pics/outlook-clip.gif
deleted file mode 100644
index 8578132702..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/outlook-clip.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/outlook-deleted.gif b/ext/tk/sample/tkextlib/treectrl/pics/outlook-deleted.gif
deleted file mode 100644
index 7cc8369b4b..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/outlook-deleted.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/outlook-draft.gif b/ext/tk/sample/tkextlib/treectrl/pics/outlook-draft.gif
deleted file mode 100644
index f19585050f..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/outlook-draft.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/outlook-folder.gif b/ext/tk/sample/tkextlib/treectrl/pics/outlook-folder.gif
deleted file mode 100644
index b3f733563b..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/outlook-folder.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/outlook-group.gif b/ext/tk/sample/tkextlib/treectrl/pics/outlook-group.gif
deleted file mode 100644
index 29ad9b466e..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/outlook-group.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/outlook-inbox.gif b/ext/tk/sample/tkextlib/treectrl/pics/outlook-inbox.gif
deleted file mode 100644
index f41d804444..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/outlook-inbox.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/outlook-local.gif b/ext/tk/sample/tkextlib/treectrl/pics/outlook-local.gif
deleted file mode 100644
index 0c74970d32..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/outlook-local.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/outlook-main.gif b/ext/tk/sample/tkextlib/treectrl/pics/outlook-main.gif
deleted file mode 100644
index 92325fa85f..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/outlook-main.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/outlook-outbox.gif b/ext/tk/sample/tkextlib/treectrl/pics/outlook-outbox.gif
deleted file mode 100644
index c7e80527a0..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/outlook-outbox.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/outlook-read-2.gif b/ext/tk/sample/tkextlib/treectrl/pics/outlook-read-2.gif
deleted file mode 100644
index 2f15a3af05..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/outlook-read-2.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/outlook-read.gif b/ext/tk/sample/tkextlib/treectrl/pics/outlook-read.gif
deleted file mode 100644
index a6f956207a..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/outlook-read.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/outlook-sent.gif b/ext/tk/sample/tkextlib/treectrl/pics/outlook-sent.gif
deleted file mode 100644
index 963b56c4c9..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/outlook-sent.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/outlook-server.gif b/ext/tk/sample/tkextlib/treectrl/pics/outlook-server.gif
deleted file mode 100644
index c950845d62..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/outlook-server.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/outlook-unread.gif b/ext/tk/sample/tkextlib/treectrl/pics/outlook-unread.gif
deleted file mode 100644
index 3df4b99439..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/outlook-unread.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/outlook-watch.gif b/ext/tk/sample/tkextlib/treectrl/pics/outlook-watch.gif
deleted file mode 100644
index 87ec861312..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/outlook-watch.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/sky.gif b/ext/tk/sample/tkextlib/treectrl/pics/sky.gif
deleted file mode 100644
index b7fbf14a0a..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/sky.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/small-dll.gif b/ext/tk/sample/tkextlib/treectrl/pics/small-dll.gif
deleted file mode 100644
index d8875ec23f..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/small-dll.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/small-exe.gif b/ext/tk/sample/tkextlib/treectrl/pics/small-exe.gif
deleted file mode 100644
index 69d30beacd..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/small-exe.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/small-file.gif b/ext/tk/sample/tkextlib/treectrl/pics/small-file.gif
deleted file mode 100644
index f340662879..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/small-file.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/small-folder.gif b/ext/tk/sample/tkextlib/treectrl/pics/small-folder.gif
deleted file mode 100644
index ad1b24da84..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/small-folder.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/small-txt.gif b/ext/tk/sample/tkextlib/treectrl/pics/small-txt.gif
deleted file mode 100644
index cdc7cbfe99..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/small-txt.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/pics/unchecked.gif b/ext/tk/sample/tkextlib/treectrl/pics/unchecked.gif
deleted file mode 100644
index 833e48268b..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/pics/unchecked.gif
+++ /dev/null
diff --git a/ext/tk/sample/tkextlib/treectrl/random.rb b/ext/tk/sample/tkextlib/treectrl/random.rb
deleted file mode 100644
index 33bbcc2631..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/random.rb
+++ /dev/null
@@ -1,509 +0,0 @@
-# frozen_string_literal: false
-#
-def random_N
-  @RandomN[0] || 500
-end
-
-#
-# Demo: random N items
-#
-def demoRandom(t)
-  init_pics('folder-*', 'small-*')
-
-  height = t.font.metrics(:linespace)
-  height = 18 if height < 18
-  t.configure(:itemheight=>height, :selectmode=>:extended,
-              :showroot=>true, :showrootbutton=>true, :showbuttons=>true,
-              :showlines=>true, :scrollmargin=>16,
-              :xscrolldelay=>[500, 50], :yscrolldelay=>[500, 50])
-
-  if $Version_1_1_OrLater
-    t.column_create(:expand=>true, :text=>'Item',
-                    :itembackground=>['#e0e8f0', []], :tag=>'item')
-    t.column_create(:text=>'Parent', :justify=>:center,
-                    :itembackground=>['gray90', []], :tag=>'parent')
-    t.column_create(:text=>'Depth', :justify=>:center,
-                    :itembackground=>['linen', []], :tag=>'depth')
-  else # TreeCtrl 1.0
-    t.column_configure(0, :expand=>true, :text=>'Item',
-                       :itembackground=>['#e0e8f0', []], :tag=>'item')
-    t.column_configure(1, :text=>'Parent', :justify=>:center,
-                       :itembackground=>['gray90', []], :tag=>'parent')
-    t.column_configure(2, :text=>'Depth', :justify=>:center,
-                       :itembackground=>['linen', []], :tag=>'depth')
-  end
-
-  t.element_create('e1', :image, :image=>[
-                     @images['folder-open'], ['open'],
-                     @images['folder-closed'], []
-                   ])
-  t.element_create('e2', :image, :image=>@images['small-file'])
-  t.element_create('e3', :text,
-                   :fill=>[@SystemHighlightText, ['selected', 'focus']])
-  t.element_create('e4', :text, :fill=>'blue')
-  t.element_create('e6', :text)
-  t.element_create('e5', :rect, :showfocus=>true,
-                   :fill=>[
-                     @SystemHighlight, ['selected', 'focus'],
-                     'gray', ['selected', '!focus']
-                   ])
-
-  s = t.style_create('s1')
-  t.style_elements(s, ['e5', 'e1', 'e3', 'e4'])
-  t.style_layout(s, 'e1', :padx=>[0,4], :expand=>:ns)
-  t.style_layout(s, 'e3', :padx=>[0,4], :expand=>:ns)
-  t.style_layout(s, 'e4', :padx=>[0,6], :expand=>:ns)
-  t.style_layout(s, 'e5', :union=>['e3'], :iexpand=>:ns, :ipadx=>2)
-
-  s = t.style_create('s2')
-  t.style_elements(s, ['e5', 'e2', 'e3'])
-  t.style_layout(s, 'e2', :padx=>[0,4], :expand=>:ns)
-  t.style_layout(s, 'e3', :padx=>[0,4], :expand=>:ns)
-  t.style_layout(s, 'e5', :union=>['e3'], :iexpand=>:ns, :ipadx=>2)
-
-  s = t.style_create('s3')
-  t.style_elements(s, ['e6'])
-  t.style_layout(s, 'e6', :padx=>6, :expand=>:ns)
-
-  @Priv[:sensitive, t] = [
-    [:item, 's1',  'e5', 'e1', 'e3'],
-    [:item, 's2',  'e5', 'e2', 'e3']
-  ]
-  @Priv[:dragimage, t] = [
-    [:item, 's1',  'e1', 'e3'],
-    [:item, 's2',  'e2', 'e3']
-  ]
-
-  clicks = Tk::Clock.clicks
-  items = [ t.index(:root) ]
-  (1...(random_N())).each{|i|
-    item_i = t.item_create
-    item_j = nil
-    loop {
-      j = rand(i)
-      item_j = items[j]
-      break if t.depth(item_j) < 5
-    }
-    if $Version_1_1_OrLater
-      t.item_collapse(item_i) if rand(2) == 0
-    else # TreeCtrl 1.0
-      t.collapse(item_i) if rand(2) == 0
-    end
-    if rand(2) == 0
-      t.item_lastchild(item_j, item_i)
-    else
-      t.item_firstchild(item_j, item_i)
-    end
-    items << item_i
-  }
-  puts "created #{random_N() - 1} items in #{Tk::Clock.clicks - clicks} clicks"
-
-  clicks = Tk::Clock.clicks
-  (0...(random_N())).each{|i|
-    item_i = items[i]
-    numChildren = t.item_numchildren(item_i)
-    if numChildren > 0
-      if $Version_1_1_OrLater
-        t.item_configure(item_i, :button=>true)
-      else # TreeCtrl 1.0
-        t.item_hasbutton(item_i, true)
-      end
-      t.item_style_set(item_i, 0, 's1', 1, 's3', 2, 's3')
-      t.item_complex(item_i,
-                     [ ['e3', {:text=>"Item #{i}"}],
-                       ['e4', {:text=>"(#{numChildren})"}] ],
-                     [ ['e6', {:text=>"#{t.item_parent(item_i)}"}] ],
-                     [ ['e6', {:text=>"#{t.depth(item_i)}"}] ])
-    else
-      t.item_style_set(item_i, 1, 's3', 2, 's3', 0, 's2')
-      t.item_complex(item_i,
-                     [ ['e3', {:text=>"Item #{i}"}] ],
-                     [ ['e6', {:text=>"#{t.item_parent(item_i)}"}] ],
-                     [ ['e6', {:text=>"#{t.depth(item_i)}"}] ])
-    end
-  }
-  puts "configured #{random_N()} items in #{Tk::Clock.clicks - clicks} clicks"
-
-  treeCtrlRandom = TkBindTag.new
-
-  treeCtrlRandom.bind('Double-ButtonPress-1',
-                      proc{|w, x, y|
-                        Tk::TreeCtrl::BindCallback.doubleButton1(w, x, y)
-                        Tk.callback_break
-                      }, '%W %x %y')
-
-  treeCtrlRandom.bind('Control-ButtonPress-1',
-                      proc{|w, x, y|
-                        @Priv['selectMode'] = :toggle
-                        randomButton1(w, x, y)
-                        Tk.callback_break
-                      }, '%W %x %y')
-
-  treeCtrlRandom.bind('Shift-ButtonPress-1',
-                      proc{|w, x, y|
-                        @Priv['selectMode'] = :add
-                        randomButton1(w, x, y)
-                        Tk.callback_break
-                      }, '%W %x %y')
-
-  treeCtrlRandom.bind('ButtonPress-1',
-                      proc{|w, x, y|
-                        @Priv['selectMode'] = :set
-                        randomButton1(w, x, y)
-                        Tk.callback_break
-                      }, '%W %x %y')
-
-  treeCtrlRandom.bind('Button1-Motion',
-                      proc{|w, x, y|
-                        randomMotion1(w, x, y)
-                        Tk.callback_break
-                      }, '%W %x %y')
-
-  treeCtrlRandom.bind('Button1-Leave',
-                      proc{|w, x, y|
-                        randomLeave1(w, x, y)
-                        Tk.callback_break
-                      }, '%W %x %y')
-
-  treeCtrlRandom.bind('ButtonRelease-1',
-                      proc{|w, x, y|
-                        randomRelease1(w, x, y)
-                        Tk.callback_break
-                      }, '%W %x %y')
-
-  t.bindtags = [ t, treeCtrlRandom, Tk::TreeCtrl, t.winfo_toplevel, :all ]
-end
-
-def randomButton1(t, x, y)
-  t.set_focus
-  id = t.identify(x, y)
-  puts id.inspect
-  @Priv['buttonMode'] = ''
-
-  # Click outside any item
-  if id.empty?
-    t.selection_clear
-
-  # Click in header
-  elsif id[0] == 'header'
-    Tk::TreeCtrl::BindCallback.buttonPress1(t, x, y)
-
-  # Click in item
-  else
-    where, item, arg1, arg2, arg3, arg4 = id
-    case arg1
-    when 'button'
-      if $Version_1_1_OrLater
-        t.item_toggle(item)
-      else # TreeCtrl 1.0
-        t.toggle(item)
-      end
-
-    when 'line'
-      if $Version_1_1_OrLater
-        t.item_toggle(arg2)
-      else # TreeCtrl 1.0
-        t.toggle(arg2)
-      end
-
-    when 'column'
-      ok = false
-      # Clicked an element
-      if id.length == 6
-        column = id[3]
-        e = id[5]
-        @Priv.list_element(:sensitive, t).each{|lst|
-          c, s, *eList = TkComm.simplelist(lst)
-          next if column != t.column_index(c)
-          next if t.item_style_set(item, c) != s
-          next if eList.find{|le| le == e} == nil
-          ok = true
-          break
-        }
-      end
-      unless ok
-        t.selection_clear
-        return
-      end
-
-      @Priv[:drag, :motion] = 0
-      @Priv[:drag, :x] = t.canvasx(x)
-      @Priv[:drag, :y] = t.canvasy(y)
-      @Priv[:drop] = ''
-
-      if @Priv['selectMode'] == 'add'
-          Tk::TreeCtrl::BindCallback.beginExtend(t, item)
-      elsif @Priv['selectMode'] == 'toggle'
-          Tk::TreeCtrl::BindCallback.beginToggle(t, item)
-      elsif ! t.selection_includes(item)
-          Tk::TreeCtrl::BindCallback.beginSelect(t, item)
-      end
-      t.activate(item)
-
-      if t.selection_includes(item)
-        @Priv['buttonMode'] = 'drag'
-      end
-    end
-  end
-end
-
-def randomMotion1(t, x, y)
-  case @Priv['buttonMode']
-  when 'resize', 'header'
-    Tk::TreeCtrl::BindCallback.motion1(t, x, y)
-  when 'drag'
-    randomAutoScanCheck(t, x, y)
-    randomMotion(t, x, y)
-  end
-end
-
-def randomMotion(t, x, y)
-  case @Priv['buttonMode']
-  when 'resize', 'header'
-    Tk::TreeCtrl::BindCallback.motion1(t, x, y)
-
-  when 'drag'
-    # Detect initial mouse movement
-    unless @Priv.bool_element(:drag, :motion)
-      @Priv[:selection] = t.selection_get
-      @Priv[:drop] = ''
-      t.dragimage_clear
-      # For each selected item, add 2nd and 3rd elements of
-      # column "item" to the dragimage
-      @Priv.list_element(:selection).each{|i|
-        @Priv.list_element(:dragimage,t).each{|lst|
-          c, s, *eList = TkComm.simplelist(lst)
-          if t.item_style_set(i, c) == s
-            t.dragimage_add(i, c, *eList)
-          end
-        }
-      }
-      @Priv[:drag,:motion] = true
-    end
-
-    # Find the item under the cursor
-    cursor = 'X_cursor'
-    drop = ''
-    id = t.identify(x, y)
-    ok = false
-    if !id.empty? && id[0] == 'item' && id.length == 6
-      item = id[1]
-      column = id[3]
-      e = id[5]
-      @Priv.list_element(:sensitive,t).each{|lst|
-        c, s, *eList = TkComm.simplelist(lst)
-        next if column != t.column_index(c)
-        next if t.item_style_set(item, c) != s
-        next unless eList.find{|val| val.to_s == e.to_s}
-        ok = true
-        break
-      }
-      ok = true if @Priv.list_element(:sensitive,t).find{|val| TkComm.simplelist(val).index(e)}
-    end
-
-    if ok
-      # If the item is not in the pre-drag selection
-      # (i.e. not being dragged) see if we can drop on it
-      unless @Priv.list_element(:selection).find{|val| val.to_s == item.to_s}
-        drop = item
-        # We can drop if dragged item isn't an ancestor
-        @Priv.list_element(:selection).each{|item2|
-          if t.item_isancestor(item2, item)
-            drop = ''
-            break
-          end
-        }
-        if drop != ''
-          x1, y1, x2, y2 = t.item_bbox(drop)
-          if y < y1 + 3
-            cursor = 'top_side'
-            @Priv[:drop,:pos] = 'prevsibling'
-          elsif y >= y2 - 3
-            cursor = 'bottom_side'
-            @Priv[:drop,:pos] = 'nextsibling'
-          else
-            cursor = ''
-            @Priv[:drop,:pos] = 'lastchild'
-          end
-        end
-      end
-    end
-
-    t[:cursor] = cursor if t[:cursor] != cursor
-
-    # Select the item under the cursor (if any) and deselect
-    # the previous drop-item (if any)
-    t.selection_modify(drop, @Priv[:drop])
-    @Priv[:drop] = drop
-
-    # Show the dragimage in its new position
-    x = t.canvasx(x) - @Priv.numeric_element(:drag,:x)
-    y = t.canvasx(y) - @Priv.numeric_element(:drag,:y)
-    t.dragimage_offset(x, y)
-    t.dragimage_configure(:visible=>true)
-  end
-end
-
-def randomLeave1(t, x, y)
-  # This is called when I do ButtonPress-1 on Unix for some reason,
-  # and buttonMode is undefined.
-  return unless @Priv.exist?('buttonMode')
-  case @Priv['buttonMode']
-  when 'header'
-    Tk::TreeCtrl::BindCallback.leave1(t, x, y)
-  end
-end
-
-def randomRelease1(t, x, y)
-  case @Priv['buttonMode']
-  when 'resize', 'header'
-    Tk::TreeCtrl::BindCallback.release1(t, x, y)
-  when 'drag'
-    Tk::TreeCtrl::BindCallback.autoScanCancel(t)
-    t.dragimage_configure(:visible=>false)
-    t.selection_modify('', @Priv[:drop])
-    t[:cursor] = ''
-    if @Priv[:drop] != ''
-      randomDrop(t, @Priv[:drop], @Priv.list_element(:selection),
-                 @Priv[:drop, :pos])
-    end
-  end
-  @Priv['buttonMode'] = ''
-end
-
-def randomDrop(t, target, src, pos)
-  parentList = []
-  case pos
-  when 'lastchild'
-    parent = target
-  when 'prevsibling'
-    parent = t.item_parent(target)
-  when 'nextsibling'
-    parent = t.item_parent(target)
-  end
-  src.each{|item|
-    # Ignore any item whose ancestor is also selected
-    ignore = false
-    t.item_ancestors(item).each{|ancestor|
-      if src.find{|val| val.to_s == ancestor.to_s}
-        ignore = true
-        break
-      end
-    }
-    next if ignore
-
-    # Update the old parent of this moved item later
-    unless parentList.find{|val| val.to_s == item.to_s}
-      parentList << t.item_parent(item)
-    end
-
-    # Add to target
-    t.__send__("item_#{pos}", target, item)
-
-    # Update text: parent
-    t.item_element_configure(item, 'parent', 'e6', :text=>parent)
-
-    # Update text: depth
-    t.item_element_configure(item, 'depth', 'e6', :text=>t.depth(item))
-
-    # Recursively update text: depth
-    itemList = []
-    item = t.item_firstchild(item)
-    itemList << item if item != ''
-
-    while item = itemList.pop
-      t.item_element_configure(item, 'depth', 'e6', :text=>t.depth(item))
-
-      item2 = t.item_nextsibling(item)
-      itemList << item2 if item2 != ''
-
-      item2 = t.item_firstchild(item)
-      itemList << item2 if item2 != ''
-    end
-  }
-
-  # Update items that lost some children
-  parentList.each{|item|
-    numChildren = t.item_numchildren(item)
-    if numChildren == 0
-      if $Version_1_1_OrLater
-        t.item_configure(item, :button=>false)
-      else # TreeCtrl 1.0
-        t.item_hasbutton(item, false)
-      end
-      t.item_style_map(item, 'item', 's2', ['e3', 'e3'])
-    else
-      t.item_element_configure(item, 'item', 'e4', :text=>"(#{numChildren})")
-    end
-  }
-
-  # Update the target that gained some children
-  if t.item_style_set(parent, 0) != 's1'
-    if $Version_1_1_OrLater
-      t.item_configure(parent, :button=>true)
-    else # TreeCtrl 1.0
-      t.item_hasbutton(parent, true)
-    end
-    t.item_style_map(parent, 'item', 's1', ['e3', 'e3'])
-  end
-  numChildren = t.item_numchildren(parent)
-  t.item_element_configure(parent, 'item', 'e4', :text=>"(#{numChildren})")
-end
-
-# Same as TreeCtrl::AutoScanCheck, but calls RandomMotion and
-# RandomAutoScanCheckAux
-def randomAutoScanCheck(t, x, y)
-  x1, y1, x2, y2 = t.contentbox
-  margin = t.winfo_pixels(t.scrollmargin)
-  if x < x1 + margin || x >= x2 - margin || y < y1 + margin || y >= y2 - margin
-    if ! @Priv.exist?(:autoscan, :afterId, t)
-      if y >= y2 - margin
-        t.yview(:scroll, 1, :units)
-        delay = t.yscrolldelay
-      elsif y < y1 + margin
-        t.yview(:scroll, -1, :units)
-        delay = t.yscrolldelay
-      elsif x >= x2 - margin
-        t.xview(:scroll, 1, :units)
-        delay = t.xscrolldelay
-      elsif x < x1 + margin
-        t.xview(:scroll, -1, :units)
-        delay = t.xscrolldelay
-      end
-      if @Priv.exist?(:autoscan, :scanning, t)
-        delay = delay[1] if delay.kind_of?(Array)
-      else
-        delay = delay[0] if delay.kind_of?(Array)
-        @Priv[:autoscan, :scanning, t] = true
-      end
-      case @Priv['buttonMode']
-      when 'drag', 'marquee'
-        randomMotion(t, x, y)
-      end
-      @Priv[:autoscan, :afterId, t] =
-        Tk.after(delay, proc{ randomAutoScanCheckAux(t) })
-    end
-    return
-  end
-  Tk::TreeCtrl::BindCallback.autoScanCancel(t)
-end
-
-def randomAutoScanCheckAux(t)
-  @Priv.unset(:autoscan, :afterId, t)
-  x = t.winfo_pointerx - t.winfo_rootx
-  y = t.winfo_pointery - t.winfo_rooty
-  randomAutoScanCheck(t, x, y)
-end
-
-#
-# Demo: random N items, button images
-#
-def demoRandom2(t)
-  demoRandom(t)
-
-  init_pics('mac-*')
-
-  t.configure(:openbuttonimage=>@images['mac-collapse'],
-              :closedbuttonimage=>@images['mac-expand'],
-              :showlines=>false)
-end
diff --git a/ext/tk/sample/tkextlib/treectrl/readme.txt b/ext/tk/sample/tkextlib/treectrl/readme.txt
deleted file mode 100644
index 81e13b24aa..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/readme.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-The scripts and image files in this directory are based on demo files
-of Tcl/Tk's TreeCtrl extension.
diff --git a/ext/tk/sample/tkextlib/treectrl/www-options.rb b/ext/tk/sample/tkextlib/treectrl/www-options.rb
deleted file mode 100644
index 81f5349abc..0000000000
--- a/ext/tk/sample/tkextlib/treectrl/www-options.rb
+++ /dev/null
@@ -1,304 +0,0 @@
-# frozen_string_literal: false
-def demoInternetOptions (t)
-  @Option = TkVarAccess.new_hash('::Option')
-
-  height = t.font.metrics(:linespace) + 2
-  height = 18 if height < 18
-  t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false,
-              :itemheight=>height, :selectmode=>:browse)
-
-  init_pics('internet-*')
-
-  if $HasColumnCreate
-    t.column_create(:text=>'Internet Options')
-  else
-    t.column_configure(0, :text=>'Internet Options')
-  end
-
-  t.state_define('check')
-  t.state_define('radio')
-  t.state_define('on')
-
-  t.element_create('e1', :image, :image=>[
-                     @images['internet-check-on'],  ['check', 'on'],
-                     @images['internet-check-off'], ['check'],
-                     @images['internet-radio-on'],  ['radio', 'on'],
-                     @images['internet-radio-off'], ['radio']
-                   ])
-  t.element_create('e2', :text,
-                   :fill=>[@SystemHighlightText, ['selected', 'focus']])
-  t.element_create('e3', :rect, :showfocus=>true,
-                   :fill=>[@SystemHighlight, ['selected', 'focus']])
-
-  s = t.style_create('s1')
-  t.style_elements(s, ['e3', 'e1', 'e2'])
-  t.style_layout(s, 'e1', :padx=>[0,4], :expand=>:ns)
-  t.style_layout(s, 'e2', :expand=>:ns)
-  t.style_layout(s, 'e3', :union=>['e2'], :iexpand=>:ns, :ipadx=>2)
-
-  parentList = [:root, '', '', '', '', '', '']
-  parent = :root
-  [
-    [0, :print, "Printing", "", ""],
-        [1, :off, "Print background colors and images", "o1", ""],
-    [0, :search, "Search from Address bar", "", ""],
-        [1, :search, "When searching", "", ""],
-            [2, :off, "Display results, and go to the most likely sites",
-                                                                 "o2", "r1"],
-            [2, :off, "Do not search from the Address bar", "o3", "r1"],
-            [2, :off, "Just display the results in the main window",
-                                                                 "o4", "r1"],
-            [2, :on, "Just go to the most likely site", "o5", "r1"],
-    [0, :security, "Security", "", ""],
-        [1, :on, "Check for publisher's certificate revocation", "o5", ""],
-        [1, :off, "Check for server certificate revocation (requires restart)",
-                                                                 "o6", ""]
-  ].each{|depth, setting, text, option, group|
-    item = t.item_create()
-    t.item_style_set(item, 0, 's1')
-    t.item_element_configure(item, 0, 'e2', :text=>text)
-    @Option[:option, item] = option
-    @Option[:group, item] = group
-    if setting == :on || setting == :off
-      @Option[:setting, item] = setting
-      if group == ''
-        t.item_state_set(item, 'check')
-        if setting == :on
-          t.item_state_set(item, 'on')
-        end
-      else
-        if setting == :on
-          @Option[:current, group] = item
-          t.item_state_set(item, 'on')
-        end
-        t.item_state_set(item, 'radio')
-      end
-    else
-      t.item_element_configure(item, 0, 'e1',
-                               :image=>@images["internet-#{setting}"])
-    end
-    t.item_lastchild(parentList[depth], item)
-    depth += 1
-    parentList[depth] = item
-  }
-
-  treeCtrlOption = TkBindTag.new
-  treeCtrlOption.bind('Double-ButtonPress-1', proc{|w, x, y|
-                        Tk::TreeCtrl::BindCallback.doubleButton1(w, x, y)
-                      }, '%W %x %y')
-  treeCtrlOption.bind('ButtonPress-1', proc{|w, x, y|
-                        optionButton1(w, x, y)
-                        Tk.callback_break
-                      }, '%W %x %y')
-  treeCtrlOption.bind('Button1-Motion', proc{|w, x, y|
-                        optionMotion1(w, x, y)
-                        Tk.callback_break
-                      }, '%W %x %y')
-  treeCtrlOption.bind('Button1-Leave', proc{|w, x, y|
-                        optionLeave1(w, x, y)
-                        Tk.callback_break
-                      }, '%W %x %y')
-  treeCtrlOption.bind('ButtonRelease-1', proc{|w, x, y|
-                        optionRelease1(w, x, y)
-                        Tk.callback_break
-                      }, '%W %x %y')
-
-  t.bindtags = [
-    t, treeCtrlOption, Tk::TreeCtrl, t.winfo_toplevel, TkBindTag::ALL
-  ]
-end
-
-def optionButton1(w, x, y)
-  w.set_focus
-  id = w.identify(x, y)
-  if id[0] == 'header'
-    Tk::TreeCtrl::BindCallback.buttonPress1(w, x, y)
-  elsif id.empty?
-    @Priv['buttonMode'] = ''
-  else
-    @Priv['buttonMode'] = ''
-    item = id[1]
-    w.selection_modify(item, :all)
-    w.activate(item)
-    return if @Option[:option, item] == ''
-    group = @Option[:group, item]
-    if group == ''
-      # a checkbutton
-      w.item_state_set(item, '~on')
-      if @Option[:setting, item] == 'on'
-        setting = :off
-      else
-        setting = :on
-      end
-      @Option[:setting, item] = setting
-    else
-      # a radiobutton
-      current = @Option[:current, group]
-      return if current == item.to_s
-      w.item_state_set(current, '!on')
-      w.item_state_set(item, 'on')
-      @Option[:setting, item] = :on
-      @Option[:current, group] = item
-    end
-  end
-end
-
-# Alternate implementation that doesn't rely on run-time styles
-def demoInternetOptions_2(t)
-  height = t.font.metrics(:linespace) + 2
-  height = 18 if height < 18
-  t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false,
-              :itemheight=>height, :selectmode=>:browse)
-
-  init_pics('internet-*')
-
-  t.column_configure(0, :text=>'Internet Options')
-
-  t.element_create('e1', :image)
-  t.element_create('e2', :text,
-                   :fill=>[@SystemHighlightText, ['selected', 'focus']])
-  t.element_create('e3', :rect, :showfocus=>true,
-                   :fill=>[@SystemHighlight, ['selected', 'focus']])
-
-  s = t.style_create('s1')
-  t.style_elements('s1', ['e3', 'e1', 'e2'])
-  t.style_layout(s, 'e1', :padx=>[0,4], :expand=>:ns)
-  t.style_layout(s, 'e2', :expand=>:ns)
-  t.style_layout(s, 'e3', :union=>['e2'], :iexpand=>:ns, :ipadx=>2)
-
-  parentList = [:root, '', '', '', '', '', '']
-  parent = :root
-  [
-    [0, :print, "Printing", "", ""],
-        [1, :off, "Print background colors and images", "o1", ""],
-    [0, :search, "Search from Address bar", "", ""],
-        [1, :search, "When searching", "", ""],
-            [2, :off, "Display results, and go to the most likely sites",
-                                                                 "o2", "r1"],
-            [2, :off, "Do not search from the Address bar", "o3", "r1"],
-            [2, :off, "Just display the results in the main window",
-                                                                 "o4", "r1"],
-            [2, :on, "Just go to the most likely site", "o5", "r1"],
-    [0, :security, "Security", "", ""],
-        [1, :on, "Check for publisher's certificate revocation", "o5", ""],
-        [1, :off, "Check for server certificate revocation (requires restart)",
-                                                                 "o6", ""]
-  ].each{|depth, setting, text, option, group|
-    item = t.item_create()
-    t.item_style_set(item, 0, 's1')
-    t.item_element_configure(item, 0, 'e2', :text=>text)
-    @Option[:option, item] = option
-    @Option[:group, item] = group
-    if setting == :on || setting == :off
-      @Option[:setting, item] = setting
-      if group == ''
-        img = @images["internet-check-#{setting}"]
-        t.item_element_configure(item, 0, 'e1', :image=>img)
-      else
-        if setting == :on
-          @Option[:current, group] = item
-        end
-        img = @images["internet-radio-#{setting}"]
-        t.item_element_configure(item, 0, 'e1', :image=>img)
-      end
-    else
-      t.item_element_configure(item, 0, 'e1',
-                               :image=>@images["internet-#{setting}"])
-    end
-    t.item_lastchild(parentList[depth], item)
-    depth += 1
-    parentList[depth] = item
-  }
-
-  treeCtrlOption = TkBindTag.new
-  treeCtrlOption.bind('Double-ButtonPress-1', proc{|w, x, y|
-                        Tk::TreeCtrl::BindCallback.doubleButton1(w, x, y)
-                      }, '%W %x %y')
-  treeCtrlOption.bind('ButtonPress-1', proc{|w, x, y|
-                        optionButton1(w, x, y)
-                        Tk.callback_break
-                      }, '%W %x %y')
-  treeCtrlOption.bind('Button1-Motion', proc{|w, x, y|
-                        optionMotion1(w, x, y)
-                        Tk.callback_break
-                      }, '%W %x %y')
-  treeCtrlOption.bind('Button1-Leave', proc{|w, x, y|
-                        optionLeave1(w, x, y)
-                        Tk.callback_break
-                      }, '%W %x %y')
-  treeCtrlOption.bind('ButtonRelease-1', proc{|w, x, y|
-                        optionRelease1(w, x, y)
-                        Tk.callback_break
-                      }, '%W %x %y')
-
-  t.bindtags = [
-    t, treeCtrlOption, Tk::TreeCtrl, t.winfo_toplevel, TkBindTag::ALL
-  ]
-end
-
-def optionButton1_2(w, x, y)
-  w.set_focus
-  id = w.identify(x, y)
-  if id[0] == 'header'
-    Tk::TreeCtrl::BindCallback.buttonPress1(w, x, y)
-  elsif id.empty?
-    @Priv['buttonMode'] = ''
-  else
-    @Priv['buttonMode'] = ''
-    item = id[1]
-    w.selection_modify(item, :all)
-    w.activate(item)
-    return if @Option[:option, item] == ''
-    group = @Option[:group, item]
-    if group == ''
-      # a checkbutton
-      if @Option[:setting, item] == 'on'
-        setting = :off
-      else
-        setting = :on
-      end
-      w.item_element_configure(item, 0, 'e1',
-                               :image=>@images["internet-check-#{setting}"])
-      @Option[:setting, item] = setting
-    else
-      # a radiobutton
-      current = @Option[:current, group]
-      return if current == item.to_s
-      w.item_element_configure(current, 0, 'e1',
-                               :image=>@images["internet-radio-off"])
-      w.item_element_configure(item, 0, 'e1',
-                               :image=>@images["internet-radio-on"])
-      @Option[:setting, item] = :on
-      @Option[:current, group] = item
-    end
-  end
-end
-
-def optionMotion1(w, x, y)
-  case @Priv['buttonMode']
-  when 'resize', 'header'
-    Tk::TreeCtrl::BindCallback.motion1(w, x, y)
-  end
-end
-
-def optionLeave1(w, x, y)
-  # This is called when I do ButtonPress-1 on Unix for some reason,
-  # and buttonMode is undefined.
-  begin
-    mode = @Priv['buttonMode']
-  rescue
-  else
-    case mode
-    when 'header'
-      t.column_configure(@Priv['column'], :sunken=>false)
-    end
-  end
-end
-
-def optionRelease1(w, x, y)
-  case @Priv['buttonMode']
-  when 'resize', 'header'
-    Tk::TreeCtrl::BindCallback.release1(w, x, y)
-  end
-  @Priv['buttonMode'] = ''
-end
diff --git a/ext/tk/sample/tkextlib/vu/Orig_LICENSE.txt b/ext/tk/sample/tkextlib/vu/Orig_LICENSE.txt
deleted file mode 100644
index f2e0edcf42..0000000000
--- a/ext/tk/sample/tkextlib/vu/Orig_LICENSE.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-
-  >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-  >>>  The following text is the original 'license.txt' of vu extension.  <<<
-  >>>  Original Tcl source files are not include in this directory,       <<<
-  >>>  because of all of them are rewritten to Ruby files.                <<<
-  >>>  However, the bitmap data file included in this directory is the    <<<
-  >>>  same file of vu extension. So, the bitmap data file is under the   <<<
-  >>>  following license.                                                 <<<
-  >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-
-		   * COPYRIGHT AND LICENSE TERMS *
-
-(This file blatantly stolen from Tcl/Tk license and adapted - thus assume
-it falls under similar license terms).
-
-This software is copyrighted by Jeffrey Hobbs <jeff.hobbs@acm.org> and
-others.  The following terms apply to all files associated with the
-software unless explicitly disclaimed in individual files.
-
-The authors hereby grant permission to use, copy, modify, distribute, and
-license this software and its documentation for any purpose, provided that
-existing copyright notices are retained in all copies and that this notice
-is included verbatim in any distributions.  No written agreement, license,
-or royalty fee is required for any of the authorized uses.
-
-IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
-OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY DERIVATIVES THEREOF,
-EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE IS
-PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE NO
-OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
-MODIFICATIONS.
-
-RESTRICTED RIGHTS: Use, duplication or disclosure by the U.S. government
-is subject to the restrictions as set forth in subparagraph (c) (1) (ii)
-of the Rights in Technical Data and Computer Software Clause as DFARS
-252.227-7013 and FAR 52.227-19.
-
-SPECIAL NOTES:
-
-This software also falls under the bourbon_ware clause:
-
-    Should you find this software useful in your daily work, you should
-    feel obliged to take the author out for a drink if the opportunity
-    presents itself.  The user may feel exempt from this clause if they
-    are under 21 or think the author has already partaken of too many
-    drinks.
diff --git a/ext/tk/sample/tkextlib/vu/README.txt b/ext/tk/sample/tkextlib/vu/README.txt
deleted file mode 100644
index 2fe72d5d5c..0000000000
--- a/ext/tk/sample/tkextlib/vu/README.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-
-  >>>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-  >>>  The following text is the original 'README.txt' of  <<<
-  >>>  vu extension demos.                                 <<<
-  >>>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-
-##
-## DESCRIPTION OF DEMOS
-##
-
-canvItems.tcl
-	old demo of all canvas chart items, useful to find memory leaks.
-	<1> prints out the additional memory usage (charts.so + script)
-
-canvSticker.tcl
-	Heribert Dahms original "demo.tcl"
-	<p> creates DEMO.ps
-
-canvSticker2.tcl
-	compares "sticker" and "text"; press <1>, <2> or <1> ...
-	<p> creates DEMO.ps
-
-dial.tcl
-	demo of variations of the dial widget.
-
-load.tcl
-	Just a utility file, not a real demo.
-
-m128_000.xbm
-	XBM pic used by sticker and canvItems demos
-
-oscilloscope.tcl
-	the heart of a Realtime Oscilloscope,where the PC�s joystick
-	port gives 4 digital inputs and 4 analog 8 bit values with an
-	resolution of ~1 millisecond (!!!)  running Realtime Linux.
-	<p> creates DEMO.ps
-
-pie.tcl
-	The magic 3D spinning pie chart!
-
-vu.tcl
-	demo fo Vu widgets
-
-canvLabel.tcl
-	'label' is a canvas item just like 'text', but with -angle
-	rotation of the string.  This is not built in by default, as
-	it requires the internal Tk headers.
-	press <1>, <2> or <1> ...
-	<p> creates DEMO.ps
-
diff --git a/ext/tk/sample/tkextlib/vu/canvItems.rb b/ext/tk/sample/tkextlib/vu/canvItems.rb
deleted file mode 100644
index aa9bd5e9f6..0000000000
--- a/ext/tk/sample/tkextlib/vu/canvItems.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-
-require 'tk'
-require 'tkextlib/vu/charts'
-
-#######################################
-
-xbm = File.join(File.dirname(File.expand_path(__FILE__)), 'm128_000.xbm')
-
-sval = [ 11, 22, 33, 44, 55, 66, 77, 88, 99 ]
-
-l0 = TkLabel.new(:width=>128, :height=>128,
-                 :bitmap=>"@#{xbm}", :relief=>:groove).pack(:side=>:left)
-
-c0 = TkCanvas.new(:width=>80, :height=>80,
-                  :insertwidth=>0, :highlightthickness=>0,
-                  :selectborderwidth=>0, :borderwidth=>2,
-                  :relief=>:ridge).place(:in=>l0, :relx=>0.5, :rely=>0.5,
-                                         :anchor=>:c)
-
-st = Tk::Vu::TkcStripchart.new(c0, 3, 3, 80, 80,
-                               :background=>"#b7c0d7", :fill=>'slategray3',
-                               :jumpscroll=>1, :outline=>'black',
-                               :scaleline=>'blue', :stripline=>'red',
-                               :selected=>1, :values=>sval)
-
-TkcText.create(c0, 40, 40,
-               :text=>Tk::TCL_PATCHLEVEL, :fill=>'cyan', :tags=>'text')
-
-
-l1 = TkLabel.new(:width=>128, :height=>128,
-                 :bitmap=>"@#{xbm}", :relief=>:groove).pack(:side=>:left)
-
-c1 = TkCanvas.new(:width=>80, :height=>80,
-                  :insertwidth=>0, :highlightthickness=>0,
-                  :selectborderwidth=>0, :borderwidth=>2,
-                  :relief=>:ridge).place(:in=>l1, :relx=>0.5, :rely=>0.5,
-                                         :anchor=>:c)
-
-bar1 = Tk::Vu::TkcBarchart.new(c1, 3, 3, 80, 80,
-                               :background=>"#b7c0d7", :scalevalue=>10.0,
-                               :autocolor=>true, :selected=>1,
-                               :outline=>'black', :barline=>'yellow',
-                               :scalelinestyle=>0)
-
-bar2 = Tk::Vu::TkcBarchart.new(c1, 53, 3, 80, 80,
-                               :background=>"#b7c0d7", :scalevalue=>10.0,
-                               :autocolor=>true, :selected=>1,
-                               :outline=>'black', :fill=>"#b7c0d7",
-                               :barline=>'red', :scalelinestyle=>22)
-
-
-l2 = TkLabel.new(:width=>128, :height=>128,
-                 :bitmap=>"@#{xbm}", :relief=>:groove).pack(:side=>:left)
-
-c2 = TkCanvas.new(:width=>80, :height=>80,
-                  :insertwidth=>0, :highlightthickness=>0,
-                  :selectborderwidth=>0, :borderwidth=>2,
-                  :relief=>:ridge).place(:in=>l2, :relx=>0.5, :rely=>0.5,
-                                         :anchor=>:c)
-
-begin
-  stick = Tk::Vu::TkcSticker.new(c2, 3, 3, 80, 80,
-                                 :text=>"Tcl/Tk", :space=>0, :color=>'red',
-                                 :outline=>'red', :font=>'Helvetica 14 bold',
-                                 :fill=>'', :stipple=>'', :bar=>'blue',
-                                 :orient=>:vertical, :anchor=>:s,
-                                 :relheight=>1.0, :relwidth=>0.15,
-                                 :relx=>0.1, :rely=>0.0)
-rescue
-  stick = nil
-  TkcText.new(c2, 40, 10, :text=>"No Sticker Item")
-end
-
-c_do = proc{
-  st[:values]   = rand() * 100
-
-  bar1[:values] = rand() * 10
-  bar2[:values] = rand() * 10
-
-  stick[:rely]  = rand() * 100 * 0.01 if stick
-}
-
-c0.bind('1', c_do)
-
-TkTimer.new(100, -1, c_do).start
-
-Tk.root.bind('q', proc{exit})
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/vu/canvSticker.rb b/ext/tk/sample/tkextlib/vu/canvSticker.rb
deleted file mode 100644
index ffc485443a..0000000000
--- a/ext/tk/sample/tkextlib/vu/canvSticker.rb
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-
-require 'tk'
-require 'tkextlib/vu/charts'
-
-#######################################
-
-Tk.root.geometry('+30+30')
-
-delay = 2000
-
-c = TkCanvas.new.pack
-
-begin
-  st = Tk::Vu::TkcSticker.new(c, 0, 0, 10, 10)
-rescue
-  Tk.messageBox(:type=>'ok', :title=>"No sticker Item",
-                :message=>"This build of vu does not include the sticker item")
-  exit
-end
-#st.delete
-
-steps = []
-
-steps << proc{
-  # I used a 75dpi screen for testing, but others should make no difference!
-  puts 'You\'ll see a small upright rectangle with "He" inside.'
-  st = Tk::Vu::TkcSticker.new(c, '6m', '10m', '13m', '27m', :text=>'Hello')
-}
-
-steps << proc{
-  puts 'You\'ll see the whole "Hello" drawn rotated 90 degrees.'
-  st[:orient] = :vertical
-}
-
-steps << proc{
-  puts 'The rectangle shrinks and the text is clipped to "Hell"'
-  #st.coords('6m', '10m', '13m', '20m')
-  st.coords('6m', '10m', '13m', '17m')
-}
-
-steps << proc{
-  puts 'Now you\'ll read "ello"'
-  st[:lefttrunc] = true
-}
-
-steps << proc{
-  puts 'Enlarging the rectangle shows the complete "Hello" again'
-  st.scale(0, 0, 3, 3)
-}
-
-steps << proc{
-  puts 'This time the text is repeated: "Hello", approx. 5mm space, "Hello"'
-  st[:space] = '5m'
-}
-
-steps << proc{
-  puts 'A vertical bar appears in the lower right region and text jumps to the left.'
-  st.configure(:anchor=>:n, :relw=>0.3, :relh=>0.7,
-               :relx=>0.6, :rely=>0.3, :bar=>'red')
-}
-
-steps << proc{
-  puts 'Paint the background.'
-  st[:fill] = 'yellow'
-}
-
-steps << proc{
-  puts "Let's test stippling."
-  st[:stipple] = 'gray25'
-}
-
-steps << proc{
-  puts 'Finally a large outline forces a single "Hello" and shrinks the bar.'
-  st[:width] = '6m'
-}
-
-Tk.root.bind('q', proc{exit})
-
-TkTimer.new(delay, 1, *steps).start
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/vu/canvSticker2.rb b/ext/tk/sample/tkextlib/vu/canvSticker2.rb
deleted file mode 100644
index 5dec81aed9..0000000000
--- a/ext/tk/sample/tkextlib/vu/canvSticker2.rb
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-
-require 'tk'
-require 'tkextlib/vu/charts'
-
-#######################################
-
-c = TkCanvas.new.pack
-
-begin
-  st = Tk::Vu::TkcSticker.new(c, 0, 0, 10, 10)
-rescue
-  Tk.messageBox(:type=>'ok', :title=>"No sticker Item",
-                :message=>"This build of vu does not include the sticker item")
-  exit
-end
-
-c.destroy
-
-#---
-#--- set STRING {{x0 y0 x1 y1} {...text...} {resize point: center}
-
-#sti_conf = [ [10, 10, 180, 180], "Sticker äöüß@²³¼½¾",  :center ]
-#txt_conf = [ [210, 210],        "Text    äöüß@²³¼½¾",  :center ]
-sti_conf = [ [10, 10, 350, 350],
-             Tk::UTF8_String('Sticker \u00E4\u00F6\u00FC\u00DF\u0040\u00B2\u00B3\u00BC\u00BD\u00BE'),
-             :center ]
-txt_conf = [ [250, 250],
-             Tk::UTF8_String('Text    \u00E4\u00F6\u00FC\u00DF\u0040\u00B2\u00B3\u00BC\u00BD\u00BE'),
-             :center ]
-
-#p sti_conf
-
-fnt = TkFont.new('Helvetica 24 bold')
-
-#---GUI
-c = TkCanvas.new(:width=>500, :height=>500, :bg=>'aquamarine3').pack
-
-#---CRRW Use the technique of eval the coord ...
-sti = Tk::Vu::TkcSticker.new(c, sti_conf[0]){
-  anchor    sti_conf[2]
-  bar       'black'
-  color     'red'
-  fill      ''
-  font      fnt
-  lefttrunc 0
-  outline   ''
-  relheight 0.0
-  relwidth  0.0
-  relx      0.0
-  rely      0.0
-  space     0
-  stipple   ''
-  tags      'sti'
-  text      sti_conf[1]
-  width     0
-  orient    :vertical
-  minwidth  0
-  minheight 0
-  maxwidth  32767
-  maxheight 32767
-}
-
-txt = TkcText.new(c, txt_conf[0]){
-  activefill      ''
-  activestipple   ''
-  anchor          txt_conf[2]
-  disabledfill    ''
-  disabledstipple ''
-  fill            'blue'
-  font            fnt
-  justify         :left
-  offset          '0,0'
-  state           ''
-  stipple         ''
-  tags            ['tex']
-  text            txt_conf[1]
-  width           0
-}
-
-#---BINDINGS
-c.bind('2', proc{
-         sti[:orient] = :horizontal
-         txt[:width] = 0  # horizontal
-       })
-
-c.bind('3', proc{
-         sti[:orient] = :vertical
-         txt[:width] = 1  # top down
-       })
-
-Tk.root.bind('p', proc{
-               c.postscript(:file=>'DEMO.ps')
-               puts "DEMO.ps printed"
-             })
-
-Tk.root.bind('q', proc{exit})
-
-#####################
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/vu/dial_demo.rb b/ext/tk/sample/tkextlib/vu/dial_demo.rb
deleted file mode 100644
index 409b8d73cf..0000000000
--- a/ext/tk/sample/tkextlib/vu/dial_demo.rb
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-
-require 'tk'
-require 'tkextlib/vu/dial'
-
-#######################################
-
-v_volume = TkVariable.new
-v_speed  = TkVariable.new
-v_dir    = TkVariable.new
-v_rot    = TkVariable.new
-v_linked = TkVariable.new
-v_needle = TkVariable.new
-
-volume = Tk::Vu::Dial.new(:label=>"Volume", :from=>-0.1, :to=>0.1,
-                          :resolution=>0.001, :minortickinterval=>0.01,
-                          :tickinterval=>0.1, :beginangle=>-20,
-                          :endangle=>260, :variable=>v_volume)
-
-speed = Tk::Vu::Dial.new(:label=>"Speed", :from=>2000, :to=>100,
-                         :resolution=>10, :tickinterval=>100,
-                         :minortickinterval=>0, :variable=>v_speed,
-                         :showtags=>:label, :showvalue=>false)
-
-speed.set_tag_constrain(100, 'Fast', 2000, 'Slow')
-
-fwd  = Tk::Vu::Dial.new(:from=>-10.0, :to=>-20.0, :resolution=>0.1,
-                        :tickinterval=>5.0, :minortickinterval=>1.0,
-                        :variable=>v_dir)
-
-rev  = Tk::Vu::Dial.new(:from=>-20.0, :to=>-10.0, :resolution=>0.1,
-                        :tickinterval=>5.0, :minortickinterval=>1.0,
-                        :variable=>v_dir)
-
-small = Tk::Vu::Dial.new(:font=>"Helvetica -10", :from=>0, :to=>10,
-                         :resolution=>0.05, :tickinterval=>2,
-                         :minortickinterval=>0.5, :radius=>20,
-                         :dialcolor=>'red2', :activebackground=>'red',
-                         :variable=>v_rot)
-
-large = Tk::Vu::Dial.new(:font=>"Helvetica -8", :from=>0, :to=>10,
-                         :resolution=>0.05, :tickinterval=>1,
-                         :minortickinterval=>0.25, :radius=>40,
-                         :dialcolor=>'red2', :activebackground=>'red',
-                         :variable=>v_rot)
-
-turn = Tk::Vu::Dial.new(:needlecolor=>'red', :label=>"Linked",
-                        :variable=>v_linked)
-
-scale = TkScale.new(:label=>"Linked", :variable=>v_linked)
-
-d1 = Tk::Vu::Dial.new(:resolution=>0.0001, :from=>-0.1, :to=>0.1,
-                      :showvalue=>true, :minortickinterval=>0.01,
-                      :tickinterval=>0.1, :radius=>30, :label=>"Dial",
-                      :beginangle=>-20, :endangle=>260, :variable=>v_needle,
-                      :relief=>:raised)
-
-d2 = Tk::Vu::Dial.new(:resolution=>0.01, :from=>-0.1, :to=>0.1,
-                      :showvalue=>true, :minortickinterval=>0.01,
-                      :tickinterval=>0.1, :radius=>30, :label=>"Dial 2",
-                      :beginangle=>-20, :endangle=>260, :variable=>v_needle,
-                      :dialrelief=>:flat, :needlecolor=>'red',
-                      :needletype=>:triangle, :relief=>:sunken)
-
-d3 = Tk::Vu::Dial.new(:resolution=>0.001, :from=>-0.1, :to=>0.1,
-                      :showvalue=>true, :minortickinterval=>0.01,
-                      :tickinterval=>0.1, :radius=>30, :label=>"Dial 3",
-                      :beginangle=>-20, :endangle=>260, :variable=>v_needle,
-                      :dialrelief=>:flat, :needlecolor=>'blue',
-                      :needletype=>:arc, :relief=>:ridge)
-
-f_btns = TkFrame.new
-f_sep  = TkFrame.new(:height=>2, :relief=>:sunken, :bd=>1)
-
-
-v_volume.value = -0.1
-v_speed.value = 500
-
-update = TkTimer.new(proc{v_speed.numeric}, -1, proc{
-                       if v_volume == volume[:to]
-                         v_volume.numeric = volume[:from]
-                       else
-                         v_volume.numeric += volume[:resolution]
-                       end
-                     })
-
-b_start = TkButton.new(:text=>"Start", :command=>proc{update.start})
-b_stop  = TkButton.new(:text=>"Stop",  :command=>proc{update.stop})
-b_exit  = TkButton.new(:text=>"Exit",  :command=>proc{exit})
-
-Tk.grid(b_start, :in=>f_btns, :sticky=>:ew, :padx=>4, :pady=>4)
-Tk.grid(b_stop,  :in=>f_btns, :sticky=>:ew, :padx=>4, :pady=>4)
-f_btns.grid_columnconfigure(0, :weight=>1)
-
-Tk.grid(f_btns, speed, volume, :sticky=>:news)
-Tk.grid(f_sep,  '-',   '-',    :sticky=>:news)
-Tk.grid(fwd,    rev,   d1,     :sticky=>:news)
-Tk.grid(small,  large, d2,     :sticky=>:news)
-Tk.grid(turn,   scale, d3,     :sticky=>:news)
-
-Tk.grid(b_exit, '-',   '-',    :sticky=>:ew, :padx=>4, :pady=>4)
-
-Tk.root.grid_columnconfigure(0, :weight=>1)
-Tk.root.grid_columnconfigure(1, :weight=>1)
-Tk.root.grid_columnconfigure(2, :weight=>1)
-
-Tk.root.grid_rowconfigure(0, :weight=>1)
-Tk.root.grid_rowconfigure(2, :weight=>1)
-Tk.root.grid_rowconfigure(3, :weight=>1)
-Tk.root.grid_rowconfigure(4, :weight=>1)
-
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/vu/m128_000.xbm b/ext/tk/sample/tkextlib/vu/m128_000.xbm
deleted file mode 100644
index 455e3c5e0f..0000000000
--- a/ext/tk/sample/tkextlib/vu/m128_000.xbm
+++ /dev/null
@@ -1,174 +0,0 @@
-#define m128_000_width 128
-#define m128_000_height 128
-static unsigned char m128_000_bits[] = {
-  0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-  0xff, 0xff, 0xff, 0x00, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0xf0, 0xff, 0xff, 0xff,
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x03,
-  0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-  0xff, 0xff, 0xff, 0x03, 0xfc, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea, 0x0f, 0xfc, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5, 0x0f,
-  0xbf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0x3f, 0x7f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3f, 0xaf, 0xfa, 0xab, 0xaa,
-  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xfa, 0xab, 0x3e,
-  0x5f, 0xf5, 0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-  0x55, 0xf5, 0x57, 0x3d, 0xaf, 0x0e, 0xac, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x0e, 0xac, 0x3e, 0x5f, 0x0d, 0x5c, 0x55,
-  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x0d, 0x5c, 0x3d,
-  0xaf, 0x03, 0xb0, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-  0xaa, 0x03, 0xb0, 0x3e, 0x5f, 0x03, 0x70, 0x55, 0x55, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x55, 0x55, 0x03, 0x70, 0x3d, 0xaf, 0x03, 0xb0, 0xaa,
-  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x03, 0xb0, 0x3e,
-  0x5f, 0x03, 0x70, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-  0x55, 0x03, 0x70, 0x3d, 0xaf, 0x03, 0xb0, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x03, 0xb0, 0x3e, 0x5f, 0x03, 0x70, 0x55,
-  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x03, 0x70, 0x3d,
-  0xaf, 0x0e, 0xac, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-  0xaa, 0x0e, 0xac, 0x3e, 0x5f, 0x0d, 0x5c, 0x55, 0x55, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x55, 0x55, 0x0d, 0x5c, 0x3d, 0xaf, 0xfa, 0xab, 0xaa,
-  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xfa, 0xab, 0x3e,
-  0x5f, 0xf5, 0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-  0x55, 0xf5, 0x57, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d,
-  0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e,
-  0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d,
-  0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e,
-  0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d,
-  0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e,
-  0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d,
-  0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e,
-  0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d,
-  0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e,
-  0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d,
-  0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e,
-  0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d,
-  0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e,
-  0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d,
-  0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e,
-  0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d,
-  0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e,
-  0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d,
-  0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e,
-  0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d,
-  0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e,
-  0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d,
-  0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e,
-  0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d,
-  0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e,
-  0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d,
-  0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d, 0xaf, 0xfa, 0xab, 0xaa,
-  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xfa, 0xab, 0x3e,
-  0x5f, 0xf5, 0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-  0x55, 0xf5, 0x57, 0x3d, 0xaf, 0x0e, 0xac, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x0e, 0xac, 0x3e, 0x5f, 0x0d, 0x5c, 0x55,
-  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x0d, 0x5c, 0x3d,
-  0xaf, 0x03, 0xb0, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-  0xaa, 0x03, 0xb0, 0x3e, 0x5f, 0x03, 0x70, 0x55, 0x55, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x55, 0x55, 0x03, 0x70, 0x3d, 0xaf, 0x03, 0xb0, 0xaa,
-  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x03, 0xb0, 0x3e,
-  0x5f, 0x03, 0x70, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-  0x55, 0x03, 0x70, 0x3d, 0xaf, 0x03, 0xb0, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x03, 0xb0, 0x3e, 0x5f, 0x03, 0x70, 0x55,
-  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x03, 0x70, 0x3d,
-  0xaf, 0x0e, 0xac, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-  0xaa, 0x0e, 0xac, 0x3e, 0x5f, 0x0d, 0x5c, 0x55, 0x55, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x55, 0x55, 0x0d, 0x5c, 0x3d, 0xaf, 0xfa, 0xab, 0xaa,
-  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xfa, 0xab, 0x3e,
-  0x5f, 0xf5, 0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-  0x55, 0xf5, 0x57, 0x3d, 0xbf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3f, 0x7f, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3f,
-  0xfc, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-  0xaa, 0xaa, 0xea, 0x0f, 0xfc, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5, 0x0f, 0xf0, 0xff, 0xff, 0xff,
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x03,
-  0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-  0xff, 0xff, 0xff, 0x03, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0xc0, 0xff, 0xff, 0xff,
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
diff --git a/ext/tk/sample/tkextlib/vu/oscilloscope.rb b/ext/tk/sample/tkextlib/vu/oscilloscope.rb
deleted file mode 100644
index de57409a5e..0000000000
--- a/ext/tk/sample/tkextlib/vu/oscilloscope.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-
-require 'tk'
-require 'tkextlib/vu/charts'
-
-#---USAGE
-info = "...the heart of a Realtime Oscilloscope, where the PCIs
-joystick port gives 4 digital inputs and 4 analog 8 bit
-values with an resolution of ~1 millisecond (!!!)
-running Realtime Linux.
-<p> creates DEMO.ps
-<B1-Motion> see what happens"
-puts info
-
-#---GEOMETRY
-geo_fr  = [10, 10, 210, 180]
-geo_ch0 = [10, 10, 210,  90]
-geo_ch1 = [10, 90, 210, 180]
-geo_t1  = [15, 88]
-
-#---GUI
-c = TkCanvas.new(:width=>220, :height=>190).pack(:fill=>:both, :expand=>true)
-
-#---background
-TkcRectangle.new(c, geo_fr, :width=>4, :fill=>'aquamarine3',
-                 :tags=>['osc', 'frbg'])
-
-#---channel 0
-ch0 = Tk::Vu::TkcStripchart.new(c, geo_ch0,
-                                :fill=>'', :jumpscroll=>false,
-                                :outline=>'', :scaleline=>'',
-                                :stripline=>'cyan', :tags=>['osc', 'ch0'])
-
-#---channel 1
-ch1 = Tk::Vu::TkcStripchart.new(c, geo_ch1,
-                                :fill=>'', :jumpscroll=>0,
-                                :outline=>'', :scaleline=>'',
-                                :stripline=>'red', :tags=>['osc', 'ch1'])
-
-#---frame
-TkcRectangle.new(c, geo_fr, :width=>4, :tags=>['osc', 'frfg'])
-
-#---position
-txt1 = TkcText.new(c, geo_t1, :text=>"B1-Motion: X:%X\tY:%Y",
-                   :anchor=>:nw, :tags=>['osc', 'txt1'])
-
-#---BINDINGS
-c.bind('B1-Motion', proc{|x, y, xx, yy|
-         ch0[:values] = x
-         ch1[:values] = y
-         txt1[:text] = "B1-Motion: X:#{xx}\tY:#{yy}"
-       }, '%x %y %X %Y')
-
-Tk.root.bind('v', proc{
-               puts ch0[:values].join(' ')
-               puts ch0[:values].size
-             })
-
-Tk.root.bind('p', proc{
-               c.postscript(:file=>'DEMO.ps')
-               puts "DEMO.ps printed"
-             })
-
-Tk.root.bind('q', proc{exit})
-
-#####################
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/vu/pie.rb b/ext/tk/sample/tkextlib/vu/pie.rb
deleted file mode 100644
index a61a19188e..0000000000
--- a/ext/tk/sample/tkextlib/vu/pie.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-
-require 'tk'
-require 'tkextlib/vu/pie'
-
-pie = Tk::Vu::Pie.new(:label=>"My Revolving Budget"){
-  itemconfigure('Welfare',   :value=>3.004)
-  itemconfigure('Military',  :value=>7.006)
-  itemconfigure('Transport', :value=>1.6, :explode=>15)
-  itemconfigure('Parks',     :value=>0.9)
-  itemconfigure('Schools',   :value=>2)
-  itemconfigure('Debt',      :value=>4,   :explode=>10)
-
-  configure(:angle=>10, :origin=>90, :shadow=>10)
-}
-
-spin = TkTimer.new(60, -1, proc{|obj|
-  pie.configure(:origin=>pie[:origin] + 1)
-})
-
-f = TkFrame.new
-fast_btn = TkButton.new(f, :text=>"Spin Faster", :command=>proc{spin.start})
-slow_btn = TkButton.new(f, :text=>"Spin Slower", :command=>proc{spin.stop})
-quit_btn = TkButton.new(f, :text=>"Exit", :command=>proc{exit})
-
-Tk.grid(pie, :sticky=>:news)
-Tk.grid(f, :sticky=>:ew)
-
-Tk.pack(fast_btn, slow_btn, quit_btn,
-        :in=>f, :side=>:left, :fill=>:both, :expand=>true, :padx=>6, :pady=>4)
-
-Tk.root.grid_columnconfigure(0, :weight=>1)
-Tk.root.grid_rowconfigure(0, :weight=>1)
-
-priv = {
-  :x=>0, :y=>0, :pie_in=>false, :angle=>pie[:angle], :origin=>pie[:origin]
-}
-
-pie.bind('ButtonPress-1', proc{|w, x, y|
-             priv[:x] = x
-             priv[:y] = y
-             priv[:pie_in] = (w.winfo_width/1.8 > x)
-             priv[:angle]  = w[:angle]
-             priv[:origin] = w[:origin]
-         }, '%W %x %y')
-
-pie.bind('B1-Motion', proc{|w, x, y|
-           if priv[:pie_in]
-             w.configure(:angle=>priv[:angle] + (priv[:y] - y)/3,
-                         :origin=>(priv[:origin] +
-                                   ((w.winfo_height/2.2 > y)? -1: 1) *
-                                   (priv[:x] - x)/3) % 360)
-           end
-         }, '%W %x %y')
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkextlib/vu/vu_demo.rb b/ext/tk/sample/tkextlib/vu/vu_demo.rb
deleted file mode 100644
index 7b9741f933..0000000000
--- a/ext/tk/sample/tkextlib/vu/vu_demo.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-
-require 'tk'
-require 'tkextlib/vu'
-
-#######################################
-
-puts "Show off barchart and dial widgets"
-
-speed = TkVariable.new(0)
-
-dial = Tk::Vu::Dial.new(:resolution=>0.001, :from=>-0.1, :to=>0.1,
-                        :showvalue=>true, :minortickinterval=>0.01,
-                        :tickinterval=>0.1, :radius=>50, :label=>"Dial",
-                        :beginangle=>-20, :endangle=>260, :dialcolor=>'red3',
-                        :active=>'red2', :variable=>speed)
-
-bar = Tk::Vu::Bargraph.new(:from=>0, :to=>100, :relief=>:groove,
-                           :border=>2, :label=>"Bar Chart")
-
-#######################################
-
-green   = 25
-blue    = 50
-purple  = 75
-current = 50
-
-def rand_bool
-
-end
-
-update = TkTimer.new(200, -1, proc{
-                       if (rand() - 0.5 + speed.numeric * 3) > 0
-                         current += 1
-                       else
-                         current -= 1
-                       end
-                       bar.set(current)
-                       if current < green
-                         current = 100 if current <= 0
-                         bar[:barcolor] = 'green'
-                       elsif current < blue
-                         bar[:barcolor] = 'blue'
-                       elsif current < purple
-                         bar[:barcolor] = 'purple'
-                       else
-                         bar[:barcolor] = 'red'
-                         current = 0 if current >= 100
-                       end
-                     })
-
-#######################################
-
-gobar = TkButton.new(:text=>"Start", :command=>proc{update.start})
-nobar = TkButton.new(:text=>"Stop",  :command=>proc{update.stop})
-quit  = TkButton.new(:text=>"Exit",  :command=>proc{exit})
-
-Tk.grid('x', gobar, :sticky=>:ew, :padx=>4, :pady=>4)
-Tk.grid(dial, bar, :sticky=>:news)
-Tk.grid('x', nobar, :sticky=>:ew, :padx=>4, :pady=>4)
-Tk.grid(quit, '-', '-', :sticky=>:ew, :padx=>4, :pady=>4)
-Tk.root.grid_columnconfigure(2, :weight=>1)
-Tk.root.grid_rowconfigure(1, :weight=>1)
-
-#######################################
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkfrom.rb b/ext/tk/sample/tkfrom.rb
deleted file mode 100644
index 69a122ffe1..0000000000
--- a/ext/tk/sample/tkfrom.rb
+++ /dev/null
@@ -1,133 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-
-require "base64"
-
-class Mail
-  def Mail.new(f)
-    if !f.kind_of?(IO)
-      f = open(f, "r")
-      me = super(f)
-      f.close
-    else
-      me = super
-    end
-    return me
-  end
-
-  def initialize(f)
-    @header = {}
-    @body = []
-    while line = f.gets()
-      $_.chop!
-      next if /^From / =~ line  # skip From-line
-      break if /^$/ =~ line     # end of header
-      if /^(\S+):\s*(.*)/ =~ line
-        @header[attr = $1.capitalize] = $2
-      elsif attr
-        sub(/^\s*/, '')
-        @header[attr] += "\n" + $_
-      end
-    end
-
-    return unless $_
-
-    while line = f.gets()
-      break if /^From / =~ line
-      @body.push($_)
-    end
-  end
-
-  def header
-    return @header
-  end
-
-  def body
-    return @body
-  end
-
-end
-
-if ARGV.length == 0
-  if ENV['MAIL']
-    ARGV[0] = ENV['MAIL']
-  elsif ENV['USER']
-    ARGV[0] = '/var/spool/mail/' + ENV['USER']
-  elsif ENV['LOGNAME']
-    ARGV[0] = '/var/spool/mail/' + ENV['LOGNAME']
-  end
-end
-
-require "tk"
-list = scroll = nil
-TkFrame.new{|f|
-  list = TkListbox.new(f) {
-    yscroll proc{|*idx|
-        scroll.set *idx
-    }
-    relief 'raised'
-#    geometry "80x5"
-    width 80
-    height 5
-    setgrid 'yes'
-    pack('side'=>'left','fill'=>'both','expand'=>'yes')
-  }
-  scroll = TkScrollbar.new(f) {
-    command proc{|idx|
-      list.yview *idx
-    }
-    pack('side'=>'right','fill'=>'y')
-  }
-  pack
-}
-root = Tk.root
-TkButton.new(root) {
-  text 'Dismiss'
-  command proc {exit}
-  pack('fill'=>'both','expand'=>'yes')
-}
-root.bind "Control-c", proc{exit}
-root.bind "Control-q", proc{exit}
-root.bind "space", proc{exit}
-
-$outcount = 0;
-for file in ARGV
-  next unless File.exist?(file)
-  atime = File.atime(file)
-  mtime = File.mtime(file)
-  f = open(file, "r")
-  begin
-    until f.eof
-      mail = Mail.new(f)
-      date = mail.header['Date']
-      next unless date
-      from = mail.header['From']
-      subj = mail.header['Subject']
-      y = m = d = 0
-      if date
-        date = Date.parse(date) if date
-        y, m, d = date.year, date.mon, date.mday
-      end
-      from = "sombody@somewhere" unless from
-      subj = "(nil)" unless subj
-      from = decode_b(from)
-      subj = decode_b(subj)
-      list.insert 'end', format('%-02d/%02d/%02d [%-28.28s] %s',y,m,d,from,subj)
-      $outcount += 1
-    end
-  ensure
-    f.close
-    File.utime(atime, mtime, file)
-    list.see 'end'
-  end
-end
-
-limit = 10000
-if $outcount == 0
-  list.insert 'end', "You have no mail."
-  limit = 2000
-end
-Tk.after limit, proc{
-  exit
-}
-Tk.mainloop
diff --git a/ext/tk/sample/tkhello.rb b/ext/tk/sample/tkhello.rb
deleted file mode 100644
index 02de5ff381..0000000000
--- a/ext/tk/sample/tkhello.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# frozen_string_literal: false
-require "tk"
-
-TkButton.new(nil,
-             :text => 'hello',
-             :command => proc{print "hello\n"}).pack(:fill=>'x')
-TkButton.new(nil,
-             :text => 'quit',
-             :command => proc{exit}).pack(:fill=>'x')
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkline.rb b/ext/tk/sample/tkline.rb
deleted file mode 100644
index c23cb95cbd..0000000000
--- a/ext/tk/sample/tkline.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-# frozen_string_literal: false
-
-require "tkclass"
-
-$tkline_init = FALSE
-def start_random
-  return if $tkline_init
-  $tkline_init = TRUE
-  if defined? Thread
-    Thread.start do
-      loop do
-        sleep 2
-        Line.new($c, rand(400), rand(200), rand(400), rand(200))
-      end
-    end
-  end
-end
-
-Label.new('text'=>'Please press or drag button-1').pack
-
-$c = Canvas.new
-$c.pack
-$start_x = start_y = 0
-
-def do_press(x, y)
-  $start_x = x
-  $start_y = y
-  $current_line = Line.new($c, x, y, x, y)
-  start_random
-end
-def do_motion(x, y)
-  if $current_line
-    $current_line.coords $start_x, $start_y, x, y
-  end
-end
-
-def do_release(x, y)
-  if $current_line
-    $current_line.coords $start_x, $start_y, x, y
-    $current_line.fill 'black'
-    $current_line = nil
-  end
-end
-
-$c.bind("1", proc{|e| do_press e.x, e.y})
-$c.bind("B1-Motion", proc{|x, y| do_motion x, y}, "%x %y")
-$c.bind("ButtonRelease-1", proc{|x, y| do_release x, y}, "%x %y")
-Tk.mainloop
diff --git a/ext/tk/sample/tkmenubutton.rb b/ext/tk/sample/tkmenubutton.rb
deleted file mode 100644
index 2107e42a75..0000000000
--- a/ext/tk/sample/tkmenubutton.rb
+++ /dev/null
@@ -1,136 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-#
-#  menubutton sample : based on sample menubuttons on the Tcl/Tk demo script
-#
-require 'tk'
-
-TkLabel.new(:text=>'Sample of TkMenubutton').pack(:side=>:top)
-
-TkFrame.new{|f|
-  pack(:side=>:top)
-
-
-  TkMenubutton.new(:parent=>f, :text=>'Right', :underline=>0,
-                   :direction=>:right, :relief=>:raised){|mb|
-    menu TkMenu.new(:parent=>mb, :tearoff=>0){
-      add(:command, :label=>'Right menu: first item',
-                    :command=>proc{print 'You have selected the first item' +
-                                         " from the Right menu.\n"})
-      add(:command, :label=>'Right menu: second item',
-                    :command=>proc{print 'You have selected the second item' +
-                                         " from the Right menu.\n"})
-    }
-    pack(:side=>:left, :padx=>25, :pady=>25)
-  }
-
-  TkMenubutton.new(:parent=>f, :text=>'Below', :underline=>0,
-                   :direction=>:below, :relief=>:raised){|mb|
-    menu(TkMenu.new(:parent=>mb, :tearoff=>0){
-      add(:command, :label=>'Below menu: first item',
-                    :command=>proc{print 'You have selected the first item' +
-                                         " from the Below menu.\n"})
-      add(:command, :label=>'Below menu: second item',
-                    :command=>proc{print 'You have selected the second item' +
-                                         " from the Below menu.\n"})
-    })
-    pack(:side=>:left, :padx=>25, :pady=>25)
-  }
-
-  TkMenubutton.new(:parent=>f, :text=>'Above', :underline=>0,
-                   :direction=>:above, :relief=>:raised){|mb|
-    menu TkMenu.new(:parent=>mb, :tearoff=>0){
-      add(:command, :label=>'Above menu: first item',
-                    :command=>proc{print 'You have selected the first item' +
-                                         " from the Above menu.\n"})
-      add(:command, :label=>'Above menu: second item',
-                    :command=>proc{print 'You have selected the second item' +
-                                         " from the Above menu.\n"})
-    }
-    pack(:side=>:left, :padx=>25, :pady=>25)
-  }
-
-  TkMenubutton.new(:parent=>f, :text=>'Left', :underline=>0,
-                   :direction=>:left, :relief=>:raised){|mb|
-    menu(TkMenu.new(:parent=>mb, :tearoff=>0){
-      add(:command, :label=>'Left menu: first item',
-                    :command=>proc{print 'You have selected the first item' +
-                                         " from the Left menu.\n"})
-      add(:command, :label=>'Left menu: second item',
-                    :command=>proc{print 'You have selected the second item' +
-                                         " from the Left menu.\n"})
-    })
-    pack(:side=>:left, :padx=>25, :pady=>25)
-  }
-}
-
-############################
-TkFrame.new(:borderwidth=>2, :relief=>:sunken,
-            :height=>5).pack(:side=>:top, :fill=>:x, :padx=>20)
-############################
-
-TkLabel.new(:text=>'Sample of TkOptionMenu').pack(:side=>:top)
-
-colors = %w(Black red4 DarkGreen NavyBlue gray75 Red Green Blue gray50
-            Yellow Cyan Magenta White Brown DarkSeaGreen DarkViolet)
-
-TkFrame.new{|f|
-  pack(:side=>:top)
-
-  b1 = TkOptionMenubutton .
-    new(:parent=>f, :values=>%w(one two three)) .
-    pack(:side=>:left, :padx=>25, :pady=>25)
-
-  b2 = TkOptionMenubutton.new(:parent=>f, :values=>colors) {|optMB|
-    colors.each{|color|
-      no_sel = TkPhotoImage.new(:height=>16, :width=>16){
-        put 'gray50', *[ 0,  0, 16,  1]
-        put 'gray50', *[ 0,  1,  1, 16]
-        put 'gray75', *[ 0, 15, 16, 16]
-        put 'gray75', *[15,  1, 16, 16]
-        put color,    *[ 1,  1, 15, 15]
-      }
-      sel = TkPhotoImage.new(:height=>16, :width=>16){
-        put 'Black',  *[ 0,  0, 16,  2]
-        put 'Black',  *[ 0,  2,  2, 16]
-        put 'Black',  *[ 2, 14, 16, 16]
-        put 'Black',  *[14,  2, 16, 14]
-        put color,    *[ 2,  2, 14, 14]
-      }
-      optMB.entryconfigure(color, :hidemargin=>1,
-                           :image=>no_sel, :selectimage=>sel)
-    }
-    optMB.menuconfigure(:tearoff, 1)
-    %w(Black gray75 gray50 White).each{|color|
-      optMB.entryconfigure(color, :columnbreak=>true)
-    }
-    pack(:side=>:left, :padx=>25, :pady=>25)
-  }
-
-  TkButton.new(:parent=>f){
-    text 'show values'
-    command proc{p [b1.value, b2.value]}
-    pack(:side=>:left, :padx=>25, :pady=>5, :anchor=>:s)
-  }
-}
-
-############################
-TkFrame.new(:borderwidth=>2, :relief=>:sunken,
-            :height=>5).pack(:side=>:top, :fill=>:x, :padx=>20)
-############################
-
-root = TkRoot.new(:title=>'menubutton samples')
-
-TkButton.new(root, :text=>'exit', :command=>proc{exit}){
-  pack(:side=>:top, :padx=>25, :pady=>5, :anchor=>:e)
-}
-
-# VirtualEvent <<MenuSelect>> on Tcl/Tk ==> '<MenuSelect>' on Ruby/Tk
-# ( remove the most external <, > for Ruby/Tk notation )
-TkMenu.bind('<MenuSelect>', proc{|widget|
-              p widget.entrycget('active', :label)
-            }, '%W')
-
-############################
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkmsgcat-load_rb.rb b/ext/tk/sample/tkmsgcat-load_rb.rb
deleted file mode 100644
index bacf85de50..0000000000
--- a/ext/tk/sample/tkmsgcat-load_rb.rb
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-
-require 'tk'
-
-demo_dir = File.dirname($0)
-msgcat_dir = [demo_dir, 'msgs_rb'].join(File::Separator)
-top_win = nil
-#msgcat = TkMsgCatalog.new('::tk')
-msgcat = TkMsgCatalog.new('::tkmsgcat_demo')
-default_locale = msgcat.locale
-#msgcat.load_rb(msgcat_dir)
-msgcat.load(msgcat_dir)
-
-col_proc = TkComm.install_bind(proc{|w, color, frame, label|
-                                 TkComm.window(frame).background(color)
-                                 Tk.update
-                                 TkComm.window(label).text(
-                                          msgcat["%1$s:: %2$s", 'Color',
-                                                 color.capitalize])
-                                 w.flash; w.flash
-                                 Tk.callback_break;
-                              }, "%W")
-
-del_proc = TkComm.install_cmd(proc{top_win.destroy; top_win = nil})
-
-err_proc = TkComm.install_cmd(proc{fail(RuntimeError,
-                                        msgcat['Application Error'])})
-
-show_sample = proc{|loc|
-  top_win = TkToplevel.new(:title=>loc)
-
-  msgcat.locale = loc
-  #msgcat.load_rb(msgcat_dir)
-  msgcat.load(msgcat_dir)
-
-  TkLabel.new(top_win){
-    text "preferences:: #{msgcat.preferences.join(' ')}"
-    pack(:pady=>10, :padx=>10)
-  }
-
-  lbl = TkLabel.new(top_win, :text=>msgcat["%1$s:: %2$s",
-                                           'Color', '']).pack(:anchor=>'w')
-
-  bg = TkFrame.new(top_win).pack(:ipadx=>20, :ipady=>10,
-                                 :expand=>true, :fill=>:both)
-
-  TkFrame.new(bg){|f|
-    ['blue', 'green', 'red'].each{|col|
-      TkButton.new(f, :text=>msgcat[col]){
-        bind('ButtonRelease-1', col_proc, "#{col} #{bg.path} #{lbl.path}")
-      }.pack(:fill=>:x)
-    }
-  }.pack(:anchor=>'center', :pady=>15)
-
-  TkFrame.new(top_win){|f|
-    TkButton.new(f, :text=>msgcat['Delete'],
-                 :command=>del_proc).pack(:side=>:right, :padx=>5)
-    TkButton.new(f, :text=>msgcat['Error'],
-                 :command=>err_proc).pack(:side=>:left, :padx=>5)
-  }.pack(:side=>:bottom, :fill=>:x)
-
-  top_win
-}
-
-
-#  listbox for locale list
-TkLabel.new(:text=>"Please click a locale.").pack(:padx=>5, :pady=>3)
-
-TkFrame.new{|f|
-  TkButton.new(f, :text=>msgcat['Exit'],
-               :command=>proc{exit}).pack(:side=>:right, :padx=>5)
-}.pack(:side=>:bottom, :fill=>:x)
-
-f = TkFrame.new.pack(:side=>:top, :fill=>:both, :expand=>true)
-lbox = TkListbox.new(f).pack(:side=>:left, :fill=>:both, :expand=>true)
-lbox.yscrollbar(TkScrollbar.new(f, :width=>12).pack(:side=>:right, :fill=>:y))
-
-lbox.bind('ButtonRelease-1'){|ev|
-  idx = lbox.index("@#{ev.x},#{ev.y}")
-  if idx == 0
-    loc = default_locale
-  else
-    loc = lbox.get(idx)
-  end
-  if top_win != nil && top_win.exist?
-    top_win.destroy
-  end
-  top_win = show_sample.call(loc)
-}
-
-lbox.insert('end', 'default')
-
-Dir.entries(msgcat_dir).sort.each{|f|
-  if f =~ /^(.*).msg$/
-    lbox.insert('end', $1)
-  end
-}
-
-top_win = show_sample.call(default_locale)
-
-#  start eventloop
-Tk.mainloop
diff --git a/ext/tk/sample/tkmsgcat-load_rb2.rb b/ext/tk/sample/tkmsgcat-load_rb2.rb
deleted file mode 100644
index 53e41bc481..0000000000
--- a/ext/tk/sample/tkmsgcat-load_rb2.rb
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-
-require 'tk'
-
-demo_dir = File.dirname($0)
-msgcat_dir = [demo_dir, 'msgs_rb2'].join(File::Separator)
-top_win = nil
-#msgcat = TkMsgCatalog.new('::tk')
-msgcat = TkMsgCatalog.new('::tkmsgcat_demo')
-default_locale = msgcat.locale
-#msgcat.load_rb(msgcat_dir)
-msgcat.load(msgcat_dir)
-
-col_proc = TkComm.install_bind(proc{|w, color, frame, label|
-                                 TkComm.window(frame).background(color)
-                                 Tk.update
-                                 TkComm.window(label).text(
-                                          msgcat["%1$s:: %2$s", 'Color',
-                                                 color.capitalize])
-                                 w.flash; w.flash
-                                 Tk.callback_break;
-                              }, "%W")
-
-del_proc = TkComm.install_cmd(proc{top_win.destroy; top_win = nil})
-
-err_proc = TkComm.install_cmd(proc{fail(RuntimeError,
-                                        msgcat['Application Error'])})
-
-show_sample = proc{|loc|
-  top_win = TkToplevel.new(:title=>loc)
-
-  msgcat.locale = loc
-  #msgcat.load_rb(msgcat_dir)
-  msgcat.load(msgcat_dir)
-
-  TkLabel.new(top_win){
-    text "preferences:: #{msgcat.preferences.join(' ')}"
-    pack(:pady=>10, :padx=>10)
-  }
-
-  lbl = TkLabel.new(top_win, :text=>msgcat["%1$s:: %2$s",
-                                           'Color', '']).pack(:anchor=>'w')
-
-  bg = TkFrame.new(top_win).pack(:ipadx=>20, :ipady=>10,
-                                 :expand=>true, :fill=>:both)
-
-  TkFrame.new(bg){|f|
-    ['blue', 'green', 'red'].each{|col|
-      TkButton.new(f, :text=>msgcat[col]){
-        bind('ButtonRelease-1', col_proc, "#{col} #{bg.path} #{lbl.path}")
-      }.pack(:fill=>:x)
-    }
-  }.pack(:anchor=>'center', :pady=>15)
-
-  TkFrame.new(top_win){|f|
-    TkButton.new(f, :text=>msgcat['Delete'],
-                 :command=>del_proc).pack(:side=>:right, :padx=>5)
-    TkButton.new(f, :text=>msgcat['Error'],
-                 :command=>err_proc).pack(:side=>:left, :padx=>5)
-  }.pack(:side=>:bottom, :fill=>:x)
-
-  top_win
-}
-
-
-#  listbox for locale list
-TkLabel.new(:text=>"Please click a locale.").pack(:padx=>5, :pady=>3)
-
-TkFrame.new{|f|
-  TkButton.new(f, :text=>msgcat['Exit'],
-               :command=>proc{exit}).pack(:side=>:right, :padx=>5)
-}.pack(:side=>:bottom, :fill=>:x)
-
-f = TkFrame.new.pack(:side=>:top, :fill=>:both, :expand=>true)
-lbox = TkListbox.new(f).pack(:side=>:left, :fill=>:both, :expand=>true)
-lbox.yscrollbar(TkScrollbar.new(f, :width=>12).pack(:side=>:right, :fill=>:y))
-
-lbox.bind('ButtonRelease-1'){|ev|
-  idx = lbox.index("@#{ev.x},#{ev.y}")
-  if idx == 0
-    loc = default_locale
-  else
-    loc = lbox.get(idx)
-  end
-  if top_win != nil && top_win.exist?
-    top_win.destroy
-  end
-  top_win = show_sample.call(loc)
-}
-
-lbox.insert('end', 'default')
-
-Dir.entries(msgcat_dir).sort.each{|f|
-  if f =~ /^(.*).msg$/
-    lbox.insert('end', $1)
-  end
-}
-
-top_win = show_sample.call(default_locale)
-
-#  start eventloop
-Tk.mainloop
diff --git a/ext/tk/sample/tkmsgcat-load_tk.rb b/ext/tk/sample/tkmsgcat-load_tk.rb
deleted file mode 100644
index 783d03ccf2..0000000000
--- a/ext/tk/sample/tkmsgcat-load_tk.rb
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-
-require 'tk'
-
-demo_dir = File.dirname($0)
-msgcat_dir = [demo_dir, 'msgs_tk'].join(File::Separator)
-top_win = nil
-#msgcat = TkMsgCatalog.new('::tk')
-msgcat = TkMsgCatalog.new('::tkmsgcat_demo')
-default_locale = msgcat.locale
-msgcat.load_tk(msgcat_dir)
-
-col_proc = TkComm.install_bind(proc{|w, color, frame, label|
-                                 TkComm.window(frame).background(color)
-                                 Tk.update
-                                 TkComm.window(label).text(
-                                          msgcat.mc("%1$s:: %2$s", 'Color',
-                                                    color.capitalize))
-                                 w.flash; w.flash
-                                 Tk.callback_break;
-                              }, "%W")
-
-del_proc = TkComm.install_cmd(proc{top_win.destroy; top_win = nil})
-
-err_proc = TkComm.install_cmd(proc{fail(RuntimeError,
-                                        msgcat.mc('Application Error'))})
-
-show_sample = proc{|loc|
-  top_win = TkToplevel.new(:title=>loc)
-
-  msgcat.locale = loc
-  msgcat.load_tk(msgcat_dir)
-
-  TkLabel.new(top_win){
-    text "preferences:: #{msgcat.preferences.join(' ')}"
-    pack(:pady=>10, :padx=>10)
-  }
-
-  lbl = TkLabel.new(top_win, :text=>msgcat.mc("%1$s:: %2$s",
-                                              'Color', '')).pack(:anchor=>'w')
-
-  bg = TkFrame.new(top_win).pack(:ipadx=>20, :ipady=>10,
-                                 :expand=>true, :fill=>:both)
-
-  TkFrame.new(bg){|f|
-    ['blue', 'green', 'red'].each{|col|
-      TkButton.new(f, :text=>msgcat.mc(col)){
-        bind('ButtonRelease-1', col_proc, "#{col} #{bg.path} #{lbl.path}")
-      }.pack(:fill=>:x)
-=begin
-      TkButton.new(f, :text=>msgcat.mc(col),
-                   :command=>proc{
-                     bg.background col
-                     lbl.text msgcat.mc("%1$s:: %2$s", 'Color', col.capitalize)
-                   }).pack(:fill=>:x)
-=end
-    }
-  }.pack(:anchor=>'center', :pady=>15)
-
-  TkFrame.new(top_win){|f|
-    TkButton.new(f, :text=>msgcat.mc('Delete'),
-                 :command=>del_proc).pack(:side=>:right, :padx=>5)
-    TkButton.new(f, :text=>msgcat.mc('Error'),
-                 :command=>err_proc).pack(:side=>:left, :padx=>5)
-=begin
-    TkButton.new(f, :text=>msgcat.mc('Delete'),
-                 :command=>proc{
-                   top_win.destroy
-                   top_win = nil
-                 }).pack(:side=>:right, :padx=>5)
-    TkButton.new(f, :text=>msgcat.mc('Error'),
-                 :command=>proc{
-                   fail RuntimeError, msgcat.mc('Application Error')
-                 }).pack(:side=>:left, :padx=>5)
-=end
-  }.pack(:side=>:bottom, :fill=>:x)
-
-  top_win
-}
-
-
-#  listbox for locale list
-TkLabel.new(:text=>"Please click a locale.").pack(:padx=>5, :pady=>3)
-
-TkFrame.new{|f|
-  TkButton.new(f, :text=>msgcat.mc('Exit'),
-               :command=>proc{exit}).pack(:side=>:right, :padx=>5)
-}.pack(:side=>:bottom, :fill=>:x)
-
-f = TkFrame.new.pack(:side=>:top, :fill=>:both, :expand=>true)
-lbox = TkListbox.new(f).pack(:side=>:left, :fill=>:both, :expand=>true)
-lbox.yscrollbar(TkScrollbar.new(f, :width=>12).pack(:side=>:right, :fill=>:y))
-
-lbox.bind('ButtonRelease-1'){|ev|
-  idx = lbox.index("@#{ev.x},#{ev.y}")
-  if idx == 0
-    loc = default_locale
-  else
-    loc = lbox.get(idx)
-  end
-  if top_win != nil && top_win.exist?
-    top_win.destroy
-  end
-  top_win = show_sample.call(loc)
-}
-
-lbox.insert('end', 'default')
-
-Dir.entries(msgcat_dir).sort.each{|f|
-  if f =~ /^(.*).msg$/
-    lbox.insert('end', $1)
-  end
-}
-
-top_win = show_sample.call(default_locale)
-
-#  start eventloop
-Tk.mainloop
diff --git a/ext/tk/sample/tkmulticolumnlist.rb b/ext/tk/sample/tkmulticolumnlist.rb
deleted file mode 100644
index 1b26077995..0000000000
--- a/ext/tk/sample/tkmulticolumnlist.rb
+++ /dev/null
@@ -1,744 +0,0 @@
-# frozen_string_literal: false
-#
-# tkmulticolumnlist.rb : multiple column list widget on scrollable frame
-#                        by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-
-class TkMultiColumnList < TkText
-  include TkComposite
-
-  #   lbox_height : height of listboxes (pixel)
-  #   title_info  : array [ [<title_string>,<init_width>], ... ]
-  #   keys        : hash {<option>=><value>, ... }
-  def initialize_composite(lbox_height, title_info, keys={})
-    # argument check
-    if (! title_info.kind_of? Array) or (title_info.size < 2)
-      raise
-    end
-
-    # mode
-    @keep_minsize = true
-    @show_each_hscr = true
-    @show_win_hscr = true
-
-    # init arrays
-    @base_list  = []
-    @rel_list   = []
-    @title_list = []
-    @title_cmd  = []
-    @lbox_list  = []
-    @hscr_list  = []
-
-    # decide total width
-    @lbox_total = title_info.size
-    @width_total = 0
-    title_info.each{|title, width, cmd|
-      @width_total += width.to_f
-      @title_cmd << cmd
-    }
-
-    # rel-table of label=>index
-    @name_index = {}
-
-    # size definition
-    @window_width = @width_total
-    @sash = 5
-    @scrbar_width = 15
-    @scrbar_border = 3
-    @lbox_border = 1
-    @title_border = 3
-    @h_l_thick = 0
-
-    # init status
-    @mode = :title
-    @command = nil
-
-    # vertical scrollbar
-    @v_scroll = TkYScrollbar.new(@frame, 'highlightthickness'=>@h_l_thick,
-                                 'borderwidth'=>@scrbar_border,
-                                 'width'=>@scrbar_width)
-
-    # horizontal scrollbar
-    @h_scroll = TkXScrollbar.new(@frame, 'highlightthickness'=>@h_l_thick,
-                                 'borderwidth'=>@scrbar_border,
-                                 'width'=>@scrbar_width)
-
-    # create base flames
-    @c_title = TkCanvas.new(@frame, 'highlightthickness'=>@h_l_thick,
-                            'width'=>@window_width)
-    @f_title = TkFrame.new(@c_title, 'width'=>@width_total)
-    @w_title = TkcWindow.new(@c_title, 0, 0,
-                             'window'=>@f_title, 'anchor'=>'nw')
-
-    @c_lbox  = TkCanvas.new(@frame, 'highlightthickness'=>@h_l_thick,
-                            'width'=>@window_width)
-    @f_lbox  = TkFrame.new(@c_lbox, 'width'=>@width_total)
-    @w_lbox  = TkcWindow.new(@c_lbox, 0, 0, 'window'=>@f_lbox, 'anchor'=>'nw')
-
-    @c_hscr  = TkCanvas.new(@frame, 'highlightthickness'=>@h_l_thick,
-                            'width'=>@window_width)
-    @f_hscr  = TkFrame.new(@c_hscr, 'width'=>@width_total)
-    @w_hscr  = TkcWindow.new(@c_hscr, 0, 0, 'window'=>@f_hscr, 'anchor'=>'nw')
-
-    # create each listbox
-    sum = 0.0
-    @rel_list << sum/@width_total
-    title_info.each_with_index{|(label, width), idx|
-      # set relation between label and index
-      if @name_index.include?(label)
-        @name_index[label] << idx
-      else
-        @name_index[label] = [idx]
-      end
-
-      # calculate relative positioning
-      sum += width
-      @rel_list << sum/@width_total
-
-      # title field
-      f = TkFrame.new(@f_title, 'width'=>width)
-      base = [f]
-
-      title = TkLabel.new(f, 'text'=>label, 'borderwidth'=>@title_border,
-                          'relief'=>'raised', 'highlightthickness'=>@h_l_thick)
-      title_binding(title, idx)
-      title.pack('fill'=>'x')
-
-      @title_list << title
-
-      f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>1,
-              'relheight'=>1.0,
-              'relwidth'=>@rel_list[idx+1] - @rel_list[idx])
-
-      # listbox field
-      f = TkFrame.new(@f_lbox, 'width'=>width)
-      base << f
-      @lbox_list << TkText.new(f, 'highlightthickness'=>@h_l_thick,
-                               'borderwidth'=>@lbox_border,
-                               'takefocus'=>false,
-                               'wrap'=>'none') {
-
-        bindtags(bindtags - [TkText])
-
-        @seltag = TkTextTag.new(self, 'background'=>'#b3b3b3',
-                                'borderwidth'=>1, 'relief'=>'raised')
-        def self.nearest(y)
-          self.index("@1,#{y}").split('.')[0].to_i
-        end
-
-        def self.select_clear(first, last=nil)
-          first = "#{first}.0" if first.kind_of?(Integer)
-          first = self.index(first.to_s + ' linestart')
-          last = first unless last
-          last = "#{last}.0" if first.kind_of?(Integer)
-          last = self.index(last.to_s + ' + 1 lines linestart')
-          @seltag.remove(first, last)
-        end
-
-        def self.select_set(first, last=nil)
-          first = "#{first}.0" if first.kind_of?(Integer)
-          first = self.index(first.to_s + ' linestart')
-          last = first unless last
-          last = "#{last}.0" if first.kind_of?(Integer)
-          last = self.index(last.to_s + ' + 1 lines linestart')
-          @seltag.add(first, last)
-        end
-
-        def self.select_index
-          self.index(@seltag.first).split('.')[0].to_i
-        end
-
-        pack('fill'=>'both', 'expand'=>true)
-      }
-
-      f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>1,
-              'relwidth'=>@rel_list[idx+1] - @rel_list[idx], 'relheight'=>1.0)
-
-      # scrollbar field
-      f = TkFrame.new(@f_hscr, 'width'=>width)
-      base << f
-      @hscr_list << TkXScrollbar.new(f, 'width'=>@scrbar_width,
-                                     'borderwidth'=>@scrbar_border,
-                                     'highlightthickness'=>@h_l_thick
-                                    ).pack('fill'=>'x', 'anchor'=>'w')
-      f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>1,
-              'relwidth'=>@rel_list[idx+1] - @rel_list[idx])
-
-      @lbox_list[idx].xscrollbar(@hscr_list[idx])
-
-      # add new base
-      @base_list << base
-    }
-
-    # pad
-    @f_title_pad = TkFrame.new(@frame, 'relief'=>'raised',
-                               'borderwidth'=>@title_border,
-                               'highlightthickness'=>@h_l_thick)
-
-    @f_scr_pad = TkFrame.new(@frame, 'relief'=>'sunken',
-                             'borderwidth'=>1,
-                             'highlightthickness'=>@h_l_thick)
-
-    # height check
-    title_height = 0
-    @title_list.each{|w|
-      h = w.winfo_reqheight
-      title_height = h if title_height < h
-    }
-
-    hscr_height = 0
-    @hscr_list.each{|w|
-      h = w.winfo_reqheight
-      hscr_height = h if hscr_height < h
-    }
-
-    @f_title.height title_height
-    @f_lbox.height lbox_height
-    @f_hscr.height hscr_height
-
-    # set control procedure for vertical scroll
-    @v_scroll.assign(*@lbox_list)
-
-    # set control procedure for horizontal scroll
-    @h_scroll.assign(@c_title, @c_lbox, @c_hscr)
-
-    # binding for listboxes
-    @lbox_list.each_with_index{|l, idx|
-      l.bind('Button-1', proc{|w, y|
-               @frame.focus
-               select_line(w, w.nearest(y))
-             }, '%W %y')
-      l.bind('B1-Motion', proc{|w, y|
-               select_line(w, w.nearest(y))
-             }, '%W %y')
-      l.bind('Double-Button-1', proc{
-               @command.call(get_select) if @command
-             })
-
-      l.bind('Control-Home', proc{|w| select_line(w, 0)}, '%W')
-      l.bind('Control-End', proc{|w| select_line(w, 'end')}, '%W')
-
-      l.bind('Button-2', proc{|x, y|
-               @lbox_mark_x = x
-               @lbox_list.each{|lbox| lbox.scan_mark(x, y)}
-             }, '%x %y')
-      l.bind('B2-Motion', proc{|x, y|
-               @lbox_list.each{|lbox| lbox.scan_dragto(@lbox_mark_x, y)}
-               l.scan_dragto(x, y)
-             }, '%x %y')
-    }
-
-    bbox = @w_title.bbox
-    @c_title.height(bbox[3])
-    @c_title.scrollregion(bbox)
-
-    bbox = @w_lbox.bbox
-    @c_lbox.height(bbox[3])
-    @c_lbox.scrollregion(bbox)
-
-    if @show_each_hscr
-      bbox = @w_hscr.bbox
-      @c_hscr.height(bbox[3])
-      @c_hscr.scrollregion(bbox)
-    end
-
-    # binding
-    @frame.takefocus(true)
-    @frame.bind('Key-Up', proc{select_shift(@lbox_list[0], -1)})
-    @frame.bind('Key-Down', proc{select_shift(@lbox_list[0], 1)})
-    @frame.bind('Return', proc{@command.call(get_select) if @command})
-
-    # alignment
-    TkGrid.rowconfigure(@frame, 0, 'weight'=>0)
-    TkGrid.rowconfigure(@frame, 1, 'weight'=>1)
-    TkGrid.rowconfigure(@frame, 2, 'weight'=>0)
-    TkGrid.rowconfigure(@frame, 3, 'weight'=>0)
-    TkGrid.columnconfigure(@frame, 0, 'weight'=>1)
-    TkGrid.columnconfigure(@frame, 1, 'weight'=>0)
-    TkGrid.columnconfigure(@frame, 2, 'weight'=>0)
-    @v_scroll.grid('row'=>1, 'column'=>2, 'sticky'=>'ns')
-    @c_title.grid('row'=>0, 'column'=>0, 'sticky'=>'news')
-    @f_title_pad.grid('row'=>0, 'column'=>2, 'sticky'=>'news')
-    @c_lbox.grid('row'=>1, 'column'=>0, 'sticky'=>'news')
-    @c_hscr.grid('row'=>2, 'column'=>0, 'sticky'=>'ew') if @show_each_hscr
-    @h_scroll.grid('row'=>3, 'column'=>0, 'sticky'=>'ew') if @show_win_hscr
-    @f_scr_pad.grid('row'=>2, 'rowspan'=>2, 'column'=>2, 'sticky'=>'news')
-
-    # binding for 'Configure' event
-    @c_lbox.bind('Configure',
-                 proc{|height, width| reconstruct(height, width)},
-                 '%h %w')
-
-    # set default receiver of method calls
-    @path = @frame.path
-
-    # configure options
-    keys = {} unless keys
-    keys = _symbolkey2str(keys)
-
-    # command
-    cmd = keys.delete('command')
-    command(cmd) if cmd
-
-    # 'scrollbarwidth' option == 'width' option of scrollbars
-    width = keys.delete('scrollbarwidth')
-    scrollbarwidth(width) if width
-
-    # options for listbox titles
-    title_font = keys.delete('titlefont')
-    titlefont(title_font) if title_font
-
-    title_fg = keys.delete('titleforeground')
-    titleforeground(title_fg) if title_fg
-
-    title_bg = keys.delete('titlebackground')
-    titlebackground(title_bg) if title_bg
-
-    # set receivers for configure methods
-    delegate('DEFAULT', *@lbox_list)
-    delegate('activebackground', @v_scroll, @h_scroll, *@hscr_list)
-    delegate('troughcolor', @v_scroll, @h_scroll, *@hscr_list)
-    delegate('repeatdelay', @v_scroll, @h_scroll, *@hscr_list)
-    delegate('repeatinterval', @v_scroll, @h_scroll, *@hscr_list)
-    delegate('borderwidth', @frame)
-    delegate('width', @c_lbox, @c_title, @c_hscr)
-    delegate('relief', @frame)
-
-    # configure
-    configure(keys) if keys.size > 0
-  end
-  private :initialize_composite
-
-  # keep_minsize?
-  def keep_minsize?
-    @keep_minsize
-  end
-  def keep_minsize(bool)
-    @keep_minsize = bool
-  end
-
-  # each hscr
-  def show_each_hscr
-    @show_each_hscr = true
-    @c_hscr.grid('row'=>2, 'column'=>0, 'sticky'=>'ew')
-  end
-  def hide_each_hscr
-    @show_each_hscr = false
-    @c_hscr.ungrid
-  end
-
-  # window hscroll
-  def show_win_hscr
-    @show_win_hscr = true
-    @h_scroll.grid('row'=>3, 'column'=>0, 'sticky'=>'ew')
-  end
-  def hide_win_hscr
-    @show_each_hscr = false
-    @h_scroll.ungrid
-  end
-
-  # set command
-  def command(cmd)
-    @command = cmd
-    self
-  end
-
-  # set scrollbar width
-  def scrollbarwidth(width)
-    @scrbar_width = width
-    @v_scroll['width'] = @scrbar_width
-    @h_scroll['width'] = @scrbar_width
-    @hscr_list.each{|hscr| hscr['width'] = @scrbar_width}
-    self
-  end
-
-  # set scrollbar border
-  def scrollbarborder(width)
-    @scrbar_border = width
-    @v_scroll['border'] = @scrbar_border
-    @h_scroll['border'] = @scrbar_border
-    @hscr_list.each{|hscr| hscr['border'] = @scrbar_border}
-    self
-  end
-
-  # set listbox borders
-  def listboxborder(width)
-    @lbox_border = width
-    @lbox_list.each{|w| w['border'] = @lbox_border}
-    self
-  end
-
-  # set listbox relief
-  def listboxrelief(relief)
-    @lbox_list.each{|w| w['relief'] = relief}
-    self
-  end
-
-  # set title borders
-  def titleborder(width)
-    @title_border = width
-    @f_title_pad['border'] = @title_border
-    @title_list.each{|label| label['border'] = @title_border}
-    self
-  end
-
-  # set title font
-  def titlefont(font)
-    @title_list.each{|label| label['font'] = font}
-    title_height = 0
-    @title_list.each{|w|
-      h = w.winfo_reqheight
-      title_height = h if title_height < h
-    }
-    @f_title.height title_height
-    bbox = @w_title.bbox
-    @c_title.height(bbox[3])
-    @c_title.scrollregion(bbox)
-    self
-  end
-
-  # set title foreground color
-  def titleforeground(fg)
-    @title_list.each{|label| label['foreground'] = fg}
-    self
-  end
-
-  # set title background color
-  def titlebackground(bg)
-    @f_title_pad['background'] = bg
-    @title_list.each{|label| label['background'] = bg}
-    self
-  end
-
-  # set title cmds
-  def titlecommand(idx, cmd=Proc.new)
-    @title_cmd[idx] = cmd
-  end
-
-  # call title cmds
-  def titleinvoke(idx)
-    @title_cmd[idx].call if @title_cmd[idx]
-  end
-
-  # get label widgets of listbox titles
-  def titlelabels(*indices)
-    @title_list[*indices]
-  end
-
-  # get listbox widgets
-  def columns(*indices)
-    @lbox_list[*indices]
-  end
-
-  def delete(*idx)
-    idx = idx.collect{|i|
-      if i.kind_of?(Integer)
-        "#{i}.0"
-      else
-        i.to_s
-      end
-    }
-    @lbox_list.collect{|lbox| lbox.delete(*idx)}
-  end
-
-  def get(idx_s, idx_e=nil)
-    unless idx_e
-      if idx_s.kind_of?(Integer)
-        idx_s = "#{idx_s}.0"
-        idx_e = "#{idx_s} lineend"
-      else
-        idx_s = idx_s.to_s
-        idx_e = "#{idx_s} lineend"
-      end
-      @lbox_list.collect{|lbox|
-        lbox.get(idx_s, idx_e)
-      }
-    else
-      if idx_s.kind_of?(Integer)
-        idx_s = "#{idx_s}.0"
-      else
-        idx_s = idx_s.to_s
-      end
-      if idx_e.kind_of?(Integer)
-        idx_e = "#{idx_e}.end"
-      else
-        idx_e = "#{idx_e} lineend"
-      end
-      list = @lbox_list.collect{|lbox| lbox.get(idx_s, idx_e).split(/\n/)}
-      result = []
-      list[0].each_with_index{|line, index|
-        result << list.collect{|lines| lines[index]}
-      }
-      result
-    end
-  end
-
-  def get_select
-    get(@lbox_list[0].select_index)
-  end
-
-  def _line_array_to_hash(line)
-    result = {}
-    @name_index.each_pair{|label, indices|
-      if indices.size == 1
-        result[label] = line[indices[0]]
-      else
-        result[label] = indices.collect{|index| line[index]}
-      end
-    }
-    result
-  end
-  private :_line_array_to_hash
-
-  def get_by_hash(*idx)
-    get_result = get(*idx)
-    if idx.size == 1
-      _line_array_to_hash(get_result)
-    else
-      get_result.collect{|line| _line_array_to_hash(line)}
-    end
-  end
-
-  def insert(idx, *lines)
-    lbox_ins = []
-    (0..@lbox_list.size).each{lbox_ins << []}
-
-    if idx.kind_of?(Integer)
-      idx = "#{idx}.0"
-    else
-      idx = idx.to_s
-    end
-
-    if @lbox_list[0].index('1.0 + 1 char') == @lbox_list[0].index('end')
-      cr = ""
-    else
-      cr = "\n"
-    end
-
-    lines.each{|line|
-      if line.kind_of? Hash
-        array = []
-        @name_index.each_pair{|label, indices|
-          if indices.size == 1
-            array[indices[0]] = line[label]
-          else
-            if line[label].kind_of? Array
-              indices.each_with_index{|index, num|
-                array[index] = line[label][num]
-              }
-            else
-              array[indices[0]] = line[label]
-            end
-          end
-        }
-        line = array
-      end
-
-      @name_index.each_pair{|label, indices|
-        if indices.size == 1
-          lbox_ins[indices[0]] << line[indices[0]]
-        else
-          indices.each{|index| lbox_ins[index] << line[index]}
-        end
-      }
-    }
-
-    @lbox_list.each_with_index{|lbox, index|
-      lbox.insert(idx, cr + lbox_ins[index].join("\n")) if lbox_ins[index]
-    }
-  end
-
-  def select_clear(first, last=None)
-    @lbox_list.each{|lbox| lbox.sel_clear(first, last=None)}
-  end
-
-  def select_set(first, last=None)
-    @lbox_list.each{|lbox| lbox.sel_set(first, last=None)}
-  end
-
-  ###########################################
-  private
-
-  def reconstruct(height, width)
-    if @keep_minsize && width <= @width_total
-      @f_title.width(@width_total)
-      @f_lbox.width(@width_total)
-      @f_hscr.width(@width_total) if @show_each_hscr
-      @window_width = @width_total
-    else
-      @f_title.width(width)
-      @f_lbox.width(width)
-      @f_hscr.width(width) if @show_each_hscr
-      @window_width = width
-    end
-
-    @f_lbox.height(height)
-
-    @c_title.scrollregion(@w_title.bbox)
-    @c_lbox.scrollregion(@w_lbox.bbox)
-    @c_hscr.scrollregion(@w_hscr.bbox) if @show_each_hscr
-
-    (0..(@rel_list.size - 2)).each{|idx|
-      title, lbox, hscr = @base_list[idx]
-      title.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx])
-      lbox.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
-                 'relheight'=>1.0)
-      hscr.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx])
-    }
-  end
-
-  def resize(x)
-    idx = @sel_sash
-    return if idx == 0
-
-    # adjustment of relative positioning
-    delta = (x - @x) / @frame_width
-    if delta < @rel_list[idx-1] - @rel_list[idx] + (2*@sash/@frame_width)
-      delta = @rel_list[idx-1] - @rel_list[idx] + (2*@sash/@frame_width)
-    elsif delta > @rel_list[idx+1] - @rel_list[idx] - (2*@sash/@frame_width)
-      delta = @rel_list[idx+1] - @rel_list[idx] - (2*@sash/@frame_width)
-    end
-    @rel_list[idx] += delta
-
-    # adjustment of leftside widget of the sash
-    title, lbox, hscr = @base_list[idx - 1]
-    title.place('relwidth'=>@rel_list[idx] - @rel_list[idx-1])
-    lbox.place('relwidth'=>@rel_list[idx] - @rel_list[idx-1], 'relheight'=>1.0)
-    hscr.place('relwidth'=>@rel_list[idx] - @rel_list[idx-1])
-
-    # adjustment of rightside widget of the sash
-    title, lbox, hscr = @base_list[idx]
-    title.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
-                'relx'=>@rel_list[idx])
-    lbox.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
-               'relx'=>@rel_list[idx], 'relheight'=>1.0)
-    hscr.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
-               'relx'=>@rel_list[idx])
-
-    # update reference position
-    @x = x
-  end
-
-  def motion_cb(w, x, idx)
-    if x <= @sash && idx > 0
-      w.cursor 'sb_h_double_arrow'
-      @mode = :sash
-      @sel_sash = idx
-    elsif x >= w.winfo_width - @sash && idx < @lbox_total - 1
-      w.cursor 'sb_h_double_arrow'
-      @mode = :sash
-      @sel_sash = idx + 1
-    else
-      w.cursor ""
-      @mode = :title
-      @sel_sash = 0
-    end
-  end
-
-  def title_binding(title, index)
-    title.bind('Motion', proc{|w, x, idx| motion_cb(w, x, idx.to_i)},
-               "%W %x #{index}")
-
-    title.bind('Enter', proc{|w, x, idx| motion_cb(w, x, idx.to_i)},
-               "%W %x #{index}")
-
-    title.bind('Leave', proc{|w| w.cursor ""}, "%W")
-
-    title.bind('Button-1',
-               proc{|w, x|
-                 if @mode == :sash
-                   @x = x
-                   @frame_width = TkWinfo.width(@f_title).to_f
-                 else
-                   title.relief 'sunken'
-                 end
-               },
-               '%W %X')
-
-    title.bind('ButtonRelease-1',
-               proc{|w, x, idx|
-                 i = idx.to_i
-                 if @mode == :title && @title_cmd[i].kind_of?(Proc)
-                   @title_cmd[i].call
-                 end
-                 title.relief 'raised'
-                 motion_cb(w,x,i)
-               },
-               "%W %x #{index}")
-
-    title.bind('B1-Motion', proc{|x| resize(x) if @mode == :sash}, "%X")
-  end
-
-  ########################
-  def select_line(w, idx)
-    @lbox_list.each{|l|
-      l.select_clear(1, 'end')
-      l.select_set(idx)
-    }
-    w.select_set(idx)
-  end
-
-  def select_shift(w, dir)
-    head = w.index('@1,1').split('.')[0].to_i
-    tail = w.index("@1,#{w.winfo_height - 1}").split('.')[0].to_i - 1
-    idx = w.select_index + dir
-    last = w.index('end - 1 char').split('.')[0].to_i
-    if idx < 1
-      idx = 1
-    elsif idx > last
-      idx = last
-    end
-    @lbox_list.each{|l|
-      l.select_clear(1, 'end')
-      l.select_set(idx)
-    }
-    if head > idx
-      @lbox_list.each{|l| l.yview('scroll', -1, 'units')}
-    elsif tail < idx
-      @lbox_list.each{|l| l.yview('scroll', 1, 'units')}
-    end
-  end
-  ########################
-end
-
-################################################
-# test
-################################################
-if __FILE__ == $0
-  l = TkMultiColumnList.new(nil, 200,
-                            [ ['L1', 200, proc{p 'click L1'}],
-                              ['L2', 100],
-                              ['L3', 200] ],
-                            'width'=>350,
-                            #'titleforeground'=>'yellow',
-                            'titleforeground'=>'white',
-                            #'titlebackground'=>'navy',
-                            'titlebackground'=>'blue',
-                            'titlefont'=>'courier'
-                            ).pack('fill'=>'both', 'expand'=>true)
-  l.insert('end', [1,2,3])
-  l.insert('end', [4,5,6])
-  l.insert('end', [4,5,6], [4,5,6])
-  l.insert('end', ['aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
-                   'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
-                   'cccccccccccccccccccccccccccccccccccccccccccccccccccc'])
-  l.insert('end', [1,2,3])
-  l.insert('end', [4,5,6], [4,5,6])
-  l.insert('end', ['aaaaaaaaaaaaaaa','bbbbbbbbbbbbbb','ccccccccccccccccc'])
-  l.insert('end', [1,2,3])
-  l.insert('end', [4,5,6], [4,5,6])
-  l.insert('end', ['aaaaaaaaaaaaaaa','bbbbbbbbbbbbbb','ccccccccccccccccc'])
-  l.insert('end', [1,2,3])
-  l.insert('end', [4,5,6], [4,5,6])
-  l.insert('end', ['aaaaaaaaaaaaaaa','bbbbbbbbbbbbbb','ccccccccccccccccc'])
-  l.insert('end', [1,2,3])
-  l.insert('end', [4,5,6], [4,5,6])
-  p l.columns(1)
-  p l.columns(1..3)
-  p l.columns(1,2)
-
-  l.command proc{|line_info| p line_info}
-
-  Tk.mainloop
-end
diff --git a/ext/tk/sample/tkmultilistbox.rb b/ext/tk/sample/tkmultilistbox.rb
deleted file mode 100644
index 29a2077fd0..0000000000
--- a/ext/tk/sample/tkmultilistbox.rb
+++ /dev/null
@@ -1,655 +0,0 @@
-# frozen_string_literal: false
-#
-# tkmultilistbox.rb : multiple listbox widget
-#                       by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-
-class TkMultiListbox < TkListbox
-  include TkComposite
-
-  #   lbox_height : height of listboxes (pixel)
-  #   title_info  : array [ [<title_string>,<init_width>], ... ]
-  #   keys        : hash {<option>=><value>, ... }
-  def initialize_composite(lbox_height, title_info, keys={})
-    # argument check
-    if (! title_info.kind_of? Array) or (title_info.size < 2)
-      raise
-    end
-
-    # decide total width
-    @width_total = 0
-    title_info.each{|title, width| @width_total += width.to_f}
-
-    # vertical scrollbar
-    @v_scroll = TkScrollbar.new(@frame, 'orient'=>'vertical')
-
-    # init arrays
-    @base_list = []
-    @rel_list   = []
-    @title_list = []
-    @lbox_list  = []
-    @hscr_list  = []
-
-    # rel-table of label=>index
-    @name_index = {}
-
-    # create base flames
-    @f_title = TkFrame.new(@frame, 'width'=>@width_total)
-    @f_lbox  = TkFrame.new(@frame,
-                           'width'=>@width_total, 'height'=>lbox_height)
-    @f_hscr  = TkFrame.new(@frame, 'width'=>@width_total,
-                           'height'=>@v_scroll.cget('width') +
-                                     2 * @v_scroll.cget('borderwidth'))
-
-    # dummy label to keep the height of title space
-    TkLabel.new(@f_title, 'text'=>' ').pack
-
-    # create each listbox
-    sum = 0.0
-    @rel_list << sum/@width_total
-    title_info.each_with_index{|(label, width), idx|
-      # set relation between label and index
-      if @name_index.include?(label)
-        @name_index[label] << idx
-      else
-        @name_index[label] = [idx]
-      end
-
-      # calculate relative positioning
-      sum += width
-      @rel_list << sum/@width_total
-
-      # title field
-      f = TkFrame.new(@f_title, 'width'=>width)
-      base = [f]
-      @title_list << TkLabel.new(f, 'text'=>label).pack('fill'=>'x')
-      f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>-6,
-              'relwidth'=>@rel_list[idx+1] - @rel_list[idx])
-
-      # listbox field
-      f = TkFrame.new(@f_lbox, 'width'=>width)
-      base << f
-      @lbox_list << TkListbox.new(f).pack('fill'=>'both', 'expand'=>true)
-      f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>-4,
-              'relwidth'=>@rel_list[idx+1] - @rel_list[idx], 'relheight'=>1.0)
-
-      # scrollbar field
-      f = TkFrame.new(@f_hscr, 'width'=>width)
-      base << f
-      @hscr_list << TkScrollbar.new(f, 'orient'=>'horizontal') .
-                                              pack('fill'=>'x', 'anchor'=>'w')
-      f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>-4,
-              'relwidth'=>@rel_list[idx+1] - @rel_list[idx])
-
-      @lbox_list[idx].xscrollcommand proc{|first, last|
-        @hscr_list[idx].set first, last
-      }
-      @hscr_list[idx].command proc{|*args| @lbox_list[idx].xview *args}
-
-      # add new base
-      @base_list << base
-    }
-
-    # create tab
-    @tab_list = [nil]
-    (1..(@rel_list.size - 2)).each{|idx|
-      tab = TkFrame.new(@f_title, 'cursor'=>'sb_h_double_arrow',
-                        'width'=>6, 'borderwidth'=>2, 'relief'=>'raised')
-      @tab_list << tab
-      tab.place('relx'=>@rel_list[idx], 'anchor'=>'ne', 'relheight'=>0.95)
-      tab.bind('Button-1',
-               proc{|x| @x = x; @frame_width = TkWinfo.width(@f_title).to_f},
-               '%X')
-      tab.bind('B1-Motion', proc{|x, idx| resize(x, idx.to_i)}, "%X #{idx}")
-    }
-
-    # set control procedure for vertical scroll
-    @lbox_list.each{|lbox|
-      lbox.yscrollcommand proc{|first, last|
-        @v_scroll.set first, last
-      }
-    }
-    @v_scroll.command proc{|*args| @lbox_list.each{|lbox| lbox.yview *args} }
-
-    # binding for listboxes
-    @mode = {}
-    @mode['browse']   = browse_mode_bindtag
-    @mode['single']   = single_mode_bindtag
-    @mode['extended'] = extended_mode_bindtag
-    @mode['multiple'] = multiple_mode_bindtag
-    @current_mode = 'browse'
-    @lbox_list.each{|l|
-      l.bind('Shift-Key-Left',
-             proc{|w| focus_shift(w, -1); Tk.callback_break}, '%W')
-      l.bind('Shift-Key-Right',
-             proc{|w| focus_shift(w, 1); Tk.callback_break}, '%W')
-
-      l.bind('Button-2', proc{|x, y|
-               @lbox_mark_x = x
-               @lbox_list.each{|lbox| lbox.scan_mark(x, y)}
-             }, '%x %y')
-      l.bind('B2-Motion', proc{|x, y|
-               @lbox_list.each{|lbox| lbox.scan_dragto(@lbox_mark_x, y)}
-               l.scan_dragto(x, y)
-             }, '%x %y')
-
-      l.bindtags(l.bindtags.unshift(@mode[@current_mode]))
-    }
-
-    # alignment
-    TkGrid.rowconfigure(@frame, 0, 'weight'=>0)
-    TkGrid.rowconfigure(@frame, 1, 'weight'=>1)
-    TkGrid.rowconfigure(@frame, 2, 'weight'=>0)
-    TkGrid.columnconfigure(@frame, 0, 'weight'=>1)
-    TkGrid.columnconfigure(@frame, 1, 'weight'=>0)
-    @v_scroll.grid('row'=>1, 'column'=>1, 'sticky'=>'ns')
-    @f_title.grid('row'=>0, 'column'=>0, 'sticky'=>'news')
-    @f_lbox.grid('row'=>1, 'column'=>0, 'sticky'=>'news')
-    @f_hscr.grid('row'=>2, 'column'=>0, 'sticky'=>'ew')
-
-    # binding for 'Configure' event
-    @frame.bind('Configure', proc{reconstruct})
-
-    # set default receiver of method calls
-    @path = @lbox_list[0].path
-
-    # configure options
-    keys = {} unless keys
-    keys = _symbolkey2str(keys)
-
-    # 'mode' option of listboxes
-    sel_mode = keys.delete('mode')
-    mode(sel_mode) if sel_mode
-
-    # 'scrollbarwidth' option == 'width' option of scrollbars
-    width = keys.delete('scrollbarwidth')
-    scrollbarwidth(width) if width
-
-    # options for listbox titles
-    title_font = keys.delete('titlefont')
-    title_fg = keys.delete('titleforeground')
-    title_bg = keys.delete('titlebackground')
-    if title_font or title_fg or title_bg
-      titleconfig(title_font, title_fg, title_bg)
-    end
-
-    # set receivers for configure methods
-    delegate('DEFAULT', *@lbox_list)
-    delegate('activebackground', @v_scroll, *@hscr_list)
-    delegate('troughcolor', @v_scroll, *@hscr_list)
-    delegate('repeatdelay', @v_scroll, *@hscr_list)
-    delegate('repeatinterval', @v_scroll, *@hscr_list)
-    delegate('borderwidth', @frame)
-    delegate('relief', @frame)
-
-    # configure
-    configure(keys) if keys.size > 0
-  end
-  private :initialize_composite
-
-  # set 'mode' option of listboxes
-  def mode(sel_mode)
-    @lbox_list.each{|l|
-      tags = l.bindtags
-      tags = tags - [ @mode[@current_mode] ]
-      l.bindtags(tags.unshift(@mode[sel_mode]))
-      @current_mode = sel_mode
-    }
-  end
-
-  # set scrollbar width
-  def scrollbarwidth(width)
-    @v_scroll['width'] = width
-    @hscr_list.each{|hscr| hscr['width'] = width}
-    @f_hscr['height'] = width + 2 * @v_scroll.cget('borderwidth')
-  end
-
-  # set options of titles
-  def titleconfig(font, fg, bg)
-    keys = {}
-    keys['font'] = font if font
-    keys['foreground'] = fg if fg
-    keys['background'] = bg if bg
-    @title_list.each{|label| label.configure(keys)}
-  end
-
-  # get label widgets of listbox titles
-  def titlelabels(*indices)
-    @title_list[*indices]
-  end
-
-  # get listbox widgets
-  def columns(*indices)
-    @lbox_list[*indices]
-  end
-
-  def activate(idx)
-    @lbox_list.each{|lbox| lbox.activate(idx)}
-  end
-
-  def bbox(idx)
-    @lbox_list.collect{|lbox| lbox.bbox(idx)}
-  end
-
-  def delete(*idx)
-    @lbox_list.collect{|lbox| lbox.delete(*idx)}
-  end
-
-  def get(*idx)
-    if idx.size == 1
-      @lbox_list.collect{|lbox| lbox.get(*idx)}
-    else
-      list = @lbox_list.collect{|lbox| lbox.get(*idx)}
-      result = []
-      list[0].each_with_index{|line, index|
-        result << list.collect{|lines| lines[index]}
-      }
-      result
-    end
-  end
-
-  def _line_array_to_hash(line)
-    result = {}
-    @name_index.each_pair{|label, indices|
-      if indices.size == 1
-        result[label] = line[indices[0]]
-      else
-        result[label] = indices.collect{|index| line[index]}
-      end
-    }
-    result
-  end
-  private :_line_array_to_hash
-
-  def get_by_hash(*idx)
-    get_result = get(*idx)
-    if idx.size == 1
-      _line_array_to_hash(get_result)
-    else
-      get_result.collect{|line| _line_array_to_hash(line)}
-    end
-  end
-
-  def insert(idx, *lines)
-    lbox_ins = []
-    (0..@lbox_list.size).each{lbox_ins << []}
-
-    lines.each{|line|
-      if line.kind_of? Hash
-        array = []
-        @name_index.each_pair{|label, indices|
-          if indices.size == 1
-            array[indices[0]] = line[label]
-          else
-            if line[label].kind_of? Array
-              indices.each_with_index{|index, num|
-                array[index] = line[label][num]
-              }
-            else
-              array[indices[0]] = line[label]
-            end
-          end
-        }
-        line = array
-      end
-
-      @name_index.each_pair{|label, indices|
-        if indices.size == 1
-          lbox_ins[indices[0]] << line[indices[0]]
-        else
-          indices.each{|index| lbox_ins[index] << line[index]}
-        end
-      }
-    }
-
-    @lbox_list.each_with_index{|lbox, index|
-      lbox.insert(idx, *lbox_ins[index]) if lbox_ins[index]
-    }
-  end
-
-  def selection_anchor(index)
-    @lbox_list.each{|lbox| lbox.selection_anchor(index)}
-  end
-
-  def selection_clear(first, last=None)
-    @lbox_list.each{|lbox| lbox.selection_clear(first, last=None)}
-  end
-
-  def selection_set(first, last=None)
-    @lbox_list.each{|lbox| lbox.selection_set(first, last=None)}
-  end
-
-  ###########################################
-  private
-
-  def reconstruct
-    (0..(@rel_list.size - 2)).each{|idx|
-      title, lbox, hscr = @base_list[idx]
-      title.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx])
-      lbox.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
-                 'relheight'=>1.0)
-      hscr.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx])
-
-      tab = @tab_list[idx]
-      tab.place('relx'=>@rel_list[idx]) if tab
-    }
-  end
-
-  def resize(x, idx)
-    # adjustment of relative positioning
-    delta = (x - @x) / @frame_width
-    if delta < @rel_list[idx-1] - @rel_list[idx] + 0.02
-      delta = @rel_list[idx-1] - @rel_list[idx] + 0.02
-    elsif delta > @rel_list[idx+1] - @rel_list[idx] - 0.02
-      delta = @rel_list[idx+1] - @rel_list[idx] - 0.02
-    end
-    @rel_list[idx] += delta
-
-    # adjustment of leftside widget of the tab
-    title, lbox, hscr = @base_list[idx - 1]
-    title.place('relwidth'=>@rel_list[idx] - @rel_list[idx-1])
-    lbox.place('relwidth'=>@rel_list[idx] - @rel_list[idx-1], 'relheight'=>1.0)
-    hscr.place('relwidth'=>@rel_list[idx] - @rel_list[idx-1])
-
-    # adjustment of the tab position
-    @tab_list[idx].place('relx'=>@rel_list[idx])
-
-    # adjustment of rightside widget of the tab
-    title, lbox, hscr = @base_list[idx]
-    title.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
-                'relx'=>@rel_list[idx])
-    lbox.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
-               'relx'=>@rel_list[idx], 'relheight'=>1.0)
-    hscr.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
-               'relx'=>@rel_list[idx])
-
-    # update reference position
-    @x = x
-  end
-
-  #################################
-  def browse_mode_bindtag
-    t = TkBindTag.new
-    t.bind('Button-1',
-           proc{|w, y| w.focus; select_line(w, w.nearest(y))}, '%W %y')
-    t.bind('B1-Motion', proc{|w, y| select_line(w, w.nearest(y))}, '%W %y')
-
-    t.bind('Shift-Button-1',
-           proc{|w, y| active_line(w, w.nearest(y))}, '%W %y')
-
-    t.bind('Key-Up', proc{|w| select_shift(w, -1)}, '%W')
-    t.bind('Key-Down', proc{|w| select_shift(w, 1)}, '%W')
-
-    t.bind('Control-Home', proc{|w| select_line(w, 0)}, '%W')
-    t.bind('Control-End', proc{|w| select_line(w, 'end')}, '%W')
-
-    t.bind('space', proc{|w| select_line(w, w.index('active').to_i)}, '%W')
-    t.bind('Select', proc{|w| select_line(w, w.index('active').to_i)}, '%W')
-    t.bind('Control-slash',
-           proc{|w| select_line(w, w.index('active').to_i)}, '%W')
-
-    t
-  end
-
-  ########################
-  def single_mode_bindtag
-    t = TkBindTag.new
-    t.bind('Button-1',
-           proc{|w, y| w.focus; select_only(w, w.nearest(y))}, '%W %y')
-    t.bind('ButtonRelease-1',
-           proc{|w, y| active_line(w, w.nearest(y))}, '%W %y')
-
-    t.bind('Shift-Button-1',
-           proc{|w, y| active_line(w, w.nearest(y))}, '%W %y')
-
-    t.bind('Key-Up', proc{|w| select_shift(w, -1)}, '%W')
-    t.bind('Key-Down', proc{|w| select_shift(w, 1)}, '%W')
-
-    t.bind('Control-Home', proc{|w| select_line(w, 0)}, '%W')
-    t.bind('Control-End', proc{|w| select_line(w, 'end')}, '%W')
-
-    t.bind('space', proc{|w| select_line(w, w.index('active').to_i)}, '%W')
-    t.bind('Select', proc{|w| select_line(w, w.index('active').to_i)}, '%W')
-    t.bind('Control-slash',
-           proc{|w| select_line(w, w.index('active').to_i)}, '%W')
-    t.bind('Control-backslash',
-           proc{@lbox_list.each{|l| l.selection_clear(0, 'end')}})
-
-    t
-  end
-
-  ########################
-  def extended_mode_bindtag
-    t = TkBindTag.new
-    t.bind('Button-1',
-           proc{|w, y| w.focus; select_only(w, w.nearest(y))}, '%W %y')
-    t.bind('B1-Motion', proc{|w, y| select_range(w, w.nearest(y))}, '%W %y')
-
-    t.bind('ButtonRelease-1',
-           proc{|w, y| active_line(w, w.nearest(y))}, '%W %y')
-
-    t.bind('Shift-Button-1',
-           proc{|w, y| select_range(w, w.nearest(y))}, '%W %y')
-    t.bind('Shift-B1-Motion',
-           proc{|w, y| select_range(w, w.nearest(y))}, '%W %y')
-
-    t.bind('Control-Button-1',
-           proc{|w, y| select_toggle(w, w.nearest(y))}, '%W %y')
-
-    t.bind('Control-B1-Motion',
-           proc{|w, y| select_drag(w, w.nearest(y))}, '%W %y')
-
-    t.bind('Key-Up', proc{|w| active_shift(w, -1)}, '%W')
-    t.bind('Key-Down', proc{|w| active_shift(w, 1)}, '%W')
-
-    t.bind('Shift-Up', proc{|w| select_expand(w, -1)}, '%W')
-    t.bind('Shift-Down', proc{|w| select_expand(w, 1)}, '%W')
-
-    t.bind('Control-Home', proc{|w| select_line2(w, 0)}, '%W')
-    t.bind('Control-End', proc{|w| select_line2(w, 'end')}, '%W')
-
-    t.bind('Control-Shift-Home', proc{|w| select_range(w, 0)}, '%W')
-    t.bind('Control-Shift-End', proc{|w| select_range(w, 'end')}, '%W')
-
-    t.bind('space', proc{|w| select_active(w)}, '%W')
-    t.bind('Select', proc{|w| select_active(w)}, '%W')
-    t.bind('Control-slash', proc{|w| select_all}, '%W')
-    t.bind('Control-backslash', proc{|w| clear_all}, '%W')
-
-    t
-  end
-
-  ########################
-  def multiple_mode_bindtag
-    t = TkBindTag.new
-    t.bind('Button-1',
-           proc{|w, y| w.focus; select_line3(w, w.nearest(y))}, '%W %y')
-    t.bind('ButtonRelease-1',
-           proc{|w, y| active_line(w, w.nearest(y))}, '%W %y')
-
-    t.bind('Key-Up', proc{|w| active_shift(w, -1)}, '%W')
-    t.bind('Key-Down', proc{|w| active_shift(w, 1)}, '%W')
-
-    t.bind('Control-Home', proc{|w| select_line2(w, 0)}, '%W')
-    t.bind('Control-End', proc{|w| select_line2(w, 'end')}, '%W')
-
-    t.bind('Control-Shift-Home', proc{|w| active_line(w, 0)}, '%W')
-    t.bind('Control-Shift-End', proc{|w| active_line(w, 'end')}, '%W')
-
-    t.bind('space', proc{|w| select_active(w)}, '%W')
-    t.bind('Select', proc{|w| select_active(w)}, '%W')
-    t.bind('Control-slash', proc{|w| select_all}, '%W')
-    t.bind('Control-backslash', proc{|w| clear_all}, '%W')
-
-    t
-  end
-
-  ########################
-  def active_line(w, idx)
-    @lbox_list.each{|l| l.activate(idx)}
-  end
-
-  def select_only(w, idx)
-    @lbox_list.each{|l|
-      l.selection_clear(0, 'end')
-      l.selection_anchor(idx)
-      l.selection_set('anchor')
-    }
-  end
-
-  def select_range(w, idx)
-    @lbox_list.each{|l|
-      l.selection_clear(0, 'end')
-      l.selection_set('anchor', idx)
-    }
-  end
-
-  def select_toggle(w, idx)
-    st = w.selection_includes(idx)
-    @lbox_list.each{|l|
-      l.selection_anchor(idx)
-      if st == 1
-        l.selection_clear(idx)
-      else
-        l.selection_set(idx)
-      end
-    }
-  end
-
-  def select_drag(w, idx)
-    st = w.selection_includes('anchor')
-    @lbox_list.each{|l|
-      if st == 1
-        l.selection_set('anchor', idx)
-      else
-        l.selection_clear('anchor', idx)
-      end
-    }
-  end
-
-  def select_line(w, idx)
-    @lbox_list.each{|l|
-      l.selection_clear(0, 'end')
-      l.activate(idx)
-      l.selection_anchor(idx)
-      l.selection_set('anchor')
-    }
-    w.selection_set('anchor')
-  end
-
-  def select_line2(w, idx)
-    @lbox_list.each{|l|
-      l.activate(idx)
-      l.selection_anchor(idx)
-      l.selection_set('anchor')
-    }
-  end
-
-  def select_line3(w, idx)
-    @lbox_list.each{|l|
-      l.selection_set(idx)
-    }
-  end
-
-  def select_active(w)
-    idx = l.activate(idx)
-    @lbox_list.each{|l|
-      l.selection_set(idx)
-    }
-  end
-
-  def select_expand(w, dir)
-    idx = w.index('active').to_i + dir
-    if idx < 0
-      idx = 0
-    elsif idx >= w.size
-      idx = w.size - 1
-    end
-    @lbox_list.each{|l|
-      l.activate(idx)
-      l.selection_set(idx)
-    }
-  end
-
-  def active_shift(w, dir)
-    idx = w.index('active').to_i + dir
-    if idx < 0
-      idx = 0
-    elsif idx >= w.size
-      idx = w.size - 1
-    end
-    @lbox_list.each{|l|
-      l.activate(idx)
-      l.selection_anchor(idx)
-    }
-  end
-
-  def select_shift(w, dir)
-    idx = w.index('anchor').to_i + dir
-    if idx < 0
-      idx = 0
-    elsif idx >= w.size
-      idx = w.size - 1
-    end
-    @lbox_list.each{|l|
-      l.selection_clear(0, 'end')
-      l.activate(idx)
-      l.selection_anchor(idx)
-      l.selection_set('anchor')
-    }
-  end
-
-  def select_all
-    @lbox_list.each{|l|
-      l.selection_set(0, 'end')
-    }
-  end
-
-  def clear_all
-    @lbox_list.each{|l|
-      l.selection_clear(0, 'end')
-    }
-  end
-
-  def focus_shift(w, dir)
-    idx = @lbox_list.index(w) + dir
-    return if idx < 0
-    return if idx >= @lbox_list.size
-    @lbox_list[idx].focus
-  end
-  ########################
-end
-
-################################################
-# test
-################################################
-if __FILE__ == $0
-  f = TkFrame.new(nil, 'width'=>300,
-                  'height'=>200).pack('fill'=>'both', 'expand'=>'true')
-  #f = TkFrame.new.pack('fill'=>'both', 'expand'=>'true')
-  l = TkMultiListbox.new(f, 150,
-                         [ ['L1', 100],
-                           ['L2', 200],
-                           ['L3', 50] ],
-                         'titlefont'=>'courier',
-                         'titleforeground'=>'yellow',
-                         'titlebackground'=>'navy'
-                         ).pack('fill'=>'both', 'expand'=>true)
-  l.insert('end', [1,2,3])
-  l.insert('end', [4,5,6])
-  l.insert('end', [4,5,6], [4,5,6])
-  l.insert('end', ['aaaaaaaaaaaaaaa','bbbbbbbbbbbbbb','ccccccccccccccccc'])
-  l.insert('end', [1,2,3])
-  l.insert('end', [4,5,6], [4,5,6])
-  l.insert('end', ['aaaaaaaaaaaaaaa','bbbbbbbbbbbbbb','ccccccccccccccccc'])
-  l.insert('end', [1,2,3])
-  l.insert('end', [4,5,6], [4,5,6])
-  l.insert('end', ['aaaaaaaaaaaaaaa','bbbbbbbbbbbbbb','ccccccccccccccccc'])
-  l.insert('end', [1,2,3])
-  l.insert('end', [4,5,6], [4,5,6])
-  p l.columns(1)
-  p l.columns(1..3)
-  p l.columns(1,2)
-  Tk.mainloop
-end
diff --git a/ext/tk/sample/tkmultilistframe.rb b/ext/tk/sample/tkmultilistframe.rb
deleted file mode 100644
index 5e07b4e230..0000000000
--- a/ext/tk/sample/tkmultilistframe.rb
+++ /dev/null
@@ -1,941 +0,0 @@
-# frozen_string_literal: false
-#
-# tkmultilistframe.rb : multiple listbox widget on scrollable frame
-#                       by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-
-class TkMultiListFrame < TkListbox
-  include TkComposite
-
-  #   lbox_height : height of listboxes (pixel)
-  #   title_info  : array [ [<title_string>,<init_width>], ... ]
-  #   keys        : hash {<option>=><value>, ... }
-  def initialize_composite(lbox_height, title_info, keys={})
-    # argument check
-    if (! title_info.kind_of? Array) or (title_info.size < 2)
-      raise
-    end
-
-    # mode
-    @keep_minsize = true
-    @show_each_hscr = true
-    @show_win_hscr = true
-
-    # init arrays
-    @base_list  = []
-    @rel_list   = []
-    @title_list = []
-    @title_cmd  = []
-    @lbox_list  = []
-    @hscr_list  = []
-
-    # decide total width
-    @lbox_total = title_info.size
-    @width_total = 0
-    title_info.each{|title, width, cmd|
-      @width_total += width.to_f
-      @title_cmd << cmd
-    }
-
-    # rel-table of label=>index
-    @name_index = {}
-
-    # size definition
-    @window_width = @width_total
-    @sash = 5
-    @scrbar_width = 15
-    @scrbar_border = 3
-    @lbox_border = 1
-    @title_border = 3
-    @h_l_thick = 0
-
-    # init status
-    @mode = :title
-
-    # vertical scrollbar
-=begin
-    @v_scroll = TkScrollbar.new(@frame, 'highlightthickness'=>@h_l_thick,
-                                'borderwidth'=>@scrbar_border,
-                                'orient'=>'vertical', 'width'=>@scrbar_width)
-=end
-    @v_scroll = TkYScrollbar.new(@frame, 'highlightthickness'=>@h_l_thick,
-                                 'borderwidth'=>@scrbar_border,
-                                 'width'=>@scrbar_width)
-
-    # horizontal scrollbar
-=begin
-    @h_scroll = TkScrollbar.new(@frame, 'highlightthickness'=>@h_l_thick,
-                                'borderwidth'=>@scrbar_border,
-                                'orient'=>'horizontal', 'width'=>@scrbar_width)
-=end
-    @h_scroll = TkXScrollbar.new(@frame, 'highlightthickness'=>@h_l_thick,
-                                 'borderwidth'=>@scrbar_border,
-                                 'width'=>@scrbar_width)
-
-    # create base flames
-    @c_title = TkCanvas.new(@frame, 'highlightthickness'=>@h_l_thick,
-                            'width'=>@window_width)
-    @f_title = TkFrame.new(@c_title, 'width'=>@width_total)
-    @w_title = TkcWindow.new(@c_title, 0, 0,
-                             'window'=>@f_title, 'anchor'=>'nw')
-
-    @c_lbox  = TkCanvas.new(@frame, 'highlightthickness'=>@h_l_thick,
-                            'width'=>@window_width)
-    @f_lbox  = TkFrame.new(@c_lbox, 'width'=>@width_total)
-    @w_lbox  = TkcWindow.new(@c_lbox, 0, 0, 'window'=>@f_lbox, 'anchor'=>'nw')
-
-    @c_hscr  = TkCanvas.new(@frame, 'highlightthickness'=>@h_l_thick,
-                            'width'=>@window_width)
-    @f_hscr  = TkFrame.new(@c_hscr, 'width'=>@width_total)
-    @w_hscr  = TkcWindow.new(@c_hscr, 0, 0, 'window'=>@f_hscr, 'anchor'=>'nw')
-
-    # create each listbox
-    sum = 0.0
-    @rel_list << sum/@width_total
-    title_info.each_with_index{|(label, width), idx|
-      # set relation between label and index
-      if @name_index.include?(label)
-        @name_index[label] << idx
-      else
-        @name_index[label] = [idx]
-      end
-
-      # calculate relative positioning
-      sum += width
-      @rel_list << sum/@width_total
-
-      # title field
-      f = TkFrame.new(@f_title, 'width'=>width)
-      base = [f]
-
-      title = TkLabel.new(f, 'text'=>label, 'borderwidth'=>@title_border,
-                          'relief'=>'raised', 'highlightthickness'=>@h_l_thick)
-      title_binding(title, idx)
-      title.pack('fill'=>'x')
-
-      @title_list << title
-
-      f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>1,
-              'relheight'=>1.0,
-              'relwidth'=>@rel_list[idx+1] - @rel_list[idx])
-
-      # listbox field
-      f = TkFrame.new(@f_lbox, 'width'=>width)
-      base << f
-      @lbox_list << TkListbox.new(f, 'highlightthickness'=>@h_l_thick,
-                                  'borderwidth'=>@lbox_border
-                                  ).pack('fill'=>'both', 'expand'=>true)
-      f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>1,
-              'relwidth'=>@rel_list[idx+1] - @rel_list[idx], 'relheight'=>1.0)
-
-      # scrollbar field
-      f = TkFrame.new(@f_hscr, 'width'=>width)
-      base << f
-=begin
-      @hscr_list << TkScrollbar.new(f, 'orient'=>'horizontal',
-                                    'width'=>@scrbar_width,
-                                    'borderwidth'=>@scrbar_border,
-                                    'highlightthickness'=>@h_l_thick
-                                    ).pack('fill'=>'x', 'anchor'=>'w')
-=end
-      @hscr_list << TkXScrollbar.new(f, 'width'=>@scrbar_width,
-                                     'borderwidth'=>@scrbar_border,
-                                     'highlightthickness'=>@h_l_thick
-                                    ).pack('fill'=>'x', 'anchor'=>'w')
-      f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>1,
-              'relwidth'=>@rel_list[idx+1] - @rel_list[idx])
-
-=begin
-      @lbox_list[idx].xscrollcommand proc{|first, last|
-        @hscr_list[idx].set first, last
-      }
-      @hscr_list[idx].command proc{|*args| @lbox_list[idx].xview *args}
-=end
-      @lbox_list[idx].xscrollbar(@hscr_list[idx])
-
-      # add new base
-      @base_list << base
-    }
-
-    # pad
-    # @f_title_pad = TkFrame.new(@frame)
-    @f_title_pad = TkFrame.new(@frame, 'relief'=>'raised',
-                               'borderwidth'=>@title_border,
-                               'highlightthickness'=>@h_l_thick)
-
-    @f_scr_pad = TkFrame.new(@frame, 'relief'=>'sunken',
-                             'borderwidth'=>1,
-                             'highlightthickness'=>@h_l_thick)
-
-    # height check
-    title_height = 0
-    @title_list.each{|w|
-      h = w.winfo_reqheight
-      title_height = h if title_height < h
-    }
-
-    hscr_height = 0
-    @hscr_list.each{|w|
-      h = w.winfo_reqheight
-      hscr_height = h if hscr_height < h
-    }
-
-    @f_title.height title_height
-    @f_lbox.height lbox_height
-    @f_hscr.height hscr_height
-
-    # set control procedure for vertical scroll
-=begin
-    @lbox_list.each{|lbox|
-      lbox.yscrollcommand proc{|first, last|
-        @v_scroll.set first, last
-      }
-    }
-    @v_scroll.command proc{|*args| @lbox_list.each{|lbox| lbox.yview *args} }
-=end
-    @v_scroll.assign(*@lbox_list)
-
-    # set control procedure for horizontal scroll
-=begin
-    @c_title.xscrollcommand proc{|first, last|
-      @h_scroll.set first, last
-    }
-    @c_lbox.xscrollcommand proc{|first, last|
-      @h_scroll.set first, last
-    }
-    @c_hscr.xscrollcommand proc{|first, last|
-      @h_scroll.set first, last
-    }
-    @h_scroll.command proc{|*args|
-      @c_title.xview *args
-      @c_lbox.xview *args
-      @c_hscr.xview *args if @show_each_hscr
-    }
-=end
-    @h_scroll.assign(@c_title, @c_lbox, @c_hscr)
-
-    # binding for listboxes
-    @lbox_mode = {}
-    @lbox_mode['browse']   = browse_mode_bindtag
-    @lbox_mode['single']   = single_mode_bindtag
-    @lbox_mode['extended'] = extended_mode_bindtag
-    @lbox_mode['multiple'] = multiple_mode_bindtag
-    @current_mode = 'browse'
-    @lbox_list.each_with_index{|l, idx|
-      l.bind('Shift-Key-Left',
-             proc{|w| focus_shift(w, -1); Tk.callback_break}, '%W')
-      l.bind('Shift-Key-Right',
-             proc{|w| focus_shift(w, 1); Tk.callback_break}, '%W')
-
-      l.bind('Button-2', proc{|x, y|
-               @lbox_mark_x = x
-               @lbox_list.each{|lbox| lbox.scan_mark(x, y)}
-             }, '%x %y')
-      l.bind('B2-Motion', proc{|x, y|
-               @lbox_list.each{|lbox| lbox.scan_dragto(@lbox_mark_x, y)}
-               l.scan_dragto(x, y)
-             }, '%x %y')
-
-      l.bindtags(l.bindtags.unshift(@lbox_mode[@current_mode]))
-    }
-
-    bbox = @w_title.bbox
-    @c_title.height(bbox[3])
-    @c_title.scrollregion(bbox)
-
-    bbox = @w_lbox.bbox
-    @c_lbox.height(bbox[3])
-    @c_lbox.scrollregion(bbox)
-
-    if @show_each_hscr
-      bbox = @w_hscr.bbox
-      @c_hscr.height(bbox[3])
-      @c_hscr.scrollregion(bbox)
-    end
-
-    # alignment
-    TkGrid.rowconfigure(@frame, 0, 'weight'=>0)
-    TkGrid.rowconfigure(@frame, 1, 'weight'=>1)
-    TkGrid.rowconfigure(@frame, 2, 'weight'=>0)
-    TkGrid.rowconfigure(@frame, 3, 'weight'=>0)
-    TkGrid.columnconfigure(@frame, 0, 'weight'=>1)
-    TkGrid.columnconfigure(@frame, 1, 'weight'=>0)
-    TkGrid.columnconfigure(@frame, 2, 'weight'=>0)
-    @v_scroll.grid('row'=>1, 'column'=>2, 'sticky'=>'ns')
-    @c_title.grid('row'=>0, 'column'=>0, 'sticky'=>'news')
-    @f_title_pad.grid('row'=>0, 'column'=>2, 'sticky'=>'news')
-    @c_lbox.grid('row'=>1, 'column'=>0, 'sticky'=>'news')
-    @c_hscr.grid('row'=>2, 'column'=>0, 'sticky'=>'ew') if @show_each_hscr
-    @h_scroll.grid('row'=>3, 'column'=>0, 'sticky'=>'ew') if @show_win_hscr
-    @f_scr_pad.grid('row'=>2, 'rowspan'=>2, 'column'=>2, 'sticky'=>'news')
-
-    # binding for 'Configure' event
-    @c_lbox.bind('Configure',
-                 proc{|height, width| reconstruct(height, width)},
-                 '%h %w')
-
-    # set default receiver of method calls
-    @path = @lbox_list[0].path
-
-    # configure options
-    keys = {} unless keys
-    keys = _symbolkey2str(keys)
-
-    # 'mode' option of listboxes
-    sel_mode = keys.delete('mode')
-    mode(sel_mode) if sel_mode
-
-    # 'scrollbarwidth' option == 'width' option of scrollbars
-    width = keys.delete('scrollbarwidth')
-    scrollbarwidth(width) if width
-
-    # options for listbox titles
-    title_font = keys.delete('titlefont')
-    titlefont(title_font) if title_font
-
-    title_fg = keys.delete('titleforeground')
-    titleforeground(title_fg) if title_fg
-
-    title_bg = keys.delete('titlebackground')
-    titlebackground(title_bg) if title_bg
-
-    # set receivers for configure methods
-    delegate('DEFAULT', *@lbox_list)
-    delegate('activebackground', @v_scroll, @h_scroll, *@hscr_list)
-    delegate('troughcolor', @v_scroll, @h_scroll, *@hscr_list)
-    delegate('repeatdelay', @v_scroll, @h_scroll, *@hscr_list)
-    delegate('repeatinterval', @v_scroll, @h_scroll, *@hscr_list)
-    delegate('borderwidth', @frame)
-    delegate('width', @c_lbox, @c_title, @c_hscr)
-    delegate('relief', @frame)
-
-    # configure
-    configure(keys) if keys.size > 0
-  end
-  private :initialize_composite
-
-  # set 'mode' option of listboxes
-  def mode(sel_mode)
-    @lbox_list.each{|l|
-      tags = l.bindtags
-      tags = tags - [ @lbox_mode[@current_mode] ]
-      l.bindtags(tags.unshift(@lbox_mode[sel_mode]))
-      @current_mode = sel_mode
-    }
-  end
-
-  # keep_minsize?
-  def keep_minsize?
-    @keep_minsize
-  end
-  def keep_minsize(bool)
-    @keep_minsize = bool
-  end
-
-  # each hscr
-  def show_each_hscr
-    @show_each_hscr = true
-    @c_hscr.grid('row'=>2, 'column'=>0, 'sticky'=>'ew')
-  end
-  def hide_each_hscr
-    @show_each_hscr = false
-    @c_hscr.ungrid
-  end
-
-  # window hscroll
-  def show_win_hscr
-    @show_win_hscr = true
-    @h_scroll.grid('row'=>3, 'column'=>0, 'sticky'=>'ew')
-  end
-  def hide_win_hscr
-    @show_each_hscr = false
-    @h_scroll.ungrid
-  end
-
-  # set scrollbar width
-  def scrollbarwidth(width)
-    @scrbar_width = width
-    @v_scroll['width'] = @scrbar_width
-    @h_scroll['width'] = @scrbar_width
-    @hscr_list.each{|hscr| hscr['width'] = @scrbar_width}
-    self
-  end
-
-  # set scrollbar border
-  def scrollbarborder(width)
-    @scrbar_border = width
-    @v_scroll['border'] = @scrbar_border
-    @h_scroll['border'] = @scrbar_border
-    @hscr_list.each{|hscr| hscr['border'] = @scrbar_border}
-    self
-  end
-
-  # set listbox borders
-  def listboxborder(width)
-    @lbox_border = width
-    @lbox_list.each{|w| w['border'] = @lbox_border}
-    self
-  end
-
-  # set listbox relief
-  def listboxrelief(relief)
-    @lbox_list.each{|w| w['relief'] = relief}
-    self
-  end
-
-  # set title borders
-  def titleborder(width)
-    @title_border = width
-    @f_title_pad['border'] = @title_border
-    @title_list.each{|label| label['border'] = @title_border}
-    self
-  end
-
-  # set title font
-  def titlefont(font)
-    @title_list.each{|label| label['font'] = font}
-    title_height = 0
-    @title_list.each{|w|
-      h = w.winfo_reqheight
-      title_height = h if title_height < h
-    }
-    @f_title.height title_height
-    bbox = @w_title.bbox
-    @c_title.height(bbox[3])
-    @c_title.scrollregion(bbox)
-    self
-  end
-
-  # set title foreground color
-  def titleforeground(fg)
-    @title_list.each{|label| label['foreground'] = fg}
-    self
-  end
-
-  # set title background color
-  def titlebackground(bg)
-    @f_title_pad['background'] = bg
-    @title_list.each{|label| label['background'] = bg}
-    self
-  end
-
-  # set title cmds
-  def titlecommand(idx, cmd=Proc.new)
-    @title_cmd[idx] = cmd
-  end
-
-  # call title cmds
-  def titleinvoke(idx)
-    @title_cmd[idx].call if @title_cmd[idx]
-  end
-
-  # get label widgets of listbox titles
-  def titlelabels(*indices)
-    @title_list[*indices]
-  end
-
-  # get listbox widgets
-  def columns(*indices)
-    @lbox_list[*indices]
-  end
-
-  def activate(idx)
-    @lbox_list.each{|lbox| lbox.activate(idx)}
-  end
-
-  def bbox(idx)
-    @lbox_list.collect{|lbox| lbox.bbox(idx)}
-  end
-
-  def delete(*idx)
-    @lbox_list.collect{|lbox| lbox.delete(*idx)}
-  end
-
-  def get(*idx)
-    if idx.size == 1
-      @lbox_list.collect{|lbox| lbox.get(*idx)}
-    else
-      list = @lbox_list.collect{|lbox| lbox.get(*idx)}
-      result = []
-      list[0].each_with_index{|line, index|
-        result << list.collect{|lines| lines[index]}
-      }
-      result
-    end
-  end
-
-  def _line_array_to_hash(line)
-    result = {}
-    @name_index.each_pair{|label, indices|
-      if indices.size == 1
-        result[label] = line[indices[0]]
-      else
-        result[label] = indices.collect{|index| line[index]}
-      end
-    }
-    result
-  end
-  private :_line_array_to_hash
-
-  def get_by_hash(*idx)
-    get_result = get(*idx)
-    if idx.size == 1
-      _line_array_to_hash(get_result)
-    else
-      get_result.collect{|line| _line_array_to_hash(line)}
-    end
-  end
-
-  def insert(idx, *lines)
-    lbox_ins = []
-    (0..@lbox_list.size).each{lbox_ins << []}
-
-    lines.each{|line|
-      if line.kind_of? Hash
-        array = []
-        @name_index.each_pair{|label, indices|
-          if indices.size == 1
-            array[indices[0]] = line[label]
-          else
-            if line[label].kind_of? Array
-              indices.each_with_index{|index, num|
-                array[index] = line[label][num]
-              }
-            else
-              array[indices[0]] = line[label]
-            end
-          end
-        }
-        line = array
-      end
-
-      @name_index.each_pair{|label, indices|
-        if indices.size == 1
-          lbox_ins[indices[0]] << line[indices[0]]
-        else
-          indices.each{|index| lbox_ins[index] << line[index]}
-        end
-      }
-    }
-
-    @lbox_list.each_with_index{|lbox, index|
-      lbox.insert(idx, *lbox_ins[index]) if lbox_ins[index]
-    }
-  end
-
-  def selection_anchor(index)
-    @lbox_list.each{|lbox| lbox.selection_anchor(index)}
-  end
-
-  def selection_clear(first, last=None)
-    @lbox_list.each{|lbox| lbox.selection_clear(first, last=None)}
-  end
-
-  def selection_set(first, last=None)
-    @lbox_list.each{|lbox| lbox.selection_set(first, last=None)}
-  end
-
-  ###########################################
-  private
-
-  def reconstruct(height, width)
-    if @keep_minsize && width <= @width_total
-      @f_title.width(@width_total)
-      @f_lbox.width(@width_total)
-      @f_hscr.width(@width_total) if @show_each_hscr
-      @window_width = @width_total
-    else
-      @f_title.width(width)
-      @f_lbox.width(width)
-      @f_hscr.width(width) if @show_each_hscr
-      @window_width = width
-    end
-
-    @f_lbox.height(height)
-
-    @c_title.scrollregion(@w_title.bbox)
-    @c_lbox.scrollregion(@w_lbox.bbox)
-    @c_hscr.scrollregion(@w_hscr.bbox) if @show_each_hscr
-
-    (0..(@rel_list.size - 2)).each{|idx|
-      title, lbox, hscr = @base_list[idx]
-      title.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx])
-      lbox.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
-                 'relheight'=>1.0)
-      hscr.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx])
-    }
-  end
-
-  def resize(x)
-    idx = @sel_sash
-    return if idx == 0
-
-    # adjustment of relative positioning
-    delta = (x - @x) / @frame_width
-    if delta < @rel_list[idx-1] - @rel_list[idx] + (2*@sash/@frame_width)
-      delta = @rel_list[idx-1] - @rel_list[idx] + (2*@sash/@frame_width)
-    elsif delta > @rel_list[idx+1] - @rel_list[idx] - (2*@sash/@frame_width)
-      delta = @rel_list[idx+1] - @rel_list[idx] - (2*@sash/@frame_width)
-    end
-    @rel_list[idx] += delta
-
-    # adjustment of leftside widget of the sash
-    title, lbox, hscr = @base_list[idx - 1]
-    title.place('relwidth'=>@rel_list[idx] - @rel_list[idx-1])
-    lbox.place('relwidth'=>@rel_list[idx] - @rel_list[idx-1], 'relheight'=>1.0)
-    hscr.place('relwidth'=>@rel_list[idx] - @rel_list[idx-1])
-
-    # adjustment of rightside widget of the sash
-    title, lbox, hscr = @base_list[idx]
-    title.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
-                'relx'=>@rel_list[idx])
-    lbox.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
-               'relx'=>@rel_list[idx], 'relheight'=>1.0)
-    hscr.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx],
-               'relx'=>@rel_list[idx])
-
-    # update reference position
-    @x = x
-  end
-
-  def motion_cb(w, x, idx)
-    if x <= @sash && idx > 0
-      w.cursor 'sb_h_double_arrow'
-      @mode = :sash
-      @sel_sash = idx
-    elsif x >= w.winfo_width - @sash && idx < @lbox_total - 1
-      w.cursor 'sb_h_double_arrow'
-      @mode = :sash
-      @sel_sash = idx + 1
-    else
-      w.cursor ""
-      @mode = :title
-      @sel_sash = 0
-    end
-  end
-
-  def title_binding(title, index)
-    title.bind('Motion', proc{|w, x, idx| motion_cb(w, x, idx.to_i)},
-               "%W %x #{index}")
-
-    title.bind('Enter', proc{|w, x, idx| motion_cb(w, x, idx.to_i)},
-               "%W %x #{index}")
-
-    title.bind('Leave', proc{|w| w.cursor ""}, "%W")
-
-    title.bind('Button-1',
-               proc{|w, x|
-                 if @mode == :sash
-                   @x = x
-                   @frame_width = TkWinfo.width(@f_title).to_f
-                 else
-                   title.relief 'sunken'
-                 end
-               },
-               '%W %X')
-
-    title.bind('ButtonRelease-1',
-               proc{|w, x, idx|
-                 i = idx.to_i
-                 if @mode == :title && @title_cmd[i].kind_of?(Proc)
-                   @title_cmd[i].call
-                 end
-                 title.relief 'raised'
-                 motion_cb(w,x,i)
-               },
-               "%W %x #{index}")
-
-    title.bind('B1-Motion', proc{|x| resize(x) if @mode == :sash}, "%X")
-  end
-
-  #################################
-  def browse_mode_bindtag
-    t = TkBindTag.new
-    t.bind('Button-1',
-           proc{|w, y| w.focus; select_line(w, w.nearest(y))}, '%W %y')
-    t.bind('B1-Motion', proc{|w, y| select_line(w, w.nearest(y))}, '%W %y')
-
-    t.bind('Shift-Button-1',
-           proc{|w, y| active_line(w, w.nearest(y))}, '%W %y')
-
-    t.bind('Key-Up', proc{|w| select_shift(w, -1)}, '%W')
-    t.bind('Key-Down', proc{|w| select_shift(w, 1)}, '%W')
-
-    t.bind('Control-Home', proc{|w| select_line(w, 0)}, '%W')
-    t.bind('Control-End', proc{|w| select_line(w, 'end')}, '%W')
-
-    t.bind('space', proc{|w| select_line(w, w.index('active').to_i)}, '%W')
-    t.bind('Select', proc{|w| select_line(w, w.index('active').to_i)}, '%W')
-    t.bind('Control-slash',
-           proc{|w| select_line(w, w.index('active').to_i)}, '%W')
-
-    t
-  end
-
-  ########################
-  def single_mode_bindtag
-    t = TkBindTag.new
-    t.bind('Button-1',
-           proc{|w, y| w.focus; select_only(w, w.nearest(y))}, '%W %y')
-    t.bind('ButtonRelease-1',
-           proc{|w, y| active_line(w, w.nearest(y))}, '%W %y')
-
-    t.bind('Shift-Button-1',
-           proc{|w, y| active_line(w, w.nearest(y))}, '%W %y')
-
-    t.bind('Key-Up', proc{|w| select_shift(w, -1)}, '%W')
-    t.bind('Key-Down', proc{|w| select_shift(w, 1)}, '%W')
-
-    t.bind('Control-Home', proc{|w| select_line(w, 0)}, '%W')
-    t.bind('Control-End', proc{|w| select_line(w, 'end')}, '%W')
-
-    t.bind('space', proc{|w| select_line(w, w.index('active').to_i)}, '%W')
-    t.bind('Select', proc{|w| select_line(w, w.index('active').to_i)}, '%W')
-    t.bind('Control-slash',
-           proc{|w| select_line(w, w.index('active').to_i)}, '%W')
-    t.bind('Control-backslash',
-           proc{@lbox_list.each{|l| l.selection_clear(0, 'end')}})
-
-    t
-  end
-
-  ########################
-  def extended_mode_bindtag
-    t = TkBindTag.new
-    t.bind('Button-1',
-           proc{|w, y| w.focus; select_only(w, w.nearest(y))}, '%W %y')
-    t.bind('B1-Motion', proc{|w, y| select_range(w, w.nearest(y))}, '%W %y')
-
-    t.bind('ButtonRelease-1',
-           proc{|w, y| active_line(w, w.nearest(y))}, '%W %y')
-
-    t.bind('Shift-Button-1',
-           proc{|w, y| select_range(w, w.nearest(y))}, '%W %y')
-    t.bind('Shift-B1-Motion',
-           proc{|w, y| select_range(w, w.nearest(y))}, '%W %y')
-
-    t.bind('Control-Button-1',
-           proc{|w, y| select_toggle(w, w.nearest(y))}, '%W %y')
-
-    t.bind('Control-B1-Motion',
-           proc{|w, y| select_drag(w, w.nearest(y))}, '%W %y')
-
-    t.bind('Key-Up', proc{|w| active_shift(w, -1)}, '%W')
-    t.bind('Key-Down', proc{|w| active_shift(w, 1)}, '%W')
-
-    t.bind('Shift-Up', proc{|w| select_expand(w, -1)}, '%W')
-    t.bind('Shift-Down', proc{|w| select_expand(w, 1)}, '%W')
-
-    t.bind('Control-Home', proc{|w| select_line2(w, 0)}, '%W')
-    t.bind('Control-End', proc{|w| select_line2(w, 'end')}, '%W')
-
-    t.bind('Control-Shift-Home', proc{|w| select_range(w, 0)}, '%W')
-    t.bind('Control-Shift-End', proc{|w| select_range(w, 'end')}, '%W')
-
-    t.bind('space', proc{|w| select_active(w)}, '%W')
-    t.bind('Select', proc{|w| select_active(w)}, '%W')
-    t.bind('Control-slash', proc{|w| select_all}, '%W')
-    t.bind('Control-backslash', proc{|w| clear_all}, '%W')
-
-    t
-  end
-
-  ########################
-  def multiple_mode_bindtag
-    t = TkBindTag.new
-    t.bind('Button-1',
-           proc{|w, y| w.focus; select_line3(w, w.nearest(y))}, '%W %y')
-    t.bind('ButtonRelease-1',
-           proc{|w, y| active_line(w, w.nearest(y))}, '%W %y')
-
-    t.bind('Key-Up', proc{|w| active_shift(w, -1)}, '%W')
-    t.bind('Key-Down', proc{|w| active_shift(w, 1)}, '%W')
-
-    t.bind('Control-Home', proc{|w| select_line2(w, 0)}, '%W')
-    t.bind('Control-End', proc{|w| select_line2(w, 'end')}, '%W')
-
-    t.bind('Control-Shift-Home', proc{|w| active_line(w, 0)}, '%W')
-    t.bind('Control-Shift-End', proc{|w| active_line(w, 'end')}, '%W')
-
-    t.bind('space', proc{|w| select_active(w)}, '%W')
-    t.bind('Select', proc{|w| select_active(w)}, '%W')
-    t.bind('Control-slash', proc{|w| select_all}, '%W')
-    t.bind('Control-backslash', proc{|w| clear_all}, '%W')
-
-    t
-  end
-
-  ########################
-  def active_line(w, idx)
-    @lbox_list.each{|l| l.activate(idx)}
-  end
-
-  def select_only(w, idx)
-    @lbox_list.each{|l|
-      l.selection_clear(0, 'end')
-      l.selection_anchor(idx)
-      l.selection_set('anchor')
-    }
-  end
-
-  def select_range(w, idx)
-    @lbox_list.each{|l|
-      l.selection_clear(0, 'end')
-      l.selection_set('anchor', idx)
-    }
-  end
-
-  def select_toggle(w, idx)
-    st = w.selection_includes(idx)
-    @lbox_list.each{|l|
-      l.selection_anchor(idx)
-      if st == 1
-        l.selection_clear(idx)
-      else
-        l.selection_set(idx)
-      end
-    }
-  end
-
-  def select_drag(w, idx)
-    st = w.selection_includes('anchor')
-    @lbox_list.each{|l|
-      if st == 1
-        l.selection_set('anchor', idx)
-      else
-        l.selection_clear('anchor', idx)
-      end
-    }
-  end
-
-  def select_line(w, idx)
-    @lbox_list.each{|l|
-      l.selection_clear(0, 'end')
-      l.activate(idx)
-      l.selection_anchor(idx)
-      l.selection_set('anchor')
-    }
-    w.selection_set('anchor')
-  end
-
-  def select_line2(w, idx)
-    @lbox_list.each{|l|
-      l.activate(idx)
-      l.selection_anchor(idx)
-      l.selection_set('anchor')
-    }
-  end
-
-  def select_line3(w, idx)
-    @lbox_list.each{|l|
-      l.selection_set(idx)
-    }
-  end
-
-  def select_active(w)
-    idx = l.activate(idx)
-    @lbox_list.each{|l|
-      l.selection_set(idx)
-    }
-  end
-
-  def select_expand(w, dir)
-    idx = w.index('active').to_i + dir
-    if idx < 0
-      idx = 0
-    elsif idx >= w.size
-      idx = w.size - 1
-    end
-    @lbox_list.each{|l|
-      l.activate(idx)
-      l.selection_set(idx)
-    }
-  end
-
-  def active_shift(w, dir)
-    idx = w.index('active').to_i + dir
-    if idx < 0
-      idx = 0
-    elsif idx >= w.size
-      idx = w.size - 1
-    end
-    @lbox_list.each{|l|
-      l.activate(idx)
-      l.selection_anchor(idx)
-    }
-  end
-
-  def select_shift(w, dir)
-    idx = w.index('anchor').to_i + dir
-    if idx < 0
-      idx = 0
-    elsif idx >= w.size
-      idx = w.size - 1
-    end
-    @lbox_list.each{|l|
-      l.selection_clear(0, 'end')
-      l.activate(idx)
-      l.selection_anchor(idx)
-      l.selection_set('anchor')
-    }
-  end
-
-  def select_all
-    @lbox_list.each{|l|
-      l.selection_set(0, 'end')
-    }
-  end
-
-  def clear_all
-    @lbox_list.each{|l|
-      l.selection_clear(0, 'end')
-    }
-  end
-
-  def focus_shift(w, dir)
-    idx = @lbox_list.index(w) + dir
-    return if idx < 0
-    return if idx >= @lbox_list.size
-    @lbox_list[idx].focus
-  end
-  ########################
-end
-
-################################################
-# test
-################################################
-if __FILE__ == $0
-  l = TkMultiListFrame.new(nil, 200,
-                           [ ['L1', 200, proc{p 'click L1'}],
-                             ['L2', 100],
-                             ['L3', 200] ],
-                           'width'=>350,
-                           #'titleforeground'=>'yellow',
-                           'titleforeground'=>'white',
-                           #'titlebackground'=>'navy',
-                           'titlebackground'=>'blue',
-                           'titlefont'=>'courier'
-                           ).pack('fill'=>'both', 'expand'=>true)
-  l.insert('end', [1,2,3])
-  l.insert('end', [4,5,6])
-  l.insert('end', [4,5,6], [4,5,6])
-  l.insert('end', ['aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
-                   'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
-                   'cccccccccccccccccccccccccccccccccccccccccccccccccccc'])
-  l.insert('end', [1,2,3])
-  l.insert('end', [4,5,6], [4,5,6])
-  l.insert('end', ['aaaaaaaaaaaaaaa','bbbbbbbbbbbbbb','ccccccccccccccccc'])
-  l.insert('end', [1,2,3])
-  l.insert('end', [4,5,6], [4,5,6])
-  l.insert('end', ['aaaaaaaaaaaaaaa','bbbbbbbbbbbbbb','ccccccccccccccccc'])
-  l.insert('end', [1,2,3])
-  l.insert('end', [4,5,6], [4,5,6])
-  l.insert('end', ['aaaaaaaaaaaaaaa','bbbbbbbbbbbbbb','ccccccccccccccccc'])
-  l.insert('end', [1,2,3])
-  l.insert('end', [4,5,6], [4,5,6])
-  p l.columns(1)
-  p l.columns(1..3)
-  p l.columns(1,2)
-  Tk.mainloop
-end
diff --git a/ext/tk/sample/tkoptdb-safeTk.rb b/ext/tk/sample/tkoptdb-safeTk.rb
deleted file mode 100755
index c0502448ac..0000000000
--- a/ext/tk/sample/tkoptdb-safeTk.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-
-require 'multi-tk'
-
-TkMessage.new(:text => <<EOM).pack
-This is a sample of the safe-Tk slave interpreter. \
-On the slave interpreter, 'tkoptdb.rb' demo is running.
-( NOTE:: a safe-Tk interpreter can't read options \
-from a file. Options are given by the master interpreter \
-in this script. )
-The window shown this message is a root widget of \
-the default master interpreter. The other window \
-is a toplevel widget of the master interpreter, and it \
-has a container frame of the safe-Tk slave interpreter.
-'exit' on the slave interpreter exits the slave only. \
-You can also delete the slave by the button on the toplevel widget.
-EOM
-
-if ENV['LANG'] =~ /^ja/
-  # read Japanese resource
-  ent = TkOptionDB.read_entries(File.expand_path('resource.ja',
-                                                 File.dirname(__FILE__)),
-                                'utf-8')
-else
-  # read English resource
-  ent = TkOptionDB.read_entries(File.expand_path('resource.en',
-                                                File.dirname(__FILE__)))
-end
-
-file = File.expand_path('tkoptdb.rb', File.dirname(__FILE__))
-
-ip = MultiTkIp.new_safeTk{
-  # When a block is given to 'new_safeTk' method,
-  # the block is evaluated on $SAFE==1.
-  ent.each{|pat, val| Tk.tk_call('option', 'add', pat, val)}
-}
-
-print "ip.eval_proc{$SAFE} ==> ", ip.eval_proc{$SAFE}, "\n"
-
-print "\ncall 'ip.wait_on_mainloop = false'\n"
-print "If 'ip.wait_on_mainloop? == true', ",
-  "when 'mainloop' is called on 'ip.eval_proc', ",
-  "'ip.eval_proc' doesn't return while the root window exists.\n",
-  "If you want to avoid that, set wait_on_mainloop to false. ",
-  "Then the mainloop in the eval_proc returns soon ",
-  "and the following steps are evaluated. \n",
-  "If you hate the both of them, use 'ip.bg_eval_proc' or ",
-  "wrap 'ip.eval_proc' by a thread.\n"
-
-ip.wait_on_mainloop = false
-
-ret = ip.eval_proc{
-  # When a block is given to 'eval_proc' method,
-  # the block is evaluated on the IP's current safe level.
-  # So, the followings raises an exception.
-  # An Exception object of the exception is returned as a
-  # return value of this method.
-
-  load file
-}
-print "\nip.eval_proc{}, which includes insecure operation in the given block, returns an exception object: ", ret.inspect, "\n"
-
-print "If a proc object is given, the proc is evaluated on the safe-level which is kept on the proc :: ip.eval_proc( proc{$SAFE} ) ==> ", ip.eval_proc(proc{$SAFE}), "\n"
-
-safe0_cmd = Proc.new{
-  print 'safe0_cmd safe-level == ', $SAFE, "\n"
-  # This proc object keeps current safe-level ($SAFE==0).
-  load file
-}
-ip.eval_proc{safe0_cmd.call}
-
-# Tk.mainloop is ignored on the slave-IP
-Tk.mainloop
diff --git a/ext/tk/sample/tkoptdb.rb b/ext/tk/sample/tkoptdb.rb
deleted file mode 100644
index 3fb2464260..0000000000
--- a/ext/tk/sample/tkoptdb.rb
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-#
-#  sample script of TkOptionDB
-#
-#  If 'LANG' environment variable's value is started by 'ja',
-#  then read Japanese resource data and display Japanese button text.
-#  In other case, read English resource data and display English text.
-#
-require "tk"
-
-if __FILE__ == $0 || !TkCore::INTERP.safe?
-  if ENV['LANG'] =~ /^ja/
-    # read Japanese resource
-    TkOptionDB.read_with_encoding(File.expand_path('resource.ja',
-                                                   File.dirname(__FILE__)),
-                                  'utf-8')
-  else
-    # read English resource
-    TkOptionDB.readfile(File.expand_path('resource.en',
-                                         File.dirname(__FILE__)))
-  end
-end
-
-# 'show_msg' and 'bye_msg' procedures can be defined on BTN_CMD resource.
-# Those procedures are called under $SAFE==2
-cmd = TkOptionDB.new_proc_class(:BTN_CMD, [:show_msg, :bye_msg], 3) {
-  # If you want to check resource string (str),
-  # please define __check_proc_string__(str) like this.
-  class << self
-    def __check_proc_string__(str)
-      print "($SAFE=#{$SAFE} >>>) check!! str.tainted?::#{str.tainted?}"
-      str.untaint
-      print "==>#{str.tainted?} (<<< $SAFE=#{$SAFE}): "
-      str
-    end
-    private :__check_proc_string__
-  end
-}
-
-# following two frame widgets use same database entry
-TkFrame.new(:class=>'BtnFrame'){|f|
-  pack(:padx=>5, :pady=>5)
-  TkButton.new(:parent=>f, :widgetname=>'hello'){
-    command proc{
-      print "($SAFE=#{$SAFE} >>>) : "
-      cmd.show_msg(TkOptionDB.inspect)
-      print "(<<< $SAFE=#{$SAFE})"
-    }
-    pack(:fill=>:x, :padx=>10, :pady=>10)
-  }
-  TkButton.new(:command=>proc{
-                 print "($SAFE=#{$SAFE} >>>) : "
-                 cmd.bye_msg
-                 print "(<<< $SAFE=#{$SAFE} ) : "
-                 exit
-               },
-               :parent=>f, :widgetname=>'quit'){
-    pack(:fill=>:x, :padx=>10, :pady=>10)
-  }
-}
-
-class BtnFrame < TkFrame; end
-BtnFrame.new{|f|
-  pack(:padx=>5, :pady=>5)
-  TkButton.new(:parent=>f, :widgetname=>'hello'){
-    command proc{
-      print "($SAFE=#{$SAFE} >>>) : "
-      cmd.show_msg(TkOptionDB.inspect)
-      print "(<<< $SAFE=#{$SAFE})"
-    }
-    pack(:fill=>:x, :padx=>10, :pady=>10)
-  }
-  TkButton.new(:command=>proc{
-                 print "($SAFE=#{$SAFE} >>>) : "
-                 cmd.bye_msg
-                 print "(<<< $SAFE=#{$SAFE})"
-                 exit
-               },
-               :parent=>f, :widgetname=>'quit'){
-    pack(:fill=>:x, :padx=>10, :pady=>10)
-  }
-}
-
-# if unknown class, use default option values
-TkFrame.new(:class=>'BtnFrame2'){|f|
-  pack(:padx=>5, :pady=>5)
-  TkButton.new(:parent=>f, :widgetname=>'hello'){
-    command proc{
-      print "($SAFE=#{$SAFE} >>>) : "
-      cmd.show_msg(TkOptionDB.inspect)
-      print "(<<< $SAFE=#{$SAFE})"
-    }
-    pack(:fill=>:x, :padx=>10, :pady=>10)
-  }
-  TkButton.new(:command=>proc{
-                 print "($SAFE=#{$SAFE} >>>) : "
-                 cmd.bye_msg
-                 print "(<<< $SAFE=#{$SAFE})"
-                 exit
-               },
-               :parent=>f, :widgetname=>'quit'){
-    pack(:fill=>:x, :padx=>10, :pady=>10)
-  }
-}
-
-Tk.mainloop
diff --git a/ext/tk/sample/tkrttimer.rb b/ext/tk/sample/tkrttimer.rb
deleted file mode 100644
index cde15620b6..0000000000
--- a/ext/tk/sample/tkrttimer.rb
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-# This script is a re-implementation of tktimer.rb with TkTimer(TkAfter) class.
-
-require "tk"
-
-root = TkRoot.new(:title=>'realtime timer sample')
-
-f1 = TkFrame.new(:borderwidth=>2, :relief=>:ridge)
-f1.pack(:side=>:bottom, :fill=>:both)
-TkLabel.new(f1, :text=>'use TkTimer (TkAfter) class').pack(:anchor=>:center)
-label1 = TkLabel.new(:parent=>f1, :relief=>:raised,
-                     :width=>10).pack(:fill=>:both)
-
-f2 = TkFrame.new(:borderwidth=>2, :relief=>:ridge)
-f2.pack(:side=>:bottom, :fill=>:both)
-TkLabel.new(f2, :text=>'use TkRTTimer class').pack
-label2 = TkLabel.new(:parent=>f2, :relief=>:raised,
-                     :width=>10).pack(:fill=>:both)
-
-TkLabel.new(:padx=>10, :pady=>5, :justify=>'left', :text=><<EOT).pack
-Interval setting of each timer object is 10 ms.
-Each timer object counts up the value on each callback
-(the value is not the clock data).
-The count of the TkTimer object is delayed by execution
-time of callbacks and inaccuracy of interval.
-On the other hand, the count of the TkRTTimer object is
-not delayed. Its callback interval is not accurate too.
-But it can compute error correction about the time when
-a callback should start.
-EOT
-
-# define the procedure repeated by the TkTimer object
-tick = proc{|aobj| #<== TkTimer object
-  cnt = aobj.return_value + 1  # return_value keeps a result of the last proc
-  label = aobj.current_args[0]
-  label.text format("%d.%02d", *(cnt.divmod(100)))
-  cnt #==> return value is kept by TkTimer object
-      #    (so, can be send to the next repeat-proc)
-}
-
-timer1 = TkTimer.new(10, -1, [tick, label1])    # 10 ms interval
-timer2 = TkRTTimer.new(10, -1, [tick, label2])  # 10 ms interval
-
-timer1.start(0, proc{ label1.text('0.00'); 0 })
-timer2.start(0, proc{ label2.text('0.00'); 0 })
-
-b_start = TkButton.new(:text=>'Start', :state=>:disabled) {
-  pack(:side=>:left, :fill=>:both, :expand=>true)
-}
-
-b_stop  = TkButton.new(:text=>'Stop', :state=>:normal) {
-  pack('side'=>'left', 'fill'=>'both', 'expand'=>'yes')
-}
-
-b_start.command {
-  timer1.continue
-  timer2.continue
-  b_stop.state(:normal)
-  b_start.state(:disabled)
-}
-
-b_stop.command {
-  timer1.stop
-  timer2.stop
-  b_start.state(:normal)
-  b_stop.state(:disabled)
-}
-
-TkButton.new(:text=>'Reset', :state=>:normal) {
-  command { timer1.reset; timer2.reset }
-  pack(:side=>:right, :fill=>:both, :expand=>:yes)
-}
-
-ev_quit = TkVirtualEvent.new('Control-c', 'Control-q')
-Tk.root.bind(ev_quit, proc{Tk.exit}).focus
-
-Tk.mainloop
diff --git a/ext/tk/sample/tksleep_sample.rb b/ext/tk/sample/tksleep_sample.rb
deleted file mode 100644
index 14ce3a475f..0000000000
--- a/ext/tk/sample/tksleep_sample.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-# frozen_string_literal: false
-require 'tk'
-
-v = TkVariable.new(0)
-l = TkLabel.new(:textvariable=>v).pack(:pady=>[1, 10])
-
-a = TkButton.new(:text=>"button A :: proc{p ['AAA', v.value]}").pack(:fill=>:x, :pady=>[1, 15], :padx=>15)
-a.command{p ['AAA', v.value]}
-
-TkLabel.new(:text=>'Callback of the button B returns LIFO order').pack
-b = TkButton.new(:text=>"button B :: proc{n = v.value; p ['B:start', n]; Tk.sleep(10000); p ['B:end', n]}").pack(:fill=>:x, :pady=>[1, 15], :padx=>15)
-b.command{n = v.value; p ['B:start', n]; Tk.sleep(10000); p ['B:end', n]}
-
-TkLabel.new(:text=>'Callback of the button C returns FIFO order').pack
-c = TkButton.new(:text=>"button C :: proc{n = v.value; Thread.new{p ['C:start', n]; Tk.sleep(10000); p ['C:end', n]}}").pack(:fill=>:x, :pady=>[1, 15], :padx=>15)
-c.command{n = v.value; Thread.new{p ['C:start', n]; Tk.sleep(10000); p ['C:end', n]}}
-
-TkLabel.new(:text=>'Callback of the button D blocks eventloop (no respond to event)').pack
-d = TkButton.new(:text=>"button D :: proc{n = v.value; p ['D:start', n]; sleep(10); p ['D:end', n]}").pack(:fill=>:x, :pady=>[1,15], :padx=>15)
-d.command{n = v.value; p ['D:start', n]; sleep(10); p ['D:end', n]}
-
-TkLabel.new(:text=>'Callback of the button E is another way to avoid eventloop blocking').pack
-e = TkButton.new(:text=>"button E :: proc{n = v.value; Thread.new{p ['D:start', n]; sleep(10); p ['D:end', n]}}").pack(:fill=>:x, :pady=>[1,15], :padx=>15)
-e.command{n = v.value; Thread.new{p ['D:start', n]; sleep(10); p ['D:end', n]}}
-
-TkButton.new(:text=>'QUIT', :command=>proc{exit}).pack
-
-TkTimer.new(500, -1){v.numeric += 1}.start
-
-Tk.mainloop
diff --git a/ext/tk/sample/tktextframe.rb b/ext/tk/sample/tktextframe.rb
deleted file mode 100644
index 60f9a277cc..0000000000
--- a/ext/tk/sample/tktextframe.rb
+++ /dev/null
@@ -1,282 +0,0 @@
-# frozen_string_literal: false
-#
-#  tktextframe.rb : a sample of TkComposite
-#
-#                         by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-require 'tk'
-
-module Tk::ScrollbarComposite
-  include TkComposite
-
-  def component_construct_keys
-    # If a component requires options for construction,
-    # return an Array of option-keys.
-    []
-  end
-  private :component_construct_keys
-
-  def create_component(keys={})
-    # This method must return the created component widget.
-  end
-  private :create_component
-
-  def component_delegates
-    # if want to override default option-methods or delegates,
-    # please define here.
-  end
-  private :component_delegates
-
-  def define_delegates
-    # option methods for scrollbars
-    option_methods([:scrollbarwidth, :get_scrollbarwidth])
-
-    # set receiver widgets for configure methods (with alias)
-    delegate_alias('scrollbarrelief', 'relief', @h_scroll, @v_scroll)
-    delegate_alias('framebackground', 'background',
-                   @frame, @h_scroll, @v_scroll)
-    delegate_alias('activeframebackground', 'activebackground',
-                   @h_scroll, @v_scroll)
-
-    # set receiver widgets for configure methods
-    delegate('DEFAULT', @component)
-    delegate('troughcolor', @h_scroll, @v_scroll)
-    delegate('repeatdelay', @h_scroll, @v_scroll)
-    delegate('repeatinterval', @h_scroll, @v_scroll)
-    delegate('borderwidth', @frame)
-    delegate('relief', @frame)
-
-    component_delegates
-  end
-  private :define_delegates
-
-  DEFAULT_VSCROLL = true
-  DEFAULT_HSCROLL = true
-
-  def initialize_composite(keys={})
-    keys = _symbolkey2str(keys)
-
-    # create scrollbars
-    @v_scroll = TkScrollbar.new(@frame, 'orient'=>'vertical')
-    @h_scroll = TkScrollbar.new(@frame, 'orient'=>'horizontal')
-
-    # create a component
-    construct_keys = {}
-    ((component_construct_keys.map{|k| k.to_s}) & keys.keys).each{|k|
-      construct_keys[k] = keys.delete(k)
-    }
-
-    # create a component (the component must be scrollable)
-    @component = create_component(construct_keys)
-
-    # set default receiver of method calls
-    @path = @component.path
-
-    # assign scrollbars
-    @component.xscrollbar(@h_scroll)
-    @component.yscrollbar(@v_scroll)
-
-    # alignment
-    TkGrid.rowconfigure(@frame, 0, 'weight'=>1, 'minsize'=>0)
-    TkGrid.columnconfigure(@frame, 0, 'weight'=>1, 'minsize'=>0)
-    @component.grid('row'=>0, 'column'=>0, 'sticky'=>'news')
-
-    # scrollbars ON
-    vscroll(keys.delete('vscroll'){self.class::DEFAULT_VSCROLL})
-    hscroll(keys.delete('hscroll'){self.class::DEFAULT_HSCROLL})
-
-    # do configure
-    define_delegates
-
-    # do configure
-    configure keys unless keys.empty?
-  end
-  private :initialize_composite
-
-  # get/set width of scrollbar
-  def get_scrollbarwidth
-    @v_scroll.width
-  end
-  def set_scrollbarwidth(width)
-    @v_scroll.width(width)
-    @h_scroll.width(width)
-  end
-  alias :scrollbarwidth :set_scrollbarwidth
-
-  def hook_vscroll_on(*args); end
-  def hook_vscroll_off(*args); end
-  def hook_hscroll_on(*args); end
-  def hook_hscroll_off(*args); end
-  private :hook_vscroll_on,:hook_vscroll_off,:hook_hscroll_on,:hook_hscroll_off
-
-  # vertical scrollbar : ON/OFF
-  def vscroll(mode, *args)
-    st = TkGrid.info(@v_scroll)
-    if mode && st.size == 0 then
-      @v_scroll.grid('row'=>0, 'column'=>1, 'sticky'=>'ns')
-      hook_vscroll_on(*args)
-    elsif !mode && st.size != 0 then
-      @v_scroll.ungrid
-      hook_vscroll_off(*args)
-    end
-    self
-  end
-
-  # horizontal scrollbar : ON/OFF
-  def hscroll(mode, *args)
-    st = TkGrid.info(@h_scroll)
-    if mode && st.size == 0 then
-      @h_scroll.grid('row'=>1, 'column'=>0, 'sticky'=>'ew')
-      hook_hscroll_on(*args)
-    elsif !mode && st.size != 0 then
-      @h_scroll.ungrid
-      hook_hscroll_off(*args)
-    end
-    self
-  end
-end
-
-################################################
-
-class TkTextFrame < TkText
-  include Tk::ScrollbarComposite
-
-  # def component_construct_keys; []; end
-  # private :component_construct_keys
-
-  def create_component(keys={})
-    # keys has options which are listed by component_construct_keys method.
-    @text = TkText.new(@frame, 'wrap'=>'none')
-    @text.configure(keys) unless keys.empty?
-
-    # option methods for component
-    option_methods(
-       [:textbackground, nil, :textbg_info],
-       :textborderwidth,
-       :textrelief
-    )
-
-    # return the created component
-    @text
-  end
-  private :create_component
-
-  # def component_delegates; end
-  # private :component_delegates
-
-  def hook_hscroll_on(wrap_mode=nil)
-    if wrap_mode
-      wrap wrap_mode
-    else
-      wrap 'none'  # => self.wrap('none')
-    end
-  end
-  def hook_hscroll_off(wrap_mode)
-    wrap wrap_mode  # => self.wrap(wrap_mode)
-  end
-  def hscroll(mode, wrap_mode="char")
-    super
-  end
-
-  # set background color of text widget
-  def textbackground(color = nil)
-    if color
-      @text.background(color)
-    else
-      @text.background
-    end
-  end
-
-  def textbg_info
-    info = @text.configinfo(:background)
-    if TkComm::GET_CONFIGINFO_AS_ARRAY
-      info[0] = 'textbackground'
-      info
-    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      {'textbackground' => info['background']}
-    end
-  end
-
-  # get/set borderwidth of text widget
-  def set_textborderwidth(width)
-    @text.borderwidth(width)
-  end
-  def get_textborderwidth
-    @text.borderwidth
-  end
-  def textborderwidth(width = nil)
-    if width
-      set_textborderwidth(width)
-    else
-      get_textborderwidth
-    end
-  end
-
-  # set relief of text widget
-  def textrelief(type)
-    @text.relief(type)
-  end
-end
-
-################################################
-# test
-################################################
-if __FILE__ == $0
-  TkLabel.new(:text=>'TkTextFrame is an example of Tk::ScrollbarComposite module.').pack
-  f = TkFrame.new.pack('fill'=>'x')
-  #t = TkTextFrame.new.pack
-  t = TkTextFrame.new(:textborderwidth=>3,
-                      :textrelief=>:ridge,
-                      :scrollbarrelief=>:ridge).pack
-  p t.configinfo
-  TkButton.new(f, 'text'=>'vscr OFF',
-               'command'=>proc{t.vscroll(false)}).pack('side'=>'right')
-  TkButton.new(f, 'text'=>'vscr ON',
-               'command'=>proc{t.vscroll(true)}).pack('side'=>'right')
-  TkButton.new(f, 'text'=>'hscr ON',
-               'command'=>proc{t.hscroll(true)}).pack('side'=>'left')
-  TkButton.new(f, 'text'=>'hscr OFF',
-               'command'=>proc{t.hscroll(false)}).pack('side'=>'left')
-
-  ############################################
-
-  # Tk.default_widget_set = :Ttk
-
-  TkFrame.new.pack(:pady=>10)
-  TkLabel.new(:text=>'The following is another example of Tk::ScrollbarComposite module.').pack
-
-  #----------------------------------
-  class ScrListbox < TkListbox
-    include Tk::ScrollbarComposite
-
-    DEFAULT_HSCROLL = false
-
-    def create_component(keys={})
-      TkListbox.new(@frame, keys)
-    end
-    private :create_component
-  end
-  #----------------------------------
-
-  f = TkFrame.new.pack(:pady=>5)
-  lbox = ScrListbox.new(f).pack(:side=>:left)
-  lbox.value = %w(aa bb cc dd eeeeeeeeeeeeeeeeeeeeeeeeee ffffffffff gg hh ii jj kk ll mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm nn oo pp qq)
-  fb = TkFrame.new(f).pack(:expand=>true, :fill=>:y, :padx=>5)
-  TkButton.new(fb, 'text'=>'lbox hscr OFF',
-               'command'=>proc{lbox.hscroll(false)}).pack(:side=>:bottom,
-                                                          :fill=>:x)
-  TkButton.new(fb, 'text'=>'lbox hscr ON',
-               'command'=>proc{lbox.hscroll(true)}).pack(:side=>:bottom,
-                                                          :fill=>:x)
-  TkFrame.new(fb).pack(:pady=>5, :side=>:bottom)
-  TkButton.new(fb, 'text'=>'lbox vscr OFF',
-               'command'=>proc{lbox.vscroll(false)}).pack(:side=>:bottom,
-                                                          :fill=>:x)
-  TkButton.new(fb, 'text'=>'lbox vscr ON',
-               'command'=>proc{lbox.vscroll(true)}).pack(:side=>:bottom,
-                                                          :fill=>:x)
-
-  ############################################
-
-  Tk.mainloop
-end
diff --git a/ext/tk/sample/tktextio.rb b/ext/tk/sample/tktextio.rb
deleted file mode 100644
index cc0326ed20..0000000000
--- a/ext/tk/sample/tktextio.rb
+++ /dev/null
@@ -1,1061 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-#
-#  TkTextIO class :: handling I/O stream on a TkText widget
-#                             by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-#  NOTE: TkTextIO supports 'character' (not 'byte') access only.
-#        So, for example, TkTextIO#getc returns a character, TkTextIO#pos
-#        means the character position, TkTextIO#read(size) counts by
-#        characters, and so on.
-#        Of course, it is available to make TkTextIO class to support
-#        'byte' access. However, it may break multi-byte characters.
-#        and then, displayed string on the text widget may be garbled.
-#        I think that it is not good on the supposed situation of using
-#        TkTextIO.
-#
-require 'tk'
-require 'tk/text'
-require 'tk/textmark'
-require 'thread'
-
-class TkTextIO < TkText
-  # keep safe level
-  @@create_queues = proc{ [Queue.new, Mutex.new, Queue.new, Mutex.new] }
-
-  OPT_DEFAULTS = {
-    'mode'       => nil,
-    'overwrite'  => false,
-    'text'       => nil,
-    'show'       => :pos,
-    'wrap'       => 'char',
-    'sync'       => true,
-    'prompt'     => nil,
-    'prompt_cmd' => nil,
-    'hist_size'  => 1000,
-  }
-
-  def create_self(keys)
-    opts = _get_io_params((keys.kind_of?(Hash))? keys: {})
-
-    super(keys)
-
-    @count_var = TkVariable.new
-
-    @write_buffer = ''
-    @read_buffer  = ''
-    @buf_size = 0
-    @buf_max = 1024
-
-    @write_buf_queue, @write_buf_mutex,
-    @read_buf_queue,  @read_buf_mutex  = @@create_queues.call
-
-    @idle_flush  = TkTimer.new(:idle, 1, proc{ @flusher.run rescue nil })
-    @timer_flush = TkTimer.new(250, -1, proc{ @flusher.run rescue nil })
-
-    @flusher = Thread.new{ loop { Thread.stop; flush() } }
-
-    @receiver = Thread.new{
-      begin
-        loop {
-          str = @write_buf_queue.deq
-          @write_buf_mutex.synchronize { @write_buffer << str }
-          @idle_flush.start
-        }
-      ensure
-        @flusher.kill
-      end
-    }
-
-    @timer_flush.start
-
-    _setup_io(opts)
-  end
-  private :create_self
-
-  def destroy
-    @flusher.kill rescue nil
-
-    @idle_flush.stop rescue nil
-    @timer_flush.stop rescue nil
-
-    @receiver.kill rescue nil
-
-    super()
-  end
-
-  ####################################
-
-  def _get_io_params(keys)
-    opts = {}
-    self.class.const_get(:OPT_DEFAULTS).each{|k, v|
-      if keys.has_key?(k)
-        opts[k] = keys.delete(k)
-      else
-        opts[k] = v
-      end
-    }
-    opts
-  end
-
-  def _setup_io(opts)
-    unless defined? @txtpos
-      @txtpos = TkTextMark.new(self, '1.0')
-    else
-      @txtpos.set('1.0')
-    end
-    @txtpos.gravity = :left
-
-    @lineno = 0
-    @line_offset = 0
-
-    @hist_max = opts['hist_size'].to_i
-    @hist_index = 0
-    @history = Array.new(@hist_max)
-    @history[0] = ''
-
-    self['wrap'] = wrap
-
-    self.show_mode = opts['show']
-
-    self.value = opts['text'] if opts['text']
-
-    @overwrite = (opts['overwrite'])? true: false
-
-    @sync = opts['sync']
-
-    @prompt = opts['prompt']
-    @prompt_cmd = opts['prompt_cmd']
-
-    @open  = {:r => true,  :w => true}  # default is 'r+'
-
-    @console_mode = false
-    @end_of_stream = false
-    @console_buffer = nil
-
-    case opts['mode']
-    when nil
-      # do nothing
-
-    when :console, 'console'
-      @console_mode = true
-      # @console_buffer = TkTextIO.new(:mode=>'r')
-      @console_buffer = self.class.new(:mode=>'r')
-      self.show_mode = :insert
-
-    when 'r', 'rb'
-      @open[:r] = true; @open[:w] = nil
-
-    when 'r+', 'rb+', 'r+b'
-      @open[:r] = true; @open[:w] = true
-
-    when 'w', 'wb'
-      @open[:r] = nil;  @open[:w] = true
-      self.value=''
-
-    when 'w+', 'wb+', 'w+b'
-      @open[:r] = true; @open[:w] = true
-      self.value=''
-
-    when 'a', 'ab'
-      @open[:r] = nil;  @open[:w] = true
-      @txtpos.set('end - 1 char')
-      @txtpos.gravity = :right
-
-    when 'a+', 'ab+', 'a+b'
-      @open[:r] = true;  @open[:w] = true
-      @txtpos.set('end - 1 char')
-      @txtpos.gravity = :right
-
-    else
-      fail ArgumentError, "unknown mode `#{opts['mode']}'"
-    end
-
-    unless defined? @ins_head
-      @ins_head = TkTextMark.new(self, 'insert')
-      @ins_head.gravity = :left
-    end
-
-    unless defined? @ins_tail
-      @ins_tail = TkTextMark.new(self, 'insert')
-      @ins_tail.gravity = :right
-    end
-
-    unless defined? @tmp_mark
-      @tmp_mark = TkTextMark.new(self, 'insert')
-      @tmp_mark.gravity = :left
-    end
-
-    if @console_mode
-      _set_console_line
-      _setup_console_bindings
-    end
-  end
-  private :_get_io_params, :_setup_io
-
-  def _set_console_line
-    @tmp_mark.set(@ins_tail)
-
-    mark_set('insert', 'end')
-
-    prompt = ''
-    prompt << @prompt_cmd.call if @prompt_cmd
-    prompt << @prompt if @prompt
-    insert(@tmp_mark, prompt)
-
-    @ins_head.set(@ins_tail)
-    @ins_tail.set('insert')
-
-    @txtpos.set(@tmp_mark)
-
-    _see_pos
-  end
-
-  def _replace_console_line(str)
-    self.delete(@ins_head, @ins_tail)
-    self.insert(@ins_head, str)
-  end
-
-  def _get_console_line
-    @tmp_mark.set(@ins_tail)
-    s = self.get(@ins_head, @tmp_mark)
-    _set_console_line
-    s
-  end
-  private :_set_console_line, :_replace_console_line, :_get_console_line
-
-  def _cb_up
-    @history[@hist_index].replace(self.get(@ins_head, @ins_tail))
-    @hist_index += 1
-    @hist_index -= 1 if @hist_index >= @hist_max || !@history[@hist_index]
-    _replace_console_line(@history[@hist_index]) if @history[@hist_index]
-    Tk.callback_break
-  end
-  def _cb_down
-    @history[@hist_index].replace(self.get(@ins_head, @ins_tail))
-    @hist_index -= 1
-    @hist_index = 0 if @hist_index < 0
-    _replace_console_line(@history[@hist_index]) if @history[@hist_index]
-    Tk.callback_break
-  end
-  def _cb_left
-    if @console_mode && compare('insert', '<=', @ins_head)
-      mark_set('insert', @ins_head)
-      Tk.callback_break
-    end
-  end
-  def _cb_backspace
-    if @console_mode && compare('insert', '<=', @ins_head)
-      Tk.callback_break
-    end
-  end
-  def _cb_ctrl_a
-    if @console_mode
-      mark_set('insert', @ins_head)
-      Tk.callback_break
-    end
-  end
-  def _cb_ctrl_u
-    if @console_mode
-      mark_set('insert', @ins_head)
-      delete('insert', 'insert lineend')
-      Tk.callback_break
-    end
-  end
-  private :_cb_up, :_cb_down, :_cb_left, :_cb_backspace,
-          :_cb_ctrl_a, :_cb_ctrl_u
-
-  def _setup_console_bindings
-    @bindtag = TkBindTag.new
-
-    tags = self.bindtags
-    tags[tags.index(self)+1, 0] = @bindtag
-    self.bindtags = tags
-
-    @bindtag.bind('Return'){
-      insert('end - 1 char', "\n")
-      if (str = _get_console_line)
-        @read_buf_queue.push(str)
-
-        @history[0].replace(str.chomp)
-        @history.pop
-        @history.unshift('')
-        @hist_index = 0
-      end
-
-      Tk.update
-      Tk.callback_break
-    }
-    @bindtag.bind('Alt-Return'){
-      Tk.callback_continue
-    }
-
-    @bindtag.bind('FocusIn'){
-      if @console_mode
-        mark_set('insert', @ins_tail)
-        Tk.callback_break
-      end
-    }
-
-    ins_mark = TkTextMark.new(self, 'insert')
-
-    @bindtag.bind('ButtonPress'){
-      if @console_mode
-        ins_mark.set('insert')
-      end
-    }
-
-    @bindtag.bind('ButtonRelease-1'){
-      if @console_mode && compare('insert', '<=', @ins_head)
-        mark_set('insert', ins_mark)
-        Tk.callback_break
-      end
-    }
-
-    @bindtag.bind('ButtonRelease-2', '%x %y'){|x, y|
-      if @console_mode
-        # paste a text at 'insert' only
-        x1, y1, x2, y2 =  bbox(ins_mark)
-        unless x == x1 && y == y1
-          Tk.event_generate(self, 'ButtonRelease-2', :x=>x1, :y=>y1)
-          Tk.callback_break
-        end
-      end
-    }
-
-    @bindtag.bind('Up'){ _cb_up }
-    @bindtag.bind('Control-p'){ _cb_up }
-
-    @bindtag.bind('Down'){ _cb_down }
-    @bindtag.bind('Control-n'){ _cb_down }
-
-    @bindtag.bind('Left'){ _cb_left }
-    @bindtag.bind('Control-b'){ _cb_left }
-
-    @bindtag.bind('BackSpace'){ _cb_backspace }
-    @bindtag.bind('Control-h'){ _cb_backspace }
-
-    @bindtag.bind('Home'){ _cb_ctrl_a }
-    @bindtag.bind('Control-a'){ _cb_ctrl_a }
-
-    @bindtag.bind('Control-u'){ _cb_ctrl_u }
-  end
-  private :_setup_console_bindings
-
-  def _block_read(size = nil, ret = '', block_mode = true)
-    return '' if size == 0
-    return nil if ! @read_buf_queue && @read_buffer.empty?
-    ret = '' unless ret.kind_of?(String)
-    ret.replace('') unless ret.empty?
-
-    if block_mode == nil # partial
-      if @read_buffer.empty?
-        ret << @read_buffer.slice!(0..-1)
-        return ret
-      end
-    end
-
-    if size.kind_of?(Numeric)
-      loop{
-        @read_buf_mutex.synchronize {
-          buf_len = @read_buffer.length
-          if buf_len >= size
-            ret << @read_buffer.slice!(0, size)
-            return ret
-          else
-            ret << @read_buffer.slice!(0..-1)
-            size -= buf_len
-            return ret unless @read_buf_queue
-          end
-        }
-        @read_buffer << @read_buf_queue.pop
-      }
-    else # readline
-      rs = (size)? size: $/
-      rs = rs.to_s if rs.kind_of?(Regexp)
-      loop{
-        @read_buf_mutex.synchronize {
-          if (str = @read_buffer.slice!(/\A(.*)(#{rs})/m))
-            ret << str
-            return ret
-          else
-            ret << @read_buffer.slice!(0..-1)
-            return ret unless @read_buf_queue
-          end
-        }
-        @read_buffer << @read_buf_queue.pop
-      }
-    end
-  end
-
-  def _block_write
-    ###### currently, not support
-  end
-  private :_block_read, :_block_write
-
-  ####################################
-
-  def <<(obj)
-    _write(obj)
-    self
-  end
-
-  def binmode
-    self
-  end
-
-  def clone
-    fail NotImplementedError, 'cannot clone TkTextIO'
-  end
-  def dup
-    fail NotImplementedError, 'cannot duplicate TkTextIO'
-  end
-
-  def close
-    close_read
-    close_write
-    nil
-  end
-  def close_read
-    @open[:r] = false if @open[:r]
-    nil
-  end
-  def close_write
-    @open[:w] = false if @open[:w]
-    nil
-  end
-
-  def closed?(dir=nil)
-    case dir
-    when :r, 'r'
-      !@open[:r]
-    when :w, 'w'
-      !@open[:w]
-    else
-      !@open[:r] && !@open[:w]
-    end
-  end
-
-  def _check_readable
-    fail IOError, "not opened for reading" if @open[:r].nil?
-    fail IOError, "closed stream" if !@open[:r]
-  end
-  def _check_writable
-    fail IOError, "not opened for writing" if @open[:w].nil?
-    fail IOError, "closed stream" if !@open[:w]
-  end
-  private :_check_readable, :_check_writable
-
-  def each_line(rs = $/)
-    _check_readable
-    while(s = self.gets(rs))
-      yield(s)
-    end
-    self
-  end
-  alias each each_line
-
-  def each_char
-    _check_readable
-    while(c = self.getc)
-      yield(c)
-    end
-    self
-  end
-  alias each_byte each_char
-
-  def eof?
-    compare(@txtpos, '==', 'end - 1 char')
-  end
-  alias eof eof?
-
-  def fcntl(*args)
-    fail NotImplementedError, "fcntl is not implemented on #{self.class}"
-  end
-
-  def fsync
-    0
-  end
-
-  def fileno
-    nil
-  end
-
-  def flush
-    Thread.pass
-    if @open[:w] || ! @write_buffer.empty?
-      @write_buf_mutex.synchronize {
-        _sync_write_buf(@write_buffer)
-        @write_buffer[0..-1] = ''
-      }
-    end
-    self
-  end
-
-  def getc
-    return _block_read(1) if @console_mode
-
-    _check_readable
-    return nil if eof?
-    c = get(@txtpos)
-    @txtpos.set(@txtpos + '1 char')
-    _see_pos
-    c
-  end
-
-  def gets(rs = $/)
-    return _block_read(rs) if @console_mode
-
-    _check_readable
-    return nil if eof?
-    _readline(rs)
-  end
-
-  def ioctrl(*args)
-    fail NotImplementedError, 'ioctrl is not implemented on TkTextIO'
-  end
-
-  def isatty
-    false
-  end
-  def tty?
-    false
-  end
-
-  def lineno
-    @lineno + @line_offset
-  end
-
-  def lineno=(num)
-    @line_offset = num - @lineno
-    num
-  end
-
-  def overwrite?
-    @overwrite
-  end
-
-  def overwrite=(ovwt)
-    @overwrite = (ovwt)? true: false
-  end
-
-  def pid
-    nil
-  end
-
-  def index_pos
-    index(@txtpos)
-  end
-  alias tell_index index_pos
-
-  def index_pos=(idx)
-    @txtpos.set(idx)
-    @txtpos.set('end - 1 char') if compare(@txtpos, '>=', :end)
-    _see_pos
-    idx
-  end
-
-  def pos
-    s = get('1.0', @txtpos)
-    number(tk_call('string', 'length', s))
-  end
-  alias tell pos
-
-  def pos=(idx)
-    seek(idx, IO::SEEK_SET)
-    idx
-  end
-
-  def pos_gravity
-    @txtpos.gravity
-  end
-
-  def pos_gravity=(side)
-    @txtpos.gravity = side
-    side
-  end
-
-  def print(arg=$_, *args)
-    _check_writable
-    args.unshift(arg)
-    args.map!{|val| (val == nil)? 'nil': val.to_s }
-    str = args.join($,)
-    str << $\ if $\
-    _write(str)
-    nil
-  end
-  def printf(*args)
-    _check_writable
-    _write(sprintf(*args))
-    nil
-  end
-
-  def putc(c)
-    _check_writable
-    c = c.chr if c.kind_of?(Fixnum)
-    _write(c)
-    c
-  end
-
-  def puts(*args)
-    _check_writable
-    if args.empty?
-      _write("\n")
-      return nil
-    end
-    args.each{|arg|
-      if arg == nil
-        _write("nil\n")
-      elsif arg.kind_of?(Array)
-        puts(*arg)
-      elsif arg.kind_of?(String)
-        _write(arg.chomp)
-        _write("\n")
-      else
-        begin
-          arg = arg.to_ary
-          puts(*arg)
-        rescue
-          puts(arg.to_s)
-        end
-      end
-    }
-    nil
-  end
-
-  def _read(len)
-    epos = @txtpos + "#{len} char"
-    s = get(@txtpos, epos)
-    @txtpos.set(epos)
-    @txtpos.set('end - 1 char') if compare(@txtpos, '>=', :end)
-    _see_pos
-    s
-  end
-  private :_read
-
-  def read(len=nil, buf=nil)
-    return _block_read(len, buf) if @console_mode
-
-    _check_readable
-    if len
-      return "" if len == 0
-      return nil if eof?
-      s = _read(len)
-    else
-      s = get(@txtpos, 'end - 1 char')
-      @txtpos.set('end - 1 char')
-      _see_pos
-    end
-    buf.replace(s) if buf.kind_of?(String)
-    s
-  end
-
-  def readchar
-    return _block_read(1) if @console_mode
-
-    _check_readable
-    fail EOFError if eof?
-    c = get(@txtpos)
-    @txtpos.set(@txtpos + '1 char')
-    _see_pos
-    c
-  end
-
-  def _readline(rs = $/)
-    if rs == nil
-      s = get(@txtpos, 'end - 1 char')
-      @txtpos.set('end - 1 char')
-    elsif rs == ''
-      @count_var.value  # make it global
-      idx = tksearch_with_count([:regexp], @count_var,
-                                   "\n(\n)+", @txtpos, 'end - 1 char')
-      if idx
-        s = get(@txtpos, idx) << "\n"
-        @txtpos.set("#{idx} + #{@count_var.value} char")
-        @txtpos.set('end - 1 char') if compare(@txtpos, '>=', :end)
-      else
-        s = get(@txtpos, 'end - 1 char')
-        @txtpos.set('end - 1 char')
-      end
-    else
-      @count_var.value  # make it global
-      idx = tksearch_with_count(@count_var, rs, @txtpos, 'end - 1 char')
-      if idx
-        s = get(@txtpos, "#{idx} + #{@count_var.value} char")
-        @txtpos.set("#{idx} + #{@count_var.value} char")
-        @txtpos.set('end - 1 char') if compare(@txtpos, '>=', :end)
-      else
-        s = get(@txtpos, 'end - 1 char')
-        @txtpos.set('end - 1 char')
-      end
-    end
-
-    _see_pos
-    @lineno += 1
-    $_ = s
-  end
-  private :_readline
-
-  def readline(rs = $/)
-    return _block_readline(rs) if @console_mode
-
-    _check_readable
-    fail EOFError if eof?
-    _readline(rs)
-  end
-
-  def readlines(rs = $/)
-    if @console_mode
-      lines = []
-      while (line = _block_readline(rs))
-        lines << line
-      end
-      return lines
-    end
-
-    _check_readable
-    lines = []
-    until(eof?)
-      lines << _readline(rs)
-    end
-    $_ = nil
-    lines
-  end
-
-  def readpartial(maxlen, buf=nil)
-    #return @console_buffer.readpartial(maxlen, buf) if @console_mode
-    return _block_read(maxlen, buf, nil) if @console_mode
-
-    _check_readable
-    fail EOFError if eof?
-    s = _read(maxlen)
-    buf.replace(s) if buf.kind_of?(String)
-    s
-  end
-
-  def reopen(*args)
-    fail NotImplementedError, 'reopen is not implemented on TkTextIO'
-  end
-
-  def rewind
-    @txtpos.set('1.0')
-    _see_pos
-    @lineno = 0
-    @line_offset = 0
-    self
-  end
-
-  def seek(offset, whence=IO::SEEK_SET)
-    case whence
-    when IO::SEEK_SET
-      offset = "1.0 + #{offset} char" if offset.kind_of?(Numeric)
-      @txtpos.set(offset)
-
-    when IO::SEEK_CUR
-      offset = "#{offset} char" if offset.kind_of?(Numeric)
-      @txtpos.set(@txtpos + offset)
-
-    when IO::SEEK_END
-      offset = "#{offset} char" if offset.kind_of?(Numeric)
-      @txtpos.set("end - 1 char + #{offset}")
-
-    else
-      fail Errno::EINVAL, 'invalid whence argument'
-    end
-
-    @txtpos.set('end - 1 char') if compare(@txtpos, '>=', :end)
-    _see_pos
-
-    0
-  end
-  alias sysseek seek
-
-  def _see_pos
-    see(@show) if @show
-  end
-  private :_see_pos
-
-  def show_mode
-    (@show == @txtpos)? :pos : @show
-  end
-
-  def show_mode=(mode)
-    # define show mode  when file position is changed.
-    #  mode == :pos or "pos" or true :: see current file position.
-    #  mode == :insert or "insert"   :: see insert cursor position.
-    #  mode == nil or false          :: do nothing
-    #  else see 'mode' position ('mode' should be text index or mark)
-    case mode
-    when :pos, 'pos', true
-      @show = @txtpos
-    when :insert, 'insert'
-      @show = :insert
-    when nil, false
-      @show = false
-    else
-      begin
-        index(mode)
-      rescue
-        fail ArgumentError, 'invalid show-position'
-      end
-      @show = mode
-    end
-
-    _see_pos
-
-    mode
-  end
-
-  def stat
-    fail NotImplementedError, 'stat is not implemented on TkTextIO'
-  end
-
-  def sync
-    @sync
-  end
-
-  def sync=(mode)
-    @sync = mode
-  end
-
-  def sysread(len, buf=nil)
-    return _block_read(len, buf) if @console_mode
-
-    _check_readable
-    fail EOFError if eof?
-    s = _read(len)
-    buf.replace(s) if buf.kind_of?(String)
-    s
-  end
-
-  def syswrite(obj)
-    _write(obj)
-  end
-
-  def to_io
-    self
-  end
-
-  def truncate(len)
-    delete("1.0 + #{len} char", :end)
-    0
-  end
-
-  def ungetc(c)
-    if @console_mode
-      @read_buf_mutex.synchronize {
-        @read_buffer[0,0] = c.chr
-      }
-      return nil
-    end
-
-    _check_readable
-    c = c.chr if c.kind_of?(Fixnum)
-    if compare(@txtpos, '>', '1.0')
-      @txtpos.set(@txtpos - '1 char')
-      delete(@txtpos)
-      insert(@txtpos, tk_call('string', 'range', c, 0, 1))
-      @txtpos.set(@txtpos - '1 char') if @txtpos.gravity == 'right'
-      _see_pos
-    else
-      fail IOError, 'cannot ungetc at head of stream'
-    end
-    nil
-  end
-
-=begin
-  def _write(obj)
-    #s = _get_eval_string(obj)
-    s = (obj.kind_of?(String))? obj: obj.to_s
-    n = number(tk_call('string', 'length', s))
-    delete(@txtpos, @txtpos + "#{n} char") if @overwrite
-    self.insert(@txtpos, s)
-    @txtpos.set(@txtpos + "#{n} char")
-    @txtpos.set('end - 1 char') if compare(@txtpos, '>=', :end)
-    _see_pos
-    Tk.update if @sync
-    n
-  end
-  private :_write
-=end
-#=begin
-  def _sync_write_buf(s)
-    if (n = number(tk_call('string', 'length', s))) > 0
-      delete(@txtpos, @txtpos + "#{n} char") if @overwrite
-      self.insert(@txtpos, s)
-      #Tk.update
-
-      @txtpos.set(@txtpos + "#{n} char")
-      @txtpos.set('end - 1 char') if compare(@txtpos, '>=', :end)
-
-      @ins_head.set(@txtpos) if compare(@txtpos, '>', @ins_head)
-
-      _see_pos
-    end
-    self
-  end
-  private :_sync_write_buf
-
-  def _write(obj)
-    s = (obj.kind_of?(String))? obj: obj.to_s
-    n = number(tk_call('string', 'length', s))
-    @write_buf_queue.enq(s)
-    if @sync
-      Thread.pass
-      Tk.update
-    end
-    n
-  end
-  private :_write
-#=end
-
-  def write(obj)
-    _check_writable
-    _write(obj)
-  end
-end
-
-####################
-#  TEST
-####################
-if __FILE__ == $0
-  ev_loop = Thread.new{Tk.mainloop}
-
-  f = TkFrame.new.pack
-  #tio = TkTextIO.new(f, :show=>:nil,
-  #tio = TkTextIO.new(f, :show=>:pos,
-  tio = TkTextIO.new(f, :show=>:insert,
-                     :text=>">>> This is an initial text line. <<<\n\n"){
-#    yscrollbar(TkScrollbar.new(f).pack(:side=>:right, :fill=>:y))
-    pack(:side=>:left, :fill=>:both, :expand=>true)
-  }
-
-  Tk.update
-
-  $stdin  = tio
-  $stdout = tio
-  $stderr = tio
-
-  STDOUT.print("\n========= TkTextIO#gets for initial text ========\n\n")
-
-  while(s = gets)
-    STDOUT.print(s)
-  end
-
-  STDOUT.print("\n============ put strings to TkTextIO ===========\n\n")
-
-  puts "On this sample, a text widget works as if it is a I/O stream."
-  puts "Please see the code."
-  puts
-  printf("printf message: %d %X\n", 123456, 255)
-  puts
-  printf("(output by 'p' method) This TkTextIO object is ...\n")
-  p tio
-  print(" [ Current wrap mode of this object is 'char'. ]\n")
-  puts
-  warn("This is a warning message generated by 'warn' method.")
-  puts
-  puts "current show_mode is #{tio.show_mode}."
-  if tio.show_mode == :pos
-    puts "So, you can see the current file position on this text widget."
-  else
-    puts "So, you can see the position '#{tio.show_mode}' on this text widget."
-  end
-  print("Please scroll up this text widget to see the head of lines.\n")
-  print("---------------------------------------------------------\n")
-
-  STDOUT.print("\n=============== TkTextIO#readlines =============\n\n")
-
-  tio.seek(0)
-  lines = readlines
-  STDOUT.puts(lines.inspect)
-
-  STDOUT.print("\n================== TkTextIO#each ===============\n\n")
-
-  tio.rewind
-  tio.each{|line| STDOUT.printf("%2d: %s\n", tio.lineno, line.chomp)}
-
-  STDOUT.print("\n================================================\n\n")
-
-  STDOUT.print("\n========= reverse order (seek by lines) ========\n\n")
-
-  tio.seek(-1, IO::SEEK_END)
-  begin
-    begin
-      tio.seek(:linestart, IO::SEEK_CUR)
-    rescue
-      # maybe use old version of tk/textmark.rb
-      tio.seek('0 char linestart', IO::SEEK_CUR)
-    end
-    STDOUT.print(gets)
-    tio.seek('-1 char linestart -1 char', IO::SEEK_CUR)
-  end while(tio.pos > 0)
-
-  STDOUT.print("\n================================================\n\n")
-
-  tio.seek(0, IO::SEEK_END)
-
-  STDOUT.print("tio.sync ==  #{tio.sync}\n")
-#  tio.sync = false
-#  STDOUT.print("tio.sync ==  #{tio.sync}\n")
-
-  (0..10).each{|i|
-    STDOUT.print("#{i}\n")
-    s = ''
-    (0..1000).each{ s << '*' }
-    print(s)
-  }
-  print("\n")
-  print("\n=========================================================\n\n")
-
-  s = ''
-  timer = TkTimer.new(:idle, -1, proc{
-                        #STDOUT.print("idle call\n")
-                        unless s.empty?
-                          print(s)
-                          s = ''
-                        end
-                      }).start
-  (0..10).each{|i|
-    STDOUT.print("#{i}\n")
-    (0..1000).each{ s << '*' }
-  }
-#  timer.stop
-  until s.empty?
-    sleep 0.1
-  end
-  timer.stop
-
-=begin
-  tio.sync = false
-  print("\n")
-  #(0..10000).each{ putc('*') }
-  (0..10).each{|i|
-    STDOUT.print("#{i}\n")
-    (0..1000).each{ putc('*') }
-  }
-
-  (0..10).each{|i|
-    STDOUT.print("#{i}\n")
-    s = ''
-    (0..1000).each{ s << '*' }
-    print(s)
-  }
-=end
-
-  num = 0
-#  io = TkTextIO.new(:mode=>:console, :prompt=>'').pack
-#=begin
-  io = TkTextIO.new(:mode=>:console,
-                    :prompt_cmd=>proc{
-                      s = "[#{num}]"
-                      num += 1
-                      s
-                    },
-                    :prompt=>'-> ').pack
-#=end
-  Thread.new{loop{sleep 2; io.puts 'hoge'}}
-  Thread.new{loop{p io.gets}}
-
-  ev_loop.join
-end
diff --git a/ext/tk/sample/tktimer.rb b/ext/tk/sample/tktimer.rb
deleted file mode 100644
index 4b6abae7e6..0000000000
--- a/ext/tk/sample/tktimer.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-# This script generates a counter with start and stop buttons.
-
-require "tk"
-$label = TkLabel.new {
-  text '0.00'
-  relief 'raised'
-  width 10
-  pack('side'=>'bottom', 'fill'=>'both')
-}
-
-TkButton.new {
-  text 'Start'
-  command proc {
-    if $stopped
-      $stopped = FALSE
-      tick
-    end
-  }
-  pack('side'=>'left','fill'=>'both','expand'=>'yes')
-}
-TkButton.new {
-  text 'Stop'
-  command proc{
-    exit if $stopped
-    $stopped = TRUE
-  }
-  pack('side'=>'right','fill'=>'both','expand'=>'yes')
-}
-
-$seconds=0
-$hundredths=0
-$stopped=TRUE
-
-def tick
-  if $stopped then return end
-  Tk.after 50, proc{tick}
-  $hundredths+=5
-  if $hundredths >= 100
-    $hundredths=0
-    $seconds+=1
-  end
-  $label.text format("%d.%02d", $seconds, $hundredths)
-end
-
-root = Tk.root
-root.bind "Control-c", proc{root.destroy}
-root.bind "Control-q", proc{root.destroy}
-Tk.root.focus
-Tk.mainloop
diff --git a/ext/tk/sample/tktimer2.rb b/ext/tk/sample/tktimer2.rb
deleted file mode 100644
index 3f8d722153..0000000000
--- a/ext/tk/sample/tktimer2.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-# This script is a re-implementation of tktimer.rb with TkTimer(TkAfter) class.
-
-require "tk"
-
-# new notation :
-#   * symbols are acceptable as keys or values of the option hash
-#   * the parent widget can be given by :parent key on the option hash
-root = TkRoot.new(:title=>'timer sample')
-label = TkLabel.new(:parent=>root, :relief=>:raised, :width=>10) \
-               .pack(:side=>:bottom, :fill=>:both)
-
-# define the procedure repeated by the TkTimer object
-tick = proc{|aobj| #<== TkTimer object
-  cnt = aobj.return_value + 5 # return_value keeps a result of the last proc
-  label.text format("%d.%02d", *(cnt.divmod(100)))
-  cnt #==> return value is kept by TkTimer object
-      #    (so, can be send to the next repeat-proc)
-}
-
-timer = TkTimer.new(50, -1, tick).start(0, proc{ label.text('0.00'); 0 })
-        # ==> repeat-interval : (about) 50 ms,
-        #     repeat : infinite (-1) times,
-        #     repeat-procedure : tick (only one, in this case)
-        #
-        # ==> wait-before-call-init-proc : 0 ms,
-        #     init_proc : proc{ label.text('0.00'); 0 }
-        #
-        # (0ms)-> init_proc ->(50ms)-> tick ->(50ms)-> tick ->....
-
-TkButton.new(:text=>'Start') {
-  command proc{ timer.continue unless timer.running? }
-  pack(:side=>:left, :fill=>:both, :expand=>true)
-}
-TkButton.new(:text=>'Restart') {
-  command proc{ timer.restart(0, proc{ label.text('0.00'); 0 }) }
-  pack(:side=>:left, :fill=>:both, :expand=>true)
-}
-TkButton.new(:text=>'Stop') {
-  command proc{ timer.stop if timer.running? }
-  pack('side'=>'right','fill'=>'both','expand'=>'yes')
-}
-
-ev_quit = TkVirtualEvent.new('Control-c', 'Control-q')
-Tk.root.bind(ev_quit, proc{Tk.exit}).focus
-
-Tk.mainloop
diff --git a/ext/tk/sample/tktimer3.rb b/ext/tk/sample/tktimer3.rb
deleted file mode 100644
index bce3cd6b6c..0000000000
--- a/ext/tk/sample/tktimer3.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-# This script is a re-implementation of tktimer.rb with TkTimer(TkAfter) class.
-
-require "tk"
-
-# new notation :
-#   * symbols are acceptable as keys or values of the option hash
-#   * the parent widget can be given by :parent key on the option hash
-root = TkRoot.new(:title=>'timer sample')
-label = TkLabel.new(:parent=>root, :relief=>:raised, :width=>10) \
-               .pack(:side=>:bottom, :fill=>:both)
-
-# define the procedure repeated by the TkTimer object
-tick = proc{|aobj| #<== TkTimer object
-  cnt = aobj.return_value + 5 # return_value keeps a result of the last proc
-  label.text format("%d.%02d", *(cnt.divmod(100)))
-  cnt #==> return value is kept by TkTimer object
-      #    (so, can be send to the next repeat-proc)
-}
-
-timer = TkTimer.new(50, -1, tick).start(0, proc{ label.text('0.00'); 0 })
-        # ==> repeat-interval : (about) 50 ms,
-        #     repeat : infinite (-1) times,
-        #     repeat-procedure : tick (only one, in this case)
-        #
-        # ==> wait-before-call-init-proc : 0 ms,
-        #     init_proc : proc{ label.text('0.00'); 0 }
-        #
-        # (0ms)-> init_proc ->(50ms)-> tick ->(50ms)-> tick ->....
-
-b_start = TkButton.new(:text=>'Start', :state=>:disabled) {
-  pack(:side=>:left, :fill=>:both, :expand=>true)
-}
-
-b_stop  = TkButton.new(:text=>'Stop', :state=>:normal) {
-  pack('side'=>'left', 'fill'=>'both', 'expand'=>'yes')
-}
-
-b_start.command {
-  timer.continue
-  b_stop.state(:normal)
-  b_start.state(:disabled)
-}
-
-b_stop.command {
-  timer.stop
-  b_start.state(:normal)
-  b_stop.state(:disabled)
-}
-
-TkButton.new(:text=>'Reset', :state=>:normal) {
-  command { timer.reset }
-  pack(:side=>:right, :fill=>:both, :expand=>:yes)
-}
-
-ev_quit = TkVirtualEvent.new('Control-c', 'Control-q')
-Tk.root.bind(ev_quit, proc{Tk.exit}).focus
-
-Tk.mainloop
diff --git a/ext/tk/sample/tktree.rb b/ext/tk/sample/tktree.rb
deleted file mode 100644
index 47622973e7..0000000000
--- a/ext/tk/sample/tktree.rb
+++ /dev/null
@@ -1,104 +0,0 @@
-# frozen_string_literal: false
-##########################################################################
-# TkTree widget class
-#
-#    see <http://wiki.tcl.tk/10615>
-#
-#  Note:  optional argument '-font' of the Tcl library is changed to
-#         'itemfont' on this Ruby library, because of avoiding font
-#         operation trouble in 'initialize' method  ( see the following
-#         test script ).
-#
-##########################################################################
-require 'tk'
-
-class TkTree < TkCanvas
-  TCL_SCRIPT_PATH = File.join(File.dirname(__FILE__), 'tktree.tcl')
-
-  def create_self(keys)
-    args = [@path]
-    if keys.kind_of?(Hash)
-      font = keys.delete('itemfont')
-#      font = hash_kv(font) if font.kind_of?(Hash)
-      keys['font'] = font if font
-#      args.concat(hash_kv(keys))
-      args << keys
-    end
-    begin
-      tk_call('::tktree::treecreate', *args)
-    rescue NameError, RuntimeError
-      Tk.load_tclscript(TkTree::TCL_SCRIPT_PATH)
-      tk_call('::tktree::treecreate', *args)
-    end
-  end
-
-  def newitem(itempath, keys = nil)
-    if keys.kind_of?(Hash)
-      keys = _symbolkey2str(keys)
-      font = keys.delete('itemfont')
-#      font = hash_kv(font) if font.kind_of?(Hash)
-      keys['font'] = font if font
-#      tk_call('::tktree::newitem', @path, itempath, *hash_kv(keys))
-      tk_call('::tktree::newitem', @path, itempath, keys)
-    else
-      tk_call('::tktree::newitem', @path, itempath)
-    end
-  end
-
-  def delitem(itempath)
-    tk_call('::tktree::delitem', @path, itempath)
-  end
-
-  def labelat(xpos, ypos)
-    tk_call('::tktree::delitem', @path, xpos, ypos)
-  end
-
-  def getselection
-    tk_call('::tktree::getselection', @path)
-  end
-
-  def setselection(itempath)
-    tk_call('::tktree::getselection', @path, itempath)
-  end
-end
-
-
-##########################################################################
-# test script
-##########################################################################
-if __FILE__ == $0
-  TkLabel.new(:text=><<EOL, :relief=>:ridge, :justify=>:left).pack
-
- This is a sample to use a Tcl library script on Ruby/Tk.
- This sample loads tktree.tcl (see <http://wiki.tcl.tk/10615>)
- and calls functions of the Tcl script.
-EOL
-
-  items = %w(/group1/item1 /group1/item2 /group1/subgroup/item1 /group2/item1 /item1)
-
-  tr1 = TkTree.new.pack(:expand=>true, :fill=>:both)
-  tr1.focus
-
-  items.each{|item|
-    tr1.newitem(item,
-                :command=>proc{Tk.messageBox(:message=>"#{item} executed")})
-  }
-
-  f = TkFrame.new.pack(:expand=>true, :fill=>:both)
-  tr2 = TkTree.new(f, :bg=>'black', #:itemfont=>{:family=>'Times', :size=>14},
-                   :textcolor=>'red', :bd=>4, :relief=>:ridge,
-                   :selectbackground=>'darkBlue', :selectforeground=>'yellow',
-                   :selectborderwidth=>3, :linecolor=>'yellow') {
-    yscrollbar(TkScrollbar.new(f, :width=>10).pack(:side=>:right, :fill=>:y))
-    xscrollbar(TkScrollbar.new(f, :width=>10).pack(:side=>:bottom, :fill=>:x))
-    pack(:expand=>true, :fill=>:both)
-  }
-
-  items.each{|item|
-    tr2.newitem(item, :textcolor=>'green', :image=>'',
-                :itemfont=>{:family=>'Times', :size=>10},
-                :command=>proc{Tk.messageBox(:message=>"#{item} executed")})
-  }
-
-  Tk.mainloop
-end
diff --git a/ext/tk/sample/tktree.tcl b/ext/tk/sample/tktree.tcl
deleted file mode 100644
index a5e47eb776..0000000000
--- a/ext/tk/sample/tktree.tcl
+++ /dev/null
@@ -1,305 +0,0 @@
-#
-#  This Tcl/Tk script is quoted from <http://wiki.tcl.tk/10615>.
-#
- package require Tk
-  namespace eval ::tktree {
-
-    # Images used for open and close state of subgroups
-    set ::tktree::imgcollapse [image create photo .tktreeopenbm -data {
-      R0lGODdhCQAJAIAAAAEBAf///ywAAAAACQAJAAACEISPoRvG614D80x5ZXyogwIAOw==}]
-    set ::tktree::imgexpand [image create photo .tktreeclosebm -data {
-      R0lGODdhCQAJAIAAAAEBAf///ywAAAAACQAJAAACEYSPoRu28KCSDSJLc44s3lMAADs=}]
-    ###Default images for groups and children
-    set ::tktree::imgsubgroups [image create photo .tktreeimgfolder -data {
-                R0lGODlhEAANAKIAANnZ2Xh4eLi4uPj4APj4+AAAAP///////yH5BAEAAAAA
-                LAAAAAAQAA0AAANkCIChiqDLITgyEgi6GoIjIyMYugCBpMsaWBA0giMjIzgy
-                UYBBMjIoIyODEgVBODIygiMjE1gQJIMyMjIoI1GAQSMjODIyghMFQSgjI4My
-                MhJYEDSCIyMjODJRgKHLXAiApcsMmAA7}]
-    set ::tktree::imgchildren [image create photo .tktreeimgfile -data {
-                R0lGODlhDQAQAKIAANnZ2Xh4ePj4+Li4uAAAAP///////////yH5BAEAAAAA
-                LAAAAAANABAAAANSGLoLgACBoqsRCBAoujqCASGDojtESCEihCREIjgUKLo8
-                hCGCpCsySIGiy0MYIki6IoMUKLo8hCGCpCsySIGiy0MYKLo8hIGiy0MYOLo8
-                SLrMCQA7}]
-
-    #### Swtich all subgroups of a layer to open or close
-    proc ::tktree::switchlayer {win opn {layer /}} {
-      variable cfg
-      foreach child $cfg($win,$layer:subgroups) {
-        set cfg($win,$child:open) $opn
-        switchlayer $win $opn $child
-      }
-      buildwhenidle $win
-    }
-
-    ####  will open or close the item given
-    proc ::tktree::switchstate {win item} {
-      set ::tktree::cfg($win,$item:open) [expr ! $::tktree::cfg($win,$item:open)]
-      buildwhenidle $win
-    }
-
-    #### Select the next item up or down
-    proc ::tktree::updown {win down} {
-      variable cfg
-      set index [lsearch -exact $cfg($win,sortlist) $cfg($win,selection)]
-      if {$down} {incr index} {incr index -1}
-      if {$index < 0} {set index end} elseif {$index >= [llength $cfg($win,sortlist)]} {set index 0}
-      setselection $win [lindex $cfg($win,sortlist) $index]
-    }
-
-    #### left-right button binding commands
-    proc ::tktree::leftright {win right} {
-      variable cfg
-      set item $cfg($win,selection)
-      set index [lsearch -exact $cfg($win,sortlist) $item]
-      set parentindex [lsearch -exact $cfg($win,sortlist) [file dirname $item]]
-      if {$parentindex == -1} {set parentindex [expr $index - 1]}
-      if {$cfg($win,$item:group)} {
-        if {$right} {
-          if {$cfg($win,$item:open)} {incr index} {set cfg($win,$item:open) 1}
-        } else {
-          if {$cfg($win,$item:open)} {set cfg($win,$item:open) 0} {set index $parentindex}
-        }
-      } else {
-        if {$right} {incr index} {set index $parentindex}
-      }
-      if {$index < 0} {set index end} elseif {$index >= [llength $cfg($win,sortlist)]} {set index 0}
-      setselection $win [lindex $cfg($win,sortlist) $index]
-      buildwhenidle $win
-    }
-
-    #### will return the pathname of the item at x and y cooridinates
-    proc ::tktree::labelat {win x y} {
-      set x [$win canvasx $x]; set y [$win canvasy $y]
-      foreach m [$win find overlapping $x $y $x $y] {
-        if {[info exists ::tktree::cfg($win,tag:$m)]} {return $::tktree::cfg($win,tag:$m)}
-      }
-      return ""
-    }
-
-    #### will return the path of the current selection in the given tree widget
-    proc ::tktree::getselection {win} {
-      return $::tktree::cfg($win,selection)
-    }
-
-    #### adjust the scrollview to show the selected item as needed
-    proc ::tktree::scrolladjust {win tag} {
-      update
-      set item [$win bbox $tag]
-      set region [$win cget -scrollregion]
-      foreach {axis idx1 idx2} {yview 1 3 xview 0 2} {
-        set range [expr abs([lindex $region $idx2]) - abs([lindex $region $idx1])]
-        set itemtop [lindex $item $idx1];  set itembot [lindex $item $idx2]
-        set viewtop [expr $range * [lindex [$win $axis] 0]]
-        set viewbot [expr $range * [lindex [$win $axis] 1]]
-        if {$itembot > $viewbot} {$win $axis moveto [expr ($itembot. - $viewbot + $viewtop) / $range]}
-        if {$itemtop < $viewtop} {$win $axis moveto [expr $itemtop. / $range]}
-      }
-    }
-
-    #### will set the current selection to the given item on the given tree
-    proc ::tktree::setselection {win item} {
-      variable cfg
-      if {![llength $cfg($win,sortlist)]} {return}
-      if {$item eq ""} {set item [lindex $cfg($win,sortlist) 0]}
-      if {![info exists cfg($win,$item:tag)]} {set item [lindex $cfg($win,sortlist) 0]}
-      if {[$win gettags $cfg($win,$item:tag)] ne ""} {
-        $win select from $cfg($win,$item:tag) 0
-        $win select to $cfg($win,$item:tag) end
-        set cfg($win,selection) $item
-        scrolladjust $win $cfg($win,$item:tag)
-      } {
-        setselection $win "/[lindex $cfg($win,/:sortlist) 0]"
-      }
-    }
-
-    #### will delete the item given from the tree given
-    proc ::tktree::delitem {win item} {
-      variable cfg
-      if {$item eq "/"} {
-        array unset cfg $win,* ; catch {destroy $win}
-      } {
-        set group [file dirname $item]
-        if {$cfg($win,$item:group)} {set type subgroups} {set type children}
-        set index [lsearch -exact $cfg($win,$group:$type) $item]
-        set cfg($win,$group:$type) [lreplace $cfg($win,$group:$type) $index $index]
-        array unset cfg $win,$item*
-        buildwhenidle $win
-      }
-    }
-
-    #### create a new item in the tree and rebuild the widget
-    proc ::tktree::newitem {win item args} {
-      variable cfg
-      if {[string index $item 0] ne "/"} {set item /$item}
-      if {[string index $item end] eq "/"} {
-        set subgroup 1
-        set type subgroups
-        set item [string range $item 0 end-1]
-        set cfg($win,$item:command) [list ::tktree::switchstate $win $item]
-      } {
-        set subgroup 0
-        set type children
-        set cfg($win,$item:command) {}
-      }
-      #Build parent group if needed
-      set group [file dirname $item]
-      if {![info exists cfg($win,$group:open)]} {newitem $win "$group\/"}
-      lappend cfg($win,$group:$type) $item
-      #Configure the new item
-      set cfg($win,$item:group) $subgroup
-      set cfg($win,$item:subgroups) {}
-      set cfg($win,$item:children) {}
-      set cfg($win,$item:sortlist) {}
-      set cfg($win,$item:tags) {}
-      set cfg($win,$item:open) 0
-      set cfg($win,$item:image) {}
-      set cfg($win,$item:textcolor) $cfg($win,textcolor)
-      set cfg($win,$item:font) $cfg($win,font)
-      if {$cfg($win,images)} {set cfg($win,$item:image) [eval list \$::tktree::img$type]}
-      foreach {confitem confval} $args {
-        switch -exact -- $confitem {
-          -textcolor  {set cfg($win,$item:textcolor) $confval}
-          -command    {set cfg($win,$item:command)   $confval}
-          -image      {set cfg($win,$item:image)     $confval}
-          -font       {set cfg($win,$item:font)      $confval}
-        }
-      }
-      buildwhenidle $win
-    }
-
-    #### Draw the given layer of the tree on the canvas starting at xposition
-    proc ::tktree::buildlayer {win layer xpos} {
-      variable cfg
-      #Record y positions for vertical line later on
-      set ystart $cfg($win,y); set yend $cfg($win,y)
-      if {$layer eq "/"} {set cfg($win,sortlist) ""}
-      foreach child $cfg($win,$layer:sortlist) {
-        lappend cfg($win,sortlist) $child
-        #Check spacing required for images
-        set imgwidth 0; set imgheight 0
-        if {[string length $cfg($win,$child:image)]} {
-          set imgwidth [expr  ([image width $cfg($win,$child:image)] + 2) / 2]
-          set imgheight [expr ([image height $cfg($win,$child:image)] + 2) / 2]
-        }
-        #find X-axis points for image, horiz line, and text
-        if {$imgwidth} {
-          set centerX [expr $imgwidth + $xpos + 7]
-          set rightX  [expr $xpos + 7]
-          set textX   [expr ($imgwidth * 2) + $xpos + 10]
-        } {
-          set centerX [expr $xpos + 10]
-          set rightX  [expr $centerX + 4]
-          set textX   [expr $rightX + 1]
-        }
-        #Find the proper amount to increment the y axis
-        set fontheight [lindex [font metrics $cfg($win,$child:font)] 5]
-        set yincr [expr ($fontheight + 1) / 2]
-        if {$imgheight > $yincr} {set yincr $imgheight}
-        incr cfg($win,y) $yincr
-        #Draw the horizonal line
-        $win create line $xpos $cfg($win,y) $rightX $cfg($win,y) -fill $cfg($win,linecolor)
-        set yend $cfg($win,y)
-        #Draw the image, if it exists
-        if {$imgwidth} {
-          set it [$win create image $centerX $cfg($win,y) -image $cfg($win,$child:image)]
-          $win bind $it <1> [list ::tktree::setselection $win $child]
-        }
-        #Draw text and store tags for reference
-        set cfg($win,$child:tag) [$win create text $textX $cfg($win,y) \
-            -text [file tail $child] -font $cfg($win,$child:font) -anchor w -tags x -fill $cfg($win,$child:textcolor)]
-        set cfg($win,tag:$cfg($win,$child:tag)) $child
-        #Command binding
-        $win bind $cfg($win,$child:tag) <1> [list ::tktree::setselection $win $child]
-        $win bind $cfg($win,$child:tag) <Double-1> $cfg($win,$child:command)
-        #next step up on the y axis
-        incr cfg($win,y) $yincr
-        #If its a group, add open-close functionality
-        if {$cfg($win,$child:group)} {
-          if {$cfg($win,$child:open)} {set img collapse} {set img expand}
-          set ocimg [$win create image $xpos [expr $cfg($win,y) - $yincr] -image [eval list \$::tktree::img$img]]
-          $win bind $ocimg <1> [list ::tktree::switchstate $win $child]
-          if {$cfg($win,$child:open)} {buildlayer $win $child $centerX}
-        }
-      }
-      #Vertical line
-      $win lower [$win create line $xpos [expr $ystart - 7] $xpos $yend -fill $cfg($win,linecolor)]
-    }
-
-    #### sort the layer by subgroups then children
-    proc ::tktree::sortlayer {win {layer /}} {
-      variable cfg
-      set cfg($win,$layer:subgroups) [lsort -dictionary $cfg($win,$layer:subgroups)]
-      set cfg($win,$layer:children) [lsort -dictionary $cfg($win,$layer:children)]
-      set cfg($win,$layer:sortlist) [join [list $cfg($win,$layer:subgroups) $cfg($win,$layer:children)]]
-      foreach group $cfg($win,$layer:subgroups) {sortlayer $win $group}
-    }
-
-    #### build the tree at the given path
-    proc ::tktree::buildtree {win} {
-      variable cfg
-      $win delete all
-      sortlayer $win
-      set xpos 5
-      set cfg($win,y) 5
-      #Draw global expand/contract button, if needed
-      if {[string length $cfg($win,/:subgroups)] && $cfg($win,expandall)} {
-        set exp 0
-        foreach subgroup $cfg($win,/:subgroups) {incr exp $cfg($win,$subgroup:open)}
-        if {$exp} {set type collapse} {set type expand}
-        set ocimg [$win create image 1 1 -image [eval list \$::tktree::img$type] -anchor w]
-        $win bind $ocimg <1> [list ::tktree::switchlayer $win [expr ! $exp]]
-      }
-      #Build the layers and set initial selection
-      buildlayer $win / $xpos
-      $win config -scrollregion [$win bbox all]
-      setselection $win $cfg($win,selection)
-    }
-
-    #### internal use - set up a handle to build the tree when everything is idle
-    proc ::tktree::buildwhenidle {win} {
-      catch {after cancel $::tktree::cfg($win,buildHandle)}
-      set ::tktree::cfg($win,buildHandle) [after idle [list ::tktree::buildtree $win]]
-    }
-
-    #### will create a new tree widget at the given path
-    proc ::tktree::treecreate {win args} {
-      variable cfg
-      #Default configuration for new tree
-      set cfg($win,selection) {}
-      set cfg($win,selidx) {}
-      set cfg($win,/:subgroups) {}
-      set cfg($win,/:children) {}
-      set cfg($win,/:open) 1
-      set cfg($win,images) 1
-      set cfg($win,expandall) 1
-      set cfg($win,linecolor)  black
-      set cfg($win,textcolor)  black
-      set cfg($win,font) {-family Helvetica -size 10}
-      #Parse and setup custom configuration options
-      set canvascfg ""
-      foreach {item val} $args {
-        switch -- $item {
-          -linecolor            {set cfg($win,linecolor) $val}
-          -textcolor            {set cfg($win,textcolor) $val}
-          -font                 {set cfg($win,font) $val}
-          -images               {set cfg($win,images) $val}
-          -expandall            {set cfg($win,expandall) $val}
-          default               {lappend canvascfg $item $val}
-        }
-      }
-      #Build the canvas
-      eval {canvas $win -takefocus 1} $canvascfg
-      bind $win <Destroy> [list ::tktree::delitem $win /]
-      bind $win <1>  [list focus $win]
-      bind $win <Return> {eval $::tktree::cfg(%W,[::tktree::getselection %W]:command)}
-      bind $win <space> {eval $::tktree::cfg(%W,[::tktree::getselection %W]:command)}
-      bind $win <Up>    [list ::tktree::updown $win 0]
-      bind $win <Down>    [list ::tktree::updown $win 1]
-      bind $win <Left>    [list ::tktree::leftright $win 0]
-      bind $win <Right>    [list ::tktree::leftright $win 1]
-
-      #Build the tree when idle
-      buildwhenidle $win
-    }
- }
-
diff --git a/ext/tk/sample/ttk_wrapper.rb b/ext/tk/sample/ttk_wrapper.rb
deleted file mode 100644
index 1706c867d2..0000000000
--- a/ext/tk/sample/ttk_wrapper.rb
+++ /dev/null
@@ -1,155 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: false
-#
-#  ttk_wrapper.rb  --  use Ttk widgets as default on old Ruby/Tk scripts
-#
-#                       by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
-#
-version = '0.1.3'
-#
-##########################################################################
-#  parse commandline arguments
-##########################################################################
-require 'optparse'
-opt = OptionParser.new("Usage: #{$0} [options] rubytk_script" << "\n    " <<
-                         "Ruby/Tk script wrapper. Use Ttk widgets as default.")
-opt.version = version
-
-OPTS = {}
-OPTS[:themedir] = []
-OPTS[:rb_theme] = []
-OPTS[:theme] = 'default'
-
-opt.on('-l', '--list', 'list available theme names'){|v| OPTS[:list] = true}
-opt.on('-t', '--theme theme', 'theme name'){|v| OPTS[:theme] = v}
-opt.on('-d', '--themedir themes_dir', 'directory of theme definitions'){|v|
-  OPTS[:themedir] << v
-}
-opt.on('-r', '--rubytheme rb_theme', 'theme definition file (ruby script)'){|v|
-  OPTS[:rb_theme] << v
-}
-opt.on('-v', '--verbose', 'print verbose messages'){|v| OPTS[:verbose] = true}
-
-opt.parse!(ARGV)
-
-
-##########################################################################
-#  load Ttk (Tile) extension
-##########################################################################
-require 'tk'
-
-begin
-  require 'tkextlib/tile'
-  Tk.default_widget_set = :Ttk
-rescue LoadError
-  if OPTS[:verbose]
-    print "warning: fail to load 'Ttk' extension. use standard widgets.\n"
-  end
-end
-
-if OPTS[:verbose]
-  print "current default widget set is '#{Tk.default_widget_set}'\n"
-end
-
-
-##########################################################################
-# define Tcl/Tk procedures for compatibility.
-# those are required when want to use themes included
-# in "sample/tkextlib/tile/demo.rb".
-##########################################################################
-Tk::Tile.__define_LoadImages_proc_for_compatibility__!
-Tk::Tile::Style.__define_wrapper_proc_for_compatibility__!
-
-
-##########################################################################
-#  use themes defined on the demo of Ttk (Tile) extension
-##########################################################################
-demodir = File.dirname(__FILE__)
-demo_themesdir = File.expand_path(File.join(demodir, 'tkextlib', 'tile', 'themes'))
-
-Tk::AUTO_PATH.lappend(*OPTS[:themedir]) unless OPTS[:themedir].empty?
-Tk::AUTO_PATH.lappend('.', demodir, demo_themesdir)
-
-OPTS[:themedir] << demo_themesdir
-print "theme-dirs: #{OPTS[:themedir].inspect}\n" if OPTS[:verbose]
-
-OPTS[:themedir].each{|themesdir|
-  if File.directory?(themesdir)
-    Dir.foreach(themesdir){|name|
-      next if name == '.' || name == '..'
-      path = File.join(themesdir, name)
-      Tk::AUTO_PATH.lappend(path) if File.directory?(path)
-    }
-  end
-}
-
-# This forces an update of the available packages list. It's required
-# for package names to find the themes in demos/themes/*.tcl
-Tk.ip_eval("#{TkPackage.unknown_proc}  Tcl #{TkPackage.provide('Tcl')}")
-
-# load themes written in Ruby.
-themes_by_ruby = [File.join(demo_themesdir, 'kroc.rb')]
-themes_by_ruby.concat OPTS[:rb_theme]
-print "ruby-themes: #{themes_by_ruby.inspect}\n" if OPTS[:verbose]
-
-themes_by_ruby.each{|f|
-  begin
-    load(f, true)
-  rescue LoadError
-    print "fail to load \"#{f}\"\n" if OPTS[:verbose]
-  end
-}
-
-
-##########################################################################
-# ignore unsupported options of Ttk widgets
-##########################################################################
-TkConfigMethod.__set_IGNORE_UNKNOWN_CONFIGURE_OPTION__! true
-TkItemConfigMethod.__set_IGNORE_UNKNOWN_CONFIGURE_OPTION__! true
-
-
-##########################################################################
-#  set theme of widget style
-##########################################################################
-if OPTS[:list] || OPTS[:verbose]
-  print "supported theme names: #{Tk::Tile.themes.inspect}\n"
-  exit if OPTS[:list] && ARGV.empty?
-end
-print "use theme: \"#{OPTS[:theme]}\"\n" if OPTS[:theme] && OPTS[:verbose]
-#setTheme(OPTS[:theme]) if OPTS[:theme]
-Tk::Tile.set_theme(OPTS[:theme]) if OPTS[:theme]
-
-
-##########################################################################
-#  replace $0 and $PROGRAM_NAME
-##########################################################################
-#  When the expand_path of the target script is long, ruby sometimes
-#  fails to set the path to $0 (the path string is trimmed).
-#  The following replaces $0 and $PROGNAME to avoid such trouble.
-progname_obj = $0.dup
-$program_name = progname_obj
-
-alias $REAL_PROGRAM_NAME $0
-alias $PROGRAM_NAME $program_name
-alias $0 $program_name
-
-trace_var(:$program_name){|val|
-  unless progname_obj.object_id == val.object_id
-    progname_obj.replace(val.to_s)
-    $program_name = progname_obj
-  end
-}
-
-
-##########################################################################
-#  load script
-##########################################################################
-if (path = ARGV.shift) && (script = File.expand_path(path))
-  print "load script \"#{script}\"\n" if OPTS[:verbose]
-  $0 = script
-  load(script)
-else
-  print "Error: no script is given.\n"
-  print opt.help
-  exit(1)
-end
diff --git a/ext/tk/stubs.c b/ext/tk/stubs.c
deleted file mode 100644
index 89da88aea4..0000000000
--- a/ext/tk/stubs.c
+++ /dev/null
@@ -1,592 +0,0 @@
-/************************************************
-
-  stubs.c - Tcl/Tk stubs support
-
-************************************************/
-
-#include "ruby.h"
-#include "stubs.h"
-
-#if !defined(RSTRING_PTR)
-#define RSTRING_PTR(s) (RSTRING(s)->ptr)
-#define RSTRING_LEN(s) (RSTRING(s)->len)
-#endif
-
-#include <tcl.h>
-#include <tk.h>
-
-/*------------------------------*/
-
-#ifdef __MACOS__
-# include <tkMac.h>
-# include <Quickdraw.h>
-
-static int call_macinit = 0;
-
-static void
-_macinit(void)
-{
-    if (!call_macinit) {
-        tcl_macQdPtr = &qd; /* setup QuickDraw globals */
-        Tcl_MacSetEventProc(TkMacConvertEvent); /* setup event handler */
-        call_macinit = 1;
-    }
-}
-#endif
-
-/*------------------------------*/
-
-static int nativethread_checked = 0;
-
-static void
-_nativethread_consistency_check(ip)
-    Tcl_Interp *ip;
-{
-    if (nativethread_checked || ip == (Tcl_Interp *)NULL) {
-        return;
-    }
-
-    /* If the variable "tcl_platform(threaded)" exists,
-       then the Tcl interpreter was compiled with threads enabled. */
-    if (Tcl_GetVar2(ip, "tcl_platform", "threaded", TCL_GLOBAL_ONLY) != (char*)NULL) {
-#ifdef HAVE_NATIVETHREAD
-        /* consistent */
-#else
-        rb_warn("Inconsistency. Loaded Tcl/Tk libraries are enabled nativethread-support. But `tcltklib' is not. The inconsistency causes SEGV or other troubles frequently.");
-#endif
-    } else {
-#ifdef HAVE_NATIVETHREAD
-        rb_warning("Inconsistency.`tcltklib' is enabled nativethread-support. But loaded Tcl/Tk libraries are not. (Probably, the inconsistency doesn't cause any troubles.)");
-#else
-        /* consistent */
-#endif
-    }
-
-    Tcl_ResetResult(ip);
-
-    nativethread_checked = 1;
-}
-
-/*------------------------------*/
-
-#if defined USE_TCL_STUBS && defined USE_TK_STUBS
-
-#if defined _WIN32 || defined __CYGWIN__
-#  ifdef HAVE_RUBY_RUBY_H
-#    include "ruby/util.h"
-#  else
-#    include "util.h"
-#  endif
-# include <windows.h>
-  typedef HINSTANCE DL_HANDLE;
-# define DL_OPEN LoadLibrary
-# define DL_SYM GetProcAddress
-# define TCL_INDEX 4
-# define TK_INDEX 3
-# define TCL_NAME "tcl89"
-# define TK_NAME "tk89"
-# undef DLEXT
-# define DLEXT ".dll"
-#elif defined HAVE_DLOPEN
-# include <dlfcn.h>
-  typedef void *DL_HANDLE;
-# define DL_OPEN(file) dlopen(file, RTLD_LAZY|RTLD_GLOBAL)
-# define DL_SYM dlsym
-# define TCL_INDEX 8
-# define TK_INDEX 7
-# define TCL_NAME "libtcl8.9"
-# define TK_NAME "libtk8.9"
-# ifdef __APPLE__
-#  undef DLEXT
-#  define DLEXT ".dylib"
-# endif
-#endif
-
-static DL_HANDLE tcl_dll = (DL_HANDLE)0;
-static DL_HANDLE tk_dll  = (DL_HANDLE)0;
-
-int
-#ifdef HAVE_PROTOTYPES
-ruby_open_tcl_dll(char *appname)
-#else
-ruby_open_tcl_dll(appname)
-    char *appname;
-#endif
-{
-    void (*p_Tcl_FindExecutable)(const char *);
-    int n;
-    char *ruby_tcl_dll = 0;
-
-    if (tcl_dll) return TCLTK_STUBS_OK;
-
-    ruby_tcl_dll = getenv("RUBY_TCL_DLL");
-#if defined _WIN32
-    if (ruby_tcl_dll) ruby_tcl_dll = ruby_strdup(ruby_tcl_dll);
-#endif
-    if (ruby_tcl_dll) {
-        tcl_dll = (DL_HANDLE)DL_OPEN(ruby_tcl_dll);
-    } else {
-	char tcl_name[] = TCL_NAME DLEXT;
-        /* examine from 8.9 to 8.1 */
-        for (n = '9'; n > '0'; n--) {
-            tcl_name[TCL_INDEX] = n;
-            tcl_dll = (DL_HANDLE)DL_OPEN(tcl_name);
-            if (tcl_dll)
-                break;
-        }
-    }
-
-#if defined _WIN32
-    if (ruby_tcl_dll) ruby_xfree(ruby_tcl_dll);
-#endif
-
-    if (!tcl_dll)
-        return NO_TCL_DLL;
-
-    p_Tcl_FindExecutable = (void (*)(const char *))DL_SYM(tcl_dll, "Tcl_FindExecutable");
-    if (!p_Tcl_FindExecutable)
-        return NO_FindExecutable;
-
-    if (appname) {
-        p_Tcl_FindExecutable(appname);
-    } else {
-        p_Tcl_FindExecutable("ruby");
-    }
-
-    return TCLTK_STUBS_OK;
-}
-
-int
-ruby_open_tk_dll(void)
-{
-    int n;
-    char *ruby_tk_dll = 0;
-
-    if (!tcl_dll) {
-        /* int ret = ruby_open_tcl_dll(RSTRING_PTR(rb_argv0)); */
-        int ret = ruby_open_tcl_dll(rb_argv0 ? RSTRING_PTR(rb_argv0) : 0);
-        if (ret != TCLTK_STUBS_OK) return ret;
-    }
-
-    if (tk_dll) return TCLTK_STUBS_OK;
-
-    ruby_tk_dll = getenv("RUBY_TK_DLL");
-    if (ruby_tk_dll) {
-        tk_dll = (DL_HANDLE)DL_OPEN(ruby_tk_dll);
-    } else {
-	char tk_name[] = TK_NAME DLEXT;
-        /* examine from 8.9 to 8.1 */
-        for (n = '9'; n > '0'; n--) {
-            tk_name[TK_INDEX] = n;
-            tk_dll = (DL_HANDLE)DL_OPEN(tk_name);
-            if (tk_dll)
-                break;
-        }
-    }
-
-    if (!tk_dll)
-        return NO_TK_DLL;
-
-    return TCLTK_STUBS_OK;
-}
-
-int
-#ifdef HAVE_PROTOTYPES
-ruby_open_tcltk_dll(char *appname)
-#else
-ruby_open_tcltk_dll(appname)
-    char *appname;
-#endif
-{
-    return( ruby_open_tcl_dll(appname) || ruby_open_tk_dll() );
-}
-
-int
-tcl_stubs_init_p(void)
-{
-    return(tclStubsPtr != (TclStubs*)NULL);
-}
-
-int
-tk_stubs_init_p(void)
-{
-    return(tkStubsPtr != (TkStubs*)NULL);
-}
-
-
-Tcl_Interp *
-#ifdef HAVE_PROTOTYPES
-ruby_tcl_create_ip_and_stubs_init(int *st)
-#else
-ruby_tcl_create_ip_and_stubs_init(st)
-    int *st;
-#endif
-{
-    Tcl_Interp *tcl_ip;
-
-    if (st) *st = 0;
-
-    if (tcl_stubs_init_p()) {
-        tcl_ip = Tcl_CreateInterp();
-
-        if (!tcl_ip) {
-            if (st) *st = FAIL_CreateInterp;
-            return (Tcl_Interp*)NULL;
-        }
-
-        _nativethread_consistency_check(tcl_ip);
-
-        return tcl_ip;
-
-    } else {
-        Tcl_Interp *(*p_Tcl_CreateInterp)();
-        Tcl_Interp *(*p_Tcl_DeleteInterp)();
-
-        if (!tcl_dll) {
-            /* int ret = ruby_open_tcl_dll(RSTRING_PTR(rb_argv0)); */
-            int ret = ruby_open_tcl_dll(rb_argv0 ? RSTRING_PTR(rb_argv0) : 0);
-
-            if (ret != TCLTK_STUBS_OK) {
-                if (st) *st = ret;
-                return (Tcl_Interp*)NULL;
-            }
-        }
-
-        p_Tcl_CreateInterp
-            = (Tcl_Interp *(*)())DL_SYM(tcl_dll, "Tcl_CreateInterp");
-        if (!p_Tcl_CreateInterp) {
-            if (st) *st = NO_CreateInterp;
-            return (Tcl_Interp*)NULL;
-        }
-
-        p_Tcl_DeleteInterp
-            = (Tcl_Interp *(*)())DL_SYM(tcl_dll, "Tcl_DeleteInterp");
-        if (!p_Tcl_DeleteInterp) {
-            if (st) *st = NO_DeleteInterp;
-            return (Tcl_Interp*)NULL;
-        }
-
-        tcl_ip = (*p_Tcl_CreateInterp)();
-        if (!tcl_ip) {
-            if (st) *st = FAIL_CreateInterp;
-            return (Tcl_Interp*)NULL;
-        }
-
-        if (!Tcl_InitStubs(tcl_ip, "8.1", 0)) {
-            if (st) *st = FAIL_Tcl_InitStubs;
-            (*p_Tcl_DeleteInterp)(tcl_ip);
-            return (Tcl_Interp*)NULL;
-        }
-
-        _nativethread_consistency_check(tcl_ip);
-
-        return tcl_ip;
-    }
-}
-
-int
-ruby_tcl_stubs_init(void)
-{
-    int st;
-    Tcl_Interp *tcl_ip;
-
-    if (!tcl_stubs_init_p()) {
-        tcl_ip = ruby_tcl_create_ip_and_stubs_init(&st);
-
-        if (!tcl_ip) return st;
-
-        Tcl_DeleteInterp(tcl_ip);
-    }
-
-    return TCLTK_STUBS_OK;
-}
-
-int
-#ifdef HAVE_PROTOTYPES
-ruby_tk_stubs_init(Tcl_Interp *tcl_ip)
-#else
-ruby_tk_stubs_init(tcl_ip)
-    Tcl_Interp *tcl_ip;
-#endif
-{
-    Tcl_ResetResult(tcl_ip);
-
-    if (tk_stubs_init_p()) {
-        if (Tk_Init(tcl_ip) == TCL_ERROR) {
-            return FAIL_Tk_Init;
-        }
-    } else {
-        int (*p_Tk_Init)(Tcl_Interp *);
-
-        if (!tk_dll) {
-            int ret = ruby_open_tk_dll();
-            if (ret != TCLTK_STUBS_OK) return ret;
-        }
-
-        p_Tk_Init = (int (*)(Tcl_Interp *))DL_SYM(tk_dll, "Tk_Init");
-        if (!p_Tk_Init)
-            return NO_Tk_Init;
-
-#if defined USE_TK_STUBS && defined TK_FRAMEWORK && defined(__APPLE__)
-	/*
-	  FIX ME : dirty hack for Mac OS X frameworks.
-	  With stubs, fails to find Resource/Script directory of Tk.framework.
-	  So, teach it to a Tcl interpreter by an environment variable.
-	  e.g. when $tcl_library ==
-	               /Library/Frameworks/Tcl.framwwork/8.5/Resources/Scripts
-		   ==> /Library/Frameworks/Tk.framwwork/8.5/Resources/Scripts
-	*/
-	if (Tcl_Eval(tcl_ip,
-		     "if {[array get env TK_LIBRARY] == {}} { set env(TK_LIBRARY) [regsub -all -nocase {(t)cl} $tcl_library  {\\1k}] }"
-		     ) != TCL_OK) {
-	  return FAIL_Tk_Init;
-	}
-#endif
-
-        if ((*p_Tk_Init)(tcl_ip) == TCL_ERROR)
-            return FAIL_Tk_Init;
-
-        if (!Tk_InitStubs(tcl_ip, (char *)"8.1", 0))
-            return FAIL_Tk_InitStubs;
-
-#ifdef __MACOS__
-        _macinit();
-#endif
-    }
-
-    return TCLTK_STUBS_OK;
-}
-
-int
-#ifdef HAVE_PROTOTYPES
-ruby_tk_stubs_safeinit(Tcl_Interp *tcl_ip)
-#else
-ruby_tk_stubs_safeinit(tcl_ip)
-    Tcl_Interp *tcl_ip;
-#endif
-{
-    Tcl_ResetResult(tcl_ip);
-
-    if (tk_stubs_init_p()) {
-        if (Tk_SafeInit(tcl_ip) == TCL_ERROR)
-            return FAIL_Tk_Init;
-    } else {
-        int (*p_Tk_SafeInit)(Tcl_Interp *);
-
-        if (!tk_dll) {
-            int ret = ruby_open_tk_dll();
-            if (ret != TCLTK_STUBS_OK) return ret;
-        }
-
-        p_Tk_SafeInit = (int (*)(Tcl_Interp *))DL_SYM(tk_dll, "Tk_SafeInit");
-        if (!p_Tk_SafeInit)
-            return NO_Tk_Init;
-
-        if ((*p_Tk_SafeInit)(tcl_ip) == TCL_ERROR)
-            return FAIL_Tk_Init;
-
-        if (!Tk_InitStubs(tcl_ip, (char *)"8.1", 0))
-            return FAIL_Tk_InitStubs;
-
-#ifdef __MACOS__
-        _macinit();
-#endif
-    }
-
-    return TCLTK_STUBS_OK;
-}
-
-int
-ruby_tcltk_stubs(void)
-{
-    int st;
-    Tcl_Interp *tcl_ip;
-
-    /* st = ruby_open_tcltk_dll(RSTRING_PTR(rb_argv0)); */
-    st = ruby_open_tcltk_dll(rb_argv0 ? RSTRING_PTR(rb_argv0) : 0);
-    switch(st) {
-    case NO_FindExecutable:
-        return -7;
-    case NO_TCL_DLL:
-    case NO_TK_DLL:
-        return -1;
-    }
-
-    tcl_ip = ruby_tcl_create_ip_and_stubs_init(&st);
-    if (!tcl_ip) {
-        switch(st) {
-        case NO_CreateInterp:
-        case NO_DeleteInterp:
-            return -2;
-        case FAIL_CreateInterp:
-            return -3;
-        case FAIL_Tcl_InitStubs:
-            return -5;
-        }
-    }
-
-    st = ruby_tk_stubs_init(tcl_ip);
-    switch(st) {
-    case NO_Tk_Init:
-        Tcl_DeleteInterp(tcl_ip);
-        return -4;
-    case FAIL_Tk_Init:
-    case FAIL_Tk_InitStubs:
-        Tcl_DeleteInterp(tcl_ip);
-        return -6;
-    }
-
-    Tcl_DeleteInterp(tcl_ip);
-
-    return 0;
-}
-
-/*###################################################*/
-#else /* ! USE_TCL_STUBS || ! USE_TK_STUBS) */
-/*###################################################*/
-
-static int open_tcl_dll = 0;
-static int call_tk_stubs_init = 0;
-
-int
-#ifdef HAVE_PROTOTYPES
-ruby_open_tcl_dll(char *appname)
-#else
-ruby_open_tcl_dll(appname)
-    char *appname;
-#endif
-{
-    if (appname) {
-        Tcl_FindExecutable(appname);
-    } else {
-        Tcl_FindExecutable("ruby");
-    }
-    open_tcl_dll = 1;
-
-    return TCLTK_STUBS_OK;
-}
-
-int
-ruby_open_tk_dll(void)
-{
-    if (!open_tcl_dll) {
-        /* ruby_open_tcl_dll(RSTRING_PTR(rb_argv0)); */
-        ruby_open_tcl_dll(rb_argv0 ? RSTRING_PTR(rb_argv0) : 0);
-    }
-
-    return TCLTK_STUBS_OK;
-}
-
-int
-#ifdef HAVE_PROTOTYPES
-ruby_open_tcltk_dll(char *appname)
-#else
-ruby_open_tcltk_dll(appname)
-    char *appname;
-#endif
-{
-    return( ruby_open_tcl_dll(appname) || ruby_open_tk_dll() );
-}
-
-int
-tcl_stubs_init_p(void)
-{
-    return 1;
-}
-
-int
-tk_stubs_init_p(void)
-{
-    return call_tk_stubs_init;
-}
-
-Tcl_Interp *
-#ifdef HAVE_PROTOTYPES
-ruby_tcl_create_ip_and_stubs_init(int *st)
-#else
-ruby_tcl_create_ip_and_stubs_init(st)
-    int *st;
-#endif
-{
-    Tcl_Interp *tcl_ip;
-
-    if (!open_tcl_dll) {
-        /* ruby_open_tcl_dll(RSTRING_PTR(rb_argv0)); */
-        ruby_open_tcl_dll(rb_argv0 ? RSTRING_PTR(rb_argv0) : 0);
-    }
-
-    if (st) *st = 0;
-    tcl_ip = Tcl_CreateInterp();
-    if (!tcl_ip) {
-        if (st) *st = FAIL_CreateInterp;
-        return (Tcl_Interp*)NULL;
-    }
-
-    _nativethread_consistency_check(tcl_ip);
-
-    return tcl_ip;
-}
-
-int
-ruby_tcl_stubs_init(void)
-{
-    return TCLTK_STUBS_OK;
-}
-
-int
-#ifdef HAVE_PROTOTYPES
-ruby_tk_stubs_init(Tcl_Interp *tcl_ip)
-#else
-ruby_tk_stubs_init(tcl_ip)
-    Tcl_Interp *tcl_ip;
-#endif
-{
-    if (Tk_Init(tcl_ip) == TCL_ERROR)
-        return FAIL_Tk_Init;
-
-    if (!call_tk_stubs_init) {
-#ifdef __MACOS__
-        _macinit();
-#endif
-        call_tk_stubs_init = 1;
-    }
-
-    return TCLTK_STUBS_OK;
-}
-
-int
-#ifdef HAVE_PROTOTYPES
-ruby_tk_stubs_safeinit(Tcl_Interp *tcl_ip)
-#else
-ruby_tk_stubs_safeinit(tcl_ip)
-    Tcl_Interp *tcl_ip;
-#endif
-{
-#if TCL_MAJOR_VERSION >= 8
-    if (Tk_SafeInit(tcl_ip) == TCL_ERROR)
-        return FAIL_Tk_Init;
-
-    if (!call_tk_stubs_init) {
-#ifdef __MACOS__
-        _macinit();
-#endif
-        call_tk_stubs_init = 1;
-    }
-
-    return TCLTK_STUBS_OK;
-
-#else /* TCL_MAJOR_VERSION < 8 */
-
-    return FAIL_Tk_Init;
-#endif
-}
-
-int
-ruby_tcltk_stubs(void)
-{
-    /* Tcl_FindExecutable(RSTRING_PTR(rb_argv0)); */
-    Tcl_FindExecutable(rb_argv0 ? RSTRING_PTR(rb_argv0) : 0);
-    return 0;
-}
-
-#endif
diff --git a/ext/tk/stubs.h b/ext/tk/stubs.h
deleted file mode 100644
index b4a85dbd1f..0000000000
--- a/ext/tk/stubs.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <tcl.h>
-
-extern int ruby_open_tcl_dll(char *);
-extern int ruby_open_tk_dll(void);
-extern int ruby_open_tcltk_dll(char *);
-extern int tcl_stubs_init_p(void);
-extern int tk_stubs_init_p(void);
-extern Tcl_Interp *ruby_tcl_create_ip_and_stubs_init(int*);
-extern int ruby_tcl_stubs_init(void);
-extern int ruby_tk_stubs_init(Tcl_Interp*);
-extern int ruby_tk_stubs_safeinit(Tcl_Interp*);
-extern int ruby_tcltk_stubs(void);
-
-/* no error */
-#define TCLTK_STUBS_OK     (0)
-
-/* return value of ruby_open_tcl_dll() */
-#define NO_TCL_DLL         (1)
-#define NO_FindExecutable  (2)
-
-/* return value of ruby_open_tk_dll() */
-#define NO_TK_DLL         (-1)
-
-/* status value of ruby_tcl_create_ip_and_stubs_init(st) */
-#define NO_CreateInterp    (3)
-#define NO_DeleteInterp    (4)
-#define FAIL_CreateInterp  (5)
-#define FAIL_Tcl_InitStubs (6)
-
-/* return value of ruby_tk_stubs_init() */
-#define NO_Tk_Init         (7)
-#define FAIL_Tk_Init       (8)
-#define FAIL_Tk_InitStubs  (9)
diff --git a/ext/tk/tcltklib.c b/ext/tk/tcltklib.c
deleted file mode 100644
index 7b547b79d1..0000000000
--- a/ext/tk/tcltklib.c
+++ /dev/null
@@ -1,11079 +0,0 @@
-/*
- *      tcltklib.c
- *              Aug. 27, 1997   Y. Shigehiro
- *              Oct. 24, 1997   Y. Matsumoto
- */
-
-#define TCLTKLIB_RELEASE_DATE "2010-08-25"
-/* #define CREATE_RUBYTK_KIT */
-
-#include "ruby.h"
-
-#ifdef HAVE_RUBY_ENCODING_H
-#include "ruby/encoding.h"
-#endif
-#ifndef RUBY_VERSION
-#define RUBY_VERSION "(unknown version)"
-#endif
-#ifndef RUBY_RELEASE_DATE
-#define RUBY_RELEASE_DATE "unknown release-date"
-#endif
-
-#undef RUBY_UNTYPED_DATA_WARNING
-#define RUBY_UNTYPED_DATA_WARNING 0
-
-#ifdef HAVE_RB_THREAD_CHECK_TRAP_PENDING
-static int rb_thread_critical; /* dummy */
-int rb_thread_check_trap_pending(void);
-#else
-/* use rb_thread_critical on Ruby 1.8.x */
-#include "rubysig.h"
-#define rb_thread_check_trap_pending() (0+rb_trap_pending)
-#endif
-
-#if !defined(RSTRING_PTR)
-#define RSTRING_PTR(s) (RSTRING(s)->ptr)
-#define RSTRING_LEN(s) (RSTRING(s)->len)
-#endif
-#if !defined(RSTRING_LENINT)
-#define RSTRING_LENINT(s) ((int)RSTRING_LEN(s))
-#endif
-#if !defined(RARRAY_PTR)
-#define RARRAY_PTR(s) (RARRAY(s)->ptr)
-#define RARRAY_LEN(s) (RARRAY(s)->len)
-#endif
-#if !defined(RARRAY_CONST_PTR)
-#define RARRAY_CONST_PTR(s) (const VALUE *)RARRAY_PTR(s)
-#endif
-#if !defined(RARRAY_AREF)
-#define RARRAY_AREF(a, i) RARRAY_CONST_PTR(a)[i]
-#endif
-
-#ifdef OBJ_UNTRUST
-#define RbTk_OBJ_UNTRUST(x)  do {OBJ_TAINT(x); OBJ_UNTRUST(x);} while (0)
-#else
-#define RbTk_OBJ_UNTRUST(x)  OBJ_TAINT(x)
-#endif
-#define RbTk_ALLOC_N(type, n) (type *)ckalloc((int)(sizeof(type) * (n)))
-
-#if defined(HAVE_RB_PROC_NEW) && !defined(RUBY_VM)
-/* Ruby 1.8 :: rb_proc_new() was hidden from intern.h at 2008/04/22 */
-extern VALUE rb_proc_new _((VALUE (*)(ANYARGS/* VALUE yieldarg[, VALUE procarg] */), VALUE));
-#endif
-
-#undef EXTERN   /* avoid conflict with tcl.h of tcl8.2 or before */
-#include <stdio.h>
-#ifdef HAVE_STDARG_PROTOTYPES
-#include <stdarg.h>
-#define va_init_list(a,b) va_start(a,b)
-#else
-#include <varargs.h>
-#define va_init_list(a,b) va_start(a)
-#endif
-#include <string.h>
-
-#if !defined HAVE_VSNPRINTF && !defined vsnprintf
-#  ifdef WIN32
-     /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
-#    define vsnprintf _vsnprintf
-#  else
-#    ifdef HAVE_RUBY_RUBY_H
-#      include "ruby/missing.h"
-#    else
-#      include "missing.h"
-#    endif
-#  endif
-#endif
-
-#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 */
-#else
-VALUE rb_errinfo(void);
-#endif
-#ifndef HAVE_RB_SAFE_LEVEL
-#define rb_safe_level() (ruby_safe_level+0)
-#endif
-#ifndef HAVE_RB_SOURCEFILE
-#define rb_sourcefile() (ruby_sourcefile+0)
-#endif
-
-#include "stubs.h"
-
-#ifndef TCL_ALPHA_RELEASE
-#define TCL_ALPHA_RELEASE       0  /* "alpha" */
-#define TCL_BETA_RELEASE        1  /* "beta"  */
-#define TCL_FINAL_RELEASE       2  /* "final" */
-#endif
-
-static struct {
-  int major;
-  int minor;
-  int type;  /* ALPHA==0, BETA==1, FINAL==2 */
-  int patchlevel;
-} tcltk_version = {0, 0, 0, 0};
-
-static void
-set_tcltk_version(void)
-{
-    if (tcltk_version.major) return;
-
-    Tcl_GetVersion(&(tcltk_version.major),
-		   &(tcltk_version.minor),
-		   &(tcltk_version.patchlevel),
-		   &(tcltk_version.type));
-}
-
-#if TCL_MAJOR_VERSION >= 8
-# ifndef CONST84
-#  if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION <= 4 /* Tcl8.0.x -- 8.4b1 */
-#   define CONST84
-#  else /* unknown (maybe TCL_VERSION >= 8.5) */
-#   ifdef CONST
-#    define CONST84 CONST
-#   else
-#    define CONST84
-#   endif
-#  endif
-# endif
-#else  /* TCL_MAJOR_VERSION < 8 */
-# ifdef CONST
-#  define CONST84 CONST
-# else
-#  define CONST
-#  define CONST84
-# endif
-#endif
-
-#ifndef CONST86
-# if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION <= 5 /* Tcl8.0.x -- 8.5.x */
-#  define CONST86
-# else
-#  define CONST86 CONST84
-# endif
-#endif
-
-/* copied from eval.c */
-#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
-
-/* for ruby_debug */
-#define DUMP1(ARG1) if (ruby_debug) { fprintf(stderr, "tcltklib: %s\n", ARG1); fflush(stderr); }
-#define DUMP2(ARG1, ARG2) if (ruby_debug) { fprintf(stderr, "tcltklib: ");\
-fprintf(stderr, ARG1, ARG2); fprintf(stderr, "\n"); fflush(stderr); }
-#define DUMP3(ARG1, ARG2, ARG3) if (ruby_debug) { fprintf(stderr, "tcltklib: ");\
-fprintf(stderr, ARG1, ARG2, ARG3); fprintf(stderr, "\n"); fflush(stderr); }
-/*
-#define DUMP1(ARG1)
-#define DUMP2(ARG1, ARG2)
-#define DUMP3(ARG1, ARG2, ARG3)
-*/
-
-/* release date */
-static const char tcltklib_release_date[] = TCLTKLIB_RELEASE_DATE;
-
-/* finalize_proc_name */
-static const char finalize_hook_name[] = "INTERP_FINALIZE_HOOK";
-
-static void ip_finalize _((Tcl_Interp*));
-static void ip_free _((void *p));
-
-static int at_exit = 0;
-
-#ifdef HAVE_RUBY_ENCODING_H
-static VALUE cRubyEncoding;
-
-/* encoding */
-static int ENCODING_INDEX_UTF8;
-static int ENCODING_INDEX_BINARY;
-#endif
-static VALUE ENCODING_NAME_UTF8;
-static VALUE ENCODING_NAME_BINARY;
-
-static VALUE create_dummy_encoding_for_tk_core _((VALUE, VALUE, VALUE));
-static VALUE create_dummy_encoding_for_tk _((VALUE, VALUE));
-static int update_encoding_table _((VALUE, VALUE, VALUE));
-static VALUE encoding_table_get_name_core _((VALUE, VALUE, VALUE));
-static VALUE encoding_table_get_obj_core _((VALUE, VALUE, VALUE));
-static VALUE encoding_table_get_name _((VALUE, VALUE));
-static VALUE encoding_table_get_obj _((VALUE, VALUE));
-static VALUE create_encoding_table _((VALUE));
-static VALUE ip_get_encoding_table _((VALUE));
-
-
-/* for callback break & continue */
-static VALUE eTkCallbackReturn;
-static VALUE eTkCallbackBreak;
-static VALUE eTkCallbackContinue;
-
-static VALUE eLocalJumpError;
-
-static VALUE eTkLocalJumpError;
-static VALUE eTkCallbackRetry;
-static VALUE eTkCallbackRedo;
-static VALUE eTkCallbackThrow;
-
-static VALUE tcltkip_class;
-
-static ID ID_at_enc;
-static ID ID_at_interp;
-
-static ID ID_encoding_name;
-static ID ID_encoding_table;
-
-static ID ID_stop_p;
-static ID ID_alive_p;
-static ID ID_kill;
-static ID ID_join;
-static ID ID_value;
-
-static ID ID_call;
-static ID ID_backtrace;
-static ID ID_message;
-
-static ID ID_at_reason;
-static ID ID_return;
-static ID ID_break;
-static ID ID_next;
-
-static ID ID_to_s;
-static ID ID_inspect;
-
-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 CONST86 Tcl_ObjType *Tcl_ObjType_ByteArray;
-
-static const char Tcl_ObjTypeName_String[]    = "string";
-static CONST86 Tcl_ObjType *Tcl_ObjType_String;
-
-#if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 1)
-#define IS_TCL_BYTEARRAY(obj)    ((obj)->typePtr == Tcl_ObjType_ByteArray)
-#define IS_TCL_STRING(obj)       ((obj)->typePtr == Tcl_ObjType_String)
-#define IS_TCL_VALID_STRING(obj) ((obj)->bytes != (char*)NULL)
-#endif
-#endif
-
-#ifndef HAVE_RB_HASH_LOOKUP
-#define rb_hash_lookup rb_hash_aref
-#endif
-
-#ifndef HAVE_RB_THREAD_ALIVE_P
-#define rb_thread_alive_p(thread) rb_funcall2((thread), ID_alive_p, 0, NULL)
-#endif
-
-/* safe Tcl_Eval and Tcl_GlobalEval */
-static int
-#ifdef HAVE_PROTOTYPES
-tcl_eval(Tcl_Interp *interp, const char *cmd)
-#else
-tcl_eval(interp, cmd)
-    Tcl_Interp *interp;
-    const char *cmd; /* don't have to be writable */
-#endif
-{
-    char *buf = strdup(cmd);
-    int ret;
-
-    Tcl_AllowExceptions(interp);
-    ret = Tcl_Eval(interp, buf);
-    free(buf);
-    return ret;
-}
-
-#undef Tcl_Eval
-#define Tcl_Eval tcl_eval
-
-static int
-#ifdef HAVE_PROTOTYPES
-tcl_global_eval(Tcl_Interp *interp, const char *cmd)
-#else
-tcl_global_eval(interp, cmd)
-    Tcl_Interp *interp;
-    const char *cmd; /* don't have to be writable */
-#endif
-{
-    char *buf = strdup(cmd);
-    int ret;
-
-    Tcl_AllowExceptions(interp);
-    ret = Tcl_GlobalEval(interp, buf);
-    free(buf);
-    return ret;
-}
-
-#undef Tcl_GlobalEval
-#define Tcl_GlobalEval tcl_global_eval
-
-/* Tcl_{Incr|Decr}RefCount for tcl7.x or earlier */
-#if TCL_MAJOR_VERSION < 8
-#define Tcl_IncrRefCount(obj) (1)
-#define Tcl_DecrRefCount(obj) (1)
-#endif
-
-/* Tcl_GetStringResult for tcl7.x or earlier */
-#if TCL_MAJOR_VERSION < 8
-#define Tcl_GetStringResult(interp) ((interp)->result)
-#endif
-
-/* Tcl_[GS]etVar2Ex for tcl8.0 */
-#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0
-static Tcl_Obj *
-Tcl_GetVar2Ex(interp, name1, name2, flags)
-    Tcl_Interp *interp;
-    CONST char *name1;
-    CONST char *name2;
-    int flags;
-{
-    Tcl_Obj *nameObj1, *nameObj2 = NULL, *retObj;
-
-    nameObj1 = Tcl_NewStringObj((char*)name1, -1);
-    Tcl_IncrRefCount(nameObj1);
-
-    if (name2) {
-        nameObj2 = Tcl_NewStringObj((char*)name2, -1);
-        Tcl_IncrRefCount(nameObj2);
-    }
-
-    retObj = Tcl_ObjGetVar2(interp, nameObj1, nameObj2, flags);
-
-    if (name2) {
-        Tcl_DecrRefCount(nameObj2);
-    }
-
-    Tcl_DecrRefCount(nameObj1);
-
-    return retObj;
-}
-
-static Tcl_Obj *
-Tcl_SetVar2Ex(interp, name1, name2, newValObj, flags)
-    Tcl_Interp *interp;
-    CONST char *name1;
-    CONST char *name2;
-    Tcl_Obj *newValObj;
-    int flags;
-{
-    Tcl_Obj *nameObj1, *nameObj2 = NULL, *retObj;
-
-    nameObj1 = Tcl_NewStringObj((char*)name1, -1);
-    Tcl_IncrRefCount(nameObj1);
-
-    if (name2) {
-        nameObj2 = Tcl_NewStringObj((char*)name2, -1);
-        Tcl_IncrRefCount(nameObj2);
-    }
-
-    retObj = Tcl_ObjSetVar2(interp, nameObj1, nameObj2, newValObj, flags);
-
-    if (name2) {
-        Tcl_DecrRefCount(nameObj2);
-    }
-
-    Tcl_DecrRefCount(nameObj1);
-
-    return retObj;
-}
-#endif
-
-/* from tkAppInit.c */
-
-#if TCL_MAJOR_VERSION < 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION < 4)
-#  if !defined __MINGW32__
-/*
- * The following variable is a special hack that is needed in order for
- * Sun shared libraries to be used for Tcl.
- */
-
-extern int matherr();
-int *tclDummyMathPtr = (int *) matherr;
-#  endif
-#endif
-
-/*---- module TclTkLib ----*/
-
-struct invoke_queue {
-    Tcl_Event ev;
-    int argc;
-#if TCL_MAJOR_VERSION >= 8
-    Tcl_Obj **argv;
-#else /* TCL_MAJOR_VERSION < 8 */
-    char **argv;
-#endif
-    VALUE interp;
-    int *done;
-    int safe_level;
-    VALUE result;
-    VALUE thread;
-};
-
-struct eval_queue {
-    Tcl_Event ev;
-    char *str;
-    int len;
-    VALUE interp;
-    int *done;
-    int safe_level;
-    VALUE result;
-    VALUE thread;
-};
-
-struct call_queue {
-    Tcl_Event ev;
-    VALUE (*func)();
-    int argc;
-    VALUE *argv;
-    VALUE interp;
-    int *done;
-    int safe_level;
-    VALUE result;
-    VALUE thread;
-};
-
-void
-invoke_queue_mark(struct invoke_queue *q)
-{
-    rb_gc_mark(q->interp);
-    rb_gc_mark(q->result);
-    rb_gc_mark(q->thread);
-}
-
-void
-eval_queue_mark(struct eval_queue *q)
-{
-    rb_gc_mark(q->interp);
-    rb_gc_mark(q->result);
-    rb_gc_mark(q->thread);
-}
-
-void
-call_queue_mark(struct call_queue *q)
-{
-    int i;
-
-    for(i = 0; i < q->argc; i++) {
-        rb_gc_mark(q->argv[i]);
-    }
-
-    rb_gc_mark(q->interp);
-    rb_gc_mark(q->result);
-    rb_gc_mark(q->thread);
-}
-
-
-static VALUE eventloop_thread;
-static Tcl_Interp *eventloop_interp;
-#ifdef RUBY_USE_NATIVE_THREAD
-Tcl_ThreadId tk_eventloop_thread_id;  /* native thread ID of Tcl interpreter */
-#endif
-static VALUE eventloop_stack;
-static int   window_event_mode = ~0;
-
-static VALUE watchdog_thread;
-
-Tcl_Interp  *current_interp;
-
-/* thread control strategy */
-/* multi-tk works with the following settings only ???
-    : CONTROL_BY_STATUS_OF_RB_THREAD_WAITING_FOR_VALUE 1
-    : 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;
-#endif
-
-/*
- *  'event_loop_max' is a maximum events which the eventloop processes in one
- *  term of thread scheduling. 'no_event_tick' is the count-up value when
- *  there are no event for processing.
- *  'timer_tick' is a limit of one term of thread scheduling.
- *  If 'timer_tick' == 0, then not use the timer for thread scheduling.
- */
-#ifdef RUBY_USE_NATIVE_THREAD
-#define DEFAULT_EVENT_LOOP_MAX        800/*counts*/
-#define DEFAULT_NO_EVENT_TICK          10/*counts*/
-#define DEFAULT_NO_EVENT_WAIT           5/*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 */
-#define DEFAULT_EVENT_LOOP_MAX        800/*counts*/
-#define DEFAULT_NO_EVENT_TICK          10/*counts*/
-#define DEFAULT_NO_EVENT_WAIT          20/*milliseconds ( 1 -- 999 ) */
-#define WATCHDOG_INTERVAL              10/*milliseconds ( 1 -- 999 ) */
-#define DEFAULT_TIMER_TICK              0/*milliseconds ( 0 -- 999 ) */
-#define NO_THREAD_INTERRUPT_TIME      100/*milliseconds ( 1 -- 999 ) */
-#endif
-
-#define EVENT_HANDLER_TIMEOUT         100/*milliseconds*/
-
-static int event_loop_max = DEFAULT_EVENT_LOOP_MAX;
-static int no_event_tick  = DEFAULT_NO_EVENT_TICK;
-static int no_event_wait  = DEFAULT_NO_EVENT_WAIT;
-static int timer_tick     = DEFAULT_TIMER_TICK;
-static int req_timer_tick = DEFAULT_TIMER_TICK;
-static int run_timer_flag = 0;
-
-static int event_loop_wait_event   = 0;
-static int event_loop_abort_on_exc = 1;
-static int loop_counter = 0;
-
-static int check_rootwidget_flag = 0;
-
-
-/* call ruby interpreter */
-#if TCL_MAJOR_VERSION >= 8
-static int ip_ruby_eval _((ClientData, Tcl_Interp *, int, Tcl_Obj *CONST*));
-static int ip_ruby_cmd _((ClientData, Tcl_Interp *, int, Tcl_Obj *CONST*));
-#else /* TCL_MAJOR_VERSION < 8 */
-static int ip_ruby_eval _((ClientData, Tcl_Interp *, int, char **));
-static int ip_ruby_cmd _((ClientData, Tcl_Interp *, int, char **));
-#endif
-
-struct cmd_body_arg {
-    VALUE receiver;
-    ID    method;
-    VALUE args;
-};
-
-/*----------------------------*/
-/* use Tcl internal functions */
-/*----------------------------*/
-#ifndef TCL_NAMESPACE_DEBUG
-#define TCL_NAMESPACE_DEBUG 0
-#endif
-
-#if TCL_NAMESPACE_DEBUG
-
-#if TCL_MAJOR_VERSION >= 8
-EXTERN struct TclIntStubs *tclIntStubsPtr;
-#endif
-
-/*-- Tcl_GetCurrentNamespace --*/
-#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION < 5
-/* Tcl7.x doesn't have namespace support.                            */
-/* Tcl8.5+ has definition of Tcl_GetCurrentNamespace() in tclDecls.h */
-#  ifndef Tcl_GetCurrentNamespace
-EXTERN Tcl_Namespace *  Tcl_GetCurrentNamespace _((Tcl_Interp *));
-#  endif
-#  if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
-#    ifndef Tcl_GetCurrentNamespace
-#      ifndef FunctionNum_of_GetCurrentNamespace
-#define FunctionNum_of_GetCurrentNamespace 124
-#      endif
-struct DummyTclIntStubs_for_GetCurrentNamespace {
-    int magic;
-    struct TclIntStubHooks *hooks;
-    void (*func[FunctionNum_of_GetCurrentNamespace])();
-    Tcl_Namespace * (*tcl_GetCurrentNamespace) _((Tcl_Interp *));
-};
-
-#define Tcl_GetCurrentNamespace \
-   (((struct DummyTclIntStubs_for_GetCurrentNamespace *)tclIntStubsPtr)->tcl_GetCurrentNamespace)
-#    endif
-#  endif
-#endif
-
-/* namespace check */
-/* ip_null_namespace(Tcl_Interp *interp) */
-#if TCL_MAJOR_VERSION < 8
-#define ip_null_namespace(interp) (0)
-#else /* support namespace */
-#define ip_null_namespace(interp) \
-    (Tcl_GetCurrentNamespace(interp) == (Tcl_Namespace *)NULL)
-#endif
-
-/* rbtk_invalid_namespace(tcltkip *ptr) */
-#if TCL_MAJOR_VERSION < 8
-#define rbtk_invalid_namespace(ptr) (0)
-#else /* support namespace */
-#define rbtk_invalid_namespace(ptr) \
-    ((ptr)->default_ns == (Tcl_Namespace*)NULL || Tcl_GetCurrentNamespace((ptr)->ip) != (ptr)->default_ns)
-#endif
-
-/*-- Tcl_PopCallFrame & Tcl_PushCallFrame --*/
-#if TCL_MAJOR_VERSION >= 8
-#  ifndef CallFrame
-typedef struct CallFrame {
-    Tcl_Namespace *nsPtr;
-    int dummy1;
-    int dummy2;
-    char *dummy3;
-    struct CallFrame *callerPtr;
-    struct CallFrame *callerVarPtr;
-    int level;
-    char *dummy7;
-    char *dummy8;
-    int dummy9;
-    char* dummy10;
-} CallFrame;
-#  endif
-
-#  if !defined(TclGetFrame) && !defined(TclGetFrame_TCL_DECLARED)
-EXTERN int  TclGetFrame _((Tcl_Interp *, CONST char *, CallFrame **));
-#  endif
-#  if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
-#    ifndef TclGetFrame
-#      ifndef FunctionNum_of_GetFrame
-#define FunctionNum_of_GetFrame 32
-#      endif
-struct DummyTclIntStubs_for_GetFrame {
-    int magic;
-    struct TclIntStubHooks *hooks;
-    void (*func[FunctionNum_of_GetFrame])();
-    int (*tclGetFrame) _((Tcl_Interp *, CONST char *, CallFrame **));
-};
-#define TclGetFrame \
-   (((struct DummyTclIntStubs_for_GetFrame *)tclIntStubsPtr)->tclGetFrame)
-#    endif
-#  endif
-
-#  if !defined(Tcl_PopCallFrame) && !defined(Tcl_PopCallFrame_TCL_DECLARED)
-EXTERN void Tcl_PopCallFrame _((Tcl_Interp *));
-EXTERN int  Tcl_PushCallFrame _((Tcl_Interp *, Tcl_CallFrame *, Tcl_Namespace *, int));
-#  endif
-#  if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
-#    ifndef Tcl_PopCallFrame
-#      ifndef FunctionNum_of_PopCallFrame
-#define FunctionNum_of_PopCallFrame 128
-#      endif
-struct DummyTclIntStubs_for_PopCallFrame {
-    int magic;
-    struct TclIntStubHooks *hooks;
-    void (*func[FunctionNum_of_PopCallFrame])();
-    void (*tcl_PopCallFrame) _((Tcl_Interp *));
-    int  (*tcl_PushCallFrame) _((Tcl_Interp *, Tcl_CallFrame *, Tcl_Namespace *, int));
-};
-
-#define Tcl_PopCallFrame \
-   (((struct DummyTclIntStubs_for_PopCallFrame *)tclIntStubsPtr)->tcl_PopCallFrame)
-#define Tcl_PushCallFrame \
-   (((struct DummyTclIntStubs_for_PopCallFrame *)tclIntStubsPtr)->tcl_PushCallFrame)
-#    endif
-#  endif
-
-#else /* Tcl7.x */
-#  ifndef CallFrame
-typedef struct CallFrame {
-    Tcl_HashTable varTable;
-    int level;
-    int argc;
-    char **argv;
-    struct CallFrame *callerPtr;
-    struct CallFrame *callerVarPtr;
-} CallFrame;
-#  endif
-#  ifndef Tcl_CallFrame
-#define Tcl_CallFrame CallFrame
-#  endif
-
-#  if !defined(TclGetFrame) && !defined(TclGetFrame_TCL_DECLARED)
-EXTERN int  TclGetFrame _((Tcl_Interp *, CONST char *, CallFrame **));
-#  endif
-
-#  if !defined(Tcl_PopCallFrame) && !defined(Tcl_PopCallFrame_TCL_DECLARED)
-typedef struct DummyInterp {
-    char *dummy1;
-    char *dummy2;
-    int  dummy3;
-    Tcl_HashTable dummy4;
-    Tcl_HashTable dummy5;
-    Tcl_HashTable dummy6;
-    int numLevels;
-    int maxNestingDepth;
-    CallFrame *framePtr;
-    CallFrame *varFramePtr;
-} DummyInterp;
-
-static void
-Tcl_PopCallFrame(interp)
-    Tcl_Interp *interp;
-{
-    DummyInterp *iPtr = (DummyInterp*)interp;
-    CallFrame *frame = iPtr->varFramePtr;
-
-    /* **** DUMMY **** */
-    iPtr->framePtr = frame.callerPtr;
-    iPtr->varFramePtr = frame.callerVarPtr;
-
-    return TCL_OK;
-}
-
-/* dummy */
-#define Tcl_Namespace char
-
-static int
-Tcl_PushCallFrame(interp, framePtr, nsPtr, isProcCallFrame)
-    Tcl_Interp *interp;
-    Tcl_CallFrame *framePtr;
-    Tcl_Namespace *nsPtr;
-    int isProcCallFrame;
-{
-    DummyInterp *iPtr = (DummyInterp*)interp;
-    CallFrame *frame = (CallFrame *)framePtr;
-
-    /* **** DUMMY **** */
-    Tcl_InitHashTable(&frame.varTable, TCL_STRING_KEYS);
-    if (iPtr->varFramePtr != NULL) {
-        frame.level = iPtr->varFramePtr->level + 1;
-    } else {
-        frame.level = 1;
-    }
-    frame.callerPtr = iPtr->framePtr;
-    frame.callerVarPtr = iPtr->varFramePtr;
-    iPtr->framePtr = &frame;
-    iPtr->varFramePtr = &frame;
-
-    return TCL_OK;
-}
-#  endif
-
-#endif
-
-#endif /* TCL_NAMESPACE_DEBUG */
-
-
-/*---- class TclTkIp ----*/
-struct tcltkip {
-    Tcl_Interp *ip;              /* the interpreter */
-#if TCL_NAMESPACE_DEBUG
-    Tcl_Namespace *default_ns;   /* default namespace */
-#endif
-#ifdef RUBY_USE_NATIVE_THREAD
-    Tcl_ThreadId tk_thread_id;   /* native thread ID of Tcl interpreter */
-#endif
-    int has_orig_exit;           /* has original 'exit' command ? */
-    Tcl_CmdInfo orig_exit_info;  /* command info of original 'exit' command */
-    int ref_count;               /* reference count of rbtk_preserve_ip call */
-    int allow_ruby_exit;         /* allow exiting ruby by 'exit' function */
-    int return_value;            /* return value */
-};
-
-static const rb_data_type_t tcltkip_type = {
-    "tcltkip",
-    {0, ip_free, 0,},
-};
-
-static struct tcltkip *
-get_ip(self)
-    VALUE self;
-{
-    struct tcltkip *ptr;
-
-    TypedData_Get_Struct(self, struct tcltkip, &tcltkip_type, ptr);
-    if (ptr == 0) {
-        /* rb_raise(rb_eTypeError, "uninitialized TclTkIp"); */
-        return((struct tcltkip *)NULL);
-    }
-    if (ptr->ip == (Tcl_Interp*)NULL) {
-        /* rb_raise(rb_eRuntimeError, "deleted IP"); */
-        return((struct tcltkip *)NULL);
-    }
-    return ptr;
-}
-
-static int
-deleted_ip(ptr)
-    struct tcltkip *ptr;
-{
-    if (!ptr || !ptr->ip || Tcl_InterpDeleted(ptr->ip)
-#if TCL_NAMESPACE_DEBUG
-          || rbtk_invalid_namespace(ptr)
-#endif
-    ) {
-        DUMP1("ip is deleted");
-        return 1;
-    }
-    return 0;
-}
-
-/* increment/decrement reference count of tcltkip */
-static int
-rbtk_preserve_ip(ptr)
-    struct tcltkip *ptr;
-{
-    ptr->ref_count++;
-    if (ptr->ip == (Tcl_Interp*)NULL) {
-        /* deleted IP */
-        ptr->ref_count = 0;
-    } else {
-        Tcl_Preserve((ClientData)ptr->ip);
-    }
-    return(ptr->ref_count);
-}
-
-static int
-rbtk_release_ip(ptr)
-    struct tcltkip *ptr;
-{
-    ptr->ref_count--;
-    if (ptr->ref_count < 0) {
-        ptr->ref_count = 0;
-    } else if (ptr->ip == (Tcl_Interp*)NULL) {
-        /* deleted IP */
-        ptr->ref_count = 0;
-    } else {
-        Tcl_Release((ClientData)ptr->ip);
-    }
-    return(ptr->ref_count);
-}
-
-
-static VALUE
-#ifdef HAVE_STDARG_PROTOTYPES
-create_ip_exc(VALUE interp, VALUE exc, const char *fmt, ...)
-#else
-create_ip_exc(interp, exc, fmt, va_alist)
-    VALUE interp:
-    VALUE exc;
-    const char *fmt;
-    va_dcl
-#endif
-{
-    va_list args;
-    VALUE msg;
-    VALUE einfo;
-    struct tcltkip *ptr = get_ip(interp);
-
-    va_init_list(args,fmt);
-    msg = rb_vsprintf(fmt, args);
-    va_end(args);
-    einfo = rb_exc_new_str(exc, msg);
-    rb_ivar_set(einfo, ID_at_interp, interp);
-    if (ptr) {
-        Tcl_ResetResult(ptr->ip);
-    }
-
-    return einfo;
-}
-
-
-/*####################################################################*/
-#if defined CREATE_RUBYTK_KIT || defined CREATE_RUBYKIT
-
-/*--------------------------------------------------------*/
-
-#if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION < 84
-#error Ruby/Tk-Kit requires Tcl/Tk8.4 or later.
-#endif
-
-/*--------------------------------------------------------*/
-
-/* Many part of code to support Ruby/Tk-Kit is quoted from Tclkit.       */
-/* But, never ask Tclkit community about Ruby/Tk-Kit.                    */
-/* Please ask Ruby (Ruby/Tk) community (e.g. "ruby-dev" mailing list).   */
-/*
-----<< license terms of TclKit (from kitgen's "README" file) >>---------------
-The Tclkit-specific sources are license free, they just have a copyright. Hold
-the author(s) harmless and any lawful use is permitted.
-
-This does *not* apply to any of the sources of the other major Open Source
-Software used in Tclkit, which each have very liberal BSD/MIT-like licenses:
-
-  * Tcl/Tk, TclVFS, Thread, Vlerq, Zlib
-------------------------------------------------------------------------------
- */
-/* Tcl/Tk stubs may work, but probably it is meaningless. */
-#if defined USE_TCL_STUBS || defined USE_TK_STUBS
-#  error Not support Tcl/Tk stubs with Ruby/Tk-Kit or Rubykit.
-#endif
-
-#ifndef KIT_INCLUDES_ZLIB
-#if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION < 86
-#define KIT_INCLUDES_ZLIB 1
-#else
-#define KIT_INCLUDES_ZLIB 0
-#endif
-#endif
-
-#ifdef _WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-#endif
-
-#if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION < 86
-EXTERN Tcl_Obj* TclGetStartupScriptPath();
-EXTERN void TclSetStartupScriptPath _((Tcl_Obj*));
-#define Tcl_GetStartupScript(encPtr) TclGetStartupScriptPath()
-#define Tcl_SetStartupScript(path,enc) TclSetStartupScriptPath(path)
-#endif
-#if !defined(TclSetPreInitScript) && !defined(TclSetPreInitScript_TCL_DECLARED)
-EXTERN char* TclSetPreInitScript _((char *));
-#endif
-
-#ifndef KIT_INCLUDES_TK
-#  define KIT_INCLUDES_TK  1
-#endif
-/* #define KIT_INCLUDES_ITCL 1 */
-/* #define KIT_INCLUDES_THREAD  1 */
-
-Tcl_AppInitProc Vfs_Init, Rechan_Init;
-#if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION < 85
-Tcl_AppInitProc Pwb_Init;
-#endif
-
-#ifdef KIT_LITE
-Tcl_AppInitProc Vlerq_Init, Vlerq_SafeInit;
-#else
-Tcl_AppInitProc Mk4tcl_Init;
-#endif
-
-#if defined TCL_THREADS && defined KIT_INCLUDES_THREAD
-Tcl_AppInitProc Thread_Init;
-#endif
-
-#if KIT_INCLUDES_ZLIB
-Tcl_AppInitProc Zlib_Init;
-#endif
-
-#ifdef KIT_INCLUDES_ITCL
-Tcl_AppInitProc Itcl_Init;
-#endif
-
-#ifdef _WIN32
-Tcl_AppInitProc Dde_Init, Dde_SafeInit, Registry_Init;
-#endif
-
-/*--------------------------------------------------------*/
-
-#define RUBYTK_KITPATH_CONST_NAME "RUBYTK_KITPATH"
-
-static char *rubytk_kitpath = NULL;
-
-static char rubytkkit_preInitCmd[] =
-"proc tclKitPreInit {} {\n"
-    "rename tclKitPreInit {}\n"
-    "load {} rubytk_kitpath\n"
-#if KIT_INCLUDES_ZLIB
-    "catch {load {} zlib}\n"
-#endif
-#ifdef KIT_LITE
-    "load {} vlerq\n"
-    "namespace eval ::vlerq {}\n"
-    "if {[catch { vlerq open $::tcl::kitpath } ::vlerq::starkit_root]} {\n"
-      "set n -1\n"
-    "} else {\n"
-      "set files [vlerq get $::vlerq::starkit_root 0 dirs 0 files]\n"
-      "set n [lsearch [vlerq get $files * name] boot.tcl]\n"
-    "}\n"
-    "if {$n >= 0} {\n"
-        "array set a [vlerq get $files $n]\n"
-#else
-    "load {} Mk4tcl\n"
-#if defined KIT_VFS_WRITABLE && !defined CREATE_RUBYKIT
-    /* running command cannot open itself for writing */
-    "mk::file open exe $::tcl::kitpath\n"
-#else
-    "mk::file open exe $::tcl::kitpath -readonly\n"
-#endif
-    "set n [mk::select exe.dirs!0.files name boot.tcl]\n"
-    "if {[llength $n] == 1} {\n"
-        "array set a [mk::get exe.dirs!0.files!$n]\n"
-#endif
-        "if {![info exists a(contents)]} { error {no boot.tcl file} }\n"
-        "if {$a(size) != [string length $a(contents)]} {\n"
-                "set a(contents) [zlib decompress $a(contents)]\n"
-        "}\n"
-        "if {$a(contents) eq \"\"} { error {empty boot.tcl} }\n"
-        "uplevel #0 $a(contents)\n"
-#if 0
-    "} elseif {[lindex $::argv 0] eq \"-init-\"} {\n"
-        "uplevel #0 { source [lindex $::argv 1] }\n"
-        "exit\n"
-#endif
-    "} else {\n"
-        /* When cannot find VFS data, try to use a real directory */
-        "set vfsdir \"[file rootname $::tcl::kitpath].vfs\"\n"
-        "if {[file isdirectory $vfsdir]} {\n"
-           "set ::tcl_library [file join $vfsdir lib tcl$::tcl_version]\n"
-           "set ::tcl_libPath [list $::tcl_library [file join $vfsdir lib]]\n"
-           "catch {uplevel #0 [list source [file join $vfsdir config.tcl]]}\n"
-           "uplevel #0 [list source [file join $::tcl_library init.tcl]]\n"
-           "set ::auto_path $::tcl_libPath\n"
-        "} else {\n"
-           "error \"\n  $::tcl::kitpath has no VFS data to start up\"\n"
-        "}\n"
-    "}\n"
-"}\n"
-"tclKitPreInit"
-;
-
-#if 0
-/* Not use this script.
-   It's a memo to support an initScript for Tcl interpreters in the future. */
-static const char initScript[] =
-"if {[file isfile [file join $::tcl::kitpath main.tcl]]} {\n"
-    "if {[info commands console] != {}} { console hide }\n"
-    "set tcl_interactive 0\n"
-    "incr argc\n"
-    "set argv [linsert $argv 0 $argv0]\n"
-    "set argv0 [file join $::tcl::kitpath main.tcl]\n"
-"} else continue\n"
-;
-#endif
-
-/*--------------------------------------------------------*/
-
-static char*
-set_rubytk_kitpath(const char *kitpath)
-{
-  if (kitpath) {
-    int len = (int)strlen(kitpath);
-    if (rubytk_kitpath) {
-      ckfree(rubytk_kitpath);
-    }
-
-    rubytk_kitpath = (char *)ckalloc(len + 1);
-    memcpy(rubytk_kitpath, kitpath, len);
-    rubytk_kitpath[len] = '\0';
-  }
-  return rubytk_kitpath;
-}
-
-/*--------------------------------------------------------*/
-
-#ifdef WIN32
-#define DEV_NULL "NUL"
-#else
-#define DEV_NULL "/dev/null"
-#endif
-
-static void
-check_tclkit_std_channels(void)
-{
-    Tcl_Channel chan;
-
-    /*
-     * We need to verify if we have the standard channels and create them if
-     * not.  Otherwise internals channels may get used as standard channels
-     * (like for encodings) and panic.
-     */
-    chan = Tcl_GetStdChannel(TCL_STDIN);
-    if (chan == NULL) {
-      	chan = Tcl_OpenFileChannel(NULL, DEV_NULL, "r", 0);
-      	if (chan != NULL) {
-      	    Tcl_SetChannelOption(NULL, chan, "-encoding", "utf-8");
-      	}
-      	Tcl_SetStdChannel(chan, TCL_STDIN);
-    }
-    chan = Tcl_GetStdChannel(TCL_STDOUT);
-    if (chan == NULL) {
-      	chan = Tcl_OpenFileChannel(NULL, DEV_NULL, "w", 0);
-      	if (chan != NULL) {
-      	    Tcl_SetChannelOption(NULL, chan, "-encoding", "utf-8");
-      	}
-      	Tcl_SetStdChannel(chan, TCL_STDOUT);
-    }
-    chan = Tcl_GetStdChannel(TCL_STDERR);
-    if (chan == NULL) {
-      	chan = Tcl_OpenFileChannel(NULL, DEV_NULL, "w", 0);
-      	if (chan != NULL) {
-      	    Tcl_SetChannelOption(NULL, chan, "-encoding", "utf-8");
-      	}
-      	Tcl_SetStdChannel(chan, TCL_STDERR);
-    }
-}
-
-/*--------------------------------------------------------*/
-
-static int
-rubytk_kitpathObjCmd(ClientData dummy, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
-{
-    const char* str;
-    if (objc == 2) {
-	set_rubytk_kitpath(Tcl_GetString(objv[1]));
-    } else if (objc > 2) {
-	Tcl_WrongNumArgs(interp, 1, objv, "?path?");
-    }
-    str = rubytk_kitpath ? rubytk_kitpath : Tcl_GetNameOfExecutable();
-    Tcl_SetObjResult(interp, Tcl_NewStringObj(str, -1));
-    return TCL_OK;
-}
-
-/*
- * Public entry point for ::tcl::kitpath.
- * Creates both link variable name and Tcl command ::tcl::kitpath.
- */
-static int
-rubytk_kitpath_init(Tcl_Interp *interp)
-{
-    Tcl_CreateObjCommand(interp, "::tcl::kitpath", rubytk_kitpathObjCmd, 0, 0);
-    if (Tcl_LinkVar(interp, "::tcl::kitpath", (char *) &rubytk_kitpath,
-		TCL_LINK_STRING | TCL_LINK_READ_ONLY) != TCL_OK) {
-	Tcl_ResetResult(interp);
-    }
-
-    Tcl_CreateObjCommand(interp, "::tcl::rubytk_kitpath", rubytk_kitpathObjCmd, 0, 0);
-    if (Tcl_LinkVar(interp, "::tcl::rubytk_kitpath", (char *) &rubytk_kitpath,
-		TCL_LINK_STRING | TCL_LINK_READ_ONLY) != TCL_OK) {
-	Tcl_ResetResult(interp);
-    }
-
-    if (rubytk_kitpath == NULL) {
-	/*
-	 * XXX: We may want to avoid doing this to allow tcl::kitpath calls
-	 * XXX: to obtain changes in nameofexe, if they occur.
-	 */
-	set_rubytk_kitpath(Tcl_GetNameOfExecutable());
-    }
-
-    return Tcl_PkgProvide(interp, "rubytk_kitpath", "1.0");
-}
-
-/*--------------------------------------------------------*/
-
-static void
-init_static_tcltk_packages(void)
-{
-    /*
-     * Ensure that std channels exist (creating them if necessary)
-     */
-    check_tclkit_std_channels();
-
-#ifdef KIT_INCLUDES_ITCL
-    Tcl_StaticPackage(0, "Itcl", Itcl_Init, NULL);
-#endif
-#ifdef KIT_LITE
-    Tcl_StaticPackage(0, "Vlerq", Vlerq_Init, Vlerq_SafeInit);
-#else
-    Tcl_StaticPackage(0, "Mk4tcl", Mk4tcl_Init, NULL);
-#endif
-#if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION < 85
-    Tcl_StaticPackage(0, "pwb", Pwb_Init, NULL);
-#endif
-    Tcl_StaticPackage(0, "rubytk_kitpath", rubytk_kitpath_init, NULL);
-    Tcl_StaticPackage(0, "rechan", Rechan_Init, NULL);
-    Tcl_StaticPackage(0, "vfs", Vfs_Init, NULL);
-#if KIT_INCLUDES_ZLIB
-    Tcl_StaticPackage(0, "zlib", Zlib_Init, NULL);
-#endif
-#if defined TCL_THREADS && defined KIT_INCLUDES_THREAD
-    Tcl_StaticPackage(0, "Thread", Thread_Init, Thread_SafeInit);
-#endif
-#ifdef _WIN32
-#if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION > 84
-    Tcl_StaticPackage(0, "dde", Dde_Init, Dde_SafeInit);
-#else
-    Tcl_StaticPackage(0, "dde", Dde_Init, NULL);
-#endif
-    Tcl_StaticPackage(0, "registry", Registry_Init, NULL);
-#endif
-#ifdef KIT_INCLUDES_TK
-    Tcl_StaticPackage(0, "Tk", Tk_Init, Tk_SafeInit);
-#endif
-}
-
-/*--------------------------------------------------------*/
-
-static int
-call_tclkit_init_script(Tcl_Interp  *interp)
-{
-#if 0
-  /* Currently, do nothing in this function.
-     It's a memo (quoted from kitInit.c of Tclkit)
-     to support an initScript for Tcl interpreters in the future. */
-  if (Tcl_EvalEx(interp, initScript, -1, TCL_EVAL_GLOBAL) == TCL_OK) {
-    const char *encoding = NULL;
-    Tcl_Obj* path = Tcl_GetStartupScript(&encoding);
-    Tcl_SetStartupScript(Tcl_GetObjResult(interp), encoding);
-    if (path == NULL) {
-      Tcl_Eval(interp, "incr argc -1; set argv [lrange $argv 1 end]");
-    }
-  }
-#endif
-
-  return 1;
-}
-
-/*--------------------------------------------------------*/
-
-#ifdef __WIN32__
-/* #include <tkWinInt.h> *//* conflict definition of struct timezone */
-/* #include <tkIntPlatDecls.h> */
-/* #include <windows.h> */
-EXTERN void TkWinSetHINSTANCE(HINSTANCE hInstance);
-void rbtk_win32_SetHINSTANCE(const char *module_name)
-{
-  /* TCHAR szBuf[256]; */
-  HINSTANCE hInst;
-
-  /* hInst = GetModuleHandle(NULL); */
-  /* hInst = GetModuleHandle("tcltklib.so"); */
-  hInst = GetModuleHandle(module_name);
-  TkWinSetHINSTANCE(hInst);
-
-  /* GetModuleFileName(hInst, szBuf, sizeof(szBuf) / sizeof(TCHAR)); */
-  /* MessageBox(NULL, szBuf, TEXT("OK"), MB_OK); */
-}
-#endif
-
-/*--------------------------------------------------------*/
-
-static void
-setup_rubytkkit(void)
-{
-  init_static_tcltk_packages();
-
-  {
-    ID const_id;
-    const_id = rb_intern(RUBYTK_KITPATH_CONST_NAME);
-
-    if (rb_const_defined(rb_cObject, const_id)) {
-      volatile VALUE pathobj;
-      pathobj = rb_const_get(rb_cObject, const_id);
-
-      if (rb_obj_is_kind_of(pathobj, rb_cString)) {
-#ifdef HAVE_RUBY_ENCODING_H
-	pathobj = rb_str_export_to_enc(pathobj, rb_utf8_encoding());
-#endif
-	set_rubytk_kitpath(RSTRING_PTR(pathobj));
-      }
-    }
-  }
-
-#ifdef CREATE_RUBYTK_KIT
-  if (rubytk_kitpath == NULL) {
-#ifdef __WIN32__
-    /* rbtk_win32_SetHINSTANCE("tcltklib.so"); */
-    {
-# ifdef HAVE_RUBY_ENC_FIND_BASENAME
-      const char *base = ruby_enc_find_basename(rb_sourcefile(), NULL, NULL,
-						rb_filesystem_encoding());
-      rbtk_win32_SetHINSTANCE(base);
-# else
-      VALUE basename;
-      basename = rb_funcall(rb_cFile, rb_intern("basename"), 1,
-			    rb_str_new2(rb_sourcefile()));
-      rbtk_win32_SetHINSTANCE(RSTRING_PTR(basename));
-      RB_GC_GUARD(basename);
-# endif
-    }
-#endif
-    set_rubytk_kitpath(rb_sourcefile());
-  }
-#endif
-
-  if (rubytk_kitpath == NULL) {
-    set_rubytk_kitpath(Tcl_GetNameOfExecutable());
-  }
-
-  TclSetPreInitScript(rubytkkit_preInitCmd);
-}
-
-/*--------------------------------------------------------*/
-
-#endif /* defined CREATE_RUBYTK_KIT || defined CREATE_RUBYKIT */
-/*####################################################################*/
-
-
-/**********************************************************************/
-
-/* stub status */
-static void
-tcl_stubs_check(void)
-{
-    if (!tcl_stubs_init_p()) {
-        int st = ruby_tcl_stubs_init();
-        switch(st) {
-        case TCLTK_STUBS_OK:
-            break;
-        case NO_TCL_DLL:
-            rb_raise(rb_eLoadError, "tcltklib: fail to open tcl_dll");
-        case NO_FindExecutable:
-            rb_raise(rb_eLoadError, "tcltklib: can't find Tcl_FindExecutable");
-        case NO_CreateInterp:
-            rb_raise(rb_eLoadError, "tcltklib: can't find Tcl_CreateInterp()");
-        case NO_DeleteInterp:
-            rb_raise(rb_eLoadError, "tcltklib: can't find Tcl_DeleteInterp()");
-        case FAIL_CreateInterp:
-            rb_raise(rb_eRuntimeError, "tcltklib: fail to create a new IP to call Tcl_InitStubs()");
-        case FAIL_Tcl_InitStubs:
-            rb_raise(rb_eRuntimeError, "tcltklib: fail to Tcl_InitStubs()");
-        default:
-            rb_raise(rb_eRuntimeError, "tcltklib: unknown error(%d) on ruby_tcl_stubs_init()", st);
-        }
-    }
-}
-
-
-static VALUE
-tcltkip_init_tk(interp)
-    VALUE interp;
-{
-    struct tcltkip *ptr = get_ip(interp);
-
-#if TCL_MAJOR_VERSION >= 8
-    int  st;
-
-    if (Tcl_IsSafe(ptr->ip)) {
-        DUMP1("Tk_SafeInit");
-        st = ruby_tk_stubs_safeinit(ptr->ip);
-        switch(st) {
-        case TCLTK_STUBS_OK:
-            break;
-        case NO_Tk_Init:
-            return rb_exc_new2(rb_eLoadError,
-                               "tcltklib: can't find Tk_SafeInit()");
-        case FAIL_Tk_Init:
-            return create_ip_exc(interp, rb_eRuntimeError,
-                                 "tcltklib: fail to Tk_SafeInit(). %s",
-                                 Tcl_GetStringResult(ptr->ip));
-        case FAIL_Tk_InitStubs:
-            return create_ip_exc(interp, rb_eRuntimeError,
-                                 "tcltklib: fail to Tk_InitStubs(). %s",
-                                 Tcl_GetStringResult(ptr->ip));
-        default:
-            return create_ip_exc(interp, rb_eRuntimeError,
-                                 "tcltklib: unknown error(%d) on ruby_tk_stubs_safeinit", st);
-        }
-    } else {
-        DUMP1("Tk_Init");
-        st = ruby_tk_stubs_init(ptr->ip);
-        switch(st) {
-        case TCLTK_STUBS_OK:
-            break;
-        case NO_Tk_Init:
-            return rb_exc_new2(rb_eLoadError,
-                               "tcltklib: can't find Tk_Init()");
-        case FAIL_Tk_Init:
-            return create_ip_exc(interp, rb_eRuntimeError,
-                                 "tcltklib: fail to Tk_Init(). %s",
-                                 Tcl_GetStringResult(ptr->ip));
-        case FAIL_Tk_InitStubs:
-            return create_ip_exc(interp, rb_eRuntimeError,
-                                 "tcltklib: fail to Tk_InitStubs(). %s",
-                                 Tcl_GetStringResult(ptr->ip));
-        default:
-            return create_ip_exc(interp, rb_eRuntimeError,
-                                 "tcltklib: unknown error(%d) on ruby_tk_stubs_init", st);
-        }
-    }
-
-#else /* TCL_MAJOR_VERSION < 8 */
-    DUMP1("Tk_Init");
-    if (ruby_tk_stubs_init(ptr->ip) != TCLTK_STUBS_OK) {
-        return rb_exc_new2(rb_eRuntimeError, ptr->ip->result);
-    }
-#endif
-
-#ifdef RUBY_USE_NATIVE_THREAD
-    ptr->tk_thread_id = Tcl_GetCurrentThread();
-#endif
-
-    return Qnil;
-}
-
-
-/* treat exception on Tcl side */
-static VALUE rbtk_pending_exception;
-static int rbtk_eventloop_depth = 0;
-static int rbtk_internal_eventloop_handler = 0;
-
-
-static int
-pending_exception_check0(void)
-{
-    volatile VALUE exc = rbtk_pending_exception;
-
-    if (!NIL_P(exc) && rb_obj_is_kind_of(exc, rb_eException)) {
-        DUMP1("find a pending exception");
-        if (rbtk_eventloop_depth > 0
-	    || rbtk_internal_eventloop_handler > 0
-	    ) {
-            return 1; /* pending */
-        } else {
-            rbtk_pending_exception = Qnil;
-
-            if (rb_obj_is_kind_of(exc, eTkCallbackRetry)) {
-                DUMP1("pending_exception_check0: call rb_jump_tag(retry)");
-                rb_jump_tag(TAG_RETRY);
-            } else if (rb_obj_is_kind_of(exc, eTkCallbackRedo)) {
-                DUMP1("pending_exception_check0: call rb_jump_tag(redo)");
-                rb_jump_tag(TAG_REDO);
-            } else if (rb_obj_is_kind_of(exc, eTkCallbackThrow)) {
-                DUMP1("pending_exception_check0: call rb_jump_tag(throw)");
-                rb_jump_tag(TAG_THROW);
-            }
-
-            rb_exc_raise(exc);
-        }
-    } else {
-        return 0;
-    }
-
-    UNREACHABLE;
-}
-
-static int
-pending_exception_check1(thr_crit_bup, ptr)
-    int thr_crit_bup;
-    struct tcltkip *ptr;
-{
-    volatile VALUE exc = rbtk_pending_exception;
-
-    if (!NIL_P(exc) && rb_obj_is_kind_of(exc, rb_eException)) {
-        DUMP1("find a pending exception");
-
-        if (rbtk_eventloop_depth > 0
-	    || rbtk_internal_eventloop_handler > 0
-	    ) {
-            return 1; /* pending */
-        } else {
-            rbtk_pending_exception = Qnil;
-
-            if (ptr != (struct tcltkip *)NULL) {
-                /* Tcl_Release(ptr->ip); */
-                rbtk_release_ip(ptr);
-            }
-
-            rb_thread_critical = thr_crit_bup;
-
-            if (rb_obj_is_kind_of(exc, eTkCallbackRetry)) {
-                DUMP1("pending_exception_check1: call rb_jump_tag(retry)");
-                rb_jump_tag(TAG_RETRY);
-            } else if (rb_obj_is_kind_of(exc, eTkCallbackRedo)) {
-                DUMP1("pending_exception_check1: call rb_jump_tag(redo)");
-                rb_jump_tag(TAG_REDO);
-            } else if (rb_obj_is_kind_of(exc, eTkCallbackThrow)) {
-                DUMP1("pending_exception_check1: call rb_jump_tag(throw)");
-                rb_jump_tag(TAG_THROW);
-            }
-            rb_exc_raise(exc);
-        }
-    } else {
-        return 0;
-    }
-
-    UNREACHABLE;
-}
-
-
-/* call original 'exit' command */
-static void
-call_original_exit(ptr, state)
-    struct tcltkip *ptr;
-    int state;
-{
-    int  thr_crit_bup;
-    Tcl_CmdInfo *info;
-#if TCL_MAJOR_VERSION >= 8
-    Tcl_Obj *cmd_obj;
-    Tcl_Obj *state_obj;
-#endif
-    DUMP1("original_exit is called");
-
-    if (!(ptr->has_orig_exit)) return;
-
-    thr_crit_bup = rb_thread_critical;
-    rb_thread_critical = Qtrue;
-
-    Tcl_ResetResult(ptr->ip);
-
-    info = &(ptr->orig_exit_info);
-
-    /* memory allocation for arguments of this command */
-#if TCL_MAJOR_VERSION >= 8
-    state_obj = Tcl_NewIntObj(state);
-    Tcl_IncrRefCount(state_obj);
-
-    if (info->isNativeObjectProc) {
-        Tcl_Obj **argv;
-#define USE_RUBY_ALLOC 0
-#if USE_RUBY_ALLOC
-        argv = (Tcl_Obj **)ALLOC_N(Tcl_Obj *, 3);
-#else /* not USE_RUBY_ALLOC */
-        argv = RbTk_ALLOC_N(Tcl_Obj *, 3);
-#if 0 /* use Tcl_Preserve/Release */
-	Tcl_Preserve((ClientData)argv); /* XXXXXXXX */
-#endif
-#endif
-	cmd_obj = Tcl_NewStringObj("exit", 4);
-	Tcl_IncrRefCount(cmd_obj);
-
-        argv[0] = cmd_obj;
-        argv[1] = state_obj;
-        argv[2] = (Tcl_Obj *)NULL;
-
-        ptr->return_value
-            = (*(info->objProc))(info->objClientData, ptr->ip, 2, argv);
-
-	Tcl_DecrRefCount(cmd_obj);
-
-#if USE_RUBY_ALLOC
-        xfree(argv);
-#else /* not USE_RUBY_ALLOC */
-#if 0 /* use Tcl_EventuallyFree */
-	Tcl_EventuallyFree((ClientData)argv, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 0 /* use Tcl_Preserve/Release */
-	Tcl_Release((ClientData)argv); /* XXXXXXXX */
-#else
-        /* free(argv); */
-        ckfree((char*)argv);
-#endif
-#endif
-#endif
-#undef USE_RUBY_ALLOC
-
-    } else {
-        /* string interface */
-        CONST84 char **argv;
-#define USE_RUBY_ALLOC 0
-#if USE_RUBY_ALLOC
-        argv = ALLOC_N(char *, 3); /* XXXXXXXXXX */
-#else /* not USE_RUBY_ALLOC */
-        argv = RbTk_ALLOC_N(CONST84 char *, 3);
-#if 0 /* use Tcl_Preserve/Release */
-	Tcl_Preserve((ClientData)argv); /* XXXXXXXX */
-#endif
-#endif
-        argv[0] = (char *)"exit";
-        /* argv[1] = Tcl_GetString(state_obj); */
-        argv[1] = Tcl_GetStringFromObj(state_obj, (int*)NULL);
-        argv[2] = (char *)NULL;
-
-        ptr->return_value = (*(info->proc))(info->clientData, ptr->ip, 2, argv);
-
-#if USE_RUBY_ALLOC
-        xfree(argv);
-#else /* not USE_RUBY_ALLOC */
-#if 0 /* use Tcl_EventuallyFree */
-	Tcl_EventuallyFree((ClientData)argv, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 0 /* use Tcl_Preserve/Release */
-	Tcl_Release((ClientData)argv); /* XXXXXXXX */
-#else
-        /* free(argv); */
-        ckfree((char*)argv);
-#endif
-#endif
-#endif
-#undef USE_RUBY_ALLOC
-    }
-
-    Tcl_DecrRefCount(state_obj);
-
-#else /* TCL_MAJOR_VERSION < 8 */
-    {
-        /* string interface */
-        char **argv;
-#define USE_RUBY_ALLOC 0
-#if USE_RUBY_ALLOC
-        argv = (char **)ALLOC_N(char *, 3);
-#else /* not USE_RUBY_ALLOC */
-        argv = RbTk_ALLOC_N(char *, 3);
-#if 0 /* use Tcl_Preserve/Release */
-	Tcl_Preserve((ClientData)argv); /* XXXXXXXX */
-#endif
-#endif
-        argv[0] = "exit";
-        argv[1] = RSTRING_PTR(rb_fix2str(INT2NUM(state), 10));
-        argv[2] = (char *)NULL;
-
-        ptr->return_value = (*(info->proc))(info->clientData, ptr->ip,
-                                            2, argv);
-
-#if USE_RUBY_ALLOC
-        xfree(argv);
-#else /* not USE_RUBY_ALLOC */
-#if 0 /* use Tcl_EventuallyFree */
-	Tcl_EventuallyFree((ClientData)argv, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 0 /* use Tcl_Preserve/Release */
-	Tcl_Release((ClientData)argv); /* XXXXXXXX */
-#else
-        /* free(argv); */
-        ckfree(argv);
-#endif
-#endif
-#endif
-#undef USE_RUBY_ALLOC
-    }
-#endif
-    DUMP1("complete original_exit");
-
-    rb_thread_critical = thr_crit_bup;
-}
-
-/* Tk_ThreadTimer */
-static Tcl_TimerToken timer_token = (Tcl_TimerToken)NULL;
-
-/* timer callback */
-static void _timer_for_tcl _((ClientData));
-static void
-_timer_for_tcl(clientData)
-    ClientData clientData;
-{
-    int thr_crit_bup;
-
-    /* struct invoke_queue *q, *tmp; */
-    /* VALUE thread; */
-
-    DUMP1("call _timer_for_tcl");
-
-    thr_crit_bup = rb_thread_critical;
-    rb_thread_critical = Qtrue;
-
-    Tcl_DeleteTimerHandler(timer_token);
-
-    run_timer_flag = 1;
-
-    if (timer_tick > 0) {
-        timer_token = Tcl_CreateTimerHandler(timer_tick, _timer_for_tcl,
-                                             (ClientData)0);
-    } else {
-        timer_token = (Tcl_TimerToken)NULL;
-    }
-
-    rb_thread_critical = thr_crit_bup;
-
-    /* rb_thread_schedule(); */
-    /* tick_counter += event_loop_max; */
-}
-
-#ifdef RUBY_USE_NATIVE_THREAD
-#if USE_TOGGLE_WINDOW_MODE_FOR_IDLE
-static int
-toggle_eventloop_window_mode_for_idle(void)
-{
-  if (window_event_mode & TCL_IDLE_EVENTS) {
-    /* idle -> event */
-    window_event_mode |= TCL_WINDOW_EVENTS;
-    window_event_mode &= ~TCL_IDLE_EVENTS;
-    return 1;
-  } else {
-    /* event -> idle */
-    window_event_mode |= TCL_IDLE_EVENTS;
-    window_event_mode &= ~TCL_WINDOW_EVENTS;
-    return 0;
-  }
-}
-#endif
-#endif
-
-static VALUE
-set_eventloop_window_mode(self, mode)
-    VALUE self;
-    VALUE mode;
-{
-
-    if (RTEST(mode)) {
-      window_event_mode = ~0;
-    } else {
-      window_event_mode = ~TCL_WINDOW_EVENTS;
-    }
-
-    return mode;
-}
-
-static VALUE
-get_eventloop_window_mode(self)
-    VALUE self;
-{
-    if ( ~window_event_mode ) {
-      return Qfalse;
-    } else {
-      return Qtrue;
-    }
-}
-
-static VALUE
-set_eventloop_tick(self, tick)
-    VALUE self;
-    VALUE tick;
-{
-    int ttick = NUM2INT(tick);
-    int thr_crit_bup;
-
-
-    if (ttick < 0) {
-        rb_raise(rb_eArgError,
-                 "timer-tick parameter must be 0 or positive number");
-    }
-
-    thr_crit_bup = rb_thread_critical;
-    rb_thread_critical = Qtrue;
-
-    /* delete old timer callback */
-    Tcl_DeleteTimerHandler(timer_token);
-
-    timer_tick = req_timer_tick = ttick;
-    if (timer_tick > 0) {
-        /* start timer callback */
-        timer_token = Tcl_CreateTimerHandler(timer_tick, _timer_for_tcl,
-                                             (ClientData)0);
-    } else {
-        timer_token = (Tcl_TimerToken)NULL;
-    }
-
-    rb_thread_critical = thr_crit_bup;
-
-    return tick;
-}
-
-static VALUE
-get_eventloop_tick(self)
-    VALUE self;
-{
-    return INT2NUM(timer_tick);
-}
-
-static VALUE
-ip_set_eventloop_tick(self, tick)
-    VALUE self;
-    VALUE tick;
-{
-    struct tcltkip *ptr = get_ip(self);
-
-    /* ip is deleted? */
-    if (deleted_ip(ptr)) {
-        return get_eventloop_tick(self);
-    }
-
-    if (Tcl_GetMaster(ptr->ip) != (Tcl_Interp*)NULL) {
-        /* slave IP */
-        return get_eventloop_tick(self);
-    }
-    return set_eventloop_tick(self, tick);
-}
-
-static VALUE
-ip_get_eventloop_tick(self)
-    VALUE self;
-{
-    return get_eventloop_tick(self);
-}
-
-static VALUE
-set_no_event_wait(self, wait)
-    VALUE self;
-    VALUE wait;
-{
-    int t_wait = NUM2INT(wait);
-
-
-    if (t_wait <= 0) {
-        rb_raise(rb_eArgError,
-                 "no_event_wait parameter must be positive number");
-    }
-
-    no_event_wait = t_wait;
-
-    return wait;
-}
-
-static VALUE
-get_no_event_wait(self)
-    VALUE self;
-{
-    return INT2NUM(no_event_wait);
-}
-
-static VALUE
-ip_set_no_event_wait(self, wait)
-    VALUE self;
-    VALUE wait;
-{
-    struct tcltkip *ptr = get_ip(self);
-
-    /* ip is deleted? */
-    if (deleted_ip(ptr)) {
-        return get_no_event_wait(self);
-    }
-
-    if (Tcl_GetMaster(ptr->ip) != (Tcl_Interp*)NULL) {
-        /* slave IP */
-        return get_no_event_wait(self);
-    }
-    return set_no_event_wait(self, wait);
-}
-
-static VALUE
-ip_get_no_event_wait(self)
-    VALUE self;
-{
-    return get_no_event_wait(self);
-}
-
-static VALUE
-set_eventloop_weight(self, loop_max, no_event)
-    VALUE self;
-    VALUE loop_max;
-    VALUE no_event;
-{
-    int lpmax = NUM2INT(loop_max);
-    int no_ev = NUM2INT(no_event);
-
-
-    if (lpmax <= 0 || no_ev <= 0) {
-        rb_raise(rb_eArgError, "weight parameters must be positive numbers");
-    }
-
-    event_loop_max = lpmax;
-    no_event_tick  = no_ev;
-
-    return rb_ary_new3(2, loop_max, no_event);
-}
-
-static VALUE
-get_eventloop_weight(self)
-    VALUE self;
-{
-    return rb_ary_new3(2, INT2NUM(event_loop_max), INT2NUM(no_event_tick));
-}
-
-static VALUE
-ip_set_eventloop_weight(self, loop_max, no_event)
-    VALUE self;
-    VALUE loop_max;
-    VALUE no_event;
-{
-    struct tcltkip *ptr = get_ip(self);
-
-    /* ip is deleted? */
-    if (deleted_ip(ptr)) {
-        return get_eventloop_weight(self);
-    }
-
-    if (Tcl_GetMaster(ptr->ip) != (Tcl_Interp*)NULL) {
-        /* slave IP */
-        return get_eventloop_weight(self);
-    }
-    return set_eventloop_weight(self, loop_max, no_event);
-}
-
-static VALUE
-ip_get_eventloop_weight(self)
-    VALUE self;
-{
-    return get_eventloop_weight(self);
-}
-
-static VALUE
-set_max_block_time(self, time)
-    VALUE self;
-    VALUE time;
-{
-    struct Tcl_Time tcl_time;
-    VALUE divmod;
-
-    switch(TYPE(time)) {
-    case T_FIXNUM:
-    case T_BIGNUM:
-        /* time is micro-second value */
-        divmod = rb_funcall(time, rb_intern("divmod"), 1, LONG2NUM(1000000));
-        tcl_time.sec  = NUM2LONG(RARRAY_AREF(divmod, 0));
-        tcl_time.usec = NUM2LONG(RARRAY_AREF(divmod, 1));
-        break;
-
-    case T_FLOAT:
-        /* time is second value */
-        divmod = rb_funcall(time, rb_intern("divmod"), 1, INT2FIX(1));
-        tcl_time.sec  = NUM2LONG(RARRAY_AREF(divmod, 0));
-        tcl_time.usec = (long)(NUM2DBL(RARRAY_AREF(divmod, 1)) * 1000000);
-
-    default:
-        {
-	    VALUE tmp = rb_funcallv(time, ID_inspect, 0, 0);
-	    rb_raise(rb_eArgError, "invalid value for time: '%s'",
-		     StringValuePtr(tmp));
-	}
-    }
-
-    Tcl_SetMaxBlockTime(&tcl_time);
-
-    return Qnil;
-}
-
-static VALUE
-lib_evloop_thread_p(self)
-    VALUE self;
-{
-    if (NIL_P(eventloop_thread)) {
-        return Qnil;    /* no eventloop */
-    } else if (rb_thread_current() == eventloop_thread) {
-        return Qtrue;   /* is eventloop */
-    } else {
-        return Qfalse;  /* not eventloop */
-    }
-}
-
-static VALUE
-lib_evloop_abort_on_exc(self)
-    VALUE self;
-{
-    if (event_loop_abort_on_exc > 0) {
-        return Qtrue;
-    } else if (event_loop_abort_on_exc == 0) {
-        return Qfalse;
-    } else {
-        return Qnil;
-    }
-}
-
-static VALUE
-ip_evloop_abort_on_exc(self)
-    VALUE self;
-{
-    return lib_evloop_abort_on_exc(self);
-}
-
-static VALUE
-lib_evloop_abort_on_exc_set(self, val)
-    VALUE self, val;
-{
-    if (RTEST(val)) {
-        event_loop_abort_on_exc =  1;
-    } else if (NIL_P(val)) {
-        event_loop_abort_on_exc = -1;
-    } else {
-        event_loop_abort_on_exc =  0;
-    }
-    return lib_evloop_abort_on_exc(self);
-}
-
-static VALUE
-ip_evloop_abort_on_exc_set(self, val)
-    VALUE self, val;
-{
-    struct tcltkip *ptr = get_ip(self);
-
-
-    /* ip is deleted? */
-    if (deleted_ip(ptr)) {
-        return lib_evloop_abort_on_exc(self);
-    }
-
-    if (Tcl_GetMaster(ptr->ip) != (Tcl_Interp*)NULL) {
-        /* slave IP */
-        return lib_evloop_abort_on_exc(self);
-    }
-    return lib_evloop_abort_on_exc_set(self, val);
-}
-
-static VALUE
-lib_num_of_mainwindows_core(self, argc, argv)
-    VALUE self;
-    int   argc;   /* dummy */
-    VALUE *argv;  /* dummy */
-{
-    if (tk_stubs_init_p()) {
-        return INT2FIX(Tk_GetNumMainWindows());
-    } else {
-        return INT2FIX(0);
-    }
-}
-
-static VALUE
-lib_num_of_mainwindows(self)
-    VALUE self;
-{
-#ifdef RUBY_USE_NATIVE_THREAD  /* 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);
-#endif
-}
-
-void
-rbtk_EventSetupProc(ClientData clientData, int flag)
-{
-    Tcl_Time tcl_time;
-    tcl_time.sec  = 0;
-    tcl_time.usec = 1000L * (long)no_event_tick;
-    Tcl_SetMaxBlockTime(&tcl_time);
-}
-
-void
-rbtk_EventCheckProc(ClientData clientData, int flag)
-{
-    rb_thread_schedule();
-}
-
-
-#ifdef RUBY_USE_NATIVE_THREAD  /* Ruby 1.9+ !!! */
-static VALUE
-#ifdef HAVE_PROTOTYPES
-call_DoOneEvent_core(VALUE flag_val)
-#else
-call_DoOneEvent_core(flag_val)
-    VALUE flag_val;
-#endif
-{
-    int flag;
-
-    flag = FIX2INT(flag_val);
-    if (Tcl_DoOneEvent(flag)) {
-        return Qtrue;
-    } else {
-        return Qfalse;
-    }
-}
-
-static VALUE
-#ifdef HAVE_PROTOTYPES
-call_DoOneEvent(VALUE flag_val)
-#else
-call_DoOneEvent(flag_val)
-    VALUE flag_val;
-#endif
-{
-  return tk_funcall(call_DoOneEvent_core, 0, (VALUE*)NULL, flag_val);
-}
-
-#else  /* Ruby 1.8- */
-static VALUE
-#ifdef HAVE_PROTOTYPES
-call_DoOneEvent(VALUE flag_val)
-#else
-call_DoOneEvent(flag_val)
-    VALUE flag_val;
-#endif
-{
-    int flag;
-
-    flag = FIX2INT(flag_val);
-    if (Tcl_DoOneEvent(flag)) {
-        return Qtrue;
-    } else {
-        return Qfalse;
-    }
-}
-#endif
-
-
-#if 0
-static VALUE
-#ifdef HAVE_PROTOTYPES
-eventloop_sleep(VALUE dummy)
-#else
-eventloop_sleep(dummy)
-    VALUE dummy;
-#endif
-{
-    struct timeval t;
-
-    if (no_event_wait <= 0) {
-      return Qnil;
-    }
-
-    t.tv_sec = 0;
-    t.tv_usec = (int)(no_event_wait*1000.0);
-
-#ifdef HAVE_NATIVETHREAD
-#ifndef RUBY_USE_NATIVE_THREAD
-    if (!ruby_native_thread_p()) {
-        rb_bug("cross-thread violation on eventloop_sleep()");
-    }
-#endif
-#endif
-
-    DUMP2("eventloop_sleep: rb_thread_wait_for() at thread : %"PRIxVALUE, rb_thread_current());
-    rb_thread_wait_for(t);
-    DUMP2("eventloop_sleep: finish at thread : %"PRIxVALUE, rb_thread_current());
-
-#ifdef HAVE_NATIVETHREAD
-#ifndef RUBY_USE_NATIVE_THREAD
-    if (!ruby_native_thread_p()) {
-        rb_bug("cross-thread violation on eventloop_sleep()");
-    }
-#endif
-#endif
-
-    return Qnil;
-}
-#endif
-
-#define USE_EVLOOP_THREAD_ALONE_CHECK_FLAG 0
-
-#if USE_EVLOOP_THREAD_ALONE_CHECK_FLAG
-static int
-get_thread_alone_check_flag(void)
-{
-#ifdef RUBY_USE_NATIVE_THREAD
-  return 0;
-#else
-  set_tcltk_version();
-
-  if (tcltk_version.major < 8) {
-    /* Tcl/Tk 7.x */
-    return 1;
-  } else if (tcltk_version.major == 8) {
-    if (tcltk_version.minor < 5) {
-      /* Tcl/Tk 8.0 - 8.4 */
-      return 1;
-    } else if (tcltk_version.minor == 5) {
-      if (tcltk_version.type < TCL_FINAL_RELEASE) {
-	/* Tcl/Tk 8.5a? - 8.5b? */
-	return 1;
-      } else {
-	/* Tcl/Tk 8.5.x */
-	return 0;
-      }
-    } else {
-      /* Tcl/Tk 8.6 - 8.9 ?? */
-      return 0;
-    }
-  } else {
-    /* Tcl/Tk 9+ ?? */
-    return 0;
-  }
-#endif
-}
-#endif
-
-#define TRAP_CHECK() do { \
-    if (trap_check(check_var) == 0) return 0; \
-} while (0)
-
-static int
-trap_check(int *check_var)
-{
-    DUMP1("trap check");
-
-#ifdef RUBY_VM
-    if (rb_thread_check_trap_pending()) {
-	if (check_var != (int*)NULL) {
-	    /* wait command */
-	    return 0;
-	}
-	else {
-	    rb_thread_check_ints();
-	}
-    }
-#else
-    if (rb_trap_pending) {
-      run_timer_flag = 0;
-      if (rb_prohibit_interrupt || check_var != (int*)NULL) {
-	/* pending or on wait command */
-	return 0;
-      } else {
-	rb_trap_exec();
-      }
-    }
-#endif
-
-    return 1;
-}
-
-static int
-check_eventloop_interp(void)
-{
-  DUMP1("check eventloop_interp");
-  if (eventloop_interp != (Tcl_Interp*)NULL
-      && Tcl_InterpDeleted(eventloop_interp)) {
-    DUMP2("eventloop_interp(%p) was deleted", eventloop_interp);
-    return 1;
-  }
-
-  return 0;
-}
-
-static int
-lib_eventloop_core(check_root, update_flag, check_var, interp)
-    int check_root;
-    int update_flag;
-    int *check_var;
-    Tcl_Interp *interp;
-{
-    volatile VALUE current = eventloop_thread;
-    int found_event = 1;
-    int event_flag;
-#if 0
-    struct timeval t;
-#endif
-    int thr_crit_bup;
-    int status;
-    int depth = rbtk_eventloop_depth;
-#if USE_EVLOOP_THREAD_ALONE_CHECK_FLAG
-    int thread_alone_check_flag = 1;
-#else
-    enum {thread_alone_check_flag = 1};
-#endif
-
-    if (update_flag) DUMP1("update loop start!!");
-
-#if 0
-    t.tv_sec = 0;
-    t.tv_usec = 1000 * no_event_wait;
-#endif
-
-    Tcl_DeleteTimerHandler(timer_token);
-    run_timer_flag = 0;
-    if (timer_tick > 0) {
-        thr_crit_bup = rb_thread_critical;
-        rb_thread_critical = Qtrue;
-        timer_token = Tcl_CreateTimerHandler(timer_tick, _timer_for_tcl,
-                                             (ClientData)0);
-        rb_thread_critical = thr_crit_bup;
-    } else {
-        timer_token = (Tcl_TimerToken)NULL;
-    }
-
-#if USE_EVLOOP_THREAD_ALONE_CHECK_FLAG
-    /* version check */
-    thread_alone_check_flag = get_thread_alone_check_flag();
-#endif
-
-    for(;;) {
-        if (check_eventloop_interp()) return 0;
-
-        if (thread_alone_check_flag && rb_thread_alone()) {
-            DUMP1("no other thread");
-            event_loop_wait_event = 0;
-
-            if (update_flag) {
-                event_flag = update_flag;
-                /* event_flag = update_flag | TCL_DONT_WAIT; */ /* for safety */
-            } else {
-	        event_flag = TCL_ALL_EVENTS;
-	        /* event_flag = TCL_ALL_EVENTS | TCL_DONT_WAIT; */
-            }
-
-            if (timer_tick == 0 && update_flag == 0) {
-                timer_tick = NO_THREAD_INTERRUPT_TIME;
-                timer_token = Tcl_CreateTimerHandler(timer_tick,
-                                                     _timer_for_tcl,
-                                                     (ClientData)0);
-            }
-
-            if (check_var != (int *)NULL) {
-                if (*check_var || !found_event) {
-                    return found_event;
-                }
-                if (interp != (Tcl_Interp*)NULL
-                    && Tcl_InterpDeleted(interp)) {
-                    /* IP for check_var is deleted */
-                    return 0;
-                }
-            }
-
-            /* found_event = Tcl_DoOneEvent(event_flag); */
-            found_event = RTEST(rb_protect(call_DoOneEvent,
-                                           INT2FIX(event_flag), &status));
-            if (status) {
-                switch (status) {
-                case TAG_RAISE:
-                    if (NIL_P(rb_errinfo())) {
-                        rbtk_pending_exception
-                            = rb_exc_new2(rb_eException, "unknown exception");
-                    } else {
-                        rbtk_pending_exception = rb_errinfo();
-
-                        if (!NIL_P(rbtk_pending_exception)) {
-                            if (rbtk_eventloop_depth == 0) {
-                                VALUE exc = rbtk_pending_exception;
-                                rbtk_pending_exception = Qnil;
-                                rb_exc_raise(exc);
-                            } else {
-                                return 0;
-                            }
-                        }
-                    }
-                    break;
-
-                case TAG_FATAL:
-                    if (NIL_P(rb_errinfo())) {
-                        rb_exc_raise(rb_exc_new2(rb_eFatal, "FATAL"));
-                    } else {
-                        rb_exc_raise(rb_errinfo());
-                    }
-                }
-            }
-
-            if (depth != rbtk_eventloop_depth) {
-                DUMP2("DoOneEvent(1) abnormal exit!! %d",
-                      rbtk_eventloop_depth);
-            }
-
-            if (check_var != (int*)NULL && !NIL_P(rbtk_pending_exception)) {
-                DUMP1("exception on wait");
-                return 0;
-            }
-
-            if (pending_exception_check0()) {
-                /* pending -> upper level */
-                return 0;
-            }
-
-            if (update_flag != 0) {
-              if (found_event) {
-                DUMP1("next update loop");
-                continue;
-              } else {
-                DUMP1("update complete");
-                return 0;
-              }
-            }
-
-	    TRAP_CHECK();
-	    if (check_eventloop_interp()) return 0;
-
-	    DUMP1("check Root Widget");
-            if (check_root && tk_stubs_init_p() && Tk_GetNumMainWindows() == 0) {
-                run_timer_flag = 0;
-		TRAP_CHECK();
-                return 1;
-            }
-
-            if (loop_counter++ > 30000) {
-                /* fprintf(stderr, "loop_counter > 30000\n"); */
-                loop_counter = 0;
-            }
-
-        } else {
-            int tick_counter;
-
-            DUMP1("there are other threads");
-            event_loop_wait_event = 1;
-
-            found_event = 1;
-
-            if (update_flag) {
-                event_flag = update_flag; /* for safety */
-                /* event_flag = update_flag | TCL_DONT_WAIT; */ /* for safety */
-            } else {
-                event_flag = TCL_ALL_EVENTS;
-                /* event_flag = TCL_ALL_EVENTS | TCL_DONT_WAIT; */
-            }
-
-            timer_tick = req_timer_tick;
-            tick_counter = 0;
-            while(tick_counter < event_loop_max) {
-                if (check_var != (int *)NULL) {
-                    if (*check_var || !found_event) {
-                        return found_event;
-                    }
-                    if (interp != (Tcl_Interp*)NULL
-                        && Tcl_InterpDeleted(interp)) {
-                        /* IP for check_var is deleted */
-                        return 0;
-                    }
-                }
-
-                if (NIL_P(eventloop_thread) || current == eventloop_thread) {
-                    int st;
-                    int status;
-
-#ifdef RUBY_USE_NATIVE_THREAD
-		    if (update_flag) {
-		      st = RTEST(rb_protect(call_DoOneEvent,
-					    INT2FIX(event_flag), &status));
-		    } else {
-		      st = RTEST(rb_protect(call_DoOneEvent,
-					    INT2FIX(event_flag & window_event_mode),
-					    &status));
-#if USE_TOGGLE_WINDOW_MODE_FOR_IDLE
-		      if (!st) {
-			if (toggle_eventloop_window_mode_for_idle()) {
-			  /* idle-mode -> event-mode*/
-			  tick_counter = event_loop_max;
-			} else {
-			  /* event-mode -> idle-mode */
-			  tick_counter = 0;
-			}
-		      }
-#endif
-		    }
-#else
-                    /* st = Tcl_DoOneEvent(event_flag); */
-                    st = RTEST(rb_protect(call_DoOneEvent,
-                                          INT2FIX(event_flag), &status));
-#endif
-
-#if CONTROL_BY_STATUS_OF_RB_THREAD_WAITING_FOR_VALUE
-		    if (have_rb_thread_waiting_for_value) {
-		      have_rb_thread_waiting_for_value = 0;
-		      rb_thread_schedule();
-		    }
-#endif
-
-                    if (status) {
-                        switch (status) {
-                        case TAG_RAISE:
-                            if (NIL_P(rb_errinfo())) {
-                                rbtk_pending_exception
-                                    = rb_exc_new2(rb_eException,
-                                                  "unknown exception");
-                            } else {
-                                rbtk_pending_exception = rb_errinfo();
-
-                                if (!NIL_P(rbtk_pending_exception)) {
-                                    if (rbtk_eventloop_depth == 0) {
-                                        VALUE exc = rbtk_pending_exception;
-                                        rbtk_pending_exception = Qnil;
-                                        rb_exc_raise(exc);
-                                    } else {
-                                        return 0;
-                                    }
-                                }
-                            }
-                            break;
-
-                        case TAG_FATAL:
-                            if (NIL_P(rb_errinfo())) {
-                                rb_exc_raise(rb_exc_new2(rb_eFatal, "FATAL"));
-                            } else {
-                                rb_exc_raise(rb_errinfo());
-                            }
-                        }
-                    }
-
-                    if (depth != rbtk_eventloop_depth) {
-                        DUMP2("DoOneEvent(2) abnormal exit!! %d",
-                              rbtk_eventloop_depth);
-                        return 0;
-                    }
-
-		    TRAP_CHECK();
-
-                    if (check_var != (int*)NULL
-                        && !NIL_P(rbtk_pending_exception)) {
-                        DUMP1("exception on wait");
-                        return 0;
-                    }
-
-                    if (pending_exception_check0()) {
-                        /* pending -> upper level */
-                        return 0;
-                    }
-
-                    if (st) {
-                        tick_counter++;
-                    } else {
-                        if (update_flag != 0) {
-                            DUMP1("update complete");
-                            return 0;
-                        }
-
-                        tick_counter += no_event_tick;
-
-#if 0
-                        /* rb_thread_wait_for(t); */
-                        rb_protect(eventloop_sleep, Qnil, &status);
-
-                        if (status) {
-                            switch (status) {
-                            case TAG_RAISE:
-                                if (NIL_P(rb_errinfo())) {
-                                    rbtk_pending_exception
-                                        = rb_exc_new2(rb_eException,
-                                                      "unknown exception");
-                                } else {
-                                    rbtk_pending_exception = rb_errinfo();
-
-                                    if (!NIL_P(rbtk_pending_exception)) {
-                                        if (rbtk_eventloop_depth == 0) {
-                                            VALUE exc = rbtk_pending_exception;
-                                            rbtk_pending_exception = Qnil;
-                                            rb_exc_raise(exc);
-                                        } else {
-                                            return 0;
-                                        }
-                                    }
-                                }
-                                break;
-
-                            case TAG_FATAL:
-                                if (NIL_P(rb_errinfo())) {
-                                    rb_exc_raise(rb_exc_new2(rb_eFatal,
-                                                             "FATAL"));
-                                } else {
-                                    rb_exc_raise(rb_errinfo());
-                                }
-                            }
-                        }
-#endif
-                    }
-
-                } else {
-                    DUMP2("sleep eventloop %"PRIxVALUE, current);
-                    DUMP2("eventloop thread is %"PRIxVALUE, eventloop_thread);
-                    /* rb_thread_stop(); */
-                    rb_thread_sleep_forever();
-                }
-
-                if (!NIL_P(watchdog_thread) && eventloop_thread != current) {
-                    return 1;
-                }
-
-		TRAP_CHECK();
-		if (check_eventloop_interp()) return 0;
-
-                DUMP1("check Root Widget");
-                if (check_root && tk_stubs_init_p() && Tk_GetNumMainWindows() == 0) {
-                    run_timer_flag = 0;
-		    TRAP_CHECK();
-                    return 1;
-                }
-
-                if (loop_counter++ > 30000) {
-                    /* fprintf(stderr, "loop_counter > 30000\n"); */
-                    loop_counter = 0;
-                }
-
-                if (run_timer_flag) {
-                    /*
-                    DUMP1("timer interrupt");
-                    run_timer_flag = 0;
-                    */
-                    break; /* switch to other thread */
-                }
-            }
-
-            DUMP1("thread scheduling");
-            rb_thread_schedule();
-        }
-
-        DUMP1("check interrupts");
-#if defined(RUBY_USE_NATIVE_THREAD) || defined(RUBY_VM)
-	if (update_flag == 0) rb_thread_check_ints();
-#else
-        if (update_flag == 0) CHECK_INTS;
-#endif
-
-    }
-    return 1;
-}
-
-
-struct evloop_params {
-    int check_root;
-    int update_flag;
-    int *check_var;
-    Tcl_Interp *interp;
-    int thr_crit_bup;
-};
-
-VALUE
-lib_eventloop_main_core(args)
-    VALUE args;
-{
-    struct evloop_params *params = (struct evloop_params *)args;
-
-    check_rootwidget_flag = params->check_root;
-
-    Tcl_CreateEventSource(rbtk_EventSetupProc, rbtk_EventCheckProc, (ClientData)args);
-
-    if (lib_eventloop_core(params->check_root,
-                           params->update_flag,
-                           params->check_var,
-                           params->interp)) {
-        return Qtrue;
-    } else {
-        return Qfalse;
-    }
-}
-
-VALUE
-lib_eventloop_main(args)
-    VALUE args;
-{
-    return lib_eventloop_main_core(args);
-
-#if 0
-    volatile VALUE ret;
-    int status = 0;
-
-    ret = rb_protect(lib_eventloop_main_core, args, &status);
-
-    switch (status) {
-    case TAG_RAISE:
-        if (NIL_P(rb_errinfo())) {
-            rbtk_pending_exception
-                = rb_exc_new2(rb_eException, "unknown exception");
-        } else {
-            rbtk_pending_exception = rb_errinfo();
-        }
-        return Qnil;
-
-    case TAG_FATAL:
-        if (NIL_P(rb_errinfo())) {
-            rbtk_pending_exception = rb_exc_new2(rb_eFatal, "FATAL");
-        } else {
-            rbtk_pending_exception = rb_errinfo();
-        }
-        return Qnil;
-    }
-
-    return ret;
-#endif
-}
-
-VALUE
-lib_eventloop_ensure(args)
-    VALUE args;
-{
-    struct evloop_params *ptr = (struct evloop_params *)args;
-    volatile VALUE current_evloop = rb_thread_current();
-
-    Tcl_DeleteEventSource(rbtk_EventSetupProc, rbtk_EventCheckProc, (ClientData)args);
-
-    DUMP2("eventloop_ensure: current-thread : %"PRIxVALUE, current_evloop);
-    DUMP2("eventloop_ensure: eventloop-thread : %"PRIxVALUE, eventloop_thread);
-    if (eventloop_thread != current_evloop) {
-        DUMP2("finish eventloop %"PRIxVALUE" (NOT current eventloop)", current_evloop);
-
-	rb_thread_critical = ptr->thr_crit_bup;
-
-        xfree(ptr);
-        /* ckfree((char*)ptr); */
-
-        return Qnil;
-    }
-
-    while((eventloop_thread = rb_ary_pop(eventloop_stack))) {
-        DUMP2("eventloop-ensure: new eventloop-thread -> %"PRIxVALUE,
-              eventloop_thread);
-
-        if (eventloop_thread == current_evloop) {
-            rbtk_eventloop_depth--;
-            DUMP2("eventloop %"PRIxVALUE" : back from recursive call", current_evloop);
-            break;
-        }
-
-        if (NIL_P(eventloop_thread)) {
-          Tcl_DeleteTimerHandler(timer_token);
-          timer_token = (Tcl_TimerToken)NULL;
-
-          break;
-        }
-
-	if (RTEST(rb_thread_alive_p(eventloop_thread))) {
-            DUMP2("eventloop-enshure: wake up parent %"PRIxVALUE, eventloop_thread);
-            rb_thread_wakeup(eventloop_thread);
-
-            break;
-        }
-    }
-
-#ifdef RUBY_USE_NATIVE_THREAD
-    if (NIL_P(eventloop_thread)) {
-        tk_eventloop_thread_id = (Tcl_ThreadId) 0;
-    }
-#endif
-
-    rb_thread_critical = ptr->thr_crit_bup;
-
-    xfree(ptr);
-    /* ckfree((char*)ptr);*/
-
-    DUMP2("finish current eventloop %"PRIxVALUE, current_evloop);
-    return Qnil;
-}
-
-static VALUE
-lib_eventloop_launcher(check_root, update_flag, check_var, interp)
-    int check_root;
-    int update_flag;
-    int *check_var;
-    Tcl_Interp *interp;
-{
-    volatile VALUE parent_evloop = eventloop_thread;
-    struct evloop_params *args = ALLOC(struct evloop_params);
-    /* struct evloop_params *args = RbTk_ALLOC_N(struct evloop_params, 1); */
-
-    tcl_stubs_check();
-
-    eventloop_thread = rb_thread_current();
-#ifdef RUBY_USE_NATIVE_THREAD
-    tk_eventloop_thread_id = Tcl_GetCurrentThread();
-#endif
-
-    if (parent_evloop == eventloop_thread) {
-        DUMP2("eventloop: recursive call on %"PRIxVALUE, parent_evloop);
-        rbtk_eventloop_depth++;
-    }
-
-    if (!NIL_P(parent_evloop) && parent_evloop != eventloop_thread) {
-        DUMP2("wait for stop of parent_evloop %"PRIxVALUE, parent_evloop);
-        while(!RTEST(rb_funcall(parent_evloop, ID_stop_p, 0))) {
-            DUMP2("parent_evloop %"PRIxVALUE" doesn't stop", parent_evloop);
-            rb_thread_run(parent_evloop);
-        }
-        DUMP1("succeed to stop parent");
-    }
-
-    rb_ary_push(eventloop_stack, parent_evloop);
-
-    DUMP3("tcltklib: eventloop-thread : %"PRIxVALUE" -> %"PRIxVALUE"\n",
-                parent_evloop, eventloop_thread);
-
-    args->check_root   = check_root;
-    args->update_flag  = update_flag;
-    args->check_var    = check_var;
-    args->interp       = interp;
-    args->thr_crit_bup = rb_thread_critical;
-
-    rb_thread_critical = Qfalse;
-
-#if 0
-    return rb_ensure(lib_eventloop_main, (VALUE)args,
-                     lib_eventloop_ensure, (VALUE)args);
-#endif
-    return rb_ensure(lib_eventloop_main_core, (VALUE)args,
-                     lib_eventloop_ensure, (VALUE)args);
-}
-
-/* execute Tk_MainLoop */
-static VALUE
-lib_mainloop(argc, argv, self)
-    int   argc;
-    VALUE *argv;
-    VALUE self;
-{
-    VALUE check_rootwidget;
-
-    if (rb_scan_args(argc, argv, "01", &check_rootwidget) == 0) {
-        check_rootwidget = Qtrue;
-    } else if (RTEST(check_rootwidget)) {
-        check_rootwidget = Qtrue;
-    } else {
-        check_rootwidget = Qfalse;
-    }
-
-    return lib_eventloop_launcher(RTEST(check_rootwidget), 0,
-                                  (int*)NULL, (Tcl_Interp*)NULL);
-}
-
-static VALUE
-ip_mainloop(argc, argv, self)
-    int   argc;
-    VALUE *argv;
-    VALUE self;
-{
-    volatile VALUE ret;
-    struct tcltkip *ptr = get_ip(self);
-
-    /* ip is deleted? */
-    if (deleted_ip(ptr)) {
-        return Qnil;
-    }
-
-    if (Tcl_GetMaster(ptr->ip) != (Tcl_Interp*)NULL) {
-        /* slave IP */
-        return Qnil;
-    }
-
-    eventloop_interp = ptr->ip;
-    ret = lib_mainloop(argc, argv, self);
-    eventloop_interp = (Tcl_Interp*)NULL;
-    return ret;
-}
-
-
-static VALUE
-watchdog_evloop_launcher(check_rootwidget)
-    VALUE check_rootwidget;
-{
-    return lib_eventloop_launcher(RTEST(check_rootwidget), 0,
-                                  (int*)NULL, (Tcl_Interp*)NULL);
-}
-
-#define EVLOOP_WAKEUP_CHANCE 3
-
-static VALUE
-lib_watchdog_core(check_rootwidget)
-    VALUE check_rootwidget;
-{
-    VALUE evloop;
-    int   prev_val = -1;
-    int   chance = 0;
-    int   check = RTEST(check_rootwidget);
-    struct timeval t0, t1;
-
-    t0.tv_sec  = 0;
-    t0.tv_usec = (long)((NO_THREAD_INTERRUPT_TIME)*1000.0);
-    t1.tv_sec  = 0;
-    t1.tv_usec = (long)((WATCHDOG_INTERVAL)*1000.0);
-
-    /* check other watchdog thread */
-    if (!NIL_P(watchdog_thread)) {
-        if (RTEST(rb_funcall(watchdog_thread, ID_stop_p, 0))) {
-            rb_funcall(watchdog_thread, ID_kill, 0);
-        } else {
-            return Qnil;
-        }
-    }
-    watchdog_thread = rb_thread_current();
-
-    /* watchdog start */
-    do {
-        if (NIL_P(eventloop_thread)
-            || (loop_counter == prev_val && chance >= EVLOOP_WAKEUP_CHANCE)) {
-            /* start new eventloop thread */
-            DUMP2("eventloop thread %"PRIxVALUE" is sleeping or dead",
-                  eventloop_thread);
-            evloop = rb_thread_create(watchdog_evloop_launcher,
-                                      (void*)&check_rootwidget);
-            DUMP2("create new eventloop thread %"PRIxVALUE, evloop);
-            loop_counter = -1;
-            chance = 0;
-            rb_thread_run(evloop);
-        } else {
-            prev_val = loop_counter;
-            if (RTEST(rb_funcall(eventloop_thread, ID_stop_p, 0))) {
-                ++chance;
-            } else {
-                chance = 0;
-            }
-            if (event_loop_wait_event) {
-                rb_thread_wait_for(t0);
-            } else {
-                rb_thread_wait_for(t1);
-            }
-            /* rb_thread_schedule(); */
-        }
-    } while(!check || !tk_stubs_init_p() || Tk_GetNumMainWindows() != 0);
-
-    return Qnil;
-}
-
-VALUE
-lib_watchdog_ensure(arg)
-    VALUE arg;
-{
-    eventloop_thread = Qnil; /* stop eventloops */
-#ifdef RUBY_USE_NATIVE_THREAD
-    tk_eventloop_thread_id = (Tcl_ThreadId) 0;
-#endif
-    return Qnil;
-}
-
-static VALUE
-lib_mainloop_watchdog(argc, argv, self)
-    int   argc;
-    VALUE *argv;
-    VALUE self;
-{
-    VALUE check_rootwidget;
-
-#ifdef RUBY_VM
-    rb_raise(rb_eNotImpError,
-	     "eventloop_watchdog is not implemented on Ruby VM.");
-#endif
-
-    if (rb_scan_args(argc, argv, "01", &check_rootwidget) == 0) {
-        check_rootwidget = Qtrue;
-    } else if (RTEST(check_rootwidget)) {
-        check_rootwidget = Qtrue;
-    } else {
-        check_rootwidget = Qfalse;
-    }
-
-    return rb_ensure(lib_watchdog_core, check_rootwidget,
-                     lib_watchdog_ensure, Qnil);
-}
-
-static VALUE
-ip_mainloop_watchdog(argc, argv, self)
-    int   argc;
-    VALUE *argv;
-    VALUE self;
-{
-    struct tcltkip *ptr = get_ip(self);
-
-    /* ip is deleted? */
-    if (deleted_ip(ptr)) {
-        return Qnil;
-    }
-
-    if (Tcl_GetMaster(ptr->ip) != (Tcl_Interp*)NULL) {
-        /* slave IP */
-        return Qnil;
-    }
-    return lib_mainloop_watchdog(argc, argv, self);
-}
-
-
-/* thread-safe(?) interaction between Ruby and Tk */
-struct thread_call_proc_arg {
-    VALUE proc;
-    int *done;
-};
-
-void
-_thread_call_proc_arg_mark(struct thread_call_proc_arg *q)
-{
-    rb_gc_mark(q->proc);
-}
-
-static VALUE
-_thread_call_proc_core(arg)
-    VALUE arg;
-{
-    struct thread_call_proc_arg *q = (struct thread_call_proc_arg*)arg;
-    return rb_funcall(q->proc, ID_call, 0);
-}
-
-static VALUE
-_thread_call_proc_ensure(arg)
-    VALUE arg;
-{
-    struct thread_call_proc_arg *q = (struct thread_call_proc_arg*)arg;
-    *(q->done) = 1;
-    return Qnil;
-}
-
-static VALUE
-_thread_call_proc(arg)
-    VALUE arg;
-{
-    struct thread_call_proc_arg *q = (struct thread_call_proc_arg*)arg;
-
-    return rb_ensure(_thread_call_proc_core, (VALUE)q,
-                     _thread_call_proc_ensure, (VALUE)q);
-}
-
-static VALUE
-#ifdef HAVE_PROTOTYPES
-_thread_call_proc_value(VALUE th)
-#else
-_thread_call_proc_value(th)
-    VALUE th;
-#endif
-{
-    return rb_funcall(th, ID_value, 0);
-}
-
-static VALUE
-lib_thread_callback(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
-{
-    struct thread_call_proc_arg *q;
-    VALUE proc, th, ret;
-    int status;
-
-    if (rb_scan_args(argc, argv, "01", &proc) == 0) {
-        proc = rb_block_proc();
-    }
-
-    q = (struct thread_call_proc_arg *)ALLOC(struct thread_call_proc_arg);
-    /* q = RbTk_ALLOC_N(struct thread_call_proc_arg, 1); */
-    q->proc = proc;
-    q->done = (int*)ALLOC(int);
-    /* q->done = RbTk_ALLOC_N(int, 1); */
-    *(q->done) = 0;
-
-    /* create call-proc thread */
-    th = rb_thread_create(_thread_call_proc, (void*)q);
-
-    rb_thread_schedule();
-
-    /* start sub-eventloop */
-    lib_eventloop_launcher(/* not check root-widget */0, 0,
-			   q->done, (Tcl_Interp*)NULL);
-
-    if (RTEST(rb_thread_alive_p(th))) {
-        rb_funcall(th, ID_kill, 0);
-        ret = Qnil;
-    } else {
-        ret = rb_protect(_thread_call_proc_value, th, &status);
-    }
-
-    xfree(q->done);
-    xfree(q);
-    /* ckfree((char*)q->done); */
-    /* ckfree((char*)q); */
-
-    if (NIL_P(rbtk_pending_exception)) {
-        /* return rb_errinfo(); */
-        if (status) {
-            rb_exc_raise(rb_errinfo());
-        }
-    } else {
-        VALUE exc = rbtk_pending_exception;
-        rbtk_pending_exception = Qnil;
-        /* return exc; */
-        rb_exc_raise(exc);
-    }
-
-    return ret;
-}
-
-
-/* do_one_event */
-static VALUE
-lib_do_one_event_core(argc, argv, self, is_ip)
-    int   argc;
-    VALUE *argv;
-    VALUE self;
-    int   is_ip;
-{
-    VALUE vflags;
-    int flags;
-    int found_event;
-
-    if (!NIL_P(eventloop_thread)) {
-        rb_raise(rb_eRuntimeError, "eventloop is already running");
-    }
-
-    tcl_stubs_check();
-
-    if (rb_scan_args(argc, argv, "01", &vflags) == 0) {
-        flags = TCL_ALL_EVENTS | TCL_DONT_WAIT;
-    } else {
-        Check_Type(vflags, T_FIXNUM);
-        flags = (int)FIX2LONG(vflags);
-    }
-
-    if (is_ip) {
-        /* check IP */
-        struct tcltkip *ptr = get_ip(self);
-
-        /* ip is deleted? */
-        if (deleted_ip(ptr)) {
-            return Qfalse;
-        }
-
-        if (Tcl_GetMaster(ptr->ip) != (Tcl_Interp*)NULL) {
-            /* slave IP */
-            flags |= TCL_DONT_WAIT;
-        }
-    }
-
-    /* found_event = Tcl_DoOneEvent(TCL_ALL_EVENTS | TCL_DONT_WAIT); */
-    found_event = Tcl_DoOneEvent(flags);
-
-    if (pending_exception_check0()) {
-        return Qfalse;
-    }
-
-    if (found_event) {
-        return Qtrue;
-    } else {
-        return Qfalse;
-    }
-}
-
-static VALUE
-lib_do_one_event(argc, argv, self)
-    int   argc;
-    VALUE *argv;
-    VALUE self;
-{
-    return lib_do_one_event_core(argc, argv, self, 0);
-}
-
-static VALUE
-ip_do_one_event(argc, argv, self)
-    int   argc;
-    VALUE *argv;
-    VALUE self;
-{
-    return lib_do_one_event_core(argc, argv, self, 0);
-}
-
-
-static void
-ip_set_exc_message(interp, exc)
-    Tcl_Interp *interp;
-    VALUE exc;
-{
-    char *buf;
-    Tcl_DString dstr;
-    volatile VALUE msg;
-    int thr_crit_bup;
-
-#if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION > 0)
-    volatile VALUE enc;
-    Tcl_Encoding encoding;
-#endif
-
-    thr_crit_bup = rb_thread_critical;
-    rb_thread_critical = Qtrue;
-
-    msg = rb_funcallv(exc, ID_message, 0, 0);
-    StringValue(msg);
-
-#if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION > 0)
-    enc = rb_attr_get(exc, ID_at_enc);
-    if (NIL_P(enc)) {
-        enc = rb_attr_get(msg, ID_at_enc);
-    }
-    if (NIL_P(enc)) {
-        encoding = (Tcl_Encoding)NULL;
-    } else if (RB_TYPE_P(enc, T_STRING)) {
-        /* encoding = Tcl_GetEncoding(interp, RSTRING_PTR(enc)); */
-        encoding = Tcl_GetEncoding((Tcl_Interp*)NULL, RSTRING_PTR(enc));
-    } else {
-        enc = rb_funcallv(enc, ID_to_s, 0, 0);
-        /* encoding = Tcl_GetEncoding(interp, RSTRING_PTR(enc)); */
-        encoding = Tcl_GetEncoding((Tcl_Interp*)NULL, RSTRING_PTR(enc));
-    }
-
-    /* to avoid a garbled error message dialog */
-    /* buf = ALLOC_N(char, (RSTRING(msg)->len)+1);*/
-    /* memcpy(buf, RSTRING(msg)->ptr, RSTRING(msg)->len);*/
-    /* buf[RSTRING(msg)->len] = 0; */
-    buf = ALLOC_N(char, RSTRING_LENINT(msg)+1);
-    /* buf = ckalloc(RSTRING_LENINT(msg)+1); */
-    memcpy(buf, RSTRING_PTR(msg), RSTRING_LEN(msg));
-    buf[RSTRING_LEN(msg)] = 0;
-
-    Tcl_DStringInit(&dstr);
-    Tcl_DStringFree(&dstr);
-    Tcl_ExternalToUtfDString(encoding, buf, RSTRING_LENINT(msg), &dstr);
-
-    Tcl_AppendResult(interp, Tcl_DStringValue(&dstr), (char*)NULL);
-    DUMP2("error message:%s", Tcl_DStringValue(&dstr));
-    Tcl_DStringFree(&dstr);
-    xfree(buf);
-    /* ckfree(buf); */
-
-#else /* TCL_VERSION <= 8.0 */
-    Tcl_AppendResult(interp, RSTRING_PTR(msg), (char*)NULL);
-#endif
-
-    rb_thread_critical = thr_crit_bup;
-}
-
-static VALUE
-TkStringValue(obj)
-    VALUE obj;
-{
-    switch(TYPE(obj)) {
-    case T_STRING:
-        return obj;
-
-    case T_NIL:
-        return rb_str_new2("");
-
-    case T_TRUE:
-        return rb_str_new2("1");
-
-    case T_FALSE:
-        return rb_str_new2("0");
-
-    case T_ARRAY:
-        return rb_funcall(obj, ID_join, 1, rb_str_new2(" "));
-
-    default:
-        if (rb_respond_to(obj, ID_to_s)) {
-            return rb_funcallv(obj, ID_to_s, 0, 0);
-        }
-    }
-
-    return rb_funcallv(obj, ID_inspect, 0, 0);
-}
-
-static int
-#ifdef HAVE_PROTOTYPES
-tcl_protect_core(Tcl_Interp *interp, VALUE (*proc)(VALUE), VALUE data)
-#else
-tcl_protect_core(interp, proc, data) /* should not raise exception */
-    Tcl_Interp *interp;
-    VALUE (*proc)();
-    VALUE data;
-#endif
-{
-    volatile VALUE ret, exc = Qnil;
-    int status = 0;
-    int thr_crit_bup = rb_thread_critical;
-
-    Tcl_ResetResult(interp);
-
-    rb_thread_critical = Qfalse;
-    ret = rb_protect(proc, data, &status);
-    rb_thread_critical = Qtrue;
-    if (status) {
-        char *buf;
-        VALUE old_gc;
-        volatile VALUE type, str;
-
-        old_gc = rb_gc_disable();
-
-        switch(status) {
-        case TAG_RETURN:
-            type = eTkCallbackReturn;
-            goto error;
-        case TAG_BREAK:
-            type = eTkCallbackBreak;
-            goto error;
-        case TAG_NEXT:
-            type = eTkCallbackContinue;
-            goto error;
-        error:
-            str = rb_str_new2("LocalJumpError: ");
-            rb_str_append(str, rb_obj_as_string(rb_errinfo()));
-            exc = rb_exc_new3(type, str);
-            break;
-
-        case TAG_RETRY:
-            if (NIL_P(rb_errinfo())) {
-                DUMP1("rb_protect: retry");
-                exc = rb_exc_new2(eTkCallbackRetry, "retry jump error");
-            } else {
-                exc = rb_errinfo();
-            }
-            break;
-
-        case TAG_REDO:
-            if (NIL_P(rb_errinfo())) {
-                DUMP1("rb_protect: redo");
-                exc = rb_exc_new2(eTkCallbackRedo,  "redo jump error");
-            } else {
-                exc = rb_errinfo();
-            }
-            break;
-
-        case TAG_RAISE:
-            if (NIL_P(rb_errinfo())) {
-                exc = rb_exc_new2(rb_eException, "unknown exception");
-            } else {
-                exc = rb_errinfo();
-            }
-            break;
-
-        case TAG_FATAL:
-            if (NIL_P(rb_errinfo())) {
-                exc = rb_exc_new2(rb_eFatal, "FATAL");
-            } else {
-                exc = rb_errinfo();
-            }
-            break;
-
-        case TAG_THROW:
-            if (NIL_P(rb_errinfo())) {
-                DUMP1("rb_protect: throw");
-                exc = rb_exc_new2(eTkCallbackThrow,  "throw jump error");
-            } else {
-                exc = rb_errinfo();
-            }
-            break;
-
-        default:
-            buf = ALLOC_N(char, 256);
-            /* buf = ckalloc(sizeof(char) * 256); */
-            sprintf(buf, "unknown loncaljmp status %d", status);
-            exc = rb_exc_new2(rb_eException, buf);
-            xfree(buf);
-            /* ckfree(buf); */
-            break;
-        }
-
-        if (old_gc == Qfalse) rb_gc_enable();
-
-        ret = Qnil;
-    }
-
-    rb_thread_critical = thr_crit_bup;
-
-    Tcl_ResetResult(interp);
-
-    /* status check */
-    if (!NIL_P(exc)) {
-        volatile VALUE eclass = rb_obj_class(exc);
-        volatile VALUE backtrace;
-
-        DUMP1("(failed)");
-
-        thr_crit_bup = rb_thread_critical;
-        rb_thread_critical = Qtrue;
-
-        DUMP1("set backtrace");
-        if (!NIL_P(backtrace = rb_funcallv(exc, ID_backtrace, 0, 0))) {
-            backtrace = rb_ary_join(backtrace, rb_str_new2("\n"));
-            Tcl_AddErrorInfo(interp, StringValuePtr(backtrace));
-        }
-
-        rb_thread_critical = thr_crit_bup;
-
-        ip_set_exc_message(interp, exc);
-
-        if (eclass == eTkCallbackReturn)
-            return TCL_RETURN;
-
-        if (eclass == eTkCallbackBreak)
-            return TCL_BREAK;
-
-        if (eclass == eTkCallbackContinue)
-            return TCL_CONTINUE;
-
-        if (eclass == rb_eSystemExit || eclass == rb_eInterrupt) {
-            rbtk_pending_exception = exc;
-            return TCL_RETURN;
-        }
-
-        if (rb_obj_is_kind_of(exc, eTkLocalJumpError)) {
-            rbtk_pending_exception = exc;
-            return TCL_ERROR;
-        }
-
-        if (rb_obj_is_kind_of(exc, eLocalJumpError)) {
-            VALUE reason = rb_ivar_get(exc, ID_at_reason);
-
-            if (RB_TYPE_P(reason, T_SYMBOL)) {
-                if (SYM2ID(reason) == ID_return)
-                    return TCL_RETURN;
-
-                if (SYM2ID(reason) == ID_break)
-                    return TCL_BREAK;
-
-                if (SYM2ID(reason) == ID_next)
-                    return TCL_CONTINUE;
-            }
-        }
-
-        return TCL_ERROR;
-    }
-
-    /* result must be string or nil */
-    if (!NIL_P(ret)) {
-        /* copy result to the tcl interpreter */
-        thr_crit_bup = rb_thread_critical;
-        rb_thread_critical = Qtrue;
-
-        ret = TkStringValue(ret);
-        DUMP1("Tcl_AppendResult");
-        Tcl_AppendResult(interp, RSTRING_PTR(ret), (char *)NULL);
-
-        rb_thread_critical = thr_crit_bup;
-    }
-
-    DUMP2("(result) %s", NIL_P(ret) ? "nil" : RSTRING_PTR(ret));
-
-    return TCL_OK;
-}
-
-static int
-tcl_protect(interp, proc, data)
-    Tcl_Interp *interp;
-    VALUE (*proc)();
-    VALUE data;
-{
-    int code;
-
-#ifdef HAVE_NATIVETHREAD
-#ifndef RUBY_USE_NATIVE_THREAD
-    if (!ruby_native_thread_p()) {
-        rb_bug("cross-thread violation on tcl_protect()");
-    }
-#endif
-#endif
-
-#ifdef RUBY_VM
-    code = tcl_protect_core(interp, proc, data);
-#else
-    do {
-      int old_trapflag = rb_trap_immediate;
-      rb_trap_immediate = 0;
-      code = tcl_protect_core(interp, proc, data);
-      rb_trap_immediate = old_trapflag;
-    } while (0);
-#endif
-
-    return code;
-}
-
-static int
-#if TCL_MAJOR_VERSION >= 8
-ip_ruby_eval(clientData, interp, argc, argv)
-    ClientData clientData;
-    Tcl_Interp *interp;
-    int argc;
-    Tcl_Obj *CONST argv[];
-#else /* TCL_MAJOR_VERSION < 8 */
-ip_ruby_eval(clientData, interp, argc, argv)
-    ClientData clientData;
-    Tcl_Interp *interp;
-    int argc;
-    char *argv[];
-#endif
-{
-    char *arg;
-    int thr_crit_bup;
-    int code;
-
-    if (interp == (Tcl_Interp*)NULL) {
-        rbtk_pending_exception = rb_exc_new2(rb_eRuntimeError,
-                                             "IP is deleted");
-        return TCL_ERROR;
-    }
-
-    /* ruby command has 1 arg. */
-    if (argc != 2) {
-#if 0
-        rb_raise(rb_eArgError,
-                 "wrong number of arguments (%d for 1)", argc - 1);
-#else
-        char buf[sizeof(int)*8 + 1];
-        Tcl_ResetResult(interp);
-        sprintf(buf, "%d", argc-1);
-        Tcl_AppendResult(interp, "wrong number of arguments (",
-                         buf, " for 1)", (char *)NULL);
-        rbtk_pending_exception = rb_exc_new2(rb_eArgError,
-                                             Tcl_GetStringResult(interp));
-        return TCL_ERROR;
-#endif
-    }
-
-    /* get C string from Tcl object */
-#if TCL_MAJOR_VERSION >= 8
-    {
-      char *str;
-      int  len;
-
-      thr_crit_bup = rb_thread_critical;
-      rb_thread_critical = Qtrue;
-
-      str = Tcl_GetStringFromObj(argv[1], &len);
-      arg = ALLOC_N(char, len + 1);
-      /* arg = ckalloc(sizeof(char) * (len + 1)); */
-      memcpy(arg, str, len);
-      arg[len] = 0;
-
-      rb_thread_critical = thr_crit_bup;
-
-    }
-#else /* TCL_MAJOR_VERSION < 8 */
-    arg = argv[1];
-#endif
-
-    /* evaluate the argument string by ruby */
-    DUMP2("rb_eval_string(%s)", arg);
-
-    code = tcl_protect(interp, rb_eval_string, (VALUE)arg);
-
-#if TCL_MAJOR_VERSION >= 8
-    xfree(arg);
-    /* ckfree(arg); */
-#endif
-
-    return code;
-}
-
-
-/* Tcl command `ruby_cmd' */
-static VALUE
-ip_ruby_cmd_core(arg)
-    struct cmd_body_arg *arg;
-{
-    volatile VALUE ret;
-    int thr_crit_bup;
-
-    DUMP1("call ip_ruby_cmd_core");
-    thr_crit_bup = rb_thread_critical;
-    rb_thread_critical = Qfalse;
-    ret = rb_apply(arg->receiver, arg->method, arg->args);
-    DUMP2("rb_apply return:%"PRIxVALUE, ret);
-    rb_thread_critical = thr_crit_bup;
-    DUMP1("finish ip_ruby_cmd_core");
-
-    return ret;
-}
-
-static VALUE
-ip_ruby_cmd_receiver_const_get(name)
-     char *name;
-{
-    return rb_path2class(name);
-}
-
-static VALUE
-ip_ruby_cmd_receiver_get(str)
-     char *str;
-{
-  volatile VALUE receiver;
-  int state;
-
-  if (str[0] == ':' || ('A' <= str[0] && str[0] <= 'Z')) {
-    /* class | module | constant */
-    receiver = rb_protect(ip_ruby_cmd_receiver_const_get, (VALUE)str, &state);
-    if (state) return Qnil;
-  } else if (str[0] == '$') {
-    /* global variable */
-    receiver = rb_gv_get(str);
-  } else {
-    /* global variable omitted '$' */
-    char *buf;
-    size_t len;
-
-    len = strlen(str);
-    buf = ALLOC_N(char, len + 2);
-    /* buf = ckalloc(sizeof(char) * (len + 2)); */
-    buf[0] = '$';
-    memcpy(buf + 1, str, len);
-    buf[len + 1] = 0;
-    receiver = rb_gv_get(buf);
-    xfree(buf);
-    /* ckfree(buf); */
-  }
-
-  return receiver;
-}
-
-/* ruby_cmd receiver method arg ... */
-static int
-#if TCL_MAJOR_VERSION >= 8
-ip_ruby_cmd(clientData, interp, argc, argv)
-    ClientData clientData;
-    Tcl_Interp *interp;
-    int argc;
-    Tcl_Obj *CONST argv[];
-#else /* TCL_MAJOR_VERSION < 8 */
-ip_ruby_cmd(clientData, interp, argc, argv)
-    ClientData clientData;
-    Tcl_Interp *interp;
-    int argc;
-    char *argv[];
-#endif
-{
-    volatile VALUE receiver;
-    volatile ID method;
-    volatile VALUE args;
-    char *str;
-    int i;
-    int  len;
-    struct cmd_body_arg *arg;
-    int thr_crit_bup;
-    VALUE old_gc;
-    int code;
-
-    if (interp == (Tcl_Interp*)NULL) {
-        rbtk_pending_exception = rb_exc_new2(rb_eRuntimeError,
-                                             "IP is deleted");
-        return TCL_ERROR;
-    }
-
-    if (argc < 3) {
-#if 0
-        rb_raise(rb_eArgError, "too few arguments");
-#else
-        Tcl_ResetResult(interp);
-        Tcl_AppendResult(interp, "too few arguments", (char *)NULL);
-        rbtk_pending_exception = rb_exc_new2(rb_eArgError,
-                                             Tcl_GetStringResult(interp));
-        return TCL_ERROR;
-#endif
-    }
-
-    /* get arguments from Tcl objects */
-    thr_crit_bup = rb_thread_critical;
-    rb_thread_critical = Qtrue;
-    old_gc = rb_gc_disable();
-
-    /* get receiver */
-#if TCL_MAJOR_VERSION >= 8
-    str = Tcl_GetStringFromObj(argv[1], &len);
-#else /* TCL_MAJOR_VERSION < 8 */
-    str = argv[1];
-#endif
-    DUMP2("receiver:%s",str);
-    /* receiver = rb_protect(ip_ruby_cmd_receiver_get, (VALUE)str, &code); */
-    receiver = ip_ruby_cmd_receiver_get(str);
-    if (NIL_P(receiver)) {
-#if 0
-        rb_raise(rb_eArgError,
-                 "unknown class/module/global-variable '%s'", str);
-#else
-        Tcl_ResetResult(interp);
-        Tcl_AppendResult(interp, "unknown class/module/global-variable '",
-                         str, "'", (char *)NULL);
-        rbtk_pending_exception = rb_exc_new2(rb_eArgError,
-                                             Tcl_GetStringResult(interp));
-        if (old_gc == Qfalse) rb_gc_enable();
-        return TCL_ERROR;
-#endif
-    }
-
-    /* get metrhod */
-#if TCL_MAJOR_VERSION >= 8
-    str = Tcl_GetStringFromObj(argv[2], &len);
-#else /* TCL_MAJOR_VERSION < 8 */
-    str = argv[2];
-#endif
-    method = rb_intern(str);
-
-    /* get args */
-    args = rb_ary_new2(argc - 2);
-    for(i = 3; i < argc; i++) {
-        VALUE s;
-#if TCL_MAJOR_VERSION >= 8
-        str = Tcl_GetStringFromObj(argv[i], &len);
-        s = rb_tainted_str_new(str, len);
-#else /* TCL_MAJOR_VERSION < 8 */
-        str = argv[i];
-        s = rb_tainted_str_new2(str);
-#endif
-        DUMP2("arg:%s",str);
-        rb_ary_push(args, s);
-    }
-
-    if (old_gc == Qfalse) rb_gc_enable();
-    rb_thread_critical = thr_crit_bup;
-
-    /* allocate */
-    arg = ALLOC(struct cmd_body_arg);
-    /* arg = RbTk_ALLOC_N(struct cmd_body_arg, 1); */
-
-    arg->receiver = receiver;
-    arg->method = method;
-    arg->args = args;
-
-    /* evaluate the argument string by ruby */
-    code = tcl_protect(interp, ip_ruby_cmd_core, (VALUE)arg);
-
-    xfree(arg);
-    /* ckfree((char*)arg); */
-
-    return code;
-}
-
-
-/*****************************/
-/* relpace of 'exit' command */
-/*****************************/
-static int
-#if TCL_MAJOR_VERSION >= 8
-#ifdef HAVE_PROTOTYPES
-ip_InterpExitObjCmd(ClientData clientData, Tcl_Interp *interp,
-		    int argc, Tcl_Obj *CONST argv[])
-#else
-ip_InterpExitObjCmd(clientData, interp, argc, argv)
-    ClientData clientData;
-    Tcl_Interp *interp;
-    int argc;
-    Tcl_Obj *CONST argv[];
-#endif
-#else /* TCL_MAJOR_VERSION < 8 */
-#ifdef HAVE_PROTOTYPES
-ip_InterpExitCommand(ClientData clientData, Tcl_Interp *interp,
-		     int argc, char *argv[])
-#else
-ip_InterpExitCommand(clientData, interp, argc, argv)
-    ClientData clientData;
-    Tcl_Interp *interp;
-    int argc;
-    char *argv[];
-#endif
-#endif
-{
-    DUMP1("start ip_InterpExitCommand");
-    if (interp != (Tcl_Interp*)NULL
-        && !Tcl_InterpDeleted(interp)
-#if TCL_NAMESPACE_DEBUG
-        && !ip_null_namespace(interp)
-#endif
-        ) {
-        Tcl_ResetResult(interp);
-        /* Tcl_Preserve(interp); */
-        /* Tcl_Eval(interp, "interp eval {} {destroy .}; interp delete {}"); */
-	if (!Tcl_InterpDeleted(interp)) {
-	  ip_finalize(interp);
-
-	  Tcl_DeleteInterp(interp);
-	  Tcl_Release(interp);
-	}
-    }
-    return TCL_OK;
-}
-
-static int
-#if TCL_MAJOR_VERSION >= 8
-#ifdef HAVE_PROTOTYPES
-ip_RubyExitObjCmd(ClientData clientData, Tcl_Interp *interp,
-		  int argc, Tcl_Obj *CONST argv[])
-#else
-ip_RubyExitObjCmd(clientData, interp, argc, argv)
-    ClientData clientData;
-    Tcl_Interp *interp;
-    int argc;
-    Tcl_Obj *CONST argv[];
-#endif
-#else /* TCL_MAJOR_VERSION < 8 */
-#ifdef HAVE_PROTOTYPES
-ip_RubyExitCommand(ClientData clientData, Tcl_Interp *interp,
-		   int argc, char *argv[])
-#else
-ip_RubyExitCommand(clientData, interp, argc, argv)
-    ClientData clientData;
-    Tcl_Interp *interp;
-    int argc;
-    char *argv[];
-#endif
-#endif
-{
-    int state;
-    char *cmd, *param;
-#if TCL_MAJOR_VERSION < 8
-    char *endptr;
-    cmd = argv[0];
-#endif
-
-    DUMP1("start ip_RubyExitCommand");
-
-#if TCL_MAJOR_VERSION >= 8
-    /* cmd = Tcl_GetString(argv[0]); */
-    cmd = Tcl_GetStringFromObj(argv[0], (int*)NULL);
-#endif
-
-    if (argc < 1 || argc > 2) {
-        /* argument error */
-        Tcl_AppendResult(interp,
-                         "wrong number of arguments: should be \"",
-                         cmd, " ?returnCode?\"", (char *)NULL);
-        return TCL_ERROR;
-    }
-
-    if (interp == (Tcl_Interp*)NULL) return TCL_OK;
-
-    Tcl_ResetResult(interp);
-
-    if (Tcl_IsSafe(interp)) {
-	if (!Tcl_InterpDeleted(interp)) {
-	  ip_finalize(interp);
-
-	  Tcl_DeleteInterp(interp);
-	  Tcl_Release(interp);
-	}
-        return TCL_OK;
-    }
-
-    switch(argc) {
-    case 1:
-        /* rb_exit(0); */ /* not return if succeed */
-        Tcl_AppendResult(interp,
-                         "fail to call \"", cmd, "\"", (char *)NULL);
-
-        rbtk_pending_exception = rb_exc_new2(rb_eSystemExit,
-                                             Tcl_GetStringResult(interp));
-        rb_iv_set(rbtk_pending_exception, "status", INT2FIX(0));
-
-        return TCL_RETURN;
-
-    case 2:
-#if TCL_MAJOR_VERSION >= 8
-        if (Tcl_GetIntFromObj(interp, argv[1], &state) == TCL_ERROR) {
-            return TCL_ERROR;
-        }
-        /* param = Tcl_GetString(argv[1]); */
-        param = Tcl_GetStringFromObj(argv[1], (int*)NULL);
-#else /* TCL_MAJOR_VERSION < 8 */
-        state = (int)strtol(argv[1], &endptr, 0);
-        if (*endptr) {
-            Tcl_AppendResult(interp,
-                             "expected integer but got \"",
-                             argv[1], "\"", (char *)NULL);
-            return TCL_ERROR;
-        }
-        param = argv[1];
-#endif
-        /* rb_exit(state); */ /* not return if succeed */
-
-        Tcl_AppendResult(interp, "fail to call \"", cmd, " ",
-                         param, "\"", (char *)NULL);
-
-        rbtk_pending_exception = rb_exc_new2(rb_eSystemExit,
-                                             Tcl_GetStringResult(interp));
-        rb_iv_set(rbtk_pending_exception, "status", INT2FIX(state));
-
-        return TCL_RETURN;
-
-    default:
-        /* argument error */
-        Tcl_AppendResult(interp,
-                         "wrong number of arguments: should be \"",
-                         cmd, " ?returnCode?\"", (char *)NULL);
-        return TCL_ERROR;
-    }
-}
-
-
-/**************************/
-/*  based on tclEvent.c   */
-/**************************/
-
-/*********************/
-/* replace of update */
-/*********************/
-#if TCL_MAJOR_VERSION >= 8
-static int ip_rbUpdateObjCmd _((ClientData, Tcl_Interp *, int,
-                               Tcl_Obj *CONST []));
-static int
-ip_rbUpdateObjCmd(clientData, interp, objc, objv)
-    ClientData clientData;
-    Tcl_Interp *interp;
-    int objc;
-    Tcl_Obj *CONST objv[];
-#else /* TCL_MAJOR_VERSION < 8 */
-static int ip_rbUpdateCommand _((ClientData, Tcl_Interp *, int, char *[]));
-static int
-ip_rbUpdateCommand(clientData, interp, objc, objv)
-    ClientData clientData;
-    Tcl_Interp *interp;
-    int objc;
-    char *objv[];
-#endif
-{
-    int  flags = 0;
-    static CONST char *updateOptions[] = {"idletasks", (char *) NULL};
-    enum updateOptions {REGEXP_IDLETASKS};
-
-    DUMP1("Ruby's 'update' is called");
-    if (interp == (Tcl_Interp*)NULL) {
-        rbtk_pending_exception = rb_exc_new2(rb_eRuntimeError,
-                                             "IP is deleted");
-        return TCL_ERROR;
-    }
-#ifdef HAVE_NATIVETHREAD
-#ifndef RUBY_USE_NATIVE_THREAD
-    if (!ruby_native_thread_p()) {
-        rb_bug("cross-thread violation on ip_ruby_eval()");
-    }
-#endif
-#endif
-
-    Tcl_ResetResult(interp);
-
-    if (objc == 1) {
-        flags = TCL_DONT_WAIT;
-
-    } else if (objc == 2) {
-#if TCL_MAJOR_VERSION >= 8
-        int  optionIndex;
-        if (Tcl_GetIndexFromObj(interp, objv[1], (CONST84 char **)updateOptions,
-                "option", 0, &optionIndex) != TCL_OK) {
-            return TCL_ERROR;
-        }
-        switch ((enum updateOptions) optionIndex) {
-            case REGEXP_IDLETASKS: {
-                flags = TCL_IDLE_EVENTS;
-                break;
-            }
-            default: {
-                rb_bug("ip_rbUpdateObjCmd: bad option index to UpdateOptions");
-            }
-        }
-#else
-        if (strncmp(objv[1], "idletasks", strlen(objv[1])) != 0) {
-            Tcl_AppendResult(interp, "bad option \"", objv[1],
-                    "\": must be idletasks", (char *) NULL);
-            return TCL_ERROR;
-        }
-        flags = TCL_IDLE_EVENTS;
-#endif
-    } else {
-#ifdef Tcl_WrongNumArgs
-        Tcl_WrongNumArgs(interp, 1, objv, "[ idletasks ]");
-#else
-# if TCL_MAJOR_VERSION >= 8
-        int  dummy;
-        Tcl_AppendResult(interp, "wrong number of arguments: should be \"",
-                         Tcl_GetStringFromObj(objv[0], &dummy),
-                         " [ idletasks ]\"",
-                         (char *) NULL);
-# else /* TCL_MAJOR_VERSION < 8 */
-        Tcl_AppendResult(interp, "wrong number of arguments: should be \"",
-                         objv[0], " [ idletasks ]\"", (char *) NULL);
-# endif
-#endif
-        return TCL_ERROR;
-    }
-
-    Tcl_Preserve(interp);
-
-    /* call eventloop */
-    /* ret = lib_eventloop_core(0, flags, (int *)NULL);*/ /* ignore result */
-    lib_eventloop_launcher(0, flags, (int *)NULL, interp); /* ignore result */
-
-    /* exception check */
-    if (!NIL_P(rbtk_pending_exception)) {
-        Tcl_Release(interp);
-
-        /*
-        if (rb_obj_is_kind_of(rbtk_pending_exception, rb_eSystemExit)) {
-        */
-        if (rb_obj_is_kind_of(rbtk_pending_exception, rb_eSystemExit)
-            || rb_obj_is_kind_of(rbtk_pending_exception, rb_eInterrupt)) {
-            return TCL_RETURN;
-        } else{
-            return TCL_ERROR;
-        }
-    }
-
-    /* trap check */
-    if (rb_thread_check_trap_pending()) {
-        Tcl_Release(interp);
-
-        return TCL_RETURN;
-    }
-
-    /*
-     * Must clear the interpreter's result because event handlers could
-     * have executed commands.
-     */
-
-    DUMP2("last result '%s'", Tcl_GetStringResult(interp));
-    Tcl_ResetResult(interp);
-    Tcl_Release(interp);
-
-    DUMP1("finish Ruby's 'update'");
-    return TCL_OK;
-}
-
-
-/**********************/
-/* update with thread */
-/**********************/
-struct th_update_param {
-    VALUE thread;
-    int   done;
-};
-
-static void rb_threadUpdateProc _((ClientData));
-static void
-rb_threadUpdateProc(clientData)
-    ClientData clientData;      /* Pointer to integer to set to 1. */
-{
-    struct th_update_param *param = (struct th_update_param *) clientData;
-
-    DUMP1("threadUpdateProc is called");
-    param->done = 1;
-    rb_thread_wakeup(param->thread);
-
-    return;
-}
-
-#if TCL_MAJOR_VERSION >= 8
-static int ip_rb_threadUpdateObjCmd _((ClientData, Tcl_Interp *, int,
-                                       Tcl_Obj *CONST []));
-static int
-ip_rb_threadUpdateObjCmd(clientData, interp, objc, objv)
-    ClientData clientData;
-    Tcl_Interp *interp;
-    int objc;
-    Tcl_Obj *CONST objv[];
-#else /* TCL_MAJOR_VERSION < 8 */
-static int ip_rb_threadUpdateCommand _((ClientData, Tcl_Interp *, int,
-                                       char *[]));
-static int
-ip_rb_threadUpdateCommand(clientData, interp, objc, objv)
-    ClientData clientData;
-    Tcl_Interp *interp;
-    int objc;
-    char *objv[];
-#endif
-{
-# if 0
-    int  flags = 0;
-# endif
-    struct th_update_param *param;
-    static CONST char *updateOptions[] = {"idletasks", (char *) NULL};
-    enum updateOptions {REGEXP_IDLETASKS};
-    volatile VALUE current_thread = rb_thread_current();
-    struct timeval t;
-
-    DUMP1("Ruby's 'thread_update' is called");
-    if (interp == (Tcl_Interp*)NULL) {
-        rbtk_pending_exception = rb_exc_new2(rb_eRuntimeError,
-                                             "IP is deleted");
-        return TCL_ERROR;
-    }
-#ifdef HAVE_NATIVETHREAD
-#ifndef RUBY_USE_NATIVE_THREAD
-    if (!ruby_native_thread_p()) {
-        rb_bug("cross-thread violation on ip_rb_threadUpdateCommand()");
-    }
-#endif
-#endif
-
-    if (rb_thread_alone()
-        || NIL_P(eventloop_thread) || eventloop_thread == current_thread) {
-#if TCL_MAJOR_VERSION >= 8
-        DUMP1("call ip_rbUpdateObjCmd");
-        return ip_rbUpdateObjCmd(clientData, interp, objc, objv);
-#else /* TCL_MAJOR_VERSION < 8 */
-        DUMP1("call ip_rbUpdateCommand");
-        return ip_rbUpdateCommand(clientData, interp, objc, objv);
-#endif
-    }
-
-    DUMP1("start Ruby's 'thread_update' body");
-
-    Tcl_ResetResult(interp);
-
-    if (objc == 1) {
-# if 0
-        flags = TCL_DONT_WAIT;
-# endif
-    } else if (objc == 2) {
-#if TCL_MAJOR_VERSION >= 8
-        int  optionIndex;
-        if (Tcl_GetIndexFromObj(interp, objv[1], (CONST84 char **)updateOptions,
-                "option", 0, &optionIndex) != TCL_OK) {
-            return TCL_ERROR;
-        }
-        switch ((enum updateOptions) optionIndex) {
-            case REGEXP_IDLETASKS: {
-# if 0
-                flags = TCL_IDLE_EVENTS;
-# endif
-                break;
-            }
-            default: {
-                rb_bug("ip_rb_threadUpdateObjCmd: bad option index to UpdateOptions");
-            }
-        }
-#else
-        if (strncmp(objv[1], "idletasks", strlen(objv[1])) != 0) {
-            Tcl_AppendResult(interp, "bad option \"", objv[1],
-                    "\": must be idletasks", (char *) NULL);
-            return TCL_ERROR;
-        }
-# if 0
-        flags = TCL_IDLE_EVENTS;
-# endif
-#endif
-    } else {
-#ifdef Tcl_WrongNumArgs
-        Tcl_WrongNumArgs(interp, 1, objv, "[ idletasks ]");
-#else
-# if TCL_MAJOR_VERSION >= 8
-        int  dummy;
-        Tcl_AppendResult(interp, "wrong number of arguments: should be \"",
-                         Tcl_GetStringFromObj(objv[0], &dummy),
-                         " [ idletasks ]\"",
-                         (char *) NULL);
-# else /* TCL_MAJOR_VERSION < 8 */
-        Tcl_AppendResult(interp, "wrong number of arguments: should be \"",
-                         objv[0], " [ idletasks ]\"", (char *) NULL);
-# endif
-#endif
-        return TCL_ERROR;
-    }
-
-    DUMP1("pass argument check");
-
-    /* param = (struct th_update_param *)Tcl_Alloc(sizeof(struct th_update_param)); */
-    param = RbTk_ALLOC_N(struct th_update_param, 1);
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Preserve((ClientData)param);
-#endif
-    param->thread = current_thread;
-    param->done = 0;
-
-    DUMP1("set idle proc");
-    Tcl_DoWhenIdle(rb_threadUpdateProc, (ClientData) param);
-
-    t.tv_sec  = 0;
-    t.tv_usec = (long)((EVENT_HANDLER_TIMEOUT)*1000.0);
-
-    while(!param->done) {
-      DUMP1("wait for complete idle proc");
-      /* rb_thread_stop(); */
-      /* rb_thread_sleep_forever(); */
-      rb_thread_wait_for(t);
-      if (NIL_P(eventloop_thread)) {
-	break;
-      }
-    }
-
-#if 0 /* use Tcl_EventuallyFree */
-	Tcl_EventuallyFree((ClientData)param, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Release((ClientData)param);
-#else
-    /* Tcl_Free((char *)param); */
-    ckfree((char *)param);
-#endif
-#endif
-
-    DUMP1("finish Ruby's 'thread_update'");
-    return TCL_OK;
-}
-
-
-/***************************/
-/* replace of vwait/tkwait */
-/***************************/
-#if TCL_MAJOR_VERSION >= 8
-static int ip_rbVwaitObjCmd _((ClientData, Tcl_Interp *, int,
-                               Tcl_Obj *CONST []));
-static int ip_rb_threadVwaitObjCmd _((ClientData, Tcl_Interp *, int,
-                                      Tcl_Obj *CONST []));
-static int ip_rbTkWaitObjCmd _((ClientData, Tcl_Interp *, int,
-                                Tcl_Obj *CONST []));
-static int ip_rb_threadTkWaitObjCmd _((ClientData, Tcl_Interp *, int,
-                                       Tcl_Obj *CONST []));
-#else
-static int ip_rbVwaitCommand _((ClientData, Tcl_Interp *, int, char *[]));
-static int ip_rb_threadVwaitCommand _((ClientData, Tcl_Interp *, int,
-                                       char *[]));
-static int ip_rbTkWaitCommand _((ClientData, Tcl_Interp *, int, char *[]));
-static int ip_rb_threadTkWaitCommand _((ClientData, Tcl_Interp *, int,
-                                        char *[]));
-#endif
-
-#if TCL_MAJOR_VERSION >= 8
-static char *VwaitVarProc _((ClientData, Tcl_Interp *,
-                             CONST84 char *,CONST84 char *, int));
-static char *
-VwaitVarProc(clientData, interp, name1, name2, flags)
-    ClientData clientData;      /* Pointer to integer to set to 1. */
-    Tcl_Interp *interp;         /* Interpreter containing variable. */
-    CONST84 char *name1;        /* Name of variable. */
-    CONST84 char *name2;        /* Second part of variable name. */
-    int flags;                  /* Information about what happened. */
-#else /* TCL_MAJOR_VERSION < 8 */
-static char *VwaitVarProc _((ClientData, Tcl_Interp *, char *, char *, int));
-static char *
-VwaitVarProc(clientData, interp, name1, name2, flags)
-    ClientData clientData;      /* Pointer to integer to set to 1. */
-    Tcl_Interp *interp;         /* Interpreter containing variable. */
-    char *name1;                /* Name of variable. */
-    char *name2;                /* Second part of variable name. */
-    int flags;                  /* Information about what happened. */
-#endif
-{
-    int *donePtr = (int *) clientData;
-
-    *donePtr = 1;
-    return (char *) NULL;
-}
-
-#if TCL_MAJOR_VERSION >= 8
-static int
-ip_rbVwaitObjCmd(clientData, interp, objc, objv)
-    ClientData clientData; /* Not used */
-    Tcl_Interp *interp;
-    int objc;
-    Tcl_Obj *CONST objv[];
-#else /* TCL_MAJOR_VERSION < 8 */
-static int
-ip_rbVwaitCommand(clientData, interp, objc, objv)
-    ClientData clientData; /* Not used */
-    Tcl_Interp *interp;
-    int objc;
-    char *objv[];
-#endif
-{
-    int  ret, done, foundEvent;
-    char *nameString;
-    int  dummy;
-    int thr_crit_bup;
-
-    DUMP1("Ruby's 'vwait' is called");
-    if (interp == (Tcl_Interp*)NULL) {
-        rbtk_pending_exception = rb_exc_new2(rb_eRuntimeError,
-                                             "IP is deleted");
-        return TCL_ERROR;
-    }
-
-#if 0
-    if (!rb_thread_alone()
-	&& eventloop_thread != Qnil
-	&& eventloop_thread != rb_thread_current()) {
-#if TCL_MAJOR_VERSION >= 8
-        DUMP1("call ip_rb_threadVwaitObjCmd");
-        return ip_rb_threadVwaitObjCmd(clientData, interp, objc, objv);
-#else /* TCL_MAJOR_VERSION < 8 */
-        DUMP1("call ip_rb_threadVwaitCommand");
-        return ip_rb_threadVwaitCommand(clientData, interp, objc, objv);
-#endif
-    }
-#endif
-
-    Tcl_Preserve(interp);
-#ifdef HAVE_NATIVETHREAD
-#ifndef RUBY_USE_NATIVE_THREAD
-    if (!ruby_native_thread_p()) {
-        rb_bug("cross-thread violation on ip_rbVwaitCommand()");
-    }
-#endif
-#endif
-
-    Tcl_ResetResult(interp);
-
-    if (objc != 2) {
-#ifdef Tcl_WrongNumArgs
-        Tcl_WrongNumArgs(interp, 1, objv, "name");
-#else
-        thr_crit_bup = rb_thread_critical;
-        rb_thread_critical = Qtrue;
-
-#if TCL_MAJOR_VERSION >= 8
-        /* nameString = Tcl_GetString(objv[0]); */
-        nameString = Tcl_GetStringFromObj(objv[0], &dummy);
-#else /* TCL_MAJOR_VERSION < 8 */
-        nameString = objv[0];
-#endif
-        Tcl_AppendResult(interp, "wrong number of arguments: should be \"",
-                         nameString, " name\"", (char *) NULL);
-
-        rb_thread_critical = thr_crit_bup;
-#endif
-
-        Tcl_Release(interp);
-        return TCL_ERROR;
-    }
-
-    thr_crit_bup = rb_thread_critical;
-    rb_thread_critical = Qtrue;
-
-#if TCL_MAJOR_VERSION >= 8
-    Tcl_IncrRefCount(objv[1]);
-    /* nameString = Tcl_GetString(objv[1]); */
-    nameString = Tcl_GetStringFromObj(objv[1], &dummy);
-#else /* TCL_MAJOR_VERSION < 8 */
-    nameString = objv[1];
-#endif
-
-    /*
-    if (Tcl_TraceVar(interp, nameString,
-                     TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
-                     VwaitVarProc, (ClientData) &done) != TCL_OK) {
-        return TCL_ERROR;
-    }
-    */
-    ret = Tcl_TraceVar(interp, nameString,
-                       TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
-                       VwaitVarProc, (ClientData) &done);
-
-    rb_thread_critical = thr_crit_bup;
-
-    if (ret != TCL_OK) {
-#if TCL_MAJOR_VERSION >= 8
-        Tcl_DecrRefCount(objv[1]);
-#endif
-        Tcl_Release(interp);
-        return TCL_ERROR;
-    }
-
-    done = 0;
-
-    foundEvent = RTEST(lib_eventloop_launcher(/* not check root-widget */0,
-                                              0, &done, interp));
-
-    thr_crit_bup = rb_thread_critical;
-    rb_thread_critical = Qtrue;
-
-    Tcl_UntraceVar(interp, nameString,
-                   TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
-                   VwaitVarProc, (ClientData) &done);
-
-    rb_thread_critical = thr_crit_bup;
-
-    /* exception check */
-    if (!NIL_P(rbtk_pending_exception)) {
-#if TCL_MAJOR_VERSION >= 8
-        Tcl_DecrRefCount(objv[1]);
-#endif
-        Tcl_Release(interp);
-
-/*
-        if (rb_obj_is_kind_of(rbtk_pending_exception, rb_eSystemExit)) {
-*/
-        if (rb_obj_is_kind_of(rbtk_pending_exception, rb_eSystemExit)
-            || rb_obj_is_kind_of(rbtk_pending_exception, rb_eInterrupt)) {
-            return TCL_RETURN;
-        } else{
-            return TCL_ERROR;
-        }
-    }
-
-    /* trap check */
-    if (rb_thread_check_trap_pending()) {
-#if TCL_MAJOR_VERSION >= 8
-        Tcl_DecrRefCount(objv[1]);
-#endif
-        Tcl_Release(interp);
-
-        return TCL_RETURN;
-    }
-
-    /*
-     * Clear out the interpreter's result, since it may have been set
-     * by event handlers.
-     */
-
-    Tcl_ResetResult(interp);
-    if (!foundEvent) {
-        thr_crit_bup = rb_thread_critical;
-        rb_thread_critical = Qtrue;
-
-        Tcl_AppendResult(interp, "can't wait for variable \"", nameString,
-                         "\":  would wait forever", (char *) NULL);
-
-        rb_thread_critical = thr_crit_bup;
-
-#if TCL_MAJOR_VERSION >= 8
-        Tcl_DecrRefCount(objv[1]);
-#endif
-        Tcl_Release(interp);
-        return TCL_ERROR;
-    }
-
-#if TCL_MAJOR_VERSION >= 8
-    Tcl_DecrRefCount(objv[1]);
-#endif
-    Tcl_Release(interp);
-    return TCL_OK;
-}
-
-
-/**************************/
-/*  based on tkCmd.c      */
-/**************************/
-#if TCL_MAJOR_VERSION >= 8
-static char *WaitVariableProc _((ClientData, Tcl_Interp *,
-                                 CONST84 char *,CONST84 char *, int));
-static char *
-WaitVariableProc(clientData, interp, name1, name2, flags)
-    ClientData clientData;      /* Pointer to integer to set to 1. */
-    Tcl_Interp *interp;         /* Interpreter containing variable. */
-    CONST84 char *name1;        /* Name of variable. */
-    CONST84 char *name2;        /* Second part of variable name. */
-    int flags;                  /* Information about what happened. */
-#else /* TCL_MAJOR_VERSION < 8 */
-static char *WaitVariableProc _((ClientData, Tcl_Interp *,
-                                 char *, char *, int));
-static char *
-WaitVariableProc(clientData, interp, name1, name2, flags)
-    ClientData clientData;      /* Pointer to integer to set to 1. */
-    Tcl_Interp *interp;         /* Interpreter containing variable. */
-    char *name1;                /* Name of variable. */
-    char *name2;                /* Second part of variable name. */
-    int flags;                  /* Information about what happened. */
-#endif
-{
-    int *donePtr = (int *) clientData;
-
-    *donePtr = 1;
-    return (char *) NULL;
-}
-
-static void WaitVisibilityProc _((ClientData, XEvent *));
-static void
-WaitVisibilityProc(clientData, eventPtr)
-    ClientData clientData;      /* Pointer to integer to set to 1. */
-    XEvent *eventPtr;           /* Information about event (not used). */
-{
-    int *donePtr = (int *) clientData;
-
-    if (eventPtr->type == VisibilityNotify) {
-        *donePtr = 1;
-    }
-    if (eventPtr->type == DestroyNotify) {
-        *donePtr = 2;
-    }
-}
-
-static void WaitWindowProc _((ClientData, XEvent *));
-static void
-WaitWindowProc(clientData, eventPtr)
-    ClientData clientData;      /* Pointer to integer to set to 1. */
-    XEvent *eventPtr;           /* Information about event. */
-{
-    int *donePtr = (int *) clientData;
-
-    if (eventPtr->type == DestroyNotify) {
-        *donePtr = 1;
-    }
-}
-
-#if TCL_MAJOR_VERSION >= 8
-static int
-ip_rbTkWaitObjCmd(clientData, interp, objc, objv)
-    ClientData clientData;
-    Tcl_Interp *interp;
-    int objc;
-    Tcl_Obj *CONST objv[];
-#else /* TCL_MAJOR_VERSION < 8 */
-static int
-ip_rbTkWaitCommand(clientData, interp, objc, objv)
-    ClientData clientData;
-    Tcl_Interp *interp;
-    int objc;
-    char *objv[];
-#endif
-{
-    Tk_Window tkwin = (Tk_Window) clientData;
-    Tk_Window window;
-    int done, index;
-    static CONST char *optionStrings[] = { "variable", "visibility", "window",
-                                           (char *) NULL };
-    enum options { TKWAIT_VARIABLE, TKWAIT_VISIBILITY, TKWAIT_WINDOW };
-    char *nameString;
-    int ret, dummy;
-    int thr_crit_bup;
-
-    DUMP1("Ruby's 'tkwait' is called");
-    if (interp == (Tcl_Interp*)NULL) {
-        rbtk_pending_exception = rb_exc_new2(rb_eRuntimeError,
-                                             "IP is deleted");
-        return TCL_ERROR;
-    }
-
-#if 0
-    if (!rb_thread_alone()
-	&& eventloop_thread != Qnil
-	&& eventloop_thread != rb_thread_current()) {
-#if TCL_MAJOR_VERSION >= 8
-        DUMP1("call ip_rb_threadTkWaitObjCmd");
-        return ip_rb_threadTkWaitObjCmd((ClientData)tkwin, interp, objc, objv);
-#else /* TCL_MAJOR_VERSION < 8 */
-        DUMP1("call ip_rb_threadTkWaitCommand");
-        return ip_rb_threadTkWwaitCommand((ClientData)tkwin, interp, objc, objv);
-#endif
-    }
-#endif
-
-    Tcl_Preserve(interp);
-    Tcl_ResetResult(interp);
-
-    if (objc != 3) {
-#ifdef Tcl_WrongNumArgs
-        Tcl_WrongNumArgs(interp, 1, objv, "variable|visibility|window name");
-#else
-        thr_crit_bup = rb_thread_critical;
-        rb_thread_critical = Qtrue;
-
-#if TCL_MAJOR_VERSION >= 8
-        Tcl_AppendResult(interp, "wrong number of arguments: should be \"",
-                         Tcl_GetStringFromObj(objv[0], &dummy),
-                         " variable|visibility|window name\"",
-                         (char *) NULL);
-#else /* TCL_MAJOR_VERSION < 8 */
-        Tcl_AppendResult(interp, "wrong number of arguments: should be \"",
-                         objv[0], " variable|visibility|window name\"",
-                         (char *) NULL);
-#endif
-
-        rb_thread_critical = thr_crit_bup;
-#endif
-
-        Tcl_Release(interp);
-        return TCL_ERROR;
-    }
-
-#if TCL_MAJOR_VERSION >= 8
-    thr_crit_bup = rb_thread_critical;
-    rb_thread_critical = Qtrue;
-
-    /*
-    if (Tcl_GetIndexFromObj(interp, objv[1],
-                            (CONST84 char **)optionStrings,
-                            "option", 0, &index) != TCL_OK) {
-        return TCL_ERROR;
-    }
-    */
-    ret = Tcl_GetIndexFromObj(interp, objv[1],
-                              (CONST84 char **)optionStrings,
-                              "option", 0, &index);
-
-    rb_thread_critical = thr_crit_bup;
-
-    if (ret != TCL_OK) {
-        Tcl_Release(interp);
-        return TCL_ERROR;
-    }
-#else /* TCL_MAJOR_VERSION < 8 */
-    {
-        int c = objv[1][0];
-        size_t length = strlen(objv[1]);
-
-        if ((c == 'v') && (strncmp(objv[1], "variable", length) == 0)
-            && (length >= 2)) {
-            index = TKWAIT_VARIABLE;
-        } else if ((c == 'v') && (strncmp(objv[1], "visibility", length) == 0)
-                   && (length >= 2)) {
-            index = TKWAIT_VISIBILITY;
-        } else if ((c == 'w') && (strncmp(objv[1], "window", length) == 0)) {
-            index = TKWAIT_WINDOW;
-        } else {
-            Tcl_AppendResult(interp, "bad option \"", objv[1],
-                             "\": must be variable, visibility, or window",
-                             (char *) NULL);
-            Tcl_Release(interp);
-            return TCL_ERROR;
-        }
-    }
-#endif
-
-    thr_crit_bup = rb_thread_critical;
-    rb_thread_critical = Qtrue;
-
-#if TCL_MAJOR_VERSION >= 8
-    Tcl_IncrRefCount(objv[2]);
-    /* nameString = Tcl_GetString(objv[2]); */
-    nameString = Tcl_GetStringFromObj(objv[2], &dummy);
-#else /* TCL_MAJOR_VERSION < 8 */
-    nameString = objv[2];
-#endif
-
-    rb_thread_critical = thr_crit_bup;
-
-    switch ((enum options) index) {
-    case TKWAIT_VARIABLE:
-        thr_crit_bup = rb_thread_critical;
-        rb_thread_critical = Qtrue;
-        /*
-        if (Tcl_TraceVar(interp, nameString,
-                         TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
-                         WaitVariableProc, (ClientData) &done) != TCL_OK) {
-            return TCL_ERROR;
-        }
-        */
-        ret = Tcl_TraceVar(interp, nameString,
-                           TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
-                           WaitVariableProc, (ClientData) &done);
-
-        rb_thread_critical = thr_crit_bup;
-
-        if (ret != TCL_OK) {
-#if TCL_MAJOR_VERSION >= 8
-            Tcl_DecrRefCount(objv[2]);
-#endif
-            Tcl_Release(interp);
-            return TCL_ERROR;
-        }
-
-        done = 0;
-        /* lib_eventloop_core(check_rootwidget_flag, 0, &done); */
-        lib_eventloop_launcher(check_rootwidget_flag, 0, &done, interp);
-
-        thr_crit_bup = rb_thread_critical;
-        rb_thread_critical = Qtrue;
-
-        Tcl_UntraceVar(interp, nameString,
-                       TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
-                       WaitVariableProc, (ClientData) &done);
-
-#if TCL_MAJOR_VERSION >= 8
-        Tcl_DecrRefCount(objv[2]);
-#endif
-
-        rb_thread_critical = thr_crit_bup;
-
-        /* exception check */
-        if (!NIL_P(rbtk_pending_exception)) {
-            Tcl_Release(interp);
-
-            /*
-            if (rb_obj_is_kind_of(rbtk_pending_exception, rb_eSystemExit)) {
-            */
-            if (rb_obj_is_kind_of(rbtk_pending_exception, rb_eSystemExit)
-                || rb_obj_is_kind_of(rbtk_pending_exception, rb_eInterrupt)) {
-                return TCL_RETURN;
-            } else{
-                return TCL_ERROR;
-            }
-        }
-
-        /* trap check */
-	if (rb_thread_check_trap_pending()) {
-            Tcl_Release(interp);
-
-            return TCL_RETURN;
-        }
-
-        break;
-
-    case TKWAIT_VISIBILITY:
-        thr_crit_bup = rb_thread_critical;
-        rb_thread_critical = Qtrue;
-
-	/* This function works on the Tk eventloop thread only. */
-        if (!tk_stubs_init_p() || Tk_MainWindow(interp) == (Tk_Window)NULL) {
-            window = NULL;
-        } else {
-            window = Tk_NameToWindow(interp, nameString, tkwin);
-        }
-
-        if (window == NULL) {
-            Tcl_AppendResult(interp, ": tkwait: ",
-                             "no main-window (not Tk application?)",
-                             (char*)NULL);
-            rb_thread_critical = thr_crit_bup;
-#if TCL_MAJOR_VERSION >= 8
-            Tcl_DecrRefCount(objv[2]);
-#endif
-            Tcl_Release(interp);
-            return TCL_ERROR;
-        }
-
-        Tk_CreateEventHandler(window,
-                              VisibilityChangeMask|StructureNotifyMask,
-                              WaitVisibilityProc, (ClientData) &done);
-
-        rb_thread_critical = thr_crit_bup;
-
-        done = 0;
-        /* lib_eventloop_core(check_rootwidget_flag, 0, &done); */
-        lib_eventloop_launcher(check_rootwidget_flag, 0, &done, interp);
-
-        /* exception check */
-        if (!NIL_P(rbtk_pending_exception)) {
-#if TCL_MAJOR_VERSION >= 8
-            Tcl_DecrRefCount(objv[2]);
-#endif
-            Tcl_Release(interp);
-
-            /*
-            if (rb_obj_is_kind_of(rbtk_pending_exception, rb_eSystemExit)) {
-            */
-            if (rb_obj_is_kind_of(rbtk_pending_exception, rb_eSystemExit)
-                || rb_obj_is_kind_of(rbtk_pending_exception, rb_eInterrupt)) {
-                return TCL_RETURN;
-            } else{
-                return TCL_ERROR;
-            }
-        }
-
-        /* trap check */
-	if (rb_thread_check_trap_pending()) {
-#if TCL_MAJOR_VERSION >= 8
-            Tcl_DecrRefCount(objv[2]);
-#endif
-            Tcl_Release(interp);
-
-            return TCL_RETURN;
-        }
-
-        if (done != 1) {
-            /*
-             * Note that we do not delete the event handler because it
-             * was deleted automatically when the window was destroyed.
-             */
-            thr_crit_bup = rb_thread_critical;
-            rb_thread_critical = Qtrue;
-
-            Tcl_ResetResult(interp);
-            Tcl_AppendResult(interp, "window \"", nameString,
-                             "\" was deleted before its visibility changed",
-                             (char *) NULL);
-
-            rb_thread_critical = thr_crit_bup;
-
-#if TCL_MAJOR_VERSION >= 8
-            Tcl_DecrRefCount(objv[2]);
-#endif
-            Tcl_Release(interp);
-            return TCL_ERROR;
-        }
-
-        thr_crit_bup = rb_thread_critical;
-        rb_thread_critical = Qtrue;
-
-#if TCL_MAJOR_VERSION >= 8
-        Tcl_DecrRefCount(objv[2]);
-#endif
-
-        Tk_DeleteEventHandler(window,
-                              VisibilityChangeMask|StructureNotifyMask,
-                              WaitVisibilityProc, (ClientData) &done);
-
-        rb_thread_critical = thr_crit_bup;
-
-        break;
-
-    case TKWAIT_WINDOW:
-        thr_crit_bup = rb_thread_critical;
-        rb_thread_critical = Qtrue;
-
-	/* This function works on the Tk eventloop thread only. */
-        if (!tk_stubs_init_p() || Tk_MainWindow(interp) == (Tk_Window)NULL) {
-            window = NULL;
-        } else {
-            window = Tk_NameToWindow(interp, nameString, tkwin);
-        }
-
-#if TCL_MAJOR_VERSION >= 8
-        Tcl_DecrRefCount(objv[2]);
-#endif
-
-        if (window == NULL) {
-            Tcl_AppendResult(interp, ": tkwait: ",
-                             "no main-window (not Tk application?)",
-                             (char*)NULL);
-            rb_thread_critical = thr_crit_bup;
-            Tcl_Release(interp);
-            return TCL_ERROR;
-        }
-
-        Tk_CreateEventHandler(window, StructureNotifyMask,
-                              WaitWindowProc, (ClientData) &done);
-
-        rb_thread_critical = thr_crit_bup;
-
-        done = 0;
-        /* lib_eventloop_core(check_rootwidget_flag, 0, &done); */
-        lib_eventloop_launcher(check_rootwidget_flag, 0, &done, interp);
-
-        /* exception check */
-        if (!NIL_P(rbtk_pending_exception)) {
-            Tcl_Release(interp);
-
-            /*
-            if (rb_obj_is_kind_of(rbtk_pending_exception, rb_eSystemExit)) {
-            */
-            if (rb_obj_is_kind_of(rbtk_pending_exception, rb_eSystemExit)
-                || rb_obj_is_kind_of(rbtk_pending_exception, rb_eInterrupt)) {
-                return TCL_RETURN;
-            } else{
-                return TCL_ERROR;
-            }
-        }
-
-        /* trap check */
-	if (rb_thread_check_trap_pending()) {
-            Tcl_Release(interp);
-
-            return TCL_RETURN;
-        }
-
-        /*
-         * Note:  there's no need to delete the event handler.  It was
-         * deleted automatically when the window was destroyed.
-         */
-        break;
-    }
-
-    /*
-     * Clear out the interpreter's result, since it may have been set
-     * by event handlers.
-     */
-
-    Tcl_ResetResult(interp);
-    Tcl_Release(interp);
-    return TCL_OK;
-}
-
-/****************************/
-/* vwait/tkwait with thread */
-/****************************/
-struct th_vwait_param {
-    VALUE thread;
-    int   done;
-};
-
-#if TCL_MAJOR_VERSION >= 8
-static char *rb_threadVwaitProc _((ClientData, Tcl_Interp *,
-                                   CONST84 char *,CONST84 char *, int));
-static char *
-rb_threadVwaitProc(clientData, interp, name1, name2, flags)
-    ClientData clientData;      /* Pointer to integer to set to 1. */
-    Tcl_Interp *interp;         /* Interpreter containing variable. */
-    CONST84 char *name1;        /* Name of variable. */
-    CONST84 char *name2;        /* Second part of variable name. */
-    int flags;                  /* Information about what happened. */
-#else /* TCL_MAJOR_VERSION < 8 */
-static char *rb_threadVwaitProc _((ClientData, Tcl_Interp *,
-                                   char *, char *, int));
-static char *
-rb_threadVwaitProc(clientData, interp, name1, name2, flags)
-    ClientData clientData;      /* Pointer to integer to set to 1. */
-    Tcl_Interp *interp;         /* Interpreter containing variable. */
-    char *name1;                /* Name of variable. */
-    char *name2;                /* Second part of variable name. */
-    int flags;                  /* Information about what happened. */
-#endif
-{
-    struct th_vwait_param *param = (struct th_vwait_param *) clientData;
-
-    if (flags & (TCL_INTERP_DESTROYED | TCL_TRACE_DESTROYED)) {
-        param->done = -1;
-    } else {
-        param->done = 1;
-    }
-    if (param->done != 0) rb_thread_wakeup(param->thread);
-
-    return (char *)NULL;
-}
-
-#define TKWAIT_MODE_VISIBILITY 1
-#define TKWAIT_MODE_DESTROY    2
-
-static void rb_threadWaitVisibilityProc _((ClientData, XEvent *));
-static void
-rb_threadWaitVisibilityProc(clientData, eventPtr)
-    ClientData clientData;      /* Pointer to integer to set to 1. */
-    XEvent *eventPtr;           /* Information about event (not used). */
-{
-    struct th_vwait_param *param = (struct th_vwait_param *) clientData;
-
-    if (eventPtr->type == VisibilityNotify) {
-        param->done = TKWAIT_MODE_VISIBILITY;
-    }
-    if (eventPtr->type == DestroyNotify) {
-        param->done = TKWAIT_MODE_DESTROY;
-    }
-    if (param->done != 0) rb_thread_wakeup(param->thread);
-}
-
-static void rb_threadWaitWindowProc _((ClientData, XEvent *));
-static void
-rb_threadWaitWindowProc(clientData, eventPtr)
-    ClientData clientData;      /* Pointer to integer to set to 1. */
-    XEvent *eventPtr;           /* Information about event. */
-{
-    struct th_vwait_param *param = (struct th_vwait_param *) clientData;
-
-    if (eventPtr->type == DestroyNotify) {
-        param->done = TKWAIT_MODE_DESTROY;
-    }
-    if (param->done != 0) rb_thread_wakeup(param->thread);
-}
-
-#if TCL_MAJOR_VERSION >= 8
-static int
-ip_rb_threadVwaitObjCmd(clientData, interp, objc, objv)
-    ClientData clientData;
-    Tcl_Interp *interp;
-    int objc;
-    Tcl_Obj *CONST objv[];
-#else /* TCL_MAJOR_VERSION < 8 */
-static int
-ip_rb_threadVwaitCommand(clientData, interp, objc, objv)
-    ClientData clientData; /* Not used */
-    Tcl_Interp *interp;
-    int objc;
-    char *objv[];
-#endif
-{
-    struct th_vwait_param *param;
-    char *nameString;
-    int ret, dummy;
-    int thr_crit_bup;
-    volatile VALUE current_thread = rb_thread_current();
-    struct timeval t;
-
-    DUMP1("Ruby's 'thread_vwait' is called");
-    if (interp == (Tcl_Interp*)NULL) {
-        rbtk_pending_exception = rb_exc_new2(rb_eRuntimeError,
-                                             "IP is deleted");
-        return TCL_ERROR;
-    }
-
-    if (rb_thread_alone() || eventloop_thread == current_thread) {
-#if TCL_MAJOR_VERSION >= 8
-        DUMP1("call ip_rbVwaitObjCmd");
-        return ip_rbVwaitObjCmd(clientData, interp, objc, objv);
-#else /* TCL_MAJOR_VERSION < 8 */
-        DUMP1("call ip_rbVwaitCommand");
-        return ip_rbVwaitCommand(clientData, interp, objc, objv);
-#endif
-    }
-
-    Tcl_Preserve(interp);
-    Tcl_ResetResult(interp);
-
-    if (objc != 2) {
-#ifdef Tcl_WrongNumArgs
-        Tcl_WrongNumArgs(interp, 1, objv, "name");
-#else
-        thr_crit_bup = rb_thread_critical;
-        rb_thread_critical = Qtrue;
-
-#if TCL_MAJOR_VERSION >= 8
-        /* nameString = Tcl_GetString(objv[0]); */
-        nameString = Tcl_GetStringFromObj(objv[0], &dummy);
-#else /* TCL_MAJOR_VERSION < 8 */
-        nameString = objv[0];
-#endif
-        Tcl_AppendResult(interp, "wrong number of arguments: should be \"",
-                         nameString, " name\"", (char *) NULL);
-
-        rb_thread_critical = thr_crit_bup;
-#endif
-
-        Tcl_Release(interp);
-        return TCL_ERROR;
-    }
-
-#if TCL_MAJOR_VERSION >= 8
-    Tcl_IncrRefCount(objv[1]);
-    /* nameString = Tcl_GetString(objv[1]); */
-    nameString = Tcl_GetStringFromObj(objv[1], &dummy);
-#else /* TCL_MAJOR_VERSION < 8 */
-    nameString = objv[1];
-#endif
-    thr_crit_bup = rb_thread_critical;
-    rb_thread_critical = Qtrue;
-
-    /* param = (struct th_vwait_param *)Tcl_Alloc(sizeof(struct th_vwait_param)); */
-    param = RbTk_ALLOC_N(struct th_vwait_param, 1);
-#if 1 /* use Tcl_Preserve/Release */
-    Tcl_Preserve((ClientData)param);
-#endif
-    param->thread = current_thread;
-    param->done = 0;
-
-    /*
-    if (Tcl_TraceVar(interp, nameString,
-                     TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
-                     rb_threadVwaitProc, (ClientData) param) != TCL_OK) {
-        return TCL_ERROR;
-    }
-    */
-    ret = Tcl_TraceVar(interp, nameString,
-                       TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
-                       rb_threadVwaitProc, (ClientData) param);
-
-    rb_thread_critical = thr_crit_bup;
-
-    if (ret != TCL_OK) {
-#if 0 /* use Tcl_EventuallyFree */
-	Tcl_EventuallyFree((ClientData)param, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 1 /* use Tcl_Preserve/Release */
-        Tcl_Release((ClientData)param);
-#else
-        /* Tcl_Free((char *)param); */
-        ckfree((char *)param);
-#endif
-#endif
-
-#if TCL_MAJOR_VERSION >= 8
-        Tcl_DecrRefCount(objv[1]);
-#endif
-        Tcl_Release(interp);
-        return TCL_ERROR;
-    }
-
-    t.tv_sec  = 0;
-    t.tv_usec = (long)((EVENT_HANDLER_TIMEOUT)*1000.0);
-
-    while(!param->done) {
-      /* rb_thread_stop(); */
-      /* rb_thread_sleep_forever(); */
-      rb_thread_wait_for(t);
-      if (NIL_P(eventloop_thread)) {
-	break;
-      }
-    }
-
-    thr_crit_bup = rb_thread_critical;
-    rb_thread_critical = Qtrue;
-
-    if (param->done > 0) {
-        Tcl_UntraceVar(interp, nameString,
-                       TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
-                       rb_threadVwaitProc, (ClientData) param);
-    }
-
-#if 0 /* use Tcl_EventuallyFree */
-    Tcl_EventuallyFree((ClientData)param, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 1 /* use Tcl_Preserve/Release */
-    Tcl_Release((ClientData)param);
-#else
-    /* Tcl_Free((char *)param); */
-    ckfree((char *)param);
-#endif
-#endif
-
-    rb_thread_critical = thr_crit_bup;
-
-#if TCL_MAJOR_VERSION >= 8
-    Tcl_DecrRefCount(objv[1]);
-#endif
-    Tcl_Release(interp);
-    return TCL_OK;
-}
-
-#if TCL_MAJOR_VERSION >= 8
-static int
-ip_rb_threadTkWaitObjCmd(clientData, interp, objc, objv)
-    ClientData clientData;
-    Tcl_Interp *interp;
-    int objc;
-    Tcl_Obj *CONST objv[];
-#else /* TCL_MAJOR_VERSION < 8 */
-static int
-ip_rb_threadTkWaitCommand(clientData, interp, objc, objv)
-    ClientData clientData;
-    Tcl_Interp *interp;
-    int objc;
-    char *objv[];
-#endif
-{
-    struct th_vwait_param *param;
-    Tk_Window tkwin = (Tk_Window) clientData;
-    Tk_Window window;
-    int index;
-    static CONST char *optionStrings[] = { "variable", "visibility", "window",
-                                           (char *) NULL };
-    enum options { TKWAIT_VARIABLE, TKWAIT_VISIBILITY, TKWAIT_WINDOW };
-    char *nameString;
-    int ret, dummy;
-    int thr_crit_bup;
-    volatile VALUE current_thread = rb_thread_current();
-    struct timeval t;
-
-    DUMP1("Ruby's 'thread_tkwait' is called");
-    if (interp == (Tcl_Interp*)NULL) {
-        rbtk_pending_exception = rb_exc_new2(rb_eRuntimeError,
-                                             "IP is deleted");
-        return TCL_ERROR;
-    }
-
-    if (rb_thread_alone() || eventloop_thread == current_thread) {
-#if TCL_MAJOR_VERSION >= 8
-        DUMP1("call ip_rbTkWaitObjCmd");
-        DUMP2("eventloop_thread %"PRIxVALUE, eventloop_thread);
-        DUMP2("current_thread %"PRIxVALUE, current_thread);
-        return ip_rbTkWaitObjCmd(clientData, interp, objc, objv);
-#else /* TCL_MAJOR_VERSION < 8 */
-        DUMP1("call rb_VwaitCommand");
-        return ip_rbTkWaitCommand(clientData, interp, objc, objv);
-#endif
-    }
-
-    Tcl_Preserve(interp);
-    Tcl_Preserve(tkwin);
-
-    Tcl_ResetResult(interp);
-
-    if (objc != 3) {
-#ifdef Tcl_WrongNumArgs
-        Tcl_WrongNumArgs(interp, 1, objv, "variable|visibility|window name");
-#else
-        thr_crit_bup = rb_thread_critical;
-        rb_thread_critical = Qtrue;
-
-#if TCL_MAJOR_VERSION >= 8
-        Tcl_AppendResult(interp, "wrong number of arguments: should be \"",
-                         Tcl_GetStringFromObj(objv[0], &dummy),
-                         " variable|visibility|window name\"",
-                         (char *) NULL);
-#else /* TCL_MAJOR_VERSION < 8 */
-        Tcl_AppendResult(interp, "wrong number of arguments: should be \"",
-                         objv[0], " variable|visibility|window name\"",
-                         (char *) NULL);
-#endif
-
-        rb_thread_critical = thr_crit_bup;
-#endif
-
-        Tcl_Release(tkwin);
-        Tcl_Release(interp);
-        return TCL_ERROR;
-    }
-
-#if TCL_MAJOR_VERSION >= 8
-    thr_crit_bup = rb_thread_critical;
-    rb_thread_critical = Qtrue;
-    /*
-    if (Tcl_GetIndexFromObj(interp, objv[1],
-                            (CONST84 char **)optionStrings,
-                            "option", 0, &index) != TCL_OK) {
-        return TCL_ERROR;
-    }
-    */
-    ret = Tcl_GetIndexFromObj(interp, objv[1],
-                              (CONST84 char **)optionStrings,
-                              "option", 0, &index);
-
-    rb_thread_critical = thr_crit_bup;
-
-    if (ret != TCL_OK) {
-        Tcl_Release(tkwin);
-        Tcl_Release(interp);
-        return TCL_ERROR;
-    }
-#else /* TCL_MAJOR_VERSION < 8 */
-    {
-        int c = objv[1][0];
-        size_t length = strlen(objv[1]);
-
-        if ((c == 'v') && (strncmp(objv[1], "variable", length) == 0)
-            && (length >= 2)) {
-            index = TKWAIT_VARIABLE;
-        } else if ((c == 'v') && (strncmp(objv[1], "visibility", length) == 0)
-                   && (length >= 2)) {
-            index = TKWAIT_VISIBILITY;
-        } else if ((c == 'w') && (strncmp(objv[1], "window", length) == 0)) {
-            index = TKWAIT_WINDOW;
-        } else {
-            Tcl_AppendResult(interp, "bad option \"", objv[1],
-                             "\": must be variable, visibility, or window",
-                             (char *) NULL);
-            Tcl_Release(tkwin);
-            Tcl_Release(interp);
-            return TCL_ERROR;
-        }
-    }
-#endif
-
-    thr_crit_bup = rb_thread_critical;
-    rb_thread_critical = Qtrue;
-
-#if TCL_MAJOR_VERSION >= 8
-    Tcl_IncrRefCount(objv[2]);
-    /* nameString = Tcl_GetString(objv[2]); */
-    nameString = Tcl_GetStringFromObj(objv[2], &dummy);
-#else /* TCL_MAJOR_VERSION < 8 */
-    nameString = objv[2];
-#endif
-
-    /* param = (struct th_vwait_param *)Tcl_Alloc(sizeof(struct th_vwait_param)); */
-    param = RbTk_ALLOC_N(struct th_vwait_param, 1);
-#if 1 /* use Tcl_Preserve/Release */
-    Tcl_Preserve((ClientData)param);
-#endif
-    param->thread = current_thread;
-    param->done = 0;
-
-    rb_thread_critical = thr_crit_bup;
-
-    switch ((enum options) index) {
-    case TKWAIT_VARIABLE:
-        thr_crit_bup = rb_thread_critical;
-        rb_thread_critical = Qtrue;
-        /*
-        if (Tcl_TraceVar(interp, nameString,
-                         TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
-                         rb_threadVwaitProc, (ClientData) param) != TCL_OK) {
-            return TCL_ERROR;
-        }
-        */
-        ret = Tcl_TraceVar(interp, nameString,
-                         TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
-                         rb_threadVwaitProc, (ClientData) param);
-
-        rb_thread_critical = thr_crit_bup;
-
-        if (ret != TCL_OK) {
-#if 0 /* use Tcl_EventuallyFree */
-            Tcl_EventuallyFree((ClientData)param, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 1 /* use Tcl_Preserve/Release */
-            Tcl_Release(param);
-#else
-            /* Tcl_Free((char *)param); */
-            ckfree((char *)param);
-#endif
-#endif
-
-#if TCL_MAJOR_VERSION >= 8
-            Tcl_DecrRefCount(objv[2]);
-#endif
-
-            Tcl_Release(tkwin);
-            Tcl_Release(interp);
-            return TCL_ERROR;
-        }
-
-	t.tv_sec  = 0;
-	t.tv_usec = (long)((EVENT_HANDLER_TIMEOUT)*1000.0);
-
-        while(!param->done) {
-	  /* rb_thread_stop(); */
-	  /* rb_thread_sleep_forever(); */
-	  rb_thread_wait_for(t);
-	  if (NIL_P(eventloop_thread)) {
-	    break;
-	  }
-        }
-
-        thr_crit_bup = rb_thread_critical;
-        rb_thread_critical = Qtrue;
-
-        if (param->done > 0) {
-            Tcl_UntraceVar(interp, nameString,
-                           TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
-                           rb_threadVwaitProc, (ClientData) param);
-        }
-
-#if TCL_MAJOR_VERSION >= 8
-        Tcl_DecrRefCount(objv[2]);
-#endif
-
-        rb_thread_critical = thr_crit_bup;
-
-        break;
-
-    case TKWAIT_VISIBILITY:
-        thr_crit_bup = rb_thread_critical;
-        rb_thread_critical = Qtrue;
-
-#if 0 /* variable 'tkwin' must keep the token of MainWindow */
-        if (!tk_stubs_init_p() || Tk_MainWindow(interp) == (Tk_Window)NULL) {
-            window = NULL;
-        } else {
-            window = Tk_NameToWindow(interp, nameString, tkwin);
-        }
-#else
-        if (!tk_stubs_init_p() || tkwin == (Tk_Window)NULL) {
-            window = NULL;
-	} else {
-            /* Tk_NameToWindow() returns right token on non-eventloop thread */
-            Tcl_CmdInfo info;
-            if (Tcl_GetCommandInfo(interp, ".", &info)) { /* check root */
-                window = Tk_NameToWindow(interp, nameString, tkwin);
-            } else {
-                window = NULL;
-            }
-	}
-#endif
-
-        if (window == NULL) {
-            Tcl_AppendResult(interp, ": thread_tkwait: ",
-                             "no main-window (not Tk application?)",
-                             (char*)NULL);
-
-            rb_thread_critical = thr_crit_bup;
-
-#if 0 /* use Tcl_EventuallyFree */
-	    Tcl_EventuallyFree((ClientData)param, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 1 /* use Tcl_Preserve/Release */
-            Tcl_Release(param);
-#else
-            /* Tcl_Free((char *)param); */
-            ckfree((char *)param);
-#endif
-#endif
-
-#if TCL_MAJOR_VERSION >= 8
-            Tcl_DecrRefCount(objv[2]);
-#endif
-            Tcl_Release(tkwin);
-            Tcl_Release(interp);
-            return TCL_ERROR;
-        }
-        Tcl_Preserve(window);
-
-        Tk_CreateEventHandler(window,
-                              VisibilityChangeMask|StructureNotifyMask,
-                              rb_threadWaitVisibilityProc, (ClientData) param);
-
-        rb_thread_critical = thr_crit_bup;
-
-	t.tv_sec  = 0;
-	t.tv_usec = (long)((EVENT_HANDLER_TIMEOUT)*1000.0);
-
-        while(param->done != TKWAIT_MODE_VISIBILITY) {
-	  if (param->done == TKWAIT_MODE_DESTROY) break;
-	  /* rb_thread_stop(); */
-	  /* rb_thread_sleep_forever(); */
-	  rb_thread_wait_for(t);
-	  if (NIL_P(eventloop_thread)) {
-	    break;
-	  }
-        }
-
-        thr_crit_bup = rb_thread_critical;
-        rb_thread_critical = Qtrue;
-
-        /* when a window is destroyed, no need to call Tk_DeleteEventHandler */
-        if (param->done != TKWAIT_MODE_DESTROY) {
-            Tk_DeleteEventHandler(window,
-                                  VisibilityChangeMask|StructureNotifyMask,
-                                  rb_threadWaitVisibilityProc,
-                                  (ClientData) param);
-        }
-
-        if (param->done != 1) {
-            Tcl_ResetResult(interp);
-            Tcl_AppendResult(interp, "window \"", nameString,
-                             "\" was deleted before its visibility changed",
-                             (char *) NULL);
-
-            rb_thread_critical = thr_crit_bup;
-
-            Tcl_Release(window);
-
-#if 0 /* use Tcl_EventuallyFree */
-	    Tcl_EventuallyFree((ClientData)param, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 1 /* use Tcl_Preserve/Release */
-            Tcl_Release(param);
-#else
-            /* Tcl_Free((char *)param); */
-            ckfree((char *)param);
-#endif
-#endif
-
-#if TCL_MAJOR_VERSION >= 8
-            Tcl_DecrRefCount(objv[2]);
-#endif
-
-            Tcl_Release(tkwin);
-            Tcl_Release(interp);
-            return TCL_ERROR;
-        }
-
-        Tcl_Release(window);
-
-#if TCL_MAJOR_VERSION >= 8
-        Tcl_DecrRefCount(objv[2]);
-#endif
-
-        rb_thread_critical = thr_crit_bup;
-
-        break;
-
-    case TKWAIT_WINDOW:
-        thr_crit_bup = rb_thread_critical;
-        rb_thread_critical = Qtrue;
-
-#if 0 /* variable 'tkwin' must keep the token of MainWindow */
-        if (!tk_stubs_init_p() || Tk_MainWindow(interp) == (Tk_Window)NULL) {
-            window = NULL;
-        } else {
-            window = Tk_NameToWindow(interp, nameString, tkwin);
-        }
-#else
-        if (!tk_stubs_init_p() || tkwin == (Tk_Window)NULL) {
-            window = NULL;
-	} else {
-            /* Tk_NameToWindow() returns right token on non-eventloop thread */
-            Tcl_CmdInfo info;
-            if (Tcl_GetCommandInfo(interp, ".", &info)) { /* check root */
-                window = Tk_NameToWindow(interp, nameString, tkwin);
-            } else {
-                window = NULL;
-            }
-	}
-#endif
-
-#if TCL_MAJOR_VERSION >= 8
-        Tcl_DecrRefCount(objv[2]);
-#endif
-
-        if (window == NULL) {
-            Tcl_AppendResult(interp, ": thread_tkwait: ",
-                             "no main-window (not Tk application?)",
-                             (char*)NULL);
-
-            rb_thread_critical = thr_crit_bup;
-
-#if 0 /* use Tcl_EventuallyFree */
-	    Tcl_EventuallyFree((ClientData)param, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 1 /* use Tcl_Preserve/Release */
-            Tcl_Release(param);
-#else
-            /* Tcl_Free((char *)param); */
-            ckfree((char *)param);
-#endif
-#endif
-
-            Tcl_Release(tkwin);
-            Tcl_Release(interp);
-            return TCL_ERROR;
-        }
-
-        Tcl_Preserve(window);
-
-        Tk_CreateEventHandler(window, StructureNotifyMask,
-                              rb_threadWaitWindowProc, (ClientData) param);
-
-        rb_thread_critical = thr_crit_bup;
-
-	t.tv_sec  = 0;
-	t.tv_usec = (long)((EVENT_HANDLER_TIMEOUT)*1000.0);
-
-        while(param->done != TKWAIT_MODE_DESTROY) {
-	  /* rb_thread_stop(); */
-	  /* rb_thread_sleep_forever(); */
-	  rb_thread_wait_for(t);
-	  if (NIL_P(eventloop_thread)) {
-	    break;
-	  }
-        }
-
-        Tcl_Release(window);
-
-        /* when a window is destroyed, no need to call Tk_DeleteEventHandler
-        thr_crit_bup = rb_thread_critical;
-        rb_thread_critical = Qtrue;
-
-        Tk_DeleteEventHandler(window, StructureNotifyMask,
-                              rb_threadWaitWindowProc, (ClientData) param);
-
-        rb_thread_critical = thr_crit_bup;
-        */
-
-        break;
-    } /* end of 'switch' statement */
-
-#if 0 /* use Tcl_EventuallyFree */
-    Tcl_EventuallyFree((ClientData)param, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 1 /* use Tcl_Preserve/Release */
-    Tcl_Release((ClientData)param);
-#else
-    /* Tcl_Free((char *)param); */
-    ckfree((char *)param);
-#endif
-#endif
-
-    /*
-     * Clear out the interpreter's result, since it may have been set
-     * by event handlers.
-     */
-
-    Tcl_ResetResult(interp);
-
-    Tcl_Release(tkwin);
-    Tcl_Release(interp);
-    return TCL_OK;
-}
-
-static VALUE
-ip_thread_vwait(self, var)
-    VALUE self;
-    VALUE var;
-{
-    VALUE argv[2];
-    volatile VALUE cmd_str = rb_str_new2("thread_vwait");
-
-    argv[0] = cmd_str;
-    argv[1] = var;
-
-    return ip_invoke_with_position(2, argv, self, TCL_QUEUE_TAIL);
-}
-
-static VALUE
-ip_thread_tkwait(self, mode, target)
-    VALUE self;
-    VALUE mode;
-    VALUE target;
-{
-    VALUE argv[3];
-    volatile VALUE cmd_str = rb_str_new2("thread_tkwait");
-
-    argv[0] = cmd_str;
-    argv[1] = mode;
-    argv[2] = target;
-
-    return ip_invoke_with_position(3, argv, self, TCL_QUEUE_TAIL);
-}
-
-
-/* delete slave interpreters */
-#if TCL_MAJOR_VERSION >= 8
-static void
-delete_slaves(ip)
-    Tcl_Interp *ip;
-{
-    int  thr_crit_bup;
-    Tcl_Interp *slave;
-    Tcl_Obj *slave_list, *elem;
-    char *slave_name;
-    int i, len;
-
-    DUMP1("delete slaves");
-    thr_crit_bup = rb_thread_critical;
-    rb_thread_critical = Qtrue;
-
-    if (!Tcl_InterpDeleted(ip) && Tcl_Eval(ip, "interp slaves") == TCL_OK) {
-        slave_list = Tcl_GetObjResult(ip);
-        Tcl_IncrRefCount(slave_list);
-
-        if (Tcl_ListObjLength((Tcl_Interp*)NULL, slave_list, &len) == TCL_OK) {
-            for(i = 0; i < len; i++) {
-                Tcl_ListObjIndex((Tcl_Interp*)NULL, slave_list, i, &elem);
-
-                if (elem == (Tcl_Obj*)NULL) continue;
-
-                Tcl_IncrRefCount(elem);
-
-                /* get slave */
-                /* slave_name = Tcl_GetString(elem); */
-                slave_name = Tcl_GetStringFromObj(elem, (int*)NULL);
-                DUMP2("delete slave:'%s'", slave_name);
-
-                Tcl_DecrRefCount(elem);
-
-                slave = Tcl_GetSlave(ip, slave_name);
-                if (slave == (Tcl_Interp*)NULL) continue;
-
-		if (!Tcl_InterpDeleted(slave)) {
-		  /* call ip_finalize */
-		  ip_finalize(slave);
-
-		  Tcl_DeleteInterp(slave);
-		  /* Tcl_Release(slave); */
-		}
-            }
-        }
-
-        Tcl_DecrRefCount(slave_list);
-    }
-
-    rb_thread_critical = thr_crit_bup;
-}
-#else /* TCL_MAJOR_VERSION < 8 */
-static void
-delete_slaves(ip)
-    Tcl_Interp *ip;
-{
-    int  thr_crit_bup;
-    Tcl_Interp *slave;
-    int argc;
-    char **argv;
-    char *slave_list;
-    char *slave_name;
-    int i, len;
-
-    DUMP1("delete slaves");
-    thr_crit_bup = rb_thread_critical;
-    rb_thread_critical = Qtrue;
-
-    if (!Tcl_InterpDeleted(ip) && Tcl_Eval(ip, "interp slaves") == TCL_OK) {
-        slave_list = ip->result;
-        if (Tcl_SplitList((Tcl_Interp*)NULL,
-                          slave_list, &argc, &argv) == TCL_OK) {
-            for(i = 0; i < argc; i++) {
-                slave_name = argv[i];
-
-                DUMP2("delete slave:'%s'", slave_name);
-
-                slave = Tcl_GetSlave(ip, slave_name);
-                if (slave == (Tcl_Interp*)NULL) continue;
-
-		if (!Tcl_InterpDeleted(slave)) {
-		  /* call ip_finalize */
-		  ip_finalize(slave);
-
-		  Tcl_DeleteInterp(slave);
-		}
-            }
-        }
-    }
-
-    rb_thread_critical = thr_crit_bup;
-}
-#endif
-
-
-/* finalize operation */
-static void
-#ifdef HAVE_PROTOTYPES
-lib_mark_at_exit(VALUE self)
-#else
-lib_mark_at_exit(self)
-    VALUE self;
-#endif
-{
-    at_exit = 1;
-}
-
-static int
-#if TCL_MAJOR_VERSION >= 8
-#ifdef HAVE_PROTOTYPES
-ip_null_proc(ClientData clientData, Tcl_Interp *interp,
-	     int argc, Tcl_Obj *CONST argv[])
-#else
-ip_null_proc(clientData, interp, argc, argv)
-    ClientData clientData;
-    Tcl_Interp *interp;
-    int argc;
-    Tcl_Obj *CONST argv[];
-#endif
-#else /* TCL_MAJOR_VERSION < 8 */
-#ifdef HAVE_PROTOTYPES
-ip_null_proc(ClientData clientData, Tcl_Interp *interp, int argc, char *argv[])
-#else
-ip_null_proc(clientData, interp, argc, argv)
-    ClientData clientData;
-    Tcl_Interp *interp;
-    int argc;
-    char *argv[];
-#endif
-#endif
-{
-    Tcl_ResetResult(interp);
-    return TCL_OK;
-}
-
-static void
-ip_finalize(ip)
-    Tcl_Interp *ip;
-{
-    Tcl_CmdInfo info;
-    int  thr_crit_bup;
-
-    VALUE rb_debug_bup, rb_verbose_bup;
-          /* When ruby is exiting, printing debug messages in some callback
-             operations from Tcl-IP sometimes cause SEGV. I don't know the
-             reason. But I got SEGV when calling "rb_io_write(rb_stdout, ...)".
-             So, in some part of this function, debug mode and verbose mode
-             are disabled. If you know the reason, please fix it.
-                           --  Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)  */
-
-    DUMP1("start ip_finalize");
-
-    if (ip == (Tcl_Interp*)NULL) {
-        DUMP1("ip is NULL");
-        return;
-    }
-
-    if (Tcl_InterpDeleted(ip)) {
-        DUMP2("ip(%p) is already deleted", ip);
-        return;
-    }
-
-#if TCL_NAMESPACE_DEBUG
-    if (ip_null_namespace(ip)) {
-        DUMP2("ip(%p) has null namespace", ip);
-        return;
-    }
-#endif
-
-    thr_crit_bup = rb_thread_critical;
-    rb_thread_critical = Qtrue;
-
-    rb_debug_bup   = ruby_debug;
-    rb_verbose_bup = ruby_verbose;
-
-    Tcl_Preserve(ip);
-
-    /* delete slaves */
-    delete_slaves(ip);
-
-    /* shut off some connections from Tcl-proc to Ruby */
-    if (at_exit) {
-	/* NOTE: Only when at exit.
-	   Because, ruby removes objects, which depends on the deleted
-	   interpreter, on some callback operations.
-	   It is important for GC. */
-#if TCL_MAJOR_VERSION >= 8
-	Tcl_CreateObjCommand(ip, "ruby", ip_null_proc,
-			     (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
-	Tcl_CreateObjCommand(ip, "ruby_eval", ip_null_proc,
-			     (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
-	Tcl_CreateObjCommand(ip, "ruby_cmd", ip_null_proc,
-			     (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
-#else /* TCL_MAJOR_VERSION < 8 */
-	Tcl_CreateCommand(ip, "ruby", ip_null_proc,
-			  (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
-	Tcl_CreateCommand(ip, "ruby_eval", ip_null_proc,
-			  (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
-	Tcl_CreateCommand(ip, "ruby_cmd", ip_null_proc,
-			  (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
-#endif
-	/*
-	  rb_thread_critical = thr_crit_bup;
-	  return;
-	*/
-    }
-
-    /* delete root widget */
-#ifdef RUBY_VM
-    /* cause SEGV on Ruby 1.9 */
-#else
-    DUMP1("check `destroy'");
-    if (Tcl_GetCommandInfo(ip, "destroy", &info)) {
-        DUMP1("call `destroy .'");
-        Tcl_GlobalEval(ip, "catch {destroy .}");
-    }
-#endif
-#if 1
-    DUMP1("destroy root widget");
-    if (tk_stubs_init_p() && Tk_MainWindow(ip) != (Tk_Window)NULL) {
-        /*
-	 *  On Ruby VM, this code piece may be not called, because
-	 *  Tk_MainWindow() returns NULL on a native thread except
-         *  the thread which initialize Tk environment.
-         *  Of course, that is a problem. But maybe not so serious.
-         *  All widgets are destroyed when the Tcl interp is deleted.
-         *  At then, Ruby may raise exceptions on the delete hook
-         *  callbacks which registered for the deleted widgets, and
-	 *  may fail to clear objects which depends on the widgets.
-         *  Although it is the problem, it is possibly avoidable by
-         *  rescuing exceptions and the finalize hook of the interp.
-         */
-        Tk_Window win = Tk_MainWindow(ip);
-
-        DUMP1("call Tk_DestroyWindow");
-        ruby_debug   = Qfalse;
-        ruby_verbose = Qnil;
-	if (! (((Tk_FakeWin*)win)->flags & TK_ALREADY_DEAD)) {
-	  Tk_DestroyWindow(win);
-	}
-        ruby_debug   = rb_debug_bup;
-        ruby_verbose = rb_verbose_bup;
-    }
-#endif
-
-    /* call finalize-hook-proc */
-    DUMP1("check `finalize-hook-proc'");
-    if ( Tcl_GetCommandInfo(ip, finalize_hook_name, &info)) {
-        DUMP2("call finalize hook proc '%s'", finalize_hook_name);
-        ruby_debug   = Qfalse;
-        ruby_verbose = Qnil;
-        Tcl_GlobalEval(ip, finalize_hook_name);
-        ruby_debug   = rb_debug_bup;
-        ruby_verbose = rb_verbose_bup;
-    }
-
-    DUMP1("check `foreach' & `after'");
-    if ( Tcl_GetCommandInfo(ip, "foreach", &info)
-         && Tcl_GetCommandInfo(ip, "after", &info) ) {
-        DUMP1("cancel after callbacks");
-        ruby_debug   = Qfalse;
-        ruby_verbose = Qnil;
-        Tcl_GlobalEval(ip, "catch {foreach id [after info] {after cancel $id}}");
-        ruby_debug   = rb_debug_bup;
-        ruby_verbose = rb_verbose_bup;
-    }
-
-    Tcl_Release(ip);
-
-    DUMP1("finish ip_finalize");
-    ruby_debug   = rb_debug_bup;
-    ruby_verbose = rb_verbose_bup;
-    rb_thread_critical = thr_crit_bup;
-}
-
-
-/* destroy interpreter */
-static void
-ip_free(p)
-    void *p;
-{
-    struct tcltkip *ptr = p;
-    int  thr_crit_bup;
-
-    DUMP2("free Tcl Interp %p", ptr->ip);
-    if (ptr) {
-        thr_crit_bup = rb_thread_critical;
-        rb_thread_critical = Qtrue;
-
-        if ( ptr->ip != (Tcl_Interp*)NULL
-             && !Tcl_InterpDeleted(ptr->ip)
-             && Tcl_GetMaster(ptr->ip) != (Tcl_Interp*)NULL
-             && !Tcl_InterpDeleted(Tcl_GetMaster(ptr->ip)) ) {
-            DUMP2("parent IP(%p) is not deleted",
-                  Tcl_GetMaster(ptr->ip));
-            DUMP2("slave IP(%p) should not be deleted",
-                  ptr->ip);
-            xfree(ptr);
-            /* ckfree((char*)ptr); */
-            rb_thread_critical = thr_crit_bup;
-            return;
-        }
-
-        if (ptr->ip == (Tcl_Interp*)NULL) {
-            DUMP1("ip_free is called for deleted IP");
-            xfree(ptr);
-            /* ckfree((char*)ptr); */
-            rb_thread_critical = thr_crit_bup;
-            return;
-        }
-
-	if (!Tcl_InterpDeleted(ptr->ip)) {
-	  ip_finalize(ptr->ip);
-
-	  Tcl_DeleteInterp(ptr->ip);
-	  Tcl_Release(ptr->ip);
-	}
-
-        ptr->ip = (Tcl_Interp*)NULL;
-        xfree(ptr);
-        /* ckfree((char*)ptr); */
-
-        rb_thread_critical = thr_crit_bup;
-    }
-
-    DUMP1("complete freeing Tcl Interp");
-}
-
-
-/* create and initialize interpreter */
-static VALUE ip_alloc _((VALUE));
-static VALUE
-ip_alloc(self)
-    VALUE self;
-{
-    return TypedData_Wrap_Struct(self, &tcltkip_type, 0);
-}
-
-static void
-ip_replace_wait_commands(interp, mainWin)
-    Tcl_Interp *interp;
-    Tk_Window mainWin;
-{
-    /* replace 'vwait' command */
-#if TCL_MAJOR_VERSION >= 8
-    DUMP1("Tcl_CreateObjCommand(\"vwait\")");
-    Tcl_CreateObjCommand(interp, "vwait", ip_rbVwaitObjCmd,
-                         (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
-#else /* TCL_MAJOR_VERSION < 8 */
-    DUMP1("Tcl_CreateCommand(\"vwait\")");
-    Tcl_CreateCommand(interp, "vwait", ip_rbVwaitCommand,
-                      (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
-#endif
-
-    /* replace 'tkwait' command */
-#if TCL_MAJOR_VERSION >= 8
-    DUMP1("Tcl_CreateObjCommand(\"tkwait\")");
-    Tcl_CreateObjCommand(interp, "tkwait", ip_rbTkWaitObjCmd,
-                         (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
-#else /* TCL_MAJOR_VERSION < 8 */
-    DUMP1("Tcl_CreateCommand(\"tkwait\")");
-    Tcl_CreateCommand(interp, "tkwait", ip_rbTkWaitCommand,
-                      (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
-#endif
-
-    /* add 'thread_vwait' command */
-#if TCL_MAJOR_VERSION >= 8
-    DUMP1("Tcl_CreateObjCommand(\"thread_vwait\")");
-    Tcl_CreateObjCommand(interp, "thread_vwait", ip_rb_threadVwaitObjCmd,
-                         (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
-#else /* TCL_MAJOR_VERSION < 8 */
-    DUMP1("Tcl_CreateCommand(\"thread_vwait\")");
-    Tcl_CreateCommand(interp, "thread_vwait", ip_rb_threadVwaitCommand,
-                      (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
-#endif
-
-    /* add 'thread_tkwait' command */
-#if TCL_MAJOR_VERSION >= 8
-    DUMP1("Tcl_CreateObjCommand(\"thread_tkwait\")");
-    Tcl_CreateObjCommand(interp, "thread_tkwait", ip_rb_threadTkWaitObjCmd,
-                         (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
-#else /* TCL_MAJOR_VERSION < 8 */
-    DUMP1("Tcl_CreateCommand(\"thread_tkwait\")");
-    Tcl_CreateCommand(interp, "thread_tkwait", ip_rb_threadTkWaitCommand,
-                      (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
-#endif
-
-    /* replace 'update' command */
-#if TCL_MAJOR_VERSION >= 8
-    DUMP1("Tcl_CreateObjCommand(\"update\")");
-    Tcl_CreateObjCommand(interp, "update", ip_rbUpdateObjCmd,
-                         (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
-#else /* TCL_MAJOR_VERSION < 8 */
-    DUMP1("Tcl_CreateCommand(\"update\")");
-    Tcl_CreateCommand(interp, "update", ip_rbUpdateCommand,
-                      (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
-#endif
-
-    /* add 'thread_update' command */
-#if TCL_MAJOR_VERSION >= 8
-    DUMP1("Tcl_CreateObjCommand(\"thread_update\")");
-    Tcl_CreateObjCommand(interp, "thread_update", ip_rb_threadUpdateObjCmd,
-                         (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
-#else /* TCL_MAJOR_VERSION < 8 */
-    DUMP1("Tcl_CreateCommand(\"thread_update\")");
-    Tcl_CreateCommand(interp, "thread_update", ip_rb_threadUpdateCommand,
-                      (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
-#endif
-}
-
-
-#if TCL_MAJOR_VERSION >= 8
-static int
-ip_rb_replaceSlaveTkCmdsObjCmd(clientData, interp, objc, objv)
-    ClientData clientData;
-    Tcl_Interp *interp;
-    int objc;
-    Tcl_Obj *CONST objv[];
-#else /* TCL_MAJOR_VERSION < 8 */
-static int
-ip_rb_replaceSlaveTkCmdsCommand(clientData, interp, objc, objv)
-    ClientData clientData;
-    Tcl_Interp *interp;
-    int objc;
-    char *objv[];
-#endif
-{
-    char *slave_name;
-    Tcl_Interp *slave;
-    Tk_Window mainWin;
-
-    if (objc != 2) {
-#ifdef Tcl_WrongNumArgs
-        Tcl_WrongNumArgs(interp, 1, objv, "slave_name");
-#else
-	char *nameString;
-#if TCL_MAJOR_VERSION >= 8
-        nameString = Tcl_GetStringFromObj(objv[0], (int*)NULL);
-#else /* TCL_MAJOR_VERSION < 8 */
-        nameString = objv[0];
-#endif
-        Tcl_AppendResult(interp, "wrong number of arguments: should be \"",
-                         nameString, " slave_name\"", (char *) NULL);
-#endif
-    }
-
-#if TCL_MAJOR_VERSION >= 8
-    slave_name = Tcl_GetStringFromObj(objv[1], (int*)NULL);
-#else
-    slave_name = objv[1];
-#endif
-
-    slave = Tcl_GetSlave(interp, slave_name);
-    if (slave == NULL) {
-        Tcl_AppendResult(interp, "cannot find slave \"",
-                         slave_name, "\"", (char *)NULL);
-	return TCL_ERROR;
-    }
-    mainWin = Tk_MainWindow(slave);
-
-    /* replace 'exit' command --> 'interp_exit' command */
-#if TCL_MAJOR_VERSION >= 8
-    DUMP1("Tcl_CreateObjCommand(\"exit\") --> \"interp_exit\"");
-    Tcl_CreateObjCommand(slave, "exit", ip_InterpExitObjCmd,
-                         (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
-#else /* TCL_MAJOR_VERSION < 8 */
-    DUMP1("Tcl_CreateCommand(\"exit\") --> \"interp_exit\"");
-    Tcl_CreateCommand(slave, "exit", ip_InterpExitCommand,
-                      (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
-#endif
-
-    /* replace vwait and tkwait */
-    ip_replace_wait_commands(slave, mainWin);
-
-    return TCL_OK;
-}
-
-#ifndef ORIG_NAMESPACE_CMD
-#define ORIG_NAMESPACE_CMD "__orig_namespace_command__"
-#endif
-
-#if TCL_MAJOR_VERSION >= 8
-static int ip_rbNamespaceObjCmd _((ClientData, Tcl_Interp *, int,
-                                   Tcl_Obj *CONST []));
-static int
-ip_rbNamespaceObjCmd(clientData, interp, objc, objv)
-    ClientData clientData;
-    Tcl_Interp *interp;
-    int objc;
-    Tcl_Obj *CONST objv[];
-{
-    Tcl_CmdInfo info;
-    int ret;
-
-    DUMP1("call ip_rbNamespaceObjCmd");
-    DUMP2("objc = %d", objc);
-    DUMP2("objv[0] = '%s'", Tcl_GetString(objv[0]));
-    DUMP2("objv[1] = '%s'", Tcl_GetString(objv[1]));
-    if (!Tcl_GetCommandInfo(interp, ORIG_NAMESPACE_CMD, &(info))) {
-      DUMP1("fail to get "ORIG_NAMESPACE_CMD);
-        Tcl_ResetResult(interp);
-        Tcl_AppendResult(interp,
-                         "invalid command name \"namespace\"", (char*)NULL);
-        return TCL_ERROR;
-    }
-
-    rbtk_eventloop_depth++;
-    DUMP2("namespace wrapper enter depth == %d", rbtk_eventloop_depth);
-
-    if (info.isNativeObjectProc) {
-#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION < 6
-        DUMP1("call a native-object-proc");
-        ret = (*(info.objProc))(info.objClientData, interp, objc, objv);
-#else
-        /* Tcl8.6 or later */
-        int i;
-        Tcl_Obj **cp_objv;
-        char org_ns_cmd_name[] = ORIG_NAMESPACE_CMD;
-
-        DUMP1("call a native-object-proc for tcl8.6 or later");
-        cp_objv = RbTk_ALLOC_N(Tcl_Obj *, (objc + 1));
-
-        cp_objv[0] = Tcl_NewStringObj(org_ns_cmd_name, strlen(org_ns_cmd_name));
-        for(i = 1; i < objc; i++) {
-            cp_objv[i] = objv[i];
-        }
-        cp_objv[objc] = (Tcl_Obj *)NULL;
-
-        /* ret = Tcl_EvalObjv(interp, objc, cp_objv, TCL_EVAL_DIRECT); */
-        ret = Tcl_EvalObjv(interp, objc, cp_objv, 0);
-
-        ckfree((char*)cp_objv);
-#endif
-    } else {
-        /* string interface */
-        int i;
-        char **argv;
-
-        DUMP1("call with the string-interface");
-        /* argv = (char **)Tcl_Alloc(sizeof(char *) * (objc + 1)); */
-        argv = RbTk_ALLOC_N(char *, (objc + 1));
-#if 0 /* use Tcl_Preserve/Release */
-	Tcl_Preserve((ClientData)argv); /* XXXXXXXX */
-#endif
-
-        for(i = 0; i < objc; i++) {
-            /* argv[i] = Tcl_GetString(objv[i]); */
-            argv[i] = Tcl_GetStringFromObj(objv[i], (int*)NULL);
-        }
-        argv[objc] = (char *)NULL;
-
-        ret = (*(info.proc))(info.clientData, interp,
-                              objc, (CONST84 char **)argv);
-
-#if 0 /* use Tcl_EventuallyFree */
-	Tcl_EventuallyFree((ClientData)argv, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 0 /* use Tcl_Preserve/Release */
-	Tcl_Release((ClientData)argv); /* XXXXXXXX */
-#else
-        /* Tcl_Free((char*)argv); */
-        ckfree((char*)argv);
-#endif
-#endif
-    }
-
-    DUMP2("namespace wrapper exit depth == %d", rbtk_eventloop_depth);
-    rbtk_eventloop_depth--;
-
-    DUMP1("end of ip_rbNamespaceObjCmd");
-    return ret;
-}
-#endif
-
-static void
-ip_wrap_namespace_command(interp)
-    Tcl_Interp *interp;
-{
-#if TCL_MAJOR_VERSION >= 8
-
-#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION < 6
-    Tcl_CmdInfo orig_info;
-
-    if (!Tcl_GetCommandInfo(interp, "namespace", &(orig_info))) {
-        return;
-    }
-
-    if (orig_info.isNativeObjectProc) {
-        Tcl_CreateObjCommand(interp, ORIG_NAMESPACE_CMD,
-                             orig_info.objProc, orig_info.objClientData,
-                             orig_info.deleteProc);
-    } else {
-        Tcl_CreateCommand(interp, ORIG_NAMESPACE_CMD,
-                          orig_info.proc, orig_info.clientData,
-                          orig_info.deleteProc);
-    }
-
-#else /* tcl8.6 or later */
-    Tcl_Eval(interp, "rename namespace "ORIG_NAMESPACE_CMD);
-
-#endif
-
-    Tcl_CreateObjCommand(interp, "namespace", ip_rbNamespaceObjCmd,
-                         (ClientData) 0, (Tcl_CmdDeleteProc *)NULL);
-#endif
-}
-
-
-/* call when interpreter is deleted */
-static void
-#ifdef HAVE_PROTOTYPES
-ip_CallWhenDeleted(ClientData clientData, Tcl_Interp *ip)
-#else
-ip_CallWhenDeleted(clientData, ip)
-    ClientData clientData;
-    Tcl_Interp *ip;
-#endif
-{
-    int  thr_crit_bup;
-    /* Tk_Window main_win = (Tk_Window) clientData; */
-
-    DUMP1("start ip_CallWhenDeleted");
-    thr_crit_bup = rb_thread_critical;
-    rb_thread_critical = Qtrue;
-
-    ip_finalize(ip);
-
-    DUMP1("finish ip_CallWhenDeleted");
-    rb_thread_critical = thr_crit_bup;
-}
-
-/*--------------------------------------------------------*/
-
-/* initialize interpreter */
-static VALUE
-ip_init(argc, argv, self)
-    int   argc;
-    VALUE *argv;
-    VALUE self;
-{
-    struct tcltkip *ptr;        /* tcltkip data struct */
-    VALUE argv0, opts;
-    int cnt;
-    int st;
-    int with_tk = 1;
-    Tk_Window mainWin = (Tk_Window)NULL;
-
-    /* create object */
-    TypedData_Get_Struct(self, struct tcltkip, &tcltkip_type, ptr);
-    if (DATA_PTR(self)) {
-	rb_raise(rb_eArgError, "already initialized interpreter");
-    }
-    ptr = ALLOC(struct tcltkip);
-    /* ptr = RbTk_ALLOC_N(struct tcltkip, 1); */
-    DATA_PTR(self) = ptr;
-#ifdef RUBY_USE_NATIVE_THREAD
-    ptr->tk_thread_id = 0;
-#endif
-    ptr->ref_count = 0;
-    ptr->allow_ruby_exit = 1;
-    ptr->return_value = 0;
-
-    /* from Tk_Main() */
-    DUMP1("Tcl_CreateInterp");
-    ptr->ip = ruby_tcl_create_ip_and_stubs_init(&st);
-    if (ptr->ip == NULL) {
-        switch(st) {
-        case TCLTK_STUBS_OK:
-            break;
-        case NO_TCL_DLL:
-            rb_raise(rb_eLoadError, "tcltklib: fail to open tcl_dll");
-        case NO_FindExecutable:
-            rb_raise(rb_eLoadError, "tcltklib: can't find Tcl_FindExecutable");
-        case NO_CreateInterp:
-            rb_raise(rb_eLoadError, "tcltklib: can't find Tcl_CreateInterp()");
-        case NO_DeleteInterp:
-            rb_raise(rb_eLoadError, "tcltklib: can't find Tcl_DeleteInterp()");
-        case FAIL_CreateInterp:
-            rb_raise(rb_eRuntimeError, "tcltklib: fail to create a new IP");
-        case FAIL_Tcl_InitStubs:
-            rb_raise(rb_eRuntimeError, "tcltklib: fail to Tcl_InitStubs()");
-        default:
-            rb_raise(rb_eRuntimeError, "tcltklib: unknown error(%d) on ruby_tcl_create_ip_and_stubs_init", st);
-        }
-    }
-
-#if TCL_MAJOR_VERSION >= 8
-#if TCL_NAMESPACE_DEBUG
-    DUMP1("get current namespace");
-    if ((ptr->default_ns = Tcl_GetCurrentNamespace(ptr->ip))
-        == (Tcl_Namespace*)NULL) {
-      rb_raise(rb_eRuntimeError, "a new Tk interpreter has a NULL namespace");
-    }
-#endif
-#endif
-
-    rbtk_preserve_ip(ptr);
-    DUMP2("IP ref_count = %d", ptr->ref_count);
-    current_interp = ptr->ip;
-
-    ptr->has_orig_exit
-        = Tcl_GetCommandInfo(ptr->ip, "exit", &(ptr->orig_exit_info));
-
-#if defined CREATE_RUBYTK_KIT || defined CREATE_RUBYKIT
-    call_tclkit_init_script(current_interp);
-
-# if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION > 84
-    {
-      Tcl_DString encodingName;
-      Tcl_GetEncodingNameFromEnvironment(&encodingName);
-      if (strcmp(Tcl_DStringValue(&encodingName), Tcl_GetEncodingName(NULL))) {
-	/* fails, so we set a variable and do it in the boot.tcl script */
-	Tcl_SetSystemEncoding(NULL, Tcl_DStringValue(&encodingName));
-      }
-      Tcl_SetVar(current_interp, "tclkit_system_encoding", Tcl_DStringValue(&encodingName), 0);
-      Tcl_DStringFree(&encodingName);
-    }
-# endif
-#endif
-
-    /* set variables */
-    Tcl_Eval(ptr->ip, "set argc 0; set argv {}; set argv0 tcltklib.so");
-
-    cnt = rb_scan_args(argc, argv, "02", &argv0, &opts);
-    switch(cnt) {
-    case 2:
-        /* options */
-        if (NIL_P(opts) || opts == Qfalse) {
-            /* without Tk */
-            with_tk = 0;
-        } else {
-            /* Tcl_SetVar(ptr->ip, "argv", StringValuePtr(opts), 0); */
-            Tcl_SetVar(ptr->ip, "argv", StringValuePtr(opts), TCL_GLOBAL_ONLY);
-	    Tcl_Eval(ptr->ip, "set argc [llength $argv]");
-        }
-    case 1:
-        /* argv0 */
-        if (!NIL_P(argv0)) {
-            if (strncmp(StringValuePtr(argv0), "-e", 3) == 0
-                || strncmp(StringValuePtr(argv0), "-", 2) == 0) {
-                Tcl_SetVar(ptr->ip, "argv0", "ruby", TCL_GLOBAL_ONLY);
-            } else {
-                /* Tcl_SetVar(ptr->ip, "argv0", StringValuePtr(argv0), 0); */
-                Tcl_SetVar(ptr->ip, "argv0", StringValuePtr(argv0),
-                           TCL_GLOBAL_ONLY);
-            }
-        }
-    case 0:
-        /* no args */
-        ;
-    }
-
-    /* from Tcl_AppInit() */
-    DUMP1("Tcl_Init");
-#if (defined CREATE_RUBYTK_KIT || defined CREATE_RUBYKIT) && (!defined KIT_LITE) && (10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION == 85)
-    /*************************************************************************/
-    /*  FIX ME (2010/06/28)                                                  */
-    /*    Don't use ::chan command for Mk4tcl + tclvfs-1.4 on Tcl8.5.        */
-    /*    It fails to access VFS files because of vfs::zstream.              */
-    /*    So, force to use ::rechan by temporarily hiding ::chan.            */
-    /*************************************************************************/
-    Tcl_Eval(ptr->ip, "catch {rename ::chan ::_tmp_chan}");
-    if (Tcl_Init(ptr->ip) == TCL_ERROR) {
-        rb_raise(rb_eRuntimeError, "%s", Tcl_GetStringResult(ptr->ip));
-    }
-    Tcl_Eval(ptr->ip, "catch {rename ::_tmp_chan ::chan}");
-#else
-    if (Tcl_Init(ptr->ip) == TCL_ERROR) {
-        rb_raise(rb_eRuntimeError, "%s", Tcl_GetStringResult(ptr->ip));
-    }
-#endif
-
-    st = ruby_tcl_stubs_init();
-    /* from Tcl_AppInit() */
-    if (with_tk) {
-        DUMP1("Tk_Init");
-        st = ruby_tk_stubs_init(ptr->ip);
-        switch(st) {
-        case TCLTK_STUBS_OK:
-            break;
-        case NO_Tk_Init:
-            rb_raise(rb_eLoadError, "tcltklib: can't find Tk_Init()");
-        case FAIL_Tk_Init:
-            rb_raise(rb_eRuntimeError, "tcltklib: fail to Tk_Init(). %s",
-                     Tcl_GetStringResult(ptr->ip));
-        case FAIL_Tk_InitStubs:
-            rb_raise(rb_eRuntimeError, "tcltklib: fail to Tk_InitStubs(). %s",
-                     Tcl_GetStringResult(ptr->ip));
-        default:
-            rb_raise(rb_eRuntimeError, "tcltklib: unknown error(%d) on ruby_tk_stubs_init", st);
-        }
-
-        DUMP1("Tcl_StaticPackage(\"Tk\")");
-#if TCL_MAJOR_VERSION >= 8
-        Tcl_StaticPackage(ptr->ip, "Tk", Tk_Init, Tk_SafeInit);
-#else /* TCL_MAJOR_VERSION < 8 */
-        Tcl_StaticPackage(ptr->ip, "Tk", Tk_Init,
-                          (Tcl_PackageInitProc *) NULL);
-#endif
-
-#ifdef RUBY_USE_NATIVE_THREAD
-        /* set Tk thread ID */
-        ptr->tk_thread_id = Tcl_GetCurrentThread();
-#endif
-        /* get main window */
-        mainWin = Tk_MainWindow(ptr->ip);
-        Tk_Preserve((ClientData)mainWin);
-    }
-
-    /* add ruby command to the interpreter */
-#if TCL_MAJOR_VERSION >= 8
-    DUMP1("Tcl_CreateObjCommand(\"ruby\")");
-    Tcl_CreateObjCommand(ptr->ip, "ruby", ip_ruby_eval, (ClientData)NULL,
-                         (Tcl_CmdDeleteProc *)NULL);
-    DUMP1("Tcl_CreateObjCommand(\"ruby_eval\")");
-    Tcl_CreateObjCommand(ptr->ip, "ruby_eval", ip_ruby_eval, (ClientData)NULL,
-                         (Tcl_CmdDeleteProc *)NULL);
-    DUMP1("Tcl_CreateObjCommand(\"ruby_cmd\")");
-    Tcl_CreateObjCommand(ptr->ip, "ruby_cmd", ip_ruby_cmd, (ClientData)NULL,
-                         (Tcl_CmdDeleteProc *)NULL);
-#else /* TCL_MAJOR_VERSION < 8 */
-    DUMP1("Tcl_CreateCommand(\"ruby\")");
-    Tcl_CreateCommand(ptr->ip, "ruby", ip_ruby_eval, (ClientData)NULL,
-                      (Tcl_CmdDeleteProc *)NULL);
-    DUMP1("Tcl_CreateCommand(\"ruby_eval\")");
-    Tcl_CreateCommand(ptr->ip, "ruby_eval", ip_ruby_eval, (ClientData)NULL,
-                      (Tcl_CmdDeleteProc *)NULL);
-    DUMP1("Tcl_CreateCommand(\"ruby_cmd\")");
-    Tcl_CreateCommand(ptr->ip, "ruby_cmd", ip_ruby_cmd, (ClientData)NULL,
-                      (Tcl_CmdDeleteProc *)NULL);
-#endif
-
-    /* add 'interp_exit', 'ruby_exit' and replace 'exit' command */
-#if TCL_MAJOR_VERSION >= 8
-    DUMP1("Tcl_CreateObjCommand(\"interp_exit\")");
-    Tcl_CreateObjCommand(ptr->ip, "interp_exit", ip_InterpExitObjCmd,
-                         (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
-    DUMP1("Tcl_CreateObjCommand(\"ruby_exit\")");
-    Tcl_CreateObjCommand(ptr->ip, "ruby_exit", ip_RubyExitObjCmd,
-                         (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
-    DUMP1("Tcl_CreateObjCommand(\"exit\") --> \"ruby_exit\"");
-    Tcl_CreateObjCommand(ptr->ip, "exit", ip_RubyExitObjCmd,
-                         (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
-#else /* TCL_MAJOR_VERSION < 8 */
-    DUMP1("Tcl_CreateCommand(\"interp_exit\")");
-    Tcl_CreateCommand(ptr->ip, "interp_exit", ip_InterpExitCommand,
-                      (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
-    DUMP1("Tcl_CreateCommand(\"ruby_exit\")");
-    Tcl_CreateCommand(ptr->ip, "ruby_exit", ip_RubyExitCommand,
-                      (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
-    DUMP1("Tcl_CreateCommand(\"exit\") --> \"ruby_exit\"");
-    Tcl_CreateCommand(ptr->ip, "exit", ip_RubyExitCommand,
-                      (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
-#endif
-
-    /* replace vwait and tkwait */
-    ip_replace_wait_commands(ptr->ip, mainWin);
-
-    /* wrap namespace command */
-    ip_wrap_namespace_command(ptr->ip);
-
-    /* define command to replace commands which depend on slave's MainWindow */
-#if TCL_MAJOR_VERSION >= 8
-    Tcl_CreateObjCommand(ptr->ip, "__replace_slave_tk_commands__",
-			 ip_rb_replaceSlaveTkCmdsObjCmd,
-                         (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
-#else /* TCL_MAJOR_VERSION < 8 */
-    Tcl_CreateCommand(ptr->ip, "__replace_slave_tk_commands__",
-		      ip_rb_replaceSlaveTkCmdsCommand,
-                      (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
-#endif
-
-    /* set finalizer */
-    Tcl_CallWhenDeleted(ptr->ip, ip_CallWhenDeleted, (ClientData)mainWin);
-
-    if (mainWin != (Tk_Window)NULL) {
-        Tk_Release((ClientData)mainWin);
-    }
-
-    return self;
-}
-
-static VALUE
-ip_create_slave_core(interp, argc, argv)
-    VALUE interp;
-    int   argc;
-    VALUE *argv;
-{
-    struct tcltkip *master = get_ip(interp);
-    struct tcltkip *slave;
-    /* struct tcltkip *slave = RbTk_ALLOC_N(struct tcltkip, 1); */
-    VALUE safemode;
-    VALUE name;
-    VALUE new_ip;
-    int safe;
-    int thr_crit_bup;
-    Tk_Window mainWin;
-
-    /* ip is deleted? */
-    if (deleted_ip(master)) {
-        return rb_exc_new2(rb_eRuntimeError,
-                           "deleted master cannot create a new slave");
-    }
-
-    name     = argv[0];
-    safemode = argv[1];
-
-    if (Tcl_IsSafe(master->ip) == 1) {
-        safe = 1;
-    } else if (safemode == Qfalse || NIL_P(safemode)) {
-        safe = 0;
-    } else {
-        safe = 1;
-    }
-
-    thr_crit_bup = rb_thread_critical;
-    rb_thread_critical = Qtrue;
-
-#if 0
-    /* init Tk */
-    if (RTEST(with_tk)) {
-        volatile VALUE exc;
-        if (!tk_stubs_init_p()) {
-            exc = tcltkip_init_tk(interp);
-            if (!NIL_P(exc)) {
-                rb_thread_critical = thr_crit_bup;
-                return exc;
-            }
-        }
-    }
-#endif
-
-    new_ip = TypedData_Make_Struct(CLASS_OF(interp), struct tcltkip,
-				   &tcltkip_type, slave);
-    /* create slave-ip */
-#ifdef RUBY_USE_NATIVE_THREAD
-    /* slave->tk_thread_id = 0; */
-    slave->tk_thread_id = master->tk_thread_id; /* == current thread */
-#endif
-    slave->ref_count = 0;
-    slave->allow_ruby_exit = 0;
-    slave->return_value = 0;
-
-    slave->ip = Tcl_CreateSlave(master->ip, StringValuePtr(name), safe);
-    if (slave->ip == NULL) {
-        rb_thread_critical = thr_crit_bup;
-        return rb_exc_new2(rb_eRuntimeError,
-                           "fail to create the new slave interpreter");
-    }
-#if TCL_MAJOR_VERSION >= 8
-#if TCL_NAMESPACE_DEBUG
-    slave->default_ns = Tcl_GetCurrentNamespace(slave->ip);
-#endif
-#endif
-    rbtk_preserve_ip(slave);
-
-    slave->has_orig_exit
-        = Tcl_GetCommandInfo(slave->ip, "exit", &(slave->orig_exit_info));
-
-    /* replace 'exit' command --> 'interp_exit' command */
-    mainWin = (tk_stubs_init_p())? Tk_MainWindow(slave->ip): (Tk_Window)NULL;
-#if TCL_MAJOR_VERSION >= 8
-    DUMP1("Tcl_CreateObjCommand(\"exit\") --> \"interp_exit\"");
-    Tcl_CreateObjCommand(slave->ip, "exit", ip_InterpExitObjCmd,
-                         (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
-#else /* TCL_MAJOR_VERSION < 8 */
-    DUMP1("Tcl_CreateCommand(\"exit\") --> \"interp_exit\"");
-    Tcl_CreateCommand(slave->ip, "exit", ip_InterpExitCommand,
-                      (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
-#endif
-
-    /* replace vwait and tkwait */
-    ip_replace_wait_commands(slave->ip, mainWin);
-
-    /* wrap namespace command */
-    ip_wrap_namespace_command(slave->ip);
-
-    /* define command to replace cmds which depend on slave-slave's MainWin */
-#if TCL_MAJOR_VERSION >= 8
-    Tcl_CreateObjCommand(slave->ip, "__replace_slave_tk_commands__",
-			 ip_rb_replaceSlaveTkCmdsObjCmd,
-                         (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
-#else /* TCL_MAJOR_VERSION < 8 */
-    Tcl_CreateCommand(slave->ip, "__replace_slave_tk_commands__",
-		      ip_rb_replaceSlaveTkCmdsCommand,
-                      (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
-#endif
-
-    /* set finalizer */
-    Tcl_CallWhenDeleted(slave->ip, ip_CallWhenDeleted, (ClientData)mainWin);
-
-    rb_thread_critical = thr_crit_bup;
-
-    return new_ip;
-}
-
-static VALUE
-ip_create_slave(argc, argv, self)
-    int   argc;
-    VALUE *argv;
-    VALUE self;
-{
-    struct tcltkip *master = get_ip(self);
-    VALUE safemode;
-    VALUE name;
-    VALUE callargv[2];
-
-    /* ip is deleted? */
-    if (deleted_ip(master)) {
-        rb_raise(rb_eRuntimeError,
-                 "deleted master cannot create a new slave interpreter");
-    }
-
-    /* argument check */
-    if (rb_scan_args(argc, argv, "11", &name, &safemode) == 1) {
-        safemode = Qfalse;
-    }
-    if (Tcl_IsSafe(master->ip) != 1
-        && (safemode == Qfalse || NIL_P(safemode))) {
-    }
-
-    StringValue(name);
-    callargv[0] = name;
-    callargv[1] = safemode;
-
-    return tk_funcall(ip_create_slave_core, 2, callargv, self);
-}
-
-
-/* self is slave of master? */
-static VALUE
-ip_is_slave_of_p(self, master)
-    VALUE self, master;
-{
-    if (!rb_obj_is_kind_of(master, tcltkip_class)) {
-        rb_raise(rb_eArgError, "expected TclTkIp object");
-    }
-
-    if (Tcl_GetMaster(get_ip(self)->ip) == get_ip(master)->ip) {
-      return Qtrue;
-    } else {
-      return Qfalse;
-    }
-}
-
-
-/* create console (if supported) */
-#if defined(MAC_TCL) || defined(__WIN32__)
-#if TCL_MAJOR_VERSION < 8 \
-    || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0) \
-    || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 1 \
-        && (TCL_RELEASE_LEVEL == TCL_ALPHA_RELEASE \
-           || (TCL_RELEASE_LEVEL == TCL_BETA_RELEASE \
-               && TCL_RELEASE_SERIAL < 2) ) )
-EXTERN void TkConsoleCreate _((void));
-#endif
-#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 1 \
-    && ( (TCL_RELEASE_LEVEL == TCL_FINAL_RELEASE \
-          && TCL_RELEASE_SERIAL == 0) \
-       || (TCL_RELEASE_LEVEL == TCL_BETA_RELEASE \
-           && TCL_RELEASE_SERIAL >= 2) )
-EXTERN void TkConsoleCreate_ _((void));
-#endif
-#endif
-static VALUE
-ip_create_console_core(interp, argc, argv)
-    VALUE interp;
-    int   argc;   /* dummy */
-    VALUE *argv;  /* dummy */
-{
-    struct tcltkip *ptr = get_ip(interp);
-
-    if (!tk_stubs_init_p()) {
-        tcltkip_init_tk(interp);
-    }
-
-    if (Tcl_GetVar(ptr->ip,"tcl_interactive",TCL_GLOBAL_ONLY) == (char*)NULL) {
-        Tcl_SetVar(ptr->ip, "tcl_interactive", "0", TCL_GLOBAL_ONLY);
-    }
-
-#if TCL_MAJOR_VERSION > 8 \
-    || (TCL_MAJOR_VERSION == 8 \
-        && (TCL_MINOR_VERSION > 1 \
-            || (TCL_MINOR_VERSION == 1 \
-                 && TCL_RELEASE_LEVEL == TCL_FINAL_RELEASE \
-                 && TCL_RELEASE_SERIAL >= 1) ) )
-    Tk_InitConsoleChannels(ptr->ip);
-
-    if (Tk_CreateConsoleWindow(ptr->ip) != TCL_OK) {
-        rb_raise(rb_eRuntimeError, "fail to create console-window");
-    }
-#else
-#if defined(MAC_TCL) || defined(__WIN32__)
-#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 1 \
-    && ( (TCL_RELEASE_LEVEL == TCL_FINAL_RELEASE && TCL_RELEASE_SERIAL == 0) \
-        || (TCL_RELEASE_LEVEL == TCL_BETA_RELEASE && TCL_RELEASE_SERIAL >= 2) )
-    TkConsoleCreate_();
-#else
-    TkConsoleCreate();
-#endif
-
-    if (TkConsoleInit(ptr->ip) != TCL_OK) {
-        rb_raise(rb_eRuntimeError, "fail to create console-window");
-    }
-#else
-    rb_notimplement();
-#endif
-#endif
-
-    return interp;
-}
-
-static VALUE
-ip_create_console(self)
-    VALUE self;
-{
-    struct tcltkip *ptr = get_ip(self);
-
-    /* ip is deleted? */
-    if (deleted_ip(ptr)) {
-        rb_raise(rb_eRuntimeError, "interpreter is deleted");
-    }
-
-    return tk_funcall(ip_create_console_core, 0, (VALUE*)NULL, self);
-}
-
-/* make ip "safe" */
-static VALUE
-ip_make_safe_core(interp, argc, argv)
-    VALUE interp;
-    int   argc;   /* dummy */
-    VALUE *argv;  /* dummy */
-{
-    struct tcltkip *ptr = get_ip(interp);
-    Tk_Window mainWin;
-
-    /* ip is deleted? */
-    if (deleted_ip(ptr)) {
-        return rb_exc_new2(rb_eRuntimeError, "interpreter is deleted");
-    }
-
-    if (Tcl_MakeSafe(ptr->ip) == TCL_ERROR) {
-        /* return rb_exc_new2(rb_eRuntimeError,
-                              Tcl_GetStringResult(ptr->ip)); */
-        return create_ip_exc(interp, rb_eRuntimeError, "%s",
-                             Tcl_GetStringResult(ptr->ip));
-    }
-
-    ptr->allow_ruby_exit = 0;
-
-    /* replace 'exit' command --> 'interp_exit' command */
-    mainWin = (tk_stubs_init_p())? Tk_MainWindow(ptr->ip): (Tk_Window)NULL;
-#if TCL_MAJOR_VERSION >= 8
-    DUMP1("Tcl_CreateObjCommand(\"exit\") --> \"interp_exit\"");
-    Tcl_CreateObjCommand(ptr->ip, "exit", ip_InterpExitObjCmd,
-                         (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
-#else /* TCL_MAJOR_VERSION < 8 */
-    DUMP1("Tcl_CreateCommand(\"exit\") --> \"interp_exit\"");
-    Tcl_CreateCommand(ptr->ip, "exit", ip_InterpExitCommand,
-                      (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
-#endif
-
-    return interp;
-}
-
-static VALUE
-ip_make_safe(self)
-    VALUE self;
-{
-    struct tcltkip *ptr = get_ip(self);
-
-    /* ip is deleted? */
-    if (deleted_ip(ptr)) {
-        rb_raise(rb_eRuntimeError, "interpreter is deleted");
-    }
-
-    return tk_funcall(ip_make_safe_core, 0, (VALUE*)NULL, self);
-}
-
-/* is safe? */
-static VALUE
-ip_is_safe_p(self)
-    VALUE self;
-{
-    struct tcltkip *ptr = get_ip(self);
-
-    /* ip is deleted? */
-    if (deleted_ip(ptr)) {
-        rb_raise(rb_eRuntimeError, "interpreter is deleted");
-    }
-
-    if (Tcl_IsSafe(ptr->ip)) {
-        return Qtrue;
-    } else {
-        return Qfalse;
-    }
-}
-
-/* allow_ruby_exit? */
-static VALUE
-ip_allow_ruby_exit_p(self)
-    VALUE self;
-{
-    struct tcltkip *ptr = get_ip(self);
-
-    /* ip is deleted? */
-    if (deleted_ip(ptr)) {
-        rb_raise(rb_eRuntimeError, "interpreter is deleted");
-    }
-
-    if (ptr->allow_ruby_exit) {
-        return Qtrue;
-    } else {
-        return Qfalse;
-    }
-}
-
-/* allow_ruby_exit = mode */
-static VALUE
-ip_allow_ruby_exit_set(self, val)
-    VALUE self, val;
-{
-    struct tcltkip *ptr = get_ip(self);
-    Tk_Window mainWin;
-
-
-    /* ip is deleted? */
-    if (deleted_ip(ptr)) {
-        rb_raise(rb_eRuntimeError, "interpreter is deleted");
-    }
-
-    if (Tcl_IsSafe(ptr->ip)) {
-        rb_raise(rb_eSecurityError,
-                 "insecure operation on a safe interpreter");
-    }
-
-    /*
-     *  Because of cross-threading, the following line may fail to find
-     *  the MainWindow, even if the Tcl/Tk interpreter has one or more.
-     *  But it has no problem. Current implementation of both type of
-     *  the "exit" command don't need maiinWin token.
-     */
-    mainWin = (tk_stubs_init_p())? Tk_MainWindow(ptr->ip): (Tk_Window)NULL;
-
-    if (RTEST(val)) {
-        ptr->allow_ruby_exit = 1;
-#if TCL_MAJOR_VERSION >= 8
-        DUMP1("Tcl_CreateObjCommand(\"exit\") --> \"ruby_exit\"");
-        Tcl_CreateObjCommand(ptr->ip, "exit", ip_RubyExitObjCmd,
-                             (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
-#else /* TCL_MAJOR_VERSION < 8 */
-        DUMP1("Tcl_CreateCommand(\"exit\") --> \"ruby_exit\"");
-        Tcl_CreateCommand(ptr->ip, "exit", ip_RubyExitCommand,
-                          (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
-#endif
-        return Qtrue;
-
-    } else {
-        ptr->allow_ruby_exit = 0;
-#if TCL_MAJOR_VERSION >= 8
-        DUMP1("Tcl_CreateObjCommand(\"exit\") --> \"interp_exit\"");
-        Tcl_CreateObjCommand(ptr->ip, "exit", ip_InterpExitObjCmd,
-                             (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
-#else /* TCL_MAJOR_VERSION < 8 */
-        DUMP1("Tcl_CreateCommand(\"exit\") --> \"interp_exit\"");
-        Tcl_CreateCommand(ptr->ip, "exit", ip_InterpExitCommand,
-                          (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
-#endif
-        return Qfalse;
-    }
-}
-
-/* delete interpreter */
-static VALUE
-ip_delete(self)
-    VALUE self;
-{
-    int  thr_crit_bup;
-    struct tcltkip *ptr = get_ip(self);
-
-    /* if (ptr == (struct tcltkip *)NULL || ptr->ip == (Tcl_Interp*)NULL) { */
-    if (deleted_ip(ptr)) {
-        DUMP1("delete deleted IP");
-        return Qnil;
-    }
-
-    thr_crit_bup = rb_thread_critical;
-    rb_thread_critical = Qtrue;
-
-    DUMP1("delete interp");
-    if (!Tcl_InterpDeleted(ptr->ip)) {
-      DUMP1("call ip_finalize");
-      ip_finalize(ptr->ip);
-
-      Tcl_DeleteInterp(ptr->ip);
-      Tcl_Release(ptr->ip);
-    }
-
-    rb_thread_critical = thr_crit_bup;
-
-    return Qnil;
-}
-
-
-/* is deleted? */
-static VALUE
-ip_has_invalid_namespace_p(self)
-    VALUE self;
-{
-    struct tcltkip *ptr = get_ip(self);
-
-    if (ptr == (struct tcltkip *)NULL || ptr->ip == (Tcl_Interp *)NULL) {
-        /* deleted IP */
-        return Qtrue;
-    }
-
-#if TCL_NAMESPACE_DEBUG
-    if (rbtk_invalid_namespace(ptr)) {
-        return Qtrue;
-    } else {
-        return Qfalse;
-    }
-#else
-    return Qfalse;
-#endif
-}
-
-static VALUE
-ip_is_deleted_p(self)
-    VALUE self;
-{
-    struct tcltkip *ptr = get_ip(self);
-
-    if (deleted_ip(ptr)) {
-        return Qtrue;
-    } else {
-        return Qfalse;
-    }
-}
-
-static VALUE
-ip_has_mainwindow_p_core(self, argc, argv)
-    VALUE self;
-    int   argc;   /* dummy */
-    VALUE *argv;  /* dummy */
-{
-    struct tcltkip *ptr = get_ip(self);
-
-    if (deleted_ip(ptr) || !tk_stubs_init_p()) {
-        return Qnil;
-    } else if (Tk_MainWindow(ptr->ip) == (Tk_Window)NULL) {
-        return Qfalse;
-    } else {
-        return Qtrue;
-    }
-}
-
-static VALUE
-ip_has_mainwindow_p(self)
-    VALUE self;
-{
-    return tk_funcall(ip_has_mainwindow_p_core, 0, (VALUE*)NULL, self);
-}
-
-
-/*** ruby string <=> tcl object ***/
-#if TCL_MAJOR_VERSION >= 8
-static VALUE
-get_str_from_obj(obj)
-    Tcl_Obj *obj;
-{
-    int len, binary = 0;
-    const char *s;
-    volatile VALUE str;
-
-#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0
-    s = Tcl_GetStringFromObj(obj, &len);
-#else
-#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION <= 3
-     /* TCL_VERSION 8.1 -- 8.3 */
-    if (Tcl_GetCharLength(obj) != Tcl_UniCharLen(Tcl_GetUnicode(obj))) {
-        /* possibly binary string */
-        s = (char *)Tcl_GetByteArrayFromObj(obj, &len);
-        binary = 1;
-    } else {
-        /* possibly text string */
-        s = Tcl_GetStringFromObj(obj, &len);
-    }
-#else /* TCL_VERSION >= 8.4 */
-    if (IS_TCL_BYTEARRAY(obj)) {
-      s = (char *)Tcl_GetByteArrayFromObj(obj, &len);
-      binary = 1;
-    } else {
-      s = Tcl_GetStringFromObj(obj, &len);
-    }
-
-#endif
-#endif
-    str = s ? rb_str_new(s, len) : rb_str_new2("");
-    if (binary) {
-#ifdef HAVE_RUBY_ENCODING_H
-      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
-      rb_enc_associate_index(str, ENCODING_INDEX_UTF8);
-#endif
-      rb_ivar_set(str, ID_at_enc, ENCODING_NAME_UTF8);
-#endif
-    }
-    return str;
-}
-
-static Tcl_Obj *
-get_obj_from_str(str)
-    VALUE str;
-{
-    const char *s = StringValuePtr(str);
-
-#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0
-    return Tcl_NewStringObj((char*)s, RSTRING_LEN(str));
-#else /* TCL_VERSION >= 8.1 */
-    VALUE enc = rb_attr_get(str, ID_at_enc);
-
-    if (!NIL_P(enc)) {
-        StringValue(enc);
-        if (strcmp(RSTRING_PTR(enc), "binary") == 0) {
-            /* binary string */
-            return Tcl_NewByteArrayObj((const unsigned char *)s, RSTRING_LENINT(str));
-        } else {
-            /* text string */
-            return Tcl_NewStringObj(s, RSTRING_LENINT(str));
-        }
-#ifdef HAVE_RUBY_ENCODING_H
-    } else if (rb_enc_get_index(str) == ENCODING_INDEX_BINARY) {
-        /* binary string */
-        return Tcl_NewByteArrayObj((const unsigned char *)s, RSTRING_LENINT(str));
-#endif
-    } else if (memchr(s, 0, RSTRING_LEN(str))) {
-        /* probably binary string */
-        return Tcl_NewByteArrayObj((const unsigned char *)s, RSTRING_LENINT(str));
-    } else {
-        /* probably text string */
-        return Tcl_NewStringObj(s, RSTRING_LENINT(str));
-    }
-#endif
-}
-#endif /* ruby string <=> tcl object */
-
-static VALUE
-ip_get_result_string_obj(interp)
-    Tcl_Interp *interp;
-{
-#if TCL_MAJOR_VERSION >= 8
-    Tcl_Obj *retObj;
-    volatile VALUE strval;
-
-    retObj = Tcl_GetObjResult(interp);
-    Tcl_IncrRefCount(retObj);
-    strval = get_str_from_obj(retObj);
-    RbTk_OBJ_UNTRUST(strval);
-    Tcl_ResetResult(interp);
-    Tcl_DecrRefCount(retObj);
-    return strval;
-#else
-    return rb_tainted_str_new2(interp->result);
-#endif
-}
-
-/* call Tcl/Tk functions on the eventloop thread */
-static VALUE
-callq_safelevel_handler(arg, callq)
-    VALUE arg;
-    VALUE callq;
-{
-    struct call_queue *q;
-
-    Data_Get_Struct(callq, struct call_queue, q);
-    DUMP2("(safe-level handler) $SAFE = %d", q->safe_level);
-    rb_set_safe_level(q->safe_level);
-    return((q->func)(q->interp, q->argc, q->argv));
-}
-
-static int call_queue_handler _((Tcl_Event *, int));
-static int
-call_queue_handler(evPtr, flags)
-    Tcl_Event *evPtr;
-    int flags;
-{
-    struct call_queue *q = (struct call_queue *)evPtr;
-    volatile VALUE ret;
-    volatile VALUE q_dat;
-    volatile VALUE thread = q->thread;
-    struct tcltkip *ptr;
-
-    DUMP2("do_call_queue_handler : evPtr = %p", evPtr);
-    DUMP2("call_queue_handler thread : %"PRIxVALUE, rb_thread_current());
-    DUMP2("added by thread : %"PRIxVALUE, thread);
-
-    if (*(q->done)) {
-        DUMP1("processed by another event-loop");
-        return 0;
-    } else {
-        DUMP1("process it on current event-loop");
-    }
-
-    if (RTEST(rb_thread_alive_p(thread))
-	&& ! RTEST(rb_funcall(thread, ID_stop_p, 0))) {
-      DUMP1("caller is not yet ready to receive the result -> pending");
-      return 0;
-    }
-
-    /* process it */
-    *(q->done) = 1;
-
-    /* deleted ipterp ? */
-    ptr = get_ip(q->interp);
-    if (deleted_ip(ptr)) {
-        /* deleted IP --> ignore */
-        return 1;
-    }
-
-    /* incr internal handler mark */
-    rbtk_internal_eventloop_handler++;
-
-    /* check safe-level */
-    if (rb_safe_level() != q->safe_level) {
-        /* q_dat = Data_Wrap_Struct(rb_cData,0,-1,q); */
-        q_dat = Data_Wrap_Struct(0,call_queue_mark,-1,q);
-        ret = rb_funcall(rb_proc_new(callq_safelevel_handler, q_dat),
-                         ID_call, 0);
-        rb_gc_force_recycle(q_dat);
-	q_dat = (VALUE)NULL;
-    } else {
-        DUMP2("call function (for caller thread:%"PRIxVALUE")", thread);
-        DUMP2("call function (current thread:%"PRIxVALUE")", rb_thread_current());
-        ret = (q->func)(q->interp, q->argc, q->argv);
-    }
-
-    /* set result */
-    RARRAY_ASET(q->result, 0, ret);
-    ret = (VALUE)NULL;
-
-    /* decr internal handler mark */
-    rbtk_internal_eventloop_handler--;
-
-    /* complete */
-    *(q->done) = -1;
-
-    /* unlink ruby objects */
-    q->argv = (VALUE*)NULL;
-    q->interp = (VALUE)NULL;
-    q->result = (VALUE)NULL;
-    q->thread = (VALUE)NULL;
-
-    /* back to caller */
-    if (RTEST(rb_thread_alive_p(thread))) {
-      DUMP2("back to caller (caller thread:%"PRIxVALUE")", thread);
-      DUMP2("               (current thread:%"PRIxVALUE")", rb_thread_current());
-#if CONTROL_BY_STATUS_OF_RB_THREAD_WAITING_FOR_VALUE
-      have_rb_thread_waiting_for_value = 1;
-      rb_thread_wakeup(thread);
-#else
-      rb_thread_run(thread);
-#endif
-      DUMP1("finish back to caller");
-#if DO_THREAD_SCHEDULE_AT_CALLBACK_DONE
-      rb_thread_schedule();
-#endif
-    } else {
-      DUMP2("caller is dead (caller thread:%"PRIxVALUE")", thread);
-      DUMP2("               (current thread:%"PRIxVALUE")", rb_thread_current());
-    }
-
-    /* end of handler : remove it */
-    return 1;
-}
-
-static VALUE
-tk_funcall(func, argc, argv, obj)
-    VALUE (*func)();
-    int argc;
-    VALUE *argv;
-    VALUE obj;
-{
-    struct call_queue *callq;
-    struct tcltkip *ptr;
-    int  *alloc_done;
-    int  thr_crit_bup;
-    int  is_tk_evloop_thread;
-    volatile VALUE current = rb_thread_current();
-    volatile VALUE ip_obj = obj;
-    volatile VALUE result;
-    volatile VALUE ret;
-    struct timeval t;
-
-    if (!NIL_P(ip_obj) && rb_obj_is_kind_of(ip_obj, tcltkip_class)) {
-        ptr = get_ip(ip_obj);
-        if (deleted_ip(ptr)) return Qnil;
-    } else {
-        ptr = (struct tcltkip *)NULL;
-    }
-
-#ifdef RUBY_USE_NATIVE_THREAD
-    if (ptr) {
-      /* on Tcl interpreter */
-      is_tk_evloop_thread = (ptr->tk_thread_id == (Tcl_ThreadId) 0
-			     || ptr->tk_thread_id == Tcl_GetCurrentThread());
-    } else {
-      /* on Tcl/Tk library */
-      is_tk_evloop_thread = (tk_eventloop_thread_id == (Tcl_ThreadId) 0
-			     || tk_eventloop_thread_id == Tcl_GetCurrentThread());
-    }
-#else
-    is_tk_evloop_thread = 1;
-#endif
-
-    if (is_tk_evloop_thread
-	&& (NIL_P(eventloop_thread) || current == eventloop_thread)
-        ) {
-        if (NIL_P(eventloop_thread)) {
-            DUMP2("tk_funcall from thread:%"PRIxVALUE" but no eventloop", current);
-        } else {
-            DUMP2("tk_funcall from current eventloop %"PRIxVALUE, current);
-        }
-        result = (func)(ip_obj, argc, argv);
-        if (rb_obj_is_kind_of(result, rb_eException)) {
-            rb_exc_raise(result);
-        }
-        return result;
-    }
-
-    DUMP2("tk_funcall from thread %"PRIxVALUE" (NOT current eventloop)", current);
-
-    thr_crit_bup = rb_thread_critical;
-    rb_thread_critical = Qtrue;
-
-    /* allocate memory (argv cross over thread : must be in heap) */
-    if (argv) {
-        /* VALUE *temp = ALLOC_N(VALUE, argc); */
-        VALUE *temp = RbTk_ALLOC_N(VALUE, argc);
-#if 0 /* use Tcl_Preserve/Release */
-	Tcl_Preserve((ClientData)temp); /* XXXXXXXX */
-#endif
-        MEMCPY(temp, argv, VALUE, argc);
-        argv = temp;
-    }
-
-    /* allocate memory (keep result) */
-    /* alloc_done = (int*)ALLOC(int); */
-    alloc_done = RbTk_ALLOC_N(int, 1);
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Preserve((ClientData)alloc_done); /* XXXXXXXX */
-#endif
-    *alloc_done = 0;
-
-    /* allocate memory (freed by Tcl_ServiceEvent) */
-    /* callq = (struct call_queue *)Tcl_Alloc(sizeof(struct call_queue)); */
-    callq = RbTk_ALLOC_N(struct call_queue, 1);
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Preserve(callq);
-#endif
-
-    /* allocate result obj */
-    result = rb_ary_new3(1, Qnil);
-
-    /* construct event data */
-    callq->done = alloc_done;
-    callq->func = func;
-    callq->argc = argc;
-    callq->argv = argv;
-    callq->interp = ip_obj;
-    callq->result = result;
-    callq->thread = current;
-    callq->safe_level = rb_safe_level();
-    callq->ev.proc = call_queue_handler;
-
-    /* add the handler to Tcl event queue */
-    DUMP1("add handler");
-#ifdef RUBY_USE_NATIVE_THREAD
-    if (ptr && ptr->tk_thread_id) {
-      /* Tcl_ThreadQueueEvent(ptr->tk_thread_id,
-			   &(callq->ev), TCL_QUEUE_HEAD); */
-      Tcl_ThreadQueueEvent(ptr->tk_thread_id,
-			   (Tcl_Event*)callq, TCL_QUEUE_HEAD);
-      Tcl_ThreadAlert(ptr->tk_thread_id);
-    } else if (tk_eventloop_thread_id) {
-      /* Tcl_ThreadQueueEvent(tk_eventloop_thread_id,
-			   &(callq->ev), TCL_QUEUE_HEAD); */
-      Tcl_ThreadQueueEvent(tk_eventloop_thread_id,
-			   (Tcl_Event*)callq, TCL_QUEUE_HEAD);
-      Tcl_ThreadAlert(tk_eventloop_thread_id);
-    } else {
-      /* Tcl_QueueEvent(&(callq->ev), TCL_QUEUE_HEAD); */
-      Tcl_QueueEvent((Tcl_Event*)callq, TCL_QUEUE_HEAD);
-    }
-#else
-    /* Tcl_QueueEvent(&(callq->ev), TCL_QUEUE_HEAD); */
-    Tcl_QueueEvent((Tcl_Event*)callq, TCL_QUEUE_HEAD);
-#endif
-
-    rb_thread_critical = thr_crit_bup;
-
-    /* wait for the handler to be processed */
-    t.tv_sec  = 0;
-    t.tv_usec = (long)((EVENT_HANDLER_TIMEOUT)*1000.0);
-
-    DUMP2("callq wait for handler (current thread:%"PRIxVALUE")", current);
-    while(*alloc_done >= 0) {
-      DUMP2("*** callq wait for handler (current thread:%"PRIxVALUE")", current);
-      /* rb_thread_stop(); */
-      /* rb_thread_sleep_forever(); */
-      rb_thread_wait_for(t);
-      DUMP2("*** callq wakeup (current thread:%"PRIxVALUE")", current);
-      DUMP2("***            (eventloop thread:%"PRIxVALUE")", eventloop_thread);
-      if (NIL_P(eventloop_thread)) {
-	DUMP1("*** callq lost eventloop thread");
-	break;
-      }
-    }
-    DUMP2("back from handler (current thread:%"PRIxVALUE")", current);
-
-    /* get result & free allocated memory */
-    ret = RARRAY_AREF(result, 0);
-#if 0 /* use Tcl_EventuallyFree */
-    Tcl_EventuallyFree((ClientData)alloc_done, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Release((ClientData)alloc_done); /* XXXXXXXX */
-#else
-    /* free(alloc_done); */
-    ckfree((char*)alloc_done);
-#endif
-#endif
-    /* if (argv) free(argv); */
-    if (argv) {
-      /* if argv != NULL, alloc as 'temp' */
-      int i;
-      for(i = 0; i < argc; i++) { argv[i] = (VALUE)NULL; }
-
-#if 0 /* use Tcl_EventuallyFree */
-      Tcl_EventuallyFree((ClientData)argv, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 0 /* use Tcl_Preserve/Release */
-      Tcl_Release((ClientData)argv); /* XXXXXXXX */
-#else
-      ckfree((char*)argv);
-#endif
-#endif
-    }
-
-#if 0 /* callq is freed by Tcl_ServiceEvent */
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Release(callq);
-#else
-    ckfree((char*)callq);
-#endif
-#endif
-
-    /* exception? */
-    if (rb_obj_is_kind_of(ret, rb_eException)) {
-        DUMP1("raise exception");
-        /* rb_exc_raise(ret); */
-	rb_exc_raise(rb_exc_new3(rb_obj_class(ret),
-				 rb_funcallv(ret, ID_to_s, 0, 0)));
-    }
-
-    DUMP1("exit tk_funcall");
-    return ret;
-}
-
-
-/* eval string in tcl by Tcl_Eval() */
-#if TCL_MAJOR_VERSION >= 8
-struct call_eval_info {
-    struct tcltkip *ptr;
-    Tcl_Obj *cmd;
-};
-
-static VALUE
-#ifdef HAVE_PROTOTYPES
-call_tcl_eval(VALUE arg)
-#else
-call_tcl_eval(arg)
-    VALUE arg;
-#endif
-{
-    struct call_eval_info *inf = (struct call_eval_info *)arg;
-
-    Tcl_AllowExceptions(inf->ptr->ip);
-    inf->ptr->return_value = Tcl_EvalObj(inf->ptr->ip, inf->cmd);
-
-    return Qnil;
-}
-#endif
-
-static VALUE
-ip_eval_real(self, cmd_str, cmd_len)
-    VALUE self;
-    char *cmd_str;
-    int  cmd_len;
-{
-    volatile VALUE ret;
-    struct tcltkip *ptr = get_ip(self);
-    int thr_crit_bup;
-
-#if TCL_MAJOR_VERSION >= 8
-    /* call Tcl_EvalObj() */
-    {
-      Tcl_Obj *cmd;
-
-      thr_crit_bup = rb_thread_critical;
-      rb_thread_critical = Qtrue;
-
-      cmd = Tcl_NewStringObj(cmd_str, cmd_len);
-      Tcl_IncrRefCount(cmd);
-
-      /* ip is deleted? */
-      if (deleted_ip(ptr)) {
-          Tcl_DecrRefCount(cmd);
-          rb_thread_critical = thr_crit_bup;
-          ptr->return_value = TCL_OK;
-          return rb_tainted_str_new2("");
-      } else {
-          int status;
-          struct call_eval_info inf;
-
-          /* Tcl_Preserve(ptr->ip); */
-          rbtk_preserve_ip(ptr);
-
-#if 0
-          ptr->return_value = Tcl_EvalObj(ptr->ip, cmd);
-          /* ptr->return_value = Tcl_GlobalEvalObj(ptr->ip, cmd); */
-#else
-          inf.ptr = ptr;
-          inf.cmd = cmd;
-          ret = rb_protect(call_tcl_eval, (VALUE)&inf, &status);
-          switch(status) {
-          case TAG_RAISE:
-              if (NIL_P(rb_errinfo())) {
-                  rbtk_pending_exception = rb_exc_new2(rb_eException,
-                                                       "unknown exception");
-              } else {
-                  rbtk_pending_exception = rb_errinfo();
-              }
-              break;
-
-          case TAG_FATAL:
-              if (NIL_P(rb_errinfo())) {
-                  rbtk_pending_exception = rb_exc_new2(rb_eFatal, "FATAL");
-              } else {
-                  rbtk_pending_exception = rb_errinfo();
-              }
-          }
-#endif
-      }
-
-      Tcl_DecrRefCount(cmd);
-
-    }
-
-    if (pending_exception_check1(thr_crit_bup, ptr)) {
-        rbtk_release_ip(ptr);
-        return rbtk_pending_exception;
-    }
-
-    /* if (ptr->return_value == TCL_ERROR) { */
-    if (ptr->return_value != TCL_OK) {
-        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));
-	    }
-
-            rbtk_release_ip(ptr);
-            rb_thread_critical = thr_crit_bup;
-            return exc;
-        } else {
-            if (event_loop_abort_on_exc < 0) {
-                rb_warning("%s (ignore)", Tcl_GetStringResult(ptr->ip));
-            } else {
-                rb_warn("%s (ignore)", Tcl_GetStringResult(ptr->ip));
-            }
-            Tcl_ResetResult(ptr->ip);
-            rbtk_release_ip(ptr);
-            rb_thread_critical = thr_crit_bup;
-            return rb_tainted_str_new2("");
-        }
-    }
-
-    /* pass back the result (as string) */
-    ret =  ip_get_result_string_obj(ptr->ip);
-    rbtk_release_ip(ptr);
-    rb_thread_critical = thr_crit_bup;
-    return ret;
-
-#else /* TCL_MAJOR_VERSION < 8 */
-    DUMP2("Tcl_Eval(%s)", cmd_str);
-
-    /* ip is deleted? */
-    if (deleted_ip(ptr)) {
-        ptr->return_value = TCL_OK;
-        return rb_tainted_str_new2("");
-    } else {
-        /* Tcl_Preserve(ptr->ip); */
-        rbtk_preserve_ip(ptr);
-        ptr->return_value = Tcl_Eval(ptr->ip, cmd_str);
-        /* ptr->return_value = Tcl_GlobalEval(ptr->ip, cmd_str); */
-    }
-
-    if (pending_exception_check1(thr_crit_bup, ptr)) {
-        rbtk_release_ip(ptr);
-        return rbtk_pending_exception;
-    }
-
-    /* if (ptr->return_value == TCL_ERROR) { */
-    if (ptr->return_value != TCL_OK) {
-        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);
-	}
-
-        rbtk_release_ip(ptr);
-        return exc;
-    }
-    DUMP2("(TCL_Eval result) %d", ptr->return_value);
-
-    /* pass back the result (as string) */
-    ret =  ip_get_result_string_obj(ptr->ip);
-    rbtk_release_ip(ptr);
-    return ret;
-#endif
-}
-
-static VALUE
-evq_safelevel_handler(arg, evq)
-    VALUE arg;
-    VALUE evq;
-{
-    struct eval_queue *q;
-
-    Data_Get_Struct(evq, struct eval_queue, q);
-    DUMP2("(safe-level handler) $SAFE = %d", q->safe_level);
-    rb_set_safe_level(q->safe_level);
-    return ip_eval_real(q->interp, q->str, q->len);
-}
-
-int eval_queue_handler _((Tcl_Event *, int));
-int
-eval_queue_handler(evPtr, flags)
-    Tcl_Event *evPtr;
-    int flags;
-{
-    struct eval_queue *q = (struct eval_queue *)evPtr;
-    volatile VALUE ret;
-    volatile VALUE q_dat;
-    volatile VALUE thread = q->thread;
-    struct tcltkip *ptr;
-
-    DUMP2("do_eval_queue_handler : evPtr = %p", evPtr);
-    DUMP2("eval_queue_thread : %"PRIxVALUE, rb_thread_current());
-    DUMP2("added by thread : %"PRIxVALUE, thread);
-
-    if (*(q->done)) {
-        DUMP1("processed by another event-loop");
-        return 0;
-    } else {
-        DUMP1("process it on current event-loop");
-    }
-
-    if (RTEST(rb_thread_alive_p(thread))
-	&& ! RTEST(rb_funcall(thread, ID_stop_p, 0))) {
-      DUMP1("caller is not yet ready to receive the result -> pending");
-      return 0;
-    }
-
-    /* process it */
-    *(q->done) = 1;
-
-    /* deleted ipterp ? */
-    ptr = get_ip(q->interp);
-    if (deleted_ip(ptr)) {
-        /* deleted IP --> ignore */
-        return 1;
-    }
-
-    /* incr internal handler mark */
-    rbtk_internal_eventloop_handler++;
-
-    /* check safe-level */
-    if (rb_safe_level() != q->safe_level) {
-#ifdef HAVE_NATIVETHREAD
-#ifndef RUBY_USE_NATIVE_THREAD
-    if (!ruby_native_thread_p()) {
-      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(0,eval_queue_mark,-1,q);
-        ret = rb_funcall(rb_proc_new(evq_safelevel_handler, q_dat),
-                         ID_call, 0);
-        rb_gc_force_recycle(q_dat);
-	q_dat = (VALUE)NULL;
-    } else {
-        ret = ip_eval_real(q->interp, q->str, q->len);
-    }
-
-    /* set result */
-    RARRAY_ASET(q->result, 0, ret);
-    ret = (VALUE)NULL;
-
-    /* decr internal handler mark */
-    rbtk_internal_eventloop_handler--;
-
-    /* complete */
-    *(q->done) = -1;
-
-    /* unlink ruby objects */
-    q->interp = (VALUE)NULL;
-    q->result = (VALUE)NULL;
-    q->thread = (VALUE)NULL;
-
-    /* back to caller */
-    if (RTEST(rb_thread_alive_p(thread))) {
-      DUMP2("back to caller (caller thread:%"PRIxVALUE")", thread);
-      DUMP2("               (current thread:%"PRIxVALUE")", rb_thread_current());
-#if CONTROL_BY_STATUS_OF_RB_THREAD_WAITING_FOR_VALUE
-      have_rb_thread_waiting_for_value = 1;
-      rb_thread_wakeup(thread);
-#else
-      rb_thread_run(thread);
-#endif
-      DUMP1("finish back to caller");
-#if DO_THREAD_SCHEDULE_AT_CALLBACK_DONE
-      rb_thread_schedule();
-#endif
-    } else {
-      DUMP2("caller is dead (caller thread:%"PRIxVALUE")", thread);
-      DUMP2("               (current thread:%"PRIxVALUE")", rb_thread_current());
-    }
-
-    /* end of handler : remove it */
-    return 1;
-}
-
-static VALUE
-ip_eval(self, str)
-    VALUE self;
-    VALUE str;
-{
-    struct eval_queue *evq;
-#ifdef RUBY_USE_NATIVE_THREAD
-    struct tcltkip *ptr;
-#endif
-    char *eval_str;
-    int  *alloc_done;
-    int  thr_crit_bup;
-    volatile VALUE current = rb_thread_current();
-    volatile VALUE ip_obj = self;
-    volatile VALUE result;
-    volatile VALUE ret;
-    Tcl_QueuePosition position;
-    struct timeval t;
-
-    thr_crit_bup = rb_thread_critical;
-    rb_thread_critical = Qtrue;
-    StringValue(str);
-    rb_thread_critical = thr_crit_bup;
-
-#ifdef RUBY_USE_NATIVE_THREAD
-    ptr = get_ip(ip_obj);
-    DUMP2("eval status: ptr->tk_thread_id %p", ptr->tk_thread_id);
-    DUMP2("eval status: Tcl_GetCurrentThread %p", Tcl_GetCurrentThread());
-#else
-    DUMP2("status: Tcl_GetCurrentThread %p", Tcl_GetCurrentThread());
-#endif
-    DUMP2("status: eventloopt_thread %"PRIxVALUE, eventloop_thread);
-
-    if (
-#ifdef RUBY_USE_NATIVE_THREAD
-	(ptr->tk_thread_id == 0 || ptr->tk_thread_id == Tcl_GetCurrentThread())
-	&&
-#endif
-	(NIL_P(eventloop_thread) || current == eventloop_thread)
-	) {
-        if (NIL_P(eventloop_thread)) {
-            DUMP2("eval from thread:%"PRIxVALUE" but no eventloop", current);
-        } else {
-            DUMP2("eval from current eventloop %"PRIxVALUE, current);
-        }
-        result = ip_eval_real(self, RSTRING_PTR(str), RSTRING_LENINT(str));
-        if (rb_obj_is_kind_of(result, rb_eException)) {
-            rb_exc_raise(result);
-        }
-        return result;
-    }
-
-    DUMP2("eval from thread %"PRIxVALUE" (NOT current eventloop)", current);
-
-    thr_crit_bup = rb_thread_critical;
-    rb_thread_critical = Qtrue;
-
-    /* allocate memory (keep result) */
-    /* alloc_done = (int*)ALLOC(int); */
-    alloc_done = RbTk_ALLOC_N(int, 1);
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Preserve((ClientData)alloc_done); /* XXXXXXXX */
-#endif
-    *alloc_done = 0;
-
-    /* eval_str = ALLOC_N(char, RSTRING_LEN(str) + 1); */
-    eval_str = ckalloc(RSTRING_LENINT(str) + 1);
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Preserve((ClientData)eval_str); /* XXXXXXXX */
-#endif
-    memcpy(eval_str, RSTRING_PTR(str), RSTRING_LEN(str));
-    eval_str[RSTRING_LEN(str)] = 0;
-
-    /* allocate memory (freed by Tcl_ServiceEvent) */
-    /* evq = (struct eval_queue *)Tcl_Alloc(sizeof(struct eval_queue)); */
-    evq = RbTk_ALLOC_N(struct eval_queue, 1);
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Preserve(evq);
-#endif
-
-    /* allocate result obj */
-    result = rb_ary_new3(1, Qnil);
-
-    /* construct event data */
-    evq->done = alloc_done;
-    evq->str = eval_str;
-    evq->len = RSTRING_LENINT(str);
-    evq->interp = ip_obj;
-    evq->result = result;
-    evq->thread = current;
-    evq->safe_level = rb_safe_level();
-    evq->ev.proc = eval_queue_handler;
-
-    position = TCL_QUEUE_TAIL;
-
-    /* add the handler to Tcl event queue */
-    DUMP1("add handler");
-#ifdef RUBY_USE_NATIVE_THREAD
-    if (ptr->tk_thread_id) {
-      /* Tcl_ThreadQueueEvent(ptr->tk_thread_id, &(evq->ev), position); */
-      Tcl_ThreadQueueEvent(ptr->tk_thread_id, (Tcl_Event*)evq, position);
-      Tcl_ThreadAlert(ptr->tk_thread_id);
-    } else if (tk_eventloop_thread_id) {
-      Tcl_ThreadQueueEvent(tk_eventloop_thread_id, (Tcl_Event*)evq, position);
-      /* Tcl_ThreadQueueEvent(tk_eventloop_thread_id,
-			   &(evq->ev), position); */
-      Tcl_ThreadAlert(tk_eventloop_thread_id);
-    } else {
-      /* Tcl_QueueEvent(&(evq->ev), position); */
-      Tcl_QueueEvent((Tcl_Event*)evq, position);
-    }
-#else
-    /* Tcl_QueueEvent(&(evq->ev), position); */
-    Tcl_QueueEvent((Tcl_Event*)evq, position);
-#endif
-
-    rb_thread_critical = thr_crit_bup;
-
-    /* wait for the handler to be processed */
-    t.tv_sec  = 0;
-    t.tv_usec = (long)((EVENT_HANDLER_TIMEOUT)*1000.0);
-
-    DUMP2("evq wait for handler (current thread:%"PRIxVALUE")", current);
-    while(*alloc_done >= 0) {
-      DUMP2("*** evq wait for handler (current thread:%"PRIxVALUE")", current);
-      /* rb_thread_stop(); */
-      /* rb_thread_sleep_forever(); */
-      rb_thread_wait_for(t);
-      DUMP2("*** evq wakeup (current thread:%"PRIxVALUE")", current);
-      DUMP2("***          (eventloop thread:%"PRIxVALUE")", eventloop_thread);
-      if (NIL_P(eventloop_thread)) {
-	DUMP1("*** evq lost eventloop thread");
-	break;
-      }
-    }
-    DUMP2("back from handler (current thread:%"PRIxVALUE")", current);
-
-    /* get result & free allocated memory */
-    ret = RARRAY_AREF(result, 0);
-
-#if 0 /* use Tcl_EventuallyFree */
-    Tcl_EventuallyFree((ClientData)alloc_done, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Release((ClientData)alloc_done); /* XXXXXXXX */
-#else
-    /* free(alloc_done); */
-    ckfree((char*)alloc_done);
-#endif
-#endif
-#if 0 /* use Tcl_EventuallyFree */
-    Tcl_EventuallyFree((ClientData)eval_str, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Release((ClientData)eval_str); /* XXXXXXXX */
-#else
-    /* free(eval_str); */
-    ckfree(eval_str);
-#endif
-#endif
-#if 0 /* evq is freed by Tcl_ServiceEvent */
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Release(evq);
-#else
-    ckfree((char*)evq);
-#endif
-#endif
-
-    if (rb_obj_is_kind_of(ret, rb_eException)) {
-        DUMP1("raise exception");
-        /* rb_exc_raise(ret); */
-	rb_exc_raise(rb_exc_new3(rb_obj_class(ret),
-				 rb_funcallv(ret, ID_to_s, 0, 0)));
-    }
-
-    return ret;
-}
-
-
-static int
-ip_cancel_eval_core(interp, msg, flag)
-    Tcl_Interp *interp;
-    VALUE msg;
-    int flag;
-{
-#if TCL_MAJOR_VERSION < 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION < 6)
-    rb_raise(rb_eNotImpError,
-	     "cancel_eval is supported Tcl/Tk8.6 or later.");
-
-    UNREACHABLE;
-#else
-    Tcl_Obj *msg_obj;
-
-    if (NIL_P(msg)) {
-      msg_obj = NULL;
-    } else {
-      char *s = StringValuePtr(msg);
-      msg_obj = Tcl_NewStringObj(s, RSTRING_LENINT(msg));
-      Tcl_IncrRefCount(msg_obj);
-    }
-
-    return Tcl_CancelEval(interp, msg_obj, 0, flag);
-#endif
-}
-
-static VALUE
-ip_cancel_eval(argc, argv, self)
-    int   argc;
-    VALUE *argv;
-    VALUE self;
-{
-    VALUE retval;
-
-    if (rb_scan_args(argc, argv, "01", &retval) == 0) {
-        retval = Qnil;
-    }
-    if (ip_cancel_eval_core(get_ip(self)->ip, retval, 0) == TCL_OK) {
-      return Qtrue;
-    } else {
-      return Qfalse;
-    }
-}
-
-#ifndef TCL_CANCEL_UNWIND
-#define TCL_CANCEL_UNWIND 0x100000
-#endif
-static VALUE
-ip_cancel_eval_unwind(argc, argv, self)
-    int   argc;
-    VALUE *argv;
-    VALUE self;
-{
-    int flag = 0;
-    VALUE retval;
-
-    if (rb_scan_args(argc, argv, "01", &retval) == 0) {
-        retval = Qnil;
-    }
-
-    flag |= TCL_CANCEL_UNWIND;
-    if (ip_cancel_eval_core(get_ip(self)->ip, retval, flag) == TCL_OK) {
-      return Qtrue;
-    } else {
-      return Qfalse;
-    }
-}
-
-/* restart Tk */
-static VALUE
-lib_restart_core(interp, argc, argv)
-    VALUE interp;
-    int   argc;   /* dummy */
-    VALUE *argv;  /* dummy */
-{
-    volatile VALUE exc;
-    struct tcltkip *ptr = get_ip(interp);
-    int  thr_crit_bup;
-
-
-    /* tcl_stubs_check(); */ /* already checked */
-
-    /* ip is deleted? */
-    if (deleted_ip(ptr)) {
-        return rb_exc_new2(rb_eRuntimeError, "interpreter is deleted");
-    }
-
-    thr_crit_bup = rb_thread_critical;
-    rb_thread_critical = Qtrue;
-
-    /* Tcl_Preserve(ptr->ip); */
-    rbtk_preserve_ip(ptr);
-
-    /* destroy the root wdiget */
-    ptr->return_value = Tcl_Eval(ptr->ip, "destroy .");
-    /* ignore ERROR */
-    DUMP2("(TCL_Eval result) %d", ptr->return_value);
-    Tcl_ResetResult(ptr->ip);
-
-#if TCL_MAJOR_VERSION >= 8
-    /* delete namespace ( tested on tk8.4.5 ) */
-    ptr->return_value = Tcl_Eval(ptr->ip, "namespace delete ::tk::msgcat");
-    /* ignore ERROR */
-    DUMP2("(TCL_Eval result) %d", ptr->return_value);
-    Tcl_ResetResult(ptr->ip);
-#endif
-
-    /* delete trace proc ( tested on tk8.4.5 ) */
-    ptr->return_value = Tcl_Eval(ptr->ip, "trace vdelete ::tk_strictMotif w ::tk::EventMotifBindings");
-    /* ignore ERROR */
-    DUMP2("(TCL_Eval result) %d", ptr->return_value);
-    Tcl_ResetResult(ptr->ip);
-
-    /* execute Tk_Init or Tk_SafeInit */
-    exc = tcltkip_init_tk(interp);
-    if (!NIL_P(exc)) {
-        rb_thread_critical = thr_crit_bup;
-        rbtk_release_ip(ptr);
-        return exc;
-    }
-
-    /* Tcl_Release(ptr->ip); */
-    rbtk_release_ip(ptr);
-
-    rb_thread_critical = thr_crit_bup;
-
-    /* return Qnil; */
-    return interp;
-}
-
-static VALUE
-lib_restart(self)
-    VALUE self;
-{
-    struct tcltkip *ptr = get_ip(self);
-
-
-    tcl_stubs_check();
-
-    /* ip is deleted? */
-    if (deleted_ip(ptr)) {
-        rb_raise(rb_eRuntimeError, "interpreter is deleted");
-    }
-
-    return tk_funcall(lib_restart_core, 0, (VALUE*)NULL, self);
-}
-
-
-static VALUE
-ip_restart(self)
-    VALUE self;
-{
-    struct tcltkip *ptr = get_ip(self);
-
-
-    tcl_stubs_check();
-
-    /* ip is deleted? */
-    if (deleted_ip(ptr)) {
-        rb_raise(rb_eRuntimeError, "interpreter is deleted");
-    }
-
-    if (Tcl_GetMaster(ptr->ip) != (Tcl_Interp*)NULL) {
-        /* slave IP */
-        return Qnil;
-    }
-    return lib_restart(self);
-}
-
-static VALUE
-lib_toUTF8_core(ip_obj, src, encodename)
-    VALUE ip_obj;
-    VALUE src;
-    VALUE encodename;
-{
-    volatile VALUE str = src;
-
-#ifdef TCL_UTF_MAX
-# if 0
-    Tcl_Interp *interp;
-# endif
-    Tcl_Encoding encoding;
-    Tcl_DString dstr;
-    int taint_flag = OBJ_TAINTED(str);
-    struct tcltkip *ptr;
-    char *buf;
-    int thr_crit_bup;
-#endif
-
-    tcl_stubs_check();
-
-    if (NIL_P(src)) {
-      return rb_str_new2("");
-    }
-
-#ifdef TCL_UTF_MAX
-    if (NIL_P(ip_obj)) {
-# if 0
-        interp = (Tcl_Interp *)NULL;
-# endif
-    } else {
-        ptr = get_ip(ip_obj);
-
-        /* ip is deleted? */
-        if (deleted_ip(ptr)) {
-# if 0
-            interp = (Tcl_Interp *)NULL;
-        } else {
-            interp = ptr->ip;
-# endif
-        }
-    }
-
-    thr_crit_bup = rb_thread_critical;
-    rb_thread_critical = Qtrue;
-
-    if (NIL_P(encodename)) {
-        if (RB_TYPE_P(str, T_STRING)) {
-            volatile VALUE enc;
-
-#ifdef HAVE_RUBY_ENCODING_H
-            enc = rb_funcallv(rb_obj_encoding(str), ID_to_s, 0, 0);
-#else
-            enc = rb_attr_get(str, ID_at_enc);
-#endif
-            if (NIL_P(enc)) {
-                if (NIL_P(ip_obj)) {
-                    encoding = (Tcl_Encoding)NULL;
-                } else {
-                    enc = rb_attr_get(ip_obj, ID_at_enc);
-                    if (NIL_P(enc)) {
-                        encoding = (Tcl_Encoding)NULL;
-                    } else {
-                        /* StringValue(enc); */
-                        enc = rb_funcallv(enc, ID_to_s, 0, 0);
-                        /* encoding = Tcl_GetEncoding(interp, RSTRING_PTR(enc)); */
-			if (!RSTRING_LEN(enc)) {
-			  encoding = (Tcl_Encoding)NULL;
-			} else {
-			  encoding = Tcl_GetEncoding((Tcl_Interp*)NULL,
-						     RSTRING_PTR(enc));
-			  if (encoding == (Tcl_Encoding)NULL) {
-                            rb_warning("Tk-interp has unknown encoding information (@encoding:'%s')", RSTRING_PTR(enc));
-			  }
-			}
-                    }
-                }
-            } else {
-                StringValue(enc);
-                if (strcmp(RSTRING_PTR(enc), "binary") == 0) {
-#ifdef HAVE_RUBY_ENCODING_H
-		    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;
-                }
-                /* encoding = Tcl_GetEncoding(interp, RSTRING_PTR(enc)); */
-                encoding = Tcl_GetEncoding((Tcl_Interp*)NULL,
-					   RSTRING_PTR(enc));
-                if (encoding == (Tcl_Encoding)NULL) {
-                    rb_warning("string has unknown encoding information (@encoding:'%s')", RSTRING_PTR(enc));
-                }
-            }
-        } else {
-            encoding = (Tcl_Encoding)NULL;
-        }
-    } else {
-        StringValue(encodename);
-	if (strcmp(RSTRING_PTR(encodename), "binary") == 0) {
-#ifdef HAVE_RUBY_ENCODING_H
-	  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;
-	}
-        /* encoding = Tcl_GetEncoding(interp, RSTRING_PTR(encodename)); */
-        encoding = Tcl_GetEncoding((Tcl_Interp*)NULL, RSTRING_PTR(encodename));
-        if (encoding == (Tcl_Encoding)NULL) {
-            /*
-            rb_warning("unknown encoding name '%s'",
-                       RSTRING_PTR(encodename));
-            */
-            rb_raise(rb_eArgError, "unknown encoding name '%s'",
-                     RSTRING_PTR(encodename));
-        }
-    }
-
-    StringValue(str);
-    if (!RSTRING_LEN(str)) {
-        rb_thread_critical = thr_crit_bup;
-        return str;
-    }
-    buf = ALLOC_N(char, RSTRING_LEN(str)+1);
-    /* buf = ckalloc(sizeof(char) * (RSTRING_LENINT(str)+1)); */
-    memcpy(buf, RSTRING_PTR(str), RSTRING_LEN(str));
-    buf[RSTRING_LEN(str)] = 0;
-
-    Tcl_DStringInit(&dstr);
-    Tcl_DStringFree(&dstr);
-    /* Tcl_ExternalToUtfDString(encoding,buf,strlen(buf),&dstr); */
-    Tcl_ExternalToUtfDString(encoding, buf, RSTRING_LENINT(str), &dstr);
-
-    /* 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
-    rb_enc_associate_index(str, ENCODING_INDEX_UTF8);
-#endif
-    if (taint_flag) RbTk_OBJ_UNTRUST(str);
-    rb_ivar_set(str, ID_at_enc, ENCODING_NAME_UTF8);
-
-    /*
-    if (encoding != (Tcl_Encoding)NULL) {
-        Tcl_FreeEncoding(encoding);
-    }
-    */
-    Tcl_DStringFree(&dstr);
-
-    xfree(buf);
-    /* ckfree(buf); */
-
-    rb_thread_critical = thr_crit_bup;
-#endif
-
-    return str;
-}
-
-static VALUE
-lib_toUTF8(argc, argv, self)
-    int   argc;
-    VALUE *argv;
-    VALUE self;
-{
-    VALUE str, encodename;
-
-    if (rb_scan_args(argc, argv, "11", &str, &encodename) == 1) {
-        encodename = Qnil;
-    }
-    return lib_toUTF8_core(Qnil, str, encodename);
-}
-
-static VALUE
-ip_toUTF8(argc, argv, self)
-    int   argc;
-    VALUE *argv;
-    VALUE self;
-{
-    VALUE str, encodename;
-
-    if (rb_scan_args(argc, argv, "11", &str, &encodename) == 1) {
-        encodename = Qnil;
-    }
-    return lib_toUTF8_core(self, str, encodename);
-}
-
-static VALUE
-lib_fromUTF8_core(ip_obj, src, encodename)
-    VALUE ip_obj;
-    VALUE src;
-    VALUE encodename;
-{
-    volatile VALUE str = src;
-
-#ifdef TCL_UTF_MAX
-    Tcl_Interp *interp;
-    Tcl_Encoding encoding;
-    Tcl_DString dstr;
-    int taint_flag = OBJ_TAINTED(str);
-    char *buf;
-    int thr_crit_bup;
-#endif
-
-    tcl_stubs_check();
-
-    if (NIL_P(src)) {
-      return rb_str_new2("");
-    }
-
-#ifdef TCL_UTF_MAX
-    if (NIL_P(ip_obj)) {
-        interp = (Tcl_Interp *)NULL;
-    } else if (get_ip(ip_obj) == (struct tcltkip *)NULL) {
-        interp = (Tcl_Interp *)NULL;
-    } else {
-        interp = get_ip(ip_obj)->ip;
-    }
-
-    thr_crit_bup = rb_thread_critical;
-    rb_thread_critical = Qtrue;
-
-    if (NIL_P(encodename)) {
-        volatile VALUE enc;
-
-        if (RB_TYPE_P(str, T_STRING)) {
-            enc = rb_attr_get(str, ID_at_enc);
-            if (!NIL_P(enc)) {
-                StringValue(enc);
-                if (strcmp(RSTRING_PTR(enc), "binary") == 0) {
-#ifdef HAVE_RUBY_ENCODING_H
-		    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
-	    } 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);
-		rb_thread_critical = thr_crit_bup;
-		return str;
-#endif
-            }
-        }
-
-        if (NIL_P(ip_obj)) {
-            encoding = (Tcl_Encoding)NULL;
-        } else {
-            enc = rb_attr_get(ip_obj, ID_at_enc);
-            if (NIL_P(enc)) {
-                encoding = (Tcl_Encoding)NULL;
-            } else {
-                /* StringValue(enc); */
-                enc = rb_funcallv(enc, ID_to_s, 0, 0);
-                /* encoding = Tcl_GetEncoding(interp, RSTRING_PTR(enc)); */
-		if (!RSTRING_LEN(enc)) {
-		  encoding = (Tcl_Encoding)NULL;
-		} else {
-		  encoding = Tcl_GetEncoding((Tcl_Interp*)NULL,
-					     RSTRING_PTR(enc));
-		  if (encoding == (Tcl_Encoding)NULL) {
-                    rb_warning("Tk-interp has unknown encoding information (@encoding:'%s')", RSTRING_PTR(enc));
-		  } else {
-		    encodename = rb_obj_dup(enc);
-		  }
-		}
-            }
-        }
-
-    } else {
-        StringValue(encodename);
-
-        if (strcmp(RSTRING_PTR(encodename), "binary") == 0) {
-	    Tcl_Obj *tclstr;
-            char *s;
-            int  len;
-
-            StringValue(str);
-            tclstr = Tcl_NewStringObj(RSTRING_PTR(str), RSTRING_LENINT(str));
-	    Tcl_IncrRefCount(tclstr);
-            s = (char*)Tcl_GetByteArrayFromObj(tclstr, &len);
-            str = rb_tainted_str_new(s, len);
-	    s = (char*)NULL;
-	    Tcl_DecrRefCount(tclstr);
-#ifdef HAVE_RUBY_ENCODING_H
-	    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;
-        }
-
-        /* encoding = Tcl_GetEncoding(interp, RSTRING_PTR(encodename)); */
-        encoding = Tcl_GetEncoding((Tcl_Interp*)NULL, RSTRING_PTR(encodename));
-        if (encoding == (Tcl_Encoding)NULL) {
-            /*
-            rb_warning("unknown encoding name '%s'",
-                       RSTRING_PTR(encodename));
-            encodename = Qnil;
-            */
-            rb_raise(rb_eArgError, "unknown encoding name '%s'",
-                     RSTRING_PTR(encodename));
-        }
-    }
-
-    StringValue(str);
-
-    if (RSTRING_LEN(str) == 0) {
-        rb_thread_critical = thr_crit_bup;
-        return rb_tainted_str_new2("");
-    }
-
-    buf = ALLOC_N(char, RSTRING_LEN(str)+1);
-    /* buf = ckalloc(sizeof(char) * (RSTRING_LENINT(str)+1)); */
-    memcpy(buf, RSTRING_PTR(str), RSTRING_LEN(str));
-    buf[RSTRING_LEN(str)] = 0;
-
-    Tcl_DStringInit(&dstr);
-    Tcl_DStringFree(&dstr);
-    /* Tcl_UtfToExternalDString(encoding,buf,strlen(buf),&dstr); */
-    Tcl_UtfToExternalDString(encoding,buf,RSTRING_LENINT(str),&dstr);
-
-    /* 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
-    if (interp) {
-      /* can access encoding_table of TclTkIp */
-      /*   ->  try to use encoding_table      */
-      VALUE tbl = ip_get_encoding_table(ip_obj);
-      VALUE encobj = encoding_table_get_obj(tbl, encodename);
-      rb_enc_associate_index(str, rb_to_encoding_index(encobj));
-    } else {
-      /* cannot access encoding_table of TclTkIp */
-      /*   ->  try to find on Ruby Encoding      */
-      rb_enc_associate_index(str, rb_enc_find_index(RSTRING_PTR(encodename)));
-    }
-#endif
-
-    if (taint_flag) RbTk_OBJ_UNTRUST(str);
-    rb_ivar_set(str, ID_at_enc, encodename);
-
-    /*
-    if (encoding != (Tcl_Encoding)NULL) {
-        Tcl_FreeEncoding(encoding);
-    }
-    */
-    Tcl_DStringFree(&dstr);
-
-    xfree(buf);
-    /* ckfree(buf); */
-
-    rb_thread_critical = thr_crit_bup;
-#endif
-
-    return str;
-}
-
-static VALUE
-lib_fromUTF8(argc, argv, self)
-    int   argc;
-    VALUE *argv;
-    VALUE self;
-{
-    VALUE str, encodename;
-
-    if (rb_scan_args(argc, argv, "11", &str, &encodename) == 1) {
-        encodename = Qnil;
-    }
-    return lib_fromUTF8_core(Qnil, str, encodename);
-}
-
-static VALUE
-ip_fromUTF8(argc, argv, self)
-    int   argc;
-    VALUE *argv;
-    VALUE self;
-{
-    VALUE str, encodename;
-
-    if (rb_scan_args(argc, argv, "11", &str, &encodename) == 1) {
-        encodename = Qnil;
-    }
-    return lib_fromUTF8_core(self, str, encodename);
-}
-
-static VALUE
-lib_UTF_backslash_core(self, str, all_bs)
-    VALUE self;
-    VALUE str;
-    int all_bs;
-{
-#ifdef TCL_UTF_MAX
-    char *src_buf, *dst_buf, *ptr;
-    int read_len = 0, dst_len = 0;
-    int taint_flag = OBJ_TAINTED(str);
-    int thr_crit_bup;
-
-    tcl_stubs_check();
-
-    StringValue(str);
-    if (!RSTRING_LEN(str)) {
-        return str;
-    }
-
-    thr_crit_bup = rb_thread_critical;
-    rb_thread_critical = Qtrue;
-
-    /* src_buf = ALLOC_N(char, RSTRING_LEN(str)+1); */
-    src_buf = ckalloc(RSTRING_LENINT(str)+1);
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Preserve((ClientData)src_buf); /* XXXXXXXX */
-#endif
-    memcpy(src_buf, RSTRING_PTR(str), RSTRING_LEN(str));
-    src_buf[RSTRING_LEN(str)] = 0;
-
-    /* dst_buf = ALLOC_N(char, RSTRING_LEN(str)+1); */
-    dst_buf = ckalloc(RSTRING_LENINT(str)+1);
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Preserve((ClientData)dst_buf); /* XXXXXXXX */
-#endif
-
-    ptr = src_buf;
-    while(RSTRING_LEN(str) > ptr - src_buf) {
-        if (*ptr == '\\' && (all_bs || *(ptr + 1) == 'u')) {
-            dst_len += Tcl_UtfBackslash(ptr, &read_len, (dst_buf + dst_len));
-            ptr += read_len;
-        } else {
-            *(dst_buf + (dst_len++)) = *(ptr++);
-        }
-    }
-
-    str = rb_str_new(dst_buf, dst_len);
-    if (taint_flag) RbTk_OBJ_UNTRUST(str);
-#ifdef HAVE_RUBY_ENCODING_H
-    rb_enc_associate_index(str, ENCODING_INDEX_UTF8);
-#endif
-    rb_ivar_set(str, ID_at_enc, ENCODING_NAME_UTF8);
-
-#if 0 /* use Tcl_EventuallyFree */
-    Tcl_EventuallyFree((ClientData)src_buf, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Release((ClientData)src_buf); /* XXXXXXXX */
-#else
-    /* free(src_buf); */
-    ckfree(src_buf);
-#endif
-#endif
-#if 0 /* use Tcl_EventuallyFree */
-    Tcl_EventuallyFree((ClientData)dst_buf, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Release((ClientData)dst_buf); /* XXXXXXXX */
-#else
-    /* free(dst_buf); */
-    ckfree(dst_buf);
-#endif
-#endif
-
-    rb_thread_critical = thr_crit_bup;
-#endif
-
-    return str;
-}
-
-static VALUE
-lib_UTF_backslash(self, str)
-    VALUE self;
-    VALUE str;
-{
-    return lib_UTF_backslash_core(self, str, 0);
-}
-
-static VALUE
-lib_Tcl_backslash(self, str)
-    VALUE self;
-    VALUE str;
-{
-    return lib_UTF_backslash_core(self, str, 1);
-}
-
-static VALUE
-lib_get_system_encoding(self)
-    VALUE self;
-{
-#if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION > 0)
-    tcl_stubs_check();
-    return rb_str_new2(Tcl_GetEncodingName((Tcl_Encoding)NULL));
-#else
-    return Qnil;
-#endif
-}
-
-static VALUE
-lib_set_system_encoding(self, enc_name)
-    VALUE self;
-    VALUE enc_name;
-{
-#if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION > 0)
-    tcl_stubs_check();
-
-    if (NIL_P(enc_name)) {
-        Tcl_SetSystemEncoding((Tcl_Interp *)NULL, (CONST char *)NULL);
-        return lib_get_system_encoding(self);
-    }
-
-    enc_name = rb_funcallv(enc_name, ID_to_s, 0, 0);
-    if (Tcl_SetSystemEncoding((Tcl_Interp *)NULL,
-                              StringValuePtr(enc_name)) != TCL_OK) {
-        rb_raise(rb_eArgError, "unknown encoding name '%s'",
-                 RSTRING_PTR(enc_name));
-    }
-
-    return enc_name;
-#else
-    return Qnil;
-#endif
-}
-
-
-/* invoke Tcl proc */
-struct invoke_info {
-    struct tcltkip *ptr;
-    Tcl_CmdInfo cmdinfo;
-#if TCL_MAJOR_VERSION >= 8
-    int objc;
-    Tcl_Obj **objv;
-#else
-    int argc;
-    char **argv;
-#endif
-};
-
-static VALUE
-#ifdef HAVE_PROTOTYPES
-invoke_tcl_proc(VALUE arg)
-#else
-invoke_tcl_proc(arg)
-    VALUE arg;
-#endif
-{
-    struct invoke_info *inf = (struct invoke_info *)arg;
-#if TCL_MAJOR_VERSION >= 8 && TCL_MINOR_VERSION < 6
-    int i, len;
-    int argc = inf->objc;
-    char **argv = (char **)NULL;
-#endif
-
-    DUMP1("call invoke_tcl_proc");
-
-#if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 6)
-    /* Tcl/Tk 8.6 or later */
-
-    /* eval */
-    inf->ptr->return_value = Tcl_EvalObjv(inf->ptr->ip, inf->objc, inf->objv, TCL_EVAL_DIRECT);
-    /* inf->ptr->return_value = Tcl_EvalObjv(inf->ptr->ip, inf->objc, inf->objv, 0); */
-
-#else /* Tcl/Tk 7.x, 8.0 -- 8.5 */
-
-    /* memory allocation for arguments of this command */
-#if TCL_MAJOR_VERSION == 8
-     /* Tcl/Tk 8.0 -- 8.5 */
-    if (!inf->cmdinfo.isNativeObjectProc) {
-        DUMP1("called proc is not a native-obj-proc");
-        /* string interface */
-        /* argv = (char **)ALLOC_N(char *, argc+1);*/ /* XXXXXXXXXX */
-        argv = RbTk_ALLOC_N(char *, (argc+1));
-#if 0 /* use Tcl_Preserve/Release */
-	Tcl_Preserve((ClientData)argv); /* XXXXXXXX */
-#endif
-        for (i = 0; i < argc; ++i) {
-            argv[i] = Tcl_GetStringFromObj(inf->objv[i], &len);
-        }
-        argv[argc] = (char *)NULL;
-    }
-#endif
-
-    DUMP1("reset result of tcl-interp");
-    Tcl_ResetResult(inf->ptr->ip);
-
-    /* Invoke the C procedure */
-#if TCL_MAJOR_VERSION == 8
-    /* Tcl/Tk 8.0 -- 8.5 */
-    if (inf->cmdinfo.isNativeObjectProc) {
-        DUMP1("call tcl_proc as a native-obj-proc");
-        inf->ptr->return_value
-            = (*(inf->cmdinfo.objProc))(inf->cmdinfo.objClientData,
-                                        inf->ptr->ip, inf->objc, inf->objv);
-    }
-    else
-#endif
-    {
-#if TCL_MAJOR_VERSION == 8
-        /* Tcl/Tk 8.0 -- 8.5 */
-        DUMP1("call tcl_proc as not a native-obj-proc");
-        inf->ptr->return_value
-            = (*(inf->cmdinfo.proc))(inf->cmdinfo.clientData, inf->ptr->ip,
-                                     argc, (CONST84 char **)argv);
-
-#if 0 /* use Tcl_EventuallyFree */
-    Tcl_EventuallyFree((ClientData)argv, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 0 /* use Tcl_Preserve/Release */
-	Tcl_Release((ClientData)argv); /* XXXXXXXX */
-#else
-        /* free(argv); */
-        ckfree((char*)argv);
-#endif
-#endif
-
-#else /* TCL_MAJOR_VERSION < 8 */
-        inf->ptr->return_value
-            = (*(inf->cmdinfo.proc))(inf->cmdinfo.clientData, inf->ptr->ip,
-                                     inf->argc, inf->argv);
-#endif
-    }
-
-#endif /* Tcl/Tk 8.6 or later || Tcl 7.x, 8.0 -- 8.5 */
-
-    DUMP1("end of invoke_tcl_proc");
-    return Qnil;
-}
-
-
-#if TCL_MAJOR_VERSION >= 8
-static VALUE
-ip_invoke_core(interp, objc, objv)
-    VALUE interp;
-    int objc;
-    Tcl_Obj **objv;
-#else
-static VALUE
-ip_invoke_core(interp, argc, argv)
-    VALUE interp;
-    int argc;
-    char **argv;
-#endif
-{
-    struct tcltkip *ptr;
-    Tcl_CmdInfo info;
-    char *cmd;
-    int  len;
-    int  thr_crit_bup;
-    int unknown_flag = 0;
-
-#if 1 /* wrap tcl-proc call */
-    struct invoke_info inf;
-    int status;
-#else
-#if TCL_MAJOR_VERSION >= 8
-    int argc = objc;
-    char **argv = (char **)NULL;
-    /* Tcl_Obj *resultPtr; */
-#endif
-#endif
-
-    /* get the command name string */
-#if TCL_MAJOR_VERSION >= 8
-    cmd = Tcl_GetStringFromObj(objv[0], &len);
-#else /* TCL_MAJOR_VERSION < 8 */
-    cmd = argv[0];
-#endif
-
-    /* get the data struct */
-    ptr = get_ip(interp);
-
-    /* ip is deleted? */
-    if (deleted_ip(ptr)) {
-        return rb_tainted_str_new2("");
-    }
-
-    /* Tcl_Preserve(ptr->ip); */
-    rbtk_preserve_ip(ptr);
-
-    /* map from the command name to a C procedure */
-    DUMP2("call Tcl_GetCommandInfo, %s", cmd);
-    if (!Tcl_GetCommandInfo(ptr->ip, cmd, &info)) {
-        DUMP1("error Tcl_GetCommandInfo");
-        DUMP1("try auto_load (call 'unknown' command)");
-        if (!Tcl_GetCommandInfo(ptr->ip,
-#if TCL_MAJOR_VERSION >= 8
-                                "::unknown",
-#else
-                                "unknown",
-#endif
-                                &info)) {
-            DUMP1("fail to get 'unknown' command");
-            /* if (event_loop_abort_on_exc || cmd[0] != '.') { */
-            if (event_loop_abort_on_exc > 0) {
-                /* Tcl_Release(ptr->ip); */
-                rbtk_release_ip(ptr);
-                /*rb_ip_raise(obj,rb_eNameError,"invalid command name `%s'",cmd);*/
-                return create_ip_exc(interp, rb_eNameError,
-                                     "invalid command name `%s'", cmd);
-            } else {
-                if (event_loop_abort_on_exc < 0) {
-                    rb_warning("invalid command name `%s' (ignore)", cmd);
-                } else {
-                    rb_warn("invalid command name `%s' (ignore)", cmd);
-                }
-                Tcl_ResetResult(ptr->ip);
-                /* Tcl_Release(ptr->ip); */
-                rbtk_release_ip(ptr);
-                return rb_tainted_str_new2("");
-            }
-        } else {
-#if TCL_MAJOR_VERSION >= 8
-            Tcl_Obj **unknown_objv;
-#else
-            char **unknown_argv;
-#endif
-            DUMP1("find 'unknown' command -> set arguments");
-            unknown_flag = 1;
-
-#if TCL_MAJOR_VERSION >= 8
-            /* unknown_objv = (Tcl_Obj **)ALLOC_N(Tcl_Obj *, objc+2); */
-            unknown_objv = RbTk_ALLOC_N(Tcl_Obj *, (objc+2));
-#if 0 /* use Tcl_Preserve/Release */
-	    Tcl_Preserve((ClientData)unknown_objv); /* XXXXXXXX */
-#endif
-            unknown_objv[0] = Tcl_NewStringObj("::unknown", 9);
-            Tcl_IncrRefCount(unknown_objv[0]);
-            memcpy(unknown_objv + 1, objv, sizeof(Tcl_Obj *)*objc);
-            unknown_objv[++objc] = (Tcl_Obj*)NULL;
-            objv = unknown_objv;
-#else
-            /* unknown_argv = (char **)ALLOC_N(char *, argc+2); */
-            unknown_argv = RbTk_ALLOC_N(char *, (argc+2));
-#if 0 /* use Tcl_Preserve/Release */
-	    Tcl_Preserve((ClientData)unknown_argv); /* XXXXXXXX */
-#endif
-            unknown_argv[0] = strdup("unknown");
-            memcpy(unknown_argv + 1, argv, sizeof(char *)*argc);
-            unknown_argv[++argc] = (char *)NULL;
-            argv = unknown_argv;
-#endif
-        }
-    }
-    DUMP1("end Tcl_GetCommandInfo");
-
-    thr_crit_bup = rb_thread_critical;
-    rb_thread_critical = Qtrue;
-
-#if 1 /* wrap tcl-proc call */
-    /* setup params */
-    inf.ptr = ptr;
-    inf.cmdinfo = info;
-#if TCL_MAJOR_VERSION >= 8
-    inf.objc = objc;
-    inf.objv = objv;
-#else
-    inf.argc = argc;
-    inf.argv = argv;
-#endif
-
-    /* invoke tcl-proc */
-    DUMP1("invoke tcl-proc");
-    rb_protect(invoke_tcl_proc, (VALUE)&inf, &status);
-    DUMP2("status of tcl-proc, %d", status);
-    switch(status) {
-    case TAG_RAISE:
-        if (NIL_P(rb_errinfo())) {
-            rbtk_pending_exception = rb_exc_new2(rb_eException,
-                                                 "unknown exception");
-        } else {
-            rbtk_pending_exception = rb_errinfo();
-        }
-        break;
-
-    case TAG_FATAL:
-        if (NIL_P(rb_errinfo())) {
-            rbtk_pending_exception = rb_exc_new2(rb_eFatal, "FATAL");
-        } else {
-            rbtk_pending_exception = rb_errinfo();
-        }
-    }
-
-#else /* !wrap tcl-proc call */
-
-    /* memory allocation for arguments of this command */
-#if TCL_MAJOR_VERSION >= 8
-    if (!info.isNativeObjectProc) {
-        int i;
-
-        /* string interface */
-        /* argv = (char **)ALLOC_N(char *, argc+1); */
-        argv = RbTk_ALLOC_N(char *, (argc+1));
-#if 0 /* use Tcl_Preserve/Release */
-	Tcl_Preserve((ClientData)argv); /* XXXXXXXX */
-#endif
-        for (i = 0; i < argc; ++i) {
-            argv[i] = Tcl_GetStringFromObj(objv[i], &len);
-        }
-        argv[argc] = (char *)NULL;
-    }
-#endif
-
-    Tcl_ResetResult(ptr->ip);
-
-    /* Invoke the C procedure */
-#if TCL_MAJOR_VERSION >= 8
-    if (info.isNativeObjectProc) {
-        ptr->return_value = (*info.objProc)(info.objClientData, ptr->ip,
-                                            objc, objv);
-#if 0
-        /* get the string value from the result object */
-        resultPtr = Tcl_GetObjResult(ptr->ip);
-        Tcl_SetResult(ptr->ip, Tcl_GetStringFromObj(resultPtr, &len),
-                      TCL_VOLATILE);
-#endif
-    }
-    else
-#endif
-    {
-#if TCL_MAJOR_VERSION >= 8
-        ptr->return_value = (*info.proc)(info.clientData, ptr->ip,
-                                         argc, (CONST84 char **)argv);
-
-#if 0 /* use Tcl_EventuallyFree */
-    Tcl_EventuallyFree((ClientData)argv, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 0 /* use Tcl_Preserve/Release */
-	Tcl_Release((ClientData)argv); /* XXXXXXXX */
-#else
-        /* free(argv); */
-        ckfree((char*)argv);
-#endif
-#endif
-
-#else /* TCL_MAJOR_VERSION < 8 */
-        ptr->return_value = (*info.proc)(info.clientData, ptr->ip,
-                                         argc, argv);
-#endif
-    }
-#endif /* ! wrap tcl-proc call */
-
-    /* free allocated memory for calling 'unknown' command */
-    if (unknown_flag) {
-#if TCL_MAJOR_VERSION >= 8
-        Tcl_DecrRefCount(objv[0]);
-#if 0 /* use Tcl_EventuallyFree */
-	Tcl_EventuallyFree((ClientData)objv, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 0 /* use Tcl_Preserve/Release */
-	Tcl_Release((ClientData)objv); /* XXXXXXXX */
-#else
-        /* free(objv); */
-        ckfree((char*)objv);
-#endif
-#endif
-#else /* TCL_MAJOR_VERSION < 8 */
-        free(argv[0]);
-        /* ckfree(argv[0]); */
-#if 0 /* use Tcl_EventuallyFree */
-	Tcl_EventuallyFree((ClientData)argv, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 0 /* use Tcl_Preserve/Release */
-	Tcl_Release((ClientData)argv); /* XXXXXXXX */
-#else
-        /* free(argv); */
-        ckfree((char*)argv);
-#endif
-#endif
-#endif
-    }
-
-    /* exception on mainloop */
-    if (pending_exception_check1(thr_crit_bup, ptr)) {
-        return rbtk_pending_exception;
-    }
-
-    rb_thread_critical = thr_crit_bup;
-
-    /* if (ptr->return_value == TCL_ERROR) { */
-    if (ptr->return_value != TCL_OK) {
-        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));
-	    }
-
-        } else {
-            if (event_loop_abort_on_exc < 0) {
-                rb_warning("%s (ignore)", Tcl_GetStringResult(ptr->ip));
-            } else {
-                rb_warn("%s (ignore)", Tcl_GetStringResult(ptr->ip));
-            }
-            Tcl_ResetResult(ptr->ip);
-            return rb_tainted_str_new2("");
-        }
-    }
-
-    /* pass back the result (as string) */
-    return ip_get_result_string_obj(ptr->ip);
-}
-
-
-#if TCL_MAJOR_VERSION >= 8
-static Tcl_Obj **
-#else /* TCL_MAJOR_VERSION < 8 */
-static char **
-#endif
-alloc_invoke_arguments(argc, argv)
-    int argc;
-    VALUE *argv;
-{
-    int i;
-    int thr_crit_bup;
-
-#if TCL_MAJOR_VERSION >= 8
-    Tcl_Obj **av;
-#else /* TCL_MAJOR_VERSION < 8 */
-    char **av;
-#endif
-
-    thr_crit_bup = rb_thread_critical;
-    rb_thread_critical = Qtrue;
-
-    /* memory allocation */
-#if TCL_MAJOR_VERSION >= 8
-    /* av = ALLOC_N(Tcl_Obj *, argc+1);*/ /* XXXXXXXXXX */
-    av = RbTk_ALLOC_N(Tcl_Obj *, (argc+1));
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Preserve((ClientData)av); /* XXXXXXXX */
-#endif
-    for (i = 0; i < argc; ++i) {
-        av[i] = get_obj_from_str(argv[i]);
-        Tcl_IncrRefCount(av[i]);
-    }
-    av[argc] = NULL;
-
-#else /* TCL_MAJOR_VERSION < 8 */
-    /* string interface */
-    /* av = ALLOC_N(char *, argc+1); */
-    av = RbTk_ALLOC_N(char *, (argc+1));
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Preserve((ClientData)av); /* XXXXXXXX */
-#endif
-    for (i = 0; i < argc; ++i) {
-        av[i] = strdup(StringValuePtr(argv[i]));
-    }
-    av[argc] = NULL;
-#endif
-
-    rb_thread_critical = thr_crit_bup;
-
-    return av;
-}
-
-static void
-free_invoke_arguments(argc, av)
-    int argc;
-#if TCL_MAJOR_VERSION >= 8
-    Tcl_Obj **av;
-#else /* TCL_MAJOR_VERSION < 8 */
-    char **av;
-#endif
-{
-    int i;
-
-    for (i = 0; i < argc; ++i) {
-#if TCL_MAJOR_VERSION >= 8
-        Tcl_DecrRefCount(av[i]);
-	av[i] = (Tcl_Obj*)NULL;
-#else /* TCL_MAJOR_VERSION < 8 */
-        free(av[i]);
-	av[i] = (char*)NULL;
-#endif
-    }
-#if TCL_MAJOR_VERSION >= 8
-#if 0 /* use Tcl_EventuallyFree */
-    Tcl_EventuallyFree((ClientData)av, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Release((ClientData)av); /* XXXXXXXX */
-#else
-    ckfree((char*)av);
-#endif
-#endif
-#else /* TCL_MAJOR_VERSION < 8 */
-#if 0 /* use Tcl_EventuallyFree */
-    Tcl_EventuallyFree((ClientData)av, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Release((ClientData)av); /* XXXXXXXX */
-#else
-    /* free(av); */
-    ckfree((char*)av);
-#endif
-#endif
-#endif
-}
-
-static VALUE
-ip_invoke_real(argc, argv, interp)
-    int argc;
-    VALUE *argv;
-    VALUE interp;
-{
-    VALUE v;
-    struct tcltkip *ptr;        /* tcltkip data struct */
-
-#if TCL_MAJOR_VERSION >= 8
-    Tcl_Obj **av = (Tcl_Obj **)NULL;
-#else /* TCL_MAJOR_VERSION < 8 */
-    char **av = (char **)NULL;
-#endif
-
-    DUMP2("invoke_real called by thread:%"PRIxVALUE, rb_thread_current());
-
-    /* get the data struct */
-    ptr = get_ip(interp);
-
-    /* ip is deleted? */
-    if (deleted_ip(ptr)) {
-        return rb_tainted_str_new2("");
-    }
-
-    /* allocate memory for arguments */
-    av = alloc_invoke_arguments(argc, argv);
-
-    /* Invoke the C procedure */
-    Tcl_ResetResult(ptr->ip);
-    v = ip_invoke_core(interp, argc, av);
-
-    /* free allocated memory */
-    free_invoke_arguments(argc, av);
-
-    return v;
-}
-
-VALUE
-ivq_safelevel_handler(arg, ivq)
-    VALUE arg;
-    VALUE ivq;
-{
-    struct invoke_queue *q;
-
-    Data_Get_Struct(ivq, struct invoke_queue, q);
-    DUMP2("(safe-level handler) $SAFE = %d", q->safe_level);
-    rb_set_safe_level(q->safe_level);
-    return ip_invoke_core(q->interp, q->argc, q->argv);
-}
-
-int invoke_queue_handler _((Tcl_Event *, int));
-int
-invoke_queue_handler(evPtr, flags)
-    Tcl_Event *evPtr;
-    int flags;
-{
-    struct invoke_queue *q = (struct invoke_queue *)evPtr;
-    volatile VALUE ret;
-    volatile VALUE q_dat;
-    volatile VALUE thread = q->thread;
-    struct tcltkip *ptr;
-
-    DUMP2("do_invoke_queue_handler : evPtr = %p", evPtr);
-    DUMP2("invoke queue_thread : %"PRIxVALUE, rb_thread_current());
-    DUMP2("added by thread : %"PRIxVALUE, thread);
-
-    if (*(q->done)) {
-        DUMP1("processed by another event-loop");
-        return 0;
-    } else {
-        DUMP1("process it on current event-loop");
-    }
-
-    if (RTEST(rb_thread_alive_p(thread))
-	&& ! RTEST(rb_funcall(thread, ID_stop_p, 0))) {
-      DUMP1("caller is not yet ready to receive the result -> pending");
-      return 0;
-    }
-
-    /* process it */
-    *(q->done) = 1;
-
-    /* deleted ipterp ? */
-    ptr = get_ip(q->interp);
-    if (deleted_ip(ptr)) {
-        /* deleted IP --> ignore */
-        return 1;
-    }
-
-    /* incr internal handler mark */
-    rbtk_internal_eventloop_handler++;
-
-    /* check safe-level */
-    if (rb_safe_level() != q->safe_level) {
-        /* q_dat = Data_Wrap_Struct(rb_cData,0,0,q); */
-        q_dat = Data_Wrap_Struct(0,invoke_queue_mark,-1,q);
-        ret = rb_funcall(rb_proc_new(ivq_safelevel_handler, q_dat),
-                         ID_call, 0);
-        rb_gc_force_recycle(q_dat);
-	q_dat = (VALUE)NULL;
-    } else {
-        DUMP2("call invoke_real (for caller thread:%"PRIxVALUE")", thread);
-        DUMP2("call invoke_real (current thread:%"PRIxVALUE")", rb_thread_current());
-        ret = ip_invoke_core(q->interp, q->argc, q->argv);
-    }
-
-    /* set result */
-    RARRAY_ASET(q->result, 0, ret);
-    ret = (VALUE)NULL;
-
-    /* decr internal handler mark */
-    rbtk_internal_eventloop_handler--;
-
-    /* complete */
-    *(q->done) = -1;
-
-    /* unlink ruby objects */
-    q->interp = (VALUE)NULL;
-    q->result = (VALUE)NULL;
-    q->thread = (VALUE)NULL;
-
-    /* back to caller */
-    if (RTEST(rb_thread_alive_p(thread))) {
-      DUMP2("back to caller (caller thread:%"PRIxVALUE")", thread);
-      DUMP2("               (current thread:%"PRIxVALUE")", rb_thread_current());
-#if CONTROL_BY_STATUS_OF_RB_THREAD_WAITING_FOR_VALUE
-      have_rb_thread_waiting_for_value = 1;
-      rb_thread_wakeup(thread);
-#else
-      rb_thread_run(thread);
-#endif
-      DUMP1("finish back to caller");
-#if DO_THREAD_SCHEDULE_AT_CALLBACK_DONE
-      rb_thread_schedule();
-#endif
-    } else {
-      DUMP2("caller is dead (caller thread:%"PRIxVALUE")", thread);
-      DUMP2("               (current thread:%"PRIxVALUE")", rb_thread_current());
-    }
-
-    /* end of handler : remove it */
-    return 1;
-}
-
-static VALUE
-ip_invoke_with_position(argc, argv, obj, position)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
-    Tcl_QueuePosition position;
-{
-    struct invoke_queue *ivq;
-#ifdef RUBY_USE_NATIVE_THREAD
-    struct tcltkip *ptr;
-#endif
-    int  *alloc_done;
-    int  thr_crit_bup;
-    volatile VALUE current = rb_thread_current();
-    volatile VALUE ip_obj = obj;
-    volatile VALUE result;
-    volatile VALUE ret;
-    struct timeval t;
-
-#if TCL_MAJOR_VERSION >= 8
-    Tcl_Obj **av = (Tcl_Obj **)NULL;
-#else /* TCL_MAJOR_VERSION < 8 */
-    char **av = (char **)NULL;
-#endif
-
-    if (argc < 1) {
-        rb_raise(rb_eArgError, "command name missing");
-    }
-
-#ifdef RUBY_USE_NATIVE_THREAD
-    ptr = get_ip(ip_obj);
-    DUMP2("invoke status: ptr->tk_thread_id %p", ptr->tk_thread_id);
-    DUMP2("invoke status: Tcl_GetCurrentThread %p", Tcl_GetCurrentThread());
-#else
-    DUMP2("status: Tcl_GetCurrentThread %p", Tcl_GetCurrentThread());
-#endif
-    DUMP2("status: eventloopt_thread %"PRIxVALUE, eventloop_thread);
-
-    if (
-#ifdef RUBY_USE_NATIVE_THREAD
-	(ptr->tk_thread_id == 0 || ptr->tk_thread_id == Tcl_GetCurrentThread())
-	&&
-#endif
-	(NIL_P(eventloop_thread) || current == eventloop_thread)
-	) {
-        if (NIL_P(eventloop_thread)) {
-            DUMP2("invoke from thread:%"PRIxVALUE" but no eventloop", current);
-        } else {
-            DUMP2("invoke from current eventloop %"PRIxVALUE, current);
-        }
-        result = ip_invoke_real(argc, argv, ip_obj);
-        if (rb_obj_is_kind_of(result, rb_eException)) {
-            rb_exc_raise(result);
-        }
-        return result;
-    }
-
-    DUMP2("invoke from thread %"PRIxVALUE" (NOT current eventloop)", current);
-
-    thr_crit_bup = rb_thread_critical;
-    rb_thread_critical = Qtrue;
-
-    /* allocate memory (for arguments) */
-    av = alloc_invoke_arguments(argc, argv);
-
-    /* allocate memory (keep result) */
-    /* alloc_done = (int*)ALLOC(int); */
-    alloc_done = RbTk_ALLOC_N(int, 1);
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Preserve((ClientData)alloc_done); /* XXXXXXXX */
-#endif
-    *alloc_done = 0;
-
-    /* allocate memory (freed by Tcl_ServiceEvent) */
-    /* ivq = (struct invoke_queue *)Tcl_Alloc(sizeof(struct invoke_queue)); */
-    ivq = RbTk_ALLOC_N(struct invoke_queue, 1);
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Preserve((ClientData)ivq); /* XXXXXXXX */
-#endif
-
-    /* allocate result obj */
-    result = rb_ary_new3(1, Qnil);
-
-    /* construct event data */
-    ivq->done = alloc_done;
-    ivq->argc = argc;
-    ivq->argv = av;
-    ivq->interp = ip_obj;
-    ivq->result = result;
-    ivq->thread = current;
-    ivq->safe_level = rb_safe_level();
-    ivq->ev.proc = invoke_queue_handler;
-
-    /* add the handler to Tcl event queue */
-    DUMP1("add handler");
-#ifdef RUBY_USE_NATIVE_THREAD
-    if (ptr->tk_thread_id) {
-      /* Tcl_ThreadQueueEvent(ptr->tk_thread_id, &(ivq->ev), position); */
-      Tcl_ThreadQueueEvent(ptr->tk_thread_id, (Tcl_Event*)ivq, position);
-      Tcl_ThreadAlert(ptr->tk_thread_id);
-    } else if (tk_eventloop_thread_id) {
-      /* Tcl_ThreadQueueEvent(tk_eventloop_thread_id,
-			   &(ivq->ev), position); */
-      Tcl_ThreadQueueEvent(tk_eventloop_thread_id,
-			   (Tcl_Event*)ivq, position);
-      Tcl_ThreadAlert(tk_eventloop_thread_id);
-    } else {
-      /* Tcl_QueueEvent(&(ivq->ev), position); */
-      Tcl_QueueEvent((Tcl_Event*)ivq, position);
-    }
-#else
-    /* Tcl_QueueEvent(&(ivq->ev), position); */
-    Tcl_QueueEvent((Tcl_Event*)ivq, position);
-#endif
-
-    rb_thread_critical = thr_crit_bup;
-
-    /* wait for the handler to be processed */
-    t.tv_sec  = 0;
-    t.tv_usec = (long)((EVENT_HANDLER_TIMEOUT)*1000.0);
-
-    DUMP2("ivq wait for handler (current thread:%"PRIxVALUE")", current);
-    while(*alloc_done >= 0) {
-      /* rb_thread_stop(); */
-      /* rb_thread_sleep_forever(); */
-      rb_thread_wait_for(t);
-      DUMP2("*** ivq wakeup (current thread:%"PRIxVALUE")", current);
-      DUMP2("***          (eventloop thread:%"PRIxVALUE")", eventloop_thread);
-      if (NIL_P(eventloop_thread)) {
-	DUMP1("*** ivq lost eventloop thread");
-	break;
-      }
-    }
-    DUMP2("back from handler (current thread:%"PRIxVALUE")", current);
-
-    /* get result & free allocated memory */
-    ret = RARRAY_AREF(result, 0);
-#if 0 /* use Tcl_EventuallyFree */
-    Tcl_EventuallyFree((ClientData)alloc_done, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Release((ClientData)alloc_done); /* XXXXXXXX */
-#else
-    /* free(alloc_done); */
-    ckfree((char*)alloc_done);
-#endif
-#endif
-
-#if 0 /* ivq is freed by Tcl_ServiceEvent */
-#if 0 /* use Tcl_EventuallyFree */
-    Tcl_EventuallyFree((ClientData)ivq, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Release(ivq);
-#else
-    ckfree((char*)ivq);
-#endif
-#endif
-#endif
-
-    /* free allocated memory */
-    free_invoke_arguments(argc, av);
-
-    /* exception? */
-    if (rb_obj_is_kind_of(ret, rb_eException)) {
-        DUMP1("raise exception");
-        /* rb_exc_raise(ret); */
-	rb_exc_raise(rb_exc_new3(rb_obj_class(ret),
-				 rb_funcallv(ret, ID_to_s, 0, 0)));
-    }
-
-    DUMP1("exit ip_invoke");
-    return ret;
-}
-
-
-/* get return code from Tcl_Eval() */
-static VALUE
-ip_retval(self)
-    VALUE self;
-{
-    struct tcltkip *ptr;        /* tcltkip data struct */
-
-    /* get the data strcut */
-    ptr = get_ip(self);
-
-    /* ip is deleted? */
-    if (deleted_ip(ptr)) {
-        return rb_tainted_str_new2("");
-    }
-
-    return (INT2FIX(ptr->return_value));
-}
-
-static VALUE
-ip_invoke(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
-{
-    return ip_invoke_with_position(argc, argv, obj, TCL_QUEUE_TAIL);
-}
-
-static VALUE
-ip_invoke_immediate(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
-{
-    /* POTENTIALY INSECURE : can create infinite loop */
-    return ip_invoke_with_position(argc, argv, obj, TCL_QUEUE_HEAD);
-}
-
-
-/* access Tcl variables */
-static VALUE
-ip_get_variable2_core(interp, argc, argv)
-    VALUE interp;
-    int   argc;
-    VALUE *argv;
-{
-    struct tcltkip *ptr = get_ip(interp);
-    int thr_crit_bup;
-    volatile VALUE varname, index, flag;
-
-    varname = argv[0];
-    index   = argv[1];
-    flag    = argv[2];
-
-    /*
-    StringValue(varname);
-    if (!NIL_P(index)) StringValue(index);
-    */
-
-#if TCL_MAJOR_VERSION >= 8
-    {
-        Tcl_Obj *ret;
-        volatile VALUE strval;
-
-        thr_crit_bup = rb_thread_critical;
-        rb_thread_critical = Qtrue;
-
-        /* ip is deleted? */
-        if (deleted_ip(ptr)) {
-            rb_thread_critical = thr_crit_bup;
-            return rb_tainted_str_new2("");
-        } else {
-            /* Tcl_Preserve(ptr->ip); */
-            rbtk_preserve_ip(ptr);
-            ret = Tcl_GetVar2Ex(ptr->ip, RSTRING_PTR(varname),
-                                NIL_P(index) ? NULL : RSTRING_PTR(index),
-                                FIX2INT(flag));
-        }
-
-        if (ret == (Tcl_Obj*)NULL) {
-            volatile VALUE exc;
-            /* exc = rb_exc_new2(rb_eRuntimeError,
-                                 Tcl_GetStringResult(ptr->ip)); */
-            exc = create_ip_exc(interp, rb_eRuntimeError, "%s",
-                                Tcl_GetStringResult(ptr->ip));
-            /* Tcl_Release(ptr->ip); */
-            rbtk_release_ip(ptr);
-            rb_thread_critical = thr_crit_bup;
-            return exc;
-        }
-
-        Tcl_IncrRefCount(ret);
-        strval = get_str_from_obj(ret);
-        RbTk_OBJ_UNTRUST(strval);
-        Tcl_DecrRefCount(ret);
-
-        /* Tcl_Release(ptr->ip); */
-        rbtk_release_ip(ptr);
-        rb_thread_critical = thr_crit_bup;
-        return(strval);
-    }
-#else /* TCL_MAJOR_VERSION < 8 */
-    {
-        char *ret;
-        volatile VALUE strval;
-
-        /* ip is deleted? */
-        if (deleted_ip(ptr)) {
-            return rb_tainted_str_new2("");
-        } else {
-            /* Tcl_Preserve(ptr->ip); */
-            rbtk_preserve_ip(ptr);
-            ret = Tcl_GetVar2(ptr->ip, RSTRING_PTR(varname),
-                              NIL_P(index) ? NULL : RSTRING_PTR(index),
-                              FIX2INT(flag));
-        }
-
-        if (ret == (char*)NULL) {
-            volatile VALUE exc;
-            exc = rb_exc_new2(rb_eRuntimeError, Tcl_GetStringResult(ptr->ip));
-            /* Tcl_Release(ptr->ip); */
-            rbtk_release_ip(ptr);
-            rb_thread_critical = thr_crit_bup;
-            return exc;
-        }
-
-        strval = rb_tainted_str_new2(ret);
-        /* Tcl_Release(ptr->ip); */
-        rbtk_release_ip(ptr);
-        rb_thread_critical = thr_crit_bup;
-
-        return(strval);
-    }
-#endif
-}
-
-static VALUE
-ip_get_variable2(self, varname, index, flag)
-    VALUE self;
-    VALUE varname;
-    VALUE index;
-    VALUE flag;
-{
-    VALUE argv[3];
-    VALUE retval;
-
-    StringValue(varname);
-    if (!NIL_P(index)) StringValue(index);
-
-    argv[0] = varname;
-    argv[1] = index;
-    argv[2] = flag;
-
-    retval = tk_funcall(ip_get_variable2_core, 3, argv, self);
-
-    if (NIL_P(retval)) {
-        return rb_tainted_str_new2("");
-    } else {
-        return retval;
-    }
-}
-
-static VALUE
-ip_get_variable(self, varname, flag)
-    VALUE self;
-    VALUE varname;
-    VALUE flag;
-{
-    return ip_get_variable2(self, varname, Qnil, flag);
-}
-
-static VALUE
-ip_set_variable2_core(interp, argc, argv)
-    VALUE interp;
-    int   argc;
-    VALUE *argv;
-{
-    struct tcltkip *ptr = get_ip(interp);
-    int thr_crit_bup;
-    volatile VALUE varname, index, value, flag;
-
-    varname = argv[0];
-    index   = argv[1];
-    value   = argv[2];
-    flag    = argv[3];
-
-    /*
-    StringValue(varname);
-    if (!NIL_P(index)) StringValue(index);
-    StringValue(value);
-    */
-
-#if TCL_MAJOR_VERSION >= 8
-    {
-        Tcl_Obj *valobj, *ret;
-        volatile VALUE strval;
-
-        thr_crit_bup = rb_thread_critical;
-        rb_thread_critical = Qtrue;
-
-        valobj = get_obj_from_str(value);
-        Tcl_IncrRefCount(valobj);
-
-        /* ip is deleted? */
-        if (deleted_ip(ptr)) {
-            Tcl_DecrRefCount(valobj);
-            rb_thread_critical = thr_crit_bup;
-            return rb_tainted_str_new2("");
-        } else {
-            /* Tcl_Preserve(ptr->ip); */
-            rbtk_preserve_ip(ptr);
-            ret = Tcl_SetVar2Ex(ptr->ip, RSTRING_PTR(varname),
-                                NIL_P(index) ? NULL : RSTRING_PTR(index),
-                                valobj, FIX2INT(flag));
-        }
-
-        Tcl_DecrRefCount(valobj);
-
-        if (ret == (Tcl_Obj*)NULL) {
-            volatile VALUE exc;
-            /* exc = rb_exc_new2(rb_eRuntimeError,
-                                 Tcl_GetStringResult(ptr->ip)); */
-            exc = create_ip_exc(interp, rb_eRuntimeError, "%s",
-                                Tcl_GetStringResult(ptr->ip));
-            /* Tcl_Release(ptr->ip); */
-            rbtk_release_ip(ptr);
-            rb_thread_critical = thr_crit_bup;
-            return exc;
-        }
-
-        Tcl_IncrRefCount(ret);
-        strval = get_str_from_obj(ret);
-        RbTk_OBJ_UNTRUST(strval);
-        Tcl_DecrRefCount(ret);
-
-        /* Tcl_Release(ptr->ip); */
-        rbtk_release_ip(ptr);
-        rb_thread_critical = thr_crit_bup;
-
-        return(strval);
-    }
-#else /* TCL_MAJOR_VERSION < 8 */
-    {
-        CONST char *ret;
-        volatile VALUE strval;
-
-        /* ip is deleted? */
-        if (deleted_ip(ptr)) {
-            return rb_tainted_str_new2("");
-        } else {
-            /* Tcl_Preserve(ptr->ip); */
-            rbtk_preserve_ip(ptr);
-            ret = Tcl_SetVar2(ptr->ip, RSTRING_PTR(varname),
-                              NIL_P(index) ? NULL : RSTRING_PTR(index),
-                              RSTRING_PTR(value), FIX2INT(flag));
-        }
-
-        if (ret == (char*)NULL) {
-            return rb_exc_new2(rb_eRuntimeError, ptr->ip->result);
-        }
-
-        strval = rb_tainted_str_new2(ret);
-
-        /* Tcl_Release(ptr->ip); */
-        rbtk_release_ip(ptr);
-        rb_thread_critical = thr_crit_bup;
-
-        return(strval);
-    }
-#endif
-}
-
-static VALUE
-ip_set_variable2(self, varname, index, value, flag)
-    VALUE self;
-    VALUE varname;
-    VALUE index;
-    VALUE value;
-    VALUE flag;
-{
-    VALUE argv[4];
-    VALUE retval;
-
-    StringValue(varname);
-    if (!NIL_P(index)) StringValue(index);
-    StringValue(value);
-
-    argv[0] = varname;
-    argv[1] = index;
-    argv[2] = value;
-    argv[3] = flag;
-
-    retval = tk_funcall(ip_set_variable2_core, 4, argv, self);
-
-    if (NIL_P(retval)) {
-        return rb_tainted_str_new2("");
-    } else {
-        return retval;
-    }
-}
-
-static VALUE
-ip_set_variable(self, varname, value, flag)
-    VALUE self;
-    VALUE varname;
-    VALUE value;
-    VALUE flag;
-{
-    return ip_set_variable2(self, varname, Qnil, value, flag);
-}
-
-static VALUE
-ip_unset_variable2_core(interp, argc, argv)
-    VALUE interp;
-    int   argc;
-    VALUE *argv;
-{
-    struct tcltkip *ptr = get_ip(interp);
-    volatile VALUE varname, index, flag;
-
-    varname = argv[0];
-    index   = argv[1];
-    flag    = argv[2];
-
-    /*
-    StringValue(varname);
-    if (!NIL_P(index)) StringValue(index);
-    */
-
-    /* ip is deleted? */
-    if (deleted_ip(ptr)) {
-        return Qtrue;
-    }
-
-    ptr->return_value = Tcl_UnsetVar2(ptr->ip, RSTRING_PTR(varname),
-                                      NIL_P(index) ? NULL : RSTRING_PTR(index),
-                                      FIX2INT(flag));
-
-    if (ptr->return_value == TCL_ERROR) {
-        if (FIX2INT(flag) & TCL_LEAVE_ERR_MSG) {
-            /* return rb_exc_new2(rb_eRuntimeError,
-                                  Tcl_GetStringResult(ptr->ip)); */
-            return create_ip_exc(interp, rb_eRuntimeError, "%s",
-                                 Tcl_GetStringResult(ptr->ip));
-        }
-        return Qfalse;
-    }
-    return Qtrue;
-}
-
-static VALUE
-ip_unset_variable2(self, varname, index, flag)
-    VALUE self;
-    VALUE varname;
-    VALUE index;
-    VALUE flag;
-{
-    VALUE argv[3];
-    VALUE retval;
-
-    StringValue(varname);
-    if (!NIL_P(index)) StringValue(index);
-
-    argv[0] = varname;
-    argv[1] = index;
-    argv[2] = flag;
-
-    retval = tk_funcall(ip_unset_variable2_core, 3, argv, self);
-
-    if (NIL_P(retval)) {
-        return rb_tainted_str_new2("");
-    } else {
-        return retval;
-    }
-}
-
-static VALUE
-ip_unset_variable(self, varname, flag)
-    VALUE self;
-    VALUE varname;
-    VALUE flag;
-{
-    return ip_unset_variable2(self, varname, Qnil, flag);
-}
-
-static VALUE
-ip_get_global_var(self, varname)
-    VALUE self;
-    VALUE varname;
-{
-    return ip_get_variable(self, varname,
-                           INT2FIX(TCL_GLOBAL_ONLY | TCL_LEAVE_ERR_MSG));
-}
-
-static VALUE
-ip_get_global_var2(self, varname, index)
-    VALUE self;
-    VALUE varname;
-    VALUE index;
-{
-    return ip_get_variable2(self, varname, index,
-                            INT2FIX(TCL_GLOBAL_ONLY | TCL_LEAVE_ERR_MSG));
-}
-
-static VALUE
-ip_set_global_var(self, varname, value)
-    VALUE self;
-    VALUE varname;
-    VALUE value;
-{
-    return ip_set_variable(self, varname, value,
-                           INT2FIX(TCL_GLOBAL_ONLY | TCL_LEAVE_ERR_MSG));
-}
-
-static VALUE
-ip_set_global_var2(self, varname, index, value)
-    VALUE self;
-    VALUE varname;
-    VALUE index;
-    VALUE value;
-{
-    return ip_set_variable2(self, varname, index, value,
-                            INT2FIX(TCL_GLOBAL_ONLY | TCL_LEAVE_ERR_MSG));
-}
-
-static VALUE
-ip_unset_global_var(self, varname)
-    VALUE self;
-    VALUE varname;
-{
-    return ip_unset_variable(self, varname,
-                             INT2FIX(TCL_GLOBAL_ONLY | TCL_LEAVE_ERR_MSG));
-}
-
-static VALUE
-ip_unset_global_var2(self, varname, index)
-    VALUE self;
-    VALUE varname;
-    VALUE index;
-{
-    return ip_unset_variable2(self, varname, index,
-                              INT2FIX(TCL_GLOBAL_ONLY | TCL_LEAVE_ERR_MSG));
-}
-
-
-/* treat Tcl_List */
-static VALUE
-lib_split_tklist_core(ip_obj, list_str)
-    VALUE ip_obj;
-    VALUE list_str;
-{
-    Tcl_Interp *interp;
-    volatile VALUE ary, elem;
-    int idx;
-    int taint_flag = OBJ_TAINTED(list_str);
-#ifdef HAVE_RUBY_ENCODING_H
-    int list_enc_idx;
-    volatile VALUE list_ivar_enc;
-#endif
-    int result;
-    VALUE old_gc;
-
-    tcl_stubs_check();
-
-    if (NIL_P(ip_obj)) {
-        interp = (Tcl_Interp *)NULL;
-    } else if (get_ip(ip_obj) == (struct tcltkip *)NULL) {
-        interp = (Tcl_Interp *)NULL;
-    } else {
-        interp = get_ip(ip_obj)->ip;
-    }
-
-    StringValue(list_str);
-#ifdef HAVE_RUBY_ENCODING_H
-    list_enc_idx = rb_enc_get_index(list_str);
-    list_ivar_enc = rb_ivar_get(list_str, ID_at_enc);
-#endif
-
-    {
-#if TCL_MAJOR_VERSION >= 8
-        /* object style interface */
-        Tcl_Obj *listobj;
-        int     objc;
-        Tcl_Obj **objv;
-        int thr_crit_bup;
-
-        listobj = get_obj_from_str(list_str);
-
-        Tcl_IncrRefCount(listobj);
-
-        result = Tcl_ListObjGetElements(interp, listobj, &objc, &objv);
-
-        if (result == TCL_ERROR) {
-            Tcl_DecrRefCount(listobj);
-            if (interp == (Tcl_Interp*)NULL) {
-                rb_raise(rb_eRuntimeError, "can't get elements from list");
-            } else {
-                rb_raise(rb_eRuntimeError, "%s", Tcl_GetStringResult(interp));
-            }
-        }
-
-        for(idx = 0; idx < objc; idx++) {
-            Tcl_IncrRefCount(objv[idx]);
-        }
-
-        thr_crit_bup = rb_thread_critical;
-        rb_thread_critical = Qtrue;
-
-        ary = rb_ary_new2(objc);
-        if (taint_flag) RbTk_OBJ_UNTRUST(ary);
-
-        old_gc = rb_gc_disable();
-
-        for(idx = 0; idx < objc; idx++) {
-            elem = get_str_from_obj(objv[idx]);
-            if (taint_flag) RbTk_OBJ_UNTRUST(elem);
-
-#ifdef HAVE_RUBY_ENCODING_H
-	    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);
-	    } else {
-	        rb_enc_associate_index(elem, list_enc_idx);
-		rb_ivar_set(elem, ID_at_enc, list_ivar_enc);
-	    }
-#endif
-            /* RARRAY(ary)->ptr[idx] = elem; */
-	    rb_ary_push(ary, elem);
-        }
-
-        /* RARRAY(ary)->len = objc; */
-
-        if (old_gc == Qfalse) rb_gc_enable();
-
-        rb_thread_critical = thr_crit_bup;
-
-        for(idx = 0; idx < objc; idx++) {
-            Tcl_DecrRefCount(objv[idx]);
-        }
-
-        Tcl_DecrRefCount(listobj);
-
-#else /* TCL_MAJOR_VERSION < 8 */
-        /* string style interface */
-        int  argc;
-        char **argv;
-
-        if (Tcl_SplitList(interp, RSTRING_PTR(list_str),
-                          &argc, &argv) == TCL_ERROR) {
-            if (interp == (Tcl_Interp*)NULL) {
-                rb_raise(rb_eRuntimeError, "can't get elements from list");
-            } else {
-                rb_raise(rb_eRuntimeError, "%s", interp->result);
-            }
-        }
-
-        ary = rb_ary_new2(argc);
-        if (taint_flag) RbTk_OBJ_UNTRUST(ary);
-
-        old_gc = rb_gc_disable();
-
-        for(idx = 0; idx < argc; idx++) {
-            if (taint_flag) {
-                elem = rb_tainted_str_new2(argv[idx]);
-            } else {
-                elem = rb_str_new2(argv[idx]);
-            }
-            /* rb_ivar_set(elem, ID_at_enc, rb_str_new2("binary")); */
-            /* RARRAY(ary)->ptr[idx] = elem; */
-	    rb_ary_push(ary, elem)
-        }
-        /* RARRAY(ary)->len = argc; */
-
-        if (old_gc == Qfalse) rb_gc_enable();
-#endif
-    }
-
-    return ary;
-}
-
-static VALUE
-lib_split_tklist(self, list_str)
-    VALUE self;
-    VALUE list_str;
-{
-    return lib_split_tklist_core(Qnil, list_str);
-}
-
-
-static VALUE
-ip_split_tklist(self, list_str)
-    VALUE self;
-    VALUE list_str;
-{
-    return lib_split_tklist_core(self, list_str);
-}
-
-static VALUE
-lib_merge_tklist(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
-{
-    int  num, len;
-    int  *flagPtr;
-    char *dst, *result;
-    volatile VALUE str;
-    int taint_flag = 0;
-    int thr_crit_bup;
-    VALUE old_gc;
-
-    if (argc == 0) return rb_str_new2("");
-
-    tcl_stubs_check();
-
-    thr_crit_bup = rb_thread_critical;
-    rb_thread_critical = Qtrue;
-    old_gc = rb_gc_disable();
-
-    /* based on Tcl/Tk's Tcl_Merge() */
-    /* flagPtr = ALLOC_N(int, argc); */
-    flagPtr = RbTk_ALLOC_N(int, argc);
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Preserve((ClientData)flagPtr); /* XXXXXXXXXX */
-#endif
-
-    /* pass 1 */
-    len = 1;
-    for(num = 0; num < argc; num++) {
-        if (OBJ_TAINTED(argv[num])) taint_flag = 1;
-        dst = StringValuePtr(argv[num]);
-#if TCL_MAJOR_VERSION >= 8
-        len += Tcl_ScanCountedElement(dst, RSTRING_LENINT(argv[num]),
-                                      &flagPtr[num]) + 1;
-#else /* TCL_MAJOR_VERSION < 8 */
-        len += Tcl_ScanElement(dst, &flagPtr[num]) + 1;
-#endif
-    }
-
-    /* pass 2 */
-    /* result = (char *)Tcl_Alloc(len); */
-    result = (char *)ckalloc(len);
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Preserve((ClientData)result);
-#endif
-    dst = result;
-    for(num = 0; num < argc; num++) {
-#if TCL_MAJOR_VERSION >= 8
-        len = Tcl_ConvertCountedElement(RSTRING_PTR(argv[num]),
-                                        RSTRING_LENINT(argv[num]),
-                                        dst, flagPtr[num]);
-#else /* TCL_MAJOR_VERSION < 8 */
-        len = Tcl_ConvertElement(RSTRING_PTR(argv[num]), dst, flagPtr[num]);
-#endif
-        dst += len;
-        *dst = ' ';
-        dst++;
-    }
-    if (dst == result) {
-        *dst = 0;
-    } else {
-        dst[-1] = 0;
-    }
-
-#if 0 /* use Tcl_EventuallyFree */
-    Tcl_EventuallyFree((ClientData)flagPtr, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Release((ClientData)flagPtr);
-#else
-    /* free(flagPtr); */
-    ckfree((char*)flagPtr);
-#endif
-#endif
-
-    /* create object */
-    str = rb_str_new(result, dst - result - 1);
-    if (taint_flag) RbTk_OBJ_UNTRUST(str);
-#if 0 /* use Tcl_EventuallyFree */
-    Tcl_EventuallyFree((ClientData)result, TCL_DYNAMIC); /* XXXXXXXX */
-#else
-#if 0 /* use Tcl_Preserve/Release */
-    Tcl_Release((ClientData)result); /* XXXXXXXXXXX */
-#else
-    /* Tcl_Free(result); */
-    ckfree(result);
-#endif
-#endif
-
-    if (old_gc == Qfalse) rb_gc_enable();
-    rb_thread_critical = thr_crit_bup;
-
-    return str;
-}
-
-static VALUE
-lib_conv_listelement(self, src)
-    VALUE self;
-    VALUE src;
-{
-    int   len, scan_flag;
-    volatile VALUE dst;
-    int   taint_flag = OBJ_TAINTED(src);
-    int thr_crit_bup;
-
-    tcl_stubs_check();
-
-    thr_crit_bup = rb_thread_critical;
-    rb_thread_critical = Qtrue;
-
-    StringValue(src);
-
-#if TCL_MAJOR_VERSION >= 8
-    len = Tcl_ScanCountedElement(RSTRING_PTR(src), RSTRING_LENINT(src),
-                                 &scan_flag);
-    dst = rb_str_new(0, len + 1);
-    len = Tcl_ConvertCountedElement(RSTRING_PTR(src), RSTRING_LENINT(src),
-                                    RSTRING_PTR(dst), scan_flag);
-#else /* TCL_MAJOR_VERSION < 8 */
-    len = Tcl_ScanElement(RSTRING_PTR(src), &scan_flag);
-    dst = rb_str_new(0, len + 1);
-    len = Tcl_ConvertElement(RSTRING_PTR(src), RSTRING_PTR(dst), scan_flag);
-#endif
-
-    rb_str_resize(dst, len);
-    if (taint_flag) RbTk_OBJ_UNTRUST(dst);
-
-    rb_thread_critical = thr_crit_bup;
-
-    return dst;
-}
-
-static VALUE
-lib_getversion(self)
-    VALUE self;
-{
-    set_tcltk_version();
-
-    return rb_ary_new3(4, INT2NUM(tcltk_version.major),
-		          INT2NUM(tcltk_version.minor),
-		          INT2NUM(tcltk_version.type),
-		          INT2NUM(tcltk_version.patchlevel));
-}
-
-static VALUE
-lib_get_reltype_name(self)
-    VALUE self;
-{
-    set_tcltk_version();
-
-    switch(tcltk_version.type) {
-    case TCL_ALPHA_RELEASE:
-      return rb_str_new2("alpha");
-    case TCL_BETA_RELEASE:
-      return rb_str_new2("beta");
-    case TCL_FINAL_RELEASE:
-      return rb_str_new2("final");
-    default:
-      rb_raise(rb_eRuntimeError, "tcltklib has invalid release type number");
-    }
-
-    UNREACHABLE;
-}
-
-
-static VALUE
-tcltklib_compile_info(void)
-{
-    volatile VALUE ret;
-    size_t size;
-    static CONST char form[]
-      = "tcltklib %s :: Ruby%s (%s) %s pthread :: Tcl%s(%s)/Tk%s(%s) %s";
-    char *info;
-
-    size = strlen(form)
-        + strlen(TCLTKLIB_RELEASE_DATE)
-        + strlen(RUBY_VERSION)
-        + strlen(RUBY_RELEASE_DATE)
-        + strlen("without")
-        + strlen(TCL_PATCH_LEVEL)
-        + strlen("without stub")
-        + strlen(TK_PATCH_LEVEL)
-        + strlen("without stub")
-        + strlen("unknown tcl_threads");
-
-    info = ALLOC_N(char, size);
-    /* info = ckalloc(sizeof(char) * size); */ /* SEGV */
-
-    sprintf(info, form,
-            TCLTKLIB_RELEASE_DATE,
-            RUBY_VERSION, RUBY_RELEASE_DATE,
-#ifdef HAVE_NATIVETHREAD
-            "with",
-#else
-            "without",
-#endif
-            TCL_PATCH_LEVEL,
-#ifdef USE_TCL_STUBS
-            "with stub",
-#else
-            "without stub",
-#endif
-            TK_PATCH_LEVEL,
-#ifdef USE_TK_STUBS
-            "with stub",
-#else
-            "without stub",
-#endif
-#ifdef WITH_TCL_ENABLE_THREAD
-# if WITH_TCL_ENABLE_THREAD
-            "with tcl_threads"
-# else
-            "without tcl_threads"
-# endif
-#else
-            "unknown tcl_threads"
-#endif
-        );
-
-    ret = rb_obj_freeze(rb_str_new2(info));
-
-    xfree(info);
-    /* ckfree(info); */
-
-    return ret;
-}
-
-
-/*###############################################*/
-
-static VALUE
-create_dummy_encoding_for_tk_core(interp, name, error_mode)
-     VALUE interp;
-     VALUE name;
-     VALUE error_mode;
-{
-  get_ip(interp);
-
-
-  StringValue(name);
-
-#if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 1)
-  if (Tcl_GetEncoding((Tcl_Interp*)NULL, RSTRING_PTR(name)) == (Tcl_Encoding)NULL) {
-    if (RTEST(error_mode)) {
-      rb_raise(rb_eArgError, "invalid Tk encoding name '%s'",
-	       RSTRING_PTR(name));
-    } else {
-      return Qnil;
-    }
-  }
-#endif
-
-#ifdef HAVE_RUBY_ENCODING_H
-  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));
-  } else {
-    if (RTEST(error_mode)) {
-      rb_raise(rb_eRuntimeError, "fail to create dummy encoding for '%s'",
-	       RSTRING_PTR(name));
-    } else {
-      return Qnil;
-    }
-  }
-
-  UNREACHABLE;
-#else
-    return name;
-#endif
-}
-static VALUE
-create_dummy_encoding_for_tk(interp, name)
-     VALUE interp;
-     VALUE name;
-{
-  return create_dummy_encoding_for_tk_core(interp, name, Qtrue);
-}
-
-
-#ifdef HAVE_RUBY_ENCODING_H
-static int
-update_encoding_table(table, interp, error_mode)
-     VALUE table;
-     VALUE interp;
-     VALUE error_mode;
-{
-  struct tcltkip *ptr;
-  int retry = 0;
-  int i, idx, objc;
-  Tcl_Obj **objv;
-  Tcl_Obj *enc_list;
-  volatile VALUE encname = Qnil;
-  volatile VALUE encobj = Qnil;
-
-  /* interpreter check */
-  if (NIL_P(interp)) return 0;
-  ptr = get_ip(interp);
-  if (ptr == (struct tcltkip *) NULL)  return 0;
-  if (deleted_ip(ptr)) return 0;
-
-  /* get Tcl's encoding list */
-  Tcl_GetEncodingNames(ptr->ip);
-  enc_list = Tcl_GetObjResult(ptr->ip);
-  Tcl_IncrRefCount(enc_list);
-
-  if (Tcl_ListObjGetElements(ptr->ip, enc_list,
-			     &objc, &objv) != TCL_OK) {
-    Tcl_DecrRefCount(enc_list);
-    /* rb_raise(rb_eRuntimeError, "failt to get Tcl's encoding names");*/
-    return 0;
-  }
-
-  /* check each encoding name */
-  for(i = 0; i < objc; i++) {
-    encname = rb_str_new2(Tcl_GetString(objv[i]));
-    if (NIL_P(rb_hash_lookup(table, encname))) {
-      /* new Tk encoding -> add to table */
-      idx = rb_enc_find_index(StringValueCStr(encname));
-      if (idx < 0) {
-	encobj = create_dummy_encoding_for_tk_core(interp,encname,error_mode);
-      } else {
-	encobj = rb_enc_from_encoding(rb_enc_from_index(idx));
-      }
-      encname = rb_obj_freeze(encname);
-      rb_hash_aset(table, encname, encobj);
-      if (!NIL_P(encobj) && NIL_P(rb_hash_lookup(table, encobj))) {
-	rb_hash_aset(table, encobj, encname);
-      }
-      retry = 1;
-    }
-  }
-
-  Tcl_DecrRefCount(enc_list);
-
-  return retry;
-}
-
-static VALUE
-encoding_table_get_name_core(table, enc_arg, error_mode)
-     VALUE table;
-     VALUE enc_arg;
-     VALUE error_mode;
-{
-  volatile VALUE enc = enc_arg;
-  volatile VALUE name = Qnil;
-  volatile VALUE tmp = Qnil;
-  volatile VALUE interp = rb_ivar_get(table, ID_at_interp);
-  struct tcltkip *ptr = (struct tcltkip *) NULL;
-  int idx;
-
-  /* deleted interp ? */
-  if (!NIL_P(interp)) {
-    ptr = get_ip(interp);
-    if (deleted_ip(ptr)) {
-      ptr = (struct tcltkip *) NULL;
-    }
-  }
-
-  /* encoding argument check */
-  /* 1st: default encoding setting of interp */
-  if (ptr && NIL_P(enc)) {
-    if (rb_respond_to(interp, ID_encoding_name)) {
-      enc = rb_funcallv(interp, ID_encoding_name, 0, 0);
-    }
-  }
-  /* 2nd: Encoding.default_internal */
-  if (NIL_P(enc)) {
-    enc = rb_enc_default_internal();
-  }
-  /* 3rd: encoding system of Tcl/Tk */
-  if (NIL_P(enc)) {
-    enc = rb_str_new2(Tcl_GetEncodingName((Tcl_Encoding)NULL));
-  }
-  /* 4th: Encoding.default_external */
-  if (NIL_P(enc)) {
-    enc = rb_enc_default_external();
-  }
-  /* 5th: Encoding.locale_charmap */
-  if (NIL_P(enc)) {
-    enc = rb_locale_charmap(rb_cEncoding);
-  }
-
-  if (RTEST(rb_obj_is_kind_of(enc, cRubyEncoding))) {
-    /* Ruby's Encoding object */
-    name = rb_hash_lookup(table, enc);
-    if (!NIL_P(name)) {
-      /* find */
-      return name;
-    }
-
-    /* is it new ? */
-    /* update check of Tk encoding names */
-    if (update_encoding_table(table, interp, error_mode)) {
-      /* add new relations to the table   */
-      /* RETRY: registered Ruby encoding? */
-      name = rb_hash_lookup(table, enc);
-      if (!NIL_P(name)) {
-	/* find */
-	return name;
-      }
-    }
-    /* fail to find */
-
-  } else {
-    /* String or Symbol? */
-    name = rb_funcallv(enc, ID_to_s, 0, 0);
-
-    if (!NIL_P(rb_hash_lookup(table, name))) {
-      /* find */
-      return name;
-    }
-
-    /* is it new ? */
-    idx = rb_enc_find_index(StringValueCStr(name));
-    if (idx >= 0) {
-      enc = rb_enc_from_encoding(rb_enc_from_index(idx));
-
-      /* registered Ruby encoding? */
-      tmp = rb_hash_lookup(table, enc);
-      if (!NIL_P(tmp)) {
-	/* find */
-	return tmp;
-      }
-
-      /* update check of Tk encoding names */
-      if (update_encoding_table(table, interp, error_mode)) {
-	/* add new relations to the table   */
-	/* RETRY: registered Ruby encoding? */
-	tmp = rb_hash_lookup(table, enc);
-	if (!NIL_P(tmp)) {
-	  /* find */
-	  return tmp;
-	}
-      }
-    }
-    /* fail to find */
-  }
-
-  if (RTEST(error_mode)) {
-    enc = rb_funcallv(enc_arg, ID_to_s, 0, 0);
-    rb_raise(rb_eArgError, "unsupported Tk encoding '%s'", RSTRING_PTR(enc));
-  }
-  return Qnil;
-}
-static VALUE
-encoding_table_get_obj_core(table, enc, error_mode)
-     VALUE table;
-     VALUE enc;
-     VALUE error_mode;
-{
-  volatile VALUE obj = Qnil;
-
-  obj = rb_hash_lookup(table,
-		       encoding_table_get_name_core(table, enc, error_mode));
-  if (RTEST(rb_obj_is_kind_of(obj, cRubyEncoding))) {
-    return obj;
-  } else {
-    return Qnil;
-  }
-}
-
-#else /* ! HAVE_RUBY_ENCODING_H */
-#if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 1)
-static int
-update_encoding_table(table, interp, error_mode)
-     VALUE table;
-     VALUE interp;
-     VALUE error_mode;
-{
-  struct tcltkip *ptr;
-  int retry = 0;
-  int i, objc;
-  Tcl_Obj **objv;
-  Tcl_Obj *enc_list;
-  volatile VALUE encname = Qnil;
-
-  /* interpreter check */
-  if (NIL_P(interp)) return 0;
-  ptr = get_ip(interp);
-  if (ptr == (struct tcltkip *) NULL)  return 0;
-  if (deleted_ip(ptr)) return 0;
-
-  /* get Tcl's encoding list */
-  Tcl_GetEncodingNames(ptr->ip);
-  enc_list = Tcl_GetObjResult(ptr->ip);
-  Tcl_IncrRefCount(enc_list);
-
-  if (Tcl_ListObjGetElements(ptr->ip, enc_list, &objc, &objv) != TCL_OK) {
-    Tcl_DecrRefCount(enc_list);
-    /* rb_raise(rb_eRuntimeError, "failt to get Tcl's encoding names"); */
-    return 0;
-  }
-
-  /* get encoding name and set it to table */
-  for(i = 0; i < objc; i++) {
-    encname = rb_str_new2(Tcl_GetString(objv[i]));
-    if (NIL_P(rb_hash_lookup(table, encname))) {
-      /* new Tk encoding -> add to table */
-      encname = rb_obj_freeze(encname);
-      rb_hash_aset(table, encname, encname);
-      retry = 1;
-    }
-  }
-
-  Tcl_DecrRefCount(enc_list);
-
-  return retry;
-}
-
-static VALUE
-encoding_table_get_name_core(table, enc, error_mode)
-     VALUE table;
-     VALUE enc;
-     VALUE error_mode;
-{
-  volatile VALUE name = Qnil;
-
-  enc = rb_funcallv(enc, ID_to_s, 0, 0);
-  name = rb_hash_lookup(table, enc);
-
-  if (!NIL_P(name)) {
-    /* find */
-    return name;
-  }
-
-  /* update check */
-  if (update_encoding_table(table, rb_ivar_get(table, ID_at_interp),
-					       error_mode)) {
-    /* add new relations to the table   */
-    /* RETRY: registered Ruby encoding? */
-    name = rb_hash_lookup(table, enc);
-    if (!NIL_P(name)) {
-      /* find */
-      return name;
-    }
-  }
-
-  if (RTEST(error_mode)) {
-    rb_raise(rb_eArgError, "unsupported Tk encoding '%s'", RSTRING_PTR(enc));
-  }
-  return Qnil;
-}
-static VALUE
-encoding_table_get_obj_core(table, enc, error_mode)
-     VALUE table;
-     VALUE enc;
-     VALUE error_mode;
-{
-  return encoding_table_get_name_core(table, enc, error_mode);
-}
-
-#else /* Tcl/Tk 7.x or 8.0 */
-static VALUE
-encoding_table_get_name_core(table, enc, error_mode)
-     VALUE table;
-     VALUE enc;
-     VALUE error_mode;
-{
-  return Qnil;
-}
-static VALUE
-encoding_table_get_obj_core(table, enc, error_mode)
-     VALUE table;
-     VALUE enc;
-     VALUE error_mode;
-{
-  return Qnil;
-}
-#endif /* end of dependency for the version of Tcl/Tk */
-#endif
-
-static VALUE
-encoding_table_get_name(table, enc)
-     VALUE table;
-     VALUE enc;
-{
-  return encoding_table_get_name_core(table, enc, Qtrue);
-}
-static VALUE
-encoding_table_get_obj(table, enc)
-     VALUE table;
-     VALUE enc;
-{
-  return encoding_table_get_obj_core(table, enc, Qtrue);
-}
-
-#ifdef HAVE_RUBY_ENCODING_H
-static VALUE
-create_encoding_table_core(arg, interp)
-     VALUE arg;
-     VALUE interp;
-{
-  struct tcltkip *ptr = get_ip(interp);
-  volatile VALUE table = rb_hash_new();
-  volatile VALUE encname = Qnil;
-  volatile VALUE encobj = Qnil;
-  int i, idx, objc;
-  Tcl_Obj **objv;
-  Tcl_Obj *enc_list;
-
-#ifdef HAVE_RB_SET_SAFE_LEVEL_FORCE
-  rb_set_safe_level_force(0);
-#else
-  rb_set_safe_level(0);
-#endif
-
-  /* set 'binary' encoding */
-  encobj = rb_enc_from_encoding(rb_enc_from_index(ENCODING_INDEX_BINARY));
-  rb_hash_aset(table, ENCODING_NAME_BINARY, encobj);
-  rb_hash_aset(table, encobj, ENCODING_NAME_BINARY);
-
-
-  /* Tcl stub check */
-  tcl_stubs_check();
-
-  /* get Tcl's encoding list */
-  Tcl_GetEncodingNames(ptr->ip);
-  enc_list = Tcl_GetObjResult(ptr->ip);
-  Tcl_IncrRefCount(enc_list);
-
-  if (Tcl_ListObjGetElements(ptr->ip, enc_list, &objc, &objv) != TCL_OK) {
-    Tcl_DecrRefCount(enc_list);
-    rb_raise(rb_eRuntimeError, "failt to get Tcl's encoding names");
-  }
-
-  /* get encoding name and set it to table */
-  for(i = 0; i < objc; i++) {
-    int name2obj, obj2name;
-
-    name2obj = 1; obj2name = 1;
-    encname = rb_obj_freeze(rb_str_new2(Tcl_GetString(objv[i])));
-    idx = rb_enc_find_index(StringValueCStr(encname));
-    if (idx < 0) {
-      /* fail to find ruby encoding -> check known encoding */
-      if (strcmp(RSTRING_PTR(encname), "identity") == 0) {
-	name2obj = 1; obj2name = 0;
-	idx = ENCODING_INDEX_BINARY;
-
-      } else if (strcmp(RSTRING_PTR(encname), "shiftjis") == 0) {
-	name2obj = 1; obj2name = 0;
-	idx = rb_enc_find_index("Shift_JIS");
-
-      } else if (strcmp(RSTRING_PTR(encname), "unicode") == 0) {
-	name2obj = 1; obj2name = 0;
-	idx = ENCODING_INDEX_UTF8;
-
-      } else if (strcmp(RSTRING_PTR(encname), "symbol") == 0) {
-	name2obj = 1; obj2name = 0;
-	idx = rb_enc_find_index("ASCII-8BIT");
-
-      } else {
-	/* regist dummy encoding */
-	name2obj = 1; obj2name = 1;
-      }
-    }
-
-    if (idx < 0) {
-      /* unknown encoding -> create dummy */
-      encobj = create_dummy_encoding_for_tk(interp, encname);
-    } else {
-      encobj = rb_enc_from_encoding(rb_enc_from_index(idx));
-    }
-
-    if (name2obj) {
-      DUMP2("create_encoding_table: name2obj: %s", RSTRING_PTR(encname));
-      rb_hash_aset(table, encname, encobj);
-    }
-    if (obj2name) {
-      DUMP2("create_encoding_table: obj2name: %s", RSTRING_PTR(encname));
-      rb_hash_aset(table, encobj, encname);
-    }
-  }
-
-  Tcl_DecrRefCount(enc_list);
-
-  rb_ivar_set(table, ID_at_interp, interp);
-  rb_ivar_set(interp, ID_encoding_table, table);
-
-  return table;
-}
-
-#else /* ! HAVE_RUBY_ENCODING_H */
-#if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 1)
-static VALUE
-create_encoding_table_core(arg, interp)
-     VALUE arg;
-     VALUE interp;
-{
-  struct tcltkip *ptr = get_ip(interp);
-  volatile VALUE table = rb_hash_new();
-  volatile VALUE encname = Qnil;
-  int i, objc;
-  Tcl_Obj **objv;
-  Tcl_Obj *enc_list;
-
-
-  /* set 'binary' encoding */
-  rb_hash_aset(table, ENCODING_NAME_BINARY, ENCODING_NAME_BINARY);
-
-  /* get Tcl's encoding list */
-  Tcl_GetEncodingNames(ptr->ip);
-  enc_list = Tcl_GetObjResult(ptr->ip);
-  Tcl_IncrRefCount(enc_list);
-
-  if (Tcl_ListObjGetElements(ptr->ip, enc_list, &objc, &objv) != TCL_OK) {
-    Tcl_DecrRefCount(enc_list);
-    rb_raise(rb_eRuntimeError, "failt to get Tcl's encoding names");
-  }
-
-  /* get encoding name and set it to table */
-  for(i = 0; i < objc; i++) {
-    encname = rb_obj_freeze(rb_str_new2(Tcl_GetString(objv[i])));
-    rb_hash_aset(table, encname, encname);
-  }
-
-  Tcl_DecrRefCount(enc_list);
-
-  rb_ivar_set(table, ID_at_interp, interp);
-  rb_ivar_set(interp, ID_encoding_table, table);
-
-  return table;
-}
-
-#else /* Tcl/Tk 7.x or 8.0 */
-static VALUE
-create_encoding_table_core(arg, interp)
-     VALUE arg;
-     VALUE interp;
-{
-  volatile VALUE table = rb_hash_new();
-  rb_ivar_set(interp, ID_encoding_table, table);
-  return table;
-}
-#endif
-#endif
-
-static VALUE
-create_encoding_table(interp)
-     VALUE interp;
-{
-  return rb_funcall(rb_proc_new(create_encoding_table_core, interp),
-		    ID_call, 0);
-}
-
-static VALUE
-ip_get_encoding_table(interp)
-     VALUE interp;
-{
-  volatile VALUE table = Qnil;
-
-  table = rb_ivar_get(interp, ID_encoding_table);
-
-  if (NIL_P(table)) {
-    /* initialize encoding_table */
-    table = create_encoding_table(interp);
-    rb_define_singleton_method(table, "get_name", encoding_table_get_name, 1);
-    rb_define_singleton_method(table, "get_obj",  encoding_table_get_obj,  1);
-  }
-
-  return table;
-}
-
-
-/*###############################################*/
-
-/*
- *   The following is based on tkMenu.[ch]
- *   of Tcl/Tk (Tk8.0 -- Tk8.5b1) source code.
- */
-#if TCL_MAJOR_VERSION >= 8
-
-#define MASTER_MENU             0
-#define TEAROFF_MENU            1
-#define MENUBAR                 2
-
-struct dummy_TkMenuEntry {
-    int type;
-    struct dummy_TkMenu *menuPtr;
-    /* , and etc.   */
-};
-
-struct dummy_TkMenu {
-    Tk_Window tkwin;
-    Display *display;
-    Tcl_Interp *interp;
-    Tcl_Command widgetCmd;
-    struct dummy_TkMenuEntry **entries;
-    int numEntries;
-    int active;
-    int menuType;     /* MASTER_MENU, TEAROFF_MENU, or MENUBAR */
-    Tcl_Obj *menuTypePtr;
-    /* , and etc.   */
-};
-
-struct dummy_TkMenuRef {
-    struct dummy_TkMenu *menuPtr;
-    char *dummy1;
-    char *dummy2;
-    char *dummy3;
-};
-
-#if 0 /* was available on Tk8.0 -- Tk8.4 */
-EXTERN struct dummy_TkMenuRef *TkFindMenuReferences(Tcl_Interp*, char*);
-#else /* based on Tk8.0 -- Tk8.5.0 */
-#define MENU_HASH_KEY "tkMenus"
-#endif
-
-#endif
-
-static VALUE
-ip_make_menu_embeddable_core(interp, argc, argv)
-    VALUE interp;
-    int   argc;
-    VALUE *argv;
-{
-#if TCL_MAJOR_VERSION >= 8
-    volatile VALUE menu_path;
-    struct tcltkip *ptr = get_ip(interp);
-    struct dummy_TkMenuRef *menuRefPtr = NULL;
-    XEvent event;
-    Tcl_HashTable *menuTablePtr;
-    Tcl_HashEntry *hashEntryPtr;
-
-    menu_path = argv[0];
-    StringValue(menu_path);
-
-#if 0 /* was available on Tk8.0 -- Tk8.4 */
-    menuRefPtr = TkFindMenuReferences(ptr->ip, RSTRING_PTR(menu_path));
-#else /* based on Tk8.0 -- Tk8.5b1 */
-    if ((menuTablePtr
-	 = (Tcl_HashTable *) Tcl_GetAssocData(ptr->ip, MENU_HASH_KEY, NULL))
-	!= NULL) {
-      if ((hashEntryPtr
-	   = Tcl_FindHashEntry(menuTablePtr, RSTRING_PTR(menu_path)))
-	  != NULL) {
-        menuRefPtr = (struct dummy_TkMenuRef *) Tcl_GetHashValue(hashEntryPtr);
-      }
-    }
-#endif
-
-    if (menuRefPtr == (struct dummy_TkMenuRef *) NULL) {
-        rb_raise(rb_eArgError, "not a menu widget, or invalid widget path");
-    }
-
-    if (menuRefPtr->menuPtr == (struct dummy_TkMenu *) NULL) {
-        rb_raise(rb_eRuntimeError,
-		 "invalid menu widget (maybe already destroyed)");
-    }
-
-    if ((menuRefPtr->menuPtr)->menuType != MENUBAR) {
-        rb_raise(rb_eRuntimeError,
-		 "target menu widget must be a MENUBAR type");
-    }
-
-    (menuRefPtr->menuPtr)->menuType = TEAROFF_MENU;
-#if 0  /* cause SEGV */
-    {
-       /* char *s = "tearoff"; */
-       char *s = "normal";
-       /* Tcl_SetStringObj((menuRefPtr->menuPtr)->menuTypePtr, s, strlen(s));*/
-       (menuRefPtr->menuPtr)->menuTypePtr = Tcl_NewStringObj(s, strlen(s));
-       /* Tcl_IncrRefCount((menuRefPtr->menuPtr)->menuTypePtr); */
-       /* (menuRefPtr->menuPtr)->menuType = TEAROFF_MENU; */
-       (menuRefPtr->menuPtr)->menuType = MASTER_MENU;
-    }
-#endif
-
-#if 0 /* was available on Tk8.0 -- Tk8.4 */
-    TkEventuallyRecomputeMenu(menuRefPtr->menuPtr);
-    TkEventuallyRedrawMenu(menuRefPtr->menuPtr,
-			   (struct dummy_TkMenuEntry *)NULL);
-#else /* based on Tk8.0 -- Tk8.5b1 */
-    memset((void *) &event, 0, sizeof(event));
-    event.xany.type = ConfigureNotify;
-    event.xany.serial = NextRequest(Tk_Display((menuRefPtr->menuPtr)->tkwin));
-    event.xany.send_event = 0; /* FALSE */
-    event.xany.window = Tk_WindowId((menuRefPtr->menuPtr)->tkwin);
-    event.xany.display = Tk_Display((menuRefPtr->menuPtr)->tkwin);
-    event.xconfigure.window = event.xany.window;
-    Tk_HandleEvent(&event);
-#endif
-
-#else /* TCL_MAJOR_VERSION <= 7 */
-    rb_notimplement();
-#endif
-
-    return interp;
-}
-
-static VALUE
-ip_make_menu_embeddable(interp, menu_path)
-    VALUE interp;
-    VALUE menu_path;
-{
-    VALUE argv[1];
-
-    argv[0] = menu_path;
-    return tk_funcall(ip_make_menu_embeddable_core, 1, argv, interp);
-}
-
-
-/*###############################################*/
-
-/*---- initialization ----*/
-void
-Init_tcltklib(void)
-{
-    int  ret;
-
-    VALUE lib = rb_define_module("TclTkLib");
-    VALUE ip = rb_define_class("TclTkIp", rb_cObject);
-
-    VALUE ev_flag = rb_define_module_under(lib, "EventFlag");
-    VALUE var_flag = rb_define_module_under(lib, "VarAccessFlag");
-    VALUE release_type = rb_define_module_under(lib, "RELEASE_TYPE");
-
-    /* --------------------------------------------------------------- */
-
-    tcltkip_class = ip;
-
-    /* --------------------------------------------------------------- */
-
-#ifdef HAVE_RUBY_ENCODING_H
-    rb_global_variable(&cRubyEncoding);
-    cRubyEncoding = rb_path2class("Encoding");
-
-    ENCODING_INDEX_UTF8   = rb_enc_to_index(rb_utf8_encoding());
-    ENCODING_INDEX_BINARY = rb_enc_find_index("binary");
-#endif
-
-    rb_global_variable(&ENCODING_NAME_UTF8);
-    rb_global_variable(&ENCODING_NAME_BINARY);
-
-    ENCODING_NAME_UTF8   = rb_obj_freeze(rb_str_new2("utf-8"));
-    ENCODING_NAME_BINARY = rb_obj_freeze(rb_str_new2("binary"));
-
-    /* --------------------------------------------------------------- */
-
-    rb_global_variable(&eTkCallbackReturn);
-    rb_global_variable(&eTkCallbackBreak);
-    rb_global_variable(&eTkCallbackContinue);
-
-    rb_global_variable(&eventloop_thread);
-    rb_global_variable(&eventloop_stack);
-    rb_global_variable(&watchdog_thread);
-
-    rb_global_variable(&rbtk_pending_exception);
-
-   /* --------------------------------------------------------------- */
-
-    rb_define_const(lib, "COMPILE_INFO", tcltklib_compile_info());
-
-    rb_define_const(lib, "RELEASE_DATE",
-                    rb_obj_freeze(rb_str_new2(tcltklib_release_date)));
-
-    rb_define_const(lib, "FINALIZE_PROC_NAME",
-                    rb_str_new2(finalize_hook_name));
-
-   /* --------------------------------------------------------------- */
-
-#ifdef __WIN32__
-#  define TK_WINDOWING_SYSTEM "win32"
-#else
-#  ifdef MAC_TCL
-#    define TK_WINDOWING_SYSTEM "classic"
-#  else
-#    ifdef MAC_OSX_TK
-#      define TK_WINDOWING_SYSTEM "aqua"
-#    else
-#      define TK_WINDOWING_SYSTEM "x11"
-#    endif
-#  endif
-#endif
-    rb_define_const(lib, "WINDOWING_SYSTEM",
-                    rb_obj_freeze(rb_str_new2(TK_WINDOWING_SYSTEM)));
-
-   /* --------------------------------------------------------------- */
-
-    rb_define_const(ev_flag, "NONE",      INT2FIX(0));
-    rb_define_const(ev_flag, "WINDOW",    INT2FIX(TCL_WINDOW_EVENTS));
-    rb_define_const(ev_flag, "FILE",      INT2FIX(TCL_FILE_EVENTS));
-    rb_define_const(ev_flag, "TIMER",     INT2FIX(TCL_TIMER_EVENTS));
-    rb_define_const(ev_flag, "IDLE",      INT2FIX(TCL_IDLE_EVENTS));
-    rb_define_const(ev_flag, "ALL",       INT2FIX(TCL_ALL_EVENTS));
-    rb_define_const(ev_flag, "DONT_WAIT", INT2FIX(TCL_DONT_WAIT));
-
-    /* --------------------------------------------------------------- */
-
-    rb_define_const(var_flag, "NONE",           INT2FIX(0));
-    rb_define_const(var_flag, "GLOBAL_ONLY",    INT2FIX(TCL_GLOBAL_ONLY));
-#ifdef TCL_NAMESPACE_ONLY
-    rb_define_const(var_flag, "NAMESPACE_ONLY", INT2FIX(TCL_NAMESPACE_ONLY));
-#else /* probably Tcl7.6 */
-    rb_define_const(var_flag, "NAMESPACE_ONLY", INT2FIX(0));
-#endif
-    rb_define_const(var_flag, "LEAVE_ERR_MSG",  INT2FIX(TCL_LEAVE_ERR_MSG));
-    rb_define_const(var_flag, "APPEND_VALUE",   INT2FIX(TCL_APPEND_VALUE));
-    rb_define_const(var_flag, "LIST_ELEMENT",   INT2FIX(TCL_LIST_ELEMENT));
-#ifdef TCL_PARSE_PART1
-    rb_define_const(var_flag, "PARSE_VARNAME",  INT2FIX(TCL_PARSE_PART1));
-#else /* probably Tcl7.6 */
-    rb_define_const(var_flag, "PARSE_VARNAME",  INT2FIX(0));
-#endif
-
-    /* --------------------------------------------------------------- */
-
-    rb_define_module_function(lib, "get_version", lib_getversion, -1);
-    rb_define_module_function(lib, "get_release_type_name",
-			      lib_get_reltype_name, -1);
-
-    rb_define_const(release_type, "ALPHA", INT2FIX(TCL_ALPHA_RELEASE));
-    rb_define_const(release_type, "BETA",  INT2FIX(TCL_BETA_RELEASE));
-    rb_define_const(release_type, "FINAL", INT2FIX(TCL_FINAL_RELEASE));
-
-    /* --------------------------------------------------------------- */
-
-    eTkCallbackReturn = rb_define_class("TkCallbackReturn", rb_eStandardError);
-    eTkCallbackBreak = rb_define_class("TkCallbackBreak", rb_eStandardError);
-    eTkCallbackContinue = rb_define_class("TkCallbackContinue",
-                                          rb_eStandardError);
-
-    /* --------------------------------------------------------------- */
-
-    eLocalJumpError = rb_const_get(rb_cObject, rb_intern("LocalJumpError"));
-
-    eTkLocalJumpError = rb_define_class("TkLocalJumpError", eLocalJumpError);
-
-    eTkCallbackRetry  = rb_define_class("TkCallbackRetry", eTkLocalJumpError);
-    eTkCallbackRedo   = rb_define_class("TkCallbackRedo",  eTkLocalJumpError);
-    eTkCallbackThrow  = rb_define_class("TkCallbackThrow", eTkLocalJumpError);
-
-    /* --------------------------------------------------------------- */
-
-    ID_at_enc = rb_intern("@encoding");
-    ID_at_interp = rb_intern("@interp");
-    ID_encoding_name = rb_intern("encoding_name");
-    ID_encoding_table = rb_intern("encoding_table");
-
-    ID_stop_p = rb_intern("stop?");
-#ifndef HAVE_RB_THREAD_ALIVE_P
-    ID_alive_p = rb_intern("alive?");
-#endif
-    ID_kill = rb_intern("kill");
-    ID_join = rb_intern("join");
-    ID_value = rb_intern("value");
-
-    ID_call = rb_intern("call");
-    ID_backtrace = rb_intern("backtrace");
-    ID_message = rb_intern("message");
-
-    ID_at_reason = rb_intern("@reason");
-    ID_return = rb_intern("return");
-    ID_break = rb_intern("break");
-    ID_next = rb_intern("next");
-
-    ID_to_s = rb_intern("to_s");
-    ID_inspect = rb_intern("inspect");
-
-    /* --------------------------------------------------------------- */
-
-    rb_define_module_function(lib, "mainloop", lib_mainloop, -1);
-    rb_define_module_function(lib, "mainloop_thread?",
-                              lib_evloop_thread_p, 0);
-    rb_define_module_function(lib, "mainloop_watchdog",
-                              lib_mainloop_watchdog, -1);
-    rb_define_module_function(lib, "do_thread_callback",
-                              lib_thread_callback, -1);
-    rb_define_module_function(lib, "do_one_event", lib_do_one_event, -1);
-    rb_define_module_function(lib, "mainloop_abort_on_exception",
-                             lib_evloop_abort_on_exc, 0);
-    rb_define_module_function(lib, "mainloop_abort_on_exception=",
-                             lib_evloop_abort_on_exc_set, 1);
-    rb_define_module_function(lib, "set_eventloop_window_mode",
-			      set_eventloop_window_mode, 1);
-    rb_define_module_function(lib, "get_eventloop_window_mode",
-			      get_eventloop_window_mode, 0);
-    rb_define_module_function(lib, "set_eventloop_tick",set_eventloop_tick,1);
-    rb_define_module_function(lib, "get_eventloop_tick",get_eventloop_tick,0);
-    rb_define_module_function(lib, "set_no_event_wait", set_no_event_wait, 1);
-    rb_define_module_function(lib, "get_no_event_wait", get_no_event_wait, 0);
-    rb_define_module_function(lib, "set_eventloop_weight",
-                              set_eventloop_weight, 2);
-    rb_define_module_function(lib, "set_max_block_time", set_max_block_time,1);
-    rb_define_module_function(lib, "get_eventloop_weight",
-                              get_eventloop_weight, 0);
-    rb_define_module_function(lib, "num_of_mainwindows",
-                              lib_num_of_mainwindows, 0);
-
-    /* --------------------------------------------------------------- */
-
-    rb_define_module_function(lib, "_split_tklist", lib_split_tklist, 1);
-    rb_define_module_function(lib, "_merge_tklist", lib_merge_tklist, -1);
-    rb_define_module_function(lib, "_conv_listelement",
-                              lib_conv_listelement, 1);
-    rb_define_module_function(lib, "_toUTF8", lib_toUTF8, -1);
-    rb_define_module_function(lib, "_fromUTF8", lib_fromUTF8, -1);
-    rb_define_module_function(lib, "_subst_UTF_backslash",
-                              lib_UTF_backslash, 1);
-    rb_define_module_function(lib, "_subst_Tcl_backslash",
-                              lib_Tcl_backslash, 1);
-
-    rb_define_module_function(lib, "encoding_system",
-                              lib_get_system_encoding, 0);
-    rb_define_module_function(lib, "encoding_system=",
-                              lib_set_system_encoding, 1);
-    rb_define_module_function(lib, "encoding",
-                              lib_get_system_encoding, 0);
-    rb_define_module_function(lib, "encoding=",
-                              lib_set_system_encoding, 1);
-
-    /* --------------------------------------------------------------- */
-
-    rb_define_alloc_func(ip, ip_alloc);
-    rb_define_method(ip, "initialize", ip_init, -1);
-    rb_define_method(ip, "create_slave", ip_create_slave, -1);
-    rb_define_method(ip, "slave_of?", ip_is_slave_of_p, 1);
-    rb_define_method(ip, "make_safe", ip_make_safe, 0);
-    rb_define_method(ip, "safe?", ip_is_safe_p, 0);
-    rb_define_method(ip, "allow_ruby_exit?", ip_allow_ruby_exit_p, 0);
-    rb_define_method(ip, "allow_ruby_exit=", ip_allow_ruby_exit_set, 1);
-    rb_define_method(ip, "delete", ip_delete, 0);
-    rb_define_method(ip, "deleted?", ip_is_deleted_p, 0);
-    rb_define_method(ip, "has_mainwindow?", ip_has_mainwindow_p, 0);
-    rb_define_method(ip, "invalid_namespace?", ip_has_invalid_namespace_p, 0);
-    rb_define_method(ip, "_eval", ip_eval, 1);
-    rb_define_method(ip, "_cancel_eval", ip_cancel_eval, -1);
-    rb_define_method(ip, "_cancel_eval_unwind", ip_cancel_eval_unwind, -1);
-    rb_define_method(ip, "_toUTF8", ip_toUTF8, -1);
-    rb_define_method(ip, "_fromUTF8", ip_fromUTF8, -1);
-    rb_define_method(ip, "_thread_vwait", ip_thread_vwait, 1);
-    rb_define_method(ip, "_thread_tkwait", ip_thread_tkwait, 2);
-    rb_define_method(ip, "_invoke", ip_invoke, -1);
-    rb_define_method(ip, "_immediate_invoke", ip_invoke_immediate, -1);
-    rb_define_method(ip, "_return_value", ip_retval, 0);
-
-    rb_define_method(ip, "_create_console", ip_create_console, 0);
-
-    /* --------------------------------------------------------------- */
-
-    rb_define_method(ip, "create_dummy_encoding_for_tk",
-		     create_dummy_encoding_for_tk, 1);
-    rb_define_method(ip, "encoding_table", ip_get_encoding_table, 0);
-
-    /* --------------------------------------------------------------- */
-
-    rb_define_method(ip, "_get_variable", ip_get_variable, 2);
-    rb_define_method(ip, "_get_variable2", ip_get_variable2, 3);
-    rb_define_method(ip, "_set_variable", ip_set_variable, 3);
-    rb_define_method(ip, "_set_variable2", ip_set_variable2, 4);
-    rb_define_method(ip, "_unset_variable", ip_unset_variable, 2);
-    rb_define_method(ip, "_unset_variable2", ip_unset_variable2, 3);
-    rb_define_method(ip, "_get_global_var", ip_get_global_var, 1);
-    rb_define_method(ip, "_get_global_var2", ip_get_global_var2, 2);
-    rb_define_method(ip, "_set_global_var", ip_set_global_var, 2);
-    rb_define_method(ip, "_set_global_var2", ip_set_global_var2, 3);
-    rb_define_method(ip, "_unset_global_var", ip_unset_global_var, 1);
-    rb_define_method(ip, "_unset_global_var2", ip_unset_global_var2, 2);
-
-    /* --------------------------------------------------------------- */
-
-    rb_define_method(ip, "_make_menu_embeddable", ip_make_menu_embeddable, 1);
-
-    /* --------------------------------------------------------------- */
-
-    rb_define_method(ip, "_split_tklist", ip_split_tklist, 1);
-    rb_define_method(ip, "_merge_tklist", lib_merge_tklist, -1);
-    rb_define_method(ip, "_conv_listelement", lib_conv_listelement, 1);
-
-    /* --------------------------------------------------------------- */
-
-    rb_define_method(ip, "mainloop", ip_mainloop, -1);
-    rb_define_method(ip, "mainloop_watchdog", ip_mainloop_watchdog, -1);
-    rb_define_method(ip, "do_one_event", ip_do_one_event, -1);
-    rb_define_method(ip, "mainloop_abort_on_exception",
-                    ip_evloop_abort_on_exc, 0);
-    rb_define_method(ip, "mainloop_abort_on_exception=",
-                    ip_evloop_abort_on_exc_set, 1);
-    rb_define_method(ip, "set_eventloop_tick", ip_set_eventloop_tick, 1);
-    rb_define_method(ip, "get_eventloop_tick", ip_get_eventloop_tick, 0);
-    rb_define_method(ip, "set_no_event_wait", ip_set_no_event_wait, 1);
-    rb_define_method(ip, "get_no_event_wait", ip_get_no_event_wait, 0);
-    rb_define_method(ip, "set_eventloop_weight", ip_set_eventloop_weight, 2);
-    rb_define_method(ip, "get_eventloop_weight", ip_get_eventloop_weight, 0);
-    rb_define_method(ip, "set_max_block_time", set_max_block_time, 1);
-    rb_define_method(ip, "restart", ip_restart, 0);
-
-    /* --------------------------------------------------------------- */
-
-    eventloop_thread = Qnil;
-    eventloop_interp = (Tcl_Interp*)NULL;
-
-#ifndef DEFAULT_EVENTLOOP_DEPTH
-#define DEFAULT_EVENTLOOP_DEPTH 7
-#endif
-    eventloop_stack = rb_ary_new2(DEFAULT_EVENTLOOP_DEPTH);
-    RbTk_OBJ_UNTRUST(eventloop_stack);
-
-    watchdog_thread  = Qnil;
-
-    rbtk_pending_exception = Qnil;
-
-    /* --------------------------------------------------------------- */
-
-#ifdef HAVE_NATIVETHREAD
-    /* if ruby->nativethread-support and tcltklib->doesn't,
-       the following will cause link-error. */
-    ruby_native_thread_p();
-#endif
-
-    /* --------------------------------------------------------------- */
-
-    rb_set_end_proc(lib_mark_at_exit, 0);
-
-    /* --------------------------------------------------------------- */
-
-    ret = ruby_open_tcl_dll(rb_argv0 ? RSTRING_PTR(rb_argv0) : 0);
-    switch(ret) {
-    case TCLTK_STUBS_OK:
-        break;
-    case NO_TCL_DLL:
-        rb_raise(rb_eLoadError, "tcltklib: fail to open tcl_dll");
-    case NO_FindExecutable:
-        rb_raise(rb_eLoadError, "tcltklib: can't find Tcl_FindExecutable");
-    default:
-        rb_raise(rb_eLoadError, "tcltklib: unknown error(%d) on ruby_open_tcl_dll", ret);
-    }
-
-    /* --------------------------------------------------------------- */
-
-#if defined CREATE_RUBYTK_KIT || defined CREATE_RUBYKIT
-    setup_rubytkkit();
-#endif
-
-    /* --------------------------------------------------------------- */
-
-    /* Tcl stub check */
-    tcl_stubs_check();
-
-    Tcl_ObjType_ByteArray = Tcl_GetObjType(Tcl_ObjTypeName_ByteArray);
-    Tcl_ObjType_String    = Tcl_GetObjType(Tcl_ObjTypeName_String);
-
-    /* --------------------------------------------------------------- */
-
-    (void)call_original_exit;
-}
-
-/* eof */
diff --git a/ext/tk/tkutil/depend b/ext/tk/tkutil/depend
deleted file mode 100644
index fd63e230f0..0000000000
--- a/ext/tk/tkutil/depend
+++ /dev/null
@@ -1 +0,0 @@
-tkutil.o: tkutil.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
diff --git a/ext/tk/tkutil/extconf.rb b/ext/tk/tkutil/extconf.rb
deleted file mode 100644
index 0b3ce03595..0000000000
--- a/ext/tk/tkutil/extconf.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# frozen_string_literal: false
-begin
-  require 'mkmf'
-
-  have_func("rb_obj_instance_exec", "ruby.h")
-  have_func("rb_obj_untrust", "ruby.h")
-  have_func("rb_obj_taint", "ruby.h")
-  have_func("rb_sym2str", "ruby.h")
-  have_func("rb_id2str", "ruby.h")
-  have_func("rb_ary_cat", "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
deleted file mode 100644
index cd1fa2bc8d..0000000000
--- a/ext/tk/tkutil/tkutil.c
+++ /dev/null
@@ -1,1900 +0,0 @@
-/************************************************
-
-  tkutil.c -
-
-  $Author$
-  created at: Fri Nov  3 00:47:54 JST 1995
-
-************************************************/
-
-#define TKUTIL_RELEASE_DATE "2010-03-26"
-
-#include "ruby.h"
-
-#ifdef RUBY_VM
-static int rb_thread_critical; /* dummy */
-#else
-/* On Ruby 1.8.x, use rb_thread_critical (defined at rubysig.h) */
-#include "rubysig.h"
-#endif
-#ifdef HAVE_RUBY_ST_H
-#include "ruby/st.h"
-#else
-#include "st.h"
-#endif
-
-#undef RUBY_UNTYPED_DATA_WARNING
-#define RUBY_UNTYPED_DATA_WARNING 1
-
-#if !defined(RHASH_TBL)
-#define RHASH_TBL(h) (RHASH(h)->tbl)
-#endif
-#if !defined(RSTRING_PTR)
-#define RSTRING_PTR(s) (RSTRING(s)->ptr)
-#define RSTRING_LEN(s) (RSTRING(s)->len)
-#endif
-#if !defined(RARRAY_PTR)
-#define RARRAY_PTR(s) (RARRAY(s)->ptr)
-#define RARRAY_LEN(s) (RARRAY(s)->len)
-#endif
-#if !defined(RARRAY_CONST_PTR)
-#define RARRAY_CONST_PTR(s) (const VALUE *)RARRAY_PTR(s)
-#endif
-#if !defined(RARRAY_AREF)
-#define RARRAY_AREF(a, i) RARRAY_CONST_PTR(a)[i]
-#endif
-
-#if defined(HAVE_STRNDUP) && !defined(_GNU_SOURCE)
-extern char *strndup(const char* _ptr, size_t _len);
-#endif
-
-#ifndef HAVE_RB_SYM2STR
-# define rb_sym2str(obj) rb_id2str(SYM2ID(obj))
-#endif
-
-#ifndef HAVE_RB_ID2STR
-# define rb_id2str(id) rb_str_new2(rb_id2name(id))
-#endif
-
-static VALUE cMethod;
-
-static VALUE cTclTkLib;
-
-static VALUE cTkObject;
-static VALUE cTkCallbackEntry;
-
-static VALUE TK_None;
-
-static VALUE cCB_SUBST;
-static VALUE cSUBST_INFO;
-
-static VALUE ENCODING_NAME_UTF8; /* for saving GC cost */
-
-static ID ID_split_tklist;
-static ID ID_toUTF8;
-static ID ID_fromUTF8;
-static ID ID_path;
-static ID ID_at_path;
-static ID ID_at_enc;
-static ID ID_to_eval;
-static ID ID_to_s;
-static ID ID_source;
-static ID ID_downcase;
-static ID ID_install_cmd;
-static ID ID_merge_tklist;
-static ID ID_encoding;
-static ID ID_encoding_system;
-static ID ID_call;
-
-static ID ID_SUBST_INFO;
-
-static VALUE CALLBACK_TABLE;
-static unsigned long CALLBACK_ID_NUM = 0;
-
-/*************************************/
-
-#ifndef HAVE_STRNDUP
-static char * strndup _((const char *, size_t));
-static char *
-strndup(ptr, len)
-    const char *ptr;
-    size_t len;
-{
-    char *newptr = malloc(len + 1);
-    if (newptr) {
-	memcpy(newptr, ptr, len);
-	newptr[len] = '\0';
-    }
-    return newptr;
-}
-#endif
-
-#ifndef HAVE_RB_ARY_CAT
-static VALUE rb_ary_cat _((VALUE, const VALUE *, long));
-static VALUE
-rb_ary_cat(ary, argv, len)
-    VALUE ary;
-    const VALUE *argv;
-    long len;
-{
-    long i;
-    for (i = 0; i < len; i++) {
-	rb_ary_push(ary, argv[i]);
-    }
-    return ary;
-}
-#endif
-
-/*************************************/
-
-#if defined(HAVE_RB_OBJ_INSTANCE_EXEC) && !defined(RUBY_VM)
-extern VALUE rb_obj_instance_exec _((int, VALUE*, VALUE));
-#endif
-static VALUE
-tk_s_new(argc, argv, klass)
-    int argc;
-    VALUE *argv;
-    VALUE klass;
-{
-    VALUE obj = rb_class_new_instance(argc, argv, klass);
-
-    if (rb_block_given_p()) {
-#ifndef HAVE_RB_OBJ_INSTANCE_EXEC
-      rb_obj_instance_eval(0, 0, obj);
-#else
-      rb_obj_instance_exec(1, &obj, obj);
-#endif
-    }
-    return obj;
-}
-
-/*************************************/
-
-static VALUE
-tkNone_to_s(self)
-    VALUE self;
-{
-    return rb_str_new2("");
-}
-
-static VALUE
-tkNone_inspect(self)
-    VALUE self;
-{
-    return rb_str_new2("None");
-}
-
-/*************************************/
-
-static VALUE
-tk_obj_untrust(self, obj)
-    VALUE self;
-    VALUE obj;
-{
-#ifdef HAVE_RB_OBJ_TAINT
-  rb_obj_taint(obj);
-#endif
-#ifdef HAVE_RB_OBJ_UNTRUST
-  rb_obj_untrust(obj);
-#endif
-
-  return obj;
-}
-
-static VALUE
-tk_eval_cmd(argc, argv, self)
-    int argc;
-    VALUE argv[];
-    VALUE self;
-{
-    VALUE cmd, rest;
-
-    rb_scan_args(argc, argv, "1*", &cmd, &rest);
-    return rb_eval_cmd(cmd, rest, 0);
-}
-
-static VALUE
-tk_do_callback(argc, argv, self)
-    int   argc;
-    VALUE *argv;
-    VALUE self;
-{
-#if 0
-    volatile VALUE id;
-    volatile VALUE rest;
-
-    rb_scan_args(argc, argv, "1*", &id, &rest);
-    return rb_apply(rb_hash_aref(CALLBACK_TABLE, id), ID_call, rest);
-#endif
-    return rb_funcall2(rb_hash_aref(CALLBACK_TABLE, argv[0]),
-                       ID_call, argc - 1, argv + 1);
-}
-
-static const char cmd_id_head[] = "ruby_cmd TkUtil callback ";
-static const char cmd_id_prefix[] = "cmd";
-
-static VALUE
-tk_install_cmd_core(cmd)
-    VALUE cmd;
-{
-    volatile VALUE id_num;
-
-    id_num = ULONG2NUM(CALLBACK_ID_NUM++);
-    id_num = rb_funcallv(id_num, ID_to_s, 0, 0);
-    id_num = rb_str_append(rb_str_new2(cmd_id_prefix), id_num);
-    rb_hash_aset(CALLBACK_TABLE, id_num, cmd);
-    return rb_str_append(rb_str_new2(cmd_id_head), id_num);
-}
-
-static VALUE
-tk_install_cmd(argc, argv, self)
-    int   argc;
-    VALUE *argv;
-    VALUE self;
-{
-    volatile VALUE cmd;
-
-#if 0
-    if (rb_scan_args(argc, argv, "01", &cmd) == 0) {
-        cmd = rb_block_proc();
-    }
-    return tk_install_cmd_core(cmd);
-#endif
-    if (argc == 0) {
-        cmd = rb_block_proc();
-    } else {
-        cmd = argv[0];
-    }
-    return tk_install_cmd_core(cmd);
-}
-
-static VALUE
-tk_uninstall_cmd(self, cmd_id)
-    VALUE self;
-    VALUE cmd_id;
-{
-    size_t head_len = strlen(cmd_id_head);
-    size_t prefix_len = strlen(cmd_id_prefix);
-
-    StringValue(cmd_id);
-    if (strncmp(cmd_id_head, RSTRING_PTR(cmd_id), head_len) != 0) {
-        return Qnil;
-    }
-    if (strncmp(cmd_id_prefix,
-                RSTRING_PTR(cmd_id) + head_len, prefix_len) != 0) {
-        return Qnil;
-    }
-
-    return rb_hash_delete(CALLBACK_TABLE,
-                          rb_str_new2(RSTRING_PTR(cmd_id) + head_len));
-}
-
-static VALUE
-tk_toUTF8(argc, argv, self)
-    int   argc;
-    VALUE *argv;
-    VALUE self;
-{
-    return rb_funcall2(cTclTkLib, ID_toUTF8, argc, argv);
-}
-
-static VALUE
-tk_fromUTF8(argc, argv, self)
-    int   argc;
-    VALUE *argv;
-    VALUE self;
-{
-    return rb_funcall2(cTclTkLib, ID_fromUTF8, argc, argv);
-}
-
-static VALUE
-fromDefaultEnc_toUTF8(str, self)
-    VALUE str;
-    VALUE self;
-{
-    VALUE argv[1];
-
-    argv[0] = str;
-    return tk_toUTF8(1, argv, self);
-}
-
-#if 0
-static VALUE
-fromUTF8_toDefaultEnc(str, self)
-    VALUE str;
-    VALUE self;
-{
-    VALUE argv[1];
-
-    argv[0] = str;
-    return tk_fromUTF8(1, argv, self);
-}
-#endif
-
-static int
-to_strkey(key, value, hash)
-    VALUE key;
-    VALUE value;
-    VALUE hash;
-{
-    rb_hash_aset(hash, rb_funcallv(key, ID_to_s, 0, 0), value);
-    return ST_CHECK;
-}
-
-static VALUE
-tk_symbolkey2str(self, keys)
-    VALUE self;
-    VALUE keys;
-{
-    volatile VALUE new_keys = rb_hash_new();
-
-    if (NIL_P(keys)) return new_keys;
-    keys = rb_convert_type(keys, T_HASH, "Hash", "to_hash");
-    st_foreach_check(RHASH_TBL(keys), to_strkey, new_keys, Qundef);
-    return new_keys;
-}
-
-static VALUE get_eval_string_core _((VALUE, VALUE, VALUE));
-static VALUE ary2list _((VALUE, VALUE, VALUE));
-static VALUE ary2list2 _((VALUE, VALUE, VALUE));
-static VALUE hash2list _((VALUE, VALUE));
-static VALUE hash2list_enc _((VALUE, VALUE));
-static VALUE hash2kv _((VALUE, VALUE, VALUE));
-static VALUE hash2kv_enc _((VALUE, VALUE, VALUE));
-
-static VALUE
-ary2list(ary, enc_flag, self)
-    VALUE ary;
-    VALUE enc_flag;
-    VALUE self;
-{
-    long idx, idx2, size, size2;
-    int req_chk_flag;
-    volatile VALUE val, val2, str_val;
-    volatile VALUE dst;
-    volatile VALUE sys_enc, dst_enc, str_enc;
-
-    sys_enc = rb_funcallv(cTclTkLib, ID_encoding, 0, 0);
-    if (NIL_P(sys_enc)) {
-      sys_enc = rb_funcallv(cTclTkLib, ID_encoding_system, 0, 0);
-      sys_enc = rb_funcallv(sys_enc, ID_to_s, 0, 0);
-    }
-
-    if (NIL_P(enc_flag)) {
-        dst_enc = sys_enc;
-        req_chk_flag = 1;
-    } else if (enc_flag == Qtrue || enc_flag == Qfalse) {
-        dst_enc = enc_flag;
-        req_chk_flag = 0;
-    } else {
-        dst_enc = rb_funcallv(enc_flag, ID_to_s, 0, 0);
-        req_chk_flag = 0;
-    }
-
-    /* size = RARRAY_LEN(ary); */
-    size = 0;
-    for(idx = 0; idx < RARRAY_LEN(ary); idx++) {
-        if (RB_TYPE_P(RARRAY_AREF(ary, idx), T_HASH)) {
-            size += 2 * RHASH_SIZE(RARRAY_AREF(ary, idx));
-        } else {
-            size++;
-        }
-    }
-
-    dst = rb_ary_new2(size);
-    for(idx = 0; idx < RARRAY_LEN(ary); idx++) {
-        val = RARRAY_AREF(ary, idx);
-        str_val = Qnil;
-        switch(TYPE(val)) {
-        case T_ARRAY:
-            str_val = ary2list(val, enc_flag, self);
-            rb_ary_push(dst, str_val);
-
-            if (req_chk_flag) {
-                str_enc = rb_ivar_get(str_val, ID_at_enc);
-                if (!NIL_P(str_enc)) {
-                    str_enc = rb_funcallv(str_enc, ID_to_s, 0, 0);
-                } else {
-                    str_enc = sys_enc;
-                }
-                if (!rb_str_cmp(str_enc, dst_enc)) {
-                    dst_enc = Qtrue;
-                    req_chk_flag = 0;
-                }
-            }
-
-            break;
-
-        case T_HASH:
-	    /* rb_ary_push(dst, hash2list(val, self)); */
-            if (RTEST(enc_flag)) {
-                val = hash2kv_enc(val, Qnil, self);
-            } else {
-                val = hash2kv(val, Qnil, self);
-            }
-            size2 = RARRAY_LEN(val);
-            for(idx2 = 0; idx2 < size2; idx2++) {
-                val2 = RARRAY_AREF(val, idx2);
-                switch(TYPE(val2)) {
-                case T_ARRAY:
-                    str_val = ary2list(val2, enc_flag, self);
-                    rb_ary_push(dst, str_val);
-                    break;
-
-                case T_HASH:
-                    if (RTEST(enc_flag)) {
-                        str_val = hash2list_enc(val2, self);
-                    } else {
-                        str_val = hash2list(val2, self);
-                    }
-                    rb_ary_push(dst, str_val);
-                    break;
-
-                default:
-                    if (val2 != TK_None) {
-                        str_val = get_eval_string_core(val2, enc_flag, self);
-                        rb_ary_push(dst, str_val);
-                    }
-                }
-
-                if (req_chk_flag) {
-                    str_enc = rb_ivar_get(str_val, ID_at_enc);
-                    if (!NIL_P(str_enc)) {
-                        str_enc = rb_funcallv(str_enc, ID_to_s, 0, 0);
-                    } else {
-                        str_enc = sys_enc;
-                    }
-                    if (!rb_str_cmp(str_enc, dst_enc)) {
-                        dst_enc = Qtrue;
-                        req_chk_flag = 0;
-                    }
-                }
-            }
-            break;
-
-        default:
-            if (val != TK_None) {
-                str_val = get_eval_string_core(val, enc_flag, self);
-                rb_ary_push(dst, str_val);
-
-                if (req_chk_flag) {
-                    str_enc = rb_ivar_get(str_val, ID_at_enc);
-                    if (!NIL_P(str_enc)) {
-                        str_enc = rb_funcallv(str_enc, ID_to_s, 0, 0);
-                    } else {
-                        str_enc = sys_enc;
-                    }
-                    if (!rb_str_cmp(str_enc, dst_enc)) {
-                        dst_enc = Qtrue;
-                        req_chk_flag = 0;
-                    }
-                }
-            }
-        }
-    }
-
-    if (RTEST(dst_enc) && !NIL_P(sys_enc)) {
-        for(idx = 0; idx < RARRAY_LEN(dst); idx++) {
-            str_val = RARRAY_AREF(dst, idx);
-            if (rb_obj_respond_to(self, ID_toUTF8, Qtrue)) {
-                str_val = rb_funcall(self, ID_toUTF8, 1, str_val);
-            } else {
-                str_val = rb_funcall(cTclTkLib, ID_toUTF8, 1, str_val);
-            }
-            RARRAY_ASET(dst, idx, str_val);
-        }
-        val = rb_apply(cTclTkLib, ID_merge_tklist, dst);
-        if (RB_TYPE_P(dst_enc, T_STRING)) {
-            val = rb_funcall(cTclTkLib, ID_fromUTF8, 2, val, dst_enc);
-            rb_ivar_set(val, ID_at_enc, dst_enc);
-        } else {
-            rb_ivar_set(val, ID_at_enc, ENCODING_NAME_UTF8);
-        }
-        return val;
-    } else {
-        return rb_apply(cTclTkLib, ID_merge_tklist, dst);
-    }
-}
-
-static VALUE
-ary2list2(ary, enc_flag, self)
-    VALUE ary;
-    VALUE enc_flag;
-    VALUE self;
-{
-    long idx, size;
-    int req_chk_flag;
-    volatile VALUE val, str_val;
-    volatile VALUE dst;
-    volatile VALUE sys_enc, dst_enc, str_enc;
-
-    sys_enc = rb_funcallv(cTclTkLib, ID_encoding, 0, 0);
-    if (NIL_P(sys_enc)) {
-      sys_enc = rb_funcallv(cTclTkLib, ID_encoding_system, 0, 0);
-      sys_enc = rb_funcallv(sys_enc, ID_to_s, 0, 0);
-    }
-
-    if (NIL_P(enc_flag)) {
-        dst_enc = sys_enc;
-        req_chk_flag = 1;
-    } else if (enc_flag == Qtrue || enc_flag == Qfalse) {
-        dst_enc = enc_flag;
-        req_chk_flag = 0;
-    } else {
-        dst_enc = rb_funcallv(enc_flag, ID_to_s, 0, 0);
-        req_chk_flag = 0;
-    }
-
-    size = RARRAY_LEN(ary);
-    dst = rb_ary_new2(size);
-    for(idx = 0; idx < RARRAY_LEN(ary); idx++) {
-        val = RARRAY_AREF(ary, idx);
-        str_val = Qnil;
-        switch(TYPE(val)) {
-        case T_ARRAY:
-            str_val = ary2list(val, enc_flag, self);
-            break;
-
-        case T_HASH:
-            if (RTEST(enc_flag)) {
-                str_val = hash2list(val, self);
-            } else {
-                str_val = hash2list_enc(val, self);
-            }
-            break;
-
-        default:
-            if (val != TK_None) {
-                str_val = get_eval_string_core(val, enc_flag, self);
-            }
-        }
-
-        if (!NIL_P(str_val)) {
-            rb_ary_push(dst, str_val);
-
-            if (req_chk_flag) {
-                str_enc = rb_ivar_get(str_val, ID_at_enc);
-                if (!NIL_P(str_enc)) {
-                    str_enc = rb_funcallv(str_enc, ID_to_s, 0, 0);
-                } else {
-                    str_enc = sys_enc;
-                }
-                if (!rb_str_cmp(str_enc, dst_enc)) {
-                    dst_enc = Qtrue;
-                    req_chk_flag = 0;
-                }
-            }
-        }
-    }
-
-    if (RTEST(dst_enc) && !NIL_P(sys_enc)) {
-        for(idx = 0; idx < RARRAY_LEN(dst); idx++) {
-            str_val = RARRAY_AREF(dst, idx);
-            if (rb_obj_respond_to(self, ID_toUTF8, Qtrue)) {
-                str_val = rb_funcall(self, ID_toUTF8, 1, str_val);
-            } else {
-                str_val = rb_funcall(cTclTkLib, ID_toUTF8, 1, str_val);
-            }
-            RARRAY_ASET(dst, idx, str_val);
-        }
-        val = rb_apply(cTclTkLib, ID_merge_tklist, dst);
-        if (RB_TYPE_P(dst_enc, T_STRING)) {
-            val = rb_funcall(cTclTkLib, ID_fromUTF8, 2, val, dst_enc);
-            rb_ivar_set(val, ID_at_enc, dst_enc);
-        } else {
-            rb_ivar_set(val, ID_at_enc, ENCODING_NAME_UTF8);
-        }
-        return val;
-    } else {
-        return rb_apply(cTclTkLib, ID_merge_tklist, dst);
-    }
-}
-
-static VALUE
-key2keyname(key)
-    VALUE key;
-{
-    return rb_str_append(rb_str_new2("-"), rb_funcallv(key, ID_to_s, 0, 0));
-}
-
-static VALUE
-assoc2kv(assoc, ary, self)
-    VALUE assoc;
-    VALUE ary;
-    VALUE self;
-{
-    long i, len;
-    volatile VALUE pair;
-    volatile VALUE val;
-    volatile VALUE dst = rb_ary_new2(2 * RARRAY_LEN(assoc));
-
-    len = RARRAY_LEN(assoc);
-
-    for(i = 0; i < len; i++) {
-        pair = RARRAY_AREF(assoc, i);
-        if (!RB_TYPE_P(pair, T_ARRAY)) {
-            rb_ary_push(dst, key2keyname(pair));
-            continue;
-        }
-        switch(RARRAY_LEN(assoc)) {
-        case 2:
-            rb_ary_push(dst, RARRAY_AREF(pair, 2));
-
-        case 1:
-            rb_ary_push(dst, key2keyname(RARRAY_AREF(pair, 0)));
-
-        case 0:
-            continue;
-
-        default:
-            rb_ary_push(dst, key2keyname(RARRAY_AREF(pair, 0)));
-
-            val = rb_ary_new2(RARRAY_LEN(pair) - 1);
-            rb_ary_cat(val, RARRAY_CONST_PTR(pair) + 1, RARRAY_LEN(pair) - 1);
-
-            rb_ary_push(dst, val);
-        }
-    }
-
-    if (NIL_P(ary)) {
-        return dst;
-    } else {
-        return rb_ary_plus(ary, dst);
-    }
-}
-
-static VALUE
-assoc2kv_enc(assoc, ary, self)
-    VALUE assoc;
-    VALUE ary;
-    VALUE self;
-{
-    long i, len;
-    volatile VALUE pair;
-    volatile VALUE val;
-    volatile VALUE dst = rb_ary_new2(2 * RARRAY_LEN(assoc));
-
-    len = RARRAY_LEN(assoc);
-
-    for(i = 0; i < len; i++) {
-        pair = RARRAY_AREF(assoc, i);
-        if (!RB_TYPE_P(pair, T_ARRAY)) {
-            rb_ary_push(dst, key2keyname(pair));
-            continue;
-        }
-        switch(RARRAY_LEN(assoc)) {
-        case 2:
-            rb_ary_push(dst, get_eval_string_core(RARRAY_AREF(pair, 2), Qtrue, self));
-
-        case 1:
-            rb_ary_push(dst, key2keyname(RARRAY_AREF(pair, 0)));
-
-        case 0:
-            continue;
-
-        default:
-            rb_ary_push(dst, key2keyname(RARRAY_AREF(pair, 0)));
-
-            val = rb_ary_new2(RARRAY_LEN(pair) - 1);
-            rb_ary_cat(val, RARRAY_CONST_PTR(pair) + 1, RARRAY_LEN(pair) - 1);
-
-            rb_ary_push(dst, get_eval_string_core(val, Qtrue, self));
-        }
-    }
-
-    if (NIL_P(ary)) {
-        return dst;
-    } else {
-        return rb_ary_plus(ary, dst);
-    }
-}
-
-static int
-push_kv(key, val, args)
-    VALUE key;
-    VALUE val;
-    VALUE args;
-{
-    volatile VALUE ary;
-
-    ary = RARRAY_AREF(args, 0);
-
-#if 0
-    rb_ary_push(ary, key2keyname(key));
-    if (val != TK_None) rb_ary_push(ary, val);
-#endif
-    rb_ary_push(ary, key2keyname(key));
-
-    if (val == TK_None) return ST_CHECK;
-
-    rb_ary_push(ary, get_eval_string_core(val, Qnil, RARRAY_AREF(args, 1)));
-
-    return ST_CHECK;
-}
-
-static VALUE
-hash2kv(hash, ary, self)
-    VALUE hash;
-    VALUE ary;
-    VALUE self;
-{
-    volatile VALUE dst = rb_ary_new2(2 * RHASH_SIZE(hash));
-    volatile VALUE args = rb_ary_new3(2, dst, self);
-
-    st_foreach_check(RHASH_TBL(hash), push_kv, args, Qundef);
-
-    if (NIL_P(ary)) {
-        return dst;
-    } else {
-        return rb_ary_concat(ary, dst);
-    }
-}
-
-static int
-push_kv_enc(key, val, args)
-    VALUE key;
-    VALUE val;
-    VALUE args;
-{
-    volatile VALUE ary;
-
-    ary = RARRAY_AREF(args, 0);
-
-#if 0
-    rb_ary_push(ary, key2keyname(key));
-    if (val != TK_None) {
-        rb_ary_push(ary, get_eval_string_core(val, Qtrue,
-                                              RARRAY_AREF(args, 1)));
-    }
-#endif
-    rb_ary_push(ary, key2keyname(key));
-
-    if (val == TK_None) return ST_CHECK;
-
-    rb_ary_push(ary, get_eval_string_core(val, Qtrue, RARRAY_AREF(args, 1)));
-
-    return ST_CHECK;
-}
-
-static VALUE
-hash2kv_enc(hash, ary, self)
-    VALUE hash;
-    VALUE ary;
-    VALUE self;
-{
-    volatile VALUE dst = rb_ary_new2(2 * RHASH_SIZE(hash));
-    volatile VALUE args = rb_ary_new3(2, dst, self);
-
-    st_foreach_check(RHASH_TBL(hash), push_kv_enc, args, Qundef);
-
-    if (NIL_P(ary)) {
-        return dst;
-    } else {
-        return rb_ary_concat(ary, dst);
-    }
-}
-
-static VALUE
-hash2list(hash, self)
-    VALUE hash;
-    VALUE self;
-{
-    return ary2list2(hash2kv(hash, Qnil, self), Qfalse, self);
-}
-
-
-static VALUE
-hash2list_enc(hash, self)
-    VALUE hash;
-    VALUE self;
-{
-    return ary2list2(hash2kv_enc(hash, Qnil, self), Qfalse, self);
-}
-
-static VALUE
-tk_hash_kv(argc, argv, self)
-    int   argc;
-    VALUE *argv;
-    VALUE self;
-{
-    volatile VALUE hash, enc_flag, ary;
-
-    ary = Qnil;
-    enc_flag = Qnil;
-    switch(argc) {
-    case 3:
-        ary = argv[2];
-	if (!NIL_P(ary)) Check_Type(ary, T_ARRAY);
-    case 2:
-        enc_flag = argv[1];
-    case 1:
-        hash = argv[0];
-        break;
-    case 0:
-        rb_raise(rb_eArgError, "too few arguments");
-    default: /* >= 3 */
-        rb_raise(rb_eArgError, "too many arguments");
-    }
-
-    switch(TYPE(hash)) {
-    case T_ARRAY:
-        if (RTEST(enc_flag)) {
-            return assoc2kv_enc(hash, ary, self);
-        } else {
-            return assoc2kv(hash, ary, self);
-        }
-
-    case T_HASH:
-        if (RTEST(enc_flag)) {
-            return hash2kv_enc(hash, ary, self);
-        } else {
-            return hash2kv(hash, ary, self);
-        }
-
-    case T_NIL:
-        if (NIL_P(ary)) {
-            return rb_ary_new();
-        } else {
-            return ary;
-        }
-
-    default:
-        if (hash == TK_None) {
-            if (NIL_P(ary)) {
-                return rb_ary_new();
-            } else {
-                return ary;
-            }
-        }
-        rb_raise(rb_eArgError, "Hash is expected for 1st argument");
-    }
-
-    UNREACHABLE;
-}
-
-static VALUE
-get_eval_string_core(obj, enc_flag, self)
-    VALUE obj;
-    VALUE enc_flag;
-    VALUE self;
-{
-    switch(TYPE(obj)) {
-    case T_FLOAT:
-    case T_FIXNUM:
-    case T_BIGNUM:
-        return rb_funcallv(obj, ID_to_s, 0, 0);
-
-    case T_STRING:
-        if (RTEST(enc_flag)) {
-            if (rb_obj_respond_to(self, ID_toUTF8, Qtrue)) {
-                return rb_funcall(self, ID_toUTF8, 1, obj);
-            } else {
-                return fromDefaultEnc_toUTF8(obj, self);
-            }
-        } else {
-            return obj;
-        }
-
-    case T_SYMBOL:
-        if (RTEST(enc_flag)) {
-            if (rb_obj_respond_to(self, ID_toUTF8, Qtrue)) {
-                return rb_funcall(self, ID_toUTF8, 1,
-                                  rb_str_dup(rb_sym2str(obj)));
-            } else {
-                return fromDefaultEnc_toUTF8(rb_sym2str(obj), self);
-            }
-        } else {
-            return rb_sym2str(obj);
-        }
-
-    case T_HASH:
-        if (RTEST(enc_flag)) {
-            return hash2list_enc(obj, self);
-        } else {
-            return hash2list(obj, self);
-        }
-
-    case T_ARRAY:
-        return ary2list(obj, enc_flag, self);
-
-    case T_FALSE:
-        return rb_str_new2("0");
-
-    case T_TRUE:
-        return rb_str_new2("1");
-
-    case T_NIL:
-        return rb_str_new2("");
-
-    case T_REGEXP:
-        return rb_funcallv(obj, ID_source, 0, 0);
-
-    default:
-        if (rb_obj_is_kind_of(obj, cTkObject)) {
-            /* return rb_str_new3(rb_funcallv(obj, ID_path, 0, 0)); */
-            return get_eval_string_core(rb_funcallv(obj, ID_path, 0, 0),
-                                        enc_flag, self);
-        }
-
-        if (rb_obj_is_kind_of(obj, rb_cProc)
-            || rb_obj_is_kind_of(obj, cMethod)
-            || rb_obj_is_kind_of(obj, cTkCallbackEntry)) {
-            if (rb_obj_respond_to(self, ID_install_cmd, Qtrue)) {
-                return rb_funcall(self, ID_install_cmd, 1, obj);
-            } else {
-                return tk_install_cmd_core(obj);
-            }
-        }
-
-        if (obj == TK_None)  return Qnil;
-
-        if (rb_obj_respond_to(obj, ID_to_eval, Qtrue)) {
-            /* return rb_funcallv(obj, ID_to_eval, 0, 0); */
-            return get_eval_string_core(rb_funcallv(obj, ID_to_eval, 0, 0),
-                                        enc_flag, self);
-        } else if (rb_obj_respond_to(obj, ID_path, Qtrue)) {
-            /* return rb_funcallv(obj, ID_path, 0, 0); */
-            return get_eval_string_core(rb_funcallv(obj, ID_path, 0, 0),
-                                        enc_flag, self);
-        } else if (rb_obj_respond_to(obj, ID_to_s, Qtrue)) {
-            return rb_funcallv(obj, ID_to_s, 0, 0);
-        }
-    }
-
-    rb_warning("fail to convert '%+"PRIsVALUE"' to string for Tk", obj);
-
-    return obj;
-}
-
-static VALUE
-tk_get_eval_string(argc, argv, self)
-    int   argc;
-    VALUE *argv;
-    VALUE self;
-{
-    VALUE obj, enc_flag;
-
-    if (rb_scan_args(argc, argv, "11", &obj, &enc_flag) == 1) {
-        enc_flag = Qnil;
-    }
-
-    return get_eval_string_core(obj, enc_flag, self);
-}
-
-static VALUE
-tk_get_eval_enc_str(self, obj)
-    VALUE self;
-    VALUE obj;
-{
-    if (obj == TK_None) {
-        return obj;
-    } else {
-        return get_eval_string_core(obj, Qtrue, self);
-    }
-}
-
-static VALUE
-tk_conv_args(argc, argv, self)
-    int   argc;
-    VALUE *argv; /* [0]:base_array, [1]:enc_mode, [2]..[n]:args */
-    VALUE self;
-{
-    int idx;
-    long size;
-    volatile VALUE dst;
-    int thr_crit_bup;
-    VALUE old_gc;
-
-    if (argc < 2) {
-      rb_raise(rb_eArgError, "too few arguments");
-    }
-
-    thr_crit_bup = rb_thread_critical;
-    rb_thread_critical = Qtrue;
-    old_gc = rb_gc_disable();
-
-    for(size = 0, idx = 2; idx < argc; idx++) {
-        if (RB_TYPE_P(argv[idx], T_HASH)) {
-            size += 2 * RHASH_SIZE(argv[idx]);
-        } else {
-            size++;
-        }
-    }
-    /* dst = rb_ary_new2(argc - 2); */
-    dst = rb_ary_new2(size);
-    for(idx = 2; idx < argc; idx++) {
-        if (RB_TYPE_P(argv[idx], T_HASH)) {
-            if (RTEST(argv[1])) {
-                hash2kv_enc(argv[idx], dst, self);
-            } else {
-                hash2kv(argv[idx], dst, self);
-            }
-        } else if (argv[idx] != TK_None) {
-            rb_ary_push(dst, get_eval_string_core(argv[idx], argv[1], self));
-        }
-    }
-
-    if (old_gc == Qfalse) rb_gc_enable();
-    rb_thread_critical = thr_crit_bup;
-
-    return rb_ary_plus(argv[0], dst);
-}
-
-
-/*************************************/
-
-static VALUE
-tcl2rb_bool(self, value)
-    VALUE self;
-    VALUE value;
-{
-    if (RB_TYPE_P(value, T_FIXNUM)) {
-        if (NUM2INT(value) == 0) {
-            return Qfalse;
-        } else {
-            return Qtrue;
-        }
-    }
-
-    if (value == Qtrue || value == Qfalse) {
-        return value;
-    }
-
-    rb_check_type(value, T_STRING);
-
-    value = rb_funcall(value, ID_downcase, 0);
-
-    if (RSTRING_PTR(value) == (char*)NULL) return Qnil;
-
-    if (RSTRING_PTR(value)[0] == '\0'
-        || strcmp(RSTRING_PTR(value), "0") == 0
-        || strcmp(RSTRING_PTR(value), "no") == 0
-        || strcmp(RSTRING_PTR(value), "off") == 0
-        || strcmp(RSTRING_PTR(value), "false") == 0) {
-        return Qfalse;
-    } else {
-        return Qtrue;
-    }
-}
-
-#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)
-    VALUE value;
-{
-    return rb_cstr_to_inum(RSTRING_PTR(value), 0, 1);
-}
-
-static VALUE
-tkstr_to_float(value)
-    VALUE value;
-{
-    return rb_float_new(rb_cstr_to_dbl(RSTRING_PTR(value), 1));
-}
-
-static VALUE
-tkstr_invalid_numstr(value)
-    VALUE value;
-{
-    rb_raise(rb_eArgError,
-             "invalid value for Number: '%s'", RSTRING_PTR(value));
-    return Qnil; /*dummy*/
-}
-
-static VALUE
-tkstr_rescue_float(value)
-    VALUE value;
-{
-    return rb_rescue2(tkstr_to_float, value,
-                      tkstr_invalid_numstr, value,
-                      rb_eArgError, 0);
-}
-
-static VALUE
-tkstr_to_number(value)
-    VALUE value;
-{
-    rb_check_type(value, T_STRING);
-
-    if (RSTRING_PTR(value) == (char*)NULL) return INT2FIX(0);
-
-    return rb_rescue2(tkstr_to_int, value,
-                      tkstr_rescue_float, value,
-                      rb_eArgError, 0);
-}
-
-static VALUE
-tcl2rb_number(self, value)
-    VALUE self;
-    VALUE value;
-{
-    return tkstr_to_number(value);
-}
-
-static VALUE
-tkstr_to_str(value)
-    VALUE value;
-{
-    char * ptr;
-    long len;
-
-    ptr = RSTRING_PTR(value);
-    len = RSTRING_LEN(value);
-
-    if (len > 1 && *ptr == '{' && *(ptr + len - 1) == '}') {
-        return rb_str_new(ptr + 1, len - 2);
-    }
-    return value;
-}
-
-static VALUE
-tcl2rb_string(self, value)
-    VALUE self;
-    VALUE value;
-{
-    rb_check_type(value, T_STRING);
-
-    if (RSTRING_PTR(value) == (char*)NULL) return rb_tainted_str_new2("");
-
-    return tkstr_to_str(value);
-}
-
-static VALUE
-tcl2rb_num_or_str(self, value)
-    VALUE self;
-    VALUE value;
-{
-    rb_check_type(value, T_STRING);
-
-    if (RSTRING_PTR(value) == (char*)NULL) return rb_tainted_str_new2("");
-
-    return rb_rescue2(tkstr_to_number, value,
-                      tkstr_to_str, value,
-                      rb_eArgError, 0);
-}
-
-static VALUE
-tcl2rb_num_or_nil(self, value)
-    VALUE self;
-    VALUE value;
-{
-    rb_check_type(value, T_STRING);
-
-    if (RSTRING_LEN(value) == 0) return Qnil;
-
-    return tkstr_to_number(value);
-}
-
-
-/*************************************/
-
-#define CBSUBST_TBL_MAX (256)
-struct cbsubst_info {
-    long  full_subst_length;
-    long  keylen[CBSUBST_TBL_MAX];
-    char  *key[CBSUBST_TBL_MAX];
-    char  type[CBSUBST_TBL_MAX];
-    ID    ivar[CBSUBST_TBL_MAX];
-    VALUE proc;
-    VALUE aliases;
-};
-
-static void
-subst_mark(ptr)
-    struct cbsubst_info *ptr;
-{
-    rb_gc_mark(ptr->proc);
-    rb_gc_mark(ptr->aliases);
-}
-
-static void
-subst_free(ptr)
-    struct cbsubst_info *ptr;
-{
-    int i;
-
-    if (ptr) {
-      for(i = 0; i < CBSUBST_TBL_MAX; i++) {
-	if (ptr->key[i] != NULL) {
-	  free(ptr->key[i]); /* allocated by malloc */
-	  ptr->key[i] = NULL;
-	}
-      }
-      xfree(ptr); /* allocated by ALLOC */
-    }
-}
-
-static size_t
-subst_memsize(ptr)
-    const struct cbsubst_info *ptr;
-{
-    return sizeof(*ptr);
-}
-
-static const rb_data_type_t cbsubst_info_type = {
-    "TkUtil/CallbackSubst/Info",
-    {
-	subst_mark,
-	subst_free,
-	subst_memsize,
-    },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
-static VALUE
-allocate_cbsubst_info(struct cbsubst_info **inf_ptr)
-{
-  struct cbsubst_info *inf;
-  volatile VALUE proc, aliases;
-  int idx;
-
-  VALUE info = TypedData_Make_Struct(cSUBST_INFO, struct cbsubst_info,
-				     &cbsubst_info_type, inf);
-
-  inf->full_subst_length = 0;
-
-  for(idx = 0; idx < CBSUBST_TBL_MAX; idx++) {
-    inf->keylen[idx] = 0;
-    inf->key[idx]    = NULL;
-    inf->type[idx]   = '\0';
-    inf->ivar[idx]   = (ID) 0;
-  }
-
-  proc = rb_hash_new();
-  inf->proc = proc;
-
-  aliases = rb_hash_new();
-  inf->aliases = aliases;
-
-  if (inf_ptr != (struct cbsubst_info **)NULL) *inf_ptr = inf;
-
-  return info;
-}
-
-static void
-cbsubst_init(void)
-{
-  rb_const_set(cCB_SUBST, ID_SUBST_INFO,
-	       allocate_cbsubst_info((struct cbsubst_info **)NULL));
-}
-
-static struct cbsubst_info *
-cbsubst_get_ptr(klass)
-    VALUE klass;
-{
-    return rb_check_typeddata(rb_const_get(klass, ID_SUBST_INFO), &cbsubst_info_type);
-}
-
-static VALUE
-cbsubst_initialize(argc, argv, self)
-    int   argc;
-    VALUE *argv;
-    VALUE self;
-{
-    struct cbsubst_info *inf;
-    int idx, iv_idx;
-
-    inf = cbsubst_get_ptr(rb_obj_class(self));
-
-    if (argc > 0) {
-	idx = 0;
-	for (iv_idx = 0; iv_idx < CBSUBST_TBL_MAX; iv_idx++) {
-	    if (inf->ivar[iv_idx] == (ID)0) continue;
-	    rb_ivar_set(self, inf->ivar[iv_idx], argv[idx++]);
-	    if (idx >= argc) break;
-	}
-    }
-
-    return self;
-}
-
-static VALUE
-cbsubst_ret_val(self, val)
-    VALUE self;
-    VALUE val;
-{
-    /* This method may be overwritten on some sub-classes.                  */
-    /* This method is used for converting from ruby's callback-return-value */
-    /* to tcl's value (e.g. validation procedure of entry widget).          */
-    return val;
-}
-
-static int
-each_attr_def(key, value, klass)
-    VALUE key, value, klass;
-{
-    ID key_id, value_id;
-
-    if (key == Qundef) return ST_CONTINUE;
-
-    switch(TYPE(key)) {
-    case T_STRING:
-        key_id = rb_intern_str(key);
-        break;
-    case T_SYMBOL:
-        key_id = SYM2ID(key);
-        break;
-    default:
-        rb_raise(rb_eArgError,
-                 "includes invalid key(s). expected a String or a Symbol");
-    }
-
-    switch(TYPE(value)) {
-    case T_STRING:
-        value_id = rb_intern_str(value);
-        break;
-    case T_SYMBOL:
-        value_id = SYM2ID(value);
-        break;
-    default:
-        rb_raise(rb_eArgError,
-                 "includes invalid value(s). expected a String or a Symbol");
-    }
-
-    rb_alias(klass, key_id, value_id);
-
-    return ST_CONTINUE;
-}
-
-static VALUE
-cbsubst_def_attr_aliases(self, tbl)
-    VALUE self;
-    VALUE tbl;
-{
-    struct cbsubst_info *inf;
-
-    if (!RB_TYPE_P(tbl, T_HASH)) {
-        rb_raise(rb_eArgError, "expected a Hash");
-    }
-
-    inf = cbsubst_get_ptr(self);
-
-    rb_hash_foreach(tbl, each_attr_def, self);
-
-    return rb_funcall(inf->aliases, rb_intern("update"), 1, tbl);
-}
-
-static VALUE
-cbsubst_append_inf_key(str, inf, idx)
-    VALUE str;
-    const struct cbsubst_info *inf;
-    int idx;
-{
-    const long len = inf->keylen[idx];
-    const long olen = RSTRING_LEN(str);
-    char *buf, *ptr;
-
-    rb_str_modify_expand(str, (len ? len : 1) + 2);
-    buf = RSTRING_PTR(str);
-    ptr = buf + olen;
-
-    *(ptr++) = '%';
-
-    if (len != 0) {
-	/* longname */
-	strncpy(ptr, inf->key[idx], len);
-	ptr += len;
-    }
-    else {
-	/* single char */
-	*(ptr++) = (unsigned char)idx;
-    }
-
-    *(ptr++) = ' ';
-
-    rb_str_set_len(str, ptr - buf);
-
-    return str;
-}
-
-static VALUE
-cbsubst_sym_to_subst(self, sym)
-    VALUE self;
-    VALUE sym;
-{
-    struct cbsubst_info *inf;
-    VALUE str;
-    int idx;
-    ID id;
-    volatile VALUE ret;
-
-    if (!RB_TYPE_P(sym, T_SYMBOL)) return sym;
-
-    inf = cbsubst_get_ptr(self);
-
-    if (!NIL_P(ret = rb_hash_aref(inf->aliases, sym))) {
-	str = rb_sym2str(ret);
-    } else {
-	str = rb_sym2str(sym);
-    }
-
-    id = rb_intern_str(rb_sprintf("@%"PRIsVALUE, str));
-
-    for(idx = 0; idx < CBSUBST_TBL_MAX; idx++) {
-      if (inf->ivar[idx] == id) break;
-    }
-    if (idx >= CBSUBST_TBL_MAX)  return sym;
-
-    return cbsubst_append_inf_key(rb_str_new(0, 0), inf, idx);
-}
-
-static VALUE
-cbsubst_get_subst_arg(argc, argv, self)
-    int   argc;
-    VALUE *argv;
-    VALUE self;
-{
-    struct cbsubst_info *inf;
-    VALUE str;
-    int i, idx;
-    ID id;
-    VALUE arg_sym, ret, result;
-
-    inf = cbsubst_get_ptr(self);
-
-    result = rb_str_new(0, 0);
-    for(i = 0; i < argc; i++) {
-        switch(TYPE(argv[i])) {
-        case T_STRING:
-            str = argv[i];
-            arg_sym = rb_check_symbol(&str);
-            if (NIL_P(arg_sym)) goto not_found;
-            break;
-        case T_SYMBOL:
-            arg_sym = argv[i];
-            str = rb_sym2str(arg_sym);
-            break;
-        default:
-            rb_raise(rb_eArgError, "arg #%d is not a String or a Symbol", i);
-        }
-
-        if (!NIL_P(ret = rb_hash_aref(inf->aliases, arg_sym))) {
-            str = rb_sym2str(ret);
-        }
-
-	ret = rb_sprintf("@%"PRIsVALUE, str);
-	id = rb_check_id(&ret);
-	if (!id) goto not_found;
-
-	for(idx = 0; idx < CBSUBST_TBL_MAX; idx++) {
-	  if (inf->ivar[idx] == id) break;
-	}
-        if (idx >= CBSUBST_TBL_MAX) {
-	  not_found:
-            rb_raise(rb_eArgError, "cannot find attribute :%"PRIsVALUE, str);
-        }
-
-	result = cbsubst_append_inf_key(result, inf, idx);
-    }
-
-    return result;
-}
-
-static VALUE
-cbsubst_get_subst_key(self, str)
-    VALUE self;
-    VALUE str;
-{
-    struct cbsubst_info *inf;
-    VALUE list;
-    VALUE ret;
-    long i, len, keylen;
-    int idx;
-    char *buf, *ptr;
-
-    list = rb_funcall(cTclTkLib, ID_split_tklist, 1, str);
-    Check_Type(list, T_ARRAY);
-    len = RARRAY_LEN(list);
-
-    inf = cbsubst_get_ptr(self);
-
-    ret = rb_str_new(0, len);
-    ptr = buf = RSTRING_PTR(ret);
-
-    for(i = 0; i < len; i++) {
-      VALUE keyval = RARRAY_AREF(list, i);
-      const char *key = (Check_Type(keyval, T_STRING), StringValueCStr(keyval));
-      if (*key == '%') {
-	if (*(key + 2) == '\0') {
-	  /* single char */
-	  *(ptr++) = *(key + 1);
-	} else {
-	  /* search longname-key */
-	  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 (strncmp(inf->key[idx], key + 1, keylen)) continue;
-	    break;
-	  }
-	  if (idx < CBSUBST_TBL_MAX) {
-	    *(ptr++) = (unsigned char)idx;
-	  } else {
-	    *(ptr++) = ' ';
-	  }
-	}
-      } else {
-	*(ptr++) = ' ';
-      }
-    }
-
-    rb_str_set_len(ret, ptr - buf);
-    return ret;
-}
-
-static VALUE
-cbsubst_get_all_subst_keys(self)
-    VALUE self;
-{
-    struct cbsubst_info *inf;
-    char *keys_buf, *keys_ptr;
-    int idx;
-    VALUE str, keys_str;
-
-    inf = cbsubst_get_ptr(self);
-
-    str = rb_str_new(0, 0);
-    keys_str = rb_str_new(0, CBSUBST_TBL_MAX);
-    keys_ptr = keys_buf = RSTRING_PTR(keys_str);
-
-    for(idx = 0; idx < CBSUBST_TBL_MAX; idx++) {
-      if (inf->ivar[idx] == (ID) 0) continue;
-
-      *(keys_ptr++) = (unsigned char)idx;
-
-      str = cbsubst_append_inf_key(str, inf, idx);
-    }
-    rb_str_set_len(keys_str, keys_ptr - keys_buf);
-
-    return rb_ary_new3(2, keys_str, str);
-}
-
-static VALUE
-cbsubst_table_setup(argc, argv, self)
-     int   argc;
-     VALUE *argv;
-     VALUE self;
-{
-  VALUE cbsubst_obj;
-  VALUE key_inf;
-  VALUE longkey_inf;
-  VALUE proc_inf;
-  VALUE inf, subst, name, type, ivar, proc;
-  const VALUE *infp;
-  ID id;
-  struct cbsubst_info *subst_inf;
-  long idx;
-  unsigned char chr;
-
-  /* accept (key_inf, proc_inf) or (key_inf, longkey_inf, procinf) */
-  if (rb_scan_args(argc, argv, "21", &key_inf, &longkey_inf, &proc_inf) == 2) {
-    proc_inf = longkey_inf;
-    longkey_inf = rb_ary_new();
-  }
-  Check_Type(key_inf, T_ARRAY);
-  Check_Type(longkey_inf, T_ARRAY);
-  Check_Type(proc_inf, T_ARRAY);
-
-  /* check the number of longkeys */
-  if (RARRAY_LEN(longkey_inf) > 125 /* from 0x80 to 0xFD */) {
-    rb_raise(rb_eArgError, "too many longname-key definitions");
-  }
-
-  /* init */
-  cbsubst_obj = allocate_cbsubst_info(&subst_inf);
-
-  /*
-   * keys : array of [subst, type, ivar]
-   *         subst ==> char code or string
-   *         type  ==> char code or string
-   *         ivar  ==> symbol
-   */
-  for(idx = 0; idx < RARRAY_LEN(key_inf); idx++) {
-    inf = RARRAY_AREF(key_inf, idx);
-    if (!RB_TYPE_P(inf, T_ARRAY)) continue;
-    if (RARRAY_LEN(inf) < 3) continue;
-    infp = RARRAY_CONST_PTR(inf);
-    subst = infp[0];
-    type = infp[1];
-    ivar = infp[2];
-
-    chr = NUM2CHR(subst);
-    subst_inf->type[chr] = NUM2CHR(type);
-
-    subst_inf->full_subst_length += 3;
-
-    id = SYM2ID(ivar);
-    subst_inf->ivar[chr] = rb_intern_str(rb_sprintf("@%"PRIsVALUE, rb_id2str(id)));
-
-    rb_attr(self, id, 1, 0, Qtrue);
-  }
-  RB_GC_GUARD(key_inf);
-
-
-  /*
-   * longkeys : array of [name, type, ivar]
-   *         name ==> longname key string
-   *         type ==> char code or string
-   *         ivar ==> symbol
-   */
-  for(idx = 0; idx < RARRAY_LEN(longkey_inf); idx++) {
-    inf = RARRAY_AREF(longkey_inf, idx);
-    if (!RB_TYPE_P(inf, T_ARRAY)) continue;
-    if (RARRAY_LEN(inf) < 3) continue;
-    infp = RARRAY_CONST_PTR(inf);
-    name = infp[0];
-    type = infp[1];
-    ivar = infp[2];
-
-    Check_Type(name, T_STRING);
-    chr = (unsigned char)(0x80 + idx);
-    subst_inf->keylen[chr] = RSTRING_LEN(name);
-    subst_inf->key[chr] = strndup(RSTRING_PTR(name),
-				  RSTRING_LEN(name));
-    subst_inf->type[chr] = NUM2CHR(type);
-
-    subst_inf->full_subst_length += (subst_inf->keylen[chr] + 2);
-
-    id = SYM2ID(ivar);
-    subst_inf->ivar[chr] = rb_intern_str(rb_sprintf("@%"PRIsVALUE, rb_id2str(id)));
-
-    rb_attr(self, id, 1, 0, Qtrue);
-  }
-  RB_GC_GUARD(longkey_inf);
-
-  /*
-   * procs : array of [type, proc]
-   *         type  ==> char code or string
-   *         proc  ==> proc/method/obj (must respond to 'call')
-   */
-  for(idx = 0; idx < RARRAY_LEN(proc_inf); idx++) {
-    inf = RARRAY_AREF(proc_inf, idx);
-    if (!RB_TYPE_P(inf, T_ARRAY)) continue;
-    if (RARRAY_LEN(inf) < 2) continue;
-    type = rb_ary_entry(inf, 0);
-    proc = rb_ary_entry(inf, 1);
-    if (RB_TYPE_P(type, T_STRING))
-      type = INT2FIX(*(RSTRING_PTR(type)));
-    rb_hash_aset(subst_inf->proc, type, proc);
-  }
-  RB_GC_GUARD(proc_inf);
-
-  rb_const_set(self, ID_SUBST_INFO, cbsubst_obj);
-
-  return self;
-}
-
-static VALUE
-cbsubst_get_extra_args_tbl(self)
-    VALUE self;
-{
-  return rb_ary_new();
-}
-
-static VALUE
-cbsubst_scan_args(self, arg_key, val_ary)
-    VALUE self;
-    VALUE arg_key;
-    VALUE val_ary;
-{
-    struct cbsubst_info *inf;
-    long idx;
-    unsigned char *keyptr = (unsigned char*)StringValueCStr(arg_key);
-    long keylen = RSTRING_LEN(arg_key);
-    long vallen = (Check_Type(val_ary, T_ARRAY), RARRAY_LEN(val_ary));
-    unsigned char type_chr;
-    volatile VALUE dst = rb_ary_new2(vallen);
-    volatile VALUE proc;
-    int thr_crit_bup;
-    VALUE old_gc;
-
-    thr_crit_bup = rb_thread_critical;
-    rb_thread_critical = Qtrue;
-
-    old_gc = rb_gc_disable();
-
-    inf = cbsubst_get_ptr(self);
-
-    for(idx = 0; idx < vallen; idx++) {
-      if (idx >= keylen) {
-	proc = Qnil;
-      } else if (*(keyptr + idx) == ' ') {
-	proc = Qnil;
-      } else {
-	if ((type_chr = inf->type[*(keyptr + idx)]) != 0) {
-	  proc = rb_hash_aref(inf->proc, INT2FIX((int)type_chr));
-	} else {
-	  proc = Qnil;
-	}
-      }
-
-      if (NIL_P(proc)) {
-	rb_ary_push(dst, RARRAY_AREF(val_ary, idx));
-      } else {
-	rb_ary_push(dst, rb_funcall(proc, ID_call, 1,
-				    RARRAY_AREF(val_ary, idx)));
-      }
-    }
-
-    if (old_gc == Qfalse) rb_gc_enable();
-    rb_thread_critical = thr_crit_bup;
-
-    return dst;
-}
-
-static VALUE
-cbsubst_inspect(self)
-    VALUE self;
-{
-    return rb_str_new2("CallbackSubst");
-}
-
-static VALUE
-substinfo_inspect(self)
-    VALUE self;
-{
-    return rb_str_new2("SubstInfo");
-}
-
-/*************************************/
-
-static VALUE
-tk_cbe_inspect(self)
-    VALUE self;
-{
-    return rb_str_new2("TkCallbackEntry");
-}
-
-/*************************************/
-
-static VALUE
-tkobj_path(self)
-    VALUE self;
-{
-    return rb_ivar_get(self, ID_at_path);
-}
-
-
-/*************************************/
-/* release date */
-const char tkutil_release_date[] = TKUTIL_RELEASE_DATE;
-
-void
-Init_tkutil(void)
-{
-    VALUE cTK = rb_define_class("TkKernel", rb_cObject);
-    VALUE mTK = rb_define_module("TkUtil");
-
-    /* --------------------- */
-
-    rb_define_const(mTK, "RELEASE_DATE",
-                    rb_obj_freeze(rb_str_new2(tkutil_release_date)));
-
-    /* --------------------- */
-    rb_global_variable(&cMethod);
-    cMethod = rb_const_get(rb_cObject, rb_intern("Method"));
-
-    ID_path = rb_intern("path");
-    ID_at_path = rb_intern("@path");
-    ID_at_enc = rb_intern("@encoding");
-    ID_to_eval = rb_intern("to_eval");
-    ID_to_s = rb_intern("to_s");
-    ID_source = rb_intern("source");
-    ID_downcase = rb_intern("downcase");
-    ID_install_cmd = rb_intern("install_cmd");
-    ID_merge_tklist = rb_intern("_merge_tklist");
-    ID_encoding = rb_intern("encoding");
-    ID_encoding_system = rb_intern("encoding_system");
-    ID_call = rb_intern("call");
-
-    /* --------------------- */
-    cCB_SUBST = rb_define_class_under(mTK, "CallbackSubst", rb_cObject);
-    rb_define_singleton_method(cCB_SUBST, "inspect", cbsubst_inspect, 0);
-
-    cSUBST_INFO = rb_define_class_under(cCB_SUBST, "Info", rb_cObject);
-    rb_define_singleton_method(cSUBST_INFO, "inspect", substinfo_inspect, 0);
-
-    ID_SUBST_INFO = rb_intern("SUBST_INFO");
-    rb_define_singleton_method(cCB_SUBST, "ret_val", cbsubst_ret_val, 1);
-    rb_define_singleton_method(cCB_SUBST, "scan_args", cbsubst_scan_args, 2);
-    rb_define_singleton_method(cCB_SUBST, "_sym2subst",
-			       cbsubst_sym_to_subst, 1);
-    rb_define_singleton_method(cCB_SUBST, "subst_arg",
-                               cbsubst_get_subst_arg, -1);
-    rb_define_singleton_method(cCB_SUBST, "_get_subst_key",
-                               cbsubst_get_subst_key,  1);
-    rb_define_singleton_method(cCB_SUBST, "_get_all_subst_keys",
-                               cbsubst_get_all_subst_keys,  0);
-    rb_define_singleton_method(cCB_SUBST, "_setup_subst_table",
-                               cbsubst_table_setup, -1);
-    rb_define_singleton_method(cCB_SUBST, "_get_extra_args_tbl",
-                               cbsubst_get_extra_args_tbl,  0);
-    rb_define_singleton_method(cCB_SUBST, "_define_attribute_aliases",
-                               cbsubst_def_attr_aliases,  1);
-
-    rb_define_method(cCB_SUBST, "initialize", cbsubst_initialize, -1);
-
-    cbsubst_init();
-
-    /* --------------------- */
-    rb_global_variable(&cTkCallbackEntry);
-    cTkCallbackEntry = rb_define_class("TkCallbackEntry", cTK);
-    rb_define_singleton_method(cTkCallbackEntry, "inspect", tk_cbe_inspect, 0);
-
-    /* --------------------- */
-    rb_global_variable(&cTkObject);
-    cTkObject = rb_define_class("TkObject", cTK);
-    rb_define_method(cTkObject, "path", tkobj_path, 0);
-
-    /* --------------------- */
-    rb_require("tcltklib");
-    rb_global_variable(&cTclTkLib);
-    cTclTkLib = rb_const_get(rb_cObject, rb_intern("TclTkLib"));
-    ID_split_tklist = rb_intern("_split_tklist");
-    ID_toUTF8 = rb_intern("_toUTF8");
-    ID_fromUTF8 = rb_intern("_fromUTF8");
-
-    /* --------------------- */
-    rb_define_singleton_method(cTK, "new", tk_s_new, -1);
-
-    /* --------------------- */
-    rb_global_variable(&TK_None);
-    TK_None = rb_obj_alloc(rb_cObject);
-    rb_define_const(mTK, "None", TK_None);
-    rb_define_singleton_method(TK_None, "to_s", tkNone_to_s, 0);
-    rb_define_singleton_method(TK_None, "inspect", tkNone_inspect, 0);
-    OBJ_FREEZE(TK_None);
-
-    /* --------------------- */
-    rb_global_variable(&CALLBACK_TABLE);
-    CALLBACK_TABLE = rb_hash_new();
-
-    /* --------------------- */
-    rb_define_singleton_method(mTK, "untrust", tk_obj_untrust, 1);
-
-    rb_define_singleton_method(mTK, "eval_cmd", tk_eval_cmd, -1);
-    rb_define_singleton_method(mTK, "callback", tk_do_callback, -1);
-    rb_define_singleton_method(mTK, "install_cmd", tk_install_cmd, -1);
-    rb_define_singleton_method(mTK, "uninstall_cmd", tk_uninstall_cmd, 1);
-    rb_define_singleton_method(mTK, "_symbolkey2str", tk_symbolkey2str, 1);
-    rb_define_singleton_method(mTK, "hash_kv", tk_hash_kv, -1);
-    rb_define_singleton_method(mTK, "_get_eval_string",
-                               tk_get_eval_string, -1);
-    rb_define_singleton_method(mTK, "_get_eval_enc_str",
-                               tk_get_eval_enc_str, 1);
-    rb_define_singleton_method(mTK, "_conv_args", tk_conv_args, -1);
-
-    rb_define_singleton_method(mTK, "bool", tcl2rb_bool, 1);
-    rb_define_singleton_method(mTK, "number", tcl2rb_number, 1);
-    rb_define_singleton_method(mTK, "string", tcl2rb_string, 1);
-    rb_define_singleton_method(mTK, "num_or_str", tcl2rb_num_or_str, 1);
-    rb_define_singleton_method(mTK, "num_or_nil", tcl2rb_num_or_nil, 1);
-
-    rb_define_method(mTK, "_toUTF8", tk_toUTF8, -1);
-    rb_define_method(mTK, "_fromUTF8", tk_fromUTF8, -1);
-    rb_define_method(mTK, "_symbolkey2str", tk_symbolkey2str, 1);
-    rb_define_method(mTK, "hash_kv", tk_hash_kv, -1);
-    rb_define_method(mTK, "_get_eval_string", tk_get_eval_string, -1);
-    rb_define_method(mTK, "_get_eval_enc_str", tk_get_eval_enc_str, 1);
-    rb_define_method(mTK, "_conv_args", tk_conv_args, -1);
-
-    rb_define_method(mTK, "bool", tcl2rb_bool, 1);
-    rb_define_method(mTK, "number", tcl2rb_number, 1);
-    rb_define_method(mTK, "string", tcl2rb_string, 1);
-    rb_define_method(mTK, "num_or_str", tcl2rb_num_or_str, 1);
-    rb_define_method(mTK, "num_or_nil", tcl2rb_num_or_nil, 1);
-
-    /* --------------------- */
-    rb_global_variable(&ENCODING_NAME_UTF8);
-    ENCODING_NAME_UTF8 = rb_obj_freeze(rb_str_new2("utf-8"));
-
-    /* --------------------- */
-}
diff --git a/ext/win32/depend b/ext/win32/depend
new file mode 100644
index 0000000000..0301ce074c
--- /dev/null
+++ b/ext/win32/depend
@@ -0,0 +1,2 @@
+# AUTOGENERATED DEPENDENCIES START
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/win32/extconf.rb b/ext/win32/extconf.rb
index 9952274e29..ceab4ef4f4 100644
--- a/ext/win32/extconf.rb
+++ b/ext/win32/extconf.rb
@@ -1,4 +1,4 @@
 # frozen_string_literal: false
-if compiled?('fiddle') and $mswin||$mingw||$cygwin
+if $mswin||$mingw||$cygwin
   create_makefile('win32')
 end
diff --git a/ext/win32/lib/Win32API.rb b/ext/win32/lib/Win32API.rb
deleted file mode 100644
index 43db7db67b..0000000000
--- a/ext/win32/lib/Win32API.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-# frozen_string_literal: false
-# -*- ruby -*-
-# for backward compatibility
-warn "Warning:#{caller[0].sub(/:in `.*'\z/, '')}: Win32API is deprecated after Ruby 1.9.1; use fiddle directly instead" if $VERBOSE
-
-require 'fiddle/import'
-
-class Win32API
-  DLL = {}
-  TYPEMAP = {"0" => Fiddle::TYPE_VOID, "S" => Fiddle::TYPE_VOIDP, "I" => Fiddle::TYPE_LONG}
-  POINTER_TYPE = Fiddle::SIZEOF_VOIDP == Fiddle::SIZEOF_LONG_LONG ? 'q*' : 'l!*'
-
-  def initialize(dllname, func, import, export = "0", calltype = :stdcall)
-    @proto = [import].join.tr("VPpNnLlIi", "0SSI").sub(/^(.)0*$/, '\1')
-    handle = DLL[dllname] ||= Fiddle.dlopen(dllname)
-
-    @func = Fiddle::Function.new(
-      handle[func],
-      @proto.chars.map { |win_type| TYPEMAP[win_type.tr("VPpNnLlIi", "0SSI")] },
-      TYPEMAP[export.tr("VPpNnLlIi", "0SSI")],
-      Fiddle::Importer.const_get(:CALL_TYPE_TO_ABI)[calltype]
-    )
-  rescue Fiddle::DLError => e
-    raise LoadError, e.message, e.backtrace
-  end
-
-  def call(*args)
-    import = @proto.split("")
-    args.each_with_index do |x, i|
-      args[i], = [x == 0 ? nil : x].pack("p").unpack(POINTER_TYPE) 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/win32/lib/win32/importer.rb b/ext/win32/lib/win32/importer.rb
deleted file mode 100644
index 2bef016c29..0000000000
--- a/ext/win32/lib/win32/importer.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: false
-require 'fiddle/import'
-
-module Win32
-end
-
-Win32.module_eval do
-  Importer = Fiddle::Importer
-end
diff --git a/ext/win32/lib/win32/registry.rb b/ext/win32/lib/win32/registry.rb
index f3655b78d3..ffc2979179 100644
--- a/ext/win32/lib/win32/registry.rb
+++ b/ext/win32/lib/win32/registry.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require 'win32/importer'
+require 'fiddle/import'
 
 module Win32
 
@@ -169,7 +169,7 @@ For detail, see the MSDN[http://msdn.microsoft.com/library/en-us/sysinfo/base/pr
     #
     class Error < ::StandardError
       module Kernel32
-        extend Importer
+        extend Fiddle::Importer
         dlload "kernel32.dll"
       end
       FormatMessageW = Kernel32.extern "int FormatMessageW(int, void *, int, int, void *, int, void *)", :stdcall
@@ -225,7 +225,7 @@ For detail, see the MSDN[http://msdn.microsoft.com/library/en-us/sysinfo/base/pr
     #
     module API
       include Constants
-      extend Importer
+      extend Fiddle::Importer
       dlload "advapi32.dll"
       [
         "long RegOpenKeyExW(void *, void *, long, long, void *)",
@@ -575,9 +575,9 @@ For detail, see the MSDN[http://msdn.microsoft.com/library/en-us/sysinfo/base/pr
         begin
           type, data = read(subkey)
         rescue Error
-          next
+        else
+          yield subkey, type, data
         end
-        yield subkey, type, data
         index += 1
       end
       index
@@ -635,7 +635,7 @@ For detail, see the MSDN[http://msdn.microsoft.com/library/en-us/sysinfo/base/pr
     #    Array of String
     # :REG_DWORD, REG_DWORD_BIG_ENDIAN, REG_QWORD
     #    Integer
-    # :REG_BINARY
+    # :REG_BINARY, REG_NONE
     #    String (contains binary data)
     #
     # When rtype is specified, the value type must be included by
@@ -643,14 +643,16 @@ For detail, see the MSDN[http://msdn.microsoft.com/library/en-us/sysinfo/base/pr
     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)"
+        raise TypeError, "Type mismatch (expect [#{
+          rtype.map{|t|Registry.type2name(t)}.join(', ')}] but #{
+          Registry.type2name(type)} present)"
       end
       case type
       when REG_SZ, REG_EXPAND_SZ
         [ type, data.encode(name.encoding, WCHAR).chop ]
       when REG_MULTI_SZ
         [ type, data.encode(name.encoding, WCHAR).split(/\0/) ]
-      when REG_BINARY
+      when REG_BINARY, REG_NONE
         [ type, data ]
       when REG_DWORD
         [ type, API.unpackdw(data) ]
@@ -659,7 +661,7 @@ For detail, see the MSDN[http://msdn.microsoft.com/library/en-us/sysinfo/base/pr
       when REG_QWORD
         [ type, API.unpackqw(data) ]
       else
-        raise TypeError, "Type #{type} is not supported."
+        raise TypeError, "Type #{Registry.type2name(type)} is not supported."
       end
     end
 
@@ -682,7 +684,7 @@ For detail, see the MSDN[http://msdn.microsoft.com/library/en-us/sysinfo/base/pr
       when REG_EXPAND_SZ
         Registry.expand_environ(data)
       else
-        raise TypeError, "Type #{type} is not supported."
+        raise TypeError, "Type #{Registry.type2name(type)} is not supported."
       end
     end
 
@@ -746,7 +748,7 @@ For detail, see the MSDN[http://msdn.microsoft.com/library/en-us/sysinfo/base/pr
       when REG_MULTI_SZ
         data = data.to_a.map {|s| s.encode(WCHAR)}.join(WCHAR_NUL) << WCHAR_NUL
         termsize = WCHAR_SIZE
-      when REG_BINARY
+      when REG_BINARY, REG_NONE
         data = data.to_s
       when REG_DWORD
         data = API.packdw(data.to_i)
@@ -755,7 +757,7 @@ For detail, see the MSDN[http://msdn.microsoft.com/library/en-us/sysinfo/base/pr
       when REG_QWORD
         data = API.packqw(data.to_i)
       else
-        raise TypeError, "Unsupported type #{type}"
+        raise TypeError, "Unsupported type #{Registry.type2name(type)}"
       end
       API.SetValue(@hkey, name, type, data, data.bytesize + termsize)
     end
diff --git a/ext/win32/lib/win32/resolv.rb b/ext/win32/lib/win32/resolv.rb
index 271084b65b..d06658f0aa 100644
--- a/ext/win32/lib/win32/resolv.rb
+++ b/ext/win32/lib/win32/resolv.rb
@@ -9,6 +9,7 @@ require 'win32/registry'
 module Win32
   module Resolv
     API = Registry::API
+    Error = Registry::Error
 
     def self.get_hosts_path
       path = get_hosts_dir
@@ -34,24 +35,33 @@ module Win32
       [ search, nameserver ]
     end
   end
+end
 
-nt = Module.new do
-  break true if [nil].pack("p").size > 4
-  extend Importer
-  dlload "kernel32"
-  getv = extern "int GetVersionExA(void *)", :stdcall
-  info = [ 148, 0, 0, 0, 0 ].pack('V5') + "\0" * 128
-  getv.call(info)
-  break info.unpack('V5')[4] == 2  # VER_PLATFORM_WIN32_NT
+begin
+  require 'win32/resolv.so'
+rescue LoadError
 end
-if not nt
-  require_relative 'resolv9x'
-  # return # does not work yet
-else
+
+module Win32
 #====================================================================
 # Windows NT
 #====================================================================
   module Resolv
+    module SZ
+      refine Registry do
+        # ad hoc workaround for broken registry
+        def read_s(key)
+          type, str = read(key)
+          unless type == Registry::REG_SZ
+            warn "Broken registry, #{name}\\#{key} was #{Registry.type2name(type)}, ignored"
+            return String.new
+          end
+          str
+        end
+      end
+    end
+    using SZ
+
     TCPIP_NT = 'SYSTEM\CurrentControlSet\Services\Tcpip\Parameters'
 
     class << self
@@ -64,7 +74,7 @@ else
 
       def get_info
         search = nil
-        nameserver = []
+        nameserver = get_dns_server_list
         Registry::HKEY_LOCAL_MACHINE.open(TCPIP_NT) do |reg|
           begin
             slist = reg.read_s('SearchList')
@@ -91,20 +101,15 @@ else
           reg.open('Interfaces') do |h|
             h.each_key do |iface, |
               h.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
+                next unless ns = %w[NameServer DhcpNameServer].find do |key|
+                  begin
+                    ns = regif.read_s(key)
+                  rescue Registry::Error
+                  else
+                    break ns.split(/[,\s]\s*/) unless ns.empty?
                   end
-                rescue Registry::Error
                 end
+                next if (nameserver & ns).empty?
 
                 if add_search
                   begin
@@ -128,4 +133,3 @@ else
     end
   end
 end
-end
diff --git a/ext/win32/lib/win32/resolv9x.rb b/ext/win32/lib/win32/resolv9x.rb
deleted file mode 100644
index 1045bb2e09..0000000000
--- a/ext/win32/lib/win32/resolv9x.rb
+++ /dev/null
@@ -1,253 +0,0 @@
-#====================================================================
-# Windows 9x
-#====================================================================
-module Win32
-  module Resolv
-    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
-      module WSock32
-        extend Importer
-        dlload "wsock32.dll"
-      end
-      WsControl = WSock32.extern "int WsControl(int, int, void *, void *, void *, void *", :stdcall
-      WSAGetLastError = WSock32.extern "int WSAGetLastError(void)", :stdcall
-
-      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
-  end
-end
diff --git a/ext/win32/lib/win32/sspi.rb b/ext/win32/lib/win32/sspi.rb
index 20441b389c..a73819f24e 100644
--- a/ext/win32/lib/win32/sspi.rb
+++ b/ext/win32/lib/win32/sspi.rb
@@ -11,321 +11,328 @@
 # Ruby Distribution License or GNU General Public License.
 #
 
-require 'Win32API'
+require 'fiddle/import'
 
 # 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
+  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
+      extend Fiddle::Importer
+      dlload "secur32.dll"
+      [
+        # Can be called with AcquireCredentialsHandleA.call()
+        "unsigned long AcquireCredentialsHandleA(void *, void *, unsigned long, void *, void *, void *, void *, void *, void *)",
+        # Can be called with InitializeSecurityContextA.call()
+        "unsigned long InitializeSecurityContextA(void *, void *, void *, unsigned long, unsigned long, unsigned long, void *, unsigned long, void *, void *, void *, void *)",
+        # Can be called with DeleteSecurityContext.call()
+        "unsigned long DeleteSecurityContext(void *)",
+        # Can be called with FreeCredentialsHandle.call()
+        "unsigned long FreeCredentialsHandle(void *)"
+      ].each do |fn|
+        cfunc = extern fn, :stdcall
+        const_set cfunc.name.intern, cfunc
+      end
+    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 representations 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
+      # 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::InitializeSecurityContextA.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.
+        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::AcquireCredentialsHandleA.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
+    end
+  end
 end
diff --git a/ext/win32/resolv/depend b/ext/win32/resolv/depend
new file mode 100644
index 0000000000..a6d24c3738
--- /dev/null
+++ b/ext/win32/resolv/depend
@@ -0,0 +1,17 @@
+# AUTOGENERATED DEPENDENCIES START
+resolv.o: $(RUBY_EXTCONF_H)
+resolv.o: $(arch_hdrdir)/ruby/config.h
+resolv.o: $(hdrdir)/ruby.h
+resolv.o: $(hdrdir)/ruby/assert.h
+resolv.o: $(hdrdir)/ruby/backward.h
+resolv.o: $(hdrdir)/ruby/defines.h
+resolv.o: $(hdrdir)/ruby/encoding.h
+resolv.o: $(hdrdir)/ruby/intern.h
+resolv.o: $(hdrdir)/ruby/missing.h
+resolv.o: $(hdrdir)/ruby/onigmo.h
+resolv.o: $(hdrdir)/ruby/oniguruma.h
+resolv.o: $(hdrdir)/ruby/ruby.h
+resolv.o: $(hdrdir)/ruby/st.h
+resolv.o: $(hdrdir)/ruby/subst.h
+resolv.o: resolv.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/win32/resolv/extconf.rb b/ext/win32/resolv/extconf.rb
new file mode 100644
index 0000000000..01f3df730a
--- /dev/null
+++ b/ext/win32/resolv/extconf.rb
@@ -0,0 +1,3 @@
+if have_library('iphlpapi', 'GetNetworkParams')
+  create_makefile('win32/resolv')
+end
diff --git a/ext/win32/resolv/resolv.c b/ext/win32/resolv/resolv.c
new file mode 100644
index 0000000000..f19243ccc1
--- /dev/null
+++ b/ext/win32/resolv/resolv.c
@@ -0,0 +1,65 @@
+#include <ruby.h>
+#include <ruby/encoding.h>
+#include <windows.h>
+#ifndef NTDDI_VERSION
+#define NTDDI_VERSION 0x06000000
+#endif
+#include <iphlpapi.h>
+
+static VALUE
+w32error_make_error(DWORD e)
+{
+    VALUE code = ULONG2NUM(e);
+    return rb_class_new_instance(1, &code, rb_path2class("Win32::Resolv::Error"));
+}
+
+static void
+w32error_raise(DWORD e)
+{
+    rb_exc_raise(w32error_make_error(e));
+}
+
+static VALUE
+get_dns_server_list(VALUE self)
+{
+    FIXED_INFO *fixedinfo = NULL;
+    ULONG buflen = 0;
+    DWORD ret;
+    VALUE buf, nameservers = Qnil;
+
+    ret = GetNetworkParams(NULL, &buflen);
+    if (ret != NO_ERROR && ret != ERROR_BUFFER_OVERFLOW) {
+	w32error_raise(ret);
+    }
+    fixedinfo = ALLOCV(buf, buflen);
+    ret = GetNetworkParams(fixedinfo, &buflen);
+    if (ret == NO_ERROR) {
+	const IP_ADDR_STRING *ipaddr = &fixedinfo->DnsServerList;
+	nameservers = rb_ary_new();
+	do {
+	    const char *s = ipaddr->IpAddress.String;
+	    if (!*s) continue;
+	    if (strcmp(s, "0.0.0.0") == 0) continue;
+	    rb_ary_push(nameservers, rb_str_new_cstr(s));
+	} while ((ipaddr = ipaddr->Next) != NULL);
+    }
+    ALLOCV_END(buf);
+    if (ret != NO_ERROR) w32error_raise(ret);
+
+    return nameservers;
+}
+
+void
+InitVM_resolv(void)
+{
+    VALUE mWin32 = rb_define_module("Win32");
+    VALUE resolv = rb_define_module_under(mWin32, "Resolv");
+    VALUE singl = rb_singleton_class(resolv);
+    rb_define_private_method(singl, "get_dns_server_list", get_dns_server_list, 0);
+}
+
+void
+Init_resolv(void)
+{
+    InitVM(resolv);
+}
diff --git a/ext/win32ole/lib/win32ole.rb b/ext/win32ole/lib/win32ole.rb
new file mode 100644
index 0000000000..d7034f7845
--- /dev/null
+++ b/ext/win32ole/lib/win32ole.rb
@@ -0,0 +1,33 @@
+begin
+  require 'win32ole.so'
+rescue LoadError
+  # do nothing
+end
+
+if defined?(WIN32OLE)
+  # WIN32OLE
+  class WIN32OLE
+
+    #
+    # By overriding Object#methods, WIN32OLE might
+    # work well with did_you_mean gem.
+    # This is experimental.
+    #
+    #  require 'win32ole'
+    #  dict = WIN32OLE.new('Scripting.Dictionary')
+    #  dict.Ade('a', 1)
+    #  #=> Did you mean?  Add
+    #
+    def methods(*args)
+      super + ole_methods_safely.map(&:name).map(&:to_sym)
+    end
+
+    private
+
+    def ole_methods_safely
+      ole_methods
+    rescue WIN32OLEQueryInterfaceError
+      []
+    end
+  end
+end
diff --git a/ext/win32ole/sample/excel1.rb b/ext/win32ole/sample/excel1.rb
index c16c753ccc..4fe1d0c2a9 100644
--- a/ext/win32ole/sample/excel1.rb
+++ b/ext/win32ole/sample/excel1.rb
@@ -3,7 +3,7 @@ require 'win32ole'
 
 application = WIN32OLE.new('Excel.Application')
 
-application.visible = TRUE
+application.visible = true
 workbook = application.Workbooks.Add();
 worksheet = workbook.Worksheets(1);
 
@@ -27,7 +27,7 @@ range = worksheet.Range("A1:D2");
 range.Select
 chart = workbook.Charts.Add;
 
-workbook.saved = TRUE;
+workbook.saved = true;
 
 print "Now quit Excel... Please enter."
 gets
diff --git a/ext/win32ole/sample/excel2.rb b/ext/win32ole/sample/excel2.rb
index 8c4773daba..47a5715f84 100644
--- a/ext/win32ole/sample/excel2.rb
+++ b/ext/win32ole/sample/excel2.rb
@@ -8,7 +8,7 @@ ChartTypeVal = -4100;
 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;
diff --git a/ext/win32ole/sample/excel3.rb b/ext/win32ole/sample/excel3.rb
index d66023c2b6..72aee2a929 100644
--- a/ext/win32ole/sample/excel3.rb
+++ b/ext/win32ole/sample/excel3.rb
@@ -4,7 +4,7 @@ require 'win32ole'
 #application = WIN32OLE.new('Excel.Application.5')
 application = WIN32OLE.new('Excel.Application')
 
-application.visible = TRUE
+application.visible = true
 workbook = application.Workbooks.Add();
 sheet = workbook.Worksheets(1);
 sheetS = workbook.Worksheets
diff --git a/ext/win32ole/sample/ie.rb b/ext/win32ole/sample/ie.rb
index dad29b08c8..4db64eed30 100644
--- a/ext/win32ole/sample/ie.rb
+++ b/ext/win32ole/sample/ie.rb
@@ -2,7 +2,7 @@
 require 'win32ole'
 url = 'http://www.ruby-lang.org/'
 ie = WIN32OLE.new('InternetExplorer.Application')
-ie.visible = TRUE
+ie.visible = true
 ie.gohome
 print "Now navigate Ruby home page... Please enter."
 gets
diff --git a/ext/win32ole/sample/ienavi.rb b/ext/win32ole/sample/ienavi.rb
index 526ef0a5a8..5d0536028b 100644
--- a/ext/win32ole/sample/ienavi.rb
+++ b/ext/win32ole/sample/ienavi.rb
@@ -9,7 +9,7 @@ end
 
 def stop_msg_loop
   puts "Now Stop IE..."
-  $LOOP = FALSE;
+  $LOOP = false;
 end
 
 def default_handler(event, *args)
@@ -20,7 +20,7 @@ def default_handler(event, *args)
 end
 
 ie = WIN32OLE.new('InternetExplorer.Application')
-ie.visible = TRUE
+ie.visible = true
 ie.gohome
 
 ev = WIN32OLE_EVENT.new(ie, 'DWebBrowserEvents')
@@ -29,7 +29,7 @@ ev.on_event {|*args| default_handler(*args)}
 ev.on_event("NavigateComplete") {|url| navigate(url)}
 ev.on_event("Quit") {|*args| stop_msg_loop}
 
-$LOOP = TRUE
+$LOOP = true
 while ($LOOP)
   WIN32OLE_EVENT.message_loop
 end
diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c
index 4dcd22e6f0..59bae0e774 100644
--- a/ext/win32ole/win32ole.c
+++ b/ext/win32ole/win32ole.c
@@ -1,6 +1,7 @@
 /*
  *  (c) 1995 Microsoft Corporation. All rights reserved.
- *  Developed by ActiveWare Internet Corp., http://www.ActiveWare.com
+ *  Developed by ActiveWare Internet Corp., now known as
+ *  ActiveState Tool Corp., http://www.ActiveState.com
  *
  *  Other modifications Copyright (c) 1997, 1998 by Gurusamy Sarathy
  *  <gsar@umich.edu> and Jan Dubois <jan.dubois@ibm.net>
@@ -26,7 +27,7 @@
 const IID IID_IMultiLanguage2 = {0xDCCFC164, 0x2B38, 0x11d2, {0xB7, 0xEC, 0x00, 0xC0, 0x4F, 0x8F, 0x5D, 0x9A}};
 #endif
 
-#define WIN32OLE_VERSION "1.8.4"
+#define WIN32OLE_VERSION "1.8.8"
 
 typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX)
     (REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*);
@@ -36,13 +37,13 @@ typedef HWND (WINAPI FNHTMLHELP)(HWND hwndCaller, LPCSTR pszFile,
 typedef BOOL (FNENUMSYSEMCODEPAGES) (CODEPAGE_ENUMPROC, DWORD);
 VALUE cWIN32OLE;
 
-#if defined(RB_THREAD_SPECIFIC) && (defined(__CYGWIN__) || defined(__MINGW32__))
+#if defined(RB_THREAD_SPECIFIC) && (defined(__CYGWIN__))
 static RB_THREAD_SPECIFIC BOOL g_ole_initialized;
 # define g_ole_initialized_init() ((void)0)
 # define g_ole_initialized_set(val) (g_ole_initialized = (val))
 #else
 static volatile DWORD g_ole_initialized_key = TLS_OUT_OF_INDEXES;
-# define g_ole_initialized (BOOL)TlsGetValue(g_ole_initialized_key)
+# define g_ole_initialized (TlsGetValue(g_ole_initialized_key)!=0)
 # define g_ole_initialized_init() (g_ole_initialized_key = TlsAlloc())
 # define g_ole_initialized_set(val) TlsSetValue(g_ole_initialized_key, (void*)(val))
 #endif
@@ -50,6 +51,7 @@ static volatile DWORD g_ole_initialized_key = TLS_OUT_OF_INDEXES;
 static BOOL g_uninitialize_hooked = FALSE;
 static BOOL g_cp_installed = FALSE;
 static BOOL g_lcid_installed = FALSE;
+static BOOL g_running_nano = FALSE;
 static HINSTANCE ghhctrl = NULL;
 static HINSTANCE gole32 = NULL;
 static FNCOCREATEINSTANCEEX *gCoCreateInstanceEx = NULL;
@@ -169,6 +171,7 @@ static VALUE fole_activex_initialize(VALUE self);
 static void com_hash_free(void *ptr);
 static void com_hash_mark(void *ptr);
 static size_t com_hash_size(const void *ptr);
+static void check_nano_server(void);
 
 static const rb_data_type_t ole_datatype = {
     "win32ole",
@@ -383,7 +386,7 @@ static /* [local] */ HRESULT ( STDMETHODCALLTYPE Invoke )(
             mid = rb_intern("value");
         }
     }
-    v = rb_funcall2(p->obj, mid, args, parg);
+    v = rb_funcallv(p->obj, mid, args, parg);
     ole_val2variant(v, pVarResult);
     return S_OK;
 }
@@ -421,12 +424,12 @@ rbtime2vtdate(VALUE tmobj)
     double t;
     double nsec;
 
-    st.wYear = FIX2INT(rb_funcall(tmobj, rb_intern("year"), 0));
-    st.wMonth = FIX2INT(rb_funcall(tmobj, rb_intern("month"), 0));
-    st.wDay = FIX2INT(rb_funcall(tmobj, rb_intern("mday"), 0));
-    st.wHour = FIX2INT(rb_funcall(tmobj, rb_intern("hour"), 0));
-    st.wMinute = FIX2INT(rb_funcall(tmobj, rb_intern("min"), 0));
-    st.wSecond = FIX2INT(rb_funcall(tmobj, rb_intern("sec"), 0));
+    st.wYear = RB_FIX2INT(rb_funcall(tmobj, rb_intern("year"), 0));
+    st.wMonth = RB_FIX2INT(rb_funcall(tmobj, rb_intern("month"), 0));
+    st.wDay = RB_FIX2INT(rb_funcall(tmobj, rb_intern("mday"), 0));
+    st.wHour = RB_FIX2INT(rb_funcall(tmobj, rb_intern("hour"), 0));
+    st.wMinute = RB_FIX2INT(rb_funcall(tmobj, rb_intern("min"), 0));
+    st.wSecond = RB_FIX2INT(rb_funcall(tmobj, rb_intern("sec"), 0));
     st.wMilliseconds = 0;
     SystemTimeToVariantTime(&st, &t);
 
@@ -435,7 +438,7 @@ rbtime2vtdate(VALUE tmobj)
      * wMilliseconds of SYSTEMTIME struct.
      * So, we need to calculate milliseconds by ourselves.
      */
-    nsec =  FIX2INT(rb_funcall(tmobj, rb_intern("nsec"), 0));
+    nsec =  RB_FIX2INT(rb_funcall(tmobj, rb_intern("nsec"), 0));
     nsec /= 1000000.0;
     nsec /= (24.0 * 3600.0);
     nsec /= 1000;
@@ -451,18 +454,18 @@ vtdate2rbtime(double date)
     double sec;
     VariantTimeToSystemTime(date, &st);
     v = rb_funcall(rb_cTime, rb_intern("new"), 6,
-		      INT2FIX(st.wYear),
-		      INT2FIX(st.wMonth),
-		      INT2FIX(st.wDay),
-		      INT2FIX(st.wHour),
-		      INT2FIX(st.wMinute),
-		      INT2FIX(st.wSecond));
-    st.wYear = FIX2INT(rb_funcall(v, rb_intern("year"), 0));
-    st.wMonth = FIX2INT(rb_funcall(v, rb_intern("month"), 0));
-    st.wDay = FIX2INT(rb_funcall(v, rb_intern("mday"), 0));
-    st.wHour = FIX2INT(rb_funcall(v, rb_intern("hour"), 0));
-    st.wMinute = FIX2INT(rb_funcall(v, rb_intern("min"), 0));
-    st.wSecond = FIX2INT(rb_funcall(v, rb_intern("sec"), 0));
+		      RB_INT2FIX(st.wYear),
+		      RB_INT2FIX(st.wMonth),
+		      RB_INT2FIX(st.wDay),
+		      RB_INT2FIX(st.wHour),
+		      RB_INT2FIX(st.wMinute),
+		      RB_INT2FIX(st.wSecond));
+    st.wYear = RB_FIX2INT(rb_funcall(v, rb_intern("year"), 0));
+    st.wMonth = RB_FIX2INT(rb_funcall(v, rb_intern("month"), 0));
+    st.wDay = RB_FIX2INT(rb_funcall(v, rb_intern("mday"), 0));
+    st.wHour = RB_FIX2INT(rb_funcall(v, rb_intern("hour"), 0));
+    st.wMinute = RB_FIX2INT(rb_funcall(v, rb_intern("min"), 0));
+    st.wSecond = RB_FIX2INT(rb_funcall(v, rb_intern("sec"), 0));
     st.wMilliseconds = 0;
     SystemTimeToVariantTime(&st, &sec);
     /*
@@ -504,6 +507,7 @@ static UINT ole_encoding2cp(rb_encoding *enc)
     ENC_MACHING_CP(enc, "GB2312", 20936);
     ENC_MACHING_CP(enc, "GBK", 936);
     ENC_MACHING_CP(enc, "IBM437", 437);
+    ENC_MACHING_CP(enc, "IBM720", 720);
     ENC_MACHING_CP(enc, "IBM737", 737);
     ENC_MACHING_CP(enc, "IBM775", 775);
     ENC_MACHING_CP(enc, "IBM852", 852);
@@ -817,16 +821,22 @@ ole_initialize(void)
     }
 
     if(g_ole_initialized == FALSE) {
-        hr = OleInitialize(NULL);
+        if(g_running_nano) {
+            hr = CoInitializeEx(NULL, COINIT_MULTITHREADED);
+        } else {
+            hr = OleInitialize(NULL);
+        }
         if(FAILED(hr)) {
             ole_raise(hr, rb_eRuntimeError, "fail: OLE initialize");
         }
         g_ole_initialized_set(TRUE);
 
-        hr = CoRegisterMessageFilter(&imessage_filter, &previous_filter);
-        if(FAILED(hr)) {
-            previous_filter = NULL;
-            ole_raise(hr, rb_eRuntimeError, "fail: install OLE MessageFilter");
+        if (g_running_nano == FALSE) {
+            hr = CoRegisterMessageFilter(&imessage_filter, &previous_filter);
+            if(FAILED(hr)) {
+                previous_filter = NULL;
+                ole_raise(hr, rb_eRuntimeError, "fail: install OLE MessageFilter");
+            }
         }
     }
 }
@@ -871,7 +881,7 @@ ole_vstr2wc(VALUE vstr)
     enc = rb_enc_get(vstr);
 
     if (st_lookup(tbl, (VALUE)enc | FIXNUM_FLAG, &data)) {
-        cp = FIX2INT((VALUE)data);
+        cp = RB_FIX2INT((VALUE)data);
     } else {
         cp = ole_encoding2cp(enc);
         if (code_page_installed(cp) ||
@@ -883,7 +893,7 @@ ole_vstr2wc(VALUE vstr)
             cp == CP_UTF7 ||
             cp == CP_UTF8 ||
             cp == 51932) {
-            st_insert(tbl, (VALUE)enc | FIXNUM_FLAG, INT2FIX(cp));
+            st_insert(tbl, (VALUE)enc | FIXNUM_FLAG, RB_INT2FIX(cp));
         } else {
             rb_raise(eWIN32OLERuntimeError, "not installed Windows codepage(%d) according to `%s'", cp, rb_enc_name(enc));
         }
@@ -1270,7 +1280,16 @@ ole_val2variant(VALUE val, VARIANT *var)
         break;
     case T_FIXNUM:
         V_VT(var) = VT_I4;
-        V_I4(var) = NUM2INT(val);
+        {
+            long v = RB_NUM2LONG(val);
+            V_I4(var) = (LONG)v;
+#if SIZEOF_LONG > 4
+            if (V_I4(var) != v) {
+                V_I8(var) = v;
+                V_VT(var) = VT_I8;
+            }
+#endif
+        }
         break;
     case T_BIGNUM:
         V_VT(var) = VT_R8;
@@ -1477,58 +1496,58 @@ ole_variant2val(VARIANT *pvar)
         break;
     case VT_I1:
         if(V_ISBYREF(pvar))
-            obj = INT2NUM((long)*V_I1REF(pvar));
+            obj = RB_INT2NUM((long)*V_I1REF(pvar));
         else
-            obj = INT2NUM((long)V_I1(pvar));
+            obj = RB_INT2NUM((long)V_I1(pvar));
         break;
 
     case VT_UI1:
         if(V_ISBYREF(pvar))
-            obj = INT2NUM((long)*V_UI1REF(pvar));
+            obj = RB_INT2NUM((long)*V_UI1REF(pvar));
         else
-            obj = INT2NUM((long)V_UI1(pvar));
+            obj = RB_INT2NUM((long)V_UI1(pvar));
         break;
 
     case VT_I2:
         if(V_ISBYREF(pvar))
-            obj = INT2NUM((long)*V_I2REF(pvar));
+            obj = RB_INT2NUM((long)*V_I2REF(pvar));
         else
-            obj = INT2NUM((long)V_I2(pvar));
+            obj = RB_INT2NUM((long)V_I2(pvar));
         break;
 
     case VT_UI2:
         if(V_ISBYREF(pvar))
-            obj = INT2NUM((long)*V_UI2REF(pvar));
+            obj = RB_INT2NUM((long)*V_UI2REF(pvar));
         else
-            obj = INT2NUM((long)V_UI2(pvar));
+            obj = RB_INT2NUM((long)V_UI2(pvar));
         break;
 
     case VT_I4:
         if(V_ISBYREF(pvar))
-            obj = INT2NUM((long)*V_I4REF(pvar));
+            obj = RB_INT2NUM((long)*V_I4REF(pvar));
         else
-            obj = INT2NUM((long)V_I4(pvar));
+            obj = RB_INT2NUM((long)V_I4(pvar));
         break;
 
     case VT_UI4:
         if(V_ISBYREF(pvar))
-            obj = INT2NUM((long)*V_UI4REF(pvar));
+            obj = RB_INT2NUM((long)*V_UI4REF(pvar));
         else
-            obj = INT2NUM((long)V_UI4(pvar));
+            obj = RB_INT2NUM((long)V_UI4(pvar));
         break;
 
     case VT_INT:
         if(V_ISBYREF(pvar))
-            obj = INT2NUM((long)*V_INTREF(pvar));
+            obj = RB_INT2NUM((long)*V_INTREF(pvar));
         else
-            obj = INT2NUM((long)V_INT(pvar));
+            obj = RB_INT2NUM((long)V_INT(pvar));
         break;
 
     case VT_UINT:
         if(V_ISBYREF(pvar))
-            obj = INT2NUM((long)*V_UINTREF(pvar));
+            obj = RB_INT2NUM((long)*V_UINTREF(pvar));
         else
-            obj = INT2NUM((long)V_UINT(pvar));
+            obj = RB_INT2NUM((long)V_UINT(pvar));
         break;
 
 #if (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__)
@@ -1587,9 +1606,9 @@ ole_variant2val(VARIANT *pvar)
 
     case VT_ERROR:
         if(V_ISBYREF(pvar))
-            obj = INT2NUM(*V_ERRORREF(pvar));
+            obj = RB_INT2NUM(*V_ERRORREF(pvar));
         else
-            obj = INT2NUM(V_ERROR(pvar));
+            obj = RB_INT2NUM(V_ERROR(pvar));
         break;
 
     case VT_BOOL:
@@ -1792,7 +1811,9 @@ ole_const_load(ITypeLib *pTypeLib, VALUE klass, VALUE self)
                 *pName = toupper((int)*pName);
                 id = rb_intern(pName);
                 if (rb_is_const_id(id)) {
-                    rb_define_const(klass, pName, val);
+                    if(!rb_const_defined_at(klass, id)) {
+                        rb_define_const(klass, pName, val);
+                    }
                 }
                 else {
                     rb_hash_aset(constant, rb_str_new2(pName), val);
@@ -1965,10 +1986,6 @@ fole_s_connect(int argc, VALUE *argv, VALUE self)
 
     rb_scan_args(argc, argv, "1*", &svr_name, &others);
     StringValue(svr_name);
-    if (rb_safe_level() > 0 && OBJ_TAINTED(svr_name)) {
-        rb_raise(rb_eSecurityError, "insecure connection - `%s'",
-		StringValuePtr(svr_name));
-    }
 
     /* get CLSID from OLE server name */
     pBuf = ole_vstr2wc(svr_name);
@@ -2054,12 +2071,12 @@ fole_s_const_load(int argc, VALUE *argv, VALUE self)
         hr = pole->pDispatch->lpVtbl->GetTypeInfo(pole->pDispatch,
                                                   0, lcid, &pTypeInfo);
         if(FAILED(hr)) {
-            ole_raise(hr, rb_eRuntimeError, "failed to GetTypeInfo");
+            ole_raise(hr, eWIN32OLEQueryInterfaceError, "failed to GetTypeInfo");
         }
         hr = pTypeInfo->lpVtbl->GetContainingTypeLib(pTypeInfo, &pTypeLib, &index);
         if(FAILED(hr)) {
             OLE_RELEASE(pTypeInfo);
-            ole_raise(hr, rb_eRuntimeError, "failed to GetContainingTypeLib");
+            ole_raise(hr, eWIN32OLEQueryInterfaceError, "failed to GetContainingTypeLib");
         }
         OLE_RELEASE(pTypeInfo);
         if(!RB_TYPE_P(klass, T_NIL)) {
@@ -2118,7 +2135,7 @@ fole_s_reference_count(VALUE self, VALUE obj)
 {
     struct oledata * pole = NULL;
     pole = oledata_get_struct(obj);
-    return INT2NUM(reference_count(pole));
+    return RB_INT2NUM(reference_count(pole));
 }
 
 /*
@@ -2141,7 +2158,7 @@ fole_s_free(VALUE self, VALUE obj)
             n = OLE_RELEASE(pole->pDispatch);
         }
     }
-    return INT2NUM(n);
+    return RB_INT2NUM(n);
 }
 
 static HWND
@@ -2158,10 +2175,10 @@ ole_show_help(VALUE helpfile, VALUE helpcontext)
     if (!pfnHtmlHelp)
         return hwnd;
     hwnd = pfnHtmlHelp(GetDesktopWindow(), StringValuePtr(helpfile),
-                    0x0f, NUM2INT(helpcontext));
+                    0x0f, RB_NUM2INT(helpcontext));
     if (hwnd == 0)
         hwnd = pfnHtmlHelp(GetDesktopWindow(), StringValuePtr(helpfile),
-                 0,  NUM2INT(helpcontext));
+                 0,  RB_NUM2INT(helpcontext));
     return hwnd;
 }
 
@@ -2218,7 +2235,7 @@ fole_s_show_help(int argc, VALUE *argv, VALUE self)
 static VALUE
 fole_s_get_code_page(VALUE self)
 {
-    return INT2FIX(cWIN32OLE_cp);
+    return RB_INT2FIX(cWIN32OLE_cp);
 }
 
 static BOOL CALLBACK
@@ -2255,7 +2272,7 @@ code_page_installed(UINT cp)
 static VALUE
 fole_s_set_code_page(VALUE self, VALUE vcp)
 {
-    UINT cp = FIX2INT(vcp);
+    UINT cp = RB_FIX2INT(vcp);
     set_ole_codepage(cp);
     /*
      * Should this method return old codepage?
@@ -2275,7 +2292,7 @@ fole_s_set_code_page(VALUE self, VALUE vcp)
 static VALUE
 fole_s_get_locale(VALUE self)
 {
-    return INT2FIX(cWIN32OLE_lcid);
+    return RB_INT2FIX(cWIN32OLE_lcid);
 }
 
 static BOOL
@@ -2310,7 +2327,7 @@ lcid_installed(LCID lcid)
 static VALUE
 fole_s_set_locale(VALUE self, VALUE vlcid)
 {
-    LCID lcid = FIX2INT(vlcid);
+    LCID lcid = RB_FIX2INT(vlcid);
     if (lcid_installed(lcid)) {
         cWIN32OLE_lcid = lcid;
     } else {
@@ -2423,12 +2440,16 @@ fole_s_ole_uninitialize(VALUE self)
 /*
  *  call-seq:
  *     WIN32OLE.new(server, [host]) -> WIN32OLE object
+ *     WIN32OLE.new(server, license: 'key') -> WIN32OLE object
  *
  *  Returns a new WIN32OLE object(OLE Automation object).
  *  The first argument server specifies OLE Automation server.
  *  The first argument should be CLSID or PROGID.
  *  If second argument host specified, then returns OLE Automation
  *  object on host.
+ *  If :license keyword argument is provided,
+ *  IClassFactory2::CreateInstanceLic is used to create instance of
+ *  licensed server.
  *
  *      WIN32OLE.new('Excel.Application') # => Excel OLE Automation WIN32OLE object.
  *      WIN32OLE.new('{00024500-0000-0000-C000-000000000046}') # => Excel OLE Automation WIN32OLE object.
@@ -2439,25 +2460,23 @@ fole_initialize(int argc, VALUE *argv, VALUE self)
     VALUE svr_name;
     VALUE host;
     VALUE others;
+    VALUE opts;
     HRESULT hr;
     CLSID   clsid;
     OLECHAR *pBuf;
+    OLECHAR *key_buf;
     IDispatch *pDispatch;
+    IClassFactory2 * pIClassFactory2;
     void *p;
+    static ID keyword_ids[1];
+    VALUE kwargs[1];
+
     rb_call_super(0, 0);
-    rb_scan_args(argc, argv, "11*", &svr_name, &host, &others);
+    rb_scan_args(argc, argv, "11*:", &svr_name, &host, &others, &opts);
 
     StringValue(svr_name);
-    if (rb_safe_level() > 0 && OBJ_TAINTED(svr_name)) {
-        rb_raise(rb_eSecurityError, "insecure object creation - `%s'",
-                 StringValuePtr(svr_name));
-    }
     if (!NIL_P(host)) {
         StringValue(host);
-        if (rb_safe_level() > 0 && OBJ_TAINTED(host)) {
-            rb_raise(rb_eSecurityError, "insecure object creation - `%s'",
-                     StringValuePtr(host));
-        }
         return ole_create_dcom(self, svr_name, host, others);
     }
 
@@ -2474,9 +2493,35 @@ fole_initialize(int argc, VALUE *argv, VALUE self)
                   StringValuePtr(svr_name));
     }
 
-    /* get IDispatch interface */
-    hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER,
-                          &IID_IDispatch, &p);
+    if (!keyword_ids[0]) {
+        keyword_ids[0] = rb_intern_const("license");
+    }
+    rb_get_kwargs(opts, keyword_ids, 0, 1, kwargs);
+
+    if (kwargs[0] == Qundef) {
+        /* get IDispatch interface */
+        hr = CoCreateInstance(
+            &clsid,
+            NULL,
+            CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER,
+            &IID_IDispatch,
+            &p
+        );
+    } else {
+        hr = CoGetClassObject(
+            &clsid,
+            CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER,
+            NULL,
+            &IID_IClassFactory2,
+            (LPVOID)&pIClassFactory2
+        );
+        if (hr == S_OK) {
+            key_buf = ole_vstr2wc(kwargs[0]);
+            hr = pIClassFactory2->lpVtbl->CreateInstanceLic(pIClassFactory2, NULL, NULL, &IID_IDispatch, key_buf, &p);
+            SysFreeString(key_buf);
+            OLE_RELEASE(pIClassFactory2);
+        }
+    }
     pDispatch = p;
     if(FAILED(hr)) {
         ole_raise(hr, eWIN32OLERuntimeError,
@@ -2593,9 +2638,7 @@ ole_invoke(int argc, VALUE *argv, VALUE self, USHORT wFlags, BOOL is_bracket)
                 &wcmdname, 1, lcid, &DispID);
         SysFreeString(wcmdname);
         if(FAILED(hr)) {
-            ole_raise(hr, rb_eNoMethodError,
-                    "unknown property or method: `%s'",
-                    StringValuePtr(cmd));
+            return rb_eNoMethodError;
         }
     }
 
@@ -2609,7 +2652,7 @@ ole_invoke(int argc, VALUE *argv, VALUE self, USHORT wFlags, BOOL is_bracket)
         /*------------------------------------------
           hash object ==> named dispatch parameters
         --------------------------------------------*/
-        cNamedArgs = rb_long2int(RHASH_SIZE(param));
+        cNamedArgs = rb_long2int((long)RHASH_SIZE(param));
         op.dp.cArgs = cNamedArgs + argc - 2;
         op.pNamedArgs = ALLOCA_N(OLECHAR*, cNamedArgs + 1);
         op.dp.rgvarg = ALLOCA_N(VARIANTARG, op.dp.cArgs);
@@ -2797,7 +2840,11 @@ ole_invoke(int argc, VALUE *argv, VALUE self, USHORT wFlags, BOOL is_bracket)
 static VALUE
 fole_invoke(int argc, VALUE *argv, VALUE self)
 {
-    return ole_invoke(argc, argv, self, DISPATCH_METHOD|DISPATCH_PROPERTYGET, FALSE);
+    VALUE v = ole_invoke(argc, argv, self, DISPATCH_METHOD|DISPATCH_PROPERTYGET, FALSE);
+    if (v == rb_eNoMethodError) {
+        return rb_call_super(argc, argv);
+    }
+    return v;
 }
 
 static VALUE
@@ -2810,8 +2857,7 @@ ole_invoke2(VALUE self, VALUE dispid, VALUE args, VALUE types, USHORT dispkind)
     VARIANT result;
     DISPPARAMS dispParams;
     VARIANTARG* realargs = NULL;
-    int i, j;
-    VALUE obj = Qnil;
+    int i, j; VALUE obj = Qnil;
     VALUE tp, param;
     VALUE v;
     VARTYPE vt;
@@ -2832,7 +2878,7 @@ ole_invoke2(VALUE self, VALUE dispid, VALUE args, VALUE types, USHORT dispkind)
         VariantInit(&realargs[i]);
         VariantInit(&dispParams.rgvarg[i]);
         tp = rb_ary_entry(types, j);
-        vt = (VARTYPE)FIX2INT(tp);
+        vt = (VARTYPE)RB_FIX2INT(tp);
         V_VT(&dispParams.rgvarg[i]) = vt;
         param = rb_ary_entry(args, j);
         if (param == Qnil)
@@ -2967,7 +3013,7 @@ ole_invoke2(VALUE self, VALUE dispid, VALUE args, VALUE types, USHORT dispkind)
         dispParams.rgdispidNamedArgs[0] = DISPID_PROPERTYPUT;
     }
 
-    hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, NUM2INT(dispid),
+    hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, RB_NUM2INT(dispid),
                                          &IID_NULL, cWIN32OLE_lcid,
                                          dispkind,
                                          &dispParams, &result,
@@ -2976,7 +3022,7 @@ ole_invoke2(VALUE self, VALUE dispid, VALUE args, VALUE types, USHORT dispkind)
     if (FAILED(hr)) {
         v = ole_excepinfo2msg(&excepinfo);
         ole_raise(hr, eWIN32OLERuntimeError, "(in OLE method `<dispatch id:%d>': )%s",
-                  NUM2INT(dispid),
+                  RB_NUM2INT(dispid),
                   StringValuePtr(v));
     }
 
@@ -3065,7 +3111,11 @@ fole_setproperty2(VALUE self, VALUE dispid, VALUE args, VALUE types)
 static VALUE
 fole_setproperty_with_bracket(int argc, VALUE *argv, VALUE self)
 {
-    return ole_invoke(argc, argv, self, DISPATCH_PROPERTYPUT, TRUE);
+    VALUE v = ole_invoke(argc, argv, self, DISPATCH_PROPERTYPUT, TRUE);
+    if (v == rb_eNoMethodError) {
+        return rb_call_super(argc, argv);
+    }
+    return v;
 }
 
 /*
@@ -3084,7 +3134,11 @@ fole_setproperty_with_bracket(int argc, VALUE *argv, VALUE self)
 static VALUE
 fole_setproperty(int argc, VALUE *argv, VALUE self)
 {
-    return ole_invoke(argc, argv, self, DISPATCH_PROPERTYPUT, FALSE);
+    VALUE v = ole_invoke(argc, argv, self, DISPATCH_PROPERTYPUT, FALSE);
+    if (v == rb_eNoMethodError) {
+        return rb_call_super(argc, argv);
+    }
+    return v;
 }
 
 /*
@@ -3106,7 +3160,11 @@ fole_setproperty(int argc, VALUE *argv, VALUE self)
 static VALUE
 fole_getproperty_with_bracket(int argc, VALUE *argv, VALUE self)
 {
-    return ole_invoke(argc, argv, self, DISPATCH_PROPERTYGET, TRUE);
+    VALUE v = ole_invoke(argc, argv, self, DISPATCH_PROPERTYGET, TRUE);
+    if (v == rb_eNoMethodError) {
+        return rb_call_super(argc, argv);
+    }
+    return v;
 }
 
 static VALUE
@@ -3256,7 +3314,7 @@ fole_each(VALUE self)
 
     if (FAILED(hr)) {
         VariantClear(&result);
-        ole_raise(hr, eWIN32OLERuntimeError, "failed to get IEnum Interface");
+        ole_raise(hr, eWIN32OLEQueryInterfaceError, "failed to get IEnum Interface");
     }
 
     if (V_VT(&result) == VT_UNKNOWN) {
@@ -3272,7 +3330,7 @@ fole_each(VALUE self)
     }
     if (FAILED(hr) || !pEnum) {
         VariantClear(&result);
-        ole_raise(hr, rb_eRuntimeError, "failed to get IEnum Interface");
+        ole_raise(hr, eWIN32OLEQueryInterfaceError, "failed to get IEnum Interface");
     }
 
     VariantClear(&result);
@@ -3289,11 +3347,11 @@ fole_each(VALUE self)
 static VALUE
 fole_missing(int argc, VALUE *argv, VALUE self)
 {
-    VALUE mid, sym;
+    VALUE mid, org_mid, sym, v;
     const char* mname;
     long n;
     rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
-    mid = argv[0];
+    mid = org_mid = argv[0];
     sym = rb_check_symbol(&mid);
     if (!NIL_P(sym)) mid = rb_sym2str(sym);
     mname = StringValueCStr(mid);
@@ -3309,7 +3367,12 @@ fole_missing(int argc, VALUE *argv, VALUE self)
     }
     else {
         argv[0] = rb_enc_associate(rb_str_dup(mid), cWIN32OLE_enc);
-        return ole_invoke(argc, argv, self, DISPATCH_METHOD|DISPATCH_PROPERTYGET, FALSE);
+        v = ole_invoke(argc, argv, self, DISPATCH_METHOD|DISPATCH_PROPERTYGET, FALSE);
+        if (v == rb_eNoMethodError) {
+            argv[0] = org_mid;
+            return rb_call_super(argc, argv);
+        }
+        return v;
     }
 }
 
@@ -3326,7 +3389,7 @@ typeinfo_from_ole(struct oledata *pole, ITypeInfo **ppti)
     HRESULT hr = pole->pDispatch->lpVtbl->GetTypeInfo(pole->pDispatch,
                                                       0, lcid, &pTypeInfo);
     if(FAILED(hr)) {
-        ole_raise(hr, rb_eRuntimeError, "failed to GetTypeInfo");
+        ole_raise(hr, eWIN32OLEQueryInterfaceError, "failed to GetTypeInfo");
     }
     hr = pTypeInfo->lpVtbl->GetDocumentation(pTypeInfo,
                                              -1,
@@ -3336,7 +3399,7 @@ typeinfo_from_ole(struct oledata *pole, ITypeInfo **ppti)
     hr = pTypeInfo->lpVtbl->GetContainingTypeLib(pTypeInfo, &pTypeLib, &i);
     OLE_RELEASE(pTypeInfo);
     if (FAILED(hr)) {
-        ole_raise(hr, rb_eRuntimeError, "failed to GetContainingTypeLib");
+        ole_raise(hr, eWIN32OLEQueryInterfaceError, "failed to GetContainingTypeLib");
     }
     count = pTypeLib->lpVtbl->GetTypeInfoCount(pTypeLib);
     for (i = 0; i < count; i++) {
@@ -3461,7 +3524,7 @@ fole_type(VALUE self)
 
     hr = pole->pDispatch->lpVtbl->GetTypeInfo( pole->pDispatch, 0, lcid, &pTypeInfo );
     if(FAILED(hr)) {
-        ole_raise(hr, rb_eRuntimeError, "failed to GetTypeInfo");
+        ole_raise(hr, eWIN32OLEQueryInterfaceError, "failed to GetTypeInfo");
     }
     type = ole_type_from_itypeinfo(pTypeInfo);
     OLE_RELEASE(pTypeInfo);
@@ -3495,7 +3558,7 @@ fole_typelib(VALUE self)
     hr = pole->pDispatch->lpVtbl->GetTypeInfo(pole->pDispatch,
                                               0, lcid, &pTypeInfo);
     if(FAILED(hr)) {
-        ole_raise(hr, rb_eRuntimeError, "failed to GetTypeInfo");
+        ole_raise(hr, eWIN32OLEQueryInterfaceError, "failed to GetTypeInfo");
     }
     vtlib = ole_typelib_from_itypeinfo(pTypeInfo);
     OLE_RELEASE(pTypeInfo);
@@ -3542,7 +3605,7 @@ fole_query_interface(VALUE self, VALUE str_iid)
     hr = pole->pDispatch->lpVtbl->QueryInterface(pole->pDispatch, &iid,
                                                  &p);
     if(FAILED(hr)) {
-        ole_raise(hr, eWIN32OLERuntimeError,
+        ole_raise(hr, eWIN32OLEQueryInterfaceError,
                   "failed to get interface `%s'",
                   StringValuePtr(str_iid));
     }
@@ -3752,7 +3815,7 @@ ole_typedesc2val(ITypeInfo *pTypeInfo, TYPEDESC *pTypeDesc, VALUE typedetails)
         break;
     default:
         typestr = rb_str_new2("Unknown Type ");
-        rb_str_concat(typestr, rb_fix2str(INT2FIX(pTypeDesc->vt), 10));
+        rb_str_concat(typestr, rb_fix2str(RB_INT2FIX(pTypeDesc->vt), 10));
         break;
     }
     if (typedetails != Qnil)
@@ -3783,7 +3846,7 @@ fole_method_help(VALUE self, VALUE cmdname)
     pole = oledata_get_struct(self);
     hr = typeinfo_from_ole(pole, &pTypeInfo);
     if(FAILED(hr))
-        ole_raise(hr, rb_eRuntimeError, "failed to get ITypeInfo");
+        ole_raise(hr, eWIN32OLEQueryInterfaceError, "failed to get ITypeInfo");
 
     obj = create_win32ole_method(pTypeInfo, cmdname);
 
@@ -3882,11 +3945,32 @@ com_hash_size(const void *ptr)
     return st_memsize(tbl);
 }
 
+static void
+check_nano_server(void)
+{
+    HKEY hsubkey;
+    LONG err;
+    const char * subkey = "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Server\\ServerLevels";
+    const char * regval = "NanoServer";
+
+    err = RegOpenKeyEx(HKEY_LOCAL_MACHINE, subkey, 0, KEY_READ, &hsubkey);
+    if (err == ERROR_SUCCESS) {
+        err = RegQueryValueEx(hsubkey, regval, NULL, NULL, NULL, NULL);
+        if (err == ERROR_SUCCESS) {
+            g_running_nano = TRUE;
+        }
+        RegCloseKey(hsubkey);
+    }
+}
+
+LCID cWIN32OLE_lcid;
+
 void
 Init_win32ole(void)
 {
     cWIN32OLE_lcid = LOCALE_SYSTEM_DEFAULT;
     g_ole_initialized_init();
+    check_nano_server();
 
     com_vtbl.QueryInterface = QueryInterface;
     com_vtbl.AddRef = AddRef;
@@ -3903,11 +3987,11 @@ Init_win32ole(void)
     message_filter.RetryRejectedCall = mf_RetryRejectedCall;
     message_filter.MessagePending = mf_MessagePending;
 
-    enc2cp_hash = TypedData_Wrap_Struct(rb_cData, &win32ole_hash_datatype, 0);
+    enc2cp_hash = TypedData_Wrap_Struct(0, &win32ole_hash_datatype, 0);
     RTYPEDDATA_DATA(enc2cp_hash) = st_init_numtable();
     rb_gc_register_mark_object(enc2cp_hash);
 
-    com_hash = TypedData_Wrap_Struct(rb_cData, &win32ole_hash_datatype, 0);
+    com_hash = TypedData_Wrap_Struct(0, &win32ole_hash_datatype, 0);
     RTYPEDDATA_DATA(com_hash) = st_init_numtable();
     rb_gc_register_mark_object(com_hash);
 
@@ -3998,50 +4082,50 @@ Init_win32ole(void)
     /*
      * 0: ANSI code page. See WIN32OLE.codepage and WIN32OLE.codepage=.
      */
-    rb_define_const(cWIN32OLE, "CP_ACP", INT2FIX(CP_ACP));
+    rb_define_const(cWIN32OLE, "CP_ACP", RB_INT2FIX(CP_ACP));
 
     /*
      * 1: OEM code page. See WIN32OLE.codepage and WIN32OLE.codepage=.
      */
-    rb_define_const(cWIN32OLE, "CP_OEMCP", INT2FIX(CP_OEMCP));
+    rb_define_const(cWIN32OLE, "CP_OEMCP", RB_INT2FIX(CP_OEMCP));
 
     /*
      * 2
      */
-    rb_define_const(cWIN32OLE, "CP_MACCP", INT2FIX(CP_MACCP));
+    rb_define_const(cWIN32OLE, "CP_MACCP", RB_INT2FIX(CP_MACCP));
 
     /*
      * 3: current thread ANSI code page. See WIN32OLE.codepage and
      * WIN32OLE.codepage=.
      */
-    rb_define_const(cWIN32OLE, "CP_THREAD_ACP", INT2FIX(CP_THREAD_ACP));
+    rb_define_const(cWIN32OLE, "CP_THREAD_ACP", RB_INT2FIX(CP_THREAD_ACP));
 
     /*
      * 42: symbol code page. See WIN32OLE.codepage and WIN32OLE.codepage=.
      */
-    rb_define_const(cWIN32OLE, "CP_SYMBOL", INT2FIX(CP_SYMBOL));
+    rb_define_const(cWIN32OLE, "CP_SYMBOL", RB_INT2FIX(CP_SYMBOL));
 
     /*
      * 65000: UTF-7 code page. See WIN32OLE.codepage and WIN32OLE.codepage=.
      */
-    rb_define_const(cWIN32OLE, "CP_UTF7", INT2FIX(CP_UTF7));
+    rb_define_const(cWIN32OLE, "CP_UTF7", RB_INT2FIX(CP_UTF7));
 
     /*
      * 65001: UTF-8 code page. See WIN32OLE.codepage and WIN32OLE.codepage=.
      */
-    rb_define_const(cWIN32OLE, "CP_UTF8", INT2FIX(CP_UTF8));
+    rb_define_const(cWIN32OLE, "CP_UTF8", RB_INT2FIX(CP_UTF8));
 
     /*
      * 0x0800: default locale for the operating system. See WIN32OLE.locale
      * and WIN32OLE.locale=.
      */
-    rb_define_const(cWIN32OLE, "LOCALE_SYSTEM_DEFAULT", INT2FIX(LOCALE_SYSTEM_DEFAULT));
+    rb_define_const(cWIN32OLE, "LOCALE_SYSTEM_DEFAULT", RB_INT2FIX(LOCALE_SYSTEM_DEFAULT));
 
     /*
      * 0x0400: default locale for the user or process. See WIN32OLE.locale
      * and WIN32OLE.locale=.
      */
-    rb_define_const(cWIN32OLE, "LOCALE_USER_DEFAULT", INT2FIX(LOCALE_USER_DEFAULT));
+    rb_define_const(cWIN32OLE, "LOCALE_USER_DEFAULT", RB_INT2FIX(LOCALE_USER_DEFAULT));
 
     Init_win32ole_variant_m();
     Init_win32ole_typelib();
diff --git a/ext/win32ole/win32ole.gemspec b/ext/win32ole/win32ole.gemspec
new file mode 100644
index 0000000000..021625e44e
--- /dev/null
+++ b/ext/win32ole/win32ole.gemspec
@@ -0,0 +1,21 @@
+Gem::Specification.new do |spec|
+  spec.name          = "win32ole"
+  spec.version       = "1.8.8"
+  spec.authors       = ["Masaki Suketa"]
+  spec.email         = ["suke@ruby-lang.org"]
+
+  spec.summary       = %q{Provides an interface for OLE Automation in Ruby}
+  spec.description   = spec.summary
+  spec.homepage      = "https://github.com/ruby/win32ole"
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+end
diff --git a/ext/win32ole/win32ole.h b/ext/win32ole/win32ole.h
index d61f5e23b4..cd627ef765 100644
--- a/ext/win32ole/win32ole.h
+++ b/ext/win32ole/win32ole.h
@@ -85,13 +85,13 @@
 #ifdef HAVE_LONG_LONG
 #define I8_2_NUM LL2NUM
 #define UI8_2_NUM ULL2NUM
-#define NUM2I8  NUM2LL
-#define NUM2UI8 NUM2ULL
+#define NUM2I8  RB_NUM2LL
+#define NUM2UI8 RB_NUM2ULL
 #else
-#define I8_2_NUM INT2NUM
-#define UI8_2_NUM UINT2NUM
-#define NUM2I8  NUM2INT
-#define NUM2UI8 NUM2UINT
+#define I8_2_NUM RB_INT2NUM
+#define UI8_2_NUM RB_UINT2NUM
+#define NUM2I8  RB_NUM2INT
+#define NUM2UI8 RB_NUM2UINT
 #endif
 
 #define OLE_ADDREF(X) (X) ? ((X)->lpVtbl->AddRef(X)) : 0
@@ -112,8 +112,8 @@ struct oledata {
     IDispatch *pDispatch;
 };
 
-VALUE cWIN32OLE;
-LCID cWIN32OLE_lcid;
+extern VALUE cWIN32OLE;
+extern LCID cWIN32OLE_lcid;
 
 struct oledata *oledata_get_struct(VALUE obj);
 LPWSTR ole_vstr2wc(VALUE vstr);
diff --git a/ext/win32ole/win32ole_error.c b/ext/win32ole/win32ole_error.c
index 62e69b186c..2bb5156263 100644
--- a/ext/win32ole/win32ole_error.c
+++ b/ext/win32ole/win32ole_error.c
@@ -60,6 +60,9 @@ ole_raise(HRESULT hr, VALUE ecs, const char *fmt, ...)
     rb_exc_raise(rb_exc_new_str(ecs, msg));
 }
 
+VALUE eWIN32OLERuntimeError;
+VALUE eWIN32OLEQueryInterfaceError;
+
 void
 Init_win32ole_error(void)
 {
@@ -80,4 +83,5 @@ Init_win32ole_error(void)
      *
      */
     eWIN32OLERuntimeError = rb_define_class("WIN32OLERuntimeError", rb_eRuntimeError);
+    eWIN32OLEQueryInterfaceError = rb_define_class("WIN32OLEQueryInterfaceError", eWIN32OLERuntimeError);
 }
diff --git a/ext/win32ole/win32ole_error.h b/ext/win32ole/win32ole_error.h
index e0eee0ecf9..a2f329856f 100644
--- a/ext/win32ole/win32ole_error.h
+++ b/ext/win32ole/win32ole_error.h
@@ -1,7 +1,8 @@
 #ifndef WIN32OLE_ERROR_H
 #define WIN32OLE_ERROR_H 1
 
-VALUE eWIN32OLERuntimeError;
+extern VALUE eWIN32OLERuntimeError;
+extern VALUE eWIN32OLEQueryInterfaceError;
 NORETURN(PRINTF_ARGS(void ole_raise(HRESULT hr, VALUE ecs, const char *fmt, ...), 3, 4));
 void Init_win32ole_error(void);
 
diff --git a/ext/win32ole/win32ole_event.c b/ext/win32ole/win32ole_event.c
index 577333bfbb..041639af6c 100644
--- a/ext/win32ole/win32ole_event.c
+++ b/ext/win32ole/win32ole_event.c
@@ -342,19 +342,19 @@ ole_val2ptr_variant(VALUE val, VARIANT *var)
     case T_FIXNUM:
         switch(V_VT(var)) {
         case (VT_UI1 | VT_BYREF) :
-            *V_UI1REF(var) = NUM2CHR(val);
+            *V_UI1REF(var) = RB_NUM2CHR(val);
             break;
         case (VT_I2 | VT_BYREF) :
-            *V_I2REF(var) = (short)NUM2INT(val);
+            *V_I2REF(var) = (short)RB_NUM2INT(val);
             break;
         case (VT_I4 | VT_BYREF) :
-            *V_I4REF(var) = NUM2INT(val);
+            *V_I4REF(var) = RB_NUM2INT(val);
             break;
         case (VT_R4 | VT_BYREF) :
-            *V_R4REF(var) = (float)NUM2INT(val);
+            *V_R4REF(var) = (float)RB_NUM2INT(val);
             break;
         case (VT_R8 | VT_BYREF) :
-            *V_R8REF(var) = NUM2INT(val);
+            *V_R8REF(var) = RB_NUM2INT(val);
             break;
         default:
             break;
@@ -363,10 +363,10 @@ ole_val2ptr_variant(VALUE val, VARIANT *var)
     case T_FLOAT:
         switch(V_VT(var)) {
         case (VT_I2 | VT_BYREF) :
-            *V_I2REF(var) = (short)NUM2INT(val);
+            *V_I2REF(var) = (short)RB_NUM2INT(val);
             break;
         case (VT_I4 | VT_BYREF) :
-            *V_I4REF(var) = NUM2INT(val);
+            *V_I4REF(var) = RB_NUM2INT(val);
             break;
         case (VT_R4 | VT_BYREF) :
             *V_R4REF(var) = (float)NUM2DBL(val);
@@ -417,7 +417,7 @@ hash2ptr_dispparams(VALUE hash, ITypeInfo *pTypeInfo, DISPID dispid, DISPPARAMS
 
     for (i = 0; i < len - 1; i++) {
 	key = WC2VSTR(bstrs[i + 1]);
-        val = rb_hash_aref(hash, INT2FIX(i));
+        val = rb_hash_aref(hash, RB_UINT2NUM(i));
 	if (val == Qnil)
 	    val = rb_hash_aref(hash, key);
 	if (val == Qnil)
@@ -922,10 +922,6 @@ ev_advise(int argc, VALUE *argv, VALUE self)
 
     if(!RB_TYPE_P(itf, T_NIL)) {
         pitf = StringValuePtr(itf);
-        if (rb_safe_level() > 0 && OBJ_TAINTED(itf)) {
-            rb_raise(rb_eSecurityError, "insecure event creation - `%s'",
-                     StringValuePtr(itf));
-        }
         hr = find_iid(ole, pitf, &iid, &pTypeInfo);
     }
     else {
@@ -942,7 +938,7 @@ ev_advise(int argc, VALUE *argv, VALUE self)
                                            &p);
     if (FAILED(hr)) {
         OLE_RELEASE(pTypeInfo);
-        ole_raise(hr, rb_eRuntimeError,
+        ole_raise(hr, eWIN32OLEQueryInterfaceError,
                   "failed to query IConnectionPointContainer");
     }
     pContainer = p;
@@ -953,7 +949,7 @@ ev_advise(int argc, VALUE *argv, VALUE self)
     OLE_RELEASE(pContainer);
     if (FAILED(hr)) {
         OLE_RELEASE(pTypeInfo);
-        ole_raise(hr, rb_eRuntimeError, "failed to query IConnectionPoint");
+        ole_raise(hr, eWIN32OLEQueryInterfaceError, "failed to query IConnectionPoint");
     }
     pIEV = EVENTSINK_Constructor();
     pIEV->m_iid = iid;
@@ -961,7 +957,7 @@ ev_advise(int argc, VALUE *argv, VALUE self)
                                           (IUnknown*)pIEV,
                                           &dwCookie);
     if (FAILED(hr)) {
-        ole_raise(hr, rb_eRuntimeError, "Advise Error");
+        ole_raise(hr, eWIN32OLEQueryInterfaceError, "Advise Error");
     }
 
     TypedData_Get_Struct(self, struct oleeventdata, &oleevent_datatype, poleev);
@@ -1264,6 +1260,7 @@ fev_get_handler(VALUE self)
 void
 Init_win32ole_event(void)
 {
+#undef rb_intern
     ary_ole_event = rb_ary_new();
     rb_gc_register_mark_object(ary_ole_event);
     id_events = rb_intern("events");
diff --git a/ext/win32ole/win32ole_method.c b/ext/win32ole/win32ole_method.c
index ba8cf78015..bf668300c2 100644
--- a/ext/win32ole/win32ole_method.c
+++ b/ext/win32ole/win32ole_method.c
@@ -83,7 +83,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, eWIN32OLEQueryInterfaceError, "failed to GetTypeAttr");
     }
     for(i = 0; i < pTypeAttr->cFuncs && method == Qnil; i++) {
         hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, i, &pFuncDesc);
@@ -119,7 +119,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, eWIN32OLEQueryInterfaceError, "failed to GetTypeAttr");
     }
 
     ole_methods_sub(0, pTypeInfo, methods, mask);
@@ -148,7 +148,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, eWIN32OLEQueryInterfaceError, "failed to GetTypeAttr");
     }
     method = ole_method_sub(self, 0, pTypeInfo, name);
     if (method != Qnil) {
@@ -179,7 +179,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, eWIN32OLEQueryInterfaceError, "failed to GetTypeAttr");
     }
     for(i = 0; i < pTypeAttr->cFuncs; i++) {
         hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, i, &pFuncDesc);
@@ -283,7 +283,7 @@ folemethod_initialize(VALUE self, VALUE oletype, VALUE method)
 }
 
 /*
- *  call-seq
+ *  call-seq:
  *     WIN32OLE_METHOD#name
  *
  *  Returns the name of the method.
@@ -308,7 +308,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, eWIN32OLEQueryInterfaceError, "failed to GetFuncDesc");
 
     type = ole_typedesc2val(pTypeInfo, &(pFuncDesc->elemdescFunc.tdesc), Qnil);
     pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
@@ -344,7 +344,7 @@ ole_method_return_vtype(ITypeInfo *pTypeInfo, UINT method_index)
     if (FAILED(hr))
         ole_raise(hr, eWIN32OLERuntimeError, "failed to GetFuncDesc");
 
-    vvt = INT2FIX(pFuncDesc->elemdescFunc.tdesc.vt);
+    vvt = RB_INT2FIX(pFuncDesc->elemdescFunc.tdesc.vt);
     pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
     return vvt;
 }
@@ -410,7 +410,7 @@ ole_method_invkind(ITypeInfo *pTypeInfo, UINT method_index)
     hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
     if(FAILED(hr))
         ole_raise(hr, eWIN32OLERuntimeError, "failed to GetFuncDesc");
-    invkind = INT2FIX(pFuncDesc->invkind);
+    invkind = RB_INT2FIX(pFuncDesc->invkind);
     pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
     return invkind;
 }
@@ -420,16 +420,16 @@ ole_method_invoke_kind(ITypeInfo *pTypeInfo, UINT method_index)
 {
     VALUE type = rb_str_new2("UNKNOWN");
     VALUE invkind = ole_method_invkind(pTypeInfo, method_index);
-    if((FIX2INT(invkind) & INVOKE_PROPERTYGET) &&
-       (FIX2INT(invkind) & INVOKE_PROPERTYPUT) ) {
+    if((RB_FIX2INT(invkind) & INVOKE_PROPERTYGET) &&
+       (RB_FIX2INT(invkind) & INVOKE_PROPERTYPUT) ) {
         type = rb_str_new2("PROPERTY");
-    } else if(FIX2INT(invkind) & INVOKE_PROPERTYGET) {
+    } else if(RB_FIX2INT(invkind) & INVOKE_PROPERTYGET) {
         type =  rb_str_new2("PROPERTYGET");
-    } else if(FIX2INT(invkind) & INVOKE_PROPERTYPUT) {
+    } else if(RB_FIX2INT(invkind) & INVOKE_PROPERTYPUT) {
         type = rb_str_new2("PROPERTYPUT");
-    } else if(FIX2INT(invkind) & INVOKE_PROPERTYPUTREF) {
+    } else if(RB_FIX2INT(invkind) & INVOKE_PROPERTYPUTREF) {
         type = rb_str_new2("PROPERTYPUTREF");
-    } else if(FIX2INT(invkind) & INVOKE_FUNC) {
+    } else if(RB_FIX2INT(invkind) & INVOKE_FUNC) {
         type = rb_str_new2("FUNC");
     }
     return type;
@@ -712,7 +712,7 @@ ole_method_helpcontext(ITypeInfo *pTypeInfo, UINT method_index)
                                       &helpcontext, NULL);
     if (FAILED(hr))
         return Qnil;
-    return INT2FIX(helpcontext);
+    return RB_INT2FIX(helpcontext);
 }
 
 /*
@@ -741,7 +741,7 @@ ole_method_dispid(ITypeInfo *pTypeInfo, UINT method_index)
     hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
     if (FAILED(hr))
         return dispid;
-    dispid = INT2NUM(pFuncDesc->memid);
+    dispid = RB_INT2NUM(pFuncDesc->memid);
     pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
     return dispid;
 }
@@ -772,7 +772,7 @@ ole_method_offset_vtbl(ITypeInfo *pTypeInfo, UINT method_index)
     hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
     if (FAILED(hr))
         return offset_vtbl;
-    offset_vtbl = INT2FIX(pFuncDesc->oVft);
+    offset_vtbl = RB_INT2FIX(pFuncDesc->oVft);
     pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
     return offset_vtbl;
 }
@@ -803,7 +803,7 @@ ole_method_size_params(ITypeInfo *pTypeInfo, UINT method_index)
     hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
     if (FAILED(hr))
         return size_params;
-    size_params = INT2FIX(pFuncDesc->cParams);
+    size_params = RB_INT2FIX(pFuncDesc->cParams);
     pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
     return size_params;
 }
@@ -835,7 +835,7 @@ ole_method_size_opt_params(ITypeInfo *pTypeInfo, UINT method_index)
     hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
     if (FAILED(hr))
         return size_opt_params;
-    size_opt_params = INT2FIX(pFuncDesc->cParamsOpt);
+    size_opt_params = RB_INT2FIX(pFuncDesc->cParamsOpt);
     pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
     return size_opt_params;
 }
@@ -923,6 +923,8 @@ folemethod_inspect(VALUE self)
     return default_inspect(self, "WIN32OLE_METHOD");
 }
 
+VALUE cWIN32OLE_METHOD;
+
 void Init_win32ole_method(void)
 {
     cWIN32OLE_METHOD = rb_define_class("WIN32OLE_METHOD", rb_cObject);
diff --git a/ext/win32ole/win32ole_method.h b/ext/win32ole/win32ole_method.h
index ff2898ebeb..ef907d2fac 100644
--- a/ext/win32ole/win32ole_method.h
+++ b/ext/win32ole/win32ole_method.h
@@ -7,7 +7,7 @@ struct olemethoddata {
     UINT index;
 };
 
-VALUE cWIN32OLE_METHOD;
+extern VALUE cWIN32OLE_METHOD;
 VALUE folemethod_s_allocate(VALUE klass);
 VALUE ole_methods_from_typeinfo(ITypeInfo *pTypeInfo, int mask);
 VALUE create_win32ole_method(ITypeInfo *pTypeInfo, VALUE name);
diff --git a/ext/win32ole/win32ole_param.c b/ext/win32ole/win32ole_param.c
index 31cf853b04..52905b3e8e 100644
--- a/ext/win32ole/win32ole_param.c
+++ b/ext/win32ole/win32ole_param.c
@@ -149,7 +149,7 @@ foleparam_initialize(VALUE self, VALUE olemethod, VALUE n)
     if (!rb_obj_is_kind_of(olemethod, cWIN32OLE_METHOD)) {
         rb_raise(rb_eTypeError, "1st parameter must be WIN32OLE_METHOD object");
     }
-    idx = FIX2INT(n);
+    idx = RB_FIX2INT(n);
     return oleparam_ole_param(self, olemethod, idx);
 }
 
diff --git a/ext/win32ole/win32ole_record.c b/ext/win32ole/win32ole_record.c
index e8838832a7..03523bc47d 100644
--- a/ext/win32ole/win32ole_record.c
+++ b/ext/win32ole/win32ole_record.c
@@ -589,6 +589,8 @@ folerecord_inspect(VALUE self)
                       field);
 }
 
+VALUE cWIN32OLE_RECORD;
+
 void
 Init_win32ole_record(void)
 {
diff --git a/ext/win32ole/win32ole_record.h b/ext/win32ole/win32ole_record.h
index ea431e91f7..ab1df0ee7f 100644
--- a/ext/win32ole/win32ole_record.h
+++ b/ext/win32ole/win32ole_record.h
@@ -1,7 +1,7 @@
 #ifndef WIN32OLE_RECORD_H
 #define WIN32OLE_RECORD_H 1
 
-VALUE cWIN32OLE_RECORD;
+extern VALUE cWIN32OLE_RECORD;
 void ole_rec2variant(VALUE rec, VARIANT *var);
 void olerecord_set_ivar(VALUE obj, IRecordInfo *pri, void *prec);
 VALUE create_win32ole_record(IRecordInfo *pri, void *prec);
diff --git a/ext/win32ole/win32ole_type.c b/ext/win32ole/win32ole_type.c
index efcac883df..fa39bf3696 100644
--- a/ext/win32ole/win32ole_type.c
+++ b/ext/win32ole/win32ole_type.c
@@ -468,7 +468,7 @@ ole_type_major_version(ITypeInfo *pTypeInfo)
     hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
     if (FAILED(hr))
         ole_raise(hr, eWIN32OLERuntimeError, "failed to GetTypeAttr");
-    ver = INT2FIX(pTypeAttr->wMajorVerNum);
+    ver = RB_INT2FIX(pTypeAttr->wMajorVerNum);
     OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
     return ver;
 }
@@ -497,7 +497,7 @@ ole_type_minor_version(ITypeInfo *pTypeInfo)
     hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
     if (FAILED(hr))
         ole_raise(hr, eWIN32OLERuntimeError, "failed to GetTypeAttr");
-    ver = INT2FIX(pTypeAttr->wMinorVerNum);
+    ver = RB_INT2FIX(pTypeAttr->wMinorVerNum);
     OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
     return ver;
 }
@@ -526,7 +526,7 @@ ole_type_typekind(ITypeInfo *pTypeInfo)
     hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
     if (FAILED(hr))
         ole_raise(hr, eWIN32OLERuntimeError, "failed to GetTypeAttr");
-    typekind = INT2FIX(pTypeAttr->typekind);
+    typekind = RB_INT2FIX(pTypeAttr->typekind);
     OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
     return typekind;
 }
@@ -645,7 +645,7 @@ ole_type_helpcontext(ITypeInfo *pTypeInfo)
                                &helpcontext, NULL);
     if(FAILED(hr))
         return Qnil;
-    return INT2FIX(helpcontext);
+    return RB_INT2FIX(helpcontext);
 }
 
 /*
@@ -883,6 +883,8 @@ foletype_inspect(VALUE self)
     return default_inspect(self, "WIN32OLE_TYPE");
 }
 
+VALUE cWIN32OLE_TYPE;
+
 void Init_win32ole_type(void)
 {
     cWIN32OLE_TYPE = rb_define_class("WIN32OLE_TYPE", rb_cObject);
diff --git a/ext/win32ole/win32ole_type.h b/ext/win32ole/win32ole_type.h
index a26bf3e043..87b551e502 100644
--- a/ext/win32ole/win32ole_type.h
+++ b/ext/win32ole/win32ole_type.h
@@ -1,6 +1,6 @@
 #ifndef WIN32OLE_TYPE_H
 #define WIN32OLE_TYPE_H 1
-VALUE cWIN32OLE_TYPE;
+extern VALUE cWIN32OLE_TYPE;
 VALUE create_win32ole_type(ITypeInfo *pTypeInfo, VALUE name);
 ITypeInfo *itypeinfo(VALUE self);
 VALUE ole_type_from_itypeinfo(ITypeInfo *pTypeInfo);
diff --git a/ext/win32ole/win32ole_typelib.c b/ext/win32ole/win32ole_typelib.c
index 4f2c42fb76..d89f181e07 100644
--- a/ext/win32ole/win32ole_typelib.c
+++ b/ext/win32ole/win32ole_typelib.c
@@ -539,7 +539,7 @@ foletypelib_major_version(VALUE self)
     pTypeLib = itypelib(self);
     oletypelib_get_libattr(pTypeLib, &pTLibAttr);
 
-    major =  INT2NUM(pTLibAttr->wMajorVerNum);
+    major =  RB_INT2NUM(pTLibAttr->wMajorVerNum);
     pTypeLib->lpVtbl->ReleaseTLibAttr(pTypeLib, pTLibAttr);
     return major;
 }
@@ -561,7 +561,7 @@ foletypelib_minor_version(VALUE self)
     ITypeLib *pTypeLib;
     pTypeLib = itypelib(self);
     oletypelib_get_libattr(pTypeLib, &pTLibAttr);
-    minor =  INT2NUM(pTLibAttr->wMinorVerNum);
+    minor =  RB_INT2NUM(pTLibAttr->wMinorVerNum);
     pTypeLib->lpVtbl->ReleaseTLibAttr(pTypeLib, pTLibAttr);
     return minor;
 }
@@ -822,6 +822,8 @@ foletypelib_inspect(VALUE self)
     return default_inspect(self, "WIN32OLE_TYPELIB");
 }
 
+VALUE cWIN32OLE_TYPELIB;
+
 void
 Init_win32ole_typelib(void)
 {
diff --git a/ext/win32ole/win32ole_typelib.h b/ext/win32ole/win32ole_typelib.h
index 9fc117fcb4..2c2730bb58 100644
--- a/ext/win32ole/win32ole_typelib.h
+++ b/ext/win32ole/win32ole_typelib.h
@@ -1,7 +1,7 @@
 #ifndef WIN32OLE_TYPELIB_H
 #define WIN32OLE_TYPELIB_H 1
 
-VALUE cWIN32OLE_TYPELIB;
+extern VALUE cWIN32OLE_TYPELIB;
 
 void Init_win32ole_typelib(void);
 ITypeLib * itypelib(VALUE self);
diff --git a/ext/win32ole/win32ole_variable.c b/ext/win32ole/win32ole_variable.c
index dd583828f2..803083156c 100644
--- a/ext/win32ole/win32ole_variable.c
+++ b/ext/win32ole/win32ole_variable.c
@@ -319,7 +319,7 @@ ole_variable_varkind(ITypeInfo *pTypeInfo, UINT var_index)
     if (FAILED(hr))
         return kind;
     pTypeInfo->lpVtbl->ReleaseVarDesc(pTypeInfo, pVarDesc);
-    kind = INT2FIX(pVarDesc->varkind);
+    kind = RB_INT2FIX(pVarDesc->varkind);
     return kind;
 }
 
@@ -365,6 +365,8 @@ folevariable_inspect(VALUE self)
     return make_inspect("WIN32OLE_VARIABLE", detail);
 }
 
+VALUE cWIN32OLE_VARIABLE;
+
 void Init_win32ole_variable(void)
 {
     cWIN32OLE_VARIABLE = rb_define_class("WIN32OLE_VARIABLE", rb_cObject);
diff --git a/ext/win32ole/win32ole_variable.h b/ext/win32ole/win32ole_variable.h
index 704dc13508..209613fd44 100644
--- a/ext/win32ole/win32ole_variable.h
+++ b/ext/win32ole/win32ole_variable.h
@@ -1,7 +1,7 @@
 #ifndef WIN32OLE_VARIABLE_H
 #define WIN32OLE_VARIABLE_H 1
 
-VALUE cWIN32OLE_VARIABLE;
+extern VALUE cWIN32OLE_VARIABLE;
 VALUE create_win32ole_variable(ITypeInfo *pTypeInfo, UINT index, VALUE name);
 void Init_win32ole_variable(void);
 
diff --git a/ext/win32ole/win32ole_variant.c b/ext/win32ole/win32ole_variant.c
index f1fdeca038..93f0636593 100644
--- a/ext/win32ole/win32ole_variant.c
+++ b/ext/win32ole/win32ole_variant.c
@@ -155,12 +155,12 @@ ole_val2variant_err(VALUE val, VARIANT *var)
     if (rb_obj_is_kind_of(v, cWIN32OLE_VARIANT)) {
         v = folevariant_value(v);
     }
-    if (TYPE(v) != T_FIXNUM && TYPE(v) != T_BIGNUM && v != Qnil) {
+    if (!(FIXNUM_P(v) || RB_TYPE_P(v, T_BIGNUM) || v == Qnil)) {
         rb_raise(eWIN32OLERuntimeError, "failed to convert VT_ERROR VARIANT:`%"PRIsVALUE"'", rb_inspect(v));
     }
     V_VT(var) = VT_ERROR;
     if (v != Qnil) {
-        V_ERROR(var) = NUM2LONG(val);
+        V_ERROR(var) = RB_NUM2LONG(val);
     } else {
         V_ERROR(var) = 0;
     }
@@ -294,7 +294,7 @@ folevariant_s_array(VALUE klass, VALUE elems, VALUE vvt)
 
     ole_initialize();
 
-    vt = NUM2UINT(vvt);
+    vt = RB_NUM2UINT(vvt);
     vt = (vt | VT_ARRAY);
     Check_Type(elems, T_ARRAY);
     obj = folevariant_s_allocate(klass);
@@ -309,7 +309,7 @@ folevariant_s_array(VALUE klass, VALUE elems, VALUE vvt)
     }
 
     for (i = 0; i < dim; i++) {
-        psab[i].cElements = FIX2INT(rb_ary_entry(elems, i));
+        psab[i].cElements = RB_FIX2INT(rb_ary_entry(elems, i));
         psab[i].lLbound = 0;
     }
 
@@ -420,7 +420,7 @@ folevariant_initialize(VALUE self, VALUE args)
         ole_val2variant(val, &(pvar->var));
     } else {
         vvt = rb_ary_entry(args, 1);
-        vt = NUM2INT(vvt);
+        vt = RB_NUM2INT(vvt);
         if ((vt & VT_TYPEMASK) == VT_RECORD) {
             rb_raise(rb_eArgError, "not supported VT_RECORD WIN32OLE_VARIANT object");
         }
@@ -465,7 +465,7 @@ ary2safe_array_index(int ary_size, VALUE *ary, SAFEARRAY *psa)
         rb_raise(rb_eRuntimeError, "failed to allocate memory for indices");
     }
     for (i = 0; i < dim; i++) {
-        pid[i] = NUM2INT(ary[i]);
+        pid[i] = RB_NUM2INT(ary[i]);
     }
     return pid;
 }
@@ -602,7 +602,7 @@ folevariant_ary_aset(int argc, VALUE *argv, VALUE self)
  *
  *  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")
+ *     obj.value # => "1" (not Integer object, but String object "1")
  *
  */
 static VALUE
@@ -649,7 +649,7 @@ folevariant_vartype(VALUE self)
 {
     struct olevariantdata *pvar;
     TypedData_Get_Struct(self, struct olevariantdata, &olevariant_datatype, pvar);
-    return INT2FIX(V_VT(&pvar->var));
+    return RB_INT2FIX(V_VT(&pvar->var));
 }
 
 /*
@@ -659,7 +659,7 @@ folevariant_vartype(VALUE self)
  *  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).
+ *  This 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
@@ -689,9 +689,12 @@ ole_variant2variant(VALUE val, VARIANT *var)
     VariantCopy(var, &(pvar->var));
 }
 
+VALUE cWIN32OLE_VARIANT;
+
 void
 Init_win32ole_variant(void)
 {
+#undef rb_intern
     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);
@@ -706,19 +709,19 @@ Init_win32ole_variant(void)
      * represents VT_EMPTY OLE object.
      */
     rb_define_const(cWIN32OLE_VARIANT, "Empty",
-            rb_funcall(cWIN32OLE_VARIANT, rb_intern("new"), 2, Qnil, INT2FIX(VT_EMPTY)));
+            rb_funcall(cWIN32OLE_VARIANT, rb_intern("new"), 2, Qnil, RB_INT2FIX(VT_EMPTY)));
 
     /*
      * represents VT_NULL OLE object.
      */
     rb_define_const(cWIN32OLE_VARIANT, "Null",
-            rb_funcall(cWIN32OLE_VARIANT, rb_intern("new"), 2, Qnil, INT2FIX(VT_NULL)));
+            rb_funcall(cWIN32OLE_VARIANT, rb_intern("new"), 2, Qnil, RB_INT2FIX(VT_NULL)));
 
     /*
      * represents Nothing of VB.NET or VB.
      */
     rb_define_const(cWIN32OLE_VARIANT, "Nothing",
-            rb_funcall(cWIN32OLE_VARIANT, rb_intern("new"), 2, Qnil, INT2FIX(VT_DISPATCH)));
+            rb_funcall(cWIN32OLE_VARIANT, rb_intern("new"), 2, Qnil, RB_INT2FIX(VT_DISPATCH)));
 
     /*
      * represents VT_ERROR variant with DISP_E_PARAMNOTFOUND.
@@ -728,5 +731,5 @@ Init_win32ole_variant(void)
      *  fso.openTextFile(filename, WIN32OLE_VARIANT::NoParam, false)
      */
     rb_define_const(cWIN32OLE_VARIANT, "NoParam",
-            rb_funcall(cWIN32OLE_VARIANT, rb_intern("new"), 2, INT2NUM(DISP_E_PARAMNOTFOUND), INT2FIX(VT_ERROR)));
+            rb_funcall(cWIN32OLE_VARIANT, rb_intern("new"), 2, INT2NUM(DISP_E_PARAMNOTFOUND), RB_INT2FIX(VT_ERROR)));
 }
diff --git a/ext/win32ole/win32ole_variant.h b/ext/win32ole/win32ole_variant.h
index efe7ea8bef..4bd3b0aeea 100644
--- a/ext/win32ole/win32ole_variant.h
+++ b/ext/win32ole/win32ole_variant.h
@@ -1,7 +1,7 @@
 #ifndef WIN32OLE_VARIANT_H
 #define WIN32OLE_VARIANT_H 1
 
-VALUE cWIN32OLE_VARIANT;
+extern VALUE cWIN32OLE_VARIANT;
 void ole_variant2variant(VALUE val, VARIANT *var);
 void Init_win32ole_variant(void);
 
diff --git a/ext/win32ole/win32ole_variant_m.c b/ext/win32ole/win32ole_variant_m.c
index eb3b0b11bb..145c08a16e 100644
--- a/ext/win32ole/win32ole_variant_m.c
+++ b/ext/win32ole/win32ole_variant_m.c
@@ -1,5 +1,7 @@
 #include "win32ole.h"
 
+VALUE mWIN32OLE_VARIANT;
+
 void Init_win32ole_variant_m(void)
 {
     /*
@@ -17,133 +19,133 @@ void Init_win32ole_variant_m(void)
     /*
      * represents VT_EMPTY type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_EMPTY", INT2FIX(VT_EMPTY));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_EMPTY", RB_INT2FIX(VT_EMPTY));
 
     /*
      * represents VT_NULL type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_NULL", INT2FIX(VT_NULL));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_NULL", RB_INT2FIX(VT_NULL));
 
     /*
      * represents VT_I2 type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_I2", INT2FIX(VT_I2));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_I2", RB_INT2FIX(VT_I2));
 
     /*
      * represents VT_I4 type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_I4", INT2FIX(VT_I4));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_I4", RB_INT2FIX(VT_I4));
 
     /*
      * represents VT_R4 type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_R4", INT2FIX(VT_R4));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_R4", RB_INT2FIX(VT_R4));
 
     /*
      * represents VT_R8 type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_R8", INT2FIX(VT_R8));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_R8", RB_INT2FIX(VT_R8));
 
     /*
      * represents VT_CY type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_CY", INT2FIX(VT_CY));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_CY", RB_INT2FIX(VT_CY));
 
     /*
      * represents VT_DATE type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_DATE", INT2FIX(VT_DATE));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_DATE", RB_INT2FIX(VT_DATE));
 
     /*
      * represents VT_BSTR type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_BSTR", INT2FIX(VT_BSTR));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_BSTR", RB_INT2FIX(VT_BSTR));
 
     /*
      * represents VT_USERDEFINED type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_USERDEFINED", INT2FIX(VT_USERDEFINED));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_USERDEFINED", RB_INT2FIX(VT_USERDEFINED));
 
     /*
      * represents VT_PTR type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_PTR", INT2FIX(VT_PTR));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_PTR", RB_INT2FIX(VT_PTR));
 
     /*
      * represents VT_DISPATCH type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_DISPATCH", INT2FIX(VT_DISPATCH));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_DISPATCH", RB_INT2FIX(VT_DISPATCH));
 
     /*
      * represents VT_ERROR type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_ERROR", INT2FIX(VT_ERROR));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_ERROR", RB_INT2FIX(VT_ERROR));
 
     /*
      * represents VT_BOOL type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_BOOL", INT2FIX(VT_BOOL));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_BOOL", RB_INT2FIX(VT_BOOL));
 
     /*
      * represents VT_VARIANT type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_VARIANT", INT2FIX(VT_VARIANT));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_VARIANT", RB_INT2FIX(VT_VARIANT));
 
     /*
      * represents VT_UNKNOWN type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_UNKNOWN", INT2FIX(VT_UNKNOWN));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_UNKNOWN", RB_INT2FIX(VT_UNKNOWN));
 
     /*
      * represents VT_I1 type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_I1", INT2FIX(VT_I1));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_I1", RB_INT2FIX(VT_I1));
 
     /*
      * represents VT_UI1 type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_UI1", INT2FIX(VT_UI1));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_UI1", RB_INT2FIX(VT_UI1));
 
     /*
      * represents VT_UI2 type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_UI2", INT2FIX(VT_UI2));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_UI2", RB_INT2FIX(VT_UI2));
 
     /*
      * represents VT_UI4 type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_UI4", INT2FIX(VT_UI4));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_UI4", RB_INT2FIX(VT_UI4));
 
 #if (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__)
     /*
      * represents VT_I8 type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_I8", INT2FIX(VT_I8));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_I8", RB_INT2FIX(VT_I8));
 
     /*
      * represents VT_UI8 type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_UI8", INT2FIX(VT_UI8));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_UI8", RB_INT2FIX(VT_UI8));
 #endif
 
     /*
      * represents VT_INT type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_INT", INT2FIX(VT_INT));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_INT", RB_INT2FIX(VT_INT));
 
     /*
      * represents VT_UINT type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_UINT", INT2FIX(VT_UINT));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_UINT", RB_INT2FIX(VT_UINT));
 
     /*
      * represents VT_ARRAY type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_ARRAY", INT2FIX(VT_ARRAY));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_ARRAY", RB_INT2FIX(VT_ARRAY));
 
     /*
      * represents VT_BYREF type constant.
      */
-    rb_define_const(mWIN32OLE_VARIANT, "VT_BYREF", INT2FIX(VT_BYREF));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_BYREF", RB_INT2FIX(VT_BYREF));
 
 }
diff --git a/ext/win32ole/win32ole_variant_m.h b/ext/win32ole/win32ole_variant_m.h
index afbef30218..6272a6578f 100644
--- a/ext/win32ole/win32ole_variant_m.h
+++ b/ext/win32ole/win32ole_variant_m.h
@@ -1,7 +1,7 @@
 #ifndef WIN32OLE_VARIANT_M_H
 #define WIN32OLE_VARIANT_M_H 1
 
-VALUE mWIN32OLE_VARIANT;
+extern VALUE mWIN32OLE_VARIANT;
 void Init_win32ole_variant_m(void);
 
 #endif
diff --git a/ext/zlib/.gitignore b/ext/zlib/.gitignore
new file mode 100644
index 0000000000..069491b4b4
--- /dev/null
+++ b/ext/zlib/.gitignore
@@ -0,0 +1 @@
+/zlib-[1-9]*.*.*
diff --git a/ext/zlib/depend b/ext/zlib/depend
index 9d47df2a8d..5433affc69 100644
--- a/ext/zlib/depend
+++ b/ext/zlib/depend
@@ -1,5 +1,168 @@
-$(OBJS): $(HDRS) $(ruby_headers) \
-  $(hdrdir)/ruby/io.h \
-  $(hdrdir)/ruby/encoding.h \
-  $(hdrdir)/ruby/oniguruma.h \
-  $(hdrdir)/ruby/thread.h
+# AUTOGENERATED DEPENDENCIES START
+zlib.o: $(RUBY_EXTCONF_H)
+zlib.o: $(arch_hdrdir)/ruby/config.h
+zlib.o: $(hdrdir)/ruby.h
+zlib.o: $(hdrdir)/ruby/internal/anyargs.h
+zlib.o: $(hdrdir)/ruby/internal/arithmetic.h
+zlib.o: $(hdrdir)/ruby/internal/arithmetic/char.h
+zlib.o: $(hdrdir)/ruby/internal/arithmetic/double.h
+zlib.o: $(hdrdir)/ruby/internal/arithmetic/fixnum.h
+zlib.o: $(hdrdir)/ruby/internal/arithmetic/gid_t.h
+zlib.o: $(hdrdir)/ruby/internal/arithmetic/int.h
+zlib.o: $(hdrdir)/ruby/internal/arithmetic/intptr_t.h
+zlib.o: $(hdrdir)/ruby/internal/arithmetic/long.h
+zlib.o: $(hdrdir)/ruby/internal/arithmetic/long_long.h
+zlib.o: $(hdrdir)/ruby/internal/arithmetic/mode_t.h
+zlib.o: $(hdrdir)/ruby/internal/arithmetic/off_t.h
+zlib.o: $(hdrdir)/ruby/internal/arithmetic/pid_t.h
+zlib.o: $(hdrdir)/ruby/internal/arithmetic/short.h
+zlib.o: $(hdrdir)/ruby/internal/arithmetic/size_t.h
+zlib.o: $(hdrdir)/ruby/internal/arithmetic/st_data_t.h
+zlib.o: $(hdrdir)/ruby/internal/arithmetic/uid_t.h
+zlib.o: $(hdrdir)/ruby/internal/assume.h
+zlib.o: $(hdrdir)/ruby/internal/attr/alloc_size.h
+zlib.o: $(hdrdir)/ruby/internal/attr/artificial.h
+zlib.o: $(hdrdir)/ruby/internal/attr/cold.h
+zlib.o: $(hdrdir)/ruby/internal/attr/const.h
+zlib.o: $(hdrdir)/ruby/internal/attr/constexpr.h
+zlib.o: $(hdrdir)/ruby/internal/attr/deprecated.h
+zlib.o: $(hdrdir)/ruby/internal/attr/diagnose_if.h
+zlib.o: $(hdrdir)/ruby/internal/attr/enum_extensibility.h
+zlib.o: $(hdrdir)/ruby/internal/attr/error.h
+zlib.o: $(hdrdir)/ruby/internal/attr/flag_enum.h
+zlib.o: $(hdrdir)/ruby/internal/attr/forceinline.h
+zlib.o: $(hdrdir)/ruby/internal/attr/format.h
+zlib.o: $(hdrdir)/ruby/internal/attr/maybe_unused.h
+zlib.o: $(hdrdir)/ruby/internal/attr/noalias.h
+zlib.o: $(hdrdir)/ruby/internal/attr/nodiscard.h
+zlib.o: $(hdrdir)/ruby/internal/attr/noexcept.h
+zlib.o: $(hdrdir)/ruby/internal/attr/noinline.h
+zlib.o: $(hdrdir)/ruby/internal/attr/nonnull.h
+zlib.o: $(hdrdir)/ruby/internal/attr/noreturn.h
+zlib.o: $(hdrdir)/ruby/internal/attr/pure.h
+zlib.o: $(hdrdir)/ruby/internal/attr/restrict.h
+zlib.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h
+zlib.o: $(hdrdir)/ruby/internal/attr/warning.h
+zlib.o: $(hdrdir)/ruby/internal/attr/weakref.h
+zlib.o: $(hdrdir)/ruby/internal/cast.h
+zlib.o: $(hdrdir)/ruby/internal/compiler_is.h
+zlib.o: $(hdrdir)/ruby/internal/compiler_is/apple.h
+zlib.o: $(hdrdir)/ruby/internal/compiler_is/clang.h
+zlib.o: $(hdrdir)/ruby/internal/compiler_is/gcc.h
+zlib.o: $(hdrdir)/ruby/internal/compiler_is/intel.h
+zlib.o: $(hdrdir)/ruby/internal/compiler_is/msvc.h
+zlib.o: $(hdrdir)/ruby/internal/compiler_is/sunpro.h
+zlib.o: $(hdrdir)/ruby/internal/compiler_since.h
+zlib.o: $(hdrdir)/ruby/internal/config.h
+zlib.o: $(hdrdir)/ruby/internal/constant_p.h
+zlib.o: $(hdrdir)/ruby/internal/core.h
+zlib.o: $(hdrdir)/ruby/internal/core/rarray.h
+zlib.o: $(hdrdir)/ruby/internal/core/rbasic.h
+zlib.o: $(hdrdir)/ruby/internal/core/rbignum.h
+zlib.o: $(hdrdir)/ruby/internal/core/rclass.h
+zlib.o: $(hdrdir)/ruby/internal/core/rdata.h
+zlib.o: $(hdrdir)/ruby/internal/core/rfile.h
+zlib.o: $(hdrdir)/ruby/internal/core/rhash.h
+zlib.o: $(hdrdir)/ruby/internal/core/robject.h
+zlib.o: $(hdrdir)/ruby/internal/core/rregexp.h
+zlib.o: $(hdrdir)/ruby/internal/core/rstring.h
+zlib.o: $(hdrdir)/ruby/internal/core/rstruct.h
+zlib.o: $(hdrdir)/ruby/internal/core/rtypeddata.h
+zlib.o: $(hdrdir)/ruby/internal/ctype.h
+zlib.o: $(hdrdir)/ruby/internal/dllexport.h
+zlib.o: $(hdrdir)/ruby/internal/dosish.h
+zlib.o: $(hdrdir)/ruby/internal/error.h
+zlib.o: $(hdrdir)/ruby/internal/eval.h
+zlib.o: $(hdrdir)/ruby/internal/event.h
+zlib.o: $(hdrdir)/ruby/internal/fl_type.h
+zlib.o: $(hdrdir)/ruby/internal/gc.h
+zlib.o: $(hdrdir)/ruby/internal/glob.h
+zlib.o: $(hdrdir)/ruby/internal/globals.h
+zlib.o: $(hdrdir)/ruby/internal/has/attribute.h
+zlib.o: $(hdrdir)/ruby/internal/has/builtin.h
+zlib.o: $(hdrdir)/ruby/internal/has/c_attribute.h
+zlib.o: $(hdrdir)/ruby/internal/has/cpp_attribute.h
+zlib.o: $(hdrdir)/ruby/internal/has/declspec_attribute.h
+zlib.o: $(hdrdir)/ruby/internal/has/extension.h
+zlib.o: $(hdrdir)/ruby/internal/has/feature.h
+zlib.o: $(hdrdir)/ruby/internal/has/warning.h
+zlib.o: $(hdrdir)/ruby/internal/intern/array.h
+zlib.o: $(hdrdir)/ruby/internal/intern/bignum.h
+zlib.o: $(hdrdir)/ruby/internal/intern/class.h
+zlib.o: $(hdrdir)/ruby/internal/intern/compar.h
+zlib.o: $(hdrdir)/ruby/internal/intern/complex.h
+zlib.o: $(hdrdir)/ruby/internal/intern/cont.h
+zlib.o: $(hdrdir)/ruby/internal/intern/dir.h
+zlib.o: $(hdrdir)/ruby/internal/intern/enum.h
+zlib.o: $(hdrdir)/ruby/internal/intern/enumerator.h
+zlib.o: $(hdrdir)/ruby/internal/intern/error.h
+zlib.o: $(hdrdir)/ruby/internal/intern/eval.h
+zlib.o: $(hdrdir)/ruby/internal/intern/file.h
+zlib.o: $(hdrdir)/ruby/internal/intern/gc.h
+zlib.o: $(hdrdir)/ruby/internal/intern/hash.h
+zlib.o: $(hdrdir)/ruby/internal/intern/io.h
+zlib.o: $(hdrdir)/ruby/internal/intern/load.h
+zlib.o: $(hdrdir)/ruby/internal/intern/marshal.h
+zlib.o: $(hdrdir)/ruby/internal/intern/numeric.h
+zlib.o: $(hdrdir)/ruby/internal/intern/object.h
+zlib.o: $(hdrdir)/ruby/internal/intern/parse.h
+zlib.o: $(hdrdir)/ruby/internal/intern/proc.h
+zlib.o: $(hdrdir)/ruby/internal/intern/process.h
+zlib.o: $(hdrdir)/ruby/internal/intern/random.h
+zlib.o: $(hdrdir)/ruby/internal/intern/range.h
+zlib.o: $(hdrdir)/ruby/internal/intern/rational.h
+zlib.o: $(hdrdir)/ruby/internal/intern/re.h
+zlib.o: $(hdrdir)/ruby/internal/intern/ruby.h
+zlib.o: $(hdrdir)/ruby/internal/intern/select.h
+zlib.o: $(hdrdir)/ruby/internal/intern/select/largesize.h
+zlib.o: $(hdrdir)/ruby/internal/intern/signal.h
+zlib.o: $(hdrdir)/ruby/internal/intern/sprintf.h
+zlib.o: $(hdrdir)/ruby/internal/intern/string.h
+zlib.o: $(hdrdir)/ruby/internal/intern/struct.h
+zlib.o: $(hdrdir)/ruby/internal/intern/thread.h
+zlib.o: $(hdrdir)/ruby/internal/intern/time.h
+zlib.o: $(hdrdir)/ruby/internal/intern/variable.h
+zlib.o: $(hdrdir)/ruby/internal/intern/vm.h
+zlib.o: $(hdrdir)/ruby/internal/interpreter.h
+zlib.o: $(hdrdir)/ruby/internal/iterator.h
+zlib.o: $(hdrdir)/ruby/internal/memory.h
+zlib.o: $(hdrdir)/ruby/internal/method.h
+zlib.o: $(hdrdir)/ruby/internal/module.h
+zlib.o: $(hdrdir)/ruby/internal/newobj.h
+zlib.o: $(hdrdir)/ruby/internal/rgengc.h
+zlib.o: $(hdrdir)/ruby/internal/scan_args.h
+zlib.o: $(hdrdir)/ruby/internal/special_consts.h
+zlib.o: $(hdrdir)/ruby/internal/static_assert.h
+zlib.o: $(hdrdir)/ruby/internal/stdalign.h
+zlib.o: $(hdrdir)/ruby/internal/stdbool.h
+zlib.o: $(hdrdir)/ruby/internal/symbol.h
+zlib.o: $(hdrdir)/ruby/internal/token_paste.h
+zlib.o: $(hdrdir)/ruby/internal/value.h
+zlib.o: $(hdrdir)/ruby/internal/value_type.h
+zlib.o: $(hdrdir)/ruby/internal/variable.h
+zlib.o: $(hdrdir)/ruby/internal/warning_push.h
+zlib.o: $(hdrdir)/ruby/internal/xmalloc.h
+zlib.o: $(hdrdir)/ruby/assert.h
+zlib.o: $(hdrdir)/ruby/backward.h
+zlib.o: $(hdrdir)/ruby/backward/2/assume.h
+zlib.o: $(hdrdir)/ruby/backward/2/attributes.h
+zlib.o: $(hdrdir)/ruby/backward/2/bool.h
+zlib.o: $(hdrdir)/ruby/backward/2/gcc_version_since.h
+zlib.o: $(hdrdir)/ruby/backward/2/inttypes.h
+zlib.o: $(hdrdir)/ruby/backward/2/limits.h
+zlib.o: $(hdrdir)/ruby/backward/2/long_long.h
+zlib.o: $(hdrdir)/ruby/backward/2/stdalign.h
+zlib.o: $(hdrdir)/ruby/backward/2/stdarg.h
+zlib.o: $(hdrdir)/ruby/defines.h
+zlib.o: $(hdrdir)/ruby/encoding.h
+zlib.o: $(hdrdir)/ruby/intern.h
+zlib.o: $(hdrdir)/ruby/io.h
+zlib.o: $(hdrdir)/ruby/missing.h
+zlib.o: $(hdrdir)/ruby/onigmo.h
+zlib.o: $(hdrdir)/ruby/oniguruma.h
+zlib.o: $(hdrdir)/ruby/ruby.h
+zlib.o: $(hdrdir)/ruby/st.h
+zlib.o: $(hdrdir)/ruby/subst.h
+zlib.o: $(hdrdir)/ruby/thread.h
+zlib.o: zlib.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/zlib/extconf.rb b/ext/zlib/extconf.rb
index 8bbede63b2..76cd34582e 100644
--- a/ext/zlib/extconf.rb
+++ b/ext/zlib/extconf.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 # extconf.rb
 #
@@ -13,7 +13,70 @@ dir_config 'zlib'
 
 if %w'z libz zlib1 zlib zdll zlibwapi'.find {|z| have_library(z, 'deflateReset')} and
     have_header('zlib.h') then
+  have_zlib = true
+else
+  unless File.directory?(zsrc = "#{$srcdir}/zlib")
+    dirs = Dir.open($srcdir) {|z| z.grep(/\Azlib-\d+[.\d]*\z/) {|x|"#{$srcdir}/#{x}"}}
+    dirs.delete_if {|x| !File.directory?(x)}
+    zsrc = dirs.max_by {|x| x.scan(/\d+/).map(&:to_i)}
+  end
+  if zsrc
+    addconf = [
+      "ZSRC = $(srcdir)/#{File.basename(zsrc)}\n",
+      "all:\n",
+    ]
+    $INCFLAGS << " -I$(ZSRC)"
+    if $mswin or $mingw
+      dll = "zlib1.dll"
+      $extso << dll
+      $cleanfiles << "$(topdir)/#{dll}" << "$(ZIMPLIB)"
+      zmk = "\t$(MAKE) -f $(ZMKFILE) TOP=$(ZSRC)"
+      zopts = []
+      if $nmake
+        zmkfile = "$(ZSRC)/win32/Makefile.msc"
+        m = "#{zsrc}/win32/Makefile.msc"
+        # zopts << "USE_ASM=1"
+        zopts << "ARCH=#{RbConfig::CONFIG['target_cpu']}"
+      else
+        zmkfile = "$(ZSRC)/win32/Makefile.gcc"
+        m = "#{zsrc}/win32/Makefile.gcc"
+        zmk += " PREFIX="
+        zmk << CONFIG['CC'][/(.*-)gcc([^\/]*)\z/, 1]
+        zmk << " CC=$(CC)" if $2
+      end
+      m = File.read(m)
+      zimplib = m[/^IMPLIB[ \t]*=[ \t]*(\S+)/, 1]
+      $LOCAL_LIBS << " " << zimplib
+      unless $nmake or /^TOP[ \t]/ =~ m
+        m.gsub!(/win32\/zlib\.def/, '$(TOP)/\&')
+        m.gsub!(/^(\t.*[ \t])(\S+\.rc)/, '\1-I$(<D) $<')
+        m = "TOP = .\n""VPATH=$(TOP)\n" + m
+        zmkfile = File.basename(zmkfile)
+        File.rename(zmkfile, zmkfile+".orig") if File.exist?(zmkfile)
+        File.write(zmkfile, m)
+      end
+      addconf.push(
+        "ZMKFILE = #{zmkfile}\n",
+        "ZIMPLIB = #{zimplib}\n",
+        "ZOPTS = #{zopts.join(' ')}\n",
+        "$(TARGET_SO): $(ZIMPLIB)\n",
+        "$(ZIMPLIB):\n",
+        "#{zmk} $(ZOPTS) $@\n",
+        "install-so: $(topdir)/#{dll}",
+        "$(topdir)/#{dll}: $(ZIMPLIB)\n",
+        "\t$(Q) $(COPY) #{dll} $(@D)\n",
+        "clean: clean-zsrc\n",
+        "clean-zsrc:\n",
+        "#{zmk} clean\n",
+      )
+    end
+    Logging.message "using zlib in #{zsrc}\n"
+    $defs << "-DHAVE_ZLIB_H"
+    have_zlib = true
+  end
+end
 
+if have_zlib
   defines = []
 
   Logging::message 'checking for kind of operating system... '
@@ -53,10 +116,21 @@ if %w'z libz zlib1 zlib zdll zlibwapi'.find {|z| have_library(z, 'deflateReset')
 
   $defs.concat(defines.collect{|d|' -D'+d})
 
-  have_func('crc32_combine', 'zlib.h')
-  have_func('adler32_combine', 'zlib.h')
-  have_type('z_crc_t', 'zlib.h')
+  if zsrc
+    $defs << "-DHAVE_CRC32_COMBINE"
+    $defs << "-DHAVE_ADLER32_COMBINE"
+    $defs << "-DHAVE_TYPE_Z_CRC_T"
+  else
+    have_func('crc32_combine', 'zlib.h')
+    have_func('adler32_combine', 'zlib.h')
+    have_type('z_crc_t', 'zlib.h')
+  end
 
-  create_makefile('zlib')
+  create_makefile('zlib') {|conf|
+    if zsrc
+      conf.concat addconf if addconf
+    end
+    conf
+  }
 
 end
diff --git a/ext/zlib/extlibs b/ext/zlib/extlibs
new file mode 100644
index 0000000000..556d1f4a6f
--- /dev/null
+++ b/ext/zlib/extlibs
@@ -0,0 +1,6 @@
+ver = 1.2.13
+pkg = zlib-$(ver)
+
+https://github.com/madler/zlib/releases/download/v$(ver)/$(pkg).tar.gz \
+  sha256:b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30 \
+  #
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 4dfa2a5f34..5dbeba6943 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -25,7 +25,11 @@
 # define VALGRIND_MAKE_MEM_UNDEFINED(p, n) 0
 #endif
 
-#define RUBY_ZLIB_VERSION  "0.6.0"
+#define RUBY_ZLIB_VERSION "2.0.0"
+
+#ifndef RB_PASS_CALLED_KEYWORDS
+# define rb_class_new_instance_kw(argc, argv, klass, kw_splat) rb_class_new_instance(argc, argv, klass)
+#endif
 
 #ifndef GZIP_SUPPORT
 #define GZIP_SUPPORT  1
@@ -52,7 +56,10 @@ max_uint(long n)
 #define MAX_UINT(n) (uInt)(n)
 #endif
 
-static ID id_dictionaries;
+#define OPTHASH_GIVEN_P(opts) \
+    (argc > 0 && !NIL_P((opts) = rb_check_hash_type(argv[argc-1])) && (--argc, 1))
+
+static ID id_dictionaries, id_read, id_buffer;
 
 /*--------- Prototypes --------*/
 
@@ -72,6 +79,7 @@ struct zstream_run_args;
 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*, unsigned long);
+static int zstream_expand_buffer_non_stream(struct zstream *z);
 static void zstream_append_buffer(struct zstream*, const Bytef*, long);
 static VALUE zstream_detach_buffer(struct zstream*);
 static VALUE zstream_shift_buffer(struct zstream*, long);
@@ -84,6 +92,7 @@ static void zstream_passthrough_input(struct zstream*);
 static VALUE zstream_detach_input(struct zstream*);
 static void zstream_reset(struct zstream*);
 static VALUE zstream_end(struct zstream*);
+static VALUE zstream_ensure_end(VALUE v);
 static void zstream_run(struct zstream*, Bytef*, long, int);
 static VALUE zstream_sync(struct zstream*, Bytef*, long);
 static void zstream_mark(void*);
@@ -124,7 +133,7 @@ static VALUE rb_inflate_s_allocate(VALUE);
 static VALUE rb_inflate_initialize(int, VALUE*, VALUE);
 static VALUE rb_inflate_s_inflate(VALUE, VALUE);
 static void do_inflate(struct zstream*, VALUE);
-static VALUE rb_inflate_inflate(VALUE, VALUE);
+static VALUE rb_inflate_inflate(int, VALUE*, VALUE);
 static VALUE rb_inflate_addstr(VALUE, VALUE);
 static VALUE rb_inflate_sync(VALUE, VALUE);
 static VALUE rb_inflate_sync_point_p(VALUE);
@@ -139,19 +148,19 @@ 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*, long);
+static VALUE gzfile_read_raw_rescue(VALUE,VALUE);
+static VALUE gzfile_read_raw(struct gzfile*, VALUE outbuf);
+static int gzfile_read_raw_ensure(struct gzfile*, long, VALUE outbuf);
 static char *gzfile_read_raw_until_zero(struct gzfile*, long);
 static unsigned int gzfile_get16(const unsigned char*);
 static unsigned long gzfile_get32(const unsigned char*);
 static void gzfile_set32(unsigned long n, unsigned char*);
 static void gzfile_make_header(struct gzfile*);
 static void gzfile_make_footer(struct gzfile*);
-static void gzfile_read_header(struct gzfile*);
-static void gzfile_check_footer(struct gzfile*);
+static void gzfile_read_header(struct gzfile*, VALUE outbuf);
+static void gzfile_check_footer(struct gzfile*, VALUE outbuf);
 static void gzfile_write(struct gzfile*, Bytef*, long);
-static long gzfile_read_more(struct gzfile*);
+static long gzfile_read_more(struct gzfile*, VALUE outbuf);
 static void gzfile_calc_crc(struct gzfile*, VALUE);
 static VALUE gzfile_read(struct gzfile*, long);
 static VALUE gzfile_read_all(struct gzfile*);
@@ -196,7 +205,7 @@ static VALUE rb_gzwriter_s_allocate(VALUE);
 static VALUE rb_gzwriter_s_open(int, VALUE*, VALUE);
 static VALUE rb_gzwriter_initialize(int, VALUE*, VALUE);
 static VALUE rb_gzwriter_flush(int, VALUE*, VALUE);
-static VALUE rb_gzwriter_write(VALUE, VALUE);
+static VALUE rb_gzwriter_write(int, VALUE*, VALUE);
 static VALUE rb_gzwriter_putc(VALUE, VALUE);
 
 static VALUE rb_gzreader_s_allocate(VALUE);
@@ -279,6 +288,7 @@ static VALUE rb_gzreader_readlines(int, VALUE*, VALUE);
  *   - Zlib::MemError
  *   - Zlib::BufError
  *   - Zlib::VersionError
+ *   - Zlib::InProgressError
  *
  * (if you have GZIP_SUPPORT)
  * - Zlib::GzipReader
@@ -295,7 +305,7 @@ void Init_zlib(void);
 /*--------- Exceptions --------*/
 
 static VALUE cZError, cStreamEnd, cNeedDict;
-static VALUE cStreamError, cDataError, cMemError, cBufError, cVersionError;
+static VALUE cStreamError, cDataError, cMemError, cBufError, cVersionError, cInProgressError;
 
 static void
 raise_zlib_error(int err, const char *msg)
@@ -359,11 +369,7 @@ finalizer_warn(const char *msg)
 static VALUE
 rb_zlib_version(VALUE klass)
 {
-    VALUE str;
-
-    str = rb_str_new2(zlibVersion());
-    OBJ_TAINT(str);  /* for safe */
-    return str;
+    return rb_str_new2(zlibVersion());
 }
 
 #if SIZEOF_LONG > SIZEOF_INT
@@ -405,6 +411,15 @@ do_checksum(int argc, VALUE *argv, uLong (*func)(uLong, const Bytef*, uInt))
     if (NIL_P(str)) {
 	sum = func(sum, Z_NULL, 0);
     }
+    else if (rb_obj_is_kind_of(str, rb_cIO)) {
+        VALUE buf;
+        VALUE buflen = INT2NUM(8192);
+
+        while (!NIL_P(buf = rb_funcall(str, id_read, 1, buflen))) {
+            StringValue(buf);
+            sum = checksum_long(func, sum, (Bytef*)RSTRING_PTR(buf), RSTRING_LEN(buf));
+        }
+    }
     else {
 	StringValue(str);
 	sum = checksum_long(func, sum, (Bytef*)RSTRING_PTR(str), RSTRING_LEN(str));
@@ -420,6 +435,8 @@ do_checksum(int argc, VALUE *argv, uLong (*func)(uLong, const Bytef*, uInt))
  * Calculates Adler-32 checksum for +string+, and returns updated value of
  * +adler+. If +string+ is omitted, it returns the Adler-32 initial value. If
  * +adler+ is omitted, it assumes that the initial value is given to +adler+.
+ * If +string+ is an IO instance, reads from the IO until the IO returns nil
+ * and returns Adler-32 of all read data.
  *
  * Example usage:
  *
@@ -450,7 +467,7 @@ rb_zlib_adler32(int argc, VALUE *argv, VALUE klass)
 static VALUE
 rb_zlib_adler32_combine(VALUE klass, VALUE adler1, VALUE adler2, VALUE len2)
 {
-  return ULONG2NUM(
+    return ULONG2NUM(
 	adler32_combine(NUM2ULONG(adler1), NUM2ULONG(adler2), NUM2LONG(len2)));
 }
 #else
@@ -464,7 +481,9 @@ rb_zlib_adler32_combine(VALUE klass, VALUE adler1, VALUE adler2, VALUE len2)
  *
  * Calculates CRC checksum for +string+, and returns updated value of +crc+. If
  * +string+ is omitted, it returns the CRC initial value. If +crc+ is omitted, it
- * assumes that the initial value is given to +crc+.
+ * assumes that the initial value is given to +crc+. If +string+ is an IO instance,
+ * reads from the IO until the IO returns nil and returns CRC checksum of all read
+ * data.
  *
  * FIXME: expression.
  */
@@ -488,7 +507,7 @@ rb_zlib_crc32(int argc, VALUE *argv, VALUE klass)
 static VALUE
 rb_zlib_crc32_combine(VALUE klass, VALUE crc1, VALUE crc2, VALUE len2)
 {
-  return ULONG2NUM(
+    return ULONG2NUM(
 	crc32_combine(NUM2ULONG(crc1), NUM2ULONG(crc2), NUM2LONG(len2)));
 }
 #else
@@ -527,8 +546,8 @@ rb_zlib_crc_table(VALUE obj)
 struct zstream {
     unsigned long flags;
     VALUE buf;
-    long buf_filled;
     VALUE input;
+    VALUE mutex;
     z_stream stream;
     const struct zstream_funcs {
 	int (*reset)(z_streamp);
@@ -537,19 +556,24 @@ struct zstream {
     } *func;
 };
 
-#define ZSTREAM_FLAG_READY      0x1
-#define ZSTREAM_FLAG_IN_STREAM  0x2
-#define ZSTREAM_FLAG_FINISHED   0x4
-#define ZSTREAM_FLAG_CLOSING    0x8
-#define ZSTREAM_FLAG_GZFILE     0x10 /* disallows yield from expand_buffer for
+#define ZSTREAM_FLAG_READY      (1 << 0)
+#define ZSTREAM_FLAG_IN_STREAM  (1 << 1)
+#define ZSTREAM_FLAG_FINISHED   (1 << 2)
+#define ZSTREAM_FLAG_CLOSING    (1 << 3)
+#define ZSTREAM_FLAG_GZFILE     (1 << 4) /* disallows yield from expand_buffer for
                                         gzip*/
-#define ZSTREAM_FLAG_UNUSED     0x20
+#define ZSTREAM_REUSE_BUFFER    (1 << 5)
+#define ZSTREAM_IN_PROGRESS     (1 << 6)
+#define ZSTREAM_FLAG_UNUSED     (1 << 7)
 
 #define ZSTREAM_READY(z)       ((z)->flags |= ZSTREAM_FLAG_READY)
 #define ZSTREAM_IS_READY(z)    ((z)->flags & ZSTREAM_FLAG_READY)
 #define ZSTREAM_IS_FINISHED(z) ((z)->flags & ZSTREAM_FLAG_FINISHED)
 #define ZSTREAM_IS_CLOSING(z)  ((z)->flags & ZSTREAM_FLAG_CLOSING)
 #define ZSTREAM_IS_GZFILE(z)   ((z)->flags & ZSTREAM_FLAG_GZFILE)
+#define ZSTREAM_BUF_FILLED(z)  (NIL_P((z)->buf) ? 0 : RSTRING_LEN((z)->buf))
+
+#define ZSTREAM_REUSE_BUFFER_P(z)     ((z)->flags & ZSTREAM_REUSE_BUFFER)
 
 #define ZSTREAM_EXPAND_BUFFER_OK          0
 
@@ -569,7 +593,9 @@ static const struct zstream_funcs inflate_funcs = {
 };
 
 struct zstream_run_args {
-    struct zstream * z;
+    struct zstream *const z;
+    Bytef *src;
+    long len;
     int flush;         /* stream flush value for inflate() or deflate() */
     int interrupt;     /* stop processing the stream and return to ruby */
     int jump_state;    /* for buffer expansion block break or exception */
@@ -599,8 +625,8 @@ zstream_init(struct zstream *z, const struct zstream_funcs *func)
 {
     z->flags = 0;
     z->buf = Qnil;
-    z->buf_filled = 0;
     z->input = Qnil;
+    z->mutex = rb_mutex_new();
     z->stream.zalloc = zlib_mem_alloc;
     z->stream.zfree = zlib_mem_free;
     z->stream.opaque = Z_NULL;
@@ -624,17 +650,25 @@ zstream_expand_buffer(struct zstream *z)
     }
 
     if (!ZSTREAM_IS_GZFILE(z) && rb_block_given_p()) {
-	if (z->buf_filled >= ZSTREAM_AVAIL_OUT_STEP_MAX) {
+	long buf_filled = ZSTREAM_BUF_FILLED(z);
+	if (buf_filled >= ZSTREAM_AVAIL_OUT_STEP_MAX) {
 	    int state = 0;
-	    VALUE self = (VALUE)z->stream.opaque;
 
-	    rb_str_resize(z->buf, z->buf_filled);
-	    rb_obj_reveal(z->buf, rb_cString);
-	    OBJ_INFECT(z->buf, self);
+            if (!ZSTREAM_REUSE_BUFFER_P(z)) {
+	        rb_obj_reveal(z->buf, rb_cString);
+            }
 
+            rb_mutex_unlock(z->mutex);
 	    rb_protect(rb_yield, z->buf, &state);
-
-	    z->buf = Qnil;
+            rb_mutex_lock(z->mutex);
+
+            if (ZSTREAM_REUSE_BUFFER_P(z)) {
+                rb_str_modify(z->buf);
+                rb_str_set_len(z->buf, 0);
+            }
+            else {
+                z->buf = Qnil;
+            }
 	    zstream_expand_buffer_into(z, ZSTREAM_AVAIL_OUT_STEP_MAX);
 
 	    if (state)
@@ -644,23 +678,11 @@ zstream_expand_buffer(struct zstream *z)
 	}
 	else {
 	    zstream_expand_buffer_into(z,
-		    ZSTREAM_AVAIL_OUT_STEP_MAX - z->buf_filled);
+				       ZSTREAM_AVAIL_OUT_STEP_MAX - buf_filled);
 	}
     }
     else {
-	if (RSTRING_LEN(z->buf) - z->buf_filled >= ZSTREAM_AVAIL_OUT_STEP_MAX) {
-	    z->stream.avail_out = ZSTREAM_AVAIL_OUT_STEP_MAX;
-	}
-	else {
-	    long inc = z->buf_filled / 2;
-	    if (inc < ZSTREAM_AVAIL_OUT_STEP_MIN) {
-		inc = ZSTREAM_AVAIL_OUT_STEP_MIN;
-	    }
-	    rb_str_resize(z->buf, z->buf_filled + inc);
-	    z->stream.avail_out = (inc < ZSTREAM_AVAIL_OUT_STEP_MAX) ?
-		(int)inc : ZSTREAM_AVAIL_OUT_STEP_MAX;
-	}
-	z->stream.next_out = (Bytef*)RSTRING_PTR(z->buf) + z->buf_filled;
+	zstream_expand_buffer_non_stream(z);
     }
 }
 
@@ -670,15 +692,14 @@ zstream_expand_buffer_into(struct zstream *z, unsigned long 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->buf = rb_str_buf_new(size);
 	z->stream.next_out = (Bytef*)RSTRING_PTR(z->buf);
 	z->stream.avail_out = MAX_UINT(size);
 	rb_obj_hide(z->buf);
     }
     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;
+	rb_str_modify_expand(z->buf, size);
+	z->stream.next_out = (Bytef*)RSTRING_END(z->buf);
 	z->stream.avail_out = MAX_UINT(size);
     }
 }
@@ -695,34 +716,24 @@ zstream_expand_buffer_protect(void *ptr)
 }
 
 static int
-zstream_expand_buffer_without_gvl(struct zstream *z)
+zstream_expand_buffer_non_stream(struct zstream *z)
 {
-    char * new_str;
-    long inc, len;
+    long inc, len = ZSTREAM_BUF_FILLED(z);
 
-    if (RSTRING_LEN(z->buf) - z->buf_filled >= ZSTREAM_AVAIL_OUT_STEP_MAX) {
+    if (rb_str_capacity(z->buf) - len >= ZSTREAM_AVAIL_OUT_STEP_MAX) {
 	z->stream.avail_out = ZSTREAM_AVAIL_OUT_STEP_MAX;
     }
     else {
-	inc = z->buf_filled / 2;
+	inc = len / 2;
 	if (inc < ZSTREAM_AVAIL_OUT_STEP_MIN) {
 	    inc = ZSTREAM_AVAIL_OUT_STEP_MIN;
 	}
 
-	len = z->buf_filled + inc;
-
-	new_str = ruby_xrealloc(RSTRING(z->buf)->as.heap.ptr, len + 1);
-
-	/* from rb_str_resize */
-	RSTRING(z->buf)->as.heap.ptr = new_str;
-	RSTRING(z->buf)->as.heap.ptr[len] = '\0'; /* sentinel */
-	RSTRING(z->buf)->as.heap.len =
-	    RSTRING(z->buf)->as.heap.aux.capa = len;
-
+	rb_str_modify_expand(z->buf, inc);
 	z->stream.avail_out = (inc < ZSTREAM_AVAIL_OUT_STEP_MAX) ?
 	    (int)inc : ZSTREAM_AVAIL_OUT_STEP_MAX;
     }
-    z->stream.next_out = (Bytef*)RSTRING_PTR(z->buf) + z->buf_filled;
+    z->stream.next_out = (Bytef*)RSTRING_END(z->buf);
 
     return ZSTREAM_EXPAND_BUFFER_OK;
 }
@@ -733,15 +744,14 @@ zstream_append_buffer(struct zstream *z, const Bytef *src, long len)
     if (NIL_P(z->buf)) {
 	z->buf = rb_str_buf_new(len);
 	rb_str_buf_cat(z->buf, (const char*)src, len);
-	z->buf_filled = len;
 	z->stream.next_out = (Bytef*)RSTRING_PTR(z->buf);
 	z->stream.avail_out = 0;
 	rb_obj_hide(z->buf);
 	return;
     }
 
-    if (RSTRING_LEN(z->buf) < z->buf_filled + len) {
-	rb_str_resize(z->buf, z->buf_filled + len);
+    if ((long)rb_str_capacity(z->buf) < ZSTREAM_BUF_FILLED(z) + len) {
+	rb_str_modify_expand(z->buf, len);
 	z->stream.avail_out = 0;
     }
     else {
@@ -752,9 +762,8 @@ zstream_append_buffer(struct zstream *z, const Bytef *src, long len)
 	    z->stream.avail_out = 0;
 	}
     }
-    memcpy(RSTRING_PTR(z->buf) + z->buf_filled, src, len);
-    z->buf_filled += len;
-    z->stream.next_out = (Bytef*)RSTRING_PTR(z->buf) + z->buf_filled;
+    rb_str_cat(z->buf, (const char *)src, len);
+    z->stream.next_out = (Bytef*)RSTRING_END(z->buf);
 }
 
 #define zstream_append_buffer2(z,v) \
@@ -763,7 +772,7 @@ zstream_append_buffer(struct zstream *z, const Bytef *src, long len)
 static VALUE
 zstream_detach_buffer(struct zstream *z)
 {
-    VALUE dst, self = (VALUE)z->stream.opaque;
+    VALUE dst;
 
     if (!ZSTREAM_IS_FINISHED(z) && !ZSTREAM_IS_GZFILE(z) &&
 	    rb_block_given_p()) {
@@ -777,14 +786,12 @@ zstream_detach_buffer(struct zstream *z)
     }
     else {
 	dst = z->buf;
-	rb_str_resize(dst, z->buf_filled);
-	rb_obj_reveal(dst, rb_cString);
+        if (!ZSTREAM_REUSE_BUFFER_P(z)) {
+	    rb_obj_reveal(dst, rb_cString);
+        }
     }
 
-    OBJ_INFECT(dst, self);
-
     z->buf = Qnil;
-    z->buf_filled = 0;
     z->stream.next_out = 0;
     z->stream.avail_out = 0;
 
@@ -800,18 +807,20 @@ static VALUE
 zstream_shift_buffer(struct zstream *z, long len)
 {
     VALUE dst;
-    long buflen;
+    char *bufptr;
+    long buflen = ZSTREAM_BUF_FILLED(z);
 
-    if (z->buf_filled <= len) {
+    if (buflen <= len) {
 	return zstream_detach_buffer(z);
     }
 
-    dst = rb_str_new(RSTRING_PTR(z->buf), len);
-    z->buf_filled -= len;
-    memmove(RSTRING_PTR(z->buf), RSTRING_PTR(z->buf) + len,
-	    z->buf_filled);
-    z->stream.next_out = (Bytef*)RSTRING_PTR(z->buf) + z->buf_filled;
-    buflen = RSTRING_LEN(z->buf) - z->buf_filled;
+    bufptr = RSTRING_PTR(z->buf);
+    dst = rb_str_new(bufptr, len);
+    buflen -= len;
+    memmove(bufptr, bufptr + len, buflen);
+    rb_str_set_len(z->buf, buflen);
+    z->stream.next_out = (Bytef*)RSTRING_END(z->buf);
+    buflen = (long)rb_str_capacity(z->buf) - ZSTREAM_BUF_FILLED(z);
     if (buflen > ZSTREAM_AVAIL_OUT_STEP_MAX) {
 	buflen = ZSTREAM_AVAIL_OUT_STEP_MAX;
     }
@@ -823,13 +832,17 @@ zstream_shift_buffer(struct zstream *z, long len)
 static void
 zstream_buffer_ungets(struct zstream *z, const Bytef *b, unsigned long len)
 {
-    if (NIL_P(z->buf) || RSTRING_LEN(z->buf) - z->buf_filled == 0) {
+    char *bufptr;
+    long filled;
+
+    if (NIL_P(z->buf) || (long)rb_str_capacity(z->buf) <= ZSTREAM_BUF_FILLED(z)) {
 	zstream_expand_buffer_into(z, len);
     }
 
-    memmove(RSTRING_PTR(z->buf) + len, RSTRING_PTR(z->buf), z->buf_filled);
-    memmove(RSTRING_PTR(z->buf), b, len);
-    z->buf_filled+=len;
+    RSTRING_GETMEM(z->buf, bufptr, filled);
+    memmove(bufptr + len, bufptr, filled);
+    memmove(bufptr, b, len);
+    rb_str_set_len(z->buf, filled + len);
     if (z->stream.avail_out > 0) {
 	if (len > z->stream.avail_out) len = z->stream.avail_out;
 	z->stream.next_out+=len;
@@ -840,17 +853,8 @@ zstream_buffer_ungets(struct zstream *z, const Bytef *b, unsigned long len)
 static void
 zstream_buffer_ungetbyte(struct zstream *z, int c)
 {
-    if (NIL_P(z->buf) || RSTRING_LEN(z->buf) - 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;
-    z->buf_filled++;
-    if (z->stream.avail_out > 0) {
-	z->stream.next_out++;
-	z->stream.avail_out--;
-    }
+    Bytef cc = (Bytef)c;
+    zstream_buffer_ungets(z, &cc, 1);
 }
 
 static void
@@ -875,20 +879,50 @@ zstream_append_input(struct zstream *z, const Bytef *src, long len)
 static void
 zstream_discard_input(struct zstream *z, long len)
 {
-    if (NIL_P(z->input) || RSTRING_LEN(z->input) <= len) {
-	z->input = Qnil;
+    if (NIL_P(z->input)) {
     }
-    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);
+    else if (RBASIC_CLASS(z->input) == 0) {
+	/* hidden, we created z->input and have complete control */
+	char *ptr;
+	long oldlen, newlen;
+
+	RSTRING_GETMEM(z->input, ptr, oldlen);
+	newlen = oldlen - len;
+	if (newlen > 0) {
+	    memmove(ptr, ptr + len, newlen);
+	}
+	if (newlen < 0) {
+	    newlen = 0;
+	}
+	rb_str_resize(z->input, newlen);
+	if (newlen == 0) {
+	    rb_gc_force_recycle(z->input);
+	    z->input = Qnil;
+	}
+	else {
+	    rb_str_set_len(z->input, newlen);
+	}
+    }
+    else { /* do not mangle user-provided data */
+	if (RSTRING_LEN(z->input) <= len) {
+	    z->input = Qnil;
+	}
+	else {
+	    z->input = rb_str_substr(z->input, len,
+				     RSTRING_LEN(z->input) - len);
+	}
     }
 }
 
 static void
 zstream_reset_input(struct zstream *z)
 {
-    z->input = Qnil;
+    if (!NIL_P(z->input) && RBASIC_CLASS(z->input) == 0) {
+	rb_str_resize(z->input, 0);
+    }
+    else {
+	z->input = Qnil;
+    }
 }
 
 static void
@@ -913,7 +947,6 @@ zstream_detach_input(struct zstream *z)
 	rb_obj_reveal(dst, rb_cString);
     }
     z->input = Qnil;
-    rb_obj_reveal(dst, rb_cString);
     return dst;
 }
 
@@ -928,7 +961,6 @@ zstream_reset(struct zstream *z)
     }
     z->flags = ZSTREAM_FLAG_READY;
     z->buf = Qnil;
-    z->buf_filled = 0;
     z->stream.next_out = 0;
     z->stream.avail_out = 0;
     zstream_reset_input(z);
@@ -957,6 +989,12 @@ zstream_end(struct zstream *z)
     return Qnil;
 }
 
+static VALUE
+zstream_ensure_end(VALUE v)
+{
+    return zstream_end((struct zstream *)v);
+}
+
 static void *
 zstream_run_func(void *ptr)
 {
@@ -969,7 +1007,7 @@ zstream_run_func(void *ptr)
     while (!args->interrupt) {
 	n = z->stream.avail_out;
 	err = z->func->run(&z->stream, flush);
-	z->buf_filled += n - z->stream.avail_out;
+	rb_str_set_len(z->buf, ZSTREAM_BUF_FILLED(z) + (n - z->stream.avail_out));
 
 	if (err == Z_STREAM_END) {
 	    z->flags &= ~ZSTREAM_FLAG_IN_STREAM;
@@ -998,7 +1036,7 @@ zstream_run_func(void *ptr)
 							(void *)z);
 	}
 	else {
-	    state = zstream_expand_buffer_without_gvl(z);
+	    state = zstream_expand_buffer_non_stream(z);
 	}
 
 	if (state) {
@@ -1013,6 +1051,7 @@ zstream_run_func(void *ptr)
 
 /*
  * There is no safe way to interrupt z->run->func().
+ * async-signal-safe
  */
 static void
 zstream_unblock_func(void *ptr)
@@ -1022,18 +1061,17 @@ zstream_unblock_func(void *ptr)
     args->interrupt = 1;
 }
 
-static void
-zstream_run(struct zstream *z, Bytef *src, long len, int flush)
+static VALUE
+zstream_run_try(VALUE value_arg)
 {
-    struct zstream_run_args args;
-    int err;
-    VALUE guard = Qnil;
+    struct zstream_run_args *args = (struct zstream_run_args *)value_arg;
+    struct zstream *z = args->z;
+    Bytef *src = args->src;
+    long len = args->len;
+    int flush = args->flush;
 
-    args.z = z;
-    args.flush = flush;
-    args.interrupt = 0;
-    args.jump_state = 0;
-    args.stream_output = !ZSTREAM_IS_GZFILE(z) && rb_block_given_p();
+    int err;
+    VALUE old_input = Qnil;
 
     if (NIL_P(z->input) && len == 0) {
 	z->stream.next_in = (Bytef*)"";
@@ -1041,12 +1079,13 @@ zstream_run(struct zstream *z, Bytef *src, long len, int flush)
     }
     else {
 	zstream_append_input(z, src, len);
-	z->stream.next_in = (Bytef*)RSTRING_PTR(z->input);
-	z->stream.avail_in = MAX_UINT(RSTRING_LEN(z->input));
 	/* keep reference to `z->input' so as not to be garbage collected
 	   after zstream_reset_input() and prevent `z->stream.next_in'
 	   from dangling. */
-	guard = z->input;
+	old_input = zstream_detach_input(z);
+	rb_obj_hide(old_input); /* for GVL release and later recycle */
+	z->stream.next_in = (Bytef*)RSTRING_PTR(old_input);
+	z->stream.avail_in = MAX_UINT(RSTRING_LEN(old_input));
     }
 
     if (z->stream.avail_out == 0) {
@@ -1054,8 +1093,20 @@ zstream_run(struct zstream *z, Bytef *src, long len, int flush)
     }
 
 loop:
-    err = (int)(VALUE)rb_thread_call_without_gvl(zstream_run_func, (void *)&args,
-						 zstream_unblock_func, (void *)&args);
+#ifndef RB_NOGVL_UBF_ASYNC_SAFE
+    err = (int)(VALUE)rb_thread_call_without_gvl(zstream_run_func, (void *)args,
+						 zstream_unblock_func, (void *)args);
+#else
+    err = (int)(VALUE)rb_nogvl(zstream_run_func, (void *)args,
+                               zstream_unblock_func, (void *)args,
+                               RB_NOGVL_UBF_ASYNC_SAFE);
+#endif
+
+    /* retry if no exception is thrown */
+    if (err == Z_OK && args->interrupt) {
+       args->interrupt = 0;
+       goto loop;
+    }
 
     if (flush != Z_FINISH && err == Z_BUF_ERROR
 	    && z->stream.avail_out > 0) {
@@ -1084,11 +1135,58 @@ loop:
 
     if (z->stream.avail_in > 0) {
 	zstream_append_input(z, z->stream.next_in, z->stream.avail_in);
-	RB_GC_GUARD(guard); /* prevent tail call to make guard effective */
     }
+    if (!NIL_P(old_input)) {
+	rb_str_resize(old_input, 0);
+	rb_gc_force_recycle(old_input);
+    }
+
+    if (args->jump_state)
+	rb_jump_tag(args->jump_state);
+
+    return Qnil;
+}
+
+static VALUE
+zstream_run_ensure(VALUE value_arg)
+{
+    struct zstream_run_args *args = (struct zstream_run_args *)value_arg;
+
+    /* Remove ZSTREAM_IN_PROGRESS flag to signal that this zstream is not in use. */
+    args->z->flags &= ~ZSTREAM_IN_PROGRESS;
+
+    return Qnil;
+}
+
+static VALUE
+zstream_run_synchronized(VALUE value_arg)
+{
+    struct zstream_run_args *args = (struct zstream_run_args *)value_arg;
+
+    /* Cannot start zstream while it is in progress. */
+    if (args->z->flags & ZSTREAM_IN_PROGRESS) {
+        rb_raise(cInProgressError, "zlib stream is in progress");
+    }
+    args->z->flags |= ZSTREAM_IN_PROGRESS;
 
-    if (args.jump_state)
-	rb_jump_tag(args.jump_state);
+    rb_ensure(zstream_run_try, value_arg, zstream_run_ensure, value_arg);
+
+    return Qnil;
+}
+
+static void
+zstream_run(struct zstream *z, Bytef *src, long len, int flush)
+{
+    struct zstream_run_args args = {
+        .z = z,
+        .src = src,
+        .len = len,
+        .flush = flush,
+        .interrupt = 0,
+        .jump_state = 0,
+        .stream_output = !ZSTREAM_IS_GZFILE(z) && rb_block_given_p(),
+    };
+    rb_mutex_synchronize(z->mutex, zstream_run_synchronized, (VALUE)&args);
 }
 
 static VALUE
@@ -1136,6 +1234,7 @@ zstream_mark(void *p)
     struct zstream *z = p;
     rb_gc_mark(z->buf);
     rb_gc_mark(z->input);
+    rb_gc_mark(z->mutex);
 }
 
 static void
@@ -1317,7 +1416,6 @@ rb_zstream_flush_next_in(VALUE obj)
 
     TypedData_Get_Struct(obj, struct zstream, &zstream_data_type, z);
     dst = zstream_detach_input(z);
-    OBJ_INFECT(dst, obj);
     return dst;
 }
 
@@ -1413,7 +1511,7 @@ rb_zstream_data_type(VALUE obj)
 static VALUE
 rb_zstream_adler(VALUE obj)
 {
-	return rb_uint2inum(get_zstream(obj)->stream.adler);
+    return rb_uint2inum(get_zstream(obj)->stream.adler);
 }
 
 /*
@@ -1578,7 +1676,6 @@ rb_deflate_init_copy(VALUE self, VALUE orig)
     }
     z1->input = NIL_P(z2->input) ? Qnil : rb_str_dup(z2->input);
     z1->buf   = NIL_P(z2->buf)   ? Qnil : rb_str_dup(z2->buf);
-    z1->buf_filled = z2->buf_filled;
     z1->flags = z2->flags;
 
     return self;
@@ -1637,9 +1734,8 @@ rb_deflate_s_deflate(int argc, VALUE *argv, VALUE klass)
 
     args[0] = (VALUE)&z;
     args[1] = src;
-    dst = rb_ensure(deflate_run, (VALUE)args, zstream_end, (VALUE)&z);
+    dst = rb_ensure(deflate_run, (VALUE)args, zstream_ensure_end, (VALUE)&z);
 
-    OBJ_INFECT(dst, src);
     return dst;
 }
 
@@ -1689,7 +1785,6 @@ rb_deflate_deflate(int argc, VALUE *argv, VALUE obj)
     VALUE src, flush;
 
     rb_scan_args(argc, argv, "11", &src, &flush);
-    OBJ_INFECT(obj, src);
     do_deflate(z, src, ARG_FLUSH(flush));
 
     return zstream_detach_buffer(z);
@@ -1707,7 +1802,6 @@ rb_deflate_deflate(int argc, VALUE *argv, VALUE obj)
 static VALUE
 rb_deflate_addstr(VALUE obj, VALUE src)
 {
-    OBJ_INFECT(obj, src);
     do_deflate(get_zstream(obj), src, Z_NO_FLUSH);
     return obj;
 }
@@ -1762,23 +1856,26 @@ rb_deflate_params(VALUE obj, VALUE v_level, VALUE v_strategy)
     int level, strategy;
     int err;
     uInt n;
+    long filled;
 
     level = ARG_LEVEL(v_level);
     strategy = ARG_STRATEGY(v_strategy);
 
     n = z->stream.avail_out;
     err = deflateParams(&z->stream, level, strategy);
-    z->buf_filled += n - z->stream.avail_out;
+    filled = n - z->stream.avail_out;
     while (err == Z_BUF_ERROR) {
 	rb_warning("deflateParams() returned Z_BUF_ERROR");
 	zstream_expand_buffer(z);
+	rb_str_set_len(z->buf, RSTRING_LEN(z->buf) + filled);
 	n = z->stream.avail_out;
 	err = deflateParams(&z->stream, level, strategy);
-	z->buf_filled += n - z->stream.avail_out;
+	filled = n - z->stream.avail_out;
     }
     if (err != Z_OK) {
 	raise_zlib_error(err, z->stream.msg);
     }
+    rb_str_set_len(z->buf, RSTRING_LEN(z->buf) + filled);
 
     return Qnil;
 }
@@ -1804,7 +1901,6 @@ rb_deflate_set_dictionary(VALUE obj, VALUE dic)
     VALUE src = dic;
     int err;
 
-    OBJ_INFECT(obj, dic);
     StringValue(src);
     err = deflateSetDictionary(&z->stream,
 			       (Bytef*)RSTRING_PTR(src), RSTRING_LENINT(src));
@@ -1949,9 +2045,8 @@ rb_inflate_s_inflate(VALUE obj, VALUE src)
 
     args[0] = (VALUE)&z;
     args[1] = src;
-    dst = rb_ensure(inflate_run, (VALUE)args, zstream_end, (VALUE)&z);
+    dst = rb_ensure(inflate_run, (VALUE)args, zstream_ensure_end, (VALUE)&z);
 
-    OBJ_INFECT(dst, src);
     return dst;
 }
 
@@ -1992,8 +2087,8 @@ rb_inflate_add_dictionary(VALUE obj, VALUE dictionary)
  * Document-method: Zlib::Inflate#inflate
  *
  * call-seq:
- *   inflate(deflate_string)                 -> String
- *   inflate(deflate_string) { |chunk| ... } -> nil
+ *   inflate(deflate_string, buffer: nil)                 -> String
+ *   inflate(deflate_string, buffer: nil) { |chunk| ... } -> nil
  *
  * Inputs +deflate_string+ into the inflate stream and returns the output from
  * the stream.  Calling this method, both the input and the output buffer of
@@ -2003,6 +2098,15 @@ rb_inflate_add_dictionary(VALUE obj, VALUE dictionary)
  * If a block is given consecutive inflated chunks from the +deflate_string+
  * are yielded to the block and +nil+ is returned.
  *
+ * If a :buffer keyword argument is given and not nil:
+ *
+ * * The :buffer keyword should be a String, and will used as the output buffer.
+ *   Using this option can reuse the memory required during inflation.
+ * * When not passing a block, the return value will be the same object as the
+ *   :buffer keyword argument.
+ * * When passing a block, the yielded chunks will be the same value as the
+ *   :buffer keyword argument.
+ *
  * Raises a Zlib::NeedDict exception if a preset dictionary is needed to
  * decompress.  Set the dictionary by Zlib::Inflate#set_dictionary and then
  * call this method again with an empty string to flush the stream:
@@ -2026,12 +2130,37 @@ rb_inflate_add_dictionary(VALUE obj, VALUE dictionary)
  * See also Zlib::Inflate.new
  */
 static VALUE
-rb_inflate_inflate(VALUE obj, VALUE src)
+rb_inflate_inflate(int argc, VALUE* argv, VALUE obj)
 {
     struct zstream *z = get_zstream(obj);
-    VALUE dst;
+    VALUE dst, src, opts, buffer = Qnil;
 
-    OBJ_INFECT(obj, src);
+    if (OPTHASH_GIVEN_P(opts)) {
+        VALUE buf;
+        rb_get_kwargs(opts, &id_buffer, 0, 1, &buf);
+        if (buf != Qundef && buf != Qnil) {
+            buffer = StringValue(buf);
+        }
+    }
+    if (buffer != Qnil) {
+        if (!(ZSTREAM_REUSE_BUFFER_P(z) && z->buf == buffer)) {
+            long len = RSTRING_LEN(buffer);
+            if (len >= ZSTREAM_AVAIL_OUT_STEP_MAX) {
+                rb_str_modify(buffer);
+            }
+            else {
+                len = ZSTREAM_AVAIL_OUT_STEP_MAX - len;
+                rb_str_modify_expand(buffer, len);
+            }
+            rb_str_set_len(buffer, 0);
+            z->flags |= ZSTREAM_REUSE_BUFFER;
+            z->buf = buffer;
+        }
+    } else if (ZSTREAM_REUSE_BUFFER_P(z)) {
+        z->flags &= ~ZSTREAM_REUSE_BUFFER;
+        z->buf = Qnil;
+    }
+    rb_scan_args(argc, argv, "10", &src);
 
     if (ZSTREAM_IS_FINISHED(z)) {
 	if (NIL_P(src)) {
@@ -2040,8 +2169,11 @@ rb_inflate_inflate(VALUE obj, VALUE src)
 	else {
 	    StringValue(src);
 	    zstream_append_buffer2(z, src);
-	    dst = rb_str_new(0, 0);
-	    OBJ_INFECT(dst, obj);
+	    if (ZSTREAM_REUSE_BUFFER_P(z)) {
+                dst = rb_str_resize(buffer, 0);
+            } else {
+                dst = rb_str_new(0, 0);
+            }
 	}
     }
     else {
@@ -2067,8 +2199,6 @@ rb_inflate_addstr(VALUE obj, VALUE src)
 {
     struct zstream *z = get_zstream(obj);
 
-    OBJ_INFECT(obj, src);
-
     if (ZSTREAM_IS_FINISHED(z)) {
 	if (!NIL_P(src)) {
 	    StringValue(src);
@@ -2098,7 +2228,6 @@ rb_inflate_sync(VALUE obj, VALUE src)
 {
     struct zstream *z = get_zstream(obj);
 
-    OBJ_INFECT(obj, src);
     StringValue(src);
     return zstream_sync(z, (Bytef*)RSTRING_PTR(src), RSTRING_LEN(src));
 }
@@ -2140,7 +2269,6 @@ rb_inflate_set_dictionary(VALUE obj, VALUE dic)
     VALUE src = dic;
     int err;
 
-    OBJ_INFECT(obj, dic);
     StringValue(src);
     err = inflateSetDictionary(&z->stream,
 			       (Bytef*)RSTRING_PTR(src), RSTRING_LENINT(src));
@@ -2197,7 +2325,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, id_path, id_input;
+static ID id_write, id_readpartial, id_flush, id_seek, id_close, id_path, id_input;
 static VALUE cGzError, cNoFooter, cCRCError, cLengthError;
 
 
@@ -2221,7 +2349,6 @@ struct gzfile {
     rb_encoding *enc2;
     rb_econv_t *ec;
     VALUE ecopts;
-    char *cbuf;
     VALUE path;
 };
 #define GZFILE_CBUF_CAPA 10
@@ -2229,12 +2356,23 @@ struct gzfile {
 #define GZFILE_FLAG_SYNC             ZSTREAM_FLAG_UNUSED
 #define GZFILE_FLAG_HEADER_FINISHED  (ZSTREAM_FLAG_UNUSED << 1)
 #define GZFILE_FLAG_FOOTER_FINISHED  (ZSTREAM_FLAG_UNUSED << 2)
+#define GZFILE_FLAG_MTIME_IS_SET     (ZSTREAM_FLAG_UNUSED << 3)
 
 #define GZFILE_IS_FINISHED(gz) \
-    (ZSTREAM_IS_FINISHED(&(gz)->z) && (gz)->z.buf_filled == 0)
+    (ZSTREAM_IS_FINISHED(&(gz)->z) && ZSTREAM_BUF_FILLED(&(gz)->z) == 0)
 
 #define GZFILE_READ_SIZE  2048
 
+struct read_raw_arg {
+    VALUE io;
+    union {
+	const VALUE argv[2]; /* for rb_funcallv */
+	struct {
+	    VALUE len;
+	    VALUE buf;
+	} in;
+    } as;
+};
 
 static void
 gzfile_mark(void *p)
@@ -2261,22 +2399,13 @@ gzfile_free(void *p)
 	}
 	zstream_finalize(z);
     }
-    if (gz->cbuf) {
-	xfree(gz->cbuf);
-    }
     xfree(gz);
 }
 
 static size_t
 gzfile_memsize(const void *p)
 {
-    const struct gzfile *gz = p;
-    size_t size = sizeof(struct gzfile);
-
-    if (gz->cbuf)
-	size += GZFILE_CBUF_CAPA;
-
-    return size;
+    return sizeof(struct gzfile);
 }
 
 static const rb_data_type_t gzfile_data_type = {
@@ -2285,16 +2414,9 @@ static const rb_data_type_t gzfile_data_type = {
      0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
-static VALUE
-gzfile_new(klass, funcs, endfunc)
-    VALUE klass;
-    const struct zstream_funcs *funcs;
-    void (*endfunc)(struct gzfile *);
+static void
+gzfile_init(struct gzfile *gz, const struct zstream_funcs *funcs, void (*endfunc)(struct gzfile *))
 {
-    VALUE obj;
-    struct gzfile *gz;
-
-    obj = TypedData_Make_Struct(klass, struct gzfile, &gzfile_data_type, gz);
     zstream_init(&gz->z, funcs);
     gz->z.flags |= ZSTREAM_FLAG_GZFILE;
     gz->io = Qnil;
@@ -2312,9 +2434,17 @@ gzfile_new(klass, funcs, endfunc)
     gz->ec = NULL;
     gz->ecflags = 0;
     gz->ecopts = Qnil;
-    gz->cbuf = 0;
     gz->path = Qnil;
+}
+
+static VALUE
+gzfile_new(VALUE klass, const struct zstream_funcs *funcs, void (*endfunc)(struct gzfile *))
+{
+    VALUE obj;
+    struct gzfile *gz;
 
+    obj = TypedData_Make_Struct(klass, struct gzfile, &gzfile_data_type, gz);
+    gzfile_init(gz, funcs, endfunc);
     return obj;
 }
 
@@ -2355,9 +2485,8 @@ gzfile_write_raw(struct gzfile *gz)
 {
     VALUE str;
 
-    if (gz->z.buf_filled > 0) {
+    if (ZSTREAM_BUF_FILLED(&gz->z) > 0) {
 	str = zstream_detach_buffer(&gz->z);
-	OBJ_TAINT(str);  /* for safe */
 	rb_funcall(gz->io, id_write, 1, str);
 	if ((gz->z.flags & GZFILE_FLAG_SYNC)
 	    && rb_respond_to(gz->io, id_flush))
@@ -2368,21 +2497,23 @@ gzfile_write_raw(struct gzfile *gz)
 static VALUE
 gzfile_read_raw_partial(VALUE arg)
 {
-    struct gzfile *gz = (struct gzfile*)arg;
+    struct read_raw_arg *ra = (struct read_raw_arg *)arg;
     VALUE str;
+    int argc = NIL_P(ra->as.argv[1]) ? 1 : 2;
 
-    str = rb_funcall(gz->io, id_readpartial, 1, INT2FIX(GZFILE_READ_SIZE));
+    str = rb_funcallv(ra->io, id_readpartial, argc, ra->as.argv);
     Check_Type(str, T_STRING);
     return str;
 }
 
 static VALUE
-gzfile_read_raw_rescue(VALUE arg)
+gzfile_read_raw_rescue(VALUE arg, VALUE _)
 {
-    struct gzfile *gz = (struct gzfile*)arg;
+    struct read_raw_arg *ra = (struct read_raw_arg *)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));
+	int argc = NIL_P(ra->as.argv[1]) ? 1 : 2;
+	str = rb_funcallv(ra->io, id_read, argc, ra->as.argv);
         if (!NIL_P(str)) {
             Check_Type(str, T_STRING);
         }
@@ -2391,20 +2522,30 @@ gzfile_read_raw_rescue(VALUE arg)
 }
 
 static VALUE
-gzfile_read_raw(struct gzfile *gz)
+gzfile_read_raw(struct gzfile *gz, VALUE outbuf)
 {
-    return rb_rescue2(gzfile_read_raw_partial, (VALUE)gz,
-                      gzfile_read_raw_rescue, (VALUE)gz,
+    struct read_raw_arg ra;
+
+    ra.io = gz->io;
+    ra.as.in.len = INT2FIX(GZFILE_READ_SIZE);
+    ra.as.in.buf = outbuf;
+
+    return rb_rescue2(gzfile_read_raw_partial, (VALUE)&ra,
+                      gzfile_read_raw_rescue, (VALUE)&ra,
                       rb_eEOFError, rb_eNoMethodError, (VALUE)0);
 }
 
 static int
-gzfile_read_raw_ensure(struct gzfile *gz, long size)
+gzfile_read_raw_ensure(struct gzfile *gz, long size, VALUE outbuf)
 {
     VALUE str;
 
+    if (gz->io == Qundef) { /* Zlib.gunzip */
+	if (NIL_P(gz->z.input) || RSTRING_LEN(gz->z.input) < size)
+	    rb_raise(cGzError, "unexpected end of string");
+    }
     while (NIL_P(gz->z.input) || RSTRING_LEN(gz->z.input) < size) {
-	str = gzfile_read_raw(gz);
+	str = gzfile_read_raw(gz, outbuf);
 	if (NIL_P(str)) return 0;
 	zstream_append_input2(&gz->z, str);
     }
@@ -2421,7 +2562,7 @@ gzfile_read_raw_until_zero(struct gzfile *gz, long offset)
 	p = memchr(RSTRING_PTR(gz->z.input) + offset, '\0',
 		   RSTRING_LEN(gz->z.input) - offset);
 	if (p) break;
-	str = gzfile_read_raw(gz);
+	str = gzfile_read_raw(gz, Qnil);
 	if (NIL_P(str)) {
 	    rb_raise(cGzError, "unexpected end of file");
 	}
@@ -2502,7 +2643,7 @@ gzfile_make_header(struct gzfile *gz)
     if (!NIL_P(gz->comment)) {
 	flags |= GZ_FLAG_COMMENT;
     }
-    if (gz->mtime == 0) {
+    if (!(gz->z.flags & GZFILE_FLAG_MTIME_IS_SET)) {
 	gz->mtime = time(0);
     }
 
@@ -2546,13 +2687,14 @@ gzfile_make_footer(struct gzfile *gz)
 }
 
 static void
-gzfile_read_header(struct gzfile *gz)
+gzfile_read_header(struct gzfile *gz, VALUE outbuf)
 {
     const unsigned char *head;
     long len;
     char flags, *p;
 
-    if (!gzfile_read_raw_ensure(gz, 10)) {  /* 10 is the size of gzip header */
+    /* 10 is the size of gzip header */
+    if (!gzfile_read_raw_ensure(gz, 10, outbuf)) {
 	gzfile_raise(gz, cGzError, "not in gzip format");
     }
 
@@ -2591,33 +2733,31 @@ gzfile_read_header(struct gzfile *gz)
     zstream_discard_input(&gz->z, 10);
 
     if (flags & GZ_FLAG_EXTRA) {
-	if (!gzfile_read_raw_ensure(gz, 2)) {
+	if (!gzfile_read_raw_ensure(gz, 2, outbuf)) {
 	    rb_raise(cGzError, "unexpected end of file");
 	}
 	len = gzfile_get16((Bytef*)RSTRING_PTR(gz->z.input));
-	if (!gzfile_read_raw_ensure(gz, 2 + len)) {
+	if (!gzfile_read_raw_ensure(gz, 2 + len, outbuf)) {
 	    rb_raise(cGzError, "unexpected end of file");
 	}
 	zstream_discard_input(&gz->z, 2 + len);
     }
     if (flags & GZ_FLAG_ORIG_NAME) {
-	if (!gzfile_read_raw_ensure(gz, 1)) {
+	if (!gzfile_read_raw_ensure(gz, 1, outbuf)) {
 	    rb_raise(cGzError, "unexpected end of file");
 	}
 	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);
-	OBJ_TAINT(gz->orig_name);  /* for safe */
 	zstream_discard_input(&gz->z, len + 1);
     }
     if (flags & GZ_FLAG_COMMENT) {
-	if (!gzfile_read_raw_ensure(gz, 1)) {
+	if (!gzfile_read_raw_ensure(gz, 1, outbuf)) {
 	    rb_raise(cGzError, "unexpected end of file");
 	}
 	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);
-	OBJ_TAINT(gz->comment);  /* for safe */
 	zstream_discard_input(&gz->z, len + 1);
     }
 
@@ -2627,13 +2767,14 @@ gzfile_read_header(struct gzfile *gz)
 }
 
 static void
-gzfile_check_footer(struct gzfile *gz)
+gzfile_check_footer(struct gzfile *gz, VALUE outbuf)
 {
     unsigned long crc, length;
 
     gz->z.flags |= GZFILE_FLAG_FOOTER_FINISHED;
 
-    if (!gzfile_read_raw_ensure(gz, 8)) { /* 8 is the size of gzip footer */
+    /* 8 is the size of gzip footer */
+    if (!gzfile_read_raw_ensure(gz, 8, outbuf)) {
 	gzfile_raise(gz, cNoFooter, "footer is not found");
     }
 
@@ -2667,12 +2808,12 @@ gzfile_write(struct gzfile *gz, Bytef *str, long len)
 }
 
 static long
-gzfile_read_more(struct gzfile *gz)
+gzfile_read_more(struct gzfile *gz, VALUE outbuf)
 {
     VALUE str;
 
     while (!ZSTREAM_IS_FINISHED(&gz->z)) {
-	str = gzfile_read_raw(gz);
+	str = gzfile_read_raw(gz, outbuf);
 	if (NIL_P(str)) {
 	    if (!ZSTREAM_IS_FINISHED(&gz->z)) {
 		rb_raise(cGzError, "unexpected end of file");
@@ -2684,9 +2825,9 @@ gzfile_read_more(struct gzfile *gz)
 			Z_SYNC_FLUSH);
 	    RB_GC_GUARD(str);
 	}
-	if (gz->z.buf_filled > 0) break;
+	if (ZSTREAM_BUF_FILLED(&gz->z) > 0) break;
     }
-    return gz->z.buf_filled;
+    return ZSTREAM_BUF_FILLED(&gz->z);
 }
 
 static void
@@ -2697,7 +2838,7 @@ gzfile_calc_crc(struct gzfile *gz, VALUE str)
     }
     else {
 	gz->crc = checksum_long(crc32, gz->crc, (Bytef*)RSTRING_PTR(str) + gz->ungetc,
-			RSTRING_LEN(str) - gz->ungetc);
+				RSTRING_LEN(str) - gz->ungetc);
 	gz->ungetc = 0;
     }
 }
@@ -2707,13 +2848,11 @@ gzfile_newstr(struct gzfile *gz, VALUE str)
 {
     if (!gz->enc2) {
 	rb_enc_associate(str, gz->enc);
-	OBJ_TAINT(str);  /* for safe */
 	return str;
     }
     if (gz->ec && rb_enc_dummy_p(gz->enc2)) {
         str = rb_econv_str_convert(gz->ec, str, ECONV_PARTIAL_INPUT);
 	rb_enc_associate(str, gz->enc);
-	OBJ_TAINT(str);
 	return str;
     }
     return rb_str_conv_enc_opts(str, gz->enc2, gz->enc,
@@ -2727,16 +2866,16 @@ gzfile_fill(struct gzfile *gz, long len)
         rb_raise(rb_eArgError, "negative length %ld given", len);
     if (len == 0)
 	return 0;
-    while (!ZSTREAM_IS_FINISHED(&gz->z) && gz->z.buf_filled < len) {
-	gzfile_read_more(gz);
+    while (!ZSTREAM_IS_FINISHED(&gz->z) && ZSTREAM_BUF_FILLED(&gz->z) < len) {
+	gzfile_read_more(gz, Qnil);
     }
     if (GZFILE_IS_FINISHED(gz)) {
 	if (!(gz->z.flags & GZFILE_FLAG_FOOTER_FINISHED)) {
-	    gzfile_check_footer(gz);
+	    gzfile_check_footer(gz, Qnil);
 	}
 	return -1;
     }
-    return len < gz->z.buf_filled ? len : gz->z.buf_filled;
+    return len < ZSTREAM_BUF_FILLED(&gz->z) ? len : ZSTREAM_BUF_FILLED(&gz->z);
 }
 
 static VALUE
@@ -2760,9 +2899,6 @@ gzfile_readpartial(struct gzfile *gz, long len, VALUE outbuf)
     if (len < 0)
         rb_raise(rb_eArgError, "negative length %ld given", len);
 
-    if (!NIL_P(outbuf))
-	OBJ_TAINT(outbuf);
-
     if (len == 0) {
         if (NIL_P(outbuf))
             return rb_str_new(0, 0);
@@ -2771,12 +2907,12 @@ gzfile_readpartial(struct gzfile *gz, long len, VALUE outbuf)
             return outbuf;
         }
     }
-    while (!ZSTREAM_IS_FINISHED(&gz->z) && gz->z.buf_filled == 0) {
-	gzfile_read_more(gz);
+    while (!ZSTREAM_IS_FINISHED(&gz->z) && ZSTREAM_BUF_FILLED(&gz->z) == 0) {
+	gzfile_read_more(gz, outbuf);
     }
     if (GZFILE_IS_FINISHED(gz)) {
 	if (!(gz->z.flags & GZFILE_FLAG_FOOTER_FINISHED)) {
-	    gzfile_check_footer(gz);
+	    gzfile_check_footer(gz, outbuf);
 	}
         if (!NIL_P(outbuf))
             rb_str_resize(outbuf, 0);
@@ -2789,10 +2925,10 @@ gzfile_readpartial(struct gzfile *gz, long len, VALUE outbuf)
     if (!NIL_P(outbuf)) {
         rb_str_resize(outbuf, RSTRING_LEN(dst));
         memcpy(RSTRING_PTR(outbuf), RSTRING_PTR(dst), RSTRING_LEN(dst));
-	RB_GC_GUARD(dst);
+	rb_str_resize(dst, 0);
+	rb_gc_force_recycle(dst);
 	dst = outbuf;
     }
-    OBJ_TAINT(dst);  /* for safe */
     return dst;
 }
 
@@ -2802,11 +2938,11 @@ gzfile_read_all(struct gzfile *gz)
     VALUE dst;
 
     while (!ZSTREAM_IS_FINISHED(&gz->z)) {
-	gzfile_read_more(gz);
+	gzfile_read_more(gz, Qnil);
     }
     if (GZFILE_IS_FINISHED(gz)) {
 	if (!(gz->z.flags & GZFILE_FLAG_FOOTER_FINISHED)) {
-	    gzfile_check_footer(gz);
+	    gzfile_check_footer(gz, Qnil);
 	}
 	return rb_str_new(0, 0);
     }
@@ -2814,7 +2950,6 @@ gzfile_read_all(struct gzfile *gz)
     dst = zstream_detach_buffer(&gz->z);
     if (NIL_P(dst)) return dst;
     gzfile_calc_crc(gz, dst);
-    OBJ_TAINT(dst);
     return gzfile_newstr(gz, dst);
 }
 
@@ -2825,12 +2960,12 @@ gzfile_getc(struct gzfile *gz)
     int len;
 
     len = rb_enc_mbmaxlen(gz->enc);
-    while (!ZSTREAM_IS_FINISHED(&gz->z) && gz->z.buf_filled < len) {
-	gzfile_read_more(gz);
+    while (!ZSTREAM_IS_FINISHED(&gz->z) && ZSTREAM_BUF_FILLED(&gz->z) < len) {
+	gzfile_read_more(gz, Qnil);
     }
     if (GZFILE_IS_FINISHED(gz)) {
 	if (!(gz->z.flags & GZFILE_FLAG_FOOTER_FINISHED)) {
-	    gzfile_check_footer(gz);
+	    gzfile_check_footer(gz, Qnil);
 	}
 	return Qnil;
     }
@@ -2838,22 +2973,18 @@ gzfile_getc(struct gzfile *gz)
     if (gz->ec && rb_enc_dummy_p(gz->enc2)) {
 	const unsigned char *ss, *sp, *se;
 	unsigned char *ds, *dp, *de;
+	VALUE cbuf = rb_enc_str_new(0, GZFILE_CBUF_CAPA, gz->enc);
 
-	if (!gz->cbuf) {
-	    gz->cbuf = ALLOC_N(char, GZFILE_CBUF_CAPA);
-	}
         ss = sp = (const unsigned char*)RSTRING_PTR(gz->z.buf);
-        se = sp + gz->z.buf_filled;
-        ds = dp = (unsigned char *)gz->cbuf;
+        se = sp + ZSTREAM_BUF_FILLED(&gz->z);
+        ds = dp = (unsigned char *)RSTRING_PTR(cbuf);
         de = (unsigned char *)ds + GZFILE_CBUF_CAPA;
         (void)rb_econv_convert(gz->ec, &sp, se, &dp, de, ECONV_PARTIAL_INPUT|ECONV_AFTER_OUTPUT);
         rb_econv_check_error(gz->ec);
 	dst = zstream_shift_buffer(&gz->z, sp - ss);
 	gzfile_calc_crc(gz, dst);
-	dst = rb_str_new(gz->cbuf, dp - ds);
-	rb_enc_associate(dst, gz->enc);
-	OBJ_TAINT(dst);
-	return dst;
+	rb_str_resize(cbuf, dp - ds);
+	return cbuf;
     }
     else {
 	buf = gz->z.buf;
@@ -2900,7 +3031,7 @@ gzfile_writer_end(struct gzfile *gz)
     if (ZSTREAM_IS_CLOSING(&gz->z)) return;
     gz->z.flags |= ZSTREAM_FLAG_CLOSING;
 
-    rb_ensure(gzfile_writer_end_run, (VALUE)gz, zstream_end, (VALUE)&gz->z);
+    rb_ensure(gzfile_writer_end_run, (VALUE)gz, zstream_ensure_end, (VALUE)&gz->z);
 }
 
 static VALUE
@@ -2910,7 +3041,7 @@ gzfile_reader_end_run(VALUE arg)
 
     if (GZFILE_IS_FINISHED(gz)
 	&& !(gz->z.flags & GZFILE_FLAG_FOOTER_FINISHED)) {
-	gzfile_check_footer(gz);
+	gzfile_check_footer(gz, Qnil);
     }
 
     return Qnil;
@@ -2922,7 +3053,7 @@ gzfile_reader_end(struct gzfile *gz)
     if (ZSTREAM_IS_CLOSING(&gz->z)) return;
     gz->z.flags |= ZSTREAM_FLAG_CLOSING;
 
-    rb_ensure(gzfile_reader_end_run, (VALUE)gz, zstream_end, (VALUE)&gz->z);
+    rb_ensure(gzfile_reader_end_run, (VALUE)gz, zstream_ensure_end, (VALUE)&gz->z);
 }
 
 static void
@@ -2947,12 +3078,11 @@ gzfile_reader_get_unused(struct gzfile *gz)
     if (!ZSTREAM_IS_READY(&gz->z)) return Qnil;
     if (!GZFILE_IS_FINISHED(gz)) return Qnil;
     if (!(gz->z.flags & GZFILE_FLAG_FOOTER_FINISHED)) {
-	gzfile_check_footer(gz);
+	gzfile_check_footer(gz, Qnil);
     }
     if (NIL_P(gz->z.input)) return Qnil;
 
     str = rb_str_resurrect(gz->z.input);
-    OBJ_TAINT(str);  /* for safe */
     return str;
 }
 
@@ -3019,7 +3149,7 @@ static VALUE
 new_wrap(VALUE tmp)
 {
     new_wrap_arg_t *arg = (new_wrap_arg_t *)tmp;
-    return rb_class_new_instance(arg->argc, arg->argv, arg->klass);
+    return rb_class_new_instance_kw(arg->argc, arg->argv, arg->klass, RB_PASS_CALLED_KEYWORDS);
 }
 
 static VALUE
@@ -3052,7 +3182,7 @@ gzfile_wrap(int argc, VALUE *argv, VALUE klass, int close_io_on_error)
 	}
     }
     else {
-	obj = rb_class_new_instance(argc, argv, klass);
+	obj = rb_class_new_instance_kw(argc, argv, klass, RB_PASS_CALLED_KEYWORDS);
     }
 
     if (rb_block_given_p()) {
@@ -3169,7 +3299,6 @@ rb_gzfile_orig_name(VALUE obj)
     if (!NIL_P(str)) {
 	str = rb_str_dup(str);
     }
-    OBJ_TAINT(str);  /* for safe */
     return str;
 }
 
@@ -3186,7 +3315,6 @@ rb_gzfile_comment(VALUE obj)
     if (!NIL_P(str)) {
 	str = rb_str_dup(str);
     }
-    OBJ_TAINT(str);  /* for safe */
     return str;
 }
 
@@ -3218,7 +3346,7 @@ rb_gzfile_set_lineno(VALUE obj, VALUE lineno)
  * Document-method: Zlib::GzipWriter#mtime=
  *
  * Specify the modification time (+mtime+) in the gzip header.
- * Using a Fixnum or Integer.
+ * Using an Integer.
  *
  * Setting the mtime in the gzip header does not effect the
  * mtime of the file generated. Different utilities that
@@ -3245,6 +3373,7 @@ rb_gzfile_set_mtime(VALUE obj, VALUE mtime)
 
     val = rb_Integer(mtime);
     gz->mtime = NUM2UINT(val);
+    gz->z.flags |= GZFILE_FLAG_MTIME_IS_SET;
 
     return mtime;
 }
@@ -3417,7 +3546,14 @@ static VALUE
 rb_gzfile_total_out(VALUE obj)
 {
     struct gzfile *gz = get_gzfile(obj);
-    return rb_uint2inum(gz->z.stream.total_out - gz->z.buf_filled);
+    uLong total_out = gz->z.stream.total_out;
+    long buf_filled = ZSTREAM_BUF_FILLED(&gz->z);
+
+    if (total_out >= (uLong)buf_filled) {
+        return rb_uint2inum(total_out - buf_filled);
+    } else {
+        return LONG2FIX(-(buf_filled - (long)total_out));
+    }
 }
 
 /*
@@ -3436,6 +3572,16 @@ rb_gzfile_path(VALUE obj)
     return gz->path;
 }
 
+static VALUE
+gzfile_initialize_path_partial(VALUE obj)
+{
+    struct gzfile* gz;
+    TypedData_Get_Struct(obj, struct gzfile, &gzfile_data_type, gz);
+    gz->path = rb_funcall(gz->io, id_path, 0);
+    rb_define_singleton_method(obj, "path", rb_gzfile_path, 0);
+    return Qnil;
+}
+
 static void
 rb_gzfile_ecopts(struct gzfile *gz, VALUE opts)
 {
@@ -3544,8 +3690,8 @@ rb_gzwriter_initialize(int argc, VALUE *argv, VALUE obj)
     rb_gzfile_ecopts(gz, opt);
 
     if (rb_respond_to(io, id_path)) {
-	gz->path = rb_funcall(gz->io, id_path, 0);
-	rb_define_singleton_method(obj, "path", rb_gzfile_path, 0);
+	/* File#path may raise IOError in case when a path is unavailable */
+	rb_rescue2(gzfile_initialize_path_partial, obj, NULL, Qnil, rb_eIOError, (VALUE)0);
     }
 
     return obj;
@@ -3583,18 +3729,23 @@ rb_gzwriter_flush(int argc, VALUE *argv, VALUE obj)
  * Same as IO.
  */
 static VALUE
-rb_gzwriter_write(VALUE obj, VALUE str)
+rb_gzwriter_write(int argc, VALUE *argv, VALUE obj)
 {
     struct gzfile *gz = get_gzfile(obj);
-
-    if (!RB_TYPE_P(str, T_STRING))
-	str = rb_obj_as_string(str);
-    if (gz->enc2 && gz->enc2 != rb_ascii8bit_encoding()) {
-	str = rb_str_conv_enc(str, rb_enc_get(str), gz->enc2);
+    size_t total = 0;
+
+    while (argc-- > 0) {
+	VALUE str = *argv++;
+	if (!RB_TYPE_P(str, T_STRING))
+	    str = rb_obj_as_string(str);
+	if (gz->enc2 && gz->enc2 != rb_ascii8bit_encoding()) {
+	    str = rb_str_conv_enc(str, rb_enc_get(str), gz->enc2);
+	}
+	gzfile_write(gz, (Bytef*)RSTRING_PTR(str), RSTRING_LEN(str));
+	total += RSTRING_LEN(str);
+	RB_GC_GUARD(str);
     }
-    gzfile_write(gz, (Bytef*)RSTRING_PTR(str), RSTRING_LEN(str));
-    RB_GC_GUARD(str);
-    return INT2FIX(RSTRING_LEN(str));
+    return SIZET2NUM(total);
 }
 
 /*
@@ -3710,6 +3861,60 @@ rb_gzreader_s_open(int argc, VALUE *argv, VALUE klass)
 }
 
 /*
+ * Document-method: Zlib::GzipReader.zcat
+ *
+ * call-seq:
+ *   Zlib::GzipReader.zcat(io, options = {}, &block) => nil
+ *   Zlib::GzipReader.zcat(io, options = {}) => string
+ *
+ * Decompresses all gzip data in the +io+, handling multiple gzip
+ * streams until the end of the +io+.  There should not be any non-gzip
+ * data after the gzip streams.
+ *
+ * If a block is given, it is yielded strings of uncompressed data,
+ * and the method returns +nil+.
+ * If a block is not given, the method returns the concatenation of
+ * all uncompressed data in all gzip streams.
+ */
+static VALUE
+rb_gzreader_s_zcat(int argc, VALUE *argv, VALUE klass)
+{
+    VALUE io, unused, obj, buf=0, tmpbuf;
+    long pos;
+
+    rb_check_arity(argc, 1, 2);
+    io = argv[0];
+
+    do {
+        obj = rb_funcallv(klass, rb_intern("new"), argc, argv);
+        if (rb_block_given_p()) {
+           rb_gzreader_each(0, 0, obj);
+        }
+        else {
+            if (!buf) {
+                buf = rb_str_new(0, 0);
+            }
+            tmpbuf = gzfile_read_all(get_gzfile(obj));
+            rb_str_cat(buf, RSTRING_PTR(tmpbuf), RSTRING_LEN(tmpbuf));
+        }
+
+        rb_gzreader_read(0, 0, obj);
+        pos = NUM2LONG(rb_funcall(io, rb_intern("pos"), 0));
+        unused = rb_gzreader_unused(obj);
+        rb_gzfile_finish(obj);
+        if (!NIL_P(unused)) {
+            pos -= NUM2LONG(rb_funcall(unused, rb_intern("length"), 0));
+            rb_funcall(io, rb_intern("pos="), 1, LONG2NUM(pos));
+        }
+    } while (pos < NUM2LONG(rb_funcall(io, rb_intern("size"), 0)));
+
+    if (rb_block_given_p()) {
+        return Qnil;
+    }
+    return buf;
+}
+
+/*
  * Document-method: Zlib::GzipReader.new
  *
  * call-seq:
@@ -3743,12 +3948,12 @@ rb_gzreader_initialize(int argc, VALUE *argv, VALUE obj)
     }
     gz->io = io;
     ZSTREAM_READY(&gz->z);
-    gzfile_read_header(gz);
+    gzfile_read_header(gz, Qnil);
     rb_gzfile_ecopts(gz, opt);
 
     if (rb_respond_to(io, id_path)) {
-	gz->path = rb_funcall(gz->io, id_path, 0);
-	rb_define_singleton_method(obj, "path", rb_gzfile_path, 0);
+	/* File#path may raise IOError in case when a path is unavailable */
+	rb_rescue2(gzfile_initialize_path_partial, obj, NULL, Qnil, rb_eIOError, (VALUE)0);
     }
 
     return obj;
@@ -3936,20 +4141,6 @@ rb_gzreader_each_byte(VALUE obj)
 }
 
 /*
- * Document-method: Zlib::GzipReader#bytes
- *
- *  This is a deprecated alias for <code>each_byte</code>.
- */
-static VALUE
-rb_gzreader_bytes(VALUE obj)
-{
-    rb_warn("Zlib::GzipReader#bytes is deprecated; use #each_byte instead");
-    if (!rb_block_given_p())
-	return rb_enumeratorize(obj, ID2SYM(rb_intern("each_byte")), 0, 0);
-    return rb_gzreader_each_byte(obj);
-}
-
-/*
  * Document-method: Zlib::GzipReader#ungetc
  *
  * See Zlib::GzipReader documentation for a description.
@@ -3991,20 +4182,20 @@ gzreader_skip_linebreaks(struct gzfile *gz)
     char *p;
     int n;
 
-    while (gz->z.buf_filled == 0) {
+    while (ZSTREAM_BUF_FILLED(&gz->z) == 0) {
 	if (GZFILE_IS_FINISHED(gz)) return;
-	gzfile_read_more(gz);
+	gzfile_read_more(gz, Qnil);
     }
     n = 0;
     p = RSTRING_PTR(gz->z.buf);
 
     while (n++, *(p++) == '\n') {
-	if (n >= gz->z.buf_filled) {
+	if (n >= ZSTREAM_BUF_FILLED(&gz->z)) {
 	    str = zstream_detach_buffer(&gz->z);
 	    gzfile_calc_crc(gz, str);
-	    while (gz->z.buf_filled == 0) {
+	    while (ZSTREAM_BUF_FILLED(&gz->z) == 0) {
 		if (GZFILE_IS_FINISHED(gz)) return;
-		gzfile_read_more(gz);
+		gzfile_read_more(gz, Qnil);
 	    }
 	    n = 0;
 	    p = RSTRING_PTR(gz->z.buf);
@@ -4026,7 +4217,7 @@ static long
 gzreader_charboundary(struct gzfile *gz, long n)
 {
     char *s = RSTRING_PTR(gz->z.buf);
-    char *e = s + gz->z.buf_filled;
+    char *e = s + ZSTREAM_BUF_FILLED(&gz->z);
     char *p = rb_enc_left_char_head(s, s + n, e, gz->enc);
     long l = p - s;
     if (l < n) {
@@ -4121,25 +4312,25 @@ gzreader_gets(int argc, VALUE *argv, VALUE obj)
 	gzreader_skip_linebreaks(gz);
     }
 
-    while (gz->z.buf_filled < rslen) {
+    while (ZSTREAM_BUF_FILLED(&gz->z) < rslen) {
 	if (ZSTREAM_IS_FINISHED(&gz->z)) {
-	    if (gz->z.buf_filled > 0) gz->lineno++;
+	    if (ZSTREAM_BUF_FILLED(&gz->z) > 0) gz->lineno++;
 	    return gzfile_read(gz, rslen);
 	}
-	gzfile_read_more(gz);
+	gzfile_read_more(gz, Qnil);
     }
 
     p = RSTRING_PTR(gz->z.buf);
     n = rslen;
     for (;;) {
 	long filled;
-	if (n > gz->z.buf_filled) {
+	if (n > ZSTREAM_BUF_FILLED(&gz->z)) {
 	    if (ZSTREAM_IS_FINISHED(&gz->z)) break;
-	    gzfile_read_more(gz);
+	    gzfile_read_more(gz, Qnil);
 	    p = RSTRING_PTR(gz->z.buf) + n - rslen;
 	}
 	if (!rspara) rscheck(rsptr, rslen, rs);
-	filled = gz->z.buf_filled;
+	filled = ZSTREAM_BUF_FILLED(&gz->z);
 	if (limit > 0 && filled >= limit) {
 	    filled = limit;
 	}
@@ -4156,7 +4347,7 @@ gzreader_gets(int argc, VALUE *argv, VALUE obj)
 	    p++, n++;
 	}
     }
-    if (maxlen > 1 && n == limit && (gz->z.buf_filled > n || !ZSTREAM_IS_FINISHED(&gz->z))) {
+    if (maxlen > 1 && n == limit && (ZSTREAM_BUF_FILLED(&gz->z) > n || !ZSTREAM_IS_FINISHED(&gz->z))) {
 	n = gzreader_charboundary(gz, n);
     }
 
@@ -4175,6 +4366,8 @@ gzreader_gets(int argc, VALUE *argv, VALUE obj)
  * Document-method: Zlib::GzipReader#gets
  *
  * See Zlib::GzipReader documentation for a description.
+ * However, note that this method can return +nil+ even if
+ * #eof? returns false, unlike the behavior of File#gets.
  */
 static VALUE
 rb_gzreader_gets(int argc, VALUE *argv, VALUE obj)
@@ -4222,20 +4415,6 @@ rb_gzreader_each(int argc, VALUE *argv, VALUE obj)
 }
 
 /*
- * Document-method: Zlib::GzipReader#lines
- *
- *  This is a deprecated alias for <code>each_line</code>.
- */
-static VALUE
-rb_gzreader_lines(int argc, VALUE *argv, VALUE obj)
-{
-    rb_warn("Zlib::GzipReader#lines is deprecated; use #each_line instead");
-    if (!rb_block_given_p())
-	return rb_enumeratorize(obj, ID2SYM(rb_intern("each_line")), argc, argv);
-    return rb_gzreader_each(argc, argv, obj);
-}
-
-/*
  * Document-method: Zlib::GzipReader#readlines
  *
  * See Zlib::GzipReader documentation for a description.
@@ -4262,11 +4441,186 @@ rb_gzreader_external_encoding(VALUE self)
     return rb_enc_from_encoding(get_gzfile(self)->enc);
 }
 
+static VALUE
+zlib_gzip_end_rescue(VALUE arg)
+{
+    struct gzfile *gz = (struct gzfile *)arg;
+    gz->end(gz);
+    return Qnil;
+}
+
+static VALUE
+zlib_gzip_ensure(VALUE arg)
+{
+    return rb_rescue(zlib_gzip_end_rescue, arg, NULL, Qnil);
+}
+
+static void
+zlib_gzip_end(struct gzfile *gz)
+{
+    gz->z.flags |= ZSTREAM_FLAG_CLOSING;
+    zstream_run(&gz->z, (Bytef*)"", 0, Z_FINISH);
+    gzfile_make_footer(gz);
+    zstream_end(&gz->z);
+}
+
+static ID id_level, id_strategy;
+static VALUE zlib_gzip_run(VALUE arg);
+
+/*
+ * call-seq:
+ *   Zlib.gzip(src, level: nil, strategy: nil) -> String
+ *
+ * Gzip the given +string+. Valid values of level are
+ * Zlib::NO_COMPRESSION, Zlib::BEST_SPEED, Zlib::BEST_COMPRESSION,
+ * Zlib::DEFAULT_COMPRESSION (default), or an integer from 0 to 9.
+ *
+ * This method is almost equivalent to the following code:
+ *
+ *   def gzip(string, level: nil, strategy: nil)
+ *     sio = StringIO.new
+ *     sio.binmode
+ *     gz = Zlib::GzipWriter.new(sio, level, strategy)
+ *     gz.write(string)
+ *     gz.close
+ *     sio.string
+ *   end
+ *
+ * See also Zlib.gunzip
+ *
+ */
+static VALUE
+zlib_s_gzip(int argc, VALUE *argv, VALUE klass)
+{
+    struct gzfile gz0;
+    struct gzfile *gz = &gz0;
+    int err;
+    VALUE src, opts, level=Qnil, strategy=Qnil, args[2];
+
+    if (OPTHASH_GIVEN_P(opts)) {
+	ID keyword_ids[2];
+	VALUE kwargs[2];
+	keyword_ids[0] = id_level;
+	keyword_ids[1] = id_strategy;
+	rb_get_kwargs(opts, keyword_ids, 0, 2, kwargs);
+	if (kwargs[0] != Qundef) {
+	    level = kwargs[0];
+	}
+	if (kwargs[1] != Qundef) {
+	    strategy = kwargs[1];
+	}
+    }
+    rb_scan_args(argc, argv, "10", &src);
+    StringValue(src);
+    gzfile_init(gz, &deflate_funcs, zlib_gzip_end);
+    gz->level = ARG_LEVEL(level);
+    err = deflateInit2(&gz->z.stream, gz->level, Z_DEFLATED,
+		       -MAX_WBITS, DEF_MEM_LEVEL, ARG_STRATEGY(strategy));
+    if (err != Z_OK) {
+	zlib_gzip_end(gz);
+	raise_zlib_error(err, gz->z.stream.msg);
+    }
+    ZSTREAM_READY(&gz->z);
+    args[0] = (VALUE)gz;
+    args[1] = src;
+    return rb_ensure(zlib_gzip_run, (VALUE)args, zlib_gzip_ensure, (VALUE)gz);
+}
+
+static VALUE
+zlib_gzip_run(VALUE arg)
+{
+    VALUE *args = (VALUE *)arg;
+    struct gzfile *gz = (struct gzfile *)args[0];
+    VALUE src = args[1];
+    long len;
+
+    gzfile_make_header(gz);
+    len = RSTRING_LEN(src);
+    if (len > 0) {
+	Bytef *ptr = (Bytef *)RSTRING_PTR(src);
+	gz->crc = checksum_long(crc32, gz->crc, ptr, len);
+	zstream_run(&gz->z, ptr, len, Z_NO_FLUSH);
+    }
+    gzfile_close(gz, 0);
+    return zstream_detach_buffer(&gz->z);
+}
+
+static void
+zlib_gunzip_end(struct gzfile *gz)
+{
+    gz->z.flags |= ZSTREAM_FLAG_CLOSING;
+    zstream_end(&gz->z);
+}
+
+static VALUE zlib_gunzip_run(VALUE arg);
+
+/*
+ * call-seq:
+ *   Zlib.gunzip(src) -> String
+ *
+ * Decode the given gzipped +string+.
+ *
+ * This method is almost equivalent to the following code:
+ *
+ *   def gunzip(string)
+ *     sio = StringIO.new(string)
+ *     gz = Zlib::GzipReader.new(sio, encoding: Encoding::ASCII_8BIT)
+ *     gz.read
+ *   ensure
+ *     gz&.close
+ *   end
+ *
+ * See also Zlib.gzip
+ */
+static VALUE
+zlib_gunzip(VALUE klass, VALUE src)
+{
+    struct gzfile gz0;
+    struct gzfile *gz = &gz0;
+    int err;
+
+    StringValue(src);
+
+    gzfile_init(gz, &inflate_funcs, zlib_gunzip_end);
+    err = inflateInit2(&gz->z.stream, -MAX_WBITS);
+    if (err != Z_OK) {
+	raise_zlib_error(err, gz->z.stream.msg);
+    }
+    gz->io = Qundef;
+    gz->z.input = src;
+    ZSTREAM_READY(&gz->z);
+    return rb_ensure(zlib_gunzip_run, (VALUE)gz, zlib_gzip_ensure, (VALUE)gz);
+}
+
+static VALUE
+zlib_gunzip_run(VALUE arg)
+{
+    struct gzfile *gz = (struct gzfile *)arg;
+    VALUE dst;
+
+    gzfile_read_header(gz, Qnil);
+    dst = zstream_detach_buffer(&gz->z);
+    gzfile_calc_crc(gz, dst);
+    if (!ZSTREAM_IS_FINISHED(&gz->z)) {
+	rb_raise(cGzError, "unexpected end of file");
+    }
+    if (NIL_P(gz->z.input)) {
+	rb_raise(cNoFooter, "footer is not found");
+    }
+    gzfile_check_footer(gz, Qnil);
+    return dst;
+}
+
 #endif /* GZIP_SUPPORT */
 
 void
 Init_zlib(void)
 {
+#ifdef HAVE_RB_EXT_RACTOR_SAFE
+    rb_ext_ractor_safe(true);
+#endif
+
+#undef rb_intern
     VALUE mZlib, cZStream, cDeflate, cInflate;
 #if GZIP_SUPPORT
     VALUE cGzipFile, cGzipWriter, cGzipReader;
@@ -4284,6 +4638,7 @@ Init_zlib(void)
     cMemError     = rb_define_class_under(mZlib, "MemError", cZError);
     cBufError     = rb_define_class_under(mZlib, "BufError", cZError);
     cVersionError = rb_define_class_under(mZlib, "VersionError", cZError);
+    cInProgressError = rb_define_class_under(mZlib, "InProgressError", cZError);
 
     rb_define_module_function(mZlib, "zlib_version", rb_zlib_version, 0);
     rb_define_module_function(mZlib, "adler32", rb_zlib_adler32, -1);
@@ -4360,7 +4715,7 @@ Init_zlib(void)
     rb_define_alloc_func(cInflate, rb_inflate_s_allocate);
     rb_define_method(cInflate, "initialize", rb_inflate_initialize, -1);
     rb_define_method(cInflate, "add_dictionary", rb_inflate_add_dictionary, 1);
-    rb_define_method(cInflate, "inflate", rb_inflate_inflate, 1);
+    rb_define_method(cInflate, "inflate", rb_inflate_inflate, -1);
     rb_define_method(cInflate, "<<", rb_inflate_addstr, 1);
     rb_define_method(cInflate, "sync", rb_inflate_sync, 1);
     rb_define_method(cInflate, "sync_point?", rb_inflate_sync_point_p, 0);
@@ -4501,7 +4856,7 @@ Init_zlib(void)
     rb_define_alloc_func(cGzipWriter, rb_gzwriter_s_allocate);
     rb_define_method(cGzipWriter, "initialize", rb_gzwriter_initialize,-1);
     rb_define_method(cGzipWriter, "flush", rb_gzwriter_flush, -1);
-    rb_define_method(cGzipWriter, "write", rb_gzwriter_write, 1);
+    rb_define_method(cGzipWriter, "write", rb_gzwriter_write, -1);
     rb_define_method(cGzipWriter, "putc", rb_gzwriter_putc, 1);
     rb_define_method(cGzipWriter, "<<", rb_gzwriter_addstr, 1);
     rb_define_method(cGzipWriter, "printf", rb_gzwriter_printf, -1);
@@ -4509,6 +4864,7 @@ Init_zlib(void)
     rb_define_method(cGzipWriter, "puts", rb_gzwriter_puts, -1);
 
     rb_define_singleton_method(cGzipReader, "open", rb_gzreader_s_open,-1);
+    rb_define_singleton_method(cGzipReader, "zcat", rb_gzreader_s_zcat, -1);
     rb_define_alloc_func(cGzipReader, rb_gzreader_s_allocate);
     rb_define_method(cGzipReader, "initialize", rb_gzreader_initialize, -1);
     rb_define_method(cGzipReader, "rewind", rb_gzreader_rewind, 0);
@@ -4521,17 +4877,18 @@ Init_zlib(void)
     rb_define_method(cGzipReader, "readbyte", rb_gzreader_readbyte, 0);
     rb_define_method(cGzipReader, "each_byte", rb_gzreader_each_byte, 0);
     rb_define_method(cGzipReader, "each_char", rb_gzreader_each_char, 0);
-    rb_define_method(cGzipReader, "bytes", rb_gzreader_bytes, 0);
     rb_define_method(cGzipReader, "ungetc", rb_gzreader_ungetc, 1);
     rb_define_method(cGzipReader, "ungetbyte", rb_gzreader_ungetbyte, 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_lines, -1);
     rb_define_method(cGzipReader, "readlines", rb_gzreader_readlines, -1);
     rb_define_method(cGzipReader, "external_encoding", rb_gzreader_external_encoding, 0);
 
+    rb_define_singleton_method(mZlib, "gzip", zlib_s_gzip, -1);
+    rb_define_singleton_method(mZlib, "gunzip", zlib_gunzip, 1);
+
     /* The OS code of current host */
     rb_define_const(mZlib, "OS_CODE", INT2FIX(OS_CODE));
     /* OS code for MSDOS hosts */
@@ -4565,6 +4922,9 @@ Init_zlib(void)
     /* OS code for unknown hosts */
     rb_define_const(mZlib, "OS_UNKNOWN", INT2FIX(OS_UNKNOWN));
 
+    id_level = rb_intern("level");
+    id_strategy = rb_intern("strategy");
+    id_buffer = rb_intern("buffer");
 #endif /* GZIP_SUPPORT */
 }
 
@@ -4586,6 +4946,7 @@ Init_zlib(void)
  * - Zlib::MemError
  * - Zlib::BufError
  * - Zlib::VersionError
+ * - Zlib::InProgressError
  *
  */
 
@@ -4661,6 +5022,20 @@ Init_zlib(void)
  */
 
 /*
+ * Document-class: Zlib::InProgressError
+ *
+ * Subclass of Zlib::Error. This error is raised when the zlib
+ * stream is currently in progress.
+ *
+ * For example:
+ *
+ *   inflater = Zlib::Inflate.new
+ *   inflater.inflate(compressed) do
+ *     inflater.inflate(compressed) # Raises Zlib::InProgressError
+ *   end
+ */
+
+/*
  * Document-class: Zlib::GzipFile::Error
  *
  * Base class of errors that occur when processing GZIP files.
@@ -4685,5 +5060,3 @@ Init_zlib(void)
  * Raised when the data length recorded in the gzip file footer is not equivalent
  * to the length of the actual uncompressed data.
  */
-
-
diff --git a/ext/zlib/zlib.gemspec b/ext/zlib/zlib.gemspec
new file mode 100644
index 0000000000..1d35065921
--- /dev/null
+++ b/ext/zlib/zlib.gemspec
@@ -0,0 +1,35 @@
+# coding: utf-8
+# frozen_string_literal: true
+
+source_version = ["", "ext/zlib/"].find do |dir|
+  begin
+    break File.open(File.join(__dir__, "#{dir}zlib.c")) {|f|
+      f.gets("\n#define RUBY_ZLIB_VERSION ")
+      f.gets[/\s*"(.+)"/, 1]
+    }
+  rescue Errno::ENOENT
+  end
+end
+
+Gem::Specification.new do |spec|
+  spec.name          = "zlib"
+  spec.version       = source_version
+  spec.authors       = ["Yukihiro Matsumoto", "UENO Katsuhiro"]
+  spec.email         = ["matz@ruby-lang.org", nil]
+
+  spec.summary       = %q{Ruby interface for the zlib compression/decompression library}
+  spec.description   = %q{Ruby interface for the zlib compression/decompression library}
+  spec.homepage      = "https://github.com/ruby/zlib"
+  spec.licenses       = ["Ruby", "BSD-2-Clause"]
+
+  spec.files         = [".gitignore",  "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "bin/console", "bin/setup", "ext/zlib/extconf.rb", "ext/zlib/zlib.c", "zlib.gemspec"]
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+  spec.extensions    = "ext/zlib/extconf.rb"
+  spec.required_ruby_version = ">= 2.3.0"
+
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rake-compiler"
+end
diff --git a/file.c b/file.c
index 9552ade863..dc832a8d9c 100644
--- a/file.c
+++ b/file.c
@@ -11,27 +11,38 @@
 
 **********************************************************************/
 
+#include "ruby/internal/config.h"
+
 #ifdef _WIN32
-#include "missing/file.h"
+# include "missing/file.h"
+# include "ruby.h"
 #endif
+
+#include <ctype.h>
+#include <time.h>
+
 #ifdef __CYGWIN__
-#include <windows.h>
-#include <sys/cygwin.h>
-#include <wchar.h>
+# include <windows.h>
+# include <sys/cygwin.h>
+# include <wchar.h>
 #endif
+
 #ifdef __APPLE__
-#include <CoreFoundation/CFString.h>
+# if !(defined(__has_feature) && defined(__has_attribute))
+/* Maybe a bug in SDK of Xcode 10.2.1 */
+/* In this condition, <os/availability.h> does not define
+ * API_AVAILABLE and similar, but __API_AVAILABLE and similar which
+ * are defined in <Availability.h> */
+#   define API_AVAILABLE(...)
+#   define API_DEPRECATED(...)
+# endif
+# include <CoreFoundation/CFString.h>
 #endif
 
-#include "internal.h"
-#include "ruby/io.h"
-#include "ruby/util.h"
-#include "dln.h"
-#include "encindex.h"
-
 #ifdef HAVE_UNISTD_H
-#include <unistd.h>
+# include <unistd.h>
 #endif
+
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
 #endif
@@ -49,85 +60,121 @@ int flock(int, int);
 # define MAXPATHLEN 1024
 #endif
 
-#include <ctype.h>
-
-#include <time.h>
-
 #ifdef HAVE_UTIME_H
-#include <utime.h>
+# include <utime.h>
 #elif defined HAVE_SYS_UTIME_H
-#include <sys/utime.h>
+# include <sys/utime.h>
 #endif
 
 #ifdef HAVE_PWD_H
-#include <pwd.h>
+# include <pwd.h>
+#endif
+
+#ifdef HAVE_SYS_SYSMACROS_H
+# include <sys/sysmacros.h>
 #endif
 
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#if defined(__native_client__)
-# if defined(NACL_NEWLIB)
-#  include "nacl/utime.h"
-#  include "nacl/stat.h"
-#  include "nacl/unistd.h"
-# else
-#  undef HAVE_UTIMENSAT
-# endif
-#endif
-
 #ifdef HAVE_SYS_MKDEV_H
-#include <sys/mkdev.h>
+# include <sys/mkdev.h>
 #endif
 
 #if defined(HAVE_FCNTL_H)
-#include <fcntl.h>
+# include <fcntl.h>
 #endif
 
 #if defined(HAVE_SYS_TIME_H)
-#include <sys/time.h>
+# include <sys/time.h>
 #endif
 
 #if !defined HAVE_LSTAT && !defined lstat
-#define lstat stat
+# define lstat stat
 #endif
 
 /* define system APIs */
 #ifdef _WIN32
-#include "win32/file.h"
-#define STAT(p, s)	rb_w32_ustati64((p), (s))
-#undef lstat
-#define lstat(p, s)	rb_w32_ulstati64((p), (s))
-#undef access
-#define access(p, m)	rb_w32_uaccess((p), (m))
-#undef truncate
-#define truncate(p, n)	rb_w32_utruncate((p), (n))
-#undef chmod
-#define chmod(p, m)	rb_w32_uchmod((p), (m))
-#undef chown
-#define chown(p, o, g)	rb_w32_uchown((p), (o), (g))
-#undef lchown
-#define lchown(p, o, g)	rb_w32_ulchown((p), (o), (g))
-#undef utime
-#define utime(p, t)	rb_w32_uutime((p), (t))
-#undef link
-#define link(f, t)	rb_w32_ulink((f), (t))
-#undef unlink
-#define unlink(p)	rb_w32_uunlink(p)
-#undef rename
-#define rename(f, t)	rb_w32_urename((f), (t))
-#undef symlink
-#define symlink(s, l)	rb_w32_usymlink((s), (l))
+# include "win32/file.h"
+# define STAT(p, s)      rb_w32_ustati128((p), (s))
+# undef lstat
+# define lstat(p, s)     rb_w32_ulstati128((p), (s))
+# undef access
+# define access(p, m)    rb_w32_uaccess((p), (m))
+# undef truncate
+# define truncate(p, n)  rb_w32_utruncate((p), (n))
+# undef chmod
+# define chmod(p, m)     rb_w32_uchmod((p), (m))
+# undef chown
+# define chown(p, o, g)  rb_w32_uchown((p), (o), (g))
+# undef lchown
+# define lchown(p, o, g) rb_w32_ulchown((p), (o), (g))
+# undef utimensat
+# define utimensat(s, p, t, f)   rb_w32_uutimensat((s), (p), (t), (f))
+# undef link
+# define link(f, t)      rb_w32_ulink((f), (t))
+# undef unlink
+# define unlink(p)       rb_w32_uunlink(p)
+# undef rename
+# define rename(f, t)    rb_w32_urename((f), (t))
+# undef symlink
+# define symlink(s, l)   rb_w32_usymlink((s), (l))
+
+# ifdef HAVE_REALPATH
+/* Don't use native realpath(3) on Windows, as the check for
+   absolute paths does not work for drive letters. */
+#  undef HAVE_REALPATH
+# endif
 #else
-#define STAT(p, s)	stat((p), (s))
+# define STAT(p, s)      stat((p), (s))
 #endif
 
+#if defined _WIN32 || defined __APPLE__
+# define USE_OSPATH 1
+# define TO_OSPATH(str) rb_str_encode_ospath(str)
+#else
+# define USE_OSPATH 0
+# define TO_OSPATH(str) (str)
+#endif
+
+/* utime may fail if time is out-of-range for the FS [ruby-dev:38277] */
+#if defined DOSISH || defined __CYGWIN__
+# define UTIME_EINVAL
+#endif
+
+/* Solaris 10 realpath(3) doesn't support File.realpath */
+#if defined HAVE_REALPATH && defined __sun && defined __SVR4
+#undef HAVE_REALPATH
+#endif
+
+#ifdef HAVE_REALPATH
+# include <limits.h>
+# include <stdlib.h>
+#endif
+
+#include "dln.h"
+#include "encindex.h"
+#include "id.h"
+#include "internal.h"
+#include "internal/compilers.h"
+#include "internal/dir.h"
+#include "internal/error.h"
+#include "internal/file.h"
+#include "internal/io.h"
+#include "internal/load.h"
+#include "internal/object.h"
+#include "internal/process.h"
+#include "internal/thread.h"
+#include "internal/vm.h"
+#include "ruby/encoding.h"
+#include "ruby/io.h"
+#include "ruby/thread.h"
+#include "ruby/util.h"
+
 VALUE rb_cFile;
 VALUE rb_mFileTest;
 VALUE rb_cStat;
 
-#define insecure_obj_p(obj, level) ((level) > 0 && OBJ_TAINTED(obj))
-
 static VALUE
 file_path_convert(VALUE name)
 {
@@ -161,71 +208,56 @@ check_path_encoding(VALUE str)
 }
 
 VALUE
-rb_get_path_check_to_string(VALUE obj, int level)
+rb_get_path_check_to_string(VALUE obj)
 {
     VALUE tmp;
     ID to_path;
 
-    if (insecure_obj_p(obj, level)) {
-	rb_insecure_operation();
-    }
-
     if (RB_TYPE_P(obj, T_STRING)) {
 	return obj;
     }
     CONST_ID(to_path, "to_path");
-    tmp = rb_check_funcall(obj, to_path, 0, 0);
-    if (tmp == Qundef) {
-	tmp = obj;
-    }
+    tmp = rb_check_funcall_default(obj, to_path, 0, 0, obj);
     StringValue(tmp);
     return tmp;
 }
 
 VALUE
-rb_get_path_check_convert(VALUE obj, VALUE tmp, int level)
+rb_get_path_check_convert(VALUE obj)
 {
-    tmp = file_path_convert(tmp);
-    if (obj != tmp && insecure_obj_p(tmp, level)) {
-	rb_insecure_operation();
-    }
+    obj = file_path_convert(obj);
 
-    check_path_encoding(tmp);
-    StringValueCStr(tmp);
-
-    return rb_str_new4(tmp);
-}
+    check_path_encoding(obj);
+    if (!rb_str_to_cstr(obj)) {
+	rb_raise(rb_eArgError, "path name contains null byte");
+    }
 
-static VALUE
-rb_get_path_check(VALUE obj, int level)
-{
-    VALUE tmp = rb_get_path_check_to_string(obj, level);
-    return rb_get_path_check_convert(obj, tmp, level);
+    return rb_str_new4(obj);
 }
 
 VALUE
 rb_get_path_no_checksafe(VALUE obj)
 {
-    return rb_get_path_check(obj, 0);
+    return rb_get_path(obj);
 }
 
 VALUE
 rb_get_path(VALUE obj)
 {
-    return rb_get_path_check(obj, rb_safe_level());
+    return rb_get_path_check_convert(rb_get_path_check_to_string(obj));
 }
 
 VALUE
 rb_str_encode_ospath(VALUE path)
 {
-#if defined _WIN32 || defined __APPLE__
+#if USE_OSPATH
     int encidx = ENCODING_GET(path);
-#ifdef _WIN32
+#if 0 && defined _WIN32
     if (encidx == ENCINDEX_ASCII) {
 	encidx = rb_filesystem_encindex();
     }
 #endif
-    if (encidx != ENCINDEX_UTF_8) {
+    if (encidx != ENCINDEX_ASCII && encidx != ENCINDEX_UTF_8) {
 	rb_encoding *enc = rb_enc_from_index(encidx);
 	rb_encoding *utf8 = rb_utf8_encoding();
 	path = rb_str_conv_enc(path, enc, utf8);
@@ -236,6 +268,46 @@ rb_str_encode_ospath(VALUE path)
 
 #ifdef __APPLE__
 # define NORMALIZE_UTF8PATH 1
+
+# ifdef HAVE_WORKING_FORK
+static void
+rb_CFString_class_initialize_before_fork(void)
+{
+    /*
+     * Since macOS 13, CFString family API used in
+     * rb_str_append_normalized_ospath may internally use Objective-C classes
+     * (NSTaggedPointerString and NSPlaceholderMutableString) for small strings.
+     *
+     * On the other hand, Objective-C classes should not be used for the first
+     * time in a fork()'ed but not exec()'ed process. Violations for this rule
+     * can result deadlock during class initialization, so Objective-C runtime
+     * conservatively crashes on such cases by default.
+     *
+     * Therefore, we need to use CFString API to initialize Objective-C classes
+     * used internally *before* fork().
+     *
+     * For future changes, please note that this initialization process cannot
+     * be done in ctor because NSTaggedPointerString in CoreFoundation is enabled
+     * after CFStringInitializeTaggedStrings(), which is called during loading
+     * Objective-C runtime after ctor.
+     * For more details, see https://bugs.ruby-lang.org/issues/18912
+     */
+
+    /* Enough small but non-empty ASCII string to fit in NSTaggedPointerString. */
+    const char small_str[] = "/";
+    long len = sizeof(small_str) - 1;
+
+    const CFAllocatorRef alloc = kCFAllocatorDefault;
+    CFStringRef s = CFStringCreateWithBytesNoCopy(alloc,
+                                                  (const UInt8 *)small_str,
+                                                  len, kCFStringEncodingUTF8,
+                                                  FALSE, kCFAllocatorNull);
+    CFMutableStringRef m = CFStringCreateMutableCopy(alloc, len, s);
+    CFRelease(m);
+    CFRelease(s);
+}
+# endif
+
 static VALUE
 rb_str_append_normalized_ospath(VALUE str, const char *ptr, long len)
 {
@@ -341,20 +413,72 @@ ignored_char_p(const char *p, const char *e, rb_encoding *enc)
 
 #define apply2args(n) (rb_check_arity(argc, n, UNLIMITED_ARGUMENTS), argc-=n)
 
+struct apply_filename {
+    const char *ptr;
+    VALUE path;
+};
+
+struct apply_arg {
+    int i;
+    int argc;
+    int errnum;
+    int (*func)(const char *, void *);
+    void *arg;
+    struct apply_filename fn[FLEX_ARY_LEN];
+};
+
+static void *
+no_gvl_apply2files(void *ptr)
+{
+    struct apply_arg *aa = ptr;
+
+    for (aa->i = 0; aa->i < aa->argc; aa->i++) {
+	if (aa->func(aa->fn[aa->i].ptr, aa->arg) < 0) {
+	    aa->errnum = errno;
+	    break;
+	}
+    }
+    return 0;
+}
+
+#ifdef UTIME_EINVAL
+NORETURN(static void utime_failed(struct apply_arg *));
+static int utime_internal(const char *, void *);
+#endif
+
 static VALUE
-apply2files(void (*func)(const char *, VALUE, void *), int argc, VALUE *argv, void *arg)
+apply2files(int (*func)(const char *, void *), int argc, VALUE *argv, void *arg)
 {
-    long i;
-    volatile VALUE path;
+    VALUE v;
+    const size_t size = sizeof(struct apply_filename);
+    const long len = (long)(offsetof(struct apply_arg, fn) + (size * argc));
+    struct apply_arg *aa = ALLOCV(v, len);
+
+    aa->errnum = 0;
+    aa->argc = argc;
+    aa->arg = arg;
+    aa->func = func;
+
+    for (aa->i = 0; aa->i < argc; aa->i++) {
+	VALUE path = rb_get_path(argv[aa->i]);
 
-    for (i=0; i<argc; i++) {
-	const char *s;
-	path = rb_get_path(argv[i]);
 	path = rb_str_encode_ospath(path);
-	s = RSTRING_PTR(path);
-	(*func)(s, path, arg);
+	aa->fn[aa->i].ptr = RSTRING_PTR(path);
+	aa->fn[aa->i].path = path;
     }
 
+    rb_thread_call_without_gvl(no_gvl_apply2files, aa, RUBY_UBF_IO, 0);
+    if (aa->errnum) {
+#ifdef UTIME_EINVAL
+	if (func == utime_internal) {
+	    utime_failed(aa);
+	}
+#endif
+	rb_syserr_fail_path(aa->errnum, aa->fn[aa->i].path);
+    }
+    if (v) {
+	ALLOCV_END(v);
+    }
     return LONG2FIX(argc);
 }
 
@@ -366,6 +490,13 @@ apply2files(void (*func)(const char *, VALUE, void *), int argc, VALUE *argv, vo
  *  Returns the pathname used to create <i>file</i> as a string. Does
  *  not normalize the name.
  *
+ *  The pathname may not point to the file corresponding to <i>file</i>.
+ *  For instance, the pathname becomes void when the file has been
+ *  moved or deleted.
+ *
+ *  This method raises IOError for a <i>file</i> created using
+ *  File::Constants::TMPFILE because they don't have a pathname.
+ *
  *     File.new("testfile").path               #=> "testfile"
  *     File.new("/tmp/../tmp/xxx", "w").path   #=> "/tmp/../tmp/xxx"
  *
@@ -378,8 +509,12 @@ rb_file_path(VALUE obj)
 
     fptr = RFILE(rb_io_taint_check(obj))->fptr;
     rb_io_check_initialized(fptr);
-    if (NIL_P(fptr->pathv)) return Qnil;
-    return rb_obj_taint(rb_str_dup(fptr->pathv));
+
+    if (NIL_P(fptr->pathv)) {
+        rb_raise(rb_eIOError, "File is unnamed (TMPFILE?)");
+    }
+
+    return rb_str_dup(fptr->pathv);
 }
 
 static size_t
@@ -423,7 +558,7 @@ get_stat(VALUE self)
     return st;
 }
 
-static struct timespec stat_mtimespec(struct stat *st);
+static struct timespec stat_mtimespec(const struct stat *st);
 
 /*
  *  call-seq:
@@ -471,7 +606,7 @@ rb_stat_cmp(VALUE self, VALUE other)
 
 /*
  *  call-seq:
- *     stat.dev    -> fixnum
+ *     stat.dev    -> integer
  *
  *  Returns an integer representing the device on which <i>stat</i>
  *  resides.
@@ -487,7 +622,7 @@ rb_stat_dev(VALUE self)
 
 /*
  *  call-seq:
- *     stat.dev_major   -> fixnum
+ *     stat.dev_major   -> integer
  *
  *  Returns the major part of <code>File_Stat#dev</code> or
  *  <code>nil</code>.
@@ -500,7 +635,7 @@ static VALUE
 rb_stat_dev_major(VALUE self)
 {
 #if defined(major)
-    return INT2NUM(major(get_stat(self)->st_dev));
+    return UINT2NUM(major(get_stat(self)->st_dev));
 #else
     return Qnil;
 #endif
@@ -508,7 +643,7 @@ rb_stat_dev_major(VALUE self)
 
 /*
  *  call-seq:
- *     stat.dev_minor   -> fixnum
+ *     stat.dev_minor   -> integer
  *
  *  Returns the minor part of <code>File_Stat#dev</code> or
  *  <code>nil</code>.
@@ -521,7 +656,7 @@ static VALUE
 rb_stat_dev_minor(VALUE self)
 {
 #if defined(minor)
-    return INT2NUM(minor(get_stat(self)->st_dev));
+    return UINT2NUM(minor(get_stat(self)->st_dev));
 #else
     return Qnil;
 #endif
@@ -529,7 +664,7 @@ rb_stat_dev_minor(VALUE self)
 
 /*
  *  call-seq:
- *     stat.ino   -> fixnum
+ *     stat.ino   -> integer
  *
  *  Returns the inode number for <i>stat</i>.
  *
@@ -540,17 +675,12 @@ rb_stat_dev_minor(VALUE self)
 static VALUE
 rb_stat_ino(VALUE self)
 {
-#ifdef _WIN32
-    struct stat *st = get_stat(self);
-    unsigned short *p2 = (unsigned short *)st;
-    unsigned int *p4 = (unsigned int *)st;
-    uint64_t r;
-    r = p2[2];
-    r <<= 16;
-    r |= p2[7];
-    r <<= 32;
-    r |= p4[5];
-    return ULL2NUM(r);
+#ifdef HAVE_STRUCT_STAT_ST_INOHIGH
+    /* assume INTEGER_PACK_LSWORD_FIRST and st_inohigh is just next of st_ino */
+    return rb_integer_unpack(&get_stat(self)->st_ino, 2,
+            SIZEOF_STRUCT_STAT_ST_INO, 0,
+            INTEGER_PACK_LSWORD_FIRST|INTEGER_PACK_NATIVE_BYTE_ORDER|
+            INTEGER_PACK_2COMP);
 #elif SIZEOF_STRUCT_STAT_ST_INO > SIZEOF_LONG
     return ULL2NUM(get_stat(self)->st_ino);
 #else
@@ -560,7 +690,7 @@ rb_stat_ino(VALUE self)
 
 /*
  *  call-seq:
- *     stat.mode   -> fixnum
+ *     stat.mode   -> integer
  *
  *  Returns an integer representing the permission bits of
  *  <i>stat</i>. The meaning of the bits is platform dependent; on
@@ -579,7 +709,7 @@ rb_stat_mode(VALUE self)
 
 /*
  *  call-seq:
- *     stat.nlink   -> fixnum
+ *     stat.nlink   -> integer
  *
  *  Returns the number of hard links to <i>stat</i>.
  *
@@ -592,12 +722,26 @@ rb_stat_mode(VALUE self)
 static VALUE
 rb_stat_nlink(VALUE self)
 {
-    return UINT2NUM(get_stat(self)->st_nlink);
+    /* struct stat::st_nlink is nlink_t in POSIX.  Not the case for Windows. */
+    const struct stat *ptr = get_stat(self);
+
+    if (sizeof(ptr->st_nlink) <= sizeof(int)) {
+        return UINT2NUM((unsigned)ptr->st_nlink);
+    }
+    else if (sizeof(ptr->st_nlink) == sizeof(long)) {
+        return ULONG2NUM((unsigned long)ptr->st_nlink);
+    }
+    else if (sizeof(ptr->st_nlink) == sizeof(LONG_LONG)) {
+        return ULL2NUM((unsigned LONG_LONG)ptr->st_nlink);
+    }
+    else {
+        rb_bug(":FIXME: don't know what to do");
+    }
 }
 
 /*
  *  call-seq:
- *     stat.uid    -> fixnum
+ *     stat.uid    -> integer
  *
  *  Returns the numeric user id of the owner of <i>stat</i>.
  *
@@ -613,7 +757,7 @@ rb_stat_uid(VALUE self)
 
 /*
  *  call-seq:
- *     stat.gid   -> fixnum
+ *     stat.gid   -> integer
  *
  *  Returns the numeric group id of the owner of <i>stat</i>.
  *
@@ -629,7 +773,7 @@ rb_stat_gid(VALUE self)
 
 /*
  *  call-seq:
- *     stat.rdev   ->  fixnum or nil
+ *     stat.rdev   ->  integer or nil
  *
  *  Returns an integer representing the device type on which
  *  <i>stat</i> resides. Returns <code>nil</code> if the operating
@@ -651,7 +795,7 @@ rb_stat_rdev(VALUE self)
 
 /*
  *  call-seq:
- *     stat.rdev_major   -> fixnum
+ *     stat.rdev_major   -> integer
  *
  *  Returns the major part of <code>File_Stat#rdev</code> or
  *  <code>nil</code>.
@@ -664,7 +808,7 @@ static VALUE
 rb_stat_rdev_major(VALUE self)
 {
 #if defined(HAVE_STRUCT_STAT_ST_RDEV) && defined(major)
-    return DEVT2NUM(major(get_stat(self)->st_rdev));
+    return UINT2NUM(major(get_stat(self)->st_rdev));
 #else
     return Qnil;
 #endif
@@ -672,7 +816,7 @@ rb_stat_rdev_major(VALUE self)
 
 /*
  *  call-seq:
- *     stat.rdev_minor   -> fixnum
+ *     stat.rdev_minor   -> integer
  *
  *  Returns the minor part of <code>File_Stat#rdev</code> or
  *  <code>nil</code>.
@@ -685,7 +829,7 @@ static VALUE
 rb_stat_rdev_minor(VALUE self)
 {
 #if defined(HAVE_STRUCT_STAT_ST_RDEV) && defined(minor)
-    return DEVT2NUM(minor(get_stat(self)->st_rdev));
+    return UINT2NUM(minor(get_stat(self)->st_rdev));
 #else
     return Qnil;
 #endif
@@ -693,7 +837,7 @@ rb_stat_rdev_minor(VALUE self)
 
 /*
  *  call-seq:
- *     stat.size    -> fixnum
+ *     stat.size    -> integer
  *
  *  Returns the size of <i>stat</i> in bytes.
  *
@@ -753,7 +897,7 @@ rb_stat_blocks(VALUE self)
 }
 
 static struct timespec
-stat_atimespec(struct stat *st)
+stat_atimespec(const struct stat *st)
 {
     struct timespec ts;
     ts.tv_sec = st->st_atime;
@@ -770,14 +914,14 @@ stat_atimespec(struct stat *st)
 }
 
 static VALUE
-stat_atime(struct stat *st)
+stat_atime(const 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)
+stat_mtimespec(const struct stat *st)
 {
     struct timespec ts;
     ts.tv_sec = st->st_mtime;
@@ -794,14 +938,14 @@ stat_mtimespec(struct stat *st)
 }
 
 static VALUE
-stat_mtime(struct stat *st)
+stat_mtime(const 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)
+stat_ctimespec(const struct stat *st)
 {
     struct timespec ts;
     ts.tv_sec = st->st_ctime;
@@ -818,7 +962,7 @@ stat_ctimespec(struct stat *st)
 }
 
 static VALUE
-stat_ctime(struct stat *st)
+stat_ctime(const struct stat *st)
 {
     struct timespec ts = stat_ctimespec(st);
     return rb_time_nano_new(ts.tv_sec, ts.tv_nsec);
@@ -826,13 +970,15 @@ stat_ctime(struct stat *st)
 
 #define HAVE_STAT_BIRTHTIME
 #if defined(HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC)
+typedef struct stat statx_data;
 static VALUE
-stat_birthtime(struct stat *st)
+stat_birthtime(const struct stat *st)
 {
-    struct timespec *ts = &st->st_birthtimespec;
+    const struct timespec *ts = &st->st_birthtimespec;
     return rb_time_nano_new(ts->tv_sec, ts->tv_nsec);
 }
 #elif defined(_WIN32)
+typedef struct stat statx_data;
 # define stat_birthtime stat_ctime
 #else
 # undef HAVE_STAT_BIRTHTIME
@@ -843,7 +989,7 @@ stat_birthtime(struct stat *st)
  *     stat.atime   -> time
  *
  *  Returns the last access time for this file as an object of class
- *  <code>Time</code>.
+ *  Time.
  *
  *     File.stat("testfile").atime   #=> Wed Dec 31 18:00:00 CST 1969
  *
@@ -995,95 +1141,202 @@ rb_stat_inspect(VALUE self)
 	}
     }
     rb_str_buf_cat2(str, ">");
-    OBJ_INFECT(str, self);
 
     return str;
 }
 
+typedef struct no_gvl_stat_data {
+    struct stat *st;
+    union {
+	const char *path;
+	int fd;
+    } file;
+} no_gvl_stat_data;
+
+static VALUE
+no_gvl_fstat(void *data)
+{
+    no_gvl_stat_data *arg = data;
+    return (VALUE)fstat(arg->file.fd, arg->st);
+}
+
 static int
-rb_stat(VALUE file, struct stat *st)
+fstat_without_gvl(int fd, struct stat *st)
 {
-    VALUE tmp;
+    no_gvl_stat_data data;
 
-    tmp = rb_check_convert_type(file, T_FILE, "IO", "to_io");
-    if (!NIL_P(tmp)) {
-	rb_io_t *fptr;
+    data.file.fd = fd;
+    data.st = st;
 
-	GetOpenFile(tmp, fptr);
-	return fstat(fptr->fd, st);
-    }
-    FilePathValue(file);
-    file = rb_str_encode_ospath(file);
-    return STAT(StringValueCStr(file), st);
+    return (int)(VALUE)rb_thread_io_blocking_region(no_gvl_fstat, &data, fd);
 }
 
-#ifdef _WIN32
-static HANDLE
-w32_io_info(VALUE *file, BY_HANDLE_FILE_INFORMATION *st)
+static void *
+no_gvl_stat(void * data)
+{
+    no_gvl_stat_data *arg = data;
+    return (void *)(VALUE)STAT(arg->file.path, arg->st);
+}
+
+static int
+stat_without_gvl(const char *path, struct stat *st)
+{
+    no_gvl_stat_data data;
+
+    data.file.path = path;
+    data.st = st;
+
+    return (int)(VALUE)rb_thread_call_without_gvl(no_gvl_stat, &data,
+						  RUBY_UBF_IO, NULL);
+}
+
+#if !defined(HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC) && \
+    defined(HAVE_STRUCT_STATX_STX_BTIME)
+
+# ifndef HAVE_STATX
+#   ifdef HAVE_SYSCALL_H
+#     include <syscall.h>
+#   elif defined HAVE_SYS_SYSCALL_H
+#     include <sys/syscall.h>
+#   endif
+#   if defined __linux__
+#     include <linux/stat.h>
+static inline int
+statx(int dirfd, const char *pathname, int flags,
+      unsigned int mask, struct statx *statxbuf)
+{
+    return (int)syscall(__NR_statx, dirfd, pathname, flags, mask, statxbuf);
+}
+#   endif
+# endif
+
+typedef struct no_gvl_statx_data {
+    struct statx *stx;
+    int fd;
+    const char *path;
+    int flags;
+    unsigned int mask;
+} no_gvl_statx_data;
+
+static VALUE
+io_blocking_statx(void *data)
+{
+    no_gvl_statx_data *arg = data;
+    return (VALUE)statx(arg->fd, arg->path, arg->flags, arg->mask, arg->stx);
+}
+
+static void *
+no_gvl_statx(void *data)
+{
+    return (void *)io_blocking_statx(data);
+}
+
+static int
+statx_without_gvl(const char *path, struct statx *stx, unsigned int mask)
+{
+    no_gvl_statx_data data = {stx, AT_FDCWD, path, 0, mask};
+
+    /* call statx(2) with pathname */
+    return (int)(VALUE)rb_thread_call_without_gvl(no_gvl_statx, &data,
+                                                  RUBY_UBF_IO, NULL);
+}
+
+static int
+fstatx_without_gvl(int fd, struct statx *stx, unsigned int mask)
+{
+    no_gvl_statx_data data = {stx, fd, "", AT_EMPTY_PATH, mask};
+
+    /* call statx(2) with fd */
+    return (int)rb_thread_io_blocking_region(io_blocking_statx, &data, fd);
+}
+
+static int
+rb_statx(VALUE file, struct statx *stx, unsigned int mask)
 {
     VALUE tmp;
-    HANDLE f, ret = 0;
+    int result;
 
-    tmp = rb_check_convert_type(*file, T_FILE, "IO", "to_io");
+    tmp = rb_check_convert_type_with_id(file, T_FILE, "IO", idTo_io);
     if (!NIL_P(tmp)) {
-	rb_io_t *fptr;
-
-	GetOpenFile(tmp, fptr);
-	f = (HANDLE)rb_w32_get_osfhandle(fptr->fd);
-	if (f == (HANDLE)-1) return INVALID_HANDLE_VALUE;
+        rb_io_t *fptr;
+        GetOpenFile(tmp, fptr);
+        result = fstatx_without_gvl(fptr->fd, stx, mask);
+        file = tmp;
     }
     else {
-	VALUE tmp;
-	WCHAR *ptr;
-	int len;
-	VALUE v;
-
-	FilePathValue(*file);
-	tmp = rb_str_encode_ospath(*file);
-	len = MultiByteToWideChar(CP_UTF8, 0, RSTRING_PTR(tmp), -1, NULL, 0);
-	ptr = ALLOCV_N(WCHAR, v, len);
-	MultiByteToWideChar(CP_UTF8, 0, RSTRING_PTR(tmp), -1, ptr, len);
-	f = CreateFileW(ptr, 0,
-			FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING,
-			FILE_FLAG_BACKUP_SEMANTICS, NULL);
-	ALLOCV_END(v);
-	if (f == INVALID_HANDLE_VALUE) return f;
-	ret = f;
-    }
-    if (GetFileType(f) == FILE_TYPE_DISK) {
-	ZeroMemory(st, sizeof(*st));
-	if (GetFileInformationByHandle(f, st)) return ret;
+        FilePathValue(file);
+        file = rb_str_encode_ospath(file);
+        result = statx_without_gvl(RSTRING_PTR(file), stx, mask);
     }
-    if (ret) CloseHandle(ret);
-    return INVALID_HANDLE_VALUE;
+    RB_GC_GUARD(file);
+    return result;
 }
 
-static VALUE
-close_handle(VALUE h)
+# define statx_has_birthtime(st) ((st)->stx_mask & STATX_BTIME)
+
+NORETURN(static void statx_notimplement(const char *field_name));
+
+/* rb_notimplement() shows "function is unimplemented on this machine".
+   It is not applicable to statx which behavior depends on the filesystem. */
+static void
+statx_notimplement(const char *field_name)
 {
-    CloseHandle((HANDLE)h);
-    return Qfalse;
+    rb_raise(rb_eNotImpError,
+             "%s is unimplemented on this filesystem",
+             field_name);
 }
 
-struct w32_io_info_args {
-    VALUE *fname;
-    BY_HANDLE_FILE_INFORMATION *st;
-};
-
 static VALUE
-call_w32_io_info(VALUE arg)
+statx_birthtime(const struct statx *stx, VALUE fname)
 {
-    struct w32_io_info_args *p = (void *)arg;
-    return (VALUE)w32_io_info(p->fname, p->st);
+    if (!statx_has_birthtime(stx)) {
+        /* birthtime is not supported on the filesystem */
+        statx_notimplement("birthtime");
+    }
+    return rb_time_nano_new((time_t)stx->stx_btime.tv_sec, stx->stx_btime.tv_nsec);
 }
+
+typedef struct statx statx_data;
+# define HAVE_STAT_BIRTHTIME
+
+#elif defined(HAVE_STAT_BIRTHTIME)
+# define statx_without_gvl(path, st, mask) stat_without_gvl(path, st)
+# define fstatx_without_gvl(fd, st, mask) fstat_without_gvl(fd, st)
+# define statx_birthtime(st, fname) stat_birthtime(st)
+# define statx_has_birthtime(st) 1
+# define rb_statx(file, st, mask) rb_stat(file, st)
+#else
+# define statx_has_birthtime(st) 0
 #endif
 
+static int
+rb_stat(VALUE file, struct stat *st)
+{
+    VALUE tmp;
+    int result;
+
+    tmp = rb_check_convert_type_with_id(file, T_FILE, "IO", idTo_io);
+    if (!NIL_P(tmp)) {
+	rb_io_t *fptr;
+
+	GetOpenFile(tmp, fptr);
+	result = fstat_without_gvl(fptr->fd, st);
+	file = tmp;
+    }
+    else {
+	FilePathValue(file);
+	file = rb_str_encode_ospath(file);
+	result = stat_without_gvl(RSTRING_PTR(file), st);
+    }
+    RB_GC_GUARD(file);
+    return result;
+}
+
 /*
  *  call-seq:
  *     File.stat(file_name)   ->  stat
  *
- *  Returns a <code>File::Stat</code> object for the named file (see
- *  <code>File::Stat</code>).
+ *  Returns a File::Stat object for the named file (see File::Stat).
  *
  *     File.stat("testfile").mtime   #=> Tue Apr 08 12:58:04 CDT 2003
  *
@@ -1095,7 +1348,8 @@ rb_file_s_stat(VALUE klass, VALUE fname)
     struct stat st;
 
     FilePathValue(fname);
-    if (rb_stat(fname, &st) < 0) {
+    fname = rb_str_encode_ospath(fname);
+    if (stat_without_gvl(RSTRING_PTR(fname), &st) < 0) {
 	rb_sys_fail_path(fname);
     }
     return rb_stat_new(&st);
@@ -1106,7 +1360,7 @@ rb_file_s_stat(VALUE klass, VALUE fname)
  *     ios.stat    -> stat
  *
  *  Returns status information for <em>ios</em> as an object of type
- *  <code>File::Stat</code>.
+ *  File::Stat.
  *
  *     f = File.new("testfile")
  *     s = f.stat
@@ -1129,12 +1383,33 @@ rb_io_stat(VALUE obj)
     return rb_stat_new(&st);
 }
 
+#ifdef HAVE_LSTAT
+static void *
+no_gvl_lstat(void *ptr)
+{
+    no_gvl_stat_data *arg = ptr;
+    return (void *)(VALUE)lstat(arg->file.path, arg->st);
+}
+
+static int
+lstat_without_gvl(const char *path, struct stat *st)
+{
+    no_gvl_stat_data data;
+
+    data.file.path = path;
+    data.st = st;
+
+    return (int)(VALUE)rb_thread_call_without_gvl(no_gvl_lstat, &data,
+						    RUBY_UBF_IO, NULL);
+}
+#endif /* HAVE_LSTAT */
+
 /*
  *  call-seq:
  *     File.lstat(file_name)   -> stat
  *
- *  Same as <code>File::stat</code>, but does not follow the last symbolic
- *  link. Instead, reports on the link itself.
+ *  Same as File::stat, but does not follow the last symbolic link.
+ *  Instead, reports on the link itself.
  *
  *     File.symlink("testfile", "link2test")   #=> 0
  *     File.stat("testfile").size              #=> 66
@@ -1151,7 +1426,7 @@ rb_file_s_lstat(VALUE klass, VALUE fname)
 
     FilePathValue(fname);
     fname = rb_str_encode_ospath(fname);
-    if (lstat(StringValueCStr(fname), &st) == -1) {
+    if (lstat_without_gvl(StringValueCStr(fname), &st) == -1) {
 	rb_sys_fail_path(fname);
     }
     return rb_stat_new(&st);
@@ -1164,8 +1439,8 @@ rb_file_s_lstat(VALUE klass, VALUE fname)
  *  call-seq:
  *     file.lstat   ->  stat
  *
- *  Same as <code>IO#stat</code>, but does not follow the last symbolic
- *  link. Instead, reports on the link itself.
+ *  Same as IO#stat, but does not follow the last symbolic link.
+ *  Instead, reports on the link itself.
  *
  *     File.symlink("testfile", "link2test")   #=> 0
  *     File.stat("testfile").size              #=> 66
@@ -1185,7 +1460,7 @@ rb_file_lstat(VALUE obj)
     GetOpenFile(obj, fptr);
     if (NIL_P(fptr->pathv)) return Qnil;
     path = rb_str_encode_ospath(fptr->pathv);
-    if (lstat(RSTRING_PTR(path), &st) == -1) {
+    if (lstat_without_gvl(RSTRING_PTR(path), &st) == -1) {
 	rb_sys_fail_path(fptr->pathv);
     }
     return rb_stat_new(&st);
@@ -1249,15 +1524,6 @@ rb_group_member(GETGROUPS_T gid)
 #define USE_GETEUID 1
 #endif
 
-#ifdef __native_client__
-// Although the NaCl toolchain contain eaccess() is it not yet
-// overridden by nacl_io.
-// TODO(sbc): Remove this once eaccess() is wired up correctly
-// in NaCl.
-# undef HAVE_EACCESS
-# undef USE_GETEUID
-#endif
-
 #ifndef HAVE_EACCESS
 int
 eaccess(const char *path, int mode)
@@ -1302,14 +1568,62 @@ eaccess(const char *path, int mode)
 }
 #endif
 
+struct access_arg {
+    const char *path;
+    int mode;
+};
+
+static void *
+nogvl_eaccess(void *ptr)
+{
+    struct access_arg *aa = ptr;
+
+    return (void *)(VALUE)eaccess(aa->path, aa->mode);
+}
+
+static int
+rb_eaccess(VALUE fname, int mode)
+{
+    struct access_arg aa;
+
+    FilePathValue(fname);
+    fname = rb_str_encode_ospath(fname);
+    aa.path = StringValueCStr(fname);
+    aa.mode = mode;
+
+    return (int)(VALUE)rb_thread_call_without_gvl(nogvl_eaccess, &aa,
+						RUBY_UBF_IO, 0);
+}
+
+static void *
+nogvl_access(void *ptr)
+{
+    struct access_arg *aa = ptr;
+
+    return (void *)(VALUE)access(aa->path, aa->mode);
+}
+
+static int
+rb_access(VALUE fname, int mode)
+{
+    struct access_arg aa;
+
+    FilePathValue(fname);
+    fname = rb_str_encode_ospath(fname);
+    aa.path = StringValueCStr(fname);
+    aa.mode = mode;
+
+    return (int)(VALUE)rb_thread_call_without_gvl(nogvl_access, &aa,
+						RUBY_UBF_IO, 0);
+}
 
 /*
  * Document-class: FileTest
  *
- *  <code>FileTest</code> implements file test operations similar to
- *  those used in <code>File::Stat</code>. It exists as a standalone
- *  module, and its methods are also insinuated into the <code>File</code>
- *  class. (Note that this is not done by inclusion: the interpreter cheats).
+ *  FileTest implements file test operations similar to those used in
+ *  File::Stat. It exists as a standalone module, and its methods are
+ *  also insinuated into the File class. (Note that this is not done
+ *  by inclusion: the interpreter cheats).
  *
  */
 
@@ -1397,7 +1711,7 @@ rb_file_symlink_p(VALUE obj, VALUE fname)
 
     FilePathValue(fname);
     fname = rb_str_encode_ospath(fname);
-    if (lstat(StringValueCStr(fname), &st) < 0) return Qfalse;
+    if (lstat_without_gvl(StringValueCStr(fname), &st) < 0) return Qfalse;
     if (S_ISLNK(st.st_mode)) return Qtrue;
 #endif
 
@@ -1513,25 +1827,20 @@ rb_file_exist_p(VALUE obj, VALUE fname)
     return Qtrue;
 }
 
-/*
- * call-seq:
- *    File.exists?(file_name)   ->  true or false
- *
- * Deprecated method. Don't use.
- */
+/* :nodoc: */
 static VALUE
 rb_file_exists_p(VALUE obj, VALUE fname)
 {
-    const char *s = "FileTest#";
+    const char *s = "FileTest#exist?";
     if (obj == rb_mFileTest) {
-	s = "FileTest.";
+	s = "FileTest.exist?";
     }
     else if (obj == rb_cFile ||
 	     (RB_TYPE_P(obj, T_CLASS) &&
 	      RTEST(rb_class_inherited_p(obj, rb_cFile)))) {
-	s = "File.";
+	s = "File.exist?";
     }
-    rb_warning("%sexists? is a deprecated name, use %sexist? instead", s, s);
+    rb_warn_deprecated("%.*ss?", s, (int)(strlen(s)-1), s);
     return rb_file_exist_p(obj, fname);
 }
 
@@ -1541,14 +1850,15 @@ rb_file_exists_p(VALUE obj, VALUE fname)
  *
  * Returns <code>true</code> if the named file is readable by the effective
  * user and group id of this process. See eaccess(3).
+ *
+ * Note that some OS-level security features may cause this to return true
+ * even though the file is not readable by the effective user/group.
  */
 
 static VALUE
 rb_file_readable_p(VALUE obj, VALUE fname)
 {
-    FilePathValue(fname);
-    fname = rb_str_encode_ospath(fname);
-    if (eaccess(StringValueCStr(fname), R_OK) < 0) return Qfalse;
+    if (rb_eaccess(fname, R_OK) < 0) return Qfalse;
     return Qtrue;
 }
 
@@ -1558,14 +1868,15 @@ rb_file_readable_p(VALUE obj, VALUE fname)
  *
  * Returns <code>true</code> if the named file is readable by the real
  * user and group id of this process. See access(3).
+ *
+ * Note that some OS-level security features may cause this to return true
+ * even though the file is not readable by the real user/group.
  */
 
 static VALUE
 rb_file_readable_real_p(VALUE obj, VALUE fname)
 {
-    FilePathValue(fname);
-    fname = rb_str_encode_ospath(fname);
-    if (access(StringValueCStr(fname), R_OK) < 0) return Qfalse;
+    if (rb_access(fname, R_OK) < 0) return Qfalse;
     return Qtrue;
 }
 
@@ -1579,7 +1890,7 @@ rb_file_readable_real_p(VALUE obj, VALUE fname)
 
 /*
  * call-seq:
- *    File.world_readable?(file_name)   -> fixnum or nil
+ *    File.world_readable?(file_name)   -> integer 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
@@ -1613,14 +1924,15 @@ rb_file_world_readable_p(VALUE obj, VALUE fname)
  *
  * Returns <code>true</code> if the named file is writable by the effective
  * user and group id of this process. See eaccess(3).
+ *
+ * Note that some OS-level security features may cause this to return true
+ * even though the file is not writable by the effective user/group.
  */
 
 static VALUE
 rb_file_writable_p(VALUE obj, VALUE fname)
 {
-    FilePathValue(fname);
-    fname = rb_str_encode_ospath(fname);
-    if (eaccess(StringValueCStr(fname), W_OK) < 0) return Qfalse;
+    if (rb_eaccess(fname, W_OK) < 0) return Qfalse;
     return Qtrue;
 }
 
@@ -1629,21 +1941,22 @@ rb_file_writable_p(VALUE obj, VALUE fname)
  *    File.writable_real?(file_name)   -> true or false
  *
  * Returns <code>true</code> if the named file is writable by the real
- * user and group id of this process. See access(3)
+ * user and group id of this process. See access(3).
+ *
+ * Note that some OS-level security features may cause this to return true
+ * even though the file is not writable by the real user/group.
  */
 
 static VALUE
 rb_file_writable_real_p(VALUE obj, VALUE fname)
 {
-    FilePathValue(fname);
-    fname = rb_str_encode_ospath(fname);
-    if (access(StringValueCStr(fname), W_OK) < 0) return Qfalse;
+    if (rb_access(fname, W_OK) < 0) return Qfalse;
     return Qtrue;
 }
 
 /*
  * call-seq:
- *    File.world_writable?(file_name)   -> fixnum or nil
+ *    File.world_writable?(file_name)   -> integer 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
@@ -1677,14 +1990,19 @@ rb_file_world_writable_p(VALUE obj, VALUE fname)
  *
  * Returns <code>true</code> if the named file is executable by the effective
  * user and group id of this process. See eaccess(3).
+ *
+ * Windows does not support execute permissions separately from read
+ * permissions. On Windows, a file is only considered executable if it ends in
+ * .bat, .cmd, .com, or .exe.
+ *
+ * Note that some OS-level security features may cause this to return true
+ * even though the file is not executable by the effective user/group.
  */
 
 static VALUE
 rb_file_executable_p(VALUE obj, VALUE fname)
 {
-    FilePathValue(fname);
-    fname = rb_str_encode_ospath(fname);
-    if (eaccess(StringValueCStr(fname), X_OK) < 0) return Qfalse;
+    if (rb_eaccess(fname, X_OK) < 0) return Qfalse;
     return Qtrue;
 }
 
@@ -1694,14 +2012,19 @@ rb_file_executable_p(VALUE obj, VALUE fname)
  *
  * Returns <code>true</code> if the named file is executable by the real
  * user and group id of this process. See access(3).
+ *
+ * Windows does not support execute permissions separately from read
+ * permissions. On Windows, a file is only considered executable if it ends in
+ * .bat, .cmd, .com, or .exe.
+ *
+ * Note that some OS-level security features may cause this to return true
+ * even though the file is not executable by the real user/group.
  */
 
 static VALUE
 rb_file_executable_real_p(VALUE obj, VALUE fname)
 {
-    FilePathValue(fname);
-    fname = rb_str_encode_ospath(fname);
-    if (access(StringValueCStr(fname), X_OK) < 0) return Qfalse;
+    if (rb_access(fname, X_OK) < 0) return Qfalse;
     return Qtrue;
 }
 
@@ -1831,9 +2154,7 @@ check3rdbyte(VALUE fname, int mode)
 {
     struct stat st;
 
-    FilePathValue(fname);
-    fname = rb_str_encode_ospath(fname);
-    if (STAT(StringValueCStr(fname), &st) < 0) return Qfalse;
+    if (rb_stat(fname, &st) < 0) return Qfalse;
     if (st.st_mode & mode) return Qtrue;
     return Qfalse;
 }
@@ -1844,6 +2165,8 @@ check3rdbyte(VALUE fname, int mode)
  *   File.setuid?(file_name)   ->  true or false
  *
  * Returns <code>true</code> if the named file has the setuid bit set.
+ *
+ * _file_name_ can be an IO object.
  */
 
 static VALUE
@@ -1861,6 +2184,8 @@ rb_file_suid_p(VALUE obj, VALUE fname)
  *   File.setgid?(file_name)   ->  true or false
  *
  * Returns <code>true</code> if the named file has the setgid bit set.
+ *
+ * _file_name_ can be an IO object.
  */
 
 static VALUE
@@ -1878,6 +2203,8 @@ rb_file_sgid_p(VALUE obj, VALUE fname)
  *   File.sticky?(file_name)   ->  true or false
  *
  * Returns <code>true</code> if the named file has the sticky bit set.
+ *
+ * _file_name_ can be an IO object.
  */
 
 static VALUE
@@ -1886,7 +2213,7 @@ rb_file_sticky_p(VALUE obj, VALUE fname)
 #ifdef S_ISVTX
     return check3rdbyte(fname, S_ISVTX);
 #else
-    return Qnil;
+    return Qfalse;
 #endif
 }
 
@@ -1921,28 +2248,8 @@ rb_file_identical_p(VALUE obj, VALUE fname1, VALUE fname2)
     if (st1.st_ino != st2.st_ino) return Qfalse;
     return Qtrue;
 #else
-    BY_HANDLE_FILE_INFORMATION st1, st2;
-    HANDLE f1 = 0, f2 = 0;
-
-    f1 = w32_io_info(&fname1, &st1);
-    if (f1 == INVALID_HANDLE_VALUE) return Qfalse;
-    if (f1) {
-	struct w32_io_info_args arg;
-	arg.fname = &fname2;
-	arg.st = &st2;
-	f2 = (HANDLE)rb_ensure(call_w32_io_info, (VALUE)&arg, close_handle, (VALUE)f1);
-    }
-    else {
-	f2 = w32_io_info(&fname2, &st2);
-    }
-    if (f2 == INVALID_HANDLE_VALUE) return Qfalse;
-    if (f2) CloseHandle(f2);
-
-    if (st1.dwVolumeSerialNumber == st2.dwVolumeSerialNumber &&
-	st1.nFileIndexHigh == st2.nFileIndexHigh &&
-	st1.nFileIndexLow == st2.nFileIndexLow)
-	return Qtrue;
-    return Qfalse;
+    extern VALUE rb_w32_file_identical_p(VALUE, VALUE);
+    return rb_w32_file_identical_p(fname1, fname2);
 #endif
 }
 
@@ -2031,7 +2338,7 @@ rb_file_s_ftype(VALUE klass, VALUE fname)
 
     FilePathValue(fname);
     fname = rb_str_encode_ospath(fname);
-    if (lstat(StringValueCStr(fname), &st) == -1) {
+    if (lstat_without_gvl(StringValueCStr(fname), &st) == -1) {
 	rb_sys_fail_path(fname);
     }
 
@@ -2042,7 +2349,7 @@ rb_file_s_ftype(VALUE klass, VALUE fname)
  *  call-seq:
  *     File.atime(file_name)  ->  time
  *
- *  Returns the last access time for the named file as a Time object).
+ *  Returns the last access time for the named file as a Time object.
  *
  *  _file_name_ can be an IO object.
  *
@@ -2067,8 +2374,8 @@ rb_file_s_atime(VALUE klass, VALUE fname)
  *  call-seq:
  *     file.atime    -> time
  *
- *  Returns the last access time (a <code>Time</code> object)
- *   for <i>file</i>, or epoch if <i>file</i> has not been accessed.
+ *  Returns the last access time (a Time object) for <i>file</i>, or
+ *  epoch if <i>file</i> has not been accessed.
  *
  *     File.new("testfile").atime   #=> Wed Dec 31 18:00:00 CST 1969
  *
@@ -2190,7 +2497,6 @@ rb_file_ctime(VALUE obj)
     return stat_ctime(&st);
 }
 
-#if defined(HAVE_STAT_BIRTHTIME)
 /*
  *  call-seq:
  *     File.birthtime(file_name)  -> time
@@ -2205,17 +2511,18 @@ rb_file_ctime(VALUE obj)
  *
  */
 
-static VALUE
+#if defined(HAVE_STAT_BIRTHTIME)
+RUBY_FUNC_EXPORTED VALUE
 rb_file_s_birthtime(VALUE klass, VALUE fname)
 {
-    struct stat st;
+    statx_data st;
 
-    if (rb_stat(fname, &st) < 0) {
+    if (rb_statx(fname, &st, STATX_BTIME) < 0) {
 	int e = errno;
 	FilePathValue(fname);
 	rb_syserr_fail_path(e, fname);
     }
-    return stat_birthtime(&st);
+    return statx_birthtime(&st, fname);
 }
 #else
 # define rb_file_s_birthtime rb_f_notimplement
@@ -2238,13 +2545,13 @@ static VALUE
 rb_file_birthtime(VALUE obj)
 {
     rb_io_t *fptr;
-    struct stat st;
+    statx_data st;
 
     GetOpenFile(obj, fptr);
-    if (fstat(fptr->fd, &st) == -1) {
+    if (fstatx_without_gvl(fptr->fd, &st, STATX_BTIME) == -1) {
 	rb_sys_fail_path(fptr->pathv);
     }
-    return stat_birthtime(&st);
+    return statx_birthtime(&st, fptr->pathv);
 }
 #else
 # define rb_file_birthtime rb_f_notimplement
@@ -2276,11 +2583,10 @@ rb_file_size(VALUE obj)
     return OFFT2NUM(st.st_size);
 }
 
-static void
-chmod_internal(const char *path, VALUE pathv, void *mode)
+static int
+chmod_internal(const char *path, void *mode)
 {
-    if (chmod(path, *(int *)mode) < 0)
-	rb_sys_fail_path(pathv);
+    return chmod(path, *(mode_t *)mode);
 }
 
 /*
@@ -2297,12 +2603,12 @@ chmod_internal(const char *path, VALUE pathv, void *mode)
  */
 
 static VALUE
-rb_file_s_chmod(int argc, VALUE *argv)
+rb_file_s_chmod(int argc, VALUE *argv, VALUE _)
 {
-    int mode;
+    mode_t mode;
 
     apply2args(1);
-    mode = NUM2INT(*argv++);
+    mode = NUM2MODET(*argv++);
 
     return apply2files(chmod_internal, argc, argv, &mode);
 }
@@ -2314,7 +2620,7 @@ rb_file_s_chmod(int argc, VALUE *argv)
  *  Changes permission bits on <i>file</i> to the bit pattern
  *  represented by <i>mode_int</i>. Actual effects are platform
  *  dependent; on Unix systems, see <code>chmod(2)</code> for details.
- *  Follows symbolic links. Also see <code>File#lchmod</code>.
+ *  Follows symbolic links. Also see File#lchmod.
  *
  *     f = File.new("out", "w");
  *     f.chmod(0644)   #=> 0
@@ -2324,12 +2630,12 @@ static VALUE
 rb_file_chmod(VALUE obj, VALUE vmode)
 {
     rb_io_t *fptr;
-    int mode;
+    mode_t mode;
 #if !defined HAVE_FCHMOD || !HAVE_FCHMOD
     VALUE path;
 #endif
 
-    mode = NUM2INT(vmode);
+    mode = NUM2MODET(vmode);
 
     GetOpenFile(obj, fptr);
 #ifdef HAVE_FCHMOD
@@ -2352,32 +2658,31 @@ rb_file_chmod(VALUE obj, VALUE vmode)
 }
 
 #if defined(HAVE_LCHMOD)
-static void
-lchmod_internal(const char *path, VALUE pathv, void *mode)
+static int
+lchmod_internal(const char *path, void *mode)
 {
-    if (lchmod(path, (int)(VALUE)mode) < 0)
-	rb_sys_fail_path(pathv);
+    return lchmod(path, *(mode_t *)mode);
 }
 
 /*
  *  call-seq:
  *     File.lchmod(mode_int, file_name, ...)  -> integer
  *
- *  Equivalent to <code>File::chmod</code>, but does not follow symbolic
- *  links (so it will change the permissions associated with the link,
- *  not the file referenced by the link). Often not available.
+ *  Equivalent to File::chmod, but does not follow symbolic links (so
+ *  it will change the permissions associated with the link, not the
+ *  file referenced by the link). Often not available.
  *
  */
 
 static VALUE
-rb_file_s_lchmod(int argc, VALUE *argv)
+rb_file_s_lchmod(int argc, VALUE *argv, VALUE _)
 {
-    long mode;
+    mode_t mode;
 
     apply2args(1);
-    mode = NUM2INT(*argv++);
+    mode = NUM2MODET(*argv++);
 
-    return apply2files(lchmod_internal, argc, argv, (void *)(long)mode);
+    return apply2files(lchmod_internal, argc, argv, &mode);
 }
 #else
 #define rb_file_s_lchmod rb_f_notimplement
@@ -2406,17 +2711,16 @@ struct chown_args {
     rb_gid_t group;
 };
 
-static void
-chown_internal(const char *path, VALUE pathv, void *arg)
+static int
+chown_internal(const char *path, void *arg)
 {
     struct chown_args *args = arg;
-    if (chown(path, args->owner, args->group) < 0)
-	rb_sys_fail_path(pathv);
+    return chown(path, args->owner, args->group);
 }
 
 /*
  *  call-seq:
- *     File.chown(owner_int, group_int, file_name,... )  ->  integer
+ *     File.chown(owner_int, group_int, file_name, ...)  ->  integer
  *
  *  Changes the owner and group of the named file(s) to the given
  *  numeric owner and group id's. Only a process with superuser
@@ -2430,7 +2734,7 @@ chown_internal(const char *path, VALUE pathv, void *arg)
  */
 
 static VALUE
-rb_file_s_chown(int argc, VALUE *argv)
+rb_file_s_chown(int argc, VALUE *argv, VALUE _)
 {
     struct chown_args arg;
 
@@ -2450,7 +2754,7 @@ rb_file_s_chown(int argc, VALUE *argv)
  *  change the owner of a file. The current owner of a file may change
  *  the file's group to any group to which the owner belongs. A
  *  <code>nil</code> or -1 owner or group id is ignored. Follows
- *  symbolic links. See also <code>File#lchown</code>.
+ *  symbolic links. See also File#lchown.
  *
  *     File.new("testfile").chown(502, 1000)
  *
@@ -2483,19 +2787,18 @@ rb_file_chown(VALUE obj, VALUE owner, VALUE group)
 }
 
 #if defined(HAVE_LCHOWN)
-static void
-lchown_internal(const char *path, VALUE pathv, void *arg)
+static int
+lchown_internal(const char *path, void *arg)
 {
     struct chown_args *args = arg;
-    if (lchown(path, args->owner, args->group) < 0)
-	rb_sys_fail_path(pathv);
+    return lchown(path, args->owner, args->group);
 }
 
 /*
  *  call-seq:
  *     File.lchown(owner_int, group_int, file_name,..) -> integer
  *
- *  Equivalent to <code>File::chown</code>, but does not follow symbolic
+ *  Equivalent to File::chown, but does not follow symbolic
  *  links (so it will change the owner associated with the link, not the
  *  file referenced by the link). Often not available. Returns number
  *  of files in the argument list.
@@ -2503,7 +2806,7 @@ lchown_internal(const char *path, VALUE pathv, void *arg)
  */
 
 static VALUE
-rb_file_s_lchown(int argc, VALUE *argv)
+rb_file_s_lchown(int argc, VALUE *argv, VALUE _)
 {
     struct chown_args arg;
 
@@ -2520,18 +2823,25 @@ rb_file_s_lchown(int argc, VALUE *argv)
 struct utime_args {
     const struct timespec* tsp;
     VALUE atime, mtime;
+    int follow; /* Whether to act on symlinks (1) or their referent (0) */
 };
 
-#if defined DOSISH || defined __CYGWIN__
-NORETURN(static void utime_failed(VALUE, const struct timespec *, VALUE, VALUE));
+#ifdef UTIME_EINVAL
+NORETURN(static void utime_failed(struct apply_arg *));
 
 static void
-utime_failed(VALUE path, const struct timespec *tsp, VALUE atime, VALUE mtime)
+utime_failed(struct apply_arg *aa)
 {
-    int e = errno;
-    if (tsp && e == EINVAL) {
+    int e = aa->errnum;
+    VALUE path = aa->fn[aa->i].path;
+    struct utime_args *ua = aa->arg;
+
+    if (ua->tsp && e == EINVAL) {
 	VALUE e[2], a = Qnil, m = Qnil;
 	int d = 0;
+	VALUE atime = ua->atime;
+	VALUE mtime = ua->mtime;
+
 	if (!NIL_P(atime)) {
 	    a = rb_inspect(atime);
 	}
@@ -2556,14 +2866,12 @@ utime_failed(VALUE path, const struct timespec *tsp, VALUE atime, VALUE mtime)
     }
     rb_syserr_fail_path(e, path);
 }
-#else
-#define utime_failed(path, tsp, atime, mtime) rb_sys_fail_path(path)
 #endif
 
 #if defined(HAVE_UTIMES)
 
-static void
-utime_internal(const char *path, VALUE pathv, void *arg)
+static int
+utime_internal(const char *path, void *arg)
 {
     struct utime_args *v = arg;
     const struct timespec *tsp = v->tsp;
@@ -2571,16 +2879,32 @@ utime_internal(const char *path, VALUE pathv, void *arg)
 
 #if defined(HAVE_UTIMENSAT)
     static int try_utimensat = 1;
+# ifdef AT_SYMLINK_NOFOLLOW
+    static int try_utimensat_follow = 1;
+# else
+    const int try_utimensat_follow = 0;
+# endif
+    int flags = 0;
+
+    if (v->follow ? try_utimensat_follow : try_utimensat) {
+# ifdef AT_SYMLINK_NOFOLLOW
+	if (v->follow) {
+	    flags = AT_SYMLINK_NOFOLLOW;
+	}
+# endif
 
-    if (try_utimensat) {
-        if (utimensat(AT_FDCWD, path, tsp, 0) < 0) {
+	if (utimensat(AT_FDCWD, path, tsp, flags) < 0) {
             if (errno == ENOSYS) {
-                try_utimensat = 0;
+# ifdef AT_SYMLINK_NOFOLLOW
+		try_utimensat_follow = 0;
+# endif
+		if (!v->follow)
+		    try_utimensat = 0;
                 goto no_utimensat;
             }
-            utime_failed(pathv, tsp, v->atime, v->mtime);
+            return -1; /* calls utime_failed */
         }
-        return;
+        return 0;
     }
 no_utimensat:
 #endif
@@ -2592,8 +2916,10 @@ no_utimensat:
         tvbuf[1].tv_usec = (int)(tsp[1].tv_nsec / 1000);
         tvp = tvbuf;
     }
-    if (utimes(path, tvp) < 0)
-	utime_failed(pathv, tsp, v->atime, v->mtime);
+#ifdef HAVE_LUTIMES
+    if (v->follow) return lutimes(path, tvp);
+#endif
+    return utimes(path, tvp);
 }
 
 #else
@@ -2605,8 +2931,8 @@ struct utimbuf {
 };
 #endif
 
-static void
-utime_internal(const char *path, VALUE pathv, void *arg)
+static int
+utime_internal(const char *path, void *arg)
 {
     struct utime_args *v = arg;
     const struct timespec *tsp = v->tsp;
@@ -2616,23 +2942,13 @@ utime_internal(const char *path, VALUE pathv, void *arg)
         utbuf.modtime = tsp[1].tv_sec;
         utp = &utbuf;
     }
-    if (utime(path, utp) < 0)
-	utime_failed(pathv, tsp, v->atime, v->mtime);
+    return utime(path, utp);
 }
 
 #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)
+utime_internal_i(int argc, VALUE *argv, int follow)
 {
     struct utime_args args;
     struct timespec tss[2], *tsp = NULL;
@@ -2641,6 +2957,8 @@ rb_file_s_utime(int argc, VALUE *argv)
     args.atime = *argv++;
     args.mtime = *argv++;
 
+    args.follow = follow;
+
     if (!NIL_P(args.atime) || !NIL_P(args.mtime)) {
 	tsp = tss;
 	tsp[0] = rb_time_timespec(args.atime);
@@ -2654,6 +2972,45 @@ rb_file_s_utime(int argc, VALUE *argv)
     return apply2files(utime_internal, argc, argv, &args);
 }
 
+/*
+ * call-seq:
+ *  File.utime(atime, mtime, file_name, ...)   ->  integer
+ *
+ * Sets the access and modification times of each named file to the
+ * first two arguments. If a file is a symlink, this method acts upon
+ * its referent rather than the link itself; for the inverse
+ * behavior see File.lutime. Returns the number of file
+ * names in the argument list.
+ */
+
+static VALUE
+rb_file_s_utime(int argc, VALUE *argv, VALUE _)
+{
+    return utime_internal_i(argc, argv, FALSE);
+}
+
+#if defined(HAVE_UTIMES) && (defined(HAVE_LUTIMES) || (defined(HAVE_UTIMENSAT) && defined(AT_SYMLINK_NOFOLLOW)))
+
+/*
+ * call-seq:
+ *  File.lutime(atime, mtime, file_name, ...)   ->  integer
+ *
+ * Sets the access and modification times of each named file to the
+ * first two arguments. If a file is a symlink, this method acts upon
+ * the link itself as opposed to its referent; for the inverse
+ * behavior, see File.utime. Returns the number of file
+ * names in the argument list.
+ */
+
+static VALUE
+rb_file_s_lutime(int argc, VALUE *argv, VALUE _)
+{
+    return utime_internal_i(argc, argv, TRUE);
+}
+#else
+#define rb_file_s_lutime rb_f_notimplement
+#endif
+
 #ifdef RUBY_FUNCTION_NAME_STRING
 # define syserr_fail2(e, s1, s2) syserr_fail2_in(RUBY_FUNCTION_NAME_STRING, e, s1, s2)
 #else
@@ -2693,7 +3050,7 @@ syserr_fail2_in(const char *func, int e, VALUE s1, VALUE s2)
  *
  *  Creates a new name for an existing file using a hard link. Will not
  *  overwrite <i>new_name</i> if it already exists (raising a subclass
- *  of <code>SystemCallError</code>). Not available on all platforms.
+ *  of SystemCallError). Not available on all platforms.
  *
  *     File.link("testfile", ".testfile")   #=> 0
  *     IO.readlines(".testfile")[0]         #=> "This is line one\n"
@@ -2722,7 +3079,7 @@ rb_file_s_link(VALUE klass, VALUE from, VALUE to)
  *     File.symlink(old_name, new_name)   -> 0
  *
  *  Creates a symbolic link called <i>new_name</i> for the existing file
- *  <i>old_name</i>. Raises a <code>NotImplemented</code> exception on
+ *  <i>old_name</i>. Raises a NotImplemented exception on
  *  platforms that do not support symbolic links.
  *
  *     File.symlink("testfile", "link2test")   #=> 0
@@ -2765,6 +3122,33 @@ rb_file_s_readlink(VALUE klass, VALUE path)
 }
 
 #ifndef _WIN32
+struct readlink_arg {
+    const char *path;
+    char *buf;
+    size_t size;
+};
+
+static void *
+nogvl_readlink(void *ptr)
+{
+    struct readlink_arg *ra = ptr;
+
+    return (void *)(VALUE)readlink(ra->path, ra->buf, ra->size);
+}
+
+static ssize_t
+readlink_without_gvl(VALUE path, VALUE buf, size_t size)
+{
+    struct readlink_arg ra;
+
+    ra.path = RSTRING_PTR(path);
+    ra.buf = RSTRING_PTR(buf);
+    ra.size = size;
+
+    return (ssize_t)rb_thread_call_without_gvl(nogvl_readlink, &ra,
+						RUBY_UBF_IO, 0);
+}
+
 VALUE
 rb_readlink(VALUE path, rb_encoding *enc)
 {
@@ -2775,7 +3159,7 @@ rb_readlink(VALUE path, rb_encoding *enc)
     FilePathValue(path);
     path = rb_str_encode_ospath(path);
     v = rb_enc_str_new(0, size, enc);
-    while ((rv = readlink(RSTRING_PTR(path), RSTRING_PTR(v), size)) == size
+    while ((rv = readlink_without_gvl(path, v, size)) == size
 #ifdef _AIX
 	    || (rv < 0 && errno == ERANGE) /* quirky behavior of GPFS */
 #endif
@@ -2798,11 +3182,10 @@ rb_readlink(VALUE path, rb_encoding *enc)
 #define rb_file_s_readlink rb_f_notimplement
 #endif
 
-static void
-unlink_internal(const char *path, VALUE pathv, void *arg)
+static int
+unlink_internal(const char *path, void *arg)
 {
-    if (unlink(path) < 0)
-	rb_sys_fail_path(pathv);
+    return unlink(path);
 }
 
 /*
@@ -2812,7 +3195,13 @@ unlink_internal(const char *path, VALUE pathv, void *arg)
  *
  *  Deletes the named files, returning the number of names
  *  passed as arguments. Raises an exception on any error.
- *  See also <code>Dir::rmdir</code>.
+ *  Since the underlying implementation relies on the
+ *  <code>unlink(2)</code> system call, the type of
+ *  exception raised depends on its error type (see
+ *  https://linux.die.net/man/2/unlink) and has the form of
+ *  e.g. Errno::ENOENT.
+ *
+ *  See also Dir::rmdir.
  */
 
 static VALUE
@@ -2821,12 +3210,25 @@ rb_file_s_unlink(int argc, VALUE *argv, VALUE klass)
     return apply2files(unlink_internal, argc, argv, 0);
 }
 
+struct rename_args {
+    const char *src;
+    const char *dst;
+};
+
+static void *
+no_gvl_rename(void *ptr)
+{
+    struct rename_args *ra = ptr;
+
+    return (void *)(VALUE)rename(ra->src, ra->dst);
+}
+
 /*
  *  call-seq:
  *     File.rename(old_name, new_name)   -> 0
  *
- *  Renames the given file to the new name. Raises a
- *  <code>SystemCallError</code> if the file cannot be renamed.
+ *  Renames the given file to the new name. Raises a SystemCallError
+ *  if the file cannot be renamed.
  *
  *     File.rename("afile", "afile.bak")   #=> 0
  */
@@ -2834,26 +3236,27 @@ rb_file_s_unlink(int argc, VALUE *argv, VALUE klass)
 static VALUE
 rb_file_s_rename(VALUE klass, VALUE from, VALUE to)
 {
-    const char *src, *dst;
+    struct rename_args ra;
     VALUE f, t;
 
     FilePathValue(from);
     FilePathValue(to);
     f = rb_str_encode_ospath(from);
     t = rb_str_encode_ospath(to);
-    src = StringValueCStr(f);
-    dst = StringValueCStr(t);
+    ra.src = StringValueCStr(f);
+    ra.dst = StringValueCStr(t);
 #if defined __CYGWIN__
     errno = 0;
 #endif
-    if (rename(src, dst) < 0) {
+    if ((int)(VALUE)rb_thread_call_without_gvl(no_gvl_rename, &ra,
+					 RUBY_UBF_IO, 0) < 0) {
 	int e = errno;
 #if defined DOSISH
 	switch (e) {
 	  case EEXIST:
-	    if (chmod(dst, 0666) == 0 &&
-		unlink(dst) == 0 &&
-		rename(src, dst) == 0)
+	    if (chmod(ra.dst, 0666) == 0 &&
+		unlink(ra.dst) == 0 &&
+		rename(ra.src, ra.dst) == 0)
 		return INT2FIX(0);
 	}
 #endif
@@ -2879,21 +3282,22 @@ rb_file_s_rename(VALUE klass, VALUE from, VALUE to)
  */
 
 static VALUE
-rb_file_s_umask(int argc, VALUE *argv)
+rb_file_s_umask(int argc, VALUE *argv, VALUE _)
 {
-    int omask = 0;
+    mode_t omask = 0;
 
-    if (argc == 0) {
+    switch (argc) {
+      case 0:
 	omask = umask(0);
 	umask(omask);
+        break;
+      case 1:
+	omask = umask(NUM2MODET(argv[0]));
+        break;
+      default:
+        rb_error_arity(argc, 0, 1);
     }
-    else if (argc == 1) {
-	omask = umask(NUM2INT(argv[0]));
-    }
-    else {
-	rb_check_arity(argc, 0, 1);
-    }
-    return INT2FIX(omask);
+    return MODET2NUM(omask);
 }
 
 #ifdef __CYGWIN__
@@ -2906,24 +3310,38 @@ rb_file_s_umask(int argc, VALUE *argv)
 #endif
 #ifdef FILE_ALT_SEPARATOR
 #define isdirsep(x) ((x) == '/' || (x) == FILE_ALT_SEPARATOR)
+# ifdef DOSISH
 static const char file_alt_separator[] = {FILE_ALT_SEPARATOR, '\0'};
+# endif
 #else
 #define isdirsep(x) ((x) == '/')
 #endif
 
 #ifndef USE_NTFS
-#if defined _WIN32 || defined __CYGWIN__
+#if defined _WIN32
 #define USE_NTFS 1
 #else
 #define USE_NTFS 0
 #endif
 #endif
+#ifndef USE_NTFS_ADS
+# if USE_NTFS
+#   define USE_NTFS_ADS 1
+# else
+#   define USE_NTFS_ADS 0
+# endif
+#endif
 
 #if USE_NTFS
 #define istrailinggarbage(x) ((x) == '.' || (x) == ' ')
 #else
 #define istrailinggarbage(x) 0
 #endif
+#if USE_NTFS_ADS
+# define isADS(x) ((x) == ':')
+#else
+# define isADS(x) 0
+#endif
 
 #define Next(p, e, enc) ((p) + rb_enc_mbclen((p), (e), (enc)))
 #define Inc(p, e, enc) ((p) = Next((p), (e), (enc)))
@@ -2961,9 +3379,9 @@ getcwdofdrv(int drv)
        of a particular drive is to change chdir() to that drive,
        so save the old cwd before chdir()
     */
-    oldcwd = my_getcwd();
+    oldcwd = ruby_getcwd();
     if (chdir(drive) == 0) {
-	drvcwd = my_getcwd();
+	drvcwd = ruby_getcwd();
 	chdir(oldcwd);
 	xfree(oldcwd);
     }
@@ -3094,17 +3512,17 @@ static char *
 ntfs_tail(const char *path, const char *end, rb_encoding *enc)
 {
     while (path < end && *path == '.') path++;
-    while (path < end && *path != ':') {
+    while (path < end && !isADS(*path)) {
 	if (istrailinggarbage(*path)) {
 	    const char *last = path++;
 	    while (path < end && istrailinggarbage(*path)) path++;
-	    if (path >= end || *path == ':') return (char *)last;
+	    if (path >= end || isADS(*path)) return (char *)last;
 	}
 	else if (isdirsep(*path)) {
 	    const char *last = path++;
 	    while (path < end && isdirsep(*path)) path++;
 	    if (path >= end) return (char *)last;
-	    if (*path == ':') path++;
+	    if (isADS(*path)) path++;
 	}
 	else {
 	    Inc(path, end, enc);
@@ -3181,13 +3599,27 @@ copy_home_path(VALUE result, const char *dir)
 VALUE
 rb_home_dir_of(VALUE user, VALUE result)
 {
-    const char *dir, *username = RSTRING_PTR(user);
 #ifdef HAVE_PWD_H
-    struct passwd *pwPtr = getpwnam(username);
+    struct passwd *pwPtr;
 #else
     extern char *getlogin(void);
     const char *pwPtr = 0;
     # define endpwent() ((void)0)
+#endif
+    const char *dir, *username = RSTRING_PTR(user);
+    rb_encoding *enc = rb_enc_get(user);
+#if defined _WIN32
+    rb_encoding *fsenc = rb_utf8_encoding();
+#else
+    rb_encoding *fsenc = rb_filesystem_encoding();
+#endif
+    if (enc != fsenc) {
+        dir = username = RSTRING_PTR(rb_str_conv_enc(user, enc, fsenc));
+    }
+
+#ifdef HAVE_PWD_H
+    pwPtr = getpwnam(username);
+#else
     if (strcasecmp(username, getlogin()) == 0)
 	dir = pwPtr = getenv("HOME");
 #endif
@@ -3203,17 +3635,58 @@ rb_home_dir_of(VALUE user, VALUE result)
     return result;
 }
 
+#ifndef _WIN32
 VALUE
 rb_default_home_dir(VALUE result)
 {
     const char *dir = getenv("HOME");
+
+#if defined HAVE_PWD_H
+    if (!dir) {
+        /* We'll look up the user's default home dir in the password db by
+         * login name, if possible, and failing that will fall back to looking
+         * the information up by uid (as would be needed for processes that
+         * are not a descendant of login(1) or a work-alike).
+         *
+         * While the lookup by uid is more likely to succeed (since we always
+         * have a uid, but may or may not have a login name), we prefer first
+         * looking up by name to accommodate the possibility of multiple login
+         * names (each with its own record in the password database, so each
+         * with a potentially different home directory) being mapped to the
+         * same uid (as explicitly allowed for by POSIX; see getlogin(3posix)).
+         */
+        VALUE login_name = rb_getlogin();
+
+# if !defined(HAVE_GETPWUID_R) && !defined(HAVE_GETPWUID)
+        /* This is a corner case, but for backward compatibility reasons we
+         * want to emit this error if neither the lookup by login name nor
+         * lookup by getuid() has a chance of succeeding.
+         */
+        if (NIL_P(login_name)) {
+            rb_raise(rb_eArgError, "couldn't find login name -- expanding `~'");
+        }
+# endif
+
+        VALUE pw_dir = rb_getpwdirnam_for_login(login_name);
+        if (NIL_P(pw_dir)) {
+            pw_dir = rb_getpwdiruid();
+            if (NIL_P(pw_dir)) {
+                rb_raise(rb_eArgError, "couldn't find home for uid `%ld'", (long)getuid());
+            }
+        }
+
+        /* found it */
+        copy_home_path(result, RSTRING_PTR(pw_dir));
+        rb_str_resize(pw_dir, 0);
+        return result;
+    }
+#endif
     if (!dir) {
 	rb_raise(rb_eArgError, "couldn't find HOME environment -- expanding `~'");
     }
     return copy_home_path(result, dir);
 }
 
-#ifndef _WIN32
 static VALUE
 ospath_new(const char *ptr, long len, rb_encoding *fsenc)
 {
@@ -3260,18 +3733,15 @@ rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_na
     const char *s, *b, *fend;
     char *buf, *p, *pend, *root;
     size_t buflen, bdiff;
-    int tainted;
     rb_encoding *enc, *fsenc = rb_filesystem_encoding();
 
     s = StringValuePtr(fname);
     fend = s + RSTRING_LEN(fname);
     enc = rb_enc_get(fname);
     BUFINIT();
-    tainted = OBJ_TAINTED(fname);
 
     if (s[0] == '~' && abs_mode == 0) {      /* execute only if NOT absolute_path() */
 	long userlen = 0;
-	tainted = 1;
 	if (isdirsep(s[1]) || s[1] == '\0') {
 	    buf = 0;
 	    b = 0;
@@ -3329,7 +3799,6 @@ rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_na
 	    }
 	    if (!same) {
 		char *e = append_fspath(result, fname, getcwdofdrv(*s), &enc, fsenc);
-		tainted = 1;
 		BUFINIT();
 		p = e;
 	    }
@@ -3350,8 +3819,7 @@ rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_na
 	    p = pend;
 	}
 	else {
-	    char *e = append_fspath(result, fname, my_getcwd(), &enc, fsenc);
-	    tainted = 1;
+	    char *e = append_fspath(result, fname, ruby_getcwd(), &enc, fsenc);
 	    BUFINIT();
 	    p = e;
 	}
@@ -3434,7 +3902,7 @@ rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_na
 	      case ' ': {
 		const char *e = s;
 		while (s < fend && istrailinggarbage(*s)) s++;
-		if (!*s) {
+		if (s >= fend) {
 		    s = e;
 		    goto endpath;
 		}
@@ -3473,19 +3941,23 @@ rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_na
 
     if (s > b) {
 #if USE_NTFS
+# if USE_NTFS_ADS
 	static const char prime[] = ":$DATA";
 	enum {prime_len = sizeof(prime) -1};
+# endif
       endpath:
+# if USE_NTFS_ADS
 	if (s > b + prime_len && strncasecmp(s - prime_len, prime, prime_len) == 0) {
 	    /* alias of stream */
 	    /* get rid of a bug of x64 VC++ */
-	    if (*(s - (prime_len+1)) == ':') {
+	    if (isADS(*(s - (prime_len+1)))) {
 		s -= prime_len + 1; /* prime */
 	    }
 	    else if (memchr(b, ':', s - prime_len - b)) {
 		s -= prime_len;	/* alternative */
 	    }
 	}
+# endif
 #endif
 	BUFCOPY(b, s-b);
 	rb_str_set_len(result, p-buf);
@@ -3514,7 +3986,7 @@ rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_na
 	struct stat st;
 	p = (char *)s;
 	len = strlen(p);
-	if (lstat(buf, &st) == 0 && S_ISLNK(st.st_mode)) {
+	if (lstat_without_gvl(buf, &st) == 0 && S_ISLNK(st.st_mode)) {
 	    is_symlink = 1;
 	    if (len > 4 && STRCASECMP(p + len - 4, ".lnk") != 0) {
 		lnk_added = 1;
@@ -3598,7 +4070,6 @@ rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_na
     }
 #endif
 
-    if (tainted) OBJ_TAINT(result);
     rb_str_set_len(result, p - buf);
     rb_enc_check(fname, result);
     ENC_CODERANGE_CLEAR(result);
@@ -3641,6 +4112,13 @@ rb_file_expand_path_fast(VALUE fname, VALUE dname)
     return expand_path(fname, dname, 0, 0, EXPAND_PATH_BUFFER());
 }
 
+VALUE
+rb_file_s_expand_path(int argc, const VALUE *argv)
+{
+    rb_check_arity(argc, 1, 2);
+    return rb_file_expand_path(argv[0], argc > 1 ? argv[1] : Qnil);
+}
+
 /*
  *  call-seq:
  *     File.expand_path(file_name [, dir_string] )  ->  abs_file_name
@@ -3669,11 +4147,10 @@ rb_file_expand_path_fast(VALUE fname, VALUE dname)
  *  parent, the root of the project and appends +lib/mygem.rb+.
  */
 
-VALUE
-rb_file_s_expand_path(int argc, const VALUE *argv)
+static VALUE
+s_expand_path(int c, const VALUE * v, VALUE _)
 {
-    rb_check_arity(argc, 1, 2);
-    return rb_file_expand_path(argv[0], argc > 1 ? argv[1] : Qnil);
+    return rb_file_s_expand_path(c, v);
 }
 
 VALUE
@@ -3683,6 +4160,13 @@ rb_file_absolute_path(VALUE fname, VALUE dname)
     return expand_path(fname, dname, 1, 1, EXPAND_PATH_BUFFER());
 }
 
+VALUE
+rb_file_s_absolute_path(int argc, const VALUE *argv)
+{
+    rb_check_arity(argc, 1, 2);
+    return rb_file_absolute_path(argv[0], argc > 1 ? argv[1] : Qnil);
+}
+
 /*
  *  call-seq:
  *     File.absolute_path(file_name [, dir_string] )  ->  abs_file_name
@@ -3696,15 +4180,41 @@ rb_file_absolute_path(VALUE fname, VALUE dname)
  *     File.absolute_path("~oracle/bin")       #=> "<relative_path>/~oracle/bin"
  */
 
-VALUE
-rb_file_s_absolute_path(int argc, const VALUE *argv)
+static VALUE
+s_absolute_path(int c, const VALUE * v, VALUE _)
 {
-    rb_check_arity(argc, 1, 2);
-    return rb_file_absolute_path(argv[0], argc > 1 ? argv[1] : Qnil);
+    return rb_file_s_absolute_path(c, v);
 }
 
-static void
-realpath_rec(long *prefixlenp, VALUE *resolvedp, const char *unresolved, VALUE loopcheck, int strict, int last)
+/*
+ *  call-seq:
+ *     File.absolute_path?(file_name)  ->  true or false
+ *
+ *  Returns <code>true</code> if +file_name+ is an absolute path, and
+ *  <code>false</code> otherwise.
+ *
+ *     File.absolute_path?("c:/foo")     #=> false (on Linux), true (on Windows)
+ */
+
+static VALUE
+s_absolute_path_p(VALUE klass, VALUE fname)
+{
+    VALUE path = rb_get_path(fname);
+
+    if (!rb_is_absolute_path(RSTRING_PTR(path))) return Qfalse;
+    return Qtrue;
+}
+
+enum rb_realpath_mode {
+    RB_REALPATH_CHECK,
+    RB_REALPATH_DIR,
+    RB_REALPATH_STRICT,
+    RB_REALPATH_MODE_MAX
+};
+
+static int
+realpath_rec(long *prefixlenp, VALUE *resolvedp, const char *unresolved, VALUE fallback,
+	     VALUE loopcheck, enum rb_realpath_mode mode, int last)
 {
     const char *pend = unresolved + strlen(unresolved);
     rb_encoding *enc = rb_enc_get(*resolvedp);
@@ -3745,6 +4255,10 @@ realpath_rec(long *prefixlenp, VALUE *resolvedp, const char *unresolved, VALUE l
             checkval = rb_hash_aref(loopcheck, testpath);
             if (!NIL_P(checkval)) {
                 if (checkval == ID2SYM(resolving)) {
+		    if (mode == RB_REALPATH_CHECK) {
+			errno = ELOOP;
+			return -1;
+		    }
                     rb_syserr_fail_path(ELOOP, testpath);
                 }
                 else {
@@ -3754,16 +4268,18 @@ realpath_rec(long *prefixlenp, VALUE *resolvedp, const char *unresolved, VALUE l
             else {
                 struct stat sbuf;
                 int ret;
-                VALUE testpath2 = rb_str_encode_ospath(testpath);
-#ifdef __native_client__
-                ret = stat(RSTRING_PTR(testpath2), &sbuf);
-#else
-                ret = lstat(RSTRING_PTR(testpath2), &sbuf);
-#endif
+                ret = lstat_without_gvl(RSTRING_PTR(testpath), &sbuf);
                 if (ret == -1) {
 		    int e = errno;
+		    if (e == ENOENT && !NIL_P(fallback)) {
+			if (stat_without_gvl(RSTRING_PTR(fallback), &sbuf) == 0) {
+			    rb_str_replace(*resolvedp, fallback);
+			    return 0;
+			}
+		    }
+		    if (mode == RB_REALPATH_CHECK) return -1;
 		    if (e == ENOENT) {
-                        if (strict || !last || *unresolved_firstsep)
+			if (mode == RB_REALPATH_STRICT || !last || *unresolved_firstsep)
 			    rb_syserr_fail_path(e, testpath);
                         *resolvedp = testpath;
                         break;
@@ -3775,7 +4291,7 @@ realpath_rec(long *prefixlenp, VALUE *resolvedp, const char *unresolved, VALUE l
 #ifdef HAVE_READLINK
                 if (S_ISLNK(sbuf.st_mode)) {
 		    VALUE link;
-		    volatile VALUE link_orig = Qnil;
+		    VALUE link_orig = Qnil;
 		    const char *link_prefix, *link_names;
                     long link_prefixlen;
                     rb_hash_aset(loopcheck, testpath, ID2SYM(resolving));
@@ -3784,15 +4300,17 @@ realpath_rec(long *prefixlenp, VALUE *resolvedp, const char *unresolved, VALUE l
 		    link_names = skipprefixroot(link_prefix, link_prefix + RSTRING_LEN(link), rb_enc_get(link));
 		    link_prefixlen = link_names - link_prefix;
 		    if (link_prefixlen > 0) {
-			rb_encoding *enc, *linkenc = rb_enc_get(link);
+			rb_encoding *tmpenc, *linkenc = rb_enc_get(link);
 			link_orig = link;
 			link = rb_str_subseq(link, 0, link_prefixlen);
-			enc = rb_enc_check(*resolvedp, link);
-			if (enc != linkenc) link = rb_str_conv_enc(link, linkenc, enc);
+			tmpenc = rb_enc_check(*resolvedp, link);
+			if (tmpenc != linkenc) link = rb_str_conv_enc(link, linkenc, tmpenc);
 			*resolvedp = link;
 			*prefixlenp = link_prefixlen;
 		    }
-		    realpath_rec(prefixlenp, resolvedp, link_names, loopcheck, strict, *unresolved_firstsep == '\0');
+		    if (realpath_rec(prefixlenp, resolvedp, link_names, testpath,
+				     loopcheck, mode, !*unresolved_firstsep))
+			return -1;
 		    RB_GC_GUARD(link_orig);
 		    rb_hash_aset(loopcheck, testpath, rb_str_dup_frozen(*resolvedp));
                 }
@@ -3806,25 +4324,19 @@ realpath_rec(long *prefixlenp, VALUE *resolvedp, const char *unresolved, VALUE l
             }
         }
     }
+    return 0;
 }
 
-#ifdef __native_client__
-VALUE
-rb_realpath_internal(VALUE basedir, VALUE path, int strict)
-{
-    return path;
-}
-#else
-VALUE
-rb_realpath_internal(VALUE basedir, VALUE path, int strict)
+static VALUE
+rb_check_realpath_emulate(VALUE basedir, VALUE path, rb_encoding *origenc, enum rb_realpath_mode mode)
 {
     long prefixlen;
     VALUE resolved;
-    volatile VALUE unresolved_path;
+    VALUE unresolved_path;
     VALUE loopcheck;
-    volatile VALUE curdir = Qnil;
+    VALUE curdir = Qnil;
 
-    rb_encoding *enc, *origenc;
+    rb_encoding *enc;
     char *path_names = NULL, *basedir_names = NULL, *curdir_names = NULL;
     char *ptr, *prefixptr = NULL, *pend;
     long len;
@@ -3833,9 +4345,11 @@ rb_realpath_internal(VALUE basedir, VALUE path, int strict)
 
     if (!NIL_P(basedir)) {
         FilePathValue(basedir);
-        basedir = rb_str_dup_frozen(basedir);
+        basedir = TO_OSPATH(rb_str_dup_frozen(basedir));
     }
 
+    enc = rb_enc_get(unresolved_path);
+    unresolved_path = TO_OSPATH(unresolved_path);
     RSTRING_GETMEM(unresolved_path, ptr, len);
     path_names = skipprefixroot(ptr, ptr + len, rb_enc_get(unresolved_path));
     if (ptr != path_names) {
@@ -3852,7 +4366,7 @@ rb_realpath_internal(VALUE basedir, VALUE path, int strict)
         }
     }
 
-    curdir = rb_dir_getwd();
+    curdir = rb_dir_getwd_ospath();
     RSTRING_GETMEM(curdir, ptr, len);
     curdir_names = skipprefixroot(ptr, ptr + len, rb_enc_get(curdir));
     resolved = rb_str_subseq(curdir, 0, curdir_names - ptr);
@@ -3860,7 +4374,6 @@ rb_realpath_internal(VALUE basedir, VALUE path, int strict)
   root_found:
     RSTRING_GETMEM(resolved, prefixptr, prefixlen);
     pend = prefixptr + prefixlen;
-    enc = rb_enc_get(resolved);
     ptr = chompdirsep(prefixptr, pend, enc);
     if (ptr < pend) {
         prefixlen = ++ptr - prefixptr;
@@ -3875,7 +4388,6 @@ rb_realpath_internal(VALUE basedir, VALUE path, int strict)
     }
 #endif
 
-    origenc = enc;
     switch (rb_enc_to_index(enc)) {
       case ENCINDEX_ASCII:
       case ENCINDEX_US_ASCII:
@@ -3883,19 +4395,116 @@ rb_realpath_internal(VALUE basedir, VALUE path, int strict)
     }
 
     loopcheck = rb_hash_new();
-    if (curdir_names)
-        realpath_rec(&prefixlen, &resolved, curdir_names, loopcheck, 1, 0);
-    if (basedir_names)
-        realpath_rec(&prefixlen, &resolved, basedir_names, loopcheck, 1, 0);
-    realpath_rec(&prefixlen, &resolved, path_names, loopcheck, strict, 1);
+    if (curdir_names) {
+	if (realpath_rec(&prefixlen, &resolved, curdir_names, Qnil, loopcheck, mode, 0))
+	    return Qnil;
+    }
+    if (basedir_names) {
+	if (realpath_rec(&prefixlen, &resolved, basedir_names, Qnil, loopcheck, mode, 0))
+	    return Qnil;
+    }
+    if (realpath_rec(&prefixlen, &resolved, path_names, Qnil, loopcheck, mode, 1))
+	return Qnil;
 
-    if (origenc != enc && rb_enc_str_asciionly_p(resolved))
-	rb_enc_associate(resolved, origenc);
+    if (origenc && origenc != rb_enc_get(resolved)) {
+	if (rb_enc_str_asciionly_p(resolved)) {
+	    rb_enc_associate(resolved, origenc);
+	}
+	else {
+	    resolved = rb_str_conv_enc(resolved, NULL, origenc);
+	}
+    }
 
-    OBJ_TAINT(resolved);
+    RB_GC_GUARD(unresolved_path);
+    RB_GC_GUARD(curdir);
     return resolved;
 }
-#endif
+
+static VALUE rb_file_join(VALUE ary);
+
+static VALUE
+rb_check_realpath_internal(VALUE basedir, VALUE path, rb_encoding *origenc, enum rb_realpath_mode mode)
+{
+#ifdef HAVE_REALPATH
+    VALUE unresolved_path;
+    char *resolved_ptr = NULL;
+    VALUE resolved;
+
+    if (mode == RB_REALPATH_DIR) {
+        return rb_check_realpath_emulate(basedir, path, origenc, mode);
+    }
+
+    unresolved_path = rb_str_dup_frozen(path);
+    if (*RSTRING_PTR(unresolved_path) != '/' && !NIL_P(basedir)) {
+        unresolved_path = rb_file_join(rb_assoc_new(basedir, unresolved_path));
+    }
+    if (origenc) unresolved_path = TO_OSPATH(unresolved_path);
+
+    if ((resolved_ptr = realpath(RSTRING_PTR(unresolved_path), NULL)) == NULL) {
+        /* glibc realpath(3) does not allow /path/to/file.rb/../other_file.rb,
+           returning ENOTDIR in that case.
+           glibc realpath(3) can also return ENOENT for paths that exist,
+           such as /dev/fd/5.
+           Fallback to the emulated approach in either of those cases. */
+        if (errno == ENOTDIR ||
+            (errno == ENOENT && rb_file_exist_p(0, unresolved_path))) {
+            return rb_check_realpath_emulate(basedir, path, origenc, mode);
+
+        }
+        if (mode == RB_REALPATH_CHECK) {
+            return Qnil;
+        }
+        rb_sys_fail_path(unresolved_path);
+    }
+    resolved = ospath_new(resolved_ptr, strlen(resolved_ptr), rb_filesystem_encoding());
+    free(resolved_ptr);
+
+# if !defined(__LINUX__) && !defined(__APPLE__)
+    /* As `resolved` is a String in the filesystem encoding, no
+     * conversion is needed */
+    struct stat st;
+    if (stat_without_gvl(RSTRING_PTR(resolved), &st) < 0) {
+        if (mode == RB_REALPATH_CHECK) {
+            return Qnil;
+        }
+        rb_sys_fail_path(unresolved_path);
+    }
+# endif
+
+    if (origenc && origenc != rb_enc_get(resolved)) {
+        if (!rb_enc_str_asciionly_p(resolved)) {
+            resolved = rb_str_conv_enc(resolved, NULL, origenc);
+        }
+        rb_enc_associate(resolved, origenc);
+    }
+
+    if (rb_enc_str_coderange(resolved) == ENC_CODERANGE_BROKEN) {
+        rb_enc_associate(resolved, rb_filesystem_encoding());
+        if (rb_enc_str_coderange(resolved) == ENC_CODERANGE_BROKEN) {
+            rb_enc_associate(resolved, rb_ascii8bit_encoding());
+        }
+    }
+
+    RB_GC_GUARD(unresolved_path);
+    return resolved;
+#else
+    return rb_check_realpath_emulate(basedir, path, origenc, mode);
+#endif /* HAVE_REALPATH */
+}
+
+VALUE
+rb_realpath_internal(VALUE basedir, VALUE path, int strict)
+{
+    const enum rb_realpath_mode mode =
+	strict ? RB_REALPATH_STRICT : RB_REALPATH_DIR;
+    return rb_check_realpath_internal(basedir, path, rb_enc_get(path), mode);
+}
+
+VALUE
+rb_check_realpath(VALUE basedir, VALUE path, rb_encoding *enc)
+{
+    return rb_check_realpath_internal(basedir, path, enc, RB_REALPATH_CHECK);
+}
 
 /*
  * call-seq:
@@ -4043,13 +4652,13 @@ ruby_enc_find_basename(const char *name, long *baselen, long *alllen, rb_encodin
  *  call-seq:
  *     File.basename(file_name [, suffix] )  ->  base_name
  *
- *  Returns the last component of the filename given in <i>file_name</i>,
- *  which can be formed using both <code>File::SEPARATOR</code> and
- *  <code>File::ALT_SEPARATOR</code> as the separator when
- *  <code>File::ALT_SEPARATOR</code> is not <code>nil</code>. If
- *  <i>suffix</i> is given and present at the end of <i>file_name</i>,
- *  it is removed. If <i>suffix</i> is ".*", any extension will be
- *  removed.
+ *  Returns the last component of the filename given in
+ *  <i>file_name</i> (after first stripping trailing separators),
+ *  which can be formed using both File::SEPARATOR and
+ *  File::ALT_SEPARATOR as the separator when File::ALT_SEPARATOR is
+ *  not <code>nil</code>. If <i>suffix</i> is given and present at the
+ *  end of <i>file_name</i>, it is removed. If <i>suffix</i> is ".*",
+ *  any extension will be removed.
  *
  *     File.basename("/home/gumby/work/ruby.rb")          #=> "ruby.rb"
  *     File.basename("/home/gumby/work/ruby.rb", ".rb")   #=> "ruby"
@@ -4057,7 +4666,7 @@ ruby_enc_find_basename(const char *name, long *baselen, long *alllen, rb_encodin
  */
 
 static VALUE
-rb_file_s_basename(int argc, VALUE *argv)
+rb_file_s_basename(int argc, VALUE *argv, VALUE _)
 {
     VALUE fname, fext, basename;
     const char *name, *p;
@@ -4097,7 +4706,6 @@ rb_file_s_basename(int argc, VALUE *argv)
 
     basename = rb_str_new(p, f);
     rb_enc_copy(basename, fname);
-    OBJ_INFECT(basename, fname);
     return basename;
 }
 
@@ -4106,9 +4714,10 @@ rb_file_s_basename(int argc, VALUE *argv)
  *     File.dirname(file_name)  ->  dir_name
  *
  *  Returns all components of the filename given in <i>file_name</i>
- *  except the last one. The filename can be formed using both
- *  <code>File::SEPARATOR</code> and <code>File::ALT_SEPARATOR</code> as the
- *  separator when <code>File::ALT_SEPARATOR</code> is not <code>nil</code>.
+ *  except the last one (after first stripping trailing separators).
+ *  The filename can be formed using both File::SEPARATOR and
+ *  File::ALT_SEPARATOR as the separator when File::ALT_SEPARATOR is
+ *  not <code>nil</code>.
  *
  *     File.dirname("/home/gumby/work/ruby.rb")   #=> "/home/gumby/work"
  */
@@ -4158,7 +4767,6 @@ rb_file_dirname(VALUE fname)
 	rb_str_cat(dirname, ".", 1);
 #endif
     rb_enc_copy(dirname, fname);
-    OBJ_INFECT(dirname, fname);
     return dirname;
 }
 
@@ -4195,7 +4803,7 @@ ruby_enc_find_extname(const char *name, long *len, rb_encoding *enc)
 		if (*p == '.') dot = p;
 		p++;
 	    }
-	    if (!*p || *p == ':') {
+	    if (!*p || isADS(*p)) {
 		p = last;
 		break;
 	    }
@@ -4206,7 +4814,7 @@ ruby_enc_find_extname(const char *name, long *len, rb_encoding *enc)
 #endif
 	}
 #if USE_NTFS
-	else if (*p == ':') {
+	else if (isADS(*p)) {
 	    break;
 	}
 #endif
@@ -4240,10 +4848,13 @@ ruby_enc_find_extname(const char *name, long *len, rb_encoding *enc)
  *  An empty string will also be returned when the period is the last character
  *  in +path+.
  *
+ *  On Windows, trailing dots are truncated.
+ *
  *     File.extname("test.rb")         #=> ".rb"
  *     File.extname("a/b/d/test.rb")   #=> ".rb"
  *     File.extname(".a/b/d/test.rb")  #=> ".rb"
- *     File.extname("foo.")            #=> ""
+ *     File.extname("foo.")            #=> "" on Windows
+ *     File.extname("foo.")            #=> "." on non-Windows
  *     File.extname("test")            #=> ""
  *     File.extname(".profile")        #=> ""
  *     File.extname(".profile.sh")     #=> ".sh"
@@ -4261,10 +4872,9 @@ rb_file_s_extname(VALUE klass, VALUE fname)
     name = StringValueCStr(fname);
     len = RSTRING_LEN(fname);
     e = ruby_enc_find_extname(name, &len, rb_enc_get(fname));
-    if (len <= 1)
+    if (len < 1)
 	return rb_str_new(0, 0);
     extname = rb_str_subseq(fname, e - name, len); /* keep the dot, too! */
-    OBJ_INFECT(extname, fname);
     return extname;
 }
 
@@ -4290,8 +4900,8 @@ rb_file_s_path(VALUE klass, VALUE fname)
  *     File.split(file_name)   -> array
  *
  *  Splits the given string into a directory and a file component and
- *  returns them in a two-element array. See also
- *  <code>File::dirname</code> and <code>File::basename</code>.
+ *  returns them in a two-element array. See also File::dirname and
+ *  File::basename.
  *
  *     File.split("/home/gumby/.profile")   #=> ["/home/gumby", ".profile"]
  */
@@ -4300,23 +4910,18 @@ static VALUE
 rb_file_s_split(VALUE klass, VALUE path)
 {
     FilePathStringValue(path);		/* get rid of converting twice */
-    return rb_assoc_new(rb_file_dirname(path), rb_file_s_basename(1,&path));
+    return rb_assoc_new(rb_file_dirname(path), rb_file_s_basename(1,&path,Qundef));
 }
 
-static VALUE separator;
-
-static VALUE rb_file_join(VALUE ary, VALUE sep);
-
 static VALUE
-file_inspect_join(VALUE ary, VALUE argp, int recur)
+file_inspect_join(VALUE ary, VALUE arg, int recur)
 {
-    VALUE *arg = (VALUE *)argp;
-    if (recur || ary == arg[0]) rb_raise(rb_eArgError, "recursive array");
-    return rb_file_join(arg[0], arg[1]);
+    if (recur || ary == arg) rb_raise(rb_eArgError, "recursive array");
+    return rb_file_join(arg);
 }
 
 static VALUE
-rb_file_join(VALUE ary, VALUE sep)
+rb_file_join(VALUE ary)
 {
     long len, i;
     VALUE result, tmp;
@@ -4337,16 +4942,12 @@ rb_file_join(VALUE ary, VALUE sep)
 	    len += 10;
 	}
     }
-    if (!NIL_P(sep)) {
-	StringValue(sep);
-	len += RSTRING_LEN(sep) * (RARRAY_LEN(ary) - 1);
-    }
+    len += RARRAY_LEN(ary) - 1;
     result = rb_str_buf_new(len);
     RBASIC_CLEAR_CLASS(result);
-    OBJ_INFECT(result, ary);
     for (i=0; i<RARRAY_LEN(ary); i++) {
 	tmp = RARRAY_AREF(ary, i);
-	switch (TYPE(tmp)) {
+	switch (OBJ_BUILTIN_TYPE(tmp)) {
 	  case T_STRING:
 	    if (!checked) check_path_encoding(tmp);
 	    StringValueCStr(tmp);
@@ -4356,11 +4957,7 @@ rb_file_join(VALUE ary, VALUE sep)
 		rb_raise(rb_eArgError, "recursive array");
 	    }
 	    else {
-		VALUE args[2];
-
-		args[0] = tmp;
-		args[1] = sep;
-		tmp = rb_exec_recursive(file_inspect_join, ary, (VALUE)args);
+		tmp = rb_exec_recursive(file_inspect_join, ary, tmp);
 	    }
 	    break;
 	  default:
@@ -4371,15 +4968,13 @@ rb_file_join(VALUE ary, VALUE sep)
 	if (i == 0) {
 	    rb_enc_copy(result, tmp);
 	}
-	else if (!NIL_P(sep)) {
+	else {
 	    tail = chompdirsep(name, name + len, rb_enc_get(result));
 	    if (RSTRING_PTR(tmp) && isdirsep(RSTRING_PTR(tmp)[0])) {
 		rb_str_set_len(result, tail - name);
 	    }
 	    else if (!*tail) {
-		enc = rb_enc_check(result, sep);
-		rb_str_buf_append(result, sep);
-		rb_enc_associate(result, enc);
+		rb_str_cat(result, "/", 1);
 	    }
 	}
 	enc = rb_enc_check(result, tmp);
@@ -4396,7 +4991,7 @@ rb_file_join(VALUE ary, VALUE sep)
  *     File.join(string, ...)  ->  string
  *
  *  Returns a new string formed by joining the strings using
- *  <code>File::SEPARATOR</code>.
+ *  <code>"/"</code>.
  *
  *     File.join("usr", "mail", "gumby")   #=> "usr/mail/gumby"
  *
@@ -4405,10 +5000,46 @@ rb_file_join(VALUE ary, VALUE sep)
 static VALUE
 rb_file_s_join(VALUE klass, VALUE args)
 {
-    return rb_file_join(args, separator);
+    return rb_file_join(args);
 }
 
 #if defined(HAVE_TRUNCATE) || defined(HAVE_CHSIZE)
+struct truncate_arg {
+    const char *path;
+#if defined(HAVE_TRUNCATE)
+#define NUM2POS(n) NUM2OFFT(n)
+    off_t pos;
+#else
+#define NUM2POS(n) NUM2LONG(n)
+    long pos;
+#endif
+};
+
+static void *
+nogvl_truncate(void *ptr)
+{
+    struct truncate_arg *ta = ptr;
+#ifdef HAVE_TRUNCATE
+    return (void *)(VALUE)truncate(ta->path, ta->pos);
+#else /* defined(HAVE_CHSIZE) */
+    {
+	int tmpfd = rb_cloexec_open(ta->path, 0, 0);
+
+	if (tmpfd < 0)
+	    return (void *)-1;
+	rb_update_max_fd(tmpfd);
+	if (chsize(tmpfd, ta->pos) < 0) {
+	    int e = errno;
+	    close(tmpfd);
+	    errno = e;
+	    return (void *)-1;
+	}
+	close(tmpfd);
+	return 0;
+    }
+#endif
+}
+
 /*
  *  call-seq:
  *     File.truncate(file_name, integer)  -> 0
@@ -4427,36 +5058,18 @@ rb_file_s_join(VALUE klass, VALUE args)
 static VALUE
 rb_file_s_truncate(VALUE klass, VALUE path, VALUE len)
 {
-#ifdef HAVE_TRUNCATE
-#define NUM2POS(n) NUM2OFFT(n)
-    off_t pos;
-#else
-#define NUM2POS(n) NUM2LONG(n)
-    long pos;
-#endif
+    struct truncate_arg ta;
+    int r;
 
-    pos = NUM2POS(len);
+    ta.pos = NUM2POS(len);
     FilePathValue(path);
     path = rb_str_encode_ospath(path);
-#ifdef HAVE_TRUNCATE
-    if (truncate(StringValueCStr(path), pos) < 0)
-	rb_sys_fail_path(path);
-#else /* defined(HAVE_CHSIZE) */
-    {
-	int tmpfd;
+    ta.path = StringValueCStr(path);
 
-	if ((tmpfd = rb_cloexec_open(StringValueCStr(path), 0, 0)) < 0) {
-	    rb_sys_fail_path(path);
-	}
-        rb_update_max_fd(tmpfd);
-	if (chsize(tmpfd, pos) < 0) {
-	    int e = errno;
-	    close(tmpfd);
-	    rb_syserr_fail_path(e, path);
-	}
-	close(tmpfd);
-    }
-#endif
+    r = (int)(VALUE)rb_thread_call_without_gvl(nogvl_truncate, &ta,
+						RUBY_UBF_IO, NULL);
+    if (r < 0)
+	rb_sys_fail_path(path);
     return INT2FIX(0);
 #undef NUM2POS
 }
@@ -4465,6 +5078,29 @@ rb_file_s_truncate(VALUE klass, VALUE path, VALUE len)
 #endif
 
 #if defined(HAVE_FTRUNCATE) || defined(HAVE_CHSIZE)
+struct ftruncate_arg {
+    int fd;
+#if defined(HAVE_FTRUNCATE)
+#define NUM2POS(n) NUM2OFFT(n)
+    off_t pos;
+#else
+#define NUM2POS(n) NUM2LONG(n)
+    long pos;
+#endif
+};
+
+static VALUE
+nogvl_ftruncate(void *ptr)
+{
+    struct ftruncate_arg *fa = ptr;
+
+#ifdef HAVE_FTRUNCATE
+    return (VALUE)ftruncate(fa->fd, fa->pos);
+#else /* defined(HAVE_CHSIZE) */
+    return (VALUE)chsize(fa->fd, fa->pos);
+#endif
+}
+
 /*
  *  call-seq:
  *     file.truncate(integer)    -> 0
@@ -4483,27 +5119,18 @@ static VALUE
 rb_file_truncate(VALUE obj, VALUE len)
 {
     rb_io_t *fptr;
-#if defined(HAVE_FTRUNCATE)
-#define NUM2POS(n) NUM2OFFT(n)
-    off_t pos;
-#else
-#define NUM2POS(n) NUM2LONG(n)
-    long pos;
-#endif
+    struct ftruncate_arg fa;
 
-    pos = NUM2POS(len);
+    fa.pos = NUM2POS(len);
     GetOpenFile(obj, fptr);
     if (!(fptr->mode & FMODE_WRITABLE)) {
 	rb_raise(rb_eIOError, "not opened for writing");
     }
     rb_io_flush_raw(obj, 0);
-#ifdef HAVE_FTRUNCATE
-    if (ftruncate(fptr->fd, pos) < 0)
-	rb_sys_fail_path(fptr->pathv);
-#else /* defined(HAVE_CHSIZE) */
-    if (chsize(fptr->fd, pos) < 0)
+    fa.fd = fptr->fd;
+    if ((int)rb_thread_io_blocking_region(nogvl_ftruncate, &fa, fa.fd) < 0) {
 	rb_sys_fail_path(fptr->pathv);
-#endif
+    }
     return INT2FIX(0);
 #undef NUM2POS
 }
@@ -4551,9 +5178,9 @@ rb_thread_flock(void *data)
  *
  *  Locks or unlocks a file according to <i>locking_constant</i> (a
  *  logical <em>or</em> of the values in the table below).
- *  Returns <code>false</code> if <code>File::LOCK_NB</code> is
- *  specified and the operation would otherwise have blocked. Not
- *  available on all platforms.
+ *  Returns <code>false</code> if File::LOCK_NB is specified and the
+ *  operation would otherwise have blocked. Not available on all
+ *  platforms.
  *
  *  Locking constants (in class File):
  *
@@ -4707,21 +5334,14 @@ test_check(int n, int argc, VALUE *argv)
  */
 
 static VALUE
-rb_f_test(int argc, VALUE *argv)
+rb_f_test(int argc, VALUE *argv, VALUE _)
 {
     int cmd;
 
     if (argc == 0) rb_check_arity(argc, 2, 3);
     cmd = NUM2CHR(argv[0]);
     if (cmd == 0) {
-      unknown:
-	/* unknown command */
-	if (ISPRINT(cmd)) {
-	    rb_raise(rb_eArgError, "unknown command '%s%c'", cmd == '\'' || cmd == '\\' ? "\\" : "", cmd);
-	}
-	else {
-	    rb_raise(rb_eArgError, "unknown command \"\\x%02X\"", cmd);
-	}
+        goto unknown;
     }
     if (strchr("bcdefgGkloOprRsSuwWxXz", cmd)) {
 	CHECK(1);
@@ -4847,22 +5467,28 @@ rb_f_test(int argc, VALUE *argv)
 	    return Qfalse;
 	}
     }
-    goto unknown;
+  unknown:
+    /* unknown command */
+    if (ISPRINT(cmd)) {
+        rb_raise(rb_eArgError, "unknown command '%s%c'", cmd == '\'' || cmd == '\\' ? "\\" : "", cmd);
+    }
+    else {
+        rb_raise(rb_eArgError, "unknown command \"\\x%02X\"", cmd);
+    }
+    UNREACHABLE_RETURN(Qundef);
 }
 
 
 /*
  *  Document-class: File::Stat
  *
- *  Objects of class <code>File::Stat</code> encapsulate common status
- *  information for <code>File</code> objects. The information is
- *  recorded at the moment the <code>File::Stat</code> object is
- *  created; changes made to the file after that point will not be
- *  reflected. <code>File::Stat</code> objects are returned by
- *  <code>IO#stat</code>, <code>File::stat</code>,
- *  <code>File#lstat</code>, and <code>File::lstat</code>. Many of these
+ *  Objects of class File::Stat encapsulate common status information
+ *  for File objects. The information is recorded at the moment the
+ *  File::Stat object is created; changes made to the file after that
+ *  point will not be reflected. File::Stat objects are returned by
+ *  IO#stat, File::stat, File#lstat, and File::lstat. Many of these
  *  methods return platform-specific values, and not all values are
- *  meaningful on all systems. See also <code>Kernel#test</code>.
+ *  meaningful on all systems. See also Kernel#test.
  */
 
 static VALUE
@@ -4983,10 +5609,9 @@ rb_stat_p(VALUE obj)
  *
  *  Returns <code>true</code> if <i>stat</i> is a symbolic link,
  *  <code>false</code> if it isn't or if the operating system doesn't
- *  support this feature. As <code>File::stat</code> automatically
- *  follows symbolic links, <code>symlink?</code> will always be
- *  <code>false</code> for an object returned by
- *  <code>File::stat</code>.
+ *  support this feature. As File::stat automatically follows symbolic
+ *  links, #symlink? will always be <code>false</code> for an object
+ *  returned by File::stat.
  *
  *     File.symlink("testfile", "alink")   #=> 0
  *     File.stat("alink").symlink?         #=> false
@@ -5183,7 +5808,7 @@ rb_stat_R(VALUE obj)
 
 /*
  * call-seq:
- *    stat.world_readable? -> fixnum or nil
+ *    stat.world_readable? -> integer or nil
  *
  * If <i>stat</i> is readable by others, returns an integer
  * representing the file permission bits of <i>stat</i>. Returns
@@ -5276,7 +5901,7 @@ rb_stat_W(VALUE obj)
 
 /*
  * call-seq:
- *    stat.world_writable?  ->  fixnum or nil
+ *    stat.world_writable?  ->  integer or nil
  *
  * If <i>stat</i> is writable by others, returns an integer
  * representing the file permission bits of <i>stat</i>. Returns
@@ -5492,6 +6117,20 @@ rb_stat_sticky(VALUE obj)
 #define HAVE_MKFIFO
 #endif
 
+#ifdef HAVE_MKFIFO
+struct mkfifo_arg {
+    const char *path;
+    mode_t mode;
+};
+
+static void *
+nogvl_mkfifo(void *ptr)
+{
+    struct mkfifo_arg *ma = ptr;
+
+    return (void *)(VALUE)mkfifo(ma->path, ma->mode);
+}
+
 /*
  *  call-seq:
  *     File.mkfifo(file_name, mode=0666)  => 0
@@ -5502,21 +6141,22 @@ rb_stat_sticky(VALUE obj)
  *  (mode & ~umask).
  */
 
-#ifdef HAVE_MKFIFO
 static VALUE
-rb_file_s_mkfifo(int argc, VALUE *argv)
+rb_file_s_mkfifo(int argc, VALUE *argv, VALUE _)
 {
     VALUE path;
-    int mode = 0666;
+    struct mkfifo_arg ma;
 
+    ma.mode = 0666;
     rb_check_arity(argc, 1, 2);
     if (argc > 1) {
-	mode = NUM2INT(argv[1]);
+	ma.mode = NUM2MODET(argv[1]);
     }
     path = argv[0];
     FilePathValue(path);
     path = rb_str_encode_ospath(path);
-    if (mkfifo(RSTRING_PTR(path), mode)) {
+    ma.path = RSTRING_PTR(path);
+    if (rb_thread_call_without_gvl(nogvl_mkfifo, &ma, RUBY_UBF_IO, 0)) {
 	rb_sys_fail_path(path);
     }
     return INT2FIX(0);
@@ -5525,7 +6165,7 @@ rb_file_s_mkfifo(int argc, VALUE *argv)
 #define rb_file_s_mkfifo rb_f_notimplement
 #endif
 
-VALUE rb_mFConst;
+static VALUE rb_mFConst;
 
 void
 rb_file_const(const char *name, VALUE value)
@@ -5558,7 +6198,7 @@ rb_is_absolute_path(const char *path)
 
 #if ENABLE_PATH_CHECK
 static int
-path_check_0(VALUE path, int execpath)
+path_check_0(VALUE path)
 {
     struct stat st;
     const char *p0 = StringValueCStr(path);
@@ -5567,7 +6207,7 @@ path_check_0(VALUE path, int execpath)
     char *p = 0, *s;
 
     if (!rb_is_absolute_path(p0)) {
-	char *buf = my_getcwd();
+	char *buf = ruby_getcwd();
 	VALUE newpath;
 
 	newpath = rb_str_new2(buf);
@@ -5586,12 +6226,12 @@ path_check_0(VALUE path, int execpath)
 #endif
 	if (STAT(p0, &st) == 0 && S_ISDIR(st.st_mode) && (st.st_mode & S_IWOTH)
 #ifdef S_ISVTX
-	    && !(p && execpath && (st.st_mode & S_ISVTX))
+	    && !(p && (st.st_mode & S_ISVTX))
 #endif
 	    && !access(p0, W_OK)) {
-	    rb_warn("Insecure world writable dir %s in %sPATH, mode 0%"
-		    PRI_MODET_PREFIX"o",
-		    p0, (execpath ? "" : "LOAD_"), st.st_mode);
+	    rb_enc_warn(enc, "Insecure world writable dir %s in PATH, mode 0%"
+			PRI_MODET_PREFIX"o",
+			p0, st.st_mode);
 	    if (p) *p = '/';
 	    RB_GC_GUARD(path);
 	    return 0;
@@ -5606,12 +6246,6 @@ path_check_0(VALUE path, int execpath)
 }
 #endif
 
-#if ENABLE_PATH_CHECK
-#define fpath_check(path) path_check_0((path), FALSE)
-#else
-#define fpath_check(path) 1
-#endif
-
 int
 rb_path_check(const char *path)
 {
@@ -5627,7 +6261,7 @@ rb_path_check(const char *path)
     if (!p) p = pend;
 
     for (;;) {
-	if (!path_check_0(rb_str_new(p0, p - p0), TRUE)) {
+	if (!path_check_0(rb_str_new(p0, p - p0))) {
 	    return 0;		/* not safe */
 	}
 	p0 = p + 1;
@@ -5653,7 +6287,7 @@ ruby_is_fd_loadable(int fd)
     if (S_ISREG(st.st_mode))
 	return 1;
 
-    if (S_ISFIFO(st.st_mode))
+    if (S_ISFIFO(st.st_mode) || S_ISCHR(st.st_mode))
 	return -1;
 
     if (S_ISDIR(st.st_mode))
@@ -5710,12 +6344,6 @@ copy_path_class(VALUE path, VALUE orig)
 int
 rb_find_file_ext(VALUE *filep, const char *const *ext)
 {
-    return rb_find_file_ext_safe(filep, ext, rb_safe_level());
-}
-
-int
-rb_find_file_ext_safe(VALUE *filep, const char *const *ext, int safe_level)
-{
     const char *f = StringValueCStr(*filep);
     VALUE fname = *filep, load_path, tmp;
     long i, j, fnlen;
@@ -5725,18 +6353,12 @@ rb_find_file_ext_safe(VALUE *filep, const char *const *ext, int safe_level)
 
     if (f[0] == '~') {
 	fname = file_expand_path_1(fname);
-	if (safe_level >= 1 && OBJ_TAINTED(fname)) {
-	    rb_raise(rb_eSecurityError, "loading from unsafe file %s", f);
-	}
 	f = RSTRING_PTR(fname);
 	*filep = fname;
 	expanded = 1;
     }
 
     if (expanded || rb_is_absolute_path(f) || is_explicit_relative(f)) {
-	if (safe_level >= 1 && !fpath_check(fname)) {
-	    rb_raise(rb_eSecurityError, "loading from unsafe path %s", f);
-	}
 	if (!expanded) fname = file_expand_path_1(fname);
 	fnlen = RSTRING_LEN(fname);
 	for (i=0; ext[i]; i++) {
@@ -5763,14 +6385,13 @@ rb_find_file_ext_safe(VALUE *filep, const char *const *ext, int safe_level)
 	for (i = 0; i < RARRAY_LEN(load_path); i++) {
 	    VALUE str = RARRAY_AREF(load_path, i);
 
-	    RB_GC_GUARD(str) = rb_get_path_check(str, safe_level);
+            RB_GC_GUARD(str) = rb_get_path(str);
 	    if (RSTRING_LEN(str) == 0) continue;
 	    rb_file_expand_path_internal(fname, str, 0, 0, tmp);
 	    if (rb_file_load_ok(RSTRING_PTR(tmp))) {
 		*filep = copy_path_class(tmp, *filep);
 		return (int)(j+1);
 	    }
-	    FL_UNSET(tmp, FL_TAINT);
 	}
 	rb_str_set_len(fname, fnlen);
     }
@@ -5782,30 +6403,18 @@ rb_find_file_ext_safe(VALUE *filep, const char *const *ext, int safe_level)
 VALUE
 rb_find_file(VALUE path)
 {
-    return rb_find_file_safe(path, rb_safe_level());
-}
-
-VALUE
-rb_find_file_safe(VALUE path, int safe_level)
-{
     VALUE tmp, load_path;
     const char *f = StringValueCStr(path);
     int expanded = 0;
 
     if (f[0] == '~') {
 	tmp = file_expand_path_1(path);
-	if (safe_level >= 1 && OBJ_TAINTED(tmp)) {
-	    rb_raise(rb_eSecurityError, "loading from unsafe file %s", f);
-	}
 	path = copy_path_class(tmp, path);
 	f = RSTRING_PTR(path);
 	expanded = 1;
     }
 
     if (expanded || rb_is_absolute_path(f) || is_explicit_relative(f)) {
-	if (safe_level >= 1 && !fpath_check(path)) {
-	    rb_raise(rb_eSecurityError, "loading from unsafe path %s", f);
-	}
 	if (!rb_file_load_ok(f)) return 0;
 	if (!expanded)
 	    path = copy_path_class(file_expand_path_1(path), path);
@@ -5820,7 +6429,7 @@ rb_find_file_safe(VALUE path, int safe_level)
 	rb_enc_associate_index(tmp, rb_usascii_encindex());
 	for (i = 0; i < RARRAY_LEN(load_path); i++) {
 	    VALUE str = RARRAY_AREF(load_path, i);
-	    RB_GC_GUARD(str) = rb_get_path_check(str, safe_level);
+            RB_GC_GUARD(str) = rb_get_path(str);
 	    if (RSTRING_LEN(str) > 0) {
 		rb_file_expand_path_internal(path, str, 0, 0, tmp);
 		f = RSTRING_PTR(tmp);
@@ -5835,10 +6444,6 @@ rb_find_file_safe(VALUE path, int safe_level)
     }
 
   found:
-    if (safe_level >= 1 && !fpath_check(tmp)) {
-	rb_raise(rb_eSecurityError, "loading from unsafe file %s", f);
-    }
-
     return copy_path_class(tmp, path);
 }
 
@@ -5849,7 +6454,7 @@ define_filetest_function(const char *name, VALUE (*func)(ANYARGS), int argc)
     rb_define_singleton_method(rb_cFile, name, func, argc);
 }
 
-static const char null_device[] =
+const char ruby_null_device[] =
 #if defined DOSISH
     "NUL"
 #elif defined AMIGA || defined __amigaos__
@@ -5862,11 +6467,10 @@ static const char null_device[] =
     ;
 
 /*
- *  A <code>File</code> is an abstraction of any file object accessible
- *  by the program and is closely associated with class <code>IO</code>.
- *  <code>File</code> includes the methods of module
- *  <code>FileTest</code> as class methods, allowing you to write (for
- *  example) <code>File.exist?("foo")</code>.
+ *  A File is an abstraction of any file object accessible by the
+ *  program and is closely associated with class IO.  File includes
+ *  the methods of module FileTest as class methods, allowing you to
+ *  write (for example) <code>File.exist?("foo")</code>.
  *
  *  In the description of File methods,
  *  <em>permission bits</em> are a platform-specific
@@ -5898,6 +6502,12 @@ static const char null_device[] =
 void
 Init_File(void)
 {
+#if defined(__APPLE__) && defined(HAVE_WORKING_FORK)
+    rb_CFString_class_initialize_before_fork();
+#endif
+
+    VALUE separator;
+
     rb_mFileTest = rb_define_module("FileTest");
     rb_cFile = rb_define_class("File", rb_cIO);
 
@@ -5947,6 +6557,7 @@ Init_File(void)
     rb_define_singleton_method(rb_cFile, "chown", rb_file_s_chown, -1);
     rb_define_singleton_method(rb_cFile, "lchmod", rb_file_s_lchmod, -1);
     rb_define_singleton_method(rb_cFile, "lchown", rb_file_s_lchown, -1);
+    rb_define_singleton_method(rb_cFile, "lutime", rb_file_s_lutime, -1);
 
     rb_define_singleton_method(rb_cFile, "link", rb_file_s_link, 2);
     rb_define_singleton_method(rb_cFile, "symlink", rb_file_s_symlink, 2);
@@ -5958,8 +6569,9 @@ Init_File(void)
     rb_define_singleton_method(rb_cFile, "umask", rb_file_s_umask, -1);
     rb_define_singleton_method(rb_cFile, "truncate", rb_file_s_truncate, 2);
     rb_define_singleton_method(rb_cFile, "mkfifo", rb_file_s_mkfifo, -1);
-    rb_define_singleton_method(rb_cFile, "expand_path", rb_file_s_expand_path, -1);
-    rb_define_singleton_method(rb_cFile, "absolute_path", rb_file_s_absolute_path, -1);
+    rb_define_singleton_method(rb_cFile, "expand_path", s_expand_path, -1);
+    rb_define_singleton_method(rb_cFile, "absolute_path", s_absolute_path, -1);
+    rb_define_singleton_method(rb_cFile, "absolute_path?", s_absolute_path_p, 1);
     rb_define_singleton_method(rb_cFile, "realpath", rb_file_s_realpath, -1);
     rb_define_singleton_method(rb_cFile, "realdirpath", rb_file_s_realdirpath, -1);
     rb_define_singleton_method(rb_cFile, "basename", rb_file_s_basename, -1);
@@ -5967,9 +6579,10 @@ Init_File(void)
     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_fstring_lit("/");
     /* separates directory parts in path */
     rb_define_const(rb_cFile, "Separator", separator);
+    /* separates directory parts in path */
     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);
@@ -5981,7 +6594,7 @@ Init_File(void)
     rb_define_const(rb_cFile, "ALT_SEPARATOR", Qnil);
 #endif
     /* path list separator */
-    rb_define_const(rb_cFile, "PATH_SEPARATOR", rb_obj_freeze(rb_str_new2(PATH_SEP)));
+    rb_define_const(rb_cFile, "PATH_SEPARATOR", rb_fstring_cstr(PATH_SEP));
 
     rb_define_method(rb_cIO, "stat",  rb_io_stat, 0); /* this is IO's method */
     rb_define_method(rb_cFile, "lstat",  rb_file_lstat, 0);
@@ -6088,7 +6701,7 @@ Init_File(void)
     rb_define_const(rb_mFConst, "LOCK_NB", INT2FIX(LOCK_NB));
 
     /* Name of the null device */
-    rb_define_const(rb_mFConst, "NULL", rb_obj_freeze(rb_usascii_str_new2(null_device)));
+    rb_define_const(rb_mFConst, "NULL", rb_fstring_cstr(ruby_null_device));
 
     rb_define_method(rb_cFile, "path",  rb_file_path, 0);
     rb_define_method(rb_cFile, "to_path",  rb_file_path, 0);
diff --git a/gc.c b/gc.c
index ebfb037c1e..5d0c342206 100644
--- a/gc.c
+++ b/gc.c
@@ -14,39 +14,38 @@
 #define rb_data_object_alloc rb_data_object_alloc
 #define rb_data_typed_object_alloc rb_data_typed_object_alloc
 
-#include "internal.h"
-#include "ruby/st.h"
-#include "ruby/re.h"
-#include "ruby/io.h"
-#include "ruby/thread.h"
-#include "ruby/util.h"
-#include "ruby/debug.h"
-#include "eval_intern.h"
-#include "vm_core.h"
-#include "gc.h"
-#include "constant.h"
-#include "ruby_atomic.h"
-#include "probes.h"
-#include "id_table.h"
-#include <stdio.h>
-#include <stdarg.h>
-#include <setjmp.h>
-#include <sys/types.h>
-#include "ruby_assert.h"
+#include "ruby/internal/config.h"
+#ifdef _WIN32
+# include "ruby/ruby.h"
+#endif
 
-#undef rb_data_object_wrap
+#include <signal.h>
+
+#define sighandler_t ruby_sighandler_t
+
+#ifndef _WIN32
+#include <unistd.h>
+#include <sys/mman.h>
+#endif
+
+#include <setjmp.h>
+#include <stdarg.h>
+#include <stdio.h>
 
 #ifndef HAVE_MALLOC_USABLE_SIZE
 # ifdef _WIN32
-#   define HAVE_MALLOC_USABLE_SIZE
-#   define malloc_usable_size(a) _msize(a)
+#  define HAVE_MALLOC_USABLE_SIZE
+#  define malloc_usable_size(a) _msize(a)
 # elif defined HAVE_MALLOC_SIZE
-#   define HAVE_MALLOC_USABLE_SIZE
-#   define malloc_usable_size(a) malloc_size(a)
+#  define HAVE_MALLOC_USABLE_SIZE
+#  define malloc_usable_size(a) malloc_size(a)
 # endif
 #endif
+
 #ifdef HAVE_MALLOC_USABLE_SIZE
-# ifdef HAVE_MALLOC_H
+# ifdef RUBY_ALTERNATIVE_MALLOC_HEADER
+#  include RUBY_ALTERNATIVE_MALLOC_HEADER
+# elif HAVE_MALLOC_H
 #  include <malloc.h>
 # elif defined(HAVE_MALLOC_NP_H)
 #  include <malloc_np.h>
@@ -55,39 +54,190 @@
 # endif
 #endif
 
-#if /* is ASAN enabled? */ \
-    __has_feature(address_sanitizer) /* Clang */ || \
-    defined(__SANITIZE_ADDRESS__)  /* GCC 4.8.x */
-  #define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS \
-        __attribute__((no_address_safety_analysis)) \
-        __attribute__((noinline))
-#else
-  #define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS
-#endif
-
 #ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
+# include <sys/time.h>
 #endif
 
 #ifdef HAVE_SYS_RESOURCE_H
-#include <sys/resource.h>
-#endif
-#if defined(__native_client__) && defined(NACL_NEWLIB)
-# include "nacl/resource.h"
-# undef HAVE_POSIX_MEMALIGN
-# undef HAVE_MEMALIGN
-
+# include <sys/resource.h>
 #endif
 
 #if defined _WIN32 || defined __CYGWIN__
-#include <windows.h>
+# include <windows.h>
 #elif defined(HAVE_POSIX_MEMALIGN)
 #elif defined(HAVE_MEMALIGN)
-#include <malloc.h>
+# include <malloc.h>
 #endif
 
+#include <sys/types.h>
+
+#include "constant.h"
+#include "debug_counter.h"
+#include "eval_intern.h"
+#include "gc.h"
+#include "id_table.h"
+#include "internal.h"
+#include "internal/class.h"
+#include "internal/complex.h"
+#include "internal/cont.h"
+#include "internal/error.h"
+#include "internal/eval.h"
+#include "internal/gc.h"
+#include "internal/hash.h"
+#include "internal/imemo.h"
+#include "internal/io.h"
+#include "internal/numeric.h"
+#include "internal/object.h"
+#include "internal/proc.h"
+#include "internal/rational.h"
+#include "internal/sanitizers.h"
+#include "internal/struct.h"
+#include "internal/symbol.h"
+#include "internal/thread.h"
+#include "internal/variable.h"
+#include "internal/warnings.h"
+#include "mjit.h"
+#include "probes.h"
+#include "regint.h"
+#include "ruby/debug.h"
+#include "ruby/io.h"
+#include "ruby/re.h"
+#include "ruby/st.h"
+#include "ruby/thread.h"
+#include "ruby/util.h"
+#include "ruby_assert.h"
+#include "ruby_atomic.h"
+#include "symbol.h"
+#include "transient_heap.h"
+#include "vm_core.h"
+#include "vm_sync.h"
+#include "vm_callinfo.h"
+#include "ractor_core.h"
+
+#include "builtin.h"
+
 #define rb_setjmp(env) RUBY_SETJMP(env)
 #define rb_jmp_buf rb_jmpbuf_t
+#undef rb_data_object_wrap
+
+static inline struct rbimpl_size_mul_overflow_tag
+size_add_overflow(size_t x, size_t y)
+{
+    size_t z;
+    bool p;
+#if 0
+
+#elif __has_builtin(__builtin_add_overflow)
+    p = __builtin_add_overflow(x, y, &z);
+
+#elif defined(DSIZE_T)
+    RB_GNUC_EXTENSION DSIZE_T dx = x;
+    RB_GNUC_EXTENSION DSIZE_T dy = y;
+    RB_GNUC_EXTENSION DSIZE_T dz = dx + dy;
+    p = dz > SIZE_MAX;
+    z = (size_t)dz;
+
+#else
+    z = x + y;
+    p = z < y;
+
+#endif
+    return (struct rbimpl_size_mul_overflow_tag) { p, z, };
+}
+
+static inline struct rbimpl_size_mul_overflow_tag
+size_mul_add_overflow(size_t x, size_t y, size_t z) /* x * y + z */
+{
+    struct rbimpl_size_mul_overflow_tag t = rbimpl_size_mul_overflow(x, y);
+    struct rbimpl_size_mul_overflow_tag u = size_add_overflow(t.right, z);
+    return (struct rbimpl_size_mul_overflow_tag) { t.left || u.left, u.right };
+}
+
+static inline struct rbimpl_size_mul_overflow_tag
+size_mul_add_mul_overflow(size_t x, size_t y, size_t z, size_t w) /* x * y + z * w */
+{
+    struct rbimpl_size_mul_overflow_tag t = rbimpl_size_mul_overflow(x, y);
+    struct rbimpl_size_mul_overflow_tag u = rbimpl_size_mul_overflow(z, w);
+    struct rbimpl_size_mul_overflow_tag v = size_add_overflow(t.right, u.right);
+    return (struct rbimpl_size_mul_overflow_tag) { t.left || u.left || v.left, v.right };
+}
+
+PRINTF_ARGS(NORETURN(static void gc_raise(VALUE, const char*, ...)), 2, 3);
+
+static inline size_t
+size_mul_or_raise(size_t x, size_t y, VALUE exc)
+{
+    struct rbimpl_size_mul_overflow_tag t = rbimpl_size_mul_overflow(x, y);
+    if (LIKELY(!t.left)) {
+        return t.right;
+    }
+    else if (rb_during_gc()) {
+        rb_memerror();          /* or...? */
+    }
+    else {
+        gc_raise(
+            exc,
+            "integer overflow: %"PRIuSIZE
+            " * %"PRIuSIZE
+            " > %"PRIuSIZE,
+            x, y, SIZE_MAX);
+    }
+}
+
+size_t
+rb_size_mul_or_raise(size_t x, size_t y, VALUE exc)
+{
+    return size_mul_or_raise(x, y, exc);
+}
+
+static inline size_t
+size_mul_add_or_raise(size_t x, size_t y, size_t z, VALUE exc)
+{
+    struct rbimpl_size_mul_overflow_tag t = size_mul_add_overflow(x, y, z);
+    if (LIKELY(!t.left)) {
+        return t.right;
+    }
+    else if (rb_during_gc()) {
+        rb_memerror();          /* or...? */
+    }
+    else {
+        gc_raise(
+            exc,
+            "integer overflow: %"PRIuSIZE
+            " * %"PRIuSIZE
+            " + %"PRIuSIZE
+            " > %"PRIuSIZE,
+            x, y, z, SIZE_MAX);
+    }
+}
+
+size_t
+rb_size_mul_add_or_raise(size_t x, size_t y, size_t z, VALUE exc)
+{
+    return size_mul_add_or_raise(x, y, z, exc);
+}
+
+static inline size_t
+size_mul_add_mul_or_raise(size_t x, size_t y, size_t z, size_t w, VALUE exc)
+{
+    struct rbimpl_size_mul_overflow_tag t = size_mul_add_mul_overflow(x, y, z, w);
+    if (LIKELY(!t.left)) {
+        return t.right;
+    }
+    else if (rb_during_gc()) {
+        rb_memerror();          /* or...? */
+    }
+    else {
+        gc_raise(
+            exc,
+            "integer overflow: %"PRIdSIZE
+            " * %"PRIdSIZE
+            " + %"PRIdSIZE
+            " * %"PRIdSIZE
+            " > %"PRIdSIZE,
+            x, y, z, w, SIZE_MAX);
+    }
+}
 
 #if defined(HAVE_RB_GC_GUARDED_PTR_VAL) && HAVE_RB_GC_GUARDED_PTR_VAL
 /* trick the compiler into thinking a external signal handler uses this */
@@ -211,7 +361,6 @@ static ruby_gc_params_t gc_params = {
 #define GC_DEBUG 0
 #endif
 
-#if USE_RGENGC
 /* RGENGC_DEBUG:
  * 1: basic information
  * 2: remember set operation
@@ -220,8 +369,18 @@ static ruby_gc_params_t gc_params = {
  * 5: sweep
  */
 #ifndef RGENGC_DEBUG
+#ifdef RUBY_DEVEL
+#define RGENGC_DEBUG       -1
+#else
 #define RGENGC_DEBUG       0
 #endif
+#endif
+#if RGENGC_DEBUG < 0 && !defined(_MSC_VER)
+# define RGENGC_DEBUG_ENABLED(level) (-(RGENGC_DEBUG) >= (level) && ruby_rgengc_debug >= (level))
+#else
+# define RGENGC_DEBUG_ENABLED(level) 0
+#endif
+int ruby_rgengc_debug;
 
 /* RGENGC_CHECK_MODE
  * 0: disable all assertions
@@ -235,6 +394,9 @@ static ruby_gc_params_t gc_params = {
 #define RGENGC_CHECK_MODE  0
 #endif
 
+// Note: using RUBY_ASSERT_WHEN() extend a macro in expr (info by nobu).
+#define GC_ASSERT(expr) RUBY_ASSERT_MESG_WHEN(RGENGC_CHECK_MODE > 0, expr, #expr)
+
 /* RGENGC_OLD_NEWOBJ_CHECK
  * 0:  disable all assertions
  * >0: make a OLD object when new object creation.
@@ -271,22 +433,6 @@ static ruby_gc_params_t gc_params = {
 #define RGENGC_FORCE_MAJOR_GC 0
 #endif
 
-#else /* USE_RGENGC */
-
-#ifdef RGENGC_DEBUG
-#undef RGENGC_DEBUG
-#endif
-#define RGENGC_DEBUG       0
-#ifdef RGENGC_CHECK_MODE
-#undef RGENGC_CHECK_MODE
-#endif
-#define RGENGC_CHECK_MODE  0
-#define RGENGC_PROFILE     0
-#define RGENGC_ESTIMATE_OLDMALLOC 0
-#define RGENGC_FORCE_MAJOR_GC 0
-
-#endif /* USE_RGENGC */
-
 #ifndef GC_PROFILE_MORE_DETAIL
 #define GC_PROFILE_MORE_DETAIL 0
 #endif
@@ -300,7 +446,7 @@ static ruby_gc_params_t gc_params = {
 #define GC_ENABLE_LAZY_SWEEP   1
 #endif
 #ifndef CALC_EXACT_MALLOC_SIZE
-#define CALC_EXACT_MALLOC_SIZE 0
+#define CALC_EXACT_MALLOC_SIZE USE_GC_MALLOC_OBJ_INFO_DETAILS
 #endif
 #if defined(HAVE_MALLOC_USABLE_SIZE) || CALC_EXACT_MALLOC_SIZE > 0
 #ifndef MALLOC_ALLOCATED_SIZE
@@ -342,7 +488,14 @@ typedef enum {
 
     /* others */
     GPR_FLAG_IMMEDIATE_SWEEP   = 0x2000,
-    GPR_FLAG_HAVE_FINALIZE     = 0x4000
+    GPR_FLAG_HAVE_FINALIZE     = 0x4000,
+    GPR_FLAG_IMMEDIATE_MARK    = 0x8000,
+    GPR_FLAG_FULL_MARK        = 0x10000,
+    GPR_FLAG_COMPACT          = 0x20000,
+
+    GPR_DEFAULT_REASON =
+        (GPR_FLAG_FULL_MARK | GPR_FLAG_IMMEDIATE_MARK |
+         GPR_FLAG_IMMEDIATE_SWEEP | GPR_FLAG_CAPI),
 } gc_profile_record_flag;
 
 typedef struct gc_profile_record {
@@ -354,6 +507,7 @@ typedef struct gc_profile_record {
     size_t heap_total_objects;
     size_t heap_use_size;
     size_t heap_total_size;
+    size_t moved_objects;
 
 #if GC_PROFILE_MORE_DETAIL
     double gc_mark_time;
@@ -386,6 +540,16 @@ typedef struct gc_profile_record {
 #endif
 } gc_profile_record;
 
+#define FL_FROM_FREELIST FL_USER0
+
+struct RMoved {
+    VALUE flags;
+    VALUE dummy;
+    VALUE destination;
+};
+
+#define RMOVED(obj) ((struct RMoved *)(obj))
+
 #if defined(_MSC_VER) || defined(__CYGWIN__)
 #pragma pack(push, 1) /* magic for reducing sizeof(RVALUE): 24 -> 20 */
 #endif
@@ -396,6 +560,7 @@ typedef struct RVALUE {
 	    VALUE flags;		/* always 0 for freed obj */
 	    struct RVALUE *next;
 	} free;
+        struct RMoved  moved;
 	struct RBasic  basic;
 	struct RObject object;
 	struct RClass  klass;
@@ -409,7 +574,6 @@ typedef struct RVALUE {
 	struct RStruct rstruct;
 	struct RBignum bignum;
 	struct RFile   file;
-	struct RNode   node;
 	struct RMatch  match;
 	struct RRational rational;
 	struct RComplex complex;
@@ -421,6 +585,9 @@ typedef struct RVALUE {
 	    struct MEMO memo;
 	    struct rb_method_entry_struct ment;
 	    const rb_iseq_t iseq;
+	    rb_env_t env;
+	    struct rb_imemo_tmpbuf_struct alloc;
+	    rb_ast_t ast;
 	} imemo;
 	struct {
 	    struct RBasic basic;
@@ -444,6 +611,7 @@ enum {
     BITS_SIZE = sizeof(bits_t),
     BITS_BITLENGTH = ( BITS_SIZE * CHAR_BIT )
 };
+#define popcount_bits rb_popcount_intptr
 
 struct heap_page_header {
     struct heap_page *page;
@@ -477,12 +645,11 @@ typedef struct mark_stack {
 } mark_stack_t;
 
 typedef struct rb_heap_struct {
-    RVALUE *freelist;
-
     struct heap_page *free_pages;
-    struct heap_page *using_page;
-    struct heap_page *pages;
-    struct heap_page *sweep_pages;
+    struct list_head pages;
+    struct heap_page *sweeping_page; /* iterator for .pages */
+    struct heap_page *compact_cursor;
+    size_t compact_cursor_index;
 #if GC_ENABLE_INCREMENTAL_MARK
     struct heap_page *pooled_pages;
 #endif
@@ -512,11 +679,10 @@ typedef struct rb_objspace {
 	unsigned int dont_gc : 1;
 	unsigned int dont_incremental : 1;
 	unsigned int during_gc : 1;
+        unsigned int during_compacting : 1;
 	unsigned int gc_stressful: 1;
 	unsigned int has_hook: 1;
-#if USE_RGENGC
 	unsigned int during_minor_gc : 1;
-#endif
 #if GC_ENABLE_INCREMENTAL_MARK
 	unsigned int during_incremental_marking : 1;
 #endif
@@ -524,6 +690,7 @@ typedef struct rb_objspace {
 
     rb_event_flag_t hook_events;
     size_t total_allocated_objects;
+    VALUE next_object_id;
 
     rb_heap_t eden_heap;
     rb_heap_t tomb_heap; /* heap for zombies and ghosts */
@@ -532,11 +699,6 @@ typedef struct rb_objspace {
 	rb_atomic_t finalizing;
     } atomic_flags;
 
-    struct mark_func_data_struct {
-	void *data;
-	void (*mark_func)(VALUE v, void *data);
-    } *mark_func_data;
-
     mark_stack_t mark_stack;
     size_t marked_slots;
 
@@ -568,9 +730,10 @@ typedef struct rb_objspace {
 #endif
 	double invoke_time;
 
-#if USE_RGENGC
 	size_t minor_gc_count;
 	size_t major_gc_count;
+	size_t compact_count;
+	size_t read_barrier_faults;
 #if RGENGC_PROFILE > 0
 	size_t total_generated_normal_object_count;
 	size_t total_generated_shady_object_count;
@@ -588,7 +751,6 @@ typedef struct rb_objspace {
 	size_t remembered_shady_object_count_types[RUBY_T_MASK];
 #endif
 #endif /* RGENGC_PROFILE */
-#endif /* USE_RGENGC */
 
 	/* temporary profiling space */
 	double gc_sweep_start_time;
@@ -605,7 +767,6 @@ typedef struct rb_objspace {
 
     VALUE gc_stress_mode;
 
-#if USE_RGENGC
     struct {
 	VALUE parent_object;
 	int need_major_gc;
@@ -625,13 +786,22 @@ typedef struct rb_objspace {
 	size_t error_count;
 #endif
     } rgengc;
+
+    struct {
+        size_t considered_count_table[T_MASK];
+        size_t moved_count_table[T_MASK];
+        size_t total_moved;
+    } rcompactor;
+
 #if GC_ENABLE_INCREMENTAL_MARK
     struct {
 	size_t pooled_slots;
 	size_t step_slots;
     } rincgc;
 #endif
-#endif /* USE_RGENGC */
+
+    st_table *id_to_obj_tbl;
+    st_table *obj_to_id_tbl;
 
 #if GC_DEBUG_STRESS_TO_CLASS
     VALUE stress_to_class;
@@ -639,26 +809,23 @@ typedef struct rb_objspace {
 } rb_objspace_t;
 
 
-#ifndef HEAP_PAGE_ALIGN_LOG
 /* default tiny heap size: 16KB */
 #define HEAP_PAGE_ALIGN_LOG 14
-#endif
 #define CEILDIV(i, mod) (((i) + (mod) - 1)/(mod))
 enum {
     HEAP_PAGE_ALIGN = (1UL << HEAP_PAGE_ALIGN_LOG),
     HEAP_PAGE_ALIGN_MASK = (~(~0UL << HEAP_PAGE_ALIGN_LOG)),
-    REQUIRED_SIZE_BY_MALLOC = (sizeof(size_t) * 5),
-    HEAP_PAGE_SIZE = (HEAP_PAGE_ALIGN - REQUIRED_SIZE_BY_MALLOC),
+    HEAP_PAGE_SIZE = HEAP_PAGE_ALIGN,
     HEAP_PAGE_OBJ_LIMIT = (unsigned int)((HEAP_PAGE_SIZE - sizeof(struct heap_page_header))/sizeof(struct RVALUE)),
     HEAP_PAGE_BITMAP_LIMIT = CEILDIV(CEILDIV(HEAP_PAGE_SIZE, sizeof(struct RVALUE)), BITS_BITLENGTH),
     HEAP_PAGE_BITMAP_SIZE = (BITS_SIZE * HEAP_PAGE_BITMAP_LIMIT),
-    HEAP_PAGE_BITMAP_PLANES = USE_RGENGC ? 4 : 1 /* RGENGC: mark, unprotected, uncollectible, marking */
+    HEAP_PAGE_BITMAP_PLANES = 4 /* RGENGC: mark, unprotected, uncollectible, marking */
 };
 
 struct heap_page {
-    struct heap_page *prev;
     short total_slots;
     short free_slots;
+    short pinned_slots;
     short final_slots;
     struct {
 	unsigned int before_sweep : 1;
@@ -670,17 +837,16 @@ struct heap_page {
     struct heap_page *free_next;
     RVALUE *start;
     RVALUE *freelist;
-    struct heap_page *next;
+    struct list_node page_node;
 
-#if USE_RGENGC
     bits_t wb_unprotected_bits[HEAP_PAGE_BITMAP_LIMIT];
-#endif
     /* the following three bitmaps are cleared at the beginning of full GC */
     bits_t mark_bits[HEAP_PAGE_BITMAP_LIMIT];
-#if USE_RGENGC
     bits_t uncollectible_bits[HEAP_PAGE_BITMAP_LIMIT];
     bits_t marking_bits[HEAP_PAGE_BITMAP_LIMIT];
-#endif
+
+    /* If set, the object is not movable */
+    bits_t pinned_bits[HEAP_PAGE_BITMAP_LIMIT];
 };
 
 #define GET_PAGE_BODY(x)   ((struct heap_page_body *)((bits_t)(x) & ~(HEAP_PAGE_ALIGN_MASK)))
@@ -699,20 +865,14 @@ struct heap_page {
 
 /* getting bitmap */
 #define GET_HEAP_MARK_BITS(x)           (&GET_HEAP_PAGE(x)->mark_bits[0])
-#if USE_RGENGC
+#define GET_HEAP_PINNED_BITS(x)         (&GET_HEAP_PAGE(x)->pinned_bits[0])
 #define GET_HEAP_UNCOLLECTIBLE_BITS(x)  (&GET_HEAP_PAGE(x)->uncollectible_bits[0])
 #define GET_HEAP_WB_UNPROTECTED_BITS(x) (&GET_HEAP_PAGE(x)->wb_unprotected_bits[0])
 #define GET_HEAP_MARKING_BITS(x)        (&GET_HEAP_PAGE(x)->marking_bits[0])
-#endif
 
 /* Aliases */
-#if defined(ENABLE_VM_OBJSPACE) && ENABLE_VM_OBJSPACE
 #define rb_objspace (*rb_objspace_of(GET_VM()))
 #define rb_objspace_of(vm) ((vm)->objspace)
-#else
-static rb_objspace_t rb_objspace = {{GC_MALLOC_LIMIT_MIN}};
-#define rb_objspace_of(vm) (&rb_objspace)
-#endif
 
 #define ruby_initial_gc_stress	gc_params.gc_stress
 
@@ -732,7 +892,6 @@ VALUE *ruby_initial_gc_stress_ptr = &ruby_initial_gc_stress;
 #define heap_pages_deferred_final	objspace->heap_pages.deferred_final
 #define heap_eden               (&objspace->eden_heap)
 #define heap_tomb               (&objspace->tomb_heap)
-#define dont_gc 		objspace->flags.dont_gc
 #define during_gc		objspace->flags.during_gc
 #define finalizing		objspace->atomic_flags.finalizing
 #define finalizer_table 	objspace->finalizer_table
@@ -745,6 +904,18 @@ VALUE *ruby_initial_gc_stress_ptr = &ruby_initial_gc_stress;
 #define stress_to_class         0
 #endif
 
+#if 0
+#define dont_gc_on()          (fprintf(stderr, "dont_gc_on@%s:%d\n",      __FILE__, __LINE__), objspace->flags.dont_gc = 1)
+#define dont_gc_off()         (fprintf(stderr, "dont_gc_off@%s:%d\n",     __FILE__, __LINE__), objspace->flags.dont_gc = 0)
+#define dont_gc_set(b)        (fprintf(stderr, "dont_gc_set(%d)@%s:%d\n", __FILE__, __LINE__), (int)b), objspace->flags.dont_gc = (b))
+#define dont_gc_val()         (objspace->flags.dont_gc)
+#else
+#define dont_gc_on()          (objspace->flags.dont_gc = 1)
+#define dont_gc_off()         (objspace->flags.dont_gc = 0)
+#define dont_gc_set(b)        (((int)b), objspace->flags.dont_gc = (b))
+#define dont_gc_val()         (objspace->flags.dont_gc)
+#endif
+
 static inline enum gc_mode
 gc_mode_verify(enum gc_mode mode)
 {
@@ -766,11 +937,7 @@ gc_mode_verify(enum gc_mode mode)
 
 #define is_marking(objspace)             (gc_mode(objspace) == gc_mode_marking)
 #define is_sweeping(objspace)            (gc_mode(objspace) == gc_mode_sweeping)
-#if USE_RGENGC
 #define is_full_marking(objspace)        ((objspace)->flags.during_minor_gc == FALSE)
-#else
-#define is_full_marking(objspace)        TRUE
-#endif
 #if GC_ENABLE_INCREMENTAL_MARK
 #define is_incremental_marking(objspace) ((objspace)->flags.during_incremental_marking != FALSE)
 #else
@@ -781,7 +948,7 @@ gc_mode_verify(enum gc_mode mode)
 #else
 #define will_be_incremental_marking(objspace) FALSE
 #endif
-#define has_sweeping_pages(heap)         ((heap)->sweep_pages != 0)
+#define has_sweeping_pages(heap)         ((heap)->sweeping_page != 0)
 #define is_lazy_sweeping(heap)           (GC_ENABLE_LAZY_SWEEP && has_sweeping_pages(heap))
 
 #if SIZEOF_LONG == SIZEOF_VOIDP
@@ -808,54 +975,67 @@ struct RZombie {
 
 #define nomem_error GET_VM()->special_exceptions[ruby_error_nomemory]
 
+#if RUBY_MARK_FREE_DEBUG
 int ruby_gc_debug_indent = 0;
+#endif
 VALUE rb_mGC;
 int ruby_disable_gc = 0;
+int ruby_enable_autocompact = 0;
 
 void rb_iseq_mark(const rb_iseq_t *iseq);
+void rb_iseq_update_references(rb_iseq_t *iseq);
 void rb_iseq_free(const rb_iseq_t *iseq);
+size_t rb_iseq_memsize(const rb_iseq_t *iseq);
+void rb_vm_update_references(void *ptr);
 
 void rb_gcdebug_print_obj_condition(VALUE obj);
 
-static void rb_objspace_call_finalizer(rb_objspace_t *objspace);
 static VALUE define_final0(VALUE obj, VALUE block);
 
-static void negative_size_allocation_error(const char *);
-static void *aligned_malloc(size_t, size_t);
-static void aligned_free(void *);
+NORETURN(static void *gc_vraise(void *ptr));
+NORETURN(static void gc_raise(VALUE exc, const char *fmt, ...));
+NORETURN(static void negative_size_allocation_error(const char *));
 
 static void init_mark_stack(mark_stack_t *stack);
 
 static int ready_to_gc(rb_objspace_t *objspace);
 
-static int garbage_collect(rb_objspace_t *, int full_mark, int immediate_mark, int immediate_sweep, int reason);
+static int garbage_collect(rb_objspace_t *, int reason);
 
-static int  gc_start(rb_objspace_t *objspace, const int full_mark, const int immediate_mark, const unsigned int immediate_sweep, int reason);
+static int  gc_start(rb_objspace_t *objspace, int reason);
 static void gc_rest(rb_objspace_t *objspace);
-static inline void gc_enter(rb_objspace_t *objspace, const char *event);
-static inline void gc_exit(rb_objspace_t *objspace, const char *event);
+
+enum gc_enter_event {
+    gc_enter_event_start,
+    gc_enter_event_mark_continue,
+    gc_enter_event_sweep_continue,
+    gc_enter_event_rest,
+    gc_enter_event_finalizer,
+    gc_enter_event_rb_memerror,
+};
+
+static inline void gc_enter(rb_objspace_t *objspace, enum gc_enter_event event, unsigned int *lock_lev);
+static inline void gc_exit(rb_objspace_t *objspace, enum gc_enter_event event, unsigned int *lock_lev);
 
 static void gc_marks(rb_objspace_t *objspace, int full_mark);
 static void gc_marks_start(rb_objspace_t *objspace, int full);
 static int  gc_marks_finish(rb_objspace_t *objspace);
 static void gc_marks_rest(rb_objspace_t *objspace);
-#if GC_ENABLE_INCREMENTAL_MARK
-static void gc_marks_step(rb_objspace_t *objspace, int slots);
+static void gc_marks_step(rb_objspace_t *objspace, size_t slots);
 static void gc_marks_continue(rb_objspace_t *objspace, rb_heap_t *heap);
-#endif
 
 static void gc_sweep(rb_objspace_t *objspace);
 static void gc_sweep_start(rb_objspace_t *objspace);
 static void gc_sweep_finish(rb_objspace_t *objspace);
 static int  gc_sweep_step(rb_objspace_t *objspace, rb_heap_t *heap);
 static void gc_sweep_rest(rb_objspace_t *objspace);
-#if GC_ENABLE_LAZY_SWEEP
 static void gc_sweep_continue(rb_objspace_t *objspace, rb_heap_t *heap);
-#endif
 
-static void gc_mark(rb_objspace_t *objspace, VALUE ptr);
+static inline void gc_mark(rb_objspace_t *objspace, VALUE ptr);
+static inline void gc_pin(rb_objspace_t *objspace, VALUE ptr);
+static inline void gc_mark_and_pin(rb_objspace_t *objspace, VALUE ptr);
 static void gc_mark_ptr(rb_objspace_t *objspace, VALUE ptr);
-static void gc_mark_maybe(rb_objspace_t *objspace, VALUE ptr);
+NO_SANITIZE("memory", static void gc_mark_maybe(rb_objspace_t *objspace, VALUE ptr));
 static void gc_mark_children(rb_objspace_t *objspace, VALUE ptr);
 
 static int gc_mark_stacked_objects_incremental(rb_objspace_t *, size_t count);
@@ -863,7 +1043,7 @@ static int gc_mark_stacked_objects_all(rb_objspace_t *);
 static void gc_grey(rb_objspace_t *objspace, VALUE ptr);
 
 static inline int gc_mark_set(rb_objspace_t *objspace, VALUE obj);
-static inline int is_pointer_to_heap(rb_objspace_t *objspace, void *ptr);
+NO_SANITIZE("memory", static inline int is_pointer_to_heap(rb_objspace_t *objspace, void *ptr));
 
 static void   push_mark_stack(mark_stack_t *, VALUE);
 static int    pop_mark_stack(mark_stack_t *, VALUE *);
@@ -871,11 +1051,12 @@ static size_t mark_stack_size(mark_stack_t *stack);
 static void   shrink_stack_chunk_cache(mark_stack_t *stack);
 
 static size_t obj_memsize_of(VALUE obj, int use_all_types);
-static VALUE gc_verify_internal_consistency(VALUE self);
+static void gc_verify_internal_consistency(rb_objspace_t *objspace);
 static int gc_verify_heap_page(rb_objspace_t *objspace, struct heap_page *page, VALUE obj);
 static int gc_verify_heap_pages(rb_objspace_t *objspace);
 
 static void gc_stress_set(rb_objspace_t *objspace, VALUE flag);
+static VALUE gc_disable_no_rest(rb_objspace_t *);
 
 static double getrusage_time(void);
 static inline void gc_prof_setup_new_record(rb_objspace_t *objspace, int reason);
@@ -888,23 +1069,26 @@ static inline void gc_prof_sweep_timer_stop(rb_objspace_t *);
 static inline void gc_prof_set_malloc_info(rb_objspace_t *);
 static inline void gc_prof_set_heap_info(rb_objspace_t *);
 
+#define TYPED_UPDATE_IF_MOVED(_objspace, _type, _thing) do { \
+    if (gc_object_moved_p(_objspace, (VALUE)_thing)) { \
+       *((_type *)(&_thing)) = (_type)RMOVED((_thing))->destination; \
+    } \
+} while (0)
+
+#define UPDATE_IF_MOVED(_objspace, _thing) TYPED_UPDATE_IF_MOVED(_objspace, VALUE, _thing)
+
 #define gc_prof_record(objspace) (objspace)->profile.current_record
 #define gc_prof_enabled(objspace) ((objspace)->profile.run && (objspace)->profile.current_record)
 
 #ifdef HAVE_VA_ARGS_MACRO
-# define gc_report(level, objspace, fmt, ...) \
-    if ((level) > RGENGC_DEBUG) {} else gc_report_body(level, objspace, fmt, ##__VA_ARGS__)
+# define gc_report(level, objspace, ...) \
+    if (!RGENGC_DEBUG_ENABLED(level)) {} else gc_report_body(level, objspace, __VA_ARGS__)
 #else
-# define gc_report if (!(RGENGC_DEBUG)) {} else gc_report_body
+# define gc_report if (!RGENGC_DEBUG_ENABLED(0)) {} else gc_report_body
 #endif
 PRINTF_ARGS(static void gc_report_body(int level, rb_objspace_t *objspace, const char *fmt, ...), 3, 4);
 static const char *obj_info(VALUE obj);
-
-#define PUSH_MARK_FUNC_DATA(v) do { \
-    struct mark_func_data_struct *prev_mark_func_data = objspace->mark_func_data; \
-    objspace->mark_func_data = (v);
-
-#define POP_MARK_FUNC_DATA() objspace->mark_func_data = prev_mark_func_data;} while (0)
+static const char *obj_type_name(VALUE obj);
 
 /*
  * 1 - TSC (H/W Time Stamp Counter)
@@ -958,6 +1142,19 @@ tick(void)
     return val;
 }
 
+#elif defined(__aarch64__) &&  defined(__GNUC__)
+typedef unsigned long tick_t;
+#define PRItick "lu"
+
+static __inline__ tick_t
+tick(void)
+{
+    unsigned long val;
+    __asm__ __volatile__ ("mrs %0, cntvct_el0", : "=r" (val));
+    return val;
+}
+
+
 #elif defined(_WIN32) && defined(_MSC_VER)
 #include <intrin.h>
 typedef unsigned __int64 tick_t;
@@ -1005,14 +1202,25 @@ tick(void)
 #define MEASURE_LINE(expr) expr
 #endif /* USE_TICK_T */
 
-#define FL_TEST2(x,f)         ((RGENGC_CHECK_MODE && SPECIAL_CONST_P(x)) ? (rb_bug("FL_TEST2: SPECIAL_CONST (%p)", (void *)(x)), 0) : FL_TEST_RAW((x),(f)) != 0)
-#define FL_SET2(x,f)          do {if (RGENGC_CHECK_MODE && SPECIAL_CONST_P(x)) rb_bug("FL_SET2: SPECIAL_CONST");   RBASIC(x)->flags |= (f);} while (0)
-#define FL_UNSET2(x,f)        do {if (RGENGC_CHECK_MODE && SPECIAL_CONST_P(x)) rb_bug("FL_UNSET2: SPECIAL_CONST"); RBASIC(x)->flags &= ~(f);} while (0)
+static inline void *
+asan_unpoison_object_temporary(VALUE obj)
+{
+    void *ptr = asan_poisoned_object_p(obj);
+    asan_unpoison_object(obj, false);
+    return ptr;
+}
+
+#define FL_CHECK2(name, x, pred) \
+    ((RGENGC_CHECK_MODE && SPECIAL_CONST_P(x)) ? \
+     (rb_bug(name": SPECIAL_CONST (%p)", (void *)(x)), 0) : (pred))
+#define FL_TEST2(x,f)  FL_CHECK2("FL_TEST2",  x, FL_TEST_RAW((x),(f)) != 0)
+#define FL_SET2(x,f)   FL_CHECK2("FL_SET2",   x, RBASIC(x)->flags |= (f))
+#define FL_UNSET2(x,f) FL_CHECK2("FL_UNSET2", x, RBASIC(x)->flags &= ~(f))
 
 #define RVALUE_MARK_BITMAP(obj)           MARKED_IN_BITMAP(GET_HEAP_MARK_BITS(obj), (obj))
+#define RVALUE_PIN_BITMAP(obj)            MARKED_IN_BITMAP(GET_HEAP_PINNED_BITS(obj), (obj))
 #define RVALUE_PAGE_MARKED(page, obj)     MARKED_IN_BITMAP((page)->mark_bits, (obj))
 
-#if USE_RGENGC
 #define RVALUE_WB_UNPROTECTED_BITMAP(obj) MARKED_IN_BITMAP(GET_HEAP_WB_UNPROTECTED_BITS(obj), (obj))
 #define RVALUE_UNCOLLECTIBLE_BITMAP(obj)  MARKED_IN_BITMAP(GET_HEAP_UNCOLLECTIBLE_BITS(obj), (obj))
 #define RVALUE_MARKING_BITMAP(obj)        MARKED_IN_BITMAP(GET_HEAP_MARKING_BITS(obj), (obj))
@@ -1025,6 +1233,7 @@ tick(void)
 #define RVALUE_AGE_SHIFT 5 /* FL_PROMOTED0 bit */
 
 static int rgengc_remembered(rb_objspace_t *objspace, VALUE obj);
+static int rgengc_remembered_sweep(rb_objspace_t *objspace, VALUE obj);
 static int rgengc_remember(rb_objspace_t *objspace, VALUE obj);
 static void rgengc_mark_and_rememberset_clear(rb_objspace_t *objspace, rb_heap_t *heap);
 static void rgengc_rememberset_mark(rb_objspace_t *objspace, rb_heap_t *heap);
@@ -1035,8 +1244,107 @@ RVALUE_FLAGS_AGE(VALUE flags)
     return (int)((flags & (FL_PROMOTED0 | FL_PROMOTED1)) >> RVALUE_AGE_SHIFT);
 }
 
-#endif /* USE_RGENGC */
+static int
+check_rvalue_consistency_force(const VALUE obj, int terminate)
+{
+    int err = 0;
+    rb_objspace_t *objspace = &rb_objspace;
+
+    RB_VM_LOCK_ENTER_NO_BARRIER();
+    {
+        if (SPECIAL_CONST_P(obj)) {
+            fprintf(stderr, "check_rvalue_consistency: %p is a special const.\n", (void *)obj);
+            err++;
+        }
+        else if (!is_pointer_to_heap(objspace, (void *)obj)) {
+            /* check if it is in tomb_pages */
+            struct heap_page *page = NULL;
+            list_for_each(&heap_tomb->pages, page, page_node) {
+                if (&page->start[0] <= (RVALUE *)obj &&
+                    (RVALUE *)obj < &page->start[page->total_slots]) {
+                    fprintf(stderr, "check_rvalue_consistency: %p is in a tomb_heap (%p).\n",
+                            (void *)obj, (void *)page);
+                    err++;
+                    goto skip;
+                }
+            }
+            bp();
+            fprintf(stderr, "check_rvalue_consistency: %p is not a Ruby object.\n", (void *)obj);
+            err++;
+          skip:
+            ;
+        }
+        else {
+            const int wb_unprotected_bit = RVALUE_WB_UNPROTECTED_BITMAP(obj) != 0;
+            const int uncollectible_bit = RVALUE_UNCOLLECTIBLE_BITMAP(obj) != 0;
+            const int mark_bit = RVALUE_MARK_BITMAP(obj) != 0;
+            const int marking_bit = RVALUE_MARKING_BITMAP(obj) != 0, remembered_bit = marking_bit;
+            const int age = RVALUE_FLAGS_AGE(RBASIC(obj)->flags);
+
+            if (GET_HEAP_PAGE(obj)->flags.in_tomb) {
+                fprintf(stderr, "check_rvalue_consistency: %s is in tomb page.\n", obj_info(obj));
+                err++;
+            }
+            if (BUILTIN_TYPE(obj) == T_NONE) {
+                fprintf(stderr, "check_rvalue_consistency: %s is T_NONE.\n", obj_info(obj));
+                err++;
+            }
+            if (BUILTIN_TYPE(obj) == T_ZOMBIE) {
+                fprintf(stderr, "check_rvalue_consistency: %s is T_ZOMBIE.\n", obj_info(obj));
+                err++;
+            }
 
+            obj_memsize_of((VALUE)obj, FALSE);
+
+            /* check generation
+             *
+             * OLD == age == 3 && old-bitmap && mark-bit (except incremental marking)
+             */
+            if (age > 0 && wb_unprotected_bit) {
+                fprintf(stderr, "check_rvalue_consistency: %s is not WB protected, but age is %d > 0.\n", obj_info(obj), age);
+                err++;
+            }
+
+            if (!is_marking(objspace) && uncollectible_bit && !mark_bit) {
+                fprintf(stderr, "check_rvalue_consistency: %s is uncollectible, but is not marked while !gc.\n", obj_info(obj));
+                err++;
+            }
+
+            if (!is_full_marking(objspace)) {
+                if (uncollectible_bit && age != RVALUE_OLD_AGE && !wb_unprotected_bit) {
+                    fprintf(stderr, "check_rvalue_consistency: %s is uncollectible, but not old (age: %d) and not WB unprotected.\n",
+                            obj_info(obj), age);
+                    err++;
+                }
+                if (remembered_bit && age != RVALUE_OLD_AGE) {
+                    fprintf(stderr, "check_rvalue_consistency: %s is remembered, but not old (age: %d).\n",
+                            obj_info(obj), age);
+                    err++;
+                }
+            }
+
+            /*
+             * check coloring
+             *
+             *               marking:false marking:true
+             * marked:false  white         *invalid*
+             * marked:true   black         grey
+             */
+            if (is_incremental_marking(objspace) && marking_bit) {
+                if (!is_marking(objspace) && !mark_bit) {
+                    fprintf(stderr, "check_rvalue_consistency: %s is marking, but not marked.\n", obj_info(obj));
+                    err++;
+                }
+            }
+        }
+    }
+    RB_VM_LOCK_LEAVE_NO_BARRIER();
+
+    if (err > 0 && terminate) {
+        rb_bug("check_rvalue_consistency_force: there is %d errors.", err);
+    }
+    return err;
+}
 
 #if RGENGC_CHECK_MODE == 0
 static inline VALUE
@@ -1048,60 +1356,30 @@ check_rvalue_consistency(const VALUE obj)
 static VALUE
 check_rvalue_consistency(const VALUE obj)
 {
-    rb_objspace_t *objspace = &rb_objspace;
+    check_rvalue_consistency_force(obj, TRUE);
+    return obj;
+}
+#endif
 
-    if (SPECIAL_CONST_P(obj)) {
-	rb_bug("check_rvalue_consistency: %p is a special const.", (void *)obj);
-    }
-    else if (!is_pointer_to_heap(objspace, (void *)obj)) {
-	rb_bug("check_rvalue_consistency: %p is not a Ruby object.", (void *)obj);
+static inline int
+gc_object_moved_p(rb_objspace_t * objspace, VALUE obj)
+{
+    if (RB_SPECIAL_CONST_P(obj)) {
+        return FALSE;
     }
     else {
-	const int wb_unprotected_bit = RVALUE_WB_UNPROTECTED_BITMAP(obj) != 0;
-	const int uncollectible_bit = RVALUE_UNCOLLECTIBLE_BITMAP(obj) != 0;
-	const int mark_bit = RVALUE_MARK_BITMAP(obj) != 0;
-	const int marking_bit = RVALUE_MARKING_BITMAP(obj) != 0, remembered_bit = marking_bit;
-	const int age = RVALUE_FLAGS_AGE(RBASIC(obj)->flags);
-
-	if (BUILTIN_TYPE(obj) == T_NONE)   rb_bug("check_rvalue_consistency: %s is T_NONE", obj_info(obj));
-	if (BUILTIN_TYPE(obj) == T_ZOMBIE) rb_bug("check_rvalue_consistency: %s is T_ZOMBIE", obj_info(obj));
-	obj_memsize_of((VALUE)obj, FALSE);
-
-	/* check generation
-	 *
-	 * OLD == age == 3 && old-bitmap && mark-bit (except incremental marking)
-	 */
-	if (age > 0 && wb_unprotected_bit) {
-	    rb_bug("check_rvalue_consistency: %s is not WB protected, but age is %d > 0.", obj_info(obj), age);
-	}
-
-	if (!is_marking(objspace) && uncollectible_bit && !mark_bit) {
-	    rb_bug("check_rvalue_consistency: %s is uncollectible, but is not marked while !gc.", obj_info(obj));
-	}
-
-	if (!is_full_marking(objspace)) {
-	    if (uncollectible_bit && age != RVALUE_OLD_AGE && !wb_unprotected_bit) {
-		rb_bug("check_rvalue_consistency: %s is uncollectible, but not old (age: %d) and not WB unprotected.", obj_info(obj), age);
-	    }
-	    if (remembered_bit && age != RVALUE_OLD_AGE) {
-		rb_bug("check_rvalue_consistency: %s is rememberd, but not old (age: %d).", obj_info(obj), age);
-	    }
-	}
-
-	/*
-	 * check coloring
-	 *
-	 *               marking:false marking:true
-	 * marked:false  white         *invalid*
-	 * marked:true   black         grey
-	 */
-	if (is_incremental_marking(objspace) && marking_bit) {
-	    if (!is_marking(objspace) && !mark_bit) rb_bug("check_rvalue_consistency: %s is marking, but not marked.", obj_info(obj));
-	}
+        void *poisoned = asan_poisoned_object_p(obj);
+        asan_unpoison_object(obj, false);
+
+        int ret =  BUILTIN_TYPE(obj) == T_MOVED;
+        /* Re-poison slot if it's not the one we want */
+        if (poisoned) {
+            GC_ASSERT(BUILTIN_TYPE(obj) == T_NONE);
+            asan_poison_object(obj);
+        }
+        return ret;
     }
-    return obj;
 }
-#endif
 
 static inline int
 RVALUE_MARKED(VALUE obj)
@@ -1110,7 +1388,13 @@ RVALUE_MARKED(VALUE obj)
     return RVALUE_MARK_BITMAP(obj) != 0;
 }
 
-#if USE_RGENGC
+static inline int
+RVALUE_PINNED(VALUE obj)
+{
+    check_rvalue_consistency(obj);
+    return RVALUE_PIN_BITMAP(obj) != 0;
+}
+
 static inline int
 RVALUE_WB_UNPROTECTED(VALUE obj)
 {
@@ -1167,6 +1451,7 @@ RVALUE_PAGE_OLD_UNCOLLECTIBLE_SET(rb_objspace_t *objspace, struct heap_page *pag
 {
     MARK_IN_BITMAP(&page->uncollectible_bits[0], obj);
     objspace->rgengc.old_objects++;
+    rb_transient_heap_promote(obj);
 
 #if RGENGC_PROFILE >= 2
     objspace->profile.total_promoted_count++;
@@ -1177,6 +1462,7 @@ RVALUE_PAGE_OLD_UNCOLLECTIBLE_SET(rb_objspace_t *objspace, struct heap_page *pag
 static inline void
 RVALUE_OLD_UNCOLLECTIBLE_SET(rb_objspace_t *objspace, VALUE obj)
 {
+    RB_DEBUG_COUNTER_INC(obj_promote);
     RVALUE_PAGE_OLD_UNCOLLECTIBLE_SET(objspace, GET_HEAP_PAGE(obj), obj);
 }
 
@@ -1213,7 +1499,7 @@ static inline void
 RVALUE_AGE_SET_OLD(rb_objspace_t *objspace, VALUE obj)
 {
     check_rvalue_consistency(obj);
-    if (RGENGC_CHECK_MODE) assert(!RVALUE_OLD_P(obj));
+    GC_ASSERT(!RVALUE_OLD_P(obj));
 
     RBASIC(obj)->flags = RVALUE_FLAGS_AGE_SET(RBASIC(obj)->flags, RVALUE_OLD_AGE);
     RVALUE_OLD_UNCOLLECTIBLE_SET(objspace, obj);
@@ -1226,7 +1512,7 @@ static inline void
 RVALUE_AGE_SET_CANDIDATE(rb_objspace_t *objspace, VALUE obj)
 {
     check_rvalue_consistency(obj);
-    if (RGENGC_CHECK_MODE) assert(!RVALUE_OLD_P(obj));
+    GC_ASSERT(!RVALUE_OLD_P(obj));
 
     RBASIC(obj)->flags = RVALUE_FLAGS_AGE_SET(RBASIC(obj)->flags, RVALUE_OLD_AGE - 1);
 
@@ -1244,7 +1530,7 @@ static inline void
 RVALUE_DEMOTE(rb_objspace_t *objspace, VALUE obj)
 {
     check_rvalue_consistency(obj);
-    if (RGENGC_CHECK_MODE) assert(RVALUE_OLD_P(obj));
+    GC_ASSERT(RVALUE_OLD_P(obj));
 
     if (!is_incremental_marking(objspace) && RVALUE_REMEMBERED(obj)) {
 	CLEAR_IN_BITMAP(GET_HEAP_MARKING_BITS(obj), obj);
@@ -1269,7 +1555,8 @@ static inline void
 RVALUE_AGE_RESET(VALUE obj)
 {
     check_rvalue_consistency(obj);
-    if (RGENGC_CHECK_MODE) assert(!RVALUE_OLD_P(obj));
+    GC_ASSERT(!RVALUE_OLD_P(obj));
+
     RVALUE_AGE_RESET_RAW(obj);
     check_rvalue_consistency(obj);
 }
@@ -1294,21 +1581,24 @@ RVALUE_WHITE_P(VALUE obj)
     return RVALUE_MARKED(obj) == FALSE;
 }
 
-#endif /* USE_RGENGC */
-
 /*
   --------------------------- ObjectSpace -----------------------------
 */
 
+static inline void *
+calloc1(size_t n)
+{
+    return calloc(1, n);
+}
+
 rb_objspace_t *
 rb_objspace_alloc(void)
 {
-#if defined(ENABLE_VM_OBJSPACE) && ENABLE_VM_OBJSPACE
-    rb_objspace_t *objspace = calloc(1, sizeof(rb_objspace_t));
-#else
-    rb_objspace_t *objspace = &rb_objspace;
-#endif
+    rb_objspace_t *objspace = calloc1(sizeof(rb_objspace_t));
     malloc_limit = gc_params.malloc_limit_min;
+    list_head_init(&objspace->eden_heap.pages);
+    list_head_init(&objspace->tomb_heap.pages);
+    dont_gc_on();
 
     return objspace;
 }
@@ -1347,102 +1637,137 @@ rb_objspace_free(rb_objspace_t *objspace)
 
 	objspace->eden_heap.total_pages = 0;
 	objspace->eden_heap.total_slots = 0;
-	objspace->eden_heap.pages = NULL;
     }
+    st_free_table(objspace->id_to_obj_tbl);
+    st_free_table(objspace->obj_to_id_tbl);
     free_stack_chunks(&objspace->mark_stack);
-#if !(defined(ENABLE_VM_OBJSPACE) && ENABLE_VM_OBJSPACE)
-    if (objspace == &rb_objspace) return;
-#endif
     free(objspace);
 }
 
 static void
+heap_pages_expand_sorted_to(rb_objspace_t *objspace, size_t next_length)
+{
+    struct heap_page **sorted;
+    size_t size = size_mul_or_raise(next_length, sizeof(struct heap_page *), rb_eRuntimeError);
+
+    gc_report(3, objspace, "heap_pages_expand_sorted: next_length: %"PRIdSIZE", size: %"PRIdSIZE"\n",
+              next_length, size);
+
+    if (heap_pages_sorted_length > 0) {
+	sorted = (struct heap_page **)realloc(heap_pages_sorted, size);
+	if (sorted) heap_pages_sorted = sorted;
+    }
+    else {
+	sorted = heap_pages_sorted = (struct heap_page **)malloc(size);
+    }
+
+    if (sorted == 0) {
+	rb_memerror();
+    }
+
+    heap_pages_sorted_length = next_length;
+}
+
+static void
 heap_pages_expand_sorted(rb_objspace_t *objspace)
 {
+    /* usually heap_allocatable_pages + heap_eden->total_pages == heap_pages_sorted_length
+     * because heap_allocatable_pages contains heap_tomb->total_pages (recycle heap_tomb pages).
+     * however, if there are pages which do not have empty slots, then try to create new pages
+     * so that the additional allocatable_pages counts (heap_tomb->total_pages) are added.
+     */
     size_t next_length = heap_allocatable_pages;
     next_length += heap_eden->total_pages;
     next_length += heap_tomb->total_pages;
 
     if (next_length > heap_pages_sorted_length) {
-	struct heap_page **sorted;
-	size_t size = next_length * sizeof(struct heap_page *);
-
-	gc_report(3, objspace, "heap_pages_expand_sorted: next_length: %d, size: %d\n", (int)next_length, (int)size);
-
-	if (heap_pages_sorted_length > 0) {
-	    sorted = (struct heap_page **)realloc(heap_pages_sorted, size);
-	    if (sorted) heap_pages_sorted = sorted;
-	}
-	else {
-	    sorted = heap_pages_sorted = (struct heap_page **)malloc(size);
-	}
+	heap_pages_expand_sorted_to(objspace, next_length);
+    }
 
-	if (sorted == 0) {
-	    rb_memerror();
-	}
+    GC_ASSERT(heap_allocatable_pages + heap_eden->total_pages <= heap_pages_sorted_length);
+    GC_ASSERT(heap_allocated_pages <= heap_pages_sorted_length);
+}
 
-	heap_pages_sorted_length = next_length;
-    }
+static void
+heap_allocatable_pages_set(rb_objspace_t *objspace, size_t s)
+{
+    heap_allocatable_pages = s;
+    heap_pages_expand_sorted(objspace);
 }
 
 static inline void
 heap_page_add_freeobj(rb_objspace_t *objspace, struct heap_page *page, VALUE obj)
 {
+    ASSERT_vm_locking();
+
     RVALUE *p = (RVALUE *)obj;
+
+    asan_unpoison_memory_region(&page->freelist, sizeof(RVALUE*), false);
+
     p->as.free.flags = 0;
     p->as.free.next = page->freelist;
     page->freelist = p;
+    asan_poison_memory_region(&page->freelist, sizeof(RVALUE*));
 
-    if (RGENGC_CHECK_MODE && !is_pointer_to_heap(objspace, p)) {
-	rb_bug("heap_page_add_freeobj: %p is not rvalue.", p);
+    if (RGENGC_CHECK_MODE &&
+        /* obj should belong to page */
+        !(&page->start[0] <= (RVALUE *)obj &&
+          (RVALUE *)obj   <  &page->start[page->total_slots] &&
+          obj % sizeof(RVALUE) == 0)) {
+        rb_bug("heap_page_add_freeobj: %p is not rvalue.", (void *)p);
     }
 
+    asan_poison_object(obj);
     gc_report(3, objspace, "heap_page_add_freeobj: add %p to freelist\n", (void *)obj);
 }
 
 static inline void
-heap_add_freepage(rb_objspace_t *objspace, rb_heap_t *heap, struct heap_page *page)
+heap_add_freepage(rb_heap_t *heap, struct heap_page *page)
 {
-    if (page->freelist) {
-	page->free_next = heap->free_pages;
-	heap->free_pages = page;
-    }
+    asan_unpoison_memory_region(&page->freelist, sizeof(RVALUE*), false);
+    GC_ASSERT(page->free_slots != 0);
+    GC_ASSERT(page->freelist != NULL);
+
+    page->free_next = heap->free_pages;
+    heap->free_pages = page;
+
+    RUBY_DEBUG_LOG("page:%p freelist:%p", page, page->freelist);
+
+    asan_poison_memory_region(&page->freelist, sizeof(RVALUE*));
 }
 
 #if GC_ENABLE_INCREMENTAL_MARK
-static inline int
+static inline void
 heap_add_poolpage(rb_objspace_t *objspace, rb_heap_t *heap, struct heap_page *page)
 {
-    if (page->freelist) {
-	page->free_next = heap->pooled_pages;
-	heap->pooled_pages = page;
-	objspace->rincgc.pooled_slots += page->free_slots;
-	return TRUE;
-    }
-    else {
-	return FALSE;
-    }
+    asan_unpoison_memory_region(&page->freelist, sizeof(RVALUE*), false);
+    GC_ASSERT(page->free_slots != 0);
+    GC_ASSERT(page->freelist != NULL);
+
+    page->free_next = heap->pooled_pages;
+    heap->pooled_pages = page;
+    objspace->rincgc.pooled_slots += page->free_slots;
+
+    asan_poison_memory_region(&page->freelist, sizeof(RVALUE*));
 }
 #endif
 
 static void
 heap_unlink_page(rb_objspace_t *objspace, rb_heap_t *heap, struct heap_page *page)
 {
-    if (page->prev) page->prev->next = page->next;
-    if (page->next) page->next->prev = page->prev;
-    if (heap->pages == page) heap->pages = page->next;
-    page->prev = NULL;
-    page->next = NULL;
+    list_del(&page->page_node);
     heap->total_pages--;
     heap->total_slots -= page->total_slots;
 }
 
+static void rb_aligned_free(void *ptr);
+
 static void
 heap_page_free(rb_objspace_t *objspace, struct heap_page *page)
 {
     heap_allocated_pages--;
     objspace->profile.total_freed_pages++;
-    aligned_free(GET_PAGE_BODY(page->start));
+    rb_aligned_free(GET_PAGE_BODY(page->start));
     free(page);
 }
 
@@ -1451,7 +1776,7 @@ heap_pages_free_unused_pages(rb_objspace_t *objspace)
 {
     size_t i, j;
 
-    if (heap_tomb->pages) {
+    if (!list_empty(&heap_tomb->pages)) {
 	for (i = j = 1; j < heap_allocated_pages; i++) {
 	    struct heap_page *page = heap_pages_sorted[i];
 
@@ -1466,7 +1791,13 @@ heap_pages_free_unused_pages(rb_objspace_t *objspace)
 		j++;
 	    }
 	}
-	if (RGENGC_CHECK_MODE) assert(j == heap_allocated_pages);
+
+        struct heap_page *hipage = heap_pages_sorted[heap_allocated_pages - 1];
+        RVALUE *himem = hipage->start + hipage->total_slots;
+        GC_ASSERT(himem <= heap_pages_himem);
+        heap_pages_himem = himem;
+
+	GC_ASSERT(j == heap_allocated_pages);
     }
 }
 
@@ -1480,15 +1811,15 @@ heap_page_allocate(rb_objspace_t *objspace)
     int limit = HEAP_PAGE_OBJ_LIMIT;
 
     /* assign heap_page body (contains heap_page_header and RVALUEs) */
-    page_body = (struct heap_page_body *)aligned_malloc(HEAP_PAGE_ALIGN, HEAP_PAGE_SIZE);
+    page_body = (struct heap_page_body *)rb_aligned_malloc(HEAP_PAGE_ALIGN, HEAP_PAGE_SIZE);
     if (page_body == 0) {
 	rb_memerror();
     }
 
     /* assign heap_page entry */
-    page = (struct heap_page *)calloc(1, sizeof(struct heap_page));
+    page = calloc1(sizeof(struct heap_page));
     if (page == 0) {
-	aligned_free(page_body);
+        rb_aligned_free(page_body);
 	rb_memerror();
     }
 
@@ -1519,6 +1850,7 @@ heap_page_allocate(rb_objspace_t *objspace)
 	    rb_bug("same heap page is allocated: %p at %"PRIuVALUE, (void *)page_body, (VALUE)mid);
 	}
     }
+
     if (hi < heap_allocated_pages) {
 	MEMMOVE(&heap_pages_sorted[hi+1], &heap_pages_sorted[hi], struct heap_page_header*, heap_allocated_pages - hi);
     }
@@ -1526,9 +1858,17 @@ heap_page_allocate(rb_objspace_t *objspace)
     heap_pages_sorted[hi] = page;
 
     heap_allocated_pages++;
+
+    GC_ASSERT(heap_eden->total_pages + heap_allocatable_pages <= heap_pages_sorted_length);
+    GC_ASSERT(heap_eden->total_pages + heap_tomb->total_pages == heap_allocated_pages - 1);
+    GC_ASSERT(heap_allocated_pages <= heap_pages_sorted_length);
+
     objspace->profile.total_allocated_pages++;
 
-    if (RGENGC_CHECK_MODE) assert(heap_allocated_pages <= heap_pages_sorted_length);
+    if (heap_allocated_pages > heap_pages_sorted_length) {
+	rb_bug("heap_page_allocate: allocated(%"PRIdSIZE") > sorted(%"PRIdSIZE")",
+	       heap_allocated_pages, heap_pages_sorted_length);
+    }
 
     if (heap_pages_lomem == 0 || heap_pages_lomem > start) heap_pages_lomem = start;
     if (heap_pages_himem < end) heap_pages_himem = end;
@@ -1538,47 +1878,61 @@ heap_page_allocate(rb_objspace_t *objspace)
     page_body->header.page = page;
 
     for (p = start; p != end; p++) {
-	gc_report(3, objspace, "assign_heap_page: %p is added to freelist\n", p);
+	gc_report(3, objspace, "assign_heap_page: %p is added to freelist\n", (void *)p);
 	heap_page_add_freeobj(objspace, page, (VALUE)p);
     }
     page->free_slots = limit;
 
+    asan_poison_memory_region(&page->freelist, sizeof(RVALUE*));
     return page;
 }
 
 static struct heap_page *
 heap_page_resurrect(rb_objspace_t *objspace)
 {
-    struct heap_page *page;
+    struct heap_page *page = 0, *next;
 
-    if ((page = heap_tomb->pages) != NULL) {
-	heap_unlink_page(objspace, heap_tomb, page);
-	return page;
+    list_for_each_safe(&heap_tomb->pages, page, next, page_node) {
+        asan_unpoison_memory_region(&page->freelist, sizeof(RVALUE*), false);
+	if (page->freelist != NULL) {
+	    heap_unlink_page(objspace, heap_tomb, page);
+            asan_poison_memory_region(&page->freelist, sizeof(RVALUE*));
+	    return page;
+	}
     }
+
     return NULL;
 }
 
 static struct heap_page *
 heap_page_create(rb_objspace_t *objspace)
 {
-    struct heap_page *page = heap_page_resurrect(objspace);
+    struct heap_page *page;
     const char *method = "recycle";
+
+    heap_allocatable_pages--;
+
+    page = heap_page_resurrect(objspace);
+
     if (page == NULL) {
 	page = heap_page_allocate(objspace);
 	method = "allocate";
     }
-    if (0) fprintf(stderr, "heap_page_create: %s - %p, heap_allocated_pages: %d, heap_allocated_pages: %d, tomb->total_pages: %d\n",
-		   method, page, (int)heap_pages_sorted_length, (int)heap_allocated_pages, (int)heap_tomb->total_pages);
+    if (0) fprintf(stderr, "heap_page_create: %s - %p, "
+                   "heap_allocated_pages: %"PRIdSIZE", "
+                   "heap_allocated_pages: %"PRIdSIZE", "
+                   "tomb->total_pages: %"PRIdSIZE"\n",
+                   method, (void *)page, heap_pages_sorted_length, heap_allocated_pages, heap_tomb->total_pages);
     return page;
 }
 
 static void
 heap_add_page(rb_objspace_t *objspace, rb_heap_t *heap, struct heap_page *page)
 {
+    /* Adding to eden heap during incremental sweeping is forbidden */
+    GC_ASSERT(!(heap == heap_eden && heap->sweeping_page));
     page->flags.in_tomb = (heap == heap_tomb);
-    page->next = heap->pages;
-    if (heap->pages) heap->pages->prev = page;
-    heap->pages = page;
+    list_add_tail(&heap->pages, &page->page_node);
     heap->total_pages++;
     heap->total_slots += page->total_slots;
 }
@@ -1588,7 +1942,7 @@ heap_assign_page(rb_objspace_t *objspace, rb_heap_t *heap)
 {
     struct heap_page *page = heap_page_create(objspace);
     heap_add_page(objspace, heap, page);
-    heap_add_freepage(objspace, heap, page);
+    heap_add_freepage(heap, page);
 }
 
 static void
@@ -1596,12 +1950,13 @@ heap_add_pages(rb_objspace_t *objspace, rb_heap_t *heap, size_t add)
 {
     size_t i;
 
-    heap_allocatable_pages = add;
-    heap_pages_expand_sorted(objspace);
+    heap_allocatable_pages_set(objspace, add);
+
     for (i = 0; i < add; i++) {
 	heap_assign_page(objspace, heap);
     }
-    heap_allocatable_pages = 0;
+
+    GC_ASSERT(heap_allocatable_pages == 0);
 }
 
 static size_t
@@ -1627,9 +1982,9 @@ heap_extend_pages(rb_objspace_t *objspace, size_t free_slots, size_t total_slots
 
 	if (0) {
 	    fprintf(stderr,
-		    "free_slots(%8"PRIdSIZE")/total_slots(%8"PRIdSIZE")=%1.2f,"
+		    "free_slots(%8"PRIuSIZE")/total_slots(%8"PRIuSIZE")=%1.2f,"
 		    " G(%1.2f), f(%1.2f),"
-		    " used(%8"PRIdSIZE") => next_used(%8"PRIdSIZE")\n",
+		    " used(%8"PRIuSIZE") => next_used(%8"PRIuSIZE")\n",
 		    free_slots, total_slots, free_slots/(double)total_slots,
 		    goal_ratio, f, used, next_used);
 	}
@@ -1651,19 +2006,23 @@ heap_set_increment(rb_objspace_t *objspace, size_t additional_pages)
 
     if (next_used_limit == heap_allocated_pages) next_used_limit++;
 
-    heap_allocatable_pages = next_used_limit - used;
-    heap_pages_expand_sorted(objspace);
+    heap_allocatable_pages_set(objspace, next_used_limit - used);
 
-    gc_report(1, objspace, "heap_set_increment: heap_allocatable_pages is %d\n", (int)heap_allocatable_pages);
+    gc_report(1, objspace, "heap_set_increment: heap_allocatable_pages is %"PRIdSIZE"\n",
+              heap_allocatable_pages);
 }
 
 static int
 heap_increment(rb_objspace_t *objspace, rb_heap_t *heap)
 {
     if (heap_allocatable_pages > 0) {
-	gc_report(1, objspace, "heap_increment: heap_pages_sorted_length: %d, heap_pages_inc: %d, heap->total_pages: %d\n",
-		  (int)heap_pages_sorted_length, (int)heap_allocatable_pages, (int)heap->total_pages);
-	heap_allocatable_pages--;
+	gc_report(1, objspace, "heap_increment: heap_pages_sorted_length: %"PRIdSIZE", "
+                  "heap_pages_inc: %"PRIdSIZE", heap->total_pages: %"PRIdSIZE"\n",
+		  heap_pages_sorted_length, heap_allocatable_pages, heap->total_pages);
+
+	GC_ASSERT(heap_allocatable_pages + heap_eden->total_pages <= heap_pages_sorted_length);
+	GC_ASSERT(heap_allocated_pages <= heap_pages_sorted_length);
+
 	heap_assign_page(objspace, heap);
 	return TRUE;
     }
@@ -1673,72 +2032,22 @@ heap_increment(rb_objspace_t *objspace, rb_heap_t *heap)
 static void
 heap_prepare(rb_objspace_t *objspace, rb_heap_t *heap)
 {
-    if (RGENGC_CHECK_MODE) assert(heap->free_pages == NULL);
+    GC_ASSERT(heap->free_pages == NULL);
 
-#if GC_ENABLE_LAZY_SWEEP
     if (is_lazy_sweeping(heap)) {
 	gc_sweep_continue(objspace, heap);
     }
-#endif
-#if GC_ENABLE_INCREMENTAL_MARK
     else if (is_incremental_marking(objspace)) {
 	gc_marks_continue(objspace, heap);
     }
-#endif
 
     if (heap->free_pages == NULL &&
 	(will_be_incremental_marking(objspace) || heap_increment(objspace, heap) == FALSE) &&
-	gc_start(objspace, FALSE, FALSE, FALSE, GPR_FLAG_NEWOBJ) == FALSE) {
+	gc_start(objspace, GPR_FLAG_NEWOBJ) == FALSE) {
 	rb_memerror();
     }
 }
 
-static RVALUE *
-heap_get_freeobj_from_next_freepage(rb_objspace_t *objspace, rb_heap_t *heap)
-{
-    struct heap_page *page;
-    RVALUE *p;
-
-    while (heap->free_pages == NULL) {
-	heap_prepare(objspace, heap);
-    }
-    page = heap->free_pages;
-    heap->free_pages = page->free_next;
-    heap->using_page = page;
-
-    if (RGENGC_CHECK_MODE) assert(page->free_slots != 0);
-    p = page->freelist;
-    page->freelist = NULL;
-    page->free_slots = 0;
-    return p;
-}
-
-static inline VALUE
-heap_get_freeobj_head(rb_objspace_t *objspace, rb_heap_t *heap)
-{
-    RVALUE *p = heap->freelist;
-    if (LIKELY(p != NULL)) {
-	heap->freelist = p->as.free.next;
-    }
-    return (VALUE)p;
-}
-
-static inline VALUE
-heap_get_freeobj(rb_objspace_t *objspace, rb_heap_t *heap)
-{
-    RVALUE *p = heap->freelist;
-
-    while (1) {
-	if (LIKELY(p != NULL)) {
-	    heap->freelist = p->as.free.next;
-	    return (VALUE)p;
-	}
-	else {
-	    p = heap_get_freeobj_from_next_freepage(objspace, heap);
-	}
-    }
-}
-
 void
 rb_objspace_set_event_hook(const rb_event_flag_t event)
 {
@@ -1748,184 +2057,308 @@ rb_objspace_set_event_hook(const rb_event_flag_t event)
 }
 
 static void
-gc_event_hook_body(rb_thread_t *th, rb_objspace_t *objspace, const rb_event_flag_t event, VALUE data)
+gc_event_hook_body(rb_execution_context_t *ec, rb_objspace_t *objspace, const rb_event_flag_t event, VALUE data)
 {
-    EXEC_EVENT_HOOK(th, event, th->cfp->self, 0, 0, data);
+    const VALUE *pc = ec->cfp->pc;
+    if (pc && VM_FRAME_RUBYFRAME_P(ec->cfp)) {
+        /* increment PC because source line is calculated with PC-1 */
+        ec->cfp->pc++;
+    }
+    EXEC_EVENT_HOOK(ec, event, ec->cfp->self, 0, 0, 0, data);
+    ec->cfp->pc = pc;
 }
 
 #define gc_event_hook_available_p(objspace) ((objspace)->flags.has_hook)
 #define gc_event_hook_needed_p(objspace, event) ((objspace)->hook_events & (event))
 
-#define gc_event_hook(objspace, event, data) do { \
+#define gc_event_hook_prep(objspace, event, data, prep) do { \
     if (UNLIKELY(gc_event_hook_needed_p(objspace, event))) { \
-	gc_event_hook_body(GET_THREAD(), (objspace), (event), (data)); \
+        prep; \
+	gc_event_hook_body(GET_EC(), (objspace), (event), (data)); \
     } \
 } while (0)
 
+#define gc_event_hook(objspace, event, data) gc_event_hook_prep(objspace, event, data, (void)0)
+
 static inline VALUE
-newobj_init(VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, int wb_protected, rb_objspace_t *objspace, VALUE obj)
+newobj_init(VALUE klass, VALUE flags, int wb_protected, rb_objspace_t *objspace, VALUE obj)
 {
-    if (RGENGC_CHECK_MODE > 0) {
-	assert(BUILTIN_TYPE(obj) == T_NONE);
-	assert((flags & FL_WB_PROTECTED) == 0);
-    }
+#if !__has_feature(memory_sanitizer)
+    GC_ASSERT(BUILTIN_TYPE(obj) == T_NONE);
+    GC_ASSERT((flags & FL_WB_PROTECTED) == 0);
+#endif
+    RVALUE *p = RANY(obj);
+    p->as.basic.flags = flags;
+    *((VALUE *)&p->as.basic.klass) = klass;
 
-    /* OBJSETUP */
-    RBASIC(obj)->flags = flags;
-    RBASIC_SET_CLASS_RAW(obj, klass);
-    RANY(obj)->as.values.v1 = v1;
-    RANY(obj)->as.values.v2 = v2;
-    RANY(obj)->as.values.v3 = v3;
+#if RACTOR_CHECK_MODE
+    rb_ractor_setup_belonging(obj);
+#endif
 
 #if RGENGC_CHECK_MODE
-    assert(RVALUE_MARKED(obj) == FALSE);
-    assert(RVALUE_MARKING(obj) == FALSE);
-    assert(RVALUE_OLD_P(obj) == FALSE);
-    assert(RVALUE_WB_UNPROTECTED(obj) == FALSE);
+    p->as.values.v1 = p->as.values.v2 = p->as.values.v3 = 0;
 
-    if (flags & FL_PROMOTED1) {
-	if (RVALUE_AGE(obj) != 2) rb_bug("newobj: %s of age (%d) != 2.", obj_info(obj), RVALUE_AGE(obj));
-    }
-    else {
-	if (RVALUE_AGE(obj) > 0) rb_bug("newobj: %s of age (%d) > 0.", obj_info(obj), RVALUE_AGE(obj));
+    RB_VM_LOCK_ENTER_NO_BARRIER();
+    {
+        check_rvalue_consistency(obj);
+
+        GC_ASSERT(RVALUE_MARKED(obj) == FALSE);
+        GC_ASSERT(RVALUE_MARKING(obj) == FALSE);
+        GC_ASSERT(RVALUE_OLD_P(obj) == FALSE);
+        GC_ASSERT(RVALUE_WB_UNPROTECTED(obj) == FALSE);
+
+        if (flags & FL_PROMOTED1) {
+            if (RVALUE_AGE(obj) != 2) rb_bug("newobj: %s of age (%d) != 2.", obj_info(obj), RVALUE_AGE(obj));
+        }
+        else {
+            if (RVALUE_AGE(obj) > 0) rb_bug("newobj: %s of age (%d) > 0.", obj_info(obj), RVALUE_AGE(obj));
+        }
+        if (rgengc_remembered(objspace, (VALUE)obj)) rb_bug("newobj: %s is remembered.", obj_info(obj));
     }
-    if (rgengc_remembered(objspace, (VALUE)obj)) rb_bug("newobj: %s is remembered.", obj_info(obj));
+    RB_VM_LOCK_LEAVE_NO_BARRIER();
 #endif
 
-#if USE_RGENGC
     if (UNLIKELY(wb_protected == FALSE)) {
-	MARK_IN_BITMAP(GET_HEAP_WB_UNPROTECTED_BITS(obj), obj);
+        ASSERT_vm_locking();
+        MARK_IN_BITMAP(GET_HEAP_WB_UNPROTECTED_BITS(obj), obj);
     }
-#endif
+
+    // TODO: make it atomic, or ractor local
+    objspace->total_allocated_objects++;
 
 #if RGENGC_PROFILE
     if (wb_protected) {
-	objspace->profile.total_generated_normal_object_count++;
+        objspace->profile.total_generated_normal_object_count++;
 #if RGENGC_PROFILE >= 2
-	objspace->profile.generated_normal_object_count_types[BUILTIN_TYPE(obj)]++;
+        objspace->profile.generated_normal_object_count_types[BUILTIN_TYPE(obj)]++;
 #endif
     }
     else {
-	objspace->profile.total_generated_shady_object_count++;
+        objspace->profile.total_generated_shady_object_count++;
 #if RGENGC_PROFILE >= 2
-	objspace->profile.generated_shady_object_count_types[BUILTIN_TYPE(obj)]++;
+        objspace->profile.generated_shady_object_count_types[BUILTIN_TYPE(obj)]++;
 #endif
     }
 #endif
 
 #if GC_DEBUG
-    RANY(obj)->file = rb_source_loc(&RANY(obj)->line);
-    assert(!SPECIAL_CONST_P(obj)); /* check alignment */
+    RANY(obj)->file = rb_source_location_cstr(&RANY(obj)->line);
+    GC_ASSERT(!SPECIAL_CONST_P(obj)); /* check alignment */
 #endif
 
-    objspace->total_allocated_objects++;
-
     gc_report(5, objspace, "newobj: %s\n", obj_info(obj));
 
 #if RGENGC_OLD_NEWOBJ_CHECK > 0
     {
-	static int newobj_cnt = RGENGC_OLD_NEWOBJ_CHECK;
+        static int newobj_cnt = RGENGC_OLD_NEWOBJ_CHECK;
 
-	if (!is_incremental_marking(objspace) &&
-	    flags & FL_WB_PROTECTED &&   /* do not promote WB unprotected objects */
-	    ! RB_TYPE_P(obj, T_ARRAY)) { /* array.c assumes that allocated objects are new */
-	    if (--newobj_cnt == 0) {
-		newobj_cnt = RGENGC_OLD_NEWOBJ_CHECK;
+        if (!is_incremental_marking(objspace) &&
+            flags & FL_WB_PROTECTED &&   /* do not promote WB unprotected objects */
+            ! RB_TYPE_P(obj, T_ARRAY)) { /* array.c assumes that allocated objects are new */
+            if (--newobj_cnt == 0) {
+                newobj_cnt = RGENGC_OLD_NEWOBJ_CHECK;
 
-		gc_mark_set(objspace, obj);
-		RVALUE_AGE_SET_OLD(objspace, obj);
+                gc_mark_set(objspace, obj);
+                RVALUE_AGE_SET_OLD(objspace, obj);
 
-		rb_gc_writebarrier_remember(obj);
-	    }
-	}
+                rb_gc_writebarrier_remember(obj);
+            }
+        }
     }
 #endif
-    check_rvalue_consistency(obj);
+    // RUBY_DEBUG_LOG("obj:%p (%s)", (void *)obj, obj_type_name(obj));
+    return obj;
+}
+
+static inline VALUE
+ractor_cached_freeobj(rb_objspace_t *objspace, rb_ractor_t *cr)
+{
+    RVALUE *p = cr->newobj_cache.freelist;
+
+    if (p) {
+        VALUE obj = (VALUE)p;
+        cr->newobj_cache.freelist = p->as.free.next;
+        asan_unpoison_object(obj, true);
+        return obj;
+    }
+    else {
+        return Qfalse;
+    }
+}
+
+static struct heap_page *
+heap_next_freepage(rb_objspace_t *objspace, rb_heap_t *heap)
+{
+    ASSERT_vm_locking();
+
+    struct heap_page *page;
+
+    while (heap->free_pages == NULL) {
+	heap_prepare(objspace, heap);
+    }
+    page = heap->free_pages;
+    heap->free_pages = page->free_next;
+
+    GC_ASSERT(page->free_slots != 0);
+    RUBY_DEBUG_LOG("page:%p freelist:%p cnt:%d", page, page->freelist, page->free_slots);
+
+    asan_unpoison_memory_region(&page->freelist, sizeof(RVALUE*), false);
+
+    return page;
+}
+
+static inline void
+ractor_cache_slots(rb_objspace_t *objspace, rb_ractor_t *cr)
+{
+    ASSERT_vm_locking();
+    GC_ASSERT(cr->newobj_cache.freelist == NULL);
+
+    struct heap_page *page = heap_next_freepage(objspace, heap_eden);
+
+    cr->newobj_cache.using_page = page;
+    cr->newobj_cache.freelist = page->freelist;
+    page->free_slots = 0;
+    page->freelist = NULL;
+
+    GC_ASSERT(RB_TYPE_P((VALUE)cr->newobj_cache.freelist, T_NONE));
+}
+
+static inline VALUE
+newobj_fill(VALUE obj, VALUE v1, VALUE v2, VALUE v3)
+{
+    RVALUE *p = (RVALUE *)obj;
+    p->as.values.v1 = v1;
+    p->as.values.v2 = v2;
+    p->as.values.v3 = v3;
     return obj;
 }
 
+ALWAYS_INLINE(static VALUE newobj_slowpath(VALUE klass, VALUE flags, rb_objspace_t *objspace, rb_ractor_t *cr, int wb_protected));
+
 static inline VALUE
-newobj_slowpath(VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, rb_objspace_t *objspace, int wb_protected)
+newobj_slowpath(VALUE klass, VALUE flags, rb_objspace_t *objspace, rb_ractor_t *cr, int wb_protected)
 {
     VALUE obj;
+    unsigned int lev;
 
-    if (UNLIKELY(during_gc || ruby_gc_stressful)) {
-	if (during_gc) {
-	    dont_gc = 1;
-	    during_gc = 0;
-	    rb_bug("object allocation during garbage collection phase");
-	}
+    RB_VM_LOCK_ENTER_CR_LEV(cr, &lev);
+    {
+        if (UNLIKELY(during_gc || ruby_gc_stressful)) {
+            if (during_gc) {
+                dont_gc_on();
+                during_gc = 0;
+                rb_bug("object allocation during garbage collection phase");
+            }
 
-	if (ruby_gc_stressful) {
-	    if (!garbage_collect(objspace, FALSE, FALSE, FALSE, GPR_FLAG_NEWOBJ)) {
-		rb_memerror();
-	    }
-	}
+            if (ruby_gc_stressful) {
+                if (!garbage_collect(objspace, GPR_FLAG_NEWOBJ)) {
+                    rb_memerror();
+                }
+            }
+        }
+
+        // allocate new slot
+        while ((obj = ractor_cached_freeobj(objspace, cr)) == Qfalse) {
+            ractor_cache_slots(objspace, cr);
+        }
+        GC_ASSERT(obj != 0);
+        newobj_init(klass, flags, wb_protected, objspace, obj);
+        gc_event_hook_prep(objspace, RUBY_INTERNAL_EVENT_NEWOBJ, obj, newobj_fill(obj, 0, 0, 0));
     }
+    RB_VM_LOCK_LEAVE_CR_LEV(cr, &lev);
 
-    obj = heap_get_freeobj(objspace, heap_eden);
-    newobj_init(klass, flags, v1, v2, v3, wb_protected, objspace, obj);
-    gc_event_hook(objspace, RUBY_INTERNAL_EVENT_NEWOBJ, obj);
     return obj;
 }
 
-NOINLINE(static VALUE newobj_slowpath_wb_protected(VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, rb_objspace_t *objspace));
-NOINLINE(static VALUE newobj_slowpath_wb_unprotected(VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, rb_objspace_t *objspace));
+NOINLINE(static VALUE newobj_slowpath_wb_protected(VALUE klass, VALUE flags,
+                                                   rb_objspace_t *objspace, rb_ractor_t *cr));
+NOINLINE(static VALUE newobj_slowpath_wb_unprotected(VALUE klass, VALUE flags,
+                                                     rb_objspace_t *objspace, rb_ractor_t *cr));
 
 static VALUE
-newobj_slowpath_wb_protected(VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, rb_objspace_t *objspace)
+newobj_slowpath_wb_protected(VALUE klass, VALUE flags, rb_objspace_t *objspace, rb_ractor_t *cr)
 {
-    return newobj_slowpath(klass, flags, v1, v2, v3, objspace, TRUE);
+    return newobj_slowpath(klass, flags, objspace, cr, TRUE);
 }
 
 static VALUE
-newobj_slowpath_wb_unprotected(VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, rb_objspace_t *objspace)
+newobj_slowpath_wb_unprotected(VALUE klass, VALUE flags, rb_objspace_t *objspace, rb_ractor_t *cr)
 {
-    return newobj_slowpath(klass, flags, v1, v2, v3, objspace, FALSE);
+    return newobj_slowpath(klass, flags, objspace, cr, FALSE);
 }
 
 static inline VALUE
-newobj_of(VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, int wb_protected)
+newobj_of0(VALUE klass, VALUE flags, int wb_protected, rb_ractor_t *cr)
 {
-    rb_objspace_t *objspace = &rb_objspace;
     VALUE obj;
+    rb_objspace_t *objspace = &rb_objspace;
+
+    RB_DEBUG_COUNTER_INC(obj_newobj);
+    (void)RB_DEBUG_COUNTER_INC_IF(obj_newobj_wb_unprotected, !wb_protected);
 
 #if GC_DEBUG_STRESS_TO_CLASS
     if (UNLIKELY(stress_to_class)) {
-	long i, cnt = RARRAY_LEN(stress_to_class);
-	const VALUE *ptr = RARRAY_CONST_PTR(stress_to_class);
-	for (i = 0; i < cnt; ++i) {
-	    if (klass == ptr[i]) rb_memerror();
-	}
+        long i, cnt = RARRAY_LEN(stress_to_class);
+        for (i = 0; i < cnt; ++i) {
+            if (klass == RARRAY_AREF(stress_to_class, i)) rb_memerror();
+        }
     }
 #endif
-    if (!(during_gc ||
-	  ruby_gc_stressful ||
-	  gc_event_hook_available_p(objspace)) &&
-	(obj = heap_get_freeobj_head(objspace, heap_eden)) != Qfalse) {
-	return newobj_init(klass, flags, v1, v2, v3, wb_protected, objspace, obj);
+
+    if ((!UNLIKELY(during_gc ||
+                   ruby_gc_stressful ||
+                   gc_event_hook_available_p(objspace)) &&
+         wb_protected &&
+         (obj = ractor_cached_freeobj(objspace, cr)) != Qfalse)) {
+
+        newobj_init(klass, flags, wb_protected, objspace, obj);
     }
     else {
-	return wb_protected ?
-	  newobj_slowpath_wb_protected(klass, flags, v1, v2, v3, objspace) :
-	  newobj_slowpath_wb_unprotected(klass, flags, v1, v2, v3, objspace);
+        RB_DEBUG_COUNTER_INC(obj_newobj_slowpath);
+
+        obj = wb_protected ?
+          newobj_slowpath_wb_protected(klass, flags, objspace, cr) :
+          newobj_slowpath_wb_unprotected(klass, flags, objspace, cr);
     }
+
+    return obj;
+}
+
+static inline VALUE
+newobj_of(VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, int wb_protected)
+{
+    VALUE obj = newobj_of0(klass, flags, wb_protected, GET_RACTOR());
+    return newobj_fill(obj, v1, v2, v3);
+}
+
+static inline VALUE
+newobj_of_cr(rb_ractor_t *cr, VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, int wb_protected)
+{
+    VALUE obj = newobj_of0(klass, flags, wb_protected, cr);
+    return newobj_fill(obj, v1, v2, v3);
 }
 
 VALUE
 rb_wb_unprotected_newobj_of(VALUE klass, VALUE flags)
 {
-    if (RGENGC_CHECK_MODE > 0) assert((flags & FL_WB_PROTECTED) == 0);
+    GC_ASSERT((flags & FL_WB_PROTECTED) == 0);
     return newobj_of(klass, flags, 0, 0, 0, FALSE);
 }
 
 VALUE
 rb_wb_protected_newobj_of(VALUE klass, VALUE flags)
 {
-    if (RGENGC_CHECK_MODE > 0) assert((flags & FL_WB_PROTECTED) == 0);
+    GC_ASSERT((flags & FL_WB_PROTECTED) == 0);
     return newobj_of(klass, flags, 0, 0, 0, TRUE);
 }
 
+VALUE
+rb_ec_wb_protected_newobj_of(rb_execution_context_t *ec, VALUE klass, VALUE flags)
+{
+    GC_ASSERT((flags & FL_WB_PROTECTED) == 0);
+    return newobj_of_cr(rb_ec_ractor_ptr(ec), klass, flags, 0, 0, 0, TRUE);
+}
+
 /* for compatibility */
 
 VALUE
@@ -1937,15 +2370,40 @@ rb_newobj(void)
 VALUE
 rb_newobj_of(VALUE klass, VALUE flags)
 {
-    return newobj_of(klass, flags & ~FL_WB_PROTECTED, 0, 0, 0, flags & FL_WB_PROTECTED);
+    if ((flags & RUBY_T_MASK) == T_OBJECT) {
+        return newobj_of(klass, (flags | ROBJECT_EMBED) & ~FL_WB_PROTECTED , Qundef, Qundef, Qundef, flags & FL_WB_PROTECTED);
+    } else {
+        return newobj_of(klass, flags & ~FL_WB_PROTECTED, 0, 0, 0, flags & FL_WB_PROTECTED);
+    }
 }
 
-NODE*
-rb_node_newnode(enum node_type type, VALUE a0, VALUE a1, VALUE a2)
+#define UNEXPECTED_NODE(func) \
+    rb_bug(#func"(): GC does not handle T_NODE 0x%x(%p) 0x%"PRIxVALUE, \
+	   BUILTIN_TYPE(obj), (void*)(obj), RBASIC(obj)->flags)
+
+const char *
+rb_imemo_name(enum imemo_type type)
 {
-    NODE *n = (NODE *)newobj_of(0, T_NODE, a0, a1, a2, FALSE); /* TODO: node also should be wb protected */
-    nd_set_type(n, type);
-    return n;
+    // put no default case to get a warning if an imemo type is missing
+    switch (type) {
+#define IMEMO_NAME(x) case imemo_##x: return #x;
+        IMEMO_NAME(env);
+        IMEMO_NAME(cref);
+        IMEMO_NAME(svar);
+        IMEMO_NAME(throw_data);
+        IMEMO_NAME(ifunc);
+        IMEMO_NAME(memo);
+        IMEMO_NAME(ment);
+        IMEMO_NAME(iseq);
+        IMEMO_NAME(tmpbuf);
+        IMEMO_NAME(ast);
+        IMEMO_NAME(parser_strterm);
+        IMEMO_NAME(callinfo);
+        IMEMO_NAME(callcache);
+        IMEMO_NAME(constcache);
+#undef IMEMO_NAME
+    }
+    return "unknown";
 }
 
 #undef rb_imemo_new
@@ -1957,29 +2415,84 @@ rb_imemo_new(enum imemo_type type, VALUE v1, VALUE v2, VALUE v3, VALUE v0)
     return newobj_of(v0, flags, v1, v2, v3, TRUE);
 }
 
+static VALUE
+rb_imemo_tmpbuf_new(VALUE v1, VALUE v2, VALUE v3, VALUE v0)
+{
+    VALUE flags = T_IMEMO | (imemo_tmpbuf << FL_USHIFT);
+    return newobj_of(v0, flags, v1, v2, v3, FALSE);
+}
+
+static VALUE
+rb_imemo_tmpbuf_auto_free_maybe_mark_buffer(void *buf, size_t cnt)
+{
+    return rb_imemo_tmpbuf_new((VALUE)buf, 0, (VALUE)cnt, 0);
+}
+
+rb_imemo_tmpbuf_t *
+rb_imemo_tmpbuf_parser_heap(void *buf, rb_imemo_tmpbuf_t *old_heap, size_t cnt)
+{
+    return (rb_imemo_tmpbuf_t *)rb_imemo_tmpbuf_new((VALUE)buf, (VALUE)old_heap, (VALUE)cnt, 0);
+}
+
+static size_t
+imemo_memsize(VALUE obj)
+{
+    size_t size = 0;
+    switch (imemo_type(obj)) {
+      case imemo_ment:
+        size += sizeof(RANY(obj)->as.imemo.ment.def);
+        break;
+      case imemo_iseq:
+        size += rb_iseq_memsize((rb_iseq_t *)obj);
+        break;
+      case imemo_env:
+        size += RANY(obj)->as.imemo.env.env_size * sizeof(VALUE);
+        break;
+      case imemo_tmpbuf:
+        size += RANY(obj)->as.imemo.alloc.cnt * sizeof(VALUE);
+        break;
+      case imemo_ast:
+        size += rb_ast_memsize(&RANY(obj)->as.imemo.ast);
+        break;
+      case imemo_cref:
+      case imemo_svar:
+      case imemo_throw_data:
+      case imemo_ifunc:
+      case imemo_memo:
+      case imemo_parser_strterm:
+        break;
+      default:
+        /* unreachable */
+        break;
+    }
+    return size;
+}
+
 #if IMEMO_DEBUG
 VALUE
 rb_imemo_new_debug(enum imemo_type type, VALUE v1, VALUE v2, VALUE v3, VALUE v0, const char *file, int line)
 {
     VALUE memo = rb_imemo_new(type, v1, v2, v3, v0);
-    fprintf(stderr, "memo %p (type: %d) @ %s:%d\n", memo, imemo_type(memo), file, line);
+    fprintf(stderr, "memo %p (type: %d) @ %s:%d\n", (void *)memo, imemo_type(memo), file, line);
     return memo;
 }
 #endif
 
 VALUE
+rb_class_allocate_instance(VALUE klass)
+{
+    VALUE flags = T_OBJECT | ROBJECT_EMBED;
+    return newobj_of(klass, flags, Qundef, Qundef, Qundef, RGENGC_WB_PROTECTED_OBJECT);
+}
+
+VALUE
 rb_data_object_wrap(VALUE klass, void *datap, RUBY_DATA_FUNC dmark, RUBY_DATA_FUNC dfree)
 {
+    RUBY_ASSERT_ALWAYS(dfree != (RUBY_DATA_FUNC)1);
     if (klass) Check_Type(klass, T_CLASS);
     return newobj_of(klass, T_DATA, (VALUE)dmark, (VALUE)dfree, (VALUE)datap, FALSE);
 }
 
-#undef rb_data_object_alloc
-RUBY_ALIAS_FUNCTION(rb_data_object_alloc(VALUE klass, void *datap,
-					 RUBY_DATA_FUNC dmark, RUBY_DATA_FUNC dfree),
-		    rb_data_object_wrap, (klass, datap, dmark, dfree))
-
-
 VALUE
 rb_data_object_zalloc(VALUE klass, size_t size, RUBY_DATA_FUNC dmark, RUBY_DATA_FUNC dfree)
 {
@@ -1991,15 +2504,11 @@ rb_data_object_zalloc(VALUE klass, size_t size, RUBY_DATA_FUNC dmark, RUBY_DATA_
 VALUE
 rb_data_typed_object_wrap(VALUE klass, void *datap, const rb_data_type_t *type)
 {
+    RUBY_ASSERT_ALWAYS(type);
     if (klass) Check_Type(klass, T_CLASS);
     return newobj_of(klass, T_DATA, (VALUE)type, (VALUE)1, (VALUE)datap, type->flags & RUBY_FL_WB_PROTECTED);
 }
 
-#undef rb_data_typed_object_alloc
-RUBY_ALIAS_FUNCTION(rb_data_typed_object_alloc(VALUE klass, void *datap,
-					       const rb_data_type_t *type),
-		    rb_data_typed_object_wrap, (klass, datap, type))
-
 VALUE
 rb_data_typed_object_zalloc(VALUE klass, size_t size, const rb_data_type_t *type)
 {
@@ -2040,8 +2549,13 @@ is_pointer_to_heap(rb_objspace_t *objspace, void *ptr)
     register struct heap_page *page;
     register size_t hi, lo, mid;
 
+    RB_DEBUG_COUNTER_INC(gc_isptr_trial);
+
     if (p < heap_pages_lomem || p > heap_pages_himem) return FALSE;
+    RB_DEBUG_COUNTER_INC(gc_isptr_range);
+
     if ((VALUE)p % sizeof(RVALUE) != 0) return FALSE;
+    RB_DEBUG_COUNTER_INC(gc_isptr_align);
 
     /* check if p looks like a pointer using bsearch*/
     lo = 0;
@@ -2051,7 +2565,14 @@ is_pointer_to_heap(rb_objspace_t *objspace, void *ptr)
 	page = heap_pages_sorted[mid];
 	if (page->start <= p) {
 	    if (p < page->start + page->total_slots) {
-		return TRUE;
+                RB_DEBUG_COUNTER_INC(gc_isptr_maybe);
+
+                if (page->flags.in_tomb) {
+                    return FALSE;
+                }
+                else {
+                    return TRUE;
+                }
 	    }
 	    lo = mid + 1;
 	}
@@ -2077,27 +2598,183 @@ rb_free_const_table(struct rb_id_table *tbl)
     rb_id_table_free(tbl);
 }
 
+static int
+free_iv_index_tbl_free_i(st_data_t key, st_data_t value, st_data_t data)
+{
+    xfree((void *)value);
+    return ST_CONTINUE;
+}
+
+static void
+iv_index_tbl_free(struct st_table *tbl)
+{
+    st_foreach(tbl, free_iv_index_tbl_free_i, 0);
+}
+
+// alive: if false, target pointers can be freed already.
+//        To check it, we need objspace parameter.
+static void
+vm_ccs_free(struct rb_class_cc_entries *ccs, int alive, rb_objspace_t *objspace, VALUE klass)
+{
+    if (ccs->entries) {
+        for (int i=0; i<ccs->len; i++) {
+            const struct rb_callcache *cc = ccs->entries[i].cc;
+            if (!alive) {
+                void *ptr = asan_poisoned_object_p((VALUE)cc);
+                asan_unpoison_object((VALUE)cc, false);
+                // ccs can be free'ed.
+                if (is_pointer_to_heap(objspace, (void *)cc) &&
+                    IMEMO_TYPE_P(cc, imemo_callcache) &&
+                    cc->klass == klass) {
+                    // OK. maybe target cc.
+                }
+                else {
+                    if (ptr) {
+                        asan_poison_object((VALUE)cc);
+                    }
+                    continue;
+                }
+                if (ptr) {
+                    asan_poison_object((VALUE)cc);
+                }
+            }
+            vm_cc_invalidate(cc);
+        }
+        ruby_xfree(ccs->entries);
+    }
+    ruby_xfree(ccs);
+}
+
+void
+rb_vm_ccs_free(struct rb_class_cc_entries *ccs)
+{
+    RB_DEBUG_COUNTER_INC(ccs_free);
+    vm_ccs_free(ccs, TRUE, NULL, Qundef);
+}
+
+struct cc_tbl_i_data {
+    rb_objspace_t *objspace;
+    VALUE klass;
+    bool alive;
+};
+
+static enum rb_id_table_iterator_result
+cc_table_mark_i(ID id, VALUE ccs_ptr, void *data_ptr)
+{
+    struct cc_tbl_i_data *data = data_ptr;
+    struct rb_class_cc_entries *ccs = (struct rb_class_cc_entries *)ccs_ptr;
+    VM_ASSERT(vm_ccs_p(ccs));
+    VM_ASSERT(id == ccs->cme->called_id);
+
+    if (METHOD_ENTRY_INVALIDATED(ccs->cme)) {
+        rb_vm_ccs_free(ccs);
+        return ID_TABLE_DELETE;
+    }
+    else {
+        gc_mark(data->objspace, (VALUE)ccs->cme);
+
+        for (int i=0; i<ccs->len; i++) {
+            VM_ASSERT(data->klass == ccs->entries[i].cc->klass);
+            VM_ASSERT(ccs->cme == vm_cc_cme(ccs->entries[i].cc));
+
+            gc_mark(data->objspace, (VALUE)ccs->entries[i].ci);
+            gc_mark(data->objspace, (VALUE)ccs->entries[i].cc);
+        }
+        return ID_TABLE_CONTINUE;
+    }
+}
+
+static void
+cc_table_mark(rb_objspace_t *objspace, VALUE klass)
+{
+    struct rb_id_table *cc_tbl = RCLASS_CC_TBL(klass);
+    if (cc_tbl) {
+        struct cc_tbl_i_data data = {
+            .objspace = objspace,
+            .klass = klass,
+        };
+        rb_id_table_foreach(cc_tbl, cc_table_mark_i, &data);
+    }
+}
+
+static enum rb_id_table_iterator_result
+cc_table_free_i(VALUE ccs_ptr, void *data_ptr)
+{
+    struct cc_tbl_i_data *data = data_ptr;
+    struct rb_class_cc_entries *ccs = (struct rb_class_cc_entries *)ccs_ptr;
+    VM_ASSERT(vm_ccs_p(ccs));
+    vm_ccs_free(ccs, data->alive, data->objspace, data->klass);
+    return ID_TABLE_CONTINUE;
+}
+
+static void
+cc_table_free(rb_objspace_t *objspace, VALUE klass, bool alive)
+{
+    struct rb_id_table *cc_tbl = RCLASS_CC_TBL(klass);
+
+    if (cc_tbl) {
+        struct cc_tbl_i_data data = {
+            .objspace = objspace,
+            .klass = klass,
+            .alive = alive,
+        };
+        rb_id_table_foreach_values(cc_tbl, cc_table_free_i, &data);
+        rb_id_table_free(cc_tbl);
+    }
+}
+
+void
+rb_cc_table_free(VALUE klass)
+{
+    cc_table_free(&rb_objspace, klass, TRUE);
+}
+
 static inline void
 make_zombie(rb_objspace_t *objspace, VALUE obj, void (*dfree)(void *), void *data)
 {
     struct RZombie *zombie = RZOMBIE(obj);
-    zombie->basic.flags = T_ZOMBIE;
+    zombie->basic.flags = T_ZOMBIE | (zombie->basic.flags & FL_SEEN_OBJ_ID);
     zombie->dfree = dfree;
     zombie->data = data;
     zombie->next = heap_pages_deferred_final;
     heap_pages_deferred_final = (VALUE)zombie;
+
+    struct heap_page *page = GET_HEAP_PAGE(obj);
+    page->final_slots++;
+    heap_pages_final_slots++;
 }
 
 static inline void
 make_io_zombie(rb_objspace_t *objspace, VALUE obj)
 {
     rb_io_t *fptr = RANY(obj)->as.file.fptr;
-    make_zombie(objspace, obj, (void (*)(void*))rb_io_fptr_finalize, fptr);
+    make_zombie(objspace, obj, rb_io_fptr_finalize_internal, fptr);
+}
+
+static void
+obj_free_object_id(rb_objspace_t *objspace, VALUE obj)
+{
+    ASSERT_vm_locking();
+    st_data_t o = (st_data_t)obj, id;
+
+    GC_ASSERT(FL_TEST(obj, FL_SEEN_OBJ_ID));
+    FL_UNSET(obj, FL_SEEN_OBJ_ID);
+
+    if (st_delete(objspace->obj_to_id_tbl, &o, &id)) {
+        GC_ASSERT(id);
+        st_delete(objspace->id_to_obj_tbl, &id, NULL);
+    }
+    else {
+        rb_bug("Object ID seen, but not in mapping table: %s\n", obj_info(obj));
+    }
 }
 
 static int
 obj_free(rb_objspace_t *objspace, VALUE obj)
 {
+    RB_DEBUG_COUNTER_INC(obj_free);
+    // RUBY_DEBUG_LOG("obj:%p (%s)", (void *)obj, obj_type_name(obj));
+
     gc_event_hook(objspace, RUBY_INTERNAL_EVENT_FREEOBJ, obj);
 
     switch (BUILTIN_TYPE(obj)) {
@@ -2107,6 +2784,8 @@ obj_free(rb_objspace_t *objspace, VALUE obj)
       case T_FALSE:
 	rb_bug("obj_free() called for broken object");
 	break;
+      default:
+        break;
     }
 
     if (FL_TEST(obj, FL_EXIVAR)) {
@@ -2114,7 +2793,10 @@ obj_free(rb_objspace_t *objspace, VALUE obj)
 	FL_UNSET(obj, FL_EXIVAR);
     }
 
-#if USE_RGENGC
+    if (FL_TEST(obj, FL_SEEN_OBJ_ID) && !FL_TEST(obj, FL_FINALIZE)) {
+        obj_free_object_id(objspace, obj);
+    }
+
     if (RVALUE_WB_UNPROTECTED(obj)) CLEAR_IN_BITMAP(GET_HEAP_WB_UNPROTECTED_BITS(obj), obj);
 
 #if RGENGC_CHECK_MODE
@@ -2125,18 +2807,25 @@ obj_free(rb_objspace_t *objspace, VALUE obj)
 	CHECK(RVALUE_UNCOLLECTIBLE);
 #undef CHECK
 #endif
-#endif
 
     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);
-	}
-	break;
+        if (RANY(obj)->as.basic.flags & ROBJECT_EMBED) {
+            RB_DEBUG_COUNTER_INC(obj_obj_embed);
+        }
+        else if (ROBJ_TRANSIENT_P(obj)) {
+            RB_DEBUG_COUNTER_INC(obj_obj_transient);
+        }
+        else {
+            xfree(RANY(obj)->as.object.as.heap.ivptr);
+            RB_DEBUG_COUNTER_INC(obj_obj_ptr);
+        }
+        break;
       case T_MODULE:
       case T_CLASS:
+        mjit_remove_class_serial(RCLASS_SERIAL(obj));
 	rb_id_table_free(RCLASS_M_TBL(obj));
+        cc_table_free(objspace, obj, FALSE);
 	if (RCLASS_IV_TBL(obj)) {
 	    st_free_table(RCLASS_IV_TBL(obj));
 	}
@@ -2144,7 +2833,7 @@ obj_free(rb_objspace_t *objspace, VALUE obj)
 	    rb_free_const_table(RCLASS_CONST_TBL(obj));
 	}
 	if (RCLASS_IV_INDEX_TBL(obj)) {
-	    st_free_table(RCLASS_IV_INDEX_TBL(obj));
+            iv_index_tbl_free(RCLASS_IV_INDEX_TBL(obj));
 	}
 	if (RCLASS_EXT(obj)->subclasses) {
 	    if (BUILTIN_TYPE(obj) == T_MODULE) {
@@ -2160,21 +2849,78 @@ obj_free(rb_objspace_t *objspace, VALUE obj)
 	if (RANY(obj)->as.klass.ptr)
 	    xfree(RANY(obj)->as.klass.ptr);
 	RANY(obj)->as.klass.ptr = NULL;
+
+        (void)RB_DEBUG_COUNTER_INC_IF(obj_module_ptr, BUILTIN_TYPE(obj) == T_MODULE);
+        (void)RB_DEBUG_COUNTER_INC_IF(obj_class_ptr, BUILTIN_TYPE(obj) == T_CLASS);
 	break;
       case T_STRING:
 	rb_str_free(obj);
 	break;
       case T_ARRAY:
-	rb_ary_free(obj);
+        rb_ary_free(obj);
 	break;
       case T_HASH:
-	if (RANY(obj)->as.hash.ntbl) {
-	    st_free_table(RANY(obj)->as.hash.ntbl);
-	}
+#if USE_DEBUG_COUNTER
+        switch (RHASH_SIZE(obj)) {
+          case 0:
+            RB_DEBUG_COUNTER_INC(obj_hash_empty);
+            break;
+          case 1:
+            RB_DEBUG_COUNTER_INC(obj_hash_1);
+            break;
+          case 2:
+            RB_DEBUG_COUNTER_INC(obj_hash_2);
+            break;
+          case 3:
+            RB_DEBUG_COUNTER_INC(obj_hash_3);
+            break;
+          case 4:
+            RB_DEBUG_COUNTER_INC(obj_hash_4);
+            break;
+          case 5:
+          case 6:
+          case 7:
+          case 8:
+            RB_DEBUG_COUNTER_INC(obj_hash_5_8);
+            break;
+          default:
+            GC_ASSERT(RHASH_SIZE(obj) > 8);
+            RB_DEBUG_COUNTER_INC(obj_hash_g8);
+        }
+
+        if (RHASH_AR_TABLE_P(obj)) {
+            if (RHASH_AR_TABLE(obj) == NULL) {
+                RB_DEBUG_COUNTER_INC(obj_hash_null);
+            }
+            else {
+                RB_DEBUG_COUNTER_INC(obj_hash_ar);
+            }
+        }
+        else {
+            RB_DEBUG_COUNTER_INC(obj_hash_st);
+        }
+#endif
+        if (/* RHASH_AR_TABLE_P(obj) */ !FL_TEST_RAW(obj, RHASH_ST_TABLE_FLAG)) {
+            struct ar_table_struct *tab = RHASH(obj)->as.ar;
+
+            if (tab) {
+                if (RHASH_TRANSIENT_P(obj)) {
+                    RB_DEBUG_COUNTER_INC(obj_hash_transient);
+                }
+                else {
+                    ruby_xfree(tab);
+                }
+            }
+        }
+        else {
+            GC_ASSERT(RHASH_ST_TABLE_P(obj));
+            st_free_table(RHASH(obj)->as.st);
+        }
 	break;
       case T_REGEXP:
 	if (RANY(obj)->as.regexp.ptr) {
 	    onig_free(RANY(obj)->as.regexp.ptr);
+            RB_DEBUG_COUNTER_INC(obj_regexp_ptr);
 	}
 	break;
       case T_DATA:
@@ -2198,40 +2944,66 @@ obj_free(rb_objspace_t *objspace, VALUE obj)
 	    if (dfree) {
 		if (dfree == RUBY_DEFAULT_FREE) {
 		    xfree(data);
+                    RB_DEBUG_COUNTER_INC(obj_data_xfree);
 		}
 		else if (free_immediately) {
 		    (*dfree)(data);
+                    RB_DEBUG_COUNTER_INC(obj_data_imm_free);
 		}
 		else {
 		    make_zombie(objspace, obj, dfree, data);
+                    RB_DEBUG_COUNTER_INC(obj_data_zombie);
 		    return 1;
 		}
 	    }
+            else {
+                RB_DEBUG_COUNTER_INC(obj_data_empty);
+            }
 	}
 	break;
       case T_MATCH:
 	if (RANY(obj)->as.match.rmatch) {
             struct rmatch *rm = RANY(obj)->as.match.rmatch;
+#if USE_DEBUG_COUNTER
+            if (rm->regs.num_regs >= 8) {
+                RB_DEBUG_COUNTER_INC(obj_match_ge8);
+            }
+            else if (rm->regs.num_regs >= 4) {
+                RB_DEBUG_COUNTER_INC(obj_match_ge4);
+            }
+            else if (rm->regs.num_regs >= 1) {
+                RB_DEBUG_COUNTER_INC(obj_match_under4);
+            }
+#endif
 	    onig_region_free(&rm->regs, 0);
             if (rm->char_offset)
 		xfree(rm->char_offset);
 	    xfree(rm);
+
+            RB_DEBUG_COUNTER_INC(obj_match_ptr);
 	}
 	break;
       case T_FILE:
 	if (RANY(obj)->as.file.fptr) {
 	    make_io_zombie(objspace, obj);
+            RB_DEBUG_COUNTER_INC(obj_file_ptr);
 	    return 1;
 	}
 	break;
       case T_RATIONAL:
+        RB_DEBUG_COUNTER_INC(obj_rational);
+        break;
       case T_COMPLEX:
+        RB_DEBUG_COUNTER_INC(obj_complex);
+        break;
+      case T_MOVED:
 	break;
       case T_ICLASS:
 	/* Basically , T_ICLASS shares table with the module */
-	if (FL_TEST(obj, RICLASS_IS_ORIGIN)) {
-	    rb_id_table_free(RCLASS_M_TBL(obj));
-	}
+        if (RICLASS_OWNS_M_TBL_P(obj)) {
+            /* Method table is not shared for origin iclasses of classes */
+            rb_id_table_free(RCLASS_M_TBL(obj));
+        }
 	if (RCLASS_CALLABLE_M_TBL(obj) != NULL) {
 	    rb_id_table_free(RCLASS_CALLABLE_M_TBL(obj));
 	}
@@ -2239,50 +3011,104 @@ obj_free(rb_objspace_t *objspace, VALUE obj)
 	    rb_class_detach_subclasses(obj);
 	    RCLASS_EXT(obj)->subclasses = NULL;
 	}
+        cc_table_free(objspace, obj, FALSE);
 	rb_class_remove_from_module_subclasses(obj);
 	rb_class_remove_from_super_subclasses(obj);
 	xfree(RANY(obj)->as.klass.ptr);
 	RANY(obj)->as.klass.ptr = NULL;
+
+        RB_DEBUG_COUNTER_INC(obj_iclass_ptr);
 	break;
 
       case T_FLOAT:
+        RB_DEBUG_COUNTER_INC(obj_float);
 	break;
 
       case T_BIGNUM:
-	if (!(RBASIC(obj)->flags & BIGNUM_EMBED_FLAG) && BIGNUM_DIGITS(obj)) {
+	if (!BIGNUM_EMBED_P(obj) && BIGNUM_DIGITS(obj)) {
 	    xfree(BIGNUM_DIGITS(obj));
+            RB_DEBUG_COUNTER_INC(obj_bignum_ptr);
 	}
+        else {
+            RB_DEBUG_COUNTER_INC(obj_bignum_embed);
+        }
 	break;
 
       case T_NODE:
-	rb_gc_free_node(obj);
-	break;			/* no need to free iv_tbl */
+	UNEXPECTED_NODE(obj_free);
+	break;
 
       case T_STRUCT:
-	if ((RBASIC(obj)->flags & RSTRUCT_EMBED_LEN_MASK) == 0 &&
-	    RANY(obj)->as.rstruct.as.heap.ptr) {
-	    xfree((void *)RANY(obj)->as.rstruct.as.heap.ptr);
+        if ((RBASIC(obj)->flags & RSTRUCT_EMBED_LEN_MASK) ||
+            RANY(obj)->as.rstruct.as.heap.ptr == NULL) {
+            RB_DEBUG_COUNTER_INC(obj_struct_embed);
+        }
+        else if (RSTRUCT_TRANSIENT_P(obj)) {
+            RB_DEBUG_COUNTER_INC(obj_struct_transient);
+        }
+        else {
+            xfree((void *)RANY(obj)->as.rstruct.as.heap.ptr);
+            RB_DEBUG_COUNTER_INC(obj_struct_ptr);
 	}
 	break;
 
       case T_SYMBOL:
 	{
             rb_gc_free_dsymbol(obj);
+            RB_DEBUG_COUNTER_INC(obj_symbol);
 	}
 	break;
 
       case T_IMEMO:
-	{
-	    switch (imemo_type(obj)) {
-	      case imemo_ment:
-		rb_free_method_entry(&RANY(obj)->as.imemo.ment);
-		break;
-	      case imemo_iseq:
-		rb_iseq_free(&RANY(obj)->as.imemo.iseq);
-		break;
-	      default:
-		break;
-	    }
+	switch (imemo_type(obj)) {
+	  case imemo_ment:
+	    rb_free_method_entry(&RANY(obj)->as.imemo.ment);
+            RB_DEBUG_COUNTER_INC(obj_imemo_ment);
+	    break;
+	  case imemo_iseq:
+	    rb_iseq_free(&RANY(obj)->as.imemo.iseq);
+            RB_DEBUG_COUNTER_INC(obj_imemo_iseq);
+	    break;
+	  case imemo_env:
+	    GC_ASSERT(VM_ENV_ESCAPED_P(RANY(obj)->as.imemo.env.ep));
+	    xfree((VALUE *)RANY(obj)->as.imemo.env.env);
+            RB_DEBUG_COUNTER_INC(obj_imemo_env);
+	    break;
+	  case imemo_tmpbuf:
+	    xfree(RANY(obj)->as.imemo.alloc.ptr);
+            RB_DEBUG_COUNTER_INC(obj_imemo_tmpbuf);
+	    break;
+	  case imemo_ast:
+	    rb_ast_free(&RANY(obj)->as.imemo.ast);
+            RB_DEBUG_COUNTER_INC(obj_imemo_ast);
+	    break;
+          case imemo_cref:
+            RB_DEBUG_COUNTER_INC(obj_imemo_cref);
+            break;
+          case imemo_svar:
+            RB_DEBUG_COUNTER_INC(obj_imemo_svar);
+            break;
+          case imemo_throw_data:
+            RB_DEBUG_COUNTER_INC(obj_imemo_throw_data);
+            break;
+          case imemo_ifunc:
+            RB_DEBUG_COUNTER_INC(obj_imemo_ifunc);
+            break;
+          case imemo_memo:
+            RB_DEBUG_COUNTER_INC(obj_imemo_memo);
+            break;
+          case imemo_parser_strterm:
+            RB_DEBUG_COUNTER_INC(obj_imemo_parser_strterm);
+            break;
+          case imemo_callinfo:
+            RB_DEBUG_COUNTER_INC(obj_imemo_callinfo);
+            break;
+          case imemo_callcache:
+            RB_DEBUG_COUNTER_INC(obj_imemo_callcache);
+            break;
+          case imemo_constcache:
+            RB_DEBUG_COUNTER_INC(obj_imemo_constcache);
+            break;
 	}
 	return 0;
 
@@ -2292,7 +3118,7 @@ obj_free(rb_objspace_t *objspace, VALUE obj)
     }
 
     if (FL_TEST(obj, FL_FINALIZE)) {
-	make_zombie(objspace, obj, 0, 0);
+        make_zombie(objspace, obj, 0, 0);
 	return 1;
     }
     else {
@@ -2300,12 +3126,53 @@ obj_free(rb_objspace_t *objspace, VALUE obj)
     }
 }
 
+
+#define OBJ_ID_INCREMENT (sizeof(RVALUE) / 2)
+#define OBJ_ID_INITIAL (OBJ_ID_INCREMENT * 2)
+
+static int
+object_id_cmp(st_data_t x, st_data_t y)
+{
+    if (RB_TYPE_P(x, T_BIGNUM)) {
+        return !rb_big_eql(x, y);
+    } else {
+        return x != y;
+    }
+}
+
+static st_index_t
+object_id_hash(st_data_t n)
+{
+    if (RB_TYPE_P(n, T_BIGNUM)) {
+        return FIX2LONG(rb_big_hash(n));
+    } else {
+        return st_numhash(n);
+    }
+}
+static const struct st_hash_type object_id_hash_type = {
+    object_id_cmp,
+    object_id_hash,
+};
+
 void
 Init_heap(void)
 {
     rb_objspace_t *objspace = &rb_objspace;
 
-    gc_stress_set(objspace, ruby_initial_gc_stress);
+#if defined(HAVE_SYSCONF) && defined(_SC_PAGE_SIZE)
+    /* If Ruby's heap pages are not a multiple of the system page size, we
+     * cannot use mprotect for the read barrier, so we must disable automatic
+     * compaction. */
+    int pagesize;
+    pagesize = (int)sysconf(_SC_PAGE_SIZE);
+    if ((HEAP_PAGE_SIZE % pagesize) != 0) {
+        ruby_enable_autocompact = 0;
+    }
+#endif
+
+    objspace->next_object_id = INT2FIX(OBJ_ID_INITIAL);
+    objspace->id_to_obj_tbl = st_init_table(&object_id_hash_type);
+    objspace->obj_to_id_tbl = st_init_numtable();
 
 #if RGENGC_ESTIMATE_OLDMALLOC
     objspace->rgengc.oldmalloc_increase_limit = gc_params.oldmalloc_limit_min;
@@ -2314,35 +3181,35 @@ Init_heap(void)
     heap_add_pages(objspace, heap_eden, gc_params.heap_init_slots / HEAP_PAGE_OBJ_LIMIT);
     init_mark_stack(&objspace->mark_stack);
 
-#ifdef USE_SIGALTSTACK
-    {
-	/* altstack of another threads are allocated in another place */
-	rb_thread_t *th = GET_THREAD();
-	void *tmp = th->altstack;
-	th->altstack = malloc(rb_sigaltstack_size());
-	free(tmp); /* free previously allocated area */
-    }
-#endif
-
     objspace->profile.invoke_time = getrusage_time();
     finalizer_table = st_init_numtable();
 }
 
+void
+Init_gc_stress(void)
+{
+    rb_objspace_t *objspace = &rb_objspace;
+
+    gc_stress_set(objspace, ruby_initial_gc_stress);
+}
+
 typedef int each_obj_callback(void *, void *, size_t, void *);
 
+static void objspace_each_objects(rb_objspace_t *objspace, each_obj_callback *callback, void *data);
+static void objspace_reachable_objects_from_root(rb_objspace_t *, void (func)(const char *, VALUE, void *), void *);
+
 struct each_obj_args {
+    rb_objspace_t *objspace;
     each_obj_callback *callback;
     void *data;
 };
 
-static VALUE
-objspace_each_objects(VALUE arg)
+static void
+objspace_each_objects_without_setup(rb_objspace_t *objspace, each_obj_callback *callback, void *data)
 {
     size_t i;
     struct heap_page *page;
     RVALUE *pstart = NULL, *pend;
-    rb_objspace_t *objspace = &rb_objspace;
-    struct each_obj_args *args = (struct each_obj_args *)arg;
 
     i = 0;
     while (i < heap_allocated_pages) {
@@ -2355,16 +3222,22 @@ objspace_each_objects(VALUE arg)
 	pstart = page->start;
 	pend = pstart + page->total_slots;
 
-	if ((*args->callback)(pstart, pend, sizeof(RVALUE), args->data)) {
+        if ((*callback)(pstart, pend, sizeof(RVALUE), data)) {
 	    break;
 	}
     }
+}
 
+static VALUE
+objspace_each_objects_protected(VALUE arg)
+{
+    struct each_obj_args *args = (struct each_obj_args *)arg;
+    objspace_each_objects_without_setup(args->objspace, args->callback, args->data);
     return Qnil;
 }
 
 static VALUE
-incremental_enable(void)
+incremental_enable(VALUE _)
 {
     rb_objspace_t *objspace = &rb_objspace;
 
@@ -2411,32 +3284,30 @@ incremental_enable(void)
 void
 rb_objspace_each_objects(each_obj_callback *callback, void *data)
 {
-    struct each_obj_args args;
-    rb_objspace_t *objspace = &rb_objspace;
+    objspace_each_objects(&rb_objspace, callback, data);
+}
+
+static void
+objspace_each_objects(rb_objspace_t *objspace, each_obj_callback *callback, void *data)
+{
     int prev_dont_incremental = objspace->flags.dont_incremental;
 
     gc_rest(objspace);
     objspace->flags.dont_incremental = TRUE;
 
-    args.callback = callback;
-    args.data = data;
-
     if (prev_dont_incremental) {
-	objspace_each_objects((VALUE)&args);
+        objspace_each_objects_without_setup(objspace, callback, data);
     }
     else {
-	rb_ensure(objspace_each_objects, (VALUE)&args, incremental_enable, Qnil);
+        struct each_obj_args args = {objspace, callback, data};
+        rb_ensure(objspace_each_objects_protected, (VALUE)&args, incremental_enable, Qnil);
     }
 }
 
 void
 rb_objspace_each_objects_without_setup(each_obj_callback *callback, void *data)
 {
-    struct each_obj_args args;
-    args.callback = callback;
-    args.data = data;
-
-    objspace_each_objects((VALUE)&args);
+    objspace_each_objects_without_setup(&rb_objspace, callback, data);
 }
 
 struct os_each_struct {
@@ -2448,13 +3319,19 @@ static int
 internal_object_p(VALUE obj)
 {
     RVALUE *p = (RVALUE *)obj;
+    void *ptr = __asan_region_is_poisoned(p, SIZEOF_VALUE);
+    asan_unpoison_object(obj, false);
+    bool used_p = p->as.basic.flags;
 
-    if (p->as.basic.flags) {
-	switch (BUILTIN_TYPE(p)) {
+    if (used_p) {
+        switch (BUILTIN_TYPE(obj)) {
+	  case T_NODE:
+	    UNEXPECTED_NODE(internal_object_p);
+	    break;
 	  case T_NONE:
+          case T_MOVED:
 	  case T_IMEMO:
 	  case T_ICLASS:
-	  case T_NODE:
 	  case T_ZOMBIE:
 	    break;
 	  case T_CLASS:
@@ -2468,6 +3345,9 @@ internal_object_p(VALUE obj)
 	    return 0;
 	}
     }
+    if (ptr || ! used_p) {
+        asan_poison_object(obj);
+    }
     return 1;
 }
 
@@ -2487,8 +3367,10 @@ os_obj_of_i(void *vstart, void *vend, size_t stride, void *data)
 	volatile VALUE v = (VALUE)p;
 	if (!internal_object_p(v)) {
 	    if (!oes->of || rb_obj_is_kind_of(v, oes->of)) {
-		rb_yield(v);
-		oes->num++;
+                if (!rb_multi_ractor_p() || rb_ractor_shareable_p(v)) {
+                    rb_yield(v);
+                    oes->num++;
+                }
 	    }
 	}
     }
@@ -2509,7 +3391,7 @@ os_obj_of(VALUE of)
 
 /*
  *  call-seq:
- *     ObjectSpace.each_object([module]) {|obj| ... } -> fixnum
+ *     ObjectSpace.each_object([module]) {|obj| ... } -> integer
  *     ObjectSpace.each_object([module])              -> an_enumerator
  *
  *  Calls the block once for each living, nonimmediate object in this
@@ -2518,9 +3400,9 @@ os_obj_of(VALUE of)
  *  <i>module</i>. Returns the number of objects found. Immediate
  *  objects (<code>Fixnum</code>s, <code>Symbol</code>s
  *  <code>true</code>, <code>false</code>, and <code>nil</code>) are
- *  never returned. In the example below, <code>each_object</code>
- *  returns both the numbers we defined and several constants defined in
- *  the <code>Math</code> module.
+ *  never returned. In the example below, #each_object returns both
+ *  the numbers we defined and several constants defined in the Math
+ *  module.
  *
  *  If no block is given, an enumerator is returned instead.
  *
@@ -2548,12 +3430,7 @@ os_each_obj(int argc, VALUE *argv, VALUE os)
 {
     VALUE of;
 
-    if (argc == 0) {
-	of = 0;
-    }
-    else {
-	rb_scan_args(argc, argv, "01", &of);
-    }
+    of = (!rb_check_arity(argc, 0, 1) ? 0 : argv[0]);
     RETURN_ENUMERATOR(os, 1, &of);
     return os_obj_of(of);
 }
@@ -2586,11 +3463,12 @@ rb_undefine_finalizer(VALUE obj)
 static void
 should_be_callable(VALUE block)
 {
-    if (!rb_obj_respond_to(block, rb_intern("call"), TRUE)) {
+    if (!rb_obj_respond_to(block, idCall, TRUE)) {
 	rb_raise(rb_eArgError, "wrong type argument %"PRIsVALUE" (should be callable)",
 		 rb_obj_class(block));
     }
 }
+
 static void
 should_be_finalizable(VALUE obj)
 {
@@ -2610,6 +3488,57 @@ should_be_finalizable(VALUE obj)
  *  as an argument to <i>aProc</i>. If <i>aProc</i> is a lambda or
  *  method, make sure it can be called with a single argument.
  *
+ *  The return value is an array <code>[0, aProc]</code>.
+ *
+ *  The two recommended patterns are to either create the finaliser proc
+ *  in a non-instance method where it can safely capture the needed state,
+ *  or to use a custom callable object that stores the needed state
+ *  explicitly as instance variables.
+ *
+ *      class Foo
+ *        def initialize(data_needed_for_finalization)
+ *          ObjectSpace.define_finalizer(self, self.class.create_finalizer(data_needed_for_finalization))
+ *        end
+ *
+ *        def self.create_finalizer(data_needed_for_finalization)
+ *          proc {
+ *            puts "finalizing #{data_needed_for_finalization}"
+ *          }
+ *        end
+ *      end
+ *
+ *      class Bar
+ *       class Remover
+ *          def initialize(data_needed_for_finalization)
+ *            @data_needed_for_finalization = data_needed_for_finalization
+ *          end
+ *
+ *          def call(id)
+ *            puts "finalizing #{@data_needed_for_finalization}"
+ *          end
+ *        end
+ *
+ *        def initialize(data_needed_for_finalization)
+ *          ObjectSpace.define_finalizer(self, Remover.new(data_needed_for_finalization))
+ *        end
+ *      end
+ *
+ *  Note that if your finalizer references the object to be
+ *  finalized it will never be run on GC, although it will still be
+ *  run at exit. You will get a warning if you capture the object
+ *  to be finalized as the receiver of the finalizer.
+ *
+ *      class CapturesSelf
+ *        def initialize(name)
+ *          ObjectSpace.define_finalizer(self, proc {
+ *            # this finalizer will only be run on exit
+ *            puts "finalizing #{name}"
+ *          })
+ *        end
+ *      end
+ *
+ *  Also note that finalization can be unpredictable and is never guaranteed
+ *  to be run except on exit.
  */
 
 static VALUE
@@ -2626,6 +3555,10 @@ define_final(int argc, VALUE *argv, VALUE os)
 	should_be_callable(block);
     }
 
+    if (rb_callable_receiver(block) == obj) {
+        rb_warn("finalizer references object to be finalized");
+    }
+
     return define_final0(obj, block);
 }
 
@@ -2638,7 +3571,7 @@ define_final0(VALUE obj, VALUE block)
 
     RBASIC(obj)->flags |= FL_FINALIZE;
 
-    block = rb_ary_new3(2, INT2FIX(rb_safe_level()), block);
+    block = rb_ary_new3(2, INT2FIX(0), block);
     OBJ_FREEZE(block);
 
     if (st_lookup(finalizer_table, obj, &data)) {
@@ -2646,13 +3579,13 @@ define_final0(VALUE obj, VALUE block)
 
 	/* avoid duplicate block, table is usually small */
 	{
-	    const VALUE *ptr = RARRAY_CONST_PTR(table);
 	    long len = RARRAY_LEN(table);
 	    long i;
 
-	    for (i = 0; i < len; i++, ptr++) {
-		if (rb_funcall(*ptr, idEq, 1, block)) {
-		    return *ptr;
+            for (i = 0; i < len; i++) {
+                VALUE recv = RARRAY_AREF(table, i);
+                if (rb_funcall(recv, idEq, 1, block)) {
+                    return recv;
 		}
 	    }
 	}
@@ -2691,36 +3624,45 @@ rb_gc_copy_finalizer(VALUE dest, VALUE obj)
 }
 
 static VALUE
-run_single_final(VALUE arg)
+run_single_final(VALUE final, VALUE objid)
 {
-    VALUE *args = (VALUE *)arg;
-
-    return rb_check_funcall(args[0], idCall, 1, args+1);
+    const VALUE cmd = RARRAY_AREF(final, 1);
+    return rb_check_funcall(cmd, idCall, 1, &objid);
 }
 
 static void
 run_finalizer(rb_objspace_t *objspace, VALUE obj, VALUE table)
 {
     long i;
-    VALUE args[2];
-    const int safe = rb_safe_level();
-    const VALUE errinfo = rb_errinfo();
-
-    args[1] = nonspecial_obj_id(obj);
-
-    for (i=0; i<RARRAY_LEN(table); i++) {
-	const VALUE final = RARRAY_AREF(table, i);
-	const VALUE cmd = RARRAY_AREF(final, 1);
-	const int level = OBJ_TAINTED(cmd) ?
-	    RUBY_SAFE_LEVEL_MAX : FIX2INT(RARRAY_AREF(final, 0));
-	int status = 0;
-
-	args[0] = cmd;
-	rb_set_safe_level_force(level);
-	rb_protect(run_single_final, (VALUE)args, &status);
-	rb_set_safe_level_force(safe);
-	rb_set_errinfo(errinfo);
-    }
+    enum ruby_tag_type state;
+    volatile struct {
+	VALUE errinfo;
+	VALUE objid;
+	rb_control_frame_t *cfp;
+	long finished;
+    } saved;
+    rb_execution_context_t * volatile ec = GET_EC();
+#define RESTORE_FINALIZER() (\
+	ec->cfp = saved.cfp, \
+	rb_set_errinfo(saved.errinfo))
+
+    saved.errinfo = rb_errinfo();
+    saved.objid = rb_obj_id(obj);
+    saved.cfp = ec->cfp;
+    saved.finished = 0;
+
+    EC_PUSH_TAG(ec);
+    state = EC_EXEC_TAG();
+    if (state != TAG_NONE) {
+	++saved.finished;	/* skip failed finalizer */
+    }
+    for (i = saved.finished;
+	 RESTORE_FINALIZER(), i<RARRAY_LEN(table);
+	 saved.finished = ++i) {
+	run_single_final(RARRAY_AREF(table, i), saved.objid);
+    }
+    EC_POP_TAG();
+#undef RESTORE_FINALIZER
 }
 
 static void
@@ -2742,20 +3684,34 @@ static void
 finalize_list(rb_objspace_t *objspace, VALUE zombie)
 {
     while (zombie) {
-	VALUE next_zombie = RZOMBIE(zombie)->next;
-	struct heap_page *page = GET_HEAP_PAGE(zombie);
+        VALUE next_zombie;
+        struct heap_page *page;
+        asan_unpoison_object(zombie, false);
+        next_zombie = RZOMBIE(zombie)->next;
+        page = GET_HEAP_PAGE(zombie);
 
 	run_final(objspace, zombie);
 
-	RZOMBIE(zombie)->basic.flags = 0;
-	heap_pages_final_slots--;
-	page->final_slots--;
-	page->free_slots++;
-	heap_page_add_freeobj(objspace, GET_HEAP_PAGE(zombie), zombie);
+        RB_VM_LOCK_ENTER();
+        {
+            GC_ASSERT(BUILTIN_TYPE(zombie) == T_ZOMBIE);
+            if (FL_TEST(zombie, FL_SEEN_OBJ_ID)) {
+                obj_free_object_id(objspace, zombie);
+            }
 
-	objspace->profile.total_freed_objects++;
+            RZOMBIE(zombie)->basic.flags = 0;
+            GC_ASSERT(heap_pages_final_slots > 0);
+            GC_ASSERT(page->final_slots > 0);
 
-	zombie = next_zombie;
+            heap_pages_final_slots--;
+            page->final_slots--;
+            page->free_slots++;
+            heap_page_add_freeobj(objspace, GET_HEAP_PAGE(zombie), zombie);
+            objspace->profile.total_freed_objects++;
+        }
+        RB_VM_LOCK_LEAVE();
+
+        zombie = next_zombie;
     }
 }
 
@@ -2774,15 +3730,13 @@ gc_finalize_deferred(void *dmy)
 {
     rb_objspace_t *objspace = dmy;
     if (ATOMIC_EXCHANGE(finalizing, 1)) return;
-    finalize_deferred(objspace);
-    ATOMIC_SET(finalizing, 0);
-}
 
-/* TODO: to keep compatibility, maybe unused. */
-void
-rb_gc_finalize_deferred(void)
-{
-    gc_finalize_deferred(0);
+    RB_VM_LOCK_ENTER();
+    {
+        finalize_deferred(objspace);
+        ATOMIC_SET(finalizing, 0);
+    }
+    RB_VM_LOCK_LEAVE();
 }
 
 static void
@@ -2811,28 +3765,24 @@ force_chain_object(st_data_t key, st_data_t val, st_data_t arg)
     return ST_CONTINUE;
 }
 
-void
-rb_gc_call_finalizer_at_exit(void)
-{
-#if RGENGC_CHECK_MODE >= 2
-    gc_verify_internal_consistency(Qnil);
-#endif
-    rb_objspace_call_finalizer(&rb_objspace);
-}
+bool rb_obj_is_main_ractor(VALUE gv);
 
-static void
+void
 rb_objspace_call_finalizer(rb_objspace_t *objspace)
 {
     RVALUE *p, *pend;
     size_t i;
 
+#if RGENGC_CHECK_MODE >= 2
+    gc_verify_internal_consistency(objspace);
+#endif
     gc_rest(objspace);
 
     if (ATOMIC_EXCHANGE(finalizing, 1)) return;
 
     /* run finalizers */
     finalize_deferred(objspace);
-    assert(heap_pages_deferred_final == 0);
+    GC_ASSERT(heap_pages_deferred_final == 0);
 
     gc_rest(objspace);
     /* prohibit incremental GC */
@@ -2853,43 +3803,54 @@ rb_objspace_call_finalizer(rb_objspace_t *objspace)
     }
 
     /* prohibit GC because force T_DATA finalizers can break an object graph consistency */
-    dont_gc = 1;
+    dont_gc_on();
 
     /* running data/file finalizers are part of garbage collection */
-    gc_enter(objspace, "rb_objspace_call_finalizer");
+    unsigned int lock_lev;
+    gc_enter(objspace, gc_enter_event_finalizer, &lock_lev);
 
     /* run data/file object's finalizers */
     for (i = 0; i < heap_allocated_pages; i++) {
 	p = heap_pages_sorted[i]->start; pend = p + heap_pages_sorted[i]->total_slots;
 	while (p < pend) {
-	    switch (BUILTIN_TYPE(p)) {
+            VALUE vp = (VALUE)p;
+            void *poisoned = asan_poisoned_object_p(vp);
+            asan_unpoison_object(vp, false);
+            switch (BUILTIN_TYPE(vp)) {
 	      case T_DATA:
 		if (!DATA_PTR(p) || !RANY(p)->as.data.dfree) break;
-		if (rb_obj_is_thread((VALUE)p)) break;
-		if (rb_obj_is_mutex((VALUE)p)) break;
-		if (rb_obj_is_fiber((VALUE)p)) break;
-		p->as.free.flags = 0;
-		if (RTYPEDDATA_P(p)) {
+                if (rb_obj_is_thread(vp)) break;
+                if (rb_obj_is_mutex(vp)) break;
+                if (rb_obj_is_fiber(vp)) break;
+                if (rb_obj_is_main_ractor(vp)) break;
+                if (RTYPEDDATA_P(vp)) {
 		    RDATA(p)->dfree = RANY(p)->as.typeddata.type->function.dfree;
 		}
-		if (RANY(p)->as.data.dfree == (RUBY_DATA_FUNC)-1) {
+                p->as.free.flags = 0;
+		if (RANY(p)->as.data.dfree == RUBY_DEFAULT_FREE) {
 		    xfree(DATA_PTR(p));
 		}
 		else if (RANY(p)->as.data.dfree) {
-		    make_zombie(objspace, (VALUE)p, RANY(p)->as.data.dfree, RANY(p)->as.data.data);
+                    make_zombie(objspace, vp, RANY(p)->as.data.dfree, RANY(p)->as.data.data);
 		}
 		break;
 	      case T_FILE:
 		if (RANY(p)->as.file.fptr) {
-		    make_io_zombie(objspace, (VALUE)p);
+                    make_io_zombie(objspace, vp);
 		}
 		break;
+              default:
+                break;
 	    }
+            if (poisoned) {
+                GC_ASSERT(BUILTIN_TYPE(vp) == T_NONE);
+                asan_poison_object(vp);
+            }
 	    p++;
 	}
     }
 
-    gc_exit(objspace, "rb_objspace_call_finalizer");
+    gc_exit(objspace, gc_enter_event_finalizer, &lock_lev);
 
     if (heap_pages_deferred_final) {
 	finalize_list(objspace, heap_pages_deferred_final);
@@ -2900,16 +3861,6 @@ rb_objspace_call_finalizer(rb_objspace_t *objspace)
     ATOMIC_SET(finalizing, 0);
 }
 
-PUREFUNC(static inline int is_id_value(rb_objspace_t *objspace, VALUE ptr));
-static inline int
-is_id_value(rb_objspace_t *objspace, VALUE ptr)
-{
-    if (!is_pointer_to_heap(objspace, (void *)ptr)) return FALSE;
-    if (BUILTIN_TYPE(ptr) > T_FIXNUM) return FALSE;
-    if (BUILTIN_TYPE(ptr) == T_ICLASS) return FALSE;
-    return TRUE;
-}
-
 static inline int
 heap_is_swept_object(rb_objspace_t *objspace, rb_heap_t *heap, VALUE ptr)
 {
@@ -2948,8 +3899,11 @@ is_live_object(rb_objspace_t *objspace, VALUE ptr)
 {
     switch (BUILTIN_TYPE(ptr)) {
       case T_NONE:
+      case T_MOVED:
       case T_ZOMBIE:
 	return FALSE;
+      default:
+        break;
     }
 
     if (!is_garbage_object(objspace, ptr)) {
@@ -2982,6 +3936,18 @@ rb_objspace_garbage_object_p(VALUE obj)
     return is_garbage_object(objspace, obj);
 }
 
+static VALUE
+id2ref_obj_tbl(rb_objspace_t *objspace, VALUE objid)
+{
+    VALUE orig;
+    if (st_lookup(objspace->id_to_obj_tbl, objid, &orig)) {
+        return orig;
+    }
+    else {
+        return Qundef;
+    }
+}
+
 /*
  *  call-seq:
  *     ObjectSpace._id2ref(object_id) -> an_object
@@ -2993,10 +3959,12 @@ rb_objspace_garbage_object_p(VALUE obj)
  *     r = ObjectSpace._id2ref(s.object_id)   #=> "I am a string"
  *     r == s                                 #=> true
  *
+ *  On multi-ractor mode, if the object is not sharable, it raises
+ *  RangeError.
  */
 
 static VALUE
-id2ref(VALUE obj, VALUE objid)
+id2ref(VALUE objid)
 {
 #if SIZEOF_LONG == SIZEOF_VOIDP
 #define NUM2PTR(x) NUM2ULONG(x)
@@ -3005,35 +3973,110 @@ id2ref(VALUE obj, VALUE objid)
 #endif
     rb_objspace_t *objspace = &rb_objspace;
     VALUE ptr;
+    VALUE orig;
     void *p0;
 
-    ptr = NUM2PTR(objid);
-    p0 = (void *)ptr;
+    objid = rb_to_int(objid);
+    if (FIXNUM_P(objid) || rb_big_size(objid) <= SIZEOF_VOIDP) {
+        ptr = NUM2PTR(objid);
+        if (ptr == Qtrue) return Qtrue;
+        if (ptr == Qfalse) return Qfalse;
+        if (ptr == Qnil) return Qnil;
+        if (FIXNUM_P(ptr)) return (VALUE)ptr;
+        if (FLONUM_P(ptr)) return (VALUE)ptr;
+
+        ptr = obj_id_to_ref(objid);
+        if ((ptr % sizeof(RVALUE)) == (4 << 2)) {
+            ID symid = ptr / sizeof(RVALUE);
+            p0 = (void *)ptr;
+            if (rb_id2str(symid) == 0)
+                rb_raise(rb_eRangeError, "%p is not symbol id value", p0);
+            return ID2SYM(symid);
+        }
+    }
 
-    if (ptr == Qtrue) return Qtrue;
-    if (ptr == Qfalse) return Qfalse;
-    if (ptr == Qnil) return Qnil;
-    if (FIXNUM_P(ptr)) return (VALUE)ptr;
-    if (FLONUM_P(ptr)) return (VALUE)ptr;
-    ptr = obj_id_to_ref(objid);
+    if ((orig = id2ref_obj_tbl(objspace, objid)) != Qundef &&
+        is_live_object(objspace, orig)) {
 
-    if ((ptr % sizeof(RVALUE)) == (4 << 2)) {
-        ID symid = ptr / sizeof(RVALUE);
-        if (rb_id2str(symid) == 0)
-	    rb_raise(rb_eRangeError, "%p is not symbol id value", p0);
-	return ID2SYM(symid);
+        if (!rb_multi_ractor_p() || rb_ractor_shareable_p(orig)) {
+            return orig;
+        }
+        else {
+            rb_raise(rb_eRangeError, "%+"PRIsVALUE" is id of the unshareable object on multi-ractor", rb_int2str(objid, 10));
+        }
+    }
+
+    if (rb_int_ge(objid, objspace->next_object_id)) {
+        rb_raise(rb_eRangeError, "%+"PRIsVALUE" is not id value", rb_int2str(objid, 10));
+    } else {
+        rb_raise(rb_eRangeError, "%+"PRIsVALUE" is recycled object", rb_int2str(objid, 10));
     }
+}
 
-    if (!is_id_value(objspace, ptr)) {
-	rb_raise(rb_eRangeError, "%p is not id value", p0);
+static VALUE
+os_id2ref(VALUE os, VALUE objid)
+{
+    return id2ref(objid);
+}
+
+static VALUE
+rb_find_object_id(VALUE obj, VALUE (*get_heap_object_id)(VALUE))
+{
+    if (STATIC_SYM_P(obj)) {
+        return (SYM2ID(obj) * sizeof(RVALUE) + (4 << 2)) | FIXNUM_FLAG;
+    }
+    else if (FLONUM_P(obj)) {
+#if SIZEOF_LONG == SIZEOF_VOIDP
+        return LONG2NUM((SIGNED_VALUE)obj);
+#else
+        return LL2NUM((SIGNED_VALUE)obj);
+#endif
     }
-    if (!is_live_object(objspace, ptr)) {
-	rb_raise(rb_eRangeError, "%p is recycled object", p0);
+    else if (SPECIAL_CONST_P(obj)) {
+        return LONG2NUM((SIGNED_VALUE)obj);
+    }
+
+    return get_heap_object_id(obj);
+}
+
+static VALUE
+cached_object_id(VALUE obj)
+{
+    VALUE id;
+    rb_objspace_t *objspace = &rb_objspace;
+
+    RB_VM_LOCK_ENTER();
+    if (st_lookup(objspace->obj_to_id_tbl, (st_data_t)obj, &id)) {
+        GC_ASSERT(FL_TEST(obj, FL_SEEN_OBJ_ID));
     }
-    if (RBASIC(ptr)->klass == 0) {
-	rb_raise(rb_eRangeError, "%p is internal object", p0);
+    else {
+        GC_ASSERT(!FL_TEST(obj, FL_SEEN_OBJ_ID));
+
+        id = objspace->next_object_id;
+        objspace->next_object_id = rb_int_plus(id, INT2FIX(OBJ_ID_INCREMENT));
+
+        VALUE already_disabled = rb_gc_disable_no_rest();
+        st_insert(objspace->obj_to_id_tbl, (st_data_t)obj, (st_data_t)id);
+        st_insert(objspace->id_to_obj_tbl, (st_data_t)id, (st_data_t)obj);
+        if (already_disabled == Qfalse) rb_objspace_gc_enable(objspace);
+        FL_SET(obj, FL_SEEN_OBJ_ID);
     }
-    return (VALUE)ptr;
+    RB_VM_LOCK_LEAVE();
+
+    return id;
+}
+
+static VALUE
+nonspecial_obj_id_(VALUE obj)
+{
+    return nonspecial_obj_id(obj);
+}
+
+
+VALUE
+rb_memory_id(VALUE obj)
+{
+    return rb_find_object_id(obj, nonspecial_obj_id_);
 }
 
 /*
@@ -3052,6 +4095,8 @@ id2ref(VALUE obj, VALUE objid)
  *  Note: that some objects of builtin classes are reused for optimization.
  *  This is the case for immediate values and frozen string literals.
  *
+ *  BasicObject implements +__id__+, Kernel implements +object_id+.
+ *
  *  Immediate values are not passed by reference but are passed by value:
  *  +nil+, +true+, +false+, Fixnums, Symbols, and some Floats.
  *
@@ -3092,23 +4137,27 @@ rb_obj_id(VALUE obj)
      *  24 if 32-bit, double is 8-byte aligned
      *  40 if 64-bit
      */
-    if (STATIC_SYM_P(obj)) {
-        return (SYM2ID(obj) * sizeof(RVALUE) + (4 << 2)) | FIXNUM_FLAG;
-    }
-    else if (FLONUM_P(obj)) {
-#if SIZEOF_LONG == SIZEOF_VOIDP
-	return LONG2NUM((SIGNED_VALUE)obj);
-#else
-	return LL2NUM((SIGNED_VALUE)obj);
-#endif
-    }
-    else if (SPECIAL_CONST_P(obj)) {
-	return LONG2NUM((SIGNED_VALUE)obj);
-    }
-    return nonspecial_obj_id(obj);
+
+    return rb_find_object_id(obj, cached_object_id);
 }
 
-#include "regint.h"
+static enum rb_id_table_iterator_result
+cc_table_memsize_i(VALUE ccs_ptr, void *data_ptr)
+{
+    size_t *total_size = data_ptr;
+    struct rb_class_cc_entries *ccs = (struct rb_class_cc_entries *)ccs_ptr;
+    *total_size += sizeof(*ccs);
+    *total_size += sizeof(ccs->entries[0]) * ccs->capa;
+    return ID_TABLE_CONTINUE;
+}
+
+static size_t
+cc_table_memsize(struct rb_id_table *cc_table)
+{
+    size_t total = rb_id_table_memsize(cc_table);
+    rb_id_table_foreach_values(cc_table, cc_table_memsize_i, &total);
+    return total;
+}
 
 static size_t
 obj_memsize_of(VALUE obj, int use_all_types)
@@ -3125,21 +4174,21 @@ obj_memsize_of(VALUE obj, int use_all_types)
 
     switch (BUILTIN_TYPE(obj)) {
       case T_OBJECT:
-	if (!(RBASIC(obj)->flags & ROBJECT_EMBED) &&
-	    ROBJECT(obj)->as.heap.ivptr) {
-	    size += ROBJECT(obj)->as.heap.numiv * sizeof(VALUE);
+	if (!(RBASIC(obj)->flags & ROBJECT_EMBED)) {
+	    size += ROBJECT_NUMIV(obj) * sizeof(VALUE);
 	}
 	break;
       case T_MODULE:
       case T_CLASS:
-	if (RCLASS_M_TBL(obj)) {
-	    size += rb_id_table_memsize(RCLASS_M_TBL(obj));
-	}
 	if (RCLASS_EXT(obj)) {
+            if (RCLASS_M_TBL(obj)) {
+                size += rb_id_table_memsize(RCLASS_M_TBL(obj));
+            }
 	    if (RCLASS_IV_TBL(obj)) {
 		size += st_memsize(RCLASS_IV_TBL(obj));
 	    }
 	    if (RCLASS_IV_INDEX_TBL(obj)) {
+                // TODO: more correct value
 		size += st_memsize(RCLASS_IV_INDEX_TBL(obj));
 	    }
 	    if (RCLASS(obj)->ptr->iv_tbl) {
@@ -3148,15 +4197,21 @@ obj_memsize_of(VALUE obj, int use_all_types)
 	    if (RCLASS(obj)->ptr->const_tbl) {
 		size += rb_id_table_memsize(RCLASS(obj)->ptr->const_tbl);
 	    }
+            if (RCLASS_CC_TBL(obj)) {
+                size += cc_table_memsize(RCLASS_CC_TBL(obj));
+            }
 	    size += sizeof(rb_classext_t);
 	}
 	break;
       case T_ICLASS:
-	if (FL_TEST(obj, RICLASS_IS_ORIGIN)) {
+        if (RICLASS_OWNS_M_TBL_P(obj)) {
 	    if (RCLASS_M_TBL(obj)) {
 		size += rb_id_table_memsize(RCLASS_M_TBL(obj));
 	    }
 	}
+        if (RCLASS_EXT(obj) && RCLASS_CC_TBL(obj)) {
+            size += cc_table_memsize(RCLASS_CC_TBL(obj));
+        }
 	break;
       case T_STRING:
 	size += rb_str_memsize(obj);
@@ -3165,9 +4220,16 @@ obj_memsize_of(VALUE obj, int use_all_types)
 	size += rb_ary_memsize(obj);
 	break;
       case T_HASH:
-	if (RHASH(obj)->ntbl) {
-	    size += st_memsize(RHASH(obj)->ntbl);
+        if (RHASH_AR_TABLE_P(obj)) {
+            if (RHASH_AR_TABLE(obj) != NULL) {
+                size_t rb_hash_ar_table_size();
+                size += rb_hash_ar_table_size();
+            }
 	}
+        else {
+            VM_ASSERT(RHASH_ST_TABLE(obj) != NULL);
+            size += st_memsize(RHASH_ST_TABLE(obj));
+        }
 	break;
       case T_REGEXP:
 	if (RREGEXP_PTR(obj)) {
@@ -3192,7 +4254,9 @@ obj_memsize_of(VALUE obj, int use_all_types)
 	break;
       case T_RATIONAL:
       case T_COMPLEX:
+        break;
       case T_IMEMO:
+        size += imemo_memsize(obj);
 	break;
 
       case T_FLOAT:
@@ -3206,7 +4270,7 @@ obj_memsize_of(VALUE obj, int use_all_types)
 	break;
 
       case T_NODE:
-	if (use_all_types) size += rb_node_memsize(obj);
+	UNEXPECTED_NODE(obj_memsize_of);
 	break;
 
       case T_STRUCT:
@@ -3217,6 +4281,7 @@ obj_memsize_of(VALUE obj, int use_all_types)
 	break;
 
       case T_ZOMBIE:
+      case T_MOVED:
 	break;
 
       default:
@@ -3242,6 +4307,43 @@ set_zero(st_data_t key, st_data_t val, st_data_t arg)
     return ST_CONTINUE;
 }
 
+static VALUE
+type_sym(size_t type)
+{
+    switch (type) {
+#define COUNT_TYPE(t) case (t): return 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_IMEMO);
+        COUNT_TYPE(T_UNDEF);
+        COUNT_TYPE(T_NODE);
+        COUNT_TYPE(T_ICLASS);
+        COUNT_TYPE(T_ZOMBIE);
+        COUNT_TYPE(T_MOVED);
+#undef COUNT_TYPE
+        default:              return SIZET2NUM(type); break;
+    }
+}
+
 /*
  *  call-seq:
  *     ObjectSpace.count_objects([result_hash]) -> hash
@@ -3285,9 +4387,10 @@ count_objects(int argc, VALUE *argv, VALUE os)
     size_t freed = 0;
     size_t total = 0;
     size_t i;
-    VALUE hash;
+    VALUE hash = Qnil;
 
-    if (rb_scan_args(argc, argv, "01", &hash) == 1) {
+    if (rb_check_arity(argc, 0, 1) == 1) {
+        hash = argv[0];
         if (!RB_TYPE_P(hash, T_HASH))
             rb_raise(rb_eTypeError, "non-hash given");
     }
@@ -3302,12 +4405,19 @@ count_objects(int argc, VALUE *argv, VALUE os)
 
 	p = page->start; pend = p + page->total_slots;
 	for (;p < pend; p++) {
+            VALUE vp = (VALUE)p;
+            void *poisoned = asan_poisoned_object_p(vp);
+            asan_unpoison_object(vp, false);
 	    if (p->as.basic.flags) {
-		counts[BUILTIN_TYPE(p)]++;
+                counts[BUILTIN_TYPE(vp)]++;
 	    }
 	    else {
 		freed++;
 	    }
+            if (poisoned) {
+                GC_ASSERT(BUILTIN_TYPE(vp) == T_NONE);
+                asan_poison_object(vp);
+            }
 	}
 	total += page->total_slots;
     }
@@ -3316,44 +4426,13 @@ count_objects(int argc, VALUE *argv, VALUE os)
         hash = rb_hash_new();
     }
     else if (!RHASH_EMPTY_P(hash)) {
-        st_foreach(RHASH_TBL_RAW(hash), set_zero, hash);
+        rb_hash_stlike_foreach(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_IMEMO);
-	    COUNT_TYPE(T_UNDEF);
-	    COUNT_TYPE(T_NODE);
-	    COUNT_TYPE(T_ICLASS);
-	    COUNT_TYPE(T_ZOMBIE);
-#undef COUNT_TYPE
-          default:              type = INT2NUM(i); break;
-        }
+        VALUE type = type_sym(i);
         if (counts[i])
             rb_hash_aset(hash, type, SIZET2NUM(counts[i]));
     }
@@ -3388,13 +4467,369 @@ objspace_free_slots(rb_objspace_t *objspace)
 static void
 gc_setup_mark_bits(struct heap_page *page)
 {
-#if USE_RGENGC
     /* copy oldgen bitmap to mark bitmap */
     memcpy(&page->mark_bits[0], &page->uncollectible_bits[0], HEAP_PAGE_BITMAP_SIZE);
+}
+
+static int gc_is_moveable_obj(rb_objspace_t *objspace, VALUE obj);
+static VALUE gc_move(rb_objspace_t *objspace, VALUE scan, VALUE free);
+
+static void
+lock_page_body(rb_objspace_t *objspace, struct heap_page_body *body)
+{
+#if defined(_WIN32)
+    DWORD old_protect;
+
+    if (!VirtualProtect(body, HEAP_PAGE_SIZE, PAGE_NOACCESS, &old_protect)) {
+#else
+    if(mprotect(body, HEAP_PAGE_SIZE, PROT_NONE)) {
+#endif
+        rb_bug("Couldn't protect page %p", (void *)body);
+    } else {
+        gc_report(5, objspace, "Protecting page in move %p\n", (void *)body);
+    }
+}
+
+static void
+unlock_page_body(rb_objspace_t *objspace, struct heap_page_body *body)
+{
+#if defined(_WIN32)
+    DWORD old_protect;
+
+    if (!VirtualProtect(body, HEAP_PAGE_SIZE, PAGE_READWRITE, &old_protect)) {
+#else
+    if(mprotect(body, HEAP_PAGE_SIZE, PROT_READ | PROT_WRITE)) {
+#endif
+        rb_bug("Couldn't unprotect page %p", (void *)body);
+    } else {
+        gc_report(5, objspace, "Unprotecting page in move %p\n", (void *)body);
+    }
+}
+
+static short
+try_move(rb_objspace_t *objspace, rb_heap_t *heap, struct heap_page *sweep_page, VALUE dest)
+{
+    struct heap_page * cursor = heap->compact_cursor;
+    char from_freelist = 0;
+
+    GC_ASSERT(!MARKED_IN_BITMAP(GET_HEAP_MARK_BITS(dest), dest));
+
+    /* T_NONE objects came from the free list.  If the object is *not* a
+     * T_NONE, it is an object that just got freed but hasn't been
+     * added to the freelist yet */
+
+    if (BUILTIN_TYPE(dest) == T_NONE) {
+        from_freelist = 1;
+    }
+
+    while(1) {
+        size_t index = heap->compact_cursor_index;
+
+        bits_t *mark_bits = cursor->mark_bits;
+        bits_t *pin_bits = cursor->pinned_bits;
+        RVALUE * p = cursor->start;
+        RVALUE * offset = p - NUM_IN_PAGE(p);
+
+        /* Find an object to move and move it. Movable objects must be
+         * marked, so we iterate using the marking bitmap */
+        for (size_t i = index; i < HEAP_PAGE_BITMAP_LIMIT; i++) {
+            bits_t bits = mark_bits[i] & ~pin_bits[i];
+
+            if (bits) {
+                p = offset + i * BITS_BITLENGTH;
+
+                do {
+                    if (bits & 1) {
+                        /* We're trying to move "p" */
+                        objspace->rcompactor.considered_count_table[BUILTIN_TYPE((VALUE)p)]++;
+
+                        if (gc_is_moveable_obj(objspace, (VALUE)p)) {
+                            /* We were able to move "p" */
+                            objspace->rcompactor.moved_count_table[BUILTIN_TYPE((VALUE)p)]++;
+                            objspace->rcompactor.total_moved++;
+                            gc_move(objspace, (VALUE)p, dest);
+                            gc_pin(objspace, (VALUE)p);
+                            heap->compact_cursor_index = i;
+                            if (from_freelist) {
+                                FL_SET((VALUE)p, FL_FROM_FREELIST);
+                            }
+
+                            return 1;
+                        }
+                    }
+                    p++;
+                    bits >>= 1;
+                } while (bits);
+            }
+        }
+
+        /* We couldn't find a movable object on the compact cursor, so lets
+         * move to the next page (previous page since we are traveling in the
+         * opposite direction of the sweep cursor) and look there. */
+
+        struct heap_page * next;
+
+        next = list_prev(&heap->pages, cursor, page_node);
+
+        /* Protect the current cursor since it probably has T_MOVED slots. */
+        lock_page_body(objspace, GET_PAGE_BODY(cursor->start));
+
+        heap->compact_cursor = next;
+        heap->compact_cursor_index = 0;
+        cursor = next;
+
+        // Cursors have met, lets quit.  We set `heap->compact_cursor` equal
+        // to `heap->sweeping_page` so we know how far to iterate through
+        // the heap when unprotecting pages.
+        if (next == sweep_page) {
+            break;
+        }
+    }
+
+    return 0;
+}
+
+static void
+gc_unprotect_pages(rb_objspace_t *objspace, rb_heap_t *heap)
+{
+    struct heap_page *cursor = heap->compact_cursor;
+
+    while(cursor) {
+        unlock_page_body(objspace, GET_PAGE_BODY(cursor->start));
+        cursor = list_next(&heap->pages, cursor, page_node);
+    }
+}
+
+static void gc_update_references(rb_objspace_t * objspace, rb_heap_t *heap);
+static void invalidate_moved_page(rb_objspace_t *objspace, struct heap_page *page);
+
+static void read_barrier_handler(intptr_t address)
+{
+    VALUE obj;
+    rb_objspace_t * objspace = &rb_objspace;
+
+    address -= address % sizeof(RVALUE);
+
+    obj = (VALUE)address;
+
+    RB_VM_LOCK_ENTER();
+    {
+        unlock_page_body(objspace, GET_PAGE_BODY(obj));
+
+        objspace->profile.read_barrier_faults++;
+
+        invalidate_moved_page(objspace, GET_HEAP_PAGE(obj));
+    }
+    RB_VM_LOCK_LEAVE();
+}
+
+#if defined(_WIN32)
+static LPTOP_LEVEL_EXCEPTION_FILTER old_handler;
+typedef void (*signal_handler)(int);
+static signal_handler old_sigsegv_handler;
+
+static LONG WINAPI read_barrier_signal(EXCEPTION_POINTERS * info)
+{
+    /* EXCEPTION_ACCESS_VIOLATION is what's raised by access to protected pages */
+    if (info->ExceptionRecord->ExceptionCode == EXCEPTION_ACCESS_VIOLATION) {
+        /* > The second array element specifies the virtual address of the inaccessible data.
+         * https://docs.microsoft.com/en-us/windows/win32/api/winnt/ns-winnt-exception_record
+         *
+         * Use this address to invalidate the page */
+        read_barrier_handler((intptr_t)info->ExceptionRecord->ExceptionInformation[1]);
+        return EXCEPTION_CONTINUE_EXECUTION;
+    } else {
+        return EXCEPTION_CONTINUE_SEARCH;
+    }
+}
+
+static void
+uninstall_handlers(void)
+{
+    signal(SIGSEGV, old_sigsegv_handler);
+    SetUnhandledExceptionFilter(old_handler);
+}
+
+static void
+install_handlers(void)
+{
+    /* Remove SEGV handler so that the Unhandled Exception Filter handles it */
+    old_sigsegv_handler = signal(SIGSEGV, NULL);
+    /* Unhandled Exception Filter has access to the violation address similar
+     * to si_addr from sigaction */
+    old_handler = SetUnhandledExceptionFilter(read_barrier_signal);
+}
 #else
-    /* clear mark bitmap */
-    memset(&page->mark_bits[0], 0, HEAP_PAGE_BITMAP_SIZE);
+static struct sigaction old_sigbus_handler;
+static struct sigaction old_sigsegv_handler;
+
+static void
+read_barrier_signal(int sig, siginfo_t * info, void * data)
+{
+    // setup SEGV/BUS handlers for errors
+    struct sigaction prev_sigbus, prev_sigsegv;
+    sigaction(SIGBUS, &old_sigbus_handler, &prev_sigbus);
+    sigaction(SIGSEGV, &old_sigsegv_handler, &prev_sigsegv);
+
+    // enable SIGBUS/SEGV
+    sigset_t set, prev_set;
+    sigemptyset(&set);
+    sigaddset(&set, SIGBUS);
+    sigaddset(&set, SIGSEGV);
+    sigprocmask(SIG_UNBLOCK, &set, &prev_set);
+
+    // run handler
+    read_barrier_handler((intptr_t)info->si_addr);
+
+    // reset SEGV/BUS handlers
+    sigaction(SIGBUS, &prev_sigbus, NULL);
+    sigaction(SIGSEGV, &prev_sigsegv, NULL);
+    sigprocmask(SIG_SETMASK, &prev_set, NULL);
+}
+
+static void
+uninstall_handlers(void)
+{
+    sigaction(SIGBUS, &old_sigbus_handler, NULL);
+    sigaction(SIGSEGV, &old_sigsegv_handler, NULL);
+}
+
+static void
+install_handlers(void)
+{
+    struct sigaction action;
+    memset(&action, 0, sizeof(struct sigaction));
+    sigemptyset(&action.sa_mask);
+    action.sa_sigaction = read_barrier_signal;
+    action.sa_flags = SA_SIGINFO | SA_ONSTACK;
+
+    sigaction(SIGBUS, &action, &old_sigbus_handler);
+    sigaction(SIGSEGV, &action, &old_sigsegv_handler);
+}
 #endif
+
+static void
+revert_stack_objects(VALUE stack_obj, void *ctx)
+{
+    rb_objspace_t * objspace = (rb_objspace_t*)ctx;
+
+    if (BUILTIN_TYPE(stack_obj) == T_MOVED) {
+        /* For now we'll revert the whole page if the object made it to the
+         * stack.  I think we can change this to move just the one object
+         * back though */
+        invalidate_moved_page(objspace, GET_HEAP_PAGE(stack_obj));
+    }
+}
+
+static void
+check_stack_for_moved(rb_objspace_t *objspace)
+{
+    rb_execution_context_t *ec = GET_EC();
+    rb_vm_t *vm = rb_ec_vm_ptr(ec);
+    rb_vm_each_stack_value(vm, revert_stack_objects, (void*)objspace);
+}
+
+static void
+gc_compact_finish(rb_objspace_t *objspace, rb_heap_t *heap)
+{
+    GC_ASSERT(heap->sweeping_page == heap->compact_cursor);
+
+    gc_unprotect_pages(objspace, heap);
+    uninstall_handlers();
+
+    /* The mutator is allowed to run during incremental sweeping. T_MOVED
+     * objects can get pushed on the stack and when the compaction process
+     * finishes up, it may remove the read barrier before anything has a
+     * chance to read from the T_MOVED address. To fix this, we scan the stack
+     * then revert any moved objects that made it to the stack. */
+    check_stack_for_moved(objspace);
+
+    gc_update_references(objspace, heap);
+    heap->compact_cursor = NULL;
+    heap->compact_cursor_index = 0;
+    objspace->profile.compact_count++;
+    if (gc_prof_enabled(objspace)) {
+        gc_profile_record *record = gc_prof_record(objspace);
+        record->moved_objects = objspace->rcompactor.total_moved - record->moved_objects;
+    }
+    rb_clear_constant_cache();
+    objspace->flags.during_compacting = FALSE;
+}
+
+static int
+gc_fill_swept_page(rb_objspace_t *objspace, rb_heap_t *heap, struct heap_page *sweep_page, int *freed_slots, int *empty_slots)
+{
+    /* Find any pinned but not marked objects and try to fill those slots */
+    int i;
+    int moved_slots = 0;
+    int finished_compacting = 0;
+    bits_t *mark_bits, *pin_bits;
+    bits_t bitset;
+    RVALUE *p, *offset;
+
+    mark_bits = sweep_page->mark_bits;
+    pin_bits = sweep_page->pinned_bits;
+
+    p = sweep_page->start;
+    offset = p - NUM_IN_PAGE(p);
+
+    struct heap_page * cursor = heap->compact_cursor;
+
+    unlock_page_body(objspace, GET_PAGE_BODY(cursor->start));
+
+    for (i=0; i < HEAP_PAGE_BITMAP_LIMIT; i++) {
+        /* *Want to move* objects are pinned but not marked. */
+        bitset = pin_bits[i] & ~mark_bits[i];
+
+        if (bitset) {
+            p = offset + i * BITS_BITLENGTH;
+            do {
+                if (bitset & 1) {
+                    VALUE dest = (VALUE)p;
+
+                    GC_ASSERT(MARKED_IN_BITMAP(GET_HEAP_PINNED_BITS(dest), dest));
+                    GC_ASSERT(!MARKED_IN_BITMAP(GET_HEAP_MARK_BITS(dest), dest));
+
+                    CLEAR_IN_BITMAP(GET_HEAP_PINNED_BITS(dest), dest);
+
+                    if (finished_compacting) {
+                        if (BUILTIN_TYPE(dest) == T_NONE) {
+                            (*empty_slots)++;
+                        } else {
+                            (*freed_slots)++;
+                        }
+                        (void)VALGRIND_MAKE_MEM_UNDEFINED((void*)dest, sizeof(RVALUE));
+                        heap_page_add_freeobj(objspace, sweep_page, dest);
+                    } else {
+                        /* Zombie slots don't get marked, but we can't reuse
+                         * their memory until they have their finalizers run.*/
+                        if (BUILTIN_TYPE(dest) != T_ZOMBIE) {
+                            if(!try_move(objspace, heap, sweep_page, dest)) {
+                                finished_compacting = 1;
+                                (void)VALGRIND_MAKE_MEM_UNDEFINED((void*)p, sizeof(RVALUE));
+                                gc_report(5, objspace, "Quit compacting, couldn't find an object to move\n");
+                                if (BUILTIN_TYPE(dest) == T_NONE) {
+                                    (*empty_slots)++;
+                                } else {
+                                    (*freed_slots)++;
+                                }
+                                heap_page_add_freeobj(objspace, sweep_page, dest);
+                                gc_report(3, objspace, "page_sweep: %s is added to freelist\n", obj_info(dest));
+                            } else {
+                                moved_slots++;
+                            }
+                        }
+                    }
+                }
+                p++;
+                bitset >>= 1;
+            } while (bitset);
+        }
+    }
+
+    lock_page_body(objspace, GET_PAGE_BODY(heap->compact_cursor->start));
+
+    return finished_compacting;
 }
 
 static inline int
@@ -3402,54 +4837,109 @@ gc_page_sweep(rb_objspace_t *objspace, rb_heap_t *heap, struct heap_page *sweep_
 {
     int i;
     int empty_slots = 0, freed_slots = 0, final_slots = 0;
-    RVALUE *p, *pend,*offset;
+    int was_compacting = 0;
+    RVALUE *p, *offset;
     bits_t *bits, bitset;
 
     gc_report(2, objspace, "page_sweep: start.\n");
 
+    if (heap->compact_cursor) {
+        if (sweep_page == heap->compact_cursor) {
+            /* The compaction cursor and sweep page met, so we need to quit compacting */
+            gc_report(5, objspace, "Quit compacting, mark and compact cursor met\n");
+            gc_compact_finish(objspace, heap);
+        } else {
+            /* We anticipate filling the page, so NULL out the freelist. */
+            asan_unpoison_memory_region(&sweep_page->freelist, sizeof(RVALUE*), false);
+            sweep_page->freelist = NULL;
+            asan_poison_memory_region(&sweep_page->freelist, sizeof(RVALUE*));
+            was_compacting = 1;
+        }
+    }
+
     sweep_page->flags.before_sweep = FALSE;
 
-    p = sweep_page->start; pend = p + sweep_page->total_slots;
+    p = sweep_page->start;
     offset = p - NUM_IN_PAGE(p);
     bits = sweep_page->mark_bits;
 
     /* create guard : fill 1 out-of-range */
     bits[BITMAP_INDEX(p)] |= BITMAP_BIT(p)-1;
-    bits[BITMAP_INDEX(pend)] |= ~(BITMAP_BIT(pend) - 1);
+
+    int out_of_range_bits = (NUM_IN_PAGE(p) + sweep_page->total_slots) % BITS_BITLENGTH;
+    if (out_of_range_bits != 0) { // sizeof(RVALUE) == 64
+        bits[BITMAP_INDEX(p) + sweep_page->total_slots / BITS_BITLENGTH] |= ~(((bits_t)1 << out_of_range_bits) - 1);
+    }
 
     for (i=0; i < HEAP_PAGE_BITMAP_LIMIT; i++) {
 	bitset = ~bits[i];
 	if (bitset) {
 	    p = offset  + i * BITS_BITLENGTH;
 	    do {
+                VALUE vp = (VALUE)p;
+                asan_unpoison_object(vp, false);
 		if (bitset & 1) {
-		    switch (BUILTIN_TYPE(p)) {
-		      default: { /* majority case */
-			  gc_report(2, objspace, "page_sweep: free %s\n", obj_info((VALUE)p));
-#if USE_RGENGC && RGENGC_CHECK_MODE
-			  if (!is_full_marking(objspace)) {
-			      if (RVALUE_OLD_P((VALUE)p)) rb_bug("page_sweep: %s - old while minor GC.", obj_info((VALUE)p));
-			      if (rgengc_remembered(objspace, (VALUE)p)) rb_bug("page_sweep: %s - remembered.", obj_info((VALUE)p));
-			  }
-#endif
-			  if (obj_free(objspace, (VALUE)p)) {
-			      final_slots++;
-			  }
-			  else {
-			      (void)VALGRIND_MAKE_MEM_UNDEFINED((void*)p, sizeof(RVALUE));
-			      heap_page_add_freeobj(objspace, sweep_page, (VALUE)p);
-			      gc_report(3, objspace, "page_sweep: %s is added to freelist\n", obj_info((VALUE)p));
-			      freed_slots++;
-			  }
-			  break;
-		      }
+                    switch (BUILTIN_TYPE(vp)) {
+		      default: /* majority case */
+                        gc_report(2, objspace, "page_sweep: free %p\n", (void *)p);
+#if RGENGC_CHECK_MODE
+                        if (!is_full_marking(objspace)) {
+                            if (RVALUE_OLD_P(vp)) rb_bug("page_sweep: %p - old while minor GC.", (void *)p);
+                            if (rgengc_remembered_sweep(objspace, vp)) rb_bug("page_sweep: %p - remembered.", (void *)p);
+                        }
+#endif
+                        if (obj_free(objspace, vp)) {
+                            final_slots++;
+                        }
+                        else {
+                            if (heap->compact_cursor) {
+                                /* We *want* to fill this slot */
+                                MARK_IN_BITMAP(GET_HEAP_PINNED_BITS(vp), vp);
+                            } else {
+                                (void)VALGRIND_MAKE_MEM_UNDEFINED((void*)p, sizeof(RVALUE));
+                                heap_page_add_freeobj(objspace, sweep_page, vp);
+                                gc_report(3, objspace, "page_sweep: %s is added to freelist\n", obj_info(vp));
+                                freed_slots++;
+                            }
+
+                        }
+                        break;
 
 			/* minor cases */
+		      case T_MOVED:
+                        if (objspace->flags.during_compacting) {
+                            /* The sweep cursor shouldn't have made it to any
+                             * T_MOVED slots while the compact flag is enabled.
+                             * The sweep cursor and compact cursor move in
+                             * opposite directions, and when they meet references will
+                             * get updated and "during_compacting" should get disabled */
+                            rb_bug("T_MOVED shouldn't be seen until compaction is finished\n");
+                        }
+                        gc_report(3, objspace, "page_sweep: %s is added to freelist\n", obj_info(vp));
+                        if (FL_TEST(vp, FL_FROM_FREELIST)) {
+                            empty_slots++;
+                        } else {
+                            freed_slots++;
+                        }
+                        heap_page_add_freeobj(objspace, sweep_page, vp);
+                        break;
 		      case T_ZOMBIE:
 			/* already counted */
 			break;
 		      case T_NONE:
-			empty_slots++; /* already freed */
+                        if (heap->compact_cursor) {
+                            /* We *want* to fill this slot */
+                            MARK_IN_BITMAP(GET_HEAP_PINNED_BITS(vp), vp);
+                        } else {
+                            /* When we started sweeping this page, we were in
+                             * compacting mode and nulled the free list for
+                             * the page. But compaction finished, so we need to
+                             * put any T_NONE slots back on the freelist. */
+                            if (was_compacting) {
+                                heap_page_add_freeobj(objspace, sweep_page, vp);
+                            }
+                            empty_slots++; /* already freed */
+                        }
 			break;
 		    }
 		}
@@ -3459,7 +4949,15 @@ gc_page_sweep(rb_objspace_t *objspace, rb_heap_t *heap, struct heap_page *sweep_
 	}
     }
 
-    gc_setup_mark_bits(sweep_page);
+    if (heap->compact_cursor) {
+        if (gc_fill_swept_page(objspace, heap, sweep_page, &freed_slots, &empty_slots)) {
+            gc_compact_finish(objspace, heap);
+        }
+    }
+
+    if (!heap->compact_cursor) {
+        gc_setup_mark_bits(sweep_page);
+    }
 
 #if GC_PROFILE_MORE_DETAIL
     if (gc_prof_enabled(objspace)) {
@@ -3468,15 +4966,13 @@ gc_page_sweep(rb_objspace_t *objspace, rb_heap_t *heap, struct heap_page *sweep_
 	record->empty_objects += empty_slots;
     }
 #endif
-    if (0) fprintf(stderr, "gc_page_sweep(%d): total_slots: %d, freed_slots: %d, empty_slots: %d, final_slots: %d\n",
-		   (int)rb_gc_count(),
-		   (int)sweep_page->total_slots,
+    if (0) fprintf(stderr, "gc_page_sweep(%"PRIdSIZE"): total_slots: %d, freed_slots: %d, empty_slots: %d, final_slots: %d\n",
+		   rb_gc_count(),
+		   sweep_page->total_slots,
 		   freed_slots, empty_slots, final_slots);
 
     sweep_page->free_slots = freed_slots + empty_slots;
     objspace->profile.total_freed_objects += freed_slots;
-    heap_pages_final_slots += final_slots;
-    sweep_page->final_slots += final_slots;
 
     if (heap_pages_deferred_final && !finalizing) {
         rb_thread_t *th = GET_THREAD();
@@ -3520,9 +5016,9 @@ gc_mode_transition(rb_objspace_t *objspace, enum gc_mode mode)
 #if RGENGC_CHECK_MODE
     enum gc_mode prev_mode = gc_mode(objspace);
     switch (prev_mode) {
-      case gc_mode_none: assert(mode == gc_mode_marking); break;
-      case gc_mode_marking: assert(mode == gc_mode_sweeping); break;
-      case gc_mode_sweeping: assert(mode == gc_mode_none); break;
+      case gc_mode_none:     GC_ASSERT(mode == gc_mode_marking); break;
+      case gc_mode_marking:  GC_ASSERT(mode == gc_mode_sweeping); break;
+      case gc_mode_sweeping: GC_ASSERT(mode == gc_mode_none); break;
     }
 #endif
     if (0) fprintf(stderr, "gc_mode_transition: %s->%s\n", gc_mode_name(gc_mode(objspace)), gc_mode_name(mode));
@@ -3532,21 +5028,17 @@ gc_mode_transition(rb_objspace_t *objspace, enum gc_mode mode)
 static void
 gc_sweep_start_heap(rb_objspace_t *objspace, rb_heap_t *heap)
 {
-    heap->sweep_pages = heap->pages;
+    heap->sweeping_page = list_top(&heap->pages, struct heap_page, page_node);
     heap->free_pages = NULL;
 #if GC_ENABLE_INCREMENTAL_MARK
     heap->pooled_pages = NULL;
     objspace->rincgc.pooled_slots = 0;
 #endif
-    if (heap->using_page) {
-	RVALUE **p = &heap->using_page->freelist;
-	while (*p) {
-	    p = &(*p)->as.free.next;
-	}
-	*p = heap->freelist;
-	heap->using_page = NULL;
+
+    rb_ractor_t *r = NULL;
+    list_for_each(&GET_VM()->ractor.set, r, vmlr_node) {
+        rb_gc_ractor_newobj_cache_clear(&r->newobj_cache);
     }
-    heap->freelist = NULL;
 }
 
 #if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ == 4
@@ -3562,29 +5054,31 @@ gc_sweep_start(rb_objspace_t *objspace)
 static void
 gc_sweep_finish(rb_objspace_t *objspace)
 {
-    gc_report(1, objspace, "gc_sweep_finish");
+    gc_report(1, objspace, "gc_sweep_finish\n");
 
     gc_prof_set_heap_info(objspace);
     heap_pages_free_unused_pages(objspace);
 
     /* if heap_pages has unused pages, then assign them to increment */
     if (heap_allocatable_pages < heap_tomb->total_pages) {
-	heap_allocatable_pages = heap_tomb->total_pages;
+	heap_allocatable_pages_set(objspace, heap_tomb->total_pages);
     }
 
     gc_event_hook(objspace, RUBY_INTERNAL_EVENT_GC_END_SWEEP, 0);
     gc_mode_transition(objspace, gc_mode_none);
 
 #if RGENGC_CHECK_MODE >= 2
-    gc_verify_internal_consistency(Qnil);
+    gc_verify_internal_consistency(objspace);
 #endif
 }
 
 static int
 gc_sweep_step(rb_objspace_t *objspace, rb_heap_t *heap)
 {
-    struct heap_page *sweep_page = heap->sweep_pages;
+    struct heap_page *sweep_page = heap->sweeping_page;
     int unlink_limit = 3;
+    int swept_slots = 0;
+
 #if GC_ENABLE_INCREMENTAL_MARK
     int need_pool = will_be_incremental_marking(objspace) ? TRUE : FALSE;
 
@@ -3599,9 +5093,10 @@ gc_sweep_step(rb_objspace_t *objspace, rb_heap_t *heap)
     gc_prof_sweep_timer_start(objspace);
 #endif
 
-    while (sweep_page) {
-	struct heap_page *next_sweep_page = heap->sweep_pages = sweep_page->next;
+    do {
+        RUBY_DEBUG_LOG("sweep_page:%p", sweep_page);
 	int free_slots = gc_page_sweep(objspace, heap, sweep_page);
+        heap->sweeping_page = list_next(&heap->pages, sweep_page, page_node);
 
 	if (sweep_page->final_slots + free_slots == sweep_page->total_slots &&
 	    heap_pages_freeable_pages > 0 &&
@@ -3615,27 +5110,26 @@ gc_sweep_step(rb_objspace_t *objspace, rb_heap_t *heap)
 	else if (free_slots > 0) {
 #if GC_ENABLE_INCREMENTAL_MARK
 	    if (need_pool) {
-		if (heap_add_poolpage(objspace, heap, sweep_page)) {
-		    need_pool = FALSE;
-		}
+                heap_add_poolpage(objspace, heap, sweep_page);
+                need_pool = FALSE;
 	    }
 	    else {
-		heap_add_freepage(objspace, heap, sweep_page);
-		break;
+                heap_add_freepage(heap, sweep_page);
+                swept_slots += free_slots;
+                if (swept_slots > 2048) {
+                    break;
+                }
 	    }
 #else
-	    heap_add_freepage(objspace, heap, sweep_page);
-	    break;
+            heap_add_freepage(heap, sweep_page);
 #endif
 	}
 	else {
 	    sweep_page->free_next = NULL;
 	}
+    } while ((sweep_page = heap->sweeping_page));
 
-	sweep_page = next_sweep_page;
-    }
-
-    if (heap->sweep_pages == NULL) {
+    if (!heap->sweeping_page) {
 	gc_sweep_finish(objspace);
     }
 
@@ -3643,6 +5137,8 @@ gc_sweep_step(rb_objspace_t *objspace, rb_heap_t *heap)
     gc_prof_sweep_timer_stop(objspace);
 #endif
 
+    GC_ASSERT(gc_mode(objspace) == gc_mode_sweeping ? heap->free_pages != NULL : 1);
+
     return heap->free_pages != NULL;
 }
 
@@ -3656,22 +5152,96 @@ gc_sweep_rest(rb_objspace_t *objspace)
     }
 }
 
-#if GC_ENABLE_LAZY_SWEEP
 static void
 gc_sweep_continue(rb_objspace_t *objspace, rb_heap_t *heap)
 {
-    if (RGENGC_CHECK_MODE) assert(dont_gc == FALSE);
+    GC_ASSERT(dont_gc_val() == FALSE);
+    if (!GC_ENABLE_LAZY_SWEEP) return;
 
-    gc_enter(objspace, "sweep_continue");
-#if USE_RGENGC
-    if (objspace->rgengc.need_major_gc == GPR_FLAG_NONE && heap_increment(objspace, heap)) {
-	gc_report(3, objspace, "gc_sweep_continue: success heap_increment().\n");
-    }
-#endif
+    unsigned int lock_lev;
+    gc_enter(objspace, gc_enter_event_sweep_continue, &lock_lev);
     gc_sweep_step(objspace, heap);
-    gc_exit(objspace, "sweep_continue");
+    gc_exit(objspace, gc_enter_event_sweep_continue, &lock_lev);
+}
+
+static void
+invalidate_moved_page(rb_objspace_t *objspace, struct heap_page *page)
+{
+    int i;
+    int empty_slots = 0, freed_slots = 0;
+    bits_t *mark_bits, *pin_bits;
+    bits_t bitset;
+    RVALUE *p, *offset;
+
+    mark_bits = page->mark_bits;
+    pin_bits = page->pinned_bits;
+
+    p = page->start;
+    offset = p - NUM_IN_PAGE(p);
+
+    for (i=0; i < HEAP_PAGE_BITMAP_LIMIT; i++) {
+        /* Moved objects are pinned but never marked. We reuse the pin bits
+         * to indicate there is a moved object in this slot. */
+        bitset = pin_bits[i] & ~mark_bits[i];
+
+        if (bitset) {
+            p = offset + i * BITS_BITLENGTH;
+            do {
+                if (bitset & 1) {
+                    VALUE forwarding_object = (VALUE)p;
+                    VALUE object;
+
+                    if (BUILTIN_TYPE(forwarding_object) == T_MOVED) {
+                        GC_ASSERT(MARKED_IN_BITMAP(GET_HEAP_PINNED_BITS(forwarding_object), forwarding_object));
+                        GC_ASSERT(!MARKED_IN_BITMAP(GET_HEAP_MARK_BITS(forwarding_object), forwarding_object));
+
+                        CLEAR_IN_BITMAP(GET_HEAP_PINNED_BITS(forwarding_object), forwarding_object);
+
+                        object = rb_gc_location(forwarding_object);
+
+                        if (FL_TEST(forwarding_object, FL_FROM_FREELIST)) {
+                            empty_slots++; /* already freed */
+                        } else {
+                            freed_slots++;
+                        }
+
+                        gc_move(objspace, object, forwarding_object);
+                        /* forwarding_object is now our actual object, and "object"
+                         * is the free slot for the original page */
+                        heap_page_add_freeobj(objspace, GET_HEAP_PAGE(object), object);
+
+                        GC_ASSERT(MARKED_IN_BITMAP(GET_HEAP_MARK_BITS(forwarding_object), forwarding_object));
+                        GC_ASSERT(BUILTIN_TYPE(forwarding_object) != T_MOVED);
+                        GC_ASSERT(BUILTIN_TYPE(forwarding_object) != T_NONE);
+                    }
+                }
+                p++;
+                bitset >>= 1;
+            } while (bitset);
+        }
+    }
+
+    page->free_slots += (empty_slots + freed_slots);
+    objspace->profile.total_freed_objects += freed_slots;
+}
+
+static void
+gc_compact_start(rb_objspace_t *objspace, rb_heap_t *heap)
+{
+    heap->compact_cursor = list_tail(&heap->pages, struct heap_page, page_node);
+    heap->compact_cursor_index = 0;
+
+    if (gc_prof_enabled(objspace)) {
+        gc_profile_record *record = gc_prof_record(objspace);
+        record->moved_objects = objspace->rcompactor.total_moved;
+    }
+
+    memset(objspace->rcompactor.considered_count_table, 0, T_MASK * sizeof(size_t));
+    memset(objspace->rcompactor.moved_count_table, 0, T_MASK * sizeof(size_t));
+
+    /* Set up read barrier for pages containing MOVED objects */
+    install_handlers();
 }
-#endif
 
 static void
 gc_sweep(rb_objspace_t *objspace)
@@ -3685,19 +5255,32 @@ gc_sweep(rb_objspace_t *objspace)
 	gc_prof_sweep_timer_start(objspace);
 #endif
 	gc_sweep_start(objspace);
+        if (objspace->flags.during_compacting) {
+            struct heap_page *page = NULL;
+
+            list_for_each(&heap_eden->pages, page, page_node) {
+                page->flags.before_sweep = TRUE;
+            }
+
+            gc_compact_start(objspace, heap_eden);
+        }
+
 	gc_sweep_rest(objspace);
 #if !GC_ENABLE_LAZY_SWEEP
 	gc_prof_sweep_timer_stop(objspace);
 #endif
     }
     else {
-	struct heap_page *page;
+	struct heap_page *page = NULL;
 	gc_sweep_start(objspace);
-	page = heap_eden->sweep_pages;
-	while (page) {
-	    page->flags.before_sweep = TRUE;
-	    page = page->next;
-	}
+
+        if (ruby_enable_autocompact && is_full_marking(objspace)) {
+            gc_compact_start(objspace, heap_eden);
+        }
+
+        list_for_each(&heap_eden->pages, page, page_node) {
+            page->flags.before_sweep = TRUE;
+        }
 	gc_sweep_step(objspace, heap_eden);
     }
 
@@ -3764,7 +5347,7 @@ push_mark_stack_chunk(mark_stack_t *stack)
 {
     stack_chunk_t *next;
 
-    if (RGENGC_CHECK_MODE) assert(stack->index == stack->limit);
+    GC_ASSERT(stack->index == stack->limit);
 
     if (stack->cache_size > 0) {
         next = stack->cache;
@@ -3787,7 +5370,7 @@ pop_mark_stack_chunk(mark_stack_t *stack)
     stack_chunk_t *prev;
 
     prev = stack->chunk->next;
-    if (RGENGC_CHECK_MODE) assert(stack->index == 0);
+    GC_ASSERT(stack->index == 0);
     add_stack_chunk_cache(stack, stack->chunk);
     stack->chunk = prev;
     stack->index = stack->limit;
@@ -3809,6 +5392,22 @@ free_stack_chunks(mark_stack_t *stack)
 static void
 push_mark_stack(mark_stack_t *stack, VALUE data)
 {
+    VALUE obj = data;
+    switch (BUILTIN_TYPE(obj)) {
+      case T_NIL:
+      case T_FIXNUM:
+      case T_MOVED:
+	rb_bug("push_mark_stack() called for broken object");
+	break;
+
+      case T_NODE:
+	UNEXPECTED_NODE(push_mark_stack);
+        break;
+
+      default:
+        break;
+    }
+
     if (stack->index == stack->limit) {
         push_mark_stack_chunk(stack);
     }
@@ -3877,15 +5476,16 @@ init_mark_stack(mark_stack_t *stack)
 
 /* Marking */
 
-#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)
-#endif
+#define SET_STACK_END SET_MACHINE_STACK_END(&ec->machine.stack_end)
 
-#define STACK_START (th->machine.stack_start)
-#define STACK_END (th->machine.stack_end)
-#define STACK_LEVEL_MAX (th->machine.stack_maxsize/sizeof(VALUE))
+#define STACK_START (ec->machine.stack_start)
+#define STACK_END (ec->machine.stack_end)
+#define STACK_LEVEL_MAX (ec->machine.stack_maxsize/sizeof(VALUE))
+
+#ifdef __EMSCRIPTEN__
+#undef STACK_GROW_DIRECTION
+#define STACK_GROW_DIRECTION 1
+#endif
 
 #if STACK_GROW_DIRECTION < 0
 # define STACK_LENGTH  (size_t)(STACK_START - STACK_END)
@@ -3911,50 +5511,57 @@ ruby_get_stack_grow_direction(volatile VALUE *addr)
 size_t
 ruby_stack_length(VALUE **p)
 {
-    rb_thread_t *th = GET_THREAD();
+    rb_execution_context_t *ec = GET_EC();
     SET_STACK_END;
     if (p) *p = STACK_UPPER(STACK_END, STACK_START, STACK_END);
     return STACK_LENGTH;
 }
 
+#define PREVENT_STACK_OVERFLOW 1
+#ifndef PREVENT_STACK_OVERFLOW
 #if !(defined(POSIX_SIGNAL) && defined(SIGSEGV) && defined(HAVE_SIGALTSTACK))
+# define PREVENT_STACK_OVERFLOW 1
+#else
+# define PREVENT_STACK_OVERFLOW 0
+#endif
+#endif
+#if PREVENT_STACK_OVERFLOW
 static int
-stack_check(int water_mark)
+stack_check(rb_execution_context_t *ec, int water_mark)
 {
-    int ret;
-    rb_thread_t *th = GET_THREAD();
     SET_STACK_END;
-    ret = STACK_LENGTH > STACK_LEVEL_MAX - water_mark;
-#ifdef __ia64
-    if (!ret) {
-        ret = (VALUE*)rb_ia64_bsp() - th->machine.register_stack_start >
-              th->machine.register_stack_maxsize/sizeof(VALUE) - water_mark;
-    }
-#endif
-    return ret;
+
+    size_t length = STACK_LENGTH;
+    size_t maximum_length = STACK_LEVEL_MAX - water_mark;
+
+    return length > maximum_length;
 }
+#else
+#define stack_check(ec, water_mark) FALSE
 #endif
 
-#define STACKFRAME_FOR_CALL_CFUNC 512
+#define STACKFRAME_FOR_CALL_CFUNC 2048
+
+MJIT_FUNC_EXPORTED int
+rb_ec_stack_check(rb_execution_context_t *ec)
+{
+    return stack_check(ec, STACKFRAME_FOR_CALL_CFUNC);
+}
 
 int
 ruby_stack_check(void)
 {
-#if defined(POSIX_SIGNAL) && defined(SIGSEGV) && defined(HAVE_SIGALTSTACK)
-    return 0;
-#else
-    return stack_check(STACKFRAME_FOR_CALL_CFUNC);
-#endif
+    return stack_check(GET_EC(), STACKFRAME_FOR_CALL_CFUNC);
 }
 
-ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS
+ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS(static void mark_locations_array(rb_objspace_t *objspace, register const VALUE *x, register long n));
 static void
 mark_locations_array(rb_objspace_t *objspace, register const VALUE *x, register long n)
 {
     VALUE v;
     while (n--) {
         v = *x;
-	gc_mark_maybe(objspace, v);
+        gc_mark_maybe(objspace, v);
 	x++;
     }
 }
@@ -3975,37 +5582,81 @@ rb_gc_mark_locations(const VALUE *start, const VALUE *end)
     gc_mark_locations(&rb_objspace, start, end);
 }
 
+static void
+gc_mark_values(rb_objspace_t *objspace, long n, const VALUE *values)
+{
+    long i;
+
+    for (i=0; i<n; i++) {
+        gc_mark(objspace, values[i]);
+    }
+}
+
 void
 rb_gc_mark_values(long n, const VALUE *values)
 {
+    long i;
     rb_objspace_t *objspace = &rb_objspace;
+
+    for (i=0; i<n; i++) {
+        gc_mark_and_pin(objspace, values[i]);
+    }
+}
+
+static void
+gc_mark_stack_values(rb_objspace_t *objspace, long n, const VALUE *values)
+{
     long i;
 
     for (i=0; i<n; i++) {
-	gc_mark(objspace, values[i]);
+        if (is_markable_object(objspace, values[i])) {
+            gc_mark_and_pin(objspace, values[i]);
+        }
     }
 }
 
+void
+rb_gc_mark_vm_stack_values(long n, const VALUE *values)
+{
+    rb_objspace_t *objspace = &rb_objspace;
+    gc_mark_stack_values(objspace, n, values);
+}
+
 static int
-mark_entry(st_data_t key, st_data_t value, st_data_t data)
+mark_value(st_data_t key, st_data_t value, st_data_t data)
 {
     rb_objspace_t *objspace = (rb_objspace_t *)data;
     gc_mark(objspace, (VALUE)value);
     return ST_CONTINUE;
 }
 
+static int
+mark_value_pin(st_data_t key, st_data_t value, st_data_t data)
+{
+    rb_objspace_t *objspace = (rb_objspace_t *)data;
+    gc_mark_and_pin(objspace, (VALUE)value);
+    return ST_CONTINUE;
+}
+
+static void
+mark_tbl_no_pin(rb_objspace_t *objspace, st_table *tbl)
+{
+    if (!tbl || tbl->num_entries == 0) return;
+    st_foreach(tbl, mark_value, (st_data_t)objspace);
+}
+
 static void
 mark_tbl(rb_objspace_t *objspace, st_table *tbl)
 {
     if (!tbl || tbl->num_entries == 0) return;
-    st_foreach(tbl, mark_entry, (st_data_t)objspace);
+    st_foreach(tbl, mark_value_pin, (st_data_t)objspace);
 }
 
 static int
 mark_key(st_data_t key, st_data_t value, st_data_t data)
 {
     rb_objspace_t *objspace = (rb_objspace_t *)data;
-    gc_mark(objspace, (VALUE)key);
+    gc_mark_and_pin(objspace, (VALUE)key);
     return ST_CONTINUE;
 }
 
@@ -4016,6 +5667,21 @@ mark_set(rb_objspace_t *objspace, st_table *tbl)
     st_foreach(tbl, mark_key, (st_data_t)objspace);
 }
 
+static int
+pin_value(st_data_t key, st_data_t value, st_data_t data)
+{
+    rb_objspace_t *objspace = (rb_objspace_t *)data;
+    gc_mark_and_pin(objspace, (VALUE)value);
+    return ST_CONTINUE;
+}
+
+static void
+mark_finalizer_tbl(rb_objspace_t *objspace, st_table *tbl)
+{
+    if (!tbl) return;
+    st_foreach(tbl, pin_value, (st_data_t)objspace);
+}
+
 void
 rb_mark_set(st_table *tbl)
 {
@@ -4032,17 +5698,58 @@ mark_keyvalue(st_data_t key, st_data_t value, st_data_t data)
     return ST_CONTINUE;
 }
 
+static int
+pin_key_pin_value(st_data_t key, st_data_t value, st_data_t data)
+{
+    rb_objspace_t *objspace = (rb_objspace_t *)data;
+
+    gc_mark_and_pin(objspace, (VALUE)key);
+    gc_mark_and_pin(objspace, (VALUE)value);
+    return ST_CONTINUE;
+}
+
+static int
+pin_key_mark_value(st_data_t key, st_data_t value, st_data_t data)
+{
+    rb_objspace_t *objspace = (rb_objspace_t *)data;
+
+    gc_mark_and_pin(objspace, (VALUE)key);
+    gc_mark(objspace, (VALUE)value);
+    return ST_CONTINUE;
+}
+
+static void
+mark_hash(rb_objspace_t *objspace, VALUE hash)
+{
+    if (rb_hash_compare_by_id_p(hash)) {
+        rb_hash_stlike_foreach(hash, pin_key_mark_value, (st_data_t)objspace);
+    }
+    else {
+        rb_hash_stlike_foreach(hash, mark_keyvalue, (st_data_t)objspace);
+    }
+
+    if (RHASH_AR_TABLE_P(hash)) {
+        if (LIKELY(during_gc) && RHASH_TRANSIENT_P(hash)) {
+            rb_transient_heap_mark(hash, RHASH_AR_TABLE(hash));
+        }
+    }
+    else {
+        VM_ASSERT(!RHASH_TRANSIENT_P(hash));
+    }
+    gc_mark(objspace, RHASH(hash)->ifnone);
+}
+
 static void
-mark_hash(rb_objspace_t *objspace, st_table *tbl)
+mark_st(rb_objspace_t *objspace, st_table *tbl)
 {
     if (!tbl) return;
-    st_foreach(tbl, mark_keyvalue, (st_data_t)objspace);
+    st_foreach(tbl, pin_key_pin_value, (st_data_t)objspace);
 }
 
 void
 rb_mark_hash(st_table *tbl)
 {
-    mark_hash(&rb_objspace, tbl);
+    mark_st(&rb_objspace, tbl);
 }
 
 static void
@@ -4064,7 +5771,8 @@ mark_method_entry(rb_objspace_t *objspace, const rb_method_entry_t *me)
 	    gc_mark(objspace, def->body.attr.location);
 	    break;
 	  case VM_METHOD_TYPE_BMETHOD:
-	    gc_mark(objspace, def->body.proc);
+            gc_mark(objspace, def->body.bmethod.proc);
+            if (def->body.bmethod.hooks) rb_hook_list_mark(def->body.bmethod.hooks);
 	    break;
 	  case VM_METHOD_TYPE_ALIAS:
 	    gc_mark(objspace, (VALUE)def->body.alias.original_me);
@@ -4129,11 +5837,11 @@ mark_const_tbl(rb_objspace_t *objspace, struct rb_id_table *tbl)
      ((start) = STACK_END, (end) = STACK_START) : ((start) = STACK_START, (end) = STACK_END+(appendix)))
 #endif
 
-static void mark_stack_locations(rb_objspace_t *objspace, rb_thread_t *th,
+static void mark_stack_locations(rb_objspace_t *objspace, const rb_execution_context_t *ec,
 				 const VALUE *stack_start, const VALUE *stack_end);
 
 static void
-mark_current_machine_context(rb_objspace_t *objspace, rb_thread_t *th)
+mark_current_machine_context(rb_objspace_t *objspace, rb_execution_context_t *ec)
 {
     union {
 	rb_jmp_buf j;
@@ -4142,6 +5850,7 @@ mark_current_machine_context(rb_objspace_t *objspace, rb_thread_t *th)
     VALUE *stack_start, *stack_end;
 
     FLUSH_REGISTER_WINDOWS;
+    memset(&save_regs_gc_mark, 0, sizeof(save_regs_gc_mark));
     /* This assumes that all registers are saved into the jmp_buf (and stack) */
     rb_setjmp(save_regs_gc_mark.j);
 
@@ -4153,30 +5862,26 @@ mark_current_machine_context(rb_objspace_t *objspace, rb_thread_t *th)
 
     mark_locations_array(objspace, save_regs_gc_mark.v, numberof(save_regs_gc_mark.v));
 
-    mark_stack_locations(objspace, th, stack_start, stack_end);
+    mark_stack_locations(objspace, ec, stack_start, stack_end);
 }
 
 void
-rb_gc_mark_machine_stack(rb_thread_t *th)
+rb_gc_mark_machine_stack(const rb_execution_context_t *ec)
 {
-    rb_objspace_t *objspace = rb_objspace_of(th->vm);
+    rb_objspace_t *objspace = &rb_objspace;
     VALUE *stack_start, *stack_end;
 
     GET_STACK_BOUNDS(stack_start, stack_end, 0);
-    mark_stack_locations(objspace, th, stack_start, stack_end);
+    mark_stack_locations(objspace, ec, stack_start, stack_end);
 }
 
 static void
-mark_stack_locations(rb_objspace_t *objspace, rb_thread_t *th,
+mark_stack_locations(rb_objspace_t *objspace, const rb_execution_context_t *ec,
 		     const VALUE *stack_start, const VALUE *stack_end)
 {
 
     gc_mark_locations(objspace, stack_start, stack_end);
-#ifdef __ia64
-    gc_mark_locations(objspace,
-		      th->machine.register_stack_start,
-		      th->machine.register_stack_end);
-#endif
+
 #if defined(__mc68000__)
     gc_mark_locations(objspace,
 		      (VALUE*)((char*)stack_start + 2),
@@ -4190,15 +5895,35 @@ rb_mark_tbl(st_table *tbl)
     mark_tbl(&rb_objspace, tbl);
 }
 
+void
+rb_mark_tbl_no_pin(st_table *tbl)
+{
+    mark_tbl_no_pin(&rb_objspace, tbl);
+}
+
 static void
 gc_mark_maybe(rb_objspace_t *objspace, VALUE obj)
 {
     (void)VALGRIND_MAKE_MEM_DEFINED(&obj, sizeof(obj));
+
     if (is_pointer_to_heap(objspace, (void *)obj)) {
-	int type = BUILTIN_TYPE(obj);
-	if (type != T_ZOMBIE && type != T_NONE) {
-	    gc_mark_ptr(objspace, obj);
-	}
+        void *ptr = __asan_region_is_poisoned((void *)obj, SIZEOF_VALUE);
+        asan_unpoison_object(obj, false);
+
+        /* Garbage can live on the stack, so do not mark or pin */
+        switch (BUILTIN_TYPE(obj)) {
+          case T_ZOMBIE:
+          case T_NONE:
+            break;
+          default:
+            gc_mark_and_pin(objspace, obj);
+            break;
+        }
+
+        if (ptr) {
+            GC_ASSERT(BUILTIN_TYPE(obj) == T_NONE);
+            asan_poison_object(obj);
+        }
     }
 }
 
@@ -4211,12 +5936,12 @@ rb_gc_mark_maybe(VALUE obj)
 static inline int
 gc_mark_set(rb_objspace_t *objspace, VALUE obj)
 {
+    ASSERT_vm_locking();
     if (RVALUE_MARKED(obj)) return 0;
     MARK_IN_BITMAP(GET_HEAP_MARK_BITS(obj), obj);
     return 1;
 }
 
-#if USE_RGENGC
 static int
 gc_remember_unprotected(rb_objspace_t *objspace, VALUE obj)
 {
@@ -4240,12 +5965,10 @@ gc_remember_unprotected(rb_objspace_t *objspace, VALUE obj)
 	return FALSE;
     }
 }
-#endif
 
 static void
 rgengc_check_relation(rb_objspace_t *objspace, VALUE obj)
 {
-#if USE_RGENGC
     const VALUE old_parent = objspace->rgengc.parent_object;
 
     if (old_parent) { /* parent object is old */
@@ -4277,8 +6000,7 @@ rgengc_check_relation(rb_objspace_t *objspace, VALUE obj)
 	}
     }
 
-    if (RGENGC_CHECK_MODE) assert(old_parent == objspace->rgengc.parent_object);
-#endif
+    GC_ASSERT(old_parent == objspace->rgengc.parent_object);
 }
 
 static void
@@ -4301,13 +6023,9 @@ gc_grey(rb_objspace_t *objspace, VALUE obj)
 static void
 gc_aging(rb_objspace_t *objspace, VALUE obj)
 {
-#if USE_RGENGC
     struct heap_page *page = GET_HEAP_PAGE(obj);
 
-#if RGENGC_CHECK_MODE
-    assert(RVALUE_MARKING(obj) == FALSE);
-#endif
-
+    GC_ASSERT(RVALUE_MARKING(obj) == FALSE);
     check_rvalue_consistency(obj);
 
     if (!RVALUE_PAGE_WB_UNPROTECTED(page, obj)) {
@@ -4316,33 +6034,68 @@ gc_aging(rb_objspace_t *objspace, VALUE obj)
 	    RVALUE_AGE_INC(objspace, obj);
 	}
 	else if (is_full_marking(objspace)) {
-	    if (RGENGC_CHECK_MODE) assert(RVALUE_PAGE_UNCOLLECTIBLE(page, obj) == FALSE);
+	    GC_ASSERT(RVALUE_PAGE_UNCOLLECTIBLE(page, obj) == FALSE);
 	    RVALUE_PAGE_OLD_UNCOLLECTIBLE_SET(objspace, page, obj);
 	}
     }
     check_rvalue_consistency(obj);
-#endif /* USE_RGENGC */
 
     objspace->marked_slots++;
 }
 
 NOINLINE(static void gc_mark_ptr(rb_objspace_t *objspace, VALUE obj));
+static void reachable_objects_from_callback(VALUE obj);
 
 static void
 gc_mark_ptr(rb_objspace_t *objspace, VALUE obj)
 {
-    if (LIKELY(objspace->mark_func_data == NULL)) {
+    if (LIKELY(during_gc)) {
 	rgengc_check_relation(objspace, obj);
 	if (!gc_mark_set(objspace, obj)) return; /* already marked */
+
+        if (0) { // for debug GC marking miss
+            if (objspace->rgengc.parent_object) {
+                RUBY_DEBUG_LOG("%p (%s) parent:%p (%s)",
+                               (void *)obj, obj_type_name(obj),
+                               (void *)objspace->rgengc.parent_object, obj_type_name(objspace->rgengc.parent_object));
+            }
+            else {
+                RUBY_DEBUG_LOG("%p (%s)", (void *)obj, obj_type_name(obj));
+            }
+        }
+
+        if (UNLIKELY(RB_TYPE_P(obj, T_NONE))) {
+            rp(obj);
+            rb_bug("try to mark T_NONE object"); /* check here will help debugging */
+        }
 	gc_aging(objspace, obj);
 	gc_grey(objspace, obj);
     }
     else {
-	objspace->mark_func_data->mark_func(obj, objspace->mark_func_data->data);
+        reachable_objects_from_callback(obj);
     }
 }
 
-static void
+static inline void
+gc_pin(rb_objspace_t *objspace, VALUE obj)
+{
+    GC_ASSERT(is_markable_object(objspace, obj));
+    if (UNLIKELY(objspace->flags.during_compacting)) {
+        if (LIKELY(during_gc)) {
+            MARK_IN_BITMAP(GET_HEAP_PINNED_BITS(obj), obj);
+        }
+    }
+}
+
+static inline void
+gc_mark_and_pin(rb_objspace_t *objspace, VALUE obj)
+{
+    if (!is_markable_object(objspace, obj)) return;
+    gc_pin(objspace, obj);
+    gc_mark_ptr(objspace, obj);
+}
+
+static inline void
 gc_mark(rb_objspace_t *objspace, VALUE obj)
 {
     if (!is_markable_object(objspace, obj)) return;
@@ -4350,11 +6103,17 @@ gc_mark(rb_objspace_t *objspace, VALUE obj)
 }
 
 void
-rb_gc_mark(VALUE ptr)
+rb_gc_mark_movable(VALUE ptr)
 {
     gc_mark(&rb_objspace, ptr);
 }
 
+void
+rb_gc_mark(VALUE ptr)
+{
+    gc_mark_and_pin(&rb_objspace, ptr);
+}
+
 /* CAUTION: THIS FUNCTION ENABLE *ONLY BEFORE* SWEEPING.
  * This function is only for GC_END_MARK timing.
  */
@@ -4368,14 +6127,95 @@ rb_objspace_marked_object_p(VALUE obj)
 static inline void
 gc_mark_set_parent(rb_objspace_t *objspace, VALUE obj)
 {
-#if USE_RGENGC
     if (RVALUE_OLD_P(obj)) {
 	objspace->rgengc.parent_object = obj;
     }
     else {
 	objspace->rgengc.parent_object = Qfalse;
     }
+}
+
+static void
+gc_mark_imemo(rb_objspace_t *objspace, VALUE obj)
+{
+    switch (imemo_type(obj)) {
+      case imemo_env:
+	{
+	    const rb_env_t *env = (const rb_env_t *)obj;
+
+            if (LIKELY(env->ep)) {
+                // just after newobj() can be NULL here.
+                GC_ASSERT(env->ep[VM_ENV_DATA_INDEX_ENV] == obj);
+                GC_ASSERT(VM_ENV_ESCAPED_P(env->ep));
+                gc_mark_values(objspace, (long)env->env_size, env->env);
+                VM_ENV_FLAGS_SET(env->ep, VM_ENV_FLAG_WB_REQUIRED);
+                gc_mark(objspace, (VALUE)rb_vm_env_prev_env(env));
+                gc_mark(objspace, (VALUE)env->iseq);
+            }
+	}
+	return;
+      case imemo_cref:
+	gc_mark(objspace, RANY(obj)->as.imemo.cref.klass);
+	gc_mark(objspace, (VALUE)RANY(obj)->as.imemo.cref.next);
+	gc_mark(objspace, RANY(obj)->as.imemo.cref.refinements);
+	return;
+      case imemo_svar:
+	gc_mark(objspace, RANY(obj)->as.imemo.svar.cref_or_me);
+	gc_mark(objspace, RANY(obj)->as.imemo.svar.lastline);
+	gc_mark(objspace, RANY(obj)->as.imemo.svar.backref);
+	gc_mark(objspace, RANY(obj)->as.imemo.svar.others);
+	return;
+      case imemo_throw_data:
+	gc_mark(objspace, RANY(obj)->as.imemo.throw_data.throw_obj);
+	return;
+      case imemo_ifunc:
+	gc_mark_maybe(objspace, (VALUE)RANY(obj)->as.imemo.ifunc.data);
+	return;
+      case imemo_memo:
+	gc_mark(objspace, RANY(obj)->as.imemo.memo.v1);
+	gc_mark(objspace, RANY(obj)->as.imemo.memo.v2);
+	gc_mark_maybe(objspace, RANY(obj)->as.imemo.memo.u3.value);
+	return;
+      case imemo_ment:
+	mark_method_entry(objspace, &RANY(obj)->as.imemo.ment);
+	return;
+      case imemo_iseq:
+	rb_iseq_mark((rb_iseq_t *)obj);
+	return;
+      case imemo_tmpbuf:
+	{
+	    const rb_imemo_tmpbuf_t *m = &RANY(obj)->as.imemo.alloc;
+	    do {
+		rb_gc_mark_locations(m->ptr, m->ptr + m->cnt);
+	    } while ((m = m->next) != NULL);
+	}
+	return;
+      case imemo_ast:
+	rb_ast_mark(&RANY(obj)->as.imemo.ast);
+	return;
+      case imemo_parser_strterm:
+	rb_strterm_mark(obj);
+	return;
+      case imemo_callinfo:
+        return;
+      case imemo_callcache:
+        {
+            const struct rb_callcache *cc = (const struct rb_callcache *)obj;
+            // should not mark klass here
+            gc_mark(objspace, (VALUE)vm_cc_cme(cc));
+        }
+        return;
+      case imemo_constcache:
+        {
+            const struct iseq_inline_constant_cache_entry *ice = (struct iseq_inline_constant_cache_entry *)obj;
+            gc_mark(objspace, ice->value);
+        }
+        return;
+#if VM_CHECK_MODE > 0
+      default:
+	VM_UNREACHABLE(gc_mark_imemo);
 #endif
+    }
 }
 
 static void
@@ -4389,51 +6229,28 @@ gc_mark_children(rb_objspace_t *objspace, VALUE obj)
     }
 
     switch (BUILTIN_TYPE(obj)) {
+      case T_FLOAT:
+      case T_BIGNUM:
+      case T_SYMBOL:
+        /* Not immediates, but does not have references and singleton
+         * class */
+        return;
+
       case T_NIL:
       case T_FIXNUM:
 	rb_bug("rb_gc_mark() called for broken object");
 	break;
 
       case T_NODE:
-	obj = rb_gc_mark_node(&any->as.node);
-	if (obj) gc_mark(objspace, obj);
-	return;			/* no need to mark class. */
+	UNEXPECTED_NODE(rb_gc_mark);
+	break;
 
       case T_IMEMO:
-	switch (imemo_type(obj)) {
-	  case imemo_none:
-	    rb_bug("unreachable");
-	    return;
-	  case imemo_cref:
-	    gc_mark(objspace, RANY(obj)->as.imemo.cref.klass);
-	    gc_mark(objspace, (VALUE)RANY(obj)->as.imemo.cref.next);
-	    gc_mark(objspace, RANY(obj)->as.imemo.cref.refinements);
-	    return;
-	  case imemo_svar:
-	    gc_mark(objspace, RANY(obj)->as.imemo.svar.cref_or_me);
-	    gc_mark(objspace, RANY(obj)->as.imemo.svar.lastline);
-	    gc_mark(objspace, RANY(obj)->as.imemo.svar.backref);
-	    gc_mark(objspace, RANY(obj)->as.imemo.svar.others);
-	    return;
-	  case imemo_throw_data:
-	    gc_mark(objspace, RANY(obj)->as.imemo.throw_data.throw_obj);
-	    return;
-	  case imemo_ifunc:
-	    gc_mark_maybe(objspace, (VALUE)RANY(obj)->as.imemo.ifunc.data);
-	    return;
-	  case imemo_memo:
-	    gc_mark(objspace, RANY(obj)->as.imemo.memo.v1);
-	    gc_mark(objspace, RANY(obj)->as.imemo.memo.v2);
-	    gc_mark_maybe(objspace, RANY(obj)->as.imemo.memo.u3.value);
-	    return;
-	  case imemo_ment:
-	    mark_method_entry(objspace, &RANY(obj)->as.imemo.ment);
-	    return;
-	  case imemo_iseq:
-	    rb_iseq_mark((rb_iseq_t *)obj);
-	    return;
-	}
-	rb_bug("T_IMEMO: unreachable");
+	gc_mark_imemo(objspace, obj);
+	return;
+
+      default:
+        break;
     }
 
     gc_mark(objspace, any->as.basic.klass);
@@ -4441,38 +6258,52 @@ gc_mark_children(rb_objspace_t *objspace, VALUE obj)
     switch (BUILTIN_TYPE(obj)) {
       case T_CLASS:
       case T_MODULE:
-	mark_m_tbl(objspace, RCLASS_M_TBL(obj));
+        if (RCLASS_SUPER(obj)) {
+            gc_mark(objspace, RCLASS_SUPER(obj));
+        }
 	if (!RCLASS_EXT(obj)) break;
-	mark_tbl(objspace, RCLASS_IV_TBL(obj));
+
+        mark_m_tbl(objspace, RCLASS_M_TBL(obj));
+        cc_table_mark(objspace, obj);
+        mark_tbl_no_pin(objspace, RCLASS_IV_TBL(obj));
 	mark_const_tbl(objspace, RCLASS_CONST_TBL(obj));
-	gc_mark(objspace, RCLASS_SUPER((VALUE)obj));
 	break;
 
       case T_ICLASS:
-	if (FL_TEST(obj, RICLASS_IS_ORIGIN)) {
+        if (RICLASS_OWNS_M_TBL_P(obj)) {
 	    mark_m_tbl(objspace, RCLASS_M_TBL(obj));
 	}
+        if (RCLASS_SUPER(obj)) {
+            gc_mark(objspace, RCLASS_SUPER(obj));
+        }
 	if (!RCLASS_EXT(obj)) break;
 	mark_m_tbl(objspace, RCLASS_CALLABLE_M_TBL(obj));
-	gc_mark(objspace, RCLASS_SUPER((VALUE)obj));
+        cc_table_mark(objspace, obj);
 	break;
 
       case T_ARRAY:
-	if (FL_TEST(obj, ELTS_SHARED)) {
-	    gc_mark(objspace, any->as.array.as.heap.aux.shared);
+        if (FL_TEST(obj, ELTS_SHARED)) {
+            VALUE root = any->as.array.as.heap.aux.shared_root;
+            gc_mark(objspace, root);
 	}
 	else {
 	    long i, len = RARRAY_LEN(obj);
-	    const VALUE *ptr = RARRAY_CONST_PTR(obj);
+            const VALUE *ptr = RARRAY_CONST_PTR_TRANSIENT(obj);
 	    for (i=0; i < len; i++) {
-		gc_mark(objspace, *ptr++);
+                gc_mark(objspace, ptr[i]);
 	    }
-	}
+
+            if (LIKELY(during_gc)) {
+                if (!FL_TEST_RAW(obj, RARRAY_EMBED_FLAG) &&
+                    RARRAY_TRANSIENT_P(obj)) {
+                    rb_transient_heap_mark(obj, ptr);
+                }
+            }
+        }
 	break;
 
       case T_HASH:
-	mark_hash(objspace, any->as.hash.ntbl);
-	gc_mark(objspace, any->as.hash.ifnone);
+        mark_hash(objspace, obj);
 	break;
 
       case T_STRING:
@@ -4495,16 +6326,23 @@ gc_mark_children(rb_objspace_t *objspace, VALUE obj)
 
       case T_OBJECT:
         {
+            const VALUE * const ptr = ROBJECT_IVPTR(obj);
+
             uint32_t i, len = ROBJECT_NUMIV(obj);
-	    VALUE *ptr = ROBJECT_IVPTR(obj);
             for (i  = 0; i < len; i++) {
-		gc_mark(objspace, *ptr++);
+                gc_mark(objspace, ptr[i]);
+            }
+
+            if (LIKELY(during_gc) &&
+                    ROBJ_TRANSIENT_P(obj)) {
+                rb_transient_heap_mark(obj, ptr);
             }
         }
 	break;
 
       case T_FILE:
         if (any->as.file.fptr) {
+            gc_mark(objspace, any->as.file.fptr->self);
             gc_mark(objspace, any->as.file.fptr->pathv);
             gc_mark(objspace, any->as.file.fptr->tied_io_for_writing);
             gc_mark(objspace, any->as.file.fptr->writeconv_asciicompat);
@@ -4518,11 +6356,6 @@ gc_mark_children(rb_objspace_t *objspace, VALUE obj)
         gc_mark(objspace, any->as.regexp.src);
 	break;
 
-      case T_FLOAT:
-      case T_BIGNUM:
-      case T_SYMBOL:
-	break;
-
       case T_MATCH:
 	gc_mark(objspace, any->as.match.regexp);
 	if (any->as.match.str) {
@@ -4542,12 +6375,18 @@ gc_mark_children(rb_objspace_t *objspace, VALUE obj)
 
       case T_STRUCT:
 	{
-	    long len = RSTRUCT_LEN(obj);
-	    const VALUE *ptr = RSTRUCT_CONST_PTR(obj);
+            long i;
+            const long len = RSTRUCT_LEN(obj);
+            const VALUE * const ptr = RSTRUCT_CONST_PTR(obj);
 
-	    while (len--) {
-		gc_mark(objspace, *ptr++);
-	    }
+            for (i=0; i<len; i++) {
+                gc_mark(objspace, ptr[i]);
+            }
+
+            if (LIKELY(during_gc) &&
+                RSTRUCT_TRANSIENT_P(obj)) {
+                rb_transient_heap_mark(obj, ptr);
+            }
 	}
 	break;
 
@@ -4555,10 +6394,11 @@ gc_mark_children(rb_objspace_t *objspace, VALUE obj)
 #if GC_DEBUG
 	rb_gcdebug_print_obj_condition((VALUE)obj);
 #endif
+        if (BUILTIN_TYPE(obj) == T_MOVED)   rb_bug("rb_gc_mark(): %p is T_MOVED", (void *)obj);
 	if (BUILTIN_TYPE(obj) == T_NONE)   rb_bug("rb_gc_mark(): %p is T_NONE", (void *)obj);
 	if (BUILTIN_TYPE(obj) == T_ZOMBIE) rb_bug("rb_gc_mark(): %p is T_ZOMBIE", (void *)obj);
 	rb_bug("rb_gc_mark(): unknown data type 0x%x(%p) %s",
-	       BUILTIN_TYPE(obj), any,
+	       BUILTIN_TYPE(obj), (void *)any,
 	       is_pointer_to_heap(objspace, any) ? "corrupted object" : "non object");
     }
 }
@@ -4603,7 +6443,7 @@ gc_mark_stacked_objects(rb_objspace_t *objspace, int incremental, size_t count)
 #endif
     }
 
-    if (RGENGC_CHECK_MODE >= 3) gc_verify_internal_consistency(Qnil);
+    if (RGENGC_CHECK_MODE >= 3) gc_verify_internal_consistency(objspace);
 
     if (is_mark_stack_empty(mstack)) {
 	shrink_stack_chunk_cache(mstack);
@@ -4647,13 +6487,14 @@ show_mark_ticks(void)
     }
 }
 
-#endif /* PRITNT_ROOT_TICKS */
+#endif /* PRINT_ROOT_TICKS */
 
 static void
 gc_mark_roots(rb_objspace_t *objspace, const char **categoryp)
 {
     struct gc_list *list;
-    rb_thread_t *th = GET_THREAD();
+    rb_execution_context_t *ec = GET_EC();
+    rb_vm_t *vm = rb_ec_vm_ptr(ec);
 
 #if PRINT_ROOT_TICKS
     tick_t start_tick = tick();
@@ -4667,9 +6508,7 @@ gc_mark_roots(rb_objspace_t *objspace, const char **categoryp)
 
     if (categoryp) *categoryp = "xxx";
 
-#if USE_RGENGC
     objspace->rgengc.parent_object = Qfalse;
-#endif
 
 #if PRINT_ROOT_TICKS
 #define MARK_CHECKPOINT_PRINT_TICK(category) do { \
@@ -4682,7 +6521,7 @@ gc_mark_roots(rb_objspace_t *objspace, const char **categoryp)
     prev_category = category; \
     start_tick = tick(); \
 } while (0)
-#else /* PRITNT_ROOT_TICKS */
+#else /* PRINT_ROOT_TICKS */
 #define MARK_CHECKPOINT_PRINT_TICK(category)
 #endif
 
@@ -4693,22 +6532,19 @@ gc_mark_roots(rb_objspace_t *objspace, const char **categoryp)
 
     MARK_CHECKPOINT("vm");
     SET_STACK_END;
-    rb_vm_mark(th->vm);
-    if (th->vm->self) gc_mark_set(objspace, th->vm->self);
+    rb_vm_mark(vm);
+    if (vm->self) gc_mark(objspace, vm->self);
 
     MARK_CHECKPOINT("finalizers");
-    mark_tbl(objspace, finalizer_table);
+    mark_finalizer_tbl(objspace, finalizer_table);
 
     MARK_CHECKPOINT("machine_context");
-    mark_current_machine_context(objspace, th);
-
-    MARK_CHECKPOINT("encodings");
-    rb_gc_mark_encodings();
+    mark_current_machine_context(objspace, ec);
 
     /* mark protected global variables */
     MARK_CHECKPOINT("global_list");
     for (list = global_list; list; list = list->next) {
-	rb_gc_mark_maybe(*list->varptr);
+        gc_mark_maybe(objspace, *list->varptr);
     }
 
     MARK_CHECKPOINT("end_proc");
@@ -4717,6 +6553,10 @@ gc_mark_roots(rb_objspace_t *objspace, const char **categoryp)
     MARK_CHECKPOINT("global_tbl");
     rb_gc_mark_global_tbl();
 
+    MARK_CHECKPOINT("object_id");
+    rb_gc_mark(objspace->next_object_id);
+    mark_tbl_no_pin(objspace, objspace->obj_to_id_tbl); /* Only mark ids */
+
     if (stress_to_class) rb_gc_mark(stress_to_class);
 
     MARK_CHECKPOINT("finish");
@@ -4781,7 +6621,7 @@ reflist_dump(struct reflist *refs)
 }
 
 static int
-reflist_refered_from_machine_context(struct reflist *refs)
+reflist_referred_from_machine_context(struct reflist *refs)
 {
     int i;
     for (i=0; i<refs->pos; i++) {
@@ -4810,8 +6650,10 @@ static int
 allrefs_add(struct allrefs *data, VALUE obj)
 {
     struct reflist *refs;
+    st_data_t r;
 
-    if (st_lookup(data->references, obj, (st_data_t *)&refs)) {
+    if (st_lookup(data->references, obj, &r)) {
+        refs = (struct reflist *)r;
 	reflist_add(refs, data->root_obj);
 	return 0;
     }
@@ -4850,8 +6692,8 @@ objspace_allrefs(rb_objspace_t *objspace)
     struct allrefs data;
     struct mark_func_data_struct mfd;
     VALUE obj;
-    int prev_dont_gc = dont_gc;
-    dont_gc = TRUE;
+    int prev_dont_gc = dont_gc_val();
+    dont_gc_on();
 
     data.objspace = objspace;
     data.references = st_init_numtable();
@@ -4872,12 +6714,12 @@ objspace_allrefs(rb_objspace_t *objspace)
     }
     free_stack_chunks(&data.mark_stack);
 
-    dont_gc = prev_dont_gc;
+    dont_gc_set(prev_dont_gc);
     return data.references;
 }
 
 static int
-objspace_allrefs_destruct_i(st_data_t key, st_data_t value, void *ptr)
+objspace_allrefs_destruct_i(st_data_t key, st_data_t value, st_data_t ptr)
 {
     struct reflist *refs = (struct reflist *)value;
     reflist_destruct(refs);
@@ -4906,13 +6748,14 @@ allrefs_dump_i(st_data_t k, st_data_t v, st_data_t ptr)
 static void
 allrefs_dump(rb_objspace_t *objspace)
 {
-    fprintf(stderr, "[all refs] (size: %d)\n", (int)objspace->rgengc.allrefs_table->num_entries);
+    VALUE size = objspace->rgengc.allrefs_table->num_entries;
+    fprintf(stderr, "[all refs] (size: %"PRIuVALUE")\n", size);
     st_foreach(objspace->rgengc.allrefs_table, allrefs_dump_i, 0);
 }
 #endif
 
 static int
-gc_check_after_marks_i(st_data_t k, st_data_t v, void *ptr)
+gc_check_after_marks_i(st_data_t k, st_data_t v, st_data_t ptr)
 {
     VALUE obj = k;
     struct reflist *refs = (struct reflist *)v;
@@ -4924,7 +6767,7 @@ gc_check_after_marks_i(st_data_t k, st_data_t v, void *ptr)
 	fprintf(stderr, "gc_check_after_marks_i: %p is referred from ", (void *)obj);
 	reflist_dump(refs);
 
-	if (reflist_refered_from_machine_context(refs)) {
+	if (reflist_referred_from_machine_context(refs)) {
 	    fprintf(stderr, " (marked from machine stack).\n");
 	    /* marked from machine context can be false positive */
 	}
@@ -4937,13 +6780,13 @@ gc_check_after_marks_i(st_data_t k, st_data_t v, void *ptr)
 }
 
 static void
-gc_marks_check(rb_objspace_t *objspace, int (*checker_func)(ANYARGS), const char *checker_name)
+gc_marks_check(rb_objspace_t *objspace, st_foreach_callback_func *checker_func, const char *checker_name)
 {
     size_t saved_malloc_increase = objspace->malloc_params.increase;
 #if RGENGC_ESTIMATE_OLDMALLOC
     size_t saved_oldmalloc_increase = objspace->rgengc.oldmalloc_increase;
 #endif
-    VALUE already_disabled = rb_gc_disable();
+    VALUE already_disabled = rb_objspace_gc_disable(objspace);
 
     objspace->rgengc.allrefs_table = objspace_allrefs(objspace);
 
@@ -4961,7 +6804,7 @@ gc_marks_check(rb_objspace_t *objspace, int (*checker_func)(ANYARGS), const char
     objspace_allrefs_destruct(objspace->rgengc.allrefs_table);
     objspace->rgengc.allrefs_table = 0;
 
-    if (already_disabled == Qfalse) rb_gc_enable();
+    if (already_disabled == Qfalse) rb_objspace_gc_enable(objspace);
     objspace->malloc_params.increase = saved_malloc_increase;
 #if RGENGC_ESTIMATE_OLDMALLOC
     objspace->rgengc.oldmalloc_increase = saved_oldmalloc_increase;
@@ -4975,21 +6818,18 @@ struct verify_internal_consistency_struct {
     size_t live_object_count;
     size_t zombie_object_count;
 
-#if USE_RGENGC
     VALUE parent;
     size_t old_object_count;
     size_t remembered_shady_count;
-#endif
 };
 
-#if USE_RGENGC
 static void
 check_generation_i(const VALUE child, void *ptr)
 {
     struct verify_internal_consistency_struct *data = (struct verify_internal_consistency_struct *)ptr;
     const VALUE parent = data->parent;
 
-    if (RGENGC_CHECK_MODE) assert(RVALUE_OLD_P(parent));
+    if (RGENGC_CHECK_MODE) GC_ASSERT(RVALUE_OLD_P(parent));
 
     if (!RVALUE_OLD_P(child)) {
 	if (!RVALUE_REMEMBERED(parent) &&
@@ -5013,12 +6853,18 @@ check_color_i(const VALUE child, void *ptr)
 	data->err_count++;
     }
 }
-#endif
 
 static void
 check_children_i(const VALUE child, void *ptr)
 {
-    check_rvalue_consistency(child);
+    struct verify_internal_consistency_struct *data = (struct verify_internal_consistency_struct *)ptr;
+    if (check_rvalue_consistency_force(child, FALSE) != 0) {
+        fprintf(stderr, "check_children_i: %s has error (referenced from %s)",
+                obj_info(child), obj_info(data->parent));
+        rb_print_backtrace(); /* C backtrace will help to debug */
+
+        data->err_count++;
+    }
 }
 
 static int
@@ -5029,16 +6875,22 @@ verify_internal_consistency_i(void *page_start, void *page_end, size_t stride, v
     rb_objspace_t *objspace = data->objspace;
 
     for (obj = (VALUE)page_start; obj != (VALUE)page_end; obj += stride) {
+        void *poisoned = asan_poisoned_object_p(obj);
+        asan_unpoison_object(obj, false);
+
 	if (is_live_object(objspace, obj)) {
 	    /* count objects */
 	    data->live_object_count++;
+            data->parent = obj;
 
-	    rb_objspace_reachable_objects_from(obj, check_children_i, (void *)data);
+            /* Normally, we don't expect T_MOVED objects to be in the heap.
+             * But they can stay alive on the stack, */
+            if (!gc_object_moved_p(objspace, obj)) {
+                /* moved slots don't have children */
+                rb_objspace_reachable_objects_from(obj, check_children_i, (void *)data);
+            }
 
-#if USE_RGENGC
 	    /* check health of children */
-	    data->parent = obj;
-
 	    if (RVALUE_OLD_P(obj)) data->old_object_count++;
 	    if (RVALUE_WB_UNPROTECTED(obj) && RVALUE_UNCOLLECTIBLE(obj)) data->remembered_shady_count++;
 
@@ -5055,14 +6907,17 @@ verify_internal_consistency_i(void *page_start, void *page_end, size_t stride, v
 		    rb_objspace_reachable_objects_from(obj, check_color_i, (void *)data);
 		}
 	    }
-#endif
 	}
 	else {
 	    if (BUILTIN_TYPE(obj) == T_ZOMBIE) {
-		if (RGENGC_CHECK_MODE) assert(RBASIC(obj)->flags == T_ZOMBIE);
+		GC_ASSERT((RBASIC(obj)->flags & ~FL_SEEN_OBJ_ID) == T_ZOMBIE);
 		data->zombie_object_count++;
 	    }
 	}
+        if (poisoned) {
+            GC_ASSERT(BUILTIN_TYPE(obj) == T_NONE);
+            asan_poison_object(obj);
+        }
     }
 
     return 0;
@@ -5071,81 +6926,101 @@ verify_internal_consistency_i(void *page_start, void *page_end, size_t stride, v
 static int
 gc_verify_heap_page(rb_objspace_t *objspace, struct heap_page *page, VALUE obj)
 {
-#if USE_RGENGC
     int i;
     unsigned int has_remembered_shady = FALSE;
     unsigned int has_remembered_old = FALSE;
-    int rememberd_old_objects = 0;
+    int remembered_old_objects = 0;
     int free_objects = 0;
     int zombie_objects = 0;
 
     for (i=0; i<page->total_slots; i++) {
-	VALUE obj = (VALUE)&page->start[i];
-	if (RBASIC(obj) == 0) free_objects++;
-	if (BUILTIN_TYPE(obj) == T_ZOMBIE) zombie_objects++;
-	if (RVALUE_PAGE_UNCOLLECTIBLE(page, obj) && RVALUE_PAGE_WB_UNPROTECTED(page, obj)) has_remembered_shady = TRUE;
-	if (RVALUE_PAGE_MARKING(page, obj)) {
+	VALUE val = (VALUE)&page->start[i];
+        void *poisoned = asan_poisoned_object_p(val);
+        asan_unpoison_object(val, false);
+
+	if (RBASIC(val) == 0) free_objects++;
+	if (BUILTIN_TYPE(val) == T_ZOMBIE) zombie_objects++;
+	if (RVALUE_PAGE_UNCOLLECTIBLE(page, val) && RVALUE_PAGE_WB_UNPROTECTED(page, val)) {
+	    has_remembered_shady = TRUE;
+	}
+	if (RVALUE_PAGE_MARKING(page, val)) {
 	    has_remembered_old = TRUE;
-	    rememberd_old_objects++;
+	    remembered_old_objects++;
 	}
+
+        if (poisoned) {
+            GC_ASSERT(BUILTIN_TYPE(val) == T_NONE);
+            asan_poison_object(val);
+        }
     }
 
     if (!is_incremental_marking(objspace) &&
 	page->flags.has_remembered_objects == FALSE && has_remembered_old == TRUE) {
 
 	for (i=0; i<page->total_slots; i++) {
-	    VALUE obj = (VALUE)&page->start[i];
-	    if (RVALUE_PAGE_MARKING(page, obj)) {
-		fprintf(stderr, "marking -> %s\n", obj_info(obj));
+	    VALUE val = (VALUE)&page->start[i];
+	    if (RVALUE_PAGE_MARKING(page, val)) {
+		fprintf(stderr, "marking -> %s\n", obj_info(val));
 	    }
 	}
 	rb_bug("page %p's has_remembered_objects should be false, but there are remembered old objects (%d). %s",
-	       page, rememberd_old_objects, obj ? obj_info(obj) : "");
+	       (void *)page, remembered_old_objects, obj ? obj_info(obj) : "");
     }
 
     if (page->flags.has_uncollectible_shady_objects == FALSE && has_remembered_shady == TRUE) {
 	rb_bug("page %p's has_remembered_shady should be false, but there are remembered shady objects. %s",
-	       page, obj ? obj_info(obj) : "");
+	       (void *)page, obj ? obj_info(obj) : "");
     }
 
     if (0) {
 	/* free_slots may not equal to free_objects */
 	if (page->free_slots != free_objects) {
-	    rb_bug("page %p's free_slots should be %d, but %d\n", page, (int)page->free_slots, free_objects);
+	    rb_bug("page %p's free_slots should be %d, but %d\n", (void *)page, page->free_slots, free_objects);
 	}
     }
     if (page->final_slots != zombie_objects) {
-	rb_bug("page %p's final_slots should be %d, but %d\n", page, (int)page->final_slots, zombie_objects);
+	rb_bug("page %p's final_slots should be %d, but %d\n", (void *)page, page->final_slots, zombie_objects);
     }
 
-    return rememberd_old_objects;
-#else
-    return 0;
-#endif
+    return remembered_old_objects;
 }
 
 static int
-gc_verify_heap_pages_(rb_objspace_t *objspace, struct heap_page *page)
-{
-    int rememberd_old_objects = 0;
+gc_verify_heap_pages_(rb_objspace_t *objspace, struct list_head *head)
+{
+    int remembered_old_objects = 0;
+    struct heap_page *page = 0;
+
+    list_for_each(head, page, page_node) {
+        asan_unpoison_memory_region(&page->freelist, sizeof(RVALUE*), false);
+        RVALUE *p = page->freelist;
+        while (p) {
+            VALUE vp = (VALUE)p;
+            VALUE prev = vp;
+            asan_unpoison_object(vp, false);
+            if (BUILTIN_TYPE(vp) != T_NONE) {
+                fprintf(stderr, "freelist slot expected to be T_NONE but was: %s\n", obj_info(vp));
+            }
+            p = p->as.free.next;
+            asan_poison_object(prev);
+        }
+        asan_poison_memory_region(&page->freelist, sizeof(RVALUE*));
 
-    while (page) {
 	if (page->flags.has_remembered_objects == FALSE) {
-	    rememberd_old_objects += gc_verify_heap_page(objspace, page, Qfalse);
+	    remembered_old_objects += gc_verify_heap_page(objspace, page, Qfalse);
 	}
-	page = page->next;
     }
 
-    return rememberd_old_objects;
+    return remembered_old_objects;
 }
 
 static int
 gc_verify_heap_pages(rb_objspace_t *objspace)
 {
-    int rememberd_old_objects = 0;
-    rememberd_old_objects = gc_verify_heap_pages_(objspace, heap_eden->pages);
-    rememberd_old_objects = gc_verify_heap_pages_(objspace, heap_tomb->pages);
-    return rememberd_old_objects;
+    int remembered_old_objects = 0;
+    remembered_old_objects += gc_verify_heap_pages_(objspace, &heap_eden->pages);
+    remembered_old_objects += gc_verify_heap_pages_(objspace, &heap_tomb->pages);
+    return remembered_old_objects;
 }
 
 /*
@@ -5159,20 +7034,23 @@ gc_verify_heap_pages(rb_objspace_t *objspace)
  *  if RGenGC is supported.
  */
 static VALUE
-gc_verify_internal_consistency(VALUE dummy)
+gc_verify_internal_consistency_m(VALUE dummy)
+{
+    gc_verify_internal_consistency(&rb_objspace);
+    return Qnil;
+}
+
+static void
+gc_verify_internal_consistency_(rb_objspace_t *objspace)
 {
-    rb_objspace_t *objspace = &rb_objspace;
     struct verify_internal_consistency_struct data = {0};
-    struct each_obj_args eo_args;
 
     data.objspace = objspace;
     gc_report(5, objspace, "gc_verify_internal_consistency: start\n");
 
     /* check relations */
 
-    eo_args.callback = verify_internal_consistency_i;
-    eo_args.data = (void *)&data;
-    objspace_each_objects((VALUE)&eo_args);
+    objspace_each_objects_without_setup(objspace, verify_internal_consistency_i, &data);
 
     if (data.err_count != 0) {
 #if RGENGC_CHECK_MODE >= 5
@@ -5188,24 +7066,28 @@ gc_verify_internal_consistency(VALUE dummy)
 
     /* check counters */
 
-    if (!is_lazy_sweeping(heap_eden) && !finalizing) {
+    if (!is_lazy_sweeping(heap_eden) &&
+        !finalizing &&
+        ruby_single_main_ractor != NULL) {
 	if (objspace_live_slots(objspace) != data.live_object_count) {
-	    fprintf(stderr, "heap_pages_final_slots: %d, objspace->profile.total_freed_objects: %d\n",
-		    (int)heap_pages_final_slots, (int)objspace->profile.total_freed_objects);
-	    rb_bug("inconsistent live slot nubmer: expect %"PRIuSIZE", but %"PRIuSIZE".", objspace_live_slots(objspace), data.live_object_count);
+	    fprintf(stderr, "heap_pages_final_slots: %"PRIdSIZE", "
+                    "objspace->profile.total_freed_objects: %"PRIdSIZE"\n",
+		    heap_pages_final_slots, objspace->profile.total_freed_objects);
+	    rb_bug("inconsistent live slot number: expect %"PRIuSIZE", but %"PRIuSIZE".",
+                   objspace_live_slots(objspace), data.live_object_count);
 	}
     }
 
-#if USE_RGENGC
     if (!is_marking(objspace)) {
 	if (objspace->rgengc.old_objects != data.old_object_count) {
-	    rb_bug("inconsistent old slot nubmer: expect %"PRIuSIZE", but %"PRIuSIZE".", objspace->rgengc.old_objects, data.old_object_count);
+	    rb_bug("inconsistent old slot number: expect %"PRIuSIZE", but %"PRIuSIZE".",
+                   objspace->rgengc.old_objects, data.old_object_count);
 	}
 	if (objspace->rgengc.uncollectible_wb_unprotected_objects != data.remembered_shady_count) {
-	    rb_bug("inconsistent old slot nubmer: expect %"PRIuSIZE", but %"PRIuSIZE".", objspace->rgengc.uncollectible_wb_unprotected_objects, data.remembered_shady_count);
+            rb_bug("inconsistent number of wb unprotected objects: expect %"PRIuSIZE", but %"PRIuSIZE".",
+                   objspace->rgengc.uncollectible_wb_unprotected_objects, data.remembered_shady_count);
 	}
     }
-#endif
 
     if (!finalizing) {
 	size_t list_count = 0;
@@ -5232,14 +7114,36 @@ gc_verify_internal_consistency(VALUE dummy)
     }
 
     gc_report(5, objspace, "gc_verify_internal_consistency: OK\n");
+}
 
-    return Qnil;
+static void
+gc_verify_internal_consistency(rb_objspace_t *objspace)
+{
+    RB_VM_LOCK_ENTER();
+    {
+        rb_vm_barrier(); // stop other ractors
+
+        unsigned int prev_during_gc = during_gc;
+        during_gc = FALSE; // stop gc here
+        {
+            gc_verify_internal_consistency_(objspace);
+        }
+        during_gc = prev_during_gc;
+    }
+    RB_VM_LOCK_LEAVE();
 }
 
 void
 rb_gc_verify_internal_consistency(void)
 {
-    gc_verify_internal_consistency(Qnil);
+    gc_verify_internal_consistency(&rb_objspace);
+}
+
+static VALUE
+gc_verify_transient_heap_internal_consistency(VALUE dmy)
+{
+    rb_transient_heap_verify();
+    return Qnil;
 }
 
 /* marks */
@@ -5251,15 +7155,19 @@ gc_marks_start(rb_objspace_t *objspace, int full_mark)
     gc_report(1, objspace, "gc_marks_start: (%s)\n", full_mark ? "full" : "minor");
     gc_mode_transition(objspace, gc_mode_marking);
 
-#if USE_RGENGC
     if (full_mark) {
 #if GC_ENABLE_INCREMENTAL_MARK
 	objspace->rincgc.step_slots = (objspace->marked_slots * 2) / ((objspace->rincgc.pooled_slots / HEAP_PAGE_OBJ_LIMIT) + 1);
 
-	if (0) fprintf(stderr, "objspace->marked_slots: %d, objspace->rincgc.pooled_page_num: %d, objspace->rincgc.step_slots: %d, \n",
-		       (int)objspace->marked_slots, (int)objspace->rincgc.pooled_slots, (int)objspace->rincgc.step_slots);
+	if (0) fprintf(stderr, "objspace->marked_slots: %"PRIdSIZE", "
+                       "objspace->rincgc.pooled_page_num: %"PRIdSIZE", "
+                       "objspace->rincgc.step_slots: %"PRIdSIZE", \n",
+                       objspace->marked_slots, objspace->rincgc.pooled_slots, objspace->rincgc.step_slots);
 #endif
 	objspace->flags.during_minor_gc = FALSE;
+        if (ruby_enable_autocompact) {
+            objspace->flags.during_compacting |= TRUE;
+        }
 	objspace->profile.major_gc_count++;
 	objspace->rgengc.uncollectible_wb_unprotected_objects = 0;
 	objspace->rgengc.old_objects = 0;
@@ -5274,20 +7182,20 @@ gc_marks_start(rb_objspace_t *objspace, int full_mark)
 	objspace->profile.minor_gc_count++;
 	rgengc_rememberset_mark(objspace, heap_eden);
     }
-#endif
 
     gc_mark_roots(objspace, NULL);
 
-    gc_report(1, objspace, "gc_marks_start: (%s) end, stack in %d\n", full_mark ? "full" : "minor", (int)mark_stack_size(&objspace->mark_stack));
+    gc_report(1, objspace, "gc_marks_start: (%s) end, stack in %"PRIdSIZE"\n",
+              full_mark ? "full" : "minor", mark_stack_size(&objspace->mark_stack));
 }
 
 #if GC_ENABLE_INCREMENTAL_MARK
 static void
 gc_marks_wb_unprotected_objects(rb_objspace_t *objspace)
 {
-    struct heap_page *page = heap_eden->pages;
+    struct heap_page *page = 0;
 
-    while (page) {
+    list_for_each(&heap_eden->pages, page, page_node) {
 	bits_t *mark_bits = page->mark_bits;
 	bits_t *wbun_bits = page->wb_unprotected_bits;
 	RVALUE *p = page->start;
@@ -5303,10 +7211,8 @@ gc_marks_wb_unprotected_objects(rb_objspace_t *objspace)
 		do {
 		    if (bits & 1) {
 			gc_report(2, objspace, "gc_marks_wb_unprotected_objects: marked shady: %s\n", obj_info((VALUE)p));
-			if (RGENGC_CHECK_MODE > 0) {
-			    assert(RVALUE_WB_UNPROTECTED((VALUE)p));
-			    assert(RVALUE_MARKED((VALUE)p));
-			}
+			GC_ASSERT(RVALUE_WB_UNPROTECTED((VALUE)p));
+			GC_ASSERT(RVALUE_MARKED((VALUE)p));
 			gc_mark_children(objspace, (VALUE)p);
 		    }
 		    p++;
@@ -5314,8 +7220,6 @@ gc_marks_wb_unprotected_objects(rb_objspace_t *objspace)
 		} while (bits);
 	    }
 	}
-
-	page = page->next;
     }
 
     gc_mark_stacked_objects_all(objspace);
@@ -5328,8 +7232,7 @@ heap_move_pooled_pages_to_free_pages(rb_heap_t *heap)
 
     if (page) {
 	heap->pooled_pages = page->free_next;
-	page->free_next = heap->free_pages;
-	heap->free_pages = page;
+        heap_add_freepage(heap, page);
     }
 
     return page;
@@ -5349,13 +7252,15 @@ gc_marks_finish(rb_objspace_t *objspace)
 	}
 
 	if (RGENGC_CHECK_MODE && is_mark_stack_empty(&objspace->mark_stack) == 0) {
-	    rb_bug("gc_marks_finish: mark stack is not empty (%d).", (int)mark_stack_size(&objspace->mark_stack));
+	    rb_bug("gc_marks_finish: mark stack is not empty (%"PRIdSIZE").",
+                   mark_stack_size(&objspace->mark_stack));
 	}
 
 	gc_mark_roots(objspace, 0);
 
 	if (is_mark_stack_empty(&objspace->mark_stack) == FALSE) {
-	    gc_report(1, objspace, "gc_marks_finish: not empty (%d). retry.\n", (int)mark_stack_size(&objspace->mark_stack));
+	    gc_report(1, objspace, "gc_marks_finish: not empty (%"PRIdSIZE"). retry.\n",
+                      mark_stack_size(&objspace->mark_stack));
 	    return FALSE;
 	}
 
@@ -5372,17 +7277,15 @@ gc_marks_finish(rb_objspace_t *objspace)
 #endif /* GC_ENABLE_INCREMENTAL_MARK */
 
 #if RGENGC_CHECK_MODE >= 2
-    gc_verify_internal_consistency(Qnil);
+    gc_verify_internal_consistency(objspace);
 #endif
 
-#if USE_RGENGC
     if (is_full_marking(objspace)) {
 	/* See the comment about RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR */
 	const double r = gc_params.oldobject_limit_factor;
 	objspace->rgengc.uncollectible_wb_unprotected_objects_limit = (size_t)(objspace->rgengc.uncollectible_wb_unprotected_objects * r);
 	objspace->rgengc.old_objects_limit = (size_t)(objspace->rgengc.old_objects * r);
     }
-#endif
 
 #if RGENGC_CHECK_MODE >= 4
     gc_marks_check(objspace, gc_check_after_marks_i, "after_marks");
@@ -5396,13 +7299,15 @@ gc_marks_finish(rb_objspace_t *objspace)
 	size_t max_free_slots = (size_t)(total_slots * gc_params.heap_free_slots_max_ratio);
 	size_t min_free_slots = (size_t)(total_slots * gc_params.heap_free_slots_min_ratio);
 	int full_marking = is_full_marking(objspace);
+        const int r_cnt = GET_VM()->ractor.cnt;
+        const int r_mul = r_cnt > 8 ? 8 : r_cnt; // upto 8
 
-#if RGENGC_CHECK_MODE
-	assert(heap->total_slots >= objspace->marked_slots);
-#endif
+	GC_ASSERT(heap->total_slots >= objspace->marked_slots);
 
 	/* setup free-able page counts */
-	if (max_free_slots < gc_params.heap_init_slots) max_free_slots = gc_params.heap_init_slots;
+        if (max_free_slots < gc_params.heap_init_slots * r_mul) {
+            max_free_slots = gc_params.heap_init_slots * r_mul;
+        }
 
 	if (sweep_slots > max_free_slots) {
 	    heap_pages_freeable_pages = (sweep_slots - max_free_slots) / HEAP_PAGE_OBJ_LIMIT;
@@ -5411,24 +7316,25 @@ gc_marks_finish(rb_objspace_t *objspace)
 	    heap_pages_freeable_pages = 0;
 	}
 
-	/* check free_min */
-	if (min_free_slots < gc_params.heap_free_slots) min_free_slots = gc_params.heap_free_slots;
+        /* check free_min */
+        if (min_free_slots < gc_params.heap_free_slots * r_mul) {
+            min_free_slots = gc_params.heap_free_slots * r_mul;
+        }
 
-#if USE_RGENGC
 	if (sweep_slots < min_free_slots) {
 	    if (!full_marking) {
 		if (objspace->profile.count - objspace->rgengc.last_major_gc < RVALUE_OLD_AGE) {
 		    full_marking = TRUE;
 		    /* do not update last_major_gc, because full marking is not done. */
-		    goto increment;
+                    /* goto increment; */
 		}
 		else {
 		    gc_report(1, objspace, "gc_marks_finish: next is full GC!!)\n");
 		    objspace->rgengc.need_major_gc |= GPR_FLAG_MAJOR_BY_NOFREE;
 		}
 	    }
-	    else {
-	      increment:
+            if (full_marking) {
+              /* increment: */
 		gc_report(1, objspace, "gc_marks_finish: heap_set_increment!!\n");
 		heap_set_increment(objspace, heap_extend_pages(objspace, sweep_slots, total_slots));
 		heap_increment(objspace, heap);
@@ -5452,28 +7358,26 @@ gc_marks_finish(rb_objspace_t *objspace)
 	    objspace->rgengc.need_major_gc = GPR_FLAG_MAJOR_BY_FORCE;
 	}
 
-	gc_report(1, objspace, "gc_marks_finish (marks %d objects, old %d objects, total %d slots, sweep %d slots, increment: %d, next GC: %s)\n",
-		  (int)objspace->marked_slots, (int)objspace->rgengc.old_objects, (int)heap->total_slots, (int)sweep_slots, (int)heap_allocatable_pages,
+	gc_report(1, objspace, "gc_marks_finish (marks %"PRIdSIZE" objects, "
+                  "old %"PRIdSIZE" objects, total %"PRIdSIZE" slots, "
+                  "sweep %"PRIdSIZE" slots, increment: %"PRIdSIZE", next GC: %s)\n",
+                  objspace->marked_slots, objspace->rgengc.old_objects, heap->total_slots, sweep_slots, heap_allocatable_pages,
 		  objspace->rgengc.need_major_gc ? "major" : "minor");
-#else /* USE_RGENGC */
-	if (sweep_slots < min_free_slots) {
-	    gc_report(1, objspace, "gc_marks_finish: heap_set_increment!!\n");
-	    heap_set_increment(objspace, heap_extend_pages(objspace, sweep_slot, total_slot));
-	    heap_increment(objspace, heap);
-	}
-#endif
     }
 
+    rb_transient_heap_finish_marking();
+    rb_ractor_finish_marking();
+
     gc_event_hook(objspace, RUBY_INTERNAL_EVENT_GC_END_MARK, 0);
 
     return TRUE;
 }
 
-#if GC_ENABLE_INCREMENTAL_MARK
 static void
-gc_marks_step(rb_objspace_t *objspace, int slots)
+gc_marks_step(rb_objspace_t *objspace, size_t slots)
 {
-    if (RGENGC_CHECK_MODE) assert(is_marking(objspace));
+#if GC_ENABLE_INCREMENTAL_MARK
+    GC_ASSERT(is_marking(objspace));
 
     if (gc_mark_stacked_objects_incremental(objspace, slots)) {
 	if (gc_marks_finish(objspace)) {
@@ -5481,9 +7385,9 @@ gc_marks_step(rb_objspace_t *objspace, int slots)
 	    gc_sweep(objspace);
 	}
     }
-    if (0) fprintf(stderr, "objspace->marked_slots: %d\n", (int)objspace->marked_slots);
-}
+    if (0) fprintf(stderr, "objspace->marked_slots: %"PRIdSIZE"\n", objspace->marked_slots);
 #endif
+}
 
 static void
 gc_marks_rest(rb_objspace_t *objspace)
@@ -5508,74 +7412,63 @@ gc_marks_rest(rb_objspace_t *objspace)
     gc_sweep(objspace);
 }
 
-#if GC_ENABLE_INCREMENTAL_MARK
 static void
 gc_marks_continue(rb_objspace_t *objspace, rb_heap_t *heap)
 {
-    int slots = 0;
-    const char *from;
+    GC_ASSERT(dont_gc_val() == FALSE);
+#if GC_ENABLE_INCREMENTAL_MARK
 
-    if (RGENGC_CHECK_MODE) assert(dont_gc == FALSE);
+    unsigned int lock_lev;
+    gc_enter(objspace, gc_enter_event_mark_continue, &lock_lev);
 
-    gc_enter(objspace, "marks_continue");
+    int slots = 0;
+    const char *from;
 
-    PUSH_MARK_FUNC_DATA(NULL);
-    {
-	if (heap->pooled_pages) {
-	    while (heap->pooled_pages && slots < HEAP_PAGE_OBJ_LIMIT) {
-		struct heap_page *page = heap_move_pooled_pages_to_free_pages(heap);
-		slots += page->free_slots;
-	    }
-	    from = "pooled-pages";
-	}
-	else if (heap_increment(objspace, heap)) {
-	    slots = heap->free_pages->free_slots;
-	    from = "incremented-pages";
-	}
+    if (heap->pooled_pages) {
+        while (heap->pooled_pages && slots < HEAP_PAGE_OBJ_LIMIT) {
+            struct heap_page *page = heap_move_pooled_pages_to_free_pages(heap);
+            slots += page->free_slots;
+        }
+        from = "pooled-pages";
+    }
+    else if (heap_increment(objspace, heap)) {
+        slots = heap->free_pages->free_slots;
+        from = "incremented-pages";
+    }
 
-	if (slots > 0) {
-	    gc_report(2, objspace, "gc_marks_continue: provide %d slots from %s.\n", slots, from);
-	    gc_marks_step(objspace, (int)objspace->rincgc.step_slots);
-	}
-	else {
-	    gc_report(2, objspace, "gc_marks_continue: no more pooled pages (stack depth: %d).\n", (int)mark_stack_size(&objspace->mark_stack));
-	    gc_marks_rest(objspace);
-	}
+    if (slots > 0) {
+        gc_report(2, objspace, "gc_marks_continue: provide %d slots from %s.\n",
+                  slots, from);
+        gc_marks_step(objspace, objspace->rincgc.step_slots);
+    }
+    else {
+        gc_report(2, objspace, "gc_marks_continue: no more pooled pages (stack depth: %"PRIdSIZE").\n",
+                  mark_stack_size(&objspace->mark_stack));
+        gc_marks_rest(objspace);
     }
-    POP_MARK_FUNC_DATA();
 
-    gc_exit(objspace, "marks_continue");
-}
+    gc_exit(objspace, gc_enter_event_mark_continue, &lock_lev);
 #endif
+}
 
 static void
 gc_marks(rb_objspace_t *objspace, int full_mark)
 {
     gc_prof_mark_timer_start(objspace);
 
-    PUSH_MARK_FUNC_DATA(NULL);
-    {
-	/* setup marking */
+    /* setup marking */
 
-#if USE_RGENGC
-	gc_marks_start(objspace, full_mark);
-	if (!is_incremental_marking(objspace)) {
-	    gc_marks_rest(objspace);
-	}
+    gc_marks_start(objspace, full_mark);
+    if (!is_incremental_marking(objspace)) {
+        gc_marks_rest(objspace);
+    }
 
 #if RGENGC_PROFILE > 0
-	if (gc_prof_record(objspace)) {
-	    gc_profile_record *record = gc_prof_record(objspace);
-	    record->old_objects = objspace->rgengc.old_objects;
-	}
-#endif
-
-#else /* USE_RGENGC */
-	gc_marks_start(objspace, TRUE);
-	gc_marks_rest(objspace);
-#endif
+    if (gc_prof_record(objspace)) {
+        gc_profile_record *record = gc_prof_record(objspace);
+        record->old_objects = objspace->rgengc.old_objects;
     }
-    POP_MARK_FUNC_DATA();
+#endif
     gc_prof_mark_timer_stop(objspace);
 }
 
@@ -5590,7 +7483,6 @@ gc_report_body(int level, rb_objspace_t *objspace, const char *fmt, ...)
 	va_list args;
 	const char *status = " ";
 
-#if USE_RGENGC
 	if (during_gc) {
 	    status = is_full_marking(objspace) ? "+" : "-";
 	}
@@ -5602,7 +7494,6 @@ gc_report_body(int level, rb_objspace_t *objspace, const char *fmt, ...)
 		status = "M";
 	    }
 	}
-#endif
 
 	va_start(args, fmt);
 	vsnprintf(buf, 1024, fmt, args);
@@ -5613,8 +7504,6 @@ gc_report_body(int level, rb_objspace_t *objspace, const char *fmt, ...)
     }
 }
 
-#if USE_RGENGC
-
 /* bit operations */
 
 static int
@@ -5629,7 +7518,7 @@ rgengc_remembersetbits_set(rb_objspace_t *objspace, VALUE obj)
     struct heap_page *page = GET_HEAP_PAGE(obj);
     bits_t *bits = &page->marking_bits[0];
 
-    if (RGENGC_CHECK_MODE) assert(!is_incremental_marking(objspace));
+    GC_ASSERT(!is_incremental_marking(objspace));
 
     if (MARKED_IN_BITMAP(bits, obj)) {
 	return FALSE;
@@ -5671,14 +7560,20 @@ rgengc_remember(rb_objspace_t *objspace, VALUE obj)
 }
 
 static int
-rgengc_remembered(rb_objspace_t *objspace, VALUE obj)
+rgengc_remembered_sweep(rb_objspace_t *objspace, VALUE obj)
 {
     int result = rgengc_remembersetbits_get(objspace, obj);
     check_rvalue_consistency(obj);
-    gc_report(6, objspace, "rgengc_remembered: %s\n", obj_info(obj));
     return result;
 }
 
+static int
+rgengc_remembered(rb_objspace_t *objspace, VALUE obj)
+{
+    gc_report(6, objspace, "rgengc_remembered: %s\n", obj_info(obj));
+    return rgengc_remembered_sweep(objspace, obj);
+}
+
 #ifndef PROFILE_REMEMBERSET_MARK
 #define PROFILE_REMEMBERSET_MARK 0
 #endif
@@ -5687,13 +7582,13 @@ static void
 rgengc_rememberset_mark(rb_objspace_t *objspace, rb_heap_t *heap)
 {
     size_t j;
-    struct heap_page *page = heap->pages;
+    struct heap_page *page = 0;
 #if PROFILE_REMEMBERSET_MARK
     int has_old = 0, has_shady = 0, has_both = 0, skip = 0;
 #endif
     gc_report(1, objspace, "rgengc_rememberset_mark: start\n");
 
-    while (page) {
+    list_for_each(&heap->pages, page, page_node) {
 	if (page->flags.has_remembered_objects | page->flags.has_uncollectible_shady_objects) {
 	    RVALUE *p = page->start;
 	    RVALUE *offset = p - NUM_IN_PAGE(p);
@@ -5722,11 +7617,8 @@ rgengc_rememberset_mark(rb_objspace_t *objspace, rb_heap_t *heap)
 			if (bitset & 1) {
 			    VALUE obj = (VALUE)p;
 			    gc_report(2, objspace, "rgengc_rememberset_mark: mark %s\n", obj_info(obj));
-
-			    if (RGENGC_CHECK_MODE) {
-				assert(RVALUE_UNCOLLECTIBLE(obj));
-				assert(RVALUE_OLD_P(obj) || RVALUE_WB_UNPROTECTED(obj));
-			    }
+			    GC_ASSERT(RVALUE_UNCOLLECTIBLE(obj));
+			    GC_ASSERT(RVALUE_OLD_P(obj) || RVALUE_WB_UNPROTECTED(obj));
 
 			    gc_mark_children(objspace, obj);
 			}
@@ -5741,8 +7633,6 @@ rgengc_rememberset_mark(rb_objspace_t *objspace, rb_heap_t *heap)
 	    skip++;
 	}
 #endif
-
-	page = page->next;
     }
 
 #if PROFILE_REMEMBERSET_MARK
@@ -5754,15 +7644,15 @@ rgengc_rememberset_mark(rb_objspace_t *objspace, rb_heap_t *heap)
 static void
 rgengc_mark_and_rememberset_clear(rb_objspace_t *objspace, rb_heap_t *heap)
 {
-    struct heap_page *page = heap->pages;
+    struct heap_page *page = 0;
 
-    while (page) {
+    list_for_each(&heap->pages, page, page_node) {
 	memset(&page->mark_bits[0],       0, HEAP_PAGE_BITMAP_SIZE);
-	memset(&page->marking_bits[0],    0, HEAP_PAGE_BITMAP_SIZE);
 	memset(&page->uncollectible_bits[0], 0, HEAP_PAGE_BITMAP_SIZE);
+        memset(&page->marking_bits[0],    0, HEAP_PAGE_BITMAP_SIZE);
+        memset(&page->pinned_bits[0],     0, HEAP_PAGE_BITMAP_SIZE);
 	page->flags.has_uncollectible_shady_objects = FALSE;
 	page->flags.has_remembered_objects = FALSE;
-	page = page->next;
     }
 }
 
@@ -5782,7 +7672,11 @@ gc_writebarrier_generational(VALUE a, VALUE b, rb_objspace_t *objspace)
 #if 1
     /* mark `a' and remember (default behavior) */
     if (!rgengc_remembered(objspace, a)) {
-	rgengc_remember(objspace, a);
+        RB_VM_LOCK_ENTER_NO_BARRIER();
+        {
+            rgengc_remember(objspace, a);
+        }
+        RB_VM_LOCK_LEAVE_NO_BARRIER();
 	gc_report(1, objspace, "gc_writebarrier_generational: %s (remembered) -> %s\n", obj_info(a), obj_info(b));
     }
 #else
@@ -5819,18 +7713,18 @@ NOINLINE(static void gc_writebarrier_incremental(VALUE a, VALUE b, rb_objspace_t
 static void
 gc_writebarrier_incremental(VALUE a, VALUE b, rb_objspace_t *objspace)
 {
-    gc_report(2, objspace, "gc_writebarrier_incremental: [LG] %s -> %s\n", obj_info(a), obj_info(b));
+    gc_report(2, objspace, "gc_writebarrier_incremental: [LG] %p -> %s\n", (void *)a, obj_info(b));
 
     if (RVALUE_BLACK_P(a)) {
 	if (RVALUE_WHITE_P(b)) {
 	    if (!RVALUE_WB_UNPROTECTED(a)) {
-		gc_report(2, objspace, "gc_writebarrier_incremental: [IN] %s -> %s\n", obj_info(a), obj_info(b));
+		gc_report(2, objspace, "gc_writebarrier_incremental: [IN] %p -> %s\n", (void *)a, obj_info(b));
 		gc_mark_from(objspace, b, a);
 	    }
 	}
 	else if (RVALUE_OLD_P(a) && !RVALUE_OLD_P(b)) {
 	    if (!RVALUE_WB_UNPROTECTED(b)) {
-		gc_report(1, objspace, "gc_writebarrier_incremental: [GN] %s -> %s\n", obj_info(a), obj_info(b));
+		gc_report(1, objspace, "gc_writebarrier_incremental: [GN] %p -> %s\n", (void *)a, obj_info(b));
 		RVALUE_AGE_SET_OLD(objspace, b);
 
 		if (RVALUE_BLACK_P(b)) {
@@ -5838,10 +7732,14 @@ gc_writebarrier_incremental(VALUE a, VALUE b, rb_objspace_t *objspace)
 		}
 	    }
 	    else {
-		gc_report(1, objspace, "gc_writebarrier_incremental: [LL] %s -> %s\n", obj_info(a), obj_info(b));
+		gc_report(1, objspace, "gc_writebarrier_incremental: [LL] %p -> %s\n", (void *)a, obj_info(b));
 		gc_remember_unprotected(objspace, b);
 	    }
 	}
+
+        if (UNLIKELY(objspace->flags.during_compacting)) {
+            MARK_IN_BITMAP(GET_HEAP_PINNED_BITS(b), b);
+        }
     }
 }
 #else
@@ -5857,16 +7755,22 @@ rb_gc_writebarrier(VALUE a, VALUE b)
     if (RGENGC_CHECK_MODE && SPECIAL_CONST_P(b)) rb_bug("rb_gc_writebarrier: b is special const");
 
     if (!is_incremental_marking(objspace)) {
-	if (!RVALUE_OLD_P(a) || RVALUE_OLD_P(b)) {
-	    return;
-	}
-	else {
-	    gc_writebarrier_generational(a, b, objspace);
-	}
+        if (!RVALUE_OLD_P(a) || RVALUE_OLD_P(b)) {
+            // do nothing
+        }
+        else {
+            gc_writebarrier_generational(a, b, objspace);
+        }
     }
-    else { /* slow path */
-	gc_writebarrier_incremental(a, b, objspace);
+    else {
+        /* slow path */
+        RB_VM_LOCK_ENTER_NO_BARRIER();
+        {
+            gc_writebarrier_incremental(a, b, objspace);
+        }
+        RB_VM_LOCK_LEAVE_NO_BARRIER();
     }
+    return;
 }
 
 void
@@ -5898,6 +7802,7 @@ rb_gc_writebarrier_unprotect(VALUE obj)
 	    RVALUE_AGE_RESET(obj);
 	}
 
+        RB_DEBUG_COUNTER_INC(obj_wb_unprotect);
 	MARK_IN_BITMAP(GET_HEAP_WB_UNPROTECTED_BITS(obj), obj);
     }
 }
@@ -5905,7 +7810,7 @@ rb_gc_writebarrier_unprotect(VALUE obj)
 /*
  * remember `obj' if needed.
  */
-void
+MJIT_FUNC_EXPORTED void
 rb_gc_writebarrier_remember(VALUE obj)
 {
     rb_objspace_t *objspace = &rb_objspace;
@@ -5929,7 +7834,7 @@ static st_table *rgengc_unprotect_logging_table;
 static int
 rgengc_unprotect_logging_exit_func_i(st_data_t key, st_data_t val, st_data_t arg)
 {
-    fprintf(stderr, "%s\t%d\n", (char *)key, (int)val);
+    fprintf(stderr, "%s\t%"PRIuVALUE"\n", (char *)key, (VALUE)val);
     return ST_CONTINUE;
 }
 
@@ -5960,19 +7865,16 @@ rb_gc_unprotect_logging(void *objptr, const char *filename, int line)
 	    cnt++;
 	}
 	else {
-	    ptr = (char *)malloc(strlen(buff) + 1);
+	    ptr = (strdup)(buff);
 	    if (!ptr) rb_memerror();
-	    strcpy(ptr, buff);
 	}
 	st_insert(rgengc_unprotect_logging_table, (st_data_t)ptr, cnt);
     }
 }
-#endif /* USE_RGENGC */
 
 void
 rb_copy_wb_protected_attribute(VALUE dest, VALUE obj)
 {
-#if USE_RGENGC
     rb_objspace_t *objspace = &rb_objspace;
 
     if (RVALUE_WB_UNPROTECTED(obj) && !RVALUE_WB_UNPROTECTED(dest)) {
@@ -5986,7 +7888,6 @@ rb_copy_wb_protected_attribute(VALUE dest, VALUE obj)
     }
 
     check_rvalue_consistency(dest);
-#endif
 }
 
 /* RGENGC analysis information */
@@ -5994,11 +7895,7 @@ rb_copy_wb_protected_attribute(VALUE dest, VALUE obj)
 VALUE
 rb_obj_rgengc_writebarrier_protected_p(VALUE obj)
 {
-#if USE_RGENGC
     return RVALUE_WB_UNPROTECTED(obj) ? Qfalse : Qtrue;
-#else
-    return Qfalse;
-#endif
 }
 
 VALUE
@@ -6012,80 +7909,109 @@ rb_obj_gc_flags(VALUE obj, ID* flags, size_t max)
 {
     size_t n = 0;
     static ID ID_marked;
-#if USE_RGENGC
-    static ID ID_wb_protected, ID_old, ID_marking, ID_uncollectible;
-#endif
+    static ID ID_wb_protected, ID_old, ID_marking, ID_uncollectible, ID_pinned;
 
     if (!ID_marked) {
 #define I(s) ID_##s = rb_intern(#s);
 	I(marked);
-#if USE_RGENGC
 	I(wb_protected);
 	I(old);
 	I(marking);
 	I(uncollectible);
-#endif
+        I(pinned);
 #undef I
     }
 
-#if USE_RGENGC
     if (RVALUE_WB_UNPROTECTED(obj) == 0 && n<max)                   flags[n++] = ID_wb_protected;
     if (RVALUE_OLD_P(obj) && n<max)                                 flags[n++] = ID_old;
     if (RVALUE_UNCOLLECTIBLE(obj) && n<max)                         flags[n++] = ID_uncollectible;
     if (MARKED_IN_BITMAP(GET_HEAP_MARKING_BITS(obj), obj) && n<max) flags[n++] = ID_marking;
-#endif
     if (MARKED_IN_BITMAP(GET_HEAP_MARK_BITS(obj), obj) && n<max)    flags[n++] = ID_marked;
+    if (MARKED_IN_BITMAP(GET_HEAP_PINNED_BITS(obj), obj) && n<max)  flags[n++] = ID_pinned;
     return n;
 }
 
 /* GC */
 
 void
+rb_gc_ractor_newobj_cache_clear(rb_ractor_newobj_cache_t *newobj_cache)
+{
+    struct heap_page *page = newobj_cache->using_page;
+    RVALUE *freelist = newobj_cache->freelist;
+    RUBY_DEBUG_LOG("ractor using_page:%p freelist:%p", page, freelist);
+
+    if (page && freelist) {
+        asan_unpoison_memory_region(&page->freelist, sizeof(RVALUE*), false);
+        if (page->freelist) {
+            RVALUE *p = page->freelist;
+            asan_unpoison_object((VALUE)p, false);
+            while (p->as.free.next) {
+                RVALUE *prev = p;
+                p = p->as.free.next;
+                asan_poison_object((VALUE)prev);
+                asan_unpoison_object((VALUE)p, false);
+            }
+            p->as.free.next = freelist;
+            asan_poison_object((VALUE)p);
+        }
+        else {
+            page->freelist = freelist;
+        }
+        asan_poison_memory_region(&page->freelist, sizeof(RVALUE*));
+    }
+
+    newobj_cache->using_page = NULL;
+    newobj_cache->freelist = NULL;
+}
+
+void
 rb_gc_force_recycle(VALUE obj)
 {
     rb_objspace_t *objspace = &rb_objspace;
+    RB_VM_LOCK_ENTER();
+    {
+        int is_old = RVALUE_OLD_P(obj);
 
-#if USE_RGENGC
-    int is_old = RVALUE_OLD_P(obj);
-
-    gc_report(2, objspace, "rb_gc_force_recycle: %s\n", obj_info(obj));
+        gc_report(2, objspace, "rb_gc_force_recycle: %s\n", obj_info(obj));
 
-    if (is_old) {
-	if (RVALUE_MARKED(obj)) {
-	    objspace->rgengc.old_objects--;
-	}
-    }
-    CLEAR_IN_BITMAP(GET_HEAP_UNCOLLECTIBLE_BITS(obj), obj);
-    CLEAR_IN_BITMAP(GET_HEAP_WB_UNPROTECTED_BITS(obj), obj);
+        if (is_old) {
+            if (RVALUE_MARKED(obj)) {
+                objspace->rgengc.old_objects--;
+            }
+        }
+        CLEAR_IN_BITMAP(GET_HEAP_UNCOLLECTIBLE_BITS(obj), obj);
+        CLEAR_IN_BITMAP(GET_HEAP_WB_UNPROTECTED_BITS(obj), obj);
+        CLEAR_IN_BITMAP(GET_HEAP_PINNED_BITS(obj), obj);
 
 #if GC_ENABLE_INCREMENTAL_MARK
-    if (is_incremental_marking(objspace)) {
-	if (MARKED_IN_BITMAP(GET_HEAP_MARKING_BITS(obj), obj)) {
-	    invalidate_mark_stack(&objspace->mark_stack, obj);
-	    CLEAR_IN_BITMAP(GET_HEAP_MARKING_BITS(obj), obj);
-	}
-	CLEAR_IN_BITMAP(GET_HEAP_MARK_BITS(obj), obj);
-    }
-    else {
+        if (is_incremental_marking(objspace)) {
+            if (MARKED_IN_BITMAP(GET_HEAP_MARKING_BITS(obj), obj)) {
+                invalidate_mark_stack(&objspace->mark_stack, obj);
+                CLEAR_IN_BITMAP(GET_HEAP_MARKING_BITS(obj), obj);
+            }
+            CLEAR_IN_BITMAP(GET_HEAP_MARK_BITS(obj), obj);
+        }
+        else {
 #endif
-	if (is_old || !GET_HEAP_PAGE(obj)->flags.before_sweep) {
-	    CLEAR_IN_BITMAP(GET_HEAP_MARK_BITS(obj), obj);
-	}
-	CLEAR_IN_BITMAP(GET_HEAP_MARKING_BITS(obj), obj);
+            if (is_old || GET_HEAP_PAGE(obj)->flags.before_sweep) {
+                CLEAR_IN_BITMAP(GET_HEAP_MARK_BITS(obj), obj);
+            }
+            CLEAR_IN_BITMAP(GET_HEAP_MARKING_BITS(obj), obj);
 #if GC_ENABLE_INCREMENTAL_MARK
-    }
-#endif
+        }
 #endif
 
-    objspace->profile.total_freed_objects++;
+        objspace->profile.total_freed_objects++;
 
-    heap_page_add_freeobj(objspace, GET_HEAP_PAGE(obj), obj);
+        heap_page_add_freeobj(objspace, GET_HEAP_PAGE(obj), obj);
 
-    /* Disable counting swept_slots because there are no meaning.
-     * if (!MARKED_IN_BITMAP(GET_HEAP_MARK_BITS(p), p)) {
-     *   objspace->heap.swept_slots++;
-     * }
-     */
+        /* Disable counting swept_slots because there are no meaning.
+         * if (!MARKED_IN_BITMAP(GET_HEAP_MARK_BITS(p), p)) {
+         *   objspace->heap.swept_slots++;
+         * }
+         */
+    }
+    RB_VM_LOCK_LEAVE();
 }
 
 #ifndef MARK_OBJECT_ARY_BUCKET_SIZE
@@ -6095,15 +8021,19 @@ rb_gc_force_recycle(VALUE obj)
 void
 rb_gc_register_mark_object(VALUE obj)
 {
-    VALUE ary_ary = GET_THREAD()->vm->mark_object_ary;
-    VALUE ary = rb_ary_last(0, 0, ary_ary);
+    RB_VM_LOCK_ENTER();
+    {
+        VALUE ary_ary = GET_VM()->mark_object_ary;
+        VALUE ary = rb_ary_last(0, 0, ary_ary);
 
-    if (ary == Qnil || RARRAY_LEN(ary) >= MARK_OBJECT_ARY_BUCKET_SIZE) {
-	ary = rb_ary_tmp_new(MARK_OBJECT_ARY_BUCKET_SIZE);
-	rb_ary_push(ary_ary, ary);
-    }
+        if (ary == Qnil || RARRAY_LEN(ary) >= MARK_OBJECT_ARY_BUCKET_SIZE) {
+            ary = rb_ary_tmp_new(MARK_OBJECT_ARY_BUCKET_SIZE);
+            rb_ary_push(ary_ary, ary);
+        }
 
-    rb_ary_push(ary, obj);
+        rb_ary_push(ary, obj);
+    }
+    RB_VM_LOCK_LEAVE();
 }
 
 void
@@ -6162,7 +8092,7 @@ enum {
 static void
 heap_ready_to_gc(rb_objspace_t *objspace, rb_heap_t *heap)
 {
-    if (!heap->freelist && !heap->free_pages) {
+    if (!heap->free_pages) {
 	if (!heap_increment(objspace, heap)) {
 	    heap_set_increment(objspace, 1);
 	    heap_increment(objspace, heap);
@@ -6173,7 +8103,7 @@ heap_ready_to_gc(rb_objspace_t *objspace, rb_heap_t *heap)
 static int
 ready_to_gc(rb_objspace_t *objspace)
 {
-    if (dont_gc || during_gc || ruby_disable_gc) {
+    if (dont_gc_val() || during_gc || ruby_disable_gc) {
 	heap_ready_to_gc(objspace, heap_eden);
 	return FALSE;
     }
@@ -6192,8 +8122,7 @@ gc_reset_malloc_info(rb_objspace_t *objspace)
 
 	if (inc > malloc_limit) {
 	    malloc_limit = (size_t)(inc * gc_params.malloc_limit_growth_factor);
-	    if (gc_params.malloc_limit_max > 0 && /* ignore max-check if 0 */
-		malloc_limit > gc_params.malloc_limit_max) {
+	    if (malloc_limit > gc_params.malloc_limit_max) {
 		malloc_limit = gc_params.malloc_limit_max;
 	    }
 	}
@@ -6220,7 +8149,7 @@ gc_reset_malloc_info(rb_objspace_t *objspace)
 #if RGENGC_ESTIMATE_OLDMALLOC
     if (!is_full_marking(objspace)) {
 	if (objspace->rgengc.oldmalloc_increase > objspace->rgengc.oldmalloc_increase_limit) {
-	    objspace->rgengc.need_major_gc |= GPR_FLAG_MAJOR_BY_OLDMALLOC;;
+	    objspace->rgengc.need_major_gc |= GPR_FLAG_MAJOR_BY_OLDMALLOC;
 	    objspace->rgengc.oldmalloc_increase_limit =
 	      (size_t)(objspace->rgengc.oldmalloc_increase_limit * gc_params.oldmalloc_limit_growth_factor);
 
@@ -6229,12 +8158,12 @@ gc_reset_malloc_info(rb_objspace_t *objspace)
 	    }
 	}
 
-	if (0) fprintf(stderr, "%d\t%d\t%u\t%u\t%d\n",
-		       (int)rb_gc_count(),
-		       (int)objspace->rgengc.need_major_gc,
-		       (unsigned int)objspace->rgengc.oldmalloc_increase,
-		       (unsigned int)objspace->rgengc.oldmalloc_increase_limit,
-		       (unsigned int)gc_params.oldmalloc_limit_max);
+	if (0) fprintf(stderr, "%"PRIdSIZE"\t%d\t%"PRIuSIZE"\t%"PRIuSIZE"\t%"PRIdSIZE"\n",
+		       rb_gc_count(),
+		       objspace->rgengc.need_major_gc,
+		       objspace->rgengc.oldmalloc_increase,
+		       objspace->rgengc.oldmalloc_increase_limit,
+		       gc_params.oldmalloc_limit_max);
     }
     else {
 	/* major GC */
@@ -6252,40 +8181,54 @@ gc_reset_malloc_info(rb_objspace_t *objspace)
 }
 
 static int
-garbage_collect(rb_objspace_t *objspace, int full_mark, int immediate_mark, int immediate_sweep, int reason)
+garbage_collect(rb_objspace_t *objspace, int reason)
 {
+    int ret;
+
+    RB_VM_LOCK_ENTER();
+    {
 #if GC_PROFILE_MORE_DETAIL
-    objspace->profile.prepare_time = getrusage_time();
+        objspace->profile.prepare_time = getrusage_time();
 #endif
 
-    gc_rest(objspace);
+        gc_rest(objspace);
 
 #if GC_PROFILE_MORE_DETAIL
-    objspace->profile.prepare_time = getrusage_time() - objspace->profile.prepare_time;
+        objspace->profile.prepare_time = getrusage_time() - objspace->profile.prepare_time;
 #endif
 
-    return gc_start(objspace, full_mark, immediate_mark, immediate_sweep, reason);
+        ret = gc_start(objspace, reason);
+    }
+    RB_VM_LOCK_LEAVE();
+
+    return ret;
 }
 
 static int
-gc_start(rb_objspace_t *objspace, const int full_mark, const int immediate_mark, const unsigned int immediate_sweep, int reason)
+gc_start(rb_objspace_t *objspace, int reason)
 {
-    int do_full_mark = full_mark;
-    objspace->flags.immediate_sweep = immediate_sweep;
+    unsigned int do_full_mark = !!((unsigned)reason & GPR_FLAG_FULL_MARK);
+    unsigned int immediate_mark = (unsigned)reason & GPR_FLAG_IMMEDIATE_MARK;
+
+    /* reason may be clobbered, later, so keep set immediate_sweep here */
+    objspace->flags.immediate_sweep = !!((unsigned)reason & GPR_FLAG_IMMEDIATE_SWEEP);
+
+    /* Explicitly enable compaction (GC.compact) */
+    objspace->flags.during_compacting = !!(reason & GPR_FLAG_COMPACT);
 
     if (!heap_allocated_pages) return FALSE; /* heap is not ready */
-    if (reason != GPR_FLAG_METHOD && !ready_to_gc(objspace)) return TRUE; /* GC is not allowed */
+    if (!(reason & GPR_FLAG_METHOD) && !ready_to_gc(objspace)) return TRUE; /* GC is not allowed */
+
+    GC_ASSERT(gc_mode(objspace) == gc_mode_none);
+    GC_ASSERT(!is_lazy_sweeping(heap_eden));
+    GC_ASSERT(!is_incremental_marking(objspace));
+
+    unsigned int lock_lev;
+    gc_enter(objspace, gc_enter_event_start, &lock_lev);
 
-    if (RGENGC_CHECK_MODE) {
-	assert(gc_mode(objspace) == gc_mode_none);
-	assert(!is_lazy_sweeping(heap_eden));
-	assert(!is_incremental_marking(objspace));
 #if RGENGC_CHECK_MODE >= 2
-	gc_verify_internal_consistency(Qnil);
+    gc_verify_internal_consistency(objspace);
 #endif
-    }
-
-    gc_enter(objspace, "gc_start");
 
     if (ruby_gc_stressful) {
 	int flag = FIXNUM_P(ruby_gc_stress_mode) ? FIX2INT(ruby_gc_stress_mode) : 0;
@@ -6297,7 +8240,6 @@ gc_start(rb_objspace_t *objspace, const int full_mark, const int immediate_mark,
 	objspace->flags.immediate_sweep = !(flag & (1<<gc_stress_no_immediate_sweep));
     }
     else {
-#if USE_RGENGC
 	if (objspace->rgengc.need_major_gc) {
 	    reason |= objspace->rgengc.need_major_gc;
 	    do_full_mark = TRUE;
@@ -6308,7 +8250,6 @@ gc_start(rb_objspace_t *objspace, const int full_mark, const int immediate_mark,
 	}
 
 	objspace->rgengc.need_major_gc = GPR_FLAG_NONE;
-#endif
     }
 
     if (do_full_mark && (reason & GPR_FLAG_MAJOR_MASK) == 0) {
@@ -6330,19 +8271,41 @@ gc_start(rb_objspace_t *objspace, const int full_mark, const int immediate_mark,
 
     if (objspace->flags.immediate_sweep) reason |= GPR_FLAG_IMMEDIATE_SWEEP;
 
-    gc_report(1, objspace, "gc_start(%d, %d, %d, reason: %d) => %d, %d, %d\n",
-	      full_mark, immediate_mark, immediate_sweep, reason,
+    gc_report(1, objspace, "gc_start(reason: %d) => %u, %d, %d\n",
+	      reason,
 	      do_full_mark, !is_incremental_marking(objspace), objspace->flags.immediate_sweep);
 
+#if USE_DEBUG_COUNTER
+    RB_DEBUG_COUNTER_INC(gc_count);
+
+    if (reason & GPR_FLAG_MAJOR_MASK) {
+        (void)RB_DEBUG_COUNTER_INC_IF(gc_major_nofree, reason & GPR_FLAG_MAJOR_BY_NOFREE);
+        (void)RB_DEBUG_COUNTER_INC_IF(gc_major_oldgen, reason & GPR_FLAG_MAJOR_BY_OLDGEN);
+        (void)RB_DEBUG_COUNTER_INC_IF(gc_major_shady,  reason & GPR_FLAG_MAJOR_BY_SHADY);
+        (void)RB_DEBUG_COUNTER_INC_IF(gc_major_force,  reason & GPR_FLAG_MAJOR_BY_FORCE);
+#if RGENGC_ESTIMATE_OLDMALLOC
+        (void)RB_DEBUG_COUNTER_INC_IF(gc_major_oldmalloc, reason & GPR_FLAG_MAJOR_BY_OLDMALLOC);
+#endif
+    }
+    else {
+        (void)RB_DEBUG_COUNTER_INC_IF(gc_minor_newobj, reason & GPR_FLAG_NEWOBJ);
+        (void)RB_DEBUG_COUNTER_INC_IF(gc_minor_malloc, reason & GPR_FLAG_MALLOC);
+        (void)RB_DEBUG_COUNTER_INC_IF(gc_minor_method, reason & GPR_FLAG_METHOD);
+        (void)RB_DEBUG_COUNTER_INC_IF(gc_minor_capi,   reason & GPR_FLAG_CAPI);
+        (void)RB_DEBUG_COUNTER_INC_IF(gc_minor_stress, reason & GPR_FLAG_STRESS);
+    }
+#endif
+
     objspace->profile.count++;
     objspace->profile.latest_gc_info = reason;
     objspace->profile.total_allocated_objects_at_gc_start = objspace->total_allocated_objects;
     objspace->profile.heap_used_at_gc_start = heap_allocated_pages;
     gc_prof_setup_new_record(objspace, reason);
     gc_reset_malloc_info(objspace);
+    rb_transient_heap_start_marking(do_full_mark);
 
     gc_event_hook(objspace, RUBY_INTERNAL_EVENT_GC_START, 0 /* TODO: pass minor/immediate flag? */);
-    if (RGENGC_CHECK_MODE) assert(during_gc);
+    GC_ASSERT(during_gc);
 
     gc_prof_timer_start(objspace);
     {
@@ -6350,7 +8313,7 @@ gc_start(rb_objspace_t *objspace, const int full_mark, const int immediate_mark,
     }
     gc_prof_timer_stop(objspace);
 
-    gc_exit(objspace, "gc_start");
+    gc_exit(objspace, gc_enter_event_start, &lock_lev);
     return TRUE;
 }
 
@@ -6361,28 +8324,24 @@ gc_rest(rb_objspace_t *objspace)
     int sweeping = is_lazy_sweeping(heap_eden);
 
     if (marking || sweeping) {
-	gc_enter(objspace, "gc_rest");
+        unsigned int lock_lev;
+	gc_enter(objspace, gc_enter_event_rest, &lock_lev);
 
-	if (RGENGC_CHECK_MODE >= 2) gc_verify_internal_consistency(Qnil);
+        if (RGENGC_CHECK_MODE >= 2) gc_verify_internal_consistency(objspace);
 
 	if (is_incremental_marking(objspace)) {
-	    PUSH_MARK_FUNC_DATA(NULL);
-	    gc_marks_rest(objspace);
-	    POP_MARK_FUNC_DATA();
-	}
+            gc_marks_rest(objspace);
+        }
 	if (is_lazy_sweeping(heap_eden)) {
 	    gc_sweep_rest(objspace);
 	}
-	gc_exit(objspace, "gc_rest");
+	gc_exit(objspace, gc_enter_event_rest, &lock_lev);
     }
 }
 
 struct objspace_and_reason {
     rb_objspace_t *objspace;
     int reason;
-    int full_mark;
-    int immediate_mark;
-    int immediate_sweep;
 };
 
 static void
@@ -6391,12 +8350,10 @@ gc_current_status_fill(rb_objspace_t *objspace, char *buff)
     int i = 0;
     if (is_marking(objspace)) {
 	buff[i++] = 'M';
-#if USE_RGENGC
 	if (is_full_marking(objspace))        buff[i++] = 'F';
 #if GC_ENABLE_INCREMENTAL_MARK
 	if (is_incremental_marking(objspace)) buff[i++] = 'I';
 #endif
-#endif
     }
     else if (is_sweeping(objspace)) {
 	buff[i++] = 'S';
@@ -6463,51 +8420,98 @@ gc_record(rb_objspace_t *objspace, int direction, const char *event)
 }
 #endif /* PRINT_ENTER_EXIT_TICK */
 
-static inline void
-gc_enter(rb_objspace_t *objspace, const char *event)
+static const char *
+gc_enter_event_cstr(enum gc_enter_event event)
+{
+    switch (event) {
+      case gc_enter_event_start: return "start";
+      case gc_enter_event_mark_continue: return "mark_continue";
+      case gc_enter_event_sweep_continue: return "sweep_continue";
+      case gc_enter_event_rest: return "rest";
+      case gc_enter_event_finalizer: return "finalizer";
+      case gc_enter_event_rb_memerror: return "rb_memerror";
+    }
+    return NULL;
+}
+
+static void
+gc_enter_count(enum gc_enter_event event)
 {
-    if (RGENGC_CHECK_MODE) assert(during_gc == 0);
-    if (RGENGC_CHECK_MODE >= 3) gc_verify_internal_consistency(Qnil);
+    switch (event) {
+      case gc_enter_event_start:          RB_DEBUG_COUNTER_INC(gc_enter_start); break;
+      case gc_enter_event_mark_continue:  RB_DEBUG_COUNTER_INC(gc_enter_mark_continue); break;
+      case gc_enter_event_sweep_continue: RB_DEBUG_COUNTER_INC(gc_enter_sweep_continue); break;
+      case gc_enter_event_rest:           RB_DEBUG_COUNTER_INC(gc_enter_rest); break;
+      case gc_enter_event_finalizer:      RB_DEBUG_COUNTER_INC(gc_enter_finalizer); break;
+      case gc_enter_event_rb_memerror:    /* nothing */ break;
+    }
+}
+
+static inline void
+gc_enter(rb_objspace_t *objspace, enum gc_enter_event event, unsigned int *lock_lev)
+{
+    RB_VM_LOCK_ENTER_LEV(lock_lev);
+
+    switch (event) {
+      case gc_enter_event_rest:
+        if (!is_marking(objspace)) break;
+        // fall through
+      case gc_enter_event_start:
+      case gc_enter_event_mark_continue:
+        // stop other ractors
+        rb_vm_barrier();
+        break;
+      default:
+        break;
+    }
+
+    gc_enter_count(event);
+    if (UNLIKELY(during_gc != 0)) rb_bug("during_gc != 0");
+    if (RGENGC_CHECK_MODE >= 3) gc_verify_internal_consistency(objspace);
+
+    mjit_gc_start_hook();
 
     during_gc = TRUE;
-    gc_report(1, objspace, "gc_entr: %s [%s]\n", event, gc_current_status(objspace));
-    gc_record(objspace, 0, event);
+    RUBY_DEBUG_LOG("%s (%s)",gc_enter_event_cstr(event), gc_current_status(objspace));
+    gc_report(1, objspace, "gc_enter: %s [%s]\n", gc_enter_event_cstr(event), gc_current_status(objspace));
+    gc_record(objspace, 0, gc_enter_event_cstr(event));
     gc_event_hook(objspace, RUBY_INTERNAL_EVENT_GC_ENTER, 0); /* TODO: which parameter should be passed? */
 }
 
 static inline void
-gc_exit(rb_objspace_t *objspace, const char *event)
+gc_exit(rb_objspace_t *objspace, enum gc_enter_event event, unsigned int *lock_lev)
 {
-    if (RGENGC_CHECK_MODE) assert(during_gc != 0);
+    GC_ASSERT(during_gc != 0);
 
     gc_event_hook(objspace, RUBY_INTERNAL_EVENT_GC_EXIT, 0); /* TODO: which parameter should be passsed? */
-    gc_record(objspace, 1, event);
-    gc_report(1, objspace, "gc_exit: %s [%s]\n", event, gc_current_status(objspace));
+    gc_record(objspace, 1, gc_enter_event_cstr(event));
+    RUBY_DEBUG_LOG("%s (%s)", gc_enter_event_cstr(event), gc_current_status(objspace));
+    gc_report(1, objspace, "gc_exit: %s [%s]\n", gc_enter_event_cstr(event), gc_current_status(objspace));
     during_gc = FALSE;
+
+    mjit_gc_exit_hook();
+    RB_VM_LOCK_LEAVE_LEV(lock_lev);
 }
 
 static void *
 gc_with_gvl(void *ptr)
 {
     struct objspace_and_reason *oar = (struct objspace_and_reason *)ptr;
-    return (void *)(VALUE)garbage_collect(oar->objspace, oar->full_mark, oar->immediate_mark, oar->immediate_sweep, oar->reason);
+    return (void *)(VALUE)garbage_collect(oar->objspace, oar->reason);
 }
 
 static int
-garbage_collect_with_gvl(rb_objspace_t *objspace, int full_mark, int immediate_mark, int immediate_sweep, int reason)
+garbage_collect_with_gvl(rb_objspace_t *objspace, int reason)
 {
-    if (dont_gc) return TRUE;
+    if (dont_gc_val()) return TRUE;
     if (ruby_thread_has_gvl_p()) {
-	return garbage_collect(objspace, full_mark, immediate_mark, immediate_sweep, reason);
+	return garbage_collect(objspace, reason);
     }
     else {
 	if (ruby_native_thread_p()) {
 	    struct objspace_and_reason oar;
 	    oar.objspace = objspace;
 	    oar.reason = reason;
-	    oar.full_mark = full_mark;
-	    oar.immediate_mark = immediate_mark;
-	    oar.immediate_sweep = immediate_sweep;
 	    return (int)(VALUE)rb_thread_call_with_gvl(gc_with_gvl, (void *)&oar);
 	}
 	else {
@@ -6518,71 +8522,968 @@ garbage_collect_with_gvl(rb_objspace_t *objspace, int full_mark, int immediate_m
     }
 }
 
-int
-rb_garbage_collect(void)
+static VALUE
+gc_start_internal(rb_execution_context_t *ec, VALUE self, VALUE full_mark, VALUE immediate_mark, VALUE immediate_sweep, VALUE compact)
+{
+    rb_objspace_t *objspace = &rb_objspace;
+    int reason = GPR_FLAG_FULL_MARK |
+                 GPR_FLAG_IMMEDIATE_MARK |
+                 GPR_FLAG_IMMEDIATE_SWEEP |
+                 GPR_FLAG_METHOD;
+
+    /* For now, compact implies full mark / sweep, so ignore other flags */
+    if (RTEST(compact)) {
+        reason |= GPR_FLAG_COMPACT;
+    } else {
+        if (!RTEST(full_mark))       reason &= ~GPR_FLAG_FULL_MARK;
+        if (!RTEST(immediate_mark))  reason &= ~GPR_FLAG_IMMEDIATE_MARK;
+        if (!RTEST(immediate_sweep)) reason &= ~GPR_FLAG_IMMEDIATE_SWEEP;
+    }
+
+    garbage_collect(objspace, reason);
+    gc_finalize_deferred(objspace);
+
+    return Qnil;
+}
+
+static int
+gc_is_moveable_obj(rb_objspace_t *objspace, VALUE obj)
+{
+    GC_ASSERT(!SPECIAL_CONST_P(obj));
+
+    switch (BUILTIN_TYPE(obj)) {
+      case T_NONE:
+      case T_NIL:
+      case T_MOVED:
+      case T_ZOMBIE:
+        return FALSE;
+      case T_SYMBOL:
+        if (DYNAMIC_SYM_P(obj) && (RSYMBOL(obj)->id & ~ID_SCOPE_MASK)) {
+            return FALSE;
+        }
+        /* fall through */
+      case T_STRING:
+      case T_OBJECT:
+      case T_FLOAT:
+      case T_IMEMO:
+      case T_ARRAY:
+      case T_BIGNUM:
+      case T_ICLASS:
+      case T_MODULE:
+      case T_REGEXP:
+      case T_DATA:
+      case T_MATCH:
+      case T_STRUCT:
+      case T_HASH:
+      case T_FILE:
+      case T_COMPLEX:
+      case T_RATIONAL:
+      case T_NODE:
+      case T_CLASS:
+        if (FL_TEST(obj, FL_FINALIZE)) {
+            /* The finalizer table is a numtable. It looks up objects by address.
+             * We can't mark the keys in the finalizer table because that would
+             * prevent the objects from being collected.  This check prevents
+             * objects that are keys in the finalizer table from being moved
+             * without directly pinning them. */
+            if (st_is_member(finalizer_table, obj)) {
+                return FALSE;
+            }
+        }
+        GC_ASSERT(RVALUE_MARKED(obj));
+        GC_ASSERT(!RVALUE_PINNED(obj));
+
+        return TRUE;
+
+      default:
+        rb_bug("gc_is_moveable_obj: unreachable (%d)", (int)BUILTIN_TYPE(obj));
+        break;
+    }
+
+    return FALSE;
+}
+
+static VALUE
+gc_move(rb_objspace_t *objspace, VALUE scan, VALUE free)
+{
+    int marked;
+    int wb_unprotected;
+    int uncollectible;
+    int marking;
+    RVALUE *dest = (RVALUE *)free;
+    RVALUE *src = (RVALUE *)scan;
+
+    gc_report(4, objspace, "Moving object: %p -> %p\n", (void*)scan, (void *)free);
+
+    GC_ASSERT(BUILTIN_TYPE(scan) != T_NONE);
+    GC_ASSERT(!MARKED_IN_BITMAP(GET_HEAP_MARK_BITS(free), free));
+
+    /* Save off bits for current object. */
+    marked = rb_objspace_marked_object_p((VALUE)src);
+    wb_unprotected = RVALUE_WB_UNPROTECTED((VALUE)src);
+    uncollectible = RVALUE_UNCOLLECTIBLE((VALUE)src);
+    marking = RVALUE_MARKING((VALUE)src);
+
+    /* Clear bits for eventual T_MOVED */
+    CLEAR_IN_BITMAP(GET_HEAP_MARK_BITS((VALUE)src), (VALUE)src);
+    CLEAR_IN_BITMAP(GET_HEAP_WB_UNPROTECTED_BITS((VALUE)src), (VALUE)src);
+    CLEAR_IN_BITMAP(GET_HEAP_UNCOLLECTIBLE_BITS((VALUE)src), (VALUE)src);
+    CLEAR_IN_BITMAP(GET_HEAP_MARKING_BITS((VALUE)src), (VALUE)src);
+
+    if (FL_TEST((VALUE)src, FL_EXIVAR)) {
+        /* Same deal as below. Generic ivars are held in st tables.
+         * Resizing the table could cause a GC to happen and we can't allow it */
+        VALUE already_disabled = rb_gc_disable_no_rest();
+        rb_mv_generic_ivar((VALUE)src, (VALUE)dest);
+        if (already_disabled == Qfalse) rb_objspace_gc_enable(objspace);
+    }
+
+    st_data_t srcid = (st_data_t)src, id;
+
+    /* If the source object's object_id has been seen, we need to update
+     * the object to object id mapping. */
+    if (st_lookup(objspace->obj_to_id_tbl, srcid, &id)) {
+        gc_report(4, objspace, "Moving object with seen id: %p -> %p\n", (void *)src, (void *)dest);
+        /* inserting in the st table can cause the GC to run. We need to
+         * prevent re-entry in to the GC since `gc_move` is running in the GC,
+         * so temporarily disable the GC around the st table mutation */
+        VALUE already_disabled = rb_gc_disable_no_rest();
+        st_delete(objspace->obj_to_id_tbl, &srcid, 0);
+        st_insert(objspace->obj_to_id_tbl, (st_data_t)dest, id);
+        if (already_disabled == Qfalse) rb_objspace_gc_enable(objspace);
+    }
+
+    /* Move the object */
+    memcpy(dest, src, sizeof(RVALUE));
+    memset(src, 0, sizeof(RVALUE));
+
+    /* Set bits for object in new location */
+    if (marking) {
+        MARK_IN_BITMAP(GET_HEAP_MARKING_BITS((VALUE)dest), (VALUE)dest);
+    }
+    else {
+        CLEAR_IN_BITMAP(GET_HEAP_MARKING_BITS((VALUE)dest), (VALUE)dest);
+    }
+
+    if (marked) {
+        MARK_IN_BITMAP(GET_HEAP_MARK_BITS((VALUE)dest), (VALUE)dest);
+    }
+    else {
+        CLEAR_IN_BITMAP(GET_HEAP_MARK_BITS((VALUE)dest), (VALUE)dest);
+    }
+
+    if (wb_unprotected) {
+        MARK_IN_BITMAP(GET_HEAP_WB_UNPROTECTED_BITS((VALUE)dest), (VALUE)dest);
+    }
+    else {
+        CLEAR_IN_BITMAP(GET_HEAP_WB_UNPROTECTED_BITS((VALUE)dest), (VALUE)dest);
+    }
+
+    if (uncollectible) {
+        MARK_IN_BITMAP(GET_HEAP_UNCOLLECTIBLE_BITS((VALUE)dest), (VALUE)dest);
+    }
+    else {
+        CLEAR_IN_BITMAP(GET_HEAP_UNCOLLECTIBLE_BITS((VALUE)dest), (VALUE)dest);
+    }
+
+    /* Assign forwarding address */
+    src->as.moved.flags = T_MOVED;
+    src->as.moved.dummy = Qundef;
+    src->as.moved.destination = (VALUE)dest;
+    GC_ASSERT(BUILTIN_TYPE((VALUE)dest) != T_NONE);
+
+    return (VALUE)src;
+}
+
+static int
+compare_free_slots(const void *left, const void *right, void *dummy)
+{
+    struct heap_page *left_page;
+    struct heap_page *right_page;
+
+    left_page = *(struct heap_page * const *)left;
+    right_page = *(struct heap_page * const *)right;
+
+    return left_page->free_slots - right_page->free_slots;
+}
+
+static void
+gc_sort_heap_by_empty_slots(rb_objspace_t *objspace)
+{
+    size_t total_pages = heap_eden->total_pages;
+    size_t size = size_mul_or_raise(total_pages, sizeof(struct heap_page *), rb_eRuntimeError);
+    struct heap_page *page = 0, **page_list = malloc(size);
+    size_t i = 0;
+
+    list_for_each(&heap_eden->pages, page, page_node) {
+        page_list[i++] = page;
+        assert(page != NULL);
+    }
+    assert(total_pages > 0);
+    assert((size_t)i == total_pages);
+
+    /* Sort the heap so "filled pages" are first. `heap_add_page` adds to the
+     * head of the list, so empty pages will end up at the start of the heap */
+    ruby_qsort(page_list, total_pages, sizeof(struct heap_page *), compare_free_slots, NULL);
+
+    /* Reset the eden heap */
+    list_head_init(&objspace->eden_heap.pages);
+
+    for (i = 0; i < total_pages; i++) {
+        list_add(&heap_eden->pages, &page_list[i]->page_node);
+        if (page_list[i]->free_slots != 0) {
+            heap_add_freepage(heap_eden, page_list[i]);
+        }
+    }
+
+    free(page_list);
+}
+
+static void
+gc_ref_update_array(rb_objspace_t * objspace, VALUE v)
+{
+    long i, len;
+
+    if (FL_TEST(v, ELTS_SHARED))
+        return;
+
+    len = RARRAY_LEN(v);
+    if (len > 0) {
+        VALUE *ptr = (VALUE *)RARRAY_CONST_PTR_TRANSIENT(v);
+        for (i = 0; i < len; i++) {
+            UPDATE_IF_MOVED(objspace, ptr[i]);
+        }
+    }
+}
+
+static void
+gc_ref_update_object(rb_objspace_t * objspace, VALUE v)
+{
+    VALUE *ptr = ROBJECT_IVPTR(v);
+
+    uint32_t i, len = ROBJECT_NUMIV(v);
+    for (i = 0; i < len; i++) {
+        UPDATE_IF_MOVED(objspace, ptr[i]);
+    }
+}
+
+static int
+hash_replace_ref(st_data_t *key, st_data_t *value, st_data_t argp, int existing)
+{
+    rb_objspace_t *objspace = (rb_objspace_t *)argp;
+
+    if (gc_object_moved_p(objspace, (VALUE)*key)) {
+        *key = rb_gc_location((VALUE)*key);
+    }
+
+    if (gc_object_moved_p(objspace, (VALUE)*value)) {
+        *value = rb_gc_location((VALUE)*value);
+    }
+
+    return ST_CONTINUE;
+}
+
+static int
+hash_foreach_replace(st_data_t key, st_data_t value, st_data_t argp, int error)
+{
+    rb_objspace_t *objspace;
+
+    objspace = (rb_objspace_t *)argp;
+
+    if (gc_object_moved_p(objspace, (VALUE)key)) {
+        return ST_REPLACE;
+    }
+
+    if (gc_object_moved_p(objspace, (VALUE)value)) {
+        return ST_REPLACE;
+    }
+    return ST_CONTINUE;
+}
+
+static int
+hash_replace_ref_value(st_data_t *key, st_data_t *value, st_data_t argp, int existing)
+{
+    rb_objspace_t *objspace = (rb_objspace_t *)argp;
+
+    if (gc_object_moved_p(objspace, (VALUE)*value)) {
+        *value = rb_gc_location((VALUE)*value);
+    }
+
+    return ST_CONTINUE;
+}
+
+static int
+hash_foreach_replace_value(st_data_t key, st_data_t value, st_data_t argp, int error)
+{
+    rb_objspace_t *objspace;
+
+    objspace = (rb_objspace_t *)argp;
+
+    if (gc_object_moved_p(objspace, (VALUE)value)) {
+        return ST_REPLACE;
+    }
+    return ST_CONTINUE;
+}
+
+static void
+gc_update_tbl_refs(rb_objspace_t * objspace, st_table *tbl)
 {
-    return garbage_collect(&rb_objspace, TRUE, TRUE, TRUE, GPR_FLAG_CAPI);
+    if (!tbl || tbl->num_entries == 0) return;
+
+    if (st_foreach_with_replace(tbl, hash_foreach_replace_value, hash_replace_ref_value, (st_data_t)objspace)) {
+        rb_raise(rb_eRuntimeError, "hash modified during iteration");
+    }
 }
 
-#undef Init_stack
+static void
+gc_update_table_refs(rb_objspace_t * objspace, st_table *tbl)
+{
+    if (!tbl || tbl->num_entries == 0) return;
 
+    if (st_foreach_with_replace(tbl, hash_foreach_replace, hash_replace_ref, (st_data_t)objspace)) {
+        rb_raise(rb_eRuntimeError, "hash modified during iteration");
+    }
+}
+
+/* Update MOVED references in an st_table */
 void
-Init_stack(volatile VALUE *addr)
+rb_gc_update_tbl_refs(st_table *ptr)
 {
-    ruby_init_stack(addr);
+    rb_objspace_t *objspace = &rb_objspace;
+    gc_update_table_refs(objspace, ptr);
 }
 
-/*
- *  call-seq:
- *     GC.start                     -> nil
- *     GC.garbage_collect           -> nil
- *     GC.start(full_mark: true, immediate_sweep: true)           -> nil
- *     GC.garbage_collect(full_mark: true, immediate_sweep: true) -> nil
- *
- *  Initiates garbage collection, unless manually disabled.
- *
- *  This method is defined with keyword arguments that default to true:
- *
- *     def GC.start(full_mark: true, immediate_sweep: true); end
- *
- *  Use full_mark: false to perform a minor GC.
- *  Use immediate_sweep: false to defer sweeping (use lazy sweep).
- *
- *  Note: These keyword arguments are implementation and version dependent. They
- *  are not guaranteed to be future-compatible, and may be ignored if the
- *  underlying implementation does not support them.
- */
+static void
+gc_ref_update_hash(rb_objspace_t * objspace, VALUE v)
+{
+    rb_hash_stlike_foreach_with_replace(v, hash_foreach_replace, hash_replace_ref, (st_data_t)objspace);
+}
+
+static void
+gc_ref_update_method_entry(rb_objspace_t *objspace, rb_method_entry_t *me)
+{
+    rb_method_definition_t *def = me->def;
+
+    UPDATE_IF_MOVED(objspace, me->owner);
+    UPDATE_IF_MOVED(objspace, me->defined_class);
+
+    if (def) {
+        switch (def->type) {
+          case VM_METHOD_TYPE_ISEQ:
+            if (def->body.iseq.iseqptr) {
+                TYPED_UPDATE_IF_MOVED(objspace, rb_iseq_t *, def->body.iseq.iseqptr);
+            }
+            TYPED_UPDATE_IF_MOVED(objspace, rb_cref_t *, def->body.iseq.cref);
+            break;
+          case VM_METHOD_TYPE_ATTRSET:
+          case VM_METHOD_TYPE_IVAR:
+            UPDATE_IF_MOVED(objspace, def->body.attr.location);
+            break;
+          case VM_METHOD_TYPE_BMETHOD:
+            UPDATE_IF_MOVED(objspace, def->body.bmethod.proc);
+            break;
+          case VM_METHOD_TYPE_ALIAS:
+            TYPED_UPDATE_IF_MOVED(objspace, struct rb_method_entry_struct *, def->body.alias.original_me);
+            return;
+          case VM_METHOD_TYPE_REFINED:
+            TYPED_UPDATE_IF_MOVED(objspace, struct rb_method_entry_struct *, def->body.refined.orig_me);
+            UPDATE_IF_MOVED(objspace, def->body.refined.owner);
+            break;
+          case VM_METHOD_TYPE_CFUNC:
+          case VM_METHOD_TYPE_ZSUPER:
+          case VM_METHOD_TYPE_MISSING:
+          case VM_METHOD_TYPE_OPTIMIZED:
+          case VM_METHOD_TYPE_UNDEF:
+          case VM_METHOD_TYPE_NOTIMPLEMENTED:
+            break;
+        }
+    }
+}
+
+static void
+gc_update_values(rb_objspace_t *objspace, long n, VALUE *values)
+{
+    long i;
+
+    for (i=0; i<n; i++) {
+        UPDATE_IF_MOVED(objspace, values[i]);
+    }
+}
+
+static void
+gc_ref_update_imemo(rb_objspace_t *objspace, VALUE obj)
+{
+    switch (imemo_type(obj)) {
+      case imemo_env:
+        {
+            rb_env_t *env = (rb_env_t *)obj;
+            TYPED_UPDATE_IF_MOVED(objspace, rb_iseq_t *, env->iseq);
+            UPDATE_IF_MOVED(objspace, env->ep[VM_ENV_DATA_INDEX_ENV]);
+            gc_update_values(objspace, (long)env->env_size, (VALUE *)env->env);
+        }
+        break;
+      case imemo_cref:
+        UPDATE_IF_MOVED(objspace, RANY(obj)->as.imemo.cref.klass);
+        TYPED_UPDATE_IF_MOVED(objspace, struct rb_cref_struct *, RANY(obj)->as.imemo.cref.next);
+        UPDATE_IF_MOVED(objspace, RANY(obj)->as.imemo.cref.refinements);
+        break;
+      case imemo_svar:
+        UPDATE_IF_MOVED(objspace, RANY(obj)->as.imemo.svar.cref_or_me);
+        UPDATE_IF_MOVED(objspace, RANY(obj)->as.imemo.svar.lastline);
+        UPDATE_IF_MOVED(objspace, RANY(obj)->as.imemo.svar.backref);
+        UPDATE_IF_MOVED(objspace, RANY(obj)->as.imemo.svar.others);
+        break;
+      case imemo_throw_data:
+        UPDATE_IF_MOVED(objspace, RANY(obj)->as.imemo.throw_data.throw_obj);
+        break;
+      case imemo_ifunc:
+        break;
+      case imemo_memo:
+        UPDATE_IF_MOVED(objspace, RANY(obj)->as.imemo.memo.v1);
+        UPDATE_IF_MOVED(objspace, RANY(obj)->as.imemo.memo.v2);
+        break;
+      case imemo_ment:
+        gc_ref_update_method_entry(objspace, &RANY(obj)->as.imemo.ment);
+        break;
+      case imemo_iseq:
+        rb_iseq_update_references((rb_iseq_t *)obj);
+        break;
+      case imemo_ast:
+        rb_ast_update_references((rb_ast_t *)obj);
+        break;
+      case imemo_callcache:
+        {
+            const struct rb_callcache *cc = (const struct rb_callcache *)obj;
+            if (cc->klass) {
+                UPDATE_IF_MOVED(objspace, cc->klass);
+                if (!is_live_object(objspace, cc->klass)) {
+                    *((VALUE *)(&cc->klass)) = (VALUE)0;
+                }
+            }
+
+            if (cc->cme_) {
+                TYPED_UPDATE_IF_MOVED(objspace, struct rb_callable_method_entry_struct *, cc->cme_);
+                if (!is_live_object(objspace, (VALUE)cc->cme_)) {
+                    *((struct rb_callable_method_entry_struct **)(&cc->cme_)) = (struct rb_callable_method_entry_struct *)0;
+                }
+            }
+        }
+        break;
+      case imemo_constcache:
+        {
+            const struct iseq_inline_constant_cache_entry *ice = (struct iseq_inline_constant_cache_entry *)obj;
+            UPDATE_IF_MOVED(objspace, ice->value);
+        }
+        break;
+      case imemo_parser_strterm:
+      case imemo_tmpbuf:
+      case imemo_callinfo:
+        break;
+      default:
+        rb_bug("not reachable %d", imemo_type(obj));
+        break;
+    }
+}
+
+static enum rb_id_table_iterator_result
+check_id_table_move(ID id, VALUE value, void *data)
+{
+    rb_objspace_t *objspace = (rb_objspace_t *)data;
+
+    if (gc_object_moved_p(objspace, (VALUE)value)) {
+        return ID_TABLE_REPLACE;
+    }
+
+    return ID_TABLE_CONTINUE;
+}
+
+/* Returns the new location of an object, if it moved.  Otherwise returns
+ * the existing location. */
+VALUE
+rb_gc_location(VALUE value)
+{
+
+    VALUE destination;
+
+    if (!SPECIAL_CONST_P(value)) {
+        void *poisoned = asan_poisoned_object_p(value);
+        asan_unpoison_object(value, false);
+
+        if (BUILTIN_TYPE(value) == T_MOVED) {
+            destination = (VALUE)RMOVED(value)->destination;
+            GC_ASSERT(BUILTIN_TYPE(destination) != T_NONE);
+        }
+        else {
+            destination = value;
+        }
+
+        /* Re-poison slot if it's not the one we want */
+        if (poisoned) {
+            GC_ASSERT(BUILTIN_TYPE(value) == T_NONE);
+            asan_poison_object(value);
+        }
+    }
+    else {
+        destination = value;
+    }
+
+    return destination;
+}
+
+static enum rb_id_table_iterator_result
+update_id_table(ID *key, VALUE * value, void *data, int existing)
+{
+    rb_objspace_t *objspace = (rb_objspace_t *)data;
+
+    if (gc_object_moved_p(objspace, (VALUE)*value)) {
+        *value = rb_gc_location((VALUE)*value);
+    }
+
+    return ID_TABLE_CONTINUE;
+}
+
+static void
+update_m_tbl(rb_objspace_t *objspace, struct rb_id_table *tbl)
+{
+    if (tbl) {
+        rb_id_table_foreach_with_replace(tbl, check_id_table_move, update_id_table, objspace);
+    }
+}
+
+static enum rb_id_table_iterator_result
+update_cc_tbl_i(ID id, VALUE ccs_ptr, void *data)
+{
+    rb_objspace_t *objspace = (rb_objspace_t *)data;
+    struct rb_class_cc_entries *ccs = (struct rb_class_cc_entries *)ccs_ptr;
+    VM_ASSERT(vm_ccs_p(ccs));
+
+    if (gc_object_moved_p(objspace, (VALUE)ccs->cme)) {
+        ccs->cme = (const rb_callable_method_entry_t *)rb_gc_location((VALUE)ccs->cme);
+    }
+
+    for (int i=0; i<ccs->len; i++) {
+        if (gc_object_moved_p(objspace, (VALUE)ccs->entries[i].ci)) {
+            ccs->entries[i].ci = (struct rb_callinfo *)rb_gc_location((VALUE)ccs->entries[i].ci);
+        }
+        if (gc_object_moved_p(objspace, (VALUE)ccs->entries[i].cc)) {
+            ccs->entries[i].cc = (struct rb_callcache *)rb_gc_location((VALUE)ccs->entries[i].cc);
+        }
+    }
+
+    // do not replace
+    return ID_TABLE_CONTINUE;
+}
+
+static void
+update_cc_tbl(rb_objspace_t *objspace, VALUE klass)
+{
+    struct rb_id_table *tbl = RCLASS_CC_TBL(klass);
+    if (tbl) {
+        rb_id_table_foreach_with_replace(tbl, update_cc_tbl_i, 0, objspace);
+    }
+}
+
+static enum rb_id_table_iterator_result
+update_const_table(VALUE value, void *data)
+{
+    rb_const_entry_t *ce = (rb_const_entry_t *)value;
+    rb_objspace_t * objspace = (rb_objspace_t *)data;
+
+    if (gc_object_moved_p(objspace, ce->value)) {
+        ce->value = rb_gc_location(ce->value);
+    }
+
+    if (gc_object_moved_p(objspace, ce->file)) {
+        ce->file = rb_gc_location(ce->file);
+    }
+
+    return ID_TABLE_CONTINUE;
+}
+
+static void
+update_const_tbl(rb_objspace_t *objspace, struct rb_id_table *tbl)
+{
+    if (!tbl) return;
+    rb_id_table_foreach_values(tbl, update_const_table, objspace);
+}
+
+static void
+update_subclass_entries(rb_objspace_t *objspace, rb_subclass_entry_t *entry)
+{
+    while (entry) {
+        UPDATE_IF_MOVED(objspace, entry->klass);
+        entry = entry->next;
+    }
+}
+
+static int
+update_iv_index_tbl_i(st_data_t key, st_data_t value, st_data_t arg)
+{
+    rb_objspace_t *objspace = (rb_objspace_t *)arg;
+    struct rb_iv_index_tbl_entry *ent = (struct rb_iv_index_tbl_entry *)value;
+    UPDATE_IF_MOVED(objspace, ent->class_value);
+    return ST_CONTINUE;
+}
+
+static void
+update_class_ext(rb_objspace_t *objspace, rb_classext_t *ext)
+{
+    UPDATE_IF_MOVED(objspace, ext->origin_);
+    UPDATE_IF_MOVED(objspace, ext->refined_class);
+    update_subclass_entries(objspace, ext->subclasses);
+
+    // ext->iv_index_tbl
+    if (ext->iv_index_tbl) {
+        st_foreach(ext->iv_index_tbl, update_iv_index_tbl_i, (st_data_t)objspace);
+    }
+}
+
+static void
+gc_update_object_references(rb_objspace_t *objspace, VALUE obj)
+{
+    RVALUE *any = RANY(obj);
+
+    gc_report(4, objspace, "update-refs: %p ->\n", (void *)obj);
+
+    switch (BUILTIN_TYPE(obj)) {
+      case T_CLASS:
+      case T_MODULE:
+        if (RCLASS_SUPER((VALUE)obj)) {
+            UPDATE_IF_MOVED(objspace, RCLASS(obj)->super);
+        }
+        if (!RCLASS_EXT(obj)) break;
+        update_m_tbl(objspace, RCLASS_M_TBL(obj));
+        update_cc_tbl(objspace, obj);
+
+        gc_update_tbl_refs(objspace, RCLASS_IV_TBL(obj));
+
+        update_class_ext(objspace, RCLASS_EXT(obj));
+        update_const_tbl(objspace, RCLASS_CONST_TBL(obj));
+        break;
+
+      case T_ICLASS:
+        if (FL_TEST(obj, RICLASS_IS_ORIGIN) &&
+                !FL_TEST(obj, RICLASS_ORIGIN_SHARED_MTBL)) {
+            update_m_tbl(objspace, RCLASS_M_TBL(obj));
+        }
+        if (RCLASS_SUPER((VALUE)obj)) {
+            UPDATE_IF_MOVED(objspace, RCLASS(obj)->super);
+        }
+        if (!RCLASS_EXT(obj)) break;
+        if (RCLASS_IV_TBL(obj)) {
+            gc_update_tbl_refs(objspace, RCLASS_IV_TBL(obj));
+        }
+        update_class_ext(objspace, RCLASS_EXT(obj));
+        update_m_tbl(objspace, RCLASS_CALLABLE_M_TBL(obj));
+        update_cc_tbl(objspace, obj);
+        break;
+
+      case T_IMEMO:
+        gc_ref_update_imemo(objspace, obj);
+        return;
+
+      case T_NIL:
+      case T_FIXNUM:
+      case T_NODE:
+      case T_MOVED:
+      case T_NONE:
+        /* These can't move */
+        return;
+
+      case T_ARRAY:
+        if (FL_TEST(obj, ELTS_SHARED)) {
+            UPDATE_IF_MOVED(objspace, any->as.array.as.heap.aux.shared_root);
+        }
+        else {
+            gc_ref_update_array(objspace, obj);
+        }
+        break;
+
+      case T_HASH:
+        gc_ref_update_hash(objspace, obj);
+        UPDATE_IF_MOVED(objspace, any->as.hash.ifnone);
+        break;
+
+      case T_STRING:
+        if (STR_SHARED_P(obj)) {
+            UPDATE_IF_MOVED(objspace, any->as.string.as.heap.aux.shared);
+        }
+        break;
+
+      case T_DATA:
+        /* Call the compaction callback, if it exists */
+        {
+            void *const ptr = DATA_PTR(obj);
+            if (ptr) {
+                if (RTYPEDDATA_P(obj)) {
+                    RUBY_DATA_FUNC compact_func = any->as.typeddata.type->function.dcompact;
+                    if (compact_func) (*compact_func)(ptr);
+                }
+            }
+        }
+        break;
+
+      case T_OBJECT:
+        gc_ref_update_object(objspace, obj);
+        break;
+
+      case T_FILE:
+        if (any->as.file.fptr) {
+            UPDATE_IF_MOVED(objspace, any->as.file.fptr->self);
+            UPDATE_IF_MOVED(objspace, any->as.file.fptr->pathv);
+            UPDATE_IF_MOVED(objspace, any->as.file.fptr->tied_io_for_writing);
+            UPDATE_IF_MOVED(objspace, any->as.file.fptr->writeconv_asciicompat);
+            UPDATE_IF_MOVED(objspace, any->as.file.fptr->writeconv_pre_ecopts);
+            UPDATE_IF_MOVED(objspace, any->as.file.fptr->encs.ecopts);
+            UPDATE_IF_MOVED(objspace, any->as.file.fptr->write_lock);
+        }
+        break;
+      case T_REGEXP:
+        UPDATE_IF_MOVED(objspace, any->as.regexp.src);
+        break;
+
+      case T_SYMBOL:
+        if (DYNAMIC_SYM_P((VALUE)any)) {
+            UPDATE_IF_MOVED(objspace, RSYMBOL(any)->fstr);
+        }
+        break;
+
+      case T_FLOAT:
+      case T_BIGNUM:
+        break;
+
+      case T_MATCH:
+        UPDATE_IF_MOVED(objspace, any->as.match.regexp);
+
+        if (any->as.match.str) {
+            UPDATE_IF_MOVED(objspace, any->as.match.str);
+        }
+        break;
+
+      case T_RATIONAL:
+        UPDATE_IF_MOVED(objspace, any->as.rational.num);
+        UPDATE_IF_MOVED(objspace, any->as.rational.den);
+        break;
+
+      case T_COMPLEX:
+        UPDATE_IF_MOVED(objspace, any->as.complex.real);
+        UPDATE_IF_MOVED(objspace, any->as.complex.imag);
+
+        break;
+
+      case T_STRUCT:
+        {
+            long i, len = RSTRUCT_LEN(obj);
+            VALUE *ptr = (VALUE *)RSTRUCT_CONST_PTR(obj);
+
+            for (i = 0; i < len; i++) {
+                UPDATE_IF_MOVED(objspace, ptr[i]);
+            }
+        }
+        break;
+      default:
+#if GC_DEBUG
+        rb_gcdebug_print_obj_condition((VALUE)obj);
+        rb_obj_info_dump(obj);
+        rb_bug("unreachable");
+#endif
+        break;
+
+    }
+
+    UPDATE_IF_MOVED(objspace, RBASIC(obj)->klass);
+
+    gc_report(4, objspace, "update-refs: %p <-\n", (void *)obj);
+}
+
+static int
+gc_ref_update(void *vstart, void *vend, size_t stride, rb_objspace_t * objspace, struct heap_page *page)
+{
+    VALUE v = (VALUE)vstart;
+    asan_unpoison_memory_region(&page->freelist, sizeof(RVALUE*), false);
+    asan_poison_memory_region(&page->freelist, sizeof(RVALUE*));
+    page->flags.has_uncollectible_shady_objects = FALSE;
+    page->flags.has_remembered_objects = FALSE;
+
+    /* For each object on the page */
+    for (; v != (VALUE)vend; v += stride) {
+        void *poisoned = asan_poisoned_object_p(v);
+        asan_unpoison_object(v, false);
+
+        switch (BUILTIN_TYPE(v)) {
+          case T_NONE:
+          case T_MOVED:
+          case T_ZOMBIE:
+            break;
+          default:
+            if (RVALUE_WB_UNPROTECTED(v)) {
+                page->flags.has_uncollectible_shady_objects = TRUE;
+            }
+            if (RVALUE_PAGE_MARKING(page, v)) {
+                page->flags.has_remembered_objects = TRUE;
+            }
+            if (page->flags.before_sweep) {
+                if (RVALUE_MARKED(v)) {
+                    gc_update_object_references(objspace, v);
+                }
+            } else {
+                gc_update_object_references(objspace, v);
+            }
+        }
+
+        if (poisoned) {
+            asan_poison_object(v);
+        }
+    }
+
+    return 0;
+}
+
+extern rb_symbols_t ruby_global_symbols;
+#define global_symbols ruby_global_symbols
+
+static void
+gc_update_references(rb_objspace_t * objspace, rb_heap_t *heap)
+{
+    rb_execution_context_t *ec = GET_EC();
+    rb_vm_t *vm = rb_ec_vm_ptr(ec);
+    short should_set_mark_bits = 1;
+
+    struct heap_page *page = NULL;
+
+    list_for_each(&heap->pages, page, page_node) {
+        gc_ref_update(page->start, page->start + page->total_slots, sizeof(RVALUE), objspace, page);
+        if (page == heap->sweeping_page) {
+            should_set_mark_bits = 0;
+        }
+        if (should_set_mark_bits) {
+            gc_setup_mark_bits(page);
+        }
+    }
+    rb_vm_update_references(vm);
+    rb_transient_heap_update_references();
+    rb_gc_update_global_tbl();
+    global_symbols.ids = rb_gc_location(global_symbols.ids);
+    global_symbols.dsymbol_fstr_hash = rb_gc_location(global_symbols.dsymbol_fstr_hash);
+    gc_update_tbl_refs(objspace, objspace->obj_to_id_tbl);
+    gc_update_table_refs(objspace, objspace->id_to_obj_tbl);
+    gc_update_table_refs(objspace, global_symbols.str_sym);
+    gc_update_table_refs(objspace, finalizer_table);
+}
+
+static VALUE type_sym(size_t type);
 
 static VALUE
-gc_start_internal(int argc, VALUE *argv, VALUE self)
+gc_compact_stats(rb_execution_context_t *ec, VALUE self)
 {
+    size_t i;
     rb_objspace_t *objspace = &rb_objspace;
-    int full_mark = TRUE, immediate_mark = TRUE, immediate_sweep = TRUE;
-    VALUE opt = Qnil;
-    static ID keyword_ids[3];
+    VALUE h = rb_hash_new();
+    VALUE considered = rb_hash_new();
+    VALUE moved = rb_hash_new();
 
-    rb_scan_args(argc, argv, "0:", &opt);
+    for (i=0; i<T_MASK; i++) {
+        if(objspace->rcompactor.considered_count_table[i]) {
+            rb_hash_aset(considered, type_sym(i), SIZET2NUM(objspace->rcompactor.considered_count_table[i]));
+        }
 
-    if (!NIL_P(opt)) {
-	VALUE kwvals[3];
+        if(objspace->rcompactor.moved_count_table[i]) {
+            rb_hash_aset(moved, type_sym(i), SIZET2NUM(objspace->rcompactor.moved_count_table[i]));
+        }
+    }
 
-	if (!keyword_ids[0]) {
-	    keyword_ids[0] = rb_intern("full_mark");
-	    keyword_ids[1] = rb_intern("immediate_mark");
-	    keyword_ids[2] = rb_intern("immediate_sweep");
-	}
+    rb_hash_aset(h, ID2SYM(rb_intern("considered")), considered);
+    rb_hash_aset(h, ID2SYM(rb_intern("moved")), moved);
+
+    return h;
+}
+
+static void
+root_obj_check_moved_i(const char *category, VALUE obj, void *data)
+{
+    if (gc_object_moved_p(&rb_objspace, obj)) {
+        rb_bug("ROOT %s points to MOVED: %p -> %s\n", category, (void *)obj, obj_info(rb_gc_location(obj)));
+    }
+}
 
-	rb_get_kwargs(opt, keyword_ids, 0, 3, kwvals);
+static void
+reachable_object_check_moved_i(VALUE ref, void *data)
+{
+    VALUE parent = (VALUE)data;
+    if (gc_object_moved_p(&rb_objspace, ref)) {
+        rb_bug("Object %s points to MOVED: %p -> %s\n", obj_info(parent), (void *)ref, obj_info(rb_gc_location(ref)));
+    }
+}
 
-	if (kwvals[0] != Qundef) full_mark = RTEST(kwvals[0]);
-	if (kwvals[1] != Qundef) immediate_mark = RTEST(kwvals[1]);
-	if (kwvals[2] != Qundef) immediate_sweep = RTEST(kwvals[2]);
+static int
+heap_check_moved_i(void *vstart, void *vend, size_t stride, void *data)
+{
+    VALUE v = (VALUE)vstart;
+    for (; v != (VALUE)vend; v += stride) {
+        if (gc_object_moved_p(&rb_objspace, v)) {
+            /* Moved object still on the heap, something may have a reference. */
+        }
+        else {
+            void *poisoned = asan_poisoned_object_p(v);
+            asan_unpoison_object(v, false);
+
+            switch (BUILTIN_TYPE(v)) {
+              case T_NONE:
+              case T_ZOMBIE:
+                break;
+              default:
+                if (!rb_objspace_garbage_object_p(v)) {
+                    rb_objspace_reachable_objects_from(v, reachable_object_check_moved_i, (void *)v);
+                }
+            }
+
+            if (poisoned) {
+                GC_ASSERT(BUILTIN_TYPE(v) == T_NONE);
+                asan_poison_object(v);
+            }
+        }
     }
 
-    garbage_collect(objspace, full_mark, immediate_mark, immediate_sweep, GPR_FLAG_METHOD);
-    if (!finalizing) finalize_deferred(objspace);
+    return 0;
+}
 
-    return Qnil;
+static VALUE
+gc_compact(rb_execution_context_t *ec, VALUE self)
+{
+    /* Run GC with compaction enabled */
+    gc_start_internal(ec, self, Qtrue, Qtrue, Qtrue, Qtrue);
+
+    return gc_compact_stats(ec, self);
+}
+
+static VALUE
+gc_verify_compaction_references(rb_execution_context_t *ec, VALUE self, VALUE double_heap, VALUE toward_empty)
+{
+    rb_objspace_t *objspace = &rb_objspace;
+
+    /* Clear the heap. */
+    gc_start_internal(ec, self, Qtrue, Qtrue, Qtrue, Qfalse);
+
+    RB_VM_LOCK_ENTER();
+    {
+        gc_rest(objspace);
+
+        if (RTEST(double_heap)) {
+            heap_add_pages(objspace, heap_eden, heap_allocated_pages);
+        }
+
+        if (RTEST(toward_empty)) {
+            gc_sort_heap_by_empty_slots(objspace);
+        }
+    }
+    RB_VM_LOCK_LEAVE();
+
+    gc_start_internal(ec, self, Qtrue, Qtrue, Qtrue, Qtrue);
+
+    objspace_reachable_objects_from_root(objspace, root_obj_check_moved_i, NULL);
+    objspace_each_objects(objspace, heap_check_moved_i, NULL);
+
+    return gc_compact_stats(ec, self);
 }
 
 VALUE
@@ -6596,8 +9497,8 @@ void
 rb_gc(void)
 {
     rb_objspace_t *objspace = &rb_objspace;
-    garbage_collect(objspace, TRUE, TRUE, TRUE, GPR_FLAG_CAPI);
-    if (!finalizing) finalize_deferred(objspace);
+    int reason = GPR_DEFAULT_REASON;
+    garbage_collect(objspace, reason);
 }
 
 int
@@ -6614,11 +9515,11 @@ static const char *type_name(int type, VALUE obj);
 static void
 gc_count_add_each_types(VALUE hash, const char *name, const size_t *types)
 {
-    VALUE result = rb_hash_new();
+    VALUE result = rb_hash_new_with_size(T_MASK);
     int i;
     for (i=0; i<T_MASK; i++) {
-	const char *type = type_name(i, 0);
-	rb_hash_aset(result, ID2SYM(rb_intern(type)), SIZET2NUM(types[i]));
+        const char *type = type_name(i, 0);
+        rb_hash_aset(result, ID2SYM(rb_intern(type)), SIZET2NUM(types[i]));
     }
     rb_hash_aset(hash, ID2SYM(rb_intern(name)), result);
 }
@@ -6630,18 +9531,8 @@ rb_gc_count(void)
     return rb_objspace.profile.count;
 }
 
-/*
- *  call-seq:
- *     GC.count -> Integer
- *
- *  The number of times GC occurred.
- *
- *  It returns the number of times GC occurred since the process started.
- *
- */
-
 static VALUE
-gc_count(VALUE self)
+gc_count(rb_execution_context_t *ec, VALUE self)
 {
     return SIZET2NUM(rb_gc_count());
 }
@@ -6661,47 +9552,47 @@ gc_info_decode(rb_objspace_t *objspace, const VALUE hash_or_key, const int orig_
     VALUE flags = orig_flags ? orig_flags : objspace->profile.latest_gc_info;
 
     if (SYMBOL_P(hash_or_key)) {
-	key = hash_or_key;
+        key = hash_or_key;
     }
     else if (RB_TYPE_P(hash_or_key, T_HASH)) {
-	hash = hash_or_key;
+        hash = hash_or_key;
     }
     else {
-	rb_raise(rb_eTypeError, "non-hash or symbol given");
+        rb_raise(rb_eTypeError, "non-hash or symbol given");
     }
 
     if (sym_major_by == Qnil) {
 #define S(s) sym_##s = ID2SYM(rb_intern_const(#s))
-	S(major_by);
-	S(gc_by);
-	S(immediate_sweep);
-	S(have_finalizer);
-	S(state);
-
-	S(stress);
-	S(nofree);
-	S(oldgen);
-	S(shady);
-	S(force);
+        S(major_by);
+        S(gc_by);
+        S(immediate_sweep);
+        S(have_finalizer);
+        S(state);
+
+        S(stress);
+        S(nofree);
+        S(oldgen);
+        S(shady);
+        S(force);
 #if RGENGC_ESTIMATE_OLDMALLOC
-	S(oldmalloc);
+        S(oldmalloc);
 #endif
-	S(newobj);
-	S(malloc);
-	S(method);
-	S(capi);
+        S(newobj);
+        S(malloc);
+        S(method);
+        S(capi);
 
-	S(none);
-	S(marking);
-	S(sweeping);
+        S(none);
+        S(marking);
+        S(sweeping);
 #undef S
     }
 
 #define SET(name, attr) \
     if (key == sym_##name) \
-	return (attr); \
+        return (attr); \
     else if (hash != Qnil) \
-	rb_hash_aset(hash, sym_##name, (attr));
+        rb_hash_aset(hash, sym_##name, (attr));
 
     major_by =
       (flags & GPR_FLAG_MAJOR_BY_NOFREE) ? sym_nofree :
@@ -6715,25 +9606,25 @@ gc_info_decode(rb_objspace_t *objspace, const VALUE hash_or_key, const int orig_
     SET(major_by, major_by);
 
     SET(gc_by,
-	(flags & GPR_FLAG_NEWOBJ) ? sym_newobj :
-	(flags & GPR_FLAG_MALLOC) ? sym_malloc :
-	(flags & GPR_FLAG_METHOD) ? sym_method :
-	(flags & GPR_FLAG_CAPI)   ? sym_capi :
-	(flags & GPR_FLAG_STRESS) ? sym_stress :
-	Qnil
+        (flags & GPR_FLAG_NEWOBJ) ? sym_newobj :
+        (flags & GPR_FLAG_MALLOC) ? sym_malloc :
+        (flags & GPR_FLAG_METHOD) ? sym_method :
+        (flags & GPR_FLAG_CAPI)   ? sym_capi :
+        (flags & GPR_FLAG_STRESS) ? sym_stress :
+        Qnil
     );
 
     SET(have_finalizer, (flags & GPR_FLAG_HAVE_FINALIZE) ? Qtrue : Qfalse);
     SET(immediate_sweep, (flags & GPR_FLAG_IMMEDIATE_SWEEP) ? Qtrue : Qfalse);
 
     if (orig_flags == 0) {
-	SET(state, gc_mode(objspace) == gc_mode_none ? sym_none :
-	           gc_mode(objspace) == gc_mode_marking ? sym_marking : sym_sweeping);
+        SET(state, gc_mode(objspace) == gc_mode_none ? sym_none :
+                   gc_mode(objspace) == gc_mode_marking ? sym_marking : sym_sweeping);
     }
 #undef SET
 
     if (!NIL_P(key)) {/* matched key should return above */
-	rb_raise(rb_eArgError, "unknown key: %"PRIsVALUE, rb_sym2str(key));
+        rb_raise(rb_eArgError, "unknown key: %"PRIsVALUE, rb_sym2str(key));
     }
 
     return hash;
@@ -6746,29 +9637,16 @@ rb_gc_latest_gc_info(VALUE key)
     return gc_info_decode(objspace, key, 0);
 }
 
-/*
- *  call-seq:
- *     GC.latest_gc_info -> {:gc_by=>:newobj}
- *     GC.latest_gc_info(hash) -> hash
- *     GC.latest_gc_info(:major_by) -> :malloc
- *
- *  Returns information about the most recent garbage collection.
- */
-
 static VALUE
-gc_latest_gc_info(int argc, VALUE *argv, VALUE self)
+gc_latest_gc_info(rb_execution_context_t *ec, VALUE self, VALUE arg)
 {
     rb_objspace_t *objspace = &rb_objspace;
-    VALUE arg = Qnil;
 
-    if (rb_scan_args(argc, argv, "01", &arg) == 1) {
-	if (!SYMBOL_P(arg) && !RB_TYPE_P(arg, T_HASH)) {
-	    rb_raise(rb_eTypeError, "non-hash or symbol given");
-	}
+    if (NIL_P(arg)) {
+        arg = rb_hash_new();
     }
-
-    if (arg == Qnil) {
-	arg = rb_hash_new();
+    else if (!SYMBOL_P(arg) && !RB_TYPE_P(arg, T_HASH)) {
+        rb_raise(rb_eTypeError, "non-hash or symbol given");
     }
 
     return gc_info_decode(objspace, arg, 0);
@@ -6792,9 +9670,11 @@ enum gc_stat_sym {
     gc_stat_sym_total_freed_objects,
     gc_stat_sym_malloc_increase_bytes,
     gc_stat_sym_malloc_increase_bytes_limit,
-#if USE_RGENGC
     gc_stat_sym_minor_gc_count,
     gc_stat_sym_major_gc_count,
+    gc_stat_sym_compact_count,
+    gc_stat_sym_read_barrier_faults,
+    gc_stat_sym_total_moved_objects,
     gc_stat_sym_remembered_wb_unprotected_objects,
     gc_stat_sym_remembered_wb_unprotected_objects_limit,
     gc_stat_sym_old_objects,
@@ -6811,40 +9691,10 @@ enum gc_stat_sym {
     gc_stat_sym_total_remembered_normal_object_count,
     gc_stat_sym_total_remembered_shady_object_count,
 #endif
-#endif
     gc_stat_sym_last
 };
 
-enum gc_stat_compat_sym {
-    gc_stat_compat_sym_gc_stat_heap_used,
-    gc_stat_compat_sym_heap_eden_page_length,
-    gc_stat_compat_sym_heap_tomb_page_length,
-    gc_stat_compat_sym_heap_increment,
-    gc_stat_compat_sym_heap_length,
-    gc_stat_compat_sym_heap_live_slot,
-    gc_stat_compat_sym_heap_free_slot,
-    gc_stat_compat_sym_heap_final_slot,
-    gc_stat_compat_sym_heap_swept_slot,
-#if USE_RGENGC
-    gc_stat_compat_sym_remembered_shady_object,
-    gc_stat_compat_sym_remembered_shady_object_limit,
-    gc_stat_compat_sym_old_object,
-    gc_stat_compat_sym_old_object_limit,
-#endif
-    gc_stat_compat_sym_total_allocated_object,
-    gc_stat_compat_sym_total_freed_object,
-    gc_stat_compat_sym_malloc_increase,
-    gc_stat_compat_sym_malloc_limit,
-#if RGENGC_ESTIMATE_OLDMALLOC
-    gc_stat_compat_sym_oldmalloc_increase,
-    gc_stat_compat_sym_oldmalloc_limit,
-#endif
-    gc_stat_compat_sym_last
-};
-
 static VALUE gc_stat_symbols[gc_stat_sym_last];
-static VALUE gc_stat_compat_symbols[gc_stat_compat_sym_last];
-static VALUE gc_stat_compat_table;
 
 static void
 setup_gc_stat_symbols(void)
@@ -6868,9 +9718,11 @@ setup_gc_stat_symbols(void)
 	S(total_freed_objects);
 	S(malloc_increase_bytes);
 	S(malloc_increase_bytes_limit);
-#if USE_RGENGC
 	S(minor_gc_count);
 	S(major_gc_count);
+	S(compact_count);
+	S(read_barrier_faults);
+	S(total_moved_objects);
 	S(remembered_wb_unprotected_objects);
 	S(remembered_wb_unprotected_objects_limit);
 	S(old_objects);
@@ -6887,104 +9739,8 @@ setup_gc_stat_symbols(void)
 	S(total_remembered_normal_object_count);
 	S(total_remembered_shady_object_count);
 #endif /* RGENGC_PROFILE */
-#endif /* USE_RGENGC */
 #undef S
-#define S(s) gc_stat_compat_symbols[gc_stat_compat_sym_##s] = ID2SYM(rb_intern_const(#s))
-	S(gc_stat_heap_used);
-	S(heap_eden_page_length);
-	S(heap_tomb_page_length);
-	S(heap_increment);
-	S(heap_length);
-	S(heap_live_slot);
-	S(heap_free_slot);
-	S(heap_final_slot);
-	S(heap_swept_slot);
-#if USE_RGEGC
-	S(remembered_shady_object);
-	S(remembered_shady_object_limit);
-	S(old_object);
-	S(old_object_limit);
-#endif
-	S(total_allocated_object);
-	S(total_freed_object);
-	S(malloc_increase);
-	S(malloc_limit);
-#if RGENGC_ESTIMATE_OLDMALLOC
-	S(oldmalloc_increase);
-	S(oldmalloc_limit);
-#endif
-#undef S
-
-	{
-	    VALUE table = gc_stat_compat_table = rb_hash_new();
-	    rb_obj_hide(table);
-	    rb_gc_register_mark_object(table);
-
-	    /* compatibility layer for Ruby 2.1 */
-#define OLD_SYM(s) gc_stat_compat_symbols[gc_stat_compat_sym_##s]
-#define NEW_SYM(s) gc_stat_symbols[gc_stat_sym_##s]
-	    rb_hash_aset(table, OLD_SYM(gc_stat_heap_used), NEW_SYM(heap_allocated_pages));
-	    rb_hash_aset(table, OLD_SYM(heap_eden_page_length), NEW_SYM(heap_eden_pages));
-	    rb_hash_aset(table, OLD_SYM(heap_tomb_page_length), NEW_SYM(heap_tomb_pages));
-	    rb_hash_aset(table, OLD_SYM(heap_increment), NEW_SYM(heap_allocatable_pages));
-	    rb_hash_aset(table, OLD_SYM(heap_length), NEW_SYM(heap_sorted_length));
-	    rb_hash_aset(table, OLD_SYM(heap_live_slot), NEW_SYM(heap_live_slots));
-	    rb_hash_aset(table, OLD_SYM(heap_free_slot), NEW_SYM(heap_free_slots));
-	    rb_hash_aset(table, OLD_SYM(heap_final_slot), NEW_SYM(heap_final_slots));
-#if USE_RGEGC
-	    rb_hash_aset(table, OLD_SYM(remembered_shady_object), NEW_SYM(remembered_wb_unprotected_objects));
-	    rb_hash_aset(table, OLD_SYM(remembered_shady_object_limit), NEW_SYM(remembered_wb_unprotected_objects_limit));
-	    rb_hash_aset(table, OLD_SYM(old_object), NEW_SYM(old_objects));
-	    rb_hash_aset(table, OLD_SYM(old_object_limit), NEW_SYM(old_objects_limit));
-#endif
-	    rb_hash_aset(table, OLD_SYM(total_allocated_object), NEW_SYM(total_allocated_objects));
-	    rb_hash_aset(table, OLD_SYM(total_freed_object), NEW_SYM(total_freed_objects));
-	    rb_hash_aset(table, OLD_SYM(malloc_increase), NEW_SYM(malloc_increase_bytes));
-	    rb_hash_aset(table, OLD_SYM(malloc_limit), NEW_SYM(malloc_increase_bytes_limit));
-#if RGENGC_ESTIMATE_OLDMALLOC
-	    rb_hash_aset(table, OLD_SYM(oldmalloc_increase), NEW_SYM(oldmalloc_increase_bytes));
-	    rb_hash_aset(table, OLD_SYM(oldmalloc_limit), NEW_SYM(oldmalloc_increase_bytes_limit));
-#endif
-#undef OLD_SYM
-#undef NEW_SYM
-	    rb_obj_freeze(table);
-	}
-    }
-}
-
-static VALUE
-compat_key(VALUE key)
-{
-    VALUE new_key = rb_hash_lookup(gc_stat_compat_table, key);
-
-    if (!NIL_P(new_key)) {
-	static int warned = 0;
-	if (warned == 0) {
-	    rb_warn("GC.stat keys were changed from Ruby 2.1. "
-		    "In this case, you refer to obsolete `%"PRIsVALUE"' (new key is `%"PRIsVALUE"'). "
-		    "Please check <https://bugs.ruby-lang.org/issues/9924> for more information.",
-		    key, new_key);
-	    warned = 1;
-	}
     }
-
-    return new_key;
-}
-
-static VALUE
-default_proc_for_compat_func(VALUE hash, VALUE dmy, int argc, VALUE *argv)
-{
-    VALUE key, new_key;
-
-    Check_Type(hash, T_HASH);
-    rb_check_arity(argc, 2, 2);
-    key = argv[1];
-
-    if ((new_key = compat_key(key)) != Qnil) {
-	return rb_hash_lookup(hash, new_key);
-    }
-
-    return Qnil;
 }
 
 static size_t
@@ -6997,15 +9753,6 @@ gc_stat_internal(VALUE hash_or_sym)
 
     if (RB_TYPE_P(hash_or_sym, T_HASH)) {
 	hash = hash_or_sym;
-
-	if (NIL_P(RHASH_IFNONE(hash))) {
-	    static VALUE default_proc_for_compat = 0;
-	    if (default_proc_for_compat == 0) { /* TODO: it should be */
-		default_proc_for_compat = rb_proc_new(default_proc_for_compat_func, Qnil);
-		rb_gc_register_mark_object(default_proc_for_compat);
-	    }
-	    rb_hash_set_default_proc(hash, default_proc_for_compat);
-	}
     }
     else if (SYMBOL_P(hash_or_sym)) {
 	key = hash_or_sym;
@@ -7020,7 +9767,6 @@ gc_stat_internal(VALUE hash_or_sym)
     else if (hash != Qnil) \
 	rb_hash_aset(hash, gc_stat_symbols[gc_stat_sym_##name], SIZET2NUM(attr));
 
-  again:
     SET(count, objspace->profile.count);
 
     /* implementation dependent counters */
@@ -7040,9 +9786,11 @@ gc_stat_internal(VALUE hash_or_sym)
     SET(total_freed_objects, objspace->profile.total_freed_objects);
     SET(malloc_increase_bytes, malloc_increase);
     SET(malloc_increase_bytes_limit, malloc_limit);
-#if USE_RGENGC
     SET(minor_gc_count, objspace->profile.minor_gc_count);
     SET(major_gc_count, objspace->profile.major_gc_count);
+    SET(compact_count, objspace->profile.compact_count);
+    SET(read_barrier_faults, objspace->profile.read_barrier_faults);
+    SET(total_moved_objects, objspace->rcompactor.total_moved);
     SET(remembered_wb_unprotected_objects, objspace->rgengc.uncollectible_wb_unprotected_objects);
     SET(remembered_wb_unprotected_objects_limit, objspace->rgengc.uncollectible_wb_unprotected_objects_limit);
     SET(old_objects, objspace->rgengc.old_objects);
@@ -7060,15 +9808,9 @@ gc_stat_internal(VALUE hash_or_sym)
     SET(total_remembered_normal_object_count, objspace->profile.total_remembered_normal_object_count);
     SET(total_remembered_shady_object_count, objspace->profile.total_remembered_shady_object_count);
 #endif /* RGENGC_PROFILE */
-#endif /* USE_RGENGC */
 #undef SET
 
     if (!NIL_P(key)) { /* matched key should return above */
-	VALUE new_key;
-	if ((new_key = compat_key(key)) != Qnil) {
-	    key = new_key;
-	    goto again;
-	}
 	rb_raise(rb_eArgError, "unknown key: %"PRIsVALUE, rb_sym2str(key));
     }
 
@@ -7086,69 +9828,23 @@ gc_stat_internal(VALUE hash_or_sym)
     return 0;
 }
 
-/*
- *  call-seq:
- *     GC.stat -> Hash
- *     GC.stat(hash) -> hash
- *     GC.stat(:key) -> Numeric
- *
- *  Returns a Hash containing information about the GC.
- *
- *  The hash includes information about internal statistics about GC such as:
- *
- *      {
- *          :count=>0,
- *          :heap_allocated_pages=>24,
- *          :heap_sorted_length=>24,
- *          :heap_allocatable_pages=>0,
- *          :heap_available_slots=>9783,
- *          :heap_live_slots=>7713,
- *          :heap_free_slots=>2070,
- *          :heap_final_slots=>0,
- *          :heap_marked_slots=>0,
- *          :heap_eden_pages=>24,
- *          :heap_tomb_pages=>0,
- *          :total_allocated_pages=>24,
- *          :total_freed_pages=>0,
- *          :total_allocated_objects=>7796,
- *          :total_freed_objects=>83,
- *          :malloc_increase_bytes=>2389312,
- *          :malloc_increase_bytes_limit=>16777216,
- *          :minor_gc_count=>0,
- *          :major_gc_count=>0,
- *          :remembered_wb_unprotected_objects=>0,
- *          :remembered_wb_unprotected_objects_limit=>0,
- *          :old_objects=>0,
- *          :old_objects_limit=>0,
- *          :oldmalloc_increase_bytes=>2389760,
- *          :oldmalloc_increase_bytes_limit=>16777216
- *      }
- *
- *  The contents of the hash are implementation specific and may be changed in
- *  the future.
- *
- *  This method is only expected to work on C Ruby.
- *
- */
-
 static VALUE
-gc_stat(int argc, VALUE *argv, VALUE self)
+gc_stat(rb_execution_context_t *ec, VALUE self, VALUE arg) // arg is (nil || hash || symbol)
 {
-    VALUE arg = Qnil;
-
-    if (rb_scan_args(argc, argv, "01", &arg) == 1) {
-	if (SYMBOL_P(arg)) {
-	    size_t value = gc_stat_internal(arg);
-	    return SIZET2NUM(value);
-	}
-	else if (!RB_TYPE_P(arg, T_HASH)) {
-	    rb_raise(rb_eTypeError, "non-hash or symbol given");
-	}
-    }
-
-    if (arg == Qnil) {
+    if (NIL_P(arg)) {
         arg = rb_hash_new();
     }
+    else if (SYMBOL_P(arg)) {
+        size_t value = gc_stat_internal(arg);
+        return SIZET2NUM(value);
+    }
+    else if (RB_TYPE_P(arg, T_HASH)) {
+        // ok
+    }
+    else {
+        rb_raise(rb_eTypeError, "non-hash or symbol given");
+    }
+
     gc_stat_internal(arg);
     return arg;
 }
@@ -7166,15 +9862,8 @@ rb_gc_stat(VALUE key)
     }
 }
 
-/*
- *  call-seq:
- *    GC.stress	    -> fixnum, true or false
- *
- *  Returns current status of GC stress mode.
- */
-
 static VALUE
-gc_stress_get(VALUE self)
+gc_stress_get(rb_execution_context_t *ec, VALUE self)
 {
     rb_objspace_t *objspace = &rb_objspace;
     return ruby_gc_stress_mode;
@@ -7187,76 +9876,92 @@ gc_stress_set(rb_objspace_t *objspace, VALUE flag)
     objspace->gc_stress_mode = flag;
 }
 
-/*
- *  call-seq:
- *    GC.stress = flag          -> flag
- *
- *  Updates the GC stress mode.
- *
- *  When stress mode is enabled, the GC is invoked at every GC opportunity:
- *  all memory and object allocations.
- *
- *  Enabling stress mode will degrade performance, it is only for debugging.
- *
- *  flag can be true, false, or a fixnum bit-ORed following flags.
- *    0x01:: no major GC
- *    0x02:: no immediate sweep
- *    0x04:: full mark after malloc/calloc/realloc
- */
-
 static VALUE
-gc_stress_set_m(VALUE self, VALUE flag)
+gc_stress_set_m(rb_execution_context_t *ec, VALUE self, VALUE flag)
 {
     rb_objspace_t *objspace = &rb_objspace;
     gc_stress_set(objspace, flag);
     return flag;
 }
 
-/*
- *  call-seq:
- *     GC.enable    -> true or false
- *
- *  Enables garbage collection, returning +true+ if garbage
- *  collection was previously disabled.
- *
- *     GC.disable   #=> false
- *     GC.enable    #=> true
- *     GC.enable    #=> false
- *
- */
-
 VALUE
 rb_gc_enable(void)
 {
     rb_objspace_t *objspace = &rb_objspace;
-    int old = dont_gc;
+    return rb_objspace_gc_enable(objspace);
+}
 
-    dont_gc = FALSE;
+VALUE
+rb_objspace_gc_enable(rb_objspace_t *objspace)
+{
+    int old = dont_gc_val();
+
+    dont_gc_off();
     return old ? Qtrue : Qfalse;
 }
 
-/*
- *  call-seq:
- *     GC.disable    -> true or false
- *
- *  Disables garbage collection, returning +true+ if garbage
- *  collection was already disabled.
- *
- *     GC.disable   #=> false
- *     GC.disable   #=> true
- *
- */
+static VALUE
+gc_enable(rb_execution_context_t *ec, VALUE _)
+{
+    return rb_gc_enable();
+}
+
+VALUE
+rb_gc_disable_no_rest(void)
+{
+    rb_objspace_t *objspace = &rb_objspace;
+    return gc_disable_no_rest(objspace);
+}
+
+static VALUE
+gc_disable_no_rest(rb_objspace_t *objspace)
+{
+    int old = dont_gc_val();
+    dont_gc_on();
+    return old ? Qtrue : Qfalse;
+}
 
 VALUE
 rb_gc_disable(void)
 {
     rb_objspace_t *objspace = &rb_objspace;
-    int old = dont_gc;
+    return rb_objspace_gc_disable(objspace);
+}
 
+VALUE
+rb_objspace_gc_disable(rb_objspace_t *objspace)
+{
     gc_rest(objspace);
+    return gc_disable_no_rest(objspace);
+}
 
-    dont_gc = TRUE;
-    return old ? Qtrue : Qfalse;
+static VALUE
+gc_disable(rb_execution_context_t *ec, VALUE _)
+{
+    return rb_gc_disable();
+}
+
+static VALUE
+gc_set_auto_compact(rb_execution_context_t *ec, VALUE _, VALUE v)
+{
+#if defined(HAVE_SYSCONF) && defined(_SC_PAGE_SIZE)
+    /* If Ruby's heap pages are not a multiple of the system page size, we
+     * cannot use mprotect for the read barrier, so we must disable automatic
+     * compaction. */
+    int pagesize;
+    pagesize = (int)sysconf(_SC_PAGE_SIZE);
+    if ((HEAP_PAGE_SIZE % pagesize) != 0) {
+        rb_raise(rb_eNotImpError, "Automatic compaction isn't available on this platform");
+    }
+#endif
+    ruby_enable_autocompact = RTEST(v);
+    return v;
+}
+
+static VALUE
+gc_get_auto_compact(rb_execution_context_t *ec, VALUE _)
+{
+    return ruby_enable_autocompact ? Qtrue : Qfalse;
 }
 
 static int
@@ -7301,14 +10006,14 @@ get_envparam_size(const char *name, size_t *default_value, size_t lower_bound)
 	}
 	if (val > 0 && (size_t)val > lower_bound) {
 	    if (RTEST(ruby_verbose)) {
-		fprintf(stderr, "%s=%"PRIdSIZE" (default value: %"PRIdSIZE")\n", name, val, *default_value);
+		fprintf(stderr, "%s=%"PRIdSIZE" (default value: %"PRIuSIZE")\n", name, val, *default_value);
 	    }
 	    *default_value = (size_t)val;
 	    return 1;
 	}
 	else {
 	    if (RTEST(ruby_verbose)) {
-		fprintf(stderr, "%s=%"PRIdSIZE" (default value: %"PRIdSIZE") is ignored because it must be greater than %"PRIdSIZE".\n",
+		fprintf(stderr, "%s=%"PRIdSIZE" (default value: %"PRIuSIZE") is ignored because it must be greater than %"PRIuSIZE".\n",
 			name, val, *default_value, lower_bound);
 	    }
 	    return 0;
@@ -7348,13 +10053,15 @@ get_envparam_double(const char *name, double *default_value, double lower_bound,
 	    }
 	}
 	else {
-	  accept:
-	    if (RTEST(ruby_verbose)) fprintf(stderr, "%s=%f (default value: %f)\n", name, val, *default_value);
-	    *default_value = val;
-	    return 1;
+            goto accept;
 	}
     }
     return 0;
+
+  accept:
+    if (RTEST(ruby_verbose)) fprintf(stderr, "%s=%f (default value: %f)\n", name, val, *default_value);
+    *default_value = val;
+    return 1;
 }
 
 static void
@@ -7412,26 +10119,17 @@ gc_set_initial_pages(void)
  */
 
 void
-ruby_gc_set_params(int safe_level)
+ruby_gc_set_params(void)
 {
-    if (safe_level > 0) return;
-
     /* RUBY_GC_HEAP_FREE_SLOTS */
     if (get_envparam_size("RUBY_GC_HEAP_FREE_SLOTS", &gc_params.heap_free_slots, 0)) {
 	/* ok */
     }
-    else if (get_envparam_size("RUBY_FREE_MIN", &gc_params.heap_free_slots, 0)) {
-	rb_warn("RUBY_FREE_MIN is obsolete. Use RUBY_GC_HEAP_FREE_SLOTS instead.");
-    }
 
     /* RUBY_GC_HEAP_INIT_SLOTS */
     if (get_envparam_size("RUBY_GC_HEAP_INIT_SLOTS", &gc_params.heap_init_slots, 0)) {
 	gc_set_initial_pages();
     }
-    else if (get_envparam_size("RUBY_HEAP_MIN_SLOTS", &gc_params.heap_init_slots, 0)) {
-	rb_warn("RUBY_HEAP_MIN_SLOTS is obsolete. Use RUBY_GC_HEAP_INIT_SLOTS instead.");
-	gc_set_initial_pages();
-    }
 
     get_envparam_double("RUBY_GC_HEAP_GROWTH_FACTOR", &gc_params.growth_factor, 1.0, 0.0, FALSE);
     get_envparam_size  ("RUBY_GC_HEAP_GROWTH_MAX_SLOTS", &gc_params.growth_max_slots, 0);
@@ -7445,6 +10143,9 @@ ruby_gc_set_params(int safe_level)
 
     get_envparam_size  ("RUBY_GC_MALLOC_LIMIT", &gc_params.malloc_limit_min, 0);
     get_envparam_size  ("RUBY_GC_MALLOC_LIMIT_MAX", &gc_params.malloc_limit_max, 0);
+    if (!gc_params.malloc_limit_max) { /* ignore max-check if 0 */
+        gc_params.malloc_limit_max = SIZE_MAX;
+    }
     get_envparam_double("RUBY_GC_MALLOC_LIMIT_GROWTH_FACTOR", &gc_params.malloc_limit_growth_factor, 1.0, 0.0, FALSE);
 
 #if RGENGC_ESTIMATE_OLDMALLOC
@@ -7457,18 +10158,30 @@ ruby_gc_set_params(int safe_level)
 #endif
 }
 
+static void
+reachable_objects_from_callback(VALUE obj)
+{
+    rb_ractor_t *cr = GET_RACTOR();
+    cr->mfd->mark_func(obj, cr->mfd->data);
+}
+
 void
 rb_objspace_reachable_objects_from(VALUE obj, void (func)(VALUE, void *), void *data)
 {
     rb_objspace_t *objspace = &rb_objspace;
 
+    if (during_gc) rb_bug("rb_objspace_reachable_objects_from() is not supported while during_gc == true");
+
     if (is_markable_object(objspace, obj)) {
-	struct mark_func_data_struct mfd;
-	mfd.mark_func = func;
-	mfd.data = data;
-	PUSH_MARK_FUNC_DATA(&mfd);
+        rb_ractor_t *cr = GET_RACTOR();
+        struct gc_mark_func_data_struct mfd = {
+            .mark_func = func,
+            .data = data,
+        }, *prev_mfd = cr->mfd;
+
+        cr->mfd = &mfd;
 	gc_mark_children(objspace, obj);
-	POP_MARK_FUNC_DATA();
+        cr->mfd = prev_mfd;
     }
 }
 
@@ -7489,48 +10202,80 @@ void
 rb_objspace_reachable_objects_from_root(void (func)(const char *category, VALUE, void *), void *passing_data)
 {
     rb_objspace_t *objspace = &rb_objspace;
-    struct root_objects_data data;
-    struct mark_func_data_struct mfd;
+    objspace_reachable_objects_from_root(objspace, func, passing_data);
+}
 
-    data.func = func;
-    data.data = passing_data;
+static void
+objspace_reachable_objects_from_root(rb_objspace_t *objspace, void (func)(const char *category, VALUE, void *), void *passing_data)
+{
+    if (during_gc) rb_bug("objspace_reachable_objects_from_root() is not supported while during_gc == true");
 
-    mfd.mark_func = root_objects_from;
-    mfd.data = &data;
+    rb_ractor_t *cr = GET_RACTOR();
+    struct root_objects_data data = {
+        .func = func,
+        .data = passing_data,
+    };
+    struct gc_mark_func_data_struct mfd = {
+        .mark_func = root_objects_from,
+        .data = &data,
+    }, *prev_mfd = cr->mfd;
 
-    PUSH_MARK_FUNC_DATA(&mfd);
+    cr->mfd = &mfd;
     gc_mark_roots(objspace, &data.category);
-    POP_MARK_FUNC_DATA();
+    cr->mfd = prev_mfd;
 }
 
 /*
   ------------------------ Extended allocator ------------------------
 */
 
-static void objspace_xfree(rb_objspace_t *objspace, void *ptr, size_t size);
+struct gc_raise_tag {
+    VALUE exc;
+    const char *fmt;
+    va_list *ap;
+};
 
 static void *
-negative_size_allocation_error_with_gvl(void *ptr)
+gc_vraise(void *ptr)
 {
-    rb_raise(rb_eNoMemError, "%s", (const char *)ptr);
-    return 0; /* should not be reached */
+    struct gc_raise_tag *argv = ptr;
+    rb_vraise(argv->exc, argv->fmt, *argv->ap);
+    UNREACHABLE_RETURN(NULL);
 }
 
 static void
-negative_size_allocation_error(const char *msg)
+gc_raise(VALUE exc, const char *fmt, ...)
 {
+    va_list ap;
+    va_start(ap, fmt);
+    struct gc_raise_tag argv = {
+        exc, fmt, &ap,
+    };
+
     if (ruby_thread_has_gvl_p()) {
-	rb_raise(rb_eNoMemError, "%s", msg);
+        gc_vraise(&argv);
+        UNREACHABLE;
+    }
+    else if (ruby_native_thread_p()) {
+        rb_thread_call_with_gvl(gc_vraise, &argv);
+        UNREACHABLE;
     }
     else {
-	if (ruby_native_thread_p()) {
-	    rb_thread_call_with_gvl(negative_size_allocation_error_with_gvl, (void *)msg);
-	}
-	else {
-	    fprintf(stderr, "[FATAL] %s\n", msg);
-	    exit(EXIT_FAILURE);
-	}
+        /* Not in a ruby thread */
+        fprintf(stderr, "%s", "[FATAL] ");
+        vfprintf(stderr, fmt, ap);
     }
+
+    va_end(ap);
+    abort();
+}
+
+static void objspace_xfree(rb_objspace_t *objspace, void *ptr, size_t size);
+
+static void
+negative_size_allocation_error(const char *msg)
+{
+    gc_raise(rb_eNoMemError, "%s", msg);
 }
 
 static void *
@@ -7540,6 +10285,8 @@ ruby_memerror_body(void *dummy)
     return 0;
 }
 
+NORETURN(static void ruby_memerror(void));
+RBIMPL_ATTR_MAYBE_UNUSED()
 static void
 ruby_memerror(void)
 {
@@ -7553,35 +10300,48 @@ ruby_memerror(void)
 	else {
 	    /* no ruby thread */
 	    fprintf(stderr, "[FATAL] failed to allocate memory\n");
-	    exit(EXIT_FAILURE);
 	}
     }
+    exit(EXIT_FAILURE);
 }
 
 void
 rb_memerror(void)
 {
-    rb_thread_t *th = GET_THREAD();
-    rb_objspace_t *objspace = rb_objspace_of(th->vm);
+    rb_execution_context_t *ec = GET_EC();
+    rb_objspace_t *objspace = rb_objspace_of(rb_ec_vm_ptr(ec));
+    VALUE exc;
+
+    if (0) {
+        // Print out pid, sleep, so you can attach debugger to see what went wrong:
+        fprintf(stderr, "rb_memerror pid=%"PRI_PIDT_PREFIX"d\n", getpid());
+        sleep(60);
+    }
 
-    if (during_gc) gc_exit(objspace, "rb_memerror");
+    if (during_gc) {
+        // TODO: OMG!! How to implement it?
+        gc_exit(objspace, gc_enter_event_rb_memerror, NULL);
+    }
 
-    if (!nomem_error ||
-	rb_thread_raised_p(th, RAISED_NOMEMORY)) {
+    exc = nomem_error;
+    if (!exc ||
+	rb_ec_raised_p(ec, RAISED_NOMEMORY)) {
 	fprintf(stderr, "[FATAL] failed to allocate memory\n");
 	exit(EXIT_FAILURE);
     }
-    if (rb_thread_raised_p(th, RAISED_NOMEMORY)) {
-	rb_thread_raised_clear(th);
-	GET_THREAD()->errinfo = nomem_error;
-	TH_JUMP_TAG(th, TAG_RAISE);
+    if (rb_ec_raised_p(ec, RAISED_NOMEMORY)) {
+	rb_ec_raised_clear(ec);
     }
-    rb_thread_raised_set(th, RAISED_NOMEMORY);
-    rb_exc_raise(nomem_error);
+    else {
+	rb_ec_raised_set(ec, RAISED_NOMEMORY);
+	exc = ruby_vm_special_exception_copy(exc);
+    }
+    ec->errinfo = exc;
+    EC_JUMP_TAG(ec, TAG_RAISE);
 }
 
-static void *
-aligned_malloc(size_t alignment, size_t size)
+void *
+rb_aligned_malloc(size_t alignment, size_t size)
 {
     void *res;
 
@@ -7608,16 +10368,14 @@ aligned_malloc(size_t alignment, size_t size)
     res = (void*)aligned;
 #endif
 
-#if defined(_DEBUG) || GC_DEBUG
     /* alignment must be a power of 2 */
-    assert(((alignment - 1) & alignment) == 0);
-    assert(alignment % sizeof(void*) == 0);
-#endif
+    GC_ASSERT(((alignment - 1) & alignment) == 0);
+    GC_ASSERT(alignment % sizeof(void*) == 0);
     return res;
 }
 
 static void
-aligned_free(void *ptr)
+rb_aligned_free(void *ptr)
 {
 #if defined __MINGW32__
     __mingw_aligned_free(ptr);
@@ -7641,9 +10399,9 @@ objspace_malloc_size(rb_objspace_t *objspace, void *ptr, size_t hint)
 }
 
 enum memop_type {
-    MEMOP_TYPE_MALLOC  = 1,
-    MEMOP_TYPE_FREE    = 2,
-    MEMOP_TYPE_REALLOC = 3
+    MEMOP_TYPE_MALLOC  = 0,
+    MEMOP_TYPE_FREE,
+    MEMOP_TYPE_REALLOC
 };
 
 static inline void
@@ -7662,7 +10420,13 @@ static void
 objspace_malloc_gc_stress(rb_objspace_t *objspace)
 {
     if (ruby_gc_stressful && ruby_native_thread_p()) {
-	garbage_collect_with_gvl(objspace, gc_stress_full_mark_after_malloc_p(), TRUE, TRUE, GPR_FLAG_STRESS | GPR_FLAG_MALLOC);
+        int reason = GPR_FLAG_IMMEDIATE_MARK | GPR_FLAG_IMMEDIATE_SWEEP |
+                                     GPR_FLAG_STRESS | GPR_FLAG_MALLOC;
+
+        if (gc_stress_full_mark_after_malloc_p()) {
+            reason |= GPR_FLAG_FULL_MARK;
+        }
+        garbage_collect_with_gvl(objspace, reason);
     }
 }
 
@@ -7684,12 +10448,12 @@ objspace_malloc_increase(rb_objspace_t *objspace, void *mem, size_t new_size, si
 
     if (type == MEMOP_TYPE_MALLOC) {
       retry:
-	if (malloc_increase > malloc_limit && ruby_native_thread_p() && !dont_gc) {
+	if (malloc_increase > malloc_limit && ruby_native_thread_p() && !dont_gc_val()) {
 	    if (ruby_thread_has_gvl_p() && is_lazy_sweeping(heap_eden)) {
 		gc_rest(objspace); /* gc_rest can reduce malloc_increase */
 		goto retry;
 	    }
-	    garbage_collect_with_gvl(objspace, FALSE, FALSE, FALSE, GPR_FLAG_MALLOC);
+	    garbage_collect_with_gvl(objspace, GPR_FLAG_MALLOC);
 	}
     }
 
@@ -7709,12 +10473,12 @@ objspace_malloc_increase(rb_objspace_t *objspace, void *mem, size_t new_size, si
 	atomic_sub_nounderflow(&objspace->malloc_params.allocated_size, dec_size);
     }
 
-    if (0) fprintf(stderr, "increase - ptr: %p, type: %s, new_size: %d, old_size: %d\n",
+    if (0) fprintf(stderr, "increase - ptr: %p, type: %s, new_size: %"PRIdSIZE", old_size: %"PRIdSIZE"\n",
 		   mem,
 		   type == MEMOP_TYPE_MALLOC  ? "malloc" :
 		   type == MEMOP_TYPE_FREE    ? "free  " :
 		   type == MEMOP_TYPE_REALLOC ? "realloc": "error",
-		   (int)new_size, (int)old_size);
+		   new_size, old_size);
 
     switch (type) {
       case MEMOP_TYPE_MALLOC:
@@ -7728,7 +10492,7 @@ objspace_malloc_increase(rb_objspace_t *objspace, void *mem, size_t new_size, si
 	    }
 #if MALLOC_ALLOCATED_SIZE_CHECK
 	    else {
-		if (RGENGC_CHECK_MODE) assert(objspace->malloc_params.allocations > 0);
+		GC_ASSERT(objspace->malloc_params.allocations > 0);
 	    }
 #endif
 	}
@@ -7738,13 +10502,27 @@ objspace_malloc_increase(rb_objspace_t *objspace, void *mem, size_t new_size, si
 #endif
 }
 
+struct malloc_obj_info { /* 4 words */
+    size_t size;
+#if USE_GC_MALLOC_OBJ_INFO_DETAILS
+    size_t gen;
+    const char *file;
+    size_t line;
+#endif
+};
+
+#if USE_GC_MALLOC_OBJ_INFO_DETAILS
+const char *ruby_malloc_info_file;
+int ruby_malloc_info_line;
+#endif
+
 static inline size_t
 objspace_malloc_prepare(rb_objspace_t *objspace, size_t size)
 {
     if (size == 0) size = 1;
 
 #if CALC_EXACT_MALLOC_SIZE
-    size += sizeof(size_t);
+    size += sizeof(struct malloc_obj_info);
 #endif
 
     return size;
@@ -7753,25 +10531,69 @@ objspace_malloc_prepare(rb_objspace_t *objspace, size_t size)
 static inline void *
 objspace_malloc_fixup(rb_objspace_t *objspace, void *mem, size_t size)
 {
+    size = objspace_malloc_size(objspace, mem, size);
+    objspace_malloc_increase(objspace, mem, size, 0, MEMOP_TYPE_MALLOC);
+
 #if CALC_EXACT_MALLOC_SIZE
-    ((size_t *)mem)[0] = size;
-    mem = (size_t *)mem + 1;
+    {
+        struct malloc_obj_info *info = mem;
+        info->size = size;
+#if USE_GC_MALLOC_OBJ_INFO_DETAILS
+        info->gen = objspace->profile.count;
+        info->file = ruby_malloc_info_file;
+        info->line = info->file ? ruby_malloc_info_line : 0;
+#endif
+        mem = info + 1;
+    }
 #endif
 
     return mem;
 }
 
-#define TRY_WITH_GC(alloc) do { \
+#if defined(__GNUC__) && RUBY_DEBUG
+#define RB_BUG_INSTEAD_OF_RB_MEMERROR
+#endif
+
+#ifdef RB_BUG_INSTEAD_OF_RB_MEMERROR
+#define TRY_WITH_GC(siz, expr) do {                          \
+        const gc_profile_record_flag gpr =                   \
+            GPR_FLAG_FULL_MARK           |                   \
+            GPR_FLAG_IMMEDIATE_MARK      |                   \
+            GPR_FLAG_IMMEDIATE_SWEEP     |                   \
+            GPR_FLAG_MALLOC;                                 \
+        objspace_malloc_gc_stress(objspace);                 \
+                                                             \
+        if (LIKELY((expr))) {                                \
+            /* Success on 1st try */                         \
+        }                                                    \
+        else if (!garbage_collect_with_gvl(objspace, gpr)) { \
+            /* @shyouhei thinks this doesn't happen */       \
+            rb_bug("TRY_WITH_GC: could not GC");             \
+        }                                                    \
+        else if ((expr)) {                                   \
+            /* Success on 2nd try */                         \
+        }                                                    \
+        else {                                               \
+            rb_bug("TRY_WITH_GC: could not allocate:"        \
+                   "%"PRIdSIZE" bytes for %s",               \
+                   siz, # expr);                             \
+        }                                                    \
+    } while (0)
+#else
+#define TRY_WITH_GC(siz, alloc) do { \
         objspace_malloc_gc_stress(objspace); \
 	if (!(alloc) && \
-	    (!garbage_collect_with_gvl(objspace, TRUE, TRUE, TRUE, GPR_FLAG_MALLOC) || /* full/immediate mark && immediate sweep */ \
+            (!garbage_collect_with_gvl(objspace, GPR_FLAG_FULL_MARK | \
+                GPR_FLAG_IMMEDIATE_MARK | GPR_FLAG_IMMEDIATE_SWEEP | \
+                GPR_FLAG_MALLOC) || \
 	     !(alloc))) { \
 	    ruby_memerror(); \
 	} \
     } while (0)
+#endif
 
-/* this shouldn't be called directly.
- * objspace_xmalloc and objspace_xmalloc2 checks allocation size.
+/* these shouldn't be called directly.
+ * objspace_* functions do not check allocation size.
  */
 static void *
 objspace_xmalloc0(rb_objspace_t *objspace, size_t size)
@@ -7779,35 +10601,15 @@ objspace_xmalloc0(rb_objspace_t *objspace, size_t size)
     void *mem;
 
     size = objspace_malloc_prepare(objspace, size);
-    TRY_WITH_GC(mem = malloc(size));
-    size = objspace_malloc_size(objspace, mem, size);
-    objspace_malloc_increase(objspace, mem, size, 0, MEMOP_TYPE_MALLOC);
+    TRY_WITH_GC(size, mem = malloc(size));
+    RB_DEBUG_COUNTER_INC(heap_xmalloc);
     return objspace_malloc_fixup(objspace, mem, size);
 }
 
-static void *
-objspace_xmalloc(rb_objspace_t *objspace, size_t size)
-{
-    if ((ssize_t)size < 0) {
-	negative_size_allocation_error("too large allocation size");
-    }
-    return objspace_xmalloc0(objspace, size);
-}
-
 static inline size_t
 xmalloc2_size(const size_t count, const size_t elsize)
 {
-    size_t ret;
-    if (rb_mul_size_overflow(count, elsize, SSIZE_MAX, &ret)) {
-	ruby_malloc_size_overflow(count, elsize);
-    }
-    return ret;
-}
-
-static void *
-objspace_xmalloc2(rb_objspace_t *objspace, size_t n, size_t size)
-{
-    return objspace_xmalloc0(&rb_objspace, xmalloc2_size(n, size));
+    return size_mul_or_raise(count, elsize, rb_eArgError);
 }
 
 static void *
@@ -7815,7 +10617,7 @@ objspace_xrealloc(rb_objspace_t *objspace, void *ptr, size_t new_size, size_t ol
 {
     void *mem;
 
-    if (!ptr) return objspace_xmalloc(objspace, new_size);
+    if (!ptr) return objspace_xmalloc0(objspace, new_size);
 
     /*
      * The behavior of realloc(ptr, 0) is implementation defined.
@@ -7823,40 +10625,196 @@ objspace_xrealloc(rb_objspace_t *objspace, void *ptr, size_t new_size, size_t ol
      * see http://www.open-std.org/jtc1/sc22/wg14/www/docs/dr_400.htm
      */
     if (new_size == 0) {
-	objspace_xfree(objspace, ptr, old_size);
-	return 0;
+        if ((mem = objspace_xmalloc0(objspace, 0)) != NULL) {
+            /*
+             * - OpenBSD's malloc(3) man page says that when 0 is passed, it
+             *   returns a non-NULL pointer to an access-protected memory page.
+             *   The returned pointer cannot be read / written at all, but
+             *   still be a valid argument of free().
+             *
+             *   https://man.openbsd.org/malloc.3
+             *
+             * - Linux's malloc(3) man page says that it _might_ perhaps return
+             *   a non-NULL pointer when its argument is 0.  That return value
+             *   is safe (and is expected) to be passed to free().
+             *
+             *   http://man7.org/linux/man-pages/man3/malloc.3.html
+             *
+             * - As I read the implementation jemalloc's malloc() returns fully
+             *   normal 16 bytes memory region when its argument is 0.
+             *
+             * - As I read the implementation musl libc's malloc() returns
+             *   fully normal 32 bytes memory region when its argument is 0.
+             *
+             * - Other malloc implementations can also return non-NULL.
+             */
+            objspace_xfree(objspace, ptr, old_size);
+            return mem;
+        }
+        else {
+            /*
+             * It is dangerous to return NULL here, because that could lead to
+             * RCE.  Fallback to 1 byte instead of zero.
+             *
+             * https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11932
+             */
+            new_size = 1;
+        }
     }
 
 #if CALC_EXACT_MALLOC_SIZE
-    new_size += sizeof(size_t);
-    ptr = (size_t *)ptr - 1;
-    old_size = ((size_t *)ptr)[0];
+    {
+        struct malloc_obj_info *info = (struct malloc_obj_info *)ptr - 1;
+        new_size += sizeof(struct malloc_obj_info);
+        ptr = info;
+        old_size = info->size;
+    }
 #endif
 
     old_size = objspace_malloc_size(objspace, ptr, old_size);
-    TRY_WITH_GC(mem = realloc(ptr, new_size));
+    TRY_WITH_GC(new_size, mem = realloc(ptr, new_size));
     new_size = objspace_malloc_size(objspace, mem, new_size);
 
 #if CALC_EXACT_MALLOC_SIZE
-    ((size_t *)mem)[0] = new_size;
-    mem = (size_t *)mem + 1;
+    {
+        struct malloc_obj_info *info = mem;
+        info->size = new_size;
+        mem = info + 1;
+    }
 #endif
 
     objspace_malloc_increase(objspace, mem, new_size, old_size, MEMOP_TYPE_REALLOC);
 
+    RB_DEBUG_COUNTER_INC(heap_xrealloc);
     return mem;
 }
 
+#if CALC_EXACT_MALLOC_SIZE && USE_GC_MALLOC_OBJ_INFO_DETAILS
+
+#define MALLOC_INFO_GEN_SIZE 100
+#define MALLOC_INFO_SIZE_SIZE 10
+static size_t malloc_info_gen_cnt[MALLOC_INFO_GEN_SIZE];
+static size_t malloc_info_gen_size[MALLOC_INFO_GEN_SIZE];
+static size_t malloc_info_size[MALLOC_INFO_SIZE_SIZE+1];
+static st_table *malloc_info_file_table;
+
+static int
+mmalloc_info_file_i(st_data_t key, st_data_t val, st_data_t dmy)
+{
+    const char *file = (void *)key;
+    const size_t *data = (void *)val;
+
+    fprintf(stderr, "%s\t%"PRIdSIZE"\t%"PRIdSIZE"\n", file, data[0], data[1]);
+
+    return ST_CONTINUE;
+}
+
+__attribute__((destructor))
+void
+rb_malloc_info_show_results(void)
+{
+    int i;
+
+    fprintf(stderr, "* malloc_info gen statistics\n");
+    for (i=0; i<MALLOC_INFO_GEN_SIZE; i++) {
+        if (i == MALLOC_INFO_GEN_SIZE-1) {
+            fprintf(stderr, "more\t%"PRIdSIZE"\t%"PRIdSIZE"\n", malloc_info_gen_cnt[i], malloc_info_gen_size[i]);
+        }
+        else {
+            fprintf(stderr, "%d\t%"PRIdSIZE"\t%"PRIdSIZE"\n", i, malloc_info_gen_cnt[i], malloc_info_gen_size[i]);
+        }
+    }
+
+    fprintf(stderr, "* malloc_info size statistics\n");
+    for (i=0; i<MALLOC_INFO_SIZE_SIZE; i++) {
+        int s = 16 << i;
+        fprintf(stderr, "%d\t%"PRIdSIZE"\n", s, malloc_info_size[i]);
+    }
+    fprintf(stderr, "more\t%"PRIdSIZE"\n", malloc_info_size[i]);
+
+    if (malloc_info_file_table) {
+        fprintf(stderr, "* malloc_info file statistics\n");
+        st_foreach(malloc_info_file_table, mmalloc_info_file_i, 0);
+    }
+}
+#else
+void
+rb_malloc_info_show_results(void)
+{
+}
+#endif
+
 static void
 objspace_xfree(rb_objspace_t *objspace, void *ptr, size_t old_size)
 {
+    if (!ptr) {
+        /*
+         * ISO/IEC 9899 says "If ptr is a null pointer, no action occurs" since
+         * its first version.  We would better follow.
+         */
+        return;
+    }
 #if CALC_EXACT_MALLOC_SIZE
-    ptr = ((size_t *)ptr) - 1;
-    old_size = ((size_t*)ptr)[0];
+    struct malloc_obj_info *info = (struct malloc_obj_info *)ptr - 1;
+    ptr = info;
+    old_size = info->size;
+
+#if USE_GC_MALLOC_OBJ_INFO_DETAILS
+    {
+        int gen = (int)(objspace->profile.count - info->gen);
+        int gen_index = gen >= MALLOC_INFO_GEN_SIZE ? MALLOC_INFO_GEN_SIZE-1 : gen;
+        int i;
+
+        malloc_info_gen_cnt[gen_index]++;
+        malloc_info_gen_size[gen_index] += info->size;
+
+        for (i=0; i<MALLOC_INFO_SIZE_SIZE; i++) {
+            size_t s = 16 << i;
+            if (info->size <= s) {
+                malloc_info_size[i]++;
+                goto found;
+            }
+        }
+        malloc_info_size[i]++;
+      found:;
+
+        {
+            st_data_t key = (st_data_t)info->file, d;
+            size_t *data;
+
+            if (malloc_info_file_table == NULL) {
+                malloc_info_file_table = st_init_numtable_with_size(1024);
+            }
+            if (st_lookup(malloc_info_file_table, key, &d)) {
+                /* hit */
+                data = (size_t *)d;
+            }
+            else {
+                data = malloc(xmalloc2_size(2, sizeof(size_t)));
+                if (data == NULL) rb_bug("objspace_xfree: can not allocate memory");
+                data[0] = data[1] = 0;
+                st_insert(malloc_info_file_table, key, (st_data_t)data);
+            }
+            data[0] ++;
+            data[1] += info->size;
+        };
+        if (0 && gen >= 2) {         /* verbose output */
+            if (info->file) {
+                fprintf(stderr, "free - size:%"PRIdSIZE", gen:%d, pos: %s:%"PRIdSIZE"\n",
+                        info->size, gen, info->file, info->line);
+            }
+            else {
+                fprintf(stderr, "free - size:%"PRIdSIZE", gen:%d\n",
+                        info->size, gen);
+            }
+        }
+    }
+#endif
 #endif
     old_size = objspace_malloc_size(objspace, ptr, old_size);
 
     free(ptr);
+    RB_DEBUG_COUNTER_INC(heap_xfree);
 
     objspace_malloc_increase(objspace, ptr, 0, old_size, MEMOP_TYPE_FREE);
 }
@@ -7868,44 +10826,42 @@ ruby_xmalloc0(size_t size)
 }
 
 void *
-ruby_xmalloc(size_t size)
+ruby_xmalloc_body(size_t size)
 {
-    return objspace_xmalloc(&rb_objspace, size);
+    if ((ssize_t)size < 0) {
+	negative_size_allocation_error("too large allocation size");
+    }
+    return ruby_xmalloc0(size);
 }
 
 void
 ruby_malloc_size_overflow(size_t count, size_t elsize)
 {
     rb_raise(rb_eArgError,
-	     "malloc: possible integer overflow (%"PRIdSIZE"*%"PRIdSIZE")",
+	     "malloc: possible integer overflow (%"PRIuSIZE"*%"PRIuSIZE")",
 	     count, elsize);
 }
 
 void *
-ruby_xmalloc2(size_t n, size_t size)
+ruby_xmalloc2_body(size_t n, size_t size)
 {
-    return objspace_xmalloc2(&rb_objspace, n, size);
+    return objspace_xmalloc0(&rb_objspace, xmalloc2_size(n, size));
 }
 
 static void *
-objspace_xcalloc(rb_objspace_t *objspace, size_t count, size_t elsize)
+objspace_xcalloc(rb_objspace_t *objspace, size_t size)
 {
     void *mem;
-    size_t size;
 
-    size = xmalloc2_size(count, elsize);
     size = objspace_malloc_prepare(objspace, size);
-
-    TRY_WITH_GC(mem = calloc(1, size));
-    size = objspace_malloc_size(objspace, mem, size);
-    objspace_malloc_increase(objspace, mem, size, 0, MEMOP_TYPE_MALLOC);
+    TRY_WITH_GC(size, mem = calloc1(size));
     return objspace_malloc_fixup(objspace, mem, size);
 }
 
 void *
-ruby_xcalloc(size_t n, size_t size)
+ruby_xcalloc_body(size_t n, size_t size)
 {
-    return objspace_xcalloc(&rb_objspace, n, size);
+    return objspace_xcalloc(&rb_objspace, xmalloc2_size(n, size));
 }
 
 #ifdef ruby_sized_xrealloc
@@ -7914,11 +10870,15 @@ ruby_xcalloc(size_t n, size_t size)
 void *
 ruby_sized_xrealloc(void *ptr, size_t new_size, size_t old_size)
 {
+    if ((ssize_t)new_size < 0) {
+	negative_size_allocation_error("too large allocation size");
+    }
+
     return objspace_xrealloc(&rb_objspace, ptr, new_size, old_size);
 }
 
 void *
-ruby_xrealloc(void *ptr, size_t new_size)
+ruby_xrealloc_body(void *ptr, size_t new_size)
 {
     return ruby_sized_xrealloc(ptr, new_size, 0);
 }
@@ -7929,15 +10889,12 @@ ruby_xrealloc(void *ptr, size_t new_size)
 void *
 ruby_sized_xrealloc2(void *ptr, size_t n, size_t size, size_t old_n)
 {
-    size_t len = size * n;
-    if (n != 0 && size != len / n) {
-	rb_raise(rb_eArgError, "realloc: possible integer overflow");
-    }
+    size_t len = xmalloc2_size(n, size);
     return objspace_xrealloc(&rb_objspace, ptr, len, old_n * size);
 }
 
 void *
-ruby_xrealloc2(void *ptr, size_t n, size_t size)
+ruby_xrealloc2_body(void *ptr, size_t n, size_t size)
 {
     return ruby_sized_xrealloc2(ptr, n, size, 0);
 }
@@ -7959,6 +10916,34 @@ ruby_xfree(void *x)
     ruby_sized_xfree(x, 0);
 }
 
+void *
+rb_xmalloc_mul_add(size_t x, size_t y, size_t z) /* x * y + z */
+{
+    size_t w = size_mul_add_or_raise(x, y, z, rb_eArgError);
+    return ruby_xmalloc(w);
+}
+
+void *
+rb_xrealloc_mul_add(const void *p, size_t x, size_t y, size_t z) /* x * y + z */
+{
+    size_t w = size_mul_add_or_raise(x, y, z, rb_eArgError);
+    return ruby_xrealloc((void *)p, w);
+}
+
+void *
+rb_xmalloc_mul_add_mul(size_t x, size_t y, size_t z, size_t w) /* x * y + z * w */
+{
+    size_t u = size_mul_add_mul_or_raise(x, y, z, w, rb_eArgError);
+    return ruby_xmalloc(u);
+}
+
+void *
+rb_xcalloc_mul_add_mul(size_t x, size_t y, size_t z, size_t w) /* x * y + z * w */
+{
+    size_t u = size_mul_add_mul_or_raise(x, y, z, w, rb_eArgError);
+    return ruby_xcalloc(u, 1);
+}
+
 /* Mimic ruby_xmalloc, but need not rb_objspace.
  * should return pointer suitable for ruby_xfree
  */
@@ -7967,13 +10952,25 @@ ruby_mimmalloc(size_t size)
 {
     void *mem;
 #if CALC_EXACT_MALLOC_SIZE
-    size += sizeof(size_t);
+    size += sizeof(struct malloc_obj_info);
 #endif
     mem = malloc(size);
 #if CALC_EXACT_MALLOC_SIZE
+    if (!mem) {
+        return NULL;
+    }
+    else
     /* set 0 for consistency of allocated_size/allocations */
-    ((size_t *)mem)[0] = 0;
-    mem = (size_t *)mem + 1;
+    {
+        struct malloc_obj_info *info = mem;
+        info->size = 0;
+#if USE_GC_MALLOC_OBJ_INFO_DETAILS
+        info->gen = 0;
+        info->file = NULL;
+        info->line = 0;
+#endif
+        mem = info + 1;
+    }
 #endif
     return mem;
 }
@@ -7981,24 +10978,28 @@ ruby_mimmalloc(size_t size)
 void
 ruby_mimfree(void *ptr)
 {
-    size_t *mem = (size_t *)ptr;
 #if CALC_EXACT_MALLOC_SIZE
-    mem = mem - 1;
+    struct malloc_obj_info *info = (struct malloc_obj_info *)ptr - 1;
+    ptr = info;
 #endif
-    free(mem);
+    free(ptr);
 }
 
 void *
 rb_alloc_tmp_buffer_with_count(volatile VALUE *store, size_t size, size_t cnt)
 {
-    NODE *s;
     void *ptr;
+    VALUE imemo;
+    rb_imemo_tmpbuf_t *tmpbuf;
 
-    s = rb_node_newnode(NODE_ALLOCA, 0, 0, 0);
+    /* Keep the order; allocate an empty imemo first then xmalloc, to
+     * get rid of potential memory leak */
+    imemo = rb_imemo_tmpbuf_auto_free_maybe_mark_buffer(NULL, 0);
+    *store = imemo;
     ptr = ruby_xmalloc0(size);
-    s->u1.value = (VALUE)ptr;
-    s->u3.cnt = cnt;
-    *store = (VALUE)s;
+    tmpbuf = (rb_imemo_tmpbuf_t *)imemo;
+    tmpbuf->ptr = ptr;
+    tmpbuf->cnt = cnt;
     return ptr;
 }
 
@@ -8017,10 +11018,10 @@ rb_alloc_tmp_buffer(volatile VALUE *store, long len)
 void
 rb_free_tmp_buffer(volatile VALUE *store)
 {
-    VALUE s = ATOMIC_VALUE_EXCHANGE(*store, 0);
+    rb_imemo_tmpbuf_t *s = (rb_imemo_tmpbuf_t*)ATOMIC_VALUE_EXCHANGE(*store, 0);
     if (s) {
-	void *ptr = ATOMIC_PTR_EXCHANGE(RNODE(s)->u1.node, 0);
-	RNODE(s)->u3.cnt = 0;
+	void *ptr = ATOMIC_PTR_EXCHANGE(s->ptr, 0);
+	s->cnt = 0;
 	ruby_xfree(ptr);
     }
 }
@@ -8057,6 +11058,18 @@ gc_malloc_allocations(VALUE self)
 }
 #endif
 
+void
+rb_gc_adjust_memory_usage(ssize_t diff)
+{
+    rb_objspace_t *objspace = &rb_objspace;
+    if (diff > 0) {
+	objspace_malloc_increase(objspace, 0, diff, 0, MEMOP_TYPE_REALLOC);
+    }
+    else if (diff < 0) {
+	objspace_malloc_increase(objspace, 0, 0, -diff, MEMOP_TYPE_REALLOC);
+    }
+}
+
 /*
   ------------------------------ WeakMap ------------------------------
 */
@@ -8081,13 +11094,22 @@ wmap_mark_map(st_data_t key, st_data_t val, st_data_t arg)
 #endif
 
 static void
+wmap_compact(void *ptr)
+{
+    struct weakmap *w = ptr;
+    if (w->wmap2obj) rb_gc_update_tbl_refs(w->wmap2obj);
+    if (w->obj2wmap) rb_gc_update_tbl_refs(w->obj2wmap);
+    w->final = rb_gc_location(w->final);
+}
+
+static void
 wmap_mark(void *ptr)
 {
     struct weakmap *w = ptr;
 #if WMAP_DELETE_DEAD_OBJECT_IN_MARK
     if (w->obj2wmap) st_foreach(w->obj2wmap, wmap_mark_map, (st_data_t)&rb_objspace);
 #endif
-    rb_gc_mark(w->final);
+    rb_gc_mark_movable(w->final);
 }
 
 static int
@@ -8133,22 +11155,45 @@ static const rb_data_type_t weakmap_type = {
 	wmap_mark,
 	wmap_free,
 	wmap_memsize,
+        wmap_compact,
     },
     0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
+static VALUE wmap_finalize(RB_BLOCK_CALL_FUNC_ARGLIST(objid, self));
+
 static VALUE
 wmap_allocate(VALUE klass)
 {
     struct weakmap *w;
     VALUE obj = TypedData_Make_Struct(klass, struct weakmap, &weakmap_type, w);
-    w->obj2wmap = st_init_numtable();
-    w->wmap2obj = st_init_numtable();
-    w->final = rb_obj_method(obj, ID2SYM(rb_intern("finalize")));
+    w->obj2wmap = rb_init_identtable();
+    w->wmap2obj = rb_init_identtable();
+    w->final = rb_func_lambda_new(wmap_finalize, obj, 1, 1);
     return obj;
 }
 
 static int
+wmap_live_p(rb_objspace_t *objspace, VALUE obj)
+{
+    if (SPECIAL_CONST_P(obj)) return TRUE;
+    if (is_pointer_to_heap(objspace, (void *)obj)) {
+        void *poisoned = asan_unpoison_object_temporary(obj);
+
+        enum ruby_value_type t = BUILTIN_TYPE(obj);
+        int ret = (!(t == T_NONE || t >= T_FIXNUM || t == T_ICLASS) &&
+                   is_live_object(objspace, obj));
+
+        if (poisoned) {
+            asan_poison_object(obj);
+        }
+
+        return ret;
+    }
+    return TRUE;
+}
+
+static int
 wmap_final_func(st_data_t *key, st_data_t *value, st_data_t arg, int existing)
 {
     VALUE wmap, *ptr, size, i, j;
@@ -8164,15 +11209,16 @@ wmap_final_func(st_data_t *key, st_data_t *value, st_data_t arg, int existing)
 	return ST_DELETE;
     }
     if (j < i) {
-	ptr = ruby_sized_xrealloc2(ptr, j + 1, sizeof(VALUE), i);
+        SIZED_REALLOC_N(ptr, VALUE, j + 1, i);
 	ptr[0] = j;
 	*value = (st_data_t)ptr;
     }
     return ST_CONTINUE;
 }
 
+/* :nodoc: */
 static VALUE
-wmap_finalize(VALUE self, VALUE objid)
+wmap_finalize(RB_BLOCK_CALL_FUNC_ARGLIST(objid, self))
 {
     st_data_t orig, wmap, data;
     VALUE obj, *rids, i, size;
@@ -8180,7 +11226,9 @@ wmap_finalize(VALUE self, VALUE objid)
 
     TypedData_Get_Struct(self, struct weakmap, &weakmap_type, w);
     /* Get reference from object id. */
-    obj = obj_id_to_ref(objid);
+    if ((obj = id2ref_obj_tbl(&rb_objspace, objid)) == Qundef) {
+        rb_bug("wmap_finalize: objid is not found.");
+    }
 
     /* obj is original referenced object and/or weak reference. */
     orig = (st_data_t)obj;
@@ -8207,10 +11255,26 @@ struct wmap_iter_arg {
     VALUE value;
 };
 
+static VALUE
+wmap_inspect_append(rb_objspace_t *objspace, VALUE str, VALUE obj)
+{
+    if (SPECIAL_CONST_P(obj)) {
+        return rb_str_append(str, rb_inspect(obj));
+    }
+    else if (wmap_live_p(objspace, obj)) {
+        return rb_str_append(str, rb_any_to_s(obj));
+    }
+    else {
+        return rb_str_catf(str, "#<collected:%p>", (void*)obj);
+    }
+}
+
 static int
 wmap_inspect_i(st_data_t key, st_data_t val, st_data_t arg)
 {
-    VALUE str = (VALUE)arg;
+    struct wmap_iter_arg *argp = (struct wmap_iter_arg *)arg;
+    rb_objspace_t *objspace = argp->objspace;
+    VALUE str = argp->value;
     VALUE k = (VALUE)key, v = (VALUE)val;
 
     if (RSTRING_PTR(str)[0] == '#') {
@@ -8220,13 +11284,9 @@ wmap_inspect_i(st_data_t key, st_data_t val, st_data_t arg)
 	rb_str_cat2(str, ": ");
 	RSTRING_PTR(str)[0] = '#';
     }
-    k = SPECIAL_CONST_P(k) ? rb_inspect(k) : rb_any_to_s(k);
-    rb_str_append(str, k);
+    wmap_inspect_append(objspace, str, k);
     rb_str_cat2(str, " => ");
-    v = SPECIAL_CONST_P(v) ? rb_inspect(v) : rb_any_to_s(v);
-    rb_str_append(str, v);
-    OBJ_INFECT(str, k);
-    OBJ_INFECT(str, v);
+    wmap_inspect_append(objspace, str, v);
 
     return ST_CONTINUE;
 }
@@ -8237,11 +11297,14 @@ wmap_inspect(VALUE self)
     VALUE str;
     VALUE c = rb_class_name(CLASS_OF(self));
     struct weakmap *w;
+    struct wmap_iter_arg args;
 
     TypedData_Get_Struct(self, struct weakmap, &weakmap_type, w);
     str = rb_sprintf("-<%"PRIsVALUE":%p", c, (void *)self);
     if (w->wmap2obj) {
-	st_foreach(w->wmap2obj, wmap_inspect_i, str);
+	args.objspace = &rb_objspace;
+	args.value = str;
+	st_foreach(w->wmap2obj, wmap_inspect_i, (st_data_t)&args);
     }
     RSTRING_PTR(str)[0] = '#';
     rb_str_cat2(str, ">");
@@ -8253,7 +11316,7 @@ wmap_each_i(st_data_t key, st_data_t val, st_data_t arg)
 {
     rb_objspace_t *objspace = (rb_objspace_t *)arg;
     VALUE obj = (VALUE)val;
-    if (is_id_value(objspace, obj) && is_live_object(objspace, obj)) {
+    if (wmap_live_p(objspace, obj)) {
 	rb_yield_values(2, (VALUE)key, obj);
     }
     return ST_CONTINUE;
@@ -8276,7 +11339,7 @@ wmap_each_key_i(st_data_t key, st_data_t val, st_data_t arg)
 {
     rb_objspace_t *objspace = (rb_objspace_t *)arg;
     VALUE obj = (VALUE)val;
-    if (is_id_value(objspace, obj) && is_live_object(objspace, obj)) {
+    if (wmap_live_p(objspace, obj)) {
 	rb_yield((VALUE)key);
     }
     return ST_CONTINUE;
@@ -8299,7 +11362,7 @@ wmap_each_value_i(st_data_t key, st_data_t val, st_data_t arg)
 {
     rb_objspace_t *objspace = (rb_objspace_t *)arg;
     VALUE obj = (VALUE)val;
-    if (is_id_value(objspace, obj) && is_live_object(objspace, obj)) {
+    if (wmap_live_p(objspace, obj)) {
 	rb_yield(obj);
     }
     return ST_CONTINUE;
@@ -8324,7 +11387,7 @@ wmap_keys_i(st_data_t key, st_data_t val, st_data_t arg)
     rb_objspace_t *objspace = argp->objspace;
     VALUE ary = argp->value;
     VALUE obj = (VALUE)val;
-    if (is_id_value(objspace, obj) && is_live_object(objspace, obj)) {
+    if (wmap_live_p(objspace, obj)) {
 	rb_ary_push(ary, (VALUE)key);
     }
     return ST_CONTINUE;
@@ -8351,7 +11414,7 @@ wmap_values_i(st_data_t key, st_data_t val, st_data_t arg)
     rb_objspace_t *objspace = argp->objspace;
     VALUE ary = argp->value;
     VALUE obj = (VALUE)val;
-    if (is_id_value(objspace, obj) && is_live_object(objspace, obj)) {
+    if (wmap_live_p(objspace, obj)) {
 	rb_ary_push(ary, obj);
     }
     return ST_CONTINUE;
@@ -8378,12 +11441,12 @@ wmap_aset_update(st_data_t *key, st_data_t *val, st_data_t arg, int existing)
     if (existing) {
 	size = (ptr = optr = (VALUE *)*val)[0];
 	++size;
-	ptr = ruby_sized_xrealloc2(ptr, size + 1, sizeof(VALUE), size);
+        SIZED_REALLOC_N(ptr, VALUE, size + 1, size);
     }
     else {
 	optr = 0;
 	size = 1;
-	ptr = ruby_xmalloc2(2, sizeof(VALUE));
+	ptr = ruby_xmalloc0(2 * sizeof(VALUE));
     }
     ptr[0] = size;
     ptr[size] = (VALUE)arg;
@@ -8394,23 +11457,26 @@ wmap_aset_update(st_data_t *key, st_data_t *val, st_data_t arg, int existing)
 
 /* Creates a weak reference from the given key to the given value */
 static VALUE
-wmap_aset(VALUE self, VALUE wmap, VALUE orig)
+wmap_aset(VALUE self, VALUE key, VALUE value)
 {
     struct weakmap *w;
 
     TypedData_Get_Struct(self, struct weakmap, &weakmap_type, w);
-    should_be_finalizable(orig);
-    should_be_finalizable(wmap);
-    define_final0(orig, w->final);
-    define_final0(wmap, w->final);
-    st_update(w->obj2wmap, (st_data_t)orig, wmap_aset_update, wmap);
-    st_insert(w->wmap2obj, (st_data_t)wmap, (st_data_t)orig);
-    return nonspecial_obj_id(orig);
+    if (FL_ABLE(value)) {
+        define_final0(value, w->final);
+    }
+    if (FL_ABLE(key)) {
+        define_final0(key, w->final);
+    }
+
+    st_update(w->obj2wmap, (st_data_t)value, wmap_aset_update, key);
+    st_insert(w->wmap2obj, (st_data_t)key, (st_data_t)value);
+    return nonspecial_obj_id(value);
 }
 
 /* Retrieves a weakly referenced object with the given key */
 static VALUE
-wmap_aref(VALUE self, VALUE wmap)
+wmap_lookup(VALUE self, VALUE key)
 {
     st_data_t data;
     VALUE obj;
@@ -8418,20 +11484,28 @@ wmap_aref(VALUE self, VALUE wmap)
     rb_objspace_t *objspace = &rb_objspace;
 
     TypedData_Get_Struct(self, struct weakmap, &weakmap_type, w);
-    if (!st_lookup(w->wmap2obj, (st_data_t)wmap, &data)) return Qnil;
+    if (!st_lookup(w->wmap2obj, (st_data_t)key, &data)) return Qundef;
     obj = (VALUE)data;
-    if (!is_id_value(objspace, obj)) return Qnil;
-    if (!is_live_object(objspace, obj)) return Qnil;
+    if (!wmap_live_p(objspace, obj)) return Qundef;
     return obj;
 }
 
+/* Retrieves a weakly referenced object with the given key */
+static VALUE
+wmap_aref(VALUE self, VALUE key)
+{
+    VALUE obj = wmap_lookup(self, key);
+    return obj != Qundef ? obj : Qnil;
+}
+
 /* Returns +true+ if +key+ is registered */
 static VALUE
 wmap_has_key(VALUE self, VALUE key)
 {
-    return NIL_P(wmap_aref(self, key)) ? Qfalse : Qtrue;
+    return wmap_lookup(self, key) == Qundef ? Qfalse : Qtrue;
 }
 
+/* Returns the number of referenced objects */
 static VALUE
 wmap_size(VALUE self)
 {
@@ -8520,12 +11594,12 @@ gc_prof_setup_new_record(rb_objspace_t *objspace, int reason)
 
 	if (!objspace->profile.records) {
 	    objspace->profile.size = GC_PROFILE_RECORD_DEFAULT_SIZE;
-	    objspace->profile.records = malloc(sizeof(gc_profile_record) * objspace->profile.size);
+	    objspace->profile.records = malloc(xmalloc2_size(sizeof(gc_profile_record), objspace->profile.size));
 	}
 	if (index >= objspace->profile.size) {
 	    void *ptr;
 	    objspace->profile.size += 1000;
-	    ptr = realloc(objspace->profile.records, sizeof(gc_profile_record) * objspace->profile.size);
+	    ptr = realloc(objspace->profile.records, xmalloc2_size(sizeof(gc_profile_record), objspace->profile.size));
 	    if (!ptr) rb_memerror();
 	    objspace->profile.records = ptr;
 	}
@@ -8540,7 +11614,7 @@ gc_prof_setup_new_record(rb_objspace_t *objspace, int reason)
 #if MALLOC_ALLOCATED_SIZE
 	record->allocated_size = malloc_allocated_size;
 #endif
-#if GC_PROFILE_DETAIL_MEMORY
+#if GC_PROFILE_MORE_DETAIL && GC_PROFILE_DETAIL_MEMORY
 #ifdef RUSAGE_SELF
 	{
 	    struct rusage usage;
@@ -8695,19 +11769,17 @@ gc_prof_set_heap_info(rb_objspace_t *objspace)
  */
 
 static VALUE
-gc_profile_clear(void)
+gc_profile_clear(VALUE _)
 {
     rb_objspace_t *objspace = &rb_objspace;
-    if (GC_PROFILE_RECORD_DEFAULT_SIZE * 2 < objspace->profile.size) {
-        objspace->profile.size = GC_PROFILE_RECORD_DEFAULT_SIZE * 2;
-        objspace->profile.records = realloc(objspace->profile.records, sizeof(gc_profile_record) * objspace->profile.size);
-        if (!objspace->profile.records) {
-            rb_memerror();
-        }
-    }
-    MEMZERO(objspace->profile.records, gc_profile_record, objspace->profile.size);
+    void *p = objspace->profile.records;
+    objspace->profile.records = NULL;
+    objspace->profile.size = 0;
     objspace->profile.next_index = 0;
     objspace->profile.current_record = 0;
+    if (p) {
+        free(p);
+    }
     return Qnil;
 }
 
@@ -8762,7 +11834,7 @@ gc_profile_clear(void)
  */
 
 static VALUE
-gc_profile_record_get(void)
+gc_profile_record_get(VALUE _)
 {
     VALUE prof;
     VALUE gc_profile = rb_ary_new();
@@ -8783,6 +11855,7 @@ gc_profile_record_get(void)
         rb_hash_aset(prof, ID2SYM(rb_intern("HEAP_USE_SIZE")), SIZET2NUM(record->heap_use_size));
         rb_hash_aset(prof, ID2SYM(rb_intern("HEAP_TOTAL_SIZE")), SIZET2NUM(record->heap_total_size));
         rb_hash_aset(prof, ID2SYM(rb_intern("HEAP_TOTAL_OBJECTS")), SIZET2NUM(record->heap_total_objects));
+        rb_hash_aset(prof, ID2SYM(rb_intern("MOVED_OBJECTS")), SIZET2NUM(record->moved_objects));
         rb_hash_aset(prof, ID2SYM(rb_intern("GC_IS_MARKED")), Qtrue);
 #if GC_PROFILE_MORE_DETAIL
         rb_hash_aset(prof, ID2SYM(rb_intern("GC_MARK_TIME")), DBL2NUM(record->gc_mark_time));
@@ -8833,8 +11906,6 @@ gc_profile_dump_major_reason(int flags, char *buff)
 	C(NOFREE, N);
 	C(OLDGEN, O);
 	C(SHADY,  S);
-	C(RESCAN, R);
-	C(STRESS, T);
 #if RGENGC_ESTIMATE_OLDMALLOC
 	C(OLDMALLOC, M);
 #endif
@@ -8862,13 +11933,13 @@ gc_profile_dump_on(VALUE out, VALUE (*append)(VALUE, VALUE))
 
 	for (i = 0; i < count; i++) {
 	    record = &objspace->profile.records[i];
-	    append(out, rb_sprintf("%5"PRIdSIZE" %19.3f %20"PRIuSIZE" %20"PRIuSIZE" %20"PRIuSIZE" %30.20f\n",
+	    append(out, rb_sprintf("%5"PRIuSIZE" %19.3f %20"PRIuSIZE" %20"PRIuSIZE" %20"PRIuSIZE" %30.20f\n",
 				   i+1, record->gc_invoke_time, record->heap_use_size,
 				   record->heap_total_size, record->heap_total_objects, record->gc_time*1000));
 	}
 
 #if GC_PROFILE_MORE_DETAIL
-	append(out, rb_str_new_cstr("\n\n" \
+        const char *str = "\n\n" \
 				    "More detail.\n" \
 				    "Prepare Time = Previously GC's rest sweep time\n"
 				    "Index Flags          Allocate Inc.  Allocate Limit"
@@ -8882,11 +11953,12 @@ gc_profile_dump_on(VALUE out, VALUE (*append)(VALUE, VALUE))
 #if GC_PROFILE_DETAIL_MEMORY
 				    " MaxRSS(KB) MinorFLT MajorFLT"
 #endif
-				    "\n"));
+                                    "\n";
+        append(out, rb_str_new_cstr(str));
 
 	for (i = 0; i < count; i++) {
 	    record = &objspace->profile.records[i];
-	    append(out, rb_sprintf("%5"PRIdSIZE" %4s/%c/%6s%c %13"PRIuSIZE" %15"PRIuSIZE
+	    append(out, rb_sprintf("%5"PRIuSIZE" %4s/%c/%6s%c %13"PRIuSIZE" %15"PRIuSIZE
 #if CALC_EXACT_MALLOC_SIZE
 				   " %15"PRIuSIZE
 #endif
@@ -8951,11 +12023,11 @@ gc_profile_dump_on(VALUE out, VALUE (*append)(VALUE, VALUE))
  */
 
 static VALUE
-gc_profile_result(void)
+gc_profile_result(VALUE _)
 {
-	VALUE str = rb_str_buf_new(0);
-	gc_profile_dump_on(str, rb_str_buf_append);
-	return str;
+    VALUE str = rb_str_buf_new(0);
+    gc_profile_dump_on(str, rb_str_buf_append);
+    return str;
 }
 
 /*
@@ -8972,12 +12044,7 @@ gc_profile_report(int argc, VALUE *argv, VALUE self)
 {
     VALUE out;
 
-    if (argc == 0) {
-	out = rb_stdout;
-    }
-    else {
-	rb_scan_args(argc, argv, "01", &out);
-    }
+    out = (!rb_check_arity(argc, 0, 1) ? rb_stdout : argv[0]);
     gc_profile_dump_on(out, rb_io_write);
 
     return Qnil;
@@ -9030,7 +12097,7 @@ gc_profile_enable_get(VALUE self)
  */
 
 static VALUE
-gc_profile_enable(void)
+gc_profile_enable(VALUE _)
 {
     rb_objspace_t *objspace = &rb_objspace;
     objspace->profile.run = TRUE;
@@ -9047,7 +12114,7 @@ gc_profile_enable(void)
  */
 
 static VALUE
-gc_profile_disable(void)
+gc_profile_disable(VALUE _)
 {
     rb_objspace_t *objspace = &rb_objspace;
 
@@ -9087,8 +12154,8 @@ type_name(int type, VALUE obj)
 	    TYPE_NAME(T_FIXNUM);
 	    TYPE_NAME(T_UNDEF);
 	    TYPE_NAME(T_IMEMO);
-	    TYPE_NAME(T_NODE);
 	    TYPE_NAME(T_ICLASS);
+            TYPE_NAME(T_MOVED);
 	    TYPE_NAME(T_ZOMBIE);
       case T_DATA:
 	if (obj && rb_objspace_data_type_name(obj)) {
@@ -9106,8 +12173,8 @@ obj_type_name(VALUE obj)
     return type_name(TYPE(obj), obj);
 }
 
-static const char *
-method_type_name(rb_method_type_t type)
+const char *
+rb_method_type_name(rb_method_type_t type)
 {
     switch (type) {
       case VM_METHOD_TYPE_ISEQ:           return "iseq";
@@ -9123,132 +12190,268 @@ method_type_name(rb_method_type_t type)
       case VM_METHOD_TYPE_UNDEF:          return "undef";
       case VM_METHOD_TYPE_NOTIMPLEMENTED: return "notimplemented";
     }
-    rb_bug("method_type_name: unreachable (type: %d)", type);
+    rb_bug("rb_method_type_name: unreachable (type: %d)", type);
 }
 
 /* from array.c */
 # define ARY_SHARED_P(ary) \
-    (assert(!FL_TEST((ary), ELTS_SHARED) || !FL_TEST((ary), RARRAY_EMBED_FLAG)), \
+    (GC_ASSERT(!FL_TEST((ary), ELTS_SHARED) || !FL_TEST((ary), RARRAY_EMBED_FLAG)), \
      FL_TEST((ary),ELTS_SHARED)!=0)
 # define ARY_EMBED_P(ary) \
-    (assert(!FL_TEST((ary), ELTS_SHARED) || !FL_TEST((ary), RARRAY_EMBED_FLAG)), \
+    (GC_ASSERT(!FL_TEST((ary), ELTS_SHARED) || !FL_TEST((ary), RARRAY_EMBED_FLAG)), \
      FL_TEST((ary), RARRAY_EMBED_FLAG)!=0)
 
+static void
+rb_raw_iseq_info(char *buff, const int buff_size, const rb_iseq_t *iseq)
+{
+    if (buff_size > 0 && iseq->body && iseq->body->location.label && !RB_TYPE_P(iseq->body->location.pathobj, T_MOVED)) {
+	VALUE path = rb_iseq_path(iseq);
+	VALUE n = iseq->body->location.first_lineno;
+        snprintf(buff, buff_size, " %s@%s:%d",
+		 RSTRING_PTR(iseq->body->location.label),
+		 RSTRING_PTR(path),
+		 n ? FIX2INT(n) : 0 );
+    }
+}
+
+bool rb_ractor_p(VALUE rv);
+
+static int
+str_len_no_raise(VALUE str)
+{
+    long len = RSTRING_LEN(str);
+    if (len < 0) return 0;
+    if (len > INT_MAX) return INT_MAX;
+    return (int)len;
+}
+
 const char *
 rb_raw_obj_info(char *buff, const int buff_size, VALUE obj)
 {
+    int pos = 0;
+    void *poisoned = asan_poisoned_object_p(obj);
+    asan_unpoison_object(obj, false);
+
+#define BUFF_ARGS buff + pos, buff_size - pos
+#define APPENDF(f) if ((pos += snprintf f) >= buff_size) goto end
     if (SPECIAL_CONST_P(obj)) {
-	snprintf(buff, buff_size, "%s", obj_type_name(obj));
+        APPENDF((BUFF_ARGS, "%s", obj_type_name(obj)));
+
+        if (FIXNUM_P(obj)) {
+            APPENDF((BUFF_ARGS, " %ld", FIX2LONG(obj)));
+        }
+        else if (SYMBOL_P(obj)) {
+            APPENDF((BUFF_ARGS, " %s", rb_id2name(SYM2ID(obj))));
+        }
     }
     else {
 #define TF(c) ((c) != 0 ? "true" : "false")
 #define C(c, s) ((c) != 0 ? (s) : " ")
 	const int type = BUILTIN_TYPE(obj);
-#if USE_RGENGC
 	const int age = RVALUE_FLAGS_AGE(RBASIC(obj)->flags);
 
-	snprintf(buff, buff_size, "%p [%d%s%s%s%s] %s",
-		 (void *)obj, age,
-		 C(RVALUE_UNCOLLECTIBLE_BITMAP(obj),  "L"),
-		 C(RVALUE_MARK_BITMAP(obj),           "M"),
-		 C(RVALUE_MARKING_BITMAP(obj),        "R"),
-		 C(RVALUE_WB_UNPROTECTED_BITMAP(obj), "U"),
-		 obj_type_name(obj));
-#else
-	snprintf(buff, buff_size, "%p [%s] %s",
-		 (void *)obj,
-		 C(RVALUE_MARK_BITMAP(obj),           "M"),
-		 obj_type_name(obj));
-#endif
+        if (is_pointer_to_heap(&rb_objspace, (void *)obj)) {
+            APPENDF((BUFF_ARGS, "%p [%d%s%s%s%s%s] %s ",
+                     (void *)obj, age,
+                     C(RVALUE_UNCOLLECTIBLE_BITMAP(obj),  "L"),
+                     C(RVALUE_MARK_BITMAP(obj),           "M"),
+                     C(RVALUE_PIN_BITMAP(obj),            "P"),
+                     C(RVALUE_MARKING_BITMAP(obj),        "R"),
+                     C(RVALUE_WB_UNPROTECTED_BITMAP(obj), "U"),
+                     obj_type_name(obj)));
+        }
+        else {
+            /* fake */
+            APPENDF((BUFF_ARGS, "%p [%dXXXX] %s",
+                     (void *)obj, age,
+                     obj_type_name(obj)));
+        }
 
 	if (internal_object_p(obj)) {
 	    /* ignore */
 	}
 	else if (RBASIC(obj)->klass == 0) {
-	    snprintf(buff, buff_size, "%s (temporary internal)", buff);
+            APPENDF((BUFF_ARGS, "(temporary internal)"));
 	}
 	else {
-	    VALUE class_path = rb_class_path_cached(RBASIC(obj)->klass);
+            if (RTEST(RBASIC(obj)->klass)) {
+            VALUE class_path = rb_class_path_cached(RBASIC(obj)->klass);
 	    if (!NIL_P(class_path)) {
-		snprintf(buff, buff_size, "%s (%s)", buff, RSTRING_PTR(class_path));
+                APPENDF((BUFF_ARGS, "(%s)", RSTRING_PTR(class_path)));
 	    }
+            }
 	}
 
 #if GC_DEBUG
-	snprintf(buff, buff_size, "%s @%s:%d", buff, RANY(obj)->file, RANY(obj)->line);
+        APPENDF((BUFF_ARGS, "@%s:%d", RANY(obj)->file, RANY(obj)->line));
 #endif
 
 	switch (type) {
 	  case T_NODE:
-	    snprintf(buff, buff_size, "%s (%s)", buff,
-		     ruby_node_name(nd_type(obj)));
+	    UNEXPECTED_NODE(rb_raw_obj_info);
 	    break;
 	  case T_ARRAY:
-	    snprintf(buff, buff_size, "%s [%s%s] len: %d", buff,
-		     C(ARY_EMBED_P(obj),  "E"),
-		     C(ARY_SHARED_P(obj), "S"),
-		     (int)RARRAY_LEN(obj));
+            if (FL_TEST(obj, ELTS_SHARED)) {
+                APPENDF((BUFF_ARGS, "shared -> %s",
+                         rb_obj_info(RARRAY(obj)->as.heap.aux.shared_root)));
+            }
+            else if (FL_TEST(obj, RARRAY_EMBED_FLAG)) {
+                APPENDF((BUFF_ARGS, "[%s%s] len: %ld (embed)",
+                         C(ARY_EMBED_P(obj),  "E"),
+                         C(ARY_SHARED_P(obj), "S"),
+                         RARRAY_LEN(obj)));
+            }
+            else {
+                APPENDF((BUFF_ARGS, "[%s%s%s] len: %ld, capa:%ld ptr:%p",
+                         C(ARY_EMBED_P(obj),  "E"),
+                         C(ARY_SHARED_P(obj), "S"),
+                         C(RARRAY_TRANSIENT_P(obj), "T"),
+                         RARRAY_LEN(obj),
+                         ARY_EMBED_P(obj) ? -1L : RARRAY(obj)->as.heap.aux.capa,
+                         (void *)RARRAY_CONST_PTR_TRANSIENT(obj)));
+            }
 	    break;
 	  case T_STRING: {
-	      snprintf(buff, buff_size, "%s %s", buff, RSTRING_PTR(obj));
-	      break;
-	  }
-	  case T_CLASS: {
-	      VALUE class_path = rb_class_path_cached(obj);
-	      if (!NIL_P(class_path)) {
-		  snprintf(buff, buff_size, "%s %s", buff, RSTRING_PTR(class_path));
-	      }
-	      break;
+            if (STR_SHARED_P(obj)) APPENDF((BUFF_ARGS, " [shared] "));
+            APPENDF((BUFF_ARGS, "%.*s", str_len_no_raise(obj), RSTRING_PTR(obj)));
+	    break;
 	  }
+          case T_SYMBOL: {
+              VALUE fstr = RSYMBOL(obj)->fstr;
+              ID id = RSYMBOL(obj)->id;
+              if (RB_TYPE_P(fstr, T_STRING)) {
+                  APPENDF((BUFF_ARGS, ":%s id:%d", RSTRING_PTR(fstr), (unsigned int)id));
+              }
+              else {
+                  APPENDF((BUFF_ARGS, "(%p) id:%d", (void *)fstr, (unsigned int)id));
+              }
+              break;
+          }
+          case T_MOVED: {
+            APPENDF((BUFF_ARGS, "-> %p", (void*)rb_gc_location(obj)));
+            break;
+          }
+          case T_HASH: {
+              APPENDF((BUFF_ARGS, "[%c%c] %"PRIdSIZE,
+                       RHASH_AR_TABLE_P(obj) ? 'A' : 'S',
+                       RHASH_TRANSIENT_P(obj) ? 'T' : ' ',
+                       RHASH_SIZE(obj)));
+              break;
+          }
+          case T_CLASS:
+          case T_MODULE:
+            {
+                VALUE class_path = rb_class_path_cached(obj);
+                if (!NIL_P(class_path)) {
+                    APPENDF((BUFF_ARGS, "%s", RSTRING_PTR(class_path)));
+                }
+                else {
+                    APPENDF((BUFF_ARGS, "(annon)"));
+                }
+                break;
+            }
+          case T_ICLASS:
+            {
+                VALUE class_path = rb_class_path_cached(RBASIC_CLASS(obj));
+                if (!NIL_P(class_path)) {
+                    APPENDF((BUFF_ARGS, "src:%s", RSTRING_PTR(class_path)));
+                }
+                break;
+            }
+          case T_OBJECT:
+            {
+                uint32_t len = ROBJECT_NUMIV(obj);
+
+                if (RANY(obj)->as.basic.flags & ROBJECT_EMBED) {
+                    APPENDF((BUFF_ARGS, "(embed) len:%d", len));
+                }
+                else {
+                    VALUE *ptr = ROBJECT_IVPTR(obj);
+                    APPENDF((BUFF_ARGS, "len:%d ptr:%p", len, (void *)ptr));
+                }
+            }
+            break;
 	  case T_DATA: {
-	      const char * const type_name = rb_objspace_data_type_name(obj);
-	      if (type_name) {
-		  snprintf(buff, buff_size, "%s %s", buff, type_name);
-	      }
-	      break;
+	    const struct rb_block *block;
+	    const rb_iseq_t *iseq;
+	    if (rb_obj_is_proc(obj) &&
+		(block = vm_proc_block(obj)) != NULL &&
+		(vm_block_type(block) == block_type_iseq) &&
+		(iseq = vm_block_iseq(block)) != NULL) {
+                rb_raw_iseq_info(BUFF_ARGS, iseq);
+	    }
+            else if (rb_ractor_p(obj)) {
+                rb_ractor_t *r = (void *)DATA_PTR(obj);
+                if (r) {
+                    APPENDF((BUFF_ARGS, "r:%d", r->pub.id));
+                }
+            }
+	    else {
+		const char * const type_name = rb_objspace_data_type_name(obj);
+		if (type_name) {
+                    APPENDF((BUFF_ARGS, "%s", type_name));
+		}
+	    }
+	    break;
 	  }
 	  case T_IMEMO: {
-	      const char *imemo_name;
-	      switch (imemo_type(obj)) {
-#define IMEMO_NAME(x) case imemo_##x: imemo_name = #x; break;
-		  IMEMO_NAME(none);
-		  IMEMO_NAME(cref);
-		  IMEMO_NAME(svar);
-		  IMEMO_NAME(throw_data);
-		  IMEMO_NAME(ifunc);
-		  IMEMO_NAME(memo);
-		  IMEMO_NAME(ment);
-		  IMEMO_NAME(iseq);
-		default: rb_bug("unknown IMEMO");
-#undef IMEMO_NAME
-	      }
-	      snprintf(buff, buff_size, "%s %s", buff, imemo_name);
+            APPENDF((BUFF_ARGS, "<%s> ", rb_imemo_name(imemo_type(obj))));
 
-	      switch (imemo_type(obj)) {
-		case imemo_ment: {
-		    const rb_method_entry_t *me = &RANY(obj)->as.imemo.ment;
-		    snprintf(buff, buff_size, "%s (called_id: %s, type: %s, alias: %d, owner: %s, defined_class: %s)", buff,
+	    switch (imemo_type(obj)) {
+	      case imemo_ment: {
+		const rb_method_entry_t *me = &RANY(obj)->as.imemo.ment;
+		if (me->def) {
+                    APPENDF((BUFF_ARGS, ":%s (%s%s%s%s) type:%s alias:%d owner:%p defined_class:%p",
 			     rb_id2name(me->called_id),
-			     method_type_name(me->def->type),
-			     me->def->alias_count,
-			     obj_info(me->owner),
-			     obj_info(me->defined_class));
-		    break;
+                             METHOD_ENTRY_VISI(me) == METHOD_VISI_PUBLIC ?  "pub" :
+                             METHOD_ENTRY_VISI(me) == METHOD_VISI_PRIVATE ? "pri" : "pro",
+                             METHOD_ENTRY_COMPLEMENTED(me) ? ",cmp" : "",
+                             METHOD_ENTRY_CACHED(me) ? ",cc" : "",
+                             METHOD_ENTRY_INVALIDATED(me) ? ",inv" : "",
+                             rb_method_type_name(me->def->type),
+                             me->def->alias_count,
+                             (void *)me->owner, // obj_info(me->owner),
+                             (void *)me->defined_class)); //obj_info(me->defined_class)));
+
+                    if (me->def->type == VM_METHOD_TYPE_ISEQ) {
+                        // APPENDF((BUFF_ARGS, " (iseq:%p)", (void *)me->def->body.iseq.iseqptr));
+                        APPENDF((BUFF_ARGS, " (iseq:%s)", obj_info((VALUE)me->def->body.iseq.iseqptr)));
+                    }
 		}
-		case imemo_iseq: {
-		    const rb_iseq_t *iseq = (const rb_iseq_t *)obj;
-
-		    if (iseq->body->location.label) {
-			snprintf(buff, buff_size, "%s %s@%s:%d", buff,
-				 RSTRING_PTR(iseq->body->location.label),
-				 RSTRING_PTR(iseq->body->location.path),
-				 FIX2INT(iseq->body->location.first_lineno));
-		    }
-		    break;
+		else {
+                    APPENDF((BUFF_ARGS, "%s", rb_id2name(me->called_id)));
 		}
-		default:
-		  break;
+		break;
+	      }
+	      case imemo_iseq: {
+		const rb_iseq_t *iseq = (const rb_iseq_t *)obj;
+                rb_raw_iseq_info(BUFF_ARGS, iseq);
+		break;
 	      }
+              case imemo_callinfo:
+                {
+                    const struct rb_callinfo *ci = (const struct rb_callinfo *)obj;
+                    APPENDF((BUFF_ARGS, "(mid:%s, flag:%x argc:%d, kwarg:%s)",
+                             rb_id2name(vm_ci_mid(ci)),
+                             vm_ci_flag(ci),
+                             vm_ci_argc(ci),
+                             vm_ci_kwarg(ci) ? "available" : "NULL"));
+                    break;
+                }
+              case imemo_callcache:
+                {
+                    const struct rb_callcache *cc = (const struct rb_callcache *)obj;
+                    VALUE class_path = cc->klass ? rb_class_path_cached(cc->klass) : Qnil;
+
+                    APPENDF((BUFF_ARGS, "(klass:%s, cme:%s (%p) call:%p",
+                             NIL_P(class_path) ? "??" : RSTRING_PTR(class_path),
+                             vm_cc_cme(cc) ? rb_id2name(vm_cc_cme(cc)->called_id) : "<NULL>",
+                             (void *)vm_cc_cme(cc), (void *)vm_cc_call(cc)));
+                    break;
+                }
+	      default:
+		break;
+	    }
 	  }
 	  default:
 	    break;
@@ -9256,7 +12459,14 @@ rb_raw_obj_info(char *buff, const int buff_size, VALUE obj)
 #undef TF
 #undef C
     }
+  end:
+    if (poisoned) {
+        asan_poison_object(obj);
+    }
+
     return buff;
+#undef APPENDF
+#undef BUFF_ARGS
 }
 
 #if RGENGC_OBJ_INFO
@@ -9285,15 +12495,10 @@ obj_info(VALUE obj)
 }
 #endif
 
-const char *
+MJIT_FUNC_EXPORTED const char *
 rb_obj_info(VALUE obj)
 {
-    if (!rb_special_const_p(obj)) {
-	return obj_info(obj);
-    }
-    else {
-	return obj_type_name(obj);
-    }
+    return obj_info(obj);
 }
 
 void
@@ -9303,6 +12508,13 @@ rb_obj_info_dump(VALUE obj)
     fprintf(stderr, "rb_obj_info_dump: %s\n", rb_raw_obj_info(buff, 0x100, obj));
 }
 
+MJIT_FUNC_EXPORTED void
+rb_obj_info_dump_loc(VALUE obj, const char *file, int line, const char *func)
+{
+    char buff[0x100];
+    fprintf(stderr, "<OBJ_INFO:%s@%s:%d> %s\n", func, file, line, rb_raw_obj_info(buff, 0x100, obj));
+}
+
 #if GC_DEBUG
 
 void
@@ -9312,6 +12524,12 @@ rb_gcdebug_print_obj_condition(VALUE obj)
 
     fprintf(stderr, "created at: %s:%d\n", RANY(obj)->file, RANY(obj)->line);
 
+    if (BUILTIN_TYPE(obj) == T_MOVED) {
+        fprintf(stderr, "moved?: true\n");
+    }
+    else {
+        fprintf(stderr, "moved?: false\n");
+    }
     if (is_pointer_to_heap(objspace, (void *)obj)) {
         fprintf(stderr, "pointer to heap?: true\n");
     }
@@ -9321,12 +12539,11 @@ rb_gcdebug_print_obj_condition(VALUE obj)
     }
 
     fprintf(stderr, "marked?      : %s\n", MARKED_IN_BITMAP(GET_HEAP_MARK_BITS(obj), obj) ? "true" : "false");
-#if USE_RGENGC
+    fprintf(stderr, "pinned?      : %s\n", MARKED_IN_BITMAP(GET_HEAP_PINNED_BITS(obj), obj) ? "true" : "false");
     fprintf(stderr, "age?         : %d\n", RVALUE_AGE(obj));
     fprintf(stderr, "old?         : %s\n", RVALUE_OLD_P(obj) ? "true" : "false");
     fprintf(stderr, "WB-protected?: %s\n", RVALUE_WB_UNPROTECTED(obj) ? "false" : "true");
     fprintf(stderr, "remembered?  : %s\n", RVALUE_REMEMBERED(obj) ? "true" : "false");
-#endif
 
     if (is_lazy_sweeping(heap_eden)) {
         fprintf(stderr, "lazy sweeping?: true\n");
@@ -9338,7 +12555,7 @@ rb_gcdebug_print_obj_condition(VALUE obj)
 }
 
 static VALUE
-gcdebug_sentinel(VALUE obj, VALUE name)
+gcdebug_sentinel(RB_BLOCK_CALL_FUNC_ARGLIST(obj, name))
 {
     fprintf(stderr, "WARNING: object %s(%p) is inadvertently collected\n", (char *)name, (void *)obj);
     return Qnil;
@@ -9353,6 +12570,13 @@ rb_gcdebug_sentinel(VALUE obj, const char *name)
 #endif /* GC_DEBUG */
 
 #if GC_DEBUG_STRESS_TO_CLASS
+/*
+ *  call-seq:
+ *    GC.add_stress_to_class(class[, ...])
+ *
+ *  Raises NoMemoryError when allocating an instance of the given classes.
+ *
+ */
 static VALUE
 rb_gcdebug_add_stress_to_class(int argc, VALUE *argv, VALUE self)
 {
@@ -9365,6 +12589,14 @@ rb_gcdebug_add_stress_to_class(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
+/*
+ *  call-seq:
+ *    GC.remove_stress_to_class(class[, ...])
+ *
+ *  No longer raises NoMemoryError when allocating an instance of the
+ *  given classes.
+ *
+ */
 static VALUE
 rb_gcdebug_remove_stress_to_class(int argc, VALUE *argv, VALUE self)
 {
@@ -9392,9 +12624,9 @@ rb_gcdebug_remove_stress_to_class(int argc, VALUE *argv, VALUE self)
  *
  *  ObjectSpace also provides support for object finalizers, procs that will be
  *  called when a specific object is about to be destroyed by garbage
- *  collection.
- *
- *     require 'objspace'
+ *  collection. See the documentation for
+ *  <code>ObjectSpace.define_finalizer</code> for important information on
+ *  how to use this method correctly.
  *
  *     a = "A"
  *     b = "B"
@@ -9402,6 +12634,9 @@ rb_gcdebug_remove_stress_to_class(int argc, VALUE *argv, VALUE self)
  *     ObjectSpace.define_finalizer(a, proc {|id| puts "Finalizer one on #{id}" })
  *     ObjectSpace.define_finalizer(b, proc {|id| puts "Finalizer two on #{id}" })
  *
+ *     a = nil
+ *     b = nil
+ *
  *  _produces:_
  *
  *     Finalizer two on 537763470
@@ -9436,16 +12671,7 @@ rb_gcdebug_remove_stress_to_class(int argc, VALUE *argv, VALUE self)
  *  See also GC.count, GC.malloc_allocated_size and GC.malloc_allocations
  */
 
-/*
- *  The GC module provides an interface to Ruby's mark and
- *  sweep garbage collection mechanism.
- *
- *  Some of the underlying methods are also available via the ObjectSpace
- *  module.
- *
- *  You may obtain information about the operation of the GC through
- *  GC::Profiler.
- */
+#include "gc.rbinc"
 
 void
 Init_GC(void)
@@ -9456,22 +12682,16 @@ Init_GC(void)
     VALUE gc_constants;
 
     rb_mGC = rb_define_module("GC");
-    rb_define_singleton_method(rb_mGC, "start", gc_start_internal, -1);
-    rb_define_singleton_method(rb_mGC, "enable", rb_gc_enable, 0);
-    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_m, 1);
-    rb_define_singleton_method(rb_mGC, "count", gc_count, 0);
-    rb_define_singleton_method(rb_mGC, "stat", gc_stat, -1);
-    rb_define_singleton_method(rb_mGC, "latest_gc_info", gc_latest_gc_info, -1);
-    rb_define_method(rb_mGC, "garbage_collect", gc_start_internal, -1);
 
     gc_constants = rb_hash_new();
+    rb_hash_aset(gc_constants, ID2SYM(rb_intern("DEBUG")), GC_DEBUG ? Qtrue : Qfalse);
     rb_hash_aset(gc_constants, ID2SYM(rb_intern("RVALUE_SIZE")), SIZET2NUM(sizeof(RVALUE)));
     rb_hash_aset(gc_constants, ID2SYM(rb_intern("HEAP_PAGE_OBJ_LIMIT")), SIZET2NUM(HEAP_PAGE_OBJ_LIMIT));
     rb_hash_aset(gc_constants, ID2SYM(rb_intern("HEAP_PAGE_BITMAP_SIZE")), SIZET2NUM(HEAP_PAGE_BITMAP_SIZE));
     rb_hash_aset(gc_constants, ID2SYM(rb_intern("HEAP_PAGE_BITMAP_PLANES")), SIZET2NUM(HEAP_PAGE_BITMAP_PLANES));
+    rb_hash_aset(gc_constants, ID2SYM(rb_intern("HEAP_PAGE_SIZE")), SIZET2NUM(HEAP_PAGE_SIZE));
     OBJ_FREEZE(gc_constants);
+    /* internal constants */
     rb_define_const(rb_mGC, "INTERNAL_CONSTANTS", gc_constants);
 
     rb_mProfiler = rb_define_module_under(rb_mGC, "Profiler");
@@ -9485,13 +12705,13 @@ Init_GC(void)
     rb_define_singleton_method(rb_mProfiler, "total_time", gc_profile_total_time, 0);
 
     rb_mObjSpace = rb_define_module("ObjectSpace");
+
     rb_define_module_function(rb_mObjSpace, "each_object", os_each_obj, -1);
-    rb_define_module_function(rb_mObjSpace, "garbage_collect", gc_start_internal, -1);
 
     rb_define_module_function(rb_mObjSpace, "define_finalizer", define_final, -1);
     rb_define_module_function(rb_mObjSpace, "undefine_finalizer", undefine_final, 1);
 
-    rb_define_module_function(rb_mObjSpace, "_id2ref", id2ref, 1);
+    rb_define_module_function(rb_mObjSpace, "_id2ref", os_id2ref, 1);
 
     rb_vm_register_special_exception(ruby_error_nomemory, rb_eNoMemError, "failed to allocate memory");
 
@@ -9517,12 +12737,12 @@ Init_GC(void)
 	rb_define_method(rb_cWeakMap, "values", wmap_values, 0);
 	rb_define_method(rb_cWeakMap, "size", wmap_size, 0);
 	rb_define_method(rb_cWeakMap, "length", wmap_size, 0);
-	rb_define_private_method(rb_cWeakMap, "finalize", wmap_finalize, 1);
 	rb_include_module(rb_cWeakMap, rb_mEnumerable);
     }
 
     /* internal methods */
-    rb_define_singleton_method(rb_mGC, "verify_internal_consistency", gc_verify_internal_consistency, 0);
+    rb_define_singleton_method(rb_mGC, "verify_internal_consistency", gc_verify_internal_consistency_m, 0);
+    rb_define_singleton_method(rb_mGC, "verify_transient_heap_internal_consistency", gc_verify_transient_heap_internal_consistency, 0);
 #if MALLOC_ALLOCATED_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);
@@ -9533,9 +12753,9 @@ Init_GC(void)
     rb_define_singleton_method(rb_mGC, "remove_stress_to_class", rb_gcdebug_remove_stress_to_class, -1);
 #endif
 
-    /* ::GC::OPTS, which shows GC build options */
     {
 	VALUE opts;
+	/* GC build options */
 	rb_define_const(rb_mGC, "OPTS", opts = rb_ary_new());
 #define OPT(o) if (o) rb_ary_push(opts, rb_fstring_lit(#o))
 	OPT(GC_DEBUG);
@@ -9554,3 +12774,69 @@ Init_GC(void)
 	OBJ_FREEZE(opts);
     }
 }
+
+#ifdef ruby_xmalloc
+#undef ruby_xmalloc
+#endif
+#ifdef ruby_xmalloc2
+#undef ruby_xmalloc2
+#endif
+#ifdef ruby_xcalloc
+#undef ruby_xcalloc
+#endif
+#ifdef ruby_xrealloc
+#undef ruby_xrealloc
+#endif
+#ifdef ruby_xrealloc2
+#undef ruby_xrealloc2
+#endif
+
+void *
+ruby_xmalloc(size_t size)
+{
+#if USE_GC_MALLOC_OBJ_INFO_DETAILS
+    ruby_malloc_info_file = __FILE__;
+    ruby_malloc_info_line = __LINE__;
+#endif
+    return ruby_xmalloc_body(size);
+}
+
+void *
+ruby_xmalloc2(size_t n, size_t size)
+{
+#if USE_GC_MALLOC_OBJ_INFO_DETAILS
+    ruby_malloc_info_file = __FILE__;
+    ruby_malloc_info_line = __LINE__;
+#endif
+    return ruby_xmalloc2_body(n, size);
+}
+
+void *
+ruby_xcalloc(size_t n, size_t size)
+{
+#if USE_GC_MALLOC_OBJ_INFO_DETAILS
+    ruby_malloc_info_file = __FILE__;
+    ruby_malloc_info_line = __LINE__;
+#endif
+    return ruby_xcalloc_body(n, size);
+}
+
+void *
+ruby_xrealloc(void *ptr, size_t new_size)
+{
+#if USE_GC_MALLOC_OBJ_INFO_DETAILS
+    ruby_malloc_info_file = __FILE__;
+    ruby_malloc_info_line = __LINE__;
+#endif
+    return ruby_xrealloc_body(ptr, new_size);
+}
+
+void *
+ruby_xrealloc2(void *ptr, size_t n, size_t new_size)
+{
+#if USE_GC_MALLOC_OBJ_INFO_DETAILS
+    ruby_malloc_info_file = __FILE__;
+    ruby_malloc_info_line = __LINE__;
+#endif
+    return ruby_xrealloc2_body(ptr, n, new_size);
+}
diff --git a/gc.h b/gc.h
index c723106137..5d113cafce 100644
--- a/gc.h
+++ b/gc.h
@@ -1,17 +1,28 @@
-
 #ifndef RUBY_GC_H
 #define RUBY_GC_H 1
+#include "ruby/ruby.h"
 
-#if defined(__x86_64__) && !defined(_ILP32) && defined(__GNUC__) && !defined(__native_client__)
+#if defined(__x86_64__) && !defined(_ILP32) && defined(__GNUC__)
 #define SET_MACHINE_STACK_END(p) __asm__ __volatile__ ("movq\t%%rsp, %0" : "=r" (*(p)))
-#elif defined(__i386) && defined(__GNUC__) && !defined(__native_client__)
+#elif defined(__i386) && defined(__GNUC__)
 #define SET_MACHINE_STACK_END(p) __asm__ __volatile__ ("movl\t%%esp, %0" : "=r" (*(p)))
+#elif defined(__powerpc64__) && defined(__GNUC__)
+#define SET_MACHINE_STACK_END(p) __asm__ __volatile__ ("mr\t%0, %%r1" : "=r" (*(p)))
+#elif defined(__aarch64__) && defined(__GNUC__)
+#define SET_MACHINE_STACK_END(p) __asm__ __volatile__ ("mov\t%0, sp" : "=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
 
+#define RB_GC_SAVE_MACHINE_CONTEXT(th)				\
+    do {							\
+	FLUSH_REGISTER_WINDOWS;					\
+	setjmp((th)->ec->machine.regs);				\
+	SET_MACHINE_STACK_END(&(th)->ec->machine.stack_end);	\
+    } while (0)
+
 /* for GC debug */
 
 #ifndef RUBY_MARK_FREE_DEBUG
@@ -57,6 +68,10 @@ rb_gc_debug_body(const char *mode, const char *msg, int st, void *ptr)
 #define RUBY_GC_INFO if(0)printf
 #endif
 
+#define RUBY_MARK_MOVABLE_UNLESS_NULL(ptr) do { \
+    VALUE markobj = (ptr); \
+    if (RTEST(markobj)) {rb_gc_mark_movable(markobj);} \
+} while (0)
 #define RUBY_MARK_UNLESS_NULL(ptr) do { \
     VALUE markobj = (ptr); \
     if (RTEST(markobj)) {rb_gc_mark(markobj);} \
@@ -77,6 +92,14 @@ int ruby_get_stack_grow_direction(volatile VALUE *addr);
 # define STACK_UPPER(x, a, b) (stack_growup_p(x) ? (a) : (b))
 #endif
 
+/*
+  STACK_GROW_DIR_DETECTION is used with STACK_DIR_UPPER.
+
+  On most normal systems, stacks grow from high address to lower address. In
+  this case, STACK_DIR_UPPER(a, b) will return (b), but on exotic systems where
+  the stack grows UP (from low address to high address), it will return (a).
+*/
+
 #if STACK_GROW_DIRECTION
 #define STACK_GROW_DIR_DETECTION
 #define STACK_DIR_UPPER(a,b) STACK_UPPER(0, (a), (b))
@@ -88,7 +111,10 @@ int ruby_get_stack_grow_direction(volatile VALUE *addr);
 
 const char *rb_obj_info(VALUE obj);
 const char *rb_raw_obj_info(char *buff, const int buff_size, VALUE obj);
-void rb_obj_info_dump(VALUE obj);
+
+VALUE rb_gc_disable_no_rest(void);
+
+struct rb_thread_struct;
 
 RUBY_SYMBOL_EXPORT_BEGIN
 
diff --git a/gc.rb b/gc.rb
new file mode 100644
index 0000000000..8a00b406ce
--- /dev/null
+++ b/gc.rb
@@ -0,0 +1,241 @@
+# for gc.c
+
+#  The GC module provides an interface to Ruby's mark and
+#  sweep garbage collection mechanism.
+#
+#  Some of the underlying methods are also available via the ObjectSpace
+#  module.
+#
+#  You may obtain information about the operation of the GC through
+#  GC::Profiler.
+module GC
+
+  #  call-seq:
+  #     GC.start                     -> nil
+  #     ObjectSpace.garbage_collect  -> nil
+  #     include GC; garbage_collect  -> nil
+  #     GC.start(full_mark: true, immediate_sweep: true)           -> nil
+  #     ObjectSpace.garbage_collect(full_mark: true, immediate_sweep: true) -> nil
+  #     include GC; garbage_collect(full_mark: true, immediate_sweep: true) -> nil
+  #
+  #  Initiates garbage collection, even if manually disabled.
+  #
+  #  This method is defined with keyword arguments that default to true:
+  #
+  #     def GC.start(full_mark: true, immediate_sweep: true); end
+  #
+  #  Use full_mark: false to perform a minor GC.
+  #  Use immediate_sweep: false to defer sweeping (use lazy sweep).
+  #
+  #  Note: These keyword arguments are implementation and version dependent. They
+  #  are not guaranteed to be future-compatible, and may be ignored if the
+  #  underlying implementation does not support them.
+  def self.start full_mark: true, immediate_mark: true, immediate_sweep: true
+    Primitive.gc_start_internal full_mark, immediate_mark, immediate_sweep, false
+  end
+
+  def garbage_collect full_mark: true, immediate_mark: true, immediate_sweep: true
+    Primitive.gc_start_internal full_mark, immediate_mark, immediate_sweep, false
+  end
+
+  #  call-seq:
+  #     GC.auto_compact    -> true or false
+  #
+  #  Returns whether or not automatic compaction has been enabled.
+  #
+  def self.auto_compact
+    Primitive.gc_get_auto_compact
+  end
+
+  #  call-seq:
+  #     GC.auto_compact = flag
+  #
+  #  Updates automatic compaction mode.
+  #
+  #  When enabled, the compactor will execute on every major collection.
+  #
+  #  Enabling compaction will degrade performance on major collections.
+  def self.auto_compact=(flag)
+    Primitive.gc_set_auto_compact(flag)
+  end
+
+  #  call-seq:
+  #     GC.enable    -> true or false
+  #
+  #  Enables garbage collection, returning +true+ if garbage
+  #  collection was previously disabled.
+  #
+  #     GC.disable   #=> false
+  #     GC.enable    #=> true
+  #     GC.enable    #=> false
+  #
+  def self.enable
+    Primitive.gc_enable
+  end
+
+  #  call-seq:
+  #     GC.disable    -> true or false
+  #
+  #  Disables garbage collection, returning +true+ if garbage
+  #  collection was already disabled.
+  #
+  #     GC.disable   #=> false
+  #     GC.disable   #=> true
+  def self.disable
+    Primitive.gc_disable
+  end
+
+  #  call-seq:
+  #    GC.stress	    -> integer, true or false
+  #
+  #  Returns current status of GC stress mode.
+  def self.stress
+    Primitive.gc_stress_get
+  end
+
+  #  call-seq:
+  #    GC.stress = flag          -> flag
+  #
+  #  Updates the GC stress mode.
+  #
+  #  When stress mode is enabled, the GC is invoked at every GC opportunity:
+  #  all memory and object allocations.
+  #
+  #  Enabling stress mode will degrade performance, it is only for debugging.
+  #
+  #  flag can be true, false, or an integer bit-ORed following flags.
+  #    0x01:: no major GC
+  #    0x02:: no immediate sweep
+  #    0x04:: full mark after malloc/calloc/realloc
+  def self.stress=(flag)
+    Primitive.gc_stress_set_m flag
+  end
+
+  #  call-seq:
+  #     GC.count -> Integer
+  #
+  #  The number of times GC occurred.
+  #
+  #  It returns the number of times GC occurred since the process started.
+  def self.count
+    Primitive.gc_count
+  end
+
+  #  call-seq:
+  #     GC.stat -> Hash
+  #     GC.stat(hash) -> hash
+  #     GC.stat(:key) -> Numeric
+  #
+  #  Returns a Hash containing information about the GC.
+  #
+  #  The hash includes information about internal statistics about GC such as:
+  #
+  #      {
+  #          :count=>0,
+  #          :heap_allocated_pages=>24,
+  #          :heap_sorted_length=>24,
+  #          :heap_allocatable_pages=>0,
+  #          :heap_available_slots=>9783,
+  #          :heap_live_slots=>7713,
+  #          :heap_free_slots=>2070,
+  #          :heap_final_slots=>0,
+  #          :heap_marked_slots=>0,
+  #          :heap_eden_pages=>24,
+  #          :heap_tomb_pages=>0,
+  #          :total_allocated_pages=>24,
+  #          :total_freed_pages=>0,
+  #          :total_allocated_objects=>7796,
+  #          :total_freed_objects=>83,
+  #          :malloc_increase_bytes=>2389312,
+  #          :malloc_increase_bytes_limit=>16777216,
+  #          :minor_gc_count=>0,
+  #          :major_gc_count=>0,
+  #          :remembered_wb_unprotected_objects=>0,
+  #          :remembered_wb_unprotected_objects_limit=>0,
+  #          :old_objects=>0,
+  #          :old_objects_limit=>0,
+  #          :oldmalloc_increase_bytes=>2389760,
+  #          :oldmalloc_increase_bytes_limit=>16777216
+  #      }
+  #
+  #  The contents of the hash are implementation specific and may be changed in
+  #  the future.
+  #
+  #  If the optional argument, hash, is given,
+  #  it is overwritten and returned.
+  #  This is intended to avoid probe effect.
+  #
+  #  This method is only expected to work on C Ruby.
+  def self.stat hash_or_key = nil
+    Primitive.gc_stat hash_or_key
+  end
+
+  #  call-seq:
+  #     GC.latest_gc_info -> {:gc_by=>:newobj}
+  #     GC.latest_gc_info(hash) -> hash
+  #     GC.latest_gc_info(:major_by) -> :malloc
+  #
+  #  Returns information about the most recent garbage collection.
+  #
+  # If the optional argument, hash, is given,
+  # it is overwritten and returned.
+  # This is intended to avoid probe effect.
+  def self.latest_gc_info hash_or_key = nil
+    Primitive.gc_latest_gc_info hash_or_key
+  end
+
+  #  call-seq:
+  #     GC.latest_compact_info -> {:considered=>{:T_CLASS=>11}, :moved=>{:T_CLASS=>11}}
+  #
+  #  Returns information about object moved in the most recent GC compaction.
+  #
+  # The returned hash has two keys :considered and :moved.  The hash for
+  # :considered lists the number of objects that were considered for movement
+  # by the compactor, and the :moved hash lists the number of objects that
+  # were actually moved.  Some objects can't be moved (maybe they were pinned)
+  # so these numbers can be used to calculate compaction efficiency.
+  def self.latest_compact_info
+    Primitive.gc_compact_stats
+  end
+
+  #  call-seq:
+  #     GC.compact
+  #
+  # This function compacts objects together in Ruby's heap.  It eliminates
+  # unused space (or fragmentation) in the heap by moving objects in to that
+  # unused space.  This function returns a hash which contains statistics about
+  # which objects were moved.  See `GC.latest_gc_info` for details about
+  # compaction statistics.
+  #
+  # This method is implementation specific and not expected to be implemented
+  # in any implementation besides MRI.
+  def self.compact
+    Primitive.gc_compact
+  end
+
+  # call-seq:
+  #    GC.verify_compaction_references(toward: nil, double_heap: false) -> hash
+  #
+  # Verify compaction reference consistency.
+  #
+  # This method is implementation specific.  During compaction, objects that
+  # were moved are replaced with T_MOVED objects.  No object should have a
+  # reference to a T_MOVED object after compaction.
+  #
+  # This function doubles the heap to ensure room to move all objects,
+  # compacts the heap to make sure everything moves, updates all references,
+  # then performs a full GC.  If any object contains a reference to a T_MOVED
+  # object, that object should be pushed on the mark stack, and will
+  # make a SEGV.
+  def self.verify_compaction_references(toward: nil, double_heap: false)
+    Primitive.gc_verify_compaction_references(double_heap, toward == :empty)
+  end
+end
+
+module ObjectSpace
+  def garbage_collect full_mark: true, immediate_mark: true, immediate_sweep: true
+    Primitive.gc_start_internal full_mark, immediate_mark, immediate_sweep, false
+  end
+
+  module_function :garbage_collect
+end
diff --git a/gem_prelude.rb b/gem_prelude.rb
index be9c41933c..c4debb6509 100644
--- a/gem_prelude.rb
+++ b/gem_prelude.rb
@@ -1,8 +1,11 @@
-if defined?(Gem)
-  require 'rubygems.rb'
-  begin
-    gem 'did_you_mean'
-    require 'did_you_mean'
-  rescue Gem::LoadError, LoadError
-  end if defined?(DidYouMean)
-end
+begin
+  require 'rubygems'
+rescue LoadError
+  warn "`RubyGems' were not loaded."
+end if defined?(Gem)
+
+begin
+  require 'did_you_mean'
+rescue LoadError
+  warn "`did_you_mean' was not loaded."
+end if defined?(DidYouMean)
diff --git a/gems/bundled_gems b/gems/bundled_gems
index c7190138a7..445d876df8 100644
--- a/gems/bundled_gems
+++ b/gems/bundled_gems
@@ -1,7 +1,9 @@
-power_assert 0.3.0
-test-unit 3.1.9
-minitest 5.9.0
-rake 11.1.2
-net-telnet 0.1.1
-did_you_mean 1.0.1
-xmlrpc 0.1.1
+# gem-name version-to-bundle repository-url [optional-commit-hash-to-test-or-defaults-to-v-version]
+minitest 5.14.2 https://github.com/seattlerb/minitest
+power_assert 1.2.1 https://github.com/ruby/power_assert
+rake 13.0.3 https://github.com/ruby/rake
+test-unit 3.3.7 https://github.com/test-unit/test-unit 3.3.7
+rexml 3.2.5 https://github.com/ruby/rexml
+rss 0.2.9 https://github.com/ruby/rss 0.2.9
+typeprof 0.15.2 https://github.com/ruby/typeprof
+rbs 1.4.0 https://github.com/ruby/rbs
diff --git a/golf_prelude.rb b/golf_prelude.rb
index 8034601287..a13d3f71bc 100644
--- a/golf_prelude.rb
+++ b/golf_prelude.rb
@@ -1,6 +1,7 @@
 class Object
   @@golf_hash = {}
 
+  verbose, $VERBOSE = $VERBOSE, nil
   def method_missing m, *a, &b
     t = @@golf_hash[ [m, self.class] ] ||= matching_methods(m)[0]
     if t && b
@@ -12,6 +13,7 @@ class Object
       t ? __send__(t, *a, &b) : super
     end
   end
+  $VERBOSE = verbose
 
   def matching_methods(s = '', m = callable_methods)
     r = /^#{s.to_s.gsub(/./){"(.*?)" + Regexp.escape($&)}}/
@@ -50,6 +52,11 @@ class Object
     puts "#{a}ello, #{b}orld#{c}"
   end
 
+  def f(m = 100)
+    1.upto(m){|n|puts'FizzBuzz
+'[i=n**4%-15,i+13]||n}
+  end
+
   alias say puts
 
   def do_while
@@ -85,7 +92,7 @@ class String
     split('')
   end
 
-  (Array.instance_methods - instance_methods - [:to_ary, :transpose, :flatten, :flatten!, :compact, :compact!, :assoc, :rassoc]).each{|meth|
+  (Array.instance_methods - instance_methods - %i[to_ary transpose flatten flatten! compact compact! assoc rassoc]).each{|meth|
     eval "
     def #{meth}(*args, &block)
       a = to_a
diff --git a/goruby.c b/goruby.c
index 99042f8440..e4119c56f7 100644
--- a/goruby.c
+++ b/goruby.c
@@ -20,7 +20,8 @@ RUBY_EXTERN void ruby_init_ext(const char *name, void (*init)(void));
 static VALUE
 init_golf(VALUE arg)
 {
-    ruby_init_ext("golf.so", Init_golf);
+    Init_golf();
+    rb_provide("golf.so");
     return arg;
 }
 
@@ -34,7 +35,11 @@ goruby_options(int argc, char **argv)
     if ((isatty(0) && isatty(1) && isatty(2)) && (pipe(rw) == 0)) {
 	ssize_t n;
 	infd = dup(0);
-	if (infd < 0) return NULL;
+	if (infd < 0) {
+	    close(rw[0]);
+	    close(rw[1]);
+	    goto no_irb;
+	}
 	dup2(rw[0], 0);
 	close(rw[0]);
 	n = write(rw[1], cmd, sizeof(cmd) - 1);
@@ -44,9 +49,8 @@ goruby_options(int argc, char **argv)
 	close(infd);
 	return ret;
     }
-    else {
-	return ruby_options(argc, argv);
-    }
+  no_irb:
+    return ruby_options(argc, argv);
 }
 
 int
diff --git a/hash.c b/hash.c
index 561aa90400..17d4186acf 100644
--- a/hash.c
+++ b/hash.c
@@ -11,13 +11,9 @@
 
 **********************************************************************/
 
-#include "internal.h"
-#include "ruby/st.h"
-#include "ruby/util.h"
+#include "ruby/internal/config.h"
+
 #include <errno.h>
-#include "probes.h"
-#include "id.h"
-#include "symbol.h"
 
 #ifdef __APPLE__
 # ifdef HAVE_CRT_EXTERNS_H
@@ -27,13 +23,42 @@
 # endif
 #endif
 
+#include "debug_counter.h"
+#include "id.h"
+#include "internal.h"
+#include "internal/array.h"
+#include "internal/bignum.h"
+#include "internal/class.h"
+#include "internal/cont.h"
+#include "internal/error.h"
+#include "internal/hash.h"
+#include "internal/object.h"
+#include "internal/proc.h"
+#include "internal/symbol.h"
+#include "internal/time.h"
+#include "internal/vm.h"
+#include "probes.h"
+#include "ruby/st.h"
+#include "ruby/util.h"
+#include "ruby_assert.h"
+#include "symbol.h"
+#include "transient_heap.h"
+
+#ifndef HASH_DEBUG
+#define HASH_DEBUG 0
+#endif
+
+#if HASH_DEBUG
+#include "gc.h"
+#endif
+
 #define HAS_EXTRA_STATES(hash, klass) ( \
     ((klass = has_extra_methods(rb_obj_class(hash))) != 0) || \
-    FL_TEST((hash), FL_EXIVAR|FL_TAINT|HASH_PROC_DEFAULT) || \
+    FL_TEST((hash), FL_EXIVAR|RHASH_PROC_DEFAULT) || \
     !NIL_P(RHASH_IFNONE(hash)))
 
 #define SET_DEFAULT(hash, ifnone) ( \
-    FL_UNSET_RAW(hash, HASH_PROC_DEFAULT), \
+    FL_UNSET_RAW(hash, RHASH_PROC_DEFAULT), \
     RHASH_SET_IFNONE(hash, ifnone))
 
 #define SET_PROC_DEFAULT(hash, proc) set_proc_default(hash, proc)
@@ -43,9 +68,9 @@
 static inline void
 copy_default(struct RHash *hash, const struct RHash *hash2)
 {
-    hash->basic.flags &= ~HASH_PROC_DEFAULT;
-    hash->basic.flags |= hash2->basic.flags & HASH_PROC_DEFAULT;
-    RHASH_SET_IFNONE(hash, RHASH_IFNONE(hash2));
+    hash->basic.flags &= ~RHASH_PROC_DEFAULT;
+    hash->basic.flags |= hash2->basic.flags & RHASH_PROC_DEFAULT;
+    RHASH_SET_IFNONE(hash, RHASH_IFNONE((VALUE)hash2));
 }
 
 static VALUE
@@ -81,13 +106,8 @@ rb_hash_freeze(VALUE hash)
 VALUE rb_cHash;
 
 static VALUE envtbl;
-static ID id_hash, id_yield, id_default, id_flatten_bang;
-
-VALUE
-rb_hash_ifnone(VALUE h)
-{
-    return RHASH_IFNONE(h);
-}
+static ID id_hash, id_default, id_flatten_bang;
+static ID id_hash_iter_lev;
 
 VALUE
 rb_hash_set_ifnone(VALUE hash, VALUE ifnone)
@@ -100,9 +120,6 @@ static int
 rb_any_cmp(VALUE a, VALUE b)
 {
     if (a == b) return 0;
-    if (FIXNUM_P(a) && FIXNUM_P(b)) {
-	return a != b;
-    }
     if (RB_TYPE_P(a, T_STRING) && RBASIC(a)->klass == rb_cString &&
 	RB_TYPE_P(b, T_STRING) && RBASIC(b)->klass == rb_cString) {
 	return rb_str_hash_cmp(a, b);
@@ -125,7 +142,11 @@ hash_recursive(VALUE obj, VALUE arg, int recurse)
 VALUE
 rb_hash(VALUE obj)
 {
-    VALUE hval = rb_exec_recursive_outer(hash_recursive, obj, 0);
+    VALUE hval = rb_check_funcall_basic_kw(obj, id_hash, rb_mKernel, 0, 0, 0);
+
+    if (hval == Qundef) {
+	hval = rb_exec_recursive_outer(hash_recursive, obj, 0);
+    }
 
     while (!FIXNUM_P(hval)) {
         if (RB_TYPE_P(hval, T_BIGNUM)) {
@@ -133,57 +154,80 @@ rb_hash(VALUE obj)
             unsigned long ul;
             sign = rb_integer_pack(hval, &ul, 1, sizeof(ul), 0,
                     INTEGER_PACK_NATIVE_BYTE_ORDER);
-            ul &= (1UL << (sizeof(long)*CHAR_BIT-1)) - 1;
-            if (sign < 0)
-                return LONG2FIX(-(long)ul);
-            return LONG2FIX((long)ul);
+            if (sign < 0) {
+                hval = LONG2FIX(ul | FIXNUM_MIN);
+            }
+            else {
+                hval = LONG2FIX(ul & FIXNUM_MAX);
+            }
         }
 	hval = rb_to_int(hval);
     }
     return hval;
 }
 
-long rb_objid_hash(st_index_t index);
+static long rb_objid_hash(st_index_t index);
 
 static st_index_t
+dbl_to_index(double d)
+{
+    union {double d; st_index_t i;} u;
+    u.d = d;
+    return u.i;
+}
+
+long
+rb_dbl_long_hash(double d)
+{
+    /* normalize -0.0 to 0.0 */
+    if (d == 0.0) d = 0.0;
+#if SIZEOF_INT == SIZEOF_VOIDP
+    return rb_memhash(&d, sizeof(d));
+#else
+    return rb_objid_hash(dbl_to_index(d));
+#endif
+}
+
+static inline long
 any_hash(VALUE a, st_index_t (*other_func)(VALUE))
 {
     VALUE hval;
     st_index_t hnum;
 
-    if (SPECIAL_CONST_P(a)) {
-	if (a == Qundef) return 0;
+    switch (TYPE(a)) {
+      case T_SYMBOL:
 	if (STATIC_SYM_P(a)) {
-	    hnum = a >> (RUBY_SPECIAL_SHIFT + ID_SCOPE_SHIFT);
-	    goto out;
-	}
-	else if (FLONUM_P(a)) {
-	    /* prevent pathological behavior: [Bug #10761] */
-	    goto flt;
-	}
+            hnum = a >> (RUBY_SPECIAL_SHIFT + ID_SCOPE_SHIFT);
+            hnum = rb_hash_start(hnum);
+        }
+        else {
+            hnum = RSYMBOL(a)->hashval;
+        }
+        break;
+      case T_FIXNUM:
+      case T_TRUE:
+      case T_FALSE:
+      case T_NIL:
 	hnum = rb_objid_hash((st_index_t)a);
-    }
-    else if (BUILTIN_TYPE(a) == T_STRING) {
+        break;
+      case T_STRING:
 	hnum = rb_str_hash(a);
-    }
-    else if (BUILTIN_TYPE(a) == T_SYMBOL) {
-	hnum = RSYMBOL(a)->hashval;
-    }
-    else if (BUILTIN_TYPE(a) == T_BIGNUM) {
+        break;
+      case T_BIGNUM:
 	hval = rb_big_hash(a);
 	hnum = FIX2LONG(hval);
-    }
-    else if (BUILTIN_TYPE(a) == T_FLOAT) {
-      flt:
-	hval = rb_dbl_hash(rb_float_value(a));
-	hnum = FIX2LONG(hval);
-    }
-    else {
+        break;
+      case T_FLOAT: /* prevent pathological behavior: [Bug #10761] */
+	hnum = rb_dbl_long_hash(rb_float_value(a));
+        break;
+      default:
 	hnum = other_func(a);
     }
-  out:
-    hnum <<= 1;
-    return (st_index_t)RSHIFT(hnum, 1);
+    if ((SIGNED_VALUE)hnum > 0)
+	hnum &= FIXNUM_MAX;
+    else
+	hnum |= FIXNUM_MIN;
+    return (long)hnum;
 }
 
 static st_index_t
@@ -199,53 +243,88 @@ rb_any_hash(VALUE a)
     return any_hash(a, obj_any_hash);
 }
 
-static st_index_t
-rb_num_hash_start(st_index_t n)
+/* Here is a hash function for 64-bit key.  It is about 5 times faster
+   (2 times faster when uint128 type is absent) on Haswell than
+   tailored Spooky or City hash function can be.  */
+
+/* Here we two primes with random bit generation.  */
+static const uint64_t prime1 = ((uint64_t)0x2e0bb864 << 32) | 0xe9ea7df5;
+static const uint32_t prime2 = 0x830fcab9;
+
+
+static inline uint64_t
+mult_and_mix(uint64_t m1, uint64_t m2)
 {
-    /*
-     * This hash function is lightly-tuned for Ruby.  Further tuning
-     * should be possible.  Notes:
-     *
-     * - (n >> 3) alone is great for heap objects and OK for fixnum,
-     *   however symbols perform poorly.
-     * - (n >> (RUBY_SPECIAL_SHIFT+3)) was added to make symbols hash well,
-     *   n.b.: +3 to remove most ID scope, +1 worked well initially, too
-     *   n.b.: +1 (instead of 3) worked well initially, too
-     * - (n << 16) was finally added to avoid losing bits for fixnums
-     * - avoid expensive modulo instructions, it is currently only
-     *   shifts and bitmask operations.
-     */
-    return (n >> (RUBY_SPECIAL_SHIFT + 3) ^ (n << 16)) ^ (n >> 3);
+#if defined HAVE_UINT128_T
+    uint128_t r = (uint128_t) m1 * (uint128_t) m2;
+    return (uint64_t) (r >> 64) ^ (uint64_t) r;
+#else
+    uint64_t hm1 = m1 >> 32, hm2 = m2 >> 32;
+    uint64_t lm1 = m1, lm2 = m2;
+    uint64_t v64_128 = hm1 * hm2;
+    uint64_t v32_96 = hm1 * lm2 + lm1 * hm2;
+    uint64_t v1_32 = lm1 * lm2;
+
+    return (v64_128 + (v32_96 >> 32)) ^ ((v32_96 << 32) + v1_32);
+#endif
 }
 
-long
-rb_objid_hash(st_index_t index)
+static inline uint64_t
+key64_hash(uint64_t key, uint32_t seed)
 {
-    st_index_t hnum = rb_num_hash_start(index);
+    return mult_and_mix(key + seed, prime1);
+}
+
+/* Should cast down the result for each purpose */
+#define st_index_hash(index) key64_hash(rb_hash_start(index), prime2)
 
-    hnum = rb_hash_start(hnum);
-    hnum = rb_hash_uint(hnum, (st_index_t)rb_any_hash);
-    hnum = rb_hash_end(hnum);
-    return hnum;
+static long
+rb_objid_hash(st_index_t index)
+{
+    return (long)st_index_hash(index);
 }
 
 static st_index_t
 objid_hash(VALUE obj)
 {
-    return rb_objid_hash((st_index_t)obj);
+    VALUE object_id = rb_obj_id(obj);
+    if (!FIXNUM_P(object_id))
+        object_id = rb_big_hash(object_id);
+
+#if SIZEOF_LONG == SIZEOF_VOIDP
+    return (st_index_t)st_index_hash((st_index_t)NUM2LONG(object_id));
+#elif SIZEOF_LONG_LONG == SIZEOF_VOIDP
+    return (st_index_t)st_index_hash((st_index_t)NUM2LL(object_id));
+#endif
 }
 
+/**
+ * call-seq:
+ *    obj.hash    -> integer
+ *
+ * Generates an Integer hash value for this object.  This function must have the
+ * property that <code>a.eql?(b)</code> implies <code>a.hash == b.hash</code>.
+ *
+ * The hash value is used along with #eql? by the Hash class to determine if
+ * two objects reference the same hash key.  Any hash value that exceeds the
+ * capacity of an Integer will be truncated before being used.
+ *
+ * The hash value for an object may not be identical across invocations or
+ * implementations of Ruby.  If you need a stable identifier across Ruby
+ * invocations and implementations you will need to generate one with a custom
+ * method.
+ *
+ * Certain core classes such as Integer use built-in hash calculations and
+ * do not call the #hash method when used as a hash key.
+ *--
+ * \private
+ *++
+ */
 VALUE
 rb_obj_hash(VALUE obj)
 {
-    st_index_t hnum = any_hash(obj, objid_hash);
-    return LONG2FIX(hnum);
-}
-
-int
-rb_hash_iter_lev(VALUE h)
-{
-    return RHASH_ITER_LEV(h);
+    long hnum = any_hash(obj, objid_hash);
+    return ST2FIX(hnum);
 }
 
 static const struct st_hash_type objhash = {
@@ -265,18 +344,964 @@ rb_ident_hash(st_data_t n)
      *   many integers get interpreted as 2.0 or -2.0 [Bug #10761]
      */
     if (FLONUM_P(n)) {
-	n ^= (st_data_t)rb_float_value(n);
+        n ^= dbl_to_index(rb_float_value(n));
     }
 #endif
 
-    return (st_index_t)rb_num_hash_start((st_index_t)n);
+    return (st_index_t)st_index_hash((st_index_t)n);
 }
 
-static const struct st_hash_type identhash = {
+#define identhash rb_hashtype_ident
+const struct st_hash_type rb_hashtype_ident = {
     rb_ident_cmp,
     rb_ident_hash,
 };
 
+typedef st_index_t st_hash_t;
+
+/*
+ * RHASH_AR_TABLE_P(h):
+ * * as.ar == NULL or
+ *   as.ar points ar_table.
+ * * as.ar is allocated by transient heap or xmalloc.
+ *
+ * !RHASH_AR_TABLE_P(h):
+ * * as.st points st_table.
+ */
+
+#define RHASH_AR_TABLE_MAX_BOUND     RHASH_AR_TABLE_MAX_SIZE
+
+#define RHASH_AR_TABLE_REF(hash, n) (&RHASH_AR_TABLE(hash)->pairs[n])
+#define RHASH_AR_CLEARED_HINT 0xff
+
+typedef struct ar_table_pair_struct {
+    VALUE key;
+    VALUE val;
+} ar_table_pair;
+
+typedef struct ar_table_struct {
+    /* 64bit CPU: 8B * 2 * 8 = 128B */
+    ar_table_pair pairs[RHASH_AR_TABLE_MAX_SIZE];
+} ar_table;
+
+size_t
+rb_hash_ar_table_size(void)
+{
+    return sizeof(ar_table);
+}
+
+static inline st_hash_t
+ar_do_hash(st_data_t key)
+{
+    return (st_hash_t)rb_any_hash(key);
+}
+
+static inline ar_hint_t
+ar_do_hash_hint(st_hash_t hash_value)
+{
+    return (ar_hint_t)hash_value;
+}
+
+static inline ar_hint_t
+ar_hint(VALUE hash, unsigned int index)
+{
+    return RHASH(hash)->ar_hint.ary[index];
+}
+
+static inline void
+ar_hint_set_hint(VALUE hash, unsigned int index, ar_hint_t hint)
+{
+    RHASH(hash)->ar_hint.ary[index] = hint;
+}
+
+static inline void
+ar_hint_set(VALUE hash, unsigned int index, st_hash_t hash_value)
+{
+    ar_hint_set_hint(hash, index, ar_do_hash_hint(hash_value));
+}
+
+static inline void
+ar_clear_entry(VALUE hash, unsigned int index)
+{
+    ar_table_pair *pair = RHASH_AR_TABLE_REF(hash, index);
+    pair->key = Qundef;
+    ar_hint_set_hint(hash, index, RHASH_AR_CLEARED_HINT);
+}
+
+static inline int
+ar_cleared_entry(VALUE hash, unsigned int index)
+{
+    if (ar_hint(hash, index) == RHASH_AR_CLEARED_HINT) {
+        /* RHASH_AR_CLEARED_HINT is only a hint, not mean cleared entry,
+         * so you need to check key == Qundef
+         */
+        ar_table_pair *pair = RHASH_AR_TABLE_REF(hash, index);
+        return pair->key == Qundef;
+    }
+    else {
+        return FALSE;
+    }
+}
+
+static inline void
+ar_set_entry(VALUE hash, unsigned int index, st_data_t key, st_data_t val, st_hash_t hash_value)
+{
+    ar_table_pair *pair = RHASH_AR_TABLE_REF(hash, index);
+    pair->key = key;
+    pair->val = val;
+    ar_hint_set(hash, index, hash_value);
+}
+
+#define RHASH_AR_TABLE_SIZE(h) (HASH_ASSERT(RHASH_AR_TABLE_P(h)), \
+                                RHASH_AR_TABLE_SIZE_RAW(h))
+
+#define RHASH_AR_TABLE_BOUND_RAW(h) \
+  ((unsigned int)((RBASIC(h)->flags >> RHASH_AR_TABLE_BOUND_SHIFT) & \
+                  (RHASH_AR_TABLE_BOUND_MASK >> RHASH_AR_TABLE_BOUND_SHIFT)))
+
+#define RHASH_AR_TABLE_BOUND(h) (HASH_ASSERT(RHASH_AR_TABLE_P(h)), \
+                                 RHASH_AR_TABLE_BOUND_RAW(h))
+
+#define RHASH_ST_TABLE_SET(h, s)  rb_hash_st_table_set(h, s)
+#define RHASH_TYPE(hash) (RHASH_AR_TABLE_P(hash) ? &objhash : RHASH_ST_TABLE(hash)->type)
+
+#define HASH_ASSERT(expr) RUBY_ASSERT_MESG_WHEN(HASH_DEBUG, expr, #expr)
+
+#if HASH_DEBUG
+#define hash_verify(hash) hash_verify_(hash, __FILE__, __LINE__)
+
+void
+rb_hash_dump(VALUE hash)
+{
+    rb_obj_info_dump(hash);
+
+    if (RHASH_AR_TABLE_P(hash)) {
+        unsigned i, n = 0, bound = RHASH_AR_TABLE_BOUND(hash);
+
+        fprintf(stderr, "  size:%u bound:%u\n",
+                RHASH_AR_TABLE_SIZE(hash), RHASH_AR_TABLE_BOUND(hash));
+
+        for (i=0; i<bound; i++) {
+            st_data_t k, v;
+
+            if (!ar_cleared_entry(hash, i)) {
+                char b1[0x100], b2[0x100];
+                ar_table_pair *pair = RHASH_AR_TABLE_REF(hash, i);
+                k = pair->key;
+                v = pair->val;
+                fprintf(stderr, "  %d key:%s val:%s hint:%02x\n", i,
+                        rb_raw_obj_info(b1, 0x100, k),
+                        rb_raw_obj_info(b2, 0x100, v),
+                        ar_hint(hash, i));
+                n++;
+            }
+            else {
+                fprintf(stderr, "  %d empty\n", i);
+            }
+        }
+    }
+}
+
+static VALUE
+hash_verify_(VALUE hash, const char *file, int line)
+{
+    HASH_ASSERT(RB_TYPE_P(hash, T_HASH));
+
+    if (RHASH_AR_TABLE_P(hash)) {
+        unsigned i, n = 0, bound = RHASH_AR_TABLE_BOUND(hash);
+
+        for (i=0; i<bound; i++) {
+            st_data_t k, v;
+            if (!ar_cleared_entry(hash, i)) {
+                ar_table_pair *pair = RHASH_AR_TABLE_REF(hash, i);
+                k = pair->key;
+                v = pair->val;
+                HASH_ASSERT(k != Qundef);
+                HASH_ASSERT(v != Qundef);
+                n++;
+            }
+        }
+        if (n != RHASH_AR_TABLE_SIZE(hash)) {
+            rb_bug("n:%u, RHASH_AR_TABLE_SIZE:%u", n, RHASH_AR_TABLE_SIZE(hash));
+        }
+    }
+    else {
+        HASH_ASSERT(RHASH_ST_TABLE(hash) != NULL);
+        HASH_ASSERT(RHASH_AR_TABLE_SIZE_RAW(hash) == 0);
+        HASH_ASSERT(RHASH_AR_TABLE_BOUND_RAW(hash) == 0);
+    }
+
+#if USE_TRANSIENT_HEAP
+    if (RHASH_TRANSIENT_P(hash)) {
+        volatile st_data_t MAYBE_UNUSED(key) = RHASH_AR_TABLE_REF(hash, 0)->key; /* read */
+        HASH_ASSERT(RHASH_AR_TABLE(hash) != NULL);
+        HASH_ASSERT(rb_transient_heap_managed_ptr_p(RHASH_AR_TABLE(hash)));
+    }
+#endif
+    return hash;
+}
+
+#else
+#define hash_verify(h) ((void)0)
+#endif
+
+static inline int
+RHASH_TABLE_NULL_P(VALUE hash)
+{
+    if (RHASH(hash)->as.ar == NULL) {
+        HASH_ASSERT(RHASH_AR_TABLE_P(hash));
+        return TRUE;
+    }
+    else {
+        return FALSE;
+    }
+}
+
+static inline int
+RHASH_TABLE_EMPTY_P(VALUE hash)
+{
+    return RHASH_SIZE(hash) == 0;
+}
+
+int
+rb_hash_ar_table_p(VALUE hash)
+{
+    if (FL_TEST_RAW((hash), RHASH_ST_TABLE_FLAG)) {
+        HASH_ASSERT(RHASH(hash)->as.st != NULL);
+        return FALSE;
+    }
+    else {
+        return TRUE;
+    }
+}
+
+ar_table *
+rb_hash_ar_table(VALUE hash)
+{
+    HASH_ASSERT(RHASH_AR_TABLE_P(hash));
+    return RHASH(hash)->as.ar;
+}
+
+st_table *
+rb_hash_st_table(VALUE hash)
+{
+    HASH_ASSERT(!RHASH_AR_TABLE_P(hash));
+    return RHASH(hash)->as.st;
+}
+
+void
+rb_hash_st_table_set(VALUE hash, st_table *st)
+{
+    HASH_ASSERT(st != NULL);
+    FL_SET_RAW((hash), RHASH_ST_TABLE_FLAG);
+    RHASH(hash)->as.st = st;
+}
+
+static void
+hash_ar_table_set(VALUE hash, ar_table *ar)
+{
+    HASH_ASSERT(RHASH_AR_TABLE_P(hash));
+    HASH_ASSERT((RHASH_TRANSIENT_P(hash) && ar == NULL) ? FALSE : TRUE);
+    RHASH(hash)->as.ar = ar;
+    hash_verify(hash);
+}
+
+#define RHASH_SET_ST_FLAG(h)          FL_SET_RAW(h, RHASH_ST_TABLE_FLAG)
+#define RHASH_UNSET_ST_FLAG(h)        FL_UNSET_RAW(h, RHASH_ST_TABLE_FLAG)
+
+static inline void
+RHASH_AR_TABLE_BOUND_SET(VALUE h, st_index_t n)
+{
+    HASH_ASSERT(RHASH_AR_TABLE_P(h));
+    HASH_ASSERT(n <= RHASH_AR_TABLE_MAX_BOUND);
+
+    RBASIC(h)->flags &= ~RHASH_AR_TABLE_BOUND_MASK;
+    RBASIC(h)->flags |= n << RHASH_AR_TABLE_BOUND_SHIFT;
+}
+
+static inline void
+RHASH_AR_TABLE_SIZE_SET(VALUE h, st_index_t n)
+{
+    HASH_ASSERT(RHASH_AR_TABLE_P(h));
+    HASH_ASSERT(n <= RHASH_AR_TABLE_MAX_SIZE);
+
+    RBASIC(h)->flags &= ~RHASH_AR_TABLE_SIZE_MASK;
+    RBASIC(h)->flags |= n << RHASH_AR_TABLE_SIZE_SHIFT;
+}
+
+static inline void
+HASH_AR_TABLE_SIZE_ADD(VALUE h, st_index_t n)
+{
+    HASH_ASSERT(RHASH_AR_TABLE_P(h));
+
+    RHASH_AR_TABLE_SIZE_SET(h, RHASH_AR_TABLE_SIZE(h) + n);
+
+    hash_verify(h);
+}
+
+#define RHASH_AR_TABLE_SIZE_INC(h) HASH_AR_TABLE_SIZE_ADD(h, 1)
+
+static inline void
+RHASH_AR_TABLE_SIZE_DEC(VALUE h)
+{
+    HASH_ASSERT(RHASH_AR_TABLE_P(h));
+    int new_size = RHASH_AR_TABLE_SIZE(h) - 1;
+
+    if (new_size != 0) {
+        RHASH_AR_TABLE_SIZE_SET(h, new_size);
+    }
+    else {
+        RHASH_AR_TABLE_SIZE_SET(h, 0);
+        RHASH_AR_TABLE_BOUND_SET(h, 0);
+    }
+    hash_verify(h);
+}
+
+static inline void
+RHASH_AR_TABLE_CLEAR(VALUE h)
+{
+    RBASIC(h)->flags &= ~RHASH_AR_TABLE_SIZE_MASK;
+    RBASIC(h)->flags &= ~RHASH_AR_TABLE_BOUND_MASK;
+
+    hash_ar_table_set(h, NULL);
+}
+
+static ar_table*
+ar_alloc_table(VALUE hash)
+{
+    ar_table *tab = (ar_table*)rb_transient_heap_alloc(hash, sizeof(ar_table));
+
+    if (tab != NULL) {
+        RHASH_SET_TRANSIENT_FLAG(hash);
+    }
+    else {
+        RHASH_UNSET_TRANSIENT_FLAG(hash);
+        tab = (ar_table*)ruby_xmalloc(sizeof(ar_table));
+    }
+
+    RHASH_AR_TABLE_SIZE_SET(hash, 0);
+    RHASH_AR_TABLE_BOUND_SET(hash, 0);
+    hash_ar_table_set(hash, tab);
+
+    return tab;
+}
+
+NOINLINE(static int ar_equal(VALUE x, VALUE y));
+
+static int
+ar_equal(VALUE x, VALUE y)
+{
+    return rb_any_cmp(x, y) == 0;
+}
+
+static unsigned
+ar_find_entry_hint(VALUE hash, ar_hint_t hint, st_data_t key)
+{
+    unsigned i, bound = RHASH_AR_TABLE_BOUND(hash);
+    const ar_hint_t *hints = RHASH(hash)->ar_hint.ary;
+
+    /* if table is NULL, then bound also should be 0 */
+
+    for (i = 0; i < bound; i++) {
+        if (hints[i] == hint) {
+            ar_table_pair *pair = RHASH_AR_TABLE_REF(hash, i);
+            if (ar_equal(key, pair->key)) {
+                RB_DEBUG_COUNTER_INC(artable_hint_hit);
+                return i;
+            }
+            else {
+#if 0
+                static int pid;
+                static char fname[256];
+                static FILE *fp;
+
+                if (pid != getpid()) {
+                    snprintf(fname, sizeof(fname), "/tmp/ruby-armiss.%d", pid = getpid());
+                    if ((fp = fopen(fname, "w")) == NULL) rb_bug("fopen");
+                }
+
+                st_hash_t h1 = ar_do_hash(key);
+                st_hash_t h2 = ar_do_hash(pair->key);
+
+                fprintf(fp, "miss: hash_eq:%d hints[%d]:%02x hint:%02x\n"
+                            "      key      :%016lx %s\n"
+                            "      pair->key:%016lx %s\n",
+                        h1 == h2, i, hints[i], hint,
+                        h1, rb_obj_info(key), h2, rb_obj_info(pair->key));
+#endif
+                RB_DEBUG_COUNTER_INC(artable_hint_miss);
+            }
+        }
+    }
+    RB_DEBUG_COUNTER_INC(artable_hint_notfound);
+    return RHASH_AR_TABLE_MAX_BOUND;
+}
+
+static unsigned
+ar_find_entry(VALUE hash, st_hash_t hash_value, st_data_t key)
+{
+    ar_hint_t hint = ar_do_hash_hint(hash_value);
+    return ar_find_entry_hint(hash, hint, key);
+}
+
+static inline void
+ar_free_and_clear_table(VALUE hash)
+{
+    ar_table *tab = RHASH_AR_TABLE(hash);
+
+    if (tab) {
+        if (RHASH_TRANSIENT_P(hash)) {
+            RHASH_UNSET_TRANSIENT_FLAG(hash);
+        }
+        else {
+            ruby_xfree(RHASH_AR_TABLE(hash));
+        }
+        RHASH_AR_TABLE_CLEAR(hash);
+    }
+    HASH_ASSERT(RHASH_AR_TABLE_SIZE(hash) == 0);
+    HASH_ASSERT(RHASH_AR_TABLE_BOUND(hash) == 0);
+    HASH_ASSERT(RHASH_TRANSIENT_P(hash) == 0);
+}
+
+static void
+ar_try_convert_table(VALUE hash)
+{
+    if (!RHASH_AR_TABLE_P(hash)) return;
+
+    const unsigned size = RHASH_AR_TABLE_SIZE(hash);
+
+    st_table *new_tab;
+    st_index_t i;
+
+    if (size < RHASH_AR_TABLE_MAX_SIZE) {
+        return;
+    }
+
+    new_tab = st_init_table_with_size(&objhash, size * 2);
+
+    for (i = 0; i < RHASH_AR_TABLE_MAX_BOUND; i++) {
+        ar_table_pair *pair = RHASH_AR_TABLE_REF(hash, i);
+        st_add_direct(new_tab, pair->key, pair->val);
+    }
+    ar_free_and_clear_table(hash);
+    RHASH_ST_TABLE_SET(hash, new_tab);
+    return;
+}
+
+static st_table *
+ar_force_convert_table(VALUE hash, const char *file, int line)
+{
+    st_table *new_tab;
+
+    if (RHASH_ST_TABLE_P(hash)) {
+        return RHASH_ST_TABLE(hash);
+    }
+
+    if (RHASH_AR_TABLE(hash)) {
+        unsigned i, bound = RHASH_AR_TABLE_BOUND(hash);
+
+#if RHASH_CONVERT_TABLE_DEBUG
+        rb_obj_info_dump(hash);
+        fprintf(stderr, "force_convert: %s:%d\n", file, line);
+        RB_DEBUG_COUNTER_INC(obj_hash_force_convert);
+#endif
+
+        new_tab = st_init_table_with_size(&objhash, RHASH_AR_TABLE_SIZE(hash));
+
+        for (i = 0; i < bound; i++) {
+            if (ar_cleared_entry(hash, i)) continue;
+
+            ar_table_pair *pair = RHASH_AR_TABLE_REF(hash, i);
+            st_add_direct(new_tab, pair->key, pair->val);
+        }
+        ar_free_and_clear_table(hash);
+    }
+    else {
+        new_tab = st_init_table(&objhash);
+    }
+    RHASH_ST_TABLE_SET(hash, new_tab);
+
+    return new_tab;
+}
+
+static ar_table *
+hash_ar_table(VALUE hash)
+{
+    if (RHASH_TABLE_NULL_P(hash)) {
+        ar_alloc_table(hash);
+    }
+    return RHASH_AR_TABLE(hash);
+}
+
+static int
+ar_compact_table(VALUE hash)
+{
+    const unsigned bound = RHASH_AR_TABLE_BOUND(hash);
+    const unsigned size = RHASH_AR_TABLE_SIZE(hash);
+
+    if (size == bound) {
+        return size;
+    }
+    else {
+        unsigned i, j=0;
+        ar_table_pair *pairs = RHASH_AR_TABLE(hash)->pairs;
+
+        for (i=0; i<bound; i++) {
+            if (ar_cleared_entry(hash, i)) {
+                if (j <= i) j = i+1;
+                for (; j<bound; j++) {
+                    if (!ar_cleared_entry(hash, j)) {
+                        pairs[i] = pairs[j];
+                        ar_hint_set_hint(hash, i, (st_hash_t)ar_hint(hash, j));
+                        ar_clear_entry(hash, j);
+                        j++;
+                        goto found;
+                    }
+                }
+                /* non-empty is not found */
+                goto done;
+              found:;
+            }
+        }
+      done:
+        HASH_ASSERT(i<=bound);
+
+        RHASH_AR_TABLE_BOUND_SET(hash, size);
+        hash_verify(hash);
+        return size;
+    }
+}
+
+static int
+ar_add_direct_with_hash(VALUE hash, st_data_t key, st_data_t val, st_hash_t hash_value)
+{
+    unsigned bin = RHASH_AR_TABLE_BOUND(hash);
+
+    if (RHASH_AR_TABLE_SIZE(hash) >= RHASH_AR_TABLE_MAX_SIZE) {
+        return 1;
+    }
+    else {
+        if (UNLIKELY(bin >= RHASH_AR_TABLE_MAX_BOUND)) {
+            bin = ar_compact_table(hash);
+            hash_ar_table(hash);
+        }
+        HASH_ASSERT(bin < RHASH_AR_TABLE_MAX_BOUND);
+
+        ar_set_entry(hash, bin, key, val, hash_value);
+        RHASH_AR_TABLE_BOUND_SET(hash, bin+1);
+        RHASH_AR_TABLE_SIZE_INC(hash);
+        return 0;
+    }
+}
+
+static int
+ar_general_foreach(VALUE hash, st_foreach_check_callback_func *func, st_update_callback_func *replace, st_data_t arg)
+{
+    if (RHASH_AR_TABLE_SIZE(hash) > 0) {
+        unsigned i, bound = RHASH_AR_TABLE_BOUND(hash);
+
+        for (i = 0; i < bound; i++) {
+            if (ar_cleared_entry(hash, i)) continue;
+
+            ar_table_pair *pair = RHASH_AR_TABLE_REF(hash, i);
+            enum st_retval retval = (*func)(pair->key, pair->val, arg, 0);
+            /* pair may be not valid here because of theap */
+
+            switch (retval) {
+              case ST_CONTINUE:
+                break;
+              case ST_CHECK:
+              case ST_STOP:
+                return 0;
+              case ST_REPLACE:
+                if (replace) {
+                    VALUE key = pair->key;
+                    VALUE val = pair->val;
+                    retval = (*replace)(&key, &val, arg, TRUE);
+
+                    // TODO: pair should be same as pair before.
+                    ar_table_pair *pair = RHASH_AR_TABLE_REF(hash, i);
+                    pair->key = key;
+                    pair->val = val;
+                }
+                break;
+              case ST_DELETE:
+                ar_clear_entry(hash, i);
+                RHASH_AR_TABLE_SIZE_DEC(hash);
+                break;
+            }
+        }
+    }
+    return 0;
+}
+
+static int
+ar_foreach_with_replace(VALUE hash, st_foreach_check_callback_func *func, st_update_callback_func *replace, st_data_t arg)
+{
+    return ar_general_foreach(hash, func, replace, arg);
+}
+
+struct functor {
+    st_foreach_callback_func *func;
+    st_data_t arg;
+};
+
+static int
+apply_functor(st_data_t k, st_data_t v, st_data_t d, int _)
+{
+    const struct functor *f = (void *)d;
+    return f->func(k, v, f->arg);
+}
+
+static int
+ar_foreach(VALUE hash, st_foreach_callback_func *func, st_data_t arg)
+{
+    const struct functor f = { func, arg };
+    return ar_general_foreach(hash, apply_functor, NULL, (st_data_t)&f);
+}
+
+static int
+ar_foreach_check(VALUE hash, st_foreach_check_callback_func *func, st_data_t arg,
+                     st_data_t never)
+{
+    if (RHASH_AR_TABLE_SIZE(hash) > 0) {
+        unsigned i, ret = 0, bound = RHASH_AR_TABLE_BOUND(hash);
+        enum st_retval retval;
+        st_data_t key;
+        ar_table_pair *pair;
+        ar_hint_t hint;
+
+        for (i = 0; i < bound; i++) {
+            if (ar_cleared_entry(hash, i)) continue;
+
+            pair = RHASH_AR_TABLE_REF(hash, i);
+            key = pair->key;
+            hint = ar_hint(hash, i);
+
+            retval = (*func)(key, pair->val, arg, 0);
+            hash_verify(hash);
+
+            switch (retval) {
+              case ST_CHECK: {
+                  pair = RHASH_AR_TABLE_REF(hash, i);
+                  if (pair->key == never) break;
+                  ret = ar_find_entry_hint(hash, hint, key);
+                  if (ret == RHASH_AR_TABLE_MAX_BOUND) {
+                      retval = (*func)(0, 0, arg, 1);
+                      return 2;
+                  }
+              }
+              case ST_CONTINUE:
+                break;
+              case ST_STOP:
+              case ST_REPLACE:
+                return 0;
+              case ST_DELETE: {
+                  if (!ar_cleared_entry(hash, i)) {
+                      ar_clear_entry(hash, i);
+                      RHASH_AR_TABLE_SIZE_DEC(hash);
+                  }
+                  break;
+              }
+            }
+        }
+    }
+    return 0;
+}
+
+static int
+ar_update(VALUE hash, st_data_t key,
+              st_update_callback_func *func, st_data_t arg)
+{
+    int retval, existing;
+    unsigned bin = RHASH_AR_TABLE_MAX_BOUND;
+    st_data_t value = 0, old_key;
+    st_hash_t hash_value = ar_do_hash(key);
+
+    if (UNLIKELY(!RHASH_AR_TABLE_P(hash))) {
+        // `#hash` changes ar_table -> st_table
+        return -1;
+    }
+
+    if (RHASH_AR_TABLE_SIZE(hash) > 0) {
+        bin = ar_find_entry(hash, hash_value, key);
+        existing = (bin != RHASH_AR_TABLE_MAX_BOUND) ? TRUE : FALSE;
+    }
+    else {
+        hash_ar_table(hash); /* allocate ltbl if needed */
+        existing = FALSE;
+    }
+
+    if (existing) {
+        ar_table_pair *pair = RHASH_AR_TABLE_REF(hash, bin);
+        key = pair->key;
+        value = pair->val;
+    }
+    old_key = key;
+    retval = (*func)(&key, &value, arg, existing);
+    /* pair can be invalid here because of theap */
+
+    switch (retval) {
+      case ST_CONTINUE:
+        if (!existing) {
+            if (ar_add_direct_with_hash(hash, key, value, hash_value)) {
+                return -1;
+            }
+        }
+        else {
+            ar_table_pair *pair = RHASH_AR_TABLE_REF(hash, bin);
+            if (old_key != key) {
+                pair->key = key;
+            }
+            pair->val = value;
+        }
+        break;
+      case ST_DELETE:
+        if (existing) {
+            ar_clear_entry(hash, bin);
+            RHASH_AR_TABLE_SIZE_DEC(hash);
+        }
+        break;
+    }
+    return existing;
+}
+
+static int
+ar_insert(VALUE hash, st_data_t key, st_data_t value)
+{
+    unsigned bin = RHASH_AR_TABLE_BOUND(hash);
+    st_hash_t hash_value = ar_do_hash(key);
+
+    if (UNLIKELY(!RHASH_AR_TABLE_P(hash))) {
+        // `#hash` changes ar_table -> st_table
+        return -1;
+    }
+
+    hash_ar_table(hash); /* prepare ltbl */
+
+    bin = ar_find_entry(hash, hash_value, key);
+    if (bin == RHASH_AR_TABLE_MAX_BOUND) {
+        if (RHASH_AR_TABLE_SIZE(hash) >= RHASH_AR_TABLE_MAX_SIZE) {
+            return -1;
+        }
+        else if (bin >= RHASH_AR_TABLE_MAX_BOUND) {
+            bin = ar_compact_table(hash);
+            hash_ar_table(hash);
+        }
+        HASH_ASSERT(bin < RHASH_AR_TABLE_MAX_BOUND);
+
+        ar_set_entry(hash, bin, key, value, hash_value);
+        RHASH_AR_TABLE_BOUND_SET(hash, bin+1);
+        RHASH_AR_TABLE_SIZE_INC(hash);
+        return 0;
+    }
+    else {
+        RHASH_AR_TABLE_REF(hash, bin)->val = value;
+        return 1;
+    }
+}
+
+static int
+ar_lookup(VALUE hash, st_data_t key, st_data_t *value)
+{
+    if (RHASH_AR_TABLE_SIZE(hash) == 0) {
+        return 0;
+    }
+    else {
+        st_hash_t hash_value = ar_do_hash(key);
+        if (UNLIKELY(!RHASH_AR_TABLE_P(hash))) {
+            // `#hash` changes ar_table -> st_table
+            return st_lookup(RHASH_ST_TABLE(hash), key, value);
+        }
+        unsigned bin = ar_find_entry(hash, hash_value, key);
+
+        if (bin == RHASH_AR_TABLE_MAX_BOUND) {
+            return 0;
+        }
+        else {
+            HASH_ASSERT(bin < RHASH_AR_TABLE_MAX_BOUND);
+            if (value != NULL) {
+                *value = RHASH_AR_TABLE_REF(hash, bin)->val;
+            }
+            return 1;
+        }
+    }
+}
+
+static int
+ar_delete(VALUE hash, st_data_t *key, st_data_t *value)
+{
+    unsigned bin;
+    st_hash_t hash_value = ar_do_hash(*key);
+
+    if (UNLIKELY(!RHASH_AR_TABLE_P(hash))) {
+        // `#hash` changes ar_table -> st_table
+        return st_delete(RHASH_ST_TABLE(hash), key, value);
+    }
+
+    bin = ar_find_entry(hash, hash_value, *key);
+
+    if (bin == RHASH_AR_TABLE_MAX_BOUND) {
+        if (value != 0) *value = 0;
+        return 0;
+    }
+    else {
+        if (value != 0) {
+            ar_table_pair *pair = RHASH_AR_TABLE_REF(hash, bin);
+            *value = pair->val;
+        }
+        ar_clear_entry(hash, bin);
+        RHASH_AR_TABLE_SIZE_DEC(hash);
+        return 1;
+    }
+}
+
+static int
+ar_shift(VALUE hash, st_data_t *key, st_data_t *value)
+{
+    if (RHASH_AR_TABLE_SIZE(hash) > 0) {
+        unsigned i, bound = RHASH_AR_TABLE_BOUND(hash);
+
+        for (i = 0; i < bound; i++) {
+            if (!ar_cleared_entry(hash, i)) {
+                ar_table_pair *pair = RHASH_AR_TABLE_REF(hash, i);
+                if (value != 0) *value = pair->val;
+                *key = pair->key;
+                ar_clear_entry(hash, i);
+                RHASH_AR_TABLE_SIZE_DEC(hash);
+                return 1;
+            }
+        }
+    }
+    if (value != NULL) *value = 0;
+    return 0;
+}
+
+static long
+ar_keys(VALUE hash, st_data_t *keys, st_index_t size)
+{
+    unsigned i, bound = RHASH_AR_TABLE_BOUND(hash);
+    st_data_t *keys_start = keys, *keys_end = keys + size;
+
+    for (i = 0; i < bound; i++) {
+        if (keys == keys_end) {
+          break;
+        }
+        else {
+            if (!ar_cleared_entry(hash, i)) {
+                *keys++ = RHASH_AR_TABLE_REF(hash, i)->key;
+            }
+        }
+    }
+
+    return keys - keys_start;
+}
+
+static long
+ar_values(VALUE hash, st_data_t *values, st_index_t size)
+{
+    unsigned i, bound = RHASH_AR_TABLE_BOUND(hash);
+    st_data_t *values_start = values, *values_end = values + size;
+
+    for (i = 0; i < bound; i++) {
+        if (values == values_end) {
+          break;
+        }
+        else {
+            if (!ar_cleared_entry(hash, i)) {
+                *values++ = RHASH_AR_TABLE_REF(hash, i)->val;
+            }
+        }
+    }
+
+    return values - values_start;
+}
+
+static ar_table*
+ar_copy(VALUE hash1, VALUE hash2)
+{
+    ar_table *old_tab = RHASH_AR_TABLE(hash2);
+
+    if (old_tab != NULL) {
+        ar_table *new_tab = RHASH_AR_TABLE(hash1);
+        if (new_tab == NULL) {
+            new_tab = (ar_table*) rb_transient_heap_alloc(hash1, sizeof(ar_table));
+            if (new_tab != NULL) {
+                RHASH_SET_TRANSIENT_FLAG(hash1);
+            }
+            else {
+                RHASH_UNSET_TRANSIENT_FLAG(hash1);
+                new_tab = (ar_table*)ruby_xmalloc(sizeof(ar_table));
+            }
+        }
+        *new_tab = *old_tab;
+        RHASH(hash1)->ar_hint.word = RHASH(hash2)->ar_hint.word;
+        RHASH_AR_TABLE_BOUND_SET(hash1, RHASH_AR_TABLE_BOUND(hash2));
+        RHASH_AR_TABLE_SIZE_SET(hash1, RHASH_AR_TABLE_SIZE(hash2));
+        hash_ar_table_set(hash1, new_tab);
+
+        rb_gc_writebarrier_remember(hash1);
+        return new_tab;
+    }
+    else {
+        RHASH_AR_TABLE_BOUND_SET(hash1, RHASH_AR_TABLE_BOUND(hash2));
+        RHASH_AR_TABLE_SIZE_SET(hash1, RHASH_AR_TABLE_SIZE(hash2));
+
+        if (RHASH_TRANSIENT_P(hash1)) {
+            RHASH_UNSET_TRANSIENT_FLAG(hash1);
+        }
+        else if (RHASH_AR_TABLE(hash1)) {
+            ruby_xfree(RHASH_AR_TABLE(hash1));
+        }
+
+        hash_ar_table_set(hash1, NULL);
+
+        rb_gc_writebarrier_remember(hash1);
+        return old_tab;
+    }
+}
+
+static void
+ar_clear(VALUE hash)
+{
+    if (RHASH_AR_TABLE(hash) != NULL) {
+        RHASH_AR_TABLE_SIZE_SET(hash, 0);
+        RHASH_AR_TABLE_BOUND_SET(hash, 0);
+    }
+    else {
+        HASH_ASSERT(RHASH_AR_TABLE_SIZE(hash) == 0);
+        HASH_ASSERT(RHASH_AR_TABLE_BOUND(hash) == 0);
+    }
+}
+
+#if USE_TRANSIENT_HEAP
+void
+rb_hash_transient_heap_evacuate(VALUE hash, int promote)
+{
+    if (RHASH_TRANSIENT_P(hash)) {
+        ar_table *new_tab;
+        ar_table *old_tab = RHASH_AR_TABLE(hash);
+
+        if (UNLIKELY(old_tab == NULL)) {
+            rb_gc_force_recycle(hash);
+            return;
+        }
+        HASH_ASSERT(old_tab != NULL);
+        if (! promote) {
+            new_tab = rb_transient_heap_alloc(hash, sizeof(ar_table));
+            if (new_tab == NULL) promote = true;
+        }
+        if (promote) {
+            new_tab = ruby_xmalloc(sizeof(ar_table));
+            RHASH_UNSET_TRANSIENT_FLAG(hash);
+        }
+        *new_tab = *old_tab;
+        hash_ar_table_set(hash, new_tab);
+    }
+    hash_verify(hash);
+}
+#endif
+
 typedef int st_foreach_func(st_data_t, st_data_t, st_data_t);
 
 struct foreach_safe_arg {
@@ -300,7 +1325,7 @@ foreach_safe_i(st_data_t key, st_data_t value, st_data_t args, int error)
 }
 
 void
-st_foreach_safe(st_table *table, int (*func)(ANYARGS), st_data_t a)
+st_foreach_safe(st_table *table, st_foreach_func *func, st_data_t a)
 {
     struct foreach_safe_arg arg;
 
@@ -321,6 +1346,27 @@ struct hash_foreach_arg {
 };
 
 static int
+hash_ar_foreach_iter(st_data_t key, st_data_t value, st_data_t argp, int error)
+{
+    struct hash_foreach_arg *arg = (struct hash_foreach_arg *)argp;
+    int status;
+
+    if (error) return ST_STOP;
+    status = (*arg->func)((VALUE)key, (VALUE)value, arg->arg);
+    /* TODO: rehash check? rb_raise(rb_eRuntimeError, "rehash occurred during iteration"); */
+
+    switch (status) {
+      case ST_DELETE:
+        return ST_DELETE;
+      case ST_CONTINUE:
+        break;
+      case ST_STOP:
+        return ST_STOP;
+    }
+    return ST_CHECK;
+}
+
+static int
 hash_foreach_iter(st_data_t key, st_data_t value, st_data_t argp, int error)
 {
     struct hash_foreach_arg *arg = (struct hash_foreach_arg *)argp;
@@ -328,14 +1374,13 @@ hash_foreach_iter(st_data_t key, st_data_t value, st_data_t argp, int error)
     st_table *tbl;
 
     if (error) return ST_STOP;
-    tbl = RHASH(arg->hash)->ntbl;
+    tbl = RHASH_ST_TABLE(arg->hash);
     status = (*arg->func)((VALUE)key, (VALUE)value, arg->arg);
-    if (RHASH(arg->hash)->ntbl != tbl) {
-	rb_raise(rb_eRuntimeError, "rehash occurred during iteration");
+    if (RHASH_ST_TABLE(arg->hash) != tbl) {
+    	rb_raise(rb_eRuntimeError, "rehash occurred during iteration");
     }
     switch (status) {
       case ST_DELETE:
-	FL_SET(arg->hash, HASH_DELETED);
 	return ST_DELETE;
       case ST_CONTINUE:
 	break;
@@ -345,47 +1390,142 @@ hash_foreach_iter(st_data_t key, st_data_t value, st_data_t argp, int error)
     return ST_CHECK;
 }
 
+static int
+iter_lev_in_ivar(VALUE hash)
+{
+    VALUE levval = rb_ivar_get(hash, id_hash_iter_lev);
+    HASH_ASSERT(FIXNUM_P(levval));
+    return FIX2INT(levval);
+}
+
+void rb_ivar_set_internal(VALUE obj, ID id, VALUE val);
+
+static void
+iter_lev_in_ivar_set(VALUE hash, int lev)
+{
+    rb_ivar_set_internal(hash, id_hash_iter_lev, INT2FIX(lev));
+}
+
+static int
+iter_lev_in_flags(VALUE hash)
+{
+    unsigned int u = (unsigned int)((RBASIC(hash)->flags >> RHASH_LEV_SHIFT) & RHASH_LEV_MAX);
+    return (int)u;
+}
+
+static int
+RHASH_ITER_LEV(VALUE hash)
+{
+    int lev = iter_lev_in_flags(hash);
+
+    if (lev == RHASH_LEV_MAX) {
+        return iter_lev_in_ivar(hash);
+    }
+    else {
+        return lev;
+    }
+}
+
+static void
+hash_iter_lev_inc(VALUE hash)
+{
+    int lev = iter_lev_in_flags(hash);
+    if (lev == RHASH_LEV_MAX) {
+        lev = iter_lev_in_ivar(hash);
+        iter_lev_in_ivar_set(hash, lev+1);
+    }
+    else {
+        lev += 1;
+        RBASIC(hash)->flags = ((RBASIC(hash)->flags & ~RHASH_LEV_MASK) | ((VALUE)lev << RHASH_LEV_SHIFT));
+        if (lev == RHASH_LEV_MAX) {
+            iter_lev_in_ivar_set(hash, lev);
+        }
+    }
+}
+
+static void
+hash_iter_lev_dec(VALUE hash)
+{
+    int lev = iter_lev_in_flags(hash);
+    if (lev == RHASH_LEV_MAX) {
+        lev = iter_lev_in_ivar(hash);
+        HASH_ASSERT(lev > 0);
+        iter_lev_in_ivar_set(hash, lev-1);
+    }
+    else {
+        HASH_ASSERT(lev > 0);
+        RBASIC(hash)->flags = ((RBASIC(hash)->flags & ~RHASH_LEV_MASK) | ((lev-1) << RHASH_LEV_SHIFT));
+    }
+}
+
 static VALUE
 hash_foreach_ensure_rollback(VALUE hash)
 {
-    RHASH_ITER_LEV(hash)++;
+    hash_iter_lev_inc(hash);
     return 0;
 }
 
 static VALUE
 hash_foreach_ensure(VALUE hash)
 {
-    if (--RHASH_ITER_LEV(hash) == 0) {
-	if (FL_TEST(hash, HASH_DELETED)) {
-	    st_cleanup_safe(RHASH(hash)->ntbl, (st_data_t)Qundef);
-	    FL_UNSET(hash, HASH_DELETED);
-	}
-    }
+    hash_iter_lev_dec(hash);
     return 0;
 }
 
+int
+rb_hash_stlike_foreach(VALUE hash, st_foreach_callback_func *func, st_data_t arg)
+{
+    if (RHASH_AR_TABLE_P(hash)) {
+        return ar_foreach(hash, func, arg);
+    }
+    else {
+        return st_foreach(RHASH_ST_TABLE(hash), func, arg);
+    }
+}
+
+int
+rb_hash_stlike_foreach_with_replace(VALUE hash, st_foreach_check_callback_func *func, st_update_callback_func *replace, st_data_t arg)
+{
+    if (RHASH_AR_TABLE_P(hash)) {
+        return ar_foreach_with_replace(hash, func, replace, arg);
+    }
+    else {
+        return st_foreach_with_replace(RHASH_ST_TABLE(hash), func, replace, arg);
+    }
+}
+
 static VALUE
 hash_foreach_call(VALUE arg)
 {
     VALUE hash = ((struct hash_foreach_arg *)arg)->hash;
-    if (st_foreach_check(RHASH(hash)->ntbl, hash_foreach_iter, (st_data_t)arg, (st_data_t)Qundef)) {
-	rb_raise(rb_eRuntimeError, "hash modified during iteration");
+    int ret = 0;
+    if (RHASH_AR_TABLE_P(hash)) {
+        ret = ar_foreach_check(hash, hash_ar_foreach_iter,
+                                   (st_data_t)arg, (st_data_t)Qundef);
+    }
+    else if (RHASH_ST_TABLE_P(hash)) {
+        ret = st_foreach_check(RHASH_ST_TABLE(hash), hash_foreach_iter,
+                               (st_data_t)arg, (st_data_t)Qundef);
+    }
+    if (ret) {
+        rb_raise(rb_eRuntimeError, "ret: %d, hash modified during iteration", ret);
     }
     return Qnil;
 }
 
 void
-rb_hash_foreach(VALUE hash, int (*func)(ANYARGS), VALUE farg)
+rb_hash_foreach(VALUE hash, rb_foreach_func *func, VALUE farg)
 {
     struct hash_foreach_arg arg;
 
-    if (!RHASH(hash)->ntbl)
+    if (RHASH_TABLE_EMPTY_P(hash))
         return;
-    RHASH_ITER_LEV(hash)++;
+    hash_iter_lev_inc(hash);
     arg.hash = hash;
     arg.func = (rb_foreach_func *)func;
     arg.arg  = farg;
     rb_ensure(hash_foreach_call, (VALUE)&arg, hash_foreach_ensure, hash);
+    hash_verify(hash);
 }
 
 static VALUE
@@ -419,60 +1559,82 @@ rb_hash_new(void)
     return hash_alloc(rb_cHash);
 }
 
+MJIT_FUNC_EXPORTED VALUE
+rb_hash_new_with_size(st_index_t size)
+{
+    VALUE ret = rb_hash_new();
+    if (size == 0) {
+        /* do nothing */
+    }
+    else if (size <= RHASH_AR_TABLE_MAX_SIZE) {
+        ar_alloc_table(ret);
+    }
+    else {
+        RHASH_ST_TABLE_SET(ret, st_init_table_with_size(&objhash, size));
+    }
+    return ret;
+}
+
 static VALUE
-hash_dup(VALUE hash, VALUE klass, VALUE flags)
+hash_copy(VALUE ret, VALUE hash)
 {
-    VALUE ret = hash_alloc_flags(klass, flags,
-				 RHASH_IFNONE(hash));
-    if (!RHASH_EMPTY_P(hash))
-	RHASH(ret)->ntbl = st_copy(RHASH(hash)->ntbl);
+    if (!RHASH_EMPTY_P(hash)) {
+        if (RHASH_AR_TABLE_P(hash))
+            ar_copy(ret, hash);
+        else if (RHASH_ST_TABLE_P(hash))
+            RHASH_ST_TABLE_SET(ret, st_copy(RHASH_ST_TABLE(hash)));
+    }
     return ret;
 }
 
+static VALUE
+hash_dup(VALUE hash, VALUE klass, VALUE flags)
+{
+    return hash_copy(hash_alloc_flags(klass, flags, RHASH_IFNONE(hash)),
+                     hash);
+}
+
 VALUE
 rb_hash_dup(VALUE hash)
 {
     const VALUE flags = RBASIC(hash)->flags;
     VALUE ret = hash_dup(hash, rb_obj_class(hash),
-			 flags & (FL_EXIVAR|FL_TAINT|HASH_PROC_DEFAULT));
+                         flags & (FL_EXIVAR|RHASH_PROC_DEFAULT));
     if (flags & FL_EXIVAR)
         rb_copy_generic_ivar(ret, hash);
     return ret;
 }
 
+MJIT_FUNC_EXPORTED VALUE
+rb_hash_resurrect(VALUE hash)
+{
+    VALUE ret = hash_dup(hash, rb_cHash, 0);
+    return ret;
+}
+
 static void
 rb_hash_modify_check(VALUE hash)
 {
     rb_check_frozen(hash);
 }
 
-static struct st_table *
-hash_tbl(VALUE hash)
+MJIT_FUNC_EXPORTED struct st_table *
+rb_hash_tbl_raw(VALUE hash, const char *file, int line)
 {
-    if (!RHASH(hash)->ntbl) {
-        RHASH(hash)->ntbl = st_init_table(&objhash);
-    }
-    return RHASH(hash)->ntbl;
+    return ar_force_convert_table(hash, file, line);
 }
 
 struct st_table *
-rb_hash_tbl(VALUE hash)
+rb_hash_tbl(VALUE hash, const char *file, int line)
 {
     OBJ_WB_UNPROTECT(hash);
-    return hash_tbl(hash);
-}
-
-struct st_table *
-rb_hash_tbl_raw(VALUE hash)
-{
-    return hash_tbl(hash);
+    return rb_hash_tbl_raw(hash, file, line);
 }
 
 static void
 rb_hash_modify(VALUE hash)
 {
     rb_hash_modify_check(hash);
-    hash_tbl(hash);
 }
 
 NORETURN(static void no_new_key(void));
@@ -512,6 +1674,22 @@ struct update_arg {
 
 typedef int (*tbl_update_func)(st_data_t *, st_data_t *, st_data_t, int);
 
+int
+rb_hash_stlike_update(VALUE hash, st_data_t key, st_update_callback_func *func, st_data_t arg)
+{
+    if (RHASH_AR_TABLE_P(hash)) {
+        int result = ar_update(hash, (st_data_t)key, func, arg);
+        if (result == -1) {
+            ar_try_convert_table(hash);
+        }
+        else {
+            return result;
+        }
+    }
+
+    return st_update(RHASH_ST_TABLE(hash), (st_data_t)key, func, arg);
+}
+
 static int
 tbl_update(VALUE hash, VALUE key, tbl_update_func func, st_data_t optional_arg)
 {
@@ -525,7 +1703,7 @@ tbl_update(VALUE hash, VALUE key, tbl_update_func func, st_data_t optional_arg)
     arg.new_value = 0;
     arg.old_value = Qundef;
 
-    result = st_update(RHASH(hash)->ntbl, (st_data_t)key, func, (st_data_t)&arg);
+    result = rb_hash_stlike_update(hash, key, func, (st_data_t)&arg);
 
     /* write barrier */
     if (arg.new_key)   RB_OBJ_WRITTEN(hash, arg.old_key, arg.new_key);
@@ -555,43 +1733,39 @@ set_proc_default(VALUE hash, VALUE proc)
 	}
     }
 
-    FL_SET_RAW(hash, HASH_PROC_DEFAULT);
+    FL_SET_RAW(hash, RHASH_PROC_DEFAULT);
     RHASH_SET_IFNONE(hash, proc);
 }
 
 /*
  *  call-seq:
- *     Hash.new                          -> new_hash
- *     Hash.new(obj)                     -> new_hash
- *     Hash.new {|hash, key| block }     -> new_hash
- *
- *  Returns a new, empty hash. If this hash is subsequently accessed by
- *  a key that doesn't correspond to a hash entry, the value returned
- *  depends on the style of <code>new</code> used to create the hash. In
- *  the first form, the access returns <code>nil</code>. If
- *  <i>obj</i> is specified, this single object will be used for
- *  all <em>default values</em>. If a block is specified, it will be
- *  called with the hash object and the key, and should return the
- *  default value. It is the block's responsibility to store the value
- *  in the hash if required.
- *
- *     h = Hash.new("Go Fish")
- *     h["a"] = 100
- *     h["b"] = 200
- *     h["a"]           #=> 100
- *     h["c"]           #=> "Go Fish"
- *     # The following alters the single default object
- *     h["c"].upcase!   #=> "GO FISH"
- *     h["d"]           #=> "GO FISH"
- *     h.keys           #=> ["a", "b"]
- *
- *     # While this creates a new default object each time
- *     h = Hash.new { |hash, key| hash[key] = "Go Fish: #{key}" }
- *     h["c"]           #=> "Go Fish: c"
- *     h["c"].upcase!   #=> "GO FISH: C"
- *     h["d"]           #=> "Go Fish: d"
- *     h.keys           #=> ["c", "d"]
- *
+ *     Hash.new(default_value = nil) -> new_hash
+ *     Hash.new {|hash, key| ... } -> new_hash
+ *
+ *  Returns a new empty \Hash object.
+ *
+ *  The initial default value and initial default proc for the new hash
+ *  depend on which form above was used. See {Default Values}[#class-Hash-label-Default+Values].
+ *
+ *  If neither an argument nor a block given,
+ *  initializes both the default value and the default proc to <tt>nil</tt>:
+ *    h = Hash.new
+ *    h.default # => nil
+ *    h.default_proc # => nil
+ *
+ *  If argument <tt>default_value</tt> given but no block given,
+ *  initializes the default value to the given <tt>default_value</tt>
+ *  and the default proc to <tt>nil</tt>:
+ *    h = Hash.new(false)
+ *    h.default # => false
+ *    h.default_proc # => nil
+ *
+ *  If a block given but no argument, stores the block as the default proc
+ *  and sets the default value to <tt>nil</tt>:
+ *    h = Hash.new {|hash, key| "Default value for #{key}" }
+ *    h.default # => nil
+ *    h.default_proc.class # => Proc
+ *    h[:nosuch] # => "Default value for nosuch"
  */
 
 static VALUE
@@ -616,37 +1790,43 @@ rb_hash_initialize(int argc, VALUE *argv, VALUE hash)
 
 /*
  *  call-seq:
- *     Hash[ key, value, ... ]         -> new_hash
- *     Hash[ [ [key, value], ... ] ]   -> new_hash
- *     Hash[ object ]                  -> new_hash
+ *    Hash[] -> new_empty_hash
+ *    Hash[hash] -> new_hash
+ *    Hash[ [*2_element_arrays] ] -> new_hash
+ *    Hash[*objects] -> new_hash
+ *
+ *  Returns a new \Hash object populated with the given objects, if any.
+ *  See Hash::new.
+ *
+ *  With no argument, returns a new empty \Hash.
  *
- *  Creates a new hash populated with the given objects.
+ *  When the single given argument is a \Hash,
+ *  returns a new \Hash populated with the entries from the given \Hash.
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    Hash[h] # => {:foo=>0, :bar=>1, :baz=>2}
  *
- *  Similar to the literal <code>{ _key_ => _value_, ... }</code>. In the first
- *  form, keys and values occur in pairs, so there must be an even number of
- *  arguments.
+ *  When the single given argument is an \Array of 2-element Arrays,
+ *  returns a new \Hash object wherein each 2-element array forms a key-value entry:
+ *    Hash[ [ [:foo, 0], [:bar, 1] ] ] # => {:foo=>0, :bar=>1}
  *
- *  The second and third form take a single argument which is either an array
- *  of key-value pairs or an object convertible to a hash.
+ *  When the argument count is an even number;
+ *  returns a new \Hash object wherein each successive pair of arguments
+ *  has become a key-value entry:
+ *    Hash[:foo, 0, :bar, 1] # => {:foo=>0, :bar=>1}
  *
- *     Hash["a", 100, "b", 200]             #=> {"a"=>100, "b"=>200}
- *     Hash[ [ ["a", 100], ["b", 200] ] ]   #=> {"a"=>100, "b"=>200}
- *     Hash["a" => 100, "b" => 200]         #=> {"a"=>100, "b"=>200}
+ *  Raises an exception if the argument list does not conform to any of the above.
  */
 
 static VALUE
 rb_hash_s_create(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_hash_s_try_convert(Qnil, argv[0]);
 	if (!NIL_P(tmp)) {
 	    hash = hash_alloc(klass);
-	    if (RHASH(tmp)->ntbl) {
-		RHASH(hash)->ntbl = st_copy(RHASH(tmp)->ntbl);
-	    }
+            hash_copy(hash, tmp);
 	    return hash;
 	}
 
@@ -661,17 +1841,8 @@ rb_hash_s_create(int argc, VALUE *argv, VALUE klass)
 		VALUE key, val = Qnil;
 
 		if (NIL_P(v)) {
-#if 0 /* refix in the next release */
 		    rb_raise(rb_eArgError, "wrong element type %s at %ld (expected array)",
 			     rb_builtin_class_name(e), i);
-
-#else
-		    rb_warn("wrong element type %s at %ld (expected array)",
-			    rb_builtin_class_name(e), i);
-		    rb_warn("ignoring wrong elements is deprecated, remove them explicitly");
-		    rb_warn("this causes ArgumentError in the next release");
-		    continue;
-#endif
 		}
 		switch (RARRAY_LEN(v)) {
 		  default:
@@ -692,38 +1863,36 @@ rb_hash_s_create(int argc, VALUE *argv, VALUE klass)
     }
 
     hash = hash_alloc(klass);
-    if (argc > 0) {
-        RHASH(hash)->ntbl = st_init_table_with_size(&objhash, argc / 2);
-    }
-    for (i=0; i<argc; i+=2) {
-        rb_hash_aset(hash, argv[i], argv[i + 1]);
-    }
-
+    rb_hash_bulk_insert(argc, argv, hash);
+    hash_verify(hash);
     return hash;
 }
 
-static VALUE
-to_hash(VALUE hash)
+MJIT_FUNC_EXPORTED VALUE
+rb_to_hash_type(VALUE hash)
 {
-    return rb_convert_type(hash, T_HASH, "Hash", "to_hash");
+    return rb_convert_type_with_id(hash, T_HASH, "Hash", idTo_hash);
 }
+#define to_hash rb_to_hash_type
 
 VALUE
 rb_check_hash_type(VALUE hash)
 {
-    return rb_check_convert_type(hash, T_HASH, "Hash", "to_hash");
+    return rb_check_convert_type_with_id(hash, T_HASH, "Hash", idTo_hash);
 }
 
 /*
  *  call-seq:
- *     Hash.try_convert(obj) -> hash or nil
+ *    Hash.try_convert(obj) -> obj, new_hash, or nil
+ *
+ *  If +obj+ is a \Hash object, returns +obj+.
  *
- *  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.
+ *  Otherwise if +obj+ responds to <tt>:to_hash</tt>,
+ *  calls <tt>obj.to_hash</tt> and returns the result.
  *
- *     Hash.try_convert({1=>2})   # => {1=>2}
- *     Hash.try_convert("1=>2")   # => nil
+ *  Returns +nil+ if +obj+ does not respond to <tt>:to_hash</tt>
+ *
+ *  Raises an exception unless <tt>obj.to_hash</tt> returns a \Hash object.
  */
 static VALUE
 rb_hash_s_try_convert(VALUE dummy, VALUE hash)
@@ -731,6 +1900,52 @@ rb_hash_s_try_convert(VALUE dummy, VALUE hash)
     return rb_check_hash_type(hash);
 }
 
+/*
+ *  call-seq:
+ *     Hash.ruby2_keywords_hash?(hash) -> true or false
+ *
+ *  Checks if a given hash is flagged by Module#ruby2_keywords (or
+ *  Proc#ruby2_keywords).
+ *  This method is not for casual use; debugging, researching, and
+ *  some truly necessary cases like serialization of arguments.
+ *
+ *     ruby2_keywords def foo(*args)
+ *       Hash.ruby2_keywords_hash?(args.last)
+ *     end
+ *     foo(k: 1)   #=> true
+ *     foo({k: 1}) #=> false
+ */
+static VALUE
+rb_hash_s_ruby2_keywords_hash_p(VALUE dummy, VALUE hash)
+{
+    Check_Type(hash, T_HASH);
+    return (RHASH(hash)->basic.flags & RHASH_PASS_AS_KEYWORDS) ? Qtrue : Qfalse;
+}
+
+/*
+ *  call-seq:
+ *     Hash.ruby2_keywords_hash(hash) -> hash
+ *
+ *  Duplicates a given hash and adds a ruby2_keywords flag.
+ *  This method is not for casual use; debugging, researching, and
+ *  some truly necessary cases like deserialization of arguments.
+ *
+ *     h = {k: 1}
+ *     h = Hash.ruby2_keywords_hash(h)
+ *     def foo(k: 42)
+ *       k
+ *     end
+ *     foo(*[h]) #=> 1 with neither a warning or an error
+ */
+static VALUE
+rb_hash_s_ruby2_keywords_hash(VALUE dummy, VALUE hash)
+{
+    Check_Type(hash, T_HASH);
+    hash = rb_hash_dup(hash);
+    RHASH(hash)->basic.flags |= RHASH_PASS_AS_KEYWORDS;
+    return hash;
+}
+
 struct rehash_arg {
     VALUE hash;
     st_table *tbl;
@@ -739,30 +1954,25 @@ struct rehash_arg {
 static int
 rb_hash_rehash_i(VALUE key, VALUE value, VALUE arg)
 {
-    st_table *tbl = (st_table *)arg;
-
-    st_insert(tbl, (st_data_t)key, (st_data_t)value);
+    if (RHASH_AR_TABLE_P(arg)) {
+        ar_insert(arg, (st_data_t)key, (st_data_t)value);
+    }
+    else {
+        st_insert(RHASH_ST_TABLE(arg), (st_data_t)key, (st_data_t)value);
+    }
     return ST_CONTINUE;
 }
 
 /*
  *  call-seq:
- *     hsh.rehash -> hsh
- *
- *  Rebuilds the hash based on the current hash values for each key. If
- *  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, a
- *  <code>RuntimeError</code> will be raised in the iterator.
- *
- *     a = [ "a", "b" ]
- *     c = [ "c", "d" ]
- *     h = { a => 100, c => 300 }
- *     h[a]       #=> 100
- *     a[0] = "z"
- *     h[a]       #=> nil
- *     h.rehash   #=> {["z", "b"]=>100, ["c", "d"]=>300}
- *     h[a]       #=> 100
+ *     hash.rehash -> self
+ *
+ *  Rebuilds the hash table by recomputing the hash index for each key;
+ *  returns <tt>self</tt>.
+ *
+ *  The hash table becomes invalid if the hash value of a key
+ *  has changed after the entry was created.
+ *  See {Modifying an Active Hash Key}[#class-Hash-label-Modifying+an+Active+Hash+Key].
  */
 
 VALUE
@@ -775,46 +1985,80 @@ rb_hash_rehash(VALUE hash)
 	rb_raise(rb_eRuntimeError, "rehash during iteration");
     }
     rb_hash_modify_check(hash);
-    if (!RHASH(hash)->ntbl)
-        return hash;
-    tmp = hash_alloc(0);
-    tbl = st_init_table_with_size(RHASH(hash)->ntbl->type, RHASH(hash)->ntbl->num_entries);
-    RHASH(tmp)->ntbl = tbl;
-
-    rb_hash_foreach(hash, rb_hash_rehash_i, (VALUE)tbl);
-    st_free_table(RHASH(hash)->ntbl);
-    RHASH(hash)->ntbl = tbl;
-    RHASH(tmp)->ntbl = 0;
-
+    if (RHASH_AR_TABLE_P(hash)) {
+        tmp = hash_alloc(0);
+        ar_alloc_table(tmp);
+        rb_hash_foreach(hash, rb_hash_rehash_i, (VALUE)tmp);
+        ar_free_and_clear_table(hash);
+        ar_copy(hash, tmp);
+        ar_free_and_clear_table(tmp);
+    }
+    else if (RHASH_ST_TABLE_P(hash)) {
+        st_table *old_tab = RHASH_ST_TABLE(hash);
+        tmp = hash_alloc(0);
+        tbl = st_init_table_with_size(old_tab->type, old_tab->num_entries);
+        RHASH_ST_TABLE_SET(tmp, tbl);
+        rb_hash_foreach(hash, rb_hash_rehash_i, (VALUE)tmp);
+        st_free_table(old_tab);
+        RHASH_ST_TABLE_SET(hash, tbl);
+        RHASH_ST_CLEAR(tmp);
+    }
+    hash_verify(hash);
     return hash;
 }
 
+static VALUE
+call_default_proc(VALUE proc, VALUE hash, VALUE key)
+{
+    VALUE args[2] = {hash, key};
+    return rb_proc_call_with_block(proc, 2, args, Qnil);
+}
+
 VALUE
 rb_hash_default_value(VALUE hash, VALUE key)
 {
-    if (rb_method_basic_definition_p(CLASS_OF(hash), id_default)) {
+    if (LIKELY(rb_method_basic_definition_p(CLASS_OF(hash), id_default))) {
 	VALUE ifnone = RHASH_IFNONE(hash);
-	if (!FL_TEST(hash, HASH_PROC_DEFAULT)) return ifnone;
+        if (!FL_TEST(hash, RHASH_PROC_DEFAULT)) return ifnone;
 	if (key == Qundef) return Qnil;
-	return rb_funcall(ifnone, id_yield, 2, hash, key);
+        return call_default_proc(ifnone, hash, key);
     }
     else {
 	return rb_funcall(hash, id_default, 1, key);
     }
 }
 
+static inline int
+hash_stlike_lookup(VALUE hash, st_data_t key, st_data_t *pval)
+{
+    hash_verify(hash);
+
+    if (RHASH_AR_TABLE_P(hash)) {
+        return ar_lookup(hash, key, pval);
+    }
+    else {
+        return st_lookup(RHASH_ST_TABLE(hash), key, pval);
+    }
+}
+
+MJIT_FUNC_EXPORTED int
+rb_hash_stlike_lookup(VALUE hash, st_data_t key, st_data_t *pval)
+{
+    return hash_stlike_lookup(hash, key, pval);
+}
+
 /*
  *  call-seq:
- *     hsh[key]    ->  value
- *
- *  Element Reference---Retrieves the <i>value</i> object corresponding
- *  to the <i>key</i> object. If not found, returns the default value (see
- *  <code>Hash::new</code> for details).
+ *    hash[key] -> value
  *
- *     h = { "a" => 100, "b" => 200 }
- *     h["a"]   #=> 100
- *     h["c"]   #=> nil
+ *  Returns the value associated with the given +key+, if found:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h[:foo] # => 0
  *
+ *  If +key+ is not found, returns a default value
+ *  (see {Default Values}[#class-Hash-label-Default+Values]):
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h[:nosuch] # => nil
  */
 
 VALUE
@@ -822,10 +2066,12 @@ rb_hash_aref(VALUE hash, VALUE key)
 {
     st_data_t val;
 
-    if (!RHASH(hash)->ntbl || !st_lookup(RHASH(hash)->ntbl, key, &val)) {
-	return rb_hash_default_value(hash, key);
+    if (hash_stlike_lookup(hash, key, &val)) {
+        return (VALUE)val;
+    }
+    else {
+        return rb_hash_default_value(hash, key);
     }
-    return (VALUE)val;
 }
 
 VALUE
@@ -833,10 +2079,12 @@ rb_hash_lookup2(VALUE hash, VALUE key, VALUE def)
 {
     st_data_t val;
 
-    if (!RHASH(hash)->ntbl || !st_lookup(RHASH(hash)->ntbl, key, &val)) {
-	return def; /* without Hash#default */
+    if (hash_stlike_lookup(hash, key, &val)) {
+        return (VALUE)val;
+    }
+    else {
+        return def; /* without Hash#default */
     }
-    return (VALUE)val;
 }
 
 VALUE
@@ -847,31 +2095,26 @@ rb_hash_lookup(VALUE hash, VALUE key)
 
 /*
  *  call-seq:
- *     hsh.fetch(key [, default] )       -> obj
- *     hsh.fetch(key) {| key | block }   -> obj
- *
- *  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
- *  given, then that will be returned; if the optional code block is
- *  specified, then that will be run and its result returned.
- *
- *     h = { "a" => 100, "b" => 200 }
- *     h.fetch("a")                            #=> 100
- *     h.fetch("z", "go fish")                 #=> "go fish"
- *     h.fetch("z") { |el| "go fish, #{el}"}   #=> "go fish, z"
+ *    hash.fetch(key) -> object
+ *    hash.fetch(key, default_value) -> object
+ *    hash.fetch(key) {|key| ... } -> object
  *
- *  The following example shows that an exception is raised if the key
- *  is not found and a default value is not supplied.
+ *  Returns the value for the given +key+, if found.
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h.fetch(:bar) # => 1
  *
- *     h = { "a" => 100, "b" => 200 }
- *     h.fetch("z")
+ *  If +key+ is not found and no block was given,
+ *  returns +default_value+:
+ *    {}.fetch(:nosuch, :default) # => :default
+ *    {}.fetch(:nosuch) # => nil
  *
- *  <em>produces:</em>
+ *  If +key+ is not found and a block was given,
+ *  yields +key+ to the block and returns the block's return value:
+ *    {}.fetch(:nosuch) {|key| "No key #{key}"} # => "No key nosuch"
  *
- *     prog.rb:2:in `fetch': key not found (KeyError)
- *      from prog.rb:2
+ *  Raises KeyError if neither +default_value+ nor a block was given.
  *
+ *  Note that this method does not use the values of either #default or #default_proc.
  */
 
 static VALUE
@@ -888,19 +2131,26 @@ rb_hash_fetch_m(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 (block_given) return rb_yield(key);
-	if (argc == 1) {
-	    VALUE desc = rb_protect(rb_inspect, key, 0);
-	    if (NIL_P(desc)) {
-		desc = rb_any_to_s(key);
-	    }
-	    desc = rb_str_ellipsize(desc, 65);
-	    rb_raise(rb_eKeyError, "key not found: %"PRIsVALUE, desc);
-	}
-	return argv[1];
+
+    if (hash_stlike_lookup(hash, key, &val)) {
+        return (VALUE)val;
+    }
+    else {
+        if (block_given) {
+            return rb_yield(key);
+        }
+        else if (argc == 1) {
+            VALUE desc = rb_protect(rb_inspect, key, 0);
+            if (NIL_P(desc)) {
+                desc = rb_any_to_s(key);
+            }
+            desc = rb_str_ellipsize(desc, 65);
+            rb_key_err_raise(rb_sprintf("key not found: %"PRIsVALUE, desc), hash, key);
+        }
+        else {
+            return argv[1];
+        }
     }
-    return (VALUE)val;
 }
 
 VALUE
@@ -911,59 +2161,49 @@ rb_hash_fetch(VALUE hash, VALUE key)
 
 /*
  *  call-seq:
- *     hsh.default(key=nil)   -> obj
- *
- *  Returns the default value, the value that would be returned by
- *  <i>hsh</i>[<i>key</i>] if <i>key</i> did not exist in <i>hsh</i>.
- *  See also <code>Hash::new</code> and <code>Hash#default=</code>.
- *
- *     h = Hash.new                            #=> {}
- *     h.default                               #=> nil
- *     h.default(2)                            #=> nil
- *
- *     h = Hash.new("cat")                     #=> {}
- *     h.default                               #=> "cat"
- *     h.default(2)                            #=> "cat"
- *
- *     h = Hash.new {|h,k| h[k] = k.to_i*10}   #=> {}
- *     h.default                               #=> nil
- *     h.default(2)                            #=> 20
+ *    hash.default -> object
+ *    hash.default(key) -> object
+ *
+ *  Returns the default value for the given +key+.
+ *  The returned value will be determined either by the default proc or by the default value.
+ *  See {Default Values}[#class-Hash-label-Default+Values].
+ *
+ *  With no argument, returns the current default value:
+ *    h = {}
+ *    h.default # => nil
+ *
+ *  If +key+ is given, returns the default value for +key+,
+ *  regardless of whether that key exists:
+ *    h = Hash.new { |hash, key| hash[key] = "No key #{key}"}
+ *    h[:foo] = "Hello"
+ *    h.default(:foo) # => "No key foo"
  */
 
 static VALUE
 rb_hash_default(int argc, VALUE *argv, VALUE hash)
 {
-    VALUE args[2], ifnone;
+    VALUE ifnone;
 
     rb_check_arity(argc, 0, 1);
     ifnone = RHASH_IFNONE(hash);
-    if (FL_TEST(hash, HASH_PROC_DEFAULT)) {
+    if (FL_TEST(hash, RHASH_PROC_DEFAULT)) {
 	if (argc == 0) return Qnil;
-	args[0] = hash;
-	args[1] = argv[0];
-	return rb_funcallv(ifnone, id_yield, 2, args);
+	return call_default_proc(ifnone, hash, argv[0]);
     }
     return ifnone;
 }
 
 /*
  *  call-seq:
- *     hsh.default = obj     -> obj
- *
- *  Sets the default value, the value returned for a key that does not
- *  exist in the hash. It is not possible to set the default to a
- *  <code>Proc</code> that will be executed on each key lookup.
- *
- *     h = { "a" => 100, "b" => 200 }
- *     h.default = "Go fish"
- *     h["a"]     #=> 100
- *     h["z"]     #=> "Go fish"
- *     # This doesn't do what you might hope...
- *     h.default = proc do |hash, key|
- *       hash[key] = key + key
- *     end
- *     h[2]       #=> #<Proc:0x401b3948@-:6>
- *     h["cat"]   #=> #<Proc:0x401b3948@-:6>
+ *    hash.default = value -> object
+ *
+ *  Sets the default value to +value+; returns +value+:
+ *    h = {}
+ *    h.default # => nil
+ *    h.default = false # => false
+ *    h.default # => false
+ *
+ *  See {Default Values}[#class-Hash-label-Default+Values].
  */
 
 static VALUE
@@ -976,23 +2216,20 @@ rb_hash_set_default(VALUE hash, VALUE ifnone)
 
 /*
  *  call-seq:
- *     hsh.default_proc -> anObject
- *
- *  If <code>Hash::new</code> was invoked with a block, return that
- *  block, otherwise return <code>nil</code>.
- *
- *     h = Hash.new {|h,k| h[k] = k*k }   #=> {}
- *     p = h.default_proc                 #=> #<Proc:0x401b3d08@-:1>
- *     a = []                             #=> []
- *     p.call(a, 2)
- *     a                                  #=> [nil, nil, 4]
+ *    hash.default_proc -> proc or nil
+ *
+ *  Returns the default proc for +self+
+ *  (see {Default Values}[#class-Hash-label-Default+Values]):
+ *    h = {}
+ *    h.default_proc # => nil
+ *    h.default_proc = proc {|hash, key| "Default value for #{key}" }
+ *    h.default_proc.class # => Proc
  */
 
-
 static VALUE
 rb_hash_default_proc(VALUE hash)
 {
-    if (FL_TEST(hash, HASH_PROC_DEFAULT)) {
+    if (FL_TEST(hash, RHASH_PROC_DEFAULT)) {
 	return RHASH_IFNONE(hash);
     }
     return Qnil;
@@ -1000,15 +2237,16 @@ rb_hash_default_proc(VALUE hash)
 
 /*
  *  call-seq:
- *     hsh.default_proc = proc_obj or nil
- *
- *  Sets the default proc to be executed on each failed key lookup.
- *
- *     h.default_proc = proc do |hash, key|
- *       hash[key] = key + key
- *     end
- *     h[2]       #=> 4
- *     h["cat"]   #=> "catcat"
+ *    hash.default_proc = proc -> proc
+ *
+ *  Sets the default proc for +self+ to +proc+:
+ *  (see {Default Values}[#class-Hash-label-Default+Values]):
+ *    h = {}
+ *    h.default_proc # => nil
+ *    h.default_proc = proc { |hash, key| "Default value for #{key}" }
+ *    h.default_proc.class # => Proc
+ *    h.default_proc = nil
+ *    h.default_proc # => nil
  */
 
 VALUE
@@ -1021,7 +2259,7 @@ rb_hash_set_default_proc(VALUE hash, VALUE proc)
 	SET_DEFAULT(hash, proc);
 	return proc;
     }
-    b = rb_check_convert_type(proc, T_DATA, "Proc", "to_proc");
+    b = rb_check_convert_type_with_id(proc, T_DATA, "Proc", idTo_proc);
     if (NIL_P(b) || !rb_obj_is_proc(b)) {
 	rb_raise(rb_eTypeError,
 		 "wrong default_proc type %s (expected Proc)",
@@ -1046,16 +2284,15 @@ key_i(VALUE key, VALUE value, VALUE arg)
 
 /*
  *  call-seq:
- *     hsh.key(value)    -> key
- *
- *  Returns the key of an occurrence of a given value. If the value is
- *  not found, returns <code>nil</code>.
+ *    hash.key(value) -> key or nil
  *
- *     h = { "a" => 100, "b" => 200, "c" => 300, "d" => 300 }
- *     h.key(200)   #=> "b"
- *     h.key(300)   #=> "c"
- *     h.key(999)   #=> nil
+ *  Returns the key for the first-found entry with the given +value+
+ *  (see {Entry Order}[#class-Hash-label-Entry+Order]):
+ *    h = {foo: 0, bar: 2, baz: 2}
+ *    h.key(0) # => :foo
+ *    h.key(2) # => :bar
  *
+ *  Returns +nil+ if so such value is found.
  */
 
 static VALUE
@@ -1071,12 +2308,15 @@ rb_hash_key(VALUE hash, VALUE value)
     return args[1];
 }
 
-/* :nodoc: */
-static VALUE
-rb_hash_index(VALUE hash, VALUE value)
+int
+rb_hash_stlike_delete(VALUE hash, st_data_t *pkey, st_data_t *pval)
 {
-    rb_warn("Hash#index is deprecated; use Hash#key");
-    return rb_hash_key(hash, value);
+    if (RHASH_AR_TABLE_P(hash)) {
+        return ar_delete(hash, pkey, pval);
+    }
+    else {
+        return st_delete(RHASH_ST_TABLE(hash), pkey, pval);
+    }
 }
 
 /*
@@ -1089,19 +2329,11 @@ rb_hash_delete_entry(VALUE hash, VALUE key)
 {
     st_data_t ktmp = (st_data_t)key, val;
 
-    if (!RHASH(hash)->ntbl) {
-	return Qundef;
-    }
-    else if (RHASH_ITER_LEV(hash) > 0 &&
-	     (st_delete_safe(RHASH(hash)->ntbl, &ktmp, &val, (st_data_t)Qundef))) {
-	FL_SET(hash, HASH_DELETED);
-	return (VALUE)val;
-    }
-    else if (st_delete(RHASH(hash)->ntbl, &ktmp, &val)) {
-	return (VALUE)val;
+    if (rb_hash_stlike_delete(hash, &ktmp, &val)) {
+        return (VALUE)val;
     }
     else {
-	return Qundef;
+        return Qundef;
     }
 }
 
@@ -1125,20 +2357,29 @@ rb_hash_delete(VALUE hash, VALUE key)
 
 /*
  *  call-seq:
- *     hsh.delete(key)                   -> value
- *     hsh.delete(key) {| key | block }  -> value
+ *    hash.delete(key) -> value or nil
+ *    hash.delete(key) {|key| ... } -> object
  *
- *  Deletes the key-value pair and returns the value from <i>hsh</i> whose
- *  key is equal to <i>key</i>. If the key is not found, it returns
- *  <em>nil</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>.
+ *  Deletes the entry for the given +key+ and returns its associated value.
  *
- *     h = { "a" => 100, "b" => 200 }
- *     h.delete("a")                              #=> 100
- *     h.delete("z")                              #=> nil
- *     h.delete("z") { |el| "#{el} not found" }   #=> "z not found"
+ *  If no block is given and +key+ is found, deletes the entry and returns the associated value:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h.delete(:bar) # => 1
+ *    h # => {:foo=>0, :baz=>2}
  *
+ *  If no block given and +key+ is not found, returns +nil+.
+ *
+ *  If a block is given and +key+ is found, ignores the block,
+ *  deletes the entry, and returns the associated value:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h.delete(:baz) { |key| raise 'Will never happen'} # => 2
+ *    h # => {:foo=>0, :bar=>1}
+ *
+ *  If a block is given and +key+ is not found,
+ *  calls the block and returns the block's return value:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h.delete(:nosuch) { |key| "Key #{key} not found" } # => "Key nosuch not found"
+ *    h # => {:foo=>0, :bar=>1, :baz=>2}
  */
 
 static VALUE
@@ -1179,15 +2420,17 @@ shift_i_safe(VALUE key, VALUE value, VALUE arg)
 
 /*
  *  call-seq:
- *     hsh.shift -> anArray or obj
+ *    hash.shift -> [key, value] or default_value
  *
- *  Removes a key-value pair from <i>hsh</i> and returns it as the
- *  two-item array <code>[</code> <i>key, value</i> <code>]</code>, or
- *  the hash's default value if the hash is empty.
+ *  Removes the first hash entry
+ *  (see {Entry Order}[#class-Hash-label-Entry+Order]);
+ *  returns a 2-element \Array containing the removed key and value:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h.shift # => [:foo, 0]
+ *    h # => {:bar=>1, :baz=>2}
  *
- *     h = { 1 => "a", 2 => "b", 3 => "c" }
- *     h.shift   #=> [1, "a"]
- *     h         #=> {2=>"b", 3=>"c"}
+ *  Returns the default value if the hash is empty
+ *  (see {Default Values}[#class-Hash-label-Default+Values]).
  */
 
 static VALUE
@@ -1196,14 +2439,29 @@ rb_hash_shift(VALUE hash)
     struct shift_var var;
 
     rb_hash_modify_check(hash);
-    if (RHASH(hash)->ntbl) {
+    if (RHASH_AR_TABLE_P(hash)) {
 	var.key = Qundef;
 	if (RHASH_ITER_LEV(hash) == 0) {
-	    if (st_shift(RHASH(hash)->ntbl, &var.key, &var.val)) {
+            if (ar_shift(hash, &var.key, &var.val)) {
 		return rb_assoc_new(var.key, var.val);
 	    }
 	}
 	else {
+            rb_hash_foreach(hash, shift_i_safe, (VALUE)&var);
+            if (var.key != Qundef) {
+                rb_hash_delete_entry(hash, var.key);
+                return rb_assoc_new(var.key, var.val);
+            }
+        }
+    }
+    if (RHASH_ST_TABLE_P(hash)) {
+        var.key = Qundef;
+        if (RHASH_ITER_LEV(hash) == 0) {
+            if (st_shift(RHASH_ST_TABLE(hash), &var.key, &var.val)) {
+                return rb_assoc_new(var.key, var.val);
+            }
+        }
+        else {
 	    rb_hash_foreach(hash, shift_i_safe, (VALUE)&var);
 	    if (var.key != Qundef) {
 		rb_hash_delete_entry(hash, var.key);
@@ -1218,6 +2476,7 @@ static int
 delete_if_i(VALUE key, VALUE value, VALUE hash)
 {
     if (RTEST(rb_yield_values(2, key, value))) {
+	rb_hash_modify(hash);
 	return ST_DELETE;
     }
     return ST_CONTINUE;
@@ -1231,17 +2490,19 @@ hash_enum_size(VALUE hash, VALUE args, VALUE eobj)
 
 /*
  *  call-seq:
- *     hsh.delete_if {| key, value | block }  -> hsh
- *     hsh.delete_if                          -> an_enumerator
- *
- *  Deletes every key-value pair from <i>hsh</i> for which <i>block</i>
- *  evaluates to <code>true</code>.
- *
- *  If no block is given, an enumerator is returned instead.
- *
- *     h = { "a" => 100, "b" => 200, "c" => 300 }
- *     h.delete_if {|key, value| key >= "b" }   #=> {"a"=>100}
- *
+ *    hash.delete_if {|key, value| ... } -> self
+ *    hash.delete_if -> new_enumerator
+ *
+ *  If a block given, calls the block with each key-value pair;
+ *  deletes each entry for which the block returns a truthy value;
+ *  returns +self+:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h.delete_if {|key, value| value > 0 } # => {:foo=>0}
+ *
+ *  If no block given, returns a new \Enumerator:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    e = h.delete_if # => #<Enumerator: {:foo=>0, :bar=>1, :baz=>2}:delete_if>
+ *    e.each { |key, value| value > 0 } # => {:foo=>0}
  */
 
 VALUE
@@ -1249,18 +2510,28 @@ rb_hash_delete_if(VALUE hash)
 {
     RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size);
     rb_hash_modify_check(hash);
-    if (RHASH(hash)->ntbl)
-	rb_hash_foreach(hash, delete_if_i, hash);
+    if (!RHASH_TABLE_EMPTY_P(hash)) {
+        rb_hash_foreach(hash, delete_if_i, hash);
+    }
     return hash;
 }
 
 /*
  *  call-seq:
- *     hsh.reject! {| key, value | block }  -> hsh or nil
- *     hsh.reject!                          -> an_enumerator
+ *    hash.reject! {|key, value| ... } -> self or nil
+ *    hash.reject! -> new_enumerator
+ *
+ *  Returns +self+, whose remaining entries are those
+ *  for which the block returns +false+ or +nil+:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h.reject! {|key, value| value < 2 } # => {:baz=>2}
  *
- *  Equivalent to <code>Hash#delete_if</code>, but returns
- *  <code>nil</code> if no changes were made.
+ *  Returns +nil+ if no entries are removed.
+ *
+ *  Returns a new \Enumerator if no block given:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    e = h.reject! # => #<Enumerator: {:foo=>0, :bar=>1, :baz=>2}:reject!>
+ *    e.each {|key, value| key.start_with?('b') } # => {:foo=>0}
  */
 
 VALUE
@@ -1273,7 +2544,7 @@ rb_hash_reject_bang(VALUE hash)
     n = RHASH_SIZE(hash);
     if (!n) return Qnil;
     rb_hash_foreach(hash, delete_if_i, hash);
-    if (n == RHASH(hash)->ntbl->num_entries) return Qnil;
+    if (n == RHASH_SIZE(hash)) return Qnil;
     return hash;
 }
 
@@ -1288,16 +2559,20 @@ reject_i(VALUE key, VALUE value, VALUE result)
 
 /*
  *  call-seq:
- *     hsh.reject {|key, value| block}   -> a_hash
- *     hsh.reject                        -> an_enumerator
- *
- *  Returns a new hash consisting of entries for which the block returns false.
- *
- *  If no block is given, an enumerator is returned instead.
- *
- *     h = { "a" => 100, "b" => 200, "c" => 300 }
- *     h.reject {|k,v| k < "b"}  #=> {"b" => 200, "c" => 300}
- *     h.reject {|k,v| v > 100}  #=> {"a" => 100}
+ *    hash.reject {|key, value| ... } -> new_hash
+ *    hash.reject -> new_enumerator
+ *
+ *  Returns a new \Hash object whose entries are all those
+ *  from +self+ for which the block returns +false+ or +nil+:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h1 = h.reject {|key, value| key.start_with?('b') }
+ *    h1 # => {:foo=>0}
+ *
+ *  Returns a new \Enumerator if no block given:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    e = h.reject # => #<Enumerator: {:foo=>0, :bar=>1, :baz=>2}:reject>
+ *    h1 = e.each {|key, value| key.start_with?('b') }
+ *    h1 # => {:foo=>0}
  */
 
 VALUE
@@ -1320,14 +2595,76 @@ rb_hash_reject(VALUE hash)
 }
 
 /*
- * call-seq:
- *   hsh.values_at(key, ...)   -> array
+ *  call-seq:
+ *    hash.slice(*keys) -> new_hash
+ *
+ *  Returns a new \Hash object containing the entries for the given +keys+:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h.slice(:baz, :foo) # => {:baz=>2, :foo=>0}
+ *
+ *  Any given +keys+ that are not found are ignored.
+ */
+
+static VALUE
+rb_hash_slice(int argc, VALUE *argv, VALUE hash)
+{
+    int i;
+    VALUE key, value, result;
+
+    if (argc == 0 || RHASH_EMPTY_P(hash)) {
+	return rb_hash_new();
+    }
+    result = rb_hash_new_with_size(argc);
+
+    for (i = 0; i < argc; i++) {
+	key = argv[i];
+	value = rb_hash_lookup2(hash, key, Qundef);
+	if (value != Qundef)
+	    rb_hash_aset(result, key, value);
+    }
+
+    return result;
+}
+
+/*
+ *  call-seq:
+ *     hsh.except(*keys) -> a_hash
  *
- * Return an array containing the values associated with the given keys.
- * Also see <code>Hash.select</code>.
+ *  Returns a new \Hash excluding entries for the given +keys+:
+ *     h = { a: 100, b: 200, c: 300 }
+ *     h.except(:a)          #=> {:b=>200, :c=>300}
  *
- *   h = { "cat" => "feline", "dog" => "canine", "cow" => "bovine" }
- *   h.values_at("cow", "cat")  #=> ["bovine", "feline"]
+ *  Any given +keys+ that are not found are ignored.
+ */
+
+static VALUE
+rb_hash_except(int argc, VALUE *argv, VALUE hash)
+{
+    int i;
+    VALUE key, result;
+
+    result = hash_alloc(rb_cHash);
+    hash_copy(result, hash);
+
+    for (i = 0; i < argc; i++) {
+        key = argv[i];
+        rb_hash_delete(result, key);
+    }
+
+    return result;
+}
+
+/*
+ *  call-seq:
+ *    hash.values_at(*keys) -> new_array
+ *
+ *  Returns a new \Array containing values for the given +keys+:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h.values_at(:baz, :foo) # => [2, 0]
+ *
+ *  The {default values}[#class-Hash-label-Default+Values] are returned
+ *  for any keys that are not found:
+ *    h.values_at(:hello, :foo) # => [nil, 0]
  */
 
 VALUE
@@ -1343,22 +2680,26 @@ rb_hash_values_at(int argc, VALUE *argv, VALUE hash)
 }
 
 /*
- * call-seq:
- *   hsh.fetch_values(key, ...)                 -> array
- *   hsh.fetch_values(key, ...) { |key| block } -> array
+ *  call-seq:
+ *    hash.fetch_values(*keys) -> new_array
+ *    hash.fetch_values(*keys) {|key| ... } -> new_array
+ *
+ *  Returns a new \Array containing the values associated with the given keys *keys:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h.fetch_values(:baz, :foo) # => [2, 0]
  *
- * Returns an array containing the values associated with the given keys
- * but also raises <code>KeyError</code> when one of keys can't be found.
- * Also see <code>Hash#values_at</code> and <code>Hash#fetch</code>.
+ *  Returns a new empty \Array if no arguments given.
  *
- *   h = { "cat" => "feline", "dog" => "canine", "cow" => "bovine" }
+ *  When a block is given, calls the block with each missing key,
+ *  treating the block's return value as the value for that key:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    values = h.fetch_values(:bar, :foo, :bad, :bam) {|key| key.to_s}
+ *    values # => [1, 0, "bad", "bam"]
  *
- *   h.fetch_values("cow", "cat")                   #=> ["bovine", "feline"]
- *   h.fetch_values("cow", "bird")                  # raises KeyError
- *   h.fetch_values("cow", "bird") { |k| k.upcase } #=> ["bovine", "BIRD"]
+ *  When no block is given, raises an exception if any given key is not found.
  */
 
-VALUE
+static VALUE
 rb_hash_fetch_values(int argc, VALUE *argv, VALUE hash)
 {
     VALUE result = rb_ary_new2(argc);
@@ -1381,19 +2722,22 @@ select_i(VALUE key, VALUE value, VALUE result)
 
 /*
  *  call-seq:
- *     hsh.select {|key, value| block}   -> a_hash
- *     hsh.select                        -> an_enumerator
+ *    hash.select {|key, value| ... } -> new_hash
+ *    hash.select -> new_enumerator
  *
- *  Returns a new hash consisting of entries for which the block returns true.
+ *  Hash#filter is an alias for Hash#select.
  *
- *  If no block is given, an enumerator is returned instead.
+ *  Returns a new \Hash object whose entries are those for which the block returns a truthy value:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h.select {|key, value| value < 2 } # => {:foo=>0, :bar=>1}
  *
- *     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}
+ *  Returns a new \Enumerator if no block given:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    e = h.select # => #<Enumerator: {:foo=>0, :bar=>1, :baz=>2}:select>
+ *    e.each {|key, value| value < 2 } # => {:foo=>0, :bar=>1}
  */
 
-VALUE
+static VALUE
 rb_hash_select(VALUE hash)
 {
     VALUE result;
@@ -1410,6 +2754,7 @@ static int
 keep_if_i(VALUE key, VALUE value, VALUE hash)
 {
     if (!RTEST(rb_yield_values(2, key, value))) {
+	rb_hash_modify(hash);
 	return ST_DELETE;
     }
     return ST_CONTINUE;
@@ -1417,47 +2762,62 @@ keep_if_i(VALUE key, VALUE value, VALUE hash)
 
 /*
  *  call-seq:
- *     hsh.select! {| key, value | block }  -> hsh or nil
- *     hsh.select!                          -> an_enumerator
+ *    hash.select! {|key, value| ... } -> self or nil
+ *    hash.select! -> new_enumerator
  *
- *  Equivalent to <code>Hash#keep_if</code>, but returns
- *  <code>nil</code> if no changes were made.
+ *  Hash#filter! is an alias for Hash#select!.
+ *
+ *  Returns +self+, whose entries are those for which the block returns a truthy value:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h.select! {|key, value| value < 2 }  => {:foo=>0, :bar=>1}
+ *
+ *  Returns +nil+ if no entries were removed.
+ *
+ *  Returns a new \Enumerator if no block given:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    e = h.select!  # => #<Enumerator: {:foo=>0, :bar=>1, :baz=>2}:select!>
+ *    e.each { |key, value| value < 2 } # => {:foo=>0, :bar=>1}
  */
 
-VALUE
+static VALUE
 rb_hash_select_bang(VALUE hash)
 {
     st_index_t n;
 
     RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size);
     rb_hash_modify_check(hash);
-    if (!RHASH(hash)->ntbl)
-        return Qnil;
-    n = RHASH(hash)->ntbl->num_entries;
+    n = RHASH_SIZE(hash);
+    if (!n) return Qnil;
     rb_hash_foreach(hash, keep_if_i, hash);
-    if (n == RHASH(hash)->ntbl->num_entries) return Qnil;
+    if (n == RHASH_SIZE(hash)) return Qnil;
     return hash;
 }
 
 /*
  *  call-seq:
- *     hsh.keep_if {| key, value | block }  -> hsh
- *     hsh.keep_if                          -> an_enumerator
- *
- *  Deletes every key-value pair from <i>hsh</i> for which <i>block</i>
- *  evaluates to false.
- *
- *  If no block is given, an enumerator is returned instead.
- *
+ *    hash.keep_if {|key, value| ... } -> self
+ *    hash.keep_if -> new_enumerator
+ *
+ *  Calls the block for each key-value pair;
+ *  retains the entry if the block returns a truthy value;
+ *  otherwise deletes the entry; returns +self+.
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h.keep_if { |key, value| key.start_with?('b') } # => {:bar=>1, :baz=>2}
+ *
+ *  Returns a new \Enumerator if no block given:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    e = h.keep_if # => #<Enumerator: {:foo=>0, :bar=>1, :baz=>2}:keep_if>
+ *    e.each { |key, value| key.start_with?('b') } # => {:bar=>1, :baz=>2}
  */
 
-VALUE
+static VALUE
 rb_hash_keep_if(VALUE hash)
 {
     RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size);
     rb_hash_modify_check(hash);
-    if (RHASH(hash)->ntbl)
-	rb_hash_foreach(hash, keep_if_i, hash);
+    if (!RHASH_TABLE_EMPTY_P(hash)) {
+        rb_hash_foreach(hash, keep_if_i, hash);
+    }
     return hash;
 }
 
@@ -1469,26 +2829,24 @@ clear_i(VALUE key, VALUE value, VALUE dummy)
 
 /*
  *  call-seq:
- *     hsh.clear -> hsh
- *
- *  Removes all key-value pairs from <i>hsh</i>.
- *
- *     h = { "a" => 100, "b" => 200 }   #=> {"a"=>100, "b"=>200}
- *     h.clear                          #=> {}
+ *    hash.clear -> self
  *
+ *  Removes all hash entries; returns +self+.
  */
 
 VALUE
 rb_hash_clear(VALUE hash)
 {
     rb_hash_modify_check(hash);
-    if (!RHASH(hash)->ntbl)
-        return hash;
-    if (RHASH(hash)->ntbl->num_entries > 0) {
-	if (RHASH_ITER_LEV(hash) > 0)
-	    rb_hash_foreach(hash, clear_i, 0);
-	else
-	    st_clear(RHASH(hash)->ntbl);
+
+    if (RHASH_ITER_LEV(hash) > 0) {
+        rb_hash_foreach(hash, clear_i, 0);
+    }
+    else if (RHASH_AR_TABLE_P(hash)) {
+        ar_clear(hash);
+    }
+    else {
+        st_clear(RHASH_ST_TABLE(hash));
     }
 
     return hash;
@@ -1509,11 +2867,22 @@ hash_aset(st_data_t *key, st_data_t *val, struct update_arg *arg, int existing)
     return ST_CONTINUE;
 }
 
+VALUE
+rb_hash_key_str(VALUE key)
+{
+    if (!RB_FL_ANY_RAW(key, FL_EXIVAR) && RBASIC_CLASS(key) == rb_cString) {
+        return rb_fstring(key);
+    }
+    else {
+	return rb_str_new_frozen(key);
+    }
+}
+
 static int
 hash_aset_str(st_data_t *key, st_data_t *val, struct update_arg *arg, int existing)
 {
-    if (!existing) {
-	*key = rb_str_new_frozen(*key);
+    if (!existing && !RB_OBJ_FROZEN(*key)) {
+	*key = rb_hash_key_str(*key);
     }
     return hash_aset(key, val, arg, existing);
 }
@@ -1523,43 +2892,43 @@ NOINSERT_UPDATE_CALLBACK(hash_aset_str)
 
 /*
  *  call-seq:
- *     hsh[key] = value        -> value
- *     hsh.store(key, value)   -> value
- *
- *  == Element Assignment
- *
- *  Associates the value given by +value+ with the key given by +key+.
- *
- *     h = { "a" => 100, "b" => 200 }
- *     h["a"] = 9
- *     h["c"] = 4
- *     h   #=> {"a"=>9, "b"=>200, "c"=>4}
- *     h.store("d", 42) #=> 42
- *     h   #=> {"a"=>9, "b"=>200, "c"=>4, "d"=>42}
- *
- *  +key+ should not have its value changed while it is in use as a key (an
- *  <tt>unfrozen String</tt> passed as a key will be duplicated and frozen).
- *
- *     a = "a"
- *     b = "b".freeze
- *     h = { a => 100, b => 200 }
- *     h.key(100).equal? a #=> false
- *     h.key(200).equal? b #=> true
- *
+ *    hash[key] = value -> value
+ *    hash.store(key, value)
+ *
+ *  Hash#store is an alias for Hash#[]=.
+
+ *  Associates the given +value+ with the given +key+; returns +value+.
+ *
+ *  If the given +key+ exists, replaces its value with the given +value+;
+ *  the ordering is not affected
+ *  (see {Entry Order}[#class-Hash-label-Entry+Order]):
+ *    h = {foo: 0, bar: 1}
+ *    h[:foo] = 2 # => 2
+ *    h.store(:bar, 3) # => 3
+ *    h # => {:foo=>2, :bar=>3}
+ *
+ *  If +key+ does not exist, adds the +key+ and +value+;
+ *  the new entry is last in the order
+ *  (see {Entry Order}[#class-Hash-label-Entry+Order]):
+ *    h = {foo: 0, bar: 1}
+ *    h[:baz] = 2 # => 2
+ *    h.store(:bat, 3) # => 3
+ *    h # => {:foo=>0, :bar=>1, :baz=>2, :bat=>3}
  */
 
 VALUE
 rb_hash_aset(VALUE hash, VALUE key, VALUE val)
 {
     int iter_lev = RHASH_ITER_LEV(hash);
-    st_table *tbl = RHASH(hash)->ntbl;
 
     rb_hash_modify(hash);
-    if (!tbl) {
+
+    if (RHASH_TABLE_NULL_P(hash)) {
 	if (iter_lev > 0) no_new_key();
-	tbl = hash_tbl(hash);
+        ar_alloc_table(hash);
     }
-    if (tbl->type == &identhash || rb_obj_class(key) != rb_cString) {
+
+    if (RHASH_TYPE(hash) == &identhash || rb_obj_class(key) != rb_cString) {
 	RHASH_UPDATE_ITER(hash, iter_lev, key, hash_aset, val);
     }
     else {
@@ -1568,86 +2937,63 @@ rb_hash_aset(VALUE hash, VALUE key, VALUE val)
     return val;
 }
 
-static int
-replace_i(VALUE key, VALUE val, VALUE hash)
-{
-    rb_hash_aset(hash, key, val);
-
-    return ST_CONTINUE;
-}
-
-/* :nodoc: */
-static VALUE
-rb_hash_initialize_copy(VALUE hash, VALUE hash2)
-{
-    st_table *ntbl;
-
-    rb_hash_modify_check(hash);
-    hash2 = to_hash(hash2);
-
-    Check_Type(hash2, T_HASH);
-
-    if (hash == hash2) return hash;
-
-    ntbl = RHASH(hash)->ntbl;
-    if (RHASH(hash2)->ntbl) {
-	if (ntbl) st_free_table(ntbl);
-        RHASH(hash)->ntbl = st_copy(RHASH(hash2)->ntbl);
-	if (RHASH(hash)->ntbl->num_entries)
-	    rb_hash_rehash(hash);
-    }
-    else if (ntbl) {
-	st_clear(ntbl);
-    }
-
-    COPY_DEFAULT(hash, hash2);
-
-    return hash;
-}
-
 /*
  *  call-seq:
- *     hsh.replace(other_hash) -> hsh
- *
- *  Replaces the contents of <i>hsh</i> with the contents of
- *  <i>other_hash</i>.
- *
- *     h = { "a" => 100, "b" => 200 }
- *     h.replace({ "c" => 300, "d" => 400 })   #=> {"c"=>300, "d"=>400}
+ *    hash.replace(other_hash) -> self
  *
+ *  Replaces the entire contents of +self+ with the contents of +other_hash+;
+ *  returns +self+:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h.replace({bat: 3, bam: 4}) # => {:bat=>3, :bam=>4}
  */
 
 static VALUE
 rb_hash_replace(VALUE hash, VALUE hash2)
 {
-    st_table *table2;
-
     rb_hash_modify_check(hash);
     if (hash == hash2) return hash;
+    if (RHASH_ITER_LEV(hash) > 0) {
+        rb_raise(rb_eRuntimeError, "can't replace hash during iteration");
+    }
     hash2 = to_hash(hash2);
 
     COPY_DEFAULT(hash, hash2);
 
-    table2 = RHASH(hash2)->ntbl;
+    if (RHASH_AR_TABLE_P(hash)) {
+        if (RHASH_AR_TABLE_P(hash2)) {
+            ar_clear(hash);
+        }
+        else {
+            ar_free_and_clear_table(hash);
+            RHASH_ST_TABLE_SET(hash, st_init_table_with_size(RHASH_TYPE(hash2), RHASH_SIZE(hash2)));
+        }
+    }
+    else {
+        if (RHASH_AR_TABLE_P(hash2)) {
+            st_free_table(RHASH_ST_TABLE(hash));
+            RHASH_ST_CLEAR(hash);
+        }
+        else {
+            st_clear(RHASH_ST_TABLE(hash));
+            RHASH_TBL_RAW(hash)->type = RHASH_ST_TABLE(hash2)->type;
+        }
+    }
+    rb_hash_foreach(hash2, rb_hash_rehash_i, (VALUE)hash);
 
-    rb_hash_clear(hash);
-    if (table2) hash_tbl(hash)->type = table2->type;
-    rb_hash_foreach(hash2, replace_i, hash);
+    rb_gc_writebarrier_remember(hash);
 
     return hash;
 }
 
 /*
  *  call-seq:
- *     hsh.length    ->  fixnum
- *     hsh.size      ->  fixnum
+ *     hash.length -> integer
+ *     hash.size -> integer
  *
- *  Returns the number of key-value pairs in the hash.
+ *  Returns the count of entries in +self+:
+ *    {foo: 0, bar: 1, baz: 2}.length # => 3
  *
- *     h = { "d" => 100, "a" => 200, "v" => 300, "e" => 400 }
- *     h.length        #=> 4
- *     h.delete("a")   #=> 200
- *     h.length        #=> 3
+ *  Hash#length is an alias for Hash#size.
  */
 
 VALUE
@@ -1656,15 +3002,19 @@ rb_hash_size(VALUE hash)
     return INT2FIX(RHASH_SIZE(hash));
 }
 
+size_t
+rb_hash_size_num(VALUE hash)
+{
+    return (long)RHASH_SIZE(hash);
+}
 
 /*
  *  call-seq:
- *     hsh.empty?    -> true or false
- *
- *  Returns <code>true</code> if <i>hsh</i> contains no key-value pairs.
- *
- *     {}.empty?   #=> true
+ *    hash.empty? -> true or false
  *
+ *  Returns +true+ if there are no hash entries, +false+ otherwise:
+ *    {}.empty? # => true
+ *    {foo: 0, bar: 1, baz: 2}.empty? # => false
  */
 
 static VALUE
@@ -1674,7 +3024,7 @@ rb_hash_empty_p(VALUE hash)
 }
 
 static int
-each_value_i(VALUE key, VALUE value)
+each_value_i(VALUE key, VALUE value, VALUE _)
 {
     rb_yield(value);
     return ST_CONTINUE;
@@ -1682,21 +3032,26 @@ each_value_i(VALUE key, VALUE value)
 
 /*
  *  call-seq:
- *     hsh.each_value {| value | block } -> hsh
- *     hsh.each_value                    -> an_enumerator
- *
- *  Calls <i>block</i> once for each key in <i>hsh</i>, passing the
- *  value as a parameter.
- *
- *  If no block is given, an enumerator is returned instead.
- *
- *     h = { "a" => 100, "b" => 200 }
- *     h.each_value {|value| puts value }
- *
- *  <em>produces:</em>
- *
- *     100
- *     200
+ *    hash.each_value {|value| ... } -> self
+ *    hash.each_value -> new_enumerator
+ *
+ *  Calls the given block with each value; returns +self+:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h.each_value {|value| puts value } # => {:foo=>0, :bar=>1, :baz=>2}
+ *  Output:
+ *    0
+ *    1
+ *    2
+ *
+ *  Returns a new \Enumerator if no block given:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    e = h.each_value # => #<Enumerator: {:foo=>0, :bar=>1, :baz=>2}:each_value>
+ *    h1 = e.each {|value| puts value }
+ *    h1 # => {:foo=>0, :bar=>1, :baz=>2}
+ *  Output:
+ *    0
+ *    1
+ *    2
  */
 
 static VALUE
@@ -1708,7 +3063,7 @@ rb_hash_each_value(VALUE hash)
 }
 
 static int
-each_key_i(VALUE key, VALUE value)
+each_key_i(VALUE key, VALUE value, VALUE _)
 {
     rb_yield(key);
     return ST_CONTINUE;
@@ -1716,21 +3071,26 @@ each_key_i(VALUE key, VALUE value)
 
 /*
  *  call-seq:
- *     hsh.each_key {| key | block } -> hsh
- *     hsh.each_key                  -> an_enumerator
- *
- *  Calls <i>block</i> once for each key in <i>hsh</i>, passing the key
- *  as a parameter.
- *
- *  If no block is given, an enumerator is returned instead.
- *
- *     h = { "a" => 100, "b" => 200 }
- *     h.each_key {|key| puts key }
- *
- *  <em>produces:</em>
- *
- *     a
- *     b
+ *    hash.each_key {|key| ... } -> self
+ *    hash.each_key -> new_enumerator
+ *
+ *  Calls the given block with each key; returns +self+:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h.each_key {|key| puts key }  # => {:foo=>0, :bar=>1, :baz=>2}
+ *  Output:
+ *    foo
+ *    bar
+ *    baz
+ *
+ *  Returns a new \Enumerator if no block given:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    e = h.each_key # => #<Enumerator: {:foo=>0, :bar=>1, :baz=>2}:each_key>
+ *    h1 = e.each {|key| puts key }
+ *    h1 # => {:foo=>0, :bar=>1, :baz=>2}
+ *  Output:
+ *    foo
+ *    bar
+ *    baz
  */
 static VALUE
 rb_hash_each_key(VALUE hash)
@@ -1741,52 +3101,296 @@ rb_hash_each_key(VALUE hash)
 }
 
 static int
-each_pair_i(VALUE key, VALUE value)
+each_pair_i(VALUE key, VALUE value, VALUE _)
 {
     rb_yield(rb_assoc_new(key, value));
     return ST_CONTINUE;
 }
 
 static int
-each_pair_i_fast(VALUE key, VALUE value)
+each_pair_i_fast(VALUE key, VALUE value, VALUE _)
 {
-    rb_yield_values(2, key, value);
+    VALUE argv[2];
+    argv[0] = key;
+    argv[1] = value;
+    rb_yield_values2(2, argv);
     return ST_CONTINUE;
 }
 
 /*
  *  call-seq:
- *     hsh.each      {| key, value | block } -> hsh
- *     hsh.each_pair {| key, value | block } -> hsh
- *     hsh.each                              -> an_enumerator
- *     hsh.each_pair                         -> an_enumerator
- *
- *  Calls <i>block</i> once for each key in <i>hsh</i>, passing the key-value
- *  pair as parameters.
- *
- *  If no block is given, an enumerator is returned instead.
- *
- *     h = { "a" => 100, "b" => 200 }
- *     h.each {|key, value| puts "#{key} is #{value}" }
- *
- *  <em>produces:</em>
- *
- *     a is 100
- *     b is 200
- *
+ *    hash.each {|key, value| ... } -> self
+ *    hash.each_pair {|key, value| ... } -> self
+ *    hash.each -> new_enumerator
+ *    hash.each_pair -> new_enumerator
+ *
+ *  Hash#each is an alias for Hash#each_pair.
+
+ *  Calls the given block with each key-value pair; returns +self+:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h.each_pair {|key, value| puts "#{key}: #{value}"} # => {:foo=>0, :bar=>1, :baz=>2}
+ *  Output:
+ *    foo: 0
+ *    bar: 1
+ *    baz: 2
+ *
+ *  Returns a new \Enumerator if no block given:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    e = h.each_pair # => #<Enumerator: {:foo=>0, :bar=>1, :baz=>2}:each_pair>
+ *    h1 = e.each {|key, value| puts "#{key}: #{value}"}
+ *    h1 # => {:foo=>0, :bar=>1, :baz=>2}
+ *  Output:
+ *    foo: 0
+ *    bar: 1
+ *    baz: 2
  */
 
 static VALUE
 rb_hash_each_pair(VALUE hash)
 {
     RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size);
-    if (rb_block_arity() > 1)
+    if (rb_block_pair_yield_optimizable())
 	rb_hash_foreach(hash, each_pair_i_fast, 0);
     else
 	rb_hash_foreach(hash, each_pair_i, 0);
     return hash;
 }
 
+struct transform_keys_args{
+    VALUE trans;
+    VALUE result;
+    int block_given;
+};
+
+static int
+transform_keys_hash_i(VALUE key, VALUE value, VALUE transarg)
+{
+    struct transform_keys_args *p = (void *)transarg;
+    VALUE trans = p->trans, result = p->result;
+    VALUE new_key = rb_hash_lookup2(trans, key, Qundef);
+    if (new_key == Qundef) {
+        if (p->block_given)
+            new_key = rb_yield(key);
+        else
+            new_key = key;
+    }
+    rb_hash_aset(result, new_key, value);
+    return ST_CONTINUE;
+}
+
+static int
+transform_keys_i(VALUE key, VALUE value, VALUE result)
+{
+    VALUE new_key = rb_yield(key);
+    rb_hash_aset(result, new_key, value);
+    return ST_CONTINUE;
+}
+
+/*
+ *  call-seq:
+ *    hash.transform_keys {|key| ... } -> new_hash
+ *    hash.transform_keys(hash2) -> new_hash
+ *    hash.transform_keys(hash2) {|other_key| ...} -> new_hash
+ *    hash.transform_keys -> new_enumerator
+ *
+ *  Returns a new \Hash object; each entry has:
+ *  * A key provided by the block.
+ *  * The value from +self+.
+ *
+ *  An optional hash argument can be provided to map keys to new keys.
+ *  Any key not given will be mapped using the provided block,
+ *  or remain the same if no block is given.
+ *
+ *  Transform keys:
+ *      h = {foo: 0, bar: 1, baz: 2}
+ *      h1 = h.transform_keys {|key| key.to_s }
+ *      h1 # => {"foo"=>0, "bar"=>1, "baz"=>2}
+ *
+ *      h.transform_keys(foo: :bar, bar: :foo)
+ *      #=> {bar: 0, foo: 1, baz: 2}
+ *
+ *      h.transform_keys(foo: :hello, &:to_s)
+ *      #=> {:hello=>0, "bar"=>1, "baz"=>2}
+ *
+ *  Overwrites values for duplicate keys:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h1 = h.transform_keys {|key| :bat }
+ *    h1 # => {:bat=>2}
+ *
+ *  Returns a new \Enumerator if no block given:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    e = h.transform_keys # => #<Enumerator: {:foo=>0, :bar=>1, :baz=>2}:transform_keys>
+ *    h1 = e.each { |key| key.to_s }
+ *    h1 # => {"foo"=>0, "bar"=>1, "baz"=>2}
+ */
+static VALUE
+rb_hash_transform_keys(int argc, VALUE *argv, VALUE hash)
+{
+    VALUE result;
+    struct transform_keys_args transarg = {0};
+
+    argc = rb_check_arity(argc, 0, 1);
+    if (argc > 0) {
+        transarg.trans = to_hash(argv[0]);
+        transarg.block_given = rb_block_given_p();
+    }
+    else {
+        RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size);
+    }
+    result = rb_hash_new();
+    if (!RHASH_EMPTY_P(hash)) {
+        if (transarg.trans) {
+            transarg.result = result;
+            rb_hash_foreach(hash, transform_keys_hash_i, (VALUE)&transarg);
+        }
+        else {
+            rb_hash_foreach(hash, transform_keys_i, result);
+        }
+    }
+
+    return result;
+}
+
+static int flatten_i(VALUE key, VALUE val, VALUE ary);
+
+/*
+ *  call-seq:
+ *    hash.transform_keys! {|key| ... } -> self
+ *    hash.transform_keys!(hash2) -> self
+ *    hash.transform_keys!(hash2) {|other_key| ...} -> self
+ *    hash.transform_keys! -> new_enumerator
+ *
+ *  Same as Hash#transform_keys but modifies the receiver in place
+ *  instead of returning a new hash.
+ */
+static VALUE
+rb_hash_transform_keys_bang(int argc, VALUE *argv, VALUE hash)
+{
+    VALUE trans = 0;
+    int block_given = 0;
+
+    argc = rb_check_arity(argc, 0, 1);
+    if (argc > 0) {
+        trans = to_hash(argv[0]);
+        block_given = rb_block_given_p();
+    }
+    else {
+        RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size);
+    }
+    rb_hash_modify_check(hash);
+    if (!RHASH_TABLE_EMPTY_P(hash)) {
+        long i;
+        VALUE new_keys = hash_alloc(0);
+        VALUE pairs = rb_ary_tmp_new(RHASH_SIZE(hash) * 2);
+        rb_hash_foreach(hash, flatten_i, pairs);
+        for (i = 0; i < RARRAY_LEN(pairs); i += 2) {
+            VALUE key = RARRAY_AREF(pairs, i), new_key, val;
+
+            if (!trans) {
+                new_key = rb_yield(key);
+            }
+            else if ((new_key = rb_hash_lookup2(trans, key, Qundef)) != Qundef) {
+                /* use the transformed key */
+            }
+            else if (block_given) {
+                new_key = rb_yield(key);
+            }
+            else {
+                new_key = key;
+            }
+            val = RARRAY_AREF(pairs, i+1);
+            if (!hash_stlike_lookup(new_keys, key, NULL)) {
+                rb_hash_stlike_delete(hash, &key, NULL);
+            }
+            rb_hash_aset(hash, new_key, val);
+            rb_hash_aset(new_keys, new_key, Qnil);
+        }
+        rb_ary_clear(pairs);
+        rb_hash_clear(new_keys);
+    }
+    return hash;
+}
+
+static int
+transform_values_foreach_func(st_data_t key, st_data_t value, st_data_t argp, int error)
+{
+    return ST_REPLACE;
+}
+
+static int
+transform_values_foreach_replace(st_data_t *key, st_data_t *value, st_data_t argp, int existing)
+{
+    VALUE new_value = rb_yield((VALUE)*value);
+    VALUE hash = (VALUE)argp;
+    rb_hash_modify(hash);
+    RB_OBJ_WRITE(hash, value, new_value);
+    return ST_CONTINUE;
+}
+
+/*
+ *  call-seq:
+ *    hash.transform_values {|value| ... } -> new_hash
+ *    hash.transform_values -> new_enumerator
+ *
+ *  Returns a new \Hash object; each entry has:
+ *  * A key from +self+.
+ *  * A value provided by the block.
+ *
+ *  Transform values:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h1 = h.transform_values {|value| value * 100}
+ *    h1 # => {:foo=>0, :bar=>100, :baz=>200}
+ *
+ *  Returns a new \Enumerator if no block given:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    e = h.transform_values # => #<Enumerator: {:foo=>0, :bar=>1, :baz=>2}:transform_values>
+ *    h1 = e.each { |value| value * 100}
+ *    h1 # => {:foo=>0, :bar=>100, :baz=>200}
+ */
+static VALUE
+rb_hash_transform_values(VALUE hash)
+{
+    VALUE result;
+
+    RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size);
+    result = hash_copy(hash_alloc(rb_cHash), hash);
+    SET_DEFAULT(result, Qnil);
+
+    if (!RHASH_EMPTY_P(hash)) {
+        rb_hash_stlike_foreach_with_replace(result, transform_values_foreach_func, transform_values_foreach_replace, result);
+    }
+
+    return result;
+}
+
+/*
+ *  call-seq:
+ *    hash.transform_values! {|value| ... } -> self
+ *    hash.transform_values! -> new_enumerator
+ *
+ *  Returns +self+, whose keys are unchanged, and whose values are determined by the given block.
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h.transform_values! {|value| value * 100} # => {:foo=>0, :bar=>100, :baz=>200}
+ *
+ *  Returns a new \Enumerator if no block given:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    e = h.transform_values! # => #<Enumerator: {:foo=>0, :bar=>100, :baz=>200}:transform_values!>
+ *    h1 = e.each {|value| value * 100}
+ *    h1 # => {:foo=>0, :bar=>100, :baz=>200}
+ */
+static VALUE
+rb_hash_transform_values_bang(VALUE hash)
+{
+    RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size);
+    rb_hash_modify_check(hash);
+
+    if (!RHASH_TABLE_EMPTY_P(hash)) {
+        rb_hash_stlike_foreach_with_replace(hash, transform_values_foreach_func, transform_values_foreach_replace, hash);
+    }
+
+    return hash;
+}
+
 static int
 to_a_i(VALUE key, VALUE value, VALUE ary)
 {
@@ -1796,13 +3400,12 @@ to_a_i(VALUE key, VALUE value, VALUE ary)
 
 /*
  *  call-seq:
- *     hsh.to_a -> array
- *
- *  Converts <i>hsh</i> to a nested array of <code>[</code> <i>key,
- *  value</i> <code>]</code> arrays.
+ *    hash.to_a -> new_array
  *
- *     h = { "c" => 300, "a" => 100, "d" => 400, "c" => 300  }
- *     h.to_a   #=> [["c", 300], ["a", 100], ["d", 400]]
+ *  Returns a new \Array of 2-element \Array objects;
+ *  each nested \Array contains a key-value pair from +self+:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h.to_a # => [[:foo, 0], [:bar, 1], [:baz, 2]]
  */
 
 static VALUE
@@ -1812,7 +3415,6 @@ rb_hash_to_a(VALUE hash)
 
     ary = rb_ary_new_capa(RHASH_SIZE(hash));
     rb_hash_foreach(hash, to_a_i, ary);
-    OBJ_INFECT(ary, hash);
 
     return ary;
 }
@@ -1830,11 +3432,9 @@ inspect_i(VALUE key, VALUE value, VALUE str)
 	rb_enc_copy(str, str2);
     }
     rb_str_buf_append(str, str2);
-    OBJ_INFECT(str, str2);
     rb_str_buf_cat_ascii(str, "=>");
     str2 = rb_inspect(value);
     rb_str_buf_append(str, str2);
-    OBJ_INFECT(str, str2);
 
     return ST_CONTINUE;
 }
@@ -1848,20 +3448,19 @@ inspect_hash(VALUE hash, VALUE dummy, int recur)
     str = rb_str_buf_new2("{");
     rb_hash_foreach(hash, inspect_i, str);
     rb_str_buf_cat2(str, "}");
-    OBJ_INFECT(str, hash);
 
     return str;
 }
 
 /*
- * call-seq:
- *   hsh.to_s     -> string
- *   hsh.inspect  -> string
+ *  call-seq:
+ *    hash.inspect -> new_string
  *
- * Return the contents of this hash as a string.
+ *  Returns a new \String containing the hash entries:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h.inspect # => "{:foo=>0, :bar=>1, :baz=>2}"
  *
- *     h = { "c" => 300, "a" => 100, "d" => 400, "c" => 300  }
- *     h.to_s   #=> "{\"c\"=>300, \"a\"=>100, \"d\"=>400}"
+ *  Hash#to_s is an alias for Hash#inspect.
  */
 
 static VALUE
@@ -1873,32 +3472,78 @@ rb_hash_inspect(VALUE hash)
 }
 
 /*
- * call-seq:
- *    hsh.to_hash   => hsh
+ *  call-seq:
+ *    hash.to_hash -> self
  *
- * Returns +self+.
+ *  Returns +self+.
  */
-
 static VALUE
 rb_hash_to_hash(VALUE hash)
 {
     return hash;
 }
 
+VALUE
+rb_hash_set_pair(VALUE hash, VALUE arg)
+{
+    VALUE pair;
+
+    pair = rb_check_array_type(arg);
+    if (NIL_P(pair)) {
+        rb_raise(rb_eTypeError, "wrong element type %s (expected array)",
+                 rb_builtin_class_name(arg));
+    }
+    if (RARRAY_LEN(pair) != 2) {
+        rb_raise(rb_eArgError, "element has wrong array length (expected 2, was %ld)",
+                 RARRAY_LEN(pair));
+    }
+    rb_hash_aset(hash, RARRAY_AREF(pair, 0), RARRAY_AREF(pair, 1));
+    return hash;
+}
+
+static int
+to_h_i(VALUE key, VALUE value, VALUE hash)
+{
+    rb_hash_set_pair(hash, rb_yield_values(2, key, value));
+    return ST_CONTINUE;
+}
+
+static VALUE
+rb_hash_to_h_block(VALUE hash)
+{
+    VALUE h = rb_hash_new_with_size(RHASH_SIZE(hash));
+    rb_hash_foreach(hash, to_h_i, h);
+    return h;
+}
+
 /*
  *  call-seq:
- *     hsh.to_h     -> hsh or new_hash
+ *    hash.to_h -> self or new_hash
+ *    hash.to_h {|key, value| ... } -> new_hash
  *
- *  Returns +self+. If called on a subclass of Hash, converts
- *  the receiver to a Hash object.
+ *  For an instance of \Hash, returns +self+.
+ *
+ *  For a subclass of \Hash, returns a new \Hash
+ *  containing the content of +self+.
+ *
+ *  When a block is given, returns a new \Hash object
+ *  whose content is based on the block;
+ *  the block should return a 2-element \Array object
+ *  specifying the key-value pair to be included in the returned \Array:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h1 = h.to_h {|key, value| [value, key] }
+ *    h1 # => {0=>:foo, 1=>:bar, 2=>:baz}
  */
 
 static VALUE
 rb_hash_to_h(VALUE hash)
 {
+    if (rb_block_given_p()) {
+        return rb_hash_to_h_block(hash);
+    }
     if (rb_obj_class(hash) != rb_cHash) {
 	const VALUE flags = RBASIC(hash)->flags;
-	hash = hash_dup(hash, rb_cHash, flags & HASH_PROC_DEFAULT);
+        hash = hash_dup(hash, rb_cHash, flags & RHASH_PROC_DEFAULT);
     }
     return hash;
 }
@@ -1912,32 +3557,32 @@ keys_i(VALUE key, VALUE value, VALUE ary)
 
 /*
  *  call-seq:
- *     hsh.keys    -> array
- *
- *  Returns a new array populated with the keys from this hash. See also
- *  <code>Hash#values</code>.
- *
- *     h = { "a" => 100, "b" => 200, "c" => 300, "d" => 400 }
- *     h.keys   #=> ["a", "b", "c", "d"]
+ *    hash.keys -> new_array
  *
+ *  Returns a new \Array containing all keys in +self+:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h.keys # => [:foo, :bar, :baz]
  */
 
-VALUE
+MJIT_FUNC_EXPORTED VALUE
 rb_hash_keys(VALUE hash)
 {
-    VALUE keys;
     st_index_t size = RHASH_SIZE(hash);
+    VALUE keys =  rb_ary_new_capa(size);
 
-    keys = rb_ary_new_capa(size);
     if (size == 0) return keys;
 
     if (ST_DATA_COMPATIBLE_P(VALUE)) {
-	st_table *table = RHASH(hash)->ntbl;
-
-	rb_gc_writebarrier_remember(keys);
-	RARRAY_PTR_USE(keys, ptr, {
-	    size = st_keys_check(table, ptr, size, Qundef);
-	});
+        RARRAY_PTR_USE_TRANSIENT(keys, ptr, {
+            if (RHASH_AR_TABLE_P(hash)) {
+                size = ar_keys(hash, ptr, size);
+            }
+            else {
+                st_table *table = RHASH_ST_TABLE(hash);
+                size = st_keys(table, ptr, size);
+            }
+        });
+        rb_gc_writebarrier_remember(keys);
 	rb_ary_set_len(keys, size);
     }
     else {
@@ -1956,14 +3601,11 @@ values_i(VALUE key, VALUE value, VALUE ary)
 
 /*
  *  call-seq:
- *     hsh.values    -> array
- *
- *  Returns a new array populated with the values from <i>hsh</i>. See
- *  also <code>Hash#keys</code>.
- *
- *     h = { "a" => 100, "b" => 200, "c" => 300 }
- *     h.values   #=> [100, 200, 300]
+ *    hash.values -> new_array
  *
+ *  Returns a new \Array containing all values in +self+:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h.values # => [0, 1, 2]
  */
 
 VALUE
@@ -1976,14 +3618,22 @@ rb_hash_values(VALUE hash)
     if (size == 0) return values;
 
     if (ST_DATA_COMPATIBLE_P(VALUE)) {
-	st_table *table = RHASH(hash)->ntbl;
-
-	rb_gc_writebarrier_remember(values);
-	RARRAY_PTR_USE(values, ptr, {
-	    size = st_values_check(table, ptr, size, Qundef);
-	});
+        if (RHASH_AR_TABLE_P(hash)) {
+            rb_gc_writebarrier_remember(values);
+            RARRAY_PTR_USE_TRANSIENT(values, ptr, {
+                size = ar_values(hash, ptr, size);
+            });
+        }
+        else if (RHASH_ST_TABLE_P(hash)) {
+            st_table *table = RHASH_ST_TABLE(hash);
+            rb_gc_writebarrier_remember(values);
+            RARRAY_PTR_USE_TRANSIENT(values, ptr, {
+                size = st_values(table, ptr, size);
+            });
+        }
 	rb_ary_set_len(values, size);
     }
+
     else {
 	rb_hash_foreach(hash, values_i, values);
     }
@@ -1993,32 +3643,25 @@ rb_hash_values(VALUE hash)
 
 /*
  *  call-seq:
- *     hsh.has_key?(key)    -> true or false
- *     hsh.include?(key)    -> true or false
- *     hsh.key?(key)        -> true or false
- *     hsh.member?(key)     -> true or false
- *
- *  Returns <code>true</code> if the given key is present in <i>hsh</i>.
- *
- *     h = { "a" => 100, "b" => 200 }
- *     h.has_key?("a")   #=> true
- *     h.has_key?("z")   #=> false
- *
- *  Note that <code>include?</code> and <code>member?</code> do not test member
- *  equality using <code>==</code> as do other Enumerables.
+ *    hash.include?(key) -> true or false
+ *    hash.has_key?(key) -> true or false
+ *    hash.key?(key) -> true or false
+ *    hash.member?(key) -> true or false
+
+ *  Methods #has_key?, #key?, and #member? are aliases for \#include?.
  *
- *  See also Enumerable#include?
+ *  Returns +true+ if +key+ is a key in +self+, otherwise +false+.
  */
 
-VALUE
+MJIT_FUNC_EXPORTED VALUE
 rb_hash_has_key(VALUE hash, VALUE key)
 {
-    if (!RHASH(hash)->ntbl)
+    if (hash_stlike_lookup(hash, key, NULL)) {
+        return Qtrue;
+    }
+    else {
         return Qfalse;
-    if (st_lookup(RHASH(hash)->ntbl, key, 0)) {
-	return Qtrue;
     }
-    return Qfalse;
 }
 
 static int
@@ -2035,15 +3678,9 @@ rb_hash_search_value(VALUE key, VALUE value, VALUE arg)
 
 /*
  *  call-seq:
- *     hsh.has_value?(value)    -> true or false
- *     hsh.value?(value)        -> true or false
+ *    hash.has_value?(value) -> true or false
  *
- *  Returns <code>true</code> if the given value is present for some key
- *  in <i>hsh</i>.
- *
- *     h = { "a" => 100, "b" => 200 }
- *     h.has_value?(100)   #=> true
- *     h.has_value?(999)   #=> false
+ *  Returns +true+ if +value+ is a value in +self+, otherwise +false+.
  */
 
 static VALUE
@@ -2059,7 +3696,7 @@ rb_hash_has_value(VALUE hash, VALUE val)
 
 struct equal_data {
     VALUE result;
-    st_table *tbl;
+    VALUE hash;
     int eql;
 };
 
@@ -2069,15 +3706,17 @@ eql_i(VALUE key, VALUE val1, VALUE arg)
     struct equal_data *data = (struct equal_data *)arg;
     st_data_t val2;
 
-    if (!st_lookup(data->tbl, key, &val2)) {
-	data->result = Qfalse;
-	return ST_STOP;
+    if (!hash_stlike_lookup(data->hash, key, &val2)) {
+        data->result = Qfalse;
+        return ST_STOP;
     }
-    if (!(data->eql ? rb_eql(val1, (VALUE)val2) : (int)rb_equal(val1, (VALUE)val2))) {
-	data->result = Qfalse;
-	return ST_STOP;
+    else {
+        if (!(data->eql ? rb_eql(val1, (VALUE)val2) : (int)rb_equal(val1, (VALUE)val2))) {
+            data->result = Qfalse;
+            return ST_STOP;
+        }
+        return ST_CONTINUE;
     }
-    return ST_CONTINUE;
 }
 
 static VALUE
@@ -2117,44 +3756,42 @@ hash_equal(VALUE hash1, VALUE hash2, int eql)
     }
     if (RHASH_SIZE(hash1) != RHASH_SIZE(hash2))
 	return Qfalse;
-    if (!RHASH(hash1)->ntbl || !RHASH(hash2)->ntbl)
-        return Qtrue;
-    if (RHASH(hash1)->ntbl->type != RHASH(hash2)->ntbl->type)
-	return Qfalse;
+    if (!RHASH_TABLE_EMPTY_P(hash1) && !RHASH_TABLE_EMPTY_P(hash2)) {
+        if (RHASH_TYPE(hash1) != RHASH_TYPE(hash2)) {
+            return Qfalse;
+        }
+        else {
+            data.hash = hash2;
+            data.eql = eql;
+            return rb_exec_recursive_paired(recursive_eql, hash1, hash2, (VALUE)&data);
+        }
+    }
+
 #if 0
     if (!(rb_equal(RHASH_IFNONE(hash1), RHASH_IFNONE(hash2)) &&
-	  FL_TEST(hash1, HASH_PROC_DEFAULT) == FL_TEST(hash2, HASH_PROC_DEFAULT)))
+          FL_TEST(hash1, RHASH_PROC_DEFAULT) == FL_TEST(hash2, RHASH_PROC_DEFAULT)))
 	return Qfalse;
 #endif
-
-    data.tbl = RHASH(hash2)->ntbl;
-    data.eql = eql;
-    return rb_exec_recursive_paired(recursive_eql, hash1, hash2, (VALUE)&data);
+    return Qtrue;
 }
 
 /*
  *  call-seq:
- *     hsh == other_hash    -> true or false
- *
- *  Equality---Two hashes are equal if they each contain the same number
- *  of keys and if each key-value pair is equal to (according to
- *  <code>Object#==</code>) the corresponding elements in the other
- *  hash.
- *
- *     h1 = { "a" => 1, "c" => 2 }
- *     h2 = { 7 => 35, "c" => 2, "a" => 1 }
- *     h3 = { "a" => 1, "c" => 2, 7 => 35 }
- *     h4 = { "a" => 1, "d" => 2, "f" => 35 }
- *     h1 == h2   #=> false
- *     h2 == h3   #=> true
- *     h3 == h4   #=> false
+ *    hash == object -> true or false
  *
- *  The orders of each hashes are not compared.
+ *  Returns +true+ if all of the following are true:
+ *  * +object+ is a \Hash object.
+ *  * +hash+ and +object+ have the same keys (regardless of order).
+ *  * For each key +key+, <tt>hash[key] == object[key]</tt>.
  *
- *     h1 = { "a" => 1, "c" => 2 }
- *     h2 = { "c" => 2, "a" => 1 }
- *     h1 == h2   #=> true
+ *  Otherwise, returns +false+.
  *
+ *  Equal:
+ *    h1 = {foo: 0, bar: 1, baz: 2}
+ *    h2 = {foo: 0, bar: 1, baz: 2}
+ *    h1 == h2 # => true
+ *    h3 = {baz: 2, bar: 1, foo: 0}
+ *    h1 == h3 # => true
  */
 
 static VALUE
@@ -2165,11 +3802,21 @@ rb_hash_equal(VALUE hash1, VALUE hash2)
 
 /*
  *  call-seq:
- *     hash.eql?(other)  -> true or false
+ *    hash.eql? object -> true or false
  *
- *  Returns <code>true</code> if <i>hash</i> and <i>other</i> are
- *  both hashes with the same content.
- *  The orders of each hashes are not compared.
+ *  Returns +true+ if all of the following are true:
+ *  * +object+ is a \Hash object.
+ *  * +hash+ and +object+ have the same keys (regardless of order).
+ *  * For each key +key+, <tt>h[key] eql? object[key]</tt>.
+ *
+ *  Otherwise, returns +false+.
+ *
+ *  Equal:
+ *    h1 = {foo: 0, bar: 1, baz: 2}
+ *    h2 = {foo: 0, bar: 1, baz: 2}
+ *    h1.eql? h2 # => true
+ *    h3 = {baz: 2, bar: 1, foo: 0}
+ *    h1.eql? h3 # => true
  */
 
 static VALUE
@@ -2192,12 +3839,16 @@ hash_i(VALUE key, VALUE val, VALUE arg)
 
 /*
  *  call-seq:
- *     hsh.hash   -> fixnum
+ *    hash.hash -> an_integer
  *
- *  Compute a hash-code for this hash. Two hashes with the same content
- *  will have the same hash code (and will compare using <code>eql?</code>).
+ *  Returns the \Integer hash-code for the hash.
  *
- *  See also Object#hash.
+ *  Two \Hash objects have the same hash-code if their content is the same
+ *  (regardless or order):
+ *    h1 = {foo: 0, bar: 1, baz: 2}
+ *    h2 = {baz: 2, bar: 1, foo: 0}
+ *    h2.hash == h1.hash # => true
+ *    h2.eql? h1 # => true
  */
 
 static VALUE
@@ -2210,7 +3861,7 @@ rb_hash_hash(VALUE hash)
 	rb_hash_foreach(hash, hash_i, (VALUE)&hval);
     }
     hval = rb_hash_end(hval);
-    return INT2FIX(hval);
+    return ST2FIX(hval);
 }
 
 static int
@@ -2222,38 +3873,23 @@ rb_hash_invert_i(VALUE key, VALUE value, VALUE hash)
 
 /*
  *  call-seq:
- *     hsh.invert -> new_hash
- *
- *  Returns a new hash created by using <i>hsh</i>'s values as keys, and
- *  the keys as values.
- *  If a key with the same value already exists in the <i>hsh</i>, then
- *  the last one defined will be used, the earlier value(s) will be discarded.
- *
- *     h = { "n" => 100, "m" => 100, "y" => 300, "d" => 200, "a" => 0 }
- *     h.invert   #=> {0=>"a", 100=>"m", 200=>"d", 300=>"y"}
- *
- *  If there is no key with the same value, Hash#invert is involutive.
- *
- *    h = { a: 1, b: 3, c: 4 }
- *    h.invert.invert == h #=> true
+ *    hash.invert -> new_hash
  *
- *  The condition, no key with the same value, can be tested by comparing
- *  the size of inverted hash.
- *
- *    # no key with the same value
- *    h = { a: 1, b: 3, c: 4 }
- *    h.size == h.invert.size #=> true
- *
- *    # two (or more) keys has the same value
- *    h = { a: 1, b: 3, c: 1 }
- *    h.size == h.invert.size #=> false
+ *  Returns a new \Hash object with the each key-value pair inverted:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h1 = h.invert
+ *    h1 # => {0=>:foo, 1=>:bar, 2=>:baz}
  *
+ *  Overwrites any repeated new keys:
+ *  (see {Entry Order}[#class-Hash-label-Entry+Order]):
+ *    h = {foo: 0, bar: 0, baz: 0}
+ *    h.invert # => {0=>:baz}
  */
 
 static VALUE
 rb_hash_invert(VALUE hash)
 {
-    VALUE h = rb_hash_new();
+    VALUE h = rb_hash_new_with_size(RHASH_SIZE(hash));
 
     rb_hash_foreach(hash, rb_hash_invert_i, h);
     return h;
@@ -2311,39 +3947,71 @@ rb_hash_update_block_i(VALUE key, VALUE value, VALUE hash)
 
 /*
  *  call-seq:
- *     hsh.merge!(other_hash)                                 -> hsh
- *     hsh.update(other_hash)                                 -> hsh
- *     hsh.merge!(other_hash){|key, oldval, newval| block}    -> hsh
- *     hsh.update(other_hash){|key, oldval, newval| block}    -> hsh
- *
- *  Adds the contents of _other_hash_ to _hsh_.  If no block is specified,
- *  entries with duplicate keys are overwritten with the values from
- *  _other_hash_, otherwise the value of each duplicate key is determined by
- *  calling the block with the key, its value in _hsh_ and its value in
- *  _other_hash_.
- *
- *     h1 = { "a" => 100, "b" => 200 }
- *     h2 = { "b" => 254, "c" => 300 }
- *     h1.merge!(h2)   #=> {"a"=>100, "b"=>254, "c"=>300}
- *
- *     h1 = { "a" => 100, "b" => 200 }
- *     h2 = { "b" => 254, "c" => 300 }
- *     h1.merge!(h2) { |key, v1, v2| v1 }
- *                     #=> {"a"=>100, "b"=>200, "c"=>300}
+ *    hash.merge! -> self
+ *    hash.merge!(*other_hashes) -> self
+ *    hash.merge!(*other_hashes) { |key, old_value, new_value| ... } -> self
+ *
+ *  Merges each of +other_hashes+ into +self+; returns +self+.
+ *
+ *  Each argument in +other_hashes+ must be a \Hash.
+ *
+ *  \Method #update is an alias for \#merge!.
+ *
+ *  With arguments and no block:
+ *  * Returns +self+, after the given hashes are merged into it.
+ *  * The given hashes are merged left to right.
+ *  * Each new entry is added at the end.
+ *  * Each duplicate-key entry's value overwrites the previous value.
+ *
+ *  Example:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h1 = {bat: 3, bar: 4}
+ *    h2 = {bam: 5, bat:6}
+ *    h.merge!(h1, h2) # => {:foo=>0, :bar=>4, :baz=>2, :bat=>6, :bam=>5}
+ *
+ *  With arguments and a block:
+ *  * Returns +self+, after the given hashes are merged.
+ *  *  The given hashes are merged left to right.
+ *  *  Each new-key entry is added at the end.
+ *  *  For each duplicate key:
+ *     * Calls the block with the key and the old and new values.
+ *     * The block's return value becomes the new value for the entry.
+ *
+ *  Example:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h1 = {bat: 3, bar: 4}
+ *    h2 = {bam: 5, bat:6}
+ *    h3 = h.merge!(h1, h2) { |key, old_value, new_value| old_value + new_value }
+ *    h3 # => {:foo=>0, :bar=>5, :baz=>2, :bat=>9, :bam=>5}
+ *
+ *  With no arguments:
+ *  * Returns +self+, unmodified.
+ *  * The block, if given, is ignored.
+ *
+ *  Example:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h.merge # => {:foo=>0, :bar=>1, :baz=>2}
+ *    h1 = h.merge! { |key, old_value, new_value| raise 'Cannot happen' }
+ *    h1 # => {:foo=>0, :bar=>1, :baz=>2}
  */
 
 static VALUE
-rb_hash_update(VALUE hash1, VALUE hash2)
+rb_hash_update(int argc, VALUE *argv, VALUE self)
 {
-    rb_hash_modify(hash1);
-    hash2 = to_hash(hash2);
-    if (rb_block_given_p()) {
-	rb_hash_foreach(hash2, rb_hash_update_block_i, hash1);
-    }
-    else {
-	rb_hash_foreach(hash2, rb_hash_update_i, hash1);
+    int i;
+    bool block_given = rb_block_given_p();
+
+    rb_hash_modify(self);
+    for (i = 0; i < argc; i++){
+       VALUE hash = to_hash(argv[i]);
+       if (block_given) {
+           rb_hash_foreach(hash, rb_hash_update_block_i, self);
+       }
+       else {
+           rb_hash_foreach(hash, rb_hash_update_i, self);
+       }
     }
-    return hash1;
+    return self;
 }
 
 struct update_func_arg {
@@ -2402,28 +4070,59 @@ rb_hash_update_by(VALUE hash1, VALUE hash2, rb_hash_update_func *func)
 
 /*
  *  call-seq:
- *     hsh.merge(other_hash)                              -> new_hash
- *     hsh.merge(other_hash){|key, oldval, newval| block} -> new_hash
- *
- *  Returns a new hash containing the contents of <i>other_hash</i> and
- *  the contents of <i>hsh</i>. If no block is specified, the value for
- *  entries with duplicate keys will be that of <i>other_hash</i>. Otherwise
- *  the value for each duplicate key is determined by calling the block
- *  with the key, its value in <i>hsh</i> and its value in <i>other_hash</i>.
- *
- *     h1 = { "a" => 100, "b" => 200 }
- *     h2 = { "b" => 254, "c" => 300 }
- *     h1.merge(h2)   #=> {"a"=>100, "b"=>254, "c"=>300}
- *     h1.merge(h2){|key, oldval, newval| newval - oldval}
- *                    #=> {"a"=>100, "b"=>54,  "c"=>300}
- *     h1             #=> {"a"=>100, "b"=>200}
- *
+ *    hash.merge -> copy_of_self
+ *    hash.merge(*other_hashes) -> new_hash
+ *    hash.merge(*other_hashes) { |key, old_value, new_value| ... } -> new_hash
+ *
+ *  Returns the new \Hash formed by merging each of +other_hashes+
+ *  into a copy of +self+.
+ *
+ *  Each argument in +other_hashes+ must be a \Hash.
+ *
+ *  ---
+ *
+ *  With arguments and no block:
+ *  * Returns the new \Hash object formed by merging each successive
+ *    \Hash in +other_hashes+ into +self+.
+ *  * Each new-key entry is added at the end.
+ *  * Each duplicate-key entry's value overwrites the previous value.
+ *
+ *  Example:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h1 = {bat: 3, bar: 4}
+ *    h2 = {bam: 5, bat:6}
+ *    h.merge(h1, h2) # => {:foo=>0, :bar=>4, :baz=>2, :bat=>6, :bam=>5}
+ *
+ *  With arguments and a block:
+ *  * Returns a new \Hash object that is the merge of +self+ and each given hash.
+ *  * The given hashes are merged left to right.
+ *  * Each new-key entry is added at the end.
+ *  * For each duplicate key:
+ *    * Calls the block with the key and the old and new values.
+ *    * The block's return value becomes the new value for the entry.
+ *
+ *  Example:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h1 = {bat: 3, bar: 4}
+ *    h2 = {bam: 5, bat:6}
+ *    h3 = h.merge(h1, h2) { |key, old_value, new_value| old_value + new_value }
+ *    h3 # => {:foo=>0, :bar=>5, :baz=>2, :bat=>9, :bam=>5}
+ *
+ *  With no arguments:
+ *  * Returns a copy of +self+.
+ *  * The block, if given, is ignored.
+ *
+ *  Example:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h.merge # => {:foo=>0, :bar=>1, :baz=>2}
+ *    h1 = h.merge { |key, old_value, new_value| raise 'Cannot happen' }
+ *    h1 # => {:foo=>0, :bar=>1, :baz=>2}
  */
 
 static VALUE
-rb_hash_merge(VALUE hash1, VALUE hash2)
+rb_hash_merge(int argc, VALUE *argv, VALUE self)
 {
-    return rb_hash_update(rb_obj_dup(hash1), hash2);
+    return rb_hash_update(argc, argv, rb_hash_dup(self));
 }
 
 static int
@@ -2448,7 +4147,8 @@ static VALUE
 reset_hash_type(VALUE arg)
 {
     struct reset_hash_type_arg *p = (struct reset_hash_type_arg *)arg;
-    RHASH(p->hash)->ntbl->type = p->orighash;
+    HASH_ASSERT(RHASH_ST_TABLE_P(p->hash));
+    RHASH_ST_TABLE(p->hash)->type = p->orighash;
     return Qundef;
 }
 
@@ -2466,16 +4166,13 @@ assoc_i(VALUE key, VALUE val, VALUE arg)
 
 /*
  *  call-seq:
- *     hash.assoc(obj)   ->  an_array  or  nil
+ *    hash.assoc(key) -> new_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>.
+ *  If the given +key+ is found, returns a 2-element \Array containing that key and its value:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h.assoc(:bar) # => [:bar, 1]
  *
- *     h = {"colors"  => ["red", "blue", "green"],
- *          "letters" => ["a", "b", "c" ]}
- *     h.assoc("letters")  #=> ["letters", ["a", "b", "c"]]
- *     h.assoc("foo")      #=> nil
+ *  Returns +nil+ if key +key+ is not found.
  */
 
 VALUE
@@ -2486,7 +4183,10 @@ rb_hash_assoc(VALUE hash, VALUE key)
     VALUE args[2];
 
     if (RHASH_EMPTY_P(hash)) return Qnil;
-    table = RHASH(hash)->ntbl;
+
+    ar_force_convert_table(hash, __FILE__, __LINE__);
+    HASH_ASSERT(RHASH_ST_TABLE_P(hash));
+    table = RHASH_ST_TABLE(hash);
     orighash = table->type;
 
     if (orighash != &identhash) {
@@ -2496,7 +4196,7 @@ rb_hash_assoc(VALUE hash, VALUE key)
 
 	assochash.compare = assoc_cmp;
 	assochash.hash = orighash->hash;
-	table->type = &assochash;
+        table->type = &assochash;
 	args[0] = hash;
 	args[1] = key;
 	ensure_arg.hash = hash;
@@ -2525,15 +4225,15 @@ rassoc_i(VALUE key, VALUE val, VALUE arg)
 
 /*
  *  call-seq:
- *     hash.rassoc(obj) -> an_array or nil
+ *    hash.rassoc(value) -> new_array or nil
  *
- *  Searches through the hash comparing _obj_ with the value using <code>==</code>.
- *  Returns the first key-value pair (two-element array) that matches. See
- *  also <code>Array#rassoc</code>.
+ *  Returns a new 2-element \Array consisting of the key and value
+ *  of the first-found entry whose value is <tt>==</tt> to value
+ *  (see {Entry Order}[#class-Hash-label-Entry+Order]):
+ *    h = {foo: 0, bar: 1, baz: 1}
+ *    h.rassoc(1) # => [:bar, 1]
  *
- *     a = {1=> "one", 2 => "two", 3 => "three", "ii" => "two"}
- *     a.rassoc("two")    #=> [2, "two"]
- *     a.rassoc("four")   #=> nil
+ *  Returns +nil+ if no such value found.
  */
 
 VALUE
@@ -2561,18 +4261,33 @@ flatten_i(VALUE key, VALUE val, VALUE ary)
 
 /*
  *  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.  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"]
+ *     hash.flatten -> new_array
+ *     hash.flatten(level) -> new_array
+ *
+ *  Returns a new \Array object that is a 1-dimensional flattening of +self+.
+ *
+ *  ---
+ *
+ *  By default, nested Arrays are not flattened:
+ *    h = {foo: 0, bar: [:bat, 3], baz: 2}
+ *    h.flatten # => [:foo, 0, :bar, [:bat, 3], :baz, 2]
+ *
+ *  Takes the depth of recursive flattening from \Integer argument +level+:
+ *    h = {foo: 0, bar: [:bat, [:baz, [:bat, ]]]}
+ *    h.flatten(1) # => [:foo, 0, :bar, [:bat, [:baz, [:bat]]]]
+ *    h.flatten(2) # => [:foo, 0, :bar, :bat, [:baz, [:bat]]]
+ *    h.flatten(3) # => [:foo, 0, :bar, :bat, :baz, [:bat]]
+ *    h.flatten(4) # => [:foo, 0, :bar, :bat, :baz, :bat]
+ *
+ *  When +level+ is negative, flattens all nested Arrays:
+ *    h = {foo: 0, bar: [:bat, [:baz, [:bat, ]]]}
+ *    h.flatten(-1) # => [:foo, 0, :bar, :bat, :baz, :bat]
+ *    h.flatten(-2) # => [:foo, 0, :bar, :bat, :baz, :bat]
+ *
+ *  When +level+ is zero, returns the equivalent of #to_a :
+ *    h = {foo: 0, bar: [:bat, 3], baz: 2}
+ *    h.flatten(0) # => [[:foo, 0], [:bar, [:bat, 3]], [:baz, 2]]
+ *    h.flatten(0) == h.to_a # => true
  */
 
 static VALUE
@@ -2580,18 +4295,24 @@ rb_hash_flatten(int argc, VALUE *argv, VALUE hash)
 {
     VALUE ary;
 
+    rb_check_arity(argc, 0, 1);
+
     if (argc) {
-	int level = NUM2INT(*argv);
+	int level = NUM2INT(argv[0]);
+
 	if (level == 0) return rb_hash_to_a(hash);
 
 	ary = rb_ary_new_capa(RHASH_SIZE(hash) * 2);
 	rb_hash_foreach(hash, flatten_i, ary);
-	if (level - 1 > 0) {
-	    *argv = INT2FIX(level - 1);
-	    rb_funcall2(ary, id_flatten_bang, argc, argv);
+	level--;
+
+	if (level > 0) {
+	    VALUE ary_flatten_level = INT2FIX(level);
+	    rb_funcallv(ary, id_flatten_bang, 1, &ary_flatten_level);
 	}
 	else if (level < 0) {
-	    rb_funcall2(ary, id_flatten_bang, 0, 0);
+	    /* flatten recursively */
+	    rb_funcallv(ary, id_flatten_bang, 0, 0);
 	}
     }
     else {
@@ -2602,59 +4323,146 @@ rb_hash_flatten(int argc, VALUE *argv, VALUE hash)
     return ary;
 }
 
-static VALUE rb_hash_compare_by_id_p(VALUE hash);
+static int
+delete_if_nil(VALUE key, VALUE value, VALUE hash)
+{
+    if (NIL_P(value)) {
+	return ST_DELETE;
+    }
+    return ST_CONTINUE;
+}
+
+static int
+set_if_not_nil(VALUE key, VALUE value, VALUE hash)
+{
+    if (!NIL_P(value)) {
+	rb_hash_aset(hash, key, value);
+    }
+    return ST_CONTINUE;
+}
 
 /*
  *  call-seq:
- *     hsh.compare_by_identity -> hsh
+ *    hash.compact -> new_hash
  *
- *  Makes <i>hsh</i> compare its keys by their identity, i.e. it
- *  will consider exact same objects as same keys.
+ *  Returns a copy of +self+ with all +nil+-valued entries removed:
+ *    h = {foo: 0, bar: nil, baz: 2, bat: nil}
+ *    h1 = h.compact
+ *    h1 # => {:foo=>0, :baz=>2}
+ */
+
+static VALUE
+rb_hash_compact(VALUE hash)
+{
+    VALUE result = rb_hash_new();
+    if (!RHASH_EMPTY_P(hash)) {
+	rb_hash_foreach(hash, set_if_not_nil, result);
+    }
+    return result;
+}
+
+/*
+ *  call-seq:
+ *    hash.compact! -> self or nil
  *
- *     h1 = { "a" => 100, "b" => 200, :c => "c" }
- *     h1["a"]        #=> 100
- *     h1.compare_by_identity
- *     h1.compare_by_identity? #=> true
- *     h1["a".dup]    #=> nil  # different objects.
- *     h1[:c]         #=> "c"  # same symbols are all same.
+ *  Returns +self+ with all its +nil+-valued entries removed (in place):
+ *    h = {foo: 0, bar: nil, baz: 2, bat: nil}
+ *    h.compact! # => {:foo=>0, :baz=>2}
  *
+ *  Returns +nil+ if no entries were removed.
+ */
+
+static VALUE
+rb_hash_compact_bang(VALUE hash)
+{
+    st_index_t n;
+    rb_hash_modify_check(hash);
+    n = RHASH_SIZE(hash);
+    if (n) {
+	rb_hash_foreach(hash, delete_if_nil, hash);
+        if (n != RHASH_SIZE(hash))
+	    return hash;
+    }
+    return Qnil;
+}
+
+static st_table *rb_init_identtable_with_size(st_index_t size);
+
+/*
+ *  call-seq:
+ *    hash.compare_by_identity -> self
+ *
+ *  Sets +self+ to consider only identity in comparing keys;
+ *  two keys are considered the same only if they are the same object;
+ *  returns +self+.
+ *
+ *  By default, these two object are considered to be the same key,
+ *  so +s1+ will overwrite +s0+:
+ *    s0 = 'x'
+ *    s1 = 'x'
+ *    h = {}
+ *    h.compare_by_identity? # => false
+ *    h[s0] = 0
+ *    h[s1] = 1
+ *    h # => {"x"=>1}
+ *
+ *  After calling \#compare_by_identity, the keys are considered to be different,
+ *  and therefore do not overwrite each other:
+ *    h = {}
+ *    h.compare_by_identity # => {}
+ *    h.compare_by_identity? # => true
+ *    h[s0] = 0
+ *    h[s1] = 1
+ *    h # => {"x"=>0, "x"=>1}
  */
 
 static VALUE
 rb_hash_compare_by_id(VALUE hash)
 {
+    VALUE tmp;
+    st_table *identtable;
+
     if (rb_hash_compare_by_id_p(hash)) return hash;
-    rb_hash_modify(hash);
-    RHASH(hash)->ntbl->type = &identhash;
-    rb_hash_rehash(hash);
+
+    rb_hash_modify_check(hash);
+    ar_force_convert_table(hash, __FILE__, __LINE__);
+    HASH_ASSERT(RHASH_ST_TABLE_P(hash));
+
+    tmp = hash_alloc(0);
+    identtable = rb_init_identtable_with_size(RHASH_SIZE(hash));
+    RHASH_ST_TABLE_SET(tmp, identtable);
+    rb_hash_foreach(hash, rb_hash_rehash_i, (VALUE)tmp);
+    st_free_table(RHASH_ST_TABLE(hash));
+    RHASH_ST_TABLE_SET(hash, identtable);
+    RHASH_ST_CLEAR(tmp);
+    rb_gc_force_recycle(tmp);
+
     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>.
+ *    hash.compare_by_identity? -> true or false
  *
+ *  Returns +true+ if #compare_by_identity has been called, +false+ otherwise.
  */
 
-static VALUE
+MJIT_FUNC_EXPORTED VALUE
 rb_hash_compare_by_id_p(VALUE hash)
 {
-    if (!RHASH(hash)->ntbl)
-        return Qfalse;
-    if (RHASH(hash)->ntbl->type == &identhash) {
+    if (RHASH_ST_TABLE_P(hash) && RHASH_ST_TABLE(hash)->type == &identhash) {
 	return Qtrue;
     }
-    return Qfalse;
+    else {
+        return Qfalse;
+    }
 }
 
 VALUE
 rb_ident_hash_new(void)
 {
     VALUE hash = rb_hash_new();
-    RHASH(hash)->ntbl = st_init_table(&identhash);
+    RHASH_ST_TABLE_SET(hash, st_init_table(&identhash));
     return hash;
 }
 
@@ -2664,7 +4472,7 @@ rb_init_identtable(void)
     return st_init_table(&identhash);
 }
 
-st_table *
+static st_table *
 rb_init_identtable_with_size(st_index_t size)
 {
     return st_init_table_with_size(&identhash, size);
@@ -2692,50 +4500,105 @@ any_p_i_fast(VALUE key, VALUE value, VALUE arg)
     return ST_CONTINUE;
 }
 
+static int
+any_p_i_pattern(VALUE key, VALUE value, VALUE arg)
+{
+    VALUE ret = rb_funcall(((VALUE *)arg)[1], idEqq, 1, rb_assoc_new(key, value));
+    if (RTEST(ret)) {
+	*(VALUE *)arg = Qtrue;
+	return ST_STOP;
+    }
+    return ST_CONTINUE;
+}
+
 /*
  *  call-seq:
- *     hsh.any? [{ |(key, value)| block }]   -> true or false
- *
- *  See also Enumerable#any?
+ *    hash.any? -> true or false
+ *    hash.any?(object) -> true or false
+ *    hash.any? {|key, value| ... } -> true or false
+ *
+ *  Returns +true+ if any element satisfies a given criterion;
+ *  +false+ otherwise.
+ *
+ *  With no argument and no block,
+ *  returns +true+ if +self+ is non-empty; +false+ if empty.
+ *
+ *  With argument +object+ and no block,
+ *  returns +true+ if for any key +key+
+ *  <tt>h.assoc(key) == object</tt>:
+ *   h = {foo: 0, bar: 1, baz: 2}
+ *   h.any?([:bar, 1]) # => true
+ *   h.any?([:bar, 0]) # => false
+ *   h.any?([:baz, 1]) # => false
+ *
+ *  With no argument and a block,
+ *  calls the block with each key-value pair;
+ *  returns +true+ if the block returns any truthy value,
+ *  +false+ otherwise:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h.any? {|key, value| value < 3 } # => true
+ *    h.any? {|key, value| value > 3 } # => false
  */
 
 static VALUE
-rb_hash_any_p(VALUE hash)
+rb_hash_any_p(int argc, VALUE *argv, VALUE hash)
 {
-    VALUE ret = Qfalse;
+    VALUE args[2];
+    args[0] = Qfalse;
 
+    rb_check_arity(argc, 0, 1);
     if (RHASH_EMPTY_P(hash)) return Qfalse;
-    if (!rb_block_given_p()) {
-	/* yields pairs, never false */
-	return Qtrue;
+    if (argc) {
+        if (rb_block_given_p()) {
+            rb_warn("given block not used");
+        }
+	args[1] = argv[0];
+
+	rb_hash_foreach(hash, any_p_i_pattern, (VALUE)args);
     }
-    if (rb_block_arity() > 1)
-	rb_hash_foreach(hash, any_p_i_fast, (VALUE)&ret);
-    else
-	rb_hash_foreach(hash, any_p_i, (VALUE)&ret);
-    return ret;
+    else {
+	if (!rb_block_given_p()) {
+	    /* yields pairs, never false */
+	    return Qtrue;
+	}
+        if (rb_block_pair_yield_optimizable())
+	    rb_hash_foreach(hash, any_p_i_fast, (VALUE)args);
+	else
+	    rb_hash_foreach(hash, any_p_i, (VALUE)args);
+    }
+    return args[0];
 }
 
 /*
- * call-seq:
- *   hsh.dig(key, ...)                 -> object
- *
- * Extracts the nested value specified by the sequence of <i>idx</i>
- * objects by calling +dig+ at each step, returning +nil+ if any
- * intermediate step is +nil+.
- *
- *   h = { foo: {bar: {baz: 1}}}
- *
- *   h.dig(:foo, :bar, :baz)           #=> 1
- *   h.dig(:foo, :zot, :xyz)           #=> nil
- *
- *   g = { foo: [10, 11, 12] }
- *   g.dig(:foo, 1)                    #=> 11
- *   g.dig(:foo, 1, 0)                 #=> TypeError: Fixnum does not have #dig method
- *   g.dig(:foo, :bar)                 #=> TypeError: no implicit conversion of Symbol into Integer
+ *  call-seq:
+ *    hash.dig(key, *identifiers) -> object
+ *
+ *  Finds and returns the object in nested objects
+ *  that is specified by +key+ and +identifiers+.
+ *  The nested objects may be instances of various classes.
+ *  See {Dig Methods}[rdoc-ref:doc/dig_methods.rdoc].
+ *
+ *  Nested Hashes:
+ *    h = {foo: {bar: {baz: 2}}}
+ *    h.dig(:foo) # => {:bar=>{:baz=>2}}
+ *    h.dig(:foo, :bar) # => {:bar=>{:baz=>2}}
+ *    h.dig(:foo, :bar, :baz) # => 2
+ *    h.dig(:foo, :bar, :BAZ) # => nil
+ *
+ *  Nested Hashes and Arrays:
+ *    h = {foo: {bar: [:a, :b, :c]}}
+ *    h.dig(:foo, :bar, 2) # => :c
+ *
+ *  This method will use the {default values}[#class-Hash-label-Default+Values]
+ *  for keys that are not present:
+ *    h = {foo: {bar: [:a, :b, :c]}}
+ *    h.dig(:hello) # => nil
+ *    h.default_proc = -> (hash, _key) { hash }
+ *    h.dig(:hello, :world) # => h
+ *    h.dig(:hello, :world, :foo, :bar, 2) # => :c
  */
 
-VALUE
+static VALUE
 rb_hash_dig(int argc, VALUE *argv, VALUE self)
 {
     rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
@@ -2766,17 +4629,15 @@ hash_le(VALUE hash1, VALUE hash2)
 }
 
 /*
- * call-seq:
- *   hash <= other -> true or false
- *
- * Returns <code>true</code> if <i>hash</i> is subset of
- * <i>other</i> or equals to <i>other</i>.
- *
- *    h1 = {a:1, b:2}
- *    h2 = {a:1, b:2, c:3}
- *    h1 <= h2   #=> true
- *    h2 <= h1   #=> false
- *    h1 <= h1   #=> true
+ *  call-seq:
+ *    hash <= other_hash -> true or false
+ *
+ *  Returns +true+ if +hash+ is a subset of +other_hash+, +false+ otherwise:
+ *    h1 = {foo: 0, bar: 1}
+ *    h2 = {foo: 0, bar: 1, baz: 2}
+ *    h1 <= h2 # => true
+ *    h2 <= h1 # => false
+ *    h1 <= h1 # => true
  */
 static VALUE
 rb_hash_le(VALUE hash, VALUE other)
@@ -2787,17 +4648,15 @@ rb_hash_le(VALUE hash, VALUE other)
 }
 
 /*
- * call-seq:
- *   hash < other -> true or false
- *
- * Returns <code>true</code> if <i>hash</i> is subset of
- * <i>other</i>.
- *
- *    h1 = {a:1, b:2}
- *    h2 = {a:1, b:2, c:3}
- *    h1 < h2    #=> true
- *    h2 < h1    #=> false
- *    h1 < h1    #=> false
+ *  call-seq:
+ *    hash < other_hash -> true or false
+ *
+ *  Returns +true+ if +hash+ is a proper subset of +other_hash+, +false+ otherwise:
+ *    h1 = {foo: 0, bar: 1}
+ *    h2 = {foo: 0, bar: 1, baz: 2}
+ *    h1 < h2 # => true
+ *    h2 < h1 # => false
+ *    h1 < h1 # => false
  */
 static VALUE
 rb_hash_lt(VALUE hash, VALUE other)
@@ -2808,17 +4667,15 @@ rb_hash_lt(VALUE hash, VALUE other)
 }
 
 /*
- * call-seq:
- *   hash >= other -> true or false
- *
- * Returns <code>true</code> if <i>other</i> is subset of
- * <i>hash</i> or equals to <i>hash</i>.
- *
- *    h1 = {a:1, b:2}
- *    h2 = {a:1, b:2, c:3}
- *    h1 >= h2   #=> false
- *    h2 >= h1   #=> true
- *    h1 >= h1   #=> true
+ *  call-seq:
+ *    hash >= other_hash -> true or false
+ *
+ *  Returns +true+ if +hash+ is a superset of +other_hash+, +false+ otherwise:
+ *    h1 = {foo: 0, bar: 1, baz: 2}
+ *    h2 = {foo: 0, bar: 1}
+ *    h1 >= h2 # => true
+ *    h2 >= h1 # => false
+ *    h1 >= h1 # => true
  */
 static VALUE
 rb_hash_ge(VALUE hash, VALUE other)
@@ -2829,17 +4686,15 @@ rb_hash_ge(VALUE hash, VALUE other)
 }
 
 /*
- * call-seq:
- *   hash > other -> true or false
- *
- * Returns <code>true</code> if <i>other</i> is subset of
- * <i>hash</i>.
- *
- *    h1 = {a:1, b:2}
- *    h2 = {a:1, b:2, c:3}
- *    h1 > h2    #=> false
- *    h2 > h1    #=> true
- *    h1 > h1    #=> false
+ *  call-seq:
+ *    hash > other_hash -> true or false
+ *
+ *  Returns +true+ if +hash+ is a proper superset of +other_hash+, +false+ otherwise:
+ *    h1 = {foo: 0, bar: 1, baz: 2}
+ *    h2 = {foo: 0, bar: 1}
+ *    h1 > h2 # => true
+ *    h2 > h1 # => false
+ *    h1 > h1 # => false
  */
 static VALUE
 rb_hash_gt(VALUE hash, VALUE other)
@@ -2850,19 +4705,118 @@ rb_hash_gt(VALUE hash, VALUE other)
 }
 
 static VALUE
-hash_proc_call(VALUE key, VALUE hash, int argc, const VALUE *argv, VALUE passed_proc)
+hash_proc_call(RB_BLOCK_CALL_FUNC_ARGLIST(key, hash))
 {
     rb_check_arity(argc, 1, 1);
     return rb_hash_aref(hash, *argv);
 }
 
+/*
+ *  call-seq:
+ *    hash.to_proc -> proc
+ *
+ *  Returns a \Proc object that maps a key to its value:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    proc = h.to_proc
+ *    proc.class # => Proc
+ *    proc.call(:foo) # => 0
+ *    proc.call(:bar) # => 1
+ *    proc.call(:nosuch) # => nil
+ */
 static VALUE
 rb_hash_to_proc(VALUE hash)
 {
-    return rb_func_proc_new(hash_proc_call, hash);
+    return rb_func_lambda_new(hash_proc_call, hash, 1, 1);
 }
 
-static int path_tainted = -1;
+static VALUE
+rb_hash_deconstruct_keys(VALUE hash, VALUE keys)
+{
+    return hash;
+}
+
+static int
+add_new_i(st_data_t *key, st_data_t *val, st_data_t arg, int existing)
+{
+    VALUE *args = (VALUE *)arg;
+    if (existing) return ST_STOP;
+    RB_OBJ_WRITTEN(args[0], Qundef, (VALUE)*key);
+    RB_OBJ_WRITE(args[0], (VALUE *)val, args[1]);
+    return ST_CONTINUE;
+}
+
+/*
+ * add +key+ to +val+ pair if +hash+ does not contain +key+.
+ * returns non-zero if +key+ was contained.
+ */
+int
+rb_hash_add_new_element(VALUE hash, VALUE key, VALUE val)
+{
+    st_table *tbl;
+    int ret = 0;
+    VALUE args[2];
+    args[0] = hash;
+    args[1] = val;
+
+    if (RHASH_AR_TABLE_P(hash)) {
+        hash_ar_table(hash);
+
+        ret = ar_update(hash, (st_data_t)key, add_new_i, (st_data_t)args);
+        if (ret != -1) {
+            return ret;
+        }
+        ar_try_convert_table(hash);
+    }
+    tbl = RHASH_TBL_RAW(hash);
+    return st_update(tbl, (st_data_t)key, add_new_i, (st_data_t)args);
+
+}
+
+static st_data_t
+key_stringify(VALUE key)
+{
+    return (rb_obj_class(key) == rb_cString && !RB_OBJ_FROZEN(key)) ?
+        rb_hash_key_str(key) : key;
+}
+
+static void
+ar_bulk_insert(VALUE hash, long argc, const VALUE *argv)
+{
+    long i;
+    for (i = 0; i < argc; ) {
+        st_data_t k = key_stringify(argv[i++]);
+        st_data_t v = argv[i++];
+        ar_insert(hash, k, v);
+        RB_OBJ_WRITTEN(hash, Qundef, k);
+        RB_OBJ_WRITTEN(hash, Qundef, v);
+    }
+}
+
+void
+rb_hash_bulk_insert(long argc, const VALUE *argv, VALUE hash)
+{
+    HASH_ASSERT(argc % 2 == 0);
+    if (argc > 0) {
+        st_index_t size = argc / 2;
+
+        if (RHASH_TABLE_NULL_P(hash)) {
+            if (size <= RHASH_AR_TABLE_MAX_SIZE) {
+                hash_ar_table(hash);
+            }
+            else {
+                RHASH_TBL_RAW(hash);
+            }
+        }
+
+        if (RHASH_AR_TABLE_P(hash) &&
+            (RHASH_AR_TABLE_SIZE(hash) + size <= RHASH_AR_TABLE_MAX_SIZE)) {
+            ar_bulk_insert(hash, argc, argv);
+        }
+        else {
+            rb_hash_bulk_insert_into_st_table(argc, argv, hash);
+        }
+    }
+}
 
 static char **origenviron;
 #ifdef _WIN32
@@ -2872,18 +4826,7 @@ static char **my_environ;
 #undef environ
 #define environ my_environ
 #undef getenv
-static inline char *
-w32_getenv(const char *name)
-{
-    static int binary = -1;
-    static int locale = -1;
-    if (binary < 0) {
-	binary = rb_ascii8bit_encindex();
-	locale = rb_locale_encindex();
-    }
-    return locale == binary ? rb_w32_getenv(name) : rb_w32_ugetenv(name);
-}
-#define getenv(n) w32_getenv(n)
+#define getenv(n) rb_w32_ugetenv(n)
 #elif defined(__APPLE__)
 #undef environ
 #define environ (*_NSGetEnviron())
@@ -2902,39 +4845,35 @@ extern char **environ;
 #define ENVNMATCH(s1, s2, n) (memcmp((s1), (s2), (n)) == 0)
 #endif
 
-#ifdef _WIN32
-static VALUE
-env_str_transcode(VALUE str, rb_encoding *enc)
+static inline rb_encoding *
+env_encoding()
 {
-    return rb_str_conv_enc_opts(str, NULL, enc,
-				ECONV_INVALID_REPLACE | ECONV_UNDEF_REPLACE, Qnil);
-}
+#ifdef _WIN32
+    return rb_utf8_encoding();
+#else
+    return rb_locale_encoding();
 #endif
+}
 
 static VALUE
-env_str_new(const char *ptr, long len)
+env_enc_str_new(const char *ptr, long len, rb_encoding *enc)
 {
-#ifdef _WIN32
-    VALUE str = env_str_transcode(rb_utf8_str_new(ptr, len), rb_locale_encoding());
-#else
-    VALUE str = rb_locale_str_new(ptr, len);
-#endif
+    VALUE str = rb_external_str_new_with_enc(ptr, len, enc);
 
     rb_obj_freeze(str);
     return str;
 }
 
 static VALUE
-env_path_str_new(const char *ptr)
+env_enc_str_new_cstr(const char *ptr, rb_encoding *enc)
 {
-#ifdef _WIN32
-    VALUE str = env_str_transcode(rb_utf8_str_new_cstr(ptr), rb_filesystem_encoding());
-#else
-    VALUE str = rb_filesystem_str_new_cstr(ptr);
-#endif
+    return env_enc_str_new(ptr, strlen(ptr), enc);
+}
 
-    rb_obj_freeze(str);
-    return str;
+static VALUE
+env_str_new(const char *ptr, long len)
+{
+    return env_enc_str_new(ptr, len, env_encoding());
 }
 
 static VALUE
@@ -2944,29 +4883,25 @@ env_str_new2(const char *ptr)
     return env_str_new(ptr, strlen(ptr));
 }
 
+static const char TZ_ENV[] = "TZ";
+
+static VALUE
+env_name_new(const char *name, const char *ptr)
+{
+    return env_enc_str_new_cstr(ptr, env_encoding());
+}
+
 static void *
 get_env_cstr(
-#ifdef _WIN32
-    volatile VALUE *pstr,
-#else
     VALUE str,
-#endif
     const char *name)
 {
-#ifdef _WIN32
-    VALUE str = *pstr;
-#endif
     char *var;
     rb_encoding *enc = rb_enc_get(str);
     if (!rb_enc_asciicompat(enc)) {
 	rb_raise(rb_eArgError, "bad environment variable %s: ASCII incompatible encoding: %s",
 		 name, rb_enc_name(enc));
     }
-#ifdef _WIN32
-    if (!rb_enc_str_asciionly_p(str)) {
-	*pstr = str = rb_str_conv_enc(str, NULL, rb_utf8_encoding());
-    }
-#endif
     var = RSTRING_PTR(str);
     if (memchr(var, '\0', RSTRING_LEN(str))) {
 	rb_raise(rb_eArgError, "bad environment variable %s: contains null byte", name);
@@ -2974,13 +4909,8 @@ get_env_cstr(
     return rb_str_fill_terminator(str, 1); /* ASCII compatible */
 }
 
-#ifdef _WIN32
-#define get_env_ptr(var, val) \
-    (var = get_env_cstr(&(val), #var))
-#else
 #define get_env_ptr(var, val) \
     (var = get_env_cstr(val, #var))
-#endif
 
 static inline const char *
 env_name(volatile VALUE *s)
@@ -2993,21 +4923,34 @@ env_name(volatile VALUE *s)
 
 #define env_name(s) env_name(&(s))
 
+static VALUE env_aset(VALUE nm, VALUE val);
+
+static void
+reset_by_modified_env(const char *nam)
+{
+    /*
+     * ENV['TZ'] = nil has a special meaning.
+     * TZ is no longer considered up-to-date and ruby call tzset() as needed.
+     * It could be useful if sysadmin change /etc/localtime.
+     * This hack might works only on Linux glibc.
+     */
+    if (ENVMATCH(nam, TZ_ENV)) {
+        ruby_reset_timezone();
+    }
+}
+
 static VALUE
-env_delete(VALUE obj, VALUE name)
+env_delete(VALUE name)
 {
-    const char *nam, *val;
+    const char *nam = env_name(name);
+    const char *val = getenv(nam);
+
+    reset_by_modified_env(nam);
 
-    nam = env_name(name);
-    val = getenv(nam);
     if (val) {
 	VALUE value = env_str_new2(val);
 
 	ruby_setenv(nam, 0);
-	if (ENVMATCH(nam, PATH_ENV)) {
-	    RB_GC_GUARD(name);
-	    path_tainted = 0;
-	}
 	return value;
     }
     return Qnil;
@@ -3015,31 +4958,50 @@ env_delete(VALUE obj, VALUE name)
 
 /*
  * call-seq:
- *   ENV.delete(name)            -> value
- *   ENV.delete(name) { |name| } -> value
+ *   ENV.delete(name)                           -> value
+ *   ENV.delete(name) { |name| block }          -> value
+ *   ENV.delete(missing_name)                   -> nil
+ *   ENV.delete(missing_name) { |name| block }  -> block_value
+ *
+ * Deletes the environment variable with +name+ if it exists and returns its value:
+ *   ENV['foo'] = '0'
+ *   ENV.delete('foo') # => '0'
+ *
+ * If a block is not given and the named environment variable does not exist, returns +nil+.
+ *
+ * If a block given and the environment variable does not exist,
+ * yields +name+ to the block and returns the value of the block:
+ *   ENV.delete('foo') { |name| name * 2 } # => "foofoo"
+ *
+ * If a block given and the environment variable exists,
+ * deletes the environment variable and returns its value (ignoring the block):
+ *   ENV['foo'] = '0'
+ *   ENV.delete('foo') { |name| raise 'ignored' } # => "0"
  *
- * Deletes the environment variable with +name+ and returns the value of the
- * variable.  If a block is given it will be called when the named environment
- * does not exist.
+ * Raises an exception if +name+ is invalid.
+ * See {Invalid Names and Values}[#class-ENV-label-Invalid+Names+and+Values].
  */
 static VALUE
 env_delete_m(VALUE obj, VALUE name)
 {
     VALUE val;
 
-    val = env_delete(obj, name);
-    if (NIL_P(val) && rb_block_given_p()) rb_yield(name);
+    val = env_delete(name);
+    if (NIL_P(val) && rb_block_given_p()) val = rb_yield(name);
     return val;
 }
 
-static int env_path_tainted(const char *);
-
 /*
  * call-seq:
  *   ENV[name] -> value
  *
- * Retrieves the +value+ for environment variable +name+ as a String.  Returns
- * +nil+ if the named variable does not exist.
+ * Returns the value for the environment variable +name+ if it exists:
+ *   ENV['foo'] = '0'
+ *   ENV['foo'] # => "0"
+ * Returns +nil+ if the named variable does not exist.
+ *
+ * Raises an exception if +name+ is invalid.
+ * See {Invalid Names and Values}[#class-ENV-label-Invalid+Names+and+Values].
  */
 static VALUE
 rb_f_getenv(VALUE obj, VALUE name)
@@ -3049,30 +5011,38 @@ rb_f_getenv(VALUE obj, VALUE name)
     nam = env_name(name);
     env = getenv(nam);
     if (env) {
-	if (ENVMATCH(nam, PATH_ENV) && !env_path_tainted(env)) {
-	    return env_path_str_new(env);
-	}
-	return env_str_new2(env);
+	return env_name_new(nam, env);
     }
     return Qnil;
 }
 
 /*
- * :yield: missing_name
  * call-seq:
- *   ENV.fetch(name)                        -> value
- *   ENV.fetch(name, default)               -> value
- *   ENV.fetch(name) { |missing_name| ... } -> value
- *
- * Retrieves the environment variable +name+.
- *
- * If the given name does not exist and neither +default+ nor a block a
- * provided an IndexError is raised.  If a block is given it is called with
- * the missing name to provide a value.  If a default value is given it will
- * be returned when no block is given.
+ *   ENV.fetch(name)                  -> value
+ *   ENV.fetch(name, default)         -> value
+ *   ENV.fetch(name) { |name| block } -> value
+ *
+ * If +name+ is the name of an environment variable, returns its value:
+ *   ENV['foo'] = '0'
+ *   ENV.fetch('foo') # => '0'
+ * Otherwise if a block is given (but not a default value),
+ * yields +name+ to the block and returns the block's return value:
+ *   ENV.fetch('foo') { |name| :need_not_return_a_string } # => :need_not_return_a_string
+ * Otherwise if a default value is given (but not a block), returns the default value:
+ *   ENV.delete('foo')
+ *   ENV.fetch('foo', :default_need_not_be_a_string) # => :default_need_not_be_a_string
+ * If the environment variable does not exist and both default and block are given,
+ * issues a warning ("warning: block supersedes default value argument"),
+ * yields +name+ to the block, and returns the block's return value:
+ *   ENV.fetch('foo', :default) { |name| :block_return } # => :block_return
+ * Raises KeyError if +name+ is valid, but not found,
+ * and neither default value nor block is given:
+ *   ENV.fetch('foo') # Raises KeyError (key not found: "foo")
+ * Raises an exception if +name+ is invalid.
+ * See {Invalid Names and Values}[#class-ENV-label-Invalid+Names+and+Values].
  */
 static VALUE
-env_fetch(int argc, VALUE *argv)
+env_fetch(int argc, VALUE *argv, VALUE _)
 {
     VALUE key;
     long block_given;
@@ -3089,37 +5059,18 @@ env_fetch(int argc, VALUE *argv)
     if (!env) {
 	if (block_given) return rb_yield(key);
 	if (argc == 1) {
-	    rb_raise(rb_eKeyError, "key not found: \"%"PRIsVALUE"\"", key);
+	    rb_key_err_raise(rb_sprintf("key not found: \"%"PRIsVALUE"\"", key), envtbl, key);
 	}
 	return argv[1];
     }
-    if (ENVMATCH(nam, PATH_ENV) && !env_path_tainted(env))
-	return env_path_str_new(env);
-    return env_str_new2(env);
-}
-
-static void
-path_tainted_p(const char *path)
-{
-    path_tainted = rb_path_check(path)?0:1;
-}
-
-static int
-env_path_tainted(const char *path)
-{
-    if (path_tainted < 0) {
-	path_tainted_p(path);
-    }
-    return path_tainted;
+    return env_name_new(nam, env);
 }
 
 int
 rb_env_path_tainted(void)
 {
-    if (path_tainted < 0) {
-	path_tainted_p(getenv(PATH_ENV));
-    }
-    return path_tainted;
+    rb_warn_deprecated_to_remove("rb_env_path_tainted", "3.2");
+    return 0;
 }
 
 #if defined(_WIN32) || (defined(HAVE_SETENV) && defined(HAVE_UNSETENV))
@@ -3158,10 +5109,33 @@ getenvsize(const WCHAR* p)
     while (*p++) p += lstrlenW(p) + 1;
     return p - porg + 1;
 }
+
 static size_t
 getenvblocksize(void)
 {
+#ifdef _MAX_ENV
+    return _MAX_ENV;
+#else
     return 32767;
+#endif
+}
+
+static int
+check_envsize(size_t n)
+{
+    if (_WIN32_WINNT < 0x0600 && rb_w32_osver() < 6) {
+	/* https://msdn.microsoft.com/en-us/library/windows/desktop/ms682653(v=vs.85).aspx */
+	/* Windows Server 2003 and Windows XP: The maximum size of the
+	 * environment block for the process is 32,767 characters. */
+	WCHAR* p = GetEnvironmentStringsW();
+	if (!p) return -1; /* never happen */
+	n += getenvsize(p);
+	FreeEnvironmentStringsW(p);
+	if (n >= getenvblocksize()) {
+	    return -1;
+	}
+    }
+    return 0;
 }
 #endif
 
@@ -3201,16 +5175,11 @@ ruby_setenv(const char *name, const char *value)
     check_envname(name);
     len = MultiByteToWideChar(CP_UTF8, 0, name, -1, NULL, 0);
     if (value) {
-	WCHAR* p = GetEnvironmentStringsW();
-	size_t n;
 	int len2;
-	if (!p) goto fail; /* never happen */
-	n = lstrlen(name) + 2 + strlen(value) + getenvsize(p);
-	FreeEnvironmentStringsW(p);
-	if (n >= getenvblocksize()) {
+	len2 = MultiByteToWideChar(CP_UTF8, 0, value, -1, NULL, 0);
+	if (check_envsize((size_t)len + len2)) { /* len and len2 include '\0' */
 	    goto fail;  /* 2 for '=' & '\0' */
 	}
-	len2 = MultiByteToWideChar(CP_UTF8, 0, value, -1, NULL, 0);
 	wname = ALLOCV_N(WCHAR, buf, len + len2);
 	wvalue = wname + len;
 	MultiByteToWideChar(CP_UTF8, 0, name, -1, wname, len);
@@ -3246,8 +5215,6 @@ ruby_setenv(const char *name, const char *value)
 	invalid_envname(name);
     }
 #elif defined(HAVE_SETENV) && defined(HAVE_UNSETENV)
-#undef setenv
-#undef unsetenv
     if (value) {
 	if (setenv(name, value, 1))
 	    rb_sys_fail_str(rb_sprintf("setenv(%s)", name));
@@ -3340,21 +5307,61 @@ ruby_unsetenv(const char *name)
 
 /*
  * call-seq:
- *   ENV[name] = value
+ *   ENV[name] = value      -> value
  *   ENV.store(name, value) -> value
  *
- * Sets the environment variable +name+ to +value+.  If the value given is
- * +nil+ the environment variable is deleted.
- * +name+ must be a string.
- *
+ * ENV.store is an alias for ENV.[]=.
+ *
+ * Creates, updates, or deletes the named environment variable, returning the value.
+ * Both +name+ and +value+ may be instances of String.
+ * See {Valid Names and Values}[#class-ENV-label-Valid+Names+and+Values].
+ *
+ * - If the named environment variable does not exist:
+ *   - If +value+ is +nil+, does nothing.
+ *       ENV.clear
+ *       ENV['foo'] = nil # => nil
+ *       ENV.include?('foo') # => false
+ *       ENV.store('bar', nil) # => nil
+ *       ENV.include?('bar') # => false
+ *   - If +value+ is not +nil+, creates the environment variable with +name+ and +value+:
+ *       # Create 'foo' using ENV.[]=.
+ *       ENV['foo'] = '0' # => '0'
+ *       ENV['foo'] # => '0'
+ *       # Create 'bar' using ENV.store.
+ *       ENV.store('bar', '1') # => '1'
+ *       ENV['bar'] # => '1'
+ * - If the named environment variable exists:
+ *   - If +value+ is not +nil+, updates the environment variable with value +value+:
+ *       # Update 'foo' using ENV.[]=.
+ *       ENV['foo'] = '2' # => '2'
+ *       ENV['foo'] # => '2'
+ *       # Update 'bar' using ENV.store.
+ *       ENV.store('bar', '3') # => '3'
+ *       ENV['bar'] # => '3'
+ *   - If +value+ is +nil+, deletes the environment variable:
+ *       # Delete 'foo' using ENV.[]=.
+ *       ENV['foo'] = nil # => nil
+ *       ENV.include?('foo') # => false
+ *       # Delete 'bar' using ENV.store.
+ *       ENV.store('bar', nil) # => nil
+ *       ENV.include?('bar') # => false
+ *
+ * Raises an exception if +name+ or +value+ is invalid.
+ * See {Invalid Names and Values}[#class-ENV-label-Invalid+Names+and+Values].
  */
 static VALUE
-env_aset(VALUE obj, VALUE nm, VALUE val)
+env_aset_m(VALUE obj, VALUE nm, VALUE val)
+{
+    return env_aset(nm, val);
+}
+
+static VALUE
+env_aset(VALUE nm, VALUE val)
 {
     char *name, *value;
 
     if (NIL_P(val)) {
-	env_delete(obj, nm);
+        env_delete(nm);
 	return Qnil;
     }
     SafeStringValue(nm);
@@ -3365,38 +5372,26 @@ env_aset(VALUE obj, VALUE nm, VALUE val)
     get_env_ptr(value, val);
 
     ruby_setenv(name, value);
-    if (ENVMATCH(name, PATH_ENV)) {
-	RB_GC_GUARD(nm);
-	if (OBJ_TAINTED(val)) {
-	    /* already tainted, no check */
-	    path_tainted = 1;
-	    return val;
-	}
-	else {
-	    path_tainted_p(value);
-	}
-    }
+    reset_by_modified_env(name);
     return val;
 }
 
-/*
- * call-seq:
- *   ENV.keys -> Array
- *
- * Returns every environment variable name in an Array
- */
 static VALUE
-env_keys(void)
+env_keys(int raw)
 {
     char **env;
     VALUE ary;
+    rb_encoding *enc = raw ? 0 : rb_locale_encoding();
 
     ary = rb_ary_new();
     env = GET_ENVIRON(environ);
     while (*env) {
 	char *s = strchr(*env, '=');
 	if (s) {
-	    rb_ary_push(ary, env_str_new(*env, s-*env));
+            const char *p = *env;
+            size_t l = s - p;
+            VALUE e = raw ? rb_utf8_str_new(p, l) : env_enc_str_new(p, l, enc);
+            rb_ary_push(ary, e);
 	}
 	env++;
     }
@@ -3404,6 +5399,25 @@ env_keys(void)
     return ary;
 }
 
+/*
+ * call-seq:
+ *   ENV.keys -> array of names
+ *
+ * Returns all variable names in an Array:
+ *   ENV.replace('foo' => '0', 'bar' => '1')
+ *   ENV.keys # => ['bar', 'foo']
+ * The order of the names is OS-dependent.
+ * See {About Ordering}[#class-ENV-label-About+Ordering].
+ *
+ * Returns the empty Array if ENV is empty.
+ */
+
+static VALUE
+env_f_keys(VALUE _)
+{
+    return env_keys(FALSE);
+}
+
 static VALUE
 rb_env_size(VALUE ehash, VALUE args, VALUE eobj)
 {
@@ -3422,12 +5436,20 @@ rb_env_size(VALUE ehash, VALUE args, VALUE eobj)
 
 /*
  * call-seq:
- *   ENV.each_key { |name| } -> Hash
- *   ENV.each_key            -> Enumerator
- *
- * Yields each environment variable name.
- *
- * An Enumerator is returned if no block is given.
+ *   ENV.each_key { |name| block } -> ENV
+ *   ENV.each_key                  -> an_enumerator
+ *
+ * Yields each environment variable name:
+ *   ENV.replace('foo' => '0', 'bar' => '1') # => ENV
+ *   names = []
+ *   ENV.each_key { |name| names.push(name) } # => ENV
+ *   names # => ["bar", "foo"]
+ *
+ * Returns an Enumerator if no block given:
+ *   e = ENV.each_key # => #<Enumerator: {"bar"=>"1", "foo"=>"0"}:each_key>
+ *   names = []
+ *   e.each { |name| names.push(name) } # => ENV
+ *   names # => ["bar", "foo"]
  */
 static VALUE
 env_each_key(VALUE ehash)
@@ -3436,19 +5458,13 @@ env_each_key(VALUE ehash)
     long i;
 
     RETURN_SIZED_ENUMERATOR(ehash, 0, 0, rb_env_size);
-    keys = env_keys();
+    keys = env_keys(FALSE);
     for (i=0; i<RARRAY_LEN(keys); i++) {
 	rb_yield(RARRAY_AREF(keys, i));
     }
     return ehash;
 }
 
-/*
- * call-seq:
- *   ENV.values -> Array
- *
- * Returns every environment variable value as an Array
- */
 static VALUE
 env_values(void)
 {
@@ -3470,12 +5486,38 @@ env_values(void)
 
 /*
  * call-seq:
- *   ENV.each_value { |value| } -> Hash
- *   ENV.each_value             -> Enumerator
+ *   ENV.values -> array of values
  *
- * Yields each environment variable +value+.
+ * Returns all environment variable values in an Array:
+ *   ENV.replace('foo' => '0', 'bar' => '1')
+ *   ENV.values # => ['1', '0']
+ * The order of the values is OS-dependent.
+ * See {About Ordering}[#class-ENV-label-About+Ordering].
  *
- * An Enumerator is returned if no block was given.
+ * Returns the empty Array if ENV is empty.
+ */
+static VALUE
+env_f_values(VALUE _)
+{
+    return env_values();
+}
+
+/*
+ * call-seq:
+ *   ENV.each_value { |value| block } -> ENV
+ *   ENV.each_value                   -> an_enumerator
+ *
+ * Yields each environment variable value:
+ *   ENV.replace('foo' => '0', 'bar' => '1') # => ENV
+ *   values = []
+ *   ENV.each_value { |value| values.push(value) } # => ENV
+ *   values # => ["1", "0"]
+ *
+ * Returns an Enumerator if no block given:
+ *   e = ENV.each_value # => #<Enumerator: {"bar"=>"1", "foo"=>"0"}:each_value>
+ *   values = []
+ *   e.each { |value| values.push(value) } # => ENV
+ *   values # => ["1", "0"]
  */
 static VALUE
 env_each_value(VALUE ehash)
@@ -3493,14 +5535,21 @@ env_each_value(VALUE ehash)
 
 /*
  * call-seq:
- *   ENV.each      { |name, value| } -> Hash
- *   ENV.each                        -> Enumerator
- *   ENV.each_pair { |name, value| } -> Hash
- *   ENV.each_pair                   -> Enumerator
- *
- * Yields each environment variable +name+ and +value+.
- *
- * If no block is given an Enumerator is returned.
+ *   ENV.each      { |name, value| block } -> ENV
+ *   ENV.each                              -> an_enumerator
+ *   ENV.each_pair { |name, value| block } -> ENV
+ *   ENV.each_pair                         -> an_enumerator
+ *
+ * Yields each environment variable name and its value as a 2-element \Array:
+ *   h = {}
+ *   ENV.each_pair { |name, value| h[name] = value } # => ENV
+ *   h # => {"bar"=>"1", "foo"=>"0"}
+ *
+ * Returns an Enumerator if no block given:
+ *   h = {}
+ *   e = ENV.each_pair # => #<Enumerator: {"bar"=>"1", "foo"=>"0"}:each_pair>
+ *   e.each { |name, value| h[name] = value } # => ENV
+ *   h # => {"bar"=>"1", "foo"=>"0"}
  */
 static VALUE
 env_each_pair(VALUE ehash)
@@ -3523,7 +5572,7 @@ env_each_pair(VALUE ehash)
     }
     FREE_ENVIRON(environ);
 
-    if (rb_block_arity() > 1) {
+    if (rb_block_pair_yield_optimizable()) {
 	for (i=0; i<RARRAY_LEN(ary); i+=2) {
 	    rb_yield_values(2, RARRAY_AREF(ary, i), RARRAY_AREF(ary, i+1));
 	}
@@ -3538,12 +5587,25 @@ env_each_pair(VALUE ehash)
 
 /*
  * call-seq:
- *   ENV.reject! { |name, value| } -> ENV or nil
- *   ENV.reject!                   -> Enumerator
- *
- * Equivalent to ENV#delete_if but returns +nil+ if no changes were made.
- *
- * Returns an Enumerator if no block was given.
+ *   ENV.reject! { |name, value| block } -> ENV or nil
+ *   ENV.reject!                         -> an_enumerator
+ *
+ * Similar to ENV.delete_if, but returns +nil+ if no changes were made.
+ *
+ * Yields each environment variable name and its value as a 2-element Array,
+ * deleting each environment variable for which the block returns a truthy value,
+ * and returning ENV (if any deletions) or +nil+ (if not):
+ *   ENV.replace('foo' => '0', 'bar' => '1', 'baz' => '2')
+ *   ENV.reject! { |name, value| name.start_with?('b') } # => ENV
+ *   ENV # => {"foo"=>"0"}
+ *   ENV.reject! { |name, value| name.start_with?('b') } # => nil
+ *
+ * Returns an Enumerator if no block given:
+ *   ENV.replace('foo' => '0', 'bar' => '1', 'baz' => '2')
+ *   e = ENV.reject! # => #<Enumerator: {"bar"=>"1", "baz"=>"2", "foo"=>"0"}:reject!>
+ *   e.each { |name, value| name.start_with?('b') } # => ENV
+ *   ENV # => {"foo"=>"0"}
+ *   e.each { |name, value| name.start_with?('b') } # => nil
  */
 static VALUE
 env_reject_bang(VALUE ehash)
@@ -3553,14 +5615,13 @@ env_reject_bang(VALUE ehash)
     int del = 0;
 
     RETURN_SIZED_ENUMERATOR(ehash, 0, 0, rb_env_size);
-    keys = env_keys();
+    keys = env_keys(FALSE);
     RBASIC_CLEAR_CLASS(keys);
     for (i=0; i<RARRAY_LEN(keys); i++) {
 	VALUE val = rb_f_getenv(Qnil, RARRAY_AREF(keys, i));
 	if (!NIL_P(val)) {
 	    if (RTEST(rb_yield_values(2, RARRAY_AREF(keys, i), val))) {
-		FL_UNSET(RARRAY_AREF(keys, i), FL_TAINT);
-		env_delete(Qnil, RARRAY_AREF(keys, i));
+                env_delete(RARRAY_AREF(keys, i));
 		del++;
 	    }
 	}
@@ -3572,12 +5633,23 @@ env_reject_bang(VALUE ehash)
 
 /*
  * call-seq:
- *   ENV.delete_if { |name, value| } -> Hash
- *   ENV.delete_if                   -> Enumerator
- *
- * Deletes every environment variable for which the block evaluates to +true+.
- *
- * If no block is given an enumerator is returned instead.
+ *   ENV.delete_if { |name, value| block } -> ENV
+ *   ENV.delete_if                         -> an_enumerator
+ *
+ * Yields each environment variable name and its value as a 2-element Array,
+ * deleting each environment variable for which the block returns a truthy value,
+ * and returning ENV (regardless of whether any deletions):
+ *   ENV.replace('foo' => '0', 'bar' => '1', 'baz' => '2')
+ *   ENV.delete_if { |name, value| name.start_with?('b') } # => ENV
+ *   ENV # => {"foo"=>"0"}
+ *   ENV.delete_if { |name, value| name.start_with?('b') } # => ENV
+ *
+ * Returns an Enumerator if no block given:
+ *   ENV.replace('foo' => '0', 'bar' => '1', 'baz' => '2')
+ *   e = ENV.delete_if # => #<Enumerator: {"bar"=>"1", "baz"=>"2", "foo"=>"0"}:delete_if!>
+ *   e.each { |name, value| name.start_with?('b') } # => ENV
+ *   ENV # => {"foo"=>"0"}
+ *   e.each { |name, value| name.start_with?('b') } # => ENV
  */
 static VALUE
 env_delete_if(VALUE ehash)
@@ -3589,13 +5661,23 @@ env_delete_if(VALUE ehash)
 
 /*
  * call-seq:
- *   ENV.values_at(name, ...) -> Array
+ *   ENV.values_at(*names) -> array of values
+ *
+ * Returns an Array containing the environment variable values associated with
+ * the given names:
+ *   ENV.replace('foo' => '0', 'bar' => '1', 'baz' => '2')
+ *   ENV.values_at('foo', 'baz') # => ["0", "2"]
  *
- * Returns an array containing the environment variable values associated with
- * the given names.  See also ENV.select.
+ * Returns +nil+ in the Array for each name that is not an ENV name:
+ *   ENV.values_at('foo', 'bat', 'bar', 'bam') # => ["0", nil, "1", nil]
+ *
+ * Returns an empty \Array if no names given.
+ *
+ * Raises an exception if any name is invalid.
+ * See {Invalid Names and Values}[#class-ENV-label-Invalid+Names+and+Values].
  */
 static VALUE
-env_values_at(int argc, VALUE *argv)
+env_values_at(int argc, VALUE *argv, VALUE _)
 {
     VALUE result;
     long i;
@@ -3609,12 +5691,24 @@ env_values_at(int argc, VALUE *argv)
 
 /*
  * call-seq:
- *   ENV.select { |name, value| } -> Hash
- *   ENV.select                   -> Enumerator
- *
- * Returns a copy of the environment for entries where the block returns true.
- *
- * Returns an Enumerator if no block was given.
+ *   ENV.select { |name, value| block } -> hash of name/value pairs
+ *   ENV.select                         -> an_enumerator
+ *   ENV.filter { |name, value| block } -> hash of name/value pairs
+ *   ENV.filter                         -> an_enumerator
+ *
+ * ENV.filter is an alias for ENV.select.
+ *
+ * Yields each environment variable name and its value as a 2-element Array,
+ * returning a Hash of the names and values for which the block returns a truthy value:
+ *   ENV.replace('foo' => '0', 'bar' => '1', 'baz' => '2')
+ *   ENV.select { |name, value| name.start_with?('b') } # => {"bar"=>"1", "baz"=>"2"}
+ *   ENV.filter { |name, value| name.start_with?('b') } # => {"bar"=>"1", "baz"=>"2"}
+ *
+ * Returns an Enumerator if no block given:
+ *   e = ENV.select # => #<Enumerator: {"bar"=>"1", "baz"=>"2", "foo"=>"0"}:select>
+ *   e.each { |name, value | name.start_with?('b') } # => {"bar"=>"1", "baz"=>"2"}
+ *   e = ENV.filter # => #<Enumerator: {"bar"=>"1", "baz"=>"2", "foo"=>"0"}:filter>
+ *   e.each { |name, value | name.start_with?('b') } # => {"bar"=>"1", "baz"=>"2"}
  */
 static VALUE
 env_select(VALUE ehash)
@@ -3625,7 +5719,7 @@ env_select(VALUE ehash)
 
     RETURN_SIZED_ENUMERATOR(ehash, 0, 0, rb_env_size);
     result = rb_hash_new();
-    keys = env_keys();
+    keys = env_keys(FALSE);
     for (i = 0; i < RARRAY_LEN(keys); ++i) {
 	VALUE key = RARRAY_AREF(keys, i);
 	VALUE val = rb_f_getenv(Qnil, key);
@@ -3642,10 +5736,40 @@ env_select(VALUE ehash)
 
 /*
  * call-seq:
- *   ENV.select! { |name, value| } -> ENV or nil
- *   ENV.select!                   -> Enumerator
- *
- * Equivalent to ENV#keep_if but returns +nil+ if no changes were made.
+ *   ENV.select! { |name, value| block } -> ENV or nil
+ *   ENV.select!                         -> an_enumerator
+ *   ENV.filter! { |name, value| block } -> ENV or nil
+ *   ENV.filter!                         -> an_enumerator
+ *
+ * ENV.filter! is an alias for ENV.select!.
+ *
+ * Yields each environment variable name and its value as a 2-element Array,
+ * deleting each entry for which the block returns +false+ or +nil+,
+ * and returning ENV if any deletions made, or +nil+ otherwise:
+ *
+ *   ENV.replace('foo' => '0', 'bar' => '1', 'baz' => '2')
+ *   ENV.select! { |name, value| name.start_with?('b') } # => ENV
+ *   ENV # => {"bar"=>"1", "baz"=>"2"}
+ *   ENV.select! { |name, value| true } # => nil
+ *
+ *   ENV.replace('foo' => '0', 'bar' => '1', 'baz' => '2')
+ *   ENV.filter! { |name, value| name.start_with?('b') } # => ENV
+ *   ENV # => {"bar"=>"1", "baz"=>"2"}
+ *   ENV.filter! { |name, value| true } # => nil
+ *
+ * Returns an Enumerator if no block given:
+ *
+ *   ENV.replace('foo' => '0', 'bar' => '1', 'baz' => '2')
+ *   e = ENV.select! # => #<Enumerator: {"bar"=>"1", "baz"=>"2"}:select!>
+ *   e.each { |name, value| name.start_with?('b') } # => ENV
+ *   ENV # => {"bar"=>"1", "baz"=>"2"}
+ *   e.each { |name, value| true } # => nil
+ *
+ *   ENV.replace('foo' => '0', 'bar' => '1', 'baz' => '2')
+ *   e = ENV.filter! # => #<Enumerator: {"bar"=>"1", "baz"=>"2"}:filter!>
+ *   e.each { |name, value| name.start_with?('b') } # => ENV
+ *   ENV # => {"bar"=>"1", "baz"=>"2"}
+ *   e.each { |name, value| true } # => nil
  */
 static VALUE
 env_select_bang(VALUE ehash)
@@ -3655,14 +5779,13 @@ env_select_bang(VALUE ehash)
     int del = 0;
 
     RETURN_SIZED_ENUMERATOR(ehash, 0, 0, rb_env_size);
-    keys = env_keys();
+    keys = env_keys(FALSE);
     RBASIC_CLEAR_CLASS(keys);
     for (i=0; i<RARRAY_LEN(keys); i++) {
 	VALUE val = rb_f_getenv(Qnil, RARRAY_AREF(keys, i));
 	if (!NIL_P(val)) {
 	    if (!RTEST(rb_yield_values(2, RARRAY_AREF(keys, i), val))) {
-		FL_UNSET(RARRAY_AREF(keys, i), FL_TAINT);
-		env_delete(Qnil, RARRAY_AREF(keys, i));
+                env_delete(RARRAY_AREF(keys, i));
 		del++;
 	    }
 	}
@@ -3674,12 +5797,21 @@ env_select_bang(VALUE ehash)
 
 /*
  * call-seq:
- *   ENV.keep_if { |name, value| } -> Hash
- *   ENV.keep_if                   -> Enumerator
- *
- * Deletes every environment variable where the block evaluates to +false+.
- *
- * Returns an enumerator if no block was given.
+ *   ENV.keep_if { |name, value| block } -> ENV
+ *   ENV.keep_if                         -> an_enumerator
+ *
+ * Yields each environment variable name and its value as a 2-element Array,
+ * deleting each environment variable for which the block returns +false+ or +nil+,
+ * and returning ENV:
+ *   ENV.replace('foo' => '0', 'bar' => '1', 'baz' => '2')
+ *   ENV.keep_if { |name, value| name.start_with?('b') } # => ENV
+ *   ENV # => {"bar"=>"1", "baz"=>"2"}
+ *
+ * Returns an Enumerator if no block given:
+ *   ENV.replace('foo' => '0', 'bar' => '1', 'baz' => '2')
+ *   e = ENV.keep_if # => #<Enumerator: {"bar"=>"1", "baz"=>"2", "foo"=>"0"}:keep_if>
+ *   e.each { |name, value| name.start_with?('b') } # => ENV
+ *   ENV # => {"bar"=>"1", "baz"=>"2"}
  */
 static VALUE
 env_keep_if(VALUE ehash)
@@ -3691,22 +5823,48 @@ env_keep_if(VALUE ehash)
 
 /*
  * call-seq:
- *   ENV.clear
- *
- * Removes every environment variable.
+ *   ENV.slice(*names) -> hash of name/value pairs
+ *
+ * Returns a Hash of the given ENV names and their corresponding values:
+ *   ENV.replace('foo' => '0', 'bar' => '1', 'baz' => '2', 'bat' => '3')
+ *   ENV.slice('foo', 'baz') # => {"foo"=>"0", "baz"=>"2"}
+ *   ENV.slice('baz', 'foo') # => {"baz"=>"2", "foo"=>"0"}
+ * Raises an exception if any of the +names+ is invalid
+ * (see {Invalid Names and Values}[#class-ENV-label-Invalid+Names+and+Values]):
+ *   ENV.slice('foo', 'bar', :bat) # Raises TypeError (no implicit conversion of Symbol into String)
  */
+static VALUE
+env_slice(int argc, VALUE *argv, VALUE _)
+{
+    int i;
+    VALUE key, value, result;
+
+    if (argc == 0) {
+        return rb_hash_new();
+    }
+    result = rb_hash_new_with_size(argc);
+
+    for (i = 0; i < argc; i++) {
+        key = argv[i];
+        value = rb_f_getenv(Qnil, key);
+        if (value != Qnil)
+            rb_hash_aset(result, key, value);
+    }
+
+    return result;
+}
+
 VALUE
 rb_env_clear(void)
 {
     VALUE keys;
     long i;
 
-    keys = env_keys();
+    keys = env_keys(TRUE);
     for (i=0; i<RARRAY_LEN(keys); i++) {
-	VALUE val = rb_f_getenv(Qnil, RARRAY_AREF(keys, i));
-	if (!NIL_P(val)) {
-	    env_delete(Qnil, RARRAY_AREF(keys, i));
-	}
+        VALUE key = RARRAY_AREF(keys, i);
+        const char *nam = RSTRING_PTR(key);
+        ruby_setenv(nam, 0);
     }
     RB_GC_GUARD(keys);
     return envtbl;
@@ -3714,24 +5872,43 @@ rb_env_clear(void)
 
 /*
  * call-seq:
+ *   ENV.clear -> ENV
+ *
+ * Removes every environment variable; returns ENV:
+ *   ENV.replace('foo' => '0', 'bar' => '1')
+ *   ENV.size # => 2
+ *   ENV.clear # => ENV
+ *   ENV.size # => 0
+ */
+static VALUE
+env_clear(VALUE _)
+{
+    return rb_env_clear();
+}
+
+/*
+ * call-seq:
  *   ENV.to_s -> "ENV"
  *
- * Returns "ENV"
+ * Returns String 'ENV':
+ *   ENV.to_s # => "ENV"
  */
 static VALUE
-env_to_s(void)
+env_to_s(VALUE _)
 {
     return rb_usascii_str_new2("ENV");
 }
 
 /*
  * call-seq:
- *   ENV.inspect -> string
+ *   ENV.inspect -> a_string
  *
- * Returns the contents of the environment as a String.
+ * Returns the contents of the environment as a String:
+ *   ENV.replace('foo' => '0', 'bar' => '1')
+ *   ENV.inspect # => "{\"bar\"=>\"1\", \"foo\"=>\"0\"}"
  */
 static VALUE
-env_inspect(void)
+env_inspect(VALUE _)
 {
     char **env;
     VALUE str, i;
@@ -3755,22 +5932,21 @@ env_inspect(void)
     }
     FREE_ENVIRON(environ);
     rb_str_buf_cat2(str, "}");
-    OBJ_TAINT(str);
 
     return str;
 }
 
 /*
  * call-seq:
- *   ENV.to_a -> Array
- *
- * Converts the environment variables into an array of names and value arrays.
- *
- *   ENV.to_a # => [["TERM", "xterm-color"], ["SHELL", "/bin/bash"], ...]
+ *   ENV.to_a -> array of 2-element arrays
  *
+ * Returns the contents of ENV as an Array of 2-element Arrays,
+ * each of which is a name/value pair:
+ *   ENV.replace('foo' => '0', 'bar' => '1')
+ *   ENV.to_a # => [["bar", "1"], ["foo", "0"]]
  */
 static VALUE
-env_to_a(void)
+env_to_a(VALUE _)
 {
     char **env;
     VALUE ary;
@@ -3791,26 +5967,30 @@ env_to_a(void)
 
 /*
  * call-seq:
- *   ENV.rehash
+ *   ENV.rehash -> nil
+ *
+ * (Provided for compatibility with Hash.)
  *
- * Re-hashing the environment variables does nothing.  It is provided for
- * compatibility with Hash.
+ * Does not modify ENV; returns +nil+.
  */
 static VALUE
-env_none(void)
+env_none(VALUE _)
 {
     return Qnil;
 }
 
 /*
  * call-seq:
- *   ENV.length
- *   ENV.size
+ *   ENV.length -> an_integer
+ *   ENV.size   -> an_integer
  *
- * Returns the number of environment variables.
+ * Returns the count of environment variables:
+ *   ENV.replace('foo' => '0', 'bar' => '1')
+ *   ENV.length # => 2
+ *   ENV.size # => 2
  */
 static VALUE
-env_size(void)
+env_size(VALUE _)
 {
     int i;
     char **env;
@@ -3826,10 +6006,14 @@ env_size(void)
  * call-seq:
  *   ENV.empty? -> true or false
  *
- * Returns true when there are no environment variables
+ * Returns +true+ when there are no environment variables, +false+ otherwise:
+ *   ENV.clear
+ *   ENV.empty? # => true
+ *   ENV['foo'] = '0'
+ *   ENV.empty? # => false
  */
 static VALUE
-env_empty_p(void)
+env_empty_p(VALUE _)
 {
     char **env;
 
@@ -3844,12 +6028,28 @@ env_empty_p(void)
 
 /*
  * call-seq:
- *   ENV.key?(name)     -> true or false
  *   ENV.include?(name) -> true or false
  *   ENV.has_key?(name) -> true or false
  *   ENV.member?(name)  -> true or false
+ *   ENV.key?(name)     -> true or false
  *
- * Returns +true+ if there is an environment variable with the given +name+.
+ * ENV.has_key?, ENV.member?, and ENV.key? are aliases for ENV.include?.
+ *
+ * Returns +true+ if there is an environment variable with the given +name+:
+ *   ENV.replace('foo' => '0', 'bar' => '1')
+ *   ENV.include?('foo') # => true
+ * Returns +false+ if +name+ is a valid String and there is no such environment variable:
+ *   ENV.include?('baz') # => false
+ * Returns +false+ if +name+ is the empty String or is a String containing character <code>'='</code>:
+ *   ENV.include?('') # => false
+ *   ENV.include?('=') # => false
+ * Raises an exception if +name+ is a String containing the NUL character <code>"\0"</code>:
+ *   ENV.include?("\0") # Raises ArgumentError (bad environment variable name: contains null byte)
+ * Raises an exception if +name+ has an encoding that is not ASCII-compatible:
+ *   ENV.include?("\xa1\xa1".force_encoding(Encoding::UTF_16LE))
+ *   # Raises ArgumentError (bad environment variable name: ASCII incompatible encoding: UTF-16LE)
+ * Raises an exception if +name+ is not a String:
+ *   ENV.include?(Object.new) # TypeError (no implicit conversion of Object into String)
  */
 static VALUE
 env_has_key(VALUE env, VALUE key)
@@ -3863,10 +6063,23 @@ env_has_key(VALUE env, VALUE key)
 
 /*
  * call-seq:
- *   ENV.assoc(name) -> Array or nil
- *
- * Returns an Array of the name and value of the environment variable with
- * +name+ or +nil+ if the name cannot be found.
+ *   ENV.assoc(name) -> [name, value] or nil
+ *
+ * Returns a 2-element Array containing the name and value of the environment variable
+ * for +name+ if it exists:
+ *   ENV.replace('foo' => '0', 'bar' => '1')
+ *   ENV.assoc('foo') # => ['foo', '0']
+ * Returns +nil+ if +name+ is a valid String and there is no such environment variable.
+ *
+ * Returns +nil+ if +name+ is the empty String or is a String containing character <code>'='</code>.
+ *
+ * Raises an exception if +name+ is a String containing the NUL character <code>"\0"</code>:
+ *   ENV.assoc("\0") # Raises ArgumentError (bad environment variable name: contains null byte)
+ * Raises an exception if +name+ has an encoding that is not ASCII-compatible:
+ *   ENV.assoc("\xa1\xa1".force_encoding(Encoding::UTF_16LE))
+ *   # Raises ArgumentError (bad environment variable name: ASCII incompatible encoding: UTF-16LE)
+ * Raises an exception if +name+ is not a String:
+ *   ENV.assoc(Object.new) # TypeError (no implicit conversion of Object into String)
  */
 static VALUE
 env_assoc(VALUE env, VALUE key)
@@ -3875,16 +6088,21 @@ env_assoc(VALUE env, VALUE key)
 
     s = env_name(key);
     e = getenv(s);
-    if (e) return rb_assoc_new(key, rb_tainted_str_new2(e));
+    if (e) return rb_assoc_new(key, env_str_new2(e));
     return Qnil;
 }
 
 /*
  * call-seq:
- *   ENV.value?(value) -> true or false
+ *   ENV.value?(value)     -> true or false
  *   ENV.has_value?(value) -> true or false
  *
- * Returns +true+ if there is an environment variable with the given +value+.
+ * Returns +true+ if +value+ is the value for some environment variable name, +false+ otherwise:
+ *   ENV.replace('foo' => '0', 'bar' => '1')
+ *   ENV.value?('0') # => true
+ *   ENV.has_value?('0') # => true
+ *   ENV.value?('2') # => false
+ *   ENV.has_value?('2') # => false
  */
 static VALUE
 env_has_value(VALUE dmy, VALUE obj)
@@ -3893,7 +6111,6 @@ env_has_value(VALUE dmy, VALUE obj)
 
     obj = rb_check_string_type(obj);
     if (NIL_P(obj)) return Qnil;
-    rb_check_safe_obj(obj);
     env = GET_ENVIRON(environ);
     while (*env) {
 	char *s = strchr(*env, '=');
@@ -3912,10 +6129,17 @@ env_has_value(VALUE dmy, VALUE obj)
 
 /*
  * call-seq:
- *   ENV.rassoc(value)
+ *   ENV.rassoc(value) -> [name, value] or nil
+ *
+ * Returns a 2-element Array containing the name and value of the
+ * *first* *found* environment variable that has value +value+, if one
+ * exists:
+ *   ENV.replace('foo' => '0', 'bar' => '0')
+ *   ENV.rassoc('0') # => ["bar", "0"]
+ * The order in which environment variables are examined is OS-dependent.
+ * See {About Ordering}[#class-ENV-label-About+Ordering].
  *
- * Returns an Array of the name and value of the environment variable with
- * +value+ or +nil+ if the value cannot be found.
+ * Returns +nil+ if there is no such environment variable.
  */
 static VALUE
 env_rassoc(VALUE dmy, VALUE obj)
@@ -3924,14 +6148,13 @@ env_rassoc(VALUE dmy, VALUE obj)
 
     obj = rb_check_string_type(obj);
     if (NIL_P(obj)) return Qnil;
-    rb_check_safe_obj(obj);
     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);
+                VALUE result = rb_assoc_new(rb_str_new(*env, s-*env-1), obj);
 		FREE_ENVIRON(environ);
 		return result;
 	    }
@@ -3944,10 +6167,19 @@ env_rassoc(VALUE dmy, VALUE obj)
 
 /*
  * call-seq:
- *   ENV.key(value) -> name
+ *   ENV.key(value) -> name or nil
  *
- * Returns the name of the environment variable with +value+.  If the value is
- * not found +nil+ is returned.
+ * Returns the name of the first environment variable with +value+, if it exists:
+ *   ENV.replace('foo' => '0', 'bar' => '0')
+ *   ENV.key('0') # => "foo"
+ * The order in which environment variables are examined is OS-dependent.
+ * See {About Ordering}[#class-ENV-label-About+Ordering].
+ *
+ * Returns +nil+ if there is no such value.
+ *
+ * Raises an exception if +value+ is invalid:
+ *   ENV.key(Object.new) # raises TypeError (no implicit conversion of Object into String)
+ * See {Invalid Names and Values}[#class-ENV-label-Invalid+Names+and+Values].
  */
 static VALUE
 env_key(VALUE dmy, VALUE value)
@@ -3973,27 +6205,6 @@ env_key(VALUE dmy, VALUE value)
     return Qnil;
 }
 
-/*
- * call-seq:
- *   ENV.index(value) -> key
- *
- * Deprecated method that is equivalent to ENV.key
- */
-static VALUE
-env_index(VALUE dmy, VALUE value)
-{
-    rb_warn("ENV.index is deprecated; use ENV.key");
-    return env_key(dmy, value);
-}
-
-/*
- * call-seq:
- *   ENV.to_hash -> hash
- *   ENV.to_h    -> hash
- *
- * Creates a hash with a copy of the environment variables.
- *
- */
 static VALUE
 env_to_hash(void)
 {
@@ -4016,27 +6227,123 @@ env_to_hash(void)
 
 /*
  * call-seq:
- *   ENV.reject { |name, value| } -> Hash
- *   ENV.reject                   -> Enumerator
+ *   ENV.to_hash -> hash of name/value pairs
+ *
+ * Returns a Hash containing all name/value pairs from ENV:
+ *   ENV.replace('foo' => '0', 'bar' => '1')
+ *   ENV.to_hash # => {"bar"=>"1", "foo"=>"0"}
+ */
+
+static VALUE
+env_f_to_hash(VALUE _)
+{
+    return env_to_hash();
+}
+
+/*
+ * call-seq:
+ *   ENV.to_h                        -> hash of name/value pairs
+ *   ENV.to_h {|name, value| block } -> hash of name/value pairs
+ *
+ * With no block, returns a Hash containing all name/value pairs from ENV:
+ *   ENV.replace('foo' => '0', 'bar' => '1')
+ *   ENV.to_h # => {"bar"=>"1", "foo"=>"0"}
+ * With a block, returns a Hash whose items are determined by the block.
+ * Each name/value pair in ENV is yielded to the block.
+ * The block must return a 2-element Array (name/value pair)
+ * that is added to the return Hash as a key and value:
+ *   ENV.to_h { |name, value| [name.to_sym, value.to_i] } # => {:bar=>1, :foo=>0}
+ * Raises an exception if the block does not return an Array:
+ *   ENV.to_h { |name, value| name } # Raises TypeError (wrong element type String (expected array))
+ * Raises an exception if the block returns an Array of the wrong size:
+ *   ENV.to_h { |name, value| [name] } # Raises ArgumentError (element has wrong array length (expected 2, was 1))
+ */
+static VALUE
+env_to_h(VALUE _)
+{
+    VALUE hash = env_to_hash();
+    if (rb_block_given_p()) {
+        hash = rb_hash_to_h_block(hash);
+    }
+    return hash;
+}
+
+/*
+ *  call-seq:
+ *     ENV.except(*keys) -> a_hash
+ *
+ *  Returns a hash except the given keys from ENV and their values.
  *
- * Same as ENV#delete_if, but works on (and returns) a copy of the
- * environment.
+ *     ENV                       #=> {"LANG"=>"en_US.UTF-8", "TERM"=>"xterm-256color", "HOME"=>"/Users/rhc"}
+ *     ENV.except("TERM","HOME") #=> {"LANG"=>"en_US.UTF-8"}
  */
 static VALUE
-env_reject(void)
+env_except(int argc, VALUE *argv, VALUE _)
+{
+    int i;
+    VALUE key, hash = env_to_hash();
+
+    for (i = 0; i < argc; i++) {
+        key = argv[i];
+        rb_hash_delete(hash, key);
+    }
+
+    return hash;
+}
+
+/*
+ * call-seq:
+ *   ENV.reject { |name, value| block } -> hash of name/value pairs
+ *   ENV.reject                         -> an_enumerator
+ *
+ * Yields each environment variable name and its value as a 2-element Array.
+ * Returns a Hash whose items are determined by the block.
+ * When the block returns a truthy value, the name/value pair is added to the return Hash;
+ * otherwise the pair is ignored:
+ *   ENV.replace('foo' => '0', 'bar' => '1', 'baz' => '2')
+ *   ENV.reject { |name, value| name.start_with?('b') } # => {"foo"=>"0"}
+ * Returns an Enumerator if no block given:
+ *   e = ENV.reject
+ *   e.each { |name, value| name.start_with?('b') } # => {"foo"=>"0"}
+ */
+static VALUE
+env_reject(VALUE _)
 {
     return rb_hash_delete_if(env_to_hash());
 }
 
+NORETURN(static VALUE env_freeze(VALUE self));
 /*
  * call-seq:
- *   ENV.shift -> Array or nil
+ *   ENV.freeze
  *
- * Removes an environment variable name-value pair from ENV and returns it as
- * an Array.  Returns +nil+ if when the environment is empty.
+ * Raises an exception:
+ *   ENV.freeze # Raises TypeError (cannot freeze ENV)
+ */
+static VALUE
+env_freeze(VALUE self)
+{
+    rb_raise(rb_eTypeError, "cannot freeze ENV");
+    UNREACHABLE_RETURN(self);
+}
+
+/*
+ * call-seq:
+ *   ENV.shift -> [name, value] or nil
+ *
+ * Removes the first environment variable from ENV and returns
+ * a 2-element Array containing its name and value:
+ *   ENV.replace('foo' => '0', 'bar' => '1')
+ *   ENV.to_hash # => {'bar' => '1', 'foo' => '0'}
+ *   ENV.shift # => ['bar', '1']
+ *   ENV.to_hash # => {'foo' => '0'}
+ * Exactly which environment variable is "first" is OS-dependent.
+ * See {About Ordering}[#class-ENV-label-About+Ordering].
+ *
+ * Returns +nil+ if the environment is empty.
  */
 static VALUE
-env_shift(void)
+env_shift(VALUE _)
 {
     char **env;
     VALUE result = Qnil;
@@ -4047,7 +6354,7 @@ env_shift(void)
 	if (s) {
 	    VALUE key = env_str_new(*env, s-*env);
 	    VALUE val = env_str_new2(getenv(RSTRING_PTR(key)));
-	    env_delete(Qnil, key);
+            env_delete(key);
 	    result = rb_assoc_new(key, val);
 	}
     }
@@ -4057,33 +6364,71 @@ env_shift(void)
 
 /*
  * call-seq:
- *   ENV.invert -> Hash
- *
- * Returns a new hash created by using environment variable names as values
- * and values as names.
+ *   ENV.invert -> hash of value/name pairs
+ *
+ * Returns a Hash whose keys are the ENV values,
+ * and whose values are the corresponding ENV names:
+ *   ENV.replace('foo' => '0', 'bar' => '1')
+ *   ENV.invert # => {"1"=>"bar", "0"=>"foo"}
+ * For a duplicate ENV value, overwrites the hash entry:
+ *   ENV.replace('foo' => '0', 'bar' => '0')
+ *   ENV.invert # => {"0"=>"foo"}
+ * Note that the order of the ENV processing is OS-dependent,
+ * which means that the order of overwriting is also OS-dependent.
+ * See {About Ordering}[#class-ENV-label-About+Ordering].
  */
 static VALUE
-env_invert(void)
+env_invert(VALUE _)
 {
     return rb_hash_invert(env_to_hash());
 }
 
+static void
+keylist_delete(VALUE keys, VALUE key)
+{
+    long keylen, elen;
+    const char *keyptr, *eptr;
+    RSTRING_GETMEM(key, keyptr, keylen);
+    /* Don't stop at first key, as it is possible to have
+       multiple environment values with the same key.
+    */
+    for (long i=0; i<RARRAY_LEN(keys); i++) {
+        VALUE e = RARRAY_AREF(keys, i);
+        RSTRING_GETMEM(e, eptr, elen);
+        if (elen != keylen) continue;
+        if (!ENVNMATCH(keyptr, eptr, elen)) continue;
+        rb_ary_delete_at(keys, i);
+        i--;
+    }
+}
+
 static int
 env_replace_i(VALUE key, VALUE val, VALUE keys)
 {
-    env_aset(Qnil, key, val);
-    if (rb_ary_includes(keys, key)) {
-	rb_ary_delete(keys, key);
-    }
+    env_name(key);
+    env_aset(key, val);
+
+    keylist_delete(keys, key);
     return ST_CONTINUE;
 }
 
 /*
  * call-seq:
- *   ENV.replace(hash) -> env
+ *   ENV.replace(hash) -> ENV
+ *
+ * Replaces the entire content of the environment variables
+ * with the name/value pairs in the given +hash+;
+ * returns ENV.
  *
- * Replaces the contents of the environment variables with the contents of
- * +hash+.
+ * Replaces the content of ENV with the given pairs:
+ *   ENV.replace('foo' => '0', 'bar' => '1') # => ENV
+ *   ENV.to_hash # => {"bar"=>"1", "foo"=>"0"}
+ *
+ * Raises an exception if a name or value is invalid
+ * (see {Invalid Names and Values}[#class-ENV-label-Invalid+Names+and+Values]):
+ *   ENV.replace('foo' => '0', :bar => '1') # Raises TypeError (no implicit conversion of Symbol into String)
+ *   ENV.replace('foo' => '0', 'bar' => 1) # Raises TypeError (no implicit conversion of Integer into String)
+ *   ENV.to_hash # => {"bar"=>"1", "foo"=>"0"}
  */
 static VALUE
 env_replace(VALUE env, VALUE hash)
@@ -4091,121 +6436,303 @@ env_replace(VALUE env, VALUE hash)
     VALUE keys;
     long i;
 
-    keys = env_keys();
+    keys = env_keys(TRUE);
     if (env == hash) return env;
     hash = to_hash(hash);
     rb_hash_foreach(hash, env_replace_i, keys);
 
     for (i=0; i<RARRAY_LEN(keys); i++) {
-	env_delete(env, RARRAY_AREF(keys, i));
+        env_delete(RARRAY_AREF(keys, i));
     }
     RB_GC_GUARD(keys);
     return env;
 }
 
 static int
-env_update_i(VALUE key, VALUE val)
+env_update_i(VALUE key, VALUE val, VALUE _)
 {
-    if (rb_block_given_p()) {
-	val = rb_yield_values(3, key, rb_f_getenv(Qnil, key), val);
+    env_aset(key, val);
+    return ST_CONTINUE;
+}
+
+static int
+env_update_block_i(VALUE key, VALUE val, VALUE _)
+{
+    VALUE oldval = rb_f_getenv(Qnil, key);
+    if (!NIL_P(oldval)) {
+	val = rb_yield_values(3, key, oldval, val);
     }
-    env_aset(Qnil, key, val);
+    env_aset(key, val);
     return ST_CONTINUE;
 }
 
 /*
  * call-seq:
- *   ENV.update(hash)                                  -> Hash
- *   ENV.update(hash) { |name, old_value, new_value| } -> Hash
- *
- * Adds the contents of +hash+ to the environment variables.  If no block is
- * specified entries with duplicate keys are overwritten, otherwise the value
- * of each duplicate name is determined by calling the block with the key, its
- * value from the environment and its value from the hash.
+ *   ENV.update(hash)                                     -> ENV
+ *   ENV.update(hash) { |name, env_val, hash_val| block } -> ENV
+ *   ENV.merge!(hash)                                     -> ENV
+ *   ENV.merge!(hash) { |name, env_val, hash_val| block } -> ENV
+ *
+ * ENV.update is an alias for ENV.merge!.
+ *
+ * Adds to ENV each key/value pair in the given +hash+; returns ENV:
+ *   ENV.replace('foo' => '0', 'bar' => '1')
+ *   ENV.merge!('baz' => '2', 'bat' => '3') # => {"bar"=>"1", "bat"=>"3", "baz"=>"2", "foo"=>"0"}
+ * Deletes the ENV entry for a hash value that is +nil+:
+ *   ENV.merge!('baz' => nil, 'bat' => nil) # => {"bar"=>"1", "foo"=>"0"}
+ * For an already-existing name, if no block given, overwrites the ENV value:
+ *   ENV.merge!('foo' => '4') # => {"bar"=>"1", "foo"=>"4"}
+ * For an already-existing name, if block given,
+ * yields the name, its ENV value, and its hash value;
+ * the block's return value becomes the new name:
+ *   ENV.merge!('foo' => '5') { |name, env_val, hash_val | env_val + hash_val } # => {"bar"=>"1", "foo"=>"45"}
+ * Raises an exception if a name or value is invalid
+ * (see {Invalid Names and Values}[#class-ENV-label-Invalid+Names+and+Values]);
+ *   ENV.replace('foo' => '0', 'bar' => '1')
+ *   ENV.merge!('foo' => '6', :bar => '7', 'baz' => '9') # Raises TypeError (no implicit conversion of Symbol into String)
+ *   ENV # => {"bar"=>"1", "foo"=>"6"}
+ *   ENV.merge!('foo' => '7', 'bar' => 8, 'baz' => '9') # Raises TypeError (no implicit conversion of Integer into String)
+ *   ENV # => {"bar"=>"1", "foo"=>"7"}
+ * Raises an exception if the block returns an invalid name:
+ * (see {Invalid Names and Values}[#class-ENV-label-Invalid+Names+and+Values]):
+ *   ENV.merge!('bat' => '8', 'foo' => '9') { |name, env_val, hash_val | 10 } # Raises TypeError (no implicit conversion of Integer into String)
+ *   ENV # => {"bar"=>"1", "bat"=>"8", "foo"=>"7"}
+ *
+ * Note that for the exceptions above,
+ * hash pairs preceding an invalid name or value are processed normally;
+ * those following are ignored.
  */
 static VALUE
 env_update(VALUE env, VALUE hash)
 {
     if (env == hash) return env;
     hash = to_hash(hash);
-    rb_hash_foreach(hash, env_update_i, 0);
+    rb_foreach_func *func = rb_block_given_p() ?
+        env_update_block_i : env_update_i;
+    rb_hash_foreach(hash, func, 0);
     return env;
 }
 
 /*
- *  A Hash is a dictionary-like collection of unique keys and their values.
- *  Also called associative arrays, they are similar to Arrays, but where an
- *  Array uses integers as its index, a Hash allows you to use any object
- *  type.
+ *  A \Hash maps each of its unique keys to a specific value.
  *
- *  Hashes enumerate their values in the order that the corresponding keys
- *  were inserted.
+ *  A \Hash has certain similarities to an \Array, but:
+ *  - An \Array index is always an \Integer.
+ *  - A \Hash key can be (almost) any object.
  *
- *  A Hash can be easily created by using its implicit form:
+ *  === \Hash \Data Syntax
  *
- *    grades = { "Jane Doe" => 10, "Jim Doe" => 6 }
+ *  The older syntax for \Hash data uses the "hash rocket," <tt>=></tt>:
  *
- *  Hashes allow an alternate syntax for keys that are symbols.
- *  Instead of
+ *    h = {:foo => 0, :bar => 1, :baz => 2}
+ *    h # => {:foo=>0, :bar=>1, :baz=>2}
  *
- *    options = { :font_size => 10, :font_family => "Arial" }
+ *  Alternatively, but only for a \Hash key that's a \Symbol,
+ *  you can use a newer JSON-style syntax,
+ *  where each bareword becomes a \Symbol:
  *
- *  You could write it as:
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h # => {:foo=>0, :bar=>1, :baz=>2}
  *
- *    options = { font_size: 10, font_family: "Arial" }
+ *  You can also use a \String in place of a bareword:
  *
- *  Each named key is a symbol you can access in hash:
+ *    h = {'foo': 0, 'bar': 1, 'baz': 2}
+ *    h # => {:foo=>0, :bar=>1, :baz=>2}
  *
- *    options[:font_size]  # => 10
+ *  And you can mix the styles:
  *
- *  A Hash can also be created through its ::new method:
+ *    h = {foo: 0, :bar => 1, 'baz': 2}
+ *    h # => {:foo=>0, :bar=>1, :baz=>2}
  *
- *    grades = Hash.new
- *    grades["Dorothy Doe"] = 9
+ *  But it's an error to try the JSON-style syntax
+ *  for a key that's not a bareword or a String:
  *
- *  Hashes have a <em>default value</em> that is returned when accessing
- *  keys that do not exist in the hash. If no default is set +nil+ is used.
- *  You can set the default value by sending it as an argument to Hash.new:
+ *    # Raises SyntaxError (syntax error, unexpected ':', expecting =>):
+ *    h = {0: 'zero'}
  *
- *    grades = Hash.new(0)
+ *  === Common Uses
  *
- *  Or by using the #default= method:
+ *  You can use a \Hash to give names to objects:
  *
- *    grades = {"Timmy Doe" => 8}
- *    grades.default = 0
+ *    person = {name: 'Matz', language: 'Ruby'}
+ *    person # => {:name=>"Matz", :language=>"Ruby"}
  *
- *  Accessing a value in a Hash requires using its key:
+ *  You can use a \Hash to give names to method arguments:
  *
- *    puts grades["Jane Doe"] # => 0
+ *    def some_method(hash)
+ *      p hash
+ *    end
+ *    some_method({foo: 0, bar: 1, baz: 2}) # => {:foo=>0, :bar=>1, :baz=>2}
  *
- *  === Common Uses
+ *  Note: when the last argument in a method call is a \Hash,
+ *  the curly braces may be omitted:
+ *
+ *    some_method(foo: 0, bar: 1, baz: 2) # => {:foo=>0, :bar=>1, :baz=>2}
+ *
+ *  You can use a \Hash to initialize an object:
  *
- *  Hashes are an easy way to represent data structures, such as
+ *    class Dev
+ *      attr_accessor :name, :language
+ *      def initialize(hash)
+ *        self.name = hash[:name]
+ *        self.language = hash[:language]
+ *      end
+ *    end
+ *    matz = Dev.new(name: 'Matz', language: 'Ruby')
+ *    matz # => #<Dev: @name="Matz", @language="Ruby">
  *
- *    books         = {}
- *    books[:matz]  = "The Ruby Language"
- *    books[:black] = "The Well-Grounded Rubyist"
+ *  === Creating a \Hash
  *
- *  Hashes are also commonly used as a way to have named parameters in
- *  functions. Note that no brackets are used below. If a hash is the last
- *  argument on a method call, no braces are needed, thus creating a really
- *  clean interface:
+ *  Here are three ways to create a \Hash:
  *
- *    Person.create(name: "John Doe", age: 27)
+ *  - \Method <tt>Hash.new</tt>
+ *  - \Method <tt>Hash[]</tt>
+ *  - Literal form: <tt>{}</tt>.
  *
- *    def self.create(params)
- *      @name = params[:name]
- *      @age  = params[:age]
- *    end
+ *  ---
+ *
+ *  You can create a \Hash by calling method Hash.new.
+ *
+ *  Create an empty Hash:
+ *
+ *    h = Hash.new
+ *    h # => {}
+ *    h.class # => Hash
+ *
+ *  ---
+ *
+ *  You can create a \Hash by calling method Hash.[].
+ *
+ *  Create an empty Hash:
+ *
+ *    h = Hash[]
+ *    h # => {}
+ *
+ *  Create a \Hash with initial entries:
  *
- *  === Hash Keys
+ *    h = Hash[foo: 0, bar: 1, baz: 2]
+ *    h # => {:foo=>0, :bar=>1, :baz=>2}
  *
- *  Two objects refer to the same hash key when their <code>hash</code> value
+ *  ---
+ *
+ *  You can create a \Hash by using its literal form (curly braces).
+ *
+ *  Create an empty \Hash:
+ *
+ *    h = {}
+ *    h # => {}
+ *
+ *  Create a \Hash with initial entries:
+ *
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h # => {:foo=>0, :bar=>1, :baz=>2}
+ *
+ *
+ *  === \Hash Value Basics
+ *
+ *  The simplest way to retrieve a \Hash value (instance method #[]):
+ *
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h[:foo] # => 0
+ *
+ *  The simplest way to create or update a \Hash value (instance method #[]=):
+ *
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h[:bat] = 3 # => 3
+ *    h # => {:foo=>0, :bar=>1, :baz=>2, :bat=>3}
+ *    h[:foo] = 4 # => 4
+ *    h # => {:foo=>4, :bar=>1, :baz=>2, :bat=>3}
+ *
+ *  The simplest way to delete a \Hash entry (instance method #delete):
+ *
+ *    h = {foo: 0, bar: 1, baz: 2}
+ *    h.delete(:bar) # => 1
+ *    h # => {:foo=>0, :baz=>2}
+ *
+ *  === Entry Order
+ *
+ *  A \Hash object presents its entries in the order of their creation. This is seen in:
+ *
+ *  - Iterative methods such as <tt>each</tt>, <tt>each_key</tt>, <tt>each_pair</tt>, <tt>each_value</tt>.
+ *  - Other order-sensitive methods such as <tt>shift</tt>, <tt>keys</tt>, <tt>values</tt>.
+ *  - The \String returned by method <tt>inspect</tt>.
+ *
+ *  A new \Hash has its initial ordering per the given entries:
+ *
+ *    h = Hash[foo: 0, bar: 1]
+ *    h # => {:foo=>0, :bar=>1}
+ *
+ *  New entries are added at the end:
+ *
+ *    h[:baz] = 2
+ *    h # => {:foo=>0, :bar=>1, :baz=>2}
+ *
+ *  Updating a value does not affect the order:
+ *
+ *    h[:baz] = 3
+ *    h # => {:foo=>0, :bar=>1, :baz=>3}
+ *
+ *  But re-creating a deleted entry can affect the order:
+ *
+ *    h.delete(:foo)
+ *    h[:foo] = 5
+ *    h # => {:bar=>1, :baz=>3, :foo=>5}
+ *
+ *  === \Hash Keys
+ *
+ *  ==== \Hash Key Equivalence
+ *
+ *  Two objects are treated as the same \hash key when their <code>hash</code> value
  *  is identical and the two objects are <code>eql?</code> to each other.
  *
- *  A user-defined class may be used as a hash key if the <code>hash</code>
- *  and <code>eql?</code> methods are overridden to provide meaningful
- *  behavior.  By default, separate instances refer to separate hash keys.
+ *  ==== Modifying an Active \Hash Key
+ *
+ *  Modifying a \Hash key while it is in use damages the hash's index.
+ *
+ *  This \Hash has keys that are Arrays:
+ *
+ *    a0 = [ :foo, :bar ]
+ *    a1 = [ :baz, :bat ]
+ *    h = {a0 => 0, a1 => 1}
+ *    h.include?(a0) # => true
+ *    h[a0] # => 0
+ *    a0.hash # => 110002110
+ *
+ *  Modifying array element <tt>a0[0]</tt> changes its hash value:
+ *
+ *    a0[0] = :bam
+ *    a0.hash # => 1069447059
+ *
+ *  And damages the \Hash index:
+ *
+ *    h.include?(a0) # => false
+ *    h[a0] # => nil
+ *
+ *  You can repair the hash index using method +rehash+:
+ *
+ *    h.rehash # => {[:bam, :bar]=>0, [:baz, :bat]=>1}
+ *    h.include?(a0) # => true
+ *    h[a0] # => 0
+ *
+ *  A \String key is always safe.
+ *  That's because an unfrozen \String
+ *  passed as a key will be replaced by a duplicated and frozen \String:
+ *
+ *    s = 'foo'
+ *    s.frozen? # => false
+ *    h = {s => 0}
+ *    first_key = h.keys.first
+ *    first_key.frozen? # => true
+ *
+ *  ==== User-Defined \Hash Keys
+ *
+ *  To be useable as a \Hash key, objects must implement the methods <code>hash</code> and <code>eql?</code>.
+ *  Note: this requirement does not apply if the \Hash uses #compare_by_id since comparison will then rely on
+ *  the keys' object id instead of <code>hash</code> and <code>eql?</code>.
+ *
+ *  \Object defines basic implementation for <code>hash</code> and <code>eq?</code> that makes each object
+ *  a distinct key. Typically, user-defined classes will want to override these methods to provide meaningful
+ *  behavior, or for example inherit \Struct that has useful definitions for these.
  *
  *  A typical implementation of <code>hash</code> is based on the
  *  object's data while <code>eql?</code> is usually aliased to the overridden
@@ -4220,8 +6747,8 @@ env_update(VALUE env, VALUE hash)
  *      end
  *
  *      def ==(other)
- *        self.class === other and
- *          other.author == @author and
+ *        self.class === other &&
+ *          other.author == @author &&
  *          other.title == @title
  *      end
  *
@@ -4242,19 +6769,98 @@ env_update(VALUE env, VALUE hash)
  *
  *    reviews.length #=> 1
  *
- *  See also Object#hash and Object#eql?
+ *  === Default Values
+ *
+ *  The methods #[], #values_at and #dig need to return the value associated to a certain key.
+ *  When that key is not found, that value will be determined by its default proc (if any)
+ *  or else its default (initially `nil`).
+ *
+ *  You can retrieve the default value with method #default:
+ *
+ *    h = Hash.new
+ *    h.default # => nil
+ *
+ *  You can set the default value by passing an argument to method Hash.new or
+ *  with method #default=
+ *
+ *    h = Hash.new(-1)
+ *    h.default # => -1
+ *    h.default = 0
+ *    h.default # => 0
+ *
+ *  This default value is returned for #[], #values_at and #dig when a key is
+ *  not found:
+ *
+ *    counts = {foo: 42}
+ *    counts.default # => nil (default)
+ *    counts[:foo] = 42
+ *    counts[:bar] # => nil
+ *    counts.default = 0
+ *    counts[:bar] # => 0
+ *    counts.values_at(:foo, :bar, :baz) # => [42, 0, 0]
+ *    counts.dig(:bar) # => 0
+ *
+ *  Note that the default value is used without being duplicated. It is not advised to set
+ *  the default value to a mutable object:
+ *
+ *    synonyms = Hash.new([])
+ *    synonyms[:hello] # => []
+ *    synonyms[:hello] << :hi # => [:hi], but this mutates the default!
+ *    synonyms.default # => [:hi]
+ *    synonyms[:world] << :universe
+ *    synonyms[:world] # => [:hi, :universe], oops
+ *    synonyms.keys # => [], oops
+ *
+ *  To use a mutable object as default, it is recommended to use a default proc
+ *
+ *  ==== Default \Proc
+ *
+ *  When the default proc for a \Hash is set (i.e., not +nil+),
+ *  the default value returned by method #[] is determined by the default proc alone.
+ *
+ *  You can retrieve the default proc with method #default_proc:
+ *
+ *    h = Hash.new
+ *    h.default_proc # => nil
+ *
+ *  You can set the default proc by calling Hash.new with a block or
+ *  calling the method #default_proc=
+ *
+ *    h = Hash.new { |hash, key| "Default value for #{key}" }
+ *    h.default_proc.class # => Proc
+ *    h.default_proc = proc { |hash, key| "Default value for #{key.inspect}" }
+ *    h.default_proc.class # => Proc
+ *
+ *  When the default proc is set (i.e., not +nil+)
+ *  and method #[] is called with with a non-existent key,
+ *  #[] calls the default proc with both the \Hash object itself and the missing key,
+ *  then returns the proc's return value:
+ *
+ *    h = Hash.new { |hash, key| "Default value for #{key}" }
+ *    h[:nosuch] # => "Default value for nosuch"
+ *
+ *  Note that in the example above no entry for key +:nosuch+ is created:
+ *
+ *    h.include?(:nosuch) # => false
+ *
+ *  However, the proc itself can add a new entry:
+ *
+ *    synonyms = Hash.new { |hash, key| hash[key] = [] }
+ *    synonyms.include?(:hello) # => false
+ *    synonyms[:hello] << :hi # => [:hi]
+ *    synonyms[:world] << :universe # => [:universe]
+ *    synonyms.keys # => [:hello, :world]
+ *
+ *  Note that setting the default proc will clear the default value and vice versa.
  */
 
 void
 Init_Hash(void)
 {
-#undef rb_intern
-#define rb_intern(str) rb_intern_const(str)
-
-    id_hash = rb_intern("hash");
-    id_yield = rb_intern("yield");
-    id_default = rb_intern("default");
-    id_flatten_bang = rb_intern("flatten!");
+    id_hash = rb_intern_const("hash");
+    id_default = rb_intern_const("default");
+    id_flatten_bang = rb_intern_const("flatten!");
+    id_hash_iter_lev = rb_make_internal_id();
 
     rb_cHash = rb_define_class("Hash", rb_cObject);
 
@@ -4263,73 +6869,83 @@ Init_Hash(void)
     rb_define_alloc_func(rb_cHash, empty_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_initialize_copy, 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_h", rb_hash_to_h, 0);
-    rb_define_method(rb_cHash,"to_a", rb_hash_to_a, 0);
-    rb_define_method(rb_cHash,"inspect", rb_hash_inspect, 0);
+    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_h", rb_hash_to_h, 0);
+    rb_define_method(rb_cHash, "to_a", rb_hash_to_a, 0);
+    rb_define_method(rb_cHash, "inspect", rb_hash_inspect, 0);
     rb_define_alias(rb_cHash, "to_s", "inspect");
-    rb_define_method(rb_cHash,"to_proc", rb_hash_to_proc, 0);
-
-    rb_define_method(rb_cHash,"==", rb_hash_equal, 1);
-    rb_define_method(rb_cHash,"[]", rb_hash_aref, 1);
-    rb_define_method(rb_cHash,"hash", rb_hash_hash, 0);
-    rb_define_method(rb_cHash,"eql?", rb_hash_eql, 1);
-    rb_define_method(rb_cHash,"fetch", rb_hash_fetch_m, -1);
-    rb_define_method(rb_cHash,"[]=", rb_hash_aset, 2);
-    rb_define_method(rb_cHash,"store", rb_hash_aset, 2);
-    rb_define_method(rb_cHash,"default", rb_hash_default, -1);
-    rb_define_method(rb_cHash,"default=", rb_hash_set_default, 1);
-    rb_define_method(rb_cHash,"default_proc", rb_hash_default_proc, 0);
-    rb_define_method(rb_cHash,"default_proc=", rb_hash_set_default_proc, 1);
-    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,"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_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,"keys", rb_hash_keys, 0);
-    rb_define_method(rb_cHash,"values", rb_hash_values, 0);
-    rb_define_method(rb_cHash,"values_at", rb_hash_values_at, -1);
-    rb_define_method(rb_cHash,"fetch_values", rb_hash_fetch_values, -1);
-
-    rb_define_method(rb_cHash,"shift", rb_hash_shift, 0);
-    rb_define_method(rb_cHash,"delete", rb_hash_delete_m, 1);
-    rb_define_method(rb_cHash,"delete_if", rb_hash_delete_if, 0);
-    rb_define_method(rb_cHash,"keep_if", rb_hash_keep_if, 0);
-    rb_define_method(rb_cHash,"select", rb_hash_select, 0);
-    rb_define_method(rb_cHash,"select!", rb_hash_select_bang, 0);
-    rb_define_method(rb_cHash,"reject", rb_hash_reject, 0);
-    rb_define_method(rb_cHash,"reject!", rb_hash_reject_bang, 0);
-    rb_define_method(rb_cHash,"clear", rb_hash_clear, 0);
-    rb_define_method(rb_cHash,"invert", rb_hash_invert, 0);
-    rb_define_method(rb_cHash,"update", rb_hash_update, 1);
-    rb_define_method(rb_cHash,"replace", rb_hash_replace, 1);
-    rb_define_method(rb_cHash,"merge!", rb_hash_update, 1);
-    rb_define_method(rb_cHash,"merge", rb_hash_merge, 1);
+    rb_define_method(rb_cHash, "to_proc", rb_hash_to_proc, 0);
+
+    rb_define_method(rb_cHash, "==", rb_hash_equal, 1);
+    rb_define_method(rb_cHash, "[]", rb_hash_aref, 1);
+    rb_define_method(rb_cHash, "hash", rb_hash_hash, 0);
+    rb_define_method(rb_cHash, "eql?", rb_hash_eql, 1);
+    rb_define_method(rb_cHash, "fetch", rb_hash_fetch_m, -1);
+    rb_define_method(rb_cHash, "[]=", rb_hash_aset, 2);
+    rb_define_method(rb_cHash, "store", rb_hash_aset, 2);
+    rb_define_method(rb_cHash, "default", rb_hash_default, -1);
+    rb_define_method(rb_cHash, "default=", rb_hash_set_default, 1);
+    rb_define_method(rb_cHash, "default_proc", rb_hash_default_proc, 0);
+    rb_define_method(rb_cHash, "default_proc=", rb_hash_set_default_proc, 1);
+    rb_define_method(rb_cHash, "key", rb_hash_key, 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_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, "transform_keys", rb_hash_transform_keys, -1);
+    rb_define_method(rb_cHash, "transform_keys!", rb_hash_transform_keys_bang, -1);
+    rb_define_method(rb_cHash, "transform_values", rb_hash_transform_values, 0);
+    rb_define_method(rb_cHash, "transform_values!", rb_hash_transform_values_bang, 0);
+
+    rb_define_method(rb_cHash, "keys", rb_hash_keys, 0);
+    rb_define_method(rb_cHash, "values", rb_hash_values, 0);
+    rb_define_method(rb_cHash, "values_at", rb_hash_values_at, -1);
+    rb_define_method(rb_cHash, "fetch_values", rb_hash_fetch_values, -1);
+
+    rb_define_method(rb_cHash, "shift", rb_hash_shift, 0);
+    rb_define_method(rb_cHash, "delete", rb_hash_delete_m, 1);
+    rb_define_method(rb_cHash, "delete_if", rb_hash_delete_if, 0);
+    rb_define_method(rb_cHash, "keep_if", rb_hash_keep_if, 0);
+    rb_define_method(rb_cHash, "select", rb_hash_select, 0);
+    rb_define_method(rb_cHash, "select!", rb_hash_select_bang, 0);
+    rb_define_method(rb_cHash, "filter", rb_hash_select, 0);
+    rb_define_method(rb_cHash, "filter!", rb_hash_select_bang, 0);
+    rb_define_method(rb_cHash, "reject", rb_hash_reject, 0);
+    rb_define_method(rb_cHash, "reject!", rb_hash_reject_bang, 0);
+    rb_define_method(rb_cHash, "slice", rb_hash_slice, -1);
+    rb_define_method(rb_cHash, "except", rb_hash_except, -1);
+    rb_define_method(rb_cHash, "clear", rb_hash_clear, 0);
+    rb_define_method(rb_cHash, "invert", rb_hash_invert, 0);
+    rb_define_method(rb_cHash, "update", rb_hash_update, -1);
+    rb_define_method(rb_cHash, "replace", rb_hash_replace, 1);
+    rb_define_method(rb_cHash, "merge!", rb_hash_update, -1);
+    rb_define_method(rb_cHash, "merge", rb_hash_merge, -1);
     rb_define_method(rb_cHash, "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, "compact", rb_hash_compact, 0);
+    rb_define_method(rb_cHash, "compact!", rb_hash_compact_bang, 0);
 
-    rb_define_method(rb_cHash,"include?", rb_hash_has_key, 1);
-    rb_define_method(rb_cHash,"member?", rb_hash_has_key, 1);
-    rb_define_method(rb_cHash,"has_key?", rb_hash_has_key, 1);
-    rb_define_method(rb_cHash,"has_value?", rb_hash_has_value, 1);
-    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, "include?", rb_hash_has_key, 1);
+    rb_define_method(rb_cHash, "member?", rb_hash_has_key, 1);
+    rb_define_method(rb_cHash, "has_key?", rb_hash_has_key, 1);
+    rb_define_method(rb_cHash, "has_value?", rb_hash_has_value, 1);
+    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);
+    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);
 
-    rb_define_method(rb_cHash, "any?", rb_hash_any_p, 0);
+    rb_define_method(rb_cHash, "any?", rb_hash_any_p, -1);
     rb_define_method(rb_cHash, "dig", rb_hash_dig, -1);
 
     rb_define_method(rb_cHash, "<=", rb_hash_le, 1);
@@ -4337,9 +6953,89 @@ Init_Hash(void)
     rb_define_method(rb_cHash, ">=", rb_hash_ge, 1);
     rb_define_method(rb_cHash, ">", rb_hash_gt, 1);
 
+    rb_define_method(rb_cHash, "deconstruct_keys", rb_hash_deconstruct_keys, 1);
+
+    rb_define_singleton_method(rb_cHash, "ruby2_keywords_hash?", rb_hash_s_ruby2_keywords_hash_p, 1);
+    rb_define_singleton_method(rb_cHash, "ruby2_keywords_hash", rb_hash_s_ruby2_keywords_hash, 1);
+
     /* Document-class: ENV
      *
      * ENV is a hash-like accessor for environment variables.
+     *
+     * === Interaction with the Operating System
+     *
+     * The ENV object interacts with the operating system's environment variables:
+     *
+     * - When you get the value for a name in ENV, the value is retrieved from among the current environment variables.
+     * - When you create or set a name-value pair in ENV, the name and value are immediately set in the environment variables.
+     * - When you delete a name-value pair in ENV, it is immediately deleted from the environment variables.
+     *
+     * === Names and Values
+     *
+     * Generally, a name or value is a String.
+     *
+     * ==== Valid Names and Values
+     *
+     * Each name or value must be one of the following:
+     *
+     * - A String.
+     * - An object that responds to \#to_str by returning a String, in which case that String will be used as the name or value.
+     *
+     * ==== Invalid Names and Values
+     *
+     * A new name:
+     *
+     * - May not be the empty string:
+     *     ENV[''] = '0'
+     *     # Raises Errno::EINVAL (Invalid argument - ruby_setenv())
+     *
+     * - May not contain character <code>"="</code>:
+     *     ENV['='] = '0'
+     *     # Raises Errno::EINVAL (Invalid argument - ruby_setenv(=))
+     *
+     * A new name or value:
+     *
+     * - May not be a non-String that does not respond to \#to_str:
+     *
+     *     ENV['foo'] = Object.new
+     *     # Raises TypeError (no implicit conversion of Object into String)
+     *     ENV[Object.new] = '0'
+     *     # Raises TypeError (no implicit conversion of Object into String)
+     *
+     * - May not contain the NUL character <code>"\0"</code>:
+     *
+     *     ENV['foo'] = "\0"
+     *     # Raises ArgumentError (bad environment variable value: contains null byte)
+     *     ENV["\0"] == '0'
+     *     # Raises ArgumentError (bad environment variable name: contains null byte)
+     *
+     * - May not have an ASCII-incompatible encoding such as UTF-16LE or ISO-2022-JP:
+     *
+     *     ENV['foo'] = '0'.force_encoding(Encoding::ISO_2022_JP)
+     *     # Raises ArgumentError (bad environment variable name: ASCII incompatible encoding: ISO-2022-JP)
+     *     ENV["foo".force_encoding(Encoding::ISO_2022_JP)] = '0'
+     *     # Raises ArgumentError (bad environment variable name: ASCII incompatible encoding: ISO-2022-JP)
+     *
+     * === About Ordering
+     *
+     * ENV enumerates its name/value pairs in the order found
+     * in the operating system's environment variables.
+     * Therefore the ordering of ENV content is OS-dependent, and may be indeterminate.
+     *
+     * This will be seen in:
+     * - A Hash returned by an ENV method.
+     * - An Enumerator returned by an ENV method.
+     * - An Array returned by ENV.keys, ENV.values, or ENV.to_a.
+     * - The String returned by ENV.inspect.
+     * - The Array returned by ENV.shift.
+     * - The name returned by ENV.key.
+     *
+     * === About the Examples
+     * Some methods in ENV return ENV itself. Typically, there are many environment variables.
+     * It's not useful to display a large ENV in the examples here,
+     * so most example snippets begin by resetting the contents of ENV:
+     * - ENV.replace replaces ENV with a new collection of entries.
+     * - ENV.clear empties ENV.
      */
 
     /*
@@ -4350,48 +7046,53 @@ Init_Hash(void)
     envtbl = rb_obj_alloc(rb_cObject);
     rb_extend_object(envtbl, rb_mEnumerable);
 
-    rb_define_singleton_method(envtbl,"[]", rb_f_getenv, 1);
-    rb_define_singleton_method(envtbl,"fetch", env_fetch, -1);
-    rb_define_singleton_method(envtbl,"[]=", env_aset, 2);
-    rb_define_singleton_method(envtbl,"store", env_aset, 2);
-    rb_define_singleton_method(envtbl,"each", env_each_pair, 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,"keep_if", env_keep_if, 0);
-    rb_define_singleton_method(envtbl,"clear", rb_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);
-    rb_define_singleton_method(envtbl,"select!", env_select_bang, 0);
-    rb_define_singleton_method(envtbl,"shift", env_shift, 0);
-    rb_define_singleton_method(envtbl,"invert", env_invert, 0);
-    rb_define_singleton_method(envtbl,"replace", env_replace, 1);
-    rb_define_singleton_method(envtbl,"update", env_update, 1);
-    rb_define_singleton_method(envtbl,"inspect", env_inspect, 0);
-    rb_define_singleton_method(envtbl,"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,"size", env_size, 0);
-    rb_define_singleton_method(envtbl,"length", env_size, 0);
-    rb_define_singleton_method(envtbl,"empty?", env_empty_p, 0);
-    rb_define_singleton_method(envtbl,"keys", env_keys, 0);
-    rb_define_singleton_method(envtbl,"values", env_values, 0);
-    rb_define_singleton_method(envtbl,"values_at", env_values_at, -1);
-    rb_define_singleton_method(envtbl,"include?", env_has_key, 1);
-    rb_define_singleton_method(envtbl,"member?", env_has_key, 1);
-    rb_define_singleton_method(envtbl,"has_key?", env_has_key, 1);
-    rb_define_singleton_method(envtbl,"has_value?", env_has_value, 1);
-    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,"to_h", env_to_hash, 0);
-    rb_define_singleton_method(envtbl,"assoc", env_assoc, 1);
-    rb_define_singleton_method(envtbl,"rassoc", env_rassoc, 1);
+    rb_define_singleton_method(envtbl, "[]", rb_f_getenv, 1);
+    rb_define_singleton_method(envtbl, "fetch", env_fetch, -1);
+    rb_define_singleton_method(envtbl, "[]=", env_aset_m, 2);
+    rb_define_singleton_method(envtbl, "store", env_aset_m, 2);
+    rb_define_singleton_method(envtbl, "each", env_each_pair, 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, "keep_if", env_keep_if, 0);
+    rb_define_singleton_method(envtbl, "slice", env_slice, -1);
+    rb_define_singleton_method(envtbl, "except", env_except, -1);
+    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);
+    rb_define_singleton_method(envtbl, "select!", env_select_bang, 0);
+    rb_define_singleton_method(envtbl, "filter", env_select, 0);
+    rb_define_singleton_method(envtbl, "filter!", env_select_bang, 0);
+    rb_define_singleton_method(envtbl, "shift", env_shift, 0);
+    rb_define_singleton_method(envtbl, "freeze", env_freeze, 0);
+    rb_define_singleton_method(envtbl, "invert", env_invert, 0);
+    rb_define_singleton_method(envtbl, "replace", env_replace, 1);
+    rb_define_singleton_method(envtbl, "update", env_update, 1);
+    rb_define_singleton_method(envtbl, "merge!", env_update, 1);
+    rb_define_singleton_method(envtbl, "inspect", env_inspect, 0);
+    rb_define_singleton_method(envtbl, "rehash", env_none, 0);
+    rb_define_singleton_method(envtbl, "to_a", env_to_a, 0);
+    rb_define_singleton_method(envtbl, "to_s", env_to_s, 0);
+    rb_define_singleton_method(envtbl, "key", env_key, 1);
+    rb_define_singleton_method(envtbl, "size", env_size, 0);
+    rb_define_singleton_method(envtbl, "length", env_size, 0);
+    rb_define_singleton_method(envtbl, "empty?", env_empty_p, 0);
+    rb_define_singleton_method(envtbl, "keys", env_f_keys, 0);
+    rb_define_singleton_method(envtbl, "values", env_f_values, 0);
+    rb_define_singleton_method(envtbl, "values_at", env_values_at, -1);
+    rb_define_singleton_method(envtbl, "include?", env_has_key, 1);
+    rb_define_singleton_method(envtbl, "member?", env_has_key, 1);
+    rb_define_singleton_method(envtbl, "has_key?", env_has_key, 1);
+    rb_define_singleton_method(envtbl, "has_value?", env_has_value, 1);
+    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_f_to_hash, 0);
+    rb_define_singleton_method(envtbl, "to_h", env_to_h, 0);
+    rb_define_singleton_method(envtbl, "assoc", env_assoc, 1);
+    rb_define_singleton_method(envtbl, "rassoc", env_rassoc, 1);
 
     /*
      * ENV is a Hash-like accessor for environment variables.
@@ -4402,4 +7103,6 @@ Init_Hash(void)
 
     /* for callcc */
     ruby_register_rollback_func_for_ensure(hash_foreach_ensure, hash_foreach_ensure_rollback);
+
+    HASH_ASSERT(sizeof(ar_hint_t) * RHASH_AR_TABLE_MAX_SIZE == sizeof(VALUE));
 }
diff --git a/hrtime.h b/hrtime.h
new file mode 100644
index 0000000000..f133bdb1ac
--- /dev/null
+++ b/hrtime.h
@@ -0,0 +1,168 @@
+#ifndef RB_HRTIME_H
+#define RB_HRTIME_H
+#include "ruby/ruby.h"
+#include <time.h>
+#if defined(HAVE_SYS_TIME_H)
+#  include <sys/time.h>
+#endif
+
+/*
+ * Hi-res monotonic clock.  It is currently nsec resolution, which has over
+ * 500 years of range (with an unsigned 64-bit integer).  Developers
+ * targeting small systems may try 32-bit and low-resolution (milliseconds).
+ *
+ * TBD: Is nsec even necessary? usec resolution seems enough for userspace
+ * and it'll be suitable for use with devices lasting over 500,000 years
+ * (maybe some devices designed for long-term space travel)
+ *
+ * Current API:
+ *
+ *	* rb_hrtime_now      - current clock value (monotonic if available)
+ *	* rb_hrtime_mul      - multiply with overflow check
+ *	* rb_hrtime_add      - add with overflow check
+ *	* rb_timeval2hrtime  - convert from timeval
+ *	* rb_timespec2hrtime - convert from timespec
+ *	* rb_msec2hrtime     - convert from millisecond
+ *	* rb_sec2hrtime      - convert from time_t (seconds)
+ *	* rb_hrtime2timeval  - convert to timeval
+ *	* rb_hrtime2timespec - convert to timespec
+ *
+ * Note: no conversion to milliseconds is provided here because different
+ * functions have different limits (e.g. epoll_wait vs w32_wait_events).
+ * So we provide RB_HRTIME_PER_MSEC and similar macros for implementing
+ * this for each use case.
+ */
+#define RB_HRTIME_PER_USEC ((rb_hrtime_t)1000)
+#define RB_HRTIME_PER_MSEC (RB_HRTIME_PER_USEC * (rb_hrtime_t)1000)
+#define RB_HRTIME_PER_SEC  (RB_HRTIME_PER_MSEC * (rb_hrtime_t)1000)
+#define RB_HRTIME_MAX      UINT64_MAX
+
+/*
+ * Lets try to support time travelers.  Lets assume anybody with a time machine
+ * also has access to a modern gcc or clang with 128-bit int support
+ */
+#ifdef MY_RUBY_BUILD_MAY_TIME_TRAVEL
+typedef int128_t rb_hrtime_t;
+#else
+typedef uint64_t rb_hrtime_t;
+#endif
+
+/* thread.c */
+/* returns the value of the monotonic clock (if available) */
+rb_hrtime_t rb_hrtime_now(void);
+
+/*
+ * multiply @a and @b with overflow check and return the
+ * (clamped to RB_HRTIME_MAX) result.
+ */
+static inline rb_hrtime_t
+rb_hrtime_mul(rb_hrtime_t a, rb_hrtime_t b)
+{
+    rb_hrtime_t c;
+
+#ifdef HAVE_BUILTIN___BUILTIN_MUL_OVERFLOW
+    if (__builtin_mul_overflow(a, b, &c))
+        return RB_HRTIME_MAX;
+#else
+    if (b != 0 && a > RB_HRTIME_MAX / b) /* overflow */
+        return RB_HRTIME_MAX;
+    c = a * b;
+#endif
+    return c;
+}
+
+/*
+ * add @a and @b with overflow check and return the
+ * (clamped to RB_HRTIME_MAX) result.
+ */
+static inline rb_hrtime_t
+rb_hrtime_add(rb_hrtime_t a, rb_hrtime_t b)
+{
+    rb_hrtime_t c;
+
+#ifdef HAVE_BUILTIN___BUILTIN_ADD_OVERFLOW
+    if (__builtin_add_overflow(a, b, &c))
+        return RB_HRTIME_MAX;
+#else
+    c = a + b;
+    if (c < a) /* overflow */
+        return RB_HRTIME_MAX;
+#endif
+    return c;
+}
+
+/*
+ * convert a timeval struct to rb_hrtime_t, clamping at RB_HRTIME_MAX
+ */
+static inline rb_hrtime_t
+rb_timeval2hrtime(const struct timeval *tv)
+{
+    rb_hrtime_t s = rb_hrtime_mul((rb_hrtime_t)tv->tv_sec, RB_HRTIME_PER_SEC);
+    rb_hrtime_t u = rb_hrtime_mul((rb_hrtime_t)tv->tv_usec, RB_HRTIME_PER_USEC);
+
+    return rb_hrtime_add(s, u);
+}
+
+/*
+ * convert a timespec struct to rb_hrtime_t, clamping at RB_HRTIME_MAX
+ */
+static inline rb_hrtime_t
+rb_timespec2hrtime(const struct timespec *ts)
+{
+    rb_hrtime_t s = rb_hrtime_mul((rb_hrtime_t)ts->tv_sec, RB_HRTIME_PER_SEC);
+
+    return rb_hrtime_add(s, (rb_hrtime_t)ts->tv_nsec);
+}
+
+/*
+ * convert a millisecond value to rb_hrtime_t, clamping at RB_HRTIME_MAX
+ */
+static inline rb_hrtime_t
+rb_msec2hrtime(unsigned long msec)
+{
+    return rb_hrtime_mul((rb_hrtime_t)msec, RB_HRTIME_PER_MSEC);
+}
+
+/*
+ * convert a time_t value to rb_hrtime_t, clamping at RB_HRTIME_MAX
+ * Negative values will be clamped at 0.
+ */
+static inline rb_hrtime_t
+rb_sec2hrtime(time_t sec)
+{
+    if (sec <= 0) return 0;
+
+    return rb_hrtime_mul((rb_hrtime_t)sec, RB_HRTIME_PER_SEC);
+}
+
+/*
+ * convert a rb_hrtime_t value to a timespec, suitable for calling
+ * functions like ppoll(2) or kevent(2)
+ */
+static inline struct timespec *
+rb_hrtime2timespec(struct timespec *ts, const rb_hrtime_t *hrt)
+{
+    if (hrt) {
+        ts->tv_sec = (time_t)(*hrt / RB_HRTIME_PER_SEC);
+        ts->tv_nsec = (int32_t)(*hrt % RB_HRTIME_PER_SEC);
+        return ts;
+    }
+    return 0;
+}
+
+/*
+ * convert a rb_hrtime_t value to a timeval, suitable for calling
+ * functions like select(2)
+ */
+static inline struct timeval *
+rb_hrtime2timeval(struct timeval *tv, const rb_hrtime_t *hrt)
+{
+    if (hrt) {
+        tv->tv_sec = (time_t)(*hrt / RB_HRTIME_PER_SEC);
+        tv->tv_usec = (int32_t)((*hrt % RB_HRTIME_PER_SEC)/RB_HRTIME_PER_USEC);
+
+        return tv;
+    }
+    return 0;
+}
+#endif /* RB_HRTIME_H */
diff --git a/ia64.s b/ia64.s
deleted file mode 100644
index 1087105585..0000000000
--- a/ia64.s
+++ /dev/null
@@ -1,42 +0,0 @@
-// rb_ia64_flushrs and rb_ia64_bsp is written in IA64 assembly language
-// because Intel Compiler for IA64 doesn't support inline assembly.
-//
-// This file is based on following C program compiled by gcc.
-//
-//   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
-	.global rb_ia64_flushrs#
-	.proc rb_ia64_flushrs#
-rb_ia64_flushrs:
-	.prologue
-	.body
-	flushrs
-	;;
-	nop.i 0
-	br.ret.sptk.many b0
-	.endp rb_ia64_flushrs#
-	.align 16
-	.global rb_ia64_bsp#
-	.proc rb_ia64_bsp#
-rb_ia64_bsp:
-	.prologue
-	.body
-	nop.m 0
-	;;
-	mov r8 = ar.bsp
-	br.ret.sptk.many b0
-	.endp rb_ia64_bsp#
-	.ident	"GCC: (GNU) 3.3.5 (Debian 1:3.3.5-13)"
diff --git a/id_table.c b/id_table.c
index b8111aa86c..840ab46ee3 100644
--- a/id_table.c
+++ b/id_table.c
@@ -7,209 +7,13 @@
 #endif
 
 #if ID_TABLE_DEBUG == 0
+#undef NDEBUG
 #define NDEBUG
 #endif
 #include "ruby_assert.h"
 
-/*
- * st
- *    0: using st with debug information.
- *    1: using st.
- * array
- *   11: simple array. ids = [ID1, ID2, ...], values = [val1, val2, ...]
- *   12: simple array, and use rb_id_serial_t instead of ID.
- *   13: simple array, and use rb_id_serial_t instead of ID. Swap recent access.
- *   14: sorted array, and use rb_id_serial_t instead of ID.
- *   15: sorted array, and use rb_id_serial_t instead of ID, linear small part.
- * hash
- *   21: funny falcon's Coalesced Hashing implementation [Feature #6962]
- *   22: simple open addressing with quadratic probing.
- * mix (array + hash)
- *   31: array(12) (capa <= 32) + hash(22)
- *   32: array(14) (capa <= 32) + hash(22)
- *   33: array(12) (capa <= 64) + hash(22)
- *   34: array(14) (capa <= 64) + hash(22)
- *   34: array(15) (capa <= 64) + hash(22)
- */
-
-#ifndef ID_TABLE_IMPL
-#define ID_TABLE_IMPL 34
-#endif
-
-#if ID_TABLE_IMPL == 0
-#define ID_TABLE_NAME st
-#define ID_TABLE_IMPL_TYPE struct st_id_table
-
-#define ID_TABLE_USE_ST 1
-#define ID_TABLE_USE_ST_DEBUG 1
-
-#elif ID_TABLE_IMPL == 1
-#define ID_TABLE_NAME st
-#define ID_TABLE_IMPL_TYPE struct st_id_table
-
-#define ID_TABLE_USE_ST 1
-#define ID_TABLE_USE_ST_DEBUG 0
-
-#elif ID_TABLE_IMPL == 11
-#define ID_TABLE_NAME list
-#define ID_TABLE_IMPL_TYPE struct list_id_table
-
-#define ID_TABLE_USE_LIST 1
-#define ID_TABLE_USE_CALC_VALUES 1
-
-#elif ID_TABLE_IMPL == 12
-#define ID_TABLE_NAME list
-#define ID_TABLE_IMPL_TYPE struct list_id_table
-
-#define ID_TABLE_USE_LIST 1
-#define ID_TABLE_USE_CALC_VALUES 1
-#define ID_TABLE_USE_ID_SERIAL 1
-
-#elif ID_TABLE_IMPL == 13
-#define ID_TABLE_NAME list
-#define ID_TABLE_IMPL_TYPE struct list_id_table
-
-#define ID_TABLE_USE_LIST 1
-#define ID_TABLE_USE_CALC_VALUES 1
-#define ID_TABLE_USE_ID_SERIAL 1
-#define ID_TABLE_SWAP_RECENT_ACCESS 1
-
-#elif ID_TABLE_IMPL == 14
-#define ID_TABLE_NAME list
-#define ID_TABLE_IMPL_TYPE struct list_id_table
-
-#define ID_TABLE_USE_LIST 1
-#define ID_TABLE_USE_CALC_VALUES 1
-#define ID_TABLE_USE_ID_SERIAL 1
-#define ID_TABLE_USE_LIST_SORTED 1
-
-#elif ID_TABLE_IMPL == 15
-#define ID_TABLE_NAME list
-#define ID_TABLE_IMPL_TYPE struct list_id_table
-
-#define ID_TABLE_USE_LIST 1
-#define ID_TABLE_USE_CALC_VALUES 1
-#define ID_TABLE_USE_ID_SERIAL 1
-#define ID_TABLE_USE_LIST_SORTED 1
-#define ID_TABLE_USE_LIST_SORTED_LINEAR_SMALL_RANGE 1
-
-#elif ID_TABLE_IMPL == 21
-#define ID_TABLE_NAME hash
-#define ID_TABLE_IMPL_TYPE sa_table
-
-#define ID_TABLE_USE_COALESCED_HASHING 1
-#define ID_TABLE_USE_ID_SERIAL 1
-
-#elif ID_TABLE_IMPL == 22
-#define ID_TABLE_NAME hash
-#define ID_TABLE_IMPL_TYPE struct hash_id_table
-
-#define ID_TABLE_USE_SMALL_HASH 1
-#define ID_TABLE_USE_ID_SERIAL 1
-
-#elif ID_TABLE_IMPL == 31
-#define ID_TABLE_NAME mix
-#define ID_TABLE_IMPL_TYPE struct mix_id_table
-
-#define ID_TABLE_USE_MIX 1
-#define ID_TABLE_USE_MIX_LIST_MAX_CAPA 32
-
-#define ID_TABLE_USE_ID_SERIAL 1
-
-#define ID_TABLE_USE_LIST 1
-#define ID_TABLE_USE_CALC_VALUES 1
-#define ID_TABLE_USE_SMALL_HASH 1
-
-#elif ID_TABLE_IMPL == 32
-#define ID_TABLE_NAME mix
-#define ID_TABLE_IMPL_TYPE struct mix_id_table
-
-#define ID_TABLE_USE_MIX 1
-#define ID_TABLE_USE_MIX_LIST_MAX_CAPA 32
-
-#define ID_TABLE_USE_ID_SERIAL 1
-
-#define ID_TABLE_USE_LIST 1
-#define ID_TABLE_USE_CALC_VALUES 1
-#define ID_TABLE_USE_LIST_SORTED 1
-
-#define ID_TABLE_USE_SMALL_HASH 1
-
-#elif ID_TABLE_IMPL == 33
-#define ID_TABLE_NAME mix
-#define ID_TABLE_IMPL_TYPE struct mix_id_table
-
-#define ID_TABLE_USE_MIX 1
-#define ID_TABLE_USE_MIX_LIST_MAX_CAPA 64
-
-#define ID_TABLE_USE_ID_SERIAL 1
-
-#define ID_TABLE_USE_LIST 1
-#define ID_TABLE_USE_CALC_VALUES 1
-#define ID_TABLE_USE_SMALL_HASH 1
-
-#elif ID_TABLE_IMPL == 34
-#define ID_TABLE_NAME mix
-#define ID_TABLE_IMPL_TYPE struct mix_id_table
-
-#define ID_TABLE_USE_MIX 1
-#define ID_TABLE_USE_MIX_LIST_MAX_CAPA 64
-
-#define ID_TABLE_USE_ID_SERIAL 1
-
-#define ID_TABLE_USE_LIST 1
-#define ID_TABLE_USE_CALC_VALUES 1
-#define ID_TABLE_USE_LIST_SORTED 1
-
-#define ID_TABLE_USE_SMALL_HASH 1
-
-#elif ID_TABLE_IMPL == 35
-#define ID_TABLE_NAME mix
-#define ID_TABLE_IMPL_TYPE struct mix_id_table
-
-#define ID_TABLE_USE_MIX 1
-#define ID_TABLE_USE_MIX_LIST_MAX_CAPA 64
-
-#define ID_TABLE_USE_ID_SERIAL 1
-
-#define ID_TABLE_USE_LIST 1
-#define ID_TABLE_USE_CALC_VALUES 1
-#define ID_TABLE_USE_LIST_SORTED 1
-#define ID_TABLE_USE_LIST_SORTED_LINEAR_SMALL_RANGE 1
-
-#define ID_TABLE_USE_SMALL_HASH 1
-
-#else
-#error
-#endif
-
-#if ID_TABLE_SWAP_RECENT_ACCESS && ID_TABLE_USE_LIST_SORTED
-#error
-#endif
-
-/* IMPL(create) will be "hash_id_table_create" and so on */
-#define IMPL1(name, op) TOKEN_PASTE(name, _id##op) /* expand `name' */
-#define IMPL(op)        IMPL1(ID_TABLE_NAME, _table##op) /* but prevent `op' */
-
-#ifdef __GNUC__
-# define UNUSED(func) static func __attribute__((unused))
-#else
-# define UNUSED(func) static func
-#endif
-
-UNUSED(ID_TABLE_IMPL_TYPE *IMPL(_create)(size_t));
-UNUSED(void IMPL(_free)(ID_TABLE_IMPL_TYPE *));
-UNUSED(void IMPL(_clear)(ID_TABLE_IMPL_TYPE *));
-UNUSED(size_t IMPL(_size)(const ID_TABLE_IMPL_TYPE *));
-UNUSED(size_t IMPL(_memsize)(const ID_TABLE_IMPL_TYPE *));
-UNUSED(int IMPL(_insert)(ID_TABLE_IMPL_TYPE *, ID, VALUE));
-UNUSED(int IMPL(_lookup)(ID_TABLE_IMPL_TYPE *, ID, VALUE *));
-UNUSED(int IMPL(_delete)(ID_TABLE_IMPL_TYPE *, ID));
-UNUSED(void IMPL(_foreach)(ID_TABLE_IMPL_TYPE *, rb_id_table_foreach_func_t *, void *));
-UNUSED(void IMPL(_foreach_values)(ID_TABLE_IMPL_TYPE *, rb_id_table_foreach_values_func_t *, void *));
-
-#if ID_TABLE_USE_ID_SERIAL
 typedef rb_id_serial_t id_key_t;
+
 static inline ID
 key2id(id_key_t key)
 {
@@ -221,931 +25,7 @@ id2key(ID id)
 {
     return rb_id_to_serial(id);
 }
-#else /* ID_TABLE_USE_ID_SERIAL */
-
-typedef ID id_key_t;
-#define key2id(key) key
-#define id2key(id)  id
-
-#endif /* ID_TABLE_USE_ID_SERIAL */
-
-/***************************************************************
- * 0: using st with debug information.
- * 1: using st.
- ***************************************************************/
-#if ID_TABLE_USE_ST
-#if ID_TABLE_USE_ST_DEBUG
-#define ID_TABLE_MARK 0x12345678
-
-struct st_id_table {
-    struct st_table *st;
-    unsigned int check;
-};
-
-static struct st_table *
-tbl2st(struct st_id_table *tbl)
-{
-    if (tbl->check != ID_TABLE_MARK) rb_bug("tbl2st: check error %x", tbl->check);
-    return tbl->st;
-}
-
-static struct st_id_table *
-st_id_table_create(size_t size)
-{
-    struct st_id_table *tbl = ALLOC(struct st_id_table);
-    tbl->st = st_init_numtable_with_size(size);
-    tbl->check = ID_TABLE_MARK;
-    return tbl;
-}
-
-static void
-st_id_table_free(struct st_id_table *tbl)
-{
-    st_free_table(tbl->st);
-    xfree(tbl);
-}
-
-#else /* ID_TABLE_USE_ST_DEBUG */
-
-struct st_id_table {
-    struct st_table st;
-};
-
-static struct st_table *
-tbl2st(struct st_id_table *tbl)
-{
-    return (struct st_table *)tbl;
-}
-
-static struct st_id_table *
-st_id_table_create(size_t size)
-{
-    return (struct st_id_table *)st_init_numtable_with_size(size);
-}
-
-static void
-st_id_table_free(struct st_id_table *tbl)
-{
-    st_free_table((struct st_table*)tbl);
-}
-
-#endif /* ID_TABLE_USE_ST_DEBUG */
-
-static void
-st_id_table_clear(struct st_id_table *tbl)
-{
-    st_clear(tbl2st(tbl));
-}
-
-static size_t
-st_id_table_size(const struct st_id_table *tbl)
-{
-    return tbl2st(tbl)->num_entries;
-}
-
-static size_t
-st_id_table_memsize(const struct st_id_table *tbl)
-{
-    size_t header_size = ID_TABLE_USE_ST_DEBUG ? sizeof(struct st_id_table) : 0;
-    return header_size + st_memsize(tbl2st(tbl));
-}
-
-static int
-st_id_table_lookup(struct st_id_table *tbl, ID id, VALUE *val)
-{
-    return st_lookup(tbl2st(tbl), (st_data_t)id, (st_data_t *)val);
-}
-
-static int
-st_id_table_insert(struct st_id_table *tbl, ID id, VALUE val)
-{
-    return st_insert(tbl2st(tbl), id, val);
-}
-
-static int
-st_id_table_delete(struct st_id_table *tbl, ID id)
-{
-    return st_delete(tbl2st(tbl), (st_data_t *)&id, NULL);
-}
-
-static void
-st_id_table_foreach(struct st_id_table *tbl, rb_id_table_foreach_func_t *func, void *data)
-{
-    st_foreach(tbl2st(tbl), (int (*)(ANYARGS))func, (st_data_t)data);
-}
-
-struct values_iter_data {
-    rb_id_table_foreach_values_func_t *values_i;
-    void *data;
-};
-
-static int
-each_values(st_data_t key, st_data_t val, st_data_t ptr)
-{
-    struct values_iter_data *values_iter_data = (struct values_iter_data *)ptr;
-    return values_iter_data->values_i(val, values_iter_data->data);
-}
-
-static void
-st_id_table_foreach_values(struct st_id_table *tbl, rb_id_table_foreach_values_func_t *func, void *data)
-{
-    struct values_iter_data values_iter_data;
-    values_iter_data.values_i = func;
-    values_iter_data.data = data;
-    st_foreach(tbl2st(tbl), each_values, (st_data_t)&values_iter_data);
-}
-#endif /* ID_TABLE_USE_ST */
-
-#if ID_TABLE_USE_LIST
-
-#define LIST_MIN_CAPA 4
-
-struct list_id_table {
-    int capa;
-    int num;
-    id_key_t *keys;
-#if ID_TABLE_USE_CALC_VALUES == 0
-    VALUE *values_;
-#endif
-};
-
-#if ID_TABLE_USE_CALC_VALUES
-#define TABLE_VALUES(tbl) ((VALUE *)((tbl)->keys + (tbl)->capa))
-#else
-#define TABLE_VALUES(tbl) (tbl)->values_
-#endif
-
-static struct list_id_table *
-list_id_table_init(struct list_id_table *tbl, size_t capa)
-{
-    if (capa > 0) {
-#if ID_TABLE_USE_CALC_VALUES && \
-    (UNALIGNED_WORD_ACCESS == 0) && (SIZEOF_VALUE == 8)
-	/* Workaround for 8-byte word alignment on 64-bit SPARC.
-	 * This code assumes that sizeof(ID) == 4, sizeof(VALUE) == 8, and
-	 *  xmalloc() returns 8-byte aligned memory block.
-	 */
-	if (capa & (size_t)1) capa += 1;
-#endif
-	tbl->capa = (int)capa;
-#if ID_TABLE_USE_CALC_VALUES
-	tbl->keys = (id_key_t *)xmalloc(sizeof(id_key_t) * capa + sizeof(VALUE) * capa);
-#else
-	tbl->keys = ALLOC_N(id_key_t, capa);
-	tbl->values_ = ALLOC_N(VALUE, capa);
-#endif
-    }
-    return tbl;
-}
-
-#ifndef ID_TABLE_USE_MIX
-static struct list_id_table *
-list_id_table_create(size_t capa)
-{
-    struct list_id_table *tbl = ZALLOC(struct list_id_table);
-    return list_id_table_init(tbl, capa);
-}
-#endif
-
-static void
-list_id_table_free(struct list_id_table *tbl)
-{
-    xfree(tbl->keys);
-#if ID_TABLE_USE_CALC_VALUES == 0
-    xfree(tbl->values_);
-#endif
-    xfree(tbl);
-}
-
-static void
-list_id_table_clear(struct list_id_table *tbl)
-{
-    tbl->num = 0;
-}
-
-static size_t
-list_id_table_size(const struct list_id_table *tbl)
-{
-    return (size_t)tbl->num;
-}
-
-static size_t
-list_id_table_memsize(const struct list_id_table *tbl)
-{
-    return (sizeof(id_key_t) + sizeof(VALUE)) * tbl->capa + sizeof(struct list_id_table);
-}
-
-static void
-list_table_extend(struct list_id_table *tbl)
-{
-    if (tbl->capa == tbl->num) {
-	const int capa = tbl->capa == 0 ? LIST_MIN_CAPA : (tbl->capa * 2);
-
-#if ID_TABLE_USE_CALC_VALUES
-	{
-	    VALUE *old_values, *new_values;
-	    VALUE *debug_values = NULL;
-	    const int num = tbl->num;
-	    const int size = sizeof(id_key_t) * capa + sizeof(VALUE) * capa;
-	    int i;
-
-	    if (num > 0) {
-		VALUE *orig_values = (VALUE *)(tbl->keys + num);
-		debug_values = ALLOC_N(VALUE, num);
-
-		for (i=0; i<num; i++) {
-		    debug_values[i] = orig_values[i];
-		}
-
-		if (0)
-		    for (i=0; i< 2 * num; i++) {
-			unsigned char *cs = (unsigned char *)&tbl->keys[i];
-			size_t j;
-			fprintf(stderr, ">> %3d | %p - ", i, cs);
-			for (j=0; j<sizeof(VALUE); j++) {
-			    fprintf(stderr, "%x ", cs[j]);
-			}
-			fprintf(stderr, "\n");
-		    }
-	    }
-
-	    tbl->keys = (id_key_t *)xrealloc(tbl->keys, size);
-	    old_values = (VALUE *)(tbl->keys + num);
-	    new_values = (VALUE *)(tbl->keys + capa);
-
-	    /*  [ keys (num) ] [ values (num) ]
-	     *                 ^ old_values
-	     * realloc =>
-	     *  [ keys (capa = num * 2)  ] [ values (capa = num * 2) ]
-	     *                             ^ new_values
-	     */
-
-	    /* memmove */
-	    if (0) {
-		fprintf(stderr, "memmove: %p -> %p (%d, capa: %d)\n",
-			old_values, new_values, num, capa);
-	    }
-	    assert(num < capa);
-	    assert(num == 0 || old_values < new_values);
-
-	    for (i=num-1; i>=0; i--) {
-		new_values[i] = old_values[i];
-	    }
-
-	    if (num > 0) {
-		for (i=0; i<num; i++) {
-		    assert(debug_values[i] == new_values[i]);
-		}
-		xfree(debug_values);
-	    }
-	}
-
-	tbl->capa = capa;
-#else
-	tbl->capa = capa;
-	tbl->keys = (id_key_t *)xrealloc(tbl->keys, sizeof(id_key_t) * capa);
-	tbl->values_ = (VALUE *)xrealloc(tbl->values_, sizeof(VALUE) * capa);
-#endif
-    }
-}
-
-#if ID_TABLE_DEBUG
-static void
-list_table_show(struct list_id_table *tbl)
-{
-    const id_key_t *keys = tbl->keys;
-    const int num = tbl->num;
-    int i;
-
-    fprintf(stderr, "tbl: %p (num: %d)\n", tbl, num);
-    for (i=0; i<num; i++) {
-	fprintf(stderr, " -> [%d] %s %d\n", i, rb_id2name(key2id(keys[i])), (int)keys[i]);
-    }
-}
-#endif
-
-static void
-tbl_assert(struct list_id_table *tbl)
-{
-#if ID_TABLE_DEBUG
-#if ID_TABLE_USE_LIST_SORTED
-    const id_key_t *keys = tbl->keys;
-    const int num = tbl->num;
-    int i;
-
-    for (i=0; i<num-1; i++) {
-	if (keys[i] >= keys[i+1]) {
-	    list_table_show(tbl);
-	    rb_bug(": not sorted.");
-	}
-    }
-#endif
-#endif
-}
-
-#if ID_TABLE_USE_LIST_SORTED
-static int
-list_ids_bsearch(const id_key_t *keys, id_key_t key, int num)
-{
-    int p, min = 0, max = num;
-
-#if ID_TABLE_USE_LIST_SORTED_LINEAR_SMALL_RANGE
-    if (num <= 64) {
-	if (num  > 32) {
-	    if (keys[num/2] <= key) {
-		min = num/2;
-	    } else {
-		max = num/2;
-	    }
-	}
-	for (p = min; p<num && keys[p] < key; p++) {
-	    assert(keys[p] != 0);
-	}
-	return (p<num && keys[p] == key) ? p : -p-1;
-    }
-#endif /* ID_TABLE_USE_LIST_SORTED_LINEAR_SMALL_RANGE */
-
-    while (1) {
-	p = min + (max - min) / 2;
-
-	if (min >= max) {
-	    break;
-	}
-	else {
-	    id_key_t kp = keys[p];
-	    assert(p < max);
-	    assert(p >= min);
-
-	    if      (kp > key) max = p;
-	    else if (kp < key) min = p+1;
-	    else {
-		assert(kp == key);
-		assert(p >= 0);
-		assert(p < num);
-		return p;
-	    }
-	}
-    }
-
-    assert(min == max);
-    assert(min == p);
-    return -p-1;
-}
-#endif /* ID_TABLE_USE_LIST_SORTED */
-
-static int
-list_table_index(struct list_id_table *tbl, id_key_t key)
-{
-    const int num = tbl->num;
-    const id_key_t *keys = tbl->keys;
 
-#if ID_TABLE_USE_LIST_SORTED
-    return list_ids_bsearch(keys, key, num);
-#else /* ID_TABLE_USE_LIST_SORTED */
-    int i;
-
-    for (i=0; i<num; i++) {
-	assert(keys[i] != 0);
-
-	if (keys[i] == key) {
-	    return (int)i;
-	}
-    }
-    return -1;
-#endif
-}
-
-static int
-list_id_table_lookup(struct list_id_table *tbl, ID id, VALUE *valp)
-{
-    id_key_t key = id2key(id);
-    int index = list_table_index(tbl, key);
-
-    if (index >= 0) {
-	*valp = TABLE_VALUES(tbl)[index];
-
-#if ID_TABLE_SWAP_RECENT_ACCESS
-	if (index > 0) {
-	    VALUE *values = TABLE_VALUES(tbl);
-	    id_key_t tk = tbl->keys[index-1];
-	    VALUE tv = values[index-1];
-	    tbl->keys[index-1] = tbl->keys[index];
-	    tbl->keys[index] = tk;
-	    values[index-1] = values[index];
-	    values[index] = tv;
-	}
-#endif /* ID_TABLE_SWAP_RECENT_ACCESS */
-	return TRUE;
-    }
-    else {
-	return FALSE;
-    }
-}
-
-static int
-list_id_table_insert(struct list_id_table *tbl, ID id, VALUE val)
-{
-    const id_key_t key = id2key(id);
-    const int index = list_table_index(tbl, key);
-
-    if (index >= 0) {
-	TABLE_VALUES(tbl)[index] = val;
-    }
-    else {
-	list_table_extend(tbl);
-	{
-	    const int num = tbl->num++;
-#if ID_TABLE_USE_LIST_SORTED
-	    const int insert_index = -(index + 1);
-	    id_key_t *keys = tbl->keys;
-	    VALUE *values = TABLE_VALUES(tbl);
-	    int i;
-
-	    if (0) fprintf(stderr, "insert: %d into %d on\n", (int)key, insert_index);
-
-	    for (i=num; i>insert_index; i--) {
-		keys[i] = keys[i-1];
-		values[i] = values[i-1];
-	    }
-	    keys[i] = key;
-	    values[i] = val;
-
-	    tbl_assert(tbl);
-#else
-	    tbl->keys[num] = key;
-	    TABLE_VALUES(tbl)[num] = val;
-#endif
-	}
-    }
-
-    return TRUE;
-}
-
-static int
-list_delete_index(struct list_id_table *tbl, id_key_t key, int index)
-{
-    if (index >= 0) {
-	VALUE *values = TABLE_VALUES(tbl);
-
-#if ID_TABLE_USE_LIST_SORTED
-	int i;
-	const int num = tbl->num;
-	id_key_t *keys = tbl->keys;
-
-	for (i=index+1; i<num; i++) { /* compaction */
-	    keys[i-1] = keys[i];
-	    values[i-1] = values[i];
-	}
-#else
-	tbl->keys[index] = tbl->keys[tbl->num-1];
-	values[index] = values[tbl->num-1];
-#endif
-	tbl->num--;
-	tbl_assert(tbl);
-
-	return TRUE;
-    }
-    else {
-	return FALSE;
-    }
-}
-
-static int
-list_id_table_delete(struct list_id_table *tbl, ID id)
-{
-    const id_key_t key = id2key(id);
-    int index = list_table_index(tbl, key);
-    return list_delete_index(tbl, key, index);
-}
-
-#define FOREACH_LAST() do {   \
-    switch (ret) {            \
-      case ID_TABLE_CONTINUE: \
-      case ID_TABLE_STOP:     \
-	break;                \
-      case ID_TABLE_DELETE:   \
-	list_delete_index(tbl, key, i); \
-	values = TABLE_VALUES(tbl);     \
-	num = tbl->num;                 \
-	i--; /* redo same index */      \
-	break; \
-    } \
-} while (0)
-
-static void
-list_id_table_foreach(struct list_id_table *tbl, rb_id_table_foreach_func_t *func, void *data)
-{
-    int num = tbl->num;
-    int i;
-    const id_key_t *keys = tbl->keys;
-    const VALUE *values = TABLE_VALUES(tbl);
-
-    for (i=0; i<num; i++) {
-	const id_key_t key = keys[i];
-	enum rb_id_table_iterator_result ret = (*func)(key2id(key), values[i], data);
-	assert(key != 0);
-
-	FOREACH_LAST();
-	if (ret == ID_TABLE_STOP) return;
-    }
-}
-
-static void
-list_id_table_foreach_values(struct list_id_table *tbl, rb_id_table_foreach_values_func_t *func, void *data)
-{
-    int num = tbl->num;
-    int i;
-    const id_key_t *keys = tbl->keys;
-    VALUE *values = TABLE_VALUES(tbl);
-
-    for (i=0; i<num; i++) {
-	const id_key_t key = keys[i];
-	enum rb_id_table_iterator_result ret = (*func)(values[i], data);
-	assert(key != 0);
-
-	FOREACH_LAST();
-	if (ret == ID_TABLE_STOP) return;
-    }
-}
-#endif /* ID_TABLE_USE_LIST */
-
-
-#if ID_TABLE_USE_COALESCED_HASHING
-/* implementation is based on
- * https://bugs.ruby-lang.org/issues/6962 by funny_falcon
- */
-
-typedef unsigned int sa_index_t;
-
-#define SA_EMPTY    0
-#define SA_LAST     1
-#define SA_OFFSET   2
-#define SA_MIN_SIZE 4
-
-typedef struct sa_entry {
-    sa_index_t next;
-    id_key_t key;
-    VALUE value;
-} sa_entry;
-
-typedef struct {
-    sa_index_t num_bins;
-    sa_index_t num_entries;
-    sa_index_t free_pos;
-    sa_entry *entries;
-} sa_table;
-
-static void
-sa_init_table(register sa_table *table, sa_index_t num_bins)
-{
-    if (num_bins) {
-        table->num_entries = 0;
-        table->entries = ZALLOC_N(sa_entry, num_bins);
-        table->num_bins = num_bins;
-        table->free_pos = num_bins;
-    }
-}
-
-static sa_table*
-hash_id_table_create(size_t size)
-{
-    sa_table* table = ZALLOC(sa_table);
-    sa_init_table(table, (sa_index_t)size);
-    return table;
-}
-
-static void
-hash_id_table_clear(sa_table *table)
-{
-    xfree(table->entries);
-    memset(table, 0, sizeof(sa_table));
-}
-
-static void
-hash_id_table_free(sa_table *table)
-{
-    xfree(table->entries);
-    xfree(table);
-}
-
-static size_t
-hash_id_table_memsize(const sa_table *table)
-{
-    return sizeof(sa_table) + table->num_bins * sizeof (sa_entry);
-}
-
-static inline sa_index_t
-calc_pos(register sa_table* table, id_key_t key)
-{
-    return key & (table->num_bins - 1);
-}
-
-static void
-fix_empty(register sa_table* table)
-{
-    while (--table->free_pos &&
-	   table->entries[table->free_pos-1].next != SA_EMPTY);
-}
-
-#define FLOOR_TO_4 ((~((sa_index_t)0)) << 2)
-static sa_index_t
-find_empty(register sa_table* table, register sa_index_t pos)
-{
-    sa_index_t new_pos = table->free_pos-1;
-    sa_entry *entry;
-    static const unsigned offsets[][3] = {
-	{1, 2, 3},
-	{2, 3, 0},
-	{3, 1, 0},
-	{2, 1, 0}
-    };
-    const unsigned *const check = offsets[pos&3];
-    pos &= FLOOR_TO_4;
-    entry = table->entries+pos;
-
-    if (entry[check[0]].next == SA_EMPTY) { new_pos = pos + check[0]; goto check; }
-    if (entry[check[1]].next == SA_EMPTY) { new_pos = pos + check[1]; goto check; }
-    if (entry[check[2]].next == SA_EMPTY) { new_pos = pos + check[2]; goto check; }
-
-  check:
-    if (new_pos+1 == table->free_pos) fix_empty(table);
-    return new_pos;
-}
-
-static void resize(register sa_table* table);
-static int insert_into_chain(register sa_table*, register id_key_t, st_data_t, sa_index_t pos);
-static int insert_into_main(register sa_table*, id_key_t, st_data_t, sa_index_t pos, sa_index_t prev_pos);
-
-static int
-sa_insert(register sa_table* table, id_key_t key, VALUE value)
-{
-    register sa_entry *entry;
-    sa_index_t pos, main_pos;
-
-    if (table->num_bins == 0) {
-        sa_init_table(table, SA_MIN_SIZE);
-    }
-
-    pos = calc_pos(table, key);
-    entry = table->entries + pos;
-
-    if (entry->next == SA_EMPTY) {
-        entry->next = SA_LAST;
-        entry->key = key;
-        entry->value = value;
-        table->num_entries++;
-        if (pos+1 == table->free_pos) fix_empty(table);
-        return 0;
-    }
-
-    if (entry->key == key) {
-        entry->value = value;
-        return 1;
-    }
-
-    if (table->num_entries + (table->num_entries >> 2) > table->num_bins) {
-        resize(table);
-	return sa_insert(table, key, value);
-    }
-
-    main_pos = calc_pos(table, entry->key);
-    if (main_pos == pos) {
-        return insert_into_chain(table, key, value, pos);
-    }
-    else {
-        if (!table->free_pos) {
-            resize(table);
-            return sa_insert(table, key, value);
-        }
-        return insert_into_main(table, key, value, pos, main_pos);
-    }
-}
-
-static int
-hash_id_table_insert(register sa_table* table, ID id, VALUE value)
-{
-    return sa_insert(table, id2key(id), value);
-}
-
-static int
-insert_into_chain(register sa_table* table, id_key_t key, st_data_t value, sa_index_t pos)
-{
-    sa_entry *entry = table->entries + pos, *new_entry;
-    sa_index_t new_pos;
-
-    while (entry->next != SA_LAST) {
-        pos = entry->next - SA_OFFSET;
-        entry = table->entries + pos;
-        if (entry->key == key) {
-            entry->value = value;
-            return 1;
-        }
-    }
-
-    if (!table->free_pos) {
-        resize(table);
-        return sa_insert(table, key, value);
-    }
-
-    new_pos = find_empty(table, pos);
-    new_entry = table->entries + new_pos;
-    entry->next = new_pos + SA_OFFSET;
-
-    new_entry->next = SA_LAST;
-    new_entry->key = key;
-    new_entry->value = value;
-    table->num_entries++;
-    return 0;
-}
-
-static int
-insert_into_main(register sa_table* table, id_key_t key, st_data_t value, sa_index_t pos, sa_index_t prev_pos)
-{
-    sa_entry *entry = table->entries + pos;
-    sa_index_t new_pos = find_empty(table, pos);
-    sa_entry *new_entry = table->entries + new_pos;
-    sa_index_t npos;
-
-    *new_entry = *entry;
-
-    while((npos = table->entries[prev_pos].next - SA_OFFSET) != pos) {
-        prev_pos = npos;
-    }
-    table->entries[prev_pos].next = new_pos + SA_OFFSET;
-
-    entry->next = SA_LAST;
-    entry->key = key;
-    entry->value = value;
-    table->num_entries++;
-    return 0;
-}
-
-static sa_index_t
-new_size(sa_index_t num_entries)
-{
-    sa_index_t size = num_entries >> 3;
-    size |= size >> 1;
-    size |= size >> 2;
-    size |= size >> 4;
-    size |= size >> 8;
-    size |= size >> 16;
-    return (size + 1) << 3;
-}
-
-static void
-resize(register sa_table *table)
-{
-    sa_table tmp_table;
-    sa_entry *entry;
-    sa_index_t i;
-
-    if (table->num_entries == 0) {
-        xfree(table->entries);
-	memset(table, 0, sizeof(sa_table));
-        return;
-    }
-
-    sa_init_table(&tmp_table, new_size(table->num_entries + (table->num_entries >> 2)));
-    entry = table->entries;
-
-    for(i = 0; i < table->num_bins; i++, entry++) {
-        if (entry->next != SA_EMPTY) {
-            sa_insert(&tmp_table, entry->key, entry->value);
-        }
-    }
-    xfree(table->entries);
-    *table = tmp_table;
-}
-
-static int
-hash_id_table_lookup(register sa_table *table, ID id, VALUE *valuep)
-{
-    register sa_entry *entry;
-    id_key_t key = id2key(id);
-
-    if (table->num_entries == 0) return 0;
-
-    entry = table->entries + calc_pos(table, key);
-    if (entry->next == SA_EMPTY) return 0;
-
-    if (entry->key == key) goto found;
-    if (entry->next == SA_LAST) return 0;
-
-    entry = table->entries + (entry->next - SA_OFFSET);
-    if (entry->key == key) goto found;
-
-    while(entry->next != SA_LAST) {
-        entry = table->entries + (entry->next - SA_OFFSET);
-        if (entry->key == key) goto found;
-    }
-    return 0;
-  found:
-    if (valuep) *valuep = entry->value;
-    return 1;
-}
-
-static size_t
-hash_id_table_size(const sa_table *table)
-{
-    return table->num_entries;
-}
-
-static int
-hash_id_table_delete(sa_table *table, ID id)
-{
-    sa_index_t pos, prev_pos = ~0;
-    sa_entry *entry;
-    id_key_t key = id2key(id);
-
-    if (table->num_entries == 0) goto not_found;
-
-    pos = calc_pos(table, key);
-    entry = table->entries + pos;
-
-    if (entry->next == SA_EMPTY) goto not_found;
-
-    do {
-        if (entry->key == key) {
-            if (entry->next != SA_LAST) {
-                sa_index_t npos = entry->next - SA_OFFSET;
-                *entry = table->entries[npos];
-                memset(table->entries + npos, 0, sizeof(sa_entry));
-            }
-            else {
-                memset(table->entries + pos, 0, sizeof(sa_entry));
-                if (~prev_pos) {
-                    table->entries[prev_pos].next = SA_LAST;
-                }
-            }
-            table->num_entries--;
-            if (table->num_entries < table->num_bins / 4) {
-                resize(table);
-            }
-            return 1;
-        }
-        if (entry->next == SA_LAST) break;
-        prev_pos = pos;
-        pos = entry->next - SA_OFFSET;
-        entry = table->entries + pos;
-    } while(1);
-
-  not_found:
-    return 0;
-}
-
-enum foreach_type {
-    foreach_key_values,
-    foreach_values
-};
-
-static void
-hash_foreach(sa_table *table, enum rb_id_table_iterator_result (*func)(ANYARGS), void *arg, enum foreach_type type)
-{
-    sa_index_t i;
-
-    if (table->num_bins > 0) {
-	for(i = 0; i < table->num_bins ; i++) {
-	    if (table->entries[i].next != SA_EMPTY) {
-		id_key_t key = table->entries[i].key;
-		st_data_t val = table->entries[i].value;
-		enum rb_id_table_iterator_result ret;
-
-		switch (type) {
-		  case foreach_key_values:
-		    ret = (*func)(key2id(key), val, arg);
-		    break;
-		  case foreach_values:
-		    ret = (*func)(val, arg);
-		    break;
-		}
-
-		switch (ret) {
-		  case ID_TABLE_DELETE:
-		    rb_warn("unsupported yet");
-		    break;
-		  default:
-		    break;
-		}
-		if (ret == ID_TABLE_STOP) break;
-	    }
-	}
-    }
-}
-
-static void
-hash_id_table_foreach(sa_table *table, enum rb_id_table_iterator_result (*func)(ID, VALUE, void *), void *arg)
-{
-    hash_foreach(table, func, arg, foreach_key_values);
-}
-
-static void
-hash_id_table_foreach_values(sa_table *table, enum rb_id_table_iterator_result (*func)(VALUE, void *), void *arg)
-{
-    hash_foreach(table, func, arg, foreach_values);
-}
-#endif /* ID_TABLE_USE_COALESCED_HASHING */
-
-#ifdef ID_TABLE_USE_SMALL_HASH
 /* simple open addressing with quadratic probing.
    uses mark-bit on collisions - need extra 1 bit,
    ID is strictly 3 bits larger than rb_id_serial_t */
@@ -1158,7 +38,7 @@ typedef struct rb_id_item {
     VALUE    val;
 } item_t;
 
-struct hash_id_table {
+struct rb_id_table {
     int capa;
     int num;
     int used;
@@ -1171,7 +51,7 @@ struct hash_id_table {
 #define ITEM_COLLIDED(tbl, i) ((tbl)->items[i].collision)
 #define ITEM_SET_COLLIDED(tbl, i) ((tbl)->items[i].collision = 1)
 static inline void
-ITEM_SET_KEY(struct hash_id_table *tbl, int i, id_key_t key)
+ITEM_SET_KEY(struct rb_id_table *tbl, int i, id_key_t key)
 {
     tbl->items[i].key = key;
 }
@@ -1181,7 +61,7 @@ ITEM_SET_KEY(struct hash_id_table *tbl, int i, id_key_t key)
 #define ITEM_COLLIDED(tbl, i) ((tbl)->items[i].key & 1)
 #define ITEM_SET_COLLIDED(tbl, i) ((tbl)->items[i].key |= 1)
 static inline void
-ITEM_SET_KEY(struct hash_id_table *tbl, int i, id_key_t key)
+ITEM_SET_KEY(struct rb_id_table *tbl, int i, id_key_t key)
 {
     tbl->items[i].key = (key << 1) | ITEM_COLLIDED(tbl, i);
 }
@@ -1200,10 +80,10 @@ round_capa(int capa)
     return (capa + 1) << 2;
 }
 
-static struct hash_id_table *
-hash_id_table_init(struct hash_id_table *tbl, int capa)
+static struct rb_id_table *
+rb_id_table_init(struct rb_id_table *tbl, int capa)
 {
-    MEMZERO(tbl, struct hash_id_table, 1);
+    MEMZERO(tbl, struct rb_id_table, 1);
     if (capa > 0) {
 	capa = round_capa(capa);
 	tbl->capa = (int)capa;
@@ -1212,44 +92,42 @@ hash_id_table_init(struct hash_id_table *tbl, int capa)
     return tbl;
 }
 
-#ifndef ID_TABLE_USE_MIX
-static struct hash_id_table *
-hash_id_table_create(size_t capa)
+struct rb_id_table *
+rb_id_table_create(size_t capa)
 {
-    struct hash_id_table *tbl = ALLOC(struct hash_id_table);
-    return hash_id_table_init(tbl, (int)capa);
+    struct rb_id_table *tbl = ALLOC(struct rb_id_table);
+    return rb_id_table_init(tbl, (int)capa);
 }
-#endif
 
-static void
-hash_id_table_free(struct hash_id_table *tbl)
+void
+rb_id_table_free(struct rb_id_table *tbl)
 {
     xfree(tbl->items);
     xfree(tbl);
 }
 
-static void
-hash_id_table_clear(struct hash_id_table *tbl)
+void
+rb_id_table_clear(struct rb_id_table *tbl)
 {
     tbl->num = 0;
     tbl->used = 0;
     MEMZERO(tbl->items, item_t, tbl->capa);
 }
 
-static size_t
-hash_id_table_size(const struct hash_id_table *tbl)
+size_t
+rb_id_table_size(const struct rb_id_table *tbl)
 {
     return (size_t)tbl->num;
 }
 
-static size_t
-hash_id_table_memsize(const struct hash_id_table *tbl)
+size_t
+rb_id_table_memsize(const struct rb_id_table *tbl)
 {
-    return sizeof(item_t) * tbl->capa + sizeof(struct hash_id_table);
+    return sizeof(item_t) * tbl->capa + sizeof(struct rb_id_table);
 }
 
 static int
-hash_table_index(struct hash_id_table* tbl, id_key_t key)
+hash_table_index(struct rb_id_table* tbl, id_key_t key)
 {
     if (tbl->capa > 0) {
 	int mask = tbl->capa - 1;
@@ -1267,7 +145,7 @@ hash_table_index(struct hash_id_table* tbl, id_key_t key)
 }
 
 static void
-hash_table_raw_insert(struct hash_id_table *tbl, id_key_t key, VALUE val)
+hash_table_raw_insert(struct rb_id_table *tbl, id_key_t key, VALUE val)
 {
     int mask = tbl->capa - 1;
     int ix = key & mask;
@@ -1287,7 +165,7 @@ hash_table_raw_insert(struct hash_id_table *tbl, id_key_t key, VALUE val)
 }
 
 static int
-hash_delete_index(struct hash_id_table *tbl, int ix)
+hash_delete_index(struct rb_id_table *tbl, int ix)
 {
     if (ix >= 0) {
 	if (!ITEM_COLLIDED(tbl, ix)) {
@@ -1297,19 +175,23 @@ hash_delete_index(struct hash_id_table *tbl, int ix)
 	ITEM_SET_KEY(tbl, ix, 0);
 	tbl->items[ix].val = 0;
 	return TRUE;
-    } else {
+    }
+    else {
 	return FALSE;
     }
 }
 
 static void
-hash_table_extend(struct hash_id_table* tbl)
+hash_table_extend(struct rb_id_table* tbl)
 {
     if (tbl->used + (tbl->used >> 1) >= tbl->capa) {
 	int new_cap = round_capa(tbl->num + (tbl->num >> 1));
 	int i;
 	item_t* old;
-	struct hash_id_table tmp_tbl = {0, 0, 0};
+	struct rb_id_table tmp_tbl = {0, 0, 0};
+	if (new_cap < tbl->capa) {
+	    new_cap = round_capa(tbl->used + (tbl->used >> 1));
+	}
 	tmp_tbl.capa = new_cap;
 	tmp_tbl.items = ZALLOC_N(item_t, new_cap);
 	for (i = 0; i < tbl->capa; i++) {
@@ -1326,7 +208,7 @@ hash_table_extend(struct hash_id_table* tbl)
 
 #if ID_TABLE_DEBUG && 0
 static void
-hash_table_show(struct hash_id_table *tbl)
+hash_table_show(struct rb_id_table *tbl)
 {
     const id_key_t *keys = tbl->keys;
     const int capa = tbl->capa;
@@ -1341,14 +223,14 @@ hash_table_show(struct hash_id_table *tbl)
 }
 #endif
 
-static int
-hash_id_table_lookup(struct hash_id_table *tbl, ID id, VALUE *valp)
+int
+rb_id_table_lookup(struct rb_id_table *tbl, ID id, VALUE *valp)
 {
     id_key_t key = id2key(id);
     int index = hash_table_index(tbl, key);
 
     if (index >= 0) {
-	*valp = tbl->items[index].val;
+        *valp = tbl->items[index].val;
 	return TRUE;
     }
     else {
@@ -1357,7 +239,7 @@ hash_id_table_lookup(struct hash_id_table *tbl, ID id, VALUE *valp)
 }
 
 static int
-hash_id_table_insert_key(struct hash_id_table *tbl, const id_key_t key, const VALUE val)
+rb_id_table_insert_key(struct rb_id_table *tbl, const id_key_t key, const VALUE val)
 {
     const int index = hash_table_index(tbl, key);
 
@@ -1371,22 +253,43 @@ hash_id_table_insert_key(struct hash_id_table *tbl, const id_key_t key, const VA
     return TRUE;
 }
 
-static int
-hash_id_table_insert(struct hash_id_table *tbl, ID id, VALUE val)
+int
+rb_id_table_insert(struct rb_id_table *tbl, ID id, VALUE val)
 {
-    return hash_id_table_insert_key(tbl, id2key(id), val);
+    return rb_id_table_insert_key(tbl, id2key(id), val);
 }
 
-static int
-hash_id_table_delete(struct hash_id_table *tbl, ID id)
+int
+rb_id_table_delete(struct rb_id_table *tbl, ID id)
 {
     const id_key_t key = id2key(id);
     int index = hash_table_index(tbl, key);
     return hash_delete_index(tbl, index);
 }
 
-static void
-hash_id_table_foreach(struct hash_id_table *tbl, rb_id_table_foreach_func_t *func, void *data)
+void
+rb_id_table_foreach_with_replace(struct rb_id_table *tbl, rb_id_table_foreach_func_t *func, rb_id_table_update_callback_func_t *replace, void *data)
+{
+    int i, capa = tbl->capa;
+
+    for (i=0; i<capa; i++) {
+        if (ITEM_KEY_ISSET(tbl, i)) {
+            enum rb_id_table_iterator_result ret = (*func)(Qundef, tbl->items[i].val, data);
+            assert(ITEM_GET_KEY(tbl, i));
+
+            if (ret == ID_TABLE_REPLACE) {
+                VALUE val = tbl->items[i].val;
+                ret = (*replace)(NULL, &val, data, TRUE);
+                tbl->items[i].val = val;
+            }
+            else if (ret == ID_TABLE_STOP)
+                return;
+        }
+    }
+}
+
+void
+rb_id_table_foreach(struct rb_id_table *tbl, rb_id_table_foreach_func_t *func, void *data)
 {
     int i, capa = tbl->capa;
 
@@ -1404,8 +307,8 @@ hash_id_table_foreach(struct hash_id_table *tbl, rb_id_table_foreach_func_t *fun
     }
 }
 
-static void
-hash_id_table_foreach_values(struct hash_id_table *tbl, rb_id_table_foreach_values_func_t *func, void *data)
+void
+rb_id_table_foreach_values(struct rb_id_table *tbl, rb_id_table_foreach_values_func_t *func, void *data)
 {
     int i, capa = tbl->capa;
 
@@ -1420,169 +323,3 @@ hash_id_table_foreach_values(struct hash_id_table *tbl, rb_id_table_foreach_valu
 	}
     }
 }
-#endif /* ID_TABLE_USE_SMALL_HASH */
-
-#if ID_TABLE_USE_MIX
-
-struct mix_id_table {
-    union {
-	struct {
-	    int capa;
-	    int num;
-	} size;
-	struct list_id_table list;
-	struct hash_id_table hash;
-    } aux;
-};
-
-#define LIST_LIMIT_P(mix) ((mix)->aux.size.num == ID_TABLE_USE_MIX_LIST_MAX_CAPA)
-#define LIST_P(mix)       ((mix)->aux.size.capa <= ID_TABLE_USE_MIX_LIST_MAX_CAPA)
-
-static struct mix_id_table *
-mix_id_table_create(size_t size)
-{
-    struct mix_id_table *mix = ZALLOC(struct mix_id_table);
-    list_id_table_init((struct list_id_table *)mix, size);
-    return mix;
-}
-
-static void
-mix_id_table_free(struct mix_id_table *tbl)
-{
-    if (LIST_P(tbl)) list_id_table_free(&tbl->aux.list);
-    else             hash_id_table_free(&tbl->aux.hash);
-}
-
-static void
-mix_id_table_clear(struct mix_id_table *tbl)
-{
-    if (LIST_P(tbl)) list_id_table_clear(&tbl->aux.list);
-    else             hash_id_table_clear(&tbl->aux.hash);
-}
-
-static size_t
-mix_id_table_size(const struct mix_id_table *tbl)
-{
-    if (LIST_P(tbl)) return list_id_table_size(&tbl->aux.list);
-    else             return hash_id_table_size(&tbl->aux.hash);
-}
-
-static size_t
-mix_id_table_memsize(const struct mix_id_table *tbl)
-{
-    if (LIST_P(tbl)) return list_id_table_memsize(&tbl->aux.list) - sizeof(struct list_id_table) + sizeof(struct mix_id_table);
-    else             return hash_id_table_memsize(&tbl->aux.hash);
-}
-
-static int
-mix_id_table_insert(struct mix_id_table *tbl, ID id, VALUE val)
-{
-    int r;
-
-    if (LIST_P(tbl)) {
-	if (!LIST_LIMIT_P(tbl)) {
-	    r = list_id_table_insert(&tbl->aux.list, id, val);
-	}
-	else {
-	    /* convert to hash */
-	    /* overflow. TODO: this promotion should be done in list_extend_table */
-	    struct list_id_table *list = &tbl->aux.list;
-	    struct hash_id_table hash_body;
-	    id_key_t *keys = list->keys;
-	    VALUE *values = TABLE_VALUES(list);
-	    const int num = list->num;
-	    int i;
-
-	    hash_id_table_init(&hash_body, 0);
-
-	    for (i=0; i<num; i++) {
-		/* note that GC can run */
-		hash_id_table_insert_key(&hash_body, keys[i], values[i]);
-	    }
-
-	    tbl->aux.hash = hash_body;
-
-	    /* free list keys/values */
-	    xfree(keys);
-#if ID_TABLE_USE_CALC_VALUES == 0
-	    xfree(values);
-#endif
-	    goto hash_insert;
-	}
-    }
-    else {
-      hash_insert:
-	r = hash_id_table_insert(&tbl->aux.hash, id, val);
-	assert(!LIST_P(tbl));
-    }
-    return r;
-}
-
-static int
-mix_id_table_lookup(struct mix_id_table *tbl, ID id, VALUE *valp)
-{
-    if (LIST_P(tbl)) return list_id_table_lookup(&tbl->aux.list, id, valp);
-    else             return hash_id_table_lookup(&tbl->aux.hash, id, valp);
-}
-
-static int
-mix_id_table_delete(struct mix_id_table *tbl, ID id)
-{
-    if (LIST_P(tbl)) return list_id_table_delete(&tbl->aux.list, id);
-    else             return hash_id_table_delete(&tbl->aux.hash, id);
-}
-
-static void
-mix_id_table_foreach(struct mix_id_table *tbl, rb_id_table_foreach_func_t *func, void *data)
-{
-    if (LIST_P(tbl)) list_id_table_foreach(&tbl->aux.list, func, data);
-    else             hash_id_table_foreach(&tbl->aux.hash, func, data);
-}
-
-static void
-mix_id_table_foreach_values(struct mix_id_table *tbl, rb_id_table_foreach_values_func_t *func, void *data)
-{
-    if (LIST_P(tbl)) list_id_table_foreach_values(&tbl->aux.list, func, data);
-    else             hash_id_table_foreach_values(&tbl->aux.hash, func, data);
-}
-
-#endif /* ID_TABLE_USE_MIX */
-
-#define IMPL_TYPE1(type, prot, name, args) \
-    RUBY_ALIAS_FUNCTION_TYPE(type, prot, name, args)
-#define IMPL_TYPE(type, name, prot, args) \
-    IMPL_TYPE1(type, rb_id_table_##name prot, IMPL(_##name), args)
-#define IMPL_VOID1(prot, name, args) \
-    RUBY_ALIAS_FUNCTION_VOID(prot, name, args)
-#define IMPL_VOID(name, prot, args) \
-    IMPL_VOID1(rb_id_table_##name prot, IMPL(_##name), args)
-#define id_tbl (ID_TABLE_IMPL_TYPE *)tbl
-
-IMPL_TYPE(struct rb_id_table *, create, (size_t size), (size))
-IMPL_VOID(free, (struct rb_id_table *tbl), (id_tbl))
-IMPL_VOID(clear, (struct rb_id_table *tbl), (id_tbl))
-IMPL_TYPE(size_t, size, (const struct rb_id_table *tbl), (id_tbl))
-IMPL_TYPE(size_t, memsize, (const struct rb_id_table *tbl), (id_tbl))
-
-IMPL_TYPE(int , insert, (struct rb_id_table *tbl, ID id, VALUE val),
-	  (id_tbl, id, val))
-IMPL_TYPE(int, lookup, (struct rb_id_table *tbl, ID id, VALUE *valp),
-	  (id_tbl, id, valp))
-IMPL_TYPE(int, delete, (struct rb_id_table *tbl, ID id),
-	  (id_tbl, id))
-
-IMPL_VOID(foreach,
-	  (struct rb_id_table *tbl, rb_id_table_foreach_func_t *func, void *data),
-	  (id_tbl, func, data))
-IMPL_VOID(foreach_values,
-	  (struct rb_id_table *tbl, rb_id_table_foreach_values_func_t *func, void *data),
-	  (id_tbl, func, data))
-
-#if ID_TABLE_STARTUP_SIG
-__attribute__((constructor))
-static void
-show_impl(void)
-{
-    fprintf(stderr, "impl: %d\n", ID_TABLE_IMPL);
-}
-#endif
diff --git a/id_table.h b/id_table.h
index 4b4eb6fd70..f3dc681d17 100644
--- a/id_table.h
+++ b/id_table.h
@@ -1,5 +1,7 @@
 #ifndef RUBY_ID_TABLE_H
 #define RUBY_ID_TABLE_H 1
+#include "ruby/internal/config.h"
+#include <stddef.h>
 #include "ruby/ruby.h"
 
 struct rb_id_table;
@@ -9,6 +11,8 @@ enum rb_id_table_iterator_result {
     ID_TABLE_CONTINUE = ST_CONTINUE,
     ID_TABLE_STOP     = ST_STOP,
     ID_TABLE_DELETE   = ST_DELETE,
+    ID_TABLE_REPLACE  = ST_REPLACE,
+    ID_TABLE_ITERATOR_RESULT_END
 };
 
 struct rb_id_table *rb_id_table_create(size_t size);
@@ -22,9 +26,11 @@ int rb_id_table_insert(struct rb_id_table *tbl, ID id, VALUE val);
 int rb_id_table_lookup(struct rb_id_table *tbl, ID id, VALUE *valp);
 int rb_id_table_delete(struct rb_id_table *tbl, ID id);
 
+typedef enum rb_id_table_iterator_result rb_id_table_update_callback_func_t(ID *id, VALUE *val, void *data, int existing);
 typedef enum rb_id_table_iterator_result rb_id_table_foreach_func_t(ID id, VALUE val, void *data);
 typedef enum rb_id_table_iterator_result rb_id_table_foreach_values_func_t(VALUE val, void *data);
 void rb_id_table_foreach(struct rb_id_table *tbl, rb_id_table_foreach_func_t *func, void *data);
+void rb_id_table_foreach_with_replace(struct rb_id_table *tbl, rb_id_table_foreach_func_t *func, rb_id_table_update_callback_func_t *replace, void *data);
 void rb_id_table_foreach_values(struct rb_id_table *tbl, rb_id_table_foreach_values_func_t *func, void *data);
 
 #endif	/* RUBY_ID_TABLE_H */
diff --git a/include/ruby.h b/include/ruby.h
index 076b5ce258..31c1df3c5e 100644
--- a/include/ruby.h
+++ b/include/ruby.h
@@ -1,28 +1,33 @@
-/**********************************************************************
-
-  ruby.h -
-
-  $Author$
-  created at: Sun 10 12:06:15 Jun JST 2007
-
-  Copyright (C) 2007-2008 Yukihiro Matsumoto
-
-**********************************************************************/
-
-#ifndef RUBY_H
+#ifndef RUBY_H                                       /*-*-C++-*-vi:se ft=cpp:*/
 #define RUBY_H 1
-
+/**
+ * @file
+ * @author     $Author$
+ * @date       Sun 10 12:06:15 Jun JST 2007
+ * @copyright  2007-2008 Yukihiro Matsumoto
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ */
+#define HAVE_RUBY_ATOMIC_H      1
+#define HAVE_RUBY_DEBUG_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_MEMORY_VIEW_H 1
 #define HAVE_RUBY_MISSING_H     1
+#define HAVE_RUBY_ONIGMO_H      1
 #define HAVE_RUBY_ONIGURUMA_H   1
+#define HAVE_RUBY_RACTOR_H      1
+#define HAVE_RUBY_RANDOM_H      1
 #define HAVE_RUBY_RE_H          1
 #define HAVE_RUBY_REGEX_H       1
 #define HAVE_RUBY_RUBY_H        1
 #define HAVE_RUBY_ST_H          1
 #define HAVE_RUBY_THREAD_H      1
+#define HAVE_RUBY_THREAD_NATIVE_H 1
 #define HAVE_RUBY_UTIL_H        1
 #define HAVE_RUBY_VERSION_H     1
 #define HAVE_RUBY_VM_H          1
diff --git a/include/ruby/assert.h b/include/ruby/assert.h
new file mode 100644
index 0000000000..9b70d7103e
--- /dev/null
+++ b/include/ruby/assert.h
@@ -0,0 +1,234 @@
+#ifndef RUBY_ASSERT_H                                /*-*-C++-*-vi:se ft=cpp:*/
+#define RUBY_ASSERT_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @date       Wed May 18 00:21:44 JST 1994
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ */
+#include "ruby/internal/assume.h"
+#include "ruby/internal/attr/cold.h"
+#include "ruby/internal/attr/noreturn.h"
+#include "ruby/internal/cast.h"
+#include "ruby/internal/dllexport.h"
+#include "ruby/backward/2/assume.h"
+
+/* RUBY_NDEBUG  is very  simple:  after everything  described  below are  done,
+ * define it with either NDEBUG is undefined (=0) or defined (=1).  It is truly
+ * subordinate.
+ *
+ * RUBY_DEBUG versus NDEBUG is complicated.  Assertions shall be:
+ *
+ *                      | -UNDEBUG | -DNDEBUG
+ *       ---------------+----------+---------
+ *       -URUBY_DEBUG   | (*1)     | disabled
+ *       -DRUBY_DEBUG=0 | disabled | disabled
+ *       -DRUBY_DEBUG=1 | enabled  | (*2)
+ *       -DRUBY_DEBUG   | enabled  | (*2)
+ *
+ * where:
+ *
+ *   - (*1): Assertions shall  be silently disabled, no warnings,  in favour of
+ *     commit 21991e6ca59274e41a472b5256bd3245f6596c90.
+ *
+ *   - (*2): Compile-time warnings shall be issued.
+ */
+
+/** @cond INTERNAL_MACRO */
+
+/*
+ * Pro tip: `!!RUBY_DEBUG-1` expands to...
+ *
+ * - `!!(-1)`  (== `!0`  ==  `1`) when RUBY_DEBUG is defined to be empty,
+ * - `(!!0)-1` (== `0-1` == `-1`) when RUBY_DEBUG is defined as 0, and
+ * - `(!!n)-1` (== `1-1` ==  `0`) when RUBY_DEBUG is defined as something else.
+ */
+#if ! defined(RUBY_DEBUG)
+# define RBIMPL_RUBY_DEBUG 0
+#elif !!RUBY_DEBUG-1 < 0
+# define RBIMPL_RUBY_DEBUG 0
+#else
+# define RBIMPL_RUBY_DEBUG 1
+#endif
+
+/*
+ * ISO/IEC 9899 (all past versions) says that  "If NDEBUG is defined as a macro
+ * name at  the point  in the  source file where  <assert.h> is  included, ..."
+ * which means we must not take its defined value into account.
+ */
+#if defined(NDEBUG)
+# define RBIMPL_NDEBUG 1
+#else
+# define RBIMPL_NDEBUG 0
+#endif
+
+/** @endcond */
+
+/* Here we go... */
+#undef RUBY_DEBUG
+#undef RUBY_NDEBUG
+#undef NDEBUG
+#if defined(__DOXYGEN__)
+# /** Define this macro when you want assertions. */
+# define RUBY_DEBUG 0
+# /** Define this macro when you don't want assertions. */
+# define NDEBUG
+# /** This macro is basically the same as #NDEBUG */
+# define RUBY_NDEBUG 1
+
+#elif (RBIMPL_NDEBUG == 1) && (RBIMPL_RUBY_DEBUG == 0)
+# /* Assertions disabled as per request, no conflicts. */
+# define RUBY_DEBUG 0
+# define RUBY_NDEBUG 1
+# define NDEBUG
+
+#elif (RBIMPL_NDEBUG == 0) && (RBIMPL_RUBY_DEBUG == 1)
+# /* Assertions enabled as per request, no conflicts. */
+# define RUBY_DEBUG 1
+# define RUBY_NDEBUG 0
+# /* keep NDEBUG undefined */
+
+#elif (RBIMPL_NDEBUG == 0) && (RBIMPL_RUBY_DEBUG == 0)
+# /* The (*1) situation in avobe diagram. */
+# define RUBY_DEBUG 0
+# define RUBY_NDEBUG 1
+# define NDEBUG
+
+#elif (RBIMPL_NDEBUG == 1) && (RBIMPL_RUBY_DEBUG == 1)
+# /* The (*2) situation in above diagram. */
+# define RUBY_DEBUG 1
+# define RUBY_NDEBUG 0
+# /* keep NDEBUG undefined */
+
+# if defined(_MSC_VER)
+#  pragma message("NDEBUG is ignored because RUBY_DEBUG>0.")
+# elif defined(__GNUC__)
+#  pragma GCC warning "NDEBUG is ignored because RUBY_DEBUG>0."
+# else
+#  error NDEBUG is ignored because RUBY_DEBUG>0.
+# endif
+#endif
+#undef RBIMPL_NDEBUG
+#undef RBIMPL_RUBY_DEBUG
+
+/** @cond INTERNAL_MACRO */
+#define RBIMPL_ASSERT_NOTHING RBIMPL_CAST((void)0)
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+RBIMPL_ATTR_NORETURN()
+RBIMPL_ATTR_COLD()
+void rb_assert_failure(const char *file, int line, const char *name, const char *expr);
+RBIMPL_SYMBOL_EXPORT_END()
+
+#ifdef RUBY_FUNCTION_NAME_STRING
+# define RBIMPL_ASSERT_FUNC RUBY_FUNCTION_NAME_STRING
+#else
+# define RBIMPL_ASSERT_FUNC RBIMPL_CAST((const char *)0)
+#endif
+
+/** @endcond */
+
+/**
+ * Prints the given message, and terminates the entire process abnormally.
+ *
+ * @param  mesg  The message to display.
+ */
+#define RUBY_ASSERT_FAIL(mesg) \
+    rb_assert_failure(__FILE__, __LINE__, RBIMPL_ASSERT_FUNC, mesg)
+
+/**
+ * Asserts that the expression is truthy.  If not aborts with the message.
+ *
+ * @param  expr  What supposedly evaluates to true.
+ * @param  mesg  The message to display on failure.
+ */
+#define RUBY_ASSERT_MESG(expr, mesg) \
+    (RB_LIKELY(expr) ? RBIMPL_ASSERT_NOTHING : RUBY_ASSERT_FAIL(mesg))
+
+/**
+ * A variant of #RUBY_ASSERT that does not interface with #RUBY_DEBUG.
+ *
+ * @copydetails #RUBY_ASSERT
+ */
+#define RUBY_ASSERT_ALWAYS(expr) RUBY_ASSERT_MESG((expr), #expr)
+
+/**
+ * Asserts that the given expression is truthy iff #RUBY_DEBUG is truthy.
+ *
+ * @param  expr  What supposedly evaluates to true.
+ */
+#if RUBY_DEBUG
+# define RUBY_ASSERT(expr) RUBY_ASSERT_MESG((expr), #expr)
+#else
+# define RUBY_ASSERT(expr) RBIMPL_ASSERT_NOTHING
+#endif
+
+/**
+ * A  variant  of   #RUBY_ASSERT  that  interfaces  with   #NDEBUG  instead  of
+ * #RUBY_DEBUG.  This almost resembles `assert`  C standard macro, except minor
+ * implementation details.
+ *
+ * @copydetails #RUBY_ASSERT
+ */
+/* Currently  `RUBY_DEBUG == ! defined(NDEBUG)` is  always true.   There is  no
+ * difference any longer between this one and `RUBY_ASSERT`. */
+#if defined(NDEBUG)
+# define RUBY_ASSERT_NDEBUG(expr) RBIMPL_ASSERT_NOTHING
+#else
+# define RUBY_ASSERT_NDEBUG(expr) RUBY_ASSERT_MESG((expr), #expr)
+#endif
+
+/**
+ * @copydoc #RUBY_ASSERT_WHEN
+ * @param  mesg  The message to display on failure.
+ */
+#if RUBY_DEBUG
+# define RUBY_ASSERT_MESG_WHEN(cond, expr, mesg) RUBY_ASSERT_MESG((expr), (mesg))
+#else
+# define RUBY_ASSERT_MESG_WHEN(cond, expr, mesg) \
+    ((cond) ? RUBY_ASSERT_MESG((expr), (mesg)) : RBIMPL_ASSERT_NOTHING)
+#endif
+
+/**
+ * A variant  of #RUBY_ASSERT  that asserts when  either #RUBY_DEBUG  or `cond`
+ * parameter is truthy.
+ *
+ * @param  cond  Extra condition that shall hold for assertion to take effect.
+ * @param  expr  What supposedly evaluates to true.
+ */
+#define RUBY_ASSERT_WHEN(cond, expr) RUBY_ASSERT_MESG_WHEN((cond), (expr), #expr)
+
+/**
+ * This is either #RUBY_ASSERT or #RBIMPL_ASSUME, depending on #RUBY_DEBUG.
+ *
+ * @copydetails #RUBY_ASSERT
+ */
+#if RUBY_DEBUG
+# define RBIMPL_ASSERT_OR_ASSUME(expr) RUBY_ASSERT_ALWAYS(expr)
+#elif RBIMPL_COMPILER_BEFORE(Clang, 7, 0, 0)
+# /* See commit 67d259c5dccd31fe49d417fec169977712ffdf10 */
+# define RBIMPL_ASSERT_OR_ASSUME(expr) RBIMPL_ASSERT_NOTHING
+#elif defined(RUBY_ASSERT_NOASSUME)
+# /* See commit d300a734414ef6de7e8eb563b7cc4389c455ed08 */
+# define RBIMPL_ASSERT_OR_ASSUME(expr) RBIMPL_ASSERT_NOTHING
+#elif ! defined(RBIMPL_HAVE___ASSUME)
+# define RBIMPL_ASSERT_OR_ASSUME(expr) RBIMPL_ASSERT_NOTHING
+#else
+# define RBIMPL_ASSERT_OR_ASSUME(expr) RBIMPL_ASSUME(expr)
+#endif
+
+#endif /* RUBY_ASSERT_H */
diff --git a/include/ruby/atomic.h b/include/ruby/atomic.h
new file mode 100644
index 0000000000..a898c30ddf
--- /dev/null
+++ b/include/ruby/atomic.h
@@ -0,0 +1,236 @@
+#ifndef RUBY_ATOMIC_H
+#define RUBY_ATOMIC_H
+
+/*
+ * - RUBY_ATOMIC_CAS, RUBY_ATOMIC_EXCHANGE, RUBY_ATOMIC_FETCH_*:
+ *   return the old * value.
+ * - RUBY_ATOMIC_ADD, RUBY_ATOMIC_SUB, RUBY_ATOMIC_INC, RUBY_ATOMIC_DEC, RUBY_ATOMIC_OR, RUBY_ATOMIC_SET:
+ *   may be void.
+ */
+#if 0
+#elif defined HAVE_GCC_ATOMIC_BUILTINS
+typedef unsigned int rb_atomic_t;
+# define RUBY_ATOMIC_FETCH_ADD(var, val) __atomic_fetch_add(&(var), (val), __ATOMIC_SEQ_CST)
+# define RUBY_ATOMIC_FETCH_SUB(var, val) __atomic_fetch_sub(&(var), (val), __ATOMIC_SEQ_CST)
+# define RUBY_ATOMIC_OR(var, val) __atomic_fetch_or(&(var), (val), __ATOMIC_SEQ_CST)
+# define RUBY_ATOMIC_EXCHANGE(var, val) __atomic_exchange_n(&(var), (val), __ATOMIC_SEQ_CST)
+# define RUBY_ATOMIC_CAS(var, oldval, newval) RB_GNUC_EXTENSION_BLOCK( \
+   __typeof__(var) oldvaldup = (oldval); /* oldval should not be modified */ \
+   __atomic_compare_exchange_n(&(var), &oldvaldup, (newval), 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST); \
+   oldvaldup )
+
+# define RUBY_ATOMIC_GENERIC_MACRO 1
+
+#elif defined HAVE_GCC_SYNC_BUILTINS
+/* @shyouhei hack to support atomic operations in case of gcc. Gcc
+ * has its own pseudo-insns to support them.  See info, or
+ * http://gcc.gnu.org/onlinedocs/gcc/Atomic-Builtins.html */
+
+typedef unsigned int rb_atomic_t; /* Anything OK */
+# define RUBY_ATOMIC_FETCH_ADD(var, val) __sync_fetch_and_add(&(var), (val))
+# define RUBY_ATOMIC_FETCH_SUB(var, val) __sync_fetch_and_sub(&(var), (val))
+# define RUBY_ATOMIC_OR(var, val) __sync_fetch_and_or(&(var), (val))
+# define RUBY_ATOMIC_EXCHANGE(var, val) __sync_lock_test_and_set(&(var), (val))
+# define RUBY_ATOMIC_CAS(var, oldval, newval) __sync_val_compare_and_swap(&(var), (oldval), (newval))
+
+# define RUBY_ATOMIC_GENERIC_MACRO 1
+
+#elif defined _WIN32
+#if RBIMPL_COMPILER_SINCE(MSVC, 13, 0, 0)
+#pragma intrinsic(_InterlockedOr)
+#endif
+typedef LONG rb_atomic_t;
+
+# define RUBY_ATOMIC_SET(var, val) InterlockedExchange(&(var), (val))
+# define RUBY_ATOMIC_INC(var) InterlockedIncrement(&(var))
+# define RUBY_ATOMIC_DEC(var) InterlockedDecrement(&(var))
+# define RUBY_ATOMIC_FETCH_ADD(var, val) InterlockedExchangeAdd(&(var), (val))
+# define RUBY_ATOMIC_FETCH_SUB(var, val) InterlockedExchangeAdd(&(var), -(LONG)(val))
+#if defined __GNUC__
+# define RUBY_ATOMIC_OR(var, val) __asm__("lock\n\t" "orl\t%1, %0" : "=m"(var) : "Ir"(val))
+#elif RBIMPL_COMPILER_BEFORE(MSVC, 13, 0, 0)
+# define RUBY_ATOMIC_OR(var, val) rb_w32_atomic_or(&(var), (val))
+static inline void
+rb_w32_atomic_or(volatile rb_atomic_t *var, rb_atomic_t val)
+{
+#ifdef _M_IX86
+    __asm mov eax, var;
+    __asm mov ecx, val;
+    __asm lock or [eax], ecx;
+#else
+#error unsupported architecture
+#endif
+}
+#else
+# define RUBY_ATOMIC_OR(var, val) _InterlockedOr(&(var), (val))
+#endif
+# define RUBY_ATOMIC_EXCHANGE(var, val) InterlockedExchange(&(var), (val))
+# define RUBY_ATOMIC_CAS(var, oldval, newval) InterlockedCompareExchange(&(var), (newval), (oldval))
+# if RBIMPL_COMPILER_BEFORE(MSVC, 13, 0, 0)
+static inline rb_atomic_t
+rb_w32_atomic_cas(volatile rb_atomic_t *var, rb_atomic_t oldval, rb_atomic_t newval)
+{
+    return (rb_atomic_t)InterlockedCompareExchange((PVOID *)var, (PVOID)newval, (PVOID)oldval);
+}
+#   undef RUBY_ATOMIC_CAS
+#   define RUBY_ATOMIC_CAS(var, oldval, newval) rb_w32_atomic_cas(&(var), (oldval), (newval))
+# endif
+# ifdef _M_AMD64
+#  define RUBY_ATOMIC_SIZE_ADD(var, val) InterlockedExchangeAdd64((LONG_LONG *)&(var), (val))
+#  define RUBY_ATOMIC_SIZE_SUB(var, val) InterlockedExchangeAdd64((LONG_LONG *)&(var), -(LONG)(val))
+#  define RUBY_ATOMIC_SIZE_INC(var) InterlockedIncrement64(&(var))
+#  define RUBY_ATOMIC_SIZE_DEC(var) InterlockedDecrement64(&(var))
+#  define RUBY_ATOMIC_SIZE_EXCHANGE(var, val) InterlockedExchange64(&(var), (val))
+#  define RUBY_ATOMIC_SIZE_CAS(var, oldval, newval) InterlockedCompareExchange64(&(var), (newval), (oldval))
+# else
+#  define RUBY_ATOMIC_SIZE_ADD(var, val) InterlockedExchangeAdd((LONG *)&(var), (val))
+#  define RUBY_ATOMIC_SIZE_SUB(var, val) InterlockedExchangeAdd((LONG *)&(var), -(LONG)(val))
+#  define RUBY_ATOMIC_SIZE_INC(var) InterlockedIncrement((LONG *)&(var))
+#  define RUBY_ATOMIC_SIZE_DEC(var) InterlockedDecrement((LONG *)&(var))
+#  define RUBY_ATOMIC_SIZE_EXCHANGE(var, val) InterlockedExchange((LONG *)&(var), (val))
+# endif
+
+# ifdef InterlockedExchangePointer
+#   define RUBY_ATOMIC_PTR_EXCHANGE(var, val) InterlockedExchangePointer((PVOID volatile *)&(var), (PVOID)(val))
+# endif /* See below for definitions of other situations */
+
+#elif defined(__sun) && defined(HAVE_ATOMIC_H)
+#include <atomic.h>
+typedef unsigned int rb_atomic_t;
+
+# define RUBY_ATOMIC_INC(var) atomic_inc_uint(&(var))
+# define RUBY_ATOMIC_DEC(var) atomic_dec_uint(&(var))
+# define RUBY_ATOMIC_FETCH_ADD(var, val) rb_atomic_fetch_add(&(var), (val))
+# define RUBY_ATOMIC_FETCH_SUB(var, val) rb_atomic_fetch_sub(&(var), (val))
+# define RUBY_ATOMIC_ADD(var, val) atomic_add_uint(&(var), (val))
+# define RUBY_ATOMIC_SUB(var, val) atomic_sub_uint(&(var), (val))
+# define RUBY_ATOMIC_OR(var, val) atomic_or_uint(&(var), (val))
+# define RUBY_ATOMIC_EXCHANGE(var, val) atomic_swap_uint(&(var), (val))
+# define RUBY_ATOMIC_CAS(var, oldval, newval) atomic_cas_uint(&(var), (oldval), (newval))
+
+static inline rb_atomic_t
+rb_atomic_fetch_add(volatile rb_atomic_t *var, rb_atomic_t val)
+{
+    return atomic_add_int_nv(var, val) - val;
+}
+
+static inline rb_atomic_t
+rb_atomic_fetch_sub(volatile rb_atomic_t *var, rb_atomic_t val)
+{
+    return atomic_add_int_nv(var, (rb_atomic_t)(-(int)val)) + val;
+}
+
+# if defined(_LP64) || defined(_I32LPx)
+#  define RUBY_ATOMIC_SIZE_ADD(var, val) atomic_add_long(&(var), (val))
+#  define RUBY_ATOMIC_SIZE_SUB(var, val) atomic_add_long(&(var), -(val))
+#  define RUBY_ATOMIC_SIZE_INC(var) atomic_inc_ulong(&(var))
+#  define RUBY_ATOMIC_SIZE_DEC(var) atomic_dec_ulong(&(var))
+#  define RUBY_ATOMIC_SIZE_EXCHANGE(var, val) atomic_swap_ulong(&(var), (val))
+#  define RUBY_ATOMIC_SIZE_CAS(var, oldval, val) atomic_cas_ulong(&(var), (oldval), (val))
+# else
+#  define RUBY_ATOMIC_SIZE_ADD(var, val) atomic_add_int(&(var), (val))
+#  define RUBY_ATOMIC_SIZE_SUB(var, val) atomic_add_int(&(var), -(val))
+#  define RUBY_ATOMIC_SIZE_INC(var) atomic_inc_uint(&(var))
+#  define RUBY_ATOMIC_SIZE_DEC(var) atomic_dec_uint(&(var))
+#  define RUBY_ATOMIC_SIZE_EXCHANGE(var, val) atomic_swap_uint(&(var), (val))
+# endif
+
+#else
+# error No atomic operation found
+#endif
+
+#ifndef RUBY_ATOMIC_SET
+# define RUBY_ATOMIC_SET(var, val) (void)RUBY_ATOMIC_EXCHANGE(var, val)
+#endif
+
+#ifndef RUBY_ATOMIC_ADD
+# define RUBY_ATOMIC_ADD(var, val) (void)RUBY_ATOMIC_FETCH_ADD(var, val)
+#endif
+
+#ifndef RUBY_ATOMIC_SUB
+# define RUBY_ATOMIC_SUB(var, val) (void)RUBY_ATOMIC_FETCH_SUB(var, val)
+#endif
+
+#ifndef RUBY_ATOMIC_INC
+# define RUBY_ATOMIC_INC(var) RUBY_ATOMIC_ADD(var, 1)
+#endif
+
+#ifndef RUBY_ATOMIC_DEC
+# define RUBY_ATOMIC_DEC(var) RUBY_ATOMIC_SUB(var, 1)
+#endif
+
+#ifndef RUBY_ATOMIC_SIZE_INC
+# define RUBY_ATOMIC_SIZE_INC(var) RUBY_ATOMIC_INC(var)
+#endif
+
+#ifndef RUBY_ATOMIC_SIZE_DEC
+# define RUBY_ATOMIC_SIZE_DEC(var) RUBY_ATOMIC_DEC(var)
+#endif
+
+#ifndef RUBY_ATOMIC_SIZE_EXCHANGE
+# define RUBY_ATOMIC_SIZE_EXCHANGE(var, val) RUBY_ATOMIC_EXCHANGE(var, val)
+#endif
+
+#ifndef RUBY_ATOMIC_SIZE_CAS
+# define RUBY_ATOMIC_SIZE_CAS(var, oldval, val) RUBY_ATOMIC_CAS(var, oldval, val)
+#endif
+
+#ifndef RUBY_ATOMIC_SIZE_ADD
+# define RUBY_ATOMIC_SIZE_ADD(var, val) RUBY_ATOMIC_ADD(var, val)
+#endif
+
+#ifndef RUBY_ATOMIC_SIZE_SUB
+# define RUBY_ATOMIC_SIZE_SUB(var, val) RUBY_ATOMIC_SUB(var, val)
+#endif
+
+#if RUBY_ATOMIC_GENERIC_MACRO
+# ifndef RUBY_ATOMIC_PTR_EXCHANGE
+#   define RUBY_ATOMIC_PTR_EXCHANGE(var, val) RUBY_ATOMIC_EXCHANGE(var, val)
+# endif
+
+# ifndef RUBY_ATOMIC_PTR_CAS
+#   define RUBY_ATOMIC_PTR_CAS(var, oldval, newval) RUBY_ATOMIC_CAS(var, oldval, newval)
+# endif
+
+# ifndef RUBY_ATOMIC_VALUE_EXCHANGE
+#   define RUBY_ATOMIC_VALUE_EXCHANGE(var, val) RUBY_ATOMIC_EXCHANGE(var, val)
+# endif
+
+# ifndef RUBY_ATOMIC_VALUE_CAS
+#   define RUBY_ATOMIC_VALUE_CAS(var, oldval, val) RUBY_ATOMIC_CAS(var, oldval, val)
+# endif
+#endif
+
+#ifndef RUBY_ATOMIC_PTR_EXCHANGE
+# if SIZEOF_VOIDP == SIZEOF_SIZE_T
+#   define RUBY_ATOMIC_PTR_EXCHANGE(var, val) (void *)RUBY_ATOMIC_SIZE_EXCHANGE(*(size_t *)&(var), (size_t)(val))
+# else
+#   error No atomic exchange for void*
+# endif
+#endif
+
+#ifndef RUBY_ATOMIC_PTR_CAS
+# if SIZEOF_VOIDP == SIZEOF_SIZE_T
+#   define RUBY_ATOMIC_PTR_CAS(var, oldval, val) (void *)RUBY_ATOMIC_SIZE_CAS(*(size_t *)&(var), (size_t)(oldval), (size_t)(val))
+# else
+#   error No atomic compare-and-set for void*
+# endif
+#endif
+
+#ifndef RUBY_ATOMIC_VALUE_EXCHANGE
+# if SIZEOF_VALUE == SIZEOF_SIZE_T
+#   define RUBY_ATOMIC_VALUE_EXCHANGE(var, val) RUBY_ATOMIC_SIZE_EXCHANGE(*(size_t *)&(var), (size_t)(val))
+# else
+#   error No atomic exchange for VALUE
+# endif
+#endif
+
+#ifndef RUBY_ATOMIC_VALUE_CAS
+# if SIZEOF_VALUE == SIZEOF_SIZE_T
+#   define RUBY_ATOMIC_VALUE_CAS(var, oldval, val) RUBY_ATOMIC_SIZE_CAS(*(size_t *)&(var), (size_t)(oldval), (size_t)(val))
+# else
+#   error No atomic compare-and-set for VALUE
+# endif
+#endif
+
+#endif /* RUBY_ATOMIC_H */
diff --git a/include/ruby/backward.h b/include/ruby/backward.h
index 4574cb98da..350a58ee95 100644
--- a/include/ruby/backward.h
+++ b/include/ruby/backward.h
@@ -1,12 +1,71 @@
-#ifndef RUBY_RUBY_BACKWARD_H
+#ifndef RUBY_RUBY_BACKWARD_H                         /*-*-C++-*-vi:se ft=cpp:*/
 #define RUBY_RUBY_BACKWARD_H 1
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ */
+#include "ruby/internal/value.h"
+#include "ruby/internal/interpreter.h"
+#include "ruby/backward/2/attributes.h"
 
-#ifndef RUBY_SHOW_COPYRIGHT_TO_DIE
-# define RUBY_SHOW_COPYRIGHT_TO_DIE 1
-#endif
-#if RUBY_SHOW_COPYRIGHT_TO_DIE
+#define DECLARE_DEPRECATED_FEATURE(ver, func) \
+    NORETURN(ERRORFUNC(("deprecated since "#ver), DEPRECATED(void func(void))))
+
+/* eval.c */
+DECLARE_DEPRECATED_FEATURE(2.2, rb_disable_super);
+DECLARE_DEPRECATED_FEATURE(2.2, rb_enable_super);
+
+/* hash.c */
+DECLARE_DEPRECATED_FEATURE(2.2, rb_hash_iter_lev);
+DECLARE_DEPRECATED_FEATURE(2.2, rb_hash_ifnone);
+
+/* string.c */
+DECLARE_DEPRECATED_FEATURE(2.2, rb_str_associate);
+DECLARE_DEPRECATED_FEATURE(2.2, rb_str_associated);
+
+/* variable.c */
+DEPRECATED(void rb_autoload(VALUE, ID, const char*));
+
+/* vm.c */
+DECLARE_DEPRECATED_FEATURE(2.2, rb_clear_cache);
+DECLARE_DEPRECATED_FEATURE(2.2, rb_frame_pop);
+
+#define DECLARE_DEPRECATED_INTERNAL_FEATURE(func) \
+    NORETURN(ERRORFUNC(("deprecated internal function"), DEPRECATED(void func(void))))
+
+/* eval.c */
+NORETURN(ERRORFUNC(("internal function"), void rb_frozen_class_p(VALUE)));
+DECLARE_DEPRECATED_INTERNAL_FEATURE(rb_exec_end_proc);
+
+/* error.c */
+DECLARE_DEPRECATED_INTERNAL_FEATURE(rb_compile_error);
+DECLARE_DEPRECATED_INTERNAL_FEATURE(rb_compile_error_with_enc);
+DECLARE_DEPRECATED_INTERNAL_FEATURE(rb_compile_error_append);
+
+/* gc.c */
+DECLARE_DEPRECATED_INTERNAL_FEATURE(rb_gc_call_finalizer_at_exit);
+
+/* signal.c */
+DECLARE_DEPRECATED_INTERNAL_FEATURE(rb_trap_exit);
+
+/* struct.c */
+DECLARE_DEPRECATED_INTERNAL_FEATURE(rb_struct_ptr);
+
+/* thread.c */
+DECLARE_DEPRECATED_INTERNAL_FEATURE(rb_clear_trace_func);
+
+/* variable.c */
+DECLARE_DEPRECATED_INTERNAL_FEATURE(rb_generic_ivar_table);
+NORETURN(ERRORFUNC(("internal function"), VALUE rb_mod_const_missing(VALUE, VALUE)));
+
+/* from version.c */
+#if defined(RUBY_SHOW_COPYRIGHT_TO_DIE) && !!(RUBY_SHOW_COPYRIGHT_TO_DIE+0)
 /* for source code backward compatibility */
-DEPRECATED(static inline int ruby_show_copyright_to_die(int));
+RBIMPL_ATTR_DEPRECATED(("since 2.4"))
 static inline int
 ruby_show_copyright_to_die(int exitcode)
 {
diff --git a/include/ruby/backward/2/assume.h b/include/ruby/backward/2/assume.h
new file mode 100644
index 0000000000..3fbb81439a
--- /dev/null
+++ b/include/ruby/backward/2/assume.h
@@ -0,0 +1,43 @@
+#ifndef RUBY_BACKWARD2_ASSUME_H                      /*-*-C++-*-vi:se ft=cpp:*/
+#define RUBY_BACKWARD2_ASSUME_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #ASSUME / #RB_LIKELY / #UNREACHABLE
+ */
+#include "ruby/internal/config.h"
+#include "ruby/internal/assume.h"
+#include "ruby/internal/has/builtin.h"
+
+#undef  ASSUME             /* Kill config.h definition */
+#undef  UNREACHABLE        /* Kill config.h definition */
+#define ASSUME             RBIMPL_ASSUME
+#define UNREACHABLE        RBIMPL_UNREACHABLE()
+#define UNREACHABLE_RETURN RBIMPL_UNREACHABLE_RETURN
+
+/* likely */
+#if RBIMPL_HAS_BUILTIN(__builtin_expect)
+# define RB_LIKELY(x)   (__builtin_expect(!!(x), 1))
+# define RB_UNLIKELY(x) (__builtin_expect(!!(x), 0))
+
+#else
+# define RB_LIKELY(x)   (x)
+# define RB_UNLIKELY(x) (x)
+#endif
+
+#endif /* RUBY_BACKWARD2_ASSUME_H */
diff --git a/include/ruby/backward/2/attributes.h b/include/ruby/backward/2/attributes.h
new file mode 100644
index 0000000000..eaff9e3381
--- /dev/null
+++ b/include/ruby/backward/2/attributes.h
@@ -0,0 +1,170 @@
+#ifndef RUBY_BACKWARD2_ATTRIBUTES_H                  /*-*-C++-*-vi:se ft=cpp:*/
+#define RUBY_BACKWARD2_ATTRIBUTES_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Various attribute-related macros.
+ *
+ * ### Q&A ###
+ *
+ * - Q: Why  are the  macros defined  in this  header file  so inconsistent  in
+ *      style?
+ *
+ * - A: Don't know.   Don't blame me.  Backward compatibility is  the key here.
+ *      I'm just preserving what they have been.
+ */
+#include "ruby/internal/config.h"
+#include "ruby/internal/attr/alloc_size.h"
+#include "ruby/internal/attr/cold.h"
+#include "ruby/internal/attr/const.h"
+#include "ruby/internal/attr/deprecated.h"
+#include "ruby/internal/attr/error.h"
+#include "ruby/internal/attr/forceinline.h"
+#include "ruby/internal/attr/format.h"
+#include "ruby/internal/attr/maybe_unused.h"
+#include "ruby/internal/attr/noinline.h"
+#include "ruby/internal/attr/nonnull.h"
+#include "ruby/internal/attr/noreturn.h"
+#include "ruby/internal/attr/pure.h"
+#include "ruby/internal/attr/restrict.h"
+#include "ruby/internal/attr/returns_nonnull.h"
+#include "ruby/internal/attr/warning.h"
+#include "ruby/internal/has/attribute.h"
+
+/* function attributes */
+#undef CONSTFUNC
+#define CONSTFUNC(x) RBIMPL_ATTR_CONST() x
+
+#undef PUREFUNC
+#define PUREFUNC(x) RBIMPL_ATTR_PURE() x
+
+#undef DEPRECATED
+#define DEPRECATED(x) RBIMPL_ATTR_DEPRECATED(("")) x
+
+#undef DEPRECATED_BY
+#define DEPRECATED_BY(n,x) RBIMPL_ATTR_DEPRECATED(("by: " # n)) x
+
+#undef DEPRECATED_TYPE
+#if defined(__GNUC__)
+# define DEPRECATED_TYPE(mesg, decl)                      \
+    _Pragma("message \"DEPRECATED_TYPE is deprecated\""); \
+    decl RBIMPL_ATTR_DEPRECATED(mseg)
+#elif defined(_MSC_VER)
+# pragma deprecated(DEPRECATED_TYPE)
+# define DEPRECATED_TYPE(mesg, decl)                              \
+    __pragma(message(__FILE__"("STRINGIZE(__LINE__)"): warning: " \
+                     "DEPRECATED_TYPE is deprecated"))            \
+    decl RBIMPL_ATTR_DEPRECATED(mseg)
+#else
+# define DEPRECATED_TYPE(mesg, decl)                    \
+    <-<-"DEPRECATED_TYPE is deprecated"->->
+#endif
+
+#undef RUBY_CXX_DEPRECATED
+#define RUBY_CXX_DEPRECATED(mseg) RBIMPL_ATTR_DEPRECATED((mseg))
+
+#undef NOINLINE
+#define NOINLINE(x) RBIMPL_ATTR_NOINLINE() x
+
+#ifndef MJIT_HEADER
+# undef ALWAYS_INLINE
+# define ALWAYS_INLINE(x) RBIMPL_ATTR_FORCEINLINE() x
+#endif
+
+#undef ERRORFUNC
+#define ERRORFUNC(mesg, x) RBIMPL_ATTR_ERROR(mesg) x
+#if RBIMPL_HAS_ATTRIBUTE(error)
+# define HAVE_ATTRIBUTE_ERRORFUNC 1
+#else
+# define HAVE_ATTRIBUTE_ERRORFUNC 0
+#endif
+
+#undef WARNINGFUNC
+#define WARNINGFUNC(mesg, x) RBIMPL_ATTR_WARNING(mesg) x
+#if RBIMPL_HAS_ATTRIBUTE(warning)
+# define HAVE_ATTRIBUTE_WARNINGFUNC 1
+#else
+# define HAVE_ATTRIBUTE_WARNINGFUNC 0
+#endif
+
+/*
+  cold attribute for code layout improvements
+  RUBY_FUNC_ATTRIBUTE not used because MSVC does not like nested func macros
+ */
+#undef COLDFUNC
+#define COLDFUNC RBIMPL_ATTR_COLD()
+
+#define PRINTF_ARGS(decl, string_index, first_to_check) \
+    RBIMPL_ATTR_FORMAT(RBIMPL_PRINTF_FORMAT, (string_index), (first_to_check)) \
+    decl
+
+#undef RUBY_ATTR_ALLOC_SIZE
+#define RUBY_ATTR_ALLOC_SIZE RBIMPL_ATTR_ALLOC_SIZE
+
+#undef RUBY_ATTR_MALLOC
+#define RUBY_ATTR_MALLOC RBIMPL_ATTR_RESTRICT()
+
+#undef RUBY_ATTR_RETURNS_NONNULL
+#define RUBY_ATTR_RETURNS_NONNULL RBIMPL_ATTR_RETURNS_NONNULL()
+
+#ifndef FUNC_MINIMIZED
+#define FUNC_MINIMIZED(x) x
+#endif
+
+#ifndef FUNC_UNOPTIMIZED
+#define FUNC_UNOPTIMIZED(x) x
+#endif
+
+#ifndef RUBY_ALIAS_FUNCTION_TYPE
+#define RUBY_ALIAS_FUNCTION_TYPE(type, prot, name, args) \
+    FUNC_MINIMIZED(type prot) {return (type)name args;}
+#endif
+
+#ifndef RUBY_ALIAS_FUNCTION_VOID
+#define RUBY_ALIAS_FUNCTION_VOID(prot, name, args) \
+    FUNC_MINIMIZED(void prot) {name args;}
+#endif
+
+#ifndef RUBY_ALIAS_FUNCTION
+#define RUBY_ALIAS_FUNCTION(prot, name, args) \
+    RUBY_ALIAS_FUNCTION_TYPE(VALUE, prot, name, args)
+#endif
+
+#undef RUBY_FUNC_NONNULL
+#define RUBY_FUNC_NONNULL(n, x) RBIMPL_ATTR_NONNULL(n) x
+
+#undef  NORETURN
+#define NORETURN(x) RBIMPL_ATTR_NORETURN() x
+#define NORETURN_STYLE_NEW
+
+#ifndef PACKED_STRUCT
+# define PACKED_STRUCT(x) x
+#endif
+
+#ifndef PACKED_STRUCT_UNALIGNED
+# if UNALIGNED_WORD_ACCESS
+#   define PACKED_STRUCT_UNALIGNED(x) PACKED_STRUCT(x)
+# else
+#   define PACKED_STRUCT_UNALIGNED(x) x
+# endif
+#endif
+
+#undef RB_UNUSED_VAR
+#define RB_UNUSED_VAR(x) x RBIMPL_ATTR_MAYBE_UNUSED()
+
+#endif /* RUBY_BACKWARD2_ATTRIBUTES_H */
diff --git a/include/ruby/backward/2/bool.h b/include/ruby/backward/2/bool.h
new file mode 100644
index 0000000000..53164eb3b8
--- /dev/null
+++ b/include/ruby/backward/2/bool.h
@@ -0,0 +1,37 @@
+#ifndef RUBY_BACKWARD2_BOOL_H                        /*-*-C++-*-vi:se ft=cpp:*/
+#define RUBY_BACKWARD2_BOOL_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines old #TRUE / #FALSE
+ */
+#include "ruby/internal/stdbool.h"
+
+#ifndef FALSE
+# define FALSE false
+#elif FALSE
+# error FALSE must be false
+#endif
+
+#ifndef TRUE
+# define TRUE true
+#elif ! TRUE
+# error TRUE must be true
+#endif
+
+#endif /* RUBY_BACKWARD2_BOOL_H */
diff --git a/include/ruby/backward/2/gcc_version_since.h b/include/ruby/backward/2/gcc_version_since.h
new file mode 100644
index 0000000000..2a5b76c102
--- /dev/null
+++ b/include/ruby/backward/2/gcc_version_since.h
@@ -0,0 +1,38 @@
+#ifndef RUBY_BACKWARD2_GCC_VERSION_SINCE_H           /*-*-C++-*-vi:se ft=cpp:*/
+#define RUBY_BACKWARD2_GCC_VERSION_SINCE_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines old #GCC_VERSION_SINCE
+ */
+#include "ruby/internal/compiler_since.h"
+
+#ifndef GCC_VERSION_SINCE
+#define GCC_VERSION_SINCE(x, y, z) RBIMPL_COMPILER_SINCE(GCC, (x), (y), (z))
+#endif
+
+#ifndef GCC_VERSION_BEFORE
+#define GCC_VERSION_BEFORE(x, y, z) \
+     (RBIMPL_COMPILER_BEFORE(GCC, (x), (y), (z)) || \
+     (RBIMPL_COMPILER_IS(GCC)                    && \
+    ((RBIMPL_COMPILER_VERSION_MAJOR == (x))      && \
+    ((RBIMPL_COMPILER_VERSION_MINOR == (y))      && \
+     (RBIMPL_COMPILER_VERSION_PATCH == (z))))))
+#endif
+
+#endif /* RUBY_BACKWARD2_GCC_VERSION_SINCE_H */
diff --git a/include/ruby/backward/2/inttypes.h b/include/ruby/backward/2/inttypes.h
new file mode 100644
index 0000000000..c1e376a107
--- /dev/null
+++ b/include/ruby/backward/2/inttypes.h
@@ -0,0 +1,132 @@
+#ifndef RUBY_BACKWARD2_INTTYPES_H                    /*-*-C++-*-vi:se ft=cpp:*/
+#define RUBY_BACKWARD2_INTTYPES_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      C99 shim for `<inttypes.h>`
+ */
+#include "ruby/internal/config.h"      /* PRI_LL_PREFIX etc. are here */
+
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+
+#include "ruby/internal/value.h"       /* PRI_VALUE_PREFIX is here. */
+
+#ifndef PRI_INT_PREFIX
+# define PRI_INT_PREFIX ""
+#endif
+
+#ifndef PRI_LONG_PREFIX
+# define PRI_LONG_PREFIX "l"
+#endif
+
+#ifndef PRI_SHORT_PREFIX
+# define PRI_SHORT_PREFIX "h"
+#endif
+
+#ifdef PRI_64_PREFIX
+# /* Take that. */
+#elif SIZEOF_LONG == 8
+# define PRI_64_PREFIX PRI_LONG_PREFIX
+#elif SIZEOF_LONG_LONG == 8
+# define PRI_64_PREFIX PRI_LL_PREFIX
+#endif
+
+#ifndef PRIdPTR
+# define PRIdPTR PRI_PTR_PREFIX"d"
+# define PRIiPTR PRI_PTR_PREFIX"i"
+# define PRIoPTR PRI_PTR_PREFIX"o"
+# define PRIuPTR PRI_PTR_PREFIX"u"
+# define PRIxPTR PRI_PTR_PREFIX"x"
+# define PRIXPTR PRI_PTR_PREFIX"X"
+#endif
+
+#ifndef RUBY_PRI_VALUE_MARK
+# define RUBY_PRI_VALUE_MARK "\v"
+#endif
+
+#if defined PRIdPTR && !defined PRI_VALUE_PREFIX
+# define PRIdVALUE PRIdPTR
+# define PRIoVALUE PRIoPTR
+# define PRIuVALUE PRIuPTR
+# define PRIxVALUE PRIxPTR
+# define PRIXVALUE PRIXPTR
+# define PRIsVALUE PRIiPTR"" RUBY_PRI_VALUE_MARK
+#else
+# define PRIdVALUE PRI_VALUE_PREFIX"d"
+# define PRIoVALUE PRI_VALUE_PREFIX"o"
+# define PRIuVALUE PRI_VALUE_PREFIX"u"
+# define PRIxVALUE PRI_VALUE_PREFIX"x"
+# define PRIXVALUE PRI_VALUE_PREFIX"X"
+# define PRIsVALUE PRI_VALUE_PREFIX"i" RUBY_PRI_VALUE_MARK
+#endif
+
+#ifndef PRI_VALUE_PREFIX
+# define PRI_VALUE_PREFIX ""
+#endif
+
+#ifdef PRI_TIMET_PREFIX
+# /* Take that. */
+#elif SIZEOF_TIME_T == SIZEOF_INT
+# define PRI_TIMET_PREFIX
+#elif SIZEOF_TIME_T == SIZEOF_LONG
+# define PRI_TIMET_PREFIX "l"
+#elif SIZEOF_TIME_T == SIZEOF_LONG_LONG
+# define PRI_TIMET_PREFIX PRI_LL_PREFIX
+#endif
+
+#ifdef PRI_PTRDIFF_PREFIX
+# /* Take that. */
+#elif 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 PRI_LL_PREFIX
+#endif
+
+#ifndef PRIdPTRDIFF
+# 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"
+#endif
+
+#ifdef PRI_SIZE_PREFIX
+# /* Take that. */
+#elif 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 PRI_LL_PREFIX
+#endif
+
+#ifndef PRIdSIZE
+# 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"
+#endif
+
+#endif /* RUBY_BACKWARD2_INTTYPES_H */
diff --git a/include/ruby/backward/2/limits.h b/include/ruby/backward/2/limits.h
new file mode 100644
index 0000000000..e38009b01a
--- /dev/null
+++ b/include/ruby/backward/2/limits.h
@@ -0,0 +1,100 @@
+#ifndef RUBY_BACKWARD2_LIMITS_H                      /*-*-C++-*-vi:se ft=cpp:*/
+#define RUBY_BACKWARD2_LIMITS_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Historical shim for `<limits.h>`.
+ *
+ * The macros in this header file are obsolescent.  Does anyone really need our
+ * own definition of #CHAR_BIT today?
+ */
+#include "ruby/internal/config.h"
+
+#ifdef HAVE_LIMITS_H
+# include <limits.h>
+#endif
+
+#include "ruby/backward/2/long_long.h"
+
+#ifndef LONG_MAX
+# /* assuming 32bit(2's complement) long */
+# define LONG_MAX 2147483647L
+#endif
+
+#ifndef LONG_MIN
+# define LONG_MIN (-LONG_MAX-1)
+#endif
+
+#ifndef CHAR_BIT
+# define CHAR_BIT 8
+#endif
+
+#ifdef LLONG_MAX
+# /* Take that. */
+#elif defined(LONG_LONG_MAX)
+# define LLONG_MAX  LONG_LONG_MAX
+#elif defined(_I64_MAX)
+# define LLONG_MAX _I64_MAX
+#else
+# /* assuming 64bit(2's complement) long long */
+# define LLONG_MAX 9223372036854775807LL
+#endif
+
+#ifdef LLONG_MIN
+# /* Take that. */
+#elif defined(LONG_LONG_MIN)
+# define LLONG_MIN  LONG_LONG_MIN
+#elif defined(_I64_MAX)
+# define LLONG_MIN _I64_MIN
+#else
+# define LLONG_MIN (-LLONG_MAX-1)
+#endif
+
+#ifdef SIZE_MAX
+# /* Take that. */
+#elif SIZEOF_SIZE_T == SIZEOF_LONG_LONG
+# define SIZE_MAX ULLONG_MAX
+# define SIZE_MIN ULLONG_MIN
+#elif SIZEOF_SIZE_T == SIZEOF_LONG
+# define SIZE_MAX ULONG_MAX
+# define SIZE_MIN ULONG_MIN
+#elif SIZEOF_SIZE_T == SIZEOF_INT
+# define SIZE_MAX UINT_MAX
+# define SIZE_MIN UINT_MIN
+#else
+# define SIZE_MAX USHRT_MAX
+# define SIZE_MIN USHRT_MIN
+#endif
+
+#ifdef SSIZE_MAX
+# /* Take that. */
+#elif SIZEOF_SIZE_T == SIZEOF_LONG_LONG
+# define SSIZE_MAX LLONG_MAX
+# define SSIZE_MIN LLONG_MIN
+#elif SIZEOF_SIZE_T == SIZEOF_LONG
+# define SSIZE_MAX LONG_MAX
+# define SSIZE_MIN LONG_MIN
+#elif SIZEOF_SIZE_T == SIZEOF_INT
+# define SSIZE_MAX INT_MAX
+# define SSIZE_MIN INT_MIN
+#else
+# define SSIZE_MAX SHRT_MAX
+# define SSIZE_MIN SHRT_MIN
+#endif
+
+#endif /* RUBY_BACKWARD2_LIMITS_H */
diff --git a/include/ruby/backward/2/long_long.h b/include/ruby/backward/2/long_long.h
new file mode 100644
index 0000000000..83eabb459c
--- /dev/null
+++ b/include/ruby/backward/2/long_long.h
@@ -0,0 +1,65 @@
+#ifndef RUBY_BACKWARD2_LONG_LONG_H                   /*-*-C++-*-vi:se ft=cpp:*/
+#define RUBY_BACKWARD2_LONG_LONG_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines old #LONG_LONG
+ *
+ * No  known  compiler   that  can  compile  today's  ruby   lacks  long  long.
+ * Historically MSVC was  one of such compiler, but it  implemented long long a
+ * while  ago  (some  time  back  in  2013).   The  macros  are  for  backwards
+ * compatibility only.
+ */
+#include "ruby/internal/config.h"
+#include "ruby/internal/has/warning.h"
+#include "ruby/internal/warning_push.h"
+
+#if RBIMPL_HAS_WARNING("-Wc++11-long-long")
+# define HAVE_TRUE_LONG_LONG 1
+# define LONG_LONG                           \
+    RBIMPL_WARNING_PUSH()                     \
+    RBIMPL_WARNING_IGNORED(-Wc++11-long-long) \
+    long long                                \
+    RBIMPL_WARNING_POP()
+
+#elif RBIMPL_HAS_WARNING("-Wlong-long")
+# define HAVE_TRUE_LONG_LONG 1
+# define LONG_LONG                     \
+    RBIMPL_WARNING_PUSH()               \
+    RBIMPL_WARNING_IGNORED(-Wlong-long) \
+    long long                          \
+    RBIMPL_WARNING_POP()
+
+#elif defined(HAVE_LONG_LONG)
+# define HAVE_TRUE_LONG_LONG 1
+# 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
+
+#else
+# error Hello!  Ruby developers believe this message must not happen.
+# error If you encounter this message, can you file a bug report?
+# error Remember to attach a detailed description of your environment.
+# error Thank you!
+#endif
+
+#endif /* RBIMPL_BACKWARD2_LONG_LONG_H */
diff --git a/include/ruby/backward/2/r_cast.h b/include/ruby/backward/2/r_cast.h
new file mode 100644
index 0000000000..4600699a9e
--- /dev/null
+++ b/include/ruby/backward/2/r_cast.h
@@ -0,0 +1,33 @@
+#ifndef RUBY_BACKWARD2_R_CAST_H                      /*-*-C++-*-vi:se ft=cpp:*/
+#define RUBY_BACKWARD2_R_CAST_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines old #R_CAST
+ *
+ * Nobody is actively using this macro.
+ */
+#define R_CAST(st)   (struct st*)
+#define RMOVED(obj)  (R_CAST(RMoved)(obj))
+
+#if defined(__GNUC__)
+# warning R_CAST and RMOVED are deprecated
+#elif defined(_MSC_VER)
+# pragma message("warning: R_CAST and RMOVED are deprecated")
+#endif
+#endif /* RUBY_BACKWARD2_R_CAST_H */
diff --git a/include/ruby/backward/2/rmodule.h b/include/ruby/backward/2/rmodule.h
new file mode 100644
index 0000000000..a3e2d39f35
--- /dev/null
+++ b/include/ruby/backward/2/rmodule.h
@@ -0,0 +1,37 @@
+#ifndef RUBY_BACKWARD2_RMODULE_H                     /*-*-C++-*-vi:se ft=cpp:*/
+#define RUBY_BACKWARD2_RMODULE_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Orphan macros.
+ *
+ * These macros  seems broken since at  least 2011. Nobody (except  ruby itself
+ * who is implementing the internals) could have used those macros for a while.
+ * Kept public as-is here to keep some theoretical backwards compatibility.
+ */
+#define RMODULE_IV_TBL(m) RCLASS_IV_TBL(m)
+#define RMODULE_CONST_TBL(m) RCLASS_CONST_TBL(m)
+#define RMODULE_M_TBL(m) RCLASS_M_TBL(m)
+#define RMODULE_SUPER(m) RCLASS_SUPER(m)
+
+#if defined(__GNUC__)
+# warning RMODULE_* macros are deprecated
+#elif defined(_MSC_VER)
+# pragma message("warning: RMODULE_* macros are deprecated")
+#endif
+#endif /* RUBY_BACKWARD2_RMODULE_H */
diff --git a/include/ruby/backward/2/stdalign.h b/include/ruby/backward/2/stdalign.h
new file mode 100644
index 0000000000..2d3c333bde
--- /dev/null
+++ b/include/ruby/backward/2/stdalign.h
@@ -0,0 +1,30 @@
+#ifndef RUBY_BACKWARD2_STDALIGN_H                    /*-*-C++-*-vi:se ft=cpp:*/
+#define RUBY_BACKWARD2_STDALIGN_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RUBY_ALIGNAS / #RUBY_ALIGNOF
+ */
+#include "ruby/internal/stdalign.h"
+
+#undef RUBY_ALIGNAS
+#undef RUBY_ALIGNOF
+#define RUBY_ALIGNAS RBIMPL_ALIGNAS
+#define RUBY_ALIGNOF RBIMPL_ALIGNOF
+
+#endif /* RUBY_BACKWARD2_STDALIGN_H */
diff --git a/include/ruby/backward/2/stdarg.h b/include/ruby/backward/2/stdarg.h
new file mode 100644
index 0000000000..c2a9ca1e2f
--- /dev/null
+++ b/include/ruby/backward/2/stdarg.h
@@ -0,0 +1,47 @@
+#ifndef RUBY_BACKWARD2_STDARG_H                      /*-*-C++-*-vi:se ft=cpp:*/
+#define RUBY_BACKWARD2_STDARG_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines old #_
+ *
+ * Nobody should  ever use these  macros any  longer.  No konwn  compilers lack
+ * prototypes today.  It's 21st century.  Just forget them.
+ */
+
+#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
+
+#endif /* RUBY_BACKWARD2_STDARG_H */
diff --git a/include/ruby/backward/classext.h b/include/ruby/backward/classext.h
deleted file mode 100644
index 9d5747316a..0000000000
--- a/include/ruby/backward/classext.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#if   defined __GNUC__
-#warning use of RClass internals is deprecated
-#elif defined _MSC_VER
-#pragma message("warning: use of RClass internals is deprecated")
-#endif
-
-#ifndef RUBY_BACKWARD_CLASSEXT_H
-#define RUBY_BACKWARD_CLASSEXT_H 1
-
-typedef struct rb_deprecated_classext_struct {
-    VALUE super;
-} rb_deprecated_classext_t;
-
-#undef RCLASS_SUPER(c)
-#define RCLASS_EXT(c) ((rb_deprecated_classext_t *)RCLASS(c)->ptr)
-#define RCLASS_SUPER(c) (RCLASS(c)->super)
-
-#endif	/* RUBY_BACKWARD_CLASSEXT_H */
diff --git a/include/ruby/backward/cxxanyargs.hpp b/include/ruby/backward/cxxanyargs.hpp
new file mode 100644
index 0000000000..bc5745d850
--- /dev/null
+++ b/include/ruby/backward/cxxanyargs.hpp
@@ -0,0 +1,683 @@
+#ifndef RUBY_BACKWARD_CXXANYARGS_HPP                       //-*-C++-*-vi:ft=cpp
+#define RUBY_BACKWARD_CXXANYARGS_HPP
+/// @file
+/// @author     \@shyouhei
+/// @copyright  This  file  is  a  part   of  the  programming  language  Ruby.
+///             Permission  is hereby  granted, to  either redistribute  and/or
+///             modify this file, provided that the conditions mentioned in the
+///             file COPYING are met.  Consult the file for details.
+/// @note       DO NOT  MODERNIZE THIS FILE!   As the  file name implies  it is
+///             meant to  be a backwards  compatibility shim.  Please  stick to
+///             C++ 98 and never use newer features, like `constexpr`.
+/// @brief      Provides old prototypes for C++ programs.
+#include "ruby/internal/config.h"
+#include "ruby/internal/intern/class.h"
+#include "ruby/internal/intern/cont.h"
+#include "ruby/internal/intern/hash.h"
+#include "ruby/internal/intern/proc.h"
+#include "ruby/internal/intern/thread.h"
+#include "ruby/internal/intern/variable.h"
+#include "ruby/internal/intern/vm.h"
+#include "ruby/internal/iterator.h"
+#include "ruby/internal/method.h"
+#include "ruby/internal/value.h"
+#include "ruby/internal/variable.h"
+#include "ruby/backward/2/stdarg.h"
+#include "ruby/st.h"
+
+extern "C++" {
+
+#ifdef HAVE_NULLPTR
+#include <cstddef>
+#endif
+
+/// @brief  The main namespace.
+/// @note   The name  "ruby" might  already be  taken, but that  must not  be a
+///         problem because namespaces are allowed to reopen.
+namespace ruby {
+
+/// Backwards compatibility layer.
+namespace backward {
+
+/// Provides  ANYARGS deprecation  warnings. In  C, ANYARGS  means there  is no
+/// function prototype.  Literally  anything, even including nothing,  can be a
+/// valid ANYARGS.   So passing a  correctly prototyped function pointer  to an
+/// ANYARGS-ed  function  parameter is  valid,  at  the  same time  passing  an
+/// ANYARGS-ed function pointer to a  granular typed function parameter is also
+/// valid.  However on the other hand in C++, ANYARGS doesn't actually mean any
+/// number of arguments.   C++'s ANYARGS means _variadic_  number of arguments.
+/// This is incompatible with ordinal, correct function prototypes.
+///
+/// Luckily, function  prototypes being distinct  each other means they  can be
+/// overloaded.  We can provide a compatibility layer for older Ruby APIs which
+/// used to have ANYARGS.  This namespace includes such attempts.
+namespace cxxanyargs {
+
+typedef VALUE type(ANYARGS);      ///< ANYARGS-ed function type.
+typedef void void_type(ANYARGS);  ///< ANYARGS-ed function type, void variant.
+typedef int int_type(ANYARGS);    ///< ANYARGS-ed function type, int variant.
+typedef VALUE onearg_type(VALUE); ///< Single-argumented function type.
+
+/// @name Hooking global variables
+/// @{
+
+RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated")
+/// @brief       Define a function-backended global variable.
+/// @param[in]   q  Name of the variable.
+/// @param[in]   w  Getter function.
+/// @param[in]   e  Setter function.
+/// @note        Both functions can be nullptr.
+/// @see         rb_define_hooked_variable()
+/// @deprecated  Use glanular typed overload instead.
+inline void
+rb_define_virtual_variable(const char *q, type *w, void_type *e)
+{
+    rb_gvar_getter_t *r = reinterpret_cast<rb_gvar_getter_t*>(w);
+    rb_gvar_setter_t *t = reinterpret_cast<rb_gvar_setter_t*>(e);
+    ::rb_define_virtual_variable(q, r, t);
+}
+
+RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated")
+inline void
+rb_define_virtual_variable(const char *q, rb_gvar_getter_t *w, void_type *e)
+{
+    rb_gvar_setter_t *t = reinterpret_cast<rb_gvar_setter_t*>(e);
+    ::rb_define_virtual_variable(q, w, t);
+}
+
+RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated")
+inline void
+rb_define_virtual_variable(const char *q, type *w, rb_gvar_setter_t *e)
+{
+    rb_gvar_getter_t *r = reinterpret_cast<rb_gvar_getter_t*>(w);
+    ::rb_define_virtual_variable(q, r, e);
+}
+
+#ifdef HAVE_NULLPTR
+inline void
+rb_define_virtual_variable(const char *q, rb_gvar_getter_t *w, std::nullptr_t e)
+{
+    ::rb_define_virtual_variable(q, w, e);
+}
+
+RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated")
+inline void
+rb_define_virtual_variable(const char *q, type *w, std::nullptr_t e)
+{
+    rb_gvar_getter_t *r = reinterpret_cast<rb_gvar_getter_t *>(w);
+    ::rb_define_virtual_variable(q, r, e);
+}
+
+inline void
+rb_define_virtual_variable(const char *q, std::nullptr_t w, rb_gvar_setter_t *e)
+{
+    ::rb_define_virtual_variable(q, w, e);
+}
+
+RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated")
+inline void
+rb_define_virtual_variable(const char *q, std::nullptr_t w, void_type *e)
+{
+    rb_gvar_setter_t *r = reinterpret_cast<rb_gvar_setter_t *>(e);
+    ::rb_define_virtual_variable(q, w, r);
+}
+#endif
+
+RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated")
+/// @brief       Define a function-backended global variable.
+/// @param[in]   q  Name of the variable.
+/// @param[in]   w  Variable storage.
+/// @param[in]   e  Getter function.
+/// @param[in]   r  Setter function.
+/// @note        Both functions can be nullptr.
+/// @see         rb_define_virtual_variable()
+/// @deprecated  Use glanular typed overload instead.
+inline void
+rb_define_hooked_variable(const char *q, VALUE *w, type *e, void_type *r)
+{
+    rb_gvar_getter_t *t = reinterpret_cast<rb_gvar_getter_t*>(e);
+    rb_gvar_setter_t *y = reinterpret_cast<rb_gvar_setter_t*>(r);
+    ::rb_define_hooked_variable(q, w, t, y);
+}
+
+RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated")
+inline void
+rb_define_hooked_variable(const char *q, VALUE *w, rb_gvar_getter_t *e, void_type *r)
+{
+    rb_gvar_setter_t *y = reinterpret_cast<rb_gvar_setter_t*>(r);
+    ::rb_define_hooked_variable(q, w, e, y);
+}
+
+RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated")
+inline void
+rb_define_hooked_variable(const char *q, VALUE *w, type *e, rb_gvar_setter_t *r)
+{
+    rb_gvar_getter_t *t = reinterpret_cast<rb_gvar_getter_t*>(e);
+    ::rb_define_hooked_variable(q, w, t, r);
+}
+
+#ifdef HAVE_NULLPTR
+inline void
+rb_define_hooked_variable(const char *q, VALUE *w, rb_gvar_getter_t *e, std::nullptr_t r)
+{
+    ::rb_define_hooked_variable(q, w, e, r);
+}
+
+RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated")
+inline void
+rb_define_hooked_variable(const char *q, VALUE *w, type *e, std::nullptr_t r)
+{
+    rb_gvar_getter_t *y = reinterpret_cast<rb_gvar_getter_t *>(e);
+    ::rb_define_hooked_variable(q, w, y, r);
+}
+
+inline void
+rb_define_hooked_variable(const char *q, VALUE *w, std::nullptr_t e, rb_gvar_setter_t *r)
+{
+    ::rb_define_hooked_variable(q, w, e, r);
+}
+
+RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated")
+inline void
+rb_define_hooked_variable(const char *q, VALUE *w, std::nullptr_t e, void_type *r)
+{
+    rb_gvar_setter_t *y = reinterpret_cast<rb_gvar_setter_t *>(r);
+    ::rb_define_hooked_variable(q, w, e, y);
+}
+#endif
+
+/// @}
+/// @name Exceptions and tag jumps
+/// @{
+
+RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated")
+/// @brief       Old way to implement iterators.
+/// @param[in]   q  A function that can yield.
+/// @param[in]   w  Passed to `q`.
+/// @param[in]   e  What is to be yielded.
+/// @param[in]   r  Passed to `e`.
+/// @return      The return value of `q`.
+/// @note        `e` can be nullptr.
+/// @deprecated  This function is obsolated since  long before 2.x era.  Do not
+///              use it any longer.  rb_block_call() is provided instead.
+inline VALUE
+rb_iterate(onearg_type *q, VALUE w, type *e, VALUE r)
+{
+    rb_block_call_func_t t = reinterpret_cast<rb_block_call_func_t>(e);
+    return ::rb_iterate(q, w, t, r);
+}
+
+#ifdef HAVE_NULLPTR
+inline VALUE
+rb_iterate(onearg_type *q, VALUE w, std::nullptr_t e, VALUE r)
+{
+    return ::rb_iterate(q, w, e, r);
+}
+#endif
+
+RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated")
+/// @brief       Call a method with a block.
+/// @param[in]   q  The self.
+/// @param[in]   w  The method.
+/// @param[in]   e  The # of elems of `r`
+/// @param[in]   r  The arguments.
+/// @param[in]   t  What is to be yielded.
+/// @param[in]   y  Passed to `t`
+/// @return      Return value of `q#w(*r,&t)`
+/// @note        't' can be nullptr.
+/// @deprecated  Use glanular typed overload instead.
+inline VALUE
+rb_block_call(VALUE q, ID w, int e, const VALUE *r, type *t, VALUE y)
+{
+    rb_block_call_func_t u = reinterpret_cast<rb_block_call_func_t>(t);
+    return ::rb_block_call(q, w, e, r, u, y);
+}
+
+#ifdef HAVE_NULLPTR
+inline VALUE
+rb_block_call(VALUE q, ID w, int e, const VALUE *r, std::nullptr_t t, VALUE y)
+{
+    return ::rb_block_call(q, w, e, r, t, y);
+}
+#endif
+
+RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated")
+/// @brief       An equivalent of `rescue` clause.
+/// @param[in]   q  A function that can raise.
+/// @param[in]   w  Passed to `q`.
+/// @param[in]   e  A function that cleans-up.
+/// @param[in]   r  Passed to `e`.
+/// @return      The return value of `q` if  no exception occurs, or the return
+///              value of `e` if otherwise.
+/// @note        `e` can be nullptr.
+/// @see         rb_ensure()
+/// @see         rb_rescue2()
+/// @see         rb_protect()
+/// @deprecated  Use glanular typed overload instead.
+inline VALUE
+rb_rescue(type *q, VALUE w, type *e, VALUE r)
+{
+    typedef VALUE func1_t(VALUE);
+    typedef VALUE func2_t(VALUE, VALUE);
+    func1_t *t = reinterpret_cast<func1_t*>(q);
+    func2_t *y = reinterpret_cast<func2_t*>(e);
+    return ::rb_rescue(t, w, y, r);
+}
+
+RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated")
+/// @brief       An equivalent of `rescue` clause.
+/// @param[in]   q    A function that can raise.
+/// @param[in]   w    Passed to `q`.
+/// @param[in]   e    A function that cleans-up.
+/// @param[in]   r    Passed to `e`.
+/// @param[in]   ...  0-terminated list of subclass of @ref rb_eException.
+/// @return      The return value of `q` if  no exception occurs, or the return
+///              value of `e` if otherwise.
+/// @note        `e` can be nullptr.
+/// @see         rb_ensure()
+/// @see         rb_rescue()
+/// @see         rb_protect()
+/// @deprecated  Use glanular typed overload instead.
+inline VALUE
+rb_rescue2(type *q, VALUE w, type *e, VALUE r, ...)
+{
+    typedef VALUE func1_t(VALUE);
+    typedef VALUE func2_t(VALUE, VALUE);
+    func1_t *t = reinterpret_cast<func1_t*>(q);
+    func2_t *y = reinterpret_cast<func2_t*>(e);
+    va_list ap;
+    va_start(ap, r);
+    VALUE ret = ::rb_vrescue2(t, w, y, r, ap);
+    va_end(ap);
+    return ret;
+}
+
+RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated")
+/// @brief       An equivalent of `ensure` clause.
+/// @param[in]   q  A function that can raise.
+/// @param[in]   w  Passed to `q`.
+/// @param[in]   e  A function that ensures.
+/// @param[in]   r  Passed to `e`.
+/// @return      The return value of `q`.
+/// @note        It makes no sense to pass nullptr to `e`.
+/// @see         rb_rescue()
+/// @see         rb_rescue2()
+/// @see         rb_protect()
+/// @deprecated  Use glanular typed overload instead.
+inline VALUE
+rb_ensure(type *q, VALUE w, type *e, VALUE r)
+{
+    typedef VALUE func1_t(VALUE);
+    func1_t *t = reinterpret_cast<func1_t*>(q);
+    func1_t *y = reinterpret_cast<func1_t*>(e);
+    return ::rb_ensure(t, w, y, r);
+}
+
+RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated")
+/// @brief       An equivalent of `Kernel#catch`.
+/// @param[in]   q  The "tag" string.
+/// @param[in]   w  A function that can throw.
+/// @param[in]   e  Passed to `w`.
+/// @return      What was thrown.
+/// @note        `q` can be a nullptr but makes no sense to pass nullptr to`w`.
+/// @see         rb_block_call()
+/// @see         rb_protect()
+/// @see         rb_rb_catch_obj()
+/// @see         rb_rescue()
+/// @deprecated  Use glanular typed overload instead.
+inline VALUE
+rb_catch(const char *q, type *w, VALUE e)
+{
+    rb_block_call_func_t r = reinterpret_cast<rb_block_call_func_t>(w);
+    return ::rb_catch(q, r, e);
+}
+
+#ifdef HAVE_NULLPTR
+inline VALUE
+rb_catch(const char *q, std::nullptr_t w, VALUE e)
+{
+    return ::rb_catch(q, w, e);
+}
+#endif
+
+RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated")
+/// @brief       An equivalent of `Kernel#catch`.
+/// @param[in]   q  The "tag" object.
+/// @param[in]   w  A function that can throw.
+/// @param[in]   e  Passed to `w`.
+/// @return      What was thrown.
+/// @note        It makes no sense to pass nullptr to`w`.
+/// @see         rb_block_call()
+/// @see         rb_protect()
+/// @see         rb_rb_catch_obj()
+/// @see         rb_rescue()
+/// @deprecated  Use glanular typed overload instead.
+inline VALUE
+rb_catch_obj(VALUE q, type *w, VALUE e)
+{
+    rb_block_call_func_t r = reinterpret_cast<rb_block_call_func_t>(w);
+    return ::rb_catch_obj(q, r, e);
+}
+
+/// @}
+/// @name Procs, Fibers and Threads
+/// @{
+
+RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated")
+/// @brief       Creates a @ref rb_cFiber instance.
+/// @param[in]   q  The fiber body.
+/// @param[in]   w  Passed to `q`.
+/// @return      What was allocated.
+/// @note        It makes no sense to pass nullptr to`q`.
+/// @see         rb_proc_new()
+/// @see         rb_thread_creatr()
+/// @deprecated  Use glanular typed overload instead.
+inline VALUE
+rb_fiber_new(type *q, VALUE w)
+{
+    rb_block_call_func_t e = reinterpret_cast<rb_block_call_func_t>(q);
+    return ::rb_fiber_new(e, w);
+}
+
+RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated")
+/// @brief       Creates a @ref rb_cProc instance.
+/// @param[in]   q  The proc body.
+/// @param[in]   w  Passed to `q`.
+/// @return      What was allocated.
+/// @note        It makes no sense to pass nullptr to`q`.
+/// @see         rb_fiber_new()
+/// @see         rb_thread_creatr()
+/// @deprecated  Use glanular typed overload instead.
+inline VALUE
+rb_proc_new(type *q, VALUE w)
+{
+    rb_block_call_func_t e = reinterpret_cast<rb_block_call_func_t>(q);
+    return ::rb_proc_new(e, w);
+}
+
+RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated")
+/// @brief       Creates a @ref rb_cThread instance.
+/// @param[in]   q  The thread body.
+/// @param[in]   w  Passed to `q`.
+/// @return      What was allocated.
+/// @note        It makes no sense to pass nullptr to`q`.
+/// @see         rb_proc_new()
+/// @see         rb_fiber_new()
+/// @deprecated  Use glanular typed overload instead.
+inline VALUE
+rb_thread_create(type *q, void *w)
+{
+    typedef VALUE ptr_t(void*);
+    ptr_t *e = reinterpret_cast<ptr_t*>(q);
+    return ::rb_thread_create(e, w);
+}
+
+/// @}
+/// @name Hash and st_table
+/// @{
+
+RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated")
+/// @brief       Iteration over the given table.
+/// @param[in]   q  A table to scan.
+/// @param[in]   w  A function to iterate.
+/// @param[in]   e  Passed to `w`.
+/// @retval      0  Always returns 0.
+/// @note        It makes no sense to pass nullptr to`w`.
+/// @see         st_foreach_check()
+/// @see         rb_hash_foreach()
+/// @deprecated  Use glanular typed overload instead.
+inline int
+st_foreach(st_table *q, int_type *w, st_data_t e)
+{
+    st_foreach_callback_func *r =
+        reinterpret_cast<st_foreach_callback_func*>(w);
+    return ::st_foreach(q, r, e);
+}
+
+RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated")
+/// @brief       Iteration over the given table.
+/// @param[in]   q  A table to scan.
+/// @param[in]   w  A function to iterate.
+/// @param[in]   e  Passed to `w`.
+/// @retval      0  Successful end of iteration.
+/// @retval      1  Element removed during traversing.
+/// @note        It makes no sense to pass nullptr to`w`.
+/// @see         st_foreach()
+/// @deprecated  Use glanular typed overload instead.
+inline int
+st_foreach_check(st_table *q, int_type *w, st_data_t e, st_data_t)
+{
+    st_foreach_check_callback_func *t =
+        reinterpret_cast<st_foreach_check_callback_func*>(w);
+    return ::st_foreach_check(q, t, e, 0);
+}
+
+RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated")
+/// @brief       Iteration over the given table.
+/// @param[in]   q  A table to scan.
+/// @param[in]   w  A function to iterate.
+/// @param[in]   e  Passed to `w`.
+/// @note        It makes no sense to pass nullptr to`w`.
+/// @see         st_foreach_check()
+/// @deprecated  Use glanular typed overload instead.
+inline void
+st_foreach_safe(st_table *q, int_type *w, st_data_t e)
+{
+    st_foreach_callback_func *r =
+        reinterpret_cast<st_foreach_callback_func*>(w);
+    ::st_foreach_safe(q, r, e);
+}
+
+RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated")
+/// @brief       Iteration over the given hash.
+/// @param[in]   q  A hash to scan.
+/// @param[in]   w  A function to iterate.
+/// @param[in]   e  Passed to `w`.
+/// @note        It makes no sense to pass nullptr to`w`.
+/// @see         st_foreach()
+/// @deprecated  Use glanular typed overload instead.
+inline void
+rb_hash_foreach(VALUE q, int_type *w, VALUE e)
+{
+    st_foreach_callback_func *r =
+        reinterpret_cast<st_foreach_callback_func*>(w);
+    ::rb_hash_foreach(q, r, e);
+}
+
+RUBY_CXX_DEPRECATED("Use of ANYARGS in this function is deprecated")
+/// @brief       Iteration over each instance variable of the object.
+/// @param[in]   q  An object.
+/// @param[in]   w  A function to iterate.
+/// @param[in]   e  Passed to `w`.
+/// @note        It makes no sense to pass nullptr to`w`.
+/// @see         st_foreach()
+/// @deprecated  Use glanular typed overload instead.
+inline void
+rb_ivar_foreach(VALUE q, int_type *w, VALUE e)
+{
+    st_foreach_callback_func *r =
+        reinterpret_cast<st_foreach_callback_func*>(w);
+    ::rb_ivar_foreach(q, r, e);
+}
+
+/// @}
+
+/// Driver for *_define_method.  ::rb_define_method function for instance takes
+/// a  pointer to  ANYARGS-ed  functions,  which in  fact  varies 18  different
+/// prototypes.  We  still need to  preserve ANYARGS  for storages but  why not
+/// check  the consistencies  if  possible.   In C++  a  function  has its  own
+/// prototype, which  is a compile-time  constant (static type) by  nature.  We
+/// can list  up all the  possible input types  and provide warnings  for other
+/// cases.  This is such attempt.
+namespace define_method {
+
+/// Type of ::rb_f_notimplement().
+typedef VALUE notimpl_type(int, const VALUE *, VALUE, VALUE);
+
+/// @brief   Template metaprogramming to generate function prototypes.
+/// @tparam  T  Type of method id (`ID` or `const char*` in practice).
+/// @tparam  F  Definition driver e.g. ::rb_define_method.
+template<typename T, void (*F)(VALUE klass, T mid, type *func, int arity)>
+struct driver {
+
+    /// @brief      Defines a method
+    /// @tparam     N  Arity of the function.
+    /// @tparam     U  The function in question
+    template<int N, typename U>
+    struct engine {
+
+        /* :TODO: Following deprecation attribute renders tons of warnings (one
+         * per  every  method  definitions),  which  is  annoying.   Of  course
+         * annoyance is the  core feature of deprecation  warnings...  But that
+         * could be  too much,  especially when the  warnings happen  inside of
+         * machine-generated programs.   And SWIG  is known  to do  such thing.
+         * The new  (granular) API was  introduced in  API version 2.7.   As of
+         * this writing the  version is 2.8.  Let's warn this  later, some time
+         * during 3.x.   Hopefully codes in  old (ANYARGS-ed) format  should be
+         * less than now. */
+#if (RUBY_API_VERSION_MAJOR * 100 + RUBY_API_VERSION_MINOR) >= 301
+        RUBY_CXX_DEPRECATED("use of ANYARGS is deprecated")
+#endif
+        /// @copydoc define(VALUE klass, T mid, U func)
+        /// @deprecated  Pass corrctly typed function instead.
+        static inline void
+        define(VALUE klass, T mid, type func)
+        {
+            F(klass, mid, func, N);
+        }
+
+        /// @brief      Defines klass#mid as func, whose arity is N.
+        /// @param[in]  klass  Where the method lives.
+        /// @param[in]  mid    Name of the method to define.
+        /// @param[in]  func   Function that implements klass#mid.
+        static inline void
+        define(VALUE klass, T mid, U func)
+        {
+            F(klass, mid, reinterpret_cast<type *>(func), N);
+        }
+
+        /// @copydoc define(VALUE klass, T mid, U func)
+        static inline void
+        define(VALUE klass, T mid, notimpl_type func)
+        {
+            F(klass, mid, reinterpret_cast<type *>(func), N);
+        }
+    };
+
+    /// @cond INTERNAL_MACRO
+    template<int N, bool = false> struct specific : public engine<N, type *> {};
+    template<bool b> struct specific<15, b> : public engine<15, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {};
+    template<bool b> struct specific<14, b> : public engine<14, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {};
+    template<bool b> struct specific<13, b> : public engine<13, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {};
+    template<bool b> struct specific<12, b> : public engine<12, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {};
+    template<bool b> struct specific<11, b> : public engine<11, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {};
+    template<bool b> struct specific<10, b> : public engine<10, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {};
+    template<bool b> struct specific< 9, b> : public engine< 9, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {};
+    template<bool b> struct specific< 8, b> : public engine< 8, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {};
+    template<bool b> struct specific< 7, b> : public engine< 7, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {};
+    template<bool b> struct specific< 6, b> : public engine< 6, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {};
+    template<bool b> struct specific< 5, b> : public engine< 5, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {};
+    template<bool b> struct specific< 4, b> : public engine< 4, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE)> {};
+    template<bool b> struct specific< 3, b> : public engine< 3, VALUE(*)(VALUE, VALUE, VALUE, VALUE)> {};
+    template<bool b> struct specific< 2, b> : public engine< 2, VALUE(*)(VALUE, VALUE, VALUE)> {};
+    template<bool b> struct specific< 1, b> : public engine< 1, VALUE(*)(VALUE, VALUE)> {};
+    template<bool b> struct specific< 0, b> : public engine< 0, VALUE(*)(VALUE)> {};
+    template<bool b> struct specific<-1, b> : public engine<-1, VALUE(*)(int argc, VALUE *argv, VALUE self)> {
+        using engine<-1, VALUE(*)(int argc, VALUE *argv, VALUE self)>::define;
+        static inline void define(VALUE c, T m, VALUE(*f)(int argc, const VALUE *argv, VALUE self)) { F(c, m, reinterpret_cast<type *>(f), -1); }
+    };
+    template<bool b> struct specific<-2, b> : public engine<-2, VALUE(*)(VALUE, VALUE)> {};
+    /// @endcond
+};
+
+/* We could perhaps merge this struct into the one above using variadic
+ * template parameters if we could assume C++11, but sadly we cannot. */
+template<typename T, void (*F)(T mid, type func, int arity)>
+struct driver0 {
+    template<int N, typename U>
+    struct engine {
+        RUBY_CXX_DEPRECATED("use of ANYARGS is deprecated")
+        static inline void
+        define(T mid, type func)
+        {
+            F(mid, func, N);
+        }
+        static inline void
+        define(T mid, U func)
+        {
+            F(mid, reinterpret_cast<type *>(func), N);
+        }
+        static inline void
+        define(T mid, notimpl_type func)
+        {
+            F(mid, reinterpret_cast<type *>(func), N);
+        }
+    };
+    /// @cond INTERNAL_MACRO
+    template<int N, bool = false> struct specific : public engine<N, type *> {};
+    template<bool b> struct specific<15, b> : public engine<15, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {};
+    template<bool b> struct specific<14, b> : public engine<14, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {};
+    template<bool b> struct specific<13, b> : public engine<13, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {};
+    template<bool b> struct specific<12, b> : public engine<12, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {};
+    template<bool b> struct specific<11, b> : public engine<11, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {};
+    template<bool b> struct specific<10, b> : public engine<10, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {};
+    template<bool b> struct specific< 9, b> : public engine< 9, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {};
+    template<bool b> struct specific< 8, b> : public engine< 8, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {};
+    template<bool b> struct specific< 7, b> : public engine< 7, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {};
+    template<bool b> struct specific< 6, b> : public engine< 6, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {};
+    template<bool b> struct specific< 5, b> : public engine< 5, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE)> {};
+    template<bool b> struct specific< 4, b> : public engine< 4, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE)> {};
+    template<bool b> struct specific< 3, b> : public engine< 3, VALUE(*)(VALUE, VALUE, VALUE, VALUE)> {};
+    template<bool b> struct specific< 2, b> : public engine< 2, VALUE(*)(VALUE, VALUE, VALUE)> {};
+    template<bool b> struct specific< 1, b> : public engine< 1, VALUE(*)(VALUE, VALUE)> {};
+    template<bool b> struct specific< 0, b> : public engine< 0, VALUE(*)(VALUE)> {};
+    template<bool b> struct specific<-1, b> : public engine<-1, VALUE(*)(int argc, VALUE *argv, VALUE self)> {
+        using engine<-1, VALUE(*)(int argc, VALUE *argv, VALUE self)>::define;
+        static inline void define(T m, VALUE(*f)(int argc, const VALUE *argv, VALUE self)) { F(m, reinterpret_cast<type *>(f), -1); }
+    };
+    template<bool b> struct specific<-2, b> : public engine<-2, VALUE(*)(VALUE, VALUE)> {};
+    /// @endcond
+};
+
+struct rb_define_method           : public driver <const char *, ::rb_define_method> {};           ///< Dispatches appropriate driver for ::rb_define_method.
+struct rb_define_method_id        : public driver <ID,           ::rb_define_method_id> {};        ///< Dispatches appropriate driver for ::rb_define_method_id.
+struct rb_define_private_method   : public driver <const char *, ::rb_define_private_method> {};   ///< Dispatches appropriate driver for ::rb_define_private_method.
+struct rb_define_protected_method : public driver <const char *, ::rb_define_protected_method> {}; ///< Dispatches appropriate driver for ::rb_define_protected_method.
+struct rb_define_singleton_method : public driver <const char *, ::rb_define_singleton_method> {}; ///< Dispatches appropriate driver for ::rb_define_singleton_method.
+struct rb_define_module_function  : public driver <const char *, ::rb_define_module_function> {};  ///< Dispatches appropriate driver for ::rb_define_module_function.
+struct rb_define_global_function  : public driver0<const char *, ::rb_define_global_function> {};  ///< Dispatches appropriate driver for ::rb_define_global_function.
+
+/// @brief        Defines klass\#mid.
+/// @param        klass  Where the method lives.
+/// @copydetails  #rb_define_global_function(mid, func, arity)
+#define rb_define_method(klass, mid, func, arity)           ruby::backward::cxxanyargs::define_method::rb_define_method::specific<arity>::define(klass, mid, func)
+
+/// @copydoc #rb_define_method(klass, mid, func, arity)
+#define rb_define_method_id(klass, mid, func, arity)        ruby::backward::cxxanyargs::define_method::rb_define_method_id::specific<arity>::define(klass, mid, func)
+
+/// @brief        Defines klass\#mid and makes it private.
+/// @copydetails  #rb_define_method(klass, mid, func, arity)
+#define rb_define_private_method(klass, mid, func, arity)   ruby::backward::cxxanyargs::define_method::rb_define_private_method::specific<arity>::define(klass, mid, func)
+
+/// @brief        Defines klass\#mid and makes it protected.
+/// @copydetails  #rb_define_method
+#define rb_define_protected_method(klass, mid, func, arity) ruby::backward::cxxanyargs::define_method::rb_define_protected_method::specific<arity>::define(klass, mid, func)
+
+/// @brief        Defines klass.mid.(klass, mid, func, arity)
+/// @copydetails  #rb_define_method
+#define rb_define_singleton_method(klass, mid, func, arity) ruby::backward::cxxanyargs::define_method::rb_define_singleton_method::specific<arity>::define(klass, mid, func)
+
+/// @brief        Defines klass\#mid and makes it a module function.
+/// @copydetails  #rb_define_method(klass, mid, func, arity)
+#define rb_define_module_function(klass, mid, func, arity)  ruby::backward::cxxanyargs::define_method::rb_define_module_function::specific<arity>::define(klass, mid, func)
+
+/// @brief Defines ::rb_mKernel \#mid.
+/// @param mid    Name of the defining method.
+/// @param func   Implementation of \#mid.
+/// @param arity  Arity of \#mid.
+#define rb_define_global_function(mid, func, arity)         ruby::backward::cxxanyargs::define_method::rb_define_global_function::specific<arity>::define(mid, func)
+
+}}}}}
+
+using namespace ruby::backward::cxxanyargs;
+#endif // RUBY_BACKWARD_CXXANYARGS_HPP
diff --git a/include/ruby/backward/rubyio.h b/include/ruby/backward/rubyio.h
deleted file mode 100644
index a6e3a7c78b..0000000000
--- a/include/ruby/backward/rubyio.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#if   defined __GNUC__
-#warning use "ruby/io.h" instead of "rubyio.h"
-#elif defined _MSC_VER
-#pragma message("warning: use \"ruby/io.h\" instead of \"rubyio.h\"")
-#endif
-#include "ruby/io.h"
diff --git a/include/ruby/backward/rubysig.h b/include/ruby/backward/rubysig.h
deleted file mode 100644
index 58b13cab1c..0000000000
--- a/include/ruby/backward/rubysig.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/**********************************************************************
-
-  rubysig.h -
-
-  $Author$
-  $Date$
-  created at: Wed Aug 16 01:15:38 JST 1995
-
-  Copyright (C) 1993-2008 Yukihiro Matsumoto
-
-**********************************************************************/
-
-#if   defined __GNUC__
-#warning rubysig.h is obsolete
-#elif defined _MSC_VER
-#pragma message("warning: rubysig.h is obsolete")
-#endif
-
-#ifndef RUBYSIG_H
-#define RUBYSIG_H
-#include "ruby/ruby.h"
-
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
-RUBY_SYMBOL_EXPORT_BEGIN
-
-#define RUBY_CRITICAL(statements) do {statements;} while (0)
-#define DEFER_INTS (0)
-#define ENABLE_INTS (1)
-#define ALLOW_INTS do {CHECK_INTS;} while (0)
-#define CHECK_INTS rb_thread_check_ints()
-
-RUBY_SYMBOL_EXPORT_END
-
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-}  /* extern "C" { */
-#endif
-
-#endif
diff --git a/include/ruby/backward/st.h b/include/ruby/backward/st.h
deleted file mode 100644
index 3e36d44cf8..0000000000
--- a/include/ruby/backward/st.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#if   defined __GNUC__
-#warning use "ruby/st.h" instead of bare "st.h"
-#elif defined _MSC_VER
-#pragma message("warning: use \"ruby/st.h\" instead of bare \"st.h\"")
-#endif
-#include "ruby/st.h"
diff --git a/include/ruby/backward/util.h b/include/ruby/backward/util.h
deleted file mode 100644
index 11d32a2da8..0000000000
--- a/include/ruby/backward/util.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#if   defined __GNUC__
-#warning use "ruby/util.h" instead of bare "util.h"
-#elif defined _MSC_VER
-#pragma message("warning: use \"ruby/util.h\" instead of bare \"util.h\"")
-#endif
-#include "ruby/util.h"
diff --git a/include/ruby/debug.h b/include/ruby/debug.h
index 9bfc9b9a83..16891e8458 100644
--- a/include/ruby/debug.h
+++ b/include/ruby/debug.h
@@ -1,25 +1,20 @@
-/**********************************************************************
-
-  ruby/debug.h -
-
-  $Author: ko1 $
-  created at: Tue Nov 20 20:35:08 2012
-
-  Copyright (C) 2012 Yukihiro Matsumoto
-
-**********************************************************************/
-
-#ifndef RB_DEBUG_H
+#ifndef RB_DEBUG_H                                   /*-*-C++-*-vi:se ft=cpp:*/
 #define RB_DEBUG_H 1
-
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
-RUBY_SYMBOL_EXPORT_BEGIN
+/**
+ * @file
+ * @author     $Author: ko1 $
+ * @date       Tue Nov 20 20:35:08 2012
+ * @copyright  Copyright (C) 2012 Yukihiro Matsumoto
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ */
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/event.h"
+#include "ruby/internal/value.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
 
 /* Note: This file contains experimental APIs. */
 /* APIs can be replaced at Ruby 2.0.1 or later */
@@ -75,6 +70,7 @@ VALUE rb_tracearg_event(rb_trace_arg_t *trace_arg);
 VALUE rb_tracearg_lineno(rb_trace_arg_t *trace_arg);
 VALUE rb_tracearg_path(rb_trace_arg_t *trace_arg);
 VALUE rb_tracearg_method_id(rb_trace_arg_t *trace_arg);
+VALUE rb_tracearg_callee_id(rb_trace_arg_t *trace_arg);
 VALUE rb_tracearg_defined_class(rb_trace_arg_t *trace_arg);
 VALUE rb_tracearg_binding(rb_trace_arg_t *trace_arg);
 VALUE rb_tracearg_self(rb_trace_arg_t *trace_arg);
@@ -82,7 +78,11 @@ VALUE rb_tracearg_return_value(rb_trace_arg_t *trace_arg);
 VALUE rb_tracearg_raised_exception(rb_trace_arg_t *trace_arg);
 VALUE rb_tracearg_object(rb_trace_arg_t *trace_arg);
 
-/* Postponed Job API */
+/*
+ * Postponed Job API
+ * rb_postponed_job_register and rb_postponed_job_register_one are
+ * async-signal-safe and used via SIGPROF by the "stackprof" RubyGem
+ */
 typedef void (*rb_postponed_job_func_t)(void *arg);
 int rb_postponed_job_register(unsigned int flags, rb_postponed_job_func_t func, void *data);
 int rb_postponed_job_register_one(unsigned int flags, rb_postponed_job_func_t func, void *data);
@@ -98,13 +98,6 @@ typedef enum {
 void rb_add_event_hook2(rb_event_hook_func_t func, rb_event_flag_t events, VALUE data, rb_event_hook_flag_t hook_flag);
 void rb_thread_add_event_hook2(VALUE thval, rb_event_hook_func_t func, rb_event_flag_t events, VALUE data, rb_event_hook_flag_t hook_flag);
 
-RUBY_SYMBOL_EXPORT_END
-
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-}  /* extern "C" { */
-#endif
+RBIMPL_SYMBOL_EXPORT_END()
 
 #endif /* RUBY_DEBUG_H */
diff --git a/include/ruby/defines.h b/include/ruby/defines.h
index bc0eda29f2..d632a69fc1 100644
--- a/include/ruby/defines.h
+++ b/include/ruby/defines.h
@@ -1,104 +1,28 @@
-/************************************************
-
-  defines.h -
-
-  $Author$
-  created at: Wed May 18 00:21:44 JST 1994
-
-************************************************/
-
-#ifndef RUBY_DEFINES_H
+#ifndef RUBY_DEFINES_H                               /*-*-C++-*-vi:se ft=cpp:*/
 #define RUBY_DEFINES_H 1
+/**
+ * @file
+ * @author     $Author$
+ * @date       Wed May 18 00:21:44 JST 1994
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ */
 
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
-#include "ruby/config.h"
-#ifdef RUBY_EXTCONF_H
-#include RUBY_EXTCONF_H
-#endif
-
-/* function attributes */
-#ifndef CONSTFUNC
-# define CONSTFUNC(x) x
-#endif
-#ifndef PUREFUNC
-# define PUREFUNC(x) x
-#endif
-#define NORETURN_STYLE_NEW 1
-#ifndef NORETURN
-# define NORETURN(x) x
-#endif
-#ifndef DEPRECATED
-# define DEPRECATED(x) x
-#endif
-#ifndef DEPRECATED_BY
-# define DEPRECATED_BY(n,x) DEPRECATED(x)
-#endif
-#ifndef DEPRECATED_TYPE
-# define DEPRECATED_TYPE(mesg, decl) decl
-#endif
-#ifndef NOINLINE
-# define NOINLINE(x) x
-#endif
-#ifndef ERRORFUNC
-# define HAVE_ATTRIBUTE_ERRORFUNC 0
-# define ERRORFUNC(mesg, x) x
-#else
-# define HAVE_ATTRIBUTE_ERRORFUNC 1
-#endif
-#ifndef WARNINGFUNC
-# define HAVE_ATTRIBUTE_WARNINGFUNC 0
-# define WARNINGFUNC(mesg, x) x
-#else
-# define HAVE_ATTRIBUTE_WARNINGFUNC 1
-#endif
-
-#ifndef GCC_VERSION_SINCE
-#define GCC_VERSION_SINCE(major, minor, patchlevel) \
-  (defined(__GNUC__) && !defined(__INTEL_COMPILER) && !defined(__clang__) && \
-   ((__GNUC__ > (major)) ||  \
-    ((__GNUC__ == (major) && \
-      ((__GNUC_MINOR__ > (minor)) ||					\
-       (__GNUC_MINOR__ == (minor) && __GNUC_PATCHLEVEL__ >= (patchlevel)))))))
-#endif
-
-/* likely */
-#if __GNUC__ >= 3
-#define RB_LIKELY(x)   (__builtin_expect(!!(x), 1))
-#define RB_UNLIKELY(x) (__builtin_expect(!!(x), 0))
-#else /* __GNUC__ >= 3 */
-#define RB_LIKELY(x)   (x)
-#define RB_UNLIKELY(x) (x)
-#endif /* __GNUC__ >= 3 */
-
-#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 __GNUC__
-#define RB_GNUC_EXTENSION __extension__
-#define RB_GNUC_EXTENSION_BLOCK(x) __extension__ ({ x; })
-#else
-#define RB_GNUC_EXTENSION
-#define RB_GNUC_EXTENSION_BLOCK(x) (x)
-#endif
+#include "ruby/internal/config.h"
 
 /* AC_INCLUDES_DEFAULT */
 #include <stdio.h>
+
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
+
 #ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
+
 #ifdef STDC_HEADERS
 # include <stdlib.h>
 # include <stddef.h>
@@ -107,21 +31,30 @@ extern "C" {
 #  include <stdlib.h>
 # endif
 #endif
+
 #ifdef HAVE_STRING_H
 # if !defined STDC_HEADERS && defined HAVE_MEMORY_H
 #  include <memory.h>
 # endif
 # include <string.h>
 #endif
+
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif
+
 #ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif
+
 #ifdef HAVE_STDINT_H
 # include <stdint.h>
 #endif
+
+#ifdef HAVE_STDALIGN_H
+# include <stdalign.h>
+#endif
+
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
@@ -130,233 +63,47 @@ extern "C" {
 # include <sys/select.h>
 #endif
 
-#if defined HAVE_SETJMPEX_H && defined HAVE__SETJMPEX
-#include <setjmpex.h>
+#ifdef RUBY_USE_SETJMPEX
+# include <setjmpex.h>
 #endif
 
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/xmalloc.h"
+#include "ruby/backward/2/assume.h"
+#include "ruby/backward/2/attributes.h"
+#include "ruby/backward/2/bool.h"
+#include "ruby/backward/2/gcc_version_since.h"
+#include "ruby/backward/2/long_long.h"
+#include "ruby/backward/2/stdalign.h"
+#include "ruby/backward/2/stdarg.h"
+#include "ruby/internal/dosish.h"
 #include "ruby/missing.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
-
-#ifndef RUBY_SYMBOL_EXPORT_BEGIN
-# define RUBY_SYMBOL_EXPORT_BEGIN /* begin */
-# define RUBY_SYMBOL_EXPORT_END   /* end */
-#endif
-
-RUBY_SYMBOL_EXPORT_BEGIN
-
-#define xmalloc ruby_xmalloc
-#define xmalloc2 ruby_xmalloc2
-#define xcalloc ruby_xcalloc
-#define xrealloc ruby_xrealloc
-#define xrealloc2 ruby_xrealloc2
-#define xfree ruby_xfree
-
-#if GCC_VERSION_SINCE(4,3,0)
-# define RUBY_ATTR_ALLOC_SIZE(params) __attribute__ ((alloc_size params))
+#ifdef __GNUC__
+# define RB_GNUC_EXTENSION __extension__
+# define RB_GNUC_EXTENSION_BLOCK(x) __extension__ ({ x; })
 #else
-# define RUBY_ATTR_ALLOC_SIZE(params)
-#endif
-
-void *xmalloc(size_t) RUBY_ATTR_ALLOC_SIZE((1));
-void *xmalloc2(size_t,size_t) RUBY_ATTR_ALLOC_SIZE((1,2));
-void *xcalloc(size_t,size_t) RUBY_ATTR_ALLOC_SIZE((1,2));
-void *xrealloc(void*,size_t) RUBY_ATTR_ALLOC_SIZE((2));
-void *xrealloc2(void*,size_t,size_t) RUBY_ATTR_ALLOC_SIZE((2,3));
-void xfree(void*);
-
-#define STRINGIZE(expr) STRINGIZE0(expr)
-#ifndef STRINGIZE0
-#define STRINGIZE0(expr) #expr
-#endif
-
-#ifdef HAVE_LONG_LONG
-# define HAVE_TRUE_LONG_LONG 1
-#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
-
-#ifdef __CYGWIN__
-#undef _WIN32
-#endif
-
-#if defined(_WIN32)
-/*
-  DOSISH mean MS-Windows style filesystem.
-  But you should use more precise macros like DOSISH_DRIVE_LETTER, PATH_SEP,
-  ENV_IGNORECASE or CASEFOLD_FILESYSTEM.
- */
-#define DOSISH 1
-# define DOSISH_DRIVE_LETTER
-#endif
-
-#ifdef AC_APPLE_UNIVERSAL_BUILD
-#undef WORDS_BIGENDIAN
-#ifdef __BIG_ENDIAN__
-#define WORDS_BIGENDIAN
-#endif
-#endif
-
-#ifdef _WIN32
-#include "ruby/win32.h"
-#endif
-
-#ifdef RUBY_EXPORT
-#undef RUBY_EXTERN
-
-#ifndef FALSE
-# define FALSE 0
-#elif FALSE
-# error FALSE must be false
-#endif
-#ifndef TRUE
-# define TRUE 1
-#elif !TRUE
-# error TRUE must be true
-#endif
-
-#endif
-
-#ifndef RUBY_FUNC_EXPORTED
-#define RUBY_FUNC_EXPORTED
-#endif
-
-#ifndef RUBY_EXTERN
-#define RUBY_EXTERN extern
-#endif
-
-#ifndef EXTERN
-#define EXTERN RUBY_EXTERN	/* deprecated */
+# define RB_GNUC_EXTENSION
+# define RB_GNUC_EXTENSION_BLOCK(x) (x)
 #endif
 
+/* :FIXME:  Can someone  tell us  why is  this macro  defined here?   @shyouhei
+ * thinks this  is a  truly internal  macro but cannot  move around  because he
+ * doesn't understand the reason of this arrangement. */
 #ifndef RUBY_MBCHAR_MAXSIZE
-#define RUBY_MBCHAR_MAXSIZE INT_MAX
-        /* MB_CUR_MAX will not work well in C locale */
+# define RUBY_MBCHAR_MAXSIZE INT_MAX
+# /* MB_CUR_MAX will not work well in C locale */
 #endif
 
 #if defined(__sparc)
+RBIMPL_SYMBOL_EXPORT_BEGIN()
 void rb_sparc_flush_register_windows(void);
-#  define FLUSH_REGISTER_WINDOWS rb_sparc_flush_register_windows()
-#elif defined(__ia64)
-void *rb_ia64_bsp(void);
-void rb_ia64_flushrs(void);
-#  define FLUSH_REGISTER_WINDOWS rb_ia64_flushrs()
+RBIMPL_SYMBOL_EXPORT_END()
+# define FLUSH_REGISTER_WINDOWS rb_sparc_flush_register_windows()
 #else
-#  define FLUSH_REGISTER_WINDOWS ((void)0)
-#endif
-
-#if defined(DOSISH)
-#define PATH_SEP ";"
-#else
-#define PATH_SEP ":"
-#endif
-#define PATH_SEP_CHAR PATH_SEP[0]
-
-#define PATH_ENV "PATH"
-
-#if defined(DOSISH)
-#define ENV_IGNORECASE
-#endif
-
-#ifndef CASEFOLD_FILESYSTEM
-# if defined DOSISH
-#   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
-
-#ifndef FUNC_MINIMIZED
-#define FUNC_MINIMIZED(x) x
-#endif
-#ifndef FUNC_UNOPTIMIZED
-#define FUNC_UNOPTIMIZED(x) x
-#endif
-#ifndef RUBY_ALIAS_FUNCTION_TYPE
-#define RUBY_ALIAS_FUNCTION_TYPE(type, prot, name, args) \
-    FUNC_MINIMIZED(type prot) {return (type)name args;}
-#endif
-#ifndef RUBY_ALIAS_FUNCTION_VOID
-#define RUBY_ALIAS_FUNCTION_VOID(prot, name, args) \
-    FUNC_MINIMIZED(void prot) {name args;}
-#endif
-#ifndef RUBY_ALIAS_FUNCTION
-#define RUBY_ALIAS_FUNCTION(prot, name, args) \
-    RUBY_ALIAS_FUNCTION_TYPE(VALUE, prot, name, args)
-#endif
-
-#ifndef UNALIGNED_WORD_ACCESS
-# if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
-     defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || \
-     defined(__powerpc64__) || \
-     defined(__mc68020__)
-#   define UNALIGNED_WORD_ACCESS 1
-# else
-#   define UNALIGNED_WORD_ACCESS 0
-# endif
-#endif
-#ifndef PACKED_STRUCT
-# define PACKED_STRUCT(x) x
-#endif
-#ifndef PACKED_STRUCT_UNALIGNED
-# if UNALIGNED_WORD_ACCESS
-#   define PACKED_STRUCT_UNALIGNED(x) PACKED_STRUCT(x)
-# else
-#   define PACKED_STRUCT_UNALIGNED(x) x
-# endif
-#endif
-
-RUBY_SYMBOL_EXPORT_END
-
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-}  /* extern "C" { */
+# define FLUSH_REGISTER_WINDOWS ((void)0)
 #endif
 
 #endif /* RUBY_DEFINES_H */
diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h
index 5b3ef484f5..07e6c9a671 100644
--- a/include/ruby/encoding.h
+++ b/include/ruby/encoding.h
@@ -1,28 +1,22 @@
-/**********************************************************************
-
-  encoding.h -
-
-  $Author: matz $
-  created at: Thu May 24 11:49:41 JST 2007
-
-  Copyright (C) 2007 Yukihiro Matsumoto
-
-**********************************************************************/
-
-#ifndef RUBY_ENCODING_H
+#ifndef RUBY_ENCODING_H                              /*-*-C++-*-vi:se ft=cpp:*/
 #define RUBY_ENCODING_H 1
-
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
+/**
+ * @file
+ * @author     $Author: matz $
+ * @date       Thu May 24 11:49:41 JST 2007
+ * @copyright  Copyright (C) 2007 Yukihiro Matsumoto
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ */
+#include "ruby/internal/config.h"
 #include <stdarg.h>
+#include "ruby/ruby.h"
 #include "ruby/oniguruma.h"
+#include "ruby/internal/dllexport.h"
 
-RUBY_SYMBOL_EXPORT_BEGIN
+RBIMPL_SYMBOL_EXPORT_BEGIN()
 
 enum ruby_encoding_consts {
     RUBY_ENCODING_INLINE_MAX = 127,
@@ -117,7 +111,9 @@ PUREFUNC(int rb_enc_dummy_p(rb_encoding *enc));
 PUREFUNC(int rb_enc_to_index(rb_encoding *enc));
 int rb_enc_get_index(VALUE obj);
 void rb_enc_set_index(VALUE obj, int encindex);
+int rb_enc_capable(VALUE obj);
 int rb_enc_find_index(const char *name);
+int rb_enc_alias(const char *alias, const char *orig);
 int rb_to_encoding_index(VALUE);
 rb_encoding *rb_to_encoding(VALUE);
 rb_encoding *rb_find_encoding(VALUE);
@@ -131,6 +127,8 @@ void rb_enc_copy(VALUE dst, VALUE src);
 VALUE rb_enc_str_new(const char*, long, rb_encoding*);
 VALUE rb_enc_str_new_cstr(const char*, rb_encoding*);
 VALUE rb_enc_str_new_static(const char*, long, rb_encoding*);
+VALUE rb_enc_interned_str(const char *, long, rb_encoding *);
+VALUE rb_enc_interned_str_cstr(const char *, 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);
@@ -410,13 +408,6 @@ enum ruby_econv_flag_type {
 /* end of flags for rb_econv_convert */
 RUBY_ECONV_FLAGS_PLACEHOLDER};
 
-RUBY_SYMBOL_EXPORT_END
-
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-}  /* extern "C" { */
-#endif
+RBIMPL_SYMBOL_EXPORT_END()
 
 #endif /* RUBY_ENCODING_H */
diff --git a/include/ruby/intern.h b/include/ruby/intern.h
index c6520d8443..2480e2e703 100644
--- a/include/ruby/intern.h
+++ b/include/ruby/intern.h
@@ -1,986 +1,64 @@
-/**********************************************************************
-
-  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
+#ifndef RUBY_INTERN_H                                /*-*-C++-*-vi:se ft=cpp:*/
 #define RUBY_INTERN_H 1
-
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
+/**
+ * @file
+ * @author     $Author$
+ * @date       Thu Jun 10 14:22:17 JST 1993
+ * @copyright  Copyright (C) 1993-2007 Yukihiro Matsumoto
+ * @copyright  Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
+ * @copyright  Copyright (C) 2000  Information-technology Promotion Agency, Japan
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ */
+#include "ruby/internal/config.h"
 #include "ruby/defines.h"
-#ifdef RUBY_EXTCONF_H
-#include RUBY_EXTCONF_H
-#endif
 
-#ifdef HAVE_STDARG_PROTOTYPES
-# include <stdarg.h>
-#else
-# include <varargs.h>
-#endif
+#include <stdarg.h>
 
 #include "ruby/st.h"
 
-RUBY_SYMBOL_EXPORT_BEGIN
-
 /*
  * Functions and variables that are used by more than one source file of
  * the kernel.
  */
 
-#define UNLIMITED_ARGUMENTS (-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_new_capa(long capa);
-VALUE rb_ary_new_from_args(long n, ...);
-VALUE rb_ary_new_from_values(long n, const VALUE *elts);
-VALUE rb_ary_tmp_new(long);
-void rb_ary_free(VALUE);
-void rb_ary_modify(VALUE);
-VALUE rb_ary_freeze(VALUE);
-VALUE rb_ary_shared_with_p(VALUE, VALUE);
-VALUE rb_ary_aref(int, const VALUE*, VALUE);
-VALUE rb_ary_subseq(VALUE, long, long);
-void rb_ary_store(VALUE, long, VALUE);
-VALUE rb_ary_dup(VALUE);
-VALUE rb_ary_resurrect(VALUE ary);
-VALUE rb_ary_to_ary(VALUE);
-VALUE rb_ary_to_s(VALUE);
-VALUE rb_ary_cat(VALUE, const VALUE *, long);
-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_reverse(VALUE);
-VALUE rb_ary_rotate(VALUE, long);
-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, const VALUE*, VALUE(*)(VALUE,long));
-VALUE rb_ary_resize(VALUE ary, long len);
-#define rb_ary_new2 rb_ary_new_capa
-#define rb_ary_new3 rb_ary_new_from_args
-#define rb_ary_new4 rb_ary_new_from_values
-/* bignum.c */
-VALUE rb_big_new(size_t, int);
-int rb_bigzero_p(VALUE x);
-VALUE rb_big_clone(VALUE);
-void rb_big_2comp(VALUE);
-VALUE rb_big_norm(VALUE);
-void rb_big_resize(VALUE big, size_t len);
-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);
-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
-LONG_LONG rb_big2ll(VALUE);
-unsigned LONG_LONG rb_big2ull(VALUE);
-#endif  /* HAVE_LONG_LONG */
-void rb_big_pack(VALUE val, unsigned long *buf, long num_longs);
-VALUE rb_big_unpack(unsigned long *buf, long num_longs);
-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_eql(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_idiv(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);
-
-/* For rb_integer_pack and rb_integer_unpack: */
-/* "MS" in MSWORD and MSBYTE means "most significant" */
-/* "LS" in LSWORD and LSBYTE means "least significant" */
-#define INTEGER_PACK_MSWORD_FIRST       0x01
-#define INTEGER_PACK_LSWORD_FIRST       0x02
-#define INTEGER_PACK_MSBYTE_FIRST       0x10
-#define INTEGER_PACK_LSBYTE_FIRST       0x20
-#define INTEGER_PACK_NATIVE_BYTE_ORDER  0x40
-#define INTEGER_PACK_2COMP              0x80
-#define INTEGER_PACK_FORCE_GENERIC_IMPLEMENTATION     0x400
-/* For rb_integer_unpack: */
-#define INTEGER_PACK_FORCE_BIGNUM       0x100
-#define INTEGER_PACK_NEGATIVE           0x200
-/* Combinations: */
-#define INTEGER_PACK_LITTLE_ENDIAN \
-    (INTEGER_PACK_LSWORD_FIRST | \
-     INTEGER_PACK_LSBYTE_FIRST)
-#define INTEGER_PACK_BIG_ENDIAN \
-    (INTEGER_PACK_MSWORD_FIRST | \
-     INTEGER_PACK_MSBYTE_FIRST)
-int rb_integer_pack(VALUE val, void *words, size_t numwords, size_t wordsize, size_t nails, int flags);
-VALUE rb_integer_unpack(const void *words, size_t numwords, size_t wordsize, size_t nails, int flags);
-size_t rb_absint_size(VALUE val, int *nlz_bits_ret);
-size_t rb_absint_numwords(VALUE val, size_t word_numbits, size_t *nlz_bits_ret);
-int rb_absint_singlebit_p(VALUE val);
-
-/* 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))
-VALUE rb_rational_num(VALUE rat);
-VALUE rb_rational_den(VALUE rat);
-VALUE rb_flt_rationalize_with_prec(VALUE, VALUE);
-VALUE rb_flt_rationalize(VALUE);
-/* 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_polar(VALUE, VALUE);
-VALUE rb_Complex(VALUE, VALUE);
-#define rb_Complex1(x) rb_Complex((x), INT2FIX(0))
-#define rb_Complex2(x,y) rb_Complex((x), (y))
-DEPRECATED(VALUE rb_complex_set_real(VALUE, VALUE));
-DEPRECATED(VALUE rb_complex_set_imag(VALUE, VALUE));
-/* class.c */
-VALUE rb_class_new(VALUE);
-VALUE rb_mod_init_copy(VALUE, VALUE);
-VALUE rb_singleton_class_clone(VALUE);
-void rb_singleton_class_attached(VALUE,VALUE);
-void rb_check_inheritable(VALUE);
-VALUE rb_define_class_id(ID, VALUE);
-VALUE rb_define_class_id_under(VALUE, ID, VALUE);
-VALUE rb_module_new(void);
-VALUE rb_define_module_id(ID);
-VALUE rb_define_module_id_under(VALUE, 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, const VALUE*, VALUE);
-VALUE rb_class_public_instance_methods(int, const VALUE*, VALUE);
-VALUE rb_class_protected_instance_methods(int, const VALUE*, VALUE);
-VALUE rb_class_private_instance_methods(int, const VALUE*, VALUE);
-VALUE rb_obj_singleton_methods(int, const 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, const VALUE *argv);
-VALUE rb_fiber_yield(int argc, const VALUE *argv);
-VALUE rb_fiber_current(void);
-VALUE rb_fiber_alive_p(VALUE);
-/* enum.c */
-VALUE rb_enum_values_pack(int, const VALUE*);
-/* enumerator.c */
-VALUE rb_enumeratorize(VALUE, VALUE, int, const VALUE *);
-typedef VALUE rb_enumerator_size_func(VALUE, VALUE, VALUE);
-VALUE rb_enumeratorize_with_size(VALUE, VALUE, int, const VALUE *, rb_enumerator_size_func *);
-#ifndef RUBY_EXPORT
-#define rb_enumeratorize_with_size(obj, id, argc, argv, size_fn) \
-    rb_enumeratorize_with_size(obj, id, argc, argv, (rb_enumerator_size_func *)(size_fn))
-#endif
-#define SIZED_ENUMERATOR(obj, argc, argv, size_fn) \
-    rb_enumeratorize_with_size((obj), ID2SYM(rb_frame_this_func()), \
-			       (argc), (argv), (size_fn))
-#define RETURN_SIZED_ENUMERATOR(obj, argc, argv, size_fn) do {		\
-	if (!rb_block_given_p())					\
-	    return SIZED_ENUMERATOR(obj, argc, argv, size_fn);		\
-    } while (0)
-#define RETURN_ENUMERATOR(obj, argc, argv) RETURN_SIZED_ENUMERATOR(obj, argc, argv, 0)
-/* error.c */
-VALUE rb_exc_new(VALUE, const char*, long);
-VALUE rb_exc_new_cstr(VALUE, const char*);
-VALUE rb_exc_new_str(VALUE, VALUE);
-#define rb_exc_new2 rb_exc_new_cstr
-#define rb_exc_new3 rb_exc_new_str
-PRINTF_ARGS(NORETURN(void rb_loaderror(const char*, ...)), 1, 2);
-PRINTF_ARGS(NORETURN(void rb_loaderror_with_path(VALUE path, const char*, ...)), 2, 3);
-PRINTF_ARGS(NORETURN(void rb_name_error(ID, const char*, ...)), 2, 3);
-PRINTF_ARGS(NORETURN(void rb_name_error_str(VALUE, const char*, ...)), 2, 3);
-NORETURN(void rb_invalid_str(const char*, const char*));
-NORETURN(DEPRECATED(PRINTF_ARGS(void rb_compile_error(const char*, int, const char*, ...), 3, 4)));
-NORETURN(DEPRECATED(PRINTF_ARGS(void rb_compile_error_with_enc(const char*, int, void *, const char*, ...), 4, 5)));
-NORETURN(DEPRECATED(PRINTF_ARGS(void rb_compile_error_append(const char*, ...), 1, 2)));
-NORETURN(void rb_error_frozen(const char*));
-NORETURN(void rb_error_frozen_object(VALUE));
-CONSTFUNC(void rb_error_untrusted(VALUE));
-void rb_check_frozen(VALUE);
-CONSTFUNC(void rb_check_trusted(VALUE));
-#define rb_check_frozen_internal(obj) do { \
-	VALUE frozen_obj = (obj); \
-	if (OBJ_FROZEN(frozen_obj)) { \
-	    rb_error_frozen_object(frozen_obj); \
-	} \
-    } while (0)
-#define rb_check_trusted_internal(obj) ((void) 0)
-#ifdef __GNUC__
-#define rb_check_frozen(obj) __extension__({rb_check_frozen_internal(obj);})
-#define rb_check_trusted(obj) __extension__({rb_check_trusted_internal(obj);})
-#else
-static inline void
-rb_check_frozen_inline(VALUE obj)
-{
-    rb_check_frozen_internal(obj);
-}
-#define rb_check_frozen(obj) rb_check_frozen_inline(obj)
-static inline void
-rb_check_trusted_inline(VALUE obj)
-{
-    rb_check_trusted_internal(obj);
-}
-#define rb_check_trusted(obj) rb_check_trusted_inline(obj)
-#endif
-void rb_check_copyable(VALUE obj, VALUE orig);
-
-#define RB_OBJ_INIT_COPY(obj, orig) \
-    ((obj) != (orig) && (rb_obj_init_copy((obj), (orig)), 1))
-#define OBJ_INIT_COPY(obj, orig) RB_OBJ_INIT_COPY(obj, orig)
-
-/* eval.c */
-int rb_sourceline(void);
-const char *rb_sourcefile(void);
-VALUE rb_check_funcall(VALUE, ID, int, const VALUE*);
-
-NORETURN(void rb_error_arity(int, int, int));
-static inline int
-rb_check_arity(int argc, int min, int max)
-{
-    if ((argc < min) || (max != UNLIMITED_ARGUMENTS && argc > max))
-	rb_error_arity(argc, min, max);
-    return argc;
-}
-#define rb_check_arity rb_check_arity /* for ifdef */
-
-#if defined(NFDBITS) && defined(HAVE_RB_FD_INIT)
-typedef struct {
-    int maxfd;
-    fd_set *fdset;
-} rb_fdset_t;
-
-void rb_fd_init(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);
-void rb_fd_dup(rb_fdset_t *dst, const rb_fdset_t *src);
-
-struct timeval;
-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)
-
-#elif defined(_WIN32)
-
-typedef struct {
-    int capa;
-    fd_set *fdset;
-} rb_fdset_t;
-
-void rb_fd_init(rb_fdset_t *);
-void rb_fd_term(rb_fdset_t *);
-#define rb_fd_zero(f)		((f)->fdset->fd_count = 0)
-void rb_fd_set(int, rb_fdset_t *);
-#define rb_fd_clr(n, f)		rb_w32_fdclr((n), (f)->fdset)
-#define rb_fd_isset(n, f)	rb_w32_fdisset((n), (f)->fdset)
-#define rb_fd_copy(d, s, n)	rb_w32_fd_copy((d), (s), (n))
-void rb_w32_fd_copy(rb_fdset_t *, const fd_set *, int);
-#define rb_fd_dup(d, s)	rb_w32_fd_dup((d), (s))
-void rb_w32_fd_dup(rb_fdset_t *dst, const rb_fdset_t *src);
-#define rb_fd_select(n, rfds, wfds, efds, timeout)	rb_w32_select((n), (rfds) ? ((rb_fdset_t*)(rfds))->fdset : NULL, (wfds) ? ((rb_fdset_t*)(wfds))->fdset : NULL, (efds) ? ((rb_fdset_t*)(efds))->fdset: NULL, (timeout))
-#define rb_fd_resize(n, f)	((void)(f))
-
-#define rb_fd_ptr(f)	((f)->fdset)
-#define rb_fd_max(f)	((f)->fdset->fd_count)
-
-#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_dup(d, s) (*(d) = *(s))
-#define rb_fd_resize(n, f)	((void)(f))
-#define rb_fd_ptr(f)	(f)
-#define rb_fd_init(f)	FD_ZERO(f)
-#define rb_fd_init_copy(d, s) (*(d) = *(s))
-#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));
-NORETURN(VALUE rb_f_exit(int, const VALUE*));
-NORETURN(VALUE rb_f_abort(int, const VALUE*));
-void rb_remove_method(VALUE, const char*);
-void rb_remove_method_id(VALUE, ID);
-DEPRECATED(static inline void rb_disable_super(void));
-DEPRECATED(static inline void rb_enable_super(void));
-static inline void rb_disable_super(void)
-{
-    /* obsolete - no use */
-}
-static inline void rb_enable_super(void)
-{
-    rb_warning("rb_enable_super() is obsolete");
-}
-#define rb_disable_super(klass, name) rb_disable_super()
-#define rb_enable_super(klass, name) rb_enable_super()
-#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);
-NORETURN(DEPRECATED(void rb_clear_cache(void)));
-void rb_clear_constant_cache(void);
-void rb_clear_method_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);
-int rb_method_basic_definition_p(VALUE, ID);
-VALUE rb_eval_cmd(VALUE, VALUE, int);
-int rb_obj_respond_to(VALUE, ID, int);
-int rb_respond_to(VALUE, ID);
-NORETURN(VALUE rb_f_notimplement(int argc, const VALUE *argv, VALUE obj));
-#if !defined(RUBY_EXPORT) && defined(_WIN32)
-RUBY_EXTERN VALUE (*const rb_f_notimplement_)(int, const VALUE *, VALUE);
-#define rb_f_notimplement (*rb_f_notimplement_)
-#endif
-NORETURN(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, const VALUE*, VALUE);
-VALUE rb_obj_instance_exec(int, const VALUE*, VALUE);
-VALUE rb_mod_module_eval(int, const VALUE*, VALUE);
-VALUE rb_mod_module_exec(int, const 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*);
-int rb_feature_provided(const char *, 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, const VALUE*);
-VALUE rb_class_new_instance(int, const VALUE*, VALUE);
-VALUE rb_block_proc(void);
-VALUE rb_block_lambda(void);
-VALUE rb_proc_new(VALUE (*)(ANYARGS/* VALUE yieldarg[, VALUE procarg] */), VALUE);
-VALUE rb_obj_is_proc(VALUE);
-VALUE rb_proc_call(VALUE, VALUE);
-VALUE rb_proc_call_with_block(VALUE, int argc, const VALUE *argv, VALUE);
-int rb_proc_arity(VALUE);
-VALUE rb_proc_lambda_p(VALUE);
-VALUE rb_binding_new(void);
-VALUE rb_obj_method(VALUE, VALUE);
-VALUE rb_obj_is_method(VALUE);
-VALUE rb_method_call(int, const VALUE*, VALUE);
-VALUE rb_method_call_with_block(int, const VALUE *, 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_exec_end_proc(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_sleep(int);
-void rb_thread_sleep_forever(void);
-void rb_thread_sleep_deadly(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_create(VALUE (*)(ANYARGS), void*);
-int rb_thread_fd_select(int, rb_fdset_t *, rb_fdset_t *, rb_fdset_t *, 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);
-VALUE rb_exec_recursive_paired(VALUE(*)(VALUE, VALUE, int),VALUE,VALUE,VALUE);
-VALUE rb_exec_recursive_outer(VALUE(*)(VALUE, VALUE, int),VALUE,VALUE);
-VALUE rb_exec_recursive_paired_outer(VALUE(*)(VALUE, VALUE, int),VALUE,VALUE,VALUE);
-/* dir.c */
-VALUE rb_dir_getwd(void);
-/* file.c */
-VALUE rb_file_s_expand_path(int, const VALUE *);
-VALUE rb_file_expand_path(VALUE, VALUE);
-VALUE rb_file_s_absolute_path(int, const VALUE *);
-VALUE rb_file_absolute_path(VALUE, VALUE);
-VALUE rb_file_dirname(VALUE fname);
-int rb_find_file_ext_safe(VALUE*, const char* const*, int);
-VALUE rb_find_file_safe(VALUE, int);
-int rb_find_file_ext(VALUE*, const char* const*);
-VALUE rb_find_file(VALUE);
-VALUE rb_file_directory_p(VALUE,VALUE);
-VALUE rb_str_encode_ospath(VALUE);
-int rb_is_absolute_path(const char *);
-/* gc.c */
-NORETURN(void rb_memerror(void));
-PUREFUNC(int rb_during_gc(void));
-void rb_gc_mark_locations(const VALUE*, const 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);
-VALUE rb_define_finalizer(VALUE, VALUE);
-VALUE rb_undefine_finalizer(VALUE);
-size_t rb_gc_count(void);
-size_t rb_gc_stat(VALUE);
-VALUE rb_gc_latest_gc_info(VALUE);
-/* hash.c */
-void st_foreach_safe(struct st_table *, int (*)(ANYARGS), st_data_t);
-VALUE rb_check_hash_type(VALUE);
-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_lookup2(VALUE, VALUE, VALUE);
-VALUE rb_hash_fetch(VALUE, VALUE);
-VALUE rb_hash_aset(VALUE, VALUE, VALUE);
-VALUE rb_hash_clear(VALUE);
-VALUE rb_hash_delete_if(VALUE);
-VALUE rb_hash_delete(VALUE,VALUE);
-VALUE rb_hash_set_ifnone(VALUE hash, VALUE ifnone);
-typedef VALUE rb_hash_update_func(VALUE newkey, VALUE oldkey, VALUE value);
-VALUE rb_hash_update_by(VALUE hash1, VALUE hash2, rb_hash_update_func *func);
-struct st_table *rb_hash_tbl(VALUE);
-int rb_path_check(const char*);
-int rb_env_path_tainted(void);
-VALUE rb_env_clear(void);
-VALUE rb_hash_size(VALUE);
-DEPRECATED(int rb_hash_iter_lev(VALUE));
-DEPRECATED(VALUE rb_hash_ifnone(VALUE));
-/* 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_ungetbyte(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_ascii8bit_binmode(VALUE);
-VALUE rb_io_addstr(VALUE, VALUE);
-VALUE rb_io_printf(int, const VALUE*, VALUE);
-VALUE rb_io_print(int, const VALUE*, VALUE);
-VALUE rb_io_puts(int, const VALUE*, VALUE);
-VALUE rb_io_fdopen(int, int, const char*);
-VALUE rb_io_get_io(VALUE);
-VALUE rb_file_open(const char*, const char*);
-VALUE rb_file_open_str(VALUE, const char*);
-VALUE rb_gets(void);
-void rb_write_error(const char*);
-void rb_write_error2(const char*, long);
-void rb_close_before_exec(int lowfd, int maxhint, VALUE noclose_fds);
-int rb_pipe(int *pipes);
-int rb_reserved_fd_p(int fd);
-int rb_cloexec_open(const char *pathname, int flags, mode_t mode);
-int rb_cloexec_dup(int oldfd);
-int rb_cloexec_dup2(int oldfd, int newfd);
-int rb_cloexec_pipe(int fildes[2]);
-int rb_cloexec_fcntl_dupfd(int fd, int minfd);
-#define RB_RESERVED_FD_P(fd) rb_reserved_fd_p(fd)
-void rb_update_max_fd(int fd);
-void rb_fd_fix_cloexec(int fd);
-/* 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 */
-NORETURN(void rb_num_zerodiv(void));
-#define RB_NUM_COERCE_FUNCS_NEED_OPID 1
-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_num_coerce_bit(VALUE, VALUE, ID);
-VALUE rb_num2fix(VALUE);
-VALUE rb_fix2str(VALUE, int);
-CONSTFUNC(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);
-PUREFUNC(VALUE rb_obj_tainted(VALUE));
-VALUE rb_obj_untaint(VALUE);
-VALUE rb_obj_untrust(VALUE);
-PUREFUNC(VALUE rb_obj_untrusted(VALUE));
-VALUE rb_obj_trust(VALUE);
-VALUE rb_obj_freeze(VALUE);
-PUREFUNC(VALUE rb_obj_frozen_p(VALUE));
-VALUE rb_obj_id(VALUE);
-VALUE rb_obj_class(VALUE);
-PUREFUNC(VALUE rb_class_real(VALUE));
-PUREFUNC(VALUE rb_class_inherited_p(VALUE, VALUE));
-VALUE rb_class_superclass(VALUE);
-VALUE rb_class_get_superclass(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_check_to_float(VALUE);
-VALUE rb_to_int(VALUE);
-VALUE rb_check_to_int(VALUE);
-VALUE rb_Integer(VALUE);
-VALUE rb_to_float(VALUE);
-VALUE rb_Float(VALUE);
-VALUE rb_String(VALUE);
-VALUE rb_Array(VALUE);
-VALUE rb_Hash(VALUE);
-double rb_cstr_to_dbl(const char*, int);
-double rb_str_to_dbl(VALUE, int);
-/* parse.y */
-ID rb_id_attrset(ID);
-CONSTFUNC(int rb_is_const_id(ID));
-CONSTFUNC(int rb_is_global_id(ID));
-CONSTFUNC(int rb_is_instance_id(ID));
-CONSTFUNC(int rb_is_attrset_id(ID));
-CONSTFUNC(int rb_is_class_id(ID));
-CONSTFUNC(int rb_is_local_id(ID));
-CONSTFUNC(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);
-/* process.c */
-void rb_last_status_set(int status, rb_pid_t pid);
-VALUE rb_last_status_get(void);
-int rb_proc_exec(const char*);
-NORETURN(VALUE rb_f_exec(int, const 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, const VALUE*);
-rb_pid_t rb_spawn_err(int, const VALUE*, char*, size_t);
-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);
-int rb_range_values(VALUE range, VALUE *begp, VALUE *endp, int *exclp);
-/* random.c */
-unsigned int rb_genrand_int32(void);
-double rb_genrand_real(void);
-void rb_reset_random_seed(void);
-VALUE rb_random_bytes(VALUE rnd, long n);
-VALUE rb_random_int(VALUE rnd, VALUE max);
-unsigned int rb_random_int32(VALUE rnd);
-double rb_random_real(VALUE rnd);
-unsigned long rb_random_ulong_limited(VALUE rnd, unsigned long limit);
-unsigned long rb_genrand_ulong_limited(unsigned long i);
-/* 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);
-int rb_reg_backref_number(VALUE match, VALUE backref);
-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_alloc(void);
-VALUE rb_reg_init_str(VALUE re, VALUE s, int options);
-VALUE rb_reg_match(VALUE, VALUE);
-VALUE rb_reg_match2(VALUE);
-int rb_reg_options(VALUE);
-/* 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 *rb_load_file_str(VALUE);
-/* signal.c */
-VALUE rb_f_kill(int, const VALUE*);
-#ifdef POSIX_SIGNAL
-#define posix_signal ruby_posix_signal
-RETSIGTYPE (*posix_signal(int, RETSIGTYPE (*)(int)))(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, 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_new_cstr(const char*);
-VALUE rb_str_new_shared(VALUE);
-VALUE rb_str_new_frozen(VALUE);
-VALUE rb_str_new_with_class(VALUE, const char*, long);
-VALUE rb_tainted_str_new_cstr(const char*);
-VALUE rb_tainted_str_new(const char*, long);
-VALUE rb_external_str_new(const char*, long);
-VALUE rb_external_str_new_cstr(const char*);
-VALUE rb_locale_str_new(const char*, long);
-VALUE rb_locale_str_new_cstr(const char*);
-VALUE rb_filesystem_str_new(const char*, long);
-VALUE rb_filesystem_str_new_cstr(const char*);
-VALUE rb_str_buf_new(long);
-VALUE rb_str_buf_new_cstr(const char*);
-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_new_cstr(const char*);
-VALUE rb_utf8_str_new(const char*, long);
-VALUE rb_utf8_str_new_cstr(const char*);
-VALUE rb_str_new_static(const char *, long);
-VALUE rb_usascii_str_new_static(const char *, long);
-VALUE rb_utf8_str_new_static(const char *, long);
-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);
-void rb_must_asciicompat(VALUE);
-VALUE rb_str_dup(VALUE);
-VALUE rb_str_resurrect(VALUE str);
-VALUE rb_str_locktmp(VALUE);
-VALUE rb_str_unlocktmp(VALUE);
-VALUE rb_str_dup_frozen(VALUE);
-#define rb_str_dup_frozen rb_str_new_frozen
-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);
-char *rb_str_subpos(VALUE, long, long*);
-void rb_str_modify(VALUE);
-void rb_str_modify_expand(VALUE, long);
-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_cat_cstr(VALUE, const char*);
-VALUE rb_str_cat2(VALUE, const char*);
-VALUE rb_str_append(VALUE, VALUE);
-VALUE rb_str_concat(VALUE, VALUE);
-st_index_t rb_memhash(const void *ptr, long len);
-st_index_t rb_hash_start(st_index_t);
-st_index_t rb_hash_uint32(st_index_t, uint32_t);
-st_index_t rb_hash_uint(st_index_t, st_index_t);
-st_index_t rb_hash_end(st_index_t);
-#define rb_hash_uint32(h, i) st_hash_uint32((h), (i))
-#define rb_hash_uint(h, i) st_hash_uint((h), (i))
-#define rb_hash_end(h) st_hash_end(h)
-st_index_t 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);
-VALUE rb_str_drop_bytes(VALUE, long);
-void rb_str_update(VALUE, long, long, VALUE);
-VALUE rb_str_replace(VALUE, VALUE);
-VALUE rb_str_inspect(VALUE);
-VALUE rb_str_dump(VALUE);
-VALUE rb_str_split(VALUE, const char*);
-NORETURN(DEPRECATED(void rb_str_associate(VALUE, VALUE)));
-NORETURN(DEPRECATED(VALUE rb_str_associated(VALUE)));
-void rb_str_setter(VALUE, ID, VALUE*);
-VALUE rb_str_intern(VALUE);
-VALUE rb_sym_to_s(VALUE);
-long rb_str_strlen(VALUE);
-VALUE rb_str_length(VALUE);
-long rb_str_offset(VALUE, long);
-PUREFUNC(size_t rb_str_capacity(VALUE));
-VALUE rb_str_ellipsize(VALUE, long);
-VALUE rb_str_scrub(VALUE, VALUE);
-/* symbol.c */
-VALUE rb_sym_all_symbols(void);
-
-#ifdef HAVE_BUILTIN___BUILTIN_CONSTANT_P
-#define rb_str_new(str, len) RB_GNUC_EXTENSION_BLOCK(	\
-    (__builtin_constant_p(str) && __builtin_constant_p(len)) ? \
-	rb_str_new_static((str), (len)) : \
-	rb_str_new((str), (len))	  \
-)
-#define rb_str_new_cstr(str) RB_GNUC_EXTENSION_BLOCK(	\
-    (__builtin_constant_p(str)) ?		\
-	rb_str_new_static((str), (long)strlen(str)) : \
-	rb_str_new_cstr(str)			\
-)
-#define rb_usascii_str_new(str, len) RB_GNUC_EXTENSION_BLOCK( \
-    (__builtin_constant_p(str) && __builtin_constant_p(len)) ? \
-	rb_usascii_str_new_static((str), (len)) : \
-	rb_usascii_str_new((str), (len))	  \
-)
-#define rb_utf8_str_new(str, len) RB_GNUC_EXTENSION_BLOCK( \
-    (__builtin_constant_p(str) && __builtin_constant_p(len)) ? \
-	rb_utf8_str_new_static((str), (len)) : \
-	rb_utf8_str_new((str), (len))	  \
-)
-#define rb_tainted_str_new_cstr(str) RB_GNUC_EXTENSION_BLOCK( \
-    (__builtin_constant_p(str)) ?	       \
-	rb_tainted_str_new((str), (long)strlen(str)) : \
-	rb_tainted_str_new_cstr(str)	       \
-)
-#define rb_usascii_str_new_cstr(str) RB_GNUC_EXTENSION_BLOCK( \
-    (__builtin_constant_p(str)) ?	       \
-	rb_usascii_str_new_static((str), (long)strlen(str)) : \
-	rb_usascii_str_new_cstr(str)	       \
-)
-#define rb_utf8_str_new_cstr(str) RB_GNUC_EXTENSION_BLOCK( \
-    (__builtin_constant_p(str)) ?		\
-	rb_utf8_str_new_static((str), (long)strlen(str)) : \
-	rb_utf8_str_new_cstr(str)		\
-)
-#define rb_external_str_new_cstr(str) RB_GNUC_EXTENSION_BLOCK( \
-    (__builtin_constant_p(str)) ?		\
-	rb_external_str_new((str), (long)strlen(str)) : \
-	rb_external_str_new_cstr(str)		\
-)
-#define rb_locale_str_new_cstr(str) RB_GNUC_EXTENSION_BLOCK( \
-    (__builtin_constant_p(str)) ?	       \
-	rb_locale_str_new((str), (long)strlen(str)) :  \
-	rb_locale_str_new_cstr(str)	       \
-)
-#define rb_str_buf_new_cstr(str) RB_GNUC_EXTENSION_BLOCK( \
-    (__builtin_constant_p(str)) ?		\
-	rb_str_buf_cat(rb_str_buf_new((long)strlen(str)), \
-		       (str), (long)strlen(str)) : \
-	rb_str_buf_new_cstr(str)		\
-)
-#define rb_str_cat_cstr(str, ptr) RB_GNUC_EXTENSION_BLOCK( \
-    (__builtin_constant_p(ptr)) ?	        \
-	rb_str_cat((str), (ptr), (long)strlen(ptr)) : \
-	rb_str_cat_cstr((str), (ptr))		\
-)
-#define rb_exc_new_cstr(klass, ptr) RB_GNUC_EXTENSION_BLOCK( \
-    (__builtin_constant_p(ptr)) ?	        \
-	rb_exc_new((klass), (ptr), (long)strlen(ptr)) : \
-	rb_exc_new_cstr((klass), (ptr))		\
-)
-#endif
-#define rb_str_new2 rb_str_new_cstr
-#define rb_str_new3 rb_str_new_shared
-#define rb_str_new4 rb_str_new_frozen
-#define rb_str_new5 rb_str_new_with_class
-#define rb_tainted_str_new2 rb_tainted_str_new_cstr
-#define rb_str_buf_new2 rb_str_buf_new_cstr
-#define rb_usascii_str_new2 rb_usascii_str_new_cstr
-#define rb_str_buf_cat rb_str_cat
-#define rb_str_buf_cat2 rb_str_cat_cstr
-#define rb_str_cat2 rb_str_cat_cstr
-#define rb_strlen_lit(str) (sizeof(str "") - 1)
-#define rb_str_new_lit(str) rb_str_new_static((str), rb_strlen_lit(str))
-#define rb_usascii_str_new_lit(str) rb_usascii_str_new_static((str), rb_strlen_lit(str))
-#define rb_utf8_str_new_lit(str) rb_utf8_str_new_static((str), rb_strlen_lit(str))
-#define rb_enc_str_new_lit(str, enc) rb_enc_str_new_static((str), rb_strlen_lit(str), (enc))
-#define rb_str_new_literal(str) rb_str_new_lit(str)
-#define rb_usascii_str_new_literal(str) rb_usascii_str_new_lit(str)
-#define rb_utf8_str_new_literal(str) rb_utf8_str_new_lit(str)
-#define rb_enc_str_new_literal(str, enc) rb_enc_str_new_lit(str, enc)
-
-/* struct.c */
-VALUE rb_struct_new(VALUE, ...);
-VALUE rb_struct_define(const char*, ...);
-VALUE rb_struct_define_under(VALUE, 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_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, ...);
-VALUE rb_struct_define_without_accessor_under(VALUE outer, const char *class_name, VALUE super, rb_alloc_func_t alloc, ...);
-
-/* thread.c */
-typedef void rb_unblock_function_t(void *);
-typedef VALUE rb_blocking_function_t(void *);
-void rb_thread_check_ints(void);
-int rb_thread_interrupted(VALUE thval);
-
-#define RUBY_UBF_IO ((rb_unblock_function_t *)-1)
-#define RUBY_UBF_PROCESS ((rb_unblock_function_t *)-1)
-VALUE rb_mutex_new(void);
-VALUE rb_mutex_locked_p(VALUE mutex);
-VALUE rb_mutex_trylock(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 mutex, VALUE (*func)(VALUE arg), VALUE arg);
-/* time.c */
-void rb_timespec_now(struct timespec *);
-VALUE rb_time_new(time_t, long);
-VALUE rb_time_nano_new(time_t, long);
-VALUE rb_time_timespec_new(const struct timespec *, int);
-VALUE rb_time_num_new(VALUE, VALUE);
-struct timeval rb_time_interval(VALUE num);
-struct timeval rb_time_timeval(VALUE time);
-struct timespec rb_time_timespec(VALUE time);
-/* variable.c */
-VALUE rb_mod_name(VALUE);
-VALUE rb_class_path(VALUE);
-VALUE rb_class_path_cached(VALUE);
-void rb_set_class_path(VALUE, VALUE, const char*);
-void rb_set_class_path_string(VALUE, VALUE, VALUE);
-VALUE rb_path_to_class(VALUE);
-VALUE rb_path2class(const char*);
-void rb_name_class(VALUE, ID);
-VALUE rb_class_name(VALUE);
-DEPRECATED(void rb_autoload(VALUE, ID, const char*));
-VALUE rb_autoload_load(VALUE, ID);
-VALUE rb_autoload_p(VALUE, ID);
-VALUE rb_f_trace_var(int, const VALUE*);
-VALUE rb_f_untrace_var(int, const VALUE*);
-VALUE rb_f_global_variables(void);
-void rb_alias_variable(ID, ID);
-DEPRECATED(struct st_table* rb_generic_ivar_table(VALUE));
-void rb_copy_generic_ivar(VALUE,VALUE);
-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);
-st_index_t rb_ivar_count(VALUE);
-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, const 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_const_remove(VALUE, ID);
-NORETURN(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(int, const VALUE*, VALUE);
-VALUE rb_mod_remove_cvar(VALUE, VALUE);
-
-ID rb_frame_callee(void);
-VALUE rb_str_succ(VALUE);
-VALUE rb_time_succ(VALUE);
-int rb_frame_method_id_and_class(ID *idp, VALUE *klassp);
-VALUE rb_make_backtrace(void);
-VALUE rb_make_exception(int, const VALUE*);
-
-/* deprecated */
-NORETURN(DEPRECATED(void rb_frame_pop(void)));
-
-
-RUBY_SYMBOL_EXPORT_END
-
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-}  /* extern "C" { */
-#endif
+#include "ruby/internal/intern/array.h"
+#include "ruby/internal/intern/bignum.h"
+#include "ruby/internal/intern/class.h"
+#include "ruby/internal/intern/compar.h"
+#include "ruby/internal/intern/complex.h"
+#include "ruby/internal/intern/cont.h"
+#include "ruby/internal/intern/dir.h"
+#include "ruby/internal/intern/enum.h"
+#include "ruby/internal/intern/enumerator.h"
+#include "ruby/internal/intern/error.h"
+#include "ruby/internal/intern/eval.h"
+#include "ruby/internal/intern/file.h"
+#include "ruby/internal/intern/gc.h"
+#include "ruby/internal/intern/hash.h"
+#include "ruby/internal/intern/io.h"
+#include "ruby/internal/intern/load.h"
+#include "ruby/internal/intern/marshal.h"
+#include "ruby/internal/intern/numeric.h"
+#include "ruby/internal/intern/object.h"
+#include "ruby/internal/intern/parse.h"
+#include "ruby/internal/intern/proc.h"
+#include "ruby/internal/intern/process.h"
+#include "ruby/internal/intern/random.h"
+#include "ruby/internal/intern/range.h"
+#include "ruby/internal/intern/rational.h"
+#include "ruby/internal/intern/re.h"
+#include "ruby/internal/intern/ruby.h"
+#include "ruby/internal/intern/select.h"
+#include "ruby/internal/intern/signal.h"
+#include "ruby/internal/intern/sprintf.h"
+#include "ruby/internal/intern/string.h"
+#include "ruby/internal/intern/struct.h"
+#include "ruby/internal/intern/thread.h"
+#include "ruby/internal/intern/time.h"
+#include "ruby/internal/intern/variable.h"
+#include "ruby/internal/intern/vm.h"
 
 #endif /* RUBY_INTERN_H */
diff --git a/include/ruby/internal/anyargs.h b/include/ruby/internal/anyargs.h
new file mode 100644
index 0000000000..f09a4e72e9
--- /dev/null
+++ b/include/ruby/internal/anyargs.h
@@ -0,0 +1,375 @@
+#ifndef RBIMPL_ANYARGS_H                             /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ANYARGS_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Function overloads to issue warnings around #ANYARGS.
+ *
+ * For instance ::rb_define_method  takes a pointer to  #ANYARGS -ed functions,
+ * which in  fact varies 18  different prototypes.   We still need  to preserve
+ * #ANYARGS for storages but why not check the consistencies if possible.  With
+ * those complex macro overlays defined in  this header file, use of a function
+ * pointer gets checked against the corresponding arity argument.
+ *
+ * ### Q&A ###
+ *
+ * - Q: Where did the magic number "18" came from in the description above?
+ *
+ * - A: Count the case branch of `vm_method.c:call_cfunc_invoker_func()`.  Note
+ *      also that the 18  branches has lasted for at least  25 years.  See also
+ *      commit 200e0ee2fd3c1c006c528874a88f684447215524.
+ *
+ * - Q: What is this `__weakref__` thing?
+ *
+ * - A: That is a kind of function overloading mechanism that GCC provides.  In
+ *      this   case  for   instance  `rb_define_method_00`   is  an   alias  of
+ *      ::rb_define_method, with a strong type.
+ *
+ * - Q: What is this `__transparent_union__` thing?
+ *
+ *   A: That  is  another  kind  of function  overloading  mechanism  that  GCC
+ *      provides.   In this  case  the attributed  function  pointer is  either
+ *      `VALUE(*)(int,VALUE*,VALUE)` or `VALUE(*)(int,const VALUE*,VALUE)`.
+ *
+ *      This is better than `void*` or #ANYARGS because we can reject all other
+ *      possibilities than the two.
+ *
+ * - Q: What does this #rb_define_method macro mean?
+ *
+ * - A: It  selects  appropriate  alias  of  the  ::rb_define_method  function,
+ *      depending on the last (arity) argument.
+ *
+ * - Q: Why the special case for ::rb_f_notimplement ?
+ *
+ * - A: Function   pointer  to   ::rb_f_notimplement   is   special  cased   in
+ *      `vm_method.c:rb_add_method_cfunc()`.   That should  be  handled by  the
+ *      `__builtin_choose_expr`   chain  inside   of  #rb_define_method   macro
+ *      expansion.      In    order     to    do     so,    comparison     like
+ *      `(func == rb_f_notimplement)`        is        inappropriate        for
+ *      `__builtin_choose_expr`'s  expression  (which  must be  a  compile-time
+ *      integer constant  but the address  of ::rb_f_notimplement is  not fixed
+ *      until      the      linker).        Instead      we      are      using
+ *      `__builtin_types_compatible_p`, and in doing  so we need to distinguish
+ *      ::rb_f_notimplement from others, by type.
+ */
+#include "ruby/internal/attr/maybe_unused.h"
+#include "ruby/internal/attr/nonnull.h"
+#include "ruby/internal/attr/weakref.h"
+#include "ruby/internal/cast.h"
+#include "ruby/internal/config.h"
+#include "ruby/internal/has/attribute.h"
+#include "ruby/internal/intern/class.h"
+#include "ruby/internal/intern/vm.h"
+#include "ruby/internal/method.h"
+#include "ruby/internal/value.h"
+#include "ruby/backward/2/stdarg.h"
+
+#if defined(__cplusplus)
+# include "ruby/backward/cxxanyargs.hpp"
+
+#elif defined(_WIN32) || defined(__CYGWIN__)
+# /* Skip due to [Bug #16134] */
+
+#elif ! RBIMPL_HAS_ATTRIBUTE(transparent_union)
+# /* :TODO: improve here, please find a way to support. */
+
+#elif ! defined(HAVE_VA_ARGS_MACRO)
+# /* :TODO: improve here, please find a way to support. */
+
+#else
+# /** @cond INTERNAL_MACRO */
+# if ! defined(HAVE_BUILTIN___BUILTIN_TYPES_COMPATIBLE_P)
+#  define RBIMPL_CFUNC_IS_rb_f_notimplement(f) 0
+# else
+#  define RBIMPL_CFUNC_IS_rb_f_notimplement(f) \
+    __builtin_types_compatible_p(             \
+        __typeof__(f),                        \
+        __typeof__(rb_f_notimplement))
+# endif
+
+# if ! defined(HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P)
+#  define RBIMPL_ANYARGS_DISPATCH(expr, truthy, falsy) (falsy)
+# else
+#  define RBIMPL_ANYARGS_DISPATCH(expr, truthy, falsy) \
+    __builtin_choose_expr(                            \
+        __builtin_choose_expr(                        \
+            __builtin_constant_p(expr),               \
+            (expr), 0),                               \
+        (truthy), (falsy))
+# endif
+
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_singleton_method_m2(n) RBIMPL_ANYARGS_DISPATCH((n) == -2, rb_define_singleton_method_m2, rb_define_singleton_method_m3)
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_singleton_method_m1(n) RBIMPL_ANYARGS_DISPATCH((n) == -1, rb_define_singleton_method_m1, RBIMPL_ANYARGS_DISPATCH_rb_define_singleton_method_m2(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_singleton_method_00(n) RBIMPL_ANYARGS_DISPATCH((n) ==  0, rb_define_singleton_method_00, RBIMPL_ANYARGS_DISPATCH_rb_define_singleton_method_m1(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_singleton_method_01(n) RBIMPL_ANYARGS_DISPATCH((n) ==  1, rb_define_singleton_method_01, RBIMPL_ANYARGS_DISPATCH_rb_define_singleton_method_00(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_singleton_method_02(n) RBIMPL_ANYARGS_DISPATCH((n) ==  2, rb_define_singleton_method_02, RBIMPL_ANYARGS_DISPATCH_rb_define_singleton_method_01(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_singleton_method_03(n) RBIMPL_ANYARGS_DISPATCH((n) ==  3, rb_define_singleton_method_03, RBIMPL_ANYARGS_DISPATCH_rb_define_singleton_method_02(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_singleton_method_04(n) RBIMPL_ANYARGS_DISPATCH((n) ==  4, rb_define_singleton_method_04, RBIMPL_ANYARGS_DISPATCH_rb_define_singleton_method_03(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_singleton_method_05(n) RBIMPL_ANYARGS_DISPATCH((n) ==  5, rb_define_singleton_method_05, RBIMPL_ANYARGS_DISPATCH_rb_define_singleton_method_04(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_singleton_method_06(n) RBIMPL_ANYARGS_DISPATCH((n) ==  6, rb_define_singleton_method_06, RBIMPL_ANYARGS_DISPATCH_rb_define_singleton_method_05(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_singleton_method_07(n) RBIMPL_ANYARGS_DISPATCH((n) ==  7, rb_define_singleton_method_07, RBIMPL_ANYARGS_DISPATCH_rb_define_singleton_method_06(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_singleton_method_08(n) RBIMPL_ANYARGS_DISPATCH((n) ==  8, rb_define_singleton_method_08, RBIMPL_ANYARGS_DISPATCH_rb_define_singleton_method_07(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_singleton_method_09(n) RBIMPL_ANYARGS_DISPATCH((n) ==  9, rb_define_singleton_method_09, RBIMPL_ANYARGS_DISPATCH_rb_define_singleton_method_08(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_singleton_method_10(n) RBIMPL_ANYARGS_DISPATCH((n) == 10, rb_define_singleton_method_10, RBIMPL_ANYARGS_DISPATCH_rb_define_singleton_method_09(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_singleton_method_11(n) RBIMPL_ANYARGS_DISPATCH((n) == 11, rb_define_singleton_method_11, RBIMPL_ANYARGS_DISPATCH_rb_define_singleton_method_10(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_singleton_method_12(n) RBIMPL_ANYARGS_DISPATCH((n) == 12, rb_define_singleton_method_12, RBIMPL_ANYARGS_DISPATCH_rb_define_singleton_method_11(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_singleton_method_13(n) RBIMPL_ANYARGS_DISPATCH((n) == 13, rb_define_singleton_method_13, RBIMPL_ANYARGS_DISPATCH_rb_define_singleton_method_12(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_singleton_method_14(n) RBIMPL_ANYARGS_DISPATCH((n) == 14, rb_define_singleton_method_14, RBIMPL_ANYARGS_DISPATCH_rb_define_singleton_method_13(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_singleton_method_15(n) RBIMPL_ANYARGS_DISPATCH((n) == 15, rb_define_singleton_method_15, RBIMPL_ANYARGS_DISPATCH_rb_define_singleton_method_14(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_protected_method_m2(n) RBIMPL_ANYARGS_DISPATCH((n) == -2, rb_define_protected_method_m2, rb_define_protected_method_m3)
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_protected_method_m1(n) RBIMPL_ANYARGS_DISPATCH((n) == -1, rb_define_protected_method_m1, RBIMPL_ANYARGS_DISPATCH_rb_define_protected_method_m2(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_protected_method_00(n) RBIMPL_ANYARGS_DISPATCH((n) ==  0, rb_define_protected_method_00, RBIMPL_ANYARGS_DISPATCH_rb_define_protected_method_m1(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_protected_method_01(n) RBIMPL_ANYARGS_DISPATCH((n) ==  1, rb_define_protected_method_01, RBIMPL_ANYARGS_DISPATCH_rb_define_protected_method_00(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_protected_method_02(n) RBIMPL_ANYARGS_DISPATCH((n) ==  2, rb_define_protected_method_02, RBIMPL_ANYARGS_DISPATCH_rb_define_protected_method_01(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_protected_method_03(n) RBIMPL_ANYARGS_DISPATCH((n) ==  3, rb_define_protected_method_03, RBIMPL_ANYARGS_DISPATCH_rb_define_protected_method_02(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_protected_method_04(n) RBIMPL_ANYARGS_DISPATCH((n) ==  4, rb_define_protected_method_04, RBIMPL_ANYARGS_DISPATCH_rb_define_protected_method_03(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_protected_method_05(n) RBIMPL_ANYARGS_DISPATCH((n) ==  5, rb_define_protected_method_05, RBIMPL_ANYARGS_DISPATCH_rb_define_protected_method_04(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_protected_method_06(n) RBIMPL_ANYARGS_DISPATCH((n) ==  6, rb_define_protected_method_06, RBIMPL_ANYARGS_DISPATCH_rb_define_protected_method_05(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_protected_method_07(n) RBIMPL_ANYARGS_DISPATCH((n) ==  7, rb_define_protected_method_07, RBIMPL_ANYARGS_DISPATCH_rb_define_protected_method_06(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_protected_method_08(n) RBIMPL_ANYARGS_DISPATCH((n) ==  8, rb_define_protected_method_08, RBIMPL_ANYARGS_DISPATCH_rb_define_protected_method_07(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_protected_method_09(n) RBIMPL_ANYARGS_DISPATCH((n) ==  9, rb_define_protected_method_09, RBIMPL_ANYARGS_DISPATCH_rb_define_protected_method_08(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_protected_method_10(n) RBIMPL_ANYARGS_DISPATCH((n) == 10, rb_define_protected_method_10, RBIMPL_ANYARGS_DISPATCH_rb_define_protected_method_09(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_protected_method_11(n) RBIMPL_ANYARGS_DISPATCH((n) == 11, rb_define_protected_method_11, RBIMPL_ANYARGS_DISPATCH_rb_define_protected_method_10(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_protected_method_12(n) RBIMPL_ANYARGS_DISPATCH((n) == 12, rb_define_protected_method_12, RBIMPL_ANYARGS_DISPATCH_rb_define_protected_method_11(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_protected_method_13(n) RBIMPL_ANYARGS_DISPATCH((n) == 13, rb_define_protected_method_13, RBIMPL_ANYARGS_DISPATCH_rb_define_protected_method_12(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_protected_method_14(n) RBIMPL_ANYARGS_DISPATCH((n) == 14, rb_define_protected_method_14, RBIMPL_ANYARGS_DISPATCH_rb_define_protected_method_13(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_protected_method_15(n) RBIMPL_ANYARGS_DISPATCH((n) == 15, rb_define_protected_method_15, RBIMPL_ANYARGS_DISPATCH_rb_define_protected_method_14(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_private_method_m2(n)   RBIMPL_ANYARGS_DISPATCH((n) == -2, rb_define_private_method_m2,   rb_define_private_method_m3)
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_private_method_m1(n)   RBIMPL_ANYARGS_DISPATCH((n) == -1, rb_define_private_method_m1,   RBIMPL_ANYARGS_DISPATCH_rb_define_private_method_m2(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_private_method_00(n)   RBIMPL_ANYARGS_DISPATCH((n) ==  0, rb_define_private_method_00,   RBIMPL_ANYARGS_DISPATCH_rb_define_private_method_m1(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_private_method_01(n)   RBIMPL_ANYARGS_DISPATCH((n) ==  1, rb_define_private_method_01,   RBIMPL_ANYARGS_DISPATCH_rb_define_private_method_00(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_private_method_02(n)   RBIMPL_ANYARGS_DISPATCH((n) ==  2, rb_define_private_method_02,   RBIMPL_ANYARGS_DISPATCH_rb_define_private_method_01(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_private_method_03(n)   RBIMPL_ANYARGS_DISPATCH((n) ==  3, rb_define_private_method_03,   RBIMPL_ANYARGS_DISPATCH_rb_define_private_method_02(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_private_method_04(n)   RBIMPL_ANYARGS_DISPATCH((n) ==  4, rb_define_private_method_04,   RBIMPL_ANYARGS_DISPATCH_rb_define_private_method_03(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_private_method_05(n)   RBIMPL_ANYARGS_DISPATCH((n) ==  5, rb_define_private_method_05,   RBIMPL_ANYARGS_DISPATCH_rb_define_private_method_04(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_private_method_06(n)   RBIMPL_ANYARGS_DISPATCH((n) ==  6, rb_define_private_method_06,   RBIMPL_ANYARGS_DISPATCH_rb_define_private_method_05(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_private_method_07(n)   RBIMPL_ANYARGS_DISPATCH((n) ==  7, rb_define_private_method_07,   RBIMPL_ANYARGS_DISPATCH_rb_define_private_method_06(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_private_method_08(n)   RBIMPL_ANYARGS_DISPATCH((n) ==  8, rb_define_private_method_08,   RBIMPL_ANYARGS_DISPATCH_rb_define_private_method_07(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_private_method_09(n)   RBIMPL_ANYARGS_DISPATCH((n) ==  9, rb_define_private_method_09,   RBIMPL_ANYARGS_DISPATCH_rb_define_private_method_08(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_private_method_10(n)   RBIMPL_ANYARGS_DISPATCH((n) == 10, rb_define_private_method_10,   RBIMPL_ANYARGS_DISPATCH_rb_define_private_method_09(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_private_method_11(n)   RBIMPL_ANYARGS_DISPATCH((n) == 11, rb_define_private_method_11,   RBIMPL_ANYARGS_DISPATCH_rb_define_private_method_10(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_private_method_12(n)   RBIMPL_ANYARGS_DISPATCH((n) == 12, rb_define_private_method_12,   RBIMPL_ANYARGS_DISPATCH_rb_define_private_method_11(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_private_method_13(n)   RBIMPL_ANYARGS_DISPATCH((n) == 13, rb_define_private_method_13,   RBIMPL_ANYARGS_DISPATCH_rb_define_private_method_12(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_private_method_14(n)   RBIMPL_ANYARGS_DISPATCH((n) == 14, rb_define_private_method_14,   RBIMPL_ANYARGS_DISPATCH_rb_define_private_method_13(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_private_method_15(n)   RBIMPL_ANYARGS_DISPATCH((n) == 15, rb_define_private_method_15,   RBIMPL_ANYARGS_DISPATCH_rb_define_private_method_14(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_module_function_m2(n)  RBIMPL_ANYARGS_DISPATCH((n) == -2, rb_define_module_function_m2,  rb_define_module_function_m3)
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_module_function_m1(n)  RBIMPL_ANYARGS_DISPATCH((n) == -1, rb_define_module_function_m1,  RBIMPL_ANYARGS_DISPATCH_rb_define_module_function_m2(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_module_function_00(n)  RBIMPL_ANYARGS_DISPATCH((n) ==  0, rb_define_module_function_00,  RBIMPL_ANYARGS_DISPATCH_rb_define_module_function_m1(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_module_function_01(n)  RBIMPL_ANYARGS_DISPATCH((n) ==  1, rb_define_module_function_01,  RBIMPL_ANYARGS_DISPATCH_rb_define_module_function_00(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_module_function_02(n)  RBIMPL_ANYARGS_DISPATCH((n) ==  2, rb_define_module_function_02,  RBIMPL_ANYARGS_DISPATCH_rb_define_module_function_01(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_module_function_03(n)  RBIMPL_ANYARGS_DISPATCH((n) ==  3, rb_define_module_function_03,  RBIMPL_ANYARGS_DISPATCH_rb_define_module_function_02(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_module_function_04(n)  RBIMPL_ANYARGS_DISPATCH((n) ==  4, rb_define_module_function_04,  RBIMPL_ANYARGS_DISPATCH_rb_define_module_function_03(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_module_function_05(n)  RBIMPL_ANYARGS_DISPATCH((n) ==  5, rb_define_module_function_05,  RBIMPL_ANYARGS_DISPATCH_rb_define_module_function_04(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_module_function_06(n)  RBIMPL_ANYARGS_DISPATCH((n) ==  6, rb_define_module_function_06,  RBIMPL_ANYARGS_DISPATCH_rb_define_module_function_05(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_module_function_07(n)  RBIMPL_ANYARGS_DISPATCH((n) ==  7, rb_define_module_function_07,  RBIMPL_ANYARGS_DISPATCH_rb_define_module_function_06(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_module_function_08(n)  RBIMPL_ANYARGS_DISPATCH((n) ==  8, rb_define_module_function_08,  RBIMPL_ANYARGS_DISPATCH_rb_define_module_function_07(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_module_function_09(n)  RBIMPL_ANYARGS_DISPATCH((n) ==  9, rb_define_module_function_09,  RBIMPL_ANYARGS_DISPATCH_rb_define_module_function_08(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_module_function_10(n)  RBIMPL_ANYARGS_DISPATCH((n) == 10, rb_define_module_function_10,  RBIMPL_ANYARGS_DISPATCH_rb_define_module_function_09(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_module_function_11(n)  RBIMPL_ANYARGS_DISPATCH((n) == 11, rb_define_module_function_11,  RBIMPL_ANYARGS_DISPATCH_rb_define_module_function_10(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_module_function_12(n)  RBIMPL_ANYARGS_DISPATCH((n) == 12, rb_define_module_function_12,  RBIMPL_ANYARGS_DISPATCH_rb_define_module_function_11(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_module_function_13(n)  RBIMPL_ANYARGS_DISPATCH((n) == 13, rb_define_module_function_13,  RBIMPL_ANYARGS_DISPATCH_rb_define_module_function_12(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_module_function_14(n)  RBIMPL_ANYARGS_DISPATCH((n) == 14, rb_define_module_function_14,  RBIMPL_ANYARGS_DISPATCH_rb_define_module_function_13(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_module_function_15(n)  RBIMPL_ANYARGS_DISPATCH((n) == 15, rb_define_module_function_15,  RBIMPL_ANYARGS_DISPATCH_rb_define_module_function_14(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_global_function_m2(n)  RBIMPL_ANYARGS_DISPATCH((n) == -2, rb_define_global_function_m2,  rb_define_global_function_m3)
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_global_function_m1(n)  RBIMPL_ANYARGS_DISPATCH((n) == -1, rb_define_global_function_m1,  RBIMPL_ANYARGS_DISPATCH_rb_define_global_function_m2(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_global_function_00(n)  RBIMPL_ANYARGS_DISPATCH((n) ==  0, rb_define_global_function_00,  RBIMPL_ANYARGS_DISPATCH_rb_define_global_function_m1(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_global_function_01(n)  RBIMPL_ANYARGS_DISPATCH((n) ==  1, rb_define_global_function_01,  RBIMPL_ANYARGS_DISPATCH_rb_define_global_function_00(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_global_function_02(n)  RBIMPL_ANYARGS_DISPATCH((n) ==  2, rb_define_global_function_02,  RBIMPL_ANYARGS_DISPATCH_rb_define_global_function_01(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_global_function_03(n)  RBIMPL_ANYARGS_DISPATCH((n) ==  3, rb_define_global_function_03,  RBIMPL_ANYARGS_DISPATCH_rb_define_global_function_02(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_global_function_04(n)  RBIMPL_ANYARGS_DISPATCH((n) ==  4, rb_define_global_function_04,  RBIMPL_ANYARGS_DISPATCH_rb_define_global_function_03(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_global_function_05(n)  RBIMPL_ANYARGS_DISPATCH((n) ==  5, rb_define_global_function_05,  RBIMPL_ANYARGS_DISPATCH_rb_define_global_function_04(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_global_function_06(n)  RBIMPL_ANYARGS_DISPATCH((n) ==  6, rb_define_global_function_06,  RBIMPL_ANYARGS_DISPATCH_rb_define_global_function_05(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_global_function_07(n)  RBIMPL_ANYARGS_DISPATCH((n) ==  7, rb_define_global_function_07,  RBIMPL_ANYARGS_DISPATCH_rb_define_global_function_06(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_global_function_08(n)  RBIMPL_ANYARGS_DISPATCH((n) ==  8, rb_define_global_function_08,  RBIMPL_ANYARGS_DISPATCH_rb_define_global_function_07(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_global_function_09(n)  RBIMPL_ANYARGS_DISPATCH((n) ==  9, rb_define_global_function_09,  RBIMPL_ANYARGS_DISPATCH_rb_define_global_function_08(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_global_function_10(n)  RBIMPL_ANYARGS_DISPATCH((n) == 10, rb_define_global_function_10,  RBIMPL_ANYARGS_DISPATCH_rb_define_global_function_09(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_global_function_11(n)  RBIMPL_ANYARGS_DISPATCH((n) == 11, rb_define_global_function_11,  RBIMPL_ANYARGS_DISPATCH_rb_define_global_function_10(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_global_function_12(n)  RBIMPL_ANYARGS_DISPATCH((n) == 12, rb_define_global_function_12,  RBIMPL_ANYARGS_DISPATCH_rb_define_global_function_11(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_global_function_13(n)  RBIMPL_ANYARGS_DISPATCH((n) == 13, rb_define_global_function_13,  RBIMPL_ANYARGS_DISPATCH_rb_define_global_function_12(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_global_function_14(n)  RBIMPL_ANYARGS_DISPATCH((n) == 14, rb_define_global_function_14,  RBIMPL_ANYARGS_DISPATCH_rb_define_global_function_13(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_global_function_15(n)  RBIMPL_ANYARGS_DISPATCH((n) == 15, rb_define_global_function_15,  RBIMPL_ANYARGS_DISPATCH_rb_define_global_function_14(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_method_id_m2(n)        RBIMPL_ANYARGS_DISPATCH((n) == -2, rb_define_method_id_m2,        rb_define_method_id_m3)
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_method_id_m1(n)        RBIMPL_ANYARGS_DISPATCH((n) == -1, rb_define_method_id_m1,        RBIMPL_ANYARGS_DISPATCH_rb_define_method_id_m2(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_method_id_00(n)        RBIMPL_ANYARGS_DISPATCH((n) ==  0, rb_define_method_id_00,        RBIMPL_ANYARGS_DISPATCH_rb_define_method_id_m1(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_method_id_01(n)        RBIMPL_ANYARGS_DISPATCH((n) ==  1, rb_define_method_id_01,        RBIMPL_ANYARGS_DISPATCH_rb_define_method_id_00(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_method_id_02(n)        RBIMPL_ANYARGS_DISPATCH((n) ==  2, rb_define_method_id_02,        RBIMPL_ANYARGS_DISPATCH_rb_define_method_id_01(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_method_id_03(n)        RBIMPL_ANYARGS_DISPATCH((n) ==  3, rb_define_method_id_03,        RBIMPL_ANYARGS_DISPATCH_rb_define_method_id_02(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_method_id_04(n)        RBIMPL_ANYARGS_DISPATCH((n) ==  4, rb_define_method_id_04,        RBIMPL_ANYARGS_DISPATCH_rb_define_method_id_03(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_method_id_05(n)        RBIMPL_ANYARGS_DISPATCH((n) ==  5, rb_define_method_id_05,        RBIMPL_ANYARGS_DISPATCH_rb_define_method_id_04(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_method_id_06(n)        RBIMPL_ANYARGS_DISPATCH((n) ==  6, rb_define_method_id_06,        RBIMPL_ANYARGS_DISPATCH_rb_define_method_id_05(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_method_id_07(n)        RBIMPL_ANYARGS_DISPATCH((n) ==  7, rb_define_method_id_07,        RBIMPL_ANYARGS_DISPATCH_rb_define_method_id_06(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_method_id_08(n)        RBIMPL_ANYARGS_DISPATCH((n) ==  8, rb_define_method_id_08,        RBIMPL_ANYARGS_DISPATCH_rb_define_method_id_07(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_method_id_09(n)        RBIMPL_ANYARGS_DISPATCH((n) ==  9, rb_define_method_id_09,        RBIMPL_ANYARGS_DISPATCH_rb_define_method_id_08(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_method_id_10(n)        RBIMPL_ANYARGS_DISPATCH((n) == 10, rb_define_method_id_10,        RBIMPL_ANYARGS_DISPATCH_rb_define_method_id_09(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_method_id_11(n)        RBIMPL_ANYARGS_DISPATCH((n) == 11, rb_define_method_id_11,        RBIMPL_ANYARGS_DISPATCH_rb_define_method_id_10(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_method_id_12(n)        RBIMPL_ANYARGS_DISPATCH((n) == 12, rb_define_method_id_12,        RBIMPL_ANYARGS_DISPATCH_rb_define_method_id_11(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_method_id_13(n)        RBIMPL_ANYARGS_DISPATCH((n) == 13, rb_define_method_id_13,        RBIMPL_ANYARGS_DISPATCH_rb_define_method_id_12(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_method_id_14(n)        RBIMPL_ANYARGS_DISPATCH((n) == 14, rb_define_method_id_14,        RBIMPL_ANYARGS_DISPATCH_rb_define_method_id_13(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_method_id_15(n)        RBIMPL_ANYARGS_DISPATCH((n) == 15, rb_define_method_id_15,        RBIMPL_ANYARGS_DISPATCH_rb_define_method_id_14(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_method_m2(n)           RBIMPL_ANYARGS_DISPATCH((n) == -2, rb_define_method_m2,           rb_define_method_m3)
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_method_m1(n)           RBIMPL_ANYARGS_DISPATCH((n) == -1, rb_define_method_m1,           RBIMPL_ANYARGS_DISPATCH_rb_define_method_m2(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_method_00(n)           RBIMPL_ANYARGS_DISPATCH((n) ==  0, rb_define_method_00,           RBIMPL_ANYARGS_DISPATCH_rb_define_method_m1(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_method_01(n)           RBIMPL_ANYARGS_DISPATCH((n) ==  1, rb_define_method_01,           RBIMPL_ANYARGS_DISPATCH_rb_define_method_00(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_method_02(n)           RBIMPL_ANYARGS_DISPATCH((n) ==  2, rb_define_method_02,           RBIMPL_ANYARGS_DISPATCH_rb_define_method_01(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_method_03(n)           RBIMPL_ANYARGS_DISPATCH((n) ==  3, rb_define_method_03,           RBIMPL_ANYARGS_DISPATCH_rb_define_method_02(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_method_04(n)           RBIMPL_ANYARGS_DISPATCH((n) ==  4, rb_define_method_04,           RBIMPL_ANYARGS_DISPATCH_rb_define_method_03(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_method_05(n)           RBIMPL_ANYARGS_DISPATCH((n) ==  5, rb_define_method_05,           RBIMPL_ANYARGS_DISPATCH_rb_define_method_04(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_method_06(n)           RBIMPL_ANYARGS_DISPATCH((n) ==  6, rb_define_method_06,           RBIMPL_ANYARGS_DISPATCH_rb_define_method_05(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_method_07(n)           RBIMPL_ANYARGS_DISPATCH((n) ==  7, rb_define_method_07,           RBIMPL_ANYARGS_DISPATCH_rb_define_method_06(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_method_08(n)           RBIMPL_ANYARGS_DISPATCH((n) ==  8, rb_define_method_08,           RBIMPL_ANYARGS_DISPATCH_rb_define_method_07(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_method_09(n)           RBIMPL_ANYARGS_DISPATCH((n) ==  9, rb_define_method_09,           RBIMPL_ANYARGS_DISPATCH_rb_define_method_08(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_method_10(n)           RBIMPL_ANYARGS_DISPATCH((n) == 10, rb_define_method_10,           RBIMPL_ANYARGS_DISPATCH_rb_define_method_09(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_method_11(n)           RBIMPL_ANYARGS_DISPATCH((n) == 11, rb_define_method_11,           RBIMPL_ANYARGS_DISPATCH_rb_define_method_10(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_method_12(n)           RBIMPL_ANYARGS_DISPATCH((n) == 12, rb_define_method_12,           RBIMPL_ANYARGS_DISPATCH_rb_define_method_11(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_method_13(n)           RBIMPL_ANYARGS_DISPATCH((n) == 13, rb_define_method_13,           RBIMPL_ANYARGS_DISPATCH_rb_define_method_12(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_method_14(n)           RBIMPL_ANYARGS_DISPATCH((n) == 14, rb_define_method_14,           RBIMPL_ANYARGS_DISPATCH_rb_define_method_13(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_method_15(n)           RBIMPL_ANYARGS_DISPATCH((n) == 15, rb_define_method_15,           RBIMPL_ANYARGS_DISPATCH_rb_define_method_14(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_singleton_method(n, f) RBIMPL_ANYARGS_DISPATCH(RBIMPL_CFUNC_IS_rb_f_notimplement(f), rb_define_singleton_method_m3, RBIMPL_ANYARGS_DISPATCH_rb_define_singleton_method_15(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_protected_method(n, f) RBIMPL_ANYARGS_DISPATCH(RBIMPL_CFUNC_IS_rb_f_notimplement(f), rb_define_protected_method_m3, RBIMPL_ANYARGS_DISPATCH_rb_define_protected_method_15(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_private_method(n, f)   RBIMPL_ANYARGS_DISPATCH(RBIMPL_CFUNC_IS_rb_f_notimplement(f), rb_define_private_method_m3,   RBIMPL_ANYARGS_DISPATCH_rb_define_private_method_15(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_module_function(n, f)  RBIMPL_ANYARGS_DISPATCH(RBIMPL_CFUNC_IS_rb_f_notimplement(f), rb_define_module_function_m3,  RBIMPL_ANYARGS_DISPATCH_rb_define_module_function_15(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_global_function(n, f)  RBIMPL_ANYARGS_DISPATCH(RBIMPL_CFUNC_IS_rb_f_notimplement(f), rb_define_global_function_m3,  RBIMPL_ANYARGS_DISPATCH_rb_define_global_function_15(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_method_id(n, f)        RBIMPL_ANYARGS_DISPATCH(RBIMPL_CFUNC_IS_rb_f_notimplement(f), rb_define_method_id_m3,        RBIMPL_ANYARGS_DISPATCH_rb_define_method_id_15(n))
+# define RBIMPL_ANYARGS_DISPATCH_rb_define_method(n, f)           RBIMPL_ANYARGS_DISPATCH(RBIMPL_CFUNC_IS_rb_f_notimplement(f), rb_define_method_m3,           RBIMPL_ANYARGS_DISPATCH_rb_define_method_15(n))
+# define RBIMPL_ANYARGS_ATTRSET(sym) RBIMPL_ATTR_MAYBE_UNUSED() RBIMPL_ATTR_NONNULL() RBIMPL_ATTR_WEAKREF(sym)
+# define RBIMPL_ANYARGS_DECL(sym, ...) \
+RBIMPL_ANYARGS_ATTRSET(sym) static void sym ## _m3(__VA_ARGS__, VALUE(*)(ANYARGS), int); \
+RBIMPL_ANYARGS_ATTRSET(sym) static void sym ## _m2(__VA_ARGS__, VALUE(*)(VALUE, VALUE), int); \
+RBIMPL_ANYARGS_ATTRSET(sym) static void sym ## _m1(__VA_ARGS__, VALUE(*)(int, union { VALUE *x; const VALUE *y; } __attribute__((__transparent_union__)), VALUE), int); \
+RBIMPL_ANYARGS_ATTRSET(sym) static void sym ## _00(__VA_ARGS__, VALUE(*)(VALUE), int); \
+RBIMPL_ANYARGS_ATTRSET(sym) static void sym ## _01(__VA_ARGS__, VALUE(*)(VALUE, VALUE), int); \
+RBIMPL_ANYARGS_ATTRSET(sym) static void sym ## _02(__VA_ARGS__, VALUE(*)(VALUE, VALUE, VALUE), int); \
+RBIMPL_ANYARGS_ATTRSET(sym) static void sym ## _03(__VA_ARGS__, VALUE(*)(VALUE, VALUE, VALUE, VALUE), int); \
+RBIMPL_ANYARGS_ATTRSET(sym) static void sym ## _04(__VA_ARGS__, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE), int); \
+RBIMPL_ANYARGS_ATTRSET(sym) static void sym ## _05(__VA_ARGS__, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE), int); \
+RBIMPL_ANYARGS_ATTRSET(sym) static void sym ## _06(__VA_ARGS__, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE), int); \
+RBIMPL_ANYARGS_ATTRSET(sym) static void sym ## _07(__VA_ARGS__, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE), int); \
+RBIMPL_ANYARGS_ATTRSET(sym) static void sym ## _08(__VA_ARGS__, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE), int); \
+RBIMPL_ANYARGS_ATTRSET(sym) static void sym ## _09(__VA_ARGS__, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE), int); \
+RBIMPL_ANYARGS_ATTRSET(sym) static void sym ## _10(__VA_ARGS__, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE), int); \
+RBIMPL_ANYARGS_ATTRSET(sym) static void sym ## _11(__VA_ARGS__, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE), int); \
+RBIMPL_ANYARGS_ATTRSET(sym) static void sym ## _12(__VA_ARGS__, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE), int); \
+RBIMPL_ANYARGS_ATTRSET(sym) static void sym ## _13(__VA_ARGS__, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE), int); \
+RBIMPL_ANYARGS_ATTRSET(sym) static void sym ## _14(__VA_ARGS__, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE), int); \
+RBIMPL_ANYARGS_ATTRSET(sym) static void sym ## _15(__VA_ARGS__, VALUE(*)(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE), int);
+RBIMPL_ANYARGS_DECL(rb_define_singleton_method, VALUE, const char *)
+RBIMPL_ANYARGS_DECL(rb_define_protected_method, VALUE, const char *)
+RBIMPL_ANYARGS_DECL(rb_define_private_method, VALUE, const char *)
+RBIMPL_ANYARGS_DECL(rb_define_module_function, VALUE, const char *)
+RBIMPL_ANYARGS_DECL(rb_define_global_function, const char *)
+RBIMPL_ANYARGS_DECL(rb_define_method_id, VALUE, ID)
+RBIMPL_ANYARGS_DECL(rb_define_method, VALUE, const char *)
+/** @endcond */
+
+/**
+ * @brief  Defines klass\#mid.
+ * @see    ::rb_define_method
+ * @param  klass  Where the method lives.
+ * @param  mid    Name of the defining method.
+ * @param  func   Implementation of klass\#mid.
+ * @param  arity  Arity of klass\#mid.
+ */
+#define rb_define_method(klass, mid, func, arity)           RBIMPL_ANYARGS_DISPATCH_rb_define_method((arity), (func))((klass), (mid), (func), (arity))
+
+/**
+ * @brief  Defines klass\#mid.
+ * @see    ::rb_define_method_id
+ * @param  klass  Where the method lives.
+ * @param  mid    Name of the defining method.
+ * @param  func   Implementation of klass\#mid.
+ * @param  arity  Arity of klass\#mid.
+ */
+#define rb_define_method_id(klass, mid, func, arity)        RBIMPL_ANYARGS_DISPATCH_rb_define_method_id((arity), (func))((klass), (mid), (func), (arity))
+
+/**
+ * @brief  Defines obj.mid.
+ * @see    ::rb_define_singleton_method
+ * @param  obj    Where the method lives.
+ * @param  mid    Name of the defining method.
+ * @param  func   Implementation of obj.mid.
+ * @param  arity  Arity of obj.mid.
+ */
+#define rb_define_singleton_method(obj, mid, func, arity)   RBIMPL_ANYARGS_DISPATCH_rb_define_singleton_method((arity), (func))((obj), (mid), (func), (arity))
+
+/**
+ * @brief  Defines klass\#mid and make it protected.
+ * @see    ::rb_define_protected_method
+ * @param  klass  Where the method lives.
+ * @param  mid    Name of the defining method.
+ * @param  func   Implementation of klass\#mid.
+ * @param  arity  Arity of klass\#mid.
+ */
+#define rb_define_protected_method(klass, mid, func, arity) RBIMPL_ANYARGS_DISPATCH_rb_define_protected_method((arity), (func))((klass), (mid), (func), (arity))
+
+/**
+ * @brief  Defines klass\#mid and make it private.
+ * @see    ::rb_define_private_method
+ * @param  klass  Where the method lives.
+ * @param  mid    Name of the defining method.
+ * @param  func   Implementation of klass\#mid.
+ * @param  arity  Arity of klass\#mid.
+ */
+#define rb_define_private_method(klass, mid, func, arity)   RBIMPL_ANYARGS_DISPATCH_rb_define_private_method((arity), (func))((klass), (mid), (func), (arity))
+
+/**
+ * @brief  Defines mod\#mid and make it a module function.
+ * @see    ::rb_define_module_function
+ * @param  mod    Where the method lives.
+ * @param  mid    Name of the defining method.
+ * @param  func   Implementation of mod\#mid.
+ * @param  arity  Arity of mod\#mid.
+ */
+#define rb_define_module_function(mod, mid, func, arity)    RBIMPL_ANYARGS_DISPATCH_rb_define_module_function((arity), (func))((mod), (mid), (func), (arity))
+
+/**
+ * @brief  Defines ::rb_mKerbel \#mid.
+ * @see    ::rb_define_gobal_function
+ * @param  mid    Name of the defining method.
+ * @param  func   Implementation of ::rb_mKernel \#mid.
+ * @param  arity  Arity of ::rb_mKernel \#mid.
+ */
+#define rb_define_global_function(mid, func, arity)         RBIMPL_ANYARGS_DISPATCH_rb_define_global_function((arity), (func))((mid), (func), (arity))
+
+#endif /* __cplusplus */
+
+/**
+ * This  macro is  to properly  cast  a function  parameter of  *_define_method
+ * family.  It  has been  around since  1.x era so  you can  maximize backwards
+ * compatibility by using it.
+ *
+ * ```CXX
+ * rb_define_method(klass, "method", RUBY_METHOD_FUNC(func), arity);
+ * ```
+ *
+ * @param  func  A pointer to a function that implements a method.
+ */
+#if ! defined(RUBY_DEVEL)
+# define RUBY_METHOD_FUNC(func) RBIMPL_CAST((VALUE (*)(ANYARGS))(func))
+
+#elif ! RUBY_DEVEL
+# define RUBY_METHOD_FUNC(func) RBIMPL_CAST((VALUE (*)(ANYARGS))(func))
+
+#elif ! defined(rb_define_method)
+# define RUBY_METHOD_FUNC(func) RBIMPL_CAST((VALUE (*)(ANYARGS))(func))
+
+#else
+# define RUBY_METHOD_FUNC(func) (func)
+
+#endif
+
+#endif /* RBIMPL_ANYARGS_H */
diff --git a/include/ruby/internal/arithmetic.h b/include/ruby/internal/arithmetic.h
new file mode 100644
index 0000000000..c3806db444
--- /dev/null
+++ b/include/ruby/internal/arithmetic.h
@@ -0,0 +1,38 @@
+#ifndef RBIMPL_ARITHMETIC_H                          /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ARITHMETIC_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Conversion between C's arithmtic types and Ruby's numeric types.
+ */
+#include "ruby/internal/arithmetic/char.h"
+#include "ruby/internal/arithmetic/double.h"
+#include "ruby/internal/arithmetic/fixnum.h"
+#include "ruby/internal/arithmetic/gid_t.h"
+#include "ruby/internal/arithmetic/int.h"
+#include "ruby/internal/arithmetic/intptr_t.h"
+#include "ruby/internal/arithmetic/long.h"
+#include "ruby/internal/arithmetic/long_long.h"
+#include "ruby/internal/arithmetic/mode_t.h"
+#include "ruby/internal/arithmetic/off_t.h"
+#include "ruby/internal/arithmetic/pid_t.h"
+#include "ruby/internal/arithmetic/short.h"
+#include "ruby/internal/arithmetic/size_t.h"
+#include "ruby/internal/arithmetic/st_data_t.h"
+#include "ruby/internal/arithmetic/uid_t.h"
+#endif /* RBIMPL_ARITHMETIC_H */
diff --git a/include/ruby/internal/arithmetic/char.h b/include/ruby/internal/arithmetic/char.h
new file mode 100644
index 0000000000..3033639a43
--- /dev/null
+++ b/include/ruby/internal/arithmetic/char.h
@@ -0,0 +1,58 @@
+#ifndef RBIMPL_ARITHMETIC_CHAR_H                     /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ARITHMETIC_CHAR_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Arithmetic conversion between C's `char` and Ruby's.
+ */
+#include "ruby/internal/arithmetic/int.h"  /* NUM2INT is here, but */
+#include "ruby/internal/arithmetic/long.h" /* INT2FIX is here.*/
+#include "ruby/internal/attr/artificial.h"
+#include "ruby/internal/attr/const.h"
+#include "ruby/internal/attr/constexpr.h"
+#include "ruby/internal/cast.h"
+#include "ruby/internal/core/rstring.h"
+#include "ruby/internal/value_type.h"
+
+#define RB_NUM2CHR rb_num2char_inline
+#define NUM2CHR    RB_NUM2CHR
+#define CHR2FIX    RB_CHR2FIX
+
+/** @cond INTERNAL_MACRO */
+#define RB_CHR2FIX RB_CHR2FIX
+/** @endcond */
+
+RBIMPL_ATTR_CONST_UNLESS_DEBUG()
+RBIMPL_ATTR_CONSTEXPR_UNLESS_DEBUG(CXX14)
+RBIMPL_ATTR_ARTIFICIAL()
+static inline VALUE
+RB_CHR2FIX(unsigned char c)
+{
+    return RB_INT2FIX(c);
+}
+
+static inline char
+rb_num2char_inline(VALUE x)
+{
+    if (RB_TYPE_P(x, RUBY_T_STRING) && (RSTRING_LEN(x)>=1))
+        return RSTRING_PTR(x)[0];
+    else
+        return RBIMPL_CAST((char)RB_NUM2INT(x));
+}
+
+#endif /* RBIMPL_ARITHMETIC_CHAR_H */
diff --git a/include/ruby/internal/arithmetic/double.h b/include/ruby/internal/arithmetic/double.h
new file mode 100644
index 0000000000..69d8630dbb
--- /dev/null
+++ b/include/ruby/internal/arithmetic/double.h
@@ -0,0 +1,39 @@
+#ifndef RBIMPL_ARITHMETIC_DOUBLE_H                   /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ARITHMETIC_DOUBLE_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Arithmetic conversion between C's `double` and Ruby's.
+ */
+#include "ruby/internal/attr/pure.h"
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+
+#define NUM2DBL      rb_num2dbl
+#define RFLOAT_VALUE rb_float_value
+#define DBL2NUM      rb_float_new
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+double rb_num2dbl(VALUE);
+RBIMPL_ATTR_PURE()
+double rb_float_value(VALUE);
+VALUE rb_float_new(double);
+VALUE rb_float_new_in_heap(double);
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_ARITHMETIC_DOUBLE_H */
diff --git a/include/ruby/internal/arithmetic/fixnum.h b/include/ruby/internal/arithmetic/fixnum.h
new file mode 100644
index 0000000000..68544b760b
--- /dev/null
+++ b/include/ruby/internal/arithmetic/fixnum.h
@@ -0,0 +1,44 @@
+#ifndef RBIMPL_ARITHMETIC_FIXNUM_H                   /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ARITHMETIC_FIXNUM_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Handling of integers formerly known as Fixnums.
+ */
+#include "ruby/backward/2/limits.h"
+
+#define FIXABLE    RB_FIXABLE
+#define FIXNUM_MAX RUBY_FIXNUM_MAX
+#define FIXNUM_MIN RUBY_FIXNUM_MIN
+#define NEGFIXABLE RB_NEGFIXABLE
+#define POSFIXABLE RB_POSFIXABLE
+
+/*
+ * FIXABLE can be applied to anything, from double to intmax_t.  The problem is
+ * double.   On a  64bit system  RUBY_FIXNUM_MAX is  4,611,686,018,427,387,903,
+ * which is not representable by a double.  The nearest value that a double can
+ * represent  is   4,611,686,018,427,387,904,  which   is  not   fixable.   The
+ * seemingly-stragne "< FIXNUM_MAX + 1" expression below is due to this.
+ */
+#define RB_POSFIXABLE(_) ((_) <  RUBY_FIXNUM_MAX + 1)
+#define RB_NEGFIXABLE(_) ((_) >= RUBY_FIXNUM_MIN)
+#define RB_FIXABLE(_)    (RB_POSFIXABLE(_) && RB_NEGFIXABLE(_))
+#define RUBY_FIXNUM_MAX  (LONG_MAX / 2)
+#define RUBY_FIXNUM_MIN  (LONG_MIN / 2)
+
+#endif /* RBIMPL_ARITHMETIC_FIXNUM_H */
diff --git a/include/ruby/internal/arithmetic/gid_t.h b/include/ruby/internal/arithmetic/gid_t.h
new file mode 100644
index 0000000000..32e3578bd2
--- /dev/null
+++ b/include/ruby/internal/arithmetic/gid_t.h
@@ -0,0 +1,34 @@
+#ifndef RBIMPL_ARITHMETIC_GID_T_H                    /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ARITHMETIC_GID_T_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Arithmetic conversion between C's `gid_t` and Ruby's.
+ */
+#include "ruby/internal/config.h"
+#include "ruby/internal/arithmetic/long.h"
+
+#ifndef GIDT2NUM
+# define GIDT2NUM RB_LONG2NUM
+#endif
+
+#ifndef NUM2GIDT
+# define NUM2GIDT RB_NUM2LONG
+#endif
+
+#endif /* RBIMPL_ARITHMETIC_GID_T_H */
diff --git a/include/ruby/internal/arithmetic/int.h b/include/ruby/internal/arithmetic/int.h
new file mode 100644
index 0000000000..346fa9258b
--- /dev/null
+++ b/include/ruby/internal/arithmetic/int.h
@@ -0,0 +1,163 @@
+#ifndef RBIMPL_ARITHMETIC_INT_H                      /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ARITHMETIC_INT_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Arithmetic conversion between C's `int` and Ruby's.
+ */
+#include "ruby/internal/config.h"
+#include "ruby/internal/arithmetic/fixnum.h"
+#include "ruby/internal/arithmetic/intptr_t.h"
+#include "ruby/internal/arithmetic/long.h"
+#include "ruby/internal/attr/artificial.h"
+#include "ruby/internal/attr/const.h"
+#include "ruby/internal/attr/constexpr.h"
+#include "ruby/internal/compiler_is.h"
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/special_consts.h"
+#include "ruby/internal/value.h"
+#include "ruby/internal/warning_push.h"
+#include "ruby/assert.h"
+
+#define RB_INT2NUM  rb_int2num_inline
+#define RB_NUM2INT  rb_num2int_inline
+#define RB_UINT2NUM rb_uint2num_inline
+
+#define FIX2INT    RB_FIX2INT
+#define FIX2UINT   RB_FIX2UINT
+#define INT2NUM    RB_INT2NUM
+#define NUM2INT    RB_NUM2INT
+#define NUM2UINT   RB_NUM2UINT
+#define UINT2NUM   RB_UINT2NUM
+
+/** @cond INTERNAL_MACRO */
+#define RB_FIX2INT  RB_FIX2INT
+#define RB_NUM2UINT RB_NUM2UINT
+#define RB_FIX2UINT RB_FIX2UINT
+/** @endcond */
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+long rb_num2int(VALUE);
+long rb_fix2int(VALUE);
+unsigned long rb_num2uint(VALUE);
+unsigned long rb_fix2uint(VALUE);
+RBIMPL_SYMBOL_EXPORT_END()
+
+RBIMPL_ATTR_ARTIFICIAL()
+static inline int
+RB_FIX2INT(VALUE x)
+{
+    /* "FIX2INT raises a  TypeError if passed nil", says rubyspec.  Not sure if
+     * that is a desired behaviour but just preserve backwards compatilibily.
+     */
+#if 0
+    RBIMPL_ASSERT_OR_ASSUME(RB_FIXNUM_P(x));
+#endif
+    long ret;
+
+    if /* constexpr */ (sizeof(int) < sizeof(long)) {
+        ret = rb_fix2int(x);
+    }
+    else {
+        ret = RB_FIX2LONG(x);
+    }
+
+    return RBIMPL_CAST((int)ret);
+}
+
+static inline int
+rb_num2int_inline(VALUE x)
+{
+    long ret;
+
+    if /* constexpr */ (sizeof(int) == sizeof(long)) {
+        ret = RB_NUM2LONG(x);
+    }
+    else if (RB_FIXNUM_P(x)) {
+        ret = rb_fix2int(x);
+    }
+    else {
+        ret = rb_num2int(x);
+    }
+
+    return RBIMPL_CAST((int)ret);
+}
+
+RBIMPL_ATTR_ARTIFICIAL()
+static inline unsigned int
+RB_NUM2UINT(VALUE x)
+{
+    unsigned long ret;
+
+    if /* constexpr */ (sizeof(int) < sizeof(long)) {
+        ret = rb_num2uint(x);
+    }
+    else {
+        ret = RB_NUM2ULONG(x);
+    }
+
+    return RBIMPL_CAST((unsigned int)ret);
+}
+
+RBIMPL_ATTR_ARTIFICIAL()
+static inline unsigned int
+RB_FIX2UINT(VALUE x)
+{
+#if 0 /* Ditto for RB_FIX2INT. */
+    RBIMPL_ASSERT_OR_ASSUME(RB_FIXNUM_P(x));
+#endif
+    unsigned long ret;
+
+    if /* constexpr */ (sizeof(int) < sizeof(long)) {
+        ret = rb_fix2uint(x);
+    }
+    else {
+        ret = RB_FIX2ULONG(x);
+    }
+
+    return RBIMPL_CAST((unsigned int)ret);
+}
+
+RBIMPL_WARNING_PUSH()
+#if RBIMPL_COMPILER_IS(GCC)
+RBIMPL_WARNING_IGNORED(-Wtype-limits) /* We can ignore them here. */
+#elif RBIMPL_HAS_WARNING("-Wtautological-constant-out-of-range-compare")
+RBIMPL_WARNING_IGNORED(-Wtautological-constant-out-of-range-compare)
+#endif
+
+static inline VALUE
+rb_int2num_inline(int v)
+{
+    if (RB_FIXABLE(v))
+        return RB_INT2FIX(v);
+    else
+        return rb_int2big(v);
+}
+
+static inline VALUE
+rb_uint2num_inline(unsigned int v)
+{
+    if (RB_POSFIXABLE(v))
+        return RB_LONG2FIX(v);
+    else
+        return rb_uint2big(v);
+}
+
+RBIMPL_WARNING_POP()
+
+#endif /* RBIMPL_ARITHMETIC_INT_H */
diff --git a/include/ruby/internal/arithmetic/intptr_t.h b/include/ruby/internal/arithmetic/intptr_t.h
new file mode 100644
index 0000000000..442c87144c
--- /dev/null
+++ b/include/ruby/internal/arithmetic/intptr_t.h
@@ -0,0 +1,42 @@
+#ifndef RBIMPL_ARITHMETIC_INTPTR_T_H                 /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ARITHMETIC_INTPTR_T_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Arithmetic conversion between C's `intptr_t` and Ruby's.
+ */
+#include "ruby/internal/config.h"
+
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+
+#include "ruby/internal/value.h"
+#include "ruby/internal/dllexport.h"
+
+#define rb_int_new  rb_int2inum
+#define rb_uint_new rb_uint2inum
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+VALUE rb_int2big(intptr_t i);
+VALUE rb_int2inum(intptr_t i);
+VALUE rb_uint2big(uintptr_t i);
+VALUE rb_uint2inum(uintptr_t i);
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_ARITHMETIC_INTPTR_T_H */
diff --git a/include/ruby/internal/arithmetic/long.h b/include/ruby/internal/arithmetic/long.h
new file mode 100644
index 0000000000..aff7d68478
--- /dev/null
+++ b/include/ruby/internal/arithmetic/long.h
@@ -0,0 +1,244 @@
+#ifndef RBIMPL_ARITHMETIC_LONG_H                     /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ARITHMETIC_LONG_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Arithmetic conversion between C's `long` and Ruby's.
+ *
+ * ### Q&A ###
+ *
+ * - Q: Why are INT2FIX etc. here, not in `int.h`?
+ *
+ * - A: Because they  are in fact  handling `long`.   It seems someone  did not
+ *      understand the difference of `int`  and `long` when they designed those
+ *      macros.
+ */
+#include "ruby/internal/config.h"
+#include "ruby/internal/arithmetic/fixnum.h"   /* FIXABLE */
+#include "ruby/internal/arithmetic/intptr_t.h" /* rb_int2big etc.*/
+#include "ruby/internal/assume.h"
+#include "ruby/internal/attr/artificial.h"
+#include "ruby/internal/attr/cold.h"
+#include "ruby/internal/attr/const.h"
+#include "ruby/internal/attr/constexpr.h"
+#include "ruby/internal/attr/noreturn.h"
+#include "ruby/internal/cast.h"
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/special_consts.h"      /* FIXNUM_FLAG */
+#include "ruby/internal/value.h"
+#include "ruby/assert.h"
+
+#define FIX2LONG     RB_FIX2LONG
+#define FIX2ULONG    RB_FIX2ULONG
+#define INT2FIX      RB_INT2FIX
+#define LONG2FIX     RB_INT2FIX
+#define LONG2NUM     RB_LONG2NUM
+#define NUM2LONG     RB_NUM2LONG
+#define NUM2ULONG    RB_NUM2ULONG
+#define RB_FIX2LONG  rb_fix2long
+#define RB_FIX2ULONG rb_fix2ulong
+#define RB_LONG2FIX  RB_INT2FIX
+#define RB_LONG2NUM  rb_long2num_inline
+#define RB_NUM2LONG  rb_num2long_inline
+#define RB_NUM2ULONG rb_num2ulong_inline
+#define RB_ULONG2NUM rb_ulong2num_inline
+#define ULONG2NUM    RB_ULONG2NUM
+#define rb_fix_new   RB_INT2FIX
+#define rb_long2int  rb_long2int_inline
+
+/** @cond INTERNAL_MACRO */
+#define RB_INT2FIX RB_INT2FIX
+/** @endcond */
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+RBIMPL_ATTR_NORETURN()
+RBIMPL_ATTR_COLD()
+void rb_out_of_int(SIGNED_VALUE num);
+
+long rb_num2long(VALUE num);
+unsigned long rb_num2ulong(VALUE num);
+RBIMPL_SYMBOL_EXPORT_END()
+
+RBIMPL_ATTR_CONST_UNLESS_DEBUG()
+RBIMPL_ATTR_CONSTEXPR_UNLESS_DEBUG(CXX14)
+RBIMPL_ATTR_ARTIFICIAL()
+static inline VALUE
+RB_INT2FIX(long i)
+{
+    RBIMPL_ASSERT_OR_ASSUME(RB_FIXABLE(i));
+
+    /* :NOTE: VALUE can be wider than long.  As j being unsigned, 2j+1 is fully
+     * defined. Also it can be compiled into a single LEA instruction. */
+    const unsigned long j = i;
+    const unsigned long k = 2 * j + RUBY_FIXNUM_FLAG;
+    const long          l = k;
+    const SIGNED_VALUE  m = l; /* Sign extend */
+    const VALUE         n = m;
+
+    RBIMPL_ASSERT_OR_ASSUME(RB_FIXNUM_P(n));
+    return n;
+}
+
+static inline int
+rb_long2int_inline(long n)
+{
+    int i = RBIMPL_CAST((int)n);
+
+    if /* constexpr */ (sizeof(long) <= sizeof(int)) {
+        RBIMPL_ASSUME(i == n);
+    }
+
+    if (i != n)
+        rb_out_of_int(n);
+
+    return i;
+}
+
+RBIMPL_ATTR_CONST_UNLESS_DEBUG()
+RBIMPL_ATTR_CONSTEXPR_UNLESS_DEBUG(CXX14)
+static inline long
+rbimpl_fix2long_by_idiv(VALUE x)
+{
+    RBIMPL_ASSERT_OR_ASSUME(RB_FIXNUM_P(x));
+
+    /* :NOTE: VALUE  can be wider  than long.  (x-1)/2 never  overflows because
+     * RB_FIXNUM_P(x)  holds.   Also it  has  no  portability issue  like  y>>1
+     * below. */
+    const SIGNED_VALUE y = x - RUBY_FIXNUM_FLAG;
+    const SIGNED_VALUE z = y / 2;
+    const long         w = RBIMPL_CAST((long)z);
+
+    RBIMPL_ASSERT_OR_ASSUME(RB_FIXABLE(w));
+    return w;
+}
+
+RBIMPL_ATTR_CONST_UNLESS_DEBUG()
+RBIMPL_ATTR_CONSTEXPR_UNLESS_DEBUG(CXX14)
+static inline long
+rbimpl_fix2long_by_shift(VALUE x)
+{
+    RBIMPL_ASSERT_OR_ASSUME(RB_FIXNUM_P(x));
+
+    /* :NOTE: VALUE can be wider than long.  If right shift is arithmetic, this
+     * is noticeably faster than above. */
+    const SIGNED_VALUE y = x;
+    const SIGNED_VALUE z = y >> 1;
+    const long         w = RBIMPL_CAST((long)z);
+
+    RBIMPL_ASSERT_OR_ASSUME(RB_FIXABLE(w));
+    return w;
+}
+
+RBIMPL_ATTR_CONST()
+RBIMPL_ATTR_CONSTEXPR(CXX11)
+static inline bool
+rbimpl_right_shift_is_arithmetic_p(void)
+{
+    return (-1 >> 1) == -1;
+}
+
+RBIMPL_ATTR_CONST_UNLESS_DEBUG()
+RBIMPL_ATTR_CONSTEXPR_UNLESS_DEBUG(CXX14)
+static inline long
+rb_fix2long(VALUE x)
+{
+    if /* constexpr */ (rbimpl_right_shift_is_arithmetic_p()) {
+        return rbimpl_fix2long_by_shift(x);
+    }
+    else {
+        return rbimpl_fix2long_by_idiv(x);
+    }
+}
+
+RBIMPL_ATTR_CONST_UNLESS_DEBUG()
+RBIMPL_ATTR_CONSTEXPR_UNLESS_DEBUG(CXX14)
+static inline unsigned long
+rb_fix2ulong(VALUE x)
+{
+    RBIMPL_ASSERT_OR_ASSUME(RB_FIXNUM_P(x));
+    return rb_fix2long(x);
+}
+
+static inline long
+rb_num2long_inline(VALUE x)
+{
+    if (RB_FIXNUM_P(x))
+        return RB_FIX2LONG(x);
+    else
+        return rb_num2long(x);
+}
+
+static inline unsigned long
+rb_num2ulong_inline(VALUE x)
+{
+    /* This (negative fixnum would become  a large unsigned long while negative
+     * bignum is  an exception) has been  THE behaviour of NUM2ULONG  since the
+     * beginning.  It is strange,  but we can no longer change  how it works at
+     * this moment.  We have to get by with it.  See also:
+     * https://bugs.ruby-lang.org/issues/9089 */
+    if (RB_FIXNUM_P(x))
+        return RB_FIX2ULONG(x);
+    else
+        return rb_num2ulong(x);
+}
+
+static inline VALUE
+rb_long2num_inline(long v)
+{
+    if (RB_FIXABLE(v))
+        return RB_LONG2FIX(v);
+    else
+        return rb_int2big(v);
+}
+
+static inline VALUE
+rb_ulong2num_inline(unsigned long v)
+{
+    if (RB_POSFIXABLE(v))
+        return RB_LONG2FIX(v);
+    else
+        return rb_uint2big(v);
+}
+
+/**
+ * @cond INTERNAL_MACRO
+ *
+ * Following overload is necessary because sometimes  INT2FIX is used as a enum
+ * value (e.g. `enum {  FOO = INT2FIX(0) };`).  THIS IS NG  in theory because a
+ * VALUE does not fit into an enum (which must be a signed int).  But we cannot
+ * break existing codes.
+ */
+#if RBIMPL_HAS_ATTR_CONSTEXPR_CXX14
+# /* C++ can write constexpr as enum values. */
+
+#elif ! defined(HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P)
+# undef INT2FIX
+# define INT2FIX(i) (RBIMPL_CAST((VALUE)(i)) << 1 | RUBY_FIXNUM_FLAG)
+
+#else
+# undef INT2FIX
+# define INT2FIX(i)                                     \
+    __builtin_choose_expr(                              \
+        __builtin_constant_p(i),                        \
+        RBIMPL_CAST((VALUE)(i)) << 1 | RUBY_FIXNUM_FLAG, \
+        RB_INT2FIX(i))
+#endif
+/** @endcond */
+
+#endif /* RBIMPL_ARITHMETIC_LONG_H */
diff --git a/include/ruby/internal/arithmetic/long_long.h b/include/ruby/internal/arithmetic/long_long.h
new file mode 100644
index 0000000000..96ffb37d57
--- /dev/null
+++ b/include/ruby/internal/arithmetic/long_long.h
@@ -0,0 +1,53 @@
+#ifndef RBIMPL_ARITHMETIC_LONG_LONG_H                /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ARITHMETIC_LONG_LONG_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Arithmetic conversion between C's `long long` and Ruby's.
+ */
+#include "ruby/internal/value.h"
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/special_consts.h"
+#include "ruby/backward/2/long_long.h"
+
+#define RB_LL2NUM  rb_ll2inum
+#define RB_ULL2NUM rb_ull2inum
+#define LL2NUM     RB_LL2NUM
+#define ULL2NUM    RB_ULL2NUM
+#define RB_NUM2LL  rb_num2ll_inline
+#define RB_NUM2ULL rb_num2ull
+#define NUM2LL     RB_NUM2LL
+#define NUM2ULL    RB_NUM2ULL
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+VALUE rb_ll2inum(LONG_LONG);
+VALUE rb_ull2inum(unsigned LONG_LONG);
+LONG_LONG rb_num2ll(VALUE);
+unsigned LONG_LONG rb_num2ull(VALUE);
+RBIMPL_SYMBOL_EXPORT_END()
+
+static inline LONG_LONG
+rb_num2ll_inline(VALUE x)
+{
+    if (RB_FIXNUM_P(x))
+        return RB_FIX2LONG(x);
+    else
+        return rb_num2ll(x);
+}
+
+#endif /* RBIMPL_ARITHMETIC_LONG_LONG_H */
diff --git a/include/ruby/internal/arithmetic/mode_t.h b/include/ruby/internal/arithmetic/mode_t.h
new file mode 100644
index 0000000000..ee47eb8221
--- /dev/null
+++ b/include/ruby/internal/arithmetic/mode_t.h
@@ -0,0 +1,34 @@
+#ifndef RBIMPL_ARITHMETIC_MODE_T_H                   /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ARITHMETIC_MODE_T_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Arithmetic conversion between C's `mode_t` and Ruby's.
+ */
+#include "ruby/internal/config.h"
+#include "ruby/internal/arithmetic/int.h"
+
+#ifndef NUM2MODET
+# define NUM2MODET RB_NUM2INT
+#endif
+
+#ifndef MODET2NUM
+# define MODET2NUM RB_INT2NUM
+#endif
+
+#endif /* RBIMPL_ARITHMETIC_MODE_T_H */
diff --git a/include/ruby/internal/arithmetic/off_t.h b/include/ruby/internal/arithmetic/off_t.h
new file mode 100644
index 0000000000..84ec807e3d
--- /dev/null
+++ b/include/ruby/internal/arithmetic/off_t.h
@@ -0,0 +1,49 @@
+#ifndef RBIMPL_ARITHMETIC_OFF_T_H                    /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ARITHMETIC_OFF_T_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Arithmetic conversion between C's `off_t` and Ruby's.
+ */
+#include "ruby/internal/config.h"
+#include "ruby/internal/arithmetic/int.h"
+#include "ruby/internal/arithmetic/long.h"
+#include "ruby/internal/arithmetic/long_long.h"
+#include "ruby/backward/2/long_long.h"
+
+#ifdef OFFT2NUM
+# /* take that. */
+#elif SIZEOF_OFF_T == SIZEOF_LONG_LONG
+# define OFFT2NUM RB_LL2NUM
+#elif SIZEOF_OFF_T == SIZEOF_LONG
+# define OFFT2NUM RB_LONG2NUM
+#else
+# define OFFT2NUM RB_INT2NUM
+#endif
+
+#ifdef NUM2OFFT
+# /* take that. */
+#elif SIZEOF_OFF_T == SIZEOF_LONG_LONG
+# define NUM2OFFT RB_NUM2LL
+#elif SIZEOF_OFF_T == SIZEOF_LONG
+# define NUM2OFFT RB_NUM2LONG
+#else
+# define NUM2OFFT RB_NUM2INT
+#endif
+
+#endif /* RBIMPL_ARITHMETIC_OFF_T_H */
diff --git a/include/ruby/internal/arithmetic/pid_t.h b/include/ruby/internal/arithmetic/pid_t.h
new file mode 100644
index 0000000000..eaca402776
--- /dev/null
+++ b/include/ruby/internal/arithmetic/pid_t.h
@@ -0,0 +1,34 @@
+#ifndef RBIMPL_ARITHMETIC_PID_T_H                    /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ARITHMETIC_PID_T_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Arithmetic conversion between C's `pid_t` and Ruby's.
+ */
+#include "ruby/internal/config.h"
+#include "ruby/internal/arithmetic/long.h"
+
+#ifndef PIDT2NUM
+# define PIDT2NUM RB_LONG2NUM
+#endif
+
+#ifndef NUM2PIDT
+# define NUM2PIDT RB_NUM2LONG
+#endif
+
+#endif /* RBIMPL_ARITHMETIC_PID_T_H */
diff --git a/include/ruby/internal/arithmetic/short.h b/include/ruby/internal/arithmetic/short.h
new file mode 100644
index 0000000000..ef213a8d3e
--- /dev/null
+++ b/include/ruby/internal/arithmetic/short.h
@@ -0,0 +1,54 @@
+#ifndef RBIMPL_ARITHMETIC_SHORT_H                    /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ARITHMETIC_SHORT_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Arithmetic conversion between C's `short` and Ruby's.
+ *
+ * Shyouhei  wonders:  why  there  is   no  SHORT2NUM,  given  there  are  both
+ * #USHORT2NUM and #CHR2FIX?
+ */
+#include "ruby/internal/value.h"
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/special_consts.h"
+
+#define RB_NUM2SHORT  rb_num2short_inline
+#define RB_NUM2USHORT rb_num2ushort
+#define NUM2SHORT     RB_NUM2SHORT
+#define NUM2USHORT    RB_NUM2USHORT
+#define USHORT2NUM    RB_INT2FIX
+#define RB_FIX2SHORT  rb_fix2short
+#define FIX2SHORT     RB_FIX2SHORT
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+short rb_num2short(VALUE);
+unsigned short rb_num2ushort(VALUE);
+short rb_fix2short(VALUE);
+unsigned short rb_fix2ushort(VALUE);
+RBIMPL_SYMBOL_EXPORT_END()
+
+static inline short
+rb_num2short_inline(VALUE x)
+{
+    if (RB_FIXNUM_P(x))
+        return rb_fix2short(x);
+    else
+        return rb_num2short(x);
+}
+
+#endif /* RBIMPL_ARITHMETIC_SOHRT_H */
diff --git a/include/ruby/internal/arithmetic/size_t.h b/include/ruby/internal/arithmetic/size_t.h
new file mode 100644
index 0000000000..0458f1f5f3
--- /dev/null
+++ b/include/ruby/internal/arithmetic/size_t.h
@@ -0,0 +1,56 @@
+#ifndef RBIMPL_ARITHMETIC_SIZE_T_H                   /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ARITHMETIC_SIZE_T_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Arithmetic conversion between C's `size_t` and Ruby's.
+ */
+#include "ruby/internal/config.h"
+#include "ruby/internal/arithmetic/int.h"
+#include "ruby/internal/arithmetic/long.h"
+#include "ruby/internal/arithmetic/long_long.h"
+#include "ruby/backward/2/long_long.h"
+
+#if SIZEOF_SIZE_T == SIZEOF_LONG_LONG
+# define RB_SIZE2NUM RB_ULL2NUM
+# define RB_SSIZE2NUM RB_LL2NUM
+#elif SIZEOF_SIZE_T == SIZEOF_LONG
+# define RB_SIZE2NUM RB_ULONG2NUM
+# define RB_SSIZE2NUM RB_LONG2NUM
+#else
+# define RB_SIZE2NUM RB_UINT2NUM
+# define RB_SSIZE2NUM RB_INT2NUM
+#endif
+
+#if SIZEOF_SIZE_T == SIZEOF_LONG_LONG
+# define RB_NUM2SIZE RB_NUM2ULL
+# define RB_NUM2SSIZE RB_NUM2LL
+#elif SIZEOF_SIZE_T == SIZEOF_LONG
+# define RB_NUM2SIZE RB_NUM2ULONG
+# define RB_NUM2SSIZE RB_NUM2LONG
+#else
+# define RB_NUM2SIZE RB_NUM2UINT
+# define RB_NUM2SSIZE RB_NUM2INT
+#endif
+
+#define NUM2SIZET RB_NUM2SIZE
+#define SIZET2NUM RB_SIZE2NUM
+#define NUM2SSIZET RB_NUM2SSIZE
+#define SSIZET2NUM RB_SSIZE2NUM
+
+#endif /* RBIMPL_ARITHMETIC_SIZE_T_H */
diff --git a/include/ruby/internal/arithmetic/st_data_t.h b/include/ruby/internal/arithmetic/st_data_t.h
new file mode 100644
index 0000000000..93a5ccb7a1
--- /dev/null
+++ b/include/ruby/internal/arithmetic/st_data_t.h
@@ -0,0 +1,59 @@
+#ifndef RBIMPL_ARITHMERIC_ST_DATA_T_H                /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ARITHMERIC_ST_DATA_T_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Arithmetic conversion between C's `st_data_t` and Ruby's.
+ */
+#include "ruby/internal/arithmetic/fixnum.h"
+#include "ruby/internal/arithmetic/long.h"
+#include "ruby/internal/attr/artificial.h"
+#include "ruby/internal/attr/const.h"
+#include "ruby/internal/attr/constexpr.h"
+#include "ruby/internal/cast.h"
+#include "ruby/internal/value.h"
+#include "ruby/assert.h"
+#include "ruby/st.h"
+
+#define ST2FIX    RB_ST2FIX
+/** @cond INTERNAL_MACRO */
+#define RB_ST2FIX RB_ST2FIX
+/** @endcond */
+
+RBIMPL_ATTR_CONST_UNLESS_DEBUG()
+RBIMPL_ATTR_CONSTEXPR_UNLESS_DEBUG(CXX14)
+RBIMPL_ATTR_ARTIFICIAL()
+/* See also [ruby-core:84395] [Bug #14218] [ruby-core:82687] [Bug #13877] */
+static inline VALUE
+RB_ST2FIX(st_data_t i)
+{
+    SIGNED_VALUE x = i;
+
+    if (x >= 0) {
+        x &= RUBY_FIXNUM_MAX;
+    }
+    else {
+        x |= RUBY_FIXNUM_MIN;
+    }
+
+    RBIMPL_ASSERT_OR_ASSUME(RB_FIXABLE(x));
+    unsigned long y = RBIMPL_CAST((unsigned long)x);
+    return RB_LONG2FIX(y);
+}
+
+#endif /* RBIMPL_ARITHMERIC_ST_DATA_T_H */
diff --git a/include/ruby/internal/arithmetic/uid_t.h b/include/ruby/internal/arithmetic/uid_t.h
new file mode 100644
index 0000000000..bdcf42f049
--- /dev/null
+++ b/include/ruby/internal/arithmetic/uid_t.h
@@ -0,0 +1,34 @@
+#ifndef RBIMPL_ARITHMETIC_UID_T_H                    /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ARITHMETIC_UID_T_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Arithmetic conversion between C's `uid_t` and Ruby's.
+ */
+#include "ruby/internal/config.h"
+#include "ruby/internal/arithmetic/long.h"
+
+#ifndef UIDT2NUM
+# define UIDT2NUM RB_LONG2NUM
+#endif
+
+#ifndef NUM2UIDT
+# define NUM2UIDT RB_NUM2LONG
+#endif
+
+#endif /* RBIMPL_ARITHMETIC_UID_T_H */
diff --git a/include/ruby/internal/assume.h b/include/ruby/internal/assume.h
new file mode 100644
index 0000000000..e95b2fb12a
--- /dev/null
+++ b/include/ruby/internal/assume.h
@@ -0,0 +1,90 @@
+#ifndef RBIMPL_ASSUME_H                              /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ASSUME_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RBIMPL_ASSUME / #RBIMPL_UNREACHABLE.
+ *
+ * These macros must be defined at once because:
+ *
+ * - #RBIMPL_ASSUME could fallback to #RBIMPL_UNREACHABLE.
+ * - #RBIMPL_UNREACHABLE could fallback to #RBIMPL_ASSUME.
+ */
+#include "ruby/internal/config.h"
+#include "ruby/internal/cast.h"
+#include "ruby/internal/compiler_since.h"
+#include "ruby/internal/has/builtin.h"
+#include "ruby/internal/warning_push.h"
+
+/** @cond INTERNAL_MACRO */
+#if RBIMPL_COMPILER_SINCE(MSVC, 13, 10, 0)
+# define RBIMPL_HAVE___ASSUME
+
+#elif RBIMPL_COMPILER_SINCE(Intel, 13, 0, 0)
+# define RBIMPL_HAVE___ASSUME
+#endif
+/** @endcond */
+
+/** Wraps (or simulates) `__builtin_unreachable`. */
+#if RBIMPL_HAS_BUILTIN(__builtin_unreachable)
+# define RBIMPL_UNREACHABLE_RETURN(_) __builtin_unreachable()
+
+#elif defined(RBIMPL_HAVE___ASSUME)
+# define RBIMPL_UNREACHABLE_RETURN(_) return (__assume(0), (_))
+
+#else
+# define RBIMPL_UNREACHABLE_RETURN(_) return (_)
+#endif
+
+/** Wraps (or simulates) `__builtin_unreachable`. */
+#if RBIMPL_HAS_BUILTIN(__builtin_unreachable)
+# define RBIMPL_UNREACHABLE __builtin_unreachable
+
+#elif defined(RBIMPL_HAVE___ASSUME)
+# define RBIMPL_UNREACHABLE() __assume(0)
+#endif
+
+/** Wraps (or simulates) `__assume`. */
+#if RBIMPL_COMPILER_SINCE(Intel, 13, 0, 0)
+# /* icc warnings are false positives.  Ignore them. */
+# /* "warning #2261: __assume expression with side effects discarded" */
+# define RBIMPL_ASSUME(expr)     \
+    RBIMPL_WARNING_PUSH()        \
+    RBIMPL_WARNING_IGNORED(2261) \
+    __assume(expr)              \
+    RBIMPL_WARNING_POP()
+
+#elif defined(RBIMPL_HAVE___ASSUME)
+# define RBIMPL_ASSUME __assume
+
+#elif RBIMPL_HAS_BUILTIN(__builtin_assume)
+# define RBIMPL_ASSUME __builtin_assume
+
+#elif ! defined(RBIMPL_UNREACHABLE)
+# define RBIMPL_ASSUME(_) RBIMPL_CAST((void)(_))
+
+#else
+# define RBIMPL_ASSUME(_) \
+    (RB_LIKELY(!!(_)) ? RBIMPL_CAST((void)0) : RBIMPL_UNREACHABLE())
+#endif
+
+#if ! defined(RBIMPL_UNREACHABLE)
+# define RBIMPL_UNREACHABLE() RBIMPL_ASSUME(0)
+#endif
+
+#endif /* RBIMPL_ASSUME_H */
diff --git a/include/ruby/internal/attr/alloc_size.h b/include/ruby/internal/attr/alloc_size.h
new file mode 100644
index 0000000000..ea96feec99
--- /dev/null
+++ b/include/ruby/internal/attr/alloc_size.h
@@ -0,0 +1,32 @@
+#ifndef RBIMPL_ATTR_ALLOC_SIZE_H                     /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ATTR_ALLOC_SIZE_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RBIMPL_ATTR_ALLOC_SIZE.
+ */
+#include "ruby/internal/has/attribute.h"
+
+/** Wraps (or simulates) `__attribute__((alloc_size))` */
+#if RBIMPL_HAS_ATTRIBUTE(alloc_size)
+# define RBIMPL_ATTR_ALLOC_SIZE(tuple) __attribute__((__alloc_size__ tuple))
+#else
+# define RBIMPL_ATTR_ALLOC_SIZE(tuple) /* void */
+#endif
+
+#endif /* RBIMPL_ATTR_ALLOC_SIZE_H */
diff --git a/include/ruby/internal/attr/artificial.h b/include/ruby/internal/attr/artificial.h
new file mode 100644
index 0000000000..fa9a3814cc
--- /dev/null
+++ b/include/ruby/internal/attr/artificial.h
@@ -0,0 +1,46 @@
+#ifndef RBIMPL_ATTR_ARTIFICIAL_H                     /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ATTR_ARTIFICIAL_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RBIMPL_ATTR_ARTIFICIAL.
+ *
+ * ### Q&A ###
+ *
+ * - Q: What is this attribute?  I don't get what GCC manual is talking about.
+ *
+ * - A: In  short  it  is  an  attribute to  manipulate  GDB  backtraces.   The
+ *      attribute    makes    the   best    sense    when    it   comes    with
+ *      __attribute__((always_inline)).   When a  function annotated  with this
+ *      attribute gets inlined, and when you  somehow look at a backtrace which
+ *      includes such  inlined call site,  then the backtrace shows  the caller
+ *      and  not the  callee.  This  is handy  for instance  when an  identical
+ *      function is inlined  more than once in a single  big function.  On such
+ *      case it gets  vital to know where the inlining  happened in the callee.
+ *      See also https://stackoverflow.com/a/21936099
+ */
+#include "ruby/internal/has/attribute.h"
+
+/** Wraps (or simulates) `__attribute__((artificial))` */
+#if RBIMPL_HAS_ATTRIBUTE(artificial)
+# define RBIMPL_ATTR_ARTIFICIAL() __attribute__((__artificial__))
+#else
+# define RBIMPL_ATTR_ARTIFICIAL() /* void */
+#endif
+
+#endif /* RBIMPL_ATTR_ARTIFICIAL_H */
diff --git a/include/ruby/internal/attr/cold.h b/include/ruby/internal/attr/cold.h
new file mode 100644
index 0000000000..fcee507456
--- /dev/null
+++ b/include/ruby/internal/attr/cold.h
@@ -0,0 +1,37 @@
+#ifndef RBIMPL_ATTR_COLD_H                           /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ATTR_COLD_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RBIMPL_ATTR_COLD.
+ */
+#include "ruby/internal/compiler_is.h"
+#include "ruby/internal/has/attribute.h"
+
+/** Wraps (or simulates) `__attribute__((cold))` */
+#if RBIMPL_COMPILER_IS(SunPro)
+# /* Recent SunPro has __has_attribute, and is borken. */
+# /* It reports it has attribute cold, reality isn't (warnings issued). */
+# define RBIMPL_ATTR_COLD() /* void */
+#elif RBIMPL_HAS_ATTRIBUTE(cold)
+# define RBIMPL_ATTR_COLD() __attribute__((__cold__))
+#else
+# define RBIMPL_ATTR_COLD() /* void */
+#endif
+
+#endif /* RBIMPL_ATTR_COLD_H */
diff --git a/include/ruby/internal/attr/const.h b/include/ruby/internal/attr/const.h
new file mode 100644
index 0000000000..d5b8da0c2d
--- /dev/null
+++ b/include/ruby/internal/attr/const.h
@@ -0,0 +1,46 @@
+#ifndef RBIMPL_ATTR_CONST_H                          /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ATTR_CONST_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RBIMPL_ATTR_CONST.
+ */
+#include "ruby/internal/compiler_since.h"
+#include "ruby/internal/has/attribute.h"
+#include "ruby/internal/has/declspec_attribute.h"
+
+/** Wraps (or simulates) `__attribute__((const))` */
+#if RBIMPL_HAS_ATTRIBUTE(const)
+# define RBIMPL_ATTR_CONST() __attribute__((__const__))
+#elif RBIMPL_HAS_DECLSPEC_ATTRIBUTE(noalias)
+# /* If a function can be a const, that is also a noalias. */
+# define RBIMPL_ATTR_CONST() __declspec(noalias)
+#elif RBIMPL_COMPILER_SINCE(SunPro, 5, 10, 0)
+# define RBIMPL_ATTR_CONST() _Pragma("no_side_effect")
+#else
+# define RBIMPL_ATTR_CONST() /* void */
+#endif
+
+/** Enables #RBIMPL_ATTR_CONST iff. ! #RUBY_DEBUG. */
+#if !RUBY_DEBUG
+# define RBIMPL_ATTR_CONST_UNLESS_DEBUG() RBIMPL_ATTR_CONST()
+#else
+# define RBIMPL_ATTR_CONST_UNLESS_DEBUG() /* void */
+#endif
+
+#endif /* RBIMPL_ATTR_CONST_H */
diff --git a/include/ruby/internal/attr/constexpr.h b/include/ruby/internal/attr/constexpr.h
new file mode 100644
index 0000000000..96b010ce6f
--- /dev/null
+++ b/include/ruby/internal/attr/constexpr.h
@@ -0,0 +1,85 @@
+#ifndef RBIMPL_ATTR_CONSTEXPR_H                      /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ATTR_CONSTEXPR_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      #RBIMPL_ATTR_CONSTEXPR.
+ */
+#include "ruby/internal/has/feature.h"
+#include "ruby/internal/compiler_is.h"
+#include "ruby/internal/token_paste.h"
+
+/** @cond INTERNAL_MACRO */
+#if ! defined(__cplusplus)
+# /* Makes no sense. */
+# define RBIMPL_HAS_ATTR_CONSTEXPR_CXX11 0
+# define RBIMPL_HAS_ATTR_CONSTEXPR_CXX14 0
+
+#elif defined(__cpp_constexpr)
+# /* https://isocpp.org/std/standing-documents/sd-6-sg10-feature-test-recommendations */
+# define RBIMPL_HAS_ATTR_CONSTEXPR_CXX11 (__cpp_constexpr >= 200704L)
+# define RBIMPL_HAS_ATTR_CONSTEXPR_CXX14 (__cpp_constexpr >= 201304L)
+
+#elif RBIMPL_COMPILER_SINCE(MSVC, 19, 0, 0)
+# define RBIMPL_HAS_ATTR_CONSTEXPR_CXX11 RBIMPL_COMPILER_SINCE(MSVC, 19, 00, 00)
+# define RBIMPL_HAS_ATTR_CONSTEXPR_CXX14 RBIMPL_COMPILER_SINCE(MSVC, 19, 11, 00)
+
+#elif RBIMPL_COMPILER_SINCE(SunPro, 5, 13, 0)
+# define RBIMPL_HAS_ATTR_CONSTEXPR_CXX11 (__cplusplus >= 201103L)
+# define RBIMPL_HAS_ATTR_CONSTEXPR_CXX14 (__cplusplus >= 201402L)
+
+#elif RBIMPL_COMPILER_SINCE(GCC, 4, 9, 0)
+# define RBIMPL_HAS_ATTR_CONSTEXPR_CXX11 (__cplusplus >= 201103L)
+# define RBIMPL_HAS_ATTR_CONSTEXPR_CXX14 (__cplusplus >= 201402L)
+
+#elif RBIMPL_HAS_FEATURE(cxx_relaxed_constexpr)
+# define RBIMPL_HAS_ATTR_CONSTEXPR_CXX11 1
+# define RBIMPL_HAS_ATTR_CONSTEXPR_CXX14 1
+
+#elif RBIMPL_HAS_FEATURE(cxx_constexpr)
+# define RBIMPL_HAS_ATTR_CONSTEXPR_CXX11 1
+# define RBIMPL_HAS_ATTR_CONSTEXPR_CXX14 0
+
+#else
+# /* :FIXME: icpc must have constexpr but don't know how to detect. */
+# define RBIMPL_HAS_ATTR_CONSTEXPR_CXX11 0
+# define RBIMPL_HAS_ATTR_CONSTEXPR_CXX14 0
+#endif
+/** @endcond */
+
+/** Wraps (or simulates) C++11 `constexpr`.  */
+#if RBIMPL_HAS_ATTR_CONSTEXPR_CXX14
+# define RBIMPL_ATTR_CONSTEXPR(_) constexpr
+
+#elif RBIMPL_HAS_ATTR_CONSTEXPR_CXX11
+# define RBIMPL_ATTR_CONSTEXPR(_) RBIMPL_TOKEN_PASTE(RBIMPL_ATTR_CONSTEXPR_, _)
+# define RBIMPL_ATTR_CONSTEXPR_CXX11 constexpr
+# define RBIMPL_ATTR_CONSTEXPR_CXX14 /* void */
+
+#else
+# define RBIMPL_ATTR_CONSTEXPR(_) /* void */
+#endif
+
+/** Enables #RBIMPL_ATTR_CONSTEXPR iff. ! #RUBY_DEBUG. */
+#if !RUBY_DEBUG
+# define RBIMPL_ATTR_CONSTEXPR_UNLESS_DEBUG(_) RBIMPL_ATTR_CONSTEXPR(_)
+#else
+# define RBIMPL_ATTR_CONSTEXPR_UNLESS_DEBUG(_) /* void */
+#endif
+
+#endif /* RBIMPL_ATTR_CONSTEXPR_H */
diff --git a/include/ruby/internal/attr/deprecated.h b/include/ruby/internal/attr/deprecated.h
new file mode 100644
index 0000000000..38a7deeaaa
--- /dev/null
+++ b/include/ruby/internal/attr/deprecated.h
@@ -0,0 +1,63 @@
+#ifndef RBIMPL_ATTR_DEPRECATED_H                     /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ATTR_DEPRECATED_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RBIMPL_ATTR_DEPRECATED.
+ */
+#include "ruby/internal/compiler_since.h"
+#include "ruby/internal/has/attribute.h"
+#include "ruby/internal/has/c_attribute.h"
+#include "ruby/internal/has/cpp_attribute.h"
+#include "ruby/internal/has/declspec_attribute.h"
+#include "ruby/internal/has/extension.h"
+
+/** Wraps (or simulates) `[[deprecated]]` */
+#if RBIMPL_HAS_EXTENSION(attribute_deprecated_with_message)
+# define RBIMPL_ATTR_DEPRECATED(msg) __attribute__((__deprecated__ msg))
+
+#elif defined(__cplusplus) && RBIMPL_COMPILER_SINCE(GCC, 10, 1, 0) /* && RBIMPL_COMPILER_BEFORE(GCC, 10, X, Y) */
+# /* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95302 */
+# define RBIMPL_ATTR_DEPRECATED(msg) /* disable until they fix this bug */
+
+#elif RBIMPL_COMPILER_SINCE(GCC, 4, 5, 0)
+# define RBIMPL_ATTR_DEPRECATED(msg) __attribute__((__deprecated__ msg))
+
+#elif RBIMPL_COMPILER_SINCE(Intel, 13, 0, 0)
+# define RBIMPL_ATTR_DEPRECATED(msg) __attribute__((__deprecated__ msg))
+
+#elif RBIMPL_HAS_ATTRIBUTE(deprecated) /* but not with message. */
+# define RBIMPL_ATTR_DEPRECATED(msg) __attribute__((__deprecated__))
+
+#elif RBIMPL_COMPILER_SINCE(MSVC, 14, 0, 0)
+# define RBIMPL_ATTR_DEPRECATED(msg) __declspec(deprecated msg)
+
+#elif RBIMPL_HAS_DECLSPEC_ATTRIBUTE(deprecated)
+# define RBIMPL_ATTR_DEPRECATED(msg) __declspec(deprecated)
+
+#elif RBIMPL_HAS_CPP_ATTRIBUTE(deprecated)
+# define RBIMPL_ATTR_DEPRECATED(msg) [[deprecated msg]]
+
+#elif RBIMPL_HAS_C_ATTRIBUTE(deprecated)
+# define RBIMPL_ATTR_DEPRECATED(msg) [[deprecated msg]]
+
+#else
+# define RBIMPL_ATTR_DEPRECATED(msg) /* void */
+#endif
+
+#endif /* RBIMPL_ATTR_DEPRECATED_H */
diff --git a/include/ruby/internal/attr/diagnose_if.h b/include/ruby/internal/attr/diagnose_if.h
new file mode 100644
index 0000000000..6a79e904b7
--- /dev/null
+++ b/include/ruby/internal/attr/diagnose_if.h
@@ -0,0 +1,42 @@
+#ifndef RBIMPL_ATTR_DIAGNOSE_IF_H                    /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ATTR_DIAGNOSE_IF_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RBIMPL_ATTR_DIAGNOSE_IF.
+ */
+#include "ruby/internal/has/attribute.h"
+#include "ruby/internal/warning_push.h"
+
+/** Wraps (or simulates) `__attribute__((diagnose_if))` */
+#if RBIMPL_COMPILER_BEFORE(Clang, 5, 0, 0)
+# /* https://bugs.llvm.org/show_bug.cgi?id=34319 */
+# define RBIMPL_ATTR_DIAGNOSE_IF(_, __, ___) /* void */
+
+#elif RBIMPL_HAS_ATTRIBUTE(diagnose_if)
+# define RBIMPL_ATTR_DIAGNOSE_IF(_, __, ___) \
+    RBIMPL_WARNING_PUSH() \
+    RBIMPL_WARNING_IGNORED(-Wgcc-compat) \
+    __attribute__((__diagnose_if__(_, __, ___))) \
+    RBIMPL_WARNING_POP()
+
+#else
+# define RBIMPL_ATTR_DIAGNOSE_IF(_, __, ___) /* void */
+#endif
+
+#endif /* RBIMPL_ATTR_DIAGNOSE_IF_H */
diff --git a/include/ruby/internal/attr/enum_extensibility.h b/include/ruby/internal/attr/enum_extensibility.h
new file mode 100644
index 0000000000..6faa58185a
--- /dev/null
+++ b/include/ruby/internal/attr/enum_extensibility.h
@@ -0,0 +1,32 @@
+#ifndef RBIMPL_ATTR_ENUM_EXTENSIBILITY_H             /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ATTR_ENUM_EXTENSIBILITY_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      #RBIMPL_ATTR_ENUM_EXTENSIBILITY.
+ */
+#include "ruby/internal/has/attribute.h"
+
+/** Wraps (or simulates) `__attribute__((enum_extensibility))` */
+#if RBIMPL_HAS_ATTRIBUTE(enum_extensibility)
+# define RBIMPL_ATTR_ENUM_EXTENSIBILITY(_) __attribute__((__enum_extensibility__(_)))
+#else
+# define RBIMPL_ATTR_ENUM_EXTENSIBILITY(_) /* void */
+#endif
+
+#endif /* RBIMPL_ATTR_ENUM_EXTENSIBILITY_H */
diff --git a/include/ruby/internal/attr/error.h b/include/ruby/internal/attr/error.h
new file mode 100644
index 0000000000..da19b73c2b
--- /dev/null
+++ b/include/ruby/internal/attr/error.h
@@ -0,0 +1,32 @@
+#ifndef RBIMPL_ATTR_ERROR_H                          /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ATTR_ERROR_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RBIMPL_ATTR_ERROR.
+ */
+#include "ruby/internal/has/attribute.h"
+
+/** Wraps (or simulates) `__attribute__((error))` */
+#if RBIMPL_HAS_ATTRIBUTE(error)
+# define RBIMPL_ATTR_ERROR(msg) __attribute__((__error__ msg))
+#else
+# define RBIMPL_ATTR_ERROR(msg) /* void */
+#endif
+
+#endif /* RBIMPL_ATTR_ERROR_H */
diff --git a/include/ruby/internal/attr/flag_enum.h b/include/ruby/internal/attr/flag_enum.h
new file mode 100644
index 0000000000..148384d842
--- /dev/null
+++ b/include/ruby/internal/attr/flag_enum.h
@@ -0,0 +1,33 @@
+#ifndef RBIMPL_ATTR_FLAG_ENUM_H                      /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ATTR_FLAG_ENUM_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RBIMPL_ATTR_FLAG_ENUM.
+ * @see        https://clang.llvm.org/docs/AttributeReference.html#flag_enum
+ */
+#include "ruby/internal/has/attribute.h"
+
+/** Wraps (or simulates) `__attribute__((flag_enum)` */
+#if RBIMPL_HAS_ATTRIBUTE(flag_enum)
+# define RBIMPL_ATTR_FLAG_ENUM() __attribute__((__flag_enum__))
+#else
+# define RBIMPL_ATTR_FLAG_ENUM() /* void */
+#endif
+
+#endif /* RBIMPLATTR_FLAG_ENUM_H */
diff --git a/include/ruby/internal/attr/forceinline.h b/include/ruby/internal/attr/forceinline.h
new file mode 100644
index 0000000000..6b31f1016f
--- /dev/null
+++ b/include/ruby/internal/attr/forceinline.h
@@ -0,0 +1,40 @@
+#ifndef RBIMPL_ATTR_FORCEINLINE_H                    /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ATTR_FORCEINLINE_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RBIMPL_ATTR_FORCEINLINE.
+ */
+#include "ruby/internal/compiler_since.h"
+#include "ruby/internal/has/attribute.h"
+
+/**
+ * Wraps (or  simulates) `__forceinline`.  MSVC complains  on declarations like
+ * `static inline __forceinline void foo()`.   It  seems  MSVC's  `inline`  and
+ * `__forceinline` are mutually exclusive.  We have to mimic that behaviour for
+ * non-MSVC compilers.
+ */
+#if RBIMPL_COMPILER_SINCE(MSVC, 12, 0, 0)
+# define RBIMPL_ATTR_FORCEINLINE() __forceinline
+#elif RBIMPL_HAS_ATTRIBUTE(always_inline)
+# define RBIMPL_ATTR_FORCEINLINE() __attribute__((__always_inline__)) inline
+#else
+# define RBIMPL_ATTR_FORCEINLINE() inline
+#endif
+
+#endif /* RBIMPL_ATTR_FORCEINLINE_H */
diff --git a/include/ruby/internal/attr/format.h b/include/ruby/internal/attr/format.h
new file mode 100644
index 0000000000..fcbf7b6cfe
--- /dev/null
+++ b/include/ruby/internal/attr/format.h
@@ -0,0 +1,38 @@
+#ifndef RBIMPL_ATTR_FORMAT_H                         /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ATTR_FORMAT_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RBIMPL_ATTR_FORMAT.
+ */
+#include "ruby/internal/has/attribute.h"
+
+/** Wraps (or simulates) `__attribute__((format))` */
+#if RBIMPL_HAS_ATTRIBUTE(format)
+# define RBIMPL_ATTR_FORMAT(x, y, z) __attribute__((__format__(x, y, z)))
+#else
+# define RBIMPL_ATTR_FORMAT(x, y, z) /* void */
+#endif
+
+#if defined(__MINGW_PRINTF_FORMAT)
+# define RBIMPL_PRINTF_FORMAT __MINGW_PRINTF_FORMAT
+#else
+# define RBIMPL_PRINTF_FORMAT __printf__
+#endif
+
+#endif /* RBIMPL_ATTR_FORMAT_H */
diff --git a/include/ruby/internal/attr/maybe_unused.h b/include/ruby/internal/attr/maybe_unused.h
new file mode 100644
index 0000000000..f46d1bc670
--- /dev/null
+++ b/include/ruby/internal/attr/maybe_unused.h
@@ -0,0 +1,38 @@
+#ifndef RBIMPL_ATTR_MAYBE_UNUSED_H                   /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ATTR_MAYBE_UNUSED_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RBIMPL_ATTR_MAYBE_UNUSED.
+ */
+#include "ruby/internal/has/attribute.h"
+#include "ruby/internal/has/c_attribute.h"
+#include "ruby/internal/has/cpp_attribute.h"
+
+/** Wraps  (or simulates)  `[[maybe_unused]]` */
+#if RBIMPL_HAS_CPP_ATTRIBUTE(maybe_unused)
+# define RBIMPL_ATTR_MAYBE_UNUSED() [[maybe_unused]]
+#elif RBIMPL_HAS_C_ATTRIBUTE(maybe_unused)
+# define RBIMPL_ATTR_MAYBE_UNUSED() [[maybe_unused]]
+#elif RBIMPL_HAS_ATTRIBUTE(unused)
+# define RBIMPL_ATTR_MAYBE_UNUSED() __attribute__((__unused__))
+#else
+# define RBIMPL_ATTR_MAYBE_UNUSED() /* void */
+#endif
+
+#endif /* RBIMPL_ATTR_MAYBE_UNUSED */
diff --git a/include/ruby/internal/attr/noalias.h b/include/ruby/internal/attr/noalias.h
new file mode 100644
index 0000000000..63324b7184
--- /dev/null
+++ b/include/ruby/internal/attr/noalias.h
@@ -0,0 +1,58 @@
+#ifndef RBIMPL_ATTR_NOALIAS_H                        /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ATTR_NOALIAS_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RBIMPL_ATTR_NOALIAS.
+ *
+ * ### Q&A ###
+ *
+ * - Q: There  are  seemingly   similar  attributes  named  #RBIMPL_ATTR_CONST,
+ *      #RBIMPL_ATTR_PURE, and #RBIMPL_ATTR_NOALIAS.  What are the difference?
+ *
+ * - A: Allowed operations are different.
+ *
+ *     - #RBIMPL_ATTR_CONST ... Functions attributed by this are not allowed to
+ *       read/write  _any_ pointers  at all  (there are  exceptional situations
+ *       when  reading a  pointer is  possible but  forget that;  they are  too
+ *       exceptional  to be  useful).  Just  remember that  everything pointer-
+ *       related are NG.
+ *
+ *     - #RBIMPL_ATTR_PURE  ...   Functions attributed  by  this  can read  any
+ *       nonvolatile pointers, but  no writes are allowed at  all.  The ability
+ *       to read _any_ nonvolatile pointers  makes it possible to mark ::VALUE-
+ *       taking functions as being pure, as long as they are read-only.
+ *
+ *     - #RBIMPL_ATTR_NOALIAS  ...  Can  both   read/write,  but  only  through
+ *       pointers  passed to  the function  as parameters.   This is  a typical
+ *       situation when you create a  C++ non-static member function which only
+ *       concerns `this`.  No  global variables are allowed  to read/write.  So
+ *       this is not a super-set of being pure.  If you want to read something,
+ *       that has to  be passed to the function as  a pointer.  ::VALUE -taking
+ *       functions thus cannot be attributed as such.
+ */
+#include "ruby/internal/has/declspec_attribute.h"
+
+/** Wraps (or simulates) `__declspec((noalias))` */
+#if RBIMPL_HAS_DECLSPEC_ATTRIBUTE(noalias)
+# define RBIMPL_ATTR_NOALIAS() __declspec(noalias)
+#else
+# define RBIMPL_ATTR_NOALIAS() /* void */
+#endif
+
+#endif /* RBIMPL_ATTR_NOALIAS_H */
diff --git a/include/ruby/internal/attr/nodiscard.h b/include/ruby/internal/attr/nodiscard.h
new file mode 100644
index 0000000000..5fd71b1c23
--- /dev/null
+++ b/include/ruby/internal/attr/nodiscard.h
@@ -0,0 +1,45 @@
+#ifndef RBIMPL_ATTR_NODISCARD_H                      /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ATTR_NODISCARD_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RBIMPL_ATTR_NODISCARD.
+ */
+#include "ruby/internal/has/attribute.h"
+#include "ruby/internal/has/c_attribute.h"
+#include "ruby/internal/has/cpp_attribute.h"
+
+/**
+ * Wraps  (or simulates)  `[[nodiscard]]`.  In  C++  (at least  since C++20)  a
+ * nodiscard attribute can  have a message why the result  shall not be ignoed.
+ * However GCC attribute and SAL annotation cannot take them.
+ */
+#if RBIMPL_HAS_CPP_ATTRIBUTE(nodiscard)
+# define RBIMPL_ATTR_NODISCARD() [[nodiscard]]
+#elif RBIMPL_HAS_C_ATTRIBUTE(nodiscard)
+# define RBIMPL_ATTR_NODISCARD() [[nodiscard]]
+#elif RBIMPL_HAS_ATTRIBUTE(warn_unused_result)
+# define RBIMPL_ATTR_NODISCARD() __attribute__((__warn_unused_result__))
+#elif defined(_Check_return_)
+# /* Take SAL definition. */
+# define RBIMPL_ATTR_NODISCARD() _Check_return_
+#else
+# define RBIMPL_ATTR_NODISCARD() /* void */
+#endif
+
+#endif /* RBIMPL_ATTR_NODISCARD_H */
diff --git a/include/ruby/internal/attr/noexcept.h b/include/ruby/internal/attr/noexcept.h
new file mode 100644
index 0000000000..968a7742b9
--- /dev/null
+++ b/include/ruby/internal/attr/noexcept.h
@@ -0,0 +1,91 @@
+#ifndef RBIMPL_ATTR_NOEXCEPT_H                       /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ATTR_NOEXCEPT_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RBIMPL_ATTR_NOEXCEPT.
+ *
+ * This isn't actually an attribute in C++ but who cares...
+ *
+ * Mainly due  to aesthetic reasons,  this one is  rarely used in  the project.
+ * But can  be handy on  occasions, especially when a  function's noexcept-ness
+ * depends on its calling functions.
+ *
+ * ### Q&A ###
+ *
+ * - Q: Can a function that raises Ruby exceptions be attributed `noexcept`?
+ *
+ * - A: Yes.   `noexcept` is  about  C++ exceptions,  not  Ruby's.  They  don't
+ *      interface each other.  You can  safely attribute a function that raises
+ *      Ruby exceptions as `noexcept`.
+ *
+ * - Q: How, then, can I assert that  a function I wrote doesn't raise any Ruby
+ *      exceptions?
+ *
+ * - A: `__attribute__((__leaf__))` is for that purpose.  A function attributed
+ *      as leaf can still throw C++  exceptions, but not Ruby's.  Note however,
+ *      that it's extremely difficult -- if  not impossible -- to assert that a
+ *      function  doesn't  raise any  Ruby  exceptions  at  all.  Use  of  that
+ *      attribute is not  recommended; mere mortals can't properly  use that by
+ *      hand.
+ *
+ * - Q: Does it make sense to attribute an inline function `noexcept`?
+ *
+ * - A: I thought so before.  But no, I don't think they are useful any longer.
+ *
+ *     - When an  inline function attributed `noexcept`  actually doesn't throw
+ *       any  exceptions at  all:  these days  I don't  see  any difference  in
+ *       generated assembly  by adding/removing this attribute.   C++ compilers
+ *       get smarter and  smarter.  Today they can infer if  it actually throws
+ *       or not without any annotations by humans (correct me if I'm wrong).
+ *
+ *     - When an inline function attributed `noexcepr` actually _does_ throw an
+ *       exception:  they  have to  call  `std::terminate`  then (C++  standard
+ *       mandates  so).  This  means exception  handling routines  are actually
+ *       enforced, not  omitted.  This doesn't impact  runtime performance (The
+ *       Itanium C++ ABI has zero-cost  exception handling), but does impact on
+ *       generated binary size.  This is bad.
+ */
+#include "ruby/internal/compiler_since.h"
+#include "ruby/internal/has/feature.h"
+
+/** Wraps (or simulates) C++11 `noexcept` */
+#if ! defined(__cplusplus)
+# /* Doesn't make sense. */
+# define RBIMPL_ATTR_NOEXCEPT(_) /* void */
+
+#elif RBIMPL_HAS_FEATURE(cxx_noexcept)
+# define RBIMPL_ATTR_NOEXCEPT(_) noexcept(noexcept(_))
+
+#elif defined(__GXX_EXPERIMENTAL_CXX0X__) && __GXX_EXPERIMENTAL_CXX0X__
+# define RBIMPL_ATTR_NOEXCEPT(_) noexcept(noexcept(_))
+
+#elif defined(__INTEL_CXX11_MODE__)
+# define RBIMPL_ATTR_NOEXCEPT(_) noexcept(noexcept(_))
+
+#elif RBIMPL_COMPILER_SINCE(MSVC, 19, 0, 0)
+# define RBIMPL_ATTR_NOEXCEPT(_) noexcept(noexcept(_))
+
+#elif __cplusplus >= 201103L
+# define RBIMPL_ATTR_NOEXCEPT(_) noexcept(noexcept(_))
+
+#else
+# define RBIMPL_ATTR_NOEXCEPT(_) /* void */
+#endif
+
+#endif /* RBIMPL_ATTR_NOEXCEPT_H */
diff --git a/include/ruby/internal/attr/noinline.h b/include/ruby/internal/attr/noinline.h
new file mode 100644
index 0000000000..619f99a171
--- /dev/null
+++ b/include/ruby/internal/attr/noinline.h
@@ -0,0 +1,35 @@
+#ifndef RBIMPL_ATTR_NOINLINE_H                       /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ATTR_NOINLINE_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RBIMPL_ATTR_NOINLINE.
+ */
+#include "ruby/internal/has/attribute.h"
+#include "ruby/internal/has/declspec_attribute.h"
+
+/** Wraps (or simulates) `__declspec(noinline)` */
+#if RBIMPL_HAS_DECLSPEC_ATTRIBUTE(noinline)
+# define RBIMPL_ATTR_NOINLINE() __declspec(noinline)
+#elif RBIMPL_HAS_ATTRIBUTE(noinline)
+# define RBIMPL_ATTR_NOINLINE() __attribute__((__noinline__))
+#else
+# define RBIMPL_ATTR_NOINLINE() /* void */
+#endif
+
+#endif /* RBIMPL_ATTR_NOINLINE_H */
diff --git a/include/ruby/internal/attr/nonnull.h b/include/ruby/internal/attr/nonnull.h
new file mode 100644
index 0000000000..cfced0bf74
--- /dev/null
+++ b/include/ruby/internal/attr/nonnull.h
@@ -0,0 +1,32 @@
+#ifndef RBIMPL_ATTR_NONNULL_H                        /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ATTR_NONNULL_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RBIMPL_ATTR_NONNULL.
+ */
+#include "ruby/internal/has/attribute.h"
+
+/** Wraps (or simulates) `__attribute__((nonnull))` */
+#if RBIMPL_HAS_ATTRIBUTE(nonnull)
+# define RBIMPL_ATTR_NONNULL(list) __attribute__((__nonnull__ list))
+#else
+# define RBIMPL_ATTR_NONNULL(list) /* void */
+#endif
+
+#endif /* RBIMPL_ATTR_NONNULL_H */
diff --git a/include/ruby/internal/attr/noreturn.h b/include/ruby/internal/attr/noreturn.h
new file mode 100644
index 0000000000..f741167c12
--- /dev/null
+++ b/include/ruby/internal/attr/noreturn.h
@@ -0,0 +1,48 @@
+#ifndef RBIMPL_ATTR_NORETURN_H                       /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ATTR_NORETURN_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RBIMPL_ATTR_NORETURN.
+ */
+#include "ruby/internal/has/attribute.h"
+#include "ruby/internal/has/cpp_attribute.h"
+#include "ruby/internal/has/declspec_attribute.h"
+
+/** Wraps (or simulates) `[[noreturn]]` */
+#if RBIMPL_HAS_DECLSPEC_ATTRIBUTE(noreturn)
+# define RBIMPL_ATTR_NORETURN() __declspec(noreturn)
+
+#elif RBIMPL_HAS_ATTRIBUTE(noreturn)
+# define RBIMPL_ATTR_NORETURN() __attribute__((__noreturn__))
+
+#elif RBIMPL_HAS_CPP_ATTRIBUTE(noreturn)
+# define RBIMPL_ATTR_NORETURN() [[noreturn]]
+
+#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112)
+# define RBIMPL_ATTR_NORETURN() _Noreturn
+
+#elif defined(_Noreturn)
+# /* glibc <sys/cdefs.h> has this macro. */
+# define RBIMPL_ATTR_NORETURN() _Noreturn
+
+#else
+# define RBIMPL_ATTR_NORETURN() /* void */
+#endif
+
+#endif /* RBIMPL_ATTR_NORETURN_H */
diff --git a/include/ruby/internal/attr/pure.h b/include/ruby/internal/attr/pure.h
new file mode 100644
index 0000000000..1a10540ef3
--- /dev/null
+++ b/include/ruby/internal/attr/pure.h
@@ -0,0 +1,43 @@
+#ifndef RBIMPL_ATTR_PURE_H                           /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ATTR_PURE_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RBIMPL_ATTR_PURE.
+ */
+#include "ruby/internal/compiler_since.h"
+#include "ruby/internal/has/attribute.h"
+#include "ruby/assert.h"
+
+/** Wraps (or simulates) `__attribute__((pure))` */
+#if RBIMPL_HAS_ATTRIBUTE(pure)
+# define RBIMPL_ATTR_PURE() __attribute__((__pure__))
+#elif RBIMPL_COMPILER_SINCE(SunPro, 5, 10, 0)
+# define RBIMPL_ATTR_PURE() _Pragma("does_not_write_global_data")
+#else
+# define RBIMPL_ATTR_PURE() /* void */
+#endif
+
+/** Enables #RBIMPL_ATTR_PURE iff. ! #RUBY_DEBUG. */
+#if !RUBY_DEBUG
+# define RBIMPL_ATTR_PURE_UNLESS_DEBUG() RBIMPL_ATTR_PURE()
+#else
+# define RBIMPL_ATTR_PURE_UNLESS_DEBUG() /* void */
+#endif
+
+#endif /* RBIMPL_ATTR_PURE_H */
diff --git a/include/ruby/internal/attr/restrict.h b/include/ruby/internal/attr/restrict.h
new file mode 100644
index 0000000000..3f4b7db165
--- /dev/null
+++ b/include/ruby/internal/attr/restrict.h
@@ -0,0 +1,45 @@
+#ifndef RBIMPL_ATTR_RESTRICT_H                       /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ATTR_RESTRICT_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RBIMPL_ATTR_RESTRICT.
+ */
+#include "ruby/internal/compiler_since.h"
+#include "ruby/internal/has/attribute.h"
+#include "ruby/internal/token_paste.h"
+
+/* :FIXME:  config.h  includes conflicting  `#define  restrict`.   MSVC can  be
+ * detected  using `RBIMPL_COMPILER_SINCE()`,  but  Clang &  family cannot  use
+ * `__has_declspec_attribute()` which involves macro substitution. */
+
+/** Wraps (or simulates) `__declspec(restrict)` */
+#if RBIMPL_COMPILER_SINCE(MSVC, 14, 0, 0)
+# define RBIMPL_ATTR_RESTRICT() __declspec(RBIMPL_TOKEN_PASTE(re, strict))
+
+#elif RBIMPL_HAS_ATTRIBUTE(malloc)
+# define RBIMPL_ATTR_RESTRICT() __attribute__((__malloc__))
+
+#elif RBIMPL_COMPILER_SINCE(SunPro, 5, 10, 0)
+# define RBIMPL_ATTR_RESTRICT() _Pragma("returns_new_memory")
+
+#else
+# define RBIMPL_ATTR_RESTRICT() /* void */
+#endif
+
+#endif /* RBIMPL_ATTR_RESTRICT_H */
diff --git a/include/ruby/internal/attr/returns_nonnull.h b/include/ruby/internal/attr/returns_nonnull.h
new file mode 100644
index 0000000000..91c7be15cd
--- /dev/null
+++ b/include/ruby/internal/attr/returns_nonnull.h
@@ -0,0 +1,37 @@
+#ifndef RBIMPL_ATTR_RETURNS_NONNULL_H                /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ATTR_RETURNS_NONNULL_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RBIMPL_ATTR_RETURNS_NONNULL.
+ */
+#include "ruby/internal/has/attribute.h"
+
+/** Wraps (or simulates) `__attribute__((returns_nonnull))` */
+#if defined(_Ret_nonnull_)
+# /* Take SAL definition. */
+# define RBIMPL_ATTR_RETURNS_NONNULL() _Ret_nonnull_
+
+#elif RBIMPL_HAS_ATTRIBUTE(returns_nonnull)
+# define RBIMPL_ATTR_RETURNS_NONNULL() __attribute__((__returns_nonnull__))
+
+#else
+# define RBIMPL_ATTR_RETURNS_NONNULL() /* void */
+#endif
+
+#endif /* RBIMPL_ATTR_RETURNS_NONNULL_H */
diff --git a/include/ruby/internal/attr/warning.h b/include/ruby/internal/attr/warning.h
new file mode 100644
index 0000000000..fb6b214828
--- /dev/null
+++ b/include/ruby/internal/attr/warning.h
@@ -0,0 +1,32 @@
+#ifndef RBIMPL_ATTR_WARNING_H                        /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ATTR_WARNING_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RBIMPL_ATTR_WARNING.
+ */
+#include "ruby/internal/has/attribute.h"
+
+/** Wraps (or simulates) `__attribute__((warning))` */
+#if RBIMPL_HAS_ATTRIBUTE(warning)
+# define RBIMPL_ATTR_WARNING(msg) __attribute__((__warning__ msg))
+#else
+# define RBIMPL_ATTR_WARNING(msg) /* void */
+#endif
+
+#endif /* RBIMPL_ATTR_WARNING_H */
diff --git a/include/ruby/internal/attr/weakref.h b/include/ruby/internal/attr/weakref.h
new file mode 100644
index 0000000000..59dba678fa
--- /dev/null
+++ b/include/ruby/internal/attr/weakref.h
@@ -0,0 +1,32 @@
+#ifndef RBIMPL_ATTR_WEAKREF_H                        /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ATTR_WEAKREF_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RBIMPL_ATTR_WEAKREF.
+ */
+#include "ruby/internal/has/attribute.h"
+
+/** Wraps (or simulates) `__attribute__((weakref))` */
+#if RBIMPL_HAS_ATTRIBUTE(weakref)
+# define RBIMPL_ATTR_WEAKREF(sym) __attribute__((__weakref__(# sym)))
+#else
+# define RBIMPL_ATTR_WEAKREF(sym) /* void */
+#endif
+
+#endif /* RBIMPL_ATTR_WEAKREF_H */
diff --git a/include/ruby/internal/cast.h b/include/ruby/internal/cast.h
new file mode 100644
index 0000000000..065a5d01c2
--- /dev/null
+++ b/include/ruby/internal/cast.h
@@ -0,0 +1,53 @@
+#ifndef RBIMPL_CAST_H                                /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_CAST_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines RBIMPL_CAST.
+ * @cond       INTERNAL_MACRO
+ *
+ * This casting macro makes sense only inside  of other macros that are part of
+ * public headers.  They could be used  from C++, and C-style casts could issue
+ * warnings.  Ruby internals are pure C so they should not bother.
+ */
+#include "ruby/internal/compiler_since.h"
+#include "ruby/internal/has/warning.h"
+#include "ruby/internal/warning_push.h"
+
+#if ! defined(__cplusplus)
+# define RBIMPL_CAST(expr) (expr)
+
+#elif RBIMPL_COMPILER_SINCE(GCC, 4, 6, 0)
+# /* g++ has -Wold-style-cast since 1997 or so, but its _Pragma is broken. */
+# /* See https://gcc.godbolt.org/z/XWhU6J */
+# define RBIMPL_CAST(expr) (expr)
+# pragma GCC diagnostic ignored "-Wold-style-cast"
+
+#elif RBIMPL_HAS_WARNING("-Wold-style-cast")
+# define RBIMPL_CAST(expr)                   \
+    RBIMPL_WARNING_PUSH()                    \
+    RBIMPL_WARNING_IGNORED(-Wold-style-cast) \
+    (expr)                                  \
+    RBIMPL_WARNING_POP()
+
+#else
+# define RBIMPL_CAST(expr) (expr)
+#endif
+/** @endcond */
+
+#endif /* RBIMPL_CAST_H */
diff --git a/include/ruby/internal/compiler_is.h b/include/ruby/internal/compiler_is.h
new file mode 100644
index 0000000000..776d7add4f
--- /dev/null
+++ b/include/ruby/internal/compiler_is.h
@@ -0,0 +1,45 @@
+#ifndef RBIMPL_COMPILER_IS_H                         /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_COMPILER_IS_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RBIMPL_COMPILER_IS.
+ */
+
+/**
+ * @brief   Checks if the compiler is of given brand.
+ * @param   cc     Compiler brand, like `MSVC`.
+ * @retval  true   It is.
+ * @retval  false  It isn't.
+ */
+#define RBIMPL_COMPILER_IS(cc) RBIMPL_COMPILER_IS_ ## cc
+
+#include "ruby/internal/compiler_is/apple.h"
+#include "ruby/internal/compiler_is/clang.h"
+#include "ruby/internal/compiler_is/gcc.h"
+#include "ruby/internal/compiler_is/intel.h"
+#include "ruby/internal/compiler_is/msvc.h"
+#include "ruby/internal/compiler_is/sunpro.h"
+/* :TODO: Other possible compilers to support:
+ *
+ * - IBM  XL: recent  XL are  clang-backended  so some  tweaks like  we do  for
+ *   Apple's might be needed.
+ *
+ * - ARM's armclang: ditto, it can be clang-backended.  */
+
+#endif /* RBIMPL_COMPILER_IS_H */
diff --git a/include/ruby/internal/compiler_is/apple.h b/include/ruby/internal/compiler_is/apple.h
new file mode 100644
index 0000000000..5a5f558254
--- /dev/null
+++ b/include/ruby/internal/compiler_is/apple.h
@@ -0,0 +1,41 @@
+#ifndef RBIMPL_COMPILER_IS_APPLE_H                   /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_COMPILER_IS_APPLE_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RBIMPL_COMPILER_IS_Apple.
+ *
+ * Apple  ships clang.   Problem is,  its  `__clang_major__` etc.  are not  the
+ * upstream LLVM  version, but XCode's.  We  have to think Apple's  is distinct
+ * from LLVM's,  when it comes  to compiler  detection business in  this header
+ * file.
+ */
+#if ! defined(__clang__)
+# define RBIMPL_COMPILER_IS_Apple 0
+
+#elif ! defined(__apple_build_version__)
+# define RBIMPL_COMPILER_IS_Apple 0
+
+#else
+# define RBIMPL_COMPILER_IS_Apple 1
+# define RBIMPL_COMPILER_VERSION_MAJOR __clang_major__
+# define RBIMPL_COMPILER_VERSION_MINOR __clang_minor__
+# define RBIMPL_COMPILER_VERSION_PATCH __clang_patchlevel__
+#endif
+
+#endif /* RBIMPL_COMPILER_IS_APPLE_H */
diff --git a/include/ruby/internal/compiler_is/clang.h b/include/ruby/internal/compiler_is/clang.h
new file mode 100644
index 0000000000..30655f2f25
--- /dev/null
+++ b/include/ruby/internal/compiler_is/clang.h
@@ -0,0 +1,38 @@
+#ifndef RBIMPL_COMPILER_IS_CLANG_H                   /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_COMPILER_IS_CLANG_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RBIMPL_COMPILER_IS_Clang.
+ */
+#include "ruby/internal/compiler_is/apple.h"
+
+#if ! defined(__clang__)
+# define RBIMPL_COMPILER_IS_Clang 0
+
+#elif RBIMPL_COMPILER_IS(Apple)
+# define RBIMPL_COMPILER_IS_Clang 0
+
+#else
+# define RBIMPL_COMPILER_IS_Clang 1
+# define RBIMPL_COMPILER_VERSION_MAJOR __clang_major__
+# define RBIMPL_COMPILER_VERSION_MINOR __clang_minor__
+# define RBIMPL_COMPILER_VERSION_PATCH __clang_patchlevel__
+#endif
+
+#endif /* RBIMPL_COMPILER_IS_CLANG_H */
diff --git a/include/ruby/internal/compiler_is/gcc.h b/include/ruby/internal/compiler_is/gcc.h
new file mode 100644
index 0000000000..6eabfb61a2
--- /dev/null
+++ b/include/ruby/internal/compiler_is/gcc.h
@@ -0,0 +1,46 @@
+#ifndef RBIMPL_COMPILER_IS_GCC_H                     /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_COMPILER_IS_GCC_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RBIMPL_COMPILER_IS_GCC.
+ */
+#include "ruby/internal/compiler_is/apple.h"
+#include "ruby/internal/compiler_is/clang.h"
+#include "ruby/internal/compiler_is/intel.h"
+
+#if ! defined(__GNUC__)
+# define RBIMPL_COMPILER_IS_GCC 0
+
+#elif RBIMPL_COMPILER_IS(Apple)
+# define RBIMPL_COMPILER_IS_GCC 0
+
+#elif RBIMPL_COMPILER_IS(Clang)
+# define RBIMPL_COMPILER_IS_GCC 0
+
+#elif RBIMPL_COMPILER_IS(Intel)
+# define RBIMPL_COMPILER_IS_GCC 0
+
+#else
+# define RBIMPL_COMPILER_IS_GCC 1
+# define RBIMPL_COMPILER_VERSION_MAJOR __GNUC__
+# define RBIMPL_COMPILER_VERSION_MINOR __GNUC_MINOR__
+# define RBIMPL_COMPILER_VERSION_PATCH __GNUC_PATCHLEVEL__
+#endif
+
+#endif /* RBIMPL_COMPILER_IS_GCC_H */
diff --git a/include/ruby/internal/compiler_is/intel.h b/include/ruby/internal/compiler_is/intel.h
new file mode 100644
index 0000000000..ada120485e
--- /dev/null
+++ b/include/ruby/internal/compiler_is/intel.h
@@ -0,0 +1,41 @@
+#ifndef RBIMPL_COMPILER_IS_INTEL_H                   /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_COMPILER_IS_INTEL_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RBIMPL_COMPILER_IS_Intel.
+ */
+#if ! defined(__INTEL_COMPILER)
+# define RBIMPL_COMPILER_IS_Intel 0
+
+#elif ! defined(__INTEL_COMPILER_UPDATE)
+# define RBIMPL_COMPILER_IS_Intel 1
+# /* __INTEL_COMPILER = XXYZ */
+# define RBIMPL_COMPILER_VERSION_MAJOR (__INTEL_COMPILER / 100)
+# define RBIMPL_COMPILER_VERSION_MINOR (__INTEL_COMPILER % 100 / 10)
+# define RBIMPL_COMPILER_VERSION_PATCH (__INTEL_COMPILER       % 10)
+
+#else
+# define RBIMPL_COMPILER_IS_Intel 1
+# /* __INTEL_COMPILER = XXYZ */
+# define RBIMPL_COMPILER_VERSION_MAJOR (__INTEL_COMPILER / 100)
+# define RBIMPL_COMPILER_VERSION_MINOR (__INTEL_COMPILER % 100 / 10)
+# define RBIMPL_COMPILER_VERSION_PATCH __INTEL_COMPILER_UPDATE
+#endif
+
+#endif /* RBIMPL_COMPILER_IS_INTEL_H */
diff --git a/include/ruby/internal/compiler_is/msvc.h b/include/ruby/internal/compiler_is/msvc.h
new file mode 100644
index 0000000000..60189da1a3
--- /dev/null
+++ b/include/ruby/internal/compiler_is/msvc.h
@@ -0,0 +1,57 @@
+#ifndef RBIMPL_COMPILER_IS_MSVC_H                    /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_COMPILER_IS_MSVC_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RBIMPL_COMPILER_IS_MSVC.
+ */
+#include "ruby/internal/compiler_is/clang.h"
+#include "ruby/internal/compiler_is/intel.h"
+
+#if ! defined(_MSC_VER)
+# define RBIMPL_COMPILER_IS_MSVC 0
+
+#elif RBIMPL_COMPILER_IS(Clang)
+# define RBIMPL_COMPILER_IS_MSVC 0
+
+#elif RBIMPL_COMPILER_IS(Intel)
+# define RBIMPL_COMPILER_IS_MSVC 0
+
+#elif _MSC_VER >= 1400
+# define RBIMPL_COMPILER_IS_MSVC 1
+# /* _MSC_FULL_VER = XXYYZZZZZ */
+# define RBIMPL_COMPILER_VERSION_MAJOR (_MSC_FULL_VER / 10000000)
+# define RBIMPL_COMPILER_VERSION_MINOR (_MSC_FULL_VER % 10000000 / 100000)
+# define RBIMPL_COMPILER_VERSION_PATCH (_MSC_FULL_VER            % 100000)
+
+#elif defined(_MSC_FULL_VER)
+# define RBIMPL_COMPILER_IS_MSVC 1
+# /* _MSC_FULL_VER = XXYYZZZZ */
+# define RBIMPL_COMPILER_VERSION_MAJOR (_MSC_FULL_VER / 1000000)
+# define RBIMPL_COMPILER_VERSION_MINOR (_MSC_FULL_VER % 1000000 / 10000)
+# define RBIMPL_COMPILER_VERSION_PATCH (_MSC_FULL_VER           % 10000)
+
+#else
+# define RBIMPL_COMPILER_IS_MSVC 1
+# /* _MSC_VER = XXYY */
+# define RBIMPL_COMPILER_VERSION_MAJOR (_MSC_VER / 100)
+# define RBIMPL_COMPILER_VERSION_MINOR (_MSC_VER % 100)
+# define RBIMPL_COMPILER_VERSION_PATCH 0
+#endif
+
+#endif /* RBIMPL_COMPILER_IS_MSVC_H */
diff --git a/include/ruby/internal/compiler_is/sunpro.h b/include/ruby/internal/compiler_is/sunpro.h
new file mode 100644
index 0000000000..2eb7b892f2
--- /dev/null
+++ b/include/ruby/internal/compiler_is/sunpro.h
@@ -0,0 +1,55 @@
+#ifndef RBIMPL_COMPILER_IS_SUNPRO_H                  /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_COMPILER_IS_SUNPRO_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RBIMPL_COMPILER_IS_SunPro.
+ */
+#if ! (defined(__SUNPRO_C) || defined(__SUNPRO_CC))
+# define RBIMPL_COMPILER_IS_SunPro 0
+
+#elif defined(__SUNPRO_C) && __SUNPRO_C >= 0x5100
+# define RBIMPL_COMPILER_IS_SunPro 1
+# /* __SUNPRO_C = 0xXYYZ */
+# define RBIMPL_COMPILER_VERSION_MAJOR  (__SUNPRO_C >> 12)
+# define RBIMPL_COMPILER_VERSION_MINOR ((__SUNPRO_C >> 8 & 0xF) * 10 + (__SUNPRO_C >> 4 & 0xF))
+# define RBIMPL_COMPILER_VERSION_PATCH  (__SUNPRO_C      & 0xF)
+
+#elif defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x5100
+# define RBIMPL_COMPILER_IS_SunPro 1
+# /* __SUNPRO_CC = 0xXYYZ */
+# define RBIMPL_COMPILER_VERSION_MAJOR  (__SUNPRO_CC >> 12)
+# define RBIMPL_COMPILER_VERSION_MINOR ((__SUNPRO_CC >> 8 & 0xF) * 10 + (__SUNPRO_CC >> 4 & 0xF))
+# define RBIMPL_COMPILER_VERSION_PATCH  (__SUNPRO_CC      & 0xF)
+
+#elif defined(__SUNPRO_C)
+# define RBIMPL_COMPILER_IS_SunPro 1
+# /* __SUNPRO_C = 0xXYZ */
+# define RBIMPL_COMPILER_VERSION_MAJOR (__SUNPRO_C >> 8)
+# define RBIMPL_COMPILER_VERSION_MINOR (__SUNPRO_C >> 4 & 0xF)
+# define RBIMPL_COMPILER_VERSION_PATCH (__SUNPRO_C      & 0xF)
+
+#else
+# define RBIMPL_COMPILER_IS_SunPro 1
+# /* __SUNPRO_CC = 0xXYZ */
+# define RBIMPL_COMPILER_VERSION_MAJOR (__SUNPRO_CC >> 8)
+# define RBIMPL_COMPILER_VERSION_MINOR (__SUNPRO_CC >> 4 & 0xF)
+# define RBIMPL_COMPILER_VERSION_PATCH (__SUNPRO_CC      & 0xF)
+#endif
+
+#endif /* RBIMPL_COMPILER_IS_SUNPRO_H */
diff --git a/include/ruby/internal/compiler_since.h b/include/ruby/internal/compiler_since.h
new file mode 100644
index 0000000000..92abb8acc8
--- /dev/null
+++ b/include/ruby/internal/compiler_since.h
@@ -0,0 +1,61 @@
+#ifndef RBIMPL_COMPILER_SINCE_H                      /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_COMPILER_SINCE_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RBIMPL_COMPILER_SINCE.
+ */
+#include "ruby/internal/compiler_is.h"
+
+/**
+ * @brief   Checks if the compiler is of given brand and is newer than or equal
+ *          to the passed version.
+ * @param   cc     Compiler brand, like `MSVC`.
+ * @param   x      Major version.
+ * @param   y      Minor version.
+ * @param   z      Patchlevel.
+ * @retval  true   cc >= x.y.z.
+ * @retval  false  oherwise.
+ */
+#define RBIMPL_COMPILER_SINCE(cc, x, y, z)     \
+     (RBIMPL_COMPILER_IS(cc)                && \
+    ((RBIMPL_COMPILER_VERSION_MAJOR >  (x)) || \
+    ((RBIMPL_COMPILER_VERSION_MAJOR == (x)) && \
+    ((RBIMPL_COMPILER_VERSION_MINOR >  (y)) || \
+    ((RBIMPL_COMPILER_VERSION_MINOR == (y)) && \
+     (RBIMPL_COMPILER_VERSION_PATCH >= (z)))))))
+
+/**
+ * @brief   Checks if  the compiler  is of  given brand and  is older  than the
+ *          passed version.
+ * @param   cc     Compiler brand, like `MSVC`.
+ * @param   x      Major version.
+ * @param   y      Minor version.
+ * @param   z      Patchlevel.
+ * @retval  true   cc < x.y.z.
+ * @retval  false  oherwise.
+ */
+#define RBIMPL_COMPILER_BEFORE(cc, x, y, z)    \
+     (RBIMPL_COMPILER_IS(cc)                && \
+    ((RBIMPL_COMPILER_VERSION_MAJOR <  (x)) || \
+    ((RBIMPL_COMPILER_VERSION_MAJOR == (x)) && \
+    ((RBIMPL_COMPILER_VERSION_MINOR <  (y)) || \
+    ((RBIMPL_COMPILER_VERSION_MINOR == (y)) && \
+     (RBIMPL_COMPILER_VERSION_PATCH <  (z)))))))
+
+#endif /* RBIMPL_COMPILER_SINCE_H */
diff --git a/include/ruby/internal/config.h b/include/ruby/internal/config.h
new file mode 100644
index 0000000000..67d7e0156f
--- /dev/null
+++ b/include/ruby/internal/config.h
@@ -0,0 +1,144 @@
+#ifndef RBIMPL_CONFIG_H                              /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_CONFIG_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Thin wrapper to ruby/config.h
+ */
+#include "ruby/config.h"
+
+#ifdef RUBY_EXTCONF_H
+# include RUBY_EXTCONF_H
+#endif
+
+#include "ruby/internal/compiler_since.h"
+
+#undef  HAVE_PROTOTYPES
+#define HAVE_PROTOTYPES 1
+
+#undef  HAVE_STDARG_PROTOTYPES
+#define HAVE_STDARG_PROTOTYPES 1
+
+#undef  TOKEN_PASTE
+#define TOKEN_PASTE(x,y) x##y
+
+#if defined(__cplusplus)
+#/* __builtin_choose_expr and __builtin_types_compatible aren't available
+# * on C++.  See https://gcc.gnu.org/onlinedocs/gcc/Other-Builtins.html */
+# undef HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P
+# undef HAVE_BUILTIN___BUILTIN_TYPES_COMPATIBLE_P
+
+/* HAVE_VA_ARGS_MACRO is for C.  C++ situations might be different. */
+# undef HAVE_VA_ARGS_MACRO
+# if __cplusplus >= 201103L
+#  define HAVE_VA_ARGS_MACRO
+# elif defined(__GXX_EXPERIMENTAL_CXX0X__) && __GXX_EXPERIMENTAL_CXX0X__
+#  define HAVE_VA_ARGS_MACRO
+# elif defined(__INTEL_CXX11_MODE__)
+#  define HAVE_VA_ARGS_MACRO
+# elif RBIMPL_COMPILER_SINCE(MSVC, 16, 0, 0)
+#  define HAVE_VA_ARGS_MACRO
+# else
+#  /* NG, not known. */
+# endif
+#endif
+
+#if RBIMPL_COMPILER_BEFORE(GCC, 4, 9, 0)
+# /* See https://bugs.ruby-lang.org/issues/14221 */
+# undef HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P
+#endif
+
+#if RBIMPL_COMPILER_BEFORE(GCC, 5, 0, 0)
+# /* GCC 4.9.2 reportedly has this feature  and is broken.  The function is not
+#  * officially documented below.  Seems we should not use it.
+#  * https://gcc.gnu.org/onlinedocs/gcc-4.9.4/gcc/Other-Builtins.html */
+# undef HAVE_BUILTIN___BUILTIN_ALLOCA_WITH_ALIGN
+#endif
+
+#if defined(__SUNPRO_CC)
+# /* Oracle  Developer Studio  12.5: GCC compatibility guide  says it  supports
+#  * statement expressions.   But to our  knowledge they support  the extension
+#  * only for C and not for C++.  Prove  me wrong.  Am happy to support them if
+#  * there is a way. */
+# undef HAVE_STMT_AND_DECL_IN_EXPR
+#endif
+
+#ifndef STRINGIZE0
+# define STRINGIZE(expr) STRINGIZE0(expr)
+# define STRINGIZE0(expr) #expr
+#endif
+
+#ifdef AC_APPLE_UNIVERSAL_BUILD
+# undef WORDS_BIGENDIAN
+# ifdef __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN
+# endif
+#endif
+
+#ifndef DLEXT_MAXLEN
+# define DLEXT_MAXLEN 4
+#endif
+
+#ifndef RUBY_PLATFORM
+# define RUBY_PLATFORM "unknown-unknown"
+#endif
+
+#ifdef UNALIGNED_WORD_ACCESS
+# /* Take that. */
+#elif defined(__i386)
+# define UNALIGNED_WORD_ACCESS 1
+#elif defined(__i386__)
+# define UNALIGNED_WORD_ACCESS 1
+#elif defined(_M_IX86)
+# define UNALIGNED_WORD_ACCESS 1
+#elif defined(__x86_64)
+# define UNALIGNED_WORD_ACCESS 1
+#elif defined(__x86_64__)
+# define UNALIGNED_WORD_ACCESS 1
+#elif defined(_M_AMD64)
+# define UNALIGNED_WORD_ACCESS 1
+#elif defined(__powerpc64__)
+# define UNALIGNED_WORD_ACCESS 1
+#elif defined(__aarch64__)
+# define UNALIGNED_WORD_ACCESS 1
+#elif defined(__mc68020__)
+# define UNALIGNED_WORD_ACCESS 1
+#else
+# define UNALIGNED_WORD_ACCESS 0
+#endif
+
+/* Detection of __VA_OPT__ */
+#if ! defined(HAVE_VA_ARGS_MACRO)
+# undef HAVE___VA_OPT__
+
+#else
+# /* Idea taken from: https://stackoverflow.com/a/48045656 */
+# define RBIMPL_TEST3(q, w, e, ...) e
+# define RBIMPL_TEST2(...)          RBIMPL_TEST3(__VA_OPT__(,),1,0,0)
+# define RBIMPL_TEST1()             RBIMPL_TEST2("ruby")
+# if RBIMPL_TEST1()
+#  define HAVE___VA_OPT__
+# else
+#  undef HAVE___VA_OPT__
+# endif
+# undef RBIMPL_TEST1
+# undef RBIMPL_TEST2
+# undef RBIMPL_TEST3
+#endif /* HAVE_VA_ARGS_MACRO */
+
+#endif /* RBIMPL_CONFIG_H */
diff --git a/include/ruby/internal/constant_p.h b/include/ruby/internal/constant_p.h
new file mode 100644
index 0000000000..e54a8d85b9
--- /dev/null
+++ b/include/ruby/internal/constant_p.h
@@ -0,0 +1,37 @@
+#ifndef RBIMPL_CONSTANT_P_H                          /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_CONSTANT_P_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RBIMPL_CONSTANT_P.
+ *
+ * Note that __builtin_constant_p can be applicable inside of inline functions,
+ * according to GCC manual.  Clang lacks that feature, though.
+ *
+ * @see https://bugs.llvm.org/show_bug.cgi?id=4898
+ * @see https://gcc.gnu.org/onlinedocs/gcc/Other-Builtins.html
+ */
+#include "ruby/internal/has/builtin.h"
+
+#if RBIMPL_HAS_BUILTIN(__builtin_constant_p)
+# define RBIMPL_CONSTANT_P(expr) __builtin_constant_p(expr)
+#else
+# define RBIMPL_CONSTANT_P(expr) 0
+#endif
+
+#endif /* RBIMPL_CONSTANT_P_H */
diff --git a/include/ruby/internal/core.h b/include/ruby/internal/core.h
new file mode 100644
index 0000000000..53a00a4603
--- /dev/null
+++ b/include/ruby/internal/core.h
@@ -0,0 +1,35 @@
+#ifndef RBIMPL_CORE_H                                /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_CORE_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Core data structures, definitions and manupulations.
+ */
+#include "ruby/internal/core/rarray.h"
+#include "ruby/internal/core/rbasic.h"
+#include "ruby/internal/core/rbignum.h"
+#include "ruby/internal/core/rclass.h"
+#include "ruby/internal/core/rdata.h"
+#include "ruby/internal/core/rfile.h"
+#include "ruby/internal/core/rhash.h"
+#include "ruby/internal/core/robject.h"
+#include "ruby/internal/core/rregexp.h"
+#include "ruby/internal/core/rstring.h"
+#include "ruby/internal/core/rstruct.h"
+#include "ruby/internal/core/rtypeddata.h"
+#endif /* RBIMPL_CORE_H */
diff --git a/include/ruby/internal/core/rarray.h b/include/ruby/internal/core/rarray.h
new file mode 100644
index 0000000000..938e2dc897
--- /dev/null
+++ b/include/ruby/internal/core/rarray.h
@@ -0,0 +1,270 @@
+#ifndef RBIMPL_RARRAY_H                              /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_RARRAY_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines struct ::RArray.
+ */
+#include "ruby/internal/arithmetic/long.h"
+#include "ruby/internal/attr/artificial.h"
+#include "ruby/internal/attr/constexpr.h"
+#include "ruby/internal/attr/maybe_unused.h"
+#include "ruby/internal/attr/pure.h"
+#include "ruby/internal/cast.h"
+#include "ruby/internal/core/rbasic.h"
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/fl_type.h"
+#include "ruby/internal/rgengc.h"
+#include "ruby/internal/stdbool.h"
+#include "ruby/internal/value.h"
+#include "ruby/internal/value_type.h"
+#include "ruby/assert.h"
+
+#ifndef USE_TRANSIENT_HEAP
+# define USE_TRANSIENT_HEAP 1
+#endif
+
+#define RARRAY(obj)            RBIMPL_CAST((struct RArray *)(obj))
+#define RARRAY_EMBED_FLAG      RARRAY_EMBED_FLAG
+#define RARRAY_EMBED_LEN_MASK  RARRAY_EMBED_LEN_MASK
+#define RARRAY_EMBED_LEN_MAX   RARRAY_EMBED_LEN_MAX
+#define RARRAY_EMBED_LEN_SHIFT RARRAY_EMBED_LEN_SHIFT
+#if USE_TRANSIENT_HEAP
+# define RARRAY_TRANSIENT_FLAG RARRAY_TRANSIENT_FLAG
+#else
+# define RARRAY_TRANSIENT_FLAG 0
+#endif
+#define RARRAY_LEN                 rb_array_len
+#define RARRAY_CONST_PTR           rb_array_const_ptr
+#define RARRAY_CONST_PTR_TRANSIENT rb_array_const_ptr_transient
+
+/** @cond INTERNAL_MACRO */
+#if defined(__fcc__) || defined(__fcc_version) || \
+    defined(__FCC__) || defined(__FCC_VERSION)
+/* workaround for old version of Fujitsu C Compiler (fcc) */
+# define FIX_CONST_VALUE_PTR(x) ((const VALUE *)(x))
+#else
+# define FIX_CONST_VALUE_PTR(x) (x)
+#endif
+
+#define RARRAY_EMBED_LEN   RARRAY_EMBED_LEN
+#define RARRAY_LENINT      RARRAY_LENINT
+#define RARRAY_TRANSIENT_P RARRAY_TRANSIENT_P
+#define RARRAY_ASET        RARRAY_ASET
+#define RARRAY_PTR         RARRAY_PTR
+/** @endcond */
+
+enum ruby_rarray_flags {
+    RARRAY_EMBED_FLAG      = RUBY_FL_USER1,
+    /* RUBY_FL_USER2 is for ELTS_SHARED */
+    RARRAY_EMBED_LEN_MASK  = RUBY_FL_USER4 | RUBY_FL_USER3
+#if USE_TRANSIENT_HEAP
+    ,
+    RARRAY_TRANSIENT_FLAG  = RUBY_FL_USER13
+#endif
+};
+
+enum ruby_rarray_consts {
+    RARRAY_EMBED_LEN_SHIFT = RUBY_FL_USHIFT + 3,
+    RARRAY_EMBED_LEN_MAX   = RBIMPL_EMBED_LEN_MAX_OF(VALUE)
+};
+
+struct RArray {
+    struct RBasic basic;
+    union {
+        struct {
+            long len;
+            union {
+                long capa;
+#if defined(__clang__)      /* <- clang++ is sane */ || \
+    !defined(__cplusplus)   /* <- C99 is sane */     || \
+    (__cplusplus > 199711L) /* <- C++11 is sane */
+                const
+#endif
+                VALUE shared_root;
+            } aux;
+            const VALUE *ptr;
+        } heap;
+        const VALUE ary[RARRAY_EMBED_LEN_MAX];
+    } as;
+};
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+VALUE *rb_ary_ptr_use_start(VALUE ary);
+void rb_ary_ptr_use_end(VALUE a);
+#if USE_TRANSIENT_HEAP
+void rb_ary_detransient(VALUE a);
+#endif
+RBIMPL_SYMBOL_EXPORT_END()
+
+RBIMPL_ATTR_PURE_UNLESS_DEBUG()
+RBIMPL_ATTR_ARTIFICIAL()
+static inline long
+RARRAY_EMBED_LEN(VALUE ary)
+{
+    RBIMPL_ASSERT_TYPE(ary, RUBY_T_ARRAY);
+    RBIMPL_ASSERT_OR_ASSUME(RB_FL_ANY_RAW(ary, RARRAY_EMBED_FLAG));
+
+    VALUE f = RBASIC(ary)->flags;
+    f &= RARRAY_EMBED_LEN_MASK;
+    f >>= RARRAY_EMBED_LEN_SHIFT;
+    return RBIMPL_CAST((long)f);
+}
+
+RBIMPL_ATTR_PURE_UNLESS_DEBUG()
+static inline long
+rb_array_len(VALUE a)
+{
+    RBIMPL_ASSERT_TYPE(a, RUBY_T_ARRAY);
+
+    if (RB_FL_ANY_RAW(a, RARRAY_EMBED_FLAG)) {
+        return RARRAY_EMBED_LEN(a);
+    }
+    else {
+        return RARRAY(a)->as.heap.len;
+    }
+}
+
+RBIMPL_ATTR_ARTIFICIAL()
+static inline int
+RARRAY_LENINT(VALUE ary)
+{
+    return rb_long2int(RARRAY_LEN(ary));
+}
+
+RBIMPL_ATTR_PURE_UNLESS_DEBUG()
+RBIMPL_ATTR_ARTIFICIAL()
+static inline bool
+RARRAY_TRANSIENT_P(VALUE ary)
+{
+    RBIMPL_ASSERT_TYPE(ary, RUBY_T_ARRAY);
+
+#if USE_TRANSIENT_HEAP
+    return RB_FL_ANY_RAW(ary, RARRAY_TRANSIENT_FLAG);
+#else
+    return false;
+#endif
+}
+
+RBIMPL_ATTR_PURE_UNLESS_DEBUG()
+/* internal function. do not use this function */
+static inline const VALUE *
+rb_array_const_ptr_transient(VALUE a)
+{
+    RBIMPL_ASSERT_TYPE(a, RUBY_T_ARRAY);
+
+    if (RB_FL_ANY_RAW(a, RARRAY_EMBED_FLAG)) {
+        return FIX_CONST_VALUE_PTR(RARRAY(a)->as.ary);
+    }
+    else {
+        return FIX_CONST_VALUE_PTR(RARRAY(a)->as.heap.ptr);
+    }
+}
+
+#if ! USE_TRANSIENT_HEAP
+RBIMPL_ATTR_PURE_UNLESS_DEBUG()
+#endif
+/* internal function. do not use this function */
+static inline const VALUE *
+rb_array_const_ptr(VALUE a)
+{
+    RBIMPL_ASSERT_TYPE(a, RUBY_T_ARRAY);
+
+#if USE_TRANSIENT_HEAP
+    if (RARRAY_TRANSIENT_P(a)) {
+        rb_ary_detransient(a);
+    }
+#endif
+    return rb_array_const_ptr_transient(a);
+}
+
+/* internal function. do not use this function */
+static inline VALUE *
+rb_array_ptr_use_start(VALUE a,
+                       RBIMPL_ATTR_MAYBE_UNUSED()
+                       int allow_transient)
+{
+    RBIMPL_ASSERT_TYPE(a, RUBY_T_ARRAY);
+
+#if USE_TRANSIENT_HEAP
+    if (!allow_transient) {
+        if (RARRAY_TRANSIENT_P(a)) {
+            rb_ary_detransient(a);
+        }
+    }
+#endif
+
+    return rb_ary_ptr_use_start(a);
+}
+
+/* internal function. do not use this function */
+static inline void
+rb_array_ptr_use_end(VALUE a,
+                     RBIMPL_ATTR_MAYBE_UNUSED()
+                     int allow_transient)
+{
+    RBIMPL_ASSERT_TYPE(a, RUBY_T_ARRAY);
+    rb_ary_ptr_use_end(a);
+}
+
+#define RBIMPL_RARRAY_STMT(flag, ary, var, expr) do {        \
+    RBIMPL_ASSERT_TYPE((ary), RUBY_T_ARRAY);                 \
+    const VALUE rbimpl_ary = (ary);                          \
+    VALUE *var = rb_array_ptr_use_start(rbimpl_ary, (flag)); \
+    expr;                                                   \
+    rb_array_ptr_use_end(rbimpl_ary, (flag));                \
+} while (0)
+
+#define RARRAY_PTR_USE_START(a) rb_array_ptr_use_start(a, 0)
+#define RARRAY_PTR_USE_END(a) rb_array_ptr_use_end(a, 0)
+#define RARRAY_PTR_USE(ary, ptr_name, expr) \
+    RBIMPL_RARRAY_STMT(0, ary, ptr_name, expr)
+
+#define RARRAY_PTR_USE_START_TRANSIENT(a) rb_array_ptr_use_start(a, 1)
+#define RARRAY_PTR_USE_END_TRANSIENT(a) rb_array_ptr_use_end(a, 1)
+#define RARRAY_PTR_USE_TRANSIENT(ary, ptr_name, expr) \
+    RBIMPL_RARRAY_STMT(1, ary, ptr_name, expr)
+
+static inline VALUE *
+RARRAY_PTR(VALUE ary)
+{
+    RBIMPL_ASSERT_TYPE(ary, RUBY_T_ARRAY);
+
+    VALUE tmp = RB_OBJ_WB_UNPROTECT_FOR(ARRAY, ary);
+    return RBIMPL_CAST((VALUE *)RARRAY_CONST_PTR(tmp));
+}
+
+static inline void
+RARRAY_ASET(VALUE ary, long i, VALUE v)
+{
+    RARRAY_PTR_USE_TRANSIENT(ary, ptr,
+        RB_OBJ_WRITE(ary, &ptr[i], v));
+}
+
+/*
+ * :FIXME: we want to convert RARRAY_AREF into an inline function (to add rooms
+ * for more sanity checks).  However there were situations where the address of
+ * this macro is taken i.e. &RARRAY_AREF(...).  They cannot be possible if this
+ * is not a  macro.  Such usages are abuse, and  we eliminated them internally.
+ * However we are afraid  of similar things to remain in  the wild.  This macro
+ * remains as  it is due to  that.  If we could  warn such usages we  can set a
+ * transition path, but currently no way is found to do so.
+ */
+#define RARRAY_AREF(a, i) RARRAY_CONST_PTR_TRANSIENT(a)[i]
+
+#endif /* RBIMPL_RARRAY_H */
diff --git a/include/ruby/internal/core/rbasic.h b/include/ruby/internal/core/rbasic.h
new file mode 100644
index 0000000000..a6093c047a
--- /dev/null
+++ b/include/ruby/internal/core/rbasic.h
@@ -0,0 +1,85 @@
+#ifndef RBIMPL_RBASIC_H                              /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_RBASIC_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines struct ::RBasic.
+ */
+#include "ruby/internal/attr/artificial.h"
+#include "ruby/internal/attr/constexpr.h"
+#include "ruby/internal/attr/forceinline.h"
+#include "ruby/internal/attr/noalias.h"
+#include "ruby/internal/attr/pure.h"
+#include "ruby/internal/cast.h"
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/special_consts.h"
+#include "ruby/internal/value.h"
+#include "ruby/assert.h"
+
+#define RBASIC(obj)          RBIMPL_CAST((struct RBasic *)(obj))
+#define RBASIC_CLASS         RBASIC_CLASS
+#define RVALUE_EMBED_LEN_MAX RVALUE_EMBED_LEN_MAX
+
+/** @cond INTERNAL_MACRO */
+#define RBIMPL_EMBED_LEN_MAX_OF(T) \
+    RBIMPL_CAST((int)(sizeof(VALUE[RVALUE_EMBED_LEN_MAX]) / (sizeof(T))))
+/** @endcond */
+
+enum ruby_rvalue_flags { RVALUE_EMBED_LEN_MAX = 3 };
+
+struct
+RUBY_ALIGNAS(SIZEOF_VALUE)
+RBasic {
+    VALUE flags;                /**< @see enum ::ruby_fl_type. */
+    const VALUE klass;
+
+#ifdef __cplusplus
+  public:
+    RBIMPL_ATTR_CONSTEXPR(CXX11)
+    RBIMPL_ATTR_ARTIFICIAL()
+    RBIMPL_ATTR_FORCEINLINE()
+    RBIMPL_ATTR_NOALIAS()
+    /**
+     * We need to define this explicit constructor because the field `klass` is
+     * const-qualified above,  which effectively  defines the  implicit default
+     * constructor as "deleted"  (as of C++11) --  No way but to  define one by
+     * ourselves.
+     */
+    RBasic() :
+        flags(RBIMPL_VALUE_NULL),
+        klass(RBIMPL_VALUE_NULL)
+    {
+    }
+#endif
+};
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+VALUE rb_obj_hide(VALUE obj);
+VALUE rb_obj_reveal(VALUE obj, VALUE klass); /* do not use this API to change klass information */
+RBIMPL_SYMBOL_EXPORT_END()
+
+RBIMPL_ATTR_PURE_UNLESS_DEBUG()
+RBIMPL_ATTR_ARTIFICIAL()
+static inline VALUE
+RBASIC_CLASS(VALUE obj)
+{
+    RBIMPL_ASSERT_OR_ASSUME(! RB_SPECIAL_CONST_P(obj));
+    return RBASIC(obj)->klass;
+}
+
+#endif /* RBIMPL_RBASIC_H */
diff --git a/include/ruby/internal/core/rbignum.h b/include/ruby/internal/core/rbignum.h
new file mode 100644
index 0000000000..89db566501
--- /dev/null
+++ b/include/ruby/internal/core/rbignum.h
@@ -0,0 +1,51 @@
+#ifndef RBIMPL_RBIGNUM_H                             /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_RBIGNUM_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Routines to manipulate struct ::RBignum.
+ */
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+#include "ruby/internal/value_type.h"
+#include "ruby/internal/stdbool.h"
+
+#define RBIGNUM_SIGN rb_big_sign
+
+/** @cond INTERNAL_MACRO */
+#define RBIGNUM_POSITIVE_P RBIGNUM_POSITIVE_P
+#define RBIGNUM_NEGATIVE_P RBIGNUM_NEGATIVE_P
+/** @endcond */
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+int rb_big_sign(VALUE num);
+RBIMPL_SYMBOL_EXPORT_END()
+
+static inline bool
+RBIGNUM_POSITIVE_P(VALUE b) {
+    RBIMPL_ASSERT_TYPE(b, RUBY_T_BIGNUM);
+    return RBIGNUM_SIGN(b);
+}
+
+static inline bool
+RBIGNUM_NEGATIVE_P(VALUE b) {
+    RBIMPL_ASSERT_TYPE(b, RUBY_T_BIGNUM);
+    return ! RBIGNUM_POSITIVE_P(b);
+}
+
+#endif /* RBIMPL_RBIGNUM_H */
diff --git a/include/ruby/internal/core/rclass.h b/include/ruby/internal/core/rclass.h
new file mode 100644
index 0000000000..0aa6b1290e
--- /dev/null
+++ b/include/ruby/internal/core/rclass.h
@@ -0,0 +1,47 @@
+#ifndef RBIMPL_RCLASS_H                              /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_RCLASS_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Routines to manipulate struct ::RClass.
+ */
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+#include "ruby/internal/cast.h"
+
+#define RMODULE_IS_OVERLAID              RMODULE_IS_OVERLAID
+#define RMODULE_IS_REFINEMENT            RMODULE_IS_REFINEMENT
+#define RMODULE_INCLUDED_INTO_REFINEMENT RMODULE_INCLUDED_INTO_REFINEMENT
+
+#define RCLASS(obj)  RBIMPL_CAST((struct RClass *)(obj))
+#define RMODULE      RCLASS
+#define RCLASS_SUPER rb_class_get_superclass
+
+enum ruby_rmodule_flags {
+    RMODULE_IS_OVERLAID              = RUBY_FL_USER2,
+    RMODULE_IS_REFINEMENT            = RUBY_FL_USER3,
+    RMODULE_INCLUDED_INTO_REFINEMENT = RUBY_FL_USER4
+};
+
+struct RClass; /* Opaque, declared here for RCLASS() macro. */
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+VALUE rb_class_get_superclass(VALUE);
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_RCLASS_H */
diff --git a/include/ruby/internal/core/rdata.h b/include/ruby/internal/core/rdata.h
new file mode 100644
index 0000000000..ca44a931dc
--- /dev/null
+++ b/include/ruby/internal/core/rdata.h
@@ -0,0 +1,184 @@
+#ifndef RBIMPL_RDATA_H                               /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_RDATA_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines struct ::RData.
+ */
+#include "ruby/internal/config.h"
+
+#ifdef STDC_HEADERS
+# include <stddef.h>
+#endif
+
+#include "ruby/internal/attr/deprecated.h"
+#include "ruby/internal/attr/warning.h"
+#include "ruby/internal/cast.h"
+#include "ruby/internal/core/rbasic.h"
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/fl_type.h"
+#include "ruby/internal/token_paste.h"
+#include "ruby/internal/value.h"
+#include "ruby/internal/value_type.h"
+#include "ruby/defines.h"
+
+#ifdef RUBY_UNTYPED_DATA_WARNING
+# /* Take that. */
+#elif defined(RUBY_EXPORT)
+# define RUBY_UNTYPED_DATA_WARNING 1
+#else
+# define RUBY_UNTYPED_DATA_WARNING 0
+#endif
+
+/** @cond INTERNAL_MACRO */
+#define RBIMPL_DATA_FUNC(f) RBIMPL_CAST((void (*)(void *))(f))
+#define RBIMPL_ATTRSET_UNTYPED_DATA_FUNC() \
+    RBIMPL_ATTR_WARNING(("untyped Data is unsafe; use TypedData instead")) \
+    RBIMPL_ATTR_DEPRECATED(("by TypedData"))
+/** @endcond */
+
+#define RDATA(obj)                RBIMPL_CAST((struct RData *)(obj))
+#define DATA_PTR(obj)             RDATA(obj)->data
+#define RUBY_MACRO_SELECT         RBIMPL_TOKEN_PASTE
+#define RUBY_DEFAULT_FREE         RBIMPL_DATA_FUNC(-1)
+#define RUBY_NEVER_FREE           RBIMPL_DATA_FUNC(0)
+#define RUBY_UNTYPED_DATA_FUNC(f) f RBIMPL_ATTRSET_UNTYPED_DATA_FUNC()
+
+/*
+#define RUBY_DATA_FUNC(func) ((void (*)(void*))(func))
+*/
+typedef void (*RUBY_DATA_FUNC)(void*);
+
+struct RData {
+    struct RBasic basic;
+    RUBY_DATA_FUNC dmark;
+    RUBY_DATA_FUNC dfree;
+    void *data;
+};
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+VALUE rb_data_object_wrap(VALUE klass, void *datap, RUBY_DATA_FUNC dmark, RUBY_DATA_FUNC dfree);
+VALUE rb_data_object_zalloc(VALUE klass, size_t size, RUBY_DATA_FUNC dmark, RUBY_DATA_FUNC dfree);
+RUBY_EXTERN VALUE rb_cObject;
+RBIMPL_SYMBOL_EXPORT_END()
+
+#define Data_Wrap_Struct(klass, mark, free, sval) \
+    rb_data_object_wrap(                          \
+        (klass),                                  \
+        (sval),                                   \
+        RBIMPL_DATA_FUNC(mark),                    \
+        RBIMPL_DATA_FUNC(free))
+
+#define Data_Make_Struct0(result, klass, type, size, mark, free, sval)  \
+    VALUE result = rb_data_object_zalloc(          \
+        (klass),                                   \
+        (size),                                    \
+        RBIMPL_DATA_FUNC(mark),                     \
+        RBIMPL_DATA_FUNC(free));                    \
+    (sval) = RBIMPL_CAST((type *)DATA_PTR(result)); \
+    RBIMPL_CAST(/*suppress unused variable warnings*/(void)(sval))
+
+#ifdef HAVE_STMT_AND_DECL_IN_EXPR
+#define Data_Make_Struct(klass, type, mark, free, sval) \
+    RB_GNUC_EXTENSION({      \
+        Data_Make_Struct0(   \
+            data_struct_obj, \
+            klass,           \
+            type,            \
+            sizeof(type),    \
+            mark,            \
+            free,            \
+            sval);           \
+        data_struct_obj;     \
+    })
+#else
+#define Data_Make_Struct(klass, type, mark, free, sval) \
+    rb_data_object_make(              \
+        (klass),                      \
+        RBIMPL_DATA_FUNC(mark),        \
+        RBIMPL_DATA_FUNC(free),        \
+        RBIMPL_CAST((void **)&(sval)), \
+        sizeof(type))
+#endif
+
+#define Data_Get_Struct(obj, type, sval) \
+    ((sval) = RBIMPL_CAST((type*)rb_data_object_get(obj)))
+
+RBIMPL_ATTRSET_UNTYPED_DATA_FUNC()
+static inline VALUE
+rb_data_object_wrap_warning(VALUE klass, void *ptr, RUBY_DATA_FUNC mark, RUBY_DATA_FUNC free)
+{
+    return rb_data_object_wrap(klass, ptr, mark, free);
+}
+
+static inline void *
+rb_data_object_get(VALUE obj)
+{
+    Check_Type(obj, RUBY_T_DATA);
+    return DATA_PTR(obj);
+}
+
+RBIMPL_ATTRSET_UNTYPED_DATA_FUNC()
+static inline void *
+rb_data_object_get_warning(VALUE obj)
+{
+    return rb_data_object_get(obj);
+}
+
+#if defined(HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P)
+# define rb_data_object_wrap_warning(klass, ptr, mark, free) \
+    RB_GNUC_EXTENSION(                                       \
+        __builtin_choose_expr(                               \
+            __builtin_constant_p(klass) && !(klass),         \
+            rb_data_object_wrap(klass, ptr, mark, free),     \
+            (rb_data_object_wrap_warning)(klass, ptr, mark, free)))
+#endif
+
+static inline VALUE
+rb_data_object_make(VALUE klass, RUBY_DATA_FUNC mark_func, RUBY_DATA_FUNC free_func, void **datap, size_t size)
+{
+    Data_Make_Struct0(result, klass, void, size, mark_func, free_func, *datap);
+    return result;
+}
+
+RBIMPL_ATTR_DEPRECATED(("by: rb_data_object_wrap"))
+static inline VALUE
+rb_data_object_alloc(VALUE klass, void *data, RUBY_DATA_FUNC dmark, RUBY_DATA_FUNC dfree)
+{
+    return rb_data_object_wrap(klass, data, dmark, dfree);
+}
+
+RBIMPL_ATTR_DEPRECATED(("by: rb_cObject.  Will be removed in 3.1."))
+RBIMPL_ATTR_PURE()
+static inline VALUE
+rb_cData(void)
+{
+    return rb_cObject;
+}
+#define rb_cData rb_cData()
+
+#define rb_data_object_wrap_0 rb_data_object_wrap
+#define rb_data_object_wrap_1 rb_data_object_wrap_warning
+#define rb_data_object_wrap   RUBY_MACRO_SELECT(rb_data_object_wrap_, RUBY_UNTYPED_DATA_WARNING)
+#define rb_data_object_get_0  rb_data_object_get
+#define rb_data_object_get_1  rb_data_object_get_warning
+#define rb_data_object_get    RUBY_MACRO_SELECT(rb_data_object_get_, RUBY_UNTYPED_DATA_WARNING)
+#define rb_data_object_make_0 rb_data_object_make
+#define rb_data_object_make_1 rb_data_object_make_warning
+#define rb_data_object_make   RUBY_MACRO_SELECT(rb_data_object_make_, RUBY_UNTYPED_DATA_WARNING)
+#endif /* RBIMPL_RDATA_H */
diff --git a/include/ruby/internal/core/rfile.h b/include/ruby/internal/core/rfile.h
new file mode 100644
index 0000000000..464625b2bd
--- /dev/null
+++ b/include/ruby/internal/core/rfile.h
@@ -0,0 +1,36 @@
+#ifndef RBIMPL_RFILE_H                               /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_RFILE_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines struct ::RFile.
+ */
+#include "ruby/internal/core/rbasic.h"
+#include "ruby/internal/cast.h"
+
+/* rb_io_t is in ruby/io.h.  The header file has historically not been included
+ * into ruby/ruby.h.  We follow that tradition. */
+struct rb_io_t;
+
+struct RFile {
+    struct RBasic basic;
+    struct rb_io_t *fptr;
+};
+
+#define RFILE(obj) RBIMPL_CAST((struct RFile *)(obj))
+#endif /* RBIMPL_RFILE_H */
diff --git a/include/ruby/internal/core/rhash.h b/include/ruby/internal/core/rhash.h
new file mode 100644
index 0000000000..9bedf0af80
--- /dev/null
+++ b/include/ruby/internal/core/rhash.h
@@ -0,0 +1,62 @@
+#ifndef RBIMPL_RHASH_H                               /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_RHASH_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Routines to manipulate struct ::RHash.
+ *
+ * Shyouhei really suffered agnish over placement of macros in this file.  They
+ * are half-brken.  The situation (as of wriring) is:
+ *
+ * - #RHASH_TBL: works.
+ * - #RHASH_ITER_LEV: compile-time error.
+ * - #RHASH_IFNONE: compile-time error.
+ * - #RHASH_SIZE: works.
+ * - #RHASH_EMPTY_P: works.
+ * - #RHASH_SET_IFNONE: works (why... given you cannot query).
+ *
+ * Shyouhei stopped thinking.  Let them be as is.
+ */
+#include "ruby/internal/config.h"
+
+#ifdef STDC_HEADERS
+# include <stddef.h>
+#endif
+
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+#if !defined RUBY_EXPORT && !defined RUBY_NO_OLD_COMPATIBILITY
+# include "ruby/backward.h"
+#endif
+
+#define RHASH_TBL(h)                rb_hash_tbl(h, __FILE__, __LINE__)
+#define RHASH_ITER_LEV(h)           rb_hash_iter_lev(h)
+#define RHASH_IFNONE(h)             rb_hash_ifnone(h)
+#define RHASH_SIZE(h)               rb_hash_size_num(h)
+#define RHASH_EMPTY_P(h)            (RHASH_SIZE(h) == 0)
+#define RHASH_SET_IFNONE(h, ifnone) rb_hash_set_ifnone((VALUE)h, ifnone)
+
+struct st_table;  /* in ruby/st.h */
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+size_t rb_hash_size_num(VALUE hash);
+struct st_table *rb_hash_tbl(VALUE, const char *file, int line);
+VALUE rb_hash_set_ifnone(VALUE hash, VALUE ifnone);
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_RHASH_H */
diff --git a/include/ruby/internal/core/rmatch.h b/include/ruby/internal/core/rmatch.h
new file mode 100644
index 0000000000..03ab5e5d82
--- /dev/null
+++ b/include/ruby/internal/core/rmatch.h
@@ -0,0 +1,73 @@
+#ifndef RBIMPL_RMATCH_H                              /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_RMATCH_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines struct ::RMatch.
+ */
+#include "ruby/internal/attr/artificial.h"
+#include "ruby/internal/attr/pure.h"
+#include "ruby/internal/attr/returns_nonnull.h"
+#include "ruby/internal/cast.h"
+#include "ruby/internal/core/rbasic.h"
+#include "ruby/internal/value.h"
+#include "ruby/internal/value_type.h"
+#include "ruby/assert.h"
+
+#define RMATCH(obj) RBIMPL_CAST((struct RMatch *)(obj))
+/** @cond INTERNAL_MACRO */
+#define RMATCH_REGS RMATCH_REGS
+/** @endcond */
+
+struct re_patter_buffer; /* a.k.a. OnigRegexType, defined in onigmo.h */
+struct re_registers;     /* Also in onigmo.h */
+
+/* @shyouhei wonders: is anyone actively using this typedef ...? */
+typedef struct re_pattern_buffer Regexp;
+
+struct rmatch_offset {
+    long beg;
+    long end;
+};
+
+struct rmatch {
+    struct re_registers regs;
+
+    struct rmatch_offset *char_offset;
+    int char_offset_num_allocated;
+};
+
+struct RMatch {
+    struct RBasic basic;
+    VALUE str;
+    struct rmatch *rmatch;
+    VALUE regexp;  /* RRegexp */
+};
+
+RBIMPL_ATTR_PURE_UNLESS_DEBUG()
+RBIMPL_ATTR_RETURNS_NONNULL()
+RBIMPL_ATTR_ARTIFICIAL()
+static inline struct re_registers *
+RMATCH_REGS(VALUE match)
+{
+    RBIMPL_ASSERT_TYPE(match, RUBY_T_MATCH);
+    RBIMPL_ASSERT_OR_ASSUME(RMATCH(match)->rmatch != NULL);
+    return &RMATCH(match)->rmatch->regs;
+}
+
+#endif /* RBIMPL_RMATCH_H */
diff --git a/include/ruby/internal/core/robject.h b/include/ruby/internal/core/robject.h
new file mode 100644
index 0000000000..c352c87a40
--- /dev/null
+++ b/include/ruby/internal/core/robject.h
@@ -0,0 +1,96 @@
+#ifndef RBIMPL_ROBJECT_H                             /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ROBJECT_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines struct ::RObject.
+ */
+#include "ruby/internal/config.h"
+
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+
+#include "ruby/internal/attr/artificial.h"
+#include "ruby/internal/attr/deprecated.h"
+#include "ruby/internal/attr/pure.h"
+#include "ruby/internal/cast.h"
+#include "ruby/internal/fl_type.h"
+#include "ruby/internal/value.h"
+#include "ruby/internal/value_type.h"
+
+#define ROBJECT(obj)          RBIMPL_CAST((struct RObject *)(obj))
+#define ROBJECT_EMBED_LEN_MAX ROBJECT_EMBED_LEN_MAX
+#define ROBJECT_EMBED         ROBJECT_EMBED
+/** @cond INTERNAL_MACRO */
+#define ROBJECT_NUMIV         ROBJECT_NUMIV
+#define ROBJECT_IVPTR         ROBJECT_IVPTR
+#define ROBJECT_IV_INDEX_TBL  ROBJECT_IV_INDEX_TBL
+/** @endcond */
+
+enum ruby_robject_flags { ROBJECT_EMBED = RUBY_FL_USER1 };
+
+enum ruby_robject_consts { ROBJECT_EMBED_LEN_MAX = RBIMPL_EMBED_LEN_MAX_OF(VALUE) };
+
+struct st_table;
+
+struct RObject {
+    struct RBasic basic;
+    union {
+        struct {
+            uint32_t 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;
+};
+
+RBIMPL_ATTR_PURE_UNLESS_DEBUG()
+RBIMPL_ATTR_ARTIFICIAL()
+static inline uint32_t
+ROBJECT_NUMIV(VALUE obj)
+{
+    RBIMPL_ASSERT_TYPE(obj, RUBY_T_OBJECT);
+
+    if (RB_FL_ANY_RAW(obj, ROBJECT_EMBED)) {
+        return ROBJECT_EMBED_LEN_MAX;
+    }
+    else {
+        return ROBJECT(obj)->as.heap.numiv;
+    }
+}
+
+RBIMPL_ATTR_PURE_UNLESS_DEBUG()
+RBIMPL_ATTR_ARTIFICIAL()
+static inline VALUE *
+ROBJECT_IVPTR(VALUE obj)
+{
+    RBIMPL_ASSERT_TYPE(obj, RUBY_T_OBJECT);
+
+    struct RObject *const ptr = ROBJECT(obj);
+
+    if (RB_FL_ANY_RAW(obj, ROBJECT_EMBED)) {
+        return ptr->as.ary;
+    }
+    else {
+        return ptr->as.heap.ivptr;
+    }
+}
+
+#endif /* RBIMPL_ROBJECT_H */
diff --git a/include/ruby/internal/core/rregexp.h b/include/ruby/internal/core/rregexp.h
new file mode 100644
index 0000000000..f289ee1dda
--- /dev/null
+++ b/include/ruby/internal/core/rregexp.h
@@ -0,0 +1,84 @@
+#ifndef RBIMPL_RREGEXP_H                             /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_RREGEXP_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines struct ::RRegexp.
+ */
+#include "ruby/internal/attr/artificial.h"
+#include "ruby/internal/attr/pure.h"
+#include "ruby/internal/cast.h"
+#include "ruby/internal/core/rbasic.h"
+#include "ruby/internal/core/rstring.h"
+#include "ruby/internal/value.h"
+#include "ruby/internal/value_type.h"
+
+#define RREGEXP(obj)     RBIMPL_CAST((struct RRegexp *)(obj))
+#define RREGEXP_PTR(obj) (RREGEXP(obj)->ptr)
+/** @cond INTERNAL_MACRO */
+#define RREGEXP_SRC      RREGEXP_SRC
+#define RREGEXP_SRC_PTR  RREGEXP_SRC_PTR
+#define RREGEXP_SRC_LEN  RREGEXP_SRC_LEN
+#define RREGEXP_SRC_END  RREGEXP_SRC_END
+/** @endcond */
+
+struct re_patter_buffer; /* a.k.a. OnigRegexType, defined in onigmo.h */
+
+struct RRegexp {
+    struct RBasic basic;
+    struct re_pattern_buffer *ptr;
+    const VALUE src;
+    unsigned long usecnt;
+};
+
+RBIMPL_ATTR_PURE_UNLESS_DEBUG()
+RBIMPL_ATTR_ARTIFICIAL()
+static inline VALUE
+RREGEXP_SRC(VALUE rexp)
+{
+    RBIMPL_ASSERT_TYPE(rexp, RUBY_T_REGEXP);
+    VALUE ret = RREGEXP(rexp)->src;
+    RBIMPL_ASSERT_TYPE(ret, RUBY_T_STRING);
+    return ret;
+}
+
+RBIMPL_ATTR_PURE_UNLESS_DEBUG()
+RBIMPL_ATTR_ARTIFICIAL()
+static inline char *
+RREGEXP_SRC_PTR(VALUE rexp)
+{
+    return RSTRING_PTR(RREGEXP_SRC(rexp));
+}
+
+RBIMPL_ATTR_PURE_UNLESS_DEBUG()
+RBIMPL_ATTR_ARTIFICIAL()
+static inline long
+RREGEXP_SRC_LEN(VALUE rexp)
+{
+    return RSTRING_LEN(RREGEXP_SRC(rexp));
+}
+
+RBIMPL_ATTR_PURE_UNLESS_DEBUG()
+RBIMPL_ATTR_ARTIFICIAL()
+static inline char *
+RREGEXP_SRC_END(VALUE rexp)
+{
+    return RSTRING_END(RREGEXP_SRC(rexp));
+}
+
+#endif /* RBIMPL_RREGEXP_H */
diff --git a/include/ruby/internal/core/rstring.h b/include/ruby/internal/core/rstring.h
new file mode 100644
index 0000000000..d073da1d2c
--- /dev/null
+++ b/include/ruby/internal/core/rstring.h
@@ -0,0 +1,215 @@
+#ifndef RBIMPL_RSTRING_H                             /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_RSTRING_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines struct ::RString.
+ */
+#include "ruby/internal/config.h"
+#include "ruby/internal/arithmetic/long.h"
+#include "ruby/internal/attr/artificial.h"
+#include "ruby/internal/attr/pure.h"
+#include "ruby/internal/cast.h"
+#include "ruby/internal/core/rbasic.h"
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/fl_type.h"
+#include "ruby/internal/value_type.h"
+#include "ruby/internal/warning_push.h"
+#include "ruby/assert.h"
+
+#define RSTRING(obj)            RBIMPL_CAST((struct RString *)(obj))
+#define RSTRING_NOEMBED         RSTRING_NOEMBED
+#define RSTRING_EMBED_LEN_MASK  RSTRING_EMBED_LEN_MASK
+#define RSTRING_EMBED_LEN_SHIFT RSTRING_EMBED_LEN_SHIFT
+#define RSTRING_EMBED_LEN_MAX   RSTRING_EMBED_LEN_MAX
+#define RSTRING_FSTR            RSTRING_FSTR
+
+/** @cond INTERNAL_MACRO */
+#define RSTRING_EMBED_LEN RSTRING_EMBED_LEN
+#define RSTRING_LEN       RSTRING_LEN
+#define RSTRING_LENINT    RSTRING_LENINT
+#define RSTRING_PTR       RSTRING_PTR
+#define RSTRING_END       RSTRING_END
+/** @endcond */
+
+#define StringValue(v)     rb_string_value(&(v))
+#define StringValuePtr(v)  rb_string_value_ptr(&(v))
+#define StringValueCStr(v) rb_string_value_cstr(&(v))
+#define SafeStringValue(v) StringValue(v)
+#define ExportStringValue(v) do { \
+    StringValue(v);               \
+    (v) = rb_str_export(v);       \
+} while (0)
+
+enum ruby_rstring_flags {
+    RSTRING_NOEMBED         = RUBY_FL_USER1,
+    RSTRING_EMBED_LEN_MASK  = RUBY_FL_USER2 | RUBY_FL_USER3 | RUBY_FL_USER4 |
+                              RUBY_FL_USER5 | RUBY_FL_USER6,
+    /* Actually,  string  encodings are  also  encoded  into the  flags,  using
+     * remaining bits.*/
+    RSTRING_FSTR            = RUBY_FL_USER17
+};
+
+enum ruby_rstring_consts {
+    RSTRING_EMBED_LEN_SHIFT = RUBY_FL_USHIFT + 2,
+    RSTRING_EMBED_LEN_MAX   = RBIMPL_EMBED_LEN_MAX_OF(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 + 1];
+    } as;
+};
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+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*);
+VALUE rb_str_export(VALUE);
+VALUE rb_str_export_locale(VALUE);
+
+RBIMPL_ATTR_ERROR(("rb_check_safe_str() and Check_SafeStr() are obsolete; use StringValue() instead"))
+void rb_check_safe_str(VALUE);
+#define Check_SafeStr(v) rb_check_safe_str(RBIMPL_CAST((VALUE)(v)))
+RBIMPL_SYMBOL_EXPORT_END()
+
+RBIMPL_ATTR_PURE_UNLESS_DEBUG()
+RBIMPL_ATTR_ARTIFICIAL()
+static inline long
+RSTRING_EMBED_LEN(VALUE str)
+{
+    RBIMPL_ASSERT_TYPE(str, RUBY_T_STRING);
+    RBIMPL_ASSERT_OR_ASSUME(! RB_FL_ANY_RAW(str, RSTRING_NOEMBED));
+
+    VALUE f = RBASIC(str)->flags;
+    f &= RSTRING_EMBED_LEN_MASK;
+    f >>= RSTRING_EMBED_LEN_SHIFT;
+    return RBIMPL_CAST((long)f);
+}
+
+RBIMPL_WARNING_PUSH()
+#if RBIMPL_COMPILER_IS(Intel)
+RBIMPL_WARNING_IGNORED(413)
+#endif
+
+RBIMPL_ATTR_PURE_UNLESS_DEBUG()
+RBIMPL_ATTR_ARTIFICIAL()
+static inline struct RString
+rbimpl_rstring_getmem(VALUE str)
+{
+    RBIMPL_ASSERT_TYPE(str, RUBY_T_STRING);
+
+    if (RB_FL_ANY_RAW(str, RSTRING_NOEMBED)) {
+        return *RSTRING(str);
+    }
+    else {
+        /* Expecting compilers to optimize this on-stack struct away. */
+        struct RString retval;
+        retval.as.heap.len = RSTRING_EMBED_LEN(str);
+        retval.as.heap.ptr = RSTRING(str)->as.ary;
+        return retval;
+    }
+}
+
+RBIMPL_WARNING_POP()
+
+RBIMPL_ATTR_PURE_UNLESS_DEBUG()
+RBIMPL_ATTR_ARTIFICIAL()
+static inline long
+RSTRING_LEN(VALUE str)
+{
+    return rbimpl_rstring_getmem(str).as.heap.len;
+}
+
+RBIMPL_ATTR_ARTIFICIAL()
+static inline char *
+RSTRING_PTR(VALUE str)
+{
+    char *ptr = rbimpl_rstring_getmem(str).as.heap.ptr;
+
+    if (RB_UNLIKELY(! ptr)) {
+        /* :BEWARE: @shyouhei thinks  that currently, there are  rooms for this
+         * function to return  NULL.  In the 20th century that  was a pointless
+         * concern.  However struct RString can hold fake strings nowadays.  It
+         * seems no  check against NULL  are exercised around handling  of them
+         * (one  of  such   usages  is  located  in   marshal.c,  which  scares
+         * @shyouhei).  Better check here for maximum safety.
+         *
+         * Also,  this is  not rb_warn()  because RSTRING_PTR()  can be  called
+         * during GC (see  what obj_info() does).  rb_warn()  needs to allocate
+         * Ruby objects.  That is not possible at this moment. */
+        fprintf(stderr, "%s\n",
+            "RSTRING_PTR is returning NULL!! "
+            "SIGSEGV is highly expected to follow immediately. "
+            "If you could reproduce, attach your debugger here, "
+            "and look at the passed string."
+        );
+    }
+
+    return ptr;
+}
+
+RBIMPL_ATTR_ARTIFICIAL()
+static inline char *
+RSTRING_END(VALUE str)
+{
+    struct RString buf = rbimpl_rstring_getmem(str);
+
+    if (RB_UNLIKELY(! buf.as.heap.ptr)) {
+        /* Ditto. */
+        fprintf(stderr, "%s\n",
+            "RSTRING_END is returning NULL!! "
+            "SIGSEGV is highly expected to follow immediately. "
+            "If you could reproduce, attach your debugger here, "
+            "and look at the passed string."
+        );
+    }
+
+    return &buf.as.heap.ptr[buf.as.heap.len];
+}
+
+RBIMPL_ATTR_ARTIFICIAL()
+static inline int
+RSTRING_LENINT(VALUE str)
+{
+    return rb_long2int(RSTRING_LEN(str));
+}
+
+#ifdef HAVE_STMT_AND_DECL_IN_EXPR
+# define RSTRING_GETMEM(str, ptrvar, lenvar) \
+    __extension__ ({ \
+        struct RString rbimpl_str = rbimpl_rstring_getmem(str); \
+        (ptrvar) = rbimpl_str.as.heap.ptr; \
+        (lenvar) = rbimpl_str.as.heap.len; \
+    })
+#else
+# define RSTRING_GETMEM(str, ptrvar, lenvar) \
+    ((ptrvar) = RSTRING_PTR(str),           \
+     (lenvar) = RSTRING_LEN(str))
+#endif /* HAVE_STMT_AND_DECL_IN_EXPR */
+#endif /* RBIMPL_RSTRING_H */
diff --git a/include/ruby/internal/core/rstruct.h b/include/ruby/internal/core/rstruct.h
new file mode 100644
index 0000000000..17454f7cbe
--- /dev/null
+++ b/include/ruby/internal/core/rstruct.h
@@ -0,0 +1,73 @@
+#ifndef RBIMPL_RSTRUCT_H                             /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_RSTRUCT_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Routines to manipulate struct ::RStruct.
+ */
+#include "ruby/internal/attr/artificial.h"
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+#include "ruby/internal/value_type.h"
+#include "ruby/internal/arithmetic/long.h"
+#include "ruby/internal/arithmetic/int.h"
+#if !defined RUBY_EXPORT && !defined RUBY_NO_OLD_COMPATIBILITY
+# include "ruby/backward.h"
+#endif
+
+#define RSTRUCT_PTR(st) rb_struct_ptr(st)
+/** @cond INTERNAL_MACRO */
+#define RSTRUCT_LEN RSTRUCT_LEN
+#define RSTRUCT_SET RSTRUCT_SET
+#define RSTRUCT_GET RSTRUCT_GET
+/** @endcond */
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+VALUE rb_struct_size(VALUE s);
+VALUE rb_struct_aref(VALUE, VALUE);
+VALUE rb_struct_aset(VALUE, VALUE, VALUE);
+RBIMPL_SYMBOL_EXPORT_END()
+
+RBIMPL_ATTR_ARTIFICIAL()
+static inline long
+RSTRUCT_LEN(VALUE st)
+{
+    RBIMPL_ASSERT_TYPE(st, RUBY_T_STRUCT);
+
+    return RB_NUM2LONG(rb_struct_size(st));
+}
+
+RBIMPL_ATTR_ARTIFICIAL()
+static inline VALUE
+RSTRUCT_SET(VALUE st, int k, VALUE v)
+{
+    RBIMPL_ASSERT_TYPE(st, RUBY_T_STRUCT);
+
+    return rb_struct_aset(st, INT2NUM(k), (v));
+}
+
+RBIMPL_ATTR_ARTIFICIAL()
+static inline VALUE
+RSTRUCT_GET(VALUE st, int k)
+{
+    RBIMPL_ASSERT_TYPE(st, RUBY_T_STRUCT);
+
+    return rb_struct_aref(st, INT2NUM(k));
+}
+
+#endif /* RBIMPL_RSTRUCT_H */
diff --git a/include/ruby/internal/core/rtypeddata.h b/include/ruby/internal/core/rtypeddata.h
new file mode 100644
index 0000000000..c038e6f2b8
--- /dev/null
+++ b/include/ruby/internal/core/rtypeddata.h
@@ -0,0 +1,186 @@
+#ifndef RBIMPL_RTYPEDDATA_H                          /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_RTYPEDDATA_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines struct ::RTypedData.
+ */
+#include "ruby/internal/config.h"
+
+#ifdef STDC_HEADERS
+# include <stddef.h>
+#endif
+
+#include "ruby/internal/assume.h"
+#include "ruby/internal/attr/artificial.h"
+#include "ruby/internal/attr/pure.h"
+#include "ruby/internal/cast.h"
+#include "ruby/internal/core/rbasic.h"
+#include "ruby/internal/core/rdata.h"
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/error.h"
+#include "ruby/internal/fl_type.h"
+#include "ruby/internal/stdbool.h"
+#include "ruby/internal/value_type.h"
+
+#define HAVE_TYPE_RB_DATA_TYPE_T     1
+#define HAVE_RB_DATA_TYPE_T_FUNCTION 1
+#define HAVE_RB_DATA_TYPE_T_PARENT   1
+#define RUBY_TYPED_DEFAULT_FREE      RUBY_DEFAULT_FREE
+#define RUBY_TYPED_NEVER_FREE        RUBY_NEVER_FREE
+#define RTYPEDDATA(obj)              RBIMPL_CAST((struct RTypedData *)(obj))
+#define RTYPEDDATA_DATA(v)           (RTYPEDDATA(v)->data)
+#define Check_TypedStruct(v, t)      \
+    rb_check_typeddata(RBIMPL_CAST((VALUE)(v)), (t))
+
+/** @cond INTERNAL_MACRO */
+#define RTYPEDDATA_P                 RTYPEDDATA_P
+#define RTYPEDDATA_TYPE              RTYPEDDATA_TYPE
+#define RUBY_TYPED_FREE_IMMEDIATELY  RUBY_TYPED_FREE_IMMEDIATELY
+#define RUBY_TYPED_FROZEN_SHAREABLE  RUBY_TYPED_FROZEN_SHAREABLE
+#define RUBY_TYPED_WB_PROTECTED      RUBY_TYPED_WB_PROTECTED
+#define RUBY_TYPED_PROMOTED1         RUBY_TYPED_PROMOTED1
+/** @endcond */
+
+/* bits for rb_data_type_struct::flags */
+enum rbimpl_typeddata_flags {
+    RUBY_TYPED_FREE_IMMEDIATELY = 1,
+    RUBY_TYPED_FROZEN_SHAREABLE = RUBY_FL_SHAREABLE,
+    RUBY_TYPED_WB_PROTECTED     = RUBY_FL_WB_PROTECTED, /* THIS FLAG DEPENDS ON Ruby version */
+    RUBY_TYPED_PROMOTED1        = RUBY_FL_PROMOTED1     /* THIS FLAG DEPENDS ON Ruby version */
+};
+
+typedef struct rb_data_type_struct rb_data_type_t;
+
+struct rb_data_type_struct {
+    const char *wrap_struct_name;
+    struct {
+        RUBY_DATA_FUNC dmark;
+        RUBY_DATA_FUNC dfree;
+        size_t (*dsize)(const void *);
+        RUBY_DATA_FUNC dcompact;
+        void *reserved[1]; /* For future extension.
+                              This array *must* be filled with ZERO. */
+    } function;
+    const rb_data_type_t *parent;
+    void *data;        /* This area can be used for any purpose
+                          by a programmer who define the type. */
+    VALUE flags;       /* RUBY_FL_WB_PROTECTED */
+};
+
+struct RTypedData {
+    struct RBasic basic;
+    const rb_data_type_t *type;
+    VALUE typed_flag; /* 1 or not */
+    void *data;
+};
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+VALUE rb_data_typed_object_wrap(VALUE klass, void *datap, const rb_data_type_t *);
+VALUE rb_data_typed_object_zalloc(VALUE klass, size_t size, const rb_data_type_t *type);
+int rb_typeddata_inherited_p(const rb_data_type_t *child, const rb_data_type_t *parent);
+int rb_typeddata_is_kind_of(VALUE obj, const rb_data_type_t *data_type);
+void *rb_check_typeddata(VALUE obj, const rb_data_type_t *data_type);
+RBIMPL_SYMBOL_EXPORT_END()
+
+#define TypedData_Wrap_Struct(klass,data_type,sval)\
+  rb_data_typed_object_wrap((klass),(sval),(data_type))
+
+#define TypedData_Make_Struct0(result, klass, type, size, data_type, sval) \
+    VALUE result = rb_data_typed_object_zalloc(klass, size, data_type);    \
+    (sval) = RBIMPL_CAST((type *)RTYPEDDATA_DATA(result));                  \
+    RBIMPL_CAST(/*suppress unused variable warnings*/(void)(sval))
+
+#ifdef HAVE_STMT_AND_DECL_IN_EXPR
+#define TypedData_Make_Struct(klass, type, data_type, sval) \
+    RB_GNUC_EXTENSION({         \
+        TypedData_Make_Struct0( \
+            data_struct_obj,    \
+            klass,              \
+            type,               \
+            sizeof(type),       \
+            data_type,          \
+            sval);              \
+        data_struct_obj;        \
+    })
+#else
+#define TypedData_Make_Struct(klass, type, data_type, sval) \
+    rb_data_typed_object_make(        \
+        (klass),                      \
+        (data_type),                  \
+        RBIMPL_CAST((void **)&(sval)), \
+        sizeof(type))
+#endif
+
+#define TypedData_Get_Struct(obj,type,data_type,sval) \
+    ((sval) = RBIMPL_CAST((type *)rb_check_typeddata((obj), (data_type))))
+
+RBIMPL_ATTR_PURE()
+RBIMPL_ATTR_ARTIFICIAL()
+static inline bool
+rbimpl_rtypeddata_p(VALUE obj)
+{
+    return RTYPEDDATA(obj)->typed_flag == 1;
+}
+
+RBIMPL_ATTR_PURE_UNLESS_DEBUG()
+RBIMPL_ATTR_ARTIFICIAL()
+static inline bool
+RTYPEDDATA_P(VALUE obj)
+{
+#if RUBY_DEBUG
+    if (RB_UNLIKELY(! RB_TYPE_P(obj, RUBY_T_DATA))) {
+        Check_Type(obj, RUBY_T_DATA);
+        RBIMPL_UNREACHABLE_RETURN(false);
+    }
+#endif
+
+    return rbimpl_rtypeddata_p(obj);
+}
+
+RBIMPL_ATTR_PURE_UNLESS_DEBUG()
+RBIMPL_ATTR_ARTIFICIAL()
+/* :TODO: can this function be __attribute__((returns_nonnull)) or not? */
+static inline const struct rb_data_type_struct *
+RTYPEDDATA_TYPE(VALUE obj)
+{
+#if RUBY_DEBUG
+    if (RB_UNLIKELY(! RTYPEDDATA_P(obj))) {
+        rb_unexpected_type(obj, RUBY_T_DATA);
+        RBIMPL_UNREACHABLE_RETURN(NULL);
+    }
+#endif
+
+    return RTYPEDDATA(obj)->type;
+}
+
+static inline VALUE
+rb_data_typed_object_make(VALUE klass, const rb_data_type_t *type, void **datap, size_t size)
+{
+    TypedData_Make_Struct0(result, klass, void, size, type, *datap);
+    return result;
+}
+
+RBIMPL_ATTR_DEPRECATED(("by: rb_data_typed_object_wrap"))
+static inline VALUE
+rb_data_typed_object_alloc(VALUE klass, void *datap, const rb_data_type_t *type)
+{
+    return rb_data_typed_object_wrap(klass, datap, type);
+}
+
+#endif /* RBIMPL_RTYPEDDATA_H */
diff --git a/include/ruby/internal/ctype.h b/include/ruby/internal/ctype.h
new file mode 100644
index 0000000000..aea3e0ca3d
--- /dev/null
+++ b/include/ruby/internal/ctype.h
@@ -0,0 +1,203 @@
+#ifndef RBIMPL_CTYPE_H                               /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_CTYPE_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Our own, locale independent, character handling routines.
+ */
+#include "ruby/internal/config.h"
+
+#ifdef STDC_HEADERS
+# include <ctype.h>
+#endif
+
+#include "ruby/internal/attr/artificial.h"
+#include "ruby/internal/attr/const.h"
+#include "ruby/internal/attr/constexpr.h"
+#include "ruby/internal/dllexport.h"
+
+#ifndef ISPRINT
+# define ISASCII  rb_isascii
+# define ISPRINT  rb_isprint
+# define ISGRAPH  rb_isgraph
+# define ISSPACE  rb_isspace
+# define ISUPPER  rb_isupper
+# define ISLOWER  rb_islower
+# define ISALNUM  rb_isalnum
+# define ISALPHA  rb_isalpha
+# define ISDIGIT  rb_isdigit
+# define ISXDIGIT rb_isxdigit
+# define ISBLANK  rb_isblank
+# define ISCNTRL  rb_iscntrl
+# define ISPUNCT  rb_ispunct
+#endif
+
+#define TOUPPER     rb_toupper
+#define TOLOWER     rb_tolower
+#define STRCASECMP  st_locale_insensitive_strcasecmp
+#define STRNCASECMP st_locale_insensitive_strncasecmp
+#define STRTOUL     ruby_strtoul
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+/* locale insensitive functions */
+int st_locale_insensitive_strcasecmp(const char *s1, const char *s2);
+int st_locale_insensitive_strncasecmp(const char *s1, const char *s2, size_t n);
+unsigned long ruby_strtoul(const char *str, char **endptr, int base);
+RBIMPL_SYMBOL_EXPORT_END()
+
+/*
+ * We are making  the functions below to return `int`  instead of `bool`.  They
+ * have been as such since their birth at 5f237d79033b2109afb768bc889611fa9630.
+ */
+
+RBIMPL_ATTR_CONST()
+RBIMPL_ATTR_CONSTEXPR(CXX11)
+RBIMPL_ATTR_ARTIFICIAL()
+static inline int
+rb_isascii(int c)
+{
+    return '\0' <= c && c <= '\x7f';
+}
+
+RBIMPL_ATTR_CONST()
+RBIMPL_ATTR_CONSTEXPR(CXX11)
+RBIMPL_ATTR_ARTIFICIAL()
+static inline int
+rb_isupper(int c)
+{
+    return 'A' <= c && c <= 'Z';
+}
+
+RBIMPL_ATTR_CONST()
+RBIMPL_ATTR_CONSTEXPR(CXX11)
+RBIMPL_ATTR_ARTIFICIAL()
+static inline int
+rb_islower(int c)
+{
+    return 'a' <= c && c <= 'z';
+}
+
+RBIMPL_ATTR_CONST()
+RBIMPL_ATTR_CONSTEXPR(CXX11)
+RBIMPL_ATTR_ARTIFICIAL()
+static inline int
+rb_isalpha(int c)
+{
+    return rb_isupper(c) || rb_islower(c);
+}
+
+RBIMPL_ATTR_CONST()
+RBIMPL_ATTR_CONSTEXPR(CXX11)
+RBIMPL_ATTR_ARTIFICIAL()
+static inline int
+rb_isdigit(int c)
+{
+    return '0' <= c && c <= '9';
+}
+
+RBIMPL_ATTR_CONST()
+RBIMPL_ATTR_CONSTEXPR(CXX11)
+RBIMPL_ATTR_ARTIFICIAL()
+static inline int
+rb_isalnum(int c)
+{
+    return rb_isalpha(c) || rb_isdigit(c);
+}
+
+RBIMPL_ATTR_CONST()
+RBIMPL_ATTR_CONSTEXPR(CXX11)
+RBIMPL_ATTR_ARTIFICIAL()
+static inline int
+rb_isxdigit(int c)
+{
+    return rb_isdigit(c) || ('A' <= c && c <= 'F') || ('a' <= c && c <= 'f');
+}
+
+RBIMPL_ATTR_CONST()
+RBIMPL_ATTR_CONSTEXPR(CXX11)
+RBIMPL_ATTR_ARTIFICIAL()
+static inline int
+rb_isblank(int c)
+{
+    return c == ' ' || c == '\t';
+}
+
+RBIMPL_ATTR_CONST()
+RBIMPL_ATTR_CONSTEXPR(CXX11)
+RBIMPL_ATTR_ARTIFICIAL()
+static inline int
+rb_isspace(int c)
+{
+    return c == ' ' || ('\t' <= c && c <= '\r');
+}
+
+RBIMPL_ATTR_CONST()
+RBIMPL_ATTR_CONSTEXPR(CXX11)
+RBIMPL_ATTR_ARTIFICIAL()
+static inline int
+rb_iscntrl(int c)
+{
+    return ('\0' <= c && c < ' ') || c == '\x7f';
+}
+
+RBIMPL_ATTR_CONST()
+RBIMPL_ATTR_CONSTEXPR(CXX11)
+RBIMPL_ATTR_ARTIFICIAL()
+static inline int
+rb_isprint(int c)
+{
+    return ' ' <= c && c <= '\x7e';
+}
+
+RBIMPL_ATTR_CONST()
+RBIMPL_ATTR_CONSTEXPR(CXX11)
+RBIMPL_ATTR_ARTIFICIAL()
+static inline int
+rb_ispunct(int c)
+{
+    return !rb_isalnum(c);
+}
+
+RBIMPL_ATTR_CONST()
+RBIMPL_ATTR_CONSTEXPR(CXX11)
+RBIMPL_ATTR_ARTIFICIAL()
+static inline int
+rb_isgraph(int c)
+{
+    return '!' <= c && c <= '\x7e';
+}
+
+RBIMPL_ATTR_CONST()
+RBIMPL_ATTR_CONSTEXPR(CXX11)
+RBIMPL_ATTR_ARTIFICIAL()
+static inline int
+rb_tolower(int c)
+{
+    return rb_isupper(c) ? (c|0x20) : c;
+}
+
+RBIMPL_ATTR_CONST()
+RBIMPL_ATTR_CONSTEXPR(CXX11)
+RBIMPL_ATTR_ARTIFICIAL()
+static inline int
+rb_toupper(int c)
+{
+    return rb_islower(c) ? (c&0x5f) : c;
+}
+
+#endif /* RBIMPL_CTYPE_H */
diff --git a/include/ruby/internal/dllexport.h b/include/ruby/internal/dllexport.h
new file mode 100644
index 0000000000..1488140854
--- /dev/null
+++ b/include/ruby/internal/dllexport.h
@@ -0,0 +1,92 @@
+#ifndef RBIMPL_DLLEXPORT_H                           /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_DLLEXPORT_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Tewaking visibility of C variables/functions.
+ */
+#include "ruby/internal/config.h"
+#include "ruby/internal/compiler_is.h"
+
+/* For MinGW, we need __declspec(dllimport) for RUBY_EXTERN on MJIT.
+   mswin's RUBY_EXTERN already has that. See also: win32/Makefile.sub */
+#undef RUBY_EXTERN
+#if defined(MJIT_HEADER) && defined(_WIN32)
+# define RUBY_EXTERN extern __declspec(dllimport)
+#elif defined(RUBY_EXPORT)
+# define RUBY_EXTERN extern
+#elif defined(_WIN32)
+# define RUBY_EXTERN extern __declspec(dllimport)
+#else
+# define RUBY_EXTERN extern
+#endif
+
+#ifndef RUBY_SYMBOL_EXPORT_BEGIN
+# define RUBY_SYMBOL_EXPORT_BEGIN /* begin */
+#endif
+
+#ifndef RUBY_SYMBOL_EXPORT_END
+# define RUBY_SYMBOL_EXPORT_END   /* end */
+#endif
+
+#ifndef RUBY_FUNC_EXPORTED
+# define RUBY_FUNC_EXPORTED /* void */
+#endif
+
+/* These macros are used for functions which are exported only for MJIT
+   and NOT ensured to be exported in future versions. */
+
+#if ! defined(MJIT_HEADER)
+# define MJIT_FUNC_EXPORTED RUBY_FUNC_EXPORTED
+#elif ! RBIMPL_COMPILER_IS(MSVC)
+# define MJIT_FUNC_EXPORTED RUBY_FUNC_EXPORTED
+#else
+# define MJIT_FUNC_EXPORTED static
+#endif
+
+#define MJIT_SYMBOL_EXPORT_BEGIN RUBY_SYMBOL_EXPORT_BEGIN
+#define MJIT_SYMBOL_EXPORT_END   RUBY_SYMBOL_EXPORT_END
+
+/* On mswin, MJIT header transformation can't be used since cl.exe can't output
+   preprocessed output preserving macros. So this `MJIT_STATIC` is needed
+   to force non-static function to static on MJIT header to avoid symbol conflict. */
+#ifdef MJIT_HEADER
+# define MJIT_STATIC static
+#else
+# define MJIT_STATIC
+#endif
+
+/** Shortcut macro equivalent to `RUBY_SYMBOL_EXPORT_BEGIN extern "C" {`.
+ * \@shyouhei finds it handy. */
+#if defined(__DOXYGEN__)
+# define RBIMPL_SYMBOL_EXPORT_BEGIN() /* void */
+#elif defined(__cplusplus)
+# define RBIMPL_SYMBOL_EXPORT_BEGIN() RUBY_SYMBOL_EXPORT_BEGIN extern "C" {
+#else
+# define RBIMPL_SYMBOL_EXPORT_BEGIN() RUBY_SYMBOL_EXPORT_BEGIN
+#endif
+
+/** Counterpart of #RBIMPL_SYMBOL_EXPORT_BEGIN */
+#if defined(__DOXYGEN__)
+# define RBIMPL_SYMBOL_EXPORT_END() /* void */
+#elif defined(__cplusplus)
+# define RBIMPL_SYMBOL_EXPORT_END() } RUBY_SYMBOL_EXPORT_END
+#else
+# define RBIMPL_SYMBOL_EXPORT_END()   RUBY_SYMBOL_EXPORT_END
+#endif
+#endif /* RBIMPL_DLLEXPORT_H */
diff --git a/include/ruby/internal/dosish.h b/include/ruby/internal/dosish.h
new file mode 100644
index 0000000000..eb71e36505
--- /dev/null
+++ b/include/ruby/internal/dosish.h
@@ -0,0 +1,63 @@
+#ifndef RBIMPL_DOSISH_H                              /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_DOSISH_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Support for so-called dosish systems.
+ */
+#ifdef __CYGWIN__
+#undef _WIN32
+#endif
+
+#if defined(_WIN32)
+/*
+  DOSISH mean MS-Windows style filesystem.
+  But you should use more precise macros like DOSISH_DRIVE_LETTER, PATH_SEP,
+  ENV_IGNORECASE or CASEFOLD_FILESYSTEM.
+ */
+#define DOSISH 1
+# define DOSISH_DRIVE_LETTER
+#endif
+
+#ifdef _WIN32
+#include "ruby/win32.h"
+#endif
+
+#if defined(DOSISH)
+#define PATH_SEP ";"
+#else
+#define PATH_SEP ":"
+#endif
+
+#define PATH_SEP_CHAR PATH_SEP[0]
+
+#define PATH_ENV "PATH"
+
+#if defined(DOSISH)
+#define ENV_IGNORECASE
+#endif
+
+#ifndef CASEFOLD_FILESYSTEM
+# if defined DOSISH
+#   define CASEFOLD_FILESYSTEM 1
+# else
+#   define CASEFOLD_FILESYSTEM 0
+# endif
+#endif
+
+#endif /* RBIMPL_DOSISH_H */
diff --git a/include/ruby/internal/error.h b/include/ruby/internal/error.h
new file mode 100644
index 0000000000..7e9d5c4167
--- /dev/null
+++ b/include/ruby/internal/error.h
@@ -0,0 +1,84 @@
+#ifndef RBIMPL_ERROR_H                               /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ERROR_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Declares ::rb_raise().
+ */
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+#include "ruby/backward/2/attributes.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+VALUE rb_errinfo(void);
+void rb_set_errinfo(VALUE);
+
+typedef enum {
+    RB_WARN_CATEGORY_NONE,
+    RB_WARN_CATEGORY_DEPRECATED,
+    RB_WARN_CATEGORY_EXPERIMENTAL,
+    RB_WARN_CATEGORY_ALL_BITS = 0x6 /* no RB_WARN_CATEGORY_NONE bit */
+} rb_warning_category_t;
+
+/* for rb_readwrite_sys_fail first argument */
+enum rb_io_wait_readwrite {RB_IO_WAIT_READABLE, RB_IO_WAIT_WRITABLE};
+#define RB_IO_WAIT_READABLE RB_IO_WAIT_READABLE
+#define RB_IO_WAIT_WRITABLE RB_IO_WAIT_WRITABLE
+
+PRINTF_ARGS(NORETURN(void rb_raise(VALUE, const char*, ...)), 2, 3);
+PRINTF_ARGS(NORETURN(void rb_fatal(const char*, ...)), 1, 2);
+COLDFUNC PRINTF_ARGS(NORETURN(void rb_bug(const char*, ...)), 1, 2);
+NORETURN(void rb_bug_errno(const char*, int));
+NORETURN(void rb_sys_fail(const char*));
+NORETURN(void rb_sys_fail_str(VALUE));
+NORETURN(void rb_mod_sys_fail(VALUE, const char*));
+NORETURN(void rb_mod_sys_fail_str(VALUE, VALUE));
+NORETURN(void rb_readwrite_sys_fail(enum rb_io_wait_readwrite, const char*));
+NORETURN(void rb_iter_break(void));
+NORETURN(void rb_iter_break_value(VALUE));
+NORETURN(void rb_exit(int));
+NORETURN(void rb_notimplement(void));
+VALUE rb_syserr_new(int, const char *);
+VALUE rb_syserr_new_str(int n, VALUE arg);
+NORETURN(void rb_syserr_fail(int, const char*));
+NORETURN(void rb_syserr_fail_str(int, VALUE));
+NORETURN(void rb_mod_syserr_fail(VALUE, int, const char*));
+NORETURN(void rb_mod_syserr_fail_str(VALUE, int, VALUE));
+NORETURN(void rb_readwrite_syserr_fail(enum rb_io_wait_readwrite, int, const char*));
+NORETURN(void rb_unexpected_type(VALUE,int));
+
+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())
+
+/* reports if `-W' specified */
+PRINTF_ARGS(void rb_warning(const char*, ...), 1, 2);
+PRINTF_ARGS(void rb_category_warning(rb_warning_category_t, const char*, ...), 2, 3);
+PRINTF_ARGS(void rb_compile_warning(const char *, int, const char*, ...), 3, 4);
+PRINTF_ARGS(void rb_category_compile_warn(rb_warning_category_t, const char *, int, const char*, ...), 4, 5);
+PRINTF_ARGS(void rb_sys_warning(const char*, ...), 1, 2);
+/* reports always */
+COLDFUNC PRINTF_ARGS(void rb_warn(const char*, ...), 1, 2);
+COLDFUNC PRINTF_ARGS(void rb_category_warn(rb_warning_category_t, const char*, ...), 2, 3);
+PRINTF_ARGS(void rb_compile_warn(const char *, int, const char*, ...), 3, 4);
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_ERROR_H */
diff --git a/include/ruby/internal/eval.h b/include/ruby/internal/eval.h
new file mode 100644
index 0000000000..934611fbb9
--- /dev/null
+++ b/include/ruby/internal/eval.h
@@ -0,0 +1,50 @@
+#ifndef RBIMPL_EVAL_H                                /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_EVAL_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Declares ::rb_eval_string().
+ */
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+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_funcallv(VALUE, ID, int, const VALUE*);
+VALUE rb_funcallv_kw(VALUE, ID, int, const VALUE*, int);
+VALUE rb_funcallv_public(VALUE, ID, int, const VALUE*);
+VALUE rb_funcallv_public_kw(VALUE, ID, int, const VALUE*, int);
+#define rb_funcall2 rb_funcallv
+#define rb_funcall3 rb_funcallv_public
+VALUE rb_funcall_passing_block(VALUE, ID, int, const VALUE*);
+VALUE rb_funcall_passing_block_kw(VALUE, ID, int, const VALUE*, int);
+VALUE rb_funcall_with_block(VALUE, ID, int, const VALUE*, VALUE);
+VALUE rb_funcall_with_block_kw(VALUE, ID, int, const VALUE*, VALUE, int);
+VALUE rb_call_super(int, const VALUE*);
+VALUE rb_call_super_kw(int, const VALUE*, int);
+VALUE rb_current_receiver(void);
+int rb_get_kwargs(VALUE keyword_hash, const ID *table, int required, int optional, VALUE *);
+VALUE rb_extract_keywords(VALUE *orighash);
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_EVAL_H */
diff --git a/include/ruby/internal/event.h b/include/ruby/internal/event.h
new file mode 100644
index 0000000000..f20e01dc01
--- /dev/null
+++ b/include/ruby/internal/event.h
@@ -0,0 +1,75 @@
+#ifndef RBIMPL_EVENT_H                               /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_EVENT_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Debugging and tracing APIs.
+ */
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+/* traditional set_trace_func events */
+#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       0x00ff
+
+/* for TracePoint extended events */
+#define RUBY_EVENT_B_CALL            0x0100
+#define RUBY_EVENT_B_RETURN          0x0200
+#define RUBY_EVENT_THREAD_BEGIN      0x0400
+#define RUBY_EVENT_THREAD_END        0x0800
+#define RUBY_EVENT_FIBER_SWITCH      0x1000
+#define RUBY_EVENT_SCRIPT_COMPILED   0x2000
+#define RUBY_EVENT_TRACEPOINT_ALL    0xffff
+
+/* special events */
+#define RUBY_EVENT_RESERVED_FOR_INTERNAL_USE 0x030000
+
+/* internal events */
+#define RUBY_INTERNAL_EVENT_SWITCH          0x040000
+#define RUBY_EVENT_SWITCH                   0x040000 /* obsolete name. this macro is for compatibility */
+                                         /* 0x080000 */
+#define RUBY_INTERNAL_EVENT_NEWOBJ          0x100000
+#define RUBY_INTERNAL_EVENT_FREEOBJ         0x200000
+#define RUBY_INTERNAL_EVENT_GC_START        0x400000
+#define RUBY_INTERNAL_EVENT_GC_END_MARK     0x800000
+#define RUBY_INTERNAL_EVENT_GC_END_SWEEP   0x1000000
+#define RUBY_INTERNAL_EVENT_GC_ENTER       0x2000000
+#define RUBY_INTERNAL_EVENT_GC_EXIT        0x4000000
+#define RUBY_INTERNAL_EVENT_OBJSPACE_MASK  0x7f00000
+#define RUBY_INTERNAL_EVENT_MASK          0xffff0000
+
+typedef uint32_t rb_event_flag_t;
+typedef void (*rb_event_hook_func_t)(rb_event_flag_t evflag, VALUE data, VALUE self, ID mid, VALUE klass);
+
+#define RB_EVENT_HOOKS_HAVE_CALLBACK_DATA 1
+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);
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_EVENT_H */
diff --git a/include/ruby/internal/fl_type.h b/include/ruby/internal/fl_type.h
new file mode 100644
index 0000000000..455448fe8d
--- /dev/null
+++ b/include/ruby/internal/fl_type.h
@@ -0,0 +1,471 @@
+#ifndef RBIMPL_FL_TYPE_H                             /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_FL_TYPE_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines enum ::ruby_fl_type.
+ */
+#include "ruby/internal/config.h"      /* for ENUM_OVER_INT */
+#include "ruby/internal/attr/artificial.h"
+#include "ruby/internal/attr/flag_enum.h"
+#include "ruby/internal/attr/forceinline.h"
+#include "ruby/internal/attr/noalias.h"
+#include "ruby/internal/attr/pure.h"
+#include "ruby/internal/cast.h"
+#include "ruby/internal/core/rbasic.h"
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/special_consts.h"
+#include "ruby/internal/stdbool.h"
+#include "ruby/internal/value.h"
+#include "ruby/internal/value_type.h"
+#include "ruby/assert.h"
+#include "ruby/defines.h"
+
+/** @cond INTERNAL_MACRO */
+#ifdef ENUM_OVER_INT
+# define RBIMPL_WIDER_ENUM 1
+#elif SIZEOF_INT * CHAR_BIT > 12+19+1
+# define RBIMPL_WIDER_ENUM 1
+#else
+# define RBIMPL_WIDER_ENUM 0
+#endif
+/** @endcond */
+
+#define FL_SINGLETON    RBIMPL_CAST((VALUE)RUBY_FL_SINGLETON)
+#define FL_WB_PROTECTED RBIMPL_CAST((VALUE)RUBY_FL_WB_PROTECTED)
+#define FL_PROMOTED0    RBIMPL_CAST((VALUE)RUBY_FL_PROMOTED0)
+#define FL_PROMOTED1    RBIMPL_CAST((VALUE)RUBY_FL_PROMOTED1)
+#define FL_FINALIZE     RBIMPL_CAST((VALUE)RUBY_FL_FINALIZE)
+#define FL_TAINT        RBIMPL_CAST((VALUE)RUBY_FL_TAINT)
+#define FL_SHAREABLE    RBIMPL_CAST((VALUE)RUBY_FL_SHAREABLE)
+#define FL_UNTRUSTED    RBIMPL_CAST((VALUE)RUBY_FL_UNTRUSTED)
+#define FL_SEEN_OBJ_ID  RBIMPL_CAST((VALUE)RUBY_FL_SEEN_OBJ_ID)
+#define FL_EXIVAR       RBIMPL_CAST((VALUE)RUBY_FL_EXIVAR)
+#define FL_FREEZE       RBIMPL_CAST((VALUE)RUBY_FL_FREEZE)
+
+#define FL_USHIFT       RBIMPL_CAST((VALUE)RUBY_FL_USHIFT)
+
+#define FL_USER0        RBIMPL_CAST((VALUE)RUBY_FL_USER0)
+#define FL_USER1        RBIMPL_CAST((VALUE)RUBY_FL_USER1)
+#define FL_USER2        RBIMPL_CAST((VALUE)RUBY_FL_USER2)
+#define FL_USER3        RBIMPL_CAST((VALUE)RUBY_FL_USER3)
+#define FL_USER4        RBIMPL_CAST((VALUE)RUBY_FL_USER4)
+#define FL_USER5        RBIMPL_CAST((VALUE)RUBY_FL_USER5)
+#define FL_USER6        RBIMPL_CAST((VALUE)RUBY_FL_USER6)
+#define FL_USER7        RBIMPL_CAST((VALUE)RUBY_FL_USER7)
+#define FL_USER8        RBIMPL_CAST((VALUE)RUBY_FL_USER8)
+#define FL_USER9        RBIMPL_CAST((VALUE)RUBY_FL_USER9)
+#define FL_USER10       RBIMPL_CAST((VALUE)RUBY_FL_USER10)
+#define FL_USER11       RBIMPL_CAST((VALUE)RUBY_FL_USER11)
+#define FL_USER12       RBIMPL_CAST((VALUE)RUBY_FL_USER12)
+#define FL_USER13       RBIMPL_CAST((VALUE)RUBY_FL_USER13)
+#define FL_USER14       RBIMPL_CAST((VALUE)RUBY_FL_USER14)
+#define FL_USER15       RBIMPL_CAST((VALUE)RUBY_FL_USER15)
+#define FL_USER16       RBIMPL_CAST((VALUE)RUBY_FL_USER16)
+#define FL_USER17       RBIMPL_CAST((VALUE)RUBY_FL_USER17)
+#define FL_USER18       RBIMPL_CAST((VALUE)RUBY_FL_USER18)
+#define FL_USER19       RBIMPL_CAST((VALUE)(unsigned int)RUBY_FL_USER19)
+
+#define ELTS_SHARED          RUBY_ELTS_SHARED
+#define RUBY_ELTS_SHARED     RUBY_ELTS_SHARED
+#define RB_OBJ_FREEZE        rb_obj_freeze_inline
+
+/** @cond INTERNAL_MACRO */
+#define RB_FL_ABLE           RB_FL_ABLE
+#define RB_FL_ALL            RB_FL_ALL
+#define RB_FL_ALL_RAW        RB_FL_ALL_RAW
+#define RB_FL_ANY            RB_FL_ANY
+#define RB_FL_ANY_RAW        RB_FL_ANY_RAW
+#define RB_FL_REVERSE        RB_FL_REVERSE
+#define RB_FL_REVERSE_RAW    RB_FL_REVERSE_RAW
+#define RB_FL_SET            RB_FL_SET
+#define RB_FL_SET_RAW        RB_FL_SET_RAW
+#define RB_FL_TEST           RB_FL_TEST
+#define RB_FL_TEST_RAW       RB_FL_TEST_RAW
+#define RB_FL_UNSET          RB_FL_UNSET
+#define RB_FL_UNSET_RAW      RB_FL_UNSET_RAW
+#define RB_OBJ_FREEZE_RAW    RB_OBJ_FREEZE_RAW
+#define RB_OBJ_FROZEN        RB_OBJ_FROZEN
+#define RB_OBJ_FROZEN_RAW    RB_OBJ_FROZEN_RAW
+#define RB_OBJ_INFECT        RB_OBJ_INFECT
+#define RB_OBJ_INFECT_RAW    RB_OBJ_INFECT_RAW
+#define RB_OBJ_TAINT         RB_OBJ_TAINT
+#define RB_OBJ_TAINTABLE     RB_OBJ_TAINTABLE
+#define RB_OBJ_TAINTED       RB_OBJ_TAINTED
+#define RB_OBJ_TAINTED_RAW   RB_OBJ_TAINTED_RAW
+#define RB_OBJ_TAINT_RAW     RB_OBJ_TAINT_RAW
+#define RB_OBJ_UNTRUST       RB_OBJ_UNTRUST
+#define RB_OBJ_UNTRUSTED     RB_OBJ_UNTRUSTED
+/** @endcond */
+
+/**
+ * @defgroup deprecated_macros deprecated macro APIs
+ * @{
+ * These macros are deprecated. Prefer their `RB_`-prefixed versions.
+ */
+#define FL_ABLE         RB_FL_ABLE
+#define FL_ALL          RB_FL_ALL
+#define FL_ALL_RAW      RB_FL_ALL_RAW
+#define FL_ANY          RB_FL_ANY
+#define FL_ANY_RAW      RB_FL_ANY_RAW
+#define FL_REVERSE      RB_FL_REVERSE
+#define FL_REVERSE_RAW  RB_FL_REVERSE_RAW
+#define FL_SET          RB_FL_SET
+#define FL_SET_RAW      RB_FL_SET_RAW
+#define FL_TEST         RB_FL_TEST
+#define FL_TEST_RAW     RB_FL_TEST_RAW
+#define FL_UNSET        RB_FL_UNSET
+#define FL_UNSET_RAW    RB_FL_UNSET_RAW
+#define OBJ_FREEZE      RB_OBJ_FREEZE
+#define OBJ_FREEZE_RAW  RB_OBJ_FREEZE_RAW
+#define OBJ_FROZEN      RB_OBJ_FROZEN
+#define OBJ_FROZEN_RAW  RB_OBJ_FROZEN_RAW
+#define OBJ_INFECT      RB_OBJ_INFECT
+#define OBJ_INFECT_RAW  RB_OBJ_INFECT_RAW
+#define OBJ_TAINT       RB_OBJ_TAINT
+#define OBJ_TAINTABLE   RB_OBJ_TAINTABLE
+#define OBJ_TAINTED     RB_OBJ_TAINTED
+#define OBJ_TAINTED_RAW RB_OBJ_TAINTED_RAW
+#define OBJ_TAINT_RAW   RB_OBJ_TAINT_RAW
+#define OBJ_UNTRUST     RB_OBJ_UNTRUST
+#define OBJ_UNTRUSTED   RB_OBJ_UNTRUSTED
+/** @} */
+
+/* This is an enum because GDB wants it (rather than a macro) */
+enum ruby_fl_ushift { RUBY_FL_USHIFT = 12 };
+
+/* > The expression that defines the value  of an enumeration constant shall be
+ * > an integer constant expression that has a value representable as an `int`.
+ *
+ * -- ISO/IEC 9899:2018 section 6.7.2.2
+ *
+ * So ENUM_OVER_INT situation is an extension to the standard.  Note however
+ * that we do not support 16 bit `int` environment. */
+RB_GNUC_EXTENSION
+enum
+RBIMPL_ATTR_FLAG_ENUM()
+ruby_fl_type {
+    RUBY_FL_WB_PROTECTED = (1<<5),
+    RUBY_FL_PROMOTED0    = (1<<5),
+    RUBY_FL_PROMOTED1    = (1<<6),
+    RUBY_FL_PROMOTED     = RUBY_FL_PROMOTED0 | RUBY_FL_PROMOTED1,
+    RUBY_FL_FINALIZE     = (1<<7),
+    RUBY_FL_TAINT        = (1<<8),
+    RUBY_FL_SHAREABLE    = (1<<8),
+    RUBY_FL_UNTRUSTED    = RUBY_FL_TAINT,
+    RUBY_FL_SEEN_OBJ_ID  = (1<<9),
+    RUBY_FL_EXIVAR       = (1<<10),
+    RUBY_FL_FREEZE       = (1<<11),
+
+#define RBIMPL_FL_USER_N(n) RUBY_FL_USER##n = (1<<(RUBY_FL_USHIFT+n))
+    RBIMPL_FL_USER_N(0),
+    RBIMPL_FL_USER_N(1),
+    RBIMPL_FL_USER_N(2),
+    RBIMPL_FL_USER_N(3),
+    RBIMPL_FL_USER_N(4),
+    RBIMPL_FL_USER_N(5),
+    RBIMPL_FL_USER_N(6),
+    RBIMPL_FL_USER_N(7),
+    RBIMPL_FL_USER_N(8),
+    RBIMPL_FL_USER_N(9),
+    RBIMPL_FL_USER_N(10),
+    RBIMPL_FL_USER_N(11),
+    RBIMPL_FL_USER_N(12),
+    RBIMPL_FL_USER_N(13),
+    RBIMPL_FL_USER_N(14),
+    RBIMPL_FL_USER_N(15),
+    RBIMPL_FL_USER_N(16),
+    RBIMPL_FL_USER_N(17),
+    RBIMPL_FL_USER_N(18),
+#if ENUM_OVER_INT
+    RBIMPL_FL_USER_N(19),
+#else
+# define RUBY_FL_USER19 (RBIMPL_VALUE_ONE<<(RUBY_FL_USHIFT+19))
+#endif
+#undef RBIMPL_FL_USER_N
+#undef RBIMPL_WIDER_ENUM
+
+    RUBY_ELTS_SHARED  = RUBY_FL_USER2,
+    RUBY_FL_SINGLETON = RUBY_FL_USER0,
+};
+
+enum { RUBY_FL_DUPPED = RUBY_T_MASK | RUBY_FL_EXIVAR | RUBY_FL_TAINT };
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+void rb_obj_infect(VALUE victim, VALUE carrier);
+void rb_freeze_singleton_class(VALUE klass);
+RBIMPL_SYMBOL_EXPORT_END()
+
+RBIMPL_ATTR_PURE_UNLESS_DEBUG()
+RBIMPL_ATTR_ARTIFICIAL()
+RBIMPL_ATTR_FORCEINLINE()
+static bool
+RB_FL_ABLE(VALUE obj)
+{
+    if (RB_SPECIAL_CONST_P(obj)) {
+        return false;
+    }
+    else if (RB_TYPE_P(obj, RUBY_T_NODE)) {
+        return false;
+    }
+    else {
+        return true;
+    }
+}
+
+RBIMPL_ATTR_PURE_UNLESS_DEBUG()
+RBIMPL_ATTR_ARTIFICIAL()
+static inline VALUE
+RB_FL_TEST_RAW(VALUE obj, VALUE flags)
+{
+    RBIMPL_ASSERT_OR_ASSUME(RB_FL_ABLE(obj));
+    return RBASIC(obj)->flags & flags;
+}
+
+RBIMPL_ATTR_PURE_UNLESS_DEBUG()
+RBIMPL_ATTR_ARTIFICIAL()
+static inline VALUE
+RB_FL_TEST(VALUE obj, VALUE flags)
+{
+    if (RB_FL_ABLE(obj)) {
+        return RB_FL_TEST_RAW(obj, flags);
+    }
+    else {
+        return RBIMPL_VALUE_NULL;
+    }
+}
+
+RBIMPL_ATTR_PURE_UNLESS_DEBUG()
+RBIMPL_ATTR_ARTIFICIAL()
+static inline bool
+RB_FL_ANY_RAW(VALUE obj, VALUE flags)
+{
+    return RB_FL_TEST_RAW(obj, flags);
+}
+
+RBIMPL_ATTR_PURE_UNLESS_DEBUG()
+RBIMPL_ATTR_ARTIFICIAL()
+static inline bool
+RB_FL_ANY(VALUE obj, VALUE flags)
+{
+    return RB_FL_TEST(obj, flags);
+}
+
+RBIMPL_ATTR_PURE_UNLESS_DEBUG()
+RBIMPL_ATTR_ARTIFICIAL()
+static inline bool
+RB_FL_ALL_RAW(VALUE obj, VALUE flags)
+{
+    return RB_FL_TEST_RAW(obj, flags) == flags;
+}
+
+RBIMPL_ATTR_PURE_UNLESS_DEBUG()
+RBIMPL_ATTR_ARTIFICIAL()
+static inline bool
+RB_FL_ALL(VALUE obj, VALUE flags)
+{
+    return RB_FL_TEST(obj, flags) == flags;
+}
+
+RBIMPL_ATTR_NOALIAS()
+RBIMPL_ATTR_ARTIFICIAL()
+static inline void
+rbimpl_fl_set_raw_raw(struct RBasic *obj, VALUE flags)
+{
+    obj->flags |= flags;
+}
+
+RBIMPL_ATTR_ARTIFICIAL()
+static inline void
+RB_FL_SET_RAW(VALUE obj, VALUE flags)
+{
+    RBIMPL_ASSERT_OR_ASSUME(RB_FL_ABLE(obj));
+    rbimpl_fl_set_raw_raw(RBASIC(obj), flags);
+}
+
+RBIMPL_ATTR_ARTIFICIAL()
+static inline void
+RB_FL_SET(VALUE obj, VALUE flags)
+{
+    if (RB_FL_ABLE(obj)) {
+        RB_FL_SET_RAW(obj, flags);
+    }
+}
+
+RBIMPL_ATTR_NOALIAS()
+RBIMPL_ATTR_ARTIFICIAL()
+static inline void
+rbimpl_fl_unset_raw_raw(struct RBasic *obj, VALUE flags)
+{
+    obj->flags &= ~flags;
+}
+
+RBIMPL_ATTR_ARTIFICIAL()
+static inline void
+RB_FL_UNSET_RAW(VALUE obj, VALUE flags)
+{
+    RBIMPL_ASSERT_OR_ASSUME(RB_FL_ABLE(obj));
+    rbimpl_fl_unset_raw_raw(RBASIC(obj), flags);
+}
+
+RBIMPL_ATTR_ARTIFICIAL()
+static inline void
+RB_FL_UNSET(VALUE obj, VALUE flags)
+{
+    if (RB_FL_ABLE(obj)) {
+        RB_FL_UNSET_RAW(obj, flags);
+    }
+}
+
+RBIMPL_ATTR_NOALIAS()
+RBIMPL_ATTR_ARTIFICIAL()
+static inline void
+rbimpl_fl_reverse_raw_raw(struct RBasic *obj, VALUE flags)
+{
+    obj->flags ^= flags;
+}
+
+RBIMPL_ATTR_ARTIFICIAL()
+static inline void
+RB_FL_REVERSE_RAW(VALUE obj, VALUE flags)
+{
+    RBIMPL_ASSERT_OR_ASSUME(RB_FL_ABLE(obj));
+    rbimpl_fl_reverse_raw_raw(RBASIC(obj), flags);
+}
+
+RBIMPL_ATTR_ARTIFICIAL()
+static inline void
+RB_FL_REVERSE(VALUE obj, VALUE flags)
+{
+    if (RB_FL_ABLE(obj)) {
+        RB_FL_REVERSE_RAW(obj, flags);
+    }
+}
+
+RBIMPL_ATTR_PURE_UNLESS_DEBUG()
+RBIMPL_ATTR_ARTIFICIAL()
+static inline bool
+RB_OBJ_TAINTABLE(VALUE obj)
+{
+    if (! RB_FL_ABLE(obj)) {
+        return false;
+    }
+    else if (RB_TYPE_P(obj, RUBY_T_BIGNUM)) {
+        return false;
+    }
+    else if (RB_TYPE_P(obj, RUBY_T_FLOAT)) {
+        return false;
+    }
+    else {
+        return true;
+    }
+}
+
+RBIMPL_ATTR_PURE_UNLESS_DEBUG()
+RBIMPL_ATTR_ARTIFICIAL()
+static inline VALUE
+RB_OBJ_TAINTED_RAW(VALUE obj)
+{
+    return RB_FL_TEST_RAW(obj, RUBY_FL_TAINT);
+}
+
+RBIMPL_ATTR_PURE_UNLESS_DEBUG()
+RBIMPL_ATTR_ARTIFICIAL()
+static inline bool
+RB_OBJ_TAINTED(VALUE obj)
+{
+    return RB_FL_ANY(obj, RUBY_FL_TAINT);
+}
+
+RBIMPL_ATTR_ARTIFICIAL()
+static inline void
+RB_OBJ_TAINT_RAW(VALUE obj)
+{
+    RB_FL_SET_RAW(obj, RUBY_FL_TAINT);
+}
+
+RBIMPL_ATTR_ARTIFICIAL()
+static inline void
+RB_OBJ_TAINT(VALUE obj)
+{
+    if (RB_OBJ_TAINTABLE(obj)) {
+        RB_OBJ_TAINT_RAW(obj);
+    }
+}
+
+RBIMPL_ATTR_ARTIFICIAL()
+static inline void
+RB_OBJ_INFECT_RAW(VALUE dst, VALUE src)
+{
+    RBIMPL_ASSERT_OR_ASSUME(RB_OBJ_TAINTABLE(dst));
+    RBIMPL_ASSERT_OR_ASSUME(RB_FL_ABLE(src));
+    RB_FL_SET_RAW(dst, RB_OBJ_TAINTED_RAW(src));
+}
+
+RBIMPL_ATTR_ARTIFICIAL()
+static inline void
+RB_OBJ_INFECT(VALUE dst, VALUE src)
+{
+    if (RB_OBJ_TAINTABLE(dst) && RB_FL_ABLE(src)) {
+        RB_OBJ_INFECT_RAW(dst, src);
+    }
+}
+
+RBIMPL_ATTR_PURE_UNLESS_DEBUG()
+RBIMPL_ATTR_ARTIFICIAL()
+/* It is  intentional not to return  bool here. There  is a place in  ruby core
+ * (namely class.c:singleton_class_of()) where return value of this function is
+ * verbatimly passed to RB_FL_SET_RAW. */
+static inline VALUE
+RB_OBJ_FROZEN_RAW(VALUE obj)
+{
+    return RB_FL_TEST_RAW(obj, RUBY_FL_FREEZE);
+}
+
+RBIMPL_ATTR_PURE_UNLESS_DEBUG()
+RBIMPL_ATTR_ARTIFICIAL()
+static inline bool
+RB_OBJ_FROZEN(VALUE obj)
+{
+    if (! RB_FL_ABLE(obj)) {
+        return true;
+    }
+    else {
+        return RB_OBJ_FROZEN_RAW(obj);
+    }
+}
+
+RBIMPL_ATTR_ARTIFICIAL()
+static inline void
+RB_OBJ_FREEZE_RAW(VALUE obj)
+{
+    RB_FL_SET_RAW(obj, RUBY_FL_FREEZE);
+}
+
+static inline void
+rb_obj_freeze_inline(VALUE x)
+{
+    if (RB_FL_ABLE(x)) {
+        RB_OBJ_FREEZE_RAW(x);
+        if (RBASIC_CLASS(x) && !(RBASIC(x)->flags & RUBY_FL_SINGLETON)) {
+            rb_freeze_singleton_class(x);
+        }
+    }
+}
+
+#endif /* RBIMPL_FL_TYPE_H */
diff --git a/include/ruby/internal/gc.h b/include/ruby/internal/gc.h
new file mode 100644
index 0000000000..d94f8a3736
--- /dev/null
+++ b/include/ruby/internal/gc.h
@@ -0,0 +1,57 @@
+#ifndef RBIMPL_GC_H                                  /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_GC_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Registering values to the GC.
+ */
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+/**
+ * Inform the garbage collector that `valptr` points to a live Ruby object that
+ * should not be moved. Note that extensions should use this API on global
+ * constants instead of assuming constants defined in Ruby are always alive.
+ * Ruby code can remove global constants.
+ */
+void rb_gc_register_address(VALUE *valptr);
+
+/**
+ * An alias for `rb_gc_register_address()`.
+ */
+void rb_global_variable(VALUE *);
+
+/**
+ * Inform the garbage collector that a pointer previously passed to
+ * `rb_gc_register_address()` no longer points to a live Ruby object.
+ */
+void rb_gc_unregister_address(VALUE *valptr);
+
+/**
+ * Inform the garbage collector that `object` is a live Ruby object that should
+ * not be moved.
+ *
+ * See also: rb_gc_register_address()
+ */
+void rb_gc_register_mark_object(VALUE object);
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_GC_H */
diff --git a/include/ruby/internal/glob.h b/include/ruby/internal/glob.h
new file mode 100644
index 0000000000..b78bb75b88
--- /dev/null
+++ b/include/ruby/internal/glob.h
@@ -0,0 +1,35 @@
+#ifndef RBIMPL_GLOB_H                                /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_GLOB_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Declares ::rb_glob().
+ */
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+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);
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_GLOB_H */
diff --git a/include/ruby/internal/globals.h b/include/ruby/internal/globals.h
new file mode 100644
index 0000000000..ddd731349e
--- /dev/null
+++ b/include/ruby/internal/globals.h
@@ -0,0 +1,157 @@
+#ifndef RBIMPL_GLOBALS_H                             /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_GLOBALS_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Ruby-level global variables / constants, visible from C.
+ */
+#include "ruby/internal/attr/pure.h"
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/fl_type.h"
+#include "ruby/internal/special_consts.h"
+#include "ruby/internal/value.h"
+#include "ruby/internal/value_type.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+#define RUBY_INTEGER_UNIFICATION 1
+
+RUBY_EXTERN VALUE rb_mKernel;
+RUBY_EXTERN VALUE rb_mComparable;
+RUBY_EXTERN VALUE rb_mEnumerable;
+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_mWaitReadable;
+RUBY_EXTERN VALUE rb_mWaitWritable;
+
+RUBY_EXTERN VALUE rb_cBasicObject;
+RUBY_EXTERN VALUE rb_cObject;
+RUBY_EXTERN VALUE rb_cArray;
+RUBY_EXTERN VALUE rb_cBinding;
+RUBY_EXTERN VALUE rb_cClass;
+RUBY_EXTERN VALUE rb_cDir;
+RUBY_EXTERN VALUE rb_cEncoding;
+RUBY_EXTERN VALUE rb_cEnumerator;
+RUBY_EXTERN VALUE rb_cFalseClass;
+RUBY_EXTERN VALUE rb_cFile;
+RUBY_EXTERN VALUE rb_cComplex;
+RUBY_EXTERN VALUE rb_cFloat;
+RUBY_EXTERN VALUE rb_cHash;
+RUBY_EXTERN VALUE rb_cIO;
+RUBY_EXTERN VALUE rb_cInteger;
+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_cRandom;
+RUBY_EXTERN VALUE rb_cRange;
+RUBY_EXTERN VALUE rb_cRational;
+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_eFrozenError;
+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_eEncodingError;
+RUBY_EXTERN VALUE rb_eEncCompatError;
+RUBY_EXTERN VALUE rb_eNoMatchingPatternError;
+
+RUBY_EXTERN VALUE rb_eScriptError;
+RUBY_EXTERN VALUE rb_eNameError;
+RUBY_EXTERN VALUE rb_eSyntaxError;
+RUBY_EXTERN VALUE rb_eLoadError;
+
+RUBY_EXTERN VALUE rb_eMathDomainError;
+
+RUBY_EXTERN VALUE rb_stdin, rb_stdout, rb_stderr;
+
+RBIMPL_ATTR_PURE()
+static inline VALUE
+rb_class_of(VALUE obj)
+{
+    if (! RB_SPECIAL_CONST_P(obj)) {
+        return RBASIC_CLASS(obj);
+    }
+    else if (obj == RUBY_Qfalse) {
+        return rb_cFalseClass;
+    }
+    else if (obj == RUBY_Qnil) {
+        return rb_cNilClass;
+    }
+    else if (obj == RUBY_Qtrue) {
+        return rb_cTrueClass;
+    }
+    else if (RB_FIXNUM_P(obj)) {
+        return rb_cInteger;
+    }
+    else if (RB_STATIC_SYM_P(obj)) {
+        return rb_cSymbol;
+    }
+    else if (RB_FLONUM_P(obj)) {
+        return rb_cFloat;
+    }
+
+#if !RUBY_DEBUG
+    RBIMPL_UNREACHABLE_RETURN(Qfalse);
+#else
+    RUBY_ASSERT_FAIL("unexpected type");
+#endif
+}
+
+#define CLASS_OF rb_class_of
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_GLOBALS_H */
diff --git a/include/ruby/internal/has/attribute.h b/include/ruby/internal/has/attribute.h
new file mode 100644
index 0000000000..512f061dc5
--- /dev/null
+++ b/include/ruby/internal/has/attribute.h
@@ -0,0 +1,164 @@
+#ifndef RBIMPL_HAS_ATTRIBUTE_H                       /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_HAS_ATTRIBUTE_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RBIMPL_HAS_ATTRIBUTE.
+ */
+#include "ruby/internal/config.h"
+#include "ruby/internal/compiler_since.h"
+#include "ruby/internal/token_paste.h"
+
+#if defined(__has_attribute)
+# if __has_attribute(pure) || RBIMPL_COMPILER_IS(GCC)
+#  /* FreeBSD's   <sys/cdefs.h>   defines   its   own   *broken*   version   of
+#   * __has_attribute.   Cygwin copied  that  content  to be  a  victim of  the
+#   * broken-ness.  We don't take them into account. */
+#  define RBIMPL_HAVE___HAS_ATTRIBUTE 1
+# endif
+#endif
+
+/** Wraps (or simulates) `__has_attribute`. */
+#if defined(RBIMPL_HAVE___HAS_ATTRIBUTE)
+# define RBIMPL_HAS_ATTRIBUTE(_) __has_attribute(_)
+
+#elif RBIMPL_COMPILER_IS(GCC)
+# /* GCC  <= 4  lack __has_attribute  predefined macro,  while have  attributes
+#  * themselves.  We can simulate the macro like the following: */
+# define RBIMPL_HAS_ATTRIBUTE(_) RBIMPL_TOKEN_PASTE(RBIMPL_HAS_ATTRIBUTE_, _)
+# define RBIMPL_HAS_ATTRIBUTE_aligned                    RBIMPL_COMPILER_SINCE(GCC, 0, 0, 0)
+# define RBIMPL_HAS_ATTRIBUTE_alloc_size                 RBIMPL_COMPILER_SINCE(GCC, 4, 3, 0)
+# define RBIMPL_HAS_ATTRIBUTE_artificial                 RBIMPL_COMPILER_SINCE(GCC, 4, 3, 0)
+# define RBIMPL_HAS_ATTRIBUTE_always_inline              RBIMPL_COMPILER_SINCE(GCC, 3, 1, 0)
+# define RBIMPL_HAS_ATTRIBUTE_cdecl                      RBIMPL_COMPILER_SINCE(GCC, 0, 0, 0)
+# define RBIMPL_HAS_ATTRIBUTE_cold                       RBIMPL_COMPILER_SINCE(GCC, 4, 3, 0)
+# define RBIMPL_HAS_ATTRIBUTE_const                      RBIMPL_COMPILER_SINCE(GCC, 2, 6, 0)
+# define RBIMPL_HAS_ATTRIBUTE_deprecated                 RBIMPL_COMPILER_SINCE(GCC, 3, 1, 0)
+# define RBIMPL_HAS_ATTRIBUTE_dllexport                  RBIMPL_COMPILER_SINCE(GCC, 0, 0, 0)
+# define RBIMPL_HAS_ATTRIBUTE_dllimport                  RBIMPL_COMPILER_SINCE(GCC, 0, 0, 0)
+# define RBIMPL_HAS_ATTRIBUTE_error                      RBIMPL_COMPILER_SINCE(GCC, 4, 3, 0)
+# define RBIMPL_HAS_ATTRIBUTE_format                     RBIMPL_COMPILER_SINCE(GCC, 0, 0, 0)
+# define RBIMPL_HAS_ATTRIBUTE_hot                        RBIMPL_COMPILER_SINCE(GCC, 4, 3, 0)
+# define RBIMPL_HAS_ATTRIBUTE_leaf                       RBIMPL_COMPILER_SINCE(GCC, 4, 6, 0)
+# define RBIMPL_HAS_ATTRIBUTE_malloc                     RBIMPL_COMPILER_SINCE(GCC, 3, 0, 0)
+# define RBIMPL_HAS_ATTRIBUTE_no_address_safety_analysis RBIMPL_COMPILER_SINCE(GCC, 4, 8, 0)
+# define RBIMPL_HAS_ATTRIBUTE_no_sanitize_address        RBIMPL_COMPILER_SINCE(GCC, 4, 8, 0)
+# define RBIMPL_HAS_ATTRIBUTE_no_sanitize_undefined      RBIMPL_COMPILER_SINCE(GCC, 4, 9, 0)
+# define RBIMPL_HAS_ATTRIBUTE_noinline                   RBIMPL_COMPILER_SINCE(GCC, 3, 1, 0)
+# define RBIMPL_HAS_ATTRIBUTE_nonnull                    RBIMPL_COMPILER_SINCE(GCC, 3, 3, 0)
+# define RBIMPL_HAS_ATTRIBUTE_noreturn                   RBIMPL_COMPILER_SINCE(GCC, 2, 5, 0)
+# define RBIMPL_HAS_ATTRIBUTE_nothrow                    RBIMPL_COMPILER_SINCE(GCC, 3, 3, 0)
+# define RBIMPL_HAS_ATTRIBUTE_pure                       RBIMPL_COMPILER_SINCE(GCC, 2,96, 0)
+# define RBIMPL_HAS_ATTRIBUTE_returns_nonnull            RBIMPL_COMPILER_SINCE(GCC, 4, 9, 0)
+# define RBIMPL_HAS_ATTRIBUTE_returns_twice              RBIMPL_COMPILER_SINCE(GCC, 4, 1, 0)
+# define RBIMPL_HAS_ATTRIBUTE_stdcall                    RBIMPL_COMPILER_SINCE(GCC, 0, 0, 0)
+# define RBIMPL_HAS_ATTRIBUTE_unused                     RBIMPL_COMPILER_SINCE(GCC, 0, 0, 0)
+# define RBIMPL_HAS_ATTRIBUTE_visibility                 RBIMPL_COMPILER_SINCE(GCC, 3, 3, 0)
+# define RBIMPL_HAS_ATTRIBUTE_warn_unused_result         RBIMPL_COMPILER_SINCE(GCC, 3, 4, 0)
+# define RBIMPL_HAS_ATTRIBUTE_warning                    RBIMPL_COMPILER_SINCE(GCC, 4, 3, 0)
+# define RBIMPL_HAS_ATTRIBUTE_weak                       RBIMPL_COMPILER_SINCE(GCC, 0, 0, 0)
+# /* Note that "0, 0, 0" might be inaccurate. */
+
+#elif RBIMPL_COMPILER_IS(SunPro)
+# /* Oracle Solaris Studio 12.4 (cc version 5.11) introduced __has_attribute.
+#  * Before that, following attributes were available. */
+# /* See https://docs.oracle.com/cd/F24633_01/index.html */
+# define RBIMPL_HAS_ATTRIBUTE(_) RBIMPL_TOKEN_PASTE(RBIMPL_HAS_ATTRIBUTE_, _)
+# define RBIMPL_HAS_ATTRIBUTE_alias                      RBIMPL_COMPILER_SINCE(SunPro, 5,  9, 0)
+# define RBIMPL_HAS_ATTRIBUTE_aligned                    RBIMPL_COMPILER_SINCE(SunPro, 5,  9, 0)
+# define RBIMPL_HAS_ATTRIBUTE_always_inline              RBIMPL_COMPILER_SINCE(SunPro, 5, 10, 0)
+# define RBIMPL_HAS_ATTRIBUTE_const                      RBIMPL_COMPILER_SINCE(SunPro, 5,  9, 0)
+# define RBIMPL_HAS_ATTRIBUTE_constructor                RBIMPL_COMPILER_SINCE(SunPro, 5,  9, 0)
+# define RBIMPL_HAS_ATTRIBUTE_destructor                 RBIMPL_COMPILER_SINCE(SunPro, 5,  9, 0)
+# define RBIMPL_HAS_ATTRIBUTE_malloc                     RBIMPL_COMPILER_SINCE(SunPro, 5,  9, 0)
+# define RBIMPL_HAS_ATTRIBUTE_noinline                   RBIMPL_COMPILER_SINCE(SunPro, 5,  9, 0)
+# define RBIMPL_HAS_ATTRIBUTE_noreturn                   RBIMPL_COMPILER_SINCE(SunPro, 5,  9, 0)
+# define RBIMPL_HAS_ATTRIBUTE_packed                     RBIMPL_COMPILER_SINCE(SunPro, 5,  9, 0)
+# define RBIMPL_HAS_ATTRIBUTE_pure                       RBIMPL_COMPILER_SINCE(SunPro, 5,  9, 0)
+# define RBIMPL_HAS_ATTRIBUTE_returns_twice              RBIMPL_COMPILER_SINCE(SunPro, 5, 10, 0)
+# define RBIMPL_HAS_ATTRIBUTE_vector_size                RBIMPL_COMPILER_SINCE(SunPro, 5, 10, 0)
+# define RBIMPL_HAS_ATTRIBUTE_visibility                 RBIMPL_COMPILER_SINCE(SunPro, 5,  9, 0)
+# define RBIMPL_HAS_ATTRIBUTE_weak                       RBIMPL_COMPILER_SINCE(SunPro, 5,  9, 0)
+
+#elif defined (_MSC_VER)
+# define RBIMPL_HAS_ATTRIBUTE(_) 0
+# /* Fallback below doesn't work: see win32/Makefile.sub */
+
+#else
+# /* Take config.h definition when available. */
+# define RBIMPL_HAS_ATTRIBUTE(_) (RBIMPL_TOKEN_PASTE(RBIMPL_HAS_ATTRIBUTE_, _)+0)
+# ifdef ALWAYS_INLINE
+#  define RBIMPL_HAS_ATTRIBUTE_always_inline 1
+# endif
+# ifdef FUNC_CDECL
+#  define RBIMPL_HAS_ATTRIBUTE_cdecl 1
+# endif
+# ifdef CONSTFUNC
+#  define RBIMPL_HAS_ATTRIBUTE_const 1
+# endif
+# ifdef DEPRECATED
+#  define RBIMPL_HAS_ATTRIBUTE_deprecated 1
+# endif
+# ifdef ERRORFUNC
+#  define RBIMPL_HAS_ATTRIBUTE_error 1
+# endif
+# ifdef FUNC_FASTCALL
+#  define RBIMPL_HAS_ATTRIBUTE_fastcall 1
+# endif
+# ifdef PUREFUNC
+#  define RBIMPL_HAS_ATTRIBUTE_pure 1
+# endif
+# ifdef NO_ADDRESS_SAFETY_ANALYSIS
+#  define RBIMPL_HAS_ATTRIBUTE_no_address_safety_analysis 1
+# endif
+# ifdef NO_SANITIZE
+#  define RBIMPL_HAS_ATTRIBUTE_no_sanitize 1
+# endif
+# ifdef NO_SANITIZE_ADDRESS
+#  define RBIMPL_HAS_ATTRIBUTE_no_sanitize_address 1
+# endif
+# ifdef NOINLINE
+#  define RBIMPL_HAS_ATTRIBUTE_noinline 1
+# endif
+# ifdef RBIMPL_FUNC_NONNULL
+#  define RBIMPL_HAS_ATTRIBUTE_nonnull 1
+# endif
+# ifdef NORETURN
+#  define RBIMPL_HAS_ATTRIBUTE_noreturn 1
+# endif
+# ifdef FUNC_OPTIMIZED
+#  define RBIMPL_HAS_ATTRIBUTE_optimize 1
+# endif
+# ifdef FUNC_STDCALL
+#  define RBIMPL_HAS_ATTRIBUTE_stdcall 1
+# endif
+# ifdef MAYBE_UNUSED
+#  define RBIMPL_HAS_ATTRIBUTE_unused 1
+# endif
+# ifdef WARN_UNUSED_RESULT
+#  define RBIMPL_HAS_ATTRIBUTE_warn_unused_result 1
+# endif
+# ifdef WARNINGFUNC
+#  define RBIMPL_HAS_ATTRIBUTE_warning 1
+# endif
+# ifdef WEAK
+#  define RBIMPL_HAS_ATTRIBUTE_weak 1
+# endif
+#endif
+
+#endif /* RBIMPL_HAS_ATTRIBUTE_H */
diff --git a/include/ruby/internal/has/builtin.h b/include/ruby/internal/has/builtin.h
new file mode 100644
index 0000000000..18cfc69e19
--- /dev/null
+++ b/include/ruby/internal/has/builtin.h
@@ -0,0 +1,105 @@
+#ifndef RBIMPL_HAS_BUILTIN_H                         /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_HAS_BUILTIN_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RBIMPL_HAS_BUILTIN.
+ */
+#include "ruby/internal/config.h"
+#include "ruby/internal/compiler_since.h"
+#include "ruby/internal/token_paste.h"
+
+#if defined(__has_builtin)
+# if RBIMPL_COMPILER_IS(Intel)
+#  /* :TODO: Intel  C Compiler  has __has_builtin (since  19.1 maybe?),  and is
+#   * reportedly  broken.  We  have to  skip them.   However the  situation can
+#   * change.  They might improve someday.  We need to revisit here later. */
+# elif RBIMPL_COMPILER_IS(GCC) && ! __has_builtin(__builtin_alloca)
+#  /* FreeBSD's   <sys/cdefs.h>   defines   its   own   *broken*   version   of
+#   * __has_builtin.   Cygwin  copied  that  content  to be  a  victim  of  the
+#   * broken-ness.  We don't take them into account. */
+# else
+#  define RBIMPL_HAVE___HAS_BUILTIN 1
+# endif
+#endif
+
+/** Wraps (or simulates) `__has_builtin`. */
+#if defined(RBIMPL_HAVE___HAS_BUILTIN)
+# define RBIMPL_HAS_BUILTIN(_) __has_builtin(_)
+
+#elif RBIMPL_COMPILER_IS(GCC)
+# /* :FIXME: Historically  GCC has had  tons of builtins, but  it implemented
+#  * __has_builtin  only  since  GCC  10.   This section  can  be  made  more
+#  * granular. */
+# /* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66970 */
+# define RBIMPL_HAS_BUILTIN(_) RBIMPL_TOKEN_PASTE(RBIMPL_HAS_BUILTIN_, _)
+# define RBIMPL_HAS_BUILTIN___builtin_add_overflow      RBIMPL_COMPILER_SINCE(GCC, 5, 1, 0)
+# define RBIMPL_HAS_BUILTIN___builtin_alloca            RBIMPL_COMPILER_SINCE(GCC, 0, 0, 0)
+# define RBIMPL_HAS_BUILTIN___builtin_alloca_with_align RBIMPL_COMPILER_SINCE(GCC, 6, 1, 0)
+# /* See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52624 for bswap16. */
+# define RBIMPL_HAS_BUILTIN___builtin_bswap16           RBIMPL_COMPILER_SINCE(GCC, 4, 8, 0)
+# define RBIMPL_HAS_BUILTIN___builtin_bswap32           RBIMPL_COMPILER_SINCE(GCC, 3, 6, 0)
+# define RBIMPL_HAS_BUILTIN___builtin_bswap64           RBIMPL_COMPILER_SINCE(GCC, 3, 6, 0)
+# define RBIMPL_HAS_BUILTIN___builtin_clz               RBIMPL_COMPILER_SINCE(GCC, 3, 6, 0)
+# define RBIMPL_HAS_BUILTIN___builtin_clzl              RBIMPL_COMPILER_SINCE(GCC, 3, 6, 0)
+# define RBIMPL_HAS_BUILTIN___builtin_clzll             RBIMPL_COMPILER_SINCE(GCC, 3, 6, 0)
+# define RBIMPL_HAS_BUILTIN___builtin_constant_p        RBIMPL_COMPILER_SINCE(GCC, 2,95, 3)
+# define RBIMPL_HAS_BUILTIN___builtin_ctz               RBIMPL_COMPILER_SINCE(GCC, 3, 6, 0)
+# define RBIMPL_HAS_BUILTIN___builtin_ctzl              RBIMPL_COMPILER_SINCE(GCC, 3, 6, 0)
+# define RBIMPL_HAS_BUILTIN___builtin_ctzll             RBIMPL_COMPILER_SINCE(GCC, 3, 6, 0)
+# define RBIMPL_HAS_BUILTIN___builtin_expect            RBIMPL_COMPILER_SINCE(GCC, 3, 0, 0)
+# define RBIMPL_HAS_BUILTIN___builtin_mul_overflow      RBIMPL_COMPILER_SINCE(GCC, 5, 1, 0)
+# define RBIMPL_HAS_BUILTIN___builtin_mul_overflow_p    RBIMPL_COMPILER_SINCE(GCC, 7, 0, 0)
+# define RBIMPL_HAS_BUILTIN___builtin_popcount          RBIMPL_COMPILER_SINCE(GCC, 3, 6, 0)
+# define RBIMPL_HAS_BUILTIN___builtin_popcountl         RBIMPL_COMPILER_SINCE(GCC, 3, 6, 0)
+# define RBIMPL_HAS_BUILTIN___builtin_popcountll        RBIMPL_COMPILER_SINCE(GCC, 3, 6, 0)
+# define RBIMPL_HAS_BUILTIN___builtin_sub_overflow      RBIMPL_COMPILER_SINCE(GCC, 5, 1, 0)
+# define RBIMPL_HAS_BUILTIN___builtin_unreachable       RBIMPL_COMPILER_SINCE(GCC, 4, 5, 0)
+# /* Note that "0, 0, 0" might be inaccurate. */
+
+#elif RBIMPL_COMPILER_IS(MSVC)
+# /* MSVC has UNREACHABLE, but that is not __builtin_unreachable. */
+# define RBIMPL_HAS_BUILTIN(_) 0
+
+#else
+# /* Take config.h definition when available */
+# define RBIMPL_HAS_BUILTIN(_) (RBIMPL_TOKEN_PASTE(RBIMPL_HAS_BUILTIN_, _)+0)
+# define RBIMPL_HAS_BUILTIN___builtin_add_overflow      HAVE_BUILTIN___BUILTIN_ADD_OVERFLOW
+# define RBIMPL_HAS_BUILTIN___builtin_alloca_with_align HAVE_BUILTIN___BUILTIN_ALLOCA_WITH_ALIGN
+# define RBIMPL_HAS_BUILTIN___builtin_assume_aligned    HAVE_BUILTIN___BUILTIN_ASSUME_ALIGNED
+# define RBIMPL_HAS_BUILTIN___builtin_bswap16           HAVE_BUILTIN___BUILTIN_BSWAP16
+# define RBIMPL_HAS_BUILTIN___builtin_bswap32           HAVE_BUILTIN___BUILTIN_BSWAP32
+# define RBIMPL_HAS_BUILTIN___builtin_bswap64           HAVE_BUILTIN___BUILTIN_BSWAP64
+# define RBIMPL_HAS_BUILTIN___builtin_clz               HAVE_BUILTIN___BUILTIN_CLZ
+# define RBIMPL_HAS_BUILTIN___builtin_clzl              HAVE_BUILTIN___BUILTIN_CLZL
+# define RBIMPL_HAS_BUILTIN___builtin_clzll             HAVE_BUILTIN___BUILTIN_CLZLL
+# define RBIMPL_HAS_BUILTIN___builtin_constant_p        HAVE_BUILTIN___BUILTIN_CONSTANT_P
+# define RBIMPL_HAS_BUILTIN___builtin_ctz               HAVE_BUILTIN___BUILTIN_CTZ
+# define RBIMPL_HAS_BUILTIN___builtin_ctzll             HAVE_BUILTIN___BUILTIN_CTZLL
+# define RBIMPL_HAS_BUILTIN___builtin_expect            HAVE_BUILTIN___BUILTIN_EXPECT
+# define RBIMPL_HAS_BUILTIN___builtin_mul_overflow      HAVE_BUILTIN___BUILTIN_MUL_OVERFLOW
+# define RBIMPL_HAS_BUILTIN___builtin_mul_overflow_p    HAVE_BUILTIN___BUILTIN_MUL_OVERFLOW_P
+# define RBIMPL_HAS_BUILTIN___builtin_popcount          HAVE_BUILTIN___BUILTIN_POPCOUNT
+# define RBIMPL_HAS_BUILTIN___builtin_popcountll        HAVE_BUILTIN___BUILTIN_POPCOUNTLL
+# define RBIMPL_HAS_BUILTIN___builtin_sub_overflow      HAVE_BUILTIN___BUILTIN_SUB_OVERFLOW
+# if defined(UNREACHABLE)
+#  define RBIMPL_HAS_BUILTIN___builtin_unreachable 1
+# endif
+#endif
+
+#endif /* RBIMPL_HAS_BUILTIN_H */
diff --git a/include/ruby/internal/has/c_attribute.h b/include/ruby/internal/has/c_attribute.h
new file mode 100644
index 0000000000..b7eb94d22a
--- /dev/null
+++ b/include/ruby/internal/has/c_attribute.h
@@ -0,0 +1,38 @@
+#ifndef RBIMPL_HAS_C_ATTRIBUTE_H                     /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_HAS_C_ATTRIBUTE_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RBIMPL_HAS_C_ATTRIBUTE.
+ */
+
+/** Wraps (or simulates) `__has_c_attribute`. */
+#if defined(__cplusplus)
+# /* Makes no sense. */
+# define RBIMPL_HAS_C_ATTRIBUTE(_) 0
+
+#elif defined(__has_c_attribute)
+# define RBIMPL_HAS_C_ATTRIBUTE(_) __has_c_attribute(_)
+
+#else
+# /* As  of writing  everything  that lacks  __has_c_attribute also  completely
+#  * lacks C2x attributes as well.  Might change in future? */
+# define RBIMPL_HAS_C_ATTRIBUTE(_) 0
+#endif
+
+#endif /* RBIMPL_HAS_C_ATTRIBUTE_H */
diff --git a/include/ruby/internal/has/cpp_attribute.h b/include/ruby/internal/has/cpp_attribute.h
new file mode 100644
index 0000000000..255f611d70
--- /dev/null
+++ b/include/ruby/internal/has/cpp_attribute.h
@@ -0,0 +1,87 @@
+#ifndef RBIMPL_HAS_CPP_ATTRIBUTE_H                   /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_HAS_CPP_ATTRIBUTE_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RBIMPL_HAS_CPP_ATTRIBUTE.
+ */
+#include "ruby/internal/compiler_is.h"
+#include "ruby/internal/compiler_since.h"
+#include "ruby/internal/token_paste.h"
+
+/** @cond INTERNAL_MACRO */
+#if RBIMPL_COMPILER_IS(SunPro)
+# /* Oracle Developer Studio 12.5's C++  preprocessor is reportedly broken.  We
+#  * could simulate  __has_cpp_attribute like below,  but don't know  the exact
+#  * list of which version supported which attribute.  Just kill everything for
+#  * now.  If you can please :FIXME: */
+# /* https://unicode-org.atlassian.net/browse/ICU-12893 */
+# /* https://github.com/boostorg/config/pull/95 */
+# define RBIMPL_HAS_CPP_ATTRIBUTE0(_) 0
+
+#elif defined(__has_cpp_attribute)
+# define RBIMPL_HAS_CPP_ATTRIBUTE0(_) __has_cpp_attribute(_)
+
+#elif RBIMPL_COMPILER_IS(MSVC)
+# /* MSVC has  never updated  its __cplusplus  since forever  (unless specified
+#  * explicitly by a compiler flag).   They also lack __has_cpp_attribute until
+#  * 2019.  However, they do have attributes since 2015 or so. */
+# /* https://docs.microsoft.com/en-us/cpp/overview/visual-cpp-language-conformance */
+# define RBIMPL_HAS_CPP_ATTRIBUTE0(_) RBIMPL_TOKEN_PASTE(RBIMPL_HAS_CPP_ATTRIBUTE_, _)
+# define RBIMPL_HAS_CPP_ATTRIBUTE_noreturn           200809 * RBIMPL_COMPILER_SINCE(MSVC, 19, 00, 0)
+# define RBIMPL_HAS_CPP_ATTRIBUTE_carries_dependency 200809 * RBIMPL_COMPILER_SINCE(MSVC, 19, 00, 0)
+# define RBIMPL_HAS_CPP_ATTRIBUTE_deprecated         201309 * RBIMPL_COMPILER_SINCE(MSVC, 19, 10, 0)
+# define RBIMPL_HAS_CPP_ATTRIBUTE_fallthrough        201603 * RBIMPL_COMPILER_SINCE(MSVC, 19, 10, 0)
+# define RBIMPL_HAS_CPP_ATTRIBUTE_maybe_unused       201603 * RBIMPL_COMPILER_SINCE(MSVC, 19, 11, 0)
+# define RBIMPL_HAS_CPP_ATTRIBUTE_nodiscard          201603 * RBIMPL_COMPILER_SINCE(MSVC, 19, 11, 0)
+
+#elif RBIMPL_COMPILER_BEFORE(Clang, 3, 6, 0)
+# /* Clang  3.6.0  introduced  __has_cpp_attribute.  Prior  to  that  following
+#  * attributes were already there. */
+# /* https://clang.llvm.org/cxx_status.html */
+# define RBIMPL_HAS_CPP_ATTRIBUTE0(_) RBIMPL_TOKEN_PASTE(RBIMPL_HAS_CPP_ATTRIBUTE_, _)
+# define RBIMPL_HAS_CPP_ATTRIBUTE_noreturn           200809 * RBIMPL_COMPILER_SINCE(Clang, 3, 3, 0)
+# define RBIMPL_HAS_CPP_ATTRIBUTE_deprecated         201309 * RBIMPL_COMPILER_SINCE(Clang, 3, 4, 0)
+
+#elif RBIMPL_COMPILER_BEFORE(GCC, 5, 0, 0)
+# /* GCC 5+ have __has_cpp_attribute, while 4.x had following attributes. */
+# /* https://gcc.gnu.org/projects/cxx-status.html */
+# define RBIMPL_HAS_CPP_ATTRIBUTE0(_) RBIMPL_TOKEN_PASTE(RBIMPL_HAS_CPP_ATTRIBUTE_, _)
+# define RBIMPL_HAS_CPP_ATTRIBUTE_noreturn           200809 * RBIMPL_COMPILER_SINCE(GCC, 4, 8, 0)
+# define RBIMPL_HAS_CPP_ATTRIBUTE_deprecated         201309 * RBIMPL_COMPILER_SINCE(GCC, 4, 9, 0)
+
+#else
+# /* :FIXME:
+#  * Candidate compilers to list here:
+#  * - icpc: They have __INTEL_CXX11_MODE__.
+#  */
+# define RBIMPL_HAS_CPP_ATTRIBUTE0(_) 0
+#endif
+/** @endcond */
+
+/** Wraps (or simulates) `__has_cpp_attribute`. */
+#if ! defined(__cplusplus)
+# /* Makes no sense. */
+# define RBIMPL_HAS_CPP_ATTRIBUTE(_) 0
+#else
+# /* GCC needs workarounds.  See https://gcc.godbolt.org/z/jdz3pa */
+# define RBIMPL_HAS_CPP_ATTRIBUTE(_) \
+    ((RBIMPL_HAS_CPP_ATTRIBUTE0(_) <= __cplusplus) ? RBIMPL_HAS_CPP_ATTRIBUTE0(_) : 0)
+#endif
+
+#endif /* RBIMPL_HAS_CPP_ATTRIBUTE_H */
diff --git a/include/ruby/internal/has/declspec_attribute.h b/include/ruby/internal/has/declspec_attribute.h
new file mode 100644
index 0000000000..02610338b8
--- /dev/null
+++ b/include/ruby/internal/has/declspec_attribute.h
@@ -0,0 +1,48 @@
+#ifndef RBIMPL_HAS_DECLSPEC_ATTRIBUTE_H              /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_HAS_DECLSPEC_ATTRIBUTE_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RBIMPL_HAS_DECLSPEC_ATTRIBUTE.
+ */
+#include "ruby/internal/compiler_since.h"
+#include "ruby/internal/token_paste.h"
+
+/** Wraps (or simulates) `__has_declspec_attribute`. */
+#if defined(__has_declspec_attribute)
+# define RBIMPL_HAS_DECLSPEC_ATTRIBUTE(_) __has_declspec_attribute(_)
+#else
+# define RBIMPL_HAS_DECLSPEC_ATTRIBUTE(_) RBIMPL_TOKEN_PASTE(RBIMPL_HAS_DECLSPEC_ATTRIBUTE_, _)
+# define RBIMPL_HAS_DECLSPEC_ATTRIBUTE_align       RBIMPL_COMPILER_SINCE(MSVC, 8, 0, 0)
+# define RBIMPL_HAS_DECLSPEC_ATTRIBUTE_deprecated  RBIMPL_COMPILER_SINCE(MSVC,13, 0, 0)
+# define RBIMPL_HAS_DECLSPEC_ATTRIBUTE_dllexport   RBIMPL_COMPILER_SINCE(MSVC, 8, 0, 0)
+# define RBIMPL_HAS_DECLSPEC_ATTRIBUTE_dllimport   RBIMPL_COMPILER_SINCE(MSVC, 8, 0, 0)
+# define RBIMPL_HAS_DECLSPEC_ATTRIBUTE_empty_bases RBIMPL_COMPILER_SINCE(MSVC,19, 0, 23918)
+# define RBIMPL_HAS_DECLSPEC_ATTRIBUTE_noalias     RBIMPL_COMPILER_SINCE(MSVC, 8, 0, 0)
+# define RBIMPL_HAS_DECLSPEC_ATTRIBUTE_noinline    RBIMPL_COMPILER_SINCE(MSVC,13, 0, 0)
+# define RBIMPL_HAS_DECLSPEC_ATTRIBUTE_noreturn    RBIMPL_COMPILER_SINCE(MSVC,11, 0, 0)
+# define RBIMPL_HAS_DECLSPEC_ATTRIBUTE_nothrow     RBIMPL_COMPILER_SINCE(MSVC, 8, 0, 0)
+# define RBIMPL_HAS_DECLSPEC_ATTRIBUTE_restrict    RBIMPL_COMPILER_SINCE(MSVC,14, 0, 0)
+# /* Note that "8, 0, 0" might be inaccurate. */
+# if ! defined(__cplusplus)
+#  /* Clang has this in both C/C++, but MSVC has this in C++ only.*/
+#  undef RBIMPL_HAS_DECLSPEC_ATTRIBUTE_nothrow
+# endif
+#endif
+
+#endif /* RBIMPL_HAS_DECLSPEC_ATTRIBUTE_H */
diff --git a/include/ruby/internal/has/extension.h b/include/ruby/internal/has/extension.h
new file mode 100644
index 0000000000..9ceb365ab9
--- /dev/null
+++ b/include/ruby/internal/has/extension.h
@@ -0,0 +1,33 @@
+#ifndef RBIMPL_HAS_EXTENSION_H                       /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_HAS_EXTENSION_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RBIMPL_HAS_EXTENSION.
+ */
+#include "ruby/internal/has/feature.h"
+
+/** Wraps (or simulates) `__has_extension`. */
+#if defined(__has_extension)
+# define RBIMPL_HAS_EXTENSION(_) __has_extension(_)
+#else
+# /* Pre-3.0 clang had __has_feature but not __has_extension. */
+# define RBIMPL_HAS_EXTENSION(_) RBIMPL_HAS_FEATURE(_)
+#endif
+
+#endif /* RBIMPL_HAS_EXTENSION_H */
diff --git a/include/ruby/internal/has/feature.h b/include/ruby/internal/has/feature.h
new file mode 100644
index 0000000000..b827590c00
--- /dev/null
+++ b/include/ruby/internal/has/feature.h
@@ -0,0 +1,31 @@
+#ifndef RBIMPL_HAS_FEATURE_H                         /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_HAS_FEATURE_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RBIMPL_HAS_FEATURE.
+ */
+
+/** Wraps (or simulates) `__has_feature`. */
+#if defined(__has_feature)
+# define RBIMPL_HAS_FEATURE(_) __has_feature(_)
+#else
+# define RBIMPL_HAS_FEATURE(_) 0
+#endif
+
+#endif /* RBIMPL_HAS_FEATURE_H */
diff --git a/include/ruby/internal/has/warning.h b/include/ruby/internal/has/warning.h
new file mode 100644
index 0000000000..03975ecc2f
--- /dev/null
+++ b/include/ruby/internal/has/warning.h
@@ -0,0 +1,31 @@
+#ifndef RBIMPL_HAS_WARNING_H                         /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_HAS_WARNING_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RBIMPL_HAS_WARNING.
+ */
+
+/** Wraps (or simulates) `__has_warning`. */
+#if defined(__has_warning)
+# define RBIMPL_HAS_WARNING(_) __has_warning(_)
+#else
+# define RBIMPL_HAS_WARNING(_) 0
+#endif
+
+#endif /* RBIMPL_HAS_WARNING_H */
diff --git a/include/ruby/internal/intern/array.h b/include/ruby/internal/intern/array.h
new file mode 100644
index 0000000000..aafe0d1350
--- /dev/null
+++ b/include/ruby/internal/intern/array.h
@@ -0,0 +1,78 @@
+#ifndef RBIMPL_INTERN_ARRAY_H                        /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_INTERN_ARRAY_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Public APIs related to ::rb_cArray.
+ */
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+/* array.c */
+void rb_mem_clear(VALUE*, long);
+VALUE rb_assoc_new(VALUE, VALUE);
+VALUE rb_check_array_type(VALUE);
+VALUE rb_ary_new(void);
+VALUE rb_ary_new_capa(long capa);
+VALUE rb_ary_new_from_args(long n, ...);
+VALUE rb_ary_new_from_values(long n, const VALUE *elts);
+VALUE rb_ary_tmp_new(long);
+void rb_ary_free(VALUE);
+void rb_ary_modify(VALUE);
+VALUE rb_ary_freeze(VALUE);
+VALUE rb_ary_shared_with_p(VALUE, VALUE);
+VALUE rb_ary_aref(int, const VALUE*, VALUE);
+VALUE rb_ary_subseq(VALUE, long, long);
+void rb_ary_store(VALUE, long, VALUE);
+VALUE rb_ary_dup(VALUE);
+VALUE rb_ary_resurrect(VALUE ary);
+VALUE rb_ary_to_ary(VALUE);
+VALUE rb_ary_to_s(VALUE);
+VALUE rb_ary_cat(VALUE, const VALUE *, long);
+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_reverse(VALUE);
+VALUE rb_ary_rotate(VALUE, long);
+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, const VALUE*, VALUE(*)(VALUE,long));
+VALUE rb_ary_resize(VALUE ary, long len);
+#define rb_ary_new2 rb_ary_new_capa
+#define rb_ary_new3 rb_ary_new_from_args
+#define rb_ary_new4 rb_ary_new_from_values
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_INTERN_ARRAY_H */
diff --git a/include/ruby/internal/intern/bignum.h b/include/ruby/internal/intern/bignum.h
new file mode 100644
index 0000000000..1ac92e9c90
--- /dev/null
+++ b/include/ruby/internal/intern/bignum.h
@@ -0,0 +1,105 @@
+#ifndef RBIMPL_INTERN_BIGNUM_H                       /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_INTERN_BIGNUM_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Public APIs related to so-called rb_cBignum.
+ */
+#include "ruby/internal/config.h"
+
+#ifdef STDC_HEADERS
+# include <stddef.h>
+#endif
+
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+#include "ruby/backward/2/long_long.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+/* bignum.c */
+VALUE rb_big_new(size_t, int);
+int rb_bigzero_p(VALUE x);
+VALUE rb_big_clone(VALUE);
+void rb_big_2comp(VALUE);
+VALUE rb_big_norm(VALUE);
+void rb_big_resize(VALUE big, size_t len);
+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);
+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
+LONG_LONG rb_big2ll(VALUE);
+unsigned LONG_LONG rb_big2ull(VALUE);
+#endif  /* HAVE_LONG_LONG */
+void rb_big_pack(VALUE val, unsigned long *buf, long num_longs);
+VALUE rb_big_unpack(unsigned long *buf, long num_longs);
+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_eql(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_idiv(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);
+
+/* For rb_integer_pack and rb_integer_unpack: */
+/* "MS" in MSWORD and MSBYTE means "most significant" */
+/* "LS" in LSWORD and LSBYTE means "least significant" */
+#define INTEGER_PACK_MSWORD_FIRST       0x01
+#define INTEGER_PACK_LSWORD_FIRST       0x02
+#define INTEGER_PACK_MSBYTE_FIRST       0x10
+#define INTEGER_PACK_LSBYTE_FIRST       0x20
+#define INTEGER_PACK_NATIVE_BYTE_ORDER  0x40
+#define INTEGER_PACK_2COMP              0x80
+#define INTEGER_PACK_FORCE_GENERIC_IMPLEMENTATION     0x400
+/* For rb_integer_unpack: */
+#define INTEGER_PACK_FORCE_BIGNUM       0x100
+#define INTEGER_PACK_NEGATIVE           0x200
+/* Combinations: */
+#define INTEGER_PACK_LITTLE_ENDIAN \
+    (INTEGER_PACK_LSWORD_FIRST | \
+     INTEGER_PACK_LSBYTE_FIRST)
+#define INTEGER_PACK_BIG_ENDIAN \
+    (INTEGER_PACK_MSWORD_FIRST | \
+     INTEGER_PACK_MSBYTE_FIRST)
+int rb_integer_pack(VALUE val, void *words, size_t numwords, size_t wordsize, size_t nails, int flags);
+VALUE rb_integer_unpack(const void *words, size_t numwords, size_t wordsize, size_t nails, int flags);
+size_t rb_absint_size(VALUE val, int *nlz_bits_ret);
+size_t rb_absint_numwords(VALUE val, size_t word_numbits, size_t *nlz_bits_ret);
+int rb_absint_singlebit_p(VALUE val);
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_INTERN_BIGNUM_H */
diff --git a/include/ruby/internal/intern/class.h b/include/ruby/internal/intern/class.h
new file mode 100644
index 0000000000..d3be80d283
--- /dev/null
+++ b/include/ruby/internal/intern/class.h
@@ -0,0 +1,57 @@
+#ifndef RBIMPL_INTERN_CLASS_H                        /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_INTERN_CLASS_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Public APIs related to ::rb_cClass/::rb_cModule.
+ */
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+#include "ruby/backward/2/stdarg.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+/* class.c */
+VALUE rb_class_new(VALUE);
+VALUE rb_mod_init_copy(VALUE, VALUE);
+VALUE rb_singleton_class_clone(VALUE);
+void rb_singleton_class_attached(VALUE,VALUE);
+void rb_check_inheritable(VALUE);
+VALUE rb_define_class_id(ID, VALUE);
+VALUE rb_define_class_id_under(VALUE, ID, VALUE);
+VALUE rb_module_new(void);
+VALUE rb_define_module_id(ID);
+VALUE rb_define_module_id_under(VALUE, 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, const VALUE*, VALUE);
+VALUE rb_class_public_instance_methods(int, const VALUE*, VALUE);
+VALUE rb_class_protected_instance_methods(int, const VALUE*, VALUE);
+VALUE rb_class_private_instance_methods(int, const VALUE*, VALUE);
+VALUE rb_obj_singleton_methods(int, const VALUE*, VALUE);
+void rb_define_method_id(VALUE, ID, VALUE (*)(ANYARGS), int);
+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);
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_INTERN_CLASS_H */
diff --git a/include/ruby/internal/intern/compar.h b/include/ruby/internal/intern/compar.h
new file mode 100644
index 0000000000..d226ca37b1
--- /dev/null
+++ b/include/ruby/internal/intern/compar.h
@@ -0,0 +1,34 @@
+#ifndef  RBIMPL_INTERN_COMPAR_H                      /*-*-C++-*-vi:se ft=cpp:*/
+#define  RBIMPL_INTERN_COMPAR_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Public APIs related to ::rb_mComparable.
+ */
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+/* compar.c */
+int rb_cmpint(VALUE, VALUE, VALUE);
+NORETURN(void rb_cmperr(VALUE, VALUE));
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_INTERN_COMPAR_H */
diff --git a/include/ruby/internal/intern/complex.h b/include/ruby/internal/intern/complex.h
new file mode 100644
index 0000000000..70343221f6
--- /dev/null
+++ b/include/ruby/internal/intern/complex.h
@@ -0,0 +1,60 @@
+#ifndef RBIMPL_INTERN_COMPLEX_H                      /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_INTERN_COMPLEX_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Public APIs related to ::rb_cComplex.
+ */
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+#include "ruby/internal/arithmetic/long.h" /* INT2FIX is here. */
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+/* 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_new_polar(VALUE abs, VALUE arg);
+DEPRECATED_BY(rb_complex_new_polar, VALUE rb_complex_polar(VALUE abs, VALUE arg));
+VALUE rb_complex_real(VALUE z);
+VALUE rb_complex_imag(VALUE z);
+VALUE rb_complex_plus(VALUE x, VALUE y);
+VALUE rb_complex_minus(VALUE x, VALUE y);
+VALUE rb_complex_mul(VALUE x, VALUE y);
+VALUE rb_complex_div(VALUE x, VALUE y);
+VALUE rb_complex_uminus(VALUE z);
+VALUE rb_complex_conjugate(VALUE z);
+VALUE rb_complex_abs(VALUE z);
+VALUE rb_complex_arg(VALUE z);
+VALUE rb_complex_pow(VALUE base, VALUE exp);
+VALUE rb_dbl_complex_new(double real, double imag);
+#define rb_complex_add rb_complex_plus
+#define rb_complex_sub rb_complex_minus
+#define rb_complex_nagate rb_complex_uminus
+
+VALUE rb_Complex(VALUE, VALUE);
+#define rb_Complex1(x) rb_Complex((x), INT2FIX(0))
+#define rb_Complex2(x,y) rb_Complex((x), (y))
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_INTERN_COMPLEX_H */
diff --git a/include/ruby/internal/intern/cont.h b/include/ruby/internal/intern/cont.h
new file mode 100644
index 0000000000..cfa5630af2
--- /dev/null
+++ b/include/ruby/internal/intern/cont.h
@@ -0,0 +1,41 @@
+#ifndef  RBIMPL_INTERN_CONT_H                        /*-*-C++-*-vi:se ft=cpp:*/
+#define  RBIMPL_INTERN_CONT_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Public APIs related to rb_cFiber.
+ */
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+#include "ruby/internal/iterator.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+/* cont.c */
+VALUE rb_fiber_new(rb_block_call_func_t, VALUE);
+VALUE rb_fiber_new_kw(rb_block_call_func_t, VALUE, int kw_splat);
+VALUE rb_fiber_resume(VALUE fib, int argc, const VALUE *argv);
+VALUE rb_fiber_resume_kw(VALUE fib, int argc, const VALUE *argv, int kw_splat);
+VALUE rb_fiber_yield(int argc, const VALUE *argv);
+VALUE rb_fiber_yield_kw(int argc, const VALUE *argv, int kw_splat);
+VALUE rb_fiber_current(void);
+VALUE rb_fiber_alive_p(VALUE);
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_INTERN_CONT_H */
diff --git a/include/ruby/internal/intern/dir.h b/include/ruby/internal/intern/dir.h
new file mode 100644
index 0000000000..936f4e1f36
--- /dev/null
+++ b/include/ruby/internal/intern/dir.h
@@ -0,0 +1,33 @@
+#ifndef RBIMPL_INTERN_DIR_H                          /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_INTERN_DIR_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Public APIs related to ::rb_cDir.
+ */
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+/* dir.c */
+VALUE rb_dir_getwd(void);
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_INTERN_DIR_H */
diff --git a/include/ruby/internal/intern/enum.h b/include/ruby/internal/intern/enum.h
new file mode 100644
index 0000000000..17c20c1c0a
--- /dev/null
+++ b/include/ruby/internal/intern/enum.h
@@ -0,0 +1,33 @@
+#ifndef RBIMPL_INTERN_ENUM_H                         /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_INTERN_ENUM_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Public APIs related to ::rb_mEnumerable.
+ */
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+/* enum.c */
+VALUE rb_enum_values_pack(int, const VALUE*);
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_INTERN_ENUM_H */
diff --git a/include/ruby/internal/intern/enumerator.h b/include/ruby/internal/intern/enumerator.h
new file mode 100644
index 0000000000..c81485155c
--- /dev/null
+++ b/include/ruby/internal/intern/enumerator.h
@@ -0,0 +1,80 @@
+#ifndef RBIMPL_INTERN_ENUMERATOR_H                   /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_INTERN_ENUMERATOR_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Public APIs related to ::rb_cEnumerator.
+ */
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/intern/eval.h" /* rb_frame_this_func */
+#include "ruby/internal/iterator.h"    /* rb_block_given_p */
+#include "ruby/internal/symbol.h"
+#include "ruby/internal/value.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+typedef VALUE rb_enumerator_size_func(VALUE, VALUE, VALUE);
+
+typedef struct {
+    VALUE begin;
+    VALUE end;
+    VALUE step;
+    int exclude_end;
+} rb_arithmetic_sequence_components_t;
+
+/* enumerator.c */
+VALUE rb_enumeratorize(VALUE, VALUE, int, const VALUE *);
+VALUE rb_enumeratorize_with_size(VALUE, VALUE, int, const VALUE *, rb_enumerator_size_func *);
+VALUE rb_enumeratorize_with_size_kw(VALUE, VALUE, int, const VALUE *, rb_enumerator_size_func *, int);
+int rb_arithmetic_sequence_extract(VALUE, rb_arithmetic_sequence_components_t *);
+VALUE rb_arithmetic_sequence_beg_len_step(VALUE, long *begp, long *lenp, long *stepp, long len, int err);
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#ifndef RUBY_EXPORT
+# define rb_enumeratorize_with_size(obj, id, argc, argv, size_fn) \
+    rb_enumeratorize_with_size(obj, id, argc, argv, (rb_enumerator_size_func *)(size_fn))
+# define rb_enumeratorize_with_size_kw(obj, id, argc, argv, size_fn, kw_splat) \
+    rb_enumeratorize_with_size_kw(obj, id, argc, argv, (rb_enumerator_size_func *)(size_fn), kw_splat)
+#endif
+
+#define SIZED_ENUMERATOR(obj, argc, argv, size_fn)                  \
+    rb_enumeratorize_with_size((obj), ID2SYM(rb_frame_this_func()), \
+                               (argc), (argv), (size_fn))
+
+#define SIZED_ENUMERATOR_KW(obj, argc, argv, size_fn, kw_splat)        \
+    rb_enumeratorize_with_size_kw((obj), ID2SYM(rb_frame_this_func()), \
+                                  (argc), (argv), (size_fn), (kw_splat))
+
+#define RETURN_SIZED_ENUMERATOR(obj, argc, argv, size_fn) do {          \
+        if (!rb_block_given_p())                                        \
+            return SIZED_ENUMERATOR(obj, argc, argv, size_fn);          \
+    } while (0)
+
+#define RETURN_SIZED_ENUMERATOR_KW(obj, argc, argv, size_fn, kw_splat) do { \
+        if (!rb_block_given_p())                                            \
+            return SIZED_ENUMERATOR_KW(obj, argc, argv, size_fn, kw_splat);              \
+    } while (0)
+
+#define RETURN_ENUMERATOR(obj, argc, argv) \
+    RETURN_SIZED_ENUMERATOR(obj, argc, argv, 0)
+
+#define RETURN_ENUMERATOR_KW(obj, argc, argv, kw_splat) \
+    RETURN_SIZED_ENUMERATOR_KW(obj, argc, argv, 0, kw_splat)
+
+#endif /* RBIMPL_INTERN_ENUMERATOR_H */
diff --git a/include/ruby/internal/intern/error.h b/include/ruby/internal/intern/error.h
new file mode 100644
index 0000000000..aa9fe2daba
--- /dev/null
+++ b/include/ruby/internal/intern/error.h
@@ -0,0 +1,82 @@
+#ifndef RBIMPL_INTERN_ERROR_H                        /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_INTERN_ERROR_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Public APIs related to ::rb_eException.
+ */
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+#include "ruby/internal/fl_type.h"
+#include "ruby/backward/2/assume.h"
+#include "ruby/backward/2/attributes.h"
+
+#define UNLIMITED_ARGUMENTS     (-1)
+#define rb_exc_new2             rb_exc_new_cstr
+#define rb_exc_new3             rb_exc_new_str
+#define rb_check_trusted        rb_check_trusted
+#define rb_check_trusted_inline rb_check_trusted
+#define rb_check_arity          rb_check_arity
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+/* error.c */
+VALUE rb_exc_new(VALUE, const char*, long);
+VALUE rb_exc_new_cstr(VALUE, const char*);
+VALUE rb_exc_new_str(VALUE, VALUE);
+PRINTF_ARGS(NORETURN(void rb_loaderror(const char*, ...)), 1, 2);
+PRINTF_ARGS(NORETURN(void rb_loaderror_with_path(VALUE path, const char*, ...)), 2, 3);
+PRINTF_ARGS(NORETURN(void rb_name_error(ID, const char*, ...)), 2, 3);
+PRINTF_ARGS(NORETURN(void rb_name_error_str(VALUE, const char*, ...)), 2, 3);
+PRINTF_ARGS(NORETURN(void rb_frozen_error_raise(VALUE, const char*, ...)), 2, 3);
+NORETURN(void rb_invalid_str(const char*, const char*));
+NORETURN(void rb_error_frozen(const char*));
+NORETURN(void rb_error_frozen_object(VALUE));
+void rb_error_untrusted(VALUE);
+void rb_check_frozen(VALUE);
+void rb_check_trusted(VALUE);
+void rb_check_copyable(VALUE obj, VALUE orig);
+NORETURN(MJIT_STATIC void rb_error_arity(int, int, int));
+RBIMPL_SYMBOL_EXPORT_END()
+
+/* Does anyone use this?  Remain not deleted for compatibility. */
+#define rb_check_frozen_internal(obj) do { \
+        VALUE frozen_obj = (obj); \
+        if (RB_UNLIKELY(RB_OBJ_FROZEN(frozen_obj))) { \
+            rb_error_frozen_object(frozen_obj); \
+        } \
+    } while (0)
+
+static inline void
+rb_check_frozen_inline(VALUE obj)
+{
+    if (RB_UNLIKELY(RB_OBJ_FROZEN(obj))) {
+        rb_error_frozen_object(obj);
+    }
+}
+#define rb_check_frozen rb_check_frozen_inline
+
+static inline int
+rb_check_arity(int argc, int min, int max)
+{
+    if ((argc < min) || (max != UNLIMITED_ARGUMENTS && argc > max))
+        rb_error_arity(argc, min, max);
+    return argc;
+}
+
+#endif /* RBIMPL_INTERN_ERROR_H */
diff --git a/include/ruby/internal/intern/eval.h b/include/ruby/internal/intern/eval.h
new file mode 100644
index 0000000000..11957053d7
--- /dev/null
+++ b/include/ruby/internal/intern/eval.h
@@ -0,0 +1,59 @@
+#ifndef  RBIMPL_INTERN_EVAL_H                        /*-*-C++-*-vi:se ft=cpp:*/
+#define  RBIMPL_INTERN_EVAL_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Pre-1.9 era evaluator APIs (now considered miscellaneous).
+ */
+#include "ruby/internal/attr/noreturn.h"
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+/* eval.c */
+RBIMPL_ATTR_NORETURN()
+void rb_exc_raise(VALUE);
+
+RBIMPL_ATTR_NORETURN()
+void rb_exc_fatal(VALUE);
+
+RBIMPL_ATTR_NORETURN()
+VALUE rb_f_exit(int, const VALUE*);
+
+RBIMPL_ATTR_NORETURN()
+VALUE rb_f_abort(int, const VALUE*);
+
+RBIMPL_ATTR_NORETURN()
+void rb_interrupt(void);
+ID rb_frame_this_func(void);
+
+RBIMPL_ATTR_NORETURN()
+void rb_jump_tag(int);
+void rb_obj_call_init(VALUE, int, const VALUE*);
+void rb_obj_call_init_kw(VALUE, int, const VALUE*, int);
+VALUE rb_protect(VALUE (*)(VALUE), VALUE, int*);
+ID rb_frame_callee(void);
+VALUE rb_make_exception(int, const VALUE*);
+
+/* eval_jump.c */
+void rb_set_end_proc(void (*)(VALUE), VALUE);
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_INTERN_EVAL_H */
diff --git a/include/ruby/internal/intern/file.h b/include/ruby/internal/intern/file.h
new file mode 100644
index 0000000000..9ebefece66
--- /dev/null
+++ b/include/ruby/internal/intern/file.h
@@ -0,0 +1,42 @@
+#ifndef RBIMPL_INTERN_FILE_H                         /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_INTERN_FILE_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Public APIs related to ::rb_cFile.
+ */
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+/* file.c */
+VALUE rb_file_s_expand_path(int, const VALUE *);
+VALUE rb_file_expand_path(VALUE, VALUE);
+VALUE rb_file_s_absolute_path(int, const VALUE *);
+VALUE rb_file_absolute_path(VALUE, VALUE);
+VALUE rb_file_dirname(VALUE fname);
+int rb_find_file_ext(VALUE*, const char* const*);
+VALUE rb_find_file(VALUE);
+VALUE rb_file_directory_p(VALUE,VALUE);
+VALUE rb_str_encode_ospath(VALUE);
+int rb_is_absolute_path(const char *);
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_INTERN_FILE_H */
diff --git a/include/ruby/internal/intern/gc.h b/include/ruby/internal/intern/gc.h
new file mode 100644
index 0000000000..30759e0ded
--- /dev/null
+++ b/include/ruby/internal/intern/gc.h
@@ -0,0 +1,57 @@
+#ifndef RBIMPL_INTERN_GC_H                           /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_INTERN_GC_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Public APIs related to ::rb_mGC.
+ */
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+#include "ruby/backward/2/attributes.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+/* gc.c */
+COLDFUNC NORETURN(void rb_memerror(void));
+PUREFUNC(int rb_during_gc(void));
+void rb_gc_mark_locations(const VALUE*, const VALUE*);
+void rb_mark_tbl(struct st_table*);
+void rb_mark_tbl_no_pin(struct st_table*);
+void rb_mark_set(struct st_table*);
+void rb_mark_hash(struct st_table*);
+void rb_gc_update_tbl_refs(st_table *ptr);
+void rb_gc_mark_maybe(VALUE);
+void rb_gc_mark(VALUE);
+void rb_gc_mark_movable(VALUE);
+VALUE rb_gc_location(VALUE);
+void rb_gc_force_recycle(VALUE);
+void rb_gc(void);
+void rb_gc_copy_finalizer(VALUE,VALUE);
+VALUE rb_gc_enable(void);
+VALUE rb_gc_disable(void);
+VALUE rb_gc_start(void);
+VALUE rb_define_finalizer(VALUE, VALUE);
+VALUE rb_undefine_finalizer(VALUE);
+size_t rb_gc_count(void);
+size_t rb_gc_stat(VALUE);
+VALUE rb_gc_latest_gc_info(VALUE);
+void rb_gc_adjust_memory_usage(ssize_t);
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_INTERN_GC_H */
diff --git a/include/ruby/internal/intern/hash.h b/include/ruby/internal/intern/hash.h
new file mode 100644
index 0000000000..c7a27c2cfa
--- /dev/null
+++ b/include/ruby/internal/intern/hash.h
@@ -0,0 +1,59 @@
+#ifndef RBIMPL_INTERN_HASH_H                         /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_INTERN_HASH_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Public APIs related to ::rb_cHash.
+ */
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+#include "ruby/st.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+/* hash.c */
+void rb_st_foreach_safe(struct st_table *, int (*)(st_data_t, st_data_t, st_data_t), st_data_t);
+#define st_foreach_safe rb_st_foreach_safe
+VALUE rb_check_hash_type(VALUE);
+void rb_hash_foreach(VALUE, int (*)(VALUE, VALUE, VALUE), 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_lookup2(VALUE, VALUE, VALUE);
+VALUE rb_hash_fetch(VALUE, VALUE);
+VALUE rb_hash_aset(VALUE, VALUE, VALUE);
+VALUE rb_hash_clear(VALUE);
+VALUE rb_hash_delete_if(VALUE);
+VALUE rb_hash_delete(VALUE,VALUE);
+VALUE rb_hash_set_ifnone(VALUE hash, VALUE ifnone);
+void rb_hash_bulk_insert(long, const VALUE *, VALUE);
+typedef VALUE rb_hash_update_func(VALUE newkey, VALUE oldkey, VALUE value);
+VALUE rb_hash_update_by(VALUE hash1, VALUE hash2, rb_hash_update_func *func);
+struct st_table *rb_hash_tbl(VALUE, const char *file, int line);
+int rb_path_check(const char*);
+int rb_env_path_tainted(void);
+VALUE rb_env_clear(void);
+VALUE rb_hash_size(VALUE);
+void rb_hash_free(VALUE);
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_INTERN_HASH_H */
diff --git a/include/ruby/internal/intern/io.h b/include/ruby/internal/intern/io.h
new file mode 100644
index 0000000000..d2f2e53486
--- /dev/null
+++ b/include/ruby/internal/intern/io.h
@@ -0,0 +1,70 @@
+#ifndef RBIMPL_INTERN_IO_H                           /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_INTERN_IO_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Public APIs related to ::rb_cIO.
+ */
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+/* 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_ungetbyte(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_ascii8bit_binmode(VALUE);
+VALUE rb_io_addstr(VALUE, VALUE);
+VALUE rb_io_printf(int, const VALUE*, VALUE);
+VALUE rb_io_print(int, const VALUE*, VALUE);
+VALUE rb_io_puts(int, const VALUE*, VALUE);
+VALUE rb_io_fdopen(int, int, const char*);
+VALUE rb_io_get_io(VALUE);
+VALUE rb_file_open(const char*, const char*);
+VALUE rb_file_open_str(VALUE, const char*);
+VALUE rb_gets(void);
+void rb_write_error(const char*);
+void rb_write_error2(const char*, long);
+void rb_close_before_exec(int lowfd, int maxhint, VALUE noclose_fds);
+int rb_pipe(int *pipes);
+int rb_reserved_fd_p(int fd);
+int rb_cloexec_open(const char *pathname, int flags, mode_t mode);
+int rb_cloexec_dup(int oldfd);
+int rb_cloexec_dup2(int oldfd, int newfd);
+int rb_cloexec_pipe(int fildes[2]);
+int rb_cloexec_fcntl_dupfd(int fd, int minfd);
+#define RB_RESERVED_FD_P(fd) rb_reserved_fd_p(fd)
+void rb_update_max_fd(int fd);
+void rb_fd_fix_cloexec(int fd);
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_INTERN_IO_H */
diff --git a/include/ruby/internal/intern/load.h b/include/ruby/internal/intern/load.h
new file mode 100644
index 0000000000..2cc5be0ebe
--- /dev/null
+++ b/include/ruby/internal/intern/load.h
@@ -0,0 +1,44 @@
+#ifndef  RBIMPL_INTERN_LOAD_H                        /*-*-C++-*-vi:se ft=cpp:*/
+#define  RBIMPL_INTERN_LOAD_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Public APIs related to ::rb_f_require().
+ */
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+/* load.c */
+void rb_load(VALUE, int);
+void rb_load_protect(VALUE, int, int*);
+int rb_provided(const char*);
+int rb_feature_provided(const char *, const char **);
+void rb_provide(const char*);
+VALUE rb_f_require(VALUE, VALUE);
+VALUE rb_require_string(VALUE);
+
+// extension configuration
+void rb_ext_ractor_safe(bool flag);
+#define RB_EXT_RACTOR_SAFE(f) rb_ext_ractor_safe(f)
+#define HAVE_RB_EXT_RACTOR_SAFE 1
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_INTERN_LOAD_H */
diff --git a/include/ruby/internal/intern/marshal.h b/include/ruby/internal/intern/marshal.h
new file mode 100644
index 0000000000..6b0243244e
--- /dev/null
+++ b/include/ruby/internal/intern/marshal.h
@@ -0,0 +1,35 @@
+#ifndef RBIMPL_INTERN_MARSHAL_H                      /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_INTERN_MARSHAL_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Public APIs related to rb_mMarshal.
+ */
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+/* 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));
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_INTERN_MARSHAL_H */
diff --git a/include/ruby/internal/intern/numeric.h b/include/ruby/internal/intern/numeric.h
new file mode 100644
index 0000000000..effc583756
--- /dev/null
+++ b/include/ruby/internal/intern/numeric.h
@@ -0,0 +1,42 @@
+#ifndef RBIMPL_INTERN_NUMERIC_H                      /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_INTERN_NUMERIC_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Public APIs related to ::rb_cNumeric.
+ */
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+#include "ruby/backward/2/attributes.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+/* numeric.c */
+NORETURN(void rb_num_zerodiv(void));
+#define RB_NUM_COERCE_FUNCS_NEED_OPID 1
+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_num_coerce_bit(VALUE, VALUE, ID);
+VALUE rb_num2fix(VALUE);
+VALUE rb_fix2str(VALUE, int);
+CONSTFUNC(VALUE rb_dbl_cmp(double, double));
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_INTERN_NUMERIC_H */
diff --git a/include/ruby/internal/intern/object.h b/include/ruby/internal/intern/object.h
new file mode 100644
index 0000000000..d55178584b
--- /dev/null
+++ b/include/ruby/internal/intern/object.h
@@ -0,0 +1,90 @@
+#ifndef RBIMPL_INTERN_OBJECT_H                       /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_INTERN_OBJECT_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Public APIs related to ::rb_cObject.
+ */
+#include "ruby/internal/attr/pure.h"
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+#define RB_OBJ_INIT_COPY(obj, orig) \
+    ((obj) != (orig) && (rb_obj_init_copy((obj), (orig)), 1))
+#define OBJ_INIT_COPY(obj, orig) RB_OBJ_INIT_COPY(obj, orig)
+
+VALUE rb_class_new_instance_pass_kw(int, const VALUE *, VALUE);
+VALUE rb_class_new_instance(int, const VALUE*, VALUE);
+VALUE rb_class_new_instance_kw(int, const VALUE*, VALUE, int);
+
+/* 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);
+
+RBIMPL_ATTR_PURE()
+VALUE rb_obj_tainted(VALUE);
+VALUE rb_obj_untaint(VALUE);
+VALUE rb_obj_untrust(VALUE);
+
+RBIMPL_ATTR_PURE()
+VALUE rb_obj_untrusted(VALUE);
+VALUE rb_obj_trust(VALUE);
+VALUE rb_obj_freeze(VALUE);
+
+RBIMPL_ATTR_PURE()
+VALUE rb_obj_frozen_p(VALUE);
+
+VALUE rb_obj_id(VALUE);
+VALUE rb_memory_id(VALUE);
+VALUE rb_obj_class(VALUE);
+
+RBIMPL_ATTR_PURE()
+VALUE rb_class_real(VALUE);
+
+RBIMPL_ATTR_PURE()
+VALUE rb_class_inherited_p(VALUE, VALUE);
+VALUE rb_class_superclass(VALUE);
+VALUE rb_class_get_superclass(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_check_to_float(VALUE);
+VALUE rb_to_int(VALUE);
+VALUE rb_check_to_int(VALUE);
+VALUE rb_Integer(VALUE);
+VALUE rb_to_float(VALUE);
+VALUE rb_Float(VALUE);
+VALUE rb_String(VALUE);
+VALUE rb_Array(VALUE);
+VALUE rb_Hash(VALUE);
+double rb_cstr_to_dbl(const char*, int);
+double rb_str_to_dbl(VALUE, int);
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_INTERN_OBJECT_H */
diff --git a/include/ruby/internal/intern/parse.h b/include/ruby/internal/intern/parse.h
new file mode 100644
index 0000000000..4a5b8cb147
--- /dev/null
+++ b/include/ruby/internal/intern/parse.h
@@ -0,0 +1,64 @@
+#ifndef RBIMPL_INTERN_PARSE_H                        /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_INTERN_PARSE_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Public APIs related to ::rb_cSymbol.
+ */
+#include "ruby/internal/attr/const.h"
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+/* parse.y */
+ID rb_id_attrset(ID);
+
+RBIMPL_ATTR_CONST()
+int rb_is_const_id(ID);
+
+RBIMPL_ATTR_CONST()
+int rb_is_global_id(ID);
+
+RBIMPL_ATTR_CONST()
+int rb_is_instance_id(ID);
+
+RBIMPL_ATTR_CONST()
+int rb_is_attrset_id(ID);
+
+RBIMPL_ATTR_CONST()
+int rb_is_class_id(ID);
+
+RBIMPL_ATTR_CONST()
+int rb_is_local_id(ID);
+
+RBIMPL_ATTR_CONST()
+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);
+
+/* symbol.c */
+VALUE rb_sym_all_symbols(void);
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_INTERN_PARSE_H */
diff --git a/include/ruby/internal/intern/proc.h b/include/ruby/internal/intern/proc.h
new file mode 100644
index 0000000000..d6f77cbd4d
--- /dev/null
+++ b/include/ruby/internal/intern/proc.h
@@ -0,0 +1,53 @@
+#ifndef RBIMPL_INTERN_PROC_H                         /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_INTERN_PROC_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Public APIs related to ::rb_cProc.
+ */
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/iterator.h"
+#include "ruby/internal/value.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+/* proc.c */
+VALUE rb_block_proc(void);
+VALUE rb_block_lambda(void);
+VALUE rb_proc_new(rb_block_call_func_t, VALUE);
+VALUE rb_obj_is_proc(VALUE);
+VALUE rb_proc_call(VALUE, VALUE);
+VALUE rb_proc_call_kw(VALUE, VALUE, int);
+VALUE rb_proc_call_with_block(VALUE, int argc, const VALUE *argv, VALUE);
+VALUE rb_proc_call_with_block_kw(VALUE, int argc, const VALUE *argv, VALUE, int);
+int rb_proc_arity(VALUE);
+VALUE rb_proc_lambda_p(VALUE);
+VALUE rb_binding_new(void);
+VALUE rb_obj_method(VALUE, VALUE);
+VALUE rb_obj_is_method(VALUE);
+VALUE rb_method_call(int, const VALUE*, VALUE);
+VALUE rb_method_call_kw(int, const VALUE*, VALUE, int);
+VALUE rb_method_call_with_block(int, const VALUE *, VALUE, VALUE);
+VALUE rb_method_call_with_block_kw(int, const VALUE *, VALUE, VALUE, int);
+int rb_mod_method_arity(VALUE, ID);
+int rb_obj_method_arity(VALUE, ID);
+VALUE rb_protect(VALUE (*)(VALUE), VALUE, int*);
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_INTERN_PROC_H */
diff --git a/include/ruby/internal/intern/process.h b/include/ruby/internal/intern/process.h
new file mode 100644
index 0000000000..2b1005a205
--- /dev/null
+++ b/include/ruby/internal/intern/process.h
@@ -0,0 +1,46 @@
+#ifndef RBIMPL_INTERN_PROCESS_H                      /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_INTERN_PROCESS_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Public APIs related to ::rb_mProcess.
+ */
+#include "ruby/internal/attr/noreturn.h"
+#include "ruby/internal/config.h"      /* rb_pid_t is defined here. */
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+/* process.c */
+void rb_last_status_set(int status, rb_pid_t pid);
+VALUE rb_last_status_get(void);
+int rb_proc_exec(const char*);
+
+RBIMPL_ATTR_NORETURN()
+VALUE rb_f_exec(int, const 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, const VALUE*);
+rb_pid_t rb_spawn_err(int, const VALUE*, char*, size_t);
+VALUE rb_proc_times(VALUE);
+VALUE rb_detach_process(rb_pid_t pid);
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_INTERN_PROCESS_H */
diff --git a/include/ruby/internal/intern/random.h b/include/ruby/internal/intern/random.h
new file mode 100644
index 0000000000..25c52f4ce4
--- /dev/null
+++ b/include/ruby/internal/intern/random.h
@@ -0,0 +1,45 @@
+#ifndef RBIMPL_INTERN_RANDOM_H                       /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_INTERN_RANDOM_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      MT19937 backended pseudo random number generator.
+ * @see        Matsumoto,  M.,   Nishimura,  T.,  "Mersenne  Twister:   A  623-
+ *             dimensionally   equidistributed   uniform  pseudorandom   number
+ *             generator", ACM  Trans. on  Modeling and Computer  Simulation, 8
+ *             (1): pp 3-30, 1998.  https://doi.org/10.1145/272991.272995
+ */
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+/* random.c */
+unsigned int rb_genrand_int32(void);
+double rb_genrand_real(void);
+void rb_reset_random_seed(void);
+VALUE rb_random_bytes(VALUE rnd, long n);
+VALUE rb_random_int(VALUE rnd, VALUE max);
+unsigned int rb_random_int32(VALUE rnd);
+double rb_random_real(VALUE rnd);
+unsigned long rb_random_ulong_limited(VALUE rnd, unsigned long limit);
+unsigned long rb_genrand_ulong_limited(unsigned long i);
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_INTERN_RANDOM_H */
diff --git a/include/ruby/internal/intern/range.h b/include/ruby/internal/intern/range.h
new file mode 100644
index 0000000000..7ca47915e2
--- /dev/null
+++ b/include/ruby/internal/intern/range.h
@@ -0,0 +1,35 @@
+#ifndef RBIMPL_INTERN_RANGE_H                        /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_INTERN_RANGE_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Public APIs related to ::rb_cRange.
+ */
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+/* range.c */
+VALUE rb_range_new(VALUE, VALUE, int);
+VALUE rb_range_beg_len(VALUE, long*, long*, long, int);
+int rb_range_values(VALUE range, VALUE *begp, VALUE *endp, int *exclp);
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_INTERN_RANGE_H */
diff --git a/include/ruby/internal/intern/rational.h b/include/ruby/internal/intern/rational.h
new file mode 100644
index 0000000000..30a87ff31f
--- /dev/null
+++ b/include/ruby/internal/intern/rational.h
@@ -0,0 +1,46 @@
+#ifndef RBIMPL_INTERN_RATIONAL_H                     /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_INTERN_RATIONAL_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Public APIs related to ::rb_cRational.
+ */
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+#include "ruby/internal/arithmetic/long.h" /* INT2FIX is here. */
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+/* 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))
+VALUE rb_rational_num(VALUE rat);
+VALUE rb_rational_den(VALUE rat);
+VALUE rb_flt_rationalize_with_prec(VALUE, VALUE);
+VALUE rb_flt_rationalize(VALUE);
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_INTERN_RATIONAL_H */
diff --git a/include/ruby/internal/intern/re.h b/include/ruby/internal/intern/re.h
new file mode 100644
index 0000000000..dd7baef954
--- /dev/null
+++ b/include/ruby/internal/intern/re.h
@@ -0,0 +1,50 @@
+#ifndef RBIMPL_INTERN_RE_H                           /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_INTERN_RE_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Public APIs related to ::rb_cRegexp.
+ */
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+/* 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);
+int rb_reg_backref_number(VALUE match, VALUE backref);
+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_alloc(void);
+VALUE rb_reg_init_str(VALUE re, VALUE s, int options);
+VALUE rb_reg_match(VALUE, VALUE);
+VALUE rb_reg_match2(VALUE);
+int rb_reg_options(VALUE);
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_INTERN_RE_H */
diff --git a/include/ruby/internal/intern/ruby.h b/include/ruby/internal/intern/ruby.h
new file mode 100644
index 0000000000..9d9a71cf7a
--- /dev/null
+++ b/include/ruby/internal/intern/ruby.h
@@ -0,0 +1,37 @@
+#ifndef RBIMPL_INTERN_RUBY_H                         /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_INTERN_RUBY_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Process-global APIs.
+ */
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+/* 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 *rb_load_file_str(VALUE);
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_INTERN_RUBY_H */
diff --git a/include/ruby/internal/intern/select.h b/include/ruby/internal/intern/select.h
new file mode 100644
index 0000000000..43d4cf354c
--- /dev/null
+++ b/include/ruby/internal/intern/select.h
@@ -0,0 +1,52 @@
+#ifndef RBIMPL_INTERN_SELECT_H                       /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_INTERN_SELECT_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Public APIs to provide ::rb_fd_select().
+ * @note       Functions  and  structs defined  in  this  header file  are  not
+ *             necessarily ruby-specific.  They don't need ::VALUE etc.
+ */
+#include "ruby/internal/config.h"
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>         /* for NFDBITS (BSD Net/2) */
+#endif
+
+#include "ruby/internal/dllexport.h"
+
+/* thread.c */
+#if defined(NFDBITS) && defined(HAVE_RB_FD_INIT)
+# include "ruby/internal/intern/select/largesize.h"
+#elif defined(_WIN32)
+# include "ruby/internal/intern/select/win32.h"
+# define rb_fd_resize(n, f) ((void)(f))
+#else
+# include "ruby/internal/intern/select/posix.h"
+# define rb_fd_resize(n, f) ((void)(f))
+#endif
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+struct timeval;
+
+int rb_thread_fd_select(int, rb_fdset_t *, rb_fdset_t *, rb_fdset_t *, struct timeval *);
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_INTERN_SELECT_H */
diff --git a/include/ruby/internal/intern/select/largesize.h b/include/ruby/internal/intern/select/largesize.h
new file mode 100644
index 0000000000..ba56a159b1
--- /dev/null
+++ b/include/ruby/internal/intern/select/largesize.h
@@ -0,0 +1,103 @@
+#ifndef RBIMPL_INTERN_SELECT_LARGESIZE_H             /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_INTERN_SELECT_LARGESIZE_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Public APIs to provide ::rb_fd_select().
+ *
+ * Several Unix  platforms support file  descriptors bigger than  FD_SETSIZE in
+ * `select(2)` system call.
+ *
+ * - Linux 2.2.12 (?)
+ *
+ * - NetBSD 1.2 (src/sys/kern/sys_generic.c:1.25)
+ *   `select(2)` documents how to allocate fd_set dynamically.
+ *   http://netbsd.gw.com/cgi-bin/man-cgi?select++NetBSD-4.0
+ *
+ * - FreeBSD 2.2 (src/sys/kern/sys_generic.c:1.19)
+ *
+ * - OpenBSD 2.0 (src/sys/kern/sys_generic.c:1.4)
+ *   `select(2)` documents how to allocate fd_set dynamically.
+ *   http://www.openbsd.org/cgi-bin/man.cgi?query=select&manpath=OpenBSD+4.4
+ *
+ * - HP-UX documents how to allocate fd_set dynamically.
+ *   http://docs.hp.com/en/B2355-60105/select.2.html
+ *
+ * - Solaris 8 has `select_large_fdset`
+ *
+ * - Mac OS X 10.7 (Lion)
+ *   `select(2)` returns `EINVAL`  if `nfds` is greater  than `FD_SET_SIZE` and
+ *   `_DARWIN_UNLIMITED_SELECT` (or `_DARWIN_C_SOURCE`) isn't defined.
+ *   http://developer.apple.com/library/mac/#releasenotes/Darwin/SymbolVariantsRelNotes/_index.html
+ *
+ * When `fd_set` is not  big enough to hold big file  descriptors, it should be
+ * allocated dynamically.   Note that  this assumes  `fd_set` is  structured as
+ * bitmap.
+ *
+ * `rb_fd_init` allocates the memory.
+ * `rb_fd_term` frees the memory.
+ * `rb_fd_set` may re-allocate bitmap.
+ *
+ * So `rb_fd_set` doesn't reject file descriptors bigger than `FD_SETSIZE`.
+ */
+#include "ruby/internal/attr/nonnull.h"
+#include "ruby/internal/attr/pure.h"
+#include "ruby/internal/dllexport.h"
+
+/**@cond INTERNAL_MACRO */
+#define rb_fd_ptr rb_fd_ptr
+#define rb_fd_max rb_fd_max
+/** @endcond */
+
+struct timeval;
+
+typedef struct {
+    int maxfd;
+    fd_set *fdset;
+} rb_fdset_t;
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+void rb_fd_init(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);
+void rb_fd_dup(rb_fdset_t *dst, const rb_fdset_t *src);
+int rb_fd_select(int, rb_fdset_t *, rb_fdset_t *, rb_fdset_t *, struct timeval *);
+RBIMPL_SYMBOL_EXPORT_END()
+
+RBIMPL_ATTR_NONNULL(())
+RBIMPL_ATTR_PURE()
+/* :TODO: can this function be __attribute__((returns_nonnull)) or not? */
+static inline fd_set *
+rb_fd_ptr(const rb_fdset_t *f)
+{
+    return f->fdset;
+}
+
+RBIMPL_ATTR_NONNULL(())
+RBIMPL_ATTR_PURE()
+static inline int
+rb_fd_max(const rb_fdset_t *f)
+{
+    return f->maxfd;
+}
+
+#endif /* RBIMPL_INTERN_SELECT_LARGESIZE_H */
diff --git a/include/ruby/internal/intern/select/posix.h b/include/ruby/internal/intern/select/posix.h
new file mode 100644
index 0000000000..0bf68ae204
--- /dev/null
+++ b/include/ruby/internal/intern/select/posix.h
@@ -0,0 +1,82 @@
+#ifndef RBIMPL_INTERN_SELECT_POSIX_H                 /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_INTERN_SELECT_POSIX_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Public APIs to provide ::rb_fd_select().
+ */
+#include "ruby/internal/config.h"
+
+#ifdef HAVE_SYS_SELECT_H
+# include <sys/select.h>        /* for select(2) (modern POSIX) */
+#endif
+
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>            /* for select(2) (archaic UNIX) */
+#endif
+
+#include "ruby/internal/attr/pure.h"
+#include "ruby/internal/attr/const.h"
+
+typedef fd_set rb_fdset_t;
+
+#define rb_fd_zero   FD_ZERO
+#define rb_fd_set    FD_SET
+#define rb_fd_clr    FD_CLR
+#define rb_fd_isset  FD_ISSET
+#define rb_fd_init   FD_ZERO
+#define rb_fd_select select
+/**@cond INTERNAL_MACRO */
+#define rb_fd_copy  rb_fd_copy
+#define rb_fd_dup   rb_fd_dup
+#define rb_fd_ptr   rb_fd_ptr
+#define rb_fd_max   rb_fd_max
+/** @endcond */
+
+static inline void
+rb_fd_copy(rb_fdset_t *dst, const fd_set *src, int n)
+{
+    *dst = *src;
+}
+
+static inline void
+rb_fd_dup(rb_fdset_t *dst, const fd_set *src)
+{
+    *dst = *src;
+}
+
+RBIMPL_ATTR_PURE()
+/* :TODO: can this function be __attribute__((returns_nonnull)) or not? */
+static inline fd_set *
+rb_fd_ptr(rb_fdset_t *f)
+{
+    return f;
+}
+
+RBIMPL_ATTR_CONST()
+static inline int
+rb_fd_max(const rb_fdset_t *f)
+{
+    return FD_SETSIZE;
+}
+
+/* :FIXME: What are these?  They don't exist for shibling implementations. */
+#define rb_fd_init_copy(d, s) (*(d) = *(s))
+#define rb_fd_term(f)   ((void)(f))
+
+#endif /* RBIMPL_INTERN_SELECT_POSIX_H */
diff --git a/include/ruby/internal/intern/select/win32.h b/include/ruby/internal/intern/select/win32.h
new file mode 100644
index 0000000000..ef75a0f760
--- /dev/null
+++ b/include/ruby/internal/intern/select/win32.h
@@ -0,0 +1,124 @@
+#ifndef RBIMPL_INTERN_SELECT_WIN32_H                 /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_INTERN_SELECT_WIN32_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Public APIs to provide ::rb_fd_select().
+ */
+#include "ruby/internal/dosish.h"      /* for rb_w32_select */
+#include "ruby/internal/attr/nonnull.h"
+#include "ruby/internal/attr/pure.h"
+#include "ruby/internal/attr/noalias.h"
+#include "ruby/internal/dllexport.h"
+#include "ruby/assert.h"
+
+/**@cond INTERNAL_MACRO */
+#define rb_fd_zero  rb_fd_zero
+#define rb_fd_clr   rb_fd_clr
+#define rb_fd_isset rb_fd_isset
+#define rb_fd_copy  rb_fd_copy
+#define rb_fd_dup   rb_fd_dup
+#define rb_fd_ptr   rb_fd_ptr
+#define rb_fd_max   rb_fd_max
+/** @endcond */
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+struct timeval;
+
+typedef struct {
+    int capa;
+    fd_set *fdset;
+} rb_fdset_t;
+
+void rb_fd_init(rb_fdset_t *);
+void rb_fd_term(rb_fdset_t *);
+void rb_fd_set(int, rb_fdset_t *);
+void rb_w32_fd_copy(rb_fdset_t *, const fd_set *, int);
+void rb_w32_fd_dup(rb_fdset_t *dst, const rb_fdset_t *src);
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+RBIMPL_ATTR_NONNULL(())
+RBIMPL_ATTR_NOALIAS()
+static inline void
+rb_fd_zero(rb_fdset_t *f)
+{
+    f->fdset->fd_count = 0;
+}
+
+RBIMPL_ATTR_NONNULL(())
+static inline void
+rb_fd_clr(int n, rb_fdset_t *f)
+{
+    rb_w32_fdclr(n, f->fdset);
+}
+
+RBIMPL_ATTR_NONNULL(())
+static inline int
+rb_fd_isset(int n, rb_fdset_t *f)
+{
+    return rb_w32_fdisset(n, f->fdset);
+}
+
+RBIMPL_ATTR_NONNULL(())
+static inline void
+rb_fd_copy(rb_fdset_t *dst, const fd_set *src, int n)
+{
+    rb_w32_fd_copy(dst, src, n);
+}
+
+RBIMPL_ATTR_NONNULL(())
+static inline void
+rb_fd_dup(rb_fdset_t *dst, const rb_fdset_t *src)
+{
+    rb_w32_fd_dup(dst, src);
+}
+
+static inline int
+rb_fd_select(int n, rb_fdset_t *rfds, rb_fdset_t *wfds, rb_fdset_t *efds, struct timeval *timeout)
+{
+    return rb_w32_select(
+        n,
+        rfds ? rfds->fdset : NULL,
+        wfds ? wfds->fdset : NULL,
+        efds ? efds->fdset : NULL,
+        timeout);
+}
+
+RBIMPL_ATTR_NONNULL(())
+RBIMPL_ATTR_PURE()
+/* :TODO: can this function be __attribute__((returns_nonnull)) or not? */
+static inline fd_set *
+rb_fd_ptr(const rb_fdset_t *f)
+{
+    return f->fdset;
+}
+
+RBIMPL_ATTR_NONNULL(())
+RBIMPL_ATTR_PURE()
+static inline int
+rb_fd_max(const rb_fdset_t *f)
+{
+    const fd_set *p = f->fdset;
+
+    RBIMPL_ASSERT_OR_ASSUME(p);
+    return p->fd_count;
+}
+
+#endif /* RBIMPL_INTERN_SELECT_WIN32_H */
diff --git a/include/ruby/internal/intern/signal.h b/include/ruby/internal/intern/signal.h
new file mode 100644
index 0000000000..8739c51f53
--- /dev/null
+++ b/include/ruby/internal/intern/signal.h
@@ -0,0 +1,39 @@
+#ifndef RBIMPL_INTERN_SIGNAL_H                       /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_INTERN_SIGNAL_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Signal handling APIs.
+ */
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+/* signal.c */
+VALUE rb_f_kill(int, const VALUE*);
+#ifdef POSIX_SIGNAL
+#define posix_signal ruby_posix_signal
+void (*posix_signal(int, void (*)(int)))(int);
+#endif
+const char *ruby_signal_name(int);
+void ruby_default_signal(int);
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_INTERN_SIGNAL_H */
diff --git a/include/ruby/internal/intern/sprintf.h b/include/ruby/internal/intern/sprintf.h
new file mode 100644
index 0000000000..2c90548353
--- /dev/null
+++ b/include/ruby/internal/intern/sprintf.h
@@ -0,0 +1,43 @@
+#ifndef RBIMPL_INTERN_SPRINTF_H                      /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_INTERN_SPRINTF_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Our own private printf(3).
+ */
+#include "ruby/internal/attr/format.h"
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+/* sprintf.c */
+VALUE rb_f_sprintf(int, const VALUE*);
+
+RBIMPL_ATTR_FORMAT(RBIMPL_PRINTF_FORMAT, 1, 2)
+VALUE rb_sprintf(const char*, ...);
+VALUE rb_vsprintf(const char*, va_list);
+
+RBIMPL_ATTR_FORMAT(RBIMPL_PRINTF_FORMAT, 2, 3)
+VALUE rb_str_catf(VALUE, const char*, ...);
+VALUE rb_str_vcatf(VALUE, const char*, va_list);
+VALUE rb_str_format(int, const VALUE *, VALUE);
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_INTERN_SPRINTF_H */
diff --git a/include/ruby/internal/intern/string.h b/include/ruby/internal/intern/string.h
new file mode 100644
index 0000000000..a590b2043e
--- /dev/null
+++ b/include/ruby/internal/intern/string.h
@@ -0,0 +1,298 @@
+#ifndef RBIMPL_INTERN_STRING_H                       /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_INTERN_STRING_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Public APIs related to ::rb_cString.
+ */
+#include "ruby/internal/config.h"
+
+#ifdef STDC_HEADERS
+# include <stddef.h>
+#endif
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+
+#include "ruby/internal/attr/nonnull.h"
+#include "ruby/internal/attr/pure.h"
+#include "ruby/internal/constant_p.h"
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+#include "ruby/internal/variable.h" /* rb_gvar_setter_t */
+#include "ruby/st.h"         /* st_index_t */
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+/* string.c */
+VALUE rb_str_new(const char*, long);
+VALUE rb_str_new_cstr(const char*);
+VALUE rb_str_new_shared(VALUE);
+VALUE rb_str_new_frozen(VALUE);
+VALUE rb_str_new_with_class(VALUE, const char*, long);
+VALUE rb_tainted_str_new_cstr(const char*);
+VALUE rb_tainted_str_new(const char*, long);
+VALUE rb_external_str_new(const char*, long);
+VALUE rb_external_str_new_cstr(const char*);
+VALUE rb_locale_str_new(const char*, long);
+VALUE rb_locale_str_new_cstr(const char*);
+VALUE rb_filesystem_str_new(const char*, long);
+VALUE rb_filesystem_str_new_cstr(const char*);
+VALUE rb_str_buf_new(long);
+VALUE rb_str_buf_new_cstr(const char*);
+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_new_cstr(const char*);
+VALUE rb_utf8_str_new(const char*, long);
+VALUE rb_utf8_str_new_cstr(const char*);
+/**
+ *  *_str_new_static functions are intended for C string literals.
+ *  They require memory in the range [ptr, ptr+len] to always be readable.
+ *  Note that this range covers a total of len + 1 bytes.
+ */
+VALUE rb_str_new_static(const char *ptr, long len);
+VALUE rb_usascii_str_new_static(const char *ptr, long len);
+VALUE rb_utf8_str_new_static(const char *ptr, long len);
+VALUE rb_str_to_interned_str(VALUE);
+VALUE rb_interned_str(const char *, long);
+VALUE rb_interned_str_cstr(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);
+void rb_must_asciicompat(VALUE);
+VALUE rb_str_dup(VALUE);
+VALUE rb_str_resurrect(VALUE str);
+VALUE rb_str_locktmp(VALUE);
+VALUE rb_str_unlocktmp(VALUE);
+VALUE rb_str_dup_frozen(VALUE);
+#define rb_str_dup_frozen rb_str_new_frozen
+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);
+char *rb_str_subpos(VALUE, long, long*);
+void rb_str_modify(VALUE);
+void rb_str_modify_expand(VALUE, long);
+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_cat_cstr(VALUE, const char*);
+VALUE rb_str_cat2(VALUE, const char*);
+VALUE rb_str_append(VALUE, VALUE);
+VALUE rb_str_concat(VALUE, VALUE);
+st_index_t rb_memhash(const void *ptr, long len);
+st_index_t rb_hash_start(st_index_t);
+st_index_t rb_hash_uint32(st_index_t, uint32_t);
+st_index_t rb_hash_uint(st_index_t, st_index_t);
+st_index_t rb_hash_end(st_index_t);
+#define rb_hash_uint32(h, i) st_hash_uint32((h), (i))
+#define rb_hash_uint(h, i) st_hash_uint((h), (i))
+#define rb_hash_end(h) st_hash_end(h)
+st_index_t 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);
+VALUE rb_str_drop_bytes(VALUE, long);
+void rb_str_update(VALUE, long, long, VALUE);
+VALUE rb_str_replace(VALUE, VALUE);
+VALUE rb_str_inspect(VALUE);
+VALUE rb_str_dump(VALUE);
+VALUE rb_str_split(VALUE, const char*);
+rb_gvar_setter_t rb_str_setter;
+VALUE rb_str_intern(VALUE);
+VALUE rb_sym_to_s(VALUE);
+long rb_str_strlen(VALUE);
+VALUE rb_str_length(VALUE);
+long rb_str_offset(VALUE, long);
+RBIMPL_ATTR_PURE()
+size_t rb_str_capacity(VALUE);
+VALUE rb_str_ellipsize(VALUE, long);
+VALUE rb_str_scrub(VALUE, VALUE);
+VALUE rb_str_succ(VALUE);
+
+RBIMPL_ATTR_NONNULL(())
+static inline long
+rbimpl_strlen(const char *str)
+{
+    return RBIMPL_CAST((long)strlen(str));
+}
+
+static inline VALUE
+rbimpl_str_new_cstr(const char *str)
+{
+    long len = rbimpl_strlen(str);
+    return rb_str_new_static(str, len);
+}
+
+static inline VALUE
+rbimpl_tainted_str_new_cstr(const char *str)
+{
+    long len = rbimpl_strlen(str);
+    return rb_tainted_str_new(str, len);
+}
+
+static inline VALUE
+rbimpl_usascii_str_new_cstr(const char *str)
+{
+    long len = rbimpl_strlen(str);
+    return rb_usascii_str_new_static(str, len);
+}
+
+static inline VALUE
+rbimpl_utf8_str_new_cstr(const char *str)
+{
+    long len = rbimpl_strlen(str);
+    return rb_utf8_str_new_static(str, len);
+}
+
+static inline VALUE
+rbimpl_external_str_new_cstr(const char *str)
+{
+    long len = rbimpl_strlen(str);
+    return rb_external_str_new(str, len);
+}
+
+static inline VALUE
+rbimpl_locale_str_new_cstr(const char *str)
+{
+    long len = rbimpl_strlen(str);
+    return rb_locale_str_new(str, len);
+}
+
+static inline VALUE
+rbimpl_str_buf_new_cstr(const char *str)
+{
+    long len = rbimpl_strlen(str);
+    VALUE buf = rb_str_buf_new(len);
+    return rb_str_buf_cat(buf, str, len);
+}
+
+static inline VALUE
+rbimpl_str_cat_cstr(VALUE buf, const char *str)
+{
+    long len = rbimpl_strlen(str);
+    return rb_str_cat(buf, str, len);
+}
+
+static inline VALUE
+rbimpl_exc_new_cstr(VALUE exc, const char *str)
+{
+    long len = rbimpl_strlen(str);
+    return rb_exc_new(exc, str, len);
+}
+
+#define rb_str_new(str, len)                    \
+    ((RBIMPL_CONSTANT_P(str) &&                 \
+      RBIMPL_CONSTANT_P(len) ?                  \
+      rb_str_new_static      :                  \
+      rb_str_new) ((str), (len)))
+
+#define rb_str_new_cstr(str)                    \
+    ((RBIMPL_CONSTANT_P(str) ?                  \
+      rbimpl_str_new_cstr    :                  \
+      rb_str_new_cstr) (str))
+
+#define rb_usascii_str_new(str, len)            \
+    ((RBIMPL_CONSTANT_P(str)    &&              \
+      RBIMPL_CONSTANT_P(len)    ?               \
+      rb_usascii_str_new_static :               \
+      rb_usascii_str_new) ((str), (len)))
+
+#define rb_utf8_str_new(str, len)               \
+    ((RBIMPL_CONSTANT_P(str) &&                 \
+      RBIMPL_CONSTANT_P(len) ?                  \
+      rb_utf8_str_new_static :                  \
+      rb_utf8_str_new) ((str), (len)))
+
+#define rb_tainted_str_new_cstr(str)            \
+    ((RBIMPL_CONSTANT_P(str)      ?             \
+      rbimpl_tainted_str_new_cstr :             \
+      rb_tainted_str_new_cstr) (str))
+
+#define rb_usascii_str_new_cstr(str)            \
+    ((RBIMPL_CONSTANT_P(str)      ?             \
+      rbimpl_usascii_str_new_cstr :             \
+      rb_usascii_str_new_cstr) (str))
+
+#define rb_utf8_str_new_cstr(str)               \
+    ((RBIMPL_CONSTANT_P(str)   ?                \
+      rbimpl_utf8_str_new_cstr :                \
+      rb_utf8_str_new_cstr) (str))
+
+#define rb_external_str_new_cstr(str)           \
+    ((RBIMPL_CONSTANT_P(str)       ?            \
+      rbimpl_external_str_new_cstr :            \
+      rb_external_str_new_cstr) (str))
+
+#define rb_locale_str_new_cstr(str)             \
+    ((RBIMPL_CONSTANT_P(str)     ?              \
+      rbimpl_locale_str_new_cstr :              \
+      rb_locale_str_new_cstr) (str))
+
+#define rb_str_buf_new_cstr(str)                \
+    ((RBIMPL_CONSTANT_P(str)  ?                 \
+      rbimpl_str_buf_new_cstr :                 \
+      rb_str_buf_new_cstr) (str))
+
+#define rb_str_cat_cstr(buf, str)               \
+    ((RBIMPL_CONSTANT_P(str) ?                  \
+      rbimpl_str_cat_cstr    :                  \
+      rb_str_cat_cstr) ((buf), (str)))
+
+#define rb_exc_new_cstr(exc, str)               \
+    ((RBIMPL_CONSTANT_P(str) ?                  \
+      rbimpl_exc_new_cstr    :                  \
+      rb_exc_new_cstr) ((exc), (str)))
+
+#define rb_str_new2 rb_str_new_cstr
+#define rb_str_new3 rb_str_new_shared
+#define rb_str_new4 rb_str_new_frozen
+#define rb_str_new5 rb_str_new_with_class
+#define rb_tainted_str_new2 rb_tainted_str_new_cstr
+#define rb_str_buf_new2 rb_str_buf_new_cstr
+#define rb_usascii_str_new2 rb_usascii_str_new_cstr
+#define rb_str_buf_cat rb_str_cat
+#define rb_str_buf_cat2 rb_str_cat_cstr
+#define rb_str_cat2 rb_str_cat_cstr
+#define rb_strlen_lit(str) (sizeof(str "") - 1)
+#define rb_str_new_lit(str) rb_str_new_static((str), rb_strlen_lit(str))
+#define rb_usascii_str_new_lit(str) rb_usascii_str_new_static((str), rb_strlen_lit(str))
+#define rb_utf8_str_new_lit(str) rb_utf8_str_new_static((str), rb_strlen_lit(str))
+#define rb_enc_str_new_lit(str, enc) rb_enc_str_new_static((str), rb_strlen_lit(str), (enc))
+#define rb_str_new_literal(str) rb_str_new_lit(str)
+#define rb_usascii_str_new_literal(str) rb_usascii_str_new_lit(str)
+#define rb_utf8_str_new_literal(str) rb_utf8_str_new_lit(str)
+#define rb_enc_str_new_literal(str, enc) rb_enc_str_new_lit(str, enc)
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_INTERN_STRING_H */
diff --git a/include/ruby/internal/intern/struct.h b/include/ruby/internal/intern/struct.h
new file mode 100644
index 0000000000..8818da96c7
--- /dev/null
+++ b/include/ruby/internal/intern/struct.h
@@ -0,0 +1,47 @@
+#ifndef RBIMPL_INTERN_STRUCT_H                       /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_INTERN_STRUCT_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Public APIs related to ::rb_cStruct.
+ */
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/intern/vm.h" /* rb_alloc_func_t */
+#include "ruby/internal/value.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+/* struct.c */
+VALUE rb_struct_new(VALUE, ...);
+VALUE rb_struct_define(const char*, ...);
+VALUE rb_struct_define_under(VALUE, 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_s_members(VALUE);
+VALUE rb_struct_members(VALUE);
+VALUE rb_struct_size(VALUE s);
+VALUE rb_struct_alloc_noinit(VALUE);
+VALUE rb_struct_define_without_accessor(const char *, VALUE, rb_alloc_func_t, ...);
+VALUE rb_struct_define_without_accessor_under(VALUE outer, const char *class_name, VALUE super, rb_alloc_func_t alloc, ...);
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_INTERN_STRUCT_H */
diff --git a/include/ruby/internal/intern/thread.h b/include/ruby/internal/intern/thread.h
new file mode 100644
index 0000000000..a12a371058
--- /dev/null
+++ b/include/ruby/internal/intern/thread.h
@@ -0,0 +1,76 @@
+#ifndef RBIMPL_INTERN_THREAD_H                       /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_INTERN_THREAD_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Public APIs related to ::rb_cThread.
+ */
+#include "ruby/internal/config.h"
+#include "ruby/internal/cast.h"
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+struct timeval;
+
+/* thread.c */
+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_sleep(int);
+void rb_thread_sleep_forever(void);
+void rb_thread_sleep_deadly(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_create(VALUE (*)(void *), void*);
+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);
+VALUE rb_exec_recursive_paired(VALUE(*)(VALUE, VALUE, int),VALUE,VALUE,VALUE);
+VALUE rb_exec_recursive_outer(VALUE(*)(VALUE, VALUE, int),VALUE,VALUE);
+VALUE rb_exec_recursive_paired_outer(VALUE(*)(VALUE, VALUE, int),VALUE,VALUE,VALUE);
+
+typedef void rb_unblock_function_t(void *);
+typedef VALUE rb_blocking_function_t(void *);
+void rb_thread_check_ints(void);
+int rb_thread_interrupted(VALUE thval);
+
+#define RUBY_UBF_IO RBIMPL_CAST((rb_unblock_function_t *)-1)
+#define RUBY_UBF_PROCESS RBIMPL_CAST((rb_unblock_function_t *)-1)
+VALUE rb_mutex_new(void);
+VALUE rb_mutex_locked_p(VALUE mutex);
+VALUE rb_mutex_trylock(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 mutex, VALUE (*func)(VALUE arg), VALUE arg);
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_INTERN_THREAD_H */
diff --git a/include/ruby/internal/intern/time.h b/include/ruby/internal/intern/time.h
new file mode 100644
index 0000000000..c7ae6ec2f5
--- /dev/null
+++ b/include/ruby/internal/intern/time.h
@@ -0,0 +1,51 @@
+#ifndef RBIMPL_INTERN_TIME_H                         /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_INTERN_TIME_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Public APIs related to ::rb_cTime.
+ */
+#include "ruby/internal/config.h"
+
+#ifdef HAVE_TIME_H
+# include <time.h>              /* for time_t */
+#endif
+
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+struct timespec;
+struct timeval;
+
+/* time.c */
+void rb_timespec_now(struct timespec *);
+VALUE rb_time_new(time_t, long);
+VALUE rb_time_nano_new(time_t, long);
+VALUE rb_time_timespec_new(const struct timespec *, int);
+VALUE rb_time_num_new(VALUE, VALUE);
+struct timeval rb_time_interval(VALUE num);
+struct timeval rb_time_timeval(VALUE time);
+struct timespec rb_time_timespec(VALUE time);
+struct timespec rb_time_timespec_interval(VALUE num);
+VALUE rb_time_utc_offset(VALUE time);
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_INTERN_TIME_H */
diff --git a/include/ruby/internal/intern/variable.h b/include/ruby/internal/intern/variable.h
new file mode 100644
index 0000000000..8210662fa0
--- /dev/null
+++ b/include/ruby/internal/intern/variable.h
@@ -0,0 +1,83 @@
+#ifndef RBIMPL_INTERN_VARIABLE_H                     /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_INTERN_VARIABLE_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Public APIs related to names inside of a Ruby program.
+ */
+#include "ruby/internal/attr/noreturn.h"
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+#include "ruby/st.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+/* variable.c */
+VALUE rb_mod_name(VALUE);
+VALUE rb_class_path(VALUE);
+VALUE rb_class_path_cached(VALUE);
+void rb_set_class_path(VALUE, VALUE, const char*);
+void rb_set_class_path_string(VALUE, VALUE, VALUE);
+VALUE rb_path_to_class(VALUE);
+VALUE rb_path2class(const char*);
+VALUE rb_class_name(VALUE);
+VALUE rb_autoload_load(VALUE, ID);
+VALUE rb_autoload_p(VALUE, ID);
+VALUE rb_f_trace_var(int, const VALUE*);
+VALUE rb_f_untrace_var(int, const VALUE*);
+VALUE rb_f_global_variables(void);
+void rb_alias_variable(ID, ID);
+void rb_copy_generic_ivar(VALUE,VALUE);
+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 (*)(ID, VALUE, st_data_t), st_data_t);
+st_index_t rb_ivar_count(VALUE);
+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, const 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_const_remove(VALUE, ID);
+#if 0 /* EXPERIMENTAL: remove if no problem */
+RBIMPL_ATTR_NORETURN()
+VALUE rb_mod_const_missing(VALUE,VALUE);
+#endif
+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(int, const VALUE*, VALUE);
+VALUE rb_mod_remove_cvar(VALUE, VALUE);
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_INTERN_VARIABLE_H */
diff --git a/include/ruby/internal/intern/vm.h b/include/ruby/internal/intern/vm.h
new file mode 100644
index 0000000000..706f160ad8
--- /dev/null
+++ b/include/ruby/internal/intern/vm.h
@@ -0,0 +1,77 @@
+#ifndef RBIMPL_INTERN_VM_H                           /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_INTERN_VM_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Public APIs related to ::rb_cRubyVM.
+ */
+#include "ruby/internal/attr/noreturn.h"
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+/* vm.c */
+int rb_sourceline(void);
+const char *rb_sourcefile(void);
+int rb_frame_method_id_and_class(ID *idp, VALUE *klassp);
+
+/* vm_eval.c */
+VALUE rb_check_funcall(VALUE, ID, int, const VALUE*);
+VALUE rb_check_funcall_kw(VALUE, ID, int, const VALUE*, int);
+void rb_remove_method(VALUE, const char*);
+void rb_remove_method_id(VALUE, ID);
+
+VALUE rb_eval_cmd_kw(VALUE, VALUE, int);
+VALUE rb_apply(VALUE, ID, VALUE);
+
+VALUE rb_obj_instance_eval(int, const VALUE*, VALUE);
+VALUE rb_obj_instance_exec(int, const VALUE*, VALUE);
+VALUE rb_mod_module_eval(int, const VALUE*, VALUE);
+VALUE rb_mod_module_exec(int, const VALUE*, VALUE);
+
+/* vm_method.c */
+#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_constant_cache(void);
+void rb_clear_method_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);
+int rb_method_basic_definition_p(VALUE, ID);
+
+int rb_obj_respond_to(VALUE, ID, int);
+int rb_respond_to(VALUE, ID);
+
+RBIMPL_ATTR_NORETURN()
+VALUE rb_f_notimplement(int argc, const VALUE *argv, VALUE obj, VALUE marker);
+#if !defined(RUBY_EXPORT) && defined(_WIN32)
+RUBY_EXTERN VALUE (*const rb_f_notimplement_)(int, const VALUE *, VALUE, VALUE marker);
+#define rb_f_notimplement (*rb_f_notimplement_)
+#endif
+
+/* vm_backtrace.c */
+void rb_backtrace(void);
+VALUE rb_make_backtrace(void);
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_INTERN_VM_H */
diff --git a/include/ruby/internal/interpreter.h b/include/ruby/internal/interpreter.h
new file mode 100644
index 0000000000..29dee60aab
--- /dev/null
+++ b/include/ruby/internal/interpreter.h
@@ -0,0 +1,93 @@
+#ifndef RBIMPL_INTERPRETER_H                         /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_INTERPRETER_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Interpreter embedding APIs.
+ */
+#include "ruby/internal/attr/noreturn.h"
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+/**
+ * @defgroup embed CRuby Embedding APIs
+ * CRuby interpreter APIs. These are APIs to embed MRI interpreter into your
+ * program.
+ * These functions are not a part of Ruby extension library API.
+ * Extension libraries of Ruby should not depend on these functions.
+ * @{
+ */
+
+/** @defgroup ruby1 ruby(1) implementation
+ * A part of the implementation of ruby(1) command.
+ * Other programs that embed Ruby interpreter do not always need to use these
+ * functions.
+ * @{
+ */
+
+void ruby_sysinit(int *argc, char ***argv);
+void ruby_init(void);
+void* ruby_options(int argc, char** argv);
+int ruby_executable_node(void *n, int *status);
+int ruby_run_node(void *n);
+
+/* version.c */
+void ruby_show_version(void);
+#ifndef ruby_show_copyright
+void ruby_show_copyright(void);
+#endif
+
+/*! A convenience macro to call ruby_init_stack(). Must be placed just after
+ *  variable declarations */
+#define RUBY_INIT_STACK \
+    VALUE variable_in_this_stack_frame; \
+    ruby_init_stack(&variable_in_this_stack_frame);
+/*! @} */
+
+void ruby_init_stack(volatile VALUE*);
+
+int ruby_setup(void);
+int ruby_cleanup(volatile int);
+
+void ruby_finalize(void);
+
+RBIMPL_ATTR_NORETURN()
+void ruby_stop(int);
+
+int ruby_stack_check(void);
+size_t ruby_stack_length(VALUE**);
+
+int ruby_exec_node(void *n);
+
+void ruby_script(const char* name);
+void ruby_set_script_name(VALUE name);
+
+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*);
+void ruby_sig_finalize(void);
+
+/*! @} */
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_INTERPRETER_H */
diff --git a/include/ruby/internal/iterator.h b/include/ruby/internal/iterator.h
new file mode 100644
index 0000000000..99c0831b13
--- /dev/null
+++ b/include/ruby/internal/iterator.h
@@ -0,0 +1,65 @@
+#ifndef RBIMPL_ITERATOR_H                            /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_ITERATOR_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Block related APIs.
+ */
+#include "ruby/internal/attr/noreturn.h"
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+#define RB_BLOCK_CALL_FUNC_STRICT 1
+#define RUBY_BLOCK_CALL_FUNC_TAKES_BLOCKARG 1
+#define RB_BLOCK_CALL_FUNC_ARGLIST(yielded_arg, callback_arg) \
+    VALUE yielded_arg, VALUE callback_arg, int argc, const VALUE *argv, VALUE blockarg
+typedef VALUE rb_block_call_func(RB_BLOCK_CALL_FUNC_ARGLIST(yielded_arg, callback_arg));
+typedef rb_block_call_func *rb_block_call_func_t;
+
+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_values_kw(int n, const VALUE *argv, int kw_splat);
+VALUE rb_yield_splat(VALUE);
+VALUE rb_yield_splat_kw(VALUE, int);
+VALUE rb_yield_block(RB_BLOCK_CALL_FUNC_ARGLIST(yielded_arg, callback_arg)); /* rb_block_call_func */
+int rb_keyword_given_p(void);
+int rb_block_given_p(void);
+void rb_need_block(void);
+VALUE rb_iterate(VALUE(*)(VALUE),VALUE,rb_block_call_func_t,VALUE);
+VALUE rb_block_call(VALUE,ID,int,const VALUE*,rb_block_call_func_t,VALUE);
+VALUE rb_block_call_kw(VALUE,ID,int,const VALUE*,rb_block_call_func_t,VALUE,int);
+VALUE rb_rescue(VALUE(*)(VALUE),VALUE,VALUE(*)(VALUE,VALUE),VALUE);
+VALUE rb_rescue2(VALUE(*)(VALUE),VALUE,VALUE(*)(VALUE,VALUE),VALUE,...);
+VALUE rb_vrescue2(VALUE(*)(VALUE),VALUE,VALUE(*)(VALUE,VALUE),VALUE,va_list);
+VALUE rb_ensure(VALUE(*)(VALUE),VALUE,VALUE(*)(VALUE),VALUE);
+VALUE rb_catch(const char*,rb_block_call_func_t,VALUE);
+VALUE rb_catch_obj(VALUE,rb_block_call_func_t,VALUE);
+
+RBIMPL_ATTR_NORETURN()
+void rb_throw(const char*,VALUE);
+
+RBIMPL_ATTR_NORETURN()
+void rb_throw_obj(VALUE,VALUE);
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_ITERATOR_H */
diff --git a/include/ruby/internal/memory.h b/include/ruby/internal/memory.h
new file mode 100644
index 0000000000..46dfcadd10
--- /dev/null
+++ b/include/ruby/internal/memory.h
@@ -0,0 +1,281 @@
+#ifndef RBIMPL_MEMORY_H                              /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_MEMORY_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Memory management stuff.
+ */
+#include "ruby/internal/config.h"
+
+#ifdef STDC_HEADERS
+# include <stddef.h>
+#endif
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+
+#ifdef HAVE_ALLOCA_H
+# include <alloca.h>
+#endif
+
+#if defined(_MSC_VER) && defined(_WIN64)
+# include <intrin.h>
+# pragma intrinsic(_umul128)
+#endif
+
+#include "ruby/internal/attr/alloc_size.h"
+#include "ruby/internal/attr/const.h"
+#include "ruby/internal/attr/constexpr.h"
+#include "ruby/internal/attr/noalias.h"
+#include "ruby/internal/attr/nonnull.h"
+#include "ruby/internal/attr/noreturn.h"
+#include "ruby/internal/attr/restrict.h"
+#include "ruby/internal/attr/returns_nonnull.h"
+#include "ruby/internal/cast.h"
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/has/builtin.h"
+#include "ruby/internal/stdalign.h"
+#include "ruby/internal/stdbool.h"
+#include "ruby/internal/xmalloc.h"
+#include "ruby/backward/2/limits.h"
+#include "ruby/backward/2/long_long.h"
+#include "ruby/backward/2/assume.h"
+#include "ruby/defines.h"
+
+/* Make alloca work the best possible way.  */
+#if defined(alloca)
+# /* Take that. */
+#elif RBIMPL_HAS_BUILTIN(__builtin_alloca)
+# define alloca __builtin_alloca
+#elif defined(_AIX)
+# pragma alloca
+#elif defined(__cplusplus)
+extern "C" void *alloca(size_t);
+#else
+extern void *alloca();
+#endif
+
+#if defined(HAVE_INT128_T) && SIZEOF_SIZE_T <= 8
+# define DSIZE_T uint128_t
+#elif SIZEOF_SIZE_T * 2 <= SIZEOF_LONG_LONG
+# define DSIZE_T unsigned LONG_LONG
+#endif
+
+#ifdef C_ALLOCA
+# define RUBY_ALLOCV_LIMIT 0
+#else
+# define RUBY_ALLOCV_LIMIT 1024
+#endif
+
+#ifdef __GNUC__
+#define RB_GC_GUARD(v) \
+    (*__extension__ ({ \
+        volatile VALUE *rb_gc_guarded_ptr = &(v); \
+        __asm__("" : : "m"(rb_gc_guarded_ptr)); \
+        rb_gc_guarded_ptr; \
+    }))
+#elif defined _MSC_VER
+#define RB_GC_GUARD(v) (*rb_gc_guarded_ptr(&(v)))
+#else
+#define HAVE_RB_GC_GUARDED_PTR_VAL 1
+#define RB_GC_GUARD(v) (*rb_gc_guarded_ptr_val(&(v),(v)))
+#endif
+
+/* Casts needed because void* is NOT compaible with others in C++. */
+#define RB_ALLOC_N(type,n)  RBIMPL_CAST((type *)ruby_xmalloc2((n), sizeof(type)))
+#define RB_ALLOC(type)      RBIMPL_CAST((type *)ruby_xmalloc(sizeof(type)))
+#define RB_ZALLOC_N(type,n) RBIMPL_CAST((type *)ruby_xcalloc((n), sizeof(type)))
+#define RB_ZALLOC(type)     (RB_ZALLOC_N(type, 1))
+#define RB_REALLOC_N(var,type,n) \
+    ((var) = RBIMPL_CAST((type *)ruby_xrealloc2((void *)(var), (n), sizeof(type))))
+
+#define ALLOCA_N(type,n) \
+    RBIMPL_CAST((type *)(!(n) ? NULL : alloca(rbimpl_size_mul_or_raise(sizeof(type), (n)))))
+
+/* allocates _n_ bytes temporary buffer and stores VALUE including it
+ * in _v_.  _n_ may be evaluated twice. */
+#define RB_ALLOCV(v, n)        \
+    ((n) < RUBY_ALLOCV_LIMIT ? \
+     ((v) = 0, !(n) ? NULL : alloca(n)) : \
+     rb_alloc_tmp_buffer(&(v), (n)))
+#define RB_ALLOCV_N(type, v, n)                             \
+    RBIMPL_CAST((type *)                                     \
+        (((size_t)(n) < RUBY_ALLOCV_LIMIT / sizeof(type)) ? \
+         ((v) = 0, !(n) ? NULL : alloca((n) * sizeof(type))) : \
+         rb_alloc_tmp_buffer2(&(v), (n), sizeof(type))))
+#define RB_ALLOCV_END(v) rb_free_tmp_buffer(&(v))
+
+#define MEMZERO(p,type,n) memset((p), 0, rbimpl_size_mul_or_raise(sizeof(type), (n)))
+#define MEMCPY(p1,p2,type,n) memcpy((p1), (p2), rbimpl_size_mul_or_raise(sizeof(type), (n)))
+#define MEMMOVE(p1,p2,type,n) memmove((p1), (p2), rbimpl_size_mul_or_raise(sizeof(type), (n)))
+#define MEMCMP(p1,p2,type,n) memcmp((p1), (p2), rbimpl_size_mul_or_raise(sizeof(type), (n)))
+
+#define ALLOC_N    RB_ALLOC_N
+#define ALLOC      RB_ALLOC
+#define ZALLOC_N   RB_ZALLOC_N
+#define ZALLOC     RB_ZALLOC
+#define REALLOC_N  RB_REALLOC_N
+#define ALLOCV     RB_ALLOCV
+#define ALLOCV_N   RB_ALLOCV_N
+#define ALLOCV_END RB_ALLOCV_END
+
+/* Expecting this struct to be eliminated by function inlinings */
+struct rbimpl_size_mul_overflow_tag {
+    bool left;
+    size_t right;
+};
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+RBIMPL_ATTR_RESTRICT()
+RBIMPL_ATTR_RETURNS_NONNULL()
+RBIMPL_ATTR_ALLOC_SIZE((2))
+void *rb_alloc_tmp_buffer(volatile VALUE *store, long len);
+
+RBIMPL_ATTR_RESTRICT()
+RBIMPL_ATTR_RETURNS_NONNULL()
+RBIMPL_ATTR_ALLOC_SIZE((2,3))
+void *rb_alloc_tmp_buffer_with_count(volatile VALUE *store, size_t len,size_t count);
+
+void rb_free_tmp_buffer(volatile VALUE *store);
+
+RBIMPL_ATTR_NORETURN()
+void ruby_malloc_size_overflow(size_t, size_t);
+
+#ifdef HAVE_RB_GC_GUARDED_PTR_VAL
+volatile VALUE *rb_gc_guarded_ptr_val(volatile VALUE *ptr, VALUE val);
+#endif
+RBIMPL_SYMBOL_EXPORT_END()
+
+#ifdef _MSC_VER
+# pragma optimize("", off)
+
+static inline volatile VALUE *
+rb_gc_guarded_ptr(volatile VALUE *ptr)
+{
+    return ptr;
+}
+
+# pragma optimize("", on)
+#endif
+
+/* Does anyone use it?  Just here for backwards compatibility. */
+static inline int
+rb_mul_size_overflow(size_t a, size_t b, size_t max, size_t *c)
+{
+#ifdef DSIZE_T
+    RB_GNUC_EXTENSION DSIZE_T da, db, c2;
+    da = a;
+    db = b;
+    c2 = da * db;
+    if (c2 > max) return 1;
+    *c = RBIMPL_CAST((size_t)c2);
+#else
+    if (b != 0 && a > max / b) return 1;
+    *c = a * b;
+#endif
+    return 0;
+}
+
+#if RBIMPL_COMPILER_SINCE(GCC, 7, 0, 0)
+RBIMPL_ATTR_CONSTEXPR(CXX14) /* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70507 */
+#elif RBIMPL_COMPILER_SINCE(Clang, 7, 0, 0)
+RBIMPL_ATTR_CONSTEXPR(CXX14) /* https://bugs.llvm.org/show_bug.cgi?id=37633 */
+#endif
+RBIMPL_ATTR_CONST()
+static inline struct rbimpl_size_mul_overflow_tag
+rbimpl_size_mul_overflow(size_t x, size_t y)
+{
+    struct rbimpl_size_mul_overflow_tag ret = { false,  0, };
+
+#if RBIMPL_HAS_BUILTIN(__builtin_mul_overflow)
+    ret.left = __builtin_mul_overflow(x, y, &ret.right);
+
+#elif defined(DSIZE_T)
+    RB_GNUC_EXTENSION DSIZE_T dx = x;
+    RB_GNUC_EXTENSION DSIZE_T dy = y;
+    RB_GNUC_EXTENSION DSIZE_T dz = dx * dy;
+    ret.left  = dz > SIZE_MAX;
+    ret.right = RBIMPL_CAST((size_t)dz);
+
+#elif defined(_MSC_VER) && defined(_WIN64)
+    unsigned __int64 dp = 0;
+    unsigned __int64 dz = _umul128(x, y, &dp);
+    ret.left  = RBIMPL_CAST((bool)dp);
+    ret.right = RBIMPL_CAST((size_t)dz);
+
+#else
+    /* https://wiki.sei.cmu.edu/confluence/display/c/INT30-C.+Ensure+that+unsigned+integer+operations+do+not+wrap */
+    ret.left  = (y != 0) && (x > SIZE_MAX / y);
+    ret.right = x * y;
+#endif
+
+    return ret;
+}
+
+static inline size_t
+rbimpl_size_mul_or_raise(size_t x, size_t y)
+{
+    struct rbimpl_size_mul_overflow_tag size =
+        rbimpl_size_mul_overflow(x, y);
+
+    if (RB_LIKELY(! size.left)) {
+        return size.right;
+    }
+    else {
+        ruby_malloc_size_overflow(x, y);
+        RBIMPL_UNREACHABLE_RETURN(0);
+    }
+}
+
+static inline void *
+rb_alloc_tmp_buffer2(volatile VALUE *store, long count, size_t elsize)
+{
+    const size_t total_size = rbimpl_size_mul_or_raise(count, elsize);
+    const size_t cnt = (total_size + sizeof(VALUE) - 1) / sizeof(VALUE);
+    return rb_alloc_tmp_buffer_with_count(store, total_size, cnt);
+}
+
+#ifndef __MINGW32__
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+RBIMPL_ATTR_NOALIAS()
+RBIMPL_ATTR_NONNULL((1))
+RBIMPL_ATTR_RETURNS_NONNULL()
+/* At least since 2004, glibc's <string.h> annotates memcpy to be
+ * __attribute__((__nonnull__(1, 2))).  However it is safe to pass NULL to the
+ * source pointer, if n is 0.  Let's wrap memcpy. */
+static inline void *
+ruby_nonempty_memcpy(void *dest, const void *src, size_t n)
+{
+    if (n) {
+        return memcpy(dest, src, n);
+    }
+    else {
+        return dest;
+    }
+}
+RBIMPL_SYMBOL_EXPORT_END()
+#undef memcpy
+#define memcpy ruby_nonempty_memcpy
+#endif
+
+#endif /* RBIMPL_MEMORY_H */
diff --git a/include/ruby/internal/method.h b/include/ruby/internal/method.h
new file mode 100644
index 0000000000..67600e8732
--- /dev/null
+++ b/include/ruby/internal/method.h
@@ -0,0 +1,39 @@
+#ifndef RBIMPL_METHOD_H                              /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_METHOD_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Creation and modification of Ruby methods.
+ */
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+#include "ruby/backward/2/stdarg.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+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);
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_METHOD_H */
diff --git a/include/ruby/internal/module.h b/include/ruby/internal/module.h
new file mode 100644
index 0000000000..0f2dfdb1be
--- /dev/null
+++ b/include/ruby/internal/module.h
@@ -0,0 +1,39 @@
+#ifndef RBIMPL_MODULE_H                              /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_MODULE_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Creation and modification of Ruby modules.
+ */
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+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_prepend_module(VALUE,VALUE);
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_MODULE_H */
diff --git a/include/ruby/internal/newobj.h b/include/ruby/internal/newobj.h
new file mode 100644
index 0000000000..684226e54b
--- /dev/null
+++ b/include/ruby/internal/newobj.h
@@ -0,0 +1,73 @@
+#ifndef RBIMPL_NEWOBJ_H                              /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_NEWOBJ_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #NEWOBJ.
+ */
+#include "ruby/internal/cast.h"
+#include "ruby/internal/core/rbasic.h"
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/fl_type.h"
+#include "ruby/internal/special_consts.h"
+#include "ruby/internal/value.h"
+#include "ruby/assert.h"
+
+#define RB_NEWOBJ(obj,type) type *(obj) = RBIMPL_CAST((type *)rb_newobj())
+#define RB_NEWOBJ_OF(obj,type,klass,flags) type *(obj) = RBIMPL_CAST((type *)rb_newobj_of(klass, flags))
+
+#define NEWOBJ     RB_NEWOBJ
+#define NEWOBJ_OF  RB_NEWOBJ_OF /* core has special NEWOBJ_OF() in internal.h */
+#define OBJSETUP   rb_obj_setup /* use NEWOBJ_OF instead of NEWOBJ()+OBJSETUP() */
+#define CLONESETUP rb_clone_setup
+#define DUPSETUP   rb_dup_setup
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+VALUE rb_newobj(void);
+VALUE rb_newobj_of(VALUE, VALUE);
+VALUE rb_obj_setup(VALUE obj, VALUE klass, VALUE type);
+VALUE rb_obj_class(VALUE);
+VALUE rb_singleton_class_clone(VALUE);
+void rb_singleton_class_attached(VALUE,VALUE);
+void rb_copy_generic_ivar(VALUE,VALUE);
+RBIMPL_SYMBOL_EXPORT_END()
+
+static inline void
+rb_clone_setup(VALUE clone, VALUE obj)
+{
+    RBIMPL_ASSERT_OR_ASSUME(! RB_SPECIAL_CONST_P(obj));
+    RBIMPL_ASSERT_OR_ASSUME(! RB_SPECIAL_CONST_P(clone));
+
+    const VALUE flags = RUBY_FL_PROMOTED0 | RUBY_FL_PROMOTED1 | RUBY_FL_FINALIZE;
+    rb_obj_setup(clone, rb_singleton_class_clone(obj),
+                 RB_FL_TEST_RAW(obj, ~flags));
+    rb_singleton_class_attached(RBASIC_CLASS(clone), clone);
+    if (RB_FL_TEST(obj, RUBY_FL_EXIVAR)) rb_copy_generic_ivar(clone, obj);
+}
+
+static inline void
+rb_dup_setup(VALUE dup, VALUE obj)
+{
+    RBIMPL_ASSERT_OR_ASSUME(! RB_SPECIAL_CONST_P(obj));
+    RBIMPL_ASSERT_OR_ASSUME(! RB_SPECIAL_CONST_P(dup));
+
+    rb_obj_setup(dup, rb_obj_class(obj), RB_FL_TEST_RAW(obj, RUBY_FL_DUPPED));
+    if (RB_FL_TEST(obj, RUBY_FL_EXIVAR)) rb_copy_generic_ivar(dup, obj);
+}
+
+#endif /* RBIMPL_NEWOBJ_H */
diff --git a/include/ruby/internal/rgengc.h b/include/ruby/internal/rgengc.h
new file mode 100644
index 0000000000..2681d41844
--- /dev/null
+++ b/include/ruby/internal/rgengc.h
@@ -0,0 +1,199 @@
+#ifndef RBIMPL_RGENGC_H                              /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_RGENGC_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      RGENGC write-barrier APIs.
+ * @see        Sasada,  K.,  "Gradual  write-barrier   insertion  into  a  Ruby
+ *             interpreter",   in  proceedings   of   the   2019  ACM   SIGPLAN
+ *             International  Symposium on  Memory Management  (ISMM 2019),  pp
+ *             115-121, 2019. https://doi.org/10.1145/3315573.3329986
+ */
+#include "ruby/internal/attr/artificial.h"
+#include "ruby/internal/attr/pure.h"
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/special_consts.h"
+#include "ruby/internal/stdbool.h"
+#include "ruby/internal/value.h"
+#include "ruby/assert.h"
+#include "ruby/backward/2/attributes.h"
+
+#undef USE_RGENGC
+#define USE_RGENGC 1
+
+#ifndef USE_RINCGC
+# define USE_RINCGC 1
+#endif
+
+#ifndef USE_RGENGC_LOGGING_WB_UNPROTECT
+# define USE_RGENGC_LOGGING_WB_UNPROTECT 0
+#endif
+
+#ifndef RGENGC_WB_PROTECTED_ARRAY
+# define RGENGC_WB_PROTECTED_ARRAY 1
+#endif
+
+#ifndef RGENGC_WB_PROTECTED_HASH
+# define RGENGC_WB_PROTECTED_HASH 1
+#endif
+
+#ifndef RGENGC_WB_PROTECTED_STRUCT
+# define RGENGC_WB_PROTECTED_STRUCT 1
+#endif
+
+#ifndef RGENGC_WB_PROTECTED_STRING
+# define RGENGC_WB_PROTECTED_STRING 1
+#endif
+
+#ifndef RGENGC_WB_PROTECTED_OBJECT
+# define RGENGC_WB_PROTECTED_OBJECT 1
+#endif
+
+#ifndef RGENGC_WB_PROTECTED_REGEXP
+# define RGENGC_WB_PROTECTED_REGEXP 1
+#endif
+
+#ifndef RGENGC_WB_PROTECTED_CLASS
+# define RGENGC_WB_PROTECTED_CLASS 1
+#endif
+
+#ifndef RGENGC_WB_PROTECTED_FLOAT
+# define RGENGC_WB_PROTECTED_FLOAT 1
+#endif
+
+#ifndef RGENGC_WB_PROTECTED_COMPLEX
+# define RGENGC_WB_PROTECTED_COMPLEX 1
+#endif
+
+#ifndef RGENGC_WB_PROTECTED_RATIONAL
+# define RGENGC_WB_PROTECTED_RATIONAL 1
+#endif
+
+#ifndef RGENGC_WB_PROTECTED_BIGNUM
+# define RGENGC_WB_PROTECTED_BIGNUM 1
+#endif
+
+#ifndef RGENGC_WB_PROTECTED_NODE_CREF
+# define RGENGC_WB_PROTECTED_NODE_CREF 1
+#endif
+
+/**
+ * @name Write barrier (WB) interfaces:
+ * @{
+ *
+ * @note The following  core interfaces can  be changed in the  future.  Please
+ *       catch up if you want to insert WB into C-extensions correctly.
+ */
+
+/**
+ * WB for new  reference from `a' to  `b'. Write `b' into `*slot'.  `slot' is a
+ * pointer in `a'.
+ */
+#define RB_OBJ_WRITE(a, slot, b) \
+    RBIMPL_CAST(rb_obj_write((VALUE)(a), (VALUE *)(slot), (VALUE)(b), __FILE__, __LINE__))
+/**
+ * WB for new  reference from `a' to  `b'.  This doesn't write  any values, but
+ * only  a WB  declaration.  `oldv'  is replaced  value with  `b' (not  used in
+ * current Ruby).
+ */
+#define RB_OBJ_WRITTEN(a, oldv, b) \
+    RBIMPL_CAST(rb_obj_written((VALUE)(a), (VALUE)(oldv), (VALUE)(b), __FILE__, __LINE__))
+/** @} */
+
+#define OBJ_PROMOTED_RAW RB_OBJ_PROMOTED_RAW
+#define OBJ_PROMOTED     RB_OBJ_PROMOTED
+#define OBJ_WB_UNPROTECT RB_OBJ_WB_UNPROTECT
+
+#define RB_OBJ_WB_UNPROTECT(x) rb_obj_wb_unprotect(x, __FILE__, __LINE__)
+#define RB_OBJ_WB_UNPROTECT_FOR(type, obj) \
+    (RGENGC_WB_PROTECTED_##type ? OBJ_WB_UNPROTECT(obj) : obj)
+#define RGENGC_LOGGING_WB_UNPROTECT rb_gc_unprotect_logging
+
+/** @cond INTERNAL_MACRO */
+#define RB_OBJ_PROMOTED_RAW RB_OBJ_PROMOTED_RAW
+#define RB_OBJ_PROMOTED     RB_OBJ_PROMOTED
+/** @endcond */
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+void rb_gc_writebarrier(VALUE a, VALUE b);
+void rb_gc_writebarrier_unprotect(VALUE obj);
+#if USE_RGENGC_LOGGING_WB_UNPROTECT
+void rb_gc_unprotect_logging(void *objptr, const char *filename, int line);
+#endif
+RBIMPL_SYMBOL_EXPORT_END()
+
+RBIMPL_ATTR_PURE_UNLESS_DEBUG()
+RBIMPL_ATTR_ARTIFICIAL()
+static inline bool
+RB_OBJ_PROMOTED_RAW(VALUE obj)
+{
+    RBIMPL_ASSERT_OR_ASSUME(RB_FL_ABLE(obj));
+    return RB_FL_ANY_RAW(obj,  RUBY_FL_PROMOTED);
+}
+
+RBIMPL_ATTR_PURE_UNLESS_DEBUG()
+RBIMPL_ATTR_ARTIFICIAL()
+static inline bool
+RB_OBJ_PROMOTED(VALUE obj)
+{
+    if (! RB_FL_ABLE(obj)) {
+        return false;
+    }
+    else {
+        return RB_OBJ_PROMOTED_RAW(obj);
+    }
+}
+
+static inline VALUE
+rb_obj_wb_unprotect(VALUE x, RB_UNUSED_VAR(const char *filename), RB_UNUSED_VAR(int line))
+{
+#if USE_RGENGC_LOGGING_WB_UNPROTECT
+    RGENGC_LOGGING_WB_UNPROTECT(RBIMPL_CAST((void *)x), filename, line);
+#endif
+    rb_gc_writebarrier_unprotect(x);
+    return x;
+}
+
+static inline VALUE
+rb_obj_written(VALUE a, RB_UNUSED_VAR(VALUE oldv), VALUE b, RB_UNUSED_VAR(const char *filename), RB_UNUSED_VAR(int line))
+{
+#if USE_RGENGC_LOGGING_WB_UNPROTECT
+    RGENGC_LOGGING_OBJ_WRITTEN(a, oldv, b, filename, line);
+#endif
+
+    if (!RB_SPECIAL_CONST_P(b)) {
+        rb_gc_writebarrier(a, b);
+    }
+
+    return a;
+}
+
+static inline VALUE
+rb_obj_write(VALUE a, VALUE *slot, VALUE b, RB_UNUSED_VAR(const char *filename), RB_UNUSED_VAR(int line))
+{
+#ifdef RGENGC_LOGGING_WRITE
+    RGENGC_LOGGING_WRITE(a, slot, b, filename, line);
+#endif
+
+    *slot = b;
+
+    rb_obj_written(a, RUBY_Qundef /* ignore `oldv' now */, b, filename, line);
+    return a;
+}
+
+#endif /* RBIMPL_RGENGC_H */
diff --git a/include/ruby/internal/scan_args.h b/include/ruby/internal/scan_args.h
new file mode 100644
index 0000000000..d9329e7e98
--- /dev/null
+++ b/include/ruby/internal/scan_args.h
@@ -0,0 +1,401 @@
+#ifndef RBIMPL_SCAN_ARGS_H                           /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_SCAN_ARGS_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Compile-time static implementation of ::rb_scan_args().
+ *
+ * This  is a  beast.  It  statically analyses  the argument  spec string,  and
+ * expands the assignment of variables into dedicated codes.
+ */
+#include "ruby/internal/attr/diagnose_if.h"
+#include "ruby/internal/attr/error.h"
+#include "ruby/internal/attr/forceinline.h"
+#include "ruby/internal/attr/noreturn.h"
+#include "ruby/internal/config.h"
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/has/attribute.h"
+#include "ruby/internal/intern/array.h" /* rb_ary_new_from_values */
+#include "ruby/internal/intern/error.h" /* rb_error_arity */
+#include "ruby/internal/intern/hash.h"  /* rb_hash_dup */
+#include "ruby/internal/intern/proc.h"  /* rb_block_proc */
+#include "ruby/internal/iterator.h"     /* rb_block_given_p / rb_keyword_given_p */
+#include "ruby/internal/static_assert.h"
+#include "ruby/internal/stdbool.h"
+#include "ruby/internal/value.h"
+#include "ruby/assert.h"
+
+#define RB_SCAN_ARGS_PASS_CALLED_KEYWORDS 0
+#define RB_SCAN_ARGS_KEYWORDS 1
+#define RB_SCAN_ARGS_LAST_HASH_KEYWORDS 3
+#define RB_NO_KEYWORDS 0
+#define RB_PASS_KEYWORDS 1
+#define RB_PASS_CALLED_KEYWORDS rb_keyword_given_p()
+/* rb_scan_args() format allows ':' for optional hash */
+#define HAVE_RB_SCAN_ARGS_OPTIONAL_HASH 1
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+int rb_scan_args(int, const VALUE*, const char*, ...);
+int rb_scan_args_kw(int, int, const VALUE*, const char*, ...);
+
+RBIMPL_ATTR_ERROR(("bad scan arg format"))
+void rb_scan_args_bad_format(const char*);
+
+RBIMPL_ATTR_ERROR(("variable argument length doesn't match"))
+void rb_scan_args_length_mismatch(const char*,int);
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+/* If we could use constexpr the following macros could be inline functions
+ * ... but sadly we cannot. */
+
+#define rb_scan_args_isdigit(c) (RBIMPL_CAST((unsigned char)((c)-'0'))<10)
+
+#define rb_scan_args_count_end(fmt, ofs, vari) \
+    ((fmt)[ofs] ? -1 : (vari))
+
+#define rb_scan_args_count_block(fmt, ofs, vari) \
+    ((fmt)[ofs]!='&' ? \
+     rb_scan_args_count_end(fmt, ofs, vari) : \
+     rb_scan_args_count_end(fmt, (ofs)+1, (vari)+1))
+
+#define rb_scan_args_count_hash(fmt, ofs, vari) \
+    ((fmt)[ofs]!=':' ? \
+     rb_scan_args_count_block(fmt, ofs, vari) : \
+     rb_scan_args_count_block(fmt, (ofs)+1, (vari)+1))
+
+#define rb_scan_args_count_trail(fmt, ofs, vari) \
+    (!rb_scan_args_isdigit((fmt)[ofs]) ? \
+     rb_scan_args_count_hash(fmt, ofs, vari) : \
+     rb_scan_args_count_hash(fmt, (ofs)+1, (vari)+((fmt)[ofs]-'0')))
+
+#define rb_scan_args_count_var(fmt, ofs, vari) \
+    ((fmt)[ofs]!='*' ? \
+     rb_scan_args_count_trail(fmt, ofs, vari) : \
+     rb_scan_args_count_trail(fmt, (ofs)+1, (vari)+1))
+
+#define rb_scan_args_count_opt(fmt, ofs, vari) \
+    (!rb_scan_args_isdigit((fmt)[ofs]) ? \
+     rb_scan_args_count_var(fmt, ofs, vari) : \
+     rb_scan_args_count_var(fmt, (ofs)+1, (vari)+(fmt)[ofs]-'0'))
+
+#define rb_scan_args_count_lead(fmt, ofs, vari) \
+    (!rb_scan_args_isdigit((fmt)[ofs]) ? \
+     rb_scan_args_count_var(fmt, ofs, vari) : \
+     rb_scan_args_count_opt(fmt, (ofs)+1, (vari)+(fmt)[ofs]-'0'))
+
+#define rb_scan_args_count(fmt) rb_scan_args_count_lead(fmt, 0, 0)
+
+#if RBIMPL_HAS_ATTRIBUTE(diagnose_if)
+# /* Assertions done in the attribute. */
+# define rb_scan_args_verify(fmt, varc) RBIMPL_ASSERT_NOTHING
+#else
+# /* At  one sight  it _seems_  the expressions  below could  be written  using
+#  * static assrtions.  The reality is no, they don't.  Because fmt is a string
+#  * literal, any operations  against fmt cannot produce  the "integer constant
+#  * expression"s, as  defined in ISO/IEC  9899:2018 section 6.6  paragraph #6.
+#  * Static assertions  need such  integer constant  expressions as  defined in
+#  * ISO/IEC 9899:2018 section 6.7.10 paragraph #3.
+#  *
+#  * GCC nonetheless constant-folds this into no-op, though. */
+# define rb_scan_args_verify(fmt, varc) \
+    (sizeof(char[1-2*(rb_scan_args_count(fmt)<0)])!=1 ? \
+     rb_scan_args_bad_format(fmt) : \
+     sizeof(char[1-2*(rb_scan_args_count(fmt)!=(varc))])!=1 ? \
+     rb_scan_args_length_mismatch(fmt, varc) : \
+     RBIMPL_ASSERT_NOTHING)
+#endif
+
+static inline bool
+rb_scan_args_keyword_p(int kw_flag, VALUE last)
+{
+    switch (kw_flag) {
+      case RB_SCAN_ARGS_PASS_CALLED_KEYWORDS:
+        return !! rb_keyword_given_p();
+      case RB_SCAN_ARGS_KEYWORDS:
+        return true;
+      case RB_SCAN_ARGS_LAST_HASH_KEYWORDS:
+        return RB_TYPE_P(last, T_HASH);
+      default:
+        return false;
+    }
+}
+
+RBIMPL_ATTR_FORCEINLINE()
+static bool
+rb_scan_args_lead_p(const char *fmt)
+{
+    return rb_scan_args_isdigit(fmt[0]);
+}
+
+RBIMPL_ATTR_FORCEINLINE()
+static int
+rb_scan_args_n_lead(const char *fmt)
+{
+    return (rb_scan_args_lead_p(fmt) ? fmt[0]-'0' : 0);
+}
+
+RBIMPL_ATTR_FORCEINLINE()
+static bool
+rb_scan_args_opt_p(const char *fmt)
+{
+    return (rb_scan_args_lead_p(fmt) && rb_scan_args_isdigit(fmt[1]));
+}
+
+RBIMPL_ATTR_FORCEINLINE()
+static int
+rb_scan_args_n_opt(const char *fmt)
+{
+    return (rb_scan_args_opt_p(fmt) ? fmt[1]-'0' : 0);
+}
+
+RBIMPL_ATTR_FORCEINLINE()
+static int
+rb_scan_args_var_idx(const char *fmt)
+{
+    return (!rb_scan_args_lead_p(fmt) ? 0 : !rb_scan_args_isdigit(fmt[1]) ? 1 : 2);
+}
+
+RBIMPL_ATTR_FORCEINLINE()
+static bool
+rb_scan_args_f_var(const char *fmt)
+{
+    return (fmt[rb_scan_args_var_idx(fmt)]=='*');
+}
+
+RBIMPL_ATTR_FORCEINLINE()
+static int
+rb_scan_args_trail_idx(const char *fmt)
+{
+    const int idx = rb_scan_args_var_idx(fmt);
+    return idx+(fmt[idx]=='*');
+}
+
+RBIMPL_ATTR_FORCEINLINE()
+static int
+rb_scan_args_n_trail(const char *fmt)
+{
+    const int idx = rb_scan_args_trail_idx(fmt);
+    return (rb_scan_args_isdigit(fmt[idx]) ? fmt[idx]-'0' : 0);
+}
+
+RBIMPL_ATTR_FORCEINLINE()
+static int
+rb_scan_args_hash_idx(const char *fmt)
+{
+    const int idx = rb_scan_args_trail_idx(fmt);
+    return idx+rb_scan_args_isdigit(fmt[idx]);
+}
+
+RBIMPL_ATTR_FORCEINLINE()
+static bool
+rb_scan_args_f_hash(const char *fmt)
+{
+    return (fmt[rb_scan_args_hash_idx(fmt)]==':');
+}
+
+RBIMPL_ATTR_FORCEINLINE()
+static int
+rb_scan_args_block_idx(const char *fmt)
+{
+    const int idx = rb_scan_args_hash_idx(fmt);
+    return idx+(fmt[idx]==':');
+}
+
+RBIMPL_ATTR_FORCEINLINE()
+static bool
+rb_scan_args_f_block(const char *fmt)
+{
+    return (fmt[rb_scan_args_block_idx(fmt)]=='&');
+}
+
+# if 0
+RBIMPL_ATTR_FORCEINLINE()
+static int
+rb_scan_args_end_idx(const char *fmt)
+{
+    const int idx = rb_scan_args_block_idx(fmt);
+    return idx+(fmt[idx]=='&');
+}
+# endif
+
+/* NOTE: Use `char *fmt` instead of `const char *fmt` because of clang's bug*/
+/* https://bugs.llvm.org/show_bug.cgi?id=38095 */
+# define rb_scan_args0(argc, argv, fmt, varc, vars) \
+    rb_scan_args_set(RB_SCAN_ARGS_PASS_CALLED_KEYWORDS, argc, argv, \
+                     rb_scan_args_n_lead(fmt), \
+                     rb_scan_args_n_opt(fmt), \
+                     rb_scan_args_n_trail(fmt), \
+                     rb_scan_args_f_var(fmt), \
+                     rb_scan_args_f_hash(fmt), \
+                     rb_scan_args_f_block(fmt), \
+                     (rb_scan_args_verify(fmt, varc), vars), (char *)fmt, varc)
+# define rb_scan_args_kw0(kw_flag, argc, argv, fmt, varc, vars) \
+    rb_scan_args_set(kw_flag, argc, argv, \
+                     rb_scan_args_n_lead(fmt), \
+                     rb_scan_args_n_opt(fmt), \
+                     rb_scan_args_n_trail(fmt), \
+                     rb_scan_args_f_var(fmt), \
+                     rb_scan_args_f_hash(fmt), \
+                     rb_scan_args_f_block(fmt), \
+                     (rb_scan_args_verify(fmt, varc), vars), (char *)fmt, varc)
+
+RBIMPL_ATTR_FORCEINLINE()
+static int
+rb_scan_args_set(int kw_flag, int argc, const VALUE *argv,
+                 int n_lead, int n_opt, int n_trail,
+                 bool f_var, bool f_hash, bool f_block,
+                 VALUE *vars[], RB_UNUSED_VAR(const char *fmt), RB_UNUSED_VAR(int varc))
+    RBIMPL_ATTR_DIAGNOSE_IF(rb_scan_args_count(fmt) <  0,    "bad scan arg format",                    "error")
+    RBIMPL_ATTR_DIAGNOSE_IF(rb_scan_args_count(fmt) != varc, "variable argument length doesn't match", "error")
+{
+    int i, argi = 0, vari = 0;
+    VALUE *var, hash = Qnil;
+#define rb_scan_args_next_param() vars[vari++]
+    const int n_mand = n_lead + n_trail;
+
+    /* capture an option hash - phase 1: pop from the argv */
+    if (f_hash && argc > 0) {
+        VALUE last = argv[argc - 1];
+        if (rb_scan_args_keyword_p(kw_flag, last)) {
+            hash = rb_hash_dup(last);
+            argc--;
+        }
+    }
+
+    if (argc < n_mand) {
+        goto argc_error;
+    }
+
+    /* capture leading mandatory arguments */
+    for (i = 0; i < n_lead; i++) {
+        var = rb_scan_args_next_param();
+        if (var) *var = argv[argi];
+        argi++;
+    }
+
+    /* capture optional arguments */
+    for (i = 0; i < n_opt; i++) {
+        var = rb_scan_args_next_param();
+        if (argi < argc - n_trail) {
+            if (var) *var = argv[argi];
+            argi++;
+        }
+        else {
+            if (var) *var = Qnil;
+        }
+    }
+
+    /* capture variable length arguments */
+    if (f_var) {
+        int n_var = argc - argi - n_trail;
+
+        var = rb_scan_args_next_param();
+        if (0 < n_var) {
+            if (var) *var = rb_ary_new_from_values(n_var, &argv[argi]);
+            argi += n_var;
+        }
+        else {
+            if (var) *var = rb_ary_new();
+        }
+    }
+
+    /* capture trailing mandatory arguments */
+    for (i = 0; i < n_trail; i++) {
+        var = rb_scan_args_next_param();
+        if (var) *var = argv[argi];
+        argi++;
+    }
+
+    /* capture an option hash - phase 2: assignment */
+    if (f_hash) {
+        var = rb_scan_args_next_param();
+        if (var) *var = hash;
+    }
+
+    /* capture iterator block */
+    if (f_block) {
+        var = rb_scan_args_next_param();
+        if (rb_block_given_p()) {
+            *var = rb_block_proc();
+        }
+        else {
+            *var = Qnil;
+        }
+    }
+
+    if (argi == argc) {
+        return argc;
+    }
+
+  argc_error:
+    rb_error_arity(argc, n_mand, f_var ? UNLIMITED_ARGUMENTS : n_mand + n_opt);
+    UNREACHABLE_RETURN(-1);
+#undef rb_scan_args_next_param
+}
+
+#if ! defined(HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P)
+# /* skip */
+
+#elif ! defined(HAVE_VA_ARGS_MACRO)
+# /* skip */
+
+#elif ! defined(__OPTIMIZE__)
+# /* skip */
+
+#elif defined(HAVE___VA_OPT__)
+# define rb_scan_args(argc, argvp, fmt, ...)                  \
+    __builtin_choose_expr(                                    \
+        __builtin_constant_p(fmt),                            \
+        rb_scan_args0(                                        \
+            argc, argvp, fmt,                                 \
+            (sizeof((VALUE*[]){__VA_ARGS__})/sizeof(VALUE*)), \
+            ((VALUE*[]){__VA_ARGS__})),                       \
+        (rb_scan_args)(argc, argvp, fmt __VA_OPT__(, __VA_ARGS__)))
+# define rb_scan_args_kw(kw_flag, argc, argvp, fmt, ...)      \
+    __builtin_choose_expr(                                    \
+        __builtin_constant_p(fmt),                            \
+        rb_scan_args_kw0(                                     \
+            kw_flag, argc, argvp, fmt,                        \
+            (sizeof((VALUE*[]){__VA_ARGS__})/sizeof(VALUE*)), \
+            ((VALUE*[]){__VA_ARGS__})),                       \
+        (rb_scan_args_kw)(kw_flag, argc, argvp, fmt __VA_OPT__(, __VA_ARGS__)))
+
+#elif defined(__STRICT_ANSI__)
+# /* skip */
+
+#elif defined(__GNUC__)
+# define rb_scan_args(argc, argvp, fmt, ...)                  \
+    __builtin_choose_expr(                                    \
+        __builtin_constant_p(fmt),                            \
+        rb_scan_args0(                                        \
+            argc, argvp, fmt,                                 \
+            (sizeof((VALUE*[]){__VA_ARGS__})/sizeof(VALUE*)), \
+            ((VALUE*[]){__VA_ARGS__})),                       \
+        (rb_scan_args)(argc, argvp, fmt, __VA_ARGS__))
+# define rb_scan_args_kw(kw_flag, argc, argvp, fmt, ...)      \
+    __builtin_choose_expr(                                    \
+        __builtin_constant_p(fmt),                            \
+        rb_scan_args_kw0(                                     \
+            kw_flag, argc, argvp, fmt,                        \
+            (sizeof((VALUE*[]){__VA_ARGS__})/sizeof(VALUE*)), \
+            ((VALUE*[]){__VA_ARGS__})),                       \
+        (rb_scan_args_kw)(kw_flag, argc, argvp, fmt, __VA_ARGS__ /**/))
+#endif
+
+#endif /* RBIMPL_SCAN_ARGS_H */
diff --git a/include/ruby/internal/special_consts.h b/include/ruby/internal/special_consts.h
new file mode 100644
index 0000000000..f36a230af2
--- /dev/null
+++ b/include/ruby/internal/special_consts.h
@@ -0,0 +1,204 @@
+#ifndef RBIMPL_SPECIAL_CONSTS_H                      /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_SPECIAL_CONSTS_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines enum ::ruby_special_consts.
+ * @see        Sasada,  K.,  "A   Lighweight  Representation  of  Floting-Point
+ *             Numbers  on  Ruby Interpreter",  in  proceedings  of 10th  JSSST
+ *             SIGPPL  Workshop   on  Programming  and   Programming  Languages
+ *             (PPL2008), pp. 9-16, 2008.
+ */
+#include "ruby/internal/attr/artificial.h"
+#include "ruby/internal/attr/const.h"
+#include "ruby/internal/attr/constexpr.h"
+#include "ruby/internal/attr/enum_extensibility.h"
+#include "ruby/internal/stdbool.h"
+#include "ruby/internal/value.h"
+
+#if defined(USE_FLONUM)
+# /* Take that. */
+#elif SIZEOF_VALUE >= SIZEOF_DOUBLE
+# define USE_FLONUM 1
+#else
+# define USE_FLONUM 0
+#endif
+
+#define RTEST           RB_TEST
+
+#define FIXNUM_P        RB_FIXNUM_P
+#define IMMEDIATE_P     RB_IMMEDIATE_P
+#define NIL_P           RB_NIL_P
+#define SPECIAL_CONST_P RB_SPECIAL_CONST_P
+#define STATIC_SYM_P    RB_STATIC_SYM_P
+
+#define Qfalse          RUBY_Qfalse
+#define Qnil            RUBY_Qnil
+#define Qtrue           RUBY_Qtrue
+#define Qundef          RUBY_Qundef
+
+/** @cond INTERNAL_MACRO */
+#define FIXNUM_FLAG        RUBY_FIXNUM_FLAG
+#define FLONUM_FLAG        RUBY_FLONUM_FLAG
+#define FLONUM_MASK        RUBY_FLONUM_MASK
+#define FLONUM_P           RB_FLONUM_P
+#define IMMEDIATE_MASK     RUBY_IMMEDIATE_MASK
+#define SYMBOL_FLAG        RUBY_SYMBOL_FLAG
+
+#define RB_FIXNUM_P        RB_FIXNUM_P
+#define RB_FLONUM_P        RB_FLONUM_P
+#define RB_IMMEDIATE_P     RB_IMMEDIATE_P
+#define RB_NIL_P           RB_NIL_P
+#define RB_SPECIAL_CONST_P RB_SPECIAL_CONST_P
+#define RB_STATIC_SYM_P    RB_STATIC_SYM_P
+#define RB_TEST            RB_TEST
+/** @endcond */
+
+/** special constants - i.e. non-zero and non-fixnum constants */
+enum
+RBIMPL_ATTR_ENUM_EXTENSIBILITY(closed)
+ruby_special_consts {
+#if USE_FLONUM
+    RUBY_Qfalse         = 0x00, /* ...0000 0000 */
+    RUBY_Qtrue          = 0x14, /* ...0001 0100 */
+    RUBY_Qnil           = 0x08, /* ...0000 1000 */
+    RUBY_Qundef         = 0x34, /* ...0011 0100 */
+    RUBY_IMMEDIATE_MASK = 0x07, /* ...0000 0111 */
+    RUBY_FIXNUM_FLAG    = 0x01, /* ...xxxx xxx1 */
+    RUBY_FLONUM_MASK    = 0x03, /* ...0000 0011 */
+    RUBY_FLONUM_FLAG    = 0x02, /* ...xxxx xx10 */
+    RUBY_SYMBOL_FLAG    = 0x0c, /* ...xxxx 1100 */
+#else
+    RUBY_Qfalse         = 0x00, /* ...0000 0000 */
+    RUBY_Qtrue          = 0x02, /* ...0000 0010 */
+    RUBY_Qnil           = 0x04, /* ...0000 0100 */
+    RUBY_Qundef         = 0x06, /* ...0000 0110 */
+    RUBY_IMMEDIATE_MASK = 0x03, /* ...0000 0011 */
+    RUBY_FIXNUM_FLAG    = 0x01, /* ...xxxx xxx1 */
+    RUBY_FLONUM_MASK    = 0x00, /* any values ANDed with FLONUM_MASK cannot be FLONUM_FLAG */
+    RUBY_FLONUM_FLAG    = 0x02, /* ...0000 0010 */
+    RUBY_SYMBOL_FLAG    = 0x0e, /* ...0000 1110 */
+#endif
+
+    RUBY_SPECIAL_SHIFT  = 8 /** Least significant 8 bits are reserved. */
+};
+
+RBIMPL_ATTR_CONST()
+RBIMPL_ATTR_CONSTEXPR(CXX11)
+RBIMPL_ATTR_ARTIFICIAL()
+/*
+ * :NOTE: rbimpl_test HAS to be  `__attribute__((const))` in order for clang to
+ * properly deduce `__builtin_assume()`.
+ */
+static inline bool
+RB_TEST(VALUE obj)
+{
+    /*
+     *  Qfalse:  ....0000 0000
+     *  Qnil:    ....0000 1000
+     * ~Qnil:    ....1111 0111
+     *  v        ....xxxx xxxx
+     * ----------------------------
+     *  RTEST(v) ....xxxx 0xxx
+     *
+     *  RTEST(v) can be 0 if and only if (v == Qfalse || v == Qnil).
+     */
+    return obj & ~RUBY_Qnil;
+}
+
+RBIMPL_ATTR_CONST()
+RBIMPL_ATTR_CONSTEXPR(CXX11)
+RBIMPL_ATTR_ARTIFICIAL()
+static inline bool
+RB_NIL_P(VALUE obj)
+{
+    return obj == RUBY_Qnil;
+}
+
+RBIMPL_ATTR_CONST()
+RBIMPL_ATTR_CONSTEXPR(CXX11)
+RBIMPL_ATTR_ARTIFICIAL()
+static inline bool
+RB_FIXNUM_P(VALUE obj)
+{
+    return obj & RUBY_FIXNUM_FLAG;
+}
+
+RBIMPL_ATTR_CONST()
+RBIMPL_ATTR_CONSTEXPR(CXX14)
+RBIMPL_ATTR_ARTIFICIAL()
+static inline bool
+RB_STATIC_SYM_P(VALUE obj)
+{
+    RBIMPL_ATTR_CONSTEXPR(CXX14)
+    const VALUE mask = ~(RBIMPL_VALUE_FULL << RUBY_SPECIAL_SHIFT);
+    return (obj & mask) == RUBY_SYMBOL_FLAG;
+}
+
+RBIMPL_ATTR_CONST()
+RBIMPL_ATTR_CONSTEXPR(CXX11)
+RBIMPL_ATTR_ARTIFICIAL()
+static inline bool
+RB_FLONUM_P(VALUE obj)
+{
+#if USE_FLONUM
+    return (obj & RUBY_FLONUM_MASK) == RUBY_FLONUM_FLAG;
+#else
+    return false;
+#endif
+}
+
+RBIMPL_ATTR_CONST()
+RBIMPL_ATTR_CONSTEXPR(CXX11)
+RBIMPL_ATTR_ARTIFICIAL()
+static inline bool
+RB_IMMEDIATE_P(VALUE obj)
+{
+    return obj & RUBY_IMMEDIATE_MASK;
+}
+
+RBIMPL_ATTR_CONST()
+RBIMPL_ATTR_CONSTEXPR(CXX11)
+RBIMPL_ATTR_ARTIFICIAL()
+static inline bool
+RB_SPECIAL_CONST_P(VALUE obj)
+{
+    return RB_IMMEDIATE_P(obj) || ! RB_TEST(obj);
+}
+
+RBIMPL_ATTR_CONST()
+RBIMPL_ATTR_CONSTEXPR(CXX11)
+/* This  function is  to mimic  old  rb_special_const_p macro  but have  anyone
+ * actually used its return value?  Wasn't it just something no one needed? */
+static inline VALUE
+rb_special_const_p(VALUE obj)
+{
+    return RB_SPECIAL_CONST_P(obj) * RUBY_Qtrue;
+}
+
+/**
+ * @cond INTERNAL_MACRO
+ * See [ruby-dev:27513] for the following macros.
+ */
+#define RUBY_Qfalse RBIMPL_CAST((VALUE)RUBY_Qfalse)
+#define RUBY_Qtrue  RBIMPL_CAST((VALUE)RUBY_Qtrue)
+#define RUBY_Qnil   RBIMPL_CAST((VALUE)RUBY_Qnil)
+#define RUBY_Qundef RBIMPL_CAST((VALUE)RUBY_Qundef)
+/** @endcond */
+
+#endif /* RBIMPL_SPECIAL_CONSTS_H */
diff --git a/include/ruby/internal/static_assert.h b/include/ruby/internal/static_assert.h
new file mode 100644
index 0000000000..d4bdadf196
--- /dev/null
+++ b/include/ruby/internal/static_assert.h
@@ -0,0 +1,77 @@
+#ifndef RBIMPL_STATIC_ASSERT_H                       /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_STATIC_ASSERT_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RBIMPL_STATIC_ASSERT.
+ */
+#include <assert.h>
+#include "ruby/internal/has/extension.h"
+#include "ruby/internal/compiler_since.h"
+
+/** @cond INTERNAL_MACRO */
+#if defined(__cplusplus) && defined(__cpp_static_assert)
+# /* https://isocpp.org/std/standing-documents/sd-6-sg10-feature-test-recommendations */
+# define RBIMPL_STATIC_ASSERT0 static_assert
+
+#elif defined(__cplusplus) && RBIMPL_COMPILER_SINCE(MSVC, 16, 0, 0)
+# define RBIMPL_STATIC_ASSERT0 static_assert
+
+#elif defined(__INTEL_CXX11_MODE__)
+# define RBIMPL_STATIC_ASSERT0 static_assert
+
+#elif defined(__cplusplus) && __cplusplus >= 201103L
+# define RBIMPL_STATIC_ASSERT0 static_assert
+
+#elif defined(__cplusplus) && RBIMPL_HAS_EXTENSION(cxx_static_assert)
+# define RBIMPL_STATIC_ASSERT0 __extension__ static_assert
+
+#elif defined(__GXX_EXPERIMENTAL_CXX0X__) && __GXX_EXPERIMENTAL_CXX0X__
+# define RBIMPL_STATIC_ASSERT0 __extension__ static_assert
+
+#elif defined(__STDC_VERSION__) && RBIMPL_HAS_EXTENSION(c_static_assert)
+# define RBIMPL_STATIC_ASSERT0 __extension__ _Static_assert
+
+#elif defined(__STDC_VERSION__) && RBIMPL_COMPILER_SINCE(GCC, 4, 6, 0)
+# define RBIMPL_STATIC_ASSERT0 __extension__ _Static_assert
+
+#elif defined(static_assert)
+# /* Take <assert.h> definition */
+# define RBIMPL_STATIC_ASSERT0 static_assert
+#endif
+/** @endcond */
+
+/**
+ * @brief  Wraps (or simulates) `static_assert`
+ * @param  name  Valid C/C++ identifier, describing the assertion.
+ * @param  expr  Expression to assert.
+ * @note   `name` shall not be a string literal.
+ */
+#if defined(__DOXYGEN__)
+# define RBIMPL_STATIC_ASSERT static_assert
+
+#elif defined(RBIMPL_STATIC_ASSERT0)
+# define RBIMPL_STATIC_ASSERT(name, expr) \
+    RBIMPL_STATIC_ASSERT0(expr, # name ": " # expr)
+
+#else
+# define RBIMPL_STATIC_ASSERT(name, expr) \
+    typedef int static_assert_ ## name ## _check[1 - 2 * !(expr)]
+#endif
+
+#endif /* RBIMPL_STATIC_ASSERT_H */
diff --git a/include/ruby/internal/stdalign.h b/include/ruby/internal/stdalign.h
new file mode 100644
index 0000000000..02eb7ab959
--- /dev/null
+++ b/include/ruby/internal/stdalign.h
@@ -0,0 +1,133 @@
+#ifndef RBIMPL_STDALIGN_H                            /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_STDALIGN_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RBIMPL_ALIGNAS / #RBIMPL_ALIGNOF
+ */
+#include "ruby/internal/config.h"
+
+#ifdef STDC_HEADERS
+# include <stddef.h>
+#endif
+
+#include "ruby/internal/compiler_is.h"
+#include "ruby/internal/has/attribute.h"
+#include "ruby/internal/has/declspec_attribute.h"
+#include "ruby/internal/has/feature.h"
+
+/**
+ * Wraps (or simulates) `alignas`. This is C++11's `alignas` and is _different_
+ * from C11 `_Alignas`.  For instance,
+ *
+ * ```CXX
+ * typedef struct alignas(128) foo { int foo } foo;
+ * ```
+ *
+ * is a valid C++ while
+ *
+ * ```C
+ * typedef struct _Alignas(128) foo { int foo } foo;
+ * ```
+ *
+ * is an invalid C because:
+ *
+ * - You cannot `struct _Alignas`.
+ * - A `typedef` cannot have alignments.
+ */
+#if defined(__cplusplus) && RBIMPL_HAS_FEATURE(cxx_alignas)
+# define RBIMPL_ALIGNAS alignas
+
+#elif defined(__cplusplus) && (__cplusplus >= 201103L)
+# define RBIMPL_ALIGNAS alignas
+
+#elif defined(__INTEL_CXX11_MODE__)
+# define RBIMPL_ALIGNAS alignas
+
+#elif defined(__GXX_EXPERIMENTAL_CXX0X__)
+# define RBIMPL_ALIGNAS alignas
+
+#elif RBIMPL_HAS_DECLSPEC_ATTRIBUTE(align)
+# define RBIMPL_ALIGNAS(_) __declspec(align(_))
+
+#elif RBIMPL_HAS_ATTRIBUTE(aligned)
+# define RBIMPL_ALIGNAS(_) __attribute__((__aligned__(_)))
+
+#else
+# define RBIMPL_ALIGNAS(_) /* void */
+#endif
+
+/**
+ * Wraps (or simulates) `alignof`.
+ *
+ * We want C11's `_Alignof`.  However in spite of its clear language, compilers
+ * (including GCC  and clang) tend to  have buggy implementations.  We  have to
+ * avoid such things to resort to our own version.
+ *
+ * @see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023
+ * @see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69560
+ * @see https://bugs.llvm.org/show_bug.cgi?id=26547
+ */
+#if defined(__cplusplus)
+# /* C++11 `alignof()` can be buggy. */
+# /* see: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69560 */
+# /* But don't worry, we can use templates. */
+# define RBIMPL_ALIGNOF(T) (static_cast<size_t>(ruby::rbimpl_alignof<T>::value))
+
+namespace ruby {
+template<typename T>
+struct rbimpl_alignof {
+    typedef struct {
+        char _;
+        T t;
+    } type;
+
+    enum {
+        value = offsetof(type, t)
+    };
+};
+}
+
+#elif RBIMPL_COMPILER_IS(MSVC)
+# /* Windows have no alignment glitch.*/
+# define RBIMPL_ALIGNOF __alignof
+
+#elif defined(HAVE__ALIGNOF)
+# /* Autoconf detected availability of a sane `_Alignof()`. */
+# define RBIMPL_ALIGNOF(T) RB_GNUC_EXTENSION(_Alignof(T))
+
+#else
+# /* :BEWARE:  This is  the last  resort.   If your  compiler somehow  supports
+#  * querying the alignment of a type,  you definitely should use that instead.
+#  * There are 2 known pitfalls for this fallback implementation:
+#  *
+#  * First, it is either an undefined  behaviour (C) or an explicit error (C++)
+#  * to define a  struct inside of `offsetof`. C compilers  tend to accept such
+#  * things, but AFAIK C++ has no room to allow.
+#  *
+#  * Second, there exist T  such that `struct { char _; T t;  }` is invalid.  A
+#  * known example is  when T is a  struct with a flexible  array member.  Such
+#  * struct cannot be enclosed into another one.
+#  */
+# /* see: http://www.open-std.org/jtc1/sc22/wg14/www/docs/n2083.htm */
+# /* see: http://www.open-std.org/jtc1/sc22/wg14/www/docs/n2350.htm */
+# define RBIMPL_ALIGNOF(T) offsetof(struct { char _; T t; }, t)
+
+#endif
+
+#endif /* RBIMPL_STDALIGN_H */
diff --git a/include/ruby/internal/stdbool.h b/include/ruby/internal/stdbool.h
new file mode 100644
index 0000000000..0cd5103a05
--- /dev/null
+++ b/include/ruby/internal/stdbool.h
@@ -0,0 +1,51 @@
+#ifndef RBIMPL_STDBOOL_H                             /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_STDBOOL_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      C99 shim for <stdbool.h>
+ */
+#include "ruby/internal/config.h"
+
+#if defined(__bool_true_false_are_defined)
+# /* Take that. */
+
+#elif defined(__cplusplus)
+# /* bool is a keyword in C++. */
+# if defined(HAVE_STDBOOL_H) && (__cplusplus >= 201103L)
+#  include <cstdbool>
+# endif
+#
+# ifndef __bool_true_false_are_defined
+#  define __bool_true_false_are_defined
+# endif
+
+#elif defined(HAVE_STDBOOL_H)
+# /* Take stdbool.h definition. */
+# include <stdbool.h>
+
+#else
+typedef unsigned char _Bool;
+# /* See also http://www.open-std.org/jtc1/sc22/wg14/www/docs/n2229.htm */
+# define bool  _Bool
+# define true  ((_Bool)+1)
+# define false ((_Bool)+0)
+# define __bool_true_false_are_defined
+#endif
+
+#endif /* RBIMPL_STDBOOL_H */
diff --git a/include/ruby/internal/symbol.h b/include/ruby/internal/symbol.h
new file mode 100644
index 0000000000..762f1e8f9b
--- /dev/null
+++ b/include/ruby/internal/symbol.h
@@ -0,0 +1,114 @@
+#ifndef RBIMPL_SYMBOL_H                              /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_SYMBOL_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #rb_intern
+ */
+#include "ruby/internal/config.h"
+
+#ifdef HAVE_STDDEF_H
+# include <stddef.h>
+#endif
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+
+#include "ruby/internal/attr/nonnull.h"
+#include "ruby/internal/attr/pure.h"
+#include "ruby/internal/attr/noalias.h"
+#include "ruby/internal/cast.h"
+#include "ruby/internal/constant_p.h"
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/has/builtin.h"
+#include "ruby/internal/value.h"
+
+#define RB_ID2SYM      rb_id2sym
+#define RB_SYM2ID      rb_sym2id
+#define ID2SYM         RB_ID2SYM
+#define SYM2ID         RB_SYM2ID
+#define CONST_ID_CACHE RUBY_CONST_ID_CACHE
+#define CONST_ID       RUBY_CONST_ID
+
+/** @cond INTERNAL_MACRO */
+#define rb_intern_const rb_intern_const
+/** @endcond */
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+ID rb_sym2id(VALUE);
+VALUE rb_id2sym(ID);
+ID rb_intern(const char*);
+ID rb_intern2(const char*, long);
+ID rb_intern_str(VALUE str);
+const char *rb_id2name(ID);
+ID rb_check_id(volatile VALUE *);
+ID rb_to_id(VALUE);
+VALUE rb_id2str(ID);
+VALUE rb_sym2str(VALUE);
+VALUE rb_to_symbol(VALUE name);
+VALUE rb_check_symbol(volatile VALUE *namep);
+RBIMPL_SYMBOL_EXPORT_END()
+
+RBIMPL_ATTR_PURE()
+RBIMPL_ATTR_NONNULL(())
+static inline ID
+rb_intern_const(const char *str)
+{
+    size_t len = strlen(str);
+    return rb_intern2(str, RBIMPL_CAST((long)len));
+}
+
+RBIMPL_ATTR_NOALIAS()
+RBIMPL_ATTR_NONNULL(())
+static inline ID
+rbimpl_intern_const(ID *ptr, const char *str)
+{
+    while (! *ptr) {
+        *ptr = rb_intern_const(str);
+    }
+
+    return *ptr;
+}
+
+/* Does anyone use it?  Preserved for backward compat. */
+#define RUBY_CONST_ID_CACHE(result, str)                \
+    {                                                   \
+        static ID rb_intern_id_cache;                   \
+        rbimpl_intern_const(&rb_intern_id_cache, (str)); \
+        result rb_intern_id_cache;                      \
+    }
+#define RUBY_CONST_ID(var, str) \
+    do { \
+        static ID rbimpl_id; \
+        (var) = rbimpl_intern_const(&rbimpl_id, (str)); \
+    } while (0)
+
+#if defined(HAVE_STMT_AND_DECL_IN_EXPR)
+/* __builtin_constant_p and statement expression is available
+ * since gcc-2.7.2.3 at least. */
+#define rb_intern(str) \
+    (RBIMPL_CONSTANT_P(str) ? \
+     __extension__ ({ \
+         static ID rbimpl_id; \
+         rbimpl_intern_const(&rbimpl_id, (str)); \
+     }) : \
+     (rb_intern)(str))
+#endif
+
+#endif /* RBIMPL_SYMBOL_H */
diff --git a/include/ruby/internal/token_paste.h b/include/ruby/internal/token_paste.h
new file mode 100644
index 0000000000..c42f7a67ef
--- /dev/null
+++ b/include/ruby/internal/token_paste.h
@@ -0,0 +1,75 @@
+#ifndef RBIMPL_TOKEN_PASTE_H                         /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_TOKEN_PASTE_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines #RBIMPL_TOKEN_PASTE.
+ */
+#include "ruby/internal/config.h"
+#include "ruby/internal/compiler_since.h"
+#include "ruby/internal/has/warning.h"
+#include "ruby/internal/warning_push.h"
+
+/* :TODO: add your  compiler here.  There are many compilers  that can suppress
+ * warnings via pragmas, but not all of them accept such things inside of `#if`
+ * and  variants'  conditions.   And  such nitpicking  behavours  tend  not  be
+ * documented.  Please  improve this file when  you are really sure  about your
+ * compiler's behaviour. */
+
+#if RBIMPL_COMPILER_SINCE(GCC, 4, 2, 0)
+# /* GCC is one of such compiler who  cannot write `_Pragma` inside of a `#if`.
+#  * Cannot but globally kill everything.  This  is of course a very bad thing.
+#  * If you know how to reroute this please tell us. */
+# /* https://gcc.godbolt.org/z/K2xr7X */
+# define RBIMPL_TOKEN_PASTE(x, y) TOKEN_PASTE(x, y)
+# pragma GCC diagnostic ignored "-Wundef"
+# /* > warning: "symbol" is not defined, evaluates to 0 [-Wundef] */
+
+#elif RBIMPL_COMPILER_IS(Intel)
+# /* Ditto for icc. */
+# /* https://gcc.godbolt.org/z/pTwDxE */
+# define RBIMPL_TOKEN_PASTE(x, y) TOKEN_PASTE(x, y)
+# pragma warning(disable: 193)
+# /* > warning #193: zero used for undefined preprocessing identifier */
+
+#elif RBIMPL_COMPILER_BEFORE(MSVC, 19, 14, 26428)
+# /* :FIXME: is 19.14 the exact version they supported this? */
+# define RBIMPL_TOKEN_PASTE(x, y) TOKEN_PASTE(x, y)
+# pragma warning(disable: 4668)
+# /* > warning C4668: 'symbol' is not defined as a preprocessor macro */
+
+#elif RBIMPL_COMPILER_IS(MSVC)
+# define RBIMPL_TOKEN_PASTE(x, y) \
+    RBIMPL_WARNING_PUSH()         \
+    RBIMPL_WARNING_IGNORED(4668)  \
+    TOKEN_PASTE(x, y)            \
+    RBIMPL_WARNING_POP()
+
+#elif RBIMPL_HAS_WARNING("-Wundef")
+# define RBIMPL_TOKEN_PASTE(x, y)   \
+    RBIMPL_WARNING_PUSH()           \
+    RBIMPL_WARNING_IGNORED(-Wundef) \
+    TOKEN_PASTE(x, y)              \
+    RBIMPL_WARNING_POP()
+
+#else
+# /* No way. */
+# define RBIMPL_TOKEN_PASTE(x, y) TOKEN_PASTE(x, y)
+#endif
+
+#endif /* RBIMPL_TOKEN_PASTE_H */
diff --git a/include/ruby/internal/value.h b/include/ruby/internal/value.h
new file mode 100644
index 0000000000..b87fe140af
--- /dev/null
+++ b/include/ruby/internal/value.h
@@ -0,0 +1,66 @@
+#ifndef RBIMPL_VALUE_H                               /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_VALUE_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines ::VALUE and ::ID.
+ */
+#include "ruby/internal/static_assert.h"
+#include "ruby/backward/2/long_long.h"
+#include "ruby/backward/2/limits.h"
+
+#if defined HAVE_UINTPTR_T && 0
+typedef uintptr_t VALUE;
+typedef uintptr_t ID;
+# define SIGNED_VALUE intptr_t
+# define SIZEOF_VALUE SIZEOF_UINTPTR_T
+# undef PRI_VALUE_PREFIX
+# define RBIMPL_VALUE_NULL UINTPTR_C(0)
+# define RBIMPL_VALUE_ONE  UINTPTR_C(1)
+# define RBIMPL_VALUE_FULL UINTPTR_MAX
+
+#elif 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"
+# define RBIMPL_VALUE_NULL 0UL
+# define RBIMPL_VALUE_ONE  1UL
+# define RBIMPL_VALUE_FULL ULONG_MAX
+
+#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 PRI_LL_PREFIX
+# define RBIMPL_VALUE_NULL 0ULL
+# define RBIMPL_VALUE_ONE  1ULL
+# define RBIMPL_VALUE_FULL ULLONG_MAX
+
+#else
+# error ---->> ruby requires sizeof(void*) == sizeof(long) or sizeof(LONG_LONG) to be compiled. <<----
+#endif
+
+RBIMPL_STATIC_ASSERT(sizeof_int, SIZEOF_INT == sizeof(int));
+RBIMPL_STATIC_ASSERT(sizeof_long, SIZEOF_LONG == sizeof(long));
+RBIMPL_STATIC_ASSERT(sizeof_long_long, SIZEOF_LONG_LONG == sizeof(LONG_LONG));
+RBIMPL_STATIC_ASSERT(sizeof_voidp, SIZEOF_VOIDP == sizeof(void *));
+#endif /* RBIMPL_VALUE_H */
diff --git a/include/ruby/internal/value_type.h b/include/ruby/internal/value_type.h
new file mode 100644
index 0000000000..6f24f08910
--- /dev/null
+++ b/include/ruby/internal/value_type.h
@@ -0,0 +1,354 @@
+#ifndef RBIMPL_VALUE_TYPE_H                          /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_VALUE_TYPE_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines enum ::ruby_value_type.
+ */
+#include "ruby/internal/assume.h"
+#include "ruby/internal/attr/artificial.h"
+#include "ruby/internal/attr/cold.h"
+#include "ruby/internal/attr/enum_extensibility.h"
+#include "ruby/internal/attr/forceinline.h"
+#include "ruby/internal/attr/pure.h"
+#include "ruby/internal/cast.h"
+#include "ruby/internal/constant_p.h"
+#include "ruby/internal/core/rbasic.h"
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/has/builtin.h"
+#include "ruby/internal/special_consts.h"
+#include "ruby/internal/stdbool.h"
+#include "ruby/internal/value.h"
+#include "ruby/assert.h"
+
+#if defined(T_DATA)
+/*
+ * :!BEWARE!: (Recent?)   Solaris' <nfs/nfs.h>  have conflicting  definition of
+ * T_DATA.  Let us stop here.  Please have a workaround like this:
+ *
+ * ```C
+ * #include <ruby/ruby.h> // <- Include this one first.
+ * #undef T_DATA          // <- ... and stick to RUBY_T_DATA forever.
+ * #include <nfs/nfs.h>   // <- OS-provided T_DATA introduced.
+ * ```
+ *
+ * See also [ruby-core:4261]
+ */
+# error Bail out due to conflicting definition of T_DATA.
+#endif
+
+#define T_ARRAY    RUBY_T_ARRAY
+#define T_BIGNUM   RUBY_T_BIGNUM
+#define T_CLASS    RUBY_T_CLASS
+#define T_COMPLEX  RUBY_T_COMPLEX
+#define T_DATA     RUBY_T_DATA
+#define T_FALSE    RUBY_T_FALSE
+#define T_FILE     RUBY_T_FILE
+#define T_FIXNUM   RUBY_T_FIXNUM
+#define T_FLOAT    RUBY_T_FLOAT
+#define T_HASH     RUBY_T_HASH
+#define T_ICLASS   RUBY_T_ICLASS
+#define T_IMEMO    RUBY_T_IMEMO
+#define T_MASK     RUBY_T_MASK
+#define T_MATCH    RUBY_T_MATCH
+#define T_MODULE   RUBY_T_MODULE
+#define T_MOVED    RUBY_T_MOVED
+#define T_NIL      RUBY_T_NIL
+#define T_NODE     RUBY_T_NODE
+#define T_NONE     RUBY_T_NONE
+#define T_OBJECT   RUBY_T_OBJECT
+#define T_RATIONAL RUBY_T_RATIONAL
+#define T_REGEXP   RUBY_T_REGEXP
+#define T_STRING   RUBY_T_STRING
+#define T_STRUCT   RUBY_T_STRUCT
+#define T_SYMBOL   RUBY_T_SYMBOL
+#define T_TRUE     RUBY_T_TRUE
+#define T_UNDEF    RUBY_T_UNDEF
+#define T_ZOMBIE   RUBY_T_ZOMBIE
+
+#define BUILTIN_TYPE      RB_BUILTIN_TYPE
+#define DYNAMIC_SYM_P     RB_DYNAMIC_SYM_P
+#define RB_INTEGER_TYPE_P rb_integer_type_p
+#define SYMBOL_P          RB_SYMBOL_P
+#define rb_type_p         RB_TYPE_P
+
+/** @cond INTERNAL_MACRO */
+#define RB_BUILTIN_TYPE   RB_BUILTIN_TYPE
+#define RB_DYNAMIC_SYM_P  RB_DYNAMIC_SYM_P
+#define RB_FLOAT_TYPE_P   RB_FLOAT_TYPE_P
+#define RB_SYMBOL_P       RB_SYMBOL_P
+#define RB_TYPE_P         RB_TYPE_P
+#define Check_Type        Check_Type
+
+#if !RUBY_DEBUG
+# define RBIMPL_ASSERT_TYPE(v, t) RBIMPL_ASSERT_OR_ASSUME(RB_TYPE_P((v), (t)))
+#else
+# define RBIMPL_ASSERT_TYPE Check_Type
+#endif
+/** @endcond */
+
+#define TYPE(_)           RBIMPL_CAST((int)rb_type(_))
+
+/** C-level type of an object. */
+enum
+RBIMPL_ATTR_ENUM_EXTENSIBILITY(closed)
+ruby_value_type {
+    RUBY_T_NONE     = 0x00, /**< Non-object (sweeped etc.) */
+
+    RUBY_T_OBJECT   = 0x01, /**< @see struct ::RObject */
+    RUBY_T_CLASS    = 0x02, /**< @see struct ::RClass and ::rb_cClass */
+    RUBY_T_MODULE   = 0x03, /**< @see struct ::RClass and ::rb_cModule */
+    RUBY_T_FLOAT    = 0x04, /**< @see struct ::RFloat */
+    RUBY_T_STRING   = 0x05, /**< @see struct ::RString */
+    RUBY_T_REGEXP   = 0x06, /**< @see struct ::RRegexp */
+    RUBY_T_ARRAY    = 0x07, /**< @see struct ::RArray */
+    RUBY_T_HASH     = 0x08, /**< @see struct ::RHash */
+    RUBY_T_STRUCT   = 0x09, /**< @see struct ::RStruct */
+    RUBY_T_BIGNUM   = 0x0a, /**< @see struct ::RBignum */
+    RUBY_T_FILE     = 0x0b, /**< @see struct ::RFile */
+    RUBY_T_DATA     = 0x0c, /**< @see struct ::RTypedData */
+    RUBY_T_MATCH    = 0x0d, /**< @see struct ::RMatch */
+    RUBY_T_COMPLEX  = 0x0e, /**< @see struct ::RComplex */
+    RUBY_T_RATIONAL = 0x0f, /**< @see struct ::RRational */
+
+    RUBY_T_NIL      = 0x11, /**< @see ::RUBY_Qnil */
+    RUBY_T_TRUE     = 0x12, /**< @see ::RUBY_Qfalse */
+    RUBY_T_FALSE    = 0x13, /**< @see ::RUBY_Qtrue */
+    RUBY_T_SYMBOL   = 0x14, /**< @see struct ::RSymbol */
+    RUBY_T_FIXNUM   = 0x15, /**< Integers formerly known as Fixnums. */
+    RUBY_T_UNDEF    = 0x16, /**< @see ::RUBY_Qundef */
+
+    RUBY_T_IMEMO    = 0x1a, /**< @see struct ::RIMemo */
+    RUBY_T_NODE     = 0x1b, /**< @see struct ::RNode */
+    RUBY_T_ICLASS   = 0x1c, /**< Hidden classes known as IClasses. */
+    RUBY_T_ZOMBIE   = 0x1d, /**< @see struct ::RZombie */
+    RUBY_T_MOVED    = 0x1e, /**< @see struct ::RMoved */
+
+    RUBY_T_MASK     = 0x1f
+};
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+RBIMPL_ATTR_COLD()
+void rb_check_type(VALUE obj, int t);
+RBIMPL_SYMBOL_EXPORT_END()
+
+RBIMPL_ATTR_PURE_UNLESS_DEBUG()
+RBIMPL_ATTR_ARTIFICIAL()
+static inline enum ruby_value_type
+RB_BUILTIN_TYPE(VALUE obj)
+{
+    RBIMPL_ASSERT_OR_ASSUME(! RB_SPECIAL_CONST_P(obj));
+
+    VALUE ret = RBASIC(obj)->flags & RUBY_T_MASK;
+    return RBIMPL_CAST((enum ruby_value_type)ret);
+}
+
+RBIMPL_ATTR_PURE_UNLESS_DEBUG()
+static inline bool
+rb_integer_type_p(VALUE obj)
+{
+    if (RB_FIXNUM_P(obj)) {
+        return true;
+    }
+    else if (RB_SPECIAL_CONST_P(obj)) {
+        return false;
+    }
+    else {
+        return RB_BUILTIN_TYPE(obj) == RUBY_T_BIGNUM;
+    }
+}
+
+RBIMPL_ATTR_PURE_UNLESS_DEBUG()
+static inline enum ruby_value_type
+rb_type(VALUE obj)
+{
+    if (! RB_SPECIAL_CONST_P(obj)) {
+        return RB_BUILTIN_TYPE(obj);
+    }
+    else if (obj == RUBY_Qfalse) {
+        return RUBY_T_FALSE;
+    }
+    else if (obj == RUBY_Qnil) {
+        return RUBY_T_NIL;
+    }
+    else if (obj == RUBY_Qtrue) {
+        return RUBY_T_TRUE;
+    }
+    else if (obj == RUBY_Qundef) {
+        return RUBY_T_UNDEF;
+    }
+    else if (RB_FIXNUM_P(obj)) {
+        return RUBY_T_FIXNUM;
+    }
+    else if (RB_STATIC_SYM_P(obj)) {
+        return RUBY_T_SYMBOL;
+    }
+    else {
+        RBIMPL_ASSUME(RB_FLONUM_P(obj));
+        return RUBY_T_FLOAT;
+    }
+}
+
+RBIMPL_ATTR_PURE_UNLESS_DEBUG()
+RBIMPL_ATTR_ARTIFICIAL()
+static inline bool
+RB_FLOAT_TYPE_P(VALUE obj)
+{
+    if (RB_FLONUM_P(obj)) {
+        return true;
+    }
+    else if (RB_SPECIAL_CONST_P(obj)) {
+        return false;
+    }
+    else {
+        return RB_BUILTIN_TYPE(obj) == RUBY_T_FLOAT;
+    }
+}
+
+RBIMPL_ATTR_PURE_UNLESS_DEBUG()
+RBIMPL_ATTR_ARTIFICIAL()
+static inline bool
+RB_DYNAMIC_SYM_P(VALUE obj)
+{
+    if (RB_SPECIAL_CONST_P(obj)) {
+        return false;
+    }
+    else {
+        return RB_BUILTIN_TYPE(obj) == RUBY_T_SYMBOL;
+    }
+}
+
+RBIMPL_ATTR_PURE_UNLESS_DEBUG()
+RBIMPL_ATTR_ARTIFICIAL()
+static inline bool
+RB_SYMBOL_P(VALUE obj)
+{
+    return RB_STATIC_SYM_P(obj) || RB_DYNAMIC_SYM_P(obj);
+}
+
+RBIMPL_ATTR_PURE_UNLESS_DEBUG()
+RBIMPL_ATTR_ARTIFICIAL()
+RBIMPL_ATTR_FORCEINLINE()
+static bool
+rbimpl_RB_TYPE_P_fastpath(VALUE obj, enum ruby_value_type t)
+{
+    if (t == RUBY_T_TRUE) {
+        return obj == RUBY_Qtrue;
+    }
+    else if (t == RUBY_T_FALSE) {
+        return obj == RUBY_Qfalse;
+    }
+    else if (t == RUBY_T_NIL) {
+        return obj == RUBY_Qnil;
+    }
+    else if (t == RUBY_T_UNDEF) {
+        return obj == RUBY_Qundef;
+    }
+    else if (t == RUBY_T_FIXNUM) {
+        return RB_FIXNUM_P(obj);
+    }
+    else if (t == RUBY_T_SYMBOL) {
+        return RB_SYMBOL_P(obj);
+    }
+    else if (t == RUBY_T_FLOAT) {
+        return RB_FLOAT_TYPE_P(obj);
+    }
+    else if (RB_SPECIAL_CONST_P(obj)) {
+        return false;
+    }
+    else if (t == RB_BUILTIN_TYPE(obj)) {
+        return true;
+    }
+    else {
+        return false;
+    }
+}
+
+RBIMPL_ATTR_PURE_UNLESS_DEBUG()
+RBIMPL_ATTR_ARTIFICIAL()
+static inline bool
+RB_TYPE_P(VALUE obj, enum ruby_value_type t)
+{
+    if (RBIMPL_CONSTANT_P(t)) {
+        return rbimpl_RB_TYPE_P_fastpath(obj, t);
+    }
+    else {
+        return t == rb_type(obj);
+    }
+}
+
+/** @cond INTERNAL_MACRO */
+/* Clang, unlike GCC, cannot propagate __builtin_constant_p beyond function
+ * boundary. */
+#if defined(__clang__)
+# undef RB_TYPE_P
+# define RB_TYPE_P(obj, t)                  \
+    (RBIMPL_CONSTANT_P(t)                  ? \
+     rbimpl_RB_TYPE_P_fastpath((obj), (t)) : \
+     (RB_TYPE_P)((obj), (t)))
+#endif
+
+/* clang 3.x (4.2 compatible) can't eliminate CSE of RB_BUILTIN_TYPE
+ * in inline function and caller function
+ * See also 8998c06461ea0bef11b3aeb30b6d2ab71c8762ba
+ */
+#if RBIMPL_COMPILER_BEFORE(Clang, 4, 0, 0)
+# undef rb_integer_type_p
+# define rb_integer_type_p(obj)                                 \
+    __extension__ ({                                            \
+        const VALUE integer_type_obj = (obj);                   \
+        (RB_FIXNUM_P(integer_type_obj) ||                       \
+         (!RB_SPECIAL_CONST_P(integer_type_obj) &&              \
+          RB_BUILTIN_TYPE(integer_type_obj) == RUBY_T_BIGNUM)); \
+    })
+#endif
+/** @endcond */
+
+RBIMPL_ATTR_PURE()
+RBIMPL_ATTR_ARTIFICIAL()
+/* Defined in ruby/internal/core/rtypeddata.h */
+static inline bool rbimpl_rtypeddata_p(VALUE obj);
+
+RBIMPL_ATTR_ARTIFICIAL()
+static inline void
+Check_Type(VALUE v, enum ruby_value_type t)
+{
+    if (RB_UNLIKELY(! RB_TYPE_P(v, t))) {
+        goto slowpath;
+    }
+    else if (t != RUBY_T_DATA) {
+        goto fastpath;
+    }
+    else if (rbimpl_rtypeddata_p(v)) {
+        /* The intention itself is not necessarily clear to me, but at least it
+         * is  intentional   to  rule   out  typed   data  here.    See  commit
+         * a7c32bf81d3391cfb78cfda278f469717d0fb794. */
+        goto slowpath;
+    }
+    else {
+        goto fastpath;
+    }
+
+  fastpath:
+    return;
+
+  slowpath: /* <- :TODO: mark this label as cold. */
+    rb_check_type(v, t);
+}
+
+#endif /* RBIMPL_VALUE_TYPE_H */
diff --git a/include/ruby/internal/variable.h b/include/ruby/internal/variable.h
new file mode 100644
index 0000000000..b0cfa61a62
--- /dev/null
+++ b/include/ruby/internal/variable.h
@@ -0,0 +1,62 @@
+#ifndef RBIMPL_VARIABLE_H                            /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_VARIABLE_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      C-function backended Ruby-global variables.
+ */
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/value.h"
+#include "ruby/internal/attr/noreturn.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+typedef VALUE rb_gvar_getter_t(ID id, VALUE *data);
+typedef void  rb_gvar_setter_t(VALUE val, ID id, VALUE *data);
+typedef void  rb_gvar_marker_t(VALUE *var);
+
+rb_gvar_getter_t rb_gvar_undef_getter;
+rb_gvar_setter_t rb_gvar_undef_setter;
+rb_gvar_marker_t rb_gvar_undef_marker;
+
+rb_gvar_getter_t rb_gvar_val_getter;
+rb_gvar_setter_t rb_gvar_val_setter;
+rb_gvar_marker_t rb_gvar_val_marker;
+
+rb_gvar_getter_t rb_gvar_var_getter;
+rb_gvar_setter_t rb_gvar_var_setter;
+rb_gvar_marker_t rb_gvar_var_marker;
+
+RBIMPL_ATTR_NORETURN()
+rb_gvar_setter_t rb_gvar_readonly_setter;
+
+void rb_define_variable(const char*,VALUE*);
+void rb_define_virtual_variable(const char*,rb_gvar_getter_t*,rb_gvar_setter_t*);
+void rb_define_hooked_variable(const char*,VALUE*,rb_gvar_getter_t*,rb_gvar_setter_t*);
+void rb_define_readonly_variable(const char*,const VALUE*);
+void rb_define_const(VALUE,const char*,VALUE);
+void rb_define_global_const(const char*,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);
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_VARIABLE_H */
diff --git a/include/ruby/internal/warning_push.h b/include/ruby/internal/warning_push.h
new file mode 100644
index 0000000000..b8a21aaeab
--- /dev/null
+++ b/include/ruby/internal/warning_push.h
@@ -0,0 +1,91 @@
+#ifndef RBIMPL_WARNING_PUSH_H                        /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_WARNING_PUSH_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Defines RBIMPL_WARNING_PUSH.
+ * @cond       INTERNAL_MACRO
+ *
+ * ### Q&A ###
+ *
+ * Q: Why all the macros defined in this file are function-like macros?
+ *
+ * A: Sigh.   This  is  because of  Doxgen.   Its  `SKIP_FUNCTION_MACROS = YES`
+ *    configuration setting  requests us  that if  we want  it to  ignore these
+ *    macros,  then we  have to  do  two things:  (1)  let them  be defined  as
+ *    function-like macros,  and (2) place  them separately in their  own line,
+ *    like below:
+ *
+ *    ```CXX
+ *    // NG -- foo's type  considered something like `unsigned int`.
+ *    RBIMPL_WARNING_PUSH
+ *    int foo(void);
+ *    RBIMPL_WARNING_POP
+ *
+ *    // OK -- the macros are ignored by Doxygen.
+ *    RBIMPL_WARNING_PUSH()
+ *    int foo(void);
+ *    RBIMPL_WARNING_POP()
+ *    ```
+ */
+#include "ruby/internal/compiler_is.h"
+#include "ruby/internal/compiler_since.h"
+
+#if RBIMPL_COMPILER_SINCE(MSVC, 12, 0, 0)
+# /* Not sure exactly when but it seems VC++ 6.0 is a version with it.*/
+# define RBIMPL_WARNING_PUSH()        __pragma(warning(push))
+# define RBIMPL_WARNING_POP()         __pragma(warning(pop))
+# define RBIMPL_WARNING_ERROR(flag)   __pragma(warning(error: flag))
+# define RBIMPL_WARNING_IGNORED(flag) __pragma(warning(disable: flag))
+
+#elif RBIMPL_COMPILER_SINCE(Intel, 13, 0, 0)
+# define RBIMPL_WARNING_PUSH()        __pragma(warning(push))
+# define RBIMPL_WARNING_POP()         __pragma(warning(pop))
+# define RBIMPL_WARNING_ERROR(flag)   __pragma(warning(error: flag))
+# define RBIMPL_WARNING_IGNORED(flag) __pragma(warning(disable: flag))
+
+#elif RBIMPL_COMPILER_IS(Clang) || RBIMPL_COMPILER_IS(Apple)
+# /* Not sure exactly when but it seems LLVM 2.6.0 is a version with it. */
+# define RBIMPL_WARNING_PRAGMA0(x)    _Pragma(# x)
+# define RBIMPL_WARNING_PRAGMA1(x)    RBIMPL_WARNING_PRAGMA0(clang diagnostic x)
+# define RBIMPL_WARNING_PRAGMA2(x, y) RBIMPL_WARNING_PRAGMA1(x # y)
+# define RBIMPL_WARNING_PUSH()        RBIMPL_WARNING_PRAGMA1(push)
+# define RBIMPL_WARNING_POP()         RBIMPL_WARNING_PRAGMA1(pop)
+# define RBIMPL_WARNING_ERROR(flag)   RBIMPL_WARNING_PRAGMA2(error, flag)
+# define RBIMPL_WARNING_IGNORED(flag) RBIMPL_WARNING_PRAGMA2(ignored, flag)
+
+#elif RBIMPL_COMPILER_SINCE(GCC, 4, 6, 0)
+# /* https://gcc.gnu.org/onlinedocs/gcc-4.6.0/gcc/Diagnostic-Pragmas.html */
+# define RBIMPL_WARNING_PRAGMA0(x)    _Pragma(# x)
+# define RBIMPL_WARNING_PRAGMA1(x)    RBIMPL_WARNING_PRAGMA0(GCC diagnostic x)
+# define RBIMPL_WARNING_PRAGMA2(x, y) RBIMPL_WARNING_PRAGMA1(x # y)
+# define RBIMPL_WARNING_PUSH()        RBIMPL_WARNING_PRAGMA1(push)
+# define RBIMPL_WARNING_POP()         RBIMPL_WARNING_PRAGMA1(pop)
+# define RBIMPL_WARNING_ERROR(flag)   RBIMPL_WARNING_PRAGMA2(error, flag)
+# define RBIMPL_WARNING_IGNORED(flag) RBIMPL_WARNING_PRAGMA2(ignored, flag)
+
+#else
+# /* :FIXME: improve here */
+# define RBIMPL_WARNING_PUSH()        /* void */
+# define RBIMPL_WARNING_POP()         /* void */
+# define RBIMPL_WARNING_ERROR(flag)   /* void */
+# define RBIMPL_WARNING_IGNORED(flag) /* void */
+#endif /* _MSC_VER */
+/** @endcond */
+
+#endif /* RBIMPL_WARNING_PUSH_H */
diff --git a/include/ruby/internal/xmalloc.h b/include/ruby/internal/xmalloc.h
new file mode 100644
index 0000000000..76da1eb099
--- /dev/null
+++ b/include/ruby/internal/xmalloc.h
@@ -0,0 +1,362 @@
+#ifndef RBIMPL_XMALLOC_H                             /*-*-C++-*-vi:se ft=cpp:*/
+#define RBIMPL_XMALLOC_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @warning    Symbols   prefixed  with   either  `RBIMPL`   or  `rbimpl`   are
+ *             implementation details.   Don't take  them as canon.  They could
+ *             rapidly appear then vanish.  The name (path) of this header file
+ *             is also an  implementation detail.  Do not expect  it to persist
+ *             at the place it is now.  Developers are free to move it anywhere
+ *             anytime at will.
+ * @note       To  ruby-core:  remember  that   this  header  can  be  possibly
+ *             recursively included  from extension  libraries written  in C++.
+ *             Do not  expect for  instance `__VA_ARGS__` is  always available.
+ *             We assume C99  for ruby itself but we don't  assume languages of
+ *             extension libraries. They could be written in C++98.
+ * @brief      Declares ::ruby_xmalloc().
+ */
+#include "ruby/internal/config.h"
+
+#ifdef STDC_HEADERS
+# include <stddef.h>
+#endif
+
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+
+#include "ruby/internal/attr/alloc_size.h"
+#include "ruby/internal/attr/nodiscard.h"
+#include "ruby/internal/attr/noexcept.h"
+#include "ruby/internal/attr/restrict.h"
+#include "ruby/internal/attr/returns_nonnull.h"
+#include "ruby/internal/dllexport.h"
+
+#ifndef USE_GC_MALLOC_OBJ_INFO_DETAILS
+# define USE_GC_MALLOC_OBJ_INFO_DETAILS 0
+#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
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+RBIMPL_ATTR_NODISCARD()
+RBIMPL_ATTR_RESTRICT()
+RBIMPL_ATTR_RETURNS_NONNULL()
+RBIMPL_ATTR_ALLOC_SIZE((1))
+/**
+ * Allocates a  storage instance.  It is  largely the same as  system malloc(),
+ * except:
+ *
+ *   - It raises Ruby exceptions instead of returning NULL, and
+ *   - In case of `ENOMEM` it tries to GC to make some room.
+ *
+ * @param[in]  size            Requested amount of memory.
+ * @exception  rb_eNoMemError  No space left for `size` bytes allocation.
+ * @return     A valid pointer  to an allocated storage instance;  which has at
+ *             least `size` bytes width, with appropriate alignment detected by
+ *             the underlying malloc() routine.
+ * @note       It doesn't return NULL.
+ * @note       Unlike some malloc() implementations, it allocates something and
+ *             returns a meaningful value even when `size` is equal to zero.
+ * @warning    The return  value shall  be invalidated  exactly once  by either
+ *             ruby_xfree(),  ruby_xrealloc(), or  ruby_xrealloc2().   It is  a
+ *             failure to pass it to system free(), because the system and Ruby
+ *             might or might not share the same malloc() implementation.
+ */
+void *ruby_xmalloc(size_t size)
+RBIMPL_ATTR_NOEXCEPT(malloc(size))
+;
+
+RBIMPL_ATTR_NODISCARD()
+RBIMPL_ATTR_RESTRICT()
+RBIMPL_ATTR_RETURNS_NONNULL()
+RBIMPL_ATTR_ALLOC_SIZE((1,2))
+/**
+ * Identical to ruby_xmalloc(), except it allocates `nelems` * `elemsiz` bytes.
+ * This is needed  because the multiplication could integer  overflow.  On such
+ * situations  Ruby does  not try  to  allocate at  all but  raises Ruby  level
+ * exceptions  instead.  If  there  is  no integer  overflow  the behaviour  is
+ * exactly the same as `ruby_xmalloc(nelems*elemsiz)`.
+ *
+ * @param[in]  nelems          Number of elements.
+ * @param[in]  elemsiz         Size of an element.
+ * @exception  rb_eNoMemError  No space left for allocation.
+ * @exception  rb_eArgError    `nelems` * `elemsiz` would overflow.
+ * @return     A valid pointer  to an allocated storage instance;  which has at
+ *             least  `nelems`  *  `elemsiz`   bytes  width,  with  appropriate
+ *             alignment detected by the underlying malloc() routine.
+ * @note       It doesn't return NULL.
+ * @note       Unlike some malloc() implementations, it allocates something and
+ *             returns a  meaningful value even  when `nelems` or  `elemsiz` or
+ *             both are zero.
+ * @warning    The return  value shall  be invalidated  exactly once  by either
+ *             ruby_xfree(),  ruby_xrealloc(), or  ruby_xrealloc2().   It is  a
+ *             failure to pass it to system free(), because the system and Ruby
+ *             might or might not share the same malloc() implementation.
+ */
+void *ruby_xmalloc2(size_t nelems, size_t elemsiz)
+RBIMPL_ATTR_NOEXCEPT(malloc(nelems * elemsiz))
+;
+
+RBIMPL_ATTR_NODISCARD()
+RBIMPL_ATTR_RESTRICT()
+RBIMPL_ATTR_RETURNS_NONNULL()
+RBIMPL_ATTR_ALLOC_SIZE((1,2))
+/**
+ * Identical  to ruby_xmalloc2(),  except it  zero-fills the  region before  it
+ * returns.  This could also be seen  as a routine identical to ruby_xmalloc(),
+ * except it calls calloc() instead of malloc() internally.
+ *
+ * @param[in]  nelems          Number of elements.
+ * @param[in]  elemsiz         Size of an element.
+ * @exception  rb_eNoMemError  No space left for allocation.
+ * @exception  rb_eArgError    `nelems` * `elemsiz` would overflow.
+ * @return     A valid pointer  to an allocated storage instance;  which has at
+ *             least  `nelems`  *  `elemsiz`   bytes  width,  with  appropriate
+ *             alignment detected by the underlying calloc() routine.
+ * @note       It doesn't return NULL.
+ * @note       Unlike some calloc() implementations, it allocates something and
+ *             returns a  meaningful value even  when `nelems` or  `elemsiz` or
+ *             both are zero.
+ * @warning    The return  value shall  be invalidated  exactly once  by either
+ *             ruby_xfree(),  ruby_xrealloc(), or  ruby_xrealloc2().   It is  a
+ *             failure to pass it to system free(), because the system and Ruby
+ *             might or might not share the same malloc() implementation.
+ */
+void *ruby_xcalloc(size_t nelems, size_t elemsiz)
+RBIMPL_ATTR_NOEXCEPT(calloc(nelems, elemsiz))
+;
+
+RBIMPL_ATTR_NODISCARD()
+RBIMPL_ATTR_RETURNS_NONNULL()
+RBIMPL_ATTR_ALLOC_SIZE((2))
+/**
+ * Resize the storage instance.
+ *
+ * @param[in]  ptr             A valid  pointer to a storage  instance that was
+ *                             previously returned  from either ruby_xmalloc(),
+ *                             ruby_xmalloc2(),                 ruby_xcalloc(),
+ *                             ruby_xrealloc(), or ruby_xrealloc2().
+ * @param[in]  newsiz          Requested new amount of memory.
+ * @exception  rb_eNoMemError  No space left for `newsiz` bytes allocation.
+ * @retval     ptr             In case the function  returns the passed pointer
+ *                             as-is,  the storage  instance  that the  pointer
+ *                             holds  is either  grown or  shrunken to  have at
+ *                             least `newsiz` bytes.
+ * @retval     otherwise       A  valid pointer  to a  newly allocated  storage
+ *                             instance  which  has  at  least  `newsiz`  bytes
+ *                             width, and holds previous contents of `ptr`.  In
+ *                             this  case `ptr`  is  invalidated as  if it  was
+ *                             passed to ruby_xfree().
+ * @note       It doesn't return NULL.
+ * @warning    Unlike some realloc() implementations, passing zero to `elemsiz`
+ *             is not the  same as calling ruby_xfree(),  because this function
+ *             never returns NULL.  Something meaningful still returns then.
+ * @warning    It is  a failure not to  check the return value.   Do not assume
+ *             anything on  it.  It could  be either identical to,  or distinct
+ *             form the passed argument.
+ * @warning    Do not  assume anything  on the alignment  of the  return value.
+ *             There is  no guarantee  that it  inherits the  passed argument's
+ *             one.
+ * @warning    The return  value shall  be invalidated  exactly once  by either
+ *             ruby_xfree(),  ruby_xrealloc(), or  ruby_xrealloc2().   It is  a
+ *             failure to pass it to system free(), because the system and Ruby
+ *             might or might not share the same malloc() implementation.
+ */
+void *ruby_xrealloc(void *ptr, size_t newsiz)
+RBIMPL_ATTR_NOEXCEPT(realloc(ptr, newsiz))
+;
+
+RBIMPL_ATTR_NODISCARD()
+RBIMPL_ATTR_RETURNS_NONNULL()
+RBIMPL_ATTR_ALLOC_SIZE((2,3))
+/**
+ * Identical to ruby_xrealloc(),  except it resizes the  given storage instance
+ * to `newelems` *  `newsiz` bytes.  This is needed  because the multiplication
+ * could integer overflow.   On such situations Ruby does not  try to touch the
+ * contents  of  argument pointer  at  all  but  raises Ruby  level  exceptions
+ * instead.  If there is no integer  overflow the behaviour is exactly the same
+ * as `ruby_xrealloc(ptr,nelems*elemsiz)`.
+ *
+ * This  is   roughly  the  same   as  reallocarray()  function   that  OpenBSD
+ * etc. provides, but also interacts with our GC.
+ *
+ * @param[in]  ptr             A valid  pointer to a storage  instance that was
+ *                             previously returned  from either ruby_xmalloc(),
+ *                             ruby_xmalloc2(),                 ruby_xcalloc(),
+ *                             ruby_xrealloc(), or ruby_xrealloc2().
+
+ * @param[in]  newelems        Requested new number of elements.
+ * @param[in]  newsiz          Requested new size of each element.
+ * @exception  rb_eNoMemError  No space left for  allocation.
+ * @exception  rb_eArgError    `newelems` * `newsiz` would overflow.
+ * @retval     ptr             In case the function  returns the passed pointer
+ *                             as-is,  the storage  instance  that the  pointer
+ *                             holds  is either  grown or  shrunken to  have at
+ *                             least `newelems` * `newsiz` bytes.
+ * @retval     otherwise       A  valid pointer  to a  newly allocated  storage
+ *                             instance  which   has  at  least   `newelems`  *
+ *                             `newsiz`   bytes  width,   and  holds   previous
+ *                             contents  of  `ptr`.   In  this  case  `ptr`  is
+ *                             invalidated as if it was passed to ruby_xfree().
+ * @note       It doesn't return NULL.
+ * @warning    Unlike some  realloc() implementations,  passing zero  to either
+ *             `newelems`   or  `elemsiz`   are   not  the   same  as   calling
+ *             ruby_xfree(),   because  this   function  never   returns  NULL.
+ *             Something meaningful still returns then.
+ * @warning    It is  a failure not to  check the return value.   Do not assume
+ *             anything on  it.  It could  be either identical to,  or distinct
+ *             form the passed argument.
+ * @warning    Do not  assume anything  on the alignment  of the  return value.
+ *             There is  no guarantee  that it  inherits the  passed argument's
+ *             one.
+ * @warning    The return  value shall  be invalidated  exactly once  by either
+ *             ruby_xfree(),  ruby_xrealloc(), or  ruby_xrealloc2().   It is  a
+ *             failure to pass it to system free(), because the system and Ruby
+ *             might or might not share the same malloc() implementation.
+ */
+void *ruby_xrealloc2(void *ptr, size_t newelems, size_t newsiz)
+RBIMPL_ATTR_NOEXCEPT(realloc(ptr, newelems * newsiz))
+;
+
+/**
+ * Deallocates a storage instance.
+ *
+ * @param[out]  ptr  Either NULL,  or a valid pointer  previously returned from
+ *                   one  of  ruby_xmalloc(), ruby_xmalloc2(),  ruby_xcalloc(),
+ *                   ruby_xrealloc(), or ruby_xrealloc2().
+ * @warning     Every single storage instance  that was previously allocated by
+ *              either    ruby_xmalloc(),   ruby_xmalloc2(),    ruby_xcalloc(),
+ *              ruby_xrealloc(),  or  ruby_xrealloc2()   shall  be  invalidated
+ *              exactly once by  either passing it to  ruby_xfree(), or passing
+ *              it to  either ruby_xrealloc(), ruby_xrealloc2() then  check the
+ *              return value for invalidation.
+ * @warning     Do not pass anything other  than pointers described above.  For
+ *              instance pointers returned from malloc() or mmap() shall not be
+ *              passed  to   this  function,  because  the   underlying  memory
+ *              management mechanism could differ.
+ * @warning     Do  not pass  any invalid  pointers  to this  function e.g.  by
+ *              calling it twice with a same argument.
+ */
+void ruby_xfree(void *ptr)
+RBIMPL_ATTR_NOEXCEPT(free(ptr))
+;
+
+#if USE_GC_MALLOC_OBJ_INFO_DETAILS || defined(__DOXYGEN)
+# define ruby_xmalloc(s1)            ruby_xmalloc_with_location(s1, __FILE__, __LINE__)
+# define ruby_xmalloc2(s1, s2)       ruby_xmalloc2_with_location(s1, s2, __FILE__, __LINE__)
+# define ruby_xcalloc(s1, s2)        ruby_xcalloc_with_location(s1, s2, __FILE__, __LINE__)
+# define ruby_xrealloc(ptr, s1)      ruby_xrealloc_with_location(ptr, s1, __FILE__, __LINE__)
+# define ruby_xrealloc2(ptr, s1, s2) ruby_xrealloc2_with_location(ptr, s1, s2, __FILE__, __LINE__)
+
+RBIMPL_ATTR_NODISCARD()
+RBIMPL_ATTR_RESTRICT()
+RBIMPL_ATTR_RETURNS_NONNULL()
+RBIMPL_ATTR_ALLOC_SIZE((1))
+void *ruby_xmalloc_body(size_t size)
+RBIMPL_ATTR_NOEXCEPT(malloc(size))
+;
+
+RBIMPL_ATTR_NODISCARD()
+RBIMPL_ATTR_RESTRICT()
+RBIMPL_ATTR_RETURNS_NONNULL()
+RBIMPL_ATTR_ALLOC_SIZE((1,2))
+void *ruby_xmalloc2_body(size_t nelems, size_t elemsiz)
+RBIMPL_ATTR_NOEXCEPT(malloc(nelems * elemsiz))
+;
+
+RBIMPL_ATTR_NODISCARD()
+RBIMPL_ATTR_RESTRICT()
+RBIMPL_ATTR_RETURNS_NONNULL()
+RBIMPL_ATTR_ALLOC_SIZE((1,2))
+void *ruby_xcalloc_body(size_t nelems, size_t elemsiz)
+RBIMPL_ATTR_NOEXCEPT(calloc(nelems, elemsiz))
+;
+
+RBIMPL_ATTR_NODISCARD()
+RBIMPL_ATTR_RETURNS_NONNULL()
+RBIMPL_ATTR_ALLOC_SIZE((2))
+void *ruby_xrealloc_body(void *ptr, size_t newsiz)
+RBIMPL_ATTR_NOEXCEPT(realloc(ptr, newsiz))
+;
+
+RBIMPL_ATTR_NODISCARD()
+RBIMPL_ATTR_RETURNS_NONNULL()
+RBIMPL_ATTR_ALLOC_SIZE((2,3))
+void *ruby_xrealloc2_body(void *ptr, size_t newelems, size_t newsiz)
+RBIMPL_ATTR_NOEXCEPT(realloc(ptr, newelems * newsiz))
+;
+
+RUBY_EXTERN const char *ruby_malloc_info_file;
+RUBY_EXTERN int ruby_malloc_info_line;
+
+static inline void *
+ruby_xmalloc_with_location(size_t s, const char *file, int line)
+{
+    void *ptr;
+    ruby_malloc_info_file = file;
+    ruby_malloc_info_line = line;
+    ptr = ruby_xmalloc_body(s);
+    ruby_malloc_info_file = NULL;
+    return ptr;
+}
+
+static inline void *
+ruby_xmalloc2_with_location(size_t s1, size_t s2, const char *file, int line)
+{
+    void *ptr;
+    ruby_malloc_info_file = file;
+    ruby_malloc_info_line = line;
+    ptr = ruby_xmalloc2_body(s1, s2);
+    ruby_malloc_info_file = NULL;
+    return ptr;
+}
+
+static inline void *
+ruby_xcalloc_with_location(size_t s1, size_t s2, const char *file, int line)
+{
+    void *ptr;
+    ruby_malloc_info_file = file;
+    ruby_malloc_info_line = line;
+    ptr = ruby_xcalloc_body(s1, s2);
+    ruby_malloc_info_file = NULL;
+    return ptr;
+}
+
+static inline void *
+ruby_xrealloc_with_location(void *ptr, size_t s, const char *file, int line)
+{
+    void *rptr;
+    ruby_malloc_info_file = file;
+    ruby_malloc_info_line = line;
+    rptr = ruby_xrealloc_body(ptr, s);
+    ruby_malloc_info_file = NULL;
+    return rptr;
+}
+
+static inline void *
+ruby_xrealloc2_with_location(void *ptr, size_t s1, size_t s2, const char *file, int line)
+{
+    void *rptr;
+    ruby_malloc_info_file = file;
+    ruby_malloc_info_line = line;
+    rptr = ruby_xrealloc2_body(ptr, s1, s2);
+    ruby_malloc_info_file = NULL;
+    return rptr;
+}
+#endif
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+#endif /* RBIMPL_XMALLOC_H */
diff --git a/include/ruby/io.h b/include/ruby/io.h
index 60d6f6d32e..a3de95f281 100644
--- a/include/ruby/io.h
+++ b/include/ruby/io.h
@@ -1,33 +1,25 @@
-/**********************************************************************
-
-  rubyio.h -
-
-  $Author$
-  created at: Fri Nov 12 16:47:09 JST 1993
-
-  Copyright (C) 1993-2007 Yukihiro Matsumoto
-
-**********************************************************************/
-
-#ifndef RUBY_IO_H
+#ifndef RUBY_IO_H                                    /*-*-C++-*-vi:se ft=cpp:*/
 #define RUBY_IO_H 1
-
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
+/**
+ * @file
+ * @author     $Author$
+ * @date       Fri Nov 12 16:47:09 JST 1993
+ * @copyright  Copyright (C) 1993-2007 Yukihiro Matsumoto
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ */
+#include "ruby/internal/config.h"
 
 #include <stdio.h>
-#include <errno.h>
 #include "ruby/encoding.h"
 
 #if defined(HAVE_STDIO_EXT_H)
 #include <stdio_ext.h>
 #endif
 
-#include "ruby/config.h"
+#include <errno.h>
 #if defined(HAVE_POLL)
 #  ifdef _AIX
 #    define reqevents events
@@ -49,7 +41,14 @@ extern "C" {
 #  define RB_WAITFD_OUT 0x004
 #endif
 
-RUBY_SYMBOL_EXPORT_BEGIN
+typedef enum {
+    RUBY_IO_READABLE = RB_WAITFD_IN,
+    RUBY_IO_WRITABLE = RB_WAITFD_OUT,
+    RUBY_IO_PRIORITY = RB_WAITFD_PRI,
+} rb_io_event_t;
+
+#include "ruby/internal/dllexport.h"
+RBIMPL_SYMBOL_EXPORT_BEGIN()
 
 PACKED_STRUCT_UNALIGNED(struct rb_io_buffer_t {
     char *ptr;                  /* off + len <= capa */
@@ -60,6 +59,8 @@ PACKED_STRUCT_UNALIGNED(struct rb_io_buffer_t {
 typedef struct rb_io_buffer_t rb_io_buffer_t;
 
 typedef struct rb_io_t {
+    VALUE self;
+
     FILE *stdio_file;		/* stdio ptr for read/write if available */
     int fd;                     /* file descriptor */
     int mode;			/* mode flags: FMODE_XXXs */
@@ -97,6 +98,8 @@ typedef struct rb_io_t {
     VALUE write_lock;
 } rb_io_t;
 
+typedef struct rb_io_enc_t rb_io_enc_t;
+
 #define HAVE_RB_IO_T 1
 
 #define FMODE_READABLE              0x00000001
@@ -109,6 +112,7 @@ typedef struct rb_io_t {
 #define FMODE_APPEND                0x00000040
 #define FMODE_CREATE                0x00000080
 /* #define FMODE_NOREVLOOKUP        0x00000100 */
+#define FMODE_EXCL                  0x00000400
 #define FMODE_TRUNC                 0x00000800
 #define FMODE_TEXTMODE              0x00001000
 /* #define FMODE_PREP               0x00010000 */
@@ -117,11 +121,13 @@ typedef struct rb_io_t {
 /* #define FMODE_INET                  0x00400000 */
 /* #define FMODE_INET6                 0x00800000 */
 
-#define GetOpenFile(obj,fp) rb_io_check_closed((fp) = RFILE(rb_io_taint_check(obj))->fptr)
+#define RB_IO_POINTER(obj,fp) rb_io_check_closed((fp) = RFILE(rb_io_taint_check(obj))->fptr)
+#define GetOpenFile RB_IO_POINTER
 
-#define MakeOpenFile(obj, fp) do {\
+#define RB_IO_OPEN(obj, fp) do {\
     (fp) = rb_io_make_open_file(obj);\
 } while (0)
+#define MakeOpenFile RB_IO_OPEN
 
 rb_io_t *rb_io_make_open_file(VALUE obj);
 
@@ -143,13 +149,17 @@ VALUE rb_io_get_io(VALUE io);
 VALUE rb_io_check_io(VALUE io);
 VALUE rb_io_get_write_io(VALUE io);
 VALUE rb_io_set_write_io(VALUE io, VALUE w);
-int rb_io_wait_readable(int);
-int rb_io_wait_writable(int);
-int rb_wait_for_single_fd(int fd, int events, struct timeval *tv);
 void rb_io_set_nonblock(rb_io_t *fptr);
 int rb_io_extract_encoding_option(VALUE opt, rb_encoding **enc_p, rb_encoding **enc2_p, int *fmode_p);
+void rb_io_extract_modeenc(VALUE *vmode_p, VALUE *vperm_p, VALUE opthash, int *oflags_p, int *fmode_p, rb_io_enc_t *convconfig_p);
 ssize_t rb_io_bufwrite(VALUE io, const void *buf, size_t size);
 
+int rb_io_wait_readable(int fd);
+int rb_io_wait_writable(int fd);
+int rb_wait_for_single_fd(int fd, int events, struct timeval *tv);
+
+VALUE rb_io_wait(VALUE io, VALUE events, VALUE timeout);
+
 /* compatibility for ruby 1.8 and older */
 #define rb_io_mode_flags(modestr) [<"rb_io_mode_flags() is obsolete; use rb_io_modestr_fmode()">]
 #define rb_io_modenum_flags(oflags) [<"rb_io_modenum_flags() is obsolete; use rb_io_oflags_fmode()">]
@@ -165,13 +175,6 @@ VALUE rb_stat_new(const struct stat *);
 
 /* gc.c */
 
-RUBY_SYMBOL_EXPORT_END
-
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-}  /* extern "C" { */
-#endif
+RBIMPL_SYMBOL_EXPORT_END()
 
 #endif /* RUBY_IO_H */
diff --git a/include/ruby/memory_view.h b/include/ruby/memory_view.h
new file mode 100644
index 0000000000..4996cdbbb3
--- /dev/null
+++ b/include/ruby/memory_view.h
@@ -0,0 +1,165 @@
+#ifndef RUBY_MEMORY_VIEW_H
+#define RUBY_MEMORY_VIEW_H 1
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Memory View.
+ */
+
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/stdbool.h"
+#include "ruby/internal/value.h"
+#include "ruby/intern.h"
+
+enum ruby_memory_view_flags {
+    RUBY_MEMORY_VIEW_SIMPLE            = 0,
+    RUBY_MEMORY_VIEW_WRITABLE          = (1<<0),
+    RUBY_MEMORY_VIEW_FORMAT            = (1<<1),
+    RUBY_MEMORY_VIEW_MULTI_DIMENSIONAL = (1<<2),
+    RUBY_MEMORY_VIEW_STRIDES           = (1<<3) | RUBY_MEMORY_VIEW_MULTI_DIMENSIONAL,
+    RUBY_MEMORY_VIEW_ROW_MAJOR         = (1<<4) | RUBY_MEMORY_VIEW_STRIDES,
+    RUBY_MEMORY_VIEW_COLUMN_MAJOR      = (1<<5) | RUBY_MEMORY_VIEW_STRIDES,
+    RUBY_MEMORY_VIEW_ANY_CONTIGUOUS    = RUBY_MEMORY_VIEW_ROW_MAJOR | RUBY_MEMORY_VIEW_COLUMN_MAJOR,
+    RUBY_MEMORY_VIEW_INDIRECT          = (1<<6) | RUBY_MEMORY_VIEW_STRIDES,
+};
+
+typedef struct {
+    char format;
+    unsigned native_size_p: 1;
+    unsigned little_endian_p: 1;
+    size_t offset;
+    size_t size;
+    size_t repeat;
+} rb_memory_view_item_component_t;
+
+typedef struct {
+    /* The original object that has the memory exported via this memory view.
+     * The consumer of this memory view has the responsibility to call rb_gc_mark
+     * for preventing this obj collected by GC.  */
+    VALUE obj;
+
+    /* The pointer to the exported memory. */
+    void *data;
+
+    /* The number of bytes in data. */
+    ssize_t byte_size;
+
+    /* true for readonly memory, false for writable memory. */
+    bool readonly;
+
+    /* A string to describe the format of an element, or NULL for unsigned bytes.
+     * The format string is a sequence of the following pack-template specifiers:
+     *
+     *   c, C, s, s!, S, S!, n, v, i, i!, I, I!, l, l!, L, L!,
+     *   N, V, f, e, g, q, q!, Q, Q!, d, E, G, j, J, x
+     *
+     * For example, "dd" for an element that consists of two double values,
+     * and "CCC" for an element that consists of three bytes, such as
+     * an RGB color triplet.
+     *
+     * Also, the value endianness can be explicitly specified by '<' or '>'
+     * following a value type specifier.
+     *
+     * The items are packed contiguously.  When you emulate the alignment of
+     * structure members, put '|' at the beginning of the format string,
+     * like "|iqc".  On x86_64 Linux ABI, the size of the item by this format
+     * is 24 bytes instead of 13 bytes.
+     */
+    const char *format;
+
+    /* The number of bytes in each element.
+     * item_size should equal to rb_memory_view_item_size_from_format(format). */
+    ssize_t item_size;
+
+    struct {
+        /* The array of rb_memory_view_item_component_t that describes the
+         * item structure.  rb_memory_view_prepare_item_desc and
+         * rb_memory_view_get_item allocate this memory if needed,
+         * and rb_memory_view_release frees it. */
+        const rb_memory_view_item_component_t *components;
+
+        /* The number of components in an item. */
+        size_t length;
+    } item_desc;
+
+    /* The number of dimension. */
+    ssize_t ndim;
+
+    /* ndim size array indicating the number of elements in each dimension.
+     * This can be NULL when ndim == 1. */
+    const ssize_t *shape;
+
+    /* ndim size array indicating the number of bytes to skip to go to the
+     * next element in each dimension. */
+    const ssize_t *strides;
+
+    /* The offset in each dimension when this memory view exposes a nested array.
+     * Or, NULL when this memory view exposes a flat array. */
+    const ssize_t *sub_offsets;
+
+    /* the private data for managing this exported memory */
+    void *const private;
+} rb_memory_view_t;
+
+typedef bool (* rb_memory_view_get_func_t)(VALUE obj, rb_memory_view_t *view, int flags);
+typedef bool (* rb_memory_view_release_func_t)(VALUE obj, rb_memory_view_t *view);
+typedef bool (* rb_memory_view_available_p_func_t)(VALUE obj);
+
+typedef struct {
+    rb_memory_view_get_func_t get_func;
+    rb_memory_view_release_func_t release_func;
+    rb_memory_view_available_p_func_t available_p_func;
+} rb_memory_view_entry_t;
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+/* memory_view.c */
+bool rb_memory_view_register(VALUE klass, const rb_memory_view_entry_t *entry);
+
+RBIMPL_ATTR_PURE()
+bool rb_memory_view_is_row_major_contiguous(const rb_memory_view_t *view);
+RBIMPL_ATTR_PURE()
+bool rb_memory_view_is_column_major_contiguous(const rb_memory_view_t *view);
+RBIMPL_ATTR_NOALIAS()
+void rb_memory_view_fill_contiguous_strides(const ssize_t ndim, const ssize_t item_size, const ssize_t *const shape, const bool row_major_p, ssize_t *const strides);
+RBIMPL_ATTR_NOALIAS()
+bool rb_memory_view_init_as_byte_array(rb_memory_view_t *view, VALUE obj, void *data, const ssize_t len, const bool readonly);
+ssize_t rb_memory_view_parse_item_format(const char *format,
+                                         rb_memory_view_item_component_t **members,
+                                         size_t *n_members, const char **err);
+ssize_t rb_memory_view_item_size_from_format(const char *format, const char **err);
+void *rb_memory_view_get_item_pointer(rb_memory_view_t *view, const ssize_t *indices);
+VALUE rb_memory_view_extract_item_members(const void *ptr, const rb_memory_view_item_component_t *members, const size_t n_members);
+void rb_memory_view_prepare_item_desc(rb_memory_view_t *view);
+VALUE rb_memory_view_get_item(rb_memory_view_t *view, const ssize_t *indices);
+
+bool rb_memory_view_available_p(VALUE obj);
+bool rb_memory_view_get(VALUE obj, rb_memory_view_t* memory_view, int flags);
+bool rb_memory_view_release(rb_memory_view_t* memory_view);
+
+/* for testing */
+RUBY_EXTERN VALUE rb_memory_view_exported_object_registry;
+RUBY_EXTERN const rb_data_type_t rb_memory_view_exported_object_registry_data_type;
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+RBIMPL_ATTR_PURE()
+static inline bool
+rb_memory_view_is_contiguous(const rb_memory_view_t *view)
+{
+    if (rb_memory_view_is_row_major_contiguous(view)) {
+        return true;
+    }
+    else if (rb_memory_view_is_column_major_contiguous(view)) {
+        return true;
+    }
+    else {
+        return false;
+    }
+}
+
+#endif /* RUBY_BUFFER_H */
diff --git a/include/ruby/missing.h b/include/ruby/missing.h
index 3474ca256f..f83f1b695c 100644
--- a/include/ruby/missing.h
+++ b/include/ruby/missing.h
@@ -1,42 +1,45 @@
-/************************************************
-
-  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
+#ifndef RUBY_MISSING_H                               /*-*-C++-*-vi:se ft=cpp:*/
 #define RUBY_MISSING_H 1
+/**
+ * @file
+ * @author     $Author$
+ * @date       Sat May 11 23:46:03 JST 2002
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Prototype for *.c in ./missing, and for missing timeval struct.
+ */
+#include "ruby/internal/config.h"
+
+#ifdef STDC_HEADERS
+# include <stddef.h>
+#endif
 
 #if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
+# include <cmath>
+#else
+# include <math.h> /* for INFINITY and NAN */
 #endif
 
-#include "ruby/config.h"
-#include <stddef.h>
-#include <math.h> /* for INFINITY and NAN */
 #ifdef RUBY_ALTERNATIVE_MALLOC_HEADER
 # include RUBY_ALTERNATIVE_MALLOC_HEADER
 #endif
-#ifdef RUBY_EXTCONF_H
-#include RUBY_EXTCONF_H
-#endif
 
-#if !defined(HAVE_STRUCT_TIMEVAL) || !defined(HAVE_STRUCT_TIMESPEC)
 #if defined(HAVE_TIME_H)
 # include <time.h>
 #endif
+
 #if defined(HAVE_SYS_TIME_H)
 # include <sys/time.h>
 #endif
+
+#ifdef HAVE_IEEEFP_H
+# include <ieeefp.h>
 #endif
 
+#include "ruby/internal/dllexport.h"
+
 #ifndef M_PI
 # define M_PI 3.14159265358979323846
 #endif
@@ -44,11 +47,6 @@ extern "C" {
 # define M_PI_2 (M_PI/2)
 #endif
 
-#ifndef RUBY_SYMBOL_EXPORT_BEGIN
-# define RUBY_SYMBOL_EXPORT_BEGIN /* begin */
-# define RUBY_SYMBOL_EXPORT_END   /* end */
-#endif
-
 #if !defined(HAVE_STRUCT_TIMEVAL)
 struct timeval {
     time_t tv_sec;	/* seconds */
@@ -57,6 +55,10 @@ struct timeval {
 #endif /* HAVE_STRUCT_TIMEVAL */
 
 #if !defined(HAVE_STRUCT_TIMESPEC)
+/* :BEWARE: @shyouhei warns that  IT IS A WRONG IDEA to  define our own version
+ * of struct timespec here.  `clock_gettime` is  a system call, and your kernel
+ * could expect  something other  than just `long`  (results stack  smashing if
+ * that happens).  See also https://ewontfix.com/19/ */
 struct timespec {
     time_t tv_sec;	/* seconds */
     long tv_nsec;	/* nanoseconds */
@@ -70,14 +72,7 @@ struct timezone {
 };
 #endif
 
-#ifdef RUBY_EXPORT
-#undef RUBY_EXTERN
-#endif
-#ifndef RUBY_EXTERN
-#define RUBY_EXTERN extern
-#endif
-
-RUBY_SYMBOL_EXPORT_BEGIN
+RBIMPL_SYMBOL_EXPORT_BEGIN()
 
 #ifndef HAVE_ACOSH
 RUBY_EXTERN double acosh(double);
@@ -136,7 +131,7 @@ RUBY_EXTERN double lgamma_r(double, int *);
 RUBY_EXTERN double cbrt(double);
 #endif
 
-#if !defined(HAVE_INFINITY) || !defined(HAVE_NAN)
+#if !defined(INFINITY) || !defined(NAN)
 union bytesequence4_or_float {
   unsigned char bytesequence[4];
   float float_value;
@@ -147,38 +142,53 @@ union bytesequence4_or_float {
 /** @internal */
 RUBY_EXTERN const union bytesequence4_or_float rb_infinity;
 # define INFINITY (rb_infinity.float_value)
+# define USE_RB_INFINITY 1
 #endif
 
 #ifndef NAN
 /** @internal */
 RUBY_EXTERN const union bytesequence4_or_float rb_nan;
 # define NAN (rb_nan.float_value)
+# define USE_RB_NAN 1
+#endif
+
+#ifndef HUGE_VAL
+# define HUGE_VAL ((double)INFINITY)
 #endif
 
-#ifndef isinf
-# ifndef HAVE_ISINF
-#  if defined(HAVE_FINITE) && defined(HAVE_ISNAN)
-#    ifdef HAVE_IEEEFP_H
-#    include <ieeefp.h>
-#    endif
-#  define isinf(x) (!finite(x) && !isnan(x))
-#  else
+#if defined(isinf)
+# /* Take that. */
+#elif defined(HAVE_ISINF)
+# /* Take that. */
+#elif defined(HAVE_FINITE) && defined(HAVE_ISNAN)
+# define isinf(x) (!finite(x) && !isnan(x))
+#elif defined(__cplusplus) && __cplusplus >= 201103L
+# // <cmath> must include constexpr bool isinf(double);
+#else
 RUBY_EXTERN int isinf(double);
-#  endif
-# endif
 #endif
 
-#ifndef isnan
-# ifndef HAVE_ISNAN
+#if defined(isnan)
+# /* Take that. */
+#elif defined(HAVE_ISNAN)
+# /* Take that. */
+#elif defined(__cplusplus) && __cplusplus >= 201103L
+# // <cmath> must include constexpr bool isnan(double);
+#else
 RUBY_EXTERN int isnan(double);
-# endif
 #endif
 
-#ifndef isfinite
-# ifndef HAVE_ISFINITE
-#   define HAVE_ISFINITE 1
-#   define isfinite(x) finite(x)
-# endif
+#if defined(isfinite)
+# /* Take that. */
+#elif defined(HAVE_ISFINITE)
+# /* Take that. */
+#else
+# define HAVE_ISFINITE 1
+# define isfinite(x) finite(x)
+#endif
+
+#ifndef HAVE_NAN
+RUBY_EXTERN double nan(const char *);
 #endif
 
 #ifndef HAVE_NEXTAFTER
@@ -214,12 +224,6 @@ RUBY_EXTERN char *strerror(int);
 RUBY_EXTERN char *strstr(const char *, const char *);
 #endif
 
-/*
-#ifndef HAVE_STRTOL
-RUBY_EXTERN long strtol(const char *, char **, int);
-#endif
-*/
-
 #ifndef HAVE_STRLCPY
 RUBY_EXTERN size_t strlcpy(char *, const char*, size_t);
 #endif
@@ -237,8 +241,8 @@ RUBY_EXTERN int ffs(int);
 #endif
 
 #ifdef BROKEN_CLOSE
-#include <sys/types.h>
-#include <sys/socket.h>
+# include <sys/types.h>
+# include <sys/socket.h>
 RUBY_EXTERN int ruby_getpeername(int, struct sockaddr *, socklen_t *);
 RUBY_EXTERN int ruby_getsockname(int, struct sockaddr *, socklen_t *);
 RUBY_EXTERN int ruby_shutdown(int, int);
@@ -249,20 +253,14 @@ RUBY_EXTERN int ruby_close(int);
 RUBY_EXTERN void setproctitle(const char *fmt, ...);
 #endif
 
-#ifndef HAVE_EXPLICIT_BZERO
+#ifdef HAVE_EXPLICIT_BZERO
+# /* Take that. */
+#elif defined(SecureZeroMemory)
+# define explicit_bzero(b, len) SecureZeroMemory(b, len)
+#else
 RUBY_EXTERN void explicit_bzero(void *b, size_t len);
-# if defined SecureZeroMemory
-#   define explicit_bzero(b, len) SecureZeroMemory(b, len)
-# endif
 #endif
 
-RUBY_SYMBOL_EXPORT_END
-
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-}  /* extern "C" { */
-#endif
+RBIMPL_SYMBOL_EXPORT_END()
 
 #endif /* RUBY_MISSING_H */
diff --git a/include/ruby/onigmo.h b/include/ruby/onigmo.h
new file mode 100644
index 0000000000..6187b37dc3
--- /dev/null
+++ b/include/ruby/onigmo.h
@@ -0,0 +1,941 @@
+#ifndef ONIGMO_H
+#define ONIGMO_H
+/**********************************************************************
+  onigmo.h - Onigmo (Oniguruma-mod) (regular expression library)
+**********************************************************************/
+/*-
+ * Copyright (c) 2002-2009  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * Copyright (c) 2011-2017  K.Takata  <kentkt AT csc 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 ONIGMO_VERSION_MAJOR   6
+#define ONIGMO_VERSION_MINOR   1
+#define ONIGMO_VERSION_TEENY   3
+
+#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
+
+#ifndef RUBY
+# ifndef RUBY_SYMBOL_EXPORT_BEGIN
+#  define RUBY_SYMBOL_EXPORT_BEGIN
+#  define RUBY_SYMBOL_EXPORT_END
+# endif
+#endif
+
+RUBY_SYMBOL_EXPORT_BEGIN
+
+#include <stddef.h>		/* for size_t */
+
+/* PART: character encoding */
+
+#ifndef ONIG_ESCAPE_UCHAR_COLLISION
+# define UChar OnigUChar
+#endif
+
+typedef unsigned char  OnigUChar;
+typedef unsigned int   OnigCodePoint;
+typedef unsigned int   OnigCtype;
+typedef size_t         OnigDistance;
+typedef ptrdiff_t      OnigPosition;
+
+#define ONIG_INFINITE_DISTANCE  ~((OnigDistance )0)
+
+/*
+ * Onig casefold/case mapping flags and related definitions
+ *
+ * Subfields (starting with 0 at LSB):
+ *   0-2: Code point count in casefold.h
+ *   3-12: Index into SpecialCaseMapping array in casefold.h
+ *   13-22: Case folding/mapping flags
+ */
+typedef unsigned int OnigCaseFoldType; /* case fold flag */
+
+ONIG_EXTERN OnigCaseFoldType OnigDefaultCaseFoldFlag;
+
+/* bits for actual code point count; 3 bits is more than enough, currently only 2 used */
+#define OnigCodePointMaskWidth    3
+#define OnigCodePointMask     ((1<<OnigCodePointMaskWidth)-1)
+#define OnigCodePointCount(n) ((n)&OnigCodePointMask)
+#define OnigCaseFoldFlags(n) ((n)&~OnigCodePointMask)
+
+/* #define ONIGENC_CASE_FOLD_HIRAGANA_KATAKANA  (1<<1) */ /* no longer usable with these values! */
+/* #define ONIGENC_CASE_FOLD_KATAKANA_WIDTH     (1<<2) */ /* no longer usable with these values! */
+
+/* bits for index into table with separate titlecase mappings */
+/* 10 bits provide 1024 values */
+#define OnigSpecialIndexShift 3
+#define OnigSpecialIndexWidth 10
+
+#define ONIGENC_CASE_UPCASE                     (1<<13) /* has/needs uppercase mapping */
+#define ONIGENC_CASE_DOWNCASE                   (1<<14) /* has/needs lowercase mapping */
+#define ONIGENC_CASE_TITLECASE                  (1<<15) /* has/needs (special) titlecase mapping */
+#define ONIGENC_CASE_SPECIAL_OFFSET             3       /* offset in bits from ONIGENC_CASE to ONIGENC_CASE_SPECIAL */
+#define ONIGENC_CASE_UP_SPECIAL                 (1<<16) /* has special upcase mapping */
+#define ONIGENC_CASE_DOWN_SPECIAL               (1<<17) /* has special downcase mapping */
+#define ONIGENC_CASE_MODIFIED                   (1<<18) /* data has been modified */
+#define ONIGENC_CASE_FOLD                       (1<<19) /* has/needs case folding */
+
+#define ONIGENC_CASE_FOLD_TURKISH_AZERI         (1<<20) /* needs mapping specific to Turkic languages; better not change original value! */
+
+#define ONIGENC_CASE_FOLD_LITHUANIAN            (1<<21) /* needs Lithuanian-specific mapping */
+#define ONIGENC_CASE_ASCII_ONLY                 (1<<22) /* only modify ASCII range */
+#define ONIGENC_CASE_IS_TITLECASE               (1<<23) /* character itself is already titlecase */
+
+#define INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR   (1<<30) /* better not change original value! */
+
+#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, const struct OnigEncodingTypeST* enc);
+  const char*   name;
+  int           max_enc_len;
+  int           min_enc_len;
+  int    (*is_mbc_newline)(const OnigUChar* p, const OnigUChar* end, const struct OnigEncodingTypeST* enc);
+  OnigCodePoint (*mbc_to_code)(const OnigUChar* p, const OnigUChar* end, const struct OnigEncodingTypeST* enc);
+  int    (*code_to_mbclen)(OnigCodePoint code, const struct OnigEncodingTypeST* enc);
+  int    (*code_to_mbc)(OnigCodePoint code, OnigUChar *buf, const struct OnigEncodingTypeST* enc);
+  int    (*mbc_case_fold)(OnigCaseFoldType flag, const OnigUChar** pp, const OnigUChar* end, OnigUChar* to, const struct OnigEncodingTypeST* enc);
+  int    (*apply_all_case_fold)(OnigCaseFoldType flag, OnigApplyAllCaseFoldFunc f, void* arg, const struct OnigEncodingTypeST* enc);
+  int    (*get_case_fold_codes_by_str)(OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem acs[], const struct OnigEncodingTypeST* enc);
+  int    (*property_name_to_ctype)(const struct OnigEncodingTypeST* enc, const OnigUChar* p, const OnigUChar* end);
+  int    (*is_code_ctype)(OnigCodePoint code, OnigCtype ctype, const struct OnigEncodingTypeST* enc);
+  int    (*get_ctype_code_range)(OnigCtype ctype, OnigCodePoint* sb_out, const OnigCodePoint* ranges[], const struct OnigEncodingTypeST* enc);
+  OnigUChar* (*left_adjust_char_head)(const OnigUChar* start, const OnigUChar* p, const OnigUChar* end, const struct OnigEncodingTypeST* enc);
+  int    (*is_allowed_reverse_match)(const OnigUChar* p, const OnigUChar* end, const struct OnigEncodingTypeST* enc);
+  int    (*case_map)(OnigCaseFoldType* flagP, const OnigUChar** pp, const OnigUChar* end, OnigUChar* to, OnigUChar* to_end, const struct OnigEncodingTypeST* enc);
+  int ruby_encoding_index;
+  unsigned int  flags;
+} OnigEncodingType;
+
+typedef const OnigEncodingType* OnigEncoding;
+
+ONIG_EXTERN const OnigEncodingType OnigEncodingASCII;
+#ifndef RUBY
+ONIG_EXTERN const OnigEncodingType OnigEncodingISO_8859_1;
+ONIG_EXTERN const OnigEncodingType OnigEncodingISO_8859_2;
+ONIG_EXTERN const OnigEncodingType OnigEncodingISO_8859_3;
+ONIG_EXTERN const OnigEncodingType OnigEncodingISO_8859_4;
+ONIG_EXTERN const OnigEncodingType OnigEncodingISO_8859_5;
+ONIG_EXTERN const OnigEncodingType OnigEncodingISO_8859_6;
+ONIG_EXTERN const OnigEncodingType OnigEncodingISO_8859_7;
+ONIG_EXTERN const OnigEncodingType OnigEncodingISO_8859_8;
+ONIG_EXTERN const OnigEncodingType OnigEncodingISO_8859_9;
+ONIG_EXTERN const OnigEncodingType OnigEncodingISO_8859_10;
+ONIG_EXTERN const OnigEncodingType OnigEncodingISO_8859_11;
+ONIG_EXTERN const OnigEncodingType OnigEncodingISO_8859_13;
+ONIG_EXTERN const OnigEncodingType OnigEncodingISO_8859_14;
+ONIG_EXTERN const OnigEncodingType OnigEncodingISO_8859_15;
+ONIG_EXTERN const OnigEncodingType OnigEncodingISO_8859_16;
+ONIG_EXTERN const OnigEncodingType OnigEncodingUTF_8;
+ONIG_EXTERN const OnigEncodingType OnigEncodingUTF_16BE;
+ONIG_EXTERN const OnigEncodingType OnigEncodingUTF_16LE;
+ONIG_EXTERN const OnigEncodingType OnigEncodingUTF_32BE;
+ONIG_EXTERN const OnigEncodingType OnigEncodingUTF_32LE;
+ONIG_EXTERN const OnigEncodingType OnigEncodingEUC_JP;
+ONIG_EXTERN const OnigEncodingType OnigEncodingEUC_TW;
+ONIG_EXTERN const OnigEncodingType OnigEncodingEUC_KR;
+ONIG_EXTERN const OnigEncodingType OnigEncodingEUC_CN;
+ONIG_EXTERN const OnigEncodingType OnigEncodingShift_JIS;
+ONIG_EXTERN const OnigEncodingType OnigEncodingWindows_31J;
+/* ONIG_EXTERN const OnigEncodingType OnigEncodingKOI8; */
+ONIG_EXTERN const OnigEncodingType OnigEncodingKOI8_R;
+ONIG_EXTERN const OnigEncodingType OnigEncodingKOI8_U;
+ONIG_EXTERN const OnigEncodingType OnigEncodingWindows_1250;
+ONIG_EXTERN const OnigEncodingType OnigEncodingWindows_1251;
+ONIG_EXTERN const OnigEncodingType OnigEncodingWindows_1252;
+ONIG_EXTERN const OnigEncodingType OnigEncodingWindows_1253;
+ONIG_EXTERN const OnigEncodingType OnigEncodingWindows_1254;
+ONIG_EXTERN const OnigEncodingType OnigEncodingWindows_1257;
+ONIG_EXTERN const OnigEncodingType OnigEncodingBIG5;
+ONIG_EXTERN const OnigEncodingType OnigEncodingGB18030;
+#endif /* RUBY */
+
+#define ONIG_ENCODING_ASCII        (&OnigEncodingASCII)
+#ifndef RUBY
+# define ONIG_ENCODING_ISO_8859_1   (&OnigEncodingISO_8859_1)
+# define ONIG_ENCODING_ISO_8859_2   (&OnigEncodingISO_8859_2)
+# define ONIG_ENCODING_ISO_8859_3   (&OnigEncodingISO_8859_3)
+# define ONIG_ENCODING_ISO_8859_4   (&OnigEncodingISO_8859_4)
+# define ONIG_ENCODING_ISO_8859_5   (&OnigEncodingISO_8859_5)
+# define ONIG_ENCODING_ISO_8859_6   (&OnigEncodingISO_8859_6)
+# define ONIG_ENCODING_ISO_8859_7   (&OnigEncodingISO_8859_7)
+# define ONIG_ENCODING_ISO_8859_8   (&OnigEncodingISO_8859_8)
+# define ONIG_ENCODING_ISO_8859_9   (&OnigEncodingISO_8859_9)
+# define ONIG_ENCODING_ISO_8859_10  (&OnigEncodingISO_8859_10)
+# define ONIG_ENCODING_ISO_8859_11  (&OnigEncodingISO_8859_11)
+# define ONIG_ENCODING_ISO_8859_13  (&OnigEncodingISO_8859_13)
+# define ONIG_ENCODING_ISO_8859_14  (&OnigEncodingISO_8859_14)
+# define ONIG_ENCODING_ISO_8859_15  (&OnigEncodingISO_8859_15)
+# define ONIG_ENCODING_ISO_8859_16  (&OnigEncodingISO_8859_16)
+# define ONIG_ENCODING_UTF_8        (&OnigEncodingUTF_8)
+# define ONIG_ENCODING_UTF_16BE     (&OnigEncodingUTF_16BE)
+# define ONIG_ENCODING_UTF_16LE     (&OnigEncodingUTF_16LE)
+# define ONIG_ENCODING_UTF_32BE     (&OnigEncodingUTF_32BE)
+# define ONIG_ENCODING_UTF_32LE     (&OnigEncodingUTF_32LE)
+# define ONIG_ENCODING_EUC_JP       (&OnigEncodingEUC_JP)
+# define ONIG_ENCODING_EUC_TW       (&OnigEncodingEUC_TW)
+# define ONIG_ENCODING_EUC_KR       (&OnigEncodingEUC_KR)
+# define ONIG_ENCODING_EUC_CN       (&OnigEncodingEUC_CN)
+# define ONIG_ENCODING_SHIFT_JIS    (&OnigEncodingShift_JIS)
+# define ONIG_ENCODING_WINDOWS_31J  (&OnigEncodingWindows_31J)
+/* # define ONIG_ENCODING_KOI8         (&OnigEncodingKOI8) */
+# define ONIG_ENCODING_KOI8_R       (&OnigEncodingKOI8_R)
+# define ONIG_ENCODING_KOI8_U       (&OnigEncodingKOI8_U)
+# define ONIG_ENCODING_WINDOWS_1250 (&OnigEncodingWindows_1250)
+# define ONIG_ENCODING_WINDOWS_1251 (&OnigEncodingWindows_1251)
+# define ONIG_ENCODING_WINDOWS_1252 (&OnigEncodingWindows_1252)
+# define ONIG_ENCODING_WINDOWS_1253 (&OnigEncodingWindows_1253)
+# define ONIG_ENCODING_WINDOWS_1254 (&OnigEncodingWindows_1254)
+# define ONIG_ENCODING_WINDOWS_1257 (&OnigEncodingWindows_1257)
+# define ONIG_ENCODING_BIG5         (&OnigEncodingBIG5)
+# define ONIG_ENCODING_GB18030      (&OnigEncodingGB18030)
+
+/* old names */
+# define ONIG_ENCODING_SJIS         ONIG_ENCODING_SHIFT_JIS
+# define ONIG_ENCODING_CP932        ONIG_ENCODING_WINDOWS_31J
+# define ONIG_ENCODING_CP1250       ONIG_ENCODING_WINDOWS_1250
+# define ONIG_ENCODING_CP1251       ONIG_ENCODING_WINDOWS_1251
+# define ONIG_ENCODING_CP1252       ONIG_ENCODING_WINDOWS_1252
+# define ONIG_ENCODING_CP1253       ONIG_ENCODING_WINDOWS_1253
+# define ONIG_ENCODING_CP1254       ONIG_ENCODING_WINDOWS_1254
+# define ONIG_ENCODING_CP1257       ONIG_ENCODING_WINDOWS_1257
+# define ONIG_ENCODING_UTF8         ONIG_ENCODING_UTF_8
+# define ONIG_ENCODING_UTF16_BE     ONIG_ENCODING_UTF_16BE
+# define ONIG_ENCODING_UTF16_LE     ONIG_ENCODING_UTF_16LE
+# define ONIG_ENCODING_UTF32_BE     ONIG_ENCODING_UTF_32BE
+# define ONIG_ENCODING_UTF32_LE     ONIG_ENCODING_UTF_32LE
+#endif /* RUBY */
+
+#define ONIG_ENCODING_UNDEF    ((OnigEncoding )0)
+
+/* this declaration needs to be here because it is used in string.c in Ruby */
+ONIG_EXTERN
+int onigenc_ascii_only_case_map(OnigCaseFoldType* flagP, const OnigUChar** pp, const OnigUChar* end, OnigUChar* to, OnigUChar* to_end, const struct OnigEncodingTypeST* enc);
+
+
+/* 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
+
+/* flags */
+#define ONIGENC_FLAG_NONE       0U
+#define ONIGENC_FLAG_UNICODE    1U
+
+#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_IS_MBC_ASCII_WORD(enc,s,end) \
+   onigenc_ascii_is_code_ctype( \
+	ONIGENC_MBC_TO_CODE(enc,s,end),ONIGENC_CTYPE_WORD,enc)
+#define ONIGENC_IS_UNICODE(enc)        ((enc)->flags & ONIGENC_FLAG_UNICODE)
+
+
+#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,end) \
+        (enc)->left_adjust_char_head(start, s, end, 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,end,n) \
+        onigenc_step_back((enc),(start),(s),(end),(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(const OnigUChar* p,const OnigUChar* e, const 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(OnigEncoding enc, const OnigUChar* start, const OnigUChar* s, const OnigUChar* end, int n);
+
+
+/* encoding API */
+ONIG_EXTERN
+int onigenc_init(void);
+ONIG_EXTERN
+int onigenc_set_default_encoding(OnigEncoding enc);
+ONIG_EXTERN
+OnigEncoding onigenc_get_default_encoding(void);
+ONIG_EXTERN
+OnigUChar* onigenc_get_right_adjust_char_head_with_prev(OnigEncoding enc, const OnigUChar* start, const OnigUChar* s, const OnigUChar* end, const OnigUChar** prev);
+ONIG_EXTERN
+OnigUChar* onigenc_get_prev_char_head(OnigEncoding enc, const OnigUChar* start, const OnigUChar* s, const OnigUChar* end);
+ONIG_EXTERN
+OnigUChar* onigenc_get_left_adjust_char_head(OnigEncoding enc, const OnigUChar* start, const OnigUChar* s, const OnigUChar* end);
+ONIG_EXTERN
+OnigUChar* onigenc_get_right_adjust_char_head(OnigEncoding enc, const OnigUChar* start, const OnigUChar* s, const OnigUChar* end);
+ONIG_EXTERN
+int onigenc_strlen(OnigEncoding enc, const OnigUChar* p, const OnigUChar* end);
+ONIG_EXTERN
+int onigenc_strlen_null(OnigEncoding enc, const OnigUChar* p);
+ONIG_EXTERN
+int onigenc_str_bytelen_null(OnigEncoding enc, const OnigUChar* p);
+
+
+
+/* PART: regular expression */
+
+/* config parameters */
+#define ONIG_NREGION                          4
+#define ONIG_MAX_CAPTURE_GROUP_NUM         32767
+#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_DOTALL                ONIG_OPTION_MULTILINE
+#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_NOTBOS               (ONIG_OPTION_NOTEOL << 1)
+#define ONIG_OPTION_NOTEOS               (ONIG_OPTION_NOTBOS << 1)
+/* options (ctype range) */
+#define ONIG_OPTION_ASCII_RANGE          (ONIG_OPTION_NOTEOS << 1)
+#define ONIG_OPTION_POSIX_BRACKET_ALL_RANGE (ONIG_OPTION_ASCII_RANGE << 1)
+#define ONIG_OPTION_WORD_BOUND_ALL_RANGE    (ONIG_OPTION_POSIX_BRACKET_ALL_RANGE << 1)
+/* options (newline) */
+#define ONIG_OPTION_NEWLINE_CRLF         (ONIG_OPTION_WORD_BOUND_ALL_RANGE << 1)
+#define ONIG_OPTION_MAXBIT               ONIG_OPTION_NEWLINE_CRLF  /* 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 OnigSyntaxPerl58;
+ONIG_EXTERN const OnigSyntaxType OnigSyntaxPerl58_NG;
+ONIG_EXTERN const OnigSyntaxType OnigSyntaxPerl;
+ONIG_EXTERN const OnigSyntaxType OnigSyntaxRuby;
+ONIG_EXTERN const OnigSyntaxType OnigSyntaxPython;
+
+/* 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_PERL58             (&OnigSyntaxPerl58)
+#define ONIG_SYNTAX_PERL58_NG          (&OnigSyntaxPerl58_NG)
+#define ONIG_SYNTAX_PERL               (&OnigSyntaxPerl)
+#define ONIG_SYNTAX_RUBY               (&OnigSyntaxRuby)
+#define ONIG_SYNTAX_PYTHON             (&OnigSyntaxPython)
+
+/* 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_OP_ESC_O_BRACE_OCTAL           (1U<<31)  /* \o{OOO} */
+
+#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)  /* (?imsxadlu), (?-imsx), (?^imsxalu) */
+#define ONIG_SYN_OP2_OPTION_RUBY                (1U<<3)  /* (?imxadu), (?-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) /* \ */
+#define ONIG_SYN_OP2_ESC_CAPITAL_R_LINEBREAK    (1U<<21) /* \R as (?>\x0D\x0A|[\x0A-\x0D\x{85}\x{2028}\x{2029}]) */
+#define ONIG_SYN_OP2_ESC_CAPITAL_X_EXTENDED_GRAPHEME_CLUSTER (1U<<22) /* \X */
+#define ONIG_SYN_OP2_ESC_V_VERTICAL_WHITESPACE   (1U<<23) /* \v, \V -- Perl */ /* NOTIMPL */
+#define ONIG_SYN_OP2_ESC_H_HORIZONTAL_WHITESPACE (1U<<24) /* \h, \H -- Perl */ /* NOTIMPL */
+#define ONIG_SYN_OP2_ESC_CAPITAL_K_KEEP         (1U<<25) /* \K */
+#define ONIG_SYN_OP2_ESC_G_BRACE_BACKREF        (1U<<26) /* \g{name}, \g{n} */
+#define ONIG_SYN_OP2_QMARK_SUBEXP_CALL          (1U<<27) /* (?&name), (?n), (?R), (?0) */
+#define ONIG_SYN_OP2_QMARK_VBAR_BRANCH_RESET    (1U<<28) /* (?|...) */         /* NOTIMPL */
+#define ONIG_SYN_OP2_QMARK_LPAREN_CONDITION     (1U<<29) /* (?(cond)yes...|no...) */
+#define ONIG_SYN_OP2_QMARK_CAPITAL_P_NAMED_GROUP (1U<<30) /* (?P<name>...), (?P=name), (?P>name) -- Python/PCRE */
+#define ONIG_SYN_OP2_QMARK_TILDE_ABSENT         (1U<<31) /* (?~...) */
+/* #define ONIG_SYN_OP2_OPTION_JAVA                (1U<<xx) */ /* (?idmsux), (?-idmsux) */ /* NOTIMPL */
+
+/* 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})? */
+#define ONIG_SYN_ALLOW_MULTIPLEX_DEFINITION_NAME_CALL (1U<<10)  /* (?<x>)(?<x>)(?&x) */
+#define ONIG_SYN_USE_LEFT_MOST_NAMED_GROUP       (1U<<11) /* (?<x>)(?<x>)\k<x> */
+
+/* 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*)+ */
+#define ONIG_SYN_WARN_CC_DUP                     (1U<<26) /* [aa] */
+
+/* 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_PARSE_DEPTH_LIMIT_OVER                        -16
+#define ONIGERR_DEFAULT_ENCODING_IS_NOT_SET                   -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
+#define ONIGERR_INVALID_CONDITION_PATTERN                    -124
+/* 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_MANY_CAPTURE_GROUPS                      -210
+#define ONIGERR_TOO_SHORT_DIGITS                             -211
+#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])
+
+#ifdef USE_CAPTURE_HISTORY
+typedef struct OnigCaptureTreeNodeStruct {
+  int group;   /* group number */
+  OnigPosition beg;
+  OnigPosition end;
+  int allocated;
+  int num_childs;
+  struct OnigCaptureTreeNodeStruct** childs;
+} OnigCaptureTreeNode;
+#endif
+
+/* match result region type */
+struct re_registers {
+  int  allocated;
+  int  num_regs;
+  OnigPosition* beg;
+  OnigPosition* end;
+#ifdef USE_CAPTURE_HISTORY
+  /* extended */
+  OnigCaptureTreeNode* history_root;  /* capture history tree root */
+#endif
+};
+
+/* 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)(const char* s);
+extern void onig_null_warn(const char* s);
+#define ONIG_NULL_WARN       onig_null_warn
+
+#define ONIG_CHAR_TABLE_SIZE   256
+
+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 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;
+
+  OnigOptionType    options;
+
+  OnigRepeatRange* repeat_range;
+
+  OnigEncoding      enc;
+  const OnigSyntaxType* syntax;
+  void*             name_table;
+  OnigCaseFoldType  case_fold_flag;
+
+  /* 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;
+  const OnigSyntaxType* syntax;
+  OnigOptionType  option;
+  OnigCaseFoldType   case_fold_flag;
+} OnigCompileInfo;
+
+/* Oniguruma Native API */
+ONIG_EXTERN
+int onig_initialize(OnigEncoding encodings[], int n);
+ONIG_EXTERN
+int onig_init(void);
+ONIG_EXTERN
+int onig_error_code_to_str(OnigUChar* s, OnigPosition err_code, ...);
+ONIG_EXTERN
+void onig_set_warn_func(OnigWarnFunc f);
+ONIG_EXTERN
+void onig_set_verb_warn_func(OnigWarnFunc f);
+ONIG_EXTERN
+int onig_new(OnigRegex*, const OnigUChar* pattern, const OnigUChar* pattern_end, OnigOptionType option, OnigEncoding enc, const OnigSyntaxType* syntax, OnigErrorInfo* einfo);
+ONIG_EXTERN
+int onig_reg_init(OnigRegex reg, OnigOptionType option, OnigCaseFoldType case_fold_flag, OnigEncoding enc, const OnigSyntaxType* syntax);
+ONIG_EXTERN
+int onig_new_without_alloc(OnigRegex, const OnigUChar* pattern, const OnigUChar* pattern_end, OnigOptionType option, OnigEncoding enc, const OnigSyntaxType* syntax, OnigErrorInfo* einfo);
+ONIG_EXTERN
+int onig_new_deluxe(OnigRegex* reg, const OnigUChar* pattern, const OnigUChar* pattern_end, OnigCompileInfo* ci, OnigErrorInfo* einfo);
+ONIG_EXTERN
+void onig_free(OnigRegex);
+ONIG_EXTERN
+void onig_free_body(OnigRegex);
+ONIG_EXTERN
+OnigPosition onig_scan(OnigRegex reg, const OnigUChar* str, const OnigUChar* end, OnigRegion* region, OnigOptionType option, int (*scan_callback)(OnigPosition, OnigPosition, OnigRegion*, void*), void* callback_arg);
+ONIG_EXTERN
+OnigPosition onig_search(OnigRegex, const OnigUChar* str, const OnigUChar* end, const OnigUChar* start, const OnigUChar* range, OnigRegion* region, OnigOptionType option);
+ONIG_EXTERN
+OnigPosition onig_search_gpos(OnigRegex, const OnigUChar* str, const OnigUChar* end, const OnigUChar* global_pos, const OnigUChar* start, const OnigUChar* range, OnigRegion* region, OnigOptionType option);
+ONIG_EXTERN
+OnigPosition onig_match(OnigRegex, const OnigUChar* str, const OnigUChar* end, const OnigUChar* at, OnigRegion* region, OnigOptionType option);
+ONIG_EXTERN
+OnigRegion* onig_region_new(void);
+ONIG_EXTERN
+void onig_region_init(OnigRegion* region);
+ONIG_EXTERN
+void onig_region_free(OnigRegion* region, int free_self);
+ONIG_EXTERN
+void onig_region_copy(OnigRegion* to, const OnigRegion* from);
+ONIG_EXTERN
+void onig_region_clear(OnigRegion* region);
+ONIG_EXTERN
+int onig_region_resize(OnigRegion* region, int n);
+ONIG_EXTERN
+int onig_region_set(OnigRegion* region, int at, int beg, int end);
+ONIG_EXTERN
+int onig_name_to_group_numbers(OnigRegex reg, const OnigUChar* name, const OnigUChar* name_end, int** nums);
+ONIG_EXTERN
+int onig_name_to_backref_number(OnigRegex reg, const OnigUChar* name, const OnigUChar* name_end, const OnigRegion *region);
+ONIG_EXTERN
+int onig_foreach_name(OnigRegex reg, int (*func)(const OnigUChar*, const OnigUChar*,int,int*,OnigRegex,void*), void* arg);
+ONIG_EXTERN
+int onig_number_of_names(const OnigRegexType *reg);
+ONIG_EXTERN
+int onig_number_of_captures(const OnigRegexType *reg);
+ONIG_EXTERN
+int onig_number_of_capture_histories(const OnigRegexType *reg);
+#ifdef USE_CAPTURE_HISTORY
+ONIG_EXTERN
+OnigCaptureTreeNode* onig_get_capture_tree(OnigRegion* region);
+#endif
+ONIG_EXTERN
+int onig_capture_tree_traverse(OnigRegion* region, int at, int(*callback_func)(int,OnigPosition,OnigPosition,int,int,void*), void* arg);
+ONIG_EXTERN
+int onig_noname_group_capture_is_active(const OnigRegexType *reg);
+ONIG_EXTERN
+OnigEncoding onig_get_encoding(const OnigRegexType *reg);
+ONIG_EXTERN
+OnigOptionType onig_get_options(const OnigRegexType *reg);
+ONIG_EXTERN
+OnigCaseFoldType onig_get_case_fold_flag(const OnigRegexType *reg);
+ONIG_EXTERN
+const OnigSyntaxType* onig_get_syntax(const OnigRegexType *reg);
+ONIG_EXTERN
+int onig_set_default_syntax(const OnigSyntaxType* syntax);
+ONIG_EXTERN
+void onig_copy_syntax(OnigSyntaxType* to, const OnigSyntaxType* from);
+ONIG_EXTERN
+unsigned int onig_get_syntax_op(const OnigSyntaxType* syntax);
+ONIG_EXTERN
+unsigned int onig_get_syntax_op2(const OnigSyntaxType* syntax);
+ONIG_EXTERN
+unsigned int onig_get_syntax_behavior(const OnigSyntaxType* syntax);
+ONIG_EXTERN
+OnigOptionType onig_get_syntax_options(const OnigSyntaxType* syntax);
+ONIG_EXTERN
+void onig_set_syntax_op(OnigSyntaxType* syntax, unsigned int op);
+ONIG_EXTERN
+void onig_set_syntax_op2(OnigSyntaxType* syntax, unsigned int op2);
+ONIG_EXTERN
+void onig_set_syntax_behavior(OnigSyntaxType* syntax, unsigned int behavior);
+ONIG_EXTERN
+void onig_set_syntax_options(OnigSyntaxType* syntax, OnigOptionType options);
+ONIG_EXTERN
+int onig_set_meta_char(OnigSyntaxType* syntax, unsigned int what, OnigCodePoint code);
+ONIG_EXTERN
+void onig_copy_encoding(OnigEncodingType *to, OnigEncoding from);
+ONIG_EXTERN
+OnigCaseFoldType onig_get_default_case_fold_flag(void);
+ONIG_EXTERN
+int onig_set_default_case_fold_flag(OnigCaseFoldType case_fold_flag);
+ONIG_EXTERN
+unsigned int onig_get_match_stack_limit_size(void);
+ONIG_EXTERN
+int onig_set_match_stack_limit_size(unsigned int size);
+ONIG_EXTERN
+unsigned int onig_get_parse_depth_limit(void);
+ONIG_EXTERN
+int onig_set_parse_depth_limit(unsigned int depth);
+ONIG_EXTERN
+int onig_end(void);
+ONIG_EXTERN
+const char* onig_version(void);
+ONIG_EXTERN
+const char* onig_copyright(void);
+
+RUBY_SYMBOL_EXPORT_END
+
+#ifdef __cplusplus
+# if 0
+{ /* satisfy cc-mode */
+# endif
+}
+#endif
+
+#endif /* ONIGMO_H */
diff --git a/include/ruby/oniguruma.h b/include/ruby/oniguruma.h
index 523fc7089a..dc83754aca 100644
--- a/include/ruby/oniguruma.h
+++ b/include/ruby/oniguruma.h
@@ -1,892 +1,8 @@
 #ifndef ONIGURUMA_H
 #define ONIGURUMA_H
-/**********************************************************************
-  oniguruma.h - Onigmo (Oniguruma-mod) (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2009  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * Copyright (c) 2011-2014  K.Takata  <kentkt AT csc 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
-
+#include "onigmo.h"
 #define ONIGURUMA
-#define ONIGURUMA_VERSION_MAJOR   5
-#define ONIGURUMA_VERSION_MINOR   15
-#define ONIGURUMA_VERSION_TEENY   0
-
-#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
-
-RUBY_SYMBOL_EXPORT_BEGIN
-
-#include <stddef.h>		/* for size_t */
-
-/* PART: character encoding */
-
-#ifndef ONIG_ESCAPE_UCHAR_COLLISION
-#define UChar OnigUChar
-#endif
-
-typedef unsigned char  OnigUChar;
-typedef unsigned int   OnigCodePoint;
-typedef unsigned int   OnigCtype;
-typedef size_t         OnigDistance;
-typedef ptrdiff_t      OnigPosition;
-
-#define ONIG_INFINITE_DISTANCE  ~((OnigDistance )0)
-
-/*
- * Onig casefold/case mapping flags and related definitions
- *
- * Subfields (starting with 0 at LSB):
- *   0-2: Code point count in casefold.h
- *   3-12: Index into SpecialCaseMapping array in casefold.h
- *   13-22: Case folding/mapping flags
- */
-typedef unsigned int OnigCaseFoldType; /* case fold flag */
-
-ONIG_EXTERN OnigCaseFoldType OnigDefaultCaseFoldFlag;
-
-#define ONIG_CASE_MAPPING
-
-#ifdef ONIG_CASE_MAPPING
-/* bits for actual code point count; 3 bits is more than enough, currently only 2 used */
-#define OnigCodePointMaskWidth    3
-#define OnigCodePointMask     ((1<<OnigCodePointMaskWidth)-1)
-#define OnigCodePointCount(n) ((n)&OnigCodePointMask)
-#define OnigCaseFoldFlags(n) ((n)&~OnigCodePointMask)
-#endif   /* ONIG_CASE_MAPPING */
-
-/* #define ONIGENC_CASE_FOLD_HIRAGANA_KATAKANA  (1<<1) */ /* no longer usable with these values! */
-/* #define ONIGENC_CASE_FOLD_KATAKANA_WIDTH     (1<<2) */ /* no longer usable with these values! */
-
-#ifdef ONIG_CASE_MAPPING
-/* bits for index into table with separate titlecase mappings */
-/* 10 bits provide 1024 values */
-#define OnigSpecialIndexShift 3
-#define OnigSpecialIndexWidth 10
-
-#define ONIGENC_CASE_UPCASE                     (1<<13) /* has/needs uppercase mapping */
-#define ONIGENC_CASE_DOWNCASE                   (1<<14) /* has/needs lowercase mapping */
-#define ONIGENC_CASE_TITLECASE                  (1<<15) /* has/needs (special) titlecase mapping */
-#define ONIGENC_CASE_SPECIAL_OFFSET             3       /* offset in bytes from ONIGENC_CASE to ONIGENC_CASE_SPECIAL */
-#define ONIGENC_CASE_UP_SPECIAL                 (1<<16) /* has special upcase mapping */
-#define ONIGENC_CASE_DOWN_SPECIAL               (1<<17) /* has special downcase mapping */
-#define ONIGENC_CASE_MODIFIED                   (1<<18) /* data has been modified */
-#define ONIGENC_CASE_FOLD                       (1<<19) /* has/needs case folding */
-#endif   /* ONIG_CASE_MAPPING */
-
-#define ONIGENC_CASE_FOLD_TURKISH_AZERI         (1<<20) /* needs mapping specific to Turkic languages; better not change original value! */
-
-#ifdef ONIG_CASE_MAPPING
-#define ONIGENC_CASE_FOLD_LITHUANIAN            (1<<21) /* needs Lithuanian-specific mapping */
-#define ONIGENC_CASE_ASCII_ONLY                 (1<<22) /* only modify ASCII range */
-#define ONIGENC_CASE_IS_TITLECASE               (1<<23) /* character itself is already titlecase */
-#endif   /* ONIG_CASE_MAPPING */
-
-#define INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR   (1<<30) /* better not change original value! */
-
-#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, const struct OnigEncodingTypeST* enc);
-  const char*   name;
-  int           max_enc_len;
-  int           min_enc_len;
-  int    (*is_mbc_newline)(const OnigUChar* p, const OnigUChar* end, const struct OnigEncodingTypeST* enc);
-  OnigCodePoint (*mbc_to_code)(const OnigUChar* p, const OnigUChar* end, const struct OnigEncodingTypeST* enc);
-  int    (*code_to_mbclen)(OnigCodePoint code, const struct OnigEncodingTypeST* enc);
-  int    (*code_to_mbc)(OnigCodePoint code, OnigUChar *buf, const struct OnigEncodingTypeST* enc);
-  int    (*mbc_case_fold)(OnigCaseFoldType flag, const OnigUChar** pp, const OnigUChar* end, OnigUChar* to, const struct OnigEncodingTypeST* enc);
-  int    (*apply_all_case_fold)(OnigCaseFoldType flag, OnigApplyAllCaseFoldFunc f, void* arg, const struct OnigEncodingTypeST* enc);
-  int    (*get_case_fold_codes_by_str)(OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem acs[], const struct OnigEncodingTypeST* enc);
-  int    (*property_name_to_ctype)(const struct OnigEncodingTypeST* enc, const OnigUChar* p, const OnigUChar* end);
-  int    (*is_code_ctype)(OnigCodePoint code, OnigCtype ctype, const struct OnigEncodingTypeST* enc);
-  int    (*get_ctype_code_range)(OnigCtype ctype, OnigCodePoint* sb_out, const OnigCodePoint* ranges[], const struct OnigEncodingTypeST* enc);
-  OnigUChar* (*left_adjust_char_head)(const OnigUChar* start, const OnigUChar* p, const OnigUChar* end, const struct OnigEncodingTypeST* enc);
-  int    (*is_allowed_reverse_match)(const OnigUChar* p, const OnigUChar* end, const struct OnigEncodingTypeST* enc);
-  int ruby_encoding_index;
-  unsigned int  flags;
-#ifdef ONIG_CASE_MAPPING
-  int    (*case_map)(OnigCaseFoldType* flagP, const OnigUChar** pp, const OnigUChar* end, OnigUChar* to, OnigUChar* to_end, const struct OnigEncodingTypeST* enc);
-#endif   /* ONIG_CASE_MAPPING */
-} OnigEncodingType;
-
-typedef const OnigEncodingType* OnigEncoding;
-
-ONIG_EXTERN const OnigEncodingType OnigEncodingASCII;
-
-#define ONIG_ENCODING_ASCII        (&OnigEncodingASCII)
-
-#define ONIG_ENCODING_UNDEF    ((OnigEncoding )0)
-
-#ifdef ONIG_CASE_MAPPING
-  /* this declaration needs to be here because it is used in string.c */
-  ONIG_EXTERN int    onigenc_ascii_only_case_map P_((OnigCaseFoldType* flagP,
-			  const OnigUChar** pp, const OnigUChar* end,
-			  OnigUChar* to, OnigUChar* to_end,
-			  const struct OnigEncodingTypeST* enc));
-#endif   /* ONIG_CASE_MAPPING */
-
-
-/* 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
-
-/* flags */
-#define ONIGENC_FLAG_NONE       0U
-#define ONIGENC_FLAG_UNICODE    1U
-
-#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_IS_MBC_ASCII_WORD(enc,s,end) \
-   onigenc_ascii_is_code_ctype( \
-	ONIGENC_MBC_TO_CODE(enc,s,end),ONIGENC_CTYPE_WORD,enc)
-#define ONIGENC_IS_UNICODE(enc)        ((enc)->flags & ONIGENC_FLAG_UNICODE)
-
-
-#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,end) \
-        (enc)->left_adjust_char_head(start, s, end, 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,end,n) \
-        onigenc_step_back((enc),(start),(s),(end),(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, const 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, const OnigUChar* end, int n));
-
-
-/* encoding API */
-ONIG_EXTERN
-int onigenc_init P_((void));
-ONIG_EXTERN
-int onigenc_set_default_encoding P_((OnigEncoding enc));
-PUREFUNC(ONIG_EXTERN OnigEncoding onigenc_get_default_encoding P_((void)));
-PUREFUNC(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* end, const OnigUChar** prev));
-ONIG_EXTERN
-OnigUChar* onigenc_get_prev_char_head P_((OnigEncoding enc, const OnigUChar* start, const OnigUChar* s, const OnigUChar* end));
-ONIG_EXTERN
-OnigUChar* onigenc_get_left_adjust_char_head P_((OnigEncoding enc, const OnigUChar* start, const OnigUChar* s, const OnigUChar* end));
-ONIG_EXTERN
-OnigUChar* onigenc_get_right_adjust_char_head P_((OnigEncoding enc, const OnigUChar* start, const OnigUChar* s, const OnigUChar* end));
-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_CAPTURE_GROUP_NUM         32767
-#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_DOTALL                ONIG_OPTION_MULTILINE
-#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)
-/* options (ctype range) */
-#define ONIG_OPTION_ASCII_RANGE          (ONIG_OPTION_POSIX_REGION << 1)
-#define ONIG_OPTION_POSIX_BRACKET_ALL_RANGE (ONIG_OPTION_ASCII_RANGE << 1)
-#define ONIG_OPTION_WORD_BOUND_ALL_RANGE    (ONIG_OPTION_POSIX_BRACKET_ALL_RANGE << 1)
-/* options (newline) */
-#define ONIG_OPTION_NEWLINE_CRLF         (ONIG_OPTION_WORD_BOUND_ALL_RANGE << 1)
-#define ONIG_OPTION_NOTBOS               (ONIG_OPTION_NEWLINE_CRLF << 1)
-#define ONIG_OPTION_NOTEOS               (ONIG_OPTION_NOTBOS << 1)
-#define ONIG_OPTION_MAXBIT               ONIG_OPTION_NOTEOS  /* 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 OnigSyntaxPerl58;
-ONIG_EXTERN const OnigSyntaxType OnigSyntaxPerl58_NG;
-ONIG_EXTERN const OnigSyntaxType OnigSyntaxPerl;
-ONIG_EXTERN const OnigSyntaxType OnigSyntaxRuby;
-ONIG_EXTERN const OnigSyntaxType OnigSyntaxPython;
-
-/* 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_PERL58             (&OnigSyntaxPerl58)
-#define ONIG_SYNTAX_PERL58_NG          (&OnigSyntaxPerl58_NG)
-#define ONIG_SYNTAX_PERL               (&OnigSyntaxPerl)
-#define ONIG_SYNTAX_RUBY               (&OnigSyntaxRuby)
-#define ONIG_SYNTAX_PYTHON             (&OnigSyntaxPython)
-
-/* 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_OP_ESC_O_BRACE_OCTAL           (1U<<31)  /* \o{OOO} */ /* NOTIMPL */
-
-#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)  /* (?imsxadlu), (?-imsx), (?^imsxalu) */
-#define ONIG_SYN_OP2_OPTION_RUBY                (1U<<3)  /* (?imxadu), (?-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) /* \ */
-#define ONIG_SYN_OP2_ESC_CAPITAL_R_LINEBREAK    (1U<<21) /* \R as (?>\x0D\x0A|[\x0A-\x0D\x{85}\x{2028}\x{2029}]) */
-#define ONIG_SYN_OP2_ESC_CAPITAL_X_EXTENDED_GRAPHEME_CLUSTER (1U<<22) /* \X as (?>\P{M}\p{M}*) */
-#define ONIG_SYN_OP2_ESC_V_VERTICAL_WHITESPACE   (1U<<23) /* \v, \V -- Perl */ /* NOTIMPL */
-#define ONIG_SYN_OP2_ESC_H_HORIZONTAL_WHITESPACE (1U<<24) /* \h, \H -- Perl */ /* NOTIMPL */
-#define ONIG_SYN_OP2_ESC_CAPITAL_K_KEEP         (1U<<25) /* \K */
-#define ONIG_SYN_OP2_ESC_G_BRACE_BACKREF        (1U<<26) /* \g{name}, \g{n} */
-#define ONIG_SYN_OP2_QMARK_SUBEXP_CALL          (1U<<27) /* (?&name), (?n), (?R), (?0) */
-#define ONIG_SYN_OP2_QMARK_VBAR_BRANCH_RESET    (1U<<28) /* (?|...) */         /* NOTIMPL */
-#define ONIG_SYN_OP2_QMARK_LPAREN_CONDITION     (1U<<29) /* (?(cond)yes...|no...) */
-#define ONIG_SYN_OP2_QMARK_CAPITAL_P_NAMED_GROUP (1U<<30) /* (?P<name>...), (?P=name), (?P>name) -- Python/PCRE */
-#define ONIG_SYN_OP2_OPTION_JAVA                (1U<<31) /* (?idmsux), (?-idmsux) */ /* NOTIMPL */
-
-/* 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})? */
-#define ONIG_SYN_ALLOW_MULTIPLEX_DEFINITION_NAME_CALL (1U<<10)  /* (?<x>)(?<x>)(?&x) */
-
-/* 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*)+ */
-#define ONIG_SYN_WARN_CC_DUP                     (1U<<26) /* [aa] */
-
-/* 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_SET                   -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
-#define ONIGERR_INVALID_CONDITION_PATTERN                    -124
-/* 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_SHORT_DIGITS                             -210
-#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_TOO_MANY_CAPTURE_GROUPS                      -224
-#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 */
-  OnigPosition beg;
-  OnigPosition end;
-  int allocated;
-  int num_childs;
-  struct OnigCaptureTreeNodeStruct** childs;
-} OnigCaptureTreeNode;
-
-/* match result region type */
-struct re_registers {
-  int  allocated;
-  int  num_regs;
-  OnigPosition* beg;
-  OnigPosition* 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;
-
-  OnigOptionType    options;
-
-  OnigRepeatRange* repeat_range;
-
-  OnigEncoding      enc;
-  const OnigSyntaxType* syntax;
-  void*             name_table;
-  OnigCaseFoldType  case_fold_flag;
-
-  /* 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;
-  const 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, OnigPosition 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_reg_init P_((OnigRegex reg, OnigOptionType option, OnigCaseFoldType case_fold_flag, OnigEncoding enc, const OnigSyntaxType* syntax));
-ONIG_EXTERN
-int onig_new_without_alloc P_((OnigRegex, const OnigUChar* pattern, const OnigUChar* pattern_end, OnigOptionType option, OnigEncoding enc, 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
-void onig_free_body 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
-OnigPosition onig_search P_((OnigRegex, const OnigUChar* str, const OnigUChar* end, const OnigUChar* start, const OnigUChar* range, OnigRegion* region, OnigOptionType option));
-ONIG_EXTERN
-OnigPosition onig_search_gpos P_((OnigRegex, const OnigUChar* str, const OnigUChar* end, const OnigUChar* global_pos, const OnigUChar* start, const OnigUChar* range, OnigRegion* region, OnigOptionType option));
-ONIG_EXTERN
-OnigPosition 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,OnigPosition,OnigPosition,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_((OnigEncodingType *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));
-
-RUBY_SYMBOL_EXPORT_END
-
-#ifdef __cplusplus
-#if 0
-{ /* satisfy cc-mode */
-#endif
-}
-#endif
-
+#define ONIGURUMA_VERSION_MAJOR ONIGMO_VERSION_MAJOR
+#define ONIGURUMA_VERSION_MINOR ONIGMO_VERSION_MINOR
+#define ONIGURUMA_VERSION_TEENY ONIGMO_VERSION_TEENY
 #endif /* ONIGURUMA_H */
diff --git a/include/ruby/ractor.h b/include/ruby/ractor.h
new file mode 100644
index 0000000000..1d6687456c
--- /dev/null
+++ b/include/ruby/ractor.h
@@ -0,0 +1,68 @@
+#ifndef RUBY_RACTOR_H
+#define RUBY_RACTOR_H 1
+
+/**
+ * @file
+ * @author Koichi Sasada
+ * @date Tue Nov 17 16:39:15 2020
+ * @copyright Copyright (C) 2020 Yukihiro Matsumoto
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ */
+
+struct rb_ractor_local_storage_type {
+    void (*mark)(void *ptr);
+    void (*free)(void *ptr);
+    // TODO: update
+};
+
+typedef struct rb_ractor_local_key_struct *rb_ractor_local_key_t;
+
+RUBY_SYMBOL_EXPORT_BEGIN
+RUBY_EXTERN VALUE rb_cRactor;
+
+VALUE rb_ractor_stdin(void);
+VALUE rb_ractor_stdout(void);
+VALUE rb_ractor_stderr(void);
+void rb_ractor_stdin_set(VALUE);
+void rb_ractor_stdout_set(VALUE);
+void rb_ractor_stderr_set(VALUE);
+
+rb_ractor_local_key_t rb_ractor_local_storage_value_newkey(void);
+VALUE rb_ractor_local_storage_value(rb_ractor_local_key_t key);
+bool rb_ractor_local_storage_value_lookup(rb_ractor_local_key_t key, VALUE *val);
+void  rb_ractor_local_storage_value_set(rb_ractor_local_key_t key, VALUE val);
+
+RUBY_EXTERN const struct rb_ractor_local_storage_type rb_ractor_local_storage_type_free;
+#define RB_RACTOR_LOCAL_STORAGE_TYPE_FREE (&rb_ractor_local_storage_type_free)
+
+rb_ractor_local_key_t rb_ractor_local_storage_ptr_newkey(const struct rb_ractor_local_storage_type *type);
+void *rb_ractor_local_storage_ptr(rb_ractor_local_key_t key);
+void  rb_ractor_local_storage_ptr_set(rb_ractor_local_key_t key, void *ptr);
+
+VALUE rb_ractor_make_shareable(VALUE obj);
+VALUE rb_ractor_make_shareable_copy(VALUE obj);
+
+RUBY_SYMBOL_EXPORT_END
+
+#define RB_OBJ_SHAREABLE_P(obj) FL_TEST_RAW((obj), RUBY_FL_SHAREABLE)
+
+static inline bool
+rb_ractor_shareable_p(VALUE obj)
+{
+    bool rb_ractor_shareable_p_continue(VALUE obj);
+
+    if (SPECIAL_CONST_P(obj)) {
+        return true;
+    }
+    else if (RB_OBJ_SHAREABLE_P(obj)) {
+        return true;
+    }
+    else {
+        return rb_ractor_shareable_p_continue(obj);
+    }
+}
+
+#endif /* RUBY_RACTOR_H */
diff --git a/include/ruby/random.h b/include/ruby/random.h
new file mode 100644
index 0000000000..56b2dd413f
--- /dev/null
+++ b/include/ruby/random.h
@@ -0,0 +1,92 @@
+#ifndef RUBY_RANDOM_H
+#define RUBY_RANDOM_H 1
+/**
+ * @file
+ * @date       Sat May  7 11:51:14 JST 2016
+ * @copyright  2007-2020 Yukihiro Matsumoto
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ */
+
+#include "ruby/ruby.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
+
+struct rb_random_struct {
+    VALUE seed;
+};
+typedef struct rb_random_struct rb_random_t;
+
+typedef void rb_random_init_func(rb_random_t *, const uint32_t *, size_t);
+typedef unsigned int rb_random_get_int32_func(rb_random_t *);
+typedef void rb_random_get_bytes_func(rb_random_t *, void *, size_t);
+typedef double rb_random_get_real_func(rb_random_t *, int);
+
+typedef struct {
+    size_t default_seed_bits;
+    rb_random_init_func *init;
+    rb_random_get_int32_func *get_int32;
+    rb_random_get_bytes_func *get_bytes;
+    rb_random_get_real_func *get_real;
+} rb_random_interface_t;
+
+#define RB_RANDOM_INTERFACE_DECLARE(prefix) \
+    static void prefix##_init(rb_random_t *, const uint32_t *, size_t); \
+    static unsigned int prefix##_get_int32(rb_random_t *); \
+    static void prefix##_get_bytes(rb_random_t *, void *, size_t)
+
+#define RB_RANDOM_INTERFACE_DECLARE_WITH_REAL(prefix) \
+    RB_RANDOM_INTERFACE_DECLARE(prefix); \
+    static double prefix##_get_real(rb_random_t *, int)
+
+#define RB_RANDOM_INTERFACE_DEFINE(prefix) \
+    prefix##_init, \
+    prefix##_get_int32, \
+    prefix##_get_bytes
+
+#define RB_RANDOM_INTERFACE_DEFINE_WITH_REAL(prefix) \
+    RB_RANDOM_INTERFACE_DEFINE(prefix), \
+    prefix##_get_real
+
+#if defined _WIN32 && !defined __CYGWIN__
+typedef rb_data_type_t rb_random_data_type_t;
+# define RB_RANDOM_PARENT 0
+#else
+typedef const rb_data_type_t rb_random_data_type_t;
+# define RB_RANDOM_PARENT &rb_random_data_type
+#endif
+
+#define RB_RANDOM_DATA_INIT_PARENT(random_data) \
+    rbimpl_random_data_init_parent(&random_data)
+
+void rb_random_mark(void *ptr);
+void rb_random_base_init(rb_random_t *rnd);
+double rb_int_pair_to_real(uint32_t a, uint32_t b, int excl);
+void rb_rand_bytes_int32(rb_random_get_int32_func *, rb_random_t *, void *, size_t);
+RUBY_EXTERN const rb_data_type_t rb_random_data_type;
+
+RBIMPL_SYMBOL_EXPORT_END()
+
+RBIMPL_ATTR_PURE_UNLESS_DEBUG()
+/* :TODO: can this function be __attribute__((returns_nonnull)) or not? */
+static inline const rb_random_interface_t *
+rb_rand_if(VALUE obj)
+{
+    RBIMPL_ASSERT_OR_ASSUME(RTYPEDDATA_P(obj));
+    const struct rb_data_type_struct *t = RTYPEDDATA_TYPE(obj);
+    const void *ret = t->data;
+    return RBIMPL_CAST((const rb_random_interface_t *)ret);
+}
+
+RBIMPL_ATTR_NOALIAS()
+static inline void
+rbimpl_random_data_init_parent(rb_random_data_type_t *random_data)
+{
+#if defined _WIN32 && !defined __CYGWIN__
+    random_data->parent = &rb_random_data_type;
+#endif
+}
+
+#endif /* RUBY_RANDOM_H */
diff --git a/include/ruby/re.h b/include/ruby/re.h
index 166f254aa5..ec0f425db0 100644
--- a/include/ruby/re.h
+++ b/include/ruby/re.h
@@ -1,55 +1,24 @@
-/**********************************************************************
-
-  re.h -
-
-  $Author$
-  created at: Thu Sep 30 14:18:32 JST 1993
-
-  Copyright (C) 1993-2007 Yukihiro Matsumoto
-
-**********************************************************************/
-
-#ifndef RUBY_RE_H
+#ifndef RUBY_RE_H                                    /*-*-C++-*-vi:se ft=cpp:*/
 #define RUBY_RE_H 1
-
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
+/**
+ * @file
+ * @author     $Author$
+ * @date       Thu Sep 30 14:18:32 JST 1993
+ * @copyright  Copyright (C) 1993-2007 Yukihiro Matsumoto
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ */
+#include "ruby/internal/config.h"
 #include <sys/types.h>
 #include <stdio.h>
 
 #include "ruby/regex.h"
+#include "ruby/internal/core/rmatch.h"
+#include "ruby/internal/dllexport.h"
 
-RUBY_SYMBOL_EXPORT_BEGIN
-
-typedef struct re_pattern_buffer Regexp;
-
-struct rmatch_offset {
-    long beg;
-    long 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)
+RBIMPL_SYMBOL_EXPORT_BEGIN()
 
 VALUE rb_reg_regcomp(VALUE);
 long rb_reg_search(VALUE, VALUE, long, int);
@@ -60,13 +29,6 @@ VALUE rb_reg_quote(VALUE);
 regex_t *rb_reg_prepare_re(VALUE re, VALUE str);
 int rb_reg_region_copy(struct re_registers *, const struct re_registers *);
 
-RUBY_SYMBOL_EXPORT_END
-
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-}  /* extern "C" { */
-#endif
+RBIMPL_SYMBOL_EXPORT_END()
 
 #endif /* RUBY_RE_H */
diff --git a/include/ruby/regex.h b/include/ruby/regex.h
index 024bed4a4e..22dae3231d 100644
--- a/include/ruby/regex.h
+++ b/include/ruby/regex.h
@@ -1,16 +1,14 @@
-/**********************************************************************
-
-  regex.h -
-
-  $Author$
-
-  Copyright (C) 1993-2007 Yukihiro Matsumoto
-
-**********************************************************************/
-
-#ifndef ONIGURUMA_REGEX_H
+#ifndef ONIGURUMA_REGEX_H                            /*-*-C++-*-vi:se ft=cpp:*/
 #define ONIGURUMA_REGEX_H 1
-
+/**
+ * @file
+ * @author     $Author$
+ * @copyright  Copyright (C) 1993-2007 Yukihiro Matsumoto
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ */
 #if defined(__cplusplus)
 extern "C" {
 #if 0
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index 983ea2760c..c68168d500 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -1,52 +1,18 @@
-/**********************************************************************
-
-  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
+#ifndef RUBY_RUBY_H                                  /*-*-C++-*-vi:se ft=cpp:*/
 #define RUBY_RUBY_H 1
-
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
-#include "ruby/config.h"
-#ifdef RUBY_EXTCONF_H
-#include RUBY_EXTCONF_H
-#endif
-
-#if defined(__cplusplus)
-/* __builtin_choose_expr and __builtin_types_compatible aren't available
- * on C++.  See https://gcc.gnu.org/onlinedocs/gcc/Other-Builtins.html */
-# undef HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P
-# undef HAVE_BUILTIN___BUILTIN_TYPES_COMPATIBLE_P
-#endif
-
-#include "defines.h"
-
-#ifndef ASSUME
-# ifdef UNREACHABLE
-#   define ASSUME(x) (RB_LIKELY(!!(x)) ? (void)0 : UNREACHABLE)
-# else
-#   define ASSUME(x) ((void)(x))
-# endif
-#endif
-#ifndef UNREACHABLE
-# define UNREACHABLE ((void)0)	/* unreachable */
-#endif
-
-#define RUBY_MACRO_SELECT(base, n) TOKEN_PASTE(base, n)
+/**
+ * @file
+ * @author     $Author$
+ * @date       Thu Jun 10 14:26:32 JST 1993
+ * @copyright  Copyright (C) 1993-2008 Yukihiro Matsumoto
+ * @copyright  Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
+ * @copyright  Copyright (C) 2000  Information-technology Promotion Agency, Japan
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ */
+#include "ruby/internal/config.h"
 
 #ifdef HAVE_INTRINSICS_H
 # include <intrinsics.h>
@@ -54,2005 +20,86 @@ extern "C" {
 
 #include <stdarg.h>
 
-RUBY_SYMBOL_EXPORT_BEGIN
-
-/* Make alloca work the best possible way.  */
-#ifdef __GNUC__
-# ifndef alloca
-#  define alloca __builtin_alloca
-# endif
-#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__ */
-
-#if defined HAVE_UINTPTR_T && 0
-typedef uintptr_t VALUE;
-typedef uintptr_t ID;
-# define SIGNED_VALUE intptr_t
-# define SIZEOF_VALUE SIZEOF_UINTPTR_T
-# undef PRI_VALUE_PREFIX
-#elif 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 PRI_LL_PREFIX
-#else
-# error ---->> ruby requires sizeof(void*) == sizeof(long) or sizeof(LONG_LONG) to be compiled. <<----
-#endif
-
-typedef char ruby_check_sizeof_int[SIZEOF_INT == sizeof(int) ? 1 : -1];
-typedef char ruby_check_sizeof_long[SIZEOF_LONG == sizeof(long) ? 1 : -1];
-#ifdef HAVE_LONG_LONG
-typedef char ruby_check_sizeof_long_long[SIZEOF_LONG_LONG == sizeof(LONG_LONG) ? 1 : -1];
-#endif
-typedef char ruby_check_sizeof_voidp[SIZEOF_VOIDP == sizeof(void*) ? 1 : -1];
-
-#ifndef PRI_INT_PREFIX
-#define PRI_INT_PREFIX ""
-#endif
-#ifndef PRI_LONG_PREFIX
-#define PRI_LONG_PREFIX "l"
-#endif
-
-#if SIZEOF_LONG == 8
-#define PRI_64_PREFIX PRI_LONG_PREFIX
-#elif SIZEOF_LONG_LONG == 8
-#define PRI_64_PREFIX PRI_LL_PREFIX
-#endif
-
-#define RUBY_PRI_VALUE_MARK "\v"
-#if defined PRIdPTR && !defined PRI_VALUE_PREFIX
-#define PRIdVALUE PRIdPTR
-#define PRIoVALUE PRIoPTR
-#define PRIuVALUE PRIuPTR
-#define PRIxVALUE PRIxPTR
-#define PRIXVALUE PRIXPTR
-#define PRIsVALUE PRIiPTR"" RUBY_PRI_VALUE_MARK
-#else
-#define PRIdVALUE PRI_VALUE_PREFIX"d"
-#define PRIoVALUE PRI_VALUE_PREFIX"o"
-#define PRIuVALUE PRI_VALUE_PREFIX"u"
-#define PRIxVALUE PRI_VALUE_PREFIX"x"
-#define PRIXVALUE PRI_VALUE_PREFIX"X"
-#define PRIsVALUE PRI_VALUE_PREFIX"i" RUBY_PRI_VALUE_MARK
-#endif
-#ifndef PRI_VALUE_PREFIX
-# define PRI_VALUE_PREFIX ""
-#endif
-
-#ifndef PRI_TIMET_PREFIX
-# if SIZEOF_TIME_T == SIZEOF_INT
-#  define PRI_TIMET_PREFIX
-# elif SIZEOF_TIME_T == SIZEOF_LONG
-#  define PRI_TIMET_PREFIX "l"
-# elif SIZEOF_TIME_T == SIZEOF_LONG_LONG
-#  define PRI_TIMET_PREFIX PRI_LL_PREFIX
-# endif
-#endif
-
-#if defined PRI_PTRDIFF_PREFIX
-#elif 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 PRI_LL_PREFIX
-#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 defined PRI_SIZE_PREFIX
-#elif 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 PRI_LL_PREFIX
-#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 complement) 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 RUBY_FIXNUM_MAX (LONG_MAX>>1)
-#define RUBY_FIXNUM_MIN RSHIFT((long)LONG_MIN,1)
-#define FIXNUM_MAX RUBY_FIXNUM_MAX
-#define FIXNUM_MIN RUBY_FIXNUM_MIN
-
-#define INT2FIX(i) (((VALUE)(i))<<1 | RUBY_FIXNUM_FLAG)
-#define LONG2FIX(i) INT2FIX(i)
-#define rb_fix_new(v) INT2FIX(v)
-VALUE rb_int2inum(SIGNED_VALUE);
-
-#define rb_int_new(v) rb_int2inum(v)
-VALUE rb_uint2inum(VALUE);
-
-#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
-
-#ifndef OFFT2NUM
-#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
-#endif
-
-#if SIZEOF_SIZE_T > SIZEOF_LONG && defined(HAVE_LONG_LONG)
-# define SIZET2NUM(v) ULL2NUM(v)
-# define SSIZET2NUM(v) LL2NUM(v)
-#elif SIZEOF_SIZE_T == SIZEOF_LONG
-# define SIZET2NUM(v) ULONG2NUM(v)
-# define SSIZET2NUM(v) LONG2NUM(v)
-#else
-# define SIZET2NUM(v) UINT2NUM(v)
-# define SSIZET2NUM(v) INT2NUM(v)
-#endif
-
-#ifndef SIZE_MAX
-# if SIZEOF_SIZE_T > SIZEOF_LONG && defined(HAVE_LONG_LONG)
-#   define SIZE_MAX ULLONG_MAX
-#   define SIZE_MIN ULLONG_MIN
-# elif SIZEOF_SIZE_T == SIZEOF_LONG
-#   define SIZE_MAX ULONG_MAX
-#   define SIZE_MIN ULONG_MIN
-# elif SIZEOF_SIZE_T == SIZEOF_INT
-#   define SIZE_MAX UINT_MAX
-#   define SIZE_MIN UINT_MIN
-# else
-#   define SIZE_MAX USHRT_MAX
-#   define SIZE_MIN USHRT_MIN
-# endif
-#endif
-
-#ifndef SSIZE_MAX
-# if SIZEOF_SIZE_T > SIZEOF_LONG && defined(HAVE_LONG_LONG)
-#   define SSIZE_MAX LLONG_MAX
-#   define SSIZE_MIN LLONG_MIN
-# elif SIZEOF_SIZE_T == SIZEOF_LONG
-#   define SSIZE_MAX LONG_MAX
-#   define SSIZE_MIN LONG_MIN
-# elif SIZEOF_SIZE_T == SIZEOF_INT
-#   define SSIZE_MAX INT_MAX
-#   define SSIZE_MIN INT_MIN
-# else
-#   define SSIZE_MAX SHRT_MAX
-#   define SSIZE_MIN SHRT_MIN
-# endif
-#endif
-
-#if SIZEOF_INT < SIZEOF_VALUE
-NORETURN(void rb_out_of_int(SIGNED_VALUE num));
-#endif
-
-#if SIZEOF_INT < SIZEOF_LONG
-static inline int
-rb_long2int_inline(long n)
-{
-    int i = (int)n;
-    if ((long)i != n)
-	rb_out_of_int(n);
-
-    return i;
-}
-#define rb_long2int(n) rb_long2int_inline(n)
-#else
-#define rb_long2int(n) ((int)(n))
-#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
-#ifndef NUM2MODET
-#define NUM2MODET(v) NUM2INT(v)
-#endif
-#ifndef MODET2NUM
-#define MODET2NUM(v) INT2NUM(v)
-#endif
-
-#define RB_FIX2LONG(x) ((long)RSHIFT((SIGNED_VALUE)(x),1))
-static inline long
-rb_fix2long(VALUE x)
-{
-    return RB_FIX2LONG(x);
-}
-#define RB_FIX2ULONG(x) ((unsigned long)RB_FIX2LONG(x))
-static inline unsigned long
-rb_fix2ulong(VALUE x)
-{
-    return RB_FIX2ULONG(x);
-}
-#define RB_FIXNUM_P(f) (((int)(SIGNED_VALUE)(f))&RUBY_FIXNUM_FLAG)
-#define RB_POSFIXABLE(f) ((f) < RUBY_FIXNUM_MAX+1)
-#define RB_NEGFIXABLE(f) ((f) >= RUBY_FIXNUM_MIN)
-#define RB_FIXABLE(f) (RB_POSFIXABLE(f) && RB_NEGFIXABLE(f))
-#define FIX2LONG(x) RB_FIX2LONG(x)
-#define FIX2ULONG(x) RB_FIX2ULONG(x)
-#define FIXNUM_P(f) RB_FIXNUM_P(f)
-#define POSFIXABLE(f) RB_POSFIXABLE(f)
-#define NEGFIXABLE(f) RB_NEGFIXABLE(f)
-#define FIXABLE(f) RB_FIXABLE(f)
-
-#define RB_IMMEDIATE_P(x) ((VALUE)(x) & RUBY_IMMEDIATE_MASK)
-#define IMMEDIATE_P(x) RB_IMMEDIATE_P(x)
-
-ID rb_sym2id(VALUE);
-VALUE rb_id2sym(ID);
-#define RB_STATIC_SYM_P(x) (((VALUE)(x)&~((~(VALUE)0)<<RUBY_SPECIAL_SHIFT)) == RUBY_SYMBOL_FLAG)
-#define RB_DYNAMIC_SYM_P(x) (!RB_SPECIAL_CONST_P(x) && RB_BUILTIN_TYPE(x) == (RUBY_T_SYMBOL))
-#define RB_SYMBOL_P(x) (RB_STATIC_SYM_P(x)||RB_DYNAMIC_SYM_P(x))
-#define RB_ID2SYM(x) (rb_id2sym(x))
-#define RB_SYM2ID(x) (rb_sym2id(x))
-#define STATIC_SYM_P(x) RB_STATIC_SYM_P(x)
-#define DYNAMIC_SYM_P(x) RB_DYNAMIC_SYM_P(x)
-#define SYMBOL_P(x) RB_SYMBOL_P(x)
-#define ID2SYM(x) RB_ID2SYM(x)
-#define SYM2ID(x) RB_SYM2ID(x)
-
-#ifndef USE_FLONUM
-#if SIZEOF_VALUE >= SIZEOF_DOUBLE
-#define USE_FLONUM 1
-#else
-#define USE_FLONUM 0
-#endif
-#endif
-
-#if USE_FLONUM
-#define RB_FLONUM_P(x) ((((int)(SIGNED_VALUE)(x))&RUBY_FLONUM_MASK) == RUBY_FLONUM_FLAG)
-#else
-#define RB_FLONUM_P(x) 0
-#endif
-#define FLONUM_P(x) RB_FLONUM_P(x)
+#include "defines.h"
+#include "ruby/internal/anyargs.h"
+#include "ruby/internal/arithmetic.h"
+#include "ruby/internal/core.h"
+#include "ruby/internal/ctype.h"
+#include "ruby/internal/dllexport.h"
+#include "ruby/internal/error.h"
+#include "ruby/internal/eval.h"
+#include "ruby/internal/event.h"
+#include "ruby/internal/fl_type.h"
+#include "ruby/internal/gc.h"
+#include "ruby/internal/glob.h"
+#include "ruby/internal/globals.h"
+#include "ruby/internal/has/warning.h"
+#include "ruby/internal/interpreter.h"
+#include "ruby/internal/iterator.h"
+#include "ruby/internal/memory.h"
+#include "ruby/internal/method.h"
+#include "ruby/internal/module.h"
+#include "ruby/internal/newobj.h"
+#include "ruby/internal/rgengc.h"
+#include "ruby/internal/scan_args.h"
+#include "ruby/internal/special_consts.h"
+#include "ruby/internal/symbol.h"
+#include "ruby/internal/value.h"
+#include "ruby/internal/value_type.h"
+#include "ruby/internal/variable.h"
+#include "ruby/assert.h"
+#include "ruby/backward/2/assume.h"
+#include "ruby/backward/2/inttypes.h"
+#include "ruby/backward/2/limits.h"
+
+RBIMPL_SYMBOL_EXPORT_BEGIN()
 
 /* Module#methods, #singleton_methods and so on return Symbols */
 #define USE_SYMBOL_AS_METHOD_NAME 1
 
-/* special constants - i.e. non-zero and non-fixnum constants */
-enum ruby_special_consts {
-#if USE_FLONUM
-    RUBY_Qfalse = 0x00,		/* ...0000 0000 */
-    RUBY_Qtrue  = 0x14,		/* ...0001 0100 */
-    RUBY_Qnil   = 0x08,		/* ...0000 1000 */
-    RUBY_Qundef = 0x34,		/* ...0011 0100 */
-
-    RUBY_IMMEDIATE_MASK = 0x07,
-    RUBY_FIXNUM_FLAG    = 0x01,	/* ...xxxx xxx1 */
-    RUBY_FLONUM_MASK    = 0x03,
-    RUBY_FLONUM_FLAG    = 0x02,	/* ...xxxx xx10 */
-    RUBY_SYMBOL_FLAG    = 0x0c,	/* ...0000 1100 */
-#else
-    RUBY_Qfalse = 0,		/* ...0000 0000 */
-    RUBY_Qtrue  = 2,		/* ...0000 0010 */
-    RUBY_Qnil   = 4,		/* ...0000 0100 */
-    RUBY_Qundef = 6,		/* ...0000 0110 */
-
-    RUBY_IMMEDIATE_MASK = 0x03,
-    RUBY_FIXNUM_FLAG    = 0x01,	/* ...xxxx xxx1 */
-    RUBY_FLONUM_MASK    = 0x00,	/* any values ANDed with FLONUM_MASK cannot be FLONUM_FLAG */
-    RUBY_FLONUM_FLAG    = 0x02,
-    RUBY_SYMBOL_FLAG    = 0x0e,	/* ...0000 1110 */
-#endif
-    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
-#if USE_FLONUM
-#define FLONUM_MASK RUBY_FLONUM_MASK
-#define FLONUM_FLAG RUBY_FLONUM_FLAG
-#endif
-#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  = 0x16,
-
-    RUBY_T_IMEMO  = 0x1a,
-    RUBY_T_NODE   = 0x1b,
-    RUBY_T_ICLASS = 0x1c,
-    RUBY_T_ZOMBIE = 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_IMEMO  RUBY_T_IMEMO
-#define T_UNDEF  RUBY_T_UNDEF
-#define T_NODE   RUBY_T_NODE
-#define T_ZOMBIE RUBY_T_ZOMBIE
-#define T_MASK   RUBY_T_MASK
-
-#define RB_BUILTIN_TYPE(x) (int)(((struct RBasic*)(x))->flags & RUBY_T_MASK)
-#define BUILTIN_TYPE(x) RB_BUILTIN_TYPE(x)
-
-static inline int rb_type(VALUE obj);
-#define TYPE(x) rb_type((VALUE)(x))
-
-#define RB_FLOAT_TYPE_P(obj) (\
-	RB_FLONUM_P(obj) || \
-	(!RB_SPECIAL_CONST_P(obj) && RB_BUILTIN_TYPE(obj) == RUBY_T_FLOAT))
-
-#define RB_TYPE_P(obj, type) ( \
-	((type) == RUBY_T_FIXNUM) ? RB_FIXNUM_P(obj) : \
-	((type) == RUBY_T_TRUE) ? ((obj) == RUBY_Qtrue) : \
-	((type) == RUBY_T_FALSE) ? ((obj) == RUBY_Qfalse) : \
-	((type) == RUBY_T_NIL) ? ((obj) == RUBY_Qnil) : \
-	((type) == RUBY_T_UNDEF) ? ((obj) == RUBY_Qundef) : \
-	((type) == RUBY_T_SYMBOL) ? RB_SYMBOL_P(obj) : \
-	((type) == RUBY_T_FLOAT) ? RB_FLOAT_TYPE_P(obj) : \
-	(!RB_SPECIAL_CONST_P(obj) && RB_BUILTIN_TYPE(obj) == (type)))
-
-#ifdef __GNUC__
-#define RB_GC_GUARD(v) \
-    (*__extension__ ({volatile VALUE *rb_gc_guarded_ptr = &(v); rb_gc_guarded_ptr;}))
-#elif defined _MSC_VER
-#pragma optimize("", off)
-static inline volatile VALUE *rb_gc_guarded_ptr(volatile VALUE *ptr) {return ptr;}
-#pragma optimize("", on)
-#define RB_GC_GUARD(v) (*rb_gc_guarded_ptr(&(v)))
-#else
-volatile VALUE *rb_gc_guarded_ptr_val(volatile VALUE *ptr, VALUE val);
-#define HAVE_RB_GC_GUARDED_PTR_VAL 1
-#define RB_GC_GUARD(v) (*rb_gc_guarded_ptr_val(&(v),(v)))
-#endif
-
-#ifdef __GNUC__
-#define RB_UNUSED_VAR(x) x __attribute__ ((unused))
-#else
-#define RB_UNUSED_VAR(x) x
-#endif
-
-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);
-#define SafeStringValue(v) do {\
-    StringValue(v);\
-    rb_check_safe_obj(v);\
-} while (0)
-#if GCC_VERSION_SINCE(4,4,0)
-void rb_check_safe_str(VALUE) __attribute__((error("rb_check_safe_str() and Check_SafeStr() are obsolete; use SafeStringValue() instead")));
-# define Check_SafeStr(v) rb_check_safe_str((VALUE)(v))
-#else
-# define rb_check_safe_str(x) [<"rb_check_safe_str() is obsolete; use SafeStringValue() instead">]
-# define Check_SafeStr(v) [<"Check_SafeStr() is obsolete; use SafeStringValue() instead">]
-#endif
-
-VALUE rb_str_export(VALUE);
-#define ExportStringValue(v) do {\
-    SafeStringValue(v);\
-   (v) = rb_str_export(v);\
-} while (0)
-VALUE rb_str_export_locale(VALUE);
-
 VALUE rb_get_path(VALUE);
 #define FilePathValue(v) (RB_GC_GUARD(v) = rb_get_path(v))
 
 VALUE rb_get_path_no_checksafe(VALUE);
-#define FilePathStringValue(v) ((v) = rb_get_path_no_checksafe(v))
-
-#define RUBY_SAFE_LEVEL_MAX 1
-void rb_secure(int);
-int rb_safe_level(void);
-void rb_set_safe_level(int);
-#if GCC_VERSION_SINCE(4,4,0)
-int ruby_safe_level_2_error(void) __attribute__((error("$SAFE=2 to 4 are obsolete")));
-int ruby_safe_level_2_warning(void) __attribute__((const,warning("$SAFE=2 to 4 are obsolete")));
-# ifdef RUBY_EXPORT
-#   define ruby_safe_level_2_warning() ruby_safe_level_2_error()
-# endif
+#define FilePathStringValue(v) ((v) = rb_get_path(v))
+
+#if defined(HAVE_BUILTIN___BUILTIN_CONSTANT_P) && defined(HAVE_STMT_AND_DECL_IN_EXPR)
+# define rb_varargs_argc_check_runtime(argc, vargc) \
+    (((argc) <= (vargc)) ? (argc) : \
+     (rb_fatal("argc(%d) exceeds actual arguments(%d)", \
+	       argc, vargc), 0))
+# define rb_varargs_argc_valid_p(argc, vargc) \
+    ((argc) == 0 ? (vargc) <= 1 : /* [ruby-core:85266] [Bug #14425] */ \
+     (argc) == (vargc))
 # if defined(HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P)
-#  define RUBY_SAFE_LEVEL_INVALID_P(level) \
-    __extension__(\
-	__builtin_choose_expr(\
-	    __builtin_constant_p(level), \
-	    ((level) < 0 || RUBY_SAFE_LEVEL_MAX < (level)), 0))
-#  define RUBY_SAFE_LEVEL_CHECK(level, type) \
-    __extension__(__builtin_choose_expr(RUBY_SAFE_LEVEL_INVALID_P(level), ruby_safe_level_2_##type(), (level)))
-# else
-/* in gcc 4.8 or earlier, __builtin_choose_expr() does not consider
- * __builtin_constant_p(variable) a constant expression.
- */
-#  define RUBY_SAFE_LEVEL_INVALID_P(level) \
-    __extension__(__builtin_constant_p(level) && \
-		  ((level) < 0 || RUBY_SAFE_LEVEL_MAX < (level)))
-#  define RUBY_SAFE_LEVEL_CHECK(level, type) \
-    (RUBY_SAFE_LEVEL_INVALID_P(level) ? ruby_safe_level_2_##type() : (level))
-# endif
-# define rb_secure(level) rb_secure(RUBY_SAFE_LEVEL_CHECK(level, warning))
-# define rb_set_safe_level(level) rb_set_safe_level(RUBY_SAFE_LEVEL_CHECK(level, error))
-#endif
-void rb_set_safe_level_force(int);
-CONSTFUNC(void rb_secure_update(VALUE));
-NORETURN(void rb_insecure_operation(void));
-
-VALUE rb_errinfo(void);
-void rb_set_errinfo(VALUE);
-
-long rb_num2long(VALUE);
-unsigned long rb_num2ulong(VALUE);
-static inline long
-rb_num2long_inline(VALUE x)
-{
-    if (RB_FIXNUM_P(x))
-	return RB_FIX2LONG(x);
-    else
-	return rb_num2long(x);
-}
-#define RB_NUM2LONG(x) rb_num2long_inline(x)
-#define NUM2LONG(x) RB_NUM2LONG(x)
-static inline unsigned long
-rb_num2ulong_inline(VALUE x)
-{
-    if (RB_FIXNUM_P(x))
-	return RB_FIX2ULONG(x);
-    else
-	return rb_num2ulong(x);
-}
-#define RB_NUM2ULONG(x) rb_num2ulong_inline(x)
-#define NUM2ULONG(x) RB_NUM2ULONG(x)
-#if SIZEOF_INT < SIZEOF_LONG
-long rb_num2int(VALUE);
-long rb_fix2int(VALUE);
-#define RB_FIX2INT(x) ((int)rb_fix2int((VALUE)(x)))
-
-static inline int
-rb_num2int_inline(VALUE x)
-{
-    if (RB_FIXNUM_P(x))
-	return (int)rb_fix2int(x);
-    else
-	return (int)rb_num2int(x);
-}
-#define RB_NUM2INT(x) rb_num2int_inline(x)
-
-unsigned long rb_num2uint(VALUE);
-#define RB_NUM2UINT(x) ((unsigned int)rb_num2uint(x))
-unsigned long rb_fix2uint(VALUE);
-#define RB_FIX2UINT(x) ((unsigned int)rb_fix2uint(x))
-#else /* SIZEOF_INT < SIZEOF_LONG */
-#define RB_NUM2INT(x) ((int)RB_NUM2LONG(x))
-#define RB_NUM2UINT(x) ((unsigned int)RB_NUM2ULONG(x))
-#define RB_FIX2INT(x) ((int)RB_FIX2LONG(x))
-#define RB_FIX2UINT(x) ((unsigned int)RB_FIX2ULONG(x))
-#endif /* SIZEOF_INT < SIZEOF_LONG */
-#define NUM2INT(x)  RB_NUM2INT(x)
-#define NUM2UINT(x) RB_NUM2UINT(x)
-#define FIX2INT(x)  RB_FIX2INT(x)
-#define FIX2UINT(x) RB_FIX2UINT(x)
-
-short rb_num2short(VALUE);
-unsigned short rb_num2ushort(VALUE);
-short rb_fix2short(VALUE);
-unsigned short rb_fix2ushort(VALUE);
-#define RB_FIX2SHORT(x) (rb_fix2short((VALUE)(x)))
-#define FIX2SHORT(x) RB_FIX2SHORT(x)
-static inline short
-rb_num2short_inline(VALUE x)
-{
-    if (RB_FIXNUM_P(x))
-	return rb_fix2short(x);
-    else
-	return rb_num2short(x);
-}
-
-#define RB_NUM2SHORT(x) rb_num2short_inline(x)
-#define RB_NUM2USHORT(x) rb_num2ushort(x)
-#define NUM2SHORT(x) RB_NUM2SHORT(x)
-#define NUM2USHORT(x) RB_NUM2USHORT(x)
-
-#ifdef HAVE_LONG_LONG
-LONG_LONG rb_num2ll(VALUE);
-unsigned LONG_LONG rb_num2ull(VALUE);
-static inline LONG_LONG
-rb_num2ll_inline(VALUE x)
-{
-    if (RB_FIXNUM_P(x))
-	return RB_FIX2LONG(x);
-    else
-	return rb_num2ll(x);
-}
-# define RB_NUM2LL(x) rb_num2ll_inline(x)
-# define RB_NUM2ULL(x) rb_num2ull(x)
-# define NUM2LL(x) RB_NUM2LL(x)
-# define NUM2ULL(x) RB_NUM2ULL(x)
-#endif
-
-#if !defined(NUM2OFFT)
-# if defined(HAVE_LONG_LONG) && SIZEOF_OFF_T > SIZEOF_LONG
-#  define NUM2OFFT(x) ((off_t)NUM2LL(x))
-# else
-#  define NUM2OFFT(x) NUM2LONG(x)
-# endif
-#endif
-
-#if defined(HAVE_LONG_LONG) && SIZEOF_SIZE_T > SIZEOF_LONG
-# define NUM2SIZET(x) ((size_t)NUM2ULL(x))
-# define NUM2SSIZET(x) ((ssize_t)NUM2LL(x))
-#else
-# define NUM2SIZET(x) NUM2ULONG(x)
-# define NUM2SSIZET(x) NUM2LONG(x)
-#endif
-
-double rb_num2dbl(VALUE);
-#define NUM2DBL(x) rb_num2dbl((VALUE)(x))
-
-VALUE rb_uint2big(VALUE);
-VALUE rb_int2big(SIGNED_VALUE);
-
-VALUE rb_newobj(void);
-VALUE rb_newobj_of(VALUE, VALUE);
-VALUE rb_obj_setup(VALUE obj, VALUE klass, VALUE type);
-#define RB_NEWOBJ(obj,type) type *(obj) = (type*)rb_newobj()
-#define RB_NEWOBJ_OF(obj,type,klass,flags) type *(obj) = (type*)rb_newobj_of(klass, flags)
-#define NEWOBJ(obj,type) RB_NEWOBJ(obj,type)
-#define NEWOBJ_OF(obj,type,klass,flags) RB_NEWOBJ_OF(obj,type,klass,flags) /* core has special NEWOBJ_OF() in internal.h */
-#define OBJSETUP(obj,c,t) rb_obj_setup(obj, c, t) /* use NEWOBJ_OF instead of NEWOBJ()+OBJSETUP() */
-#define CLONESETUP(clone,obj) rb_clone_setup(clone,obj)
-#define DUPSETUP(dup,obj) rb_dup_setup(dup,obj)
-
-#ifndef USE_RGENGC
-#define USE_RGENGC 1
-#ifndef USE_RINCGC
-#define USE_RINCGC 1
-#endif
-#endif
-
-#if USE_RGENGC == 0
-#define USE_RINCGC 0
-#endif
-
-#ifndef RGENGC_WB_PROTECTED_ARRAY
-#define RGENGC_WB_PROTECTED_ARRAY 1
-#endif
-#ifndef RGENGC_WB_PROTECTED_HASH
-#define RGENGC_WB_PROTECTED_HASH 1
-#endif
-#ifndef RGENGC_WB_PROTECTED_STRUCT
-#define RGENGC_WB_PROTECTED_STRUCT 1
-#endif
-#ifndef RGENGC_WB_PROTECTED_STRING
-#define RGENGC_WB_PROTECTED_STRING 1
-#endif
-#ifndef RGENGC_WB_PROTECTED_OBJECT
-#define RGENGC_WB_PROTECTED_OBJECT 1
-#endif
-#ifndef RGENGC_WB_PROTECTED_REGEXP
-#define RGENGC_WB_PROTECTED_REGEXP 1
-#endif
-#ifndef RGENGC_WB_PROTECTED_CLASS
-#define RGENGC_WB_PROTECTED_CLASS 1
-#endif
-#ifndef RGENGC_WB_PROTECTED_FLOAT
-#define RGENGC_WB_PROTECTED_FLOAT 1
-#endif
-#ifndef RGENGC_WB_PROTECTED_COMPLEX
-#define RGENGC_WB_PROTECTED_COMPLEX 1
-#endif
-#ifndef RGENGC_WB_PROTECTED_RATIONAL
-#define RGENGC_WB_PROTECTED_RATIONAL 1
-#endif
-#ifndef RGENGC_WB_PROTECTED_BIGNUM
-#define RGENGC_WB_PROTECTED_BIGNUM 1
-#endif
-#ifndef RGENGC_WB_PROTECTED_NODE_CREF
-#define RGENGC_WB_PROTECTED_NODE_CREF 1
-#endif
-
-enum ruby_fl_type {
-    RUBY_FL_WB_PROTECTED = (1<<5),
-    RUBY_FL_PROMOTED0 = (1<<5),
-    RUBY_FL_PROMOTED1 = (1<<6),
-    RUBY_FL_PROMOTED  = RUBY_FL_PROMOTED0|RUBY_FL_PROMOTED1,
-    RUBY_FL_FINALIZE  = (1<<7),
-    RUBY_FL_TAINT     = (1<<8),
-    RUBY_FL_UNTRUSTED = RUBY_FL_TAINT,
-    RUBY_FL_EXIVAR    = (1<<10),
-    RUBY_FL_FREEZE    = (1<<11),
-
-    RUBY_FL_USHIFT    = 12,
-
-#define RUBY_FL_USER_N(n) RUBY_FL_USER##n = (1<<(RUBY_FL_USHIFT+n))
-    RUBY_FL_USER_N(0),
-    RUBY_FL_USER_N(1),
-    RUBY_FL_USER_N(2),
-    RUBY_FL_USER_N(3),
-    RUBY_FL_USER_N(4),
-    RUBY_FL_USER_N(5),
-    RUBY_FL_USER_N(6),
-    RUBY_FL_USER_N(7),
-    RUBY_FL_USER_N(8),
-    RUBY_FL_USER_N(9),
-    RUBY_FL_USER_N(10),
-    RUBY_FL_USER_N(11),
-    RUBY_FL_USER_N(12),
-    RUBY_FL_USER_N(13),
-    RUBY_FL_USER_N(14),
-    RUBY_FL_USER_N(15),
-    RUBY_FL_USER_N(16),
-    RUBY_FL_USER_N(17),
-    RUBY_FL_USER_N(18),
-#if defined ENUM_OVER_INT || SIZEOF_INT*CHAR_BIT>12+19+1
-    RUBY_FL_USER_N(19),
-#else
-#define RUBY_FL_USER19 (((VALUE)1)<<(RUBY_FL_USHIFT+19))
-#endif
-
-    RUBY_ELTS_SHARED = RUBY_FL_USER2,
-    RUBY_FL_DUPPED = (RUBY_T_MASK|RUBY_FL_EXIVAR|RUBY_FL_TAINT),
-    RUBY_FL_SINGLETON = RUBY_FL_USER0
-};
-
-struct RBasic {
-    VALUE flags;
-    const VALUE klass;
-}
-#ifdef __GNUC__
-    __attribute__((aligned(sizeof(VALUE))))
-#endif
-;
-
-VALUE rb_obj_hide(VALUE obj);
-VALUE rb_obj_reveal(VALUE obj, VALUE klass); /* do not use this API to change klass information */
-
-#if defined(HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P)
-# define RB_OBJ_WB_UNPROTECT_FOR(type, obj) \
-    __extension__( \
-	__builtin_choose_expr( \
-	    RGENGC_WB_PROTECTED_##type, \
-	    OBJ_WB_UNPROTECT((VALUE)(obj)), ((VALUE)(obj))))
-#else
-# define RB_OBJ_WB_UNPROTECT_FOR(type, obj) \
-    (RGENGC_WB_PROTECTED_##type ? \
-     OBJ_WB_UNPROTECT((VALUE)(obj)) : ((VALUE)(obj)))
-#endif
-
-#define RBASIC_CLASS(obj) (RBASIC(obj)->klass)
-
-#define ROBJECT_EMBED_LEN_MAX ROBJECT_EMBED_LEN_MAX
-#define ROBJECT_EMBED ROBJECT_EMBED
-enum {
-    ROBJECT_EMBED_LEN_MAX = 3,
-    ROBJECT_EMBED = RUBY_FL_USER1,
-
-    ROBJECT_ENUM_END
-};
-
-struct RObject {
-    struct RBasic basic;
-    union {
-	struct {
-	    uint32_t numiv;
-	    VALUE *ivptr;
-            void *iv_index_tbl; /* shortcut for RCLASS_IV_INDEX_TBL(rb_obj_class(obj)) */
-	} heap;
-	VALUE ary[ROBJECT_EMBED_LEN_MAX];
-    } as;
-};
-#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)
-
-#define RClass RClassDeprecated
-#ifndef __cplusplus
-DEPRECATED_TYPE(("RClass is internal use only"),
-struct RClass {
-    struct RBasic basic;
-});
-#endif
-#define RCLASS_SUPER(c) rb_class_get_superclass(c)
-#define RMODULE_IV_TBL(m) RCLASS_IV_TBL(m)
-#define RMODULE_CONST_TBL(m) RCLASS_CONST_TBL(m)
-#define RMODULE_M_TBL(m) RCLASS_M_TBL(m)
-#define RMODULE_SUPER(m) RCLASS_SUPER(m)
-#define RMODULE_IS_OVERLAID RMODULE_IS_OVERLAID
-#define RMODULE_IS_REFINEMENT RMODULE_IS_REFINEMENT
-#define RMODULE_INCLUDED_INTO_REFINEMENT RMODULE_INCLUDED_INTO_REFINEMENT
-enum {
-    RMODULE_IS_OVERLAID = RUBY_FL_USER2,
-    RMODULE_IS_REFINEMENT = RUBY_FL_USER3,
-    RMODULE_INCLUDED_INTO_REFINEMENT = RUBY_FL_USER4,
-
-    RMODULE_ENUM_END
-};
-
-PUREFUNC(double rb_float_value(VALUE));
-VALUE rb_float_new(double);
-VALUE rb_float_new_in_heap(double);
-
-#define RFLOAT_VALUE(v) rb_float_value(v)
-#define DBL2NUM(dbl)  rb_float_new(dbl)
-
-#define RUBY_ELTS_SHARED RUBY_ELTS_SHARED
-#define ELTS_SHARED RUBY_ELTS_SHARED
-
-#define RSTRING_NOEMBED RSTRING_NOEMBED
-#define RSTRING_EMBED_LEN_MASK RSTRING_EMBED_LEN_MASK
-#define RSTRING_EMBED_LEN_SHIFT RSTRING_EMBED_LEN_SHIFT
-#define RSTRING_EMBED_LEN_MAX RSTRING_EMBED_LEN_MAX
-#define RSTRING_FSTR RSTRING_FSTR
-enum {
-    RSTRING_NOEMBED = RUBY_FL_USER1,
-    RSTRING_EMBED_LEN_MASK = (RUBY_FL_USER2|RUBY_FL_USER3|RUBY_FL_USER4|
-			      RUBY_FL_USER5|RUBY_FL_USER6),
-    RSTRING_EMBED_LEN_SHIFT = (RUBY_FL_USHIFT+2),
-    RSTRING_EMBED_LEN_MAX = (int)((sizeof(VALUE)*3)/sizeof(char)-1),
-    RSTRING_FSTR = RUBY_FL_USER17,
-
-    RSTRING_ENUM_END
-};
-struct RString {
-    struct RBasic basic;
-    union {
-	struct {
-	    long len;
-	    char *ptr;
-	    union {
-		long capa;
-		VALUE shared;
-	    } aux;
-	} heap;
-	char ary[RSTRING_EMBED_LEN_MAX + 1];
-    } as;
-};
-#define RSTRING_EMBED_LEN(str) \
-     (long)((RBASIC(str)->flags >> RSTRING_EMBED_LEN_SHIFT) & \
-            (RSTRING_EMBED_LEN_MASK >> RSTRING_EMBED_LEN_SHIFT))
-#define RSTRING_LEN(str) \
-    (!(RBASIC(str)->flags & RSTRING_NOEMBED) ? \
-     RSTRING_EMBED_LEN(str) : \
-     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) \
-    (!(RBASIC(str)->flags & RSTRING_NOEMBED) ? \
-     (RSTRING(str)->as.ary + RSTRING_EMBED_LEN(str)) : \
-     (RSTRING(str)->as.heap.ptr + RSTRING(str)->as.heap.len))
-#define RSTRING_LENINT(str) rb_long2int(RSTRING_LEN(str))
-#define RSTRING_GETMEM(str, ptrvar, lenvar) \
-    (!(RBASIC(str)->flags & RSTRING_NOEMBED) ? \
-     ((ptrvar) = RSTRING(str)->as.ary, (lenvar) = RSTRING_EMBED_LEN(str)) : \
-     ((ptrvar) = RSTRING(str)->as.heap.ptr, (lenvar) = RSTRING(str)->as.heap.len))
-
-#define RARRAY_EMBED_FLAG RARRAY_EMBED_FLAG
-#define RARRAY_EMBED_LEN_MASK RARRAY_EMBED_LEN_MASK
-#define RARRAY_EMBED_LEN_MAX RARRAY_EMBED_LEN_MAX
-#define RARRAY_EMBED_LEN_SHIFT RARRAY_EMBED_LEN_SHIFT
-enum {
-    RARRAY_EMBED_LEN_MAX = 3,
-    RARRAY_EMBED_FLAG = RUBY_FL_USER1,
-    /* RUBY_FL_USER2 is for ELTS_SHARED */
-    RARRAY_EMBED_LEN_MASK = (RUBY_FL_USER4|RUBY_FL_USER3),
-    RARRAY_EMBED_LEN_SHIFT = (RUBY_FL_USHIFT+3),
-
-    RARRAY_ENUM_END
-};
-struct RArray {
-    struct RBasic basic;
-    union {
-	struct {
-	    long len;
-	    union {
-		long capa;
-		VALUE shared;
-	    } aux;
-	    const VALUE *ptr;
-	} heap;
-	const VALUE ary[RARRAY_EMBED_LEN_MAX];
-    } as;
-};
-#define RARRAY_EMBED_LEN(a) \
-    (long)((RBASIC(a)->flags >> RARRAY_EMBED_LEN_SHIFT) & \
-	   (RARRAY_EMBED_LEN_MASK >> RARRAY_EMBED_LEN_SHIFT))
-#define RARRAY_LEN(a) rb_array_len(a)
-#define RARRAY_LENINT(ary) rb_long2int(RARRAY_LEN(ary))
-#define RARRAY_CONST_PTR(a) rb_array_const_ptr(a)
-
-#define RARRAY_PTR_USE_START(a) ((VALUE *)RARRAY_CONST_PTR(a))
-#define RARRAY_PTR_USE_END(a) /* */
-
-#define RARRAY_PTR_USE(ary, ptr_name, expr) do { \
-    const VALUE _ary = (ary); \
-    VALUE *ptr_name = (VALUE *)RARRAY_PTR_USE_START(_ary); \
-    expr; \
-    RARRAY_PTR_USE_END(_ary); \
-} while (0)
-
-#define RARRAY_AREF(a, i)    (RARRAY_CONST_PTR(a)[i])
-#define RARRAY_ASET(a, i, v) do { \
-    const VALUE _ary = (a); \
-    VALUE *ptr = (VALUE *)RARRAY_PTR_USE_START(_ary); \
-    RB_OBJ_WRITE(_ary, &ptr[i], (v)); \
-    RARRAY_PTR_USE_END(_ary); \
-} while (0)
-
-#define RARRAY_PTR(a) ((VALUE *)RARRAY_CONST_PTR(RB_OBJ_WB_UNPROTECT_FOR(ARRAY, a)))
-
-struct RRegexp {
-    struct RBasic basic;
-    struct re_pattern_buffer *ptr;
-    const VALUE src;
-    unsigned long usecnt;
-};
-#define RREGEXP_PTR(r) (RREGEXP(r)->ptr)
-#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)
-#define RREGEXP_SRC_END(r) RSTRING_END(RREGEXP(r)->src)
-
-/* RHASH_TBL allocates st_table if not available. */
-#define RHASH_TBL(h) rb_hash_tbl(h)
-#define RHASH_ITER_LEV(h) rb_hash_iter_lev(h)
-#define RHASH_IFNONE(h) rb_hash_ifnone(h)
-#define RHASH_SIZE(h) NUM2SIZET(rb_hash_size(h))
-#define RHASH_EMPTY_P(h) (RHASH_SIZE(h) == 0)
-#define RHASH_SET_IFNONE(h, ifnone) rb_hash_set_ifnone((VALUE)h, ifnone)
-
-struct RFile {
-    struct RBasic basic;
-    struct rb_io_t *fptr;
-};
-
-#define RCOMPLEX_SET_REAL(cmp, r) RB_OBJ_WRITE((cmp), &((struct RComplex *)(cmp))->real,(r))
-#define RCOMPLEX_SET_IMAG(cmp, i) RB_OBJ_WRITE((cmp), &((struct RComplex *)(cmp))->imag,(i))
-
-struct RData {
-    struct RBasic basic;
-    void (*dmark)(void*);
-    void (*dfree)(void*);
-    void *data;
-};
-
-typedef struct rb_data_type_struct rb_data_type_t;
-
-struct rb_data_type_struct {
-    const char *wrap_struct_name;
-    struct {
-	void (*dmark)(void*);
-	void (*dfree)(void*);
-	size_t (*dsize)(const void *);
-	void *reserved[2]; /* For future extension.
-			      This array *must* be filled with ZERO. */
-    } function;
-    const rb_data_type_t *parent;
-    void *data;        /* This area can be used for any purpose
-                          by a programmer who define the type. */
-    VALUE flags;       /* RUBY_FL_WB_PROTECTED */
-};
-
-#define HAVE_TYPE_RB_DATA_TYPE_T 1
-#define HAVE_RB_DATA_TYPE_T_FUNCTION 1
-#define HAVE_RB_DATA_TYPE_T_PARENT 1
-
-struct RTypedData {
-    struct RBasic basic;
-    const rb_data_type_t *type;
-    VALUE typed_flag; /* 1 or not */
-    void *data;
-};
-
-#define DATA_PTR(dta) (RDATA(dta)->data)
-
-#define RTYPEDDATA_P(v)    (RTYPEDDATA(v)->typed_flag == 1)
-#define RTYPEDDATA_TYPE(v) (RTYPEDDATA(v)->type)
-#define RTYPEDDATA_DATA(v) (RTYPEDDATA(v)->data)
-
-/*
-#define RUBY_DATA_FUNC(func) ((void (*)(void*))(func))
-*/
-typedef void (*RUBY_DATA_FUNC)(void*);
-
-#ifndef RUBY_UNTYPED_DATA_WARNING
-# if defined RUBY_EXPORT
-#   define RUBY_UNTYPED_DATA_WARNING 1
+#   if HAVE_ATTRIBUTE_ERRORFUNC
+ERRORFUNC((" argument length doesn't match"), int rb_varargs_bad_length(int,int));
+#   else
+#     define rb_varargs_bad_length(argc, vargc) \
+	((argc)/rb_varargs_argc_valid_p(argc, vargc))
+#   endif
+#   define rb_varargs_argc_check(argc, vargc) \
+    __builtin_choose_expr(__builtin_constant_p(argc), \
+	(rb_varargs_argc_valid_p(argc, vargc) ? (argc) : \
+	 rb_varargs_bad_length(argc, vargc)), \
+	rb_varargs_argc_check_runtime(argc, vargc))
 # else
-#   define RUBY_UNTYPED_DATA_WARNING 0
+#   define rb_varargs_argc_check(argc, vargc) \
+	rb_varargs_argc_check_runtime(argc, vargc)
 # endif
 #endif
-VALUE rb_data_object_wrap(VALUE,void*,RUBY_DATA_FUNC,RUBY_DATA_FUNC);
-VALUE rb_data_object_zalloc(VALUE,size_t,RUBY_DATA_FUNC,RUBY_DATA_FUNC);
-VALUE rb_data_typed_object_wrap(VALUE klass, void *datap, const rb_data_type_t *);
-VALUE rb_data_typed_object_zalloc(VALUE klass, size_t size, const rb_data_type_t *type);
-int rb_typeddata_inherited_p(const rb_data_type_t *child, const rb_data_type_t *parent);
-int rb_typeddata_is_kind_of(VALUE, const rb_data_type_t *);
-void *rb_check_typeddata(VALUE, const rb_data_type_t *);
-#define Check_TypedStruct(v,t) rb_check_typeddata((VALUE)(v),(t))
-#define RUBY_DEFAULT_FREE ((RUBY_DATA_FUNC)-1)
-#define RUBY_NEVER_FREE   ((RUBY_DATA_FUNC)0)
-#define RUBY_TYPED_DEFAULT_FREE RUBY_DEFAULT_FREE
-#define RUBY_TYPED_NEVER_FREE   RUBY_NEVER_FREE
-
-/* bits for rb_data_type_struct::flags */
-#define RUBY_TYPED_FREE_IMMEDIATELY  1 /* TYPE field */
-#define RUBY_TYPED_WB_PROTECTED      RUBY_FL_WB_PROTECTED /* THIS FLAG DEPENDS ON Ruby version */
-#define RUBY_TYPED_PROMOTED1         RUBY_FL_PROMOTED1    /* THIS FLAG DEPENDS ON Ruby version */
-
-#define Data_Wrap_Struct(klass,mark,free,sval)\
-    rb_data_object_wrap((klass),(sval),(RUBY_DATA_FUNC)(mark),(RUBY_DATA_FUNC)(free))
-
-#define Data_Make_Struct0(result, klass, type, size, mark, free, sval) \
-    VALUE result = rb_data_object_zalloc((klass), (size), \
-					 (RUBY_DATA_FUNC)(mark), \
-					 (RUBY_DATA_FUNC)(free)); \
-    (void)((sval) = (type *)DATA_PTR(result));
-
-#ifdef __GNUC__
-#define Data_Make_Struct(klass,type,mark,free,sval) ({\
-    Data_Make_Struct0(data_struct_obj, klass, type, sizeof(type), mark, free, sval); \
-    data_struct_obj; \
-})
-#else
-#define Data_Make_Struct(klass,type,mark,free,sval) (\
-    rb_data_object_make((klass),(RUBY_DATA_FUNC)(mark),(RUBY_DATA_FUNC)(free),(void **)&(sval),sizeof(type)) \
-)
-#endif
-
-#define TypedData_Wrap_Struct(klass,data_type,sval)\
-  rb_data_typed_object_wrap((klass),(sval),(data_type))
-
-#define TypedData_Make_Struct0(result, klass, type, size, data_type, sval) \
-    VALUE result = rb_data_typed_object_zalloc(klass, size, data_type); \
-    (void)((sval) = (type *)DATA_PTR(result));
-
-#ifdef __GNUC__
-#define TypedData_Make_Struct(klass, type, data_type, sval) ({\
-    TypedData_Make_Struct0(data_struct_obj, klass, type, sizeof(type), data_type, sval); \
-    data_struct_obj; \
-})
-#else
-#define TypedData_Make_Struct(klass, type, data_type, sval) (\
-    rb_data_typed_object_make((klass),(data_type),(void **)&(sval),sizeof(type)) \
-)
-#endif
-
-#define Data_Get_Struct(obj,type,sval) \
-    ((sval) = (type*)rb_data_object_get(obj))
-
-#define TypedData_Get_Struct(obj,type,data_type,sval) \
-    ((sval) = (type*)rb_check_typeddata((obj), (data_type)))
-
-#define RSTRUCT_EMBED_LEN_MAX RSTRUCT_EMBED_LEN_MAX
-#define RSTRUCT_EMBED_LEN_MASK RSTRUCT_EMBED_LEN_MASK
-#define RSTRUCT_EMBED_LEN_SHIFT RSTRUCT_EMBED_LEN_SHIFT
-enum {
-    RSTRUCT_EMBED_LEN_MAX = 3,
-    RSTRUCT_EMBED_LEN_MASK = (RUBY_FL_USER2|RUBY_FL_USER1),
-    RSTRUCT_EMBED_LEN_SHIFT = (RUBY_FL_USHIFT+1),
-
-    RSTRUCT_ENUM_END
-};
-
-struct RStruct {
-    struct RBasic basic;
-    union {
-	struct {
-	    long len;
-	    const VALUE *ptr;
-	} heap;
-	const VALUE ary[RSTRUCT_EMBED_LEN_MAX];
-    } as;
-};
-
-#define RSTRUCT_EMBED_LEN(st) \
-    (long)((RBASIC(st)->flags >> RSTRUCT_EMBED_LEN_SHIFT) & \
-	   (RSTRUCT_EMBED_LEN_MASK >> RSTRUCT_EMBED_LEN_SHIFT))
-#define RSTRUCT_LEN(st) rb_struct_len(st)
-#define RSTRUCT_LENINT(st) rb_long2int(RSTRUCT_LEN(st))
-#define RSTRUCT_CONST_PTR(st) rb_struct_const_ptr(st)
-#define RSTRUCT_PTR(st) ((VALUE *)RSTRUCT_CONST_PTR(RB_OBJ_WB_UNPROTECT_FOR(STRUCT, st)))
-
-#define RSTRUCT_SET(st, idx, v) RB_OBJ_WRITE(st, &RSTRUCT_CONST_PTR(st)[idx], (v))
-#define RSTRUCT_GET(st, idx)    (RSTRUCT_CONST_PTR(st)[idx])
-
-#define RBIGNUM_SIGN(b) (FIX2LONG(rb_big_cmp((b), INT2FIX(0))) >= 0)
-#define RBIGNUM_POSITIVE_P(b) (FIX2LONG(rb_big_cmp((b), INT2FIX(0))) >= 0)
-#define RBIGNUM_NEGATIVE_P(b) (FIX2LONG(rb_big_cmp((b), INT2FIX(0))) < 0)
-
-#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 RSTRING(obj) (R_CAST(RString)(obj))
-#define RREGEXP(obj) (R_CAST(RRegexp)(obj))
-#define RARRAY(obj)  (R_CAST(RArray)(obj))
-#define RDATA(obj)   (R_CAST(RData)(obj))
-#define RTYPEDDATA(obj)   (R_CAST(RTypedData)(obj))
-#define RSTRUCT(obj) (R_CAST(RStruct)(obj))
-#define RFILE(obj)   (R_CAST(RFile)(obj))
-
-#define FL_SINGLETON    RUBY_FL_SINGLETON
-#define FL_WB_PROTECTED RUBY_FL_WB_PROTECTED
-#define FL_PROMOTED0    RUBY_FL_PROMOTED0
-#define FL_PROMOTED1    RUBY_FL_PROMOTED1
-#define FL_FINALIZE     RUBY_FL_FINALIZE
-#define FL_TAINT        RUBY_FL_TAINT
-#define FL_UNTRUSTED    RUBY_FL_UNTRUSTED
-#define FL_EXIVAR       RUBY_FL_EXIVAR
-#define FL_FREEZE       RUBY_FL_FREEZE
-
-#define FL_USHIFT       RUBY_FL_USHIFT
-
-#define FL_USER0  	RUBY_FL_USER0
-#define FL_USER1  	RUBY_FL_USER1
-#define FL_USER2  	RUBY_FL_USER2
-#define FL_USER3  	RUBY_FL_USER3
-#define FL_USER4  	RUBY_FL_USER4
-#define FL_USER5  	RUBY_FL_USER5
-#define FL_USER6  	RUBY_FL_USER6
-#define FL_USER7  	RUBY_FL_USER7
-#define FL_USER8  	RUBY_FL_USER8
-#define FL_USER9  	RUBY_FL_USER9
-#define FL_USER10 	RUBY_FL_USER10
-#define FL_USER11 	RUBY_FL_USER11
-#define FL_USER12 	RUBY_FL_USER12
-#define FL_USER13 	RUBY_FL_USER13
-#define FL_USER14 	RUBY_FL_USER14
-#define FL_USER15 	RUBY_FL_USER15
-#define FL_USER16 	RUBY_FL_USER16
-#define FL_USER17 	RUBY_FL_USER17
-#define FL_USER18 	RUBY_FL_USER18
-#define FL_USER19 	RUBY_FL_USER19
-
-#define RB_SPECIAL_CONST_P(x) (RB_IMMEDIATE_P(x) || !RTEST(x))
-#define SPECIAL_CONST_P(x) RB_SPECIAL_CONST_P(x)
-
-#define RB_FL_ABLE(x) (!RB_SPECIAL_CONST_P(x) && RB_BUILTIN_TYPE(x) != RUBY_T_NODE)
-#define RB_FL_TEST_RAW(x,f) (RBASIC(x)->flags&(f))
-#define RB_FL_TEST(x,f) (RB_FL_ABLE(x)?RB_FL_TEST_RAW((x),(f)):0)
-#define RB_FL_ANY_RAW(x,f) RB_FL_TEST_RAW((x),(f))
-#define RB_FL_ANY(x,f) RB_FL_TEST((x),(f))
-#define RB_FL_ALL_RAW(x,f) (RB_FL_TEST_RAW((x),(f)) == (f))
-#define RB_FL_ALL(x,f) (RB_FL_TEST((x),(f)) == (f))
-#define RB_FL_SET_RAW(x,f) (void)(RBASIC(x)->flags |= (f))
-#define RB_FL_SET(x,f) (RB_FL_ABLE(x) ? RB_FL_SET_RAW(x, f) : (void)0)
-#define RB_FL_UNSET_RAW(x,f) (void)(RBASIC(x)->flags &= ~(f))
-#define RB_FL_UNSET(x,f) (RB_FL_ABLE(x) ? RB_FL_UNSET_RAW(x, f) : (void)0)
-#define RB_FL_REVERSE_RAW(x,f) (void)(RBASIC(x)->flags ^= (f))
-#define RB_FL_REVERSE(x,f) (RB_FL_ABLE(x) ? RB_FL_REVERSE_RAW(x, f) : (void)0)
-
-#define RB_OBJ_TAINTABLE(x) (RB_FL_ABLE(x) && RB_BUILTIN_TYPE(x) != RUBY_T_BIGNUM && RB_BUILTIN_TYPE(x) != RUBY_T_FLOAT)
-#define RB_OBJ_TAINTED_RAW(x) RB_FL_TEST_RAW(x, RUBY_FL_TAINT)
-#define RB_OBJ_TAINTED(x) (!!RB_FL_TEST((x), RUBY_FL_TAINT))
-#define RB_OBJ_TAINT_RAW(x) RB_FL_SET_RAW(x, RUBY_FL_TAINT)
-#define RB_OBJ_TAINT(x) (RB_OBJ_TAINTABLE(x) ? RB_OBJ_TAINT_RAW(x) : (void)0)
-#define RB_OBJ_UNTRUSTED(x) RB_OBJ_TAINTED(x)
-#define RB_OBJ_UNTRUST(x) RB_OBJ_TAINT(x)
-#define RB_OBJ_INFECT_RAW(x,s) RB_FL_SET_RAW(x, RB_OBJ_TAINTED_RAW(s))
-#define RB_OBJ_INFECT(x,s) ( \
-    (RB_OBJ_TAINTABLE(x) && RB_FL_ABLE(s)) ? \
-    RB_OBJ_INFECT_RAW(x, s) : (void)0)
-
-#define RB_OBJ_FROZEN_RAW(x) (RBASIC(x)->flags&RUBY_FL_FREEZE)
-#define RB_OBJ_FROZEN(x) (!RB_FL_ABLE(x) || RB_OBJ_FROZEN_RAW(x))
-#define RB_OBJ_FREEZE_RAW(x) (void)(RBASIC(x)->flags |= RUBY_FL_FREEZE)
-#define RB_OBJ_FREEZE(x) rb_obj_freeze_inline((VALUE)x)
-
-#define FL_ABLE(x) RB_FL_ABLE(x)
-#define FL_TEST_RAW(x,f) RB_FL_TEST_RAW(x,f)
-#define FL_TEST(x,f) RB_FL_TEST(x,f)
-#define FL_ANY_RAW(x,f) RB_FL_ANY_RAW(x,f)
-#define FL_ANY(x,f) RB_FL_ANY(x,f)
-#define FL_ALL_RAW(x,f) RB_FL_ALL_RAW(x,f)
-#define FL_ALL(x,f) RB_FL_ALL(x,f)
-#define FL_SET_RAW(x,f) RB_FL_SET_RAW(x,f)
-#define FL_SET(x,f) RB_FL_SET(x,f)
-#define FL_UNSET_RAW(x,f) RB_FL_UNSET_RAW(x,f)
-#define FL_UNSET(x,f) RB_FL_UNSET(x,f)
-#define FL_REVERSE_RAW(x,f) RB_FL_REVERSE_RAW(x,f)
-#define FL_REVERSE(x,f) RB_FL_REVERSE(x,f)
-
-#define OBJ_TAINTABLE(x) RB_OBJ_TAINTABLE(x)
-#define OBJ_TAINTED_RAW(x) RB_OBJ_TAINTED_RAW(x)
-#define OBJ_TAINTED(x) RB_OBJ_TAINTED(x)
-#define OBJ_TAINT_RAW(x) RB_OBJ_TAINT_RAW(x)
-#define OBJ_TAINT(x) RB_OBJ_TAINT(x)
-#define OBJ_UNTRUSTED(x) RB_OBJ_UNTRUSTED(x)
-#define OBJ_UNTRUST(x) RB_OBJ_UNTRUST(x)
-#define OBJ_INFECT_RAW(x,s) RB_OBJ_INFECT_RAW(x,s)
-#define OBJ_INFECT(x,s) RB_OBJ_INFECT(x,s)
-#define OBJ_FROZEN_RAW(x) RB_OBJ_FROZEN_RAW(x)
-#define OBJ_FROZEN(x) RB_OBJ_FROZEN(x)
-#define OBJ_FREEZE_RAW(x) RB_OBJ_FREEZE_RAW(x)
-#define OBJ_FREEZE(x) RB_OBJ_FREEZE(x)
-
-void rb_freeze_singleton_class(VALUE klass);
-
-static inline void
-rb_obj_freeze_inline(VALUE x)
-{
-    if (RB_FL_ABLE(x)) {
-	RB_OBJ_FREEZE_RAW(x);
-	if (RBASIC_CLASS(x) && !(RBASIC(x)->flags & RUBY_FL_SINGLETON)) {
-	    rb_freeze_singleton_class(x);
-	}
-    }
-}
-
-#if GCC_VERSION_SINCE(4,4,0)
-# define RUBY_UNTYPED_DATA_FUNC(func) func __attribute__((warning("untyped Data is unsafe; use TypedData instead")))
-#else
-# define RUBY_UNTYPED_DATA_FUNC(func) DEPRECATED(func)
-#endif
-
-#if defined(__GNUC__) && !defined(__NO_INLINE__)
-#if defined(HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P)
-RUBY_UNTYPED_DATA_FUNC(static inline VALUE rb_data_object_wrap_warning(VALUE,void*,RUBY_DATA_FUNC,RUBY_DATA_FUNC));
-#endif
-RUBY_UNTYPED_DATA_FUNC(static inline void *rb_data_object_get_warning(VALUE));
-
-static inline VALUE
-rb_data_object_wrap_warning(VALUE klass, void *ptr, RUBY_DATA_FUNC mark, RUBY_DATA_FUNC free)
-{
-    return rb_data_object_wrap(klass, ptr, mark, free);
-}
-
-#if defined(HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P)
-#define rb_data_object_wrap_warning(klass, ptr, mark, free) \
-    __extension__( \
-	__builtin_choose_expr( \
-	    __builtin_constant_p(klass) && !(klass), \
-	    rb_data_object_wrap(klass, ptr, mark, free), \
-	    rb_data_object_wrap_warning(klass, ptr, mark, free)))
-#endif
-#endif
-
-static inline void *
-rb_data_object_get(VALUE obj)
-{
-    Check_Type(obj, RUBY_T_DATA);
-    return ((struct RData *)obj)->data;
-}
-
-#if defined(__GNUC__) && !defined(__NO_INLINE__)
-static inline void *
-rb_data_object_get_warning(VALUE obj)
-{
-    return rb_data_object_get(obj);
-}
-#endif
-
-static inline VALUE
-rb_data_object_make(VALUE klass, RUBY_DATA_FUNC mark_func, RUBY_DATA_FUNC free_func, void **datap, size_t size)
-{
-    Data_Make_Struct0(result, klass, void, size, mark_func, free_func, *datap);
-    return result;
-}
-
-static inline VALUE
-rb_data_typed_object_make(VALUE klass, const rb_data_type_t *type, void **datap, size_t size)
-{
-    TypedData_Make_Struct0(result, klass, void, size, type, *datap);
-    return result;
-}
-
-#ifndef rb_data_object_alloc
-DEPRECATED_BY(rb_data_object_wrap, static inline VALUE rb_data_object_alloc(VALUE,void*,RUBY_DATA_FUNC,RUBY_DATA_FUNC));
-static inline VALUE
-rb_data_object_alloc(VALUE klass, void *data, RUBY_DATA_FUNC dmark, RUBY_DATA_FUNC dfree)
-{
-    return rb_data_object_wrap(klass, data, dmark, dfree);
-}
-#endif
-
-#ifndef rb_data_typed_object_alloc
-DEPRECATED_BY(rb_data_typed_object_wrap, static inline VALUE rb_data_typed_object_alloc(VALUE,void*,const rb_data_type_t*));
-static inline VALUE
-rb_data_typed_object_alloc(VALUE klass, void *datap, const rb_data_type_t *type)
-{
-    return rb_data_typed_object_wrap(klass, datap, type);
-}
-#endif
-
-#if defined(__GNUC__) && !defined(__NO_INLINE__)
-#define rb_data_object_wrap_0 rb_data_object_wrap
-#define rb_data_object_wrap_1 rb_data_object_wrap_warning
-#define rb_data_object_wrap  RUBY_MACRO_SELECT(rb_data_object_wrap_, RUBY_UNTYPED_DATA_WARNING)
-#define rb_data_object_get_0 rb_data_object_get
-#define rb_data_object_get_1 rb_data_object_get_warning
-#define rb_data_object_get  RUBY_MACRO_SELECT(rb_data_object_get_, RUBY_UNTYPED_DATA_WARNING)
-#define rb_data_object_make_0 rb_data_object_make
-#define rb_data_object_make_1 rb_data_object_make_warning
-#define rb_data_object_make   RUBY_MACRO_SELECT(rb_data_object_make_, RUBY_UNTYPED_DATA_WARNING)
-#endif
-
-#if USE_RGENGC
-#define RB_OBJ_PROMOTED_RAW(x)      RB_FL_ALL_RAW(x, RUBY_FL_PROMOTED)
-#define RB_OBJ_PROMOTED(x)          (RB_SPECIAL_CONST_P(x) ? 0 : RB_OBJ_PROMOTED_RAW(x))
-#define RB_OBJ_WB_UNPROTECT(x)      rb_obj_wb_unprotect(x, __FILE__, __LINE__)
-
-void rb_gc_writebarrier(VALUE a, VALUE b);
-void rb_gc_writebarrier_unprotect(VALUE obj);
-
-#else /* USE_RGENGC */
-#define RB_OBJ_PROMOTED(x)          0
-#define RB_OBJ_WB_UNPROTECT(x)      rb_obj_wb_unprotect(x, __FILE__, __LINE__)
-#endif
-#define OBJ_PROMOTED_RAW(x)         RB_OBJ_PROMOTED_RAW(x)
-#define OBJ_PROMOTED(x)             RB_OBJ_PROMOTED(x)
-#define OBJ_WB_UNPROTECT(x)         RB_OBJ_WB_UNPROTECT(x)
-
-/* Write barrier (WB) interfaces:
- * - RB_OBJ_WRITE(a, slot, b): WB for new reference from `a' to `b'.
- *     Write `b' into `*slot'. `slot' is a pointer in `a'.
- * - RB_OBJ_WRITTEN(a, oldv, b): WB for new reference from `a' to `b'.
- *     This doesn't write any values, but only a WB declaration.
- *     `oldv' is replaced value with `b' (not used in current Ruby).
- *
- * NOTE: The following core interfaces can be changed in the future.
- *       Please catch up if you want to insert WB into C-extensions
- *       correctly.
- */
-#define RB_OBJ_WRITE(a, slot, b)       rb_obj_write((VALUE)(a), (VALUE *)(slot), (VALUE)(b), __FILE__, __LINE__)
-#define RB_OBJ_WRITTEN(a, oldv, b)     rb_obj_written((VALUE)(a), (VALUE)(oldv), (VALUE)(b), __FILE__, __LINE__)
-
-#ifndef USE_RGENGC_LOGGING_WB_UNPROTECT
-#define USE_RGENGC_LOGGING_WB_UNPROTECT 0
-#endif
-
-#if USE_RGENGC_LOGGING_WB_UNPROTECT
-void rb_gc_unprotect_logging(void *objptr, const char *filename, int line);
-#define RGENGC_LOGGING_WB_UNPROTECT rb_gc_unprotect_logging
-#endif
-
-static inline VALUE
-rb_obj_wb_unprotect(VALUE x, RB_UNUSED_VAR(const char *filename), RB_UNUSED_VAR(int line))
-{
-#ifdef RGENGC_LOGGING_WB_UNPROTECT
-    RGENGC_LOGGING_WB_UNPROTECT((void *)x, filename, line);
-#endif
-#if USE_RGENGC
-    rb_gc_writebarrier_unprotect(x);
-#endif
-    return x;
-}
-
-static inline VALUE
-rb_obj_written(VALUE a, RB_UNUSED_VAR(VALUE oldv), VALUE b, RB_UNUSED_VAR(const char *filename), RB_UNUSED_VAR(int line))
-{
-#ifdef RGENGC_LOGGING_OBJ_WRITTEN
-    RGENGC_LOGGING_OBJ_WRITTEN(a, oldv, b, filename, line);
-#endif
-
-#if USE_RGENGC
-    if (!RB_SPECIAL_CONST_P(b)) {
-	rb_gc_writebarrier(a, b);
-    }
-#endif
-
-    return a;
-}
-
-static inline VALUE
-rb_obj_write(VALUE a, VALUE *slot, VALUE b, RB_UNUSED_VAR(const char *filename), RB_UNUSED_VAR(int line))
-{
-#ifdef RGENGC_LOGGING_WRITE
-    RGENGC_LOGGING_WRITE(a, slot, b, filename, line);
-#endif
-
-    *slot = b;
-
-#if USE_RGENGC
-    rb_obj_written(a, Qundef /* ignore `oldv' now */, b, filename, line);
-#endif
-    return a;
-}
-
-#define RUBY_INTEGER_UNIFICATION 1
-#define RB_INTEGER_TYPE_P(obj) rb_integer_type_p(obj)
-static inline int
-rb_integer_type_p(VALUE obj)
-{
-    return (RB_FIXNUM_P(obj) ||
-	    (!RB_SPECIAL_CONST_P(obj) &&
-	     RB_BUILTIN_TYPE(obj) == RUBY_T_BIGNUM));
-}
-
-#if SIZEOF_INT < SIZEOF_LONG
-# define RB_INT2NUM(v) INT2FIX((int)(v))
-# define RB_UINT2NUM(v) LONG2FIX((unsigned int)(v))
-#else
-static inline VALUE
-rb_int2num_inline(int v)
-{
-    if (RB_FIXABLE(v))
-	return INT2FIX(v);
-    else
-	return rb_int2big(v);
-}
-#define RB_INT2NUM(x) rb_int2num_inline(x)
-
-static inline VALUE
-rb_uint2num_inline(unsigned int v)
-{
-    if (RB_POSFIXABLE(v))
-	return LONG2FIX(v);
-    else
-	return rb_uint2big(v);
-}
-#define RB_UINT2NUM(x) rb_uint2num_inline(x)
-#endif
-#define INT2NUM(x) RB_INT2NUM(x)
-#define UINT2NUM(x) RB_UINT2NUM(x)
-
-static inline VALUE
-rb_long2num_inline(long v)
-{
-    if (RB_FIXABLE(v))
-	return LONG2FIX(v);
-    else
-	return rb_int2big(v);
-}
-#define RB_LONG2NUM(x) rb_long2num_inline(x)
-
-static inline VALUE
-rb_ulong2num_inline(unsigned long v)
-{
-    if (RB_POSFIXABLE(v))
-	return LONG2FIX(v);
-    else
-	return rb_uint2big(v);
-}
-#define RB_ULONG2NUM(x) rb_ulong2num_inline(x)
-
-static inline char
-rb_num2char_inline(VALUE x)
-{
-    if (RB_TYPE_P(x, RUBY_T_STRING) && (RSTRING_LEN(x)>=1))
-	return RSTRING_PTR(x)[0];
-    else
-	return (char)(NUM2INT(x) & 0xff);
-}
-#define RB_NUM2CHR(x) rb_num2char_inline(x)
-
-#define RB_CHR2FIX(x) INT2FIX((long)((x)&0xff))
-
-#define LONG2NUM(x) RB_LONG2NUM(x)
-#define ULONG2NUM(x) RB_ULONG2NUM(x)
-#define NUM2CHR(x) RB_NUM2CHR(x)
-#define CHR2FIX(x) RB_CHR2FIX(x)
-
-#define RB_ALLOC_N(type,n) ((type*)ruby_xmalloc2((n),sizeof(type)))
-#define RB_ALLOC(type) ((type*)ruby_xmalloc(sizeof(type)))
-#define RB_ZALLOC_N(type,n) ((type*)ruby_xcalloc((n),sizeof(type)))
-#define RB_ZALLOC(type) (RB_ZALLOC_N(type,1))
-#define RB_REALLOC_N(var,type,n) ((var)=(type*)ruby_xrealloc2((char*)(var),(n),sizeof(type)))
-
-#define ALLOC_N(type,n) RB_ALLOC_N(type,n)
-#define ALLOC(type) RB_ALLOC(type)
-#define ZALLOC_N(type,n) RB_ZALLOC_N(type,n)
-#define ZALLOC(type) RB_ZALLOC(type)
-#define REALLOC_N(var,type,n) RB_REALLOC_N(var,type,n)
-
-#define ALLOCA_N(type,n) ((type*)alloca(sizeof(type)*(n)))
-
-void *rb_alloc_tmp_buffer(volatile VALUE *store, long len) RUBY_ATTR_ALLOC_SIZE((2));
-void *rb_alloc_tmp_buffer_with_count(volatile VALUE *store, size_t len,size_t count) RUBY_ATTR_ALLOC_SIZE((2,3));
-void rb_free_tmp_buffer(volatile VALUE *store);
-NORETURN(void ruby_malloc_size_overflow(size_t, size_t));
-#if HAVE_LONG_LONG && SIZEOF_SIZE_T * 2 <= SIZEOF_LONG_LONG
-# define DSIZE_T unsigned LONG_LONG
-#elif defined(HAVE_INT128_T)
-# define DSIZE_T uint128_t
-#endif
-static inline int
-rb_mul_size_overflow(size_t a, size_t b, size_t max, size_t *c)
-{
-#ifdef DSIZE_T
-    DSIZE_T c2 = (DSIZE_T)a * (DSIZE_T)b;
-    if (c2 > max) return 1;
-    *c = (size_t)c2;
-#else
-    if (b != 0 && a > max / b) return 1;
-    *c = a * b;
-#endif
-    return 0;
-}
-static inline void *
-rb_alloc_tmp_buffer2(volatile VALUE *store, long count, size_t elsize)
-{
-    size_t cnt = (size_t)count;
-    if (elsize % sizeof(VALUE) == 0) {
-	if (RB_UNLIKELY(cnt > LONG_MAX / sizeof(VALUE))) {
-	    ruby_malloc_size_overflow(cnt, elsize);
-	}
-    }
-    else {
-	size_t size, max = LONG_MAX - sizeof(VALUE) + 1;
-	if (RB_UNLIKELY(rb_mul_size_overflow(count, elsize, max, &size))) {
-	    ruby_malloc_size_overflow(cnt, elsize);
-	}
-	cnt = (size + sizeof(VALUE) - 1) / sizeof(VALUE);
-    }
-    return rb_alloc_tmp_buffer_with_count(store, cnt * sizeof(VALUE), cnt);
-}
-/* allocates _n_ bytes temporary buffer and stores VALUE including it
- * in _v_.  _n_ may be evaluated twice. */
-#ifdef C_ALLOCA
-# define RB_ALLOCV(v, n) rb_alloc_tmp_buffer(&(v), (n))
-# define RB_ALLOCV_N(type, v, n) \
-     rb_alloc_tmp_buffer2(&(v), (n), sizeof(type))))
-#else
-# define RUBY_ALLOCV_LIMIT 1024
-# define RB_ALLOCV(v, n) ((n) < RUBY_ALLOCV_LIMIT ? \
-		       (RB_GC_GUARD(v) = 0, alloca(n)) : \
-		       rb_alloc_tmp_buffer(&(v), (n)))
-# define RB_ALLOCV_N(type, v, n) \
-    ((type*)(((size_t)(n) < RUBY_ALLOCV_LIMIT / sizeof(type)) ? \
-	     (RB_GC_GUARD(v) = 0, alloca((n) * sizeof(type))) : \
-	     rb_alloc_tmp_buffer2(&(v), (n), sizeof(type))))
-#endif
-#define RB_ALLOCV_END(v) rb_free_tmp_buffer(&(v))
-
-#define ALLOCV(v, n) RB_ALLOCV(v, n)
-#define ALLOCV_N(type, v, n) RB_ALLOCV_N(type, v, n)
-#define ALLOCV_END(v) RB_ALLOCV_END(v)
-
-#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_prepend_module(VALUE,VALUE);
-
-struct rb_global_variable;
-
-typedef VALUE rb_gvar_getter_t(ID id, void *data, struct rb_global_variable *gvar);
-typedef void  rb_gvar_setter_t(VALUE val, ID id, void *data, struct rb_global_variable *gvar);
-typedef void  rb_gvar_marker_t(VALUE *var);
-
-VALUE rb_gvar_undef_getter(ID id, void *data, struct rb_global_variable *gvar);
-void  rb_gvar_undef_setter(VALUE val, ID id, void *data, struct rb_global_variable *gvar);
-void  rb_gvar_undef_marker(VALUE *var);
-
-VALUE rb_gvar_val_getter(ID id, void *data, struct rb_global_variable *gvar);
-void  rb_gvar_val_setter(VALUE val, ID id, void *data, struct rb_global_variable *gvar);
-void  rb_gvar_val_marker(VALUE *var);
-
-VALUE rb_gvar_var_getter(ID id, void *data, struct rb_global_variable *gvar);
-void  rb_gvar_var_setter(VALUE val, ID id, void *data, struct rb_global_variable *gvar);
-void  rb_gvar_var_marker(VALUE *var);
-
-NORETURN(void  rb_gvar_readonly_setter(VALUE val, ID id, void *data, struct rb_global_variable *gvar));
-
-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*,const 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_gc_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_check_id(volatile VALUE *);
-ID rb_to_id(VALUE);
-VALUE rb_id2str(ID);
-VALUE rb_sym2str(VALUE);
-VALUE rb_to_symbol(VALUE name);
-VALUE rb_check_symbol(volatile VALUE *namep);
-
-#define RUBY_CONST_ID_CACHE(result, str)		\
-    {							\
-	static ID rb_intern_id_cache;			\
-	if (!rb_intern_id_cache)			\
-	    rb_intern_id_cache = rb_intern2((str), (long)strlen(str)); \
-	result rb_intern_id_cache;			\
-    }
-#define RUBY_CONST_ID(var, str) \
-    do RUBY_CONST_ID_CACHE((var) =, (str)) while (0)
-#define CONST_ID_CACHE(result, str) RUBY_CONST_ID_CACHE(result, str)
-#define CONST_ID(var, str) RUBY_CONST_ID(var, str)
-#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((ID), (str))) : \
-        rb_intern(str))
-#define rb_intern_const(str) \
-    (__builtin_constant_p(str) ? \
-     __extension__ (rb_intern2((str), (long)strlen(str))) : \
-     (rb_intern)(str))
-#else
-#define rb_intern_const(str) rb_intern2((str), (long)strlen(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_funcallv(VALUE, ID, int, const VALUE*);
-VALUE rb_funcallv_public(VALUE, ID, int, const VALUE*);
-#define rb_funcall2 rb_funcallv
-#define rb_funcall3 rb_funcallv_public
-VALUE rb_funcall_passing_block(VALUE, ID, int, const VALUE*);
-VALUE rb_funcall_with_block(VALUE, ID, int, const VALUE*, VALUE);
-int rb_scan_args(int, const VALUE*, const char*, ...);
-VALUE rb_call_super(int, const VALUE*);
-VALUE rb_current_receiver(void);
-int rb_get_kwargs(VALUE keyword_hash, const ID *table, int required, int optional, VALUE *);
-VALUE rb_extract_keywords(VALUE *orighash);
-
-/* rb_scan_args() format allows ':' for optional hash */
-#define HAVE_RB_SCAN_ARGS_OPTIONAL_HASH 1
-
-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())
-
-/* for rb_readwrite_sys_fail first argument */
-enum rb_io_wait_readwrite {RB_IO_WAIT_READABLE, RB_IO_WAIT_WRITABLE};
-#define RB_IO_WAIT_READABLE RB_IO_WAIT_READABLE
-#define RB_IO_WAIT_WRITABLE RB_IO_WAIT_WRITABLE
-
-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_bug_errno(const char*, int));
-NORETURN(void rb_sys_fail(const char*));
-NORETURN(void rb_sys_fail_str(VALUE));
-NORETURN(void rb_mod_sys_fail(VALUE, const char*));
-NORETURN(void rb_mod_sys_fail_str(VALUE, VALUE));
-NORETURN(void rb_readwrite_sys_fail(enum rb_io_wait_readwrite, const char*));
-NORETURN(void rb_iter_break(void));
-NORETURN(void rb_iter_break_value(VALUE));
-NORETURN(void rb_exit(int));
-NORETURN(void rb_notimplement(void));
-VALUE rb_syserr_new(int, const char *);
-VALUE rb_syserr_new_str(int n, VALUE arg);
-NORETURN(void rb_syserr_fail(int, const char*));
-NORETURN(void rb_syserr_fail_str(int, VALUE));
-NORETURN(void rb_mod_syserr_fail(VALUE, int, const char*));
-NORETURN(void rb_mod_syserr_fail_str(VALUE, int, VALUE));
-NORETURN(void rb_readwrite_syserr_fail(enum rb_io_wait_readwrite, int, const char*));
-
-/* 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);
-
-#define RUBY_BLOCK_CALL_FUNC_TAKES_BLOCKARG 1
-#define RB_BLOCK_CALL_FUNC_ARGLIST(yielded_arg, callback_arg) \
-    VALUE yielded_arg, VALUE callback_arg, int argc, const VALUE *argv, VALUE blockarg
-typedef VALUE rb_block_call_func(RB_BLOCK_CALL_FUNC_ARGLIST(yielded_arg, callback_arg));
-
-#if defined RB_BLOCK_CALL_FUNC_STRICT && RB_BLOCK_CALL_FUNC_STRICT
-typedef rb_block_call_func *rb_block_call_func_t;
-#else
-typedef VALUE (*rb_block_call_func_t)(ANYARGS);
-#endif
-
-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);
-VALUE rb_yield_block(VALUE, VALUE, int, const VALUE *, VALUE); /* rb_block_call_func */
-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,const VALUE*,rb_block_call_func_t,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*);
 
-RUBY_EXTERN VALUE rb_mKernel;
-RUBY_EXTERN VALUE rb_mComparable;
-RUBY_EXTERN VALUE rb_mEnumerable;
-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_mWaitReadable;
-RUBY_EXTERN VALUE rb_mWaitWritable;
-
-RUBY_EXTERN VALUE rb_cBasicObject;
-RUBY_EXTERN VALUE rb_cObject;
-RUBY_EXTERN VALUE rb_cArray;
-#ifndef RUBY_INTEGER_UNIFICATION
-RUBY_EXTERN VALUE rb_cBignum;
-#endif
-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_cEncoding;
-RUBY_EXTERN VALUE rb_cEnumerator;
-RUBY_EXTERN VALUE rb_cFile;
-#ifndef RUBY_INTEGER_UNIFICATION
-RUBY_EXTERN VALUE rb_cFixnum;
-#endif
-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_cRandom;
-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_eEncodingError;
-RUBY_EXTERN VALUE rb_eEncCompatError;
-
-RUBY_EXTERN VALUE rb_eScriptError;
-RUBY_EXTERN VALUE rb_eNameError;
-RUBY_EXTERN VALUE rb_eSyntaxError;
-RUBY_EXTERN VALUE rb_eLoadError;
-
-RUBY_EXTERN VALUE rb_eMathDomainError;
-
-RUBY_EXTERN VALUE rb_stdin, rb_stdout, rb_stderr;
-
-static inline VALUE
-rb_class_of(VALUE obj)
-{
-    if (RB_IMMEDIATE_P(obj)) {
-	if (RB_FIXNUM_P(obj)) return rb_cInteger;
-	if (RB_FLONUM_P(obj)) return rb_cFloat;
-	if (obj == RUBY_Qtrue)  return rb_cTrueClass;
-	if (RB_STATIC_SYM_P(obj)) return rb_cSymbol;
-    }
-    else if (!RTEST(obj)) {
-	if (obj == RUBY_Qnil)   return rb_cNilClass;
-	if (obj == RUBY_Qfalse) return rb_cFalseClass;
-    }
-    return RBASIC(obj)->klass;
-}
-
-static inline int
-rb_type(VALUE obj)
-{
-    if (RB_IMMEDIATE_P(obj)) {
-	if (RB_FIXNUM_P(obj)) return RUBY_T_FIXNUM;
-        if (RB_FLONUM_P(obj)) return RUBY_T_FLOAT;
-        if (obj == RUBY_Qtrue)  return RUBY_T_TRUE;
-	if (RB_STATIC_SYM_P(obj)) return RUBY_T_SYMBOL;
-	if (obj == RUBY_Qundef) return RUBY_T_UNDEF;
-    }
-    else if (!RTEST(obj)) {
-	if (obj == RUBY_Qnil)   return RUBY_T_NIL;
-	if (obj == RUBY_Qfalse) return RUBY_T_FALSE;
-    }
-    return RB_BUILTIN_TYPE(obj);
-}
-
-#ifdef __GNUC__
-#define rb_type_p(obj, type) \
-    __extension__ (__builtin_constant_p(type) ? RB_TYPE_P((obj), (type)) : \
-		   rb_type(obj) == (type))
-#else
-#define rb_type_p(obj, type) (rb_type(obj) == (type))
-#endif
-
-#ifdef __GNUC__
-#define rb_special_const_p(obj) \
-    __extension__ ({ \
-	VALUE special_const_obj = (obj); \
-	(int)(RB_SPECIAL_CONST_P(special_const_obj) ? RUBY_Qtrue : RUBY_Qfalse); \
-    })
-#else
-static inline int
-rb_special_const_p(VALUE obj)
-{
-    if (RB_SPECIAL_CONST_P(obj)) return (int)RUBY_Qtrue;
-    return (int)RUBY_Qfalse;
-}
-#endif
-
 #include "ruby/intern.h"
 
-static inline void
-rb_clone_setup(VALUE clone, VALUE obj)
-{
-    rb_obj_setup(clone, rb_singleton_class_clone(obj), RBASIC(obj)->flags);
-    rb_singleton_class_attached(RBASIC_CLASS(clone), clone);
-    if (RB_FL_TEST(obj, RUBY_FL_EXIVAR)) rb_copy_generic_ivar(clone, obj);
-}
-
-static inline void
-rb_dup_setup(VALUE dup, VALUE obj)
-{
-    rb_obj_setup(dup, rb_obj_class(obj), RB_FL_TEST_RAW(obj, RUBY_FL_DUPPED));
-    if (RB_FL_TEST(obj, RUBY_FL_EXIVAR)) rb_copy_generic_ivar(dup, obj);
-}
-
-static inline long
-rb_array_len(VALUE a)
-{
-    return (RBASIC(a)->flags & RARRAY_EMBED_FLAG) ?
-	RARRAY_EMBED_LEN(a) : RARRAY(a)->as.heap.len;
-}
-
-#if defined(__fcc__) || defined(__fcc_version) || \
-    defined(__FCC__) || defined(__FCC_VERSION)
-/* workaround for old version of Fujitsu C Compiler (fcc) */
-# define FIX_CONST_VALUE_PTR(x) ((const VALUE *)(x))
-#else
-# define FIX_CONST_VALUE_PTR(x) (x)
-#endif
-
-static inline const VALUE *
-rb_array_const_ptr(VALUE a)
-{
-    return FIX_CONST_VALUE_PTR((RBASIC(a)->flags & RARRAY_EMBED_FLAG) ?
-	RARRAY(a)->as.ary : RARRAY(a)->as.heap.ptr);
-}
-
-static inline long
-rb_struct_len(VALUE st)
-{
-    return (RBASIC(st)->flags & RSTRUCT_EMBED_LEN_MASK) ?
-	RSTRUCT_EMBED_LEN(st) : RSTRUCT(st)->as.heap.len;
-}
-
-static inline const VALUE *
-rb_struct_const_ptr(VALUE st)
-{
-    return FIX_CONST_VALUE_PTR((RBASIC(st)->flags & RSTRUCT_EMBED_LEN_MASK) ?
-	RSTRUCT(st)->as.ary : RSTRUCT(st)->as.heap.ptr);
-}
-
 #if defined(EXTLIB) && defined(USE_DLN_A_OUT)
 /* hook for external modules */
 static char *dln_libs_to_be_linked[] = { EXTLIB, 0 };
@@ -2062,461 +109,45 @@ static char *dln_libs_to_be_linked[] = { EXTLIB, 0 };
 #define HAVE_NATIVETHREAD
 int ruby_native_thread_p(void);
 
-/* traditional set_trace_func events */
-#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       0x00ff
-
-/* for TracePoint extended events */
-#define RUBY_EVENT_B_CALL            0x0100
-#define RUBY_EVENT_B_RETURN          0x0200
-#define RUBY_EVENT_THREAD_BEGIN      0x0400
-#define RUBY_EVENT_THREAD_END        0x0800
-#define RUBY_EVENT_FIBER_SWITCH      0x1000
-#define RUBY_EVENT_TRACEPOINT_ALL    0xffff
-
-/* special events */
-#define RUBY_EVENT_SPECIFIED_LINE         0x010000
-#define RUBY_EVENT_COVERAGE               0x020000
-
-/* internal events */
-#define RUBY_INTERNAL_EVENT_SWITCH          0x040000
-#define RUBY_EVENT_SWITCH                   0x040000 /* obsolete name. this macro is for compatibility */
-                                         /* 0x080000 */
-#define RUBY_INTERNAL_EVENT_NEWOBJ          0x100000
-#define RUBY_INTERNAL_EVENT_FREEOBJ         0x200000
-#define RUBY_INTERNAL_EVENT_GC_START        0x400000
-#define RUBY_INTERNAL_EVENT_GC_END_MARK     0x800000
-#define RUBY_INTERNAL_EVENT_GC_END_SWEEP   0x1000000
-#define RUBY_INTERNAL_EVENT_GC_ENTER       0x2000000
-#define RUBY_INTERNAL_EVENT_GC_EXIT        0x4000000
-#define RUBY_INTERNAL_EVENT_OBJSPACE_MASK  0x7f00000
-#define RUBY_INTERNAL_EVENT_MASK          0xfffe0000
-
-typedef uint32_t rb_event_flag_t;
-typedef void (*rb_event_hook_func_t)(rb_event_flag_t evflag, VALUE data, VALUE self, ID mid, VALUE klass);
-
-#define RB_EVENT_HOOKS_HAVE_CALLBACK_DATA 1
-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 */
-
-static inline int rb_isascii(int c){ return '\0' <= c && c <= '\x7f'; }
-static inline int rb_isupper(int c){ return 'A' <= c && c <= 'Z'; }
-static inline int rb_islower(int c){ return 'a' <= c && c <= 'z'; }
-static inline int rb_isalpha(int c){ return rb_isupper(c) || rb_islower(c); }
-static inline int rb_isdigit(int c){ return '0' <= c && c <= '9'; }
-static inline int rb_isalnum(int c){ return rb_isalpha(c) || rb_isdigit(c); }
-static inline int rb_isxdigit(int c){ return rb_isdigit(c) || ('A' <= c && c <= 'F') || ('a' <= c && c <= 'f'); }
-static inline int rb_isblank(int c){ return c == ' ' || c == '\t'; }
-static inline int rb_isspace(int c){ return c == ' ' || ('\t' <= c && c <= '\r'); }
-static inline int rb_iscntrl(int c){ return ('\0' <= c && c < ' ') || c == '\x7f'; }
-static inline int rb_isprint(int c){ return ' ' <= c && c <= '\x7e'; }
-static inline int rb_ispunct(int c){ return !rb_isalnum(c); }
-static inline int rb_isgraph(int c){ return '!' <= c && c <= '\x7e'; }
-static inline int rb_tolower(int c) { return rb_isupper(c) ? (c|0x20) : c; }
-static inline int rb_toupper(int c) { return rb_islower(c) ? (c&0x5f) : c; }
-
-#ifndef ISPRINT
-#define ISASCII(c) rb_isascii(c)
-#define ISPRINT(c) rb_isprint(c)
-#define ISGRAPH(c) rb_isgraph(c)
-#define ISSPACE(c) rb_isspace(c)
-#define ISUPPER(c) rb_isupper(c)
-#define ISLOWER(c) rb_islower(c)
-#define ISALNUM(c) rb_isalnum(c)
-#define ISALPHA(c) rb_isalpha(c)
-#define ISDIGIT(c) rb_isdigit(c)
-#define ISXDIGIT(c) rb_isxdigit(c)
-#endif
-#define TOUPPER(c) rb_toupper(c)
-#define TOLOWER(c) rb_tolower(c)
-
-int st_locale_insensitive_strcasecmp(const char *s1, const char *s2);
-int st_locale_insensitive_strncasecmp(const char *s1, const char *s2, size_t n);
-#define STRCASECMP(s1, s2) (st_locale_insensitive_strcasecmp((s1), (s2)))
-#define STRNCASECMP(s1, s2, n) (st_locale_insensitive_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)))
-
 #define InitVM(ext) {void InitVM_##ext(void);InitVM_##ext();}
 
 PRINTF_ARGS(int ruby_snprintf(char *str, size_t n, char const *fmt, ...), 3, 4);
 int ruby_vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
 
-#if defined(HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P) && defined(__OPTIMIZE__)
-# define rb_scan_args(argc,argvp,fmt,...) \
-    __builtin_choose_expr(__builtin_constant_p(fmt), \
-        rb_scan_args0(argc,argvp,fmt,\
-		      (sizeof((VALUE*[]){__VA_ARGS__})/sizeof(VALUE*)), \
-		      ((VALUE*[]){__VA_ARGS__})), \
-        rb_scan_args(argc,argvp,fmt,__VA_ARGS__))
-# if HAVE_ATTRIBUTE_ERRORFUNC
-ERRORFUNC(("bad scan arg format"), int rb_scan_args_bad_format(const char*));
-ERRORFUNC(("variable argument length doesn't match"), int rb_scan_args_length_mismatch(const char*,int));
-# else
-#   define rb_scan_args_bad_format(fmt) 0
-#   define rb_scan_args_length_mismatch(fmt, varc) 0
-# endif
-
-# define rb_scan_args_isdigit(c) ((unsigned char)((c)-'0')<10)
-
-# define rb_scan_args_count_end(fmt, ofs, varc, vari) \
-    ((vari)/(!fmt[ofs] || rb_scan_args_bad_format(fmt)))
-
-# define rb_scan_args_count_block(fmt, ofs, varc, vari) \
-    (fmt[ofs]!='&' ? \
-     rb_scan_args_count_end(fmt, ofs, varc, vari) : \
-     rb_scan_args_count_end(fmt, ofs+1, varc, vari+1))
-
-# define rb_scan_args_count_hash(fmt, ofs, varc, vari) \
-    (fmt[ofs]!=':' ? \
-     rb_scan_args_count_block(fmt, ofs, varc, vari) : \
-     rb_scan_args_count_block(fmt, ofs+1, varc, vari+1))
-
-# define rb_scan_args_count_trail(fmt, ofs, varc, vari) \
-    (!rb_scan_args_isdigit(fmt[ofs]) ? \
-     rb_scan_args_count_hash(fmt, ofs, varc, vari) : \
-     rb_scan_args_count_hash(fmt, ofs+1, varc, vari+(fmt[ofs]-'0')))
-
-# define rb_scan_args_count_var(fmt, ofs, varc, vari) \
-    (fmt[ofs]!='*' ? \
-     rb_scan_args_count_trail(fmt, ofs, varc, vari) : \
-     rb_scan_args_count_trail(fmt, ofs+1, varc, vari+1))
-
-# define rb_scan_args_count_opt(fmt, ofs, varc, vari) \
-    (!rb_scan_args_isdigit(fmt[1]) ? \
-     rb_scan_args_count_var(fmt, ofs, varc, vari) : \
-     rb_scan_args_count_var(fmt, ofs+1, varc, vari+fmt[ofs]-'0'))
-
-# define rb_scan_args_count(fmt, varc) \
-    ((!rb_scan_args_isdigit(fmt[0]) ? \
-      rb_scan_args_count_var(fmt, 0, varc, 0) : \
-      rb_scan_args_count_opt(fmt, 1, varc, fmt[0]-'0')) \
-     == (varc) || \
-     rb_scan_args_length_mismatch(fmt, varc))
-
-# define rb_scan_args_verify_count(fmt, varc) \
-    ((varc)/(rb_scan_args_count(fmt, varc)))
-
-# ifdef __GNUC__
-# define rb_scan_args_verify(fmt, varc) \
-    ({ \
-	int verify; \
-	_Pragma("GCC diagnostic push"); \
-	_Pragma("GCC diagnostic ignored \"-Warray-bounds\""); \
-	verify = rb_scan_args_verify_count(fmt, varc); \
-	_Pragma("GCC diagnostic pop"); \
-	verify; \
+#if RBIMPL_HAS_WARNING("-Wgnu-zero-variadic-macro-arguments")
+# /* Skip it; clang -pedantic doesn't like the following */
+#elif defined(__GNUC__) && defined(HAVE_VA_ARGS_MACRO) && defined(__OPTIMIZE__)
+# define rb_yield_values(argc, ...) \
+__extension__({ \
+	const int rb_yield_values_argc = (argc); \
+	const VALUE rb_yield_values_args[] = {__VA_ARGS__}; \
+	const int rb_yield_values_nargs = \
+	    (int)(sizeof(rb_yield_values_args) / sizeof(VALUE)); \
+	rb_yield_values2( \
+	    rb_varargs_argc_check(rb_yield_values_argc, rb_yield_values_nargs), \
+	    rb_yield_values_nargs ? rb_yield_values_args : NULL); \
     })
-# else
-# define rb_scan_args_verify(fmt, varc) \
-    rb_scan_args_verify_count(fmt, varc)
-# endif
-
-ALWAYS_INLINE(static int rb_scan_args_lead_p(const char *fmt));
-static inline int
-rb_scan_args_lead_p(const char *fmt)
-{
-    return rb_scan_args_isdigit(fmt[0]);
-}
-
-ALWAYS_INLINE(static int rb_scan_args_n_lead(const char *fmt));
-static inline int
-rb_scan_args_n_lead(const char *fmt)
-{
-    return (rb_scan_args_lead_p(fmt) ? fmt[0]-'0' : 0);
-}
-
-ALWAYS_INLINE(static int rb_scan_args_opt_p(const char *fmt));
-static inline int
-rb_scan_args_opt_p(const char *fmt)
-{
-    return (rb_scan_args_lead_p(fmt) && rb_scan_args_isdigit(fmt[1]));
-}
-
-ALWAYS_INLINE(static int rb_scan_args_n_opt(const char *fmt));
-static inline int
-rb_scan_args_n_opt(const char *fmt)
-{
-    return (rb_scan_args_opt_p(fmt) ? fmt[1]-'0' : 0);
-}
-
-ALWAYS_INLINE(static int rb_scan_args_var_idx(const char *fmt));
-static inline int
-rb_scan_args_var_idx(const char *fmt)
-{
-    return (!rb_scan_args_lead_p(fmt) ? 0 : !rb_scan_args_isdigit(fmt[1]) ? 1 : 2);
-}
-
-ALWAYS_INLINE(static int rb_scan_args_f_var(const char *fmt));
-static inline int
-rb_scan_args_f_var(const char *fmt)
-{
-    return (fmt[rb_scan_args_var_idx(fmt)]=='*');
-}
-
-ALWAYS_INLINE(static int rb_scan_args_trail_idx(const char *fmt));
-static inline int
-rb_scan_args_trail_idx(const char *fmt)
-{
-    return (rb_scan_args_lead_p(fmt) ?
-	    (rb_scan_args_isdigit(fmt[1]) || fmt[1]=='*')+1 :
-	    (fmt[0]=='*'));
-}
-
-ALWAYS_INLINE(static int rb_scan_args_trail_p(const char *fmt));
-static inline int
-rb_scan_args_trail_p(const char *fmt)
-{
-    return (rb_scan_args_lead_p(fmt) ?
-	    (rb_scan_args_isdigit(fmt[1]) || fmt[1]=='*') &&
-	    rb_scan_args_isdigit(fmt[2]) :
-	    fmt[0]=='*' && rb_scan_args_isdigit(fmt[1]));
-}
-
-ALWAYS_INLINE(static int rb_scan_args_n_trail(const char *fmt));
-static inline int
-rb_scan_args_n_trail(const char *fmt)
-{
-    return (rb_scan_args_lead_p(fmt) ?
-	    ((rb_scan_args_isdigit(fmt[1]) || fmt[1]=='*') &&
-	     rb_scan_args_isdigit(fmt[2]) ? fmt[2]-'0' : 0) :
-	    (fmt[0]=='*' && rb_scan_args_isdigit(fmt[1]) ? fmt[1]-'0' : 0));
-}
-
-ALWAYS_INLINE(static int rb_scan_args_hash_idx(const char *fmt));
-static inline int
-rb_scan_args_hash_idx(const char *fmt)
-{
-    const int idx = rb_scan_args_trail_idx(fmt);
-    return idx+rb_scan_args_isdigit(fmt[idx]);
-}
-
-ALWAYS_INLINE(static int rb_scan_args_f_hash(const char *fmt));
-static inline int
-rb_scan_args_f_hash(const char *fmt)
-{
-    return (fmt[rb_scan_args_hash_idx(fmt)]==':');
-}
-
-ALWAYS_INLINE(static int rb_scan_args_block_idx(const char *fmt));
-static inline int
-rb_scan_args_block_idx(const char *fmt)
-{
-    const int idx = rb_scan_args_hash_idx(fmt);
-    return idx+(fmt[idx]==':');
-}
-
-ALWAYS_INLINE(static int rb_scan_args_f_block(const char *fmt));
-static inline int
-rb_scan_args_f_block(const char *fmt)
-{
-    return (fmt[rb_scan_args_block_idx(fmt)]=='&');
-}
-
-# if 0
-ALWAYS_INLINE(static int rb_scan_args_end_idx(const char *fmt));
-static inline int
-rb_scan_args_end_idx(const char *fmt)
-{
-    const int idx = rb_scan_args_block_idx(fmt);
-    return idx+(fmt[idx]=='&');
-}
-# endif
-
-# define rb_scan_args0(argc, argv, fmt, varc, vars) \
-    rb_scan_args_set(argc, argv, \
-		     rb_scan_args_n_lead(fmt), \
-		     rb_scan_args_n_opt(fmt), \
-		     rb_scan_args_n_trail(fmt), \
-		     rb_scan_args_f_var(fmt), \
-		     rb_scan_args_f_hash(fmt), \
-		     rb_scan_args_f_block(fmt), \
-		     rb_scan_args_verify(fmt, varc), vars)
-ALWAYS_INLINE(static int
-rb_scan_args_set(int argc, const VALUE *argv,
-		 int n_lead, int n_opt, int n_trail,
-		 int f_var, int f_hash, int f_block,
-		 int varc, VALUE *vars[]));
-inline int
-rb_scan_args_set(int argc, const VALUE *argv,
-		 int n_lead, int n_opt, int n_trail,
-		 int f_var, int f_hash, int f_block,
-		 int varc, VALUE *vars[])
-{
-    int i, argi = 0, vari = 0;
-    VALUE *var, hash = Qnil;
-    const int n_mand = n_lead + n_trail;
 
-    /* capture an option hash - phase 1: pop */
-    if (f_hash && n_mand < argc) {
-	VALUE last = argv[argc - 1];
-
-	if (NIL_P(last)) {
-	    /* nil is taken as an empty option hash only if it is not
-	       ambiguous; i.e. '*' is not specified and arguments are
-	       given more than sufficient */
-	    if (!f_var && n_mand + n_opt < argc)
-		argc--;
-	}
-	else {
-	    hash = rb_check_hash_type(last);
-	    if (!NIL_P(hash)) {
-		VALUE opts = rb_extract_keywords(&hash);
-		if (!hash) argc--;
-		hash = opts ? opts : Qnil;
-	    }
-	}
-    }
-
-    rb_check_arity(argc, n_mand, f_var ? UNLIMITED_ARGUMENTS : n_mand + n_opt);
-
-    /* capture leading mandatory arguments */
-    for (i = n_lead; i-- > 0; ) {
-	var = vars[vari++];
-	if (var) *var = argv[argi];
-	argi++;
-    }
-    /* capture optional arguments */
-    for (i = n_opt; i-- > 0; ) {
-	var = vars[vari++];
-	if (argi < argc - n_trail) {
-	    if (var) *var = argv[argi];
-	    argi++;
-	}
-	else {
-	    if (var) *var = Qnil;
-	}
-    }
-    /* capture variable length arguments */
-    if (f_var) {
-	int n_var = argc - argi - n_trail;
-
-	var = vars[vari++];
-	if (0 < n_var) {
-	    if (var) *var = rb_ary_new4(n_var, &argv[argi]);
-	    argi += n_var;
-	}
-	else {
-	    if (var) *var = rb_ary_new();
-	}
-    }
-    /* capture trailing mandatory arguments */
-    for (i = n_trail; i-- > 0; ) {
-	var = vars[vari++];
-	if (var) *var = argv[argi];
-	argi++;
-    }
-    /* capture an option hash - phase 2: assignment */
-    if (f_hash) {
-	var = vars[vari++];
-	if (var) *var = hash;
-    }
-    /* capture iterator block */
-    if (f_block) {
-	var = vars[vari++];
-	if (rb_block_given_p()) {
-	    *var = rb_block_proc();
-	}
-	else {
-	    *var = Qnil;
-	}
-    }
-
-    return argc;
-}
+# define rb_funcall(recv, mid, argc, ...) \
+__extension__({ \
+	const int rb_funcall_argc = (argc); \
+	const VALUE rb_funcall_args[] = {__VA_ARGS__}; \
+	const int rb_funcall_nargs = \
+	    (int)(sizeof(rb_funcall_args) / sizeof(VALUE)); \
+        rb_funcallv(recv, mid, \
+	    rb_varargs_argc_check(rb_funcall_argc, rb_funcall_nargs), \
+	    rb_funcall_nargs ? rb_funcall_args : NULL); \
+    })
 #endif
 
 #ifndef RUBY_DONT_SUBST
 #include "ruby/subst.h"
 #endif
 
-/**
- * @defgroup embed CRuby Embedding APIs
- * CRuby interpreter APIs. These are APIs to embed MRI interpreter into your
- * program.
- * These functions are not a part of Ruby extension library API.
- * Extension libraries of Ruby should not depend on these functions.
- * @{
- */
-
-/** @defgroup ruby1 ruby(1) implementation
- * A part of the implementation of ruby(1) command.
- * Other programs that embed Ruby interpreter do not always need to use these
- * functions.
- * @{
- */
-
-void ruby_sysinit(int *argc, char ***argv);
-void ruby_init(void);
-void* ruby_options(int argc, char** argv);
-int ruby_executable_node(void *n, int *status);
-int ruby_run_node(void *n);
-
-/* version.c */
-void ruby_show_version(void);
-void ruby_show_copyright(void);
-
-
-/*! A convenience macro to call ruby_init_stack(). Must be placed just after
- *  variable declarations */
-#define RUBY_INIT_STACK \
-    VALUE variable_in_this_stack_frame; \
-    ruby_init_stack(&variable_in_this_stack_frame);
-/*! @} */
-
-#ifdef __ia64
-void ruby_init_stack(volatile VALUE*, void*);
-#define ruby_init_stack(addr) ruby_init_stack((addr), rb_ia64_bsp())
-#else
-void ruby_init_stack(volatile VALUE*);
-#endif
-#define Init_stack(addr) ruby_init_stack(addr)
-
-int ruby_setup(void);
-int ruby_cleanup(volatile int);
-
-void ruby_finalize(void);
-NORETURN(void ruby_stop(int));
-
-void ruby_set_stack_size(size_t);
-int ruby_stack_check(void);
-size_t ruby_stack_length(VALUE**);
-
-int ruby_exec_node(void *n);
-
-void ruby_script(const char* name);
-void ruby_set_script_name(VALUE name);
-
-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*);
-void ruby_sig_finalize(void);
-
-/*! @} */
-
 #if !defined RUBY_EXPORT && !defined RUBY_NO_OLD_COMPATIBILITY
 # include "ruby/backward.h"
 #endif
 
-RUBY_SYMBOL_EXPORT_END
+RBIMPL_SYMBOL_EXPORT_END()
 
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-}  /* extern "C" { */
-#endif
 #endif /* RUBY_RUBY_H */
diff --git a/include/ruby/st.h b/include/ruby/st.h
index de5aaaebec..1e4bb80686 100644
--- a/include/ruby/st.h
+++ b/include/ruby/st.h
@@ -1,6 +1,8 @@
-/* This is a public domain general purpose hash table package written by Peter Moore @ UCB. */
+/* This is a public domain general purpose hash table package
+   originally written by Peter Moore @ UCB.
 
-/* @(#) st.h 5.1 89/12/14 */
+   The hash table data structures were redesigned and the package was
+   rewritten by Vladimir Makarov <vmakarov@redhat.com>.  */
 
 #ifndef RUBY_ST_H
 #define RUBY_ST_H 1
@@ -46,6 +48,10 @@ typedef unsigned LONG_LONG st_data_t;
 typedef struct st_table st_table;
 
 typedef st_data_t st_index_t;
+
+/* Maximal value of unsigned integer type st_index_t.  */
+#define MAX_ST_INDEX_VAL (~(st_index_t) 0)
+
 typedef int st_compare_func(st_data_t, st_data_t);
 typedef st_index_t st_hash_func(st_data_t);
 
@@ -53,11 +59,11 @@ typedef char st_check_for_sizeof_st_index_t[SIZEOF_VOIDP == (int)sizeof(st_index
 #define SIZEOF_ST_INDEX_T SIZEOF_VOIDP
 
 struct st_hash_type {
-    int (*compare)(ANYARGS /*st_data_t, st_data_t*/); /* st_compare_func* */
-    st_index_t (*hash)(ANYARGS /*st_data_t*/);        /* st_hash_func* */
+    int (*compare)(st_data_t, st_data_t); /* st_compare_func* */
+    st_index_t (*hash)(st_data_t);        /* st_hash_func* */
 };
 
-#define ST_INDEX_BITS (sizeof(st_index_t) * CHAR_BIT)
+#define ST_INDEX_BITS (SIZEOF_ST_INDEX_T * CHAR_BIT)
 
 #if defined(HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR) && defined(HAVE_BUILTIN___BUILTIN_TYPES_COMPATIBLE_P)
 # define ST_DATA_COMPATIBLE_P(type) \
@@ -66,85 +72,119 @@ struct st_hash_type {
 # define ST_DATA_COMPATIBLE_P(type) 0
 #endif
 
+typedef struct st_table_entry st_table_entry;
+
+struct st_table_entry; /* defined in st.c */
+
 struct st_table {
+    /* Cached features of the table -- see st.c for more details.  */
+    unsigned char entry_power, bin_power, size_ind;
+    /* How many times the table was rebuilt.  */
+    unsigned int rebuilds_num;
     const struct st_hash_type *type;
-    st_index_t num_bins;
-    unsigned int entries_packed : 1;
-#ifdef __GNUC__
-    /*
-     * C spec says,
-     *   A bit-field shall have a type that is a qualified or unqualified
-     *   version of _Bool, signed int, unsigned int, or some other
-     *   implementation-defined type. It is implementation-defined whether
-     *   atomic types are permitted.
-     * In short, long and long long bit-field are implementation-defined
-     * feature. Therefore we want to suppress a warning explicitly.
-     */
-    __extension__
-#endif
-    st_index_t num_entries : ST_INDEX_BITS - 1;
-    union {
-	struct {
-	    struct st_table_entry **bins;
-	    void *private_list_head[2];
-	} big;
-	struct {
-	    struct st_packed_entry *entries;
-	    st_index_t real_entries;
-	} packed;
-    } as;
+    /* Number of entries currently in the table.  */
+    st_index_t num_entries;
+    /* Array of bins used for access by keys.  */
+    st_index_t *bins;
+    /* Start and bound index of entries in array entries.
+       entries_starts and entries_bound are in interval
+       [0,allocated_entries].  */
+    st_index_t entries_start, entries_bound;
+    /* Array of size 2^entry_power.  */
+    st_table_entry *entries;
 };
 
 #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 *, st_index_t);
-st_table *st_init_numtable(void);
-st_table *st_init_numtable_with_size(st_index_t);
-st_table *st_init_strtable(void);
-st_table *st_init_strtable_with_size(st_index_t);
-st_table *st_init_strcasetable(void);
-st_table *st_init_strcasetable_with_size(st_index_t);
-int st_delete(st_table *, st_data_t *, st_data_t *); /* returns 0:notfound 1:deleted */
-int st_delete_safe(st_table *, st_data_t *, st_data_t *, st_data_t);
-int st_shift(st_table *, st_data_t *, st_data_t *); /* returns 0:notfound 1:deleted */
-int st_insert(st_table *, st_data_t, st_data_t);
-int st_insert2(st_table *, st_data_t, st_data_t, 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 *);
+enum st_retval {ST_CONTINUE, ST_STOP, ST_DELETE, ST_CHECK, ST_REPLACE};
+
+st_table *rb_st_init_table(const struct st_hash_type *);
+#define st_init_table rb_st_init_table
+st_table *rb_st_init_table_with_size(const struct st_hash_type *, st_index_t);
+#define st_init_table_with_size rb_st_init_table_with_size
+st_table *rb_st_init_numtable(void);
+#define st_init_numtable rb_st_init_numtable
+st_table *rb_st_init_numtable_with_size(st_index_t);
+#define st_init_numtable_with_size rb_st_init_numtable_with_size
+st_table *rb_st_init_strtable(void);
+#define st_init_strtable rb_st_init_strtable
+st_table *rb_st_init_strtable_with_size(st_index_t);
+#define st_init_strtable_with_size rb_st_init_strtable_with_size
+st_table *rb_st_init_strcasetable(void);
+#define st_init_strcasetable rb_st_init_strcasetable
+st_table *rb_st_init_strcasetable_with_size(st_index_t);
+#define st_init_strcasetable_with_size rb_st_init_strcasetable_with_size
+int rb_st_delete(st_table *, st_data_t *, st_data_t *); /* returns 0:notfound 1:deleted */
+#define st_delete rb_st_delete
+int rb_st_delete_safe(st_table *, st_data_t *, st_data_t *, st_data_t);
+#define st_delete_safe rb_st_delete_safe
+int rb_st_shift(st_table *, st_data_t *, st_data_t *); /* returns 0:notfound 1:deleted */
+#define st_shift rb_st_shift
+int rb_st_insert(st_table *, st_data_t, st_data_t);
+#define st_insert rb_st_insert
+int rb_st_insert2(st_table *, st_data_t, st_data_t, st_data_t (*)(st_data_t));
+#define st_insert2 rb_st_insert2
+int rb_st_lookup(st_table *, st_data_t, st_data_t *);
+#define st_lookup rb_st_lookup
+int rb_st_get_key(st_table *, st_data_t, st_data_t *);
+#define st_get_key rb_st_get_key
 typedef int st_update_callback_func(st_data_t *key, st_data_t *value, st_data_t arg, int existing);
 /* *key may be altered, but must equal to the old key, i.e., the
  * results of hash() are same and compare() returns 0, otherwise the
  * behavior is undefined */
-int st_update(st_table *table, st_data_t key, st_update_callback_func *func, st_data_t arg);
-int st_foreach(st_table *, int (*)(ANYARGS), st_data_t);
-int st_foreach_check(st_table *, int (*)(ANYARGS), st_data_t, st_data_t);
-int st_reverse_foreach(st_table *, int (*)(ANYARGS), st_data_t);
-st_index_t st_keys(st_table *table, st_data_t *keys, st_index_t size);
-st_index_t st_keys_check(st_table *table, st_data_t *keys, st_index_t size, st_data_t never);
-st_index_t st_values(st_table *table, st_data_t *values, st_index_t size);
-st_index_t st_values_check(st_table *table, st_data_t *values, st_index_t size, st_data_t never);
-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 *);
-CONSTFUNC(int st_numcmp(st_data_t, st_data_t));
-CONSTFUNC(st_index_t st_numhash(st_data_t));
-PUREFUNC(int st_locale_insensitive_strcasecmp(const char *s1, const char *s2));
-PUREFUNC(int st_locale_insensitive_strncasecmp(const char *s1, const char *s2, size_t n));
-#define st_strcasecmp st_locale_insensitive_strcasecmp
-#define st_strncasecmp st_locale_insensitive_strncasecmp
-PUREFUNC(size_t st_memsize(const st_table *));
-PUREFUNC(st_index_t st_hash(const void *ptr, size_t len, st_index_t h));
-CONSTFUNC(st_index_t st_hash_uint32(st_index_t h, uint32_t i));
-CONSTFUNC(st_index_t st_hash_uint(st_index_t h, st_index_t i));
-CONSTFUNC(st_index_t st_hash_end(st_index_t h));
-CONSTFUNC(st_index_t st_hash_start(st_index_t h));
+int rb_st_update(st_table *table, st_data_t key, st_update_callback_func *func, st_data_t arg);
+#define st_update rb_st_update
+typedef int st_foreach_callback_func(st_data_t, st_data_t, st_data_t);
+typedef int st_foreach_check_callback_func(st_data_t, st_data_t, st_data_t, int);
+int rb_st_foreach_with_replace(st_table *tab, st_foreach_check_callback_func *func, st_update_callback_func *replace, st_data_t arg);
+#define st_foreach_with_replace rb_st_foreach_with_replace
+int rb_st_foreach(st_table *, st_foreach_callback_func *, st_data_t);
+#define st_foreach rb_st_foreach
+int rb_st_foreach_check(st_table *, st_foreach_check_callback_func *, st_data_t, st_data_t);
+#define st_foreach_check rb_st_foreach_check
+st_index_t rb_st_keys(st_table *table, st_data_t *keys, st_index_t size);
+#define st_keys rb_st_keys
+st_index_t rb_st_keys_check(st_table *table, st_data_t *keys, st_index_t size, st_data_t never);
+#define st_keys_check rb_st_keys_check
+st_index_t rb_st_values(st_table *table, st_data_t *values, st_index_t size);
+#define st_values rb_st_values
+st_index_t rb_st_values_check(st_table *table, st_data_t *values, st_index_t size, st_data_t never);
+#define st_values_check rb_st_values_check
+void rb_st_add_direct(st_table *, st_data_t, st_data_t);
+#define st_add_direct rb_st_add_direct
+void rb_st_free_table(st_table *);
+#define st_free_table rb_st_free_table
+void rb_st_cleanup_safe(st_table *, st_data_t);
+#define st_cleanup_safe rb_st_cleanup_safe
+void rb_st_clear(st_table *);
+#define st_clear rb_st_clear
+st_table *rb_st_copy(st_table *);
+#define st_copy rb_st_copy
+CONSTFUNC(int rb_st_numcmp(st_data_t, st_data_t));
+#define st_numcmp rb_st_numcmp
+CONSTFUNC(st_index_t rb_st_numhash(st_data_t));
+#define st_numhash rb_st_numhash
+PUREFUNC(int rb_st_locale_insensitive_strcasecmp(const char *s1, const char *s2));
+#define st_locale_insensitive_strcasecmp rb_st_locale_insensitive_strcasecmp
+PUREFUNC(int rb_st_locale_insensitive_strncasecmp(const char *s1, const char *s2, size_t n));
+#define st_locale_insensitive_strncasecmp rb_st_locale_insensitive_strncasecmp
+#define st_strcasecmp rb_st_locale_insensitive_strcasecmp
+#define st_strncasecmp rb_st_locale_insensitive_strncasecmp
+PUREFUNC(size_t rb_st_memsize(const st_table *));
+#define st_memsize rb_st_memsize
+PUREFUNC(st_index_t rb_st_hash(const void *ptr, size_t len, st_index_t h));
+#define st_hash rb_st_hash
+CONSTFUNC(st_index_t rb_st_hash_uint32(st_index_t h, uint32_t i));
+#define st_hash_uint32 rb_st_hash_uint32
+CONSTFUNC(st_index_t rb_st_hash_uint(st_index_t h, st_index_t i));
+#define st_hash_uint rb_st_hash_uint
+CONSTFUNC(st_index_t rb_st_hash_end(st_index_t h));
+#define st_hash_end rb_st_hash_end
+CONSTFUNC(st_index_t rb_st_hash_start(st_index_t h));
 #define st_hash_start(h) ((st_index_t)(h))
 
+void rb_hash_bulk_insert_into_st_table(long, const VALUE *, VALUE);
+
 RUBY_SYMBOL_EXPORT_END
 
 #if defined(__cplusplus)
diff --git a/include/ruby/subst.h b/include/ruby/subst.h
index 1f0e6db5a4..cf48a3909c 100644
--- a/include/ruby/subst.h
+++ b/include/ruby/subst.h
@@ -1,5 +1,13 @@
-#ifndef RUBY_SUBST_H
+#ifndef RUBY_SUBST_H                                 /*-*-C++-*-vi:se ft=cpp:*/
 #define RUBY_SUBST_H 1
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ */
 
 #undef snprintf
 #undef vsnprintf
diff --git a/include/ruby/thread.h b/include/ruby/thread.h
index 550f678e54..b05537badb 100644
--- a/include/ruby/thread.h
+++ b/include/ruby/thread.h
@@ -1,27 +1,23 @@
-/**********************************************************************
-
-  thread.h -
-
-  $Author: matz $
-  created at: Tue Jul 10 17:35:43 JST 2012
-
-  Copyright (C) 2007 Yukihiro Matsumoto
-
-**********************************************************************/
-
-#ifndef RUBY_THREAD_H
+#ifndef RUBY_THREAD_H                                /*-*-C++-*-vi:se ft=cpp:*/
 #define RUBY_THREAD_H 1
-
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
+/**
+ * @file
+ * @author     $Author: matz $
+ * @date       Tue Jul 10 17:35:43 JST 2012
+ * @copyright  Copyright (C) 2007 Yukihiro Matsumoto
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ */
 #include "ruby/intern.h"
+#include "ruby/internal/dllexport.h"
+
+/* flags for rb_nogvl */
+#define RB_NOGVL_INTR_FAIL       (0x1)
+#define RB_NOGVL_UBF_ASYNC_SAFE  (0x2)
 
-RUBY_SYMBOL_EXPORT_BEGIN
+RBIMPL_SYMBOL_EXPORT_BEGIN()
 
 void *rb_thread_call_with_gvl(void *(*func)(void *), void *data1);
 
@@ -30,16 +26,17 @@ void *rb_thread_call_without_gvl(void *(*func)(void *), void *data1,
 void *rb_thread_call_without_gvl2(void *(*func)(void *), void *data1,
 				  rb_unblock_function_t *ubf, void *data2);
 
+/*
+ * XXX: unstable/unapproved - out-of-tree code should NOT not depend
+ * on this until it hits Ruby 2.6.1
+ */
+void *rb_nogvl(void *(*func)(void *), void *data1,
+               rb_unblock_function_t *ubf, void *data2,
+               int flags);
+
 #define RUBY_CALL_WO_GVL_FLAG_SKIP_CHECK_INTS_AFTER 0x01
 #define RUBY_CALL_WO_GVL_FLAG_SKIP_CHECK_INTS_
 
-RUBY_SYMBOL_EXPORT_END
-
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-}  /* extern "C" { */
-#endif
+RBIMPL_SYMBOL_EXPORT_END()
 
 #endif /* RUBY_THREAD_H */
diff --git a/include/ruby/thread_native.h b/include/ruby/thread_native.h
index 8e500c5a13..7e08c2e97f 100644
--- a/include/ruby/thread_native.h
+++ b/include/ruby/thread_native.h
@@ -1,22 +1,21 @@
-/**********************************************************************
-
-  thread_native.h -
-
-  $Author: ko1 $
-  created at: Wed May 14 19:37:31 2014
-
-  Copyright (C) 2014 Yukihiro Matsumoto
-
-**********************************************************************/
-
-#ifndef RUBY_THREAD_NATIVE_H
+#ifndef RUBY_THREAD_NATIVE_H                         /*-*-C++-*-vi:se ft=cpp:*/
 #define RUBY_THREAD_NATIVE_H 1
+/**
+ * @file
+ * @author     $Author: ko1 $
+ * @date       Wed May 14 19:37:31 2014
+ * @copyright  Copyright (C) 2014 Yukihiro Matsumoto
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ */
 
 /*
  * This file contains wrapper APIs for native thread primitives
  * which Ruby interpreter uses.
  *
- * Now, we only suppors pthread and Windows threads.
+ * Now, we only support pthread and Windows threads.
  *
  * If you want to use Ruby's Mutex and so on to synchronize Ruby Threads,
  * please use Mutex directly.
@@ -32,10 +31,14 @@ typedef union rb_thread_lock_union {
     CRITICAL_SECTION crit;
 } rb_nativethread_lock_t;
 
+typedef struct rb_thread_cond_struct rb_nativethread_cond_t;
+
 #elif defined(HAVE_PTHREAD_H)
+
 #include <pthread.h>
 typedef pthread_t rb_nativethread_id_t;
 typedef pthread_mutex_t rb_nativethread_lock_t;
+typedef pthread_cond_t rb_nativethread_cond_t;
 
 #else
 #error "unsupported thread type"
@@ -51,6 +54,19 @@ void rb_nativethread_lock_destroy(rb_nativethread_lock_t *lock);
 void rb_nativethread_lock_lock(rb_nativethread_lock_t *lock);
 void rb_nativethread_lock_unlock(rb_nativethread_lock_t *lock);
 
+void rb_native_mutex_lock(rb_nativethread_lock_t *lock);
+int  rb_native_mutex_trylock(rb_nativethread_lock_t *lock);
+void rb_native_mutex_unlock(rb_nativethread_lock_t *lock);
+void rb_native_mutex_initialize(rb_nativethread_lock_t *lock);
+void rb_native_mutex_destroy(rb_nativethread_lock_t *lock);
+
+void rb_native_cond_signal(rb_nativethread_cond_t *cond);
+void rb_native_cond_broadcast(rb_nativethread_cond_t *cond);
+void rb_native_cond_wait(rb_nativethread_cond_t *cond, rb_nativethread_lock_t *mutex);
+void rb_native_cond_timedwait(rb_nativethread_cond_t *cond, rb_nativethread_lock_t *mutex, unsigned long msec);
+void rb_native_cond_initialize(rb_nativethread_cond_t *cond);
+void rb_native_cond_destroy(rb_nativethread_cond_t *cond);
+
 RUBY_SYMBOL_EXPORT_END
 
 #endif
diff --git a/include/ruby/util.h b/include/ruby/util.h
index e9343b3390..af022dacbd 100644
--- a/include/ruby/util.h
+++ b/include/ruby/util.h
@@ -1,51 +1,20 @@
-/**********************************************************************
-
-  util.h -
-
-  $Author$
-  created at: Thu Mar  9 11:55:53 JST 1995
-
-  Copyright (C) 1993-2007 Yukihiro Matsumoto
-
-**********************************************************************/
-
-#ifndef RUBY_UTIL_H
+#ifndef RUBY_UTIL_H                                  /*-*-C++-*-vi:se ft=cpp:*/
 #define RUBY_UTIL_H 1
-
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
+/**
+ * @file
+ * @author     $Author$
+ * @date       Thu Mar  9 11:55:53 JST 1995
+ * @copyright  Copyright (C) 1993-2007 Yukihiro Matsumoto
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ */
+#include "ruby/internal/config.h"
+#include "ruby/internal/dllexport.h"
 #include "ruby/defines.h"
-#ifdef RUBY_EXTCONF_H
-#include RUBY_EXTCONF_H
-#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
-
-RUBY_SYMBOL_EXPORT_BEGIN
+RBIMPL_SYMBOL_EXPORT_BEGIN()
 
 #define DECIMAL_SIZE_OF_BITS(n) (((n) * 3010 + 9998) / 9999)
 /* an approximation of ceil(n * log10(2)), up to 65536 at least */
@@ -64,17 +33,12 @@ void ruby_qsort(void *, const size_t, const size_t,
 
 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
@@ -82,13 +46,6 @@ double ruby_strtod(const char *, char **);
 
 void ruby_each_words(const char *, void (*)(const char*, int, void*), void *);
 
-RUBY_SYMBOL_EXPORT_END
-
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-}  /* extern "C" { */
-#endif
+RBIMPL_SYMBOL_EXPORT_END()
 
 #endif /* RUBY_UTIL_H */
diff --git a/include/ruby/version.h b/include/ruby/version.h
index 8b4801fcfd..924bfa8f91 100644
--- a/include/ruby/version.h
+++ b/include/ruby/version.h
@@ -1,17 +1,17 @@
-/**********************************************************************
-
-  ruby/version.h -
-
-  $Author$
-  created at: Wed May 13 12:56:56 JST 2009
-
-  Copyright (C) 1993-2009 Yukihiro Matsumoto
-  Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
-  Copyright (C) 2000  Information-technology Promotion Agency, Japan
-
-**********************************************************************/
-
-/*
+#ifndef RUBY_VERSION_H                               /*-*-C++-*-vi:se ft=cpp:*/
+#define RUBY_VERSION_H 1
+/**
+ * @file
+ * @author     $Author$
+ * @date       Wed May 13 12:56:56 JST 2009
+ * @copyright  Copyright (C) 1993-2009 Yukihiro Matsumoto
+ * @copyright  Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
+ * @copyright  Copyright (C) 2000  Information-technology Promotion Agency, Japan
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ *
  * This file contains only
  * - never-changeable information, and
  * - interfaces accessible from extension libraries.
@@ -20,9 +20,6 @@
  * check the features with mkmf.rb instead.
  */
 
-#ifndef RUBY_VERSION_H
-#define RUBY_VERSION_H 1
-
 /* The origin. */
 #define RUBY_AUTHOR "Yukihiro Matsumoto"
 #define RUBY_BIRTH_YEAR 1993
@@ -30,20 +27,16 @@
 #define RUBY_BIRTH_DAY 24
 
 /* API version */
-#define RUBY_API_VERSION_MAJOR 2
-#define RUBY_API_VERSION_MINOR 4
+#define RUBY_API_VERSION_MAJOR 3
+#define RUBY_API_VERSION_MINOR 0
 #define RUBY_API_VERSION_TEENY 0
 #define RUBY_API_VERSION_CODE (RUBY_API_VERSION_MAJOR*10000+RUBY_API_VERSION_MINOR*100+RUBY_API_VERSION_TEENY)
 
 #ifdef RUBY_EXTERN
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
-RUBY_SYMBOL_EXPORT_BEGIN
+/* Internal note: this file could be included from verconf.mk _before_
+ * generating config.h, on Windows.  The #ifdef above is to trick such
+ * situation. */
+RBIMPL_SYMBOL_EXPORT_BEGIN()
 
 /*
  * Interfaces from extension libraries.
@@ -61,14 +54,7 @@ RUBY_EXTERN const char ruby_description[];
 RUBY_EXTERN const char ruby_copyright[];
 RUBY_EXTERN const char ruby_engine[];
 
-RUBY_SYMBOL_EXPORT_END
-
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-}  /* extern "C" { */
-#endif
+RBIMPL_SYMBOL_EXPORT_END()
 #endif
 
 #endif
diff --git a/include/ruby/vm.h b/include/ruby/vm.h
index 73345264bd..7bdd567453 100644
--- a/include/ruby/vm.h
+++ b/include/ruby/vm.h
@@ -1,31 +1,23 @@
-/**********************************************************************
-
-  ruby/vm.h -
-
-  $Author$
-  created at: Sat May 31 15:17:36 2008
-
-  Copyright (C) 2008 Yukihiro Matsumoto
-
-**********************************************************************/
-
-#ifndef RUBY_VM_H
+#ifndef RUBY_VM_H                                    /*-*-C++-*-vi:se ft=cpp:*/
 #define RUBY_VM_H 1
+/**
+ * @file
+ * @author     $Author$
+ * @date       Sat May 31 15:17:36 2008
+ * @copyright  Copyright (C) 2008 Yukihiro Matsumoto
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ */
+#include "ruby/internal/dllexport.h"
 
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
-RUBY_SYMBOL_EXPORT_BEGIN
+RBIMPL_SYMBOL_EXPORT_BEGIN()
 
 /* Place holder.
  *
  * We will prepare VM creation/control APIs on 1.9.2 or later.
- * If you have an interest about it, please see mvm branch.
- * http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/mvm/
+ *
  */
 
 /* VM type declaration */
@@ -52,13 +44,6 @@ int ruby_vm_destruct(ruby_vm_t *vm);
  */
 void ruby_vm_at_exit(void(*func)(ruby_vm_t *));
 
-RUBY_SYMBOL_EXPORT_END
-
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-}  /* extern "C" { */
-#endif
+RBIMPL_SYMBOL_EXPORT_END()
 
 #endif /* RUBY_VM_H */
diff --git a/include/ruby/win32.h b/include/ruby/win32.h
index 68b8db73e6..00259485a2 100644
--- a/include/ruby/win32.h
+++ b/include/ruby/win32.h
@@ -138,11 +138,18 @@ typedef int clockid_t;
 #undef stat
 #undef fstat
 #ifdef RUBY_EXPORT
-#define utime(_p, _t)		rb_w32_utime(_p, _t)
-#define lseek(_f, _o, _w)	_lseeki64(_f, _o, _w)
+#define utime(_p, _t)		rb_w32_uutime(_p, _t)
+#undef HAVE_UTIMES
+#define HAVE_UTIMES 1
+#define utimes(_p, _t)		rb_w32_uutimes(_p, _t)
+#undef HAVE_UTIMENSAT
+#define HAVE_UTIMENSAT 1
+#define AT_FDCWD		-100
+#define utimensat(_d, _p, _t, _f)	rb_w32_uutimensat(_d, _p, _t, _f)
+#define lseek(_f, _o, _w)	rb_w32_lseek(_f, _o, _w)
 
 #define pipe(p)			rb_w32_pipe(p)
-#define open			rb_w32_open
+#define open			rb_w32_uopen
 #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)
@@ -151,42 +158,51 @@ typedef int clockid_t;
 #define getppid()		rb_w32_getppid()
 #define sleep(x)		rb_w32_Sleep((x)*1000)
 #define Sleep(msec)		(void)rb_w32_Sleep(msec)
-#define fstati64(fd,st) 	rb_w32_fstati64(fd,st)
 
 #undef execv
-#define execv(path,argv)	rb_w32_aspawn(P_OVERLAY,path,argv)
+#define execv(path,argv)	rb_w32_uaspawn(P_OVERLAY,path,argv)
 #undef isatty
 #define isatty(h)		rb_w32_isatty(h)
 
 #undef mkdir
-#define mkdir(p, m)		rb_w32_mkdir(p, m)
+#define mkdir(p, m)		rb_w32_umkdir(p, m)
 #undef rmdir
-#define rmdir(p)		rb_w32_rmdir(p)
+#define rmdir(p)		rb_w32_urmdir(p)
 #undef unlink
-#define unlink(p)		rb_w32_unlink(p)
+#define unlink(p)		rb_w32_uunlink(p)
 #endif /* RUBY_EXPORT */
 
-#if SIZEOF_OFF_T == 8
+/* same with stati64 except the size of st_ino and nanosecond timestamps */
+struct stati128 {
+  _dev_t st_dev;
+  unsigned __int64 st_ino;
+  __int64 st_inohigh;
+  unsigned short st_mode;
+  short st_nlink;
+  short st_uid;
+  short st_gid;
+  _dev_t st_rdev;
+  __int64 st_size;
+  __time64_t st_atime;
+  long st_atimensec;
+  __time64_t st_mtime;
+  long st_mtimensec;
+  __time64_t st_ctime;
+  long st_ctimensec;
+};
+
 #define off_t __int64
-#define stat stati64
-#define fstat(fd,st)		fstati64(fd,st)
-#if !defined(_MSC_VER) || RUBY_MSVCRT_VERSION < 80
-#define stati64 _stati64
-#ifndef _stati64
-#define _stati64(path, st) rb_w32_stati64(path, st)
-#endif
-#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 lstat(path,st)		rb_w32_lstati64(path,st)
-#define access(path,mode)	rb_w32_access(path,mode)
+#define stat stati128
+#undef SIZEOF_STRUCT_STAT_ST_INO
+#define SIZEOF_STRUCT_STAT_ST_INO sizeof(unsigned __int64)
+#define HAVE_STRUCT_STAT_ST_INOHIGH
+#define HAVE_STRUCT_STAT_ST_ATIMENSEC
+#define HAVE_STRUCT_STAT_ST_MTIMENSEC
+#define HAVE_STRUCT_STAT_ST_CTIMENSEC
+#define fstat(fd,st)		rb_w32_fstati128(fd,st)
+#define stati128(path, st)	rb_w32_ustati128(path,st)
+#define lstat(path,st)		rb_w32_ulstati128(path,st)
+#define access(path,mode)	rb_w32_uaccess(path,mode)
 
 #define strcasecmp		_stricmp
 #define strncasecmp		_strnicmp
@@ -233,8 +249,8 @@ struct ifaddrs {
 #define IFF_POINTOPOINT IFF_POINTTOPOINT
 #endif
 
+extern void   rb_w32_sysinit(int *, char ***);
 extern DWORD  rb_w32_osid(void);
-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_io_cancelable_p(int);
 extern int    rb_w32_is_socket(int);
@@ -270,10 +286,8 @@ extern struct servent  *WSAAPI rb_w32_getservbyport(int, const char *);
 extern int    socketpair(int, int, int, int *);
 extern int    getifaddrs(struct ifaddrs **);
 extern void   freeifaddrs(struct ifaddrs *);
-extern char * rb_w32_getcwd(char *, int);
+extern char * rb_w32_ugetcwd(char *, int);
 extern char * rb_w32_ugetenv(const char *);
-extern char * rb_w32_getenv(const char *);
-extern int    rb_w32_rename(const char *, const char *);
 extern int    rb_w32_urename(const char *, const char *);
 extern char **rb_w32_get_environ(void);
 extern void   rb_w32_free_environ(char **);
@@ -282,22 +296,15 @@ extern const char *WSAAPI rb_w32_inet_ntop(int,const void *,char *,size_t);
 extern int WSAAPI rb_w32_inet_pton(int,const char *,void *);
 extern DWORD  rb_w32_osver(void);
 
-extern int chown(const char *, int, int);
 extern int rb_w32_uchown(const char *, int, int);
-extern int link(const char *, const char *);
 extern int rb_w32_ulink(const char *, const char *);
-extern ssize_t readlink(const char *, char *, size_t);
 extern ssize_t rb_w32_ureadlink(const char *, char *, size_t);
 extern ssize_t rb_w32_wreadlink(const WCHAR *, WCHAR *, size_t);
-extern int symlink(const char *src, const char *link);
 extern int rb_w32_usymlink(const char *src, const char *link);
 extern int gettimeofday(struct timeval *, struct timezone *);
 extern int clock_gettime(clockid_t, struct timespec *);
 extern int clock_getres(clockid_t, struct timespec *);
 extern rb_pid_t waitpid (rb_pid_t, int *, int);
-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 rb_pid_t rb_w32_aspawn_flags(int, const char *, char *const *, DWORD);
 extern rb_pid_t rb_w32_uspawn(int, const char *, const char*);
 extern rb_pid_t rb_w32_uaspawn(int, const char *, char *const *);
 extern rb_pid_t rb_w32_uaspawn_flags(int, const char *, char *const *, DWORD);
@@ -308,21 +315,15 @@ extern rb_pid_t rb_w32_getpid(void);
 extern rb_pid_t rb_w32_getppid(void);
 extern int rb_w32_isatty(int);
 extern int rb_w32_uchdir(const char *);
-extern int rb_w32_mkdir(const char *, int);
 extern int rb_w32_umkdir(const char *, int);
-extern int rb_w32_rmdir(const char *);
 extern int rb_w32_urmdir(const char *);
-extern int rb_w32_unlink(const char *);
 extern int rb_w32_uunlink(const char *);
 extern int rb_w32_uchmod(const char *, int);
-extern int rb_w32_stati64(const char *, struct stati64 *);
-extern int rb_w32_ustati64(const char *, struct stati64 *);
-extern int rb_w32_lstati64(const char *, struct stati64 *);
-extern int rb_w32_ulstati64(const char *, struct stati64 *);
-extern int rb_w32_access(const char *, int);
+extern int rb_w32_ustati128(const char *, struct stati128 *);
+extern int rb_w32_ulstati128(const char *, struct stati128 *);
 extern int rb_w32_uaccess(const char *, int);
 extern char rb_w32_fd_is_text(int);
-extern int rb_w32_fstati64(int, struct stati64 *);
+extern int rb_w32_fstati128(int, struct stati128 *);
 extern int rb_w32_dup2(int, int);
 
 #include <float.h>
@@ -417,11 +418,7 @@ extern int rb_w32_utruncate(const char *path, off_t length);
 
 #undef HAVE_TRUNCATE
 #define HAVE_TRUNCATE 1
-#if defined HAVE_TRUNCATE64
-#define truncate truncate64
-#else
-#define truncate rb_w32_truncate
-#endif
+#define truncate rb_w32_utruncate
 
 #if defined(_MSC_VER) && _MSC_VER >= 1400 && _MSC_VER < 1800
 #define strtoll  _strtoi64
@@ -439,8 +436,6 @@ extern rb_gid_t  getegid (void);
 extern int       setuid (rb_uid_t);
 extern int       setgid (rb_gid_t);
 
-extern int fstati64(int, struct stati64 *);
-
 extern char *rb_w32_strerror(int);
 
 #ifdef RUBY_EXPORT
@@ -692,13 +687,13 @@ extern char *rb_w32_strerror(int);
 #define get_osfhandle(h)	rb_w32_get_osfhandle(h)
 
 #undef getcwd
-#define getcwd(b, s)		rb_w32_getcwd(b, s)
+#define getcwd(b, s)		rb_w32_ugetcwd(b, s)
 
 #undef getenv
-#define getenv(n)		rb_w32_getenv(n)
+#define getenv(n)		rb_w32_ugetenv(n)
 
 #undef rename
-#define rename(o, n)		rb_w32_rename(o, n)
+#define rename(o, n)		rb_w32_urename(o, n)
 
 #undef times
 #define times(t)		rb_w32_times(t)
@@ -721,7 +716,6 @@ struct tm *localtime_r(const time_t *, struct tm *);
 
 /* thread stuff */
 int  rb_w32_sleep(unsigned long msec);
-int  rb_w32_open(const char *, int, ...);
 int  rb_w32_uopen(const char *, int, ...);
 int  rb_w32_wopen(const WCHAR *, int, ...);
 int  rb_w32_close(int);
@@ -729,8 +723,10 @@ int  rb_w32_fclose(FILE*);
 int  rb_w32_pipe(int[2]);
 ssize_t rb_w32_read(int, void *, size_t);
 ssize_t rb_w32_write(int, const void *, size_t);
-int  rb_w32_utime(const char *, const struct utimbuf *);
+off_t  rb_w32_lseek(int, off_t, int);
 int  rb_w32_uutime(const char *, const struct utimbuf *);
+int  rb_w32_uutimes(const char *, const struct timeval *);
+int  rb_w32_uutimensat(int /* must be AT_FDCWD */, const char *, const struct timespec *, int /* must be 0 */);
 long rb_w32_write_console(uintptr_t, int);	/* use uintptr_t instead of VALUE because it's not defined yet here */
 int  WINAPI rb_w32_Sleep(unsigned long msec);
 int  rb_w32_wait_events_blocking(HANDLE *events, int num, DWORD timeout);
@@ -740,6 +736,27 @@ int  rb_w32_unwrap_io_handle(int);
 WCHAR *rb_w32_mbstr_to_wstr(UINT, const char *, int, long *);
 char *rb_w32_wstr_to_mbstr(UINT, const WCHAR *, int, long *);
 
+DEPRECATED_BY(rb_w32_ugetcwd, char *rb_w32_getcwd(char *, int));
+DEPRECATED_BY(rb_w32_ugetenv, char *rb_w32_getenv(const char *));
+DEPRECATED_BY(rb_w32_urename, int rb_w32_rename(const char *, const char *));
+DEPRECATED_BY(rb_w32_uopen, int rb_w32_open(const char *, int, ...));
+DEPRECATED_BY(rb_w32_uchown, int chown(const char *, int, int));
+DEPRECATED_BY(rb_w32_ulink, int link(const char *, const char *));
+DEPRECATED_BY(rb_w32_ureadlink, ssize_t readlink(const char *, char *, size_t));
+DEPRECATED_BY(rb_w32_usymlink, int symlink(const char *src, const char *link));
+DEPRECATED_BY(rb_w32_umkdir, int rb_w32_mkdir(const char *, int));
+DEPRECATED_BY(rb_w32_urmdir, int rb_w32_rmdir(const char *));
+DEPRECATED_BY(rb_w32_uunlink, int rb_w32_unlink(const char *));
+DEPRECATED_BY(rb_w32_uutime, int rb_w32_utime(const char *, const struct utimbuf *));
+DEPRECATED_BY(rb_w32_uutimes, int rb_w32_utimes(const char *, const struct timeval *));
+DEPRECATED_BY(rb_w32_uutimensat, int rb_w32_utimensat(int, const char *, const struct timespec *, int));
+DEPRECATED_BY(rb_w32_ustati128, int rb_w32_stati128(const char *, struct stati128 *));
+DEPRECATED_BY(rb_w32_ulstati128, int rb_w32_lstati128(const char *, struct stati128 *));
+DEPRECATED_BY(rb_w32_uaccess, int rb_w32_access(const char *, int));
+DEPRECATED_BY(rb_w32_uspawn, rb_pid_t rb_w32_spawn(int, const char *, const char*));
+DEPRECATED_BY(rb_w32_uaspawn, rb_pid_t rb_w32_aspawn(int, const char *, char *const *));
+DEPRECATED_BY(rb_w32_uaspawn_flags, rb_pid_t rb_w32_aspawn_flags(int, const char *, char *const *, DWORD));
+
 /*
 == ***CAUTION***
 Since this function is very dangerous, ((*NEVER*))
@@ -752,7 +769,8 @@ uintptr_t rb_w32_asynchronize(asynchronous_func_t func, uintptr_t self, int argc
 
 RUBY_SYMBOL_EXPORT_END
 
-#ifdef __MINGW_ATTRIB_PURE
+#if (defined(__MINGW64_VERSION_MAJOR) || defined(__MINGW64__)) && !defined(__cplusplus)
+#ifdef RUBY_MINGW64_BROKEN_FREXP_MODF
 /* License: Ruby's */
 /* get rid of bugs in math.h of mingw */
 #define frexp(_X, _Y) __extension__ ({\
@@ -770,13 +788,6 @@ RUBY_SYMBOL_EXPORT_END
 })
 #endif
 
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-}  /* extern "C" { */
-#endif
-
 #if defined(__MINGW64__)
 /*
  * Use powl() instead of broken pow() of x86_64-w64-mingw32.
@@ -786,13 +797,19 @@ RUBY_SYMBOL_EXPORT_END
 static inline double
 rb_w32_pow(double x, double y)
 {
-    return powl(x, y);
+    return (double)powl(x, y);
 }
 #elif defined(__MINGW64_VERSION_MAJOR)
 double rb_w32_pow(double x, double y);
 #endif
-#if defined(__MINGW64_VERSION_MAJOR) || defined(__MINGW64__)
 #define pow rb_w32_pow
 #endif
 
+#if defined(__cplusplus)
+#if 0
+{ /* satisfy cc-mode */
+#endif
+}  /* extern "C" { */
+#endif
+
 #endif /* RUBY_WIN32_H */
diff --git a/inits.c b/inits.c
index 5822f04cab..f636748101 100644
--- a/inits.c
+++ b/inits.c
@@ -9,15 +9,25 @@
 
 **********************************************************************/
 
-#include "internal.h"
+#include "internal/inits.h"
+#include "ruby.h"
+#include "builtin.h"
+static void Init_builtin_prelude(void);
+#include "prelude.rbinc"
 
 #define CALL(n) {void Init_##n(void); Init_##n();}
 
 void
 rb_call_inits(void)
 {
+    CALL(Thread_Mutex);
+#if USE_TRANSIENT_HEAP
+    CALL(TransientHeap);
+#endif
+    CALL(vm_postponed_job);
     CALL(Method);
     CALL(RandomSeedCore);
+    CALL(encodings);
     CALL(sym);
     CALL(var_tables);
     CALL(Object);
@@ -28,7 +38,6 @@ rb_call_inits(void)
     CALL(String);
     CALL(Exception);
     CALL(eval);
-    CALL(safe);
     CALL(jump);
     CALL(Numeric);
     CALL(Bignum);
@@ -52,14 +61,41 @@ rb_call_inits(void)
     CALL(Math);
     CALL(GC);
     CALL(Enumerator);
+    CALL(Ractor);
     CALL(VM);
     CALL(ISeq);
     CALL(Thread);
+    CALL(Scheduler);
     CALL(process);
     CALL(Cont);
     CALL(Rational);
     CALL(Complex);
+    CALL(MemoryView);
     CALL(version);
     CALL(vm_trace);
+    CALL(vm_stack_canary);
+    CALL(ast);
+    CALL(gc_stress);
+
+    // enable builtin loading
+    CALL(builtin);
+}
+
+void
+rb_call_builtin_inits(void)
+{
+#define BUILTIN(n) CALL(builtin_##n)
+    BUILTIN(gc);
+    BUILTIN(ractor);
+    BUILTIN(integer);
+    BUILTIN(io);
+    BUILTIN(dir);
+    BUILTIN(ast);
+    BUILTIN(trace_point);
+    BUILTIN(pack);
+    BUILTIN(warning);
+    BUILTIN(array);
+    BUILTIN(kernel);
+    Init_builtin_prelude();
 }
 #undef CALL
diff --git a/insns.def b/insns.def
index cdc82872ab..51e130786b 100644
--- a/insns.def
+++ b/insns.def
@@ -1,36 +1,62 @@
-/** ##skip -*- mode:c; style:ruby; coding: utf-8 -*-
+/* -*- C -*-
   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
-    instruction_name
-    (instruction_operands, ..)
-    (pop_values, ..)
-    (return value)
-    {
+  Massive rewrite by @shyouhei in 2017.
+ */
+
+/* Some comments about this file's contents:
+
+   - The new format aims to be editable by C editor of your choice;
+     your mileage might vary of course.
+
+   - Each instructions are in following format:
+
+     DEFINE_INSN
+     instruction_name
+     (type operand, type operand, ..)
+     (pop_values, ..)
+     (return values ..)
+     // attr type name contents..
+     {
        .. // insn body
-    }
+     }
 
- */
+   - Unlike the old format which was line-oriented, you can now place
+     newlines and comments at liberal positions.
+
+   - `DEFINE_INSN` is a keyword.
+
+   - An instruction name must be a valid C identifier.
 
+   - Operands, pop values, return values are series of either variable
+     declarations, keyword `void`, or keyword `...`.  They are much
+     like C function declarations.
 
-/**
-  @c nop
-  @e nop
-  @j nop
+   - Attribute pragmas are optional, and can include arbitrary C
+     expressions.  You can write anything there but as of writing,
+     supported attributes are:
+
+       * sp_inc: Used to dynamically calculate sp increase in
+         `insn_stack_increase`.
+
+       * handles_sp: If it is true, VM deals with sp in the insn.
+         Default is if the instruction takes ISEQ operand or not.
+
+       * leaf: indicates that the instruction is "leaf" i.e. it does
+         not introduce new stack frame on top of it.
+         If an instruction handles sp, that can never be a leaf.
+
+   - Attributes can access operands, but not stack (push/pop) variables.
+
+   - An instruction's body is a pure C block, copied verbatimly into
+     the generated C source code.
  */
+
+/* nop */
 DEFINE_INSN
 nop
 ()
@@ -44,12 +70,8 @@ nop
 /* deal with variables                                    */
 /**********************************************************/
 
-/**
-  @c variable
-  @e Get local variable (pointed by `idx' and `level').
+/* Get local variable (pointed by `idx' and `level').
      'level' indicates the nesting depth from the current block.
-  @j level, idx で指定されたローカル変数の値をスタックに置く。
-     level はブロックのネストレベルで、何段上かを示す。
  */
 DEFINE_INSN
 getlocal
@@ -57,22 +79,13 @@ getlocal
 ()
 (VALUE val)
 {
-    int i, lev = (int)level;
-    VALUE *ep = GET_EP();
-
-    /* optimized insns generated for level == (0|1) in defs/opt_operand.def */
-    for (i = 0; i < lev; i++) {
-	ep = GET_PREV_EP(ep);
-    }
-    val = *(ep - idx);
+    val = *(vm_get_ep(GET_EP(), level) - idx);
+    RB_DEBUG_COUNTER_INC(lvar_get);
+    (void)RB_DEBUG_COUNTER_INC_IF(lvar_get_dynamic, level > 0);
 }
 
-/**
-  @c variable
-  @e Set a local variable (pointed to by 'idx') as val.
+/* Set a local variable (pointed to by 'idx') as val.
      'level' indicates the nesting depth from the current block.
-  @j level, idx で指定されたローカル変数の値を val にする。
-     level はブロックのネストレベルで、何段上かを示す。
  */
 DEFINE_INSN
 setlocal
@@ -80,184 +93,225 @@ setlocal
 (VALUE val)
 ()
 {
-    int i, lev = (int)level;
-    VALUE *ep = GET_EP();
+    vm_env_write(vm_get_ep(GET_EP(), level), -(int)idx, val);
+    RB_DEBUG_COUNTER_INC(lvar_set);
+    (void)RB_DEBUG_COUNTER_INC_IF(lvar_set_dynamic, level > 0);
+}
 
-    /* optimized insns generated for level == (0|1) in defs/opt_operand.def */
-    for (i = 0; i < lev; i++) {
-	ep = GET_PREV_EP(ep);
+/* Get a block parameter. */
+DEFINE_INSN
+getblockparam
+(lindex_t idx, rb_num_t level)
+()
+(VALUE val)
+{
+    const VALUE *ep = vm_get_ep(GET_EP(), level);
+    VM_ASSERT(VM_ENV_LOCAL_P(ep));
+
+    if (!VM_ENV_FLAGS(ep, VM_FRAME_FLAG_MODIFIED_BLOCK_PARAM)) {
+	val = rb_vm_bh_to_procval(ec, VM_ENV_BLOCK_HANDLER(ep));
+	vm_env_write(ep, -(int)idx, val);
+	VM_ENV_FLAGS_SET(ep, VM_FRAME_FLAG_MODIFIED_BLOCK_PARAM);
+    }
+    else {
+	val = *(ep - idx);
+	RB_DEBUG_COUNTER_INC(lvar_get);
+	(void)RB_DEBUG_COUNTER_INC_IF(lvar_get_dynamic, level > 0);
     }
-    *(ep - idx) = val;
 }
 
-/**
-  @c variable
-  @e Get value of special local variable ($~, $_, ..).
-  @j 特殊なローカル変数（$~, $_, ...）の値を得る。
+/* Set block parameter. */
+DEFINE_INSN
+setblockparam
+(lindex_t idx, rb_num_t level)
+(VALUE val)
+()
+{
+    const VALUE *ep = vm_get_ep(GET_EP(), level);
+    VM_ASSERT(VM_ENV_LOCAL_P(ep));
+
+    vm_env_write(ep, -(int)idx, val);
+    RB_DEBUG_COUNTER_INC(lvar_set);
+    (void)RB_DEBUG_COUNTER_INC_IF(lvar_set_dynamic, level > 0);
+
+    VM_ENV_FLAGS_SET(ep, VM_FRAME_FLAG_MODIFIED_BLOCK_PARAM);
+}
+
+/* Get special proxy object which only responds to `call` method if the block parameter
+     represents a iseq/ifunc block. Otherwise, same as `getblockparam`.
  */
 DEFINE_INSN
+getblockparamproxy
+(lindex_t idx, rb_num_t level)
+()
+(VALUE val)
+{
+    const VALUE *ep = vm_get_ep(GET_EP(), level);
+    VM_ASSERT(VM_ENV_LOCAL_P(ep));
+
+    if (!VM_ENV_FLAGS(ep, VM_FRAME_FLAG_MODIFIED_BLOCK_PARAM)) {
+	VALUE block_handler = VM_ENV_BLOCK_HANDLER(ep);
+
+	if (block_handler) {
+	    switch (vm_block_handler_type(block_handler)) {
+	      case block_handler_type_iseq:
+	      case block_handler_type_ifunc:
+		val = rb_block_param_proxy;
+		break;
+	      case block_handler_type_symbol:
+		val = rb_sym_to_proc(VM_BH_TO_SYMBOL(block_handler));
+		goto INSN_LABEL(set);
+	      case block_handler_type_proc:
+		val = VM_BH_TO_PROC(block_handler);
+		goto INSN_LABEL(set);
+	      default:
+		VM_UNREACHABLE(getblockparamproxy);
+	    }
+	}
+	else {
+	    val = Qnil;
+	  INSN_LABEL(set):
+	    vm_env_write(ep, -(int)idx, val);
+	    VM_ENV_FLAGS_SET(ep, VM_FRAME_FLAG_MODIFIED_BLOCK_PARAM);
+	}
+    }
+    else {
+	val = *(ep - idx);
+	RB_DEBUG_COUNTER_INC(lvar_get);
+	(void)RB_DEBUG_COUNTER_INC_IF(lvar_get_dynamic, level > 0);
+    }
+}
+
+/* Get value of special local variable ($~, $_, ..). */
+DEFINE_INSN
 getspecial
 (rb_num_t key, rb_num_t type)
 ()
 (VALUE val)
+/* `$~ = MatchData.allocate; $&` can raise. */
+// attr bool leaf = (type == 0) ? true : false;
 {
-    val = vm_getspecial(th, GET_LEP(), key, type);
+    val = vm_getspecial(ec, GET_LEP(), key, type);
 }
 
-/**
-  @c variable
-  @e Set value of special local variable ($~, $_, ...) to obj.
-  @j 特別なローカル変数（$~, $_, ...）の値を設定する。
- */
+/* Set value of special local variable ($~, $_, ...) to obj. */
 DEFINE_INSN
 setspecial
 (rb_num_t key)
 (VALUE obj)
 ()
 {
-    lep_svar_set(th, GET_LEP(), key, obj);
+    lep_svar_set(ec, GET_LEP(), key, obj);
 }
 
-/**
-  @c variable
-  @e Get value of instance variable id of self.
-     If is_local is not 0, get value of class local variable.
-  @j self のインスタンス変数 id の値を得る。
- */
+/* Get value of instance variable id of self. */
 DEFINE_INSN
 getinstancevariable
-(ID id, IC ic)
+(ID id, IVC ic)
 ()
 (VALUE val)
+/* Ractor crashes when it accesses class/module-level instances variables. */
+// attr bool leaf = false; /* has IVAR_ACCESSOR_SHOULD_BE_MAIN_RACTOR() */
 {
-    val = vm_getinstancevariable(GET_SELF(), id, ic);
+    val = vm_getinstancevariable(GET_ISEQ(), GET_SELF(), id, ic);
 }
 
-/**
-  @c variable
-  @e Set value of instance variable id of self to val.
-     If is_local is not 0, set value of class local variable.
-  @j self のインスタンス変数 id を val にする。
- */
+/* Set value of instance variable id of self to val. */
 DEFINE_INSN
 setinstancevariable
-(ID id, IC ic)
+(ID id, IVC ic)
 (VALUE val)
 ()
+// attr bool leaf = false; /* has rb_check_frozen_internal() */
 {
-    vm_setinstancevariable(GET_SELF(), id, val, ic);
+    vm_setinstancevariable(GET_ISEQ(), GET_SELF(), id, val, ic);
 }
 
-/**
-  @c variable
-  @e Get value of class variable id of klass as val.
-  @j 現在のスコープのクラス変数 id の値を得る。
- */
+/* Get value of class variable id of klass as val. */
 DEFINE_INSN
 getclassvariable
 (ID id)
 ()
 (VALUE val)
+/* "class variable access from toplevel" warning can be hooked. */
+// attr bool leaf = false; /* has rb_warning() */
 {
-    val = rb_cvar_get(vm_get_cvar_base(rb_vm_get_cref(GET_EP()), GET_CFP()), id);
+    val = rb_cvar_get(vm_get_cvar_base(vm_get_cref(GET_EP()), GET_CFP(), 1), id);
 }
 
-/**
-  @c variable
-  @e Set value of class variable id of klass as val.
-  @j klass のクラス変数 id を val にする。
- */
+/* Set value of class variable id of klass as val. */
 DEFINE_INSN
 setclassvariable
 (ID id)
 (VALUE val)
 ()
+/* "class variable access from toplevel" warning can be hooked. */
+// attr bool leaf = false; /* has rb_warning() */
 {
-    rb_cvar_set(vm_get_cvar_base(rb_vm_get_cref(GET_EP()), GET_CFP()), id, val);
+    vm_ensure_not_refinement_module(GET_SELF());
+    rb_cvar_set(vm_get_cvar_base(vm_get_cref(GET_EP()), GET_CFP(), 1), id, val);
 }
 
-/**
-  @c variable
-  @e
-   Get constant variable id. If klass is Qnil, constants
-   are searched in the current scope. If klass is Qfalse, constants
-   are searched as top level constants. Otherwise, get constant under klass
+/* Get constant variable id. If klass is Qnil and allow_nil is Qtrue, constants
+   are searched in the current scope. Otherwise, get constant under klass
    class or module.
-  @j 定数 id の値を得る。
-   klass が Qnil なら、そのスコープで得られる定数の値を得る。
-   Qfalse なら、トップレベルスコープを得る。
-   それ以外なら、klass クラスの下の定数を得る。
  */
 DEFINE_INSN
 getconstant
 (ID id)
-(VALUE klass)
+(VALUE klass, VALUE allow_nil)
 (VALUE val)
+/* getconstant can kick autoload */
+// attr bool leaf = false; /* has rb_autoload_load() */
 {
-    val = vm_get_ev_const(th, klass, id, 0);
+    val = vm_get_ev_const(ec, klass, id, allow_nil == Qtrue, 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 の値を val にする。
-   klass が Qfalse なら、そのスコープで得られる定数 id の値を設定する。
-   Qnil なら、トップレベルスコープの値を設定する。
-   それ以外なら、klass クラスの下の定数を設定する。
+/* Set constant variable id under cbase class or module.
  */
 DEFINE_INSN
 setconstant
 (ID id)
 (VALUE val, VALUE cbase)
 ()
+/* Assigning an object to a constant is basically a leaf operation.
+ * The problem is, assigning a Module instance to a constant _names_
+ * that module.  Naming involves string manipulations, which are
+ * method calls. */
+// attr bool leaf = false; /* has StringValue() */
 {
     vm_check_if_namespace(cbase);
+    vm_ensure_not_refinement_module(GET_SELF());
     rb_const_set(cbase, id, val);
 }
 
-/**
-  @c variable
-  @e get global variable id.
-  @j グローバル変数 id の値を得る。
- */
+/* get global variable id. */
 DEFINE_INSN
 getglobal
-(GENTRY entry)
+(ID gid)
 ()
 (VALUE val)
+// attr bool leaf = false;
 {
-    val = GET_GLOBAL((VALUE)entry);
+    val = rb_gvar_get(gid);
 }
 
-/**
-  @c variable
-  @e set global variable id as val.
-  @j グローバル変数 id の値を設定する。
- */
+/* set global variable id as val. */
 DEFINE_INSN
 setglobal
-(GENTRY entry)
+(ID gid)
 (VALUE val)
 ()
+// attr bool leaf = false;
 {
-    SET_GLOBAL((VALUE)entry, val);
+    rb_gvar_set(gid, val);
 }
 
-
 /**********************************************************/
 /* deal with values                                       */
 /**********************************************************/
 
-/**
-  @c put
-  @e put nil to stack.
-  @j スタックに nil をプッシュする。
- */
+/* put nil to stack. */
 DEFINE_INSN
 putnil
 ()
@@ -267,11 +321,7 @@ putnil
     val = Qnil;
 }
 
-/**
-  @c put
-  @e put self.
-  @j スタックに self をプッシュする。
- */
+/* put self. */
 DEFINE_INSN
 putself
 ()
@@ -281,11 +331,7 @@ putself
     val = GET_SELF();
 }
 
-/**
-  @c put
-  @e put some object.
-     i.e. Fixnum, true, false, nil, and so on.
-  @j オブジェクト val をスタックにプッシュする。
+/* put some object.
      i.e. Fixnum, true, false, nil, and so on.
  */
 DEFINE_INSN
@@ -297,165 +343,135 @@ putobject
     /* */
 }
 
-/**
-  @c put
-  @e put special object.  "value_type" is for expansion.
-  @j 特別なオブジェクト val をスタックにプッシュする。
-     オブジェクトの種類は value_type による．
- */
+/* put special object.  "value_type" is for expansion. */
 DEFINE_INSN
 putspecialobject
 (rb_num_t value_type)
 ()
 (VALUE val)
 {
-    enum vm_special_object_type type = (enum vm_special_object_type)value_type;
-
-    switch (type) {
-      case VM_SPECIAL_OBJECT_VMCORE:
-	val = rb_mRubyVMFrozenCore;
-	break;
-      case VM_SPECIAL_OBJECT_CBASE:
-	val = vm_get_cbase(GET_EP());
-	break;
-      case VM_SPECIAL_OBJECT_CONST_BASE:
-	val = vm_get_const_base(GET_EP());
-	break;
-      default:
-	rb_bug("putspecialobject insn: unknown value_type");
-    }
-}
+    enum vm_special_object_type type;
 
-/**
-  @c put
-  @e put iseq value.
-  @j iseq をスタックにプッシュする。
- */
-DEFINE_INSN
-putiseq
-(ISEQ iseq)
-()
-(VALUE ret)
-{
-    ret = (VALUE)iseq;
+    type = (enum vm_special_object_type)value_type;
+    val = vm_get_special_object(GET_EP(), type);
 }
 
-/**
-  @c put
-  @e put string val. string will be copied.
-  @j 文字列をコピーしてスタックにプッシュする。
- */
+/* put string val. string will be copied. */
 DEFINE_INSN
 putstring
 (VALUE str)
 ()
 (VALUE val)
 {
-    val = rb_str_resurrect(str);
+    val = rb_ec_str_resurrect(ec, str);
 }
 
-/**
-  @c put
-  @e put concatenate strings
-  @j スタックトップの文字列を n 個連結し，結果をスタックにプッシュする。
- */
+/* put concatenate strings */
 DEFINE_INSN
 concatstrings
 (rb_num_t num)
 (...)
-(VALUE val) // inc += 1 - num;
+(VALUE val)
+/* This instruction can concat UTF-8 and binary strings, resulting in
+ * Encoding::CompatibilityError. */
+// attr bool leaf = false; /* has rb_enc_cr_str_buf_cat() */
+// attr rb_snum_t sp_inc = 1 - (rb_snum_t)num;
 {
-    val = rb_str_concat_literals(num, &TOPN(num-1));
-    POPN(num);
+    val = rb_str_concat_literals(num, STACK_ADDR_FROM_TOP(num));
 }
 
-/**
-  @c put
-  @e push the result of to_str.
-  @j to_str の結果をスタックにプッシュする。
- */
+/* push the result of to_s. */
 DEFINE_INSN
 tostring
 ()
+(VALUE val, VALUE str)
 (VALUE val)
-(VALUE val)
-{
-    val = rb_obj_as_string(val);
-}
-
-/**
-  @c put
-  @e Freeze (dynamically) created strings. if debug_info is given, set it.
-  @j （埋め込み）文字列を freeze する。もし、debug_info が与えられていれば、それを設定する。
- */
-DEFINE_INSN
-freezestring
-(VALUE debug_info)
-(VALUE str)
-(VALUE str)
 {
-    if (!NIL_P(debug_info)) {
-	rb_ivar_set(str, id_debug_created_info, debug_info);
-    }
-    rb_str_freeze(str);
+    val = rb_obj_as_string_result(str, val);
 }
 
-/**
-  @c put
-  @e compile str to Regexp and push it.
+/* compile str to Regexp and push it.
      opt is the option for the Regexp.
-  @j 文字列 str を正規表現にコンパイルしてスタックにプッシュする。
-     コンパイル時，opt を正規表現のオプションとする。
  */
 DEFINE_INSN
 toregexp
 (rb_num_t opt, rb_num_t cnt)
 (...)
-(VALUE val) // inc += 1 - cnt;
+(VALUE val)
+/* This instruction can raise RegexpError, thus can call
+ * RegexpError#initialize */
+// attr bool leaf = false;
+// attr rb_snum_t sp_inc = 1 - (rb_snum_t)cnt;
 {
-    VALUE rb_reg_new_ary(VALUE ary, int options);
-    rb_num_t i;
-    const VALUE ary = rb_ary_tmp_new(cnt);
-    for (i = 0; i < cnt; i++) {
-        rb_ary_store(ary, cnt-i-1, TOPN(i));
-    }
-    POPN(cnt);
+    const VALUE ary = rb_ary_tmp_new_from_values(0, cnt, STACK_ADDR_FROM_TOP(cnt));
     val = rb_reg_new_ary(ary, (int)opt);
     rb_ary_clear(ary);
 }
 
-/**
-  @c put
-  @e put new array initialized with num values on the stack.
-  @j 新しい配列をスタック上の num 個の値で初期化して生成しプッシュする。
- */
+/* intern str to Symbol and push it. */
+DEFINE_INSN
+intern
+()
+(VALUE str)
+(VALUE sym)
+{
+    sym = rb_str_intern(str);
+}
+
+/* put new array initialized with num values on the stack. */
 DEFINE_INSN
 newarray
 (rb_num_t num)
 (...)
-(VALUE val) // inc += 1 - num;
+(VALUE val)
+// attr rb_snum_t sp_inc = 1 - (rb_snum_t)num;
 {
-    val = rb_ary_new4((long)num, STACK_ADDR_FROM_TOP(num));
-    POPN(num);
+    val = rb_ec_ary_new_from_values(ec, num, STACK_ADDR_FROM_TOP(num));
 }
 
-/**
-  @c put
-  @e dup array
-  @j 配列 ary を dup してスタックにプッシュする。
+/* put new array initialized with num values on the stack. There
+   should be at least one element on the stack, and the top element
+   should be a hash.  If the top element is empty, it is not
+   included in the array.
  */
 DEFINE_INSN
+newarraykwsplat
+(rb_num_t num)
+(...)
+(VALUE val)
+// attr rb_snum_t sp_inc = 1 - (rb_snum_t)num;
+{
+    if (RHASH_EMPTY_P(*STACK_ADDR_FROM_TOP(1))) {
+        val = rb_ary_new4(num-1, STACK_ADDR_FROM_TOP(num));
+    }
+    else {
+        val = rb_ary_new4(num, STACK_ADDR_FROM_TOP(num));
+    }
+}
+
+/* dup array */
+DEFINE_INSN
 duparray
 (VALUE ary)
 ()
 (VALUE val)
 {
+    RUBY_DTRACE_CREATE_HOOK(ARRAY, RARRAY_LEN(ary));
     val = rb_ary_resurrect(ary);
 }
 
-/**
-  @c put
-  @e if TOS is an array expand, expand it to num objects.
+/* dup hash */
+DEFINE_INSN
+duphash
+(VALUE hash)
+()
+(VALUE val)
+{
+    RUBY_DTRACE_CREATE_HOOK(HASH, RHASH_SIZE(hash) << 1);
+    val = rb_hash_resurrect(hash);
+}
+
+/* if TOS is an array expand, expand it to num objects.
      if the number of the array is less than num, push nils to fill.
      if it is greater than num, exceeding elements are dropped.
      unless TOS is an array, push num - 1 nils.
@@ -463,110 +479,66 @@ duparray
      flag: 0x01 - rest args array
      flag: 0x02 - for postarg
      flag: 0x04 - reverse?
-  @j スタックトップのオブジェクトが配列であれば、それを展開する。
-     配列オブジェクトの要素数が num以下ならば、代わりに nil を積む。num以上なら、
-     num以上の要素は切り捨てる。
-     配列オブジェクトでなければ、num - 1 個の nil を積む。
-     もし flag が真なら、残り要素の配列を積む
-     flag: 0x01 - 最後を配列に
-     flag: 0x02 - postarg 用
-     flag: 0x04 - reverse?
  */
 DEFINE_INSN
 expandarray
 (rb_num_t num, rb_num_t flag)
 (..., VALUE ary)
-(...) // inc += num - 1 + (flag & 1 ? 1 : 0);
+(...)
+// attr bool leaf = false; /* has rb_check_array_type() */
+// attr rb_snum_t sp_inc = (rb_snum_t)num - 1 + (flag & 1 ? 1 : 0);
 {
-    vm_expandarray(GET_CFP(), ary, num, (int)flag);
+    vm_expandarray(GET_SP(), ary, num, (int)flag);
 }
 
-/**
-  @c put
-  @e concat two arrays
-  @j 二つの配列 ary1, ary2 を連結しスタックへプッシュする。
- */
+/* concat two arrays */
 DEFINE_INSN
 concatarray
 ()
-(VALUE ary1, VALUE ary2st)
+(VALUE ary1, VALUE ary2)
 (VALUE ary)
+// attr bool leaf = false; /* has rb_check_array_type() */
 {
-    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);
+    ary = vm_concat_array(ary1, ary2);
 }
 
-/**
-  @c put
-  @e call to_a on array ary to splat
-  @j splat のために配列 ary に対して to_a を呼び出す。
- */
+/* call to_a on array ary to splat */
 DEFINE_INSN
 splatarray
 (VALUE flag)
 (VALUE ary)
 (VALUE obj)
+// attr bool leaf = false; /* has rb_check_array_type() */
 {
-    VALUE tmp = rb_check_convert_type(ary, T_ARRAY, "Array", "to_a");
-    if (NIL_P(tmp)) {
-	tmp = rb_ary_new3(1, ary);
-    }
-    else if (RTEST(flag)) {
-	tmp = rb_ary_dup(tmp);
-    }
-    obj = tmp;
+    obj = vm_splat_array(flag, ary);
 }
 
-/**
-  @c put
-  @e put new Hash from n elements. n must be an even number.
-  @j 新しいハッシュをスタックトップの n 個を初期値として生成する。
-     n はキーと値のペアなので 2 の倍数でなければならない。
- */
+/* put new Hash from n elements. n must be an even number. */
 DEFINE_INSN
 newhash
 (rb_num_t num)
 (...)
-(VALUE val) // inc += 1 - num;
+(VALUE val)
+// attr bool leaf = false; /* has rb_hash_key_str() */
+// attr rb_snum_t sp_inc = 1 - (rb_snum_t)num;
 {
-    rb_num_t i;
-
     RUBY_DTRACE_CREATE_HOOK(HASH, num);
 
-    val = rb_hash_new();
+    val = rb_hash_new_with_size(num / 2);
 
-    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);
+    if (num) {
+        rb_hash_bulk_insert(num, STACK_ADDR_FROM_TOP(num), val);
     }
-    POPN(num);
 }
 
-/**
-  @c put
-  @e put new Range object.(Range.new(low, high, flag))
-  @j Range.new(low, high, flag) のようなオブジェクトを生成しスタックにプッシュする。
- */
+/* put new Range object.(Range.new(low, high, flag)) */
 DEFINE_INSN
 newrange
 (rb_num_t flag)
 (VALUE low, VALUE high)
 (VALUE val)
+/* rb_range_new() exercises "bad value for range" check. */
+// attr bool leaf = false; /* see also: range.c:range_init() */
 {
     val = rb_range_new(low, high, (int)flag);
 }
@@ -575,11 +547,7 @@ newrange
 /* deal with stack operation                              */
 /**********************************************************/
 
-/**
-  @c stack
-  @e pop from stack.
-  @j スタックから一つポップする。
- */
+/* pop from stack. */
 DEFINE_INSN
 pop
 ()
@@ -590,11 +558,7 @@ pop
     /* none */
 }
 
-/**
-  @c stack
-  @e duplicate stack top.
-  @j スタックトップをコピーしてスタックにプッシュする。
- */
+/* duplicate stack top. */
 DEFINE_INSN
 dup
 ()
@@ -604,31 +568,21 @@ dup
     val1 = val2 = val;
 }
 
-/**
-  @c stack
-  @e duplicate stack top n elements
-  @j スタックトップの n 個をコピーしてスタックにプッシュする。
- */
+/* duplicate stack top n elements */
 DEFINE_INSN
 dupn
 (rb_num_t n)
 (...)
-(...) // inc += n;
+(...)
+// attr rb_snum_t sp_inc = n;
 {
-    rb_num_t i;
-    VALUE *sp = STACK_ADDR_FROM_TOP(n);
-    for (i = 0; i < n; i++) {
-	GET_SP()[i] = sp[i];
-    }
-    INC_SP(n);
-}
+    void *dst = GET_SP();
+    void *src = STACK_ADDR_FROM_TOP(n);
 
+    MEMCPY(dst, src, VALUE, n);
+}
 
-/**
-  @c stack
-  @e swap top 2 vals
-  @j スタックトップの 2 つの値を交換する。
- */
+/* swap top 2 vals */
 DEFINE_INSN
 swap
 ()
@@ -638,16 +592,13 @@ swap
     /* none */
 }
 
-/**
-  @c stack
-  @e reverse stack top N order.
-  @j スタックトップの n 個の値を逆転する。
- */
+/* reverse stack top N order. */
 DEFINE_INSN
 reverse
 (rb_num_t n)
 (...)
-(...) // inc += 0;
+(...)
+// attr rb_snum_t sp_inc = 0;
 {
     rb_num_t i;
     VALUE *sp = STACK_ADDR_FROM_TOP(n);
@@ -660,191 +611,108 @@ reverse
     }
 }
 
-/**
-  @c stack
-  @e for stack caching.
-  @j スタックキャッシングの状態を調整するために必要な命令。
- */
-DEFINE_INSN
+/* for stack caching. */
+DEFINE_INSN_IF(STACK_CACHING)
 reput
 ()
 (..., VALUE val)
-(VALUE val) // inc += 0;
+(VALUE val)
+// attr rb_snum_t sp_inc = 0;
 {
     /* none */
 }
 
-/**
-  @c stack
-  @e get nth stack value from stack top
-  @j スタックトップから n 個目をスタックにプッシュする。
- */
+/* get nth stack value from stack top */
 DEFINE_INSN
 topn
 (rb_num_t n)
 (...)
-(VALUE val) // inc += 1;
+(VALUE val)
+// attr rb_snum_t sp_inc = 1;
 {
     val = TOPN(n);
 }
 
-/**
-  @c stack
-  @e set Nth stack entry to stack top
-  @j スタックトップの値を n 個目のスタックにコピー
- */
+/* set Nth stack entry to stack top */
 DEFINE_INSN
 setn
 (rb_num_t n)
 (..., VALUE val)
-(VALUE val) // inc += 0
+(VALUE val)
+// attr rb_snum_t sp_inc = 0;
 {
-    TOPN(n-1) = val;
+    TOPN(n) = val;
 }
 
-/**
-  @c stack
-  @e empty current stack
-  @j current stack を空にする。
- */
+/* empty current stack */
 DEFINE_INSN
 adjuststack
 (rb_num_t n)
 (...)
-(...) // inc -= n
+(...)
+// attr rb_snum_t sp_inc = -(rb_snum_t)n;
 {
-    DEC_SP(n);
+    /* none */
 }
 
-
 /**********************************************************/
 /* deal with setting                                      */
 /**********************************************************/
 
-/**
-  @c setting
-  @e defined?
-  @j defined? を行う。
- */
+/* defined? */
 DEFINE_INSN
 defined
 (rb_num_t op_type, VALUE obj, VALUE needstr)
 (VALUE v)
 (VALUE val)
+// attr bool leaf = leafness_of_defined(op_type);
 {
-    val = vm_defined(th, GET_CFP(), op_type, obj, needstr, v);
+    val = vm_defined(ec, GET_CFP(), op_type, obj, needstr, v);
 }
 
-/**
-  @c setting
-  @e check `target' matches `pattern'.
+/* check `target' matches `pattern'.
      `flag & VM_CHECKMATCH_TYPE_MASK' describe how to check pattern.
       VM_CHECKMATCH_TYPE_WHEN: ignore target and check pattern is truthy.
       VM_CHECKMATCH_TYPE_CASE: check `patten === target'.
-      VM_CHECKMATCH_TYPE_RESCUE: check `pattern.kind_op?(Module) && pattern == target'.
+      VM_CHECKMATCH_TYPE_RESCUE: check `pattern.kind_op?(Module) && pattern === target'.
      if `flag & VM_CHECKMATCH_ARRAY' is not 0, then `patten' is array of patterns.
-  @j see above comments.
  */
 DEFINE_INSN
 checkmatch
 (rb_num_t flag)
 (VALUE target, VALUE pattern)
 (VALUE result)
+// attr bool leaf = leafness_of_checkmatch(flag);
 {
-    enum vm_check_match_type checkmatch_type =
-      (enum vm_check_match_type)(flag & VM_CHECKMATCH_TYPE_MASK);
-    result = Qfalse;
-
-    if (flag & VM_CHECKMATCH_ARRAY) {
-	int i;
-	for (i = 0; i < RARRAY_LEN(pattern); i++) {
-	    if (RTEST(check_match(RARRAY_AREF(pattern, i), target, checkmatch_type))) {
-		result = Qtrue;
-		break;
-	    }
-	}
-    }
-    else {
-	if (RTEST(check_match(pattern, target, checkmatch_type))) {
-	    result = Qtrue;
-	}
-    }
+    result = vm_check_match(ec, target, pattern, flag);
 }
 
-/**
-  @c setting
-  @e check keywords are specified or not.
-  @j キーワードが指定されているかどうかチェックする
- */
+/* check keywords are specified or not. */
 DEFINE_INSN
 checkkeyword
-(lindex_t kw_bits_index, rb_num_t keyword_index)
+(lindex_t kw_bits_index, lindex_t keyword_index)
 ()
 (VALUE ret)
 {
-    const VALUE *ep = GET_EP();
-    const VALUE kw_bits = *(ep - kw_bits_index);
-
-    if (FIXNUM_P(kw_bits)) {
-	int bits = FIX2INT(kw_bits);
-	ret = (bits & (0x01 << keyword_index)) ? Qfalse : Qtrue;
-    }
-    else {
-	assert(RB_TYPE_P(kw_bits, T_HASH));
-	ret = rb_hash_has_key(kw_bits, INT2FIX(keyword_index)) ? Qfalse : Qtrue;
-    }
+    ret = vm_check_keyword(kw_bits_index, keyword_index, GET_EP());
 }
 
-/**
-  @c setting
-  @e trace
-  @j trace 用の命令。
- */
+/* check if val is type. */
 DEFINE_INSN
-trace
-(rb_num_t nf)
-()
-()
+checktype
+(rb_num_t type)
+(VALUE val)
+(VALUE ret)
 {
-    rb_event_flag_t flag = (rb_event_flag_t)nf;
-
-    if (RUBY_DTRACE_METHOD_ENTRY_ENABLED() ||
-        RUBY_DTRACE_METHOD_RETURN_ENABLED() ||
-        RUBY_DTRACE_CMETHOD_ENTRY_ENABLED() ||
-        RUBY_DTRACE_CMETHOD_RETURN_ENABLED()) {
-
-        switch (flag) {
-          case RUBY_EVENT_CALL:
-            RUBY_DTRACE_METHOD_ENTRY_HOOK(th, 0, 0);
-            break;
-          case RUBY_EVENT_C_CALL:
-            RUBY_DTRACE_CMETHOD_ENTRY_HOOK(th, 0, 0);
-            break;
-          case RUBY_EVENT_RETURN:
-            RUBY_DTRACE_METHOD_RETURN_HOOK(th, 0, 0);
-            break;
-          case RUBY_EVENT_C_RETURN:
-            RUBY_DTRACE_CMETHOD_RETURN_HOOK(th, 0, 0);
-            break;
-        }
-    }
-
-    EXEC_EVENT_HOOK(th, flag, GET_SELF(), 0, 0 /* id and klass are resolved at callee */,
-		    (flag & (RUBY_EVENT_RETURN | RUBY_EVENT_B_RETURN)) ? TOPN(0) : Qundef);
+    ret = (TYPE(val) == (int)type) ? Qtrue : Qfalse;
 }
 
 /**********************************************************/
 /* deal with control flow 1: class/module                 */
 /**********************************************************/
 
-/**
-  @c class/module
-  @e
-   enter class definition scope. if super is Qfalse, and class
+/* enter class definition scope. if super is Qfalse, and class
    "klass" is defined, it's redefine. otherwise, define "klass" class.
-  @j クラス定義スコープへ移行する。
-   もし super が Qfalse で klassクラスが定義されていれば再定義である。
-   そうでなければ、klass クラスを定義する。
  */
 DEFINE_INSN
 defineclass
@@ -852,294 +720,214 @@ defineclass
 (VALUE cbase, VALUE super)
 (VALUE val)
 {
-    VALUE klass;
-    rb_vm_defineclass_type_t type = VM_DEFINECLASS_TYPE(flags);
-
-    switch (type) {
-      case VM_DEFINECLASS_TYPE_CLASS:
-	/* val is dummy.  classdef returns class scope value */
-
-	if (VM_DEFINECLASS_HAS_SUPERCLASS_P(flags) &&
-	    !RB_TYPE_P(super, T_CLASS)) {
-	    rb_raise(rb_eTypeError, "superclass must be a Class (%"PRIsVALUE" given)",
-		     rb_obj_class(super));
-	}
-
-	vm_check_if_namespace(cbase);
-
-	/* find klass */
-	rb_autoload_load(cbase, id);
-	if ((klass = vm_search_const_defined_class(cbase, id)) != 0) {
-	    /* already exist */
-	    klass = VM_DEFINECLASS_SCOPED_P(flags) ?
-		rb_public_const_get_at(klass, id) : rb_const_get_at(klass, id);
-	    if (!RB_TYPE_P(klass, T_CLASS)) {
-		rb_raise(rb_eTypeError, "%"PRIsVALUE" is not a class", rb_id2str(id));
-	    }
-
-	    if (VM_DEFINECLASS_HAS_SUPERCLASS_P(flags)) {
-		VALUE tmp;
-		tmp = rb_class_real(RCLASS_SUPER(klass));
-
-		if (tmp != super) {
-		    rb_raise(rb_eTypeError, "superclass mismatch for class %"PRIsVALUE"",
-			     rb_id2str(id));
-		}
-	    }
-	}
-	else {
-	    if (!VM_DEFINECLASS_HAS_SUPERCLASS_P(flags)) {
-		super = rb_cObject;
-	    }
-	    /* new class declaration */
-	    klass = rb_define_class_id(id, super);
-	    rb_set_class_path_string(klass, cbase, rb_id2str(id));
-	    rb_const_set(cbase, id, klass);
-	    rb_class_inherited(super, klass);
-	}
-	break;
-      case VM_DEFINECLASS_TYPE_SINGLETON_CLASS:
-	/* val is dummy.  classdef returns class scope value */
-	/* super is dummy */
-	klass = rb_singleton_class(cbase);
-	break;
-      case VM_DEFINECLASS_TYPE_MODULE:
-	/* val is dummy.  classdef returns class scope value */
-	/* super is dummy */
-
-	vm_check_if_namespace(cbase);
-
-	/* find klass */
-	if ((klass = vm_search_const_defined_class(cbase, id)) != 0) {
-	    klass = VM_DEFINECLASS_SCOPED_P(flags) ?
-		rb_public_const_get_at(klass, id) : rb_const_get_at(klass, id);
-	    /* already exist */
-	    if (!RB_TYPE_P(klass, T_MODULE)) {
-		rb_raise(rb_eTypeError, "%"PRIsVALUE" is not a module", rb_id2str(id));
-	    }
-	}
-	else {
-	    /* new module declaration */
-	    klass = rb_define_module_id(id);
-	    rb_set_class_path_string(klass, cbase, rb_id2str(id));
-	    rb_const_set(cbase, id, klass);
-	}
-	break;
-      default:
-	rb_bug("unknown defineclass type: %d", (int)type);
-    }
+    VALUE klass = vm_find_or_create_class_by_id(id, flags, cbase, super);
 
     rb_iseq_check(class_iseq);
 
     /* enter scope */
-    vm_push_frame(th, class_iseq, VM_FRAME_MAGIC_CLASS, klass,
-		  VM_ENVVAL_BLOCK_PTR(GET_BLOCK_PTR()),
-		  (VALUE)vm_cref_push(th, klass, NULL, FALSE),
+    vm_push_frame(ec, class_iseq, VM_FRAME_MAGIC_CLASS | VM_ENV_FLAG_LOCAL, klass,
+		  GET_BLOCK_HANDLER(),
+		  (VALUE)vm_cref_push(ec, klass, NULL, FALSE),
 		  class_iseq->body->iseq_encoded, GET_SP(),
-		  class_iseq->body->local_size,
+		  class_iseq->body->local_table_size,
 		  class_iseq->body->stack_max);
     RESTORE_REGS();
     NEXT_INSN();
 }
 
+DEFINE_INSN
+definemethod
+(ID id, ISEQ iseq)
+()
+()
+{
+    vm_define_method(ec, Qnil, id, (VALUE)iseq, FALSE);
+}
+
+DEFINE_INSN
+definesmethod
+(ID id, ISEQ iseq)
+(VALUE obj)
+()
+{
+    vm_define_method(ec, obj, id, (VALUE)iseq, TRUE);
+}
 
 /**********************************************************/
 /* deal with control flow 2: method/iterator              */
 /**********************************************************/
 
-/**
-  @c method/iterator
-  @e invoke method.
-  @j メソッド呼び出しを行う。ci に必要な情報が格納されている。
- */
+/* invoke method. */
 DEFINE_INSN
 send
-(CALL_INFO ci, CALL_CACHE cc, ISEQ blockiseq)
+(CALL_DATA cd, ISEQ blockiseq)
 (...)
-(VALUE val) // inc += - (int)(ci->orig_argc + ((ci->flag & VM_CALL_ARGS_BLOCKARG) ? 1 : 0));
+(VALUE val)
+// attr rb_snum_t sp_inc = sp_inc_of_sendish(cd->ci);
+// attr rb_snum_t comptime_sp_inc = sp_inc_of_sendish(ci);
 {
-    struct rb_calling_info calling;
+    VALUE bh = vm_caller_setup_arg_block(ec, GET_CFP(), cd->ci, blockiseq, false);
+    val = vm_sendish(ec, GET_CFP(), cd, bh, mexp_search_method);
 
-    vm_caller_setup_arg_block(th, reg_cfp, &calling, ci, blockiseq, FALSE);
-    vm_search_method(ci, cc, calling.recv = TOPN(calling.argc = ci->orig_argc));
-    CALL_METHOD(&calling, ci, cc);
+    if (val == Qundef) {
+        RESTORE_REGS();
+        NEXT_INSN();
+    }
+}
+
+/* Invoke method without block */
+DEFINE_INSN
+opt_send_without_block
+(CALL_DATA cd)
+(...)
+(VALUE val)
+// attr bool handles_sp = true;
+// attr rb_snum_t sp_inc = sp_inc_of_sendish(cd->ci);
+// attr rb_snum_t comptime_sp_inc = sp_inc_of_sendish(ci);
+{
+    VALUE bh = VM_BLOCK_HANDLER_NONE;
+    val = vm_sendish(ec, GET_CFP(), cd, bh, mexp_search_method);
+
+    if (val == Qundef) {
+        RESTORE_REGS();
+        NEXT_INSN();
+    }
 }
 
 DEFINE_INSN
 opt_str_freeze
-(VALUE str)
+(VALUE str, CALL_DATA cd)
 ()
 (VALUE val)
 {
-    if (BASIC_OP_UNREDEFINED_P(BOP_FREEZE, STRING_REDEFINED_OP_FLAG)) {
-	val = str;
-    }
-    else {
-	val = rb_funcall(rb_str_resurrect(str), idFreeze, 0);
+    val = vm_opt_str_freeze(str, BOP_FREEZE, idFreeze);
+
+    if (val == Qundef) {
+        PUSH(rb_str_resurrect(str));
+        CALL_SIMPLE_METHOD();
     }
 }
 
+/* optimized nil? */
 DEFINE_INSN
-opt_newarray_max
-(rb_num_t num)
-(...)
-(VALUE val) // inc += 1 - num;
+opt_nil_p
+(CALL_DATA cd)
+(VALUE recv)
+(VALUE val)
 {
-#define id_cmp  idCmp
-    if (BASIC_OP_UNREDEFINED_P(BOP_MAX, ARRAY_REDEFINED_OP_FLAG)) {
-	if (num == 0) {
-	    val = Qnil;
-	}
-	else {
-	    struct cmp_opt_data cmp_opt = { 0, 0 };
-	    VALUE result = Qundef;
-	    rb_num_t i = num - 1;
-	    result = TOPN(i);
-	    while (i-- > 0) {
-		const VALUE v = TOPN(i);
-		if (result == Qundef || OPTIMIZED_CMP(v, result, cmp_opt) > 0) {
-		    result = v;
-		}
-	    }
-	    val = result == Qundef ? Qnil : result;
-	}
-	POPN(num);
+    val = vm_opt_nil_p(GET_ISEQ(), cd, recv);
+
+    if (val == Qundef) {
+        CALL_SIMPLE_METHOD();
     }
-    else {
-	VALUE ary = rb_ary_new4((long)num, STACK_ADDR_FROM_TOP(num));
-	val = rb_funcall(ary, idMax, 0);
-	POPN(num);
+}
+
+DEFINE_INSN
+opt_str_uminus
+(VALUE str, CALL_DATA cd)
+()
+(VALUE val)
+{
+    val = vm_opt_str_freeze(str, BOP_UMINUS, idUMinus);
+
+    if (val == Qundef) {
+        PUSH(rb_str_resurrect(str));
+        CALL_SIMPLE_METHOD();
     }
-#undef id_cmp
 }
 
 DEFINE_INSN
-opt_newarray_min
+opt_newarray_max
 (rb_num_t num)
 (...)
-(VALUE val) // inc += 1 - num;
+(VALUE val)
+/* This instruction typically has no funcalls.  But it compares array
+ * contents each other by nature.  That part could call methods when
+ * necessary.  No way to detect such method calls beforehand.  We
+ * cannot but mark it being not leaf. */
+// attr bool leaf = false; /* has rb_funcall() */
+// attr rb_snum_t sp_inc = 1 - (rb_snum_t)num;
 {
-#define id_cmp  idCmp
-    if (BASIC_OP_UNREDEFINED_P(BOP_MIN, ARRAY_REDEFINED_OP_FLAG)) {
-	if (num == 0) {
-	    val = Qnil;
-	}
-	else {
-	    struct cmp_opt_data cmp_opt = { 0, 0 };
-	    VALUE result = Qundef;
-	    rb_num_t i = num - 1;
-	    result = TOPN(i);
-	    while (i-- > 0) {
-		const VALUE v = TOPN(i);
-		if (result == Qundef || OPTIMIZED_CMP(v, result, cmp_opt) < 0) {
-		    result = v;
-		}
-	    }
-	    val = result == Qundef ? Qnil : result;
-	}
-	POPN(num);
-    }
-    else {
-	VALUE ary = rb_ary_new4((long)num, STACK_ADDR_FROM_TOP(num));
-	val = rb_funcall(ary, idMin, 0);
-	POPN(num);
-    }
-#undef id_cmp
+    val = vm_opt_newarray_max(num, STACK_ADDR_FROM_TOP(num));
 }
 
-/**
-  @c optimize
-  @e Invoke method without block
-  @j Invoke method without block
- */
 DEFINE_INSN
-opt_send_without_block
-(CALL_INFO ci, CALL_CACHE cc)
+opt_newarray_min
+(rb_num_t num)
 (...)
-(VALUE val) // inc += -ci->orig_argc;
+(VALUE val)
+/* Same discussion as opt_newarray_max. */
+// attr bool leaf = false; /* has rb_funcall() */
+// attr rb_snum_t sp_inc = 1 - (rb_snum_t)num;
 {
-    struct rb_calling_info calling;
-    calling.blockptr = NULL;
-    vm_search_method(ci, cc, calling.recv = TOPN(calling.argc = ci->orig_argc));
-    CALL_METHOD(&calling, ci, cc);
+    val = vm_opt_newarray_min(num, STACK_ADDR_FROM_TOP(num));
 }
 
-/**
-  @c method/iterator
-  @e super(args) # args.size => num
-  @j super を実行する。ci に必要な情報が格納されている。
- */
+/* super(args) # args.size => num */
 DEFINE_INSN
 invokesuper
-(CALL_INFO ci, CALL_CACHE cc, ISEQ blockiseq)
+(CALL_DATA cd, ISEQ blockiseq)
 (...)
-(VALUE val) // inc += - (int)(ci->orig_argc + ((ci->flag & VM_CALL_ARGS_BLOCKARG) ? 1 : 0));
+(VALUE val)
+// attr rb_snum_t sp_inc = sp_inc_of_sendish(cd->ci);
+// attr rb_snum_t comptime_sp_inc = sp_inc_of_sendish(ci);
 {
-    struct rb_calling_info calling;
-    calling.argc = ci->orig_argc;
+    VALUE bh = vm_caller_setup_arg_block(ec, GET_CFP(), cd->ci, blockiseq, true);
+    val = vm_sendish(ec, GET_CFP(), cd, bh, mexp_search_super);
 
-    vm_caller_setup_arg_block(th, reg_cfp, &calling, ci, blockiseq, TRUE);
-    calling.recv = GET_SELF();
-    vm_search_super_method(th, GET_CFP(), &calling, ci, cc);
-    CALL_METHOD(&calling, ci, cc);
+    if (val == Qundef) {
+        RESTORE_REGS();
+        NEXT_INSN();
+    }
 }
 
-/**
-  @c method/iterator
-  @e yield(args)
-  @j yield を実行する。
- */
+/* yield(args) */
 DEFINE_INSN
 invokeblock
-(CALL_INFO ci)
+(CALL_DATA cd)
 (...)
-(VALUE val)  // inc += 1 - ci->orig_argc;
+(VALUE val)
+// attr bool handles_sp = true;
+// attr rb_snum_t sp_inc = sp_inc_of_invokeblock(cd->ci);
+// attr rb_snum_t comptime_sp_inc = sp_inc_of_invokeblock(ci);
 {
-    struct rb_calling_info calling;
-    calling.argc = ci->orig_argc;
-    calling.blockptr = NULL;
-    calling.recv = GET_SELF();
+    VALUE bh = VM_BLOCK_HANDLER_NONE;
+    val = vm_sendish(ec, GET_CFP(), cd, bh, mexp_search_invokeblock);
 
-    val = vm_invoke_block(th, GET_CFP(), &calling, ci);
     if (val == Qundef) {
-	RESTORE_REGS();
-	NEXT_INSN();
+        RESTORE_REGS();
+        NEXT_INSN();
     }
 }
 
-/**
-  @c method/iterator
-  @e return from this scope.
-  @j このスコープから抜ける。
- */
+/* return from this scope. */
 DEFINE_INSN
 leave
 ()
 (VALUE val)
 (VALUE val)
+/* This is super surprising but when leaving from a frame, we check
+ * for interrupts.  If any, that should be executed on top of the
+ * current execution context.  This is a method call. */
+// attr bool leaf = false; /* has rb_threadptr_execute_interrupts() */
+// attr bool handles_sp = true;
 {
     if (OPT_CHECKED_RUN) {
-	const VALUE *const bp = vm_base_ptr(reg_cfp);
-	if (reg_cfp->sp != bp) {
-	    rb_bug("Stack consistency error (sp: %"PRIdPTRDIFF", bp: %"PRIdPTRDIFF")",
-		   VM_SP_CNT(th, reg_cfp->sp), VM_SP_CNT(th, bp));
+        const VALUE *const bp = vm_base_ptr(GET_CFP());
+        if (GET_SP() != bp) {
+            vm_stack_consistency_error(ec, GET_CFP(), bp);
 	}
     }
 
-    RUBY_VM_CHECK_INTS(th);
-
-    if (UNLIKELY(VM_FRAME_TYPE_FINISH_P(GET_CFP()))) {
-	vm_pop_frame(th);
-
+    if (vm_pop_frame(ec, GET_CFP(), GET_EP())) {
 #if OPT_CALL_THREADED_CODE
-	th->retval = val;
+	rb_ec_thread_ptr(ec)->retval = val;
 	return 0;
 #else
 	return val;
 #endif
     }
     else {
-	vm_pop_frame(th);
 	RESTORE_REGS();
     }
 }
@@ -1148,19 +936,16 @@ leave
 /* deal with control flow 3: exception                    */
 /**********************************************************/
 
-/**
-  @c exception
-  @e longjump
-  @j 大域ジャンプを行う。
- */
+/* longjump */
 DEFINE_INSN
 throw
 (rb_num_t throw_state)
 (VALUE throwobj)
 (VALUE val)
+/* Same discussion as leave. */
+// attr bool leaf = false; /* has rb_threadptr_execute_interrupts() */
 {
-    RUBY_VM_CHECK_INTS(th);
-    val = vm_throw(th, GET_CFP(), throw_state, throwobj);
+    val = vm_throw(ec, GET_CFP(), throw_state, throwobj);
     THROW_EXCEPTION(val);
     /* unreachable */
 }
@@ -1169,992 +954,504 @@ throw
 /* deal with control flow 4: local jump                   */
 /**********************************************************/
 
-/**
-  @c jump
-  @e set PC to (PC + dst).
-  @j PC を (PC + dst) にする。
- */
+/* set PC to (PC + dst). */
 DEFINE_INSN
 jump
 (OFFSET dst)
 ()
 ()
+/* Same discussion as leave. */
+// attr bool leaf = leafness_of_check_ints; /* has rb_threadptr_execute_interrupts() */
 {
-    RUBY_VM_CHECK_INTS(th);
+    RUBY_VM_CHECK_INTS(ec);
     JUMP(dst);
 }
 
-/**
-  @c jump
-  @e if val is not false or nil, set PC to (PC + dst).
-  @j もし val が false か nil でなければ、PC を (PC + dst) にする。
- */
+/* if val is not false or nil, set PC to (PC + dst). */
 DEFINE_INSN
 branchif
 (OFFSET dst)
 (VALUE val)
 ()
+/* Same discussion as jump. */
+// attr bool leaf = leafness_of_check_ints; /* has rb_threadptr_execute_interrupts() */
 {
     if (RTEST(val)) {
-	RUBY_VM_CHECK_INTS(th);
+	RUBY_VM_CHECK_INTS(ec);
 	JUMP(dst);
     }
 }
 
-/**
-  @c jump
-  @e if val is false or nil, set PC to (PC + dst).
-  @j もし val が false か nil ならば、PC を (PC + dst) にする。
- */
+/* if val is false or nil, set PC to (PC + dst). */
 DEFINE_INSN
 branchunless
 (OFFSET dst)
 (VALUE val)
 ()
+/* Same discussion as jump. */
+// attr bool leaf = leafness_of_check_ints; /* has rb_threadptr_execute_interrupts() */
 {
     if (!RTEST(val)) {
-	RUBY_VM_CHECK_INTS(th);
+	RUBY_VM_CHECK_INTS(ec);
 	JUMP(dst);
     }
 }
 
-/**
-  @c jump
-  @e if val is nil, set PC to (PC + dst).
-  @j もし val が nil ならば、PC を (PC + dst) にする。
- */
+/* if val is nil, set PC to (PC + dst). */
 DEFINE_INSN
 branchnil
 (OFFSET dst)
 (VALUE val)
 ()
+/* Same discussion as jump. */
+// attr bool leaf = leafness_of_check_ints; /* has rb_threadptr_execute_interrupts() */
 {
     if (NIL_P(val)) {
-	RUBY_VM_CHECK_INTS(th);
+	RUBY_VM_CHECK_INTS(ec);
 	JUMP(dst);
     }
 }
 
-
 /**********************************************************/
 /* for optimize                                           */
 /**********************************************************/
 
-/**
-  @c optimize
-  @e push inline-cached value and go to dst if it is valid
-  @j インラインキャッシュが有効なら、値をスタックにプッシュして dst へジャンプする。
- */
+/* push inline-cached value and go to dst if it is valid */
 DEFINE_INSN
-getinlinecache
+opt_getinlinecache
 (OFFSET dst, IC ic)
 ()
 (VALUE val)
 {
-    if (ic->ic_serial == GET_GLOBAL_CONSTANT_STATE() &&
-	(ic->ic_cref == NULL || ic->ic_cref == rb_vm_get_cref(GET_EP()))) {
-	val = ic->ic_value.value;
-	JUMP(dst);
+    struct iseq_inline_constant_cache_entry *ice = ic->entry;
+    if (ice && vm_ic_hit_p(ice, GET_EP())) {
+        val = ice->value;
+        JUMP(dst);
     }
     else {
-	/* none */
 	val = Qnil;
     }
 }
 
-/**
-  @c optimize
-  @e set inline cache
-  @j インラインキャッシュの値を設定する。
- */
+/* set inline cache */
 DEFINE_INSN
-setinlinecache
+opt_setinlinecache
 (IC ic)
 (VALUE val)
 (VALUE val)
 {
-    VM_ASSERT(ic->ic_value.value != Qundef);
-    ic->ic_value.value = val;
-    ic->ic_serial = GET_GLOBAL_CONSTANT_STATE() - ruby_vm_const_missing_count;
-    ic->ic_cref = vm_get_const_key_cref(GET_EP());
-    ruby_vm_const_missing_count = 0;
+    vm_ic_update(GET_ISEQ(), ic, val, GET_EP());
 }
 
-/**
-  @c optimize
-  @e run iseq only once
-  @j once を実現する。
- */
+/* run iseq only once */
 DEFINE_INSN
 once
-(ISEQ iseq, IC ic)
+(ISEQ iseq, ISE ise)
 ()
 (VALUE val)
 {
-    union iseq_inline_storage_entry *is = (union iseq_inline_storage_entry *)ic;
-
-#define RUNNING_THREAD_ONCE_DONE ((rb_thread_t *)(0x1))
-  retry:
-    if (is->once.running_thread == RUNNING_THREAD_ONCE_DONE) {
-	val = is->once.value;
-    }
-    else if (is->once.running_thread == NULL) {
-	is->once.running_thread = th;
-	val = is->once.value = rb_ensure(vm_once_exec, (VALUE)iseq, vm_once_clear, (VALUE)is);
-	/* is->once.running_thread is cleared by vm_once_clear() */
-	is->once.running_thread = RUNNING_THREAD_ONCE_DONE; /* success */
-	rb_iseq_add_mark_object(GET_ISEQ(), val);
-    }
-    else if (is->once.running_thread == th) {
-	/* recursive once */
-	val = vm_once_exec((VALUE)iseq);
-    }
-    else {
-	/* waiting for finish */
-	RUBY_VM_CHECK_INTS(th);
-	rb_thread_schedule();
-	goto retry;
-    }
+    val = vm_once_dispatch(ec, iseq, ise);
 }
 
-/**
-  @c optimize
-  @e case dispatcher, jump by table if possible
-  @j case 文で、可能なら表引きでジャンプする。
- */
+/* case dispatcher, jump by table if possible */
 DEFINE_INSN
 opt_case_dispatch
 (CDHASH hash, OFFSET else_offset)
 (..., VALUE key)
-() // inc += -1;
+()
+// attr rb_snum_t sp_inc = -1;
 {
-    switch(TYPE(key)) {
-      case T_FLOAT: {
-	double ival;
-	if (modf(RFLOAT_VALUE(key), &ival) == 0.0 && !isinf(ival)) {
-	    key = FIXABLE(ival) ? LONG2FIX((long)ival) : rb_dbl2big(ival);
-	}
-      }
-      case T_TRUE: /* fall through */
-      case T_FALSE:
-      case T_NIL:
-      case T_SYMBOL:
-      case T_FIXNUM:
-      case T_BIGNUM:
-      case T_STRING:
-	if (BASIC_OP_UNREDEFINED_P(BOP_EQQ,
-				   SYMBOL_REDEFINED_OP_FLAG |
-				   INTEGER_REDEFINED_OP_FLAG |
-				   FLOAT_REDEFINED_OP_FLAG |
-				   NIL_REDEFINED_OP_FLAG    |
-				   TRUE_REDEFINED_OP_FLAG   |
-				   FALSE_REDEFINED_OP_FLAG  |
-				   STRING_REDEFINED_OP_FLAG)) {
-	    st_data_t val;
-	    if (st_lookup(RHASH_TBL_RAW(hash), key, &val)) {
-		JUMP(FIX2INT((VALUE)val));
-	    }
-	    else {
-		JUMP(else_offset);
-	    }
-	    break;
-	}
-      default:
-	break;
+    OFFSET dst = vm_case_dispatch(hash, else_offset, key);
+
+    if (dst) {
+	JUMP(dst);
     }
 }
 
 /** simple functions */
 
-/**
-  @c optimize
-  @e optimized X+Y.
-  @j 最適化された X+Y。
- */
+/* optimized X+Y. */
 DEFINE_INSN
 opt_plus
-(CALL_INFO ci, CALL_CACHE cc)
+(CALL_DATA cd)
 (VALUE recv, VALUE obj)
 (VALUE val)
 {
-    if (FIXNUM_2_P(recv, obj) &&
-	BASIC_OP_UNREDEFINED_P(BOP_PLUS,INTEGER_REDEFINED_OP_FLAG)) {
-	/* 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;
-	val = LONG2NUM(c);
-#endif
-    }
-    else if (FLONUM_2_P(recv, obj) &&
-	     BASIC_OP_UNREDEFINED_P(BOP_PLUS, FLOAT_REDEFINED_OP_FLAG)) {
-	val = DBL2NUM(RFLOAT_VALUE(recv) + RFLOAT_VALUE(obj));
-    }
-    else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) {
-	if (RBASIC_CLASS(recv) == rb_cFloat && RBASIC_CLASS(obj) == rb_cFloat &&
-	    BASIC_OP_UNREDEFINED_P(BOP_PLUS, FLOAT_REDEFINED_OP_FLAG)) {
-	    val = DBL2NUM(RFLOAT_VALUE(recv) + RFLOAT_VALUE(obj));
-	}
-	else if (RBASIC_CLASS(recv) == rb_cString && RBASIC_CLASS(obj) == rb_cString &&
-		 BASIC_OP_UNREDEFINED_P(BOP_PLUS, STRING_REDEFINED_OP_FLAG)) {
-	    val = rb_str_plus(recv, obj);
-	}
-	else if (RBASIC_CLASS(recv) == rb_cArray &&
-		 BASIC_OP_UNREDEFINED_P(BOP_PLUS, ARRAY_REDEFINED_OP_FLAG)) {
-	    val = rb_ary_plus(recv, obj);
-	}
-	else {
-	    goto INSN_LABEL(normal_dispatch);
-	}
-    }
-    else {
-	INSN_LABEL(normal_dispatch):
-	PUSH(recv);
-	PUSH(obj);
-	CALL_SIMPLE_METHOD(recv);
+    val = vm_opt_plus(recv, obj);
+
+    if (val == Qundef) {
+        CALL_SIMPLE_METHOD();
     }
 }
 
-/**
-  @c optimize
-  @e optimized X-Y.
-  @j 最適化された X-Y。
- */
+/* optimized X-Y. */
 DEFINE_INSN
 opt_minus
-(CALL_INFO ci, CALL_CACHE cc)
+(CALL_DATA cd)
 (VALUE recv, VALUE obj)
 (VALUE val)
 {
-    if (FIXNUM_2_P(recv, obj) &&
-	BASIC_OP_UNREDEFINED_P(BOP_MINUS, INTEGER_REDEFINED_OP_FLAG)) {
-	long a, b, c;
+    val = vm_opt_minus(recv, obj);
 
-	a = FIX2LONG(recv);
-	b = FIX2LONG(obj);
-	c = a - b;
-	val = LONG2NUM(c);
-    }
-    else if (FLONUM_2_P(recv, obj) &&
-	     BASIC_OP_UNREDEFINED_P(BOP_MINUS, FLOAT_REDEFINED_OP_FLAG)) {
-	val = DBL2NUM(RFLOAT_VALUE(recv) - RFLOAT_VALUE(obj));
-    }
-    else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) {
-	if (RBASIC_CLASS(recv) == rb_cFloat && RBASIC_CLASS(obj) == rb_cFloat  &&
-	    BASIC_OP_UNREDEFINED_P(BOP_MINUS, FLOAT_REDEFINED_OP_FLAG)) {
-	    val = DBL2NUM(RFLOAT_VALUE(recv) - RFLOAT_VALUE(obj));
-	}
-	else {
-	    goto INSN_LABEL(normal_dispatch);
-	}
-    }
-    else {
-	/* other */
-      INSN_LABEL(normal_dispatch):
-	PUSH(recv);
-	PUSH(obj);
-	CALL_SIMPLE_METHOD(recv);
+    if (val == Qundef) {
+        CALL_SIMPLE_METHOD();
     }
 }
 
-/**
-  @c optimize
-  @e optimized X*Y.
-  @j 最適化された X*Y。
- */
+/* optimized X*Y. */
 DEFINE_INSN
 opt_mult
-(CALL_INFO ci, CALL_CACHE cc)
+(CALL_DATA cd)
 (VALUE recv, VALUE obj)
 (VALUE val)
 {
-    if (FIXNUM_2_P(recv, obj) &&
-	BASIC_OP_UNREDEFINED_P(BOP_MULT, INTEGER_REDEFINED_OP_FLAG)) {
-	val = rb_fix_mul_fix(recv, obj);
-    }
-    else if (FLONUM_2_P(recv, obj) &&
-	     BASIC_OP_UNREDEFINED_P(BOP_MULT, FLOAT_REDEFINED_OP_FLAG)) {
-	val = DBL2NUM(RFLOAT_VALUE(recv) * RFLOAT_VALUE(obj));
-    }
-    else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) {
-	if (RBASIC_CLASS(recv) == rb_cFloat && RBASIC_CLASS(obj) == rb_cFloat  &&
-	    BASIC_OP_UNREDEFINED_P(BOP_MULT, FLOAT_REDEFINED_OP_FLAG)) {
-	    val = DBL2NUM(RFLOAT_VALUE(recv) * RFLOAT_VALUE(obj));
-	}
-	else {
-	    goto INSN_LABEL(normal_dispatch);
-	}
-    }
-    else {
-      INSN_LABEL(normal_dispatch):
-	PUSH(recv);
-	PUSH(obj);
-	CALL_SIMPLE_METHOD(recv);
+    val = vm_opt_mult(recv, obj);
+
+    if (val == Qundef) {
+        CALL_SIMPLE_METHOD();
     }
 }
 
-/**
-  @c optimize
-  @e optimized X/Y.
-  @j 最適化された X/Y。
- */
+/* optimized X/Y. */
 DEFINE_INSN
 opt_div
-(CALL_INFO ci, CALL_CACHE cc)
+(CALL_DATA cd)
 (VALUE recv, VALUE obj)
 (VALUE val)
+/* In case of division by zero, it raises. Thus
+ * ZeroDivisionError#initialize is called.  */
+// attr bool leaf = false;
 {
-    if (FIXNUM_2_P(recv, obj) &&
-	BASIC_OP_UNREDEFINED_P(BOP_DIV, INTEGER_REDEFINED_OP_FLAG)) {
-	if (FIX2LONG(obj) == 0) goto INSN_LABEL(normal_dispatch);
-	val = rb_fix_div_fix(recv, obj);
-    }
-    else if (FLONUM_2_P(recv, obj) &&
-	     BASIC_OP_UNREDEFINED_P(BOP_DIV, FLOAT_REDEFINED_OP_FLAG)) {
-	val = DBL2NUM(RFLOAT_VALUE(recv) / RFLOAT_VALUE(obj));
-    }
-    else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) {
-	if (RBASIC_CLASS(recv) == rb_cFloat && RBASIC_CLASS(obj) == rb_cFloat  &&
-	    BASIC_OP_UNREDEFINED_P(BOP_DIV, FLOAT_REDEFINED_OP_FLAG)) {
-	    val = DBL2NUM(RFLOAT_VALUE(recv) / RFLOAT_VALUE(obj));
-	}
-	else {
-	    goto INSN_LABEL(normal_dispatch);
-	}
-    }
-    else {
-      INSN_LABEL(normal_dispatch):
-	PUSH(recv);
-	PUSH(obj);
-	CALL_SIMPLE_METHOD(recv);
+    val = vm_opt_div(recv, obj);
+
+    if (val == Qundef) {
+        CALL_SIMPLE_METHOD();
     }
 }
 
-/**
-  @c optimize
-  @e optimized X%Y.
-  @j 最適化された X%Y。
- */
+/* optimized X%Y. */
 DEFINE_INSN
 opt_mod
-(CALL_INFO ci, CALL_CACHE cc)
+(CALL_DATA cd)
 (VALUE recv, VALUE obj)
 (VALUE val)
+/* Same discussion as opt_mod. */
+// attr bool leaf = false;
 {
-    if (FIXNUM_2_P(recv, obj) &&
-	BASIC_OP_UNREDEFINED_P(BOP_MOD, INTEGER_REDEFINED_OP_FLAG )) {
-	if (FIX2LONG(obj) == 0) goto INSN_LABEL(normal_dispatch);
-	val = rb_fix_mod_fix(recv, obj);
-    }
-    else if (FLONUM_2_P(recv, obj) &&
-	     BASIC_OP_UNREDEFINED_P(BOP_MOD, FLOAT_REDEFINED_OP_FLAG)) {
-	val = DBL2NUM(ruby_float_mod(RFLOAT_VALUE(recv), RFLOAT_VALUE(obj)));
-    }
-    else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) {
-	if (RBASIC_CLASS(recv) == rb_cFloat && RBASIC_CLASS(obj) == rb_cFloat &&
-	    BASIC_OP_UNREDEFINED_P(BOP_MOD, FLOAT_REDEFINED_OP_FLAG)) {
-	    val = DBL2NUM(ruby_float_mod(RFLOAT_VALUE(recv), RFLOAT_VALUE(obj)));
-	}
-	else {
-	    goto INSN_LABEL(normal_dispatch);
-	}
-    }
-    else {
-      INSN_LABEL(normal_dispatch):
-	PUSH(recv);
-	PUSH(obj);
-	CALL_SIMPLE_METHOD(recv);
+    val = vm_opt_mod(recv, obj);
+
+    if (val == Qundef) {
+        CALL_SIMPLE_METHOD();
     }
 }
 
-/**
-  @c optimize
-  @e optimized X==Y.
-  @j 最適化された X==Y。
- */
+/* optimized X==Y. */
 DEFINE_INSN
 opt_eq
-(CALL_INFO ci, CALL_CACHE cc)
+(CALL_DATA cd)
 (VALUE recv, VALUE obj)
 (VALUE val)
 {
-    val = opt_eq_func(recv, obj, ci, cc);
+    val = opt_equality(GET_ISEQ(), recv, obj, cd);
 
     if (val == Qundef) {
-	/* other */
-	PUSH(recv);
-	PUSH(obj);
-	CALL_SIMPLE_METHOD(recv);
+        CALL_SIMPLE_METHOD();
     }
 }
 
-/**
-  @c optimize
-  @e optimized X!=Y.
-  @j 最適化された X!=Y。
- */
+/* optimized X!=Y. */
 DEFINE_INSN
 opt_neq
-(CALL_INFO ci, CALL_CACHE cc, CALL_INFO ci_eq, CALL_CACHE cc_eq)
+(CALL_DATA cd_eq, CALL_DATA cd)
 (VALUE recv, VALUE obj)
 (VALUE val)
 {
-    extern VALUE rb_obj_not_equal(VALUE obj1, VALUE obj2);
-    vm_search_method(ci, cc, recv);
-
-    val = Qundef;
-
-    if (check_cfunc(cc->me, rb_obj_not_equal)) {
-	val = opt_eq_func(recv, obj, ci_eq, cc_eq);
-
-	if (val != Qundef) {
-	    val = RTEST(val) ? Qfalse : Qtrue;
-	}
-    }
+    val = vm_opt_neq(GET_ISEQ(), cd, cd_eq, recv, obj);
 
     if (val == Qundef) {
-	/* other */
-	PUSH(recv);
-	PUSH(obj);
-	CALL_SIMPLE_METHOD(recv);
+        CALL_SIMPLE_METHOD();
     }
 }
 
-/**
-  @c optimize
-  @e optimized X<Y.
-  @j 最適化された X<Y。
- */
+/* optimized X<Y. */
 DEFINE_INSN
 opt_lt
-(CALL_INFO ci, CALL_CACHE cc)
+(CALL_DATA cd)
 (VALUE recv, VALUE obj)
 (VALUE val)
 {
-    if (FIXNUM_2_P(recv, obj) &&
-	BASIC_OP_UNREDEFINED_P(BOP_LT, INTEGER_REDEFINED_OP_FLAG)) {
-	SIGNED_VALUE a = recv, b = obj;
+    val = vm_opt_lt(recv, obj);
 
-	if (a < b) {
-	    val = Qtrue;
-	}
-	else {
-	    val = Qfalse;
-	}
-    }
-    else if (FLONUM_2_P(recv, obj) &&
-	     BASIC_OP_UNREDEFINED_P(BOP_LT, FLOAT_REDEFINED_OP_FLAG)) {
-	/* flonum is not NaN */
-	val = RFLOAT_VALUE(recv) < RFLOAT_VALUE(obj) ? Qtrue : Qfalse;
-    }
-    else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) {
-	if (RBASIC_CLASS(recv) == rb_cFloat && RBASIC_CLASS(obj) == rb_cFloat  &&
-	    BASIC_OP_UNREDEFINED_P(BOP_LT, FLOAT_REDEFINED_OP_FLAG)) {
-	    val = double_cmp_lt(RFLOAT_VALUE(recv), RFLOAT_VALUE(obj));
-	}
-	else {
-	    goto INSN_LABEL(normal_dispatch);
-	}
-    }
-    else {
-      INSN_LABEL(normal_dispatch):
-	PUSH(recv);
-	PUSH(obj);
-	CALL_SIMPLE_METHOD(recv);
+    if (val == Qundef) {
+        CALL_SIMPLE_METHOD();
     }
 }
 
-/**
-  @c optimize
-  @e optimized X<=Y.
-  @j 最適化された X<=Y。
- */
+/* optimized X<=Y. */
 DEFINE_INSN
 opt_le
-(CALL_INFO ci, CALL_CACHE cc)
+(CALL_DATA cd)
 (VALUE recv, VALUE obj)
 (VALUE val)
 {
-    if (FIXNUM_2_P(recv, obj) &&
-	BASIC_OP_UNREDEFINED_P(BOP_LE, INTEGER_REDEFINED_OP_FLAG)) {
-	SIGNED_VALUE a = recv, b = obj;
+    val = vm_opt_le(recv, obj);
 
-	if (a <= b) {
-	    val = Qtrue;
-	}
-	else {
-	    val = Qfalse;
-	}
-    }
-    else if (FLONUM_2_P(recv, obj) &&
-	     BASIC_OP_UNREDEFINED_P(BOP_LE, FLOAT_REDEFINED_OP_FLAG)) {
-	/* flonum is not NaN */
-	val = RFLOAT_VALUE(recv) <= RFLOAT_VALUE(obj) ? Qtrue : Qfalse;
-    }
-    else {
-	/* other */
-	PUSH(recv);
-	PUSH(obj);
-	CALL_SIMPLE_METHOD(recv);
+    if (val == Qundef) {
+        CALL_SIMPLE_METHOD();
     }
 }
 
-/**
-  @c optimize
-  @e optimized X>Y.
-  @j 最適化された X>Y。
- */
+/* optimized X>Y. */
 DEFINE_INSN
 opt_gt
-(CALL_INFO ci, CALL_CACHE cc)
+(CALL_DATA cd)
 (VALUE recv, VALUE obj)
 (VALUE val)
 {
-    if (FIXNUM_2_P(recv, obj) &&
-	BASIC_OP_UNREDEFINED_P(BOP_GT, INTEGER_REDEFINED_OP_FLAG)) {
-	SIGNED_VALUE a = recv, b = obj;
+    val = vm_opt_gt(recv, obj);
 
-	if (a > b) {
-	    val = Qtrue;
-	}
-	else {
-	    val = Qfalse;
-	}
-    }
-    else if (FLONUM_2_P(recv, obj) &&
-	     BASIC_OP_UNREDEFINED_P(BOP_GT, FLOAT_REDEFINED_OP_FLAG)) {
-	/* flonum is not NaN */
-	val = RFLOAT_VALUE(recv) > RFLOAT_VALUE(obj) ? Qtrue : Qfalse;
-    }
-    else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) {
-	if (RBASIC_CLASS(recv) == rb_cFloat && RBASIC_CLASS(obj) == rb_cFloat  &&
-	    BASIC_OP_UNREDEFINED_P(BOP_GT, FLOAT_REDEFINED_OP_FLAG)) {
-	    val = double_cmp_gt(RFLOAT_VALUE(recv), RFLOAT_VALUE(obj));
-	}
-	else {
-	    goto INSN_LABEL(normal_dispatch);
-	}
-    }
-    else {
-      INSN_LABEL(normal_dispatch):
-	PUSH(recv);
-	PUSH(obj);
-	CALL_SIMPLE_METHOD(recv);
+    if (val == Qundef) {
+        CALL_SIMPLE_METHOD();
     }
 }
 
-/**
-  @c optimize
-  @e optimized X>=Y.
-  @j 最適化された X>=Y。
- */
+/* optimized X>=Y. */
 DEFINE_INSN
 opt_ge
-(CALL_INFO ci, CALL_CACHE cc)
+(CALL_DATA cd)
 (VALUE recv, VALUE obj)
 (VALUE val)
 {
-    if (FIXNUM_2_P(recv, obj) &&
-	BASIC_OP_UNREDEFINED_P(BOP_GE, INTEGER_REDEFINED_OP_FLAG)) {
-	SIGNED_VALUE a = recv, b = obj;
+    val = vm_opt_ge(recv, obj);
 
-	if (a >= b) {
-	    val = Qtrue;
-	}
-	else {
-	    val = Qfalse;
-	}
-    }
-    else if (FLONUM_2_P(recv, obj) &&
-	     BASIC_OP_UNREDEFINED_P(BOP_GE, FLOAT_REDEFINED_OP_FLAG)) {
-	/* flonum is not NaN */
-	val = RFLOAT_VALUE(recv) >= RFLOAT_VALUE(obj) ? Qtrue : Qfalse;
-    }
-    else {
-	PUSH(recv);
-	PUSH(obj);
-	CALL_SIMPLE_METHOD(recv);
+    if (val == Qundef) {
+        CALL_SIMPLE_METHOD();
     }
 }
 
-/**
-  @c optimize
-  @e <<
-  @j 最適化された X<<Y。
- */
+/* << */
 DEFINE_INSN
 opt_ltlt
-(CALL_INFO ci, CALL_CACHE cc)
+(CALL_DATA cd)
 (VALUE recv, VALUE obj)
 (VALUE val)
+/* This instruction can append an integer, as a codepoint, into a
+ * string.  Then what happens if that codepoint does not exist in the
+ * string's encoding?  Of course an exception.  That's not a leaf. */
+// attr bool leaf = false; /* has "invalid codepoint" exception */
 {
-    if (!SPECIAL_CONST_P(recv)) {
-	if (RBASIC_CLASS(recv) == rb_cString &&
-	    BASIC_OP_UNREDEFINED_P(BOP_LTLT, STRING_REDEFINED_OP_FLAG)) {
-	    val = rb_str_concat(recv, obj);
-	}
-	else if (RBASIC_CLASS(recv) == rb_cArray &&
-		 BASIC_OP_UNREDEFINED_P(BOP_LTLT, ARRAY_REDEFINED_OP_FLAG)) {
-	    val = rb_ary_push(recv, obj);
-	}
-	else {
-	    goto INSN_LABEL(normal_dispatch);
-	}
+    val = vm_opt_ltlt(recv, obj);
+
+    if (val == Qundef) {
+        CALL_SIMPLE_METHOD();
     }
-    else {
-      INSN_LABEL(normal_dispatch):
-	PUSH(recv);
-	PUSH(obj);
-	CALL_SIMPLE_METHOD(recv);
+}
+
+/* optimized X&Y. */
+DEFINE_INSN
+opt_and
+(CALL_DATA cd)
+(VALUE recv, VALUE obj)
+(VALUE val)
+{
+    val = vm_opt_and(recv, obj);
+
+    if (val == Qundef) {
+        CALL_SIMPLE_METHOD();
     }
 }
 
-/**
-  @c optimize
-  @e []
-  @j 最適化された recv[obj]。
- */
+/* optimized X|Y. */
 DEFINE_INSN
-opt_aref
-(CALL_INFO ci, CALL_CACHE cc)
+opt_or
+(CALL_DATA cd)
 (VALUE recv, VALUE obj)
 (VALUE val)
 {
-    if (!SPECIAL_CONST_P(recv)) {
-	if (RBASIC_CLASS(recv) == rb_cArray && BASIC_OP_UNREDEFINED_P(BOP_AREF, ARRAY_REDEFINED_OP_FLAG) && FIXNUM_P(obj)) {
-	    val = rb_ary_entry(recv, FIX2LONG(obj));
-	}
-	else if (RBASIC_CLASS(recv) == rb_cHash && BASIC_OP_UNREDEFINED_P(BOP_AREF, HASH_REDEFINED_OP_FLAG)) {
-	    val = rb_hash_aref(recv, obj);
-	}
-	else {
-	    goto INSN_LABEL(normal_dispatch);
-	}
+    val = vm_opt_or(recv, obj);
+
+    if (val == Qundef) {
+        CALL_SIMPLE_METHOD();
     }
-    else {
-      INSN_LABEL(normal_dispatch):
-	PUSH(recv);
-	PUSH(obj);
-	CALL_SIMPLE_METHOD(recv);
+}
+
+/* [] */
+DEFINE_INSN
+opt_aref
+(CALL_DATA cd)
+(VALUE recv, VALUE obj)
+(VALUE val)
+/* This is complicated.  In case of hash, vm_opt_aref() resorts to
+ * rb_hash_aref().  If `recv` has no `obj`, this function then yields
+ * default_proc.  This is a method call.  So opt_aref is
+ * (surprisingly) not leaf. */
+// attr bool leaf = false; /* has rb_funcall() */ /* calls #yield */
+{
+    val = vm_opt_aref(recv, obj);
+
+    if (val == Qundef) {
+        CALL_SIMPLE_METHOD();
     }
 }
 
-/**
-  @c optimize
-  @e recv[obj] = set
-  @j 最適化された recv[obj] = set。
- */
+/* recv[obj] = set */
 DEFINE_INSN
 opt_aset
-(CALL_INFO ci, CALL_CACHE cc)
+(CALL_DATA cd)
 (VALUE recv, VALUE obj, VALUE set)
 (VALUE val)
+/* This is another story than opt_aref.  When vm_opt_aset() resorts
+ * to rb_hash_aset(), which should call #hash for `obj`. */
+// attr bool leaf = false; /* has rb_funcall() */ /* calls #hash */
 {
-    if (!SPECIAL_CONST_P(recv)) {
-	if (RBASIC_CLASS(recv) == rb_cArray && BASIC_OP_UNREDEFINED_P(BOP_ASET, ARRAY_REDEFINED_OP_FLAG) && FIXNUM_P(obj)) {
-	    rb_ary_store(recv, FIX2LONG(obj), set);
-	    val = set;
-	}
-	else if (RBASIC_CLASS(recv) == rb_cHash && BASIC_OP_UNREDEFINED_P(BOP_ASET, HASH_REDEFINED_OP_FLAG)) {
-	    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(recv);
+    val = vm_opt_aset(recv, obj, set);
+
+    if (val == Qundef) {
+        CALL_SIMPLE_METHOD();
     }
 }
 
-/**
-  @c optimize
-  @e recv[str] = set
-  @j 最適化された recv[str] = set。
- */
+/* recv[str] = set */
 DEFINE_INSN
 opt_aset_with
-(CALL_INFO ci, CALL_CACHE cc, VALUE key)
+(VALUE key, CALL_DATA cd)
 (VALUE recv, VALUE val)
 (VALUE val)
+/* Same discussion as opt_aset. */
+// attr bool leaf = false; /* has rb_funcall() */ /* calls #hash */
 {
-    if (!SPECIAL_CONST_P(recv) && RBASIC_CLASS(recv) == rb_cHash && BASIC_OP_UNREDEFINED_P(BOP_ASET, HASH_REDEFINED_OP_FLAG)) {
-	rb_hash_aset(recv, key, val);
+    VALUE tmp = vm_opt_aset_with(recv, key, val);
+
+    if (tmp != Qundef) {
+	val = tmp;
     }
     else {
-	PUSH(recv);
-	PUSH(rb_str_resurrect(key));
+#ifndef MJIT_HEADER
+	TOPN(0) = rb_str_resurrect(key);
 	PUSH(val);
-	CALL_SIMPLE_METHOD(recv);
+#endif
+        CALL_SIMPLE_METHOD();
     }
 }
 
-/**
-  @c optimize
-  @e recv[str]
-  @j 最適化された recv[str]。
- */
+/* recv[str] */
 DEFINE_INSN
 opt_aref_with
-(CALL_INFO ci, CALL_CACHE cc, VALUE key)
+(VALUE key, CALL_DATA cd)
 (VALUE recv)
 (VALUE val)
+/* Same discussion as opt_aref. */
+// attr bool leaf = false; /* has rb_funcall() */ /* calls #yield */
 {
-    if (!SPECIAL_CONST_P(recv) && RBASIC_CLASS(recv) == rb_cHash && BASIC_OP_UNREDEFINED_P(BOP_AREF, HASH_REDEFINED_OP_FLAG)) {
-	val = rb_hash_aref(recv, key);
-    }
-    else {
-	PUSH(recv);
+    val = vm_opt_aref_with(recv, key);
+
+    if (val == Qundef) {
+#ifndef MJIT_HEADER
 	PUSH(rb_str_resurrect(key));
-	CALL_SIMPLE_METHOD(recv);
+#endif
+        CALL_SIMPLE_METHOD();
     }
 }
 
-/**
-  @c optimize
-  @e optimized length
-  @j 最適化された recv.length()。
- */
+/* optimized length */
 DEFINE_INSN
 opt_length
-(CALL_INFO ci, CALL_CACHE cc)
+(CALL_DATA cd)
 (VALUE recv)
 (VALUE val)
 {
-    if (!SPECIAL_CONST_P(recv)) {
-	if (RBASIC_CLASS(recv) == rb_cString &&
-	    BASIC_OP_UNREDEFINED_P(BOP_LENGTH, STRING_REDEFINED_OP_FLAG)) {
-	    val = rb_str_length(recv);
-	}
-	else if (RBASIC_CLASS(recv) == rb_cArray &&
-		 BASIC_OP_UNREDEFINED_P(BOP_LENGTH, ARRAY_REDEFINED_OP_FLAG)) {
-	    val = LONG2NUM(RARRAY_LEN(recv));
-	}
-	else if (RBASIC_CLASS(recv) == rb_cHash &&
-		 BASIC_OP_UNREDEFINED_P(BOP_LENGTH, HASH_REDEFINED_OP_FLAG)) {
-	    val = INT2FIX(RHASH_SIZE(recv));
-	}
-	else {
-	    goto INSN_LABEL(normal_dispatch);
-	}
-    }
-    else {
-      INSN_LABEL(normal_dispatch):
-	PUSH(recv);
-	CALL_SIMPLE_METHOD(recv);
+    val = vm_opt_length(recv, BOP_LENGTH);
+
+    if (val == Qundef) {
+        CALL_SIMPLE_METHOD();
     }
 }
 
-/**
-  @c optimize
-  @e optimized size
-  @j 最適化された recv.size()。
- */
+/* optimized size */
 DEFINE_INSN
 opt_size
-(CALL_INFO ci, CALL_CACHE cc)
+(CALL_DATA cd)
 (VALUE recv)
 (VALUE val)
 {
-    if (!SPECIAL_CONST_P(recv)) {
-	if (RBASIC_CLASS(recv) == rb_cString &&
-	    BASIC_OP_UNREDEFINED_P(BOP_SIZE, STRING_REDEFINED_OP_FLAG)) {
-	    val = rb_str_length(recv);
-	}
-	else if (RBASIC_CLASS(recv) == rb_cArray &&
-		 BASIC_OP_UNREDEFINED_P(BOP_SIZE, ARRAY_REDEFINED_OP_FLAG)) {
-	    val = LONG2NUM(RARRAY_LEN(recv));
-	}
-	else if (RBASIC_CLASS(recv) == rb_cHash &&
-		 BASIC_OP_UNREDEFINED_P(BOP_SIZE, HASH_REDEFINED_OP_FLAG)) {
-	    val = INT2FIX(RHASH_SIZE(recv));
-	}
-	else {
-	    goto INSN_LABEL(normal_dispatch);
-	}
-    }
-    else {
-      INSN_LABEL(normal_dispatch):
-	PUSH(recv);
-	CALL_SIMPLE_METHOD(recv);
+    val = vm_opt_length(recv, BOP_SIZE);
+
+    if (val == Qundef) {
+        CALL_SIMPLE_METHOD();
     }
 }
 
-/**
-  @c optimize
-  @e optimized empty?
-  @j 最適化された recv.empty?()。
- */
+/* optimized empty? */
 DEFINE_INSN
 opt_empty_p
-(CALL_INFO ci, CALL_CACHE cc)
+(CALL_DATA cd)
 (VALUE recv)
 (VALUE val)
 {
-    if (!SPECIAL_CONST_P(recv)) {
-	if (RBASIC_CLASS(recv) == rb_cString &&
-	    BASIC_OP_UNREDEFINED_P(BOP_EMPTY_P, STRING_REDEFINED_OP_FLAG)) {
-	    if (RSTRING_LEN(recv) == 0) val = Qtrue;
-	    else val = Qfalse;
-	}
-	else if (RBASIC_CLASS(recv) == rb_cArray &&
-		 BASIC_OP_UNREDEFINED_P(BOP_EMPTY_P, ARRAY_REDEFINED_OP_FLAG)) {
-	    if (RARRAY_LEN(recv) == 0) val = Qtrue;
-	    else val = Qfalse;
-	}
-	else if (RBASIC_CLASS(recv) == rb_cHash &&
-		 BASIC_OP_UNREDEFINED_P(BOP_EMPTY_P, HASH_REDEFINED_OP_FLAG)) {
-	    if (RHASH_EMPTY_P(recv)) val = Qtrue;
-	    else val = Qfalse;
-	}
-	else {
-	    goto INSN_LABEL(normal_dispatch);
-	}
-    }
-    else {
-      INSN_LABEL(normal_dispatch):
-	PUSH(recv);
-	CALL_SIMPLE_METHOD(recv);
+    val = vm_opt_empty_p(recv);
+
+    if (val == Qundef) {
+        CALL_SIMPLE_METHOD();
     }
 }
 
-/**
-  @c optimize
-  @e optimized succ
-  @j 最適化された recv.succ()。
- */
+/* optimized succ */
 DEFINE_INSN
 opt_succ
-(CALL_INFO ci, CALL_CACHE cc)
+(CALL_DATA cd)
 (VALUE recv)
 (VALUE val)
 {
-    if (SPECIAL_CONST_P(recv)) {
-	if (FIXNUM_P(recv) &&
-	    BASIC_OP_UNREDEFINED_P(BOP_SUCC, INTEGER_REDEFINED_OP_FLAG)) {
-	    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 (RBASIC_CLASS(recv) == rb_cString &&
-	    BASIC_OP_UNREDEFINED_P(BOP_SUCC, STRING_REDEFINED_OP_FLAG)) {
-	    val = rb_str_succ(recv);
-	}
-	else
-	  {
-	    goto INSN_LABEL(normal_dispatch);
-	}
-    }
-    if (0) {
-      INSN_LABEL(normal_dispatch):
-	PUSH(recv);
-	CALL_SIMPLE_METHOD(recv);
+    val = vm_opt_succ(recv);
+
+    if (val == Qundef) {
+        CALL_SIMPLE_METHOD();
     }
 }
 
-/**
-  @c optimize
-  @e optimized not
-  @j 最適化された recv.!()。
- */
+/* optimized not */
 DEFINE_INSN
 opt_not
-(CALL_INFO ci, CALL_CACHE cc)
+(CALL_DATA cd)
 (VALUE recv)
 (VALUE val)
 {
-    vm_search_method(ci, cc, recv);
+    val = vm_opt_not(GET_ISEQ(), cd, recv);
 
-    if (check_cfunc(cc->me, rb_obj_not)) {
-	val = RTEST(recv) ? Qfalse : Qtrue;
-    }
-    else {
-	PUSH(recv);
-	CALL_SIMPLE_METHOD(recv);
-    }
-}
-
-
-/**
-  @c optimize
-  @e optimized regexp match
-  @j 最適化された正規表現マッチ。
- */
-DEFINE_INSN
-opt_regexpmatch1
-(VALUE r)
-(VALUE obj)
-(VALUE val)
-{
-    if (BASIC_OP_UNREDEFINED_P(BOP_MATCH, REGEXP_REDEFINED_OP_FLAG)) {
-	val = rb_reg_match(r, obj);
-    }
-    else {
-	val = rb_funcall(r, idEqTilde, 1, obj);
+    if (val == Qundef) {
+        CALL_SIMPLE_METHOD();
     }
 }
 
-/**
-  @c optimize
-  @e optimized regexp match 2
-  @j 最適化された正規表現マッチ 2
- */
+/* optimized regexp match 2 */
 DEFINE_INSN
 opt_regexpmatch2
-(CALL_INFO ci, CALL_CACHE cc)
+(CALL_DATA cd)
 (VALUE obj2, VALUE obj1)
 (VALUE val)
+// attr bool leaf = false; /* match_at() has rb_thread_check_ints() */
 {
-    if (CLASS_OF(obj2) == rb_cString &&
-	BASIC_OP_UNREDEFINED_P(BOP_MATCH, STRING_REDEFINED_OP_FLAG)) {
-	val = rb_reg_match(obj1, obj2);
-    }
-    else {
-	PUSH(obj2);
-	PUSH(obj1);
-	CALL_SIMPLE_METHOD(obj2);
+    val = vm_opt_regexpmatch2(obj2, obj1);
+
+    if (val == Qundef) {
+        CALL_SIMPLE_METHOD();
     }
 }
 
-/**
-  @c optimize
-  @e call native compiled method
-  @j ネイティブコンパイルしたメソッドを起動。
- */
-DEFINE_INSN
+/* call native compiled method */
+DEFINE_INSN_IF(SUPPORT_CALL_C_FUNCTION)
 opt_call_c_function
 (rb_insn_func_t funcptr)
 ()
 ()
+// attr bool leaf = false; /* anything can happen inside */
+// attr bool handles_sp = true;
 {
-    reg_cfp = (funcptr)(th, reg_cfp);
+    reg_cfp = (funcptr)(ec, reg_cfp);
 
     if (reg_cfp == 0) {
-	VALUE err = th->errinfo;
-	th->errinfo = Qnil;
+	VALUE err = ec->errinfo;
+	ec->errinfo = Qnil;
 	THROW_EXCEPTION(err);
     }
 
@@ -2162,12 +1459,56 @@ opt_call_c_function
     NEXT_INSN();
 }
 
-/**
-  @c joke
-  @e BLT
-  @j BLT
- */
+/* call specific function with args */
 DEFINE_INSN
+invokebuiltin
+(RB_BUILTIN bf)
+(...)
+(VALUE val)
+// attr bool leaf = false; /* anything can happen inside */
+// attr rb_snum_t sp_inc = 1 - bf->argc;
+{
+    val = vm_invoke_builtin(ec, reg_cfp, bf, STACK_ADDR_FROM_TOP(bf->argc));
+}
+
+/* call specific function with args (same parameters) */
+DEFINE_INSN
+opt_invokebuiltin_delegate
+(RB_BUILTIN bf, rb_num_t index)
+()
+(VALUE val)
+// attr bool leaf = false; /* anything can happen inside */
+{
+    val = vm_invoke_builtin_delegate(ec, reg_cfp, bf, (unsigned int)index);
+}
+
+/* call specific function with args (same parameters) and leave */
+DEFINE_INSN
+opt_invokebuiltin_delegate_leave
+(RB_BUILTIN bf, rb_num_t index)
+()
+(VALUE val)
+// attr bool leaf = false; /* anything can happen inside */
+{
+    val = vm_invoke_builtin_delegate(ec, reg_cfp, bf, (unsigned int)index);
+
+    /* leave fastpath */
+    /* TracePoint/return fallbacks this insn to opt_invokebuiltin_delegate */
+    if (vm_pop_frame(ec, GET_CFP(), GET_EP())) {
+#if OPT_CALL_THREADED_CODE
+        rb_ec_thread_ptr(ec)->retval = val;
+        return 0;
+#else
+        return val;
+#endif
+    }
+    else {
+        RESTORE_REGS();
+    }
+}
+
+/* BLT */
+DEFINE_INSN_IF(SUPPORT_JOKE)
 bitblt
 ()
 ()
@@ -2176,12 +1517,8 @@ bitblt
     ret = rb_str_new2("a bit of bacon, lettuce and tomato");
 }
 
-/**
-  @c joke
-  @e The Answer to Life, the Universe, and Everything
-  @j 人生、宇宙、すべての答え。
- */
-DEFINE_INSN
+/* The Answer to Life, the Universe, and Everything */
+DEFINE_INSN_IF(SUPPORT_JOKE)
 answer
 ()
 ()
@@ -2189,4 +1526,3 @@ answer
 {
     ret = INT2FIX(42);
 }
-
diff --git a/integer.rb b/integer.rb
new file mode 100644
index 0000000000..d18494f42f
--- /dev/null
+++ b/integer.rb
@@ -0,0 +1,150 @@
+class Integer
+  # call-seq:
+  #    -int  ->  integer
+  #
+  # Returns +int+, negated.
+  def -@
+    Primitive.attr! 'inline'
+    Primitive.cexpr! 'rb_int_uminus(self)'
+  end
+
+  # call-seq:
+  #   ~int  ->  integer
+  #
+  # One's complement: returns a number where each bit is flipped.
+  #
+  # Inverts the bits in an Integer. As integers are conceptually of
+  # infinite length, the result acts as if it had an infinite number of
+  # one bits to the left. In hex representations, this is displayed
+  # as two periods to the left of the digits.
+  #
+  #   sprintf("%X", ~0x1122334455)    #=> "..FEEDDCCBBAA"
+  def ~
+    Primitive.attr! 'inline'
+    Primitive.cexpr! 'rb_int_comp(self)'
+  end
+
+  def abs
+    Primitive.attr! 'inline'
+    Primitive.cexpr! 'rb_int_abs(self)'
+  end
+
+  # call-seq:
+  #    int.bit_length  ->  integer
+  #
+  # Returns the number of bits of the value of +int+.
+  #
+  # "Number of bits" means the bit position of the highest bit
+  # which is different from the sign bit
+  # (where the least significant bit has bit position 1).
+  # If there is no such bit (zero or minus one), zero is returned.
+  #
+  # I.e. this method returns <i>ceil(log2(int < 0 ? -int : int+1))</i>.
+  #
+  #    (-2**1000-1).bit_length   #=> 1001
+  #    (-2**1000).bit_length     #=> 1000
+  #    (-2**1000+1).bit_length   #=> 1000
+  #    (-2**12-1).bit_length     #=> 13
+  #    (-2**12).bit_length       #=> 12
+  #    (-2**12+1).bit_length     #=> 12
+  #    -0x101.bit_length         #=> 9
+  #    -0x100.bit_length         #=> 8
+  #    -0xff.bit_length          #=> 8
+  #    -2.bit_length             #=> 1
+  #    -1.bit_length             #=> 0
+  #    0.bit_length              #=> 0
+  #    1.bit_length              #=> 1
+  #    0xff.bit_length           #=> 8
+  #    0x100.bit_length          #=> 9
+  #    (2**12-1).bit_length      #=> 12
+  #    (2**12).bit_length        #=> 13
+  #    (2**12+1).bit_length      #=> 13
+  #    (2**1000-1).bit_length    #=> 1000
+  #    (2**1000).bit_length      #=> 1001
+  #    (2**1000+1).bit_length    #=> 1001
+  #
+  # This method can be used to detect overflow in Array#pack as follows:
+  #
+  #    if n.bit_length < 32
+  #      [n].pack("l") # no overflow
+  #    else
+  #      raise "overflow"
+  #    end
+  def bit_length
+    Primitive.attr! 'inline'
+    Primitive.cexpr! 'rb_int_bit_length(self)'
+  end
+
+  #  call-seq:
+  #     int.even?  ->  true or false
+  #
+  #  Returns +true+ if +int+ is an even number.
+  def even?
+    Primitive.attr! 'inline'
+    Primitive.cexpr! 'rb_int_even_p(self)'
+  end
+
+  #  call-seq:
+  #     int.integer?  ->  true
+  #
+  #  Since +int+ is already an Integer, this always returns +true+.
+  def integer?
+    return true
+  end
+
+  def magnitude
+    Primitive.attr! 'inline'
+    Primitive.cexpr! 'rb_int_abs(self)'
+  end
+
+  #  call-seq:
+  #     int.odd?  ->  true or false
+  #
+  #  Returns +true+ if +int+ is an odd number.
+  def odd?
+    Primitive.attr! 'inline'
+    Primitive.cexpr! 'rb_int_odd_p(self)'
+  end
+
+  #  call-seq:
+  #     int.ord  ->  self
+  #
+  #  Returns the +int+ itself.
+  #
+  #     97.ord   #=> 97
+  #
+  #  This method is intended for compatibility to character literals
+  #  in Ruby 1.9.
+  #
+  #  For example, <code>?a.ord</code> returns 97 both in 1.8 and 1.9.
+  def ord
+    return self
+  end
+
+  #  call-seq:
+  #     int.to_i    ->  integer
+  #
+  #  Since +int+ is already an Integer, returns +self+.
+  #
+  #  #to_int is an alias for #to_i.
+  def to_i
+    return self
+  end
+
+  #  call-seq:
+  #     int.to_int  ->  integer
+  #
+  #  Since +int+ is already an Integer, returns +self+.
+  def to_int
+    return self
+  end
+
+  # call-seq:
+  #    int.zero? -> true or false
+  #
+  # Returns +true+ if +int+ has a zero value.
+  def zero?
+    Primitive.attr! 'inline'
+    Primitive.cexpr! 'rb_int_zero_p(self)'
+  end
+end
diff --git a/internal.h b/internal.h
index ca866d8dd5..c3b3a799b1 100644
--- a/internal.h
+++ b/internal.h
@@ -1,1640 +1,107 @@
-/**********************************************************************
-
-  internal.h -
-
-  $Author$
-  created at: Tue May 17 11:42:20 JST 2011
-
-  Copyright (C) 2011 Yukihiro Matsumoto
-
-**********************************************************************/
-
-#ifndef RUBY_INTERNAL_H
+#ifndef RUBY_INTERNAL_H                                  /*-*-C-*-vi:se ft=c:*/
 #define RUBY_INTERNAL_H 1
+/**
+ * @file
+ * @author     $Author$
+ * @date       Tue May 17 11:42:20 JST 2011
+ * @copyright  Copyright (C) 2011 Yukihiro Matsumoto
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ */
+#include "ruby/internal/config.h"
 
-#include "ruby.h"
-#include "ruby/encoding.h"
-#include "ruby/io.h"
-
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
+#ifdef __cplusplus
+# error not for C++
 #endif
 
 #define LIKELY(x) RB_LIKELY(x)
 #define UNLIKELY(x) RB_UNLIKELY(x)
 
-#ifndef __has_attribute
-# define __has_attribute(x) 0
-#endif
-
-#if __has_attribute(__unused__)
-#define UNINITIALIZED_VAR(x) x __attribute__((__unused__))
-#elif defined(__GNUC__) && __GNUC__ >= 3
-#define UNINITIALIZED_VAR(x) x = x
-#else
-#define UNINITIALIZED_VAR(x) x
-#endif
-
-#if __has_attribute(__warn_unused_result__)
-#define WARN_UNUSED_RESULT(x) x __attribute__((__warn_unused_result__))
-#elif GCC_VERSION_SINCE(3,4,0)
-#define WARN_UNUSED_RESULT(x) x __attribute__((__warn_unused_result__))
-#else
-#define WARN_UNUSED_RESULT(x) x
-#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) 0
-# define VALGRIND_MAKE_MEM_UNDEFINED(p, n) 0
-#endif
-
 #define numberof(array) ((int)(sizeof(array) / sizeof((array)[0])))
-
-#ifndef __has_feature
-# define __has_feature(x) 0
-#endif
-
-#ifndef __has_extension
-# define __has_extension __has_feature
-#endif
-
-#if GCC_VERSION_SINCE(4, 6, 0) || __has_extension(c_static_assert)
-# define STATIC_ASSERT(name, expr) _Static_assert(expr, #name ": " #expr)
-#else
-# define STATIC_ASSERT(name, expr) typedef int static_assert_##name##_check[1 - 2*!(expr)]
-#endif
-
-#define SIGNED_INTEGER_TYPE_P(int_type) (0 > ((int_type)0)-1)
-#define SIGNED_INTEGER_MAX(sint_type) \
-  (sint_type) \
-  ((((sint_type)1) << (sizeof(sint_type) * CHAR_BIT - 2)) | \
-  ((((sint_type)1) << (sizeof(sint_type) * CHAR_BIT - 2)) - 1))
-#define SIGNED_INTEGER_MIN(sint_type) (-SIGNED_INTEGER_MAX(sint_type)-1)
-#define UNSIGNED_INTEGER_MAX(uint_type) (~(uint_type)0)
-
-#if SIGNEDNESS_OF_TIME_T < 0	/* signed */
-# define TIMET_MAX SIGNED_INTEGER_MAX(time_t)
-# define TIMET_MIN SIGNED_INTEGER_MIN(time_t)
-#elif SIGNEDNESS_OF_TIME_T > 0	/* unsigned */
-# define TIMET_MAX UNSIGNED_INTEGER_MAX(time_t)
-# define TIMET_MIN ((time_t)0)
-#endif
-#define TIMET_MAX_PLUS_ONE (2*(double)(TIMET_MAX/2+1))
-
-#define MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, min, max) ( \
-    (a) == 0 ? 0 : \
-    (a) == -1 ? (b) < -(max) : \
-    (a) > 0 ? \
-      ((b) > 0 ? (max) / (a) < (b) : (min) / (a) > (b)) : \
-      ((b) > 0 ? (min) / (a) < (b) : (max) / (a) > (b)))
-#define MUL_OVERFLOW_FIXNUM_P(a, b) MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, FIXNUM_MIN, FIXNUM_MAX)
-#define MUL_OVERFLOW_LONG_P(a, b) MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, LONG_MIN, LONG_MAX)
-#define MUL_OVERFLOW_INT_P(a, b) MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, INT_MIN, INT_MAX)
-
-#ifndef swap16
-# ifdef HAVE_BUILTIN___BUILTIN_BSWAP16
-#  define swap16(x) __builtin_bswap16(x)
-# endif
-#endif
-
-#ifndef swap16
-# define swap16(x)      ((uint16_t)((((x)&0xFF)<<8) | (((x)>>8)&0xFF)))
-#endif
-
-#ifndef swap32
-# ifdef HAVE_BUILTIN___BUILTIN_BSWAP32
-#  define swap32(x) __builtin_bswap32(x)
-# endif
-#endif
-
-#ifndef swap32
-# define swap32(x)      ((uint32_t)((((x)&0xFF)<<24)    \
-                        |(((x)>>24)&0xFF)       \
-                        |(((x)&0x0000FF00)<<8)  \
-                        |(((x)&0x00FF0000)>>8)  ))
-#endif
-
-#ifndef swap64
-# ifdef HAVE_BUILTIN___BUILTIN_BSWAP64
-#  define swap64(x) __builtin_bswap64(x)
-# endif
-#endif
-
-#ifndef swap64
-# ifdef HAVE_INT64_T
-#  define byte_in_64bit(n) ((uint64_t)0xff << (n))
-#  define swap64(x)       ((uint64_t)((((x)&byte_in_64bit(0))<<56)      \
-                           |(((x)>>56)&0xFF)                    \
-                           |(((x)&byte_in_64bit(8))<<40)        \
-                           |(((x)&byte_in_64bit(48))>>40)       \
-                           |(((x)&byte_in_64bit(16))<<24)       \
-                           |(((x)&byte_in_64bit(40))>>24)       \
-                           |(((x)&byte_in_64bit(24))<<8)        \
-                           |(((x)&byte_in_64bit(32))>>8)))
-# endif
-#endif
-
-static inline int
-nlz_int(unsigned int x)
-{
-#if defined(HAVE_BUILTIN___BUILTIN_CLZ)
-    if (x == 0) return SIZEOF_INT * CHAR_BIT;
-    return __builtin_clz(x);
-#else
-    unsigned int y;
-# if 64 < SIZEOF_INT * CHAR_BIT
-    int n = 128;
-# elif 32 < SIZEOF_INT * CHAR_BIT
-    int n = 64;
-# else
-    int n = 32;
-# endif
-# if 64 < SIZEOF_INT * CHAR_BIT
-    y = x >> 64; if (y) {n -= 64; x = y;}
-# endif
-# if 32 < SIZEOF_INT * CHAR_BIT
-    y = x >> 32; if (y) {n -= 32; x = y;}
-# endif
-    y = x >> 16; if (y) {n -= 16; x = y;}
-    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 (int)(n - x);
-#endif
-}
-
-static inline int
-nlz_long(unsigned long x)
-{
-#if defined(HAVE_BUILTIN___BUILTIN_CLZL)
-    if (x == 0) return SIZEOF_LONG * CHAR_BIT;
-    return __builtin_clzl(x);
-#else
-    unsigned long y;
-# if 64 < SIZEOF_LONG * CHAR_BIT
-    int n = 128;
-# elif 32 < SIZEOF_LONG * CHAR_BIT
-    int n = 64;
-# else
-    int n = 32;
-# endif
-# if 64 < SIZEOF_LONG * CHAR_BIT
-    y = x >> 64; if (y) {n -= 64; x = y;}
-# endif
-# if 32 < SIZEOF_LONG * CHAR_BIT
-    y = x >> 32; if (y) {n -= 32; x = y;}
-# endif
-    y = x >> 16; if (y) {n -= 16; x = y;}
-    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 (int)(n - x);
-#endif
-}
-
-#ifdef HAVE_LONG_LONG
-static inline int
-nlz_long_long(unsigned LONG_LONG x)
-{
-#if defined(HAVE_BUILTIN___BUILTIN_CLZLL)
-    if (x == 0) return SIZEOF_LONG_LONG * CHAR_BIT;
-    return __builtin_clzll(x);
-#else
-    unsigned LONG_LONG y;
-# if 64 < SIZEOF_LONG_LONG * CHAR_BIT
-    int n = 128;
-# elif 32 < SIZEOF_LONG_LONG * CHAR_BIT
-    int n = 64;
-# else
-    int n = 32;
-# endif
-# if 64 < SIZEOF_LONG_LONG * CHAR_BIT
-    y = x >> 64; if (y) {n -= 64; x = y;}
-# endif
-# if 32 < SIZEOF_LONG_LONG * CHAR_BIT
-    y = x >> 32; if (y) {n -= 32; x = y;}
-# endif
-    y = x >> 16; if (y) {n -= 16; x = y;}
-    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 (int)(n - x);
-#endif
-}
-#endif
-
-#ifdef HAVE_UINT128_T
-static inline int
-nlz_int128(uint128_t x)
-{
-    uint128_t y;
-    int n = 128;
-    y = x >> 64; if (y) {n -= 64; x = y;}
-    y = x >> 32; if (y) {n -= 32; x = y;}
-    y = x >> 16; if (y) {n -= 16; x = y;}
-    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 (int)(n - x);
-}
-#endif
-
-static inline int
-nlz_intptr(uintptr_t x) {
-#if SIZEOF_VOIDP == 8
-    return nlz_long_long(x);
-#elif SIZEOF_VOIDP == 4
-    return nlz_int(x);
-#endif
-}
-
-static inline int
-rb_popcount32(uint32_t x) {
-#ifdef HAVE_BUILTIN___BUILTIN_POPCOUNT
-    return __builtin_popcount(x);
-#else
-    x = (x & 0x55555555) + (x >> 1 & 0x55555555);
-    x = (x & 0x33333333) + (x >> 2 & 0x33333333);
-    x = (x & 0x0f0f0f0f) + (x >> 4 & 0x0f0f0f0f);
-    x = (x & 0x001f001f) + (x >> 8 & 0x001f001f);
-    return (x & 0x0000003f) + (x >>16 & 0x0000003f);
-#endif
-}
-
-static inline int
-rb_popcount64(uint64_t x) {
-#ifdef HAVE_BUILTIN___BUILTIN_POPCOUNT
-    return __builtin_popcountll(x);
-#else
-    x = (x & 0x5555555555555555) + (x >> 1 & 0x5555555555555555);
-    x = (x & 0x3333333333333333) + (x >> 2 & 0x3333333333333333);
-    x = (x & 0x0707070707070707) + (x >> 4 & 0x0707070707070707);
-    x = (x & 0x001f001f001f001f) + (x >> 8 & 0x001f001f001f001f);
-    x = (x & 0x0000003f0000003f) + (x >>16 & 0x0000003f0000003f);
-    return (x & 0x7f) + (x >>32 & 0x7f);
-#endif
-}
-
-static inline int
-rb_popcount_intptr(uintptr_t x) {
-#if SIZEOF_VOIDP == 8
-    return rb_popcount64(x);
-#elif SIZEOF_VOIDP == 4
-    return rb_popcount32(x);
-#endif
-}
-
-static inline int
-ntz_int32(uint32_t x) {
-#ifdef HAVE_BUILTIN___BUILTIN_CTZ
-    return __builtin_ctz(x);
-#else
-    return rb_popcount32((~x) & (x-1));
-#endif
-}
-
-static inline int
-ntz_int64(uint64_t x) {
-#ifdef HAVE_BUILTIN___BUILTIN_CTZLL
-    return __builtin_ctzll(x);
-#else
-    return rb_popcount64((~x) & (x-1));
-#endif
-}
-
-static inline int
-ntz_intptr(uintptr_t x) {
-#if SIZEOF_VOIDP == 8
-    return ntz_int64(x);
-#elif SIZEOF_VOIDP == 4
-    return ntz_int32(x);
-#endif
-}
-
-#if HAVE_LONG_LONG && SIZEOF_LONG * 2 <= SIZEOF_LONG_LONG
-# define DLONG LONG_LONG
-# define DL2NUM(x) LL2NUM(x)
-#elif defined(HAVE_INT128_T)
-# define DLONG int128_t
-# define DL2NUM(x) (RB_FIXABLE(x) ? LONG2FIX(x) : rb_int128t2big(x))
-VALUE rb_int128t2big(int128_t n);
-#endif
-
-/* arguments must be Fixnum */
-static inline VALUE
-rb_fix_mul_fix(VALUE x, VALUE y)
-{
-    long lx = FIX2LONG(x);
-    long ly = FIX2LONG(y);
-#ifdef DLONG
-    return DL2NUM((DLONG)lx * (DLONG)ly);
-#else
-    if (MUL_OVERFLOW_FIXNUM_P(lx, ly)) {
-	return rb_big_mul(rb_int2big(lx), rb_int2big(ly));
-    }
-    else {
-	return LONG2FIX(lx * ly);
-    }
-#endif
-}
-
-/*
- * This behaves different from C99 for negative arguments.
- * Note that div may overflow fixnum.
- */
-static inline void
-rb_fix_divmod_fix(VALUE a, VALUE b, VALUE *divp, VALUE *modp)
-{
-    /* assume / and % comply C99.
-     * ldiv(3) won't be inlined by GCC and clang.
-     * I expect / and % are compiled as single idiv.
-     */
-    long x = FIX2LONG(a);
-    long y = FIX2LONG(b);
-    long div, mod;
-    if (x == FIXNUM_MIN && y == -1) {
-	if (divp) *divp = LONG2NUM(-FIXNUM_MIN);
-	if (modp) *modp = LONG2FIX(0);
-	return;
-    }
-    div = x / y;
-    mod = x % y;
-    if (y > 0 ? mod < 0 : mod > 0) {
-	mod += y;
-	div -= 1;
-    }
-    if (divp) *divp = LONG2FIX(div);
-    if (modp) *modp = LONG2FIX(mod);
-}
-
-/* div() for Ruby
- * This behaves different from C99 for negative arguments.
- */
-static inline VALUE
-rb_fix_div_fix(VALUE x, VALUE y)
-{
-    VALUE div;
-    rb_fix_divmod_fix(x, y, &div, NULL);
-    return div;
-}
-
-/* mod() for Ruby
- * This behaves different from C99 for negative arguments.
- */
-static inline VALUE
-rb_fix_mod_fix(VALUE x, VALUE y)
-{
-    VALUE mod;
-    rb_fix_divmod_fix(x, y, NULL, &mod);
-    return mod;
-}
-
-#if defined(HAVE_UINT128_T)
-#   define bit_length(x) \
-    (sizeof(x) <= SIZEOF_INT ? SIZEOF_INT * CHAR_BIT - nlz_int((unsigned int)(x)) : \
-     sizeof(x) <= SIZEOF_LONG ? SIZEOF_LONG * CHAR_BIT - nlz_long((unsigned long)(x)) : \
-     sizeof(x) <= SIZEOF_LONG_LONG ? SIZEOF_LONG_LONG * CHAR_BIT - nlz_long_long((unsigned LONG_LONG)(x)) : \
-     SIZEOF_INT128_T * CHAR_BIT - nlz_int128((uint128_t)(x)))
-#elif defined(HAVE_LONG_LONG)
-#   define bit_length(x) \
-    (sizeof(x) <= SIZEOF_INT ? SIZEOF_INT * CHAR_BIT - nlz_int((unsigned int)(x)) : \
-     sizeof(x) <= SIZEOF_LONG ? SIZEOF_LONG * CHAR_BIT - nlz_long((unsigned long)(x)) : \
-     SIZEOF_LONG_LONG * CHAR_BIT - nlz_long_long((unsigned LONG_LONG)(x)))
-#else
-#   define bit_length(x) \
-    (sizeof(x) <= SIZEOF_INT ? SIZEOF_INT * CHAR_BIT - nlz_int((unsigned int)(x)) : \
-     SIZEOF_LONG * CHAR_BIT - nlz_long((unsigned long)(x)))
-#endif
-
-#ifndef BDIGIT
-# if SIZEOF_INT*2 <= SIZEOF_LONG_LONG
-#  define BDIGIT unsigned int
-#  define SIZEOF_BDIGIT SIZEOF_INT
-#  define BDIGIT_DBL unsigned LONG_LONG
-#  define BDIGIT_DBL_SIGNED LONG_LONG
-#  define PRI_BDIGIT_PREFIX ""
-#  define PRI_BDIGIT_DBL_PREFIX PRI_LL_PREFIX
-# elif SIZEOF_INT*2 <= SIZEOF_LONG
-#  define BDIGIT unsigned int
-#  define SIZEOF_BDIGIT SIZEOF_INT
-#  define BDIGIT_DBL unsigned long
-#  define BDIGIT_DBL_SIGNED long
-#  define PRI_BDIGIT_PREFIX ""
-#  define PRI_BDIGIT_DBL_PREFIX "l"
-# elif SIZEOF_SHORT*2 <= SIZEOF_LONG
-#  define BDIGIT unsigned short
-#  define SIZEOF_BDIGIT SIZEOF_SHORT
-#  define BDIGIT_DBL unsigned long
-#  define BDIGIT_DBL_SIGNED long
-#  define PRI_BDIGIT_PREFIX "h"
-#  define PRI_BDIGIT_DBL_PREFIX "l"
-# else
-#  define BDIGIT unsigned short
-#  define SIZEOF_BDIGIT (SIZEOF_LONG/2)
-#  define SIZEOF_ACTUAL_BDIGIT SIZEOF_LONG
-#  define BDIGIT_DBL unsigned long
-#  define BDIGIT_DBL_SIGNED long
-#  define PRI_BDIGIT_PREFIX "h"
-#  define PRI_BDIGIT_DBL_PREFIX "l"
-# endif
-#endif
-#ifndef SIZEOF_ACTUAL_BDIGIT
-# define SIZEOF_ACTUAL_BDIGIT SIZEOF_BDIGIT
-#endif
-
-#ifdef PRI_BDIGIT_PREFIX
-# define PRIdBDIGIT PRI_BDIGIT_PREFIX"d"
-# define PRIiBDIGIT PRI_BDIGIT_PREFIX"i"
-# define PRIoBDIGIT PRI_BDIGIT_PREFIX"o"
-# define PRIuBDIGIT PRI_BDIGIT_PREFIX"u"
-# define PRIxBDIGIT PRI_BDIGIT_PREFIX"x"
-# define PRIXBDIGIT PRI_BDIGIT_PREFIX"X"
-#endif
-
-#ifdef PRI_BDIGIT_DBL_PREFIX
-# define PRIdBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"d"
-# define PRIiBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"i"
-# define PRIoBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"o"
-# define PRIuBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"u"
-# define PRIxBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"x"
-# define PRIXBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"X"
-#endif
-
-#define BIGNUM_EMBED_LEN_NUMBITS 3
-#ifndef BIGNUM_EMBED_LEN_MAX
-# if (SIZEOF_VALUE*3/SIZEOF_ACTUAL_BDIGIT) < (1 << BIGNUM_EMBED_LEN_NUMBITS)-1
-#   define BIGNUM_EMBED_LEN_MAX (SIZEOF_VALUE*3/SIZEOF_ACTUAL_BDIGIT)
-# else
-#   define BIGNUM_EMBED_LEN_MAX ((1 << BIGNUM_EMBED_LEN_NUMBITS)-1)
-# endif
-#endif
-
-struct RBignum {
-    struct RBasic basic;
-    union {
-        struct {
-            size_t len;
-            BDIGIT *digits;
-        } heap;
-        BDIGIT ary[BIGNUM_EMBED_LEN_MAX];
-    } as;
-};
-#define BIGNUM_SIGN_BIT FL_USER1
-/* sign: positive:1, negative:0 */
-#define BIGNUM_SIGN(b) ((RBASIC(b)->flags & BIGNUM_SIGN_BIT) != 0)
-#define BIGNUM_SET_SIGN(b,sign) \
-  ((sign) ? (RBASIC(b)->flags |= BIGNUM_SIGN_BIT) \
-          : (RBASIC(b)->flags &= ~BIGNUM_SIGN_BIT))
-#define BIGNUM_POSITIVE_P(b) BIGNUM_SIGN(b)
-#define BIGNUM_NEGATIVE_P(b) (!BIGNUM_SIGN(b))
-#define BIGNUM_NEGATE(b) (RBASIC(b)->flags ^= BIGNUM_SIGN_BIT)
-
-#define BIGNUM_EMBED_FLAG FL_USER2
-#define BIGNUM_EMBED_LEN_MASK (FL_USER5|FL_USER4|FL_USER3)
-#define BIGNUM_EMBED_LEN_SHIFT (FL_USHIFT+BIGNUM_EMBED_LEN_NUMBITS)
-#define BIGNUM_LEN(b) \
-    ((RBASIC(b)->flags & BIGNUM_EMBED_FLAG) ? \
-     (long)((RBASIC(b)->flags >> BIGNUM_EMBED_LEN_SHIFT) & \
-            (BIGNUM_EMBED_LEN_MASK >> BIGNUM_EMBED_LEN_SHIFT)) : \
-     RBIGNUM(b)->as.heap.len)
-/* LSB:BIGNUM_DIGITS(b)[0], MSB:BIGNUM_DIGITS(b)[BIGNUM_LEN(b)-1] */
-#define BIGNUM_DIGITS(b) \
-    ((RBASIC(b)->flags & BIGNUM_EMBED_FLAG) ? \
-     RBIGNUM(b)->as.ary : \
-     RBIGNUM(b)->as.heap.digits)
-#define BIGNUM_LENINT(b) rb_long2int(BIGNUM_LEN(b))
-
-#define RBIGNUM(obj) (R_CAST(RBignum)(obj))
-
-struct RRational {
-    struct RBasic basic;
-    const VALUE num;
-    const VALUE den;
-};
-
-#define RRATIONAL(obj) (R_CAST(RRational)(obj))
-#define RRATIONAL_SET_NUM(rat, n) RB_OBJ_WRITE((rat), &((struct RRational *)(rat))->num,(n))
-#define RRATIONAL_SET_DEN(rat, d) RB_OBJ_WRITE((rat), &((struct RRational *)(rat))->den,(d))
-
-struct RFloat {
-    struct RBasic basic;
-    double float_value;
-};
-
-#define RFLOAT(obj)  (R_CAST(RFloat)(obj))
-
-struct RComplex {
-    struct RBasic basic;
-    const VALUE real;
-    const VALUE imag;
-};
-
-#define RCOMPLEX(obj) (R_CAST(RComplex)(obj))
-
-#ifdef RCOMPLEX_SET_REAL        /* shortcut macro for internal only */
-#undef RCOMPLEX_SET_REAL
-#undef RCOMPLEX_SET_IMAG
-#define RCOMPLEX_SET_REAL(cmp, r) RB_OBJ_WRITE((cmp), &((struct RComplex *)(cmp))->real,(r))
-#define RCOMPLEX_SET_IMAG(cmp, i) RB_OBJ_WRITE((cmp), &((struct RComplex *)(cmp))->imag,(i))
-#endif
-
-struct RHash {
-    struct RBasic basic;
-    struct st_table *ntbl;      /* possibly 0 */
-    int iter_lev;
-    const VALUE ifnone;
-};
-
-#define RHASH(obj)   (R_CAST(RHash)(obj))
-
-#ifdef RHASH_ITER_LEV
-#undef RHASH_ITER_LEV
-#undef RHASH_IFNONE
-#undef RHASH_SIZE
-#define RHASH_ITER_LEV(h) (RHASH(h)->iter_lev)
-#define RHASH_IFNONE(h) (RHASH(h)->ifnone)
-#define RHASH_SIZE(h) (RHASH(h)->ntbl ? (st_index_t)RHASH(h)->ntbl->num_entries : 0)
-#endif
-
-/* missing/setproctitle.c */
-#ifndef HAVE_SETPROCTITLE
-extern void ruby_init_setproctitle(int argc, char *argv[]);
-#endif
-
-/* class.c */
-
-struct rb_deprecated_classext_struct {
-    char conflict[sizeof(VALUE) * 3];
-};
-
-struct rb_subclass_entry;
-typedef struct rb_subclass_entry rb_subclass_entry_t;
-
-struct rb_subclass_entry {
-    VALUE klass;
-    rb_subclass_entry_t *next;
-};
-
-#if defined(HAVE_LONG_LONG)
-typedef unsigned LONG_LONG rb_serial_t;
-#define SERIALT2NUM ULL2NUM
-#elif defined(HAVE_UINT64_T)
-typedef uint64_t rb_serial_t;
-#define SERIALT2NUM SIZET2NUM
-#else
-typedef unsigned long rb_serial_t;
-#define SERIALT2NUM ULONG2NUM
-#endif
-
-struct rb_classext_struct {
-    struct st_table *iv_index_tbl;
-    struct st_table *iv_tbl;
-    struct rb_id_table *const_tbl;
-    struct rb_id_table *callable_m_tbl;
-    rb_subclass_entry_t *subclasses;
-    rb_subclass_entry_t **parent_subclasses;
-    /**
-     * In the case that this is an `ICLASS`, `module_subclasses` points to the link
-     * in the module's `subclasses` list that indicates that the klass has been
-     * included. Hopefully that makes sense.
-     */
-    rb_subclass_entry_t **module_subclasses;
-    rb_serial_t class_serial;
-    const VALUE origin_;
-    VALUE refined_class;
-    rb_alloc_func_t allocator;
-};
-
-typedef struct rb_classext_struct rb_classext_t;
-
-#undef RClass
-struct RClass {
-    struct RBasic basic;
-    VALUE super;
-    rb_classext_t *ptr;
-    struct rb_id_table *m_tbl;
-};
-
-void rb_class_subclass_add(VALUE super, VALUE klass);
-void rb_class_remove_from_super_subclasses(VALUE);
-int rb_singleton_class_internal_p(VALUE sklass);
-
-#define RCLASS_EXT(c) (RCLASS(c)->ptr)
-#define RCLASS_IV_TBL(c) (RCLASS_EXT(c)->iv_tbl)
-#define RCLASS_CONST_TBL(c) (RCLASS_EXT(c)->const_tbl)
-#define RCLASS_M_TBL(c) (RCLASS(c)->m_tbl)
-#define RCLASS_CALLABLE_M_TBL(c) (RCLASS_EXT(c)->callable_m_tbl)
-#define RCLASS_IV_INDEX_TBL(c) (RCLASS_EXT(c)->iv_index_tbl)
-#define RCLASS_ORIGIN(c) (RCLASS_EXT(c)->origin_)
-#define RCLASS_REFINED_CLASS(c) (RCLASS_EXT(c)->refined_class)
-#define RCLASS_SERIAL(c) (RCLASS_EXT(c)->class_serial)
-
-#define RICLASS_IS_ORIGIN FL_USER5
-
-static inline void
-RCLASS_SET_ORIGIN(VALUE klass, VALUE origin)
-{
-    RB_OBJ_WRITE(klass, &RCLASS_ORIGIN(klass), origin);
-    if (klass != origin) FL_SET(origin, RICLASS_IS_ORIGIN);
-}
-
-#undef RCLASS_SUPER
-static inline VALUE
-RCLASS_SUPER(VALUE klass)
-{
-    return RCLASS(klass)->super;
-}
-
-static inline VALUE
-RCLASS_SET_SUPER(VALUE klass, VALUE super)
-{
-    if (super) {
-	rb_class_remove_from_super_subclasses(klass);
-	rb_class_subclass_add(super, klass);
-    }
-    RB_OBJ_WRITE(klass, &RCLASS(klass)->super, super);
-    return super;
-}
-/* IMEMO: Internal memo object */
-
-#ifndef IMEMO_DEBUG
-#define IMEMO_DEBUG 0
-#endif
-
-struct RIMemo {
-    VALUE flags;
-    VALUE v0;
-    VALUE v1;
-    VALUE v2;
-    VALUE v3;
-};
-
-enum imemo_type {
-    imemo_none = 0,
-    imemo_cref = 1,
-    imemo_svar = 2,
-    imemo_throw_data = 3,
-    imemo_ifunc = 4,
-    imemo_memo = 5,
-    imemo_ment = 6,
-    imemo_iseq = 7,
-    imemo_mask = 0x07
-};
-
-static inline enum imemo_type
-imemo_type(VALUE imemo)
-{
-    return (RBASIC(imemo)->flags >> FL_USHIFT) & imemo_mask;
-}
-
-/* FL_USER0 to FL_USER2 is for type */
-#define IMEMO_FL_USHIFT (FL_USHIFT + 3)
-#define IMEMO_FL_USER0 FL_USER3
-#define IMEMO_FL_USER1 FL_USER4
-#define IMEMO_FL_USER2 FL_USER5
-#define IMEMO_FL_USER3 FL_USER6
-#define IMEMO_FL_USER4 FL_USER7
-
-/* CREF in method.h */
-
-/* SVAR */
-
-struct vm_svar {
-    VALUE flags;
-    const VALUE cref_or_me;
-    const VALUE lastline;
-    const VALUE backref;
-    const VALUE others;
-};
-
-/* THROW_DATA */
-
-struct vm_throw_data {
-    VALUE flags;
-    VALUE reserved;
-    const VALUE throw_obj;
-    const struct rb_control_frame_struct *catch_frame;
-    VALUE throw_state;
-};
-
-#define THROW_DATA_P(err) RB_TYPE_P((err), T_IMEMO)
-
-/* IFUNC */
-
-struct vm_ifunc {
-    VALUE flags;
-    VALUE reserved;
-    VALUE (*func)(ANYARGS);
-    const void *data;
-    ID id;
-};
-
-#define IFUNC_NEW(a, b, c) ((struct vm_ifunc *)rb_imemo_new(imemo_ifunc, (VALUE)(a), (VALUE)(b), (VALUE)(c), 0))
-
-/* MEMO */
-
-struct MEMO {
-    VALUE flags;
-    VALUE reserved;
-    const VALUE v1;
-    const VALUE v2;
-    union {
-	long cnt;
-	long state;
-	const VALUE value;
-	VALUE (*func)(ANYARGS);
-    } u3;
-};
-
-#define MEMO_V1_SET(m, v) RB_OBJ_WRITE((memo), &(memo)->v1, (v))
-#define MEMO_V2_SET(m, v) RB_OBJ_WRITE((memo), &(memo)->v2, (v))
-
-#define MEMO_CAST(m) ((struct MEMO *)m)
-
-#define MEMO_NEW(a, b, c) ((struct MEMO *)rb_imemo_new(imemo_memo, (VALUE)(a), (VALUE)(b), (VALUE)(c), 0))
-
 #define roomof(x, y) (((x) + (y) - 1) / (y))
 #define type_roomof(x, y) roomof(sizeof(x), sizeof(y))
-#define MEMO_FOR(type, value) ((type *)RARRAY_PTR(value))
-#define NEW_MEMO_FOR(type, value) \
-  ((value) = rb_ary_tmp_new_fill(type_roomof(type, VALUE)), MEMO_FOR(type, value))
-#define NEW_PARTIAL_MEMO_FOR(type, value, member) \
-  ((value) = rb_ary_tmp_new_fill(type_roomof(type, VALUE)), \
-   rb_ary_set_len((value), offsetof(type, member) / sizeof(VALUE)), \
-   MEMO_FOR(type, value))
-
-#define STRING_P(s) (RB_TYPE_P((s), T_STRING) && CLASS_OF(s) == rb_cString)
-
-#ifdef RUBY_INTEGER_UNIFICATION
-# define rb_cFixnum rb_cInteger
-# define rb_cBignum rb_cInteger
-#endif
-
-enum {
-    cmp_opt_Fixnum,
-    cmp_opt_String,
-    cmp_optimizable_count
-};
-
-struct cmp_opt_data {
-    int opt_methods;
-    int opt_inited;
-};
-
-#define NEW_CMP_OPT_MEMO(type, value) \
-    NEW_PARTIAL_MEMO_FOR(type, value, cmp_opt)
-#define CMP_OPTIMIZABLE_BIT(type) (1U << TOKEN_PASTE(cmp_opt_,type))
-#define CMP_OPTIMIZABLE(data, type) \
-    (((data).opt_inited & CMP_OPTIMIZABLE_BIT(type)) ? \
-     ((data).opt_methods & CMP_OPTIMIZABLE_BIT(type)) : \
-     (((data).opt_inited |= CMP_OPTIMIZABLE_BIT(type)), \
-      rb_method_basic_definition_p(TOKEN_PASTE(rb_c,type), id_cmp) && \
-      ((data).opt_methods |= CMP_OPTIMIZABLE_BIT(type))))
-
-#define OPTIMIZED_CMP(a, b, data) \
-    ((FIXNUM_P(a) && FIXNUM_P(b) && CMP_OPTIMIZABLE(data, Fixnum)) ? \
-     (((long)a > (long)b) ? 1 : ((long)a < (long)b) ? -1 : 0) : \
-     (STRING_P(a) && STRING_P(b) && CMP_OPTIMIZABLE(data, String)) ? \
-     rb_str_cmp(a, b) : \
-     rb_cmpint(rb_funcallv(a, id_cmp, 1, &b), a, b))
-
-/* ment is in method.h */
-
-/* global variable */
-
-struct rb_global_entry {
-    struct rb_global_variable *var;
-    ID id;
-};
-
-struct rb_global_entry *rb_global_entry(ID);
-VALUE rb_gvar_get(struct rb_global_entry *);
-VALUE rb_gvar_set(struct rb_global_entry *, VALUE);
-VALUE rb_gvar_defined(struct rb_global_entry *);
-
-struct vtm; /* defined by timev.h */
-
-/* array.c */
-VALUE rb_ary_last(int, const VALUE *, VALUE);
-void rb_ary_set_len(VALUE, long);
-void rb_ary_delete_same(VALUE, VALUE);
-VALUE rb_ary_tmp_new_fill(long capa);
-VALUE rb_ary_at(VALUE, VALUE);
-size_t rb_ary_memsize(VALUE);
-#ifdef __GNUC__
-#define rb_ary_new_from_args(n, ...) \
-    __extension__ ({ \
-	const VALUE args_to_new_ary[] = {__VA_ARGS__}; \
-	if (__builtin_constant_p(n)) { \
-	    STATIC_ASSERT(rb_ary_new_from_args, numberof(args_to_new_ary) == (n)); \
-	} \
-	rb_ary_new_from_values(numberof(args_to_new_ary), args_to_new_ary); \
-    })
-#endif
-
-/* bignum.c */
-extern const char ruby_digitmap[];
-VALUE rb_big_fdiv(VALUE x, VALUE y);
-VALUE rb_big_uminus(VALUE x);
-VALUE rb_big_hash(VALUE);
-VALUE rb_big_odd_p(VALUE);
-VALUE rb_big_even_p(VALUE);
-size_t rb_big_size(VALUE);
-VALUE rb_integer_float_cmp(VALUE x, VALUE y);
-VALUE rb_integer_float_eq(VALUE x, VALUE y);
-VALUE rb_cstr_parse_inum(const char *str, ssize_t len, char **endp, int base);
-VALUE rb_big_comp(VALUE x);
-VALUE rb_big_aref(VALUE x, VALUE y);
-VALUE rb_big_abs(VALUE x);
-VALUE rb_big_size_m(VALUE big);
-VALUE rb_big_bit_length(VALUE big);
-VALUE rb_big_remainder(VALUE x, VALUE y);
-VALUE rb_big_gt(VALUE x, VALUE y);
-VALUE rb_big_ge(VALUE x, VALUE y);
-VALUE rb_big_lt(VALUE x, VALUE y);
-VALUE rb_big_le(VALUE x, VALUE y);
-
-/* class.c */
-VALUE rb_class_boot(VALUE);
-VALUE rb_class_inherited(VALUE, VALUE);
-VALUE rb_make_metaclass(VALUE, VALUE);
-VALUE rb_include_class_new(VALUE, VALUE);
-void rb_class_foreach_subclass(VALUE klass, void (*f)(VALUE, VALUE), VALUE);
-void rb_class_detach_subclasses(VALUE);
-void rb_class_detach_module_subclasses(VALUE);
-void rb_class_remove_from_module_subclasses(VALUE);
-VALUE rb_obj_methods(int argc, const VALUE *argv, VALUE obj);
-VALUE rb_obj_protected_methods(int argc, const VALUE *argv, VALUE obj);
-VALUE rb_obj_private_methods(int argc, const VALUE *argv, VALUE obj);
-VALUE rb_obj_public_methods(int argc, const VALUE *argv, VALUE obj);
-int rb_obj_basic_to_s_p(VALUE);
-VALUE rb_special_singleton_class(VALUE);
-VALUE rb_singleton_class_clone_and_attach(VALUE obj, VALUE attach);
-VALUE rb_singleton_class_get(VALUE obj);
-void Init_class_hierarchy(void);
-
-int rb_class_has_methods(VALUE c);
-
-/* compar.c */
-VALUE rb_invcmp(VALUE, VALUE);
-
-/* compile.c */
-struct rb_block_struct;
-int rb_dvar_defined(ID, const struct rb_block_struct *);
-int rb_local_defined(ID, const struct rb_block_struct *);
-CONSTFUNC(const char * rb_insns_name(int i));
-VALUE rb_insns_name_array(void);
-
-/* complex.c */
-VALUE rb_nucomp_add(VALUE, VALUE);
-VALUE rb_nucomp_mul(VALUE, VALUE);
-
-/* cont.c */
-VALUE rb_obj_is_fiber(VALUE);
-void rb_fiber_reset_root_local_storage(VALUE);
-void ruby_register_rollback_func_for_ensure(VALUE (*ensure_func)(ANYARGS), VALUE (*rollback_func)(ANYARGS));
-
-/* debug.c */
-PRINTF_ARGS(void ruby_debug_printf(const char*, ...), 1, 2);
-
-/* dmyext.c */
-void Init_enc(void);
-void Init_ext(void);
 
-/* encoding.c */
-ID rb_id_encoding(void);
-CONSTFUNC(void rb_gc_mark_encodings(void));
-rb_encoding *rb_enc_get_from_index(int index);
-rb_encoding *rb_enc_check_str(VALUE str1, VALUE str2);
-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);
-void rb_enc_set_base(const char *name, const char *orig);
-int rb_enc_set_dummy(int index);
-void rb_encdb_set_unicode(int index);
-PUREFUNC(int rb_data_is_encoding(VALUE obj));
+/* Prevent compiler from reordering access */
+#define ACCESS_ONCE(type,x) (*((volatile type *)&(x)))
 
-/* enum.c */
-VALUE rb_f_send(int argc, VALUE *argv, VALUE recv);
-VALUE rb_nmin_run(VALUE obj, VALUE num, int by, int rev, int ary);
+#include "ruby/ruby.h"
 
-/* error.c */
-extern VALUE rb_eEAGAIN;
-extern VALUE rb_eEWOULDBLOCK;
-extern VALUE rb_eEINPROGRESS;
-void rb_report_bug_valist(VALUE file, int line, const char *fmt, va_list args);
-PRINTF_ARGS(void rb_compile_error_str(VALUE file, int line, void *enc, const char *fmt, ...), 4, 5);
-VALUE rb_syntax_error_append(VALUE, VALUE, int, int, rb_encoding*, const char*, va_list);
-VALUE rb_check_backtrace(VALUE);
-NORETURN(void rb_async_bug_errno(const char *,int));
-const char *rb_builtin_type_name(int t);
-const char *rb_builtin_class_name(VALUE x);
-PRINTF_ARGS(void rb_enc_warn(rb_encoding *enc, const char *fmt, ...), 2, 3);
-PRINTF_ARGS(void rb_enc_warning(rb_encoding *enc, const char *fmt, ...), 2, 3);
-PRINTF_ARGS(void rb_sys_enc_warning(rb_encoding *enc, const char *fmt, ...), 2, 3);
-VALUE rb_name_err_new(VALUE mesg, VALUE recv, VALUE method);
-#define rb_name_err_raise_str(mesg, recv, name) \
-    rb_exc_raise(rb_name_err_new(mesg, recv, name))
-#define rb_name_err_raise(mesg, recv, name) \
-    rb_name_err_raise_str(rb_fstring_cstr(mesg), (recv), (name))
-NORETURN(void ruby_only_for_internal_use(const char *));
-#define ONLY_FOR_INTERNAL_USE(func) ruby_only_for_internal_use(func)
+/* Following macros were formerly defined in this header but moved to somewhere
+ * else.  In order to detect them we undef here. */
 
-/* eval.c */
-VALUE rb_refinement_module_get_refined_class(VALUE module);
+/* internal/array.h */
+#undef RARRAY_AREF
 
-/* eval_error.c */
-void ruby_error_print(void);
-VALUE rb_get_backtrace(VALUE info);
-
-/* eval_jump.c */
-void rb_call_end_proc(VALUE data);
-void rb_mark_end_proc(void);
-
-/* file.c */
-VALUE rb_home_dir_of(VALUE user, VALUE result);
-VALUE rb_default_home_dir(VALUE result);
-VALUE rb_realpath_internal(VALUE basedir, VALUE path, int strict);
-void rb_file_const(const char*, VALUE);
-int rb_file_load_ok(const char *);
-VALUE rb_file_expand_path_fast(VALUE, VALUE);
-VALUE rb_file_expand_path_internal(VALUE, VALUE, int, int, VALUE);
-VALUE rb_get_path_check_to_string(VALUE, int);
-VALUE rb_get_path_check_convert(VALUE, VALUE, int);
-void Init_File(void);
-int ruby_is_fd_loadable(int fd);
-
-#ifdef RUBY_FUNCTION_NAME_STRING
-# if defined __GNUC__ && __GNUC__ >= 4
-#   pragma GCC visibility push(default)
-# endif
-NORETURN(void rb_sys_fail_path_in(const char *func_name, VALUE path));
-NORETURN(void rb_syserr_fail_path_in(const char *func_name, int err, VALUE path));
-# if defined __GNUC__ && __GNUC__ >= 4
-#   pragma GCC visibility pop
-# endif
-# define rb_sys_fail_path(path) rb_sys_fail_path_in(RUBY_FUNCTION_NAME_STRING, path)
-# define rb_syserr_fail_path(err, path) rb_syserr_fail_path_in(RUBY_FUNCTION_NAME_STRING, (err), (path))
-#else
-# define rb_sys_fail_path(path) rb_sys_fail_str(path)
-# define rb_syserr_fail_path(err, path) rb_syserr_fail_str((err), (path))
-#endif
-
-/* gc.c */
-extern VALUE *ruby_initial_gc_stress_ptr;
-extern int ruby_disable_gc;
-void Init_heap(void);
-void *ruby_mimmalloc(size_t size);
-void ruby_mimfree(void *ptr);
-void rb_objspace_set_event_hook(const rb_event_flag_t event);
-#if USE_RGENGC
-void rb_gc_writebarrier_remember(VALUE obj);
-#else
-#define rb_gc_writebarrier_remember(obj) 0
-#endif
-void ruby_gc_set_params(int safe_level);
-void rb_copy_wb_protected_attribute(VALUE dest, VALUE obj);
-
-#if defined(HAVE_MALLOC_USABLE_SIZE) || defined(HAVE_MALLOC_SIZE) || defined(_WIN32)
-#define ruby_sized_xrealloc(ptr, new_size, old_size) ruby_xrealloc(ptr, new_size)
-#define ruby_sized_xrealloc2(ptr, new_count, element_size, old_count) ruby_xrealloc(ptr, new_count, element_size)
-#define ruby_sized_xfree(ptr, size) ruby_xfree(ptr)
-#define SIZED_REALLOC_N(var,type,n,old_n) REALLOC_N(var, type, n)
-#else
-void *ruby_sized_xrealloc(void *ptr, size_t new_size, size_t old_size) RUBY_ATTR_ALLOC_SIZE((2));
-void *ruby_sized_xrealloc2(void *ptr, size_t new_count, size_t element_size, size_t old_count) RUBY_ATTR_ALLOC_SIZE((2, 3));
-void ruby_sized_xfree(void *x, size_t size);
-#define SIZED_REALLOC_N(var,type,n,old_n) ((var)=(type*)ruby_sized_xrealloc((char*)(var), (n) * sizeof(type), (old_n) * sizeof(type)))
-#endif
-
-void rb_gc_resurrect(VALUE ptr);
+/* internal/class.h */
+#undef RClass
+#undef RCLASS_SUPER
 
-/* optimized version of NEWOBJ() */
-#undef NEWOBJF_OF
+/* internal/gc.h */
+#undef NEWOBJ_OF
 #undef RB_NEWOBJ_OF
-#define RB_NEWOBJ_OF(obj,type,klass,flags) \
-  type *(obj) = (type*)(((flags) & FL_WB_PROTECTED) ? \
-			rb_wb_protected_newobj_of(klass, (flags) & ~FL_WB_PROTECTED) : \
-			rb_wb_unprotected_newobj_of(klass, flags))
-#define NEWOBJ_OF(obj,type,klass,flags) RB_NEWOBJ_OF(obj,type,klass,flags)
-
-/* hash.c */
-struct st_table *rb_hash_tbl_raw(VALUE hash);
-VALUE rb_hash_has_key(VALUE hash, VALUE key);
-VALUE rb_hash_default_value(VALUE hash, VALUE key);
-VALUE rb_hash_set_default_proc(VALUE hash, VALUE proc);
-long rb_objid_hash(st_index_t index);
-st_table *rb_init_identtable(void);
-st_table *rb_init_identtable_with_size(st_index_t size);
-
-#define RHASH_TBL_RAW(h) rb_hash_tbl_raw(h)
-VALUE rb_hash_keys(VALUE hash);
-VALUE rb_hash_values(VALUE hash);
-VALUE rb_hash_rehash(VALUE hash);
-#define HASH_DELETED  FL_USER1
-#define HASH_PROC_DEFAULT FL_USER2
-
-/* inits.c */
-void rb_call_inits(void);
-
-/* io.c */
-const char *ruby_get_inplace_mode(void);
-void ruby_set_inplace_mode(const char *);
-ssize_t rb_io_bufread(VALUE io, void *buf, size_t size);
-void rb_stdio_set_default_encoding(void);
-VALUE rb_io_flush_raw(VALUE, int);
-size_t rb_io_memsize(const rb_io_t *);
-
-/* load.c */
-VALUE rb_get_load_path(void);
-VALUE rb_get_expanded_load_path(void);
-int rb_require_internal(VALUE fname, int safe);
-NORETURN(void rb_load_fail(VALUE, const char*));
+#undef RB_OBJ_WRITE
 
-/* loadpath.c */
-extern const char ruby_exec_prefix[];
-extern const char ruby_initial_load_paths[];
-
-/* localeinit.c */
-int Init_enc_set_filesystem_encoding(void);
-
-/* math.c */
-VALUE rb_math_atan2(VALUE, VALUE);
-VALUE rb_math_cos(VALUE);
-VALUE rb_math_cosh(VALUE);
-VALUE rb_math_exp(VALUE);
-VALUE rb_math_hypot(VALUE, VALUE);
-VALUE rb_math_log(int argc, const VALUE *argv);
-VALUE rb_math_sin(VALUE);
-VALUE rb_math_sinh(VALUE);
-#if 0
-VALUE rb_math_sqrt(VALUE);
-#endif
-
-/* newline.c */
-void Init_newline(void);
-
-/* numeric.c */
-int rb_num_to_uint(VALUE val, unsigned int *ret);
-VALUE ruby_num_interval_step_size(VALUE from, VALUE to, VALUE step, int excl);
-int ruby_float_step(VALUE from, VALUE to, VALUE step, int excl);
-double ruby_float_mod(double x, double y);
-int rb_num_negative_p(VALUE);
-VALUE rb_int_succ(VALUE num);
-VALUE rb_int_pred(VALUE num);
-VALUE rb_int_uminus(VALUE num);
-VALUE rb_int_plus(VALUE x, VALUE y);
-VALUE rb_int_minus(VALUE x, VALUE y);
-VALUE rb_int_mul(VALUE x, VALUE y);
-VALUE rb_int_idiv(VALUE x, VALUE y);
-VALUE rb_int_modulo(VALUE x, VALUE y);
-VALUE rb_int_round(VALUE num, int ndigits);
-VALUE rb_int2str(VALUE num, int base);
-VALUE rb_dbl_hash(double d);
-VALUE rb_fix_plus(VALUE x, VALUE y);
-VALUE rb_int_ge(VALUE x, VALUE y);
-
-#if USE_FLONUM
-#define RUBY_BIT_ROTL(v, n) (((v) << (n)) | ((v) >> ((sizeof(v) * 8) - n)))
-#define RUBY_BIT_ROTR(v, n) (((v) >> (n)) | ((v) << ((sizeof(v) * 8) - n)))
-#endif
-
-static inline double
-rb_float_flonum_value(VALUE v)
-{
-#if USE_FLONUM
-    if (v != (VALUE)0x8000000000000002) { /* LIKELY */
-	union {
-	    double d;
-	    VALUE v;
-	} t;
-
-	VALUE b63 = (v >> 63);
-	/* e: xx1... -> 011... */
-	/*    xx0... -> 100... */
-	/*      ^b63           */
-	t.v = RUBY_BIT_ROTR((2 - b63) | (v & ~0x03), 3);
-	return t.d;
-    }
-#endif
-    return 0.0;
-}
-
-static inline double
-rb_float_noflonum_value(VALUE v)
-{
-    return ((struct RFloat *)v)->float_value;
-}
-
-static inline double
-rb_float_value_inline(VALUE v)
-{
-    if (FLONUM_P(v)) {
-	return rb_float_flonum_value(v);
-    }
-    return rb_float_noflonum_value(v);
-}
-
-static inline VALUE
-rb_float_new_inline(double d)
-{
-#if USE_FLONUM
-    union {
-	double d;
-	VALUE v;
-    } t;
-    int bits;
-
-    t.d = d;
-    bits = (int)((VALUE)(t.v >> 60) & 0x7);
-    /* bits contains 3 bits of b62..b60. */
-    /* bits - 3 = */
-    /*   b011 -> b000 */
-    /*   b100 -> b001 */
-
-    if (t.v != 0x3000000000000000 /* 1.72723e-77 */ &&
-	!((bits-3) & ~0x01)) {
-	return (RUBY_BIT_ROTL(t.v, 3) & ~(VALUE)0x01) | 0x02;
-    }
-    else if (t.v == (VALUE)0) {
-	/* +0.0 */
-	return 0x8000000000000002;
-    }
-    /* out of range */
-#endif
-    return rb_float_new_in_heap(d);
-}
-
-#define rb_float_value(v) rb_float_value_inline(v)
-#define rb_float_new(d)   rb_float_new_inline(d)
-
-/* object.c */
-void rb_obj_copy_ivar(VALUE dest, VALUE obj);
-CONSTFUNC(VALUE rb_obj_equal(VALUE obj1, VALUE obj2));
-CONSTFUNC(VALUE rb_obj_not(VALUE obj));
-VALUE rb_class_search_ancestor(VALUE klass, VALUE super);
-NORETURN(void rb_undefined_alloc(VALUE klass));
-double rb_num_to_dbl(VALUE val);
-VALUE rb_obj_dig(int argc, VALUE *argv, VALUE self, VALUE notfound);
-
-struct RBasicRaw {
-    VALUE flags;
-    VALUE klass;
-};
-
-#define RBASIC_CLEAR_CLASS(obj)        (((struct RBasicRaw *)((VALUE)(obj)))->klass = 0)
-#define RBASIC_SET_CLASS_RAW(obj, cls) (((struct RBasicRaw *)((VALUE)(obj)))->klass = (cls))
-#define RBASIC_SET_CLASS(obj, cls)     do { \
-    VALUE _obj_ = (obj); \
-    RB_OBJ_WRITE(_obj_, &((struct RBasicRaw *)(_obj_))->klass, cls); \
-} while (0)
-
-/* parse.y */
-#ifndef USE_SYMBOL_GC
-#define USE_SYMBOL_GC 1
-#endif
-VALUE rb_parser_get_yydebug(VALUE);
-VALUE rb_parser_set_yydebug(VALUE, VALUE);
-VALUE rb_parser_set_context(VALUE, const struct rb_block_struct *, int);
-void *rb_parser_load_file(VALUE parser, VALUE name);
-int rb_is_const_name(VALUE name);
-int rb_is_class_name(VALUE name);
-int rb_is_global_name(VALUE name);
-int rb_is_instance_name(VALUE name);
-int rb_is_attrset_name(VALUE name);
-int rb_is_local_name(VALUE name);
-int rb_is_method_name(VALUE name);
-int rb_is_junk_name(VALUE name);
-PUREFUNC(int rb_is_const_sym(VALUE sym));
-PUREFUNC(int rb_is_class_sym(VALUE sym));
-PUREFUNC(int rb_is_global_sym(VALUE sym));
-PUREFUNC(int rb_is_instance_sym(VALUE sym));
-PUREFUNC(int rb_is_attrset_sym(VALUE sym));
-PUREFUNC(int rb_is_local_sym(VALUE sym));
-PUREFUNC(int rb_is_method_sym(VALUE sym));
-PUREFUNC(int rb_is_junk_sym(VALUE sym));
-ID rb_make_internal_id(void);
-void rb_gc_free_dsymbol(VALUE);
-ID rb_id_attrget(ID id);
-
-/* proc.c */
-VALUE rb_proc_location(VALUE self);
-st_index_t rb_hash_proc(st_index_t hash, VALUE proc);
-int rb_block_arity(void);
-VALUE rb_func_proc_new(rb_block_call_func_t func, VALUE val);
-VALUE rb_func_lambda_new(rb_block_call_func_t func, VALUE val);
-
-/* process.c */
-#define RB_MAX_GROUPS (65536)
-
-struct rb_execarg {
-    union {
-        struct {
-            VALUE shell_script;
-        } sh;
-        struct {
-            VALUE command_name;
-            VALUE command_abspath; /* full path string or nil */
-            VALUE argv_str;
-            VALUE argv_buf;
-        } cmd;
-    } invoke;
-    VALUE redirect_fds;
-    VALUE envp_str;
-    VALUE envp_buf;
-    VALUE dup2_tmpbuf;
-    unsigned use_shell : 1;
-    unsigned pgroup_given : 1;
-    unsigned umask_given : 1;
-    unsigned unsetenv_others_given : 1;
-    unsigned unsetenv_others_do : 1;
-    unsigned close_others_given : 1;
-    unsigned close_others_do : 1;
-    unsigned chdir_given : 1;
-    unsigned new_pgroup_given : 1;
-    unsigned new_pgroup_flag : 1;
-    unsigned uid_given : 1;
-    unsigned gid_given : 1;
-    rb_pid_t pgroup_pgid; /* asis(-1), new pgroup(0), specified pgroup (0<V). */
-    VALUE rlimit_limits; /* Qfalse or [[rtype, softlim, hardlim], ...] */
-    mode_t umask_mask;
-    rb_uid_t uid;
-    rb_gid_t gid;
-    int close_others_maxhint;
-    VALUE fd_dup2;
-    VALUE fd_close;
-    VALUE fd_open;
-    VALUE fd_dup2_child;
-    VALUE env_modification; /* Qfalse or [[k1,v1], ...] */
-    VALUE chdir_dir;
-};
-
-/* argv_str contains extra two elements.
- * The beginning one is for /bin/sh used by exec_with_sh.
- * The last one for terminating NULL used by execve.
- * See rb_exec_fillarg() in process.c. */
-#define ARGVSTR2ARGC(argv_str) (RSTRING_LEN(argv_str) / sizeof(char *) - 2)
-#define ARGVSTR2ARGV(argv_str) ((char **)RSTRING_PTR(argv_str) + 1)
-
-rb_pid_t rb_fork_ruby(int *status);
-void rb_last_status_clear(void);
-
-/* rational.c */
-VALUE rb_rational_plus(VALUE self, VALUE other);
-VALUE rb_lcm(VALUE x, VALUE y);
-VALUE rb_rational_reciprocal(VALUE x);
-VALUE rb_cstr_to_rat(const char *, int);
-
-/* re.c */
-VALUE rb_reg_compile(VALUE str, int options, const char *sourcefile, int sourceline);
-VALUE rb_reg_check_preprocess(VALUE);
-long rb_reg_search0(VALUE, VALUE, long, int, int);
-void rb_backref_set_string(VALUE string, long pos, long len);
-int rb_match_count(VALUE match);
-int rb_match_nth_defined(int nth, VALUE match);
-
-/* signal.c */
-extern int ruby_enable_coredump;
-int rb_get_next_signal(void);
-int rb_sigaltstack_size(void);
-
-/* strftime.c */
-#ifdef RUBY_ENCODING_H
-VALUE rb_strftime_timespec(const char *format, size_t format_len, rb_encoding *enc,
-			   const struct vtm *vtm, struct timespec *ts, int gmt);
-VALUE rb_strftime(const char *format, size_t format_len, rb_encoding *enc,
-		  const struct vtm *vtm, VALUE timev, int gmt);
-#endif
-
-/* string.c */
-void Init_frozen_strings(void);
-VALUE rb_fstring(VALUE);
-VALUE rb_fstring_new(const char *ptr, long len);
-#define rb_fstring_lit(str) rb_fstring_new((str), rb_strlen_lit(str))
-#define rb_fstring_literal(str) rb_fstring_lit(str)
-VALUE rb_fstring_cstr(const char *str);
-#ifdef HAVE_BUILTIN___BUILTIN_CONSTANT_P
-# define rb_fstring_cstr(str) RB_GNUC_EXTENSION_BLOCK(	\
-    (__builtin_constant_p(str)) ?		\
-	rb_fstring_new((str), (long)strlen(str)) : \
-	rb_fstring_cstr(str) \
-)
-#endif
-#ifdef RUBY_ENCODING_H
-VALUE rb_fstring_enc_new(const char *ptr, long len, rb_encoding *enc);
-#define rb_fstring_enc_lit(str, enc) rb_fstring_enc_new((str), rb_strlen_lit(str), (enc))
-#define rb_fstring_enc_literal(str, enc) rb_fstring_enc_lit(str, enc)
-VALUE rb_fstring_enc_cstr(const char *ptr, rb_encoding *enc);
-# ifdef HAVE_BUILTIN___BUILTIN_CONSTANT_P
-#  define rb_fstring_enc_cstr(str, enc) RB_GNUC_EXTENSION_BLOCK( \
-    (__builtin_constant_p(str)) ?		\
-	rb_fstring_enc_new((str), (long)strlen(str), (enc)) : \
-	rb_fstring_enc_cstr(str, enc) \
-)
-# endif
-#endif
-int rb_str_buf_cat_escaped_char(VALUE result, unsigned int c, int unicode_p);
-int rb_str_symname_p(VALUE);
-VALUE rb_str_quote_unprintable(VALUE);
-VALUE rb_id_quote_unprintable(ID);
-#define QUOTE(str) rb_str_quote_unprintable(str)
-#define QUOTE_ID(id) rb_id_quote_unprintable(id)
-char *rb_str_fill_terminator(VALUE str, const int termlen);
-VALUE rb_str_locktmp_ensure(VALUE str, VALUE (*func)(VALUE), VALUE arg);
-#ifdef RUBY_ENCODING_H
-VALUE rb_external_str_with_enc(VALUE str, rb_encoding *eenc);
-VALUE rb_str_cat_conv_enc_opts(VALUE newstr, long ofs, const char *ptr, long len,
-			       rb_encoding *from, int ecflags, VALUE ecopts);
-VALUE rb_enc_str_scrub(rb_encoding *enc, VALUE str, VALUE repl);
-#endif
-#define STR_NOEMBED      FL_USER1
-#define STR_SHARED       FL_USER2 /* = ELTS_SHARED */
-#define STR_EMBED_P(str) (!FL_TEST_RAW((str), STR_NOEMBED))
-#define STR_SHARED_P(s)  FL_ALL_RAW((s), STR_NOEMBED|ELTS_SHARED)
-#define is_ascii_string(str) (rb_enc_str_coderange(str) == ENC_CODERANGE_7BIT)
-#define is_broken_string(str) (rb_enc_str_coderange(str) == ENC_CODERANGE_BROKEN)
-size_t rb_str_memsize(VALUE);
-VALUE rb_sym_proc_call(VALUE args, VALUE sym, int argc, const VALUE *argv, VALUE passed_proc);
-VALUE rb_sym_to_proc(VALUE sym);
-
-/* symbol.c */
-#ifdef RUBY_ENCODING_H
-VALUE rb_sym_intern(const char *ptr, long len, rb_encoding *enc);
-VALUE rb_sym_intern_cstr(const char *ptr, rb_encoding *enc);
-#ifdef __GNUC__
-#define rb_sym_intern_cstr(ptr, enc) __extension__ ( \
-{						\
-    (__builtin_constant_p(ptr)) ?		\
-	rb_sym_intern((ptr), (long)strlen(ptr), (enc)) : \
-	rb_sym_intern_cstr((ptr), (enc)); \
-})
-#endif
-#endif
-VALUE rb_sym_intern_ascii(const char *ptr, long len);
-VALUE rb_sym_intern_ascii_cstr(const char *ptr);
-#ifdef __GNUC__
-#define rb_sym_intern_ascii_cstr(ptr) __extension__ ( \
-{						\
-    (__builtin_constant_p(ptr)) ?		\
-	rb_sym_intern_ascii((ptr), (long)strlen(ptr)) : \
-	rb_sym_intern_ascii_cstr(ptr); \
-})
-#endif
-
-/* struct.c */
-VALUE rb_struct_init_copy(VALUE copy, VALUE s);
-VALUE rb_struct_lookup(VALUE s, VALUE idx);
-
-/* time.c */
-struct timeval rb_time_timeval(VALUE);
-
-/* thread.c */
-VALUE rb_obj_is_mutex(VALUE obj);
-VALUE rb_suppress_tracing(VALUE (*func)(VALUE), VALUE arg);
-void rb_thread_execute_interrupts(VALUE th);
-void rb_clear_trace_func(void);
-VALUE rb_get_coverages(void);
-VALUE rb_thread_shield_new(void);
-VALUE rb_thread_shield_wait(VALUE self);
-VALUE rb_thread_shield_release(VALUE self);
-VALUE rb_thread_shield_destroy(VALUE self);
-int rb_thread_to_be_killed(VALUE thread);
-void rb_mutex_allow_trap(VALUE self, int val);
-VALUE rb_uninterruptible(VALUE (*b_proc)(ANYARGS), VALUE data);
-VALUE rb_mutex_owned_p(VALUE self);
-void ruby_kill(rb_pid_t pid, int sig);
-
-/* thread_pthread.c, thread_win32.c */
-void Init_native_thread(void);
-int rb_divert_reserved_fd(int fd);
-
-/* transcode.c */
-extern VALUE rb_cEncodingConverter;
-size_t rb_econv_memsize(rb_econv_t *);
-
-/* us_ascii.c */
-extern rb_encoding OnigEncodingUS_ASCII;
-
-/* util.c */
-char *ruby_dtoa(double d_, int mode, int ndigits, int *decpt, int *sign, char **rve);
-char *ruby_hdtoa(double d, const char *xdigs, int ndigits, int *decpt, int *sign, char **rve);
-
-/* utf_8.c */
-extern rb_encoding OnigEncodingUTF_8;
+/* internal/hash.h */
+#undef RHASH_IFNONE
+#undef RHASH_SIZE
+#undef RHASH_TBL
+#undef RHASH_EMPTY_P
 
-/* variable.c */
-void rb_gc_mark_global_tbl(void);
-size_t rb_generic_ivar_memsize(VALUE);
-VALUE rb_search_class_path(VALUE);
-VALUE rb_attr_delete(VALUE, ID);
-VALUE rb_ivar_lookup(VALUE obj, ID id, VALUE undef);
-void rb_autoload_str(VALUE mod, ID id, VALUE file);
+/* internal/object.h */
+#undef ROBJECT_IV_INDEX_TBL
 
-/* version.c */
-extern const char ruby_engine[];
+/* internal/struct.h */
+#undef RSTRUCT_LEN
+#undef RSTRUCT_PTR
+#undef RSTRUCT_SET
+#undef RSTRUCT_GET
 
-/* vm_insnhelper.h */
-rb_serial_t rb_next_class_serial(void);
+/* Also,  we  keep  the  following  macros  here.   They  are  expected  to  be
+ * overridden in each headers. */
 
-/* vm.c */
-VALUE rb_obj_is_thread(VALUE obj);
-void rb_vm_mark(void *ptr);
-void Init_BareVM(void);
-void Init_vm_objects(void);
-PUREFUNC(VALUE rb_vm_top_self(void));
-void rb_thread_recycle_stack_release(VALUE *);
-void rb_vm_change_state(void);
-void rb_vm_inc_const_missing_count(void);
-void rb_thread_mark(void *th);
-const void **rb_vm_get_insns_address_table(void);
-VALUE rb_sourcefilename(void);
-VALUE rb_source_location(int *pline);
-const char *rb_source_loc(int *pline);
-void rb_vm_pop_cfunc_frame(void);
-int rb_vm_add_root_module(ID id, VALUE module);
-void rb_vm_check_redefinition_by_prepend(VALUE klass);
-VALUE rb_yield_refine_block(VALUE refinement, VALUE refinements);
-VALUE ruby_vm_sysstack_error_copy(void);
-PUREFUNC(st_table *rb_vm_fstring_table(void));
+/* internal/array.h */
+#define rb_ary_new_from_args(...) rb_nonexistent_symbol(__VA_ARGS__)
 
+/* internal/io.h */
+#define rb_io_fptr_finalize(...) rb_nonexistent_symbol(__VA_ARGS__)
 
-/* vm_dump.c */
-void rb_print_backtrace(void);
+/* internal/string.h */
+#define rb_fstring_cstr(...) rb_nonexistent_symbol(__VA_ARGS__)
 
-/* vm_eval.c */
-void Init_vm_eval(void);
-VALUE rb_current_realfilepath(void);
-VALUE rb_check_block_call(VALUE, ID, int, const VALUE *, rb_block_call_func_t, VALUE);
-typedef void rb_check_funcall_hook(int, VALUE, ID, int, const VALUE *, VALUE);
-VALUE rb_check_funcall_with_hook(VALUE recv, ID mid, int argc, const VALUE *argv,
-				 rb_check_funcall_hook *hook, VALUE arg);
-VALUE rb_check_funcall_default(VALUE, ID, int, const VALUE *, VALUE);
-VALUE rb_catch_protect(VALUE t, rb_block_call_func *func, VALUE data, int *stateptr);
-VALUE rb_yield_1(VALUE val);
+/* internal/symbol.h */
+#define rb_sym_intern_ascii_cstr(...) rb_nonexistent_symbol(__VA_ARGS__)
 
-/* vm_insnhelper.c */
-VALUE rb_equal_opt(VALUE obj1, VALUE obj2);
+/* internal/vm.h */
+#define rb_funcallv(...) rb_nonexistent_symbol(__VA_ARGS__)
+#define rb_method_basic_definition_p(...) rb_nonexistent_symbol(__VA_ARGS__)
 
-/* vm_method.c */
-void Init_eval_method(void);
-int rb_method_defined_by(VALUE obj, ID mid, VALUE (*cfunc)(ANYARGS));
 
-/* miniprelude.c, prelude.c */
-void Init_prelude(void);
+/* MRI debug support */
 
-/* vm_backtrace.c */
-void Init_vm_backtrace(void);
-VALUE rb_vm_thread_backtrace(int argc, const VALUE *argv, VALUE thval);
-VALUE rb_vm_thread_backtrace_locations(int argc, const VALUE *argv, VALUE thval);
+/* gc.c */
+void rb_obj_info_dump(VALUE obj);
+void rb_obj_info_dump_loc(VALUE obj, const char *file, int line, const char *func);
 
-VALUE rb_make_backtrace(void);
-void rb_backtrace_print_as_bugreport(void);
-int rb_backtrace_p(VALUE obj);
-VALUE rb_backtrace_to_str_ary(VALUE obj);
-VALUE rb_backtrace_to_location_ary(VALUE obj);
-void rb_backtrace_print_to(VALUE output);
-VALUE rb_vm_backtrace_object(void);
+/* debug.c */
 
 RUBY_SYMBOL_EXPORT_BEGIN
-const char *rb_objspace_data_type_name(VALUE obj);
-
-/* Temporary.  This API will be removed (renamed). */
-VALUE rb_thread_io_blocking_region(rb_blocking_function_t *func, void *data1, int fd);
-
-/* bignum.c (export) */
-VALUE rb_big_mul_normal(VALUE x, VALUE y);
-VALUE rb_big_mul_balance(VALUE x, VALUE y);
-VALUE rb_big_mul_karatsuba(VALUE x, VALUE y);
-VALUE rb_big_mul_toom3(VALUE x, VALUE y);
-VALUE rb_big_sq_fast(VALUE x);
-VALUE rb_big_divrem_normal(VALUE x, VALUE y);
-VALUE rb_big2str_poweroftwo(VALUE x, int base);
-VALUE rb_big2str_generic(VALUE x, int base);
-VALUE rb_str2big_poweroftwo(VALUE arg, int base, int badcheck);
-VALUE rb_str2big_normal(VALUE arg, int base, int badcheck);
-VALUE rb_str2big_karatsuba(VALUE arg, int base, int badcheck);
-#if defined(HAVE_LIBGMP) && defined(HAVE_GMP_H)
-VALUE rb_big_mul_gmp(VALUE x, VALUE y);
-VALUE rb_big_divrem_gmp(VALUE x, VALUE y);
-VALUE rb_big2str_gmp(VALUE x, int base);
-VALUE rb_str2big_gmp(VALUE arg, int base, int badcheck);
-#endif
-
-/* error.c (export) */
-int rb_bug_reporter_add(void (*func)(FILE *, void *), void *data);
-
-/* file.c (export) */
-#ifdef HAVE_READLINK
-VALUE rb_readlink(VALUE path, rb_encoding *enc);
-#endif
-#ifdef __APPLE__
-VALUE rb_str_normalize_ospath(const char *ptr, long len);
-#endif
-
-/* hash.c (export) */
-VALUE rb_hash_delete_entry(VALUE hash, VALUE key);
-VALUE rb_ident_hash_new(void);
-
-/* io.c (export) */
-void rb_maygvl_fd_fix_cloexec(int fd);
-int rb_gc_for_fd(int err);
-void rb_write_error_str(VALUE mesg);
-
-/* numeric.c (export) */
-VALUE rb_int_positive_pow(long x, unsigned long y);
-
-/* process.c (export) */
-int rb_exec_async_signal_safe(const struct rb_execarg *e, char *errmsg, size_t errmsg_buflen);
-rb_pid_t rb_fork_async_signal_safe(int *status, int (*chfunc)(void*, char *, size_t), void *charg, VALUE fds, char *errmsg, size_t errmsg_buflen);
-VALUE rb_execarg_new(int argc, const VALUE *argv, int accept_shell);
-struct rb_execarg *rb_execarg_get(VALUE execarg_obj); /* dangerous.  needs GC guard. */
-VALUE rb_execarg_init(int argc, const VALUE *argv, int accept_shell, VALUE execarg_obj);
-int rb_execarg_addopt(VALUE execarg_obj, VALUE key, VALUE val);
-void rb_execarg_parent_start(VALUE execarg_obj);
-void rb_execarg_parent_end(VALUE execarg_obj);
-int rb_execarg_run_options(const struct rb_execarg *e, struct rb_execarg *s, char* errmsg, size_t errmsg_buflen);
-VALUE rb_execarg_extract_options(VALUE execarg_obj, VALUE opthash);
-void rb_execarg_setenv(VALUE execarg_obj, VALUE env);
-
-/* rational.c (export) */
-VALUE rb_gcd_normal(VALUE self, VALUE other);
-#if defined(HAVE_LIBGMP) && defined(HAVE_GMP_H)
-VALUE rb_gcd_gmp(VALUE x, VALUE y);
-#endif
-
-/* string.c (export) */
-#ifdef RUBY_ENCODING_H
-/* internal use */
-VALUE rb_setup_fake_str(struct RString *fake_str, const char *name, long len, rb_encoding *enc);
-#endif
-
-/* thread.c (export) */
-int ruby_thread_has_gvl_p(void); /* for ext/fiddle/closure.c */
-
-/* util.c (export) */
-extern const signed char ruby_digit36_to_number_table[];
-extern const char ruby_hexdigits[];
-extern unsigned long ruby_scan_digits(const char *str, ssize_t len, int base, size_t *retlen, int *overflow);
-
-/* variable.c (export) */
-void rb_mark_generic_ivar(VALUE);
-VALUE rb_const_missing(VALUE klass, VALUE name);
-int rb_class_ivar_set(VALUE klass, ID vid, VALUE value);
-st_table *rb_st_copy(VALUE obj, struct st_table *orig_tbl);
-
-/* gc.c (export) */
-VALUE rb_wb_protected_newobj_of(VALUE, VALUE);
-VALUE rb_wb_unprotected_newobj_of(VALUE, VALUE);
-
-size_t rb_obj_memsize_of(VALUE);
-void rb_gc_verify_internal_consistency(void);
-
-#define RB_OBJ_GC_FLAGS_MAX 5
-size_t rb_obj_gc_flags(VALUE, ID[], size_t);
-void rb_gc_mark_values(long n, const VALUE *values);
-
-#if IMEMO_DEBUG
-VALUE rb_imemo_new_debug(enum imemo_type type, VALUE v1, VALUE v2, VALUE v3, VALUE v0, const char *file, int line);
-#define rb_imemo_new(type, v1, v2, v3, v0) rb_imemo_new_debug(type, v1, v2, v3, v0, __FILE__, __LINE__)
-#else
-VALUE rb_imemo_new(enum imemo_type type, VALUE v1, VALUE v2, VALUE v3, VALUE v0);
-#endif
-
+void ruby_debug_breakpoint(void);
+PRINTF_ARGS(void ruby_debug_printf(const char*, ...), 1, 2);
 RUBY_SYMBOL_EXPORT_END
 
-#define RUBY_DTRACE_CREATE_HOOK(name, arg) \
-    RUBY_DTRACE_HOOK(name##_CREATE, arg)
-#define RUBY_DTRACE_HOOK(name, arg) \
-do { \
-    if (UNLIKELY(RUBY_DTRACE_##name##_ENABLED())) { \
-	int dtrace_line; \
-	const char *dtrace_file = rb_source_loc(&dtrace_line); \
-	if (!dtrace_file) dtrace_file = ""; \
-	RUBY_DTRACE_##name(arg, dtrace_file, dtrace_line); \
-    } \
+// show obj data structure without any side-effect
+#define rp(obj) rb_obj_info_dump_loc((VALUE)(obj), __FILE__, __LINE__, RUBY_FUNCTION_NAME_STRING)
+
+// same as rp, but add message header
+#define rp_m(msg, obj) do { \
+    fprintf(stderr, "%s", (msg)); \
+    rb_obj_info_dump((VALUE)obj); \
 } while (0)
 
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-}  /* extern "C" { */
-#endif
+// `ruby_debug_breakpoint()` does nothing,
+// but breakpoint is set in run.gdb, so `make gdb` can stop here.
+#define bp() ruby_debug_breakpoint()
 
 #endif /* RUBY_INTERNAL_H */
diff --git a/internal/array.h b/internal/array.h
new file mode 100644
index 0000000000..44c0efbbc1
--- /dev/null
+++ b/internal/array.h
@@ -0,0 +1,119 @@
+#ifndef INTERNAL_ARRAY_H                                 /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_ARRAY_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for Array.
+ */
+#include "ruby/internal/config.h"
+#include <stddef.h>                 /* for size_t */
+#include "internal/static_assert.h" /* for STATIC_ASSERT */
+#include "ruby/internal/stdbool.h"         /* for bool */
+#include "ruby/ruby.h"              /* for RARRAY_LEN */
+
+#ifndef ARRAY_DEBUG
+# define ARRAY_DEBUG (0+RUBY_DEBUG)
+#endif
+
+#define RARRAY_PTR_IN_USE_FLAG FL_USER14
+
+/* array.c */
+VALUE rb_ary_last(int, const VALUE *, VALUE);
+void rb_ary_set_len(VALUE, long);
+void rb_ary_delete_same(VALUE, VALUE);
+VALUE rb_ary_tmp_new_fill(long capa);
+VALUE rb_ary_at(VALUE, VALUE);
+size_t rb_ary_memsize(VALUE);
+VALUE rb_to_array_type(VALUE obj);
+void rb_ary_cancel_sharing(VALUE ary);
+
+static inline VALUE rb_ary_entry_internal(VALUE ary, long offset);
+static inline bool ARY_PTR_USING_P(VALUE ary);
+static inline void RARY_TRANSIENT_SET(VALUE ary);
+static inline void RARY_TRANSIENT_UNSET(VALUE ary);
+
+RUBY_SYMBOL_EXPORT_BEGIN
+/* array.c (export) */
+void rb_ary_detransient(VALUE a);
+VALUE *rb_ary_ptr_use_start(VALUE ary);
+void rb_ary_ptr_use_end(VALUE ary);
+RUBY_SYMBOL_EXPORT_END
+
+MJIT_SYMBOL_EXPORT_BEGIN
+VALUE rb_ary_tmp_new_from_values(VALUE, long, const VALUE *);
+VALUE rb_check_to_array(VALUE ary);
+VALUE rb_ary_behead(VALUE, long);
+VALUE rb_ary_aref1(VALUE ary, VALUE i);
+
+struct rb_execution_context_struct;
+VALUE rb_ec_ary_new_from_values(struct rb_execution_context_struct *ec, long n, const VALUE *elts);
+MJIT_SYMBOL_EXPORT_END
+
+static inline VALUE
+rb_ary_entry_internal(VALUE ary, long offset)
+{
+    long len = RARRAY_LEN(ary);
+    const VALUE *ptr = RARRAY_CONST_PTR_TRANSIENT(ary);
+    if (len == 0) return Qnil;
+    if (offset < 0) {
+        offset += len;
+        if (offset < 0) return Qnil;
+    }
+    else if (len <= offset) {
+        return Qnil;
+    }
+    return ptr[offset];
+}
+
+static inline bool
+ARY_PTR_USING_P(VALUE ary)
+{
+    return FL_TEST_RAW(ary, RARRAY_PTR_IN_USE_FLAG);
+}
+
+static inline void
+RARY_TRANSIENT_SET(VALUE ary)
+{
+#if USE_TRANSIENT_HEAP
+    FL_SET_RAW(ary, RARRAY_TRANSIENT_FLAG);
+#endif
+}
+
+static inline void
+RARY_TRANSIENT_UNSET(VALUE ary)
+{
+#if USE_TRANSIENT_HEAP
+    FL_UNSET_RAW(ary, RARRAY_TRANSIENT_FLAG);
+#endif
+}
+
+#undef rb_ary_new_from_args
+#if RBIMPL_HAS_WARNING("-Wgnu-zero-variadic-macro-arguments")
+# /* Skip it; clang -pedantic doesn't like the following */
+#elif defined(__GNUC__) && defined(HAVE_VA_ARGS_MACRO)
+#define rb_ary_new_from_args(n, ...) \
+    __extension__ ({ \
+        const VALUE args_to_new_ary[] = {__VA_ARGS__}; \
+        if (__builtin_constant_p(n)) { \
+            STATIC_ASSERT(rb_ary_new_from_args, numberof(args_to_new_ary) == (n)); \
+        } \
+        rb_ary_new_from_values(numberof(args_to_new_ary), args_to_new_ary); \
+    })
+#endif
+
+#undef RARRAY_AREF
+RBIMPL_ATTR_PURE_UNLESS_DEBUG()
+RBIMPL_ATTR_ARTIFICIAL()
+static inline VALUE
+RARRAY_AREF(VALUE ary, long i)
+{
+    RBIMPL_ASSERT_TYPE(ary, RUBY_T_ARRAY);
+
+    return RARRAY_CONST_PTR_TRANSIENT(ary)[i];
+}
+
+#endif /* INTERNAL_ARRAY_H */
diff --git a/internal/bignum.h b/internal/bignum.h
new file mode 100644
index 0000000000..95c1e6eacd
--- /dev/null
+++ b/internal/bignum.h
@@ -0,0 +1,246 @@
+#ifndef INTERNAL_BIGNUM_H                                /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_BIGNUM_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for Bignums.
+ */
+#include "ruby/internal/config.h"      /* for HAVE_LIBGMP */
+#include <stddef.h>             /* for size_t */
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>         /* for ssize_t (note: on Windows ssize_t is */
+#endif                          /* `#define`d in ruby/config.h) */
+
+#include "ruby/internal/stdbool.h"     /* for bool */
+#include "ruby/ruby.h"          /* for struct RBasic */
+
+#ifndef BDIGIT
+# if SIZEOF_INT*2 <= SIZEOF_LONG_LONG
+#  define BDIGIT unsigned int
+#  define SIZEOF_BDIGIT SIZEOF_INT
+#  define BDIGIT_DBL unsigned LONG_LONG
+#  define BDIGIT_DBL_SIGNED LONG_LONG
+#  define PRI_BDIGIT_PREFIX ""
+#  define PRI_BDIGIT_DBL_PREFIX PRI_LL_PREFIX
+# elif SIZEOF_INT*2 <= SIZEOF_LONG
+#  define BDIGIT unsigned int
+#  define SIZEOF_BDIGIT SIZEOF_INT
+#  define BDIGIT_DBL unsigned long
+#  define BDIGIT_DBL_SIGNED long
+#  define PRI_BDIGIT_PREFIX ""
+#  define PRI_BDIGIT_DBL_PREFIX "l"
+# elif SIZEOF_SHORT*2 <= SIZEOF_LONG
+#  define BDIGIT unsigned short
+#  define SIZEOF_BDIGIT SIZEOF_SHORT
+#  define BDIGIT_DBL unsigned long
+#  define BDIGIT_DBL_SIGNED long
+#  define PRI_BDIGIT_PREFIX "h"
+#  define PRI_BDIGIT_DBL_PREFIX "l"
+# else
+#  define BDIGIT unsigned short
+#  define SIZEOF_BDIGIT (SIZEOF_LONG/2)
+#  define SIZEOF_ACTUAL_BDIGIT SIZEOF_LONG
+#  define BDIGIT_DBL unsigned long
+#  define BDIGIT_DBL_SIGNED long
+#  define PRI_BDIGIT_PREFIX "h"
+#  define PRI_BDIGIT_DBL_PREFIX "l"
+# endif
+#endif
+
+#ifndef SIZEOF_ACTUAL_BDIGIT
+# define SIZEOF_ACTUAL_BDIGIT SIZEOF_BDIGIT
+#endif
+
+#ifdef PRI_BDIGIT_PREFIX
+# define PRIdBDIGIT PRI_BDIGIT_PREFIX"d"
+# define PRIiBDIGIT PRI_BDIGIT_PREFIX"i"
+# define PRIoBDIGIT PRI_BDIGIT_PREFIX"o"
+# define PRIuBDIGIT PRI_BDIGIT_PREFIX"u"
+# define PRIxBDIGIT PRI_BDIGIT_PREFIX"x"
+# define PRIXBDIGIT PRI_BDIGIT_PREFIX"X"
+#endif
+
+#ifdef PRI_BDIGIT_DBL_PREFIX
+# define PRIdBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"d"
+# define PRIiBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"i"
+# define PRIoBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"o"
+# define PRIuBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"u"
+# define PRIxBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"x"
+# define PRIXBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"X"
+#endif
+
+#define RBIGNUM(obj) ((struct RBignum *)(obj))
+#define BIGNUM_SIGN_BIT FL_USER1
+#define BIGNUM_EMBED_FLAG ((VALUE)FL_USER2)
+#define BIGNUM_EMBED_LEN_NUMBITS 3
+#define BIGNUM_EMBED_LEN_MASK \
+    (~(~(VALUE)0U << BIGNUM_EMBED_LEN_NUMBITS) << BIGNUM_EMBED_LEN_SHIFT)
+#define BIGNUM_EMBED_LEN_SHIFT \
+    (FL_USHIFT+3) /* bit offset of BIGNUM_EMBED_LEN_MASK */
+#ifndef BIGNUM_EMBED_LEN_MAX
+# if (SIZEOF_VALUE*RVALUE_EMBED_LEN_MAX/SIZEOF_ACTUAL_BDIGIT) < (1 << BIGNUM_EMBED_LEN_NUMBITS)-1
+#  define BIGNUM_EMBED_LEN_MAX (SIZEOF_VALUE*RVALUE_EMBED_LEN_MAX/SIZEOF_ACTUAL_BDIGIT)
+# else
+#  define BIGNUM_EMBED_LEN_MAX ((1 << BIGNUM_EMBED_LEN_NUMBITS)-1)
+# endif
+#endif
+
+enum rb_int_parse_flags {
+    RB_INT_PARSE_SIGN       = 0x01,
+    RB_INT_PARSE_UNDERSCORE = 0x02,
+    RB_INT_PARSE_PREFIX     = 0x04,
+    RB_INT_PARSE_ALL        = 0x07,
+    RB_INT_PARSE_DEFAULT    = 0x07,
+};
+
+struct RBignum {
+    struct RBasic basic;
+    union {
+        struct {
+            size_t len;
+            BDIGIT *digits;
+        } heap;
+        BDIGIT ary[BIGNUM_EMBED_LEN_MAX];
+    } as;
+};
+
+/* bignum.c */
+extern const char ruby_digitmap[];
+double rb_big_fdiv_double(VALUE x, VALUE y);
+VALUE rb_big_uminus(VALUE x);
+VALUE rb_big_hash(VALUE);
+VALUE rb_big_odd_p(VALUE);
+VALUE rb_big_even_p(VALUE);
+size_t rb_big_size(VALUE);
+VALUE rb_integer_float_cmp(VALUE x, VALUE y);
+VALUE rb_integer_float_eq(VALUE x, VALUE y);
+VALUE rb_str_convert_to_inum(VALUE str, int base, int badcheck, int raise_exception);
+VALUE rb_big_comp(VALUE x);
+VALUE rb_big_aref(VALUE x, VALUE y);
+VALUE rb_big_abs(VALUE x);
+VALUE rb_big_size_m(VALUE big);
+VALUE rb_big_bit_length(VALUE big);
+VALUE rb_big_remainder(VALUE x, VALUE y);
+VALUE rb_big_gt(VALUE x, VALUE y);
+VALUE rb_big_ge(VALUE x, VALUE y);
+VALUE rb_big_lt(VALUE x, VALUE y);
+VALUE rb_big_le(VALUE x, VALUE y);
+VALUE rb_int_powm(int const argc, VALUE * const argv, VALUE const num);
+static inline bool BIGNUM_SIGN(VALUE b);
+static inline bool BIGNUM_POSITIVE_P(VALUE b);
+static inline bool BIGNUM_NEGATIVE_P(VALUE b);
+static inline void BIGNUM_SET_SIGN(VALUE b, bool sign);
+static inline void BIGNUM_NEGATE(VALUE b);
+static inline size_t BIGNUM_LEN(VALUE b);
+static inline BDIGIT *BIGNUM_DIGITS(VALUE b);
+static inline int BIGNUM_LENINT(VALUE b);
+static inline bool BIGNUM_EMBED_P(VALUE b);
+
+RUBY_SYMBOL_EXPORT_BEGIN
+/* bignum.c (export) */
+VALUE rb_big_mul_normal(VALUE x, VALUE y);
+VALUE rb_big_mul_balance(VALUE x, VALUE y);
+VALUE rb_big_mul_karatsuba(VALUE x, VALUE y);
+VALUE rb_big_mul_toom3(VALUE x, VALUE y);
+VALUE rb_big_sq_fast(VALUE x);
+VALUE rb_big_divrem_normal(VALUE x, VALUE y);
+VALUE rb_big2str_poweroftwo(VALUE x, int base);
+VALUE rb_big2str_generic(VALUE x, int base);
+VALUE rb_str2big_poweroftwo(VALUE arg, int base, int badcheck);
+VALUE rb_str2big_normal(VALUE arg, int base, int badcheck);
+VALUE rb_str2big_karatsuba(VALUE arg, int base, int badcheck);
+#if defined(HAVE_LIBGMP) && defined(HAVE_GMP_H)
+VALUE rb_big_mul_gmp(VALUE x, VALUE y);
+VALUE rb_big_divrem_gmp(VALUE x, VALUE y);
+VALUE rb_big2str_gmp(VALUE x, int base);
+VALUE rb_str2big_gmp(VALUE arg, int base, int badcheck);
+#endif
+VALUE rb_int_parse_cstr(const char *str, ssize_t len, char **endp, size_t *ndigits, int base, int flags);
+RUBY_SYMBOL_EXPORT_END
+
+MJIT_SYMBOL_EXPORT_BEGIN
+#if defined(HAVE_INT128_T)
+VALUE rb_int128t2big(int128_t n);
+#endif
+MJIT_SYMBOL_EXPORT_END
+
+/* sign: positive:1, negative:0 */
+static inline bool
+BIGNUM_SIGN(VALUE b)
+{
+    return FL_TEST_RAW(b, BIGNUM_SIGN_BIT);
+}
+
+static inline bool
+BIGNUM_POSITIVE_P(VALUE b)
+{
+    return BIGNUM_SIGN(b);
+}
+
+static inline bool
+BIGNUM_NEGATIVE_P(VALUE b)
+{
+    return ! BIGNUM_POSITIVE_P(b);
+}
+
+static inline void
+BIGNUM_SET_SIGN(VALUE b, bool sign)
+{
+    if (sign) {
+        FL_SET_RAW(b, BIGNUM_SIGN_BIT);
+    }
+    else {
+        FL_UNSET_RAW(b, BIGNUM_SIGN_BIT);
+    }
+}
+
+static inline void
+BIGNUM_NEGATE(VALUE b)
+{
+    FL_REVERSE_RAW(b, BIGNUM_SIGN_BIT);
+}
+
+static inline size_t
+BIGNUM_LEN(VALUE b)
+{
+    if (! BIGNUM_EMBED_P(b)) {
+        return RBIGNUM(b)->as.heap.len;
+    }
+    else {
+        size_t ret = RBASIC(b)->flags;
+        ret &= BIGNUM_EMBED_LEN_MASK;
+        ret >>= BIGNUM_EMBED_LEN_SHIFT;
+        return ret;
+    }
+}
+
+static inline int
+BIGNUM_LENINT(VALUE b)
+{
+    return rb_long2int(BIGNUM_LEN(b));
+}
+
+/* LSB:BIGNUM_DIGITS(b)[0], MSB:BIGNUM_DIGITS(b)[BIGNUM_LEN(b)-1] */
+static inline BDIGIT *
+BIGNUM_DIGITS(VALUE b)
+{
+    if (BIGNUM_EMBED_P(b)) {
+        return RBIGNUM(b)->as.ary;
+    }
+    else {
+        return RBIGNUM(b)->as.heap.digits;
+    }
+}
+
+static inline bool
+BIGNUM_EMBED_P(VALUE b)
+{
+    return FL_TEST_RAW(b, BIGNUM_EMBED_FLAG);
+}
+
+#endif /* INTERNAL_BIGNUM_H */
diff --git a/internal/bits.h b/internal/bits.h
new file mode 100644
index 0000000000..746947bfc2
--- /dev/null
+++ b/internal/bits.h
@@ -0,0 +1,566 @@
+#ifndef INTERNAL_BITS_H                                  /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_BITS_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for bitwise integer algorithms.
+ * @see        Henry S. Warren Jr., "Hacker's Delight" (2nd ed.), 2013.
+ * @see        SEI CERT C Coding Standard  INT32-C.  "Ensure that operations on
+ *             signed integers do not result in overflow"
+ * @see        https://gcc.gnu.org/onlinedocs/gcc/Other-Builtins.html
+ * @see        https://clang.llvm.org/docs/LanguageExtensions.html#builtin-rotateleft
+ * @see        https://clang.llvm.org/docs/LanguageExtensions.html#builtin-rotateright
+ * @see        https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/byteswap-uint64-byteswap-ulong-byteswap-ushort
+ * @see        https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/rotl-rotl64-rotr-rotr64
+ * @see        https://docs.microsoft.com/en-us/cpp/intrinsics/bitscanforward-bitscanforward64
+ * @see        https://docs.microsoft.com/en-us/cpp/intrinsics/bitscanreverse-bitscanreverse64
+ * @see        https://docs.microsoft.com/en-us/cpp/intrinsics/lzcnt16-lzcnt-lzcnt64
+ * @see        https://docs.microsoft.com/en-us/cpp/intrinsics/popcnt16-popcnt-popcnt64
+ * @see        https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_lzcnt_u32
+ * @see        https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_tzcnt_u32
+ * @see        https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_rotl64
+ * @see        https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_rotr64
+ * @see        https://stackoverflow.com/a/776523
+ */
+#include "ruby/internal/config.h"
+#include <limits.h>             /* for CHAR_BITS */
+#include <stdint.h>             /* for uintptr_t */
+#include "internal/compilers.h" /* for MSC_VERSION_SINCE */
+
+#if MSC_VERSION_SINCE(1310)
+# include <stdlib.h>            /* for _byteswap_uint64 */
+#endif
+
+#if defined(HAVE_X86INTRIN_H) && ! defined(MJIT_HEADER)
+# /* Rule out MJIT_HEADER, which does not interface well with <immintrin.h> */
+# include <x86intrin.h>         /* for _lzcnt_u64 */
+#elif MSC_VERSION_SINCE(1310)
+# include <intrin.h>            /* for the following intrinsics */
+#endif
+
+#if defined(_MSC_VER) && defined(__AVX__)
+# pragma intrinsic(__popcnt)
+# pragma intrinsic(__popcnt64)
+#endif
+
+#if defined(_MSC_VER) && defined(__AVX2__)
+# pragma intrinsic(__lzcnt)
+# pragma intrinsic(__lzcnt64)
+#endif
+
+#if MSC_VERSION_SINCE(1310)
+# pragma intrinsic(_rotl)
+# pragma intrinsic(_rotr)
+# ifdef _WIN64
+#  pragma intrinsic(_rotl64)
+#  pragma intrinsic(_rotr64)
+# endif
+#endif
+
+#if MSC_VERSION_SINCE(1400)
+# pragma intrinsic(_BitScanForward)
+# pragma intrinsic(_BitScanReverse)
+# ifdef _WIN64
+#  pragma intrinsic(_BitScanForward64)
+#  pragma intrinsic(_BitScanReverse64)
+# endif
+#endif
+
+#include "ruby/ruby.h"              /* for VALUE */
+#include "internal/static_assert.h" /* for STATIC_ASSERT */
+
+/* The most significant bit of the lower part of half-long integer.
+ * If sizeof(long) == 4, this is 0x8000.
+ * If sizeof(long) == 8, this is 0x80000000.
+ */
+#define HALF_LONG_MSB ((SIGNED_VALUE)1<<((SIZEOF_LONG*CHAR_BIT-1)/2))
+
+#define SIGNED_INTEGER_TYPE_P(T) (0 > ((T)0)-1)
+
+#define SIGNED_INTEGER_MIN(T)                           \
+    ((sizeof(T) == sizeof(int8_t))  ? ((T)INT8_MIN)  :  \
+    ((sizeof(T) == sizeof(int16_t)) ? ((T)INT16_MIN) :  \
+    ((sizeof(T) == sizeof(int32_t)) ? ((T)INT32_MIN) :  \
+    ((sizeof(T) == sizeof(int64_t)) ? ((T)INT64_MIN) :  \
+     0))))
+
+#define SIGNED_INTEGER_MAX(T) ((T)(SIGNED_INTEGER_MIN(T) ^ ((T)~(T)0)))
+
+#define UNSIGNED_INTEGER_MAX(T) ((T)~(T)0)
+
+#if __has_builtin(__builtin_mul_overflow_p)
+# define MUL_OVERFLOW_P(a, b) \
+    __builtin_mul_overflow_p((a), (b), (__typeof__(a * b))0)
+#elif __has_builtin(__builtin_mul_overflow)
+# define MUL_OVERFLOW_P(a, b) \
+    __extension__ ({ __typeof__(a) c; __builtin_mul_overflow((a), (b), &c); })
+#endif
+
+#define MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, min, max) ( \
+    (a) == 0 ? 0 : \
+    (a) == -1 ? (b) < -(max) : \
+    (a) > 0 ? \
+      ((b) > 0 ? (max) / (a) < (b) : (min) / (a) > (b)) : \
+      ((b) > 0 ? (min) / (a) < (b) : (max) / (a) > (b)))
+
+#if __has_builtin(__builtin_mul_overflow_p)
+/* __builtin_mul_overflow_p can take bitfield */
+/* and GCC permits bitfields for integers other than int */
+# define MUL_OVERFLOW_FIXNUM_P(a, b) \
+    __extension__ ({ \
+        struct { long fixnum : sizeof(long) * CHAR_BIT - 1; } c = { 0 }; \
+        __builtin_mul_overflow_p((a), (b), c.fixnum); \
+    })
+#else
+# define MUL_OVERFLOW_FIXNUM_P(a, b) \
+    MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, FIXNUM_MIN, FIXNUM_MAX)
+#endif
+
+#ifdef MUL_OVERFLOW_P
+# define MUL_OVERFLOW_LONG_LONG_P(a, b) MUL_OVERFLOW_P(a, b)
+# define MUL_OVERFLOW_LONG_P(a, b)      MUL_OVERFLOW_P(a, b)
+# define MUL_OVERFLOW_INT_P(a, b)       MUL_OVERFLOW_P(a, b)
+#else
+# define MUL_OVERFLOW_LONG_LONG_P(a, b) MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, LLONG_MIN, LLONG_MAX)
+# define MUL_OVERFLOW_LONG_P(a, b)      MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, LONG_MIN, LONG_MAX)
+# define MUL_OVERFLOW_INT_P(a, b)       MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, INT_MIN, INT_MAX)
+#endif
+
+#ifdef HAVE_UINT128_T
+# define bit_length(x) \
+    (unsigned int) \
+    (sizeof(x) <= sizeof(int32_t) ? 32 - nlz_int32((uint32_t)(x)) : \
+     sizeof(x) <= sizeof(int64_t) ? 64 - nlz_int64((uint64_t)(x)) : \
+                                   128 - nlz_int128((uint128_t)(x)))
+#else
+# define bit_length(x) \
+    (unsigned int) \
+    (sizeof(x) <= sizeof(int32_t) ? 32 - nlz_int32((uint32_t)(x)) : \
+                                    64 - nlz_int64((uint64_t)(x)))
+#endif
+
+#ifndef swap16
+# define swap16 ruby_swap16
+#endif
+
+#ifndef swap32
+# define swap32 ruby_swap32
+#endif
+
+#ifndef swap64
+# define swap64 ruby_swap64
+#endif
+
+static inline uint16_t ruby_swap16(uint16_t);
+static inline uint32_t ruby_swap32(uint32_t);
+static inline uint64_t ruby_swap64(uint64_t);
+static inline unsigned nlz_int(unsigned x);
+static inline unsigned nlz_long(unsigned long x);
+static inline unsigned nlz_long_long(unsigned long long x);
+static inline unsigned nlz_intptr(uintptr_t x);
+static inline unsigned nlz_int32(uint32_t x);
+static inline unsigned nlz_int64(uint64_t x);
+#ifdef HAVE_UINT128_T
+static inline unsigned nlz_int128(uint128_t x);
+#endif
+static inline unsigned rb_popcount32(uint32_t x);
+static inline unsigned rb_popcount64(uint64_t x);
+static inline unsigned rb_popcount_intptr(uintptr_t x);
+static inline int ntz_int32(uint32_t x);
+static inline int ntz_int64(uint64_t x);
+static inline int ntz_intptr(uintptr_t x);
+static inline VALUE RUBY_BIT_ROTL(VALUE, int);
+static inline VALUE RUBY_BIT_ROTR(VALUE, int);
+
+static inline uint16_t
+ruby_swap16(uint16_t x)
+{
+#if __has_builtin(__builtin_bswap16)
+    return __builtin_bswap16(x);
+
+#elif MSC_VERSION_SINCE(1310)
+    return _byteswap_ushort(x);
+
+#else
+    return (x << 8) | (x >> 8);
+
+#endif
+}
+
+static inline uint32_t
+ruby_swap32(uint32_t x)
+{
+#if __has_builtin(__builtin_bswap32)
+    return __builtin_bswap32(x);
+
+#elif MSC_VERSION_SINCE(1310)
+    return _byteswap_ulong(x);
+
+#else
+    x = ((x & 0x0000FFFF) << 16) | ((x & 0xFFFF0000) >> 16);
+    x = ((x & 0x00FF00FF) <<  8) | ((x & 0xFF00FF00) >>  8);
+    return x;
+
+#endif
+}
+
+static inline uint64_t
+ruby_swap64(uint64_t x)
+{
+#if __has_builtin(__builtin_bswap64)
+    return __builtin_bswap64(x);
+
+#elif MSC_VERSION_SINCE(1310)
+    return _byteswap_uint64(x);
+
+#else
+    x = ((x & 0x00000000FFFFFFFFULL) << 32) | ((x & 0xFFFFFFFF00000000ULL) >> 32);
+    x = ((x & 0x0000FFFF0000FFFFULL) << 16) | ((x & 0xFFFF0000FFFF0000ULL) >> 16);
+    x = ((x & 0x00FF00FF00FF00FFULL) <<  8) | ((x & 0xFF00FF00FF00FF00ULL) >>  8);
+    return x;
+
+#endif
+}
+
+static inline unsigned int
+nlz_int32(uint32_t x)
+{
+#if defined(_MSC_VER) && defined(__AVX2__)
+    /* Note: It seems there is no such thing like __LZCNT__ predefined in MSVC.
+     * AMD  CPUs have  had this  instruction for  decades (since  K10) but  for
+     * Intel, Haswell is  the oldest one.  We need to  use __AVX2__ for maximum
+     * safety. */
+    return (unsigned int)__lzcnt(x);
+
+#elif defined(__x86_64__) && defined(__LZCNT__) && ! defined(MJIT_HEADER)
+    return (unsigned int)_lzcnt_u32(x);
+
+#elif MSC_VERSION_SINCE(1400) /* &&! defined(__AVX2__) */
+    unsigned long r;
+    return _BitScanReverse(&r, x) ? (31 - (int)r) : 32;
+
+#elif __has_builtin(__builtin_clz)
+    STATIC_ASSERT(sizeof_int, sizeof(int) * CHAR_BIT == 32);
+    return x ? (unsigned int)__builtin_clz(x) : 32;
+
+#else
+    uint32_t y;
+    unsigned n = 32;
+    y = x >> 16; if (y) {n -= 16; x = y;}
+    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 (unsigned int)(n - x);
+#endif
+}
+
+static inline unsigned int
+nlz_int64(uint64_t x)
+{
+#if defined(_MSC_VER) && defined(__AVX2__)
+    return (unsigned int)__lzcnt64(x);
+
+#elif defined(__x86_64__) && defined(__LZCNT__) && ! defined(MJIT_HEADER)
+    return (unsigned int)_lzcnt_u64(x);
+
+#elif defined(_WIN64) && MSC_VERSION_SINCE(1400) /* &&! defined(__AVX2__) */
+    unsigned long r;
+    return _BitScanReverse64(&r, x) ? (63u - (unsigned int)r) : 64;
+
+#elif __has_builtin(__builtin_clzl)
+    if (x == 0) {
+        return 64;
+    }
+    else if (sizeof(long) * CHAR_BIT == 64) {
+        return (unsigned int)__builtin_clzl((unsigned long)x);
+    }
+    else if (sizeof(long long) * CHAR_BIT == 64) {
+        return (unsigned int)__builtin_clzll((unsigned long long)x);
+    }
+    else {
+        /* :FIXME: Is there a way to make this branch a compile-time error? */
+        UNREACHABLE_RETURN(~0);
+    }
+
+#else
+    uint64_t y;
+    unsigned int n = 64;
+    y = x >> 32; if (y) {n -= 32; x = y;}
+    y = x >> 16; if (y) {n -= 16; x = y;}
+    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 (unsigned int)(n - x);
+
+#endif
+}
+
+#ifdef HAVE_UINT128_T
+static inline unsigned int
+nlz_int128(uint128_t x)
+{
+    uint64_t y = (uint64_t)(x >> 64);
+
+    if (x == 0) {
+        return 128;
+    }
+    else if (y == 0) {
+        return (unsigned int)nlz_int64(x) + 64;
+    }
+    else {
+        return (unsigned int)nlz_int64(y);
+    }
+}
+#endif
+
+static inline unsigned int
+nlz_int(unsigned int x)
+{
+    if (sizeof(unsigned int) * CHAR_BIT == 32) {
+        return nlz_int32((uint32_t)x);
+    }
+    else if (sizeof(unsigned int) * CHAR_BIT == 64) {
+        return nlz_int64((uint64_t)x);
+    }
+    else {
+        UNREACHABLE_RETURN(~0);
+    }
+}
+
+static inline unsigned int
+nlz_long(unsigned long x)
+{
+    if (sizeof(unsigned long) * CHAR_BIT == 32) {
+        return nlz_int32((uint32_t)x);
+    }
+    else if (sizeof(unsigned long) * CHAR_BIT == 64) {
+        return nlz_int64((uint64_t)x);
+    }
+    else {
+        UNREACHABLE_RETURN(~0);
+    }
+}
+
+static inline unsigned int
+nlz_long_long(unsigned long long x)
+{
+    if (sizeof(unsigned long long) * CHAR_BIT == 64) {
+        return nlz_int64((uint64_t)x);
+    }
+#ifdef HAVE_UINT128_T
+    else if (sizeof(unsigned long long) * CHAR_BIT == 128) {
+        return nlz_int128((uint128_t)x);
+    }
+#endif
+    else {
+        UNREACHABLE_RETURN(~0);
+    }
+}
+
+static inline unsigned int
+nlz_intptr(uintptr_t x)
+{
+    if (sizeof(uintptr_t) == sizeof(unsigned int)) {
+        return nlz_int((unsigned int)x);
+    }
+    if (sizeof(uintptr_t) == sizeof(unsigned long)) {
+        return nlz_long((unsigned long)x);
+    }
+    if (sizeof(uintptr_t) == sizeof(unsigned long long)) {
+        return nlz_long_long((unsigned long long)x);
+    }
+    else {
+        UNREACHABLE_RETURN(~0);
+    }
+}
+
+static inline unsigned int
+rb_popcount32(uint32_t x)
+{
+#if defined(_MSC_VER) && defined(__AVX__)
+    /* Note: CPUs since Nehalem and Barcelona  have had this instruction so SSE
+     * 4.2 should suffice, but it seems there is no such thing like __SSE_4_2__
+     * predefined macro in MSVC.  They do have __AVX__ so use it instead. */
+    return (unsigned int)__popcnt(x);
+
+#elif __has_builtin(__builtin_popcount)
+    STATIC_ASSERT(sizeof_int, sizeof(int) * CHAR_BIT >= 32);
+    return (unsigned int)__builtin_popcount(x);
+
+#else
+    x = (x & 0x55555555) + (x >> 1 & 0x55555555);
+    x = (x & 0x33333333) + (x >> 2 & 0x33333333);
+    x = (x & 0x0f0f0f0f) + (x >> 4 & 0x0f0f0f0f);
+    x = (x & 0x001f001f) + (x >> 8 & 0x001f001f);
+    x = (x & 0x0000003f) + (x >>16 & 0x0000003f);
+    return (unsigned int)x;
+
+#endif
+}
+
+static inline unsigned int
+rb_popcount64(uint64_t x)
+{
+#if defined(_MSC_VER) && defined(__AVX__)
+    return (unsigned int)__popcnt64(x);
+
+#elif __has_builtin(__builtin_popcount)
+    if (sizeof(long) * CHAR_BIT == 64) {
+        return (unsigned int)__builtin_popcountl((unsigned long)x);
+    }
+    else if (sizeof(long long) * CHAR_BIT == 64) {
+        return (unsigned int)__builtin_popcountll((unsigned long long)x);
+    }
+    else {
+        /* :FIXME: Is there a way to make this branch a compile-time error? */
+        UNREACHABLE_RETURN(~0);
+    }
+
+#else
+    x = (x & 0x5555555555555555) + (x >> 1 & 0x5555555555555555);
+    x = (x & 0x3333333333333333) + (x >> 2 & 0x3333333333333333);
+    x = (x & 0x0707070707070707) + (x >> 4 & 0x0707070707070707);
+    x = (x & 0x001f001f001f001f) + (x >> 8 & 0x001f001f001f001f);
+    x = (x & 0x0000003f0000003f) + (x >>16 & 0x0000003f0000003f);
+    x = (x & 0x000000000000007f) + (x >>32 & 0x000000000000007f);
+    return (unsigned int)x;
+
+#endif
+}
+
+static inline unsigned int
+rb_popcount_intptr(uintptr_t x)
+{
+    if (sizeof(uintptr_t) * CHAR_BIT == 64) {
+        return rb_popcount64((uint64_t)x);
+    }
+    else if (sizeof(uintptr_t) * CHAR_BIT == 32) {
+        return rb_popcount32((uint32_t)x);
+    }
+    else {
+        UNREACHABLE_RETURN(~0);
+    }
+}
+
+static inline int
+ntz_int32(uint32_t x)
+{
+#if defined(__x86_64__) && defined(__BMI__) && ! defined(MJIT_HEADER)
+    return (unsigned)_tzcnt_u32(x);
+
+#elif MSC_VERSION_SINCE(1400)
+    /* :FIXME: Is there any way to issue TZCNT instead of BSF, apart from using
+     *         assembly?  Because issuing LZCNT seems possible (see nlz.h). */
+    unsigned long r;
+    return _BitScanForward(&r, x) ? (int)r : 32;
+
+#elif __has_builtin(__builtin_ctz)
+    STATIC_ASSERT(sizeof_int, sizeof(int) * CHAR_BIT == 32);
+    return x ? (unsigned)__builtin_ctz(x) : 32;
+
+#else
+    return rb_popcount32((~x) & (x-1));
+
+#endif
+}
+
+static inline int
+ntz_int64(uint64_t x)
+{
+#if defined(__x86_64__) && defined(__BMI__) && ! defined(MJIT_HEADER)
+    return (unsigned)_tzcnt_u64(x);
+
+#elif defined(_WIN64) && MSC_VERSION_SINCE(1400)
+    unsigned long r;
+    return _BitScanForward64(&r, x) ? (int)r : 64;
+
+#elif __has_builtin(__builtin_ctzl)
+    if (x == 0) {
+        return 64;
+    }
+    else if (sizeof(long) * CHAR_BIT == 64) {
+        return (unsigned)__builtin_ctzl((unsigned long)x);
+    }
+    else if (sizeof(long long) * CHAR_BIT == 64) {
+        return (unsigned)__builtin_ctzll((unsigned long long)x);
+    }
+    else {
+        /* :FIXME: Is there a way to make this branch a compile-time error? */
+        UNREACHABLE_RETURN(~0);
+    }
+
+#else
+    return rb_popcount64((~x) & (x-1));
+
+#endif
+}
+
+static inline int
+ntz_intptr(uintptr_t x)
+{
+    if (sizeof(uintptr_t) * CHAR_BIT == 64) {
+        return ntz_int64((uint64_t)x);
+    }
+    else if (sizeof(uintptr_t) * CHAR_BIT == 32) {
+        return ntz_int32((uint32_t)x);
+    }
+    else {
+        UNREACHABLE_RETURN(~0);
+    }
+}
+
+static inline VALUE
+RUBY_BIT_ROTL(VALUE v, int n)
+{
+#if __has_builtin(__builtin_rotateleft32) && (SIZEOF_VALUE * CHAR_BIT == 32)
+    return __builtin_rotateleft32(v, n);
+
+#elif __has_builtin(__builtin_rotateleft64) && (SIZEOF_VALUE * CHAR_BIT == 64)
+    return __builtin_rotateleft64(v, n);
+
+#elif MSC_VERSION_SINCE(1310) && (SIZEOF_VALUE * CHAR_BIT == 32)
+    return _rotl(v, n);
+
+#elif MSC_VERSION_SINCE(1310) && (SIZEOF_VALUE * CHAR_BIT == 64)
+    return _rotl64(v, n);
+
+#elif defined(_lrotl) && (SIZEOF_VALUE == SIZEOF_LONG)
+    return _lrotl(v, n);
+
+#else
+    const int m = (sizeof(VALUE) * CHAR_BIT) - 1;
+    return (v << (n & m)) | (v >> (-n & m));
+#endif
+}
+
+static inline VALUE
+RUBY_BIT_ROTR(VALUE v, int n)
+{
+#if __has_builtin(__builtin_rotateright32) && (SIZEOF_VALUE * CHAR_BIT == 32)
+    return __builtin_rotateright32(v, n);
+
+#elif __has_builtin(__builtin_rotateright64) && (SIZEOF_VALUE * CHAR_BIT == 64)
+    return __builtin_rotateright64(v, n);
+
+#elif MSC_VERSION_SINCE(1310) && (SIZEOF_VALUE * CHAR_BIT == 32)
+    return _rotr(v, n);
+
+#elif MSC_VERSION_SINCE(1310) && (SIZEOF_VALUE * CHAR_BIT == 64)
+    return _rotr64(v, n);
+
+#elif defined(_lrotr) && (SIZEOF_VALUE == SIZEOF_LONG)
+    return _lrotr(v, n);
+
+#else
+    const int m = (sizeof(VALUE) * CHAR_BIT) - 1;
+    return (v << (-n & m)) | (v >> (n & m));
+#endif
+}
+
+#endif /* INTERNAL_BITS_H */
diff --git a/internal/class.h b/internal/class.h
new file mode 100644
index 0000000000..eade920ff0
--- /dev/null
+++ b/internal/class.h
@@ -0,0 +1,174 @@
+#ifndef INTERNAL_CLASS_H                                 /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_CLASS_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for Class.
+ */
+#include "id_table.h"           /* for struct rb_id_table */
+#include "internal/gc.h"        /* for RB_OBJ_WRITE */
+#include "internal/serial.h"    /* for rb_serial_t */
+#include "ruby/internal/stdbool.h"     /* for bool */
+#include "ruby/intern.h"        /* for rb_alloc_func_t */
+#include "ruby/ruby.h"          /* for struct RBasic */
+
+#ifdef RCLASS_SUPER
+# undef RCLASS_SUPER
+#endif
+
+struct rb_subclass_entry {
+    VALUE klass;
+    struct rb_subclass_entry *next;
+};
+
+struct rb_iv_index_tbl_entry {
+    uint32_t index;
+    rb_serial_t class_serial;
+    VALUE class_value;
+};
+
+struct rb_classext_struct {
+    struct st_table *iv_index_tbl; // ID -> struct rb_iv_index_tbl_entry
+    struct st_table *iv_tbl;
+#if SIZEOF_SERIAL_T == SIZEOF_VALUE /* otherwise m_tbl is in struct RClass */
+    struct rb_id_table *m_tbl;
+#endif
+    struct rb_id_table *const_tbl;
+    struct rb_id_table *callable_m_tbl;
+    struct rb_id_table *cc_tbl; /* ID -> [[ci, cc1], cc2, ...] */
+    struct rb_subclass_entry *subclasses;
+    struct rb_subclass_entry **parent_subclasses;
+    /**
+     * In the case that this is an `ICLASS`, `module_subclasses` points to the link
+     * in the module's `subclasses` list that indicates that the klass has been
+     * included. Hopefully that makes sense.
+     */
+    struct rb_subclass_entry **module_subclasses;
+#if SIZEOF_SERIAL_T != SIZEOF_VALUE /* otherwise class_serial is in struct RClass */
+    rb_serial_t class_serial;
+#endif
+    const VALUE origin_;
+    const VALUE refined_class;
+    rb_alloc_func_t allocator;
+    const VALUE includer;
+};
+
+struct RClass {
+    struct RBasic basic;
+    VALUE super;
+    struct rb_classext_struct *ptr;
+#if SIZEOF_SERIAL_T == SIZEOF_VALUE
+    /* Class serial is as wide as VALUE.  Place it here. */
+    rb_serial_t class_serial;
+#else
+    /* Class serial does not fit into struct RClass. Place m_tbl instead. */
+    struct rb_id_table *m_tbl;
+#endif
+};
+
+typedef struct rb_subclass_entry rb_subclass_entry_t;
+typedef struct rb_classext_struct rb_classext_t;
+
+#define RCLASS_EXT(c) (RCLASS(c)->ptr)
+#define RCLASS_IV_TBL(c) (RCLASS_EXT(c)->iv_tbl)
+#define RCLASS_CONST_TBL(c) (RCLASS_EXT(c)->const_tbl)
+#if SIZEOF_SERIAL_T == SIZEOF_VALUE
+# define RCLASS_M_TBL(c) (RCLASS_EXT(c)->m_tbl)
+#else
+# define RCLASS_M_TBL(c) (RCLASS(c)->m_tbl)
+#endif
+#define RCLASS_CALLABLE_M_TBL(c) (RCLASS_EXT(c)->callable_m_tbl)
+#define RCLASS_CC_TBL(c) (RCLASS_EXT(c)->cc_tbl)
+#define RCLASS_IV_INDEX_TBL(c) (RCLASS_EXT(c)->iv_index_tbl)
+#define RCLASS_ORIGIN(c) (RCLASS_EXT(c)->origin_)
+#define RCLASS_REFINED_CLASS(c) (RCLASS_EXT(c)->refined_class)
+#if SIZEOF_SERIAL_T == SIZEOF_VALUE
+# define RCLASS_SERIAL(c) (RCLASS(c)->class_serial)
+#else
+# define RCLASS_SERIAL(c) (RCLASS_EXT(c)->class_serial)
+#endif
+#define RCLASS_INCLUDER(c) (RCLASS_EXT(c)->includer)
+
+#define RICLASS_IS_ORIGIN FL_USER5
+#define RCLASS_CLONED     FL_USER6
+#define RICLASS_ORIGIN_SHARED_MTBL FL_USER8
+
+/* class.c */
+void rb_class_subclass_add(VALUE super, VALUE klass);
+void rb_class_remove_from_super_subclasses(VALUE);
+int rb_singleton_class_internal_p(VALUE sklass);
+VALUE rb_class_boot(VALUE);
+VALUE rb_make_metaclass(VALUE, VALUE);
+VALUE rb_include_class_new(VALUE, VALUE);
+void rb_class_foreach_subclass(VALUE klass, void (*f)(VALUE, VALUE), VALUE);
+void rb_class_detach_subclasses(VALUE);
+void rb_class_detach_module_subclasses(VALUE);
+void rb_class_remove_from_module_subclasses(VALUE);
+VALUE rb_obj_methods(int argc, const VALUE *argv, VALUE obj);
+VALUE rb_obj_protected_methods(int argc, const VALUE *argv, VALUE obj);
+VALUE rb_obj_private_methods(int argc, const VALUE *argv, VALUE obj);
+VALUE rb_obj_public_methods(int argc, const VALUE *argv, VALUE obj);
+VALUE rb_special_singleton_class(VALUE);
+VALUE rb_singleton_class_clone_and_attach(VALUE obj, VALUE attach);
+VALUE rb_singleton_class_get(VALUE obj);
+int rb_class_has_methods(VALUE c);
+void rb_undef_methods_from(VALUE klass, VALUE super);
+
+static inline void RCLASS_SET_ORIGIN(VALUE klass, VALUE origin);
+static inline void RICLASS_SET_ORIGIN_SHARED_MTBL(VALUE iclass);
+static inline VALUE RCLASS_SUPER(VALUE klass);
+static inline VALUE RCLASS_SET_SUPER(VALUE klass, VALUE super);
+static inline void RCLASS_SET_INCLUDER(VALUE iclass, VALUE klass);
+
+MJIT_SYMBOL_EXPORT_BEGIN
+VALUE rb_class_inherited(VALUE, VALUE);
+VALUE rb_keyword_error_new(const char *, VALUE);
+MJIT_SYMBOL_EXPORT_END
+
+static inline void
+RCLASS_SET_ORIGIN(VALUE klass, VALUE origin)
+{
+    RB_OBJ_WRITE(klass, &RCLASS_ORIGIN(klass), origin);
+    if (klass != origin) FL_SET(origin, RICLASS_IS_ORIGIN);
+}
+
+static inline void
+RICLASS_SET_ORIGIN_SHARED_MTBL(VALUE iclass)
+{
+    FL_SET(iclass, RICLASS_ORIGIN_SHARED_MTBL);
+}
+
+static inline bool
+RICLASS_OWNS_M_TBL_P(VALUE iclass)
+{
+    return FL_TEST_RAW(iclass, RICLASS_IS_ORIGIN | RICLASS_ORIGIN_SHARED_MTBL) == RICLASS_IS_ORIGIN;
+}
+
+static inline void
+RCLASS_SET_INCLUDER(VALUE iclass, VALUE klass)
+{
+    RB_OBJ_WRITE(iclass, &RCLASS_INCLUDER(iclass), klass);
+}
+
+static inline VALUE
+RCLASS_SUPER(VALUE klass)
+{
+    return RCLASS(klass)->super;
+}
+
+static inline VALUE
+RCLASS_SET_SUPER(VALUE klass, VALUE super)
+{
+    if (super) {
+        rb_class_remove_from_super_subclasses(klass);
+        rb_class_subclass_add(super, klass);
+    }
+    RB_OBJ_WRITE(klass, &RCLASS(klass)->super, super);
+    return super;
+}
+
+#endif /* INTERNAL_CLASS_H */
diff --git a/internal/compar.h b/internal/compar.h
new file mode 100644
index 0000000000..888a3b5e1e
--- /dev/null
+++ b/internal/compar.h
@@ -0,0 +1,50 @@
+#ifndef INTERNAL_COMPAR_H                                /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_COMPAR_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for Comparable.
+ */
+#include "internal/vm.h"        /* for rb_method_basic_definition_p */
+
+#define STRING_P(s) (RB_TYPE_P((s), T_STRING) && CLASS_OF(s) == rb_cString)
+
+enum {
+    cmp_opt_Integer,
+    cmp_opt_String,
+    cmp_opt_Float,
+    cmp_optimizable_count
+};
+
+struct cmp_opt_data {
+    unsigned int opt_methods;
+    unsigned int opt_inited;
+};
+
+#define NEW_CMP_OPT_MEMO(type, value) \
+    NEW_PARTIAL_MEMO_FOR(type, value, cmp_opt)
+#define CMP_OPTIMIZABLE_BIT(type) (1U << TOKEN_PASTE(cmp_opt_,type))
+#define CMP_OPTIMIZABLE(data, type) \
+    (((data).opt_inited & CMP_OPTIMIZABLE_BIT(type)) ? \
+     ((data).opt_methods & CMP_OPTIMIZABLE_BIT(type)) : \
+     (((data).opt_inited |= CMP_OPTIMIZABLE_BIT(type)), \
+      rb_method_basic_definition_p(TOKEN_PASTE(rb_c,type), id_cmp) && \
+      ((data).opt_methods |= CMP_OPTIMIZABLE_BIT(type))))
+
+#define OPTIMIZED_CMP(a, b, data) \
+    ((FIXNUM_P(a) && FIXNUM_P(b) && CMP_OPTIMIZABLE(data, Integer)) ? \
+     (((long)a > (long)b) ? 1 : ((long)a < (long)b) ? -1 : 0) : \
+     (STRING_P(a) && STRING_P(b) && CMP_OPTIMIZABLE(data, String)) ? \
+     rb_str_cmp(a, b) : \
+     (RB_FLOAT_TYPE_P(a) && RB_FLOAT_TYPE_P(b) && CMP_OPTIMIZABLE(data, Float)) ? \
+     rb_float_cmp(a, b) : \
+     rb_cmpint(rb_funcallv(a, id_cmp, 1, &b), a, b))
+
+/* compar.c */
+VALUE rb_invcmp(VALUE, VALUE);
+
+#endif /* INTERNAL_COMPAR_H */
diff --git a/internal/compile.h b/internal/compile.h
new file mode 100644
index 0000000000..9842e0f5e0
--- /dev/null
+++ b/internal/compile.h
@@ -0,0 +1,32 @@
+#ifndef INTERNAL_COMPILE_H                               /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_COMPILE_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for the compiler.
+ */
+#include "ruby/internal/config.h"
+#include <stddef.h>             /* for size_t */
+#include "ruby/ruby.h"          /* for rb_event_flag_t */
+
+struct rb_iseq_struct;          /* in vm_core.h */
+
+/* compile.c */
+int rb_dvar_defined(ID, const struct rb_iseq_struct *);
+int rb_local_defined(ID, const struct rb_iseq_struct *);
+const char *rb_insns_name(int i);
+VALUE rb_insns_name_array(void);
+
+/* iseq.c */
+int rb_vm_insn_addr2insn(const void *);
+
+MJIT_SYMBOL_EXPORT_BEGIN
+/* iseq.c (export) */
+rb_event_flag_t rb_iseq_event_flags(const struct rb_iseq_struct *iseq, size_t pos);
+MJIT_SYMBOL_EXPORT_END
+
+#endif /* INTERNAL_COMPILE_H */
diff --git a/internal/compilers.h b/internal/compilers.h
new file mode 100644
index 0000000000..8a2f1d8d26
--- /dev/null
+++ b/internal/compilers.h
@@ -0,0 +1,108 @@
+#ifndef INTERNAL_COMPILERS_H                             /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_COMPILERS_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header absorbing C compipler differences.
+ */
+#include "ruby/internal/compiler_since.h"
+#include "ruby/internal/has/attribute.h"
+#include "ruby/internal/has/builtin.h"
+#include "ruby/internal/has/c_attribute.h"
+#include "ruby/internal/has/declspec_attribute.h"
+#include "ruby/internal/has/extension.h"
+#include "ruby/internal/has/feature.h"
+#include "ruby/internal/has/warning.h"
+#include "ruby/backward/2/gcc_version_since.h"
+
+#define MSC_VERSION_SINCE(_)   RBIMPL_COMPILER_SINCE(MSVC, (_) / 100, (_) % 100, 0)
+#define MSC_VERSION_BEFORE(_)  RBIMPL_COMPILER_BEFORE(MSVC, (_) / 100, (_) % 100, 0)
+
+#ifndef __has_attribute
+# define __has_attribute(...) RBIMPL_HAS_ATTRIBUTE(__VA_ARGS__)
+#endif
+
+#ifndef __has_c_attribute
+# /* As  of writing  everything  that lacks  __has_c_attribute also  completely
+#  * lacks C2x attributes as well.  Might change in future? */
+# define __has_c_attribute(...) 0
+#endif
+
+#ifndef __has_declspec_attribute
+# define __has_declspec_attribute(...) RBIMPL_HAS_DECLSPEC_ATTRIBUTE(__VA_ARGS__)
+#endif
+
+#ifndef __has_builtin
+# define __has_builtin(...) RBIMPL_HAS_BUILTIN(__VA_ARGS__)
+#endif
+
+#ifndef __has_feature
+# define __has_feature(...) RBIMPL_HAS_FEATURE(__VA_ARGS__)
+#endif
+
+#ifndef __has_extension
+# define __has_extension(...) RBIMPL_HAS_EXTENSION(__VA_ARGS__)
+#endif
+
+#ifndef __has_warning
+# define __has_warning(...) RBIMPL_HAS_WARNING(__VA_ARGS__)
+#endif
+
+#ifndef __GNUC__
+# define __extension__ /* void */
+#endif
+
+#ifndef MAYBE_UNUSED
+# define MAYBE_UNUSED(x) x
+#endif
+
+#ifndef WARN_UNUSED_RESULT
+# define WARN_UNUSED_RESULT(x) x
+#endif
+
+#define RB_OBJ_BUILTIN_TYPE(obj) rb_obj_builtin_type(obj)
+#define OBJ_BUILTIN_TYPE(obj) RB_OBJ_BUILTIN_TYPE(obj)
+#ifdef __GNUC__
+#define rb_obj_builtin_type(obj) \
+__extension__({ \
+    VALUE arg_obj = (obj); \
+    RB_SPECIAL_CONST_P(arg_obj) ? -1 : \
+        (int)RB_BUILTIN_TYPE(arg_obj);    \
+    })
+#else
+# include "ruby/ruby.h"
+static inline int
+rb_obj_builtin_type(VALUE obj)
+{
+    return RB_SPECIAL_CONST_P(obj) ? -1 :
+        (int)RB_BUILTIN_TYPE(obj);
+}
+#endif
+
+/* A macro for defining a flexible array, like: VALUE ary[FLEX_ARY_LEN]; */
+#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
+# define FLEX_ARY_LEN   /* VALUE ary[]; */
+#elif defined(__GNUC__) && !defined(__STRICT_ANSI__)
+# define FLEX_ARY_LEN 0 /* VALUE ary[0]; */
+#else
+# define FLEX_ARY_LEN 1 /* VALUE ary[1]; */
+#endif
+
+/*
+ * For declaring bitfields out of non-unsigned int types:
+ *   struct date {
+ *      BITFIELD(enum months, month, 4);
+ *      ...
+ *   };
+ */
+#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
+# define BITFIELD(type, name, size) type name : size
+#else
+# define BITFIELD(type, name, size) unsigned int name : size
+#endif
+
+#endif /* INTERNAL_COMPILERS_H */
diff --git a/internal/complex.h b/internal/complex.h
new file mode 100644
index 0000000000..9eae804ddb
--- /dev/null
+++ b/internal/complex.h
@@ -0,0 +1,30 @@
+#ifndef INTERNAL_COMPLEX_H                               /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_COMPLEX_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for Complex.
+ */
+#include "ruby/internal/value.h"          /* for struct RBasic */
+
+struct RComplex {
+    struct RBasic basic;
+    VALUE real;
+    VALUE imag;
+};
+
+#define RCOMPLEX(obj) ((struct RComplex *)(obj))
+
+/* shortcut macro for internal only */
+#define RCOMPLEX_SET_REAL(cmp, r) RB_OBJ_WRITE((cmp), &RCOMPLEX(cmp)->real, (r))
+#define RCOMPLEX_SET_IMAG(cmp, i) RB_OBJ_WRITE((cmp), &RCOMPLEX(cmp)->imag, (i))
+
+/* complex.c */
+VALUE rb_dbl_complex_new_polar_pi(double abs, double ang);
+st_index_t rb_complex_hash(VALUE comp);
+
+#endif /* INTERNAL_COMPLEX_H */
diff --git a/internal/cont.h b/internal/cont.h
new file mode 100644
index 0000000000..9e49dd3c8e
--- /dev/null
+++ b/internal/cont.h
@@ -0,0 +1,26 @@
+#ifndef INTERNAL_CONT_H                                  /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_CONT_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for Fiber.
+ */
+#include "ruby/ruby.h"          /* for VALUE */
+
+struct rb_thread_struct;        /* in vm_core.h */
+struct rb_fiber_struct;         /* in cont.c */
+
+/* cont.c */
+VALUE rb_obj_is_fiber(VALUE);
+void rb_fiber_reset_root_local_storage(struct rb_thread_struct *);
+void ruby_register_rollback_func_for_ensure(VALUE (*ensure_func)(VALUE), VALUE (*rollback_func)(VALUE));
+void rb_fiber_init_mjit_cont(struct rb_fiber_struct *fiber);
+
+VALUE rb_fiberptr_self(struct rb_fiber_struct *fiber);
+unsigned int rb_fiberptr_blocking(struct rb_fiber_struct *fiber);
+
+#endif /* INTERNAL_CONT_H */
diff --git a/internal/dir.h b/internal/dir.h
new file mode 100644
index 0000000000..ffbdb25208
--- /dev/null
+++ b/internal/dir.h
@@ -0,0 +1,17 @@
+#ifndef INTERNAL_DIR_H                                   /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_DIR_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for Dir.
+ */
+#include "ruby/ruby.h"          /* for VALUE */
+
+/* dir.c */
+VALUE rb_dir_getwd_ospath(void);
+
+#endif /* INTERNAL_DIR_H */
diff --git a/internal/enc.h b/internal/enc.h
new file mode 100644
index 0000000000..0afc74db5d
--- /dev/null
+++ b/internal/enc.h
@@ -0,0 +1,20 @@
+#ifndef INTERNAL_ENC_H                                   /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_ENC_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for Encoding.
+ */
+#include "ruby/encoding.h"      /* for rb_encoding */
+
+/* us_ascii.c */
+extern rb_encoding OnigEncodingUS_ASCII;
+
+/* utf_8.c */
+extern rb_encoding OnigEncodingUTF_8;
+
+#endif /* INTERNAL_ENC_H */
diff --git a/internal/encoding.h b/internal/encoding.h
new file mode 100644
index 0000000000..c0cf061bd4
--- /dev/null
+++ b/internal/encoding.h
@@ -0,0 +1,31 @@
+#ifndef INTERNAL_ENCODING_H                              /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_ENCODING_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for Encoding.
+ */
+#include "ruby/ruby.h"          /* for ID */
+#include "ruby/encoding.h"      /* for rb_encoding */
+
+#define rb_enc_autoload_p(enc) (!rb_enc_mbmaxlen(enc))
+
+/* encoding.c */
+ID rb_id_encoding(void);
+rb_encoding *rb_enc_get_from_index(int index);
+rb_encoding *rb_enc_check_str(VALUE str1, VALUE str2);
+int rb_encdb_replicate(const char *alias, const char *orig);
+int rb_encdb_alias(const char *alias, const char *orig);
+int rb_enc_autoload(rb_encoding *enc);
+int rb_encdb_dummy(const char *name);
+void rb_encdb_declare(const char *name);
+void rb_enc_set_base(const char *name, const char *orig);
+int rb_enc_set_dummy(int index);
+void rb_encdb_set_unicode(int index);
+PUREFUNC(int rb_data_is_encoding(VALUE obj));
+
+#endif /* INTERNAL_ENCODING_H */
diff --git a/internal/enum.h b/internal/enum.h
new file mode 100644
index 0000000000..50890f0c9f
--- /dev/null
+++ b/internal/enum.h
@@ -0,0 +1,19 @@
+#ifndef INTERNAL_ENUM_H                                  /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_ENUM_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for Enumerable.
+ */
+#include "ruby/ruby.h"          /* for VALUE */
+
+/* enum.c */
+extern VALUE rb_cArithSeq;
+VALUE rb_f_send(int argc, VALUE *argv, VALUE recv);
+VALUE rb_nmin_run(VALUE obj, VALUE num, int by, int rev, int ary);
+
+#endif /* INTERNAL_ENUM_H */
diff --git a/internal/enumerator.h b/internal/enumerator.h
new file mode 100644
index 0000000000..2e20c37d9e
--- /dev/null
+++ b/internal/enumerator.h
@@ -0,0 +1,22 @@
+#ifndef INTERNAL_ENUMERATOR_H                            /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_ENUMERATOR_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for Enumerator.
+ */
+#include "ruby/ruby.h"          /* for VALUE */
+#include "ruby/intern.h"        /* for rb_enumerator_size_func */
+
+RUBY_SYMBOL_EXPORT_BEGIN
+/* enumerator.c (export) */
+VALUE rb_arith_seq_new(VALUE obj, VALUE meth, int argc, VALUE const *argv,
+                       rb_enumerator_size_func *size_fn,
+                       VALUE beg, VALUE end, VALUE step, int excl);
+RUBY_SYMBOL_EXPORT_END
+
+#endif /* INTERNAL_ENUMERATOR_H */
diff --git a/internal/error.h b/internal/error.h
new file mode 100644
index 0000000000..0dd629f052
--- /dev/null
+++ b/internal/error.h
@@ -0,0 +1,124 @@
+#ifndef INTERNAL_ERROR_H                                 /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_ERROR_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for Exception.
+ */
+#include "ruby/internal/config.h"
+#include <stdarg.h>             /* for va_list */
+#include "internal/string.h"    /* for rb_fstring_cstr */
+#include "ruby/internal/stdbool.h"     /* for bool */
+#include "ruby/encoding.h"      /* for rb_encoding */
+#include "ruby/intern.h"        /* for rb_exc_raise */
+#include "ruby/ruby.h"          /* for enum ruby_value_type */
+
+#ifdef Check_Type
+# undef Check_Type               /* in ruby/ruby.h */
+#endif
+
+#ifdef rb_raise_static
+# undef rb_raise_static
+# undef rb_sys_fail_path
+# undef rb_syserr_fail_path
+#endif
+
+#define rb_raise_static(e, m) \
+    rb_raise_cstr_i((e), rb_str_new_static((m), rb_strlen_lit(m)))
+#ifdef RUBY_FUNCTION_NAME_STRING
+# define rb_sys_fail_path(path) rb_sys_fail_path_in(RUBY_FUNCTION_NAME_STRING, path)
+# define rb_syserr_fail_path(err, path) rb_syserr_fail_path_in(RUBY_FUNCTION_NAME_STRING, (err), (path))
+# define rb_syserr_new_path(err, path) rb_syserr_new_path_in(RUBY_FUNCTION_NAME_STRING, (err), (path))
+#else
+# define rb_sys_fail_path(path) rb_sys_fail_str(path)
+# define rb_syserr_fail_path(err, path) rb_syserr_fail_str((err), (path))
+# define rb_syserr_new_path(err, path) rb_syserr_new_str((err), (path))
+#endif
+
+/* error.c */
+extern long rb_backtrace_length_limit;
+extern VALUE rb_eEAGAIN;
+extern VALUE rb_eEWOULDBLOCK;
+extern VALUE rb_eEINPROGRESS;
+void rb_report_bug_valist(VALUE file, int line, const char *fmt, va_list args);
+NORETURN(void rb_async_bug_errno(const char *,int));
+const char *rb_builtin_type_name(int t);
+const char *rb_builtin_class_name(VALUE x);
+PRINTF_ARGS(void rb_warn_deprecated(const char *fmt, const char *suggest, ...), 1, 3);
+PRINTF_ARGS(void rb_warn_deprecated_to_remove(const char *fmt, const char *removal, ...), 1, 3);
+VALUE rb_syntax_error_append(VALUE, VALUE, int, int, rb_encoding*, const char*, va_list);
+PRINTF_ARGS(void rb_enc_warn(rb_encoding *enc, const char *fmt, ...), 2, 3);
+PRINTF_ARGS(void rb_sys_enc_warning(rb_encoding *enc, const char *fmt, ...), 2, 3);
+PRINTF_ARGS(void rb_syserr_enc_warning(int err, rb_encoding *enc, const char *fmt, ...), 3, 4);
+rb_warning_category_t rb_warning_category_from_name(VALUE category);
+bool rb_warning_category_enabled_p(rb_warning_category_t category);
+VALUE rb_name_err_new(VALUE mesg, VALUE recv, VALUE method);
+VALUE rb_nomethod_err_new(VALUE mesg, VALUE recv, VALUE method, VALUE args, int priv);
+VALUE rb_key_err_new(VALUE mesg, VALUE recv, VALUE name);
+PRINTF_ARGS(VALUE rb_warning_string(const char *fmt, ...), 1, 2);
+NORETURN(void rb_vraise(VALUE, const char *, va_list));
+NORETURN(static inline void rb_raise_cstr(VALUE etype, const char *mesg));
+NORETURN(static inline void rb_raise_cstr_i(VALUE etype, VALUE mesg));
+NORETURN(static inline void rb_name_err_raise_str(VALUE mesg, VALUE recv, VALUE name));
+NORETURN(static inline void rb_name_err_raise(const char *mesg, VALUE recv, VALUE name));
+NORETURN(static inline void rb_key_err_raise(VALUE mesg, VALUE recv, VALUE name));
+static inline void Check_Type(VALUE v, enum ruby_value_type t);
+static inline bool rb_typeddata_is_instance_of_inline(VALUE obj, const rb_data_type_t *data_type);
+#define rb_typeddata_is_instance_of rb_typeddata_is_instance_of_inline
+
+RUBY_SYMBOL_EXPORT_BEGIN
+/* error.c (export) */
+int rb_bug_reporter_add(void (*func)(FILE *, void *), void *data);
+#ifdef RUBY_FUNCTION_NAME_STRING
+NORETURN(void rb_sys_fail_path_in(const char *func_name, VALUE path));
+NORETURN(void rb_syserr_fail_path_in(const char *func_name, int err, VALUE path));
+VALUE rb_syserr_new_path_in(const char *func_name, int n, VALUE path);
+#endif
+RUBY_SYMBOL_EXPORT_END
+
+static inline void
+rb_raise_cstr_i(VALUE etype, VALUE mesg)
+{
+    VALUE exc = rb_exc_new_str(etype, mesg);
+    rb_exc_raise(exc);
+}
+
+static inline void
+rb_raise_cstr(VALUE etype, const char *mesg)
+{
+    VALUE str = rb_str_new_cstr(mesg);
+    rb_raise_cstr_i(etype, str);
+}
+
+static inline void
+rb_name_err_raise_str(VALUE mesg, VALUE recv, VALUE name)
+{
+    VALUE exc = rb_name_err_new(mesg, recv, name);
+    rb_exc_raise(exc);
+}
+
+static inline void
+rb_name_err_raise(const char *mesg, VALUE recv, VALUE name)
+{
+    VALUE str = rb_fstring_cstr(mesg);
+    rb_name_err_raise_str(str, recv, name);
+}
+
+static inline void
+rb_key_err_raise(VALUE mesg, VALUE recv, VALUE name)
+{
+    VALUE exc = rb_key_err_new(mesg, recv, name);
+    rb_exc_raise(exc);
+}
+
+static inline bool
+rb_typeddata_is_instance_of_inline(VALUE obj, const rb_data_type_t *data_type)
+{
+    return RB_TYPE_P(obj, T_DATA) && RTYPEDDATA_P(obj) && (RTYPEDDATA_TYPE(obj) == data_type);
+}
+
+#endif /* INTERNAL_ERROR_H */
diff --git a/internal/eval.h b/internal/eval.h
new file mode 100644
index 0000000000..8dae76b6f8
--- /dev/null
+++ b/internal/eval.h
@@ -0,0 +1,33 @@
+#ifndef INTERNAL_EVAL_H                                  /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_EVAL_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for the evaluator.
+ * @note       There  also  is  eval_intern.h, which  is  evaluator's  internal
+ *             header (related to this file, but not the same role).
+ */
+#include "ruby/ruby.h"          /* for ID */
+
+#define id_signo ruby_static_id_signo
+#define id_status ruby_static_id_status
+
+/* eval.c */
+extern ID ruby_static_id_signo;
+extern ID ruby_static_id_status;
+VALUE rb_refinement_module_get_refined_class(VALUE module);
+void rb_class_modify_check(VALUE);
+NORETURN(VALUE rb_f_raise(int argc, VALUE *argv));
+
+/* eval_error.c */
+VALUE rb_get_backtrace(VALUE info);
+
+/* eval_jump.c */
+void rb_call_end_proc(VALUE data);
+void rb_mark_end_proc(void);
+
+#endif /* INTERNAL_EVAL_H */
diff --git a/internal/file.h b/internal/file.h
new file mode 100644
index 0000000000..a93c1392f0
--- /dev/null
+++ b/internal/file.h
@@ -0,0 +1,39 @@
+#ifndef INTERNAL_FILE_H                                  /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_FILE_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for File.
+ */
+#include "ruby/ruby.h"          /* for VALUE */
+#include "ruby/encoding.h"      /* for rb_encodinng */
+
+/* file.c */
+extern const char ruby_null_device[];
+VALUE rb_home_dir_of(VALUE user, VALUE result);
+VALUE rb_default_home_dir(VALUE result);
+VALUE rb_realpath_internal(VALUE basedir, VALUE path, int strict);
+VALUE rb_check_realpath(VALUE basedir, VALUE path, rb_encoding *origenc);
+void rb_file_const(const char*, VALUE);
+int rb_file_load_ok(const char *);
+VALUE rb_file_expand_path_fast(VALUE, VALUE);
+VALUE rb_file_expand_path_internal(VALUE, VALUE, int, int, VALUE);
+VALUE rb_get_path_check_to_string(VALUE);
+VALUE rb_get_path_check_convert(VALUE);
+int ruby_is_fd_loadable(int fd);
+
+RUBY_SYMBOL_EXPORT_BEGIN
+/* file.c (export) */
+#ifdef HAVE_READLINK
+VALUE rb_readlink(VALUE path, rb_encoding *enc);
+#endif
+#ifdef __APPLE__
+VALUE rb_str_normalize_ospath(const char *ptr, long len);
+#endif
+RUBY_SYMBOL_EXPORT_END
+
+#endif /* INTERNAL_FILE_H */
diff --git a/internal/fixnum.h b/internal/fixnum.h
new file mode 100644
index 0000000000..7e0e4be84c
--- /dev/null
+++ b/internal/fixnum.h
@@ -0,0 +1,185 @@
+#ifndef INTERNAL_FIXNUM_H                                /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_FIXNUM_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for Fixnums.
+ */
+#include "ruby/internal/config.h"      /* for HAVE_LONG_LONG */
+#include <limits.h>             /* for CHAR_BIT */
+#include "internal/compilers.h" /* for __has_builtin */
+#include "ruby/internal/stdbool.h"     /* for bool */
+#include "ruby/intern.h"        /* for rb_big_mul */
+#include "ruby/ruby.h"          /* for RB_FIXABLE */
+
+#if HAVE_LONG_LONG && SIZEOF_LONG * 2 <= SIZEOF_LONG_LONG
+# define DLONG LONG_LONG
+# define DL2NUM(x) LL2NUM(x)
+#elif defined(HAVE_INT128_T)
+# define DLONG int128_t
+# define DL2NUM(x) (RB_FIXABLE(x) ? LONG2FIX(x) : rb_int128t2big(x))
+VALUE rb_int128t2big(int128_t n); /* in bignum.c */
+#endif
+
+static inline long rb_overflowed_fix_to_int(long x);
+static inline VALUE rb_fix_plus_fix(VALUE x, VALUE y);
+static inline VALUE rb_fix_minus_fix(VALUE x, VALUE y);
+static inline VALUE rb_fix_mul_fix(VALUE x, VALUE y);
+static inline void rb_fix_divmod_fix(VALUE x, VALUE y, VALUE *divp, VALUE *modp);
+static inline VALUE rb_fix_div_fix(VALUE x, VALUE y);
+static inline VALUE rb_fix_mod_fix(VALUE x, VALUE y);
+static inline bool FIXNUM_POSITIVE_P(VALUE num);
+static inline bool FIXNUM_NEGATIVE_P(VALUE num);
+static inline bool FIXNUM_ZERO_P(VALUE num);
+
+static inline long
+rb_overflowed_fix_to_int(long x)
+{
+    return (long)((unsigned long)(x >> 1) ^ (1LU << (SIZEOF_LONG * CHAR_BIT - 1)));
+}
+
+static inline VALUE
+rb_fix_plus_fix(VALUE x, VALUE y)
+{
+#if !__has_builtin(__builtin_add_overflow)
+    long lz = FIX2LONG(x) + FIX2LONG(y);
+    return LONG2NUM(lz);
+#else
+    long lz;
+    /* NOTE
+     * (1) `LONG2FIX(FIX2LONG(x)+FIX2LONG(y))`
+     +     = `((lx*2+1)/2 + (ly*2+1)/2)*2+1`
+     +     = `lx*2 + ly*2 + 1`
+     +     = `(lx*2+1) + (ly*2+1) - 1`
+     +     = `x + y - 1`
+     * (2) Fixnum's LSB is always 1.
+     *     It means you can always run `x - 1` without overflow.
+     * (3) Of course `z = x + (y-1)` may overflow.
+     *     At that time true value is
+     *     * positive: 0b0 1xxx...1, and z = 0b1xxx...1
+     *     * negative: 0b1 0xxx...1, and z = 0b0xxx...1
+     *     To convert this true value to long,
+     *     (a) Use arithmetic shift
+     *         * positive: 0b11xxx...
+     *         * negative: 0b00xxx...
+     *     (b) invert MSB
+     *         * positive: 0b01xxx...
+     *         * negative: 0b10xxx...
+     */
+    if (__builtin_add_overflow((long)x, (long)y-1, &lz)) {
+        return rb_int2big(rb_overflowed_fix_to_int(lz));
+    }
+    else {
+        return (VALUE)lz;
+    }
+#endif
+}
+
+static inline VALUE
+rb_fix_minus_fix(VALUE x, VALUE y)
+{
+#if !__has_builtin(__builtin_sub_overflow)
+    long lz = FIX2LONG(x) - FIX2LONG(y);
+    return LONG2NUM(lz);
+#else
+    long lz;
+    if (__builtin_sub_overflow((long)x, (long)y-1, &lz)) {
+        return rb_int2big(rb_overflowed_fix_to_int(lz));
+    }
+    else {
+        return (VALUE)lz;
+    }
+#endif
+}
+
+/* arguments must be Fixnum */
+static inline VALUE
+rb_fix_mul_fix(VALUE x, VALUE y)
+{
+    long lx = FIX2LONG(x);
+    long ly = FIX2LONG(y);
+#ifdef DLONG
+    return DL2NUM((DLONG)lx * (DLONG)ly);
+#else
+    if (MUL_OVERFLOW_FIXNUM_P(lx, ly)) {
+        return rb_big_mul(rb_int2big(lx), rb_int2big(ly));
+    }
+    else {
+        return LONG2FIX(lx * ly);
+    }
+#endif
+}
+
+/*
+ * This behaves different from C99 for negative arguments.
+ * Note that div may overflow fixnum.
+ */
+static inline void
+rb_fix_divmod_fix(VALUE a, VALUE b, VALUE *divp, VALUE *modp)
+{
+    /* assume / and % comply C99.
+     * ldiv(3) won't be inlined by GCC and clang.
+     * I expect / and % are compiled as single idiv.
+     */
+    long x = FIX2LONG(a);
+    long y = FIX2LONG(b);
+    long div, mod;
+    if (x == FIXNUM_MIN && y == -1) {
+        if (divp) *divp = LONG2NUM(-FIXNUM_MIN);
+        if (modp) *modp = LONG2FIX(0);
+        return;
+    }
+    div = x / y;
+    mod = x % y;
+    if (y > 0 ? mod < 0 : mod > 0) {
+        mod += y;
+        div -= 1;
+    }
+    if (divp) *divp = LONG2FIX(div);
+    if (modp) *modp = LONG2FIX(mod);
+}
+
+/* div() for Ruby
+ * This behaves different from C99 for negative arguments.
+ */
+static inline VALUE
+rb_fix_div_fix(VALUE x, VALUE y)
+{
+    VALUE div;
+    rb_fix_divmod_fix(x, y, &div, NULL);
+    return div;
+}
+
+/* mod() for Ruby
+ * This behaves different from C99 for negative arguments.
+ */
+static inline VALUE
+rb_fix_mod_fix(VALUE x, VALUE y)
+{
+    VALUE mod;
+    rb_fix_divmod_fix(x, y, NULL, &mod);
+    return mod;
+}
+
+static inline bool
+FIXNUM_POSITIVE_P(VALUE num)
+{
+    return (SIGNED_VALUE)num > (SIGNED_VALUE)INT2FIX(0);
+}
+
+static inline bool
+FIXNUM_NEGATIVE_P(VALUE num)
+{
+    return (SIGNED_VALUE)num < 0;
+}
+
+static inline bool
+FIXNUM_ZERO_P(VALUE num)
+{
+    return num == INT2FIX(0);
+}
+#endif /* INTERNAL_FIXNUM_H */
diff --git a/internal/gc.h b/internal/gc.h
new file mode 100644
index 0000000000..d439f6d8f6
--- /dev/null
+++ b/internal/gc.h
@@ -0,0 +1,167 @@
+#ifndef INTERNAL_GC_H                                    /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_GC_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for GC.
+ */
+#include "ruby/internal/config.h"
+
+#include <stddef.h>             /* for size_t */
+
+#include "internal/compilers.h" /* for __has_attribute */
+#include "ruby/ruby.h"          /* for rb_event_flag_t */
+
+struct rb_execution_context_struct; /* in vm_core.h */
+struct rb_objspace; /* in vm_core.h */
+
+#ifdef NEWOBJ_OF
+# undef NEWOBJ_OF
+# undef RB_NEWOBJ_OF
+# undef RB_OBJ_WRITE
+#endif
+
+/* optimized version of NEWOBJ() */
+#define RB_NEWOBJ_OF(var, T, c, f) \
+  T *(var) = (T *)(((f) & FL_WB_PROTECTED) ? \
+                   rb_wb_protected_newobj_of((c), (f) & ~FL_WB_PROTECTED) : \
+                   rb_wb_unprotected_newobj_of((c), (f)))
+
+#define RB_EC_NEWOBJ_OF(ec, var, T, c, f) \
+  T *(var) = (T *)(((f) & FL_WB_PROTECTED) ? \
+                   rb_ec_wb_protected_newobj_of((ec), (c), (f) & ~FL_WB_PROTECTED) : \
+                   rb_wb_unprotected_newobj_of((c), (f)))
+
+#define NEWOBJ_OF(var, T, c, f) RB_NEWOBJ_OF((var), T, (c), (f))
+#define RB_OBJ_GC_FLAGS_MAX 6   /* used in ext/objspace */
+
+#ifndef USE_UNALIGNED_MEMBER_ACCESS
+# define UNALIGNED_MEMBER_ACCESS(expr) (expr)
+#elif ! USE_UNALIGNED_MEMBER_ACCESS
+# define UNALIGNED_MEMBER_ACCESS(expr) (expr)
+#elif ! (__has_warning("-Waddress-of-packed-member") || GCC_VERSION_SINCE(9, 0, 0))
+# define UNALIGNED_MEMBER_ACCESS(expr) (expr)
+#else
+# include "internal/warnings.h"
+# define UNALIGNED_MEMBER_ACCESS(expr) __extension__({ \
+    COMPILER_WARNING_PUSH; \
+    COMPILER_WARNING_IGNORED(-Waddress-of-packed-member); \
+    __typeof__(expr) unaligned_member_access_result = (expr); \
+    COMPILER_WARNING_POP; \
+    unaligned_member_access_result; \
+})
+#endif
+
+#define UNALIGNED_MEMBER_PTR(ptr, mem) UNALIGNED_MEMBER_ACCESS(&(ptr)->mem)
+#define RB_OBJ_WRITE(a, slot, b) \
+    rb_obj_write((VALUE)(a), UNALIGNED_MEMBER_ACCESS((VALUE *)(slot)), \
+                 (VALUE)(b), __FILE__, __LINE__)
+
+typedef struct ractor_newobj_cache {
+    struct RVALUE *freelist;
+    struct heap_page *using_page;
+} rb_ractor_newobj_cache_t;
+
+/* gc.c */
+extern VALUE *ruby_initial_gc_stress_ptr;
+extern int ruby_disable_gc;
+RUBY_ATTR_MALLOC void *ruby_mimmalloc(size_t size);
+void ruby_mimfree(void *ptr);
+void rb_objspace_set_event_hook(const rb_event_flag_t event);
+VALUE rb_objspace_gc_enable(struct rb_objspace *);
+VALUE rb_objspace_gc_disable(struct rb_objspace *);
+void ruby_gc_set_params(void);
+void rb_copy_wb_protected_attribute(VALUE dest, VALUE obj);
+#if __has_attribute(alloc_align)
+__attribute__((__alloc_align__(1)))
+#endif
+RUBY_ATTR_MALLOC void *rb_aligned_malloc(size_t, size_t) RUBY_ATTR_ALLOC_SIZE((2));
+size_t rb_size_mul_or_raise(size_t, size_t, VALUE); /* used in compile.c */
+size_t rb_size_mul_add_or_raise(size_t, size_t, size_t, VALUE); /* used in iseq.h */
+RUBY_ATTR_MALLOC void *rb_xmalloc_mul_add(size_t, size_t, size_t);
+void *rb_xrealloc_mul_add(const void *, size_t, size_t, size_t);
+RUBY_ATTR_MALLOC void *rb_xmalloc_mul_add_mul(size_t, size_t, size_t, size_t);
+RUBY_ATTR_MALLOC void *rb_xcalloc_mul_add_mul(size_t, size_t, size_t, size_t);
+static inline void *ruby_sized_xrealloc_inlined(void *ptr, size_t new_size, size_t old_size) RUBY_ATTR_RETURNS_NONNULL RUBY_ATTR_ALLOC_SIZE((2));
+static inline void *ruby_sized_xrealloc2_inlined(void *ptr, size_t new_count, size_t elemsiz, size_t old_count) RUBY_ATTR_RETURNS_NONNULL RUBY_ATTR_ALLOC_SIZE((2, 3));
+static inline void ruby_sized_xfree_inlined(void *ptr, size_t size);
+VALUE rb_class_allocate_instance(VALUE klass);
+
+RUBY_SYMBOL_EXPORT_BEGIN
+/* gc.c (export) */
+const char *rb_objspace_data_type_name(VALUE obj);
+VALUE rb_wb_protected_newobj_of(VALUE, VALUE);
+VALUE rb_wb_unprotected_newobj_of(VALUE, VALUE);
+VALUE rb_ec_wb_protected_newobj_of(struct rb_execution_context_struct *ec, VALUE klass, VALUE flags);
+size_t rb_obj_memsize_of(VALUE);
+void rb_gc_verify_internal_consistency(void);
+size_t rb_obj_gc_flags(VALUE, ID[], size_t);
+void rb_gc_mark_values(long n, const VALUE *values);
+void rb_gc_mark_vm_stack_values(long n, const VALUE *values);
+void *ruby_sized_xrealloc(void *ptr, size_t new_size, size_t old_size) RUBY_ATTR_RETURNS_NONNULL RUBY_ATTR_ALLOC_SIZE((2));
+void *ruby_sized_xrealloc2(void *ptr, size_t new_count, size_t element_size, size_t old_count) RUBY_ATTR_RETURNS_NONNULL RUBY_ATTR_ALLOC_SIZE((2, 3));
+void ruby_sized_xfree(void *x, size_t size);
+void rb_gc_ractor_newobj_cache_clear(rb_ractor_newobj_cache_t *newobj_cache);
+RUBY_SYMBOL_EXPORT_END
+
+MJIT_SYMBOL_EXPORT_BEGIN
+int rb_ec_stack_check(struct rb_execution_context_struct *ec);
+void rb_gc_writebarrier_remember(VALUE obj);
+const char *rb_obj_info(VALUE obj);
+MJIT_SYMBOL_EXPORT_END
+
+#if defined(HAVE_MALLOC_USABLE_SIZE) || defined(HAVE_MALLOC_SIZE) || defined(_WIN32)
+
+static inline void *
+ruby_sized_xrealloc_inlined(void *ptr, size_t new_size, size_t old_size)
+{
+    return ruby_xrealloc(ptr, new_size);
+}
+
+static inline void *
+ruby_sized_xrealloc2_inlined(void *ptr, size_t new_count, size_t elemsiz, size_t old_count)
+{
+    return ruby_xrealloc2(ptr, new_count, elemsiz);
+}
+
+static inline void
+ruby_sized_xfree_inlined(void *ptr, size_t size)
+{
+    ruby_xfree(ptr);
+}
+
+# define SIZED_REALLOC_N(x, y, z, w) REALLOC_N(x, y, z)
+
+#else
+
+static inline void *
+ruby_sized_xrealloc_inlined(void *ptr, size_t new_size, size_t old_size)
+{
+    return ruby_sized_xrealloc(ptr, new_size, old_size);
+}
+
+static inline void *
+ruby_sized_xrealloc2_inlined(void *ptr, size_t new_count, size_t elemsiz, size_t old_count)
+{
+    return ruby_sized_xrealloc2(ptr, new_count, elemsiz, old_count);
+}
+
+static inline void
+ruby_sized_xfree_inlined(void *ptr, size_t size)
+{
+    ruby_sized_xfree(ptr, size);
+}
+
+# define SIZED_REALLOC_N(v, T, m, n) \
+    ((v) = (T *)ruby_sized_xrealloc2((void *)(v), (m), sizeof(T), (n)))
+
+#endif /* HAVE_MALLOC_USABLE_SIZE */
+
+#define ruby_sized_xrealloc ruby_sized_xrealloc_inlined
+#define ruby_sized_xrealloc2 ruby_sized_xrealloc2_inlined
+#define ruby_sized_xfree ruby_sized_xfree_inlined
+#endif /* INTERNAL_GC_H */
diff --git a/internal/hash.h b/internal/hash.h
new file mode 100644
index 0000000000..a4677c581b
--- /dev/null
+++ b/internal/hash.h
@@ -0,0 +1,241 @@
+#ifndef INTERNAL_HASH_H                                  /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_HASH_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for Hash.
+ */
+#include "ruby/internal/config.h"
+#include <stddef.h>             /* for size_t */
+#include "ruby/internal/stdbool.h"     /* for bool */
+#include "ruby/ruby.h"          /* for struct RBasic */
+#include "ruby/st.h"            /* for struct st_table */
+
+#define RHASH_AR_TABLE_MAX_SIZE SIZEOF_VALUE
+
+struct ar_table_struct;
+typedef unsigned char ar_hint_t;
+
+enum ruby_rhash_flags {
+    RHASH_PASS_AS_KEYWORDS = FL_USER1,                                   /* FL 1 */
+    RHASH_PROC_DEFAULT = FL_USER2,                                       /* FL 2 */
+    RHASH_ST_TABLE_FLAG = FL_USER3,                                      /* FL 3 */
+    RHASH_AR_TABLE_SIZE_MASK = (FL_USER4|FL_USER5|FL_USER6|FL_USER7),    /* FL 4..7 */
+    RHASH_AR_TABLE_SIZE_SHIFT = (FL_USHIFT+4),
+    RHASH_AR_TABLE_BOUND_MASK = (FL_USER8|FL_USER9|FL_USER10|FL_USER11), /* FL 8..11 */
+    RHASH_AR_TABLE_BOUND_SHIFT = (FL_USHIFT+8),
+
+#if USE_TRANSIENT_HEAP
+    RHASH_TRANSIENT_FLAG = FL_USER12,                                    /* FL 12 */
+#endif
+
+    // we can not put it in "enum" because it can exceed "int" range.
+#define RHASH_LEV_MASK (FL_USER13 | FL_USER14 | FL_USER15 |                /* FL 13..19 */ \
+                        FL_USER16 | FL_USER17 | FL_USER18 | FL_USER19)
+
+    RHASH_LEV_SHIFT = (FL_USHIFT + 13),
+    RHASH_LEV_MAX = 127, /* 7 bits */
+};
+
+struct RHash {
+    struct RBasic basic;
+    union {
+        st_table *st;
+        struct ar_table_struct *ar; /* possibly 0 */
+    } as;
+    const VALUE ifnone;
+    union {
+        ar_hint_t ary[RHASH_AR_TABLE_MAX_SIZE];
+        VALUE word;
+    } ar_hint;
+};
+
+#define RHASH(obj) ((struct RHash *)(obj))
+
+#ifdef RHASH_IFNONE
+# undef RHASH_IFNONE
+#endif
+
+#ifdef RHASH_SIZE
+# undef RHASH_SIZE
+#endif
+
+#ifdef RHASH_EMPTY_P
+# undef RHASH_EMPTY_P
+#endif
+
+/* hash.c */
+void rb_hash_st_table_set(VALUE hash, st_table *st);
+VALUE rb_hash_default_value(VALUE hash, VALUE key);
+VALUE rb_hash_set_default_proc(VALUE hash, VALUE proc);
+long rb_dbl_long_hash(double d);
+st_table *rb_init_identtable(void);
+VALUE rb_to_hash_type(VALUE obj);
+VALUE rb_hash_key_str(VALUE);
+VALUE rb_hash_values(VALUE hash);
+VALUE rb_hash_rehash(VALUE hash);
+int rb_hash_add_new_element(VALUE hash, VALUE key, VALUE val);
+VALUE rb_hash_set_pair(VALUE hash, VALUE pair);
+int rb_hash_stlike_delete(VALUE hash, st_data_t *pkey, st_data_t *pval);
+int rb_hash_stlike_foreach_with_replace(VALUE hash, st_foreach_check_callback_func *func, st_update_callback_func *replace, st_data_t arg);
+int rb_hash_stlike_update(VALUE hash, st_data_t key, st_update_callback_func *func, st_data_t arg);
+extern st_table *rb_hash_st_table(VALUE hash);
+
+static inline unsigned RHASH_AR_TABLE_SIZE_RAW(VALUE h);
+static inline VALUE RHASH_IFNONE(VALUE h);
+static inline size_t RHASH_SIZE(VALUE h);
+static inline bool RHASH_EMPTY_P(VALUE h);
+static inline bool RHASH_AR_TABLE_P(VALUE h);
+static inline bool RHASH_ST_TABLE_P(VALUE h);
+static inline struct ar_table_struct *RHASH_AR_TABLE(VALUE h);
+static inline st_table *RHASH_ST_TABLE(VALUE h);
+static inline size_t RHASH_ST_SIZE(VALUE h);
+static inline void RHASH_ST_CLEAR(VALUE h);
+static inline bool RHASH_TRANSIENT_P(VALUE h);
+static inline void RHASH_SET_TRANSIENT_FLAG(VALUE h);
+static inline void RHASH_UNSET_TRANSIENT_FLAG(VALUE h);
+
+RUBY_SYMBOL_EXPORT_BEGIN
+/* hash.c (export) */
+VALUE rb_hash_delete_entry(VALUE hash, VALUE key);
+VALUE rb_ident_hash_new(void);
+int rb_hash_stlike_foreach(VALUE hash, st_foreach_callback_func *func, st_data_t arg);
+RUBY_SYMBOL_EXPORT_END
+
+MJIT_SYMBOL_EXPORT_BEGIN
+VALUE rb_hash_new_with_size(st_index_t size);
+VALUE rb_hash_resurrect(VALUE hash);
+int rb_hash_stlike_lookup(VALUE hash, st_data_t key, st_data_t *pval);
+VALUE rb_hash_keys(VALUE hash);
+VALUE rb_hash_has_key(VALUE hash, VALUE key);
+VALUE rb_hash_compare_by_id_p(VALUE hash);
+
+st_table *rb_hash_tbl_raw(VALUE hash, const char *file, int line);
+#define RHASH_TBL_RAW(h) rb_hash_tbl_raw(h, __FILE__, __LINE__)
+MJIT_SYMBOL_EXPORT_END
+
+#if 0 /* for debug */
+
+static inline bool
+RHASH_AR_TABLE_P(VALUE h)
+{
+    extern int rb_hash_ar_table_p(VALUE hash);
+    return rb_hash_ar_table_p(h)
+}
+
+static inline struct ar_table_struct *
+RHASH_AR_TABLE(VALUE h)
+{
+    extern struct ar_table_struct *rb_hash_ar_table(VALUE hash);
+    return rb_hash_ar_table(h)
+}
+
+static inline st_table *
+RHASH_ST_TABLE(VALUE h)
+{
+    return rb_hash_st_table(h)
+}
+
+#else
+
+static inline bool
+RHASH_AR_TABLE_P(VALUE h)
+{
+    return ! FL_TEST_RAW(h, RHASH_ST_TABLE_FLAG);
+}
+
+static inline struct ar_table_struct *
+RHASH_AR_TABLE(VALUE h)
+{
+    return RHASH(h)->as.ar;
+}
+
+static inline st_table *
+RHASH_ST_TABLE(VALUE h)
+{
+    return RHASH(h)->as.st;
+}
+
+#endif
+
+static inline VALUE
+RHASH_IFNONE(VALUE h)
+{
+    return RHASH(h)->ifnone;
+}
+
+static inline size_t
+RHASH_SIZE(VALUE h)
+{
+    if (RHASH_AR_TABLE_P(h)) {
+        return RHASH_AR_TABLE_SIZE_RAW(h);
+    }
+    else {
+        return RHASH_ST_SIZE(h);
+    }
+}
+
+static inline bool
+RHASH_EMPTY_P(VALUE h)
+{
+    return RHASH_SIZE(h) == 0;
+}
+
+static inline bool
+RHASH_ST_TABLE_P(VALUE h)
+{
+    return ! RHASH_AR_TABLE_P(h);
+}
+
+static inline size_t
+RHASH_ST_SIZE(VALUE h)
+{
+    return RHASH_ST_TABLE(h)->num_entries;
+}
+
+static inline void
+RHASH_ST_CLEAR(VALUE h)
+{
+    FL_UNSET_RAW(h, RHASH_ST_TABLE_FLAG);
+    RHASH(h)->as.ar = NULL;
+}
+
+static inline unsigned
+RHASH_AR_TABLE_SIZE_RAW(VALUE h)
+{
+    VALUE ret = FL_TEST_RAW(h, RHASH_AR_TABLE_SIZE_MASK);
+    ret >>= RHASH_AR_TABLE_SIZE_SHIFT;
+    return (unsigned)ret;
+}
+
+static inline bool
+RHASH_TRANSIENT_P(VALUE h)
+{
+#if USE_TRANSIENT_HEAP
+    return FL_TEST_RAW(h, RHASH_TRANSIENT_FLAG);
+#else
+    return false;
+#endif
+}
+
+static inline void
+RHASH_SET_TRANSIENT_FLAG(VALUE h)
+{
+#if USE_TRANSIENT_HEAP
+    FL_SET_RAW(h, RHASH_TRANSIENT_FLAG);
+#endif
+}
+
+static inline void
+RHASH_UNSET_TRANSIENT_FLAG(VALUE h)
+{
+#if USE_TRANSIENT_HEAP
+    FL_UNSET_RAW(h, RHASH_TRANSIENT_FLAG);
+#endif
+}
+
+#endif /* INTERNAL_HASH_H */
diff --git a/internal/imemo.h b/internal/imemo.h
new file mode 100644
index 0000000000..a9e2136ac4
--- /dev/null
+++ b/internal/imemo.h
@@ -0,0 +1,244 @@
+#ifndef INTERNAL_IMEMO_H                                 /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_IMEMO_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      IMEMO: Internal memo object.
+ */
+#include "ruby/internal/config.h"
+#include <stddef.h>             /* for size_t */
+#include "internal/array.h"     /* for rb_ary_tmp_new_fill */
+#include "internal/gc.h"        /* for RB_OBJ_WRITE */
+#include "ruby/internal/stdbool.h"     /* for bool */
+#include "ruby/ruby.h"          /* for rb_block_call_func_t */
+
+#ifndef IMEMO_DEBUG
+# define IMEMO_DEBUG 0
+#endif
+
+#define IMEMO_MASK   0x0f
+
+/* FL_USER0 to FL_USER3 is for type */
+#define IMEMO_FL_USHIFT (FL_USHIFT + 4)
+#define IMEMO_FL_USER0 FL_USER4
+#define IMEMO_FL_USER1 FL_USER5
+#define IMEMO_FL_USER2 FL_USER6
+#define IMEMO_FL_USER3 FL_USER7
+#define IMEMO_FL_USER4 FL_USER8
+#define IMEMO_FL_USER5 FL_USER9
+
+enum imemo_type {
+    imemo_env            =  0,
+    imemo_cref           =  1, /*!< class reference */
+    imemo_svar           =  2, /*!< special variable */
+    imemo_throw_data     =  3,
+    imemo_ifunc          =  4, /*!< iterator function */
+    imemo_memo           =  5,
+    imemo_ment           =  6,
+    imemo_iseq           =  7,
+    imemo_tmpbuf         =  8,
+    imemo_ast            =  9,
+    imemo_parser_strterm = 10,
+    imemo_callinfo       = 11,
+    imemo_callcache      = 12,
+    imemo_constcache     = 13,
+};
+
+/* CREF (Class REFerence) is defined in method.h */
+
+/*! SVAR (Special VARiable) */
+struct vm_svar {
+    VALUE flags;
+    const VALUE cref_or_me; /*!< class reference or rb_method_entry_t */
+    const VALUE lastline;
+    const VALUE backref;
+    const VALUE others;
+};
+
+/*! THROW_DATA */
+struct vm_throw_data {
+    VALUE flags;
+    VALUE reserved;
+    const VALUE throw_obj;
+    const struct rb_control_frame_struct *catch_frame;
+    int throw_state;
+};
+
+#define THROW_DATA_CONSUMED IMEMO_FL_USER0
+
+/* IFUNC (Internal FUNCtion) */
+
+struct vm_ifunc_argc {
+#if SIZEOF_INT * 2 > SIZEOF_VALUE
+    signed int min: (SIZEOF_VALUE * CHAR_BIT) / 2;
+    signed int max: (SIZEOF_VALUE * CHAR_BIT) / 2;
+#else
+    int min, max;
+#endif
+};
+
+/*! IFUNC (Internal FUNCtion) */
+struct vm_ifunc {
+    VALUE flags;
+    VALUE reserved;
+    rb_block_call_func_t func;
+    const void *data;
+    struct vm_ifunc_argc argc;
+};
+
+struct rb_imemo_tmpbuf_struct {
+    VALUE flags;
+    VALUE reserved;
+    VALUE *ptr; /* malloc'ed buffer */
+    struct rb_imemo_tmpbuf_struct *next; /* next imemo */
+    size_t cnt; /* buffer size in VALUE */
+};
+
+/*! MEMO
+ *
+ * @see imemo_type
+ * */
+struct MEMO {
+    VALUE flags;
+    VALUE reserved;
+    const VALUE v1;
+    const VALUE v2;
+    union {
+        long cnt;
+        long state;
+        const VALUE value;
+        void (*func)(void);
+    } u3;
+};
+
+/* ment is in method.h */
+
+#define THROW_DATA_P(err) imemo_throw_data_p((VALUE)err)
+#define MEMO_CAST(m) ((struct MEMO *)(m))
+#define MEMO_NEW(a, b, c) ((struct MEMO *)rb_imemo_new(imemo_memo, (VALUE)(a), (VALUE)(b), (VALUE)(c), 0))
+#define MEMO_FOR(type, value) ((type *)RARRAY_PTR(value))
+#define NEW_MEMO_FOR(type, value) \
+  ((value) = rb_ary_tmp_new_fill(type_roomof(type, VALUE)), MEMO_FOR(type, value))
+#define NEW_PARTIAL_MEMO_FOR(type, value, member) \
+  ((value) = rb_ary_tmp_new_fill(type_roomof(type, VALUE)), \
+   rb_ary_set_len((value), offsetof(type, member) / sizeof(VALUE)), \
+   MEMO_FOR(type, value))
+
+typedef struct rb_imemo_tmpbuf_struct rb_imemo_tmpbuf_t;
+VALUE rb_imemo_new(enum imemo_type type, VALUE v1, VALUE v2, VALUE v3, VALUE v0);
+rb_imemo_tmpbuf_t *rb_imemo_tmpbuf_parser_heap(void *buf, rb_imemo_tmpbuf_t *old_heap, size_t cnt);
+struct vm_ifunc *rb_vm_ifunc_new(rb_block_call_func_t func, const void *data, int min_argc, int max_argc);
+void rb_strterm_mark(VALUE obj);
+static inline enum imemo_type imemo_type(VALUE imemo);
+static inline int imemo_type_p(VALUE imemo, enum imemo_type imemo_type);
+static inline bool imemo_throw_data_p(VALUE imemo);
+static inline struct vm_ifunc *rb_vm_ifunc_proc_new(rb_block_call_func_t func, const void *data);
+static inline VALUE rb_imemo_tmpbuf_auto_free_pointer(void);
+static inline void *RB_IMEMO_TMPBUF_PTR(VALUE v);
+static inline void *rb_imemo_tmpbuf_set_ptr(VALUE v, void *ptr);
+static inline VALUE rb_imemo_tmpbuf_auto_free_pointer_new_from_an_RString(VALUE str);
+static inline void MEMO_V1_SET(struct MEMO *m, VALUE v);
+static inline void MEMO_V2_SET(struct MEMO *m, VALUE v);
+
+RUBY_SYMBOL_EXPORT_BEGIN
+#if IMEMO_DEBUG
+VALUE rb_imemo_new_debug(enum imemo_type type, VALUE v1, VALUE v2, VALUE v3, VALUE v0, const char *file, int line);
+#define rb_imemo_new(type, v1, v2, v3, v0) rb_imemo_new_debug(type, v1, v2, v3, v0, __FILE__, __LINE__)
+#else
+VALUE rb_imemo_new(enum imemo_type type, VALUE v1, VALUE v2, VALUE v3, VALUE v0);
+#endif
+const char *rb_imemo_name(enum imemo_type type);
+RUBY_SYMBOL_EXPORT_END
+
+static inline enum imemo_type
+imemo_type(VALUE imemo)
+{
+    return (RBASIC(imemo)->flags >> FL_USHIFT) & IMEMO_MASK;
+}
+
+static inline int
+imemo_type_p(VALUE imemo, enum imemo_type imemo_type)
+{
+    if (LIKELY(!RB_SPECIAL_CONST_P(imemo))) {
+        /* fixed at compile time if imemo_type is given. */
+        const VALUE mask = (IMEMO_MASK << FL_USHIFT) | RUBY_T_MASK;
+        const VALUE expected_type = (imemo_type << FL_USHIFT) | T_IMEMO;
+        /* fixed at runtime. */
+        return expected_type == (RBASIC(imemo)->flags & mask);
+    }
+    else {
+        return 0;
+    }
+}
+
+#define IMEMO_TYPE_P(v, t) imemo_type_p((VALUE)v, t)
+
+static inline bool
+imemo_throw_data_p(VALUE imemo)
+{
+    return RB_TYPE_P(imemo, T_IMEMO);
+}
+
+static inline struct vm_ifunc *
+rb_vm_ifunc_proc_new(rb_block_call_func_t func, const void *data)
+{
+    return rb_vm_ifunc_new(func, data, 0, UNLIMITED_ARGUMENTS);
+}
+
+static inline VALUE
+rb_imemo_tmpbuf_auto_free_pointer(void)
+{
+    return rb_imemo_new(imemo_tmpbuf, 0, 0, 0, 0);
+}
+
+static inline void *
+RB_IMEMO_TMPBUF_PTR(VALUE v)
+{
+    const struct rb_imemo_tmpbuf_struct *p = (const void *)v;
+    return p->ptr;
+}
+
+static inline void *
+rb_imemo_tmpbuf_set_ptr(VALUE v, void *ptr)
+{
+    return ((rb_imemo_tmpbuf_t *)v)->ptr = ptr;
+}
+
+static inline VALUE
+rb_imemo_tmpbuf_auto_free_pointer_new_from_an_RString(VALUE str)
+{
+    const void *src;
+    VALUE imemo;
+    rb_imemo_tmpbuf_t *tmpbuf;
+    void *dst;
+    size_t len;
+
+    SafeStringValue(str);
+    /* create tmpbuf to keep the pointer before xmalloc */
+    imemo = rb_imemo_tmpbuf_auto_free_pointer();
+    tmpbuf = (rb_imemo_tmpbuf_t *)imemo;
+    len = RSTRING_LEN(str);
+    src = RSTRING_PTR(str);
+    dst = ruby_xmalloc(len);
+    memcpy(dst, src, len);
+    tmpbuf->ptr = dst;
+    return imemo;
+}
+
+static inline void
+MEMO_V1_SET(struct MEMO *m, VALUE v)
+{
+    RB_OBJ_WRITE(m, &m->v1, v);
+}
+
+static inline void
+MEMO_V2_SET(struct MEMO *m, VALUE v)
+{
+    RB_OBJ_WRITE(m, &m->v2, v);
+}
+
+#endif /* INTERNAL_IMEMO_H */
diff --git a/internal/inits.h b/internal/inits.h
new file mode 100644
index 0000000000..680c9cc1a5
--- /dev/null
+++ b/internal/inits.h
@@ -0,0 +1,51 @@
+#ifndef INTERNAL_INITS_H                                 /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_INITS_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header aggregating init functions.
+ */
+
+/* class.c */
+void Init_class_hierarchy(void);
+
+/* dmyext.c */
+void Init_enc(void);
+void Init_ext(void);
+
+/* file.c */
+void Init_File(void);
+
+/* gc.c */
+void Init_heap(void);
+
+/* localeinit.c */
+int Init_enc_set_filesystem_encoding(void);
+
+/* newline.c */
+void Init_newline(void);
+
+/* vm.c */
+void Init_BareVM(void);
+void Init_vm_objects(void);
+
+/* vm_backtrace.c */
+void Init_vm_backtrace(void);
+
+/* vm_eval.c */
+void Init_vm_eval(void);
+
+/* vm_insnhelper.c */
+void Init_vm_stack_canary(void);
+
+/* vm_method.c */
+void Init_eval_method(void);
+
+/* inits.c */
+void rb_call_inits(void);
+
+#endif /* INTERNAL_INITS_H */
diff --git a/internal/io.h b/internal/io.h
new file mode 100644
index 0000000000..b184cec439
--- /dev/null
+++ b/internal/io.h
@@ -0,0 +1,35 @@
+#ifndef INTERNAL_IO_H                                    /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_IO_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for IO.
+ */
+#include "ruby/ruby.h"          /* for VALUE */
+#include "ruby/io.h"            /* for rb_io_t */
+
+/* io.c */
+void ruby_set_inplace_mode(const char *);
+void rb_stdio_set_default_encoding(void);
+VALUE rb_io_flush_raw(VALUE, int);
+size_t rb_io_memsize(const rb_io_t *);
+int rb_stderr_tty_p(void);
+void rb_io_fptr_finalize_internal(void *ptr);
+#ifdef rb_io_fptr_finalize
+# undef rb_io_fptr_finalize
+#endif
+#define rb_io_fptr_finalize rb_io_fptr_finalize_internal
+VALUE rb_io_popen(VALUE pname, VALUE pmode, VALUE env, VALUE opt);
+
+RUBY_SYMBOL_EXPORT_BEGIN
+/* io.c (export) */
+void rb_maygvl_fd_fix_cloexec(int fd);
+int rb_gc_for_fd(int err);
+void rb_write_error_str(VALUE mesg);
+RUBY_SYMBOL_EXPORT_END
+
+#endif /* INTERNAL_IO_H */
diff --git a/internal/load.h b/internal/load.h
new file mode 100644
index 0000000000..37c1dee351
--- /dev/null
+++ b/internal/load.h
@@ -0,0 +1,19 @@
+#ifndef INTERNAL_LOAD_H                                  /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_LOAD_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for require.
+ */
+#include "ruby/ruby.h"          /* for VALUE */
+
+/* load.c */
+VALUE rb_get_expanded_load_path(void);
+int rb_require_internal(VALUE fname);
+NORETURN(void rb_load_fail(VALUE, const char*));
+
+#endif /* INTERNAL_LOAD_H */
diff --git a/internal/loadpath.h b/internal/loadpath.h
new file mode 100644
index 0000000000..f89f6694cd
--- /dev/null
+++ b/internal/loadpath.h
@@ -0,0 +1,17 @@
+#ifndef INTERNAL_LOADPATH_H                              /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_LOADPATH_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for $LOAD_PATH.
+ */
+
+/* loadpath.c */
+extern const char ruby_exec_prefix[];
+extern const char ruby_initial_load_paths[];
+
+#endif /* INTERNAL_LOADPATH_H */
diff --git a/internal/math.h b/internal/math.h
new file mode 100644
index 0000000000..cd8d553790
--- /dev/null
+++ b/internal/math.h
@@ -0,0 +1,24 @@
+#ifndef INTERNAL_MATH_H                                  /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_MATH_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for Math.
+ */
+#include "ruby/ruby.h"          /* for VALUE */
+
+/* math.c */
+VALUE rb_math_atan2(VALUE, VALUE);
+VALUE rb_math_cos(VALUE);
+VALUE rb_math_cosh(VALUE);
+VALUE rb_math_exp(VALUE);
+VALUE rb_math_hypot(VALUE, VALUE);
+VALUE rb_math_log(int argc, const VALUE *argv);
+VALUE rb_math_sin(VALUE);
+VALUE rb_math_sinh(VALUE);
+
+#endif /* INTERNAL_MATH_H */
diff --git a/internal/missing.h b/internal/missing.h
new file mode 100644
index 0000000000..0224075b3d
--- /dev/null
+++ b/internal/missing.h
@@ -0,0 +1,19 @@
+#ifndef INTERNAL_MISSING_H                               /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_MISSING_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header corresponding missing.
+ */
+#include "ruby/internal/config.h"      /* for HAVE_SETPROCTITLE */
+
+/* missing/setproctitle.c */
+#ifndef HAVE_SETPROCTITLE
+extern void ruby_init_setproctitle(int argc, char *argv[]);
+#endif
+
+#endif /* INTERNAL_MISSING_H */
diff --git a/internal/numeric.h b/internal/numeric.h
new file mode 100644
index 0000000000..32d5bd27fa
--- /dev/null
+++ b/internal/numeric.h
@@ -0,0 +1,255 @@
+#ifndef INTERNAL_NUMERIC_H                               /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_NUMERIC_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for Numeric.
+ */
+#include "internal/bignum.h"    /* for BIGNUM_POSITIVE_P */
+#include "internal/bits.h"      /* for RUBY_BIT_ROTL */
+#include "internal/fixnum.h"    /* for FIXNUM_POSITIVE_P */
+#include "internal/vm.h"        /* for rb_method_basic_definition_p */
+#include "ruby/intern.h"        /* for rb_cmperr */
+#include "ruby/ruby.h"          /* for USE_FLONUM */
+
+#define ROUND_TO(mode, even, up, down) \
+    ((mode) == RUBY_NUM_ROUND_HALF_EVEN ? even : \
+     (mode) == RUBY_NUM_ROUND_HALF_UP ? up : down)
+#define ROUND_FUNC(mode, name) \
+    ROUND_TO(mode, name##_half_even, name##_half_up, name##_half_down)
+#define ROUND_CALL(mode, name, args) \
+    ROUND_TO(mode, name##_half_even args, \
+             name##_half_up args, name##_half_down args)
+
+#ifndef ROUND_DEFAULT
+# define ROUND_DEFAULT RUBY_NUM_ROUND_HALF_UP
+#endif
+
+enum ruby_num_rounding_mode {
+    RUBY_NUM_ROUND_HALF_UP,
+    RUBY_NUM_ROUND_HALF_EVEN,
+    RUBY_NUM_ROUND_HALF_DOWN,
+    RUBY_NUM_ROUND_DEFAULT = ROUND_DEFAULT,
+};
+
+struct RFloat {
+    struct RBasic basic;
+    double float_value;
+};
+
+#define RFLOAT(obj)  ((struct RFloat *)(obj))
+
+/* numeric.c */
+int rb_num_to_uint(VALUE val, unsigned int *ret);
+VALUE ruby_num_interval_step_size(VALUE from, VALUE to, VALUE step, int excl);
+double ruby_float_step_size(double beg, double end, double unit, int excl);
+int ruby_float_step(VALUE from, VALUE to, VALUE step, int excl, int allow_endless);
+int rb_num_negative_p(VALUE);
+VALUE rb_int_succ(VALUE num);
+VALUE rb_float_uminus(VALUE num);
+VALUE rb_int_plus(VALUE x, VALUE y);
+VALUE rb_float_plus(VALUE x, VALUE y);
+VALUE rb_int_minus(VALUE x, VALUE y);
+VALUE rb_float_minus(VALUE x, VALUE y);
+VALUE rb_int_mul(VALUE x, VALUE y);
+VALUE rb_float_mul(VALUE x, VALUE y);
+VALUE rb_float_div(VALUE x, VALUE y);
+VALUE rb_int_idiv(VALUE x, VALUE y);
+VALUE rb_int_modulo(VALUE x, VALUE y);
+VALUE rb_int2str(VALUE num, int base);
+VALUE rb_fix_plus(VALUE x, VALUE y);
+VALUE rb_int_gt(VALUE x, VALUE y);
+VALUE rb_float_gt(VALUE x, VALUE y);
+VALUE rb_int_ge(VALUE x, VALUE y);
+enum ruby_num_rounding_mode rb_num_get_rounding_option(VALUE opts);
+double rb_int_fdiv_double(VALUE x, VALUE y);
+VALUE rb_int_pow(VALUE x, VALUE y);
+VALUE rb_float_pow(VALUE x, VALUE y);
+VALUE rb_int_cmp(VALUE x, VALUE y);
+VALUE rb_int_equal(VALUE x, VALUE y);
+VALUE rb_int_divmod(VALUE x, VALUE y);
+VALUE rb_int_and(VALUE x, VALUE y);
+VALUE rb_int_lshift(VALUE x, VALUE y);
+VALUE rb_int_div(VALUE x, VALUE y);
+int rb_int_positive_p(VALUE num);
+int rb_int_negative_p(VALUE num);
+VALUE rb_num_pow(VALUE x, VALUE y);
+VALUE rb_float_ceil(VALUE num, int ndigits);
+VALUE rb_float_floor(VALUE x, int ndigits);
+VALUE rb_float_abs(VALUE flt);
+static inline VALUE rb_num_compare_with_zero(VALUE num, ID mid);
+static inline int rb_num_positive_int_p(VALUE num);
+static inline int rb_num_negative_int_p(VALUE num);
+static inline double rb_float_flonum_value(VALUE v);
+static inline double rb_float_noflonum_value(VALUE v);
+static inline double rb_float_value_inline(VALUE v);
+static inline VALUE rb_float_new_inline(double d);
+static inline bool INT_POSITIVE_P(VALUE num);
+static inline bool INT_NEGATIVE_P(VALUE num);
+static inline bool FLOAT_ZERO_P(VALUE num);
+#define rb_float_value rb_float_value_inline
+#define rb_float_new   rb_float_new_inline
+
+RUBY_SYMBOL_EXPORT_BEGIN
+/* numeric.c (export) */
+VALUE rb_int_positive_pow(long x, unsigned long y);
+RUBY_SYMBOL_EXPORT_END
+
+MJIT_SYMBOL_EXPORT_BEGIN
+VALUE rb_flo_div_flo(VALUE x, VALUE y);
+double ruby_float_mod(double x, double y);
+VALUE rb_float_equal(VALUE x, VALUE y);
+int rb_float_cmp(VALUE x, VALUE y);
+VALUE rb_float_eql(VALUE x, VALUE y);
+VALUE rb_fix_aref(VALUE fix, VALUE idx);
+VALUE rb_int_zero_p(VALUE num);
+VALUE rb_int_even_p(VALUE num);
+VALUE rb_int_odd_p(VALUE num);
+VALUE rb_int_abs(VALUE num);
+VALUE rb_int_bit_length(VALUE num);
+VALUE rb_int_uminus(VALUE num);
+VALUE rb_int_comp(VALUE num);
+MJIT_SYMBOL_EXPORT_END
+
+static inline bool
+INT_POSITIVE_P(VALUE num)
+{
+    if (FIXNUM_P(num)) {
+        return FIXNUM_POSITIVE_P(num);
+    }
+    else {
+        return BIGNUM_POSITIVE_P(num);
+    }
+}
+
+static inline bool
+INT_NEGATIVE_P(VALUE num)
+{
+    if (FIXNUM_P(num)) {
+        return FIXNUM_NEGATIVE_P(num);
+    }
+    else {
+        return BIGNUM_NEGATIVE_P(num);
+    }
+}
+
+static inline bool
+FLOAT_ZERO_P(VALUE num)
+{
+    return RFLOAT_VALUE(num) == 0.0;
+}
+
+static inline VALUE
+rb_num_compare_with_zero(VALUE num, ID mid)
+{
+    VALUE zero = INT2FIX(0);
+    VALUE r = rb_check_funcall(num, mid, 1, &zero);
+    if (r == Qundef) {
+        rb_cmperr(num, zero);
+    }
+    return r;
+}
+
+static inline int
+rb_num_positive_int_p(VALUE num)
+{
+    const ID mid = '>';
+
+    if (FIXNUM_P(num)) {
+        if (rb_method_basic_definition_p(rb_cInteger, mid))
+            return FIXNUM_POSITIVE_P(num);
+    }
+    else if (RB_TYPE_P(num, T_BIGNUM)) {
+        if (rb_method_basic_definition_p(rb_cInteger, mid))
+            return BIGNUM_POSITIVE_P(num);
+    }
+    return RTEST(rb_num_compare_with_zero(num, mid));
+}
+
+static inline int
+rb_num_negative_int_p(VALUE num)
+{
+    const ID mid = '<';
+
+    if (FIXNUM_P(num)) {
+        if (rb_method_basic_definition_p(rb_cInteger, mid))
+            return FIXNUM_NEGATIVE_P(num);
+    }
+    else if (RB_TYPE_P(num, T_BIGNUM)) {
+        if (rb_method_basic_definition_p(rb_cInteger, mid))
+            return BIGNUM_NEGATIVE_P(num);
+    }
+    return RTEST(rb_num_compare_with_zero(num, mid));
+}
+
+static inline double
+rb_float_flonum_value(VALUE v)
+{
+#if USE_FLONUM
+    if (v != (VALUE)0x8000000000000002) { /* LIKELY */
+        union {
+            double d;
+            VALUE v;
+        } t;
+
+        VALUE b63 = (v >> 63);
+        /* e: xx1... -> 011... */
+        /*    xx0... -> 100... */
+        /*      ^b63           */
+        t.v = RUBY_BIT_ROTR((2 - b63) | (v & ~(VALUE)0x03), 3);
+        return t.d;
+    }
+#endif
+    return 0.0;
+}
+
+static inline double
+rb_float_noflonum_value(VALUE v)
+{
+    return RFLOAT(v)->float_value;
+}
+
+static inline double
+rb_float_value_inline(VALUE v)
+{
+    if (FLONUM_P(v)) {
+        return rb_float_flonum_value(v);
+    }
+    return rb_float_noflonum_value(v);
+}
+
+static inline VALUE
+rb_float_new_inline(double d)
+{
+#if USE_FLONUM
+    union {
+        double d;
+        VALUE v;
+    } t;
+    int bits;
+
+    t.d = d;
+    bits = (int)((VALUE)(t.v >> 60) & 0x7);
+    /* bits contains 3 bits of b62..b60. */
+    /* bits - 3 = */
+    /*   b011 -> b000 */
+    /*   b100 -> b001 */
+
+    if (t.v != 0x3000000000000000 /* 1.72723e-77 */ &&
+        !((bits-3) & ~0x01)) {
+        return (RUBY_BIT_ROTL(t.v, 3) & ~(VALUE)0x01) | 0x02;
+    }
+    else if (t.v == (VALUE)0) {
+        /* +0.0 */
+        return 0x8000000000000002;
+    }
+    /* out of range */
+#endif
+    return rb_float_new_in_heap(d);
+}
+
+#endif /* INTERNAL_NUMERIC_H */
diff --git a/internal/object.h b/internal/object.h
new file mode 100644
index 0000000000..aa820128c7
--- /dev/null
+++ b/internal/object.h
@@ -0,0 +1,83 @@
+#ifndef INTERNAL_OBJECT_H                                /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_OBJECT_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for Object.
+ */
+#include "ruby/ruby.h"          /* for VALUE */
+#include "internal/class.h"     /* for RCLASS_IV_INDEX_TBL */
+
+#ifdef ROBJECT_IV_INDEX_TBL
+# undef ROBJECT_IV_INDEX_TBL
+#endif
+
+/* object.c */
+VALUE rb_class_search_ancestor(VALUE klass, VALUE super);
+NORETURN(void rb_undefined_alloc(VALUE klass));
+double rb_num_to_dbl(VALUE val);
+VALUE rb_obj_dig(int argc, VALUE *argv, VALUE self, VALUE notfound);
+VALUE rb_immutable_obj_clone(int, VALUE *, VALUE);
+VALUE rb_check_convert_type_with_id(VALUE,int,const char*,ID);
+int rb_bool_expected(VALUE, const char *);
+static inline void RBASIC_CLEAR_CLASS(VALUE obj);
+static inline void RBASIC_SET_CLASS_RAW(VALUE obj, VALUE klass);
+static inline void RBASIC_SET_CLASS(VALUE obj, VALUE klass);
+static inline struct st_table *ROBJECT_IV_INDEX_TBL_inline(VALUE obj);
+
+RUBY_SYMBOL_EXPORT_BEGIN
+/* object.c (export) */
+int rb_opts_exception_p(VALUE opts, int default_value);
+RUBY_SYMBOL_EXPORT_END
+
+MJIT_SYMBOL_EXPORT_BEGIN
+CONSTFUNC(VALUE rb_obj_equal(VALUE obj1, VALUE obj2));
+CONSTFUNC(VALUE rb_obj_not(VALUE obj));
+VALUE rb_obj_not_equal(VALUE obj1, VALUE obj2);
+void rb_obj_copy_ivar(VALUE dest, VALUE obj);
+VALUE rb_false(VALUE obj);
+VALUE rb_convert_type_with_id(VALUE v, int t, const char* nam, ID mid);
+VALUE rb_obj_size(VALUE self, VALUE args, VALUE obj);
+MJIT_SYMBOL_EXPORT_END
+
+static inline void
+RBASIC_SET_CLASS_RAW(VALUE obj, VALUE klass)
+{
+    struct { VALUE flags; VALUE klass; } *ptr = (void *)obj;
+    ptr->klass = klass;
+}
+
+static inline void
+RBASIC_CLEAR_CLASS(VALUE obj)
+{
+    RBASIC_SET_CLASS_RAW(obj, 0);
+}
+
+static inline void
+RBASIC_SET_CLASS(VALUE obj, VALUE klass)
+{
+    VALUE oldv = RBASIC_CLASS(obj);
+    RBASIC_SET_CLASS_RAW(obj, klass);
+    RB_OBJ_WRITTEN(obj, oldv, klass);
+}
+
+RBIMPL_ATTR_PURE()
+static inline struct st_table *
+ROBJECT_IV_INDEX_TBL_inline(VALUE obj)
+{
+    if (RB_FL_ANY_RAW(obj, ROBJECT_EMBED)) {
+        VALUE klass = rb_obj_class(obj);
+        return RCLASS_IV_INDEX_TBL(klass);
+    }
+    else {
+        const struct RObject *const ptr = ROBJECT(obj);
+        return ptr->as.heap.iv_index_tbl;
+    }
+}
+#define ROBJECT_IV_INDEX_TBL ROBJECT_IV_INDEX_TBL_inline
+
+#endif /* INTERNAL_OBJECT_H */
diff --git a/internal/parse.h b/internal/parse.h
new file mode 100644
index 0000000000..a37a39f84d
--- /dev/null
+++ b/internal/parse.h
@@ -0,0 +1,23 @@
+#ifndef INTERNAL_PARSE_H                                 /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_PARSE_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for the parser.
+ */
+#include "ruby/ruby.h"          /* for VALUE */
+struct rb_iseq_struct;          /* in vm_core.h */
+
+/* parse.y */
+VALUE rb_parser_set_yydebug(VALUE, VALUE);
+void *rb_parser_load_file(VALUE parser, VALUE name);
+
+RUBY_SYMBOL_EXPORT_BEGIN
+VALUE rb_parser_set_context(VALUE, const struct rb_iseq_struct *, int);
+RUBY_SYMBOL_EXPORT_END
+
+#endif /* INTERNAL_PARSE_H */
diff --git a/internal/proc.h b/internal/proc.h
new file mode 100644
index 0000000000..5628a1f1c7
--- /dev/null
+++ b/internal/proc.h
@@ -0,0 +1,33 @@
+#ifndef INTERNAL_PROC_H                                  /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_PROC_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for Proc.
+ */
+#include "ruby/ruby.h"          /* for rb_block_call_func_t */
+#include "ruby/st.h"            /* for st_index_t */
+struct rb_block;                /* in vm_core.h */
+struct rb_iseq_struct;          /* in vm_core.h */
+
+/* proc.c */
+VALUE rb_proc_location(VALUE self);
+st_index_t rb_hash_proc(st_index_t hash, VALUE proc);
+int rb_block_pair_yield_optimizable(void);
+int rb_block_arity(void);
+int rb_block_min_max_arity(int *max);
+VALUE rb_block_to_s(VALUE self, const struct rb_block *block, const char *additional_info);
+VALUE rb_callable_receiver(VALUE);
+
+MJIT_SYMBOL_EXPORT_BEGIN
+VALUE rb_func_proc_new(rb_block_call_func_t func, VALUE val);
+VALUE rb_func_lambda_new(rb_block_call_func_t func, VALUE val, int min_argc, int max_argc);
+VALUE rb_iseq_location(const struct rb_iseq_struct *iseq);
+VALUE rb_sym_to_proc(VALUE sym);
+MJIT_SYMBOL_EXPORT_END
+
+#endif /* INTERNAL_PROC_H */
diff --git a/internal/process.h b/internal/process.h
new file mode 100644
index 0000000000..904c9a5cea
--- /dev/null
+++ b/internal/process.h
@@ -0,0 +1,136 @@
+#ifndef INTERNAL_PROCESS_H                               /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_PROCESS_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for Process.
+ */
+#include "ruby/internal/config.h"      /* for rb_pid_t */
+#include <stddef.h>             /* for size_t */
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>         /* for mode_t */
+#endif
+
+#ifdef _WIN32
+# include "ruby/win32.h"        /* for mode_t */
+#endif
+
+#include "ruby/ruby.h"          /* for VALUE */
+#include "internal/imemo.h"     /* for RB_IMEMO_TMPBUF_PTR */
+#include "internal/warnings.h"  /* for COMPILER_WARNING_PUSH */
+
+#define RB_MAX_GROUPS (65536)
+
+struct waitpid_state;
+struct rb_execarg {
+    union {
+        struct {
+            VALUE shell_script;
+        } sh;
+        struct {
+            VALUE command_name;
+            VALUE command_abspath; /* full path string or nil */
+            VALUE argv_str;
+            VALUE argv_buf;
+        } cmd;
+    } invoke;
+    VALUE redirect_fds;
+    VALUE envp_str;
+    VALUE envp_buf;
+    VALUE dup2_tmpbuf;
+    unsigned use_shell : 1;
+    unsigned pgroup_given : 1;
+    unsigned umask_given : 1;
+    unsigned unsetenv_others_given : 1;
+    unsigned unsetenv_others_do : 1;
+    unsigned close_others_given : 1;
+    unsigned close_others_do : 1;
+    unsigned chdir_given : 1;
+    unsigned new_pgroup_given : 1;
+    unsigned new_pgroup_flag : 1;
+    unsigned uid_given : 1;
+    unsigned gid_given : 1;
+    unsigned exception : 1;
+    unsigned exception_given : 1;
+    struct waitpid_state *waitpid_state; /* for async process management */
+    rb_pid_t pgroup_pgid; /* asis(-1), new pgroup(0), specified pgroup (0<V). */
+    VALUE rlimit_limits; /* Qfalse or [[rtype, softlim, hardlim], ...] */
+    mode_t umask_mask;
+    rb_uid_t uid;
+    rb_gid_t gid;
+    int close_others_maxhint;
+    VALUE fd_dup2;
+    VALUE fd_close;
+    VALUE fd_open;
+    VALUE fd_dup2_child;
+    VALUE env_modification; /* Qfalse or [[k1,v1], ...] */
+    VALUE path_env;
+    VALUE chdir_dir;
+};
+
+/* process.c */
+rb_pid_t rb_fork_ruby(int *status);
+void rb_last_status_clear(void);
+static inline char **ARGVSTR2ARGV(VALUE argv_str);
+static inline size_t ARGVSTR2ARGC(VALUE argv_str);
+
+#ifdef HAVE_PWD_H
+VALUE rb_getlogin(void);
+VALUE rb_getpwdirnam_for_login(VALUE login);  /* read as: "get pwd db home dir by username for login" */
+VALUE rb_getpwdiruid(void);                   /* read as: "get pwd db home dir for getuid()" */
+#endif
+
+RUBY_SYMBOL_EXPORT_BEGIN
+/* process.c (export) */
+int rb_exec_async_signal_safe(const struct rb_execarg *e, char *errmsg, size_t errmsg_buflen);
+rb_pid_t rb_fork_async_signal_safe(int *status, int (*chfunc)(void*, char *, size_t), void *charg, VALUE fds, char *errmsg, size_t errmsg_buflen);
+VALUE rb_execarg_new(int argc, const VALUE *argv, int accept_shell, int allow_exc_opt);
+struct rb_execarg *rb_execarg_get(VALUE execarg_obj); /* dangerous.  needs GC guard. */
+int rb_execarg_addopt(VALUE execarg_obj, VALUE key, VALUE val);
+void rb_execarg_parent_start(VALUE execarg_obj);
+void rb_execarg_parent_end(VALUE execarg_obj);
+int rb_execarg_run_options(const struct rb_execarg *e, struct rb_execarg *s, char* errmsg, size_t errmsg_buflen);
+VALUE rb_execarg_extract_options(VALUE execarg_obj, VALUE opthash);
+void rb_execarg_setenv(VALUE execarg_obj, VALUE env);
+RUBY_SYMBOL_EXPORT_END
+
+/* argv_str contains extra two elements.
+ * The beginning one is for /bin/sh used by exec_with_sh.
+ * The last one for terminating NULL used by execve.
+ * See rb_exec_fillarg() in process.c. */
+static inline char **
+ARGVSTR2ARGV(VALUE argv_str)
+{
+    char **buf = RB_IMEMO_TMPBUF_PTR(argv_str);
+    return &buf[1];
+}
+
+static inline size_t
+ARGVSTR2ARGC(VALUE argv_str)
+{
+    size_t i = 0;
+    char *const *p = ARGVSTR2ARGV(argv_str);
+    while (p[i++])
+        ;
+    return i - 1;
+}
+
+#ifdef HAVE_WORKING_FORK
+COMPILER_WARNING_PUSH
+#if __has_warning("-Wdeprecated-declarations") || RBIMPL_COMPILER_IS(GCC)
+COMPILER_WARNING_IGNORED(-Wdeprecated-declarations)
+#endif
+static inline rb_pid_t
+rb_fork(void)
+{
+    return fork();
+}
+COMPILER_WARNING_POP
+#endif
+
+#endif /* INTERNAL_PROCESS_H */
diff --git a/internal/random.h b/internal/random.h
new file mode 100644
index 0000000000..a92e65b8ba
--- /dev/null
+++ b/internal/random.h
@@ -0,0 +1,17 @@
+#ifndef INTERNAL_RANDOM_H                                /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_RANDOM_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for Random.
+ */
+#include <stddef.h>             /* for size_t */
+
+/* random.c */
+int ruby_fill_random_bytes(void *, size_t, int);
+
+#endif /* INTERNAL_RANDOM_H */
diff --git a/internal/range.h b/internal/range.h
new file mode 100644
index 0000000000..4fe6037c89
--- /dev/null
+++ b/internal/range.h
@@ -0,0 +1,41 @@
+#ifndef INTERNAL_RANGE_H                                  /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_RANGE_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for Range.
+ */
+#include "internal/struct.h"    /* for RSTRUCT */
+
+/* range.c */
+static inline VALUE RANGE_BEG(VALUE r);
+static inline VALUE RANGE_END(VALUE r);
+static inline VALUE RANGE_EXCL(VALUE r);
+
+static inline VALUE
+RANGE_BEG(VALUE r)
+{
+    return RSTRUCT(r)->as.ary[0];
+}
+
+static inline VALUE
+RANGE_END(VALUE r)
+{
+    return RSTRUCT(r)->as.ary[1];
+}
+
+static inline VALUE
+RANGE_EXCL(VALUE r)
+{
+    return RSTRUCT(r)->as.ary[2];
+}
+
+VALUE
+rb_range_component_beg_len(VALUE b, VALUE e, int excl,
+                           long *begp, long *lenp, long len, int err);
+
+#endif /* INTERNAL_RANGE_H */
diff --git a/internal/rational.h b/internal/rational.h
new file mode 100644
index 0000000000..6bbd2a9810
--- /dev/null
+++ b/internal/rational.h
@@ -0,0 +1,72 @@
+#ifndef INTERNAL_RATIONAL_H                              /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_RATIONAL_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for Rational.
+ */
+#include "ruby/internal/config.h"      /* for HAVE_LIBGMP */
+#include "ruby/ruby.h"          /* for struct RBasic */
+#include "internal/gc.h"        /* for RB_OBJ_WRITE */
+#include "internal/numeric.h"   /* for INT_POSITIVE_P */
+#include "ruby_assert.h"        /* for assert */
+
+struct RRational {
+    struct RBasic basic;
+    VALUE num;
+    VALUE den;
+};
+
+#define RRATIONAL(obj) ((struct RRational *)(obj))
+
+/* rational.c */
+VALUE rb_rational_canonicalize(VALUE x);
+VALUE rb_rational_uminus(VALUE self);
+VALUE rb_rational_plus(VALUE self, VALUE other);
+VALUE rb_rational_minus(VALUE self, VALUE other);
+VALUE rb_rational_mul(VALUE self, VALUE other);
+VALUE rb_rational_div(VALUE self, VALUE other);
+VALUE rb_lcm(VALUE x, VALUE y);
+VALUE rb_rational_reciprocal(VALUE x);
+VALUE rb_cstr_to_rat(const char *, int);
+VALUE rb_rational_hash(VALUE self);
+VALUE rb_rational_abs(VALUE self);
+VALUE rb_rational_cmp(VALUE self, VALUE other);
+VALUE rb_rational_pow(VALUE self, VALUE other);
+VALUE rb_rational_floor(VALUE self, int ndigits);
+VALUE rb_numeric_quo(VALUE x, VALUE y);
+VALUE rb_float_numerator(VALUE x);
+VALUE rb_float_denominator(VALUE x);
+
+static inline void RATIONAL_SET_NUM(VALUE r, VALUE n);
+static inline void RATIONAL_SET_DEN(VALUE r, VALUE d);
+
+RUBY_SYMBOL_EXPORT_BEGIN
+/* rational.c (export) */
+VALUE rb_gcd(VALUE x, VALUE y);
+VALUE rb_gcd_normal(VALUE self, VALUE other);
+#if defined(HAVE_LIBGMP) && defined(HAVE_GMP_H)
+VALUE rb_gcd_gmp(VALUE x, VALUE y);
+#endif
+RUBY_SYMBOL_EXPORT_END
+
+static inline void
+RATIONAL_SET_NUM(VALUE r, VALUE n)
+{
+    assert(RB_INTEGER_TYPE_P(n));
+    RB_OBJ_WRITE(r, &RRATIONAL(r)->num, n);
+}
+
+static inline void
+RATIONAL_SET_DEN(VALUE r, VALUE d)
+{
+    assert(RB_INTEGER_TYPE_P(d));
+    assert(INT_POSITIVE_P(d));
+    RB_OBJ_WRITE(r, &RRATIONAL(r)->den, d);
+}
+
+#endif /* INTERNAL_RATIONAL_H */
diff --git a/internal/re.h b/internal/re.h
new file mode 100644
index 0000000000..28fa3fb51c
--- /dev/null
+++ b/internal/re.h
@@ -0,0 +1,29 @@
+#ifndef INTERNAL_RE_H                                    /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_RE_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for Regexp.
+ */
+#include "ruby/internal/stdbool.h"     /* for bool */
+#include "ruby/ruby.h"          /* for VALUE */
+
+/* re.c */
+VALUE rb_reg_compile(VALUE str, int options, const char *sourcefile, int sourceline);
+VALUE rb_reg_check_preprocess(VALUE);
+long rb_reg_search0(VALUE, VALUE, long, int, int);
+VALUE rb_reg_match_p(VALUE re, VALUE str, long pos);
+bool rb_reg_start_with_p(VALUE re, VALUE str);
+void rb_backref_set_string(VALUE string, long pos, long len);
+void rb_match_unbusy(VALUE);
+int rb_match_count(VALUE match);
+int rb_match_nth_defined(int nth, VALUE match);
+MJIT_SYMBOL_EXPORT_BEGIN
+VALUE rb_reg_new_ary(VALUE ary, int options);
+MJIT_SYMBOL_EXPORT_END
+
+#endif /* INTERNAL_RE_H */
diff --git a/internal/sanitizers.h b/internal/sanitizers.h
new file mode 100644
index 0000000000..b4f5bdeda1
--- /dev/null
+++ b/internal/sanitizers.h
@@ -0,0 +1,191 @@
+#ifndef INTERNAL_SANITIZERS_H                            /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_SANITIZERS_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for ASAN / MSAN / etc.
+ */
+#include "ruby/internal/config.h"
+#include "internal/compilers.h" /* for __has_feature */
+
+#ifdef HAVE_VALGRIND_MEMCHECK_H
+# include <valgrind/memcheck.h>
+#endif
+
+#ifdef HAVE_SANITIZER_ASAN_INTERFACE_H
+# include <sanitizer/asan_interface.h>
+#endif
+
+#ifdef HAVE_SANITIZER_MSAN_INTERFACE_H
+# if __has_feature(memory_sanitizer)
+#  include <sanitizer/msan_interface.h>
+# endif
+#endif
+
+#include "ruby/internal/stdbool.h"     /* for bool */
+#include "ruby/ruby.h"          /* for VALUE */
+
+#if 0
+#elif __has_feature(memory_sanitizer) && __has_feature(address_sanitizer)
+# define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS(x) \
+    __attribute__((__no_sanitize__("memory, address"), __noinline__)) x
+#elif __has_feature(address_sanitizer)
+# define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS(x) \
+    __attribute__((__no_sanitize__("address"), __noinline__)) x
+#elif defined(NO_SANITIZE_ADDRESS)
+# define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS(x) \
+    NO_SANITIZE_ADDRESS(NOINLINE(x))
+#elif defined(NO_ADDRESS_SAFETY_ANALYSIS)
+# define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS(x) \
+    NO_ADDRESS_SAFETY_ANALYSIS(NOINLINE(x))
+#else
+# define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS(x) x
+#endif
+
+#if defined(NO_SANITIZE) && RBIMPL_COMPILER_IS(GCC)
+/* GCC warns about unknown sanitizer, which is annoying. */
+# include "internal/warnings.h"
+# undef NO_SANITIZE
+# define NO_SANITIZE(x, y) \
+    COMPILER_WARNING_PUSH; \
+    COMPILER_WARNING_IGNORED(-Wattributes); \
+    __attribute__((__no_sanitize__(x))) y; \
+    COMPILER_WARNING_POP
+#endif
+
+#ifndef NO_SANITIZE
+# define NO_SANITIZE(x, y) y
+#endif
+
+#if !__has_feature(address_sanitizer)
+# define __asan_poison_memory_region(x, y)
+# define __asan_unpoison_memory_region(x, y)
+# define __asan_region_is_poisoned(x, y) 0
+#endif
+
+#if !__has_feature(memory_sanitizer)
+# define __msan_allocated_memory(x, y) ((void)(x), (void)(y))
+# define __msan_poison(x, y) ((void)(x), (void)(y))
+# define __msan_unpoison(x, y) ((void)(x), (void)(y))
+# define __msan_unpoison_string(x) ((void)(x))
+#endif
+
+#ifdef VALGRIND_MAKE_READABLE
+# define VALGRIND_MAKE_MEM_DEFINED(p, n) VALGRIND_MAKE_READABLE((p), (n))
+#endif
+
+#ifdef VALGRIND_MAKE_WRITABLE
+# define VALGRIND_MAKE_MEM_UNDEFINED(p, n) VALGRIND_MAKE_WRITABLE((p), (n))
+#endif
+
+#ifndef VALGRIND_MAKE_MEM_DEFINED
+# define VALGRIND_MAKE_MEM_DEFINED(p, n) 0
+#endif
+
+#ifndef VALGRIND_MAKE_MEM_UNDEFINED
+# define VALGRIND_MAKE_MEM_UNDEFINED(p, n) 0
+#endif
+
+#ifndef MJIT_HEADER
+
+/*!
+ * This function asserts that a (continuous) memory region from ptr to size
+ * being "poisoned".  Both read / write access to such memory region are
+ * prohibited until properly unpoisoned.  The region must be previously
+ * allocated (do not pass a freed pointer here), but not necessarily be an
+ * entire object that the malloc returns.  You can punch hole a part of a
+ * gigantic heap arena.  This is handy when you do not free an allocated memory
+ * region to reuse later: poison when you keep it unused, and unpoison when you
+ * reuse.
+ *
+ * \param[in]  ptr   pointer to the beginning of the memory region to poison.
+ * \param[in]  size  the length of the memory region to poison.
+ */
+static inline void
+asan_poison_memory_region(const volatile void *ptr, size_t size)
+{
+    __msan_poison(ptr, size);
+    __asan_poison_memory_region(ptr, size);
+}
+
+/*!
+ * This is a variant of asan_poison_memory_region that takes a VALUE.
+ *
+ * \param[in]  obj   target object.
+ */
+static inline void
+asan_poison_object(VALUE obj)
+{
+    MAYBE_UNUSED(struct RVALUE *) ptr = (void *)obj;
+    asan_poison_memory_region(ptr, SIZEOF_VALUE);
+}
+
+#if !__has_feature(address_sanitizer)
+#define asan_poison_object_if(ptr, obj) ((void)(ptr), (void)(obj))
+#else
+#define asan_poison_object_if(ptr, obj) do { \
+        if (ptr) asan_poison_object(obj); \
+    } while (0)
+#endif
+
+/*!
+ * This function predicates if the given object is fully addressable or not.
+ *
+ * \param[in]  obj        target object.
+ * \retval     0          the given object is fully addressable.
+ * \retval     otherwise  pointer to first such byte who is poisoned.
+ */
+static inline void *
+asan_poisoned_object_p(VALUE obj)
+{
+    MAYBE_UNUSED(struct RVALUE *) ptr = (void *)obj;
+    return __asan_region_is_poisoned(ptr, SIZEOF_VALUE);
+}
+
+/*!
+ * This function asserts that a (formally poisoned) memory region from ptr to
+ * size is now addressable.  Write access to such memory region gets allowed.
+ * However read access might or might not be possible depending on situations,
+ * because the region can have contents of previous usages.  That information
+ * should be passed by the malloc_p flag.  If that is true, the contents of the
+ * region is _not_ fully defined (like the return value of malloc behaves).
+ * Reading from there is NG; write something first.  If malloc_p is false on
+ * the other hand, that memory region is fully defined and can be read
+ * immediately.
+ *
+ * \param[in]  ptr       pointer to the beginning of the memory region to unpoison.
+ * \param[in]  size      the length of the memory region.
+ * \param[in]  malloc_p  if the memory region is like a malloc's return value or not.
+ */
+static inline void
+asan_unpoison_memory_region(const volatile void *ptr, size_t size, bool malloc_p)
+{
+    __asan_unpoison_memory_region(ptr, size);
+    if (malloc_p) {
+        __msan_allocated_memory(ptr, size);
+    }
+    else {
+        __msan_unpoison(ptr, size);
+    }
+}
+
+/*!
+ * This is a variant of asan_unpoison_memory_region that takes a VALUE.
+ *
+ * \param[in]  obj       target object.
+ * \param[in]  malloc_p  if the memory region is like a malloc's return value or not.
+ */
+static inline void
+asan_unpoison_object(VALUE obj, bool newobj_p)
+{
+    MAYBE_UNUSED(struct RVALUE *) ptr = (void *)obj;
+    asan_unpoison_memory_region(ptr, SIZEOF_VALUE, newobj_p);
+}
+
+#endif /* MJIT_HEADER */
+
+#endif /* INTERNAL_SANITIZERS_H */
diff --git a/internal/scheduler.h b/internal/scheduler.h
new file mode 100644
index 0000000000..8314020220
--- /dev/null
+++ b/internal/scheduler.h
@@ -0,0 +1,44 @@
+#ifndef RUBY_SCHEDULER_H                                 /*-*-C-*-vi:se ft=c:*/
+#define RUBY_SCHEDULER_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for Scheduler.
+ */
+#include "ruby/ruby.h"
+#include "ruby/intern.h"
+
+VALUE rb_scheduler_get();
+VALUE rb_scheduler_set(VALUE scheduler);
+
+VALUE rb_scheduler_current();
+VALUE rb_thread_scheduler_current(VALUE thread);
+
+VALUE rb_scheduler_timeout(struct timeval *timeout);
+
+VALUE rb_scheduler_close(VALUE scheduler);
+
+VALUE rb_scheduler_kernel_sleep(VALUE scheduler, VALUE duration);
+VALUE rb_scheduler_kernel_sleepv(VALUE scheduler, int argc, VALUE * argv);
+
+int rb_scheduler_supports_process_wait(VALUE scheduler);
+VALUE rb_scheduler_process_wait(VALUE scheduler, rb_pid_t pid, int flags);
+
+VALUE rb_scheduler_block(VALUE scheduler, VALUE blocker, VALUE timeout);
+VALUE rb_scheduler_unblock(VALUE scheduler, VALUE blocker, VALUE fiber);
+
+VALUE rb_scheduler_io_wait(VALUE scheduler, VALUE io, VALUE events, VALUE timeout);
+VALUE rb_scheduler_io_wait_readable(VALUE scheduler, VALUE io);
+VALUE rb_scheduler_io_wait_writable(VALUE scheduler, VALUE io);
+
+int rb_scheduler_supports_io_read(VALUE scheduler);
+VALUE rb_scheduler_io_read(VALUE scheduler, VALUE io, VALUE buffer, size_t offset, size_t length);
+
+int rb_scheduler_supports_io_write(VALUE scheduler);
+VALUE rb_scheduler_io_write(VALUE scheduler, VALUE io, VALUE buffer, size_t offset, size_t length);
+
+#endif /* RUBY_SCHEDULER_H */
diff --git a/internal/serial.h b/internal/serial.h
new file mode 100644
index 0000000000..977cb35477
--- /dev/null
+++ b/internal/serial.h
@@ -0,0 +1,24 @@
+#ifndef INTERNAL_SERIAL_H                                /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_SERIAL_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for rb_serial_t.
+ */
+#include "ruby/internal/config.h"      /* for HAVE_LONG_LONG */
+#include "ruby/defines.h"       /* for LONG_LONG */
+
+#ifndef HAVE_LONG_LONG
+# error need C99+
+#endif
+
+typedef unsigned LONG_LONG rb_serial_t;
+#define SERIALT2NUM ULL2NUM
+#define PRI_SERIALT_PREFIX PRI_LL_PREFIX
+#define SIZEOF_SERIAL_T SIZEOF_LONG_LONG
+
+#endif /* INTERNAL_SERIAL_H */
diff --git a/internal/signal.h b/internal/signal.h
new file mode 100644
index 0000000000..6b4672f15b
--- /dev/null
+++ b/internal/signal.h
@@ -0,0 +1,22 @@
+#ifndef INTERNAL_SIGNAL_H                                /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_SIGNAL_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for SignalException.
+ */
+
+/* signal.c */
+extern int ruby_enable_coredump;
+int rb_get_next_signal(void);
+
+RUBY_SYMBOL_EXPORT_BEGIN
+/* signal.c (export) */
+int rb_grantpt(int fd);
+RUBY_SYMBOL_EXPORT_END
+
+#endif /* INTERNAL_SIGNAL_H */
diff --git a/internal/static_assert.h b/internal/static_assert.h
new file mode 100644
index 0000000000..284e410313
--- /dev/null
+++ b/internal/static_assert.h
@@ -0,0 +1,17 @@
+#ifndef INTERNAL_STATIC_ASSERT_H                         /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_STATIC_ASSERT_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      C11 shim for _Static_assert.
+ */
+#include "ruby/internal/static_assert.h"
+#ifndef STATIC_ASSERT
+# define STATIC_ASSERT RBIMPL_STATIC_ASSERT
+#endif
+
+#endif /* INTERNAL_STATIC_ASSERT_H */
diff --git a/internal/string.h b/internal/string.h
new file mode 100644
index 0000000000..adc8385cb6
--- /dev/null
+++ b/internal/string.h
@@ -0,0 +1,141 @@
+#ifndef INTERNAL_STRING_H                                /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_STRING_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for String.
+ */
+#include "ruby/internal/config.h"
+#include <stddef.h>             /* for size_t */
+#include "internal/compilers.h" /* for __has_builtin */
+#include "ruby/internal/stdbool.h"     /* for bool */
+#include "ruby/encoding.h"      /* for rb_encoding */
+#include "ruby/ruby.h"          /* for VALUE */
+
+#define STR_NOEMBED      FL_USER1
+#define STR_SHARED       FL_USER2 /* = ELTS_SHARED */
+
+#ifdef rb_fstring_cstr
+# undef rb_fstring_cstr
+#endif
+
+/* string.c */
+VALUE rb_fstring(VALUE);
+VALUE rb_fstring_cstr(const char *str);
+VALUE rb_fstring_enc_new(const char *ptr, long len, rb_encoding *enc);
+int rb_str_buf_cat_escaped_char(VALUE result, unsigned int c, int unicode_p);
+int rb_str_symname_p(VALUE);
+VALUE rb_str_quote_unprintable(VALUE);
+char *rb_str_fill_terminator(VALUE str, const int termlen);
+void rb_str_change_terminator_length(VALUE str, const int oldtermlen, const int termlen);
+VALUE rb_str_locktmp_ensure(VALUE str, VALUE (*func)(VALUE), VALUE arg);
+VALUE rb_str_chomp_string(VALUE str, VALUE chomp);
+VALUE rb_external_str_with_enc(VALUE str, rb_encoding *eenc);
+VALUE rb_str_cat_conv_enc_opts(VALUE newstr, long ofs, const char *ptr, long len,
+                               rb_encoding *from, int ecflags, VALUE ecopts);
+VALUE rb_enc_str_scrub(rb_encoding *enc, VALUE str, VALUE repl);
+VALUE rb_str_initialize(VALUE str, const char *ptr, long len, rb_encoding *enc);
+size_t rb_str_memsize(VALUE);
+char *rb_str_to_cstr(VALUE str);
+const char *ruby_escaped_char(int c);
+void rb_str_make_independent(VALUE str);
+int rb_enc_str_coderange_scan(VALUE str, rb_encoding *enc);
+
+static inline bool STR_EMBED_P(VALUE str);
+static inline bool STR_SHARED_P(VALUE str);
+static inline VALUE QUOTE(VALUE v);
+static inline VALUE QUOTE_ID(ID v);
+static inline bool is_ascii_string(VALUE str);
+static inline bool is_broken_string(VALUE str);
+static inline VALUE rb_str_eql_internal(const VALUE str1, const VALUE str2);
+
+RUBY_SYMBOL_EXPORT_BEGIN
+/* string.c (export) */
+VALUE rb_str_tmp_frozen_acquire(VALUE str);
+void rb_str_tmp_frozen_release(VALUE str, VALUE tmp);
+VALUE rb_setup_fake_str(struct RString *fake_str, const char *name, long len, rb_encoding *enc);
+VALUE rb_str_upto_each(VALUE, VALUE, int, int (*each)(VALUE, VALUE), VALUE);
+VALUE rb_str_upto_endless_each(VALUE, int (*each)(VALUE, VALUE), VALUE);
+RUBY_SYMBOL_EXPORT_END
+
+MJIT_SYMBOL_EXPORT_BEGIN
+VALUE rb_fstring_new(const char *ptr, long len);
+VALUE rb_obj_as_string_result(VALUE str, VALUE obj);
+VALUE rb_str_opt_plus(VALUE x, VALUE y);
+VALUE rb_str_concat_literals(size_t num, const VALUE *strary);
+VALUE rb_str_eql(VALUE str1, VALUE str2);
+VALUE rb_id_quote_unprintable(ID);
+VALUE rb_sym_proc_call(ID mid, int argc, const VALUE *argv, int kw_splat, VALUE passed_proc);
+
+struct rb_execution_context_struct;
+VALUE rb_ec_str_resurrect(struct rb_execution_context_struct *ec, VALUE str);
+MJIT_SYMBOL_EXPORT_END
+
+#define rb_fstring_lit(str) rb_fstring_new((str), rb_strlen_lit(str))
+#define rb_fstring_literal(str) rb_fstring_lit(str)
+#define rb_fstring_enc_lit(str, enc) rb_fstring_enc_new((str), rb_strlen_lit(str), (enc))
+#define rb_fstring_enc_literal(str, enc) rb_fstring_enc_lit(str, enc)
+
+static inline VALUE
+QUOTE(VALUE v)
+{
+    return rb_str_quote_unprintable(v);
+}
+
+static inline VALUE
+QUOTE_ID(ID i)
+{
+    return rb_id_quote_unprintable(i);
+}
+
+static inline bool
+STR_EMBED_P(VALUE str)
+{
+    return ! FL_TEST_RAW(str, STR_NOEMBED);
+}
+
+static inline bool
+STR_SHARED_P(VALUE str)
+{
+    return FL_ALL_RAW(str, STR_NOEMBED | ELTS_SHARED);
+}
+
+static inline bool
+is_ascii_string(VALUE str)
+{
+    return rb_enc_str_coderange(str) == ENC_CODERANGE_7BIT;
+}
+
+static inline bool
+is_broken_string(VALUE str)
+{
+    return rb_enc_str_coderange(str) == ENC_CODERANGE_BROKEN;
+}
+
+/* expect tail call optimization */
+static inline VALUE
+rb_str_eql_internal(const VALUE str1, const VALUE str2)
+{
+    const long len = RSTRING_LEN(str1);
+    const char *ptr1, *ptr2;
+
+    if (len != RSTRING_LEN(str2)) return Qfalse;
+    if (!rb_str_comparable(str1, str2)) return Qfalse;
+    if ((ptr1 = RSTRING_PTR(str1)) == (ptr2 = RSTRING_PTR(str2)))
+        return Qtrue;
+    if (memcmp(ptr1, ptr2, len) == 0)
+        return Qtrue;
+    return Qfalse;
+}
+
+#if __has_builtin(__builtin_constant_p)
+# define rb_fstring_cstr(str) \
+    (__builtin_constant_p(str) ? \
+        rb_fstring_new((str), (long)strlen(str)) : \
+        (rb_fstring_cstr)(str))
+#endif
+#endif /* INTERNAL_STRING_H */
diff --git a/internal/struct.h b/internal/struct.h
new file mode 100644
index 0000000000..82b2738b69
--- /dev/null
+++ b/internal/struct.h
@@ -0,0 +1,154 @@
+#ifndef INTERNAL_STRUCT_H                                /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_STRUCT_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for Struct.
+ */
+#include "ruby/internal/stdbool.h"     /* for bool */
+#include "internal/gc.h"        /* for RB_OBJ_WRITE */
+#include "ruby/ruby.h"          /* for struct RBasic */
+
+enum {
+    RSTRUCT_EMBED_LEN_MAX = RVALUE_EMBED_LEN_MAX,
+    RSTRUCT_EMBED_LEN_MASK = (RUBY_FL_USER2|RUBY_FL_USER1),
+    RSTRUCT_EMBED_LEN_SHIFT = (RUBY_FL_USHIFT+1),
+    RSTRUCT_TRANSIENT_FLAG = FL_USER3,
+};
+
+struct RStruct {
+    struct RBasic basic;
+    union {
+        struct {
+            long len;
+            const VALUE *ptr;
+        } heap;
+        const VALUE ary[RSTRUCT_EMBED_LEN_MAX];
+    } as;
+};
+
+#define RSTRUCT(obj) ((struct RStruct *)(obj))
+
+#ifdef RSTRUCT_LEN
+# undef RSTRUCT_LEN
+#endif
+
+#ifdef RSTRUCT_PTR
+# undef RSTRUCT_PTR
+#endif
+
+#ifdef RSTRUCT_SET
+# undef RSTRUCT_SET
+#endif
+
+#ifdef RSTRUCT_GET
+# undef RSTRUCT_GET
+#endif
+
+#define RSTRUCT_LEN internal_RSTRUCT_LEN
+#define RSTRUCT_SET internal_RSTRUCT_SET
+#define RSTRUCT_GET internal_RSTRUCT_GET
+
+/* struct.c */
+VALUE rb_struct_init_copy(VALUE copy, VALUE s);
+VALUE rb_struct_lookup(VALUE s, VALUE idx);
+VALUE rb_struct_s_keyword_init(VALUE klass);
+static inline const VALUE *rb_struct_const_heap_ptr(VALUE st);
+static inline bool RSTRUCT_TRANSIENT_P(VALUE st);
+static inline void RSTRUCT_TRANSIENT_SET(VALUE st);
+static inline void RSTRUCT_TRANSIENT_UNSET(VALUE st);
+static inline long RSTRUCT_EMBED_LEN(VALUE st);
+static inline long RSTRUCT_LEN(VALUE st);
+static inline int RSTRUCT_LENINT(VALUE st);
+static inline const VALUE *RSTRUCT_CONST_PTR(VALUE st);
+static inline void RSTRUCT_SET(VALUE st, long k, VALUE v);
+static inline VALUE RSTRUCT_GET(VALUE st, long k);
+
+static inline bool
+RSTRUCT_TRANSIENT_P(VALUE st)
+{
+#if USE_TRANSIENT_HEAP
+    return FL_TEST_RAW(st, RSTRUCT_TRANSIENT_FLAG);
+#else
+    return false;
+#endif
+}
+
+static inline void
+RSTRUCT_TRANSIENT_SET(VALUE st)
+{
+#if USE_TRANSIENT_HEAP
+    FL_SET_RAW(st, RSTRUCT_TRANSIENT_FLAG);
+#endif
+}
+
+static inline void
+RSTRUCT_TRANSIENT_UNSET(VALUE st)
+{
+#if USE_TRANSIENT_HEAP
+    FL_UNSET_RAW(st, RSTRUCT_TRANSIENT_FLAG);
+#endif
+}
+
+static inline long
+RSTRUCT_EMBED_LEN(VALUE st)
+{
+    long ret = FL_TEST_RAW(st, RSTRUCT_EMBED_LEN_MASK);
+    ret >>= RSTRUCT_EMBED_LEN_SHIFT;
+    return ret;
+}
+
+static inline long
+RSTRUCT_LEN(VALUE st)
+{
+    if (FL_TEST_RAW(st, RSTRUCT_EMBED_LEN_MASK)) {
+        return RSTRUCT_EMBED_LEN(st);
+    }
+    else {
+        return RSTRUCT(st)->as.heap.len;
+    }
+}
+
+static inline int
+RSTRUCT_LENINT(VALUE st)
+{
+    return rb_long2int(RSTRUCT_LEN(st));
+}
+
+static inline const VALUE *
+RSTRUCT_CONST_PTR(VALUE st)
+{
+    const struct RStruct *p = RSTRUCT(st);
+
+    if (FL_TEST_RAW(st, RSTRUCT_EMBED_LEN_MASK)) {
+        return p->as.ary;
+    }
+    else {
+        return p->as.heap.ptr;
+    }
+}
+
+static inline void
+RSTRUCT_SET(VALUE st, long k,  VALUE v)
+{
+    RB_OBJ_WRITE(st, &RSTRUCT_CONST_PTR(st)[k], v);
+}
+
+static inline VALUE
+RSTRUCT_GET(VALUE st, long k)
+{
+    return RSTRUCT_CONST_PTR(st)[k];
+}
+
+static inline const VALUE *
+rb_struct_const_heap_ptr(VALUE st)
+{
+    /* TODO: check embed on debug mode */
+    return RSTRUCT(st)->as.heap.ptr;
+}
+
+#endif /* INTERNAL_STRUCT_H */
diff --git a/internal/symbol.h b/internal/symbol.h
new file mode 100644
index 0000000000..691df66228
--- /dev/null
+++ b/internal/symbol.h
@@ -0,0 +1,41 @@
+#ifndef INTERNAL_SYMBOL_H                                /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_SYMBOL_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for Symbol.
+ */
+#include "ruby/ruby.h"          /* for VALUE */
+#include "ruby/encoding.h"      /* for rb_encoding */
+#include "internal/compilers.h" /* for __has_builtin */
+
+#ifdef rb_sym_intern_ascii_cstr
+# undef rb_sym_intern_ascii_cstr
+#endif
+
+/* symbol.c */
+VALUE rb_to_symbol_type(VALUE obj);
+VALUE rb_sym_intern(const char *ptr, long len, rb_encoding *enc);
+VALUE rb_sym_intern_ascii(const char *ptr, long len);
+VALUE rb_sym_intern_ascii_cstr(const char *ptr);
+int rb_is_const_name(VALUE name);
+int rb_is_class_name(VALUE name);
+int rb_is_instance_name(VALUE name);
+int rb_is_local_name(VALUE name);
+PUREFUNC(int rb_is_const_sym(VALUE sym));
+PUREFUNC(int rb_is_attrset_sym(VALUE sym));
+ID rb_make_internal_id(void);
+void rb_gc_free_dsymbol(VALUE);
+
+#if __has_builtin(__builtin_constant_p)
+#define rb_sym_intern_ascii_cstr(ptr) \
+    (__builtin_constant_p(ptr) ? \
+        rb_sym_intern_ascii((ptr), (long)strlen(ptr)) : \
+        rb_sym_intern_ascii_cstr(ptr))
+#endif
+
+#endif /* INTERNAL_SYMBOL_H */
diff --git a/internal/thread.h b/internal/thread.h
new file mode 100644
index 0000000000..09b8551b5c
--- /dev/null
+++ b/internal/thread.h
@@ -0,0 +1,54 @@
+#ifndef INTERNAL_THREAD_H                                /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_THREAD_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for Thread.
+ */
+#include "ruby/ruby.h"          /* for VALUE */
+#include "ruby/intern.h"        /* for rb_blocking_function_t */
+
+struct rb_thread_struct;        /* in vm_core.h */
+
+/* thread.c */
+#define COVERAGE_INDEX_LINES    0
+#define COVERAGE_INDEX_BRANCHES 1
+#define COVERAGE_TARGET_LINES    1
+#define COVERAGE_TARGET_BRANCHES 2
+#define COVERAGE_TARGET_METHODS  4
+#define COVERAGE_TARGET_ONESHOT_LINES 8
+
+VALUE rb_obj_is_mutex(VALUE obj);
+VALUE rb_suppress_tracing(VALUE (*func)(VALUE), VALUE arg);
+void rb_thread_execute_interrupts(VALUE th);
+VALUE rb_get_coverages(void);
+int rb_get_coverage_mode(void);
+VALUE rb_default_coverage(int);
+VALUE rb_thread_shield_new(void);
+VALUE rb_thread_shield_wait(VALUE self);
+VALUE rb_thread_shield_release(VALUE self);
+VALUE rb_thread_shield_destroy(VALUE self);
+int rb_thread_to_be_killed(VALUE thread);
+void rb_mutex_allow_trap(VALUE self, int val);
+VALUE rb_uninterruptible(VALUE (*b_proc)(VALUE), VALUE data);
+VALUE rb_mutex_owned_p(VALUE self);
+
+int rb_thread_wait_for_single_fd(int fd, int events, struct timeval * timeout);
+
+RUBY_SYMBOL_EXPORT_BEGIN
+/* Temporary.  This API will be removed (renamed). */
+VALUE rb_thread_io_blocking_region(rb_blocking_function_t *func, void *data1, int fd);
+
+/* thread.c (export) */
+int ruby_thread_has_gvl_p(void); /* for ext/fiddle/closure.c */
+RUBY_SYMBOL_EXPORT_END
+
+MJIT_SYMBOL_EXPORT_BEGIN
+int rb_threadptr_execute_interrupts(struct rb_thread_struct *th, int blocking_timing);
+MJIT_SYMBOL_EXPORT_END
+
+#endif /* INTERNAL_THREAD_H */
diff --git a/internal/time.h b/internal/time.h
new file mode 100644
index 0000000000..f9ac084603
--- /dev/null
+++ b/internal/time.h
@@ -0,0 +1,35 @@
+#ifndef INTERNAL_TIME_H                                  /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_TIME_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for Time.
+ */
+#include "ruby/internal/config.h"      /* for SIGNEDNESS_OF_TIME_T */
+#include "internal/bits.h"      /* for SIGNED_INTEGER_MAX */
+#include "ruby/ruby.h"          /* for VALUE */
+
+#if SIGNEDNESS_OF_TIME_T < 0    /* signed */
+# define TIMET_MAX SIGNED_INTEGER_MAX(time_t)
+# define TIMET_MIN SIGNED_INTEGER_MIN(time_t)
+#elif SIGNEDNESS_OF_TIME_T > 0  /* unsigned */
+# define TIMET_MAX UNSIGNED_INTEGER_MAX(time_t)
+# define TIMET_MIN ((time_t)0)
+#endif
+
+struct timeval; /* <- in <sys/time.h> or <winsock2.h> */
+
+/* time.c */
+struct timeval rb_time_timeval(VALUE);
+
+RUBY_SYMBOL_EXPORT_BEGIN
+/* time.c (export) */
+void ruby_reset_leap_second_info(void);
+void ruby_reset_timezone(void);
+RUBY_SYMBOL_EXPORT_END
+
+#endif /* INTERNAL_TIME_H */
diff --git a/internal/transcode.h b/internal/transcode.h
new file mode 100644
index 0000000000..a60ac06d10
--- /dev/null
+++ b/internal/transcode.h
@@ -0,0 +1,21 @@
+#ifndef INTERNAL_TRANSCODE_H                             /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_TRANSCODE_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for Encoding::Converter.
+ */
+#include "ruby/internal/config.h"
+#include <stddef.h>             /* for size_t */
+#include "ruby/ruby.h"          /* for VALUE */
+#include "ruby/encoding.h"      /* for rb_econv_t */
+
+/* transcode.c */
+extern VALUE rb_cEncodingConverter;
+size_t rb_econv_memsize(rb_econv_t *);
+
+#endif /* INTERNAL_TRANSCODE_H */
diff --git a/internal/util.h b/internal/util.h
new file mode 100644
index 0000000000..c28b884d32
--- /dev/null
+++ b/internal/util.h
@@ -0,0 +1,31 @@
+#ifndef INTERNAL_UTIL_H                                  /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_UTIL_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header corresponding util.c.
+ * @warning    DO NOT ADD RANDOM GARBAGE HERE THIS FILE IS FOR util.c
+ */
+#include "ruby/internal/config.h"
+#include <stddef.h>             /* for size_t */
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>         /* for ssize_t (note: on Windows ssize_t is */
+#endif                          /* `#define`d in ruby/config.h) */
+
+/* util.c */
+char *ruby_dtoa(double d_, int mode, int ndigits, int *decpt, int *sign, char **rve);
+char *ruby_hdtoa(double d, const char *xdigs, int ndigits, int *decpt, int *sign, char **rve);
+
+RUBY_SYMBOL_EXPORT_BEGIN
+/* util.c (export) */
+extern const signed char ruby_digit36_to_number_table[];
+extern const char ruby_hexdigits[];
+extern unsigned long ruby_scan_digits(const char *str, ssize_t len, int base, size_t *retlen, int *overflow);
+RUBY_SYMBOL_EXPORT_END
+
+#endif /* INTERNAL_UTIL_H */
diff --git a/internal/variable.h b/internal/variable.h
new file mode 100644
index 0000000000..057beccfcc
--- /dev/null
+++ b/internal/variable.h
@@ -0,0 +1,84 @@
+#ifndef INTERNAL_VARIABLE_H                              /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_VARIABLE_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for variables.
+ */
+#include "ruby/internal/config.h"
+#include <stddef.h>             /* for size_t */
+#include "constant.h"           /* for rb_const_entry_t */
+#include "ruby/internal/stdbool.h"     /* for bool */
+#include "ruby/ruby.h"          /* for VALUE */
+
+/* global variable */
+
+#define ROBJECT_TRANSIENT_FLAG    FL_USER13
+
+/* variable.c */
+void rb_gc_mark_global_tbl(void);
+void rb_gc_update_global_tbl(void);
+size_t rb_generic_ivar_memsize(VALUE);
+VALUE rb_search_class_path(VALUE);
+VALUE rb_attr_delete(VALUE, ID);
+VALUE rb_ivar_lookup(VALUE obj, ID id, VALUE undef);
+void rb_autoload_str(VALUE mod, ID id, VALUE file);
+VALUE rb_autoload_at_p(VALUE, ID, int);
+NORETURN(VALUE rb_mod_const_missing(VALUE,VALUE));
+rb_gvar_getter_t *rb_gvar_getter_function_of(ID);
+rb_gvar_setter_t *rb_gvar_setter_function_of(ID);
+void rb_gvar_readonly_setter(VALUE v, ID id, VALUE *_);
+void rb_gvar_ractor_local(const char *name);
+static inline bool ROBJ_TRANSIENT_P(VALUE obj);
+static inline void ROBJ_TRANSIENT_SET(VALUE obj);
+static inline void ROBJ_TRANSIENT_UNSET(VALUE obj);
+
+RUBY_SYMBOL_EXPORT_BEGIN
+/* variable.c (export) */
+void rb_mark_generic_ivar(VALUE);
+void rb_mv_generic_ivar(VALUE src, VALUE dst);
+VALUE rb_const_missing(VALUE klass, VALUE name);
+int rb_class_ivar_set(VALUE klass, ID vid, VALUE value);
+void rb_iv_tbl_copy(VALUE dst, VALUE src);
+void rb_deprecate_constant(VALUE mod, const char *name);
+RUBY_SYMBOL_EXPORT_END
+
+MJIT_SYMBOL_EXPORT_BEGIN
+VALUE rb_gvar_get(ID);
+VALUE rb_gvar_set(ID, VALUE);
+VALUE rb_gvar_defined(ID);
+void rb_const_warn_if_deprecated(const rb_const_entry_t *, VALUE, ID);
+void rb_init_iv_list(VALUE obj);
+MJIT_SYMBOL_EXPORT_END
+
+static inline bool
+ROBJ_TRANSIENT_P(VALUE obj)
+{
+#if USE_TRANSIENT_HEAP
+    return FL_TEST_RAW(obj, ROBJECT_TRANSIENT_FLAG);
+#else
+    return false;
+#endif
+}
+
+static inline void
+ROBJ_TRANSIENT_SET(VALUE obj)
+{
+#if USE_TRANSIENT_HEAP
+    FL_SET_RAW(obj, ROBJECT_TRANSIENT_FLAG);
+#endif
+}
+
+static inline void
+ROBJ_TRANSIENT_UNSET(VALUE obj)
+{
+#if USE_TRANSIENT_HEAP
+    FL_UNSET_RAW(obj, ROBJECT_TRANSIENT_FLAG);
+#endif
+}
+
+#endif /* INTERNAL_VARIABLE_H */
diff --git a/internal/vm.h b/internal/vm.h
new file mode 100644
index 0000000000..689b4fa61f
--- /dev/null
+++ b/internal/vm.h
@@ -0,0 +1,131 @@
+#ifndef INTERNAL_VM_H                                    /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_VM_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header for RubyVM.
+ */
+#include "ruby/internal/stdbool.h"         /* for bool */
+#include "internal/serial.h"        /* for rb_serial_t */
+#include "internal/static_assert.h" /* for STATIC_ASSERT */
+#include "ruby/ruby.h"              /* for ID */
+#include "ruby/st.h"                /* for st_table */
+
+#ifdef rb_funcallv
+# undef rb_funcallv
+#endif
+
+#ifdef rb_method_basic_definition_p
+# undef rb_method_basic_definition_p
+#endif
+
+struct rb_callable_method_entry_struct; /* in method.h */
+struct rb_method_definition_struct;     /* in method.h */
+struct rb_execution_context_struct;     /* in vm_core.h */
+struct rb_control_frame_struct;         /* in vm_core.h */
+struct rb_callinfo;                     /* in vm_core.h */
+
+enum method_missing_reason {
+    MISSING_NOENTRY   = 0x00,
+    MISSING_PRIVATE   = 0x01,
+    MISSING_PROTECTED = 0x02,
+    MISSING_FCALL     = 0x04,
+    MISSING_VCALL     = 0x08,
+    MISSING_SUPER     = 0x10,
+    MISSING_MISSING   = 0x20,
+    MISSING_NONE      = 0x40
+};
+
+/* vm_insnhelper.h */
+rb_serial_t rb_next_class_serial(void);
+
+/* vm.c */
+VALUE rb_obj_is_thread(VALUE obj);
+void rb_vm_mark(void *ptr);
+void rb_vm_each_stack_value(void *ptr, void (*cb)(VALUE, void*), void *ctx);
+PUREFUNC(VALUE rb_vm_top_self(void));
+void rb_vm_inc_const_missing_count(void);
+const void **rb_vm_get_insns_address_table(void);
+VALUE rb_source_location(int *pline);
+const char *rb_source_location_cstr(int *pline);
+MJIT_STATIC void rb_vm_pop_cfunc_frame(void);
+int rb_vm_add_root_module(VALUE module);
+void rb_vm_check_redefinition_by_prepend(VALUE klass);
+int rb_vm_check_optimizable_mid(VALUE mid);
+VALUE rb_yield_refine_block(VALUE refinement, VALUE refinements);
+MJIT_STATIC VALUE ruby_vm_special_exception_copy(VALUE);
+PUREFUNC(st_table *rb_vm_fstring_table(void));
+
+MJIT_SYMBOL_EXPORT_BEGIN
+VALUE vm_exec(struct rb_execution_context_struct *, bool); /* used in JIT-ed code */
+MJIT_SYMBOL_EXPORT_END
+
+/* vm_eval.c */
+VALUE rb_current_realfilepath(void);
+VALUE rb_check_block_call(VALUE, ID, int, const VALUE *, rb_block_call_func_t, VALUE);
+typedef void rb_check_funcall_hook(int, VALUE, ID, int, const VALUE *, VALUE);
+VALUE rb_check_funcall_with_hook(VALUE recv, ID mid, int argc, const VALUE *argv,
+                                 rb_check_funcall_hook *hook, VALUE arg);
+VALUE rb_check_funcall_with_hook_kw(VALUE recv, ID mid, int argc, const VALUE *argv,
+                                 rb_check_funcall_hook *hook, VALUE arg, int kw_splat);
+const char *rb_type_str(enum ruby_value_type type);
+VALUE rb_check_funcall_default(VALUE, ID, int, const VALUE *, VALUE);
+VALUE rb_check_funcall_basic_kw(VALUE, ID, VALUE, int, const VALUE*, int);
+VALUE rb_yield_1(VALUE val);
+VALUE rb_yield_force_blockarg(VALUE values);
+VALUE rb_lambda_call(VALUE obj, ID mid, int argc, const VALUE *argv,
+                     rb_block_call_func_t bl_proc, int min_argc, int max_argc,
+                     VALUE data2);
+void rb_check_stack_overflow(void);
+
+/* vm_insnhelper.c */
+VALUE rb_equal_opt(VALUE obj1, VALUE obj2);
+VALUE rb_eql_opt(VALUE obj1, VALUE obj2);
+
+struct rb_iseq_struct;
+MJIT_SYMBOL_EXPORT_BEGIN
+const struct rb_callcache *rb_vm_search_method_slowpath(const struct rb_callinfo *ci, VALUE klass);
+MJIT_SYMBOL_EXPORT_END
+
+/* vm_method.c */
+struct rb_execution_context_struct;
+MJIT_SYMBOL_EXPORT_BEGIN
+int rb_ec_obj_respond_to(struct rb_execution_context_struct *ec, VALUE obj, ID id, int priv);
+MJIT_SYMBOL_EXPORT_END
+
+/* vm_dump.c */
+void rb_print_backtrace(void);
+
+/* vm_backtrace.c */
+VALUE rb_vm_thread_backtrace(int argc, const VALUE *argv, VALUE thval);
+VALUE rb_vm_thread_backtrace_locations(int argc, const VALUE *argv, VALUE thval);
+VALUE rb_vm_backtrace(int argc, const VALUE * argv, struct rb_execution_context_struct * ec);
+VALUE rb_vm_backtrace_locations(int argc, const VALUE * argv, struct rb_execution_context_struct * ec);
+VALUE rb_make_backtrace(void);
+void rb_backtrace_print_as_bugreport(void);
+int rb_backtrace_p(VALUE obj);
+VALUE rb_backtrace_to_str_ary(VALUE obj);
+VALUE rb_backtrace_to_location_ary(VALUE obj);
+void rb_backtrace_each(VALUE (*iter)(VALUE recv, VALUE str), VALUE output);
+
+MJIT_SYMBOL_EXPORT_BEGIN
+VALUE rb_ec_backtrace_object(const struct rb_execution_context_struct *ec);
+void rb_backtrace_use_iseq_first_lineno_for_last_location(VALUE self);
+MJIT_SYMBOL_EXPORT_END
+
+#define RUBY_DTRACE_CREATE_HOOK(name, arg) \
+    RUBY_DTRACE_HOOK(name##_CREATE, arg)
+#define RUBY_DTRACE_HOOK(name, arg) \
+do { \
+    if (UNLIKELY(RUBY_DTRACE_##name##_ENABLED())) { \
+        int dtrace_line; \
+        const char *dtrace_file = rb_source_location_cstr(&dtrace_line); \
+        if (!dtrace_file) dtrace_file = ""; \
+        RUBY_DTRACE_##name(arg, dtrace_file, dtrace_line); \
+    } \
+} while (0)
+#endif /* INTERNAL_VM_H */
diff --git a/internal/warnings.h b/internal/warnings.h
new file mode 100644
index 0000000000..63ded99d04
--- /dev/null
+++ b/internal/warnings.h
@@ -0,0 +1,17 @@
+#ifndef INTERNAL_WARNINGS_H                              /*-*-C-*-vi:se ft=c:*/
+#define INTERNAL_WARNINGS_H
+/**
+ * @file
+ * @author     Ruby developers <ruby-core@ruby-lang.org>
+ * @copyright  This  file  is   a  part  of  the   programming  language  Ruby.
+ *             Permission  is hereby  granted,  to  either redistribute  and/or
+ *             modify this file, provided that  the conditions mentioned in the
+ *             file COPYING are met.  Consult the file for details.
+ * @brief      Internal header to suppres / mandate warnings.
+ */
+#include "ruby/internal/warning_push.h"
+#define COMPILER_WARNING_PUSH          RBIMPL_WARNING_PUSH()
+#define COMPILER_WARNING_POP           RBIMPL_WARNING_POP()
+#define COMPILER_WARNING_ERROR(flag)   RBIMPL_WARNING_ERROR(flag)
+#define COMPILER_WARNING_IGNORED(flag) RBIMPL_WARNING_IGNORED(flag)
+#endif /* INTERNAL_WARNINGS_H */
diff --git a/io.c b/io.c
index 10cdeb699c..caa4dd28f7 100644
--- a/io.c
+++ b/io.c
@@ -11,15 +11,32 @@
 
 **********************************************************************/
 
-#include "internal.h"
-#include "ruby/io.h"
-#include "ruby/thread.h"
-#include "dln.h"
-#include "encindex.h"
-#include "id.h"
+#include "ruby/internal/config.h"
+
+#include "internal/scheduler.h"
+
+#ifdef _WIN32
+# include "ruby/ruby.h"
+# include "ruby/io.h"
+#endif
+
 #include <ctype.h>
 #include <errno.h>
-#include "ruby_atomic.h"
+#include <stddef.h>
+
+/* non-Linux poll may not work on all FDs */
+#if defined(HAVE_POLL)
+# if defined(__linux__)
+#   define USE_POLL 1
+# endif
+# if defined(__FreeBSD_version) && __FreeBSD_version >= 1100000
+#  define USE_POLL 1
+# endif
+#endif
+
+#ifndef USE_POLL
+# define USE_POLL 0
+#endif
 
 #undef free
 #define free(x) xfree(x)
@@ -44,7 +61,7 @@
 #endif
 
 #ifdef __QNXNTO__
-#include "unix.h"
+#include <unix.h>
 #endif
 
 #include <sys/types.h>
@@ -93,7 +110,37 @@
 # include <sys/wait.h>		/* for WNOHANG on BSD */
 #endif
 
+#ifdef HAVE_COPYFILE_H
+# include <copyfile.h>
+#endif
+
+#include "ruby/internal/stdbool.h"
+#include "ccan/list/list.h"
+#include "dln.h"
+#include "encindex.h"
+#include "id.h"
+#include "internal.h"
+#include "internal/encoding.h"
+#include "internal/error.h"
+#include "internal/inits.h"
+#include "internal/io.h"
+#include "internal/numeric.h"
+#include "internal/object.h"
+#include "internal/process.h"
+#include "internal/thread.h"
+#include "internal/transcode.h"
+#include "internal/variable.h"
+#include "ruby/io.h"
+#include "ruby/thread.h"
 #include "ruby/util.h"
+#include "ruby_atomic.h"
+#include "ruby/ractor.h"
+
+#if !USE_POLL
+#  include "vm_core.h"
+#endif
+
+#include "builtin.h"
 
 #ifndef O_ACCMODE
 #define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR)
@@ -120,13 +167,6 @@
 off_t __syscall(quad_t number, ...);
 #endif
 
-#ifdef __native_client__
-# undef F_GETFD
-# ifdef NACL_NEWLIB
-#  undef HAVE_IOCTL
-# endif
-#endif
-
 #define IO_RBUF_CAPA_MIN  8192
 #define IO_CBUF_CAPA_MIN  (128*1024)
 #define IO_RBUF_CAPA_FOR(fptr) (NEED_READCONV(fptr) ? IO_CBUF_CAPA_MIN : IO_RBUF_CAPA_MIN)
@@ -136,6 +176,8 @@ off_t __syscall(quad_t number, ...);
 #ifdef _WIN32
 #undef open
 #define open	rb_w32_uopen
+#undef rename
+#define rename(f, t)	rb_w32_urename((f), (t))
 #endif
 
 VALUE rb_cIO;
@@ -161,7 +203,6 @@ VALUE rb_default_rs;
 
 static VALUE argf;
 
-#define id_exception idException
 static ID id_write, id_read, id_getc, id_flush, id_readpartial, id_set_encoding;
 static VALUE sym_mode, sym_perm, sym_flags, sym_extenc, sym_intenc, sym_encoding, sym_open_args;
 static VALUE sym_textmode, sym_binmode, sym_autoclose;
@@ -174,12 +215,15 @@ static VALUE sym_DATA;
 static VALUE sym_HOLE;
 #endif
 
+static VALUE rb_io_initialize(int argc, VALUE *argv, VALUE io);
+static VALUE prep_io(int fd, int fmode, VALUE klass, const char *path);
+
 struct argf {
     VALUE filename, current_file;
     long last_lineno;		/* $. */
     long lineno;
     VALUE argv;
-    char *inplace;
+    VALUE inplace;
     struct rb_io_enc_t encs;
     int8_t init_p, next_p, binmode;
 };
@@ -188,14 +232,22 @@ static rb_atomic_t max_file_descriptor = NOFILE;
 void
 rb_update_max_fd(int fd)
 {
-    struct stat buf;
     rb_atomic_t afd = (rb_atomic_t)fd;
     rb_atomic_t max_fd = max_file_descriptor;
+    int err;
 
-    if (afd <= max_fd)
+    if (fd < 0 || afd <= max_fd)
         return;
 
-    if (fstat(fd, &buf) != 0 && errno == EBADF) {
+#if defined(HAVE_FCNTL) && defined(F_GETFL)
+    err = fcntl(fd, F_GETFL) == -1;
+#else
+    {
+        struct stat buf;
+        err = fstat(fd, &buf) != 0;
+    }
+#endif
+    if (err && errno == EBADF) {
         rb_bug("rb_update_max_fd: invalid fd (%d) given.", fd);
     }
 
@@ -220,7 +272,7 @@ rb_maygvl_fd_fix_cloexec(int fd)
         flags2 = flags | FD_CLOEXEC; /* Set CLOEXEC for non-standard file descriptors: 3, 4, 5, ... */
     if (flags != flags2) {
         ret = fcntl(fd, F_SETFD, flags2);
-        if (ret == -1) {
+        if (ret != 0) {
             rb_bug("rb_maygvl_fd_fix_cloexec: fcntl(%d, F_SETFD, %d) failed: %s", fd, flags2, strerror(errno));
         }
     }
@@ -257,14 +309,27 @@ rb_cloexec_open(const char *pathname, int flags, mode_t mode)
     int ret;
     static int o_cloexec_state = -1; /* <0: unknown, 0: ignored, >0: working */
 
+    static const int retry_interval = 0;
+    static const int retry_max_count = 10000;
+
+    int retry_count = 0;
+
 #ifdef O_CLOEXEC
     /* O_CLOEXEC is available since Linux 2.6.23.  Linux 2.6.18 silently ignore it. */
     flags |= O_CLOEXEC;
 #elif defined O_NOINHERIT
     flags |= O_NOINHERIT;
 #endif
-    ret = open(pathname, flags, mode);
-    if (ret == -1) return -1;
+
+    while ((ret = open(pathname, flags, mode)) == -1) {
+        int e = errno;
+        if (e != EAGAIN && e != EWOULDBLOCK) break;
+        if (retry_count++ >= retry_max_count) break;
+
+        sleep(retry_interval);
+    }
+
+    if (ret < 0) return ret;
     if (ret <= 2 || o_cloexec_state == 0) {
 	rb_maygvl_fd_fix_cloexec(ret);
     }
@@ -313,47 +378,62 @@ rb_cloexec_dup2(int oldfd, int newfd)
 #else
         ret = dup2(oldfd, newfd);
 #endif
-        if (ret == -1) return -1;
+        if (ret < 0) return ret;
     }
     rb_maygvl_fd_fix_cloexec(ret);
     return ret;
 }
 
-int
-rb_cloexec_pipe(int fildes[2])
+static int
+rb_fd_set_nonblock(int fd)
 {
-    int ret;
+#ifdef _WIN32
+    return rb_w32_set_nonblock(fd);
+#elif defined(F_GETFL)
+    int oflags = fcntl(fd, F_GETFL);
 
-#if defined(HAVE_PIPE2)
-    static int try_pipe2 = 1;
-    if (try_pipe2) {
-        ret = pipe2(fildes, O_CLOEXEC);
-        if (ret != -1)
-            return ret;
-        /* pipe2 is available since Linux 2.6.27, glibc 2.9. */
-        if (errno == ENOSYS) {
-            try_pipe2 = 0;
-            ret = pipe(fildes);
-        }
-    }
-    else {
-        ret = pipe(fildes);
-    }
+    if (oflags == -1)
+        return -1;
+    if (oflags & O_NONBLOCK)
+        return 0;
+    oflags |= O_NONBLOCK;
+    return fcntl(fd, F_SETFL, oflags);
+#endif
+    return 0;
+}
+
+int
+rb_cloexec_pipe(int descriptors[2])
+{
+#ifdef HAVE_PIPE2
+    int result = pipe2(descriptors, O_CLOEXEC | O_NONBLOCK);
 #else
-    ret = pipe(fildes);
+    int result = pipe(descriptors);
 #endif
-    if (ret == -1) return -1;
+
+    if (result < 0)
+        return result;
+
 #ifdef __CYGWIN__
-    if (ret == 0 && fildes[1] == -1) {
-	close(fildes[0]);
-	fildes[0] = -1;
-	errno = ENFILE;
-	return -1;
+    if (result == 0 && descriptors[1] == -1) {
+        close(descriptors[0]);
+        descriptors[0] = -1;
+        errno = ENFILE;
+        return -1;
     }
 #endif
-    rb_maygvl_fd_fix_cloexec(fildes[0]);
-    rb_maygvl_fd_fix_cloexec(fildes[1]);
-    return ret;
+
+#ifndef HAVE_PIPE2
+    rb_maygvl_fd_fix_cloexec(descriptors[0]);
+    rb_maygvl_fd_fix_cloexec(descriptors[1]);
+
+#ifndef _WIN32
+    rb_fd_set_nonblock(descriptors[0]);
+    rb_fd_set_nonblock(descriptors[1]);
+#endif
+#endif
+
+    return result;
 }
 
 int
@@ -385,7 +465,7 @@ rb_cloexec_fcntl_dupfd(int fd, int minfd)
     ret = fcntl(fd, F_DUPFD, minfd);
 #elif defined(HAVE_DUP)
     ret = dup(fd);
-    if (ret != -1 && ret < minfd) {
+    if (ret >= 0 && ret < minfd) {
         const int prev_fd = ret;
         ret = rb_cloexec_fcntl_dupfd(fd, minfd);
         close(prev_fd);
@@ -394,7 +474,7 @@ rb_cloexec_fcntl_dupfd(int fd, int minfd)
 #else
 # error "dup() or fcntl(F_DUPFD) must be supported."
 #endif
-    if (ret == -1) return -1;
+    if (ret < 0) return ret;
     rb_maygvl_fd_fix_cloexec(ret);
     return ret;
 }
@@ -424,7 +504,7 @@ rb_cloexec_fcntl_dupfd(int fd, int minfd)
     if (!READ_DATA_PENDING(fptr)) {\
 	WAIT_FD_IN_WIN32(fptr);\
 	rb_io_check_closed(fptr);\
-     }\
+    }\
 } while(0)
 
 #ifndef S_ISSOCK
@@ -444,6 +524,42 @@ rb_cloexec_fcntl_dupfd(int fd, int minfd)
 static int io_fflush(rb_io_t *);
 static rb_io_t *flush_before_seek(rb_io_t *fptr);
 
+#define FMODE_PREP (1<<16)
+#define FMODE_SIGNAL_ON_EPIPE (1<<17)
+
+#define fptr_signal_on_epipe(fptr) \
+    (((fptr)->mode & FMODE_SIGNAL_ON_EPIPE) != 0)
+
+#define fptr_set_signal_on_epipe(fptr, flag) \
+    ((flag) ? \
+     (fptr)->mode |= FMODE_SIGNAL_ON_EPIPE : \
+     (fptr)->mode &= ~FMODE_SIGNAL_ON_EPIPE)
+
+extern ID ruby_static_id_signo;
+
+NORETURN(static void raise_on_write(rb_io_t *fptr, int e, VALUE errinfo));
+static void
+raise_on_write(rb_io_t *fptr, int e, VALUE errinfo)
+{
+#if defined EPIPE
+    if (fptr_signal_on_epipe(fptr) && (e == EPIPE)) {
+        const VALUE sig =
+# if defined SIGPIPE
+            INT2FIX(SIGPIPE) - INT2FIX(0) +
+# endif
+            INT2FIX(0);
+        rb_ivar_set(errinfo, ruby_static_id_signo, sig);
+    }
+#endif
+    rb_exc_raise(errinfo);
+}
+
+#define rb_sys_fail_on_write(fptr) \
+    do { \
+        int e = errno; \
+        raise_on_write(fptr, e, rb_syserr_new_path(e, (fptr)->pathv)); \
+    } while (0)
+
 #define NEED_NEWLINE_DECORATOR_ON_READ(fptr) ((fptr)->mode & FMODE_TEXTMODE)
 #define NEED_NEWLINE_DECORATOR_ON_WRITE(fptr) ((fptr)->mode & FMODE_TEXTMODE)
 #if defined(RUBY_TEST_CRLF_ENVIRONMENT) || defined(_WIN32)
@@ -458,7 +574,14 @@ static rb_io_t *flush_before_seek(rb_io_t *fptr);
  * conversion IO process and universal newline decorator by default.
  */
 #define NEED_READCONV(fptr) ((fptr)->encs.enc2 != NULL || (fptr)->encs.ecflags & ~ECONV_CRLF_NEWLINE_DECORATOR)
-#define NEED_WRITECONV(fptr) (((fptr)->encs.enc != NULL && (fptr)->encs.enc != rb_ascii8bit_encoding()) || ((fptr)->encs.ecflags & ((ECONV_DECORATOR_MASK & ~ECONV_CRLF_NEWLINE_DECORATOR)|ECONV_STATEFUL_DECORATOR_MASK)))
+#define WRITECONV_MASK ( \
+    (ECONV_DECORATOR_MASK & ~ECONV_CRLF_NEWLINE_DECORATOR)|\
+    ECONV_STATEFUL_DECORATOR_MASK|\
+    0)
+#define NEED_WRITECONV(fptr) ( \
+  ((fptr)->encs.enc != NULL && (fptr)->encs.enc != rb_ascii8bit_encoding()) || \
+  ((fptr)->encs.ecflags & WRITECONV_MASK) || \
+  0)
 #define SET_BINARY_MODE(fptr) setmode((fptr)->fd, O_BINARY)
 
 #define NEED_NEWLINE_DECORATOR_ON_READ_CHECK(fptr) do {\
@@ -586,7 +709,11 @@ set_binary_mode_with_seek_cur(rb_io_t *fptr)
 /* Unix */
 # define DEFAULT_TEXTMODE 0
 #define NEED_READCONV(fptr) ((fptr)->encs.enc2 != NULL || NEED_NEWLINE_DECORATOR_ON_READ(fptr))
-#define NEED_WRITECONV(fptr) (((fptr)->encs.enc != NULL && (fptr)->encs.enc != rb_ascii8bit_encoding()) || NEED_NEWLINE_DECORATOR_ON_WRITE(fptr) || ((fptr)->encs.ecflags & (ECONV_DECORATOR_MASK|ECONV_STATEFUL_DECORATOR_MASK)))
+#define NEED_WRITECONV(fptr) ( \
+  ((fptr)->encs.enc != NULL && (fptr)->encs.enc != rb_ascii8bit_encoding()) || \
+  NEED_NEWLINE_DECORATOR_ON_WRITE(fptr) ||                        \
+  ((fptr)->encs.ecflags & (ECONV_DECORATOR_MASK|ECONV_STATEFUL_DECORATOR_MASK)) || \
+  0)
 #define SET_BINARY_MODE(fptr) (void)(fptr)
 #define NEED_NEWLINE_DECORATOR_ON_READ_CHECK(fptr) (void)(fptr)
 #define SET_UNIVERSAL_NEWLINE_DECORATOR_IF_ENC2(enc2, ecflags) ((void)(enc2), (void)(ecflags))
@@ -614,6 +741,15 @@ is_socket(int fd, VALUE path)
 
 static const char closed_stream[] = "closed stream";
 
+static void
+io_fd_check_closed(int fd)
+{
+    if (fd < 0) {
+        rb_thread_check_ints(); /* check for ruby_error_stream_closed */
+        rb_raise(rb_eIOError, closed_stream);
+    }
+}
+
 void
 rb_eof_error(void)
 {
@@ -639,9 +775,7 @@ void
 rb_io_check_closed(rb_io_t *fptr)
 {
     rb_io_check_initialized(fptr);
-    if (fptr->fd < 0) {
-	rb_raise(rb_eIOError, closed_stream);
-    }
+    io_fd_check_closed(fptr->fd);
 }
 
 static rb_io_t *
@@ -655,13 +789,13 @@ rb_io_get_fptr(VALUE io)
 VALUE
 rb_io_get_io(VALUE io)
 {
-    return rb_convert_type(io, T_FILE, "IO", "to_io");
+    return rb_convert_type_with_id(io, T_FILE, "IO", idTo_io);
 }
 
 VALUE
 rb_io_check_io(VALUE io)
 {
-    return rb_check_convert_type(io, T_FILE, "IO", "to_io");
+    return rb_check_convert_type_with_id(io, T_FILE, "IO", idTo_io);
 }
 
 VALUE
@@ -693,10 +827,10 @@ rb_io_set_write_io(VALUE io, VALUE w)
 
 /*
  *  call-seq:
- *     IO.try_convert(obj)  ->  io or nil
+ *     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
+ *  Returns converted IO or +nil+ if <i>obj</i> cannot be converted
  *  for any reason.
  *
  *     IO.try_convert(STDOUT)     #=> STDOUT
@@ -775,7 +909,7 @@ static rb_io_t *
 flush_before_seek(rb_io_t *fptr)
 {
     if (io_fflush(fptr) < 0)
-        rb_sys_fail(0);
+        rb_sys_fail_on_write(fptr);
     io_unread(fptr);
     errno = 0;
     return fptr;
@@ -799,13 +933,13 @@ rb_io_check_char_readable(rb_io_t *fptr)
     }
     if (fptr->wbuf.len) {
         if (io_fflush(fptr) < 0)
-            rb_sys_fail(0);
+            rb_sys_fail_on_write(fptr);
     }
     if (fptr->tied_io_for_writing) {
 	rb_io_t *wfptr;
 	GetOpenFile(fptr->tied_io_for_writing, wfptr);
         if (io_fflush(wfptr) < 0)
-            rb_sys_fail(0);
+            rb_sys_fail_on_write(wfptr);
     }
 }
 
@@ -889,11 +1023,12 @@ ruby_dup(int orig)
 
     fd = rb_cloexec_dup(orig);
     if (fd < 0) {
-	if (rb_gc_for_fd(errno)) {
+	int e = errno;
+	if (rb_gc_for_fd(e)) {
 	    fd = rb_cloexec_dup(orig);
 	}
 	if (fd < 0) {
-	    rb_sys_fail(0);
+	    rb_syserr_fail(e, 0);
 	}
     }
     rb_update_max_fd(fd);
@@ -915,7 +1050,9 @@ io_alloc(VALUE klass)
 #endif
 
 struct io_internal_read_struct {
+    VALUE th;
     int fd;
+    int nonblock;
     void *buf;
     size_t capa;
 };
@@ -934,25 +1071,44 @@ struct io_internal_writev_struct {
 };
 #endif
 
+static int nogvl_wait_for_single_fd(VALUE th, int fd, short events);
 static VALUE
 internal_read_func(void *ptr)
 {
     struct io_internal_read_struct *iis = ptr;
-    return read(iis->fd, iis->buf, iis->capa);
+    ssize_t r;
+retry:
+    r = read(iis->fd, iis->buf, iis->capa);
+    if (r < 0 && !iis->nonblock) {
+        int e = errno;
+        if (e == EAGAIN || e == EWOULDBLOCK) {
+            if (nogvl_wait_for_single_fd(iis->th, iis->fd, RB_WAITFD_IN) != -1) {
+                goto retry;
+            }
+            errno = e;
+        }
+    }
+    return r;
 }
 
+#if defined __APPLE__
+# define do_write_retry(code) do {ret = code;} while (ret == -1 && errno == EPROTOTYPE)
+#else
+# define do_write_retry(code) ret = code
+#endif
 static VALUE
 internal_write_func(void *ptr)
 {
     struct io_internal_write_struct *iis = ptr;
-    return write(iis->fd, iis->buf, iis->capa);
+    ssize_t ret;
+    do_write_retry(write(iis->fd, iis->buf, iis->capa));
+    return (VALUE)ret;
 }
 
 static void*
 internal_write_func2(void *ptr)
 {
-    struct io_internal_write_struct *iis = ptr;
-    return (void*)(intptr_t)write(iis->fd, iis->buf, iis->capa);
+    return (void*)internal_write_func(ptr);
 }
 
 #ifdef HAVE_WRITEV
@@ -960,17 +1116,22 @@ static VALUE
 internal_writev_func(void *ptr)
 {
     struct io_internal_writev_struct *iis = ptr;
-    return writev(iis->fd, iis->iov, iis->iovcnt);
+    ssize_t ret;
+    do_write_retry(writev(iis->fd, iis->iov, iis->iovcnt));
+    return (VALUE)ret;
 }
 #endif
 
 static ssize_t
 rb_read_internal(int fd, void *buf, size_t count)
 {
-    struct io_internal_read_struct iis;
-    iis.fd = fd;
-    iis.buf = buf;
-    iis.capa = count;
+    struct io_internal_read_struct iis = {
+        .th = rb_thread_current(),
+        .fd = fd,
+        .nonblock = 0,
+        .buf = buf,
+        .capa = count
+    };
 
     return (ssize_t)rb_thread_io_blocking_region(internal_read_func, &iis, fd);
 }
@@ -978,10 +1139,11 @@ rb_read_internal(int fd, void *buf, size_t count)
 static ssize_t
 rb_write_internal(int fd, const void *buf, size_t count)
 {
-    struct io_internal_write_struct iis;
-    iis.fd = fd;
-    iis.buf = buf;
-    iis.capa = count;
+    struct io_internal_write_struct iis = {
+        .fd = fd,
+        .buf = buf,
+        .capa = count
+    };
 
     return (ssize_t)rb_thread_io_blocking_region(internal_write_func, &iis, fd);
 }
@@ -989,10 +1151,11 @@ rb_write_internal(int fd, const void *buf, size_t count)
 static ssize_t
 rb_write_internal2(int fd, const void *buf, size_t count)
 {
-    struct io_internal_write_struct iis;
-    iis.fd = fd;
-    iis.buf = buf;
-    iis.capa = count;
+    struct io_internal_write_struct iis = {
+        .fd = fd,
+        .buf = buf,
+        .capa = count
+    };
 
     return (ssize_t)rb_thread_call_without_gvl2(internal_write_func2, &iis,
 						RUBY_UBF_IO, NULL);
@@ -1002,10 +1165,11 @@ rb_write_internal2(int fd, const void *buf, size_t count)
 static ssize_t
 rb_writev_internal(int fd, const struct iovec *iov, int iovcnt)
 {
-    struct io_internal_writev_struct iis;
-    iis.fd = fd;
-    iis.iov = iov;
-    iis.iovcnt = iovcnt;
+    struct io_internal_writev_struct iis = {
+        .fd = fd,
+        .iov = iov,
+        .iovcnt = iovcnt,
+    };
 
     return (ssize_t)rb_thread_io_blocking_region(internal_writev_func, &iis, fd);
 }
@@ -1056,8 +1220,7 @@ io_flush_buffer_async2(VALUE arg)
     rb_io_t *fptr = (rb_io_t *)arg;
     VALUE ret;
 
-    ret = (VALUE)rb_thread_call_without_gvl2(io_flush_buffer_sync2, fptr,
-					     RUBY_UBF_IO, NULL);
+    ret = (VALUE)rb_thread_call_without_gvl2(io_flush_buffer_sync2, fptr, RUBY_UBF_IO, NULL);
 
     if (!ret) {
 	/* pending async interrupt is there. */
@@ -1090,7 +1253,6 @@ io_fflush(rb_io_t *fptr)
     rb_io_check_closed(fptr);
     if (fptr->wbuf.len == 0)
         return 0;
-    rb_io_check_closed(fptr);
     while (fptr->wbuf.len > 0 && io_flush_buffer(fptr) != 0) {
 	if (!rb_io_wait_writable(fptr->fd))
 	    return -1;
@@ -1099,65 +1261,137 @@ io_fflush(rb_io_t *fptr)
     return 0;
 }
 
+VALUE
+rb_io_wait(VALUE io, VALUE events, VALUE timeout)
+{
+    VALUE scheduler = rb_scheduler_current();
+
+    if (scheduler != Qnil) {
+        return rb_scheduler_io_wait(scheduler, io, events, timeout);
+    }
+
+    rb_io_t * fptr = NULL;
+    RB_IO_POINTER(io, fptr);
+
+    struct timeval tv_storage;
+    struct timeval *tv = NULL;
+
+    if (timeout != Qnil) {
+        tv_storage = rb_time_interval(timeout);
+        tv = &tv_storage;
+    }
+
+    int ready = rb_thread_wait_for_single_fd(fptr->fd, RB_NUM2INT(events), tv);
+
+    if (ready < 0) {
+        rb_sys_fail(0);
+    }
+
+    // Not sure if this is necessary:
+    rb_io_check_closed(fptr);
+
+    if (ready > 0) {
+        return RB_INT2NUM(ready);
+    } else {
+        return Qfalse;
+    }
+}
+
+static VALUE
+rb_io_from_fd(int fd)
+{
+    return prep_io(fd, FMODE_PREP, rb_cIO, NULL);
+}
+
 int
 rb_io_wait_readable(int f)
 {
-    if (f < 0) {
-	rb_raise(rb_eIOError, closed_stream);
-    }
+    VALUE scheduler;
+
+    io_fd_check_closed(f);
+
+    scheduler = rb_scheduler_current();
     switch (errno) {
       case EINTR:
 #if defined(ERESTART)
       case ERESTART:
 #endif
-	rb_thread_check_ints();
-	return TRUE;
+        rb_thread_check_ints();
+        return TRUE;
 
       case EAGAIN:
 #if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
       case EWOULDBLOCK:
 #endif
-	rb_thread_wait_fd(f);
-	return TRUE;
+        if (scheduler != Qnil) {
+            return RTEST(
+                rb_scheduler_io_wait_readable(scheduler, rb_io_from_fd(f))
+            );
+        } else {
+            rb_thread_wait_fd(f);
+        }
+        return TRUE;
 
       default:
-	return FALSE;
+        return FALSE;
     }
 }
 
 int
 rb_io_wait_writable(int f)
 {
-    if (f < 0) {
-	rb_raise(rb_eIOError, closed_stream);
-    }
+    VALUE scheduler;
+
+    io_fd_check_closed(f);
+
+    scheduler = rb_scheduler_current();
     switch (errno) {
       case EINTR:
 #if defined(ERESTART)
       case ERESTART:
 #endif
-	/*
-	 * In old Linux, several special files under /proc and /sys don't handle
-	 * select properly. Thus we need avoid to call if don't use O_NONBLOCK.
-	 * Otherwise, we face nasty hang up. Sigh.
-	 * e.g. http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=31b07093c44a7a442394d44423e21d783f5523b8
-	 * http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=31b07093c44a7a442394d44423e21d783f5523b8
-	 * In EINTR case, we only need to call RUBY_VM_CHECK_INTS_BLOCKING().
-	 * Then rb_thread_check_ints() is enough.
-	 */
-	rb_thread_check_ints();
-	return TRUE;
+        /*
+         * In old Linux, several special files under /proc and /sys don't handle
+         * select properly. Thus we need avoid to call if don't use O_NONBLOCK.
+         * Otherwise, we face nasty hang up. Sigh.
+         * e.g. http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=31b07093c44a7a442394d44423e21d783f5523b8
+         * http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=31b07093c44a7a442394d44423e21d783f5523b8
+         * In EINTR case, we only need to call RUBY_VM_CHECK_INTS_BLOCKING().
+         * Then rb_thread_check_ints() is enough.
+         */
+        rb_thread_check_ints();
+        return TRUE;
 
       case EAGAIN:
 #if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
       case EWOULDBLOCK:
 #endif
-	rb_thread_fd_writable(f);
-	return TRUE;
+        if (scheduler != Qnil) {
+            return RTEST(
+                rb_scheduler_io_wait_writable(scheduler, rb_io_from_fd(f))
+            );
+        } else {
+            rb_thread_fd_writable(f);
+        }
+        return TRUE;
 
       default:
-	return FALSE;
+        return FALSE;
+    }
+}
+
+int
+rb_wait_for_single_fd(int fd, int events, struct timeval *timeout)
+{
+    VALUE scheduler = rb_scheduler_current();
+
+    if (scheduler != Qnil) {
+        return RTEST(
+            rb_scheduler_io_wait(scheduler, rb_io_from_fd(fd), RB_INT2NUM(events), rb_scheduler_timeout(timeout))
+        );
     }
+
+    return rb_thread_wait_for_single_fd(fd, events, timeout);
 }
 
 static void
@@ -1247,8 +1481,8 @@ io_binwrite_string(VALUE arg)
 
 	r = rb_writev_internal(fptr->fd, iov, 2);
 
-        if (r == -1)
-            return -1;
+        if (r < 0)
+            return r;
 
 	if (fptr->wbuf.len <= r) {
 	    r -= fptr->wbuf.len;
@@ -1309,12 +1543,24 @@ io_binwrite(VALUE str, const char *ptr, long len, rb_io_t *fptr, int nosync)
     rb_thread_check_ints();
 
     if ((n = len) <= 0) return n;
+
+    VALUE scheduler = rb_scheduler_current();
+    if (scheduler != Qnil && rb_scheduler_supports_io_write(scheduler)) {
+        ssize_t length = RB_NUM2SSIZE(
+            rb_scheduler_io_write(scheduler, fptr->self, str, offset, len)
+        );
+
+        if (length < 0) rb_sys_fail_path(fptr->pathv);
+
+        return length;
+    }
+
     if (fptr->wbuf.ptr == NULL && !(!nosync && (fptr->mode & FMODE_SYNC))) {
         fptr->wbuf.off = 0;
         fptr->wbuf.len = 0;
         fptr->wbuf.capa = IO_WBUF_CAPA_MIN;
         fptr->wbuf.ptr = ALLOC_N(char, fptr->wbuf.capa);
-	fptr->write_lock = rb_mutex_new();
+        fptr->write_lock = rb_mutex_new();
 	rb_mutex_allow_trap(fptr->write_lock, 1);
     }
     if ((!nosync && (fptr->mode & (FMODE_SYNC|FMODE_TTY))) ||
@@ -1327,7 +1573,7 @@ io_binwrite(VALUE str, const char *ptr, long len, rb_io_t *fptr, int nosync)
 	arg.ptr = ptr + offset;
 	arg.length = n;
 	if (fptr->write_lock) {
-	    r = rb_mutex_synchronize(fptr->write_lock, io_binwrite_string, (VALUE)&arg);
+            r = rb_mutex_synchronize(fptr->write_lock, io_binwrite_string, (VALUE)&arg);
 	}
 	else {
 	    r = io_binwrite_string((VALUE)&arg);
@@ -1361,6 +1607,11 @@ io_binwrite(VALUE str, const char *ptr, long len, rb_io_t *fptr, int nosync)
 
 # define MODE_BTMODE(a,b,c) ((fmode & FMODE_BINMODE) ? (b) : \
                              (fmode & FMODE_TEXTMODE) ? (c) : (a))
+
+#define MODE_BTXMODE(a, b, c, d, e, f) ((fmode & FMODE_EXCL) ? \
+                                        MODE_BTMODE(d, e, f) : \
+                                        MODE_BTMODE(a, b, c))
+
 static VALUE
 do_writeconv(VALUE str, rb_io_t *fptr, int *converted)
 {
@@ -1422,6 +1673,9 @@ static long
 io_fwrite(VALUE str, rb_io_t *fptr, int nosync)
 {
     int converted = 0;
+    VALUE tmp;
+    long n, len;
+    const char *ptr;
 #ifdef _WIN32
     if (fptr->mode & FMODE_TTY) {
 	long len = rb_w32_write_console(str, fptr->fd);
@@ -1431,11 +1685,13 @@ io_fwrite(VALUE str, rb_io_t *fptr, int nosync)
     str = do_writeconv(str, fptr, &converted);
     if (converted)
 	OBJ_FREEZE(str);
-    else
-	str = rb_str_new_frozen(str);
 
-    return io_binwrite(str, RSTRING_PTR(str), RSTRING_LEN(str),
-		       fptr, nosync);
+    tmp = rb_str_tmp_frozen_acquire(str);
+    RSTRING_GETMEM(tmp, ptr, len);
+    n = io_binwrite(tmp, ptr, len, fptr, nosync);
+    rb_str_tmp_frozen_release(str, tmp);
+
+    return n;
 }
 
 ssize_t
@@ -1469,21 +1725,210 @@ io_write(VALUE io, VALUE str, int nosync)
     rb_io_check_writable(fptr);
 
     n = io_fwrite(str, fptr, nosync);
-    if (n == -1L) rb_sys_fail_path(fptr->pathv);
+    if (n < 0L) rb_sys_fail_on_write(fptr);
 
     return LONG2FIX(n);
 }
 
+#ifdef HAVE_WRITEV
+struct binwritev_arg {
+    rb_io_t *fptr;
+    const struct iovec *iov;
+    int iovcnt;
+};
+
+static VALUE
+call_writev_internal(VALUE arg)
+{
+    struct binwritev_arg *p = (struct binwritev_arg *)arg;
+    return rb_writev_internal(p->fptr->fd, p->iov, p->iovcnt);
+}
+
+static long
+io_binwritev(struct iovec *iov, int iovcnt, rb_io_t *fptr)
+{
+    int i;
+    long r, total = 0, written_len = 0;
+
+    /* don't write anything if current thread has a pending interrupt. */
+    rb_thread_check_ints();
+
+    if (iovcnt == 0) return 0;
+    for (i = 1; i < iovcnt; i++) total += iov[i].iov_len;
+
+    if (fptr->wbuf.ptr == NULL && !(fptr->mode & FMODE_SYNC)) {
+	fptr->wbuf.off = 0;
+	fptr->wbuf.len = 0;
+	fptr->wbuf.capa = IO_WBUF_CAPA_MIN;
+	fptr->wbuf.ptr = ALLOC_N(char, fptr->wbuf.capa);
+	fptr->write_lock = rb_mutex_new();
+	rb_mutex_allow_trap(fptr->write_lock, 1);
+    }
+
+    if (fptr->wbuf.ptr && fptr->wbuf.len) {
+	long offset = fptr->wbuf.off + fptr->wbuf.len;
+	if (offset + total <= fptr->wbuf.capa) {
+	    for (i = 1; i < iovcnt; i++) {
+		memcpy(fptr->wbuf.ptr+offset, iov[i].iov_base, iov[i].iov_len);
+		offset += iov[i].iov_len;
+	    }
+	    fptr->wbuf.len += total;
+	    return total;
+	}
+	else {
+	    iov[0].iov_base = fptr->wbuf.ptr + fptr->wbuf.off;
+	    iov[0].iov_len  = fptr->wbuf.len;
+	}
+    }
+    else {
+	iov++;
+	if (!--iovcnt) return 0;
+    }
+
+  retry:
+    if (fptr->write_lock) {
+	struct binwritev_arg arg;
+	arg.fptr = fptr;
+	arg.iov  = iov;
+	arg.iovcnt = iovcnt;
+	r = rb_mutex_synchronize(fptr->write_lock, call_writev_internal, (VALUE)&arg);
+    }
+    else {
+	r = rb_writev_internal(fptr->fd, iov, iovcnt);
+    }
+
+    if (r >= 0) {
+	written_len += r;
+	if (fptr->wbuf.ptr && fptr->wbuf.len) {
+	    if (written_len < fptr->wbuf.len) {
+		fptr->wbuf.off += r;
+		fptr->wbuf.len -= r;
+	    }
+	    else {
+		written_len -= fptr->wbuf.len;
+		fptr->wbuf.off = 0;
+		fptr->wbuf.len = 0;
+	    }
+	}
+	if (written_len == total) return total;
+
+	while (r >= (ssize_t)iov->iov_len) {
+	    /* iovcnt > 0 */
+	    r -= iov->iov_len;
+	    iov->iov_len = 0;
+	    iov++;
+	    if (!--iovcnt) return total;
+	    /* defensive check: written_len should == total */
+	}
+	iov->iov_base = (char *)iov->iov_base + r;
+	iov->iov_len -= r;
+
+	errno = EAGAIN;
+    }
+    if (rb_io_wait_writable(fptr->fd)) {
+	rb_io_check_closed(fptr);
+	goto retry;
+    }
+
+    return -1L;
+}
+
+static long
+io_fwritev(int argc, const VALUE *argv, rb_io_t *fptr)
+{
+    int i, converted, iovcnt = argc + 1;
+    long n;
+    VALUE v1, v2, str, tmp, *tmp_array;
+    struct iovec *iov;
+
+    iov = ALLOCV_N(struct iovec, v1, iovcnt);
+    tmp_array = ALLOCV_N(VALUE, v2, argc);
+
+    for (i = 0; i < argc; i++) {
+	str = rb_obj_as_string(argv[i]);
+	converted = 0;
+	str = do_writeconv(str, fptr, &converted);
+	if (converted)
+	    OBJ_FREEZE(str);
+
+	tmp = rb_str_tmp_frozen_acquire(str);
+	tmp_array[i] = tmp;
+	/* iov[0] is reserved for buffer of fptr */
+	iov[i+1].iov_base = RSTRING_PTR(tmp);
+	iov[i+1].iov_len = RSTRING_LEN(tmp);
+    }
+
+    n = io_binwritev(iov, iovcnt, fptr);
+    if (v1) ALLOCV_END(v1);
+
+    for (i = 0; i < argc; i++) {
+	rb_str_tmp_frozen_release(argv[i], tmp_array[i]);
+    }
+
+    if (v2) ALLOCV_END(v2);
+
+    return n;
+}
+
+static int
+iovcnt_ok(int iovcnt)
+{
+#ifdef IOV_MAX
+    return iovcnt < IOV_MAX;
+#else /* GNU/Hurd has writev, but no IOV_MAX */
+    return 1;
+#endif
+}
+#endif /* HAVE_WRITEV */
+
+static VALUE
+io_writev(int argc, const VALUE *argv, VALUE io)
+{
+    rb_io_t *fptr;
+    long n;
+    VALUE tmp, total = INT2FIX(0);
+    int i, cnt = 1;
+
+    io = GetWriteIO(io);
+    tmp = rb_io_check_io(io);
+    if (NIL_P(tmp)) {
+	/* port is not IO, call write method for it. */
+	return rb_funcallv(io, id_write, argc, argv);
+    }
+    io = tmp;
+
+    GetOpenFile(io, fptr);
+    rb_io_check_writable(fptr);
+
+    for (i = 0; i < argc; i += cnt) {
+#ifdef HAVE_WRITEV
+	if ((fptr->mode & (FMODE_SYNC|FMODE_TTY)) && iovcnt_ok(cnt = argc - i)) {
+	    n = io_fwritev(cnt, &argv[i], fptr);
+	}
+	else
+#endif
+	{
+	    cnt = 1;
+	    /* sync at last item */
+	    n = io_fwrite(rb_obj_as_string(argv[i]), fptr, (i < argc-1));
+	}
+        if (n < 0L) rb_sys_fail_on_write(fptr);
+	total = rb_fix_plus(LONG2FIX(n), total);
+    }
+
+    return total;
+}
+
 /*
  *  call-seq:
- *     ios.write(string)    -> integer
+ *     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
+ *  Writes the given strings to <em>ios</em>. The stream must be opened
+ *  for writing. Arguments that are not a string will be converted
  *  to a string using <code>to_s</code>. Returns the number of bytes
- *  written.
+ *  written in total.
  *
- *     count = $stdout.write("This is a test\n")
+ *     count = $stdout.write("This is", " a test\n")
  *     puts "That was #{count} bytes of data"
  *
  *  <em>produces:</em>
@@ -1493,9 +1938,15 @@ io_write(VALUE io, VALUE str, int nosync)
  */
 
 static VALUE
-io_write_m(VALUE io, VALUE str)
+io_write_m(int argc, VALUE *argv, VALUE io)
 {
-    return io_write(io, str, 0);
+    if (argc != 1) {
+	return io_writev(argc, argv, io);
+    }
+    else {
+	VALUE str = argv[0];
+	return io_write(io, str, 0);
+    }
 }
 
 VALUE
@@ -1504,6 +1955,23 @@ rb_io_write(VALUE io, VALUE str)
     return rb_funcallv(io, id_write, 1, &str);
 }
 
+static VALUE
+rb_io_writev(VALUE io, int argc, const VALUE *argv)
+{
+    if (argc > 1 && rb_obj_method_arity(io, id_write) == 1) {
+	if (io != rb_ractor_stderr() && RTEST(ruby_verbose)) {
+	    VALUE klass = CLASS_OF(io);
+	    char sep = FL_TEST(klass, FL_SINGLETON) ? (klass = io, '.') : '#';
+            rb_category_warning(RB_WARN_CATEGORY_DEPRECATED, "%+"PRIsVALUE"%c""write is outdated interface"
+		       " which accepts just one argument",
+		       klass, sep);
+	}
+	do rb_io_write(io, *argv++); while (--argc);
+	return argv[0];		/* unused right now */
+    }
+    return rb_funcallv(io, id_write, argc, argv);
+}
+
 /*
  *  call-seq:
  *     ios << obj     -> ios
@@ -1533,6 +2001,10 @@ nogvl_fsync(void *ptr)
 {
     rb_io_t *fptr = ptr;
 
+#ifdef _WIN32
+    if (GetFileType((HANDLE)rb_w32_get_osfhandle(fptr->fd)) != FILE_TYPE_DISK)
+	return 0;
+#endif
     return (VALUE)fsync(fptr->fd);
 }
 #endif
@@ -1551,7 +2023,7 @@ rb_io_flush_raw(VALUE io, int sync)
 
     if (fptr->mode & FMODE_WRITABLE) {
         if (io_fflush(fptr) < 0)
-            rb_sys_fail(0);
+            rb_sys_fail_on_write(fptr);
     }
     if (fptr->mode & FMODE_READABLE) {
         io_unread(fptr);
@@ -1644,7 +2116,7 @@ interpret_seek_whence(VALUE vwhence)
 
 /*
  *  call-seq:
- *     ios.seek(amount, whence=IO::SEEK_SET)  ->  0
+ *     ios.seek(amount, whence=IO::SEEK_SET)  -> 0
  *
  *  Seeks to a given offset <i>anInteger</i> in the stream according to
  *  the value of <i>whence</i>:
@@ -1710,7 +2182,7 @@ static void clear_readconv(rb_io_t *fptr);
  *     ios.rewind    -> 0
  *
  *  Positions <em>ios</em> to the beginning of input, resetting
- *  <code>lineno</code> to zero.
+ *  #lineno to zero.
  *
  *     f = File.new("testfile")
  *     f.readline   #=> "This is line one\n"
@@ -1740,6 +2212,16 @@ rb_io_rewind(VALUE io)
 }
 
 static int
+fptr_wait_readable(rb_io_t *fptr)
+{
+    int ret = rb_io_wait_readable(fptr->fd);
+
+    if (ret)
+        rb_io_check_closed(fptr);
+    return ret;
+}
+
+static int
 io_fillbuf(rb_io_t *fptr)
 {
     ssize_t r;
@@ -1759,7 +2241,7 @@ io_fillbuf(rb_io_t *fptr)
 	    r = rb_read_internal(fptr->fd, fptr->rbuf.ptr, fptr->rbuf.capa);
 	}
         if (r < 0) {
-            if (rb_io_wait_readable(fptr->fd))
+            if (fptr_wait_readable(fptr))
                 goto retry;
 	    {
 		int e = errno;
@@ -1770,6 +2252,7 @@ io_fillbuf(rb_io_t *fptr)
 		rb_syserr_fail_path(e, path);
 	    }
         }
+	if (r > 0) rb_io_check_closed(fptr);
         fptr->rbuf.off = 0;
         fptr->rbuf.len = (int)r; /* r should be <= rbuf_capa */
         if (r == 0)
@@ -1785,14 +2268,14 @@ io_fillbuf(rb_io_t *fptr)
  *
  *  Returns true if <em>ios</em> is at end of file that means
  *  there are no more data to read.
- *  The stream must be opened for reading or an <code>IOError</code> will be
+ *  The stream must be opened for reading or an IOError will be
  *  raised.
  *
  *     f = File.new("testfile")
  *     dummy = f.readlines
  *     f.eof   #=> true
  *
- *  If <em>ios</em> is a stream such as pipe or socket, <code>IO#eof?</code>
+ *  If <em>ios</em> is a stream such as pipe or socket, IO#eof?
  *  blocks until the other end sends some data or closes it.
  *
  *     r, w = IO.pipe
@@ -1806,10 +2289,9 @@ io_fillbuf(rb_io_t *fptr)
  *     r, w = IO.pipe
  *     r.eof?  # blocks forever
  *
- *  Note that <code>IO#eof?</code> reads data to the input byte buffer.
- *  So <code>IO#sysread</code> may not behave as you intend with
- *  <code>IO#eof?</code>, unless you call <code>IO#rewind</code>
- *  first (which is not available for some streams).
+ *  Note that IO#eof? reads data to the input byte buffer.  So
+ *  IO#sysread may not behave as you intend with IO#eof?, unless you
+ *  call IO#rewind first (which is not available for some streams).
  */
 
 VALUE
@@ -1841,7 +2323,7 @@ rb_io_eof(VALUE io)
  *  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>.
+ *  IO#fsync.
  *
  *     f = File.new("testfile")
  *     f.sync   #=> false
@@ -1866,12 +2348,10 @@ rb_io_sync(VALUE io)
  *  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>.
+ *  the new state. See also IO#fsync.
  *
  *     f = File.new("testfile")
  *     f.sync = true
- *
- *  <em>(produces no output)</em>
  */
 
 static VALUE
@@ -1895,12 +2375,11 @@ rb_io_set_sync(VALUE io, VALUE sync)
  *     ios.fsync   -> 0 or nil
  *
  *  Immediately writes all buffered data in <em>ios</em> to disk.
- *  Note that <code>fsync</code> differs from
- *  using <code>IO#sync=</code>. The latter ensures that data is flushed
- *  from Ruby's buffers, but does not guarantee that the underlying
- *  operating system actually writes it to disk.
+ *  Note that #fsync differs from using IO#sync=. The latter ensures
+ *  that data is flushed from Ruby's buffers, but does not guarantee
+ *  that the underlying operating system actually writes it to disk.
  *
- *  <code>NotImplementedError</code> is raised
+ *  NotImplementedError is raised
  *  if the underlying operating system does not support <em>fsync(2)</em>.
  */
 
@@ -1913,7 +2392,7 @@ rb_io_fsync(VALUE io)
     GetOpenFile(io, fptr);
 
     if (io_fflush(fptr) < 0)
-        rb_sys_fail(0);
+        rb_sys_fail_on_write(fptr);
     if ((int)rb_thread_io_blocking_region(nogvl_fsync, fptr, fptr->fd) < 0)
 	rb_sys_fail_path(fptr->pathv);
     return INT2FIX(0);
@@ -1935,6 +2414,10 @@ nogvl_fdatasync(void *ptr)
 {
     rb_io_t *fptr = ptr;
 
+#ifdef _WIN32
+    if (GetFileType((HANDLE)rb_w32_get_osfhandle(fptr->fd)) != FILE_TYPE_DISK)
+	return 0;
+#endif
     return (VALUE)fdatasync(fptr->fd);
 }
 
@@ -1945,8 +2428,8 @@ nogvl_fdatasync(void *ptr)
  *  Immediately writes all buffered data in <em>ios</em> to disk.
  *
  *  If the underlying operating system does not support <em>fdatasync(2)</em>,
- *  <code>IO#fsync</code> is called instead (which might raise a
- *  <code>NotImplementedError</code>).
+ *  IO#fsync is called instead (which might raise a
+ *  NotImplementedError).
  */
 
 static VALUE
@@ -1958,7 +2441,7 @@ rb_io_fdatasync(VALUE io)
     GetOpenFile(io, fptr);
 
     if (io_fflush(fptr) < 0)
-        rb_sys_fail(0);
+        rb_sys_fail_on_write(fptr);
 
     if ((int)rb_thread_io_blocking_region(nogvl_fdatasync, fptr, fptr->fd) == 0)
 	return INT2FIX(0);
@@ -1972,8 +2455,8 @@ rb_io_fdatasync(VALUE io)
 
 /*
  *  call-seq:
- *     ios.fileno    -> fixnum
- *     ios.to_i      -> fixnum
+ *     ios.fileno    -> integer
+ *     ios.to_i      -> integer
  *
  *  Returns an integer representing the numeric file descriptor for
  *  <em>ios</em>.
@@ -1996,10 +2479,10 @@ rb_io_fileno(VALUE io)
 
 /*
  *  call-seq:
- *     ios.pid    -> fixnum
+ *     ios.pid    -> integer
  *
  *  Returns the process ID of a child process associated with
- *  <em>ios</em>. This will be set by <code>IO.popen</code>.
+ *  <em>ios</em>. This will be set by IO.popen.
  *
  *     pipe = IO.popen("-")
  *     if pipe
@@ -2064,7 +2547,7 @@ rb_io_inspect(VALUE obj)
 
 /*
  *  call-seq:
- *     ios.to_io  ->  ios
+ *     ios.to_io  -> ios
  *
  *  Returns <em>ios</em>.
  */
@@ -2103,7 +2586,7 @@ io_bufread(char *ptr, long len, rb_io_t *fptr)
 	    c = rb_read_internal(fptr->fd, ptr+offset, n);
 	    if (c == 0) break;
 	    if (c < 0) {
-                if (rb_io_wait_readable(fptr->fd))
+                if (fptr_wait_readable(fptr))
                     goto again;
 		return -1;
 	    }
@@ -2127,7 +2610,7 @@ io_bufread(char *ptr, long len, rb_io_t *fptr)
     return len - n;
 }
 
-static void io_setstrbuf(VALUE *str, long len);
+static int io_setstrbuf(VALUE *str, long len);
 
 struct bufread_arg {
     char *str_ptr;
@@ -2146,6 +2629,17 @@ bufread_call(VALUE arg)
 static long
 io_fread(VALUE str, long offset, long size, rb_io_t *fptr)
 {
+    VALUE scheduler = rb_scheduler_current();
+    if (scheduler != Qnil && rb_scheduler_supports_io_read(scheduler)) {
+        ssize_t length = RB_NUM2SSIZE(
+            rb_scheduler_io_read(scheduler, fptr->self, str, offset, size)
+        );
+
+        if (length < 0) rb_sys_fail_path(fptr->pathv);
+
+        return length;
+    }
+
     long len;
     struct bufread_arg arg;
 
@@ -2159,16 +2653,6 @@ io_fread(VALUE str, long offset, long size, rb_io_t *fptr)
     return len;
 }
 
-ssize_t
-rb_io_bufread(VALUE io, void *buf, size_t size)
-{
-    rb_io_t *fptr;
-
-    GetOpenFile(io, fptr);
-    rb_io_check_readable(fptr);
-    return (ssize_t)io_bufread(buf, (long)size, fptr);
-}
-
 static long
 remain_size(rb_io_t *fptr)
 {
@@ -2183,7 +2667,7 @@ remain_size(rb_io_t *fptr)
 	)
     {
         if (io_fflush(fptr) < 0)
-            rb_sys_fail(0);
+            rb_sys_fail_on_write(fptr);
 	pos = lseek(fptr->fd, 0, SEEK_CUR);
 	if (st.st_size >= pos && pos >= 0) {
 	    siz += st.st_size - pos;
@@ -2201,7 +2685,6 @@ remain_size(rb_io_t *fptr)
 static VALUE
 io_enc_str(VALUE str, rb_io_t *fptr)
 {
-    OBJ_TAINT(str);
     rb_enc_associate(str, io_read_encoding(fptr));
     return str;
 }
@@ -2289,7 +2772,7 @@ fill_cbuf(rb_io_t *fptr, int ec_flags)
         if (res == econv_source_buffer_empty) {
             if (fptr->rbuf.len == 0) {
 		READ_CHECK(fptr);
-                if (io_fillbuf(fptr) == -1) {
+                if (io_fillbuf(fptr) < 0) {
 		    if (!fptr->readconv) {
 			return MORE_CHAR_FINISHED;
 		    }
@@ -2331,7 +2814,6 @@ io_shift_cbuf(rb_io_t *fptr, int len, VALUE *strp)
 	else {
 	    rb_str_cat(str, fptr->cbuf.ptr+fptr->cbuf.off, len);
 	}
-	OBJ_TAINT(str);
 	rb_enc_associate(str, fptr->encs.enc);
     }
     fptr->cbuf.off += len;
@@ -2346,33 +2828,45 @@ io_shift_cbuf(rb_io_t *fptr, int len, VALUE *strp)
     return str;
 }
 
-static void
+static int
 io_setstrbuf(VALUE *str, long len)
 {
 #ifdef _WIN32
     len = (len + 1) & ~1L;	/* round up for wide char */
 #endif
     if (NIL_P(*str)) {
-	*str = rb_str_new(0, 0);
+	*str = rb_str_new(0, len);
+	return TRUE;
     }
     else {
 	VALUE s = StringValue(*str);
 	long clen = RSTRING_LEN(s);
 	if (clen >= len) {
 	    rb_str_modify(s);
-	    return;
+	    return FALSE;
 	}
 	len -= clen;
     }
     rb_str_modify_expand(*str, len);
+    return FALSE;
+}
+
+#define MAX_REALLOC_GAP 4096
+static void
+io_shrink_read_string(VALUE str, long n)
+{
+    if (rb_str_capacity(str) - n > MAX_REALLOC_GAP) {
+	rb_str_resize(str, n);
+    }
 }
 
 static void
-io_set_read_length(VALUE str, long n)
+io_set_read_length(VALUE str, long n, int shrinkable)
 {
     if (RSTRING_LEN(str) != n) {
 	rb_str_modify(str);
 	rb_str_set_len(str, n);
+	if (shrinkable) io_shrink_read_string(str, n);
     }
 }
 
@@ -2384,11 +2878,12 @@ read_all(rb_io_t *fptr, long siz, VALUE str)
     long pos;
     rb_encoding *enc;
     int cr;
+    int shrinkable;
 
     if (NEED_READCONV(fptr)) {
 	int first = !NIL_P(str);
 	SET_BINARY_MODE(fptr);
-	io_setstrbuf(&str,0);
+	shrinkable = io_setstrbuf(&str,0);
         make_readconv(fptr, 0);
         while (1) {
             VALUE v;
@@ -2407,6 +2902,7 @@ read_all(rb_io_t *fptr, long siz, VALUE str)
             if (v == MORE_CHAR_FINISHED) {
                 clear_readconv(fptr);
 		if (first) rb_str_set_len(str, first = 0);
+		if (shrinkable) io_shrink_read_string(str, RSTRING_LEN(str));
                 return io_enc_str(str, fptr);
             }
         }
@@ -2420,7 +2916,7 @@ read_all(rb_io_t *fptr, long siz, VALUE str)
     cr = 0;
 
     if (siz == 0) siz = BUFSIZ;
-    io_setstrbuf(&str,siz);
+    shrinkable = io_setstrbuf(&str, siz);
     for (;;) {
 	READ_CHECK(fptr);
 	n = io_fread(str, bytes, siz - bytes, fptr);
@@ -2436,6 +2932,7 @@ read_all(rb_io_t *fptr, long siz, VALUE str)
 	siz += BUFSIZ;
 	rb_str_modify_expand(str, BUFSIZ);
     }
+    if (shrinkable) io_shrink_read_string(str, RSTRING_LEN(str));
     str = io_enc_str(str, fptr);
     ENC_CODERANGE_SET(str, cr);
     return str;
@@ -2444,60 +2941,35 @@ read_all(rb_io_t *fptr, long siz, VALUE str)
 void
 rb_io_set_nonblock(rb_io_t *fptr)
 {
-#ifdef _WIN32
-    if (rb_w32_set_nonblock(fptr->fd) != 0) {
+    if (rb_fd_set_nonblock(fptr->fd) != 0) {
 	rb_sys_fail_path(fptr->pathv);
     }
-#else
-    int oflags;
-#ifdef F_GETFL
-    oflags = fcntl(fptr->fd, F_GETFL);
-    if (oflags == -1) {
-        rb_sys_fail_path(fptr->pathv);
-    }
-#else
-    oflags = 0;
-#endif
-    if ((oflags & O_NONBLOCK) == 0) {
-        oflags |= O_NONBLOCK;
-        if (fcntl(fptr->fd, F_SETFL, oflags) == -1) {
-            rb_sys_fail_path(fptr->pathv);
-        }
-    }
-#endif
 }
 
-struct read_internal_arg {
-    int fd;
-    char *str_ptr;
-    long len;
-};
-
 static VALUE
 read_internal_call(VALUE arg)
 {
-    struct read_internal_arg *p = (struct read_internal_arg *)arg;
-    p->len = rb_read_internal(p->fd, p->str_ptr, p->len);
-    return Qundef;
+    struct io_internal_read_struct *iis = (struct io_internal_read_struct *)arg;
+
+    return rb_thread_io_blocking_region(internal_read_func, iis, iis->fd);
 }
 
-static int
-no_exception_p(VALUE opts)
+static long
+read_internal_locktmp(VALUE str, struct io_internal_read_struct *iis)
 {
-    VALUE except;
-    ID id = id_exception;
-
-    rb_get_kwargs(opts, &id, 0, 1, &except);
-    return except == Qfalse;
+    return (long)rb_str_locktmp_ensure(str, read_internal_call, (VALUE)iis);
 }
 
+#define no_exception_p(opts) !rb_opts_exception_p((opts), TRUE)
+
 static VALUE
-io_getpartial(int argc, VALUE *argv, VALUE io, VALUE opts, int nonblock)
+io_getpartial(int argc, VALUE *argv, VALUE io, int no_exception, int nonblock)
 {
     rb_io_t *fptr;
     VALUE length, str;
     long n, len;
-    struct read_internal_arg arg;
+    struct io_internal_read_struct iis;
+    int shrinkable;
 
     rb_scan_args(argc, argv, "11", &length, &str);
 
@@ -2505,14 +2977,15 @@ io_getpartial(int argc, VALUE *argv, VALUE io, VALUE opts, int nonblock)
 	rb_raise(rb_eArgError, "negative length %ld given", len);
     }
 
-    io_setstrbuf(&str,len);
-    OBJ_TAINT(str);
+    shrinkable = io_setstrbuf(&str, len);
 
     GetOpenFile(io, fptr);
     rb_io_check_byte_readable(fptr);
 
-    if (len == 0)
+    if (len == 0) {
+	io_set_read_length(str, 0, shrinkable);
 	return str;
+    }
 
     if (!nonblock)
         READ_CHECK(fptr);
@@ -2523,17 +2996,18 @@ io_getpartial(int argc, VALUE *argv, VALUE io, VALUE opts, int nonblock)
             rb_io_set_nonblock(fptr);
         }
 	io_setstrbuf(&str, len);
-	arg.fd = fptr->fd;
-	arg.str_ptr = RSTRING_PTR(str);
-	arg.len = len;
-	rb_str_locktmp_ensure(str, read_internal_call, (VALUE)&arg);
-	n = arg.len;
+        iis.th = rb_thread_current();
+        iis.fd = fptr->fd;
+        iis.nonblock = nonblock;
+        iis.buf = RSTRING_PTR(str);
+        iis.capa = len;
+        n = read_internal_locktmp(str, &iis);
         if (n < 0) {
 	    int e = errno;
-            if (!nonblock && rb_io_wait_readable(fptr->fd))
+            if (!nonblock && fptr_wait_readable(fptr))
                 goto again;
 	    if (nonblock && (e == EWOULDBLOCK || e == EAGAIN)) {
-                if (no_exception_p(opts))
+                if (no_exception)
                     return sym_wait_readable;
                 else
 		    rb_readwrite_syserr_fail(RB_IO_WAIT_READABLE,
@@ -2542,7 +3016,7 @@ io_getpartial(int argc, VALUE *argv, VALUE io, VALUE opts, int nonblock)
             rb_syserr_fail_path(e, fptr->pathv);
         }
     }
-    io_set_read_length(str, n);
+    io_set_read_length(str, n, shrinkable);
 
     if (n == 0)
         return Qnil;
@@ -2558,11 +3032,13 @@ io_getpartial(int argc, VALUE *argv, VALUE io, VALUE opts, int nonblock)
  *  Reads at most <i>maxlen</i> bytes from the I/O stream.
  *  It blocks only if <em>ios</em> has no data immediately available.
  *  It doesn't block if some data available.
- *  If the optional <i>outbuf</i> argument is present,
+ *
+ *  If the optional _outbuf_ argument is present,
  *  it must reference a String, which will receive the data.
- *  The <i>outbuf</i> will contain only the received data after the method call
+ *  The _outbuf_ will contain only the received data after the method call
  *  even if it is not empty at the beginning.
- *  It raises <code>EOFError</code> on end of file.
+ *
+ *  It raises EOFError on end of file.
  *
  *  readpartial is designed for streams such as pipe, socket, tty, etc.
  *  It blocks only when no data immediately available.
@@ -2601,11 +3077,15 @@ io_getpartial(int argc, VALUE *argv, VALUE io, VALUE opts, int nonblock)
  *
  *  Note that readpartial behaves similar to sysread.
  *  The differences are:
- *  * If the byte buffer is not empty, read from the byte buffer instead of "sysread for buffered IO (IOError)".
- *  * It doesn't cause Errno::EWOULDBLOCK and Errno::EINTR.  When readpartial meets EWOULDBLOCK and EINTR by read system call, readpartial retry the system call.
+ *  * If the byte buffer is not empty, read from the byte buffer
+ *    instead of "sysread for buffered IO (IOError)".
+ *  * It doesn't cause Errno::EWOULDBLOCK and Errno::EINTR.  When
+ *    readpartial meets EWOULDBLOCK and EINTR by read system call,
+ *    readpartial retry the system call.
  *
  *  The latter means that readpartial is nonblocking-flag insensitive.
- *  It blocks on the situation IO#sysread causes Errno::EWOULDBLOCK as if the fd is blocking mode.
+ *  It blocks on the situation IO#sysread causes Errno::EWOULDBLOCK as
+ *  if the fd is blocking mode.
  *
  */
 
@@ -2621,9 +3101,9 @@ io_readpartial(int argc, VALUE *argv, VALUE io)
 }
 
 static VALUE
-io_nonblock_eof(VALUE opts)
+io_nonblock_eof(int no_exception)
 {
-    if (!no_exception_p(opts)) {
+    if (!no_exception) {
         rb_eof_error();
     }
     return Qnil;
@@ -2631,47 +3111,51 @@ io_nonblock_eof(VALUE opts)
 
 /* :nodoc: */
 static VALUE
-io_read_nonblock(VALUE io, VALUE length, VALUE str, VALUE ex)
+io_read_nonblock(rb_execution_context_t *ec, VALUE io, VALUE length, VALUE str, VALUE ex)
 {
     rb_io_t *fptr;
     long n, len;
-    struct read_internal_arg arg;
+    struct io_internal_read_struct iis;
+    int shrinkable;
 
     if ((len = NUM2LONG(length)) < 0) {
 	rb_raise(rb_eArgError, "negative length %ld given", len);
     }
 
-    io_setstrbuf(&str,len);
-    OBJ_TAINT(str);
+    shrinkable = io_setstrbuf(&str, len);
+    rb_bool_expected(ex, "exception");
+
     GetOpenFile(io, fptr);
     rb_io_check_byte_readable(fptr);
 
-    if (len == 0)
+    if (len == 0) {
+	io_set_read_length(str, 0, shrinkable);
 	return str;
+    }
 
     n = read_buffered_data(RSTRING_PTR(str), len, fptr);
     if (n <= 0) {
 	rb_io_set_nonblock(fptr);
-	io_setstrbuf(&str, len);
-	arg.fd = fptr->fd;
-	arg.str_ptr = RSTRING_PTR(str);
-	arg.len = len;
-	rb_str_locktmp_ensure(str, read_internal_call, (VALUE)&arg);
-	n = arg.len;
+	shrinkable |= io_setstrbuf(&str, len);
+        iis.fd = fptr->fd;
+        iis.nonblock = 1;
+        iis.buf = RSTRING_PTR(str);
+        iis.capa = len;
+        n = read_internal_locktmp(str, &iis);
         if (n < 0) {
 	    int e = errno;
 	    if ((e == EWOULDBLOCK || e == EAGAIN)) {
-                if (ex == Qfalse) return sym_wait_readable;
+                if (!ex) return sym_wait_readable;
 		rb_readwrite_syserr_fail(RB_IO_WAIT_READABLE,
 					 e, "read would block");
             }
             rb_syserr_fail_path(e, fptr->pathv);
         }
     }
-    io_set_read_length(str, n);
+    io_set_read_length(str, n, shrinkable);
 
     if (n == 0) {
-	if (ex == Qfalse) return Qnil;
+        if (!ex) return Qnil;
 	rb_eof_error();
     }
 
@@ -2680,28 +3164,30 @@ io_read_nonblock(VALUE io, VALUE length, VALUE str, VALUE ex)
 
 /* :nodoc: */
 static VALUE
-io_write_nonblock(VALUE io, VALUE str, VALUE ex)
+io_write_nonblock(rb_execution_context_t *ec, VALUE io, VALUE str, VALUE ex)
 {
     rb_io_t *fptr;
     long n;
 
     if (!RB_TYPE_P(str, T_STRING))
 	str = rb_obj_as_string(str);
+    rb_bool_expected(ex, "exception");
 
     io = GetWriteIO(io);
     GetOpenFile(io, fptr);
     rb_io_check_writable(fptr);
 
     if (io_fflush(fptr) < 0)
-        rb_sys_fail(0);
+        rb_sys_fail_on_write(fptr);
 
     rb_io_set_nonblock(fptr);
     n = write(fptr->fd, RSTRING_PTR(str), RSTRING_LEN(str));
+    RB_GC_GUARD(str);
 
-    if (n == -1) {
+    if (n < 0) {
 	int e = errno;
 	if (e == EWOULDBLOCK || e == EAGAIN) {
-	    if (ex == Qfalse) {
+            if (!ex) {
 		return sym_wait_writable;
 	    }
 	    else {
@@ -2718,66 +3204,67 @@ io_write_nonblock(VALUE io, VALUE str, VALUE ex)
  *  call-seq:
  *     ios.read([length [, outbuf]])    -> string, outbuf, or nil
  *
- *  Reads <i>length</i> bytes from the I/O stream.
+ *  Reads _length_ bytes from the I/O stream.
  *
- *  <i>length</i> must be a non-negative integer or <code>nil</code>.
+ *  _length_ must be a non-negative integer or +nil+.
  *
- *  If <i>length</i> is a positive integer,
- *  it tries to read <i>length</i> bytes without any conversion (binary mode).
- *  It returns <code>nil</code> or a string whose length is 1 to <i>length</i> bytes.
- *  <code>nil</code> means it met EOF at beginning.
- *  The 1 to <i>length</i>-1 bytes string means it met EOF after reading the result.
- *  The <i>length</i> bytes string means it doesn't meet EOF.
- *  The resulted string is always ASCII-8BIT encoding.
+ *  If _length_ is a positive integer, +read+ tries to read
+ *  _length_ bytes without any conversion (binary mode).
+ *  It returns +nil+ if an EOF is encountered before anything can be read.
+ *  Fewer than _length_ bytes are returned if an EOF is encountered during
+ *  the read.
+ *  In the case of an integer _length_, the resulting string is always
+ *  in ASCII-8BIT encoding.
  *
- *  If <i>length</i> is omitted or is <code>nil</code>,
- *  it reads until EOF and the encoding conversion is applied.
- *  It returns a string even if EOF is met at beginning.
+ *  If _length_ is omitted or is +nil+, it reads until EOF
+ *  and the encoding conversion is applied, if applicable.
+ *  A string is returned even if EOF is encountered before any data is read.
  *
- *  If <i>length</i> is zero, it returns <code>""</code>.
+ *  If _length_ is zero, it returns an empty string (<code>""</code>).
  *
- *  If the optional <i>outbuf</i> argument is present, it must reference
- *  a String, which will receive the data.
- *  The <i>outbuf</i> will contain only the received data after the method call
+ *  If the optional _outbuf_ argument is present,
+ *  it must reference a String, which will receive the data.
+ *  The _outbuf_ will contain only the received data after the method call
  *  even if it is not empty at the beginning.
  *
- *  At end of file, it returns <code>nil</code> or <code>""</code>
- *  depend on <i>length</i>.
- *  <code><i>ios</i>.read()</code> and
- *  <code><i>ios</i>.read(nil)</code> returns <code>""</code>.
- *  <code><i>ios</i>.read(<i>positive-integer</i>)</code> returns <code>nil</code>.
+ *  When this method is called at end of file, it returns +nil+
+ *  or <code>""</code>, depending on _length_:
+ *  +read+, <code>read(nil)</code>, and <code>read(0)</code> return
+ *  <code>""</code>,
+ *  <code>read(<i>positive_integer</i>)</code> returns +nil+.
  *
  *     f = File.new("testfile")
  *     f.read(16)   #=> "This is line one"
  *
- *     # reads whole file
- *     open("file") {|f|
- *       data = f.read # This returns a string even if the file is empty.
- *       ...
- *     }
+ *     # read whole file
+ *     open("file") do |f|
+ *       data = f.read   # This returns a string even if the file is empty.
+ *       # ...
+ *     end
  *
- *     # iterate over fixed length records.
- *     open("fixed-record-file") {|f|
+ *     # iterate over fixed length records
+ *     open("fixed-record-file") do |f|
  *       while record = f.read(256)
- *         ...
+ *         # ...
  *       end
- *     }
+ *     end
  *
- *     # iterate over variable length records.
- *     # record is prefixed by 32-bit length.
- *     open("variable-record-file") {|f|
+ *     # iterate over variable length records,
+ *     # each record is prefixed by its 32-bit length
+ *     open("variable-record-file") do |f|
  *       while len = f.read(4)
- *         len = len.unpack("N")[0] # 32-bit length
- *         record = f.read(len) # This returns a string even if len is 0.
+ *         len = len.unpack("N")[0]   # 32-bit length
+ *         record = f.read(len)       # This returns a string even if len is 0.
  *       end
- *     }
+ *     end
  *
- *  Note that this method behaves like fread() function in C.
- *  This means it retry to invoke read(2) system call to read data with the specified length (or until EOF).
- *  This behavior is preserved even if <i>ios</i> is non-blocking mode.
+ *  Note that this method behaves like the fread() function in C.
+ *  This means it retries to invoke read(2) system calls to read data
+ *  with the specified length (or until EOF).
+ *  This behavior is preserved even if <i>ios</i> is in non-blocking mode.
  *  (This method is non-blocking flag insensitive as other methods.)
- *  If you need the behavior like single read(2) system call,
- *  consider readpartial, read_nonblock and sysread.
+ *  If you need the behavior like a single read(2) system call,
+ *  consider #readpartial, #read_nonblock, and #sysread.
  */
 
 static VALUE
@@ -2786,6 +3273,7 @@ io_read(int argc, VALUE *argv, VALUE io)
     rb_io_t *fptr;
     long n, len;
     VALUE length, str;
+    int shrinkable;
 #if defined(RUBY_TEST_CRLF_ENVIRONMENT) || defined(_WIN32)
     int previous_mode;
 #endif
@@ -2802,12 +3290,12 @@ io_read(int argc, VALUE *argv, VALUE io)
 	rb_raise(rb_eArgError, "negative length %ld given", len);
     }
 
-    io_setstrbuf(&str,len);
+    shrinkable = io_setstrbuf(&str,len);
 
     GetOpenFile(io, fptr);
     rb_io_check_byte_readable(fptr);
     if (len == 0) {
-	io_set_read_length(str, 0);
+	io_set_read_length(str, 0, shrinkable);
 	return str;
     }
 
@@ -2816,14 +3304,13 @@ io_read(int argc, VALUE *argv, VALUE io)
     previous_mode = set_binary_mode_with_seek_cur(fptr);
 #endif
     n = io_fread(str, 0, len, fptr);
-    io_set_read_length(str, n);
+    io_set_read_length(str, n, shrinkable);
 #if defined(RUBY_TEST_CRLF_ENVIRONMENT) || defined(_WIN32)
     if (previous_mode == O_TEXT) {
 	setmode(fptr->fd, O_TEXT);
     }
 #endif
     if (n == 0) return Qnil;
-    OBJ_TAINT(str);
 
     return str;
 }
@@ -2968,7 +3455,7 @@ swallow(rb_io_t *fptr, int term)
 }
 
 static VALUE
-rb_io_getline_fast(rb_io_t *fptr, rb_encoding *enc)
+rb_io_getline_fast(rb_io_t *fptr, rb_encoding *enc, int chomp)
 {
     VALUE str = Qnil;
     int len = 0;
@@ -2981,21 +3468,33 @@ rb_io_getline_fast(rb_io_t *fptr, rb_encoding *enc)
 	if (pending > 0) {
 	    const char *p = READ_DATA_PENDING_PTR(fptr);
 	    const char *e;
+	    int chomplen = 0;
 
 	    e = memchr(p, '\n', pending);
 	    if (e) {
                 pending = (int)(e - p + 1);
+		if (chomp) {
+		    chomplen = (pending > 1 && *(e-1) == '\r') + 1;
+		}
 	    }
 	    if (NIL_P(str)) {
-		str = rb_str_new(p, pending);
+		str = rb_str_new(p, pending - chomplen);
 		fptr->rbuf.off += pending;
 		fptr->rbuf.len -= pending;
 	    }
 	    else {
-		rb_str_resize(str, len + pending);
-		read_buffered_data(RSTRING_PTR(str)+len, pending, fptr);
+		rb_str_resize(str, len + pending - chomplen);
+		read_buffered_data(RSTRING_PTR(str)+len, pending - chomplen, fptr);
+		fptr->rbuf.off += chomplen;
+		fptr->rbuf.len -= chomplen;
+                if (pending == 1 && chomplen == 1 && len > 0) {
+                    if (RSTRING_PTR(str)[len-1] == '\r') {
+                        rb_str_resize(str, --len);
+                        break;
+                    }
+                }
 	    }
-	    len += pending;
+	    len += pending - chomplen;
 	    if (cr != ENC_CODERANGE_BROKEN)
 		pos += rb_str_coderange_scan_restartable(RSTRING_PTR(str) + pos, RSTRING_PTR(str) + len, enc, &cr);
 	    if (e) break;
@@ -3011,13 +3510,34 @@ rb_io_getline_fast(rb_io_t *fptr, rb_encoding *enc)
     return str;
 }
 
+struct getline_arg {
+    VALUE io;
+    VALUE rs;
+    long limit;
+    unsigned int chomp: 1;
+};
+
+static void
+extract_getline_opts(VALUE opts, struct getline_arg *args)
+{
+    int chomp = FALSE;
+    if (!NIL_P(opts)) {
+	static ID kwds[1];
+	VALUE vchomp;
+	if (!kwds[0]) {
+	    kwds[0] = rb_intern_const("chomp");
+	}
+	rb_get_kwargs(opts, kwds, 0, -2, &vchomp);
+	chomp = (vchomp != Qundef) && RTEST(vchomp);
+    }
+    args->chomp = chomp;
+}
+
 static void
-prepare_getline_args(int argc, VALUE *argv, VALUE *rsp, long *limit, VALUE io)
+extract_getline_args(int argc, VALUE *argv, struct getline_arg *args)
 {
     VALUE rs = rb_rs, lim = Qnil;
-    rb_io_t *fptr;
 
-    rb_check_arity(argc, 0, 2);
     if (argc == 1) {
         VALUE tmp = Qnil;
 
@@ -3033,6 +3553,16 @@ prepare_getline_args(int argc, VALUE *argv, VALUE *rsp, long *limit, VALUE io)
         if (!NIL_P(rs))
             StringValue(rs);
     }
+    args->rs = rs;
+    args->limit = NIL_P(lim) ? -1L : NUM2LONG(lim);
+}
+
+static void
+check_getline_args(VALUE *rsp, long *limit, VALUE io)
+{
+    rb_io_t *fptr;
+    VALUE rs = *rsp;
+
     if (!NIL_P(rs)) {
 	rb_encoding *enc_rs, *enc_io;
 
@@ -3045,6 +3575,7 @@ prepare_getline_args(int argc, VALUE *argv, VALUE *rsp, long *limit, VALUE io)
             if (rs == rb_default_rs) {
                 rs = rb_enc_str_new(0, 0, enc_io);
                 rb_str_buf_cat_ascii(rs, "\n");
+		*rsp = rs;
             }
             else {
                 rb_raise(rb_eArgError, "encoding mismatch: %s IO with %s RS",
@@ -3053,12 +3584,20 @@ prepare_getline_args(int argc, VALUE *argv, VALUE *rsp, long *limit, VALUE io)
             }
 	}
     }
-    *rsp = rs;
-    *limit = NIL_P(lim) ? -1L : NUM2LONG(lim);
+}
+
+static void
+prepare_getline_args(int argc, VALUE *argv, struct getline_arg *args, VALUE io)
+{
+    VALUE opts;
+    argc = rb_scan_args(argc, argv, "02:", NULL, NULL, &opts);
+    extract_getline_args(argc, argv, args);
+    extract_getline_opts(opts, args);
+    check_getline_args(&args->rs, &args->limit, io);
 }
 
 static VALUE
-rb_io_getline_0(VALUE rs, long limit, rb_io_t *fptr)
+rb_io_getline_0(VALUE rs, long limit, int chomp, rb_io_t *fptr)
 {
     VALUE str = Qnil;
     int nolimit = 0;
@@ -3068,6 +3607,7 @@ rb_io_getline_0(VALUE rs, long limit, rb_io_t *fptr)
     if (NIL_P(rs) && limit < 0) {
 	str = read_all(fptr, 0, Qnil);
 	if (RSTRING_LEN(str) == 0) return Qnil;
+	if (chomp) rb_str_chomp_string(str, rb_default_rs);
     }
     else if (limit == 0) {
 	return rb_enc_str_new(0, 0, io_read_encoding(fptr));
@@ -3075,7 +3615,7 @@ rb_io_getline_0(VALUE rs, long limit, rb_io_t *fptr)
     else if (rs == rb_default_rs && limit < 0 && !NEED_READCONV(fptr) &&
              rb_enc_asciicompat(enc = io_read_encoding(fptr))) {
 	NEED_NEWLINE_DECORATOR_ON_READ_CHECK(fptr);
-	return rb_io_getline_fast(fptr, enc);
+	return rb_io_getline_fast(fptr, enc, chomp);
     }
     else {
 	int c, newline = -1;
@@ -3083,6 +3623,7 @@ rb_io_getline_0(VALUE rs, long limit, rb_io_t *fptr)
 	long rslen = 0;
 	int rspara = 0;
         int extra_limit = 16;
+	int chomp_cr = chomp;
 
 	SET_BINARY_MODE(fptr);
         enc = io_read_encoding(fptr);
@@ -3107,6 +3648,7 @@ rb_io_getline_0(VALUE rs, long limit, rb_io_t *fptr)
 		rsptr = RSTRING_PTR(rs);
 	    }
 	    newline = (unsigned char)rsptr[rslen - 1];
+	    chomp_cr = chomp && rslen == 1 && newline == '\n';
 	}
 
 	/* MS - Optimization */
@@ -3121,7 +3663,13 @@ rb_io_getline_0(VALUE rs, long limit, rb_io_t *fptr)
 		pp = rb_enc_left_char_head(s, p, e, enc);
 		if (pp != p) continue;
 		if (!rspara) rscheck(rsptr, rslen, rs);
-		if (memcmp(p, rsptr, rslen) == 0) break;
+		if (memcmp(p, rsptr, rslen) == 0) {
+		    if (chomp) {
+			if (chomp_cr && p > s && *(p-1) == '\r') --p;
+			rb_str_set_len(str, p - s);
+		    }
+		    break;
+		}
 	    }
 	    if (limit == 0) {
 		s = RSTRING_PTR(str);
@@ -3155,7 +3703,7 @@ rb_io_getline_0(VALUE rs, long limit, rb_io_t *fptr)
 }
 
 static VALUE
-rb_io_getline_1(VALUE rs, long limit, VALUE io)
+rb_io_getline_1(VALUE rs, long limit, int chomp, VALUE io)
 {
     rb_io_t *fptr;
     int old_lineno, new_lineno;
@@ -3163,7 +3711,7 @@ rb_io_getline_1(VALUE rs, long limit, VALUE io)
 
     GetOpenFile(io, fptr);
     old_lineno = fptr->lineno;
-    str = rb_io_getline_0(rs, limit, fptr);
+    str = rb_io_getline_0(rs, limit, chomp, fptr);
     if (!NIL_P(str) && (new_lineno = fptr->lineno) != old_lineno) {
 	if (io == ARGF.current_file) {
 	    ARGF.lineno += new_lineno - old_lineno;
@@ -3180,17 +3728,16 @@ rb_io_getline_1(VALUE rs, long limit, VALUE io)
 static VALUE
 rb_io_getline(int argc, VALUE *argv, VALUE io)
 {
-    VALUE rs;
-    long limit;
+    struct getline_arg args;
 
-    prepare_getline_args(argc, argv, &rs, &limit, io);
-    return rb_io_getline_1(rs, limit, io);
+    prepare_getline_args(argc, argv, &args, io);
+    return rb_io_getline_1(args.rs, args.limit, args.chomp, io);
 }
 
 VALUE
 rb_io_gets(VALUE io)
 {
-    return rb_io_getline_1(rb_default_rs, -1, io);
+    return rb_io_getline_1(rb_default_rs, -1, FALSE, io);
 }
 
 VALUE
@@ -3198,25 +3745,25 @@ rb_io_gets_internal(VALUE io)
 {
     rb_io_t *fptr;
     GetOpenFile(io, fptr);
-    return rb_io_getline_0(rb_default_rs, -1, fptr);
+    return rb_io_getline_0(rb_default_rs, -1, FALSE, fptr);
 }
 
 /*
  *  call-seq:
- *     ios.gets(sep=$/)     -> string or nil
- *     ios.gets(limit)      -> string or nil
- *     ios.gets(sep, limit) -> string or nil
+ *     ios.gets(sep=$/ [, getline_args])     -> string or nil
+ *     ios.gets(limit [, getline_args])      -> string or nil
+ *     ios.gets(sep, limit [, getline_args]) -> 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</i>. A separator of +nil+ 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 in bytes.
+ *  The stream must be opened for reading or an IOError will be raised.
+ *  The line read in will be returned and also assigned to
+ *  <code>$_</code>. Returns +nil+ 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 in
+ *  bytes.
  *
  *     File.new("testfile").gets   #=> "This is line one\n"
  *     $_                          #=> "This is line one\n"
@@ -3250,12 +3797,12 @@ rb_io_gets_m(int argc, VALUE *argv, VALUE io)
  *     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
- *  #gets is called rather than the number of newlines encountered.  The two
- *  values will differ if #gets is called with a separator other than newline.
+ *  opened for reading. #lineno counts the number of times #gets is called
+ *  rather than the number of newlines encountered.  The two values will
+ *  differ if #gets is called with a separator other than newline.
  *
  *  Methods that use <code>$/</code> like #each, #lines and #readline will
- *  also increment <code>lineno</code>.
+ *  also increment #lineno.
  *
  *  See also the <code>$.</code> variable.
  *
@@ -3307,12 +3854,11 @@ rb_io_set_lineno(VALUE io, VALUE lineno)
 
 /*
  *  call-seq:
- *     ios.readline(sep=$/)     -> string
- *     ios.readline(limit)      -> string
- *     ios.readline(sep, limit) -> string
+ *     ios.readline(sep=$/ [, getline_args])     -> string
+ *     ios.readline(limit [, getline_args])      -> string
+ *     ios.readline(sep, limit [, getline_args]) -> string
  *
- *  Reads a line as with <code>IO#gets</code>, but raises an
- *  <code>EOFError</code> on end of file.
+ *  Reads a line as with IO#gets, but raises an EOFError on end of file.
  */
 
 static VALUE
@@ -3326,35 +3872,50 @@ rb_io_readline(int argc, VALUE *argv, VALUE io)
     return line;
 }
 
+static VALUE io_readlines(const struct getline_arg *arg, VALUE io);
+
 /*
  *  call-seq:
- *     ios.readlines(sep=$/)     -> array
- *     ios.readlines(limit)      -> array
- *     ios.readlines(sep, limit) -> array
+ *     ios.readlines(sep=$/ [, getline_args])     -> array
+ *     ios.readlines(limit [, getline_args])      -> array
+ *     ios.readlines(sep, limit [, getline_args]) -> 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
+ *  an array. Lines are separated by the optional <i>sep</i>. If
+ *  <i>sep</i> is +nil+, the rest of the stream is returned
+ *  as a single record.
+ *  If the first argument is an integer, or an
  *  optional second argument is given, the returning string would not be
  *  longer than the given value in bytes. The stream must be opened for
- *  reading or an <code>IOError</code> will be raised.
+ *  reading or an IOError will be raised.
  *
  *     f = File.new("testfile")
  *     f.readlines[0]   #=> "This is line one\n"
+ *
+ *     f = File.new("testfile", chomp: true)
+ *     f.readlines[0]   #=> "This is line one"
+ *
+ *  See IO.readlines for details about getline_args.
  */
 
 static VALUE
 rb_io_readlines(int argc, VALUE *argv, VALUE io)
 {
-    VALUE line, ary, rs;
-    long limit;
+    struct getline_arg args;
 
-    prepare_getline_args(argc, argv, &rs, &limit, io);
-    if (limit == 0)
+    prepare_getline_args(argc, argv, &args, io);
+    return io_readlines(&args, io);
+}
+
+static VALUE
+io_readlines(const struct getline_arg *arg, VALUE io)
+{
+    VALUE line, ary;
+
+    if (arg->limit == 0)
 	rb_raise(rb_eArgError, "invalid limit: 0 for readlines");
     ary = rb_ary_new();
-    while (!NIL_P(line = rb_io_getline_1(rs, limit, io))) {
+    while (!NIL_P(line = rb_io_getline_1(arg->rs, arg->limit, arg->chomp, io))) {
 	rb_ary_push(ary, line);
     }
     return ary;
@@ -3362,19 +3923,19 @@ 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(...)                            -> an_enumerator
+ *     ios.each(sep=$/ [, getline_args])          {|line| block } -> ios
+ *     ios.each(limit [, getline_args])           {|line| block } -> ios
+ *     ios.each(sep, limit [, getline_args])      {|line| block } -> ios
+ *     ios.each(...)                             -> an_enumerator
  *
- *     ios.each_line(sep=$/) {|line| block }    -> ios
- *     ios.each_line(limit) {|line| block }     -> ios
- *     ios.each_line(sep,limit) {|line| block } -> ios
- *     ios.each_line(...)                       -> an_enumerator
+ *     ios.each_line(sep=$/ [, getline_args])     {|line| block } -> ios
+ *     ios.each_line(limit [, getline_args])      {|line| block } -> ios
+ *     ios.each_line(sep, limit [, getline_args]) {|line| block } -> ios
+ *     ios.each_line(...)                        -> an_enumerator
  *
  *  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
- *  reading or an <code>IOError</code> will be raised.
+ *  reading or an IOError will be raised.
  *
  *  If no block is given, an enumerator is returned instead.
  *
@@ -3387,45 +3948,34 @@ rb_io_readlines(int argc, VALUE *argv, VALUE io)
  *     2: This is line two
  *     3: This is line three
  *     4: And so on...
+ *
+ *  See IO.readlines for details about getline_args.
  */
 
 static VALUE
 rb_io_each_line(int argc, VALUE *argv, VALUE io)
 {
-    VALUE str, rs;
-    long limit;
+    VALUE str;
+    struct getline_arg args;
 
     RETURN_ENUMERATOR(io, argc, argv);
-    prepare_getline_args(argc, argv, &rs, &limit, io);
-    if (limit == 0)
+    prepare_getline_args(argc, argv, &args, io);
+    if (args.limit == 0)
 	rb_raise(rb_eArgError, "invalid limit: 0 for each_line");
-    while (!NIL_P(str = rb_io_getline_1(rs, limit, io))) {
+    while (!NIL_P(str = rb_io_getline_1(args.rs, args.limit, args.chomp, io))) {
 	rb_yield(str);
     }
     return io;
 }
 
 /*
- *  This is a deprecated alias for <code>each_line</code>.
- */
-
-static VALUE
-rb_io_lines(int argc, VALUE *argv, VALUE io)
-{
-    rb_warn("IO#lines is deprecated; use #each_line instead");
-    if (!rb_block_given_p())
-	return rb_enumeratorize(io, ID2SYM(rb_intern("each_line")), argc, argv);
-    return rb_io_each_line(argc, argv, io);
-}
-
-/*
  *  call-seq:
  *     ios.each_byte {|byte| block }  -> ios
  *     ios.each_byte                  -> an_enumerator
  *
  *  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.
+ *  reading or an IOError will be raised.
  *
  *  If no block is given, an enumerator is returned instead.
  *
@@ -3448,27 +3998,14 @@ rb_io_each_byte(VALUE io)
 	    char *p = fptr->rbuf.ptr + fptr->rbuf.off++;
 	    fptr->rbuf.len--;
 	    rb_yield(INT2FIX(*p & 0xff));
+	    rb_io_check_byte_readable(fptr);
 	    errno = 0;
 	}
-	rb_io_check_byte_readable(fptr);
 	READ_CHECK(fptr);
     } while (io_fillbuf(fptr) >= 0);
     return io;
 }
 
-/*
- *  This is a deprecated alias for <code>each_byte</code>.
- */
-
-static VALUE
-rb_io_bytes(VALUE io)
-{
-    rb_warn("IO#bytes is deprecated; use #each_byte instead");
-    if (!rb_block_given_p())
-	return rb_enumeratorize(io, ID2SYM(rb_intern("each_byte")), 0, 0);
-    return rb_io_each_byte(io);
-}
-
 static VALUE
 io_getc(rb_io_t *fptr, rb_encoding *enc)
 {
@@ -3476,9 +4013,9 @@ io_getc(rb_io_t *fptr, rb_encoding *enc)
     VALUE str;
 
     if (NEED_READCONV(fptr)) {
-        VALUE str = Qnil;
 	rb_encoding *read_enc = io_read_encoding(fptr);
 
+	str = Qnil;
 	SET_BINARY_MODE(fptr);
         make_readconv(fptr, 0);
 
@@ -3583,7 +4120,7 @@ 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 IOError will be raised.
  *
  *  If no block is given, an enumerator is returned instead.
  *
@@ -3611,29 +4148,15 @@ rb_io_each_char(VALUE io)
 }
 
 /*
- *  This is a deprecated alias for <code>each_char</code>.
- */
-
-static VALUE
-rb_io_chars(VALUE io)
-{
-    rb_warn("IO#chars is deprecated; use #each_char instead");
-    if (!rb_block_given_p())
-	return rb_enumeratorize(io, ID2SYM(rb_intern("each_char")), 0, 0);
-    return rb_io_each_char(io);
-}
-
-
-/*
  *  call-seq:
  *     ios.each_codepoint {|c| block }  -> ios
  *     ios.codepoints     {|c| block }  -> ios
  *     ios.each_codepoint               -> an_enumerator
  *     ios.codepoints                   -> an_enumerator
  *
- *  Passes the <code>Integer</code> ordinal of each character in <i>ios</i>,
+ *  Passes the Integer ordinal of each character in <i>ios</i>,
  *  passing the codepoint as an argument. The stream must be opened for
- *  reading or an <code>IOError</code> will be raised.
+ *  reading or an IOError will be raised.
  *
  *  If no block is given, an enumerator is returned instead.
  *
@@ -3696,6 +4219,7 @@ rb_io_each_codepoint(VALUE io)
 	    fptr->cbuf.off += n;
 	    fptr->cbuf.len -= n;
 	    rb_yield(UINT2NUM(c));
+            rb_io_check_byte_readable(fptr);
 	}
     }
     NEED_NEWLINE_DECORATOR_ON_READ_CHECK(fptr);
@@ -3712,8 +4236,7 @@ rb_io_each_codepoint(VALUE io)
 	    rb_yield(UINT2NUM(c));
 	}
 	else if (MBCLEN_INVALID_P(r)) {
-	  invalid:
-	    rb_raise(rb_eArgError, "invalid byte sequence in %s", rb_enc_name(enc));
+            goto invalid;
 	}
 	else if (MBCLEN_NEEDMORE_P(r)) {
 	    char cbuf[8], *p = cbuf;
@@ -3734,30 +4257,21 @@ rb_io_each_codepoint(VALUE io)
 	else {
 	    continue;
 	}
+        rb_io_check_byte_readable(fptr);
     }
     return io;
-}
-
-/*
- *  This is a deprecated alias for <code>each_codepoint</code>.
- */
 
-static VALUE
-rb_io_codepoints(VALUE io)
-{
-    rb_warn("IO#codepoints is deprecated; use #each_codepoint instead");
-    if (!rb_block_given_p())
-	return rb_enumeratorize(io, ID2SYM(rb_intern("each_codepoint")), 0, 0);
-    return rb_io_each_codepoint(io);
+  invalid:
+    rb_raise(rb_eArgError, "invalid byte sequence in %s", rb_enc_name(enc));
+    UNREACHABLE_RETURN(Qundef);
 }
 
-
 /*
  *  call-seq:
  *     ios.getc   -> string or nil
  *
  *  Reads a one-character string from <em>ios</em>. Returns
- *  <code>nil</code> if called at end of file.
+ *  +nil+ if called at end of file.
  *
  *     f = File.new("testfile")
  *     f.getc   #=> "h"
@@ -3783,7 +4297,7 @@ rb_io_getc(VALUE io)
  *     ios.readchar   -> string
  *
  *  Reads a one-character string from <em>ios</em>. Raises an
- *  <code>EOFError</code> on end of file.
+ *  EOFError on end of file.
  *
  *     f = File.new("testfile")
  *     f.readchar   #=> "h"
@@ -3803,10 +4317,10 @@ rb_io_readchar(VALUE io)
 
 /*
  *  call-seq:
- *     ios.getbyte   -> fixnum or nil
+ *     ios.getbyte   -> integer or nil
  *
  *  Gets the next 8-bit byte (0..255) from <em>ios</em>. Returns
- *  <code>nil</code> if called at end of file.
+ *  +nil+ if called at end of file.
  *
  *     f = File.new("testfile")
  *     f.getbyte   #=> 84
@@ -3822,11 +4336,12 @@ rb_io_getbyte(VALUE io)
     GetOpenFile(io, fptr);
     rb_io_check_byte_readable(fptr);
     READ_CHECK(fptr);
-    if (fptr->fd == 0 && (fptr->mode & FMODE_TTY) && RB_TYPE_P(rb_stdout, T_FILE)) {
+    VALUE r_stdout = rb_ractor_stdout();
+    if (fptr->fd == 0 && (fptr->mode & FMODE_TTY) && RB_TYPE_P(r_stdout, T_FILE)) {
         rb_io_t *ofp;
-        GetOpenFile(rb_stdout, ofp);
+        GetOpenFile(r_stdout, ofp);
         if (ofp->mode & FMODE_TTY) {
-            rb_io_flush(rb_stdout);
+            rb_io_flush(r_stdout);
         }
     }
     if (io_fillbuf(fptr) < 0) {
@@ -3840,10 +4355,10 @@ rb_io_getbyte(VALUE io)
 
 /*
  *  call-seq:
- *     ios.readbyte   -> fixnum
+ *     ios.readbyte   -> integer
  *
- *  Reads a byte as with <code>IO#getbyte</code>, but raises an
- *  <code>EOFError</code> on end of file.
+ *  Reads a byte as with IO#getbyte, but raises an EOFError on end of
+ *  file.
  */
 
 static VALUE
@@ -3860,13 +4375,13 @@ rb_io_readbyte(VALUE io)
 /*
  *  call-seq:
  *     ios.ungetbyte(string)   -> nil
- *     ios.ungetbyte(integer)   -> nil
+ *     ios.ungetbyte(integer)  -> nil
  *
  *  Pushes back bytes (passed as a parameter) onto <em>ios</em>,
  *  such that a subsequent buffered read will return it. Only one byte
  *  may be pushed back before a subsequent read operation (that is,
  *  you will be able to read only the last of several bytes that have been pushed
- *  back). Has no effect with unbuffered reads (such as <code>IO#sysread</code>).
+ *  back). Has no effect with unbuffered reads (such as IO#sysread).
  *
  *     f = File.new("testfile")   #=> #<File:testfile>
  *     b = f.getbyte              #=> 0x38
@@ -3881,13 +4396,17 @@ rb_io_ungetbyte(VALUE io, VALUE b)
 
     GetOpenFile(io, fptr);
     rb_io_check_byte_readable(fptr);
-    if (NIL_P(b)) return Qnil;
-    if (FIXNUM_P(b)) {
-	char cc = FIX2INT(b);
-	b = rb_str_new(&cc, 1);
-    }
-    else {
-	SafeStringValue(b);
+    switch (TYPE(b)) {
+      case T_NIL:
+        return Qnil;
+      case T_FIXNUM:
+      case T_BIGNUM: ;
+        VALUE v = rb_int_modulo(b, INT2FIX(256));
+        unsigned char c = NUM2INT(v) & 0xFF;
+        b = rb_str_new((const char *)&c, 1);
+        break;
+      default:
+        SafeStringValue(b);
     }
     io_ungetbyte(b, fptr);
     return Qnil;
@@ -3901,7 +4420,7 @@ rb_io_ungetbyte(VALUE io, VALUE b)
  *  such that a subsequent buffered character 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>).
+ *  back). Has no effect with unbuffered reads (such as IO#sysread).
  *
  *     f = File.new("testfile")   #=> #<File:testfile>
  *     c = f.getc                 #=> "8"
@@ -3917,7 +4436,6 @@ rb_io_ungetc(VALUE io, VALUE c)
 
     GetOpenFile(io, fptr);
     rb_io_check_char_readable(fptr);
-    if (NIL_P(c)) return Qnil;
     if (FIXNUM_P(c)) {
 	c = rb_enc_uint_chr(FIX2UINT(c), io_read_encoding(fptr));
     }
@@ -4056,7 +4574,7 @@ rb_io_set_close_on_exec(VALUE io, VALUE arg)
             if ((ret & FD_CLOEXEC) != flag) {
                 ret = (ret & ~FD_CLOEXEC) | flag;
                 ret = fcntl(fd, F_SETFD, ret);
-                if (ret == -1) rb_sys_fail_path(fptr->pathv);
+                if (ret != 0) rb_sys_fail_path(fptr->pathv);
             }
         }
 
@@ -4068,7 +4586,7 @@ rb_io_set_close_on_exec(VALUE io, VALUE arg)
         if ((ret & FD_CLOEXEC) != flag) {
             ret = (ret & ~FD_CLOEXEC) | flag;
             ret = fcntl(fd, F_SETFD, ret);
-            if (ret == -1) rb_sys_fail_path(fptr->pathv);
+            if (ret != 0) rb_sys_fail_path(fptr->pathv);
         }
     }
     return Qnil;
@@ -4077,7 +4595,6 @@ rb_io_set_close_on_exec(VALUE io, VALUE arg)
 #define rb_io_set_close_on_exec rb_f_notimplement
 #endif
 
-#define FMODE_PREP (1<<16)
 #define IS_PREP_STDIO(f) ((f)->mode & FMODE_PREP)
 #define PREP_STDIO_NAME(f) (RSTRING_PTR((f)->pathv))
 
@@ -4198,7 +4715,8 @@ static void free_io_buffer(rb_io_buffer_t *buf);
 static void clear_codeconv(rb_io_t *fptr);
 
 static void
-fptr_finalize(rb_io_t *fptr, int noraise)
+fptr_finalize_flush(rb_io_t *fptr, int noraise, int keepgvl,
+                    struct list_head *busy)
 {
     VALUE err = Qnil;
     int fd = fptr->fd;
@@ -4218,8 +4736,7 @@ fptr_finalize(rb_io_t *fptr, int noraise)
     }
     if (fptr->wbuf.len) {
 	if (noraise) {
-	    if ((int)io_flush_buffer_sync(fptr) < 0 && NIL_P(err))
-		err = Qtrue;
+	    io_flush_buffer_sync(fptr);
 	}
 	else {
 	    if (io_fflush(fptr) < 0 && NIL_P(err))
@@ -4231,6 +4748,14 @@ fptr_finalize(rb_io_t *fptr, int noraise)
     fptr->stdio_file = 0;
     fptr->mode &= ~(FMODE_READABLE|FMODE_WRITABLE);
 
+    /*
+     * ensure waiting_fd users do not hit EBADF, wait for them
+     * to exit before we call close().
+     */
+    if (busy) {
+        do rb_thread_schedule(); while (!list_empty(busy));
+    }
+
     if (IS_PREP_STDIO(fptr) || fd <= 2) {
 	/* need to keep FILE objects of stdin, stdout and stderr */
     }
@@ -4238,7 +4763,7 @@ fptr_finalize(rb_io_t *fptr, int noraise)
 	/* stdio_file is deallocated anyway
          * even if fclose failed.  */
 	if ((maygvl_fclose(stdio_file, noraise) < 0) && NIL_P(err))
-	    err = noraise ? Qtrue : INT2NUM(errno);
+	    if (!noraise) err = INT2NUM(errno);
     }
     else if (0 <= fd) {
 	/* fptr->fd may be closed even if close fails.
@@ -4246,22 +4771,24 @@ fptr_finalize(rb_io_t *fptr, int noraise)
          * We assumes it is closed.  */
 
 	/**/
-	int keepgvl = !(mode & FMODE_WRITABLE);
+	keepgvl |= !(mode & FMODE_WRITABLE);
 	keepgvl |= noraise;
 	if ((maygvl_close(fd, keepgvl) < 0) && NIL_P(err))
-	    err = noraise ? Qtrue : INT2NUM(errno);
+	    if (!noraise) err = INT2NUM(errno);
     }
 
     if (!NIL_P(err) && !noraise) {
-        switch (TYPE(err)) {
-          case T_FIXNUM:
-          case T_BIGNUM:
+	if (RB_INTEGER_TYPE_P(err))
 	    rb_syserr_fail_path(NUM2INT(err), fptr->pathv);
-
-          default:
-            rb_exc_raise(err);
-        }
+	else
+	    rb_exc_raise(err);
     }
+}
+
+static void
+fptr_finalize(rb_io_t *fptr, int noraise)
+{
+    fptr_finalize_flush(fptr, noraise, FALSE, 0);
     free_io_buffer(&fptr->rbuf);
     free_io_buffer(&fptr->wbuf);
     clear_codeconv(fptr);
@@ -4314,21 +4841,36 @@ clear_codeconv(rb_io_t *fptr)
     clear_writeconv(fptr);
 }
 
-int
-rb_io_fptr_finalize(rb_io_t *fptr)
+void
+rb_io_fptr_finalize_internal(void *ptr)
 {
-    if (!fptr) return 0;
+    rb_io_t *fptr = ptr;
+
+    if (!ptr) return;
     fptr->pathv = Qnil;
     if (0 <= fptr->fd)
-	rb_io_fptr_cleanup(fptr, TRUE);
+        rb_io_fptr_cleanup(fptr, TRUE);
     fptr->write_lock = 0;
     free_io_buffer(&fptr->rbuf);
     free_io_buffer(&fptr->wbuf);
     clear_codeconv(fptr);
     free(fptr);
-    return 1;
 }
 
+#undef rb_io_fptr_finalize
+int
+rb_io_fptr_finalize(rb_io_t *fptr)
+{
+    if (!fptr) {
+        return 0;
+    }
+    else {
+        rb_io_fptr_finalize_internal(fptr);
+        return 1;
+    }
+}
+#define rb_io_fptr_finalize(fptr) rb_io_fptr_finalize_internal(fptr)
+
 RUBY_FUNC_EXPORTED size_t
 rb_io_memsize(const rb_io_t *fptr)
 {
@@ -4341,14 +4883,23 @@ rb_io_memsize(const rb_io_t *fptr)
     return size;
 }
 
+#ifdef _WIN32
+/* keep GVL while closing to prevent crash on Windows */
+# define KEEPGVL TRUE
+#else
+# define KEEPGVL FALSE
+#endif
+
+int rb_notify_fd_close(int fd, struct list_head *);
 static rb_io_t *
 io_close_fptr(VALUE io)
 {
     rb_io_t *fptr;
-    int fd;
     VALUE write_io;
     rb_io_t *write_fptr;
+    struct list_head busy;
 
+    list_head_init(&busy);
     write_io = GetWriteIO(io);
     if (io != write_io) {
         write_fptr = RFILE(write_io)->fptr;
@@ -4361,8 +4912,10 @@ io_close_fptr(VALUE io)
     if (!fptr) return 0;
     if (fptr->fd < 0) return 0;
 
-    fd = fptr->fd;
-    rb_thread_fd_close(fd);
+    if (rb_notify_fd_close(fptr->fd, &busy)) {
+        /* calls close(fptr->fd): */
+        fptr_finalize_flush(fptr, FALSE, KEEPGVL, &busy);
+    }
     rb_io_fptr_cleanup(fptr, FALSE);
     return fptr;
 }
@@ -4372,9 +4925,9 @@ fptr_waitpid(rb_io_t *fptr, int nohang)
 {
     int status;
     if (fptr->pid) {
-	rb_last_status_clear();
-	rb_waitpid(fptr->pid, &status, nohang ? WNOHANG : 0);
-	fptr->pid = 0;
+        rb_last_status_clear();
+        rb_waitpid(fptr->pid, &status, nohang ? WNOHANG : 0);
+        fptr->pid = 0;
     }
 }
 
@@ -4392,12 +4945,11 @@ rb_io_close(VALUE io)
  *
  *  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
- *  streams are automatically closed when they are claimed by the
- *  garbage collector.
+ *  an IOError is raised if such an attempt is made. I/O streams are
+ *  automatically closed when they are claimed by the garbage collector.
  *
- *  If <em>ios</em> is opened by <code>IO.popen</code>,
- *  <code>close</code> sets <code>$?</code>.
+ *  If <em>ios</em> is opened by IO.popen, #close sets
+ *  <code>$?</code>.
  *
  *  Calling this method on closed IO object is just ignored since Ruby 2.3.
  */
@@ -4424,7 +4976,7 @@ static VALUE
 ignore_closed_stream(VALUE io, VALUE exc)
 {
     enum {mesg_len = sizeof(closed_stream)-1};
-    VALUE mesg = rb_attr_get(exc, rb_intern("mesg"));
+    VALUE mesg = rb_attr_get(exc, idMesg);
     if (!RB_TYPE_P(mesg, T_STRING) ||
 	RSTRING_LEN(mesg) != mesg_len ||
 	memcmp(RSTRING_PTR(mesg), closed_stream, mesg_len)) {
@@ -4487,7 +5039,7 @@ rb_io_closed(VALUE io)
  *
  *  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.
+ *  IOError if the stream is not duplexed.
  *
  *     f = IO.popen("/bin/sh","r+")
  *     f.close_read
@@ -4497,6 +5049,8 @@ rb_io_closed(VALUE io)
  *
  *     prog.rb:3:in `readlines': not opened for reading (IOError)
  *     	from prog.rb:3
+ *
+ *  Calling this method on closed IO object is just ignored since Ruby 2.3.
  */
 
 static VALUE
@@ -4546,7 +5100,7 @@ rb_io_close_read(VALUE io)
  *
  *  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.
+ *  IOError if the stream is not duplexed.
  *
  *     f = IO.popen("/bin/sh","r+")
  *     f.close_write
@@ -4557,6 +5111,8 @@ rb_io_close_read(VALUE io)
  *     prog.rb:3:in `write': not opened for writing (IOError)
  *     	from prog.rb:3:in `print'
  *     	from prog.rb:3
+ *
+ *  Calling this method on closed IO object is just ignored since Ruby 2.3.
  */
 
 static VALUE
@@ -4597,8 +5153,8 @@ rb_io_close_write(VALUE io)
  *     ios.sysseek(offset, whence=IO::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.
+ *  of <i>whence</i> (see IO#seek for values of <i>whence</i>). Returns
+ *  the new offset into the file.
  *
  *     f = File.new("testfile")
  *     f.sysseek(-13, IO::SEEK_END)   #=> 53
@@ -4627,7 +5183,7 @@ rb_io_sysseek(int argc, VALUE *argv, VALUE io)
     }
     errno = 0;
     pos = lseek(fptr->fd, pos, whence);
-    if (pos == -1 && errno) rb_sys_fail_path(fptr->pathv);
+    if (pos < 0 && errno) rb_sys_fail_path(fptr->pathv);
 
     return OFFT2NUM(pos);
 }
@@ -4639,7 +5195,7 @@ rb_io_sysseek(int argc, VALUE *argv, VALUE io)
  *  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.
+ *  Raises SystemCallError on error.
  *
  *     f = File.new("out", "w")
  *     f.syswrite("ABCDEF")   #=> 6
@@ -4648,8 +5204,10 @@ rb_io_sysseek(int argc, VALUE *argv, VALUE io)
 static VALUE
 rb_io_syswrite(VALUE io, VALUE str)
 {
+    VALUE tmp;
     rb_io_t *fptr;
-    long n;
+    long n, len;
+    const char *ptr;
 
     if (!RB_TYPE_P(str, T_STRING))
 	str = rb_obj_as_string(str);
@@ -4658,16 +5216,15 @@ rb_io_syswrite(VALUE io, VALUE str)
     GetOpenFile(io, fptr);
     rb_io_check_writable(fptr);
 
-    str = rb_str_new_frozen(str);
-
     if (fptr->wbuf.len) {
 	rb_warn("syswrite for buffered IO");
     }
 
-    n = rb_write_internal(fptr->fd, RSTRING_PTR(str), RSTRING_LEN(str));
-    RB_GC_GUARD(str);
-
-    if (n == -1) rb_sys_fail_path(fptr->pathv);
+    tmp = rb_str_tmp_frozen_acquire(str);
+    RSTRING_GETMEM(tmp, ptr, len);
+    n = rb_write_internal(fptr->fd, ptr, len);
+    if (n < 0) rb_sys_fail_path(fptr->pathv);
+    rb_str_tmp_frozen_release(str, tmp);
 
     return LONG2FIX(n);
 }
@@ -4679,12 +5236,13 @@ rb_io_syswrite(VALUE io, VALUE str)
  *  Reads <i>maxlen</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.
- *  The <i>outbuf</i> will contain only the received data after the method call
+ *
+ *  If the optional _outbuf_ argument is present,
+ *  it must reference a String, which will receive the data.
+ *  The _outbuf_ will contain only the received data after the method call
  *  even if it is not empty at the beginning.
- *  Raises <code>SystemCallError</code> on error and
- *  <code>EOFError</code> at end of file.
+ *
+ *  Raises SystemCallError on error and EOFError at end of file.
  *
  *     f = File.new("testfile")
  *     f.sysread(16)   #=> "This is line one"
@@ -4696,12 +5254,13 @@ rb_io_sysread(int argc, VALUE *argv, VALUE io)
     VALUE len, str;
     rb_io_t *fptr;
     long n, ilen;
-    struct read_internal_arg arg;
+    struct io_internal_read_struct iis;
+    int shrinkable;
 
     rb_scan_args(argc, argv, "11", &len, &str);
     ilen = NUM2LONG(len);
 
-    io_setstrbuf(&str,ilen);
+    shrinkable = io_setstrbuf(&str, ilen);
     if (ilen == 0) return str;
 
     GetOpenFile(io, fptr);
@@ -4723,25 +5282,169 @@ rb_io_sysread(int argc, VALUE *argv, VALUE io)
     rb_io_check_closed(fptr);
 
     io_setstrbuf(&str, ilen);
-    rb_str_locktmp(str);
-    arg.fd = fptr->fd;
-    arg.str_ptr = RSTRING_PTR(str);
-    arg.len = ilen;
-    rb_ensure(read_internal_call, (VALUE)&arg, rb_str_unlocktmp, str);
-    n = arg.len;
+    iis.fd = fptr->fd;
+    iis.nonblock = 1; /* for historical reasons, maybe (see above) */
+    iis.buf = RSTRING_PTR(str);
+    iis.capa = ilen;
+    n = read_internal_locktmp(str, &iis);
 
-    if (n == -1) {
+    if (n < 0) {
 	rb_sys_fail_path(fptr->pathv);
     }
-    io_set_read_length(str, n);
+    io_set_read_length(str, n, shrinkable);
     if (n == 0 && ilen > 0) {
 	rb_eof_error();
     }
-    OBJ_TAINT(str);
 
     return str;
 }
 
+#if defined(HAVE_PREAD) || defined(HAVE_PWRITE)
+struct prdwr_internal_arg {
+    int fd;
+    void *buf;
+    size_t count;
+    off_t offset;
+};
+#endif /* HAVE_PREAD || HAVE_PWRITE */
+
+#if defined(HAVE_PREAD)
+static VALUE
+internal_pread_func(void *arg)
+{
+    struct prdwr_internal_arg *p = arg;
+    return (VALUE)pread(p->fd, p->buf, p->count, p->offset);
+}
+
+static VALUE
+pread_internal_call(VALUE arg)
+{
+    struct prdwr_internal_arg *p = (struct prdwr_internal_arg *)arg;
+    return rb_thread_io_blocking_region(internal_pread_func, p, p->fd);
+}
+
+/*
+ *  call-seq:
+ *     ios.pread(maxlen, offset[, outbuf])    -> string
+ *
+ *  Reads <i>maxlen</i> bytes from <em>ios</em> using the pread system call
+ *  and returns them as a string without modifying the underlying
+ *  descriptor offset.  This is advantageous compared to combining IO#seek
+ *  and IO#read in that it is atomic, allowing multiple threads/process to
+ *  share the same IO object for reading the file at various locations.
+ *  This bypasses any userspace buffering of the IO layer.
+ *  If the optional <i>outbuf</i> argument is present, it must
+ *  reference a String, which will receive the data.
+ *  Raises SystemCallError on error, EOFError at end of file and
+ *  NotImplementedError if platform does not implement the system call.
+ *
+ *     File.write("testfile", "This is line one\nThis is line two\n")
+ *     File.open("testfile") do |f|
+ *       p f.read           # => "This is line one\nThis is line two\n"
+ *       p f.pread(12, 0)   # => "This is line"
+ *       p f.pread(9, 8)    # => "line one\n"
+ *     end
+ */
+static VALUE
+rb_io_pread(int argc, VALUE *argv, VALUE io)
+{
+    VALUE len, offset, str;
+    rb_io_t *fptr;
+    ssize_t n;
+    struct prdwr_internal_arg arg;
+    int shrinkable;
+
+    rb_scan_args(argc, argv, "21", &len, &offset, &str);
+    arg.count = NUM2SIZET(len);
+    arg.offset = NUM2OFFT(offset);
+
+    shrinkable = io_setstrbuf(&str, (long)arg.count);
+    if (arg.count == 0) return str;
+    arg.buf = RSTRING_PTR(str);
+
+    GetOpenFile(io, fptr);
+    rb_io_check_byte_readable(fptr);
+
+    arg.fd = fptr->fd;
+    rb_io_check_closed(fptr);
+
+    rb_str_locktmp(str);
+    n = (ssize_t)rb_ensure(pread_internal_call, (VALUE)&arg, rb_str_unlocktmp, str);
+
+    if (n < 0) {
+	rb_sys_fail_path(fptr->pathv);
+    }
+    io_set_read_length(str, n, shrinkable);
+    if (n == 0 && arg.count > 0) {
+	rb_eof_error();
+    }
+
+    return str;
+}
+#else
+# define rb_io_pread rb_f_notimplement
+#endif /* HAVE_PREAD */
+
+#if defined(HAVE_PWRITE)
+static VALUE
+internal_pwrite_func(void *ptr)
+{
+    struct prdwr_internal_arg *arg = ptr;
+
+    return (VALUE)pwrite(arg->fd, arg->buf, arg->count, arg->offset);
+}
+
+/*
+ *  call-seq:
+ *     ios.pwrite(string, offset)    -> integer
+ *
+ *  Writes the given string to <em>ios</em> at <i>offset</i> using pwrite()
+ *  system call.  This is advantageous to combining IO#seek and IO#write
+ *  in that it is atomic, allowing multiple threads/process to share the
+ *  same IO object for reading the file at various locations.
+ *  This bypasses any userspace buffering of the IO layer.
+ *  Returns the number of bytes written.
+ *  Raises SystemCallError on error and NotImplementedError
+ *  if platform does not implement the system call.
+ *
+ *     File.open("out", "w") do |f|
+ *       f.pwrite("ABCDEF", 3)   #=> 6
+ *     end
+ *
+ *     File.read("out")          #=> "\u0000\u0000\u0000ABCDEF"
+ */
+static VALUE
+rb_io_pwrite(VALUE io, VALUE str, VALUE offset)
+{
+    rb_io_t *fptr;
+    ssize_t n;
+    struct prdwr_internal_arg arg;
+    VALUE tmp;
+
+    if (!RB_TYPE_P(str, T_STRING))
+	str = rb_obj_as_string(str);
+
+    arg.offset = NUM2OFFT(offset);
+
+    io = GetWriteIO(io);
+    GetOpenFile(io, fptr);
+    rb_io_check_writable(fptr);
+    arg.fd = fptr->fd;
+
+    tmp = rb_str_tmp_frozen_acquire(str);
+    arg.buf = RSTRING_PTR(tmp);
+    arg.count = (size_t)RSTRING_LEN(tmp);
+
+    n = (ssize_t)rb_thread_io_blocking_region(internal_pwrite_func, &arg, fptr->fd);
+    if (n < 0) rb_sys_fail_path(fptr->pathv);
+    rb_str_tmp_frozen_release(str, tmp);
+
+    return SSIZET2NUM(n);
+}
+#else
+# define rb_io_pwrite rb_f_notimplement
+#endif /* HAVE_PWRITE */
+
 VALUE
 rb_io_binmode(VALUE io)
 {
@@ -4809,7 +5512,6 @@ rb_io_ascii8bit_binmode(VALUE io)
  *  - newline conversion disabled
  *  - encoding conversion disabled
  *  - content is treated as ASCII-8BIT
- *
  */
 
 static VALUE
@@ -4854,10 +5556,10 @@ rb_io_fmode_modestr(int fmode)
       case FMODE_READABLE:
 	return MODE_BTMODE("r", "rb", "rt");
       case FMODE_WRITABLE:
-	return MODE_BTMODE("w", "wb", "wt");
+	return MODE_BTXMODE("w", "wb", "wt", "wx", "wbx", "wtx");
       case FMODE_READWRITE:
 	if (fmode & FMODE_CREATE) {
-	    return MODE_BTMODE("w+", "wb+", "wt+");
+            return MODE_BTXMODE("w+", "wb+", "wt+", "w+x", "wb+x", "wt+x");
 	}
 	return MODE_BTMODE("r+", "rb+", "rt+");
     }
@@ -4891,8 +5593,7 @@ rb_io_modestr_fmode(const char *modestr)
 	fmode |= FMODE_WRITABLE | FMODE_APPEND | FMODE_CREATE;
 	break;
       default:
-      error:
-	rb_raise(rb_eArgError, "invalid access mode %s", modestr);
+        goto error;
     }
 
     while (*m) {
@@ -4906,6 +5607,11 @@ rb_io_modestr_fmode(const char *modestr)
 	  case '+':
             fmode |= FMODE_READWRITE;
             break;
+          case 'x':
+            if (modestr[0] != 'w')
+                goto error;
+            fmode |= FMODE_EXCL;
+            break;
 	  default:
             goto error;
 	  case ':':
@@ -4921,6 +5627,10 @@ rb_io_modestr_fmode(const char *modestr)
         goto error;
 
     return fmode;
+
+  error:
+    rb_raise(rb_eArgError, "invalid access mode %s", modestr);
+    UNREACHABLE_RETURN(Qundef);
 }
 
 int
@@ -4949,6 +5659,9 @@ rb_io_oflags_fmode(int oflags)
     if (oflags & O_CREAT) {
 	fmode |= FMODE_CREATE;
     }
+    if (oflags & O_EXCL) {
+        fmode |= FMODE_EXCL;
+    }
 #ifdef O_BINARY
     if (oflags & O_BINARY) {
 	fmode |= FMODE_BINMODE;
@@ -4984,6 +5697,9 @@ rb_io_fmode_oflags(int fmode)
     if (fmode & FMODE_CREATE) {
         oflags |= O_CREAT;
     }
+    if (fmode & FMODE_EXCL) {
+        oflags |= O_EXCL;
+    }
 #ifdef O_BINARY
     if (fmode & FMODE_BINMODE) {
         oflags |= O_BINARY;
@@ -5007,7 +5723,11 @@ rb_io_oflags_modestr(int oflags)
 #else
 # define MODE_BINARY(a,b) (a)
 #endif
-    int accmode = oflags & (O_RDONLY|O_WRONLY|O_RDWR);
+    int accmode;
+    if (oflags & O_EXCL) {
+        rb_raise(rb_eArgError, "exclusive access mode is not supported");
+    }
+    accmode = oflags & (O_RDONLY|O_WRONLY|O_RDWR);
     if (oflags & O_APPEND) {
 	if (accmode == O_WRONLY) {
 	    return MODE_BINARY("a", "ab");
@@ -5016,7 +5736,7 @@ rb_io_oflags_modestr(int oflags)
 	    return MODE_BINARY("a+", "ab+");
 	}
     }
-    switch (oflags & (O_RDONLY|O_WRONLY|O_RDWR)) {
+    switch (accmode) {
       default:
 	rb_raise(rb_eArgError, "invalid access oflags 0x%x", oflags);
       case O_RDONLY:
@@ -5220,9 +5940,12 @@ validate_enc_binmode(int *fmode_p, int ecflags, rb_encoding *enc, rb_encoding *e
         !rb_enc_asciicompat(enc ? enc : rb_default_external_encoding()))
         rb_raise(rb_eArgError, "ASCII incompatible encoding needs binmode");
 
+    if ((fmode & FMODE_BINMODE) && (ecflags & ECONV_NEWLINE_DECORATOR_MASK)) {
+	rb_raise(rb_eArgError, "newline decorator with binary mode");
+    }
     if (!(fmode & FMODE_BINMODE) &&
 	(DEFAULT_TEXTMODE || (ecflags & ECONV_NEWLINE_DECORATOR_MASK))) {
-	fmode |= DEFAULT_TEXTMODE;
+	fmode |= FMODE_TEXTMODE;
 	*fmode_p = fmode;
     }
 #if !DEFAULT_TEXTMODE
@@ -5262,7 +5985,7 @@ extract_binmode(VALUE opthash, int *fmode)
     }
 }
 
-static void
+void
 rb_io_extract_modeenc(VALUE *vmode_p, VALUE *vperm_p, VALUE opthash,
         int *oflags_p, int *fmode_p, convconfig_t *convconfig_p)
 {
@@ -5320,6 +6043,18 @@ rb_io_extract_modeenc(VALUE *vmode_p, VALUE *vperm_p, VALUE opthash,
 #endif
 	SET_UNIVERSAL_NEWLINE_DECORATOR_IF_ENC2(enc2, ecflags);
         ecopts = Qnil;
+        if (fmode & FMODE_BINMODE) {
+#ifdef O_BINARY
+            oflags |= O_BINARY;
+#endif
+            if (!has_enc)
+                rb_io_ext_int_to_encs(rb_ascii8bit_encoding(), NULL, &enc, &enc2, fmode);
+        }
+#if DEFAULT_TEXTMODE
+        else if (NIL_P(vmode)) {
+            fmode |= DEFAULT_TEXTMODE;
+        }
+#endif
     }
     else {
 	VALUE v;
@@ -5433,11 +6168,12 @@ rb_sysopen(VALUE fname, int oflags, mode_t perm)
 
     fd = rb_sysopen_internal(&data);
     if (fd < 0) {
-	if (rb_gc_for_fd(errno)) {
+	int e = errno;
+	if (rb_gc_for_fd(e)) {
 	    fd = rb_sysopen_internal(&data);
 	}
 	if (fd < 0) {
-	    rb_sys_fail_path(fname);
+	    rb_syserr_fail_path(e, fname);
 	}
     }
     return fd;
@@ -5453,19 +6189,19 @@ rb_fdopen(int fd, const char *modestr)
 #endif
     file = fdopen(fd, modestr);
     if (!file) {
+	int e = errno;
 #if defined(__sun)
-	if (errno == 0) {
+	if (e == 0) {
 	    rb_gc();
 	    errno = 0;
 	    file = fdopen(fd, modestr);
 	}
 	else
 #endif
-	if (rb_gc_for_fd(errno)) {
+	if (rb_gc_for_fd(e)) {
 	    file = fdopen(fd, modestr);
 	}
 	if (!file) {
-	    int e = errno;
 #ifdef _WIN32
 	    if (e == 0) e = EINVAL;
 #elif defined(__sun)
@@ -5483,11 +6219,13 @@ rb_fdopen(int fd, const char *modestr)
     return file;
 }
 
-static void
+static int
 io_check_tty(rb_io_t *fptr)
 {
-    if (isatty(fptr->fd))
+    int t = isatty(fptr->fd);
+    if (t)
         fptr->mode |= FMODE_TTY|FMODE_DUPLEX;
+    return t;
 }
 
 static VALUE rb_io_internal_encoding(VALUE);
@@ -5497,7 +6235,10 @@ static int
 io_strip_bom(VALUE io)
 {
     VALUE b1, b2, b3, b4;
+    rb_io_t *fptr;
 
+    GetOpenFile(io, fptr);
+    if (!(fptr->mode & FMODE_READABLE)) return 0;
     if (NIL_P(b1 = rb_io_getbyte(io))) return 0;
     switch (b1) {
       case INT2FIX(0xEF):
@@ -5528,12 +6269,9 @@ io_strip_bom(VALUE io)
 		    return ENCINDEX_UTF_32LE;
 		}
 		rb_io_ungetbyte(io, b4);
-		rb_io_ungetbyte(io, b3);
-	    }
-	    else {
-		rb_io_ungetbyte(io, b3);
-		return ENCINDEX_UTF_16LE;
 	    }
+            rb_io_ungetbyte(io, b3);
+            return ENCINDEX_UTF_16LE;
 	}
 	rb_io_ungetbyte(io, b2);
 	break;
@@ -5556,26 +6294,30 @@ io_strip_bom(VALUE io)
     return 0;
 }
 
-static void
+static rb_encoding *
 io_set_encoding_by_bom(VALUE io)
 {
     int idx = io_strip_bom(io);
     rb_io_t *fptr;
+    rb_encoding *extenc = NULL;
 
     GetOpenFile(io, fptr);
     if (idx) {
-	io_encoding_set(fptr, rb_enc_from_encoding(rb_enc_from_index(idx)),
-		rb_io_internal_encoding(io), Qnil);
+        extenc = rb_enc_from_index(idx);
+        io_encoding_set(fptr, rb_enc_from_encoding(extenc),
+                        rb_io_internal_encoding(io), Qnil);
     }
     else {
 	fptr->encs.enc2 = NULL;
     }
+    return extenc;
 }
 
 static VALUE
 rb_file_open_generic(VALUE io, VALUE filename, int oflags, int fmode,
 		     const convconfig_t *convconfig, mode_t perm)
 {
+    VALUE pathv;
     rb_io_t *fptr;
     convconfig_t cc;
     if (!convconfig) {
@@ -5591,8 +6333,15 @@ rb_file_open_generic(VALUE io, VALUE filename, int oflags, int fmode,
     MakeOpenFile(io, fptr);
     fptr->mode = fmode;
     fptr->encs = *convconfig;
-    fptr->pathv = rb_str_new_frozen(filename);
-    fptr->fd = rb_sysopen(fptr->pathv, oflags, perm);
+    pathv = rb_str_new_frozen(filename);
+#ifdef O_TMPFILE
+    if (!(oflags & O_TMPFILE)) {
+        fptr->pathv = pathv;
+    }
+#else
+    fptr->pathv = pathv;
+#endif
+    fptr->fd = rb_sysopen(pathv, oflags, perm);
     io_check_tty(fptr);
     if (fmode & FMODE_SETENC_BY_BOM) io_set_encoding_by_bom(io);
 
@@ -5609,6 +6358,8 @@ rb_file_open_internal(VALUE io, VALUE filename, const char *modestr)
     if (p) {
         parse_mode_enc(p+1, rb_usascii_encoding(),
 		       &convconfig.enc, &convconfig.enc2, &fmode);
+        convconfig.ecflags = 0;
+        convconfig.ecopts = Qnil;
     }
     else {
 	rb_encoding *e;
@@ -5660,23 +6411,16 @@ pipe_add_fptr(rb_io_t *fptr)
 static void
 pipe_del_fptr(rb_io_t *fptr)
 {
-    struct pipe_list *list = pipe_list;
+    struct pipe_list **prev = &pipe_list;
     struct pipe_list *tmp;
 
-    if (list->fptr == fptr) {
-	pipe_list = list->next;
-	free(list);
-	return;
-    }
-
-    while (list->next) {
-	if (list->next->fptr == fptr) {
-	    tmp = list->next;
-	    list->next = list->next->next;
+    while ((tmp = *prev) != 0) {
+	if (tmp->fptr == fptr) {
+	    *prev = tmp->next;
 	    free(tmp);
 	    return;
 	}
-	list = list->next;
+	prev = &tmp->next;
     }
 }
 
@@ -5701,7 +6445,7 @@ pipe_finalize(rb_io_t *fptr, int noraise)
 #if !defined(HAVE_WORKING_FORK) && !defined(_WIN32)
     int status = 0;
     if (fptr->stdio_file) {
-	status = pclose(fptr->stdio_file);
+        status = pclose(fptr->stdio_file);
     }
     fptr->fd = -1;
     fptr->stdio_file = 0;
@@ -5713,6 +6457,31 @@ pipe_finalize(rb_io_t *fptr, int noraise)
 }
 #endif
 
+static void
+fptr_copy_finalizer(rb_io_t *fptr, const rb_io_t *orig)
+{
+#if defined(__CYGWIN__) || !defined(HAVE_WORKING_FORK)
+    void (*const old_finalize)(struct rb_io_t*,int) = fptr->finalize;
+
+    if (old_finalize == orig->finalize) return;
+#endif
+
+    fptr->finalize = orig->finalize;
+
+#if defined(__CYGWIN__) || !defined(HAVE_WORKING_FORK)
+    if (old_finalize != pipe_finalize) {
+	struct pipe_list *list;
+	for (list = pipe_list; list; list = list->next) {
+	    if (list->fptr == fptr) break;
+	}
+	if (!list) pipe_add_fptr(fptr);
+    }
+    else {
+	pipe_del_fptr(fptr);
+    }
+#endif
+}
+
 void
 rb_io_synchronized(rb_io_t *fptr)
 {
@@ -5731,7 +6500,7 @@ rb_pipe(int *pipes)
 {
     int ret;
     ret = rb_cloexec_pipe(pipes);
-    if (ret == -1) {
+    if (ret < 0) {
         if (rb_gc_for_fd(errno)) {
             ret = rb_cloexec_pipe(pipes);
         }
@@ -5808,9 +6577,9 @@ linux_get_maxfd(void)
     char buf[4096], *p, *np, *e;
     ssize_t ss;
     fd = rb_cloexec_open("/proc/self/status", O_RDONLY|O_NOCTTY, 0);
-    if (fd == -1) return -1;
+    if (fd < 0) return fd;
     ss = read(fd, buf, sizeof(buf));
-    if (ss == -1) goto err;
+    if (ss < 0) goto err;
     p = buf;
     e = buf + ss;
     while ((int)sizeof("FDSize:\t0\n")-1 <= e-p &&
@@ -5829,7 +6598,7 @@ linux_get_maxfd(void)
 
   err:
     close(fd);
-    return -1;
+    return (int)ss;
 }
 #endif
 
@@ -5999,7 +6768,7 @@ pipe_open(VALUE execarg_obj, const char *modestr, int fmode,
 #   if defined(HAVE_SPAWNVE)
 	if (eargp->envp_str) envp = (char **)RSTRING_PTR(eargp->envp_str);
 #   endif
-	while ((pid = DO_SPAWN(cmd, args, envp)) == -1) {
+        while ((pid = DO_SPAWN(cmd, args, envp)) < 0) {
 	    /* exec failed */
 	    switch (e = errno) {
 	      case EAGAIN:
@@ -6032,7 +6801,7 @@ pipe_open(VALUE execarg_obj, const char *modestr, int fmode,
     }
 
     /* parent */
-    if (pid == -1) {
+    if (pid < 0) {
 # if defined(HAVE_WORKING_FORK)
 	e = errno;
 # endif
@@ -6143,7 +6912,7 @@ pipe_open_s(VALUE prog, const char *modestr, int fmode,
     VALUE execarg_obj = Qnil;
 
     if (!is_popen_fork(prog))
-	execarg_obj = rb_execarg_new(argc, argv, TRUE);
+        execarg_obj = rb_execarg_new(argc, argv, TRUE, FALSE);
     return pipe_open(execarg_obj, modestr, fmode, convconfig);
 }
 
@@ -6157,6 +6926,8 @@ pipe_close(VALUE io)
     return Qnil;
 }
 
+static VALUE popen_finish(VALUE port, VALUE klass);
+
 /*
  *  call-seq:
  *     IO.popen([env,] cmd, mode="r" [, opt])               -> io
@@ -6164,7 +6935,7 @@ pipe_close(VALUE io)
  *
  *  Runs the specified command as a subprocess; the subprocess's
  *  standard input and output will be connected to the returned
- *  <code>IO</code> object.
+ *  IO object.
  *
  *  The PID of the started process can be obtained by IO#pid method.
  *
@@ -6182,8 +6953,8 @@ pipe_close(VALUE io)
  *
  *  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 array can contain a hash at first for environments and
+ *  a hash at last for options similar to #spawn.
  *
  *  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.
@@ -6205,21 +6976,19 @@ pipe_close(VALUE io)
  *      ls_result_with_error = ls_io.read
  *    }
  *
- *  Raises exceptions which <code>IO.pipe</code> and
- *  <code>Kernel.spawn</code> raise.
+ *  Raises exceptions which IO.pipe and Kernel.spawn raise.
  *
  *  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 closes the pipe and sets <code>$?</code>.
- *  In this case <code>IO.popen</code> returns
- *  the value of the block.
+ *  In this case IO.popen returns the value of the block.
  *
  *  If a block is given with a _cmd_ 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
+ *  will be passed +nil+, and the child's standard in and
  *  standard out will be connected to the parent through the pipe. Not
  *  available on all platforms.
  *
@@ -6227,7 +6996,7 @@ pipe_close(VALUE io)
  *     p f.readlines
  *     f.close
  *     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.inspect}"}
  *     p $?
  *     IO.popen(%w"sed -e s|^|<foo>| -e s&$&;zot;&", "r+") {|f|
@@ -6248,10 +7017,7 @@ pipe_close(VALUE io)
 static VALUE
 rb_io_s_popen(int argc, VALUE *argv, VALUE klass)
 {
-    const char *modestr;
-    VALUE pname, pmode = Qnil, port, tmp, opt = Qnil, env = Qnil, execarg_obj = Qnil;
-    int oflags, fmode;
-    convconfig_t convconfig;
+    VALUE pname, pmode = Qnil, opt = Qnil, env = Qnil;
 
     if (argc > 1 && !NIL_P(opt = rb_check_hash_type(argv[argc-1]))) --argc;
     if (argc > 1 && !NIL_P(env = rb_check_hash_type(argv[0]))) --argc, ++argv;
@@ -6267,6 +7033,16 @@ rb_io_s_popen(int argc, VALUE *argv, VALUE klass)
 	    rb_error_arity(argc + ex, 1 + ex, 2 + ex);
 	}
     }
+    return popen_finish(rb_io_popen(pname, pmode, env, opt), klass);
+}
+
+VALUE
+rb_io_popen(VALUE pname, VALUE pmode, VALUE env, VALUE opt)
+{
+    const char *modestr;
+    VALUE tmp, execarg_obj = Qnil;
+    int oflags, fmode;
+    convconfig_t convconfig;
 
     tmp = rb_check_array_type(pname);
     if (!NIL_P(tmp)) {
@@ -6276,14 +7052,14 @@ rb_io_s_popen(int argc, VALUE *argv, VALUE klass)
 	    rb_raise(rb_eArgError, "too many arguments");
 	}
 #endif
-	execarg_obj = rb_execarg_new((int)len, RARRAY_CONST_PTR(tmp), FALSE);
+        execarg_obj = rb_execarg_new((int)len, RARRAY_CONST_PTR(tmp), FALSE, FALSE);
 	RB_GC_GUARD(tmp);
     }
     else {
 	SafeStringValue(pname);
 	execarg_obj = Qnil;
 	if (!is_popen_fork(pname))
-	    execarg_obj = rb_execarg_new(1, &pname, TRUE);
+            execarg_obj = rb_execarg_new(1, &pname, TRUE, FALSE);
     }
     if (!NIL_P(execarg_obj)) {
 	if (!NIL_P(opt))
@@ -6294,13 +7070,18 @@ rb_io_s_popen(int argc, VALUE *argv, VALUE klass)
     rb_io_extract_modeenc(&pmode, 0, opt, &oflags, &fmode, &convconfig);
     modestr = rb_io_oflags_modestr(oflags);
 
-    port = pipe_open(execarg_obj, modestr, fmode, &convconfig);
+    return pipe_open(execarg_obj, modestr, fmode, &convconfig);
+}
+
+static VALUE
+popen_finish(VALUE port, VALUE klass)
+{
     if (NIL_P(port)) {
 	/* child */
 	if (rb_block_given_p()) {
 	    rb_yield(Qnil);
-            rb_io_flush(rb_stdout);
-            rb_io_flush(rb_stderr);
+            rb_io_flush(rb_ractor_stdout());
+            rb_io_flush(rb_ractor_stderr());
 	    _exit(0);
 	}
 	return Qnil;
@@ -6358,11 +7139,11 @@ rb_open_file(int argc, const VALUE *argv, VALUE io)
  *     File.open(filename, mode="r" [, opt]) {|file| block } -> obj
  *     File.open(filename [, mode [, perm]] [, opt]) {|file| block } -> obj
  *
- *  With no associated block, <code>File.open</code> is a synonym for
+ *  With no associated block, File.open is a synonym for
  *  File.new. If the optional code block is given, it will
  *  be passed the opened +file+ as an argument and the File object will
  *  automatically be closed when the block terminates.  The value of the block
- *  will be returned from <code>File.open</code>.
+ *  will be returned from File.open.
  *
  *  If a file is being created, its initial permissions may be set using the
  *  +perm+ parameter.  See File.new for further discussion.
@@ -6375,9 +7156,9 @@ rb_open_file(int argc, const VALUE *argv, VALUE io)
  *
  *  call-seq:
  *     IO.open(fd, mode="r" [, opt])                -> io
- *     IO.open(fd, mode="r" [, opt]) { |io| block } -> obj
+ *     IO.open(fd, mode="r" [, opt]) {|io| block }  -> obj
  *
- *  With no associated block, <code>IO.open</code> is a synonym for IO.new.  If
+ *  With no associated block, IO.open is a synonym for IO.new.  If
  *  the optional code block is given, it will be passed +io+ as an argument,
  *  and the IO object will automatically be closed when the block terminates.
  *  In this instance, IO.open returns the value of the block.
@@ -6388,7 +7169,7 @@ rb_open_file(int argc, const VALUE *argv, VALUE io)
 static VALUE
 rb_io_s_open(int argc, VALUE *argv, VALUE klass)
 {
-    VALUE io = rb_class_new_instance(argc, argv, klass);
+    VALUE io = rb_class_new_instance_kw(argc, argv, klass, RB_PASS_CALLED_KEYWORDS);
 
     if (rb_block_given_p()) {
 	return rb_ensure(rb_yield, io, io_close, io);
@@ -6399,16 +7180,16 @@ rb_io_s_open(int argc, VALUE *argv, VALUE klass)
 
 /*
  *  call-seq:
- *     IO.sysopen(path, [mode, [perm]])  -> fixnum
+ *     IO.sysopen(path, [mode, [perm]])  -> integer
  *
  *  Opens the given path, returning the underlying file descriptor as a
- *  <code>Fixnum</code>.
+ *  Integer.
  *
  *     IO.sysopen("testfile")   #=> 3
  */
 
 static VALUE
-rb_io_s_sysopen(int argc, VALUE *argv)
+rb_io_s_sysopen(int argc, VALUE *argv, VALUE _)
 {
     VALUE fname, vmode, vperm;
     VALUE intmode;
@@ -6444,7 +7225,6 @@ check_pipe_command(VALUE filename_or_command)
 
     if (rb_enc_ascget(s, e, &chlen, rb_enc_get(filename_or_command)) == '|') {
         VALUE cmd = rb_str_new(s+chlen, l-chlen);
-        OBJ_INFECT(cmd, filename_or_command);
         return cmd;
     }
     return Qnil;
@@ -6487,7 +7267,7 @@ check_pipe_command(VALUE filename_or_command)
  *  parent.  If the command is not <code>"-"</code>, the subprocess runs the
  *  command.
  *
- *  When the subprocess is ruby (opened via <code>"|-"</code>), the +open+
+ *  When the subprocess is Ruby (opened via <code>"|-"</code>), the +open+
  *  call returns +nil+.  If a block is associated with the open call, that
  *  block will run twice --- once in the parent and once in the child.
  *
@@ -6520,7 +7300,7 @@ check_pipe_command(VALUE filename_or_command)
  *  Open a subprocess running the same Ruby program:
  *
  *     f = open("|-", "w+")
- *     if f == nil
+ *     if f.nil?
  *       puts "in Child"
  *       exit
  *     else
@@ -6549,7 +7329,7 @@ check_pipe_command(VALUE filename_or_command)
  */
 
 static VALUE
-rb_f_open(int argc, VALUE *argv)
+rb_f_open(int argc, VALUE *argv, VALUE _)
 {
     ID to_open = 0;
     int redirect = FALSE;
@@ -6575,7 +7355,7 @@ rb_f_open(int argc, VALUE *argv)
 	}
     }
     if (redirect) {
-	VALUE io = rb_funcall2(argv[0], to_open, argc-1, argv+1);
+        VALUE io = rb_funcallv_kw(argv[0], to_open, argc-1, argv+1, RB_PASS_CALLED_KEYWORDS);
 
 	if (rb_block_given_p()) {
 	    return rb_ensure(rb_yield, io, io_close, io);
@@ -6585,10 +7365,10 @@ rb_f_open(int argc, VALUE *argv)
     return rb_io_s_open(argc, argv, rb_cFile);
 }
 
-static VALUE rb_io_open_generic(VALUE, int, int, const convconfig_t *, mode_t);
+static VALUE rb_io_open_generic(VALUE, VALUE, int, int, const convconfig_t *, mode_t);
 
 static VALUE
-rb_io_open(VALUE filename, VALUE vmode, VALUE vperm, VALUE opt)
+rb_io_open(VALUE io, VALUE filename, VALUE vmode, VALUE vperm, VALUE opt)
 {
     int oflags, fmode;
     convconfig_t convconfig;
@@ -6596,34 +7376,24 @@ rb_io_open(VALUE filename, VALUE vmode, VALUE vperm, VALUE opt)
 
     rb_io_extract_modeenc(&vmode, &vperm, opt, &oflags, &fmode, &convconfig);
     perm = NIL_P(vperm) ? 0666 :  NUM2MODET(vperm);
-    return rb_io_open_generic(filename, oflags, fmode, &convconfig, perm);
+    return rb_io_open_generic(io, filename, oflags, fmode, &convconfig, perm);
 }
 
 static VALUE
-rb_io_open_generic(VALUE filename, int oflags, int fmode,
+rb_io_open_generic(VALUE klass, VALUE filename, int oflags, int fmode,
 		   const convconfig_t *convconfig, mode_t perm)
 {
     VALUE cmd;
-    if (!NIL_P(cmd = check_pipe_command(filename))) {
+    if (klass == rb_cIO && !NIL_P(cmd = check_pipe_command(filename))) {
 	return pipe_open_s(cmd, rb_io_oflags_modestr(oflags), fmode, convconfig);
     }
     else {
-        return rb_file_open_generic(io_alloc(rb_cFile), filename,
+	return rb_file_open_generic(io_alloc(klass), filename,
 				    oflags, fmode, convconfig, perm);
     }
 }
 
 static VALUE
-rb_io_open_with_args(int argc, const VALUE *argv)
-{
-    VALUE io;
-
-    io = io_alloc(rb_cFile);
-    rb_open_file(argc, argv, io);
-    return io;
-}
-
-static VALUE
 io_reopen(VALUE io, VALUE nfile)
 {
     rb_io_t *fptr, *orig;
@@ -6647,17 +7417,17 @@ io_reopen(VALUE io, VALUE nfile)
     }
     if (fptr->mode & FMODE_WRITABLE) {
         if (io_fflush(fptr) < 0)
-            rb_sys_fail(0);
+            rb_sys_fail_on_write(fptr);
     }
     else {
-	io_tell(fptr);
+        flush_before_seek(fptr);
     }
     if (orig->mode & FMODE_READABLE) {
 	pos = io_tell(orig);
     }
     if (orig->mode & FMODE_WRITABLE) {
         if (io_fflush(orig) < 0)
-            rb_sys_fail(0);
+            rb_sys_fail_on_write(fptr);
     }
 
     /* copy rb_io_t structure */
@@ -6666,11 +7436,7 @@ io_reopen(VALUE io, VALUE nfile)
     fptr->lineno = orig->lineno;
     if (RTEST(orig->pathv)) fptr->pathv = orig->pathv;
     else if (!IS_PREP_STDIO(fptr)) fptr->pathv = Qnil;
-    fptr->finalize = orig->finalize;
-#if defined (__CYGWIN__) || !defined(HAVE_WORKING_FORK)
-    if (fptr->finalize == pipe_finalize)
-	pipe_add_fptr(fptr);
-#endif
+    fptr_copy_finalizer(fptr, orig);
 
     fd = fptr->fd;
     fd2 = orig->fd;
@@ -6725,12 +7491,13 @@ rb_freopen(VALUE fname, const char *mode, FILE *fp)
 
 /*
  *  call-seq:
- *     ios.reopen(other_IO)         -> ios
- *     ios.reopen(path, mode_str)   -> ios
+ *     ios.reopen(other_IO)             -> ios
+ *     ios.reopen(path, mode [, opt])   -> 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.
+ *  The +mode+ and +opt+ parameters accept the same values as IO.open.
  *
  *     f1 = File.new("testfile")
  *     f2 = File.new("testfile")
@@ -6789,7 +7556,7 @@ rb_io_reopen(int argc, VALUE *argv, VALUE file)
 
     if (fptr->mode & FMODE_WRITABLE) {
         if (io_fflush(fptr) < 0)
-            rb_sys_fail(0);
+            rb_sys_fail_on_write(fptr);
     }
     fptr->rbuf.off = fptr->rbuf.len = 0;
 
@@ -6797,7 +7564,7 @@ rb_io_reopen(int argc, VALUE *argv, VALUE file)
 	int e = rb_freopen(rb_str_encode_ospath(fptr->pathv),
 			   rb_io_oflags_modestr(oflags),
 			   fptr->stdio_file);
-	if (e) rb_syserr_fail_path(e, fptr->pathv);
+        if (e) rb_syserr_fail_path(e, fptr->pathv);
         fptr->fd = fileno(fptr->stdio_file);
         rb_fd_fix_cloexec(fptr->fd);
 #ifdef USE_SETVBUF
@@ -6849,11 +7616,7 @@ rb_io_init_copy(VALUE dest, VALUE io)
     fptr->pid = orig->pid;
     fptr->lineno = orig->lineno;
     if (!NIL_P(orig->pathv)) fptr->pathv = orig->pathv;
-    fptr->finalize = orig->finalize;
-#if defined (__CYGWIN__) || !defined(HAVE_WORKING_FORK)
-    if (fptr->finalize == pipe_finalize)
-	pipe_add_fptr(fptr);
-#endif
+    fptr_copy_finalizer(fptr, orig);
 
     fd = ruby_dup(orig->fd);
     fptr->fd = fd;
@@ -6879,8 +7642,7 @@ rb_io_init_copy(VALUE dest, VALUE io)
  *     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.
+ *  control of the format string. See Kernel#sprintf for details.
  */
 
 VALUE
@@ -6902,13 +7664,13 @@ rb_io_printf(int argc, const VALUE *argv, VALUE out)
  */
 
 static VALUE
-rb_f_printf(int argc, VALUE *argv)
+rb_f_printf(int argc, VALUE *argv, VALUE _)
 {
     VALUE out;
 
     if (argc == 0) return Qnil;
     if (RB_TYPE_P(argv[0], T_STRING)) {
-	out = rb_stdout;
+	out = rb_ractor_stdout();
     }
     else {
 	out = argv[0];
@@ -6920,20 +7682,32 @@ rb_f_printf(int argc, VALUE *argv)
     return Qnil;
 }
 
+static void
+deprecated_str_setter(VALUE val, ID id, VALUE *var)
+{
+    rb_str_setter(val, id, &val);
+    if (!NIL_P(val)) {
+        rb_warn_deprecated("`%s'", NULL, rb_id2name(id));
+    }
+    *var = val;
+}
+
 /*
  *  call-seq:
- *     ios.print()             -> nil
+ *     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 field separator (<code>$,</code>)
- *  is not <code>nil</code>, it will be inserted between each object.
- *  If the output record separator (<code>$\\</code>)
- *  is not <code>nil</code>, it will be 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.
- *  With no argument, prints the contents of the variable <code>$_</code>.
- *  Returns <code>nil</code>.
+ *  Writes the given object(s) to <em>ios</em>. Returns +nil+.
+ *
+ *  The stream must be opened for writing.
+ *  Each given object that isn't a string will be converted by calling
+ *  its <code>to_s</code> method.
+ *  When called without arguments, prints the contents of <code>$_</code>.
+ *
+ *  If the output field separator (<code>$,</code>) is not +nil+,
+ *  it is inserted between objects.
+ *  If the output record separator (<code>$\\</code>) is not +nil+,
+ *  it is appended to the output.
  *
  *     $stdout.print("This is ", 100, " percent.\n")
  *
@@ -6954,6 +7728,9 @@ rb_io_print(int argc, const VALUE *argv, VALUE out)
 	line = rb_lastline_get();
 	argv = &line;
     }
+    if (argc > 1 && !NIL_P(rb_output_fs)) {
+        rb_category_warn(RB_WARN_CATEGORY_DEPRECATED, "$, is set to non-nil value");
+    }
     for (i=0; i<argc; i++) {
 	if (!NIL_P(rb_output_fs) && i>0) {
 	    rb_io_write(out, rb_output_fs);
@@ -6991,9 +7768,9 @@ rb_io_print(int argc, const VALUE *argv, VALUE out)
  */
 
 static VALUE
-rb_f_print(int argc, const VALUE *argv)
+rb_f_print(int argc, const VALUE *argv, VALUE _)
 {
-    rb_io_print(argc, argv, rb_stdout);
+    rb_io_print(argc, argv, rb_ractor_stdout());
     return Qnil;
 }
 
@@ -7001,11 +7778,10 @@ rb_f_print(int argc, const VALUE *argv)
  *  call-seq:
  *     ios.putc(obj)    -> obj
  *
- *  If <i>obj</i> is <code>Numeric</code>, write the character whose code is
- *  the least-significant byte of <i>obj</i>, otherwise write the first byte
- *  of the string representation of <i>obj</i> to <em>ios</em>. Note: This
- *  method is not safe for use with multi-byte characters as it will truncate
- *  them.
+ *  If <i>obj</i> is Numeric, write the character whose code is the
+ *  least-significant byte of <i>obj</i>.  If <i>obj</i> is String,
+ *  write the first character of <i>obj</i> to <em>ios</em>.  Otherwise,
+ *  raise TypeError.
  *
  *     $stdout.putc "A"
  *     $stdout.putc 65
@@ -7038,22 +7814,23 @@ rb_io_putc(VALUE io, VALUE ch)
  *
  *    $stdout.putc(int)
  *
- * Refer to the documentation for IO#putc for important information regarding
- * multi-byte characters.
+ *  Refer to the documentation for IO#putc for important information regarding
+ *  multi-byte characters.
  */
 
 static VALUE
 rb_f_putc(VALUE recv, VALUE ch)
 {
-    if (recv == rb_stdout) {
+    VALUE r_stdout = rb_ractor_stdout();
+    if (recv == r_stdout) {
 	return rb_io_putc(recv, ch);
     }
-    return rb_funcall2(rb_stdout, rb_intern("putc"), 1, &ch);
+    return rb_funcallv(r_stdout, rb_intern("putc"), 1, &ch);
 }
 
 
-static int
-str_end_with_asciichar(VALUE str, int c)
+int
+rb_str_end_with_asciichar(VALUE str, int c)
 {
     long len = RSTRING_LEN(str);
     const char *ptr = RSTRING_PTR(str);
@@ -7091,13 +7868,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.
+ *  Writes the given object(s) to <em>ios</em>.
+ *  Writes a newline after any that do not already end
+ *  with a newline sequence. Returns +nil+.
+ *
+ *  The stream must be opened for writing.
  *  If called with an array argument, writes each element on a new line.
- *  If called without arguments, outputs a single record separator.
+ *  Each given object that isn't a string or array will be converted
+ *  by calling its +to_s+ method.
+ *  If called without arguments, outputs a single newline.
  *
- *     $stdout.puts("this", "is", "a", "test")
+ *     $stdout.puts("this", "is", ["a", "test"])
  *
  *  <em>produces:</em>
  *
@@ -7105,13 +7886,16 @@ io_puts_ary(VALUE ary, VALUE out, int recur)
  *     is
  *     a
  *     test
+ *
+ *  Note that +puts+ always uses newlines and is not affected
+ *  by the output record separator (<code>$\\</code>).
  */
 
 VALUE
 rb_io_puts(int argc, const VALUE *argv, VALUE out)
 {
-    int i;
-    VALUE line;
+    int i, n;
+    VALUE line, args[2];
 
     /* if no argument given, print newline. */
     if (argc == 0) {
@@ -7128,11 +7912,13 @@ rb_io_puts(int argc, const VALUE *argv, VALUE out)
 	}
 	line = rb_obj_as_string(argv[i]);
       string:
-	rb_io_write(out, line);
+	n = 0;
+	args[n++] = line;
 	if (RSTRING_LEN(line) == 0 ||
-            !str_end_with_asciichar(line, '\n')) {
-	    rb_io_write(out, rb_default_rs);
+            !rb_str_end_with_asciichar(line, '\n')) {
+	    args[n++] = rb_default_rs;
 	}
+	rb_io_writev(out, n, args);
     }
 
     return Qnil;
@@ -7150,52 +7936,50 @@ rb_io_puts(int argc, const VALUE *argv, VALUE out)
 static VALUE
 rb_f_puts(int argc, VALUE *argv, VALUE recv)
 {
-    if (recv == rb_stdout) {
+    VALUE r_stdout = rb_ractor_stdout();
+    if (recv == r_stdout) {
 	return rb_io_puts(argc, argv, recv);
     }
-    return rb_funcall2(rb_stdout, rb_intern("puts"), argc, argv);
+    return rb_funcallv(r_stdout, rb_intern("puts"), argc, argv);
 }
 
-void
-rb_p(VALUE obj) /* for debug print within C code */
+static VALUE
+rb_p_write(VALUE str)
 {
-    VALUE str = rb_obj_as_string(rb_inspect(obj));
-    if (RB_TYPE_P(rb_stdout, T_FILE) &&
-        rb_method_basic_definition_p(CLASS_OF(rb_stdout), id_write)) {
-        io_write(rb_stdout, str, 1);
-        io_write(rb_stdout, rb_default_rs, 0);
+    VALUE args[2];
+    args[0] = str;
+    args[1] = rb_default_rs;
+    VALUE r_stdout = rb_ractor_stdout();
+    if (RB_TYPE_P(r_stdout, T_FILE) &&
+        rb_method_basic_definition_p(CLASS_OF(r_stdout), id_write)) {
+	io_writev(2, args, r_stdout);
     }
     else {
-        rb_io_write(rb_stdout, str);
-        rb_io_write(rb_stdout, rb_default_rs);
+	rb_io_writev(r_stdout, 2, args);
     }
+    return Qnil;
 }
 
-struct rb_f_p_arg {
-    int argc;
-    VALUE *argv;
-};
+void
+rb_p(VALUE obj) /* for debug print within C code */
+{
+    rb_p_write(rb_obj_as_string(rb_inspect(obj)));
+}
 
 static VALUE
-rb_f_p_internal(VALUE arg)
+rb_p_result(int argc, const VALUE *argv)
 {
-    struct rb_f_p_arg *arg1 = (struct rb_f_p_arg*)arg;
-    int argc = arg1->argc;
-    VALUE *argv = arg1->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 (RB_TYPE_P(rb_stdout, T_FILE)) {
-	rb_io_flush(rb_stdout);
+    VALUE r_stdout = rb_ractor_stdout();
+    if (RB_TYPE_P(r_stdout, T_FILE)) {
+	rb_io_flush(r_stdout);
     }
     return ret;
 }
@@ -7221,11 +8005,12 @@ rb_f_p_internal(VALUE arg)
 static VALUE
 rb_f_p(int argc, VALUE *argv, VALUE self)
 {
-    struct rb_f_p_arg arg;
-    arg.argc = argc;
-    arg.argv = argv;
-
-    return rb_uninterruptible(rb_f_p_internal, (VALUE)&arg);
+    int i;
+    for (i=0; i<argc; i++) {
+        VALUE inspected = rb_obj_as_string(rb_inspect(argv[i]));
+        rb_uninterruptible(rb_p_write, inspected);
+    }
+    return rb_p_result(argc, argv);
 }
 
 /*
@@ -7237,6 +8022,7 @@ rb_f_p(int argc, VALUE *argv, VALUE self)
  *
  *     def display(port=$>)
  *       port.write self
+ *       nil
  *     end
  *
  *  For example:
@@ -7256,28 +8042,34 @@ rb_obj_display(int argc, VALUE *argv, VALUE self)
 {
     VALUE out;
 
-    if (argc == 0) {
-	out = rb_stdout;
-    }
-    else {
-	rb_scan_args(argc, argv, "01", &out);
-    }
+    out = (!rb_check_arity(argc, 0, 1) ? rb_ractor_stdout() : argv[0]);
     rb_io_write(out, self);
 
     return Qnil;
 }
 
+static int
+rb_stderr_to_original_p(void)
+{
+    return (rb_ractor_stderr() == orig_stderr || RFILE(orig_stderr)->fptr->fd < 0);
+}
+
 void
 rb_write_error2(const char *mesg, long len)
 {
-    if (rb_stderr == orig_stderr || RFILE(orig_stderr)->fptr->fd < 0) {
+    if (rb_stderr_to_original_p()) {
+#ifdef _WIN32
+	if (isatty(fileno(stderr))) {
+	    if (rb_w32_write_console(rb_str_new(mesg, len), fileno(stderr)) > 0) return;
+	}
+#endif
 	if (fwrite(mesg, sizeof(char), (size_t)len, stderr) < (size_t)len) {
 	    /* failed to write to stderr, what can we do? */
 	    return;
 	}
     }
     else {
-	rb_io_write(rb_stderr, rb_str_new(mesg, len));
+	rb_io_write(rb_ractor_stderr(), rb_str_new(mesg, len));
     }
 }
 
@@ -7291,7 +8083,7 @@ void
 rb_write_error_str(VALUE mesg)
 {
     /* a stopgap measure for the time being */
-    if (rb_stderr == orig_stderr || RFILE(orig_stderr)->fptr->fd < 0) {
+    if (rb_stderr_to_original_p()) {
 	size_t len = (size_t)RSTRING_LEN(mesg);
 #ifdef _WIN32
 	if (isatty(fileno(stderr))) {
@@ -7305,10 +8097,18 @@ rb_write_error_str(VALUE mesg)
     }
     else {
 	/* may unlock GVL, and  */
-	rb_io_write(rb_stderr, mesg);
+	rb_io_write(rb_ractor_stderr(), mesg);
     }
 }
 
+int
+rb_stderr_tty_p(void)
+{
+    if (rb_stderr_to_original_p())
+	return isatty(fileno(stderr));
+    return 0;
+}
+
 static void
 must_respond_to(ID mid, VALUE val, ID id)
 {
@@ -7320,10 +8120,41 @@ must_respond_to(ID mid, VALUE val, ID id)
 }
 
 static void
-stdout_setter(VALUE val, ID id, VALUE *variable)
+stdin_setter(VALUE val, ID id, VALUE *ptr)
+{
+    rb_ractor_stdin_set(val);
+}
+
+static VALUE
+stdin_getter(ID id, VALUE *ptr)
+{
+    return rb_ractor_stdin();
+}
+
+static void
+stdout_setter(VALUE val, ID id, VALUE *ptr)
+{
+    must_respond_to(id_write, val, id);
+    rb_ractor_stdout_set(val);
+}
+
+static VALUE
+stdout_getter(ID id, VALUE *ptr)
+{
+    return rb_ractor_stdout();
+}
+
+static void
+stderr_setter(VALUE val, ID id, VALUE *ptr)
 {
     must_respond_to(id_write, val, id);
-    *variable = val;
+    rb_ractor_stderr_set(val);
+}
+
+static VALUE
+stderr_getter(ID id, VALUE *ptr)
+{
+    return rb_ractor_stderr();
 }
 
 static VALUE
@@ -7333,15 +8164,15 @@ prep_io(int fd, int fmode, VALUE klass, const char *path)
     VALUE io = io_alloc(klass);
 
     MakeOpenFile(io, fp);
+    fp->self = io;
     fp->fd = fd;
+    fp->mode = fmode;
+    if (!io_check_tty(fp)) {
 #ifdef __CYGWIN__
-    if (!isatty(fd)) {
-        fmode |= FMODE_BINMODE;
+	fp->mode |= FMODE_BINMODE;
 	setmode(fd, O_BINARY);
-    }
 #endif
-    fp->mode = fmode;
-    io_check_tty(fp);
+    }
     if (path) fp->pathv = rb_obj_freeze(rb_str_new_cstr(path));
     rb_update_max_fd(fd);
 
@@ -7376,11 +8207,29 @@ prep_stdio(FILE *f, int fmode, VALUE klass, const char *path)
     return io;
 }
 
+VALUE
+rb_io_prep_stdin(void)
+{
+    return prep_stdio(stdin,  FMODE_READABLE, rb_cIO, "<STDIN>");
+}
+
+VALUE
+rb_io_prep_stdout(void)
+{
+    return prep_stdio(stdout, FMODE_WRITABLE|FMODE_SIGNAL_ON_EPIPE, rb_cIO, "<STDOUT>");
+}
+
+VALUE
+rb_io_prep_stderr(void)
+{
+    return prep_stdio(stderr, FMODE_WRITABLE|FMODE_SYNC, rb_cIO, "<STDERR>");
+}
+
 FILE *
 rb_io_stdio_file(rb_io_t *fptr)
 {
     if (!fptr->stdio_file) {
-        int oflags = rb_io_fmode_oflags(fptr->mode);
+        int oflags = rb_io_fmode_oflags(fptr->mode) & ~O_EXCL;
         fptr->stdio_file = rb_fdopen(fptr->fd, rb_io_oflags_modestr(oflags));
     }
     return fptr->stdio_file;
@@ -7399,6 +8248,7 @@ static inline rb_io_t *
 rb_io_fptr_new(void)
 {
     rb_io_t *fp = ALLOC(rb_io_t);
+    fp->self = Qnil;
     fp->fd = -1;
     fp->stdio_file = NULL;
     fp->mode = 0;
@@ -7431,11 +8281,12 @@ rb_io_make_open_file(VALUE obj)
 
     Check_Type(obj, T_FILE);
     if (RFILE(obj)->fptr) {
-	rb_io_close(obj);
-	rb_io_fptr_finalize(RFILE(obj)->fptr);
-	RFILE(obj)->fptr = 0;
+        rb_io_close(obj);
+        rb_io_fptr_finalize(RFILE(obj)->fptr);
+        RFILE(obj)->fptr = 0;
     }
     fp = rb_io_fptr_new();
+    fp->self = obj;
     RFILE(obj)->fptr = fp;
     return fp;
 }
@@ -7454,8 +8305,8 @@ rb_io_make_open_file(VALUE obj)
  *  === Open Mode
  *
  *  When +mode+ is an integer it must be combination of the modes defined in
- *  File::Constants (+File::RDONLY+, +File::WRONLY | File::CREAT+).  See the
- *  open(2) man page for more information.
+ *  File::Constants (+File::RDONLY+, <code>File::WRONLY|File::CREAT</code>).
+ *  See the open(2) man page for more information.
  *
  *  When +mode+ is a string it must be in one of the following forms:
  *
@@ -7498,6 +8349,10 @@ rb_io_make_open_file(VALUE obj)
  *
  *  	"t"  Text file mode
  *
+ *  The exclusive access mode ("x") can be used together with "w" to ensure
+ *  the file is created. Errno::EEXIST is raised when it already exists.
+ *  It may not be supported with all kinds of streams (e.g. pipes).
+ *
  *  When the open mode of original IO is read only, the mode cannot be
  *  changed to be writable.  Similarly, the open mode cannot be changed from
  *  write only to readable.
@@ -7516,7 +8371,7 @@ rb_io_make_open_file(VALUE obj)
  *  converted from +int_enc+ to +ext_enc+ upon output.  See Encoding for
  *  further details of transcoding on input and output.
  *
- *  If "BOM|UTF-8", "BOM|UTF-16LE" or "BOM|UTF16-BE" are used, ruby checks for
+ *  If "BOM|UTF-8", "BOM|UTF-16LE" or "BOM|UTF16-BE" are used, Ruby checks for
  *  a Unicode BOM in the input document to help determine the encoding.  For
  *  UTF-16 encodings the file open mode must be binary.  When present, the BOM
  *  is stripped and the external encoding from the BOM is used.  When the BOM
@@ -7536,14 +8391,13 @@ rb_io_make_open_file(VALUE obj)
  *    If +mode+ parameter is given, this parameter will be bitwise-ORed.
  *
  *  :\external_encoding ::
- *    External encoding for the IO.  "-" is a synonym for the default external
- *    encoding.
+ *    External encoding for the IO.
  *
  *  :\internal_encoding ::
  *    Internal encoding for the IO.  "-" is a synonym for the default internal
  *    encoding.
  *
- *    If the value is nil no conversion occurs.
+ *    If the value is +nil+ no conversion occurs.
  *
  *  :encoding ::
  *    Specifies external and internal encodings as "extern:intern".
@@ -7587,7 +8441,7 @@ rb_io_make_open_file(VALUE obj)
  *    io.puts "Hello, World!"
  *
  *  Both of above print "Hello, World!" in UTF-16LE to standard error output
- *  with converting EOL generated by <code>puts</code> to CR.
+ *  with converting EOL generated by #puts to CR.
  */
 
 static VALUE
@@ -7616,7 +8470,7 @@ rb_io_initialize(int argc, VALUE *argv, VALUE io)
     oflags = fcntl(fd, F_GETFL);
     if (oflags == -1) rb_sys_fail(0);
 #else
-    if (fstat(fd, &st) == -1) rb_sys_fail(0);
+    if (fstat(fd, &st) < 0) rb_sys_fail(0);
 #endif
     rb_update_max_fd(fd);
 #if defined(HAVE_FCNTL) && defined(F_GETFL)
@@ -7633,6 +8487,7 @@ rb_io_initialize(int argc, VALUE *argv, VALUE io)
 	fmode |= FMODE_PREP;
     }
     MakeOpenFile(io, fp);
+    fp->self = io;
     fp->fd = fd;
     fp->mode = fmode;
     fp->encs = convconfig;
@@ -7651,6 +8506,44 @@ rb_io_initialize(int argc, VALUE *argv, VALUE io)
 
 /*
  *  call-seq:
+ *     ios.set_encoding_by_bom   -> encoding or nil
+ *
+ *  Checks if +ios+ starts with a BOM, and then consumes it and sets
+ *  the external encoding.  Returns the result encoding if found, or
+ *  nil.  If +ios+ is not binmode or its encoding has been set
+ *  already, an exception will be raised.
+ *
+ *    File.write("bom.txt", "\u{FEFF}abc")
+ *    ios = File.open("bom.txt", "rb")
+ *    ios.set_encoding_by_bom    #=>  #<Encoding:UTF-8>
+ *
+ *    File.write("nobom.txt", "abc")
+ *    ios = File.open("nobom.txt", "rb")
+ *    ios.set_encoding_by_bom    #=>  nil
+ */
+
+static VALUE
+rb_io_set_encoding_by_bom(VALUE io)
+{
+    rb_io_t *fptr;
+
+    GetOpenFile(io, fptr);
+    if (!(fptr->mode & FMODE_BINMODE)) {
+        rb_raise(rb_eArgError, "ASCII incompatible encoding needs binmode");
+    }
+    if (fptr->encs.enc2) {
+        rb_raise(rb_eArgError, "encoding conversion is set");
+    }
+    else if (fptr->encs.enc && fptr->encs.enc != rb_ascii8bit_encoding()) {
+        rb_raise(rb_eArgError, "encoding is set to %s already",
+                 rb_enc_name(fptr->encs.enc));
+    }
+    if (!io_set_encoding_by_bom(io)) return Qnil;
+    return rb_enc_from_encoding(fptr->encs.enc);
+}
+
+/*
+ *  call-seq:
  *     File.new(filename, mode="r" [, opt])            -> file
  *     File.new(filename [, mode [, perm]] [, opt])    -> file
  *
@@ -7663,6 +8556,10 @@ rb_io_initialize(int argc, VALUE *argv, VALUE io)
  *  mode and permission bits are platform dependent; on Unix systems, see
  *  open(2) and chmod(2) man pages for details.
  *
+ *  The new File object is buffered mode (or non-sync mode), unless
+ *  +filename+ is a tty.
+ *  See IO#flush, IO#fsync, IO#fdatasync, and IO#sync= about sync mode.
+ *
  *  === Examples
  *
  *    f = File.new("testfile", "r")
@@ -7677,7 +8574,7 @@ rb_file_initialize(int argc, VALUE *argv, VALUE io)
 	rb_raise(rb_eRuntimeError, "reinitializing File");
     }
     if (0 < argc && argc < 3) {
-	VALUE fd = rb_check_convert_type(argv[0], T_FIXNUM, "Fixnum", "to_int");
+	VALUE fd = rb_check_to_int(argv[0]);
 
 	if (!NIL_P(fd)) {
 	    argv[0] = fd;
@@ -7699,7 +8596,7 @@ rb_io_s_new(int argc, VALUE *argv, VALUE klass)
 	rb_warn("%"PRIsVALUE"::new() does not take block; use %"PRIsVALUE"::open() instead",
 		cname, cname);
     }
-    return rb_class_new_instance(argc, argv, klass);
+    return rb_class_new_instance_kw(argc, argv, klass, RB_PASS_CALLED_KEYWORDS);
 }
 
 
@@ -7707,7 +8604,7 @@ rb_io_s_new(int argc, VALUE *argv, VALUE klass)
  *  call-seq:
  *     IO.for_fd(fd, mode [, opt])    -> io
  *
- *  Synonym for <code>IO.new</code>.
+ *  Synonym for IO.new.
  *
  */
 
@@ -7744,12 +8641,12 @@ rb_io_autoclose_p(VALUE io)
  *     f = open("/dev/null")
  *     IO.for_fd(f.fileno)
  *     # ...
- *     f.gets # may cause IOError
+ *     f.gets # may cause Errno::EBADF
  *
  *     f = open("/dev/null")
- *     IO.for_fd(f.fileno).autoclose = true
+ *     IO.for_fd(f.fileno).autoclose = false
  *     # ...
- *     f.gets # won't cause IOError
+ *     f.gets # won't cause Errno::EBADF
  */
 
 static VALUE
@@ -7761,7 +8658,7 @@ rb_io_set_autoclose(VALUE io, VALUE autoclose)
 	fptr->mode |= FMODE_PREP;
     else
 	fptr->mode &= ~FMODE_PREP;
-    return io;
+    return autoclose;
 }
 
 static void
@@ -7771,29 +8668,21 @@ argf_mark(void *ptr)
     rb_gc_mark(p->filename);
     rb_gc_mark(p->current_file);
     rb_gc_mark(p->argv);
+    rb_gc_mark(p->inplace);
     rb_gc_mark(p->encs.ecopts);
 }
 
-static void
-argf_free(void *ptr)
-{
-    struct argf *p = ptr;
-    xfree(p->inplace);
-    xfree(p);
-}
-
 static size_t
 argf_memsize(const void *ptr)
 {
     const struct argf *p = ptr;
     size_t size = sizeof(*p);
-    if (p->inplace) size += strlen(p->inplace) + 1;
     return size;
 }
 
 static const rb_data_type_t argf_type = {
     "ARGF",
-    {argf_mark, argf_free, argf_memsize},
+    {argf_mark, RUBY_TYPED_DEFAULT_FREE, argf_memsize},
     0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
@@ -7835,11 +8724,6 @@ argf_initialize_copy(VALUE argf, VALUE orig)
     if (!OBJ_INIT_COPY(argf, orig)) return argf;
     ARGF = argf_of(orig);
     ARGF.argv = rb_obj_dup(ARGF.argv);
-    if (ARGF.inplace) {
-	const char *inplace = ARGF.inplace;
-	ARGF.inplace = 0;
-	ARGF.inplace = ruby_strdup(inplace);
-    }
     return argf;
 }
 
@@ -7871,7 +8755,7 @@ argf_set_lineno(VALUE argf, VALUE val)
 
 /*
  *  call-seq:
- *     ARGF.lineno -> integer
+ *     ARGF.lineno  -> integer
  *
  *  Returns the current line number of ARGF as a whole. This value
  *  can be set manually with +ARGF.lineno=+.
@@ -7914,7 +8798,7 @@ argf_close(VALUE argf)
     if (RB_TYPE_P(file, T_FILE)) {
 	rb_io_set_write_io(file, Qnil);
     }
-    rb_funcall3(file, rb_intern("close"), 0, 0);
+    io_close(file);
     ARGF.init_p = -1;
 }
 
@@ -7926,8 +8810,10 @@ argf_next_argv(VALUE argf)
     int stdout_binmode = 0;
     int fmode;
 
-    if (RB_TYPE_P(rb_stdout, T_FILE)) {
-        GetOpenFile(rb_stdout, fptr);
+    VALUE r_stdout = rb_ractor_stdout();
+
+    if (RB_TYPE_P(r_stdout, T_FILE)) {
+        GetOpenFile(r_stdout, fptr);
         if (fptr->mode & FMODE_BINMODE)
             stdout_binmode = 1;
     }
@@ -7951,11 +8837,13 @@ argf_next_argv(VALUE argf)
     }
 
     if (ARGF.next_p == 1) {
+	if (ARGF.init_p == 1) argf_close(argf);
       retry:
 	if (RARRAY_LEN(ARGF.argv) > 0) {
 	    VALUE filename = rb_ary_shift(ARGF.argv);
-	    StringValueCStr(filename);
-	    ARGF.filename = rb_str_encode_ospath(filename);
+	    FilePathValue(filename);
+	    ARGF.filename = filename;
+	    filename = rb_str_encode_ospath(filename);
 	    fn = StringValueCStr(filename);
 	    if (RSTRING_LEN(filename) == 1 && fn[0] == '-') {
 		ARGF.current_file = rb_stdin;
@@ -7976,15 +8864,19 @@ argf_next_argv(VALUE argf)
 		    VALUE str;
 		    int fw;
 
-		    if (RB_TYPE_P(rb_stdout, T_FILE) && rb_stdout != orig_stdout) {
-			rb_io_close(rb_stdout);
+		    if (RB_TYPE_P(r_stdout, T_FILE) && r_stdout != orig_stdout) {
+			rb_io_close(r_stdout);
 		    }
 		    fstat(fr, &st);
 		    str = filename;
-		    if (*ARGF.inplace) {
+		    if (!NIL_P(ARGF.inplace)) {
+			VALUE suffix = ARGF.inplace;
 			str = rb_str_dup(str);
-			rb_str_cat2(str, ARGF.inplace);
-			/* TODO: encoding of ARGF.inplace */
+			if (NIL_P(rb_str_cat_conv_enc_opts(str, RSTRING_LEN(str),
+							   RSTRING_PTR(suffix), RSTRING_LEN(suffix),
+							   rb_enc_get(suffix), 0, Qnil))) {
+			    rb_str_append(str, suffix);
+			}
 #ifdef NO_SAFE_RENAME
 			(void)close(fr);
 			(void)unlink(RSTRING_PTR(str));
@@ -8042,7 +8934,7 @@ argf_next_argv(VALUE argf)
 		    }
 #endif
 		    write_io = prep_io(fw, FMODE_WRITABLE, rb_cFile, fn);
-		    rb_stdout = write_io;
+		    rb_ractor_stdout_set(write_io);
 		    if (stdout_binmode) rb_io_binmode(rb_stdout);
 		}
 		fmode = FMODE_READABLE;
@@ -8053,6 +8945,7 @@ argf_next_argv(VALUE argf)
 		if (!NIL_P(write_io)) {
 		    rb_io_set_write_io(ARGF.current_file, write_io);
 		}
+		RB_GC_GUARD(filename);
 	    }
 	    if (ARGF.binmode) rb_io_ascii8bit_binmode(ARGF.current_file);
 	    GetOpenFile(ARGF.current_file, fptr);
@@ -8081,7 +8974,7 @@ argf_next_argv(VALUE argf)
 	ARGF.filename = rb_str_new2("-");
 	if (ARGF.inplace) {
 	    rb_warn("Can't do inplace edit for stdio");
-	    rb_stdout = orig_stdout;
+	    rb_ractor_stdout_set(orig_stdout);
 	}
     }
     if (ARGF.init_p == -1) ARGF.init_p = 1;
@@ -8138,9 +9031,9 @@ 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(sep=$/ [, getline_args])     -> string or nil
+ *     gets(limit [, getline_args])      -> string or nil
+ *     gets(sep, limit [, getline_args]) -> 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
@@ -8152,8 +9045,8 @@ static VALUE argf_gets(int, VALUE *, VALUE);
  *  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 in bytes.  If multiple
- *  filenames are present in +ARGV+, +gets(nil)+ will read the contents
- *  one file at a time.
+ *  filenames are present in +ARGV+, <code>gets(nil)</code> will read
+ *  the contents one file at a time.
  *
  *     ARGV << "testfile"
  *     print while gets
@@ -8175,23 +9068,26 @@ rb_f_gets(int argc, VALUE *argv, VALUE recv)
     if (recv == argf) {
 	return argf_gets(argc, argv, argf);
     }
-    return rb_funcall2(argf, idGets, argc, argv);
+    return rb_funcallv(argf, idGets, argc, argv);
 }
 
 /*
  *  call-seq:
- *     ARGF.gets(sep=$/)     -> string or nil
- *     ARGF.gets(limit)      -> string or nil
- *     ARGF.gets(sep, limit) -> string or nil
+ *     ARGF.gets(sep=$/ [, getline_args])     -> string or nil
+ *     ARGF.gets(limit [, getline_args])      -> string or nil
+ *     ARGF.gets(sep, limit [, getline_args]) -> string or nil
  *
  *  Returns the next line from the current file in +ARGF+.
  *
- *  By default lines are assumed to be separated by +$/+; to use a different
- *  character as a separator, supply it as a +String+ for the _sep_ argument.
+ *  By default lines are assumed to be separated by <code>$/</code>;
+ *  to use a different character as a separator, supply it as a +String+
+ *  for the _sep_ argument.
  *
  *  The optional _limit_ argument specifies how many characters of each line
  *  to return. By default all characters are returned.
  *
+ *  See IO.readlines for details about getline_args.
+ *
  */
 static VALUE
 argf_gets(int argc, VALUE *argv, VALUE argf)
@@ -8238,7 +9134,7 @@ static VALUE argf_readline(int, VALUE *, VALUE);
  *     readline(limit)      -> string
  *     readline(sep, limit) -> string
  *
- *  Equivalent to <code>Kernel::gets</code>, except
+ *  Equivalent to Kernel::gets, except
  *  +readline+ raises +EOFError+ at end of file.
  */
 
@@ -8248,7 +9144,7 @@ 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);
+    return rb_funcallv(argf, rb_intern("readline"), argc, argv);
 }
 
 
@@ -8260,10 +9156,11 @@ rb_f_readline(int argc, VALUE *argv, VALUE recv)
  *
  *  Returns the next line from the current file in +ARGF+.
  *
- *  By default lines are assumed to be separated by +$/+; to use a different
- *  character as a separator, supply it as a +String+ for the _sep_ argument.
+ *  By default lines are assumed to be separated by <code>$/</code>;
+ *  to use a different character as a separator, supply it as a +String+
+ *  for the _sep_ argument.
  *
- *  The optional  _limit_ argument specifies how many characters of each line
+ *  The optional _limit_ argument specifies how many characters of each line
  *  to return. By default all characters are returned.
  *
  *  An +EOFError+ is raised at the end of the file.
@@ -8287,9 +9184,9 @@ static VALUE argf_readlines(int, VALUE *, VALUE);
 
 /*
  *  call-seq:
- *     readlines(sep=$/)    -> array
- *     readlines(limit)     -> array
- *     readlines(sep,limit) -> array
+ *     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.
@@ -8301,7 +9198,7 @@ rb_f_readlines(int argc, VALUE *argv, VALUE recv)
     if (recv == argf) {
 	return argf_readlines(argc, argv, argf);
     }
-    return rb_funcall2(argf, rb_intern("readlines"), argc, argv);
+    return rb_funcallv(argf, rb_intern("readlines"), argc, argv);
 }
 
 /*
@@ -8373,6 +9270,7 @@ rb_f_backquote(VALUE obj, VALUE str)
     GetOpenFile(port, fptr);
     result = read_all(fptr, remain_size(fptr), Qnil);
     rb_io_close(port);
+    RFILE(port)->fptr = NULL;
     rb_io_fptr_finalize(fptr);
     rb_gc_force_recycle(port); /* also guards from premature GC */
 
@@ -8669,17 +9567,17 @@ advice_arg_check(VALUE advice)
  *
  *  If an error occurs, one of the following exceptions will be raised:
  *
- *  <code>IOError</code>:: The <code>IO</code> stream is closed.
- *  <code>Errno::EBADF</code>::
+ *  IOError:: The IO stream is closed.
+ *  Errno::EBADF::
  *    The file descriptor of the current file is invalid.
- *  <code>Errno::EINVAL</code>:: An invalid value for _advice_ was given.
- *  <code>Errno::ESPIPE</code>::
+ *  Errno::EINVAL:: An invalid value for _advice_ was given.
+ *  Errno::ESPIPE::
  *    The file descriptor of the current file refers to a FIFO or
- *    pipe. (Linux raises <code>Errno::EINVAL</code> in this case).
- *  <code>TypeError</code>::
+ *    pipe. (Linux raises Errno::EINVAL in this case).
+ *  TypeError::
  *    Either _advice_ was not a Symbol, or one of the
- *    other arguments was not an <code>Integer</code>.
- *  <code>RangeError</code>:: One of the arguments given was too big/small.
+ *    other arguments was not an Integer.
+ *  RangeError:: One of the arguments given was too big/small.
  *
  *  This list is not exhaustive; other Errno:: exceptions are also possible.
  */
@@ -8709,32 +9607,31 @@ rb_io_advise(int argc, VALUE *argv, VALUE io)
 
 /*
  *  call-seq:
- *     IO.select(read_array [, write_array [, error_array [, timeout]]]) -> array  or  nil
+ *     IO.select(read_array [, write_array [, error_array [, timeout]]]) -> array or nil
  *
  *  Calls select(2) system call.
- *  It monitors given arrays of <code>IO</code> objects, waits until one or more
- *  of <code>IO</code> objects are ready for reading, are ready for writing,
- *  and have pending exceptions respectively, and returns an array that
- *  contains arrays of those IO objects.  It will return <code>nil</code>
- *  if optional <i>timeout</i> value is given and no <code>IO</code> object
- *  is ready in <i>timeout</i> seconds.
- *
- *  <code>IO.select</code> peeks the buffer of <code>IO</code> objects for testing readability.
- *  If the <code>IO</code> buffer is not empty,
- *  <code>IO.select</code> immediately notifies readability.
- *  This "peek" only happens for <code>IO</code> objects.
- *  It does not happen for IO-like objects such as OpenSSL::SSL::SSLSocket.
- *
- *  The best way to use <code>IO.select</code> is invoking it
- *  after nonblocking methods such as <code>read_nonblock</code>, <code>write_nonblock</code>, etc.
- *  The methods raise an exception which is extended by
- *  <code>IO::WaitReadable</code> or <code>IO::WaitWritable</code>.
- *  The modules notify how the caller should wait with <code>IO.select</code>.
- *  If <code>IO::WaitReadable</code> is raised, the caller should wait for reading.
- *  If <code>IO::WaitWritable</code> is raised, the caller should wait for writing.
- *
- *  So, blocking read (<code>readpartial</code>) can be emulated using
- *  <code>read_nonblock</code> and <code>IO.select</code> as follows:
+ *  It monitors given arrays of IO objects, waits until one or more of
+ *  IO objects are ready for reading, are ready for writing, and have
+ *  pending exceptions respectively, and returns an array that contains
+ *  arrays of those IO objects.  It will return +nil+ if optional
+ *  <i>timeout</i> value is given and no IO object is ready in
+ *  <i>timeout</i> seconds.
+ *
+ *  IO.select peeks the buffer of IO objects for testing readability.
+ *  If the IO buffer is not empty, IO.select immediately notifies
+ *  readability.  This "peek" only happens for IO objects.  It does not
+ *  happen for IO-like objects such as OpenSSL::SSL::SSLSocket.
+ *
+ *  The best way to use IO.select is invoking it after nonblocking
+ *  methods such as #read_nonblock, #write_nonblock, etc.  The methods
+ *  raise an exception which is extended by IO::WaitReadable or
+ *  IO::WaitWritable.  The modules notify how the caller should wait
+ *  with IO.select.  If IO::WaitReadable is raised, the caller should
+ *  wait for reading.  If IO::WaitWritable is raised, the caller should
+ *  wait for writing.
+ *
+ *  So, blocking read (#readpartial) can be emulated using
+ *  #read_nonblock and IO.select as follows:
  *
  *    begin
  *      result = io_like.read_nonblock(maxlen)
@@ -8746,57 +9643,57 @@ rb_io_advise(int argc, VALUE *argv, VALUE io)
  *      retry
  *    end
  *
- *  Especially, the combination of nonblocking methods and
- *  <code>IO.select</code> is preferred for <code>IO</code> like
- *  objects such as <code>OpenSSL::SSL::SSLSocket</code>.
- *  It has <code>to_io</code> method to return underlying <code>IO</code> object.
- *  <code>IO.select</code> calls <code>to_io</code> to obtain the file descriptor to wait.
+ *  Especially, the combination of nonblocking methods and IO.select is
+ *  preferred for IO like objects such as OpenSSL::SSL::SSLSocket.  It
+ *  has #to_io method to return underlying IO object.  IO.select calls
+ *  #to_io to obtain the file descriptor to wait.
  *
- *  This means that readability notified by <code>IO.select</code> doesn't mean
- *  readability from <code>OpenSSL::SSL::SSLSocket</code> object.
+ *  This means that readability notified by IO.select doesn't mean
+ *  readability from OpenSSL::SSL::SSLSocket object.
  *
- *  The most likely situation is that <code>OpenSSL::SSL::SSLSocket</code> buffers some data.
- *  <code>IO.select</code> doesn't see the buffer.
- *  So <code>IO.select</code> can block when <code>OpenSSL::SSL::SSLSocket#readpartial</code> doesn't block.
+ *  The most likely situation is that OpenSSL::SSL::SSLSocket buffers
+ *  some data.  IO.select doesn't see the buffer.  So IO.select can
+ *  block when OpenSSL::SSL::SSLSocket#readpartial doesn't block.
  *
  *  However, several more complicated situations exist.
  *
  *  SSL is a protocol which is sequence of records.
  *  The record consists of multiple bytes.
- *  So, the remote side of SSL sends a partial record,
- *  <code>IO.select</code> notifies readability but
- *  <code>OpenSSL::SSL::SSLSocket</code> cannot decrypt a byte and
- *  <code>OpenSSL::SSL::SSLSocket#readpartial</code> will blocks.
+ *  So, the remote side of SSL sends a partial record, IO.select
+ *  notifies readability but OpenSSL::SSL::SSLSocket cannot decrypt a
+ *  byte and OpenSSL::SSL::SSLSocket#readpartial will block.
  *
  *  Also, the remote side can request SSL renegotiation which forces
  *  the local SSL engine to write some data.
- *  This means <code>OpenSSL::SSL::SSLSocket#readpartial</code> may
- *  invoke <code>write</code> system call and it can block.
- *  In such a situation, <code>OpenSSL::SSL::SSLSocket#read_nonblock</code>
- *  raises IO::WaitWritable instead of blocking.
- *  So, the caller should wait for ready for writability as above example.
+ *  This means OpenSSL::SSL::SSLSocket#readpartial may invoke #write
+ *  system call and it can block.
+ *  In such a situation, OpenSSL::SSL::SSLSocket#read_nonblock raises
+ *  IO::WaitWritable instead of blocking.
+ *  So, the caller should wait for ready for writability as above
+ *  example.
  *
- *  The combination of nonblocking methods and <code>IO.select</code> is
- *  also useful for streams such as tty, pipe socket socket when
- *  multiple processes read from a stream.
+ *  The combination of nonblocking methods and IO.select is also useful
+ *  for streams such as tty, pipe socket socket when multiple processes
+ *  read from a stream.
  *
  *  Finally, Linux kernel developers don't guarantee that
  *  readability of select(2) means readability of following read(2) even
  *  for a single process.
  *  See select(2) manual on GNU/Linux system.
  *
- *  Invoking <code>IO.select</code> before <code>IO#readpartial</code> works well as usual.
- *  However it is not the best way to use <code>IO.select</code>.
+ *  Invoking IO.select before IO#readpartial works well as usual.
+ *  However it is not the best way to use IO.select.
  *
  *  The writability notified by select(2) doesn't show
- *  how many bytes writable.
- *  <code>IO#write</code> method blocks until given whole string is written.
- *  So, <code>IO#write(two or more bytes)</code> can block after writability is notified by <code>IO.select</code>.
- *  <code>IO#write_nonblock</code> is required to avoid the blocking.
+ *  how many bytes are writable.
+ *  IO#write method blocks until given whole string is written.
+ *  So, <code>IO#write(two or more bytes)</code> can block after
+ *  writability is notified by IO.select.  IO#write_nonblock is required
+ *  to avoid the blocking.
  *
- *  Blocking write (<code>write</code>) can be emulated using
- *  <code>write_nonblock</code> and <code>IO.select</code> as follows:
- *  IO::WaitReadable should also be rescued for SSL renegotiation in <code>OpenSSL::SSL::SSLSocket</code>.
+ *  Blocking write (#write) can be emulated using #write_nonblock and
+ *  IO.select as follows: IO::WaitReadable should also be rescued for
+ *  SSL renegotiation in OpenSSL::SSL::SSLSocket.
  *
  *    while 0 < string.bytesize
  *      begin
@@ -8812,9 +9709,9 @@ rb_io_advise(int argc, VALUE *argv, VALUE io)
  *    end
  *
  *  === Parameters
- *  read_array:: an array of <code>IO</code> objects that wait until ready for read
- *  write_array:: an array of <code>IO</code> objects that wait until ready for write
- *  error_array:: an array of <code>IO</code> objects that wait for exceptions
+ *  read_array:: an array of IO objects that wait until ready for read
+ *  write_array:: an array of IO objects that wait until ready for write
+ *  error_array:: an array of IO objects that wait for exceptions
  *  timeout:: a numeric value in second
  *
  *  === Example
@@ -8871,12 +9768,12 @@ rb_f_select(int argc, VALUE *argv, VALUE obj)
     return rb_ensure(select_call, (VALUE)&args, select_end, (VALUE)&args);
 }
 
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
+#if (defined(__linux__) && !defined(__ANDROID__)) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
  typedef unsigned long ioctl_req_t;
 # define NUM2IOCTLREQ(num) NUM2ULONG(num)
 #else
  typedef int ioctl_req_t;
-# define NUM2IOCTLREQ(num) NUM2INT(num)
+# define NUM2IOCTLREQ(num) ((int)NUM2LONG(num))
 #endif
 
 #ifdef HAVE_IOCTL
@@ -8963,14 +9860,6 @@ typedef long fcntl_arg_t;
 typedef int fcntl_arg_t;
 #endif
 
-#if defined __native_client__ && !defined __GLIBC__
-// struct flock is currently missing the NaCl newlib headers
-// TODO(sbc): remove this once it gets added.
-#undef F_GETLK
-#undef F_SETLK
-#undef F_SETLKW
-#endif
-
 static long
 fcntl_narg_len(int cmd)
 {
@@ -9226,11 +10115,17 @@ do_fcntl(int fd, int cmd, long narg)
     arg.narg = narg;
 
     retval = (int)rb_thread_io_blocking_region(nogvl_fcntl, &arg, fd);
+    if (retval != -1) {
+	switch (cmd) {
 #if defined(F_DUPFD)
-    if (retval != -1 && cmd == F_DUPFD) {
-	rb_update_max_fd(retval);
-    }
+	  case F_DUPFD:
+#endif
+#if defined(F_DUPFD_CLOEXEC)
+	  case F_DUPFD_CLOEXEC:
 #endif
+	    rb_update_max_fd(retval);
+	}
+    }
 
     return retval;
 }
@@ -9267,9 +10162,9 @@ rb_fcntl(VALUE io, VALUE req, VALUE arg)
  *  query file-oriented I/O streams. Arguments and results are platform
  *  dependent. If <i>arg</i> is a number, its value is passed
  *  directly. If it is a string, it is interpreted as a binary sequence
- *  of bytes (<code>Array#pack</code> might be a useful way to build this
- *  string). On Unix platforms, see <code>fcntl(2)</code> for details.
- *  Not implemented on all platforms.
+ *  of bytes (Array#pack might be a useful way to build this string). On
+ *  Unix platforms, see <code>fcntl(2)</code> for details.  Not
+ *  implemented on all platforms.
  */
 
 static VALUE
@@ -9309,17 +10204,18 @@ rb_io_fcntl(int argc, VALUE *argv, VALUE io)
  *
  *     hello
  *
- *
  *  Calling +syscall+ on a platform which does not have any way to
  *  an arbitrary system function just fails with NotImplementedError.
  *
- * Note::
- *   +syscall+ is essentially unsafe and unportable. Feel free to shoot your foot.
- *   DL (Fiddle) library is preferred for safer and a bit more portable programming.
+ *  *Note:*
+ *  +syscall+ is essentially unsafe and unportable.
+ *  Feel free to shoot your foot.
+ *  The DL (Fiddle) library is preferred for safer and a bit
+ *  more portable programming.
  */
 
 static VALUE
-rb_f_syscall(int argc, VALUE *argv)
+rb_f_syscall(int argc, VALUE *argv, VALUE _)
 {
     VALUE arg[8];
 #if SIZEOF_VOIDP == 8 && defined(HAVE___SYSCALL) && SIZEOF_INT != 8 /* mainly *BSD */
@@ -9354,7 +10250,8 @@ rb_f_syscall(int argc, VALUE *argv)
     int i;
 
     if (RTEST(ruby_verbose)) {
-	rb_warning("We plan to remove a syscall function at future release. DL(Fiddle) provides safer alternative.");
+        rb_category_warning(RB_WARN_CATEGORY_DEPRECATED,
+            "We plan to remove a syscall function at future release. DL(Fiddle) provides safer alternative.");
     }
 
     if (argc == 0)
@@ -9522,7 +10419,7 @@ pipe_pair_close(VALUE rw)
  *     IO.pipe(...) {|read_io, write_io| ... }
  *
  *  Creates a pair of pipe endpoints (connected to each other) and
- *  returns them as a two-element array of <code>IO</code> objects:
+ *  returns them as a two-element array of IO objects:
  *  <code>[</code> <i>read_io</i>, <i>write_io</i> <code>]</code>.
  *
  *  If a block is given, the block is called and
@@ -9584,7 +10481,7 @@ rb_io_s_pipe(int argc, VALUE *argv, VALUE klass)
     VALUE ret;
 
     argc = rb_scan_args(argc, argv, "02:", &v1, &v2, &opt);
-    if (rb_pipe(pipes) == -1)
+    if (rb_pipe(pipes) < 0)
         rb_sys_fail(0);
 
     args[0] = klass;
@@ -9621,6 +10518,12 @@ rb_io_s_pipe(int argc, VALUE *argv, VALUE klass)
     rb_io_synchronized(fptr2);
 
     extract_binmode(opt, &fmode);
+
+    if ((fmode & FMODE_BINMODE) && v1 == Qnil) {
+        rb_io_ascii8bit_binmode(r);
+        rb_io_ascii8bit_binmode(w);
+    }
+
 #if DEFAULT_TEXTMODE
     if ((fptr->mode & FMODE_TEXTMODE) && (fmode & FMODE_BINMODE)) {
 	fptr->mode &= ~FMODE_TEXTMODE;
@@ -9658,9 +10561,10 @@ struct foreach_arg {
 };
 
 static void
-open_key_args(int argc, VALUE *argv, VALUE opt, struct foreach_arg *arg)
+open_key_args(VALUE klass, int argc, VALUE *argv, VALUE opt, struct foreach_arg *arg)
 {
     VALUE path, v;
+    VALUE vmode = Qnil, vperm = Qnil;
 
     path = *argv++;
     argc--;
@@ -9669,47 +10573,39 @@ open_key_args(int argc, VALUE *argv, VALUE opt, struct foreach_arg *arg)
     arg->argc = argc;
     arg->argv = argv;
     if (NIL_P(opt)) {
-	arg->io = rb_io_open(path, INT2NUM(O_RDONLY), INT2FIX(0666), Qnil);
-	return;
+	vmode = INT2NUM(O_RDONLY);
+	vperm = INT2FIX(0666);
     }
-    v = rb_hash_aref(opt, sym_open_args);
-    if (!NIL_P(v)) {
-	VALUE args;
-	long n;
+    else if (!NIL_P(v = rb_hash_aref(opt, sym_open_args))) {
+	int n;
 
-	v = rb_convert_type(v, T_ARRAY, "Array", "to_ary");
-	n = RARRAY_LEN(v) + 1;
-#if SIZEOF_LONG > SIZEOF_INT
-	if (n > INT_MAX) {
-	    rb_raise(rb_eArgError, "too many arguments");
-	}
-#endif
-	args = rb_ary_tmp_new(n);
-	rb_ary_push(args, path);
-	rb_ary_concat(args, v);
-	arg->io = rb_io_open_with_args((int)n, RARRAY_CONST_PTR(args));
-	rb_ary_clear(args);	/* prevent from GC */
-	return;
+	v = rb_to_array_type(v);
+	n = RARRAY_LENINT(v);
+	rb_check_arity(n, 0, 3); /* rb_io_open */
+        rb_scan_args_kw(RB_SCAN_ARGS_LAST_HASH_KEYWORDS, n, RARRAY_CONST_PTR(v), "02:", &vmode, &vperm, &opt);
     }
-    arg->io = rb_io_open(path, Qnil, Qnil, opt);
+    arg->io = rb_io_open(klass, path, vmode, vperm, opt);
 }
 
 static VALUE
-io_s_foreach(struct foreach_arg *arg)
+io_s_foreach(VALUE v)
 {
+    struct getline_arg *arg = (void *)v;
     VALUE str;
 
-    while (!NIL_P(str = rb_io_gets_m(arg->argc, arg->argv, arg->io))) {
+    while (!NIL_P(str = rb_io_getline_1(arg->rs, arg->limit, arg->chomp, arg->io))) {
+	rb_lastline_set(str);
 	rb_yield(str);
     }
+    rb_lastline_set(Qnil);
     return Qnil;
 }
 
 /*
  *  call-seq:
- *     IO.foreach(name, sep=$/ [, open_args]) {|line| block }     -> nil
- *     IO.foreach(name, limit [, open_args]) {|line| block }      -> nil
- *     IO.foreach(name, sep, limit [, open_args]) {|line| block } -> nil
+ *     IO.foreach(name, sep=$/ [, getline_args, open_args]) {|line| block }     -> nil
+ *     IO.foreach(name, limit [, getline_args, open_args]) {|line| block }      -> nil
+ *     IO.foreach(name, sep, limit [, getline_args, open_args]) {|line| block } -> nil
  *     IO.foreach(...)                                            -> an_enumerator
  *
  *  Executes the block for every line in the named I/O port, where lines
@@ -9727,7 +10623,8 @@ io_s_foreach(struct foreach_arg *arg)
  *     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.
+ *  See IO.readlines for details about getline_args.
+ *  And see also IO.read for details about open_args.
  *
  */
 
@@ -9737,25 +10634,30 @@ rb_io_s_foreach(int argc, VALUE *argv, VALUE self)
     VALUE opt;
     int orig_argc = argc;
     struct foreach_arg arg;
+    struct getline_arg garg;
 
     argc = rb_scan_args(argc, argv, "13:", NULL, NULL, NULL, NULL, &opt);
     RETURN_ENUMERATOR(self, orig_argc, argv);
-    open_key_args(argc, argv, opt, &arg);
+    extract_getline_args(argc-1, argv+1, &garg);
+    open_key_args(self, argc, argv, opt, &arg);
     if (NIL_P(arg.io)) return Qnil;
-    return rb_ensure(io_s_foreach, (VALUE)&arg, rb_io_close, arg.io);
+    extract_getline_opts(opt, &garg);
+    check_getline_args(&garg.rs, &garg.limit, garg.io = arg.io);
+    return rb_ensure(io_s_foreach, (VALUE)&garg, rb_io_close, arg.io);
 }
 
 static VALUE
-io_s_readlines(struct foreach_arg *arg)
+io_s_readlines(VALUE v)
 {
-    return rb_io_readlines(arg->argc, arg->argv, arg->io);
+    struct getline_arg *arg = (void *)v;
+    return io_readlines(arg, arg->io);
 }
 
 /*
  *  call-seq:
- *     IO.readlines(name, sep=$/ [, open_args])     -> array
- *     IO.readlines(name, limit [, open_args])      -> array
- *     IO.readlines(name, sep, limit [, open_args]) -> array
+ *     IO.readlines(name, sep=$/ [, getline_args, open_args])     -> array
+ *     IO.readlines(name, limit [, getline_args, open_args])      -> array
+ *     IO.readlines(name, sep, limit [, getline_args, open_args]) -> array
  *
  *  Reads the entire file specified by <i>name</i> as individual
  *  lines, and returns those lines in an array. Lines are separated by
@@ -9764,9 +10666,21 @@ io_s_readlines(struct foreach_arg *arg)
  *     a = IO.readlines("testfile")
  *     a[0]   #=> "This is line one\n"
  *
+ *     b = IO.readlines("testfile", chomp: true)
+ *     b[0]   #=> "This is line one"
+ *
  *  If the last argument is a hash, it's the keyword argument to open.
- *  See <code>IO.read</code> for detail.
  *
+ *  === Options for getline
+ *
+ *  The options hash accepts the following keys:
+ *
+ *  :chomp::
+ *    When the optional +chomp+ keyword argument has a true value,
+ *    <code>\n</code>, <code>\r</code>, and <code>\r\n</code>
+ *    will be removed from the end of each line.
+ *
+ *  See also IO.read for details about open_args.
  */
 
 static VALUE
@@ -9774,16 +10688,21 @@ rb_io_s_readlines(int argc, VALUE *argv, VALUE io)
 {
     VALUE opt;
     struct foreach_arg arg;
+    struct getline_arg garg;
 
     argc = rb_scan_args(argc, argv, "13:", NULL, NULL, NULL, NULL, &opt);
-    open_key_args(argc, argv, opt, &arg);
+    extract_getline_args(argc-1, argv+1, &garg);
+    open_key_args(io, argc, argv, opt, &arg);
     if (NIL_P(arg.io)) return Qnil;
-    return rb_ensure(io_s_readlines, (VALUE)&arg, rb_io_close, arg.io);
+    extract_getline_opts(opt, &garg);
+    check_getline_args(&garg.rs, &garg.limit, garg.io = arg.io);
+    return rb_ensure(io_s_readlines, (VALUE)&garg, rb_io_close, arg.io);
 }
 
 static VALUE
-io_s_read(struct foreach_arg *arg)
+io_s_read(VALUE v)
 {
+    struct foreach_arg *arg = (void *)v;
     return io_read(arg->argc, arg->argv, arg->io);
 }
 
@@ -9806,31 +10725,34 @@ seek_before_access(VALUE argp)
  *     IO.read(name, [length [, offset]] [, opt] )   -> string
  *
  *  Opens the file, optionally seeks to the given +offset+, then returns
- *  +length+ bytes (defaulting to the rest of the file).  <code>read</code>
- *  ensures the file is closed before returning.
+ *  +length+ bytes (defaulting to the rest of the file).  #read ensures
+ *  the file is closed before returning.
+ *
+ *  If +name+ starts with a pipe character (<code>"|"</code>), a subprocess is
+ *  created in the same way as Kernel#open, and its output is returned.
  *
  *  === Options
  *
  *  The options hash accepts the following keys:
  *
- *  encoding::
+ *  :encoding::
  *    string or encoding
  *
- *    Specifies the encoding of the read string.  +encoding:+ will be ignored
+ *    Specifies the encoding of the read string.  +:encoding+ will be ignored
  *    if +length+ is specified.  See Encoding.aliases for possible encodings.
  *
- *  mode::
- *    string
+ *  :mode::
+ *    string or integer
  *
- *    Specifies the mode argument for open().  It must start with an "r"
- *    otherwise it will cause an error. See IO.new for the list of possible
- *    modes.
+ *    Specifies the <i>mode</i> argument for open().  It must start
+ *    with an "r", otherwise it will cause an error.
+ *    See IO.new for the list of possible modes.
  *
- *  open_args::
- *    array of strings
+ *  :open_args::
+ *    array
  *
  *    Specifies arguments for open() as an array.  This key can not be used
- *    in combination with either +encoding:+ or +mode:+.
+ *    in combination with either +:encoding+ or +:mode+.
  *
  *  Examples:
  *
@@ -9847,7 +10769,7 @@ rb_io_s_read(int argc, VALUE *argv, VALUE io)
     struct foreach_arg arg;
 
     argc = rb_scan_args(argc, argv, "13:", NULL, NULL, &offset, NULL, &opt);
-    open_key_args(argc, argv, opt, &arg);
+    open_key_args(io, argc, argv, opt, &arg);
     if (NIL_P(arg.io)) return Qnil;
     if (!NIL_P(offset)) {
 	struct seek_arg sarg;
@@ -9869,10 +10791,10 @@ rb_io_s_read(int argc, VALUE *argv, VALUE io)
  *  call-seq:
  *     IO.binread(name, [length [, offset]] )   -> string
  *
- *  Opens the file, optionally seeks to the given <i>offset</i>, then returns
- *  <i>length</i> bytes (defaulting to the rest of the file).
- *  <code>binread</code> ensures the file is closed before returning.
- *  The open mode would be "rb:ASCII-8BIT".
+ *  Opens the file, optionally seeks to the given <i>offset</i>, then
+ *  returns <i>length</i> bytes (defaulting to the rest of the file).
+ *  #binread ensures the file is closed before returning.  The open mode
+ *  would be <code>"rb:ASCII-8BIT"</code>.
  *
  *     IO.binread("testfile")           #=> "This is line one\nThis is line two\nThis is line three\nAnd so on...\n"
  *     IO.binread("testfile", 20)       #=> "This is line one\nThi"
@@ -9896,7 +10818,7 @@ rb_io_s_binread(int argc, VALUE *argv, VALUE io)
     rb_scan_args(argc, argv, "12", NULL, NULL, &offset);
     FilePathValue(argv[0]);
     convconfig.enc = rb_ascii8bit_encoding();
-    arg.io = rb_io_open_generic(argv[0], oflags, fmode, &convconfig, 0);
+    arg.io = rb_io_open_generic(io, argv[0], oflags, fmode, &convconfig, 0);
     if (NIL_P(arg.io)) return Qnil;
     arg.argv = argv+1;
     arg.argc = (argc > 1) ? 1 : 0;
@@ -9916,13 +10838,14 @@ rb_io_s_binread(int argc, VALUE *argv, VALUE io)
 }
 
 static VALUE
-io_s_write0(struct write_arg *arg)
+io_s_write0(VALUE v)
 {
+    struct write_arg *arg = (void * )v;
     return io_write(arg->io,arg->str,arg->nosync);
 }
 
 static VALUE
-io_s_write(int argc, VALUE *argv, int binary)
+io_s_write(int argc, VALUE *argv, VALUE klass, int binary)
 {
     VALUE string, offset, opt;
     struct foreach_arg arg;
@@ -9942,7 +10865,7 @@ io_s_write(int argc, VALUE *argv, int binary)
        if (NIL_P(offset)) mode |= O_TRUNC;
        rb_hash_aset(opt,sym_mode,INT2NUM(mode));
     }
-    open_key_args(argc,argv,opt,&arg);
+    open_key_args(klass, argc, argv, opt, &arg);
 
 #ifndef O_BINARY
     if (binary) rb_io_binmode_m(arg.io);
@@ -9971,63 +10894,66 @@ io_s_write(int argc, VALUE *argv, int binary)
 
 /*
  *  call-seq:
- *     IO.write(name, string, [offset] )   => fixnum
- *     IO.write(name, string, [offset], open_args )   => fixnum
+ *     IO.write(name, string [, offset])           -> integer
+ *     IO.write(name, string [, offset] [, opt])   -> integer
  *
  *  Opens the file, optionally seeks to the given <i>offset</i>, writes
- *  <i>string</i>, then returns the length written.
- *  <code>write</code> ensures the file is closed before returning.
- *  If <i>offset</i> is not given, the file is truncated.  Otherwise,
- *  it is not truncated.
+ *  <i>string</i>, then returns the length written.  #write ensures the
+ *  file is closed before returning.  If <i>offset</i> is not given in
+ *  write mode, the file is truncated.  Otherwise, it is not truncated.
  *
- *  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.
+ *    IO.write("testfile", "0123456789", 20)  #=> 10
+ *    # File could contain:  "This is line one\nThi0123456789two\nThis is line three\nAnd so on...\n"
+ *    IO.write("testfile", "0123456789")      #=> 10
+ *    # File would now read: "0123456789"
  *
- *   encoding: string or encoding
+ *  If the last argument is a hash, it specifies options for the internal
+ *  open().  It accepts the following keys:
  *
- *    specifies encoding of the read string.  encoding will be ignored
- *    if length is specified.
+ *  :encoding::
+ *    string or encoding
  *
- *   mode: string
+ *    Specifies the encoding of the read string.
+ *    See Encoding.aliases for possible encodings.
  *
- *    specifies mode argument for open().  it should start with "w" or "a" or "r+"
- *    otherwise it would cause error.
+ *  :mode::
+ *    string or integer
  *
- *   perm: fixnum
+ *    Specifies the <i>mode</i> argument for open().  It must start
+ *    with "w", "a", or "r+", otherwise it will cause an error.
+ *    See IO.new for the list of possible modes.
  *
- *    specifies perm argument for open().
+ *  :perm::
+ *    integer
  *
- *   open_args: array
+ *    Specifies the <i>perm</i> argument for open().
  *
- *    specifies arguments for open() as an array.
+ *  :open_args::
+ *    array
  *
- *     IO.write("testfile", "0123456789", 20) # => 10
- *     # File could contain:  "This is line one\nThi0123456789two\nThis is line three\nAnd so on...\n"
- *     IO.write("testfile", "0123456789")      #=> 10
- *     # File would now read: "0123456789"
+ *    Specifies arguments for open() as an array.
+ *    This key can not be used in combination with other keys.
  */
 
 static VALUE
 rb_io_s_write(int argc, VALUE *argv, VALUE io)
 {
-    return io_s_write(argc, argv, 0);
+    return io_s_write(argc, argv, io, 0);
 }
 
 /*
  *  call-seq:
- *     IO.binwrite(name, string, [offset] )   => fixnum
- *     IO.binwrite(name, string, [offset], open_args )   => fixnum
- *
- *  Same as <code>IO.write</code> except opening the file in binary mode
- *  and ASCII-8BIT encoding ("wb:ASCII-8BIT").
+ *     IO.binwrite(name, string, [offset] )             -> integer
+ *     IO.binwrite(name, string, [offset], open_args )  -> integer
  *
+ *  Same as IO.write except opening the file in binary mode and
+ *  ASCII-8BIT encoding (<code>"wb:ASCII-8BIT"</code>).
  */
 
 static VALUE
 rb_io_s_binwrite(int argc, VALUE *argv, VALUE io)
 {
-    return io_s_write(argc, argv, 1);
+    return io_s_write(argc, argv, io, 1);
 }
 
 struct copy_stream_struct {
@@ -10038,14 +10964,18 @@ struct copy_stream_struct {
 
     int src_fd;
     int dst_fd;
-    int close_src;
-    int close_dst;
+    unsigned close_src : 1;
+    unsigned close_dst : 1;
+    int error_no;
     off_t total;
     const char *syserr;
-    int error_no;
     const char *notimp;
-    rb_fdset_t fds;
     VALUE th;
+    struct stat src_stat;
+    struct stat dst_stat;
+#ifdef HAVE_FCOPYFILE
+    copyfile_state_t copyfile_state;
+#endif
 };
 
 static void *
@@ -10080,26 +11010,79 @@ maygvl_copy_stream_continue_p(int has_gvl, struct copy_stream_struct *stp)
     return FALSE;
 }
 
-/* non-Linux poll may not work on all FDs */
-#if defined(HAVE_POLL) && defined(__linux__)
-#  define USE_POLL 1
-#  define IOWAIT_SYSCALL "poll"
-#else
-#  define IOWAIT_SYSCALL "select"
-#  define USE_POLL 0
-#endif
+struct wait_for_single_fd {
+    VALUE scheduler;
+
+    int fd;
+    short events;
+
+    VALUE result;
+};
+
+static void *
+rb_thread_scheduler_wait_for_single_fd(void * _args)
+{
+    struct wait_for_single_fd *args = (struct wait_for_single_fd *)_args;
+
+    args->result = rb_scheduler_io_wait(args->scheduler, rb_io_from_fd(args->fd), INT2NUM(args->events), Qnil);
+
+    return NULL;
+}
 
 #if USE_POLL
+#  define IOWAIT_SYSCALL "poll"
+STATIC_ASSERT(pollin_expected, POLLIN == RB_WAITFD_IN);
+STATIC_ASSERT(pollout_expected, POLLOUT == RB_WAITFD_OUT);
 static int
-nogvl_wait_for_single_fd(int fd, short events)
+nogvl_wait_for_single_fd(VALUE th, int fd, short events)
 {
+    VALUE scheduler = rb_thread_scheduler_current(th);
+    if (scheduler != Qnil) {
+        struct wait_for_single_fd args = {.scheduler = scheduler, .fd = fd, .events = events};
+        rb_thread_call_with_gvl(rb_thread_scheduler_wait_for_single_fd, &args);
+        return RTEST(args.result);
+    }
+
     struct pollfd fds;
 
     fds.fd = fd;
     fds.events = events;
 
-    return poll(&fds, 1, 0);
+    return poll(&fds, 1, -1);
+}
+#else /* !USE_POLL */
+#  define IOWAIT_SYSCALL "select"
+static int
+nogvl_wait_for_single_fd(VALUE th, int fd, short events)
+{
+    VALUE scheduler = rb_thread_scheduler_current(th);
+    if (scheduler != Qnil) {
+        struct wait_for_single_fd args = {.scheduler = scheduler, .fd = fd, .events = events};
+        rb_thread_call_with_gvl(rb_thread_scheduler_wait_for_single_fd, &args);
+        return RTEST(args.result);
+    }
+
+    rb_fdset_t fds;
+    int ret;
+
+    rb_fd_init(&fds);
+    rb_fd_set(fd, &fds);
+
+    switch (events) {
+      case RB_WAITFD_IN:
+        ret = rb_fd_select(fd + 1, &fds, 0, 0, 0);
+        break;
+      case RB_WAITFD_OUT:
+        ret = rb_fd_select(fd + 1, 0, &fds, 0, 0);
+        break;
+      default:
+        VM_UNREACHABLE(nogvl_wait_for_single_fd);
+    }
+
+    rb_fd_term(&fds);
+    return ret;
 }
+#endif /* !USE_POLL */
 
 static int
 maygvl_copy_stream_wait_read(int has_gvl, struct copy_stream_struct *stp)
@@ -10111,69 +11094,220 @@ maygvl_copy_stream_wait_read(int has_gvl, struct copy_stream_struct *stp)
 	    ret = rb_wait_for_single_fd(stp->src_fd, RB_WAITFD_IN, NULL);
 	}
 	else {
-	    ret = nogvl_wait_for_single_fd(stp->src_fd, POLLIN);
+	    ret = nogvl_wait_for_single_fd(stp->th, stp->src_fd, RB_WAITFD_IN);
 	}
-    } while (ret == -1 && maygvl_copy_stream_continue_p(has_gvl, stp));
+    } while (ret < 0 && maygvl_copy_stream_continue_p(has_gvl, stp));
 
-    if (ret == -1) {
-        stp->syserr = "poll";
+    if (ret < 0) {
+        stp->syserr = IOWAIT_SYSCALL;
         stp->error_no = errno;
-        return -1;
+        return ret;
     }
     return 0;
 }
-#else /* !USE_POLL */
-static int
-maygvl_select(int has_gvl, int n, rb_fdset_t *rfds, rb_fdset_t *wfds, rb_fdset_t *efds, struct timeval *timeout)
-{
-    if (has_gvl)
-        return rb_thread_fd_select(n, rfds, wfds, efds, timeout);
-    else
-        return rb_fd_select(n, rfds, wfds, efds, timeout);
-}
 
 static int
-maygvl_copy_stream_wait_read(int has_gvl, struct copy_stream_struct *stp)
+nogvl_copy_stream_wait_write(struct copy_stream_struct *stp)
 {
     int ret;
 
     do {
-	rb_fd_zero(&stp->fds);
-	rb_fd_set(stp->src_fd, &stp->fds);
-        ret = maygvl_select(has_gvl, rb_fd_max(&stp->fds), &stp->fds, NULL, NULL, NULL);
-    } while (ret == -1 && maygvl_copy_stream_continue_p(has_gvl, stp));
+	ret = nogvl_wait_for_single_fd(stp->th, stp->dst_fd, RB_WAITFD_OUT);
+    } while (ret < 0 && maygvl_copy_stream_continue_p(0, stp));
 
-    if (ret == -1) {
-        stp->syserr = "select";
+    if (ret < 0) {
+        stp->syserr = IOWAIT_SYSCALL;
         stp->error_no = errno;
-        return -1;
+        return ret;
     }
     return 0;
 }
-#endif /* !USE_POLL */
+
+#ifdef USE_COPY_FILE_RANGE
+
+static ssize_t
+simple_copy_file_range(int in_fd, off_t *in_offset, int out_fd, off_t *out_offset, size_t count, unsigned int flags)
+{
+#ifdef HAVE_COPY_FILE_RANGE
+    return copy_file_range(in_fd, in_offset, out_fd, out_offset, count, flags);
+#else
+    return syscall(__NR_copy_file_range, in_fd, in_offset, out_fd, out_offset, count, flags);
+#endif
+}
 
 static int
-nogvl_copy_stream_wait_write(struct copy_stream_struct *stp)
+nogvl_copy_file_range(struct copy_stream_struct *stp)
 {
-    int ret;
+    ssize_t ss;
+    off_t src_size;
+    off_t copy_length, src_offset, *src_offset_ptr;
 
-    do {
-#if USE_POLL
-	ret = nogvl_wait_for_single_fd(stp->dst_fd, POLLOUT);
-#else
-	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 (!S_ISREG(stp->src_stat.st_mode))
+        return 0;
+
+    src_size = stp->src_stat.st_size;
+    src_offset = stp->src_offset;
+    if (src_offset >= (off_t)0) {
+	src_offset_ptr = &src_offset;
+    }
+    else {
+	src_offset_ptr = NULL; /* if src_offset_ptr is NULL, then bytes are read from in_fd starting from the file offset */
+    }
+
+    copy_length = stp->copy_length;
+    if (copy_length < (off_t)0) {
+        if (src_offset < (off_t)0) {
+	    off_t current_offset;
+            errno = 0;
+            current_offset = lseek(stp->src_fd, 0, SEEK_CUR);
+            if (current_offset < (off_t)0 && errno) {
+                stp->syserr = "lseek";
+                stp->error_no = errno;
+                return (int)current_offset;
+            }
+            copy_length = src_size - current_offset;
+	}
+	else {
+            copy_length = src_size - src_offset;
+	}
+    }
+
+  retry_copy_file_range:
+# if SIZEOF_OFF_T > SIZEOF_SIZE_T
+    /* we are limited by the 32-bit ssize_t return value on 32-bit */
+    ss = (copy_length > (off_t)SSIZE_MAX) ? SSIZE_MAX : (ssize_t)copy_length;
+# else
+    ss = (ssize_t)copy_length;
+# endif
+    ss = simple_copy_file_range(stp->src_fd, src_offset_ptr, stp->dst_fd, NULL, ss, 0);
+    if (0 < ss) {
+        stp->total += ss;
+        copy_length -= ss;
+        if (0 < copy_length) {
+            goto retry_copy_file_range;
+        }
+    }
+    if (ss < 0) {
+	if (maygvl_copy_stream_continue_p(0, stp)) {
+            goto retry_copy_file_range;
+	}
+        switch (errno) {
+	  case EINVAL:
+	  case EPERM: /* copy_file_range(2) doesn't exist (may happen in
+			 docker container) */
+#ifdef ENOSYS
+	  case ENOSYS:
+#endif
+#ifdef EXDEV
+	  case EXDEV: /* in_fd and out_fd are not on the same filesystem */
 #endif
-    } while (ret == -1 && maygvl_copy_stream_continue_p(0, stp));
+            return 0;
+	  case EAGAIN:
+#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
+	  case EWOULDBLOCK:
+#endif
+            {
+                int ret = nogvl_copy_stream_wait_write(stp);
+                if (ret < 0) return ret;
+            }
+            goto retry_copy_file_range;
+	  case EBADF:
+	    {
+		int e = errno;
+		int flags = fcntl(stp->dst_fd, F_GETFL);
 
-    if (ret == -1) {
-        stp->syserr = IOWAIT_SYSCALL;
+		if (flags != -1 && flags & O_APPEND) {
+		    return 0;
+		}
+		errno = e;
+	    }
+        }
+        stp->syserr = "copy_file_range";
         stp->error_no = errno;
-        return -1;
+        return (int)ss;
     }
-    return 0;
+    return 1;
+}
+#endif
+
+#ifdef HAVE_FCOPYFILE
+static int
+nogvl_fcopyfile(struct copy_stream_struct *stp)
+{
+    off_t cur, ss = 0;
+    const off_t src_offset = stp->src_offset;
+    int ret;
+
+    if (stp->copy_length >= (off_t)0) {
+        /* copy_length can't be specified in fcopyfile(3) */
+        return 0;
+    }
+
+    if (!S_ISREG(stp->src_stat.st_mode))
+        return 0;
+
+    if (!S_ISREG(stp->dst_stat.st_mode))
+        return 0;
+    if (lseek(stp->dst_fd, 0, SEEK_CUR) > (off_t)0) /* if dst IO was already written */
+        return 0;
+    if (fcntl(stp->dst_fd, F_GETFL) & O_APPEND) {
+        /* fcopyfile(3) appends src IO to dst IO and then truncates
+         * dst IO to src IO's original size. */
+        off_t end = lseek(stp->dst_fd, 0, SEEK_END);
+        lseek(stp->dst_fd, 0, SEEK_SET);
+        if (end > (off_t)0) return 0;
+    }
+
+    if (src_offset > (off_t)0) {
+        off_t r;
+
+        /* get current offset */
+        errno = 0;
+        cur = lseek(stp->src_fd, 0, SEEK_CUR);
+        if (cur < (off_t)0 && errno) {
+            stp->error_no = errno;
+            return 1;
+        }
+
+        errno = 0;
+        r = lseek(stp->src_fd, src_offset, SEEK_SET);
+        if (r < (off_t)0 && errno) {
+            stp->error_no = errno;
+            return 1;
+        }
+    }
+
+    stp->copyfile_state = copyfile_state_alloc(); /* this will be freed by copy_stream_finalize() */
+    ret = fcopyfile(stp->src_fd, stp->dst_fd, stp->copyfile_state, COPYFILE_DATA);
+    copyfile_state_get(stp->copyfile_state, COPYFILE_STATE_COPIED, &ss); /* get copied bytes */
+
+    if (ret == 0) { /* success */
+        stp->total = ss;
+        if (src_offset > (off_t)0) {
+            off_t r;
+            errno = 0;
+            /* reset offset */
+            r = lseek(stp->src_fd, cur, SEEK_SET);
+            if (r < (off_t)0 && errno) {
+                stp->error_no = errno;
+                return 1;
+            }
+        }
+    }
+    else {
+        switch (errno) {
+          case ENOTSUP:
+          case EPERM:
+          case EINVAL:
+            return 0;
+        }
+        stp->syserr = "fcopyfile";
+        stp->error_no = errno;
+        return (int)ret;
+    }
+    return 1;
 }
+#endif
 
 #ifdef HAVE_SENDFILE
 
@@ -10208,7 +11342,7 @@ simple_sendfile(int out_fd, int in_fd, off_t *offset, off_t count)
 #  else
     r = sendfile(in_fd, out_fd, pos, (size_t)count, NULL, &sbytes, 0);
 #  endif
-    if (r != 0 && sbytes == 0) return -1;
+    if (r != 0 && sbytes == 0) return r;
     if (offset) {
 	*offset += sbytes;
     }
@@ -10226,51 +11360,38 @@ simple_sendfile(int out_fd, int in_fd, off_t *offset, off_t count)
 static int
 nogvl_copy_stream_sendfile(struct copy_stream_struct *stp)
 {
-    struct stat src_stat, dst_stat;
     ssize_t ss;
-    int ret;
-
+    off_t src_size;
     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))
+    if (!S_ISREG(stp->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;
-    }
+    src_size = stp->src_stat.st_size;
 #ifndef __linux__
-    if ((dst_stat.st_mode & S_IFMT) != S_IFSOCK)
+    if ((stp->dst_stat.st_mode & S_IFMT) != S_IFSOCK)
 	return 0;
 #endif
 
     src_offset = stp->src_offset;
-    use_pread = src_offset != (off_t)-1;
+    use_pread = src_offset >= (off_t)0;
 
     copy_length = stp->copy_length;
-    if (copy_length == (off_t)-1) {
+    if (copy_length < (off_t)0) {
         if (use_pread)
-            copy_length = src_stat.st_size - src_offset;
+            copy_length = src_size - src_offset;
         else {
             off_t cur;
             errno = 0;
             cur = lseek(stp->src_fd, 0, SEEK_CUR);
-            if (cur == (off_t)-1 && errno) {
+            if (cur < (off_t)0 && errno) {
                 stp->syserr = "lseek";
                 stp->error_no = errno;
-                return -1;
+                return (int)cur;
             }
-            copy_length = src_stat.st_size - cur;
+            copy_length = src_size - cur;
         }
     }
 
@@ -10294,7 +11415,7 @@ nogvl_copy_stream_sendfile(struct copy_stream_struct *stp)
             goto retry_sendfile;
         }
     }
-    if (ss == -1) {
+    if (ss < 0) {
 	if (maygvl_copy_stream_continue_p(0, stp))
 	    goto retry_sendfile;
         switch (errno) {
@@ -10302,29 +11423,37 @@ nogvl_copy_stream_sendfile(struct copy_stream_struct *stp)
 #ifdef ENOSYS
 	  case ENOSYS:
 #endif
+#ifdef EOPNOTSUP
+	  /* some RedHat kernels may return EOPNOTSUP on an NFS mount.
+	     see also: [Feature #16965] */
+	  case EOPNOTSUP:
+#endif
             return 0;
 	  case EAGAIN:
 #if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
 	  case EWOULDBLOCK:
 #endif
+            {
+                int ret;
 #ifndef __linux__
-           /*
-            * Linux requires stp->src_fd to be a mmap-able (regular) file,
-            * select() reports regular files to always be "ready", so
-            * there is no need to select() on it.
-            * Other OSes may have the same limitation for sendfile() which
-            * allow us to bypass maygvl_copy_stream_wait_read()...
-            */
-            if (maygvl_copy_stream_wait_read(0, stp) == -1)
-                return -1;
-#endif
-            if (nogvl_copy_stream_wait_write(stp) == -1)
-                return -1;
+               /*
+                * Linux requires stp->src_fd to be a mmap-able (regular) file,
+                * select() reports regular files to always be "ready", so
+                * there is no need to select() on it.
+                * Other OSes may have the same limitation for sendfile() which
+                * allow us to bypass maygvl_copy_stream_wait_read()...
+                */
+                ret = maygvl_copy_stream_wait_read(0, stp);
+                if (ret < 0) return ret;
+#endif
+                ret = nogvl_copy_stream_wait_write(stp);
+                if (ret < 0) return ret;
+            }
             goto retry_sendfile;
         }
         stp->syserr = "sendfile";
         stp->error_no = errno;
-        return -1;
+        return (int)ss;
     }
     return 1;
 }
@@ -10344,7 +11473,7 @@ maygvl_copy_stream_read(int has_gvl, struct copy_stream_struct *stp, char *buf,
 {
     ssize_t ss;
   retry_read:
-    if (offset == (off_t)-1) {
+    if (offset < (off_t)0) {
         ss = maygvl_read(has_gvl, stp->src_fd, buf, len);
     }
     else {
@@ -10358,7 +11487,7 @@ maygvl_copy_stream_read(int has_gvl, struct copy_stream_struct *stp, char *buf,
     if (ss == 0) {
         return 0;
     }
-    if (ss == -1) {
+    if (ss < 0) {
 	if (maygvl_copy_stream_continue_p(has_gvl, stp))
 	    goto retry_read;
         switch (errno) {
@@ -10366,18 +11495,19 @@ maygvl_copy_stream_read(int has_gvl, struct copy_stream_struct *stp, char *buf,
 #if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
 	  case EWOULDBLOCK:
 #endif
-            if (maygvl_copy_stream_wait_read(has_gvl, stp) == -1)
-                return -1;
+            {
+                int ret = maygvl_copy_stream_wait_read(has_gvl, stp);
+                if (ret < 0) return ret;
+            }
             goto retry_read;
 #ifdef ENOSYS
 	  case ENOSYS:
             stp->notimp = "pread";
-            return -1;
+            return ss;
 #endif
         }
-        stp->syserr = offset == (off_t)-1 ?  "read" : "pread";
+        stp->syserr = offset < (off_t)0 ?  "read" : "pread";
         stp->error_no = errno;
-        return -1;
     }
     return ss;
 }
@@ -10389,17 +11519,17 @@ nogvl_copy_stream_write(struct copy_stream_struct *stp, char *buf, size_t len)
     int off = 0;
     while (len) {
         ss = write(stp->dst_fd, buf+off, len);
-        if (ss == -1) {
-	    if (maygvl_copy_stream_continue_p(0, stp))
-		continue;
+        if (ss < 0) {
+            if (maygvl_copy_stream_continue_p(0, stp))
+                continue;
             if (errno == EAGAIN || errno == EWOULDBLOCK) {
-                if (nogvl_copy_stream_wait_write(stp) == -1)
-                    return -1;
+                int ret = nogvl_copy_stream_wait_write(stp);
+                if (ret < 0) return ret;
                 continue;
             }
             stp->syserr = "write";
             stp->error_no = errno;
-            return -1;
+            return (int)ss;
         }
         off += (int)ss;
         len -= (int)ss;
@@ -10421,15 +11551,15 @@ nogvl_copy_stream_read_write(struct copy_stream_struct *stp)
     int use_pread;
 
     copy_length = stp->copy_length;
-    use_eof = copy_length == (off_t)-1;
+    use_eof = copy_length < (off_t)0;
     src_offset = stp->src_offset;
-    use_pread = src_offset != (off_t)-1;
+    use_pread = src_offset >= (off_t)0;
 
     if (use_pread && stp->close_src) {
         off_t r;
 	errno = 0;
         r = lseek(stp->src_fd, src_offset, SEEK_SET);
-        if (r == (off_t)-1 && errno) {
+        if (r < (off_t)0 && errno) {
             stp->syserr = "lseek";
             stp->error_no = errno;
             return;
@@ -10469,10 +11599,22 @@ static void *
 nogvl_copy_stream_func(void *arg)
 {
     struct copy_stream_struct *stp = (struct copy_stream_struct *)arg;
-#ifdef USE_SENDFILE
+#if defined(USE_SENDFILE) || defined(USE_COPY_FILE_RANGE) || defined(HAVE_FCOPYFILE)
     int ret;
 #endif
 
+#ifdef USE_COPY_FILE_RANGE
+    ret = nogvl_copy_file_range(stp);
+    if (ret != 0)
+	goto finish; /* error or success */
+#endif
+
+#ifdef HAVE_FCOPYFILE
+    ret = nogvl_fcopyfile(stp);
+    if (ret != 0)
+        goto finish; /* error or success */
+#endif
+
 #ifdef USE_SENDFILE
     ret = nogvl_copy_stream_sendfile(stp);
     if (ret != 0)
@@ -10481,7 +11623,7 @@ nogvl_copy_stream_func(void *arg)
 
     nogvl_copy_stream_read_write(stp);
 
-#ifdef USE_SENDFILE
+#if defined(USE_SENDFILE) || defined(USE_COPY_FILE_RANGE) || defined(HAVE_FCOPYFILE)
   finish:
 #endif
     return 0;
@@ -10498,7 +11640,7 @@ copy_stream_fallback_body(VALUE arg)
     off_t off = stp->src_offset;
     ID read_method = id_readpartial;
 
-    if (stp->src_fd == -1) {
+    if (stp->src_fd < 0) {
 	if (!rb_respond_to(stp->src, read_method)) {
 	    read_method = id_read;
 	}
@@ -10507,15 +11649,17 @@ copy_stream_fallback_body(VALUE arg)
     while (1) {
         long numwrote;
         long l;
-        if (stp->copy_length == (off_t)-1) {
+        if (stp->copy_length < (off_t)0) {
             l = buflen;
         }
         else {
-            if (rest == 0)
-                break;
+	    if (rest == 0) {
+		rb_str_resize(buf, 0);
+		break;
+	    }
             l = buflen < rest ? buflen : (long)rest;
         }
-        if (stp->src_fd == -1) {
+        if (stp->src_fd < 0) {
             VALUE rc = rb_funcall(stp->src, read_method, 2, INT2FIX(l), buf);
 
             if (read_method == id_read && NIL_P(rc))
@@ -10526,11 +11670,11 @@ copy_stream_fallback_body(VALUE arg)
             rb_str_resize(buf, buflen);
             ss = maygvl_copy_stream_read(1, stp, RSTRING_PTR(buf), l, off);
             rb_str_resize(buf, ss > 0 ? ss : 0);
-            if (ss == -1)
+            if (ss < 0)
                 return Qnil;
             if (ss == 0)
                 rb_eof_error();
-            if (off != (off_t)-1)
+            if (off >= (off_t)0)
                 off += ss;
         }
         n = rb_io_write(stp->dst, buf);
@@ -10548,11 +11692,11 @@ copy_stream_fallback_body(VALUE arg)
 static VALUE
 copy_stream_fallback(struct copy_stream_struct *stp)
 {
-    if (stp->src_fd == -1 && stp->src_offset != (off_t)-1) {
+    if (stp->src_fd < 0 && stp->src_offset >= (off_t)0) {
 	rb_raise(rb_eArgError, "cannot specify src_offset for non-IO");
     }
     rb_rescue2(copy_stream_fallback_body, (VALUE)stp,
-               (VALUE (*) (ANYARGS))0, (VALUE)0,
+               (VALUE (*) (VALUE, VALUE))0, (VALUE)0,
                rb_eEOFError, (VALUE)0);
     return Qnil;
 }
@@ -10581,6 +11725,7 @@ copy_stream_body(VALUE arg)
 	src_fd = -1;
     }
     else {
+        int stat_ret;
 	VALUE tmp_io = rb_io_check_io(src_io);
 	if (!NIL_P(tmp_io)) {
 	    src_io = tmp_io;
@@ -10597,6 +11742,13 @@ copy_stream_body(VALUE arg)
 	GetOpenFile(src_io, src_fptr);
 	rb_io_check_byte_readable(src_fptr);
 	src_fd = src_fptr->fd;
+
+        stat_ret = fstat(src_fd, &stp->src_stat);
+        if (stat_ret < 0) {
+            stp->syserr = "fstat";
+            stp->error_no = errno;
+            return Qnil;
+        }
     }
     stp->src_fd = src_fd;
 
@@ -10607,9 +11759,10 @@ copy_stream_body(VALUE arg)
 	dst_fd = -1;
     }
     else {
-	VALUE tmp_io = rb_io_check_io(dst_io);
+        int stat_ret;
+        VALUE tmp_io = rb_io_check_io(dst_io);
 	if (!NIL_P(tmp_io)) {
-	    dst_io = tmp_io;
+	    dst_io = GetWriteIO(tmp_io);
 	}
 	else if (!RB_TYPE_P(dst_io, T_FILE)) {
 	    VALUE args[3];
@@ -10628,6 +11781,13 @@ copy_stream_body(VALUE arg)
 	GetOpenFile(dst_io, dst_fptr);
 	rb_io_check_writable(dst_fptr);
 	dst_fd = dst_fptr->fd;
+
+        stat_ret = fstat(dst_fd, &stp->dst_stat);
+        if (stat_ret < 0) {
+            stp->syserr = "fstat";
+            stp->error_no = errno;
+            return Qnil;
+        }
     }
     stp->dst_fd = dst_fd;
 
@@ -10638,10 +11798,10 @@ copy_stream_body(VALUE arg)
     if (dst_fptr)
 	io_ascii8bit_binmode(dst_fptr);
 
-    if (stp->src_offset == (off_t)-1 && src_fptr && src_fptr->rbuf.len) {
+    if (stp->src_offset < (off_t)0 && src_fptr && src_fptr->rbuf.len) {
         size_t len = src_fptr->rbuf.len;
         VALUE str;
-        if (stp->copy_length != (off_t)-1 && stp->copy_length < (off_t)len) {
+        if (stp->copy_length >= (off_t)0 && stp->copy_length < (off_t)len) {
             len = (size_t)stp->copy_length;
         }
         str = rb_str_buf_new(len);
@@ -10649,12 +11809,13 @@ copy_stream_body(VALUE arg)
         read_buffered_data(RSTRING_PTR(str), len, src_fptr);
         if (dst_fptr) { /* IO or filename */
             if (io_binwrite(str, RSTRING_PTR(str), RSTRING_LEN(str), dst_fptr, 0) < 0)
-                rb_sys_fail(0);
+                rb_sys_fail_on_write(dst_fptr);
         }
         else /* others such as StringIO */
 	    rb_io_write(dst_io, str);
+        rb_str_resize(str, 0);
         stp->total += len;
-        if (stp->copy_length != (off_t)-1)
+        if (stp->copy_length >= (off_t)0)
             stp->copy_length -= len;
     }
 
@@ -10665,13 +11826,10 @@ copy_stream_body(VALUE arg)
     if (stp->copy_length == 0)
         return Qnil;
 
-    if (src_fd == -1 || dst_fd == -1) {
+    if (src_fd < 0 || dst_fd < 0) {
         return copy_stream_fallback(stp);
     }
 
-    rb_fd_set(src_fd, &stp->fds);
-    rb_fd_set(dst_fd, &stp->fds);
-
     rb_thread_call_without_gvl(nogvl_copy_stream_func, (void*)stp, RUBY_UBF_IO, 0);
     return Qnil;
 }
@@ -10680,13 +11838,19 @@ static VALUE
 copy_stream_finalize(VALUE arg)
 {
     struct copy_stream_struct *stp = (struct copy_stream_struct *)arg;
+
+#ifdef HAVE_FCOPYFILE
+    if (stp->copyfile_state) {
+        copyfile_state_free(stp->copyfile_state);
+    }
+#endif
+
     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) {
         rb_syserr_fail(stp->error_no, stp->syserr);
     }
@@ -10703,7 +11867,11 @@ copy_stream_finalize(VALUE arg)
  *     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.
+ *  <i>src</i> and <i>dst</i> is either a filename or an IO-like object.
+ *  IO-like object for <i>src</i> should have #readpartial or #read
+ *  method.  IO-like object for <i>dst</i> should have #write method.
+ *  (Specialized mechanisms, such as sendfile system call, may be used
+ *  on appropriate situation.)
  *
  *  This method returns the number of bytes copied.
  *
@@ -10747,7 +11915,6 @@ rb_io_s_copy_stream(int argc, VALUE *argv, VALUE io)
     else
         st.src_offset = NUM2OFFT(src_offset);
 
-    rb_fd_init(&st.fds);
     rb_ensure(copy_stream_body, (VALUE)&st, copy_stream_finalize, (VALUE)&st);
 
     return OFFT2NUM(st.total);
@@ -10758,7 +11925,7 @@ rb_io_s_copy_stream(int argc, VALUE *argv, VALUE io)
  *     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>.
+ *  If _io_ is in write mode and no encoding is specified, returns +nil+.
  */
 
 static VALUE
@@ -10783,7 +11950,7 @@ rb_io_external_encoding(VALUE io)
  *     io.internal_encoding   -> encoding
  *
  *  Returns the Encoding of the internal string if conversion is
- *  specified.  Otherwise returns nil.
+ *  specified.  Otherwise returns +nil+.
  */
 
 static VALUE
@@ -10822,7 +11989,7 @@ rb_io_set_encoding(int argc, VALUE *argv, VALUE io)
     VALUE v1, v2, opt;
 
     if (!RB_TYPE_P(io, T_FILE)) {
-        return rb_funcall2(io, id_set_encoding, argc, argv);
+        return rb_funcallv(io, id_set_encoding, argc, argv);
     }
 
     argc = rb_scan_args(argc, argv, "11:", &v1, &v2, &opt);
@@ -10841,6 +12008,12 @@ rb_stdio_set_default_encoding(void)
     rb_io_set_encoding(1, &val, rb_stderr);
 }
 
+static inline int
+global_argf_p(VALUE arg)
+{
+    return arg == argf;
+}
+
 /*
  *  call-seq:
  *     ARGF.external_encoding   -> encoding
@@ -10852,7 +12025,7 @@ rb_stdio_set_default_encoding(void)
  *
  *  To set the external encoding use +ARGF.set_encoding+.
  *
- * For example:
+ *  For example:
  *
  *     ARGF.external_encoding  #=>  #<Encoding:UTF-8>
  *
@@ -10877,7 +12050,7 @@ argf_external_encoding(VALUE argf)
  *  is returned. Otherwise, if +Encoding.default_external+ has been set, that
  *  value is returned. Failing that, if a default external encoding was
  *  specified on the command-line, that value is used. If the encoding is
- *  unknown, nil is returned.
+ *  unknown, +nil+ is returned.
  */
 static VALUE
 argf_internal_encoding(VALUE argf)
@@ -10910,7 +12083,7 @@ argf_internal_encoding(VALUE argf)
  *
  *  If the external encoding and the internal encoding are specified, the
  *  optional +Hash+ argument can be used to adjust the conversion process. The
- *  structure of this hash is explained in the +String#encode+ documentation.
+ *  structure of this hash is explained in the String#encode documentation.
  *
  *  For example:
  *
@@ -10957,10 +12130,10 @@ argf_tell(VALUE argf)
 
 /*
  *  call-seq:
- *     ARGF.seek(amount, whence=IO::SEEK_SET)  ->  0
+ *     ARGF.seek(amount, whence=IO::SEEK_SET)  -> 0
  *
  *  Seeks to offset _amount_ (an +Integer+) in the +ARGF+ stream according to
- *  the value of _whence_. See +IO#seek+ for further details.
+ *  the value of _whence_. See IO#seek for further details.
  */
 static VALUE
 argf_seek_m(int argc, VALUE *argv, VALUE argf)
@@ -11008,17 +12181,25 @@ argf_set_pos(VALUE argf, VALUE offset)
 static VALUE
 argf_rewind(VALUE argf)
 {
+    VALUE ret;
+    int old_lineno;
+
     if (!next_argv()) {
 	rb_raise(rb_eArgError, "no stream to rewind");
     }
     ARGF_FORWARD(0, 0);
-    return rb_io_rewind(ARGF.current_file);
+    old_lineno = RFILE(ARGF.current_file)->fptr->lineno;
+    ret = rb_io_rewind(ARGF.current_file);
+    if (!global_argf_p(argf)) {
+	ARGF.last_lineno = ARGF.lineno -= old_lineno;
+    }
+    return ret;
 }
 
 /*
  *  call-seq:
- *     ARGF.fileno    -> fixnum
- *     ARGF.to_i      -> fixnum
+ *     ARGF.fileno    -> integer
+ *     ARGF.to_i      -> integer
  *
  *  Returns an integer representing the numeric file descriptor for
  *  the current file. Raises an +ArgumentError+ if there isn't a current file.
@@ -11097,22 +12278,28 @@ argf_eof(VALUE argf)
  *  called without arguments the contents of this pseudo file are returned in
  *  their entirety.
  *
- *  _length_ must be a non-negative integer or nil. If it is a positive
- *  integer, +read+ tries to read at most _length_ bytes. It returns nil
- *  if an EOF was encountered before anything could be read. Fewer than
- *  _length_ bytes may be returned if an EOF is encountered during the read.
+ *  _length_ must be a non-negative integer or +nil+.
+ *
+ *  If _length_ is a positive integer, +read+ tries to read
+ *  _length_ bytes without any conversion (binary mode).
+ *  It returns +nil+ if an EOF is encountered before anything can be read.
+ *  Fewer than _length_ bytes are returned if an EOF is encountered during
+ *  the read.
+ *  In the case of an integer _length_, the resulting string is always
+ *  in ASCII-8BIT encoding.
  *
- *  If _length_ is omitted or is _nil_, it reads until EOF. A String is
- *  returned even if EOF is encountered before any data is read.
+ *  If _length_ is omitted or is +nil+, it reads until EOF
+ *  and the encoding conversion is applied, if applicable.
+ *  A string is returned even if EOF is encountered before any data is read.
  *
- *  If _length_ is zero, it returns _""_.
+ *  If _length_ is zero, it returns an empty string (<code>""</code>).
  *
- *  If the optional _outbuf_ argument is present, it must reference a String,
- *  which will receive the data.
- *  The <i>outbuf</i> will contain only the received data after the method call
+ *  If the optional _outbuf_ argument is present,
+ *  it must reference a String, which will receive the data.
+ *  The _outbuf_ will contain only the received data after the method call
  *  even if it is not empty at the beginning.
  *
- * For example:
+ *  For example:
  *
  *     $ echo "small" > small.txt
  *     $ echo "large" > large.txt
@@ -11123,8 +12310,11 @@ argf_eof(VALUE argf)
  *     ARGF.read(2)   #=> "sm"
  *     ARGF.read(0)   #=> ""
  *
- *  Note that this method behaves like fread() function in C.  If you need the
- *  behavior like read(2) system call, consider +ARGF.readpartial+.
+ *  Note that this method behaves like the fread() function in C.
+ *  This means it retries to invoke read(2) system calls to read data
+ *  with the specified length.
+ *  If you need the behavior like a single read(2) system call,
+ *  consider ARGF#readpartial or ARGF#read_nonblock.
  */
 
 static VALUE
@@ -11166,7 +12356,7 @@ argf_read(int argc, VALUE *argv, VALUE argf)
 	long slen = RSTRING_LEN(str);
 	if (slen < len) {
 	    len -= slen;
-	    argv[0] = INT2NUM(len);
+            argv[0] = LONG2NUM(len);
 	    goto retry;
 	}
     }
@@ -11199,14 +12389,14 @@ static VALUE argf_getpartial(int argc, VALUE *argv, VALUE argf, VALUE opts,
  *
  *  If the optional _outbuf_ argument is present,
  *  it must reference a String, which will receive the data.
- *  The <i>outbuf</i> will contain only the received data after the method call
+ *  The _outbuf_ will contain only the received data after the method call
  *  even if it is not empty at the beginning.
  *
- *  It raises <code>EOFError</code> on end of ARGF stream.
+ *  It raises EOFError on end of ARGF stream.
  *  Since ARGF stream is a concatenation of multiple files,
  *  internally EOF is occur for each file.
  *  ARGF.readpartial returns empty strings for EOFs except the last one and
- *  raises <code>EOFError</code> for the last one.
+ *  raises EOFError for the last one.
  *
  */
 
@@ -11218,8 +12408,8 @@ argf_readpartial(int argc, VALUE *argv, VALUE argf)
 
 /*
  *  call-seq:
- *     ARGF.read_nonblock(maxlen)              -> string
- *     ARGF.read_nonblock(maxlen, outbuf)      -> outbuf
+ *     ARGF.read_nonblock(maxlen[, options])              -> string
+ *     ARGF.read_nonblock(maxlen, outbuf[, options])      -> outbuf
  *
  *  Reads at most _maxlen_ bytes from the ARGF stream in non-blocking mode.
  */
@@ -11241,12 +12431,14 @@ static VALUE
 argf_getpartial(int argc, VALUE *argv, VALUE argf, VALUE opts, int nonblock)
 {
     VALUE tmp, str, length;
+    int no_exception;
 
     rb_scan_args(argc, argv, "11", &length, &str);
     if (!NIL_P(str)) {
         StringValue(str);
         argv[1] = str;
     }
+    no_exception = no_exception_p(opts);
 
     if (!next_argv()) {
 	if (!NIL_P(str)) {
@@ -11255,24 +12447,25 @@ argf_getpartial(int argc, VALUE *argv, VALUE argf, VALUE opts, int nonblock)
         rb_eof_error();
     }
     if (ARGF_GENERIC_INPUT_P()) {
+        VALUE (*const rescue_does_nothing)(VALUE, VALUE) = 0;
 	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);
+                         rescue_does_nothing, Qnil, rb_eEOFError, (VALUE)0);
     }
     else {
-        tmp = io_getpartial(argc, argv, ARGF.current_file, opts, nonblock);
+        tmp = io_getpartial(argc, argv, ARGF.current_file, no_exception, nonblock);
     }
     if (NIL_P(tmp)) {
         if (ARGF.next_p == -1) {
-	    return io_nonblock_eof(opts);
+            return io_nonblock_eof(no_exception);
         }
         argf_close(argf);
         ARGF.next_p = 1;
         if (RARRAY_LEN(ARGF.argv) == 0) {
-	    return io_nonblock_eof(opts);
+            return io_nonblock_eof(no_exception);
 	}
         if (NIL_P(str))
             str = rb_str_new(NULL, 0);
@@ -11328,7 +12521,7 @@ argf_getc(VALUE argf)
 
 /*
  *  call-seq:
- *     ARGF.getbyte  -> Fixnum or nil
+ *     ARGF.getbyte  -> Integer or nil
  *
  *  Gets the next 8-bit byte (0..255) from +ARGF+. Returns +nil+ if called at
  *  the end of the stream.
@@ -11408,9 +12601,9 @@ argf_readchar(VALUE argf)
 
 /*
  *  call-seq:
- *     ARGF.readbyte  -> Fixnum
+ *     ARGF.readbyte  -> Integer
  *
- *  Reads the next 8-bit byte from ARGF and returns it as a +Fixnum+. Raises
+ *  Reads the next 8-bit byte from ARGF and returns it as an +Integer+. Raises
  *  an +EOFError+ after the last byte of the last file has been read.
  *
  *  For example:
@@ -11450,41 +12643,69 @@ argf_block_call_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, argf))
     return Qnil;
 }
 
+#define ARGF_block_call(mid, argc, argv, func, argf) \
+    rb_block_call_kw(ARGF.current_file, mid, argc, argv, \
+                     func, argf, rb_keyword_given_p())
+
 static void
 argf_block_call(ID mid, int argc, VALUE *argv, VALUE argf)
 {
-    VALUE ret = rb_block_call(ARGF.current_file, mid, argc, argv, argf_block_call_i, argf);
+    VALUE ret = ARGF_block_call(mid, argc, argv, argf_block_call_i, argf);
+    if (ret != Qundef) ARGF.next_p = 1;
+}
+
+static VALUE
+argf_block_call_line_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, argf))
+{
+    if (!global_argf_p(argf)) {
+	ARGF.last_lineno = ++ARGF.lineno;
+    }
+    return argf_block_call_i(i, argf, argc, argv, blockarg);
+}
+
+static void
+argf_block_call_line(ID mid, int argc, VALUE *argv, VALUE argf)
+{
+    VALUE ret = ARGF_block_call(mid, argc, argv, argf_block_call_line_i, argf);
     if (ret != Qundef) ARGF.next_p = 1;
 }
 
 /*
  *  call-seq:
- *     ARGF.each(sep=$/)            {|line| block }  -> ARGF
- *     ARGF.each(sep=$/,limit)      {|line| block }  -> ARGF
- *     ARGF.each(...)                                -> an_enumerator
+ *     ARGF.each(sep=$/)             {|line| block }  -> ARGF
+ *     ARGF.each(sep=$/, limit)      {|line| block }  -> ARGF
+ *     ARGF.each(...)                                 -> an_enumerator
  *
- *     ARGF.each_line(sep=$/)       {|line| block }  -> ARGF
- *     ARGF.each_line(sep=$/,limit) {|line| block }  -> ARGF
- *     ARGF.each_line(...)                           -> an_enumerator
+ *     ARGF.each_line(sep=$/)        {|line| block }  -> ARGF
+ *     ARGF.each_line(sep=$/, limit) {|line| block }  -> ARGF
+ *     ARGF.each_line(...)                            -> an_enumerator
  *
  *  Returns an enumerator which iterates over each line (separated by _sep_,
  *  which defaults to your platform's newline character) of each file in
  *  +ARGV+. If a block is supplied, each line in turn will be yielded to the
  *  block, otherwise an enumerator is returned.
- *  The optional _limit_ argument is a +Fixnum+ specifying the maximum
+ *  The optional _limit_ argument is an +Integer+ specifying the maximum
  *  length of each line; longer lines will be split according to this limit.
  *
  *  This method allows you to treat the files supplied on the command line as
  *  a single file consisting of the concatenation of each named file. After
  *  the last line of the first file has been returned, the first line of the
  *  second file is returned. The +ARGF.filename+ and +ARGF.lineno+ methods can
- *  be used to determine the filename and line number, respectively, of the
- *  current line.
+ *  be used to determine the filename of the current line and line number of
+ *  the whole input, respectively.
  *
  *  For example, the following code prints out each line of each named file
  *  prefixed with its line number, displaying the filename once per file:
  *
  *     ARGF.each_line do |line|
+ *       puts ARGF.filename if ARGF.file.lineno == 1
+ *       puts "#{ARGF.file.lineno}: #{line}"
+ *     end
+ *
+ *  While the following code prints only the first file's name at first, and
+ *  the contents with line number counted through all named files.
+ *
+ *     ARGF.each_line do |line|
  *       puts ARGF.filename if ARGF.lineno == 1
  *       puts "#{ARGF.lineno}: #{line}"
  *     end
@@ -11494,34 +12715,18 @@ argf_each_line(int argc, VALUE *argv, VALUE argf)
 {
     RETURN_ENUMERATOR(argf, argc, argv);
     FOREACH_ARGF() {
-	argf_block_call(rb_intern("each_line"), argc, argv, argf);
+	argf_block_call_line(rb_intern("each_line"), argc, argv, argf);
     }
     return argf;
 }
 
 /*
- *  This is a deprecated alias for <code>each_line</code>.
- */
-
-static VALUE
-argf_lines(int argc, VALUE *argv, VALUE argf)
-{
-    rb_warn("ARGF#lines is deprecated; use #each_line instead");
-    if (!rb_block_given_p())
-	return rb_enumeratorize(argf, ID2SYM(rb_intern("each_line")), argc, argv);
-    return argf_each_line(argc, argv, argf);
-}
-
-/*
  *  call-seq:
- *     ARGF.bytes     {|byte| block }  -> ARGF
- *     ARGF.bytes                      -> an_enumerator
- *
  *     ARGF.each_byte {|byte| block }  -> ARGF
  *     ARGF.each_byte                  -> an_enumerator
  *
  *  Iterates over each byte of each file in +ARGV+.
- *  A byte is returned as a +Fixnum+ in the range 0..255.
+ *  A byte is returned as an +Integer+ in the range 0..255.
  *
  *  This method allows you to treat the files supplied on the command line as
  *  a single file consisting of the concatenation of each named file. After
@@ -11531,7 +12736,7 @@ argf_lines(int argc, VALUE *argv, VALUE argf)
  *
  *  If no block is given, an enumerator is returned instead.
  *
- * For example:
+ *  For example:
  *
  *     ARGF.bytes.to_a  #=> [35, 32, ... 95, 10]
  *
@@ -11547,22 +12752,9 @@ argf_each_byte(VALUE argf)
 }
 
 /*
- *  This is a deprecated alias for <code>each_byte</code>.
- */
-
-static VALUE
-argf_bytes(VALUE argf)
-{
-    rb_warn("ARGF#bytes is deprecated; use #each_byte instead");
-    if (!rb_block_given_p())
-	return rb_enumeratorize(argf, ID2SYM(rb_intern("each_byte")), 0, 0);
-    return argf_each_byte(argf);
-}
-
-/*
  *  call-seq:
- *     ARGF.each_char  {|char| block }  -> ARGF
- *     ARGF.each_char                   -> an_enumerator
+ *     ARGF.each_char {|char| block }  -> ARGF
+ *     ARGF.each_char                  -> an_enumerator
  *
  *  Iterates over each character of each file in +ARGF+.
  *
@@ -11586,22 +12778,9 @@ argf_each_char(VALUE argf)
 }
 
 /*
- *  This is a deprecated alias for <code>each_char</code>.
- */
-
-static VALUE
-argf_chars(VALUE argf)
-{
-    rb_warn("ARGF#chars is deprecated; use #each_char instead");
-    if (!rb_block_given_p())
-	return rb_enumeratorize(argf, ID2SYM(rb_intern("each_char")), 0, 0);
-    return argf_each_char(argf);
-}
-
-/*
  *  call-seq:
- *     ARGF.each_codepoint  {|codepoint| block }  -> ARGF
- *     ARGF.each_codepoint                   -> an_enumerator
+ *     ARGF.each_codepoint {|codepoint| block }  -> ARGF
+ *     ARGF.each_codepoint                       -> an_enumerator
  *
  *  Iterates over each codepoint of each file in +ARGF+.
  *
@@ -11625,19 +12804,6 @@ argf_each_codepoint(VALUE argf)
 }
 
 /*
- *  This is a deprecated alias for <code>each_codepoint</code>.
- */
-
-static VALUE
-argf_codepoints(VALUE argf)
-{
-    rb_warn("ARGF#codepoints is deprecated; use #each_codepoint instead");
-    if (!rb_block_given_p())
-	return rb_enumeratorize(argf, ID2SYM(rb_intern("each_codepoint")), 0, 0);
-    return argf_each_codepoint(argf);
-}
-
-/*
  *  call-seq:
  *     ARGF.filename  -> String
  *     ARGF.path      -> String
@@ -11676,8 +12842,8 @@ argf_filename_getter(ID id, VALUE *var)
  *  call-seq:
  *     ARGF.file  -> IO or File object
  *
- *  Returns the current file as an +IO+ or +File+ object. #<IO:<STDIN>> is
- *  returned when the current file is STDIN.
+ *  Returns the current file as an +IO+ or +File+ object.
+ *  <code>$stdin</code> is returned when the current file is STDIN.
  *
  *  For example:
  *
@@ -11722,10 +12888,10 @@ argf_binmode_m(VALUE argf)
  *  call-seq:
  *     ARGF.binmode?  -> true or false
  *
- *  Returns true if +ARGF+ is being read in binary mode; false otherwise. (To
- *  enable binary mode use +ARGF.binmode+.
+ *  Returns true if +ARGF+ is being read in binary mode; false otherwise.
+ *  To enable binary mode use +ARGF.binmode+.
  *
- * For example:
+ *  For example:
  *
  *     ARGF.binmode?  #=> false
  *     ARGF.binmode
@@ -11744,7 +12910,7 @@ argf_binmode_p(VALUE argf)
  *  Sets the current file to the next file in ARGV. If there aren't any more
  *  files it has no effect.
  *
- * For example:
+ *  For example:
  *
  *     $ ruby argf.rb foo bar
  *     ARGF.filename  #=> "foo"
@@ -11765,11 +12931,11 @@ argf_skip(VALUE argf)
  *  call-seq:
  *     ARGF.close  -> ARGF
  *
- *  Closes the current file and skips to the next in the stream. Trying to
- *  close a file that has already been closed causes an +IOError+ to be
- *  raised.
+ *  Closes the current file and skips to the next file in ARGV. If there are
+ *  no more files to open, just closes the current file. +STDIN+ will not be
+ *  closed.
  *
- * For example:
+ *  For example:
  *
  *     $ ruby argf.rb foo bar
  *
@@ -11777,7 +12943,6 @@ argf_skip(VALUE argf)
  *     ARGF.close
  *     ARGF.filename  #=> "bar"
  *     ARGF.close
- *     ARGF.close     #=> closed stream (IOError)
  */
 static VALUE
 argf_close_m(VALUE argf)
@@ -11823,14 +12988,15 @@ argf_to_s(VALUE argf)
  *     ARGF.inplace_mode  -> String
  *
  *  Returns the file extension appended to the names of modified files under
- *  inplace-edit mode. This value can be set using +ARGF.inplace_mode=+ or
+ *  in-place edit mode. This value can be set using +ARGF.inplace_mode=+ or
  *  passing the +-i+ switch to the Ruby binary.
  */
 static VALUE
 argf_inplace_mode_get(VALUE argf)
 {
     if (!ARGF.inplace) return Qnil;
-    return rb_str_new2(ARGF.inplace);
+    if (NIL_P(ARGF.inplace)) return rb_str_new(0, 0);
+    return rb_str_dup(ARGF.inplace);
 }
 
 static VALUE
@@ -11843,7 +13009,7 @@ opt_i_get(ID id, VALUE *var)
  *  call-seq:
  *     ARGF.inplace_mode = ext  -> ARGF
  *
- *  Sets the filename extension for in place editing mode to the given String.
+ *  Sets the filename extension for in-place editing mode to the given String.
  *  Each file being edited has this value appended to its filename. The
  *  modified file is saved under this new name.
  *
@@ -11856,24 +13022,20 @@ opt_i_get(ID id, VALUE *var)
  *        print line.sub("foo","bar")
  *      end
  *
- * Each line of _file.txt_ has the first occurrence of "foo" replaced with
- * "bar", then the new line is written out to _file.txt.bak_.
+ *  Each line of _file.txt_ has the first occurrence of "foo" replaced with
+ *  "bar", then the new line is written out to _file.txt.bak_.
  */
 static VALUE
 argf_inplace_mode_set(VALUE argf, VALUE val)
 {
-    if (rb_safe_level() >= 1 && OBJ_TAINTED(val))
-	rb_insecure_operation();
-
     if (!RTEST(val)) {
-	if (ARGF.inplace) free(ARGF.inplace);
-	ARGF.inplace = 0;
+	ARGF.inplace = Qfalse;
+    }
+    else if (StringValueCStr(val), !RSTRING_LEN(val)) {
+	ARGF.inplace = Qnil;
     }
     else {
-	StringValue(val);
-	if (ARGF.inplace) free(ARGF.inplace);
-	ARGF.inplace = 0;
-	ARGF.inplace = strdup(RSTRING_PTR(val));
+	ARGF.inplace = rb_str_new_frozen(val);
     }
     return argf;
 }
@@ -11884,18 +13046,10 @@ opt_i_set(VALUE val, ID id, VALUE *var)
     argf_inplace_mode_set(*var, val);
 }
 
-const char *
-ruby_get_inplace_mode(void)
-{
-    return ARGF.inplace;
-}
-
 void
 ruby_set_inplace_mode(const char *suffix)
 {
-    if (ARGF.inplace) free(ARGF.inplace);
-    ARGF.inplace = 0;
-    if (suffix) ARGF.inplace = strdup(suffix);
+    ARGF.inplace = !suffix ? Qfalse : !*suffix ? Qnil : rb_str_new(suffix, strlen(suffix));
 }
 
 /*
@@ -11959,53 +13113,67 @@ argf_write(VALUE argf, VALUE str)
 }
 
 void
-rb_readwrite_sys_fail(enum rb_io_wait_readwrite writable, const char *mesg)
+rb_readwrite_sys_fail(enum rb_io_wait_readwrite waiting, const char *mesg)
 {
-    rb_readwrite_syserr_fail(writable, errno, mesg);
+    rb_readwrite_syserr_fail(waiting, errno, mesg);
 }
 
 void
-rb_readwrite_syserr_fail(enum rb_io_wait_readwrite writable, int n, const char *mesg)
+rb_readwrite_syserr_fail(enum rb_io_wait_readwrite waiting, int n, const char *mesg)
 {
-    VALUE arg;
+    VALUE arg, c = Qnil;
     arg = mesg ? rb_str_new2(mesg) : Qnil;
-    if (writable == RB_IO_WAIT_WRITABLE) {
+    switch (waiting) {
+      case RB_IO_WAIT_WRITABLE:
 	switch (n) {
 	  case EAGAIN:
-	    rb_exc_raise(rb_class_new_instance(1, &arg, rb_eEAGAINWaitWritable));
+            c = rb_eEAGAINWaitWritable;
 	    break;
 #if EAGAIN != EWOULDBLOCK
 	  case EWOULDBLOCK:
-	    rb_exc_raise(rb_class_new_instance(1, &arg, rb_eEWOULDBLOCKWaitWritable));
+            c = rb_eEWOULDBLOCKWaitWritable;
 	    break;
 #endif
 	  case EINPROGRESS:
-	    rb_exc_raise(rb_class_new_instance(1, &arg, rb_eEINPROGRESSWaitWritable));
+            c = rb_eEINPROGRESSWaitWritable;
 	    break;
 	  default:
-	    rb_mod_sys_fail_str(rb_mWaitWritable, arg);
+            rb_mod_syserr_fail_str(rb_mWaitWritable, n, arg);
 	}
-    }
-    else if (writable == RB_IO_WAIT_READABLE) {
+        break;
+      case RB_IO_WAIT_READABLE:
 	switch (n) {
 	  case EAGAIN:
-	    rb_exc_raise(rb_class_new_instance(1, &arg, rb_eEAGAINWaitReadable));
+            c = rb_eEAGAINWaitReadable;
 	    break;
 #if EAGAIN != EWOULDBLOCK
 	  case EWOULDBLOCK:
-	    rb_exc_raise(rb_class_new_instance(1, &arg, rb_eEWOULDBLOCKWaitReadable));
+            c = rb_eEWOULDBLOCKWaitReadable;
 	    break;
 #endif
 	  case EINPROGRESS:
-	    rb_exc_raise(rb_class_new_instance(1, &arg, rb_eEINPROGRESSWaitReadable));
+            c = rb_eEINPROGRESSWaitReadable;
 	    break;
 	  default:
-	    rb_mod_sys_fail_str(rb_mWaitReadable, arg);
+            rb_mod_syserr_fail_str(rb_mWaitReadable, n, arg);
 	}
+        break;
+      default:
+	rb_bug("invalid read/write type passed to rb_readwrite_sys_fail: %d", waiting);
     }
-    else {
-	rb_bug("invalid read/write type passed to rb_readwrite_sys_fail: %d", writable);
-    }
+    rb_exc_raise(rb_class_new_instance(1, &arg, c));
+}
+
+static VALUE
+get_LAST_READ_LINE(ID _x, VALUE *_y)
+{
+    return rb_lastline_get();
+}
+
+static void
+set_LAST_READ_LINE(VALUE val, ID _x, VALUE *_y)
+{
+    rb_lastline_set(val);
 }
 
 /*
@@ -12019,8 +13187,8 @@ rb_readwrite_syserr_fail(enum rb_io_wait_readwrite writable, int n, const char *
  *    File.open("/etc/hosts") {|f| f.close; f.read }
  *      #=> IOError: closed stream
  *
- * Note that some IO failures raise +SystemCallError+s and these are not
- * subclasses of IOError:
+ * Note that some IO failures raise <code>SystemCallError</code>s
+ * and these are not subclasses of IOError:
  *
  *    File.open("does/not/exist")
  *      #=> Errno::ENOENT: No such file or directory - does/not/exist
@@ -12033,7 +13201,7 @@ rb_readwrite_syserr_fail(enum rb_io_wait_readwrite writable, int n, const char *
  * methods exist in two forms,
  *
  * one that returns +nil+ when the end of file is reached, the other
- * raises EOFError +EOFError+.
+ * raises +EOFError+.
  *
  * +EOFError+ is a subclass of +IOError+.
  *
@@ -12121,13 +13289,13 @@ rb_readwrite_syserr_fail(enum rb_io_wait_readwrite writable, int n, const char *
  *  <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"
+ *    "C:\\gumby\\ruby\\test.rb"
  *
  *  Our examples here will use the Unix-style forward slashes;
  *  File::ALT_SEPARATOR can be used to get the platform-specific separator
  *  character.
  *
- *  The global constant ARGF (also accessible as $<) provides an
+ *  The global constant ARGF (also accessible as <code>$<</code>) provides an
  *  IO-like stream which allows access to all files mentioned on the
  *  command line (or STDIN if no files are mentioned). ARGF#path and its alias
  *  ARGF#filename are provided to access the name of the file currently being
@@ -12166,9 +13334,6 @@ rb_readwrite_syserr_fail(enum rb_io_wait_readwrite writable, int n, const char *
 void
 Init_IO(void)
 {
-#undef rb_intern
-#define rb_intern(str) rb_intern_const(str)
-
     VALUE rb_cARGF;
 #ifdef __CYGWIN__
 #include <sys/cygwin.h>
@@ -12186,12 +13351,12 @@ Init_IO(void)
     rb_eIOError = rb_define_class("IOError", rb_eStandardError);
     rb_eEOFError = rb_define_class("EOFError", rb_eIOError);
 
-    id_write = rb_intern("write");
-    id_read = rb_intern("read");
-    id_getc = rb_intern("getc");
-    id_flush = rb_intern("flush");
-    id_readpartial = rb_intern("readpartial");
-    id_set_encoding = rb_intern("set_encoding");
+    id_write = rb_intern_const("write");
+    id_read = rb_intern_const("read");
+    id_getc = rb_intern_const("getc");
+    id_flush = rb_intern_const("flush");
+    id_readpartial = rb_intern_const("readpartial");
+    id_set_encoding = rb_intern_const("set_encoding");
 
     rb_define_global_function("syscall", rb_f_syscall, -1);
 
@@ -12214,10 +13379,18 @@ Init_IO(void)
     rb_cIO = rb_define_class("IO", rb_cObject);
     rb_include_module(rb_cIO, rb_mEnumerable);
 
+    rb_define_const(rb_cIO, "READABLE", INT2NUM(RUBY_IO_READABLE));
+    rb_define_const(rb_cIO, "WRITABLE", INT2NUM(RUBY_IO_WRITABLE));
+    rb_define_const(rb_cIO, "PRIORITY", INT2NUM(RUBY_IO_PRIORITY));
+
+    /* exception to wait for reading. see IO.select. */
     rb_mWaitReadable = rb_define_module_under(rb_cIO, "WaitReadable");
+    /* exception to wait for writing. see IO.select. */
     rb_mWaitWritable = rb_define_module_under(rb_cIO, "WaitWritable");
+    /* exception to wait for reading by EAGAIN. see IO.select. */
     rb_eEAGAINWaitReadable = rb_define_class_under(rb_cIO, "EAGAINWaitReadable", rb_eEAGAIN);
     rb_include_module(rb_eEAGAINWaitReadable, rb_mWaitReadable);
+    /* exception to wait for writing by EAGAIN. see IO.select. */
     rb_eEAGAINWaitWritable = rb_define_class_under(rb_cIO, "EAGAINWaitWritable", rb_eEAGAIN);
     rb_include_module(rb_eEAGAINWaitWritable, rb_mWaitWritable);
 #if EAGAIN == EWOULDBLOCK
@@ -12228,13 +13401,17 @@ Init_IO(void)
     /* same as IO::EAGAINWaitWritable */
     rb_define_const(rb_cIO, "EWOULDBLOCKWaitWritable", rb_eEAGAINWaitWritable);
 #else
+    /* exception to wait for reading by EWOULDBLOCK. see IO.select. */
     rb_eEWOULDBLOCKWaitReadable = rb_define_class_under(rb_cIO, "EWOULDBLOCKWaitReadable", rb_eEWOULDBLOCK);
     rb_include_module(rb_eEWOULDBLOCKWaitReadable, rb_mWaitReadable);
+    /* exception to wait for writing by EWOULDBLOCK. see IO.select. */
     rb_eEWOULDBLOCKWaitWritable = rb_define_class_under(rb_cIO, "EWOULDBLOCKWaitWritable", rb_eEWOULDBLOCK);
     rb_include_module(rb_eEWOULDBLOCKWaitWritable, rb_mWaitWritable);
 #endif
+    /* exception to wait for reading by EINPROGRESS. see IO.select. */
     rb_eEINPROGRESSWaitReadable = rb_define_class_under(rb_cIO, "EINPROGRESSWaitReadable", rb_eEINPROGRESS);
     rb_include_module(rb_eEINPROGRESSWaitReadable, rb_mWaitReadable);
+    /* exception to wait for writing by EINPROGRESS. see IO.select. */
     rb_eEINPROGRESSWaitWritable = rb_define_class_under(rb_cIO, "EINPROGRESSWaitWritable", rb_eEINPROGRESS);
     rb_include_module(rb_eEINPROGRESSWaitWritable, rb_mWaitWritable);
 
@@ -12263,17 +13440,18 @@ Init_IO(void)
     rb_define_method(rb_cIO, "initialize", rb_io_initialize, -1);
 
     rb_output_fs = Qnil;
-    rb_define_hooked_variable("$,", &rb_output_fs, 0, rb_str_setter);
+    rb_define_hooked_variable("$,", &rb_output_fs, 0, deprecated_str_setter);
 
-    rb_rs = rb_default_rs = rb_usascii_str_new2("\n");
+    rb_default_rs = rb_fstring_lit("\n"); /* avoid modifying RS_default */
     rb_gc_register_mark_object(rb_default_rs);
+    rb_rs = rb_default_rs;
     rb_output_rs = Qnil;
-    OBJ_FREEZE(rb_default_rs);	/* avoid modifying RS_default */
-    rb_define_hooked_variable("$/", &rb_rs, 0, rb_str_setter);
-    rb_define_hooked_variable("$-0", &rb_rs, 0, rb_str_setter);
-    rb_define_hooked_variable("$\\", &rb_output_rs, 0, rb_str_setter);
+    rb_define_hooked_variable("$/", &rb_rs, 0, deprecated_str_setter);
+    rb_define_hooked_variable("$-0", &rb_rs, 0, deprecated_str_setter);
+    rb_define_hooked_variable("$\\", &rb_output_rs, 0, deprecated_str_setter);
 
-    rb_define_virtual_variable("$_", rb_lastline_get, rb_lastline_set);
+    rb_define_virtual_variable("$_", get_LAST_READ_LINE, set_LAST_READ_LINE);
+    rb_gvar_ractor_local("$_");
 
     rb_define_method(rb_cIO, "initialize_copy", rb_io_init_copy, 1);
     rb_define_method(rb_cIO, "reopen", rb_io_reopen, -1);
@@ -12288,14 +13466,13 @@ Init_IO(void)
     rb_define_method(rb_cIO, "each_byte",  rb_io_each_byte, 0);
     rb_define_method(rb_cIO, "each_char",  rb_io_each_char, 0);
     rb_define_method(rb_cIO, "each_codepoint",  rb_io_each_codepoint, 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, "codepoints",  rb_io_codepoints, 0);
 
     rb_define_method(rb_cIO, "syswrite", rb_io_syswrite, 1);
     rb_define_method(rb_cIO, "sysread",  rb_io_sysread, -1);
 
+    rb_define_method(rb_cIO, "pread", rb_io_pread, -1);
+    rb_define_method(rb_cIO, "pwrite", rb_io_pwrite, 2);
+
     rb_define_method(rb_cIO, "fileno", rb_io_fileno, 0);
     rb_define_alias(rb_cIO, "to_i", "fileno");
     rb_define_method(rb_cIO, "to_io", rb_io_to_io, 0);
@@ -12310,13 +13487,9 @@ Init_IO(void)
 
     rb_define_method(rb_cIO, "readlines",  rb_io_readlines, -1);
 
-    /* for prelude.rb use only: */
-    rb_define_private_method(rb_cIO, "__read_nonblock", io_read_nonblock, 3);
-    rb_define_private_method(rb_cIO, "__write_nonblock", io_write_nonblock, 2);
-
     rb_define_method(rb_cIO, "readpartial",  io_readpartial, -1);
     rb_define_method(rb_cIO, "read",  io_read, -1);
-    rb_define_method(rb_cIO, "write", io_write_m, 1);
+    rb_define_method(rb_cIO, "write", io_write_m, -1);
     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);
@@ -12372,17 +13545,29 @@ Init_IO(void)
     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_method(rb_cIO, "set_encoding_by_bom", rb_io_set_encoding_by_bom, 0);
 
     rb_define_method(rb_cIO, "autoclose?", rb_io_autoclose_p, 0);
     rb_define_method(rb_cIO, "autoclose=", rb_io_set_autoclose, 1);
 
-    rb_define_variable("$stdin", &rb_stdin);
-    rb_stdin = prep_stdio(stdin, FMODE_READABLE, rb_cIO, "<STDIN>");
-    rb_define_hooked_variable("$stdout", &rb_stdout, 0, stdout_setter);
-    rb_stdout = prep_stdio(stdout, FMODE_WRITABLE, rb_cIO, "<STDOUT>");
-    rb_define_hooked_variable("$stderr", &rb_stderr, 0, stdout_setter);
-    rb_stderr = prep_stdio(stderr, FMODE_WRITABLE|FMODE_SYNC, rb_cIO, "<STDERR>");
-    rb_define_hooked_variable("$>", &rb_stdout, 0, stdout_setter);
+    rb_define_virtual_variable("$stdin",  stdin_getter,  stdin_setter);
+    rb_define_virtual_variable("$stdout", stdout_getter, stdout_setter);
+    rb_define_virtual_variable("$>",      stdout_getter, stdout_setter);
+    rb_define_virtual_variable("$stderr", stderr_getter, stderr_setter);
+
+    rb_gvar_ractor_local("$stdin");
+    rb_gvar_ractor_local("$stdout");
+    rb_gvar_ractor_local("$>");
+    rb_gvar_ractor_local("$stderr");
+
+    rb_stdin  = rb_io_prep_stdin();
+    rb_stdout = rb_io_prep_stdout();
+    rb_stderr = rb_io_prep_stderr();
+
+    rb_global_variable(&rb_stdin);
+    rb_global_variable(&rb_stdout);
+    rb_global_variable(&rb_stderr);
+
     orig_stdout = rb_stdout;
     orig_stderr = rb_stderr;
 
@@ -12419,10 +13604,6 @@ Init_IO(void)
     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, "each_codepoint",  argf_each_codepoint, 0);
-    rb_define_method(rb_cARGF, "lines", argf_lines, -1);
-    rb_define_method(rb_cARGF, "bytes", argf_bytes, 0);
-    rb_define_method(rb_cARGF, "chars", argf_chars, 0);
-    rb_define_method(rb_cARGF, "codepoints", argf_codepoints, 0);
 
     rb_define_method(rb_cARGF, "read",  argf_read, -1);
     rb_define_method(rb_cARGF, "readpartial",  argf_readpartial, -1);
@@ -12484,6 +13665,8 @@ Init_IO(void)
     ARGF.filename = rb_str_new2("-");
 
     rb_define_hooked_variable("$-i", &argf, opt_i_get, opt_i_set);
+    rb_gvar_ractor_local("$-i");
+
     rb_define_hooked_variable("$*", &argf, argf_argv_getter, rb_gvar_readonly_setter);
 
 #if defined (_WIN32) || defined(__CYGWIN__)
@@ -12494,31 +13677,33 @@ Init_IO(void)
 
     rb_define_method(rb_cFile, "initialize",  rb_file_initialize, -1);
 
-    sym_mode = ID2SYM(rb_intern("mode"));
-    sym_perm = ID2SYM(rb_intern("perm"));
-    sym_flags = ID2SYM(rb_intern("flags"));
-    sym_extenc = ID2SYM(rb_intern("external_encoding"));
-    sym_intenc = ID2SYM(rb_intern("internal_encoding"));
+    sym_mode = ID2SYM(rb_intern_const("mode"));
+    sym_perm = ID2SYM(rb_intern_const("perm"));
+    sym_flags = ID2SYM(rb_intern_const("flags"));
+    sym_extenc = ID2SYM(rb_intern_const("external_encoding"));
+    sym_intenc = ID2SYM(rb_intern_const("internal_encoding"));
     sym_encoding = ID2SYM(rb_id_encoding());
-    sym_open_args = ID2SYM(rb_intern("open_args"));
-    sym_textmode = ID2SYM(rb_intern("textmode"));
-    sym_binmode = ID2SYM(rb_intern("binmode"));
-    sym_autoclose = ID2SYM(rb_intern("autoclose"));
-    sym_normal = ID2SYM(rb_intern("normal"));
-    sym_sequential = ID2SYM(rb_intern("sequential"));
-    sym_random = ID2SYM(rb_intern("random"));
-    sym_willneed = ID2SYM(rb_intern("willneed"));
-    sym_dontneed = ID2SYM(rb_intern("dontneed"));
-    sym_noreuse = ID2SYM(rb_intern("noreuse"));
-    sym_SET = ID2SYM(rb_intern("SET"));
-    sym_CUR = ID2SYM(rb_intern("CUR"));
-    sym_END = ID2SYM(rb_intern("END"));
+    sym_open_args = ID2SYM(rb_intern_const("open_args"));
+    sym_textmode = ID2SYM(rb_intern_const("textmode"));
+    sym_binmode = ID2SYM(rb_intern_const("binmode"));
+    sym_autoclose = ID2SYM(rb_intern_const("autoclose"));
+    sym_normal = ID2SYM(rb_intern_const("normal"));
+    sym_sequential = ID2SYM(rb_intern_const("sequential"));
+    sym_random = ID2SYM(rb_intern_const("random"));
+    sym_willneed = ID2SYM(rb_intern_const("willneed"));
+    sym_dontneed = ID2SYM(rb_intern_const("dontneed"));
+    sym_noreuse = ID2SYM(rb_intern_const("noreuse"));
+    sym_SET = ID2SYM(rb_intern_const("SET"));
+    sym_CUR = ID2SYM(rb_intern_const("CUR"));
+    sym_END = ID2SYM(rb_intern_const("END"));
 #ifdef SEEK_DATA
-    sym_DATA = ID2SYM(rb_intern("DATA"));
+    sym_DATA = ID2SYM(rb_intern_const("DATA"));
 #endif
 #ifdef SEEK_HOLE
-    sym_HOLE = ID2SYM(rb_intern("HOLE"));
+    sym_HOLE = ID2SYM(rb_intern_const("HOLE"));
 #endif
-    sym_wait_readable = ID2SYM(rb_intern("wait_readable"));
-    sym_wait_writable = ID2SYM(rb_intern("wait_writable"));
+    sym_wait_readable = ID2SYM(rb_intern_const("wait_readable"));
+    sym_wait_writable = ID2SYM(rb_intern_const("wait_writable"));
 }
+
+#include "io.rbinc"
diff --git a/io.rb b/io.rb
new file mode 100644
index 0000000000..40873ea4fd
--- /dev/null
+++ b/io.rb
@@ -0,0 +1,123 @@
+class IO
+  # other IO methods are defined in io.c
+
+  # call-seq:
+  #    ios.read_nonblock(maxlen [, options])              -> string
+  #    ios.read_nonblock(maxlen, outbuf [, options])      -> outbuf
+  #
+  # Reads at most <i>maxlen</i> bytes from <em>ios</em> using
+  # the read(2) system call after O_NONBLOCK is set for
+  # the underlying file descriptor.
+  #
+  # If the optional <i>outbuf</i> argument is present,
+  # it must reference a String, which will receive the data.
+  # The <i>outbuf</i> will contain only the received data after the method call
+  # even if it is not empty at the beginning.
+  #
+  # read_nonblock just calls the read(2) system call.
+  # It causes all errors the read(2) system call causes: Errno::EWOULDBLOCK, Errno::EINTR, etc.
+  # The caller should care such errors.
+  #
+  # If the exception is Errno::EWOULDBLOCK or Errno::EAGAIN,
+  # it is extended by IO::WaitReadable.
+  # So IO::WaitReadable can be used to rescue the exceptions for retrying
+  # read_nonblock.
+  #
+  # read_nonblock causes EOFError on EOF.
+  #
+  # On some platforms, such as Windows, non-blocking mode is not supported
+  # on IO objects other than sockets. In such cases, Errno::EBADF will
+  # be raised.
+  #
+  # If the read byte buffer is not empty,
+  # read_nonblock reads from the buffer like readpartial.
+  # In this case, the read(2) system call is not called.
+  #
+  # When read_nonblock raises an exception kind of IO::WaitReadable,
+  # read_nonblock should not be called
+  # until io is readable for avoiding busy loop.
+  # This can be done as follows.
+  #
+  #   # emulates blocking read (readpartial).
+  #   begin
+  #     result = io.read_nonblock(maxlen)
+  #   rescue IO::WaitReadable
+  #     IO.select([io])
+  #     retry
+  #   end
+  #
+  # Although IO#read_nonblock doesn't raise IO::WaitWritable.
+  # OpenSSL::Buffering#read_nonblock can raise IO::WaitWritable.
+  # If IO and SSL should be used polymorphically,
+  # IO::WaitWritable should be rescued too.
+  # See the document of OpenSSL::Buffering#read_nonblock for sample code.
+  #
+  # Note that this method is identical to readpartial
+  # except the non-blocking flag is set.
+  #
+  # By specifying a keyword argument _exception_ to +false+, you can indicate
+  # that read_nonblock should not raise an IO::WaitReadable exception, but
+  # return the symbol +:wait_readable+ instead. At EOF, it will return nil
+  # instead of raising EOFError.
+  def read_nonblock(len, buf = nil, exception: true)
+    Primitive.io_read_nonblock(len, buf, exception)
+  end
+
+  # call-seq:
+  #    ios.write_nonblock(string)   -> integer
+  #    ios.write_nonblock(string [, options])   -> integer
+  #
+  # Writes the given string to <em>ios</em> using
+  # the write(2) system call after O_NONBLOCK is set for
+  # the underlying file descriptor.
+  #
+  # It returns the number of bytes written.
+  #
+  # write_nonblock just calls the write(2) system call.
+  # It causes all errors the write(2) system call causes: Errno::EWOULDBLOCK, Errno::EINTR, etc.
+  # The result may also be smaller than string.length (partial write).
+  # The caller should care such errors and partial write.
+  #
+  # If the exception is Errno::EWOULDBLOCK or Errno::EAGAIN,
+  # it is extended by IO::WaitWritable.
+  # So IO::WaitWritable can be used to rescue the exceptions for retrying write_nonblock.
+  #
+  #   # Creates a pipe.
+  #   r, w = IO.pipe
+  #
+  #   # write_nonblock writes only 65536 bytes and return 65536.
+  #   # (The pipe size is 65536 bytes on this environment.)
+  #   s = "a" * 100000
+  #   p w.write_nonblock(s)     #=> 65536
+  #
+  #   # write_nonblock cannot write a byte and raise EWOULDBLOCK (EAGAIN).
+  #   p w.write_nonblock("b")   # Resource temporarily unavailable (Errno::EAGAIN)
+  #
+  # If the write buffer is not empty, it is flushed at first.
+  #
+  # When write_nonblock raises an exception kind of IO::WaitWritable,
+  # write_nonblock should not be called
+  # until io is writable for avoiding busy loop.
+  # This can be done as follows.
+  #
+  #   begin
+  #     result = io.write_nonblock(string)
+  #   rescue IO::WaitWritable, Errno::EINTR
+  #     IO.select(nil, [io])
+  #     retry
+  #   end
+  #
+  # Note that this doesn't guarantee to write all data in string.
+  # The length written is reported as result and it should be checked later.
+  #
+  # On some platforms such as Windows, write_nonblock is not supported
+  # according to the kind of the IO object.
+  # In such cases, write_nonblock raises <code>Errno::EBADF</code>.
+  #
+  # By specifying a keyword argument _exception_ to +false+, you can indicate
+  # that write_nonblock should not raise an IO::WaitWritable exception, but
+  # return the symbol +:wait_writable+ instead.
+  def write_nonblock(buf, exception: true)
+    Primitive.io_write_nonblock(buf, exception)
+  end
+end
diff --git a/iseq.c b/iseq.c
index 28d35eb328..2d83bc3f06 100644
--- a/iseq.c
+++ b/iseq.c
@@ -9,20 +9,37 @@
 
 **********************************************************************/
 
-#include "internal.h"
-#include "ruby/util.h"
-#include "eval_intern.h"
+#define RUBY_VM_INSNS_INFO 1
+/* #define RUBY_MARK_FREE_DEBUG 1 */
+
+#include "ruby/internal/config.h"
 
 #ifdef HAVE_DLADDR
 # include <dlfcn.h>
 #endif
 
-/* #define RUBY_MARK_FREE_DEBUG 1 */
+#include "eval_intern.h"
 #include "gc.h"
-#include "vm_core.h"
-#include "iseq.h"
 #include "id_table.h"
+#include "internal.h"
+#include "internal/bits.h"
+#include "internal/class.h"
+#include "internal/compile.h"
+#include "internal/error.h"
+#include "internal/file.h"
+#include "internal/hash.h"
+#include "internal/parse.h"
+#include "internal/sanitizers.h"
+#include "internal/symbol.h"
+#include "internal/thread.h"
+#include "internal/variable.h"
+#include "iseq.h"
+#include "mjit.h"
+#include "ruby/util.h"
+#include "vm_core.h"
+#include "vm_callinfo.h"
 
+#include "builtin.h"
 #include "insns.inc"
 #include "insns_info.inc"
 
@@ -30,6 +47,12 @@ VALUE rb_cISeq;
 static VALUE iseqw_new(const rb_iseq_t *iseq);
 static const rb_iseq_t *iseqw_check(VALUE iseqw);
 
+#if VM_INSN_INFO_TABLE_IMPL == 2
+static struct succ_index_table *succ_index_table_create(int max_pos, int *data, int size);
+static unsigned int *succ_index_table_invert(int max_pos, struct succ_index_table *sd, int size);
+static int succ_index_lookup(const struct succ_index_table *sd, int x);
+#endif
+
 #define hidden_obj_p(obj) (!SPECIAL_CONST_P(obj) && !RBASIC(obj)->klass)
 
 static inline VALUE
@@ -43,22 +66,34 @@ obj_resurrect(VALUE obj)
 	  case T_ARRAY:
 	    obj = rb_ary_resurrect(obj);
 	    break;
+          case T_HASH:
+            obj = rb_hash_resurrect(obj);
+            break;
+          default:
+	    break;
 	}
     }
     return obj;
 }
 
 static void
+free_arena(struct iseq_compile_data_storage *cur)
+{
+    struct iseq_compile_data_storage *next;
+
+    while (cur) {
+        next = cur->next;
+        ruby_xfree(cur);
+        cur = next;
+    }
+}
+
+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;
-	}
+	free_arena(compile_data->node.storage_head);
+	free_arena(compile_data->insn.storage_head);
 	if (compile_data->ivar_cache_table) {
 	    rb_id_table_free(compile_data->ivar_cache_table);
 	}
@@ -71,63 +106,320 @@ rb_iseq_free(const rb_iseq_t *iseq)
 {
     RUBY_FREE_ENTER("iseq");
 
-    if (iseq) {
-	if (iseq->body) {
-	    ruby_xfree((void *)iseq->body->iseq_encoded);
-	    ruby_xfree((void *)iseq->body->line_info_table);
-	    ruby_xfree((void *)iseq->body->local_table);
-	    ruby_xfree((void *)iseq->body->is_entries);
-
-	    if (iseq->body->ci_entries) {
-		unsigned int i;
-		struct rb_call_info_with_kwarg *ci_kw_entries = (struct rb_call_info_with_kwarg *)&iseq->body->ci_entries[iseq->body->ci_size];
-		for (i=0; i<iseq->body->ci_kw_size; i++) {
-		    const struct rb_call_info_kw_arg *kw_arg = ci_kw_entries[i].kw_arg;
-		    ruby_xfree((void *)kw_arg);
-		}
-		ruby_xfree(iseq->body->ci_entries);
-		ruby_xfree(iseq->body->cc_entries);
-	    }
-	    ruby_xfree((void *)iseq->body->catch_table);
-	    ruby_xfree((void *)iseq->body->param.opt_table);
+    if (iseq && iseq->body) {
+	struct rb_iseq_constant_body *const body = iseq->body;
+	mjit_free_iseq(iseq); /* Notify MJIT */
+	ruby_xfree((void *)body->iseq_encoded);
+	ruby_xfree((void *)body->insns_info.body);
+	if (body->insns_info.positions) ruby_xfree((void *)body->insns_info.positions);
+#if VM_INSN_INFO_TABLE_IMPL == 2
+	if (body->insns_info.succ_index_table) ruby_xfree(body->insns_info.succ_index_table);
+#endif
+        if (LIKELY(body->local_table != rb_iseq_shared_exc_local_tbl))
+            ruby_xfree((void *)body->local_table);
+	ruby_xfree((void *)body->is_entries);
 
-	    if (iseq->body->param.keyword != NULL) {
-		ruby_xfree((void *)iseq->body->param.keyword->default_values);
-		ruby_xfree((void *)iseq->body->param.keyword);
-	    }
-	    compile_data_free(ISEQ_COMPILE_DATA(iseq));
-	    ruby_xfree(iseq->body);
+        if (body->call_data) {
+            ruby_xfree(body->call_data);
 	}
+	ruby_xfree((void *)body->catch_table);
+	ruby_xfree((void *)body->param.opt_table);
+
+	if (body->param.keyword != NULL) {
+	    ruby_xfree((void *)body->param.keyword->default_values);
+	    ruby_xfree((void *)body->param.keyword);
+	}
+	compile_data_free(ISEQ_COMPILE_DATA(iseq));
+        if (body->outer_variables) rb_id_table_free(body->outer_variables);
+	ruby_xfree(body);
     }
+
+    if (iseq && ISEQ_EXECUTABLE_P(iseq) && iseq->aux.exec.local_hooks) {
+        rb_hook_list_free(iseq->aux.exec.local_hooks);
+    }
+
     RUBY_FREE_LEAVE("iseq");
 }
 
+#if OPT_DIRECT_THREADED_CODE || OPT_CALL_THREADED_CODE
+static VALUE
+rb_vm_insn_addr2insn2(const void *addr)
+{
+    return (VALUE)rb_vm_insn_addr2insn(addr);
+}
+#endif
+
+static VALUE
+rb_vm_insn_null_translator(const void *addr)
+{
+    return (VALUE)addr;
+}
+
+typedef VALUE iseq_value_itr_t(void *ctx, VALUE obj);
+typedef VALUE rb_vm_insns_translator_t(const void *addr);
+
+static int
+iseq_extract_values(VALUE *code, size_t pos, iseq_value_itr_t * func, void *data, rb_vm_insns_translator_t * translator)
+{
+    VALUE insn = translator((void *)code[pos]);
+    int len = insn_len(insn);
+    int op_no;
+    const char *types = insn_op_types(insn);
+
+    for (op_no = 0; types[op_no]; op_no++) {
+	char type = types[op_no];
+	switch (type) {
+          case TS_CDHASH:
+          case TS_ISEQ:
+          case TS_VALUE:
+            {
+              VALUE op = code[pos + op_no + 1];
+              if (!SPECIAL_CONST_P(op)) {
+                  VALUE newop = func(data, op);
+                  if (newop != op) {
+                      code[pos + op_no + 1] = newop;
+                  }
+              }
+            }
+            break;
+          case TS_IC:
+            {
+                IC ic = (IC)code[pos + op_no + 1];
+                if (ic->entry) {
+                    VALUE nv = func(data, (VALUE)ic->entry);
+                    if ((VALUE)ic->entry != nv) {
+                        ic->entry = (void *)nv;
+                    }
+                }
+            }
+            break;
+          case TS_IVC:
+            {
+                IVC ivc = (IVC)code[pos + op_no + 1];
+                if (ivc->entry) {
+                    if (RB_TYPE_P(ivc->entry->class_value, T_NONE)) {
+                        rb_bug("!! %u", ivc->entry->index);
+                    }
+                    VALUE nv = func(data, ivc->entry->class_value);
+                    if (ivc->entry->class_value != nv) {
+                        ivc->entry->class_value = nv;
+                    }
+                }
+            }
+            break;
+          case TS_ISE:
+            {
+              union iseq_inline_storage_entry *const is = (union iseq_inline_storage_entry *)code[pos + op_no + 1];
+              if (is->once.value) {
+                  VALUE nv = func(data, is->once.value);
+                  if (is->once.value != nv) {
+                      is->once.value = nv;
+                  }
+              }
+            }
+            break;
+          default:
+            break;
+	}
+    }
+
+    return len;
+}
+
+static void
+rb_iseq_each_value(const rb_iseq_t *iseq, iseq_value_itr_t * func, void *data)
+{
+    unsigned int size;
+    VALUE *code;
+    size_t n;
+    rb_vm_insns_translator_t *const translator =
+#if OPT_DIRECT_THREADED_CODE || OPT_CALL_THREADED_CODE
+        (FL_TEST((VALUE)iseq, ISEQ_TRANSLATED)) ? rb_vm_insn_addr2insn2 :
+#endif
+        rb_vm_insn_null_translator;
+    const struct rb_iseq_constant_body *const body = iseq->body;
+
+    size = body->iseq_size;
+    code = body->iseq_encoded;
+
+    for (n = 0; n < size;) {
+	n += iseq_extract_values(code, n, func, data, translator);
+    }
+}
+
+static VALUE
+update_each_insn_value(void *ctx, VALUE obj)
+{
+    return rb_gc_location(obj);
+}
+
+void
+rb_iseq_update_references(rb_iseq_t *iseq)
+{
+    if (iseq->body) {
+        struct rb_iseq_constant_body *body = iseq->body;
+
+        body->variable.coverage = rb_gc_location(body->variable.coverage);
+        body->variable.pc2branchindex = rb_gc_location(body->variable.pc2branchindex);
+        body->location.label = rb_gc_location(body->location.label);
+        body->location.base_label = rb_gc_location(body->location.base_label);
+        body->location.pathobj = rb_gc_location(body->location.pathobj);
+        if (body->local_iseq) {
+            body->local_iseq = (struct rb_iseq_struct *)rb_gc_location((VALUE)body->local_iseq);
+        }
+        if (body->parent_iseq) {
+            body->parent_iseq = (struct rb_iseq_struct *)rb_gc_location((VALUE)body->parent_iseq);
+        }
+        if (body->call_data) {
+            for (unsigned int i=0; i<body->ci_size; i++) {
+                struct rb_call_data *cds = body->call_data;
+                if (!SPECIAL_CONST_P((VALUE)cds[i].ci)) {
+                    cds[i].ci = (struct rb_callinfo *)rb_gc_location((VALUE)cds[i].ci);
+                }
+                cds[i].cc = (struct rb_callcache *)rb_gc_location((VALUE)cds[i].cc);
+            }
+        }
+        if (FL_TEST((VALUE)iseq, ISEQ_MARKABLE_ISEQ)) {
+            rb_iseq_each_value(iseq, update_each_insn_value, NULL);
+            VALUE *original_iseq = ISEQ_ORIGINAL_ISEQ(iseq);
+            if (original_iseq) {
+                size_t n = 0;
+                const unsigned int size = body->iseq_size;
+                while (n < size) {
+                    n += iseq_extract_values(original_iseq, n, update_each_insn_value, NULL, rb_vm_insn_null_translator);
+                }
+            }
+        }
+
+        if (body->param.flags.has_kw && ISEQ_COMPILE_DATA(iseq) == NULL) {
+            int i, j;
+
+            i = body->param.keyword->required_num;
+
+            for (j = 0; i < body->param.keyword->num; i++, j++) {
+                VALUE obj = body->param.keyword->default_values[j];
+                if (obj != Qundef) {
+                    body->param.keyword->default_values[j] = rb_gc_location(obj);
+                }
+            }
+        }
+
+        if (body->catch_table) {
+            struct iseq_catch_table *table = body->catch_table;
+            unsigned int i;
+            for (i = 0; i < table->size; i++) {
+                struct iseq_catch_table_entry *entry;
+                entry = UNALIGNED_MEMBER_PTR(table, entries[i]);
+                if (entry->iseq) {
+                    entry->iseq = (rb_iseq_t *)rb_gc_location((VALUE)entry->iseq);
+                }
+            }
+        }
+#if USE_MJIT
+        mjit_update_references(iseq);
+#endif
+    }
+}
+
+static VALUE
+each_insn_value(void *ctx, VALUE obj)
+{
+    rb_gc_mark_movable(obj);
+    return obj;
+}
+
 void
 rb_iseq_mark(const rb_iseq_t *iseq)
 {
     RUBY_MARK_ENTER("iseq");
 
-    RUBY_GC_INFO("%s @ %s\n", RSTRING_PTR(iseq->body->location.label), RSTRING_PTR(iseq->body->location.path));
+    RUBY_MARK_UNLESS_NULL(iseq->wrapper);
 
     if (iseq->body) {
-	const struct rb_iseq_constant_body *body = iseq->body;
+	const struct rb_iseq_constant_body *const body = iseq->body;
 
-	RUBY_MARK_UNLESS_NULL(body->mark_ary);
-	rb_gc_mark(body->location.label);
-	rb_gc_mark(body->location.base_label);
-	rb_gc_mark(body->location.path);
-	RUBY_MARK_UNLESS_NULL(body->location.absolute_path);
-	RUBY_MARK_UNLESS_NULL((VALUE)body->parent_iseq);
+        if (FL_TEST((VALUE)iseq, ISEQ_MARKABLE_ISEQ)) {
+	    rb_iseq_each_value(iseq, each_insn_value, NULL);
+	}
+
+        rb_gc_mark_movable(body->variable.coverage);
+        rb_gc_mark_movable(body->variable.pc2branchindex);
+        rb_gc_mark_movable(body->location.label);
+        rb_gc_mark_movable(body->location.base_label);
+        rb_gc_mark_movable(body->location.pathobj);
+        RUBY_MARK_MOVABLE_UNLESS_NULL((VALUE)body->parent_iseq);
+
+        if (body->call_data) {
+            struct rb_call_data *cds = (struct rb_call_data *)body->call_data;
+            for (unsigned int i=0; i<body->ci_size; i++) {
+                const struct rb_callinfo *ci = cds[i].ci;
+                const struct rb_callcache *cc = cds[i].cc;
+
+                if (vm_ci_markable(ci)) {
+                    rb_gc_mark_movable((VALUE)ci);
+                }
+                if (cc && vm_cc_markable(cc)) {
+                    if (!vm_cc_invalidated_p(cc)) {
+                        rb_gc_mark_movable((VALUE)cc);
+                    }
+                    else {
+                        cds[i].cc = rb_vm_empty_cc();
+                    }
+                }
+            }
+        }
+
+	if (body->param.flags.has_kw && ISEQ_COMPILE_DATA(iseq) == NULL) {
+	    const struct rb_iseq_param_keyword *const keyword = body->param.keyword;
+	    int i, j;
+
+	    i = keyword->required_num;
+
+	    for (j = 0; i < keyword->num; i++, j++) {
+		VALUE obj = keyword->default_values[j];
+		if (!SPECIAL_CONST_P(obj)) {
+                    rb_gc_mark_movable(obj);
+		}
+	    }
+	}
+
+	if (body->catch_table) {
+	    const struct iseq_catch_table *table = body->catch_table;
+	    unsigned int i;
+	    for (i = 0; i < table->size; i++) {
+		const struct iseq_catch_table_entry *entry;
+		entry = UNALIGNED_MEMBER_PTR(table, entries[i]);
+		if (entry->iseq) {
+                    rb_gc_mark_movable((VALUE)entry->iseq);
+		}
+	    }
+	}
+
+#if USE_MJIT
+        mjit_mark_cc_entries(body);
+#endif
     }
 
-    if (FL_TEST(iseq, ISEQ_NOT_LOADED_YET)) {
+    if (FL_TEST_RAW((VALUE)iseq, ISEQ_NOT_LOADED_YET)) {
 	rb_gc_mark(iseq->aux.loader.obj);
     }
-    else if (ISEQ_COMPILE_DATA(iseq) != 0) {
+    else if (FL_TEST_RAW((VALUE)iseq, ISEQ_USE_COMPILE_DATA)) {
 	const struct iseq_compile_data *const compile_data = ISEQ_COMPILE_DATA(iseq);
-	RUBY_MARK_UNLESS_NULL(compile_data->mark_ary);
-	RUBY_MARK_UNLESS_NULL(compile_data->err_info);
-	RUBY_MARK_UNLESS_NULL(compile_data->catch_table_ary);
+
+        rb_iseq_mark_insn_storage(compile_data->insn.storage_head);
+
+        RUBY_MARK_UNLESS_NULL(compile_data->err_info);
+        if (RTEST(compile_data->catch_table_ary)) {
+            rb_gc_mark(compile_data->catch_table_ary);
+        }
+        VM_ASSERT(compile_data != NULL);
+    }
+    else {
+        /* executable */
+        VM_ASSERT(ISEQ_EXECUTABLE_P(iseq));
+        if (iseq->aux.exec.local_hooks) {
+            rb_hook_list_mark(iseq->aux.exec.local_hooks);
+        }
     }
 
     RUBY_MARK_LEAVE("iseq");
@@ -146,8 +438,8 @@ param_keyword_size(const struct rb_iseq_param_keyword *pkw)
     return size;
 }
 
-static size_t
-iseq_memsize(const rb_iseq_t *iseq)
+size_t
+rb_iseq_memsize(const rb_iseq_t *iseq)
 {
     size_t size = 0; /* struct already counted as RVALUE size */
     const struct rb_iseq_constant_body *body = iseq->body;
@@ -155,41 +447,23 @@ iseq_memsize(const rb_iseq_t *iseq)
 
     /* TODO: should we count original_iseq? */
 
-    if (body) {
-	struct rb_call_info_with_kwarg *ci_kw_entries = (struct rb_call_info_with_kwarg *)&body->ci_entries[body->ci_size];
-
-	size += sizeof(struct rb_iseq_constant_body);
-	size += body->iseq_size * sizeof(VALUE);
-	size += body->line_info_size * sizeof(struct iseq_line_info_entry);
-	size += body->local_table_size * sizeof(ID);
-	if (body->catch_table) {
-	    size += iseq_catch_table_bytes(body->catch_table->size);
-	}
-	size += (body->param.opt_num + 1) * sizeof(VALUE);
-	size += param_keyword_size(body->param.keyword);
-
-	/* body->is_entries */
-	size += body->is_size * sizeof(union iseq_inline_storage_entry);
-
-	/* body->ci_entries */
-	size += body->ci_size * sizeof(struct rb_call_info);
-	size += body->ci_kw_size * sizeof(struct rb_call_info_with_kwarg);
-
-	/* body->cc_entries */
-	size += body->ci_size * sizeof(struct rb_call_cache);
-	size += body->ci_kw_size * sizeof(struct rb_call_cache);
-
-	if (ci_kw_entries) {
-	    unsigned int i;
+    if (ISEQ_EXECUTABLE_P(iseq) && body) {
+        size += sizeof(struct rb_iseq_constant_body);
+        size += body->iseq_size * sizeof(VALUE);
+        size += body->insns_info.size * (sizeof(struct iseq_insn_info_entry) + sizeof(unsigned int));
+        size += body->local_table_size * sizeof(ID);
+        if (body->catch_table) {
+            size += iseq_catch_table_bytes(body->catch_table->size);
+        }
+        size += (body->param.opt_num + 1) * sizeof(VALUE);
+        size += param_keyword_size(body->param.keyword);
 
-	    for (i = 0; i < body->ci_kw_size; i++) {
-		const struct rb_call_info_kw_arg *kw_arg = ci_kw_entries[i].kw_arg;
+        /* body->is_entries */
+        size += body->is_size * sizeof(union iseq_inline_storage_entry);
 
-		if (kw_arg) {
-		    size += rb_call_info_kw_arg_bytes(kw_arg->keyword_len);
-		}
-	    }
-	}
+        /* body->call_data */
+        size += body->ci_size * sizeof(struct rb_call_data);
+        // TODO: should we count imemo_callinfo?
     }
 
     compile_data = ISEQ_COMPILE_DATA(iseq);
@@ -198,9 +472,9 @@ iseq_memsize(const rb_iseq_t *iseq)
 
 	size += sizeof(struct iseq_compile_data);
 
-	cur = compile_data->storage_head;
+	cur = compile_data->node.storage_head;
 	while (cur) {
-	    size += cur->size + SIZEOF_ISEQ_COMPILE_DATA_STORAGE;
+	    size += cur->size + offsetof(struct iseq_compile_data_storage, buff);
 	    cur = cur->next;
 	}
     }
@@ -208,126 +482,228 @@ iseq_memsize(const rb_iseq_t *iseq)
     return size;
 }
 
+struct rb_iseq_constant_body *
+rb_iseq_constant_body_alloc(void)
+{
+    struct rb_iseq_constant_body *iseq_body;
+    iseq_body = ZALLOC(struct rb_iseq_constant_body);
+    return iseq_body;
+}
+
 static rb_iseq_t *
 iseq_alloc(void)
 {
     rb_iseq_t *iseq = iseq_imemo_alloc();
-    iseq->body = ZALLOC(struct rb_iseq_constant_body);
+    iseq->body = rb_iseq_constant_body_alloc();
     return iseq;
 }
 
-static rb_iseq_location_t *
-iseq_location_setup(rb_iseq_t *iseq, VALUE path, VALUE absolute_path, VALUE name, VALUE first_lineno)
+VALUE
+rb_iseq_pathobj_new(VALUE path, VALUE realpath)
 {
-    rb_iseq_location_t *loc = &iseq->body->location;
-    RB_OBJ_WRITE(iseq, &loc->path, path);
-    if (RTEST(absolute_path) && rb_str_cmp(path, absolute_path) == 0) {
-	RB_OBJ_WRITE(iseq, &loc->absolute_path, path);
+    VALUE pathobj;
+    VM_ASSERT(RB_TYPE_P(path, T_STRING));
+    VM_ASSERT(realpath == Qnil || RB_TYPE_P(realpath, T_STRING));
+
+    if (path == realpath ||
+	(!NIL_P(realpath) && rb_str_cmp(path, realpath) == 0)) {
+	pathobj = rb_fstring(path);
     }
     else {
-	RB_OBJ_WRITE(iseq, &loc->absolute_path, absolute_path);
+	if (!NIL_P(realpath)) realpath = rb_fstring(realpath);
+	pathobj = rb_ary_new_from_args(2, rb_fstring(path), realpath);
+	rb_obj_freeze(pathobj);
     }
+    return pathobj;
+}
+
+void
+rb_iseq_pathobj_set(const rb_iseq_t *iseq, VALUE path, VALUE realpath)
+{
+    RB_OBJ_WRITE(iseq, &iseq->body->location.pathobj,
+		 rb_iseq_pathobj_new(path, realpath));
+}
+
+static rb_iseq_location_t *
+iseq_location_setup(rb_iseq_t *iseq, VALUE name, VALUE path, VALUE realpath, VALUE first_lineno, const rb_code_location_t *code_location, const int node_id)
+{
+    rb_iseq_location_t *loc = &iseq->body->location;
+
+    rb_iseq_pathobj_set(iseq, path, realpath);
     RB_OBJ_WRITE(iseq, &loc->label, name);
     RB_OBJ_WRITE(iseq, &loc->base_label, name);
     loc->first_lineno = first_lineno;
+    if (code_location) {
+        loc->node_id = node_id;
+	loc->code_location = *code_location;
+    }
+    else {
+	loc->code_location.beg_pos.lineno = 0;
+	loc->code_location.beg_pos.column = 0;
+	loc->code_location.end_pos.lineno = -1;
+	loc->code_location.end_pos.column = -1;
+    }
+
     return loc;
 }
 
 static void
 set_relation(rb_iseq_t *iseq, const rb_iseq_t *piseq)
 {
-    const VALUE type = iseq->body->type;
+    struct rb_iseq_constant_body *const body = iseq->body;
+    const VALUE type = body->type;
 
     /* set class nest stack */
     if (type == ISEQ_TYPE_TOP) {
-	iseq->body->local_iseq = iseq;
+	body->local_iseq = iseq;
     }
     else if (type == ISEQ_TYPE_METHOD || type == ISEQ_TYPE_CLASS) {
-	iseq->body->local_iseq = iseq;
+	body->local_iseq = iseq;
     }
     else if (piseq) {
-	iseq->body->local_iseq = piseq->body->local_iseq;
+	body->local_iseq = piseq->body->local_iseq;
     }
 
     if (piseq) {
-	iseq->body->parent_iseq = piseq;
+	body->parent_iseq = piseq;
     }
 
     if (type == ISEQ_TYPE_MAIN) {
-	iseq->body->local_iseq = iseq;
+	body->local_iseq = iseq;
     }
 }
 
-void
-rb_iseq_add_mark_object(const rb_iseq_t *iseq, VALUE obj)
+static struct iseq_compile_data_storage *
+new_arena(void)
 {
-    /* TODO: check dedup */
-    rb_ary_push(ISEQ_MARK_ARY(iseq), obj);
+    struct iseq_compile_data_storage * new_arena =
+        (struct iseq_compile_data_storage *)
+        ALLOC_N(char, INITIAL_ISEQ_COMPILE_DATA_STORAGE_BUFF_SIZE +
+                offsetof(struct iseq_compile_data_storage, buff));
+
+    new_arena->pos = 0;
+    new_arena->next = 0;
+    new_arena->size = INITIAL_ISEQ_COMPILE_DATA_STORAGE_BUFF_SIZE;
+
+    return new_arena;
 }
 
 static VALUE
 prepare_iseq_build(rb_iseq_t *iseq,
-		   VALUE name, VALUE path, VALUE absolute_path, VALUE first_lineno,
-		   const rb_iseq_t *parent, enum iseq_type type,
-		   const rb_compile_option_t *option)
+                   VALUE name, VALUE path, VALUE realpath, VALUE first_lineno, const rb_code_location_t *code_location, const int node_id,
+		   const rb_iseq_t *parent, int isolated_depth, enum iseq_type type, const rb_compile_option_t *option)
 {
     VALUE coverage = Qfalse;
+    VALUE err_info = Qnil;
+    struct rb_iseq_constant_body *const body = iseq->body;
+
+    if (parent && (type == ISEQ_TYPE_MAIN || type == ISEQ_TYPE_TOP))
+	err_info = Qfalse;
 
-    iseq->body->type = type;
+    body->type = type;
     set_relation(iseq, parent);
 
     name = rb_fstring(name);
-    path = rb_fstring(path);
-    if (RTEST(absolute_path)) absolute_path = rb_fstring(absolute_path);
-    iseq_location_setup(iseq, path, absolute_path, name, first_lineno);
-    if (iseq != iseq->body->local_iseq) {
-	RB_OBJ_WRITE(iseq, &iseq->body->location.base_label, iseq->body->local_iseq->body->location.label);
-    }
-    RB_OBJ_WRITE(iseq, &iseq->body->mark_ary, iseq_mark_ary_create(0));
-
-    ISEQ_COMPILE_DATA(iseq) = ZALLOC(struct iseq_compile_data);
-    RB_OBJ_WRITE(iseq, &ISEQ_COMPILE_DATA(iseq)->err_info, Qnil);
-    RB_OBJ_WRITE(iseq, &ISEQ_COMPILE_DATA(iseq)->mark_ary, rb_ary_tmp_new(3));
-
-    ISEQ_COMPILE_DATA(iseq)->storage_head = ISEQ_COMPILE_DATA(iseq)->storage_current =
-      (struct iseq_compile_data_storage *)
-	ALLOC_N(char, INITIAL_ISEQ_COMPILE_DATA_STORAGE_BUFF_SIZE +
-		SIZEOF_ISEQ_COMPILE_DATA_STORAGE);
-
-    RB_OBJ_WRITE(iseq, &ISEQ_COMPILE_DATA(iseq)->catch_table_ary, rb_ary_tmp_new(3));
-    ISEQ_COMPILE_DATA(iseq)->storage_head->pos = 0;
-    ISEQ_COMPILE_DATA(iseq)->storage_head->next = 0;
-    ISEQ_COMPILE_DATA(iseq)->storage_head->size =
-      INITIAL_ISEQ_COMPILE_DATA_STORAGE_BUFF_SIZE;
-    ISEQ_COMPILE_DATA(iseq)->option = option;
-    ISEQ_COMPILE_DATA(iseq)->last_coverable_line = -1;
+    iseq_location_setup(iseq, name, path, realpath, first_lineno, code_location, node_id);
+    if (iseq != body->local_iseq) {
+	RB_OBJ_WRITE(iseq, &body->location.base_label, body->local_iseq->body->location.label);
+    }
+    ISEQ_COVERAGE_SET(iseq, Qnil);
+    ISEQ_ORIGINAL_ISEQ_CLEAR(iseq);
+    body->variable.flip_count = 0;
 
+    ISEQ_COMPILE_DATA_ALLOC(iseq);
+    RB_OBJ_WRITE(iseq, &ISEQ_COMPILE_DATA(iseq)->err_info, err_info);
+    RB_OBJ_WRITE(iseq, &ISEQ_COMPILE_DATA(iseq)->catch_table_ary, Qnil);
+
+    ISEQ_COMPILE_DATA(iseq)->node.storage_head = ISEQ_COMPILE_DATA(iseq)->node.storage_current = new_arena();
+    ISEQ_COMPILE_DATA(iseq)->insn.storage_head = ISEQ_COMPILE_DATA(iseq)->insn.storage_current = new_arena();
+    ISEQ_COMPILE_DATA(iseq)->isolated_depth = isolated_depth;
+    ISEQ_COMPILE_DATA(iseq)->option = option;
     ISEQ_COMPILE_DATA(iseq)->ivar_cache_table = NULL;
+    ISEQ_COMPILE_DATA(iseq)->builtin_function_table = GET_VM()->builtin_function_table;
+
 
     if (option->coverage_enabled) {
 	VALUE coverages = rb_get_coverages();
 	if (RTEST(coverages)) {
-	    coverage = rb_hash_lookup(coverages, path);
+	    coverage = rb_hash_lookup(coverages, rb_iseq_path(iseq));
 	    if (NIL_P(coverage)) coverage = Qfalse;
 	}
     }
     ISEQ_COVERAGE_SET(iseq, coverage);
+    if (coverage && ISEQ_BRANCH_COVERAGE(iseq))
+        ISEQ_PC2BRANCHINDEX_SET(iseq, rb_ary_tmp_new(0));
 
     return Qtrue;
 }
 
+#if VM_CHECK_MODE > 0 && VM_INSN_INFO_TABLE_IMPL > 0
+static void validate_get_insn_info(const rb_iseq_t *iseq);
+#endif
+
+void
+rb_iseq_insns_info_encode_positions(const rb_iseq_t *iseq)
+{
+#if VM_INSN_INFO_TABLE_IMPL == 2
+    /* create succ_index_table */
+    struct rb_iseq_constant_body *const body = iseq->body;
+    int size = body->insns_info.size;
+    int max_pos = body->iseq_size;
+    int *data = (int *)body->insns_info.positions;
+    if (body->insns_info.succ_index_table) ruby_xfree(body->insns_info.succ_index_table);
+    body->insns_info.succ_index_table = succ_index_table_create(max_pos, data, size);
+#if VM_CHECK_MODE == 0
+    ruby_xfree(body->insns_info.positions);
+    body->insns_info.positions = NULL;
+#endif
+#endif
+}
+
+#if VM_INSN_INFO_TABLE_IMPL == 2
+unsigned int *
+rb_iseq_insns_info_decode_positions(const struct rb_iseq_constant_body *body)
+{
+    int size = body->insns_info.size;
+    int max_pos = body->iseq_size;
+    struct succ_index_table *sd = body->insns_info.succ_index_table;
+    return succ_index_table_invert(max_pos, sd, size);
+}
+#endif
+
+void
+rb_iseq_init_trace(rb_iseq_t *iseq)
+{
+    iseq->aux.exec.global_trace_events = 0;
+    if (ruby_vm_event_enabled_global_flags & ISEQ_TRACE_EVENTS) {
+        rb_iseq_trace_set(iseq, ruby_vm_event_enabled_global_flags & ISEQ_TRACE_EVENTS);
+    }
+}
+
 static VALUE
-cleanup_iseq_build(rb_iseq_t *iseq)
+finish_iseq_build(rb_iseq_t *iseq)
 {
     struct iseq_compile_data *data = ISEQ_COMPILE_DATA(iseq);
+    const struct rb_iseq_constant_body *const body = iseq->body;
     VALUE err = data->err_info;
-    ISEQ_COMPILE_DATA(iseq) = 0;
+    ISEQ_COMPILE_DATA_CLEAR(iseq);
     compile_data_free(data);
 
+#if VM_CHECK_MODE > 0 && VM_INSN_INFO_TABLE_IMPL > 0
+    validate_get_insn_info(iseq);
+#endif
+
     if (RTEST(err)) {
-	rb_funcall2(err, rb_intern("set_backtrace"), 1, &iseq->body->location.path);
+	VALUE path = pathobj_path(body->location.pathobj);
+	if (err == Qtrue) err = rb_exc_new_cstr(rb_eSyntaxError, "compile error");
+	rb_funcallv(err, rb_intern("set_backtrace"), 1, &path);
 	rb_exc_raise(err);
     }
+
+    RB_DEBUG_COUNTER_INC(iseq_num);
+    RB_DEBUG_COUNTER_ADD(iseq_cd_num, iseq->body->ci_size);
+
+    rb_iseq_init_trace(iseq);
     return Qtrue;
 }
 
@@ -339,7 +715,6 @@ static rb_compile_option_t COMPILE_OPTION_DEFAULT = {
     OPT_OPERANDS_UNIFICATION, /* int operands_unification; */
     OPT_INSTRUCTIONS_UNIFICATION, /* int instructions_unification; */
     OPT_STACK_CACHING, /* int stack_caching; */
-    OPT_TRACE_INSTRUCTION, /* int trace_instruction */
     OPT_FROZEN_STRING_LITERAL,
     OPT_DEBUG_FROZEN_STRING_LITERAL,
     TRUE,			/* coverage_enabled */
@@ -366,7 +741,6 @@ set_compile_option_from_hash(rb_compile_option_t *option, VALUE opt)
     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(option, opt, frozen_string_literal);
     SET_COMPILE_OPTION(option, opt, debug_frozen_string_literal);
     SET_COMPILE_OPTION(option, opt, coverage_enabled);
@@ -375,7 +749,7 @@ set_compile_option_from_hash(rb_compile_option_t *option, VALUE opt)
 #undef SET_COMPILE_OPTION_NUM
 }
 
-void
+static void
 rb_iseq_make_compile_option(rb_compile_option_t *option, VALUE opt)
 {
     Check_Type(opt, T_HASH);
@@ -408,7 +782,7 @@ make_compile_option(rb_compile_option_t *option, VALUE opt)
 static VALUE
 make_compile_option_value(rb_compile_option_t *option)
 {
-    VALUE opt = rb_hash_new();
+    VALUE opt = rb_hash_new_with_size(11);
 #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) \
@@ -421,7 +795,6 @@ make_compile_option_value(rb_compile_option_t *option)
 	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(option, opt, frozen_string_literal);
 	SET_COMPILE_OPTION(option, opt, debug_frozen_string_literal);
 	SET_COMPILE_OPTION(option, opt, coverage_enabled);
@@ -433,26 +806,42 @@ make_compile_option_value(rb_compile_option_t *option)
 }
 
 rb_iseq_t *
-rb_iseq_new(NODE *node, VALUE name, VALUE path, VALUE absolute_path,
+rb_iseq_new(const rb_ast_body_t *ast, VALUE name, VALUE path, VALUE realpath,
 	    const rb_iseq_t *parent, enum iseq_type type)
 {
-    return rb_iseq_new_with_opt(node, name, path, absolute_path, INT2FIX(0), parent, type,
-				&COMPILE_OPTION_DEFAULT);
+    return rb_iseq_new_with_opt(ast, name, path, realpath, INT2FIX(0), parent,
+                                0, type, &COMPILE_OPTION_DEFAULT);
 }
 
 rb_iseq_t *
-rb_iseq_new_top(NODE *node, VALUE name, VALUE path, VALUE absolute_path, const rb_iseq_t *parent)
+rb_iseq_new_top(const rb_ast_body_t *ast, VALUE name, VALUE path, VALUE realpath, const rb_iseq_t *parent)
+{
+    VALUE coverages = rb_get_coverages();
+    if (RTEST(coverages)) {
+        if (ast->line_count >= 0) {
+            int len = (rb_get_coverage_mode() & COVERAGE_TARGET_ONESHOT_LINES) ? 0 : ast->line_count;
+            VALUE coverage = rb_default_coverage(len);
+            rb_hash_aset(coverages, path, coverage);
+        }
+    }
+
+    return rb_iseq_new_with_opt(ast, name, path, realpath, INT2FIX(0), parent, 0,
+                                ISEQ_TYPE_TOP, &COMPILE_OPTION_DEFAULT);
+}
+
+rb_iseq_t *
+rb_iseq_new_main(const rb_ast_body_t *ast, VALUE path, VALUE realpath, const rb_iseq_t *parent)
 {
-    return rb_iseq_new_with_opt(node, name, path, absolute_path, INT2FIX(0), parent, ISEQ_TYPE_TOP,
-				&COMPILE_OPTION_DEFAULT);
+    return rb_iseq_new_with_opt(ast, rb_fstring_lit("<main>"),
+				path, realpath, INT2FIX(0),
+				parent, 0, ISEQ_TYPE_MAIN, &COMPILE_OPTION_DEFAULT);
 }
 
 rb_iseq_t *
-rb_iseq_new_main(NODE *node, VALUE path, VALUE absolute_path, const rb_iseq_t *parent)
+rb_iseq_new_eval(const rb_ast_body_t *ast, VALUE name, VALUE path, VALUE realpath, VALUE first_lineno, const rb_iseq_t *parent, int isolated_depth)
 {
-    return rb_iseq_new_with_opt(node, rb_fstring_cstr("<main>"),
-				path, absolute_path, INT2FIX(0),
-				parent, ISEQ_TYPE_MAIN, &COMPILE_OPTION_DEFAULT);
+    return rb_iseq_new_with_opt(ast, name, path, realpath, first_lineno,
+                                parent, isolated_depth, ISEQ_TYPE_EVAL, &COMPILE_OPTION_DEFAULT);
 }
 
 static inline rb_iseq_t *
@@ -470,22 +859,50 @@ iseq_translate(rb_iseq_t *iseq)
 }
 
 rb_iseq_t *
-rb_iseq_new_with_opt(NODE *node, VALUE name, VALUE path, VALUE absolute_path,
-		     VALUE first_lineno, const rb_iseq_t *parent,
-		     enum iseq_type type, const rb_compile_option_t *option)
+rb_iseq_new_with_opt(const rb_ast_body_t *ast, VALUE name, VALUE path, VALUE realpath,
+		     VALUE first_lineno, const rb_iseq_t *parent, int isolated_depth,
+                     enum iseq_type type, const rb_compile_option_t *option)
 {
+    const NODE *node = ast ? ast->root : 0;
     /* TODO: argument check */
     rb_iseq_t *iseq = iseq_alloc();
+    rb_compile_option_t new_opt;
 
-    if (!option) option = &COMPILE_OPTION_DEFAULT;
-    prepare_iseq_build(iseq, name, path, absolute_path, first_lineno, parent, type, option);
+    if (option) {
+        new_opt = *option;
+    }
+    else {
+        new_opt = COMPILE_OPTION_DEFAULT;
+    }
+    if (ast && ast->compile_option) rb_iseq_make_compile_option(&new_opt, ast->compile_option);
+
+    prepare_iseq_build(iseq, name, path, realpath, first_lineno, node ? &node->nd_loc : NULL, node ? nd_node_id(node) : -1, parent, isolated_depth, type, &new_opt);
 
     rb_iseq_compile_node(iseq, node);
-    cleanup_iseq_build(iseq);
+    finish_iseq_build(iseq);
 
     return iseq_translate(iseq);
 }
 
+rb_iseq_t *
+rb_iseq_new_with_callback(
+    const struct rb_iseq_new_with_callback_callback_func * ifunc,
+    VALUE name, VALUE path, VALUE realpath,
+    VALUE first_lineno, const rb_iseq_t *parent,
+    enum iseq_type type, const rb_compile_option_t *option)
+{
+    /* TODO: argument check */
+    rb_iseq_t *iseq = iseq_alloc();
+
+    if (!option) option = &COMPILE_OPTION_DEFAULT;
+    prepare_iseq_build(iseq, name, path, realpath, first_lineno, NULL, -1, parent, 0, type, option);
+
+    rb_iseq_compile_callback(iseq, ifunc);
+    finish_iseq_build(iseq);
+
+    return iseq;
+}
+
 const rb_iseq_t *
 rb_iseq_load_iseq(VALUE fname)
 {
@@ -498,10 +915,10 @@ rb_iseq_load_iseq(VALUE fname)
     return NULL;
 }
 
-#define CHECK_ARRAY(v)   rb_convert_type((v), T_ARRAY, "Array", "to_ary")
-#define CHECK_HASH(v)    rb_convert_type((v), T_HASH, "Hash", "to_hash")
-#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")
+#define CHECK_ARRAY(v)   rb_to_array_type(v)
+#define CHECK_HASH(v)    rb_to_hash_type(v)
+#define CHECK_STRING(v)  rb_str_to_str(v)
+#define CHECK_SYMBOL(v)  rb_to_symbol_type(v)
 static inline VALUE CHECK_INTEGER(VALUE v) {(void)NUM2LONG(v); return v;}
 
 static enum iseq_type
@@ -515,7 +932,7 @@ iseq_type_from_sym(VALUE type)
     const ID id_ensure = rb_intern("ensure");
     const ID id_eval = rb_intern("eval");
     const ID id_main = rb_intern("main");
-    const ID id_defined_guard = rb_intern("defined_guard");
+    const ID id_plain = rb_intern("plain");
     /* ensure all symbols are static or pinned down before
      * conversion */
     const ID typeid = rb_check_id(&type);
@@ -527,7 +944,7 @@ iseq_type_from_sym(VALUE type)
     if (typeid == id_ensure) return ISEQ_TYPE_ENSURE;
     if (typeid == id_eval) return ISEQ_TYPE_EVAL;
     if (typeid == id_main) return ISEQ_TYPE_MAIN;
-    if (typeid == id_defined_guard) return ISEQ_TYPE_DEFINED_GUARD;
+    if (typeid == id_plain) return ISEQ_TYPE_PLAIN;
     return (enum iseq_type)-1;
 }
 
@@ -537,12 +954,13 @@ iseq_load(VALUE data, const rb_iseq_t *parent, VALUE opt)
     rb_iseq_t *iseq = iseq_alloc();
 
     VALUE magic, version1, version2, format_type, misc;
-    VALUE name, path, absolute_path, first_lineno;
+    VALUE name, path, realpath, first_lineno, code_location, node_id;
     VALUE type, body, locals, params, exception;
 
     st_data_t iseq_type;
     rb_compile_option_t option;
     int i = 0;
+    rb_code_location_t tmp_loc = { {0, 0}, {-1, -1} };
 
     /* [magic, major_version, minor_version, format_type, misc,
      *  label, path, first_lineno,
@@ -560,8 +978,8 @@ iseq_load(VALUE data, const rb_iseq_t *parent, VALUE opt)
 
     name        = CHECK_STRING(rb_ary_entry(data, i++));
     path        = CHECK_STRING(rb_ary_entry(data, i++));
-    absolute_path = rb_ary_entry(data, i++);
-    absolute_path = NIL_P(absolute_path) ? Qnil : CHECK_STRING(absolute_path);
+    realpath    = rb_ary_entry(data, i++);
+    realpath    = NIL_P(realpath) ? Qnil : CHECK_STRING(realpath);
     first_lineno = CHECK_INTEGER(rb_ary_entry(data, i++));
 
     type        = CHECK_SYMBOL(rb_ary_entry(data, i++));
@@ -574,17 +992,27 @@ iseq_load(VALUE data, const rb_iseq_t *parent, VALUE opt)
 
     iseq_type = iseq_type_from_sym(type);
     if (iseq_type == (enum iseq_type)-1) {
-	rb_raise(rb_eTypeError, "unsupport type: :%"PRIsVALUE, rb_sym2str(type));
+	rb_raise(rb_eTypeError, "unsupported type: :%"PRIsVALUE, rb_sym2str(type));
+    }
+
+    node_id = rb_hash_aref(misc, ID2SYM(rb_intern("node_id")));
+
+    code_location = rb_hash_aref(misc, ID2SYM(rb_intern("code_location")));
+    if (RB_TYPE_P(code_location, T_ARRAY) && RARRAY_LEN(code_location) == 4) {
+	tmp_loc.beg_pos.lineno = NUM2INT(rb_ary_entry(code_location, 0));
+	tmp_loc.beg_pos.column = NUM2INT(rb_ary_entry(code_location, 1));
+	tmp_loc.end_pos.lineno = NUM2INT(rb_ary_entry(code_location, 2));
+	tmp_loc.end_pos.column = NUM2INT(rb_ary_entry(code_location, 3));
     }
 
     make_compile_option(&option, opt);
     option.peephole_optimization = FALSE; /* because peephole optimization can modify original iseq */
-    prepare_iseq_build(iseq, name, path, absolute_path, first_lineno,
-		       parent, (enum iseq_type)iseq_type, &option);
+    prepare_iseq_build(iseq, name, path, realpath, first_lineno, &tmp_loc, NUM2INT(node_id),
+                       parent, 0, (enum iseq_type)iseq_type, &option);
 
     rb_iseq_build_from_ary(iseq, misc, locals, params, exception, body);
 
-    cleanup_iseq_build(iseq);
+    finish_iseq_build(iseq);
 
     return iseqw_new(iseq);
 }
@@ -606,22 +1034,19 @@ rb_iseq_load(VALUE data, VALUE parent, VALUE opt)
     return iseq_load(data, RTEST(parent) ? (rb_iseq_t *)parent : NULL, opt);
 }
 
-rb_iseq_t *
-rb_iseq_compile_with_option(VALUE src, VALUE file, VALUE absolute_path, VALUE line, rb_block_t *base_block, VALUE opt)
+static rb_iseq_t *
+rb_iseq_compile_with_option(VALUE src, VALUE file, VALUE realpath, VALUE line, VALUE opt)
 {
-    rb_thread_t *th = GET_THREAD();
     rb_iseq_t *iseq = NULL;
-    const rb_iseq_t *const parent = base_block ? base_block->iseq : NULL;
     rb_compile_option_t option;
-    const enum iseq_type type = parent ? ISEQ_TYPE_EVAL : ISEQ_TYPE_TOP;
 #if !defined(__GNUC__) || (__GNUC__ == 4 && __GNUC_MINOR__ == 8)
 # define INITIALIZED volatile /* suppress warnings by gcc 4.8 */
 #else
 # define INITIALIZED /* volatile */
 #endif
-    NODE *(*parse)(VALUE vparser, VALUE fname, VALUE file, int start);
+    rb_ast_t *(*parse)(VALUE vparser, VALUE fname, VALUE file, int start);
     int ln;
-    NODE *INITIALIZED node;
+    rb_ast_t *INITIALIZED ast;
 
     /* safe results first */
     make_compile_option(&option, opt);
@@ -636,46 +1061,44 @@ rb_iseq_compile_with_option(VALUE src, VALUE file, VALUE absolute_path, VALUE li
     }
     {
 	const VALUE parser = rb_parser_new();
-	rb_parser_set_context(parser, base_block, FALSE);
-	node = (*parse)(parser, file, src, ln);
+        VALUE name = rb_fstring_lit("<compiled>");
+        const rb_iseq_t *outer_scope = rb_iseq_new(NULL, name, name, Qnil, 0, ISEQ_TYPE_TOP);
+        VALUE outer_scope_v = (VALUE)outer_scope;
+        rb_parser_set_context(parser, outer_scope, FALSE);
+        RB_GC_GUARD(outer_scope_v);
+	ast = (*parse)(parser, file, src, ln);
     }
 
-    if (!node) {
-	rb_exc_raise(th->errinfo);
+    if (!ast->body.root) {
+	rb_ast_dispose(ast);
+	rb_exc_raise(GET_EC()->errinfo);
     }
     else {
-	INITIALIZED VALUE label = parent ?
-	    parent->body->location.label :
-	    rb_fstring_cstr("<compiled>");
-	iseq = rb_iseq_new_with_opt(node, label, file, absolute_path, line,
-				    parent, type, &option);
+	INITIALIZED VALUE label = rb_fstring_lit("<compiled>");
+	iseq = rb_iseq_new_with_opt(&ast->body, label, file, realpath, line,
+				    NULL, 0, ISEQ_TYPE_TOP, &option);
+	rb_ast_dispose(ast);
     }
 
     return iseq;
 }
 
-rb_iseq_t *
-rb_iseq_compile(VALUE src, VALUE file, VALUE line)
-{
-    return rb_iseq_compile_with_option(src, file, Qnil, line, 0, Qnil);
-}
-
-rb_iseq_t *
-rb_iseq_compile_on_base(VALUE src, VALUE file, VALUE line, rb_block_t *base_block)
+VALUE
+rb_iseq_path(const rb_iseq_t *iseq)
 {
-    return rb_iseq_compile_with_option(src, file, Qnil, line, base_block, Qnil);
+    return pathobj_path(iseq->body->location.pathobj);
 }
 
 VALUE
-rb_iseq_path(const rb_iseq_t *iseq)
+rb_iseq_realpath(const rb_iseq_t *iseq)
 {
-    return iseq->body->location.path;
+    return pathobj_realpath(iseq->body->location.pathobj);
 }
 
 VALUE
 rb_iseq_absolute_path(const rb_iseq_t *iseq)
 {
-    return iseq->body->location.absolute_path;
+    return rb_iseq_realpath(iseq);
 }
 
 VALUE
@@ -699,24 +1122,56 @@ rb_iseq_first_lineno(const rb_iseq_t *iseq)
 VALUE
 rb_iseq_method_name(const rb_iseq_t *iseq)
 {
-    const rb_iseq_t *local_iseq;
-
-    local_iseq = iseq->body->local_iseq;
+    struct rb_iseq_constant_body *const body = iseq->body->local_iseq->body;
 
-    if (local_iseq->body->type == ISEQ_TYPE_METHOD) {
-	return local_iseq->body->location.base_label;
+    if (body->type == ISEQ_TYPE_METHOD) {
+	return body->location.base_label;
     }
     else {
 	return Qnil;
     }
 }
 
+void
+rb_iseq_code_location(const rb_iseq_t *iseq, int *beg_pos_lineno, int *beg_pos_column, int *end_pos_lineno, int *end_pos_column)
+{
+    const rb_code_location_t *loc = &iseq->body->location.code_location;
+    if (beg_pos_lineno) *beg_pos_lineno = loc->beg_pos.lineno;
+    if (beg_pos_column) *beg_pos_column = loc->beg_pos.column;
+    if (end_pos_lineno) *end_pos_lineno = loc->end_pos.lineno;
+    if (end_pos_column) *end_pos_column = loc->end_pos.column;
+}
+
 VALUE
 rb_iseq_coverage(const rb_iseq_t *iseq)
 {
     return ISEQ_COVERAGE(iseq);
 }
 
+static int
+remove_coverage_i(void *vstart, void *vend, size_t stride, void *data)
+{
+    VALUE v = (VALUE)vstart;
+    for (; v != (VALUE)vend; v += stride) {
+        void *ptr = asan_poisoned_object_p(v);
+        asan_unpoison_object(v, false);
+
+	if (rb_obj_is_iseq(v)) {
+            rb_iseq_t *iseq = (rb_iseq_t *)v;
+            ISEQ_COVERAGE_SET(iseq, Qnil);
+	}
+
+        asan_poison_object_if(ptr, v);
+    }
+    return 0;
+}
+
+void
+rb_iseq_remove_coverage_all(void)
+{
+    rb_objspace_each_objects(remove_coverage_i, NULL);
+}
+
 /* define wrapper class methods (RubyVM::InstructionSequence) */
 
 static void
@@ -728,7 +1183,7 @@ iseqw_mark(void *ptr)
 static size_t
 iseqw_memsize(const void *ptr)
 {
-    return iseq_memsize((const rb_iseq_t *)ptr);
+    return rb_iseq_memsize((const rb_iseq_t *)ptr);
 }
 
 static const rb_data_type_t iseqw_data_type = {
@@ -740,14 +1195,22 @@ static const rb_data_type_t iseqw_data_type = {
 static VALUE
 iseqw_new(const rb_iseq_t *iseq)
 {
-    union { const rb_iseq_t *in; void *out; } deconst;
-    VALUE obj;
+    if (iseq->wrapper) {
+        return iseq->wrapper;
+    }
+    else {
+        union { const rb_iseq_t *in; void *out; } deconst;
+        VALUE obj;
+        deconst.in = iseq;
+        obj = TypedData_Wrap_Struct(rb_cISeq, &iseqw_data_type, deconst.out);
+        RB_OBJ_WRITTEN(obj, Qundef, iseq);
 
-    deconst.in = iseq;
-    obj = TypedData_Wrap_Struct(rb_cISeq, &iseqw_data_type, deconst.out);
-    RB_OBJ_WRITTEN(obj, Qundef, iseq);
+        /* cache a wrapper object */
+        RB_OBJ_WRITE((VALUE)iseq, &iseq->wrapper, obj);
+        RB_OBJ_FREEZE((VALUE)iseq);
 
-    return obj;
+        return obj;
+    }
 }
 
 VALUE
@@ -764,10 +1227,14 @@ rb_iseqw_new(const rb_iseq_t *iseq)
  *  Takes +source+, a String of Ruby code and compiles it to an
  *  InstructionSequence.
  *
- *  Optionally takes +file+, +path+, and +line+ which describe the filename,
- *  absolute path and first line number of the ruby code in +source+ which are
+ *  Optionally takes +file+, +path+, and +line+ which describe the file path,
+ *  real path and first line number of the ruby code in +source+ which are
  *  metadata attached to the returned +iseq+.
  *
+ *  +file+ is used for `__FILE__` and exception backtrace. +path+ is used for
+ *  +require_relative+ base. It is recommended these should be the same full
+ *  path.
+ *
  *  +options+, which can be +true+, +false+ or a +Hash+, is used to
  *  modify the default behavior of the Ruby iseq compiler.
  *
@@ -776,18 +1243,38 @@ rb_iseqw_new(const rb_iseq_t *iseq)
  *     RubyVM::InstructionSequence.compile("a = 1 + 2")
  *     #=> <RubyVM::InstructionSequence:<compiled>@<compiled>>
  *
+ *     path = "test.rb"
+ *     RubyVM::InstructionSequence.compile(File.read(path), path, File.expand_path(path))
+ *     #=> <RubyVM::InstructionSequence:<compiled>@test.rb:1>
+ *
+ *     path = File.expand_path("test.rb")
+ *     RubyVM::InstructionSequence.compile(File.read(path), path, path)
+ *     #=> <RubyVM::InstructionSequence:<compiled>@/absolute/path/to/test.rb:1>
+ *
  */
 static VALUE
 iseqw_s_compile(int argc, VALUE *argv, VALUE self)
 {
     VALUE src, file = Qnil, path = Qnil, line = INT2FIX(1), opt = Qnil;
-    rb_secure(1);
+    int i;
 
-    rb_scan_args(argc, argv, "14", &src, &file, &path, &line, &opt);
-    if (NIL_P(file)) file = rb_fstring_cstr("<compiled>");
+    i = rb_scan_args(argc, argv, "1*:", &src, NULL, &opt);
+    if (i > 4+NIL_P(opt)) rb_error_arity(argc, 1, 5);
+    switch (i) {
+      case 5: opt = argv[--i];
+      case 4: line = argv[--i];
+      case 3: path = argv[--i];
+      case 2: file = argv[--i];
+    }
+
+    if (NIL_P(file)) file = rb_fstring_lit("<compiled>");
+    if (NIL_P(path)) path = file;
     if (NIL_P(line)) line = INT2FIX(1);
 
-    return iseqw_new(rb_iseq_compile_with_option(src, file, path, line, 0, opt));
+    Check_Type(path, T_STRING);
+    Check_Type(file, T_STRING);
+
+    return iseqw_new(rb_iseq_compile_with_option(src, file, path, line, opt));
 }
 
 /*
@@ -814,31 +1301,40 @@ static VALUE
 iseqw_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;
+    VALUE parser, f, exc = Qnil, ret;
+    rb_ast_t *ast;
     rb_compile_option_t option;
+    int i;
 
-    rb_secure(1);
-    rb_scan_args(argc, argv, "11", &file, &opt);
+    i = rb_scan_args(argc, argv, "1*:", &file, NULL, &opt);
+    if (i > 1+NIL_P(opt)) rb_error_arity(argc, 1, 2);
+    switch (i) {
+      case 2: opt = argv[--i];
+    }
     FilePathValue(file);
     file = rb_fstring(file); /* rb_io_t->pathv gets frozen anyways */
-    fname = StringValueCStr(file);
 
     f = rb_file_open_str(file, "r");
 
     parser = rb_parser_new();
-    node = rb_parser_compile_file(parser, fname, f, NUM2INT(line));
+    rb_parser_set_context(parser, NULL, FALSE);
+    ast = (rb_ast_t *)rb_parser_load_file(parser, file);
+    if (!ast->body.root) exc = GET_EC()->errinfo;
 
     rb_io_close(f);
+    if (!ast->body.root) {
+	rb_ast_dispose(ast);
+	rb_exc_raise(exc);
+    }
 
     make_compile_option(&option, opt);
 
-    return iseqw_new(rb_iseq_new_with_opt(node, rb_fstring_cstr("<main>"),
-					  file,
-					  rb_realpath_internal(Qnil, file, 1),
-					  line, NULL, ISEQ_TYPE_TOP, &option));
+    ret = iseqw_new(rb_iseq_new_with_opt(&ast->body, rb_fstring_lit("<main>"),
+					 file,
+					 rb_realpath_internal(Qnil, file, 1),
+					 line, NULL, 0, ISEQ_TYPE_TOP, &option));
+    rb_ast_dispose(ast);
+    return ret;
 }
 
 /*
@@ -865,7 +1361,6 @@ iseqw_s_compile_file(int argc, VALUE *argv, VALUE self)
  *  * +:specialized_instruction+
  *  * +:stack_caching+
  *  * +:tailcall_optimization+
- *  * +:trace_instruction+
  *
  *  Additionally, +:debug_level+ can be set to an integer.
  *
@@ -877,7 +1372,6 @@ static VALUE
 iseqw_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;
@@ -903,7 +1397,7 @@ iseqw_check(VALUE iseqw)
     rb_iseq_t *iseq = DATA_PTR(iseqw);
 
     if (!iseq->body) {
-	ibf_load_iseq_complete(iseq);
+	rb_ibf_load_iseq_complete(iseq);
     }
 
     if (!iseq->body->location.label) {
@@ -929,7 +1423,6 @@ rb_iseqw_to_iseq(VALUE iseqw)
 static VALUE
 iseqw_eval(VALUE self)
 {
-    rb_secure(1);
     return rb_iseq_eval(iseqw_check(self));
 }
 
@@ -941,14 +1434,17 @@ static VALUE
 iseqw_inspect(VALUE self)
 {
     const rb_iseq_t *iseq = iseqw_check(self);
+    const struct rb_iseq_constant_body *const body = iseq->body;
+    VALUE klass = rb_class_name(rb_obj_class(self));
 
-    if (!iseq->body->location.label) {
-        return rb_sprintf("#<%s: uninitialized>", rb_obj_classname(self));
+    if (!body->location.label) {
+	return rb_sprintf("#<%"PRIsVALUE": uninitialized>", klass);
     }
     else {
-	return rb_sprintf("<%s:%s@%s>",
-			  rb_obj_classname(self),
-			  RSTRING_PTR(iseq->body->location.label), RSTRING_PTR(iseq->body->location.path));
+	return rb_sprintf("<%"PRIsVALUE":%"PRIsVALUE"@%"PRIsVALUE":%d>",
+			  klass,
+			  body->location.label, rb_iseq_path(iseq),
+			  FIX2INT(rb_iseq_first_lineno(iseq)));
     }
 }
 
@@ -1000,7 +1496,7 @@ iseqw_path(VALUE self)
 static VALUE
 iseqw_absolute_path(VALUE self)
 {
-    return rb_iseq_absolute_path(iseqw_check(self));
+    return rb_iseq_realpath(iseqw_check(self));
 }
 
 /*  Returns the label of this instruction sequence.
@@ -1135,7 +1631,7 @@ static VALUE iseq_data_to_ary(const rb_iseq_t *iseq);
  *    The type of the instruction sequence.
  *
  *    Valid values are +:top+, +:method+, +:block+, +:class+, +:rescue+,
- *    +:ensure+, +:eval+, +:main+, and +:defined_guard+.
+ *    +:ensure+, +:eval+, +:main+, and +plain+.
  *
  *  [locals]
  *    An array containing the names of all arguments and local variables as
@@ -1161,52 +1657,170 @@ static VALUE
 iseqw_to_a(VALUE self)
 {
     const rb_iseq_t *iseq = iseqw_check(self);
-    rb_secure(1);
     return iseq_data_to_ary(iseq);
 }
 
-/* TODO: search algorithm is brute force.
-         this should be binary search or so. */
+#if VM_INSN_INFO_TABLE_IMPL == 1 /* binary search */
+static const struct iseq_insn_info_entry *
+get_insn_info_binary_search(const rb_iseq_t *iseq, size_t pos)
+{
+    const struct rb_iseq_constant_body *const body = iseq->body;
+    size_t size = body->insns_info.size;
+    const struct iseq_insn_info_entry *insns_info = body->insns_info.body;
+    const unsigned int *positions = body->insns_info.positions;
+    const int debug = 0;
+
+    if (debug) {
+	printf("size: %"PRIuSIZE"\n", size);
+	printf("insns_info[%"PRIuSIZE"]: position: %d, line: %d, pos: %"PRIuSIZE"\n",
+	       (size_t)0, positions[0], insns_info[0].line_no, pos);
+    }
 
-static const struct iseq_line_info_entry *
-get_line_info(const rb_iseq_t *iseq, size_t pos)
+    if (size == 0) {
+	return NULL;
+    }
+    else if (size == 1) {
+	return &insns_info[0];
+    }
+    else {
+	size_t l = 1, r = size - 1;
+	while (l <= r) {
+	    size_t m = l + (r - l) / 2;
+	    if (positions[m] == pos) {
+		return &insns_info[m];
+	    }
+	    if (positions[m] < pos) {
+		l = m + 1;
+	    }
+	    else {
+		r = m - 1;
+	    }
+	}
+	if (l >= size) {
+	    return &insns_info[size-1];
+	}
+	if (positions[l] > pos) {
+	    return &insns_info[l-1];
+	}
+	return &insns_info[l];
+    }
+}
+
+static const struct iseq_insn_info_entry *
+get_insn_info(const rb_iseq_t *iseq, size_t pos)
 {
-    size_t i = 0, size = iseq->body->line_info_size;
-    const struct iseq_line_info_entry *table = iseq->body->line_info_table;
+    return get_insn_info_binary_search(iseq, pos);
+}
+#endif
+
+#if VM_INSN_INFO_TABLE_IMPL == 2 /* succinct bitvector */
+static const struct iseq_insn_info_entry *
+get_insn_info_succinct_bitvector(const rb_iseq_t *iseq, size_t pos)
+{
+    const struct rb_iseq_constant_body *const body = iseq->body;
+    size_t size = body->insns_info.size;
+    const struct iseq_insn_info_entry *insns_info = body->insns_info.body;
     const int debug = 0;
 
     if (debug) {
-	printf("size: %"PRIdSIZE"\n", size);
-	printf("table[%"PRIdSIZE"]: position: %d, line: %d, pos: %"PRIdSIZE"\n",
-	       i, table[i].position, table[i].line_no, pos);
+#if VM_CHECK_MODE > 0
+        const unsigned int *positions = body->insns_info.positions;
+        printf("size: %"PRIuSIZE"\n", size);
+        printf("insns_info[%"PRIuSIZE"]: position: %d, line: %d, pos: %"PRIuSIZE"\n",
+               (size_t)0, positions[0], insns_info[0].line_no, pos);
+#else
+        printf("size: %"PRIuSIZE"\n", size);
+        printf("insns_info[%"PRIuSIZE"]: line: %d, pos: %"PRIuSIZE"\n",
+               (size_t)0, insns_info[0].line_no, pos);
+#endif
     }
 
     if (size == 0) {
-	return 0;
+	return NULL;
+    }
+    else if (size == 1) {
+	return &insns_info[0];
+    }
+    else {
+	int index;
+	VM_ASSERT(body->insns_info.succ_index_table != NULL);
+	index = succ_index_lookup(body->insns_info.succ_index_table, (int)pos);
+	return &insns_info[index-1];
+    }
+}
+
+static const struct iseq_insn_info_entry *
+get_insn_info(const rb_iseq_t *iseq, size_t pos)
+{
+    return get_insn_info_succinct_bitvector(iseq, pos);
+}
+#endif
+
+#if VM_CHECK_MODE > 0 || VM_INSN_INFO_TABLE_IMPL == 0
+static const struct iseq_insn_info_entry *
+get_insn_info_linear_search(const rb_iseq_t *iseq, size_t pos)
+{
+    const struct rb_iseq_constant_body *const body = iseq->body;
+    size_t i = 0, size = body->insns_info.size;
+    const struct iseq_insn_info_entry *insns_info = body->insns_info.body;
+    const unsigned int *positions = body->insns_info.positions;
+    const int debug = 0;
+
+    if (debug) {
+	printf("size: %"PRIuSIZE"\n", size);
+	printf("insns_info[%"PRIuSIZE"]: position: %d, line: %d, pos: %"PRIuSIZE"\n",
+	       i, positions[i], insns_info[i].line_no, pos);
+    }
+
+    if (size == 0) {
+	return NULL;
     }
     else if (size == 1) {
-	return &table[0];
+	return &insns_info[0];
     }
     else {
 	for (i=1; i<size; i++) {
-	    if (debug) printf("table[%"PRIdSIZE"]: position: %d, line: %d, pos: %"PRIdSIZE"\n",
-			      i, table[i].position, table[i].line_no, pos);
+	    if (debug) printf("insns_info[%"PRIuSIZE"]: position: %d, line: %d, pos: %"PRIuSIZE"\n",
+			      i, positions[i], insns_info[i].line_no, pos);
 
-	    if (table[i].position == pos) {
-		return &table[i];
+	    if (positions[i] == pos) {
+		return &insns_info[i];
 	    }
-	    if (table[i].position > pos) {
-		return &table[i-1];
+	    if (positions[i] > pos) {
+		return &insns_info[i-1];
 	    }
 	}
     }
-    return &table[i-1];
+    return &insns_info[i-1];
 }
+#endif
+
+#if VM_INSN_INFO_TABLE_IMPL == 0 /* linear search */
+static const struct iseq_insn_info_entry *
+get_insn_info(const rb_iseq_t *iseq, size_t pos)
+{
+    return get_insn_info_linear_search(iseq, pos);
+}
+#endif
 
-static unsigned int
-find_line_no(const rb_iseq_t *iseq, size_t pos)
+#if VM_CHECK_MODE > 0 && VM_INSN_INFO_TABLE_IMPL > 0
+static void
+validate_get_insn_info(const rb_iseq_t *iseq)
 {
-    const struct iseq_line_info_entry *entry = get_line_info(iseq, pos);
+    const struct rb_iseq_constant_body *const body = iseq->body;
+    size_t i;
+    for (i = 0; i < body->iseq_size; i++) {
+	if (get_insn_info_linear_search(iseq, i) != get_insn_info(iseq, i)) {
+	    rb_bug("validate_get_insn_info: get_insn_info_linear_search(iseq, %"PRIuSIZE") != get_insn_info(iseq, %"PRIuSIZE")", i, i);
+	}
+    }
+}
+#endif
+
+unsigned int
+rb_iseq_line_no(const rb_iseq_t *iseq, size_t pos)
+{
+    const struct iseq_insn_info_entry *entry = get_insn_info(iseq, pos);
 
     if (entry) {
 	return entry->line_no;
@@ -1216,30 +1830,61 @@ find_line_no(const rb_iseq_t *iseq, size_t pos)
     }
 }
 
-unsigned int
-rb_iseq_line_no(const rb_iseq_t *iseq, size_t pos)
+MJIT_FUNC_EXPORTED rb_event_flag_t
+rb_iseq_event_flags(const rb_iseq_t *iseq, size_t pos)
 {
-    if (pos == 0) {
-	return find_line_no(iseq, pos);
+    const struct iseq_insn_info_entry *entry = get_insn_info(iseq, pos);
+    if (entry) {
+	return entry->events;
     }
     else {
-	return find_line_no(iseq, pos - 1);
+	return 0;
+    }
+}
+
+void
+rb_iseq_clear_event_flags(const rb_iseq_t *iseq, size_t pos, rb_event_flag_t reset)
+{
+    struct iseq_insn_info_entry *entry = (struct iseq_insn_info_entry *)get_insn_info(iseq, pos);
+    if (entry) {
+        entry->events &= ~reset;
+        if (!(entry->events & iseq->aux.exec.global_trace_events)) {
+            void rb_iseq_trace_flag_cleared(const rb_iseq_t *iseq, size_t pos);
+            rb_iseq_trace_flag_cleared(iseq, pos);
+        }
     }
 }
 
 static VALUE
-id_to_name(ID id, VALUE default_value)
+local_var_name(const rb_iseq_t *diseq, VALUE level, VALUE op)
 {
-    VALUE str = rb_id2str(id);
-    if (!str) {
-	str = default_value;
+    VALUE i;
+    VALUE name;
+    ID lid;
+    int idx;
+
+    for (i = 0; i < level; i++) {
+	diseq = diseq->body->parent_iseq;
     }
-    else if (!rb_str_symname_p(str)) {
-	str = rb_str_inspect(str);
+    idx = diseq->body->local_table_size - (int)op - 1;
+    lid = diseq->body->local_table[idx];
+    name = rb_id2str(lid);
+    if (!name) {
+	name = rb_str_new_cstr("?");
     }
-    return str;
+    else if (!rb_str_symname_p(name)) {
+	name = rb_str_inspect(name);
+    }
+    else {
+	name = rb_str_dup(name);
+    }
+    rb_str_catf(name, "@%d", idx);
+    return name;
 }
 
+int rb_insn_unified_local_var_level(VALUE);
+VALUE rb_dump_literal(VALUE lit);
+
 VALUE
 rb_insn_operand_intern(const rb_iseq_t *iseq,
 		       VALUE insn, int op_no, VALUE op,
@@ -1255,23 +1900,40 @@ rb_insn_operand_intern(const rb_iseq_t *iseq,
 	break;
 
       case TS_NUM:		/* ULONG */
+	if (insn == BIN(defined) && op_no == 0) {
+	    enum defined_type deftype = (enum defined_type)op;
+	    switch (deftype) {
+	      case DEFINED_FUNC:
+		ret = rb_fstring_lit("func");
+		break;
+	      case DEFINED_REF:
+		ret = rb_fstring_lit("ref");
+		break;
+	      case DEFINED_CONST_FROM:
+		ret = rb_fstring_lit("constant-from");
+		break;
+	      default:
+		ret = rb_iseq_defined_string(deftype);
+		break;
+	    }
+	    if (ret) break;
+	}
+	else if (insn == BIN(checktype) && op_no == 0) {
+	    const char *type_str = rb_type_str((enum ruby_value_type)op);
+	    if (type_str) {
+		ret = rb_str_new_cstr(type_str); break;
+	    }
+	}
 	ret = rb_sprintf("%"PRIuVALUE, op);
 	break;
 
       case TS_LINDEX:{
-	if (insn == BIN(getlocal) || insn == BIN(setlocal)) {
-	    if (pnop) {
-		const rb_iseq_t *diseq = iseq;
-		VALUE level = *pnop, i;
-
-		for (i = 0; i < level; i++) {
-		    diseq = diseq->body->parent_iseq;
-		}
-		ret = id_to_name(diseq->body->local_table[diseq->body->local_size - op], INT2FIX('*'));
-	    }
-	    else {
-		ret = rb_sprintf("%"PRIuVALUE, op);
-	    }
+	int level;
+	if (types[op_no+1] == TS_NUM && pnop) {
+	    ret = local_var_name(iseq, *pnop, op - VM_ENV_DATA_SIZE);
+	}
+	else if ((level = rb_insn_unified_local_var_level(insn)) >= 0) {
+	    ret = local_var_name(iseq, (VALUE)level, op - VM_ENV_DATA_SIZE);
 	}
 	else {
 	    ret = rb_inspect(INT2FIX(op));
@@ -1279,11 +1941,25 @@ rb_insn_operand_intern(const rb_iseq_t *iseq,
 	break;
       }
       case TS_ID:		/* ID (symbol) */
-	op = ID2SYM(op);
+	ret = rb_inspect(ID2SYM(op));
+	break;
 
       case TS_VALUE:		/* VALUE */
 	op = obj_resurrect(op);
-	ret = rb_inspect(op);
+	if (insn == BIN(defined) && op_no == 1 && FIXNUM_P(op)) {
+	    /* should be DEFINED_REF */
+	    int type = NUM2INT(op);
+	    if (type) {
+		if (type & 1) {
+		    ret = rb_sprintf(":$%c", (type >> 1));
+		}
+		else {
+		    ret = rb_sprintf(":$%d", (type >> 1));
+		}
+		break;
+	    }
+	}
+	ret = rb_dump_literal(op);
 	if (CLASS_OF(op) == rb_cISeq) {
 	    if (child) {
 		rb_ary_push(child, op);
@@ -1305,53 +1981,53 @@ rb_insn_operand_intern(const rb_iseq_t *iseq,
 	    }
 	    break;
 	}
-      case TS_GENTRY:
-	{
-	    struct rb_global_entry *entry = (struct rb_global_entry *)op;
-	    ret = rb_str_dup(rb_id2str(entry->id));
-	}
-	break;
 
       case TS_IC:
+      case TS_IVC:
+      case TS_ISE:
 	ret = rb_sprintf("<is:%"PRIdPTRDIFF">", (union iseq_inline_storage_entry *)op - iseq->body->is_entries);
 	break;
 
-      case TS_CALLINFO:
+      case TS_CALLDATA:
 	{
-	    struct rb_call_info *ci = (struct rb_call_info *)op;
+            struct rb_call_data *cd = (struct rb_call_data *)op;
+            const struct rb_callinfo *ci = cd->ci;
 	    VALUE ary = rb_ary_new();
+            ID mid = vm_ci_mid(ci);
 
-	    if (ci->mid) {
-		rb_ary_push(ary, rb_sprintf("mid:%"PRIsVALUE, rb_id2str(ci->mid)));
+            if (mid) {
+		rb_ary_push(ary, rb_sprintf("mid:%"PRIsVALUE, rb_id2str(mid)));
 	    }
 
-	    rb_ary_push(ary, rb_sprintf("argc:%d", ci->orig_argc));
+	    rb_ary_push(ary, rb_sprintf("argc:%d", vm_ci_argc(ci)));
 
-	    if (ci->flag & VM_CALL_KWARG) {
-		struct rb_call_info_kw_arg *kw_args = ((struct rb_call_info_with_kwarg *)ci)->kw_arg;
-		VALUE kw_ary = rb_ary_new_from_values(kw_args->keyword_len, kw_args->keywords);
-		rb_ary_push(ary, rb_sprintf("kw:[%"PRIsVALUE"]", rb_ary_join(kw_ary, rb_str_new2(","))));
+            if (vm_ci_flag(ci) & VM_CALL_KWARG) {
+                const struct rb_callinfo_kwarg *kw_args = vm_ci_kwarg(ci);
+                VALUE kw_ary = rb_ary_new_from_values(kw_args->keyword_len, kw_args->keywords);
+                rb_ary_push(ary, rb_sprintf("kw:[%"PRIsVALUE"]", rb_ary_join(kw_ary, rb_str_new2(","))));
 	    }
 
-	    if (ci->flag) {
+            if (vm_ci_flag(ci)) {
 		VALUE flags = rb_ary_new();
-		if (ci->flag & VM_CALL_ARGS_SPLAT) rb_ary_push(flags, rb_str_new2("ARGS_SPLAT"));
-		if (ci->flag & VM_CALL_ARGS_BLOCKARG) rb_ary_push(flags, rb_str_new2("ARGS_BLOCKARG"));
-		if (ci->flag & VM_CALL_FCALL) rb_ary_push(flags, rb_str_new2("FCALL"));
-		if (ci->flag & VM_CALL_VCALL) rb_ary_push(flags, rb_str_new2("VCALL"));
-		if (ci->flag & VM_CALL_TAILCALL) rb_ary_push(flags, rb_str_new2("TAILCALL"));
-		if (ci->flag & VM_CALL_SUPER) rb_ary_push(flags, rb_str_new2("SUPER"));
-		if (ci->flag & VM_CALL_KWARG) rb_ary_push(flags, rb_str_new2("KWARG"));
-		if (ci->flag & VM_CALL_OPT_SEND) rb_ary_push(flags, rb_str_new2("SNED")); /* maybe not reachable */
-		if (ci->flag & VM_CALL_ARGS_SIMPLE) rb_ary_push(flags, rb_str_new2("ARGS_SIMPLE")); /* maybe not reachable */
+# define CALL_FLAG(n) if (vm_ci_flag(ci) & VM_CALL_##n) rb_ary_push(flags, rb_str_new2(#n))
+		CALL_FLAG(ARGS_SPLAT);
+		CALL_FLAG(ARGS_BLOCKARG);
+		CALL_FLAG(FCALL);
+		CALL_FLAG(VCALL);
+		CALL_FLAG(ARGS_SIMPLE);
+		CALL_FLAG(BLOCKISEQ);
+		CALL_FLAG(TAILCALL);
+		CALL_FLAG(SUPER);
+		CALL_FLAG(ZSUPER);
+		CALL_FLAG(KWARG);
+		CALL_FLAG(KW_SPLAT);
+                CALL_FLAG(KW_SPLAT_MUT);
+		CALL_FLAG(OPT_SEND); /* maybe not reachable */
 		rb_ary_push(ary, rb_ary_join(flags, rb_str_new2("|")));
 	    }
-	    ret = rb_sprintf("<callinfo!%"PRIsVALUE">", rb_ary_join(ary, rb_str_new2(", ")));
-	}
-	break;
 
-      case TS_CALLCACHE:
-	ret = rb_str_new2("<callcache>");
+            ret = rb_sprintf("<calldata!%"PRIsVALUE">", rb_ary_join(ary, rb_str_new2(", ")));
+        }
 	break;
 
       case TS_CDHASH:
@@ -1371,12 +2047,29 @@ rb_insn_operand_intern(const rb_iseq_t *iseq,
 	}
 	break;
 
+      case TS_BUILTIN:
+        {
+            const struct rb_builtin_function *bf = (const struct rb_builtin_function *)op;
+            ret = rb_sprintf("<builtin!%s/%d>",
+                             bf->name, bf->argc);
+        }
+        break;
+
       default:
-	rb_bug("insn_operand_intern: unknown operand type: %c", type);
+	rb_bug("unknown operand type: %c", type);
     }
     return ret;
 }
 
+static VALUE
+right_strip(VALUE str)
+{
+    const char *beg = RSTRING_PTR(str), *end = RSTRING_END(str);
+    while (end-- > beg && *end == ' ');
+    rb_str_set_len(str, end - beg + 1);
+    return str;
+}
+
 /**
  * Disassemble a instruction
  * Iseq -> Iseq inspect object
@@ -1394,15 +2087,15 @@ rb_iseq_disasm_insn(VALUE ret, const VALUE *code, size_t pos,
 
     insn_name_buff = insn_name(insn);
     if (1) {
-	rb_str_catf(str, "%04"PRIdSIZE" %-16s ", pos, insn_name_buff);
+	extern const int rb_vm_max_insn_name_size;
+	rb_str_catf(str, "%04"PRIuSIZE" %-*s ", pos, rb_vm_max_insn_name_size, insn_name_buff);
     }
     else {
-	rb_str_catf(str, "%04"PRIdSIZE" %-16.*s ", pos,
+	rb_str_catf(str, "%04"PRIuSIZE" %-28.*s ", pos,
 		    (int)strcspn(insn_name_buff, "_"), insn_name_buff);
     }
 
     for (j = 0; types[j]; j++) {
-	const char *types = insn_op_types(insn);
 	VALUE opstr = rb_insn_operand_intern(iseq, insn, j, code[pos + j + 1],
 					     len, pos, &code[pos + j + 2],
 					     child);
@@ -1414,8 +2107,8 @@ rb_iseq_disasm_insn(VALUE ret, const VALUE *code, size_t pos,
     }
 
     {
-	unsigned int line_no = find_line_no(iseq, pos);
-	unsigned int prev = pos == 0 ? 0 : find_line_no(iseq, pos - 1);
+	unsigned int line_no = rb_iseq_line_no(iseq, pos);
+	unsigned int prev = pos == 0 ? 0 : rb_iseq_line_no(iseq, pos - 1);
 	if (line_no && line_no != prev) {
 	    long slen = RSTRING_LEN(str);
 	    slen = (slen > 70) ? 0 : (70 - slen);
@@ -1423,12 +2116,31 @@ rb_iseq_disasm_insn(VALUE ret, const VALUE *code, size_t pos,
 	}
     }
 
+    {
+	rb_event_flag_t events = rb_iseq_event_flags(iseq, pos);
+	if (events) {
+            str = rb_str_catf(str, "[%s%s%s%s%s%s%s%s%s%s%s]",
+			      events & RUBY_EVENT_LINE     ? "Li" : "",
+			      events & RUBY_EVENT_CLASS    ? "Cl" : "",
+			      events & RUBY_EVENT_END      ? "En" : "",
+			      events & RUBY_EVENT_CALL     ? "Ca" : "",
+			      events & RUBY_EVENT_RETURN   ? "Re" : "",
+			      events & RUBY_EVENT_C_CALL   ? "Cc" : "",
+			      events & RUBY_EVENT_C_RETURN ? "Cr" : "",
+			      events & RUBY_EVENT_B_CALL   ? "Bc" : "",
+                              events & RUBY_EVENT_B_RETURN ? "Br" : "",
+                              events & RUBY_EVENT_COVERAGE_LINE   ? "Cli" : "",
+                              events & RUBY_EVENT_COVERAGE_BRANCH ? "Cbr" : "");
+	}
+    }
+
+    right_strip(str);
     if (ret) {
 	rb_str_cat2(str, "\n");
 	rb_str_concat(ret, str);
     }
     else {
-	printf("%s\n", RSTRING_PTR(str));
+	printf("%.*s\n", (int)RSTRING_LEN(str), RSTRING_PTR(str));
     }
     return len;
 }
@@ -1450,7 +2162,7 @@ catch_type(int type)
       case CATCH_TYPE_NEXT:
 	return "next";
       default:
-	rb_bug("unknown catch type (%d)", type);
+	rb_bug("unknown catch type: %d", type);
 	return 0;
     }
 }
@@ -1458,127 +2170,175 @@ catch_type(int type)
 static VALUE
 iseq_inspect(const rb_iseq_t *iseq)
 {
-    if (!iseq->body->location.label) {
+    const struct rb_iseq_constant_body *const body = iseq->body;
+    if (!body->location.label) {
 	return rb_sprintf("#<ISeq: uninitialized>");
     }
     else {
-	return rb_sprintf("#<ISeq:%s@%s>", RSTRING_PTR(iseq->body->location.label), RSTRING_PTR(iseq->body->location.path));
+	const rb_code_location_t *loc = &body->location.code_location;
+	return rb_sprintf("#<ISeq:%"PRIsVALUE"@%"PRIsVALUE":%d (%d,%d)-(%d,%d)>",
+			  body->location.label, rb_iseq_path(iseq),
+			  loc->beg_pos.lineno,
+			  loc->beg_pos.lineno,
+			  loc->beg_pos.column,
+			  loc->end_pos.lineno,
+			  loc->end_pos.column);
     }
 }
 
-VALUE
-rb_iseq_disasm(const rb_iseq_t *iseq)
+static const rb_data_type_t tmp_set = {
+    "tmpset",
+    {(void (*)(void *))rb_mark_set, (void (*)(void *))st_free_table, 0, 0,},
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+static VALUE
+rb_iseq_disasm_recursive(const rb_iseq_t *iseq, VALUE indent)
 {
+    const struct rb_iseq_constant_body *const body = iseq->body;
     VALUE *code;
     VALUE str = rb_str_new(0, 0);
     VALUE child = rb_ary_tmp_new(3);
     unsigned int size;
     unsigned int i;
     long l;
-    const ID *tbl;
     size_t n;
     enum {header_minlen = 72};
+    st_table *done_iseq = 0;
+    VALUE done_iseq_wrapper = Qnil;
+    const char *indent_str;
+    long indent_len;
 
-    rb_secure(1);
+    size = body->iseq_size;
 
-    size = iseq->body->iseq_size;
+    indent_len = RSTRING_LEN(indent);
+    indent_str = RSTRING_PTR(indent);
 
+    rb_str_cat(str, indent_str, indent_len);
     rb_str_cat2(str, "== disasm: ");
 
-    rb_str_concat(str, iseq_inspect(iseq));
-    if ((l = RSTRING_LEN(str)) < header_minlen) {
-	rb_str_resize(str, header_minlen);
-	memset(RSTRING_PTR(str) + l, '=', header_minlen - l);
+    rb_str_append(str, iseq_inspect(iseq));
+    rb_str_catf(str, " (catch: %s)", body->catch_except_p ? "TRUE" : "FALSE");
+    if ((l = RSTRING_LEN(str) - indent_len) < header_minlen) {
+	rb_str_modify_expand(str, header_minlen - l);
+	memset(RSTRING_END(str), '=', header_minlen - l);
     }
     rb_str_cat2(str, "\n");
 
     /* show catch table information */
-    if (iseq->body->catch_table) {
+    if (body->catch_table) {
+	rb_str_cat(str, indent_str, indent_len);
 	rb_str_cat2(str, "== catch table\n");
     }
-    if (iseq->body->catch_table) {
-	for (i = 0; i < iseq->body->catch_table->size; i++) {
-	    const struct iseq_catch_table_entry *entry = &iseq->body->catch_table->entries[i];
+    if (body->catch_table) {
+	rb_str_cat_cstr(indent, "| ");
+	indent_str = RSTRING_PTR(indent);
+	for (i = 0; i < body->catch_table->size; i++) {
+	    const struct iseq_catch_table_entry *entry =
+		UNALIGNED_MEMBER_PTR(body->catch_table, entries[i]);
+	    rb_str_cat(str, indent_str, indent_len);
 	    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, rb_iseq_disasm(rb_iseq_check(entry->iseq)));
+	    if (entry->iseq && !(done_iseq && st_is_member(done_iseq, (st_data_t)entry->iseq))) {
+		rb_str_concat(str, rb_iseq_disasm_recursive(rb_iseq_check(entry->iseq), indent));
+		if (!done_iseq) {
+                    done_iseq = st_init_numtable();
+                    done_iseq_wrapper = TypedData_Wrap_Struct(0, &tmp_set, done_iseq);
+                }
+		st_insert(done_iseq, (st_data_t)entry->iseq, (st_data_t)0);
+		indent_str = RSTRING_PTR(indent);
 	    }
 	}
+	rb_str_resize(indent, indent_len);
+	indent_str = RSTRING_PTR(indent);
     }
-    if (iseq->body->catch_table) {
+    if (body->catch_table) {
+	rb_str_cat(str, indent_str, indent_len);
 	rb_str_cat2(str, "|-------------------------------------"
 		    "-----------------------------------\n");
     }
 
     /* show local table information */
-    tbl = iseq->body->local_table;
-
-    if (tbl) {
+    if (body->local_table) {
+	const struct rb_iseq_param_keyword *const keyword = body->param.keyword;
+	rb_str_cat(str, indent_str, indent_len);
 	rb_str_catf(str,
 		    "local table (size: %d, argc: %d "
 		    "[opts: %d, rest: %d, post: %d, block: %d, kw: %d@%d, kwrest: %d])\n",
-		    iseq->body->local_size,
-		    iseq->body->param.lead_num,
-		    iseq->body->param.opt_num,
-		    iseq->body->param.flags.has_rest ? iseq->body->param.rest_start : -1,
-		    iseq->body->param.post_num,
-		    iseq->body->param.flags.has_block ? iseq->body->param.block_start : -1,
-		    iseq->body->param.flags.has_kw ? iseq->body->param.keyword->num : -1,
-		    iseq->body->param.flags.has_kw ? iseq->body->param.keyword->required_num : -1,
-		    iseq->body->param.flags.has_kwrest ? iseq->body->param.keyword->rest_start : -1);
-
-	for (i = 0; i < iseq->body->local_table_size; i++) {
-	    int li = (int)i;
+		    body->local_table_size,
+		    body->param.lead_num,
+		    body->param.opt_num,
+		    body->param.flags.has_rest ? body->param.rest_start : -1,
+		    body->param.post_num,
+		    body->param.flags.has_block ? body->param.block_start : -1,
+		    body->param.flags.has_kw ? keyword->num : -1,
+		    body->param.flags.has_kw ? keyword->required_num : -1,
+		    body->param.flags.has_kwrest ? keyword->rest_start : -1);
+
+	for (i = body->local_table_size; i > 0;) {
+	    int li = body->local_table_size - --i - 1;
 	    long width;
-	    VALUE name = id_to_name(tbl[i], 0);
-	    char argi[0x100] = "";
-	    char opti[0x100] = "";
-
-	    if (iseq->body->param.flags.has_opt) {
-		int argc = iseq->body->param.lead_num;
-		int opts = iseq->body->param.opt_num;
+	    VALUE name = local_var_name(iseq, 0, i);
+            char argi[0x100];
+            char opti[0x100];
+
+            opti[0] = '\0';
+	    if (body->param.flags.has_opt) {
+		int argc = body->param.lead_num;
+		int opts = body->param.opt_num;
 		if (li >= argc && li < argc + opts) {
 		    snprintf(opti, sizeof(opti), "Opt=%"PRIdVALUE,
-			     iseq->body->param.opt_table[li - argc]);
+			     body->param.opt_table[li - argc]);
 		}
 	    }
 
-	    snprintf(argi, sizeof(argi), "%s%s%s%s%s",	/* arg, opts, rest, post  block */
-		     iseq->body->param.lead_num > li ? "Arg" : "",
+	    snprintf(argi, sizeof(argi), "%s%s%s%s%s%s",	/* arg, opts, rest, post, kwrest, block */
+		     body->param.lead_num > li ? "Arg" : "",
 		     opti,
-		     (iseq->body->param.flags.has_rest && iseq->body->param.rest_start == li) ? "Rest" : "",
-		     (iseq->body->param.flags.has_post && iseq->body->param.post_start <= li && li < iseq->body->param.post_start + iseq->body->param.post_num) ? "Post" : "",
-		     (iseq->body->param.flags.has_block && iseq->body->param.block_start == li) ? "Block" : "");
+		     (body->param.flags.has_rest && body->param.rest_start == li) ? "Rest" : "",
+		     (body->param.flags.has_post && body->param.post_start <= li && li < body->param.post_start + body->param.post_num) ? "Post" : "",
+		     (body->param.flags.has_kwrest && keyword->rest_start == li) ? "Kwrest" : "",
+		     (body->param.flags.has_block && body->param.block_start == li) ? "Block" : "");
 
-	    rb_str_catf(str, "[%2d] ", iseq->body->local_size - i);
+	    rb_str_cat(str, indent_str, indent_len);
+	    rb_str_catf(str, "[%2d] ", i + 1);
 	    width = RSTRING_LEN(str) + 11;
-	    if (name)
-		rb_str_append(str, name);
-	    else
-		rb_str_cat2(str, "?");
+	    rb_str_append(str, name);
 	    if (*argi) rb_str_catf(str, "<%s>", argi);
 	    if ((width -= RSTRING_LEN(str)) > 0) rb_str_catf(str, "%*s", (int)width, "");
 	}
-	rb_str_cat2(str, "\n");
+	rb_str_cat_cstr(right_strip(str), "\n");
     }
 
     /* show each line */
     code = rb_iseq_original_iseq(iseq);
     for (n = 0; n < size;) {
+	rb_str_cat(str, indent_str, indent_len);
 	n += rb_iseq_disasm_insn(str, code, n, iseq, child);
     }
 
     for (l = 0; l < RARRAY_LEN(child); l++) {
 	VALUE isv = rb_ary_entry(child, l);
-	rb_str_concat(str, rb_iseq_disasm(rb_iseq_check((rb_iseq_t *)isv)));
+	if (done_iseq && st_is_member(done_iseq, (st_data_t)isv)) continue;
+	rb_str_cat_cstr(str, "\n");
+	rb_str_concat(str, rb_iseq_disasm_recursive(rb_iseq_check((rb_iseq_t *)isv), indent));
+	indent_str = RSTRING_PTR(indent);
     }
+    RB_GC_GUARD(done_iseq_wrapper);
 
     return str;
 }
 
+VALUE
+rb_iseq_disasm(const rb_iseq_t *iseq)
+{
+    VALUE str = rb_iseq_disasm_recursive(iseq, rb_str_new(0, 0));
+    rb_str_resize(str, RSTRING_LEN(str));
+    return str;
+}
+
 /*
  *  call-seq:
  *     iseq.disasm -> str
@@ -1603,6 +2363,116 @@ iseqw_disasm(VALUE self)
     return rb_iseq_disasm(iseqw_check(self));
 }
 
+static int
+iseq_iterate_children(const rb_iseq_t *iseq, void (*iter_func)(const rb_iseq_t *child_iseq, void *data), void *data)
+{
+    unsigned int i;
+    VALUE *code = rb_iseq_original_iseq(iseq);
+    const struct rb_iseq_constant_body *const body = iseq->body;
+    const rb_iseq_t *child;
+    VALUE all_children = rb_obj_hide(rb_ident_hash_new());
+
+    if (body->catch_table) {
+        for (i = 0; i < body->catch_table->size; i++) {
+            const struct iseq_catch_table_entry *entry =
+                UNALIGNED_MEMBER_PTR(body->catch_table, entries[i]);
+            child = entry->iseq;
+            if (child) {
+                if (rb_hash_aref(all_children, (VALUE)child) == Qnil) {
+                    rb_hash_aset(all_children, (VALUE)child, Qtrue);
+                    (*iter_func)(child, data);
+                }
+            }
+        }
+    }
+
+    for (i=0; i<body->iseq_size;) {
+        VALUE insn = code[i];
+        int len = insn_len(insn);
+        const char *types = insn_op_types(insn);
+        int j;
+
+        for (j=0; types[j]; j++) {
+            switch (types[j]) {
+              case TS_ISEQ:
+                child = (const rb_iseq_t *)code[i+j+1];
+                if (child) {
+                    if (rb_hash_aref(all_children, (VALUE)child) == Qnil) {
+                        rb_hash_aset(all_children, (VALUE)child, Qtrue);
+                        (*iter_func)(child, data);
+                    }
+                }
+                break;
+              default:
+                break;
+            }
+        }
+        i += len;
+    }
+
+    return (int)RHASH_SIZE(all_children);
+}
+
+static void
+yield_each_children(const rb_iseq_t *child_iseq, void *data)
+{
+    rb_yield(iseqw_new(child_iseq));
+}
+
+/*
+ *  call-seq:
+ *     iseq.each_child{|child_iseq| ...} -> iseq
+ *
+ *  Iterate all direct child instruction sequences.
+ *  Iteration order is implementation/version defined
+ *  so that people should not rely on the order.
+ */
+static VALUE
+iseqw_each_child(VALUE self)
+{
+    const rb_iseq_t *iseq = iseqw_check(self);
+    iseq_iterate_children(iseq, yield_each_children, NULL);
+    return self;
+}
+
+static void
+push_event_info(const rb_iseq_t *iseq, rb_event_flag_t events, int line, VALUE ary)
+{
+#define C(ev, cstr, l) if (events & ev) rb_ary_push(ary, rb_ary_new_from_args(2, l, ID2SYM(rb_intern(cstr))));
+    C(RUBY_EVENT_CLASS,    "class",    rb_iseq_first_lineno(iseq));
+    C(RUBY_EVENT_CALL,     "call",     rb_iseq_first_lineno(iseq));
+    C(RUBY_EVENT_B_CALL,   "b_call",   rb_iseq_first_lineno(iseq));
+    C(RUBY_EVENT_LINE,     "line",     INT2FIX(line));
+    C(RUBY_EVENT_END,      "end",      INT2FIX(line));
+    C(RUBY_EVENT_RETURN,   "return",   INT2FIX(line));
+    C(RUBY_EVENT_B_RETURN, "b_return", INT2FIX(line));
+#undef C
+}
+
+/*
+ *  call-seq:
+ *     iseq.trace_points -> ary
+ *
+ *  Return trace points in the instruction sequence.
+ *  Return an array of [line, event_symbol] pair.
+ */
+static VALUE
+iseqw_trace_points(VALUE self)
+{
+    const rb_iseq_t *iseq = iseqw_check(self);
+    const struct rb_iseq_constant_body *const body = iseq->body;
+    unsigned int i;
+    VALUE ary = rb_ary_new();
+
+    for (i=0; i<body->insns_info.size; i++) {
+	const struct iseq_insn_info_entry *entry = &body->insns_info.body[i];
+	if (entry->events) {
+	    push_event_info(iseq, entry->events, entry->line_no, ary);
+	}
+    }
+    return ary;
+}
+
 /*
  *  Returns the instruction sequence containing the given proc or method.
  *
@@ -1643,19 +2513,18 @@ iseqw_s_of(VALUE klass, VALUE body)
 {
     const rb_iseq_t *iseq = NULL;
 
-    rb_secure(1);
-
     if (rb_obj_is_proc(body)) {
-	rb_proc_t *proc;
-	GetProcPtr(body, proc);
-	iseq = proc->block.iseq;
+        iseq = vm_proc_iseq(body);
 
-	if (!RUBY_VM_NORMAL_ISEQ_P(iseq)) {
-	    iseq = NULL;
-	}
+        if (!rb_obj_is_iseq((VALUE)iseq)) {
+            iseq = NULL;
+        }
     }
-    else {
-	iseq = rb_method_iseq(body);
+    else if (rb_obj_is_method(body)) {
+        iseq = rb_method_iseq(body);
+    }
+    else if (rb_typeddata_is_instance_of(body, &iseqw_data_type)) {
+        return body;
     }
 
     return iseq ? iseqw_new(iseq) : Qnil;
@@ -1726,16 +2595,16 @@ ruby_node_name(int node)
     switch (node) {
 #include "node_name.inc"
       default:
-	rb_bug("unknown node (%d)", node);
+	rb_bug("unknown node: %d", node);
 	return 0;
     }
 }
 
 #define DECL_SYMBOL(name) \
-  static VALUE sym_##name
+  static ID sym_##name
 
 #define INIT_SYMBOL(name) \
-  sym_##name = ID2SYM(rb_intern(#name))
+  sym_##name = rb_intern(#name)
 
 static VALUE
 register_label(struct st_table *table, unsigned long idx)
@@ -1757,7 +2626,7 @@ exception_type2symbol(VALUE type)
       case CATCH_TYPE_REDO:   CONST_ID(id, "redo");   break;
       case CATCH_TYPE_NEXT:   CONST_ID(id, "next");   break;
       default:
-	rb_bug("exception_type2symbol: unknown type %d", (int)type);
+	rb_bug("unknown exception type: %d", (int)type);
     }
     return ID2SYM(id);
 }
@@ -1770,18 +2639,25 @@ cdhash_each(VALUE key, VALUE value, VALUE ary)
     return ST_CONTINUE;
 }
 
+static const rb_data_type_t label_wrapper = {
+    "label_wrapper",
+    {(void (*)(void *))rb_mark_tbl, (void (*)(void *))st_free_table, 0, 0,},
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 static VALUE
 iseq_data_to_ary(const rb_iseq_t *iseq)
 {
     unsigned int i;
     long l;
-    size_t ti;
+    const struct rb_iseq_constant_body *const iseq_body = iseq->body;
+    const struct iseq_insn_info_entry *prev_insn_info;
     unsigned int pos;
-    unsigned int line = 0;
+    int last_line = 0;
     VALUE *seq, *iseq_original;
 
     VALUE val = rb_ary_new();
-    VALUE type; /* Symbol */
+    ID type; /* Symbol */
     VALUE locals = rb_ary_new();
     VALUE params = rb_hash_new();
     VALUE body = rb_ary_new(); /* [[:insn1, ...], ...] */
@@ -1789,8 +2665,9 @@ iseq_data_to_ary(const rb_iseq_t *iseq)
     VALUE exception = rb_ary_new(); /* [[....]] */
     VALUE misc = rb_hash_new();
 
-    static VALUE insn_syms[VM_INSTRUCTION_SIZE];
+    static ID insn_syms[VM_INSTRUCTION_SIZE/2]; /* w/o-trace only */
     struct st_table *labels_table = st_init_numtable();
+    VALUE labels_wrapper = TypedData_Wrap_Struct(0, &label_wrapper, labels_table);
 
     DECL_SYMBOL(top);
     DECL_SYMBOL(method);
@@ -1800,12 +2677,12 @@ iseq_data_to_ary(const rb_iseq_t *iseq)
     DECL_SYMBOL(ensure);
     DECL_SYMBOL(eval);
     DECL_SYMBOL(main);
-    DECL_SYMBOL(defined_guard);
+    DECL_SYMBOL(plain);
 
     if (sym_top == 0) {
 	int i;
-	for (i=0; i<VM_INSTRUCTION_SIZE; i++) {
-	    insn_syms[i] = ID2SYM(rb_intern(insn_name(i)));
+	for (i=0; i<numberof(insn_syms); i++) {
+            insn_syms[i] = rb_intern(insn_name(i));
 	}
 	INIT_SYMBOL(top);
 	INIT_SYMBOL(method);
@@ -1815,11 +2692,11 @@ iseq_data_to_ary(const rb_iseq_t *iseq)
 	INIT_SYMBOL(ensure);
 	INIT_SYMBOL(eval);
 	INIT_SYMBOL(main);
-	INIT_SYMBOL(defined_guard);
+	INIT_SYMBOL(plain);
     }
 
     /* type */
-    switch (iseq->body->type) {
+    switch (iseq_body->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;
@@ -1828,19 +2705,19 @@ iseq_data_to_ary(const rb_iseq_t *iseq)
       case ISEQ_TYPE_ENSURE: type = sym_ensure; break;
       case ISEQ_TYPE_EVAL:   type = sym_eval;   break;
       case ISEQ_TYPE_MAIN:   type = sym_main;   break;
-      case ISEQ_TYPE_DEFINED_GUARD: type = sym_defined_guard; break;
-      default: rb_bug("unsupported iseq type");
+      case ISEQ_TYPE_PLAIN:  type = sym_plain;  break;
+      default: rb_bug("unsupported iseq type: %d", (int)iseq_body->type);
     };
 
     /* locals */
-    for (i=0; i<iseq->body->local_table_size; i++) {
-	ID lid = iseq->body->local_table[i];
+    for (i=0; i<iseq_body->local_table_size; i++) {
+	ID lid = iseq_body->local_table[i];
 	if (lid) {
 	    if (rb_id2str(lid)) {
 		rb_ary_push(locals, ID2SYM(lid));
 	    }
 	    else { /* hidden variable from id_internal() */
-		rb_ary_push(locals, ULONG2NUM(iseq->body->local_table_size-i+1));
+		rb_ary_push(locals, ULONG2NUM(iseq_body->local_table_size-i+1));
 	    }
 	}
 	else {
@@ -1850,57 +2727,58 @@ iseq_data_to_ary(const rb_iseq_t *iseq)
 
     /* params */
     {
+	const struct rb_iseq_param_keyword *const keyword = iseq_body->param.keyword;
 	int j;
 
-	if (iseq->body->param.flags.has_opt) {
-          int len = iseq->body->param.opt_num + 1;
-          VALUE arg_opt_labels = rb_ary_new2(len);
+	if (iseq_body->param.flags.has_opt) {
+	    int len = iseq_body->param.opt_num + 1;
+	    VALUE arg_opt_labels = rb_ary_new2(len);
 
-          for (j = 0; j < len; j++) {
-              VALUE l = register_label(labels_table, iseq->body->param.opt_table[j]);
-              rb_ary_push(arg_opt_labels, l);
-          }
-          rb_hash_aset(params, ID2SYM(rb_intern("opt")), arg_opt_labels);
+	    for (j = 0; j < len; j++) {
+		VALUE l = register_label(labels_table, iseq_body->param.opt_table[j]);
+		rb_ary_push(arg_opt_labels, l);
+	    }
+	    rb_hash_aset(params, ID2SYM(rb_intern("opt")), arg_opt_labels);
         }
 
 	/* commit */
-	if (iseq->body->param.flags.has_lead) rb_hash_aset(params, ID2SYM(rb_intern("lead_num")), INT2FIX(iseq->body->param.lead_num));
-	if (iseq->body->param.flags.has_post) rb_hash_aset(params, ID2SYM(rb_intern("post_num")), INT2FIX(iseq->body->param.post_num));
-	if (iseq->body->param.flags.has_post) rb_hash_aset(params, ID2SYM(rb_intern("post_start")), INT2FIX(iseq->body->param.post_start));
-	if (iseq->body->param.flags.has_rest) rb_hash_aset(params, ID2SYM(rb_intern("rest_start")), INT2FIX(iseq->body->param.rest_start));
-	if (iseq->body->param.flags.has_block) rb_hash_aset(params, ID2SYM(rb_intern("block_start")), INT2FIX(iseq->body->param.block_start));
-	if (iseq->body->param.flags.has_kw) {
+	if (iseq_body->param.flags.has_lead) rb_hash_aset(params, ID2SYM(rb_intern("lead_num")), INT2FIX(iseq_body->param.lead_num));
+	if (iseq_body->param.flags.has_post) rb_hash_aset(params, ID2SYM(rb_intern("post_num")), INT2FIX(iseq_body->param.post_num));
+	if (iseq_body->param.flags.has_post) rb_hash_aset(params, ID2SYM(rb_intern("post_start")), INT2FIX(iseq_body->param.post_start));
+	if (iseq_body->param.flags.has_rest) rb_hash_aset(params, ID2SYM(rb_intern("rest_start")), INT2FIX(iseq_body->param.rest_start));
+	if (iseq_body->param.flags.has_block) rb_hash_aset(params, ID2SYM(rb_intern("block_start")), INT2FIX(iseq_body->param.block_start));
+	if (iseq_body->param.flags.has_kw) {
 	    VALUE keywords = rb_ary_new();
 	    int i, j;
-	    for (i=0; i<iseq->body->param.keyword->required_num; i++) {
-		rb_ary_push(keywords, ID2SYM(iseq->body->param.keyword->table[i]));
+	    for (i=0; i<keyword->required_num; i++) {
+		rb_ary_push(keywords, ID2SYM(keyword->table[i]));
 	    }
-	    for (j=0; i<iseq->body->param.keyword->num; i++, j++) {
-		VALUE key = rb_ary_new_from_args(1, ID2SYM(iseq->body->param.keyword->table[i]));
-		if (iseq->body->param.keyword->default_values[j] != Qundef) {
-		    rb_ary_push(key, iseq->body->param.keyword->default_values[j]);
+	    for (j=0; i<keyword->num; i++, j++) {
+		VALUE key = rb_ary_new_from_args(1, ID2SYM(keyword->table[i]));
+		if (keyword->default_values[j] != Qundef) {
+		    rb_ary_push(key, keyword->default_values[j]);
 		}
 		rb_ary_push(keywords, key);
 	    }
 
 	    rb_hash_aset(params, ID2SYM(rb_intern("kwbits")),
-	                 INT2FIX(iseq->body->param.keyword->bits_start));
+	                 INT2FIX(keyword->bits_start));
 	    rb_hash_aset(params, ID2SYM(rb_intern("keyword")), keywords);
 	}
-	if (iseq->body->param.flags.has_kwrest) rb_hash_aset(params, ID2SYM(rb_intern("kwrest")), INT2FIX(iseq->body->param.keyword->rest_start));
-	if (iseq->body->param.flags.ambiguous_param0) rb_hash_aset(params, ID2SYM(rb_intern("ambiguous_param0")), Qtrue);
+	if (iseq_body->param.flags.has_kwrest) rb_hash_aset(params, ID2SYM(rb_intern("kwrest")), INT2FIX(keyword->rest_start));
+	if (iseq_body->param.flags.ambiguous_param0) rb_hash_aset(params, ID2SYM(rb_intern("ambiguous_param0")), Qtrue);
     }
 
     /* body */
     iseq_original = rb_iseq_original_iseq((rb_iseq_t *)iseq);
 
-    for (seq = iseq_original; seq < iseq_original + iseq->body->iseq_size; ) {
+    for (seq = iseq_original; seq < iseq_original + iseq_body->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]);
+        rb_ary_push(ary, ID2SYM(insn_syms[insn%numberof(insn_syms)]));
 	for (j=0; j<len-1; j++, seq++) {
 	    switch (insn_op_type(insn, j)) {
 	      case TS_OFFSET: {
@@ -1927,47 +2805,42 @@ iseq_data_to_ary(const rb_iseq_t *iseq)
 		    }
 		}
 		break;
-	      case TS_GENTRY:
-		{
-		    struct rb_global_entry *entry = (struct rb_global_entry *)*seq;
-		    rb_ary_push(ary, ID2SYM(entry->id));
-		}
-		break;
 	      case TS_IC:
+              case TS_IVC:
+	      case TS_ISE:
 		{
 		    union iseq_inline_storage_entry *is = (union iseq_inline_storage_entry *)*seq;
-		    rb_ary_push(ary, INT2FIX(is - iseq->body->is_entries));
+		    rb_ary_push(ary, INT2FIX(is - iseq_body->is_entries));
 		}
 		break;
-	      case TS_CALLINFO:
+              case TS_CALLDATA:
 		{
-		    struct rb_call_info *ci = (struct rb_call_info *)*seq;
+                    struct rb_call_data *cd = (struct rb_call_data *)*seq;
+                    const struct rb_callinfo *ci = cd->ci;
 		    VALUE e = rb_hash_new();
-		    int orig_argc = ci->orig_argc;
+                    int argc = vm_ci_argc(ci);
 
-		    rb_hash_aset(e, ID2SYM(rb_intern("mid")), ci->mid ? ID2SYM(ci->mid) : Qnil);
-		    rb_hash_aset(e, ID2SYM(rb_intern("flag")), UINT2NUM(ci->flag));
+                    ID mid = vm_ci_mid(ci);
+		    rb_hash_aset(e, ID2SYM(rb_intern("mid")), mid ? ID2SYM(mid) : Qnil);
+		    rb_hash_aset(e, ID2SYM(rb_intern("flag")), UINT2NUM(vm_ci_flag(ci)));
 
-		    if (ci->flag & VM_CALL_KWARG) {
-			struct rb_call_info_with_kwarg *ci_kw = (struct rb_call_info_with_kwarg *)ci;
-			int i;
-			VALUE kw = rb_ary_new2((long)ci_kw->kw_arg->keyword_len);
+                    if (vm_ci_flag(ci) & VM_CALL_KWARG) {
+                        const struct rb_callinfo_kwarg *kwarg = vm_ci_kwarg(ci);
+                        int i;
+			VALUE kw = rb_ary_new2((long)kwarg->keyword_len);
 
-			orig_argc -= ci_kw->kw_arg->keyword_len;
-			for (i = 0; i < ci_kw->kw_arg->keyword_len; i++) {
-			    rb_ary_push(kw, ci_kw->kw_arg->keywords[i]);
+			argc -= kwarg->keyword_len;
+                        for (i = 0; i < kwarg->keyword_len; i++) {
+			    rb_ary_push(kw, kwarg->keywords[i]);
 			}
 			rb_hash_aset(e, ID2SYM(rb_intern("kw_arg")), kw);
 		    }
 
 		    rb_hash_aset(e, ID2SYM(rb_intern("orig_argc")),
-				INT2FIX(orig_argc));
+				INT2FIX(argc));
 		    rb_ary_push(ary, e);
 	        }
 		break;
-	      case TS_CALLCACHE:
-		rb_ary_push(ary, Qfalse);
-		break;
 	      case TS_ID:
 		rb_ary_push(ary, ID2SYM(*seq));
 		break;
@@ -1999,6 +2872,21 @@ iseq_data_to_ary(const rb_iseq_t *iseq)
 		    rb_ary_push(ary, val);
 		}
 		break;
+              case TS_BUILTIN:
+                {
+                    VALUE val = rb_hash_new();
+#if SIZEOF_VALUE <= SIZEOF_LONG
+                    VALUE func_ptr = LONG2NUM((SIGNED_VALUE)((RB_BUILTIN)*seq)->func_ptr);
+#else
+                    VALUE func_ptr = LL2NUM((SIGNED_VALUE)((RB_BUILTIN)*seq)->func_ptr);
+#endif
+                    rb_hash_aset(val, ID2SYM(rb_intern("func_ptr")), func_ptr);
+                    rb_hash_aset(val, ID2SYM(rb_intern("argc")), INT2NUM(((RB_BUILTIN)*seq)->argc));
+                    rb_hash_aset(val, ID2SYM(rb_intern("index")), INT2NUM(((RB_BUILTIN)*seq)->index));
+                    rb_hash_aset(val, ID2SYM(rb_intern("name")), rb_str_new_cstr(((RB_BUILTIN)*seq)->name));
+                    rb_ary_push(ary, val);
+                }
+                break;
 	      default:
 		rb_bug("unknown operand: %c", insn_op_type(insn, j));
 	    }
@@ -2009,9 +2897,10 @@ iseq_data_to_ary(const rb_iseq_t *iseq)
     nbody = body;
 
     /* exception */
-    if (iseq->body->catch_table) for (i=0; i<iseq->body->catch_table->size; i++) {
+    if (iseq_body->catch_table) for (i=0; i<iseq_body->catch_table->size; i++) {
 	VALUE ary = rb_ary_new();
-	const struct iseq_catch_table_entry *entry = &iseq->body->catch_table->entries[i];
+	const struct iseq_catch_table_entry *entry =
+	    UNALIGNED_MEMBER_PTR(iseq_body->catch_table, entries[i]);
 	rb_ary_push(ary, exception_type2symbol(entry->type));
 	if (entry->iseq) {
 	    rb_ary_push(ary, iseq_data_to_ary(rb_iseq_check(entry->iseq)));
@@ -2028,9 +2917,10 @@ iseq_data_to_ary(const rb_iseq_t *iseq)
 
     /* make body with labels and insert line number */
     body = rb_ary_new();
-    ti = 0;
+    prev_insn_info = NULL;
 
     for (l=0, pos=0; l<RARRAY_LEN(nbody); l++) {
+	const struct iseq_insn_info_entry *info;
 	VALUE ary = RARRAY_AREF(nbody, l);
 	st_data_t label;
 
@@ -2038,24 +2928,45 @@ iseq_data_to_ary(const rb_iseq_t *iseq)
 	    rb_ary_push(body, (VALUE)label);
 	}
 
-	if (ti < iseq->body->line_info_size && iseq->body->line_info_table[ti].position == pos) {
-	    line = iseq->body->line_info_table[ti].line_no;
-	    rb_ary_push(body, INT2FIX(line));
-	    ti++;
+	info = get_insn_info(iseq, pos);
+
+	if (prev_insn_info != info) {
+	    int line = info->line_no;
+	    rb_event_flag_t events = info->events;
+
+	    if (line > 0 && last_line != line) {
+		rb_ary_push(body, INT2FIX(line));
+		last_line = line;
+	    }
+#define CHECK_EVENT(ev) if (events & ev) rb_ary_push(body, ID2SYM(rb_intern(#ev)));
+	    CHECK_EVENT(RUBY_EVENT_LINE);
+	    CHECK_EVENT(RUBY_EVENT_CLASS);
+	    CHECK_EVENT(RUBY_EVENT_END);
+	    CHECK_EVENT(RUBY_EVENT_CALL);
+	    CHECK_EVENT(RUBY_EVENT_RETURN);
+	    CHECK_EVENT(RUBY_EVENT_B_CALL);
+	    CHECK_EVENT(RUBY_EVENT_B_RETURN);
+#undef CHECK_EVENT
+	    prev_insn_info = info;
 	}
 
 	rb_ary_push(body, ary);
 	pos += RARRAY_LENINT(ary); /* reject too huge data */
     }
     RB_GC_GUARD(nbody);
+    RB_GC_GUARD(labels_wrapper);
+
+    rb_hash_aset(misc, ID2SYM(rb_intern("arg_size")), INT2FIX(iseq_body->param.size));
+    rb_hash_aset(misc, ID2SYM(rb_intern("local_size")), INT2FIX(iseq_body->local_table_size));
+    rb_hash_aset(misc, ID2SYM(rb_intern("stack_max")), INT2FIX(iseq_body->stack_max));
+    rb_hash_aset(misc, ID2SYM(rb_intern("node_id")), INT2FIX(iseq_body->location.node_id));
+    rb_hash_aset(misc, ID2SYM(rb_intern("code_location")),
+	    rb_ary_new_from_args(4,
+		INT2FIX(iseq_body->location.code_location.beg_pos.lineno),
+		INT2FIX(iseq_body->location.code_location.beg_pos.column),
+		INT2FIX(iseq_body->location.code_location.end_pos.lineno),
+		INT2FIX(iseq_body->location.code_location.end_pos.column)));
 
-    st_free_table(labels_table);
-
-    rb_hash_aset(misc, ID2SYM(rb_intern("arg_size")), INT2FIX(iseq->body->param.size));
-    rb_hash_aset(misc, ID2SYM(rb_intern("local_size")), INT2FIX(iseq->body->local_size));
-    rb_hash_aset(misc, ID2SYM(rb_intern("stack_max")), INT2FIX(iseq->body->stack_max));
-
-    /* TODO: compatibility issue */
     /*
      * [:magic, :major_version, :minor_version, :format_type, :misc,
      *  :name, :path, :absolute_path, :start_lineno, :type, :locals, :args,
@@ -2066,11 +2977,11 @@ iseq_data_to_ary(const rb_iseq_t *iseq)
     rb_ary_push(val, INT2FIX(ISEQ_MINOR_VERSION)); /* minor */
     rb_ary_push(val, INT2FIX(1));
     rb_ary_push(val, misc);
-    rb_ary_push(val, iseq->body->location.label);
-    rb_ary_push(val, iseq->body->location.path);
-    rb_ary_push(val, iseq->body->location.absolute_path);
-    rb_ary_push(val, iseq->body->location.first_lineno);
-    rb_ary_push(val, type);
+    rb_ary_push(val, iseq_body->location.label);
+    rb_ary_push(val, rb_iseq_path(iseq));
+    rb_ary_push(val, rb_iseq_realpath(iseq));
+    rb_ary_push(val, iseq_body->location.first_lineno);
+    rb_ary_push(val, ID2SYM(type));
     rb_ary_push(val, locals);
     rb_ary_push(val, params);
     rb_ary_push(val, exception);
@@ -2082,10 +2993,12 @@ VALUE
 rb_iseq_parameters(const rb_iseq_t *iseq, int is_proc)
 {
     int i, r;
-    VALUE a, args = rb_ary_new2(iseq->body->param.size);
+    const struct rb_iseq_constant_body *const body = iseq->body;
+    const struct rb_iseq_param_keyword *const keyword = body->param.keyword;
+    VALUE a, args = rb_ary_new2(body->param.size);
     ID req, opt, rest, block, key, keyrest;
 #define PARAM_TYPE(type) rb_ary_push(a = rb_ary_new2(2), ID2SYM(type))
-#define PARAM_ID(i) iseq->body->local_table[(i)]
+#define PARAM_ID(i) body->local_table[(i)]
 #define PARAM(i, type) (		      \
 	PARAM_TYPE(type),		      \
 	rb_id2str(PARAM_ID(i)) ?	      \
@@ -2095,18 +3008,18 @@ rb_iseq_parameters(const rb_iseq_t *iseq, int is_proc)
     CONST_ID(req, "req");
     CONST_ID(opt, "opt");
     if (is_proc) {
-	for (i = 0; i < iseq->body->param.lead_num; i++) {
+	for (i = 0; i < body->param.lead_num; i++) {
 	    PARAM_TYPE(opt);
 	    rb_ary_push(a, rb_id2str(PARAM_ID(i)) ? ID2SYM(PARAM_ID(i)) : Qnil);
 	    rb_ary_push(args, a);
 	}
     }
     else {
-	for (i = 0; i < iseq->body->param.lead_num; i++) {
+	for (i = 0; i < body->param.lead_num; i++) {
 	    rb_ary_push(args, PARAM(i, req));
 	}
     }
-    r = iseq->body->param.lead_num + iseq->body->param.opt_num;
+    r = body->param.lead_num + body->param.opt_num;
     for (; i < r; i++) {
 	PARAM_TYPE(opt);
 	if (rb_id2str(PARAM_ID(i))) {
@@ -2114,52 +3027,58 @@ rb_iseq_parameters(const rb_iseq_t *iseq, int is_proc)
 	}
 	rb_ary_push(args, a);
     }
-    if (iseq->body->param.flags.has_rest) {
+    if (body->param.flags.has_rest) {
 	CONST_ID(rest, "rest");
-	rb_ary_push(args, PARAM(iseq->body->param.rest_start, rest));
+	rb_ary_push(args, PARAM(body->param.rest_start, rest));
     }
-    r = iseq->body->param.post_start + iseq->body->param.post_num;
+    r = body->param.post_start + body->param.post_num;
     if (is_proc) {
-	for (i = iseq->body->param.post_start; i < r; i++) {
+	for (i = body->param.post_start; i < r; i++) {
 	    PARAM_TYPE(opt);
 	    rb_ary_push(a, rb_id2str(PARAM_ID(i)) ? ID2SYM(PARAM_ID(i)) : Qnil);
 	    rb_ary_push(args, a);
 	}
     }
     else {
-	for (i = iseq->body->param.post_start; i < r; i++) {
+	for (i = body->param.post_start; i < r; i++) {
 	    rb_ary_push(args, PARAM(i, req));
 	}
     }
-    if (iseq->body->param.flags.has_kw) {
+    if (body->param.flags.accepts_no_kwarg) {
+	ID nokey;
+	CONST_ID(nokey, "nokey");
+	PARAM_TYPE(nokey);
+	rb_ary_push(args, a);
+    }
+    if (body->param.flags.has_kw) {
 	i = 0;
-	if (iseq->body->param.keyword->required_num > 0) {
+	if (keyword->required_num > 0) {
 	    ID keyreq;
 	    CONST_ID(keyreq, "keyreq");
-	    for (; i < iseq->body->param.keyword->required_num; i++) {
+	    for (; i < keyword->required_num; i++) {
 		PARAM_TYPE(keyreq);
-		if (rb_id2str(iseq->body->param.keyword->table[i])) {
-		    rb_ary_push(a, ID2SYM(iseq->body->param.keyword->table[i]));
+		if (rb_id2str(keyword->table[i])) {
+		    rb_ary_push(a, ID2SYM(keyword->table[i]));
 		}
 		rb_ary_push(args, a);
 	    }
 	}
 	CONST_ID(key, "key");
-	for (; i < iseq->body->param.keyword->num; i++) {
+	for (; i < keyword->num; i++) {
 	    PARAM_TYPE(key);
-	    if (rb_id2str(iseq->body->param.keyword->table[i])) {
-		rb_ary_push(a, ID2SYM(iseq->body->param.keyword->table[i]));
+	    if (rb_id2str(keyword->table[i])) {
+		rb_ary_push(a, ID2SYM(keyword->table[i]));
 	    }
 	    rb_ary_push(args, a);
 	}
     }
-    if (iseq->body->param.flags.has_kwrest) {
+    if (body->param.flags.has_kwrest) {
 	CONST_ID(keyrest, "keyrest");
-	rb_ary_push(args, PARAM(iseq->body->param.keyword->rest_start, keyrest));
+	rb_ary_push(args, PARAM(keyword->rest_start, keyrest));
     }
-    if (iseq->body->param.flags.has_block) {
+    if (body->param.flags.has_block) {
 	CONST_ID(block, "block");
-	rb_ary_push(args, PARAM(iseq->body->param.block_start, block));
+	rb_ary_push(args, PARAM(body->param.block_start, block));
     }
     return args;
 }
@@ -2204,131 +3123,262 @@ rb_iseq_defined_string(enum defined_type type)
     return str;
 }
 
-/* Experimental tracing support: trace(line) -> trace(specified_line)
- * MRI Specific.
- */
+/* A map from encoded_insn to insn_data: decoded insn number, its len,
+ * non-trace version of encoded insn, and trace version. */
+
+static st_table *encoded_insn_data;
+typedef struct insn_data_struct {
+    int insn;
+    int insn_len;
+    void *notrace_encoded_insn;
+    void *trace_encoded_insn;
+} insn_data_t;
+static insn_data_t insn_data[VM_INSTRUCTION_SIZE/2];
+
+void
+rb_vm_encoded_insn_data_table_init(void)
+{
+#if OPT_DIRECT_THREADED_CODE || OPT_CALL_THREADED_CODE
+    const void * const *table = rb_vm_get_insns_address_table();
+#define INSN_CODE(insn) ((VALUE)table[insn])
+#else
+#define INSN_CODE(insn) (insn)
+#endif
+    st_data_t insn;
+    encoded_insn_data = st_init_numtable_with_size(VM_INSTRUCTION_SIZE / 2);
+
+    for (insn = 0; insn < VM_INSTRUCTION_SIZE/2; insn++) {
+        st_data_t key1 = (st_data_t)INSN_CODE(insn);
+        st_data_t key2 = (st_data_t)INSN_CODE(insn + VM_INSTRUCTION_SIZE/2);
+
+        insn_data[insn].insn = (int)insn;
+        insn_data[insn].insn_len = insn_len(insn);
+
+        if (insn != BIN(opt_invokebuiltin_delegate_leave)) {
+            insn_data[insn].notrace_encoded_insn = (void *) key1;
+            insn_data[insn].trace_encoded_insn = (void *) key2;
+        }
+        else {
+            insn_data[insn].notrace_encoded_insn = (void *) INSN_CODE(BIN(opt_invokebuiltin_delegate));
+            insn_data[insn].trace_encoded_insn = (void *) INSN_CODE(BIN(opt_invokebuiltin_delegate) + VM_INSTRUCTION_SIZE/2);
+        }
+
+        st_add_direct(encoded_insn_data, key1, (st_data_t)&insn_data[insn]);
+        st_add_direct(encoded_insn_data, key2, (st_data_t)&insn_data[insn]);
+    }
+}
 
 int
-rb_iseqw_line_trace_each(VALUE iseqw, int (*func)(int line, rb_event_flag_t *events_ptr, void *d), void *data)
+rb_vm_insn_addr2insn(const void *addr)
 {
-    int trace_num = 0;
-    unsigned int pos;
-    size_t insn;
-    const rb_iseq_t *iseq = iseqw_check(iseqw);
-    int cont = 1;
-    VALUE *iseq_original;
-
-    iseq_original = rb_iseq_original_iseq(iseq);
-    for (pos = 0; cont && pos < iseq->body->iseq_size; pos += insn_len(insn)) {
-	insn = iseq_original[pos];
-
-	if (insn == BIN(trace)) {
-	    rb_event_flag_t current_events;
-
-	    current_events = (rb_event_flag_t)iseq_original[pos+1];
-
-	    if (current_events & RUBY_EVENT_LINE) {
-		rb_event_flag_t events = current_events & RUBY_EVENT_SPECIFIED_LINE;
-		trace_num++;
-
-		if (func) {
-		    int line = find_line_no(iseq, pos);
-		    /* printf("line: %d\n", line); */
-		    cont = (*func)(line, &events, data);
-		    if (current_events != events) {
-			VALUE *encoded = (VALUE *)iseq->body->iseq_encoded;
-			iseq_original[pos+1] = encoded[pos+1] =
-			  (VALUE)(current_events | (events & RUBY_EVENT_SPECIFIED_LINE));
-		    }
-		}
-	    }
-	}
+    st_data_t key = (st_data_t)addr;
+    st_data_t val;
+
+    if (st_lookup(encoded_insn_data, key, &val)) {
+        insn_data_t *e = (insn_data_t *)val;
+        return (int)e->insn;
     }
-    return trace_num;
+
+    rb_bug("rb_vm_insn_addr2insn: invalid insn address: %p", addr);
 }
 
-static int
-collect_trace(int line, rb_event_flag_t *events_ptr, void *ptr)
+static inline int
+encoded_iseq_trace_instrument(VALUE *iseq_encoded_insn, rb_event_flag_t turnon, bool remain_current_trace)
 {
-    VALUE result = (VALUE)ptr;
-    rb_ary_push(result, INT2NUM(line));
-    return 1;
+    st_data_t key = (st_data_t)*iseq_encoded_insn;
+    st_data_t val;
+
+    if (st_lookup(encoded_insn_data, key, &val)) {
+        insn_data_t *e = (insn_data_t *)val;
+        if (remain_current_trace && key == (st_data_t)e->trace_encoded_insn) {
+            turnon = 1;
+        }
+        *iseq_encoded_insn = (VALUE) (turnon ? e->trace_encoded_insn : e->notrace_encoded_insn);
+        return e->insn_len;
+    }
+
+    rb_bug("trace_instrument: invalid insn address: %p", (void *)*iseq_encoded_insn);
 }
 
-/*
- * <b>Experimental MRI specific feature, only available as C level api.</b>
- *
- * Returns all +specified_line+ events.
- */
-VALUE
-rb_iseqw_line_trace_all(VALUE iseqw)
+void
+rb_iseq_trace_flag_cleared(const rb_iseq_t *iseq, size_t pos)
 {
-    VALUE result = rb_ary_new();
-    rb_iseqw_line_trace_each(iseqw, collect_trace, (void *)result);
-    return result;
+    const struct rb_iseq_constant_body *const body = iseq->body;
+    VALUE *iseq_encoded = (VALUE *)body->iseq_encoded;
+    encoded_iseq_trace_instrument(&iseq_encoded[pos], 0, false);
 }
 
-struct set_specifc_data {
-    int pos;
-    int set;
-    int prev; /* 1: set, 2: unset, 0: not found */
+static int
+iseq_add_local_tracepoint(const rb_iseq_t *iseq, rb_event_flag_t turnon_events, VALUE tpval, unsigned int target_line)
+{
+    unsigned int pc;
+    int n = 0;
+    const struct rb_iseq_constant_body *const body = iseq->body;
+    VALUE *iseq_encoded = (VALUE *)body->iseq_encoded;
+
+    VM_ASSERT(ISEQ_EXECUTABLE_P(iseq));
+
+    for (pc=0; pc<body->iseq_size;) {
+        const struct iseq_insn_info_entry *entry = get_insn_info(iseq, pc);
+        rb_event_flag_t pc_events = entry->events;
+        rb_event_flag_t target_events = turnon_events;
+        unsigned int line = (int)entry->line_no;
+
+        if (target_line == 0 || target_line == line) {
+            /* ok */
+        }
+        else {
+            target_events &= ~RUBY_EVENT_LINE;
+        }
+
+        if (pc_events & target_events) {
+            n++;
+        }
+        pc += encoded_iseq_trace_instrument(&iseq_encoded[pc], pc_events & (target_events | iseq->aux.exec.global_trace_events), true);
+    }
+
+    if (n > 0) {
+        if (iseq->aux.exec.local_hooks == NULL) {
+            ((rb_iseq_t *)iseq)->aux.exec.local_hooks = RB_ZALLOC(rb_hook_list_t);
+        }
+        rb_hook_list_connect_tracepoint((VALUE)iseq, iseq->aux.exec.local_hooks, tpval, target_line);
+    }
+
+    return n;
+}
+
+struct trace_set_local_events_struct {
+    rb_event_flag_t turnon_events;
+    VALUE tpval;
+    unsigned int target_line;
+    int n;
 };
 
+static void
+iseq_add_local_tracepoint_i(const rb_iseq_t *iseq, void *p)
+{
+    struct trace_set_local_events_struct *data = (struct trace_set_local_events_struct *)p;
+    data->n += iseq_add_local_tracepoint(iseq, data->turnon_events, data->tpval, data->target_line);
+    iseq_iterate_children(iseq, iseq_add_local_tracepoint_i, p);
+}
+
+int
+rb_iseq_add_local_tracepoint_recursively(const rb_iseq_t *iseq, rb_event_flag_t turnon_events, VALUE tpval, unsigned int target_line)
+{
+    struct trace_set_local_events_struct data;
+    data.turnon_events = turnon_events;
+    data.tpval = tpval;
+    data.target_line = target_line;
+    data.n = 0;
+
+    iseq_add_local_tracepoint_i(iseq, (void *)&data);
+    if (0) rb_funcall(Qnil, rb_intern("puts"), 1, rb_iseq_disasm(iseq)); /* for debug */
+    return data.n;
+}
+
 static int
-line_trace_specify(int line, rb_event_flag_t *events_ptr, void *ptr)
+iseq_remove_local_tracepoint(const rb_iseq_t *iseq, VALUE tpval)
 {
-    struct set_specifc_data *data = (struct set_specifc_data *)ptr;
+    int n = 0;
 
-    if (data->pos == 0) {
-	data->prev = *events_ptr & RUBY_EVENT_SPECIFIED_LINE ? 1 : 2;
-	if (data->set) {
-	    *events_ptr = *events_ptr | RUBY_EVENT_SPECIFIED_LINE;
-	}
-	else {
-	    *events_ptr = *events_ptr & ~RUBY_EVENT_SPECIFIED_LINE;
-	}
-	return 0; /* found */
-    }
-    else {
-	data->pos--;
-	return 1;
+    if (iseq->aux.exec.local_hooks) {
+        unsigned int pc;
+        const struct rb_iseq_constant_body *const body = iseq->body;
+        VALUE *iseq_encoded = (VALUE *)body->iseq_encoded;
+        rb_event_flag_t local_events = 0;
+
+        rb_hook_list_remove_tracepoint(iseq->aux.exec.local_hooks, tpval);
+        local_events = iseq->aux.exec.local_hooks->events;
+
+        if (local_events == 0) {
+            if (iseq->aux.exec.local_hooks->running == 0) {
+                rb_hook_list_free(iseq->aux.exec.local_hooks);
+            }
+            ((rb_iseq_t *)iseq)->aux.exec.local_hooks = NULL;
+        }
+
+        for (pc = 0; pc<body->iseq_size;) {
+            rb_event_flag_t pc_events = rb_iseq_event_flags(iseq, pc);
+            pc += encoded_iseq_trace_instrument(&iseq_encoded[pc], pc_events & (local_events | iseq->aux.exec.global_trace_events), false);
+        }
     }
+    return n;
 }
 
-/*
- * <b>Experimental MRI specific feature, only available as C level api.</b>
- *
- * Set a +specified_line+ event at the given line position, if the +set+
- * parameter is +true+.
- *
- * This method is useful for building a debugger breakpoint at a specific line.
- *
- * A TypeError is raised if +set+ is not boolean.
- *
- * If +pos+ is a negative integer a TypeError exception is raised.
- */
-VALUE
-rb_iseqw_line_trace_specify(VALUE iseqval, VALUE pos, VALUE set)
+struct trace_clear_local_events_struct {
+    VALUE tpval;
+    int n;
+};
+
+static void
+iseq_remove_local_tracepoint_i(const rb_iseq_t *iseq, void *p)
+{
+    struct trace_clear_local_events_struct *data = (struct trace_clear_local_events_struct *)p;
+    data->n += iseq_remove_local_tracepoint(iseq, data->tpval);
+    iseq_iterate_children(iseq, iseq_remove_local_tracepoint_i, p);
+}
+
+int
+rb_iseq_remove_local_tracepoint_recursively(const rb_iseq_t *iseq, VALUE tpval)
 {
-    struct set_specifc_data data;
+    struct trace_clear_local_events_struct data;
+    data.tpval = tpval;
+    data.n = 0;
 
-    data.prev = 0;
-    data.pos = NUM2INT(pos);
-    if (data.pos < 0) rb_raise(rb_eTypeError, "`pos' is negative");
+    iseq_remove_local_tracepoint_i(iseq, (void *)&data);
+    return data.n;
+}
 
-    switch (set) {
-      case Qtrue:  data.set = 1; break;
-      case Qfalse: data.set = 0; break;
-      default:
-	rb_raise(rb_eTypeError, "`set' should be true/false");
+void
+rb_iseq_trace_set(const rb_iseq_t *iseq, rb_event_flag_t turnon_events)
+{
+    if (iseq->aux.exec.global_trace_events == turnon_events) {
+	return;
+    }
+
+    if (!ISEQ_EXECUTABLE_P(iseq)) {
+	/* this is building ISeq */
+	return;
+    }
+    else {
+        unsigned int pc;
+	const struct rb_iseq_constant_body *const body = iseq->body;
+	VALUE *iseq_encoded = (VALUE *)body->iseq_encoded;
+        rb_event_flag_t enabled_events;
+        rb_event_flag_t local_events = iseq->aux.exec.local_hooks ? iseq->aux.exec.local_hooks->events : 0;
+        ((rb_iseq_t *)iseq)->aux.exec.global_trace_events = turnon_events;
+        enabled_events = turnon_events | local_events;
+
+        for (pc=0; pc<body->iseq_size;) {
+            rb_event_flag_t pc_events = rb_iseq_event_flags(iseq, pc);
+            pc += encoded_iseq_trace_instrument(&iseq_encoded[pc], pc_events & enabled_events, true);
+	}
     }
+}
+
+static int
+trace_set_i(void *vstart, void *vend, size_t stride, void *data)
+{
+    rb_event_flag_t turnon_events = *(rb_event_flag_t *)data;
 
-    rb_iseqw_line_trace_each(iseqval, line_trace_specify, (void *)&data);
+    VALUE v = (VALUE)vstart;
+    for (; v != (VALUE)vend; v += stride) {
+        void *ptr = asan_poisoned_object_p(v);
+        asan_unpoison_object(v, false);
 
-    if (data.prev == 0) {
-	rb_raise(rb_eTypeError, "`pos' is out of range.");
+	if (rb_obj_is_iseq(v)) {
+	    rb_iseq_trace_set(rb_iseq_check((rb_iseq_t *)v), turnon_events);
+	}
+
+        asan_poison_object_if(ptr, v);
     }
-    return data.prev == 1 ? Qtrue : Qfalse;
+    return 0;
+}
+
+void
+rb_iseq_trace_set_all(rb_event_flag_t turnon_events)
+{
+    rb_objspace_each_objects(trace_set_i, &turnon_events);
 }
 
 VALUE
@@ -2357,9 +3407,8 @@ rb_iseqw_local_variables(VALUE iseqval)
 static VALUE
 iseqw_to_binary(int argc, VALUE *argv, VALUE self)
 {
-    VALUE opt;
-    rb_scan_args(argc, argv, "01", &opt);
-    return iseq_ibf_dump(iseqw_check(self), opt);
+    VALUE opt = !rb_check_arity(argc, 0, 1) ? Qnil : argv[0];
+    return rb_iseq_ibf_dump(iseqw_check(self), opt);
 }
 
 /*
@@ -2378,7 +3427,7 @@ iseqw_to_binary(int argc, VALUE *argv, VALUE self)
 static VALUE
 iseqw_s_load_from_binary(VALUE self, VALUE str)
 {
-    return iseqw_new(iseq_ibf_load(str));
+    return iseqw_new(rb_iseq_ibf_load(str));
 }
 
 /*
@@ -2390,19 +3439,156 @@ iseqw_s_load_from_binary(VALUE self, VALUE str)
 static VALUE
 iseqw_s_load_from_binary_extra_data(VALUE self, VALUE str)
 {
-    return  iseq_ibf_load_extra_data(str);
+    return rb_iseq_ibf_load_extra_data(str);
+}
+
+#if VM_INSN_INFO_TABLE_IMPL == 2
+
+/* An implementation of succinct bit-vector for insn_info table.
+ *
+ * A succinct bit-vector is a small and efficient data structure that provides
+ * a bit-vector augmented with an index for O(1) rank operation:
+ *
+ *   rank(bv, n): the number of 1's within a range from index 0 to index n
+ *
+ * This can be used to lookup insn_info table from PC.
+ * For example, consider the following iseq and insn_info_table:
+ *
+ *  iseq               insn_info_table
+ *  PC  insn+operand   position  lineno event
+ *   0: insn1                 0: 1      [Li]
+ *   2: insn2                 2: 2      [Li]  <= (A)
+ *   5: insn3                 8: 3      [Li]  <= (B)
+ *   8: insn4
+ *
+ * In this case, a succinct bit-vector whose indexes 0, 2, 8 is "1" and
+ * other indexes is "0", i.e., "101000001", is created.
+ * To lookup the lineno of insn2, calculate rank("10100001", 2) = 2, so
+ * the line (A) is the entry in question.
+ * To lookup the lineno of insn4, calculate rank("10100001", 8) = 3, so
+ * the line (B) is the entry in question.
+ *
+ * A naive implementation of succinct bit-vector works really well
+ * not only for large size but also for small size.  However, it has
+ * tiny overhead for very small size.  So, this implementation consist
+ * of two parts: one part is the "immediate" table that keeps rank result
+ * as a raw table, and the other part is a normal succinct bit-vector.
+ */
+
+#define IMMEDIATE_TABLE_SIZE 54 /* a multiple of 9, and < 128 */
+
+struct succ_index_table {
+    uint64_t imm_part[IMMEDIATE_TABLE_SIZE / 9];
+    struct succ_dict_block {
+	unsigned int rank;
+	uint64_t small_block_ranks; /* 9 bits * 7 = 63 bits */
+	uint64_t bits[512/64];
+    } succ_part[FLEX_ARY_LEN];
+};
+
+#define imm_block_rank_set(v, i, r) (v) |= (uint64_t)(r) << (7 * (i))
+#define imm_block_rank_get(v, i) (((int)((v) >> ((i) * 7))) & 0x7f)
+#define small_block_rank_set(v, i, r) (v) |= (uint64_t)(r) << (9 * ((i) - 1))
+#define small_block_rank_get(v, i) ((i) == 0 ? 0 : (((int)((v) >> (((i) - 1) * 9))) & 0x1ff))
+
+static struct succ_index_table *
+succ_index_table_create(int max_pos, int *data, int size)
+{
+    const int imm_size = (max_pos < IMMEDIATE_TABLE_SIZE ? max_pos + 8 : IMMEDIATE_TABLE_SIZE) / 9;
+    const int succ_size = (max_pos < IMMEDIATE_TABLE_SIZE ? 0 : (max_pos - IMMEDIATE_TABLE_SIZE + 511)) / 512;
+    struct succ_index_table *sd =
+        rb_xcalloc_mul_add_mul(
+            imm_size, sizeof(uint64_t),
+            succ_size, sizeof(struct succ_dict_block));
+    int i, j, k, r;
+
+    r = 0;
+    for (j = 0; j < imm_size; j++) {
+	for (i = 0; i < 9; i++) {
+	    if (r < size && data[r] == j * 9 + i) r++;
+	    imm_block_rank_set(sd->imm_part[j], i, r);
+	}
+    }
+    for (k = 0; k < succ_size; k++) {
+	struct succ_dict_block *sd_block = &sd->succ_part[k];
+	int small_rank = 0;
+	sd_block->rank = r;
+	for (j = 0; j < 8; j++) {
+	    uint64_t bits = 0;
+	    if (j) small_block_rank_set(sd_block->small_block_ranks, j, small_rank);
+	    for (i = 0; i < 64; i++) {
+		if (r < size && data[r] == k * 512 + j * 64 + i + IMMEDIATE_TABLE_SIZE) {
+		    bits |= ((uint64_t)1) << i;
+		    r++;
+		}
+	    }
+	    sd_block->bits[j] = bits;
+	    small_rank += rb_popcount64(bits);
+	}
+    }
+    return sd;
+}
+
+static unsigned int *
+succ_index_table_invert(int max_pos, struct succ_index_table *sd, int size)
+{
+    const int imm_size = (max_pos < IMMEDIATE_TABLE_SIZE ? max_pos + 8 : IMMEDIATE_TABLE_SIZE) / 9;
+    const int succ_size = (max_pos < IMMEDIATE_TABLE_SIZE ? 0 : (max_pos - IMMEDIATE_TABLE_SIZE + 511)) / 512;
+    unsigned int *positions = ALLOC_N(unsigned int, size), *p;
+    int i, j, k, r = -1;
+    p = positions;
+    for (j = 0; j < imm_size; j++) {
+	for (i = 0; i < 9; i++) {
+	    int nr = imm_block_rank_get(sd->imm_part[j], i);
+	    if (r != nr) *p++ = j * 9 + i;
+	    r = nr;
+	}
+    }
+    for (k = 0; k < succ_size; k++) {
+	for (j = 0; j < 8; j++) {
+	    for (i = 0; i < 64; i++) {
+		if (sd->succ_part[k].bits[j] & (((uint64_t)1) << i)) {
+		    *p++ = k * 512 + j * 64 + i + IMMEDIATE_TABLE_SIZE;
+		}
+	    }
+	}
+    }
+    return positions;
+}
+
+static int
+succ_index_lookup(const struct succ_index_table *sd, int x)
+{
+    if (x < IMMEDIATE_TABLE_SIZE) {
+	const int i = x / 9;
+	const int j = x % 9;
+	return imm_block_rank_get(sd->imm_part[i], j);
+    }
+    else {
+	const int block_index = (x - IMMEDIATE_TABLE_SIZE) / 512;
+	const struct succ_dict_block *block = &sd->succ_part[block_index];
+	const int block_bit_index = (x - IMMEDIATE_TABLE_SIZE) % 512;
+	const int small_block_index = block_bit_index / 64;
+	const int small_block_popcount = small_block_rank_get(block->small_block_ranks, small_block_index);
+	const int popcnt = rb_popcount64(block->bits[small_block_index] << (63 - block_bit_index % 64));
+
+	return block->rank + small_block_popcount + popcnt;
+    }
 }
+#endif
 
 /*
  *  Document-class: RubyVM::InstructionSequence
  *
  *  The InstructionSequence class represents a compiled sequence of
- *  instructions for the Ruby Virtual Machine.
+ *  instructions for the Virtual Machine used in MRI. Not all implementations of Ruby
+ *  may implement this class, and for the implementations that implement it,
+ *  the methods defined and behavior of the methods can change in any version.
  *
  *  With it, you can get a handle to the instructions that make up a method or
  *  a proc, compile strings of Ruby code down to VM instructions, and
  *  disassemble instruction sequences to strings for easy inspection. It is
- *  mostly useful if you want to learn how the Ruby VM works, but it also lets
+ *  mostly useful if you want to learn how YARV works, but it also lets
  *  you control various settings for the Ruby iseq compiler.
  *
  *  You can find the source for the VM instructions in +insns.def+ in the Ruby
@@ -2411,6 +3597,8 @@ iseqw_s_load_from_binary_extra_data(VALUE self, VALUE str)
  *  The instruction sequence results will almost certainly change as Ruby
  *  changes, so example output in this documentation may be different from what
  *  you see.
+ *
+ *  Of course, this class is MRI specific.
  */
 
 void
@@ -2418,6 +3606,7 @@ Init_ISeq(void)
 {
     /* declare ::RubyVM::InstructionSequence */
     rb_cISeq = rb_define_class_under(rb_cRubyVM, "InstructionSequence", rb_cObject);
+    rb_undef_alloc_func(rb_cISeq);
     rb_define_method(rb_cISeq, "inspect", iseqw_inspect, 0);
     rb_define_method(rb_cISeq, "disasm", iseqw_disasm, 0);
     rb_define_method(rb_cISeq, "disassemble", iseqw_disasm, 0);
@@ -2435,16 +3624,8 @@ Init_ISeq(void)
     rb_define_method(rb_cISeq, "label", iseqw_label, 0);
     rb_define_method(rb_cISeq, "base_label", iseqw_base_label, 0);
     rb_define_method(rb_cISeq, "first_lineno", iseqw_first_lineno, 0);
-
-#if 0
-    /* Now, it is experimental. No discussions, no tests. */
-    /* They can be used from C level. Please give us feedback. */
-    rb_define_method(rb_cISeq, "line_trace_all", rb_iseqw_line_trace_all, 0);
-    rb_define_method(rb_cISeq, "line_trace_specify", rb_iseqw_line_trace_specify, 2);
-#else
-    (void)rb_iseqw_line_trace_all;
-    (void)rb_iseqw_line_trace_specify;
-#endif
+    rb_define_method(rb_cISeq, "trace_points", iseqw_trace_points, 0);
+    rb_define_method(rb_cISeq, "each_child", iseqw_each_child, 0);
 
 #if 0 /* TBD */
     rb_define_private_method(rb_cISeq, "marshal_dump", iseqw_marshal_dump, 0);
@@ -2462,4 +3643,7 @@ Init_ISeq(void)
     rb_define_singleton_method(rb_cISeq, "disasm", iseqw_s_disasm, 1);
     rb_define_singleton_method(rb_cISeq, "disassemble", iseqw_s_disasm, 1);
     rb_define_singleton_method(rb_cISeq, "of", iseqw_s_of, 1);
+
+    rb_undef_method(CLASS_OF(rb_cISeq), "translate");
+    rb_undef_method(CLASS_OF(rb_cISeq), "load_iseq");
 }
diff --git a/iseq.h b/iseq.h
index 6a5cb8bdad..bae534c71d 100644
--- a/iseq.h
+++ b/iseq.h
@@ -1,3 +1,5 @@
+#ifndef RUBY_ISEQ_H
+#define RUBY_ISEQ_H 1
 /**********************************************************************
 
   iseq.h -
@@ -8,73 +10,135 @@
   Copyright (C) 2004-2008 Koichi Sasada
 
 **********************************************************************/
+#include "internal/gc.h"
+#include "vm_core.h"
 
-#ifndef RUBY_ISEQ_H
-#define RUBY_ISEQ_H 1
-
-#define ISEQ_MAJOR_VERSION 2
-#define ISEQ_MINOR_VERSION 3
+RUBY_EXTERN const int ruby_api_version[];
+#define ISEQ_MAJOR_VERSION ((unsigned int)ruby_api_version[0])
+#define ISEQ_MINOR_VERSION ((unsigned int)ruby_api_version[1])
 
 #ifndef rb_iseq_t
 typedef struct rb_iseq_struct rb_iseq_t;
 #define rb_iseq_t rb_iseq_t
 #endif
 
-static inline size_t
-rb_call_info_kw_arg_bytes(int keyword_len)
-{
-    return sizeof(struct rb_call_info_kw_arg) + sizeof(VALUE) * (keyword_len - 1);
-}
-
-enum iseq_mark_ary_index {
-    ISEQ_MARK_ARY_COVERAGE,
-    ISEQ_MARK_ARY_FLIP_CNT,
-    ISEQ_MARK_ARY_ORIGINAL_ISEQ,
-    ISEQ_MARK_ARY_INITIAL_SIZE
-};
-
-static inline VALUE
-iseq_mark_ary_create(int flip_cnt)
-{
-    VALUE ary = rb_ary_tmp_new(ISEQ_MARK_ARY_INITIAL_SIZE);
-    rb_ary_push(ary, Qnil);              /* ISEQ_MARK_ARY_COVERAGE */
-    rb_ary_push(ary, INT2FIX(flip_cnt)); /* ISEQ_MARK_ARY_FLIP_CNT */
-    rb_ary_push(ary, Qnil);              /* ISEQ_MARK_ARY_ORIGINAL_ISEQ */
-    return ary;
-}
+extern const ID rb_iseq_shared_exc_local_tbl[];
 
-#define ISEQ_MARK_ARY(iseq)           (iseq)->body->mark_ary
+#define ISEQ_COVERAGE(iseq)           iseq->body->variable.coverage
+#define ISEQ_COVERAGE_SET(iseq, cov)  RB_OBJ_WRITE(iseq, &iseq->body->variable.coverage, cov)
+#define ISEQ_LINE_COVERAGE(iseq)      RARRAY_AREF(ISEQ_COVERAGE(iseq), COVERAGE_INDEX_LINES)
+#define ISEQ_BRANCH_COVERAGE(iseq)    RARRAY_AREF(ISEQ_COVERAGE(iseq), COVERAGE_INDEX_BRANCHES)
 
-#define ISEQ_COVERAGE(iseq)           RARRAY_AREF(ISEQ_MARK_ARY(iseq), ISEQ_MARK_ARY_COVERAGE)
-#define ISEQ_COVERAGE_SET(iseq, cov)  RARRAY_ASET(ISEQ_MARK_ARY(iseq), ISEQ_MARK_ARY_COVERAGE, cov)
+#define ISEQ_PC2BRANCHINDEX(iseq)         iseq->body->variable.pc2branchindex
+#define ISEQ_PC2BRANCHINDEX_SET(iseq, h)  RB_OBJ_WRITE(iseq, &iseq->body->variable.pc2branchindex, h)
 
-#define ISEQ_FLIP_CNT(iseq) FIX2INT(RARRAY_AREF(ISEQ_MARK_ARY(iseq), ISEQ_MARK_ARY_FLIP_CNT))
+#define ISEQ_FLIP_CNT(iseq) (iseq)->body->variable.flip_count
 
-static inline int
+static inline rb_snum_t
 ISEQ_FLIP_CNT_INCREMENT(const rb_iseq_t *iseq)
 {
-    int cnt = ISEQ_FLIP_CNT(iseq);
-    RARRAY_ASET(ISEQ_MARK_ARY(iseq), ISEQ_MARK_ARY_FLIP_CNT, INT2FIX(cnt+1));
+    rb_snum_t cnt = iseq->body->variable.flip_count;
+    iseq->body->variable.flip_count += 1;
     return cnt;
 }
 
 static inline VALUE *
 ISEQ_ORIGINAL_ISEQ(const rb_iseq_t *iseq)
 {
-    VALUE str = RARRAY_AREF(ISEQ_MARK_ARY(iseq), ISEQ_MARK_ARY_ORIGINAL_ISEQ);
-    if (RTEST(str)) return (VALUE *)RSTRING_PTR(str);
-    return NULL;
+    return iseq->body->variable.original_iseq;
+}
+
+static inline void
+ISEQ_ORIGINAL_ISEQ_CLEAR(const rb_iseq_t *iseq)
+{
+    void *ptr = iseq->body->variable.original_iseq;
+    iseq->body->variable.original_iseq = NULL;
+    if (ptr) {
+        ruby_xfree(ptr);
+    }
 }
 
 static inline VALUE *
 ISEQ_ORIGINAL_ISEQ_ALLOC(const rb_iseq_t *iseq, long size)
 {
-    VALUE str = rb_str_tmp_new(size * sizeof(VALUE));
-    RARRAY_ASET(ISEQ_MARK_ARY(iseq), ISEQ_MARK_ARY_ORIGINAL_ISEQ, str);
-    return (VALUE *)RSTRING_PTR(str);
+    return iseq->body->variable.original_iseq =
+        ALLOC_N(VALUE, size);
 }
 
-#define ISEQ_COMPILE_DATA(iseq)       (iseq)->aux.compile_data
+#define ISEQ_TRACE_EVENTS (RUBY_EVENT_LINE  | \
+			   RUBY_EVENT_CLASS | \
+			   RUBY_EVENT_END   | \
+			   RUBY_EVENT_CALL  | \
+			   RUBY_EVENT_RETURN| \
+			   RUBY_EVENT_B_CALL| \
+			   RUBY_EVENT_B_RETURN| \
+                           RUBY_EVENT_COVERAGE_LINE| \
+                           RUBY_EVENT_COVERAGE_BRANCH)
+
+#define ISEQ_NOT_LOADED_YET   IMEMO_FL_USER1
+#define ISEQ_USE_COMPILE_DATA IMEMO_FL_USER2
+#define ISEQ_TRANSLATED       IMEMO_FL_USER3
+#define ISEQ_MARKABLE_ISEQ    IMEMO_FL_USER4
+
+#define ISEQ_EXECUTABLE_P(iseq) (FL_TEST_RAW(((VALUE)iseq), ISEQ_NOT_LOADED_YET | ISEQ_USE_COMPILE_DATA) == 0)
+
+struct iseq_compile_data {
+    /* GC is needed */
+    const VALUE err_info;
+    const VALUE catch_table_ary;	/* Array */
+
+    /* GC is not needed */
+    struct iseq_label_data *start_label;
+    struct iseq_label_data *end_label;
+    struct iseq_label_data *redo_label;
+    const rb_iseq_t *current_block;
+    struct iseq_compile_data_ensure_node_stack *ensure_node_stack;
+    struct {
+      struct iseq_compile_data_storage *storage_head;
+      struct iseq_compile_data_storage *storage_current;
+    } node;
+    struct {
+      struct iseq_compile_data_storage *storage_head;
+      struct iseq_compile_data_storage *storage_current;
+    } insn;
+    int loopval_popped;	/* used by NODE_BREAK */
+    int last_line;
+    int label_no;
+    int node_level;
+    int isolated_depth;
+    unsigned int ci_index;
+    const rb_compile_option_t *option;
+    struct rb_id_table *ivar_cache_table;
+    const struct rb_builtin_function *builtin_function_table;
+#if OPT_SUPPORT_JOKE
+    st_table *labels_table;
+#endif
+};
+
+static inline struct iseq_compile_data *
+ISEQ_COMPILE_DATA(const rb_iseq_t *iseq)
+{
+    if (iseq->flags & ISEQ_USE_COMPILE_DATA) {
+	return iseq->aux.compile_data;
+    }
+    else {
+	return NULL;
+    }
+}
+
+static inline void
+ISEQ_COMPILE_DATA_ALLOC(rb_iseq_t *iseq)
+{
+    iseq->aux.compile_data = ZALLOC(struct iseq_compile_data);
+    iseq->flags |= ISEQ_USE_COMPILE_DATA;
+}
+
+static inline void
+ISEQ_COMPILE_DATA_CLEAR(rb_iseq_t *iseq)
+{
+    iseq->flags &= ~ISEQ_USE_COMPILE_DATA;
+    iseq->aux.compile_data = NULL;
+}
 
 static inline rb_iseq_t *
 iseq_imemo_alloc(void)
@@ -82,42 +146,51 @@ iseq_imemo_alloc(void)
     return (rb_iseq_t *)rb_imemo_new(imemo_iseq, 0, 0, 0, 0);
 }
 
-#define ISEQ_NOT_LOADED_YET   IMEMO_FL_USER1
-
-VALUE iseq_ibf_dump(const rb_iseq_t *iseq, VALUE opt);
-void ibf_load_iseq_complete(rb_iseq_t *iseq);
-const rb_iseq_t *iseq_ibf_load(VALUE str);
-VALUE iseq_ibf_load_extra_data(VALUE str);
+VALUE rb_iseq_ibf_dump(const rb_iseq_t *iseq, VALUE opt);
+void rb_ibf_load_iseq_complete(rb_iseq_t *iseq);
+const rb_iseq_t *rb_iseq_ibf_load(VALUE str);
+const rb_iseq_t *rb_iseq_ibf_load_bytes(const char *cstr, size_t);
+VALUE rb_iseq_ibf_load_extra_data(VALUE str);
+void rb_iseq_init_trace(rb_iseq_t *iseq);
+int rb_iseq_add_local_tracepoint_recursively(const rb_iseq_t *iseq, rb_event_flag_t turnon_events, VALUE tpval, unsigned int target_line);
+int rb_iseq_remove_local_tracepoint_recursively(const rb_iseq_t *iseq, VALUE tpval);
+const rb_iseq_t *rb_iseq_load_iseq(VALUE fname);
+
+#if VM_INSN_INFO_TABLE_IMPL == 2
+unsigned int *rb_iseq_insns_info_decode_positions(const struct rb_iseq_constant_body *body);
+#endif
 
 RUBY_SYMBOL_EXPORT_BEGIN
 
 /* compile.c */
-VALUE rb_iseq_compile_node(rb_iseq_t *iseq, NODE *node);
-int rb_iseq_translate_threaded_code(rb_iseq_t *iseq);
+VALUE rb_iseq_compile_node(rb_iseq_t *iseq, const NODE *node);
+VALUE rb_iseq_compile_callback(rb_iseq_t *iseq, const struct rb_iseq_new_with_callback_callback_func * ifunc);
 VALUE *rb_iseq_original_iseq(const rb_iseq_t *iseq);
 void rb_iseq_build_from_ary(rb_iseq_t *iseq, VALUE misc,
 			    VALUE locals, VALUE args,
 			    VALUE exception, VALUE body);
+void rb_iseq_mark_insn_storage(struct iseq_compile_data_storage *arena);
 
 /* iseq.c */
-void rb_iseq_add_mark_object(const rb_iseq_t *iseq, VALUE obj);
 VALUE rb_iseq_load(VALUE data, VALUE parent, VALUE opt);
 VALUE rb_iseq_parameters(const rb_iseq_t *iseq, int is_proc);
-struct st_table *ruby_insn_make_insn_table(void);
 unsigned int rb_iseq_line_no(const rb_iseq_t *iseq, size_t pos);
+void rb_iseq_trace_set(const rb_iseq_t *iseq, rb_event_flag_t turnon_events);
+void rb_iseq_trace_set_all(rb_event_flag_t turnon_events);
+void rb_iseq_insns_info_encode_positions(const rb_iseq_t *iseq);
 
-int rb_iseqw_line_trace_each(VALUE iseqval, int (*func)(int line, rb_event_flag_t *events_ptr, void *d), void *data);
-VALUE rb_iseqw_line_trace_all(VALUE iseqval);
-VALUE rb_iseqw_line_trace_specify(VALUE iseqval, VALUE pos, VALUE set);
+struct rb_iseq_constant_body *rb_iseq_constant_body_alloc(void);
 VALUE rb_iseqw_new(const rb_iseq_t *iseq);
 const rb_iseq_t *rb_iseqw_to_iseq(VALUE iseqw);
 
-VALUE rb_iseq_path(const rb_iseq_t *iseq);
-VALUE rb_iseq_absolute_path(const rb_iseq_t *iseq);
+VALUE rb_iseq_absolute_path(const rb_iseq_t *iseq); /* obsolete */
 VALUE rb_iseq_label(const rb_iseq_t *iseq);
 VALUE rb_iseq_base_label(const rb_iseq_t *iseq);
 VALUE rb_iseq_first_lineno(const rb_iseq_t *iseq);
 VALUE rb_iseq_method_name(const rb_iseq_t *iseq);
+void rb_iseq_code_location(const rb_iseq_t *iseq, int *first_lineno, int *first_column, int *last_lineno, int *last_column);
+
+void rb_iseq_remove_coverage_all(void);
 
 /* proc.c */
 const rb_iseq_t *rb_method_iseq(VALUE body);
@@ -131,16 +204,15 @@ struct rb_compile_option_struct {
     unsigned int operands_unification: 1;
     unsigned int instructions_unification: 1;
     unsigned int stack_caching: 1;
-    unsigned int trace_instruction: 1;
     unsigned int frozen_string_literal: 1;
     unsigned int debug_frozen_string_literal: 1;
     unsigned int coverage_enabled: 1;
     int debug_level;
 };
 
-struct iseq_line_info_entry {
-    unsigned int position;
-    unsigned int line_no;
+struct iseq_insn_info_entry {
+    int line_no;
+    rb_event_flag_t events;
 };
 
 struct iseq_catch_table_entry {
@@ -152,7 +224,21 @@ struct iseq_catch_table_entry {
 	CATCH_TYPE_REDO   = INT2FIX(5),
 	CATCH_TYPE_NEXT   = INT2FIX(6)
     } type;
-    const rb_iseq_t *iseq;
+
+    /*
+     * iseq type:
+     *   CATCH_TYPE_RESCUE, CATCH_TYPE_ENSURE:
+     *     use iseq as continuation.
+     *
+     *   CATCH_TYPE_BREAK (iter):
+     *     use iseq as key.
+     *
+     *   CATCH_TYPE_BREAK (while), CATCH_TYPE_RETRY,
+     *   CATCH_TYPE_REDO, CATCH_TYPE_NEXT:
+     *     NULL.
+     */
+    rb_iseq_t *iseq;
+
     unsigned int start;
     unsigned int end;
     unsigned int cont;
@@ -161,18 +247,19 @@ struct iseq_catch_table_entry {
 
 PACKED_STRUCT_UNALIGNED(struct iseq_catch_table {
     unsigned int size;
-    struct iseq_catch_table_entry entries[1]; /* flexible array */
+    struct iseq_catch_table_entry entries[FLEX_ARY_LEN];
 });
 
 static inline int
 iseq_catch_table_bytes(int n)
 {
     enum {
-	catch_table_entries_max = (INT_MAX - sizeof(struct iseq_catch_table)) / sizeof(struct iseq_catch_table_entry)
+	catch_table_entry_size = sizeof(struct iseq_catch_table_entry),
+	catch_table_entries_max = (INT_MAX - offsetof(struct iseq_catch_table, entries)) / catch_table_entry_size
     };
     if (n > catch_table_entries_max) rb_fatal("too large iseq_catch_table - %d", n);
-    return (int)(sizeof(struct iseq_catch_table) +
-		 (n - 1) * sizeof(struct iseq_catch_table_entry));
+    return (int)(offsetof(struct iseq_catch_table, entries) +
+		 n * catch_table_entry_size);
 }
 
 #define INITIAL_ISEQ_COMPILE_DATA_STORAGE_BUFF_SIZE (512)
@@ -181,47 +268,13 @@ struct iseq_compile_data_storage {
     struct iseq_compile_data_storage *next;
     unsigned int pos;
     unsigned int size;
-    char buff[1]; /* flexible array */
-};
-
-/* account for flexible array */
-#define SIZEOF_ISEQ_COMPILE_DATA_STORAGE \
-    (sizeof(struct iseq_compile_data_storage) - 1)
-
-struct iseq_compile_data {
-    /* GC is needed */
-    const VALUE err_info;
-    VALUE mark_ary;
-    const VALUE catch_table_ary;	/* Array */
-
-    /* GC is not needed */
-    struct iseq_label_data *start_label;
-    struct iseq_label_data *end_label;
-    struct iseq_label_data *redo_label;
-    const rb_iseq_t *current_block;
-    VALUE ensure_node;
-    VALUE for_iseq;
-    struct iseq_compile_data_ensure_node_stack *ensure_node_stack;
-    int loopval_popped;	/* used by NODE_BREAK */
-    int cached_const;
-    struct iseq_compile_data_storage *storage_head;
-    struct iseq_compile_data_storage *storage_current;
-    int last_line;
-    int last_coverable_line;
-    int label_no;
-    int node_level;
-    unsigned int ci_index;
-    unsigned int ci_kw_index;
-    const rb_compile_option_t *option;
-    struct rb_id_table *ivar_cache_table;
-#if SUPPORT_JOKE
-    st_table *labels_table;
-#endif
+    char buff[FLEX_ARY_LEN];
 };
 
 /* defined? */
 
 enum defined_type {
+    DEFINED_NOT_DEFINED,
     DEFINED_NIL = 1,
     DEFINED_IVAR,
     DEFINED_LVAR,
@@ -238,11 +291,11 @@ enum defined_type {
     DEFINED_EXPR,
     DEFINED_IVAR2,
     DEFINED_REF,
-    DEFINED_FUNC
+    DEFINED_FUNC,
+    DEFINED_CONST_FROM
 };
 
 VALUE rb_iseq_defined_string(enum defined_type type);
-void rb_iseq_make_compile_option(struct rb_compile_option_struct *option, VALUE opt);
 
 /* vm.c */
 VALUE rb_iseq_local_variables(const rb_iseq_t *iseq);
diff --git a/kernel.rb b/kernel.rb
new file mode 100644
index 0000000000..04a371a7c8
--- /dev/null
+++ b/kernel.rb
@@ -0,0 +1,174 @@
+module Kernel
+  #
+  #  call-seq:
+  #     obj.class    -> class
+  #
+  #  Returns the class of <i>obj</i>. This method must always be called
+  #  with an explicit receiver, as #class is also a reserved word in
+  #  Ruby.
+  #
+  #     1.class      #=> Integer
+  #     self.class   #=> Object
+  #--
+  # Equivalent to \c Object\#class in Ruby.
+  #
+  # Returns the class of \c obj, skipping singleton classes or module inclusions.
+  #++
+  #
+  def class
+    Primitive.attr! 'inline'
+    Primitive.cexpr! 'rb_obj_class(self)'
+  end
+
+  #
+  #  call-seq:
+  #     obj.clone(freeze: nil) -> an_object
+  #
+  #  Produces a shallow copy of <i>obj</i>---the instance variables of
+  #  <i>obj</i> are copied, but not the objects they reference.
+  #  #clone copies the frozen value state of <i>obj</i>, unless the
+  #  +:freeze+ keyword argument is given with a false or true value.
+  #  See also the discussion under Object#dup.
+  #
+  #     class Klass
+  #        attr_accessor :str
+  #     end
+  #     s1 = Klass.new      #=> #<Klass:0x401b3a38>
+  #     s1.str = "Hello"    #=> "Hello"
+  #     s2 = s1.clone       #=> #<Klass:0x401b3998 @str="Hello">
+  #     s2.str[1,4] = "i"   #=> "i"
+  #     s1.inspect          #=> "#<Klass:0x401b3a38 @str=\"Hi\">"
+  #     s2.inspect          #=> "#<Klass:0x401b3998 @str=\"Hi\">"
+  #
+  #  This method may have class-specific behavior.  If so, that
+  #  behavior will be documented under the #+initialize_copy+ method of
+  #  the class.
+  #
+  def clone(freeze: nil)
+    Primitive.rb_obj_clone2(freeze)
+  end
+
+  #
+  #  call-seq:
+  #     obj.frozen?    -> true or false
+  #
+  #  Returns the freeze status of <i>obj</i>.
+  #
+  #     a = [ "a", "b", "c" ]
+  #     a.freeze    #=> ["a", "b", "c"]
+  #     a.frozen?   #=> true
+  #--
+  # Determines if the object is frozen. Equivalent to \c Object\#frozen? in Ruby.
+  # \param[in] obj  the object to be determines
+  # \retval Qtrue if frozen
+  # \retval Qfalse if not frozen
+  #++
+  #
+  def frozen?
+    Primitive.attr! 'inline'
+    Primitive.cexpr! 'rb_obj_frozen_p(self)'
+  end
+
+  #
+  #  call-seq:
+  #     obj.tap {|x| block }    -> obj
+  #
+  #  Yields self to the block, and then returns self.
+  #  The primary purpose of this method is to "tap into" a method chain,
+  #  in order to perform operations on intermediate results within the chain.
+  #
+  #     (1..10)                  .tap {|x| puts "original: #{x}" }
+  #       .to_a                  .tap {|x| puts "array:    #{x}" }
+  #       .select {|x| x.even? } .tap {|x| puts "evens:    #{x}" }
+  #       .map {|x| x*x }        .tap {|x| puts "squares:  #{x}" }
+  #
+  #--
+  # \private
+  #++
+  #
+  def tap
+    yield(self)
+    self
+  end
+
+  #
+  #  call-seq:
+  #     obj.then {|x| block }          -> an_object
+  #
+  #  Yields self to the block and returns the result of the block.
+  #
+  #     3.next.then {|x| x**x }.to_s             #=> "256"
+  #
+  #  Good usage for +then+ is value piping in method chains:
+  #
+  #     require 'open-uri'
+  #     require 'json'
+  #
+  #     construct_url(arguments).
+  #       then {|url| open(url).read }.
+  #       then {|response| JSON.parse(response) }
+  #
+  #  When called without block, the method returns +Enumerator+,
+  #  which can be used, for example, for conditional
+  #  circuit-breaking:
+  #
+  #     # meets condition, no-op
+  #     1.then.detect(&:odd?)            # => 1
+  #     # does not meet condition, drop value
+  #     2.then.detect(&:odd?)            # => nil
+  #
+  def then
+    unless Primitive.block_given_p
+      return Primitive.cexpr! 'SIZED_ENUMERATOR(self, 0, 0, rb_obj_size)'
+    end
+    yield(self)
+  end
+
+  #
+  #  call-seq:
+  #     obj.yield_self {|x| block }    -> an_object
+  #
+  #  Yields self to the block and returns the result of the block.
+  #
+  #     "my string".yield_self {|s| s.upcase }   #=> "MY STRING"
+  #
+  #  Good usage for +then+ is value piping in method chains:
+  #
+  #     require 'open-uri'
+  #     require 'json'
+  #
+  #     construct_url(arguments).
+  #       then {|url| open(url).read }.
+  #       then {|response| JSON.parse(response) }
+  #
+  def yield_self
+    unless Primitive.block_given_p
+      return Primitive.cexpr! 'SIZED_ENUMERATOR(self, 0, 0, rb_obj_size)'
+    end
+    yield(self)
+  end
+
+  module_function
+
+  #
+  #  call-seq:
+  #     Float(arg, exception: true)    -> float or nil
+  #
+  #  Returns <i>arg</i> converted to a float. Numeric types are
+  #  converted directly, and with exception to String and
+  #  <code>nil</code> the rest are converted using
+  #  <i>arg</i><code>.to_f</code>.  Converting a String with invalid
+  #  characters will result in a ArgumentError.  Converting
+  #  <code>nil</code> generates a TypeError.  Exceptions can be
+  #  suppressed by passing <code>exception: false</code>.
+  #
+  #     Float(1)                 #=> 1.0
+  #     Float("123.456")         #=> 123.456
+  #     Float("123.0_badstring") #=> ArgumentError: invalid value for Float(): "123.0_badstring"
+  #     Float(nil)               #=> TypeError: can't convert nil into Float
+  #     Float("123.0_badstring", exception: false)  #=> nil
+  #
+  def Float(arg, exception: true)
+    Primitive.rb_f_float(arg, exception)
+  end
+end
diff --git a/lex.c.blt b/lex.c.blt
index 7d8dd5b6e7..92a4793b00 100644
--- a/lex.c.blt
+++ b/lex.c.blt
@@ -1,4 +1,4 @@
-/* C code produced by gperf version 3.0.4 */
+/* ANSI-C code produced by gperf version 3.1 */
 /* Command-line: gperf -C -P -p -j1 -i 1 -g -o -t -N rb_reserved_word -k'1,3,$' defs/keywords  */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
@@ -25,15 +25,16 @@
       && ('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>."
+#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gperf@gnu.org>."
 #endif
 
+#define gperf_offsetof(s, n) (short)offsetof(struct s##_t, s##_str##n)
 #line 1 "defs/keywords"
 
-struct kwtable {int name, id[2], state;};
+struct kwtable {short name, id[2], state;};
 const struct kwtable *rb_reserved_word(const char *, unsigned int);
 #ifndef RIPPER
-static const struct kwtable *reserved_word(const char *, unsigned int);
+static const struct kwtable *reserved_word(/*const char *, unsigned int*/);
 #define rb_reserved_word(str, len) reserved_word(str, len)
 #line 9 "defs/keywords"
 struct kwtable;
@@ -45,15 +46,15 @@ struct kwtable;
 #define MAX_HASH_VALUE 50
 /* maximum key range = 43, duplicates = 0 */
 
-#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__cplusplus) || defined(__GNUC_STDC_INLINE__)
-inline
-#elif defined(__GNUC__)
+#ifdef __GNUC__
 __inline
+#else
+#ifdef __cplusplus
+inline
+#endif
 #endif
 static unsigned int
-hash (str, len)
-     register const char *str;
-     register unsigned int len;
+hash (register const char *str, register size_t len)
 {
   static const unsigned char asso_values[] =
     {
@@ -84,7 +85,7 @@ hash (str, len)
       51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
       51, 51, 51, 51, 51, 51
     };
-  register int hval = len;
+  register unsigned int hval = (unsigned int)len;
 
   switch (hval)
     {
@@ -96,7 +97,7 @@ hash (str, len)
         hval += asso_values[(unsigned char)str[0]];
         break;
     }
-  return hval + asso_values[(unsigned char)str[len - 1]];
+  return (unsigned int)hval + asso_values[(unsigned char)str[len - 1]];
 }
 
 struct stringpool_t
@@ -188,110 +189,102 @@ static const struct stringpool_t stringpool_contents =
     "while"
   };
 #define stringpool ((const char *) &stringpool_contents)
-#ifdef __GNUC__
-__inline
-#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
-__attribute__ ((__gnu_inline__))
-#endif
-#endif
 const struct kwtable *
-rb_reserved_word (str, len)
-     register const char *str;
-     register unsigned int len;
+rb_reserved_word (register const char *str, register size_t len)
 {
   static const struct kwtable wordlist[] =
     {
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
 #line 19 "defs/keywords"
-      {(int)offsetof(struct stringpool_t, stringpool_str8), {keyword_break, keyword_break}, EXPR_MID},
+      {gperf_offsetof(stringpool, 8), {keyword_break, keyword_break}, EXPR_MID},
 #line 25 "defs/keywords"
-      {(int)offsetof(struct stringpool_t, stringpool_str9), {keyword_else, keyword_else}, EXPR_BEG},
+      {gperf_offsetof(stringpool, 9), {keyword_else, keyword_else}, EXPR_BEG},
 #line 35 "defs/keywords"
-      {(int)offsetof(struct stringpool_t, stringpool_str10), {keyword_nil, keyword_nil}, EXPR_END},
+      {gperf_offsetof(stringpool, 10), {keyword_nil, keyword_nil}, EXPR_END},
 #line 28 "defs/keywords"
-      {(int)offsetof(struct stringpool_t, stringpool_str11), {keyword_ensure, keyword_ensure}, EXPR_BEG},
+      {gperf_offsetof(stringpool, 11), {keyword_ensure, keyword_ensure}, EXPR_BEG},
 #line 27 "defs/keywords"
-      {(int)offsetof(struct stringpool_t, stringpool_str12), {keyword_end, keyword_end}, EXPR_END},
+      {gperf_offsetof(stringpool, 12), {keyword_end, keyword_end}, EXPR_END},
 #line 44 "defs/keywords"
-      {(int)offsetof(struct stringpool_t, stringpool_str13), {keyword_then, keyword_then}, EXPR_BEG},
+      {gperf_offsetof(stringpool, 13), {keyword_then, keyword_then}, EXPR_BEG},
 #line 36 "defs/keywords"
-      {(int)offsetof(struct stringpool_t, stringpool_str14), {keyword_not, keyword_not}, EXPR_ARG},
+      {gperf_offsetof(stringpool, 14), {keyword_not, keyword_not}, EXPR_ARG},
 #line 29 "defs/keywords"
-      {(int)offsetof(struct stringpool_t, stringpool_str15), {keyword_false, keyword_false}, EXPR_END},
+      {gperf_offsetof(stringpool, 15), {keyword_false, keyword_false}, EXPR_END},
 #line 42 "defs/keywords"
-      {(int)offsetof(struct stringpool_t, stringpool_str16), {keyword_self, keyword_self}, EXPR_END},
+      {gperf_offsetof(stringpool, 16), {keyword_self, keyword_self}, EXPR_END},
 #line 26 "defs/keywords"
-      {(int)offsetof(struct stringpool_t, stringpool_str17), {keyword_elsif, keyword_elsif}, EXPR_VALUE},
+      {gperf_offsetof(stringpool, 17), {keyword_elsif, keyword_elsif}, EXPR_VALUE},
 #line 39 "defs/keywords"
-      {(int)offsetof(struct stringpool_t, stringpool_str18), {keyword_rescue, modifier_rescue}, EXPR_MID},
+      {gperf_offsetof(stringpool, 18), {keyword_rescue, modifier_rescue}, EXPR_MID},
 #line 45 "defs/keywords"
-      {(int)offsetof(struct stringpool_t, stringpool_str19), {keyword_true, keyword_true}, EXPR_END},
+      {gperf_offsetof(stringpool, 19), {keyword_true, keyword_true}, EXPR_END},
 #line 48 "defs/keywords"
-      {(int)offsetof(struct stringpool_t, stringpool_str20), {keyword_until, modifier_until}, EXPR_VALUE},
+      {gperf_offsetof(stringpool, 20), {keyword_until, modifier_until}, EXPR_VALUE},
 #line 47 "defs/keywords"
-      {(int)offsetof(struct stringpool_t, stringpool_str21), {keyword_unless, modifier_unless}, EXPR_VALUE},
+      {gperf_offsetof(stringpool, 21), {keyword_unless, modifier_unless}, EXPR_VALUE},
 #line 41 "defs/keywords"
-      {(int)offsetof(struct stringpool_t, stringpool_str22), {keyword_return, keyword_return}, EXPR_MID},
+      {gperf_offsetof(stringpool, 22), {keyword_return, keyword_return}, EXPR_MID},
 #line 22 "defs/keywords"
-      {(int)offsetof(struct stringpool_t, stringpool_str23), {keyword_def, keyword_def}, EXPR_FNAME},
+      {gperf_offsetof(stringpool, 23), {keyword_def, keyword_def}, EXPR_FNAME},
 #line 17 "defs/keywords"
-      {(int)offsetof(struct stringpool_t, stringpool_str24), {keyword_and, keyword_and}, EXPR_VALUE},
+      {gperf_offsetof(stringpool, 24), {keyword_and, keyword_and}, EXPR_VALUE},
 #line 24 "defs/keywords"
-      {(int)offsetof(struct stringpool_t, stringpool_str25), {keyword_do, keyword_do}, EXPR_BEG},
+      {gperf_offsetof(stringpool, 25), {keyword_do, keyword_do}, EXPR_BEG},
 #line 51 "defs/keywords"
-      {(int)offsetof(struct stringpool_t, stringpool_str26), {keyword_yield, keyword_yield}, EXPR_ARG},
+      {gperf_offsetof(stringpool, 26), {keyword_yield, keyword_yield}, EXPR_ARG},
 #line 30 "defs/keywords"
-      {(int)offsetof(struct stringpool_t, stringpool_str27), {keyword_for, keyword_for}, EXPR_VALUE},
+      {gperf_offsetof(stringpool, 27), {keyword_for, keyword_for}, EXPR_VALUE},
 #line 46 "defs/keywords"
-      {(int)offsetof(struct stringpool_t, stringpool_str28), {keyword_undef, keyword_undef}, EXPR_FNAME|EXPR_FITEM},
+      {gperf_offsetof(stringpool, 28), {keyword_undef, keyword_undef}, EXPR_FNAME|EXPR_FITEM},
 #line 37 "defs/keywords"
-      {(int)offsetof(struct stringpool_t, stringpool_str29), {keyword_or, keyword_or}, EXPR_VALUE},
+      {gperf_offsetof(stringpool, 29), {keyword_or, keyword_or}, EXPR_VALUE},
 #line 32 "defs/keywords"
-      {(int)offsetof(struct stringpool_t, stringpool_str30), {keyword_in, keyword_in}, EXPR_VALUE},
+      {gperf_offsetof(stringpool, 30), {keyword_in, keyword_in}, EXPR_VALUE},
 #line 49 "defs/keywords"
-      {(int)offsetof(struct stringpool_t, stringpool_str31), {keyword_when, keyword_when}, EXPR_VALUE},
+      {gperf_offsetof(stringpool, 31), {keyword_when, keyword_when}, EXPR_VALUE},
 #line 40 "defs/keywords"
-      {(int)offsetof(struct stringpool_t, stringpool_str32), {keyword_retry, keyword_retry}, EXPR_END},
+      {gperf_offsetof(stringpool, 32), {keyword_retry, keyword_retry}, EXPR_END},
 #line 31 "defs/keywords"
-      {(int)offsetof(struct stringpool_t, stringpool_str33), {keyword_if, modifier_if}, EXPR_VALUE},
+      {gperf_offsetof(stringpool, 33), {keyword_if, modifier_if}, EXPR_VALUE},
 #line 20 "defs/keywords"
-      {(int)offsetof(struct stringpool_t, stringpool_str34), {keyword_case, keyword_case}, EXPR_VALUE},
+      {gperf_offsetof(stringpool, 34), {keyword_case, keyword_case}, EXPR_VALUE},
 #line 38 "defs/keywords"
-      {(int)offsetof(struct stringpool_t, stringpool_str35), {keyword_redo, keyword_redo}, EXPR_END},
+      {gperf_offsetof(stringpool, 35), {keyword_redo, keyword_redo}, EXPR_END},
 #line 34 "defs/keywords"
-      {(int)offsetof(struct stringpool_t, stringpool_str36), {keyword_next, keyword_next}, EXPR_MID},
+      {gperf_offsetof(stringpool, 36), {keyword_next, keyword_next}, EXPR_MID},
 #line 43 "defs/keywords"
-      {(int)offsetof(struct stringpool_t, stringpool_str37), {keyword_super, keyword_super}, EXPR_ARG},
+      {gperf_offsetof(stringpool, 37), {keyword_super, keyword_super}, EXPR_ARG},
 #line 33 "defs/keywords"
-      {(int)offsetof(struct stringpool_t, stringpool_str38), {keyword_module, keyword_module}, EXPR_VALUE},
+      {gperf_offsetof(stringpool, 38), {keyword_module, keyword_module}, EXPR_VALUE},
 #line 18 "defs/keywords"
-      {(int)offsetof(struct stringpool_t, stringpool_str39), {keyword_begin, keyword_begin}, EXPR_BEG},
+      {gperf_offsetof(stringpool, 39), {keyword_begin, keyword_begin}, EXPR_BEG},
 #line 12 "defs/keywords"
-      {(int)offsetof(struct stringpool_t, stringpool_str40), {keyword__LINE__, keyword__LINE__}, EXPR_END},
+      {gperf_offsetof(stringpool, 40), {keyword__LINE__, keyword__LINE__}, EXPR_END},
 #line 13 "defs/keywords"
-      {(int)offsetof(struct stringpool_t, stringpool_str41), {keyword__FILE__, keyword__FILE__}, EXPR_END},
+      {gperf_offsetof(stringpool, 41), {keyword__FILE__, keyword__FILE__}, EXPR_END},
 #line 11 "defs/keywords"
-      {(int)offsetof(struct stringpool_t, stringpool_str42), {keyword__ENCODING__, keyword__ENCODING__}, EXPR_END},
+      {gperf_offsetof(stringpool, 42), {keyword__ENCODING__, keyword__ENCODING__}, EXPR_END},
 #line 15 "defs/keywords"
-      {(int)offsetof(struct stringpool_t, stringpool_str43), {keyword_END, keyword_END}, EXPR_END},
+      {gperf_offsetof(stringpool, 43), {keyword_END, keyword_END}, EXPR_END},
 #line 16 "defs/keywords"
-      {(int)offsetof(struct stringpool_t, stringpool_str44), {keyword_alias, keyword_alias}, EXPR_FNAME|EXPR_FITEM},
+      {gperf_offsetof(stringpool, 44), {keyword_alias, keyword_alias}, EXPR_FNAME|EXPR_FITEM},
 #line 14 "defs/keywords"
-      {(int)offsetof(struct stringpool_t, stringpool_str45), {keyword_BEGIN, keyword_BEGIN}, EXPR_END},
+      {gperf_offsetof(stringpool, 45), {keyword_BEGIN, keyword_BEGIN}, EXPR_END},
 #line 23 "defs/keywords"
-      {(int)offsetof(struct stringpool_t, stringpool_str46), {keyword_defined, keyword_defined}, EXPR_ARG},
+      {gperf_offsetof(stringpool, 46), {keyword_defined, keyword_defined}, EXPR_ARG},
 #line 21 "defs/keywords"
-      {(int)offsetof(struct stringpool_t, stringpool_str47), {keyword_class, keyword_class}, EXPR_CLASS},
+      {gperf_offsetof(stringpool, 47), {keyword_class, keyword_class}, EXPR_CLASS},
       {-1}, {-1},
 #line 50 "defs/keywords"
-      {(int)offsetof(struct stringpool_t, stringpool_str50), {keyword_while, modifier_while}, EXPR_VALUE}
+      {gperf_offsetof(stringpool, 50), {keyword_while, modifier_while}, EXPR_VALUE}
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
     {
-      register int key = hash (str, len);
+      register unsigned int key = hash (str, len);
 
-      if (key <= MAX_HASH_VALUE && key >= 0)
+      if (key <= MAX_HASH_VALUE)
         {
           register int o = wordlist[key].name;
           if (o >= 0)
diff --git a/lib/.document b/lib/.document
new file mode 100644
index 0000000000..0d612d1077
--- /dev/null
+++ b/lib/.document
@@ -0,0 +1,26 @@
+# Add files to this as they become documented
+
+*.rb
+
+# bundler # not in RDoc
+cgi
+csv
+drb
+forwardable
+irb
+matrix
+net
+optparse
+racc/*.rb
+racc/rdoc
+rdoc
+rexml
+rinda
+rss
+rubygems
+scanf.rb
+shell
+unicode_normalize
+uri
+webrick
+yaml
diff --git a/lib/English.gemspec b/lib/English.gemspec
new file mode 100644
index 0000000000..ad6eb7aced
--- /dev/null
+++ b/lib/English.gemspec
@@ -0,0 +1,24 @@
+Gem::Specification.new do |spec|
+  spec.name          = "english"
+  spec.version       = "0.7.1"
+  spec.authors       = ["Yukihiro Matsumoto"]
+  spec.email         = ["matz@ruby-lang.org"]
+
+  spec.summary       = %q{Require 'English.rb' to reference global variables with less cryptic names.}
+  spec.description   = %q{Require 'English.rb' to reference global variables with less cryptic names.}
+  spec.homepage      = "https://github.com/ruby/English"
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.licenses       = ["Ruby", "BSD-2-Clause"]
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z 2>/dev/null`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+end
diff --git a/lib/English.rb b/lib/English.rb
index 0c17229682..ec90ff10cd 100644
--- a/lib/English.rb
+++ b/lib/English.rb
@@ -1,7 +1,7 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #  Include the English library file in a Ruby script, and you can
-#  reference the global variables such as \VAR{\$\_} using less
-#  cryptic names, listed in the following table.% \vref{tab:english}.
+#  reference the global variables such as <tt>$_</tt> using less
+#  cryptic names, listed below.
 #
 #  Without 'English':
 #
@@ -52,45 +52,43 @@ module English end if false
 alias $ERROR_INFO              $!
 
 # The stack backtrace generated by the last
-# exception. <tt>See Kernel.caller</tt> for details. Thread local.
+# exception. See Kernel#caller for details. Thread local.
 alias $ERROR_POSITION          $@
 
-# The default separator pattern used by <tt>String.split</tt>.  May be
-# set from the command line using the <tt>-F</tt> flag.
+# The default separator pattern used by String#split.  May be set from
+# the command line using the <tt>-F</tt> flag.
 alias $FS                      $;
 
-# The default separator pattern used by <tt>String.split</tt>.  May be
-# set from the command line using the <tt>-F</tt> flag.
+# The default separator pattern used by String#split.  May be set from
+# the command line using the <tt>-F</tt> flag.
 alias $FIELD_SEPARATOR         $;
 
 # The separator string output between the parameters to methods such
-# as <tt>Kernel.print</tt> and <tt>Array.join</tt>. Defaults to +nil+,
-# which adds no text.
+# as Kernel#print and Array#join. Defaults to +nil+, which adds no
+# text.
 alias $OFS                     $,
 
 # The separator string output between the parameters to methods such
-# as <tt>Kernel.print</tt> and <tt>Array.join</tt>. Defaults to +nil+,
-# which adds no text.
+# as Kernel#print and Array#join. Defaults to +nil+, which adds no
+# text.
 alias $OUTPUT_FIELD_SEPARATOR  $,
 
 # The input record separator (newline by default). This is the value
-# that routines such as <tt>Kernel.gets</tt> use to determine record
+# that routines such as Kernel#gets use to determine record
 # boundaries. If set to +nil+, +gets+ will read the entire file.
 alias $RS                      $/
 
 # The input record separator (newline by default). This is the value
-# that routines such as <tt>Kernel.gets</tt> use to determine record
+# that routines such as Kernel#gets use to determine record
 # boundaries. If set to +nil+, +gets+ will read the entire file.
 alias $INPUT_RECORD_SEPARATOR  $/
 
 # The string appended to the output of every call to methods such as
-# <tt>Kernel.print</tt> and <tt>IO.write</tt>. The default value is
-# +nil+.
+# Kernel#print and IO#write. The default value is +nil+.
 alias $ORS                     $\
 
 # The string appended to the output of every call to methods such as
-# <tt>Kernel.print</tt> and <tt>IO.write</tt>. The default value is
-# +nil+.
+# Kernel#print and IO#write. The default value is +nil+.
 alias $OUTPUT_RECORD_SEPARATOR $\
 
 # The number of the last line read from the current input file.
@@ -99,14 +97,14 @@ alias $INPUT_LINE_NUMBER       $.
 # The number of the last line read from the current input file.
 alias $NR                      $.
 
-# The last line read by <tt>Kernel.gets</tt> or
-# <tt>Kernel.readline</tt>. Many string-related functions in the
-# +Kernel+ module operate on <tt>$_</tt> by default. The variable is
+# The last line read by Kernel#gets or
+# Kernel#readline. Many string-related functions in the
+# Kernel module operate on <tt>$_</tt> by default. The variable is
 # local to the current scope. Thread local.
 alias $LAST_READ_LINE          $_
 
-# The destination of output for <tt>Kernel.print</tt>
-# and <tt>Kernel.printf</tt>. The default value is
+# The destination of output for Kernel#print
+# and Kernel#printf. The default value is
 # <tt>$stdout</tt>.
 alias $DEFAULT_OUTPUT          $>
 
@@ -115,7 +113,7 @@ alias $DEFAULT_OUTPUT          $>
 # given as command-line arguments, or <tt>$stdin</tt>
 # (in the case where there are no
 # arguments). <tt>$<</tt> supports methods similar to a
-# +File+ object:
+# File object:
 # +inmode+, +close+,
 # <tt>closed?</tt>, +each+,
 # <tt>each_byte</tt>, <tt>each_line</tt>,
@@ -129,8 +127,8 @@ alias $DEFAULT_OUTPUT          $>
 # +rewind+, +seek+, +skip+,
 # +tell+, <tt>to_a</tt>, <tt>to_i</tt>,
 # <tt>to_io</tt>, <tt>to_s</tt>, along with the
-# methods in +Enumerable+. The method +file+
-# returns a +File+ object for the file currently
+# methods in Enumerable. The method +file+
+# returns a File object for the file currently
 # being read. This may change as <tt>$<</tt> reads
 # through the files on the command line. Read only.
 alias $DEFAULT_INPUT           $<
@@ -153,9 +151,7 @@ alias $CHILD_STATUS            $?
 # scope.
 alias $LAST_MATCH_INFO         $~
 
-# If set to any value apart from +nil+ or +false+, all pattern matches
-# will be case insensitive, string comparisons will ignore case, and
-# string hash values will be case insensitive. Deprecated
+# This variable is no longer effective. Deprecated.
 alias $IGNORECASE              $=
 
 # An array of strings containing the command-line
diff --git a/lib/abbrev.gemspec b/lib/abbrev.gemspec
new file mode 100644
index 0000000000..4edf0edaa3
--- /dev/null
+++ b/lib/abbrev.gemspec
@@ -0,0 +1,22 @@
+Gem::Specification.new do |spec|
+  spec.name          = "abbrev"
+  spec.version       = "0.1.0"
+  spec.authors       = ["Akinori MUSHA"]
+  spec.email         = ["knu@idaemons.org"]
+
+  spec.summary       = %q{Calculates a set of unique abbreviations for a given set of strings}
+  spec.description   = %q{Calculates a set of unique abbreviations for a given set of strings}
+  spec.homepage      = "https://github.com/ruby/abbrev"
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.licenses      = ["Ruby", "BSD-2-Clause"]
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+end
diff --git a/lib/abbrev.rb b/lib/abbrev.rb
index 2eac293c30..2af01d2eae 100644
--- a/lib/abbrev.rb
+++ b/lib/abbrev.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #--
 # Copyright (c) 2001,2003 Akinori MUSHA <knu@iDaemons.org>
 #
diff --git a/lib/base64.gemspec b/lib/base64.gemspec
new file mode 100644
index 0000000000..331ecc4491
--- /dev/null
+++ b/lib/base64.gemspec
@@ -0,0 +1,22 @@
+Gem::Specification.new do |spec|
+  spec.name          = "base64"
+  spec.version       = "0.1.0"
+  spec.authors       = ["Yusuke Endoh"]
+  spec.email         = ["mame@ruby-lang.org"]
+
+  spec.summary       = %q{Support for encoding and decoding binary data using a Base64 representation.}
+  spec.description   = %q{Support for encoding and decoding binary data using a Base64 representation.}
+  spec.homepage      = "https://github.com/ruby/base64"
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.licenses      = ["Ruby", "BSD-2-Clause"]
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+end
diff --git a/lib/base64.rb b/lib/base64.rb
index a08941af92..5c8df841f1 100644
--- a/lib/base64.rb
+++ b/lib/base64.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 # = base64.rb: methods for base64-encoding and -decoding strings
 #
@@ -56,7 +56,7 @@ module Base64
   #    This is line three
   #    And so on...
   def decode64(str)
-    str.unpack("m").first
+    str.unpack1("m")
   end
 
   # Returns the Base64-encoded version of +bin+.
@@ -71,7 +71,7 @@ module Base64
   # ArgumentError is raised if +str+ is incorrectly padded or contains
   # non-alphabet characters.  Note that CR or LF are also rejected.
   def strict_decode64(str)
-    str.unpack("m0").first
+    str.unpack1("m0")
   end
 
   # Returns the Base64-encoded version of +bin+.
@@ -81,8 +81,9 @@ module Base64
   # Note that the result can still contain '='.
   # You can remove the padding by setting +padding+ as false.
   def urlsafe_encode64(bin, padding: true)
-    str = strict_encode64(bin).tr("+/", "-_")
-    str = str.delete("=") unless padding
+    str = strict_encode64(bin)
+    str.tr!("+/", "-_")
+    str.delete!("=") unless padding
     str
   end
 
diff --git a/lib/benchmark.rb b/lib/benchmark.rb
index ec1b658cde..5ce9710586 100644
--- a/lib/benchmark.rb
+++ b/lib/benchmark.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #--
 # benchmark.rb - a performance benchmarking library
 #
@@ -439,6 +439,9 @@ module Benchmark
 
     #
     # An in-place version of #add.
+    # Changes the times of this Tms object by making it the sum of the times
+    # for this Tms object, plus the time required to execute
+    # the code block (+blk+).
     #
     def add!(&blk)
       t = Benchmark.measure(&blk)
@@ -452,7 +455,7 @@ module Benchmark
 
     #
     # Returns a new Tms object obtained by memberwise summation
-    # of the individual times for this Tms object with those of the other
+    # of the individual times for this Tms object with those of the +other+
     # Tms object.
     # This method and #/() are useful for taking statistics.
     #
@@ -460,20 +463,20 @@ module Benchmark
 
     #
     # Returns a new Tms object obtained by memberwise subtraction
-    # of the individual times for the other Tms object from those of this
+    # of the individual times for the +other+ Tms object from those of this
     # Tms object.
     #
     def -(other); memberwise(:-, other) end
 
     #
     # Returns a new Tms object obtained by memberwise multiplication
-    # of the individual times for this Tms object by _x_.
+    # of the individual times for this Tms object by +x+.
     #
     def *(x); memberwise(:*, x) end
 
     #
     # Returns a new Tms object obtained by memberwise division
-    # of the individual times for this Tms object by _x_.
+    # of the individual times for this Tms object by +x+.
     # This method and #+() are useful for taking statistics.
     #
     def /(x); memberwise(:/, x) end
@@ -529,7 +532,7 @@ module Benchmark
     #
     # Returns a new Tms object obtained by memberwise operation +op+
     # of the individual times for this Tms object with those of the other
-    # Tms object.
+    # Tms object (+x+).
     #
     # +op+ can be a mathematical operation such as <tt>+</tt>, <tt>-</tt>,
     # <tt>*</tt>, <tt>/</tt>
diff --git a/lib/benchmark/benchmark.gemspec b/lib/benchmark/benchmark.gemspec
new file mode 100644
index 0000000000..031ccbe34a
--- /dev/null
+++ b/lib/benchmark/benchmark.gemspec
@@ -0,0 +1,29 @@
+begin
+  require_relative "lib/benchmark/version"
+rescue LoadError # Fallback to load version file in ruby core repository
+  require_relative "version"
+end
+
+Gem::Specification.new do |spec|
+  spec.name          = "benchmark"
+  spec.version       = Benchmark::VERSION
+  spec.authors       = ["Yukihiro Matsumoto"]
+  spec.email         = ["matz@ruby-lang.org"]
+
+  spec.summary       = %q{a performance benchmarking library}
+  spec.description   = spec.summary
+  spec.homepage      = "https://github.com/ruby/benchmark"
+  spec.licenses       = ["Ruby", "BSD-2-Clause"]
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z 2>/dev/null`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+end
diff --git a/lib/benchmark/version.rb b/lib/benchmark/version.rb
new file mode 100644
index 0000000000..90d1a3900c
--- /dev/null
+++ b/lib/benchmark/version.rb
@@ -0,0 +1,3 @@
+module Benchmark
+  VERSION = "0.1.1"
+end
diff --git a/lib/bundler.rb b/lib/bundler.rb
new file mode 100644
index 0000000000..1ab87ac299
--- /dev/null
+++ b/lib/bundler.rb
@@ -0,0 +1,697 @@
+# frozen_string_literal: true
+
+require_relative "bundler/vendored_fileutils"
+require "pathname"
+require "rbconfig"
+
+require_relative "bundler/errors"
+require_relative "bundler/environment_preserver"
+require_relative "bundler/plugin"
+require_relative "bundler/rubygems_ext"
+require_relative "bundler/rubygems_integration"
+require_relative "bundler/version"
+require_relative "bundler/constants"
+require_relative "bundler/current_ruby"
+require_relative "bundler/build_metadata"
+
+# Bundler provides a consistent environment for Ruby projects by
+# tracking and installing the exact gems and versions that are needed.
+#
+# Since Ruby 2.6, Bundler is a part of Ruby's standard library.
+#
+# Bunder is used by creating _gemfiles_ listing all the project dependencies
+# and (optionally) their versions and then using
+#
+#   require 'bundler/setup'
+#
+# or Bundler.setup to setup environment where only specified gems and their
+# specified versions could be used.
+#
+# See {Bundler website}[https://bundler.io/docs.html] for extensive documentation
+# on gemfiles creation and Bundler usage.
+#
+# As a standard library inside project, Bundler could be used for introspection
+# of loaded and required modules.
+#
+module Bundler
+  environment_preserver = EnvironmentPreserver.from_env
+  ORIGINAL_ENV = environment_preserver.restore
+  environment_preserver.replace_with_backup
+  SUDO_MUTEX = Thread::Mutex.new
+
+  autoload :Definition,             File.expand_path("bundler/definition", __dir__)
+  autoload :Dependency,             File.expand_path("bundler/dependency", __dir__)
+  autoload :DepProxy,               File.expand_path("bundler/dep_proxy", __dir__)
+  autoload :Deprecate,              File.expand_path("bundler/deprecate", __dir__)
+  autoload :Digest,                 File.expand_path("bundler/digest", __dir__)
+  autoload :Dsl,                    File.expand_path("bundler/dsl", __dir__)
+  autoload :EndpointSpecification,  File.expand_path("bundler/endpoint_specification", __dir__)
+  autoload :Env,                    File.expand_path("bundler/env", __dir__)
+  autoload :Fetcher,                File.expand_path("bundler/fetcher", __dir__)
+  autoload :FeatureFlag,            File.expand_path("bundler/feature_flag", __dir__)
+  autoload :GemHelper,              File.expand_path("bundler/gem_helper", __dir__)
+  autoload :GemHelpers,             File.expand_path("bundler/gem_helpers", __dir__)
+  autoload :GemVersionPromoter,     File.expand_path("bundler/gem_version_promoter", __dir__)
+  autoload :Graph,                  File.expand_path("bundler/graph", __dir__)
+  autoload :Index,                  File.expand_path("bundler/index", __dir__)
+  autoload :Injector,               File.expand_path("bundler/injector", __dir__)
+  autoload :Installer,              File.expand_path("bundler/installer", __dir__)
+  autoload :LazySpecification,      File.expand_path("bundler/lazy_specification", __dir__)
+  autoload :LockfileParser,         File.expand_path("bundler/lockfile_parser", __dir__)
+  autoload :MatchPlatform,          File.expand_path("bundler/match_platform", __dir__)
+  autoload :ProcessLock,            File.expand_path("bundler/process_lock", __dir__)
+  autoload :RemoteSpecification,    File.expand_path("bundler/remote_specification", __dir__)
+  autoload :Resolver,               File.expand_path("bundler/resolver", __dir__)
+  autoload :Retry,                  File.expand_path("bundler/retry", __dir__)
+  autoload :RubyDsl,                File.expand_path("bundler/ruby_dsl", __dir__)
+  autoload :RubyVersion,            File.expand_path("bundler/ruby_version", __dir__)
+  autoload :Runtime,                File.expand_path("bundler/runtime", __dir__)
+  autoload :Settings,               File.expand_path("bundler/settings", __dir__)
+  autoload :SharedHelpers,          File.expand_path("bundler/shared_helpers", __dir__)
+  autoload :Source,                 File.expand_path("bundler/source", __dir__)
+  autoload :SourceList,             File.expand_path("bundler/source_list", __dir__)
+  autoload :SourceMap,              File.expand_path("bundler/source_map", __dir__)
+  autoload :SpecSet,                File.expand_path("bundler/spec_set", __dir__)
+  autoload :StubSpecification,      File.expand_path("bundler/stub_specification", __dir__)
+  autoload :UI,                     File.expand_path("bundler/ui", __dir__)
+  autoload :URICredentialsFilter,   File.expand_path("bundler/uri_credentials_filter", __dir__)
+  autoload :VersionRanges,          File.expand_path("bundler/version_ranges", __dir__)
+
+  class << self
+    def configure
+      @configured ||= configure_gem_home_and_path
+    end
+
+    def ui
+      (defined?(@ui) && @ui) || (self.ui = UI::Shell.new)
+    end
+
+    def ui=(ui)
+      Bundler.rubygems.ui = UI::RGProxy.new(ui)
+      @ui = ui
+    end
+
+    # Returns absolute path of where gems are installed on the filesystem.
+    def bundle_path
+      @bundle_path ||= Pathname.new(configured_bundle_path.path).expand_path(root)
+    end
+
+    def configured_bundle_path
+      @configured_bundle_path ||= settings.path.tap(&:validate!)
+    end
+
+    # Returns absolute location of where binstubs are installed to.
+    def bin_path
+      @bin_path ||= begin
+        path = settings[:bin] || "bin"
+        path = Pathname.new(path).expand_path(root).expand_path
+        SharedHelpers.filesystem_access(path) {|p| FileUtils.mkdir_p(p) }
+        path
+      end
+    end
+
+    # Turns on the Bundler runtime. After +Bundler.setup+ call, all +load+ or
+    # +require+ of the gems would be allowed only if they are part of
+    # the Gemfile or Ruby's standard library. If the versions specified
+    # in Gemfile, only those versions would be loaded.
+    #
+    # Assuming Gemfile
+    #
+    #    gem 'first_gem', '= 1.0'
+    #    group :test do
+    #      gem 'second_gem', '= 1.0'
+    #    end
+    #
+    # The code using Bundler.setup works as follows:
+    #
+    #    require 'third_gem' # allowed, required from global gems
+    #    require 'first_gem' # allowed, loads the last installed version
+    #    Bundler.setup
+    #    require 'fourth_gem' # fails with LoadError
+    #    require 'second_gem' # loads exactly version 1.0
+    #
+    # +Bundler.setup+ can be called only once, all subsequent calls are no-op.
+    #
+    # If _groups_ list is provided, only gems from specified groups would
+    # be allowed (gems specified outside groups belong to special +:default+ group).
+    #
+    # To require all gems from Gemfile (or only some groups), see Bundler.require.
+    #
+    def setup(*groups)
+      # Return if all groups are already loaded
+      return @setup if defined?(@setup) && @setup
+
+      definition.validate_runtime!
+
+      SharedHelpers.print_major_deprecations!
+
+      if groups.empty?
+        # Load all groups, but only once
+        @setup = load.setup
+      else
+        load.setup(*groups)
+      end
+    end
+
+    # Setups Bundler environment (see Bundler.setup) if it is not already set,
+    # and loads all gems from groups specified. Unlike ::setup, can be called
+    # multiple times with different groups (if they were allowed by setup).
+    #
+    # Assuming Gemfile
+    #
+    #    gem 'first_gem', '= 1.0'
+    #    group :test do
+    #      gem 'second_gem', '= 1.0'
+    #    end
+    #
+    # The code will work as follows:
+    #
+    #    Bundler.setup # allow all groups
+    #    Bundler.require(:default) # requires only first_gem
+    #    # ...later
+    #    Bundler.require(:test)   # requires second_gem
+    #
+    def require(*groups)
+      setup(*groups).require(*groups)
+    end
+
+    def load
+      @load ||= Runtime.new(root, definition)
+    end
+
+    def environment
+      SharedHelpers.major_deprecation 2, "Bundler.environment has been removed in favor of Bundler.load", :print_caller_location => true
+      load
+    end
+
+    # Returns an instance of Bundler::Definition for given Gemfile and lockfile
+    #
+    # @param unlock [Hash, Boolean, nil] Gems that have been requested
+    #   to be updated or true if all gems should be updated
+    # @return [Bundler::Definition]
+    def definition(unlock = nil)
+      @definition = nil if unlock
+      @definition ||= begin
+        configure
+        Definition.build(default_gemfile, default_lockfile, unlock)
+      end
+    end
+
+    def frozen_bundle?
+      frozen = settings[:deployment]
+      frozen ||= settings[:frozen]
+      frozen
+    end
+
+    def locked_gems
+      @locked_gems ||=
+        if defined?(@definition) && @definition
+          definition.locked_gems
+        elsif Bundler.default_lockfile.file?
+          lock = Bundler.read_file(Bundler.default_lockfile)
+          LockfileParser.new(lock)
+        end
+    end
+
+    def most_specific_locked_platform?(platform)
+      return false unless defined?(@definition) && @definition
+
+      definition.most_specific_locked_platform == platform
+    end
+
+    def ruby_scope
+      "#{Bundler.rubygems.ruby_engine}/#{RbConfig::CONFIG["ruby_version"]}"
+    end
+
+    def user_home
+      @user_home ||= begin
+        home = Bundler.rubygems.user_home
+        bundle_home = home ? File.join(home, ".bundle") : nil
+
+        warning = if home.nil?
+          "Your home directory is not set."
+        elsif !File.directory?(home)
+          "`#{home}` is not a directory."
+        elsif !File.writable?(home) && (!File.directory?(bundle_home) || !File.writable?(bundle_home))
+          "`#{home}` is not writable."
+        end
+
+        if warning
+          Bundler.ui.warn "#{warning}\n"
+          user_home = tmp_home_path
+          Bundler.ui.warn "Bundler will use `#{user_home}' as your home directory temporarily.\n"
+          user_home
+        else
+          Pathname.new(home)
+        end
+      end
+    end
+
+    def user_bundle_path(dir = "home")
+      env_var, fallback = case dir
+                          when "home"
+                            ["BUNDLE_USER_HOME", proc { Pathname.new(user_home).join(".bundle") }]
+                          when "cache"
+                            ["BUNDLE_USER_CACHE", proc { user_bundle_path.join("cache") }]
+                          when "config"
+                            ["BUNDLE_USER_CONFIG", proc { user_bundle_path.join("config") }]
+                          when "plugin"
+                            ["BUNDLE_USER_PLUGIN", proc { user_bundle_path.join("plugin") }]
+                          else
+                            raise BundlerError, "Unknown user path requested: #{dir}"
+      end
+      # `fallback` will already be a Pathname, but Pathname.new() is
+      # idempotent so it's OK
+      Pathname.new(ENV.fetch(env_var, &fallback))
+    end
+
+    def user_cache
+      user_bundle_path("cache")
+    end
+
+    def home
+      bundle_path.join("bundler")
+    end
+
+    def install_path
+      home.join("gems")
+    end
+
+    def specs_path
+      bundle_path.join("specifications")
+    end
+
+    def root
+      @root ||= begin
+                  SharedHelpers.root
+                rescue GemfileNotFound
+                  bundle_dir = default_bundle_dir
+                  raise GemfileNotFound, "Could not locate Gemfile or .bundle/ directory" unless bundle_dir
+                  Pathname.new(File.expand_path("..", bundle_dir))
+                end
+    end
+
+    def app_config_path
+      if app_config = ENV["BUNDLE_APP_CONFIG"]
+        app_config_pathname = Pathname.new(app_config)
+
+        if app_config_pathname.absolute?
+          app_config_pathname
+        else
+          app_config_pathname.expand_path(root)
+        end
+      else
+        root.join(".bundle")
+      end
+    end
+
+    def app_cache(custom_path = nil)
+      path = custom_path || root
+      Pathname.new(path).join(settings.app_cache_path)
+    end
+
+    def tmp(name = Process.pid.to_s)
+      Kernel.send(:require, "tmpdir")
+      Pathname.new(Dir.mktmpdir(["bundler", name]))
+    end
+
+    def rm_rf(path)
+      FileUtils.remove_entry_secure(path) if path && File.exist?(path)
+    rescue ArgumentError
+      message = <<EOF
+It is a security vulnerability to allow your home directory to be world-writable, and bundler can not continue.
+You should probably consider fixing this issue by running `chmod o-w ~` on *nix.
+Please refer to https://ruby-doc.org/stdlib-2.1.2/libdoc/fileutils/rdoc/FileUtils.html#method-c-remove_entry_secure for details.
+EOF
+      File.world_writable?(path) ? Bundler.ui.warn(message) : raise
+      raise PathError, "Please fix the world-writable issue with your #{path} directory"
+    end
+
+    def settings
+      @settings ||= Settings.new(app_config_path)
+    rescue GemfileNotFound
+      @settings = Settings.new(Pathname.new(".bundle").expand_path)
+    end
+
+    # @return [Hash] Environment present before Bundler was activated
+    def original_env
+      ORIGINAL_ENV.clone
+    end
+
+    # @deprecated Use `unbundled_env` instead
+    def clean_env
+      Bundler::SharedHelpers.major_deprecation(
+        2,
+        "`Bundler.clean_env` has been deprecated in favor of `Bundler.unbundled_env`. " \
+        "If you instead want the environment before bundler was originally loaded, use `Bundler.original_env`",
+        :print_caller_location => true
+      )
+
+      unbundled_env
+    end
+
+    # @return [Hash] Environment with all bundler-related variables removed
+    def unbundled_env
+      env = original_env
+
+      if env.key?("BUNDLER_ORIG_MANPATH")
+        env["MANPATH"] = env["BUNDLER_ORIG_MANPATH"]
+      end
+
+      env.delete_if {|k, _| k[0, 7] == "BUNDLE_" }
+
+      if env.key?("RUBYOPT")
+        rubyopt = env["RUBYOPT"].split(" ")
+        rubyopt.delete("-r#{File.expand_path("bundler/setup", __dir__)}")
+        rubyopt.delete("-rbundler/setup")
+        env["RUBYOPT"] = rubyopt.join(" ")
+      end
+
+      if env.key?("RUBYLIB")
+        rubylib = env["RUBYLIB"].split(File::PATH_SEPARATOR)
+        rubylib.delete(File.expand_path("..", __FILE__))
+        env["RUBYLIB"] = rubylib.join(File::PATH_SEPARATOR)
+      end
+
+      env
+    end
+
+    # Run block with environment present before Bundler was activated
+    def with_original_env
+      with_env(original_env) { yield }
+    end
+
+    # @deprecated Use `with_unbundled_env` instead
+    def with_clean_env
+      Bundler::SharedHelpers.major_deprecation(
+        2,
+        "`Bundler.with_clean_env` has been deprecated in favor of `Bundler.with_unbundled_env`. " \
+        "If you instead want the environment before bundler was originally loaded, use `Bundler.with_original_env`",
+        :print_caller_location => true
+      )
+
+      with_env(unbundled_env) { yield }
+    end
+
+    # Run block with all bundler-related variables removed
+    def with_unbundled_env
+      with_env(unbundled_env) { yield }
+    end
+
+    # Run subcommand with the environment present before Bundler was activated
+    def original_system(*args)
+      with_original_env { Kernel.system(*args) }
+    end
+
+    # @deprecated Use `unbundled_system` instead
+    def clean_system(*args)
+      Bundler::SharedHelpers.major_deprecation(
+        2,
+        "`Bundler.clean_system` has been deprecated in favor of `Bundler.unbundled_system`. " \
+        "If you instead want to run the command in the environment before bundler was originally loaded, use `Bundler.original_system`",
+        :print_caller_location => true
+      )
+
+      with_env(unbundled_env) { Kernel.system(*args) }
+    end
+
+    # Run subcommand in an environment with all bundler related variables removed
+    def unbundled_system(*args)
+      with_unbundled_env { Kernel.system(*args) }
+    end
+
+    # Run a `Kernel.exec` to a subcommand with the environment present before Bundler was activated
+    def original_exec(*args)
+      with_original_env { Kernel.exec(*args) }
+    end
+
+    # @deprecated Use `unbundled_exec` instead
+    def clean_exec(*args)
+      Bundler::SharedHelpers.major_deprecation(
+        2,
+        "`Bundler.clean_exec` has been deprecated in favor of `Bundler.unbundled_exec`. " \
+        "If you instead want to exec to a command in the environment before bundler was originally loaded, use `Bundler.original_exec`",
+        :print_caller_location => true
+      )
+
+      with_env(unbundled_env) { Kernel.exec(*args) }
+    end
+
+    # Run a `Kernel.exec` to a subcommand in an environment with all bundler related variables removed
+    def unbundled_exec(*args)
+      with_env(unbundled_env) { Kernel.exec(*args) }
+    end
+
+    def local_platform
+      return Gem::Platform::RUBY if settings[:force_ruby_platform] || Gem.platforms == [Gem::Platform::RUBY]
+      Gem::Platform.local
+    end
+
+    def default_gemfile
+      SharedHelpers.default_gemfile
+    end
+
+    def default_lockfile
+      SharedHelpers.default_lockfile
+    end
+
+    def default_bundle_dir
+      SharedHelpers.default_bundle_dir
+    end
+
+    def system_bindir
+      # Gem.bindir doesn't always return the location that RubyGems will install
+      # system binaries. If you put '-n foo' in your .gemrc, RubyGems will
+      # install binstubs there instead. Unfortunately, RubyGems doesn't expose
+      # that directory at all, so rather than parse .gemrc ourselves, we allow
+      # the directory to be set as well, via `bundle config set --local bindir foo`.
+      Bundler.settings[:system_bindir] || Bundler.rubygems.gem_bindir
+    end
+
+    def preferred_gemfile_name
+      Bundler.settings[:init_gems_rb] ? "gems.rb" : "Gemfile"
+    end
+
+    def use_system_gems?
+      configured_bundle_path.use_system_gems?
+    end
+
+    def requires_sudo?
+      return @requires_sudo if defined?(@requires_sudo_ran)
+
+      sudo_present = which "sudo" if settings.allow_sudo?
+
+      if sudo_present
+        # the bundle path and subdirectories need to be writable for RubyGems
+        # to be able to unpack and install gems without exploding
+        path = bundle_path
+        path = path.parent until path.exist?
+
+        # bins are written to a different location on OS X
+        bin_dir = Pathname.new(Bundler.system_bindir)
+        bin_dir = bin_dir.parent until bin_dir.exist?
+
+        # if any directory is not writable, we need sudo
+        files = [path, bin_dir] | Dir[bundle_path.join("build_info/*").to_s] | Dir[bundle_path.join("*").to_s]
+        unwritable_files = files.reject {|f| File.writable?(f) }
+        sudo_needed = !unwritable_files.empty?
+        if sudo_needed
+          Bundler.ui.warn "Following files may not be writable, so sudo is needed:\n  #{unwritable_files.map(&:to_s).sort.join("\n  ")}"
+        end
+      end
+
+      @requires_sudo_ran = true
+      @requires_sudo = settings.allow_sudo? && sudo_present && sudo_needed
+    end
+
+    def mkdir_p(path, options = {})
+      if requires_sudo? && !options[:no_sudo]
+        sudo "mkdir -p '#{path}'" unless File.exist?(path)
+      else
+        SharedHelpers.filesystem_access(path, :write) do |p|
+          FileUtils.mkdir_p(p)
+        end
+      end
+    end
+
+    def which(executable)
+      if File.file?(executable) && File.executable?(executable)
+        executable
+      elsif paths = ENV["PATH"]
+        quote = '"'.freeze
+        paths.split(File::PATH_SEPARATOR).find do |path|
+          path = path[1..-2] if path.start_with?(quote) && path.end_with?(quote)
+          executable_path = File.expand_path(executable, path)
+          return executable_path if File.file?(executable_path) && File.executable?(executable_path)
+        end
+      end
+    end
+
+    def sudo(str)
+      SUDO_MUTEX.synchronize do
+        prompt = "\n\n" + <<-PROMPT.gsub(/^ {6}/, "").strip + " "
+        Your user account isn't allowed to install to the system RubyGems.
+        You can cancel this installation and run:
+
+            bundle config set --local path 'vendor/bundle'
+            bundle install
+
+        to install the gems into ./vendor/bundle/, or you can enter your password
+        and install the bundled gems to RubyGems using sudo.
+
+        Password:
+        PROMPT
+
+        unless @prompted_for_sudo ||= system(%(sudo -k -p "#{prompt}" true))
+          raise SudoNotPermittedError,
+            "Bundler requires sudo access to install at the moment. " \
+            "Try installing again, granting Bundler sudo access when prompted, or installing into a different path."
+        end
+
+        `sudo -p "#{prompt}" #{str}`
+      end
+    end
+
+    def read_file(file)
+      SharedHelpers.filesystem_access(file, :read) do
+        File.open(file, "r:UTF-8", &:read)
+      end
+    end
+
+    def load_marshal(data)
+      Marshal.load(data)
+    rescue StandardError => e
+      raise MarshalError, "#{e.class}: #{e.message}"
+    end
+
+    def load_gemspec(file, validate = false)
+      @gemspec_cache ||= {}
+      key = File.expand_path(file)
+      @gemspec_cache[key] ||= load_gemspec_uncached(file, validate)
+      # Protect against caching side-effected gemspecs by returning a
+      # new instance each time.
+      @gemspec_cache[key].dup if @gemspec_cache[key]
+    end
+
+    def load_gemspec_uncached(file, validate = false)
+      path = Pathname.new(file)
+      contents = read_file(file)
+      spec = if contents.start_with?("---") # YAML header
+        eval_yaml_gemspec(path, contents)
+      else
+        # Eval the gemspec from its parent directory, because some gemspecs
+        # depend on "./" relative paths.
+        SharedHelpers.chdir(path.dirname.to_s) do
+          eval_gemspec(path, contents)
+        end
+      end
+      return unless spec
+      spec.loaded_from = path.expand_path.to_s
+      Bundler.rubygems.validate(spec) if validate
+      spec
+    end
+
+    def clear_gemspec_cache
+      @gemspec_cache = {}
+    end
+
+    def git_present?
+      return @git_present if defined?(@git_present)
+      @git_present = Bundler.which("git") || Bundler.which("git.exe")
+    end
+
+    def feature_flag
+      @feature_flag ||= FeatureFlag.new(VERSION)
+    end
+
+    def reset!
+      reset_paths!
+      Plugin.reset!
+      reset_rubygems!
+    end
+
+    def reset_settings_and_root!
+      @settings = nil
+      @root = nil
+    end
+
+    def reset_paths!
+      @bin_path = nil
+      @bundler_major_version = nil
+      @bundle_path = nil
+      @configured = nil
+      @configured_bundle_path = nil
+      @definition = nil
+      @load = nil
+      @locked_gems = nil
+      @root = nil
+      @settings = nil
+      @setup = nil
+      @user_home = nil
+    end
+
+    def reset_rubygems!
+      return unless defined?(@rubygems) && @rubygems
+      rubygems.undo_replacements
+      rubygems.reset
+      @rubygems = nil
+    end
+
+    def configure_gem_home_and_path(path = bundle_path)
+      configure_gem_path
+      configure_gem_home(path)
+      Bundler.rubygems.clear_paths
+    end
+
+    private
+
+    def eval_yaml_gemspec(path, contents)
+      require_relative "bundler/psyched_yaml"
+
+      # If the YAML is invalid, Syck raises an ArgumentError, and Psych
+      # raises a Psych::SyntaxError. See psyched_yaml.rb for more info.
+      Gem::Specification.from_yaml(contents)
+    rescue YamlLibrarySyntaxError, ArgumentError, Gem::EndOfYAMLException, Gem::Exception
+      eval_gemspec(path, contents)
+    end
+
+    def eval_gemspec(path, contents)
+      eval(contents, TOPLEVEL_BINDING.dup, path.expand_path.to_s)
+    rescue ScriptError, StandardError => e
+      msg = "There was an error while loading `#{path.basename}`: #{e.message}"
+
+      raise GemspecError, Dsl::DSLError.new(msg, path, e.backtrace, contents)
+    end
+
+    def configure_gem_path
+      unless use_system_gems?
+        # this needs to be empty string to cause
+        # PathSupport.split_gem_path to only load up the
+        # Bundler --path setting as the GEM_PATH.
+        Bundler::SharedHelpers.set_env "GEM_PATH", ""
+      end
+    end
+
+    def configure_gem_home(path)
+      Bundler::SharedHelpers.set_env "GEM_HOME", path.to_s
+    end
+
+    def tmp_home_path
+      Kernel.send(:require, "tmpdir")
+      SharedHelpers.filesystem_access(Dir.tmpdir) do
+        path = Bundler.tmp
+        at_exit { Bundler.rm_rf(path) }
+        path
+      end
+    end
+
+    # @param env [Hash]
+    def with_env(env)
+      backup = ENV.to_hash
+      ENV.replace(env)
+      yield
+    ensure
+      ENV.replace(backup)
+    end
+  end
+end
diff --git a/lib/bundler/build_metadata.rb b/lib/bundler/build_metadata.rb
new file mode 100644
index 0000000000..0846e82e06
--- /dev/null
+++ b/lib/bundler/build_metadata.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Bundler
+  # Represents metadata from when the Bundler gem was built.
+  module BuildMetadata
+    # begin ivars
+    @release = false
+    # end ivars
+
+    # A hash representation of the build metadata.
+    def self.to_h
+      {
+        "Built At" => built_at,
+        "Git SHA" => git_commit_sha,
+        "Released Version" => release?,
+      }
+    end
+
+    # A string representing the date the bundler gem was built.
+    def self.built_at
+      @built_at ||= Time.now.utc.strftime("%Y-%m-%d").freeze
+    end
+
+    # The SHA for the git commit the bundler gem was built from.
+    def self.git_commit_sha
+      return @git_commit_sha if instance_variable_defined? :@git_commit_sha
+
+      # If Bundler has been installed without its .git directory and without a
+      # commit instance variable then we can't determine its commits SHA.
+      git_dir = File.join(File.expand_path("../../../..", __FILE__), ".git")
+      if File.directory?(git_dir)
+        return @git_commit_sha = Dir.chdir(git_dir) { `git rev-parse --short HEAD`.strip.freeze }
+      end
+
+      @git_commit_sha ||= "unknown"
+    end
+
+    # Whether this is an official release build of Bundler.
+    def self.release?
+      @release
+    end
+  end
+end
diff --git a/lib/bundler/bundler.gemspec b/lib/bundler/bundler.gemspec
new file mode 100644
index 0000000000..38c533b0c1
--- /dev/null
+++ b/lib/bundler/bundler.gemspec
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+begin
+  require_relative "lib/bundler/version"
+rescue LoadError
+  # for Ruby core repository
+  require_relative "version"
+end
+
+Gem::Specification.new do |s|
+  s.name        = "bundler"
+  s.version     = Bundler::VERSION
+  s.license     = "MIT"
+  s.authors     = [
+    "André Arko", "Samuel Giddins", "Colby Swandale", "Hiroshi Shibata",
+    "David Rodríguez", "Grey Baker", "Stephanie Morillo", "Chris Morris", "James Wen", "Tim Moore",
+    "André Medeiros", "Jessica Lynn Suttles", "Terence Lee", "Carl Lerche",
+    "Yehuda Katz"
+  ]
+  s.email       = ["team@bundler.io"]
+  s.homepage    = "https://bundler.io"
+  s.summary     = "The best way to manage your application's dependencies"
+  s.description = "Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably"
+
+  if s.respond_to?(:metadata=)
+    s.metadata = {
+      "bug_tracker_uri" => "https://github.com/rubygems/rubygems/issues?q=is%3Aopen+is%3Aissue+label%3ABundler",
+      "changelog_uri" => "https://github.com/rubygems/rubygems/blob/master/bundler/CHANGELOG.md",
+      "homepage_uri" => "https://bundler.io/",
+      "source_code_uri" => "https://github.com/rubygems/rubygems/",
+    }
+  end
+
+  s.required_ruby_version     = ">= 2.3.0"
+  s.required_rubygems_version = ">= 2.5.2"
+
+  s.files = Dir.glob("lib/bundler{.rb,/**/*}", File::FNM_DOTMATCH).reject {|f| File.directory?(f) }
+
+  # include the gemspec itself because warbler breaks w/o it
+  s.files += %w[lib/bundler/bundler.gemspec]
+
+  s.bindir        = "libexec"
+  s.executables   = %w[bundle bundler]
+  s.require_paths = ["lib"]
+end
diff --git a/lib/bundler/capistrano.rb b/lib/bundler/capistrano.rb
new file mode 100644
index 0000000000..1f3712d48e
--- /dev/null
+++ b/lib/bundler/capistrano.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require_relative "shared_helpers"
+Bundler::SharedHelpers.major_deprecation 2,
+  "The Bundler task for Capistrano. Please use https://github.com/capistrano/bundler"
+
+# Capistrano task for Bundler.
+#
+# Add "require 'bundler/capistrano'" in your Capistrano deploy.rb, and
+# Bundler will be activated after each new deployment.
+require_relative "deployment"
+require "capistrano/version"
+
+if defined?(Capistrano::Version) && Gem::Version.new(Capistrano::Version).release >= Gem::Version.new("3.0")
+  raise "For Capistrano 3.x integration, please use https://github.com/capistrano/bundler"
+end
+
+Capistrano::Configuration.instance(:must_exist).load do
+  before "deploy:finalize_update", "bundle:install"
+  Bundler::Deployment.define_task(self, :task, :except => { :no_release => true })
+  set :rake, lambda { "#{fetch(:bundle_cmd, "bundle")} exec rake" }
+end
diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb
new file mode 100644
index 0000000000..d271086b25
--- /dev/null
+++ b/lib/bundler/cli.rb
@@ -0,0 +1,851 @@
+# frozen_string_literal: true
+
+require_relative "vendored_thor"
+
+module Bundler
+  class CLI < Thor
+    require_relative "cli/common"
+
+    package_name "Bundler"
+
+    AUTO_INSTALL_CMDS = %w[show binstubs outdated exec open console licenses clean].freeze
+    PARSEABLE_COMMANDS = %w[check config help exec platform show version].freeze
+
+    COMMAND_ALIASES = {
+      "check" => "c",
+      "install" => "i",
+      "plugin" => "",
+      "list" => "ls",
+      "exec" => ["e", "ex", "exe"],
+      "cache" => ["package", "pack"],
+      "version" => ["-v", "--version"],
+    }.freeze
+
+    def self.start(*)
+      super
+    ensure
+      Bundler::SharedHelpers.print_major_deprecations!
+    end
+
+    def self.dispatch(*)
+      super do |i|
+        i.send(:print_command)
+        i.send(:warn_on_outdated_bundler)
+      end
+    end
+
+    def self.all_aliases
+      @all_aliases ||= begin
+                         command_aliases = {}
+
+                         COMMAND_ALIASES.each do |name, aliases|
+                           Array(aliases).each do |one_alias|
+                             command_aliases[one_alias] = name
+                           end
+                         end
+
+                         command_aliases
+                       end
+    end
+
+    def self.aliases_for(command_name)
+      COMMAND_ALIASES.select {|k, _| k == command_name }.invert
+    end
+
+    def initialize(*args)
+      super
+
+      custom_gemfile = options[:gemfile] || Bundler.settings[:gemfile]
+      if custom_gemfile && !custom_gemfile.empty?
+        Bundler::SharedHelpers.set_env "BUNDLE_GEMFILE", File.expand_path(custom_gemfile)
+        Bundler.reset_settings_and_root!
+      end
+
+      Bundler.settings.set_command_option_if_given :retry, options[:retry]
+
+      current_cmd = args.last[:current_command].name
+      auto_install if AUTO_INSTALL_CMDS.include?(current_cmd)
+    rescue UnknownArgumentError => e
+      raise InvalidOption, e.message
+    ensure
+      self.options ||= {}
+      unprinted_warnings = Bundler.ui.unprinted_warnings
+      Bundler.ui = UI::Shell.new(options)
+      Bundler.ui.level = "debug" if options["verbose"]
+      unprinted_warnings.each {|w| Bundler.ui.warn(w) }
+    end
+
+    check_unknown_options!(:except => [:config, :exec])
+    stop_on_unknown_option! :exec
+
+    desc "cli_help", "Prints a summary of bundler commands", :hide => true
+    def cli_help
+      version
+      Bundler.ui.info "\n"
+
+      primary_commands = ["install", "update", "cache", "exec", "config", "help"]
+
+      list = self.class.printable_commands(true)
+      by_name = list.group_by {|name, _message| name.match(/^bundle (\w+)/)[1] }
+      utilities = by_name.keys.sort - primary_commands
+      primary_commands.map! {|name| (by_name[name] || raise("no primary command #{name}")).first }
+      utilities.map! {|name| by_name[name].first }
+
+      shell.say "Bundler commands:\n\n"
+
+      shell.say "  Primary commands:\n"
+      shell.print_table(primary_commands, :indent => 4, :truncate => true)
+      shell.say
+      shell.say "  Utilities:\n"
+      shell.print_table(utilities, :indent => 4, :truncate => true)
+      shell.say
+      self.class.send(:class_options_help, shell)
+    end
+    default_task(Bundler.feature_flag.default_cli_command)
+
+    class_option "no-color", :type => :boolean, :desc => "Disable colorization in output"
+    class_option "retry",    :type => :numeric, :aliases => "-r", :banner => "NUM",
+                             :desc => "Specify the number of times you wish to attempt network commands"
+    class_option "verbose", :type => :boolean, :desc => "Enable verbose output mode", :aliases => "-V"
+
+    def help(cli = nil)
+      case cli
+      when "gemfile" then command = "gemfile"
+      when nil       then command = "bundle"
+      else command = "bundle-#{cli}"
+      end
+
+      man_path = File.expand_path("man", __dir__)
+      man_pages = Hash[Dir.glob(File.join(man_path, "**", "*")).grep(/.*\.\d*\Z/).collect do |f|
+        [File.basename(f, ".*"), f]
+      end]
+
+      if man_pages.include?(command)
+        man_page = man_pages[command]
+        if Bundler.which("man") && man_path !~ %r{^file:/.+!/META-INF/jruby.home/.+}
+          Kernel.exec "man #{man_page}"
+        else
+          puts File.read("#{man_path}/#{File.basename(man_page)}.ronn")
+        end
+      elsif command_path = Bundler.which("bundler-#{cli}")
+        Kernel.exec(command_path, "--help")
+      else
+        super
+      end
+    end
+
+    def self.handle_no_command_error(command, has_namespace = $thor_runner)
+      if Bundler.feature_flag.plugins? && Bundler::Plugin.command?(command)
+        return Bundler::Plugin.exec_command(command, ARGV[1..-1])
+      end
+
+      return super unless command_path = Bundler.which("bundler-#{command}")
+
+      Kernel.exec(command_path, *ARGV[1..-1])
+    end
+
+    desc "init [OPTIONS]", "Generates a Gemfile into the current working directory"
+    long_desc <<-D
+      Init generates a default Gemfile in the current working directory. When adding a
+      Gemfile to a gem with a gemspec, the --gemspec option will automatically add each
+      dependency listed in the gemspec file to the newly created Gemfile.
+    D
+    method_option "gemspec", :type => :string, :banner => "Use the specified .gemspec to create the Gemfile"
+    def init
+      require_relative "cli/init"
+      Init.new(options.dup).run
+    end
+
+    desc "check [OPTIONS]", "Checks if the dependencies listed in Gemfile are satisfied by currently installed gems"
+    long_desc <<-D
+      Check searches the local machine for each of the gems requested in the Gemfile. If
+      all gems are found, Bundler prints a success message and exits with a status of 0.
+      If not, the first missing gem is listed and Bundler exits status 1.
+    D
+    method_option "dry-run", :type => :boolean, :default => false, :banner =>
+      "Lock the Gemfile"
+    method_option "gemfile", :type => :string, :banner =>
+      "Use the specified gemfile instead of Gemfile"
+    method_option "path", :type => :string, :banner =>
+      "Specify a different path than the system default ($BUNDLE_PATH or $GEM_HOME).#{" Bundler will remember this value for future installs on this machine" unless Bundler.feature_flag.forget_cli_options?}"
+    def check
+      remembered_flag_deprecation("path")
+
+      require_relative "cli/check"
+      Check.new(options).run
+    end
+
+    map aliases_for("check")
+
+    desc "remove [GEM [GEM ...]]", "Removes gems from the Gemfile"
+    long_desc <<-D
+      Removes the given gems from the Gemfile while ensuring that the resulting Gemfile is still valid. If the gem is not found, Bundler prints a error message and if gem could not be removed due to any reason Bundler will display a warning.
+    D
+    method_option "install", :type => :boolean, :banner =>
+      "Runs 'bundle install' after removing the gems from the Gemfile"
+    def remove(*gems)
+      SharedHelpers.major_deprecation(2, "The `--install` flag has been deprecated. `bundle install` is triggered by default.") if ARGV.include?("--install")
+      require_relative "cli/remove"
+      Remove.new(gems, options).run
+    end
+
+    desc "install [OPTIONS]", "Install the current environment to the system"
+    long_desc <<-D
+      Install will install all of the gems in the current bundle, making them available
+      for use. In a freshly checked out repository, this command will give you the same
+      gem versions as the last person who updated the Gemfile and ran `bundle update`.
+
+      Passing [DIR] to install (e.g. vendor) will cause the unpacked gems to be installed
+      into the [DIR] directory rather than into system gems.
+
+      If the bundle has already been installed, bundler will tell you so and then exit.
+    D
+    method_option "binstubs", :type => :string, :lazy_default => "bin", :banner =>
+      "Generate bin stubs for bundled gems to ./bin"
+    method_option "clean", :type => :boolean, :banner =>
+      "Run bundle clean automatically after install"
+    method_option "deployment", :type => :boolean, :banner =>
+      "Install using defaults tuned for deployment environments"
+    method_option "frozen", :type => :boolean, :banner =>
+      "Do not allow the Gemfile.lock to be updated after this install"
+    method_option "full-index", :type => :boolean, :banner =>
+      "Fall back to using the single-file index of all gems"
+    method_option "gemfile", :type => :string, :banner =>
+      "Use the specified gemfile instead of Gemfile"
+    method_option "jobs", :aliases => "-j", :type => :numeric, :banner =>
+      "Specify the number of jobs to run in parallel"
+    method_option "local", :type => :boolean, :banner =>
+      "Do not attempt to fetch gems remotely and use the gem cache instead"
+    method_option "no-cache", :type => :boolean, :banner =>
+      "Don't update the existing gem cache."
+    method_option "redownload", :type => :boolean, :aliases => "--force", :banner =>
+      "Force downloading every gem."
+    method_option "no-prune", :type => :boolean, :banner =>
+      "Don't remove stale gems from the cache."
+    method_option "path", :type => :string, :banner =>
+      "Specify a different path than the system default ($BUNDLE_PATH or $GEM_HOME).#{" Bundler will remember this value for future installs on this machine" unless Bundler.feature_flag.forget_cli_options?}"
+    method_option "quiet", :type => :boolean, :banner =>
+      "Only output warnings and errors."
+    method_option "shebang", :type => :string, :banner =>
+      "Specify a different shebang executable name than the default (usually 'ruby')"
+    method_option "standalone", :type => :array, :lazy_default => [], :banner =>
+      "Make a bundle that can work without the Bundler runtime"
+    method_option "system", :type => :boolean, :banner =>
+      "Install to the system location ($BUNDLE_PATH or $GEM_HOME) even if the bundle was previously installed somewhere else for this application"
+    method_option "trust-policy", :alias => "P", :type => :string, :banner =>
+      "Gem trust policy (like gem install -P). Must be one of " +
+        Bundler.rubygems.security_policy_keys.join("|")
+    method_option "without", :type => :array, :banner =>
+      "Exclude gems that are part of the specified named group."
+    method_option "with", :type => :array, :banner =>
+      "Include gems that are part of the specified named group."
+    def install
+      SharedHelpers.major_deprecation(2, "The `--force` option has been renamed to `--redownload`") if ARGV.include?("--force")
+
+      %w[clean deployment frozen no-prune path shebang system without with].each do |option|
+        remembered_flag_deprecation(option)
+      end
+
+      remembered_negative_flag_deprecation("no-deployment")
+
+      require_relative "cli/install"
+      Bundler.settings.temporary(:no_install => false) do
+        Install.new(options.dup).run
+      end
+    end
+
+    map aliases_for("install")
+
+    desc "update [OPTIONS]", "Update the current environment"
+    long_desc <<-D
+      Update will install the newest versions of the gems listed in the Gemfile. Use
+      update when you have changed the Gemfile, or if you want to get the newest
+      possible versions of the gems in the bundle.
+    D
+    method_option "full-index", :type => :boolean, :banner =>
+      "Fall back to using the single-file index of all gems"
+    method_option "gemfile", :type => :string, :banner =>
+      "Use the specified gemfile instead of Gemfile"
+    method_option "group", :aliases => "-g", :type => :array, :banner =>
+      "Update a specific group"
+    method_option "jobs", :aliases => "-j", :type => :numeric, :banner =>
+      "Specify the number of jobs to run in parallel"
+    method_option "local", :type => :boolean, :banner =>
+      "Do not attempt to fetch gems remotely and use the gem cache instead"
+    method_option "quiet", :type => :boolean, :banner =>
+      "Only output warnings and errors."
+    method_option "source", :type => :array, :banner =>
+      "Update a specific source (and all gems associated with it)"
+    method_option "redownload", :type => :boolean, :aliases => "--force", :banner =>
+      "Force downloading every gem."
+    method_option "ruby", :type => :boolean, :banner =>
+      "Update ruby specified in Gemfile.lock"
+    method_option "bundler", :type => :string, :lazy_default => "> 0.a", :banner =>
+      "Update the locked version of bundler"
+    method_option "patch", :type => :boolean, :banner =>
+      "Prefer updating only to next patch version"
+    method_option "minor", :type => :boolean, :banner =>
+      "Prefer updating only to next minor version"
+    method_option "major", :type => :boolean, :banner =>
+      "Prefer updating to next major version (default)"
+    method_option "strict", :type => :boolean, :banner =>
+      "Do not allow any gem to be updated past latest --patch | --minor | --major"
+    method_option "conservative", :type => :boolean, :banner =>
+      "Use bundle install conservative update behavior and do not allow shared dependencies to be updated."
+    method_option "all", :type => :boolean, :banner =>
+      "Update everything."
+    def update(*gems)
+      SharedHelpers.major_deprecation(2, "The `--force` option has been renamed to `--redownload`") if ARGV.include?("--force")
+      require_relative "cli/update"
+      Bundler.settings.temporary(:no_install => false) do
+        Update.new(options, gems).run
+      end
+    end
+
+    desc "show GEM [OPTIONS]", "Shows all gems that are part of the bundle, or the path to a given gem"
+    long_desc <<-D
+      Show lists the names and versions of all gems that are required by your Gemfile.
+      Calling show with [GEM] will list the exact location of that gem on your machine.
+    D
+    method_option "paths", :type => :boolean,
+                           :banner => "List the paths of all gems that are required by your Gemfile."
+    method_option "outdated", :type => :boolean,
+                              :banner => "Show verbose output including whether gems are outdated."
+    def show(gem_name = nil)
+      SharedHelpers.major_deprecation(2, "the `--outdated` flag to `bundle show` was undocumented and will be removed without replacement") if ARGV.include?("--outdated")
+      require_relative "cli/show"
+      Show.new(options, gem_name).run
+    end
+
+    desc "list", "List all gems in the bundle"
+    method_option "name-only", :type => :boolean, :banner => "print only the gem names"
+    method_option "only-group", :type => :array, :default => [], :banner => "print gems from a given set of groups"
+    method_option "without-group", :type => :array, :default => [], :banner => "print all gems except from a given set of groups"
+    method_option "paths", :type => :boolean, :banner => "print the path to each gem in the bundle"
+    def list
+      require_relative "cli/list"
+      List.new(options).run
+    end
+
+    map aliases_for("list")
+
+    desc "info GEM [OPTIONS]", "Show information for the given gem"
+    method_option "path", :type => :boolean, :banner => "Print full path to gem"
+    method_option "version", :type => :boolean, :banner => "Print gem version"
+    def info(gem_name)
+      require_relative "cli/info"
+      Info.new(options, gem_name).run
+    end
+
+    desc "binstubs GEM [OPTIONS]", "Install the binstubs of the listed gem"
+    long_desc <<-D
+      Generate binstubs for executables in [GEM]. Binstubs are put into bin,
+      or the --binstubs directory if one has been set. Calling binstubs with [GEM [GEM]]
+      will create binstubs for all given gems.
+    D
+    method_option "force", :type => :boolean, :default => false, :banner =>
+      "Overwrite existing binstubs if they exist"
+    method_option "path", :type => :string, :lazy_default => "bin", :banner =>
+      "Binstub destination directory (default bin)"
+    method_option "shebang", :type => :string, :banner =>
+      "Specify a different shebang executable name than the default (usually 'ruby')"
+    method_option "standalone", :type => :boolean, :banner =>
+      "Make binstubs that can work without the Bundler runtime"
+    method_option "all", :type => :boolean, :banner =>
+      "Install binstubs for all gems"
+    method_option "all-platforms", :type => :boolean, :default => false, :banner =>
+      "Install binstubs for all platforms"
+    def binstubs(*gems)
+      require_relative "cli/binstubs"
+      Binstubs.new(options, gems).run
+    end
+
+    desc "add GEM VERSION", "Add gem to Gemfile and run bundle install"
+    long_desc <<-D
+      Adds the specified gem to Gemfile (if valid) and run 'bundle install' in one step.
+    D
+    method_option "version", :aliases => "-v", :type => :string
+    method_option "group", :aliases => "-g", :type => :string
+    method_option "source", :aliases => "-s", :type => :string
+    method_option "git", :type => :string
+    method_option "branch", :type => :string
+    method_option "skip-install", :type => :boolean, :banner =>
+      "Adds gem to the Gemfile but does not install it"
+    method_option "optimistic", :type => :boolean, :banner => "Adds optimistic declaration of version to gem"
+    method_option "strict", :type => :boolean, :banner => "Adds strict declaration of version to gem"
+    def add(*gems)
+      require_relative "cli/add"
+      Add.new(options.dup, gems).run
+    end
+
+    desc "outdated GEM [OPTIONS]", "List installed gems with newer versions available"
+    long_desc <<-D
+      Outdated lists the names and versions of gems that have a newer version available
+      in the given source. Calling outdated with [GEM [GEM]] will only check for newer
+      versions of the given gems. Prerelease gems are ignored by default. If your gems
+      are up to date, Bundler will exit with a status of 0. Otherwise, it will exit 1.
+
+      For more information on patch level options (--major, --minor, --patch,
+      --update-strict) see documentation on the same options on the update command.
+    D
+    method_option "group", :type => :string, :banner => "List gems from a specific group"
+    method_option "groups", :type => :boolean, :banner => "List gems organized by groups"
+    method_option "local", :type => :boolean, :banner =>
+      "Do not attempt to fetch gems remotely and use the gem cache instead"
+    method_option "pre", :type => :boolean, :banner => "Check for newer pre-release gems"
+    method_option "source", :type => :array, :banner => "Check against a specific source"
+    strict_is_update = Bundler.feature_flag.forget_cli_options?
+    method_option "filter-strict", :type => :boolean, :aliases => strict_is_update ? [] : %w[--strict], :banner =>
+      "Only list newer versions allowed by your Gemfile requirements"
+    method_option "update-strict", :type => :boolean, :aliases => strict_is_update ? %w[--strict] : [], :banner =>
+      "Strict conservative resolution, do not allow any gem to be updated past latest --patch | --minor | --major"
+    method_option "minor", :type => :boolean, :banner => "Prefer updating only to next minor version"
+    method_option "major", :type => :boolean, :banner => "Prefer updating to next major version (default)"
+    method_option "patch", :type => :boolean, :banner => "Prefer updating only to next patch version"
+    method_option "filter-major", :type => :boolean, :banner => "Only list major newer versions"
+    method_option "filter-minor", :type => :boolean, :banner => "Only list minor newer versions"
+    method_option "filter-patch", :type => :boolean, :banner => "Only list patch newer versions"
+    method_option "parseable", :aliases => "--porcelain", :type => :boolean, :banner =>
+      "Use minimal formatting for more parseable output"
+    method_option "only-explicit", :type => :boolean, :banner =>
+      "Only list gems specified in your Gemfile, not their dependencies"
+    def outdated(*gems)
+      require_relative "cli/outdated"
+      Outdated.new(options, gems).run
+    end
+
+    desc "fund [OPTIONS]", "Lists information about gems seeking funding assistance"
+    method_option "group", :aliases => "-g", :type => :array, :banner =>
+      "Fetch funding information for a specific group"
+    def fund
+      require_relative "cli/fund"
+      Fund.new(options).run
+    end
+
+    desc "cache [OPTIONS]", "Locks and then caches all of the gems into vendor/cache"
+    method_option "all",  :type => :boolean,
+                          :default => Bundler.feature_flag.cache_all?,
+                          :banner => "Include all sources (including path and git)."
+    method_option "all-platforms", :type => :boolean, :banner => "Include gems for all platforms present in the lockfile, not only the current one"
+    method_option "cache-path", :type => :string, :banner =>
+      "Specify a different cache path than the default (vendor/cache)."
+    method_option "gemfile", :type => :string, :banner => "Use the specified gemfile instead of Gemfile"
+    method_option "no-install", :type => :boolean, :banner => "Don't install the gems, only update the cache."
+    method_option "no-prune", :type => :boolean, :banner => "Don't remove stale gems from the cache."
+    method_option "path", :type => :string, :banner =>
+      "Specify a different path than the system default ($BUNDLE_PATH or $GEM_HOME).#{" Bundler will remember this value for future installs on this machine" unless Bundler.feature_flag.forget_cli_options?}"
+    method_option "quiet", :type => :boolean, :banner => "Only output warnings and errors."
+    method_option "frozen", :type => :boolean, :banner =>
+      "Do not allow the Gemfile.lock to be updated after this bundle cache operation's install"
+    long_desc <<-D
+      The cache command will copy the .gem files for every gem in the bundle into the
+      directory ./vendor/cache. If you then check that directory into your source
+      control repository, others who check out your source will be able to install the
+      bundle without having to download any additional gems.
+    D
+    def cache
+      SharedHelpers.major_deprecation 2,
+        "The `--all` flag is deprecated because it relies on being " \
+        "remembered across bundler invocations, which bundler will no longer " \
+        "do in future versions. Instead please use `bundle config set cache_all true`, " \
+        "and stop using this flag" if ARGV.include?("--all")
+
+      SharedHelpers.major_deprecation 2,
+        "The `--path` flag is deprecated because its semantics are unclear. " \
+        "Use `bundle config cache_path` to configure the path of your cache of gems, " \
+        "and `bundle config path` to configure the path where your gems are installed, " \
+        "and stop using this flag" if ARGV.include?("--path")
+
+      require_relative "cli/cache"
+      Cache.new(options).run
+    end
+
+    map aliases_for("cache")
+
+    desc "exec [OPTIONS]", "Run the command in context of the bundle"
+    method_option :keep_file_descriptors, :type => :boolean, :default => true
+    method_option :gemfile, :type => :string, :required => false
+    long_desc <<-D
+      Exec runs a command, providing it access to the gems in the bundle. While using
+      bundle exec you can require and call the bundled gems as if they were installed
+      into the system wide RubyGems repository.
+    D
+    def exec(*args)
+      if ARGV.include?("--no-keep-file-descriptors")
+        SharedHelpers.major_deprecation(2, "The `--no-keep-file-descriptors` has been deprecated. `bundle exec` no longer mess with your file descriptors. Close them in the exec'd script if you need to")
+      end
+
+      require_relative "cli/exec"
+      Exec.new(options, args).run
+    end
+
+    map aliases_for("exec")
+
+    desc "config NAME [VALUE]", "Retrieve or set a configuration value"
+    long_desc <<-D
+      Retrieves or sets a configuration value. If only one parameter is provided, retrieve the value. If two parameters are provided, replace the
+      existing value with the newly provided one.
+
+      By default, setting a configuration value sets it for all projects
+      on the machine.
+
+      If a global setting is superseded by local configuration, this command
+      will show the current value, as well as any superseded values and
+      where they were specified.
+    D
+    require_relative "cli/config"
+    subcommand "config", Config
+
+    desc "open GEM", "Opens the source directory of the given bundled gem"
+    def open(name)
+      require_relative "cli/open"
+      Open.new(options, name).run
+    end
+
+    unless Bundler.feature_flag.bundler_3_mode?
+      desc "console [GROUP]", "Opens an IRB session with the bundle pre-loaded"
+      def console(group = nil)
+        require_relative "cli/console"
+        Console.new(options, group).run
+      end
+    end
+
+    desc "version", "Prints the bundler's version information"
+    def version
+      cli_help = current_command.name == "cli_help"
+      if cli_help || ARGV.include?("version")
+        build_info = " (#{BuildMetadata.built_at} commit #{BuildMetadata.git_commit_sha})"
+      end
+
+      if !cli_help && Bundler.feature_flag.print_only_version_number?
+        Bundler.ui.info "#{Bundler::VERSION}#{build_info}"
+      else
+        Bundler.ui.info "Bundler version #{Bundler::VERSION}#{build_info}"
+      end
+    end
+
+    map aliases_for("version")
+
+    desc "licenses", "Prints the license of all gems in the bundle"
+    def licenses
+      Bundler.load.specs.sort_by {|s| s.license.to_s }.reverse_each do |s|
+        gem_name = s.name
+        license  = s.license || s.licenses
+
+        if license.empty?
+          Bundler.ui.warn "#{gem_name}: Unknown"
+        else
+          Bundler.ui.info "#{gem_name}: #{license}"
+        end
+      end
+    end
+
+    unless Bundler.feature_flag.bundler_3_mode?
+      desc "viz [OPTIONS]", "Generates a visual dependency graph", :hide => true
+      long_desc <<-D
+        Viz generates a PNG file of the current Gemfile as a dependency graph.
+        Viz requires the ruby-graphviz gem (and its dependencies).
+        The associated gems must also be installed via 'bundle install'.
+      D
+      method_option :file, :type => :string, :default => "gem_graph", :aliases => "-f", :desc => "The name to use for the generated file. see format option"
+      method_option :format, :type => :string, :default => "png", :aliases => "-F", :desc => "This is output format option. Supported format is png, jpg, svg, dot ..."
+      method_option :requirements, :type => :boolean, :default => false, :aliases => "-R", :desc => "Set to show the version of each required dependency."
+      method_option :version, :type => :boolean, :default => false, :aliases => "-v", :desc => "Set to show each gem version."
+      method_option :without, :type => :array, :default => [], :aliases => "-W", :banner => "GROUP[ GROUP...]", :desc => "Exclude gems that are part of the specified named group."
+      def viz
+        SharedHelpers.major_deprecation 2, "The `viz` command has been renamed to `graph` and moved to a plugin. See https://github.com/rubygems/bundler-graph"
+        require_relative "cli/viz"
+        Viz.new(options.dup).run
+      end
+    end
+
+    old_gem = instance_method(:gem)
+
+    desc "gem NAME [OPTIONS]", "Creates a skeleton for creating a rubygem"
+    method_option :exe, :type => :boolean, :default => false, :aliases => ["--bin", "-b"], :desc => "Generate a binary executable for your library."
+    method_option :coc, :type => :boolean, :desc => "Generate a code of conduct file. Set a default with `bundle config set --global gem.coc true`."
+    method_option :edit, :type => :string, :aliases => "-e", :required => false, :banner => "EDITOR",
+                         :lazy_default => [ENV["BUNDLER_EDITOR"], ENV["VISUAL"], ENV["EDITOR"]].find {|e| !e.nil? && !e.empty? },
+                         :desc => "Open generated gemspec in the specified editor (defaults to $EDITOR or $BUNDLER_EDITOR)"
+    method_option :ext, :type => :boolean, :default => false, :desc => "Generate the boilerplate for C extension code"
+    method_option :git, :type => :boolean, :default => true, :desc => "Initialize a git repo inside your library."
+    method_option :mit, :type => :boolean, :desc => "Generate an MIT license file. Set a default with `bundle config set --global gem.mit true`."
+    method_option :rubocop, :type => :boolean, :desc => "Add rubocop to the generated Rakefile and gemspec. Set a default with `bundle config set --global gem.rubocop true`."
+    method_option :changelog, :type => :boolean, :desc => "Generate changelog file. Set a default with `bundle config set --global gem.changelog true`."
+    method_option :test, :type => :string, :lazy_default => Bundler.settings["gem.test"] || "", :aliases => "-t", :banner => "Use the specified test framework for your library",
+                         :desc => "Generate a test directory for your library, either rspec, minitest or test-unit. Set a default with `bundle config set --global gem.test (rspec|minitest|test-unit)`."
+    method_option :ci, :type => :string, :lazy_default => Bundler.settings["gem.ci"] || "",
+                       :desc => "Generate CI configuration, either GitHub Actions, Travis CI, GitLab CI or CircleCI. Set a default with `bundle config set --global gem.ci (github|travis|gitlab|circle)`"
+    method_option :linter, :type => :string, :lazy_default => Bundler.settings["gem.linter"] || "",
+                           :desc => "Add a linter and code formatter, either RuboCop or Standard. Set a default with `bundle config set --global gem.linter (rubocop|standard)`"
+    method_option :github_username, :type => :string, :default => Bundler.settings["gem.github_username"], :banner => "Set your username on GitHub", :desc => "Fill in GitHub username on README so that you don't have to do it manually. Set a default with `bundle config set --global gem.github_username <your_username>`."
+
+    def gem(name)
+    end
+
+    commands["gem"].tap do |gem_command|
+      def gem_command.run(instance, args = [])
+        arity = 1 # name
+
+        require_relative "cli/gem"
+        cmd_args = args + [instance]
+        cmd_args.unshift(instance.options)
+
+        cmd = begin
+          Gem.new(*cmd_args)
+        rescue ArgumentError => e
+          instance.class.handle_argument_error(self, e, args, arity)
+        end
+
+        cmd.run
+      end
+    end
+
+    undef_method(:gem)
+    define_method(:gem, old_gem)
+    private :gem
+
+    def self.source_root
+      File.expand_path(File.join(File.dirname(__FILE__), "templates"))
+    end
+
+    desc "clean [OPTIONS]", "Cleans up unused gems in your bundler directory", :hide => true
+    method_option "dry-run", :type => :boolean, :default => false, :banner =>
+      "Only print out changes, do not clean gems"
+    method_option "force", :type => :boolean, :default => false, :banner =>
+      "Forces clean even if --path is not set"
+    def clean
+      require_relative "cli/clean"
+      Clean.new(options.dup).run
+    end
+
+    desc "platform [OPTIONS]", "Displays platform compatibility information"
+    method_option "ruby", :type => :boolean, :default => false, :banner =>
+      "only display ruby related platform information"
+    def platform
+      require_relative "cli/platform"
+      Platform.new(options).run
+    end
+
+    desc "inject GEM VERSION", "Add the named gem, with version requirements, to the resolved Gemfile", :hide => true
+    method_option "source", :type => :string, :banner =>
+     "Install gem from the given source"
+    method_option "group", :type => :string, :banner =>
+     "Install gem into a bundler group"
+    def inject(name, version)
+      SharedHelpers.major_deprecation 2, "The `inject` command has been replaced by the `add` command"
+      require_relative "cli/inject"
+      Inject.new(options.dup, name, version).run
+    end
+
+    desc "lock", "Creates a lockfile without installing"
+    method_option "update", :type => :array, :lazy_default => true, :banner =>
+      "ignore the existing lockfile, update all gems by default, or update list of given gems"
+    method_option "local", :type => :boolean, :default => false, :banner =>
+      "do not attempt to fetch remote gemspecs and use the local gem cache only"
+    method_option "print", :type => :boolean, :default => false, :banner =>
+      "print the lockfile to STDOUT instead of writing to the file system"
+    method_option "gemfile", :type => :string, :banner =>
+      "Use the specified gemfile instead of Gemfile"
+    method_option "lockfile", :type => :string, :default => nil, :banner =>
+      "the path the lockfile should be written to"
+    method_option "full-index", :type => :boolean, :default => false, :banner =>
+      "Fall back to using the single-file index of all gems"
+    method_option "add-platform", :type => :array, :default => [], :banner =>
+      "Add a new platform to the lockfile"
+    method_option "remove-platform", :type => :array, :default => [], :banner =>
+      "Remove a platform from the lockfile"
+    method_option "patch", :type => :boolean, :banner =>
+      "If updating, prefer updating only to next patch version"
+    method_option "minor", :type => :boolean, :banner =>
+      "If updating, prefer updating only to next minor version"
+    method_option "major", :type => :boolean, :banner =>
+      "If updating, prefer updating to next major version (default)"
+    method_option "strict", :type => :boolean, :banner =>
+      "If updating, do not allow any gem to be updated past latest --patch | --minor | --major"
+    method_option "conservative", :type => :boolean, :banner =>
+      "If updating, use bundle install conservative update behavior and do not allow shared dependencies to be updated"
+    def lock
+      require_relative "cli/lock"
+      Lock.new(options).run
+    end
+
+    desc "env", "Print information about the environment Bundler is running under"
+    def env
+      Env.write($stdout)
+    end
+
+    desc "doctor [OPTIONS]", "Checks the bundle for common problems"
+    long_desc <<-D
+      Doctor scans the OS dependencies of each of the gems requested in the Gemfile. If
+      missing dependencies are detected, Bundler prints them and exits status 1.
+      Otherwise, Bundler prints a success message and exits with a status of 0.
+    D
+    method_option "gemfile", :type => :string, :banner =>
+      "Use the specified gemfile instead of Gemfile"
+    method_option "quiet", :type => :boolean, :banner =>
+        "Only output warnings and errors."
+    def doctor
+      require_relative "cli/doctor"
+      Doctor.new(options).run
+    end
+
+    desc "issue", "Learn how to report an issue in Bundler"
+    def issue
+      require_relative "cli/issue"
+      Issue.new.run
+    end
+
+    desc "pristine [GEMS...]", "Restores installed gems to pristine condition"
+    long_desc <<-D
+      Restores installed gems to pristine condition from files located in the
+      gem cache. Gems installed from a git repository will be issued `git
+      checkout --force`.
+    D
+    def pristine(*gems)
+      require_relative "cli/pristine"
+      Pristine.new(gems).run
+    end
+
+    if Bundler.feature_flag.plugins?
+      require_relative "cli/plugin"
+      desc "plugin", "Manage the bundler plugins"
+      subcommand "plugin", Plugin
+    end
+
+    # Reformat the arguments passed to bundle that include a --help flag
+    # into the corresponding `bundle help #{command}` call
+    def self.reformatted_help_args(args)
+      bundler_commands = (COMMAND_ALIASES.keys + COMMAND_ALIASES.values).flatten
+
+      help_flags = %w[--help -h]
+      exec_commands = ["exec"] + COMMAND_ALIASES["exec"]
+
+      help_used = args.index {|a| help_flags.include? a }
+      exec_used = args.index {|a| exec_commands.include? a }
+
+      command = args.find {|a| bundler_commands.include? a }
+      command = all_aliases[command] if all_aliases[command]
+
+      if exec_used && help_used
+        if exec_used + help_used == 1
+          %w[help exec]
+        else
+          args
+        end
+      elsif help_used
+        args = args.dup
+        args.delete_at(help_used)
+        ["help", command || args].flatten.compact
+      else
+        args
+      end
+    end
+
+    private
+
+    # Automatically invoke `bundle install` and resume if
+    # Bundler.settings[:auto_install] exists. This is set through config cmd
+    # `bundle config set --global auto_install 1`.
+    #
+    # Note that this method `nil`s out the global Definition object, so it
+    # should be called first, before you instantiate anything like an
+    # `Installer` that'll keep a reference to the old one instead.
+    def auto_install
+      return unless Bundler.settings[:auto_install]
+
+      begin
+        Bundler.definition.specs
+      rescue GemNotFound
+        Bundler.ui.info "Automatically installing missing gems."
+        Bundler.reset!
+        invoke :install, []
+        Bundler.reset!
+      end
+    end
+
+    def current_command
+      _, _, config = @_initializer
+      config[:current_command]
+    end
+
+    def print_command
+      return unless Bundler.ui.debug?
+      cmd = current_command
+      command_name = cmd.name
+      return if PARSEABLE_COMMANDS.include?(command_name)
+      command = ["bundle", command_name] + args
+      options_to_print = options.dup
+      options_to_print.delete_if do |k, v|
+        next unless o = cmd.options[k]
+        o.default == v
+      end
+      command << Thor::Options.to_switches(options_to_print.sort_by(&:first)).strip
+      command.reject!(&:empty?)
+      Bundler.ui.info "Running `#{command * " "}` with bundler #{Bundler::VERSION}"
+    end
+
+    def warn_on_outdated_bundler
+      return if Bundler.settings[:disable_version_check]
+
+      command_name = current_command.name
+      return if PARSEABLE_COMMANDS.include?(command_name)
+
+      return unless SharedHelpers.md5_available?
+
+      latest = Fetcher::CompactIndex.
+               new(nil, Source::Rubygems::Remote.new(Bundler::URI("https://rubygems.org")), nil).
+               send(:compact_index_client).
+               instance_variable_get(:@cache).
+               dependencies("bundler").
+               map {|d| Gem::Version.new(d.first) }.
+               max
+      return unless latest
+
+      current = Gem::Version.new(VERSION)
+      return if current >= latest
+      latest_installed = Bundler.rubygems.find_name("bundler").map(&:version).max
+
+      installation = "To install the latest version, run `gem install bundler#{" --pre" if latest.prerelease?}`"
+      if latest_installed && latest_installed > current
+        suggestion = "To update to the most recent installed version (#{latest_installed}), run `bundle update --bundler`"
+        suggestion = "#{installation}\n#{suggestion}" if latest_installed < latest
+      else
+        suggestion = installation
+      end
+
+      Bundler.ui.warn "The latest bundler is #{latest}, but you are currently running #{current}.\n#{suggestion}"
+    rescue RuntimeError
+      nil
+    end
+
+    def remembered_negative_flag_deprecation(name)
+      positive_name = name.gsub(/\Ano-/, "")
+      option = current_command.options[positive_name]
+      flag_name = "--no-" + option.switch_name.gsub(/\A--/, "")
+
+      flag_deprecation(positive_name, flag_name, option)
+    end
+
+    def remembered_flag_deprecation(name)
+      option = current_command.options[name]
+      flag_name = option.switch_name
+
+      flag_deprecation(name, flag_name, option)
+    end
+
+    def flag_deprecation(name, flag_name, option)
+      name_index = ARGV.find {|arg| flag_name == arg.split("=")[0] }
+      return unless name_index
+
+      value = options[name]
+      value = value.join(" ").to_s if option.type == :array
+
+      Bundler::SharedHelpers.major_deprecation 2,
+        "The `#{flag_name}` flag is deprecated because it relies on being " \
+        "remembered across bundler invocations, which bundler will no longer " \
+        "do in future versions. Instead please use `bundle config set --local #{name.tr("-", "_")} " \
+        "'#{value}'`, and stop using this flag"
+    end
+  end
+end
diff --git a/lib/bundler/cli/add.rb b/lib/bundler/cli/add.rb
new file mode 100644
index 0000000000..5bcf30d82d
--- /dev/null
+++ b/lib/bundler/cli/add.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Bundler
+  class CLI::Add
+    attr_reader :gems, :options, :version
+
+    def initialize(options, gems)
+      @gems = gems
+      @options = options
+      @options[:group] = options[:group].split(",").map(&:strip) unless options[:group].nil?
+      @version = options[:version].split(",").map(&:strip) unless options[:version].nil?
+    end
+
+    def run
+      validate_options!
+      inject_dependencies
+      perform_bundle_install unless options["skip-install"]
+    end
+
+    private
+
+    def perform_bundle_install
+      Installer.install(Bundler.root, Bundler.definition)
+      Bundler.load.cache if Bundler.app_cache.exist?
+    end
+
+    def inject_dependencies
+      dependencies = gems.map {|g| Bundler::Dependency.new(g, version, options) }
+
+      Injector.inject(dependencies,
+        :conservative_versioning => options[:version].nil?, # Perform conservative versioning only when version is not specified
+        :optimistic => options[:optimistic],
+        :strict => options[:strict])
+    end
+
+    def validate_options!
+      raise InvalidOption, "You can not specify `--strict` and `--optimistic` at the same time." if options[:strict] && options[:optimistic]
+
+      # raise error when no gems are specified
+      raise InvalidOption, "Please specify gems to add." if gems.empty?
+
+      version.to_a.each do |v|
+        raise InvalidOption, "Invalid gem requirement pattern '#{v}'" unless Gem::Requirement::PATTERN =~ v.to_s
+      end
+    end
+  end
+end
diff --git a/lib/bundler/cli/binstubs.rb b/lib/bundler/cli/binstubs.rb
new file mode 100644
index 0000000000..639c01ff39
--- /dev/null
+++ b/lib/bundler/cli/binstubs.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module Bundler
+  class CLI::Binstubs
+    attr_reader :options, :gems
+    def initialize(options, gems)
+      @options = options
+      @gems = gems
+    end
+
+    def run
+      Bundler.definition.validate_runtime!
+      path_option = options["path"]
+      path_option = nil if path_option && path_option.empty?
+      Bundler.settings.set_command_option :bin, path_option if options["path"]
+      Bundler.settings.set_command_option_if_given :shebang, options["shebang"]
+      installer = Installer.new(Bundler.root, Bundler.definition)
+
+      installer_opts = {
+        :force => options[:force],
+        :binstubs_cmd => true,
+        :all_platforms => options["all-platforms"],
+      }
+
+      if options[:all]
+        raise InvalidOption, "Cannot specify --all with specific gems" unless gems.empty?
+        @gems = Bundler.definition.specs.map(&:name)
+        installer_opts.delete(:binstubs_cmd)
+      elsif gems.empty?
+        Bundler.ui.error "`bundle binstubs` needs at least one gem to run."
+        exit 1
+      end
+
+      gems.each do |gem_name|
+        spec = Bundler.definition.specs.find {|s| s.name == gem_name }
+        unless spec
+          raise GemNotFound, Bundler::CLI::Common.gem_not_found_message(
+            gem_name, Bundler.definition.specs
+          )
+        end
+
+        if options[:standalone]
+          next Bundler.ui.warn("Sorry, Bundler can only be run via RubyGems.") if gem_name == "bundler"
+          Bundler.settings.temporary(:path => (Bundler.settings[:path] || Bundler.root)) do
+            installer.generate_standalone_bundler_executable_stubs(spec, installer_opts)
+          end
+        else
+          installer.generate_bundler_executable_stubs(spec, installer_opts)
+        end
+      end
+    end
+  end
+end
diff --git a/lib/bundler/cli/cache.rb b/lib/bundler/cli/cache.rb
new file mode 100644
index 0000000000..c8698ed7e3
--- /dev/null
+++ b/lib/bundler/cli/cache.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Bundler
+  class CLI::Cache
+    attr_reader :options
+
+    def initialize(options)
+      @options = options
+    end
+
+    def run
+      Bundler.ui.level = "warn" if options[:quiet]
+      Bundler.settings.set_command_option_if_given :path, options[:path]
+      Bundler.settings.set_command_option_if_given :cache_path, options["cache-path"]
+
+      setup_cache_all
+      install
+
+      # TODO: move cache contents here now that all bundles are locked
+      custom_path = Bundler.settings[:path] if options[:path]
+
+      Bundler.settings.temporary(:cache_all_platforms => options["all-platforms"]) do
+        Bundler.load.cache(custom_path)
+      end
+    end
+
+    private
+
+    def install
+      require_relative "install"
+      options = self.options.dup
+      options["local"] = false if Bundler.settings[:cache_all_platforms]
+      options["no-cache"] = true
+      Bundler::CLI::Install.new(options).run
+    end
+
+    def setup_cache_all
+      all = options.fetch(:all, Bundler.feature_flag.cache_all? || nil)
+
+      Bundler.settings.set_command_option_if_given :cache_all, all
+    end
+  end
+end
diff --git a/lib/bundler/cli/check.rb b/lib/bundler/cli/check.rb
new file mode 100644
index 0000000000..65c51337d2
--- /dev/null
+++ b/lib/bundler/cli/check.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Bundler
+  class CLI::Check
+    attr_reader :options
+
+    def initialize(options)
+      @options = options
+    end
+
+    def run
+      Bundler.settings.set_command_option_if_given :path, options[:path]
+
+      definition = Bundler.definition
+      definition.validate_runtime!
+
+      begin
+        definition.resolve_only_locally!
+        not_installed = definition.missing_specs
+      rescue GemNotFound, VersionConflict
+        Bundler.ui.error "Bundler can't satisfy your Gemfile's dependencies."
+        Bundler.ui.warn "Install missing gems with `bundle install`."
+        exit 1
+      end
+
+      if not_installed.any?
+        Bundler.ui.error "The following gems are missing"
+        not_installed.each {|s| Bundler.ui.error " * #{s.name} (#{s.version})" }
+        Bundler.ui.warn "Install missing gems with `bundle install`"
+        exit 1
+      elsif !Bundler.default_lockfile.file? && Bundler.frozen_bundle?
+        Bundler.ui.error "This bundle has been frozen, but there is no #{Bundler.default_lockfile.relative_path_from(SharedHelpers.pwd)} present"
+        exit 1
+      else
+        Bundler.load.lock(:preserve_unknown_sections => true) unless options[:"dry-run"]
+        Bundler.ui.info "The Gemfile's dependencies are satisfied"
+      end
+    end
+  end
+end
diff --git a/lib/bundler/cli/clean.rb b/lib/bundler/cli/clean.rb
new file mode 100644
index 0000000000..c6b0968e3e
--- /dev/null
+++ b/lib/bundler/cli/clean.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Bundler
+  class CLI::Clean
+    attr_reader :options
+
+    def initialize(options)
+      @options = options
+    end
+
+    def run
+      require_path_or_force unless options[:"dry-run"]
+      Bundler.load.clean(options[:"dry-run"])
+    end
+
+    protected
+
+    def require_path_or_force
+      return unless Bundler.use_system_gems? && !options[:force]
+      raise InvalidOption, "Cleaning all the gems on your system is dangerous! " \
+        "If you're sure you want to remove every system gem not in this " \
+        "bundle, run `bundle clean --force`."
+    end
+  end
+end
diff --git a/lib/bundler/cli/common.rb b/lib/bundler/cli/common.rb
new file mode 100644
index 0000000000..ba259143b7
--- /dev/null
+++ b/lib/bundler/cli/common.rb
@@ -0,0 +1,128 @@
+# frozen_string_literal: true
+
+module Bundler
+  module CLI::Common
+    def self.output_post_install_messages(messages)
+      return if Bundler.settings["ignore_messages"]
+      messages.to_a.each do |name, msg|
+        print_post_install_message(name, msg) unless Bundler.settings["ignore_messages.#{name}"]
+      end
+    end
+
+    def self.print_post_install_message(name, msg)
+      Bundler.ui.confirm "Post-install message from #{name}:"
+      Bundler.ui.info msg
+    end
+
+    def self.output_fund_metadata_summary
+      definition = Bundler.definition
+      current_dependencies = definition.requested_dependencies
+      current_specs = definition.specs
+
+      count = current_dependencies.count {|dep| current_specs[dep.name].first.metadata.key?("funding_uri") }
+
+      return if count.zero?
+
+      intro = count > 1 ? "#{count} installed gems you directly depend on are" : "#{count} installed gem you directly depend on is"
+      message = "#{intro} looking for funding.\n  Run `bundle fund` for details"
+      Bundler.ui.info message
+    end
+
+    def self.output_without_groups_message(command)
+      return if Bundler.settings[:without].empty?
+      Bundler.ui.confirm without_groups_message(command)
+    end
+
+    def self.without_groups_message(command)
+      command_in_past_tense = command == :install ? "installed" : "updated"
+      groups = Bundler.settings[:without]
+      "Gems in the #{verbalize_groups(groups)} were not #{command_in_past_tense}."
+    end
+
+    def self.verbalize_groups(groups)
+      groups.map!{|g| "'#{g}'" }
+      group_list = [groups[0...-1].join(", "), groups[-1..-1]].
+        reject {|s| s.to_s.empty? }.join(" and ")
+      group_str = groups.size == 1 ? "group" : "groups"
+      "#{group_str} #{group_list}"
+    end
+
+    def self.select_spec(name, regex_match = nil)
+      specs = []
+      regexp = Regexp.new(name) if regex_match
+
+      Bundler.definition.specs.each do |spec|
+        return spec if spec.name == name
+        specs << spec if regexp && spec.name =~ regexp
+      end
+
+      case specs.count
+      when 0
+        dep_in_other_group = Bundler.definition.current_dependencies.find {|dep|dep.name == name }
+
+        if dep_in_other_group
+          raise GemNotFound, "Could not find gem '#{name}', because it's in the #{verbalize_groups(dep_in_other_group.groups)}, configured to be ignored."
+        else
+          raise GemNotFound, gem_not_found_message(name, Bundler.definition.dependencies)
+        end
+      when 1
+        specs.first
+      else
+        ask_for_spec_from(specs)
+      end
+    rescue RegexpError
+      raise GemNotFound, gem_not_found_message(name, Bundler.definition.dependencies)
+    end
+
+    def self.ask_for_spec_from(specs)
+      specs.each_with_index do |spec, index|
+        Bundler.ui.info "#{index.succ} : #{spec.name}", true
+      end
+      Bundler.ui.info "0 : - exit -", true
+
+      num = Bundler.ui.ask("> ").to_i
+      num > 0 ? specs[num - 1] : nil
+    end
+
+    def self.gem_not_found_message(missing_gem_name, alternatives)
+      require_relative "../similarity_detector"
+      message = "Could not find gem '#{missing_gem_name}'."
+      alternate_names = alternatives.map {|a| a.respond_to?(:name) ? a.name : a }
+      suggestions = SimilarityDetector.new(alternate_names).similar_word_list(missing_gem_name)
+      message += "\nDid you mean #{suggestions}?" if suggestions
+      message
+    end
+
+    def self.ensure_all_gems_in_lockfile!(names, locked_gems = Bundler.locked_gems)
+      return unless locked_gems
+
+      locked_names = locked_gems.specs.map(&:name).uniq
+      names.-(locked_names).each do |g|
+        raise GemNotFound, gem_not_found_message(g, locked_names)
+      end
+    end
+
+    def self.configure_gem_version_promoter(definition, options)
+      patch_level = patch_level_options(options)
+      patch_level << :patch if patch_level.empty? && Bundler.settings[:prefer_patch]
+      raise InvalidOption, "Provide only one of the following options: #{patch_level.join(", ")}" unless patch_level.length <= 1
+
+      definition.gem_version_promoter.tap do |gvp|
+        gvp.level = patch_level.first || :major
+        gvp.strict = options[:strict] || options["update-strict"] || options["filter-strict"]
+      end
+    end
+
+    def self.patch_level_options(options)
+      [:major, :minor, :patch].select {|v| options.keys.include?(v.to_s) }
+    end
+
+    def self.clean_after_install?
+      clean = Bundler.settings[:clean]
+      return clean unless clean.nil?
+      clean ||= Bundler.feature_flag.auto_clean_without_path? && Bundler.settings[:path].nil?
+      clean &&= !Bundler.use_system_gems?
+      clean
+    end
+  end
+end
diff --git a/lib/bundler/cli/config.rb b/lib/bundler/cli/config.rb
new file mode 100644
index 0000000000..8d2aba0916
--- /dev/null
+++ b/lib/bundler/cli/config.rb
@@ -0,0 +1,194 @@
+# frozen_string_literal: true
+
+module Bundler
+  class CLI::Config < Thor
+    class_option :parseable, :type => :boolean, :banner => "Use minimal formatting for more parseable output"
+
+    def self.scope_options
+      method_option :global, :type => :boolean, :banner => "Only change the global config"
+      method_option :local, :type => :boolean, :banner => "Only change the local config"
+    end
+    private_class_method :scope_options
+
+    desc "base NAME [VALUE]", "The Bundler 1 config interface", :hide => true
+    scope_options
+    method_option :delete, :type => :boolean, :banner => "delete"
+    def base(name = nil, *value)
+      new_args =
+        if ARGV.size == 1
+          ["config", "list"]
+        elsif ARGV.include?("--delete")
+          ARGV.map {|arg| arg == "--delete" ? "unset" : arg }
+        elsif ARGV.include?("--global") || ARGV.include?("--local") || ARGV.size == 3
+          ["config", "set", *ARGV[1..-1]]
+        else
+          ["config", "get", ARGV[1]]
+        end
+
+      SharedHelpers.major_deprecation 3,
+        "Using the `config` command without a subcommand [list, get, set, unset] is deprecated and will be removed in the future. Use `bundle #{new_args.join(" ")}` instead."
+
+      Base.new(options, name, value, self).run
+    end
+
+    desc "list", "List out all configured settings"
+    def list
+      Base.new(options, nil, nil, self).run
+    end
+
+    desc "get NAME", "Returns the value for the given key"
+    def get(name)
+      Base.new(options, name, nil, self).run
+    end
+
+    desc "set NAME VALUE", "Sets the given value for the given key"
+    scope_options
+    def set(name, value, *value_)
+      Base.new(options, name, value_.unshift(value), self).run
+    end
+
+    desc "unset NAME", "Unsets the value for the given key"
+    scope_options
+    def unset(name)
+      options[:delete] = true
+      Base.new(options, name, nil, self).run
+    end
+
+    default_task :base
+
+    class Base
+      attr_reader :name, :value, :options, :scope, :thor
+
+      def initialize(options, name, value, thor)
+        @options = options
+        @name = name
+        value = Array(value)
+        @value = value.empty? ? nil : value.join(" ")
+        @thor = thor
+        validate_scope!
+      end
+
+      def run
+        unless name
+          warn_unused_scope "Ignoring --#{scope}"
+          confirm_all
+          return
+        end
+
+        if options[:delete]
+          if !explicit_scope? || scope != "global"
+            Bundler.settings.set_local(name, nil)
+          end
+          if !explicit_scope? || scope != "local"
+            Bundler.settings.set_global(name, nil)
+          end
+          return
+        end
+
+        if value.nil?
+          warn_unused_scope "Ignoring --#{scope} since no value to set was given"
+
+          if options[:parseable]
+            if value = Bundler.settings[name]
+              Bundler.ui.info("#{name}=#{value}")
+            end
+            return
+          end
+
+          confirm(name)
+          return
+        end
+
+        Bundler.ui.info(message) if message
+        Bundler.settings.send("set_#{scope}", name, new_value)
+      end
+
+      def confirm_all
+        if @options[:parseable]
+          thor.with_padding do
+            Bundler.settings.all.each do |setting|
+              val = Bundler.settings[setting]
+              Bundler.ui.info "#{setting}=#{val}"
+            end
+          end
+        else
+          Bundler.ui.confirm "Settings are listed in order of priority. The top value will be used.\n"
+          Bundler.settings.all.each do |setting|
+            Bundler.ui.confirm setting
+            show_pretty_values_for(setting)
+            Bundler.ui.confirm ""
+          end
+        end
+      end
+
+      def confirm(name)
+        Bundler.ui.confirm "Settings for `#{name}` in order of priority. The top value will be used"
+        show_pretty_values_for(name)
+      end
+
+      def new_value
+        pathname = Pathname.new(value)
+        if name.start_with?("local.") && pathname.directory?
+          pathname.expand_path.to_s
+        else
+          value
+        end
+      end
+
+      def message
+        locations = Bundler.settings.locations(name)
+        if @options[:parseable]
+          "#{name}=#{new_value}" if new_value
+        elsif scope == "global"
+          if !locations[:local].nil?
+            "Your application has set #{name} to #{locations[:local].inspect}. " \
+              "This will override the global value you are currently setting"
+          elsif locations[:env]
+            "You have a bundler environment variable for #{name} set to " \
+              "#{locations[:env].inspect}. This will take precedence over the global value you are setting"
+          elsif !locations[:global].nil? && locations[:global] != value
+            "You are replacing the current global value of #{name}, which is currently " \
+              "#{locations[:global].inspect}"
+          end
+        elsif scope == "local" && !locations[:local].nil? && locations[:local] != value
+          "You are replacing the current local value of #{name}, which is currently " \
+            "#{locations[:local].inspect}"
+        end
+      end
+
+      def show_pretty_values_for(setting)
+        thor.with_padding do
+          Bundler.settings.pretty_values_for(setting).each do |line|
+            Bundler.ui.info line
+          end
+        end
+      end
+
+      def explicit_scope?
+        @explicit_scope
+      end
+
+      def warn_unused_scope(msg)
+        return unless explicit_scope?
+        return if options[:parseable]
+
+        Bundler.ui.warn(msg)
+      end
+
+      def validate_scope!
+        @explicit_scope = true
+        scopes = %w[global local].select {|s| options[s] }
+        case scopes.size
+        when 0
+          @scope = "global"
+          @explicit_scope = false
+        when 1
+          @scope = scopes.first
+        else
+          raise InvalidOption,
+            "The options #{scopes.join " and "} were specified. Please only use one of the switches at a time."
+        end
+      end
+    end
+  end
+end
diff --git a/lib/bundler/cli/console.rb b/lib/bundler/cli/console.rb
new file mode 100644
index 0000000000..97b8dc0663
--- /dev/null
+++ b/lib/bundler/cli/console.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Bundler
+  class CLI::Console
+    attr_reader :options, :group
+    def initialize(options, group)
+      @options = options
+      @group = group
+    end
+
+    def run
+      Bundler::SharedHelpers.major_deprecation 2, "bundle console will be replaced " \
+                           "by `bin/console` generated by `bundle gem <name>`"
+
+      group ? Bundler.require(:default, *group.split(" ").map!(&:to_sym)) : Bundler.require
+      ARGV.clear
+
+      console = get_console(Bundler.settings[:console] || "irb")
+      console.start
+    end
+
+    def get_console(name)
+      require name
+      get_constant(name)
+    rescue LoadError
+      Bundler.ui.error "Couldn't load console #{name}, falling back to irb"
+      require "irb"
+      get_constant("irb")
+    end
+
+    def get_constant(name)
+      const_name = {
+        "pry"  => :Pry,
+        "ripl" => :Ripl,
+        "irb"  => :IRB,
+      }[name]
+      Object.const_get(const_name)
+    rescue NameError
+      Bundler.ui.error "Could not find constant #{const_name}"
+      exit 1
+    end
+  end
+end
diff --git a/lib/bundler/cli/doctor.rb b/lib/bundler/cli/doctor.rb
new file mode 100644
index 0000000000..43f1ca92e2
--- /dev/null
+++ b/lib/bundler/cli/doctor.rb
@@ -0,0 +1,151 @@
+# frozen_string_literal: true
+
+require "rbconfig"
+require "shellwords"
+
+module Bundler
+  class CLI::Doctor
+    DARWIN_REGEX = /\s+(.+) \(compatibility /.freeze
+    LDD_REGEX = /\t\S+ => (\S+) \(\S+\)/.freeze
+
+    attr_reader :options
+
+    def initialize(options)
+      @options = options
+    end
+
+    def otool_available?
+      Bundler.which("otool")
+    end
+
+    def ldd_available?
+      Bundler.which("ldd")
+    end
+
+    def dylibs_darwin(path)
+      output = `/usr/bin/otool -L #{path.shellescape}`.chomp
+      dylibs = output.split("\n")[1..-1].map {|l| l.match(DARWIN_REGEX).captures[0] }.uniq
+      # ignore @rpath and friends
+      dylibs.reject {|dylib| dylib.start_with? "@" }
+    end
+
+    def dylibs_ldd(path)
+      output = `/usr/bin/ldd #{path.shellescape}`.chomp
+      output.split("\n").map do |l|
+        match = l.match(LDD_REGEX)
+        next if match.nil?
+        match.captures[0]
+      end.compact
+    end
+
+    def dylibs(path)
+      case RbConfig::CONFIG["host_os"]
+      when /darwin/
+        return [] unless otool_available?
+        dylibs_darwin(path)
+      when /(linux|solaris|bsd)/
+        return [] unless ldd_available?
+        dylibs_ldd(path)
+      else # Windows, etc.
+        Bundler.ui.warn("Dynamic library check not supported on this platform.")
+        []
+      end
+    end
+
+    def bundles_for_gem(spec)
+      Dir.glob("#{spec.full_gem_path}/**/*.bundle")
+    end
+
+    def check!
+      require_relative "check"
+      Bundler::CLI::Check.new({}).run
+    end
+
+    def run
+      Bundler.ui.level = "warn" if options[:quiet]
+      Bundler.settings.validate!
+      check!
+
+      definition = Bundler.definition
+      broken_links = {}
+
+      definition.specs.each do |spec|
+        bundles_for_gem(spec).each do |bundle|
+          bad_paths = dylibs(bundle).select {|f| !File.exist?(f) }
+          if bad_paths.any?
+            broken_links[spec] ||= []
+            broken_links[spec].concat(bad_paths)
+          end
+        end
+      end
+
+      permissions_valid = check_home_permissions
+
+      if broken_links.any?
+        message = "The following gems are missing OS dependencies:"
+        broken_links.map do |spec, paths|
+          paths.uniq.map do |path|
+            "\n * #{spec.name}: #{path}"
+          end
+        end.flatten.sort.each {|m| message += m }
+        raise ProductionError, message
+      elsif !permissions_valid
+        Bundler.ui.info "No issues found with the installed bundle"
+      end
+    end
+
+    private
+
+    def check_home_permissions
+      require "find"
+      files_not_readable_or_writable = []
+      files_not_rw_and_owned_by_different_user = []
+      files_not_owned_by_current_user_but_still_rw = []
+      broken_symlinks = []
+      Find.find(Bundler.bundle_path.to_s).each do |f|
+        if !File.exist?(f)
+          broken_symlinks << f
+        elsif !File.writable?(f) || !File.readable?(f)
+          if File.stat(f).uid != Process.uid
+            files_not_rw_and_owned_by_different_user << f
+          else
+            files_not_readable_or_writable << f
+          end
+        elsif File.stat(f).uid != Process.uid
+          files_not_owned_by_current_user_but_still_rw << f
+        end
+      end
+
+      ok = true
+
+      if broken_symlinks.any?
+        Bundler.ui.warn "Broken links exist in the Bundler home. Please report them to the offending gem's upstream repo. These files are:\n - #{broken_symlinks.join("\n - ")}"
+
+        ok = false
+      end
+
+      if files_not_owned_by_current_user_but_still_rw.any?
+        Bundler.ui.warn "Files exist in the Bundler home that are owned by another " \
+          "user, but are still readable/writable. These files are:\n - #{files_not_owned_by_current_user_but_still_rw.join("\n - ")}"
+
+        ok = false
+      end
+
+      if files_not_rw_and_owned_by_different_user.any?
+        Bundler.ui.warn "Files exist in the Bundler home that are owned by another " \
+          "user, and are not readable/writable. These files are:\n - #{files_not_rw_and_owned_by_different_user.join("\n - ")}"
+
+        ok = false
+      end
+
+      if files_not_readable_or_writable.any?
+        Bundler.ui.warn "Files exist in the Bundler home that are not " \
+          "readable/writable by the current user. These files are:\n - #{files_not_readable_or_writable.join("\n - ")}"
+
+        ok = false
+      end
+
+      ok
+    end
+  end
+end
diff --git a/lib/bundler/cli/exec.rb b/lib/bundler/cli/exec.rb
new file mode 100644
index 0000000000..42b602a055
--- /dev/null
+++ b/lib/bundler/cli/exec.rb
@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+require_relative "../current_ruby"
+
+module Bundler
+  class CLI::Exec
+    attr_reader :options, :args, :cmd
+
+    TRAPPED_SIGNALS = %w[INT].freeze
+
+    def initialize(options, args)
+      @options = options
+      @cmd = args.shift
+      @args = args
+      @args << { :close_others => !options.keep_file_descriptors? } unless Bundler.current_ruby.jruby?
+    end
+
+    def run
+      validate_cmd!
+      SharedHelpers.set_bundle_environment
+      if bin_path = Bundler.which(cmd)
+        if !Bundler.settings[:disable_exec_load] && ruby_shebang?(bin_path)
+          return kernel_load(bin_path, *args)
+        end
+        kernel_exec(bin_path, *args)
+      else
+        # exec using the given command
+        kernel_exec(cmd, *args)
+      end
+    end
+
+    private
+
+    def validate_cmd!
+      return unless cmd.nil?
+      Bundler.ui.error "bundler: exec needs a command to run"
+      exit 128
+    end
+
+    def kernel_exec(*args)
+      Kernel.exec(*args)
+    rescue Errno::EACCES, Errno::ENOEXEC
+      Bundler.ui.error "bundler: not executable: #{cmd}"
+      exit 126
+    rescue Errno::ENOENT
+      Bundler.ui.error "bundler: command not found: #{cmd}"
+      Bundler.ui.warn "Install missing gem executables with `bundle install`"
+      exit 127
+    end
+
+    def kernel_load(file, *args)
+      args.pop if args.last.is_a?(Hash)
+      ARGV.replace(args)
+      $0 = file
+      Process.setproctitle(process_title(file, args)) if Process.respond_to?(:setproctitle)
+      require_relative "../setup"
+      TRAPPED_SIGNALS.each {|s| trap(s, "DEFAULT") }
+      Kernel.load(file)
+    rescue SystemExit, SignalException
+      raise
+    rescue Exception # rubocop:disable Lint/RescueException
+      Bundler.ui.error "bundler: failed to load command: #{cmd} (#{file})"
+      Bundler::FriendlyErrors.disable!
+      raise
+    end
+
+    def process_title(file, args)
+      "#{file} #{args.join(" ")}".strip
+    end
+
+    def ruby_shebang?(file)
+      possibilities = [
+        "#!/usr/bin/env ruby\n",
+        "#!/usr/bin/env jruby\n",
+        "#!/usr/bin/env truffleruby\n",
+        "#!#{Gem.ruby}\n",
+      ]
+
+      if File.zero?(file)
+        Bundler.ui.warn "#{file} is empty"
+        return false
+      end
+
+      first_line = File.open(file, "rb") {|f| f.read(possibilities.map(&:size).max) }
+      possibilities.any? {|shebang| first_line.start_with?(shebang) }
+    end
+  end
+end
diff --git a/lib/bundler/cli/fund.rb b/lib/bundler/cli/fund.rb
new file mode 100644
index 0000000000..52db5aef68
--- /dev/null
+++ b/lib/bundler/cli/fund.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Bundler
+  class CLI::Fund
+    attr_reader :options
+
+    def initialize(options)
+      @options = options
+    end
+
+    def run
+      Bundler.definition.validate_runtime!
+
+      groups = Array(options[:group]).map(&:to_sym)
+
+      deps = if groups.any?
+        Bundler.definition.dependencies_for(groups)
+      else
+        Bundler.definition.current_dependencies
+      end
+
+      fund_info = deps.each_with_object([]) do |dep, arr|
+        spec = Bundler.definition.specs[dep.name].first
+        if spec.metadata.key?("funding_uri")
+          arr << "* #{spec.name} (#{spec.version})\n  Funding: #{spec.metadata["funding_uri"]}"
+        end
+      end
+
+      if fund_info.empty?
+        Bundler.ui.info "None of the installed gems you directly depend on are looking for funding."
+      else
+        Bundler.ui.info fund_info.join("\n")
+      end
+    end
+  end
+end
diff --git a/lib/bundler/cli/gem.rb b/lib/bundler/cli/gem.rb
new file mode 100644
index 0000000000..2a74325fde
--- /dev/null
+++ b/lib/bundler/cli/gem.rb
@@ -0,0 +1,433 @@
+# frozen_string_literal: true
+
+require "pathname"
+
+module Bundler
+  class CLI
+    Bundler.require_thor_actions
+    include Thor::Actions
+  end
+
+  class CLI::Gem
+    TEST_FRAMEWORK_VERSIONS = {
+      "rspec" => "3.0",
+      "minitest" => "5.0",
+      "test-unit" => "3.0",
+    }.freeze
+
+    attr_reader :options, :gem_name, :thor, :name, :target
+
+    def initialize(options, gem_name, thor)
+      @options = options
+      @gem_name = resolve_name(gem_name)
+
+      @thor = thor
+      thor.behavior = :invoke
+      thor.destination_root = nil
+
+      @name = @gem_name
+      @target = SharedHelpers.pwd.join(gem_name)
+
+      validate_ext_name if options[:ext]
+    end
+
+    def run
+      Bundler.ui.confirm "Creating gem '#{name}'..."
+
+      underscored_name = name.tr("-", "_")
+      namespaced_path = name.tr("-", "/")
+      constant_name = name.gsub(/-[_-]*(?![_-]|$)/) { "::" }.gsub(/([_-]+|(::)|^)(.|$)/) { $2.to_s + $3.upcase }
+      constant_array = constant_name.split("::")
+
+      use_git = Bundler.git_present? && options[:git]
+
+      git_author_name = use_git ? `git config user.name`.chomp : ""
+      git_username = use_git ? `git config github.user`.chomp : ""
+      git_user_email = use_git ? `git config user.email`.chomp : ""
+
+      github_username = if options[:github_username].nil?
+        git_username
+      elsif options[:github_username] == false
+        ""
+      else
+        options[:github_username]
+      end
+
+      config = {
+        :name             => name,
+        :underscored_name => underscored_name,
+        :namespaced_path  => namespaced_path,
+        :makefile_path    => "#{underscored_name}/#{underscored_name}",
+        :constant_name    => constant_name,
+        :constant_array   => constant_array,
+        :author           => git_author_name.empty? ? "TODO: Write your name" : git_author_name,
+        :email            => git_user_email.empty? ? "TODO: Write your email address" : git_user_email,
+        :test             => options[:test],
+        :ext              => options[:ext],
+        :exe              => options[:exe],
+        :bundler_version  => bundler_dependency_version,
+        :git              => use_git,
+        :github_username  => github_username.empty? ? "[USERNAME]" : github_username,
+        :required_ruby_version => required_ruby_version,
+      }
+      ensure_safe_gem_name(name, constant_array)
+
+      templates = {
+        "#{Bundler.preferred_gemfile_name}.tt" => Bundler.preferred_gemfile_name,
+        "lib/newgem.rb.tt" => "lib/#{namespaced_path}.rb",
+        "lib/newgem/version.rb.tt" => "lib/#{namespaced_path}/version.rb",
+        "sig/newgem.rbs.tt" => "sig/#{namespaced_path}.rbs",
+        "newgem.gemspec.tt" => "#{name}.gemspec",
+        "Rakefile.tt" => "Rakefile",
+        "README.md.tt" => "README.md",
+        "bin/console.tt" => "bin/console",
+        "bin/setup.tt" => "bin/setup",
+      }
+
+      executables = %w[
+        bin/console
+        bin/setup
+      ]
+
+      templates.merge!("gitignore.tt" => ".gitignore") if use_git
+
+      if test_framework = ask_and_set_test_framework
+        config[:test] = test_framework
+        config[:test_framework_version] = TEST_FRAMEWORK_VERSIONS[test_framework]
+
+        case test_framework
+        when "rspec"
+          templates.merge!(
+            "rspec.tt" => ".rspec",
+            "spec/spec_helper.rb.tt" => "spec/spec_helper.rb",
+            "spec/newgem_spec.rb.tt" => "spec/#{namespaced_path}_spec.rb"
+          )
+          config[:test_task] = :spec
+        when "minitest"
+          templates.merge!(
+            "test/minitest/test_helper.rb.tt" => "test/test_helper.rb",
+            "test/minitest/newgem_test.rb.tt" => "test/#{namespaced_path}_test.rb"
+          )
+          config[:test_task] = :test
+        when "test-unit"
+          templates.merge!(
+            "test/test-unit/test_helper.rb.tt" => "test/test_helper.rb",
+            "test/test-unit/newgem_test.rb.tt" => "test/#{namespaced_path}_test.rb"
+          )
+          config[:test_task] = :test
+        end
+      end
+
+      config[:ci] = ask_and_set_ci
+      case config[:ci]
+      when "github"
+        templates.merge!("github/workflows/main.yml.tt" => ".github/workflows/main.yml")
+      when "travis"
+        templates.merge!("travis.yml.tt" => ".travis.yml")
+      when "gitlab"
+        templates.merge!("gitlab-ci.yml.tt" => ".gitlab-ci.yml")
+      when "circle"
+        templates.merge!("circleci/config.yml.tt" => ".circleci/config.yml")
+      end
+
+      if ask_and_set(:mit, "Do you want to license your code permissively under the MIT license?",
+        "This means that any other developer or company will be legally allowed to use your code " \
+        "for free as long as they admit you created it. You can read more about the MIT license " \
+        "at https://choosealicense.com/licenses/mit.")
+        config[:mit] = true
+        Bundler.ui.info "MIT License enabled in config"
+        templates.merge!("LICENSE.txt.tt" => "LICENSE.txt")
+      end
+
+      if ask_and_set(:coc, "Do you want to include a code of conduct in gems you generate?",
+        "Codes of conduct can increase contributions to your project by contributors who " \
+        "prefer collaborative, safe spaces. You can read more about the code of conduct at " \
+        "contributor-covenant.org. Having a code of conduct means agreeing to the responsibility " \
+        "of enforcing it, so be sure that you are prepared to do that. Be sure that your email " \
+        "address is specified as a contact in the generated code of conduct so that people know " \
+        "who to contact in case of a violation. For suggestions about " \
+        "how to enforce codes of conduct, see https://bit.ly/coc-enforcement.")
+        config[:coc] = true
+        Bundler.ui.info "Code of conduct enabled in config"
+        templates.merge!("CODE_OF_CONDUCT.md.tt" => "CODE_OF_CONDUCT.md")
+      end
+
+      if ask_and_set(:changelog, "Do you want to include a changelog?",
+        "A changelog is a file which contains a curated, chronologically ordered list of notable " \
+        "changes for each version of a project. To make it easier for users and contributors to" \
+        " see precisely what notable changes have been made between each release (or version) of" \
+        " the project. Whether consumers or developers, the end users of software are" \
+        " human beings who care about what's in the software. When the software changes, people " \
+        "want to know why and how. see https://keepachangelog.com")
+        config[:changelog] = true
+        Bundler.ui.info "Changelog enabled in config"
+        templates.merge!("CHANGELOG.md.tt" => "CHANGELOG.md")
+      end
+
+      config[:linter] = ask_and_set_linter
+      case config[:linter]
+      when "rubocop"
+        config[:linter_version] = rubocop_version
+        Bundler.ui.info "RuboCop enabled in config"
+        templates.merge!("rubocop.yml.tt" => ".rubocop.yml")
+      when "standard"
+        config[:linter_version] = standard_version
+        Bundler.ui.info "Standard enabled in config"
+        templates.merge!("standard.yml.tt" => ".standard.yml")
+      end
+
+      templates.merge!("exe/newgem.tt" => "exe/#{name}") if config[:exe]
+
+      if options[:ext]
+        templates.merge!(
+          "ext/newgem/extconf.rb.tt" => "ext/#{name}/extconf.rb",
+          "ext/newgem/newgem.h.tt" => "ext/#{name}/#{underscored_name}.h",
+          "ext/newgem/newgem.c.tt" => "ext/#{name}/#{underscored_name}.c"
+        )
+      end
+
+      if target.exist? && !target.directory?
+        Bundler.ui.error "Couldn't create a new gem named `#{gem_name}` because there's an existing file named `#{gem_name}`."
+        exit Bundler::BundlerError.all_errors[Bundler::GenericSystemCallError]
+      end
+
+      if use_git
+        Bundler.ui.info "Initializing git repo in #{target}"
+        require "shellwords"
+        `git init #{target.to_s.shellescape}`
+
+        config[:git_default_branch] = File.read("#{target}/.git/HEAD").split("/").last.chomp
+      end
+
+      templates.each do |src, dst|
+        destination = target.join(dst)
+        thor.template("newgem/#{src}", destination, config)
+      end
+
+      executables.each do |file|
+        path = target.join(file)
+        executable = (path.stat.mode | 0o111)
+        path.chmod(executable)
+      end
+
+      if use_git
+        Dir.chdir(target) do
+          `git add .`
+        end
+      end
+
+      # Open gemspec in editor
+      open_editor(options["edit"], target.join("#{name}.gemspec")) if options[:edit]
+
+      Bundler.ui.info "Gem '#{name}' was successfully created. " \
+        "For more information on making a RubyGem visit https://bundler.io/guides/creating_gem.html"
+    end
+
+    private
+
+    def resolve_name(name)
+      SharedHelpers.pwd.join(name).basename.to_s
+    end
+
+    def ask_and_set(key, header, message)
+      choice = options[key]
+      choice = Bundler.settings["gem.#{key}"] if choice.nil?
+
+      if choice.nil?
+        Bundler.ui.confirm header
+        choice = Bundler.ui.yes? "#{message} y/(n):"
+        Bundler.settings.set_global("gem.#{key}", choice)
+      end
+
+      choice
+    end
+
+    def validate_ext_name
+      return unless gem_name.index("-")
+
+      Bundler.ui.error "You have specified a gem name which does not conform to the \n" \
+                       "naming guidelines for C extensions. For more information, \n" \
+                       "see the 'Extension Naming' section at the following URL:\n" \
+                       "https://guides.rubygems.org/gems-with-extensions/\n"
+      exit 1
+    end
+
+    def ask_and_set_test_framework
+      test_framework = options[:test] || Bundler.settings["gem.test"]
+
+      if test_framework.to_s.empty?
+        Bundler.ui.confirm "Do you want to generate tests with your gem?"
+        Bundler.ui.info hint_text("test")
+
+        result = Bundler.ui.ask "Enter a test framework. rspec/minitest/test-unit/(none):"
+        if result =~ /rspec|minitest|test-unit/
+          test_framework = result
+        else
+          test_framework = false
+        end
+      end
+
+      if Bundler.settings["gem.test"].nil?
+        Bundler.settings.set_global("gem.test", test_framework)
+      end
+
+      if options[:test] == Bundler.settings["gem.test"]
+        Bundler.ui.info "#{options[:test]} is already configured, ignoring --test flag."
+      end
+
+      test_framework
+    end
+
+    def hint_text(setting)
+      if Bundler.settings["gem.#{setting}"] == false
+        "Your choice will only be applied to this gem."
+      else
+        "Future `bundle gem` calls will use your choice. " \
+        "This setting can be changed anytime with `bundle config gem.#{setting}`."
+      end
+    end
+
+    def ask_and_set_ci
+      ci_template = options[:ci] || Bundler.settings["gem.ci"]
+
+      if ci_template.to_s.empty?
+        Bundler.ui.confirm "Do you want to set up continuous integration for your gem? " \
+          "Supported services:\n" \
+          "* CircleCI:       https://circleci.com/\n" \
+          "* GitHub Actions: https://github.com/features/actions\n" \
+          "* GitLab CI:      https://docs.gitlab.com/ee/ci/\n" \
+          "* Travis CI:      https://travis-ci.org/\n" \
+          "\n"
+        Bundler.ui.info hint_text("ci")
+
+        result = Bundler.ui.ask "Enter a CI service. github/travis/gitlab/circle/(none):"
+        if result =~ /github|travis|gitlab|circle/
+          ci_template = result
+        else
+          ci_template = false
+        end
+      end
+
+      if Bundler.settings["gem.ci"].nil?
+        Bundler.settings.set_global("gem.ci", ci_template)
+      end
+
+      if options[:ci] == Bundler.settings["gem.ci"]
+        Bundler.ui.info "#{options[:ci]} is already configured, ignoring --ci flag."
+      end
+
+      ci_template
+    end
+
+    def ask_and_set_linter
+      linter_template = options[:linter] || Bundler.settings["gem.linter"]
+      linter_template = deprecated_rubocop_option if linter_template.nil?
+
+      if linter_template.to_s.empty?
+        Bundler.ui.confirm "Do you want to add a code linter and formatter to your gem? " \
+          "Supported Linters:\n" \
+          "* RuboCop:       https://rubocop.org\n" \
+          "* Standard:      https://github.com/testdouble/standard\n" \
+          "\n"
+        Bundler.ui.info hint_text("linter")
+
+        result = Bundler.ui.ask "Enter a linter. rubocop/standard/(none):"
+        if result =~ /rubocop|standard/
+          linter_template = result
+        else
+          linter_template = false
+        end
+      end
+
+      if Bundler.settings["gem.linter"].nil?
+        Bundler.settings.set_global("gem.linter", linter_template)
+      end
+
+      # Once gem.linter safely set, unset the deprecated gem.rubocop
+      unless Bundler.settings["gem.rubocop"].nil?
+        Bundler.settings.set_global("gem.rubocop", nil)
+      end
+
+      if options[:linter] == Bundler.settings["gem.linter"]
+        Bundler.ui.info "#{options[:linter]} is already configured, ignoring --linter flag."
+      end
+
+      linter_template
+    end
+
+    def deprecated_rubocop_option
+      if !options[:rubocop].nil?
+        if options[:rubocop]
+          Bundler::SharedHelpers.major_deprecation 2, "--rubocop is deprecated, use --linter=rubocop"
+          "rubocop"
+        else
+          Bundler::SharedHelpers.major_deprecation 2, "--no-rubocop is deprecated, use --linter"
+          false
+        end
+      elsif !Bundler.settings["gem.rubocop"].nil?
+        Bundler::SharedHelpers.major_deprecation 2,
+          "config gem.rubocop is deprecated; we've updated your config to use gem.linter instead"
+        Bundler.settings["gem.rubocop"] ? "rubocop" : false
+      end
+    end
+
+    def bundler_dependency_version
+      v = Gem::Version.new(Bundler::VERSION)
+      req = v.segments[0..1]
+      req << "a" if v.prerelease?
+      req.join(".")
+    end
+
+    def ensure_safe_gem_name(name, constant_array)
+      if name =~ /^\d/
+        Bundler.ui.error "Invalid gem name #{name} Please give a name which does not start with numbers."
+        exit 1
+      end
+
+      constant_name = constant_array.join("::")
+
+      existing_constant = constant_array.inject(Object) do |c, s|
+        defined = begin
+          c.const_defined?(s)
+        rescue NameError
+          Bundler.ui.error "Invalid gem name #{name} -- `#{constant_name}` is an invalid constant name"
+          exit 1
+        end
+        (defined && c.const_get(s)) || break
+      end
+
+      return unless existing_constant
+      Bundler.ui.error "Invalid gem name #{name} constant #{constant_name} is already in use. Please choose another gem name."
+      exit 1
+    end
+
+    def open_editor(editor, file)
+      thor.run(%(#{editor} "#{file}"))
+    end
+
+    def required_ruby_version
+      if Gem.ruby_version < Gem::Version.new("2.4.a") then "2.3.0"
+      elsif Gem.ruby_version < Gem::Version.new("2.5.a") then "2.4.0"
+      elsif Gem.ruby_version < Gem::Version.new("2.6.a") then "2.5.0"
+      else
+        "2.6.0"
+      end
+    end
+
+    def rubocop_version
+      if Gem.ruby_version < Gem::Version.new("2.4.a") then "0.81.0"
+      elsif Gem.ruby_version < Gem::Version.new("2.5.a") then "1.12"
+      else
+        "1.21"
+      end
+    end
+
+    def standard_version
+      if Gem.ruby_version < Gem::Version.new("2.4.a") then "0.2.5"
+      elsif Gem.ruby_version < Gem::Version.new("2.5.a") then "1.0"
+      else
+        "1.3"
+      end
+    end
+  end
+end
diff --git a/lib/bundler/cli/info.rb b/lib/bundler/cli/info.rb
new file mode 100644
index 0000000000..76c8cf60c0
--- /dev/null
+++ b/lib/bundler/cli/info.rb
@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+module Bundler
+  class CLI::Info
+    attr_reader :gem_name, :options
+    def initialize(options, gem_name)
+      @options = options
+      @gem_name = gem_name
+    end
+
+    def run
+      Bundler.ui.silence do
+        Bundler.definition.validate_runtime!
+        Bundler.load.lock
+      end
+
+      spec = spec_for_gem(gem_name)
+
+      if spec
+        return print_gem_path(spec) if @options[:path]
+        return print_gem_version(spec) if @options[:version]
+        print_gem_info(spec)
+      end
+    end
+
+    private
+
+    def spec_for_gem(gem_name)
+      spec = Bundler.definition.specs.find {|s| s.name == gem_name }
+      spec || default_gem_spec(gem_name) || Bundler::CLI::Common.select_spec(gem_name, :regex_match)
+    end
+
+    def default_gem_spec(gem_name)
+      return unless Gem::Specification.respond_to?(:find_all_by_name)
+      gem_spec = Gem::Specification.find_all_by_name(gem_name).last
+      return gem_spec if gem_spec && gem_spec.respond_to?(:default_gem?) && gem_spec.default_gem?
+    end
+
+    def spec_not_found(gem_name)
+      raise GemNotFound, Bundler::CLI::Common.gem_not_found_message(gem_name, Bundler.definition.dependencies)
+    end
+
+    def print_gem_version(spec)
+      Bundler.ui.info spec.version.to_s
+    end
+
+    def print_gem_path(spec)
+      name = spec.name
+      if name == "bundler"
+        path = File.expand_path("../../../..", __FILE__)
+      else
+        path = spec.full_gem_path
+        if spec.deleted_gem?
+          return Bundler.ui.warn "The gem #{name} has been deleted. It was installed at: #{path}"
+        end
+      end
+
+      Bundler.ui.info path
+    end
+
+    def print_gem_info(spec)
+      metadata = spec.metadata
+      name = spec.name
+      gem_info = String.new
+      gem_info << "  * #{name} (#{spec.version}#{spec.git_version})\n"
+      gem_info << "\tSummary: #{spec.summary}\n" if spec.summary
+      gem_info << "\tHomepage: #{spec.homepage}\n" if spec.homepage
+      gem_info << "\tDocumentation: #{metadata["documentation_uri"]}\n" if metadata.key?("documentation_uri")
+      gem_info << "\tSource Code: #{metadata["source_code_uri"]}\n" if metadata.key?("source_code_uri")
+      gem_info << "\tFunding: #{metadata["funding_uri"]}\n" if metadata.key?("funding_uri")
+      gem_info << "\tWiki: #{metadata["wiki_uri"]}\n" if metadata.key?("wiki_uri")
+      gem_info << "\tChangelog: #{metadata["changelog_uri"]}\n" if metadata.key?("changelog_uri")
+      gem_info << "\tBug Tracker: #{metadata["bug_tracker_uri"]}\n" if metadata.key?("bug_tracker_uri")
+      gem_info << "\tMailing List: #{metadata["mailing_list_uri"]}\n" if metadata.key?("mailing_list_uri")
+      gem_info << "\tPath: #{spec.full_gem_path}\n"
+      gem_info << "\tDefault Gem: yes" if spec.respond_to?(:default_gem?) && spec.default_gem?
+
+      if name != "bundler" && spec.deleted_gem?
+        return Bundler.ui.warn "The gem #{name} has been deleted. Gemspec information is still available though:\n#{gem_info}"
+      end
+
+      Bundler.ui.info gem_info
+    end
+  end
+end
diff --git a/lib/bundler/cli/init.rb b/lib/bundler/cli/init.rb
new file mode 100644
index 0000000000..d851d02d42
--- /dev/null
+++ b/lib/bundler/cli/init.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Bundler
+  class CLI::Init
+    attr_reader :options
+    def initialize(options)
+      @options = options
+    end
+
+    def run
+      if File.exist?(gemfile)
+        Bundler.ui.error "#{gemfile} already exists at #{File.expand_path(gemfile)}"
+        exit 1
+      end
+
+      unless File.writable?(Dir.pwd)
+        Bundler.ui.error "Can not create #{gemfile} as the current directory is not writable."
+        exit 1
+      end
+
+      if options[:gemspec]
+        gemspec = File.expand_path(options[:gemspec])
+        unless File.exist?(gemspec)
+          Bundler.ui.error "Gem specification #{gemspec} doesn't exist"
+          exit 1
+        end
+
+        spec = Bundler.load_gemspec_uncached(gemspec)
+
+        File.open(gemfile, "wb") do |file|
+          file << "# Generated from #{gemspec}\n"
+          file << spec.to_gemfile
+        end
+      else
+        FileUtils.cp(File.expand_path("../../templates/#{gemfile}", __FILE__), gemfile)
+      end
+
+      puts "Writing new #{gemfile} to #{SharedHelpers.pwd}/#{gemfile}"
+    end
+
+    private
+
+    def gemfile
+      @gemfile ||= Bundler.preferred_gemfile_name
+    end
+  end
+end
diff --git a/lib/bundler/cli/inject.rb b/lib/bundler/cli/inject.rb
new file mode 100644
index 0000000000..8093a85283
--- /dev/null
+++ b/lib/bundler/cli/inject.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Bundler
+  class CLI::Inject
+    attr_reader :options, :name, :version, :group, :source, :gems
+    def initialize(options, name, version)
+      @options = options
+      @name = name
+      @version = version || last_version_number
+      @group = options[:group].split(",") unless options[:group].nil?
+      @source = options[:source]
+      @gems = []
+    end
+
+    def run
+      # The required arguments allow Thor to give useful feedback when the arguments
+      # are incorrect. This adds those first two arguments onto the list as a whole.
+      gems.unshift(source).unshift(group).unshift(version).unshift(name)
+
+      # Build an array of Dependency objects out of the arguments
+      deps = []
+      # when `inject` support addition of more than one gem, then this loop will
+      # help. Currently this loop is running once.
+      gems.each_slice(4) do |gem_name, gem_version, gem_group, gem_source|
+        ops = Gem::Requirement::OPS.map {|key, _val| key }
+        has_op = ops.any? {|op| gem_version.start_with? op }
+        gem_version = "~> #{gem_version}" unless has_op
+        deps << Bundler::Dependency.new(gem_name, gem_version, "group" => gem_group, "source" => gem_source)
+      end
+
+      added = Injector.inject(deps, options)
+
+      if added.any?
+        Bundler.ui.confirm "Added to Gemfile:"
+        Bundler.ui.confirm(added.map do |d|
+          name = "'#{d.name}'"
+          requirement = ", '#{d.requirement}'"
+          group = ", :group => #{d.groups.inspect}" if d.groups != Array(:default)
+          source = ", :source => '#{d.source}'" unless d.source.nil?
+          %(gem #{name}#{requirement}#{group}#{source})
+        end.join("\n"))
+      else
+        Bundler.ui.confirm "All gems were already present in the Gemfile"
+      end
+    end
+
+    private
+
+    def last_version_number
+      definition = Bundler.definition(true)
+      definition.resolve_remotely!
+      specs = definition.index[name].sort_by(&:version)
+      unless options[:pre]
+        specs.delete_if {|b| b.respond_to?(:version) && b.version.prerelease? }
+      end
+      spec = specs.last
+      spec.version.to_s
+    end
+  end
+end
diff --git a/lib/bundler/cli/install.rb b/lib/bundler/cli/install.rb
new file mode 100644
index 0000000000..4c1915fea6
--- /dev/null
+++ b/lib/bundler/cli/install.rb
@@ -0,0 +1,207 @@
+# frozen_string_literal: true
+
+module Bundler
+  class CLI::Install
+    attr_reader :options
+    def initialize(options)
+      @options = options
+    end
+
+    def run
+      Bundler.ui.level = "warn" if options[:quiet]
+
+      warn_if_root
+
+      Bundler::SharedHelpers.set_env "RB_USER_INSTALL", "1" if Bundler::FREEBSD
+
+      # Disable color in deployment mode
+      Bundler.ui.shell = Thor::Shell::Basic.new if options[:deployment]
+
+      check_for_options_conflicts
+
+      check_trust_policy
+
+      if options[:deployment] || options[:frozen] || Bundler.frozen_bundle?
+        unless Bundler.default_lockfile.exist?
+          flag   = "--deployment flag" if options[:deployment]
+          flag ||= "--frozen flag"     if options[:frozen]
+          flag ||= "deployment setting"
+          raise ProductionError, "The #{flag} requires a #{Bundler.default_lockfile.relative_path_from(SharedHelpers.pwd)}. Please make " \
+                                 "sure you have checked your #{Bundler.default_lockfile.relative_path_from(SharedHelpers.pwd)} into version control " \
+                                 "before deploying."
+        end
+
+        options[:local] = true if Bundler.app_cache.exist?
+
+        Bundler.settings.set_command_option :deployment, true if options[:deployment]
+        Bundler.settings.set_command_option :frozen, true if options[:frozen]
+      end
+
+      # When install is called with --no-deployment, disable deployment mode
+      if options[:deployment] == false
+        Bundler.settings.set_command_option :frozen, nil
+        options[:system] = true
+      end
+
+      normalize_settings
+
+      Bundler::Fetcher.disable_endpoint = options["full-index"]
+
+      if options["binstubs"]
+        Bundler::SharedHelpers.major_deprecation 2,
+          "The --binstubs option will be removed in favor of `bundle binstubs --all`"
+      end
+
+      Plugin.gemfile_install(Bundler.default_gemfile) if Bundler.feature_flag.plugins?
+
+      definition = Bundler.definition
+      definition.validate_runtime!
+
+      installer = Installer.install(Bundler.root, definition, options)
+
+      Bundler.settings.temporary(:cache_all_platforms => options[:local] ? false : Bundler.settings[:cache_all_platforms]) do
+        Bundler.load.cache(nil, options[:local]) if Bundler.app_cache.exist? && !options["no-cache"] && !Bundler.frozen_bundle?
+      end
+
+      Bundler.ui.confirm "Bundle complete! #{dependencies_count_for(definition)}, #{gems_installed_for(definition)}."
+      Bundler::CLI::Common.output_without_groups_message(:install)
+
+      if Bundler.use_system_gems?
+        Bundler.ui.confirm "Use `bundle info [gemname]` to see where a bundled gem is installed."
+      else
+        relative_path = Bundler.configured_bundle_path.base_path_relative_to_pwd
+        Bundler.ui.confirm "Bundled gems are installed into `#{relative_path}`"
+      end
+
+      Bundler::CLI::Common.output_post_install_messages installer.post_install_messages
+
+      warn_ambiguous_gems
+
+      if CLI::Common.clean_after_install?
+        require_relative "clean"
+        Bundler::CLI::Clean.new(options).run
+      end
+
+      Bundler::CLI::Common.output_fund_metadata_summary
+    rescue Gem::InvalidSpecificationException
+      Bundler.ui.warn "You have one or more invalid gemspecs that need to be fixed."
+      raise
+    end
+
+    private
+
+    def warn_if_root
+      return if Bundler.settings[:silence_root_warning] || Gem.win_platform? || !Process.uid.zero?
+      Bundler.ui.warn "Don't run Bundler as root. Bundler can ask for sudo " \
+        "if it is needed, and installing your bundle as root will break this " \
+        "application for all non-root users on this machine.", :wrap => true
+    end
+
+    def dependencies_count_for(definition)
+      count = definition.dependencies.count
+      "#{count} Gemfile #{count == 1 ? "dependency" : "dependencies"}"
+    end
+
+    def gems_installed_for(definition)
+      count = definition.specs.count
+      "#{count} #{count == 1 ? "gem" : "gems"} now installed"
+    end
+
+    def check_for_group_conflicts_in_cli_options
+      conflicting_groups = Array(options[:without]) & Array(options[:with])
+      return if conflicting_groups.empty?
+      raise InvalidOption, "You can't list a group in both with and without." \
+        " The offending groups are: #{conflicting_groups.join(", ")}."
+    end
+
+    def check_for_options_conflicts
+      if (options[:path] || options[:deployment]) && options[:system]
+        error_message = String.new
+        error_message << "You have specified both --path as well as --system. Please choose only one option.\n" if options[:path]
+        error_message << "You have specified both --deployment as well as --system. Please choose only one option.\n" if options[:deployment]
+        raise InvalidOption.new(error_message)
+      end
+    end
+
+    def check_trust_policy
+      trust_policy = options["trust-policy"]
+      unless Bundler.rubygems.security_policies.keys.unshift(nil).include?(trust_policy)
+        raise InvalidOption, "RubyGems doesn't know about trust policy '#{trust_policy}'. " \
+          "The known policies are: #{Bundler.rubygems.security_policies.keys.join(", ")}."
+      end
+      Bundler.settings.set_command_option_if_given :"trust-policy", trust_policy
+    end
+
+    def normalize_groups
+      options[:with] &&= options[:with].join(":").tr(" ", ":").split(":")
+      options[:without] &&= options[:without].join(":").tr(" ", ":").split(":")
+
+      check_for_group_conflicts_in_cli_options
+
+      Bundler.settings.set_command_option :with, nil if options[:with] == []
+      Bundler.settings.set_command_option :without, nil if options[:without] == []
+
+      with = options.fetch(:with, [])
+      with |= Bundler.settings[:with].map(&:to_s)
+      with -= options[:without] if options[:without]
+
+      without = options.fetch(:without, [])
+      without |= Bundler.settings[:without].map(&:to_s)
+      without -= options[:with] if options[:with]
+
+      options[:with]    = with
+      options[:without] = without
+
+      unless Bundler.settings[:without] == options[:without] && Bundler.settings[:with] == options[:with]
+        # need to nil them out first to get around validation for backwards compatibility
+        Bundler.settings.set_command_option :without, nil
+        Bundler.settings.set_command_option :with,    nil
+        Bundler.settings.set_command_option :without, options[:without] - options[:with]
+        Bundler.settings.set_command_option :with,    options[:with]
+      end
+    end
+
+    def normalize_settings
+      Bundler.settings.set_command_option :path, nil if options[:system]
+      Bundler.settings.temporary(:path_relative_to_cwd => false) do
+        Bundler.settings.set_command_option :path, "vendor/bundle" if Bundler.settings[:deployment] && Bundler.settings[:path].nil?
+      end
+      Bundler.settings.set_command_option_if_given :path, options[:path]
+      Bundler.settings.temporary(:path_relative_to_cwd => false) do
+        Bundler.settings.set_command_option :path, "bundle" if options["standalone"] && Bundler.settings[:path].nil?
+      end
+
+      bin_option = options["binstubs"]
+      bin_option = nil if bin_option && bin_option.empty?
+      Bundler.settings.set_command_option :bin, bin_option if options["binstubs"]
+
+      Bundler.settings.set_command_option_if_given :shebang, options["shebang"]
+
+      Bundler.settings.set_command_option_if_given :jobs, options["jobs"]
+
+      Bundler.settings.set_command_option_if_given :no_prune, options["no-prune"]
+
+      Bundler.settings.set_command_option_if_given :no_install, options["no-install"]
+
+      Bundler.settings.set_command_option_if_given :clean, options["clean"]
+
+      normalize_groups
+
+      options[:force] = options[:redownload]
+    end
+
+    def warn_ambiguous_gems
+      # TODO: remove this when we drop Bundler 1.x support
+      Installer.ambiguous_gems.to_a.each do |name, installed_from_uri, *also_found_in_uris|
+        Bundler.ui.warn "Warning: the gem '#{name}' was found in multiple sources."
+        Bundler.ui.warn "Installed from: #{installed_from_uri}"
+        Bundler.ui.warn "Also found in:"
+        also_found_in_uris.each {|uri| Bundler.ui.warn "  * #{uri}" }
+        Bundler.ui.warn "You should add a source requirement to restrict this gem to your preferred source."
+        Bundler.ui.warn "For example:"
+        Bundler.ui.warn "    gem '#{name}', :source => '#{installed_from_uri}'"
+        Bundler.ui.warn "Then uninstall the gem '#{name}' (or delete all bundled gems) and then install again."
+      end
+    end
+  end
+end
diff --git a/lib/bundler/cli/issue.rb b/lib/bundler/cli/issue.rb
new file mode 100644
index 0000000000..b891ecb1d2
--- /dev/null
+++ b/lib/bundler/cli/issue.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require "rbconfig"
+
+module Bundler
+  class CLI::Issue
+    def run
+      Bundler.ui.info <<-EOS.gsub(/^ {8}/, "")
+        Did you find an issue with Bundler? Before filing a new issue,
+        be sure to check out these resources:
+
+        1. Check out our troubleshooting guide for quick fixes to common issues:
+        https://github.com/rubygems/rubygems/blob/master/bundler/doc/TROUBLESHOOTING.md
+
+        2. Instructions for common Bundler uses can be found on the documentation
+        site: https://bundler.io/
+
+        3. Information about each Bundler command can be found in the Bundler
+        man pages: https://bundler.io/man/bundle.1.html
+
+        Hopefully the troubleshooting steps above resolved your problem!  If things
+        still aren't working the way you expect them to, please let us know so
+        that we can diagnose and help fix the problem you're having, by filling
+        in the new issue form located at
+        https://github.com/rubygems/rubygems/issues/new?labels=Bundler&template=bundler-related-issue.md,
+        and copy and pasting the information below.
+
+      EOS
+
+      Bundler.ui.info Bundler::Env.report
+
+      Bundler.ui.info "\n## Bundle Doctor"
+      doctor
+    end
+
+    def doctor
+      require_relative "doctor"
+      Bundler::CLI::Doctor.new({}).run
+    end
+  end
+end
diff --git a/lib/bundler/cli/list.rb b/lib/bundler/cli/list.rb
new file mode 100644
index 0000000000..f56bf5b86a
--- /dev/null
+++ b/lib/bundler/cli/list.rb
@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+module Bundler
+  class CLI::List
+    def initialize(options)
+      @options = options
+      @without_group = options["without-group"].map(&:to_sym)
+      @only_group = options["only-group"].map(&:to_sym)
+    end
+
+    def run
+      raise InvalidOption, "The `--only-group` and `--without-group` options cannot be used together" if @only_group.any? && @without_group.any?
+
+      raise InvalidOption, "The `--name-only` and `--paths` options cannot be used together" if @options["name-only"] && @options[:paths]
+
+      specs = if @only_group.any? || @without_group.any?
+        filtered_specs_by_groups
+      else
+        begin
+          Bundler.load.specs
+        rescue GemNotFound => e
+          Bundler.ui.error e.message
+          Bundler.ui.warn "Install missing gems with `bundle install`."
+          exit 1
+        end
+      end.reject {|s| s.name == "bundler" }.sort_by(&:name)
+
+      return Bundler.ui.info "No gems in the Gemfile" if specs.empty?
+
+      return specs.each {|s| Bundler.ui.info s.name } if @options["name-only"]
+      return specs.each {|s| Bundler.ui.info s.full_gem_path } if @options["paths"]
+
+      Bundler.ui.info "Gems included by the bundle:"
+
+      specs.each {|s| Bundler.ui.info "  * #{s.name} (#{s.version}#{s.git_version})" }
+
+      Bundler.ui.info "Use `bundle info` to print more detailed information about a gem"
+    end
+
+    private
+
+    def verify_group_exists(groups)
+      (@without_group + @only_group).each do |group|
+        raise InvalidOption, "`#{group}` group could not be found." unless groups.include?(group)
+      end
+    end
+
+    def filtered_specs_by_groups
+      definition = Bundler.definition
+      groups = definition.groups
+
+      verify_group_exists(groups)
+
+      show_groups =
+        if @without_group.any?
+          groups.reject {|g| @without_group.include?(g) }
+        elsif @only_group.any?
+          groups.select {|g| @only_group.include?(g) }
+        else
+          groups
+        end.map(&:to_sym)
+
+      definition.specs_for(show_groups)
+    end
+  end
+end
diff --git a/lib/bundler/cli/lock.rb b/lib/bundler/cli/lock.rb
new file mode 100644
index 0000000000..7d613a6644
--- /dev/null
+++ b/lib/bundler/cli/lock.rb
@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module Bundler
+  class CLI::Lock
+    attr_reader :options
+
+    def initialize(options)
+      @options = options
+    end
+
+    def run
+      unless Bundler.default_gemfile
+        Bundler.ui.error "Unable to find a Gemfile to lock"
+        exit 1
+      end
+
+      print = options[:print]
+      ui = Bundler.ui
+      Bundler.ui = UI::Silent.new if print
+
+      Bundler::Fetcher.disable_endpoint = options["full-index"]
+
+      update = options[:update]
+      conservative = options[:conservative]
+
+      if update.is_a?(Array) # unlocking specific gems
+        Bundler::CLI::Common.ensure_all_gems_in_lockfile!(update)
+        update = { :gems => update, :conservative => conservative }
+      elsif update
+        update = { :conservative => conservative } if conservative
+      end
+      definition = Bundler.definition(update)
+
+      Bundler::CLI::Common.configure_gem_version_promoter(Bundler.definition, options) if options[:update]
+
+      options["remove-platform"].each do |platform|
+        definition.remove_platform(platform)
+      end
+
+      options["add-platform"].each do |platform_string|
+        platform = Gem::Platform.new(platform_string)
+        if platform.to_s == "unknown"
+          Bundler.ui.warn "The platform `#{platform_string}` is unknown to RubyGems " \
+            "and adding it will likely lead to resolution errors"
+        end
+        definition.add_platform(platform)
+      end
+
+      if definition.platforms.empty?
+        raise InvalidOption, "Removing all platforms from the bundle is not allowed"
+      end
+
+      definition.resolve_remotely! unless options[:local]
+
+      if print
+        puts definition.to_lock
+      else
+        file = options[:lockfile]
+        file = file ? File.expand_path(file) : Bundler.default_lockfile
+        puts "Writing lockfile to #{file}"
+        definition.lock(file)
+      end
+
+      Bundler.ui = ui
+    end
+  end
+end
diff --git a/lib/bundler/cli/open.rb b/lib/bundler/cli/open.rb
new file mode 100644
index 0000000000..ea504344f3
--- /dev/null
+++ b/lib/bundler/cli/open.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Bundler
+  class CLI::Open
+    attr_reader :options, :name
+    def initialize(options, name)
+      @options = options
+      @name = name
+    end
+
+    def run
+      editor = [ENV["BUNDLER_EDITOR"], ENV["VISUAL"], ENV["EDITOR"]].find {|e| !e.nil? && !e.empty? }
+      return Bundler.ui.info("To open a bundled gem, set $EDITOR or $BUNDLER_EDITOR") unless editor
+      return unless spec = Bundler::CLI::Common.select_spec(name, :regex_match)
+      if spec.default_gem?
+        Bundler.ui.info "Unable to open #{name} because it's a default gem, so the directory it would normally be installed to does not exist."
+      else
+        path = spec.full_gem_path
+        Dir.chdir(path) do
+          require "shellwords"
+          command = Shellwords.split(editor) + [path]
+          Bundler.with_original_env do
+            system(*command)
+          end || Bundler.ui.info("Could not run '#{command.join(" ")}'")
+        end
+      end
+    end
+  end
+end
diff --git a/lib/bundler/cli/outdated.rb b/lib/bundler/cli/outdated.rb
new file mode 100644
index 0000000000..d5183b060b
--- /dev/null
+++ b/lib/bundler/cli/outdated.rb
@@ -0,0 +1,290 @@
+# frozen_string_literal: true
+
+module Bundler
+  class CLI::Outdated
+    attr_reader :options, :gems, :options_include_groups, :filter_options_patch, :sources, :strict
+    attr_accessor :outdated_gems
+
+    def initialize(options, gems)
+      @options = options
+      @gems = gems
+      @sources = Array(options[:source])
+
+      @filter_options_patch = options.keys & %w[filter-major filter-minor filter-patch]
+
+      @outdated_gems = []
+
+      @options_include_groups = [:group, :groups].any? do |v|
+        options.keys.include?(v.to_s)
+      end
+
+      # the patch level options imply strict is also true. It wouldn't make
+      # sense otherwise.
+      @strict = options["filter-strict"] || Bundler::CLI::Common.patch_level_options(options).any?
+    end
+
+    def run
+      check_for_deployment_mode!
+
+      gems.each do |gem_name|
+        Bundler::CLI::Common.select_spec(gem_name)
+      end
+
+      Bundler.definition.validate_runtime!
+      current_specs = Bundler.ui.silence { Bundler.definition.resolve }
+
+      current_dependencies = Bundler.ui.silence do
+        Bundler.load.dependencies.map {|dep| [dep.name, dep] }.to_h
+      end
+
+      definition = if gems.empty? && sources.empty?
+        # We're doing a full update
+        Bundler.definition(true)
+      else
+        Bundler.definition(:gems => gems, :sources => sources)
+      end
+
+      Bundler::CLI::Common.configure_gem_version_promoter(
+        Bundler.definition,
+        options
+      )
+
+      definition_resolution = proc do
+        options[:local] ? definition.resolve_with_cache! : definition.resolve_remotely!
+      end
+
+      if options[:parseable]
+        Bundler.ui.silence(&definition_resolution)
+      else
+        definition_resolution.call
+      end
+
+      Bundler.ui.info ""
+
+      # Loop through the current specs
+      gemfile_specs, dependency_specs = current_specs.partition do |spec|
+        current_dependencies.key? spec.name
+      end
+
+      specs = if options["only-explicit"]
+        gemfile_specs
+      else
+        gemfile_specs + dependency_specs
+      end
+
+      specs.sort_by(&:name).uniq(&:name).each do |current_spec|
+        next unless gems.empty? || gems.include?(current_spec.name)
+
+        active_spec = retrieve_active_spec(definition, current_spec)
+        next unless active_spec
+
+        next unless filter_options_patch.empty? || update_present_via_semver_portions(current_spec, active_spec, options)
+
+        gem_outdated = Gem::Version.new(active_spec.version) > Gem::Version.new(current_spec.version)
+        next unless gem_outdated || (current_spec.git_version != active_spec.git_version)
+
+        dependency = current_dependencies[current_spec.name]
+        groups = ""
+        if dependency && !options[:parseable]
+          groups = dependency.groups.join(", ")
+        end
+
+        outdated_gems << {
+          :active_spec => active_spec,
+          :current_spec => current_spec,
+          :dependency => dependency,
+          :groups => groups,
+        }
+      end
+
+      if outdated_gems.empty?
+        unless options[:parseable]
+          Bundler.ui.info(nothing_outdated_message)
+        end
+      else
+        if options_include_groups
+          relevant_outdated_gems = outdated_gems.group_by {|g| g[:groups] }.sort.flat_map do |groups, gems|
+            contains_group = groups.split(", ").include?(options[:group])
+            next unless options[:groups] || contains_group
+
+            gems
+          end.compact
+
+          if options[:parseable]
+            relevant_outdated_gems.each do |gems|
+              print_gems(gems)
+            end
+          else
+            print_gems_table(relevant_outdated_gems)
+          end
+        elsif options[:parseable]
+          print_gems(outdated_gems)
+        else
+          print_gems_table(outdated_gems)
+        end
+
+        exit 1
+      end
+    end
+
+    private
+
+    def groups_text(group_text, groups)
+      "#{group_text}#{groups.split(",").size > 1 ? "s" : ""} \"#{groups}\""
+    end
+
+    def nothing_outdated_message
+      if filter_options_patch.any?
+        display = filter_options_patch.map do |o|
+          o.sub("filter-", "")
+        end.join(" or ")
+
+        "No #{display} updates to display.\n"
+      else
+        "Bundle up to date!\n"
+      end
+    end
+
+    def retrieve_active_spec(definition, current_spec)
+      active_spec = definition.resolve.find_by_name_and_platform(current_spec.name, current_spec.platform)
+      return unless active_spec
+
+      return active_spec if strict
+
+      active_specs = active_spec.source.specs.search(current_spec.name).select {|spec| spec.match_platform(current_spec.platform) }.sort_by(&:version)
+      if !current_spec.version.prerelease? && !options[:pre] && active_specs.size > 1
+        active_specs.delete_if {|b| b.respond_to?(:version) && b.version.prerelease? }
+      end
+      active_specs.last
+    end
+
+    def print_gems(gems_list)
+      gems_list.each do |gem|
+        print_gem(
+          gem[:current_spec],
+          gem[:active_spec],
+          gem[:dependency],
+          gem[:groups],
+        )
+      end
+    end
+
+    def print_gems_table(gems_list)
+      data = gems_list.map do |gem|
+        gem_column_for(
+          gem[:current_spec],
+          gem[:active_spec],
+          gem[:dependency],
+          gem[:groups],
+        )
+      end
+
+      print_indented([table_header] + data)
+    end
+
+    def print_gem(current_spec, active_spec, dependency, groups)
+      spec_version = "#{active_spec.version}#{active_spec.git_version}"
+      spec_version += " (from #{active_spec.loaded_from})" if Bundler.ui.debug? && active_spec.loaded_from
+      current_version = "#{current_spec.version}#{current_spec.git_version}"
+
+      if dependency && dependency.specific?
+        dependency_version = %(, requested #{dependency.requirement})
+      end
+
+      spec_outdated_info = "#{active_spec.name} (newest #{spec_version}, " \
+        "installed #{current_version}#{dependency_version})"
+
+      output_message = if options[:parseable]
+        spec_outdated_info.to_s
+      elsif options_include_groups || groups.empty?
+        "  * #{spec_outdated_info}"
+      else
+        "  * #{spec_outdated_info} in #{groups_text("group", groups)}"
+      end
+
+      Bundler.ui.info output_message.rstrip
+    end
+
+    def gem_column_for(current_spec, active_spec, dependency, groups)
+      current_version = "#{current_spec.version}#{current_spec.git_version}"
+      spec_version = "#{active_spec.version}#{active_spec.git_version}"
+      dependency = dependency.requirement if dependency
+
+      ret_val = [active_spec.name, current_version, spec_version, dependency.to_s, groups.to_s]
+      ret_val << active_spec.loaded_from.to_s if Bundler.ui.debug?
+      ret_val
+    end
+
+    def check_for_deployment_mode!
+      return unless Bundler.frozen_bundle?
+      suggested_command = if Bundler.settings.locations("frozen").keys.&([:global, :local]).any?
+        "bundle config unset frozen"
+      elsif Bundler.settings.locations("deployment").keys.&([:global, :local]).any?
+        "bundle config unset deployment"
+      end
+      raise ProductionError, "You are trying to check outdated gems in " \
+        "deployment mode. Run `bundle outdated` elsewhere.\n" \
+        "\nIf this is a development machine, remove the " \
+        "#{Bundler.default_gemfile} freeze" \
+        "\nby running `#{suggested_command}`."
+    end
+
+    def update_present_via_semver_portions(current_spec, active_spec, options)
+      current_major = current_spec.version.segments.first
+      active_major = active_spec.version.segments.first
+
+      update_present = false
+      update_present = active_major > current_major if options["filter-major"]
+
+      if !update_present && (options["filter-minor"] || options["filter-patch"]) && current_major == active_major
+        current_minor = get_version_semver_portion_value(current_spec, 1)
+        active_minor = get_version_semver_portion_value(active_spec, 1)
+
+        update_present = active_minor > current_minor if options["filter-minor"]
+
+        if !update_present && options["filter-patch"] && current_minor == active_minor
+          current_patch = get_version_semver_portion_value(current_spec, 2)
+          active_patch = get_version_semver_portion_value(active_spec, 2)
+
+          update_present = active_patch > current_patch
+        end
+      end
+
+      update_present
+    end
+
+    def get_version_semver_portion_value(spec, version_portion_index)
+      version_section = spec.version.segments[version_portion_index, 1]
+      version_section.to_a[0].to_i
+    end
+
+    def print_indented(matrix)
+      header = matrix[0]
+      data = matrix[1..-1]
+
+      column_sizes = Array.new(header.size) do |index|
+        matrix.max_by {|row| row[index].length }[index].length
+      end
+
+      Bundler.ui.info justify(header, column_sizes)
+
+      data.sort_by! {|row| row[0] }
+
+      data.each do |row|
+        Bundler.ui.info justify(row, column_sizes)
+      end
+    end
+
+    def table_header
+      header = ["Gem", "Current", "Latest", "Requested", "Groups"]
+      header << "Path" if Bundler.ui.debug?
+      header
+    end
+
+    def justify(row, sizes)
+      row.each_with_index.map do |element, index|
+        element.ljust(sizes[index])
+      end.join("  ").strip + "\n"
+    end
+  end
+end
diff --git a/lib/bundler/cli/platform.rb b/lib/bundler/cli/platform.rb
new file mode 100644
index 0000000000..e97cad49a4
--- /dev/null
+++ b/lib/bundler/cli/platform.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Bundler
+  class CLI::Platform
+    attr_reader :options
+    def initialize(options)
+      @options = options
+    end
+
+    def run
+      platforms, ruby_version = Bundler.ui.silence do
+        locked_ruby_version = Bundler.locked_gems && Bundler.locked_gems.ruby_version
+        gemfile_ruby_version = Bundler.definition.ruby_version && Bundler.definition.ruby_version.single_version_string
+        [Bundler.definition.platforms.map {|p| "* #{p}" },
+         locked_ruby_version || gemfile_ruby_version]
+      end
+      output = []
+
+      if options[:ruby]
+        if ruby_version
+          output << ruby_version
+        else
+          output << "No ruby version specified"
+        end
+      else
+        output << "Your platform is: #{RUBY_PLATFORM}"
+        output << "Your app has gems that work on these platforms:\n#{platforms.join("\n")}"
+
+        if ruby_version
+          output << "Your Gemfile specifies a Ruby version requirement:\n* #{ruby_version}"
+
+          begin
+            Bundler.definition.validate_runtime!
+            output << "Your current platform satisfies the Ruby version requirement."
+          rescue RubyVersionMismatch => e
+            output << e.message
+          end
+        else
+          output << "Your Gemfile does not specify a Ruby version requirement."
+        end
+      end
+
+      Bundler.ui.info output.join("\n\n")
+    end
+  end
+end
diff --git a/lib/bundler/cli/plugin.rb b/lib/bundler/cli/plugin.rb
new file mode 100644
index 0000000000..fe3f4412fa
--- /dev/null
+++ b/lib/bundler/cli/plugin.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require_relative "../vendored_thor"
+module Bundler
+  class CLI::Plugin < Thor
+    desc "install PLUGINS", "Install the plugin from the source"
+    long_desc <<-D
+      Install plugins either from the rubygems source provided (with --source option) or from a git source provided with --git (for remote repos) or --local_git (for local repos). If no sources are provided, it uses Gem.sources
+   D
+    method_option "source", :type => :string, :default => nil, :banner =>
+      "URL of the RubyGems source to fetch the plugin from"
+    method_option "version", :type => :string, :default => nil, :banner =>
+      "The version of the plugin to fetch"
+    method_option "git", :type => :string, :default => nil, :banner =>
+      "URL of the git repo to fetch from"
+    method_option "local_git", :type => :string, :default => nil, :banner =>
+      "Path of the local git repo to fetch from"
+    method_option "branch", :type => :string, :default => nil, :banner =>
+      "The git branch to checkout"
+    method_option "ref", :type => :string, :default => nil, :banner =>
+      "The git revision to check out"
+    def install(*plugins)
+      Bundler::Plugin.install(plugins, options)
+    end
+
+    desc "uninstall PLUGINS", "Uninstall the plugins"
+    long_desc <<-D
+      Uninstall given list of plugins. To uninstall all the plugins, use -all option.
+    D
+    method_option "all", :type => :boolean, :default => nil, :banner =>
+      "Uninstall all the installed plugins. If no plugin is installed, then it does nothing."
+    def uninstall(*plugins)
+      Bundler::Plugin.uninstall(plugins, options)
+    end
+
+    desc "list", "List the installed plugins and available commands"
+    def list
+      Bundler::Plugin.list
+    end
+  end
+end
diff --git a/lib/bundler/cli/pristine.rb b/lib/bundler/cli/pristine.rb
new file mode 100644
index 0000000000..d6654f8053
--- /dev/null
+++ b/lib/bundler/cli/pristine.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Bundler
+  class CLI::Pristine
+    def initialize(gems)
+      @gems = gems
+    end
+
+    def run
+      CLI::Common.ensure_all_gems_in_lockfile!(@gems)
+      definition = Bundler.definition
+      definition.validate_runtime!
+      installer = Bundler::Installer.new(Bundler.root, definition)
+
+      Bundler.load.specs.each do |spec|
+        next if spec.name == "bundler" # Source::Rubygems doesn't install bundler
+        next if !@gems.empty? && !@gems.include?(spec.name)
+
+        gem_name = "#{spec.name} (#{spec.version}#{spec.git_version})"
+        gem_name += " (#{spec.platform})" if !spec.platform.nil? && spec.platform != Gem::Platform::RUBY
+
+        case source = spec.source
+        when Source::Rubygems
+          cached_gem = spec.cache_file
+          unless File.exist?(cached_gem)
+            Bundler.ui.error("Failed to pristine #{gem_name}. Cached gem #{cached_gem} does not exist.")
+            next
+          end
+
+          FileUtils.rm_rf spec.full_gem_path
+        when Source::Git
+          if source.local?
+            Bundler.ui.warn("Cannot pristine #{gem_name}. Gem is locally overridden.")
+            next
+          end
+
+          source.remote!
+          if extension_cache_path = source.extension_cache_path(spec)
+            FileUtils.rm_rf extension_cache_path
+          end
+          FileUtils.rm_rf spec.extension_dir
+          FileUtils.rm_rf spec.full_gem_path
+        else
+          Bundler.ui.warn("Cannot pristine #{gem_name}. Gem is sourced from local path.")
+          next
+        end
+
+        Bundler::GemInstaller.new(spec, installer, false, 0, true).install_from_spec
+      end
+    end
+  end
+end
diff --git a/lib/bundler/cli/remove.rb b/lib/bundler/cli/remove.rb
new file mode 100644
index 0000000000..44a4d891dd
--- /dev/null
+++ b/lib/bundler/cli/remove.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Bundler
+  class CLI::Remove
+    def initialize(gems, options)
+      @gems = gems
+      @options = options
+    end
+
+    def run
+      raise InvalidOption, "Please specify gems to remove." if @gems.empty?
+
+      Injector.remove(@gems, {})
+      Installer.install(Bundler.root, Bundler.definition)
+    end
+  end
+end
diff --git a/lib/bundler/cli/show.rb b/lib/bundler/cli/show.rb
new file mode 100644
index 0000000000..5eaaba1ef7
--- /dev/null
+++ b/lib/bundler/cli/show.rb
@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+module Bundler
+  class CLI::Show
+    attr_reader :options, :gem_name, :latest_specs
+    def initialize(options, gem_name)
+      @options = options
+      @gem_name = gem_name
+      @verbose = options[:verbose] || options[:outdated]
+      @latest_specs = fetch_latest_specs if @verbose
+    end
+
+    def run
+      Bundler.ui.silence do
+        Bundler.definition.validate_runtime!
+        Bundler.load.lock
+      end
+
+      if gem_name
+        if gem_name == "bundler"
+          path = File.expand_path("../../../..", __FILE__)
+        else
+          spec = Bundler::CLI::Common.select_spec(gem_name, :regex_match)
+          return unless spec
+          path = spec.full_gem_path
+          unless File.directory?(path)
+            return Bundler.ui.warn "The gem #{gem_name} has been deleted. It was installed at: #{path}"
+          end
+        end
+        return Bundler.ui.info(path)
+      end
+
+      if options[:paths]
+        Bundler.load.specs.sort_by(&:name).map do |s|
+          Bundler.ui.info s.full_gem_path
+        end
+      else
+        Bundler.ui.info "Gems included by the bundle:"
+        Bundler.load.specs.sort_by(&:name).each do |s|
+          desc = "  * #{s.name} (#{s.version}#{s.git_version})"
+          if @verbose
+            latest = latest_specs.find {|l| l.name == s.name }
+            Bundler.ui.info <<-END.gsub(/^ +/, "")
+              #{desc}
+              \tSummary:  #{s.summary || "No description available."}
+              \tHomepage: #{s.homepage || "No website available."}
+              \tStatus:   #{outdated?(s, latest) ? "Outdated - #{s.version} < #{latest.version}" : "Up to date"}
+            END
+          else
+            Bundler.ui.info desc
+          end
+        end
+      end
+    end
+
+    private
+
+    def fetch_latest_specs
+      definition = Bundler.definition(true)
+      if options[:outdated]
+        Bundler.ui.info "Fetching remote specs for outdated check...\n\n"
+        Bundler.ui.silence { definition.resolve_remotely! }
+      else
+        definition.resolve_with_cache!
+      end
+      Bundler.reset!
+      definition.specs
+    end
+
+    def outdated?(current, latest)
+      return false unless latest
+      Gem::Version.new(current.version) < Gem::Version.new(latest.version)
+    end
+  end
+end
diff --git a/lib/bundler/cli/update.rb b/lib/bundler/cli/update.rb
new file mode 100644
index 0000000000..95a8886ea5
--- /dev/null
+++ b/lib/bundler/cli/update.rb
@@ -0,0 +1,118 @@
+# frozen_string_literal: true
+
+module Bundler
+  class CLI::Update
+    attr_reader :options, :gems
+    def initialize(options, gems)
+      @options = options
+      @gems = gems
+    end
+
+    def run
+      Bundler.ui.level = "warn" if options[:quiet]
+
+      Plugin.gemfile_install(Bundler.default_gemfile) if Bundler.feature_flag.plugins?
+
+      sources = Array(options[:source])
+      groups  = Array(options[:group]).map(&:to_sym)
+
+      full_update = gems.empty? && sources.empty? && groups.empty? && !options[:ruby] && !options[:bundler]
+
+      if full_update && !options[:all]
+        if Bundler.feature_flag.update_requires_all_flag?
+          raise InvalidOption, "To update everything, pass the `--all` flag."
+        end
+        SharedHelpers.major_deprecation 3, "Pass --all to `bundle update` to update everything"
+      elsif !full_update && options[:all]
+        raise InvalidOption, "Cannot specify --all along with specific options."
+      end
+
+      conservative = options[:conservative]
+
+      if full_update
+        if conservative
+          Bundler.definition(:conservative => conservative)
+        else
+          Bundler.definition(true)
+        end
+      else
+        unless Bundler.default_lockfile.exist?
+          raise GemfileLockNotFound, "This Bundle hasn't been installed yet. " \
+            "Run `bundle install` to update and install the bundled gems."
+        end
+        Bundler::CLI::Common.ensure_all_gems_in_lockfile!(gems)
+
+        if groups.any?
+          deps = Bundler.definition.dependencies.select {|d| (d.groups & groups).any? }
+          gems.concat(deps.map(&:name))
+        end
+
+        Bundler.definition(:gems => gems, :sources => sources, :ruby => options[:ruby],
+                           :conservative => conservative,
+                           :bundler => options[:bundler])
+      end
+
+      Bundler::CLI::Common.configure_gem_version_promoter(Bundler.definition, options)
+
+      Bundler::Fetcher.disable_endpoint = options["full-index"]
+
+      opts = options.dup
+      opts["update"] = true
+      opts["local"] = options[:local]
+
+      Bundler.settings.set_command_option_if_given :jobs, opts["jobs"]
+
+      Bundler.definition.validate_runtime!
+
+      if locked_gems = Bundler.definition.locked_gems
+        previous_locked_info = locked_gems.specs.reduce({}) do |h, s|
+          h[s.name] = { :spec => s, :version => s.version, :source => s.source.identifier }
+          h
+        end
+      end
+
+      installer = Installer.install Bundler.root, Bundler.definition, opts
+      Bundler.load.cache if Bundler.app_cache.exist?
+
+      if CLI::Common.clean_after_install?
+        require_relative "clean"
+        Bundler::CLI::Clean.new(options).run
+      end
+
+      if locked_gems
+        gems.each do |name|
+          locked_info = previous_locked_info[name]
+          next unless locked_info
+
+          locked_spec = locked_info[:spec]
+          new_spec = Bundler.definition.specs[name].first
+          unless new_spec
+            unless locked_spec.match_platform(Bundler.local_platform)
+              Bundler.ui.warn "Bundler attempted to update #{name} but it was not considered because it is for a different platform from the current one"
+            end
+
+            next
+          end
+
+          locked_source = locked_info[:source]
+          new_source = new_spec.source.identifier
+          next if locked_source != new_source
+
+          new_version = new_spec.version
+          locked_version = locked_info[:version]
+          if new_version < locked_version
+            Bundler.ui.warn "Note: #{name} version regressed from #{locked_version} to #{new_version}"
+          elsif new_version == locked_version
+            Bundler.ui.warn "Bundler attempted to update #{name} but its version stayed the same"
+          end
+        end
+      end
+
+      Bundler.ui.confirm "Bundle updated!"
+      Bundler::CLI::Common.output_without_groups_message(:update)
+      Bundler::CLI::Common.output_post_install_messages installer.post_install_messages
+
+      Bundler::CLI::Common.output_fund_metadata_summary
+    end
+  end
+end
diff --git a/lib/bundler/cli/viz.rb b/lib/bundler/cli/viz.rb
new file mode 100644
index 0000000000..644f9b25cf
--- /dev/null
+++ b/lib/bundler/cli/viz.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Bundler
+  class CLI::Viz
+    attr_reader :options, :gem_name
+    def initialize(options)
+      @options = options
+    end
+
+    def run
+      # make sure we get the right `graphviz`. There is also a `graphviz`
+      # gem we're not built to support
+      gem "ruby-graphviz"
+      require "graphviz"
+
+      options[:without] = options[:without].join(":").tr(" ", ":").split(":")
+      output_file = File.expand_path(options[:file])
+
+      graph = Graph.new(Bundler.load, output_file, options[:version], options[:requirements], options[:format], options[:without])
+      graph.viz
+    rescue LoadError => e
+      Bundler.ui.error e.inspect
+      Bundler.ui.warn "Make sure you have the graphviz ruby gem. You can install it with:"
+      Bundler.ui.warn "`gem install ruby-graphviz`"
+    rescue StandardError => e
+      raise unless e.message =~ /GraphViz not installed or dot not in PATH/
+      Bundler.ui.error e.message
+      Bundler.ui.warn "Please install GraphViz. On a Mac with Homebrew, you can run `brew install graphviz`."
+    end
+  end
+end
diff --git a/lib/bundler/compact_index_client.rb b/lib/bundler/compact_index_client.rb
new file mode 100644
index 0000000000..d5dbeb3b10
--- /dev/null
+++ b/lib/bundler/compact_index_client.rb
@@ -0,0 +1,125 @@
+# frozen_string_literal: true
+
+require "pathname"
+require "set"
+
+module Bundler
+  class CompactIndexClient
+    DEBUG_MUTEX = Thread::Mutex.new
+    def self.debug
+      return unless ENV["DEBUG_COMPACT_INDEX"]
+      DEBUG_MUTEX.synchronize { warn("[#{self}] #{yield}") }
+    end
+
+    class Error < StandardError; end
+
+    require_relative "compact_index_client/cache"
+    require_relative "compact_index_client/updater"
+
+    attr_reader :directory
+
+    def initialize(directory, fetcher)
+      @directory = Pathname.new(directory)
+      @updater = Updater.new(fetcher)
+      @cache = Cache.new(@directory)
+      @endpoints = Set.new
+      @info_checksums_by_name = {}
+      @parsed_checksums = false
+      @mutex = Thread::Mutex.new
+    end
+
+    def execution_mode=(block)
+      Bundler::CompactIndexClient.debug { "execution_mode=" }
+      @endpoints = Set.new
+
+      @execution_mode = block
+    end
+
+    # @return [Lambda] A lambda that takes an array of inputs and a block, and
+    #         maps the inputs with the block in parallel.
+    #
+    def execution_mode
+      @execution_mode || sequentially
+    end
+
+    def sequential_execution_mode!
+      self.execution_mode = sequentially
+    end
+
+    def sequentially
+      @sequentially ||= lambda do |inputs, &blk|
+        inputs.map(&blk)
+      end
+    end
+
+    def names
+      Bundler::CompactIndexClient.debug { "/names" }
+      update(@cache.names_path, "names")
+      @cache.names
+    end
+
+    def versions
+      Bundler::CompactIndexClient.debug { "/versions" }
+      update(@cache.versions_path, "versions")
+      versions, @info_checksums_by_name = @cache.versions
+      versions
+    end
+
+    def dependencies(names)
+      Bundler::CompactIndexClient.debug { "dependencies(#{names})" }
+      execution_mode.call(names) do |name|
+        update_info(name)
+        @cache.dependencies(name).map {|d| d.unshift(name) }
+      end.flatten(1)
+    end
+
+    def spec(name, version, platform = nil)
+      Bundler::CompactIndexClient.debug { "spec(name = #{name}, version = #{version}, platform = #{platform})" }
+      update_info(name)
+      @cache.specific_dependency(name, version, platform)
+    end
+
+    def update_and_parse_checksums!
+      Bundler::CompactIndexClient.debug { "update_and_parse_checksums!" }
+      return @info_checksums_by_name if @parsed_checksums
+      update(@cache.versions_path, "versions")
+      @info_checksums_by_name = @cache.checksums
+      @parsed_checksums = true
+    end
+
+    private
+
+    def update(local_path, remote_path)
+      Bundler::CompactIndexClient.debug { "update(#{local_path}, #{remote_path})" }
+      unless synchronize { @endpoints.add?(remote_path) }
+        Bundler::CompactIndexClient.debug { "already fetched #{remote_path}" }
+        return
+      end
+      @updater.update(local_path, url(remote_path))
+    end
+
+    def update_info(name)
+      Bundler::CompactIndexClient.debug { "update_info(#{name})" }
+      path = @cache.info_path(name)
+      checksum = @updater.checksum_for_file(path)
+      unless existing = @info_checksums_by_name[name]
+        Bundler::CompactIndexClient.debug { "skipping updating info for #{name} since it is missing from versions" }
+        return
+      end
+      if checksum == existing
+        Bundler::CompactIndexClient.debug { "skipping updating info for #{name} since the versions checksum matches the local checksum" }
+        return
+      end
+      Bundler::CompactIndexClient.debug { "updating info for #{name} since the versions checksum #{existing} != the local checksum #{checksum}" }
+      update(path, "info/#{name}")
+    end
+
+    def url(path)
+      path
+    end
+
+    def synchronize
+      @mutex.synchronize { yield }
+    end
+  end
+end
diff --git a/lib/bundler/compact_index_client/cache.rb b/lib/bundler/compact_index_client/cache.rb
new file mode 100644
index 0000000000..c2cd069ec1
--- /dev/null
+++ b/lib/bundler/compact_index_client/cache.rb
@@ -0,0 +1,110 @@
+# frozen_string_literal: true
+
+require_relative "gem_parser"
+
+module Bundler
+  class CompactIndexClient
+    class Cache
+      attr_reader :directory
+
+      def initialize(directory)
+        @directory = Pathname.new(directory).expand_path
+        info_roots.each do |dir|
+          SharedHelpers.filesystem_access(dir) do
+            FileUtils.mkdir_p(dir)
+          end
+        end
+      end
+
+      def names
+        lines(names_path)
+      end
+
+      def names_path
+        directory.join("names")
+      end
+
+      def versions
+        versions_by_name = Hash.new {|hash, key| hash[key] = [] }
+        info_checksums_by_name = {}
+
+        lines(versions_path).each do |line|
+          name, versions_string, info_checksum = line.split(" ", 3)
+          info_checksums_by_name[name] = info_checksum || ""
+          versions_string.split(",").each do |version|
+            if version.start_with?("-")
+              version = version[1..-1].split("-", 2).unshift(name)
+              versions_by_name[name].delete(version)
+            else
+              version = version.split("-", 2).unshift(name)
+              versions_by_name[name] << version
+            end
+          end
+        end
+
+        [versions_by_name, info_checksums_by_name]
+      end
+
+      def versions_path
+        directory.join("versions")
+      end
+
+      def checksums
+        checksums = {}
+
+        lines(versions_path).each do |line|
+          name, _, checksum = line.split(" ", 3)
+          checksums[name] = checksum
+        end
+
+        checksums
+      end
+
+      def dependencies(name)
+        lines(info_path(name)).map do |line|
+          parse_gem(line)
+        end
+      end
+
+      def info_path(name)
+        name = name.to_s
+        if name =~ /[^a-z0-9_-]/
+          name += "-#{SharedHelpers.digest(:MD5).hexdigest(name).downcase}"
+          info_roots.last.join(name)
+        else
+          info_roots.first.join(name)
+        end
+      end
+
+      def specific_dependency(name, version, platform)
+        pattern = [version, platform].compact.join("-")
+        return nil if pattern.empty?
+
+        gem_lines = info_path(name).read
+        gem_line = gem_lines[/^#{Regexp.escape(pattern)}\b.*/, 0]
+        gem_line ? parse_gem(gem_line) : nil
+      end
+
+      private
+
+      def lines(path)
+        return [] unless path.file?
+        lines = SharedHelpers.filesystem_access(path, :read, &:read).split("\n")
+        header = lines.index("---")
+        header ? lines[header + 1..-1] : lines
+      end
+
+      def parse_gem(line)
+        @dependency_parser ||= GemParser.new
+        @dependency_parser.parse(line)
+      end
+
+      def info_roots
+        [
+          directory.join("info"),
+          directory.join("info-special-characters"),
+        ]
+      end
+    end
+  end
+end
diff --git a/lib/bundler/compact_index_client/gem_parser.rb b/lib/bundler/compact_index_client/gem_parser.rb
new file mode 100644
index 0000000000..e7bf4c6001
--- /dev/null
+++ b/lib/bundler/compact_index_client/gem_parser.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Bundler
+  class CompactIndexClient
+    if defined?(Gem::Resolver::APISet::GemParser)
+      GemParser = Gem::Resolver::APISet::GemParser
+    else
+      class GemParser
+        def parse(line)
+          version_and_platform, rest = line.split(" ", 2)
+          version, platform = version_and_platform.split("-", 2)
+          dependencies, requirements = rest.split("|", 2).map {|s| s.split(",") } if rest
+          dependencies = dependencies ? dependencies.map {|d| parse_dependency(d) } : []
+          requirements = requirements ? requirements.map {|d| parse_dependency(d) } : []
+          [version, platform, dependencies, requirements]
+        end
+
+        private
+
+        def parse_dependency(string)
+          dependency = string.split(":")
+          dependency[-1] = dependency[-1].split("&") if dependency.size > 1
+          dependency
+        end
+      end
+    end
+  end
+end
diff --git a/lib/bundler/compact_index_client/updater.rb b/lib/bundler/compact_index_client/updater.rb
new file mode 100644
index 0000000000..d9b9cec0d4
--- /dev/null
+++ b/lib/bundler/compact_index_client/updater.rb
@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+require_relative "../vendored_fileutils"
+
+module Bundler
+  class CompactIndexClient
+    class Updater
+      class MisMatchedChecksumError < Error
+        def initialize(path, server_checksum, local_checksum)
+          @path = path
+          @server_checksum = server_checksum
+          @local_checksum = local_checksum
+        end
+
+        def message
+          "The checksum of /#{@path} does not match the checksum provided by the server! Something is wrong " \
+            "(local checksum is #{@local_checksum.inspect}, was expecting #{@server_checksum.inspect})."
+        end
+      end
+
+      def initialize(fetcher)
+        @fetcher = fetcher
+        require_relative "../vendored_tmpdir"
+      end
+
+      def update(local_path, remote_path, retrying = nil)
+        headers = {}
+
+        Bundler::Dir.mktmpdir("bundler-compact-index-") do |local_temp_dir|
+          local_temp_path = Pathname.new(local_temp_dir).join(local_path.basename)
+
+          # first try to fetch any new bytes on the existing file
+          if retrying.nil? && local_path.file?
+            SharedHelpers.filesystem_access(local_temp_path) do
+              FileUtils.cp local_path, local_temp_path
+            end
+            headers["If-None-Match"] = etag_for(local_temp_path)
+            headers["Range"] =
+              if local_temp_path.size.nonzero?
+                # Subtract a byte to ensure the range won't be empty.
+                # Avoids 416 (Range Not Satisfiable) responses.
+                "bytes=#{local_temp_path.size - 1}-"
+              else
+                "bytes=#{local_temp_path.size}-"
+              end
+          end
+
+          response = @fetcher.call(remote_path, headers)
+          return nil if response.is_a?(Net::HTTPNotModified)
+
+          content = response.body
+
+          etag = (response["ETag"] || "").gsub(%r{\AW/}, "")
+          correct_response = SharedHelpers.filesystem_access(local_temp_path) do
+            if response.is_a?(Net::HTTPPartialContent) && local_temp_path.size.nonzero?
+              local_temp_path.open("a") {|f| f << slice_body(content, 1..-1) }
+
+              etag_for(local_temp_path) == etag
+            else
+              local_temp_path.open("wb") {|f| f << content }
+
+              etag.length.zero? || etag_for(local_temp_path) == etag
+            end
+          end
+
+          if correct_response
+            SharedHelpers.filesystem_access(local_path) do
+              FileUtils.mv(local_temp_path, local_path)
+            end
+            return nil
+          end
+
+          if retrying
+            raise MisMatchedChecksumError.new(remote_path, etag, etag_for(local_temp_path))
+          end
+
+          update(local_path, remote_path, :retrying)
+        end
+      rescue Zlib::GzipFile::Error
+        raise Bundler::HTTPError
+      end
+
+      def etag_for(path)
+        sum = checksum_for_file(path)
+        sum ? %("#{sum}") : nil
+      end
+
+      def slice_body(body, range)
+        body.byteslice(range)
+      end
+
+      def checksum_for_file(path)
+        return nil unless path.file?
+        # This must use File.read instead of Digest.file().hexdigest
+        # because we need to preserve \n line endings on windows when calculating
+        # the checksum
+        SharedHelpers.filesystem_access(path, :read) do
+          SharedHelpers.digest(:MD5).hexdigest(File.read(path))
+        end
+      end
+    end
+  end
+end
diff --git a/lib/bundler/constants.rb b/lib/bundler/constants.rb
new file mode 100644
index 0000000000..2e4ebb37ee
--- /dev/null
+++ b/lib/bundler/constants.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Bundler
+  WINDOWS = RbConfig::CONFIG["host_os"] =~ /(msdos|mswin|djgpp|mingw)/
+  FREEBSD = RbConfig::CONFIG["host_os"] =~ /bsd/
+  NULL    = WINDOWS ? "NUL" : "/dev/null"
+end
diff --git a/lib/bundler/current_ruby.rb b/lib/bundler/current_ruby.rb
new file mode 100644
index 0000000000..f84d68e262
--- /dev/null
+++ b/lib/bundler/current_ruby.rb
@@ -0,0 +1,96 @@
+# frozen_string_literal: true
+
+module Bundler
+  # Returns current version of Ruby
+  #
+  # @return [CurrentRuby] Current version of Ruby
+  def self.current_ruby
+    @current_ruby ||= CurrentRuby.new
+  end
+
+  class CurrentRuby
+    KNOWN_MINOR_VERSIONS = %w[
+      1.8
+      1.9
+      2.0
+      2.1
+      2.2
+      2.3
+      2.4
+      2.5
+      2.6
+      2.7
+      3.0
+    ].freeze
+
+    KNOWN_MAJOR_VERSIONS = KNOWN_MINOR_VERSIONS.map {|v| v.split(".", 2).first }.uniq.freeze
+
+    KNOWN_PLATFORMS = %w[
+      jruby
+      maglev
+      mingw
+      mri
+      mswin
+      mswin64
+      rbx
+      ruby
+      truffleruby
+      x64_mingw
+    ].freeze
+
+    def ruby?
+      return true if Bundler::GemHelpers.generic_local_platform == Gem::Platform::RUBY
+
+      !mswin? && (RUBY_ENGINE == "ruby" || RUBY_ENGINE == "rbx" || RUBY_ENGINE == "maglev" || RUBY_ENGINE == "truffleruby")
+    end
+
+    def mri?
+      !mswin? && RUBY_ENGINE == "ruby"
+    end
+
+    def rbx?
+      ruby? && RUBY_ENGINE == "rbx"
+    end
+
+    def jruby?
+      RUBY_ENGINE == "jruby"
+    end
+
+    def maglev?
+      RUBY_ENGINE == "maglev"
+    end
+
+    def truffleruby?
+      RUBY_ENGINE == "truffleruby"
+    end
+
+    def mswin?
+      Gem.win_platform?
+    end
+
+    def mswin64?
+      Gem.win_platform? && Bundler.local_platform != Gem::Platform::RUBY && Bundler.local_platform.os == "mswin64" && Bundler.local_platform.cpu == "x64"
+    end
+
+    def mingw?
+      Gem.win_platform? && Bundler.local_platform != Gem::Platform::RUBY && Bundler.local_platform.os == "mingw32" && Bundler.local_platform.cpu != "x64"
+    end
+
+    def x64_mingw?
+      Gem.win_platform? && Bundler.local_platform != Gem::Platform::RUBY && Bundler.local_platform.os == "mingw32" && Bundler.local_platform.cpu == "x64"
+    end
+
+    (KNOWN_MINOR_VERSIONS + KNOWN_MAJOR_VERSIONS).each do |version|
+      trimmed_version = version.tr(".", "")
+      define_method(:"on_#{trimmed_version}?") do
+        RUBY_VERSION.start_with?("#{version}.")
+      end
+
+      KNOWN_PLATFORMS.each do |platform|
+        define_method(:"#{platform}_#{trimmed_version}?") do
+          send(:"#{platform}?") && send(:"on_#{trimmed_version}?")
+        end
+      end
+    end
+  end
+end
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
new file mode 100644
index 0000000000..584f379256
--- /dev/null
+++ b/lib/bundler/definition.rb
@@ -0,0 +1,832 @@
+# frozen_string_literal: true
+
+require_relative "lockfile_parser"
+
+module Bundler
+  class Definition
+    include GemHelpers
+
+    attr_reader(
+      :dependencies,
+      :locked_deps,
+      :locked_gems,
+      :platforms,
+      :requires,
+      :ruby_version,
+      :lockfile,
+      :gemfiles
+    )
+
+    # Given a gemfile and lockfile creates a Bundler definition
+    #
+    # @param gemfile [Pathname] Path to Gemfile
+    # @param lockfile [Pathname,nil] Path to Gemfile.lock
+    # @param unlock [Hash, Boolean, nil] Gems that have been requested
+    #   to be updated or true if all gems should be updated
+    # @return [Bundler::Definition]
+    def self.build(gemfile, lockfile, unlock)
+      unlock ||= {}
+      gemfile = Pathname.new(gemfile).expand_path
+
+      raise GemfileNotFound, "#{gemfile} not found" unless gemfile.file?
+
+      Dsl.evaluate(gemfile, lockfile, unlock)
+    end
+
+    #
+    # How does the new system work?
+    #
+    # * Load information from Gemfile and Lockfile
+    # * Invalidate stale locked specs
+    #  * All specs from stale source are stale
+    #  * All specs that are reachable only through a stale
+    #    dependency are stale.
+    # * If all fresh dependencies are satisfied by the locked
+    #  specs, then we can try to resolve locally.
+    #
+    # @param lockfile [Pathname] Path to Gemfile.lock
+    # @param dependencies [Array(Bundler::Dependency)] array of dependencies from Gemfile
+    # @param sources [Bundler::SourceList]
+    # @param unlock [Hash, Boolean, nil] Gems that have been requested
+    #   to be updated or true if all gems should be updated
+    # @param ruby_version [Bundler::RubyVersion, nil] Requested Ruby Version
+    # @param optional_groups [Array(String)] A list of optional groups
+    def initialize(lockfile, dependencies, sources, unlock, ruby_version = nil, optional_groups = [], gemfiles = [])
+      if [true, false].include?(unlock)
+        @unlocking_bundler = false
+        @unlocking = unlock
+      else
+        @unlocking_bundler = unlock.delete(:bundler)
+        @unlocking = unlock.any? {|_k, v| !Array(v).empty? }
+      end
+
+      @dependencies    = dependencies
+      @sources         = sources
+      @unlock          = unlock
+      @optional_groups = optional_groups
+      @remote          = false
+      @specs           = nil
+      @ruby_version    = ruby_version
+      @gemfiles        = gemfiles
+
+      @lockfile               = lockfile
+      @lockfile_contents      = String.new
+      @locked_bundler_version = nil
+      @locked_ruby_version    = nil
+      @new_platform = nil
+
+      if lockfile && File.exist?(lockfile)
+        @lockfile_contents = Bundler.read_file(lockfile)
+        @locked_gems = LockfileParser.new(@lockfile_contents)
+        @locked_platforms = @locked_gems.platforms
+        @platforms = @locked_platforms.dup
+        @locked_bundler_version = @locked_gems.bundler_version
+        @locked_ruby_version = @locked_gems.ruby_version
+
+        if unlock != true
+          @locked_deps    = @locked_gems.dependencies
+          @locked_specs   = SpecSet.new(@locked_gems.specs)
+          @locked_sources = @locked_gems.sources
+        else
+          @unlock         = {}
+          @locked_deps    = {}
+          @locked_specs   = SpecSet.new([])
+          @locked_sources = []
+        end
+      else
+        @unlock         = {}
+        @platforms      = []
+        @locked_gems    = nil
+        @locked_deps    = {}
+        @locked_specs   = SpecSet.new([])
+        @locked_sources = []
+        @locked_platforms = []
+      end
+
+      locked_gem_sources = @locked_sources.select {|s| s.is_a?(Source::Rubygems) }
+      @multisource_allowed = locked_gem_sources.size == 1 && locked_gem_sources.first.multiple_remotes? && Bundler.frozen_bundle?
+
+      if @multisource_allowed
+        unless sources.aggregate_global_source?
+          msg = "Your lockfile contains a single rubygems source section with multiple remotes, which is insecure. Make sure you run `bundle install` in non frozen mode and commit the result to make your lockfile secure."
+
+          Bundler::SharedHelpers.major_deprecation 2, msg
+        end
+
+        @sources.merged_gem_lockfile_sections!(locked_gem_sources.first)
+      end
+
+      @unlock[:sources] ||= []
+      @unlock[:ruby] ||= if @ruby_version && locked_ruby_version_object
+        @ruby_version.diff(locked_ruby_version_object)
+      end
+      @unlocking ||= @unlock[:ruby] ||= (!@locked_ruby_version ^ !@ruby_version)
+
+      add_current_platform unless current_ruby_platform_locked? || Bundler.frozen_bundle?
+
+      converge_path_sources_to_gemspec_sources
+      @path_changes = converge_paths
+      @source_changes = converge_sources
+
+      if @unlock[:conservative]
+        @unlock[:gems] ||= @dependencies.map(&:name)
+      else
+        eager_unlock = expand_dependencies(@unlock[:gems] || [], true)
+        @unlock[:gems] = @locked_specs.for(eager_unlock, false, false).map(&:name)
+      end
+
+      @dependency_changes = converge_dependencies
+      @local_changes = converge_locals
+
+      @locked_specs_incomplete_for_platform = !@locked_specs.for(requested_dependencies & expand_dependencies(locked_dependencies), true, true)
+
+      @requires = compute_requires
+    end
+
+    def gem_version_promoter
+      @gem_version_promoter ||= begin
+        locked_specs =
+          if unlocking? && @locked_specs.empty? && !@lockfile_contents.empty?
+            # Definition uses an empty set of locked_specs to indicate all gems
+            # are unlocked, but GemVersionPromoter needs the locked_specs
+            # for conservative comparison.
+            Bundler::SpecSet.new(@locked_gems.specs)
+          else
+            @locked_specs
+          end
+        GemVersionPromoter.new(locked_specs, @unlock[:gems])
+      end
+    end
+
+    def resolve_only_locally!
+      @remote = false
+      sources.local_only!
+      resolve
+    end
+
+    def resolve_with_cache!
+      sources.cached!
+      resolve
+    end
+
+    def resolve_remotely!
+      @remote = true
+      sources.remote!
+      resolve
+    end
+
+    # For given dependency list returns a SpecSet with Gemspec of all the required
+    # dependencies.
+    #  1. The method first resolves the dependencies specified in Gemfile
+    #  2. After that it tries and fetches gemspec of resolved dependencies
+    #
+    # @return [Bundler::SpecSet]
+    def specs
+      @specs ||= materialize(requested_dependencies)
+    end
+
+    def new_specs
+      specs - @locked_specs
+    end
+
+    def removed_specs
+      @locked_specs - specs
+    end
+
+    def missing_specs
+      resolve.materialize(requested_dependencies).missing_specs
+    end
+
+    def missing_specs?
+      missing = missing_specs
+      return false if missing.empty?
+      Bundler.ui.debug "The definition is missing #{missing.map(&:full_name)}"
+      true
+    rescue BundlerError => e
+      @resolve = nil
+      @specs = nil
+      @gem_version_promoter = nil
+
+      Bundler.ui.debug "The definition is missing dependencies, failed to resolve & materialize locally (#{e})"
+      true
+    end
+
+    def requested_specs
+      specs_for(requested_groups)
+    end
+
+    def requested_dependencies
+      dependencies_for(requested_groups)
+    end
+
+    def current_dependencies
+      dependencies.select do |d|
+        d.should_include? && !d.gem_platforms(@platforms).empty?
+      end
+    end
+
+    def locked_dependencies
+      @locked_deps.values
+    end
+
+    def specs_for(groups)
+      return specs if groups.empty?
+      deps = dependencies_for(groups)
+      materialize(deps)
+    end
+
+    def dependencies_for(groups)
+      groups.map!(&:to_sym)
+      deps = current_dependencies.reject do |d|
+        (d.groups & groups).empty?
+      end
+      expand_dependencies(deps)
+    end
+
+    # Resolve all the dependencies specified in Gemfile. It ensures that
+    # dependencies that have been already resolved via locked file and are fresh
+    # are reused when resolving dependencies
+    #
+    # @return [SpecSet] resolved dependencies
+    def resolve
+      @resolve ||= begin
+        last_resolve = converge_locked_specs
+        if Bundler.frozen_bundle?
+          Bundler.ui.debug "Frozen, using resolution from the lockfile"
+          last_resolve
+        elsif !unlocking? && nothing_changed?
+          Bundler.ui.debug("Found no changes, using resolution from the lockfile")
+          last_resolve
+        else
+          # Run a resolve against the locally available gems
+          Bundler.ui.debug("Found changes from the lockfile, re-resolving dependencies because #{change_reason}")
+          expanded_dependencies = expand_dependencies(dependencies + metadata_dependencies, @remote)
+          Resolver.resolve(expanded_dependencies, source_requirements, last_resolve, gem_version_promoter, additional_base_requirements_for_resolve, platforms)
+        end
+      end
+    end
+
+    def spec_git_paths
+      sources.git_sources.map {|s| File.realpath(s.path) if File.exist?(s.path) }.compact
+    end
+
+    def groups
+      dependencies.map(&:groups).flatten.uniq
+    end
+
+    def lock(file, preserve_unknown_sections = false)
+      contents = to_lock
+
+      # Convert to \r\n if the existing lock has them
+      # i.e., Windows with `git config core.autocrlf=true`
+      contents.gsub!(/\n/, "\r\n") if @lockfile_contents.match("\r\n")
+
+      if @locked_bundler_version
+        locked_major = @locked_bundler_version.segments.first
+        current_major = Gem::Version.create(Bundler::VERSION).segments.first
+
+        if updating_major = locked_major < current_major
+          Bundler.ui.warn "Warning: the lockfile is being updated to Bundler #{current_major}, " \
+                          "after which you will be unable to return to Bundler #{@locked_bundler_version.segments.first}."
+        end
+      end
+
+      preserve_unknown_sections ||= !updating_major && (Bundler.frozen_bundle? || !(unlocking? || @unlocking_bundler))
+
+      return if file && File.exist?(file) && lockfiles_equal?(@lockfile_contents, contents, preserve_unknown_sections)
+
+      if Bundler.frozen_bundle?
+        Bundler.ui.error "Cannot write a changed lockfile while frozen."
+        return
+      end
+
+      SharedHelpers.filesystem_access(file) do |p|
+        File.open(p, "wb") {|f| f.puts(contents) }
+      end
+    end
+
+    def locked_bundler_version
+      if @locked_bundler_version && @locked_bundler_version < Gem::Version.new(Bundler::VERSION)
+        new_version = Bundler::VERSION
+      end
+
+      new_version || @locked_bundler_version || Bundler::VERSION
+    end
+
+    def locked_ruby_version
+      return unless ruby_version
+      if @unlock[:ruby] || !@locked_ruby_version
+        Bundler::RubyVersion.system
+      else
+        @locked_ruby_version
+      end
+    end
+
+    def locked_ruby_version_object
+      return unless @locked_ruby_version
+      @locked_ruby_version_object ||= begin
+        unless version = RubyVersion.from_string(@locked_ruby_version)
+          raise LockfileError, "The Ruby version #{@locked_ruby_version} from " \
+            "#{@lockfile} could not be parsed. " \
+            "Try running bundle update --ruby to resolve this."
+        end
+        version
+      end
+    end
+
+    def to_lock
+      require_relative "lockfile_generator"
+      LockfileGenerator.generate(self)
+    end
+
+    def ensure_equivalent_gemfile_and_lockfile(explicit_flag = false)
+      msg = String.new
+      msg << "You are trying to install in deployment mode after changing\n" \
+             "your Gemfile. Run `bundle install` elsewhere and add the\n" \
+             "updated #{Bundler.default_lockfile.relative_path_from(SharedHelpers.pwd)} to version control."
+
+      unless explicit_flag
+        suggested_command = if Bundler.settings.locations("frozen").keys.&([:global, :local]).any?
+          "bundle config unset frozen"
+        elsif Bundler.settings.locations("deployment").keys.&([:global, :local]).any?
+          "bundle config unset deployment"
+        end
+        msg << "\n\nIf this is a development machine, remove the #{Bundler.default_gemfile} " \
+               "freeze \nby running `#{suggested_command}`."
+      end
+
+      added =   []
+      deleted = []
+      changed = []
+
+      new_platforms = @platforms - @locked_platforms
+      deleted_platforms = @locked_platforms - @platforms
+      added.concat new_platforms.map {|p| "* platform: #{p}" }
+      deleted.concat deleted_platforms.map {|p| "* platform: #{p}" }
+
+      new_deps = @dependencies - locked_dependencies
+      deleted_deps = locked_dependencies - @dependencies
+
+      added.concat new_deps.map {|d| "* #{pretty_dep(d)}" } if new_deps.any?
+      deleted.concat deleted_deps.map {|d| "* #{pretty_dep(d)}" } if deleted_deps.any?
+
+      both_sources = Hash.new {|h, k| h[k] = [] }
+      @dependencies.each {|d| both_sources[d.name][0] = d }
+      locked_dependencies.each {|d| both_sources[d.name][1] = d }
+
+      both_sources.each do |name, (dep, lock_dep)|
+        next if dep.nil? || lock_dep.nil?
+
+        gemfile_source = dep.source || sources.default_source
+        lock_source = lock_dep.source || sources.default_source
+        next if lock_source.include?(gemfile_source)
+
+        gemfile_source_name = dep.source ? gemfile_source.identifier : "no specified source"
+        lockfile_source_name = lock_dep.source ? lock_source.identifier : "no specified source"
+        changed << "* #{name} from `#{lockfile_source_name}` to `#{gemfile_source_name}`"
+      end
+
+      reason = change_reason
+      msg << "\n\n#{reason.split(", ").map(&:capitalize).join("\n")}" unless reason.strip.empty?
+      msg << "\n\nYou have added to the Gemfile:\n" << added.join("\n") if added.any?
+      msg << "\n\nYou have deleted from the Gemfile:\n" << deleted.join("\n") if deleted.any?
+      msg << "\n\nYou have changed in the Gemfile:\n" << changed.join("\n") if changed.any?
+      msg << "\n"
+
+      raise ProductionError, msg if added.any? || deleted.any? || changed.any? || !nothing_changed?
+    end
+
+    def validate_runtime!
+      validate_ruby!
+      validate_platforms!
+    end
+
+    def validate_ruby!
+      return unless ruby_version
+
+      if diff = ruby_version.diff(Bundler::RubyVersion.system)
+        problem, expected, actual = diff
+
+        msg = case problem
+              when :engine
+                "Your Ruby engine is #{actual}, but your Gemfile specified #{expected}"
+              when :version
+                "Your Ruby version is #{actual}, but your Gemfile specified #{expected}"
+              when :engine_version
+                "Your #{Bundler::RubyVersion.system.engine} version is #{actual}, but your Gemfile specified #{ruby_version.engine} #{expected}"
+              when :patchlevel
+                if !expected.is_a?(String)
+                  "The Ruby patchlevel in your Gemfile must be a string"
+                else
+                  "Your Ruby patchlevel is #{actual}, but your Gemfile specified #{expected}"
+                end
+        end
+
+        raise RubyVersionMismatch, msg
+      end
+    end
+
+    def validate_platforms!
+      return if current_platform_locked?
+
+      raise ProductionError, "Your bundle only supports platforms #{@platforms.map(&:to_s)} " \
+        "but your local platform is #{Bundler.local_platform}. " \
+        "Add the current platform to the lockfile with `bundle lock --add-platform #{Bundler.local_platform}` and try again."
+    end
+
+    def add_platform(platform)
+      @new_platform ||= !@platforms.include?(platform)
+      @platforms |= [platform]
+    end
+
+    def remove_platform(platform)
+      return if @platforms.delete(Gem::Platform.new(platform))
+      raise InvalidOption, "Unable to remove the platform `#{platform}` since the only platforms are #{@platforms.join ", "}"
+    end
+
+    def most_specific_locked_platform
+      @platforms.min_by do |bundle_platform|
+        platform_specificity_match(bundle_platform, local_platform)
+      end
+    end
+
+    attr_reader :sources
+    private :sources
+
+    def nothing_changed?
+      !@source_changes && !@dependency_changes && !@new_platform && !@path_changes && !@local_changes && !@locked_specs_incomplete_for_platform
+    end
+
+    def unlocking?
+      @unlocking
+    end
+
+    private
+
+    def materialize(dependencies)
+      specs = resolve.materialize(dependencies)
+      missing_specs = specs.missing_specs
+
+      if missing_specs.any?
+        missing_specs.each do |s|
+          locked_gem = @locked_specs[s.name].last
+          next if locked_gem.nil? || locked_gem.version != s.version || !@remote
+          raise GemNotFound, "Your bundle is locked to #{locked_gem} from #{locked_gem.source}, but that version can " \
+                             "no longer be found in that source. That means the author of #{locked_gem} has removed it. " \
+                             "You'll need to update your bundle to a version other than #{locked_gem} that hasn't been " \
+                             "removed in order to install."
+        end
+
+        raise GemNotFound, "Could not find #{missing_specs.map(&:full_name).join(", ")} in any of the sources"
+      end
+
+      unless specs["bundler"].any?
+        bundler = sources.metadata_source.specs.search(Gem::Dependency.new("bundler", VERSION)).last
+        specs["bundler"] = bundler
+      end
+
+      specs
+    end
+
+    def precompute_source_requirements_for_indirect_dependencies?
+      @remote && sources.non_global_rubygems_sources.all?(&:dependency_api_available?) && !sources.aggregate_global_source?
+    end
+
+    def current_ruby_platform_locked?
+      return false unless generic_local_platform == Gem::Platform::RUBY
+
+      current_platform_locked?
+    end
+
+    def current_platform_locked?
+      @platforms.any? do |bundle_platform|
+        MatchPlatform.platforms_match?(bundle_platform, Bundler.local_platform)
+      end
+    end
+
+    def add_current_platform
+      add_platform(local_platform)
+    end
+
+    def change_reason
+      if unlocking?
+        unlock_reason = @unlock.reject {|_k, v| Array(v).empty? }.map do |k, v|
+          if v == true
+            k.to_s
+          else
+            v = Array(v)
+            "#{k}: (#{v.join(", ")})"
+          end
+        end.join(", ")
+        return "bundler is unlocking #{unlock_reason}"
+      end
+      [
+        [@source_changes, "the list of sources changed"],
+        [@dependency_changes, "the dependencies in your gemfile changed"],
+        [@new_platform, "you added a new platform to your gemfile"],
+        [@path_changes, "the gemspecs for path gems changed"],
+        [@local_changes, "the gemspecs for git local gems changed"],
+        [@locked_specs_incomplete_for_platform, "the lockfile does not have all gems needed for the current platform"],
+      ].select(&:first).map(&:last).join(", ")
+    end
+
+    def pretty_dep(dep, source = false)
+      SharedHelpers.pretty_dependency(dep, source)
+    end
+
+    # Check if the specs of the given source changed
+    # according to the locked source.
+    def specs_changed?(source)
+      locked = @locked_sources.find {|s| s == source }
+
+      !locked || dependencies_for_source_changed?(source, locked) || specs_for_source_changed?(source)
+    end
+
+    def dependencies_for_source_changed?(source, locked_source = source)
+      deps_for_source = @dependencies.select {|s| s.source == source }
+      locked_deps_for_source = locked_dependencies.select {|dep| dep.source == locked_source }
+
+      deps_for_source.uniq.sort != locked_deps_for_source.sort
+    end
+
+    def specs_for_source_changed?(source)
+      locked_index = Index.new
+      locked_index.use(@locked_specs.select {|s| source.can_lock?(s) })
+
+      # order here matters, since Index#== is checking source.specs.include?(locked_index)
+      locked_index != source.specs
+    rescue PathError, GitError => e
+      Bundler.ui.debug "Assuming that #{source} has not changed since fetching its specs errored (#{e})"
+      false
+    end
+
+    # Get all locals and override their matching sources.
+    # Return true if any of the locals changed (for example,
+    # they point to a new revision) or depend on new specs.
+    def converge_locals
+      locals = []
+
+      Bundler.settings.local_overrides.map do |k, v|
+        spec   = @dependencies.find {|s| s.name == k }
+        source = spec && spec.source
+        if source && source.respond_to?(:local_override!)
+          source.unlock! if @unlock[:gems].include?(spec.name)
+          locals << [source, source.local_override!(v)]
+        end
+      end
+
+      sources_with_changes = locals.select do |source, changed|
+        changed || specs_changed?(source)
+      end.map(&:first)
+      !sources_with_changes.each {|source| @unlock[:sources] << source.name }.empty?
+    end
+
+    def converge_paths
+      sources.path_sources.any? do |source|
+        specs_changed?(source)
+      end
+    end
+
+    def converge_path_source_to_gemspec_source(source)
+      return source unless source.instance_of?(Source::Path)
+      gemspec_source = sources.path_sources.find {|s| s.is_a?(Source::Gemspec) && s.as_path_source == source }
+      gemspec_source || source
+    end
+
+    def converge_path_sources_to_gemspec_sources
+      @locked_sources.map! do |source|
+        converge_path_source_to_gemspec_source(source)
+      end
+      @locked_specs.each do |spec|
+        spec.source &&= converge_path_source_to_gemspec_source(spec.source)
+      end
+      @locked_deps.each do |_, dep|
+        dep.source &&= converge_path_source_to_gemspec_source(dep.source)
+      end
+    end
+
+    def converge_sources
+      # Replace the sources from the Gemfile with the sources from the Gemfile.lock,
+      # if they exist in the Gemfile.lock and are `==`. If you can't find an equivalent
+      # source in the Gemfile.lock, use the one from the Gemfile.
+      changes = sources.replace_sources!(@locked_sources)
+
+      sources.all_sources.each do |source|
+        # If the source is unlockable and the current command allows an unlock of
+        # the source (for example, you are doing a `bundle update <foo>` of a git-pinned
+        # gem), unlock it. For git sources, this means to unlock the revision, which
+        # will cause the `ref` used to be the most recent for the branch (or master) if
+        # an explicit `ref` is not used.
+        if source.respond_to?(:unlock!) && @unlock[:sources].include?(source.name)
+          source.unlock!
+          changes = true
+        end
+      end
+
+      changes
+    end
+
+    def converge_dependencies
+      changes = false
+
+      @dependencies.each do |dep|
+        if dep.source
+          dep.source = sources.get(dep.source)
+        end
+
+        unless locked_dep = @locked_deps[dep.name]
+          changes = true
+          next
+        end
+
+        # Gem::Dependency#== matches Gem::Dependency#type. As the lockfile
+        # doesn't carry a notion of the dependency type, if you use
+        # add_development_dependency in a gemspec that's loaded with the gemspec
+        # directive, the lockfile dependencies and resolved dependencies end up
+        # with a mismatch on #type. Work around that by setting the type on the
+        # dep from the lockfile.
+        locked_dep.instance_variable_set(:@type, dep.type)
+
+        # We already know the name matches from the hash lookup
+        # so we only need to check the requirement now
+        changes ||= dep.requirement != locked_dep.requirement
+      end
+
+      changes
+    end
+
+    # Remove elements from the locked specs that are expired. This will most
+    # commonly happen if the Gemfile has changed since the lockfile was last
+    # generated
+    def converge_locked_specs
+      resolve = converge_specs(@locked_specs)
+
+      diff = nil
+
+      # Now, we unlock any sources that do not have anymore gems pinned to it
+      sources.all_sources.each do |source|
+        next unless source.respond_to?(:unlock!)
+
+        unless resolve.any? {|s| s.source == source }
+          diff ||= @locked_specs.to_a - resolve.to_a
+          source.unlock! if diff.any? {|s| s.source == source }
+        end
+      end
+
+      resolve
+    end
+
+    def converge_specs(specs)
+      deps = []
+      converged = []
+      specs.each do |s|
+        # Replace the locked dependency's source with the equivalent source from the Gemfile
+        dep = @dependencies.find {|d| s.satisfies?(d) }
+
+        if dep && (!dep.source || s.source.include?(dep.source))
+          deps << dep
+        end
+
+        s.source = (dep && dep.source) || sources.get(s.source) || sources.default_source unless Bundler.frozen_bundle?
+
+        next if @unlock[:sources].include?(s.source.name)
+
+        # If the spec is from a path source and it doesn't exist anymore
+        # then we unlock it.
+
+        # Path sources have special logic
+        if s.source.instance_of?(Source::Path) || s.source.instance_of?(Source::Gemspec)
+          new_specs = begin
+            s.source.specs
+          rescue PathError, GitError
+            # if we won't need the source (according to the lockfile),
+            # don't error if the path/git source isn't available
+            next if specs.
+                    for(requested_dependencies, false, true).
+                    none? {|locked_spec| locked_spec.source == s.source }
+
+            raise
+          end
+
+          new_spec = new_specs[s].first
+
+          # If the spec is no longer in the path source, unlock it. This
+          # commonly happens if the version changed in the gemspec
+          next unless new_spec
+
+          s.dependencies.replace(new_spec.dependencies)
+        end
+
+        if dep.nil? && requested_dependencies.find {|d| s.name == d.name }
+          @unlock[:gems] << s.name
+        else
+          converged << s
+        end
+      end
+
+      resolve = SpecSet.new(converged)
+      SpecSet.new(resolve.for(expand_dependencies(deps, true), false, false).reject{|s| @unlock[:gems].include?(s.name) })
+    end
+
+    def metadata_dependencies
+      @metadata_dependencies ||= begin
+        ruby_versions = ruby_version_requirements(@ruby_version)
+        [
+          Dependency.new("Ruby\0", ruby_versions),
+          Dependency.new("RubyGems\0", Gem::VERSION),
+        ]
+      end
+    end
+
+    def ruby_version_requirements(ruby_version)
+      return [] unless ruby_version
+      if ruby_version.patchlevel
+        [ruby_version.to_gem_version_with_patchlevel]
+      else
+        ruby_version.versions.map do |version|
+          requirement = Gem::Requirement.new(version)
+          if requirement.exact?
+            "~> #{version}.0"
+          else
+            requirement
+          end
+        end
+      end
+    end
+
+    def expand_dependencies(dependencies, remote = false)
+      deps = []
+      dependencies.each do |dep|
+        dep = Dependency.new(dep, ">= 0") unless dep.respond_to?(:name)
+        next unless remote || dep.current_platform?
+        target_platforms = dep.gem_platforms(remote ? @platforms : [generic_local_platform])
+        deps += expand_dependency_with_platforms(dep, target_platforms)
+      end
+      deps
+    end
+
+    def expand_dependency_with_platforms(dep, platforms)
+      platforms.map do |p|
+        DepProxy.get_proxy(dep, p)
+      end
+    end
+
+    def source_requirements
+      # Record the specs available in each gem's source, so that those
+      # specs will be available later when the resolver knows where to
+      # look for that gemspec (or its dependencies)
+      source_requirements = if precompute_source_requirements_for_indirect_dependencies?
+        { :default => sources.default_source }.merge(source_map.all_requirements)
+      else
+        { :default => Source::RubygemsAggregate.new(sources, source_map) }.merge(source_map.direct_requirements)
+      end
+      metadata_dependencies.each do |dep|
+        source_requirements[dep.name] = sources.metadata_source
+      end
+      source_requirements[:default_bundler] = source_requirements["bundler"] || sources.default_source
+      source_requirements["bundler"] = sources.metadata_source # needs to come last to override
+      source_requirements
+    end
+
+    def requested_groups
+      groups - Bundler.settings[:without] - @optional_groups + Bundler.settings[:with]
+    end
+
+    def lockfiles_equal?(current, proposed, preserve_unknown_sections)
+      if preserve_unknown_sections
+        sections_to_ignore = LockfileParser.sections_to_ignore(@locked_bundler_version)
+        sections_to_ignore += LockfileParser.unknown_sections_in_lockfile(current)
+        sections_to_ignore += LockfileParser::ENVIRONMENT_VERSION_SECTIONS
+        pattern = /#{Regexp.union(sections_to_ignore)}\n(\s{2,}.*\n)+/
+        whitespace_cleanup = /\n{2,}/
+        current = current.gsub(pattern, "\n").gsub(whitespace_cleanup, "\n\n").strip
+        proposed = proposed.gsub(pattern, "\n").gsub(whitespace_cleanup, "\n\n").strip
+      end
+      current == proposed
+    end
+
+    def compute_requires
+      dependencies.reduce({}) do |requires, dep|
+        next requires unless dep.should_include?
+        requires[dep.name] = Array(dep.autorequire || dep.name).map do |file|
+          # Allow `require: true` as an alias for `require: <name>`
+          file == true ? dep.name : file
+        end
+        requires
+      end
+    end
+
+    def additional_base_requirements_for_resolve
+      return [] unless @locked_gems && unlocking? && !sources.expired_sources?(@locked_gems.sources)
+      converge_specs(@locked_gems.specs).map do |locked_spec|
+        name = locked_spec.name
+        dep = Gem::Dependency.new(name, ">= #{locked_spec.version}")
+        DepProxy.get_proxy(dep, locked_spec.platform)
+      end
+    end
+
+    def source_map
+      @source_map ||= SourceMap.new(sources, dependencies)
+    end
+  end
+end
diff --git a/lib/bundler/dep_proxy.rb b/lib/bundler/dep_proxy.rb
new file mode 100644
index 0000000000..a32dc37b49
--- /dev/null
+++ b/lib/bundler/dep_proxy.rb
@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module Bundler
+  class DepProxy
+    attr_reader :__platform, :dep
+
+    @proxies = {}
+
+    def self.get_proxy(dep, platform)
+      @proxies[[dep, platform]] ||= new(dep, platform).freeze
+    end
+
+    def initialize(dep, platform)
+      @dep = dep
+      @__platform = platform
+    end
+
+    private_class_method :new
+
+    alias_method :eql?, :==
+
+    def type
+      @dep.type
+    end
+
+    def name
+      @dep.name
+    end
+
+    def requirement
+      @dep.requirement
+    end
+
+    def to_s
+      s = name.dup
+      s << " (#{requirement})" unless requirement == Gem::Requirement.default
+      s << " #{__platform}" unless __platform == Gem::Platform::RUBY
+      s
+    end
+
+    def dup
+      raise NoMethodError.new("DepProxy cannot be duplicated")
+    end
+
+    def clone
+      raise NoMethodError.new("DepProxy cannot be cloned")
+    end
+
+    private
+
+    def method_missing(*args, &blk)
+      @dep.send(*args, &blk)
+    end
+  end
+end
diff --git a/lib/bundler/dependency.rb b/lib/bundler/dependency.rb
new file mode 100644
index 0000000000..af07e8bc36
--- /dev/null
+++ b/lib/bundler/dependency.rb
@@ -0,0 +1,144 @@
+# frozen_string_literal: true
+
+require "rubygems/dependency"
+require_relative "shared_helpers"
+require_relative "rubygems_ext"
+
+module Bundler
+  class Dependency < Gem::Dependency
+    attr_reader :autorequire
+    attr_reader :groups, :platforms, :gemfile, :git, :branch
+
+    PLATFORM_MAP = {
+      :ruby     => Gem::Platform::RUBY,
+      :ruby_18  => Gem::Platform::RUBY,
+      :ruby_19  => Gem::Platform::RUBY,
+      :ruby_20  => Gem::Platform::RUBY,
+      :ruby_21  => Gem::Platform::RUBY,
+      :ruby_22  => Gem::Platform::RUBY,
+      :ruby_23  => Gem::Platform::RUBY,
+      :ruby_24  => Gem::Platform::RUBY,
+      :ruby_25  => Gem::Platform::RUBY,
+      :ruby_26  => Gem::Platform::RUBY,
+      :mri      => Gem::Platform::RUBY,
+      :mri_18   => Gem::Platform::RUBY,
+      :mri_19   => Gem::Platform::RUBY,
+      :mri_20   => Gem::Platform::RUBY,
+      :mri_21   => Gem::Platform::RUBY,
+      :mri_22   => Gem::Platform::RUBY,
+      :mri_23   => Gem::Platform::RUBY,
+      :mri_24   => Gem::Platform::RUBY,
+      :mri_25   => Gem::Platform::RUBY,
+      :mri_26   => Gem::Platform::RUBY,
+      :rbx      => Gem::Platform::RUBY,
+      :truffleruby => Gem::Platform::RUBY,
+      :jruby    => Gem::Platform::JAVA,
+      :jruby_18 => Gem::Platform::JAVA,
+      :jruby_19 => Gem::Platform::JAVA,
+      :mswin    => Gem::Platform::MSWIN,
+      :mswin_18 => Gem::Platform::MSWIN,
+      :mswin_19 => Gem::Platform::MSWIN,
+      :mswin_20 => Gem::Platform::MSWIN,
+      :mswin_21 => Gem::Platform::MSWIN,
+      :mswin_22 => Gem::Platform::MSWIN,
+      :mswin_23 => Gem::Platform::MSWIN,
+      :mswin_24 => Gem::Platform::MSWIN,
+      :mswin_25 => Gem::Platform::MSWIN,
+      :mswin_26 => Gem::Platform::MSWIN,
+      :mswin64    => Gem::Platform::MSWIN64,
+      :mswin64_19 => Gem::Platform::MSWIN64,
+      :mswin64_20 => Gem::Platform::MSWIN64,
+      :mswin64_21 => Gem::Platform::MSWIN64,
+      :mswin64_22 => Gem::Platform::MSWIN64,
+      :mswin64_23 => Gem::Platform::MSWIN64,
+      :mswin64_24 => Gem::Platform::MSWIN64,
+      :mswin64_25 => Gem::Platform::MSWIN64,
+      :mswin64_26 => Gem::Platform::MSWIN64,
+      :mingw    => Gem::Platform::MINGW,
+      :mingw_18 => Gem::Platform::MINGW,
+      :mingw_19 => Gem::Platform::MINGW,
+      :mingw_20 => Gem::Platform::MINGW,
+      :mingw_21 => Gem::Platform::MINGW,
+      :mingw_22 => Gem::Platform::MINGW,
+      :mingw_23 => Gem::Platform::MINGW,
+      :mingw_24 => Gem::Platform::MINGW,
+      :mingw_25 => Gem::Platform::MINGW,
+      :mingw_26 => Gem::Platform::MINGW,
+      :x64_mingw    => Gem::Platform::X64_MINGW,
+      :x64_mingw_20 => Gem::Platform::X64_MINGW,
+      :x64_mingw_21 => Gem::Platform::X64_MINGW,
+      :x64_mingw_22 => Gem::Platform::X64_MINGW,
+      :x64_mingw_23 => Gem::Platform::X64_MINGW,
+      :x64_mingw_24 => Gem::Platform::X64_MINGW,
+      :x64_mingw_25 => Gem::Platform::X64_MINGW,
+      :x64_mingw_26 => Gem::Platform::X64_MINGW,
+    }.freeze
+
+    def initialize(name, version, options = {}, &blk)
+      type = options["type"] || :runtime
+      super(name, version, type)
+
+      @autorequire    = nil
+      @groups         = Array(options["group"] || :default).map(&:to_sym)
+      @source         = options["source"]
+      @git            = options["git"]
+      @branch         = options["branch"]
+      @platforms      = Array(options["platforms"])
+      @env            = options["env"]
+      @should_include = options.fetch("should_include", true)
+      @gemfile        = options["gemfile"]
+
+      @autorequire = Array(options["require"] || []) if options.key?("require")
+    end
+
+    # Returns the platforms this dependency is valid for, in the same order as
+    # passed in the `valid_platforms` parameter
+    def gem_platforms(valid_platforms)
+      return valid_platforms if @platforms.empty?
+
+      valid_generic_platforms = valid_platforms.map {|p| [p, GemHelpers.generic(p)] }.to_h
+      @gem_platforms ||= expanded_platforms.compact.uniq
+
+      filtered_generic_platforms = valid_generic_platforms.values & @gem_platforms
+      valid_generic_platforms.select {|_, v| filtered_generic_platforms.include?(v) }.keys
+    end
+
+    def expanded_platforms
+      @platforms.map {|pl| PLATFORM_MAP[pl] }
+    end
+
+    def should_include?
+      @should_include && current_env? && current_platform?
+    end
+
+    def current_env?
+      return true unless @env
+      if @env.is_a?(Hash)
+        @env.all? do |key, val|
+          ENV[key.to_s] && (val.is_a?(String) ? ENV[key.to_s] == val : ENV[key.to_s] =~ val)
+        end
+      else
+        ENV[@env.to_s]
+      end
+    end
+
+    def current_platform?
+      return true if @platforms.empty?
+      @platforms.any? do |p|
+        Bundler.current_ruby.send("#{p}?")
+      end
+    end
+
+    def to_lock
+      out = super
+      out << "!" if source
+      out << "\n"
+    end
+
+    def specific?
+      super
+    rescue NoMethodError
+      requirement != ">= 0"
+    end
+  end
+end
diff --git a/lib/bundler/deployment.rb b/lib/bundler/deployment.rb
new file mode 100644
index 0000000000..b432ae6ae1
--- /dev/null
+++ b/lib/bundler/deployment.rb
@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+require_relative "shared_helpers"
+Bundler::SharedHelpers.major_deprecation 2, "Bundler no longer integrates with " \
+  "Capistrano, but Capistrano provides its own integration with " \
+  "Bundler via the capistrano-bundler gem. Use it instead."
+
+module Bundler
+  class Deployment
+    def self.define_task(context, task_method = :task, opts = {})
+      if defined?(Capistrano) && context.is_a?(Capistrano::Configuration)
+        context_name = "capistrano"
+        role_default = "{:except => {:no_release => true}}"
+        error_type = ::Capistrano::CommandError
+      else
+        context_name = "vlad"
+        role_default = "[:app]"
+        error_type = ::Rake::CommandFailedError
+      end
+
+      roles = context.fetch(:bundle_roles, false)
+      opts[:roles] = roles if roles
+
+      context.send :namespace, :bundle do
+        send :desc, <<-DESC
+          Install the current Bundler environment. By default, gems will be \
+          installed to the shared/bundle path. Gems in the development and \
+          test group will not be installed. The install command is executed \
+          with the --deployment and --quiet flags. If the bundle cmd cannot \
+          be found then you can override the bundle_cmd variable to specify \
+          which one it should use. The base path to the app is fetched from \
+          the :latest_release variable. Set it for custom deploy layouts.
+
+          You can override any of these defaults by setting the variables shown below.
+
+          N.B. bundle_roles must be defined before you require 'bundler/#{context_name}' \
+          in your deploy.rb file.
+
+            set :bundle_gemfile,  "Gemfile"
+            set :bundle_dir,      File.join(fetch(:shared_path), 'bundle')
+            set :bundle_flags,    "--deployment --quiet"
+            set :bundle_without,  [:development, :test]
+            set :bundle_with,     [:mysql]
+            set :bundle_cmd,      "bundle" # e.g. "/opt/ruby/bin/bundle"
+            set :bundle_roles,    #{role_default} # e.g. [:app, :batch]
+        DESC
+        send task_method, :install, opts do
+          bundle_cmd     = context.fetch(:bundle_cmd, "bundle")
+          bundle_flags   = context.fetch(:bundle_flags, "--deployment --quiet")
+          bundle_dir     = context.fetch(:bundle_dir, File.join(context.fetch(:shared_path), "bundle"))
+          bundle_gemfile = context.fetch(:bundle_gemfile, "Gemfile")
+          bundle_without = [*context.fetch(:bundle_without, [:development, :test])].compact
+          bundle_with    = [*context.fetch(:bundle_with, [])].compact
+          app_path = context.fetch(:latest_release)
+          if app_path.to_s.empty?
+            raise error_type.new("Cannot detect current release path - make sure you have deployed at least once.")
+          end
+          args = ["--gemfile #{File.join(app_path, bundle_gemfile)}"]
+          args << "--path #{bundle_dir}" unless bundle_dir.to_s.empty?
+          args << bundle_flags.to_s
+          args << "--without #{bundle_without.join(" ")}" unless bundle_without.empty?
+          args << "--with #{bundle_with.join(" ")}" unless bundle_with.empty?
+
+          run "cd #{app_path} && #{bundle_cmd} install #{args.join(" ")}"
+        end
+      end
+    end
+  end
+end
diff --git a/lib/bundler/deprecate.rb b/lib/bundler/deprecate.rb
new file mode 100644
index 0000000000..f59533630e
--- /dev/null
+++ b/lib/bundler/deprecate.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+begin
+  require "rubygems/deprecate"
+rescue LoadError
+  # it's fine if it doesn't exist on the current RubyGems...
+  nil
+end
+
+module Bundler
+  # If Bundler::Deprecate is an autoload constant, we need to define it
+  if defined?(Bundler::Deprecate) && !autoload?(:Deprecate)
+    # nothing to do!
+  elsif defined? ::Deprecate
+    Deprecate = ::Deprecate
+  elsif defined? Gem::Deprecate
+    Deprecate = Gem::Deprecate
+  else
+    class Deprecate
+    end
+  end
+
+  unless Deprecate.respond_to?(:skip_during)
+    def Deprecate.skip_during
+      original = skip
+      self.skip = true
+      yield
+    ensure
+      self.skip = original
+    end
+  end
+
+  unless Deprecate.respond_to?(:skip)
+    def Deprecate.skip
+      @skip ||= false
+    end
+  end
+
+  unless Deprecate.respond_to?(:skip=)
+    def Deprecate.skip=(skip)
+      @skip = skip
+    end
+  end
+end
diff --git a/lib/bundler/digest.rb b/lib/bundler/digest.rb
new file mode 100644
index 0000000000..759f609416
--- /dev/null
+++ b/lib/bundler/digest.rb
@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+# This code was extracted from https://github.com/Solistra/ruby-digest which is under public domain
+module Bundler
+  module Digest
+    # The initial constant values for the 32-bit constant words A, B, C, D, and
+    # E, respectively.
+    SHA1_WORDS = [0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476, 0xC3D2E1F0].freeze
+
+    # The 8-bit field used for bitwise `AND` masking. Defaults to `0xFFFFFFFF`.
+    SHA1_MASK = 0xFFFFFFFF
+
+    class << self
+      def sha1(string)
+        unless string.is_a?(String)
+          raise TypeError, "can't convert #{string.class.inspect} into String"
+        end
+
+        buffer = string.b
+
+        words = SHA1_WORDS.dup
+        generate_split_buffer(buffer) do |chunk|
+          w = []
+          chunk.each_slice(4) do |a, b, c, d|
+            w << (((a << 8 | b) << 8 | c) << 8 | d)
+          end
+          a, b, c, d, e = *words
+          (16..79).each do |i|
+            w[i] = SHA1_MASK & rotate((w[i-3] ^ w[i-8] ^ w[i-14] ^ w[i-16]), 1)
+          end
+          0.upto(79) do |i|
+            case i
+            when  0..19
+              f = ((b & c) | (~b & d))
+              k = 0x5A827999
+            when 20..39
+              f = (b ^ c ^ d)
+              k = 0x6ED9EBA1
+            when 40..59
+              f = ((b & c) | (b & d) | (c & d))
+              k = 0x8F1BBCDC
+            when 60..79
+              f = (b ^ c ^ d)
+              k = 0xCA62C1D6
+            end
+            t = SHA1_MASK & (SHA1_MASK & rotate(a, 5) + f + e + k + w[i])
+            a, b, c, d, e = t, a, SHA1_MASK & rotate(b, 30), c, d # rubocop:disable Style/ParallelAssignment
+          end
+          mutated = [a, b, c, d, e]
+          words.map!.with_index {|word, index| SHA1_MASK & (word + mutated[index]) }
+        end
+
+        words.pack("N*").unpack("H*").first
+      end
+
+      private
+
+      def generate_split_buffer(string, &block)
+        size   = string.bytesize * 8
+        buffer = string.bytes << 128
+        buffer << 0 while buffer.size % 64 != 56
+        buffer.concat([size].pack("Q>").bytes)
+        buffer.each_slice(64, &block)
+      end
+
+      def rotate(value, spaces)
+        value << spaces | value >> (32 - spaces)
+      end
+    end
+  end
+end
diff --git a/lib/bundler/dsl.rb b/lib/bundler/dsl.rb
new file mode 100644
index 0000000000..1108fc3b78
--- /dev/null
+++ b/lib/bundler/dsl.rb
@@ -0,0 +1,615 @@
+# frozen_string_literal: true
+
+require_relative "dependency"
+require_relative "ruby_dsl"
+
+module Bundler
+  class Dsl
+    include RubyDsl
+
+    def self.evaluate(gemfile, lockfile, unlock)
+      builder = new
+      builder.eval_gemfile(gemfile)
+      builder.to_definition(lockfile, unlock)
+    end
+
+    VALID_PLATFORMS = Bundler::Dependency::PLATFORM_MAP.keys.freeze
+
+    VALID_KEYS = %w[group groups git path glob name branch ref tag require submodules
+                    platform platforms type source install_if gemfile].freeze
+
+    GITHUB_PULL_REQUEST_URL = %r{\Ahttps://github\.com/([A-Za-z0-9_\-\.]+/[A-Za-z0-9_\-\.]+)/pull/(\d+)\z}.freeze
+
+    attr_reader :gemspecs
+    attr_accessor :dependencies
+
+    def initialize
+      @source               = nil
+      @sources              = SourceList.new
+      @git_sources          = {}
+      @dependencies         = []
+      @groups               = []
+      @install_conditionals = []
+      @optional_groups      = []
+      @platforms            = []
+      @env                  = nil
+      @ruby_version         = nil
+      @gemspecs             = []
+      @gemfile              = nil
+      @gemfiles             = []
+      add_git_sources
+    end
+
+    def eval_gemfile(gemfile, contents = nil)
+      expanded_gemfile_path = Pathname.new(gemfile).expand_path(@gemfile && @gemfile.parent)
+      original_gemfile = @gemfile
+      @gemfile = expanded_gemfile_path
+      @gemfiles << expanded_gemfile_path
+      contents ||= Bundler.read_file(@gemfile.to_s)
+      instance_eval(contents.dup.tap{|x| x.untaint if RUBY_VERSION < "2.7" }, gemfile.to_s, 1)
+    rescue Exception => e # rubocop:disable Lint/RescueException
+      message = "There was an error " \
+        "#{e.is_a?(GemfileEvalError) ? "evaluating" : "parsing"} " \
+        "`#{File.basename gemfile.to_s}`: #{e.message}"
+
+      raise DSLError.new(message, gemfile, e.backtrace, contents)
+    ensure
+      @gemfile = original_gemfile
+    end
+
+    def gemspec(opts = nil)
+      opts ||= {}
+      path              = opts[:path] || "."
+      glob              = opts[:glob]
+      name              = opts[:name]
+      development_group = opts[:development_group] || :development
+      expanded_path     = gemfile_root.join(path)
+
+      gemspecs = Gem::Util.glob_files_in_dir("{,*}.gemspec", expanded_path).map {|g| Bundler.load_gemspec(g) }.compact
+      gemspecs.reject! {|s| s.name != name } if name
+      Index.sort_specs(gemspecs)
+      specs_by_name_and_version = gemspecs.group_by {|s| [s.name, s.version] }
+
+      case specs_by_name_and_version.size
+      when 1
+        specs = specs_by_name_and_version.values.first
+        spec = specs.find {|s| s.match_platform(Bundler.local_platform) } || specs.first
+
+        @gemspecs << spec
+
+        gem spec.name, :name => spec.name, :path => path, :glob => glob
+
+        group(development_group) do
+          spec.development_dependencies.each do |dep|
+            gem dep.name, *(dep.requirement.as_list + [:type => :development])
+          end
+        end
+      when 0
+        raise InvalidOption, "There are no gemspecs at #{expanded_path}"
+      else
+        raise InvalidOption, "There are multiple gemspecs at #{expanded_path}. " \
+          "Please use the :name option to specify which one should be used"
+      end
+    end
+
+    def gem(name, *args)
+      options = args.last.is_a?(Hash) ? args.pop.dup : {}
+      options["gemfile"] = @gemfile
+      version = args || [">= 0"]
+
+      normalize_options(name, version, options)
+
+      dep = Dependency.new(name, version, options)
+
+      # if there's already a dependency with this name we try to prefer one
+      if current = @dependencies.find {|d| d.name == dep.name }
+        deleted_dep = @dependencies.delete(current) if current.type == :development
+
+        unless deleted_dep
+          if current.requirement != dep.requirement
+            return if dep.type == :development
+
+            update_prompt = ""
+
+            if File.basename(@gemfile) == Injector::INJECTED_GEMS
+              if dep.requirements_list.include?(">= 0") && !current.requirements_list.include?(">= 0")
+                update_prompt = ". Gem already added"
+              else
+                update_prompt = ". If you want to update the gem version, run `bundle update #{current.name}`"
+
+                update_prompt += ". You may also need to change the version requirement specified in the Gemfile if it's too restrictive." unless current.requirements_list.include?(">= 0")
+              end
+            end
+
+            raise GemfileError, "You cannot specify the same gem twice with different version requirements.\n" \
+                            "You specified: #{current.name} (#{current.requirement}) and #{dep.name} (#{dep.requirement})" \
+                             "#{update_prompt}"
+          else
+            Bundler.ui.warn "Your Gemfile lists the gem #{current.name} (#{current.requirement}) more than once.\n" \
+                            "You should probably keep only one of them.\n" \
+                            "Remove any duplicate entries and specify the gem only once.\n" \
+                            "While it's not a problem now, it could cause errors if you change the version of one of them later."
+          end
+
+          if current.source != dep.source
+            return if dep.type == :development
+            raise GemfileError, "You cannot specify the same gem twice coming from different sources.\n" \
+                            "You specified that #{dep.name} (#{dep.requirement}) should come from " \
+                            "#{current.source || "an unspecified source"} and #{dep.source}\n"
+          end
+        end
+      end
+
+      @dependencies << dep
+    end
+
+    def source(source, *args, &blk)
+      options = args.last.is_a?(Hash) ? args.pop.dup : {}
+      options = normalize_hash(options)
+      source = normalize_source(source)
+
+      if options.key?("type")
+        options["type"] = options["type"].to_s
+        unless Plugin.source?(options["type"])
+          raise InvalidOption, "No plugin sources available for #{options["type"]}"
+        end
+
+        unless block_given?
+          raise InvalidOption, "You need to pass a block to #source with :type option"
+        end
+
+        source_opts = options.merge("uri" => source)
+        with_source(@sources.add_plugin_source(options["type"], source_opts), &blk)
+      elsif block_given?
+        with_source(@sources.add_rubygems_source("remotes" => source), &blk)
+      else
+        @sources.add_global_rubygems_remote(source)
+      end
+    end
+
+    def git_source(name, &block)
+      unless block_given?
+        raise InvalidOption, "You need to pass a block to #git_source"
+      end
+
+      if valid_keys.include?(name.to_s)
+        raise InvalidOption, "You cannot use #{name} as a git source. It " \
+          "is a reserved key. Reserved keys are: #{valid_keys.join(", ")}"
+      end
+
+      @git_sources[name.to_s] = block
+    end
+
+    def path(path, options = {}, &blk)
+      source_options = normalize_hash(options).merge(
+        "path" => Pathname.new(path),
+        "root_path" => gemfile_root,
+        "gemspec" => gemspecs.find {|g| g.name == options["name"] }
+      )
+
+      source_options["global"] = true unless block_given?
+
+      source = @sources.add_path_source(source_options)
+      with_source(source, &blk)
+    end
+
+    def git(uri, options = {}, &blk)
+      unless block_given?
+        msg = "You can no longer specify a git source by itself. Instead, \n" \
+              "either use the :git option on a gem, or specify the gems that \n" \
+              "bundler should find in the git source by passing a block to \n" \
+              "the git method, like: \n\n" \
+              "  git 'git://github.com/rails/rails.git' do\n" \
+              "    gem 'rails'\n" \
+              "  end"
+        raise DeprecatedError, msg
+      end
+
+      with_source(@sources.add_git_source(normalize_hash(options).merge("uri" => uri)), &blk)
+    end
+
+    def github(repo, options = {})
+      raise ArgumentError, "GitHub sources require a block" unless block_given?
+      github_uri  = @git_sources["github"].call(repo)
+      git_options = normalize_hash(options).merge("uri" => github_uri)
+      git_source  = @sources.add_git_source(git_options)
+      with_source(git_source) { yield }
+    end
+
+    def to_definition(lockfile, unlock)
+      check_primary_source_safety
+      Definition.new(lockfile, @dependencies, @sources, unlock, @ruby_version, @optional_groups, @gemfiles)
+    end
+
+    def group(*args, &blk)
+      options = args.last.is_a?(Hash) ? args.pop.dup : {}
+      normalize_group_options(options, args)
+
+      @groups.concat args
+
+      if options["optional"]
+        optional_groups = args - @optional_groups
+        @optional_groups.concat optional_groups
+      end
+
+      yield
+    ensure
+      args.each { @groups.pop }
+    end
+
+    def install_if(*args)
+      @install_conditionals.concat args
+      yield
+    ensure
+      args.each { @install_conditionals.pop }
+    end
+
+    def platforms(*platforms)
+      @platforms.concat platforms
+      yield
+    ensure
+      platforms.each { @platforms.pop }
+    end
+    alias_method :platform, :platforms
+
+    def env(name)
+      old = @env
+      @env = name
+      yield
+    ensure
+      @env = old
+    end
+
+    def plugin(*args)
+      # Pass on
+    end
+
+    def method_missing(name, *args)
+      raise GemfileError, "Undefined local variable or method `#{name}' for Gemfile"
+    end
+
+    def check_primary_source_safety
+      check_path_source_safety
+      check_rubygems_source_safety
+    end
+
+    private
+
+    def add_git_sources
+      git_source(:github) do |repo_name|
+        warn_deprecated_git_source(:github, <<-'RUBY'.strip, 'Change any "reponame" :github sources to "username/reponame".')
+"https://github.com/#{repo_name}.git"
+        RUBY
+        if repo_name =~ GITHUB_PULL_REQUEST_URL
+          {
+            "git" => "https://github.com/#{$1}.git",
+            "branch" => "refs/pull/#{$2}/head",
+            "ref" => nil,
+            "tag" => nil,
+          }
+        else
+          repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
+          "https://github.com/#{repo_name}.git"
+        end
+      end
+
+      git_source(:gist) do |repo_name|
+        warn_deprecated_git_source(:gist, '"https://gist.github.com/#{repo_name}.git"')
+
+        "https://gist.github.com/#{repo_name}.git"
+      end
+
+      git_source(:bitbucket) do |repo_name|
+        warn_deprecated_git_source(:bitbucket, <<-'RUBY'.strip)
+user_name, repo_name = repo_name.split("/")
+repo_name ||= user_name
+"https://#{user_name}@bitbucket.org/#{user_name}/#{repo_name}.git"
+        RUBY
+
+        user_name, repo_name = repo_name.split("/")
+        repo_name ||= user_name
+        "https://#{user_name}@bitbucket.org/#{user_name}/#{repo_name}.git"
+      end
+    end
+
+    def with_source(source)
+      old_source = @source
+      if block_given?
+        @source = source
+        yield
+      end
+      source
+    ensure
+      @source = old_source
+    end
+
+    def normalize_hash(opts)
+      opts.keys.each do |k|
+        opts[k.to_s] = opts.delete(k) unless k.is_a?(String)
+      end
+      opts
+    end
+
+    def valid_keys
+      @valid_keys ||= VALID_KEYS
+    end
+
+    def normalize_options(name, version, opts)
+      if name.is_a?(Symbol)
+        raise GemfileError, %(You need to specify gem names as Strings. Use 'gem "#{name}"' instead)
+      end
+      if name =~ /\s/
+        raise GemfileError, %('#{name}' is not a valid gem name because it contains whitespace)
+      end
+      raise GemfileError, %(an empty gem name is not valid) if name.empty?
+
+      normalize_hash(opts)
+
+      git_names = @git_sources.keys.map(&:to_s)
+      validate_keys("gem '#{name}'", opts, valid_keys + git_names)
+
+      groups = @groups.dup
+      opts["group"] = opts.delete("groups") || opts["group"]
+      groups.concat Array(opts.delete("group"))
+      groups = [:default] if groups.empty?
+
+      install_if = @install_conditionals.dup
+      install_if.concat Array(opts.delete("install_if"))
+      install_if = install_if.reduce(true) do |memo, val|
+        memo && (val.respond_to?(:call) ? val.call : val)
+      end
+
+      platforms = @platforms.dup
+      opts["platforms"] = opts["platform"] || opts["platforms"]
+      platforms.concat Array(opts.delete("platforms"))
+      platforms.map!(&:to_sym)
+      platforms.each do |p|
+        next if VALID_PLATFORMS.include?(p)
+        raise GemfileError, "`#{p}` is not a valid platform. The available options are: #{VALID_PLATFORMS.inspect}"
+      end
+
+      # Save sources passed in a key
+      if opts.key?("source")
+        source = normalize_source(opts["source"])
+        opts["source"] = @sources.add_rubygems_source("remotes" => source)
+      end
+
+      git_name = (git_names & opts.keys).last
+      if @git_sources[git_name]
+        git_opts = @git_sources[git_name].call(opts[git_name])
+        git_opts = { "git" => git_opts } if git_opts.is_a?(String)
+        opts.merge!(git_opts) do |key, _gemfile_value, _git_source_value|
+          raise GemfileError, %(The :#{key} option can't be used with `#{git_name}: #{opts[git_name].inspect}`)
+        end
+      end
+
+      %w[git path].each do |type|
+        next unless param = opts[type]
+        if version.first && version.first =~ /^\s*=?\s*(\d[^\s]*)\s*$/
+          options = opts.merge("name" => name, "version" => $1)
+        else
+          options = opts.dup
+        end
+        source = send(type, param, options) {}
+        opts["source"] = source
+      end
+
+      opts["source"]         ||= @source
+      opts["env"]            ||= @env
+      opts["platforms"]      = platforms.dup
+      opts["group"]          = groups
+      opts["should_include"] = install_if
+    end
+
+    def normalize_group_options(opts, groups)
+      normalize_hash(opts)
+
+      groups = groups.map {|group| ":#{group}" }.join(", ")
+      validate_keys("group #{groups}", opts, %w[optional])
+
+      opts["optional"] ||= false
+    end
+
+    def validate_keys(command, opts, valid_keys)
+      invalid_keys = opts.keys - valid_keys
+
+      git_source = opts.keys & @git_sources.keys.map(&:to_s)
+      if opts["branch"] && !(opts["git"] || opts["github"] || git_source.any?)
+        raise GemfileError, %(The `branch` option for `#{command}` is not allowed. Only gems with a git source can specify a branch)
+      end
+
+      return true unless invalid_keys.any?
+
+      message = String.new
+      message << "You passed #{invalid_keys.map {|k| ":" + k }.join(", ")} "
+      message << if invalid_keys.size > 1
+        "as options for #{command}, but they are invalid."
+      else
+        "as an option for #{command}, but it is invalid."
+      end
+
+      message << " Valid options are: #{valid_keys.join(", ")}."
+      message << " You may be able to resolve this by upgrading Bundler to the newest version."
+      raise InvalidOption, message
+    end
+
+    def normalize_source(source)
+      case source
+      when :gemcutter, :rubygems, :rubyforge
+        Bundler::SharedHelpers.major_deprecation 2, "The source :#{source} is deprecated because HTTP " \
+          "requests are insecure.\nPlease change your source to 'https://" \
+          "rubygems.org' if possible, or 'http://rubygems.org' if not."
+        "http://rubygems.org"
+      when String
+        source
+      else
+        raise GemfileError, "Unknown source '#{source}'"
+      end
+    end
+
+    def check_path_source_safety
+      return if @sources.global_path_source.nil?
+
+      msg = "You can no longer specify a path source by itself. Instead, \n" \
+              "either use the :path option on a gem, or specify the gems that \n" \
+              "bundler should find in the path source by passing a block to \n" \
+              "the path method, like: \n\n" \
+              "    path 'dir/containing/rails' do\n" \
+              "      gem 'rails'\n" \
+              "    end\n\n"
+
+      SharedHelpers.major_deprecation(2, msg.strip)
+    end
+
+    def check_rubygems_source_safety
+      if @sources.implicit_global_source?
+        implicit_global_source_warning
+      elsif @sources.aggregate_global_source?
+        multiple_global_source_warning
+      end
+    end
+
+    def implicit_global_source_warning
+      Bundler::SharedHelpers.major_deprecation 2, "This Gemfile does not include an explicit global source. " \
+        "Not using an explicit global source may result in a different lockfile being generated depending on " \
+        "the gems you have installed locally before bundler is run. " \
+        "Instead, define a global source in your Gemfile like this: source \"https://rubygems.org\"."
+    end
+
+    def multiple_global_source_warning
+      if Bundler.feature_flag.bundler_3_mode?
+        msg = "This Gemfile contains multiple primary sources. " \
+          "Each source after the first must include a block to indicate which gems " \
+          "should come from that source"
+        raise GemfileEvalError, msg
+      else
+        Bundler::SharedHelpers.major_deprecation 2, "Your Gemfile contains multiple primary sources. " \
+          "Using `source` more than once without a block is a security risk, and " \
+          "may result in installing unexpected gems. To resolve this warning, use " \
+          "a block to indicate which gems should come from the secondary source."
+      end
+    end
+
+    def warn_deprecated_git_source(name, replacement, additional_message = nil)
+      additional_message &&= " #{additional_message}"
+      replacement = if replacement.count("\n").zero?
+        "{|repo_name| #{replacement} }"
+      else
+        "do |repo_name|\n#{replacement.to_s.gsub(/^/, "      ")}\n    end"
+      end
+
+      Bundler::SharedHelpers.major_deprecation 3, <<-EOS
+The :#{name} git source is deprecated, and will be removed in the future.#{additional_message} Add this code to the top of your Gemfile to ensure it continues to work:
+
+    git_source(:#{name}) #{replacement}
+
+      EOS
+    end
+
+    class DSLError < GemfileError
+      # @return [String] the description that should be presented to the user.
+      #
+      attr_reader :description
+
+      # @return [String] the path of the dsl file that raised the exception.
+      #
+      attr_reader :dsl_path
+
+      # @return [Exception] the backtrace of the exception raised by the
+      #         evaluation of the dsl file.
+      #
+      attr_reader :backtrace
+
+      # @param [Exception] backtrace @see backtrace
+      # @param [String]    dsl_path  @see dsl_path
+      #
+      def initialize(description, dsl_path, backtrace, contents = nil)
+        @status_code = $!.respond_to?(:status_code) && $!.status_code
+
+        @description = description
+        @dsl_path    = dsl_path
+        @backtrace   = backtrace
+        @contents    = contents
+      end
+
+      def status_code
+        @status_code || super
+      end
+
+      # @return [String] the contents of the DSL that cause the exception to
+      #         be raised.
+      #
+      def contents
+        @contents ||= begin
+          dsl_path && File.exist?(dsl_path) && File.read(dsl_path)
+        end
+      end
+
+      # The message of the exception reports the content of podspec for the
+      # line that generated the original exception.
+      #
+      # @example Output
+      #
+      #   Invalid podspec at `RestKit.podspec` - undefined method
+      #   `exclude_header_search_paths=' for #<Pod::Specification for
+      #   `RestKit/Network (0.9.3)`>
+      #
+      #       from spec-repos/master/RestKit/0.9.3/RestKit.podspec:36
+      #       -------------------------------------------
+      #           # because it would break: #import <CoreData/CoreData.h>
+      #    >      ns.exclude_header_search_paths = 'Code/RestKit.h'
+      #         end
+      #       -------------------------------------------
+      #
+      # @return [String] the message of the exception.
+      #
+      def to_s
+        @to_s ||= begin
+          trace_line, description = parse_line_number_from_description
+
+          m = String.new("\n[!] ")
+          m << description
+          m << ". Bundler cannot continue.\n"
+
+          return m unless backtrace && dsl_path && contents
+
+          trace_line = backtrace.find {|l| l.include?(dsl_path.to_s) } || trace_line
+          return m unless trace_line
+          line_numer = trace_line.split(":")[1].to_i - 1
+          return m unless line_numer
+
+          lines      = contents.lines.to_a
+          indent     = " #  "
+          indicator  = indent.tr("#", ">")
+          first_line = line_numer.zero?
+          last_line  = (line_numer == (lines.count - 1))
+
+          m << "\n"
+          m << "#{indent}from #{trace_line.gsub(/:in.*$/, "")}\n"
+          m << "#{indent}-------------------------------------------\n"
+          m << "#{indent}#{lines[line_numer - 1]}" unless first_line
+          m << "#{indicator}#{lines[line_numer]}"
+          m << "#{indent}#{lines[line_numer + 1]}" unless last_line
+          m << "\n" unless m.end_with?("\n")
+          m << "#{indent}-------------------------------------------\n"
+        end
+      end
+
+      private
+
+      def parse_line_number_from_description
+        description = self.description
+        if dsl_path && description =~ /((#{Regexp.quote File.expand_path(dsl_path)}|#{Regexp.quote dsl_path.to_s}):\d+)/
+          trace_line = Regexp.last_match[1]
+          description = description.sub(/\n.*\n(\.\.\.)? *\^~+$/, "").sub(/#{Regexp.quote trace_line}:\s*/, "").sub("\n", " - ")
+        end
+        [trace_line, description]
+      end
+    end
+
+    def gemfile_root
+      @gemfile ||= Bundler.default_gemfile
+      @gemfile.dirname
+    end
+  end
+end
diff --git a/lib/bundler/endpoint_specification.rb b/lib/bundler/endpoint_specification.rb
new file mode 100644
index 0000000000..476151ae56
--- /dev/null
+++ b/lib/bundler/endpoint_specification.rb
@@ -0,0 +1,141 @@
+# frozen_string_literal: true
+
+module Bundler
+  # used for Creating Specifications from the Gemcutter Endpoint
+  class EndpointSpecification < Gem::Specification
+    ILLFORMED_MESSAGE = 'Ill-formed requirement ["#<YAML::Syck::DefaultKey'.freeze
+    include MatchPlatform
+
+    attr_reader :name, :version, :platform, :required_rubygems_version, :required_ruby_version, :checksum
+    attr_accessor :source, :remote, :dependencies
+
+    def initialize(name, version, platform, dependencies, metadata = nil)
+      super()
+      @name         = name
+      @version      = Gem::Version.create version
+      @platform     = platform
+      @dependencies = dependencies.map {|dep, reqs| build_dependency(dep, reqs) }
+
+      @loaded_from          = nil
+      @remote_specification = nil
+
+      parse_metadata(metadata)
+    end
+
+    def fetch_platform
+      @platform
+    end
+
+    # needed for standalone, load required_paths from local gemspec
+    # after the gem is installed
+    def require_paths
+      if @remote_specification
+        @remote_specification.require_paths
+      elsif _local_specification
+        _local_specification.require_paths
+      else
+        super
+      end
+    end
+
+    # needed for inline
+    def load_paths
+      # remote specs aren't installed, and can't have load_paths
+      if _local_specification
+        _local_specification.load_paths
+      else
+        super
+      end
+    end
+
+    # needed for binstubs
+    def executables
+      if @remote_specification
+        @remote_specification.executables
+      elsif _local_specification
+        _local_specification.executables
+      else
+        super
+      end
+    end
+
+    # needed for bundle clean
+    def bindir
+      if @remote_specification
+        @remote_specification.bindir
+      elsif _local_specification
+        _local_specification.bindir
+      else
+        super
+      end
+    end
+
+    # needed for post_install_messages during install
+    def post_install_message
+      if @remote_specification
+        @remote_specification.post_install_message
+      elsif _local_specification
+        _local_specification.post_install_message
+      else
+        super
+      end
+    end
+
+    # needed for "with native extensions" during install
+    def extensions
+      if @remote_specification
+        @remote_specification.extensions
+      elsif _local_specification
+        _local_specification.extensions
+      else
+        super
+      end
+    end
+
+    def _local_specification
+      return unless @loaded_from && File.exist?(local_specification_path)
+      eval(File.read(local_specification_path)).tap do |spec|
+        spec.loaded_from = @loaded_from
+      end
+    end
+
+    def __swap__(spec)
+      SharedHelpers.ensure_same_dependencies(self, dependencies, spec.dependencies)
+      @remote_specification = spec
+    end
+
+    private
+
+    def local_specification_path
+      "#{base_dir}/specifications/#{full_name}.gemspec"
+    end
+
+    def parse_metadata(data)
+      return unless data
+      data.each do |k, v|
+        next unless v
+        case k.to_s
+        when "checksum"
+          @checksum = v.last
+        when "rubygems"
+          @required_rubygems_version = Gem::Requirement.new(v)
+        when "ruby"
+          @required_ruby_version = Gem::Requirement.new(v)
+        end
+      end
+    rescue StandardError => e
+      raise GemspecError, "There was an error parsing the metadata for the gem #{name} (#{version}): #{e.class}\n#{e}\nThe metadata was #{data.inspect}"
+    end
+
+    def build_dependency(name, requirements)
+      Gem::Dependency.new(name, requirements)
+    rescue ArgumentError => e
+      raise unless e.message.include?(ILLFORMED_MESSAGE)
+      puts # we shouldn't print the error message on the "fetching info" status line
+      raise GemspecError,
+        "Unfortunately, the gem #{name} (#{version}) has an invalid " \
+        "gemspec.\nPlease ask the gem author to yank the bad version to fix " \
+        "this issue. For more information, see http://bit.ly/syck-defaultkey."
+    end
+  end
+end
diff --git a/lib/bundler/env.rb b/lib/bundler/env.rb
new file mode 100644
index 0000000000..00d4ef2196
--- /dev/null
+++ b/lib/bundler/env.rb
@@ -0,0 +1,150 @@
+# frozen_string_literal: true
+
+require_relative "rubygems_integration"
+require_relative "source/git/git_proxy"
+
+module Bundler
+  class Env
+    def self.write(io)
+      io.write report
+    end
+
+    def self.report(options = {})
+      print_gemfile = options.delete(:print_gemfile) { true }
+      print_gemspecs = options.delete(:print_gemspecs) { true }
+
+      out = String.new
+      append_formatted_table("Environment", environment, out)
+      append_formatted_table("Bundler Build Metadata", BuildMetadata.to_h, out)
+
+      unless Bundler.settings.all.empty?
+        out << "\n## Bundler settings\n\n```\n"
+        Bundler.settings.all.each do |setting|
+          out << setting << "\n"
+          Bundler.settings.pretty_values_for(setting).each do |line|
+            out << "  " << line << "\n"
+          end
+        end
+        out << "```\n"
+      end
+
+      return out unless SharedHelpers.in_bundle?
+
+      if print_gemfile
+        gemfiles = [Bundler.default_gemfile]
+        begin
+          gemfiles = Bundler.definition.gemfiles
+        rescue GemfileNotFound
+          nil
+        end
+
+        out << "\n## Gemfile\n"
+        gemfiles.each do |gemfile|
+          out << "\n### #{Pathname.new(gemfile).relative_path_from(SharedHelpers.pwd)}\n\n"
+          out << "```ruby\n" << read_file(gemfile).chomp << "\n```\n"
+        end
+
+        out << "\n### #{Bundler.default_lockfile.relative_path_from(SharedHelpers.pwd)}\n\n"
+        out << "```\n" << read_file(Bundler.default_lockfile).chomp << "\n```\n"
+      end
+
+      if print_gemspecs
+        dsl = Dsl.new.tap {|d| d.eval_gemfile(Bundler.default_gemfile) }
+        out << "\n## Gemspecs\n" unless dsl.gemspecs.empty?
+        dsl.gemspecs.each do |gs|
+          out << "\n### #{File.basename(gs.loaded_from)}"
+          out << "\n\n```ruby\n" << read_file(gs.loaded_from).chomp << "\n```\n"
+        end
+      end
+
+      out
+    end
+
+    def self.read_file(filename)
+      Bundler.read_file(filename.to_s).strip
+    rescue Errno::ENOENT
+      "<No #{filename} found>"
+    rescue RuntimeError => e
+      "#{e.class}: #{e.message}"
+    end
+
+    def self.ruby_version
+      str = String.new(RUBY_VERSION)
+      str << "p#{RUBY_PATCHLEVEL}" if defined? RUBY_PATCHLEVEL
+      str << " (#{RUBY_RELEASE_DATE} revision #{RUBY_REVISION}) [#{RUBY_PLATFORM}]"
+    end
+
+    def self.git_version
+      Bundler::Source::Git::GitProxy.new(nil, nil, nil).full_version
+    rescue Bundler::Source::Git::GitNotInstalledError
+      "not installed"
+    end
+
+    def self.version_of(script)
+      return "not installed" unless Bundler.which(script)
+      `#{script} --version`.chomp
+    end
+
+    def self.chruby_version
+      return "not installed" unless Bundler.which("chruby-exec")
+      `chruby-exec -- chruby --version`.
+        sub(/.*^chruby: (#{Gem::Version::VERSION_PATTERN}).*/m, '\1')
+    end
+
+    def self.environment
+      out = []
+
+      out << ["Bundler", Bundler::VERSION]
+      out << ["  Platforms", Gem.platforms.join(", ")]
+      out << ["Ruby", ruby_version]
+      out << ["  Full Path", Gem.ruby]
+      out << ["  Config Dir", Pathname.new(Gem::ConfigFile::SYSTEM_WIDE_CONFIG_FILE).dirname]
+      out << ["RubyGems", Gem::VERSION]
+      out << ["  Gem Home", Gem.dir]
+      out << ["  Gem Path", Gem.path.join(File::PATH_SEPARATOR)]
+      out << ["  User Home", Gem.user_home]
+      out << ["  User Path", Gem.user_dir]
+      out << ["  Bin Dir", Gem.bindir]
+      if defined?(OpenSSL::SSL)
+        out << ["OpenSSL"]
+        out << ["  Compiled", OpenSSL::OPENSSL_VERSION] if defined?(OpenSSL::OPENSSL_VERSION)
+        out << ["  Loaded", OpenSSL::OPENSSL_LIBRARY_VERSION] if defined?(OpenSSL::OPENSSL_LIBRARY_VERSION)
+        out << ["  Cert File", OpenSSL::X509::DEFAULT_CERT_FILE] if defined?(OpenSSL::X509::DEFAULT_CERT_FILE)
+        out << ["  Cert Dir", OpenSSL::X509::DEFAULT_CERT_DIR] if defined?(OpenSSL::X509::DEFAULT_CERT_DIR)
+      end
+      out << ["Tools"]
+      out << ["  Git", git_version]
+      out << ["  RVM", ENV.fetch("rvm_version") { version_of("rvm") }]
+      out << ["  rbenv", version_of("rbenv")]
+      out << ["  chruby", chruby_version]
+
+      %w[rubygems-bundler open_gem].each do |name|
+        specs = Bundler.rubygems.find_name(name)
+        out << ["  #{name}", "(#{specs.map(&:version).join(",")})"] unless specs.empty?
+      end
+      if (exe = caller.last.split(":").first) && exe =~ %r{(exe|bin)/bundler?\z}
+        shebang = File.read(exe).lines.first
+        shebang.sub!(/^#!\s*/, "")
+        unless shebang.start_with?(Gem.ruby, "/usr/bin/env ruby")
+          out << ["Gem.ruby", Gem.ruby]
+          out << ["bundle #!", shebang]
+        end
+      end
+
+      out
+    end
+
+    def self.append_formatted_table(title, pairs, out)
+      return if pairs.empty?
+      out << "\n" unless out.empty?
+      out << "## #{title}\n\n```\n"
+      ljust = pairs.map {|k, _v| k.to_s.length }.max
+      pairs.each do |k, v|
+        out << "#{k.to_s.ljust(ljust)}  #{v}\n"
+      end
+      out << "```\n"
+    end
+
+    private_class_method :read_file, :ruby_version, :git_version, :append_formatted_table, :version_of, :chruby_version
+  end
+end
diff --git a/lib/bundler/environment_preserver.rb b/lib/bundler/environment_preserver.rb
new file mode 100644
index 0000000000..0f08e049d8
--- /dev/null
+++ b/lib/bundler/environment_preserver.rb
@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+module Bundler
+  class EnvironmentPreserver
+    INTENTIONALLY_NIL = "BUNDLER_ENVIRONMENT_PRESERVER_INTENTIONALLY_NIL".freeze
+    BUNDLER_KEYS = %w[
+      BUNDLE_BIN_PATH
+      BUNDLE_GEMFILE
+      BUNDLER_VERSION
+      GEM_HOME
+      GEM_PATH
+      MANPATH
+      PATH
+      RB_USER_INSTALL
+      RUBYLIB
+      RUBYOPT
+    ].map(&:freeze).freeze
+    BUNDLER_PREFIX = "BUNDLER_ORIG_".freeze
+
+    def self.from_env
+      new(env_to_hash(ENV), BUNDLER_KEYS)
+    end
+
+    def self.env_to_hash(env)
+      to_hash = env.to_hash
+      return to_hash unless Gem.win_platform?
+
+      to_hash.each_with_object({}) {|(k,v), a| a[k.upcase] = v }
+    end
+
+    # @param env [Hash]
+    # @param keys [Array<String>]
+    def initialize(env, keys)
+      @original = env
+      @keys = keys
+      @prefix = BUNDLER_PREFIX
+    end
+
+    # Replaces `ENV` with the bundler environment variables backed up
+    def replace_with_backup
+      unless Gem.win_platform?
+        ENV.replace(backup)
+        return
+      end
+
+      # Fallback logic for Windows below to workaround
+      # https://bugs.ruby-lang.org/issues/16798. Can be dropped once all
+      # supported rubies include the fix for that.
+
+      ENV.clear
+
+      backup.each {|k, v| ENV[k] = v }
+    end
+
+    # @return [Hash]
+    def backup
+      env = @original.clone
+      @keys.each do |key|
+        value = env[key]
+        if !value.nil? && !value.empty?
+          env[@prefix + key] ||= value
+        elsif value.nil?
+          env[@prefix + key] ||= INTENTIONALLY_NIL
+        end
+      end
+      env
+    end
+
+    # @return [Hash]
+    def restore
+      env = @original.clone
+      @keys.each do |key|
+        value_original = env[@prefix + key]
+        next if value_original.nil? || value_original.empty?
+        if value_original == INTENTIONALLY_NIL
+          env.delete(key)
+        else
+          env[key] = value_original
+        end
+        env.delete(@prefix + key)
+      end
+      env
+    end
+  end
+end
diff --git a/lib/bundler/errors.rb b/lib/bundler/errors.rb
new file mode 100644
index 0000000000..9ad7460e58
--- /dev/null
+++ b/lib/bundler/errors.rb
@@ -0,0 +1,175 @@
+# frozen_string_literal: true
+
+module Bundler
+  class BundlerError < StandardError
+    def self.status_code(code)
+      define_method(:status_code) { code }
+      if match = BundlerError.all_errors.find {|_k, v| v == code }
+        error, _ = match
+        raise ArgumentError,
+          "Trying to register #{self} for status code #{code} but #{error} is already registered"
+      end
+      BundlerError.all_errors[self] = code
+    end
+
+    def self.all_errors
+      @all_errors ||= {}
+    end
+  end
+
+  class GemfileError < BundlerError; status_code(4); end
+  class InstallError < BundlerError; status_code(5); end
+
+  # Internal error, should be rescued
+  class VersionConflict < BundlerError
+    attr_reader :conflicts
+
+    def initialize(conflicts, msg = nil)
+      super(msg)
+      @conflicts = conflicts
+    end
+
+    status_code(6)
+  end
+
+  class GemNotFound < BundlerError; status_code(7); end
+  class InstallHookError < BundlerError; status_code(8); end
+  class GemfileNotFound < BundlerError; status_code(10); end
+  class GitError < BundlerError; status_code(11); end
+  class DeprecatedError < BundlerError; status_code(12); end
+  class PathError < BundlerError; status_code(13); end
+  class GemspecError < BundlerError; status_code(14); end
+  class InvalidOption < BundlerError; status_code(15); end
+  class ProductionError < BundlerError; status_code(16); end
+  class HTTPError < BundlerError
+    status_code(17)
+    def filter_uri(uri)
+      URICredentialsFilter.credential_filtered_uri(uri)
+    end
+  end
+  class RubyVersionMismatch < BundlerError; status_code(18); end
+  class SecurityError < BundlerError; status_code(19); end
+  class LockfileError < BundlerError; status_code(20); end
+  class CyclicDependencyError < BundlerError; status_code(21); end
+  class GemfileLockNotFound < BundlerError; status_code(22); end
+  class PluginError < BundlerError; status_code(29); end
+  class SudoNotPermittedError < BundlerError; status_code(30); end
+  class ThreadCreationError < BundlerError; status_code(33); end
+  class APIResponseMismatchError < BundlerError; status_code(34); end
+  class APIResponseInvalidDependenciesError < BundlerError; status_code(35); end
+  class GemfileEvalError < GemfileError; end
+  class MarshalError < StandardError; end
+
+  class PermissionError < BundlerError
+    def initialize(path, permission_type = :write)
+      @path = path
+      @permission_type = permission_type
+    end
+
+    def action
+      case @permission_type
+      when :read then "read from"
+      when :write then "write to"
+      when :executable, :exec then "execute"
+      else @permission_type.to_s
+      end
+    end
+
+    def permission_type
+      case @permission_type
+      when :create
+        "executable permissions for all parent directories and write permissions for `#{parent_folder}`"
+      when :delete
+        permissions = "executable permissions for all parent directories and write permissions for `#{parent_folder}`"
+        permissions += ", and the same thing for all subdirectories inside #{@path}" if File.directory?(@path)
+        permissions
+      else
+        "#{@permission_type} permissions for that path"
+      end
+    end
+
+    def parent_folder
+      File.dirname(@path)
+    end
+
+    def message
+      "There was an error while trying to #{action} `#{@path}`. " \
+      "It is likely that you need to grant #{permission_type}."
+    end
+
+    status_code(23)
+  end
+
+  class GemRequireError < BundlerError
+    attr_reader :orig_exception
+
+    def initialize(orig_exception, msg)
+      full_message = msg + "\nGem Load Error is: #{orig_exception.message}\n"\
+                      "Backtrace for gem load error is:\n"\
+                      "#{orig_exception.backtrace.join("\n")}\n"\
+                      "Bundler Error Backtrace:\n"
+      super(full_message)
+      @orig_exception = orig_exception
+    end
+
+    status_code(24)
+  end
+
+  class YamlSyntaxError < BundlerError
+    attr_reader :orig_exception
+
+    def initialize(orig_exception, msg)
+      super(msg)
+      @orig_exception = orig_exception
+    end
+
+    status_code(25)
+  end
+
+  class TemporaryResourceError < PermissionError
+    def message
+      "There was an error while trying to #{action} `#{@path}`. " \
+      "Some resource was temporarily unavailable. It's suggested that you try" \
+      "the operation again."
+    end
+
+    status_code(26)
+  end
+
+  class VirtualProtocolError < BundlerError
+    def message
+      "There was an error relating to virtualization and file access. " \
+      "It is likely that you need to grant access to or mount some file system correctly."
+    end
+
+    status_code(27)
+  end
+
+  class OperationNotSupportedError < PermissionError
+    def message
+      "Attempting to #{action} `#{@path}` is unsupported by your OS."
+    end
+
+    status_code(28)
+  end
+
+  class NoSpaceOnDeviceError < PermissionError
+    def message
+      "There was an error while trying to #{action} `#{@path}`. " \
+      "There was insufficient space remaining on the device."
+    end
+
+    status_code(31)
+  end
+
+  class GenericSystemCallError < BundlerError
+    attr_reader :underlying_error
+
+    def initialize(underlying_error, message)
+      @underlying_error = underlying_error
+      super("#{message}\nThe underlying system error is #{@underlying_error.class}: #{@underlying_error}")
+    end
+
+    status_code(32)
+  end
+end
diff --git a/lib/bundler/feature_flag.rb b/lib/bundler/feature_flag.rb
new file mode 100644
index 0000000000..e441b941c2
--- /dev/null
+++ b/lib/bundler/feature_flag.rb
@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module Bundler
+  class FeatureFlag
+    def self.settings_flag(flag, &default)
+      unless Bundler::Settings::BOOL_KEYS.include?(flag.to_s)
+        raise "Cannot use `#{flag}` as a settings feature flag since it isn't a bool key"
+      end
+
+      settings_method("#{flag}?", flag, &default)
+    end
+    private_class_method :settings_flag
+
+    def self.settings_option(key, &default)
+      settings_method(key, key, &default)
+    end
+    private_class_method :settings_option
+
+    def self.settings_method(name, key, &default)
+      define_method(name) do
+        value = Bundler.settings[key]
+        value = instance_eval(&default) if value.nil?
+        value
+      end
+    end
+    private_class_method :settings_method
+
+    (1..10).each {|v| define_method("bundler_#{v}_mode?") { major_version >= v } }
+
+    settings_flag(:allow_offline_install) { bundler_3_mode? }
+    settings_flag(:auto_clean_without_path) { bundler_3_mode? }
+    settings_flag(:cache_all) { bundler_3_mode? }
+    settings_flag(:default_install_uses_path) { bundler_3_mode? }
+    settings_flag(:forget_cli_options) { bundler_3_mode? }
+    settings_flag(:global_gem_cache) { bundler_3_mode? }
+    settings_flag(:path_relative_to_cwd) { bundler_3_mode? }
+    settings_flag(:plugins) { @bundler_version >= Gem::Version.new("1.14") }
+    settings_flag(:print_only_version_number) { bundler_3_mode? }
+    settings_flag(:setup_makes_kernel_gem_public) { !bundler_3_mode? }
+    settings_flag(:suppress_install_using_messages) { bundler_3_mode? }
+    settings_flag(:update_requires_all_flag) { bundler_4_mode? }
+    settings_flag(:use_gem_version_promoter_for_major_updates) { bundler_3_mode? }
+
+    settings_option(:default_cli_command) { bundler_3_mode? ? :cli_help : :install }
+
+    def initialize(bundler_version)
+      @bundler_version = Gem::Version.create(bundler_version)
+    end
+
+    def major_version
+      @bundler_version.segments.first
+    end
+    private :major_version
+  end
+end
diff --git a/lib/bundler/fetcher.rb b/lib/bundler/fetcher.rb
new file mode 100644
index 0000000000..e3253a942f
--- /dev/null
+++ b/lib/bundler/fetcher.rb
@@ -0,0 +1,317 @@
+# frozen_string_literal: true
+
+require_relative "vendored_persistent"
+require "cgi"
+require "securerandom"
+require "zlib"
+require "rubygems/request"
+
+module Bundler
+  # Handles all the fetching with the rubygems server
+  class Fetcher
+    autoload :CompactIndex, File.expand_path("fetcher/compact_index", __dir__)
+    autoload :Downloader, File.expand_path("fetcher/downloader", __dir__)
+    autoload :Dependency, File.expand_path("fetcher/dependency", __dir__)
+    autoload :Index, File.expand_path("fetcher/index", __dir__)
+
+    # This error is raised when it looks like the network is down
+    class NetworkDownError < HTTPError; end
+    # This error is raised if we should rate limit our requests to the API
+    class TooManyRequestsError < HTTPError; end
+    # This error is raised if the API returns a 413 (only printed in verbose)
+    class FallbackError < HTTPError; end
+    # This is the error raised if OpenSSL fails the cert verification
+    class CertificateFailureError < HTTPError
+      def initialize(remote_uri)
+        remote_uri = filter_uri(remote_uri)
+        super "Could not verify the SSL certificate for #{remote_uri}.\nThere" \
+          " is a chance you are experiencing a man-in-the-middle attack, but" \
+          " most likely your system doesn't have the CA certificates needed" \
+          " for verification. For information about OpenSSL certificates, see" \
+          " https://railsapps.github.io/openssl-certificate-verify-failed.html." \
+          " To connect without using SSL, edit your Gemfile" \
+          " sources and change 'https' to 'http'."
+      end
+    end
+    # This is the error raised when a source is HTTPS and OpenSSL didn't load
+    class SSLError < HTTPError
+      def initialize(msg = nil)
+        super msg || "Could not load OpenSSL.\n" \
+            "You must recompile Ruby with OpenSSL support or change the sources in your " \
+            "Gemfile from 'https' to 'http'. Instructions for compiling with OpenSSL " \
+            "using RVM are available at rvm.io/packages/openssl."
+      end
+    end
+    # This error is raised if HTTP authentication is required, but not provided.
+    class AuthenticationRequiredError < HTTPError
+      def initialize(remote_uri)
+        remote_uri = filter_uri(remote_uri)
+        super "Authentication is required for #{remote_uri}.\n" \
+          "Please supply credentials for this source. You can do this by running:\n" \
+          "`bundle config set --global #{remote_uri} username:password`\n" \
+          "or by storing the credentials in the `#{Settings.key_for(remote_uri)}` environment variable"
+      end
+    end
+    # This error is raised if HTTP authentication is provided, but incorrect.
+    class BadAuthenticationError < HTTPError
+      def initialize(remote_uri)
+        remote_uri = filter_uri(remote_uri)
+        super "Bad username or password for #{remote_uri}.\n" \
+          "Please double-check your credentials and correct them."
+      end
+    end
+
+    # Exceptions classes that should bypass retry attempts. If your password didn't work the
+    # first time, it's not going to the third time.
+    NET_ERRORS = [:HTTPBadGateway, :HTTPBadRequest, :HTTPFailedDependency,
+                  :HTTPForbidden, :HTTPInsufficientStorage, :HTTPMethodNotAllowed,
+                  :HTTPMovedPermanently, :HTTPNoContent, :HTTPNotFound,
+                  :HTTPNotImplemented, :HTTPPreconditionFailed, :HTTPRequestEntityTooLarge,
+                  :HTTPRequestURITooLong, :HTTPUnauthorized, :HTTPUnprocessableEntity,
+                  :HTTPUnsupportedMediaType, :HTTPVersionNotSupported].freeze
+    FAIL_ERRORS = begin
+      fail_errors = [AuthenticationRequiredError, BadAuthenticationError, FallbackError]
+      fail_errors << Gem::Requirement::BadRequirementError if defined?(Gem::Requirement::BadRequirementError)
+      fail_errors.concat(NET_ERRORS.map {|e| SharedHelpers.const_get_safely(e, Net) }.compact)
+    end.freeze
+
+    class << self
+      attr_accessor :disable_endpoint, :api_timeout, :redirect_limit, :max_retries
+    end
+
+    self.redirect_limit = Bundler.settings[:redirect] # How many redirects to allow in one request
+    self.api_timeout    = Bundler.settings[:timeout] # How long to wait for each API call
+    self.max_retries    = Bundler.settings[:retry] # How many retries for the API call
+
+    def initialize(remote)
+      @remote = remote
+
+      Socket.do_not_reverse_lookup = true
+      connection # create persistent connection
+    end
+
+    def uri
+      @remote.anonymized_uri
+    end
+
+    # fetch a gem specification
+    def fetch_spec(spec)
+      spec -= [nil, "ruby", ""]
+      spec_file_name = "#{spec.join "-"}.gemspec"
+
+      uri = Bundler::URI.parse("#{remote_uri}#{Gem::MARSHAL_SPEC_DIR}#{spec_file_name}.rz")
+      if uri.scheme == "file"
+        path = Bundler.rubygems.correct_for_windows_path(uri.path)
+        Bundler.load_marshal Bundler.rubygems.inflate(Gem.read_binary(path))
+      elsif cached_spec_path = gemspec_cached_path(spec_file_name)
+        Bundler.load_gemspec(cached_spec_path)
+      else
+        Bundler.load_marshal Bundler.rubygems.inflate(downloader.fetch(uri).body)
+      end
+    rescue MarshalError
+      raise HTTPError, "Gemspec #{spec} contained invalid data.\n" \
+        "Your network or your gem server is probably having issues right now."
+    end
+
+    # return the specs in the bundler format as an index with retries
+    def specs_with_retry(gem_names, source)
+      Bundler::Retry.new("fetcher", FAIL_ERRORS).attempts do
+        specs(gem_names, source)
+      end
+    end
+
+    # return the specs in the bundler format as an index
+    def specs(gem_names, source)
+      old = Bundler.rubygems.sources
+      index = Bundler::Index.new
+
+      if Bundler::Fetcher.disable_endpoint
+        @use_api = false
+        specs = fetchers.last.specs(gem_names)
+      else
+        specs = []
+        fetchers.shift until fetchers.first.available? || fetchers.empty?
+        fetchers.dup.each do |f|
+          break unless f.api_fetcher? && !gem_names || !specs = f.specs(gem_names)
+          fetchers.delete(f)
+        end
+        @use_api = false if fetchers.none?(&:api_fetcher?)
+      end
+
+      specs.each do |name, version, platform, dependencies, metadata|
+        spec = if dependencies
+          EndpointSpecification.new(name, version, platform, dependencies, metadata)
+        else
+          RemoteSpecification.new(name, version, platform, self)
+        end
+        spec.source = source
+        spec.remote = @remote
+        index << spec
+      end
+
+      index
+    rescue CertificateFailureError
+      Bundler.ui.info "" if gem_names && use_api # newline after dots
+      raise
+    ensure
+      Bundler.rubygems.sources = old
+    end
+
+    def use_api
+      return @use_api if defined?(@use_api)
+
+      fetchers.shift until fetchers.first.available?
+
+      @use_api = if remote_uri.scheme == "file" || Bundler::Fetcher.disable_endpoint
+        false
+      else
+        fetchers.first.api_fetcher?
+      end
+    end
+
+    def user_agent
+      @user_agent ||= begin
+        ruby = Bundler::RubyVersion.system
+
+        agent = String.new("bundler/#{Bundler::VERSION}")
+        agent << " rubygems/#{Gem::VERSION}"
+        agent << " ruby/#{ruby.versions_string(ruby.versions)}"
+        agent << " (#{ruby.host})"
+        agent << " command/#{ARGV.first}"
+
+        if ruby.engine != "ruby"
+          # engine_version raises on unknown engines
+          engine_version = begin
+                             ruby.engine_versions
+                           rescue RuntimeError
+                             "???"
+                           end
+          agent << " #{ruby.engine}/#{ruby.versions_string(engine_version)}"
+        end
+
+        agent << " options/#{Bundler.settings.all.join(",")}"
+
+        agent << " ci/#{cis.join(",")}" if cis.any?
+
+        # add a random ID so we can consolidate runs server-side
+        agent << " " << SecureRandom.hex(8)
+
+        # add any user agent strings set in the config
+        extra_ua = Bundler.settings[:user_agent]
+        agent << " " << extra_ua if extra_ua
+
+        agent
+      end
+    end
+
+    def fetchers
+      @fetchers ||= FETCHERS.map {|f| f.new(downloader, @remote, uri) }
+    end
+
+    def http_proxy
+      return unless uri = connection.proxy_uri
+      uri.to_s
+    end
+
+    def inspect
+      "#<#{self.class}:0x#{object_id} uri=#{uri}>"
+    end
+
+    private
+
+    FETCHERS = [CompactIndex, Dependency, Index].freeze
+
+    def cis
+      env_cis = {
+        "TRAVIS" => "travis",
+        "CIRCLECI" => "circle",
+        "SEMAPHORE" => "semaphore",
+        "JENKINS_URL" => "jenkins",
+        "BUILDBOX" => "buildbox",
+        "GO_SERVER_URL" => "go",
+        "SNAP_CI" => "snap",
+        "GITLAB_CI" => "gitlab",
+        "CI_NAME" => ENV["CI_NAME"],
+        "CI" => "ci",
+      }
+      env_cis.find_all {|env, _| ENV[env] }.map {|_, ci| ci }
+    end
+
+    def connection
+      @connection ||= begin
+        needs_ssl = remote_uri.scheme == "https" ||
+          Bundler.settings[:ssl_verify_mode] ||
+          Bundler.settings[:ssl_client_cert]
+        raise SSLError if needs_ssl && !defined?(OpenSSL::SSL)
+
+        con = PersistentHTTP.new :name => "bundler", :proxy => :ENV
+        if gem_proxy = Bundler.rubygems.configuration[:http_proxy]
+          con.proxy = Bundler::URI.parse(gem_proxy) if gem_proxy != :no_proxy
+        end
+
+        if remote_uri.scheme == "https"
+          con.verify_mode = (Bundler.settings[:ssl_verify_mode] ||
+            OpenSSL::SSL::VERIFY_PEER)
+          con.cert_store = bundler_cert_store
+        end
+
+        ssl_client_cert = Bundler.settings[:ssl_client_cert] ||
+          (Bundler.rubygems.configuration.ssl_client_cert if
+            Bundler.rubygems.configuration.respond_to?(:ssl_client_cert))
+        if ssl_client_cert
+          pem = File.read(ssl_client_cert)
+          con.cert = OpenSSL::X509::Certificate.new(pem)
+          con.key  = OpenSSL::PKey::RSA.new(pem)
+        end
+
+        con.read_timeout = Fetcher.api_timeout
+        con.open_timeout = Fetcher.api_timeout
+        con.override_headers["User-Agent"] = user_agent
+        con.override_headers["X-Gemfile-Source"] = @remote.original_uri.to_s if @remote.original_uri
+        con
+      end
+    end
+
+    # cached gem specification path, if one exists
+    def gemspec_cached_path(spec_file_name)
+      paths = Bundler.rubygems.spec_cache_dirs.map {|dir| File.join(dir, spec_file_name) }
+      paths = paths.select {|path| File.file? path }
+      paths.first
+    end
+
+    HTTP_ERRORS = [
+      Timeout::Error, EOFError, SocketError, Errno::ENETDOWN, Errno::ENETUNREACH,
+      Errno::EINVAL, Errno::ECONNRESET, Errno::ETIMEDOUT, Errno::EAGAIN,
+      Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError,
+      PersistentHTTP::Error, Zlib::BufError, Errno::EHOSTUNREACH
+    ].freeze
+
+    def bundler_cert_store
+      store = OpenSSL::X509::Store.new
+      ssl_ca_cert = Bundler.settings[:ssl_ca_cert] ||
+        (Bundler.rubygems.configuration.ssl_ca_cert if
+          Bundler.rubygems.configuration.respond_to?(:ssl_ca_cert))
+      if ssl_ca_cert
+        if File.directory? ssl_ca_cert
+          store.add_path ssl_ca_cert
+        else
+          store.add_file ssl_ca_cert
+        end
+      else
+        store.set_default_paths
+        Gem::Request.get_cert_files.each {|c| store.add_file c }
+      end
+      store
+    end
+
+    private
+
+    def remote_uri
+      @remote.uri
+    end
+
+    def downloader
+      @downloader ||= Downloader.new(connection, self.class.redirect_limit)
+    end
+  end
+end
diff --git a/lib/bundler/fetcher/base.rb b/lib/bundler/fetcher/base.rb
new file mode 100644
index 0000000000..16cc98273a
--- /dev/null
+++ b/lib/bundler/fetcher/base.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Bundler
+  class Fetcher
+    class Base
+      attr_reader :downloader
+      attr_reader :display_uri
+      attr_reader :remote
+
+      def initialize(downloader, remote, display_uri)
+        raise "Abstract class" if self.class == Base
+        @downloader = downloader
+        @remote = remote
+        @display_uri = display_uri
+      end
+
+      def remote_uri
+        @remote.uri
+      end
+
+      def fetch_uri
+        @fetch_uri ||= begin
+          if remote_uri.host == "rubygems.org"
+            uri = remote_uri.dup
+            uri.host = "index.rubygems.org"
+            uri
+          else
+            remote_uri
+          end
+        end
+      end
+
+      def available?
+        true
+      end
+
+      def api_fetcher?
+        false
+      end
+
+      private
+
+      def log_specs(debug_msg)
+        if Bundler.ui.debug?
+          Bundler.ui.debug debug_msg
+        else
+          Bundler.ui.info ".", false
+        end
+      end
+    end
+  end
+end
diff --git a/lib/bundler/fetcher/compact_index.rb b/lib/bundler/fetcher/compact_index.rb
new file mode 100644
index 0000000000..bc69b884ec
--- /dev/null
+++ b/lib/bundler/fetcher/compact_index.rb
@@ -0,0 +1,140 @@
+# frozen_string_literal: true
+
+require_relative "base"
+require_relative "../worker"
+
+module Bundler
+  autoload :CompactIndexClient, File.expand_path("../compact_index_client", __dir__)
+
+  class Fetcher
+    class CompactIndex < Base
+      def self.compact_index_request(method_name)
+        method = instance_method(method_name)
+        undef_method(method_name)
+        define_method(method_name) do |*args, &blk|
+          begin
+            method.bind(self).call(*args, &blk)
+          rescue NetworkDownError, CompactIndexClient::Updater::MisMatchedChecksumError => e
+            raise HTTPError, e.message
+          rescue AuthenticationRequiredError
+            # Fail since we got a 401 from the server.
+            raise
+          rescue HTTPError => e
+            Bundler.ui.trace(e)
+            nil
+          end
+        end
+      end
+
+      def specs(gem_names)
+        specs_for_names(gem_names)
+      end
+      compact_index_request :specs
+
+      def specs_for_names(gem_names)
+        gem_info = []
+        complete_gems = []
+        remaining_gems = gem_names.dup
+
+        until remaining_gems.empty?
+          log_specs "Looking up gems #{remaining_gems.inspect}"
+
+          deps = begin
+                   parallel_compact_index_client.dependencies(remaining_gems)
+                 rescue TooManyRequestsError
+                   @bundle_worker.stop if @bundle_worker
+                   @bundle_worker = nil # reset it.  Not sure if necessary
+                   serial_compact_index_client.dependencies(remaining_gems)
+                 end
+          next_gems = deps.map {|d| d[3].map(&:first).flatten(1) }.flatten(1).uniq
+          deps.each {|dep| gem_info << dep }
+          complete_gems.concat(deps.map(&:first)).uniq!
+          remaining_gems = next_gems - complete_gems
+        end
+        @bundle_worker.stop if @bundle_worker
+        @bundle_worker = nil # reset it.  Not sure if necessary
+
+        gem_info
+      end
+
+      def fetch_spec(spec)
+        spec -= [nil, "ruby", ""]
+        contents = compact_index_client.spec(*spec)
+        return nil if contents.nil?
+        contents.unshift(spec.first)
+        contents[3].map! {|d| Gem::Dependency.new(*d) }
+        EndpointSpecification.new(*contents)
+      end
+      compact_index_request :fetch_spec
+
+      def available?
+        return nil unless SharedHelpers.md5_available?
+        user_home = Bundler.user_home
+        return nil unless user_home.directory? && user_home.writable?
+        # Read info file checksums out of /versions, so we can know if gems are up to date
+        fetch_uri.scheme != "file" && compact_index_client.update_and_parse_checksums!
+      rescue CompactIndexClient::Updater::MisMatchedChecksumError => e
+        Bundler.ui.debug(e.message)
+        nil
+      end
+      compact_index_request :available?
+
+      def api_fetcher?
+        true
+      end
+
+      private
+
+      def compact_index_client
+        @compact_index_client ||=
+          SharedHelpers.filesystem_access(cache_path) do
+            CompactIndexClient.new(cache_path, client_fetcher)
+          end
+      end
+
+      def parallel_compact_index_client
+        compact_index_client.execution_mode = lambda do |inputs, &blk|
+          func = lambda {|object, _index| blk.call(object) }
+          worker = bundle_worker(func)
+          inputs.each {|input| worker.enq(input) }
+          inputs.map { worker.deq }
+        end
+
+        compact_index_client
+      end
+
+      def serial_compact_index_client
+        compact_index_client.sequential_execution_mode!
+        compact_index_client
+      end
+
+      def bundle_worker(func = nil)
+        @bundle_worker ||= begin
+          worker_name = "Compact Index (#{display_uri.host})"
+          Bundler::Worker.new(Bundler.settings.processor_count, worker_name, func)
+        end
+        @bundle_worker.tap do |worker|
+          worker.instance_variable_set(:@func, func) if func
+        end
+      end
+
+      def cache_path
+        Bundler.user_cache.join("compact_index", remote.cache_slug)
+      end
+
+      def client_fetcher
+        ClientFetcher.new(self, Bundler.ui)
+      end
+
+      ClientFetcher = Struct.new(:fetcher, :ui) do
+        def call(path, headers)
+          fetcher.downloader.fetch(fetcher.fetch_uri + path, headers)
+        rescue NetworkDownError => e
+          raise unless Bundler.feature_flag.allow_offline_install? && headers["If-None-Match"]
+          ui.warn "Using the cached data for the new index because of a network error: #{e}"
+          Net::HTTPNotModified.new(nil, nil, nil)
+        end
+      end
+    end
+  end
+end
diff --git a/lib/bundler/fetcher/dependency.rb b/lib/bundler/fetcher/dependency.rb
new file mode 100644
index 0000000000..c52c32fb5b
--- /dev/null
+++ b/lib/bundler/fetcher/dependency.rb
@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+require_relative "base"
+require "cgi"
+
+module Bundler
+  class Fetcher
+    class Dependency < Base
+      def available?
+        @available ||= fetch_uri.scheme != "file" && downloader.fetch(dependency_api_uri)
+      rescue NetworkDownError => e
+        raise HTTPError, e.message
+      rescue AuthenticationRequiredError
+        # Fail since we got a 401 from the server.
+        raise
+      rescue HTTPError
+        false
+      end
+
+      def api_fetcher?
+        true
+      end
+
+      def specs(gem_names, full_dependency_list = [], last_spec_list = [])
+        query_list = gem_names.uniq - full_dependency_list
+
+        log_specs "Query List: #{query_list.inspect}"
+
+        return last_spec_list if query_list.empty?
+
+        spec_list, deps_list = Bundler::Retry.new("dependency api", FAIL_ERRORS).attempts do
+          dependency_specs(query_list)
+        end
+
+        returned_gems = spec_list.map(&:first).uniq
+        specs(deps_list, full_dependency_list + returned_gems, spec_list + last_spec_list)
+      rescue MarshalError
+        Bundler.ui.info "" unless Bundler.ui.debug? # new line now that the dots are over
+        Bundler.ui.debug "could not fetch from the dependency API, trying the full index"
+        nil
+      rescue HTTPError, GemspecError
+        Bundler.ui.info "" unless Bundler.ui.debug? # new line now that the dots are over
+        Bundler.ui.debug "could not fetch from the dependency API\nit's suggested to retry using the full index via `bundle install --full-index`"
+        nil
+      end
+
+      def dependency_specs(gem_names)
+        Bundler.ui.debug "Query Gemcutter Dependency Endpoint API: #{gem_names.join(",")}"
+
+        gem_list = unmarshalled_dep_gems(gem_names)
+        get_formatted_specs_and_deps(gem_list)
+      end
+
+      def unmarshalled_dep_gems(gem_names)
+        gem_list = []
+        gem_names.each_slice(Source::Rubygems::API_REQUEST_SIZE) do |names|
+          marshalled_deps = downloader.fetch(dependency_api_uri(names)).body
+          gem_list.concat(Bundler.load_marshal(marshalled_deps))
+        end
+        gem_list
+      end
+
+      def get_formatted_specs_and_deps(gem_list)
+        deps_list = []
+        spec_list = []
+
+        gem_list.each do |s|
+          deps_list.concat(s[:dependencies].map(&:first))
+          deps = s[:dependencies].map {|n, d| [n, d.split(", ")] }
+          spec_list.push([s[:name], s[:number], s[:platform], deps])
+        end
+        [spec_list, deps_list]
+      end
+
+      def dependency_api_uri(gem_names = [])
+        uri = fetch_uri + "api/v1/dependencies"
+        uri.query = "gems=#{CGI.escape(gem_names.sort.join(","))}" if gem_names.any?
+        uri
+      end
+    end
+  end
+end
diff --git a/lib/bundler/fetcher/downloader.rb b/lib/bundler/fetcher/downloader.rb
new file mode 100644
index 0000000000..f2aad3a500
--- /dev/null
+++ b/lib/bundler/fetcher/downloader.rb
@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+module Bundler
+  class Fetcher
+    class Downloader
+      attr_reader :connection
+      attr_reader :redirect_limit
+
+      def initialize(connection, redirect_limit)
+        @connection = connection
+        @redirect_limit = redirect_limit
+      end
+
+      def fetch(uri, headers = {}, counter = 0)
+        raise HTTPError, "Too many redirects" if counter >= redirect_limit
+
+        filtered_uri = URICredentialsFilter.credential_filtered_uri(uri)
+
+        response = request(uri, headers)
+        Bundler.ui.debug("HTTP #{response.code} #{response.message} #{filtered_uri}")
+
+        case response
+        when Net::HTTPSuccess, Net::HTTPNotModified
+          response
+        when Net::HTTPRedirection
+          new_uri = Bundler::URI.parse(response["location"])
+          if new_uri.host == uri.host
+            new_uri.user = uri.user
+            new_uri.password = uri.password
+          end
+          fetch(new_uri, headers, counter + 1)
+        when Net::HTTPRequestedRangeNotSatisfiable
+          new_headers = headers.dup
+          new_headers.delete("Range")
+          new_headers["Accept-Encoding"] = "gzip"
+          fetch(uri, new_headers)
+        when Net::HTTPRequestEntityTooLarge
+          raise FallbackError, response.body
+        when Net::HTTPTooManyRequests
+          raise TooManyRequestsError, response.body
+        when Net::HTTPUnauthorized
+          raise BadAuthenticationError, uri.host if uri.userinfo
+          raise AuthenticationRequiredError, uri.host
+        when Net::HTTPNotFound
+          raise FallbackError, "Net::HTTPNotFound: #{filtered_uri}"
+        else
+          raise HTTPError, "#{response.class}#{": #{response.body}" unless response.body.empty?}"
+        end
+      end
+
+      def request(uri, headers)
+        validate_uri_scheme!(uri)
+
+        filtered_uri = URICredentialsFilter.credential_filtered_uri(uri)
+
+        Bundler.ui.debug "HTTP GET #{filtered_uri}"
+        req = Net::HTTP::Get.new uri.request_uri, headers
+        if uri.user
+          user = CGI.unescape(uri.user)
+          password = uri.password ? CGI.unescape(uri.password) : nil
+          req.basic_auth(user, password)
+        end
+        connection.request(uri, req)
+      rescue NoMethodError => e
+        raise unless ["undefined method", "use_ssl="].all? {|snippet| e.message.include? snippet }
+        raise LoadError.new("cannot load such file -- openssl")
+      rescue OpenSSL::SSL::SSLError
+        raise CertificateFailureError.new(uri)
+      rescue *HTTP_ERRORS => e
+        Bundler.ui.trace e
+        if e.is_a?(SocketError) || e.message =~ /host down:/
+          raise NetworkDownError, "Could not reach host #{uri.host}. Check your network " \
+            "connection and try again."
+        else
+          raise HTTPError, "Network error while fetching #{filtered_uri}" \
+            " (#{e})"
+        end
+      end
+
+      private
+
+      def validate_uri_scheme!(uri)
+        return if uri.scheme =~ /\Ahttps?\z/
+        raise InvalidOption,
+          "The request uri `#{uri}` has an invalid scheme (`#{uri.scheme}`). " \
+          "Did you mean `http` or `https`?"
+      end
+    end
+  end
+end
diff --git a/lib/bundler/fetcher/index.rb b/lib/bundler/fetcher/index.rb
new file mode 100644
index 0000000000..0d14c47aa7
--- /dev/null
+++ b/lib/bundler/fetcher/index.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require_relative "base"
+
+module Bundler
+  class Fetcher
+    class Index < Base
+      def specs(_gem_names)
+        Bundler.rubygems.fetch_all_remote_specs(remote)
+      rescue Gem::RemoteFetcher::FetchError => e
+        case e.message
+        when /certificate verify failed/
+          raise CertificateFailureError.new(display_uri)
+        when /401/
+          raise BadAuthenticationError, remote_uri if remote_uri.userinfo
+          raise AuthenticationRequiredError, remote_uri
+        when /403/
+          raise BadAuthenticationError, remote_uri if remote_uri.userinfo
+          raise AuthenticationRequiredError, remote_uri
+        else
+          raise HTTPError, "Could not fetch specs from #{display_uri} due to underlying error <#{e.message}>"
+        end
+      end
+
+      def fetch_spec(spec)
+        spec -= [nil, "ruby", ""]
+        spec_file_name = "#{spec.join "-"}.gemspec"
+
+        uri = Bundler::URI.parse("#{remote_uri}#{Gem::MARSHAL_SPEC_DIR}#{spec_file_name}.rz")
+        if uri.scheme == "file"
+          path = Bundler.rubygems.correct_for_windows_path(uri.path)
+          Bundler.load_marshal Bundler.rubygems.inflate(Gem.read_binary(path))
+        elsif cached_spec_path = gemspec_cached_path(spec_file_name)
+          Bundler.load_gemspec(cached_spec_path)
+        else
+          Bundler.load_marshal Bundler.rubygems.inflate(downloader.fetch(uri).body)
+        end
+      rescue MarshalError
+        raise HTTPError, "Gemspec #{spec} contained invalid data.\n" \
+          "Your network or your gem server is probably having issues right now."
+      end
+
+      private
+
+      # cached gem specification path, if one exists
+      def gemspec_cached_path(spec_file_name)
+        paths = Bundler.rubygems.spec_cache_dirs.map {|dir| File.join(dir, spec_file_name) }
+        paths.find {|path| File.file? path }
+      end
+    end
+  end
+end
diff --git a/lib/bundler/friendly_errors.rb b/lib/bundler/friendly_errors.rb
new file mode 100644
index 0000000000..cc615db60c
--- /dev/null
+++ b/lib/bundler/friendly_errors.rb
@@ -0,0 +1,112 @@
+# frozen_string_literal: true
+
+require_relative "vendored_thor"
+
+module Bundler
+  module FriendlyErrors
+    module_function
+
+    def enable!
+      @disabled = false
+    end
+
+    def disabled?
+      @disabled
+    end
+
+    def disable!
+      @disabled = true
+    end
+
+    def log_error(error)
+      case error
+      when YamlSyntaxError
+        Bundler.ui.error error.message
+        Bundler.ui.trace error.orig_exception
+      when Dsl::DSLError, GemspecError
+        Bundler.ui.error error.message
+      when GemRequireError
+        Bundler.ui.error error.message
+        Bundler.ui.trace error.orig_exception
+      when BundlerError
+        Bundler.ui.error error.message, :wrap => true
+        Bundler.ui.trace error
+      when Thor::Error
+        Bundler.ui.error error.message
+      when LoadError
+        raise error unless error.message =~ /cannot load such file -- openssl|openssl.so|libcrypto.so/
+        Bundler.ui.error "\nCould not load OpenSSL. #{error.class}: #{error}\n#{error.backtrace.join("\n  ")}"
+      when Interrupt
+        Bundler.ui.error "\nQuitting..."
+        Bundler.ui.trace error
+      when Gem::InvalidSpecificationException
+        Bundler.ui.error error.message, :wrap => true
+      when SystemExit
+      when *[defined?(Java::JavaLang::OutOfMemoryError) && Java::JavaLang::OutOfMemoryError].compact
+        Bundler.ui.error "\nYour JVM has run out of memory, and Bundler cannot continue. " \
+          "You can decrease the amount of memory Bundler needs by removing gems from your Gemfile, " \
+          "especially large gems. (Gems can be as large as hundreds of megabytes, and Bundler has to read those files!). " \
+          "Alternatively, you can increase the amount of memory the JVM is able to use by running Bundler with jruby -J-Xmx1024m -S bundle (JRuby defaults to 500MB)."
+      else request_issue_report_for(error)
+      end
+    end
+
+    def exit_status(error)
+      case error
+      when BundlerError then error.status_code
+      when Thor::Error then 15
+      when SystemExit then error.status
+      else 1
+      end
+    end
+
+    def request_issue_report_for(e)
+      Bundler.ui.error <<-EOS.gsub(/^ {8}/, ""), nil, nil
+        --- ERROR REPORT TEMPLATE -------------------------------------------------------
+
+        ```
+        #{e.class}: #{e.message}
+          #{e.backtrace && e.backtrace.join("\n          ").chomp}
+        ```
+
+        #{Bundler::Env.report}
+        --- TEMPLATE END ----------------------------------------------------------------
+
+      EOS
+
+      Bundler.ui.error "Unfortunately, an unexpected error occurred, and Bundler cannot continue."
+
+      Bundler.ui.error <<-EOS.gsub(/^ {8}/, ""), nil, :yellow
+
+        First, try this link to see if there are any existing issue reports for this error:
+        #{issues_url(e)}
+
+        If there aren't any reports for this error yet, please fill in the new issue form located at #{new_issue_url}, and copy and paste the report template above in there.
+      EOS
+    end
+
+    def issues_url(exception)
+      message = exception.message.lines.first.tr(":", " ").chomp
+      message = message.split("-").first if exception.is_a?(Errno)
+      require "cgi"
+      "https://github.com/rubygems/rubygems/search?q=" \
+        "#{CGI.escape(message)}&type=Issues"
+    end
+
+    def new_issue_url
+      "https://github.com/rubygems/rubygems/issues/new?labels=Bundler&template=bundler-related-issue.md"
+    end
+  end
+
+  def self.with_friendly_errors
+    FriendlyErrors.enable!
+    yield
+  rescue SignalException
+    raise
+  rescue Exception => e # rubocop:disable Lint/RescueException
+    raise if FriendlyErrors.disabled?
+
+    FriendlyErrors.log_error(e)
+    exit FriendlyErrors.exit_status(e)
+  end
+end
diff --git a/lib/bundler/gem_helper.rb b/lib/bundler/gem_helper.rb
new file mode 100644
index 0000000000..034f2e5960
--- /dev/null
+++ b/lib/bundler/gem_helper.rb
@@ -0,0 +1,238 @@
+# frozen_string_literal: true
+
+require_relative "../bundler"
+require "shellwords"
+
+module Bundler
+  class GemHelper
+    include Rake::DSL if defined? Rake::DSL
+
+    class << self
+      # set when install'd.
+      attr_accessor :instance
+
+      def install_tasks(opts = {})
+        new(opts[:dir], opts[:name]).install
+      end
+
+      def tag_prefix=(prefix)
+        instance.tag_prefix = prefix
+      end
+
+      def gemspec(&block)
+        gemspec = instance.gemspec
+        block.call(gemspec) if block
+        gemspec
+      end
+    end
+
+    attr_reader :spec_path, :base, :gemspec
+
+    attr_writer :tag_prefix
+
+    def initialize(base = nil, name = nil)
+      @base = File.expand_path(base || SharedHelpers.pwd)
+      gemspecs = name ? [File.join(@base, "#{name}.gemspec")] : Gem::Util.glob_files_in_dir("{,*}.gemspec", @base)
+      raise "Unable to determine name from existing gemspec. Use :name => 'gemname' in #install_tasks to manually set it." unless gemspecs.size == 1
+      @spec_path = gemspecs.first
+      @gemspec = Bundler.load_gemspec(@spec_path)
+      @tag_prefix = ""
+    end
+
+    def install
+      built_gem_path = nil
+
+      desc "Build #{name}-#{version}.gem into the pkg directory."
+      task "build" do
+        built_gem_path = build_gem
+      end
+
+      desc "Generate SHA512 checksum if #{name}-#{version}.gem into the checksums directory."
+      task "build:checksum" => "build" do
+        build_checksum(built_gem_path)
+      end
+
+      desc "Build and install #{name}-#{version}.gem into system gems."
+      task "install" => "build" do
+        install_gem(built_gem_path)
+      end
+
+      desc "Build and install #{name}-#{version}.gem into system gems without network access."
+      task "install:local" => "build" do
+        install_gem(built_gem_path, :local)
+      end
+
+      desc "Create tag #{version_tag} and build and push #{name}-#{version}.gem to #{gem_push_host}\n" \
+           "To prevent publishing in RubyGems use `gem_push=no rake release`"
+      task "release", [:remote] => ["build", "release:guard_clean",
+                                    "release:source_control_push", "release:rubygem_push"] do
+      end
+
+      task "release:guard_clean" do
+        guard_clean
+      end
+
+      task "release:source_control_push", [:remote] do |_, args|
+        tag_version { git_push(args[:remote]) } unless already_tagged?
+      end
+
+      task "release:rubygem_push" => "build" do
+        rubygem_push(built_gem_path) if gem_push?
+      end
+
+      GemHelper.instance = self
+    end
+
+    def build_gem
+      file_name = nil
+      sh([*gem_command, "build", "-V", spec_path]) do
+        file_name = File.basename(built_gem_path)
+        SharedHelpers.filesystem_access(File.join(base, "pkg")) {|p| FileUtils.mkdir_p(p) }
+        FileUtils.mv(built_gem_path, "pkg")
+        Bundler.ui.confirm "#{name} #{version} built to pkg/#{file_name}."
+      end
+      File.join(base, "pkg", file_name)
+    end
+
+    def install_gem(built_gem_path = nil, local = false)
+      built_gem_path ||= build_gem
+      cmd = [*gem_command, "install", built_gem_path.to_s]
+      cmd << "--local" if local
+      sh(cmd)
+      Bundler.ui.confirm "#{name} (#{version}) installed."
+    end
+
+    def build_checksum(built_gem_path = nil)
+      built_gem_path ||= build_gem
+      SharedHelpers.filesystem_access(File.join(base, "checksums")) {|p| FileUtils.mkdir_p(p) }
+      file_name = "#{File.basename(built_gem_path)}.sha512"
+      require "digest/sha2"
+      checksum = ::Digest::SHA512.new.hexdigest(built_gem_path.to_s)
+      target = File.join(base, "checksums", file_name)
+      File.write(target, checksum)
+      Bundler.ui.confirm "#{name} #{version} checksum written to checksums/#{file_name}."
+    end
+
+    protected
+
+    def rubygem_push(path)
+      cmd = [*gem_command, "push", path]
+      cmd << "--key" << gem_key if gem_key
+      cmd << "--host" << allowed_push_host if allowed_push_host
+      sh_with_input(cmd)
+      Bundler.ui.confirm "Pushed #{name} #{version} to #{gem_push_host}"
+    end
+
+    def built_gem_path
+      Gem::Util.glob_files_in_dir("#{name}-*.gem", base).sort_by {|f| File.mtime(f) }.last
+    end
+
+    def git_push(remote = nil)
+      remote ||= default_remote
+      sh("git push #{remote} refs/heads/#{current_branch}".shellsplit)
+      sh("git push #{remote} refs/tags/#{version_tag}".shellsplit)
+      Bundler.ui.confirm "Pushed git commits and release tag."
+    end
+
+    def default_remote
+      remote_for_branch, status = sh_with_status(%W[git config --get branch.#{current_branch}.remote])
+      return "origin" unless status.success?
+
+      remote_for_branch.strip
+    end
+
+    def current_branch
+      # We can replace this with `git branch --show-current` once we drop support for git < 2.22.0
+      sh(%w[git rev-parse --abbrev-ref HEAD]).gsub(%r{\Aheads/}, "").strip
+    end
+
+    def allowed_push_host
+      @gemspec.metadata["allowed_push_host"] if @gemspec.respond_to?(:metadata)
+    end
+
+    def gem_push_host
+      env_rubygems_host = ENV["RUBYGEMS_HOST"]
+      env_rubygems_host = nil if
+        env_rubygems_host && env_rubygems_host.empty?
+
+      allowed_push_host || env_rubygems_host || "rubygems.org"
+    end
+
+    def already_tagged?
+      return false unless sh(%w[git tag]).split(/\n/).include?(version_tag)
+      Bundler.ui.confirm "Tag #{version_tag} has already been created."
+      true
+    end
+
+    def guard_clean
+      clean? && committed? || raise("There are files that need to be committed first.")
+    end
+
+    def clean?
+      sh_with_status(%w[git diff --exit-code])[1].success?
+    end
+
+    def committed?
+      sh_with_status(%w[git diff-index --quiet --cached HEAD])[1].success?
+    end
+
+    def tag_version
+      sh %W[git tag -m Version\ #{version} #{version_tag}]
+      Bundler.ui.confirm "Tagged #{version_tag}."
+      yield if block_given?
+    rescue RuntimeError
+      Bundler.ui.error "Untagging #{version_tag} due to error."
+      sh_with_status %W[git tag -d #{version_tag}]
+      raise
+    end
+
+    def version
+      gemspec.version
+    end
+
+    def version_tag
+      "#{@tag_prefix}v#{version}"
+    end
+
+    def name
+      gemspec.name
+    end
+
+    def sh_with_input(cmd)
+      Bundler.ui.debug(cmd)
+      SharedHelpers.chdir(base) do
+        abort unless Kernel.system(*cmd)
+      end
+    end
+
+    def sh(cmd, &block)
+      out, status = sh_with_status(cmd, &block)
+      unless status.success?
+        raise("Running `#{cmd.shelljoin}` failed with the following output:\n\n#{out}\n")
+      end
+      out
+    end
+
+    def sh_with_status(cmd, &block)
+      Bundler.ui.debug(cmd)
+      SharedHelpers.chdir(base) do
+        outbuf = IO.popen(cmd, :err => [:child, :out], &:read)
+        status = $?
+        block.call(outbuf) if status.success? && block
+        [outbuf, status]
+      end
+    end
+
+    def gem_key
+      Bundler.settings["gem.push_key"].to_s.downcase if Bundler.settings["gem.push_key"]
+    end
+
+    def gem_push?
+      !%w[n no nil false off 0].include?(ENV["gem_push"].to_s.downcase)
+    end
+
+    def gem_command
+      ENV["GEM_COMMAND"]&.shellsplit || ["gem"]
+    end
+  end
+end
diff --git a/lib/bundler/gem_helpers.rb b/lib/bundler/gem_helpers.rb
new file mode 100644
index 0000000000..b271b8d229
--- /dev/null
+++ b/lib/bundler/gem_helpers.rb
@@ -0,0 +1,110 @@
+# frozen_string_literal: true
+
+module Bundler
+  module GemHelpers
+    GENERIC_CACHE = { Gem::Platform::RUBY => Gem::Platform::RUBY } # rubocop:disable Style/MutableConstant
+    GENERICS = [
+      [Gem::Platform.new("java"), Gem::Platform.new("java")],
+      [Gem::Platform.new("mswin32"), Gem::Platform.new("mswin32")],
+      [Gem::Platform.new("mswin64"), Gem::Platform.new("mswin64")],
+      [Gem::Platform.new("universal-mingw32"), Gem::Platform.new("universal-mingw32")],
+      [Gem::Platform.new("x64-mingw32"), Gem::Platform.new("x64-mingw32")],
+      [Gem::Platform.new("x86_64-mingw32"), Gem::Platform.new("x64-mingw32")],
+      [Gem::Platform.new("mingw32"), Gem::Platform.new("x86-mingw32")],
+    ].freeze
+
+    def generic(p)
+      GENERIC_CACHE[p] ||= begin
+        _, found = GENERICS.find do |match, _generic|
+          p.os == match.os && (!match.cpu || p.cpu == match.cpu)
+        end
+        found || Gem::Platform::RUBY
+      end
+    end
+    module_function :generic
+
+    def generic_local_platform
+      generic(local_platform)
+    end
+    module_function :generic_local_platform
+
+    def local_platform
+      Bundler.local_platform
+    end
+    module_function :local_platform
+
+    def platform_specificity_match(spec_platform, user_platform)
+      spec_platform = Gem::Platform.new(spec_platform)
+
+      PlatformMatch.specificity_score(spec_platform, user_platform)
+    end
+    module_function :platform_specificity_match
+
+    def select_best_platform_match(specs, platform)
+      matching = specs.select {|spec| spec.match_platform(platform) }
+      exact = matching.select {|spec| spec.platform == platform }
+      return exact if exact.any?
+
+      sorted_matching = matching.sort_by {|spec| platform_specificity_match(spec.platform, platform) }
+      exemplary_spec = sorted_matching.first
+
+      sorted_matching.take_while{|spec| same_specificity(platform, spec, exemplary_spec) && same_deps(spec, exemplary_spec) }
+    end
+    module_function :select_best_platform_match
+
+    class PlatformMatch
+      def self.specificity_score(spec_platform, user_platform)
+        return -1 if spec_platform == user_platform
+        return 1_000_000 if spec_platform.nil? || spec_platform == Gem::Platform::RUBY || user_platform == Gem::Platform::RUBY
+
+        os_match(spec_platform, user_platform) +
+          cpu_match(spec_platform, user_platform) * 10 +
+          platform_version_match(spec_platform, user_platform) * 100
+      end
+
+      def self.os_match(spec_platform, user_platform)
+        if spec_platform.os == user_platform.os
+          0
+        else
+          1
+        end
+      end
+
+      def self.cpu_match(spec_platform, user_platform)
+        if spec_platform.cpu == user_platform.cpu
+          0
+        elsif spec_platform.cpu == "arm" && user_platform.cpu.to_s.start_with?("arm")
+          0
+        elsif spec_platform.cpu.nil? || spec_platform.cpu == "universal"
+          1
+        else
+          2
+        end
+      end
+
+      def self.platform_version_match(spec_platform, user_platform)
+        if spec_platform.version == user_platform.version
+          0
+        elsif spec_platform.version.nil?
+          1
+        else
+          2
+        end
+      end
+    end
+
+    def same_specificity(platform, spec, exemplary_spec)
+      platform_specificity_match(spec.platform, platform) == platform_specificity_match(exemplary_spec.platform, platform)
+    end
+    module_function :same_specificity
+
+    def same_deps(spec, exemplary_spec)
+      same_runtime_deps = spec.dependencies.sort == exemplary_spec.dependencies.sort
+      return same_runtime_deps unless spec.is_a?(Gem::Specification) && exemplary_spec.is_a?(Gem::Specification)
+
+      same_metadata_deps = spec.required_ruby_version == exemplary_spec.required_ruby_version && spec.required_rubygems_version == exemplary_spec.required_rubygems_version
+      same_runtime_deps && same_metadata_deps
+    end
+    module_function :same_deps
+  end
+end
diff --git a/lib/bundler/gem_tasks.rb b/lib/bundler/gem_tasks.rb
new file mode 100644
index 0000000000..bc725d3602
--- /dev/null
+++ b/lib/bundler/gem_tasks.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require "rake/clean"
+CLOBBER.include "pkg"
+
+require_relative "gem_helper"
+Bundler::GemHelper.install_tasks
diff --git a/lib/bundler/gem_version_promoter.rb b/lib/bundler/gem_version_promoter.rb
new file mode 100644
index 0000000000..3cce3f2139
--- /dev/null
+++ b/lib/bundler/gem_version_promoter.rb
@@ -0,0 +1,190 @@
+# frozen_string_literal: true
+
+module Bundler
+  # This class contains all of the logic for determining the next version of a
+  # Gem to update to based on the requested level (patch, minor, major).
+  # Primarily designed to work with Resolver which will provide it the list of
+  # available dependency versions as found in its index, before returning it to
+  # to the resolution engine to select the best version.
+  class GemVersionPromoter
+    DEBUG = ENV["BUNDLER_DEBUG_RESOLVER"] || ENV["DEBUG_RESOLVER"]
+
+    attr_reader :level, :locked_specs, :unlock_gems
+
+    # By default, strict is false, meaning every available version of a gem
+    # is returned from sort_versions. The order gives preference to the
+    # requested level (:patch, :minor, :major) but in complicated requirement
+    # cases some gems will by necessity by promoted past the requested level,
+    # or even reverted to older versions.
+    #
+    # If strict is set to true, the results from sort_versions will be
+    # truncated, eliminating any version outside the current level scope.
+    # This can lead to unexpected outcomes or even VersionConflict exceptions
+    # that report a version of a gem not existing for versions that indeed do
+    # existing in the referenced source.
+    attr_accessor :strict
+
+    attr_accessor :prerelease_specified
+
+    # Given a list of locked_specs and a list of gems to unlock creates a
+    # GemVersionPromoter instance.
+    #
+    # @param locked_specs [SpecSet] All current locked specs. Unlike Definition
+    #   where this list is empty if all gems are being updated, this should
+    #   always be populated for all gems so this class can properly function.
+    # @param unlock_gems [String] List of gem names being unlocked. If empty,
+    #   all gems will be considered unlocked.
+    # @return [GemVersionPromoter]
+    def initialize(locked_specs = SpecSet.new([]), unlock_gems = [])
+      @level = :major
+      @strict = false
+      @locked_specs = locked_specs
+      @unlock_gems = unlock_gems
+      @sort_versions = {}
+      @prerelease_specified = {}
+    end
+
+    # @param value [Symbol] One of three Symbols: :major, :minor or :patch.
+    def level=(value)
+      v = case value
+          when String, Symbol
+            value.to_sym
+      end
+
+      raise ArgumentError, "Unexpected level #{v}. Must be :major, :minor or :patch" unless [:major, :minor, :patch].include?(v)
+      @level = v
+    end
+
+    # Given a Dependency and an Array of SpecGroups of available versions for a
+    # gem, this method will return the Array of SpecGroups sorted (and possibly
+    # truncated if strict is true) in an order to give preference to the current
+    # level (:major, :minor or :patch) when resolution is deciding what versions
+    # best resolve all dependencies in the bundle.
+    # @param dep [Dependency] The Dependency of the gem.
+    # @param spec_groups [SpecGroup] An array of SpecGroups for the same gem
+    #    named in the @dep param.
+    # @return [SpecGroup] A new instance of the SpecGroup Array sorted and
+    #    possibly filtered.
+    def sort_versions(dep, spec_groups)
+      before_result = "before sort_versions: #{debug_format_result(dep, spec_groups).inspect}" if DEBUG
+
+      @sort_versions[dep] ||= begin
+        gem_name = dep.name
+
+        # An Array per version returned, different entries for different platforms.
+        # We only need the version here so it's ok to hard code this to the first instance.
+        locked_spec = locked_specs[gem_name].first
+
+        if strict
+          filter_dep_specs(spec_groups, locked_spec)
+        else
+          sort_dep_specs(spec_groups, locked_spec)
+        end.tap do |specs|
+          if DEBUG
+            puts before_result
+            puts " after sort_versions: #{debug_format_result(dep, specs).inspect}"
+          end
+        end
+      end
+    end
+
+    # @return [bool] Convenience method for testing value of level variable.
+    def major?
+      level == :major
+    end
+
+    # @return [bool] Convenience method for testing value of level variable.
+    def minor?
+      level == :minor
+    end
+
+    private
+
+    def filter_dep_specs(spec_groups, locked_spec)
+      res = spec_groups.select do |spec_group|
+        if locked_spec && !major?
+          gsv = spec_group.version
+          lsv = locked_spec.version
+
+          must_match = minor? ? [0] : [0, 1]
+
+          matches = must_match.map {|idx| gsv.segments[idx] == lsv.segments[idx] }
+          matches.uniq == [true] ? (gsv >= lsv) : false
+        else
+          true
+        end
+      end
+
+      sort_dep_specs(res, locked_spec)
+    end
+
+    def sort_dep_specs(spec_groups, locked_spec)
+      return spec_groups unless locked_spec
+      @gem_name = locked_spec.name
+      @locked_version = locked_spec.version
+
+      result = spec_groups.sort do |a, b|
+        @a_ver = a.version
+        @b_ver = b.version
+
+        unless @prerelease_specified[@gem_name]
+          a_pre = @a_ver.prerelease?
+          b_pre = @b_ver.prerelease?
+
+          next -1 if a_pre && !b_pre
+          next  1 if b_pre && !a_pre
+        end
+
+        if major?
+          @a_ver <=> @b_ver
+        elsif either_version_older_than_locked
+          @a_ver <=> @b_ver
+        elsif segments_do_not_match(:major)
+          @b_ver <=> @a_ver
+        elsif !minor? && segments_do_not_match(:minor)
+          @b_ver <=> @a_ver
+        else
+          @a_ver <=> @b_ver
+        end
+      end
+      post_sort(result)
+    end
+
+    def either_version_older_than_locked
+      @a_ver < @locked_version || @b_ver < @locked_version
+    end
+
+    def segments_do_not_match(level)
+      index = [:major, :minor].index(level)
+      @a_ver.segments[index] != @b_ver.segments[index]
+    end
+
+    def unlocking_gem?
+      unlock_gems.empty? || unlock_gems.include?(@gem_name)
+    end
+
+    # Specific version moves can't always reliably be done during sorting
+    # as not all elements are compared against each other.
+    def post_sort(result)
+      # default :major behavior in Bundler does not do this
+      return result if major?
+      if unlocking_gem?
+        result
+      else
+        move_version_to_end(result, @locked_version)
+      end
+    end
+
+    def move_version_to_end(result, version)
+      move, keep = result.partition {|s| s.version.to_s == version.to_s }
+      keep.concat(move)
+    end
+
+    def debug_format_result(dep, spec_groups)
+      a = [dep.to_s,
+           spec_groups.map {|sg| [sg.version, sg.dependencies_for_activated_platforms.map {|dp| [dp.name, dp.requirement.to_s] }] }]
+      last_map = a.last.map {|sg_data| [sg_data.first.version, sg_data.last.map {|aa| aa.join(" ") }] }
+      [a.first, last_map, level, strict ? :strict : :not_strict]
+    end
+  end
+end
diff --git a/lib/bundler/gemdeps.rb b/lib/bundler/gemdeps.rb
new file mode 100644
index 0000000000..cd4b25d0e6
--- /dev/null
+++ b/lib/bundler/gemdeps.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Bundler
+  class Gemdeps
+    def initialize(runtime)
+      @runtime = runtime
+    end
+
+    def requested_specs
+      @runtime.requested_specs
+    end
+
+    def specs
+      @runtime.specs
+    end
+
+    def dependencies
+      @runtime.dependencies
+    end
+
+    def current_dependencies
+      @runtime.current_dependencies
+    end
+
+    def requires
+      @runtime.requires
+    end
+  end
+end
diff --git a/lib/bundler/graph.rb b/lib/bundler/graph.rb
new file mode 100644
index 0000000000..8f52e2f0f0
--- /dev/null
+++ b/lib/bundler/graph.rb
@@ -0,0 +1,152 @@
+# frozen_string_literal: true
+
+require "set"
+module Bundler
+  class Graph
+    GRAPH_NAME = :Gemfile
+
+    def initialize(env, output_file, show_version = false, show_requirements = false, output_format = "png", without = [])
+      @env               = env
+      @output_file       = output_file
+      @show_version      = show_version
+      @show_requirements = show_requirements
+      @output_format     = output_format
+      @without_groups    = without.map(&:to_sym)
+
+      @groups            = []
+      @relations         = Hash.new {|h, k| h[k] = Set.new }
+      @node_options      = {}
+      @edge_options      = {}
+
+      _populate_relations
+    end
+
+    attr_reader :groups, :relations, :node_options, :edge_options, :output_file, :output_format
+
+    def viz
+      GraphVizClient.new(self).run
+    end
+
+    private
+
+    def _populate_relations
+      parent_dependencies = _groups.values.to_set.flatten
+      loop do
+        break if parent_dependencies.empty?
+
+        tmp = Set.new
+        parent_dependencies.each do |dependency|
+          child_dependencies = spec_for_dependency(dependency).runtime_dependencies.to_set
+          @relations[dependency.name] += child_dependencies.map(&:name).to_set
+          tmp += child_dependencies
+
+          @node_options[dependency.name] = _make_label(dependency, :node)
+          child_dependencies.each do |c_dependency|
+            @edge_options["#{dependency.name}_#{c_dependency.name}"] = _make_label(c_dependency, :edge)
+          end
+        end
+        parent_dependencies = tmp
+      end
+    end
+
+    def _groups
+      relations = Hash.new {|h, k| h[k] = Set.new }
+      @env.current_dependencies.each do |dependency|
+        dependency.groups.each do |group|
+          next if @without_groups.include?(group)
+
+          relations[group.to_s].add(dependency)
+          @relations[group.to_s].add(dependency.name)
+
+          @node_options[group.to_s] ||= _make_label(group, :node)
+          @edge_options["#{group}_#{dependency.name}"] = _make_label(dependency, :edge)
+        end
+      end
+      @groups = relations.keys
+      relations
+    end
+
+    def _make_label(symbol_or_string_or_dependency, element_type)
+      case element_type.to_sym
+      when :node
+        if symbol_or_string_or_dependency.is_a?(Gem::Dependency)
+          label = symbol_or_string_or_dependency.name.dup
+          label << "\n#{spec_for_dependency(symbol_or_string_or_dependency).version}" if @show_version
+        else
+          label = symbol_or_string_or_dependency.to_s
+        end
+      when :edge
+        label = nil
+        if symbol_or_string_or_dependency.respond_to?(:requirements_list) && @show_requirements
+          tmp = symbol_or_string_or_dependency.requirements_list.join(", ")
+          label = tmp if tmp != ">= 0"
+        end
+      else
+        raise ArgumentError, "2nd argument is invalid"
+      end
+      label.nil? ? {} : { :label => label }
+    end
+
+    def spec_for_dependency(dependency)
+      @env.requested_specs.find {|s| s.name == dependency.name }
+    end
+
+    class GraphVizClient
+      def initialize(graph_instance)
+        @graph_name    = graph_instance.class::GRAPH_NAME
+        @groups        = graph_instance.groups
+        @relations     = graph_instance.relations
+        @node_options  = graph_instance.node_options
+        @edge_options  = graph_instance.edge_options
+        @output_file   = graph_instance.output_file
+        @output_format = graph_instance.output_format
+      end
+
+      def g
+        @g ||= ::GraphViz.digraph(@graph_name, :concentrate => true, :normalize => true, :nodesep => 0.55) do |g|
+          g.edge[:weight]   = 2
+          g.edge[:fontname] = g.node[:fontname] = "Arial, Helvetica, SansSerif"
+          g.edge[:fontsize] = 12
+        end
+      end
+
+      def run
+        @groups.each do |group|
+          g.add_nodes(
+            group, {
+              :style     => "filled",
+              :fillcolor => "#B9B9D5",
+              :shape     => "box3d",
+              :fontsize  => 16,
+            }.merge(@node_options[group])
+          )
+        end
+
+        @relations.each do |parent, children|
+          children.each do |child|
+            if @groups.include?(parent)
+              g.add_nodes(child, { :style => "filled", :fillcolor => "#B9B9D5" }.merge(@node_options[child]))
+              g.add_edges(parent, child, { :constraint => false }.merge(@edge_options["#{parent}_#{child}"]))
+            else
+              g.add_nodes(child, @node_options[child])
+              g.add_edges(parent, child, @edge_options["#{parent}_#{child}"])
+            end
+          end
+        end
+
+        if @output_format.to_s == "debug"
+          $stdout.puts g.output :none => String
+          Bundler.ui.info "debugging bundle viz..."
+        else
+          begin
+            g.output @output_format.to_sym => "#{@output_file}.#{@output_format}"
+            Bundler.ui.info "#{@output_file}.#{@output_format}"
+          rescue ArgumentError => e
+            warn "Unsupported output format. See Ruby-Graphviz/lib/graphviz/constants.rb"
+            raise e
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/bundler/index.rb b/lib/bundler/index.rb
new file mode 100644
index 0000000000..8930fca6d0
--- /dev/null
+++ b/lib/bundler/index.rb
@@ -0,0 +1,213 @@
+# frozen_string_literal: true
+
+module Bundler
+  class Index
+    include Enumerable
+
+    def self.build
+      i = new
+      yield i
+      i
+    end
+
+    attr_reader :specs, :all_specs, :sources
+    protected :specs, :all_specs
+
+    RUBY = "ruby".freeze
+    NULL = "\0".freeze
+
+    def initialize
+      @sources = []
+      @cache = {}
+      @specs = Hash.new {|h, k| h[k] = {} }
+      @all_specs = Hash.new {|h, k| h[k] = EMPTY_SEARCH }
+    end
+
+    def initialize_copy(o)
+      @sources = o.sources.dup
+      @cache = {}
+      @specs = Hash.new {|h, k| h[k] = {} }
+      @all_specs = Hash.new {|h, k| h[k] = EMPTY_SEARCH }
+
+      o.specs.each do |name, hash|
+        @specs[name] = hash.dup
+      end
+      o.all_specs.each do |name, array|
+        @all_specs[name] = array.dup
+      end
+    end
+
+    def inspect
+      "#<#{self.class}:0x#{object_id} sources=#{sources.map(&:inspect)} specs.size=#{specs.size}>"
+    end
+
+    def empty?
+      each { return false }
+      true
+    end
+
+    def search_all(name)
+      all_matches = local_search(name) + @all_specs[name]
+      @sources.each do |source|
+        all_matches.concat(source.search_all(name))
+      end
+      all_matches
+    end
+
+    # Search this index's specs, and any source indexes that this index knows
+    # about, returning all of the results.
+    def search(query, base = nil)
+      sort_specs(unsorted_search(query, base))
+    end
+
+    def unsorted_search(query, base)
+      results = local_search(query, base)
+
+      seen = results.map(&:full_name).uniq unless @sources.empty?
+
+      @sources.each do |source|
+        source.unsorted_search(query, base).each do |spec|
+          next if seen.include?(spec.full_name)
+
+          seen << spec.full_name
+          results << spec
+        end
+      end
+
+      results
+    end
+    protected :unsorted_search
+
+    def self.sort_specs(specs)
+      specs.sort_by do |s|
+        platform_string = s.platform.to_s
+        [s.version, platform_string == RUBY ? NULL : platform_string]
+      end
+    end
+
+    def sort_specs(specs)
+      self.class.sort_specs(specs)
+    end
+
+    def local_search(query, base = nil)
+      case query
+      when Gem::Specification, RemoteSpecification, LazySpecification, EndpointSpecification then search_by_spec(query)
+      when String then specs_by_name(query)
+      when Gem::Dependency then search_by_dependency(query, base)
+      when DepProxy then search_by_dependency(query.dep, base)
+      else
+        raise "You can't search for a #{query.inspect}."
+      end
+    end
+
+    alias_method :[], :search
+
+    def <<(spec)
+      @specs[spec.name][spec.full_name] = spec
+      spec
+    end
+
+    def each(&blk)
+      return enum_for(:each) unless blk
+      specs.values.each do |spec_sets|
+        spec_sets.values.each(&blk)
+      end
+      sources.each {|s| s.each(&blk) }
+      self
+    end
+
+    def spec_names
+      names = specs.keys + sources.map(&:spec_names)
+      names.uniq!
+      names
+    end
+
+    def unmet_dependency_names
+      dependency_names.select do |name|
+        search(name).empty?
+      end
+    end
+
+    def dependency_names
+      names = []
+      each do |spec|
+        spec.dependencies.each do |dep|
+          next if dep.type == :development
+          names << dep.name
+        end
+      end
+      names.uniq
+    end
+
+    def use(other, override_dupes = false)
+      return unless other
+      other.each do |s|
+        if (dupes = search_by_spec(s)) && !dupes.empty?
+          # safe to << since it's a new array when it has contents
+          @all_specs[s.name] = dupes << s
+          next unless override_dupes
+        end
+        self << s
+      end
+      self
+    end
+
+    def size
+      @sources.inject(@specs.size) do |size, source|
+        size += source.size
+      end
+    end
+
+    # Whether all the specs in self are in other
+    # TODO: rename to #include?
+    def ==(other)
+      all? do |spec|
+        other_spec = other[spec].first
+        other_spec && dependencies_eql?(spec, other_spec) && spec.source == other_spec.source
+      end
+    end
+
+    def dependencies_eql?(spec, other_spec)
+      deps       = spec.dependencies.select {|d| d.type != :development }
+      other_deps = other_spec.dependencies.select {|d| d.type != :development }
+      deps.sort == other_deps.sort
+    end
+
+    def add_source(index)
+      raise ArgumentError, "Source must be an index, not #{index.class}" unless index.is_a?(Index)
+      @sources << index
+      @sources.uniq! # need to use uniq! here instead of checking for the item before adding
+    end
+
+    private
+
+    def specs_by_name(name)
+      @specs[name].values
+    end
+
+    def search_by_dependency(dependency, base = nil)
+      @cache[base || false] ||= {}
+      @cache[base || false][dependency] ||= begin
+        specs = specs_by_name(dependency.name)
+        specs += base if base
+        found = specs.select do |spec|
+          next true if spec.source.is_a?(Source::Gemspec)
+          if base # allow all platforms when searching from a lockfile
+            dependency.matches_spec?(spec)
+          else
+            dependency.matches_spec?(spec) && Gem::Platform.match_spec?(spec)
+          end
+        end
+
+        found
+      end
+    end
+
+    EMPTY_SEARCH = [].freeze
+
+    def search_by_spec(spec)
+      spec = @specs[spec.name][spec.full_name]
+      spec ? [spec] : EMPTY_SEARCH
+    end
+  end
+end
diff --git a/lib/bundler/injector.rb b/lib/bundler/injector.rb
new file mode 100644
index 0000000000..613bda4f84
--- /dev/null
+++ b/lib/bundler/injector.rb
@@ -0,0 +1,273 @@
+# frozen_string_literal: true
+
+module Bundler
+  class Injector
+    INJECTED_GEMS = "injected gems".freeze
+
+    def self.inject(new_deps, options = {})
+      injector = new(new_deps, options)
+      injector.inject(Bundler.default_gemfile, Bundler.default_lockfile)
+    end
+
+    def self.remove(gems, options = {})
+      injector = new(gems, options)
+      injector.remove(Bundler.default_gemfile, Bundler.default_lockfile)
+    end
+
+    def initialize(deps, options = {})
+      @deps = deps
+      @options = options
+    end
+
+    # @param [Pathname] gemfile_path The Gemfile in which to inject the new dependency.
+    # @param [Pathname] lockfile_path The lockfile in which to inject the new dependency.
+    # @return [Array]
+    def inject(gemfile_path, lockfile_path)
+      if Bundler.frozen_bundle?
+        # ensure the lock and Gemfile are synced
+        Bundler.definition.ensure_equivalent_gemfile_and_lockfile(true)
+      end
+
+      # temporarily unfreeze
+      Bundler.settings.temporary(:deployment => false, :frozen => false) do
+        # evaluate the Gemfile we have now
+        builder = Dsl.new
+        builder.eval_gemfile(gemfile_path)
+
+        # don't inject any gems that are already in the Gemfile
+        @deps -= builder.dependencies
+
+        # add new deps to the end of the in-memory Gemfile
+        # Set conservative versioning to false because
+        # we want to let the resolver resolve the version first
+        builder.eval_gemfile(INJECTED_GEMS, build_gem_lines(false)) if @deps.any?
+
+        # resolve to see if the new deps broke anything
+        @definition = builder.to_definition(lockfile_path, {})
+        @definition.resolve_remotely!
+
+        # since nothing broke, we can add those gems to the gemfile
+        append_to(gemfile_path, build_gem_lines(@options[:conservative_versioning])) if @deps.any?
+
+        # since we resolved successfully, write out the lockfile
+        @definition.lock(Bundler.default_lockfile)
+
+        # invalidate the cached Bundler.definition
+        Bundler.reset_paths!
+
+        # return an array of the deps that we added
+        @deps
+      end
+    end
+
+    # @param [Pathname] gemfile_path The Gemfile from which to remove dependencies.
+    # @param [Pathname] lockfile_path The lockfile from which to remove dependencies.
+    # @return [Array]
+    def remove(gemfile_path, lockfile_path)
+      # remove gems from each gemfiles we have
+      Bundler.definition.gemfiles.each do |path|
+        deps = remove_deps(path)
+
+        show_warning("No gems were removed from the gemfile.") if deps.empty?
+
+        deps.each {|dep| Bundler.ui.confirm "#{SharedHelpers.pretty_dependency(dep, false)} was removed." }
+      end
+    end
+
+    private
+
+    def conservative_version(spec)
+      version = spec.version
+      return ">= 0" if version.nil?
+      segments = version.segments
+      seg_end_index = version >= Gem::Version.new("1.0") ? 1 : 2
+
+      prerelease_suffix = version.to_s.gsub(version.release.to_s, "") if version.prerelease?
+      "#{version_prefix}#{segments[0..seg_end_index].join(".")}#{prerelease_suffix}"
+    end
+
+    def version_prefix
+      if @options[:strict]
+        "= "
+      elsif @options[:optimistic]
+        ">= "
+      else
+        "~> "
+      end
+    end
+
+    def build_gem_lines(conservative_versioning)
+      @deps.map do |d|
+        name = d.name.dump
+
+        requirement = if conservative_versioning
+          ", \"#{conservative_version(@definition.specs[d.name][0])}\""
+        else
+          ", #{d.requirement.as_list.map(&:dump).join(", ")}"
+        end
+
+        if d.groups != Array(:default)
+          group = d.groups.size == 1 ? ", :group => #{d.groups.first.inspect}" : ", :groups => #{d.groups.inspect}"
+        end
+
+        source = ", :source => \"#{d.source}\"" unless d.source.nil?
+        git = ", :git => \"#{d.git}\"" unless d.git.nil?
+        branch = ", :branch => \"#{d.branch}\"" unless d.branch.nil?
+
+        %(gem #{name}#{requirement}#{group}#{source}#{git}#{branch})
+      end.join("\n")
+    end
+
+    def append_to(gemfile_path, new_gem_lines)
+      gemfile_path.open("a") do |f|
+        f.puts
+        f.puts new_gem_lines
+      end
+    end
+
+    # evaluates a gemfile to remove the specified gem
+    # from it.
+    def remove_deps(gemfile_path)
+      initial_gemfile = File.readlines(gemfile_path)
+
+      Bundler.ui.info "Removing gems from #{gemfile_path}"
+
+      # evaluate the Gemfile we have
+      builder = Dsl.new
+      builder.eval_gemfile(gemfile_path)
+
+      removed_deps = remove_gems_from_dependencies(builder, @deps, gemfile_path)
+
+      # abort the operation if no gems were removed
+      # no need to operate on gemfile further
+      return [] if removed_deps.empty?
+
+      cleaned_gemfile = remove_gems_from_gemfile(@deps, gemfile_path)
+
+      SharedHelpers.write_to_gemfile(gemfile_path, cleaned_gemfile)
+
+      # check for errors
+      # including extra gems being removed
+      # or some gems not being removed
+      # and return the actual removed deps
+      cross_check_for_errors(gemfile_path, builder.dependencies, removed_deps, initial_gemfile)
+    end
+
+    # @param [Dsl]      builder Dsl object of current Gemfile.
+    # @param [Array]    gems Array of names of gems to be removed.
+    # @param [Pathname] gemfile_path Path of the Gemfile.
+    # @return [Array]   Array of removed dependencies.
+    def remove_gems_from_dependencies(builder, gems, gemfile_path)
+      removed_deps = []
+
+      gems.each do |gem_name|
+        deleted_dep = builder.dependencies.find {|d| d.name == gem_name }
+
+        if deleted_dep.nil?
+          raise GemfileError, "`#{gem_name}` is not specified in #{gemfile_path} so it could not be removed."
+        end
+
+        builder.dependencies.delete(deleted_dep)
+
+        removed_deps << deleted_dep
+      end
+
+      removed_deps
+    end
+
+    # @param [Array] gems            Array of names of gems to be removed.
+    # @param [Pathname] gemfile_path The Gemfile from which to remove dependencies.
+    def remove_gems_from_gemfile(gems, gemfile_path)
+      patterns = /gem\s+(['"])#{Regexp.union(gems)}\1|gem\s*\((['"])#{Regexp.union(gems)}\2\)/
+      new_gemfile = []
+      multiline_removal = false
+      File.readlines(gemfile_path).each do |line|
+        match_data = line.match(patterns)
+        if match_data && is_not_within_comment?(line, match_data)
+          multiline_removal = line.rstrip.end_with?(",")
+          # skip lines which match the regex
+          next
+        end
+
+        # skip followup lines until line does not end with ','
+        new_gemfile << line unless multiline_removal
+        multiline_removal = line.rstrip.end_with?(",") if multiline_removal
+      end
+
+      # remove line \n and append them with other strings
+      new_gemfile.each_with_index do |_line, index|
+        if new_gemfile[index + 1] == "\n"
+          new_gemfile[index] += new_gemfile[index + 1]
+          new_gemfile.delete_at(index + 1)
+        end
+      end
+
+      %w[group source env install_if].each {|block| remove_nested_blocks(new_gemfile, block) }
+
+      new_gemfile.join.chomp
+    end
+
+    # @param [String] line          Individual line of gemfile content.
+    # @param [MatchData] match_data Data about Regex match.
+    def is_not_within_comment?(line, match_data)
+      match_start_index = match_data.offset(0).first
+      !line[0..match_start_index].include?("#")
+    end
+
+    # @param [Array] gemfile       Array of gemfile contents.
+    # @param [String] block_name   Name of block name to look for.
+    def remove_nested_blocks(gemfile, block_name)
+      nested_blocks = 0
+
+      # count number of nested blocks
+      gemfile.each_with_index {|line, index| nested_blocks += 1 if !gemfile[index + 1].nil? && gemfile[index + 1].include?(block_name) && line.include?(block_name) }
+
+      while nested_blocks >= 0
+        nested_blocks -= 1
+
+        gemfile.each_with_index do |line, index|
+          next unless !line.nil? && line.strip.start_with?(block_name)
+          if gemfile[index + 1] =~ /^\s*end\s*$/
+            gemfile[index] = nil
+            gemfile[index + 1] = nil
+          end
+        end
+
+        gemfile.compact!
+      end
+    end
+
+    # @param [Pathname] gemfile_path   The Gemfile from which to remove dependencies.
+    # @param [Array] original_deps     Array of original dependencies.
+    # @param [Array] removed_deps      Array of removed dependencies.
+    # @param [Array] initial_gemfile   Contents of original Gemfile before any operation.
+    def cross_check_for_errors(gemfile_path, original_deps, removed_deps, initial_gemfile)
+      # evaluate the new gemfile to look for any failure cases
+      builder = Dsl.new
+      builder.eval_gemfile(gemfile_path)
+
+      # record gems which were removed but not requested
+      extra_removed_gems = original_deps - builder.dependencies
+
+      # if some extra gems were removed then raise error
+      # and revert Gemfile to original
+      unless extra_removed_gems.empty?
+        SharedHelpers.write_to_gemfile(gemfile_path, initial_gemfile.join)
+
+        raise InvalidOption, "Gems could not be removed. #{extra_removed_gems.join(", ")} would also have been removed. Bundler cannot continue."
+      end
+
+      # record gems which could not be removed due to some reasons
+      errored_deps = builder.dependencies.select {|d| d.gemfile == gemfile_path } & removed_deps.select {|d| d.gemfile == gemfile_path }
+
+      show_warning "#{errored_deps.map(&:name).join(", ")} could not be removed." unless errored_deps.empty?
+
+      # return actual removed dependencies
+      removed_deps - errored_deps
+    end
+
+    def show_warning(message)
+      Bundler.ui.info Bundler.ui.add_color(message, :yellow)
+    end
+  end
+end
diff --git a/lib/bundler/inline.rb b/lib/bundler/inline.rb
new file mode 100644
index 0000000000..a718418fce
--- /dev/null
+++ b/lib/bundler/inline.rb
@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+# Allows for declaring a Gemfile inline in a ruby script, optionally installing
+# any gems that aren't already installed on the user's system.
+#
+# @note Every gem that is specified in this 'Gemfile' will be `require`d, as if
+#       the user had manually called `Bundler.require`. To avoid a requested gem
+#       being automatically required, add the `:require => false` option to the
+#       `gem` dependency declaration.
+#
+# @param install [Boolean] whether gems that aren't already installed on the
+#                          user's system should be installed.
+#                          Defaults to `false`.
+#
+# @param gemfile [Proc]    a block that is evaluated as a `Gemfile`.
+#
+# @example Using an inline Gemfile
+#
+#          #!/usr/bin/env ruby
+#
+#          require 'bundler/inline'
+#
+#          gemfile do
+#            source 'https://rubygems.org'
+#            gem 'json', require: false
+#            gem 'nap', require: 'rest'
+#            gem 'cocoapods', '~> 0.34.1'
+#          end
+#
+#          puts Pod::VERSION # => "0.34.4"
+#
+def gemfile(install = false, options = {}, &gemfile)
+  require_relative "../bundler"
+
+  opts = options.dup
+  ui = opts.delete(:ui) { Bundler::UI::Shell.new }
+  ui.level = "silent" if opts.delete(:quiet)
+  raise ArgumentError, "Unknown options: #{opts.keys.join(", ")}" unless opts.empty?
+
+  begin
+    old_root = Bundler.method(:root)
+    bundler_module = class << Bundler; self; end
+    bundler_module.send(:remove_method, :root)
+    def Bundler.root
+      Bundler::SharedHelpers.pwd.expand_path
+    end
+    old_gemfile = ENV["BUNDLE_GEMFILE"]
+    Bundler::SharedHelpers.set_env "BUNDLE_GEMFILE", "Gemfile"
+
+    Bundler::Plugin.gemfile_install(&gemfile) if Bundler.feature_flag.plugins?
+    builder = Bundler::Dsl.new
+    builder.instance_eval(&gemfile)
+    builder.check_primary_source_safety
+
+    Bundler.settings.temporary(:deployment => false, :frozen => false) do
+      definition = builder.to_definition(nil, true)
+      def definition.lock(*); end
+      definition.validate_runtime!
+
+      Bundler.ui = install ? ui : Bundler::UI::Silent.new
+      if install || definition.missing_specs?
+        Bundler.settings.temporary(:inline => true) do
+          installer = Bundler::Installer.install(Bundler.root, definition, :system => true)
+          installer.post_install_messages.each do |name, message|
+            Bundler.ui.info "Post-install message from #{name}:\n#{message}"
+          end
+        end
+      end
+
+      runtime = Bundler::Runtime.new(nil, definition)
+      runtime.setup.require
+    end
+  ensure
+    if bundler_module
+      bundler_module.send(:remove_method, :root)
+      bundler_module.send(:define_method, :root, old_root)
+    end
+
+    if old_gemfile
+      ENV["BUNDLE_GEMFILE"] = old_gemfile
+    else
+      ENV["BUNDLE_GEMFILE"] = ""
+    end
+  end
+end
diff --git a/lib/bundler/installer.rb b/lib/bundler/installer.rb
new file mode 100644
index 0000000000..63e02ba496
--- /dev/null
+++ b/lib/bundler/installer.rb
@@ -0,0 +1,291 @@
+# frozen_string_literal: true
+
+require_relative "worker"
+require_relative "installer/parallel_installer"
+require_relative "installer/standalone"
+require_relative "installer/gem_installer"
+
+module Bundler
+  class Installer
+    class << self
+      attr_accessor :ambiguous_gems
+
+      Installer.ambiguous_gems = []
+    end
+
+    attr_reader :post_install_messages
+
+    # Begins the installation process for Bundler.
+    # For more information see the #run method on this class.
+    def self.install(root, definition, options = {})
+      installer = new(root, definition)
+      Plugin.hook(Plugin::Events::GEM_BEFORE_INSTALL_ALL, definition.dependencies)
+      installer.run(options)
+      Plugin.hook(Plugin::Events::GEM_AFTER_INSTALL_ALL, definition.dependencies)
+      installer
+    end
+
+    def initialize(root, definition)
+      @root = root
+      @definition = definition
+      @post_install_messages = {}
+    end
+
+    # Runs the install procedures for a specific Gemfile.
+    #
+    # Firstly, this method will check to see if `Bundler.bundle_path` exists
+    # and if not then Bundler will create the directory. This is usually the same
+    # location as RubyGems which typically is the `~/.gem` directory
+    # unless other specified.
+    #
+    # Secondly, it checks if Bundler has been configured to be "frozen".
+    # Frozen ensures that the Gemfile and the Gemfile.lock file are matching.
+    # This stops a situation where a developer may update the Gemfile but may not run
+    # `bundle install`, which leads to the Gemfile.lock file not being correctly updated.
+    # If this file is not correctly updated then any other developer running
+    # `bundle install` will potentially not install the correct gems.
+    #
+    # Thirdly, Bundler checks if there are any dependencies specified in the Gemfile.
+    # If there are no dependencies specified then Bundler returns a warning message stating
+    # so and this method returns.
+    #
+    # Fourthly, Bundler checks if the Gemfile.lock exists, and if so
+    # then proceeds to set up a definition based on the Gemfile and the Gemfile.lock.
+    # During this step Bundler will also download information about any new gems
+    # that are not in the Gemfile.lock and resolve any dependencies if needed.
+    #
+    # Fifthly, Bundler resolves the dependencies either through a cache of gems or by remote.
+    # This then leads into the gems being installed, along with stubs for their executables,
+    # but only if the --binstubs option has been passed or Bundler.options[:bin] has been set
+    # earlier.
+    #
+    # Sixthly, a new Gemfile.lock is created from the installed gems to ensure that the next time
+    # that a user runs `bundle install` they will receive any updates from this process.
+    #
+    # Finally, if the user has specified the standalone flag, Bundler will generate the needed
+    # require paths and save them in a `setup.rb` file. See `bundle standalone --help` for more
+    # information.
+    def run(options)
+      create_bundle_path
+
+      ProcessLock.lock do
+        if Bundler.frozen_bundle?
+          @definition.ensure_equivalent_gemfile_and_lockfile(options[:deployment])
+        end
+
+        if @definition.dependencies.empty?
+          Bundler.ui.warn "The Gemfile specifies no dependencies"
+          lock
+          return
+        end
+
+        if resolve_if_needed(options)
+          ensure_specs_are_compatible!
+          load_plugins
+          options.delete(:jobs)
+        else
+          options[:jobs] = 1 # to avoid the overhead of Bundler::Worker
+        end
+        install(options)
+
+        Gem::Specification.reset # invalidate gem specification cache so that installed gems are immediately available
+
+        lock unless Bundler.frozen_bundle?
+        Standalone.new(options[:standalone], @definition).generate if options[:standalone]
+      end
+    end
+
+    def generate_bundler_executable_stubs(spec, options = {})
+      if options[:binstubs_cmd] && spec.executables.empty?
+        options = {}
+        spec.runtime_dependencies.each do |dep|
+          bins = @definition.specs[dep].first.executables
+          options[dep.name] = bins unless bins.empty?
+        end
+        if options.any?
+          Bundler.ui.warn "#{spec.name} has no executables, but you may want " \
+            "one from a gem it depends on."
+          options.each {|name, bins| Bundler.ui.warn "  #{name} has: #{bins.join(", ")}" }
+        else
+          Bundler.ui.warn "There are no executables for the gem #{spec.name}."
+        end
+        return
+      end
+
+      # double-assignment to avoid warnings about variables that will be used by ERB
+      bin_path = Bundler.bin_path
+      bin_path = bin_path
+      relative_gemfile_path = Bundler.default_gemfile.relative_path_from(bin_path)
+      relative_gemfile_path = relative_gemfile_path
+      ruby_command = Thor::Util.ruby_command
+      ruby_command = ruby_command
+      template_path = File.expand_path("../templates/Executable", __FILE__)
+      if spec.name == "bundler"
+        template_path += ".bundler"
+        spec.executables = %(bundle)
+      end
+      template = File.read(template_path)
+
+      exists = []
+      spec.executables.each do |executable|
+        binstub_path = "#{bin_path}/#{executable}"
+        if File.exist?(binstub_path) && !options[:force]
+          exists << executable
+          next
+        end
+
+        mode = Gem.win_platform? ? "wb:UTF-8" : "w"
+        require "erb"
+        content = if RUBY_VERSION >= "2.6"
+          ERB.new(template, :trim_mode => "-").result(binding)
+        else
+          ERB.new(template, nil, "-").result(binding)
+        end
+
+        File.write(binstub_path, content, :mode => mode, :perm => 0o777 & ~File.umask)
+        if Gem.win_platform? || options[:all_platforms]
+          prefix = "@ruby -x \"%~f0\" %*\n@exit /b %ERRORLEVEL%\n\n"
+          File.write("#{binstub_path}.cmd", prefix + content, :mode => mode)
+        end
+      end
+
+      if options[:binstubs_cmd] && exists.any?
+        case exists.size
+        when 1
+          Bundler.ui.warn "Skipped #{exists[0]} since it already exists."
+        when 2
+          Bundler.ui.warn "Skipped #{exists.join(" and ")} since they already exist."
+        else
+          items = exists[0...-1].empty? ? nil : exists[0...-1].join(", ")
+          skipped = [items, exists[-1]].compact.join(" and ")
+          Bundler.ui.warn "Skipped #{skipped} since they already exist."
+        end
+        Bundler.ui.warn "If you want to overwrite skipped stubs, use --force."
+      end
+    end
+
+    def generate_standalone_bundler_executable_stubs(spec, options = {})
+      # double-assignment to avoid warnings about variables that will be used by ERB
+      bin_path = Bundler.bin_path
+      unless path = Bundler.settings[:path]
+        raise "Can't standalone without an explicit path set"
+      end
+      standalone_path = Bundler.root.join(path).relative_path_from(bin_path)
+      standalone_path = standalone_path
+      template = File.read(File.expand_path("../templates/Executable.standalone", __FILE__))
+      ruby_command = Thor::Util.ruby_command
+      ruby_command = ruby_command
+
+      spec.executables.each do |executable|
+        next if executable == "bundle"
+        executable_path = Pathname(spec.full_gem_path).join(spec.bindir, executable).relative_path_from(bin_path)
+        executable_path = executable_path
+
+        mode = Gem.win_platform? ? "wb:UTF-8" : "w"
+        require "erb"
+        content = if RUBY_VERSION >= "2.6"
+          ERB.new(template, :trim_mode => "-").result(binding)
+        else
+          ERB.new(template, nil, "-").result(binding)
+        end
+
+        File.write("#{bin_path}/#{executable}", content, :mode => mode, :perm => 0o755)
+        if Gem.win_platform? || options[:all_platforms]
+          prefix = "@ruby -x \"%~f0\" %*\n@exit /b %ERRORLEVEL%\n\n"
+          File.write("#{bin_path}/#{executable}.cmd", prefix + content, :mode => mode)
+        end
+      end
+    end
+
+    private
+
+    # the order that the resolver provides is significant, since
+    # dependencies might affect the installation of a gem.
+    # that said, it's a rare situation (other than rake), and parallel
+    # installation is SO MUCH FASTER. so we let people opt in.
+    def install(options)
+      force = options["force"]
+      jobs = installation_parallelization(options)
+      install_in_parallel jobs, options[:standalone], force
+    end
+
+    def installation_parallelization(options)
+      if jobs = options.delete(:jobs)
+        return jobs
+      end
+
+      if jobs = Bundler.settings[:jobs]
+        return jobs
+      end
+
+      # Parallelization has some issues on Windows, so it's not yet the default
+      return 1 if Gem.win_platform?
+
+      Bundler.settings.processor_count
+    end
+
+    def load_plugins
+      Bundler.rubygems.load_plugins
+
+      requested_path_gems = @definition.requested_specs.select {|s| s.source.is_a?(Source::Path) }
+      path_plugin_files = requested_path_gems.map do |spec|
+        begin
+          Bundler.rubygems.spec_matches_for_glob(spec, "rubygems_plugin#{Bundler.rubygems.suffix_pattern}")
+        rescue TypeError
+          error_message = "#{spec.name} #{spec.version} has an invalid gemspec"
+          raise Gem::InvalidSpecificationException, error_message
+        end
+      end.flatten
+      Bundler.rubygems.load_plugin_files(path_plugin_files)
+      Bundler.rubygems.load_env_plugins
+    end
+
+    def ensure_specs_are_compatible!
+      system_ruby = Bundler::RubyVersion.system
+      rubygems_version = Gem::Version.create(Gem::VERSION)
+      @definition.specs.each do |spec|
+        if required_ruby_version = spec.required_ruby_version
+          unless required_ruby_version.satisfied_by?(system_ruby.gem_version)
+            raise InstallError, "#{spec.full_name} requires ruby version #{required_ruby_version}, " \
+              "which is incompatible with the current version, #{system_ruby}"
+          end
+        end
+        next unless required_rubygems_version = spec.required_rubygems_version
+        unless required_rubygems_version.satisfied_by?(rubygems_version)
+          raise InstallError, "#{spec.full_name} requires rubygems version #{required_rubygems_version}, " \
+            "which is incompatible with the current version, #{rubygems_version}"
+        end
+      end
+    end
+
+    def install_in_parallel(size, standalone, force = false)
+      spec_installations = ParallelInstaller.call(self, @definition.specs, size, standalone, force)
+      spec_installations.each do |installation|
+        post_install_messages[installation.name] = installation.post_install_message if installation.has_post_install_message?
+      end
+    end
+
+    def create_bundle_path
+      SharedHelpers.filesystem_access(Bundler.bundle_path.to_s) do |p|
+        Bundler.mkdir_p(p)
+      end unless Bundler.bundle_path.exist?
+    rescue Errno::EEXIST
+      raise PathError, "Could not install to path `#{Bundler.bundle_path}` " \
+        "because a file already exists at that path. Either remove or rename the file so the directory can be created."
+    end
+
+    # returns whether or not a re-resolve was needed
+    def resolve_if_needed(options)
+      if !@definition.unlocking? && !options["force"] && !Bundler.settings[:inline] && Bundler.default_lockfile.file?
+        return false if @definition.nothing_changed? && !@definition.missing_specs?
+      end
+
+      options["local"] ? @definition.resolve_with_cache! : @definition.resolve_remotely!
+      true
+    end
+
+    def lock(opts = {})
+      @definition.lock(Bundler.default_lockfile, opts[:preserve_unknown_sections])
+    end
+  end
+end
diff --git a/lib/bundler/installer/gem_installer.rb b/lib/bundler/installer/gem_installer.rb
new file mode 100644
index 0000000000..1df86ccfbc
--- /dev/null
+++ b/lib/bundler/installer/gem_installer.rb
@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+module Bundler
+  class GemInstaller
+    attr_reader :spec, :standalone, :worker, :force, :installer
+
+    def initialize(spec, installer, standalone = false, worker = 0, force = false)
+      @spec = spec
+      @installer = installer
+      @standalone = standalone
+      @worker = worker
+      @force = force
+    end
+
+    def install_from_spec
+      post_install_message = spec_settings ? install_with_settings : install
+      Bundler.ui.debug "#{worker}:  #{spec.name} (#{spec.version}) from #{spec.loaded_from}"
+      generate_executable_stubs
+      return true, post_install_message
+    rescue Bundler::InstallHookError, Bundler::SecurityError, Bundler::APIResponseMismatchError
+      raise
+    rescue Errno::ENOSPC
+      return false, out_of_space_message
+    rescue Bundler::BundlerError, Gem::InstallError, Bundler::APIResponseInvalidDependenciesError => e
+      return false, specific_failure_message(e)
+    end
+
+    private
+
+    def specific_failure_message(e)
+      message = "#{e.class}: #{e.message}\n"
+      message += "  " + e.backtrace.join("\n  ") + "\n\n"
+      message = message.lines.first + Bundler.ui.add_color(message.lines.drop(1).join, :clear)
+      message + Bundler.ui.add_color(failure_message, :red)
+    end
+
+    def failure_message
+      install_error_message
+    end
+
+    def install_error_message
+      "An error occurred while installing #{spec.name} (#{spec.version}), and Bundler cannot continue."
+    end
+
+    def spec_settings
+      # Fetch the build settings, if there are any
+      if settings = Bundler.settings["build.#{spec.name}"]
+        require "shellwords"
+        Shellwords.shellsplit(settings)
+      end
+    end
+
+    def install
+      spec.source.install(spec, :force => force, :ensure_builtin_gems_cached => standalone, :build_args => Array(spec_settings))
+    end
+
+    def install_with_settings
+      # Build arguments are global, so this is mutexed
+      Bundler.rubygems.install_with_build_args([spec_settings]) { install }
+    end
+
+    def out_of_space_message
+      "#{install_error_message}\nYour disk is out of space. Free some space to be able to install your bundle."
+    end
+
+    def generate_executable_stubs
+      return if Bundler.feature_flag.forget_cli_options?
+      return if Bundler.settings[:inline]
+      if Bundler.settings[:bin] && standalone
+        installer.generate_standalone_bundler_executable_stubs(spec)
+      elsif Bundler.settings[:bin]
+        installer.generate_bundler_executable_stubs(spec, :force => true)
+      end
+    end
+  end
+end
diff --git a/lib/bundler/installer/parallel_installer.rb b/lib/bundler/installer/parallel_installer.rb
new file mode 100644
index 0000000000..5b6680e5e1
--- /dev/null
+++ b/lib/bundler/installer/parallel_installer.rb
@@ -0,0 +1,250 @@
+# frozen_string_literal: true
+
+require_relative "../worker"
+require_relative "gem_installer"
+
+module Bundler
+  class ParallelInstaller
+    class SpecInstallation
+      attr_accessor :spec, :name, :full_name, :post_install_message, :state, :error
+      def initialize(spec)
+        @spec = spec
+        @name = spec.name
+        @full_name = spec.full_name
+        @state = :none
+        @post_install_message = ""
+        @error = nil
+      end
+
+      def installed?
+        state == :installed
+      end
+
+      def enqueued?
+        state == :enqueued
+      end
+
+      def failed?
+        state == :failed
+      end
+
+      def ready_to_enqueue?
+        state == :none
+      end
+
+      def has_post_install_message?
+        !post_install_message.empty?
+      end
+
+      def ignorable_dependency?(dep)
+        dep.type == :development || dep.name == @name
+      end
+
+      # Checks installed dependencies against spec's dependencies to make
+      # sure needed dependencies have been installed.
+      def dependencies_installed?(all_specs)
+        installed_specs = all_specs.select(&:installed?).map(&:name)
+        dependencies.all? {|d| installed_specs.include? d.name }
+      end
+
+      # Represents only the non-development dependencies, the ones that are
+      # itself and are in the total list.
+      def dependencies
+        @dependencies ||= all_dependencies.reject {|dep| ignorable_dependency? dep }
+      end
+
+      def missing_lockfile_dependencies(all_spec_names)
+        dependencies.reject {|dep| all_spec_names.include? dep.name }
+      end
+
+      # Represents all dependencies
+      def all_dependencies
+        @spec.dependencies
+      end
+
+      def to_s
+        "#<#{self.class} #{full_name} (#{state})>"
+      end
+    end
+
+    def self.call(*args)
+      new(*args).call
+    end
+
+    attr_reader :size
+
+    def initialize(installer, all_specs, size, standalone, force)
+      @installer = installer
+      @size = size
+      @standalone = standalone
+      @force = force
+      @specs = all_specs.map {|s| SpecInstallation.new(s) }
+      @spec_set = all_specs
+      @rake = @specs.find {|s| s.name == "rake" }
+    end
+
+    def call
+      check_for_corrupt_lockfile
+
+      if @rake
+        do_install(@rake, 0)
+        Gem::Specification.reset
+      end
+
+      if @size > 1
+        install_with_worker
+      else
+        install_serially
+      end
+
+      check_for_unmet_dependencies
+
+      handle_error if failed_specs.any?
+      @specs
+    ensure
+      worker_pool && worker_pool.stop
+    end
+
+    def check_for_unmet_dependencies
+      unmet_dependencies = @specs.map do |s|
+        [
+          s,
+          s.dependencies.reject {|dep| @specs.any? {|spec| dep.matches_spec?(spec.spec) } },
+        ]
+      end.reject {|a| a.last.empty? }
+      return if unmet_dependencies.empty?
+
+      warning = []
+      warning << "Your lockfile doesn't include a valid resolution."
+      warning << "You can fix this by regenerating your lockfile or trying to manually editing the bad locked gems to a version that satisfies all dependencies."
+      warning << "The unmet dependencies are:"
+
+      unmet_dependencies.each do |spec, unmet_spec_dependencies|
+        unmet_spec_dependencies.each do |unmet_spec_dependency|
+          warning << "* #{unmet_spec_dependency}, depended upon #{spec.full_name}, unsatisfied by #{@specs.find {|s| s.name == unmet_spec_dependency.name && !unmet_spec_dependency.matches_spec?(s.spec) }.full_name}"
+        end
+      end
+
+      Bundler.ui.warn(warning.join("\n"))
+    end
+
+    def check_for_corrupt_lockfile
+      missing_dependencies = @specs.map do |s|
+        [
+          s,
+          s.missing_lockfile_dependencies(@specs.map(&:name)),
+        ]
+      end.reject {|a| a.last.empty? }
+      return if missing_dependencies.empty?
+
+      warning = []
+      warning << "Your lockfile was created by an old Bundler that left some things out."
+      if @size != 1
+        warning << "Because of the missing DEPENDENCIES, we can only install gems one at a time, instead of installing #{@size} at a time."
+        @size = 1
+      end
+      warning << "You can fix this by adding the missing gems to your Gemfile, running bundle install, and then removing the gems from your Gemfile."
+      warning << "The missing gems are:"
+
+      missing_dependencies.each do |spec, missing|
+        warning << "* #{missing.map(&:name).join(", ")} depended upon by #{spec.name}"
+      end
+
+      Bundler.ui.warn(warning.join("\n"))
+    end
+
+    private
+
+    def failed_specs
+      @specs.select(&:failed?)
+    end
+
+    def install_with_worker
+      enqueue_specs
+      process_specs until finished_installing?
+    end
+
+    def install_serially
+      until finished_installing?
+        raise "failed to find a spec to enqueue while installing serially" unless spec_install = @specs.find(&:ready_to_enqueue?)
+        spec_install.state = :enqueued
+        do_install(spec_install, 0)
+      end
+    end
+
+    def worker_pool
+      @worker_pool ||= Bundler::Worker.new @size, "Parallel Installer", lambda {|spec_install, worker_num|
+        do_install(spec_install, worker_num)
+      }
+    end
+
+    def do_install(spec_install, worker_num)
+      Plugin.hook(Plugin::Events::GEM_BEFORE_INSTALL, spec_install)
+      gem_installer = Bundler::GemInstaller.new(
+        spec_install.spec, @installer, @standalone, worker_num, @force
+      )
+      success, message = gem_installer.install_from_spec
+      if success
+        spec_install.state = :installed
+        spec_install.post_install_message = message unless message.nil?
+      else
+        spec_install.error = "#{message}\n\n#{require_tree_for_spec(spec_install.spec)}"
+        spec_install.state = :failed
+      end
+      Plugin.hook(Plugin::Events::GEM_AFTER_INSTALL, spec_install)
+      spec_install
+    end
+
+    # Dequeue a spec and save its post-install message and then enqueue the
+    # remaining specs.
+    # Some specs might've had to wait til this spec was installed to be
+    # processed so the call to `enqueue_specs` is important after every
+    # dequeue.
+    def process_specs
+      worker_pool.deq
+      enqueue_specs
+    end
+
+    def finished_installing?
+      @specs.all? do |spec|
+        return true if spec.failed?
+        spec.installed?
+      end
+    end
+
+    def handle_error
+      errors = failed_specs.map(&:error)
+      if exception = errors.find {|e| e.is_a?(Bundler::BundlerError) }
+        raise exception
+      end
+      raise Bundler::InstallError, errors.join("\n\n")
+    end
+
+    def require_tree_for_spec(spec)
+      tree = @spec_set.what_required(spec)
+      t = String.new("In #{File.basename(SharedHelpers.default_gemfile)}:\n")
+      tree.each_with_index do |s, depth|
+        t << "  " * depth.succ << s.name
+        unless tree.last == s
+          t << %( was resolved to #{s.version}, which depends on)
+        end
+        t << %(\n)
+      end
+      t
+    end
+
+    # Keys in the remains hash represent uninstalled gems specs.
+    # We enqueue all gem specs that do not have any dependencies.
+    # Later we call this lambda again to install specs that depended on
+    # previously installed specifications. We continue until all specs
+    # are installed.
+    def enqueue_specs
+      @specs.select(&:ready_to_enqueue?).each do |spec|
+        if spec.dependencies_installed? @specs
+          spec.state = :enqueued
+          worker_pool.enq spec
+        end
+      end
+    end
+  end
+end
diff --git a/lib/bundler/installer/standalone.rb b/lib/bundler/installer/standalone.rb
new file mode 100644
index 0000000000..e8494b4bcd
--- /dev/null
+++ b/lib/bundler/installer/standalone.rb
@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module Bundler
+  class Standalone
+    def initialize(groups, definition)
+      @specs = definition.specs_for(groups)
+    end
+
+    def generate
+      SharedHelpers.filesystem_access(bundler_path) do |p|
+        FileUtils.mkdir_p(p)
+      end
+      File.open File.join(bundler_path, "setup.rb"), "w" do |file|
+        file.puts "require 'rbconfig'"
+        file.puts reverse_rubygems_kernel_mixin
+        paths.each do |path|
+          if Pathname.new(path).absolute?
+            file.puts %($:.unshift "#{path}")
+          else
+            file.puts %($:.unshift File.expand_path("\#{__dir__}/#{path}"))
+          end
+        end
+      end
+    end
+
+    private
+
+    def paths
+      @specs.map do |spec|
+        next if spec.name == "bundler"
+        Array(spec.require_paths).map do |path|
+          gem_path(path, spec).sub(version_dir, '#{RUBY_ENGINE}/#{RbConfig::CONFIG["ruby_version"]}')
+          # This is a static string intentionally. It's interpolated at a later time.
+        end
+      end.flatten.compact
+    end
+
+    def version_dir
+      "#{RUBY_ENGINE}/#{RbConfig::CONFIG["ruby_version"]}"
+    end
+
+    def bundler_path
+      Bundler.root.join(Bundler.settings[:path], "bundler")
+    end
+
+    def gem_path(path, spec)
+      full_path = Pathname.new(path).absolute? ? path : File.join(spec.full_gem_path, path)
+      if spec.source.instance_of?(Source::Path)
+        full_path
+      else
+        Pathname.new(full_path).relative_path_from(Bundler.root.join(bundler_path)).to_s
+      end
+    rescue TypeError
+      error_message = "#{spec.name} #{spec.version} has an invalid gemspec"
+      raise Gem::InvalidSpecificationException.new(error_message)
+    end
+
+    def reverse_rubygems_kernel_mixin
+      <<~END
+      kernel = (class << ::Kernel; self; end)
+      [kernel, ::Kernel].each do |k|
+        if k.private_method_defined?(:gem_original_require)
+          private_require = k.private_method_defined?(:require)
+          k.send(:remove_method, :require)
+          k.send(:define_method, :require, k.instance_method(:gem_original_require))
+          k.send(:private, :require) if private_require
+        end
+      end
+      END
+    end
+  end
+end
diff --git a/lib/bundler/lazy_specification.rb b/lib/bundler/lazy_specification.rb
new file mode 100644
index 0000000000..4eb228f314
--- /dev/null
+++ b/lib/bundler/lazy_specification.rb
@@ -0,0 +1,158 @@
+# frozen_string_literal: true
+
+require_relative "match_platform"
+
+module Bundler
+  class LazySpecification
+    include MatchPlatform
+
+    attr_reader :name, :version, :dependencies, :platform
+    attr_accessor :source, :remote
+
+    def initialize(name, version, platform, source = nil)
+      @name          = name
+      @version       = version
+      @dependencies  = []
+      @platform      = platform || Gem::Platform::RUBY
+      @source        = source
+      @specification = nil
+    end
+
+    def full_name
+      if platform == Gem::Platform::RUBY || platform.nil?
+        "#{@name}-#{@version}"
+      else
+        "#{@name}-#{@version}-#{platform}"
+      end
+    end
+
+    def ==(other)
+      identifier == other.identifier
+    end
+
+    def eql?(other)
+      identifier.eql?(other.identifier)
+    end
+
+    def hash
+      identifier.hash
+    end
+
+    ##
+    # Does this locked specification satisfy +dependency+?
+    #
+    # NOTE: Rubygems default requirement is ">= 0", which doesn't match
+    # prereleases of 0 versions, like "0.0.0.dev" or "0.0.0.SNAPSHOT". However,
+    # bundler users expect those to work. We need to make sure that Gemfile
+    # dependencies without explicit requirements (which use ">= 0" under the
+    # hood by default) are still valid for locked specs using this kind of
+    # versions. The method implements an ad-hoc fix for that. A better solution
+    # might be to change default rubygems requirement of dependencies to be ">=
+    # 0.A" but that's a major refactoring likely to break things. Hopefully we
+    # can attempt it in the future.
+    #
+
+    def satisfies?(dependency)
+      effective_requirement = dependency.requirement == Gem::Requirement.default ? Gem::Requirement.new(">= 0.A") : dependency.requirement
+
+      @name == dependency.name && effective_requirement.satisfied_by?(Gem::Version.new(@version))
+    end
+
+    def to_lock
+      out = String.new
+
+      if platform == Gem::Platform::RUBY || platform.nil?
+        out << "    #{name} (#{version})\n"
+      else
+        out << "    #{name} (#{version}-#{platform})\n"
+      end
+
+      dependencies.sort_by(&:to_s).uniq.each do |dep|
+        next if dep.type == :development
+        out << "    #{dep.to_lock}\n"
+      end
+
+      out
+    end
+
+    def __materialize__
+      @specification = if source.is_a?(Source::Gemspec) && source.gemspec.name == name
+        source.gemspec.tap {|s| s.source = source }
+      else
+        search_object = if source.is_a?(Source::Path)
+          Dependency.new(name, version)
+        else
+          ruby_platform_materializes_to_ruby_platform? ? self : Dependency.new(name, version)
+        end
+        platform_object = Gem::Platform.new(platform)
+        candidates = source.specs.search(search_object)
+        same_platform_candidates = candidates.select do |spec|
+          MatchPlatform.platforms_match?(spec.platform, platform_object)
+        end
+        installable_candidates = same_platform_candidates.select do |spec|
+          !spec.is_a?(EndpointSpecification) ||
+            (spec.required_ruby_version.satisfied_by?(Gem.ruby_version) &&
+              spec.required_rubygems_version.satisfied_by?(Gem.rubygems_version))
+        end
+        search = installable_candidates.last || same_platform_candidates.last
+        search.dependencies = dependencies if search && (search.is_a?(RemoteSpecification) || search.is_a?(EndpointSpecification))
+        search
+      end
+    end
+
+    def respond_to?(*args)
+      super || @specification ? @specification.respond_to?(*args) : nil
+    end
+
+    def to_s
+      @__to_s ||= if platform == Gem::Platform::RUBY || platform.nil?
+        "#{name} (#{version})"
+      else
+        "#{name} (#{version}-#{platform})"
+      end
+    end
+
+    def identifier
+      @__identifier ||= [name, version, platform_string]
+    end
+
+    def git_version
+      return unless source.is_a?(Bundler::Source::Git)
+      " #{source.revision[0..6]}"
+    end
+
+    protected
+
+    def platform_string
+      platform_string = platform.to_s
+      platform_string == Index::RUBY ? Index::NULL : platform_string
+    end
+
+    private
+
+    def to_ary
+      nil
+    end
+
+    def method_missing(method, *args, &blk)
+      raise "LazySpecification has not been materialized yet (calling :#{method} #{args.inspect})" unless @specification
+
+      return super unless respond_to?(method)
+
+      @specification.send(method, *args, &blk)
+    end
+
+    #
+    # For backwards compatibility with existing lockfiles, if the most specific
+    # locked platform is RUBY, we keep the previous behaviour of resolving the
+    # best platform variant at materiliazation time. For previous bundler
+    # versions (before 2.2.0) this was always the case (except when the lockfile
+    # only included non-ruby platforms), but we're also keeping this behaviour
+    # on newer bundlers unless users generate the lockfile from scratch or
+    # explicitly add a more specific platform.
+    #
+    def ruby_platform_materializes_to_ruby_platform?
+      !Bundler.most_specific_locked_platform?(Gem::Platform::RUBY) || Bundler.settings[:force_ruby_platform]
+    end
+  end
+end
diff --git a/lib/bundler/lockfile_generator.rb b/lib/bundler/lockfile_generator.rb
new file mode 100644
index 0000000000..3bc6bd7339
--- /dev/null
+++ b/lib/bundler/lockfile_generator.rb
@@ -0,0 +1,95 @@
+# frozen_string_literal: true
+
+module Bundler
+  class LockfileGenerator
+    attr_reader :definition
+    attr_reader :out
+
+    # @private
+    def initialize(definition)
+      @definition = definition
+      @out = String.new
+    end
+
+    def self.generate(definition)
+      new(definition).generate!
+    end
+
+    def generate!
+      add_sources
+      add_platforms
+      add_dependencies
+      add_locked_ruby_version
+      add_bundled_with
+
+      out
+    end
+
+    private
+
+    def add_sources
+      definition.send(:sources).lock_sources.each_with_index do |source, idx|
+        out << "\n" unless idx.zero?
+
+        # Add the source header
+        out << source.to_lock
+
+        # Find all specs for this source
+        specs = definition.resolve.select {|s| source.can_lock?(s) }
+        add_specs(specs)
+      end
+    end
+
+    def add_specs(specs)
+      # This needs to be sorted by full name so that
+      # gems with the same name, but different platform
+      # are ordered consistently
+      specs.sort_by(&:full_name).each do |spec|
+        next if spec.name == "bundler".freeze
+        out << spec.to_lock
+      end
+    end
+
+    def add_platforms
+      add_section("PLATFORMS", definition.platforms)
+    end
+
+    def add_dependencies
+      out << "\nDEPENDENCIES\n"
+
+      handled = []
+      definition.dependencies.sort_by(&:to_s).each do |dep|
+        next if handled.include?(dep.name)
+        out << dep.to_lock
+        handled << dep.name
+      end
+    end
+
+    def add_locked_ruby_version
+      return unless locked_ruby_version = definition.locked_ruby_version
+      add_section("RUBY VERSION", locked_ruby_version.to_s)
+    end
+
+    def add_bundled_with
+      add_section("BUNDLED WITH", definition.locked_bundler_version.to_s)
+    end
+
+    def add_section(name, value)
+      out << "\n#{name}\n"
+      case value
+      when Array
+        value.map(&:to_s).sort.each do |val|
+          out << "  #{val}\n"
+        end
+      when Hash
+        value.to_a.sort_by {|k, _| k.to_s }.each do |key, val|
+          out << "  #{key}: #{val}\n"
+        end
+      when String
+        out << "   #{value}\n"
+      else
+        raise ArgumentError, "#{value.inspect} can't be serialized in a lockfile"
+      end
+    end
+  end
+end
diff --git a/lib/bundler/lockfile_parser.rb b/lib/bundler/lockfile_parser.rb
new file mode 100644
index 0000000000..6ff4910a36
--- /dev/null
+++ b/lib/bundler/lockfile_parser.rb
@@ -0,0 +1,223 @@
+# frozen_string_literal: true
+
+module Bundler
+  class LockfileParser
+    attr_reader :sources, :dependencies, :specs, :platforms, :bundler_version, :ruby_version
+
+    BUNDLED      = "BUNDLED WITH".freeze
+    DEPENDENCIES = "DEPENDENCIES".freeze
+    PLATFORMS    = "PLATFORMS".freeze
+    RUBY         = "RUBY VERSION".freeze
+    GIT          = "GIT".freeze
+    GEM          = "GEM".freeze
+    PATH         = "PATH".freeze
+    PLUGIN       = "PLUGIN SOURCE".freeze
+    SPECS        = "  specs:".freeze
+    OPTIONS      = /^  ([a-z]+): (.*)$/i.freeze
+    SOURCE       = [GIT, GEM, PATH, PLUGIN].freeze
+
+    SECTIONS_BY_VERSION_INTRODUCED = {
+      Gem::Version.create("1.0") => [DEPENDENCIES, PLATFORMS, GIT, GEM, PATH].freeze,
+      Gem::Version.create("1.10") => [BUNDLED].freeze,
+      Gem::Version.create("1.12") => [RUBY].freeze,
+      Gem::Version.create("1.13") => [PLUGIN].freeze,
+    }.freeze
+
+    KNOWN_SECTIONS = SECTIONS_BY_VERSION_INTRODUCED.values.flatten.freeze
+
+    ENVIRONMENT_VERSION_SECTIONS = [BUNDLED, RUBY].freeze
+
+    def self.sections_in_lockfile(lockfile_contents)
+      lockfile_contents.scan(/^\w[\w ]*$/).uniq
+    end
+
+    def self.unknown_sections_in_lockfile(lockfile_contents)
+      sections_in_lockfile(lockfile_contents) - KNOWN_SECTIONS
+    end
+
+    def self.sections_to_ignore(base_version = nil)
+      base_version &&= base_version.release
+      base_version ||= Gem::Version.create("1.0".dup)
+      attributes = []
+      SECTIONS_BY_VERSION_INTRODUCED.each do |version, introduced|
+        next if version <= base_version
+        attributes += introduced
+      end
+      attributes
+    end
+
+    def initialize(lockfile)
+      @platforms    = []
+      @sources      = []
+      @dependencies = {}
+      @state        = nil
+      @specs        = {}
+
+      if lockfile.match(/<<<<<<<|=======|>>>>>>>|\|\|\|\|\|\|\|/)
+        raise LockfileError, "Your #{Bundler.default_lockfile.relative_path_from(SharedHelpers.pwd)} contains merge conflicts.\n" \
+          "Run `git checkout HEAD -- #{Bundler.default_lockfile.relative_path_from(SharedHelpers.pwd)}` first to get a clean lock."
+      end
+
+      lockfile.split(/(?:\r?\n)+/).each do |line|
+        if SOURCE.include?(line)
+          @state = :source
+          parse_source(line)
+        elsif line == DEPENDENCIES
+          @state = :dependency
+        elsif line == PLATFORMS
+          @state = :platform
+        elsif line == RUBY
+          @state = :ruby
+        elsif line == BUNDLED
+          @state = :bundled_with
+        elsif line =~ /^[^\s]/
+          @state = nil
+        elsif @state
+          send("parse_#{@state}", line)
+        end
+      end
+      @specs = @specs.values.sort_by(&:identifier)
+      warn_for_outdated_bundler_version
+    rescue ArgumentError => e
+      Bundler.ui.debug(e)
+      raise LockfileError, "Your lockfile is unreadable. Run `rm #{Bundler.default_lockfile.relative_path_from(SharedHelpers.pwd)}` " \
+        "and then `bundle install` to generate a new lockfile."
+    end
+
+    def warn_for_outdated_bundler_version
+      return unless bundler_version
+      return if bundler_version.segments.last == "dev"
+      prerelease_text = bundler_version.prerelease? ? " --pre" : ""
+      current_version = Gem::Version.create(Bundler::VERSION)
+      return unless current_version < bundler_version
+      Bundler.ui.warn "Warning: the running version of Bundler (#{current_version}) is older " \
+           "than the version that created the lockfile (#{bundler_version}). We suggest you to " \
+           "upgrade to the version that created the lockfile by running `gem install " \
+           "bundler:#{bundler_version}#{prerelease_text}`.\n"
+    end
+
+    private
+
+    TYPES = {
+      GIT    => Bundler::Source::Git,
+      GEM    => Bundler::Source::Rubygems,
+      PATH   => Bundler::Source::Path,
+      PLUGIN => Bundler::Plugin,
+    }.freeze
+
+    def parse_source(line)
+      case line
+      when SPECS
+        case @type
+        when PATH
+          @current_source = TYPES[@type].from_lock(@opts)
+          @sources << @current_source
+        when GIT
+          @current_source = TYPES[@type].from_lock(@opts)
+          @sources << @current_source
+        when GEM
+          @opts["remotes"] = Array(@opts.delete("remote")).reverse
+          @current_source = TYPES[@type].from_lock(@opts)
+          @sources << @current_source
+        when PLUGIN
+          @current_source = Plugin.source_from_lock(@opts)
+          @sources << @current_source
+        end
+      when OPTIONS
+        value = $2
+        value = true if value == "true"
+        value = false if value == "false"
+
+        key = $1
+
+        if @opts[key]
+          @opts[key] = Array(@opts[key])
+          @opts[key] << value
+        else
+          @opts[key] = value
+        end
+      when *SOURCE
+        @current_source = nil
+        @opts = {}
+        @type = line
+      else
+        parse_spec(line)
+      end
+    end
+
+    space = / /
+    NAME_VERSION = /
+      ^(#{space}{2}|#{space}{4}|#{space}{6})(?!#{space}) # Exactly 2, 4, or 6 spaces at the start of the line
+      (.*?)                                              # Name
+      (?:#{space}\(([^-]*)                               # Space, followed by version
+      (?:-(.*))?\))?                                     # Optional platform
+      (!)?                                               # Optional pinned marker
+      $                                                  # Line end
+    /xo.freeze
+
+    def parse_dependency(line)
+      return unless line =~ NAME_VERSION
+      spaces = $1
+      return unless spaces.size == 2
+      name = $2
+      version = $3
+      pinned = $5
+
+      version = version.split(",").map(&:strip) if version
+
+      dep = Bundler::Dependency.new(name, version)
+
+      if pinned && dep.name != "bundler"
+        spec = @specs.find {|_, v| v.name == dep.name }
+        dep.source = spec.last.source if spec
+
+        # Path sources need to know what the default name / version
+        # to use in the case that there are no gemspecs present. A fake
+        # gemspec is created based on the version set on the dependency
+        # TODO: Use the version from the spec instead of from the dependency
+        if version && version.size == 1 && version.first =~ /^\s*= (.+)\s*$/ && dep.source.is_a?(Bundler::Source::Path)
+          dep.source.name    = name
+          dep.source.version = $1
+        end
+      end
+
+      @dependencies[dep.name] = dep
+    end
+
+    def parse_spec(line)
+      return unless line =~ NAME_VERSION
+      spaces = $1
+      name = $2
+      version = $3
+      platform = $4
+
+      if spaces.size == 4
+        version = Gem::Version.new(version)
+        platform = platform ? Gem::Platform.new(platform) : Gem::Platform::RUBY
+        @current_spec = LazySpecification.new(name, version, platform)
+        @current_spec.source = @current_source
+        @current_source.add_dependency_names(name)
+
+        @specs[@current_spec.identifier] = @current_spec
+      elsif spaces.size == 6
+        version = version.split(",").map(&:strip) if version
+        dep = Gem::Dependency.new(name, version)
+        @current_spec.dependencies << dep
+      end
+    end
+
+    def parse_platform(line)
+      @platforms << Gem::Platform.new($1) if line =~ /^  (.*)$/
+    end
+
+    def parse_bundled_with(line)
+      line = line.strip
+      return unless Gem::Version.correct?(line)
+      @bundler_version = Gem::Version.create(line)
+    end
+
+    def parse_ruby(line)
+      @ruby_version = line.strip
+    end
+  end
+end
diff --git a/lib/bundler/man/.document b/lib/bundler/man/.document
new file mode 100644
index 0000000000..fb66f13c33
--- /dev/null
+++ b/lib/bundler/man/.document
@@ -0,0 +1 @@
+# Ignore all files in this directory
diff --git a/lib/bundler/man/bundle-add.1 b/lib/bundler/man/bundle-add.1
new file mode 100644
index 0000000000..a94467e25f
--- /dev/null
+++ b/lib/bundler/man/bundle-add.1
@@ -0,0 +1,66 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "BUNDLE\-ADD" "1" "December 2021" "" ""
+.
+.SH "NAME"
+\fBbundle\-add\fR \- Add gem to the Gemfile and run bundle install
+.
+.SH "SYNOPSIS"
+\fBbundle add\fR \fIGEM_NAME\fR [\-\-group=GROUP] [\-\-version=VERSION] [\-\-source=SOURCE] [\-\-git=GIT] [\-\-branch=BRANCH] [\-\-skip\-install] [\-\-strict] [\-\-optimistic]
+.
+.SH "DESCRIPTION"
+Adds the named gem to the Gemfile and run \fBbundle install\fR\. \fBbundle install\fR can be avoided by using the flag \fB\-\-skip\-install\fR\.
+.
+.P
+Example:
+.
+.P
+bundle add rails
+.
+.P
+bundle add rails \-\-version "< 3\.0, > 1\.1"
+.
+.P
+bundle add rails \-\-version "~> 5\.0\.0" \-\-source "https://gems\.example\.com" \-\-group "development"
+.
+.P
+bundle add rails \-\-skip\-install
+.
+.P
+bundle add rails \-\-group "development, test"
+.
+.SH "OPTIONS"
+.
+.TP
+\fB\-\-version\fR, \fB\-v\fR
+Specify version requirements(s) for the added gem\.
+.
+.TP
+\fB\-\-group\fR, \fB\-g\fR
+Specify the group(s) for the added gem\. Multiple groups should be separated by commas\.
+.
+.TP
+\fB\-\-source\fR, , \fB\-s\fR
+Specify the source for the added gem\.
+.
+.TP
+\fB\-\-git\fR
+Specify the git source for the added gem\.
+.
+.TP
+\fB\-\-branch\fR
+Specify the git branch for the added gem\.
+.
+.TP
+\fB\-\-skip\-install\fR
+Adds the gem to the Gemfile but does not install it\.
+.
+.TP
+\fB\-\-optimistic\fR
+Adds optimistic declaration of version
+.
+.TP
+\fB\-\-strict\fR
+Adds strict declaration of version
+
diff --git a/lib/bundler/man/bundle-add.1.ronn b/lib/bundler/man/bundle-add.1.ronn
new file mode 100644
index 0000000000..26cbe55647
--- /dev/null
+++ b/lib/bundler/man/bundle-add.1.ronn
@@ -0,0 +1,46 @@
+bundle-add(1) -- Add gem to the Gemfile and run bundle install
+================================================================
+
+## SYNOPSIS
+
+`bundle add` <GEM_NAME> [--group=GROUP] [--version=VERSION] [--source=SOURCE] [--git=GIT] [--branch=BRANCH] [--skip-install] [--strict] [--optimistic]
+
+## DESCRIPTION
+Adds the named gem to the Gemfile and run `bundle install`. `bundle install` can be avoided by using the flag `--skip-install`.
+
+Example:
+
+bundle add rails
+
+bundle add rails --version "< 3.0, > 1.1"
+
+bundle add rails --version "~> 5.0.0" --source "https://gems.example.com" --group "development"
+
+bundle add rails --skip-install
+
+bundle add rails --group "development, test"
+
+## OPTIONS
+* `--version`, `-v`:
+  Specify version requirements(s) for the added gem.
+
+* `--group`, `-g`:
+  Specify the group(s) for the added gem. Multiple groups should be separated by commas.
+
+* `--source`, , `-s`:
+  Specify the source for the added gem.
+
+* `--git`:
+  Specify the git source for the added gem.
+
+* `--branch`:
+  Specify the git branch for the added gem.
+
+* `--skip-install`:
+  Adds the gem to the Gemfile but does not install it.
+
+* `--optimistic`:
+  Adds optimistic declaration of version
+
+* `--strict`:
+  Adds strict declaration of version
diff --git a/lib/bundler/man/bundle-binstubs.1 b/lib/bundler/man/bundle-binstubs.1
new file mode 100644
index 0000000000..6d1b1d4247
--- /dev/null
+++ b/lib/bundler/man/bundle-binstubs.1
@@ -0,0 +1,42 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "BUNDLE\-BINSTUBS" "1" "December 2021" "" ""
+.
+.SH "NAME"
+\fBbundle\-binstubs\fR \- Install the binstubs of the listed gems
+.
+.SH "SYNOPSIS"
+\fBbundle binstubs\fR \fIGEM_NAME\fR [\-\-force] [\-\-path PATH] [\-\-standalone]
+.
+.SH "DESCRIPTION"
+Binstubs are scripts that wrap around executables\. Bundler creates a small Ruby file (a binstub) that loads Bundler, runs the command, and puts it into \fBbin/\fR\. Binstubs are a shortcut\-or alternative\- to always using \fBbundle exec\fR\. This gives you a file that can be run directly, and one that will always run the correct gem version used by the application\.
+.
+.P
+For example, if you run \fBbundle binstubs rspec\-core\fR, Bundler will create the file \fBbin/rspec\fR\. That file will contain enough code to load Bundler, tell it to load the bundled gems, and then run rspec\.
+.
+.P
+This command generates binstubs for executables in \fBGEM_NAME\fR\. Binstubs are put into \fBbin\fR, or the \fB\-\-path\fR directory if one has been set\. Calling binstubs with [GEM [GEM]] will create binstubs for all given gems\.
+.
+.SH "OPTIONS"
+.
+.TP
+\fB\-\-force\fR
+Overwrite existing binstubs if they exist\.
+.
+.TP
+\fB\-\-path\fR
+The location to install the specified binstubs to\. This defaults to \fBbin\fR\.
+.
+.TP
+\fB\-\-standalone\fR
+Makes binstubs that can work without depending on Rubygems or Bundler at runtime\.
+.
+.TP
+\fB\-\-shebang\fR
+Specify a different shebang executable name than the default (default \'ruby\')
+.
+.TP
+\fB\-\-all\fR
+Create binstubs for all gems in the bundle\.
+
diff --git a/lib/bundler/man/bundle-binstubs.1.ronn b/lib/bundler/man/bundle-binstubs.1.ronn
new file mode 100644
index 0000000000..a96186929f
--- /dev/null
+++ b/lib/bundler/man/bundle-binstubs.1.ronn
@@ -0,0 +1,41 @@
+bundle-binstubs(1) -- Install the binstubs of the listed gems
+=============================================================
+
+## SYNOPSIS
+
+`bundle binstubs` <GEM_NAME> [--force] [--path PATH] [--standalone]
+
+## DESCRIPTION
+
+Binstubs are scripts that wrap around executables. Bundler creates a
+small Ruby file (a binstub) that loads Bundler, runs the command,
+and puts it into `bin/`. Binstubs are a shortcut-or alternative-
+to always using `bundle exec`. This gives you a file that can be run
+directly, and one that will always run the correct gem version
+used by the application.
+
+For example, if you run `bundle binstubs rspec-core`, Bundler will create
+the file `bin/rspec`. That file will contain enough code to load Bundler,
+tell it to load the bundled gems, and then run rspec.
+
+This command generates binstubs for executables in `GEM_NAME`.
+Binstubs are put into `bin`, or the `--path` directory if one has been set.
+Calling binstubs with [GEM [GEM]] will create binstubs for all given gems.
+
+## OPTIONS
+
+* `--force`:
+  Overwrite existing binstubs if they exist.
+
+* `--path`:
+  The location to install the specified binstubs to. This defaults to `bin`.
+
+* `--standalone`:
+  Makes binstubs that can work without depending on Rubygems or Bundler at
+  runtime.
+
+* `--shebang`:
+  Specify a different shebang executable name than the default (default 'ruby')
+
+* `--all`:
+  Create binstubs for all gems in the bundle.
diff --git a/lib/bundler/man/bundle-cache.1 b/lib/bundler/man/bundle-cache.1
new file mode 100644
index 0000000000..acbdae0df2
--- /dev/null
+++ b/lib/bundler/man/bundle-cache.1
@@ -0,0 +1,55 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "BUNDLE\-CACHE" "1" "December 2021" "" ""
+.
+.SH "NAME"
+\fBbundle\-cache\fR \- Package your needed \fB\.gem\fR files into your application
+.
+.SH "SYNOPSIS"
+\fBbundle cache\fR
+.
+.SH "DESCRIPTION"
+Copy all of the \fB\.gem\fR files needed to run the application into the \fBvendor/cache\fR directory\. In the future, when running [bundle install(1)][bundle\-install], use the gems in the cache in preference to the ones on \fBrubygems\.org\fR\.
+.
+.SH "GIT AND PATH GEMS"
+The \fBbundle cache\fR command can also package \fB:git\fR and \fB:path\fR dependencies besides \.gem files\. This needs to be explicitly enabled via the \fB\-\-all\fR option\. Once used, the \fB\-\-all\fR option will be remembered\.
+.
+.SH "SUPPORT FOR MULTIPLE PLATFORMS"
+When using gems that have different packages for different platforms, Bundler supports caching of gems for other platforms where the Gemfile has been resolved (i\.e\. present in the lockfile) in \fBvendor/cache\fR\. This needs to be enabled via the \fB\-\-all\-platforms\fR option\. This setting will be remembered in your local bundler configuration\.
+.
+.SH "REMOTE FETCHING"
+By default, if you run \fBbundle install(1)\fR](bundle\-install\.1\.html) after running bundle cache(1) \fIbundle\-cache\.1\.html\fR, bundler will still connect to \fBrubygems\.org\fR to check whether a platform\-specific gem exists for any of the gems in \fBvendor/cache\fR\.
+.
+.P
+For instance, consider this Gemfile(5):
+.
+.IP "" 4
+.
+.nf
+
+source "https://rubygems\.org"
+
+gem "nokogiri"
+.
+.fi
+.
+.IP "" 0
+.
+.P
+If you run \fBbundle cache\fR under C Ruby, bundler will retrieve the version of \fBnokogiri\fR for the \fB"ruby"\fR platform\. If you deploy to JRuby and run \fBbundle install\fR, bundler is forced to check to see whether a \fB"java"\fR platformed \fBnokogiri\fR exists\.
+.
+.P
+Even though the \fBnokogiri\fR gem for the Ruby platform is \fItechnically\fR acceptable on JRuby, it has a C extension that does not run on JRuby\. As a result, bundler will, by default, still connect to \fBrubygems\.org\fR to check whether it has a version of one of your gems more specific to your platform\.
+.
+.P
+This problem is also not limited to the \fB"java"\fR platform\. A similar (common) problem can happen when developing on Windows and deploying to Linux, or even when developing on OSX and deploying to Linux\.
+.
+.P
+If you know for sure that the gems packaged in \fBvendor/cache\fR are appropriate for the platform you are on, you can run \fBbundle install \-\-local\fR to skip checking for more appropriate gems, and use the ones in \fBvendor/cache\fR\.
+.
+.P
+One way to be sure that you have the right platformed versions of all your gems is to run \fBbundle cache\fR on an identical machine and check in the gems\. For instance, you can run \fBbundle cache\fR on an identical staging box during your staging process, and check in the \fBvendor/cache\fR before deploying to production\.
+.
+.P
+By default, bundle cache(1) \fIbundle\-cache\.1\.html\fR fetches and also installs the gems to the default location\. To package the dependencies to \fBvendor/cache\fR without installing them to the local install location, you can run \fBbundle cache \-\-no\-install\fR\.
diff --git a/lib/bundler/man/bundle-cache.1.ronn b/lib/bundler/man/bundle-cache.1.ronn
new file mode 100644
index 0000000000..383adb2ba3
--- /dev/null
+++ b/lib/bundler/man/bundle-cache.1.ronn
@@ -0,0 +1,72 @@
+bundle-cache(1) -- Package your needed `.gem` files into your application
+===========================================================================
+
+## SYNOPSIS
+
+`bundle cache`
+
+## DESCRIPTION
+
+Copy all of the `.gem` files needed to run the application into the
+`vendor/cache` directory. In the future, when running [bundle install(1)][bundle-install],
+use the gems in the cache in preference to the ones on `rubygems.org`.
+
+## GIT AND PATH GEMS
+
+The `bundle cache` command can also package `:git` and `:path` dependencies
+besides .gem files. This needs to be explicitly enabled via the `--all` option.
+Once used, the `--all` option will be remembered.
+
+## SUPPORT FOR MULTIPLE PLATFORMS
+
+When using gems that have different packages for different platforms, Bundler
+supports caching of gems for other platforms where the Gemfile has been resolved
+(i.e. present in the lockfile) in `vendor/cache`.  This needs to be enabled via
+the `--all-platforms` option. This setting will be remembered in your local
+bundler configuration.
+
+## REMOTE FETCHING
+
+By default, if you run `bundle install(1)`](bundle-install.1.html) after running
+[bundle cache(1)](bundle-cache.1.html), bundler will still connect to `rubygems.org`
+to check whether a platform-specific gem exists for any of the gems
+in `vendor/cache`.
+
+For instance, consider this Gemfile(5):
+
+    source "https://rubygems.org"
+
+    gem "nokogiri"
+
+If you run `bundle cache` under C Ruby, bundler will retrieve
+the version of `nokogiri` for the `"ruby"` platform. If you deploy
+to JRuby and run `bundle install`, bundler is forced to check to
+see whether a `"java"` platformed `nokogiri` exists.
+
+Even though the `nokogiri` gem for the Ruby platform is
+_technically_ acceptable on JRuby, it has a C extension
+that does not run on JRuby. As a result, bundler will, by default,
+still connect to `rubygems.org` to check whether it has a version
+of one of your gems more specific to your platform.
+
+This problem is also not limited to the `"java"` platform.
+A similar (common) problem can happen when developing on Windows
+and deploying to Linux, or even when developing on OSX and
+deploying to Linux.
+
+If you know for sure that the gems packaged in `vendor/cache`
+are appropriate for the platform you are on, you can run
+`bundle install --local` to skip checking for more appropriate
+gems, and use the ones in `vendor/cache`.
+
+One way to be sure that you have the right platformed versions
+of all your gems is to run `bundle cache` on an identical
+machine and check in the gems. For instance, you can run
+`bundle cache` on an identical staging box during your
+staging process, and check in the `vendor/cache` before
+deploying to production.
+
+By default, [bundle cache(1)](bundle-cache.1.html) fetches and also
+installs the gems to the default location. To package the
+dependencies to `vendor/cache` without installing them to the
+local install location, you can run `bundle cache --no-install`.
diff --git a/lib/bundler/man/bundle-check.1 b/lib/bundler/man/bundle-check.1
new file mode 100644
index 0000000000..e555c9b399
--- /dev/null
+++ b/lib/bundler/man/bundle-check.1
@@ -0,0 +1,31 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "BUNDLE\-CHECK" "1" "December 2021" "" ""
+.
+.SH "NAME"
+\fBbundle\-check\fR \- Verifies if dependencies are satisfied by installed gems
+.
+.SH "SYNOPSIS"
+\fBbundle check\fR [\-\-dry\-run] [\-\-gemfile=FILE] [\-\-path=PATH]
+.
+.SH "DESCRIPTION"
+\fBcheck\fR searches the local machine for each of the gems requested in the Gemfile\. If all gems are found, Bundler prints a success message and exits with a status of 0\.
+.
+.P
+If not, the first missing gem is listed and Bundler exits status 1\.
+.
+.SH "OPTIONS"
+.
+.TP
+\fB\-\-dry\-run\fR
+Locks the [\fBGemfile(5)\fR][Gemfile(5)] before running the command\.
+.
+.TP
+\fB\-\-gemfile\fR
+Use the specified gemfile instead of the [\fBGemfile(5)\fR][Gemfile(5)]\.
+.
+.TP
+\fB\-\-path\fR
+Specify a different path than the system default (\fB$BUNDLE_PATH\fR or \fB$GEM_HOME\fR)\. Bundler will remember this value for future installs on this machine\.
+
diff --git a/lib/bundler/man/bundle-check.1.ronn b/lib/bundler/man/bundle-check.1.ronn
new file mode 100644
index 0000000000..f2846b8ff2
--- /dev/null
+++ b/lib/bundler/man/bundle-check.1.ronn
@@ -0,0 +1,26 @@
+bundle-check(1) -- Verifies if dependencies are satisfied by installed gems
+===========================================================================
+
+## SYNOPSIS
+
+`bundle check` [--dry-run]
+               [--gemfile=FILE]
+               [--path=PATH]
+
+## DESCRIPTION
+
+`check` searches the local machine for each of the gems requested in the
+Gemfile. If all gems are found, Bundler prints a success message and exits with
+a status of 0.
+
+If not, the first missing gem is listed and Bundler exits status 1.
+
+## OPTIONS
+
+* `--dry-run`:
+  Locks the [`Gemfile(5)`][Gemfile(5)] before running the command.
+* `--gemfile`:
+  Use the specified gemfile instead of the [`Gemfile(5)`][Gemfile(5)].
+* `--path`:
+  Specify a different path than the system default (`$BUNDLE_PATH` or `$GEM_HOME`).
+  Bundler will remember this value for future installs on this machine.
diff --git a/lib/bundler/man/bundle-clean.1 b/lib/bundler/man/bundle-clean.1
new file mode 100644
index 0000000000..d403247524
--- /dev/null
+++ b/lib/bundler/man/bundle-clean.1
@@ -0,0 +1,24 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "BUNDLE\-CLEAN" "1" "December 2021" "" ""
+.
+.SH "NAME"
+\fBbundle\-clean\fR \- Cleans up unused gems in your bundler directory
+.
+.SH "SYNOPSIS"
+\fBbundle clean\fR [\-\-dry\-run] [\-\-force]
+.
+.SH "DESCRIPTION"
+This command will remove all unused gems in your bundler directory\. This is useful when you have made many changes to your gem dependencies\.
+.
+.SH "OPTIONS"
+.
+.TP
+\fB\-\-dry\-run\fR
+Print the changes, but do not clean the unused gems\.
+.
+.TP
+\fB\-\-force\fR
+Force a clean even if \fB\-\-path\fR is not set\.
+
diff --git a/lib/bundler/man/bundle-clean.1.ronn b/lib/bundler/man/bundle-clean.1.ronn
new file mode 100644
index 0000000000..de23991782
--- /dev/null
+++ b/lib/bundler/man/bundle-clean.1.ronn
@@ -0,0 +1,18 @@
+bundle-clean(1) -- Cleans up unused gems in your bundler directory
+==================================================================
+
+## SYNOPSIS
+
+`bundle clean` [--dry-run] [--force]
+
+## DESCRIPTION
+
+This command will remove all unused gems in your bundler directory. This is
+useful when you have made many changes to your gem dependencies.
+
+## OPTIONS
+
+* `--dry-run`:
+  Print the changes, but do not clean the unused gems.
+* `--force`:
+  Force a clean even if `--path` is not set.
diff --git a/lib/bundler/man/bundle-config.1 b/lib/bundler/man/bundle-config.1
new file mode 100644
index 0000000000..976dae3aec
--- /dev/null
+++ b/lib/bundler/man/bundle-config.1
@@ -0,0 +1,496 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "BUNDLE\-CONFIG" "1" "December 2021" "" ""
+.
+.SH "NAME"
+\fBbundle\-config\fR \- Set bundler configuration options
+.
+.SH "SYNOPSIS"
+\fBbundle config\fR [list|get|set|unset] [\fIname\fR [\fIvalue\fR]]
+.
+.SH "DESCRIPTION"
+This command allows you to interact with Bundler\'s configuration system\.
+.
+.P
+Bundler loads configuration settings in this order:
+.
+.IP "1." 4
+Local config (\fB<project_root>/\.bundle/config\fR or \fB$BUNDLE_APP_CONFIG/config\fR)
+.
+.IP "2." 4
+Environmental variables (\fBENV\fR)
+.
+.IP "3." 4
+Global config (\fB~/\.bundle/config\fR)
+.
+.IP "4." 4
+Bundler default config
+.
+.IP "" 0
+.
+.P
+Executing \fBbundle config list\fR with will print a list of all bundler configuration for the current bundle, and where that configuration was set\.
+.
+.P
+Executing \fBbundle config get <name>\fR will print the value of that configuration setting, and where it was set\.
+.
+.P
+Executing \fBbundle config set <name> <value>\fR will set that configuration to the value specified for all bundles executed as the current user\. The configuration will be stored in \fB~/\.bundle/config\fR\. If \fIname\fR already is set, \fIname\fR will be overridden and user will be warned\.
+.
+.P
+Executing \fBbundle config set \-\-global <name> <value>\fR works the same as above\.
+.
+.P
+Executing \fBbundle config set \-\-local <name> <value>\fR will set that configuration in the directory for the local application\. The configuration will be stored in \fB<project_root>/\.bundle/config\fR\. If \fBBUNDLE_APP_CONFIG\fR is set, the configuration will be stored in \fB$BUNDLE_APP_CONFIG/config\fR\.
+.
+.P
+Executing \fBbundle config unset <name>\fR will delete the configuration in both local and global sources\.
+.
+.P
+Executing \fBbundle config unset \-\-global <name>\fR will delete the configuration only from the user configuration\.
+.
+.P
+Executing \fBbundle config unset \-\-local <name> <value>\fR will delete the configuration only from the local application\.
+.
+.P
+Executing bundle with the \fBBUNDLE_IGNORE_CONFIG\fR environment variable set will cause it to ignore all configuration\.
+.
+.SH "REMEMBERING OPTIONS"
+Flags passed to \fBbundle install\fR or the Bundler runtime, such as \fB\-\-path foo\fR or \fB\-\-without production\fR, are remembered between commands and saved to your local application\'s configuration (normally, \fB\./\.bundle/config\fR)\.
+.
+.P
+However, this will be changed in bundler 3, so it\'s better not to rely on this behavior\. If these options must be remembered, it\'s better to set them using \fBbundle config\fR (e\.g\., \fBbundle config set \-\-local path foo\fR)\.
+.
+.P
+The options that can be configured are:
+.
+.TP
+\fBbin\fR
+Creates a directory (defaults to \fB~/bin\fR) and place any executables from the gem there\. These executables run in Bundler\'s context\. If used, you might add this directory to your environment\'s \fBPATH\fR variable\. For instance, if the \fBrails\fR gem comes with a \fBrails\fR executable, this flag will create a \fBbin/rails\fR executable that ensures that all referred dependencies will be resolved using the bundled gems\.
+.
+.TP
+\fBdeployment\fR
+In deployment mode, Bundler will \'roll\-out\' the bundle for \fBproduction\fR use\. Please check carefully if you want to have this option enabled in \fBdevelopment\fR or \fBtest\fR environments\.
+.
+.TP
+\fBpath\fR
+The location to install the specified gems to\. This defaults to Rubygems\' setting\. Bundler shares this location with Rubygems, \fBgem install \.\.\.\fR will have gem installed there, too\. Therefore, gems installed without a \fB\-\-path \.\.\.\fR setting will show up by calling \fBgem list\fR\. Accordingly, gems installed to other locations will not get listed\.
+.
+.TP
+\fBwithout\fR
+A space\-separated list of groups referencing gems to skip during installation\.
+.
+.TP
+\fBwith\fR
+A space\-separated list of groups referencing gems to include during installation\.
+.
+.SH "BUILD OPTIONS"
+You can use \fBbundle config\fR to give Bundler the flags to pass to the gem installer every time bundler tries to install a particular gem\.
+.
+.P
+A very common example, the \fBmysql\fR gem, requires Snow Leopard users to pass configuration flags to \fBgem install\fR to specify where to find the \fBmysql_config\fR executable\.
+.
+.IP "" 4
+.
+.nf
+
+gem install mysql \-\- \-\-with\-mysql\-config=/usr/local/mysql/bin/mysql_config
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Since the specific location of that executable can change from machine to machine, you can specify these flags on a per\-machine basis\.
+.
+.IP "" 4
+.
+.nf
+
+bundle config set \-\-global build\.mysql \-\-with\-mysql\-config=/usr/local/mysql/bin/mysql_config
+.
+.fi
+.
+.IP "" 0
+.
+.P
+After running this command, every time bundler needs to install the \fBmysql\fR gem, it will pass along the flags you specified\.
+.
+.SH "CONFIGURATION KEYS"
+Configuration keys in bundler have two forms: the canonical form and the environment variable form\.
+.
+.P
+For instance, passing the \fB\-\-without\fR flag to bundle install(1) \fIbundle\-install\.1\.html\fR prevents Bundler from installing certain groups specified in the Gemfile(5)\. Bundler persists this value in \fBapp/\.bundle/config\fR so that calls to \fBBundler\.setup\fR do not try to find gems from the \fBGemfile\fR that you didn\'t install\. Additionally, subsequent calls to bundle install(1) \fIbundle\-install\.1\.html\fR remember this setting and skip those groups\.
+.
+.P
+The canonical form of this configuration is \fB"without"\fR\. To convert the canonical form to the environment variable form, capitalize it, and prepend \fBBUNDLE_\fR\. The environment variable form of \fB"without"\fR is \fBBUNDLE_WITHOUT\fR\.
+.
+.P
+Any periods in the configuration keys must be replaced with two underscores when setting it via environment variables\. The configuration key \fBlocal\.rack\fR becomes the environment variable \fBBUNDLE_LOCAL__RACK\fR\.
+.
+.SH "LIST OF AVAILABLE KEYS"
+The following is a list of all configuration keys and their purpose\. You can learn more about their operation in bundle install(1) \fIbundle\-install\.1\.html\fR\.
+.
+.IP "\(bu" 4
+\fBallow_deployment_source_credential_changes\fR (\fBBUNDLE_ALLOW_DEPLOYMENT_SOURCE_CREDENTIAL_CHANGES\fR): When in deployment mode, allow changing the credentials to a gem\'s source\. Ex: \fBhttps://some\.host\.com/gems/path/\fR \-> \fBhttps://user_name:password@some\.host\.com/gems/path\fR
+.
+.IP "\(bu" 4
+\fBallow_offline_install\fR (\fBBUNDLE_ALLOW_OFFLINE_INSTALL\fR): Allow Bundler to use cached data when installing without network access\.
+.
+.IP "\(bu" 4
+\fBauto_clean_without_path\fR (\fBBUNDLE_AUTO_CLEAN_WITHOUT_PATH\fR): Automatically run \fBbundle clean\fR after installing when an explicit \fBpath\fR has not been set and Bundler is not installing into the system gems\.
+.
+.IP "\(bu" 4
+\fBauto_install\fR (\fBBUNDLE_AUTO_INSTALL\fR): Automatically run \fBbundle install\fR when gems are missing\.
+.
+.IP "\(bu" 4
+\fBbin\fR (\fBBUNDLE_BIN\fR): Install executables from gems in the bundle to the specified directory\. Defaults to \fBfalse\fR\.
+.
+.IP "\(bu" 4
+\fBcache_all\fR (\fBBUNDLE_CACHE_ALL\fR): Cache all gems, including path and git gems\. This needs to be explicitly configured on bundler 1 and bundler 2, but will be the default on bundler 3\.
+.
+.IP "\(bu" 4
+\fBcache_all_platforms\fR (\fBBUNDLE_CACHE_ALL_PLATFORMS\fR): Cache gems for all platforms\.
+.
+.IP "\(bu" 4
+\fBcache_path\fR (\fBBUNDLE_CACHE_PATH\fR): The directory that bundler will place cached gems in when running \fBbundle package\fR, and that bundler will look in when installing gems\. Defaults to \fBvendor/cache\fR\.
+.
+.IP "\(bu" 4
+\fBclean\fR (\fBBUNDLE_CLEAN\fR): Whether Bundler should run \fBbundle clean\fR automatically after \fBbundle install\fR\.
+.
+.IP "\(bu" 4
+\fBconsole\fR (\fBBUNDLE_CONSOLE\fR): The console that \fBbundle console\fR starts\. Defaults to \fBirb\fR\.
+.
+.IP "\(bu" 4
+\fBdefault_install_uses_path\fR (\fBBUNDLE_DEFAULT_INSTALL_USES_PATH\fR): Whether a \fBbundle install\fR without an explicit \fB\-\-path\fR argument defaults to installing gems in \fB\.bundle\fR\.
+.
+.IP "\(bu" 4
+\fBdeployment\fR (\fBBUNDLE_DEPLOYMENT\fR): Disallow changes to the \fBGemfile\fR\. When the \fBGemfile\fR is changed and the lockfile has not been updated, running Bundler commands will be blocked\.
+.
+.IP "\(bu" 4
+\fBdisable_checksum_validation\fR (\fBBUNDLE_DISABLE_CHECKSUM_VALIDATION\fR): Allow installing gems even if they do not match the checksum provided by RubyGems\.
+.
+.IP "\(bu" 4
+\fBdisable_exec_load\fR (\fBBUNDLE_DISABLE_EXEC_LOAD\fR): Stop Bundler from using \fBload\fR to launch an executable in\-process in \fBbundle exec\fR\.
+.
+.IP "\(bu" 4
+\fBdisable_local_branch_check\fR (\fBBUNDLE_DISABLE_LOCAL_BRANCH_CHECK\fR): Allow Bundler to use a local git override without a branch specified in the Gemfile\.
+.
+.IP "\(bu" 4
+\fBdisable_local_revision_check\fR (\fBBUNDLE_DISABLE_LOCAL_REVISION_CHECK\fR): Allow Bundler to use a local git override without checking if the revision present in the lockfile is present in the repository\.
+.
+.IP "\(bu" 4
+\fBdisable_shared_gems\fR (\fBBUNDLE_DISABLE_SHARED_GEMS\fR): Stop Bundler from accessing gems installed to RubyGems\' normal location\.
+.
+.IP "\(bu" 4
+\fBdisable_version_check\fR (\fBBUNDLE_DISABLE_VERSION_CHECK\fR): Stop Bundler from checking if a newer Bundler version is available on rubygems\.org\.
+.
+.IP "\(bu" 4
+\fBforce_ruby_platform\fR (\fBBUNDLE_FORCE_RUBY_PLATFORM\fR): Ignore the current machine\'s platform and install only \fBruby\fR platform gems\. As a result, gems with native extensions will be compiled from source\.
+.
+.IP "\(bu" 4
+\fBfrozen\fR (\fBBUNDLE_FROZEN\fR): Disallow changes to the \fBGemfile\fR\. When the \fBGemfile\fR is changed and the lockfile has not been updated, running Bundler commands will be blocked\. Defaults to \fBtrue\fR when \fB\-\-deployment\fR is used\.
+.
+.IP "\(bu" 4
+\fBgem\.github_username\fR (\fBBUNDLE_GEM__GITHUB_USERNAME\fR): Sets a GitHub username or organization to be used in \fBREADME\fR file when you create a new gem via \fBbundle gem\fR command\. It can be overridden by passing an explicit \fB\-\-github\-username\fR flag to \fBbundle gem\fR\.
+.
+.IP "\(bu" 4
+\fBgem\.push_key\fR (\fBBUNDLE_GEM__PUSH_KEY\fR): Sets the \fB\-\-key\fR parameter for \fBgem push\fR when using the \fBrake release\fR command with a private gemstash server\.
+.
+.IP "\(bu" 4
+\fBgemfile\fR (\fBBUNDLE_GEMFILE\fR): The name of the file that bundler should use as the \fBGemfile\fR\. This location of this file also sets the root of the project, which is used to resolve relative paths in the \fBGemfile\fR, among other things\. By default, bundler will search up from the current working directory until it finds a \fBGemfile\fR\.
+.
+.IP "\(bu" 4
+\fBglobal_gem_cache\fR (\fBBUNDLE_GLOBAL_GEM_CACHE\fR): Whether Bundler should cache all gems globally, rather than locally to the installing Ruby installation\.
+.
+.IP "\(bu" 4
+\fBignore_messages\fR (\fBBUNDLE_IGNORE_MESSAGES\fR): When set, no post install messages will be printed\. To silence a single gem, use dot notation like \fBignore_messages\.httparty true\fR\.
+.
+.IP "\(bu" 4
+\fBinit_gems_rb\fR (\fBBUNDLE_INIT_GEMS_RB\fR): Generate a \fBgems\.rb\fR instead of a \fBGemfile\fR when running \fBbundle init\fR\.
+.
+.IP "\(bu" 4
+\fBjobs\fR (\fBBUNDLE_JOBS\fR): The number of gems Bundler can install in parallel\. Defaults to 1 on Windows, and to the the number of processors on other platforms\.
+.
+.IP "\(bu" 4
+\fBno_install\fR (\fBBUNDLE_NO_INSTALL\fR): Whether \fBbundle package\fR should skip installing gems\.
+.
+.IP "\(bu" 4
+\fBno_prune\fR (\fBBUNDLE_NO_PRUNE\fR): Whether Bundler should leave outdated gems unpruned when caching\.
+.
+.IP "\(bu" 4
+\fBpath\fR (\fBBUNDLE_PATH\fR): The location on disk where all gems in your bundle will be located regardless of \fB$GEM_HOME\fR or \fB$GEM_PATH\fR values\. Bundle gems not found in this location will be installed by \fBbundle install\fR\. Defaults to \fBGem\.dir\fR\. When \-\-deployment is used, defaults to vendor/bundle\.
+.
+.IP "\(bu" 4
+\fBpath\.system\fR (\fBBUNDLE_PATH__SYSTEM\fR): Whether Bundler will install gems into the default system path (\fBGem\.dir\fR)\.
+.
+.IP "\(bu" 4
+\fBpath_relative_to_cwd\fR (\fBBUNDLE_PATH_RELATIVE_TO_CWD\fR) Makes \fB\-\-path\fR relative to the CWD instead of the \fBGemfile\fR\.
+.
+.IP "\(bu" 4
+\fBplugins\fR (\fBBUNDLE_PLUGINS\fR): Enable Bundler\'s experimental plugin system\.
+.
+.IP "\(bu" 4
+\fBprefer_patch\fR (BUNDLE_PREFER_PATCH): Prefer updating only to next patch version during updates\. Makes \fBbundle update\fR calls equivalent to \fBbundler update \-\-patch\fR\.
+.
+.IP "\(bu" 4
+\fBprint_only_version_number\fR (\fBBUNDLE_PRINT_ONLY_VERSION_NUMBER\fR): Print only version number from \fBbundler \-\-version\fR\.
+.
+.IP "\(bu" 4
+\fBredirect\fR (\fBBUNDLE_REDIRECT\fR): The number of redirects allowed for network requests\. Defaults to \fB5\fR\.
+.
+.IP "\(bu" 4
+\fBretry\fR (\fBBUNDLE_RETRY\fR): The number of times to retry failed network requests\. Defaults to \fB3\fR\.
+.
+.IP "\(bu" 4
+\fBsetup_makes_kernel_gem_public\fR (\fBBUNDLE_SETUP_MAKES_KERNEL_GEM_PUBLIC\fR): Have \fBBundler\.setup\fR make the \fBKernel#gem\fR method public, even though RubyGems declares it as private\.
+.
+.IP "\(bu" 4
+\fBshebang\fR (\fBBUNDLE_SHEBANG\fR): The program name that should be invoked for generated binstubs\. Defaults to the ruby install name used to generate the binstub\.
+.
+.IP "\(bu" 4
+\fBsilence_deprecations\fR (\fBBUNDLE_SILENCE_DEPRECATIONS\fR): Whether Bundler should silence deprecation warnings for behavior that will be changed in the next major version\.
+.
+.IP "\(bu" 4
+\fBsilence_root_warning\fR (\fBBUNDLE_SILENCE_ROOT_WARNING\fR): Silence the warning Bundler prints when installing gems as root\.
+.
+.IP "\(bu" 4
+\fBssl_ca_cert\fR (\fBBUNDLE_SSL_CA_CERT\fR): Path to a designated CA certificate file or folder containing multiple certificates for trusted CAs in PEM format\.
+.
+.IP "\(bu" 4
+\fBssl_client_cert\fR (\fBBUNDLE_SSL_CLIENT_CERT\fR): Path to a designated file containing a X\.509 client certificate and key in PEM format\.
+.
+.IP "\(bu" 4
+\fBssl_verify_mode\fR (\fBBUNDLE_SSL_VERIFY_MODE\fR): The SSL verification mode Bundler uses when making HTTPS requests\. Defaults to verify peer\.
+.
+.IP "\(bu" 4
+\fBsuppress_install_using_messages\fR (\fBBUNDLE_SUPPRESS_INSTALL_USING_MESSAGES\fR): Avoid printing \fBUsing \.\.\.\fR messages during installation when the version of a gem has not changed\.
+.
+.IP "\(bu" 4
+\fBsystem_bindir\fR (\fBBUNDLE_SYSTEM_BINDIR\fR): The location where RubyGems installs binstubs\. Defaults to \fBGem\.bindir\fR\.
+.
+.IP "\(bu" 4
+\fBtimeout\fR (\fBBUNDLE_TIMEOUT\fR): The seconds allowed before timing out for network requests\. Defaults to \fB10\fR\.
+.
+.IP "\(bu" 4
+\fBupdate_requires_all_flag\fR (\fBBUNDLE_UPDATE_REQUIRES_ALL_FLAG\fR): Require passing \fB\-\-all\fR to \fBbundle update\fR when everything should be updated, and disallow passing no options to \fBbundle update\fR\.
+.
+.IP "\(bu" 4
+\fBuser_agent\fR (\fBBUNDLE_USER_AGENT\fR): The custom user agent fragment Bundler includes in API requests\.
+.
+.IP "\(bu" 4
+\fBwith\fR (\fBBUNDLE_WITH\fR): A \fB:\fR\-separated list of groups whose gems bundler should install\.
+.
+.IP "\(bu" 4
+\fBwithout\fR (\fBBUNDLE_WITHOUT\fR): A \fB:\fR\-separated list of groups whose gems bundler should not install\.
+.
+.IP "" 0
+.
+.P
+In general, you should set these settings per\-application by using the applicable flag to the bundle install(1) \fIbundle\-install\.1\.html\fR or bundle package(1) \fIbundle\-package\.1\.html\fR command\.
+.
+.P
+You can set them globally either via environment variables or \fBbundle config\fR, whichever is preferable for your setup\. If you use both, environment variables will take preference over global settings\.
+.
+.SH "LOCAL GIT REPOS"
+Bundler also allows you to work against a git repository locally instead of using the remote version\. This can be achieved by setting up a local override:
+.
+.IP "" 4
+.
+.nf
+
+bundle config set \-\-local local\.GEM_NAME /path/to/local/git/repository
+.
+.fi
+.
+.IP "" 0
+.
+.P
+For example, in order to use a local Rack repository, a developer could call:
+.
+.IP "" 4
+.
+.nf
+
+bundle config set \-\-local local\.rack ~/Work/git/rack
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Now instead of checking out the remote git repository, the local override will be used\. Similar to a path source, every time the local git repository change, changes will be automatically picked up by Bundler\. This means a commit in the local git repo will update the revision in the \fBGemfile\.lock\fR to the local git repo revision\. This requires the same attention as git submodules\. Before pushing to the remote, you need to ensure the local override was pushed, otherwise you may point to a commit that only exists in your local machine\. You\'ll also need to CGI escape your usernames and passwords as well\.
+.
+.P
+Bundler does many checks to ensure a developer won\'t work with invalid references\. Particularly, we force a developer to specify a branch in the \fBGemfile\fR in order to use this feature\. If the branch specified in the \fBGemfile\fR and the current branch in the local git repository do not match, Bundler will abort\. This ensures that a developer is always working against the correct branches, and prevents accidental locking to a different branch\.
+.
+.P
+Finally, Bundler also ensures that the current revision in the \fBGemfile\.lock\fR exists in the local git repository\. By doing this, Bundler forces you to fetch the latest changes in the remotes\.
+.
+.SH "MIRRORS OF GEM SOURCES"
+Bundler supports overriding gem sources with mirrors\. This allows you to configure rubygems\.org as the gem source in your Gemfile while still using your mirror to fetch gems\.
+.
+.IP "" 4
+.
+.nf
+
+bundle config set \-\-global mirror\.SOURCE_URL MIRROR_URL
+.
+.fi
+.
+.IP "" 0
+.
+.P
+For example, to use a mirror of rubygems\.org hosted at rubygems\-mirror\.org:
+.
+.IP "" 4
+.
+.nf
+
+bundle config set \-\-global mirror\.http://rubygems\.org http://rubygems\-mirror\.org
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Each mirror also provides a fallback timeout setting\. If the mirror does not respond within the fallback timeout, Bundler will try to use the original server instead of the mirror\.
+.
+.IP "" 4
+.
+.nf
+
+bundle config set \-\-global mirror\.SOURCE_URL\.fallback_timeout TIMEOUT
+.
+.fi
+.
+.IP "" 0
+.
+.P
+For example, to fall back to rubygems\.org after 3 seconds:
+.
+.IP "" 4
+.
+.nf
+
+bundle config set \-\-global mirror\.https://rubygems\.org\.fallback_timeout 3
+.
+.fi
+.
+.IP "" 0
+.
+.P
+The default fallback timeout is 0\.1 seconds, but the setting can currently only accept whole seconds (for example, 1, 15, or 30)\.
+.
+.SH "CREDENTIALS FOR GEM SOURCES"
+Bundler allows you to configure credentials for any gem source, which allows you to avoid putting secrets into your Gemfile\.
+.
+.IP "" 4
+.
+.nf
+
+bundle config set \-\-global SOURCE_HOSTNAME USERNAME:PASSWORD
+.
+.fi
+.
+.IP "" 0
+.
+.P
+For example, to save the credentials of user \fBclaudette\fR for the gem source at \fBgems\.longerous\.com\fR, you would run:
+.
+.IP "" 4
+.
+.nf
+
+bundle config set \-\-global gems\.longerous\.com claudette:s00pers3krit
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Or you can set the credentials as an environment variable like this:
+.
+.IP "" 4
+.
+.nf
+
+export BUNDLE_GEMS__LONGEROUS__COM="claudette:s00pers3krit"
+.
+.fi
+.
+.IP "" 0
+.
+.P
+For gems with a git source with HTTP(S) URL you can specify credentials like so:
+.
+.IP "" 4
+.
+.nf
+
+bundle config set \-\-global https://github\.com/rubygems/rubygems\.git username:password
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Or you can set the credentials as an environment variable like so:
+.
+.IP "" 4
+.
+.nf
+
+export BUNDLE_GITHUB__COM=username:password
+.
+.fi
+.
+.IP "" 0
+.
+.P
+This is especially useful for private repositories on hosts such as Github, where you can use personal OAuth tokens:
+.
+.IP "" 4
+.
+.nf
+
+export BUNDLE_GITHUB__COM=abcd0123generatedtoken:x\-oauth\-basic
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Note that any configured credentials will be redacted by informative commands such as \fBbundle config list\fR or \fBbundle config get\fR, unless you use the \fB\-\-parseable\fR flag\. This is to avoid unintentionally leaking credentials when copy\-pasting bundler output\.
+.
+.P
+Also note that to guarantee a sane mapping between valid environment variable names and valid host names, bundler makes the following transformations:
+.
+.IP "\(bu" 4
+Any \fB\-\fR characters in a host name are mapped to a triple dash (\fB___\fR) in the corresponding environment variable\.
+.
+.IP "\(bu" 4
+Any \fB\.\fR characters in a host name are mapped to a double dash (\fB__\fR) in the corresponding environment variable\.
+.
+.IP "" 0
+.
+.P
+This means that if you have a gem server named \fBmy\.gem\-host\.com\fR, you\'ll need to use the \fBBUNDLE_MY__GEM___HOST__COM\fR variable to configure credentials for it through ENV\.
+.
+.SH "CONFIGURE BUNDLER DIRECTORIES"
+Bundler\'s home, config, cache and plugin directories are able to be configured through environment variables\. The default location for Bundler\'s home directory is \fB~/\.bundle\fR, which all directories inherit from by default\. The following outlines the available environment variables and their default values
+.
+.IP "" 4
+.
+.nf
+
+BUNDLE_USER_HOME : $HOME/\.bundle
+BUNDLE_USER_CACHE : $BUNDLE_USER_HOME/cache
+BUNDLE_USER_CONFIG : $BUNDLE_USER_HOME/config
+BUNDLE_USER_PLUGIN : $BUNDLE_USER_HOME/plugin
+.
+.fi
+.
+.IP "" 0
+
diff --git a/lib/bundler/man/bundle-config.1.ronn b/lib/bundler/man/bundle-config.1.ronn
new file mode 100644
index 0000000000..f412ee3aec
--- /dev/null
+++ b/lib/bundler/man/bundle-config.1.ronn
@@ -0,0 +1,396 @@
+bundle-config(1) -- Set bundler configuration options
+=====================================================
+
+## SYNOPSIS
+
+`bundle config` [list|get|set|unset] [<name> [<value>]]
+
+## DESCRIPTION
+
+This command allows you to interact with Bundler's configuration system.
+
+Bundler loads configuration settings in this order:
+
+1. Local config (`<project_root>/.bundle/config` or `$BUNDLE_APP_CONFIG/config`)
+2. Environmental variables (`ENV`)
+3. Global config (`~/.bundle/config`)
+4. Bundler default config
+
+Executing `bundle config list` with will print a list of all bundler
+configuration for the current bundle, and where that configuration
+was set.
+
+Executing `bundle config get <name>` will print the value of that configuration
+setting, and where it was set.
+
+Executing `bundle config set <name> <value>` will set that configuration to the
+value specified for all bundles executed as the current user. The configuration
+will be stored in `~/.bundle/config`. If <name> already is set, <name> will be
+overridden and user will be warned.
+
+Executing `bundle config set --global <name> <value>` works the same as above.
+
+Executing `bundle config set --local <name> <value>` will set that configuration
+in the directory for the local application. The configuration will be stored in
+`<project_root>/.bundle/config`. If `BUNDLE_APP_CONFIG` is set, the configuration
+will be stored in `$BUNDLE_APP_CONFIG/config`.
+
+Executing `bundle config unset <name>` will delete the configuration in both
+local and global sources.
+
+Executing `bundle config unset --global <name>` will delete the configuration
+only from the user configuration.
+
+Executing `bundle config unset --local <name> <value>` will delete the
+configuration only from the local application.
+
+Executing bundle with the `BUNDLE_IGNORE_CONFIG` environment variable set will
+cause it to ignore all configuration.
+
+## REMEMBERING OPTIONS
+
+Flags passed to `bundle install` or the Bundler runtime, such as `--path foo` or
+`--without production`, are remembered between commands and saved to your local
+application's configuration (normally, `./.bundle/config`).
+
+However, this will be changed in bundler 3, so it's better not to rely on this
+behavior. If these options must be remembered, it's better to set them using
+`bundle config` (e.g., `bundle config set --local path foo`).
+
+The options that can be configured are:
+
+* `bin`:
+   Creates a directory (defaults to `~/bin`) and place any executables from the
+   gem there. These executables run in Bundler's context. If used, you might add
+   this directory to your environment's `PATH` variable. For instance, if the
+   `rails` gem comes with a `rails` executable, this flag will create a
+   `bin/rails` executable that ensures that all referred dependencies will be
+   resolved using the bundled gems.
+
+* `deployment`:
+   In deployment mode, Bundler will 'roll-out' the bundle for
+   `production` use. Please check carefully if you want to have this option
+   enabled in `development` or `test` environments.
+
+* `path`:
+   The location to install the specified gems to. This defaults to Rubygems'
+   setting. Bundler shares this location with Rubygems, `gem install ...` will
+   have gem installed there, too. Therefore, gems installed without a
+   `--path ...` setting will show up by calling `gem list`. Accordingly, gems
+   installed to other locations will not get listed.
+
+* `without`:
+   A space-separated list of groups referencing gems to skip during installation.
+
+* `with`:
+  A space-separated list of groups referencing gems to include during installation.
+
+## BUILD OPTIONS
+
+You can use `bundle config` to give Bundler the flags to pass to the gem
+installer every time bundler tries to install a particular gem.
+
+A very common example, the `mysql` gem, requires Snow Leopard users to
+pass configuration flags to `gem install` to specify where to find the
+`mysql_config` executable.
+
+    gem install mysql -- --with-mysql-config=/usr/local/mysql/bin/mysql_config
+
+Since the specific location of that executable can change from machine
+to machine, you can specify these flags on a per-machine basis.
+
+    bundle config set --global build.mysql --with-mysql-config=/usr/local/mysql/bin/mysql_config
+
+After running this command, every time bundler needs to install the
+`mysql` gem, it will pass along the flags you specified.
+
+## CONFIGURATION KEYS
+
+Configuration keys in bundler have two forms: the canonical form and the
+environment variable form.
+
+For instance, passing the `--without` flag to [bundle install(1)](bundle-install.1.html)
+prevents Bundler from installing certain groups specified in the Gemfile(5). Bundler
+persists this value in `app/.bundle/config` so that calls to `Bundler.setup`
+do not try to find gems from the `Gemfile` that you didn't install. Additionally,
+subsequent calls to [bundle install(1)](bundle-install.1.html) remember this setting
+and skip those groups.
+
+The canonical form of this configuration is `"without"`. To convert the canonical
+form to the environment variable form, capitalize it, and prepend `BUNDLE_`. The
+environment variable form of `"without"` is `BUNDLE_WITHOUT`.
+
+Any periods in the configuration keys must be replaced with two underscores when
+setting it via environment variables. The configuration key `local.rack` becomes
+the environment variable `BUNDLE_LOCAL__RACK`.
+
+## LIST OF AVAILABLE KEYS
+
+The following is a list of all configuration keys and their purpose. You can
+learn more about their operation in [bundle install(1)](bundle-install.1.html).
+
+* `allow_deployment_source_credential_changes` (`BUNDLE_ALLOW_DEPLOYMENT_SOURCE_CREDENTIAL_CHANGES`):
+   When in deployment mode, allow changing the credentials to a gem's source.
+   Ex: `https://some.host.com/gems/path/` -> `https://user_name:password@some.host.com/gems/path`
+* `allow_offline_install` (`BUNDLE_ALLOW_OFFLINE_INSTALL`):
+   Allow Bundler to use cached data when installing without network access.
+* `auto_clean_without_path` (`BUNDLE_AUTO_CLEAN_WITHOUT_PATH`):
+   Automatically run `bundle clean` after installing when an explicit `path`
+   has not been set and Bundler is not installing into the system gems.
+* `auto_install` (`BUNDLE_AUTO_INSTALL`):
+   Automatically run `bundle install` when gems are missing.
+* `bin` (`BUNDLE_BIN`):
+   Install executables from gems in the bundle to the specified directory.
+   Defaults to `false`.
+* `cache_all` (`BUNDLE_CACHE_ALL`):
+   Cache all gems, including path and git gems. This needs to be explicitly
+   configured on bundler 1 and bundler 2, but will be the default on bundler 3.
+* `cache_all_platforms` (`BUNDLE_CACHE_ALL_PLATFORMS`):
+   Cache gems for all platforms.
+* `cache_path` (`BUNDLE_CACHE_PATH`):
+   The directory that bundler will place cached gems in when running
+   <code>bundle package</code>, and that bundler will look in when installing gems.
+   Defaults to `vendor/cache`.
+* `clean` (`BUNDLE_CLEAN`):
+   Whether Bundler should run `bundle clean` automatically after
+   `bundle install`.
+* `console` (`BUNDLE_CONSOLE`):
+   The console that `bundle console` starts. Defaults to `irb`.
+* `default_install_uses_path` (`BUNDLE_DEFAULT_INSTALL_USES_PATH`):
+   Whether a `bundle install` without an explicit `--path` argument defaults
+   to installing gems in `.bundle`.
+* `deployment` (`BUNDLE_DEPLOYMENT`):
+   Disallow changes to the `Gemfile`. When the `Gemfile` is changed and the
+   lockfile has not been updated, running Bundler commands will be blocked.
+* `disable_checksum_validation` (`BUNDLE_DISABLE_CHECKSUM_VALIDATION`):
+   Allow installing gems even if they do not match the checksum provided by
+   RubyGems.
+* `disable_exec_load` (`BUNDLE_DISABLE_EXEC_LOAD`):
+   Stop Bundler from using `load` to launch an executable in-process in
+   `bundle exec`.
+* `disable_local_branch_check` (`BUNDLE_DISABLE_LOCAL_BRANCH_CHECK`):
+   Allow Bundler to use a local git override without a branch specified in the
+   Gemfile.
+* `disable_local_revision_check` (`BUNDLE_DISABLE_LOCAL_REVISION_CHECK`):
+   Allow Bundler to use a local git override without checking if the revision
+   present in the lockfile is present in the repository.
+* `disable_shared_gems` (`BUNDLE_DISABLE_SHARED_GEMS`):
+   Stop Bundler from accessing gems installed to RubyGems' normal location.
+* `disable_version_check` (`BUNDLE_DISABLE_VERSION_CHECK`):
+   Stop Bundler from checking if a newer Bundler version is available on
+   rubygems.org.
+* `force_ruby_platform` (`BUNDLE_FORCE_RUBY_PLATFORM`):
+   Ignore the current machine's platform and install only `ruby` platform gems.
+   As a result, gems with native extensions will be compiled from source.
+* `frozen` (`BUNDLE_FROZEN`):
+   Disallow changes to the `Gemfile`. When the `Gemfile` is changed and the
+   lockfile has not been updated, running Bundler commands will be blocked.
+   Defaults to `true` when `--deployment` is used.
+* `gem.github_username` (`BUNDLE_GEM__GITHUB_USERNAME`):
+   Sets a GitHub username or organization to be used in `README` file when you
+   create a new gem via `bundle gem` command. It can be overridden by passing an
+   explicit `--github-username` flag to `bundle gem`.
+* `gem.push_key` (`BUNDLE_GEM__PUSH_KEY`):
+   Sets the `--key` parameter for `gem push` when using the `rake release`
+   command with a private gemstash server.
+* `gemfile` (`BUNDLE_GEMFILE`):
+   The name of the file that bundler should use as the `Gemfile`. This location
+   of this file also sets the root of the project, which is used to resolve
+   relative paths in the `Gemfile`, among other things. By default, bundler
+   will search up from the current working directory until it finds a
+   `Gemfile`.
+* `global_gem_cache` (`BUNDLE_GLOBAL_GEM_CACHE`):
+   Whether Bundler should cache all gems globally, rather than locally to the
+   installing Ruby installation.
+* `ignore_messages` (`BUNDLE_IGNORE_MESSAGES`):
+   When set, no post install messages will be printed. To silence a single gem,
+   use dot notation like `ignore_messages.httparty true`.
+* `init_gems_rb` (`BUNDLE_INIT_GEMS_RB`):
+   Generate a `gems.rb` instead of a `Gemfile` when running `bundle init`.
+* `jobs` (`BUNDLE_JOBS`):
+   The number of gems Bundler can install in parallel. Defaults to 1 on Windows,
+   and to the the number of processors on other platforms.
+* `no_install` (`BUNDLE_NO_INSTALL`):
+   Whether `bundle package` should skip installing gems.
+* `no_prune` (`BUNDLE_NO_PRUNE`):
+   Whether Bundler should leave outdated gems unpruned when caching.
+* `path` (`BUNDLE_PATH`):
+   The location on disk where all gems in your bundle will be located regardless
+   of `$GEM_HOME` or `$GEM_PATH` values. Bundle gems not found in this location
+   will be installed by `bundle install`. Defaults to `Gem.dir`. When --deployment
+   is used, defaults to vendor/bundle.
+* `path.system` (`BUNDLE_PATH__SYSTEM`):
+   Whether Bundler will install gems into the default system path (`Gem.dir`).
+* `path_relative_to_cwd` (`BUNDLE_PATH_RELATIVE_TO_CWD`)
+   Makes `--path` relative to the CWD instead of the `Gemfile`.
+* `plugins` (`BUNDLE_PLUGINS`):
+   Enable Bundler's experimental plugin system.
+* `prefer_patch` (BUNDLE_PREFER_PATCH):
+   Prefer updating only to next patch version during updates. Makes `bundle update` calls equivalent to `bundler update --patch`.
+* `print_only_version_number` (`BUNDLE_PRINT_ONLY_VERSION_NUMBER`):
+   Print only version number from `bundler --version`.
+* `redirect` (`BUNDLE_REDIRECT`):
+   The number of redirects allowed for network requests. Defaults to `5`.
+* `retry` (`BUNDLE_RETRY`):
+   The number of times to retry failed network requests. Defaults to `3`.
+* `setup_makes_kernel_gem_public` (`BUNDLE_SETUP_MAKES_KERNEL_GEM_PUBLIC`):
+   Have `Bundler.setup` make the `Kernel#gem` method public, even though
+   RubyGems declares it as private.
+* `shebang` (`BUNDLE_SHEBANG`):
+   The program name that should be invoked for generated binstubs. Defaults to
+   the ruby install name used to generate the binstub.
+* `silence_deprecations` (`BUNDLE_SILENCE_DEPRECATIONS`):
+   Whether Bundler should silence deprecation warnings for behavior that will
+   be changed in the next major version.
+* `silence_root_warning` (`BUNDLE_SILENCE_ROOT_WARNING`):
+   Silence the warning Bundler prints when installing gems as root.
+* `ssl_ca_cert` (`BUNDLE_SSL_CA_CERT`):
+   Path to a designated CA certificate file or folder containing multiple
+   certificates for trusted CAs in PEM format.
+* `ssl_client_cert` (`BUNDLE_SSL_CLIENT_CERT`):
+   Path to a designated file containing a X.509 client certificate
+   and key in PEM format.
+* `ssl_verify_mode` (`BUNDLE_SSL_VERIFY_MODE`):
+   The SSL verification mode Bundler uses when making HTTPS requests.
+   Defaults to verify peer.
+* `suppress_install_using_messages` (`BUNDLE_SUPPRESS_INSTALL_USING_MESSAGES`):
+   Avoid printing `Using ...` messages during installation when the version of
+   a gem has not changed.
+* `system_bindir` (`BUNDLE_SYSTEM_BINDIR`):
+   The location where RubyGems installs binstubs. Defaults to `Gem.bindir`.
+* `timeout` (`BUNDLE_TIMEOUT`):
+   The seconds allowed before timing out for network requests. Defaults to `10`.
+* `update_requires_all_flag` (`BUNDLE_UPDATE_REQUIRES_ALL_FLAG`):
+   Require passing `--all` to `bundle update` when everything should be updated,
+   and disallow passing no options to `bundle update`.
+* `user_agent` (`BUNDLE_USER_AGENT`):
+   The custom user agent fragment Bundler includes in API requests.
+* `with` (`BUNDLE_WITH`):
+   A `:`-separated list of groups whose gems bundler should install.
+* `without` (`BUNDLE_WITHOUT`):
+   A `:`-separated list of groups whose gems bundler should not install.
+
+In general, you should set these settings per-application by using the applicable
+flag to the [bundle install(1)](bundle-install.1.html) or [bundle package(1)](bundle-package.1.html) command.
+
+You can set them globally either via environment variables or `bundle config`,
+whichever is preferable for your setup. If you use both, environment variables
+will take preference over global settings.
+
+## LOCAL GIT REPOS
+
+Bundler also allows you to work against a git repository locally
+instead of using the remote version. This can be achieved by setting
+up a local override:
+
+    bundle config set --local local.GEM_NAME /path/to/local/git/repository
+
+For example, in order to use a local Rack repository, a developer could call:
+
+    bundle config set --local local.rack ~/Work/git/rack
+
+Now instead of checking out the remote git repository, the local
+override will be used. Similar to a path source, every time the local
+git repository change, changes will be automatically picked up by
+Bundler. This means a commit in the local git repo will update the
+revision in the `Gemfile.lock` to the local git repo revision. This
+requires the same attention as git submodules. Before pushing to
+the remote, you need to ensure the local override was pushed, otherwise
+you may point to a commit that only exists in your local machine.
+You'll also need to CGI escape your usernames and passwords as well.
+
+Bundler does many checks to ensure a developer won't work with
+invalid references. Particularly, we force a developer to specify
+a branch in the `Gemfile` in order to use this feature. If the branch
+specified in the `Gemfile` and the current branch in the local git
+repository do not match, Bundler will abort. This ensures that
+a developer is always working against the correct branches, and prevents
+accidental locking to a different branch.
+
+Finally, Bundler also ensures that the current revision in the
+`Gemfile.lock` exists in the local git repository. By doing this, Bundler
+forces you to fetch the latest changes in the remotes.
+
+## MIRRORS OF GEM SOURCES
+
+Bundler supports overriding gem sources with mirrors. This allows you to
+configure rubygems.org as the gem source in your Gemfile while still using your
+mirror to fetch gems.
+
+    bundle config set --global mirror.SOURCE_URL MIRROR_URL
+
+For example, to use a mirror of rubygems.org hosted at rubygems-mirror.org:
+
+    bundle config set --global mirror.http://rubygems.org http://rubygems-mirror.org
+
+Each mirror also provides a fallback timeout setting. If the mirror does not
+respond within the fallback timeout, Bundler will try to use the original
+server instead of the mirror.
+
+    bundle config set --global mirror.SOURCE_URL.fallback_timeout TIMEOUT
+
+For example, to fall back to rubygems.org after 3 seconds:
+
+    bundle config set --global mirror.https://rubygems.org.fallback_timeout 3
+
+The default fallback timeout is 0.1 seconds, but the setting can currently
+only accept whole seconds (for example, 1, 15, or 30).
+
+## CREDENTIALS FOR GEM SOURCES
+
+Bundler allows you to configure credentials for any gem source, which allows
+you to avoid putting secrets into your Gemfile.
+
+    bundle config set --global SOURCE_HOSTNAME USERNAME:PASSWORD
+
+For example, to save the credentials of user `claudette` for the gem source at
+`gems.longerous.com`, you would run:
+
+    bundle config set --global gems.longerous.com claudette:s00pers3krit
+
+Or you can set the credentials as an environment variable like this:
+
+    export BUNDLE_GEMS__LONGEROUS__COM="claudette:s00pers3krit"
+
+For gems with a git source with HTTP(S) URL you can specify credentials like so:
+
+    bundle config set --global https://github.com/rubygems/rubygems.git username:password
+
+Or you can set the credentials as an environment variable like so:
+
+    export BUNDLE_GITHUB__COM=username:password
+
+This is especially useful for private repositories on hosts such as Github,
+where you can use personal OAuth tokens:
+
+    export BUNDLE_GITHUB__COM=abcd0123generatedtoken:x-oauth-basic
+
+Note that any configured credentials will be redacted by informative commands
+such as `bundle config list` or `bundle config get`, unless you use the
+`--parseable` flag. This is to avoid unintentionally leaking credentials when
+copy-pasting bundler output.
+
+Also note that to guarantee a sane mapping between valid environment variable
+names and valid host names, bundler makes the following transformations:
+
+* Any `-` characters in a host name are mapped to a triple dash (`___`) in the
+  corresponding environment variable.
+
+* Any `.` characters in a host name are mapped to a double dash (`__`) in the
+  corresponding environment variable.
+
+This means that if you have a gem server named `my.gem-host.com`, you'll need to
+use the `BUNDLE_MY__GEM___HOST__COM` variable to configure credentials for it
+through ENV.
+
+## CONFIGURE BUNDLER DIRECTORIES
+
+Bundler's home, config, cache and plugin directories are able to be configured
+through environment variables. The default location for Bundler's home directory is
+`~/.bundle`, which all directories inherit from by default. The following
+outlines the available environment variables and their default values
+
+    BUNDLE_USER_HOME : $HOME/.bundle
+    BUNDLE_USER_CACHE : $BUNDLE_USER_HOME/cache
+    BUNDLE_USER_CONFIG : $BUNDLE_USER_HOME/config
+    BUNDLE_USER_PLUGIN : $BUNDLE_USER_HOME/plugin
diff --git a/lib/bundler/man/bundle-doctor.1 b/lib/bundler/man/bundle-doctor.1
new file mode 100644
index 0000000000..87a7fe5f2f
--- /dev/null
+++ b/lib/bundler/man/bundle-doctor.1
@@ -0,0 +1,44 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "BUNDLE\-DOCTOR" "1" "December 2021" "" ""
+.
+.SH "NAME"
+\fBbundle\-doctor\fR \- Checks the bundle for common problems
+.
+.SH "SYNOPSIS"
+\fBbundle doctor\fR [\-\-quiet] [\-\-gemfile=GEMFILE]
+.
+.SH "DESCRIPTION"
+Checks your Gemfile and gem environment for common problems\. If issues are detected, Bundler prints them and exits status 1\. Otherwise, Bundler prints a success message and exits status 0\.
+.
+.P
+Examples of common problems caught by bundle\-doctor include:
+.
+.IP "\(bu" 4
+Invalid Bundler settings
+.
+.IP "\(bu" 4
+Mismatched Ruby versions
+.
+.IP "\(bu" 4
+Mismatched platforms
+.
+.IP "\(bu" 4
+Uninstalled gems
+.
+.IP "\(bu" 4
+Missing dependencies
+.
+.IP "" 0
+.
+.SH "OPTIONS"
+.
+.TP
+\fB\-\-quiet\fR
+Only output warnings and errors\.
+.
+.TP
+\fB\-\-gemfile=<gemfile>\fR
+The location of the Gemfile(5) which Bundler should use\. This defaults to a Gemfile(5) in the current working directory\. In general, Bundler will assume that the location of the Gemfile(5) is also the project\'s root and will try to find \fBGemfile\.lock\fR and \fBvendor/cache\fR relative to this location\.
+
diff --git a/lib/bundler/man/bundle-doctor.1.ronn b/lib/bundler/man/bundle-doctor.1.ronn
new file mode 100644
index 0000000000..271ee800ad
--- /dev/null
+++ b/lib/bundler/man/bundle-doctor.1.ronn
@@ -0,0 +1,33 @@
+bundle-doctor(1) -- Checks the bundle for common problems
+=========================================================
+
+## SYNOPSIS
+
+`bundle doctor` [--quiet]
+                [--gemfile=GEMFILE]
+
+## DESCRIPTION
+
+Checks your Gemfile and gem environment for common problems. If issues
+are detected, Bundler prints them and exits status 1. Otherwise,
+Bundler prints a success message and exits status 0.
+
+Examples of common problems caught by bundle-doctor include:
+
+* Invalid Bundler settings
+* Mismatched Ruby versions
+* Mismatched platforms
+* Uninstalled gems
+* Missing dependencies
+
+## OPTIONS
+
+* `--quiet`:
+  Only output warnings and errors.
+
+* `--gemfile=<gemfile>`:
+  The location of the Gemfile(5) which Bundler should use. This defaults
+  to a Gemfile(5) in the current working directory. In general, Bundler
+  will assume that the location of the Gemfile(5) is also the project's
+  root and will try to find `Gemfile.lock` and `vendor/cache` relative
+  to this location.
diff --git a/lib/bundler/man/bundle-exec.1 b/lib/bundler/man/bundle-exec.1
new file mode 100644
index 0000000000..69adfa7c92
--- /dev/null
+++ b/lib/bundler/man/bundle-exec.1
@@ -0,0 +1,165 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "BUNDLE\-EXEC" "1" "December 2021" "" ""
+.
+.SH "NAME"
+\fBbundle\-exec\fR \- Execute a command in the context of the bundle
+.
+.SH "SYNOPSIS"
+\fBbundle exec\fR [\-\-keep\-file\-descriptors] \fIcommand\fR
+.
+.SH "DESCRIPTION"
+This command executes the command, making all gems specified in the [\fBGemfile(5)\fR][Gemfile(5)] available to \fBrequire\fR in Ruby programs\.
+.
+.P
+Essentially, if you would normally have run something like \fBrspec spec/my_spec\.rb\fR, and you want to use the gems specified in the [\fBGemfile(5)\fR][Gemfile(5)] and installed via bundle install(1) \fIbundle\-install\.1\.html\fR, you should run \fBbundle exec rspec spec/my_spec\.rb\fR\.
+.
+.P
+Note that \fBbundle exec\fR does not require that an executable is available on your shell\'s \fB$PATH\fR\.
+.
+.SH "OPTIONS"
+.
+.TP
+\fB\-\-keep\-file\-descriptors\fR
+Exec in Ruby 2\.0 began discarding non\-standard file descriptors\. When this flag is passed, exec will revert to the 1\.9 behaviour of passing all file descriptors to the new process\.
+.
+.SH "BUNDLE INSTALL \-\-BINSTUBS"
+If you use the \fB\-\-binstubs\fR flag in bundle install(1) \fIbundle\-install\.1\.html\fR, Bundler will automatically create a directory (which defaults to \fBapp_root/bin\fR) containing all of the executables available from gems in the bundle\.
+.
+.P
+After using \fB\-\-binstubs\fR, \fBbin/rspec spec/my_spec\.rb\fR is identical to \fBbundle exec rspec spec/my_spec\.rb\fR\.
+.
+.SH "ENVIRONMENT MODIFICATIONS"
+\fBbundle exec\fR makes a number of changes to the shell environment, then executes the command you specify in full\.
+.
+.IP "\(bu" 4
+make sure that it\'s still possible to shell out to \fBbundle\fR from inside a command invoked by \fBbundle exec\fR (using \fB$BUNDLE_BIN_PATH\fR)
+.
+.IP "\(bu" 4
+put the directory containing executables (like \fBrails\fR, \fBrspec\fR, \fBrackup\fR) for your bundle on \fB$PATH\fR
+.
+.IP "\(bu" 4
+make sure that if bundler is invoked in the subshell, it uses the same \fBGemfile\fR (by setting \fBBUNDLE_GEMFILE\fR)
+.
+.IP "\(bu" 4
+add \fB\-rbundler/setup\fR to \fB$RUBYOPT\fR, which makes sure that Ruby programs invoked in the subshell can see the gems in the bundle
+.
+.IP "" 0
+.
+.P
+It also modifies Rubygems:
+.
+.IP "\(bu" 4
+disallow loading additional gems not in the bundle
+.
+.IP "\(bu" 4
+modify the \fBgem\fR method to be a no\-op if a gem matching the requirements is in the bundle, and to raise a \fBGem::LoadError\fR if it\'s not
+.
+.IP "\(bu" 4
+Define \fBGem\.refresh\fR to be a no\-op, since the source index is always frozen when using bundler, and to prevent gems from the system leaking into the environment
+.
+.IP "\(bu" 4
+Override \fBGem\.bin_path\fR to use the gems in the bundle, making system executables work
+.
+.IP "\(bu" 4
+Add all gems in the bundle into Gem\.loaded_specs
+.
+.IP "" 0
+.
+.P
+Finally, \fBbundle exec\fR also implicitly modifies \fBGemfile\.lock\fR if the lockfile and the Gemfile do not match\. Bundler needs the Gemfile to determine things such as a gem\'s groups, \fBautorequire\fR, and platforms, etc\., and that information isn\'t stored in the lockfile\. The Gemfile and lockfile must be synced in order to \fBbundle exec\fR successfully, so \fBbundle exec\fR updates the lockfile beforehand\.
+.
+.SS "Loading"
+By default, when attempting to \fBbundle exec\fR to a file with a ruby shebang, Bundler will \fBKernel\.load\fR that file instead of using \fBKernel\.exec\fR\. For the vast majority of cases, this is a performance improvement\. In a rare few cases, this could cause some subtle side\-effects (such as dependence on the exact contents of \fB$0\fR or \fB__FILE__\fR) and the optimization can be disabled by enabling the \fBdisable_exec_load\fR setting\.
+.
+.SS "Shelling out"
+Any Ruby code that opens a subshell (like \fBsystem\fR, backticks, or \fB%x{}\fR) will automatically use the current Bundler environment\. If you need to shell out to a Ruby command that is not part of your current bundle, use the \fBwith_clean_env\fR method with a block\. Any subshells created inside the block will be given the environment present before Bundler was activated\. For example, Homebrew commands run Ruby, but don\'t work inside a bundle:
+.
+.IP "" 4
+.
+.nf
+
+Bundler\.with_clean_env do
+  `brew install wget`
+end
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Using \fBwith_clean_env\fR is also necessary if you are shelling out to a different bundle\. Any Bundler commands run in a subshell will inherit the current Gemfile, so commands that need to run in the context of a different bundle also need to use \fBwith_clean_env\fR\.
+.
+.IP "" 4
+.
+.nf
+
+Bundler\.with_clean_env do
+  Dir\.chdir "/other/bundler/project" do
+    `bundle exec \./script`
+  end
+end
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Bundler provides convenience helpers that wrap \fBsystem\fR and \fBexec\fR, and they can be used like this:
+.
+.IP "" 4
+.
+.nf
+
+Bundler\.clean_system(\'brew install wget\')
+Bundler\.clean_exec(\'brew install wget\')
+.
+.fi
+.
+.IP "" 0
+.
+.SH "RUBYGEMS PLUGINS"
+At present, the Rubygems plugin system requires all files named \fBrubygems_plugin\.rb\fR on the load path of \fIany\fR installed gem when any Ruby code requires \fBrubygems\.rb\fR\. This includes executables installed into the system, like \fBrails\fR, \fBrackup\fR, and \fBrspec\fR\.
+.
+.P
+Since Rubygems plugins can contain arbitrary Ruby code, they commonly end up activating themselves or their dependencies\.
+.
+.P
+For instance, the \fBgemcutter 0\.5\fR gem depended on \fBjson_pure\fR\. If you had that version of gemcutter installed (even if you \fIalso\fR had a newer version without this problem), Rubygems would activate \fBgemcutter 0\.5\fR and \fBjson_pure <latest>\fR\.
+.
+.P
+If your Gemfile(5) also contained \fBjson_pure\fR (or a gem with a dependency on \fBjson_pure\fR), the latest version on your system might conflict with the version in your Gemfile(5), or the snapshot version in your \fBGemfile\.lock\fR\.
+.
+.P
+If this happens, bundler will say:
+.
+.IP "" 4
+.
+.nf
+
+You have already activated json_pure 1\.4\.6 but your Gemfile
+requires json_pure 1\.4\.3\. Consider using bundle exec\.
+.
+.fi
+.
+.IP "" 0
+.
+.P
+In this situation, you almost certainly want to remove the underlying gem with the problematic gem plugin\. In general, the authors of these plugins (in this case, the \fBgemcutter\fR gem) have released newer versions that are more careful in their plugins\.
+.
+.P
+You can find a list of all the gems containing gem plugins by running
+.
+.IP "" 4
+.
+.nf
+
+ruby \-rrubygems \-e "puts Gem\.find_files(\'rubygems_plugin\.rb\')"
+.
+.fi
+.
+.IP "" 0
+.
+.P
+At the very least, you should remove all but the newest version of each gem plugin, and also remove all gem plugins that you aren\'t using (\fBgem uninstall gem_name\fR)\.
diff --git a/lib/bundler/man/bundle-exec.1.ronn b/lib/bundler/man/bundle-exec.1.ronn
new file mode 100644
index 0000000000..dec3c7cb82
--- /dev/null
+++ b/lib/bundler/man/bundle-exec.1.ronn
@@ -0,0 +1,152 @@
+bundle-exec(1) -- Execute a command in the context of the bundle
+================================================================
+
+## SYNOPSIS
+
+`bundle exec` [--keep-file-descriptors] <command>
+
+## DESCRIPTION
+
+This command executes the command, making all gems specified in the
+[`Gemfile(5)`][Gemfile(5)] available to `require` in Ruby programs.
+
+Essentially, if you would normally have run something like
+`rspec spec/my_spec.rb`, and you want to use the gems specified
+in the [`Gemfile(5)`][Gemfile(5)] and installed via [bundle install(1)](bundle-install.1.html), you
+should run `bundle exec rspec spec/my_spec.rb`.
+
+Note that `bundle exec` does not require that an executable is
+available on your shell's `$PATH`.
+
+## OPTIONS
+
+* `--keep-file-descriptors`:
+  Exec in Ruby 2.0 began discarding non-standard file descriptors. When this
+  flag is passed, exec will revert to the 1.9 behaviour of passing all file
+  descriptors to the new process.
+
+## BUNDLE INSTALL --BINSTUBS
+
+If you use the `--binstubs` flag in [bundle install(1)](bundle-install.1.html), Bundler will
+automatically create a directory (which defaults to `app_root/bin`)
+containing all of the executables available from gems in the bundle.
+
+After using `--binstubs`, `bin/rspec spec/my_spec.rb` is identical
+to `bundle exec rspec spec/my_spec.rb`.
+
+## ENVIRONMENT MODIFICATIONS
+
+`bundle exec` makes a number of changes to the shell environment,
+then executes the command you specify in full.
+
+* make sure that it's still possible to shell out to `bundle`
+  from inside a command invoked by `bundle exec` (using
+  `$BUNDLE_BIN_PATH`)
+* put the directory containing executables (like `rails`, `rspec`,
+  `rackup`) for your bundle on `$PATH`
+* make sure that if bundler is invoked in the subshell, it uses
+  the same `Gemfile` (by setting `BUNDLE_GEMFILE`)
+* add `-rbundler/setup` to `$RUBYOPT`, which makes sure that
+  Ruby programs invoked in the subshell can see the gems in
+  the bundle
+
+It also modifies Rubygems:
+
+* disallow loading additional gems not in the bundle
+* modify the `gem` method to be a no-op if a gem matching
+  the requirements is in the bundle, and to raise a
+  `Gem::LoadError` if it's not
+* Define `Gem.refresh` to be a no-op, since the source
+  index is always frozen when using bundler, and to
+  prevent gems from the system leaking into the environment
+* Override `Gem.bin_path` to use the gems in the bundle,
+  making system executables work
+* Add all gems in the bundle into Gem.loaded_specs
+
+Finally, `bundle exec` also implicitly modifies `Gemfile.lock` if the lockfile
+and the Gemfile do not match. Bundler needs the Gemfile to determine things
+such as a gem's groups, `autorequire`, and platforms, etc., and that
+information isn't stored in the lockfile. The Gemfile and lockfile must be
+synced in order to `bundle exec` successfully, so `bundle exec`
+updates the lockfile beforehand.
+
+### Loading
+
+By default, when attempting to `bundle exec` to a file with a ruby shebang,
+Bundler will `Kernel.load` that file instead of using `Kernel.exec`. For the
+vast majority of cases, this is a performance improvement. In a rare few cases,
+this could cause some subtle side-effects (such as dependence on the exact
+contents of `$0` or `__FILE__`) and the optimization can be disabled by enabling
+the `disable_exec_load` setting.
+
+### Shelling out
+
+Any Ruby code that opens a subshell (like `system`, backticks, or `%x{}`) will
+automatically use the current Bundler environment. If you need to shell out to
+a Ruby command that is not part of your current bundle, use the
+`with_clean_env` method with a block. Any subshells created inside the block
+will be given the environment present before Bundler was activated. For
+example, Homebrew commands run Ruby, but don't work inside a bundle:
+
+    Bundler.with_clean_env do
+      `brew install wget`
+    end
+
+Using `with_clean_env` is also necessary if you are shelling out to a different
+bundle. Any Bundler commands run in a subshell will inherit the current
+Gemfile, so commands that need to run in the context of a different bundle also
+need to use `with_clean_env`.
+
+    Bundler.with_clean_env do
+      Dir.chdir "/other/bundler/project" do
+        `bundle exec ./script`
+      end
+    end
+
+Bundler provides convenience helpers that wrap `system` and `exec`, and they
+can be used like this:
+
+    Bundler.clean_system('brew install wget')
+    Bundler.clean_exec('brew install wget')
+
+
+## RUBYGEMS PLUGINS
+
+At present, the Rubygems plugin system requires all files
+named `rubygems_plugin.rb` on the load path of _any_ installed
+gem when any Ruby code requires `rubygems.rb`. This includes
+executables installed into the system, like `rails`, `rackup`,
+and `rspec`.
+
+Since Rubygems plugins can contain arbitrary Ruby code, they
+commonly end up activating themselves or their dependencies.
+
+For instance, the `gemcutter 0.5` gem depended on `json_pure`.
+If you had that version of gemcutter installed (even if
+you _also_ had a newer version without this problem), Rubygems
+would activate `gemcutter 0.5` and `json_pure <latest>`.
+
+If your Gemfile(5) also contained `json_pure` (or a gem
+with a dependency on `json_pure`), the latest version on
+your system might conflict with the version in your
+Gemfile(5), or the snapshot version in your `Gemfile.lock`.
+
+If this happens, bundler will say:
+
+    You have already activated json_pure 1.4.6 but your Gemfile
+    requires json_pure 1.4.3. Consider using bundle exec.
+
+In this situation, you almost certainly want to remove the
+underlying gem with the problematic gem plugin. In general,
+the authors of these plugins (in this case, the `gemcutter`
+gem) have released newer versions that are more careful in
+their plugins.
+
+You can find a list of all the gems containing gem plugins
+by running
+
+    ruby -rrubygems -e "puts Gem.find_files('rubygems_plugin.rb')"
+
+At the very least, you should remove all but the newest
+version of each gem plugin, and also remove all gem plugins
+that you aren't using (`gem uninstall gem_name`).
diff --git a/lib/bundler/man/bundle-gem.1 b/lib/bundler/man/bundle-gem.1
new file mode 100644
index 0000000000..fae5c34e7e
--- /dev/null
+++ b/lib/bundler/man/bundle-gem.1
@@ -0,0 +1,115 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "BUNDLE\-GEM" "1" "December 2021" "" ""
+.
+.SH "NAME"
+\fBbundle\-gem\fR \- Generate a project skeleton for creating a rubygem
+.
+.SH "SYNOPSIS"
+\fBbundle gem\fR \fIGEM_NAME\fR \fIOPTIONS\fR
+.
+.SH "DESCRIPTION"
+Generates a directory named \fBGEM_NAME\fR with a \fBRakefile\fR, \fBGEM_NAME\.gemspec\fR, and other supporting files and directories that can be used to develop a rubygem with that name\.
+.
+.P
+Run \fBrake \-T\fR in the resulting project for a list of Rake tasks that can be used to test and publish the gem to rubygems\.org\.
+.
+.P
+The generated project skeleton can be customized with OPTIONS, as explained below\. Note that these options can also be specified via Bundler\'s global configuration file using the following names:
+.
+.IP "\(bu" 4
+\fBgem\.coc\fR
+.
+.IP "\(bu" 4
+\fBgem\.mit\fR
+.
+.IP "\(bu" 4
+\fBgem\.test\fR
+.
+.IP "" 0
+.
+.SH "OPTIONS"
+.
+.TP
+\fB\-\-exe\fR or \fB\-b\fR or \fB\-\-bin\fR
+Specify that Bundler should create a binary executable (as \fBexe/GEM_NAME\fR) in the generated rubygem project\. This binary will also be added to the \fBGEM_NAME\.gemspec\fR manifest\. This behavior is disabled by default\.
+.
+.TP
+\fB\-\-no\-exe\fR
+Do not create a binary (overrides \fB\-\-exe\fR specified in the global config)\.
+.
+.TP
+\fB\-\-coc\fR
+Add a \fBCODE_OF_CONDUCT\.md\fR file to the root of the generated project\. If this option is unspecified, an interactive prompt will be displayed and the answer will be saved in Bundler\'s global config for future \fBbundle gem\fR use\.
+.
+.TP
+\fB\-\-no\-coc\fR
+Do not create a \fBCODE_OF_CONDUCT\.md\fR (overrides \fB\-\-coc\fR specified in the global config)\.
+.
+.TP
+\fB\-\-ext\fR
+Add boilerplate for C extension code to the generated project\. This behavior is disabled by default\.
+.
+.TP
+\fB\-\-no\-ext\fR
+Do not add C extension code (overrides \fB\-\-ext\fR specified in the global config)\.
+.
+.TP
+\fB\-\-mit\fR
+Add an MIT license to a \fBLICENSE\.txt\fR file in the root of the generated project\. Your name from the global git config is used for the copyright statement\. If this option is unspecified, an interactive prompt will be displayed and the answer will be saved in Bundler\'s global config for future \fBbundle gem\fR use\.
+.
+.TP
+\fB\-\-no\-mit\fR
+Do not create a \fBLICENSE\.txt\fR (overrides \fB\-\-mit\fR specified in the global config)\.
+.
+.TP
+\fB\-t\fR, \fB\-\-test=minitest\fR, \fB\-\-test=rspec\fR, \fB\-\-test=test\-unit\fR
+Specify the test framework that Bundler should use when generating the project\. Acceptable values are \fBminitest\fR, \fBrspec\fR and \fBtest\-unit\fR\. The \fBGEM_NAME\.gemspec\fR will be configured and a skeleton test/spec directory will be created based on this option\. Given no option is specified:
+.
+.IP
+When Bundler is configured to generate tests, this defaults to Bundler\'s global config setting \fBgem\.test\fR\.
+.
+.IP
+When Bundler is configured to not generate tests, an interactive prompt will be displayed and the answer will be used for the current rubygem project\.
+.
+.IP
+When Bundler is unconfigured, an interactive prompt will be displayed and the answer will be saved in Bundler\'s global config for future \fBbundle gem\fR use\.
+.
+.TP
+\fB\-\-ci\fR, \fB\-\-ci=github\fR, \fB\-\-ci=travis\fR, \fB\-\-ci=gitlab\fR, \fB\-\-ci=circle\fR
+Specify the continuous integration service that Bundler should use when generating the project\. Acceptable values are \fBgithub\fR, \fBtravis\fR, \fBgitlab\fR and \fBcircle\fR\. A configuration file will be generated in the project directory\. Given no option is specified:
+.
+.IP
+When Bundler is configured to generate CI files, this defaults to Bundler\'s global config setting \fBgem\.ci\fR\.
+.
+.IP
+When Bundler is configured to not generate CI files, an interactive prompt will be displayed and the answer will be used for the current rubygem project\.
+.
+.IP
+When Bundler is unconfigured, an interactive prompt will be displayed and the answer will be saved in Bundler\'s global config for future \fBbundle gem\fR use\.
+.
+.TP
+\fB\-\-linter\fR, \fB\-\-linter=rubocop\fR, \fB\-\-linter=standard\fR
+Specify the linter and code formatter that Bundler should add to the project\'s development dependencies\. Acceptable values are \fBrubocop\fR and \fBstandard\fR\. A configuration file will be generated in the project directory\. Given no option is specified:
+.
+.IP
+When Bundler is configured to add a linter, this defaults to Bundler\'s global config setting \fBgem\.linter\fR\.
+.
+.IP
+When Bundler is configured not to add a linter, an interactive prompt will be displayed and the answer will be used for the current rubygem project\.
+.
+.IP
+When Bundler is unconfigured, an interactive prompt will be displayed and the answer will be saved in Bundler\'s global config for future \fBbundle gem\fR use\.
+.
+.TP
+\fB\-e\fR, \fB\-\-edit[=EDITOR]\fR
+Open the resulting GEM_NAME\.gemspec in EDITOR, or the default editor if not specified\. The default is \fB$BUNDLER_EDITOR\fR, \fB$VISUAL\fR, or \fB$EDITOR\fR\.
+.
+.SH "SEE ALSO"
+.
+.IP "\(bu" 4
+bundle config(1) \fIbundle\-config\.1\.html\fR
+.
+.IP "" 0
+
diff --git a/lib/bundler/man/bundle-gem.1.ronn b/lib/bundler/man/bundle-gem.1.ronn
new file mode 100644
index 0000000000..61c741fb24
--- /dev/null
+++ b/lib/bundler/man/bundle-gem.1.ronn
@@ -0,0 +1,117 @@
+bundle-gem(1) -- Generate a project skeleton for creating a rubygem
+====================================================================
+
+## SYNOPSIS
+
+`bundle gem` <GEM_NAME> [OPTIONS]
+
+## DESCRIPTION
+
+Generates a directory named `GEM_NAME` with a `Rakefile`, `GEM_NAME.gemspec`,
+and other supporting files and directories that can be used to develop a
+rubygem with that name.
+
+Run `rake -T` in the resulting project for a list of Rake tasks that can be used
+to test and publish the gem to rubygems.org.
+
+The generated project skeleton can be customized with OPTIONS, as explained
+below. Note that these options can also be specified via Bundler's global
+configuration file using the following names:
+
+* `gem.coc`
+* `gem.mit`
+* `gem.test`
+
+## OPTIONS
+
+* `--exe` or `-b` or `--bin`:
+  Specify that Bundler should create a binary executable (as `exe/GEM_NAME`)
+  in the generated rubygem project. This binary will also be added to the
+  `GEM_NAME.gemspec` manifest. This behavior is disabled by default.
+
+* `--no-exe`:
+  Do not create a binary (overrides `--exe` specified in the global config).
+
+* `--coc`:
+  Add a `CODE_OF_CONDUCT.md` file to the root of the generated project. If
+  this option is unspecified, an interactive prompt will be displayed and the
+  answer will be saved in Bundler's global config for future `bundle gem` use.
+
+* `--no-coc`:
+  Do not create a `CODE_OF_CONDUCT.md` (overrides `--coc` specified in the
+  global config).
+
+* `--ext`:
+  Add boilerplate for C extension code to the generated project. This behavior
+  is disabled by default.
+
+* `--no-ext`:
+  Do not add C extension code (overrides `--ext` specified in the global
+  config).
+
+* `--mit`:
+  Add an MIT license to a `LICENSE.txt` file in the root of the generated
+  project. Your name from the global git config is used for the copyright
+  statement. If this option is unspecified, an interactive prompt will be
+  displayed and the answer will be saved in Bundler's global config for future
+  `bundle gem` use.
+
+* `--no-mit`:
+  Do not create a `LICENSE.txt` (overrides `--mit` specified in the global
+  config).
+
+* `-t`, `--test=minitest`, `--test=rspec`, `--test=test-unit`:
+  Specify the test framework that Bundler should use when generating the
+  project. Acceptable values are `minitest`, `rspec` and `test-unit`. The
+  `GEM_NAME.gemspec` will be configured and a skeleton test/spec directory will
+  be created based on this option. Given no option is specified:
+
+  When Bundler is configured to generate tests, this defaults to Bundler's
+  global config setting `gem.test`.
+
+  When Bundler is configured to not generate tests, an interactive prompt will
+  be displayed and the answer will be used for the current rubygem project.
+
+  When Bundler is unconfigured, an interactive prompt will be displayed and
+  the answer will be saved in Bundler's global config for future `bundle gem`
+  use.
+
+* `--ci`, `--ci=github`, `--ci=travis`, `--ci=gitlab`, `--ci=circle`:
+  Specify the continuous integration service that Bundler should use when
+  generating the project. Acceptable values are `github`, `travis`, `gitlab`
+  and `circle`. A configuration file will be generated in the project directory.
+  Given no option is specified:
+
+  When Bundler is configured to generate CI files, this defaults to Bundler's
+  global config setting `gem.ci`.
+
+  When Bundler is configured to not generate CI files, an interactive prompt
+  will be displayed and the answer will be used for the current rubygem project.
+
+  When Bundler is unconfigured, an interactive prompt will be displayed and
+  the answer will be saved in Bundler's global config for future `bundle gem`
+  use.
+
+* `--linter`, `--linter=rubocop`, `--linter=standard`:
+  Specify the linter and code formatter that Bundler should add to the
+  project's development dependencies. Acceptable values are `rubocop` and
+  `standard`. A configuration file will be generated in the project directory.
+  Given no option is specified:
+
+  When Bundler is configured to add a linter, this defaults to Bundler's
+  global config setting `gem.linter`.
+
+  When Bundler is configured not to add a linter, an interactive prompt
+  will be displayed and the answer will be used for the current rubygem project.
+
+  When Bundler is unconfigured, an interactive prompt will be displayed and
+  the answer will be saved in Bundler's global config for future `bundle gem`
+  use.
+
+* `-e`, `--edit[=EDITOR]`:
+  Open the resulting GEM_NAME.gemspec in EDITOR, or the default editor if not
+  specified. The default is `$BUNDLER_EDITOR`, `$VISUAL`, or `$EDITOR`.
+
+## SEE ALSO
+
+* [bundle config(1)](bundle-config.1.html)
diff --git a/lib/bundler/man/bundle-info.1 b/lib/bundler/man/bundle-info.1
new file mode 100644
index 0000000000..9e1400ec56
--- /dev/null
+++ b/lib/bundler/man/bundle-info.1
@@ -0,0 +1,20 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "BUNDLE\-INFO" "1" "December 2021" "" ""
+.
+.SH "NAME"
+\fBbundle\-info\fR \- Show information for the given gem in your bundle
+.
+.SH "SYNOPSIS"
+\fBbundle info\fR [GEM] [\-\-path]
+.
+.SH "DESCRIPTION"
+Print the basic information about the provided GEM such as homepage, version, path and summary\.
+.
+.SH "OPTIONS"
+.
+.TP
+\fB\-\-path\fR
+Print the path of the given gem
+
diff --git a/lib/bundler/man/bundle-info.1.ronn b/lib/bundler/man/bundle-info.1.ronn
new file mode 100644
index 0000000000..47e457aa3c
--- /dev/null
+++ b/lib/bundler/man/bundle-info.1.ronn
@@ -0,0 +1,17 @@
+bundle-info(1) -- Show information for the given gem in your bundle
+=========================================================================
+
+## SYNOPSIS
+
+`bundle info` [GEM]
+              [--path]
+
+## DESCRIPTION
+
+Print the basic information about the provided GEM such as homepage, version,
+path and summary.
+
+## OPTIONS
+
+* `--path`:
+Print the path of the given gem
diff --git a/lib/bundler/man/bundle-init.1 b/lib/bundler/man/bundle-init.1
new file mode 100644
index 0000000000..612d16031c
--- /dev/null
+++ b/lib/bundler/man/bundle-init.1
@@ -0,0 +1,25 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "BUNDLE\-INIT" "1" "December 2021" "" ""
+.
+.SH "NAME"
+\fBbundle\-init\fR \- Generates a Gemfile into the current working directory
+.
+.SH "SYNOPSIS"
+\fBbundle init\fR [\-\-gemspec=FILE]
+.
+.SH "DESCRIPTION"
+Init generates a default [\fBGemfile(5)\fR][Gemfile(5)] in the current working directory\. When adding a [\fBGemfile(5)\fR][Gemfile(5)] to a gem with a gemspec, the \fB\-\-gemspec\fR option will automatically add each dependency listed in the gemspec file to the newly created [\fBGemfile(5)\fR][Gemfile(5)]\.
+.
+.SH "OPTIONS"
+.
+.TP
+\fB\-\-gemspec\fR
+Use the specified \.gemspec to create the [\fBGemfile(5)\fR][Gemfile(5)]
+.
+.SH "FILES"
+Included in the default [\fBGemfile(5)\fR][Gemfile(5)] generated is the line \fB# frozen_string_literal: true\fR\. This is a magic comment supported for the first time in Ruby 2\.3\. The presence of this line results in all string literals in the file being implicitly frozen\.
+.
+.SH "SEE ALSO"
+Gemfile(5) \fIhttps://bundler\.io/man/gemfile\.5\.html\fR
diff --git a/lib/bundler/man/bundle-init.1.ronn b/lib/bundler/man/bundle-init.1.ronn
new file mode 100644
index 0000000000..9d3d97deea
--- /dev/null
+++ b/lib/bundler/man/bundle-init.1.ronn
@@ -0,0 +1,29 @@
+bundle-init(1) -- Generates a Gemfile into the current working directory
+========================================================================
+
+## SYNOPSIS
+
+`bundle init` [--gemspec=FILE]
+
+## DESCRIPTION
+
+Init generates a default [`Gemfile(5)`][Gemfile(5)] in the current working directory. When
+adding a [`Gemfile(5)`][Gemfile(5)] to a gem with a gemspec, the `--gemspec` option will
+automatically add each dependency listed in the gemspec file to the newly
+created [`Gemfile(5)`][Gemfile(5)].
+
+## OPTIONS
+
+* `--gemspec`:
+  Use the specified .gemspec to create the [`Gemfile(5)`][Gemfile(5)]
+
+## FILES
+
+Included in the default [`Gemfile(5)`][Gemfile(5)]
+generated is the line `# frozen_string_literal: true`. This is a magic comment
+supported for the first time in Ruby 2.3. The presence of this line
+results in all string literals in the file being implicitly frozen.
+
+## SEE ALSO
+
+[Gemfile(5)](https://bundler.io/man/gemfile.5.html)
diff --git a/lib/bundler/man/bundle-inject.1 b/lib/bundler/man/bundle-inject.1
new file mode 100644
index 0000000000..ded4d6d64b
--- /dev/null
+++ b/lib/bundler/man/bundle-inject.1
@@ -0,0 +1,33 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "BUNDLE\-INJECT" "1" "December 2021" "" ""
+.
+.SH "NAME"
+\fBbundle\-inject\fR \- Add named gem(s) with version requirements to Gemfile
+.
+.SH "SYNOPSIS"
+\fBbundle inject\fR [GEM] [VERSION]
+.
+.SH "DESCRIPTION"
+Adds the named gem(s) with their version requirements to the resolved [\fBGemfile(5)\fR][Gemfile(5)]\.
+.
+.P
+This command will add the gem to both your [\fBGemfile(5)\fR][Gemfile(5)] and Gemfile\.lock if it isn\'t listed yet\.
+.
+.P
+Example:
+.
+.IP "" 4
+.
+.nf
+
+bundle install
+bundle inject \'rack\' \'> 0\'
+.
+.fi
+.
+.IP "" 0
+.
+.P
+This will inject the \'rack\' gem with a version greater than 0 in your [\fBGemfile(5)\fR][Gemfile(5)] and Gemfile\.lock
diff --git a/lib/bundler/man/bundle-inject.1.ronn b/lib/bundler/man/bundle-inject.1.ronn
new file mode 100644
index 0000000000..f454341896
--- /dev/null
+++ b/lib/bundler/man/bundle-inject.1.ronn
@@ -0,0 +1,22 @@
+bundle-inject(1) -- Add named gem(s) with version requirements to Gemfile
+=========================================================================
+
+## SYNOPSIS
+
+`bundle inject` [GEM] [VERSION]
+
+## DESCRIPTION
+
+Adds the named gem(s) with their version requirements to the resolved
+[`Gemfile(5)`][Gemfile(5)].
+
+This command will add the gem to both your [`Gemfile(5)`][Gemfile(5)] and Gemfile.lock if it
+isn't listed yet.
+
+Example:
+
+    bundle install
+    bundle inject 'rack' '> 0'
+
+This will inject the 'rack' gem with a version greater than 0 in your
+[`Gemfile(5)`][Gemfile(5)] and Gemfile.lock
diff --git a/lib/bundler/man/bundle-install.1 b/lib/bundler/man/bundle-install.1
new file mode 100644
index 0000000000..6ccf100b4e
--- /dev/null
+++ b/lib/bundler/man/bundle-install.1
@@ -0,0 +1,338 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "BUNDLE\-INSTALL" "1" "December 2021" "" ""
+.
+.SH "NAME"
+\fBbundle\-install\fR \- Install the dependencies specified in your Gemfile
+.
+.SH "SYNOPSIS"
+\fBbundle install\fR [\-\-binstubs[=DIRECTORY]] [\-\-clean] [\-\-deployment] [\-\-frozen] [\-\-full\-index] [\-\-gemfile=GEMFILE] [\-\-jobs=NUMBER] [\-\-local] [\-\-no\-cache] [\-\-no\-prune] [\-\-path PATH] [\-\-quiet] [\-\-redownload] [\-\-retry=NUMBER] [\-\-shebang] [\-\-standalone[=GROUP[ GROUP\.\.\.]]] [\-\-system] [\-\-trust\-policy=POLICY] [\-\-with=GROUP[ GROUP\.\.\.]] [\-\-without=GROUP[ GROUP\.\.\.]]
+.
+.SH "DESCRIPTION"
+Install the gems specified in your Gemfile(5)\. If this is the first time you run bundle install (and a \fBGemfile\.lock\fR does not exist), Bundler will fetch all remote sources, resolve dependencies and install all needed gems\.
+.
+.P
+If a \fBGemfile\.lock\fR does exist, and you have not updated your Gemfile(5), Bundler will fetch all remote sources, but use the dependencies specified in the \fBGemfile\.lock\fR instead of resolving dependencies\.
+.
+.P
+If a \fBGemfile\.lock\fR does exist, and you have updated your Gemfile(5), Bundler will use the dependencies in the \fBGemfile\.lock\fR for all gems that you did not update, but will re\-resolve the dependencies of gems that you did update\. You can find more information about this update process below under \fICONSERVATIVE UPDATING\fR\.
+.
+.SH "OPTIONS"
+The \fB\-\-clean\fR, \fB\-\-deployment\fR, \fB\-\-frozen\fR, \fB\-\-no\-prune\fR, \fB\-\-path\fR, \fB\-\-shebang\fR, \fB\-\-system\fR, \fB\-\-without\fR and \fB\-\-with\fR options are deprecated because they only make sense if they are applied to every subsequent \fBbundle install\fR run automatically and that requires \fBbundler\fR to silently remember them\. Since \fBbundler\fR will no longer remember CLI flags in future versions, \fBbundle config\fR (see bundle\-config(1)) should be used to apply them permanently\.
+.
+.TP
+\fB\-\-binstubs[=<directory>]\fR
+Binstubs are scripts that wrap around executables\. Bundler creates a small Ruby file (a binstub) that loads Bundler, runs the command, and puts it in \fBbin/\fR\. This lets you link the binstub inside of an application to the exact gem version the application needs\.
+.
+.IP
+Creates a directory (defaults to \fB~/bin\fR) and places any executables from the gem there\. These executables run in Bundler\'s context\. If used, you might add this directory to your environment\'s \fBPATH\fR variable\. For instance, if the \fBrails\fR gem comes with a \fBrails\fR executable, this flag will create a \fBbin/rails\fR executable that ensures that all referred dependencies will be resolved using the bundled gems\.
+.
+.TP
+\fB\-\-clean\fR
+On finishing the installation Bundler is going to remove any gems not present in the current Gemfile(5)\. Don\'t worry, gems currently in use will not be removed\.
+.
+.IP
+This option is deprecated in favor of the \fBclean\fR setting\.
+.
+.TP
+\fB\-\-deployment\fR
+In \fIdeployment mode\fR, Bundler will \'roll\-out\' the bundle for production or CI use\. Please check carefully if you want to have this option enabled in your development environment\.
+.
+.IP
+This option is deprecated in favor of the \fBdeployment\fR setting\.
+.
+.TP
+\fB\-\-redownload\fR
+Force download every gem, even if the required versions are already available locally\.
+.
+.TP
+\fB\-\-frozen\fR
+Do not allow the Gemfile\.lock to be updated after this install\. Exits non\-zero if there are going to be changes to the Gemfile\.lock\.
+.
+.IP
+This option is deprecated in favor of the \fBfrozen\fR setting\.
+.
+.TP
+\fB\-\-full\-index\fR
+Bundler will not call Rubygems\' API endpoint (default) but download and cache a (currently big) index file of all gems\. Performance can be improved for large bundles that seldom change by enabling this option\.
+.
+.TP
+\fB\-\-gemfile=<gemfile>\fR
+The location of the Gemfile(5) which Bundler should use\. This defaults to a Gemfile(5) in the current working directory\. In general, Bundler will assume that the location of the Gemfile(5) is also the project\'s root and will try to find \fBGemfile\.lock\fR and \fBvendor/cache\fR relative to this location\.
+.
+.TP
+\fB\-\-jobs=[<number>]\fR, \fB\-j[<number>]\fR
+The maximum number of parallel download and install jobs\. The default is \fB1\fR\.
+.
+.TP
+\fB\-\-local\fR
+Do not attempt to connect to \fBrubygems\.org\fR\. Instead, Bundler will use the gems already present in Rubygems\' cache or in \fBvendor/cache\fR\. Note that if an appropriate platform\-specific gem exists on \fBrubygems\.org\fR it will not be found\.
+.
+.TP
+\fB\-\-no\-cache\fR
+Do not update the cache in \fBvendor/cache\fR with the newly bundled gems\. This does not remove any gems in the cache but keeps the newly bundled gems from being cached during the install\.
+.
+.TP
+\fB\-\-no\-prune\fR
+Don\'t remove stale gems from the cache when the installation finishes\.
+.
+.IP
+This option is deprecated in favor of the \fBno_prune\fR setting\.
+.
+.TP
+\fB\-\-path=<path>\fR
+The location to install the specified gems to\. This defaults to Rubygems\' setting\. Bundler shares this location with Rubygems, \fBgem install \.\.\.\fR will have gem installed there, too\. Therefore, gems installed without a \fB\-\-path \.\.\.\fR setting will show up by calling \fBgem list\fR\. Accordingly, gems installed to other locations will not get listed\.
+.
+.IP
+This option is deprecated in favor of the \fBpath\fR setting\.
+.
+.TP
+\fB\-\-quiet\fR
+Do not print progress information to the standard output\. Instead, Bundler will exit using a status code (\fB$?\fR)\.
+.
+.TP
+\fB\-\-retry=[<number>]\fR
+Retry failed network or git requests for \fInumber\fR times\.
+.
+.TP
+\fB\-\-shebang=<ruby\-executable>\fR
+Uses the specified ruby executable (usually \fBruby\fR) to execute the scripts created with \fB\-\-binstubs\fR\. In addition, if you use \fB\-\-binstubs\fR together with \fB\-\-shebang jruby\fR these executables will be changed to execute \fBjruby\fR instead\.
+.
+.IP
+This option is deprecated in favor of the \fBshebang\fR setting\.
+.
+.TP
+\fB\-\-standalone[=<list>]\fR
+Makes a bundle that can work without depending on Rubygems or Bundler at runtime\. A space separated list of groups to install has to be specified\. Bundler creates a directory named \fBbundle\fR and installs the bundle there\. It also generates a \fBbundle/bundler/setup\.rb\fR file to replace Bundler\'s own setup in the manner required\. Using this option implicitly sets \fBpath\fR, which is a [remembered option][REMEMBERED OPTIONS]\.
+.
+.TP
+\fB\-\-system\fR
+Installs the gems specified in the bundle to the system\'s Rubygems location\. This overrides any previous configuration of \fB\-\-path\fR\.
+.
+.IP
+This option is deprecated in favor of the \fBsystem\fR setting\.
+.
+.TP
+\fB\-\-trust\-policy=[<policy>]\fR
+Apply the Rubygems security policy \fIpolicy\fR, where policy is one of \fBHighSecurity\fR, \fBMediumSecurity\fR, \fBLowSecurity\fR, \fBAlmostNoSecurity\fR, or \fBNoSecurity\fR\. For more details, please see the Rubygems signing documentation linked below in \fISEE ALSO\fR\.
+.
+.TP
+\fB\-\-with=<list>\fR
+A space\-separated list of groups referencing gems to install\. If an optional group is given it is installed\. If a group is given that is in the remembered list of groups given to \-\-without, it is removed from that list\.
+.
+.IP
+This option is deprecated in favor of the \fBwith\fR setting\.
+.
+.TP
+\fB\-\-without=<list>\fR
+A space\-separated list of groups referencing gems to skip during installation\. If a group is given that is in the remembered list of groups given to \-\-with, it is removed from that list\.
+.
+.IP
+This option is deprecated in favor of the \fBwithout\fR setting\.
+.
+.SH "DEPLOYMENT MODE"
+Bundler\'s defaults are optimized for development\. To switch to defaults optimized for deployment and for CI, use the \fB\-\-deployment\fR flag\. Do not activate deployment mode on development machines, as it will cause an error when the Gemfile(5) is modified\.
+.
+.IP "1." 4
+A \fBGemfile\.lock\fR is required\.
+.
+.IP
+To ensure that the same versions of the gems you developed with and tested with are also used in deployments, a \fBGemfile\.lock\fR is required\.
+.
+.IP
+This is mainly to ensure that you remember to check your \fBGemfile\.lock\fR into version control\.
+.
+.IP "2." 4
+The \fBGemfile\.lock\fR must be up to date
+.
+.IP
+In development, you can modify your Gemfile(5) and re\-run \fBbundle install\fR to \fIconservatively update\fR your \fBGemfile\.lock\fR snapshot\.
+.
+.IP
+In deployment, your \fBGemfile\.lock\fR should be up\-to\-date with changes made in your Gemfile(5)\.
+.
+.IP "3." 4
+Gems are installed to \fBvendor/bundle\fR not your default system location
+.
+.IP
+In development, it\'s convenient to share the gems used in your application with other applications and other scripts that run on the system\.
+.
+.IP
+In deployment, isolation is a more important default\. In addition, the user deploying the application may not have permission to install gems to the system, or the web server may not have permission to read them\.
+.
+.IP
+As a result, \fBbundle install \-\-deployment\fR installs gems to the \fBvendor/bundle\fR directory in the application\. This may be overridden using the \fB\-\-path\fR option\.
+.
+.IP "" 0
+.
+.SH "SUDO USAGE"
+By default, Bundler installs gems to the same location as \fBgem install\fR\.
+.
+.P
+In some cases, that location may not be writable by your Unix user\. In that case, Bundler will stage everything in a temporary directory, then ask you for your \fBsudo\fR password in order to copy the gems into their system location\.
+.
+.P
+From your perspective, this is identical to installing the gems directly into the system\.
+.
+.P
+You should never use \fBsudo bundle install\fR\. This is because several other steps in \fBbundle install\fR must be performed as the current user:
+.
+.IP "\(bu" 4
+Updating your \fBGemfile\.lock\fR
+.
+.IP "\(bu" 4
+Updating your \fBvendor/cache\fR, if necessary
+.
+.IP "\(bu" 4
+Checking out private git repositories using your user\'s SSH keys
+.
+.IP "" 0
+.
+.P
+Of these three, the first two could theoretically be performed by \fBchown\fRing the resulting files to \fB$SUDO_USER\fR\. The third, however, can only be performed by invoking the \fBgit\fR command as the current user\. Therefore, git gems are downloaded and installed into \fB~/\.bundle\fR rather than $GEM_HOME or $BUNDLE_PATH\.
+.
+.P
+As a result, you should run \fBbundle install\fR as the current user, and Bundler will ask for your password if it is needed to put the gems into their final location\.
+.
+.SH "INSTALLING GROUPS"
+By default, \fBbundle install\fR will install all gems in all groups in your Gemfile(5), except those declared for a different platform\.
+.
+.P
+However, you can explicitly tell Bundler to skip installing certain groups with the \fB\-\-without\fR option\. This option takes a space\-separated list of groups\.
+.
+.P
+While the \fB\-\-without\fR option will skip \fIinstalling\fR the gems in the specified groups, it will still \fIdownload\fR those gems and use them to resolve the dependencies of every gem in your Gemfile(5)\.
+.
+.P
+This is so that installing a different set of groups on another machine (such as a production server) will not change the gems and versions that you have already developed and tested against\.
+.
+.P
+\fBBundler offers a rock\-solid guarantee that the third\-party code you are running in development and testing is also the third\-party code you are running in production\. You can choose to exclude some of that code in different environments, but you will never be caught flat\-footed by different versions of third\-party code being used in different environments\.\fR
+.
+.P
+For a simple illustration, consider the following Gemfile(5):
+.
+.IP "" 4
+.
+.nf
+
+source \'https://rubygems\.org\'
+
+gem \'sinatra\'
+
+group :production do
+  gem \'rack\-perftools\-profiler\'
+end
+.
+.fi
+.
+.IP "" 0
+.
+.P
+In this case, \fBsinatra\fR depends on any version of Rack (\fB>= 1\.0\fR), while \fBrack\-perftools\-profiler\fR depends on 1\.x (\fB~> 1\.0\fR)\.
+.
+.P
+When you run \fBbundle install \-\-without production\fR in development, we look at the dependencies of \fBrack\-perftools\-profiler\fR as well\. That way, you do not spend all your time developing against Rack 2\.0, using new APIs unavailable in Rack 1\.x, only to have Bundler switch to Rack 1\.2 when the \fBproduction\fR group \fIis\fR used\.
+.
+.P
+This should not cause any problems in practice, because we do not attempt to \fBinstall\fR the gems in the excluded groups, and only evaluate as part of the dependency resolution process\.
+.
+.P
+This also means that you cannot include different versions of the same gem in different groups, because doing so would result in different sets of dependencies used in development and production\. Because of the vagaries of the dependency resolution process, this usually affects more than the gems you list in your Gemfile(5), and can (surprisingly) radically change the gems you are using\.
+.
+.SH "THE GEMFILE\.LOCK"
+When you run \fBbundle install\fR, Bundler will persist the full names and versions of all gems that you used (including dependencies of the gems specified in the Gemfile(5)) into a file called \fBGemfile\.lock\fR\.
+.
+.P
+Bundler uses this file in all subsequent calls to \fBbundle install\fR, which guarantees that you always use the same exact code, even as your application moves across machines\.
+.
+.P
+Because of the way dependency resolution works, even a seemingly small change (for instance, an update to a point\-release of a dependency of a gem in your Gemfile(5)) can result in radically different gems being needed to satisfy all dependencies\.
+.
+.P
+As a result, you \fBSHOULD\fR check your \fBGemfile\.lock\fR into version control, in both applications and gems\. If you do not, every machine that checks out your repository (including your production server) will resolve all dependencies again, which will result in different versions of third\-party code being used if \fBany\fR of the gems in the Gemfile(5) or any of their dependencies have been updated\.
+.
+.P
+When Bundler first shipped, the \fBGemfile\.lock\fR was included in the \fB\.gitignore\fR file included with generated gems\. Over time, however, it became clear that this practice forces the pain of broken dependencies onto new contributors, while leaving existing contributors potentially unaware of the problem\. Since \fBbundle install\fR is usually the first step towards a contribution, the pain of broken dependencies would discourage new contributors from contributing\. As a result, we have revised our guidance for gem authors to now recommend checking in the lock for gems\.
+.
+.SH "CONSERVATIVE UPDATING"
+When you make a change to the Gemfile(5) and then run \fBbundle install\fR, Bundler will update only the gems that you modified\.
+.
+.P
+In other words, if a gem that you \fBdid not modify\fR worked before you called \fBbundle install\fR, it will continue to use the exact same versions of all dependencies as it used before the update\.
+.
+.P
+Let\'s take a look at an example\. Here\'s your original Gemfile(5):
+.
+.IP "" 4
+.
+.nf
+
+source \'https://rubygems\.org\'
+
+gem \'actionpack\', \'2\.3\.8\'
+gem \'activemerchant\'
+.
+.fi
+.
+.IP "" 0
+.
+.P
+In this case, both \fBactionpack\fR and \fBactivemerchant\fR depend on \fBactivesupport\fR\. The \fBactionpack\fR gem depends on \fBactivesupport 2\.3\.8\fR and \fBrack ~> 1\.1\.0\fR, while the \fBactivemerchant\fR gem depends on \fBactivesupport >= 2\.3\.2\fR, \fBbraintree >= 2\.0\.0\fR, and \fBbuilder >= 2\.0\.0\fR\.
+.
+.P
+When the dependencies are first resolved, Bundler will select \fBactivesupport 2\.3\.8\fR, which satisfies the requirements of both gems in your Gemfile(5)\.
+.
+.P
+Next, you modify your Gemfile(5) to:
+.
+.IP "" 4
+.
+.nf
+
+source \'https://rubygems\.org\'
+
+gem \'actionpack\', \'3\.0\.0\.rc\'
+gem \'activemerchant\'
+.
+.fi
+.
+.IP "" 0
+.
+.P
+The \fBactionpack 3\.0\.0\.rc\fR gem has a number of new dependencies, and updates the \fBactivesupport\fR dependency to \fB= 3\.0\.0\.rc\fR and the \fBrack\fR dependency to \fB~> 1\.2\.1\fR\.
+.
+.P
+When you run \fBbundle install\fR, Bundler notices that you changed the \fBactionpack\fR gem, but not the \fBactivemerchant\fR gem\. It evaluates the gems currently being used to satisfy its requirements:
+.
+.TP
+\fBactivesupport 2\.3\.8\fR
+also used to satisfy a dependency in \fBactivemerchant\fR, which is not being updated
+.
+.TP
+\fBrack ~> 1\.1\.0\fR
+not currently being used to satisfy another dependency
+.
+.P
+Because you did not explicitly ask to update \fBactivemerchant\fR, you would not expect it to suddenly stop working after updating \fBactionpack\fR\. However, satisfying the new \fBactivesupport 3\.0\.0\.rc\fR dependency of actionpack requires updating one of its dependencies\.
+.
+.P
+Even though \fBactivemerchant\fR declares a very loose dependency that theoretically matches \fBactivesupport 3\.0\.0\.rc\fR, Bundler treats gems in your Gemfile(5) that have not changed as an atomic unit together with their dependencies\. In this case, the \fBactivemerchant\fR dependency is treated as \fBactivemerchant 1\.7\.1 + activesupport 2\.3\.8\fR, so \fBbundle install\fR will report that it cannot update \fBactionpack\fR\.
+.
+.P
+To explicitly update \fBactionpack\fR, including its dependencies which other gems in the Gemfile(5) still depend on, run \fBbundle update actionpack\fR (see \fBbundle update(1)\fR)\.
+.
+.P
+\fBSummary\fR: In general, after making a change to the Gemfile(5) , you should first try to run \fBbundle install\fR, which will guarantee that no other gem in the Gemfile(5) is impacted by the change\. If that does not work, run bundle update(1) \fIbundle\-update\.1\.html\fR\.
+.
+.SH "SEE ALSO"
+.
+.IP "\(bu" 4
+Gem install docs \fIhttp://guides\.rubygems\.org/rubygems\-basics/#installing\-gems\fR
+.
+.IP "\(bu" 4
+Rubygems signing docs \fIhttp://guides\.rubygems\.org/security/\fR
+.
+.IP "" 0
+
diff --git a/lib/bundler/man/bundle-install.1.ronn b/lib/bundler/man/bundle-install.1.ronn
new file mode 100644
index 0000000000..5ea777f1d4
--- /dev/null
+++ b/lib/bundler/man/bundle-install.1.ronn
@@ -0,0 +1,405 @@
+bundle-install(1) -- Install the dependencies specified in your Gemfile
+=======================================================================
+
+## SYNOPSIS
+
+`bundle install` [--binstubs[=DIRECTORY]]
+                 [--clean]
+                 [--deployment]
+                 [--frozen]
+                 [--full-index]
+                 [--gemfile=GEMFILE]
+                 [--jobs=NUMBER]
+                 [--local]
+                 [--no-cache]
+                 [--no-prune]
+                 [--path PATH]
+                 [--quiet]
+                 [--redownload]
+                 [--retry=NUMBER]
+                 [--shebang]
+                 [--standalone[=GROUP[ GROUP...]]]
+                 [--system]
+                 [--trust-policy=POLICY]
+                 [--with=GROUP[ GROUP...]]
+                 [--without=GROUP[ GROUP...]]
+
+## DESCRIPTION
+
+Install the gems specified in your Gemfile(5). If this is the first
+time you run bundle install (and a `Gemfile.lock` does not exist),
+Bundler will fetch all remote sources, resolve dependencies and
+install all needed gems.
+
+If a `Gemfile.lock` does exist, and you have not updated your Gemfile(5),
+Bundler will fetch all remote sources, but use the dependencies
+specified in the `Gemfile.lock` instead of resolving dependencies.
+
+If a `Gemfile.lock` does exist, and you have updated your Gemfile(5),
+Bundler will use the dependencies in the `Gemfile.lock` for all gems
+that you did not update, but will re-resolve the dependencies of
+gems that you did update. You can find more information about this
+update process below under [CONSERVATIVE UPDATING][].
+
+## OPTIONS
+
+The `--clean`, `--deployment`, `--frozen`, `--no-prune`, `--path`, `--shebang`,
+`--system`, `--without` and `--with` options are deprecated because they only
+make sense if they are applied to every subsequent `bundle install` run
+automatically and that requires `bundler` to silently remember them. Since
+`bundler` will no longer remember CLI flags in future versions, `bundle config`
+(see bundle-config(1)) should be used to apply them permanently.
+
+* `--binstubs[=<directory>]`:
+  Binstubs are scripts that wrap around executables. Bundler creates a small Ruby
+  file (a binstub) that loads Bundler, runs the command, and puts it in `bin/`.
+  This lets you link the binstub inside of an application to the exact gem
+  version the application needs.
+
+  Creates a directory (defaults to `~/bin`) and places any executables from the
+  gem there. These executables run in Bundler's context. If used, you might add
+  this directory to your environment's `PATH` variable. For instance, if the
+  `rails` gem comes with a `rails` executable, this flag will create a
+  `bin/rails` executable that ensures that all referred dependencies will be
+  resolved using the bundled gems.
+
+* `--clean`:
+  On finishing the installation Bundler is going to remove any gems not present
+  in the current Gemfile(5). Don't worry, gems currently in use will not be
+  removed.
+
+  This option is deprecated in favor of the `clean` setting.
+
+* `--deployment`:
+  In [deployment mode][DEPLOYMENT MODE], Bundler will 'roll-out' the bundle for
+  production or CI use. Please check carefully if you want to have this option
+  enabled in your development environment.
+
+  This option is deprecated in favor of the `deployment` setting.
+
+* `--redownload`:
+  Force download every gem, even if the required versions are already available
+  locally.
+
+* `--frozen`:
+  Do not allow the Gemfile.lock to be updated after this install. Exits
+  non-zero if there are going to be changes to the Gemfile.lock.
+
+  This option is deprecated in favor of the `frozen` setting.
+
+* `--full-index`:
+  Bundler will not call Rubygems' API endpoint (default) but download and cache
+  a (currently big) index file of all gems. Performance can be improved for
+  large bundles that seldom change by enabling this option.
+
+* `--gemfile=<gemfile>`:
+  The location of the Gemfile(5) which Bundler should use. This defaults
+  to a Gemfile(5) in the current working directory. In general, Bundler
+  will assume that the location of the Gemfile(5) is also the project's
+  root and will try to find `Gemfile.lock` and `vendor/cache` relative
+  to this location.
+
+* `--jobs=[<number>]`, `-j[<number>]`:
+  The maximum number of parallel download and install jobs. The default
+  is `1`.
+
+* `--local`:
+  Do not attempt to connect to `rubygems.org`. Instead, Bundler will use the
+  gems already present in Rubygems' cache or in `vendor/cache`. Note that if an
+  appropriate platform-specific gem exists on `rubygems.org` it will not be
+  found.
+
+* `--no-cache`:
+  Do not update the cache in `vendor/cache` with the newly bundled gems. This
+  does not remove any gems in the cache but keeps the newly bundled gems from
+  being cached during the install.
+
+* `--no-prune`:
+  Don't remove stale gems from the cache when the installation finishes.
+
+  This option is deprecated in favor of the `no_prune` setting.
+
+* `--path=<path>`:
+  The location to install the specified gems to. This defaults to Rubygems'
+  setting. Bundler shares this location with Rubygems, `gem install ...` will
+  have gem installed there, too. Therefore, gems installed without a
+  `--path ...` setting will show up by calling `gem list`. Accordingly, gems
+  installed to other locations will not get listed.
+
+  This option is deprecated in favor of the `path` setting.
+
+* `--quiet`:
+  Do not print progress information to the standard output. Instead, Bundler
+  will exit using a status code (`$?`).
+
+* `--retry=[<number>]`:
+  Retry failed network or git requests for <number> times.
+
+* `--shebang=<ruby-executable>`:
+  Uses the specified ruby executable (usually `ruby`) to execute the scripts
+  created with `--binstubs`. In addition, if you use `--binstubs` together with
+  `--shebang jruby` these executables will be changed to execute `jruby`
+  instead.
+
+  This option is deprecated in favor of the `shebang` setting.
+
+* `--standalone[=<list>]`:
+  Makes a bundle that can work without depending on Rubygems or Bundler at
+  runtime. A space separated list of groups to install has to be specified.
+  Bundler creates a directory named `bundle` and installs the bundle there. It
+  also generates a `bundle/bundler/setup.rb` file to replace Bundler's own setup
+  in the manner required. Using this option implicitly sets `path`, which is a
+  [remembered option][REMEMBERED OPTIONS].
+
+* `--system`:
+  Installs the gems specified in the bundle to the system's Rubygems location.
+  This overrides any previous configuration of `--path`.
+
+  This option is deprecated in favor of the `system` setting.
+
+* `--trust-policy=[<policy>]`:
+  Apply the Rubygems security policy <policy>, where policy is one of
+  `HighSecurity`, `MediumSecurity`, `LowSecurity`, `AlmostNoSecurity`, or
+  `NoSecurity`. For more details, please see the Rubygems signing documentation
+  linked below in [SEE ALSO][].
+
+* `--with=<list>`:
+  A space-separated list of groups referencing gems to install. If an
+  optional group is given it is installed. If a group is given that is
+  in the remembered list of groups given to --without, it is removed
+  from that list.
+
+  This option is deprecated in favor of the `with` setting.
+
+* `--without=<list>`:
+  A space-separated list of groups referencing gems to skip during installation.
+  If a group is given that is in the remembered list of groups given
+  to --with, it is removed from that list.
+
+  This option is deprecated in favor of the `without` setting.
+
+## DEPLOYMENT MODE
+
+Bundler's defaults are optimized for development. To switch to
+defaults optimized for deployment and for CI, use the `--deployment`
+flag. Do not activate deployment mode on development machines, as it
+will cause an error when the Gemfile(5) is modified.
+
+1. A `Gemfile.lock` is required.
+
+   To ensure that the same versions of the gems you developed with
+   and tested with are also used in deployments, a `Gemfile.lock`
+   is required.
+
+   This is mainly to ensure that you remember to check your
+   `Gemfile.lock` into version control.
+
+2. The `Gemfile.lock` must be up to date
+
+   In development, you can modify your Gemfile(5) and re-run
+   `bundle install` to [conservatively update][CONSERVATIVE UPDATING]
+   your `Gemfile.lock` snapshot.
+
+   In deployment, your `Gemfile.lock` should be up-to-date with
+   changes made in your Gemfile(5).
+
+3. Gems are installed to `vendor/bundle` not your default system location
+
+   In development, it's convenient to share the gems used in your
+   application with other applications and other scripts that run on
+   the system.
+
+   In deployment, isolation is a more important default. In addition,
+   the user deploying the application may not have permission to install
+   gems to the system, or the web server may not have permission to
+   read them.
+
+   As a result, `bundle install --deployment` installs gems to
+   the `vendor/bundle` directory in the application. This may be
+   overridden using the `--path` option.
+
+## SUDO USAGE
+
+By default, Bundler installs gems to the same location as `gem install`.
+
+In some cases, that location may not be writable by your Unix user. In
+that case, Bundler will stage everything in a temporary directory,
+then ask you for your `sudo` password in order to copy the gems into
+their system location.
+
+From your perspective, this is identical to installing the gems
+directly into the system.
+
+You should never use `sudo bundle install`. This is because several
+other steps in `bundle install` must be performed as the current user:
+
+* Updating your `Gemfile.lock`
+* Updating your `vendor/cache`, if necessary
+* Checking out private git repositories using your user's SSH keys
+
+Of these three, the first two could theoretically be performed by
+`chown`ing the resulting files to `$SUDO_USER`. The third, however,
+can only be performed by invoking the `git` command as
+the current user. Therefore, git gems are downloaded and installed
+into `~/.bundle` rather than $GEM_HOME or $BUNDLE_PATH.
+
+As a result, you should run `bundle install` as the current user,
+and Bundler will ask for your password if it is needed to put the
+gems into their final location.
+
+## INSTALLING GROUPS
+
+By default, `bundle install` will install all gems in all groups
+in your Gemfile(5), except those declared for a different platform.
+
+However, you can explicitly tell Bundler to skip installing
+certain groups with the `--without` option. This option takes
+a space-separated list of groups.
+
+While the `--without` option will skip _installing_ the gems in the
+specified groups, it will still _download_ those gems and use them to
+resolve the dependencies of every gem in your Gemfile(5).
+
+This is so that installing a different set of groups on another
+ machine (such as a production server) will not change the
+gems and versions that you have already developed and tested against.
+
+`Bundler offers a rock-solid guarantee that the third-party
+code you are running in development and testing is also the
+third-party code you are running in production. You can choose
+to exclude some of that code in different environments, but you
+will never be caught flat-footed by different versions of
+third-party code being used in different environments.`
+
+For a simple illustration, consider the following Gemfile(5):
+
+    source 'https://rubygems.org'
+
+    gem 'sinatra'
+
+    group :production do
+      gem 'rack-perftools-profiler'
+    end
+
+In this case, `sinatra` depends on any version of Rack (`>= 1.0`), while
+`rack-perftools-profiler` depends on 1.x (`~> 1.0`).
+
+When you run `bundle install --without production` in development, we
+look at the dependencies of `rack-perftools-profiler` as well. That way,
+you do not spend all your time developing against Rack 2.0, using new
+APIs unavailable in Rack 1.x, only to have Bundler switch to Rack 1.2
+when the `production` group _is_ used.
+
+This should not cause any problems in practice, because we do not
+attempt to `install` the gems in the excluded groups, and only evaluate
+as part of the dependency resolution process.
+
+This also means that you cannot include different versions of the same
+gem in different groups, because doing so would result in different
+sets of dependencies used in development and production. Because of
+the vagaries of the dependency resolution process, this usually
+affects more than the gems you list in your Gemfile(5), and can
+(surprisingly) radically change the gems you are using.
+
+## THE GEMFILE.LOCK
+
+When you run `bundle install`, Bundler will persist the full names
+and versions of all gems that you used (including dependencies of
+the gems specified in the Gemfile(5)) into a file called `Gemfile.lock`.
+
+Bundler uses this file in all subsequent calls to `bundle install`,
+which guarantees that you always use the same exact code, even
+as your application moves across machines.
+
+Because of the way dependency resolution works, even a
+seemingly small change (for instance, an update to a point-release
+of a dependency of a gem in your Gemfile(5)) can result in radically
+different gems being needed to satisfy all dependencies.
+
+As a result, you `SHOULD` check your `Gemfile.lock` into version
+control, in both applications and gems. If you do not, every machine that
+checks out your repository (including your production server) will resolve all
+dependencies again, which will result in different versions of
+third-party code being used if `any` of the gems in the Gemfile(5)
+or any of their dependencies have been updated.
+
+When Bundler first shipped, the `Gemfile.lock` was included in the `.gitignore`
+file included with generated gems.  Over time, however, it became clear that
+this practice forces the pain of broken dependencies onto new contributors,
+while leaving existing contributors potentially unaware of the problem. Since
+`bundle install` is usually the first step towards a contribution, the pain of
+broken dependencies would discourage new contributors from contributing. As a
+result, we have revised our guidance for gem authors to now recommend checking
+in the lock for gems.
+
+## CONSERVATIVE UPDATING
+
+When you make a change to the Gemfile(5) and then run `bundle install`,
+Bundler will update only the gems that you modified.
+
+In other words, if a gem that you `did not modify` worked before
+you called `bundle install`, it will continue to use the exact
+same versions of all dependencies as it used before the update.
+
+Let's take a look at an example. Here's your original Gemfile(5):
+
+    source 'https://rubygems.org'
+
+    gem 'actionpack', '2.3.8'
+    gem 'activemerchant'
+
+In this case, both `actionpack` and `activemerchant` depend on
+`activesupport`. The `actionpack` gem depends on `activesupport 2.3.8`
+and `rack ~> 1.1.0`, while the `activemerchant` gem depends on
+`activesupport >= 2.3.2`, `braintree >= 2.0.0`, and `builder >= 2.0.0`.
+
+When the dependencies are first resolved, Bundler will select
+`activesupport 2.3.8`, which satisfies the requirements of both
+gems in your Gemfile(5).
+
+Next, you modify your Gemfile(5) to:
+
+    source 'https://rubygems.org'
+
+    gem 'actionpack', '3.0.0.rc'
+    gem 'activemerchant'
+
+The `actionpack 3.0.0.rc` gem has a number of new dependencies,
+and updates the `activesupport` dependency to `= 3.0.0.rc` and
+the `rack` dependency to `~> 1.2.1`.
+
+When you run `bundle install`, Bundler notices that you changed
+the `actionpack` gem, but not the `activemerchant` gem. It
+evaluates the gems currently being used to satisfy its requirements:
+
+  * `activesupport 2.3.8`:
+    also used to satisfy a dependency in `activemerchant`,
+    which is not being updated
+  * `rack ~> 1.1.0`:
+    not currently being used to satisfy another dependency
+
+Because you did not explicitly ask to update `activemerchant`,
+you would not expect it to suddenly stop working after updating
+`actionpack`. However, satisfying the new `activesupport 3.0.0.rc`
+dependency of actionpack requires updating one of its dependencies.
+
+Even though `activemerchant` declares a very loose dependency
+that theoretically matches `activesupport 3.0.0.rc`, Bundler treats
+gems in your Gemfile(5) that have not changed as an atomic unit
+together with their dependencies. In this case, the `activemerchant`
+dependency is treated as `activemerchant 1.7.1 + activesupport 2.3.8`,
+so `bundle install` will report that it cannot update `actionpack`.
+
+To explicitly update `actionpack`, including its dependencies
+which other gems in the Gemfile(5) still depend on, run
+`bundle update actionpack` (see `bundle update(1)`).
+
+`Summary`: In general, after making a change to the Gemfile(5) , you
+should first try to run `bundle install`, which will guarantee that no
+other gem in the Gemfile(5) is impacted by the change. If that
+does not work, run [bundle update(1)](bundle-update.1.html).
+
+## SEE ALSO
+
+* [Gem install docs](http://guides.rubygems.org/rubygems-basics/#installing-gems)
+* [Rubygems signing docs](http://guides.rubygems.org/security/)
diff --git a/lib/bundler/man/bundle-list.1 b/lib/bundler/man/bundle-list.1
new file mode 100644
index 0000000000..a697173af9
--- /dev/null
+++ b/lib/bundler/man/bundle-list.1
@@ -0,0 +1,50 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "BUNDLE\-LIST" "1" "December 2021" "" ""
+.
+.SH "NAME"
+\fBbundle\-list\fR \- List all the gems in the bundle
+.
+.SH "SYNOPSIS"
+\fBbundle list\fR [\-\-name\-only] [\-\-paths] [\-\-without\-group=GROUP[ GROUP\.\.\.]] [\-\-only\-group=GROUP[ GROUP\.\.\.]]
+.
+.SH "DESCRIPTION"
+Prints a list of all the gems in the bundle including their version\.
+.
+.P
+Example:
+.
+.P
+bundle list \-\-name\-only
+.
+.P
+bundle list \-\-paths
+.
+.P
+bundle list \-\-without\-group test
+.
+.P
+bundle list \-\-only\-group dev
+.
+.P
+bundle list \-\-only\-group dev test \-\-paths
+.
+.SH "OPTIONS"
+.
+.TP
+\fB\-\-name\-only\fR
+Print only the name of each gem\.
+.
+.TP
+\fB\-\-paths\fR
+Print the path to each gem in the bundle\.
+.
+.TP
+\fB\-\-without\-group=<list>\fR
+A space\-separated list of groups of gems to skip during printing\.
+.
+.TP
+\fB\-\-only\-group=<list>\fR
+A space\-separated list of groups of gems to print\.
+
diff --git a/lib/bundler/man/bundle-list.1.ronn b/lib/bundler/man/bundle-list.1.ronn
new file mode 100644
index 0000000000..dc058ecd5f
--- /dev/null
+++ b/lib/bundler/man/bundle-list.1.ronn
@@ -0,0 +1,33 @@
+bundle-list(1) -- List all the gems in the bundle
+=========================================================================
+
+## SYNOPSIS
+
+`bundle list` [--name-only] [--paths] [--without-group=GROUP[ GROUP...]] [--only-group=GROUP[ GROUP...]]
+
+## DESCRIPTION
+
+Prints a list of all the gems in the bundle including their version.
+
+Example:
+
+bundle list --name-only
+
+bundle list --paths
+
+bundle list --without-group test
+
+bundle list --only-group dev
+
+bundle list --only-group dev test --paths
+
+## OPTIONS
+
+* `--name-only`:
+  Print only the name of each gem.
+* `--paths`:
+  Print the path to each gem in the bundle.
+* `--without-group=<list>`:
+  A space-separated list of groups of gems to skip during printing.
+* `--only-group=<list>`:
+  A space-separated list of groups of gems to print.
diff --git a/lib/bundler/man/bundle-lock.1 b/lib/bundler/man/bundle-lock.1
new file mode 100644
index 0000000000..ef515b0337
--- /dev/null
+++ b/lib/bundler/man/bundle-lock.1
@@ -0,0 +1,84 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "BUNDLE\-LOCK" "1" "December 2021" "" ""
+.
+.SH "NAME"
+\fBbundle\-lock\fR \- Creates / Updates a lockfile without installing
+.
+.SH "SYNOPSIS"
+\fBbundle lock\fR [\-\-update] [\-\-local] [\-\-print] [\-\-lockfile=PATH] [\-\-full\-index] [\-\-add\-platform] [\-\-remove\-platform] [\-\-patch] [\-\-minor] [\-\-major] [\-\-strict] [\-\-conservative]
+.
+.SH "DESCRIPTION"
+Lock the gems specified in Gemfile\.
+.
+.SH "OPTIONS"
+.
+.TP
+\fB\-\-update=<*gems>\fR
+Ignores the existing lockfile\. Resolve then updates lockfile\. Taking a list of gems or updating all gems if no list is given\.
+.
+.TP
+\fB\-\-local\fR
+Do not attempt to connect to \fBrubygems\.org\fR\. Instead, Bundler will use the gems already present in Rubygems\' cache or in \fBvendor/cache\fR\. Note that if a appropriate platform\-specific gem exists on \fBrubygems\.org\fR it will not be found\.
+.
+.TP
+\fB\-\-print\fR
+Prints the lockfile to STDOUT instead of writing to the file system\.
+.
+.TP
+\fB\-\-lockfile=<path>\fR
+The path where the lockfile should be written to\.
+.
+.TP
+\fB\-\-full\-index\fR
+Fall back to using the single\-file index of all gems\.
+.
+.TP
+\fB\-\-add\-platform\fR
+Add a new platform to the lockfile, re\-resolving for the addition of that platform\.
+.
+.TP
+\fB\-\-remove\-platform\fR
+Remove a platform from the lockfile\.
+.
+.TP
+\fB\-\-patch\fR
+If updating, prefer updating only to next patch version\.
+.
+.TP
+\fB\-\-minor\fR
+If updating, prefer updating only to next minor version\.
+.
+.TP
+\fB\-\-major\fR
+If updating, prefer updating to next major version (default)\.
+.
+.TP
+\fB\-\-strict\fR
+If updating, do not allow any gem to be updated past latest \-\-patch | \-\-minor | \-\-major\.
+.
+.TP
+\fB\-\-conservative\fR
+If updating, use bundle install conservative update behavior and do not allow shared dependencies to be updated\.
+.
+.SH "UPDATING ALL GEMS"
+If you run \fBbundle lock\fR with \fB\-\-update\fR option without list of gems, bundler will ignore any previously installed gems and resolve all dependencies again based on the latest versions of all gems available in the sources\.
+.
+.SH "UPDATING A LIST OF GEMS"
+Sometimes, you want to update a single gem in the Gemfile(5), and leave the rest of the gems that you specified locked to the versions in the \fBGemfile\.lock\fR\.
+.
+.P
+For instance, you only want to update \fBnokogiri\fR, run \fBbundle lock \-\-update nokogiri\fR\.
+.
+.P
+Bundler will update \fBnokogiri\fR and any of its dependencies, but leave the rest of the gems that you specified locked to the versions in the \fBGemfile\.lock\fR\.
+.
+.SH "SUPPORTING OTHER PLATFORMS"
+If you want your bundle to support platforms other than the one you\'re running locally, you can run \fBbundle lock \-\-add\-platform PLATFORM\fR to add PLATFORM to the lockfile, force bundler to re\-resolve and consider the new platform when picking gems, all without needing to have a machine that matches PLATFORM handy to install those platform\-specific gems on\.
+.
+.P
+For a full explanation of gem platforms, see \fBgem help platform\fR\.
+.
+.SH "PATCH LEVEL OPTIONS"
+See bundle update(1) \fIbundle\-update\.1\.html\fR for details\.
diff --git a/lib/bundler/man/bundle-lock.1.ronn b/lib/bundler/man/bundle-lock.1.ronn
new file mode 100644
index 0000000000..3aa5920f5a
--- /dev/null
+++ b/lib/bundler/man/bundle-lock.1.ronn
@@ -0,0 +1,94 @@
+bundle-lock(1) -- Creates / Updates a lockfile without installing
+=================================================================
+
+## SYNOPSIS
+
+`bundle lock` [--update]
+              [--local]
+              [--print]
+              [--lockfile=PATH]
+              [--full-index]
+              [--add-platform]
+              [--remove-platform]
+              [--patch]
+              [--minor]
+              [--major]
+              [--strict]
+              [--conservative]
+
+## DESCRIPTION
+
+Lock the gems specified in Gemfile.
+
+## OPTIONS
+
+* `--update=<*gems>`:
+  Ignores the existing lockfile. Resolve then updates lockfile. Taking a list
+  of gems or updating all gems if no list is given.
+
+* `--local`:
+  Do not attempt to connect to `rubygems.org`. Instead, Bundler will use the
+  gems already present in Rubygems' cache or in `vendor/cache`. Note that if a
+  appropriate platform-specific gem exists on `rubygems.org` it will not be
+  found.
+
+* `--print`:
+  Prints the lockfile to STDOUT instead of writing to the file system.
+
+* `--lockfile=<path>`:
+  The path where the lockfile should be written to.
+
+* `--full-index`:
+  Fall back to using the single-file index of all gems.
+
+* `--add-platform`:
+  Add a new platform to the lockfile, re-resolving for the addition of that
+  platform.
+
+* `--remove-platform`:
+  Remove a platform from the lockfile.
+
+* `--patch`:
+  If updating, prefer updating only to next patch version.
+
+* `--minor`:
+  If updating, prefer updating only to next minor version.
+
+* `--major`:
+  If updating, prefer updating to next major version (default).
+
+* `--strict`:
+  If updating, do not allow any gem to be updated past latest --patch | --minor | --major.
+
+* `--conservative`:
+  If updating, use bundle install conservative update behavior and do not allow shared dependencies to be updated.
+
+## UPDATING ALL GEMS
+
+If you run `bundle lock` with `--update` option without list of gems, bundler will
+ignore any previously installed gems and resolve all dependencies again based
+on the latest versions of all gems available in the sources.
+
+## UPDATING A LIST OF GEMS
+
+Sometimes, you want to update a single gem in the Gemfile(5), and leave the rest of
+the gems that you specified locked to the versions in the `Gemfile.lock`.
+
+For instance, you only want to update `nokogiri`, run `bundle lock --update nokogiri`.
+
+Bundler will update `nokogiri` and any of its dependencies, but leave the rest of the
+gems that you specified locked to the versions in the `Gemfile.lock`.
+
+## SUPPORTING OTHER PLATFORMS
+
+If you want your bundle to support platforms other than the one you're running
+locally, you can run `bundle lock --add-platform PLATFORM` to add PLATFORM to
+the lockfile, force bundler to re-resolve and consider the new platform when
+picking gems, all without needing to have a machine that matches PLATFORM handy
+to install those platform-specific gems on.
+
+For a full explanation of gem platforms, see `gem help platform`.
+
+## PATCH LEVEL OPTIONS
+
+See [bundle update(1)](bundle-update.1.html) for details.
diff --git a/lib/bundler/man/bundle-open.1 b/lib/bundler/man/bundle-open.1
new file mode 100644
index 0000000000..dd28566bdb
--- /dev/null
+++ b/lib/bundler/man/bundle-open.1
@@ -0,0 +1,32 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "BUNDLE\-OPEN" "1" "December 2021" "" ""
+.
+.SH "NAME"
+\fBbundle\-open\fR \- Opens the source directory for a gem in your bundle
+.
+.SH "SYNOPSIS"
+\fBbundle open\fR [GEM]
+.
+.SH "DESCRIPTION"
+Opens the source directory of the provided GEM in your editor\.
+.
+.P
+For this to work the \fBEDITOR\fR or \fBBUNDLER_EDITOR\fR environment variable has to be set\.
+.
+.P
+Example:
+.
+.IP "" 4
+.
+.nf
+
+bundle open \'rack\'
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Will open the source directory for the \'rack\' gem in your bundle\.
diff --git a/lib/bundler/man/bundle-open.1.ronn b/lib/bundler/man/bundle-open.1.ronn
new file mode 100644
index 0000000000..497beac93f
--- /dev/null
+++ b/lib/bundler/man/bundle-open.1.ronn
@@ -0,0 +1,19 @@
+bundle-open(1) -- Opens the source directory for a gem in your bundle
+=====================================================================
+
+## SYNOPSIS
+
+`bundle open` [GEM]
+
+## DESCRIPTION
+
+Opens the source directory of the provided GEM in your editor.
+
+For this to work the `EDITOR` or `BUNDLER_EDITOR` environment variable has to
+be set.
+
+Example:
+
+    bundle open 'rack'
+
+Will open the source directory for the 'rack' gem in your bundle.
diff --git a/lib/bundler/man/bundle-outdated.1 b/lib/bundler/man/bundle-outdated.1
new file mode 100644
index 0000000000..b9d50a1c71
--- /dev/null
+++ b/lib/bundler/man/bundle-outdated.1
@@ -0,0 +1,155 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "BUNDLE\-OUTDATED" "1" "December 2021" "" ""
+.
+.SH "NAME"
+\fBbundle\-outdated\fR \- List installed gems with newer versions available
+.
+.SH "SYNOPSIS"
+\fBbundle outdated\fR [GEM] [\-\-local] [\-\-pre] [\-\-source] [\-\-strict] [\-\-parseable | \-\-porcelain] [\-\-group=GROUP] [\-\-groups] [\-\-update\-strict] [\-\-patch|\-\-minor|\-\-major] [\-\-filter\-major] [\-\-filter\-minor] [\-\-filter\-patch] [\-\-only\-explicit]
+.
+.SH "DESCRIPTION"
+Outdated lists the names and versions of gems that have a newer version available in the given source\. Calling outdated with [GEM [GEM]] will only check for newer versions of the given gems\. Prerelease gems are ignored by default\. If your gems are up to date, Bundler will exit with a status of 0\. Otherwise, it will exit 1\.
+.
+.SH "OPTIONS"
+.
+.TP
+\fB\-\-local\fR
+Do not attempt to fetch gems remotely and use the gem cache instead\.
+.
+.TP
+\fB\-\-pre\fR
+Check for newer pre\-release gems\.
+.
+.TP
+\fB\-\-source\fR
+Check against a specific source\.
+.
+.TP
+\fB\-\-strict\fR
+Only list newer versions allowed by your Gemfile requirements\.
+.
+.TP
+\fB\-\-parseable\fR, \fB\-\-porcelain\fR
+Use minimal formatting for more parseable output\.
+.
+.TP
+\fB\-\-group\fR
+List gems from a specific group\.
+.
+.TP
+\fB\-\-groups\fR
+List gems organized by groups\.
+.
+.TP
+\fB\-\-update\-strict\fR
+Strict conservative resolution, do not allow any gem to be updated past latest \-\-patch | \-\-minor| \-\-major\.
+.
+.TP
+\fB\-\-minor\fR
+Prefer updating only to next minor version\.
+.
+.TP
+\fB\-\-major\fR
+Prefer updating to next major version (default)\.
+.
+.TP
+\fB\-\-patch\fR
+Prefer updating only to next patch version\.
+.
+.TP
+\fB\-\-filter\-major\fR
+Only list major newer versions\.
+.
+.TP
+\fB\-\-filter\-minor\fR
+Only list minor newer versions\.
+.
+.TP
+\fB\-\-filter\-patch\fR
+Only list patch newer versions\.
+.
+.TP
+\fB\-\-only\-explicit\fR
+Only list gems specified in your Gemfile, not their dependencies\.
+.
+.SH "PATCH LEVEL OPTIONS"
+See bundle update(1) \fIbundle\-update\.1\.html\fR for details\.
+.
+.P
+One difference between the patch level options in \fBbundle update\fR and here is the \fB\-\-strict\fR option\. \fB\-\-strict\fR was already an option on outdated before the patch level options were added\. \fB\-\-strict\fR wasn\'t altered, and the \fB\-\-update\-strict\fR option on \fBoutdated\fR reflects what \fB\-\-strict\fR does on \fBbundle update\fR\.
+.
+.SH "FILTERING OUTPUT"
+The 3 filtering options do not affect the resolution of versions, merely what versions are shown in the output\.
+.
+.P
+If the regular output shows the following:
+.
+.IP "" 4
+.
+.nf
+
+* faker (newest 1\.6\.6, installed 1\.6\.5, requested ~> 1\.4) in groups "development, test"
+* hashie (newest 3\.4\.6, installed 1\.2\.0, requested = 1\.2\.0) in groups "default"
+* headless (newest 2\.3\.1, installed 2\.2\.3) in groups "test"
+.
+.fi
+.
+.IP "" 0
+.
+.P
+\fB\-\-filter\-major\fR would only show:
+.
+.IP "" 4
+.
+.nf
+
+* hashie (newest 3\.4\.6, installed 1\.2\.0, requested = 1\.2\.0) in groups "default"
+.
+.fi
+.
+.IP "" 0
+.
+.P
+\fB\-\-filter\-minor\fR would only show:
+.
+.IP "" 4
+.
+.nf
+
+* headless (newest 2\.3\.1, installed 2\.2\.3) in groups "test"
+.
+.fi
+.
+.IP "" 0
+.
+.P
+\fB\-\-filter\-patch\fR would only show:
+.
+.IP "" 4
+.
+.nf
+
+* faker (newest 1\.6\.6, installed 1\.6\.5, requested ~> 1\.4) in groups "development, test"
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Filter options can be combined\. \fB\-\-filter\-minor\fR and \fB\-\-filter\-patch\fR would show:
+.
+.IP "" 4
+.
+.nf
+
+* faker (newest 1\.6\.6, installed 1\.6\.5, requested ~> 1\.4) in groups "development, test"
+* headless (newest 2\.3\.1, installed 2\.2\.3) in groups "test"
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Combining all three \fBfilter\fR options would be the same result as providing none of them\.
diff --git a/lib/bundler/man/bundle-outdated.1.ronn b/lib/bundler/man/bundle-outdated.1.ronn
new file mode 100644
index 0000000000..a991d23789
--- /dev/null
+++ b/lib/bundler/man/bundle-outdated.1.ronn
@@ -0,0 +1,111 @@
+bundle-outdated(1) -- List installed gems with newer versions available
+=======================================================================
+
+## SYNOPSIS
+
+`bundle outdated` [GEM] [--local]
+                        [--pre]
+                        [--source]
+                        [--strict]
+                        [--parseable | --porcelain]
+                        [--group=GROUP]
+                        [--groups]
+                        [--update-strict]
+                        [--patch|--minor|--major]
+                        [--filter-major]
+                        [--filter-minor]
+                        [--filter-patch]
+                        [--only-explicit]
+
+## DESCRIPTION
+
+Outdated lists the names and versions of gems that have a newer version available
+in the given source. Calling outdated with [GEM [GEM]] will only check for newer
+versions of the given gems. Prerelease gems are ignored by default. If your gems
+are up to date, Bundler will exit with a status of 0. Otherwise, it will exit 1.
+
+## OPTIONS
+
+* `--local`:
+  Do not attempt to fetch gems remotely and use the gem cache instead.
+
+* `--pre`:
+  Check for newer pre-release gems.
+
+* `--source`:
+  Check against a specific source.
+
+* `--strict`:
+  Only list newer versions allowed by your Gemfile requirements.
+
+* `--parseable`, `--porcelain`:
+   Use minimal formatting for more parseable output.
+
+* `--group`:
+  List gems from a specific group.
+
+* `--groups`:
+  List gems organized by groups.
+
+* `--update-strict`:
+  Strict conservative resolution, do not allow any gem to be updated past latest --patch | --minor| --major.
+
+* `--minor`:
+  Prefer updating only to next minor version.
+
+* `--major`:
+  Prefer updating to next major version (default).
+
+* `--patch`:
+  Prefer updating only to next patch version.
+
+* `--filter-major`:
+  Only list major newer versions.
+
+* `--filter-minor`:
+  Only list minor newer versions.
+
+* `--filter-patch`:
+  Only list patch newer versions.
+
+* `--only-explicit`:
+  Only list gems specified in your Gemfile, not their dependencies.
+
+## PATCH LEVEL OPTIONS
+
+See [bundle update(1)](bundle-update.1.html) for details.
+
+One difference between the patch level options in `bundle update` and here is the `--strict` option.
+`--strict` was already an option on outdated before the patch level options were added. `--strict`
+wasn't altered, and the `--update-strict` option on `outdated` reflects what `--strict` does on
+`bundle update`.
+
+## FILTERING OUTPUT
+
+The 3 filtering options do not affect the resolution of versions, merely what versions are shown
+in the output.
+
+If the regular output shows the following:
+
+    * faker (newest 1.6.6, installed 1.6.5, requested ~> 1.4) in groups "development, test"
+    * hashie (newest 3.4.6, installed 1.2.0, requested = 1.2.0) in groups "default"
+    * headless (newest 2.3.1, installed 2.2.3) in groups "test"
+
+`--filter-major` would only show:
+
+    * hashie (newest 3.4.6, installed 1.2.0, requested = 1.2.0) in groups "default"
+
+`--filter-minor` would only show:
+
+    * headless (newest 2.3.1, installed 2.2.3) in groups "test"
+
+`--filter-patch` would only show:
+
+    * faker (newest 1.6.6, installed 1.6.5, requested ~> 1.4) in groups "development, test"
+
+Filter options can be combined. `--filter-minor` and `--filter-patch` would show:
+
+    * faker (newest 1.6.6, installed 1.6.5, requested ~> 1.4) in groups "development, test"
+    * headless (newest 2.3.1, installed 2.2.3) in groups "test"
+
+Combining all three `filter` options would be the same result as providing none of them.
diff --git a/lib/bundler/man/bundle-platform.1 b/lib/bundler/man/bundle-platform.1
new file mode 100644
index 0000000000..b1c859f64b
--- /dev/null
+++ b/lib/bundler/man/bundle-platform.1
@@ -0,0 +1,61 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "BUNDLE\-PLATFORM" "1" "December 2021" "" ""
+.
+.SH "NAME"
+\fBbundle\-platform\fR \- Displays platform compatibility information
+.
+.SH "SYNOPSIS"
+\fBbundle platform\fR [\-\-ruby]
+.
+.SH "DESCRIPTION"
+\fBplatform\fR will display information from your Gemfile, Gemfile\.lock, and Ruby VM about your platform\.
+.
+.P
+For instance, using this Gemfile(5):
+.
+.IP "" 4
+.
+.nf
+
+source "https://rubygems\.org"
+
+ruby "1\.9\.3"
+
+gem "rack"
+.
+.fi
+.
+.IP "" 0
+.
+.P
+If you run \fBbundle platform\fR on Ruby 1\.9\.3, it will display the following output:
+.
+.IP "" 4
+.
+.nf
+
+Your platform is: x86_64\-linux
+
+Your app has gems that work on these platforms:
+* ruby
+
+Your Gemfile specifies a Ruby version requirement:
+* ruby 1\.9\.3
+
+Your current platform satisfies the Ruby version requirement\.
+.
+.fi
+.
+.IP "" 0
+.
+.P
+\fBplatform\fR will list all the platforms in your \fBGemfile\.lock\fR as well as the \fBruby\fR directive if applicable from your Gemfile(5)\. It will also let you know if the \fBruby\fR directive requirement has been met\. If \fBruby\fR directive doesn\'t match the running Ruby VM, it will tell you what part does not\.
+.
+.SH "OPTIONS"
+.
+.TP
+\fB\-\-ruby\fR
+It will display the ruby directive information, so you don\'t have to parse it from the Gemfile(5)\.
+
diff --git a/lib/bundler/man/bundle-platform.1.ronn b/lib/bundler/man/bundle-platform.1.ronn
new file mode 100644
index 0000000000..b5d3283fb6
--- /dev/null
+++ b/lib/bundler/man/bundle-platform.1.ronn
@@ -0,0 +1,42 @@
+bundle-platform(1) -- Displays platform compatibility information
+=================================================================
+
+## SYNOPSIS
+
+`bundle platform` [--ruby]
+
+## DESCRIPTION
+
+`platform` will display information from your Gemfile, Gemfile.lock, and Ruby
+VM about your platform.
+
+For instance, using this Gemfile(5):
+
+    source "https://rubygems.org"
+
+    ruby "1.9.3"
+
+    gem "rack"
+
+If you run `bundle platform` on Ruby 1.9.3, it will display the following output:
+
+    Your platform is: x86_64-linux
+
+    Your app has gems that work on these platforms:
+    * ruby
+
+    Your Gemfile specifies a Ruby version requirement:
+    * ruby 1.9.3
+
+    Your current platform satisfies the Ruby version requirement.
+
+`platform` will list all the platforms in your `Gemfile.lock` as well as the
+`ruby` directive if applicable from your Gemfile(5). It will also let you know
+if the `ruby` directive requirement has been met. If `ruby` directive doesn't
+match the running Ruby VM, it will tell you what part does not.
+
+## OPTIONS
+
+* `--ruby`:
+  It will display the ruby directive information, so you don't have to
+  parse it from the Gemfile(5).
diff --git a/lib/bundler/man/bundle-pristine.1 b/lib/bundler/man/bundle-pristine.1
new file mode 100644
index 0000000000..6e4a028666
--- /dev/null
+++ b/lib/bundler/man/bundle-pristine.1
@@ -0,0 +1,34 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "BUNDLE\-PRISTINE" "1" "December 2021" "" ""
+.
+.SH "NAME"
+\fBbundle\-pristine\fR \- Restores installed gems to their pristine condition
+.
+.SH "SYNOPSIS"
+\fBbundle pristine\fR
+.
+.SH "DESCRIPTION"
+\fBpristine\fR restores the installed gems in the bundle to their pristine condition using the local gem cache from RubyGems\. For git gems, a forced checkout will be performed\.
+.
+.P
+For further explanation, \fBbundle pristine\fR ignores unpacked files on disk\. In other words, this command utilizes the local \fB\.gem\fR cache or the gem\'s git repository as if one were installing from scratch\.
+.
+.P
+Note: the Bundler gem cannot be restored to its original state with \fBpristine\fR\. One also cannot use \fBbundle pristine\fR on gems with a \'path\' option in the Gemfile, because bundler has no original copy it can restore from\.
+.
+.P
+When is it practical to use \fBbundle pristine\fR?
+.
+.P
+It comes in handy when a developer is debugging a gem\. \fBbundle pristine\fR is a great way to get rid of experimental changes to a gem that one may not want\.
+.
+.P
+Why use \fBbundle pristine\fR over \fBgem pristine \-\-all\fR?
+.
+.P
+Both commands are very similar\. For context: \fBbundle pristine\fR, without arguments, cleans all gems from the lockfile\. Meanwhile, \fBgem pristine \-\-all\fR cleans all installed gems for that Ruby version\.
+.
+.P
+If a developer forgets which gems in their project they might have been debugging, the Rubygems \fBgem pristine [GEMNAME]\fR command may be inconvenient\. One can avoid waiting for \fBgem pristine \-\-all\fR, and instead run \fBbundle pristine\fR\.
diff --git a/lib/bundler/man/bundle-pristine.1.ronn b/lib/bundler/man/bundle-pristine.1.ronn
new file mode 100644
index 0000000000..e2d6b6a348
--- /dev/null
+++ b/lib/bundler/man/bundle-pristine.1.ronn
@@ -0,0 +1,34 @@
+bundle-pristine(1) -- Restores installed gems to their pristine condition
+===========================================================================
+
+## SYNOPSIS
+
+`bundle pristine`
+
+## DESCRIPTION
+
+`pristine` restores the installed gems in the bundle to their pristine condition
+using the local gem cache from RubyGems. For git gems, a forced checkout will be performed.
+
+For further explanation, `bundle pristine` ignores unpacked files on disk. In other
+words, this command utilizes the local `.gem` cache or the gem's git repository
+as if one were installing from scratch.
+
+Note: the Bundler gem cannot be restored to its original state with `pristine`.
+One also cannot use `bundle pristine` on gems with a 'path' option in the Gemfile,
+because bundler has no original copy it can restore from.
+
+When is it practical to use `bundle pristine`?
+
+It comes in handy when a developer is debugging a gem. `bundle pristine` is a
+great way to get rid of experimental changes to a gem that one may not want.
+
+Why use `bundle pristine` over `gem pristine --all`?
+
+Both commands are very similar.
+For context: `bundle pristine`, without arguments, cleans all gems from the lockfile.
+Meanwhile, `gem pristine --all` cleans all installed gems for that Ruby version.
+
+If a developer forgets which gems in their project they might
+have been debugging, the Rubygems `gem pristine [GEMNAME]` command may be inconvenient.
+One can avoid waiting for `gem pristine --all`, and instead run `bundle pristine`.
diff --git a/lib/bundler/man/bundle-remove.1 b/lib/bundler/man/bundle-remove.1
new file mode 100644
index 0000000000..0b4edd1414
--- /dev/null
+++ b/lib/bundler/man/bundle-remove.1
@@ -0,0 +1,31 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "BUNDLE\-REMOVE" "1" "December 2021" "" ""
+.
+.SH "NAME"
+\fBbundle\-remove\fR \- Removes gems from the Gemfile
+.
+.SH "SYNOPSIS"
+\fBbundle remove [GEM [GEM \.\.\.]] [\-\-install]\fR
+.
+.SH "DESCRIPTION"
+Removes the given gems from the Gemfile while ensuring that the resulting Gemfile is still valid\. If a gem cannot be removed, a warning is printed\. If a gem is already absent from the Gemfile, and error is raised\.
+.
+.SH "OPTIONS"
+.
+.TP
+\fB\-\-install\fR
+Runs \fBbundle install\fR after the given gems have been removed from the Gemfile, which ensures that both the lockfile and the installed gems on disk are also updated to remove the given gem(s)\.
+.
+.P
+Example:
+.
+.P
+bundle remove rails
+.
+.P
+bundle remove rails rack
+.
+.P
+bundle remove rails rack \-\-install
diff --git a/lib/bundler/man/bundle-remove.1.ronn b/lib/bundler/man/bundle-remove.1.ronn
new file mode 100644
index 0000000000..40a239b4a2
--- /dev/null
+++ b/lib/bundler/man/bundle-remove.1.ronn
@@ -0,0 +1,23 @@
+bundle-remove(1) -- Removes gems from the Gemfile
+===========================================================================
+
+## SYNOPSIS
+
+`bundle remove [GEM [GEM ...]] [--install]`
+
+## DESCRIPTION
+
+Removes the given gems from the Gemfile while ensuring that the resulting Gemfile is still valid. If a gem cannot be removed, a warning is printed. If a gem is already absent from the Gemfile, and error is raised.
+
+## OPTIONS
+
+* `--install`:
+  Runs `bundle install` after the given gems have been removed from the Gemfile, which ensures that both the lockfile and the installed gems on disk are also updated to remove the given gem(s).
+
+Example:
+
+bundle remove rails
+
+bundle remove rails rack
+
+bundle remove rails rack --install
diff --git a/lib/bundler/man/bundle-show.1 b/lib/bundler/man/bundle-show.1
new file mode 100644
index 0000000000..375699ddf0
--- /dev/null
+++ b/lib/bundler/man/bundle-show.1
@@ -0,0 +1,23 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "BUNDLE\-SHOW" "1" "December 2021" "" ""
+.
+.SH "NAME"
+\fBbundle\-show\fR \- Shows all the gems in your bundle, or the path to a gem
+.
+.SH "SYNOPSIS"
+\fBbundle show\fR [GEM] [\-\-paths]
+.
+.SH "DESCRIPTION"
+Without the [GEM] option, \fBshow\fR will print a list of the names and versions of all gems that are required by your [\fBGemfile(5)\fR][Gemfile(5)], sorted by name\.
+.
+.P
+Calling show with [GEM] will list the exact location of that gem on your machine\.
+.
+.SH "OPTIONS"
+.
+.TP
+\fB\-\-paths\fR
+List the paths of all gems that are required by your [\fBGemfile(5)\fR][Gemfile(5)], sorted by gem name\.
+
diff --git a/lib/bundler/man/bundle-show.1.ronn b/lib/bundler/man/bundle-show.1.ronn
new file mode 100644
index 0000000000..a6a59a1445
--- /dev/null
+++ b/lib/bundler/man/bundle-show.1.ronn
@@ -0,0 +1,21 @@
+bundle-show(1) -- Shows all the gems in your bundle, or the path to a gem
+=========================================================================
+
+## SYNOPSIS
+
+`bundle show` [GEM]
+              [--paths]
+
+## DESCRIPTION
+
+Without the [GEM] option, `show` will print a list of the names and versions of
+all gems that are required by your [`Gemfile(5)`][Gemfile(5)], sorted by name.
+
+Calling show with [GEM] will list the exact location of that gem on your
+machine.
+
+## OPTIONS
+
+* `--paths`:
+  List the paths of all gems that are required by your [`Gemfile(5)`][Gemfile(5)],
+  sorted by gem name.
diff --git a/lib/bundler/man/bundle-update.1 b/lib/bundler/man/bundle-update.1
new file mode 100644
index 0000000000..c08bc66ef0
--- /dev/null
+++ b/lib/bundler/man/bundle-update.1
@@ -0,0 +1,394 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "BUNDLE\-UPDATE" "1" "December 2021" "" ""
+.
+.SH "NAME"
+\fBbundle\-update\fR \- Update your gems to the latest available versions
+.
+.SH "SYNOPSIS"
+\fBbundle update\fR \fI*gems\fR [\-\-all] [\-\-group=NAME] [\-\-source=NAME] [\-\-local] [\-\-ruby] [\-\-bundler[=VERSION]] [\-\-full\-index] [\-\-jobs=JOBS] [\-\-quiet] [\-\-patch|\-\-minor|\-\-major] [\-\-redownload] [\-\-strict] [\-\-conservative]
+.
+.SH "DESCRIPTION"
+Update the gems specified (all gems, if \fB\-\-all\fR flag is used), ignoring the previously installed gems specified in the \fBGemfile\.lock\fR\. In general, you should use bundle install(1) \fIbundle\-install\.1\.html\fR to install the same exact gems and versions across machines\.
+.
+.P
+You would use \fBbundle update\fR to explicitly update the version of a gem\.
+.
+.SH "OPTIONS"
+.
+.TP
+\fB\-\-all\fR
+Update all gems specified in Gemfile\.
+.
+.TP
+\fB\-\-group=<name>\fR, \fB\-g=[<name>]\fR
+Only update the gems in the specified group\. For instance, you can update all gems in the development group with \fBbundle update \-\-group development\fR\. You can also call \fBbundle update rails \-\-group test\fR to update the rails gem and all gems in the test group, for example\.
+.
+.TP
+\fB\-\-source=<name>\fR
+The name of a \fB:git\fR or \fB:path\fR source used in the Gemfile(5)\. For instance, with a \fB:git\fR source of \fBhttp://github\.com/rails/rails\.git\fR, you would call \fBbundle update \-\-source rails\fR
+.
+.TP
+\fB\-\-local\fR
+Do not attempt to fetch gems remotely and use the gem cache instead\.
+.
+.TP
+\fB\-\-ruby\fR
+Update the locked version of Ruby to the current version of Ruby\.
+.
+.TP
+\fB\-\-bundler\fR
+Update the locked version of bundler to the invoked bundler version\.
+.
+.TP
+\fB\-\-full\-index\fR
+Fall back to using the single\-file index of all gems\.
+.
+.TP
+\fB\-\-jobs=[<number>]\fR, \fB\-j[<number>]\fR
+Specify the number of jobs to run in parallel\. The default is \fB1\fR\.
+.
+.TP
+\fB\-\-retry=[<number>]\fR
+Retry failed network or git requests for \fInumber\fR times\.
+.
+.TP
+\fB\-\-quiet\fR
+Only output warnings and errors\.
+.
+.TP
+\fB\-\-redownload\fR
+Force downloading every gem\.
+.
+.TP
+\fB\-\-patch\fR
+Prefer updating only to next patch version\.
+.
+.TP
+\fB\-\-minor\fR
+Prefer updating only to next minor version\.
+.
+.TP
+\fB\-\-major\fR
+Prefer updating to next major version (default)\.
+.
+.TP
+\fB\-\-strict\fR
+Do not allow any gem to be updated past latest \fB\-\-patch\fR | \fB\-\-minor\fR | \fB\-\-major\fR\.
+.
+.TP
+\fB\-\-conservative\fR
+Use bundle install conservative update behavior and do not allow indirect dependencies to be updated\.
+.
+.SH "UPDATING ALL GEMS"
+If you run \fBbundle update \-\-all\fR, bundler will ignore any previously installed gems and resolve all dependencies again based on the latest versions of all gems available in the sources\.
+.
+.P
+Consider the following Gemfile(5):
+.
+.IP "" 4
+.
+.nf
+
+source "https://rubygems\.org"
+
+gem "rails", "3\.0\.0\.rc"
+gem "nokogiri"
+.
+.fi
+.
+.IP "" 0
+.
+.P
+When you run bundle install(1) \fIbundle\-install\.1\.html\fR the first time, bundler will resolve all of the dependencies, all the way down, and install what you need:
+.
+.IP "" 4
+.
+.nf
+
+Fetching gem metadata from https://rubygems\.org/\.\.\.\.\.\.\.\.\.
+Resolving dependencies\.\.\.
+Installing builder 2\.1\.2
+Installing abstract 1\.0\.0
+Installing rack 1\.2\.8
+Using bundler 1\.7\.6
+Installing rake 10\.4\.0
+Installing polyglot 0\.3\.5
+Installing mime\-types 1\.25\.1
+Installing i18n 0\.4\.2
+Installing mini_portile 0\.6\.1
+Installing tzinfo 0\.3\.42
+Installing rack\-mount 0\.6\.14
+Installing rack\-test 0\.5\.7
+Installing treetop 1\.4\.15
+Installing thor 0\.14\.6
+Installing activesupport 3\.0\.0\.rc
+Installing erubis 2\.6\.6
+Installing activemodel 3\.0\.0\.rc
+Installing arel 0\.4\.0
+Installing mail 2\.2\.20
+Installing activeresource 3\.0\.0\.rc
+Installing actionpack 3\.0\.0\.rc
+Installing activerecord 3\.0\.0\.rc
+Installing actionmailer 3\.0\.0\.rc
+Installing railties 3\.0\.0\.rc
+Installing rails 3\.0\.0\.rc
+Installing nokogiri 1\.6\.5
+
+Bundle complete! 2 Gemfile dependencies, 26 gems total\.
+Use `bundle show [gemname]` to see where a bundled gem is installed\.
+.
+.fi
+.
+.IP "" 0
+.
+.P
+As you can see, even though you have two gems in the Gemfile(5), your application needs 26 different gems in order to run\. Bundler remembers the exact versions it installed in \fBGemfile\.lock\fR\. The next time you run bundle install(1) \fIbundle\-install\.1\.html\fR, bundler skips the dependency resolution and installs the same gems as it installed last time\.
+.
+.P
+After checking in the \fBGemfile\.lock\fR into version control and cloning it on another machine, running bundle install(1) \fIbundle\-install\.1\.html\fR will \fIstill\fR install the gems that you installed last time\. You don\'t need to worry that a new release of \fBerubis\fR or \fBmail\fR changes the gems you use\.
+.
+.P
+However, from time to time, you might want to update the gems you are using to the newest versions that still match the gems in your Gemfile(5)\.
+.
+.P
+To do this, run \fBbundle update \-\-all\fR, which will ignore the \fBGemfile\.lock\fR, and resolve all the dependencies again\. Keep in mind that this process can result in a significantly different set of the 25 gems, based on the requirements of new gems that the gem authors released since the last time you ran \fBbundle update \-\-all\fR\.
+.
+.SH "UPDATING A LIST OF GEMS"
+Sometimes, you want to update a single gem in the Gemfile(5), and leave the rest of the gems that you specified locked to the versions in the \fBGemfile\.lock\fR\.
+.
+.P
+For instance, in the scenario above, imagine that \fBnokogiri\fR releases version \fB1\.4\.4\fR, and you want to update it \fIwithout\fR updating Rails and all of its dependencies\. To do this, run \fBbundle update nokogiri\fR\.
+.
+.P
+Bundler will update \fBnokogiri\fR and any of its dependencies, but leave alone Rails and its dependencies\.
+.
+.SH "OVERLAPPING DEPENDENCIES"
+Sometimes, multiple gems declared in your Gemfile(5) are satisfied by the same second\-level dependency\. For instance, consider the case of \fBthin\fR and \fBrack\-perftools\-profiler\fR\.
+.
+.IP "" 4
+.
+.nf
+
+source "https://rubygems\.org"
+
+gem "thin"
+gem "rack\-perftools\-profiler"
+.
+.fi
+.
+.IP "" 0
+.
+.P
+The \fBthin\fR gem depends on \fBrack >= 1\.0\fR, while \fBrack\-perftools\-profiler\fR depends on \fBrack ~> 1\.0\fR\. If you run bundle install, you get:
+.
+.IP "" 4
+.
+.nf
+
+Fetching source index for https://rubygems\.org/
+Installing daemons (1\.1\.0)
+Installing eventmachine (0\.12\.10) with native extensions
+Installing open4 (1\.0\.1)
+Installing perftools\.rb (0\.4\.7) with native extensions
+Installing rack (1\.2\.1)
+Installing rack\-perftools_profiler (0\.0\.2)
+Installing thin (1\.2\.7) with native extensions
+Using bundler (1\.0\.0\.rc\.3)
+.
+.fi
+.
+.IP "" 0
+.
+.P
+In this case, the two gems have their own set of dependencies, but they share \fBrack\fR in common\. If you run \fBbundle update thin\fR, bundler will update \fBdaemons\fR, \fBeventmachine\fR and \fBrack\fR, which are dependencies of \fBthin\fR, but not \fBopen4\fR or \fBperftools\.rb\fR, which are dependencies of \fBrack\-perftools_profiler\fR\. Note that \fBbundle update thin\fR will update \fBrack\fR even though it\'s \fIalso\fR a dependency of \fBrack\-perftools_profiler\fR\.
+.
+.P
+In short, by default, when you update a gem using \fBbundle update\fR, bundler will update all dependencies of that gem, including those that are also dependencies of another gem\.
+.
+.P
+To prevent updating indirect dependencies, prior to version 1\.14 the only option was the \fBCONSERVATIVE UPDATING\fR behavior in bundle install(1) \fIbundle\-install\.1\.html\fR:
+.
+.P
+In this scenario, updating the \fBthin\fR version manually in the Gemfile(5), and then running bundle install(1) \fIbundle\-install\.1\.html\fR will only update \fBdaemons\fR and \fBeventmachine\fR, but not \fBrack\fR\. For more information, see the \fBCONSERVATIVE UPDATING\fR section of bundle install(1) \fIbundle\-install\.1\.html\fR\.
+.
+.P
+Starting with 1\.14, specifying the \fB\-\-conservative\fR option will also prevent indirect dependencies from being updated\.
+.
+.SH "PATCH LEVEL OPTIONS"
+Version 1\.14 introduced 4 patch\-level options that will influence how gem versions are resolved\. One of the following options can be used: \fB\-\-patch\fR, \fB\-\-minor\fR or \fB\-\-major\fR\. \fB\-\-strict\fR can be added to further influence resolution\.
+.
+.TP
+\fB\-\-patch\fR
+Prefer updating only to next patch version\.
+.
+.TP
+\fB\-\-minor\fR
+Prefer updating only to next minor version\.
+.
+.TP
+\fB\-\-major\fR
+Prefer updating to next major version (default)\.
+.
+.TP
+\fB\-\-strict\fR
+Do not allow any gem to be updated past latest \fB\-\-patch\fR | \fB\-\-minor\fR | \fB\-\-major\fR\.
+.
+.P
+When Bundler is resolving what versions to use to satisfy declared requirements in the Gemfile or in parent gems, it looks up all available versions, filters out any versions that don\'t satisfy the requirement, and then, by default, sorts them from newest to oldest, considering them in that order\.
+.
+.P
+Providing one of the patch level options (e\.g\. \fB\-\-patch\fR) changes the sort order of the satisfying versions, causing Bundler to consider the latest \fB\-\-patch\fR or \fB\-\-minor\fR version available before other versions\. Note that versions outside the stated patch level could still be resolved to if necessary to find a suitable dependency graph\.
+.
+.P
+For example, if gem \'foo\' is locked at 1\.0\.2, with no gem requirement defined in the Gemfile, and versions 1\.0\.3, 1\.0\.4, 1\.1\.0, 1\.1\.1, 2\.0\.0 all exist, the default order of preference by default (\fB\-\-major\fR) will be "2\.0\.0, 1\.1\.1, 1\.1\.0, 1\.0\.4, 1\.0\.3, 1\.0\.2"\.
+.
+.P
+If the \fB\-\-patch\fR option is used, the order of preference will change to "1\.0\.4, 1\.0\.3, 1\.0\.2, 1\.1\.1, 1\.1\.0, 2\.0\.0"\.
+.
+.P
+If the \fB\-\-minor\fR option is used, the order of preference will change to "1\.1\.1, 1\.1\.0, 1\.0\.4, 1\.0\.3, 1\.0\.2, 2\.0\.0"\.
+.
+.P
+Combining the \fB\-\-strict\fR option with any of the patch level options will remove any versions beyond the scope of the patch level option, to ensure that no gem is updated that far\.
+.
+.P
+To continue the previous example, if both \fB\-\-patch\fR and \fB\-\-strict\fR options are used, the available versions for resolution would be "1\.0\.4, 1\.0\.3, 1\.0\.2"\. If \fB\-\-minor\fR and \fB\-\-strict\fR are used, it would be "1\.1\.1, 1\.1\.0, 1\.0\.4, 1\.0\.3, 1\.0\.2"\.
+.
+.P
+Gem requirements as defined in the Gemfile will still be the first determining factor for what versions are available\. If the gem requirement for \fBfoo\fR in the Gemfile is \'~> 1\.0\', that will accomplish the same thing as providing the \fB\-\-minor\fR and \fB\-\-strict\fR options\.
+.
+.SH "PATCH LEVEL EXAMPLES"
+Given the following gem specifications:
+.
+.IP "" 4
+.
+.nf
+
+foo 1\.4\.3, requires: ~> bar 2\.0
+foo 1\.4\.4, requires: ~> bar 2\.0
+foo 1\.4\.5, requires: ~> bar 2\.1
+foo 1\.5\.0, requires: ~> bar 2\.1
+foo 1\.5\.1, requires: ~> bar 3\.0
+bar with versions 2\.0\.3, 2\.0\.4, 2\.1\.0, 2\.1\.1, 3\.0\.0
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Gemfile:
+.
+.IP "" 4
+.
+.nf
+
+gem \'foo\'
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Gemfile\.lock:
+.
+.IP "" 4
+.
+.nf
+
+foo (1\.4\.3)
+  bar (~> 2\.0)
+bar (2\.0\.3)
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Cases:
+.
+.IP "" 4
+.
+.nf
+
+#  Command Line                     Result
+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+1  bundle update \-\-patch            \'foo 1\.4\.5\', \'bar 2\.1\.1\'
+2  bundle update \-\-patch foo        \'foo 1\.4\.5\', \'bar 2\.1\.1\'
+3  bundle update \-\-minor            \'foo 1\.5\.1\', \'bar 3\.0\.0\'
+4  bundle update \-\-minor \-\-strict   \'foo 1\.5\.0\', \'bar 2\.1\.1\'
+5  bundle update \-\-patch \-\-strict   \'foo 1\.4\.4\', \'bar 2\.0\.4\'
+.
+.fi
+.
+.IP "" 0
+.
+.P
+In case 1, bar is upgraded to 2\.1\.1, a minor version increase, because the dependency from foo 1\.4\.5 required it\.
+.
+.P
+In case 2, only foo is requested to be unlocked, but bar is also allowed to move because it\'s not a declared dependency in the Gemfile\.
+.
+.P
+In case 3, bar goes up a whole major release, because a minor increase is preferred now for foo, and when it goes to 1\.5\.1, it requires 3\.0\.0 of bar\.
+.
+.P
+In case 4, foo is preferred up to a minor version, but 1\.5\.1 won\'t work because the \-\-strict flag removes bar 3\.0\.0 from consideration since it\'s a major increment\.
+.
+.P
+In case 5, both foo and bar have any minor or major increments removed from consideration because of the \-\-strict flag, so the most they can move is up to 1\.4\.4 and 2\.0\.4\.
+.
+.SH "RECOMMENDED WORKFLOW"
+In general, when working with an application managed with bundler, you should use the following workflow:
+.
+.IP "\(bu" 4
+After you create your Gemfile(5) for the first time, run
+.
+.IP
+$ bundle install
+.
+.IP "\(bu" 4
+Check the resulting \fBGemfile\.lock\fR into version control
+.
+.IP
+$ git add Gemfile\.lock
+.
+.IP "\(bu" 4
+When checking out this repository on another development machine, run
+.
+.IP
+$ bundle install
+.
+.IP "\(bu" 4
+When checking out this repository on a deployment machine, run
+.
+.IP
+$ bundle install \-\-deployment
+.
+.IP "\(bu" 4
+After changing the Gemfile(5) to reflect a new or update dependency, run
+.
+.IP
+$ bundle install
+.
+.IP "\(bu" 4
+Make sure to check the updated \fBGemfile\.lock\fR into version control
+.
+.IP
+$ git add Gemfile\.lock
+.
+.IP "\(bu" 4
+If bundle install(1) \fIbundle\-install\.1\.html\fR reports a conflict, manually update the specific gems that you changed in the Gemfile(5)
+.
+.IP
+$ bundle update rails thin
+.
+.IP "\(bu" 4
+If you want to update all the gems to the latest possible versions that still match the gems listed in the Gemfile(5), run
+.
+.IP
+$ bundle update \-\-all
+.
+.IP "" 0
+
diff --git a/lib/bundler/man/bundle-update.1.ronn b/lib/bundler/man/bundle-update.1.ronn
new file mode 100644
index 0000000000..3a16f29149
--- /dev/null
+++ b/lib/bundler/man/bundle-update.1.ronn
@@ -0,0 +1,350 @@
+bundle-update(1) -- Update your gems to the latest available versions
+=====================================================================
+
+## SYNOPSIS
+
+`bundle update` <*gems> [--all]
+                        [--group=NAME]
+                        [--source=NAME]
+                        [--local]
+                        [--ruby]
+                        [--bundler[=VERSION]]
+                        [--full-index]
+                        [--jobs=JOBS]
+                        [--quiet]
+                        [--patch|--minor|--major]
+                        [--redownload]
+                        [--strict]
+                        [--conservative]
+
+## DESCRIPTION
+
+Update the gems specified (all gems, if `--all` flag is used), ignoring
+the previously installed gems specified in the `Gemfile.lock`. In
+general, you should use [bundle install(1)](bundle-install.1.html) to install the same exact
+gems and versions across machines.
+
+You would use `bundle update` to explicitly update the version of a
+gem.
+
+## OPTIONS
+
+* `--all`:
+  Update all gems specified in Gemfile.
+
+* `--group=<name>`, `-g=[<name>]`:
+  Only update the gems in the specified group. For instance, you can update all gems
+  in the development group with `bundle update --group development`. You can also
+  call `bundle update rails --group test` to update the rails gem and all gems in
+  the test group, for example.
+
+* `--source=<name>`:
+  The name of a `:git` or `:path` source used in the Gemfile(5). For
+  instance, with a `:git` source of `http://github.com/rails/rails.git`,
+  you would call `bundle update --source rails`
+
+* `--local`:
+  Do not attempt to fetch gems remotely and use the gem cache instead.
+
+* `--ruby`:
+  Update the locked version of Ruby to the current version of Ruby.
+
+* `--bundler`:
+  Update the locked version of bundler to the invoked bundler version.
+
+* `--full-index`:
+  Fall back to using the single-file index of all gems.
+
+* `--jobs=[<number>]`, `-j[<number>]`:
+  Specify the number of jobs to run in parallel. The default is `1`.
+
+* `--retry=[<number>]`:
+  Retry failed network or git requests for <number> times.
+
+* `--quiet`:
+  Only output warnings and errors.
+
+* `--redownload`:
+  Force downloading every gem.
+
+* `--patch`:
+  Prefer updating only to next patch version.
+
+* `--minor`:
+  Prefer updating only to next minor version.
+
+* `--major`:
+  Prefer updating to next major version (default).
+
+* `--strict`:
+  Do not allow any gem to be updated past latest `--patch` | `--minor` | `--major`.
+
+* `--conservative`:
+  Use bundle install conservative update behavior and do not allow indirect dependencies to be updated.
+
+## UPDATING ALL GEMS
+
+If you run `bundle update --all`, bundler will ignore
+any previously installed gems and resolve all dependencies again
+based on the latest versions of all gems available in the sources.
+
+Consider the following Gemfile(5):
+
+    source "https://rubygems.org"
+
+    gem "rails", "3.0.0.rc"
+    gem "nokogiri"
+
+When you run [bundle install(1)](bundle-install.1.html) the first time, bundler will resolve
+all of the dependencies, all the way down, and install what you need:
+
+    Fetching gem metadata from https://rubygems.org/.........
+    Resolving dependencies...
+    Installing builder 2.1.2
+    Installing abstract 1.0.0
+    Installing rack 1.2.8
+    Using bundler 1.7.6
+    Installing rake 10.4.0
+    Installing polyglot 0.3.5
+    Installing mime-types 1.25.1
+    Installing i18n 0.4.2
+    Installing mini_portile 0.6.1
+    Installing tzinfo 0.3.42
+    Installing rack-mount 0.6.14
+    Installing rack-test 0.5.7
+    Installing treetop 1.4.15
+    Installing thor 0.14.6
+    Installing activesupport 3.0.0.rc
+    Installing erubis 2.6.6
+    Installing activemodel 3.0.0.rc
+    Installing arel 0.4.0
+    Installing mail 2.2.20
+    Installing activeresource 3.0.0.rc
+    Installing actionpack 3.0.0.rc
+    Installing activerecord 3.0.0.rc
+    Installing actionmailer 3.0.0.rc
+    Installing railties 3.0.0.rc
+    Installing rails 3.0.0.rc
+    Installing nokogiri 1.6.5
+
+    Bundle complete! 2 Gemfile dependencies, 26 gems total.
+    Use `bundle show [gemname]` to see where a bundled gem is installed.
+
+As you can see, even though you have two gems in the Gemfile(5), your application
+needs 26 different gems in order to run. Bundler remembers the exact versions
+it installed in `Gemfile.lock`. The next time you run [bundle install(1)](bundle-install.1.html), bundler skips
+the dependency resolution and installs the same gems as it installed last time.
+
+After checking in the `Gemfile.lock` into version control and cloning it on another
+machine, running [bundle install(1)](bundle-install.1.html) will _still_ install the gems that you installed
+last time. You don't need to worry that a new release of `erubis` or `mail` changes
+the gems you use.
+
+However, from time to time, you might want to update the gems you are using to the
+newest versions that still match the gems in your Gemfile(5).
+
+To do this, run `bundle update --all`, which will ignore the `Gemfile.lock`, and resolve
+all the dependencies again. Keep in mind that this process can result in a significantly
+different set of the 25 gems, based on the requirements of new gems that the gem
+authors released since the last time you ran `bundle update --all`.
+
+## UPDATING A LIST OF GEMS
+
+Sometimes, you want to update a single gem in the Gemfile(5), and leave the rest of the
+gems that you specified locked to the versions in the `Gemfile.lock`.
+
+For instance, in the scenario above, imagine that `nokogiri` releases version `1.4.4`, and
+you want to update it _without_ updating Rails and all of its dependencies. To do this,
+run `bundle update nokogiri`.
+
+Bundler will update `nokogiri` and any of its dependencies, but leave alone Rails and
+its dependencies.
+
+## OVERLAPPING DEPENDENCIES
+
+Sometimes, multiple gems declared in your Gemfile(5) are satisfied by the same
+second-level dependency. For instance, consider the case of `thin` and
+`rack-perftools-profiler`.
+
+    source "https://rubygems.org"
+
+    gem "thin"
+    gem "rack-perftools-profiler"
+
+The `thin` gem depends on `rack >= 1.0`, while `rack-perftools-profiler` depends
+on `rack ~> 1.0`. If you run bundle install, you get:
+
+    Fetching source index for https://rubygems.org/
+    Installing daemons (1.1.0)
+    Installing eventmachine (0.12.10) with native extensions
+    Installing open4 (1.0.1)
+    Installing perftools.rb (0.4.7) with native extensions
+    Installing rack (1.2.1)
+    Installing rack-perftools_profiler (0.0.2)
+    Installing thin (1.2.7) with native extensions
+    Using bundler (1.0.0.rc.3)
+
+In this case, the two gems have their own set of dependencies, but they share
+`rack` in common. If you run `bundle update thin`, bundler will update `daemons`,
+`eventmachine` and `rack`, which are dependencies of `thin`, but not `open4` or
+`perftools.rb`, which are dependencies of `rack-perftools_profiler`. Note that
+`bundle update thin` will update `rack` even though it's _also_ a dependency of
+`rack-perftools_profiler`.
+
+In short, by default, when you update a gem using `bundle update`, bundler will
+update all dependencies of that gem, including those that are also dependencies
+of another gem.
+
+To prevent updating indirect dependencies, prior to version 1.14 the only option
+was the `CONSERVATIVE UPDATING` behavior in [bundle install(1)](bundle-install.1.html):
+
+In this scenario, updating the `thin` version manually in the Gemfile(5),
+and then running [bundle install(1)](bundle-install.1.html) will only update `daemons` and `eventmachine`,
+but not `rack`. For more information, see the `CONSERVATIVE UPDATING` section
+of [bundle install(1)](bundle-install.1.html).
+
+Starting with 1.14, specifying the `--conservative` option will also prevent indirect
+dependencies from being updated.
+
+## PATCH LEVEL OPTIONS
+
+Version 1.14 introduced 4 patch-level options that will influence how gem
+versions are resolved. One of the following options can be used: `--patch`,
+`--minor` or `--major`. `--strict` can be added to further influence resolution.
+
+* `--patch`:
+  Prefer updating only to next patch version.
+
+* `--minor`:
+  Prefer updating only to next minor version.
+
+* `--major`:
+  Prefer updating to next major version (default).
+
+* `--strict`:
+  Do not allow any gem to be updated past latest `--patch` | `--minor` | `--major`.
+
+When Bundler is resolving what versions to use to satisfy declared
+requirements in the Gemfile or in parent gems, it looks up all
+available versions, filters out any versions that don't satisfy
+the requirement, and then, by default, sorts them from newest to
+oldest, considering them in that order.
+
+Providing one of the patch level options (e.g. `--patch`) changes the
+sort order of the satisfying versions, causing Bundler to consider the
+latest `--patch` or `--minor` version available before other versions.
+Note that versions outside the stated patch level could still be
+resolved to if necessary to find a suitable dependency graph.
+
+For example, if gem 'foo' is locked at 1.0.2, with no gem requirement
+defined in the Gemfile, and versions 1.0.3, 1.0.4, 1.1.0, 1.1.1, 2.0.0
+all exist, the default order of preference by default (`--major`) will
+be "2.0.0, 1.1.1, 1.1.0, 1.0.4, 1.0.3, 1.0.2".
+
+If the `--patch` option is used, the order of preference will change to
+"1.0.4, 1.0.3, 1.0.2, 1.1.1, 1.1.0, 2.0.0".
+
+If the `--minor` option is used, the order of preference will change to
+"1.1.1, 1.1.0, 1.0.4, 1.0.3, 1.0.2, 2.0.0".
+
+Combining the `--strict` option with any of the patch level options
+will remove any versions beyond the scope of the patch level option,
+to ensure that no gem is updated that far.
+
+To continue the previous example, if both `--patch` and `--strict`
+options are used, the available versions for resolution would be
+"1.0.4, 1.0.3, 1.0.2". If `--minor` and `--strict` are used, it would
+be "1.1.1, 1.1.0, 1.0.4, 1.0.3, 1.0.2".
+
+Gem requirements as defined in the Gemfile will still be the first
+determining factor for what versions are available. If the gem
+requirement for `foo` in the Gemfile is '~> 1.0', that will accomplish
+the same thing as providing the `--minor` and `--strict` options.
+
+## PATCH LEVEL EXAMPLES
+
+Given the following gem specifications:
+
+    foo 1.4.3, requires: ~> bar 2.0
+    foo 1.4.4, requires: ~> bar 2.0
+    foo 1.4.5, requires: ~> bar 2.1
+    foo 1.5.0, requires: ~> bar 2.1
+    foo 1.5.1, requires: ~> bar 3.0
+    bar with versions 2.0.3, 2.0.4, 2.1.0, 2.1.1, 3.0.0
+
+Gemfile:
+
+    gem 'foo'
+
+Gemfile.lock:
+
+    foo (1.4.3)
+      bar (~> 2.0)
+    bar (2.0.3)
+
+Cases:
+
+    #  Command Line                     Result
+    ------------------------------------------------------------
+    1  bundle update --patch            'foo 1.4.5', 'bar 2.1.1'
+    2  bundle update --patch foo        'foo 1.4.5', 'bar 2.1.1'
+    3  bundle update --minor            'foo 1.5.1', 'bar 3.0.0'
+    4  bundle update --minor --strict   'foo 1.5.0', 'bar 2.1.1'
+    5  bundle update --patch --strict   'foo 1.4.4', 'bar 2.0.4'
+
+In case 1, bar is upgraded to 2.1.1, a minor version increase, because
+the dependency from foo 1.4.5 required it.
+
+In case 2, only foo is requested to be unlocked, but bar is also
+allowed to move because it's not a declared dependency in the Gemfile.
+
+In case 3, bar goes up a whole major release, because a minor increase
+is preferred now for foo, and when it goes to 1.5.1, it requires 3.0.0
+of bar.
+
+In case 4, foo is preferred up to a minor version, but 1.5.1 won't work
+because the --strict flag removes bar 3.0.0 from consideration since
+it's a major increment.
+
+In case 5, both foo and bar have any minor or major increments removed
+from consideration because of the --strict flag, so the most they can
+move is up to 1.4.4 and 2.0.4.
+
+## RECOMMENDED WORKFLOW
+
+In general, when working with an application managed with bundler, you should
+use the following workflow:
+
+* After you create your Gemfile(5) for the first time, run
+
+    $ bundle install
+
+* Check the resulting `Gemfile.lock` into version control
+
+    $ git add Gemfile.lock
+
+* When checking out this repository on another development machine, run
+
+    $ bundle install
+
+* When checking out this repository on a deployment machine, run
+
+    $ bundle install --deployment
+
+* After changing the Gemfile(5) to reflect a new or update dependency, run
+
+    $ bundle install
+
+* Make sure to check the updated `Gemfile.lock` into version control
+
+    $ git add Gemfile.lock
+
+* If [bundle install(1)](bundle-install.1.html) reports a conflict, manually update the specific
+  gems that you changed in the Gemfile(5)
+
+    $ bundle update rails thin
+
+* If you want to update all the gems to the latest possible versions that
+  still match the gems listed in the Gemfile(5), run
+
+    $ bundle update --all
diff --git a/lib/bundler/man/bundle-viz.1 b/lib/bundler/man/bundle-viz.1
new file mode 100644
index 0000000000..f792aa6346
--- /dev/null
+++ b/lib/bundler/man/bundle-viz.1
@@ -0,0 +1,39 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "BUNDLE\-VIZ" "1" "December 2021" "" ""
+.
+.SH "NAME"
+\fBbundle\-viz\fR \- Generates a visual dependency graph for your Gemfile
+.
+.SH "SYNOPSIS"
+\fBbundle viz\fR [\-\-file=FILE] [\-\-format=FORMAT] [\-\-requirements] [\-\-version] [\-\-without=GROUP GROUP]
+.
+.SH "DESCRIPTION"
+\fBviz\fR generates a PNG file of the current \fBGemfile(5)\fR as a dependency graph\. \fBviz\fR requires the ruby\-graphviz gem (and its dependencies)\.
+.
+.P
+The associated gems must also be installed via \fBbundle install(1)\fR \fIbundle\-install\.1\.html\fR\.
+.
+.SH "OPTIONS"
+.
+.TP
+\fB\-\-file\fR, \fB\-f\fR
+The name to use for the generated file\. See \fB\-\-format\fR option
+.
+.TP
+\fB\-\-format\fR, \fB\-F\fR
+This is output format option\. Supported format is png, jpg, svg, dot \.\.\.
+.
+.TP
+\fB\-\-requirements\fR, \fB\-R\fR
+Set to show the version of each required dependency\.
+.
+.TP
+\fB\-\-version\fR, \fB\-v\fR
+Set to show each gem version\.
+.
+.TP
+\fB\-\-without\fR, \fB\-W\fR
+Exclude gems that are part of the specified named group\.
+
diff --git a/lib/bundler/man/bundle-viz.1.ronn b/lib/bundler/man/bundle-viz.1.ronn
new file mode 100644
index 0000000000..701df5415e
--- /dev/null
+++ b/lib/bundler/man/bundle-viz.1.ronn
@@ -0,0 +1,30 @@
+bundle-viz(1) -- Generates a visual dependency graph for your Gemfile
+=====================================================================
+
+## SYNOPSIS
+
+`bundle viz` [--file=FILE]
+             [--format=FORMAT]
+             [--requirements]
+             [--version]
+             [--without=GROUP GROUP]
+
+## DESCRIPTION
+
+`viz` generates a PNG file of the current `Gemfile(5)` as a dependency graph.
+`viz` requires the ruby-graphviz gem (and its dependencies).
+
+The associated gems must also be installed via [`bundle install(1)`](bundle-install.1.html).
+
+## OPTIONS
+
+* `--file`, `-f`:
+  The name to use for the generated file. See `--format` option
+* `--format`, `-F`:
+  This is output format option. Supported format is png, jpg, svg, dot ...
+* `--requirements`, `-R`:
+  Set to show the version of each required dependency.
+* `--version`, `-v`:
+  Set to show each gem version.
+* `--without`, `-W`:
+  Exclude gems that are part of the specified named group.
diff --git a/lib/bundler/man/bundle.1 b/lib/bundler/man/bundle.1
new file mode 100644
index 0000000000..b1458bf57b
--- /dev/null
+++ b/lib/bundler/man/bundle.1
@@ -0,0 +1,136 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "BUNDLE" "1" "December 2021" "" ""
+.
+.SH "NAME"
+\fBbundle\fR \- Ruby Dependency Management
+.
+.SH "SYNOPSIS"
+\fBbundle\fR COMMAND [\-\-no\-color] [\-\-verbose] [ARGS]
+.
+.SH "DESCRIPTION"
+Bundler manages an \fBapplication\'s dependencies\fR through its entire life across many machines systematically and repeatably\.
+.
+.P
+See the bundler website \fIhttps://bundler\.io\fR for information on getting started, and Gemfile(5) for more information on the \fBGemfile\fR format\.
+.
+.SH "OPTIONS"
+.
+.TP
+\fB\-\-no\-color\fR
+Print all output without color
+.
+.TP
+\fB\-\-retry\fR, \fB\-r\fR
+Specify the number of times you wish to attempt network commands
+.
+.TP
+\fB\-\-verbose\fR, \fB\-V\fR
+Print out additional logging information
+.
+.SH "BUNDLE COMMANDS"
+We divide \fBbundle\fR subcommands into primary commands and utilities:
+.
+.SH "PRIMARY COMMANDS"
+.
+.TP
+\fBbundle install(1)\fR \fIbundle\-install\.1\.html\fR
+Install the gems specified by the \fBGemfile\fR or \fBGemfile\.lock\fR
+.
+.TP
+\fBbundle update(1)\fR \fIbundle\-update\.1\.html\fR
+Update dependencies to their latest versions
+.
+.TP
+\fBbundle package(1)\fR \fIbundle\-package\.1\.html\fR
+Package the \.gem files required by your application into the \fBvendor/cache\fR directory
+.
+.TP
+\fBbundle exec(1)\fR \fIbundle\-exec\.1\.html\fR
+Execute a script in the current bundle
+.
+.TP
+\fBbundle config(1)\fR \fIbundle\-config\.1\.html\fR
+Specify and read configuration options for Bundler
+.
+.TP
+\fBbundle help(1)\fR
+Display detailed help for each subcommand
+.
+.SH "UTILITIES"
+.
+.TP
+\fBbundle add(1)\fR \fIbundle\-add\.1\.html\fR
+Add the named gem to the Gemfile and run \fBbundle install\fR
+.
+.TP
+\fBbundle binstubs(1)\fR \fIbundle\-binstubs\.1\.html\fR
+Generate binstubs for executables in a gem
+.
+.TP
+\fBbundle check(1)\fR \fIbundle\-check\.1\.html\fR
+Determine whether the requirements for your application are installed and available to Bundler
+.
+.TP
+\fBbundle show(1)\fR \fIbundle\-show\.1\.html\fR
+Show the source location of a particular gem in the bundle
+.
+.TP
+\fBbundle outdated(1)\fR \fIbundle\-outdated\.1\.html\fR
+Show all of the outdated gems in the current bundle
+.
+.TP
+\fBbundle console(1)\fR
+Start an IRB session in the current bundle
+.
+.TP
+\fBbundle open(1)\fR \fIbundle\-open\.1\.html\fR
+Open an installed gem in the editor
+.
+.TP
+\fBbundle lock(1)\fR \fIbundle\-lock\.1\.html\fR
+Generate a lockfile for your dependencies
+.
+.TP
+\fBbundle viz(1)\fR \fIbundle\-viz\.1\.html\fR
+Generate a visual representation of your dependencies
+.
+.TP
+\fBbundle init(1)\fR \fIbundle\-init\.1\.html\fR
+Generate a simple \fBGemfile\fR, placed in the current directory
+.
+.TP
+\fBbundle gem(1)\fR \fIbundle\-gem\.1\.html\fR
+Create a simple gem, suitable for development with Bundler
+.
+.TP
+\fBbundle platform(1)\fR \fIbundle\-platform\.1\.html\fR
+Display platform compatibility information
+.
+.TP
+\fBbundle clean(1)\fR \fIbundle\-clean\.1\.html\fR
+Clean up unused gems in your Bundler directory
+.
+.TP
+\fBbundle doctor(1)\fR \fIbundle\-doctor\.1\.html\fR
+Display warnings about common problems
+.
+.TP
+\fBbundle remove(1)\fR \fIbundle\-remove\.1\.html\fR
+Removes gems from the Gemfile
+.
+.SH "PLUGINS"
+When running a command that isn\'t listed in PRIMARY COMMANDS or UTILITIES, Bundler will try to find an executable on your path named \fBbundler\-<command>\fR and execute it, passing down any extra arguments to it\.
+.
+.SH "OBSOLETE"
+These commands are obsolete and should no longer be used:
+.
+.IP "\(bu" 4
+\fBbundle cache(1)\fR
+.
+.IP "\(bu" 4
+\fBbundle show(1)\fR
+.
+.IP "" 0
+
diff --git a/lib/bundler/man/bundle.1.ronn b/lib/bundler/man/bundle.1.ronn
new file mode 100644
index 0000000000..5b1712394a
--- /dev/null
+++ b/lib/bundler/man/bundle.1.ronn
@@ -0,0 +1,111 @@
+bundle(1) -- Ruby Dependency Management
+=======================================
+
+## SYNOPSIS
+
+`bundle` COMMAND [--no-color] [--verbose] [ARGS]
+
+## DESCRIPTION
+
+Bundler manages an `application's dependencies` through its entire life
+across many machines systematically and repeatably.
+
+See [the bundler website](https://bundler.io) for information on getting
+started, and Gemfile(5) for more information on the `Gemfile` format.
+
+## OPTIONS
+
+* `--no-color`:
+  Print all output without color
+
+* `--retry`, `-r`:
+  Specify the number of times you wish to attempt network commands
+
+* `--verbose`, `-V`:
+  Print out additional logging information
+
+## BUNDLE COMMANDS
+
+We divide `bundle` subcommands into primary commands and utilities:
+
+## PRIMARY COMMANDS
+
+* [`bundle install(1)`](bundle-install.1.html):
+  Install the gems specified by the `Gemfile` or `Gemfile.lock`
+
+* [`bundle update(1)`](bundle-update.1.html):
+  Update dependencies to their latest versions
+
+* [`bundle package(1)`](bundle-package.1.html):
+  Package the .gem files required by your application into the
+  `vendor/cache` directory
+
+* [`bundle exec(1)`](bundle-exec.1.html):
+  Execute a script in the current bundle
+
+* [`bundle config(1)`](bundle-config.1.html):
+  Specify and read configuration options for Bundler
+
+* `bundle help(1)`:
+  Display detailed help for each subcommand
+
+## UTILITIES
+
+* [`bundle add(1)`](bundle-add.1.html):
+  Add the named gem to the Gemfile and run `bundle install`
+
+* [`bundle binstubs(1)`](bundle-binstubs.1.html):
+  Generate binstubs for executables in a gem
+
+* [`bundle check(1)`](bundle-check.1.html):
+  Determine whether the requirements for your application are installed
+  and available to Bundler
+
+* [`bundle show(1)`](bundle-show.1.html):
+  Show the source location of a particular gem in the bundle
+
+* [`bundle outdated(1)`](bundle-outdated.1.html):
+  Show all of the outdated gems in the current bundle
+
+* `bundle console(1)`:
+  Start an IRB session in the current bundle
+
+* [`bundle open(1)`](bundle-open.1.html):
+  Open an installed gem in the editor
+
+* [`bundle lock(1)`](bundle-lock.1.html):
+  Generate a lockfile for your dependencies
+
+* [`bundle viz(1)`](bundle-viz.1.html):
+  Generate a visual representation of your dependencies
+
+* [`bundle init(1)`](bundle-init.1.html):
+  Generate a simple `Gemfile`, placed in the current directory
+
+* [`bundle gem(1)`](bundle-gem.1.html):
+  Create a simple gem, suitable for development with Bundler
+
+* [`bundle platform(1)`](bundle-platform.1.html):
+  Display platform compatibility information
+
+* [`bundle clean(1)`](bundle-clean.1.html):
+  Clean up unused gems in your Bundler directory
+
+* [`bundle doctor(1)`](bundle-doctor.1.html):
+  Display warnings about common problems
+
+* [`bundle remove(1)`](bundle-remove.1.html):
+  Removes gems from the Gemfile
+
+## PLUGINS
+
+When running a command that isn't listed in PRIMARY COMMANDS or UTILITIES,
+Bundler will try to find an executable on your path named `bundler-<command>`
+and execute it, passing down any extra arguments to it.
+
+## OBSOLETE
+
+These commands are obsolete and should no longer be used:
+
+* `bundle cache(1)`
+* `bundle show(1)`
diff --git a/lib/bundler/man/gemfile.5 b/lib/bundler/man/gemfile.5
new file mode 100644
index 0000000000..2e423522b7
--- /dev/null
+++ b/lib/bundler/man/gemfile.5
@@ -0,0 +1,712 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "GEMFILE" "5" "December 2021" "" ""
+.
+.SH "NAME"
+\fBGemfile\fR \- A format for describing gem dependencies for Ruby programs
+.
+.SH "SYNOPSIS"
+A \fBGemfile\fR describes the gem dependencies required to execute associated Ruby code\.
+.
+.P
+Place the \fBGemfile\fR in the root of the directory containing the associated code\. For instance, in a Rails application, place the \fBGemfile\fR in the same directory as the \fBRakefile\fR\.
+.
+.SH "SYNTAX"
+A \fBGemfile\fR is evaluated as Ruby code, in a context which makes available a number of methods used to describe the gem requirements\.
+.
+.SH "GLOBAL SOURCES"
+At the top of the \fBGemfile\fR, add a line for the \fBRubygems\fR source that contains the gems listed in the \fBGemfile\fR\.
+.
+.IP "" 4
+.
+.nf
+
+source "https://rubygems\.org"
+.
+.fi
+.
+.IP "" 0
+.
+.P
+It is possible, but not recommended as of Bundler 1\.7, to add multiple global \fBsource\fR lines\. Each of these \fBsource\fRs \fBMUST\fR be a valid Rubygems repository\.
+.
+.P
+Sources are checked for gems following the heuristics described in \fISOURCE PRIORITY\fR\. If a gem is found in more than one global source, Bundler will print a warning after installing the gem indicating which source was used, and listing the other sources where the gem is available\. A specific source can be selected for gems that need to use a non\-standard repository, suppressing this warning, by using the \fI\fB:source\fR option\fR or a \fI\fBsource\fR block\fR\.
+.
+.SS "CREDENTIALS"
+Some gem sources require a username and password\. Use bundle config(1) \fIbundle\-config\.1\.html\fR to set the username and password for any of the sources that need it\. The command must be run once on each computer that will install the Gemfile, but this keeps the credentials from being stored in plain text in version control\.
+.
+.IP "" 4
+.
+.nf
+
+bundle config gems\.example\.com user:password
+.
+.fi
+.
+.IP "" 0
+.
+.P
+For some sources, like a company Gemfury account, it may be easier to include the credentials in the Gemfile as part of the source URL\.
+.
+.IP "" 4
+.
+.nf
+
+source "https://user:password@gems\.example\.com"
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Credentials in the source URL will take precedence over credentials set using \fBconfig\fR\.
+.
+.SH "RUBY"
+If your application requires a specific Ruby version or engine, specify your requirements using the \fBruby\fR method, with the following arguments\. All parameters are \fBOPTIONAL\fR unless otherwise specified\.
+.
+.SS "VERSION (required)"
+The version of Ruby that your application requires\. If your application requires an alternate Ruby engine, such as JRuby, Rubinius or TruffleRuby, this should be the Ruby version that the engine is compatible with\.
+.
+.IP "" 4
+.
+.nf
+
+ruby "1\.9\.3"
+.
+.fi
+.
+.IP "" 0
+.
+.SS "ENGINE"
+Each application \fImay\fR specify a Ruby engine\. If an engine is specified, an engine version \fImust\fR also be specified\.
+.
+.P
+What exactly is an Engine? \- A Ruby engine is an implementation of the Ruby language\.
+.
+.IP "\(bu" 4
+For background: the reference or original implementation of the Ruby programming language is called Matz\'s Ruby Interpreter \fIhttps://en\.wikipedia\.org/wiki/Ruby_MRI\fR, or MRI for short\. This is named after Ruby creator Yukihiro Matsumoto, also known as Matz\. MRI is also known as CRuby, because it is written in C\. MRI is the most widely used Ruby engine\.
+.
+.IP "\(bu" 4
+Other implementations \fIhttps://www\.ruby\-lang\.org/en/about/\fR of Ruby exist\. Some of the more well\-known implementations include Rubinius \fIhttps://rubinius\.com/\fR, and JRuby \fIhttp://jruby\.org/\fR\. Rubinius is an alternative implementation of Ruby written in Ruby\. JRuby is an implementation of Ruby on the JVM, short for Java Virtual Machine\.
+.
+.IP "" 0
+.
+.SS "ENGINE VERSION"
+Each application \fImay\fR specify a Ruby engine version\. If an engine version is specified, an engine \fImust\fR also be specified\. If the engine is "ruby" the engine version specified \fImust\fR match the Ruby version\.
+.
+.IP "" 4
+.
+.nf
+
+ruby "1\.8\.7", :engine => "jruby", :engine_version => "1\.6\.7"
+.
+.fi
+.
+.IP "" 0
+.
+.SS "PATCHLEVEL"
+Each application \fImay\fR specify a Ruby patchlevel\.
+.
+.IP "" 4
+.
+.nf
+
+ruby "2\.0\.0", :patchlevel => "247"
+.
+.fi
+.
+.IP "" 0
+.
+.SH "GEMS"
+Specify gem requirements using the \fBgem\fR method, with the following arguments\. All parameters are \fBOPTIONAL\fR unless otherwise specified\.
+.
+.SS "NAME (required)"
+For each gem requirement, list a single \fIgem\fR line\.
+.
+.IP "" 4
+.
+.nf
+
+gem "nokogiri"
+.
+.fi
+.
+.IP "" 0
+.
+.SS "VERSION"
+Each \fIgem\fR \fBMAY\fR have one or more version specifiers\.
+.
+.IP "" 4
+.
+.nf
+
+gem "nokogiri", ">= 1\.4\.2"
+gem "RedCloth", ">= 4\.1\.0", "< 4\.2\.0"
+.
+.fi
+.
+.IP "" 0
+.
+.SS "REQUIRE AS"
+Each \fIgem\fR \fBMAY\fR specify files that should be used when autorequiring via \fBBundler\.require\fR\. You may pass an array with multiple files or \fBtrue\fR if the file you want \fBrequired\fR has the same name as \fIgem\fR or \fBfalse\fR to prevent any file from being autorequired\.
+.
+.IP "" 4
+.
+.nf
+
+gem "redis", :require => ["redis/connection/hiredis", "redis"]
+gem "webmock", :require => false
+gem "byebug", :require => true
+.
+.fi
+.
+.IP "" 0
+.
+.P
+The argument defaults to the name of the gem\. For example, these are identical:
+.
+.IP "" 4
+.
+.nf
+
+gem "nokogiri"
+gem "nokogiri", :require => "nokogiri"
+gem "nokogiri", :require => true
+.
+.fi
+.
+.IP "" 0
+.
+.SS "GROUPS"
+Each \fIgem\fR \fBMAY\fR specify membership in one or more groups\. Any \fIgem\fR that does not specify membership in any group is placed in the \fBdefault\fR group\.
+.
+.IP "" 4
+.
+.nf
+
+gem "rspec", :group => :test
+gem "wirble", :groups => [:development, :test]
+.
+.fi
+.
+.IP "" 0
+.
+.P
+The Bundler runtime allows its two main methods, \fBBundler\.setup\fR and \fBBundler\.require\fR, to limit their impact to particular groups\.
+.
+.IP "" 4
+.
+.nf
+
+# setup adds gems to Ruby\'s load path
+Bundler\.setup                    # defaults to all groups
+require "bundler/setup"          # same as Bundler\.setup
+Bundler\.setup(:default)          # only set up the _default_ group
+Bundler\.setup(:test)             # only set up the _test_ group (but `not` _default_)
+Bundler\.setup(:default, :test)   # set up the _default_ and _test_ groups, but no others
+
+# require requires all of the gems in the specified groups
+Bundler\.require                  # defaults to the _default_ group
+Bundler\.require(:default)        # identical
+Bundler\.require(:default, :test) # requires the _default_ and _test_ groups
+Bundler\.require(:test)           # requires the _test_ group
+.
+.fi
+.
+.IP "" 0
+.
+.P
+The Bundler CLI allows you to specify a list of groups whose gems \fBbundle install\fR should not install with the \fBwithout\fR configuration\.
+.
+.P
+To specify multiple groups to ignore, specify a list of groups separated by spaces\.
+.
+.IP "" 4
+.
+.nf
+
+bundle config set \-\-local without test
+bundle config set \-\-local without development test
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Also, calling \fBBundler\.setup\fR with no parameters, or calling \fBrequire "bundler/setup"\fR will setup all groups except for the ones you excluded via \fB\-\-without\fR (since they are not available)\.
+.
+.P
+Note that on \fBbundle install\fR, bundler downloads and evaluates all gems, in order to create a single canonical list of all of the required gems and their dependencies\. This means that you cannot list different versions of the same gems in different groups\. For more details, see Understanding Bundler \fIhttps://bundler\.io/rationale\.html\fR\.
+.
+.SS "PLATFORMS"
+If a gem should only be used in a particular platform or set of platforms, you can specify them\. Platforms are essentially identical to groups, except that you do not need to use the \fB\-\-without\fR install\-time flag to exclude groups of gems for other platforms\.
+.
+.P
+There are a number of \fBGemfile\fR platforms:
+.
+.TP
+\fBruby\fR
+C Ruby (MRI), Rubinius or TruffleRuby, but \fBNOT\fR Windows
+.
+.TP
+\fBmri\fR
+Same as \fIruby\fR, but only C Ruby (MRI)
+.
+.TP
+\fBmingw\fR
+Windows 32 bit \'mingw32\' platform (aka RubyInstaller)
+.
+.TP
+\fBx64_mingw\fR
+Windows 64 bit \'mingw32\' platform (aka RubyInstaller x64)
+.
+.TP
+\fBrbx\fR
+Rubinius
+.
+.TP
+\fBjruby\fR
+JRuby
+.
+.TP
+\fBtruffleruby\fR
+TruffleRuby
+.
+.TP
+\fBmswin\fR
+Windows
+.
+.P
+You can restrict further by platform and version for all platforms \fIexcept\fR for \fBrbx\fR, \fBjruby\fR, \fBtruffleruby\fR and \fBmswin\fR\.
+.
+.P
+To specify a version in addition to a platform, append the version number without the delimiter to the platform\. For example, to specify that a gem should only be used on platforms with Ruby 2\.3, use:
+.
+.IP "" 4
+.
+.nf
+
+ruby_23
+.
+.fi
+.
+.IP "" 0
+.
+.P
+The full list of platforms and supported versions includes:
+.
+.TP
+\fBruby\fR
+1\.8, 1\.9, 2\.0, 2\.1, 2\.2, 2\.3, 2\.4, 2\.5, 2\.6
+.
+.TP
+\fBmri\fR
+1\.8, 1\.9, 2\.0, 2\.1, 2\.2, 2\.3, 2\.4, 2\.5, 2\.6
+.
+.TP
+\fBmingw\fR
+1\.8, 1\.9, 2\.0, 2\.1, 2\.2, 2\.3, 2\.4, 2\.5, 2\.6
+.
+.TP
+\fBx64_mingw\fR
+2\.0, 2\.1, 2\.2, 2\.3, 2\.4, 2\.5, 2\.6
+.
+.P
+As with groups, you can specify one or more platforms:
+.
+.IP "" 4
+.
+.nf
+
+gem "weakling",   :platforms => :jruby
+gem "ruby\-debug", :platforms => :mri_18
+gem "nokogiri",   :platforms => [:mri_18, :jruby]
+.
+.fi
+.
+.IP "" 0
+.
+.P
+All operations involving groups (\fBbundle install\fR \fIbundle\-install\.1\.html\fR, \fBBundler\.setup\fR, \fBBundler\.require\fR) behave exactly the same as if any groups not matching the current platform were explicitly excluded\.
+.
+.SS "SOURCE"
+You can select an alternate Rubygems repository for a gem using the \':source\' option\.
+.
+.IP "" 4
+.
+.nf
+
+gem "some_internal_gem", :source => "https://gems\.example\.com"
+.
+.fi
+.
+.IP "" 0
+.
+.P
+This forces the gem to be loaded from this source and ignores any global sources declared at the top level of the file\. If the gem does not exist in this source, it will not be installed\.
+.
+.P
+Bundler will search for child dependencies of this gem by first looking in the source selected for the parent, but if they are not found there, it will fall back on global sources using the ordering described in \fISOURCE PRIORITY\fR\.
+.
+.P
+Selecting a specific source repository this way also suppresses the ambiguous gem warning described above in \fIGLOBAL SOURCES (#source)\fR\.
+.
+.P
+Using the \fB:source\fR option for an individual gem will also make that source available as a possible global source for any other gems which do not specify explicit sources\. Thus, when adding gems with explicit sources, it is recommended that you also ensure all other gems in the Gemfile are using explicit sources\.
+.
+.SS "GIT"
+If necessary, you can specify that a gem is located at a particular git repository using the \fB:git\fR parameter\. The repository can be accessed via several protocols:
+.
+.TP
+\fBHTTP(S)\fR
+gem "rails", :git => "https://github\.com/rails/rails\.git"
+.
+.TP
+\fBSSH\fR
+gem "rails", :git => "git@github\.com:rails/rails\.git"
+.
+.TP
+\fBgit\fR
+gem "rails", :git => "git://github\.com/rails/rails\.git"
+.
+.P
+If using SSH, the user that you use to run \fBbundle install\fR \fBMUST\fR have the appropriate keys available in their \fB$HOME/\.ssh\fR\.
+.
+.P
+\fBNOTE\fR: \fBhttp://\fR and \fBgit://\fR URLs should be avoided if at all possible\. These protocols are unauthenticated, so a man\-in\-the\-middle attacker can deliver malicious code and compromise your system\. HTTPS and SSH are strongly preferred\.
+.
+.P
+The \fBgroup\fR, \fBplatforms\fR, and \fBrequire\fR options are available and behave exactly the same as they would for a normal gem\.
+.
+.P
+A git repository \fBSHOULD\fR have at least one file, at the root of the directory containing the gem, with the extension \fB\.gemspec\fR\. This file \fBMUST\fR contain a valid gem specification, as expected by the \fBgem build\fR command\.
+.
+.P
+If a git repository does not have a \fB\.gemspec\fR, bundler will attempt to create one, but it will not contain any dependencies, executables, or C extension compilation instructions\. As a result, it may fail to properly integrate into your application\.
+.
+.P
+If a git repository does have a \fB\.gemspec\fR for the gem you attached it to, a version specifier, if provided, means that the git repository is only valid if the \fB\.gemspec\fR specifies a version matching the version specifier\. If not, bundler will print a warning\.
+.
+.IP "" 4
+.
+.nf
+
+gem "rails", "2\.3\.8", :git => "https://github\.com/rails/rails\.git"
+# bundle install will fail, because the \.gemspec in the rails
+# repository\'s master branch specifies version 3\.0\.0
+.
+.fi
+.
+.IP "" 0
+.
+.P
+If a git repository does \fBnot\fR have a \fB\.gemspec\fR for the gem you attached it to, a version specifier \fBMUST\fR be provided\. Bundler will use this version in the simple \fB\.gemspec\fR it creates\.
+.
+.P
+Git repositories support a number of additional options\.
+.
+.TP
+\fBbranch\fR, \fBtag\fR, and \fBref\fR
+You \fBMUST\fR only specify at most one of these options\. The default is \fB:branch => "master"\fR\. For example:
+.
+.IP
+gem "rails", :git => "https://github\.com/rails/rails\.git", :branch => "5\-0\-stable"
+.
+.IP
+gem "rails", :git => "https://github\.com/rails/rails\.git", :tag => "v5\.0\.0"
+.
+.IP
+gem "rails", :git => "https://github\.com/rails/rails\.git", :ref => "4aded"
+.
+.TP
+\fBsubmodules\fR
+For reference, a git submodule \fIhttps://git\-scm\.com/book/en/v2/Git\-Tools\-Submodules\fR lets you have another git repository within a subfolder of your repository\. Specify \fB:submodules => true\fR to cause bundler to expand any submodules included in the git repository
+.
+.P
+If a git repository contains multiple \fB\.gemspecs\fR, each \fB\.gemspec\fR represents a gem located at the same place in the file system as the \fB\.gemspec\fR\.
+.
+.IP "" 4
+.
+.nf
+
+|~rails                   [git root]
+| |\-rails\.gemspec         [rails gem located here]
+|~actionpack
+| |\-actionpack\.gemspec    [actionpack gem located here]
+|~activesupport
+| |\-activesupport\.gemspec [activesupport gem located here]
+|\.\.\.
+.
+.fi
+.
+.IP "" 0
+.
+.P
+To install a gem located in a git repository, bundler changes to the directory containing the gemspec, runs \fBgem build name\.gemspec\fR and then installs the resulting gem\. The \fBgem build\fR command, which comes standard with Rubygems, evaluates the \fB\.gemspec\fR in the context of the directory in which it is located\.
+.
+.SS "GIT SOURCE"
+A custom git source can be defined via the \fBgit_source\fR method\. Provide the source\'s name as an argument, and a block which receives a single argument and interpolates it into a string to return the full repo address:
+.
+.IP "" 4
+.
+.nf
+
+git_source(:stash){ |repo_name| "https://stash\.corp\.acme\.pl/#{repo_name}\.git" }
+gem \'rails\', :stash => \'forks/rails\'
+.
+.fi
+.
+.IP "" 0
+.
+.P
+In addition, if you wish to choose a specific branch:
+.
+.IP "" 4
+.
+.nf
+
+gem "rails", :stash => "forks/rails", :branch => "branch_name"
+.
+.fi
+.
+.IP "" 0
+.
+.SS "GITHUB"
+\fBNOTE\fR: This shorthand should be avoided until Bundler 2\.0, since it currently expands to an insecure \fBgit://\fR URL\. This allows a man\-in\-the\-middle attacker to compromise your system\.
+.
+.P
+If the git repository you want to use is hosted on GitHub and is public, you can use the :github shorthand to specify the github username and repository name (without the trailing "\.git"), separated by a slash\. If both the username and repository name are the same, you can omit one\.
+.
+.IP "" 4
+.
+.nf
+
+gem "rails", :github => "rails/rails"
+gem "rails", :github => "rails"
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Are both equivalent to
+.
+.IP "" 4
+.
+.nf
+
+gem "rails", :git => "git://github\.com/rails/rails\.git"
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Since the \fBgithub\fR method is a specialization of \fBgit_source\fR, it accepts a \fB:branch\fR named argument\.
+.
+.P
+You can also directly pass a pull request URL:
+.
+.IP "" 4
+.
+.nf
+
+gem "rails", :github => "https://github\.com/rails/rails/pull/43753"
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Which is equivalent to:
+.
+.IP "" 4
+.
+.nf
+
+gem "rails", :github => "rails/rails", branch: "refs/pull/43753/head"
+.
+.fi
+.
+.IP "" 0
+.
+.SS "GIST"
+If the git repository you want to use is hosted as a Github Gist and is public, you can use the :gist shorthand to specify the gist identifier (without the trailing "\.git")\.
+.
+.IP "" 4
+.
+.nf
+
+gem "the_hatch", :gist => "4815162342"
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Is equivalent to:
+.
+.IP "" 4
+.
+.nf
+
+gem "the_hatch", :git => "https://gist\.github\.com/4815162342\.git"
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Since the \fBgist\fR method is a specialization of \fBgit_source\fR, it accepts a \fB:branch\fR named argument\.
+.
+.SS "BITBUCKET"
+If the git repository you want to use is hosted on Bitbucket and is public, you can use the :bitbucket shorthand to specify the bitbucket username and repository name (without the trailing "\.git"), separated by a slash\. If both the username and repository name are the same, you can omit one\.
+.
+.IP "" 4
+.
+.nf
+
+gem "rails", :bitbucket => "rails/rails"
+gem "rails", :bitbucket => "rails"
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Are both equivalent to
+.
+.IP "" 4
+.
+.nf
+
+gem "rails", :git => "https://rails@bitbucket\.org/rails/rails\.git"
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Since the \fBbitbucket\fR method is a specialization of \fBgit_source\fR, it accepts a \fB:branch\fR named argument\.
+.
+.SS "PATH"
+You can specify that a gem is located in a particular location on the file system\. Relative paths are resolved relative to the directory containing the \fBGemfile\fR\.
+.
+.P
+Similar to the semantics of the \fB:git\fR option, the \fB:path\fR option requires that the directory in question either contains a \fB\.gemspec\fR for the gem, or that you specify an explicit version that bundler should use\.
+.
+.P
+Unlike \fB:git\fR, bundler does not compile C extensions for gems specified as paths\.
+.
+.IP "" 4
+.
+.nf
+
+gem "rails", :path => "vendor/rails"
+.
+.fi
+.
+.IP "" 0
+.
+.P
+If you would like to use multiple local gems directly from the filesystem, you can set a global \fBpath\fR option to the path containing the gem\'s files\. This will automatically load gemspec files from subdirectories\.
+.
+.IP "" 4
+.
+.nf
+
+path \'components\' do
+  gem \'admin_ui\'
+  gem \'public_ui\'
+end
+.
+.fi
+.
+.IP "" 0
+.
+.SH "BLOCK FORM OF SOURCE, GIT, PATH, GROUP and PLATFORMS"
+The \fB:source\fR, \fB:git\fR, \fB:path\fR, \fB:group\fR, and \fB:platforms\fR options may be applied to a group of gems by using block form\.
+.
+.IP "" 4
+.
+.nf
+
+source "https://gems\.example\.com" do
+  gem "some_internal_gem"
+  gem "another_internal_gem"
+end
+
+git "https://github\.com/rails/rails\.git" do
+  gem "activesupport"
+  gem "actionpack"
+end
+
+platforms :ruby do
+  gem "ruby\-debug"
+  gem "sqlite3"
+end
+
+group :development, :optional => true do
+  gem "wirble"
+  gem "faker"
+end
+.
+.fi
+.
+.IP "" 0
+.
+.P
+In the case of the group block form the :optional option can be given to prevent a group from being installed unless listed in the \fB\-\-with\fR option given to the \fBbundle install\fR command\.
+.
+.P
+In the case of the \fBgit\fR block form, the \fB:ref\fR, \fB:branch\fR, \fB:tag\fR, and \fB:submodules\fR options may be passed to the \fBgit\fR method, and all gems in the block will inherit those options\.
+.
+.P
+The presence of a \fBsource\fR block in a Gemfile also makes that source available as a possible global source for any other gems which do not specify explicit sources\. Thus, when defining source blocks, it is recommended that you also ensure all other gems in the Gemfile are using explicit sources, either via source blocks or \fB:source\fR directives on individual gems\.
+.
+.SH "INSTALL_IF"
+The \fBinstall_if\fR method allows gems to be installed based on a proc or lambda\. This is especially useful for optional gems that can only be used if certain software is installed or some other conditions are met\.
+.
+.IP "" 4
+.
+.nf
+
+install_if \-> { RUBY_PLATFORM =~ /darwin/ } do
+  gem "pasteboard"
+end
+.
+.fi
+.
+.IP "" 0
+.
+.SH "GEMSPEC"
+The \fB\.gemspec\fR \fIhttp://guides\.rubygems\.org/specification\-reference/\fR file is where you provide metadata about your gem to Rubygems\. Some required Gemspec attributes include the name, description, and homepage of your gem\. This is also where you specify the dependencies your gem needs to run\.
+.
+.P
+If you wish to use Bundler to help install dependencies for a gem while it is being developed, use the \fBgemspec\fR method to pull in the dependencies listed in the \fB\.gemspec\fR file\.
+.
+.P
+The \fBgemspec\fR method adds any runtime dependencies as gem requirements in the default group\. It also adds development dependencies as gem requirements in the \fBdevelopment\fR group\. Finally, it adds a gem requirement on your project (\fB:path => \'\.\'\fR)\. In conjunction with \fBBundler\.setup\fR, this allows you to require project files in your test code as you would if the project were installed as a gem; you need not manipulate the load path manually or require project files via relative paths\.
+.
+.P
+The \fBgemspec\fR method supports optional \fB:path\fR, \fB:glob\fR, \fB:name\fR, and \fB:development_group\fR options, which control where bundler looks for the \fB\.gemspec\fR, the glob it uses to look for the gemspec (defaults to: "{,\fI,\fR/*}\.gemspec"), what named \fB\.gemspec\fR it uses (if more than one is present), and which group development dependencies are included in\.
+.
+.P
+When a \fBgemspec\fR dependency encounters version conflicts during resolution, the local version under development will always be selected \-\- even if there are remote versions that better match other requirements for the \fBgemspec\fR gem\.
+.
+.SH "SOURCE PRIORITY"
+When attempting to locate a gem to satisfy a gem requirement, bundler uses the following priority order:
+.
+.IP "1." 4
+The source explicitly attached to the gem (using \fB:source\fR, \fB:path\fR, or \fB:git\fR)
+.
+.IP "2." 4
+For implicit gems (dependencies of explicit gems), any source, git, or path repository declared on the parent\. This results in bundler prioritizing the ActiveSupport gem from the Rails git repository over ones from \fBrubygems\.org\fR
+.
+.IP "3." 4
+The sources specified via global \fBsource\fR lines, searching each source in your \fBGemfile\fR from last added to first added\.
+.
+.IP "" 0
+
diff --git a/lib/bundler/man/gemfile.5.ronn b/lib/bundler/man/gemfile.5.ronn
new file mode 100644
index 0000000000..20ce3242ae
--- /dev/null
+++ b/lib/bundler/man/gemfile.5.ronn
@@ -0,0 +1,525 @@
+Gemfile(5) -- A format for describing gem dependencies for Ruby programs
+========================================================================
+
+## SYNOPSIS
+
+A `Gemfile` describes the gem dependencies required to execute associated
+Ruby code.
+
+Place the `Gemfile` in the root of the directory containing the associated
+code. For instance, in a Rails application, place the `Gemfile` in the same
+directory as the `Rakefile`.
+
+## SYNTAX
+
+A `Gemfile` is evaluated as Ruby code, in a context which makes available
+a number of methods used to describe the gem requirements.
+
+## GLOBAL SOURCES
+
+At the top of the `Gemfile`, add a line for the `Rubygems` source that contains
+the gems listed in the `Gemfile`.
+
+    source "https://rubygems.org"
+
+It is possible, but not recommended as of Bundler 1.7, to add multiple global
+`source` lines. Each of these `source`s `MUST` be a valid Rubygems repository.
+
+Sources are checked for gems following the heuristics described in
+[SOURCE PRIORITY][]. If a gem is found in more than one global source, Bundler
+will print a warning after installing the gem indicating which source was used,
+and listing the other sources where the gem is available. A specific source can
+be selected for gems that need to use a non-standard repository, suppressing
+this warning, by using the [`:source` option](#SOURCE) or a
+[`source` block](#BLOCK-FORM-OF-SOURCE-GIT-PATH-GROUP-and-PLATFORMS).
+
+### CREDENTIALS
+
+Some gem sources require a username and password. Use [bundle config(1)](bundle-config.1.html) to set
+the username and password for any of the sources that need it. The command must
+be run once on each computer that will install the Gemfile, but this keeps the
+credentials from being stored in plain text in version control.
+
+    bundle config gems.example.com user:password
+
+For some sources, like a company Gemfury account, it may be easier to
+include the credentials in the Gemfile as part of the source URL.
+
+    source "https://user:password@gems.example.com"
+
+Credentials in the source URL will take precedence over credentials set using
+`config`.
+
+## RUBY
+
+If your application requires a specific Ruby version or engine, specify your
+requirements using the `ruby` method, with the following arguments.
+All parameters are `OPTIONAL` unless otherwise specified.
+
+### VERSION (required)
+
+The version of Ruby that your application requires. If your application
+requires an alternate Ruby engine, such as JRuby, Rubinius or TruffleRuby, this
+should be the Ruby version that the engine is compatible with.
+
+    ruby "1.9.3"
+
+### ENGINE
+
+Each application _may_ specify a Ruby engine. If an engine is specified, an
+engine version _must_ also be specified.
+
+What exactly is an Engine?
+  - A Ruby engine is an implementation of the Ruby language.
+
+  - For background: the reference or original implementation of the Ruby
+    programming language is called
+    [Matz's Ruby Interpreter](https://en.wikipedia.org/wiki/Ruby_MRI), or  MRI
+    for short. This is named after Ruby creator Yukihiro Matsumoto,
+    also known as Matz. MRI is also known as CRuby, because it is written in C.
+    MRI is the most widely used Ruby engine.
+
+  - [Other implementations](https://www.ruby-lang.org/en/about/) of Ruby exist.
+    Some of the more well-known implementations include
+    [Rubinius](https://rubinius.com/), and [JRuby](http://jruby.org/).
+    Rubinius is an alternative implementation of Ruby written in Ruby.
+    JRuby is an implementation of Ruby on the JVM, short for Java Virtual Machine.
+
+### ENGINE VERSION
+
+Each application _may_ specify a Ruby engine version. If an engine version is
+specified, an engine _must_ also be specified. If the engine is "ruby" the
+engine version specified _must_ match the Ruby version.
+
+    ruby "1.8.7", :engine => "jruby", :engine_version => "1.6.7"
+
+### PATCHLEVEL
+
+Each application _may_ specify a Ruby patchlevel.
+
+    ruby "2.0.0", :patchlevel => "247"
+
+## GEMS
+
+Specify gem requirements using the `gem` method, with the following arguments.
+All parameters are `OPTIONAL` unless otherwise specified.
+
+### NAME (required)
+
+For each gem requirement, list a single _gem_ line.
+
+    gem "nokogiri"
+
+### VERSION
+
+Each _gem_ `MAY` have one or more version specifiers.
+
+    gem "nokogiri", ">= 1.4.2"
+    gem "RedCloth", ">= 4.1.0", "< 4.2.0"
+
+### REQUIRE AS
+
+Each _gem_ `MAY` specify files that should be used when autorequiring via
+`Bundler.require`. You may pass an array with multiple files or `true` if the file
+you want `required` has the same name as _gem_ or `false` to
+prevent any file from being autorequired.
+
+    gem "redis", :require => ["redis/connection/hiredis", "redis"]
+    gem "webmock", :require => false
+    gem "byebug", :require => true
+
+The argument defaults to the name of the gem. For example, these are identical:
+
+    gem "nokogiri"
+    gem "nokogiri", :require => "nokogiri"
+    gem "nokogiri", :require => true
+
+### GROUPS
+
+Each _gem_ `MAY` specify membership in one or more groups. Any _gem_ that does
+not specify membership in any group is placed in the `default` group.
+
+    gem "rspec", :group => :test
+    gem "wirble", :groups => [:development, :test]
+
+The Bundler runtime allows its two main methods, `Bundler.setup` and
+`Bundler.require`, to limit their impact to particular groups.
+
+    # setup adds gems to Ruby's load path
+    Bundler.setup                    # defaults to all groups
+    require "bundler/setup"          # same as Bundler.setup
+    Bundler.setup(:default)          # only set up the _default_ group
+    Bundler.setup(:test)             # only set up the _test_ group (but `not` _default_)
+    Bundler.setup(:default, :test)   # set up the _default_ and _test_ groups, but no others
+
+    # require requires all of the gems in the specified groups
+    Bundler.require                  # defaults to the _default_ group
+    Bundler.require(:default)        # identical
+    Bundler.require(:default, :test) # requires the _default_ and _test_ groups
+    Bundler.require(:test)           # requires the _test_ group
+
+The Bundler CLI allows you to specify a list of groups whose gems `bundle install` should
+not install with the `without` configuration.
+
+To specify multiple groups to ignore, specify a list of groups separated by spaces.
+
+    bundle config set --local without test
+    bundle config set --local without development test
+
+Also, calling `Bundler.setup` with no parameters, or calling `require "bundler/setup"`
+will setup all groups except for the ones you excluded via `--without` (since they
+are not available).
+
+Note that on `bundle install`, bundler downloads and evaluates all gems, in order to
+create a single canonical list of all of the required gems and their dependencies.
+This means that you cannot list different versions of the same gems in different
+groups. For more details, see [Understanding Bundler](https://bundler.io/rationale.html).
+
+### PLATFORMS
+
+If a gem should only be used in a particular platform or set of platforms, you can
+specify them. Platforms are essentially identical to groups, except that you do not
+need to use the `--without` install-time flag to exclude groups of gems for other
+platforms.
+
+There are a number of `Gemfile` platforms:
+
+  * `ruby`:
+    C Ruby (MRI), Rubinius or TruffleRuby, but `NOT` Windows
+  * `mri`:
+    Same as _ruby_, but only C Ruby (MRI)
+  * `mingw`:
+    Windows 32 bit 'mingw32' platform (aka RubyInstaller)
+  * `x64_mingw`:
+    Windows 64 bit 'mingw32' platform (aka RubyInstaller x64)
+  * `rbx`:
+    Rubinius
+  * `jruby`:
+    JRuby
+  * `truffleruby`:
+    TruffleRuby
+  * `mswin`:
+    Windows
+
+You can restrict further by platform and version for all platforms *except* for
+`rbx`, `jruby`, `truffleruby` and `mswin`.
+
+To specify a version in addition to a platform, append the version number without
+the delimiter to the platform. For example, to specify that a gem should only be
+used on platforms with Ruby 2.3, use:
+
+    ruby_23
+
+The full list of platforms and supported versions includes:
+
+  * `ruby`:
+    1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6
+  * `mri`:
+    1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6
+  * `mingw`:
+    1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6
+  * `x64_mingw`:
+    2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6
+
+As with groups, you can specify one or more platforms:
+
+    gem "weakling",   :platforms => :jruby
+    gem "ruby-debug", :platforms => :mri_18
+    gem "nokogiri",   :platforms => [:mri_18, :jruby]
+
+All operations involving groups ([`bundle install`](bundle-install.1.html), `Bundler.setup`,
+`Bundler.require`) behave exactly the same as if any groups not
+matching the current platform were explicitly excluded.
+
+### SOURCE
+
+You can select an alternate Rubygems repository for a gem using the ':source'
+option.
+
+    gem "some_internal_gem", :source => "https://gems.example.com"
+
+This forces the gem to be loaded from this source and ignores any global sources
+declared at the top level of the file. If the gem does not exist in this source,
+it will not be installed.
+
+Bundler will search for child dependencies of this gem by first looking in the
+source selected for the parent, but if they are not found there, it will fall
+back on global sources using the ordering described in [SOURCE PRIORITY][].
+
+Selecting a specific source repository this way also suppresses the ambiguous
+gem warning described above in
+[GLOBAL SOURCES (#source)](#GLOBAL-SOURCES).
+
+Using the `:source` option for an individual gem will also make that source
+available as a possible global source for any other gems which do not specify
+explicit sources. Thus, when adding gems with explicit sources, it is
+recommended that you also ensure all other gems in the Gemfile are using
+explicit sources.
+
+### GIT
+
+If necessary, you can specify that a gem is located at a particular
+git repository using the `:git` parameter. The repository can be accessed via
+several protocols:
+
+  * `HTTP(S)`:
+    gem "rails", :git => "https://github.com/rails/rails.git"
+  * `SSH`:
+    gem "rails", :git => "git@github.com:rails/rails.git"
+  * `git`:
+    gem "rails", :git => "git://github.com/rails/rails.git"
+
+If using SSH, the user that you use to run `bundle install` `MUST` have the
+appropriate keys available in their `$HOME/.ssh`.
+
+`NOTE`: `http://` and `git://` URLs should be avoided if at all possible. These
+protocols are unauthenticated, so a man-in-the-middle attacker can deliver
+malicious code and compromise your system. HTTPS and SSH are strongly
+preferred.
+
+The `group`, `platforms`, and `require` options are available and behave
+exactly the same as they would for a normal gem.
+
+A git repository `SHOULD` have at least one file, at the root of the
+directory containing the gem, with the extension `.gemspec`. This file
+`MUST` contain a valid gem specification, as expected by the `gem build`
+command.
+
+If a git repository does not have a `.gemspec`, bundler will attempt to
+create one, but it will not contain any dependencies, executables, or
+C extension compilation instructions. As a result, it may fail to properly
+integrate into your application.
+
+If a git repository does have a `.gemspec` for the gem you attached it
+to, a version specifier, if provided, means that the git repository is
+only valid if the `.gemspec` specifies a version matching the version
+specifier. If not, bundler will print a warning.
+
+    gem "rails", "2.3.8", :git => "https://github.com/rails/rails.git"
+    # bundle install will fail, because the .gemspec in the rails
+    # repository's master branch specifies version 3.0.0
+
+If a git repository does `not` have a `.gemspec` for the gem you attached
+it to, a version specifier `MUST` be provided. Bundler will use this
+version in the simple `.gemspec` it creates.
+
+Git repositories support a number of additional options.
+
+  * `branch`, `tag`, and `ref`:
+    You `MUST` only specify at most one of these options. The default
+    is `:branch => "master"`.  For example:
+
+      gem "rails", :git => "https://github.com/rails/rails.git", :branch => "5-0-stable"
+
+      gem "rails", :git => "https://github.com/rails/rails.git", :tag => "v5.0.0"
+
+      gem "rails", :git => "https://github.com/rails/rails.git", :ref => "4aded"
+
+  * `submodules`:
+    For reference, a [git submodule](https://git-scm.com/book/en/v2/Git-Tools-Submodules)
+    lets you have another git repository within a subfolder of your repository.
+    Specify `:submodules => true` to cause bundler to expand any
+    submodules included in the git repository
+
+If a git repository contains multiple `.gemspecs`, each `.gemspec`
+represents a gem located at the same place in the file system as
+the `.gemspec`.
+
+    |~rails                   [git root]
+    | |-rails.gemspec         [rails gem located here]
+    |~actionpack
+    | |-actionpack.gemspec    [actionpack gem located here]
+    |~activesupport
+    | |-activesupport.gemspec [activesupport gem located here]
+    |...
+
+To install a gem located in a git repository, bundler changes to
+the directory containing the gemspec, runs `gem build name.gemspec`
+and then installs the resulting gem. The `gem build` command,
+which comes standard with Rubygems, evaluates the `.gemspec` in
+the context of the directory in which it is located.
+
+### GIT SOURCE
+
+A custom git source can be defined via the `git_source` method. Provide the source's name
+as an argument, and a block which receives a single argument and interpolates it into a
+string to return the full repo address:
+
+    git_source(:stash){ |repo_name| "https://stash.corp.acme.pl/#{repo_name}.git" }
+    gem 'rails', :stash => 'forks/rails'
+
+In addition, if you wish to choose a specific branch:
+
+    gem "rails", :stash => "forks/rails", :branch => "branch_name"
+
+### GITHUB
+
+`NOTE`: This shorthand should be avoided until Bundler 2.0, since it
+currently expands to an insecure `git://` URL. This allows a
+man-in-the-middle attacker to compromise your system.
+
+If the git repository you want to use is hosted on GitHub and is public, you can use the
+:github shorthand to specify the github username and repository name (without the
+trailing ".git"), separated by a slash. If both the username and repository name are the
+same, you can omit one.
+
+    gem "rails", :github => "rails/rails"
+    gem "rails", :github => "rails"
+
+Are both equivalent to
+
+    gem "rails", :git => "git://github.com/rails/rails.git"
+
+Since the `github` method is a specialization of `git_source`, it accepts a `:branch` named argument.
+
+You can also directly pass a pull request URL:
+
+    gem "rails", :github => "https://github.com/rails/rails/pull/43753"
+
+Which is equivalent to:
+
+    gem "rails", :github => "rails/rails", branch: "refs/pull/43753/head"
+
+### GIST
+
+If the git repository you want to use is hosted as a Github Gist and is public, you can use
+the :gist shorthand to specify the gist identifier (without the trailing ".git").
+
+    gem "the_hatch", :gist => "4815162342"
+
+Is equivalent to:
+
+    gem "the_hatch", :git => "https://gist.github.com/4815162342.git"
+
+Since the `gist` method is a specialization of `git_source`, it accepts a `:branch` named argument.
+
+### BITBUCKET
+
+If the git repository you want to use is hosted on Bitbucket and is public, you can use the
+:bitbucket shorthand to specify the bitbucket username and repository name (without the
+trailing ".git"), separated by a slash. If both the username and repository name are the
+same, you can omit one.
+
+    gem "rails", :bitbucket => "rails/rails"
+    gem "rails", :bitbucket => "rails"
+
+Are both equivalent to
+
+    gem "rails", :git => "https://rails@bitbucket.org/rails/rails.git"
+
+Since the `bitbucket` method is a specialization of `git_source`, it accepts a `:branch` named argument.
+
+### PATH
+
+You can specify that a gem is located in a particular location
+on the file system. Relative paths are resolved relative to the
+directory containing the `Gemfile`.
+
+Similar to the semantics of the `:git` option, the `:path`
+option requires that the directory in question either contains
+a `.gemspec` for the gem, or that you specify an explicit
+version that bundler should use.
+
+Unlike `:git`, bundler does not compile C extensions for
+gems specified as paths.
+
+    gem "rails", :path => "vendor/rails"
+
+If you would like to use multiple local gems directly from the filesystem, you can set a global `path` option to the path containing the gem's files. This will automatically load gemspec files from subdirectories.
+
+    path 'components' do
+      gem 'admin_ui'
+      gem 'public_ui'
+    end
+
+## BLOCK FORM OF SOURCE, GIT, PATH, GROUP and PLATFORMS
+
+The `:source`, `:git`, `:path`, `:group`, and `:platforms` options may be
+applied to a group of gems by using block form.
+
+    source "https://gems.example.com" do
+      gem "some_internal_gem"
+      gem "another_internal_gem"
+    end
+
+    git "https://github.com/rails/rails.git" do
+      gem "activesupport"
+      gem "actionpack"
+    end
+
+    platforms :ruby do
+      gem "ruby-debug"
+      gem "sqlite3"
+    end
+
+    group :development, :optional => true do
+      gem "wirble"
+      gem "faker"
+    end
+
+In the case of the group block form the :optional option can be given
+to prevent a group from being installed unless listed in the `--with`
+option given to the `bundle install` command.
+
+In the case of the `git` block form, the `:ref`, `:branch`, `:tag`,
+and `:submodules` options may be passed to the `git` method, and
+all gems in the block will inherit those options.
+
+The presence of a `source` block in a Gemfile also makes that source
+available as a possible global source for any other gems which do not specify
+explicit sources. Thus, when defining source blocks, it is
+recommended that you also ensure all other gems in the Gemfile are using
+explicit sources, either via source blocks or `:source` directives on
+individual gems.
+
+## INSTALL_IF
+
+The `install_if` method allows gems to be installed based on a proc or lambda.
+This is especially useful for optional gems that can only be used if certain
+software is installed or some other conditions are met.
+
+    install_if -> { RUBY_PLATFORM =~ /darwin/ } do
+      gem "pasteboard"
+    end
+
+## GEMSPEC
+
+The [`.gemspec`](http://guides.rubygems.org/specification-reference/) file is where
+ you provide metadata about your gem to Rubygems. Some required Gemspec
+ attributes include the name, description, and homepage of your gem. This is
+ also where you specify the dependencies your gem needs to run.
+
+If you wish to use Bundler to help install dependencies for a gem while it is
+being developed, use the `gemspec` method to pull in the dependencies listed in
+the `.gemspec` file.
+
+The `gemspec` method adds any runtime dependencies as gem requirements in the
+default group. It also adds development dependencies as gem requirements in the
+`development` group. Finally, it adds a gem requirement on your project (`:path
+=> '.'`). In conjunction with `Bundler.setup`, this allows you to require project
+files in your test code as you would if the project were installed as a gem; you
+need not manipulate the load path manually or require project files via relative
+paths.
+
+The `gemspec` method supports optional `:path`, `:glob`, `:name`, and `:development_group`
+options, which control where bundler looks for the `.gemspec`, the glob it uses to look
+for the gemspec (defaults to: "{,*,*/*}.gemspec"), what named `.gemspec` it uses
+(if more than one is present), and which group development dependencies are included in.
+
+When a `gemspec` dependency encounters version conflicts during resolution, the
+local version under development will always be selected -- even if there are
+remote versions that better match other requirements for the `gemspec` gem.
+
+## SOURCE PRIORITY
+
+When attempting to locate a gem to satisfy a gem requirement,
+bundler uses the following priority order:
+
+  1. The source explicitly attached to the gem (using `:source`, `:path`, or
+     `:git`)
+  2. For implicit gems (dependencies of explicit gems), any source, git, or path
+     repository declared on the parent. This results in bundler prioritizing the
+     ActiveSupport gem from the Rails git repository over ones from
+     `rubygems.org`
+  3. The sources specified via global `source` lines, searching each source in
+     your `Gemfile` from last added to first added.
diff --git a/lib/bundler/man/index.txt b/lib/bundler/man/index.txt
new file mode 100644
index 0000000000..ef2956b2f9
--- /dev/null
+++ b/lib/bundler/man/index.txt
@@ -0,0 +1,25 @@
+Gemfile(5)            gemfile.5
+bundle(1)             bundle.1
+bundle-add(1)         bundle-add.1
+bundle-binstubs(1)    bundle-binstubs.1
+bundle-cache(1)       bundle-cache.1
+bundle-check(1)       bundle-check.1
+bundle-clean(1)       bundle-clean.1
+bundle-config(1)      bundle-config.1
+bundle-doctor(1)      bundle-doctor.1
+bundle-exec(1)        bundle-exec.1
+bundle-gem(1)         bundle-gem.1
+bundle-info(1)        bundle-info.1
+bundle-init(1)        bundle-init.1
+bundle-inject(1)      bundle-inject.1
+bundle-install(1)     bundle-install.1
+bundle-list(1)        bundle-list.1
+bundle-lock(1)        bundle-lock.1
+bundle-open(1)        bundle-open.1
+bundle-outdated(1)    bundle-outdated.1
+bundle-platform(1)    bundle-platform.1
+bundle-pristine(1)    bundle-pristine.1
+bundle-remove(1)      bundle-remove.1
+bundle-show(1)        bundle-show.1
+bundle-update(1)      bundle-update.1
+bundle-viz(1)         bundle-viz.1
diff --git a/lib/bundler/match_platform.rb b/lib/bundler/match_platform.rb
new file mode 100644
index 0000000000..69074925a6
--- /dev/null
+++ b/lib/bundler/match_platform.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require_relative "gem_helpers"
+
+module Bundler
+  module MatchPlatform
+    include GemHelpers
+
+    def match_platform(p)
+      MatchPlatform.platforms_match?(platform, p)
+    end
+
+    def self.platforms_match?(gemspec_platform, local_platform)
+      return true if gemspec_platform.nil?
+      return true if Gem::Platform::RUBY == gemspec_platform
+      return true if local_platform == gemspec_platform
+      gemspec_platform = Gem::Platform.new(gemspec_platform)
+      return true if GemHelpers.generic(gemspec_platform) === local_platform
+      return true if gemspec_platform === local_platform
+
+      false
+    end
+  end
+end
diff --git a/lib/bundler/mirror.rb b/lib/bundler/mirror.rb
new file mode 100644
index 0000000000..a63b45b47d
--- /dev/null
+++ b/lib/bundler/mirror.rb
@@ -0,0 +1,223 @@
+# frozen_string_literal: true
+
+require "socket"
+
+module Bundler
+  class Settings
+    # Class used to build the mirror set and then find a mirror for a given URI
+    #
+    # @param prober [Prober object, nil] by default a TCPSocketProbe, this object
+    #   will be used to probe the mirror address to validate that the mirror replies.
+    class Mirrors
+      def initialize(prober = nil)
+        @all = Mirror.new
+        @prober = prober || TCPSocketProbe.new
+        @mirrors = {}
+      end
+
+      # Returns a mirror for the given uri.
+      #
+      # Depending on the uri having a valid mirror or not, it may be a
+      #   mirror that points to the provided uri
+      def for(uri)
+        if @all.validate!(@prober).valid?
+          @all
+        else
+          fetch_valid_mirror_for(Settings.normalize_uri(uri))
+        end
+      end
+
+      def each
+        @mirrors.each do |k, v|
+          yield k, v.uri.to_s
+        end
+      end
+
+      def parse(key, value)
+        config = MirrorConfig.new(key, value)
+        mirror = if config.all?
+          @all
+        else
+          @mirrors[config.uri] ||= Mirror.new
+        end
+        config.update_mirror(mirror)
+      end
+
+      private
+
+      def fetch_valid_mirror_for(uri)
+        downcased = uri.to_s.downcase
+        mirror = @mirrors[downcased] || @mirrors[Bundler::URI(downcased).host] || Mirror.new(uri)
+        mirror.validate!(@prober)
+        mirror = Mirror.new(uri) unless mirror.valid?
+        mirror
+      end
+    end
+
+    # A mirror
+    #
+    # Contains both the uri that should be used as a mirror and the
+    #   fallback timeout which will be used for probing if the mirror
+    #   replies on time or not.
+    class Mirror
+      DEFAULT_FALLBACK_TIMEOUT = 0.1
+
+      attr_reader :uri, :fallback_timeout
+
+      def initialize(uri = nil, fallback_timeout = 0)
+        self.uri = uri
+        self.fallback_timeout = fallback_timeout
+        @valid = nil
+      end
+
+      def uri=(uri)
+        @uri = if uri.nil?
+          nil
+        else
+          Bundler::URI(uri.to_s)
+        end
+        @valid = nil
+      end
+
+      def fallback_timeout=(timeout)
+        case timeout
+        when true, "true"
+          @fallback_timeout = DEFAULT_FALLBACK_TIMEOUT
+        when false, "false"
+          @fallback_timeout = 0
+        else
+          @fallback_timeout = timeout.to_i
+        end
+        @valid = nil
+      end
+
+      def ==(other)
+        !other.nil? && uri == other.uri && fallback_timeout == other.fallback_timeout
+      end
+
+      def valid?
+        return false if @uri.nil?
+        return @valid unless @valid.nil?
+        false
+      end
+
+      def validate!(probe = nil)
+        @valid = false if uri.nil?
+        if @valid.nil?
+          @valid = fallback_timeout == 0 || (probe || TCPSocketProbe.new).replies?(self)
+        end
+        self
+      end
+    end
+
+    # Class used to parse one configuration line
+    #
+    # Gets the configuration line and the value.
+    #   This object provides a `update_mirror` method
+    #   used to setup the given mirror value.
+    class MirrorConfig
+      attr_accessor :uri, :value
+
+      def initialize(config_line, value)
+        uri, fallback =
+          config_line.match(%r{\Amirror\.(all|.+?)(\.fallback_timeout)?\/?\z}).captures
+        @fallback = !fallback.nil?
+        @all = false
+        if uri == "all"
+          @all = true
+        else
+          @uri = Bundler::URI(uri).absolute? ? Settings.normalize_uri(uri) : uri
+        end
+        @value = value
+      end
+
+      def all?
+        @all
+      end
+
+      def update_mirror(mirror)
+        if @fallback
+          mirror.fallback_timeout = @value
+        else
+          mirror.uri = Settings.normalize_uri(@value)
+        end
+      end
+    end
+
+    # Class used for probing TCP availability for a given mirror.
+    class TCPSocketProbe
+      def replies?(mirror)
+        MirrorSockets.new(mirror).any? do |socket, address, timeout|
+          begin
+            socket.connect_nonblock(address)
+          rescue Errno::EINPROGRESS
+            wait_for_writtable_socket(socket, address, timeout)
+          rescue RuntimeError # Connection failed somehow, again
+            false
+          end
+        end
+      end
+
+      private
+
+      def wait_for_writtable_socket(socket, address, timeout)
+        if IO.select(nil, [socket], nil, timeout)
+          probe_writtable_socket(socket, address)
+        else # TCP Handshake timed out, or there is something dropping packets
+          false
+        end
+      end
+
+      def probe_writtable_socket(socket, address)
+        socket.connect_nonblock(address)
+      rescue Errno::EISCONN
+        true
+      rescue StandardError # Connection failed
+        false
+      end
+    end
+  end
+
+  # Class used to build the list of sockets that correspond to
+  #   a given mirror.
+  #
+  # One mirror may correspond to many different addresses, both
+  #   because of it having many dns entries or because
+  #   the network interface is both ipv4 and ipv5
+  class MirrorSockets
+    def initialize(mirror)
+      @timeout = mirror.fallback_timeout
+      @addresses = Socket.getaddrinfo(mirror.uri.host, mirror.uri.port).map do |address|
+        SocketAddress.new(address[0], address[3], address[1])
+      end
+    end
+
+    def any?
+      @addresses.any? do |address|
+        socket = Socket.new(Socket.const_get(address.type), Socket::SOCK_STREAM, 0)
+        socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+        value = yield socket, address.to_socket_address, @timeout
+        socket.close unless socket.closed?
+        value
+      end
+    end
+  end
+
+  # Socket address builder.
+  #
+  # Given a socket type, a host and a port,
+  #   provides a method to build sockaddr string
+  class SocketAddress
+    attr_reader :type, :host, :port
+
+    def initialize(type, host, port)
+      @type = type
+      @host = host
+      @port = port
+    end
+
+    def to_socket_address
+      Socket.pack_sockaddr_in(@port, @host)
+    end
+  end
+end
diff --git a/lib/bundler/plugin.rb b/lib/bundler/plugin.rb
new file mode 100644
index 0000000000..158c69e1a1
--- /dev/null
+++ b/lib/bundler/plugin.rb
@@ -0,0 +1,350 @@
+# frozen_string_literal: true
+
+require_relative "plugin/api"
+
+module Bundler
+  module Plugin
+    autoload :DSL,        File.expand_path("plugin/dsl", __dir__)
+    autoload :Events,     File.expand_path("plugin/events", __dir__)
+    autoload :Index,      File.expand_path("plugin/index", __dir__)
+    autoload :Installer,  File.expand_path("plugin/installer", __dir__)
+    autoload :SourceList, File.expand_path("plugin/source_list", __dir__)
+
+    class MalformattedPlugin < PluginError; end
+    class UndefinedCommandError < PluginError; end
+    class UnknownSourceError < PluginError; end
+    class PluginInstallError < PluginError; end
+
+    PLUGIN_FILE_NAME = "plugins.rb".freeze
+
+    module_function
+
+    def reset!
+      instance_variables.each {|i| remove_instance_variable(i) }
+
+      @sources = {}
+      @commands = {}
+      @hooks_by_event = Hash.new {|h, k| h[k] = [] }
+      @loaded_plugin_names = []
+    end
+
+    reset!
+
+    # Installs a new plugin by the given name
+    #
+    # @param [Array<String>] names the name of plugin to be installed
+    # @param [Hash] options various parameters as described in description.
+    #               Refer to cli/plugin for available options
+    def install(names, options)
+      specs = Installer.new.install(names, options)
+
+      save_plugins names, specs
+    rescue PluginError
+      specs_to_delete = specs.select {|k, _v| names.include?(k) && !index.commands.values.include?(k) }
+      specs_to_delete.each_value {|spec| Bundler.rm_rf(spec.full_gem_path) }
+
+      raise
+    end
+
+    # Uninstalls plugins by the given names
+    #
+    # @param [Array<String>] names the names of plugins to be uninstalled
+    def uninstall(names, options)
+      if names.empty? && !options[:all]
+        Bundler.ui.error "No plugins to uninstall. Specify at least 1 plugin to uninstall.\n"\
+          "Use --all option to uninstall all the installed plugins."
+        return
+      end
+
+      names = index.installed_plugins if options[:all]
+      if names.any?
+        names.each do |name|
+          if index.installed?(name)
+            Bundler.rm_rf(index.plugin_path(name))
+            index.unregister_plugin(name)
+            Bundler.ui.info "Uninstalled plugin #{name}"
+          else
+            Bundler.ui.error "Plugin #{name} is not installed \n"
+          end
+        end
+      else
+        Bundler.ui.info "No plugins installed"
+      end
+    end
+
+    # List installed plugins and commands
+    #
+    def list
+      installed_plugins = index.installed_plugins
+      if installed_plugins.any?
+        output = String.new
+        installed_plugins.each do |plugin|
+          output << "#{plugin}\n"
+          output << "-----\n"
+          index.plugin_commands(plugin).each do |command|
+            output << "  #{command}\n"
+          end
+          output << "\n"
+        end
+      else
+        output = "No plugins installed"
+      end
+      Bundler.ui.info output
+    end
+
+    # Evaluates the Gemfile with a limited DSL and installs the plugins
+    # specified by plugin method
+    #
+    # @param [Pathname] gemfile path
+    # @param [Proc] block that can be evaluated for (inline) Gemfile
+    def gemfile_install(gemfile = nil, &inline)
+      Bundler.settings.temporary(:frozen => false, :deployment => false) do
+        builder = DSL.new
+        if block_given?
+          builder.instance_eval(&inline)
+        else
+          builder.eval_gemfile(gemfile)
+        end
+        builder.check_primary_source_safety
+        definition = builder.to_definition(nil, true)
+
+        return if definition.dependencies.empty?
+
+        plugins = definition.dependencies.map(&:name).reject {|p| index.installed? p }
+        installed_specs = Installer.new.install_definition(definition)
+
+        save_plugins plugins, installed_specs, builder.inferred_plugins
+      end
+    rescue RuntimeError => e
+      unless e.is_a?(GemfileError)
+        Bundler.ui.error "Failed to install plugin: #{e.message}\n  #{e.backtrace[0]}"
+      end
+      raise
+    end
+
+    # The index object used to store the details about the plugin
+    def index
+      @index ||= Index.new
+    end
+
+    # The directory root for all plugin related data
+    #
+    # If run in an app, points to local root, in app_config_path
+    # Otherwise, points to global root, in Bundler.user_bundle_path("plugin")
+    def root
+      @root ||= if SharedHelpers.in_bundle?
+        local_root
+      else
+        global_root
+      end
+    end
+
+    def local_root
+      Bundler.app_config_path.join("plugin")
+    end
+
+    # The global directory root for all plugin related data
+    def global_root
+      Bundler.user_bundle_path("plugin")
+    end
+
+    # The cache directory for plugin stuffs
+    def cache
+      @cache ||= root.join("cache")
+    end
+
+    # To be called via the API to register to handle a command
+    def add_command(command, cls)
+      @commands[command] = cls
+    end
+
+    # Checks if any plugin handles the command
+    def command?(command)
+      !index.command_plugin(command).nil?
+    end
+
+    # To be called from Cli class to pass the command and argument to
+    # appropriate plugin class
+    def exec_command(command, args)
+      raise UndefinedCommandError, "Command `#{command}` not found" unless command? command
+
+      load_plugin index.command_plugin(command) unless @commands.key? command
+
+      @commands[command].new.exec(command, args)
+    end
+
+    # To be called via the API to register to handle a source plugin
+    def add_source(source, cls)
+      @sources[source] = cls
+    end
+
+    # Checks if any plugin declares the source
+    def source?(name)
+      !index.source_plugin(name.to_s).nil?
+    end
+
+    # @return [Class] that handles the source. The class includes API::Source
+    def source(name)
+      raise UnknownSourceError, "Source #{name} not found" unless source? name
+
+      load_plugin(index.source_plugin(name)) unless @sources.key? name
+
+      @sources[name]
+    end
+
+    # @param [Hash] The options that are present in the lock file
+    # @return [API::Source] the instance of the class that handles the source
+    #                       type passed in locked_opts
+    def source_from_lock(locked_opts)
+      src = source(locked_opts["type"])
+
+      src.new(locked_opts.merge("uri" => locked_opts["remote"]))
+    end
+
+    # To be called via the API to register a hooks and corresponding block that
+    # will be called to handle the hook
+    def add_hook(event, &block)
+      unless Events.defined_event?(event)
+        raise ArgumentError, "Event '#{event}' not defined in Bundler::Plugin::Events"
+      end
+      @hooks_by_event[event.to_s] << block
+    end
+
+    # Runs all the hooks that are registered for the passed event
+    #
+    # It passes the passed arguments and block to the block registered with
+    # the api.
+    #
+    # @param [String] event
+    def hook(event, *args, &arg_blk)
+      return unless Bundler.feature_flag.plugins?
+      unless Events.defined_event?(event)
+        raise ArgumentError, "Event '#{event}' not defined in Bundler::Plugin::Events"
+      end
+
+      plugins = index.hook_plugins(event)
+      return unless plugins.any?
+
+      (plugins - @loaded_plugin_names).each {|name| load_plugin(name) }
+
+      @hooks_by_event[event].each {|blk| blk.call(*args, &arg_blk) }
+    end
+
+    # currently only intended for specs
+    #
+    # @return [String, nil] installed path
+    def installed?(plugin)
+      Index.new.installed?(plugin)
+    end
+
+    # Post installation processing and registering with index
+    #
+    # @param [Array<String>] plugins list to be installed
+    # @param [Hash] specs of plugins mapped to installation path (currently they
+    #               contain all the installed specs, including plugins)
+    # @param [Array<String>] names of inferred source plugins that can be ignored
+    def save_plugins(plugins, specs, optional_plugins = [])
+      plugins.each do |name|
+        next if index.installed?(name)
+
+        spec = specs[name]
+
+        save_plugin(name, spec, optional_plugins.include?(name))
+      end
+    end
+
+    # Checks if the gem is good to be a plugin
+    #
+    # At present it only checks whether it contains plugins.rb file
+    #
+    # @param [Pathname] plugin_path the path plugin is installed at
+    # @raise [MalformattedPlugin] if plugins.rb file is not found
+    def validate_plugin!(plugin_path)
+      plugin_file = plugin_path.join(PLUGIN_FILE_NAME)
+      raise MalformattedPlugin, "#{PLUGIN_FILE_NAME} was not found in the plugin." unless plugin_file.file?
+    end
+
+    # Validates and registers a plugin.
+    #
+    # @param [String] name the name of the plugin
+    # @param [Specification] spec of installed plugin
+    # @param [Boolean] optional_plugin, removed if there is conflict with any
+    #                     other plugin (used for default source plugins)
+    #
+    # @raise [PluginInstallError] if validation or registration raises any error
+    def save_plugin(name, spec, optional_plugin = false)
+      validate_plugin! Pathname.new(spec.full_gem_path)
+      installed = register_plugin(name, spec, optional_plugin)
+      Bundler.ui.info "Installed plugin #{name}" if installed
+    rescue PluginError => e
+      raise PluginInstallError, "Failed to install plugin `#{spec.name}`, due to #{e.class} (#{e.message})"
+    end
+
+    # Runs the plugins.rb file in an isolated namespace, records the plugin
+    # actions it registers for and then passes the data to index to be stored.
+    #
+    # @param [String] name the name of the plugin
+    # @param [Specification] spec of installed plugin
+    # @param [Boolean] optional_plugin, removed if there is conflict with any
+    #                     other plugin (used for default source plugins)
+    #
+    # @raise [MalformattedPlugin] if plugins.rb raises any error
+    def register_plugin(name, spec, optional_plugin = false)
+      commands = @commands
+      sources = @sources
+      hooks = @hooks_by_event
+
+      @commands = {}
+      @sources = {}
+      @hooks_by_event = Hash.new {|h, k| h[k] = [] }
+
+      load_paths = spec.load_paths
+      Bundler.rubygems.add_to_load_path(load_paths)
+      path = Pathname.new spec.full_gem_path
+
+      begin
+        load path.join(PLUGIN_FILE_NAME), true
+      rescue StandardError => e
+        raise MalformattedPlugin, "#{e.class}: #{e.message}"
+      end
+
+      if optional_plugin && @sources.keys.any? {|s| source? s }
+        Bundler.rm_rf(path)
+        false
+      else
+        index.register_plugin(name, path.to_s, load_paths, @commands.keys,
+          @sources.keys, @hooks_by_event.keys)
+        true
+      end
+    ensure
+      @commands = commands
+      @sources = sources
+      @hooks_by_event = hooks
+    end
+
+    # Executes the plugins.rb file
+    #
+    # @param [String] name of the plugin
+    def load_plugin(name)
+      return unless name && !name.empty?
+
+      # Need to ensure before this that plugin root where the rest of gems
+      # are installed to be on load path to support plugin deps. Currently not
+      # done to avoid conflicts
+      path = index.plugin_path(name)
+
+      Bundler.rubygems.add_to_load_path(index.load_paths(name))
+
+      load path.join(PLUGIN_FILE_NAME)
+
+      @loaded_plugin_names << name
+    rescue RuntimeError => e
+      Bundler.ui.error "Failed loading plugin #{name}: #{e.message}"
+      raise
+    end
+
+    class << self
+      private :load_plugin, :register_plugin, :save_plugins, :validate_plugin!
+    end
+  end
+end
diff --git a/lib/bundler/plugin/api.rb b/lib/bundler/plugin/api.rb
new file mode 100644
index 0000000000..ee2bffe3ab
--- /dev/null
+++ b/lib/bundler/plugin/api.rb
@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+module Bundler
+  # This is the interfacing class represents the API that we intend to provide
+  # the plugins to use.
+  #
+  # For plugins to be independent of the Bundler internals they shall limit their
+  # interactions to methods of this class only. This will save them from breaking
+  # when some internal change.
+  #
+  # Currently we are delegating the methods defined in Bundler class to
+  # itself. So, this class acts as a buffer.
+  #
+  # If there is some change in the Bundler class that is incompatible to its
+  # previous behavior or if otherwise desired, we can reimplement(or implement)
+  # the method to preserve compatibility.
+  #
+  # To use this, either the class can inherit this class or use it directly.
+  # For example of both types of use, refer the file `spec/plugins/command.rb`
+  #
+  # To use it without inheriting, you will have to create an object of this
+  # to use the functions (except for declaration functions like command, source,
+  # and hooks).
+  module Plugin
+    class API
+      autoload :Source, File.expand_path("api/source", __dir__)
+
+      # The plugins should declare that they handle a command through this helper.
+      #
+      # @param [String] command being handled by them
+      # @param [Class] (optional) class that handles the command. If not
+      #                 provided, the `self` class will be used.
+      def self.command(command, cls = self)
+        Plugin.add_command command, cls
+      end
+
+      # The plugins should declare that they provide a installation source
+      # through this helper.
+      #
+      # @param [String] the source type they provide
+      # @param [Class] (optional) class that handles the source. If not
+      #                 provided, the `self` class will be used.
+      def self.source(source, cls = self)
+        cls.send :include, Bundler::Plugin::API::Source
+        Plugin.add_source source, cls
+      end
+
+      def self.hook(event, &block)
+        Plugin.add_hook(event, &block)
+      end
+
+      # The cache dir to be used by the plugins for storage
+      #
+      # @return [Pathname] path of the cache dir
+      def cache_dir
+        Plugin.cache.join("plugins")
+      end
+
+      # A tmp dir to be used by plugins
+      # Accepts names that get concatenated as suffix
+      #
+      # @return [Pathname] object for the new directory created
+      def tmp(*names)
+        Bundler.tmp(["plugin", *names].join("-"))
+      end
+
+      def method_missing(name, *args, &blk)
+        return Bundler.send(name, *args, &blk) if Bundler.respond_to?(name)
+
+        return SharedHelpers.send(name, *args, &blk) if SharedHelpers.respond_to?(name)
+
+        super
+      end
+
+      def respond_to_missing?(name, include_private = false)
+        SharedHelpers.respond_to?(name, include_private) ||
+          Bundler.respond_to?(name, include_private) || super
+      end
+    end
+  end
+end
diff --git a/lib/bundler/plugin/api/source.rb b/lib/bundler/plugin/api/source.rb
new file mode 100644
index 0000000000..32b1d0ee38
--- /dev/null
+++ b/lib/bundler/plugin/api/source.rb
@@ -0,0 +1,326 @@
+# frozen_string_literal: true
+
+module Bundler
+  module Plugin
+    class API
+      # This class provides the base to build source plugins
+      # All the method here are required to build a source plugin (except
+      # `uri_hash`, `gem_install_dir`; they are helpers).
+      #
+      # Defaults for methods, where ever possible are provided which is
+      # expected to work. But, all source plugins have to override
+      # `fetch_gemspec_files` and `install`. Defaults are also not provided for
+      # `remote!`, `cache!` and `unlock!`.
+      #
+      # The defaults shall work for most situations but nevertheless they can
+      # be (preferably should be) overridden as per the plugins' needs safely
+      # (as long as they behave as expected).
+      # On overriding `initialize` you should call super first.
+      #
+      # If required plugin should override `hash`, `==` and `eql?` methods to be
+      # able to match objects representing same sources, but may be created in
+      # different situation (like form gemfile and lockfile). The default ones
+      # checks only for class and uri, but elaborate source plugins may need
+      # more comparisons (e.g. git checking on branch or tag).
+      #
+      # @!attribute [r] uri
+      #   @return [String] the remote specified with `source` block in Gemfile
+      #
+      # @!attribute [r] options
+      #   @return [String] options passed during initialization (either from
+      #     lockfile or Gemfile)
+      #
+      # @!attribute [r] name
+      #   @return [String] name that can be used to uniquely identify a source
+      #
+      # @!attribute [rw] dependency_names
+      #   @return [Array<String>] Names of dependencies that the source should
+      #     try to resolve. It is not necessary to use this list internally. This
+      #     is present to be compatible with `Definition` and is used by
+      #     rubygems source.
+      module Source
+        attr_reader :uri, :options, :name
+        attr_accessor :dependency_names
+
+        def initialize(opts)
+          @options = opts
+          @dependency_names = []
+          @uri = opts["uri"]
+          @type = opts["type"]
+          @name = opts["name"] || "#{@type} at #{@uri}"
+        end
+
+        # This is used by the default `spec` method to constructs the
+        # Specification objects for the gems and versions that can be installed
+        # by this source plugin.
+        #
+        # Note: If the spec method is overridden, this function is not necessary
+        #
+        # @return [Array<String>] paths of the gemspec files for gems that can
+        #                         be installed
+        def fetch_gemspec_files
+          []
+        end
+
+        # Options to be saved in the lockfile so that the source plugin is able
+        # to check out same version of gem later.
+        #
+        # There options are passed when the source plugin is created from the
+        # lock file.
+        #
+        # @return [Hash]
+        def options_to_lock
+          {}
+        end
+
+        # Install the gem specified by the spec at appropriate path.
+        # `install_path` provides a sufficient default, if the source can only
+        # satisfy one gem,  but is not binding.
+        #
+        # @return [String] post installation message (if any)
+        def install(spec, opts)
+          raise MalformattedPlugin, "Source plugins need to override the install method."
+        end
+
+        # It builds extensions, generates bins and installs them for the spec
+        # provided.
+        #
+        # It depends on `spec.loaded_from` to get full_gem_path. The source
+        # plugins should set that.
+        #
+        # It should be called in `install` after the plugin is done placing the
+        # gem at correct install location.
+        #
+        # It also runs Gem hooks `pre_install`, `post_build` and `post_install`
+        #
+        # Note: Do not override if you don't know what you are doing.
+        def post_install(spec, disable_exts = false)
+          opts = { :env_shebang => false, :disable_extensions => disable_exts }
+          installer = Bundler::Source::Path::Installer.new(spec, opts)
+          installer.post_install
+        end
+
+        # A default installation path to install a single gem. If the source
+        # servers multiple gems, it's not of much use and the source should one
+        # of its own.
+        def install_path
+          @install_path ||=
+            begin
+              base_name = File.basename(Bundler::URI.parse(uri).normalize.path)
+
+              gem_install_dir.join("#{base_name}-#{uri_hash[0..11]}")
+            end
+        end
+
+        # Parses the gemspec files to find the specs for the gems that can be
+        # satisfied by the source.
+        #
+        # Few important points to keep in mind:
+        #   - If the gems are not installed then it shall return specs for all
+        #   the gems it can satisfy
+        #   - If gem is installed (that is to be detected by the plugin itself)
+        #   then it shall return at least the specs that are installed.
+        #   - The `loaded_from` for each of the specs shall be correct (it is
+        #   used to find the load path)
+        #
+        # @return [Bundler::Index] index containing the specs
+        def specs
+          files = fetch_gemspec_files
+
+          Bundler::Index.build do |index|
+            files.each do |file|
+              next unless spec = Bundler.load_gemspec(file)
+              Bundler.rubygems.set_installed_by_version(spec)
+
+              spec.source = self
+              Bundler.rubygems.validate(spec)
+
+              index << spec
+            end
+          end
+        end
+
+        # Set internal representation to fetch the gems/specs locally.
+        #
+        # When this is called, the source should try to fetch the specs and
+        # install from the local system.
+        def local!
+        end
+
+        # Set internal representation to fetch the gems/specs from remote.
+        #
+        # When this is called, the source should try to fetch the specs and
+        # install from remote path.
+        def remote!
+        end
+
+        # Set internal representation to fetch the gems/specs from app cache.
+        #
+        # When this is called, the source should try to fetch the specs and
+        # install from the path provided by `app_cache_path`.
+        def cached!
+        end
+
+        # This is called to update the spec and installation.
+        #
+        # If the source plugin is loaded from lockfile or otherwise, it shall
+        # refresh the cache/specs (e.g. git sources can make a fresh clone).
+        def unlock!
+        end
+
+        # Name of directory where plugin the is expected to cache the gems when
+        # #cache is called.
+        #
+        # Also this name is matched against the directories in cache for pruning
+        #
+        # This is used by `app_cache_path`
+        def app_cache_dirname
+          base_name = File.basename(Bundler::URI.parse(uri).normalize.path)
+          "#{base_name}-#{uri_hash}"
+        end
+
+        # This method is called while caching to save copy of the gems that the
+        # source can resolve to path provided by `app_cache_app`so that they can
+        # be reinstalled from the cache without querying the remote (i.e. an
+        # alternative to remote)
+        #
+        # This is stored with the app and source plugins should try to provide
+        # specs and install only from this cache when `cached!` is called.
+        #
+        # This cache is different from the internal caching that can be done
+        # at sub paths of `cache_path` (from API). This can be though as caching
+        # by bundler.
+        def cache(spec, custom_path = nil)
+          new_cache_path = app_cache_path(custom_path)
+
+          FileUtils.rm_rf(new_cache_path)
+          FileUtils.cp_r(install_path, new_cache_path)
+          FileUtils.touch(app_cache_path.join(".bundlecache"))
+        end
+
+        # This shall check if two source object represent the same source.
+        #
+        # The comparison shall take place only on the attribute that can be
+        # inferred from the options passed from Gemfile and not on attributes
+        # that are used to pin down the gem to specific version (e.g. Git
+        # sources should compare on branch and tag but not on commit hash)
+        #
+        # The sources objects are constructed from Gemfile as well as from
+        # lockfile. To converge the sources, it is necessary that they match.
+        #
+        # The same applies for `eql?` and `hash`
+        def ==(other)
+          other.is_a?(self.class) && uri == other.uri
+        end
+
+        # When overriding `eql?` please preserve the behaviour as mentioned in
+        # docstring for `==` method.
+        alias_method :eql?, :==
+
+        # When overriding `hash` please preserve the behaviour as mentioned in
+        # docstring for `==` method, i.e. two methods equal by above comparison
+        # should have same hash.
+        def hash
+          [self.class, uri].hash
+        end
+
+        # A helper method, not necessary if not used internally.
+        def installed?
+          File.directory?(install_path)
+        end
+
+        # The full path where the plugin should cache the gem so that it can be
+        # installed latter.
+        #
+        # Note: Do not override if you don't know what you are doing.
+        def app_cache_path(custom_path = nil)
+          @app_cache_path ||= Bundler.app_cache(custom_path).join(app_cache_dirname)
+        end
+
+        # Used by definition.
+        #
+        # Note: Do not override if you don't know what you are doing.
+        def unmet_deps
+          specs.unmet_dependency_names
+        end
+
+        # Used by definition.
+        #
+        # Note: Do not override if you don't know what you are doing.
+        def spec_names
+          specs.spec_names
+        end
+
+        # Used by definition.
+        #
+        # Note: Do not override if you don't know what you are doing.
+        def add_dependency_names(names)
+          @dependencies |= Array(names)
+        end
+
+        # Note: Do not override if you don't know what you are doing.
+        def can_lock?(spec)
+          spec.source == self
+        end
+
+        # Generates the content to be entered into the lockfile.
+        # Saves type and remote and also calls to `options_to_lock`.
+        #
+        # Plugin should use `options_to_lock` to save information in lockfile
+        # and not override this.
+        #
+        # Note: Do not override if you don't know what you are doing.
+        def to_lock
+          out = String.new("#{LockfileParser::PLUGIN}\n")
+          out << "  remote: #{@uri}\n"
+          out << "  type: #{@type}\n"
+          options_to_lock.each do |opt, value|
+            out << "  #{opt}: #{value}\n"
+          end
+          out << "  specs:\n"
+        end
+
+        def to_s
+          "plugin source for #{@type} with uri #{@uri}"
+        end
+        alias_method :identifier, :to_s
+
+        # Note: Do not override if you don't know what you are doing.
+        def include?(other)
+          other == self
+        end
+
+        def uri_hash
+          SharedHelpers.digest(:SHA1).hexdigest(uri)
+        end
+
+        # Note: Do not override if you don't know what you are doing.
+        def gem_install_dir
+          Bundler.install_path
+        end
+
+        # It is used to obtain the full_gem_path.
+        #
+        # spec's loaded_from path is expanded against this to get full_gem_path
+        #
+        # Note: Do not override if you don't know what you are doing.
+        def root
+          Bundler.root
+        end
+
+        # @private
+        # Returns true
+        def bundler_plugin_api_source?
+          true
+        end
+
+        # @private
+        # This API on source might not be stable, and for now we expect plugins
+        # to download all specs in `#specs`, so we implement the method for
+        # compatibility purposes and leave it undocumented (and don't support)
+        # overriding it)
+        def double_check_for(*); end
+      end
+    end
+  end
+end
diff --git a/lib/bundler/plugin/dsl.rb b/lib/bundler/plugin/dsl.rb
new file mode 100644
index 0000000000..da751d1774
--- /dev/null
+++ b/lib/bundler/plugin/dsl.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module Bundler
+  module Plugin
+    # Dsl to parse the Gemfile looking for plugins to install
+    class DSL < Bundler::Dsl
+      class PluginGemfileError < PluginError; end
+      alias_method :_gem, :gem # To use for plugin installation as gem
+
+      # So that we don't have to override all there methods to dummy ones
+      # explicitly.
+      # They will be handled by method_missing
+      [:gemspec, :gem, :install_if, :platforms, :env].each {|m| undef_method m }
+
+      # This lists the plugins that was added automatically and not specified by
+      # the user.
+      #
+      # When we encounter :type attribute with a source block, we add a plugin
+      # by name bundler-source-<type> to list of plugins to be installed.
+      #
+      # These plugins are optional and are not installed when there is conflict
+      # with any other plugin.
+      attr_reader :inferred_plugins
+
+      def initialize
+        super
+        @sources = Plugin::SourceList.new
+        @inferred_plugins = [] # The source plugins inferred from :type
+      end
+
+      def plugin(name, *args)
+        _gem(name, *args)
+      end
+
+      def method_missing(name, *args)
+        raise PluginGemfileError, "Undefined local variable or method `#{name}' for Gemfile" unless Bundler::Dsl.method_defined? name
+      end
+
+      def source(source, *args, &blk)
+        options = args.last.is_a?(Hash) ? args.pop.dup : {}
+        options = normalize_hash(options)
+        return super unless options.key?("type")
+
+        plugin_name = "bundler-source-#{options["type"]}"
+
+        return if @dependencies.any? {|d| d.name == plugin_name }
+
+        plugin(plugin_name)
+        @inferred_plugins << plugin_name
+      end
+    end
+  end
+end
diff --git a/lib/bundler/plugin/events.rb b/lib/bundler/plugin/events.rb
new file mode 100644
index 0000000000..bc037d1af5
--- /dev/null
+++ b/lib/bundler/plugin/events.rb
@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+module Bundler
+  module Plugin
+    module Events
+      def self.define(const, event)
+        const = const.to_sym.freeze
+        if const_defined?(const) && const_get(const) != event
+          raise ArgumentError, "Attempting to reassign #{const} to a different value"
+        end
+        const_set(const, event) unless const_defined?(const)
+        @events ||= {}
+        @events[event] = const
+      end
+      private_class_method :define
+
+      def self.reset
+        @events.each_value do |const|
+          remove_const(const)
+        end
+        @events = nil
+      end
+      private_class_method :reset
+
+      # Check if an event has been defined
+      # @param event [String] An event to check
+      # @return [Boolean] A boolean indicating if the event has been defined
+      def self.defined_event?(event)
+        @events ||= {}
+        @events.key?(event)
+      end
+
+      # @!parse
+      #   A hook called before each individual gem is installed
+      #   Includes a Bundler::ParallelInstaller::SpecInstallation.
+      #   No state, error, post_install_message will be present as nothing has installed yet
+      #   GEM_BEFORE_INSTALL = "before-install"
+      define :GEM_BEFORE_INSTALL, "before-install"
+
+      # @!parse
+      #   A hook called after each individual gem is installed
+      #   Includes a Bundler::ParallelInstaller::SpecInstallation.
+      #     - If state is failed, an error will be present.
+      #     - If state is success, a post_install_message may be present.
+      #   GEM_AFTER_INSTALL = "after-install"
+      define :GEM_AFTER_INSTALL,  "after-install"
+
+      # @!parse
+      #   A hook called before any gems install
+      #   Includes an Array of Bundler::Dependency objects
+      #   GEM_BEFORE_INSTALL_ALL = "before-install-all"
+      define :GEM_BEFORE_INSTALL_ALL, "before-install-all"
+
+      # @!parse
+      #   A hook called after any gems install
+      #   Includes an Array of Bundler::Dependency objects
+      #   GEM_AFTER_INSTALL_ALL = "after-install-all"
+      define :GEM_AFTER_INSTALL_ALL,  "after-install-all"
+    end
+  end
+end
diff --git a/lib/bundler/plugin/index.rb b/lib/bundler/plugin/index.rb
new file mode 100644
index 0000000000..29d33be718
--- /dev/null
+++ b/lib/bundler/plugin/index.rb
@@ -0,0 +1,185 @@
+# frozen_string_literal: true
+
+module Bundler
+  # Manages which plugins are installed and their sources. This also is supposed to map
+  # which plugin does what (currently the features are not implemented so this class is
+  # now a stub class).
+  module Plugin
+    class Index
+      class CommandConflict < PluginError
+        def initialize(plugin, commands)
+          msg = "Command(s) `#{commands.join("`, `")}` declared by #{plugin} are already registered."
+          super msg
+        end
+      end
+
+      class SourceConflict < PluginError
+        def initialize(plugin, sources)
+          msg = "Source(s) `#{sources.join("`, `")}` declared by #{plugin} are already registered."
+          super msg
+        end
+      end
+
+      attr_reader :commands
+
+      def initialize
+        @plugin_paths = {}
+        @commands = {}
+        @sources = {}
+        @hooks = {}
+        @load_paths = {}
+
+        begin
+          load_index(global_index_file, true)
+        rescue GenericSystemCallError
+          # no need to fail when on a read-only FS, for example
+          nil
+        end
+        load_index(local_index_file) if SharedHelpers.in_bundle?
+      end
+
+      # This function is to be called when a new plugin is installed. This
+      # function shall add the functions of the plugin to existing maps and also
+      # the name to source location.
+      #
+      # @param [String] name of the plugin to be registered
+      # @param [String] path where the plugin is installed
+      # @param [Array<String>] load_paths for the plugin
+      # @param [Array<String>] commands that are handled by the plugin
+      # @param [Array<String>] sources that are handled by the plugin
+      def register_plugin(name, path, load_paths, commands, sources, hooks)
+        old_commands = @commands.dup
+
+        common = commands & @commands.keys
+        raise CommandConflict.new(name, common) unless common.empty?
+        commands.each {|c| @commands[c] = name }
+
+        common = sources & @sources.keys
+        raise SourceConflict.new(name, common) unless common.empty?
+        sources.each {|k| @sources[k] = name }
+
+        hooks.each do |event|
+          event_hooks = (@hooks[event] ||= []) << name
+          event_hooks.uniq!
+        end
+
+        @plugin_paths[name] = path
+        @load_paths[name] = load_paths
+        save_index
+      rescue StandardError
+        @commands = old_commands
+        raise
+      end
+
+      def unregister_plugin(name)
+        @commands.delete_if {|_, v| v == name }
+        @sources.delete_if {|_, v| v == name }
+        @hooks.each do |hook, names|
+          names.delete(name)
+          @hooks.delete(hook) if names.empty?
+        end
+        @plugin_paths.delete(name)
+        @load_paths.delete(name)
+        save_index
+      end
+
+      # Path of default index file
+      def index_file
+        Plugin.root.join("index")
+      end
+
+      # Path where the global index file is stored
+      def global_index_file
+        Plugin.global_root.join("index")
+      end
+
+      # Path where the local index file is stored
+      def local_index_file
+        Plugin.local_root.join("index")
+      end
+
+      def plugin_path(name)
+        Pathname.new @plugin_paths[name]
+      end
+
+      def load_paths(name)
+        @load_paths[name]
+      end
+
+      # Fetch the name of plugin handling the command
+      def command_plugin(command)
+        @commands[command]
+      end
+
+      def installed?(name)
+        @plugin_paths[name]
+      end
+
+      def installed_plugins
+        @plugin_paths.keys
+      end
+
+      def plugin_commands(plugin)
+        @commands.find_all {|_, n| n == plugin }.map(&:first)
+      end
+
+      def source?(source)
+        @sources.key? source
+      end
+
+      def source_plugin(name)
+        @sources[name]
+      end
+
+      # Returns the list of plugin names handling the passed event
+      def hook_plugins(event)
+        @hooks[event] || []
+      end
+
+      private
+
+      # Reads the index file from the directory and initializes the instance
+      # variables.
+      #
+      # It skips the sources if the second param is true
+      # @param [Pathname] index file path
+      # @param [Boolean] is the index file global index
+      def load_index(index_file, global = false)
+        SharedHelpers.filesystem_access(index_file, :read) do |index_f|
+          valid_file = index_f && index_f.exist? && !index_f.size.zero?
+          break unless valid_file
+
+          data = index_f.read
+
+          require_relative "../yaml_serializer"
+          index = YAMLSerializer.load(data)
+
+          @commands.merge!(index["commands"])
+          @hooks.merge!(index["hooks"])
+          @load_paths.merge!(index["load_paths"])
+          @plugin_paths.merge!(index["plugin_paths"])
+          @sources.merge!(index["sources"]) unless global
+        end
+      end
+
+      # Should be called when any of the instance variables change. Stores the
+      # instance variables in YAML format. (The instance variables are supposed
+      # to be only String key value pairs)
+      def save_index
+        index = {
+          "commands"     => @commands,
+          "hooks"        => @hooks,
+          "load_paths"   => @load_paths,
+          "plugin_paths" => @plugin_paths,
+          "sources"      => @sources,
+        }
+
+        require_relative "../yaml_serializer"
+        SharedHelpers.filesystem_access(index_file) do |index_f|
+          FileUtils.mkdir_p(index_f.dirname)
+          File.open(index_f, "w") {|f| f.puts YAMLSerializer.dump(index) }
+        end
+      end
+    end
+  end
+end
diff --git a/lib/bundler/plugin/installer.rb b/lib/bundler/plugin/installer.rb
new file mode 100644
index 0000000000..d7411fff45
--- /dev/null
+++ b/lib/bundler/plugin/installer.rb
@@ -0,0 +1,109 @@
+# frozen_string_literal: true
+
+module Bundler
+  # Handles the installation of plugin in appropriate directories.
+  #
+  # This class is supposed to be wrapper over the existing gem installation infra
+  # but currently it itself handles everything as the Source's subclasses (e.g. Source::RubyGems)
+  # are heavily dependent on the Gemfile.
+  module Plugin
+    class Installer
+      autoload :Rubygems, File.expand_path("installer/rubygems", __dir__)
+      autoload :Git,      File.expand_path("installer/git", __dir__)
+
+      def install(names, options)
+        check_sources_consistency!(options)
+
+        version = options[:version] || [">= 0"]
+
+        if options[:git]
+          install_git(names, version, options)
+        elsif options[:local_git]
+          install_local_git(names, version, options)
+        else
+          sources = options[:source] || Bundler.rubygems.sources
+          install_rubygems(names, version, sources)
+        end
+      end
+
+      # Installs the plugin from Definition object created by limited parsing of
+      # Gemfile searching for plugins to be installed
+      #
+      # @param [Definition] definition object
+      # @return [Hash] map of names to their specs they are installed with
+      def install_definition(definition)
+        def definition.lock(*); end
+        definition.resolve_remotely!
+        specs = definition.specs
+
+        install_from_specs specs
+      end
+
+      private
+
+      def check_sources_consistency!(options)
+        if options.key?(:git) && options.key?(:local_git)
+          raise InvalidOption, "Remote and local plugin git sources can't be both specified"
+        end
+      end
+
+      def install_git(names, version, options)
+        uri = options.delete(:git)
+        options["uri"] = uri
+
+        install_all_sources(names, version, options, options[:source])
+      end
+
+      def install_local_git(names, version, options)
+        uri = options.delete(:local_git)
+        options["uri"] = uri
+
+        install_all_sources(names, version, options, options[:source])
+      end
+
+      # Installs the plugin from rubygems source and returns the path where the
+      # plugin was installed
+      #
+      # @param [String] name of the plugin gem to search in the source
+      # @param [Array] version of the gem to install
+      # @param [String, Array<String>] source(s) to resolve the gem
+      #
+      # @return [Hash] map of names to the specs of plugins installed
+      def install_rubygems(names, version, sources)
+        install_all_sources(names, version, nil, sources)
+      end
+
+      def install_all_sources(names, version, git_source_options, rubygems_source)
+        source_list = SourceList.new
+
+        source_list.add_git_source(git_source_options) if git_source_options
+        Array(rubygems_source).each {|remote| source_list.add_global_rubygems_remote(remote) } if rubygems_source
+
+        deps = names.map {|name| Dependency.new name, version }
+
+        Bundler.configure_gem_home_and_path(Plugin.root)
+
+        definition = Definition.new(nil, deps, source_list, true)
+        install_definition(definition)
+      end
+
+      # Installs the plugins and deps from the provided specs and returns map of
+      # gems to their paths
+      #
+      # @param specs to install
+      #
+      # @return [Hash] map of names to the specs
+      def install_from_specs(specs)
+        paths = {}
+
+        specs.each do |spec|
+          spec.source.install spec
+
+          paths[spec.name] = spec
+        end
+
+        paths
+      end
+    end
+  end
+end
diff --git a/lib/bundler/plugin/installer/git.rb b/lib/bundler/plugin/installer/git.rb
new file mode 100644
index 0000000000..fbb6c5e40e
--- /dev/null
+++ b/lib/bundler/plugin/installer/git.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Bundler
+  module Plugin
+    class Installer
+      class Git < Bundler::Source::Git
+        def cache_path
+          @cache_path ||= begin
+            git_scope = "#{base_name}-#{uri_hash}"
+
+            Plugin.cache.join("bundler", "git", git_scope)
+          end
+        end
+
+        def install_path
+          @install_path ||= begin
+            git_scope = "#{base_name}-#{shortref_for_path(revision)}"
+
+            Plugin.root.join("bundler", "gems", git_scope)
+          end
+        end
+
+        def version_message(spec)
+          "#{spec.name} #{spec.version}"
+        end
+
+        def root
+          Plugin.root
+        end
+
+        def generate_bin(spec, disable_extensions = false)
+          # Need to find a way without code duplication
+          # For now, we can ignore this
+        end
+      end
+    end
+  end
+end
diff --git a/lib/bundler/plugin/installer/rubygems.rb b/lib/bundler/plugin/installer/rubygems.rb
new file mode 100644
index 0000000000..e144c14b24
--- /dev/null
+++ b/lib/bundler/plugin/installer/rubygems.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Bundler
+  module Plugin
+    class Installer
+      class Rubygems < Bundler::Source::Rubygems
+        def version_message(spec)
+          "#{spec.name} #{spec.version}"
+        end
+
+        private
+
+        def requires_sudo?
+          false # Will change on implementation of project level plugins
+        end
+
+        def rubygems_dir
+          Plugin.root
+        end
+
+        def cache_path
+          Plugin.cache
+        end
+      end
+    end
+  end
+end
diff --git a/lib/bundler/plugin/source_list.rb b/lib/bundler/plugin/source_list.rb
new file mode 100644
index 0000000000..547661cf2f
--- /dev/null
+++ b/lib/bundler/plugin/source_list.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Bundler
+  # SourceList object to be used while parsing the Gemfile, setting the
+  # approptiate options to be used with Source classes for plugin installation
+  module Plugin
+    class SourceList < Bundler::SourceList
+      def add_git_source(options = {})
+        add_source_to_list Plugin::Installer::Git.new(options), git_sources
+      end
+
+      def add_rubygems_source(options = {})
+        add_source_to_list Plugin::Installer::Rubygems.new(options), @rubygems_sources
+      end
+
+      def all_sources
+        path_sources + git_sources + rubygems_sources + [metadata_source]
+      end
+
+      def default_source
+        git_sources.first || global_rubygems_source
+      end
+
+      private
+
+      def rubygems_aggregate_class
+        Plugin::Installer::Rubygems
+      end
+    end
+  end
+end
diff --git a/lib/bundler/process_lock.rb b/lib/bundler/process_lock.rb
new file mode 100644
index 0000000000..cba4fcdba5
--- /dev/null
+++ b/lib/bundler/process_lock.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Bundler
+  class ProcessLock
+    def self.lock(bundle_path = Bundler.bundle_path)
+      lock_file_path = File.join(bundle_path, "bundler.lock")
+      has_lock = false
+
+      File.open(lock_file_path, "w") do |f|
+        f.flock(File::LOCK_EX)
+        has_lock = true
+        yield
+        f.flock(File::LOCK_UN)
+      end
+    rescue Errno::EACCES, Errno::ENOLCK, *[SharedHelpers.const_get_safely(:ENOTSUP, Errno)].compact
+      # In the case the user does not have access to
+      # create the lock file or is using NFS where
+      # locks are not available we skip locking.
+      yield
+    ensure
+      FileUtils.rm_f(lock_file_path) if has_lock
+    end
+  end
+end
diff --git a/lib/bundler/psyched_yaml.rb b/lib/bundler/psyched_yaml.rb
new file mode 100644
index 0000000000..463d52dc4a
--- /dev/null
+++ b/lib/bundler/psyched_yaml.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+# Psych could be in the stdlib
+# but it's too late if Syck is already loaded
+begin
+  require "psych" unless defined?(Syck)
+rescue LoadError
+  # Apparently Psych wasn't available. Oh well.
+end
+
+# At least load the YAML stdlib, whatever that may be
+require "yaml" unless defined?(YAML.dump)
+
+module Bundler
+  # On encountering invalid YAML,
+  # Psych raises Psych::SyntaxError
+  if defined?(::Psych::SyntaxError)
+    YamlLibrarySyntaxError = ::Psych::SyntaxError
+  else # Syck raises ArgumentError
+    YamlLibrarySyntaxError = ::ArgumentError
+  end
+end
diff --git a/lib/bundler/remote_specification.rb b/lib/bundler/remote_specification.rb
new file mode 100644
index 0000000000..89b69e1045
--- /dev/null
+++ b/lib/bundler/remote_specification.rb
@@ -0,0 +1,115 @@
+# frozen_string_literal: true
+
+module Bundler
+  # Represents a lazily loaded gem specification, where the full specification
+  # is on the source server in rubygems' "quick" index. The proxy object is to
+  # be seeded with what we're given from the source's abbreviated index - the
+  # full specification will only be fetched when necessary.
+  class RemoteSpecification
+    include MatchPlatform
+    include Comparable
+
+    attr_reader :name, :version, :platform
+    attr_writer :dependencies
+    attr_accessor :source, :remote
+
+    def initialize(name, version, platform, spec_fetcher)
+      @name         = name
+      @version      = Gem::Version.create version
+      @platform     = platform
+      @spec_fetcher = spec_fetcher
+      @dependencies = nil
+    end
+
+    # Needed before installs, since the arch matters then and quick
+    # specs don't bother to include the arch in the platform string
+    def fetch_platform
+      @platform = _remote_specification.platform
+    end
+
+    def full_name
+      if platform == Gem::Platform::RUBY || platform.nil?
+        "#{@name}-#{@version}"
+      else
+        "#{@name}-#{@version}-#{platform}"
+      end
+    end
+
+    # Compare this specification against another object. Using sort_obj
+    # is compatible with Gem::Specification and other Bundler or RubyGems
+    # objects. Otherwise, use the default Object comparison.
+    def <=>(other)
+      if other.respond_to?(:sort_obj)
+        sort_obj <=> other.sort_obj
+      else
+        super
+      end
+    end
+
+    # Because Rubyforge cannot be trusted to provide valid specifications
+    # once the remote gem is downloaded, the backend specification will
+    # be swapped out.
+    def __swap__(spec)
+      raise APIResponseInvalidDependenciesError unless spec.dependencies.all? {|d| d.is_a?(Gem::Dependency) }
+
+      SharedHelpers.ensure_same_dependencies(self, dependencies, spec.dependencies)
+      @_remote_specification = spec
+    end
+
+    # Create a delegate used for sorting. This strategy is copied from
+    # RubyGems 2.23 and ensures that Bundler's specifications can be
+    # compared and sorted with RubyGems' own specifications.
+    #
+    # @see #<=>
+    # @see Gem::Specification#sort_obj
+    #
+    # @return [Array] an object you can use to compare and sort this
+    #   specification against other specifications
+    def sort_obj
+      [@name, @version, @platform == Gem::Platform::RUBY ? -1 : 1]
+    end
+
+    def to_s
+      "#<#{self.class} name=#{name} version=#{version} platform=#{platform}>"
+    end
+
+    def dependencies
+      @dependencies ||= begin
+        deps = method_missing(:dependencies)
+
+        # allow us to handle when the specs dependencies are an array of array of string
+        # in order to delay the crash to `#__swap__` where it results in a friendlier error
+        # see https://github.com/rubygems/bundler/issues/5797
+        deps = deps.map {|d| d.is_a?(Gem::Dependency) ? d : Gem::Dependency.new(*d) }
+
+        deps
+      end
+    end
+
+    def git_version
+      return unless loaded_from && source.is_a?(Bundler::Source::Git)
+      " #{source.revision[0..6]}"
+    end
+
+    private
+
+    def to_ary
+      nil
+    end
+
+    def _remote_specification
+      @_remote_specification ||= @spec_fetcher.fetch_spec([@name, @version, @platform])
+      @_remote_specification || raise(GemspecError, "Gemspec data for #{full_name} was" \
+        " missing from the server! Try installing with `--full-index` as a workaround.")
+    end
+
+    def method_missing(method, *args, &blk)
+      _remote_specification.send(method, *args, &blk)
+    end
+
+    def respond_to?(method, include_all = false)
+      super || _remote_specification.respond_to?(method, include_all)
+    end
+    public :respond_to?
+  end
+end
diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb
new file mode 100644
index 0000000000..5eb17a3921
--- /dev/null
+++ b/lib/bundler/resolver.rb
@@ -0,0 +1,387 @@
+# frozen_string_literal: true
+
+module Bundler
+  class Resolver
+    require_relative "vendored_molinillo"
+    require_relative "resolver/spec_group"
+
+    include GemHelpers
+
+    # Figures out the best possible configuration of gems that satisfies
+    # the list of passed dependencies and any child dependencies without
+    # causing any gem activation errors.
+    #
+    # ==== Parameters
+    # *dependencies<Gem::Dependency>:: The list of dependencies to resolve
+    #
+    # ==== Returns
+    # <GemBundle>,nil:: If the list of dependencies can be resolved, a
+    #   collection of gemspecs is returned. Otherwise, nil is returned.
+    def self.resolve(requirements, source_requirements = {}, base = [], gem_version_promoter = GemVersionPromoter.new, additional_base_requirements = [], platforms = nil)
+      base = SpecSet.new(base) unless base.is_a?(SpecSet)
+      resolver = new(source_requirements, base, gem_version_promoter, additional_base_requirements, platforms)
+      result = resolver.start(requirements)
+      SpecSet.new(SpecSet.new(result).for(requirements.reject{|dep| dep.name.end_with?("\0") }))
+    end
+
+    def initialize(source_requirements, base, gem_version_promoter, additional_base_requirements, platforms)
+      @source_requirements = source_requirements
+      @base = base
+      @resolver = Molinillo::Resolver.new(self, self)
+      @search_for = {}
+      @base_dg = Molinillo::DependencyGraph.new
+      @base.each do |ls|
+        dep = Dependency.new(ls.name, ls.version)
+        @base_dg.add_vertex(ls.name, DepProxy.get_proxy(dep, ls.platform), true)
+      end
+      additional_base_requirements.each {|d| @base_dg.add_vertex(d.name, d) }
+      @platforms = platforms.reject {|p| p != Gem::Platform::RUBY && (platforms - [p]).any? {|pl| generic(pl) == p } }
+      @resolving_only_for_ruby = platforms == [Gem::Platform::RUBY]
+      @gem_version_promoter = gem_version_promoter
+      @use_gvp = Bundler.feature_flag.use_gem_version_promoter_for_major_updates? || !@gem_version_promoter.major?
+    end
+
+    def start(requirements)
+      @gem_version_promoter.prerelease_specified = @prerelease_specified = {}
+      requirements.each {|dep| @prerelease_specified[dep.name] ||= dep.prerelease? }
+
+      verify_gemfile_dependencies_are_found!(requirements)
+      dg = @resolver.resolve(requirements, @base_dg)
+      dg.
+        map(&:payload).
+        reject {|sg| sg.name.end_with?("\0") }.
+        map(&:to_specs).
+        flatten
+    rescue Molinillo::VersionConflict => e
+      message = version_conflict_message(e)
+      raise VersionConflict.new(e.conflicts.keys.uniq, message)
+    rescue Molinillo::CircularDependencyError => e
+      names = e.dependencies.sort_by(&:name).map {|d| "gem '#{d.name}'" }
+      raise CyclicDependencyError, "Your bundle requires gems that depend" \
+        " on each other, creating an infinite loop. Please remove" \
+        " #{names.count > 1 ? "either " : ""}#{names.join(" or ")}" \
+        " and try again."
+    end
+
+    include Molinillo::UI
+
+    # Conveys debug information to the user.
+    #
+    # @param [Integer] depth the current depth of the resolution process.
+    # @return [void]
+    def debug(depth = 0)
+      return unless debug?
+      debug_info = yield
+      debug_info = debug_info.inspect unless debug_info.is_a?(String)
+      puts debug_info.split("\n").map {|s| depth == 0 ? "BUNDLER: #{s}" : "BUNDLER(#{depth}): #{s}" }
+    end
+
+    def debug?
+      return @debug_mode if defined?(@debug_mode)
+      @debug_mode =
+        ENV["BUNDLER_DEBUG_RESOLVER"] ||
+        ENV["BUNDLER_DEBUG_RESOLVER_TREE"] ||
+        ENV["DEBUG_RESOLVER"] ||
+        ENV["DEBUG_RESOLVER_TREE"] ||
+        false
+    end
+
+    def before_resolution
+      Bundler.ui.info "Resolving dependencies...", debug?
+    end
+
+    def after_resolution
+      Bundler.ui.info ""
+    end
+
+    def indicate_progress
+      Bundler.ui.info ".", false unless debug?
+    end
+
+    include Molinillo::SpecificationProvider
+
+    def dependencies_for(specification)
+      specification.dependencies_for_activated_platforms
+    end
+
+    def search_for(dependency_proxy)
+      platform = dependency_proxy.__platform
+      dependency = dependency_proxy.dep
+      name = dependency.name
+      @search_for[dependency_proxy] ||= begin
+        results = results_for(dependency, @base[name])
+
+        if vertex = @base_dg.vertex_named(name)
+          locked_requirement = vertex.payload.requirement
+        end
+
+        if !@prerelease_specified[name] && (!@use_gvp || locked_requirement.nil?)
+          # Move prereleases to the beginning of the list, so they're considered
+          # last during resolution.
+          pre, results = results.partition {|spec| spec.version.prerelease? }
+          results = pre + results
+        end
+
+        spec_groups = if results.any?
+          nested = []
+          results.each do |spec|
+            version, specs = nested.last
+            if version == spec.version
+              specs << spec
+            else
+              nested << [spec.version, [spec]]
+            end
+          end
+          nested.reduce([]) do |groups, (version, specs)|
+            next groups if locked_requirement && !locked_requirement.satisfied_by?(version)
+
+            specs_by_platform = Hash.new do |current_specs, current_platform|
+              current_specs[current_platform] = select_best_platform_match(specs, current_platform)
+            end
+
+            spec_group_ruby = SpecGroup.create_for(specs_by_platform, [Gem::Platform::RUBY], Gem::Platform::RUBY)
+            groups << spec_group_ruby if spec_group_ruby
+
+            next groups if @resolving_only_for_ruby
+
+            spec_group = SpecGroup.create_for(specs_by_platform, @platforms, platform)
+            groups << spec_group if spec_group
+
+            groups
+          end
+        else
+          []
+        end
+        # GVP handles major itself, but it's still a bit risky to trust it with it
+        # until we get it settled with new behavior. For 2.x it can take over all cases.
+        if !@use_gvp
+          spec_groups
+        else
+          @gem_version_promoter.sort_versions(dependency, spec_groups)
+        end
+      end
+    end
+
+    def index_for(dependency)
+      source_for(dependency.name).specs
+    end
+
+    def source_for(name)
+      @source_requirements[name] || @source_requirements[:default]
+    end
+
+    def results_for(dependency, base)
+      index_for(dependency).search(dependency, base)
+    end
+
+    def name_for(dependency)
+      dependency.name
+    end
+
+    def name_for_explicit_dependency_source
+      Bundler.default_gemfile.basename.to_s
+    rescue StandardError
+      "Gemfile"
+    end
+
+    def name_for_locking_dependency_source
+      Bundler.default_lockfile.basename.to_s
+    rescue StandardError
+      "Gemfile.lock"
+    end
+
+    def requirement_satisfied_by?(requirement, activated, spec)
+      requirement.matches_spec?(spec) || spec.source.is_a?(Source::Gemspec)
+    end
+
+    def dependencies_equal?(dependencies, other_dependencies)
+      dependencies.map(&:dep) == other_dependencies.map(&:dep)
+    end
+
+    def sort_dependencies(dependencies, activated, conflicts)
+      dependencies.sort_by do |dependency|
+        name = name_for(dependency)
+        vertex = activated.vertex_named(name)
+        [
+          @base_dg.vertex_named(name) ? 0 : 1,
+          vertex.payload ? 0 : 1,
+          vertex.root? ? 0 : 1,
+          amount_constrained(dependency),
+          conflicts[name] ? 0 : 1,
+          vertex.payload ? 0 : search_for(dependency).count,
+          self.class.platform_sort_key(dependency.__platform),
+        ]
+      end
+    end
+
+    def self.platform_sort_key(platform)
+      # Prefer specific platform to not specific platform
+      return ["99-LAST", "", "", ""] if Gem::Platform::RUBY == platform
+      ["00", *platform.to_a.map {|part| part || "" }]
+    end
+
+    private
+
+    # returns an integer \in (-\infty, 0]
+    # a number closer to 0 means the dependency is less constraining
+    #
+    # dependencies w/ 0 or 1 possibilities (ignoring version requirements)
+    # are given very negative values, so they _always_ sort first,
+    # before dependencies that are unconstrained
+    def amount_constrained(dependency)
+      @amount_constrained ||= {}
+      @amount_constrained[dependency.name] ||= begin
+        if (base = @base[dependency.name]) && !base.empty?
+          dependency.requirement.satisfied_by?(base.first.version) ? 0 : 1
+        else
+          all = index_for(dependency).search(dependency.name).size
+
+          if all <= 1
+            all - 1_000_000
+          else
+            search = search_for(dependency)
+            search = @prerelease_specified[dependency.name] ? search.count : search.count {|s| !s.version.prerelease? }
+            search - all
+          end
+        end
+      end
+    end
+
+    def verify_gemfile_dependencies_are_found!(requirements)
+      requirements.each do |requirement|
+        name = requirement.name
+        next if name == "bundler"
+        next unless search_for(requirement).empty?
+
+        if (base = @base[name]) && !base.empty?
+          version = base.first.version
+          message = "You have requested:\n" \
+            "  #{name} #{requirement.requirement}\n\n" \
+            "The bundle currently has #{name} locked at #{version}.\n" \
+            "Try running `bundle update #{name}`\n\n" \
+            "If you are updating multiple gems in your Gemfile at once,\n" \
+            "try passing them all to `bundle update`"
+        else
+          source = source_for(name)
+          specs = source.specs.search(name)
+          versions_with_platforms = specs.map {|s| [s.version, s.platform] }
+          cache_message = begin
+                              " or in gems cached in #{Bundler.settings.app_cache_path}" if Bundler.app_cache.exist?
+                            rescue GemfileNotFound
+                              nil
+                            end
+          message = String.new("Could not find gem '#{SharedHelpers.pretty_dependency(requirement)}' in #{source}#{cache_message}.\n")
+          message << "The source contains the following versions of '#{name}': #{formatted_versions_with_platforms(versions_with_platforms)}" if versions_with_platforms.any?
+        end
+        raise GemNotFound, message
+      end
+    end
+
+    def formatted_versions_with_platforms(versions_with_platforms)
+      version_platform_strs = versions_with_platforms.map do |vwp|
+        version = vwp.first
+        platform = vwp.last
+        version_platform_str = String.new(version.to_s)
+        version_platform_str << " #{platform}" unless platform.nil? || platform == Gem::Platform::RUBY
+        version_platform_str
+      end
+      version_platform_strs.join(", ")
+    end
+
+    def version_conflict_message(e)
+      # only show essential conflicts, if possible
+      conflicts = e.conflicts.dup
+
+      if conflicts["bundler"]
+        conflicts.replace("bundler" => conflicts["bundler"])
+      else
+        conflicts.delete_if do |_name, conflict|
+          deps = conflict.requirement_trees.map(&:last).flatten(1)
+          !Bundler::VersionRanges.empty?(*Bundler::VersionRanges.for_many(deps.map(&:requirement)))
+        end
+      end
+
+      e = Molinillo::VersionConflict.new(conflicts, e.specification_provider) unless conflicts.empty?
+
+      solver_name = "Bundler"
+      possibility_type = "gem"
+      e.message_with_trees(
+        :solver_name => solver_name,
+        :possibility_type => possibility_type,
+        :reduce_trees => lambda do |trees|
+          # called first, because we want to reduce the amount of work required to find maximal empty sets
+          trees = trees.uniq {|t| t.flatten.map {|dep| [dep.name, dep.requirement] } }
+
+          # bail out if tree size is too big for Array#combination to make any sense
+          return trees if trees.size > 15
+          maximal = 1.upto(trees.size).map do |size|
+            trees.map(&:last).flatten(1).combination(size).to_a
+          end.flatten(1).select do |deps|
+            Bundler::VersionRanges.empty?(*Bundler::VersionRanges.for_many(deps.map(&:requirement)))
+          end.min_by(&:size)
+
+          trees.reject! {|t| !maximal.include?(t.last) } if maximal
+
+          trees.sort_by {|t| t.reverse.map(&:name) }
+        end,
+        :printable_requirement => lambda {|req| SharedHelpers.pretty_dependency(req) },
+        :additional_message_for_conflict => lambda do |o, name, conflict|
+          if name == "bundler"
+            o << %(\n  Current Bundler version:\n    bundler (#{Bundler::VERSION}))
+
+            conflict_dependency = conflict.requirement
+            conflict_requirement = conflict_dependency.requirement
+            other_bundler_required = !conflict_requirement.satisfied_by?(Gem::Version.new(Bundler::VERSION))
+
+            if other_bundler_required
+              o << "\n\n"
+
+              candidate_specs = source_for(:default_bundler).specs.search(conflict_dependency)
+              if candidate_specs.any?
+                target_version = candidate_specs.last.version
+                new_command = [File.basename($PROGRAM_NAME), "_#{target_version}_", *ARGV].join(" ")
+                o << "Your bundle requires a different version of Bundler than the one you're running.\n"
+                o << "Install the necessary version with `gem install bundler:#{target_version}` and rerun bundler using `#{new_command}`\n"
+              else
+                o << "Your bundle requires a different version of Bundler than the one you're running, and that version could not be found.\n"
+              end
+            end
+          elsif conflict.locked_requirement
+            o << "\n"
+            o << %(Running `bundle update` will rebuild your snapshot from scratch, using only\n)
+            o << %(the gems in your Gemfile, which may resolve the conflict.\n)
+          elsif !conflict.existing
+            o << "\n"
+
+            relevant_source = conflict.requirement.source || source_for(name)
+
+            metadata_requirement = name.end_with?("\0")
+
+            o << "Could not find gem '" unless metadata_requirement
+            o << SharedHelpers.pretty_dependency(conflict.requirement)
+            o << "'" unless metadata_requirement
+            if conflict.requirement_trees.first.size > 1
+              o << ", which is required by "
+              o << "gem '#{SharedHelpers.pretty_dependency(conflict.requirement_trees.first[-2])}',"
+            end
+            o << " "
+
+            o << if metadata_requirement
+              "is not available in #{relevant_source}"
+            else
+              "in #{relevant_source}.\n"
+            end
+          end
+        end,
+        :version_for_spec => lambda {|spec| spec.version },
+        :incompatible_version_message_for_conflict => lambda do |name, _conflict|
+          if name.end_with?("\0")
+            %(#{solver_name} found conflicting requirements for the #{name} version:)
+          else
+            %(#{solver_name} could not find compatible versions for #{possibility_type} "#{name}":)
+          end
+        end
+      )
+    end
+  end
+end
diff --git a/lib/bundler/resolver/spec_group.rb b/lib/bundler/resolver/spec_group.rb
new file mode 100644
index 0000000000..8f4fd18c46
--- /dev/null
+++ b/lib/bundler/resolver/spec_group.rb
@@ -0,0 +1,110 @@
+# frozen_string_literal: true
+
+module Bundler
+  class Resolver
+    class SpecGroup
+      attr_accessor :name, :version, :source
+      attr_accessor :activated_platforms
+
+      def self.create_for(specs, all_platforms, specific_platform)
+        specific_platform_specs = specs[specific_platform]
+        return unless specific_platform_specs.any?
+
+        platforms = all_platforms.select {|p| specs[p].any? }
+
+        new(specific_platform_specs.first, specs, platforms)
+      end
+
+      def initialize(exemplary_spec, specs, relevant_platforms)
+        @exemplary_spec = exemplary_spec
+        @name = exemplary_spec.name
+        @version = exemplary_spec.version
+        @source = exemplary_spec.source
+
+        @activated_platforms = relevant_platforms
+        @dependencies = Hash.new do |dependencies, platforms|
+          dependencies[platforms] = dependencies_for(platforms)
+        end
+        @specs = specs
+      end
+
+      def to_specs
+        activated_platforms.map do |p|
+          specs = @specs[p]
+          next unless specs.any?
+
+          specs.map do |s|
+            lazy_spec = LazySpecification.new(name, version, s.platform, source)
+            lazy_spec.dependencies.replace s.dependencies
+            lazy_spec
+          end
+        end.flatten.compact.uniq
+      end
+
+      def to_s
+        activated_platforms_string = sorted_activated_platforms.join(", ")
+        "#{name} (#{version}) (#{activated_platforms_string})"
+      end
+
+      def dependencies_for_activated_platforms
+        @dependencies[activated_platforms]
+      end
+
+      def ==(other)
+        return unless other.is_a?(SpecGroup)
+        name == other.name &&
+          version == other.version &&
+          sorted_activated_platforms == other.sorted_activated_platforms &&
+          source == other.source
+      end
+
+      def eql?(other)
+        return unless other.is_a?(SpecGroup)
+        name.eql?(other.name) &&
+          version.eql?(other.version) &&
+          sorted_activated_platforms.eql?(other.sorted_activated_platforms) &&
+          source.eql?(other.source)
+      end
+
+      def hash
+        name.hash ^ version.hash ^ sorted_activated_platforms.hash ^ source.hash
+      end
+
+      protected
+
+      def sorted_activated_platforms
+        activated_platforms.sort_by(&:to_s)
+      end
+
+      private
+
+      def dependencies_for(platforms)
+        platforms.map do |platform|
+          __dependencies(platform) + metadata_dependencies(platform)
+        end.flatten
+      end
+
+      def __dependencies(platform)
+        dependencies = []
+        @specs[platform].first.dependencies.each do |dep|
+          next if dep.type == :development
+          dependencies << DepProxy.get_proxy(dep, platform)
+        end
+        dependencies
+      end
+
+      def metadata_dependencies(platform)
+        spec = @specs[platform].first
+        return [] unless spec.is_a?(Gem::Specification)
+        dependencies = []
+        if !spec.required_ruby_version.nil? && !spec.required_ruby_version.none?
+          dependencies << DepProxy.get_proxy(Gem::Dependency.new("Ruby\0", spec.required_ruby_version), platform)
+        end
+        if !spec.required_rubygems_version.nil? && !spec.required_rubygems_version.none?
+          dependencies << DepProxy.get_proxy(Gem::Dependency.new("RubyGems\0", spec.required_rubygems_version), platform)
+        end
+        dependencies
+      end
+    end
+  end
+end
diff --git a/lib/bundler/retry.rb b/lib/bundler/retry.rb
new file mode 100644
index 0000000000..2415ade200
--- /dev/null
+++ b/lib/bundler/retry.rb
@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+module Bundler
+  # General purpose class for retrying code that may fail
+  class Retry
+    attr_accessor :name, :total_runs, :current_run
+
+    class << self
+      def default_attempts
+        default_retries + 1
+      end
+      alias_method :attempts, :default_attempts
+
+      def default_retries
+        Bundler.settings[:retry]
+      end
+    end
+
+    def initialize(name, exceptions = nil, retries = self.class.default_retries)
+      @name = name
+      @retries = retries
+      @exceptions = Array(exceptions) || []
+      @total_runs = @retries + 1 # will run once, then upto attempts.times
+    end
+
+    def attempt(&block)
+      @current_run = 0
+      @failed      = false
+      @error       = nil
+      run(&block) while keep_trying?
+      @result
+    end
+    alias_method :attempts, :attempt
+
+    private
+
+    def run(&block)
+      @failed = false
+      @current_run += 1
+      @result = block.call
+    rescue StandardError => e
+      fail_attempt(e)
+    end
+
+    def fail_attempt(e)
+      @failed = true
+      if last_attempt? || @exceptions.any? {|k| e.is_a?(k) }
+        Bundler.ui.info "" unless Bundler.ui.debug?
+        raise e
+      end
+      return true unless name
+      Bundler.ui.info "" unless Bundler.ui.debug? # Add new line in case dots preceded this
+      Bundler.ui.warn "Retrying #{name} due to error (#{current_run.next}/#{total_runs}): #{e.class} #{e.message}", Bundler.ui.debug?
+    end
+
+    def keep_trying?
+      return true  if current_run.zero?
+      return false if last_attempt?
+      return true  if @failed
+    end
+
+    def last_attempt?
+      current_run >= total_runs
+    end
+  end
+end
diff --git a/lib/bundler/ruby_dsl.rb b/lib/bundler/ruby_dsl.rb
new file mode 100644
index 0000000000..f6ba220cd5
--- /dev/null
+++ b/lib/bundler/ruby_dsl.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Bundler
+  module RubyDsl
+    def ruby(*ruby_version)
+      options = ruby_version.last.is_a?(Hash) ? ruby_version.pop : {}
+      ruby_version.flatten!
+      raise GemfileError, "Please define :engine_version" if options[:engine] && options[:engine_version].nil?
+      raise GemfileError, "Please define :engine" if options[:engine_version] && options[:engine].nil?
+
+      if options[:engine] == "ruby" && options[:engine_version] &&
+          ruby_version != Array(options[:engine_version])
+        raise GemfileEvalError, "ruby_version must match the :engine_version for MRI"
+      end
+      @ruby_version = RubyVersion.new(ruby_version, options[:patchlevel], options[:engine], options[:engine_version])
+    end
+  end
+end
diff --git a/lib/bundler/ruby_version.rb b/lib/bundler/ruby_version.rb
new file mode 100644
index 0000000000..491f8c55a4
--- /dev/null
+++ b/lib/bundler/ruby_version.rb
@@ -0,0 +1,137 @@
+# frozen_string_literal: true
+
+module Bundler
+  class RubyVersion
+    attr_reader :versions,
+      :patchlevel,
+      :engine,
+      :engine_versions,
+      :gem_version,
+      :engine_gem_version
+
+    def initialize(versions, patchlevel, engine, engine_version)
+      # The parameters to this method must satisfy the
+      # following constraints, which are verified in
+      # the DSL:
+      #
+      # * If an engine is specified, an engine version
+      #   must also be specified
+      # * If an engine version is specified, an engine
+      #   must also be specified
+      # * If the engine is "ruby", the engine version
+      #   must not be specified, or the engine version
+      #   specified must match the version.
+
+      @versions = Array(versions).map do |v|
+        op, v = Gem::Requirement.parse(v)
+        op == "=" ? v.to_s : "#{op} #{v}"
+      end
+
+      @gem_version        = Gem::Requirement.create(@versions.first).requirements.first.last
+      @input_engine       = engine && engine.to_s
+      @engine             = engine && engine.to_s || "ruby"
+      @engine_versions    = (engine_version && Array(engine_version)) || @versions
+      @engine_gem_version = Gem::Requirement.create(@engine_versions.first).requirements.first.last
+      @patchlevel         = patchlevel
+    end
+
+    def to_s(versions = self.versions)
+      output = String.new("ruby #{versions_string(versions)}")
+      output << "p#{patchlevel}" if patchlevel
+      output << " (#{engine} #{versions_string(engine_versions)})" unless engine == "ruby"
+
+      output
+    end
+
+    # @private
+    PATTERN = /
+      ruby\s
+      ([\d.]+) # ruby version
+      (?:p(-?\d+))? # optional patchlevel
+      (?:\s\((\S+)\s(.+)\))? # optional engine info
+    /xo.freeze
+
+    # Returns a RubyVersion from the given string.
+    # @param [String] the version string to match.
+    # @return [RubyVersion,Nil] The version if the string is a valid RubyVersion
+    #         description, and nil otherwise.
+    def self.from_string(string)
+      new($1, $2, $3, $4) if string =~ PATTERN
+    end
+
+    def single_version_string
+      to_s(gem_version)
+    end
+
+    def ==(other)
+      versions == other.versions &&
+        engine == other.engine &&
+        engine_versions == other.engine_versions &&
+        patchlevel == other.patchlevel
+    end
+
+    def host
+      @host ||= [
+        RbConfig::CONFIG["host_cpu"],
+        RbConfig::CONFIG["host_vendor"],
+        RbConfig::CONFIG["host_os"],
+      ].join("-")
+    end
+
+    # Returns a tuple of these things:
+    #   [diff, this, other]
+    #   The priority of attributes are
+    #   1. engine
+    #   2. ruby_version
+    #   3. engine_version
+    def diff(other)
+      raise ArgumentError, "Can only diff with a RubyVersion, not a #{other.class}" unless other.is_a?(RubyVersion)
+      if engine != other.engine && @input_engine
+        [:engine, engine, other.engine]
+      elsif versions.empty? || !matches?(versions, other.gem_version)
+        [:version, versions_string(versions), versions_string(other.versions)]
+      elsif @input_engine && !matches?(engine_versions, other.engine_gem_version)
+        [:engine_version, versions_string(engine_versions), versions_string(other.engine_versions)]
+      elsif patchlevel && (!patchlevel.is_a?(String) || !other.patchlevel.is_a?(String) || !matches?(patchlevel, other.patchlevel))
+        [:patchlevel, patchlevel, other.patchlevel]
+      end
+    end
+
+    def versions_string(versions)
+      Array(versions).join(", ")
+    end
+
+    def self.system
+      ruby_engine = RUBY_ENGINE.dup
+      ruby_version = ENV.fetch("BUNDLER_SPEC_RUBY_VERSION") { RUBY_VERSION }.dup
+      ruby_engine_version = RUBY_ENGINE_VERSION.dup
+      patchlevel = RUBY_PATCHLEVEL.to_s
+
+      @ruby_version ||= RubyVersion.new(ruby_version, patchlevel, ruby_engine, ruby_engine_version)
+    end
+
+    def to_gem_version_with_patchlevel
+      @gem_version_with_patch ||= begin
+        Gem::Version.create("#{@gem_version}.#{@patchlevel}")
+      rescue ArgumentError
+        @gem_version
+      end
+    end
+
+    def exact?
+      return @exact if defined?(@exact)
+      @exact = versions.all? {|v| Gem::Requirement.create(v).exact? }
+    end
+
+    private
+
+    def matches?(requirements, version)
+      # Handles RUBY_PATCHLEVEL of -1 for instances like ruby-head
+      return requirements == version if requirements.to_s == "-1" || version.to_s == "-1"
+
+      Array(requirements).all? do |requirement|
+        Gem::Requirement.create(requirement).satisfied_by?(Gem::Version.create(version))
+      end
+    end
+  end
+end
diff --git a/lib/bundler/rubygems_ext.rb b/lib/bundler/rubygems_ext.rb
new file mode 100644
index 0000000000..a3efff1e86
--- /dev/null
+++ b/lib/bundler/rubygems_ext.rb
@@ -0,0 +1,234 @@
+# frozen_string_literal: true
+
+require "pathname"
+
+require "rubygems/specification"
+
+# Possible use in Gem::Specification#source below and require
+# shouldn't be deferred.
+require "rubygems/source"
+
+require_relative "match_platform"
+
+module Gem
+  class Specification
+    attr_accessor :remote, :location, :relative_loaded_from
+
+    remove_method :source
+    attr_writer :source
+    def source
+      (defined?(@source) && @source) || Gem::Source::Installed.new
+    end
+
+    alias_method :rg_full_gem_path, :full_gem_path
+    alias_method :rg_loaded_from,   :loaded_from
+
+    def full_gem_path
+      # this cannot check source.is_a?(Bundler::Plugin::API::Source)
+      # because that _could_ trip the autoload, and if there are unresolved
+      # gems at that time, this method could be called inside another require,
+      # thus raising with that constant being undefined. Better to check a method
+      if source.respond_to?(:path) || (source.respond_to?(:bundler_plugin_api_source?) && source.bundler_plugin_api_source?)
+        Pathname.new(loaded_from).dirname.expand_path(source.root).to_s.tap{|x| x.untaint if RUBY_VERSION < "2.7" }
+      else
+        rg_full_gem_path
+      end
+    end
+
+    def loaded_from
+      if relative_loaded_from
+        source.path.join(relative_loaded_from).to_s
+      else
+        rg_loaded_from
+      end
+    end
+
+    def load_paths
+      full_require_paths
+    end
+
+    alias_method :rg_extension_dir, :extension_dir
+    def extension_dir
+      @bundler_extension_dir ||= if source.respond_to?(:extension_dir_name)
+        unique_extension_dir = [source.extension_dir_name, File.basename(full_gem_path)].uniq.join("-")
+        File.expand_path(File.join(extensions_dir, unique_extension_dir))
+      else
+        rg_extension_dir
+      end
+    end
+
+    remove_method :gem_dir if instance_methods(false).include?(:gem_dir)
+    def gem_dir
+      full_gem_path
+    end
+
+    def groups
+      @groups ||= []
+    end
+
+    def git_version
+      return unless loaded_from && source.is_a?(Bundler::Source::Git)
+      " #{source.revision[0..6]}"
+    end
+
+    def to_gemfile(path = nil)
+      gemfile = String.new("source 'https://rubygems.org'\n")
+      gemfile << dependencies_to_gemfile(nondevelopment_dependencies)
+      unless development_dependencies.empty?
+        gemfile << "\n"
+        gemfile << dependencies_to_gemfile(development_dependencies, :development)
+      end
+      gemfile
+    end
+
+    def nondevelopment_dependencies
+      dependencies - development_dependencies
+    end
+
+    def deleted_gem?
+      !default_gem? && !File.directory?(full_gem_path)
+    end
+
+    private
+
+    def dependencies_to_gemfile(dependencies, group = nil)
+      gemfile = String.new
+      if dependencies.any?
+        gemfile << "group :#{group} do\n" if group
+        dependencies.each do |dependency|
+          gemfile << "  " if group
+          gemfile << %(gem "#{dependency.name}")
+          req = dependency.requirements_list.first
+          gemfile << %(, "#{req}") if req
+          gemfile << "\n"
+        end
+        gemfile << "end\n" if group
+      end
+      gemfile
+    end
+  end
+
+  class Dependency
+    attr_accessor :source, :groups
+
+    alias_method :eql?, :==
+
+    def encode_with(coder)
+      to_yaml_properties.each do |ivar|
+        coder[ivar.to_s.sub(/^@/, "")] = instance_variable_get(ivar)
+      end
+    end
+
+    def to_yaml_properties
+      instance_variables.reject {|p| ["@source", "@groups"].include?(p.to_s) }
+    end
+
+    def to_lock
+      out = String.new("  #{name}")
+      unless requirement.none?
+        reqs = requirement.requirements.map {|o, v| "#{o} #{v}" }.sort.reverse
+        out << " (#{reqs.join(", ")})"
+      end
+      out
+    end
+  end
+
+  # comparison is done order independently since rubygems 3.2.0.rc.2
+  unless Gem::Requirement.new("> 1", "< 2") == Gem::Requirement.new("< 2", "> 1")
+    class Requirement
+      module OrderIndependentComparison
+        def ==(other)
+          if _requirements_sorted? && other._requirements_sorted?
+            super
+          else
+            _with_sorted_requirements == other._with_sorted_requirements
+          end
+        end
+
+        protected
+
+        def _requirements_sorted?
+          return @_are_requirements_sorted if defined?(@_are_requirements_sorted)
+          strings = as_list
+          @_are_requirements_sorted = strings == strings.sort
+        end
+
+        def _with_sorted_requirements
+          @_with_sorted_requirements ||= _requirements_sorted? ? self : self.class.new(as_list.sort)
+        end
+      end
+
+      prepend OrderIndependentComparison
+    end
+  end
+
+  if Gem::Requirement.new("~> 2.0").hash == Gem::Requirement.new("~> 2.0.0").hash
+    class Requirement
+      module CorrectHashForLambdaOperator
+        def hash
+          if requirements.any? {|r| r.first == "~>" }
+            requirements.map {|r| r.first == "~>" ? [r[0], r[1].to_s] : r }.sort.hash
+          else
+            super
+          end
+        end
+      end
+
+      prepend CorrectHashForLambdaOperator
+    end
+  end
+
+  require "rubygems/platform"
+
+  class Platform
+    JAVA  = Gem::Platform.new("java") unless defined?(JAVA)
+    MSWIN = Gem::Platform.new("mswin32") unless defined?(MSWIN)
+    MSWIN64 = Gem::Platform.new("mswin64") unless defined?(MSWIN64)
+    MINGW = Gem::Platform.new("x86-mingw32") unless defined?(MINGW)
+    X64_MINGW = Gem::Platform.new("x64-mingw32") unless defined?(X64_MINGW)
+  end
+
+  Platform.singleton_class.module_eval do
+    unless Platform.singleton_methods.include?(:match_spec?)
+      def match_spec?(spec)
+        match_gem?(spec.platform, spec.name)
+      end
+
+      def match_gem?(platform, gem_name)
+        match_platforms?(platform, Gem.platforms)
+      end
+
+      private
+
+      def match_platforms?(platform, platforms)
+        platforms.any? do |local_platform|
+          platform.nil? ||
+            local_platform == platform ||
+            (local_platform != Gem::Platform::RUBY && local_platform =~ platform)
+        end
+      end
+    end
+  end
+
+  require "rubygems/util"
+
+  Util.singleton_class.module_eval do
+    if Util.singleton_methods.include?(:glob_files_in_dir) # since 3.0.0.beta.2
+      remove_method :glob_files_in_dir
+    end
+
+    def glob_files_in_dir(glob, base_path)
+      if RUBY_VERSION >= "2.5"
+        Dir.glob(glob, :base => base_path).map! {|f| File.expand_path(f, base_path) }
+      else
+        Dir.glob(File.join(base_path.to_s.gsub(/[\[\]]/, '\\\\\\&'), glob)).map! {|f| File.expand_path(f) }
+      end
+    end
+  end
+end
+
+module Gem
+  class Specification
+    include ::Bundler::MatchPlatform
+  end
+end
diff --git a/lib/bundler/rubygems_gem_installer.rb b/lib/bundler/rubygems_gem_installer.rb
new file mode 100644
index 0000000000..bb9f1cb3f5
--- /dev/null
+++ b/lib/bundler/rubygems_gem_installer.rb
@@ -0,0 +1,160 @@
+# frozen_string_literal: true
+
+require "rubygems/installer"
+
+module Bundler
+  class RubyGemsGemInstaller < Gem::Installer
+    def check_executable_overwrite(filename)
+      # Bundler needs to install gems regardless of binstub overwriting
+    end
+
+    def install
+      pre_install_checks
+
+      run_pre_install_hooks
+
+      spec.loaded_from = spec_file
+
+      # Completely remove any previous gem files
+      strict_rm_rf gem_dir
+      strict_rm_rf spec.extension_dir
+
+      SharedHelpers.filesystem_access(gem_dir, :create) do
+        FileUtils.mkdir_p gem_dir, :mode => 0o755
+      end
+
+      extract_files
+
+      build_extensions
+      write_build_info_file
+      run_post_build_hooks
+
+      generate_bin
+      generate_plugins
+
+      write_spec
+
+      SharedHelpers.filesystem_access("#{gem_home}/cache", :write) do
+        write_cache_file
+      end
+
+      say spec.post_install_message unless spec.post_install_message.nil?
+
+      run_post_install_hooks
+
+      spec
+    end
+
+    def generate_plugins
+      return unless Gem::Installer.instance_methods(false).include?(:generate_plugins)
+
+      latest = Gem::Specification.stubs_for(spec.name).first
+      return if latest && latest.version > spec.version
+
+      ensure_writable_dir @plugins_dir
+
+      if spec.plugins.empty?
+        remove_plugins_for(spec, @plugins_dir)
+      else
+        regenerate_plugins_for(spec, @plugins_dir)
+      end
+    end
+
+    def pre_install_checks
+      super && validate_bundler_checksum(options[:bundler_expected_checksum])
+    end
+
+    def build_extensions
+      extension_cache_path = options[:bundler_extension_cache_path]
+      unless extension_cache_path && extension_dir = spec.extension_dir
+        require "shellwords" # compensate missing require in rubygems before version 3.2.25
+        return super
+      end
+
+      extension_dir = Pathname.new(extension_dir)
+      build_complete = SharedHelpers.filesystem_access(extension_cache_path.join("gem.build_complete"), :read, &:file?)
+      if build_complete && !options[:force]
+        SharedHelpers.filesystem_access(extension_dir.parent, &:mkpath)
+        SharedHelpers.filesystem_access(extension_cache_path) do
+          FileUtils.cp_r extension_cache_path, spec.extension_dir
+        end
+      else
+        require "shellwords" # compensate missing require in rubygems before version 3.2.25
+        super
+        if extension_dir.directory? # not made for gems without extensions
+          SharedHelpers.filesystem_access(extension_cache_path.parent, &:mkpath)
+          SharedHelpers.filesystem_access(extension_cache_path) do
+            FileUtils.cp_r extension_dir, extension_cache_path
+          end
+        end
+      end
+    end
+
+    private
+
+    def strict_rm_rf(dir)
+      # FileUtils.rm_rf should probably rise in case of permission issues like
+      # `rm -rf` does. However, it fails to delete the folder silently due to
+      # https://github.com/ruby/fileutils/issues/57. It should probably be fixed
+      # inside `fileutils` but for now I`m checking whether the folder was
+      # removed after it completes, and raising otherwise.
+      FileUtils.rm_rf dir
+
+      raise PermissionError.new(dir, :delete) if File.directory?(dir)
+    end
+
+    def validate_bundler_checksum(checksum)
+      return true if Bundler.settings[:disable_checksum_validation]
+      return true unless checksum
+      return true unless source = @package.instance_variable_get(:@gem)
+      return true unless source.respond_to?(:with_read_io)
+      digest = source.with_read_io do |io|
+        digest = SharedHelpers.digest(:SHA256).new
+        digest << io.read(16_384) until io.eof?
+        io.rewind
+        send(checksum_type(checksum), digest)
+      end
+      unless digest == checksum
+        raise SecurityError, <<-MESSAGE
+          Bundler cannot continue installing #{spec.name} (#{spec.version}).
+          The checksum for the downloaded `#{spec.full_name}.gem` does not match \
+          the checksum given by the server. This means the contents of the downloaded \
+          gem is different from what was uploaded to the server, and could be a potential security issue.
+
+          To resolve this issue:
+          1. delete the downloaded gem located at: `#{spec.gem_dir}/#{spec.full_name}.gem`
+          2. run `bundle install`
+
+          If you wish to continue installing the downloaded gem, and are certain it does not pose a \
+          security issue despite the mismatching checksum, do the following:
+          1. run `bundle config set --local disable_checksum_validation true` to turn off checksum verification
+          2. run `bundle install`
+
+          (More info: The expected SHA256 checksum was #{checksum.inspect}, but the \
+          checksum for the downloaded gem was #{digest.inspect}.)
+          MESSAGE
+      end
+      true
+    end
+
+    def checksum_type(checksum)
+      case checksum.length
+      when 64 then :hexdigest!
+      when 44 then :base64digest!
+      else raise InstallError, "The given checksum for #{spec.full_name} (#{checksum.inspect}) is not a valid SHA256 hexdigest nor base64digest"
+      end
+    end
+
+    def hexdigest!(digest)
+      digest.hexdigest!
+    end
+
+    def base64digest!(digest)
+      if digest.respond_to?(:base64digest!)
+        digest.base64digest!
+      else
+        [digest.digest!].pack("m0")
+      end
+    end
+  end
+end
diff --git a/lib/bundler/rubygems_integration.rb b/lib/bundler/rubygems_integration.rb
new file mode 100644
index 0000000000..f6d59baf15
--- /dev/null
+++ b/lib/bundler/rubygems_integration.rb
@@ -0,0 +1,633 @@
+# frozen_string_literal: true
+
+require "rubygems" unless defined?(Gem)
+
+module Bundler
+  class RubygemsIntegration
+    if defined?(Gem::Ext::Builder::CHDIR_MONITOR)
+      EXT_LOCK = Gem::Ext::Builder::CHDIR_MONITOR
+    else
+      require "monitor"
+
+      EXT_LOCK = Monitor.new
+    end
+
+    def self.version
+      @version ||= Gem::Version.new(Gem::VERSION)
+    end
+
+    def self.provides?(req_str)
+      Gem::Requirement.new(req_str).satisfied_by?(version)
+    end
+
+    def initialize
+      @replaced_methods = {}
+      backport_ext_builder_monitor
+    end
+
+    def version
+      self.class.version
+    end
+
+    def provides?(req_str)
+      self.class.provides?(req_str)
+    end
+
+    def build_args
+      require "rubygems/command"
+      Gem::Command.build_args
+    end
+
+    def build_args=(args)
+      require "rubygems/command"
+      Gem::Command.build_args = args
+    end
+
+    def loaded_specs(name)
+      Gem.loaded_specs[name]
+    end
+
+    def add_to_load_path(paths)
+      return Gem.add_to_load_path(*paths) if Gem.respond_to?(:add_to_load_path)
+
+      if insert_index = Gem.load_path_insert_index
+        # Gem directories must come after -I and ENV['RUBYLIB']
+        $LOAD_PATH.insert(insert_index, *paths)
+      else
+        # We are probably testing in core, -I and RUBYLIB don't apply
+        $LOAD_PATH.unshift(*paths)
+      end
+    end
+
+    def mark_loaded(spec)
+      if spec.respond_to?(:activated=)
+        current = Gem.loaded_specs[spec.name]
+        current.activated = false if current
+        spec.activated = true
+      end
+      Gem.loaded_specs[spec.name] = spec
+    end
+
+    def validate(spec)
+      Bundler.ui.silence { spec.validate(false) }
+    rescue Gem::InvalidSpecificationException => e
+      error_message = "The gemspec at #{spec.loaded_from} is not valid. Please fix this gemspec.\n" \
+        "The validation error was '#{e.message}'\n"
+      raise Gem::InvalidSpecificationException.new(error_message)
+    rescue Errno::ENOENT
+      nil
+    end
+
+    def set_installed_by_version(spec, installed_by_version = Gem::VERSION)
+      return unless spec.respond_to?(:installed_by_version=)
+      spec.installed_by_version = Gem::Version.create(installed_by_version)
+    end
+
+    def spec_missing_extensions?(spec, default = true)
+      return spec.missing_extensions? if spec.respond_to?(:missing_extensions?)
+
+      return false if spec.default_gem?
+      return false if spec.extensions.empty?
+
+      default
+    end
+
+    def spec_matches_for_glob(spec, glob)
+      return spec.matches_for_glob(glob) if spec.respond_to?(:matches_for_glob)
+
+      spec.load_paths.map do |lp|
+        Dir["#{lp}/#{glob}#{suffix_pattern}"]
+      end.flatten(1)
+    end
+
+    def stub_set_spec(stub, spec)
+      stub.instance_variable_set(:@spec, spec)
+    end
+
+    def path(obj)
+      obj.to_s
+    end
+
+    def configuration
+      require_relative "psyched_yaml"
+      Gem.configuration
+    rescue Gem::SystemExitException, LoadError => e
+      Bundler.ui.error "#{e.class}: #{e.message}"
+      Bundler.ui.trace e
+      raise
+    rescue YamlLibrarySyntaxError => e
+      raise YamlSyntaxError.new(e, "Your RubyGems configuration, which is " \
+        "usually located in ~/.gemrc, contains invalid YAML syntax.")
+    end
+
+    def ruby_engine
+      Gem.ruby_engine
+    end
+
+    def read_binary(path)
+      Gem.read_binary(path)
+    end
+
+    def inflate(obj)
+      Gem::Util.inflate(obj)
+    end
+
+    def correct_for_windows_path(path)
+      if Gem::Util.respond_to?(:correct_for_windows_path)
+        Gem::Util.correct_for_windows_path(path)
+      elsif path[0].chr == "/" && path[1].chr =~ /[a-z]/i && path[2].chr == ":"
+        path[1..-1]
+      else
+        path
+      end
+    end
+
+    def sources=(val)
+      # Gem.configuration creates a new Gem::ConfigFile, which by default will read ~/.gemrc
+      # If that file exists, its settings (including sources) will overwrite the values we
+      # are about to set here. In order to avoid that, we force memoizing the config file now.
+      configuration
+
+      Gem.sources = val
+    end
+
+    def sources
+      Gem.sources
+    end
+
+    def gem_dir
+      Gem.dir
+    end
+
+    def gem_bindir
+      Gem.bindir
+    end
+
+    def user_home
+      Gem.user_home
+    end
+
+    def gem_path
+      Gem.path
+    end
+
+    def reset
+      Gem::Specification.reset
+    end
+
+    def post_reset_hooks
+      Gem.post_reset_hooks
+    end
+
+    def suffix_pattern
+      Gem.suffix_pattern
+    end
+
+    def gem_cache
+      gem_path.map {|p| File.expand_path("cache", p) }
+    end
+
+    def spec_cache_dirs
+      @spec_cache_dirs ||= begin
+        dirs = gem_path.map {|dir| File.join(dir, "specifications") }
+        dirs << Gem.spec_cache_dir if Gem.respond_to?(:spec_cache_dir) # Not in RubyGems 2.0.3 or earlier
+        dirs.uniq.select {|dir| File.directory? dir }
+      end
+    end
+
+    def marshal_spec_dir
+      Gem::MARSHAL_SPEC_DIR
+    end
+
+    def clear_paths
+      Gem.clear_paths
+    end
+
+    def bin_path(gem, bin, ver)
+      Gem.bin_path(gem, bin, ver)
+    end
+
+    def loaded_gem_paths
+      loaded_gem_paths = Gem.loaded_specs.map {|_, s| s.full_require_paths }
+      loaded_gem_paths.flatten
+    end
+
+    def load_plugins
+      Gem.load_plugins if Gem.respond_to?(:load_plugins)
+    end
+
+    def load_plugin_files(files)
+      Gem.load_plugin_files(files) if Gem.respond_to?(:load_plugin_files)
+    end
+
+    def load_env_plugins
+      Gem.load_env_plugins if Gem.respond_to?(:load_env_plugins)
+    end
+
+    def ui=(obj)
+      Gem::DefaultUserInteraction.ui = obj
+    end
+
+    def ext_lock
+      EXT_LOCK
+    end
+
+    def with_build_args(args)
+      ext_lock.synchronize do
+        old_args = build_args
+        begin
+          self.build_args = args
+          yield
+        ensure
+          self.build_args = old_args
+        end
+      end
+    end
+
+    def spec_from_gem(path, policy = nil)
+      require "rubygems/security"
+      require_relative "psyched_yaml"
+      gem_from_path(path, security_policies[policy]).spec
+    rescue Exception, Gem::Exception, Gem::Security::Exception => e # rubocop:disable Lint/RescueException
+      if e.is_a?(Gem::Security::Exception) ||
+          e.message =~ /unknown trust policy|unsigned gem/i ||
+          e.message =~ /couldn't verify (meta)?data signature/i
+        raise SecurityError,
+          "The gem #{File.basename(path, ".gem")} can't be installed because " \
+          "the security policy didn't allow it, with the message: #{e.message}"
+      else
+        raise e
+      end
+    end
+
+    def build_gem(gem_dir, spec)
+      build(spec)
+    end
+
+    def security_policy_keys
+      %w[High Medium Low AlmostNo No].map {|level| "#{level}Security" }
+    end
+
+    def security_policies
+      @security_policies ||= begin
+        require "rubygems/security"
+        Gem::Security::Policies
+      rescue LoadError, NameError
+        {}
+      end
+    end
+
+    def reverse_rubygems_kernel_mixin
+      # Disable rubygems' gem activation system
+      kernel = (class << ::Kernel; self; end)
+      [kernel, ::Kernel].each do |k|
+        if k.private_method_defined?(:gem_original_require)
+          redefine_method(k, :require, k.instance_method(:gem_original_require))
+        end
+      end
+    end
+
+    def replace_gem(specs, specs_by_name)
+      reverse_rubygems_kernel_mixin
+
+      executables = nil
+
+      kernel = (class << ::Kernel; self; end)
+      [kernel, ::Kernel].each do |kernel_class|
+        redefine_method(kernel_class, :gem) do |dep, *reqs|
+          if executables && executables.include?(File.basename(caller.first.split(":").first))
+            break
+          end
+
+          reqs.pop if reqs.last.is_a?(Hash)
+
+          unless dep.respond_to?(:name) && dep.respond_to?(:requirement)
+            dep = Gem::Dependency.new(dep, reqs)
+          end
+
+          if spec = specs_by_name[dep.name]
+            return true if dep.matches_spec?(spec)
+          end
+
+          message = if spec.nil?
+            target_file = begin
+                            Bundler.default_gemfile.basename
+                          rescue GemfileNotFound
+                            "inline Gemfile"
+                          end
+            "#{dep.name} is not part of the bundle." \
+            " Add it to your #{target_file}."
+          else
+            "can't activate #{dep}, already activated #{spec.full_name}. " \
+            "Make sure all dependencies are added to Gemfile."
+          end
+
+          e = Gem::LoadError.new(message)
+          e.name = dep.name
+          if e.respond_to?(:requirement=)
+            e.requirement = dep.requirement
+          elsif e.respond_to?(:version_requirement=)
+            e.version_requirement = dep.requirement
+          end
+          raise e
+        end
+
+        # backwards compatibility shim, see https://github.com/rubygems/bundler/issues/5102
+        kernel_class.send(:public, :gem) if Bundler.feature_flag.setup_makes_kernel_gem_public?
+      end
+    end
+
+    # Used to make bin stubs that are not created by bundler work
+    # under bundler. The new Gem.bin_path only considers gems in
+    # +specs+
+    def replace_bin_path(specs_by_name)
+      gem_class = (class << Gem; self; end)
+
+      redefine_method(gem_class, :find_spec_for_exe) do |gem_name, *args|
+        exec_name = args.first
+        raise ArgumentError, "you must supply exec_name" unless exec_name
+
+        spec_with_name = specs_by_name[gem_name]
+        matching_specs_by_exec_name = specs_by_name.values.select {|s| s.executables.include?(exec_name) }
+        spec = matching_specs_by_exec_name.delete(spec_with_name)
+
+        unless spec || !matching_specs_by_exec_name.empty?
+          message = "can't find executable #{exec_name} for gem #{gem_name}"
+          if spec_with_name.nil?
+            message += ". #{gem_name} is not currently included in the bundle, " \
+                       "perhaps you meant to add it to your #{Bundler.default_gemfile.basename}?"
+          end
+          raise Gem::Exception, message
+        end
+
+        unless spec
+          spec = matching_specs_by_exec_name.shift
+          warn \
+            "Bundler is using a binstub that was created for a different gem (#{spec.name}).\n" \
+            "You should run `bundle binstub #{gem_name}` " \
+            "to work around a system/bundle conflict."
+        end
+
+        unless matching_specs_by_exec_name.empty?
+          conflicting_names = matching_specs_by_exec_name.map(&:name).join(", ")
+          warn \
+            "The `#{exec_name}` executable in the `#{spec.name}` gem is being loaded, but it's also present in other gems (#{conflicting_names}).\n" \
+            "If you meant to run the executable for another gem, make sure you use a project specific binstub (`bundle binstub <gem_name>`).\n" \
+            "If you plan to use multiple conflicting executables, generate binstubs for them and disambiguate their names."
+        end
+
+        spec
+      end
+
+      redefine_method(gem_class, :activate_bin_path) do |name, *args|
+        exec_name = args.first
+        return ENV["BUNDLE_BIN_PATH"] if exec_name == "bundle"
+
+        # Copy of Rubygems activate_bin_path impl
+        requirement = args.last
+        spec = find_spec_for_exe name, exec_name, [requirement]
+
+        gem_bin = File.join(spec.full_gem_path, spec.bindir, exec_name)
+        gem_from_path_bin = File.join(File.dirname(spec.loaded_from), spec.bindir, exec_name)
+        File.exist?(gem_bin) ? gem_bin : gem_from_path_bin
+      end
+
+      redefine_method(gem_class, :bin_path) do |name, *args|
+        exec_name = args.first
+        return ENV["BUNDLE_BIN_PATH"] if exec_name == "bundle"
+
+        spec = find_spec_for_exe(name, *args)
+        exec_name ||= spec.default_executable
+
+        gem_bin = File.join(spec.full_gem_path, spec.bindir, exec_name)
+        gem_from_path_bin = File.join(File.dirname(spec.loaded_from), spec.bindir, exec_name)
+        File.exist?(gem_bin) ? gem_bin : gem_from_path_bin
+      end
+    end
+
+    # Replace or hook into RubyGems to provide a bundlerized view
+    # of the world.
+    def replace_entrypoints(specs)
+      specs_by_name = add_default_gems_to(specs)
+
+      replace_gem(specs, specs_by_name)
+      stub_rubygems(specs)
+      replace_bin_path(specs_by_name)
+
+      Gem.clear_paths
+    end
+
+    # Add default gems not already present in specs, and return them as a hash.
+    def add_default_gems_to(specs)
+      specs_by_name = specs.reduce({}) do |h, s|
+        h[s.name] = s
+        h
+      end
+
+      Bundler.rubygems.default_stubs.each do |stub|
+        default_spec = stub.to_spec
+        default_spec_name = default_spec.name
+        next if specs_by_name.key?(default_spec_name)
+
+        specs << default_spec
+        specs_by_name[default_spec_name] = default_spec
+      end
+
+      specs_by_name
+    end
+
+    def undo_replacements
+      @replaced_methods.each do |(sym, klass), method|
+        redefine_method(klass, sym, method)
+      end
+      if Binding.public_method_defined?(:source_location)
+        post_reset_hooks.reject! {|proc| proc.binding.source_location[0] == __FILE__ }
+      else
+        post_reset_hooks.reject! {|proc| proc.binding.eval("__FILE__") == __FILE__ }
+      end
+      @replaced_methods.clear
+    end
+
+    def redefine_method(klass, method, unbound_method = nil, &block)
+      visibility = method_visibility(klass, method)
+      begin
+        if (instance_method = klass.instance_method(method)) && method != :initialize
+          # doing this to ensure we also get private methods
+          klass.send(:remove_method, method)
+        end
+      rescue NameError
+        # method isn't defined
+        nil
+      end
+      @replaced_methods[[method, klass]] = instance_method
+      if unbound_method
+        klass.send(:define_method, method, unbound_method)
+        klass.send(visibility, method)
+      elsif block
+        klass.send(:define_method, method, &block)
+        klass.send(visibility, method)
+      end
+    end
+
+    def method_visibility(klass, method)
+      if klass.private_method_defined?(method)
+        :private
+      elsif klass.protected_method_defined?(method)
+        :protected
+      else
+        :public
+      end
+    end
+
+    def stub_rubygems(specs)
+      Gem::Specification.all = specs
+
+      Gem.post_reset do
+        Gem::Specification.all = specs
+      end
+
+      redefine_method((class << Gem; self; end), :finish_resolve) do |*|
+        []
+      end
+    end
+
+    def plain_specs
+      Gem::Specification._all
+    end
+
+    def plain_specs=(specs)
+      Gem::Specification.all = specs
+    end
+
+    def fetch_specs(remote, name)
+      require "rubygems/remote_fetcher"
+      path = remote.uri.to_s + "#{name}.#{Gem.marshal_version}.gz"
+      fetcher = gem_remote_fetcher
+      fetcher.headers = { "X-Gemfile-Source" => remote.original_uri.to_s } if remote.original_uri
+      string = fetcher.fetch_path(path)
+      Bundler.load_marshal(string)
+    rescue Gem::RemoteFetcher::FetchError
+      # it's okay for prerelease to fail
+      raise unless name == "prerelease_specs"
+    end
+
+    def fetch_all_remote_specs(remote)
+      specs = fetch_specs(remote, "specs")
+      pres = fetch_specs(remote, "prerelease_specs") || []
+
+      specs.concat(pres)
+    end
+
+    def download_gem(spec, uri, cache_dir)
+      require "rubygems/remote_fetcher"
+      uri = Bundler.settings.mirror_for(uri)
+      fetcher = gem_remote_fetcher
+      fetcher.headers = { "X-Gemfile-Source" => spec.remote.original_uri.to_s } if spec.remote.original_uri
+      Bundler::Retry.new("download gem from #{uri}").attempts do
+        gem_file_name = spec.file_name
+        local_gem_path = File.join cache_dir, gem_file_name
+        return if File.exist? local_gem_path
+
+        begin
+          remote_gem_path = uri + "gems/#{gem_file_name}"
+          remote_gem_path = remote_gem_path.to_s if provides?("< 3.2.0.rc.1")
+
+          SharedHelpers.filesystem_access(local_gem_path) do
+            fetcher.cache_update_path remote_gem_path, local_gem_path
+          end
+        rescue Gem::RemoteFetcher::FetchError
+          raise if spec.original_platform == spec.platform
+
+          original_gem_file_name = "#{spec.original_name}.gem"
+          raise if gem_file_name == original_gem_file_name
+
+          gem_file_name = original_gem_file_name
+          retry
+        end
+      end
+    rescue Gem::RemoteFetcher::FetchError => e
+      raise Bundler::HTTPError, "Could not download gem from #{uri} due to underlying error <#{e.message}>"
+    end
+
+    def gem_remote_fetcher
+      require "rubygems/remote_fetcher"
+      proxy = configuration[:http_proxy]
+      Gem::RemoteFetcher.new(proxy)
+    end
+
+    def gem_from_path(path, policy = nil)
+      require "rubygems/package"
+      p = Gem::Package.new(path)
+      p.security_policy = policy if policy
+      p
+    end
+
+    def build(spec, skip_validation = false)
+      require "rubygems/package"
+      Gem::Package.build(spec, skip_validation)
+    end
+
+    def repository_subdirectories
+      Gem::REPOSITORY_SUBDIRECTORIES
+    end
+
+    def install_with_build_args(args)
+      yield
+    end
+
+    def path_separator
+      Gem.path_separator
+    end
+
+    def all_specs
+      Gem::Specification.stubs.map do |stub|
+        StubSpecification.from_stub(stub)
+      end
+    end
+
+    def backport_ext_builder_monitor
+      # So we can avoid requiring "rubygems/ext" in its entirety
+      Gem.module_eval <<-RUBY, __FILE__, __LINE__ + 1
+        module Ext
+        end
+      RUBY
+
+      require "rubygems/ext/builder"
+
+      Gem::Ext::Builder.class_eval do
+        unless const_defined?(:CHDIR_MONITOR)
+          const_set(:CHDIR_MONITOR, EXT_LOCK)
+        end
+
+        remove_const(:CHDIR_MUTEX) if const_defined?(:CHDIR_MUTEX)
+        const_set(:CHDIR_MUTEX, const_get(:CHDIR_MONITOR))
+      end
+    end
+
+    def find_name(name)
+      Gem::Specification.stubs_for(name).map(&:to_spec)
+    end
+
+    if Gem::Specification.respond_to?(:default_stubs)
+      def default_stubs
+        Gem::Specification.default_stubs("*.gemspec")
+      end
+    else
+      def default_stubs
+        Gem::Specification.send(:default_stubs, "*.gemspec")
+      end
+    end
+
+    def use_gemdeps(gemfile)
+      ENV["BUNDLE_GEMFILE"] ||= File.expand_path(gemfile)
+      require_relative "gemdeps"
+      runtime = Bundler.setup
+      activated_spec_names = runtime.requested_specs.map(&:to_spec).sort_by(&:name)
+      [Gemdeps.new(runtime), activated_spec_names]
+    end
+  end
+
+  def self.rubygems
+    @rubygems ||= RubygemsIntegration.new
+  end
+end
diff --git a/lib/bundler/runtime.rb b/lib/bundler/runtime.rb
new file mode 100644
index 0000000000..c7276b0e25
--- /dev/null
+++ b/lib/bundler/runtime.rb
@@ -0,0 +1,312 @@
+# frozen_string_literal: true
+
+module Bundler
+  class Runtime
+    include SharedHelpers
+
+    def initialize(root, definition)
+      @root = root
+      @definition = definition
+    end
+
+    def setup(*groups)
+      @definition.ensure_equivalent_gemfile_and_lockfile if Bundler.frozen_bundle?
+
+      # Has to happen first
+      clean_load_path
+
+      specs = @definition.specs_for(groups)
+
+      SharedHelpers.set_bundle_environment
+      Bundler.rubygems.replace_entrypoints(specs)
+
+      # Activate the specs
+      load_paths = specs.map do |spec|
+        check_for_activated_spec!(spec)
+
+        Bundler.rubygems.mark_loaded(spec)
+        spec.load_paths.reject {|path| $LOAD_PATH.include?(path) }
+      end.reverse.flatten
+
+      Bundler.rubygems.add_to_load_path(load_paths)
+
+      setup_manpath
+
+      lock(:preserve_unknown_sections => true)
+
+      self
+    end
+
+    def require(*groups)
+      groups.map!(&:to_sym)
+      groups = [:default] if groups.empty?
+
+      @definition.dependencies.each do |dep|
+        # Skip the dependency if it is not in any of the requested groups, or
+        # not for the current platform, or doesn't match the gem constraints.
+        next unless (dep.groups & groups).any? && dep.should_include?
+
+        required_file = nil
+
+        begin
+          # Loop through all the specified autorequires for the
+          # dependency. If there are none, use the dependency's name
+          # as the autorequire.
+          Array(dep.autorequire || dep.name).each do |file|
+            # Allow `require: true` as an alias for `require: <name>`
+            file = dep.name if file == true
+            required_file = file
+            begin
+              Kernel.require file
+            rescue RuntimeError => e
+              raise e if e.is_a?(LoadError) # we handle this a little later
+              raise Bundler::GemRequireError.new e,
+                "There was an error while trying to load the gem '#{file}'."
+            end
+          end
+        rescue LoadError => e
+          raise if dep.autorequire || e.path != required_file
+
+          if dep.autorequire.nil? && dep.name.include?("-")
+            begin
+              namespaced_file = dep.name.tr("-", "/")
+              Kernel.require namespaced_file
+            rescue LoadError => e
+              raise if e.path != namespaced_file
+            end
+          end
+        end
+      end
+    end
+
+    def self.definition_method(meth)
+      define_method(meth) do
+        raise ArgumentError, "no definition when calling Runtime##{meth}" unless @definition
+        @definition.send(meth)
+      end
+    end
+    private_class_method :definition_method
+
+    definition_method :requested_specs
+    definition_method :specs
+    definition_method :dependencies
+    definition_method :current_dependencies
+    definition_method :requires
+
+    def lock(opts = {})
+      return if @definition.nothing_changed? && !@definition.unlocking?
+      @definition.lock(Bundler.default_lockfile, opts[:preserve_unknown_sections])
+    end
+
+    alias_method :gems, :specs
+
+    def cache(custom_path = nil, local = false)
+      cache_path = Bundler.app_cache(custom_path)
+      SharedHelpers.filesystem_access(cache_path) do |p|
+        FileUtils.mkdir_p(p)
+      end unless File.exist?(cache_path)
+
+      Bundler.ui.info "Updating files in #{Bundler.settings.app_cache_path}"
+
+      specs_to_cache = if Bundler.settings[:cache_all_platforms]
+        @definition.resolve.materialized_for_all_platforms
+      else
+        begin
+          specs
+        rescue GemNotFound
+          if local
+            Bundler.ui.warn "Some gems seem to be missing from your #{Bundler.settings.app_cache_path} directory."
+          end
+
+          raise
+        end
+      end
+
+      specs_to_cache.each do |spec|
+        next if spec.name == "bundler"
+        next if spec.source.is_a?(Source::Gemspec)
+        spec.source.send(:fetch_gem, spec) if Bundler.settings[:cache_all_platforms] && spec.source.respond_to?(:fetch_gem, true)
+        spec.source.cache(spec, custom_path) if spec.source.respond_to?(:cache)
+      end
+
+      Dir[cache_path.join("*/.git")].each do |git_dir|
+        FileUtils.rm_rf(git_dir)
+        FileUtils.touch(File.expand_path("../.bundlecache", git_dir))
+      end
+
+      prune_cache(cache_path) unless Bundler.settings[:no_prune]
+    end
+
+    def prune_cache(cache_path)
+      SharedHelpers.filesystem_access(cache_path) do |p|
+        FileUtils.mkdir_p(p)
+      end unless File.exist?(cache_path)
+      resolve = @definition.resolve
+      prune_gem_cache(resolve, cache_path)
+      prune_git_and_path_cache(resolve, cache_path)
+    end
+
+    def clean(dry_run = false)
+      gem_bins             = Dir["#{Gem.dir}/bin/*"]
+      git_dirs             = Dir["#{Gem.dir}/bundler/gems/*"]
+      git_cache_dirs       = Dir["#{Gem.dir}/cache/bundler/git/*"]
+      gem_dirs             = Dir["#{Gem.dir}/gems/*"]
+      gem_files            = Dir["#{Gem.dir}/cache/*.gem"]
+      gemspec_files        = Dir["#{Gem.dir}/specifications/*.gemspec"]
+      extension_dirs       = Dir["#{Gem.dir}/extensions/*/*/*"] + Dir["#{Gem.dir}/bundler/gems/extensions/*/*/*"]
+      spec_gem_paths       = []
+      # need to keep git sources around
+      spec_git_paths       = @definition.spec_git_paths
+      spec_git_cache_dirs  = []
+      spec_gem_executables = []
+      spec_cache_paths     = []
+      spec_gemspec_paths   = []
+      spec_extension_paths = []
+      Bundler.rubygems.add_default_gems_to(specs).values.each do |spec|
+        spec_gem_paths << spec.full_gem_path
+        # need to check here in case gems are nested like for the rails git repo
+        md = %r{(.+bundler/gems/.+-[a-f0-9]{7,12})}.match(spec.full_gem_path)
+        spec_git_paths << md[1] if md
+        spec_gem_executables << spec.executables.collect do |executable|
+          e = "#{Bundler.rubygems.gem_bindir}/#{executable}"
+          [e, "#{e}.bat"]
+        end
+        spec_cache_paths << spec.cache_file
+        spec_gemspec_paths << spec.spec_file
+        spec_extension_paths << spec.extension_dir if spec.respond_to?(:extension_dir)
+        spec_git_cache_dirs << spec.source.cache_path.to_s if spec.source.is_a?(Bundler::Source::Git)
+      end
+      spec_gem_paths.uniq!
+      spec_gem_executables.flatten!
+
+      stale_gem_bins       = gem_bins - spec_gem_executables
+      stale_git_dirs       = git_dirs - spec_git_paths - ["#{Gem.dir}/bundler/gems/extensions"]
+      stale_git_cache_dirs = git_cache_dirs - spec_git_cache_dirs
+      stale_gem_dirs       = gem_dirs - spec_gem_paths
+      stale_gem_files      = gem_files - spec_cache_paths
+      stale_gemspec_files  = gemspec_files - spec_gemspec_paths
+      stale_extension_dirs = extension_dirs - spec_extension_paths
+
+      removed_stale_gem_dirs = stale_gem_dirs.collect {|dir| remove_dir(dir, dry_run) }
+      removed_stale_git_dirs = stale_git_dirs.collect {|dir| remove_dir(dir, dry_run) }
+      output = removed_stale_gem_dirs + removed_stale_git_dirs
+
+      unless dry_run
+        stale_files = stale_gem_bins + stale_gem_files + stale_gemspec_files
+        stale_files.each do |file|
+          SharedHelpers.filesystem_access(File.dirname(file)) do |_p|
+            FileUtils.rm(file) if File.exist?(file)
+          end
+        end
+
+        stale_dirs = stale_git_cache_dirs + stale_extension_dirs
+        stale_dirs.each do |stale_dir|
+          SharedHelpers.filesystem_access(stale_dir) do |dir|
+            FileUtils.rm_rf(dir) if File.exist?(dir)
+          end
+        end
+      end
+
+      output
+    end
+
+    private
+
+    def prune_gem_cache(resolve, cache_path)
+      cached = Dir["#{cache_path}/*.gem"]
+
+      cached = cached.delete_if do |path|
+        spec = Bundler.rubygems.spec_from_gem path
+
+        resolve.any? do |s|
+          s.name == spec.name && s.version == spec.version && !s.source.is_a?(Bundler::Source::Git)
+        end
+      end
+
+      if cached.any?
+        Bundler.ui.info "Removing outdated .gem files from #{Bundler.settings.app_cache_path}"
+
+        cached.each do |path|
+          Bundler.ui.info "  * #{File.basename(path)}"
+          File.delete(path)
+        end
+      end
+    end
+
+    def prune_git_and_path_cache(resolve, cache_path)
+      cached = Dir["#{cache_path}/*/.bundlecache"]
+
+      cached = cached.delete_if do |path|
+        name = File.basename(File.dirname(path))
+
+        resolve.any? do |s|
+          source = s.source
+          source.respond_to?(:app_cache_dirname) && source.app_cache_dirname == name
+        end
+      end
+
+      if cached.any?
+        Bundler.ui.info "Removing outdated git and path gems from #{Bundler.settings.app_cache_path}"
+
+        cached.each do |path|
+          path = File.dirname(path)
+          Bundler.ui.info "  * #{File.basename(path)}"
+          FileUtils.rm_rf(path)
+        end
+      end
+    end
+
+    def setup_manpath
+      # Add man/ subdirectories from activated bundles to MANPATH for man(1)
+      manuals = $LOAD_PATH.map do |path|
+        man_subdir = path.sub(/lib$/, "man")
+        man_subdir unless Dir[man_subdir + "/man?/"].empty?
+      end.compact
+
+      return if manuals.empty?
+      Bundler::SharedHelpers.set_env "MANPATH", manuals.concat(
+        ENV["MANPATH"] ? ENV["MANPATH"].to_s.split(File::PATH_SEPARATOR) : [""]
+      ).uniq.join(File::PATH_SEPARATOR)
+    end
+
+    def remove_dir(dir, dry_run)
+      full_name = Pathname.new(dir).basename.to_s
+
+      parts    = full_name.split("-")
+      name     = parts[0..-2].join("-")
+      version  = parts.last
+      output   = "#{name} (#{version})"
+
+      if dry_run
+        Bundler.ui.info "Would have removed #{output}"
+      else
+        Bundler.ui.info "Removing #{output}"
+        FileUtils.rm_rf(dir)
+      end
+
+      output
+    end
+
+    def check_for_activated_spec!(spec)
+      return unless activated_spec = Bundler.rubygems.loaded_specs(spec.name)
+      return if activated_spec.version == spec.version
+
+      suggestion = if activated_spec.default_gem?
+        "Since #{spec.name} is a default gem, you can either remove your dependency on it" \
+        " or try updating to a newer version of bundler that supports #{spec.name} as a default gem."
+      else
+        "Prepending `bundle exec` to your command may solve this."
+      end
+
+      e = Gem::LoadError.new "You have already activated #{activated_spec.name} #{activated_spec.version}, " \
+                             "but your Gemfile requires #{spec.name} #{spec.version}. #{suggestion}"
+      e.name = spec.name
+      if e.respond_to?(:requirement=)
+        e.requirement = Gem::Requirement.new(spec.version.to_s)
+      else
+        e.version_requirement = Gem::Requirement.new(spec.version.to_s)
+      end
+      raise e
+    end
+  end
+end
diff --git a/lib/bundler/settings.rb b/lib/bundler/settings.rb
new file mode 100644
index 0000000000..1ced590b6f
--- /dev/null
+++ b/lib/bundler/settings.rb
@@ -0,0 +1,512 @@
+# frozen_string_literal: true
+
+module Bundler
+  class Settings
+    autoload :Mirror,  File.expand_path("mirror", __dir__)
+    autoload :Mirrors, File.expand_path("mirror", __dir__)
+    autoload :Validator, File.expand_path("settings/validator", __dir__)
+
+    BOOL_KEYS = %w[
+      allow_deployment_source_credential_changes
+      allow_offline_install
+      auto_clean_without_path
+      auto_install
+      cache_all
+      cache_all_platforms
+      clean
+      default_install_uses_path
+      deployment
+      disable_checksum_validation
+      disable_exec_load
+      disable_local_branch_check
+      disable_local_revision_check
+      disable_shared_gems
+      disable_version_check
+      force_ruby_platform
+      forget_cli_options
+      frozen
+      gem.changelog
+      gem.coc
+      gem.mit
+      git.allow_insecure
+      global_gem_cache
+      ignore_messages
+      init_gems_rb
+      inline
+      no_install
+      no_prune
+      path_relative_to_cwd
+      path.system
+      plugins
+      prefer_patch
+      print_only_version_number
+      setup_makes_kernel_gem_public
+      silence_deprecations
+      silence_root_warning
+      suppress_install_using_messages
+      update_requires_all_flag
+      use_gem_version_promoter_for_major_updates
+    ].freeze
+
+    NUMBER_KEYS = %w[
+      jobs
+      redirect
+      retry
+      ssl_verify_mode
+      timeout
+    ].freeze
+
+    ARRAY_KEYS = %w[
+      with
+      without
+    ].freeze
+
+    STRING_KEYS = %w[
+      bin
+      cache_path
+      console
+      gem.ci
+      gem.github_username
+      gem.linter
+      gem.rubocop
+      gem.test
+      gemfile
+      path
+      shebang
+      system_bindir
+      trust-policy
+    ].freeze
+
+    DEFAULT_CONFIG = {
+      "BUNDLE_SILENCE_DEPRECATIONS" => false,
+      "BUNDLE_DISABLE_VERSION_CHECK" => true,
+      "BUNDLE_PREFER_PATCH" => false,
+      "BUNDLE_REDIRECT" => 5,
+      "BUNDLE_RETRY" => 3,
+      "BUNDLE_TIMEOUT" => 10,
+    }.freeze
+
+    def initialize(root = nil)
+      @root            = root
+      @local_config    = load_config(local_config_file)
+      @env_config      = ENV.to_h.select {|key, _value| key =~ /\ABUNDLE_.+/ }
+      @global_config   = load_config(global_config_file)
+      @temporary       = {}
+    end
+
+    def [](name)
+      key = key_for(name)
+      value = configs.values.map {|config| config[key] }.compact.first
+
+      converted_value(value, name)
+    end
+
+    def set_command_option(key, value)
+      if Bundler.feature_flag.forget_cli_options?
+        temporary(key => value)
+        value
+      else
+        set_local(key, value)
+      end
+    end
+
+    def set_command_option_if_given(key, value)
+      return if value.nil?
+      set_command_option(key, value)
+    end
+
+    def set_local(key, value)
+      local_config_file || raise(GemfileNotFound, "Could not locate Gemfile")
+
+      set_key(key, value, @local_config, local_config_file)
+    end
+
+    def temporary(update)
+      existing = Hash[update.map {|k, _| [k, @temporary[key_for(k)]] }]
+      update.each do |k, v|
+        set_key(k, v, @temporary, nil)
+      end
+      return unless block_given?
+      begin
+        yield
+      ensure
+        existing.each {|k, v| set_key(k, v, @temporary, nil) }
+      end
+    end
+
+    def set_global(key, value)
+      set_key(key, value, @global_config, global_config_file)
+    end
+
+    def all
+      keys = @temporary.keys | @global_config.keys | @local_config.keys | @env_config.keys
+
+      keys.map do |key|
+        key.sub(/^BUNDLE_/, "").gsub(/___/, "-").gsub(/__/, ".").downcase
+      end.sort
+    end
+
+    def local_overrides
+      repos = {}
+      all.each do |k|
+        repos[$'] = self[k] if k =~ /^local\./
+      end
+      repos
+    end
+
+    def mirror_for(uri)
+      if uri.is_a?(String)
+        require_relative "vendored_uri"
+        uri = Bundler::URI(uri)
+      end
+
+      gem_mirrors.for(uri.to_s).uri
+    end
+
+    def credentials_for(uri)
+      self[uri.to_s] || self[uri.host]
+    end
+
+    def gem_mirrors
+      all.inject(Mirrors.new) do |mirrors, k|
+        mirrors.parse(k, self[k]) if k.start_with?("mirror.")
+        mirrors
+      end
+    end
+
+    def locations(key)
+      key = key_for(key)
+      configs.keys.inject({}) do |partial_locations, level|
+        value_on_level = configs[level][key]
+        partial_locations[level] = value_on_level unless value_on_level.nil?
+        partial_locations
+      end
+    end
+
+    def pretty_values_for(exposed_key)
+      key = key_for(exposed_key)
+
+      locations = []
+
+      if value = @temporary[key]
+        locations << "Set for the current command: #{printable_value(value, exposed_key).inspect}"
+      end
+
+      if value = @local_config[key]
+        locations << "Set for your local app (#{local_config_file}): #{printable_value(value, exposed_key).inspect}"
+      end
+
+      if value = @env_config[key]
+        locations << "Set via #{key}: #{printable_value(value, exposed_key).inspect}"
+      end
+
+      if value = @global_config[key]
+        locations << "Set for the current user (#{global_config_file}): #{printable_value(value, exposed_key).inspect}"
+      end
+
+      return ["You have not configured a value for `#{exposed_key}`"] if locations.empty?
+      locations
+    end
+
+    def processor_count
+      require "etc"
+      Etc.nprocessors
+    rescue StandardError
+      1
+    end
+
+    # for legacy reasons, in Bundler 2, we do not respect :disable_shared_gems
+    def path
+      configs.each do |_level, settings|
+        path = value_for("path", settings)
+        path_system = value_for("path.system", settings)
+        disabled_shared_gems = value_for("disable_shared_gems", settings)
+        next if path.nil? && path_system.nil? && disabled_shared_gems.nil?
+        system_path = path_system || (disabled_shared_gems == false)
+        return Path.new(path, system_path)
+      end
+
+      Path.new(nil, false)
+    end
+
+    Path = Struct.new(:explicit_path, :system_path) do
+      def path
+        path = base_path
+        path = File.join(path, Bundler.ruby_scope) unless use_system_gems?
+        path
+      end
+
+      def use_system_gems?
+        return true if system_path
+        return false if explicit_path
+        !Bundler.feature_flag.default_install_uses_path?
+      end
+
+      def base_path
+        path = explicit_path
+        path ||= ".bundle" unless use_system_gems?
+        path ||= Bundler.rubygems.gem_dir
+        path
+      end
+
+      def base_path_relative_to_pwd
+        base_path = Pathname.new(self.base_path)
+        expanded_base_path = base_path.expand_path(Bundler.root)
+        relative_path = expanded_base_path.relative_path_from(Pathname.pwd)
+        if relative_path.to_s.start_with?("..")
+          relative_path = base_path if base_path.absolute?
+        else
+          relative_path = Pathname.new(File.join(".", relative_path))
+        end
+        relative_path
+      rescue ArgumentError
+        expanded_base_path
+      end
+
+      def validate!
+        return unless explicit_path && system_path
+        path = Bundler.settings.pretty_values_for(:path)
+        path.unshift(nil, "path:") unless path.empty?
+        system_path = Bundler.settings.pretty_values_for("path.system")
+        system_path.unshift(nil, "path.system:") unless system_path.empty?
+        disable_shared_gems = Bundler.settings.pretty_values_for(:disable_shared_gems)
+        disable_shared_gems.unshift(nil, "disable_shared_gems:") unless disable_shared_gems.empty?
+        raise InvalidOption,
+          "Using a custom path while using system gems is unsupported.\n#{path.join("\n")}\n#{system_path.join("\n")}\n#{disable_shared_gems.join("\n")}"
+      end
+    end
+
+    def allow_sudo?
+      key = key_for(:path)
+      path_configured = @temporary.key?(key) || @local_config.key?(key)
+      !path_configured
+    end
+
+    def ignore_config?
+      ENV["BUNDLE_IGNORE_CONFIG"]
+    end
+
+    def app_cache_path
+      @app_cache_path ||= self[:cache_path] || "vendor/cache"
+    end
+
+    def validate!
+      all.each do |raw_key|
+        [@local_config, @env_config, @global_config].each do |settings|
+          value = value_for(raw_key, settings)
+          Validator.validate!(raw_key, value, settings.dup)
+        end
+      end
+    end
+
+    def key_for(key)
+      self.class.key_for(key)
+    end
+
+    private
+
+    def configs
+      {
+        :temporary => @temporary,
+        :local => @local_config,
+        :env => @env_config,
+        :global => @global_config,
+        :default => DEFAULT_CONFIG,
+      }
+    end
+
+    def value_for(name, config)
+      converted_value(config[key_for(name)], name)
+    end
+
+    def parent_setting_for(name)
+      split_specific_setting_for(name)[0]
+    end
+
+    def specific_gem_for(name)
+      split_specific_setting_for(name)[1]
+    end
+
+    def split_specific_setting_for(name)
+      name.split(".")
+    end
+
+    def is_bool(name)
+      BOOL_KEYS.include?(name.to_s) || BOOL_KEYS.include?(parent_setting_for(name.to_s))
+    end
+
+    def is_string(name)
+      STRING_KEYS.include?(name.to_s) || name.to_s.start_with?("local.") || name.to_s.start_with?("mirror.") || name.to_s.start_with?("build.")
+    end
+
+    def to_bool(value)
+      case value
+      when nil, /\A(false|f|no|n|0|)\z/i, false
+        false
+      else
+        true
+      end
+    end
+
+    def is_num(key)
+      NUMBER_KEYS.include?(key.to_s)
+    end
+
+    def is_array(key)
+      ARRAY_KEYS.include?(key.to_s)
+    end
+
+    def is_credential(key)
+      key == "gem.push_key"
+    end
+
+    def is_userinfo(value)
+      value.include?(":")
+    end
+
+    def to_array(value)
+      return [] unless value
+      value.split(":").map(&:to_sym)
+    end
+
+    def array_to_s(array)
+      array = Array(array)
+      return nil if array.empty?
+      array.join(":").tr(" ", ":")
+    end
+
+    def set_key(raw_key, value, hash, file)
+      raw_key = raw_key.to_s
+      value = array_to_s(value) if is_array(raw_key)
+
+      key = key_for(raw_key)
+
+      return if hash[key] == value
+
+      hash[key] = value
+      hash.delete(key) if value.nil?
+
+      Validator.validate!(raw_key, converted_value(value, raw_key), hash)
+
+      return unless file
+      SharedHelpers.filesystem_access(file) do |p|
+        FileUtils.mkdir_p(p.dirname)
+        require_relative "yaml_serializer"
+        p.open("w") {|f| f.write(YAMLSerializer.dump(hash)) }
+      end
+    end
+
+    def converted_value(value, key)
+      if is_array(key)
+        to_array(value)
+      elsif value.nil?
+        nil
+      elsif is_bool(key) || value == "false"
+        to_bool(value)
+      elsif is_num(key)
+        value.to_i
+      else
+        value.to_s
+      end
+    end
+
+    def printable_value(value, key)
+      converted = converted_value(value, key)
+      return converted unless converted.is_a?(String)
+
+      if is_string(key)
+        converted
+      elsif is_credential(key)
+        "[REDACTED]"
+      elsif is_userinfo(converted)
+        username, pass = converted.split(":", 2)
+
+        if pass == "x-oauth-basic"
+          username = "[REDACTED]"
+        else
+          pass = "[REDACTED]"
+        end
+
+        [username, pass].join(":")
+      else
+        converted
+      end
+    end
+
+    def global_config_file
+      if ENV["BUNDLE_CONFIG"] && !ENV["BUNDLE_CONFIG"].empty?
+        Pathname.new(ENV["BUNDLE_CONFIG"])
+      elsif ENV["BUNDLE_USER_CONFIG"] && !ENV["BUNDLE_USER_CONFIG"].empty?
+        Pathname.new(ENV["BUNDLE_USER_CONFIG"])
+      elsif ENV["BUNDLE_USER_HOME"] && !ENV["BUNDLE_USER_HOME"].empty?
+        Pathname.new(ENV["BUNDLE_USER_HOME"]).join("config")
+      elsif Bundler.rubygems.user_home && !Bundler.rubygems.user_home.empty?
+        Pathname.new(Bundler.rubygems.user_home).join(".bundle/config")
+      end
+    end
+
+    def local_config_file
+      Pathname.new(@root).join("config") if @root
+    end
+
+    def load_config(config_file)
+      return {} if !config_file || ignore_config?
+      SharedHelpers.filesystem_access(config_file, :read) do |file|
+        valid_file = file.exist? && !file.size.zero?
+        return {} unless valid_file
+        require_relative "yaml_serializer"
+        YAMLSerializer.load(file.read).inject({}) do |config, (k, v)|
+          new_k = k
+
+          if k.include?("-")
+            Bundler.ui.warn "Your #{file} config includes `#{k}`, which contains the dash character (`-`).\n" \
+              "This is deprecated, because configuration through `ENV` should be possible, but `ENV` keys cannot include dashes.\n" \
+              "Please edit #{file} and replace any dashes in configuration keys with a triple underscore (`___`)."
+
+            new_k = k.gsub("-", "___")
+          end
+
+          config[new_k] = v
+          config
+        end
+      end
+    end
+
+    PER_URI_OPTIONS = %w[
+      fallback_timeout
+    ].freeze
+
+    NORMALIZE_URI_OPTIONS_PATTERN =
+      /
+        \A
+        (\w+\.)? # optional prefix key
+        (https?.*?) # URI
+        (\.#{Regexp.union(PER_URI_OPTIONS)})? # optional suffix key
+        \z
+      /ix.freeze
+
+    def self.key_for(key)
+      key = normalize_uri(key).to_s if key.is_a?(String) && /https?:/ =~ key
+      key = key.to_s.gsub(".", "__").gsub("-", "___").upcase
+      "BUNDLE_#{key}"
+    end
+
+    # TODO: duplicates Rubygems#normalize_uri
+    # TODO: is this the correct place to validate mirror URIs?
+    def self.normalize_uri(uri)
+      uri = uri.to_s
+      if uri =~ NORMALIZE_URI_OPTIONS_PATTERN
+        prefix = $1
+        uri = $2
+        suffix = $3
+      end
+      uri = "#{uri}/" unless uri.end_with?("/")
+      require_relative "vendored_uri"
+      uri = Bundler::URI(uri)
+      unless uri.absolute?
+        raise ArgumentError, format("Gem sources must be absolute. You provided '%s'.", uri)
+      end
+      "#{prefix}#{uri}#{suffix}"
+    end
+  end
+end
diff --git a/lib/bundler/settings/validator.rb b/lib/bundler/settings/validator.rb
new file mode 100644
index 0000000000..0a57ea7f03
--- /dev/null
+++ b/lib/bundler/settings/validator.rb
@@ -0,0 +1,102 @@
+# frozen_string_literal: true
+
+module Bundler
+  class Settings
+    class Validator
+      class Rule
+        attr_reader :description
+
+        def initialize(keys, description, &validate)
+          @keys = keys
+          @description = description
+          @validate = validate
+        end
+
+        def validate!(key, value, settings)
+          instance_exec(key, value, settings, &@validate)
+        end
+
+        def fail!(key, value, *reasons)
+          reasons.unshift @description
+          raise InvalidOption, "Setting `#{key}` to #{value.inspect} failed:\n#{reasons.map {|r| " - #{r}" }.join("\n")}"
+        end
+
+        def set(settings, key, value, *reasons)
+          hash_key = k(key)
+          return if settings[hash_key] == value
+          reasons.unshift @description
+          Bundler.ui.info "Setting `#{key}` to #{value.inspect}, since #{reasons.join(", ")}"
+          if value.nil?
+            settings.delete(hash_key)
+          else
+            settings[hash_key] = value
+          end
+        end
+
+        def k(key)
+          Bundler.settings.key_for(key)
+        end
+      end
+
+      def self.rules
+        @rules ||= Hash.new {|h, k| h[k] = [] }
+      end
+      private_class_method :rules
+
+      def self.rule(keys, description, &blk)
+        rule = Rule.new(keys, description, &blk)
+        keys.each {|k| rules[k] << rule }
+      end
+      private_class_method :rule
+
+      def self.validate!(key, value, settings)
+        rules_to_validate = rules[key]
+        rules_to_validate.each {|rule| rule.validate!(key, value, settings) }
+      end
+
+      rule %w[path path.system], "path and path.system are mutually exclusive" do |key, value, settings|
+        if key == "path" && value
+          set(settings, "path.system", nil)
+        elsif key == "path.system" && value
+          set(settings, :path, nil)
+        end
+      end
+
+      rule %w[with without], "a group cannot be in both `with` & `without` simultaneously" do |key, value, settings|
+        with = settings.fetch(k(:with), "").split(":").map(&:to_sym)
+        without = settings.fetch(k(:without), "").split(":").map(&:to_sym)
+
+        other_key = key == "with" ? :without : :with
+        other_setting = key == "with" ? without : with
+
+        conflicting = with & without
+        if conflicting.any?
+          fail!(key, value, "`#{other_key}` is current set to #{other_setting.inspect}", "the `#{conflicting.join("`, `")}` groups conflict")
+        end
+      end
+
+      rule %w[path], "relative paths are expanded relative to the current working directory" do |key, value, settings|
+        next if value.nil?
+
+        path = Pathname.new(value)
+        next if !path.relative? || !Bundler.feature_flag.path_relative_to_cwd?
+
+        path = path.expand_path
+
+        root = begin
+                 Bundler.root
+               rescue GemfileNotFound
+                 Pathname.pwd.expand_path
+               end
+
+        path = begin
+                 path.relative_path_from(root)
+               rescue ArgumentError
+                 path
+               end
+
+        set(settings, key, path.to_s)
+      end
+    end
+  end
+end
diff --git a/lib/bundler/setup.rb b/lib/bundler/setup.rb
new file mode 100644
index 0000000000..32e9b2d7c0
--- /dev/null
+++ b/lib/bundler/setup.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require_relative "shared_helpers"
+
+if Bundler::SharedHelpers.in_bundle?
+  require_relative "../bundler"
+
+  if STDOUT.tty? || ENV["BUNDLER_FORCE_TTY"]
+    begin
+      Bundler.ui.silence { Bundler.setup }
+    rescue Bundler::BundlerError => e
+      Bundler.ui.error e.message
+      Bundler.ui.warn e.backtrace.join("\n") if ENV["DEBUG"]
+      if e.is_a?(Bundler::GemNotFound)
+        Bundler.ui.warn "Run `bundle install` to install missing gems."
+      end
+      exit e.status_code
+    end
+  else
+    Bundler.ui.silence { Bundler.setup }
+  end
+
+  # We might be in the middle of shelling out to rubygems
+  # (RUBYOPT=-rbundler/setup), so we need to give rubygems the opportunity of
+  # not being silent.
+  Gem::DefaultUserInteraction.ui = nil
+end
diff --git a/lib/bundler/shared_helpers.rb b/lib/bundler/shared_helpers.rb
new file mode 100644
index 0000000000..df1c136c56
--- /dev/null
+++ b/lib/bundler/shared_helpers.rb
@@ -0,0 +1,350 @@
+# frozen_string_literal: true
+
+require "pathname"
+require "rbconfig"
+
+require_relative "version"
+require_relative "constants"
+require_relative "rubygems_integration"
+require_relative "current_ruby"
+
+module Bundler
+  module SharedHelpers
+    def root
+      gemfile = find_gemfile
+      raise GemfileNotFound, "Could not locate Gemfile" unless gemfile
+      Pathname.new(gemfile).tap{|x| x.untaint if RUBY_VERSION < "2.7" }.expand_path.parent
+    end
+
+    def default_gemfile
+      gemfile = find_gemfile
+      raise GemfileNotFound, "Could not locate Gemfile" unless gemfile
+      Pathname.new(gemfile).tap{|x| x.untaint if RUBY_VERSION < "2.7" }.expand_path
+    end
+
+    def default_lockfile
+      gemfile = default_gemfile
+
+      case gemfile.basename.to_s
+      when "gems.rb" then Pathname.new(gemfile.sub(/.rb$/, ".locked"))
+      else Pathname.new("#{gemfile}.lock")
+      end.tap{|x| x.untaint if RUBY_VERSION < "2.7" }
+    end
+
+    def default_bundle_dir
+      bundle_dir = find_directory(".bundle")
+      return nil unless bundle_dir
+
+      bundle_dir = Pathname.new(bundle_dir)
+
+      global_bundle_dir = Bundler.user_home.join(".bundle")
+      return nil if bundle_dir == global_bundle_dir
+
+      bundle_dir
+    end
+
+    def in_bundle?
+      find_gemfile
+    end
+
+    def chdir(dir, &blk)
+      Bundler.rubygems.ext_lock.synchronize do
+        Dir.chdir dir, &blk
+      end
+    end
+
+    def pwd
+      Bundler.rubygems.ext_lock.synchronize do
+        Pathname.pwd
+      end
+    end
+
+    def with_clean_git_env(&block)
+      keys    = %w[GIT_DIR GIT_WORK_TREE]
+      old_env = keys.inject({}) do |h, k|
+        h.update(k => ENV[k])
+      end
+
+      keys.each {|key| ENV.delete(key) }
+
+      block.call
+    ensure
+      keys.each {|key| ENV[key] = old_env[key] }
+    end
+
+    def set_bundle_environment
+      set_bundle_variables
+      set_path
+      set_rubyopt
+      set_rubylib
+    end
+
+    # Rescues permissions errors raised by file system operations
+    # (ie. Errno:EACCESS, Errno::EAGAIN) and raises more friendly errors instead.
+    #
+    # @param path [String] the path that the action will be attempted to
+    # @param action [Symbol, #to_s] the type of operation that will be
+    #   performed. For example: :write, :read, :exec
+    #
+    # @yield path
+    #
+    # @raise [Bundler::PermissionError] if Errno:EACCES is raised in the
+    #   given block
+    # @raise [Bundler::TemporaryResourceError] if Errno:EAGAIN is raised in the
+    #   given block
+    #
+    # @example
+    #   filesystem_access("vendor/cache", :write) do
+    #     FileUtils.mkdir_p("vendor/cache")
+    #   end
+    #
+    # @see {Bundler::PermissionError}
+    def filesystem_access(path, action = :write, &block)
+      yield(path.dup.tap{|x| x.untaint if RUBY_VERSION < "2.7" })
+    rescue Errno::EACCES
+      raise PermissionError.new(path, action)
+    rescue Errno::EAGAIN
+      raise TemporaryResourceError.new(path, action)
+    rescue Errno::EPROTO
+      raise VirtualProtocolError.new
+    rescue Errno::ENOSPC
+      raise NoSpaceOnDeviceError.new(path, action)
+    rescue *[const_get_safely(:ENOTSUP, Errno)].compact
+      raise OperationNotSupportedError.new(path, action)
+    rescue Errno::EEXIST, Errno::ENOENT
+      raise
+    rescue SystemCallError => e
+      raise GenericSystemCallError.new(e, "There was an error accessing `#{path}`.")
+    end
+
+    def const_get_safely(constant_name, namespace)
+      const_in_namespace = namespace.constants.include?(constant_name.to_s) ||
+        namespace.constants.include?(constant_name.to_sym)
+      return nil unless const_in_namespace
+      namespace.const_get(constant_name)
+    end
+
+    def major_deprecation(major_version, message, print_caller_location: false)
+      if print_caller_location
+        caller_location = caller_locations(2, 2).first
+        message = "#{message} (called at #{caller_location.path}:#{caller_location.lineno})"
+      end
+
+      bundler_major_version = Bundler.bundler_major_version
+      if bundler_major_version > major_version
+        require_relative "errors"
+        raise DeprecatedError, "[REMOVED] #{message}"
+      end
+
+      return unless bundler_major_version >= major_version && prints_major_deprecations?
+      Bundler.ui.warn("[DEPRECATED] #{message}")
+    end
+
+    def print_major_deprecations!
+      multiple_gemfiles = search_up(".") do |dir|
+        gemfiles = gemfile_names.select {|gf| File.file? File.expand_path(gf, dir) }
+        next if gemfiles.empty?
+        break gemfiles.size != 1
+      end
+      return unless multiple_gemfiles
+      message = "Multiple gemfiles (gems.rb and Gemfile) detected. " \
+                "Make sure you remove Gemfile and Gemfile.lock since bundler is ignoring them in favor of gems.rb and gems.rb.locked."
+      Bundler.ui.warn message
+    end
+
+    def ensure_same_dependencies(spec, old_deps, new_deps)
+      new_deps = new_deps.reject {|d| d.type == :development }
+      old_deps = old_deps.reject {|d| d.type == :development }
+
+      without_type = proc {|d| Gem::Dependency.new(d.name, d.requirements_list.sort) }
+      new_deps.map!(&without_type)
+      old_deps.map!(&without_type)
+
+      extra_deps = new_deps - old_deps
+      return if extra_deps.empty?
+
+      Bundler.ui.debug "#{spec.full_name} from #{spec.remote} has either corrupted API or lockfile dependencies" \
+        " (was expecting #{old_deps.map(&:to_s)}, but the real spec has #{new_deps.map(&:to_s)})"
+      raise APIResponseMismatchError,
+        "Downloading #{spec.full_name} revealed dependencies not in the API or the lockfile (#{extra_deps.join(", ")})." \
+        "\nEither installing with `--full-index` or running `bundle update #{spec.name}` should fix the problem."
+    end
+
+    def pretty_dependency(dep, print_source = false)
+      msg = String.new(dep.name)
+      msg << " (#{dep.requirement})" unless dep.requirement == Gem::Requirement.default
+
+      if dep.is_a?(Bundler::Dependency)
+        platform_string = dep.platforms.join(", ")
+        msg << " " << platform_string if !platform_string.empty? && platform_string != Gem::Platform::RUBY
+      end
+
+      msg << " from the `#{dep.source}` source" if print_source && dep.source
+      msg
+    end
+
+    def md5_available?
+      return @md5_available if defined?(@md5_available)
+      @md5_available = begin
+        require "openssl"
+        ::OpenSSL::Digest.digest("MD5", "")
+        true
+      rescue LoadError
+        true
+      rescue ::OpenSSL::Digest::DigestError
+        false
+      end
+    end
+
+    def digest(name)
+      require "digest"
+      Digest(name)
+    end
+
+    def write_to_gemfile(gemfile_path, contents)
+      filesystem_access(gemfile_path) {|g| File.open(g, "w") {|file| file.puts contents } }
+    end
+
+    private
+
+    def validate_bundle_path
+      path_separator = Bundler.rubygems.path_separator
+      return unless Bundler.bundle_path.to_s.split(path_separator).size > 1
+      message = "Your bundle path contains text matching #{path_separator.inspect}, " \
+                "which is the path separator for your system. Bundler cannot " \
+                "function correctly when the Bundle path contains the " \
+                "system's PATH separator. Please change your " \
+                "bundle path to not match #{path_separator.inspect}." \
+                "\nYour current bundle path is '#{Bundler.bundle_path}'."
+      raise Bundler::PathError, message
+    end
+
+    def find_gemfile
+      given = ENV["BUNDLE_GEMFILE"]
+      return given if given && !given.empty?
+      find_file(*gemfile_names)
+    end
+
+    def gemfile_names
+      ["gems.rb", "Gemfile"]
+    end
+
+    def find_file(*names)
+      search_up(*names) do |filename|
+        return filename if File.file?(filename)
+      end
+    end
+
+    def find_directory(*names)
+      search_up(*names) do |dirname|
+        return dirname if File.directory?(dirname)
+      end
+    end
+
+    def search_up(*names)
+      previous = nil
+      current  = File.expand_path(SharedHelpers.pwd).tap{|x| x.untaint if RUBY_VERSION < "2.7" }
+
+      until !File.directory?(current) || current == previous
+        if ENV["BUNDLE_SPEC_RUN"]
+          # avoid stepping above the tmp directory when testing
+          gemspec = if ENV["GEM_COMMAND"]
+            # for Ruby Core
+            "lib/bundler/bundler.gemspec"
+          else
+            "bundler.gemspec"
+          end
+
+          # avoid stepping above the tmp directory when testing
+          return nil if File.file?(File.join(current, gemspec))
+        end
+
+        names.each do |name|
+          filename = File.join(current, name)
+          yield filename
+        end
+        previous = current
+        current = File.expand_path("..", current)
+      end
+    end
+
+    def set_env(key, value)
+      raise ArgumentError, "new key #{key}" unless EnvironmentPreserver::BUNDLER_KEYS.include?(key)
+      orig_key = "#{EnvironmentPreserver::BUNDLER_PREFIX}#{key}"
+      orig = ENV[key]
+      orig ||= EnvironmentPreserver::INTENTIONALLY_NIL
+      ENV[orig_key] ||= orig
+
+      ENV[key] = value
+    end
+    public :set_env
+
+    def set_bundle_variables
+      # bundler exe & lib folders have same root folder, typical gem installation
+      exe_file = File.expand_path("../../../exe/bundle", __FILE__)
+
+      # for Ruby core repository testing
+      exe_file = File.expand_path("../../../libexec/bundle", __FILE__) unless File.exist?(exe_file)
+
+      # bundler is a default gem, exe path is separate
+      exe_file = Bundler.rubygems.bin_path("bundler", "bundle", VERSION) unless File.exist?(exe_file)
+
+      Bundler::SharedHelpers.set_env "BUNDLE_BIN_PATH", exe_file
+      Bundler::SharedHelpers.set_env "BUNDLE_GEMFILE", find_gemfile.to_s
+      Bundler::SharedHelpers.set_env "BUNDLER_VERSION", Bundler::VERSION
+    end
+
+    def set_path
+      validate_bundle_path
+      paths = (ENV["PATH"] || "").split(File::PATH_SEPARATOR)
+      paths.unshift "#{Bundler.bundle_path}/bin"
+      Bundler::SharedHelpers.set_env "PATH", paths.uniq.join(File::PATH_SEPARATOR)
+    end
+
+    def set_rubyopt
+      rubyopt = [ENV["RUBYOPT"]].compact
+      setup_require = "-r#{File.expand_path("setup", __dir__)}"
+      return if !rubyopt.empty? && rubyopt.first =~ /#{setup_require}/
+      rubyopt.unshift setup_require
+      Bundler::SharedHelpers.set_env "RUBYOPT", rubyopt.join(" ")
+    end
+
+    def set_rubylib
+      rubylib = (ENV["RUBYLIB"] || "").split(File::PATH_SEPARATOR)
+      rubylib.unshift bundler_ruby_lib unless RbConfig::CONFIG["rubylibdir"] == bundler_ruby_lib
+      Bundler::SharedHelpers.set_env "RUBYLIB", rubylib.uniq.join(File::PATH_SEPARATOR)
+    end
+
+    def bundler_ruby_lib
+      resolve_path File.expand_path("../..", __FILE__)
+    end
+
+    def clean_load_path
+      loaded_gem_paths = Bundler.rubygems.loaded_gem_paths
+
+      $LOAD_PATH.reject! do |p|
+        resolved_path = resolve_path(p)
+        next if $LOADED_FEATURES.any? {|lf| lf.start_with?(resolved_path) }
+        loaded_gem_paths.delete(p)
+      end
+      $LOAD_PATH.uniq!
+    end
+
+    def resolve_path(path)
+      expanded = File.expand_path(path)
+      return expanded unless File.respond_to?(:realpath) && File.exist?(expanded)
+
+      File.realpath(expanded)
+    end
+
+    def prints_major_deprecations?
+      require_relative "../bundler"
+      return false if Bundler.settings[:silence_deprecations]
+      require_relative "deprecate"
+      return false if Bundler::Deprecate.skip
+      true
+    end
+
+    extend self
+  end
+end
diff --git a/lib/bundler/similarity_detector.rb b/lib/bundler/similarity_detector.rb
new file mode 100644
index 0000000000..50e66b9cab
--- /dev/null
+++ b/lib/bundler/similarity_detector.rb
@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+module Bundler
+  class SimilarityDetector
+    SimilarityScore = Struct.new(:string, :distance)
+
+    # initialize with an array of words to be matched against
+    def initialize(corpus)
+      @corpus = corpus
+    end
+
+    # return an array of words similar to 'word' from the corpus
+    def similar_words(word, limit = 3)
+      words_by_similarity = @corpus.map {|w| SimilarityScore.new(w, levenshtein_distance(word, w)) }
+      words_by_similarity.select {|s| s.distance <= limit }.sort_by(&:distance).map(&:string)
+    end
+
+    # return the result of 'similar_words', concatenated into a list
+    # (eg "a, b, or c")
+    def similar_word_list(word, limit = 3)
+      words = similar_words(word, limit)
+      if words.length == 1
+        words[0]
+      elsif words.length > 1
+        [words[0..-2].join(", "), words[-1]].join(" or ")
+      end
+    end
+
+    protected
+
+    # https://www.informit.com/articles/article.aspx?p=683059&seqNum=36
+    def levenshtein_distance(this, that, ins = 2, del = 2, sub = 1)
+      # ins, del, sub are weighted costs
+      return nil if this.nil?
+      return nil if that.nil?
+      dm = [] # distance matrix
+
+      # Initialize first row values
+      dm[0] = (0..this.length).collect {|i| i * ins }
+      fill = [0] * (this.length - 1)
+
+      # Initialize first column values
+      (1..that.length).each do |i|
+        dm[i] = [i * del, fill.flatten]
+      end
+
+      # populate matrix
+      (1..that.length).each do |i|
+        (1..this.length).each do |j|
+          # critical comparison
+          dm[i][j] = [
+            dm[i - 1][j - 1] + (this[j - 1] == that[i - 1] ? 0 : sub),
+            dm[i][j - 1] + ins,
+            dm[i - 1][j] + del,
+          ].min
+        end
+      end
+
+      # The last value in matrix is the Levenshtein distance between the strings
+      dm[that.length][this.length]
+    end
+  end
+end
diff --git a/lib/bundler/source.rb b/lib/bundler/source.rb
new file mode 100644
index 0000000000..2a2b332cff
--- /dev/null
+++ b/lib/bundler/source.rb
@@ -0,0 +1,115 @@
+# frozen_string_literal: true
+
+module Bundler
+  class Source
+    autoload :Gemspec,  File.expand_path("source/gemspec", __dir__)
+    autoload :Git,      File.expand_path("source/git", __dir__)
+    autoload :Metadata, File.expand_path("source/metadata", __dir__)
+    autoload :Path,     File.expand_path("source/path", __dir__)
+    autoload :Rubygems, File.expand_path("source/rubygems", __dir__)
+    autoload :RubygemsAggregate, File.expand_path("source/rubygems_aggregate", __dir__)
+
+    attr_accessor :dependency_names
+
+    def unmet_deps
+      specs.unmet_dependency_names
+    end
+
+    def version_message(spec)
+      message = "#{spec.name} #{spec.version}"
+      message += " (#{spec.platform})" if spec.platform != Gem::Platform::RUBY && !spec.platform.nil?
+
+      if Bundler.locked_gems
+        locked_spec = Bundler.locked_gems.specs.find {|s| s.name == spec.name }
+        locked_spec_version = locked_spec.version if locked_spec
+        if locked_spec_version && spec.version != locked_spec_version
+          message += Bundler.ui.add_color(" (was #{locked_spec_version})", version_color(spec.version, locked_spec_version))
+        end
+      end
+
+      message
+    end
+
+    def can_lock?(spec)
+      spec.source == self
+    end
+
+    def local!; end
+
+    def local_only!; end
+
+    def cached!; end
+
+    def remote!; end
+
+    def add_dependency_names(names)
+      @dependency_names = Array(dependency_names) | Array(names)
+    end
+
+    # it's possible that gems from one source depend on gems from some
+    # other source, so now we download gemspecs and iterate over those
+    # dependencies, looking for gems we don't have info on yet.
+    def double_check_for(*); end
+
+    def dependency_names_to_double_check
+      specs.dependency_names
+    end
+
+    def spec_names
+      specs.spec_names
+    end
+
+    def include?(other)
+      other == self
+    end
+
+    def inspect
+      "#<#{self.class}:0x#{object_id} #{self}>"
+    end
+
+    def identifier
+      to_s
+    end
+
+    def path?
+      instance_of?(Bundler::Source::Path)
+    end
+
+    def extension_cache_path(spec)
+      return unless Bundler.feature_flag.global_gem_cache?
+      return unless source_slug = extension_cache_slug(spec)
+      Bundler.user_cache.join(
+        "extensions", Gem::Platform.local.to_s, Bundler.ruby_scope,
+        source_slug, spec.full_name
+      )
+    end
+
+    private
+
+    def version_color(spec_version, locked_spec_version)
+      if Gem::Version.correct?(spec_version) && Gem::Version.correct?(locked_spec_version)
+        # display yellow if there appears to be a regression
+        earlier_version?(spec_version, locked_spec_version) ? :yellow : :green
+      else
+        # default to green if the versions cannot be directly compared
+        :green
+      end
+    end
+
+    def earlier_version?(spec_version, locked_spec_version)
+      Gem::Version.new(spec_version) < Gem::Version.new(locked_spec_version)
+    end
+
+    def print_using_message(message)
+      if !message.include?("(was ") && Bundler.feature_flag.suppress_install_using_messages?
+        Bundler.ui.debug message
+      else
+        Bundler.ui.info message
+      end
+    end
+
+    def extension_cache_slug(_)
+      nil
+    end
+  end
+end
diff --git a/lib/bundler/source/gemspec.rb b/lib/bundler/source/gemspec.rb
new file mode 100644
index 0000000000..7e3447e776
--- /dev/null
+++ b/lib/bundler/source/gemspec.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Bundler
+  class Source
+    class Gemspec < Path
+      attr_reader :gemspec
+
+      def initialize(options)
+        super
+        @gemspec = options["gemspec"]
+      end
+
+      def as_path_source
+        Path.new(options)
+      end
+    end
+  end
+end
diff --git a/lib/bundler/source/git.rb b/lib/bundler/source/git.rb
new file mode 100644
index 0000000000..a41a2f23e9
--- /dev/null
+++ b/lib/bundler/source/git.rb
@@ -0,0 +1,356 @@
+# frozen_string_literal: true
+
+require_relative "../vendored_fileutils"
+
+module Bundler
+  class Source
+    class Git < Path
+      autoload :GitProxy, File.expand_path("git/git_proxy", __dir__)
+
+      attr_reader :uri, :ref, :branch, :options, :glob, :submodules
+
+      def initialize(options)
+        @options = options
+        @glob = options["glob"] || DEFAULT_GLOB
+
+        @allow_cached = false
+        @allow_remote = false
+
+        # Stringify options that could be set as symbols
+        %w[ref branch tag revision].each {|k| options[k] = options[k].to_s if options[k] }
+
+        @uri        = options["uri"] || ""
+        @safe_uri   = URICredentialsFilter.credential_filtered_uri(@uri)
+        @branch     = options["branch"]
+        @ref        = options["ref"] || options["branch"] || options["tag"]
+        @submodules = options["submodules"]
+        @name       = options["name"]
+        @version    = options["version"].to_s.strip.gsub("-", ".pre.")
+
+        @copied     = false
+        @local      = false
+      end
+
+      def self.from_lock(options)
+        new(options.merge("uri" => options.delete("remote")))
+      end
+
+      def to_lock
+        out = String.new("GIT\n")
+        out << "  remote: #{@uri}\n"
+        out << "  revision: #{revision}\n"
+        %w[ref branch tag submodules].each do |opt|
+          out << "  #{opt}: #{options[opt]}\n" if options[opt]
+        end
+        out << "  glob: #{@glob}\n" unless default_glob?
+        out << "  specs:\n"
+      end
+
+      def hash
+        [self.class, uri, ref, branch, name, version, glob, submodules].hash
+      end
+
+      def eql?(other)
+        other.is_a?(Git) && uri == other.uri && ref == other.ref &&
+          branch == other.branch && name == other.name &&
+          version == other.version && glob == other.glob &&
+          submodules == other.submodules
+      end
+
+      alias_method :==, :eql?
+
+      def to_s
+        begin
+          at = if local?
+            path
+          elsif user_ref = options["ref"]
+            if ref =~ /\A[a-z0-9]{4,}\z/i
+              shortref_for_display(user_ref)
+            else
+              user_ref
+            end
+          elsif ref
+            ref
+          else
+            git_proxy.branch
+          end
+
+          rev = "at #{at}@#{shortref_for_display(revision)}"
+        rescue GitError
+          ""
+        end
+
+        specifiers = [rev, glob_for_display].compact
+        suffix =
+          if specifiers.any?
+            " (#{specifiers.join(", ")})"
+          else
+            ""
+          end
+
+        "#{@safe_uri}#{suffix}"
+      end
+
+      def name
+        File.basename(@uri, ".git")
+      end
+
+      # This is the path which is going to contain a specific
+      # checkout of the git repository. When using local git
+      # repos, this is set to the local repo.
+      def install_path
+        @install_path ||= begin
+          git_scope = "#{base_name}-#{shortref_for_path(revision)}"
+
+          path = Bundler.install_path.join(git_scope)
+
+          if !path.exist? && Bundler.requires_sudo?
+            Bundler.user_bundle_path.join(Bundler.ruby_scope).join(git_scope)
+          else
+            path
+          end
+        end
+      end
+
+      alias_method :path, :install_path
+
+      def extension_dir_name
+        "#{base_name}-#{shortref_for_path(revision)}"
+      end
+
+      def unlock!
+        git_proxy.revision = nil
+        options["revision"] = nil
+
+        @unlocked = true
+      end
+
+      def local_override!(path)
+        return false if local?
+
+        original_path = path
+        path = Pathname.new(path)
+        path = path.expand_path(Bundler.root) unless path.relative?
+
+        unless options["branch"] || Bundler.settings[:disable_local_branch_check]
+          raise GitError, "Cannot use local override for #{name} at #{path} because " \
+            ":branch is not specified in Gemfile. Specify a branch or run " \
+            "`bundle config unset local.#{override_for(original_path)}` to remove the local override"
+        end
+
+        unless path.exist?
+          raise GitError, "Cannot use local override for #{name} because #{path} " \
+            "does not exist. Run `bundle config unset local.#{override_for(original_path)}` to remove the local override"
+        end
+
+        set_local!(path)
+
+        # Create a new git proxy without the cached revision
+        # so the Gemfile.lock always picks up the new revision.
+        @git_proxy = GitProxy.new(path, uri, ref)
+
+        if git_proxy.branch != options["branch"] && !Bundler.settings[:disable_local_branch_check]
+          raise GitError, "Local override for #{name} at #{path} is using branch " \
+            "#{git_proxy.branch} but Gemfile specifies #{options["branch"]}"
+        end
+
+        changed = cached_revision && cached_revision != git_proxy.revision
+
+        if !Bundler.settings[:disable_local_revision_check] && changed && !@unlocked && !git_proxy.contains?(cached_revision)
+          raise GitError, "The Gemfile lock is pointing to revision #{shortref_for_display(cached_revision)} " \
+            "but the current branch in your local override for #{name} does not contain such commit. " \
+            "Please make sure your branch is up to date."
+        end
+
+        changed
+      end
+
+      def specs(*)
+        set_local!(app_cache_path) if has_app_cache? && !local?
+
+        if requires_checkout? && !@copied
+          fetch
+          git_proxy.copy_to(install_path, submodules)
+          serialize_gemspecs_in(install_path)
+          @copied = true
+        end
+
+        local_specs
+      end
+
+      def install(spec, options = {})
+        force = options[:force]
+
+        print_using_message "Using #{version_message(spec)} from #{self}"
+
+        if (requires_checkout? && !@copied) || force
+          Bundler.ui.debug "  * Checking out revision: #{ref}"
+          git_proxy.copy_to(install_path, submodules)
+          serialize_gemspecs_in(install_path)
+          @copied = true
+        end
+
+        generate_bin_options = { :disable_extensions => !Bundler.rubygems.spec_missing_extensions?(spec), :build_args => options[:build_args] }
+        generate_bin(spec, generate_bin_options)
+
+        requires_checkout? ? spec.post_install_message : nil
+      end
+
+      def cache(spec, custom_path = nil)
+        app_cache_path = app_cache_path(custom_path)
+        return unless Bundler.feature_flag.cache_all?
+        return if path == app_cache_path
+        cached!
+        FileUtils.rm_rf(app_cache_path)
+        git_proxy.checkout if requires_checkout?
+        git_proxy.copy_to(app_cache_path, @submodules)
+        serialize_gemspecs_in(app_cache_path)
+      end
+
+      def load_spec_files
+        super
+      rescue PathError => e
+        Bundler.ui.trace e
+        raise GitError, "#{self} is not yet checked out. Run `bundle install` first."
+      end
+
+      # This is the path which is going to contain a cache
+      # of the git repository. When using the same git repository
+      # across different projects, this cache will be shared.
+      # When using local git repos, this is set to the local repo.
+      def cache_path
+        @cache_path ||= begin
+          if Bundler.requires_sudo? || Bundler.feature_flag.global_gem_cache?
+            Bundler.user_cache
+          else
+            Bundler.bundle_path.join("cache", "bundler")
+          end.join("git", git_scope)
+        end
+      end
+
+      def app_cache_dirname
+        "#{base_name}-#{shortref_for_path(cached_revision || revision)}"
+      end
+
+      def revision
+        git_proxy.revision
+      end
+
+      def allow_git_ops?
+        @allow_remote || @allow_cached
+      end
+
+      def local?
+        @local
+      end
+
+      private
+
+      def serialize_gemspecs_in(destination)
+        destination = destination.expand_path(Bundler.root) if destination.relative?
+        Dir["#{destination}/#{@glob}"].each do |spec_path|
+          # Evaluate gemspecs and cache the result. Gemspecs
+          # in git might require git or other dependencies.
+          # The gemspecs we cache should already be evaluated.
+          spec = Bundler.load_gemspec(spec_path)
+          next unless spec
+          Bundler.rubygems.set_installed_by_version(spec)
+          Bundler.rubygems.validate(spec)
+          File.open(spec_path, "wb") {|file| file.write(spec.to_ruby) }
+        end
+      end
+
+      def set_local!(path)
+        @local       = true
+        @local_specs = @git_proxy = nil
+        @cache_path  = @install_path = path
+      end
+
+      def has_app_cache?
+        cached_revision && super
+      end
+
+      def requires_checkout?
+        allow_git_ops? && !local? && !cached_revision_checked_out?
+      end
+
+      def cached_revision_checked_out?
+        cached_revision && cached_revision == revision && install_path.exist?
+      end
+
+      def base_name
+        File.basename(uri.sub(%r{^(\w+://)?([^/:]+:)?(//\w*/)?(\w*/)*}, ""), ".git")
+      end
+
+      def shortref_for_display(ref)
+        ref[0..6]
+      end
+
+      def shortref_for_path(ref)
+        ref[0..11]
+      end
+
+      def glob_for_display
+        default_glob? ? nil : "glob: #{@glob}"
+      end
+
+      def default_glob?
+        @glob == DEFAULT_GLOB
+      end
+
+      def uri_hash
+        if uri =~ %r{^\w+://(\w+@)?}
+          # Downcase the domain component of the URI
+          # and strip off a trailing slash, if one is present
+          input = Bundler::URI.parse(uri).normalize.to_s.sub(%r{/$}, "")
+        else
+          # If there is no URI scheme, assume it is an ssh/git URI
+          input = uri
+        end
+        # We use SHA1 here for historical reason and to preserve backward compatibility.
+        # But a transition to a simpler mangling algorithm would be welcome.
+        Bundler::Digest.sha1(input)
+      end
+
+      def cached_revision
+        options["revision"]
+      end
+
+      def cached?
+        cache_path.exist?
+      end
+
+      def git_proxy
+        @git_proxy ||= GitProxy.new(cache_path, uri, ref, cached_revision, self)
+      end
+
+      def fetch
+        git_proxy.checkout
+      rescue GitError => e
+        raise unless Bundler.feature_flag.allow_offline_install?
+        Bundler.ui.warn "Using cached git data because of network errors:\n#{e}"
+      end
+
+      # no-op, since we validate when re-serializing the gemspec
+      def validate_spec(_spec); end
+
+      def load_gemspec(file)
+        stub = Gem::StubSpecification.gemspec_stub(file, install_path.parent, install_path.parent)
+        stub.full_gem_path = Pathname.new(file).dirname.expand_path(root).to_s.tap{|x| x.untaint if RUBY_VERSION < "2.7" }
+        StubSpecification.from_stub(stub)
+      end
+
+      def git_scope
+        "#{base_name}-#{uri_hash}"
+      end
+
+      def extension_cache_slug(_)
+        extension_dir_name
+      end
+
+      def override_for(path)
+        Bundler.settings.local_overrides.key(path)
+      end
+    end
+  end
+end
diff --git a/lib/bundler/source/git/git_proxy.rb b/lib/bundler/source/git/git_proxy.rb
new file mode 100644
index 0000000000..745a7fe118
--- /dev/null
+++ b/lib/bundler/source/git/git_proxy.rb
@@ -0,0 +1,263 @@
+# frozen_string_literal: true
+
+module Bundler
+  class Source
+    class Git
+      class GitNotInstalledError < GitError
+        def initialize
+          msg = String.new
+          msg << "You need to install git to be able to use gems from git repositories. "
+          msg << "For help installing git, please refer to GitHub's tutorial at https://help.github.com/articles/set-up-git"
+          super msg
+        end
+      end
+
+      class GitNotAllowedError < GitError
+        def initialize(command)
+          msg = String.new
+          msg << "Bundler is trying to run `#{command}` at runtime. You probably need to run `bundle install`. However, "
+          msg << "this error message could probably be more useful. Please submit a ticket at https://github.com/rubygems/rubygems/issues/new?labels=Bundler&template=bundler-related-issue.md "
+          msg << "with steps to reproduce as well as the following\n\nCALLER: #{caller.join("\n")}"
+          super msg
+        end
+      end
+
+      class GitCommandError < GitError
+        attr_reader :command
+
+        def initialize(command, path, extra_info = nil)
+          @command = command
+
+          msg = String.new
+          msg << "Git error: command `#{command}` in directory #{path} has failed."
+          msg << "\n#{extra_info}" if extra_info
+          msg << "\nIf this error persists you could try removing the cache directory '#{path}'" if path.exist?
+          super msg
+        end
+      end
+
+      class MissingGitRevisionError < GitCommandError
+        def initialize(command, destination_path, ref, repo)
+          msg = "Revision #{ref} does not exist in the repository #{repo}. Maybe you misspelled it?"
+          super command, destination_path, msg
+        end
+      end
+
+      # The GitProxy is responsible to interact with git repositories.
+      # All actions required by the Git source is encapsulated in this
+      # object.
+      class GitProxy
+        attr_accessor :path, :uri, :ref
+        attr_writer :revision
+
+        def initialize(path, uri, ref, revision = nil, git = nil)
+          @path     = path
+          @uri      = uri
+          @ref      = ref
+          @revision = revision
+          @git      = git
+        end
+
+        def revision
+          @revision ||= find_local_revision
+        end
+
+        def branch
+          @branch ||= allowed_with_path do
+            git("rev-parse", "--abbrev-ref", "HEAD", :dir => path).strip
+          end
+        end
+
+        def contains?(commit)
+          allowed_with_path do
+            result, status = git_null("branch", "--contains", commit, :dir => path)
+            status.success? && result =~ /^\* (.*)$/
+          end
+        end
+
+        def version
+          git("--version").match(/(git version\s*)?((\.?\d+)+).*/)[2]
+        end
+
+        def full_version
+          git("--version").sub("git version", "").strip
+        end
+
+        def checkout
+          return if path.exist? && has_revision_cached?
+          extra_ref = "#{ref}:#{ref}" if ref && ref.start_with?("refs/")
+
+          Bundler.ui.info "Fetching #{URICredentialsFilter.credential_filtered_uri(uri)}"
+
+          configured_uri = configured_uri_for(uri).to_s
+
+          unless path.exist?
+            SharedHelpers.filesystem_access(path.dirname) do |p|
+              FileUtils.mkdir_p(p)
+            end
+            git_retry "clone", "--bare", "--no-hardlinks", "--quiet", "--", configured_uri, path.to_s
+            return unless extra_ref
+          end
+
+          with_path do
+            git_retry(*["fetch", "--force", "--quiet", "--tags", "--", configured_uri, "refs/heads/*:refs/heads/*", extra_ref].compact, :dir => path)
+          end
+        end
+
+        def copy_to(destination, submodules = false)
+          # method 1
+          unless File.exist?(destination.join(".git"))
+            begin
+              SharedHelpers.filesystem_access(destination.dirname) do |p|
+                FileUtils.mkdir_p(p)
+              end
+              SharedHelpers.filesystem_access(destination) do |p|
+                FileUtils.rm_rf(p)
+              end
+              git_retry "clone", "--no-checkout", "--quiet", path.to_s, destination.to_s
+              File.chmod(((File.stat(destination).mode | 0o777) & ~File.umask), destination)
+            rescue Errno::EEXIST => e
+              file_path = e.message[%r{.*?((?:[a-zA-Z]:)?/.*)}, 1]
+              raise GitError, "Bundler could not install a gem because it needs to " \
+                "create a directory, but a file exists - #{file_path}. Please delete " \
+                "this file and try again."
+            end
+          end
+          # method 2
+          git_retry "fetch", "--force", "--quiet", "--tags", path.to_s, :dir => destination
+
+          begin
+            git "reset", "--hard", @revision, :dir => destination
+          rescue GitCommandError => e
+            raise MissingGitRevisionError.new(e.command, destination, @revision, URICredentialsFilter.credential_filtered_uri(uri))
+          end
+
+          if submodules
+            git_retry "submodule", "update", "--init", "--recursive", :dir => destination
+          elsif Gem::Version.create(version) >= Gem::Version.create("2.9.0")
+            inner_command = "git -C $toplevel submodule deinit --force $sm_path"
+            git_retry "submodule", "foreach", "--quiet", inner_command, :dir => destination
+          end
+        end
+
+        private
+
+        def git_null(*command, dir: nil)
+          check_allowed(command)
+
+          out, status = SharedHelpers.with_clean_git_env do
+            capture_and_ignore_stderr(*capture3_args_for(command, dir))
+          end
+
+          [URICredentialsFilter.credential_filtered_string(out, uri), status]
+        end
+
+        def git_retry(*command, dir: nil)
+          command_with_no_credentials = check_allowed(command)
+
+          Bundler::Retry.new("`#{command_with_no_credentials}` at #{dir || SharedHelpers.pwd}").attempts do
+            git(*command, :dir => dir)
+          end
+        end
+
+        def git(*command, dir: nil)
+          command_with_no_credentials = check_allowed(command)
+
+          out, status = SharedHelpers.with_clean_git_env do
+            capture_and_filter_stderr(*capture3_args_for(command, dir))
+          end
+
+          filtered_out = URICredentialsFilter.credential_filtered_string(out, uri)
+
+          raise GitCommandError.new(command_with_no_credentials, dir || SharedHelpers.pwd, filtered_out) unless status.success?
+
+          filtered_out
+        end
+
+        def has_revision_cached?
+          return unless @revision
+          with_path { git("cat-file", "-e", @revision, :dir => path) }
+          true
+        rescue GitError
+          false
+        end
+
+        def remove_cache
+          FileUtils.rm_rf(path)
+        end
+
+        def find_local_revision
+          allowed_with_path do
+            git("rev-parse", "--verify", ref || "HEAD", :dir => path).strip
+          end
+        rescue GitCommandError => e
+          raise MissingGitRevisionError.new(e.command, path, ref, URICredentialsFilter.credential_filtered_uri(uri))
+        end
+
+        # Adds credentials to the URI as Fetcher#configured_uri_for does
+        def configured_uri_for(uri)
+          if /https?:/ =~ uri
+            remote = Bundler::URI(uri)
+            config_auth = Bundler.settings[remote.to_s] || Bundler.settings[remote.host]
+            remote.userinfo ||= config_auth
+            remote.to_s
+          else
+            uri
+          end
+        end
+
+        def allow?
+          allowed = @git ? @git.allow_git_ops? : true
+
+          raise GitNotInstalledError.new if allowed && !Bundler.git_present?
+
+          allowed
+        end
+
+        def with_path(&blk)
+          checkout unless path.exist?
+          blk.call
+        end
+
+        def allowed_with_path
+          return with_path { yield } if allow?
+          raise GitError, "The git source #{uri} is not yet checked out. Please run `bundle install` before trying to start your application"
+        end
+
+        def check_allowed(command)
+          require "shellwords"
+          command_with_no_credentials = URICredentialsFilter.credential_filtered_string("git #{command.shelljoin}", uri)
+          raise GitNotAllowedError.new(command_with_no_credentials) unless allow?
+          command_with_no_credentials
+        end
+
+        def capture_and_filter_stderr(*cmd)
+          require "open3"
+          return_value, captured_err, status = Open3.capture3(*cmd)
+          Bundler.ui.warn URICredentialsFilter.credential_filtered_string(captured_err, uri) unless captured_err.empty?
+          [return_value, status]
+        end
+
+        def capture_and_ignore_stderr(*cmd)
+          require "open3"
+          return_value, _, status = Open3.capture3(*cmd)
+          [return_value, status]
+        end
+
+        def capture3_args_for(cmd, dir)
+          return ["git", *cmd] unless dir
+
+          if Bundler.feature_flag.bundler_3_mode? || supports_minus_c?
+            ["git", "-C", dir.to_s, *cmd]
+          else
+            ["git", *cmd, { :chdir => dir.to_s }]
+          end
+        end
+
+        def supports_minus_c?
+          @supports_minus_c ||= Gem::Version.new(version) >= Gem::Version.new("1.8.5")
+        end
+      end
+    end
+  end
+end
diff --git a/lib/bundler/source/metadata.rb b/lib/bundler/source/metadata.rb
new file mode 100644
index 0000000000..50b65ce0ea
--- /dev/null
+++ b/lib/bundler/source/metadata.rb
@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+module Bundler
+  class Source
+    class Metadata < Source
+      def specs
+        @specs ||= Index.build do |idx|
+          idx << Gem::Specification.new("Ruby\0", RubyVersion.system.to_gem_version_with_patchlevel)
+          idx << Gem::Specification.new("RubyGems\0", Gem::VERSION) do |s|
+            s.required_rubygems_version = Gem::Requirement.default
+          end
+
+          idx << Gem::Specification.new do |s|
+            s.name     = "bundler"
+            s.version  = VERSION
+            s.license  = "MIT"
+            s.platform = Gem::Platform::RUBY
+            s.source   = self
+            s.authors  = ["bundler team"]
+            s.bindir   = "exe"
+            s.homepage = "https://bundler.io"
+            s.summary  = "The best way to manage your application's dependencies"
+            s.executables = %w[bundle]
+            # can't point to the actual gemspec or else the require paths will be wrong
+            s.loaded_from = File.expand_path("..", __FILE__)
+          end
+
+          if local_spec = Bundler.rubygems.find_name("bundler").find {|s| s.version.to_s == VERSION }
+            idx << local_spec
+          end
+
+          idx.each {|s| s.source = self }
+        end
+      end
+
+      def options
+        {}
+      end
+
+      def install(spec, _opts = {})
+        print_using_message "Using #{version_message(spec)}"
+        nil
+      end
+
+      def to_s
+        "the local ruby installation"
+      end
+
+      def ==(other)
+        self.class == other.class
+      end
+      alias_method :eql?, :==
+
+      def hash
+        self.class.hash
+      end
+
+      def version_message(spec)
+        "#{spec.name} #{spec.version}"
+      end
+    end
+  end
+end
diff --git a/lib/bundler/source/path.rb b/lib/bundler/source/path.rb
new file mode 100644
index 0000000000..01f89b204d
--- /dev/null
+++ b/lib/bundler/source/path.rb
@@ -0,0 +1,260 @@
+# frozen_string_literal: true
+
+module Bundler
+  class Source
+    class Path < Source
+      autoload :Installer, File.expand_path("path/installer", __dir__)
+
+      attr_reader :path, :options, :root_path, :original_path
+      attr_writer :name
+      attr_accessor :version
+
+      protected :original_path
+
+      DEFAULT_GLOB = "{,*,*/*}.gemspec".freeze
+
+      def initialize(options)
+        @options = options.dup
+        @glob = options["glob"] || DEFAULT_GLOB
+
+        @allow_cached = false
+        @allow_remote = false
+
+        @root_path = options["root_path"] || root
+
+        if options["path"]
+          @path = Pathname.new(options["path"])
+          expanded_path = expand(@path)
+          @path = if @path.relative?
+            expanded_path.relative_path_from(root_path.expand_path)
+          else
+            expanded_path
+          end
+        end
+
+        @name    = options["name"]
+        @version = options["version"]
+
+        # Stores the original path. If at any point we move to the
+        # cached directory, we still have the original path to copy from.
+        @original_path = @path
+      end
+
+      def remote!
+        @local_specs = nil
+        @allow_remote = true
+      end
+
+      def cached!
+        @local_specs = nil
+        @allow_cached = true
+      end
+
+      def self.from_lock(options)
+        new(options.merge("path" => options.delete("remote")))
+      end
+
+      def to_lock
+        out = String.new("PATH\n")
+        out << "  remote: #{lockfile_path}\n"
+        out << "  glob: #{@glob}\n" unless @glob == DEFAULT_GLOB
+        out << "  specs:\n"
+      end
+
+      def to_s
+        "source at `#{@path}`"
+      end
+
+      def hash
+        [self.class, expanded_path, version].hash
+      end
+
+      def eql?(other)
+        return unless other.class == self.class
+        expanded_original_path == other.expanded_original_path &&
+          version == other.version
+      end
+
+      alias_method :==, :eql?
+
+      def name
+        File.basename(expanded_path.to_s)
+      end
+
+      def install(spec, options = {})
+        using_message = "Using #{version_message(spec)} from #{self}"
+        using_message += " and installing its executables" unless spec.executables.empty?
+        print_using_message using_message
+        generate_bin(spec, :disable_extensions => true)
+        nil # no post-install message
+      end
+
+      def cache(spec, custom_path = nil)
+        app_cache_path = app_cache_path(custom_path)
+        return unless Bundler.feature_flag.cache_all?
+        return if expand(@original_path).to_s.index(root_path.to_s + "/") == 0
+
+        unless @original_path.exist?
+          raise GemNotFound, "Can't cache gem #{version_message(spec)} because #{self} is missing!"
+        end
+
+        FileUtils.rm_rf(app_cache_path)
+        FileUtils.cp_r("#{@original_path}/.", app_cache_path)
+        FileUtils.touch(app_cache_path.join(".bundlecache"))
+      end
+
+      def local_specs(*)
+        @local_specs ||= load_spec_files
+      end
+
+      def specs
+        if has_app_cache?
+          @path = app_cache_path
+          @expanded_path = nil # Invalidate
+        end
+        local_specs
+      end
+
+      def app_cache_dirname
+        name
+      end
+
+      def root
+        Bundler.root
+      end
+
+      def expanded_original_path
+        @expanded_original_path ||= expand(original_path)
+      end
+
+      private
+
+      def expanded_path
+        @expanded_path ||= expand(path)
+      end
+
+      def expand(somepath)
+        if Bundler.current_ruby.jruby? # TODO: Unify when https://github.com/rubygems/bundler/issues/7598 fixed upstream and all supported jrubies include the fix
+          somepath.expand_path(root_path).expand_path
+        else
+          somepath.expand_path(root_path)
+        end
+      rescue ArgumentError => e
+        Bundler.ui.debug(e)
+        raise PathError, "There was an error while trying to use the path " \
+          "`#{somepath}`.\nThe error message was: #{e.message}."
+      end
+
+      def lockfile_path
+        return relative_path(original_path) if original_path.absolute?
+        expand(original_path).relative_path_from(root)
+      end
+
+      def app_cache_path(custom_path = nil)
+        @app_cache_path ||= Bundler.app_cache(custom_path).join(app_cache_dirname)
+      end
+
+      def has_app_cache?
+        SharedHelpers.in_bundle? && app_cache_path.exist?
+      end
+
+      def load_gemspec(file)
+        return unless spec = Bundler.load_gemspec(file)
+        Bundler.rubygems.set_installed_by_version(spec)
+        spec
+      end
+
+      def validate_spec(spec)
+        Bundler.rubygems.validate(spec)
+      end
+
+      def load_spec_files
+        index = Index.new
+
+        if File.directory?(expanded_path)
+          # We sort depth-first since `<<` will override the earlier-found specs
+          Gem::Util.glob_files_in_dir(@glob, expanded_path).sort_by {|p| -p.split(File::SEPARATOR).size }.each do |file|
+            next unless spec = load_gemspec(file)
+            spec.source = self
+
+            # Validation causes extension_dir to be calculated, which depends
+            # on #source, so we validate here instead of load_gemspec
+            validate_spec(spec)
+            index << spec
+          end
+
+          if index.empty? && @name && @version
+            index << Gem::Specification.new do |s|
+              s.name     = @name
+              s.source   = self
+              s.version  = Gem::Version.new(@version)
+              s.platform = Gem::Platform::RUBY
+              s.summary  = "Fake gemspec for #{@name}"
+              s.relative_loaded_from = "#{@name}.gemspec"
+              s.authors = ["no one"]
+              if expanded_path.join("bin").exist?
+                executables = expanded_path.join("bin").children
+                executables.reject! {|p| File.directory?(p) }
+                s.executables = executables.map {|c| c.basename.to_s }
+              end
+            end
+          end
+        else
+          message = String.new("The path `#{expanded_path}` ")
+          message << if File.exist?(expanded_path)
+            "is not a directory."
+          else
+            "does not exist."
+          end
+          raise PathError, message
+        end
+
+        index
+      end
+
+      def relative_path(path = self.path)
+        if path.to_s.start_with?(root_path.to_s)
+          return path.relative_path_from(root_path)
+        end
+        path
+      end
+
+      def generate_bin(spec, options = {})
+        gem_dir = Pathname.new(spec.full_gem_path)
+
+        # Some gem authors put absolute paths in their gemspec
+        # and we have to save them from themselves
+        spec.files = spec.files.map do |p|
+          next p unless p =~ /\A#{Pathname::SEPARATOR_PAT}/
+          next if File.directory?(p)
+          begin
+            Pathname.new(p).relative_path_from(gem_dir).to_s
+          rescue ArgumentError
+            p
+          end
+        end.compact
+
+        installer = Path::Installer.new(
+          spec,
+          :env_shebang => false,
+          :disable_extensions => options[:disable_extensions],
+          :build_args => options[:build_args],
+          :bundler_extension_cache_path => extension_cache_path(spec)
+        )
+        installer.post_install
+      rescue Gem::InvalidSpecificationException => e
+        Bundler.ui.warn "\n#{spec.name} at #{spec.full_gem_path} did not have a valid gemspec.\n" \
+                        "This prevents bundler from installing bins or native extensions, but " \
+                        "that may not affect its functionality."
+
+        if !spec.extensions.empty? && !spec.email.empty?
+          Bundler.ui.warn "If you need to use this package without installing it from a gem " \
+                          "repository, please contact #{spec.email} and ask them " \
+                          "to modify their .gemspec so it can work with `gem build`."
+        end
+
+        Bundler.ui.warn "The validation message from RubyGems was:\n  #{e.message}"
+      end
+    end
+  end
+end
diff --git a/lib/bundler/source/path/installer.rb b/lib/bundler/source/path/installer.rb
new file mode 100644
index 0000000000..a70973bde7
--- /dev/null
+++ b/lib/bundler/source/path/installer.rb
@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+require_relative "../../rubygems_gem_installer"
+
+module Bundler
+  class Source
+    class Path
+      class Installer < Bundler::RubyGemsGemInstaller
+        attr_reader :spec
+
+        def initialize(spec, options = {})
+          @options            = options
+          @spec               = spec
+          @gem_dir            = Bundler.rubygems.path(spec.full_gem_path)
+          @wrappers           = true
+          @env_shebang        = true
+          @format_executable  = options[:format_executable] || false
+          @build_args         = options[:build_args] || Bundler.rubygems.build_args
+          @gem_bin_dir        = "#{Bundler.rubygems.gem_dir}/bin"
+          @disable_extensions = options[:disable_extensions]
+
+          if Bundler.requires_sudo?
+            @tmp_dir = Bundler.tmp(spec.full_name).to_s
+            @bin_dir = "#{@tmp_dir}/bin"
+          else
+            @bin_dir = @gem_bin_dir
+          end
+        end
+
+        def post_install
+          run_hooks(:pre_install)
+
+          unless @disable_extensions
+            build_extensions
+            run_hooks(:post_build)
+          end
+
+          generate_bin unless spec.executables.empty?
+
+          run_hooks(:post_install)
+        ensure
+          Bundler.rm_rf(@tmp_dir) if Bundler.requires_sudo?
+        end
+
+        private
+
+        def generate_bin
+          super
+
+          if Bundler.requires_sudo?
+            SharedHelpers.filesystem_access(@gem_bin_dir) do |p|
+              Bundler.mkdir_p(p)
+            end
+            spec.executables.each do |exe|
+              Bundler.sudo "cp -R #{@bin_dir}/#{exe} #{@gem_bin_dir}"
+            end
+          end
+        end
+
+        def run_hooks(type)
+          hooks_meth = "#{type}_hooks"
+          return unless Gem.respond_to?(hooks_meth)
+          Gem.send(hooks_meth).each do |hook|
+            result = hook.call(self)
+            next unless result == false
+            location = " at #{$1}" if hook.inspect =~ /@(.*:\d+)/
+            message = "#{type} hook#{location} failed for #{spec.full_name}"
+            raise InstallHookError, message
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/bundler/source/rubygems.rb b/lib/bundler/source/rubygems.rb
new file mode 100644
index 0000000000..8bc3aa17e9
--- /dev/null
+++ b/lib/bundler/source/rubygems.rb
@@ -0,0 +1,555 @@
+# frozen_string_literal: true
+
+require "rubygems/user_interaction"
+
+module Bundler
+  class Source
+    class Rubygems < Source
+      autoload :Remote, File.expand_path("rubygems/remote", __dir__)
+
+      # Use the API when installing less than X gems
+      API_REQUEST_LIMIT = 500
+      # Ask for X gems per API request
+      API_REQUEST_SIZE = 50
+
+      attr_reader :remotes, :caches
+
+      def initialize(options = {})
+        @options = options
+        @remotes = []
+        @dependency_names = []
+        @allow_remote = false
+        @allow_cached = false
+        @allow_local = options["allow_local"] || false
+        @caches = [cache_path, *Bundler.rubygems.gem_cache]
+
+        Array(options["remotes"]).reverse_each {|r| add_remote(r) }
+      end
+
+      def local_only!
+        @specs = nil
+        @allow_local = true
+        @allow_cached = false
+        @allow_remote = false
+      end
+
+      def local!
+        return if @allow_local
+
+        @specs = nil
+        @allow_local = true
+      end
+
+      def remote!
+        return if @allow_remote
+
+        @specs = nil
+        @allow_remote = true
+      end
+
+      def cached!
+        return if @allow_cached
+
+        @specs = nil
+        @allow_local = true
+        @allow_cached = true
+      end
+
+      def hash
+        @remotes.hash
+      end
+
+      def eql?(other)
+        other.is_a?(Rubygems) && other.credless_remotes == credless_remotes
+      end
+
+      alias_method :==, :eql?
+
+      def include?(o)
+        o.is_a?(Rubygems) && (o.credless_remotes - credless_remotes).empty?
+      end
+
+      def multiple_remotes?
+        @remotes.size > 1
+      end
+
+      def no_remotes?
+        @remotes.size == 0
+      end
+
+      def can_lock?(spec)
+        return super unless multiple_remotes?
+        include?(spec.source)
+      end
+
+      def options
+        { "remotes" => @remotes.map(&:to_s) }
+      end
+
+      def self.from_lock(options)
+        new(options)
+      end
+
+      def to_lock
+        out = String.new("GEM\n")
+        remotes.reverse_each do |remote|
+          out << "  remote: #{suppress_configured_credentials remote}\n"
+        end
+        out << "  specs:\n"
+      end
+
+      def to_s
+        if remotes.empty?
+          "locally installed gems"
+        elsif @allow_remote && @allow_cached && @allow_local
+          "rubygems repository #{remote_names}, cached gems or installed locally"
+        elsif @allow_remote && @allow_local
+          "rubygems repository #{remote_names} or installed locally"
+        elsif @allow_remote
+          "rubygems repository #{remote_names}"
+        elsif @allow_cached && @allow_local
+          "cached gems or installed locally"
+        else
+          "locally installed gems"
+        end
+      end
+
+      def identifier
+        if remotes.empty?
+          "locally installed gems"
+        else
+          "rubygems repository #{remote_names}"
+        end
+      end
+      alias_method :name, :identifier
+
+      def specs
+        @specs ||= begin
+          # remote_specs usually generates a way larger Index than the other
+          # sources, and large_idx.use small_idx is way faster than
+          # small_idx.use large_idx.
+          idx = @allow_remote ? remote_specs.dup : Index.new
+          idx.use(cached_specs, :override_dupes) if @allow_cached || @allow_remote
+          idx.use(installed_specs, :override_dupes) if @allow_local
+          idx
+        end
+      end
+
+      def install(spec, opts = {})
+        force = opts[:force]
+        ensure_builtin_gems_cached = opts[:ensure_builtin_gems_cached]
+
+        if ensure_builtin_gems_cached && spec.default_gem?
+          if !cached_path(spec)
+            cached_built_in_gem(spec) unless spec.remote
+            force = true
+          else
+            spec.loaded_from = loaded_from(spec)
+          end
+        end
+
+        if installed?(spec) && !force
+          print_using_message "Using #{version_message(spec)}"
+          return nil # no post-install message
+        end
+
+        # Download the gem to get the spec, because some specs that are returned
+        # by rubygems.org are broken and wrong.
+        if spec.remote
+          # Check for this spec from other sources
+          uris = [spec.remote.anonymized_uri]
+          uris += remotes_for_spec(spec).map(&:anonymized_uri)
+          uris.uniq!
+          Installer.ambiguous_gems << [spec.name, *uris] if uris.length > 1
+
+          path = fetch_gem(spec)
+          begin
+            s = Bundler.rubygems.spec_from_gem(path, Bundler.settings["trust-policy"])
+            spec.__swap__(s)
+          rescue Gem::Package::FormatError
+            Bundler.rm_rf(path)
+            raise
+          end
+        end
+
+        unless Bundler.settings[:no_install]
+          message = "Installing #{version_message(spec)}"
+          message += " with native extensions" if spec.extensions.any?
+          Bundler.ui.confirm message
+
+          path = cached_gem(spec)
+          raise GemNotFound, "Could not find #{spec.file_name} for installation" unless path
+          if requires_sudo?
+            install_path = Bundler.tmp(spec.full_name)
+            bin_path     = install_path.join("bin")
+          else
+            install_path = rubygems_dir
+            bin_path     = Bundler.system_bindir
+          end
+
+          Bundler.mkdir_p bin_path, :no_sudo => true unless spec.executables.empty? || Bundler.rubygems.provides?(">= 2.7.5")
+
+          require_relative "../rubygems_gem_installer"
+
+          installed_spec = Bundler::RubyGemsGemInstaller.at(
+            path,
+            :install_dir         => install_path.to_s,
+            :bin_dir             => bin_path.to_s,
+            :ignore_dependencies => true,
+            :wrappers            => true,
+            :env_shebang         => true,
+            :build_args          => opts[:build_args],
+            :bundler_expected_checksum => spec.respond_to?(:checksum) && spec.checksum,
+            :bundler_extension_cache_path => extension_cache_path(spec)
+          ).install
+          spec.full_gem_path = installed_spec.full_gem_path
+
+          # SUDO HAX
+          if requires_sudo?
+            Bundler.rubygems.repository_subdirectories.each do |name|
+              src = File.join(install_path, name, "*")
+              dst = File.join(rubygems_dir, name)
+              if name == "extensions" && Dir.glob(src).any?
+                src = File.join(src, "*/*")
+                ext_src = Dir.glob(src).first
+                ext_src.gsub!(src[0..-6], "")
+                dst = File.dirname(File.join(dst, ext_src))
+              end
+              SharedHelpers.filesystem_access(dst) do |p|
+                Bundler.mkdir_p(p)
+              end
+              Bundler.sudo "cp -R #{src} #{dst}" if Dir[src].any?
+            end
+
+            spec.executables.each do |exe|
+              SharedHelpers.filesystem_access(Bundler.system_bindir) do |p|
+                Bundler.mkdir_p(p)
+              end
+              Bundler.sudo "cp -R #{install_path}/bin/#{exe} #{Bundler.system_bindir}/"
+            end
+          end
+          installed_spec.loaded_from = loaded_from(spec)
+        end
+        spec.loaded_from = loaded_from(spec)
+
+        spec.post_install_message
+      ensure
+        Bundler.rm_rf(install_path) if requires_sudo?
+      end
+
+      def cache(spec, custom_path = nil)
+        cached_path = cached_gem(spec)
+        raise GemNotFound, "Missing gem file '#{spec.file_name}'." unless cached_path
+        return if File.dirname(cached_path) == Bundler.app_cache.to_s
+        Bundler.ui.info "  * #{File.basename(cached_path)}"
+        FileUtils.cp(cached_path, Bundler.app_cache(custom_path))
+      rescue Errno::EACCES => e
+        Bundler.ui.debug(e)
+        raise InstallError, e.message
+      end
+
+      def cached_built_in_gem(spec)
+        cached_path = cached_path(spec)
+        if cached_path.nil?
+          remote_spec = remote_specs.search(spec).first
+          if remote_spec
+            cached_path = fetch_gem(remote_spec)
+          else
+            Bundler.ui.warn "#{spec.full_name} is built in to Ruby, and can't be cached because your Gemfile doesn't have any sources that contain it."
+          end
+        end
+        cached_path
+      end
+
+      def add_remote(source)
+        uri = normalize_uri(source)
+        @remotes.unshift(uri) unless @remotes.include?(uri)
+      end
+
+      def spec_names
+        if @allow_remote && dependency_api_available?
+          remote_specs.spec_names
+        else
+          []
+        end
+      end
+
+      def unmet_deps
+        if @allow_remote && dependency_api_available?
+          remote_specs.unmet_dependency_names
+        else
+          []
+        end
+      end
+
+      def fetchers
+        @fetchers ||= remotes.map do |uri|
+          remote = Source::Rubygems::Remote.new(uri)
+          Bundler::Fetcher.new(remote)
+        end
+      end
+
+      def double_check_for(unmet_dependency_names)
+        return unless @allow_remote
+        return unless dependency_api_available?
+
+        unmet_dependency_names = unmet_dependency_names.call
+        unless unmet_dependency_names.nil?
+          if api_fetchers.size <= 1
+            # can't do this when there are multiple fetchers because then we might not fetch from _all_
+            # of them
+            unmet_dependency_names -= remote_specs.spec_names # avoid re-fetching things we've already gotten
+          end
+          return if unmet_dependency_names.empty?
+        end
+
+        Bundler.ui.debug "Double checking for #{unmet_dependency_names || "all specs (due to the size of the request)"} in #{self}"
+
+        fetch_names(api_fetchers, unmet_dependency_names, specs, false)
+      end
+
+      def dependency_names_to_double_check
+        names = []
+        remote_specs.each do |spec|
+          case spec
+          when EndpointSpecification, Gem::Specification, StubSpecification, LazySpecification
+            names.concat(spec.runtime_dependencies.map(&:name))
+          when RemoteSpecification # from the full index
+            return nil
+          else
+            raise "unhandled spec type (#{spec.inspect})"
+          end
+        end
+        names
+      end
+
+      def dependency_api_available?
+        api_fetchers.any?
+      end
+
+      protected
+
+      def remote_names
+        remotes.map(&:to_s).join(", ")
+      end
+
+      def credless_remotes
+        if Bundler.settings[:allow_deployment_source_credential_changes]
+          remotes.map(&method(:remove_auth))
+        else
+          remotes.map(&method(:suppress_configured_credentials))
+        end
+      end
+
+      def remotes_for_spec(spec)
+        specs.search_all(spec.name).inject([]) do |uris, s|
+          uris << s.remote if s.remote
+          uris
+        end
+      end
+
+      def loaded_from(spec)
+        "#{rubygems_dir}/specifications/#{spec.full_name}.gemspec"
+      end
+
+      def cached_gem(spec)
+        if spec.default_gem?
+          cached_built_in_gem(spec)
+        else
+          cached_path(spec)
+        end
+      end
+
+      def cached_path(spec)
+        global_cache_path = download_cache_path(spec)
+        @caches << global_cache_path if global_cache_path
+
+        possibilities = @caches.map {|p| "#{p}/#{spec.file_name}" }
+        possibilities.find {|p| File.exist?(p) }
+      end
+
+      def normalize_uri(uri)
+        uri = uri.to_s
+        uri = "#{uri}/" unless uri =~ %r{/$}
+        require_relative "../vendored_uri"
+        uri = Bundler::URI(uri)
+        raise ArgumentError, "The source must be an absolute URI. For example:\n" \
+          "source 'https://rubygems.org'" if !uri.absolute? || (uri.is_a?(Bundler::URI::HTTP) && uri.host.nil?)
+        uri
+      end
+
+      def suppress_configured_credentials(remote)
+        remote_nouser = remove_auth(remote)
+        if remote.userinfo && remote.userinfo == Bundler.settings[remote_nouser]
+          remote_nouser
+        else
+          remote
+        end
+      end
+
+      def remove_auth(remote)
+        if remote.user || remote.password
+          remote.dup.tap {|uri| uri.user = uri.password = nil }.to_s
+        else
+          remote.to_s
+        end
+      end
+
+      def installed_specs
+        @installed_specs ||= Index.build do |idx|
+          Bundler.rubygems.all_specs.reverse_each do |spec|
+            spec.source = self
+            if Bundler.rubygems.spec_missing_extensions?(spec, false)
+              Bundler.ui.debug "Source #{self} is ignoring #{spec} because it is missing extensions"
+              next
+            end
+            idx << spec
+          end
+        end
+      end
+
+      def cached_specs
+        @cached_specs ||= begin
+          idx = @allow_local ? installed_specs.dup : Index.new
+
+          Dir["#{cache_path}/*.gem"].each do |gemfile|
+            next if gemfile =~ /^bundler\-[\d\.]+?\.gem/
+            s ||= Bundler.rubygems.spec_from_gem(gemfile)
+            s.source = self
+            idx << s
+          end
+
+          idx
+        end
+      end
+
+      def api_fetchers
+        fetchers.select {|f| f.use_api && f.fetchers.first.api_fetcher? }
+      end
+
+      def remote_specs
+        @remote_specs ||= Index.build do |idx|
+          index_fetchers = fetchers - api_fetchers
+
+          # gather lists from non-api sites
+          fetch_names(index_fetchers, nil, idx, false)
+
+          # because ensuring we have all the gems we need involves downloading
+          # the gemspecs of those gems, if the non-api sites contain more than
+          # about 500 gems, we treat all sites as non-api for speed.
+          allow_api = idx.size < API_REQUEST_LIMIT && dependency_names.size < API_REQUEST_LIMIT
+          Bundler.ui.debug "Need to query more than #{API_REQUEST_LIMIT} gems." \
+            " Downloading full index instead..." unless allow_api
+
+          fetch_names(api_fetchers, allow_api && dependency_names, idx, false)
+        end
+      end
+
+      def fetch_names(fetchers, dependency_names, index, override_dupes)
+        fetchers.each do |f|
+          if dependency_names
+            Bundler.ui.info "Fetching gem metadata from #{URICredentialsFilter.credential_filtered_uri(f.uri)}", Bundler.ui.debug?
+            index.use f.specs_with_retry(dependency_names, self), override_dupes
+            Bundler.ui.info "" unless Bundler.ui.debug? # new line now that the dots are over
+          else
+            Bundler.ui.info "Fetching source index from #{URICredentialsFilter.credential_filtered_uri(f.uri)}"
+            index.use f.specs_with_retry(nil, self), override_dupes
+          end
+        end
+      end
+
+      def fetch_gem(spec)
+        return false unless spec.remote
+
+        spec.fetch_platform
+
+        cache_path = download_cache_path(spec) || default_cache_path_for(rubygems_dir)
+        gem_path = "#{cache_path}/#{spec.file_name}"
+
+        if requires_sudo?
+          download_path = Bundler.tmp(spec.full_name)
+          download_cache_path = default_cache_path_for(download_path)
+        else
+          download_cache_path = cache_path
+        end
+
+        SharedHelpers.filesystem_access(download_cache_path) do |p|
+          FileUtils.mkdir_p(p)
+        end
+        download_gem(spec, download_cache_path)
+
+        if requires_sudo?
+          SharedHelpers.filesystem_access(cache_path) do |p|
+            Bundler.mkdir_p(p)
+          end
+          Bundler.sudo "mv #{download_cache_path}/#{spec.file_name} #{gem_path}"
+        end
+
+        gem_path
+      ensure
+        Bundler.rm_rf(download_path) if requires_sudo?
+      end
+
+      def installed?(spec)
+        installed_specs[spec].any? && !spec.deleted_gem?
+      end
+
+      def requires_sudo?
+        Bundler.requires_sudo?
+      end
+
+      def rubygems_dir
+        Bundler.rubygems.gem_dir
+      end
+
+      def default_cache_path_for(dir)
+        "#{dir}/cache"
+      end
+
+      def cache_path
+        Bundler.app_cache
+      end
+
+      private
+
+      # Checks if the requested spec exists in the global cache. If it does,
+      # we copy it to the download path, and if it does not, we download it.
+      #
+      # @param  [Specification] spec
+      #         the spec we want to download or retrieve from the cache.
+      #
+      # @param  [String] download_cache_path
+      #         the local directory the .gem will end up in.
+      #
+      def download_gem(spec, download_cache_path)
+        uri = spec.remote.uri
+        Bundler.ui.confirm("Fetching #{version_message(spec)}")
+        Bundler.rubygems.download_gem(spec, uri, download_cache_path)
+      end
+
+      # Returns the global cache path of the calling Rubygems::Source object.
+      #
+      # Note that the Source determines the path's subdirectory. We use this
+      # subdirectory in the global cache path so that gems with the same name
+      # -- and possibly different versions -- from different sources are saved
+      # to their respective subdirectories and do not override one another.
+      #
+      # @param  [Gem::Specification] specification
+      #
+      # @return [Pathname] The global cache path.
+      #
+      def download_cache_path(spec)
+        return unless Bundler.feature_flag.global_gem_cache?
+        return unless remote = spec.remote
+        return unless cache_slug = remote.cache_slug
+
+        Bundler.user_cache.join("gems", cache_slug)
+      end
+
+      def extension_cache_slug(spec)
+        return unless remote = spec.remote
+        remote.cache_slug
+      end
+    end
+  end
+end
diff --git a/lib/bundler/source/rubygems/remote.rb b/lib/bundler/source/rubygems/remote.rb
new file mode 100644
index 0000000000..82c850ffbb
--- /dev/null
+++ b/lib/bundler/source/rubygems/remote.rb
@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+module Bundler
+  class Source
+    class Rubygems
+      class Remote
+        attr_reader :uri, :anonymized_uri, :original_uri
+
+        def initialize(uri)
+          orig_uri = uri
+          uri = Bundler.settings.mirror_for(uri)
+          @original_uri = orig_uri if orig_uri != uri
+          fallback_auth = Bundler.settings.credentials_for(uri)
+
+          @uri = apply_auth(uri, fallback_auth).freeze
+          @anonymized_uri = remove_auth(@uri).freeze
+        end
+
+        # @return [String] A slug suitable for use as a cache key for this
+        #         remote.
+        #
+        def cache_slug
+          @cache_slug ||= begin
+            return nil unless SharedHelpers.md5_available?
+
+            cache_uri = original_uri || uri
+
+            host = cache_uri.to_s.start_with?("file://") ? nil : cache_uri.host
+
+            uri_parts = [host, cache_uri.user, cache_uri.port, cache_uri.path]
+            uri_digest = SharedHelpers.digest(:MD5).hexdigest(uri_parts.compact.join("."))
+
+            uri_parts[-1] = uri_digest
+            uri_parts.compact.join(".")
+          end
+        end
+
+        def to_s
+          "rubygems remote at #{anonymized_uri}"
+        end
+
+        private
+
+        def apply_auth(uri, auth)
+          if auth && uri.userinfo.nil?
+            uri = uri.dup
+            uri.userinfo = auth
+          end
+
+          uri
+        rescue Bundler::URI::InvalidComponentError
+          error_message = "Please CGI escape your usernames and passwords before " \
+                          "setting them for authentication."
+          raise HTTPError.new(error_message)
+        end
+
+        def remove_auth(uri)
+          if uri.userinfo
+            uri = uri.dup
+            uri.user = uri.password = nil
+          end
+
+          uri
+        end
+      end
+    end
+  end
+end
diff --git a/lib/bundler/source/rubygems_aggregate.rb b/lib/bundler/source/rubygems_aggregate.rb
new file mode 100644
index 0000000000..99ef81ad54
--- /dev/null
+++ b/lib/bundler/source/rubygems_aggregate.rb
@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+module Bundler
+  class Source
+    class RubygemsAggregate
+      attr_reader :source_map, :sources
+
+      def initialize(sources, source_map)
+        @sources = sources
+        @source_map = source_map
+
+        @index = build_index
+      end
+
+      def specs
+        @index
+      end
+
+      def identifier
+        to_s
+      end
+
+      def to_s
+        "any of the sources"
+      end
+
+      private
+
+      def build_index
+        Index.build do |idx|
+          dependency_names = source_map.pinned_spec_names
+
+          sources.all_sources.each do |source|
+            source.dependency_names = dependency_names - source_map.pinned_spec_names(source)
+            idx.add_source source.specs
+            dependency_names.concat(source.unmet_deps).uniq!
+          end
+
+          double_check_for_index(idx, dependency_names)
+        end
+      end
+
+      # Suppose the gem Foo depends on the gem Bar.  Foo exists in Source A.  Bar has some versions that exist in both
+      # sources A and B.  At this point, the API request will have found all the versions of Bar in source A,
+      # but will not have found any versions of Bar from source B, which is a problem if the requested version
+      # of Foo specifically depends on a version of Bar that is only found in source B. This ensures that for
+      # each spec we found, we add all possible versions from all sources to the index.
+      def double_check_for_index(idx, dependency_names)
+        pinned_names = source_map.pinned_spec_names
+
+        names = :names # do this so we only have to traverse to get dependency_names from the index once
+        unmet_dependency_names = lambda do
+          return names unless names == :names
+          new_names = sources.all_sources.map(&:dependency_names_to_double_check)
+          return names = nil if new_names.compact!
+          names = new_names.flatten(1).concat(dependency_names)
+          names.uniq!
+          names -= pinned_names
+          names
+        end
+
+        sources.all_sources.each do |source|
+          source.double_check_for(unmet_dependency_names)
+        end
+      end
+    end
+  end
+end
diff --git a/lib/bundler/source_list.rb b/lib/bundler/source_list.rb
new file mode 100644
index 0000000000..a4773397c7
--- /dev/null
+++ b/lib/bundler/source_list.rb
@@ -0,0 +1,221 @@
+# frozen_string_literal: true
+
+module Bundler
+  class SourceList
+    attr_reader :path_sources,
+      :git_sources,
+      :plugin_sources,
+      :global_path_source,
+      :metadata_source
+
+    def global_rubygems_source
+      @global_rubygems_source ||= rubygems_aggregate_class.new("allow_local" => true)
+    end
+
+    def initialize
+      @path_sources           = []
+      @git_sources            = []
+      @plugin_sources         = []
+      @global_rubygems_source = nil
+      @global_path_source     = nil
+      @rubygems_sources       = []
+      @metadata_source        = Source::Metadata.new
+
+      @merged_gem_lockfile_sections = false
+    end
+
+    def merged_gem_lockfile_sections?
+      @merged_gem_lockfile_sections
+    end
+
+    def merged_gem_lockfile_sections!(replacement_source)
+      @merged_gem_lockfile_sections = true
+      @global_rubygems_source = replacement_source
+    end
+
+    def aggregate_global_source?
+      global_rubygems_source.multiple_remotes?
+    end
+
+    def implicit_global_source?
+      global_rubygems_source.no_remotes?
+    end
+
+    def add_path_source(options = {})
+      if options["gemspec"]
+        add_source_to_list Source::Gemspec.new(options), path_sources
+      else
+        path_source = add_source_to_list Source::Path.new(options), path_sources
+        @global_path_source ||= path_source if options["global"]
+        path_source
+      end
+    end
+
+    def add_git_source(options = {})
+      add_source_to_list(Source::Git.new(options), git_sources).tap do |source|
+        warn_on_git_protocol(source)
+      end
+    end
+
+    def add_rubygems_source(options = {})
+      new_source = Source::Rubygems.new(options)
+      return @global_rubygems_source if @global_rubygems_source == new_source
+
+      add_source_to_list new_source, @rubygems_sources
+    end
+
+    def add_plugin_source(source, options = {})
+      add_source_to_list Plugin.source(source).new(options), @plugin_sources
+    end
+
+    def add_global_rubygems_remote(uri)
+      global_rubygems_source.add_remote(uri)
+      global_rubygems_source
+    end
+
+    def default_source
+      global_path_source || global_rubygems_source
+    end
+
+    def rubygems_sources
+      non_global_rubygems_sources + [global_rubygems_source]
+    end
+
+    def non_global_rubygems_sources
+      @rubygems_sources
+    end
+
+    def rubygems_remotes
+      rubygems_sources.map(&:remotes).flatten.uniq
+    end
+
+    def all_sources
+      path_sources + git_sources + plugin_sources + rubygems_sources + [metadata_source]
+    end
+
+    def non_default_explicit_sources
+      all_sources - [default_source, metadata_source]
+    end
+
+    def get(source)
+      source_list_for(source).find {|s| equivalent_source?(source, s) }
+    end
+
+    def lock_sources
+      lock_other_sources + lock_rubygems_sources
+    end
+
+    def lock_other_sources
+      (path_sources + git_sources + plugin_sources).sort_by(&:identifier)
+    end
+
+    def lock_rubygems_sources
+      if merged_gem_lockfile_sections?
+        [combine_rubygems_sources]
+      else
+        rubygems_sources.sort_by(&:identifier)
+      end
+    end
+
+    # Returns true if there are changes
+    def replace_sources!(replacement_sources)
+      return false if replacement_sources.empty?
+
+      @rubygems_sources, @path_sources, @git_sources, @plugin_sources = map_sources(replacement_sources)
+      @global_rubygems_source = global_replacement_source(replacement_sources)
+
+      different_sources?(lock_sources, replacement_sources)
+    end
+
+    # Returns true if there are changes
+    def expired_sources?(replacement_sources)
+      return false if replacement_sources.empty?
+
+      lock_sources = dup_with_replaced_sources(replacement_sources).lock_sources
+
+      different_sources?(lock_sources, replacement_sources)
+    end
+
+    def local_only!
+      all_sources.each(&:local_only!)
+    end
+
+    def cached!
+      all_sources.each(&:cached!)
+    end
+
+    def remote!
+      all_sources.each(&:remote!)
+    end
+
+    private
+
+    def dup_with_replaced_sources(replacement_sources)
+      new_source_list = dup
+      new_source_list.replace_sources!(replacement_sources)
+      new_source_list
+    end
+
+    def map_sources(replacement_sources)
+      [@rubygems_sources, @path_sources, @git_sources, @plugin_sources].map do |sources|
+        sources.map do |source|
+          replacement_sources.find {|s| s == source } || source
+        end
+      end
+    end
+
+    def global_replacement_source(replacement_sources)
+      replacement_source = replacement_sources.find {|s| s == global_rubygems_source }
+      return global_rubygems_source unless replacement_source
+
+      replacement_source.local!
+      replacement_source
+    end
+
+    def different_sources?(lock_sources, replacement_sources)
+      !equivalent_sources?(lock_sources, replacement_sources)
+    end
+
+    def rubygems_aggregate_class
+      Source::Rubygems
+    end
+
+    def add_source_to_list(source, list)
+      list.unshift(source).uniq!
+      source
+    end
+
+    def source_list_for(source)
+      case source
+      when Source::Git          then git_sources
+      when Source::Path         then path_sources
+      when Source::Rubygems     then rubygems_sources
+      when Plugin::API::Source  then plugin_sources
+      else raise ArgumentError, "Invalid source: #{source.inspect}"
+      end
+    end
+
+    def combine_rubygems_sources
+      Source::Rubygems.new("remotes" => rubygems_remotes)
+    end
+
+    def warn_on_git_protocol(source)
+      return if Bundler.settings["git.allow_insecure"]
+
+      if source.uri =~ /^git\:/
+        Bundler.ui.warn "The git source `#{source.uri}` uses the `git` protocol, " \
+          "which transmits data without encryption. Disable this warning with " \
+          "`bundle config set --local git.allow_insecure true`, or switch to the `https` " \
+          "protocol to keep your data secure."
+      end
+    end
+
+    def equivalent_sources?(lock_sources, replacement_sources)
+      lock_sources.sort_by(&:identifier) == replacement_sources.sort_by(&:identifier)
+    end
+
+    def equivalent_source?(source, other_source)
+      source == other_source
+    end
+  end
+end
diff --git a/lib/bundler/source_map.rb b/lib/bundler/source_map.rb
new file mode 100644
index 0000000000..a554f26f76
--- /dev/null
+++ b/lib/bundler/source_map.rb
@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module Bundler
+  class SourceMap
+    attr_reader :sources, :dependencies
+
+    def initialize(sources, dependencies)
+      @sources = sources
+      @dependencies = dependencies
+    end
+
+    def pinned_spec_names(skip = nil)
+      direct_requirements.reject {|_, source| source == skip }.keys
+    end
+
+    def all_requirements
+      requirements = direct_requirements.dup
+
+      unmet_deps = sources.non_default_explicit_sources.map do |source|
+        (source.spec_names - pinned_spec_names).each do |indirect_dependency_name|
+          previous_source = requirements[indirect_dependency_name]
+          if previous_source.nil?
+            requirements[indirect_dependency_name] = source
+          else
+            no_ambiguous_sources = Bundler.feature_flag.bundler_3_mode?
+
+            msg = ["The gem '#{indirect_dependency_name}' was found in multiple relevant sources."]
+            msg.concat [previous_source, source].map {|s| "  * #{s}" }.sort
+            msg << "You #{no_ambiguous_sources ? :must : :should} add this gem to the source block for the source you wish it to be installed from."
+            msg = msg.join("\n")
+
+            raise SecurityError, msg if no_ambiguous_sources
+            Bundler.ui.warn "Warning: #{msg}"
+          end
+        end
+
+        source.unmet_deps
+      end
+
+      sources.default_source.add_dependency_names(unmet_deps.flatten - requirements.keys)
+
+      requirements
+    end
+
+    def direct_requirements
+      @direct_requirements ||= begin
+        requirements = {}
+        default = sources.default_source
+        dependencies.each do |dep|
+          dep_source = dep.source || default
+          dep_source.add_dependency_names(dep.name)
+          requirements[dep.name] = dep_source
+        end
+        requirements
+      end
+    end
+  end
+end
diff --git a/lib/bundler/spec_set.rb b/lib/bundler/spec_set.rb
new file mode 100644
index 0000000000..a19d18388a
--- /dev/null
+++ b/lib/bundler/spec_set.rb
@@ -0,0 +1,188 @@
+# frozen_string_literal: true
+
+require_relative "vendored_tsort"
+
+module Bundler
+  class SpecSet
+    include Enumerable
+    include TSort
+
+    def initialize(specs)
+      @specs = specs
+    end
+
+    def for(dependencies, check = false, match_current_platform = false)
+      handled = []
+      deps = dependencies.dup
+      specs = []
+
+      loop do
+        break unless dep = deps.shift
+        next if handled.any?{|d| d.name == dep.name && (match_current_platform || d.__platform == dep.__platform) } || dep.name == "bundler"
+
+        handled << dep
+
+        specs_for_dep = spec_for_dependency(dep, match_current_platform)
+        if specs_for_dep.any?
+          match_current_platform ? specs += specs_for_dep : specs |= specs_for_dep
+
+          specs_for_dep.first.dependencies.each do |d|
+            next if d.type == :development
+            d = DepProxy.get_proxy(d, dep.__platform) unless match_current_platform
+            deps << d
+          end
+        elsif check
+          return false
+        end
+      end
+
+      if spec = lookup["bundler"].first
+        specs << spec
+      end
+
+      check ? true : specs
+    end
+
+    def [](key)
+      key = key.name if key.respond_to?(:name)
+      lookup[key].reverse
+    end
+
+    def []=(key, value)
+      @specs << value
+      @lookup = nil
+      @sorted = nil
+    end
+
+    def sort!
+      self
+    end
+
+    def to_a
+      sorted.dup
+    end
+
+    def to_hash
+      lookup.dup
+    end
+
+    def materialize(deps)
+      materialized = self.for(deps, false, true)
+
+      materialized.map! do |s|
+        next s unless s.is_a?(LazySpecification)
+        s.source.local!
+        s.__materialize__ || s
+      end
+      SpecSet.new(materialized)
+    end
+
+    # Materialize for all the specs in the spec set, regardless of what platform they're for
+    # This is in contrast to how for does platform filtering (and specifically different from how `materialize` calls `for` only for the current platform)
+    # @return [Array<Gem::Specification>]
+    def materialized_for_all_platforms
+      @specs.map do |s|
+        next s unless s.is_a?(LazySpecification)
+        s.source.local!
+        s.source.remote!
+        spec = s.__materialize__
+        raise GemNotFound, "Could not find #{s.full_name} in any of the sources" unless spec
+        spec
+      end
+    end
+
+    def missing_specs
+      @specs.select {|s| s.is_a?(LazySpecification) }
+    end
+
+    def merge(set)
+      arr = sorted.dup
+      set.each do |set_spec|
+        full_name = set_spec.full_name
+        next if arr.any? {|spec| spec.full_name == full_name }
+        arr << set_spec
+      end
+      SpecSet.new(arr)
+    end
+
+    def find_by_name_and_platform(name, platform)
+      @specs.detect {|spec| spec.name == name && spec.match_platform(platform) }
+    end
+
+    def what_required(spec)
+      unless req = find {|s| s.dependencies.any? {|d| d.type == :runtime && d.name == spec.name } }
+        return [spec]
+      end
+      what_required(req) << spec
+    end
+
+    def <<(spec)
+      @specs << spec
+    end
+
+    def length
+      @specs.length
+    end
+
+    def size
+      @specs.size
+    end
+
+    def empty?
+      @specs.empty?
+    end
+
+    def each(&b)
+      sorted.each(&b)
+    end
+
+    private
+
+    def sorted
+      rake = @specs.find {|s| s.name == "rake" }
+      begin
+        @sorted ||= ([rake] + tsort).compact.uniq
+      rescue TSort::Cyclic => error
+        cgems = extract_circular_gems(error)
+        raise CyclicDependencyError, "Your bundle requires gems that depend" \
+          " on each other, creating an infinite loop. Please remove either" \
+          " gem '#{cgems[1]}' or gem '#{cgems[0]}' and try again."
+      end
+    end
+
+    def extract_circular_gems(error)
+      error.message.scan(/@name="(.*?)"/).flatten
+    end
+
+    def lookup
+      @lookup ||= begin
+        lookup = Hash.new {|h, k| h[k] = [] }
+        Index.sort_specs(@specs).reverse_each do |s|
+          lookup[s.name] << s
+        end
+        lookup
+      end
+    end
+
+    def tsort_each_node
+      # MUST sort by name for backwards compatibility
+      @specs.sort_by(&:name).each {|s| yield s }
+    end
+
+    def spec_for_dependency(dep, match_current_platform)
+      specs_for_platforms = lookup[dep.name]
+      if match_current_platform
+        GemHelpers.select_best_platform_match(specs_for_platforms.select{|s| Gem::Platform.match_spec?(s) }, Bundler.local_platform)
+      else
+        GemHelpers.select_best_platform_match(specs_for_platforms, dep.__platform)
+      end
+    end
+
+    def tsort_each_child(s)
+      s.dependencies.sort_by(&:name).each do |d|
+        next if d.type == :development
+        lookup[d.name].each {|s2| yield s2 }
+      end
+    end
+  end
+end
diff --git a/lib/bundler/stub_specification.rb b/lib/bundler/stub_specification.rb
new file mode 100644
index 0000000000..fa071901e5
--- /dev/null
+++ b/lib/bundler/stub_specification.rb
@@ -0,0 +1,114 @@
+# frozen_string_literal: true
+
+module Bundler
+  class StubSpecification < RemoteSpecification
+    def self.from_stub(stub)
+      return stub if stub.is_a?(Bundler::StubSpecification)
+      spec = new(stub.name, stub.version, stub.platform, nil)
+      spec.stub = stub
+      spec
+    end
+
+    attr_accessor :stub, :ignored
+
+    def source=(source)
+      super
+      # Stub has no concept of source, which means that extension_dir may be wrong
+      # This is the case for git-based gems. So, instead manually assign the extension dir
+      return unless source.respond_to?(:extension_dir_name)
+      path = File.join(stub.extensions_dir, source.extension_dir_name)
+      stub.extension_dir = File.expand_path(path)
+    end
+
+    def to_yaml
+      _remote_specification.to_yaml
+    end
+
+    # @!group Stub Delegates
+
+    def manually_installed?
+      # This is for manually installed gems which are gems that were fixed in place after a
+      # failed installation. Once the issue was resolved, the user then manually created
+      # the gem specification using the instructions provided by `gem help install`
+      installed_by_version == Gem::Version.new(0)
+    end
+
+    # This is defined directly to avoid having to loading the full spec
+    def missing_extensions?
+      return false if default_gem?
+      return false if extensions.empty?
+      return false if File.exist? gem_build_complete_path
+      return false if manually_installed?
+
+      true
+    end
+
+    def activated
+      stub.activated
+    end
+
+    def activated=(activated)
+      stub.instance_variable_set(:@activated, activated)
+    end
+
+    def extensions
+      stub.extensions
+    end
+
+    def gem_build_complete_path
+      File.join(extension_dir, "gem.build_complete")
+    end
+
+    def default_gem?
+      stub.default_gem?
+    end
+
+    def full_gem_path
+      # deleted gems can have their stubs return nil, so in that case grab the
+      # expired path from the full spec
+      stub.full_gem_path || method_missing(:full_gem_path)
+    end
+
+    def full_require_paths
+      stub.full_require_paths
+    end
+
+    def load_paths
+      full_require_paths
+    end
+
+    def loaded_from
+      stub.loaded_from
+    end
+
+    def matches_for_glob(glob)
+      stub.matches_for_glob(glob)
+    end
+
+    def raw_require_paths
+      stub.raw_require_paths
+    end
+
+    private
+
+    def _remote_specification
+      @_remote_specification ||= begin
+        rs = stub.to_spec
+        if rs.equal?(self) # happens when to_spec gets the spec from Gem.loaded_specs
+          rs = Gem::Specification.load(loaded_from)
+          Bundler.rubygems.stub_set_spec(stub, rs)
+        end
+
+        unless rs
+          raise GemspecError, "The gemspec for #{full_name} at #{loaded_from}" \
+            " was missing or broken. Try running `gem pristine #{name} -v #{version}`" \
+            " to fix the cached spec."
+        end
+
+        rs.source = source
+
+        rs
+      end
+    end
+  end
+end
diff --git a/lib/bundler/templates/.document b/lib/bundler/templates/.document
new file mode 100644
index 0000000000..fb66f13c33
--- /dev/null
+++ b/lib/bundler/templates/.document
@@ -0,0 +1 @@
+# Ignore all files in this directory
diff --git a/lib/bundler/templates/Executable b/lib/bundler/templates/Executable
new file mode 100644
index 0000000000..3e8d5b317a
--- /dev/null
+++ b/lib/bundler/templates/Executable
@@ -0,0 +1,29 @@
+#!/usr/bin/env <%= Bundler.settings[:shebang] || RbConfig::CONFIG["ruby_install_name"] %>
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application '<%= executable %>' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../<%= relative_gemfile_path %>",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("<%= spec.name %>", "<%= executable %>")
diff --git a/lib/bundler/templates/Executable.bundler b/lib/bundler/templates/Executable.bundler
new file mode 100644
index 0000000000..8009412ea2
--- /dev/null
+++ b/lib/bundler/templates/Executable.bundler
@@ -0,0 +1,114 @@
+#!/usr/bin/env <%= Bundler.settings[:shebang] || RbConfig::CONFIG["ruby_install_name"] %>
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application '<%= executable %>' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "rubygems"
+
+m = Module.new do
+  module_function
+
+  def invoked_as_script?
+    File.expand_path($0) == File.expand_path(__FILE__)
+  end
+
+  def env_var_version
+    ENV["BUNDLER_VERSION"]
+  end
+
+  def cli_arg_version
+    return unless invoked_as_script? # don't want to hijack other binstubs
+    return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update`
+    bundler_version = nil
+    update_index = nil
+    ARGV.each_with_index do |a, i|
+      if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN
+        bundler_version = a
+      end
+      next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/
+      bundler_version = $1
+      update_index = i
+    end
+    bundler_version
+  end
+
+  def gemfile
+    gemfile = ENV["BUNDLE_GEMFILE"]
+    return gemfile if gemfile && !gemfile.empty?
+
+    File.expand_path("../<%= relative_gemfile_path %>", __FILE__)
+  end
+
+  def lockfile
+    lockfile =
+      case File.basename(gemfile)
+      when "gems.rb" then gemfile.sub(/\.rb$/, gemfile)
+      else "#{gemfile}.lock"
+      end
+    File.expand_path(lockfile)
+  end
+
+  def lockfile_version
+    return unless File.file?(lockfile)
+    lockfile_contents = File.read(lockfile)
+    return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/
+    Regexp.last_match(1)
+  end
+
+  def bundler_requirement
+    @bundler_requirement ||=
+      env_var_version || cli_arg_version ||
+        bundler_requirement_for(lockfile_version)
+  end
+
+  def bundler_requirement_for(version)
+    return "#{Gem::Requirement.default}.a" unless version
+
+    bundler_gem_version = Gem::Version.new(version)
+
+    requirement = bundler_gem_version.approximate_recommendation
+
+    return requirement unless Gem::Version.new(Gem::VERSION) < Gem::Version.new("2.7.0")
+
+    requirement += ".a" if bundler_gem_version.prerelease?
+
+    requirement
+  end
+
+  def load_bundler!
+    ENV["BUNDLE_GEMFILE"] ||= gemfile
+
+    activate_bundler
+  end
+
+  def activate_bundler
+    gem_error = activation_error_handling do
+      gem "bundler", bundler_requirement
+    end
+    return if gem_error.nil?
+    require_error = activation_error_handling do
+      require "bundler/version"
+    end
+    return if require_error.nil? && Gem::Requirement.new(bundler_requirement).satisfied_by?(Gem::Version.new(Bundler::VERSION))
+    warn "Activating bundler (#{bundler_requirement}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_requirement}'`"
+    exit 42
+  end
+
+  def activation_error_handling
+    yield
+    nil
+  rescue StandardError, LoadError => e
+    e
+  end
+end
+
+m.load_bundler!
+
+if m.invoked_as_script?
+  load Gem.bin_path("<%= spec.name %>", "<%= executable %>")
+end
diff --git a/lib/bundler/templates/Executable.standalone b/lib/bundler/templates/Executable.standalone
new file mode 100644
index 0000000000..4bf0753f44
--- /dev/null
+++ b/lib/bundler/templates/Executable.standalone
@@ -0,0 +1,14 @@
+#!/usr/bin/env <%= Bundler.settings[:shebang] || RbConfig::CONFIG["ruby_install_name"] %>
+#
+# This file was generated by Bundler.
+#
+# The application '<%= executable %>' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+path = Pathname.new(__FILE__)
+$:.unshift File.expand_path "../<%= standalone_path %>", path.realpath
+
+require "bundler/setup"
+load File.expand_path "../<%= executable_path %>", path.realpath
diff --git a/lib/bundler/templates/Gemfile b/lib/bundler/templates/Gemfile
new file mode 100644
index 0000000000..d41f2719b4
--- /dev/null
+++ b/lib/bundler/templates/Gemfile
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
+
+# gem "rails"
diff --git a/lib/bundler/templates/gems.rb b/lib/bundler/templates/gems.rb
new file mode 100644
index 0000000000..56a62a7a82
--- /dev/null
+++ b/lib/bundler/templates/gems.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+# A sample gems.rb
+source "https://rubygems.org"
+
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
+
+# gem "rails"
diff --git a/lib/bundler/templates/newgem/CHANGELOG.md.tt b/lib/bundler/templates/newgem/CHANGELOG.md.tt
new file mode 100644
index 0000000000..c9ea96d453
--- /dev/null
+++ b/lib/bundler/templates/newgem/CHANGELOG.md.tt
@@ -0,0 +1,5 @@
+## [Unreleased]
+
+## [0.1.0] - <%= Time.now.strftime('%F') %>
+
+- Initial release
diff --git a/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt b/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt
new file mode 100644
index 0000000000..175b821a62
--- /dev/null
+++ b/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt
@@ -0,0 +1,84 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive, or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, and will communicate reasons for moderation decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when an individual is officially representing the community in public spaces. Examples of representing our community include using an official e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at <%= config[:email] %>. All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time. This includes avoiding interactions in community spaces as well as external channels like social media. Violating these terms may lead to a temporary or permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior,  harassment of an individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 2.0,
+available at https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at https://www.contributor-covenant.org/translations.
diff --git a/lib/bundler/templates/newgem/Gemfile.tt b/lib/bundler/templates/newgem/Gemfile.tt
new file mode 100644
index 0000000000..de82a63c5f
--- /dev/null
+++ b/lib/bundler/templates/newgem/Gemfile.tt
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+# Specify your gem's dependencies in <%= config[:name] %>.gemspec
+gemspec
+
+gem "rake", "~> 13.0"
+<%- if config[:ext] -%>
+
+gem "rake-compiler"
+<%- end -%>
+<%- if config[:test] -%>
+
+gem "<%= config[:test] %>", "~> <%= config[:test_framework_version] %>"
+<%- end -%>
+<%- if config[:linter] == "rubocop" -%>
+
+gem "rubocop", "~> <%= config[:linter_version] %>"
+<%- elsif config[:linter] == "standard" -%>
+
+gem "standard", "~> <%= config[:linter_version] %>"
+<%- end -%>
diff --git a/lib/bundler/templates/newgem/LICENSE.txt.tt b/lib/bundler/templates/newgem/LICENSE.txt.tt
new file mode 100644
index 0000000000..76ef4b0191
--- /dev/null
+++ b/lib/bundler/templates/newgem/LICENSE.txt.tt
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) <%= Time.now.year %> <%= config[:author] %>
+
+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.
diff --git a/lib/bundler/templates/newgem/README.md.tt b/lib/bundler/templates/newgem/README.md.tt
new file mode 100644
index 0000000000..8fd87abe9a
--- /dev/null
+++ b/lib/bundler/templates/newgem/README.md.tt
@@ -0,0 +1,49 @@
+# <%= config[:constant_name] %>
+
+Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/<%= config[:namespaced_path] %>`. To experiment with that code, run `bin/console` for an interactive prompt.
+
+TODO: Delete this and the text above, and describe your gem
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem '<%= config[:name] %>'
+```
+
+And then execute:
+
+    $ bundle install
+
+Or install it yourself as:
+
+    $ gem install <%= config[:name] %>
+
+## Usage
+
+TODO: Write usage instructions here
+
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies.<% if config[:test] %> Then, run `rake <%= config[:test].sub('mini', '').sub('rspec', 'spec') %>` to run the tests.<% end %> You can also run `bin/console` for an interactive prompt that will allow you to experiment.<% if config[:bin] %> Run `bundle exec <%= config[:name] %>` to use the gem in this directory, ignoring other installed copies of this gem.<% end %>
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+<% if config[:git] -%>
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/<%= config[:github_username] %>/<%= config[:name] %>.<% if config[:coc] %> This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/<%= config[:github_username] %>/<%= config[:name] %>/blob/<%= config[:git_default_branch] %>/CODE_OF_CONDUCT.md).<% end %>
+<% end -%>
+<% if config[:mit] -%>
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+<% end -%>
+<% if config[:git] && config[:coc] -%>
+
+## Code of Conduct
+
+Everyone interacting in the <%= config[:constant_name] %> project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/<%= config[:github_username] %>/<%= config[:name] %>/blob/<%= config[:git_default_branch] %>/CODE_OF_CONDUCT.md).
+<% end -%>
diff --git a/lib/bundler/templates/newgem/Rakefile.tt b/lib/bundler/templates/newgem/Rakefile.tt
new file mode 100644
index 0000000000..00b91c8464
--- /dev/null
+++ b/lib/bundler/templates/newgem/Rakefile.tt
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require "bundler/gem_tasks"
+<% default_task_names = [config[:test_task]].compact -%>
+<% case config[:test] -%>
+<% when "minitest", "test-unit" -%>
+require "rake/testtask"
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList["test/**/*_test.rb"]
+end
+
+<% when "rspec" -%>
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+<% end -%>
+<% if config[:linter] == "rubocop" -%>
+<% default_task_names << :rubocop -%>
+require "rubocop/rake_task"
+
+RuboCop::RakeTask.new
+
+<% elsif config[:linter] == "standard" -%>
+<% default_task_names << :standard -%>
+require "standard/rake"
+
+<% end -%>
+<% if config[:ext] -%>
+<% default_task_names.unshift(:clobber, :compile) -%>
+require "rake/extensiontask"
+
+task build: :compile
+
+Rake::ExtensionTask.new("<%= config[:underscored_name] %>") do |ext|
+  ext.lib_dir = "lib/<%= config[:namespaced_path] %>"
+end
+
+<% end -%>
+<% if default_task_names.size == 1 -%>
+task default: <%= default_task_names.first.inspect %>
+<% else -%>
+task default: %i[<%= default_task_names.join(" ") %>]
+<% end -%>
diff --git a/lib/bundler/templates/newgem/bin/console.tt b/lib/bundler/templates/newgem/bin/console.tt
new file mode 100644
index 0000000000..08dfaaef69
--- /dev/null
+++ b/lib/bundler/templates/newgem/bin/console.tt
@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "bundler/setup"
+require "<%= config[:namespaced_path] %>"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)
diff --git a/lib/bundler/templates/newgem/bin/setup.tt b/lib/bundler/templates/newgem/bin/setup.tt
new file mode 100644
index 0000000000..dce67d860a
--- /dev/null
+++ b/lib/bundler/templates/newgem/bin/setup.tt
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here
diff --git a/lib/bundler/templates/newgem/circleci/config.yml.tt b/lib/bundler/templates/newgem/circleci/config.yml.tt
new file mode 100644
index 0000000000..79fd0dcc0f
--- /dev/null
+++ b/lib/bundler/templates/newgem/circleci/config.yml.tt
@@ -0,0 +1,13 @@
+version: 2.1
+jobs:
+  build:
+    docker:
+      - image: ruby:<%= RUBY_VERSION %>
+    steps:
+      - checkout
+      - run:
+          name: Run the default task
+          command: |
+            gem install bundler -v <%= Bundler::VERSION %>
+            bundle install
+            bundle exec rake
diff --git a/lib/bundler/templates/newgem/exe/newgem.tt b/lib/bundler/templates/newgem/exe/newgem.tt
new file mode 100644
index 0000000000..a8339bb79f
--- /dev/null
+++ b/lib/bundler/templates/newgem/exe/newgem.tt
@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+
+require "<%= config[:namespaced_path] %>"
diff --git a/lib/bundler/templates/newgem/ext/newgem/extconf.rb.tt b/lib/bundler/templates/newgem/ext/newgem/extconf.rb.tt
new file mode 100644
index 0000000000..e918063ddf
--- /dev/null
+++ b/lib/bundler/templates/newgem/ext/newgem/extconf.rb.tt
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+require "mkmf"
+
+create_makefile(<%= config[:makefile_path].inspect %>)
diff --git a/lib/bundler/templates/newgem/ext/newgem/newgem.c.tt b/lib/bundler/templates/newgem/ext/newgem/newgem.c.tt
new file mode 100644
index 0000000000..8177c4d202
--- /dev/null
+++ b/lib/bundler/templates/newgem/ext/newgem/newgem.c.tt
@@ -0,0 +1,9 @@
+#include "<%= config[:underscored_name] %>.h"
+
+VALUE rb_m<%= config[:constant_array].join %>;
+
+void
+Init_<%= config[:underscored_name] %>(void)
+{
+  rb_m<%= config[:constant_array].join %> = rb_define_module(<%= config[:constant_name].inspect %>);
+}
diff --git a/lib/bundler/templates/newgem/ext/newgem/newgem.h.tt b/lib/bundler/templates/newgem/ext/newgem/newgem.h.tt
new file mode 100644
index 0000000000..c6e420b66e
--- /dev/null
+++ b/lib/bundler/templates/newgem/ext/newgem/newgem.h.tt
@@ -0,0 +1,6 @@
+#ifndef <%= config[:underscored_name].upcase %>_H
+#define <%= config[:underscored_name].upcase %>_H 1
+
+#include "ruby.h"
+
+#endif /* <%= config[:underscored_name].upcase %>_H */
diff --git a/lib/bundler/templates/newgem/github/workflows/main.yml.tt b/lib/bundler/templates/newgem/github/workflows/main.yml.tt
new file mode 100644
index 0000000000..6570d177af
--- /dev/null
+++ b/lib/bundler/templates/newgem/github/workflows/main.yml.tt
@@ -0,0 +1,27 @@
+name: Ruby
+
+on:
+  push:
+    branches:
+      - <%= config[:git_default_branch] %>
+
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    name: Ruby ${{ matrix.ruby }}
+    strategy:
+      matrix:
+        ruby:
+          - '<%= RUBY_VERSION %>'
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - name: Run the default task
+      run: bundle exec rake
diff --git a/lib/bundler/templates/newgem/gitignore.tt b/lib/bundler/templates/newgem/gitignore.tt
new file mode 100644
index 0000000000..b1c9f9986c
--- /dev/null
+++ b/lib/bundler/templates/newgem/gitignore.tt
@@ -0,0 +1,20 @@
+/.bundle/
+/.yardoc
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+<%- if config[:ext] -%>
+*.bundle
+*.so
+*.o
+*.a
+mkmf.log
+<%- end -%>
+<%- if config[:test] == "rspec" -%>
+
+# rspec failure tracking
+.rspec_status
+<%- end -%>
diff --git a/lib/bundler/templates/newgem/gitlab-ci.yml.tt b/lib/bundler/templates/newgem/gitlab-ci.yml.tt
new file mode 100644
index 0000000000..0e71ff26a4
--- /dev/null
+++ b/lib/bundler/templates/newgem/gitlab-ci.yml.tt
@@ -0,0 +1,9 @@
+image: ruby:<%= RUBY_VERSION %>
+
+before_script:
+  - gem install bundler -v <%= Bundler::VERSION %>
+  - bundle install
+
+example_job:
+  script:
+    - bundle exec rake
diff --git a/lib/bundler/templates/newgem/lib/newgem.rb.tt b/lib/bundler/templates/newgem/lib/newgem.rb.tt
new file mode 100644
index 0000000000..caf6e32f4a
--- /dev/null
+++ b/lib/bundler/templates/newgem/lib/newgem.rb.tt
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require_relative "<%= File.basename(config[:namespaced_path]) %>/version"
+<%- if config[:ext] -%>
+require_relative "<%= File.basename(config[:namespaced_path]) %>/<%= config[:underscored_name] %>"
+<%- end -%>
+
+<%- config[:constant_array].each_with_index do |c, i| -%>
+<%= "  " * i %>module <%= c %>
+<%- end -%>
+<%= "  " * config[:constant_array].size %>class Error < StandardError; end
+<%= "  " * config[:constant_array].size %># Your code goes here...
+<%- (config[:constant_array].size-1).downto(0) do |i| -%>
+<%= "  " * i %>end
+<%- end -%>
diff --git a/lib/bundler/templates/newgem/lib/newgem/version.rb.tt b/lib/bundler/templates/newgem/lib/newgem/version.rb.tt
new file mode 100644
index 0000000000..b5cd4cb232
--- /dev/null
+++ b/lib/bundler/templates/newgem/lib/newgem/version.rb.tt
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+<%- config[:constant_array].each_with_index do |c, i| -%>
+<%= "  " * i %>module <%= c %>
+<%- end -%>
+<%= "  " * config[:constant_array].size %>VERSION = "0.1.0"
+<%- (config[:constant_array].size-1).downto(0) do |i| -%>
+<%= "  " * i %>end
+<%- end -%>
diff --git a/lib/bundler/templates/newgem/newgem.gemspec.tt b/lib/bundler/templates/newgem/newgem.gemspec.tt
new file mode 100644
index 0000000000..82281ab674
--- /dev/null
+++ b/lib/bundler/templates/newgem/newgem.gemspec.tt
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require_relative "lib/<%=config[:namespaced_path]%>/version"
+
+Gem::Specification.new do |spec|
+  spec.name = <%= config[:name].inspect %>
+  spec.version = <%= config[:constant_name] %>::VERSION
+  spec.authors = [<%= config[:author].inspect %>]
+  spec.email = [<%= config[:email].inspect %>]
+
+  spec.summary = "TODO: Write a short summary, because RubyGems requires one."
+  spec.description = "TODO: Write a longer description or delete this line."
+  spec.homepage = "TODO: Put your gem's website or public repo URL here."
+<%- if config[:mit] -%>
+  spec.license = "MIT"
+<%- end -%>
+  spec.required_ruby_version = ">= <%= config[:required_ruby_version] %>"
+
+  spec.metadata["allowed_push_host"] = "TODO: Set to your gem server 'https://example.com'"
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = "TODO: Put your gem's public repo URL here."
+  spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here."
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject do |f|
+      (f == __FILE__) || f.match(%r{\A(?:(?:test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
+    end
+  end
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+<%- if config[:ext] -%>
+  spec.extensions = ["ext/<%= config[:underscored_name] %>/extconf.rb"]
+<%- end -%>
+
+  # Uncomment to register a new dependency of your gem
+  # spec.add_dependency "example-gem", "~> 1.0"
+
+  # For more information and examples about making a new gem, checkout our
+  # guide at: https://bundler.io/guides/creating_gem.html
+end
diff --git a/lib/bundler/templates/newgem/rspec.tt b/lib/bundler/templates/newgem/rspec.tt
new file mode 100644
index 0000000000..34c5164d9b
--- /dev/null
+++ b/lib/bundler/templates/newgem/rspec.tt
@@ -0,0 +1,3 @@
+--format documentation
+--color
+--require spec_helper
diff --git a/lib/bundler/templates/newgem/rubocop.yml.tt b/lib/bundler/templates/newgem/rubocop.yml.tt
new file mode 100644
index 0000000000..9ecec78807
--- /dev/null
+++ b/lib/bundler/templates/newgem/rubocop.yml.tt
@@ -0,0 +1,13 @@
+AllCops:
+  TargetRubyVersion: <%= ::Gem::Version.new(config[:required_ruby_version]).segments[0..1].join(".") %>
+
+Style/StringLiterals:
+  Enabled: true
+  EnforcedStyle: double_quotes
+
+Style/StringLiteralsInInterpolation:
+  Enabled: true
+  EnforcedStyle: double_quotes
+
+Layout/LineLength:
+  Max: 120
diff --git a/lib/bundler/templates/newgem/sig/newgem.rbs.tt b/lib/bundler/templates/newgem/sig/newgem.rbs.tt
new file mode 100644
index 0000000000..eb7b380bbb
--- /dev/null
+++ b/lib/bundler/templates/newgem/sig/newgem.rbs.tt
@@ -0,0 +1,8 @@
+<%- config[:constant_array].each_with_index do |c, i| -%>
+<%= "  " * i %>module <%= c %>
+<%- end -%>
+<%= "  " * config[:constant_array].size %>VERSION: String
+<%= "  " * config[:constant_array].size %># See the writing guide of rbs: https://github.com/ruby/rbs#guides
+<%- (config[:constant_array].size-1).downto(0) do |i| -%>
+<%= "  " * i %>end
+<%- end -%>
diff --git a/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt b/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt
new file mode 100644
index 0000000000..82cada988c
--- /dev/null
+++ b/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+RSpec.describe <%= config[:constant_name] %> do
+  it "has a version number" do
+    expect(<%= config[:constant_name] %>::VERSION).not_to be nil
+  end
+
+  it "does something useful" do
+    expect(false).to eq(true)
+  end
+end
diff --git a/lib/bundler/templates/newgem/spec/spec_helper.rb.tt b/lib/bundler/templates/newgem/spec/spec_helper.rb.tt
new file mode 100644
index 0000000000..70c6d1fcde
--- /dev/null
+++ b/lib/bundler/templates/newgem/spec/spec_helper.rb.tt
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require "<%= config[:namespaced_path] %>"
+
+RSpec.configure do |config|
+  # Enable flags like --only-failures and --next-failure
+  config.example_status_persistence_file_path = ".rspec_status"
+
+  # Disable RSpec exposing methods globally on `Module` and `main`
+  config.disable_monkey_patching!
+
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+end
diff --git a/lib/bundler/templates/newgem/standard.yml.tt b/lib/bundler/templates/newgem/standard.yml.tt
new file mode 100644
index 0000000000..9e88fbbe8b
--- /dev/null
+++ b/lib/bundler/templates/newgem/standard.yml.tt
@@ -0,0 +1,2 @@
+# For available configuration options, see:
+#   https://github.com/testdouble/standard
diff --git a/lib/bundler/templates/newgem/test/minitest/newgem_test.rb.tt b/lib/bundler/templates/newgem/test/minitest/newgem_test.rb.tt
new file mode 100644
index 0000000000..9e005d69a8
--- /dev/null
+++ b/lib/bundler/templates/newgem/test/minitest/newgem_test.rb.tt
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class <%= config[:constant_name] %>Test < Minitest::Test
+  def test_that_it_has_a_version_number
+    refute_nil ::<%= config[:constant_name] %>::VERSION
+  end
+
+  def test_it_does_something_useful
+    assert false
+  end
+end
diff --git a/lib/bundler/templates/newgem/test/minitest/test_helper.rb.tt b/lib/bundler/templates/newgem/test/minitest/test_helper.rb.tt
new file mode 100644
index 0000000000..e05c387bfa
--- /dev/null
+++ b/lib/bundler/templates/newgem/test/minitest/test_helper.rb.tt
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.unshift File.expand_path("../lib", __dir__)
+require "<%= config[:namespaced_path] %>"
+
+require "minitest/autorun"
diff --git a/lib/bundler/templates/newgem/test/test-unit/newgem_test.rb.tt b/lib/bundler/templates/newgem/test/test-unit/newgem_test.rb.tt
new file mode 100644
index 0000000000..5c61094e62
--- /dev/null
+++ b/lib/bundler/templates/newgem/test/test-unit/newgem_test.rb.tt
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class <%= config[:constant_name] %>Test < Test::Unit::TestCase
+  test "VERSION" do
+    assert do
+      ::<%= config[:constant_name] %>.const_defined?(:VERSION)
+    end
+  end
+
+  test "something useful" do
+    assert_equal("expected", "actual")
+  end
+end
diff --git a/lib/bundler/templates/newgem/test/test-unit/test_helper.rb.tt b/lib/bundler/templates/newgem/test/test-unit/test_helper.rb.tt
new file mode 100644
index 0000000000..6f633c6039
--- /dev/null
+++ b/lib/bundler/templates/newgem/test/test-unit/test_helper.rb.tt
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.unshift File.expand_path("../lib", __dir__)
+require "<%= config[:namespaced_path] %>"
+
+require "test-unit"
diff --git a/lib/bundler/templates/newgem/travis.yml.tt b/lib/bundler/templates/newgem/travis.yml.tt
new file mode 100644
index 0000000000..eab16addca
--- /dev/null
+++ b/lib/bundler/templates/newgem/travis.yml.tt
@@ -0,0 +1,6 @@
+---
+language: ruby
+cache: bundler
+rvm:
+  - <%= RUBY_VERSION %>
+before_install: gem install bundler -v <%= Bundler::VERSION %>
diff --git a/lib/bundler/ui.rb b/lib/bundler/ui.rb
new file mode 100644
index 0000000000..7a4fa03669
--- /dev/null
+++ b/lib/bundler/ui.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Bundler
+  module UI
+    autoload :RGProxy, File.expand_path("ui/rg_proxy", __dir__)
+    autoload :Shell,   File.expand_path("ui/shell", __dir__)
+    autoload :Silent,  File.expand_path("ui/silent", __dir__)
+  end
+end
diff --git a/lib/bundler/ui/rg_proxy.rb b/lib/bundler/ui/rg_proxy.rb
new file mode 100644
index 0000000000..ef6def225b
--- /dev/null
+++ b/lib/bundler/ui/rg_proxy.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require_relative "../ui"
+require "rubygems/user_interaction"
+
+module Bundler
+  module UI
+    class RGProxy < ::Gem::SilentUI
+      def initialize(ui)
+        @ui = ui
+        super()
+      end
+
+      def say(message)
+        @ui && @ui.debug(message)
+      end
+    end
+  end
+end
diff --git a/lib/bundler/ui/shell.rb b/lib/bundler/ui/shell.rb
new file mode 100644
index 0000000000..17777af4ac
--- /dev/null
+++ b/lib/bundler/ui/shell.rb
@@ -0,0 +1,142 @@
+# frozen_string_literal: true
+
+require_relative "../vendored_thor"
+
+module Bundler
+  module UI
+    class Shell
+      LEVELS = %w[silent error warn confirm info debug].freeze
+
+      attr_writer :shell
+
+      def initialize(options = {})
+        Thor::Base.shell = options["no-color"] ? Thor::Shell::Basic : nil
+        @shell = Thor::Base.shell.new
+        @level = ENV["DEBUG"] ? "debug" : "info"
+        @warning_history = []
+      end
+
+      def add_color(string, *color)
+        @shell.set_color(string, *color)
+      end
+
+      def info(msg, newline = nil)
+        tell_me(msg, nil, newline) if level("info")
+      end
+
+      def confirm(msg, newline = nil)
+        tell_me(msg, :green, newline) if level("confirm")
+      end
+
+      def warn(msg, newline = nil, color = :yellow)
+        return unless level("warn")
+        return if @warning_history.include? msg
+        @warning_history << msg
+
+        tell_err(msg, color, newline)
+      end
+
+      def error(msg, newline = nil, color = :red)
+        return unless level("error")
+        tell_err(msg, color, newline)
+      end
+
+      def debug(msg, newline = nil)
+        tell_me(msg, nil, newline) if debug?
+      end
+
+      def debug?
+        level("debug")
+      end
+
+      def quiet?
+        level("quiet")
+      end
+
+      def ask(msg)
+        @shell.ask(msg)
+      end
+
+      def yes?(msg)
+        @shell.yes?(msg)
+      end
+
+      def no?
+        @shell.no?(msg)
+      end
+
+      def level=(level)
+        raise ArgumentError unless LEVELS.include?(level.to_s)
+        @level = level.to_s
+      end
+
+      def level(name = nil)
+        return @level unless name
+        unless index = LEVELS.index(name)
+          raise "#{name.inspect} is not a valid level"
+        end
+        index <= LEVELS.index(@level)
+      end
+
+      def trace(e, newline = nil, force = false)
+        return unless debug? || force
+        msg = "#{e.class}: #{e.message}\n#{e.backtrace.join("\n  ")}"
+        tell_me(msg, nil, newline)
+      end
+
+      def silence(&blk)
+        with_level("silent", &blk)
+      end
+
+      def unprinted_warnings
+        []
+      end
+
+      private
+
+      # valimism
+      def tell_me(msg, color = nil, newline = nil)
+        msg = word_wrap(msg) if newline.is_a?(Hash) && newline[:wrap]
+        if newline.nil?
+          @shell.say(msg, color)
+        else
+          @shell.say(msg, color, newline)
+        end
+      end
+
+      def tell_err(message, color = nil, newline = nil)
+        return if @shell.send(:stderr).closed?
+
+        newline ||= message.to_s !~ /( |\t)\Z/
+        message = word_wrap(message) if newline.is_a?(Hash) && newline[:wrap]
+
+        color = nil if color && !$stderr.tty?
+
+        buffer = @shell.send(:prepare_message, message, *color)
+        buffer << "\n" if newline && !message.to_s.end_with?("\n")
+
+        @shell.send(:stderr).print(buffer)
+        @shell.send(:stderr).flush
+      end
+
+      def strip_leading_spaces(text)
+        spaces = text[/\A\s+/, 0]
+        spaces ? text.gsub(/#{spaces}/, "") : text
+      end
+
+      def word_wrap(text, line_width = @shell.terminal_width)
+        strip_leading_spaces(text).split("\n").collect do |line|
+          line.length > line_width ? line.gsub(/(.{1,#{line_width}})(\s+|$)/, "\\1\n").strip : line
+        end * "\n"
+      end
+
+      def with_level(level)
+        original = @level
+        @level = level
+        yield
+      ensure
+        @level = original
+      end
+    end
+  end
+end
diff --git a/lib/bundler/ui/silent.rb b/lib/bundler/ui/silent.rb
new file mode 100644
index 0000000000..dca1b2ac86
--- /dev/null
+++ b/lib/bundler/ui/silent.rb
@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+module Bundler
+  module UI
+    class Silent
+      attr_writer :shell
+
+      def initialize
+        @warnings = []
+      end
+
+      def add_color(string, color)
+        string
+      end
+
+      def info(message, newline = nil)
+      end
+
+      def confirm(message, newline = nil)
+      end
+
+      def warn(message, newline = nil)
+        @warnings |= [message]
+      end
+
+      def error(message, newline = nil)
+      end
+
+      def debug(message, newline = nil)
+      end
+
+      def debug?
+        false
+      end
+
+      def quiet?
+        false
+      end
+
+      def ask(message)
+      end
+
+      def yes?(msg)
+        raise "Cannot ask yes? with a silent shell"
+      end
+
+      def no?
+        raise "Cannot ask no? with a silent shell"
+      end
+
+      def level=(name)
+      end
+
+      def level(name = nil)
+      end
+
+      def trace(message, newline = nil, force = false)
+      end
+
+      def silence
+        yield
+      end
+
+      def unprinted_warnings
+        @warnings
+      end
+    end
+  end
+end
diff --git a/lib/bundler/uri_credentials_filter.rb b/lib/bundler/uri_credentials_filter.rb
new file mode 100644
index 0000000000..ccfaf0bc5d
--- /dev/null
+++ b/lib/bundler/uri_credentials_filter.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Bundler
+  module URICredentialsFilter
+    module_function
+
+    def credential_filtered_uri(uri_to_anonymize)
+      return uri_to_anonymize if uri_to_anonymize.nil?
+      uri = uri_to_anonymize.dup
+      if uri.is_a?(String)
+        return uri if File.exist?(uri)
+
+        require_relative "vendored_uri"
+        uri = Bundler::URI(uri)
+      end
+
+      if uri.userinfo
+        # oauth authentication
+        if uri.password == "x-oauth-basic" || uri.password == "x"
+          # URI as string does not display with password if no user is set
+          oauth_designation = uri.password
+          uri.user = oauth_designation
+        end
+        uri.password = nil
+      end
+      return uri.to_s if uri_to_anonymize.is_a?(String)
+      uri
+    rescue Bundler::URI::InvalidURIError # uri is not canonical uri scheme
+      uri
+    end
+
+    def credential_filtered_string(str_to_filter, uri)
+      return str_to_filter if uri.nil? || str_to_filter.nil?
+      str_with_no_credentials = str_to_filter.dup
+      anonymous_uri_str = credential_filtered_uri(uri).to_s
+      uri_str = uri.to_s
+      if anonymous_uri_str != uri_str
+        str_with_no_credentials = str_with_no_credentials.gsub(uri_str, anonymous_uri_str)
+      end
+      str_with_no_credentials
+    end
+  end
+end
diff --git a/lib/bundler/vendor/.document b/lib/bundler/vendor/.document
new file mode 100644
index 0000000000..0c43bbd6b3
--- /dev/null
+++ b/lib/bundler/vendor/.document
@@ -0,0 +1 @@
+# Vendored files do not need to be documented
diff --git a/lib/bundler/vendor/connection_pool/LICENSE b/lib/bundler/vendor/connection_pool/LICENSE
new file mode 100644
index 0000000000..7673cbfb7a
--- /dev/null
+++ b/lib/bundler/vendor/connection_pool/LICENSE
@@ -0,0 +1,20 @@
+Copyright (c) 2011 Mike Perham
+
+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.
diff --git a/lib/bundler/vendor/connection_pool/lib/connection_pool.rb b/lib/bundler/vendor/connection_pool/lib/connection_pool.rb
new file mode 100644
index 0000000000..984c1c3dcb
--- /dev/null
+++ b/lib/bundler/vendor/connection_pool/lib/connection_pool.rb
@@ -0,0 +1,126 @@
+require "timeout"
+require_relative "connection_pool/version"
+
+class Bundler::ConnectionPool
+  class Error < ::RuntimeError; end
+  class PoolShuttingDownError < ::Bundler::ConnectionPool::Error; end
+  class TimeoutError < ::Timeout::Error; end
+end
+
+# Generic connection pool class for sharing a limited number of objects or network connections
+# among many threads.  Note: pool elements are lazily created.
+#
+# Example usage with block (faster):
+#
+#    @pool = Bundler::ConnectionPool.new { Redis.new }
+#    @pool.with do |redis|
+#      redis.lpop('my-list') if redis.llen('my-list') > 0
+#    end
+#
+# Using optional timeout override (for that single invocation)
+#
+#    @pool.with(timeout: 2.0) do |redis|
+#      redis.lpop('my-list') if redis.llen('my-list') > 0
+#    end
+#
+# Example usage replacing an existing connection (slower):
+#
+#    $redis = Bundler::ConnectionPool.wrap { Redis.new }
+#
+#    def do_work
+#      $redis.lpop('my-list') if $redis.llen('my-list') > 0
+#    end
+#
+# Accepts the following options:
+# - :size - number of connections to pool, defaults to 5
+# - :timeout - amount of time to wait for a connection if none currently available, defaults to 5 seconds
+#
+class Bundler::ConnectionPool
+  DEFAULTS = {size: 5, timeout: 5}
+
+  def self.wrap(options, &block)
+    Wrapper.new(options, &block)
+  end
+
+  def initialize(options = {}, &block)
+    raise ArgumentError, "Connection pool requires a block" unless block
+
+    options = DEFAULTS.merge(options)
+
+    @size = Integer(options.fetch(:size))
+    @timeout = options.fetch(:timeout)
+
+    @available = TimedStack.new(@size, &block)
+    @key = :"pool-#{@available.object_id}"
+    @key_count = :"pool-#{@available.object_id}-count"
+  end
+
+  def with(options = {})
+    Thread.handle_interrupt(Exception => :never) do
+      conn = checkout(options)
+      begin
+        Thread.handle_interrupt(Exception => :immediate) do
+          yield conn
+        end
+      ensure
+        checkin
+      end
+    end
+  end
+  alias then with
+
+  def checkout(options = {})
+    if ::Thread.current[@key]
+      ::Thread.current[@key_count] += 1
+      ::Thread.current[@key]
+    else
+      ::Thread.current[@key_count] = 1
+      ::Thread.current[@key] = @available.pop(options[:timeout] || @timeout)
+    end
+  end
+
+  def checkin
+    if ::Thread.current[@key]
+      if ::Thread.current[@key_count] == 1
+        @available.push(::Thread.current[@key])
+        ::Thread.current[@key] = nil
+        ::Thread.current[@key_count] = nil
+      else
+        ::Thread.current[@key_count] -= 1
+      end
+    else
+      raise Bundler::ConnectionPool::Error, "no connections are checked out"
+    end
+
+    nil
+  end
+
+  ##
+  # Shuts down the Bundler::ConnectionPool by passing each connection to +block+ and
+  # then removing it from the pool. Attempting to checkout a connection after
+  # shutdown will raise +Bundler::ConnectionPool::PoolShuttingDownError+.
+
+  def shutdown(&block)
+    @available.shutdown(&block)
+  end
+
+  ##
+  # Reloads the Bundler::ConnectionPool by passing each connection to +block+ and then
+  # removing it the pool. Subsequent checkouts will create new connections as
+  # needed.
+
+  def reload(&block)
+    @available.shutdown(reload: true, &block)
+  end
+
+  # Size of this connection pool
+  attr_reader :size
+
+  # Number of pool entries available for checkout at this instant.
+  def available
+    @available.length
+  end
+end
+
+require_relative "connection_pool/timed_stack"
+require_relative "connection_pool/wrapper"
diff --git a/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb b/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb
new file mode 100644
index 0000000000..a7b1cf06a8
--- /dev/null
+++ b/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb
@@ -0,0 +1,174 @@
+##
+# The TimedStack manages a pool of homogeneous connections (or any resource
+# you wish to manage).  Connections are created lazily up to a given maximum
+# number.
+
+# Examples:
+#
+#    ts = TimedStack.new(1) { MyConnection.new }
+#
+#    # fetch a connection
+#    conn = ts.pop
+#
+#    # return a connection
+#    ts.push conn
+#
+#    conn = ts.pop
+#    ts.pop timeout: 5
+#    #=> raises Bundler::ConnectionPool::TimeoutError after 5 seconds
+
+class Bundler::ConnectionPool::TimedStack
+  attr_reader :max
+
+  ##
+  # Creates a new pool with +size+ connections that are created from the given
+  # +block+.
+
+  def initialize(size = 0, &block)
+    @create_block = block
+    @created = 0
+    @que = []
+    @max = size
+    @mutex = Thread::Mutex.new
+    @resource = Thread::ConditionVariable.new
+    @shutdown_block = nil
+  end
+
+  ##
+  # Returns +obj+ to the stack.  +options+ is ignored in TimedStack but may be
+  # used by subclasses that extend TimedStack.
+
+  def push(obj, options = {})
+    @mutex.synchronize do
+      if @shutdown_block
+        @shutdown_block.call(obj)
+      else
+        store_connection obj, options
+      end
+
+      @resource.broadcast
+    end
+  end
+  alias << push
+
+  ##
+  # Retrieves a connection from the stack.  If a connection is available it is
+  # immediately returned.  If no connection is available within the given
+  # timeout a Bundler::ConnectionPool::TimeoutError is raised.
+  #
+  # +:timeout+ is the only checked entry in +options+ and is preferred over
+  # the +timeout+ argument (which will be removed in a future release).  Other
+  # options may be used by subclasses that extend TimedStack.
+
+  def pop(timeout = 0.5, options = {})
+    options, timeout = timeout, 0.5 if Hash === timeout
+    timeout = options.fetch :timeout, timeout
+
+    deadline = current_time + timeout
+    @mutex.synchronize do
+      loop do
+        raise Bundler::ConnectionPool::PoolShuttingDownError if @shutdown_block
+        return fetch_connection(options) if connection_stored?(options)
+
+        connection = try_create(options)
+        return connection if connection
+
+        to_wait = deadline - current_time
+        raise Bundler::ConnectionPool::TimeoutError, "Waited #{timeout} sec" if to_wait <= 0
+        @resource.wait(@mutex, to_wait)
+      end
+    end
+  end
+
+  ##
+  # Shuts down the TimedStack by passing each connection to +block+ and then
+  # removing it from the pool. Attempting to checkout a connection after
+  # shutdown will raise +Bundler::ConnectionPool::PoolShuttingDownError+ unless
+  # +:reload+ is +true+.
+
+  def shutdown(reload: false, &block)
+    raise ArgumentError, "shutdown must receive a block" unless block_given?
+
+    @mutex.synchronize do
+      @shutdown_block = block
+      @resource.broadcast
+
+      shutdown_connections
+      @shutdown_block = nil if reload
+    end
+  end
+
+  ##
+  # Returns +true+ if there are no available connections.
+
+  def empty?
+    (@created - @que.length) >= @max
+  end
+
+  ##
+  # The number of connections available on the stack.
+
+  def length
+    @max - @created + @que.length
+  end
+
+  private
+
+  def current_time
+    Process.clock_gettime(Process::CLOCK_MONOTONIC)
+  end
+
+  ##
+  # This is an extension point for TimedStack and is called with a mutex.
+  #
+  # This method must returns true if a connection is available on the stack.
+
+  def connection_stored?(options = nil)
+    !@que.empty?
+  end
+
+  ##
+  # This is an extension point for TimedStack and is called with a mutex.
+  #
+  # This method must return a connection from the stack.
+
+  def fetch_connection(options = nil)
+    @que.pop
+  end
+
+  ##
+  # This is an extension point for TimedStack and is called with a mutex.
+  #
+  # This method must shut down all connections on the stack.
+
+  def shutdown_connections(options = nil)
+    while connection_stored?(options)
+      conn = fetch_connection(options)
+      @shutdown_block.call(conn)
+    end
+    @created = 0
+  end
+
+  ##
+  # This is an extension point for TimedStack and is called with a mutex.
+  #
+  # This method must return +obj+ to the stack.
+
+  def store_connection(obj, options = nil)
+    @que.push obj
+  end
+
+  ##
+  # This is an extension point for TimedStack and is called with a mutex.
+  #
+  # This method must create a connection if and only if the total number of
+  # connections allowed has not been met.
+
+  def try_create(options = nil)
+    unless @created == @max
+      object = @create_block.call
+      @created += 1
+      object
+    end
+  end
+end
diff --git a/lib/bundler/vendor/connection_pool/lib/connection_pool/version.rb b/lib/bundler/vendor/connection_pool/lib/connection_pool/version.rb
new file mode 100644
index 0000000000..56ebf69902
--- /dev/null
+++ b/lib/bundler/vendor/connection_pool/lib/connection_pool/version.rb
@@ -0,0 +1,3 @@
+class Bundler::ConnectionPool
+  VERSION = "2.3.0"
+end
diff --git a/lib/bundler/vendor/connection_pool/lib/connection_pool/wrapper.rb b/lib/bundler/vendor/connection_pool/lib/connection_pool/wrapper.rb
new file mode 100644
index 0000000000..880170c06b
--- /dev/null
+++ b/lib/bundler/vendor/connection_pool/lib/connection_pool/wrapper.rb
@@ -0,0 +1,57 @@
+class Bundler::ConnectionPool
+  class Wrapper < ::BasicObject
+    METHODS = [:with, :pool_shutdown, :wrapped_pool]
+
+    def initialize(options = {}, &block)
+      @pool = options.fetch(:pool) { ::Bundler::ConnectionPool.new(options, &block) }
+    end
+
+    def wrapped_pool
+      @pool
+    end
+
+    def with(&block)
+      @pool.with(&block)
+    end
+
+    def pool_shutdown(&block)
+      @pool.shutdown(&block)
+    end
+
+    def pool_size
+      @pool.size
+    end
+
+    def pool_available
+      @pool.available
+    end
+
+    def respond_to?(id, *args)
+      METHODS.include?(id) || with { |c| c.respond_to?(id, *args) }
+    end
+
+    # rubocop:disable Style/MethodMissingSuper
+    # rubocop:disable Style/MissingRespondToMissing
+    if ::RUBY_VERSION >= "3.0.0"
+      def method_missing(name, *args, **kwargs, &block)
+        with do |connection|
+          connection.send(name, *args, **kwargs, &block)
+        end
+      end
+    elsif ::RUBY_VERSION >= "2.7.0"
+      ruby2_keywords def method_missing(name, *args, &block)
+        with do |connection|
+          connection.send(name, *args, &block)
+        end
+      end
+    else
+      def method_missing(name, *args, &block)
+        with do |connection|
+          connection.send(name, *args, &block)
+        end
+      end
+    end
+    # rubocop:enable Style/MethodMissingSuper
+    # rubocop:enable Style/MissingRespondToMissing
+  end
+end
diff --git a/lib/bundler/vendor/fileutils/LICENSE.txt b/lib/bundler/vendor/fileutils/LICENSE.txt
new file mode 100644
index 0000000000..a009caefea
--- /dev/null
+++ b/lib/bundler/vendor/fileutils/LICENSE.txt
@@ -0,0 +1,22 @@
+Copyright (C) 1993-2013 Yukihiro Matsumoto. 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.
diff --git a/lib/bundler/vendor/fileutils/lib/fileutils.rb b/lib/bundler/vendor/fileutils/lib/fileutils.rb
new file mode 100644
index 0000000000..8f8faf30c8
--- /dev/null
+++ b/lib/bundler/vendor/fileutils/lib/fileutils.rb
@@ -0,0 +1,1764 @@
+# frozen_string_literal: true
+
+begin
+  require 'rbconfig'
+rescue LoadError
+  # for make mjit-headers
+end
+
+#
+# = fileutils.rb
+#
+# Copyright (c) 2000-2007 Minero Aoki
+#
+# This program is free software.
+# You can distribute/modify this program under the same terms of ruby.
+#
+# == module Bundler::FileUtils
+#
+# Namespace for several file utility methods for copying, moving, removing, etc.
+#
+# === Module Functions
+#
+#   require 'bundler/vendor/fileutils/lib/fileutils'
+#
+#   Bundler::FileUtils.cd(dir, **options)
+#   Bundler::FileUtils.cd(dir, **options) {|dir| block }
+#   Bundler::FileUtils.pwd()
+#   Bundler::FileUtils.mkdir(dir, **options)
+#   Bundler::FileUtils.mkdir(list, **options)
+#   Bundler::FileUtils.mkdir_p(dir, **options)
+#   Bundler::FileUtils.mkdir_p(list, **options)
+#   Bundler::FileUtils.rmdir(dir, **options)
+#   Bundler::FileUtils.rmdir(list, **options)
+#   Bundler::FileUtils.ln(target, link, **options)
+#   Bundler::FileUtils.ln(targets, dir, **options)
+#   Bundler::FileUtils.ln_s(target, link, **options)
+#   Bundler::FileUtils.ln_s(targets, dir, **options)
+#   Bundler::FileUtils.ln_sf(target, link, **options)
+#   Bundler::FileUtils.cp(src, dest, **options)
+#   Bundler::FileUtils.cp(list, dir, **options)
+#   Bundler::FileUtils.cp_r(src, dest, **options)
+#   Bundler::FileUtils.cp_r(list, dir, **options)
+#   Bundler::FileUtils.mv(src, dest, **options)
+#   Bundler::FileUtils.mv(list, dir, **options)
+#   Bundler::FileUtils.rm(list, **options)
+#   Bundler::FileUtils.rm_r(list, **options)
+#   Bundler::FileUtils.rm_rf(list, **options)
+#   Bundler::FileUtils.install(src, dest, **options)
+#   Bundler::FileUtils.chmod(mode, list, **options)
+#   Bundler::FileUtils.chmod_R(mode, list, **options)
+#   Bundler::FileUtils.chown(user, group, list, **options)
+#   Bundler::FileUtils.chown_R(user, group, list, **options)
+#   Bundler::FileUtils.touch(list, **options)
+#
+# Possible <tt>options</tt> are:
+#
+# <tt>:force</tt> :: forced operation (rewrite files if exist, remove
+#                    directories if not empty, etc.);
+# <tt>:verbose</tt> :: print command to be run, in bash syntax, before
+#                      performing it;
+# <tt>:preserve</tt> :: preserve object's group, user and modification
+#                       time on copying;
+# <tt>:noop</tt> :: no changes are made (usable in combination with
+#                   <tt>:verbose</tt> which will print the command to run)
+#
+# Each method documents the options that it honours. See also ::commands,
+# ::options and ::options_of methods to introspect which command have which
+# options.
+#
+# All methods that have the concept of a "source" file or directory can take
+# either one file or a list of files in that argument.  See the method
+# documentation for examples.
+#
+# There are some `low level' methods, which do not accept keyword arguments:
+#
+#   Bundler::FileUtils.copy_entry(src, dest, preserve = false, dereference_root = false, remove_destination = false)
+#   Bundler::FileUtils.copy_file(src, dest, preserve = false, dereference = true)
+#   Bundler::FileUtils.copy_stream(srcstream, deststream)
+#   Bundler::FileUtils.remove_entry(path, force = false)
+#   Bundler::FileUtils.remove_entry_secure(path, force = false)
+#   Bundler::FileUtils.remove_file(path, force = false)
+#   Bundler::FileUtils.compare_file(path_a, path_b)
+#   Bundler::FileUtils.compare_stream(stream_a, stream_b)
+#   Bundler::FileUtils.uptodate?(file, cmp_list)
+#
+# == module Bundler::FileUtils::Verbose
+#
+# This module has all methods of Bundler::FileUtils module, but it outputs messages
+# before acting.  This equates to passing the <tt>:verbose</tt> flag to methods
+# in Bundler::FileUtils.
+#
+# == module Bundler::FileUtils::NoWrite
+#
+# This module has all methods of Bundler::FileUtils module, but never changes
+# files/directories.  This equates to passing the <tt>:noop</tt> flag to methods
+# in Bundler::FileUtils.
+#
+# == module Bundler::FileUtils::DryRun
+#
+# This module has all methods of Bundler::FileUtils module, but never changes
+# files/directories.  This equates to passing the <tt>:noop</tt> and
+# <tt>:verbose</tt> flags to methods in Bundler::FileUtils.
+#
+module Bundler::FileUtils
+  VERSION = "1.4.1"
+
+  def self.private_module_function(name)   #:nodoc:
+    module_function name
+    private_class_method name
+  end
+
+  #
+  # Returns the name of the current directory.
+  #
+  def pwd
+    Dir.pwd
+  end
+  module_function :pwd
+
+  alias getwd pwd
+  module_function :getwd
+
+  #
+  # Changes the current directory to the directory +dir+.
+  #
+  # If this method is called with block, resumes to the previous
+  # working directory after the block execution has finished.
+  #
+  #   Bundler::FileUtils.cd('/')  # change directory
+  #
+  #   Bundler::FileUtils.cd('/', verbose: true)   # change directory and report it
+  #
+  #   Bundler::FileUtils.cd('/') do  # change directory
+  #     # ...               # do something
+  #   end                   # return to original directory
+  #
+  def cd(dir, verbose: nil, &block) # :yield: dir
+    fu_output_message "cd #{dir}" if verbose
+    result = Dir.chdir(dir, &block)
+    fu_output_message 'cd -' if verbose and block
+    result
+  end
+  module_function :cd
+
+  alias chdir cd
+  module_function :chdir
+
+  #
+  # Returns true if +new+ is newer than all +old_list+.
+  # Non-existent files are older than any file.
+  #
+  #   Bundler::FileUtils.uptodate?('hello.o', %w(hello.c hello.h)) or \
+  #       system 'make hello.o'
+  #
+  def uptodate?(new, old_list)
+    return false unless File.exist?(new)
+    new_time = File.mtime(new)
+    old_list.each do |old|
+      if File.exist?(old)
+        return false unless new_time > File.mtime(old)
+      end
+    end
+    true
+  end
+  module_function :uptodate?
+
+  def remove_trailing_slash(dir)   #:nodoc:
+    dir == '/' ? dir : dir.chomp(?/)
+  end
+  private_module_function :remove_trailing_slash
+
+  #
+  # Creates one or more directories.
+  #
+  #   Bundler::FileUtils.mkdir 'test'
+  #   Bundler::FileUtils.mkdir %w(tmp data)
+  #   Bundler::FileUtils.mkdir 'notexist', noop: true  # Does not really create.
+  #   Bundler::FileUtils.mkdir 'tmp', mode: 0700
+  #
+  def mkdir(list, mode: nil, noop: nil, verbose: nil)
+    list = fu_list(list)
+    fu_output_message "mkdir #{mode ? ('-m %03o ' % mode) : ''}#{list.join ' '}" if verbose
+    return if noop
+
+    list.each do |dir|
+      fu_mkdir dir, mode
+    end
+  end
+  module_function :mkdir
+
+  #
+  # Creates a directory and all its parent directories.
+  # For example,
+  #
+  #   Bundler::FileUtils.mkdir_p '/usr/local/lib/ruby'
+  #
+  # causes to make following directories, if they do not exist.
+  #
+  # * /usr
+  # * /usr/local
+  # * /usr/local/lib
+  # * /usr/local/lib/ruby
+  #
+  # You can pass several directories at a time in a list.
+  #
+  def mkdir_p(list, mode: nil, noop: nil, verbose: nil)
+    list = fu_list(list)
+    fu_output_message "mkdir -p #{mode ? ('-m %03o ' % mode) : ''}#{list.join ' '}" if verbose
+    return *list if noop
+
+    list.map {|path| remove_trailing_slash(path)}.each do |path|
+      # optimize for the most common case
+      begin
+        fu_mkdir path, mode
+        next
+      rescue SystemCallError
+        next if File.directory?(path)
+      end
+
+      stack = []
+      until path == stack.last   # dirname("/")=="/", dirname("C:/")=="C:/"
+        stack.push path
+        path = File.dirname(path)
+      end
+      stack.pop                 # root directory should exist
+      stack.reverse_each do |dir|
+        begin
+          fu_mkdir dir, mode
+        rescue SystemCallError
+          raise unless File.directory?(dir)
+        end
+      end
+    end
+
+    return *list
+  end
+  module_function :mkdir_p
+
+  alias mkpath    mkdir_p
+  alias makedirs  mkdir_p
+  module_function :mkpath
+  module_function :makedirs
+
+  def fu_mkdir(path, mode)   #:nodoc:
+    path = remove_trailing_slash(path)
+    if mode
+      Dir.mkdir path, mode
+      File.chmod mode, path
+    else
+      Dir.mkdir path
+    end
+  end
+  private_module_function :fu_mkdir
+
+  #
+  # Removes one or more directories.
+  #
+  #   Bundler::FileUtils.rmdir 'somedir'
+  #   Bundler::FileUtils.rmdir %w(somedir anydir otherdir)
+  #   # Does not really remove directory; outputs message.
+  #   Bundler::FileUtils.rmdir 'somedir', verbose: true, noop: true
+  #
+  def rmdir(list, parents: nil, noop: nil, verbose: nil)
+    list = fu_list(list)
+    fu_output_message "rmdir #{parents ? '-p ' : ''}#{list.join ' '}" if verbose
+    return if noop
+    list.each do |dir|
+      Dir.rmdir(dir = remove_trailing_slash(dir))
+      if parents
+        begin
+          until (parent = File.dirname(dir)) == '.' or parent == dir
+            dir = parent
+            Dir.rmdir(dir)
+          end
+        rescue Errno::ENOTEMPTY, Errno::EEXIST, Errno::ENOENT
+        end
+      end
+    end
+  end
+  module_function :rmdir
+
+  #
+  # :call-seq:
+  #   Bundler::FileUtils.ln(target, link, force: nil, noop: nil, verbose: nil)
+  #   Bundler::FileUtils.ln(target,  dir, force: nil, noop: nil, verbose: nil)
+  #   Bundler::FileUtils.ln(targets, dir, force: nil, noop: nil, verbose: nil)
+  #
+  # In the first form, creates a hard link +link+ which points to +target+.
+  # If +link+ already exists, raises Errno::EEXIST.
+  # But if the +force+ option is set, overwrites +link+.
+  #
+  #   Bundler::FileUtils.ln 'gcc', 'cc', verbose: true
+  #   Bundler::FileUtils.ln '/usr/bin/emacs21', '/usr/bin/emacs'
+  #
+  # In the second form, creates a link +dir/target+ pointing to +target+.
+  # In the third form, creates several hard links in the directory +dir+,
+  # pointing to each item in +targets+.
+  # If +dir+ is not a directory, raises Errno::ENOTDIR.
+  #
+  #   Bundler::FileUtils.cd '/sbin'
+  #   Bundler::FileUtils.ln %w(cp mv mkdir), '/bin'   # Now /sbin/cp and /bin/cp are linked.
+  #
+  def ln(src, dest, force: nil, noop: nil, verbose: nil)
+    fu_output_message "ln#{force ? ' -f' : ''} #{[src,dest].flatten.join ' '}" if verbose
+    return if noop
+    fu_each_src_dest0(src, dest) do |s,d|
+      remove_file d, true if force
+      File.link s, d
+    end
+  end
+  module_function :ln
+
+  alias link ln
+  module_function :link
+
+  #
+  # Hard link +src+ to +dest+. If +src+ is a directory, this method links
+  # all its contents recursively. If +dest+ is a directory, links
+  # +src+ to +dest/src+.
+  #
+  # +src+ can be a list of files.
+  #
+  # If +dereference_root+ is true, this method dereference tree root.
+  #
+  # If +remove_destination+ is true, this method removes each destination file before copy.
+  #
+  #   Bundler::FileUtils.rm_r site_ruby + '/mylib', force: true
+  #   Bundler::FileUtils.cp_lr 'lib/', site_ruby + '/mylib'
+  #
+  #   # Examples of linking several files to target directory.
+  #   Bundler::FileUtils.cp_lr %w(mail.rb field.rb debug/), site_ruby + '/tmail'
+  #   Bundler::FileUtils.cp_lr Dir.glob('*.rb'), '/home/aamine/lib/ruby', noop: true, verbose: true
+  #
+  #   # If you want to link all contents of a directory instead of the
+  #   # directory itself, c.f. src/x -> dest/x, src/y -> dest/y,
+  #   # use the following code.
+  #   Bundler::FileUtils.cp_lr 'src/.', 'dest'  # cp_lr('src', 'dest') makes dest/src, but this doesn't.
+  #
+  def cp_lr(src, dest, noop: nil, verbose: nil,
+            dereference_root: true, remove_destination: false)
+    fu_output_message "cp -lr#{remove_destination ? ' --remove-destination' : ''} #{[src,dest].flatten.join ' '}" if verbose
+    return if noop
+    fu_each_src_dest(src, dest) do |s, d|
+      link_entry s, d, dereference_root, remove_destination
+    end
+  end
+  module_function :cp_lr
+
+  #
+  # :call-seq:
+  #   Bundler::FileUtils.ln_s(target, link, force: nil, noop: nil, verbose: nil)
+  #   Bundler::FileUtils.ln_s(target,  dir, force: nil, noop: nil, verbose: nil)
+  #   Bundler::FileUtils.ln_s(targets, dir, force: nil, noop: nil, verbose: nil)
+  #
+  # In the first form, creates a symbolic link +link+ which points to +target+.
+  # If +link+ already exists, raises Errno::EEXIST.
+  # But if the <tt>force</tt> option is set, overwrites +link+.
+  #
+  #   Bundler::FileUtils.ln_s '/usr/bin/ruby', '/usr/local/bin/ruby'
+  #   Bundler::FileUtils.ln_s 'verylongsourcefilename.c', 'c', force: true
+  #
+  # In the second form, creates a link +dir/target+ pointing to +target+.
+  # In the third form, creates several symbolic links in the directory +dir+,
+  # pointing to each item in +targets+.
+  # If +dir+ is not a directory, raises Errno::ENOTDIR.
+  #
+  #   Bundler::FileUtils.ln_s Dir.glob('/bin/*.rb'), '/home/foo/bin'
+  #
+  def ln_s(src, dest, force: nil, noop: nil, verbose: nil)
+    fu_output_message "ln -s#{force ? 'f' : ''} #{[src,dest].flatten.join ' '}" if verbose
+    return if noop
+    fu_each_src_dest0(src, dest) do |s,d|
+      remove_file d, true if force
+      File.symlink s, d
+    end
+  end
+  module_function :ln_s
+
+  alias symlink ln_s
+  module_function :symlink
+
+  #
+  # :call-seq:
+  #   Bundler::FileUtils.ln_sf(*args)
+  #
+  # Same as
+  #
+  #   Bundler::FileUtils.ln_s(*args, force: true)
+  #
+  def ln_sf(src, dest, noop: nil, verbose: nil)
+    ln_s src, dest, force: true, noop: noop, verbose: verbose
+  end
+  module_function :ln_sf
+
+  #
+  # Hard links a file system entry +src+ to +dest+.
+  # If +src+ is a directory, this method links its contents recursively.
+  #
+  # Both of +src+ and +dest+ must be a path name.
+  # +src+ must exist, +dest+ must not exist.
+  #
+  # If +dereference_root+ is true, this method dereferences the tree root.
+  #
+  # If +remove_destination+ is true, this method removes each destination file before copy.
+  #
+  def link_entry(src, dest, dereference_root = false, remove_destination = false)
+    Entry_.new(src, nil, dereference_root).traverse do |ent|
+      destent = Entry_.new(dest, ent.rel, false)
+      File.unlink destent.path if remove_destination && File.file?(destent.path)
+      ent.link destent.path
+    end
+  end
+  module_function :link_entry
+
+  #
+  # Copies a file content +src+ to +dest+.  If +dest+ is a directory,
+  # copies +src+ to +dest/src+.
+  #
+  # If +src+ is a list of files, then +dest+ must be a directory.
+  #
+  #   Bundler::FileUtils.cp 'eval.c', 'eval.c.org'
+  #   Bundler::FileUtils.cp %w(cgi.rb complex.rb date.rb), '/usr/lib/ruby/1.6'
+  #   Bundler::FileUtils.cp %w(cgi.rb complex.rb date.rb), '/usr/lib/ruby/1.6', verbose: true
+  #   Bundler::FileUtils.cp 'symlink', 'dest'   # copy content, "dest" is not a symlink
+  #
+  def cp(src, dest, preserve: nil, noop: nil, verbose: nil)
+    fu_output_message "cp#{preserve ? ' -p' : ''} #{[src,dest].flatten.join ' '}" if verbose
+    return if noop
+    fu_each_src_dest(src, dest) do |s, d|
+      copy_file s, d, preserve
+    end
+  end
+  module_function :cp
+
+  alias copy cp
+  module_function :copy
+
+  #
+  # Copies +src+ to +dest+. If +src+ is a directory, this method copies
+  # all its contents recursively. If +dest+ is a directory, copies
+  # +src+ to +dest/src+.
+  #
+  # +src+ can be a list of files.
+  #
+  # If +dereference_root+ is true, this method dereference tree root.
+  #
+  # If +remove_destination+ is true, this method removes each destination file before copy.
+  #
+  #   # Installing Ruby library "mylib" under the site_ruby
+  #   Bundler::FileUtils.rm_r site_ruby + '/mylib', force: true
+  #   Bundler::FileUtils.cp_r 'lib/', site_ruby + '/mylib'
+  #
+  #   # Examples of copying several files to target directory.
+  #   Bundler::FileUtils.cp_r %w(mail.rb field.rb debug/), site_ruby + '/tmail'
+  #   Bundler::FileUtils.cp_r Dir.glob('*.rb'), '/home/foo/lib/ruby', noop: true, verbose: true
+  #
+  #   # If you want to copy all contents of a directory instead of the
+  #   # directory itself, c.f. src/x -> dest/x, src/y -> dest/y,
+  #   # use following code.
+  #   Bundler::FileUtils.cp_r 'src/.', 'dest'     # cp_r('src', 'dest') makes dest/src,
+  #                                      # but this doesn't.
+  #
+  def cp_r(src, dest, preserve: nil, noop: nil, verbose: nil,
+           dereference_root: true, remove_destination: nil)
+    fu_output_message "cp -r#{preserve ? 'p' : ''}#{remove_destination ? ' --remove-destination' : ''} #{[src,dest].flatten.join ' '}" if verbose
+    return if noop
+    fu_each_src_dest(src, dest) do |s, d|
+      copy_entry s, d, preserve, dereference_root, remove_destination
+    end
+  end
+  module_function :cp_r
+
+  #
+  # Copies a file system entry +src+ to +dest+.
+  # If +src+ is a directory, this method copies its contents recursively.
+  # This method preserves file types, c.f. symlink, directory...
+  # (FIFO, device files and etc. are not supported yet)
+  #
+  # Both of +src+ and +dest+ must be a path name.
+  # +src+ must exist, +dest+ must not exist.
+  #
+  # If +preserve+ is true, this method preserves owner, group, and
+  # modified time.  Permissions are copied regardless +preserve+.
+  #
+  # If +dereference_root+ is true, this method dereference tree root.
+  #
+  # If +remove_destination+ is true, this method removes each destination file before copy.
+  #
+  def copy_entry(src, dest, preserve = false, dereference_root = false, remove_destination = false)
+    if dereference_root
+      src = File.realpath(src)
+    end
+
+    Entry_.new(src, nil, false).wrap_traverse(proc do |ent|
+      destent = Entry_.new(dest, ent.rel, false)
+      File.unlink destent.path if remove_destination && (File.file?(destent.path) || File.symlink?(destent.path))
+      ent.copy destent.path
+    end, proc do |ent|
+      destent = Entry_.new(dest, ent.rel, false)
+      ent.copy_metadata destent.path if preserve
+    end)
+  end
+  module_function :copy_entry
+
+  #
+  # Copies file contents of +src+ to +dest+.
+  # Both of +src+ and +dest+ must be a path name.
+  #
+  def copy_file(src, dest, preserve = false, dereference = true)
+    ent = Entry_.new(src, nil, dereference)
+    ent.copy_file dest
+    ent.copy_metadata dest if preserve
+  end
+  module_function :copy_file
+
+  #
+  # Copies stream +src+ to +dest+.
+  # +src+ must respond to #read(n) and
+  # +dest+ must respond to #write(str).
+  #
+  def copy_stream(src, dest)
+    IO.copy_stream(src, dest)
+  end
+  module_function :copy_stream
+
+  #
+  # Moves file(s) +src+ to +dest+.  If +file+ and +dest+ exist on the different
+  # disk partition, the file is copied then the original file is removed.
+  #
+  #   Bundler::FileUtils.mv 'badname.rb', 'goodname.rb'
+  #   Bundler::FileUtils.mv 'stuff.rb', '/notexist/lib/ruby', force: true  # no error
+  #
+  #   Bundler::FileUtils.mv %w(junk.txt dust.txt), '/home/foo/.trash/'
+  #   Bundler::FileUtils.mv Dir.glob('test*.rb'), 'test', noop: true, verbose: true
+  #
+  def mv(src, dest, force: nil, noop: nil, verbose: nil, secure: nil)
+    fu_output_message "mv#{force ? ' -f' : ''} #{[src,dest].flatten.join ' '}" if verbose
+    return if noop
+    fu_each_src_dest(src, dest) do |s, d|
+      destent = Entry_.new(d, nil, true)
+      begin
+        if destent.exist?
+          if destent.directory?
+            raise Errno::EEXIST, d
+          end
+        end
+        begin
+          File.rename s, d
+        rescue Errno::EXDEV,
+               Errno::EPERM # move from unencrypted to encrypted dir (ext4)
+          copy_entry s, d, true
+          if secure
+            remove_entry_secure s, force
+          else
+            remove_entry s, force
+          end
+        end
+      rescue SystemCallError
+        raise unless force
+      end
+    end
+  end
+  module_function :mv
+
+  alias move mv
+  module_function :move
+
+  #
+  # Remove file(s) specified in +list+.  This method cannot remove directories.
+  # All StandardErrors are ignored when the :force option is set.
+  #
+  #   Bundler::FileUtils.rm %w( junk.txt dust.txt )
+  #   Bundler::FileUtils.rm Dir.glob('*.so')
+  #   Bundler::FileUtils.rm 'NotExistFile', force: true   # never raises exception
+  #
+  def rm(list, force: nil, noop: nil, verbose: nil)
+    list = fu_list(list)
+    fu_output_message "rm#{force ? ' -f' : ''} #{list.join ' '}" if verbose
+    return if noop
+
+    list.each do |path|
+      remove_file path, force
+    end
+  end
+  module_function :rm
+
+  alias remove rm
+  module_function :remove
+
+  #
+  # Equivalent to
+  #
+  #   Bundler::FileUtils.rm(list, force: true)
+  #
+  def rm_f(list, noop: nil, verbose: nil)
+    rm list, force: true, noop: noop, verbose: verbose
+  end
+  module_function :rm_f
+
+  alias safe_unlink rm_f
+  module_function :safe_unlink
+
+  #
+  # remove files +list+[0] +list+[1]... If +list+[n] is a directory,
+  # removes its all contents recursively. This method ignores
+  # StandardError when :force option is set.
+  #
+  #   Bundler::FileUtils.rm_r Dir.glob('/tmp/*')
+  #   Bundler::FileUtils.rm_r 'some_dir', force: true
+  #
+  # WARNING: This method causes local vulnerability
+  # if one of parent directories or removing directory tree are world
+  # writable (including /tmp, whose permission is 1777), and the current
+  # process has strong privilege such as Unix super user (root), and the
+  # system has symbolic link.  For secure removing, read the documentation
+  # of remove_entry_secure carefully, and set :secure option to true.
+  # Default is <tt>secure: false</tt>.
+  #
+  # NOTE: This method calls remove_entry_secure if :secure option is set.
+  # See also remove_entry_secure.
+  #
+  def rm_r(list, force: nil, noop: nil, verbose: nil, secure: nil)
+    list = fu_list(list)
+    fu_output_message "rm -r#{force ? 'f' : ''} #{list.join ' '}" if verbose
+    return if noop
+    list.each do |path|
+      if secure
+        remove_entry_secure path, force
+      else
+        remove_entry path, force
+      end
+    end
+  end
+  module_function :rm_r
+
+  #
+  # Equivalent to
+  #
+  #   Bundler::FileUtils.rm_r(list, force: true)
+  #
+  # WARNING: This method causes local vulnerability.
+  # Read the documentation of rm_r first.
+  #
+  def rm_rf(list, noop: nil, verbose: nil, secure: nil)
+    rm_r list, force: true, noop: noop, verbose: verbose, secure: secure
+  end
+  module_function :rm_rf
+
+  alias rmtree rm_rf
+  module_function :rmtree
+
+  #
+  # This method removes a file system entry +path+.  +path+ shall be a
+  # regular file, a directory, or something.  If +path+ is a directory,
+  # remove it recursively.  This method is required to avoid TOCTTOU
+  # (time-of-check-to-time-of-use) local security vulnerability of rm_r.
+  # #rm_r causes security hole when:
+  #
+  # * Parent directory is world writable (including /tmp).
+  # * Removing directory tree includes world writable directory.
+  # * The system has symbolic link.
+  #
+  # To avoid this security hole, this method applies special preprocess.
+  # If +path+ is a directory, this method chown(2) and chmod(2) all
+  # removing directories.  This requires the current process is the
+  # owner of the removing whole directory tree, or is the super user (root).
+  #
+  # WARNING: You must ensure that *ALL* parent directories cannot be
+  # moved by other untrusted users.  For example, parent directories
+  # should not be owned by untrusted users, and should not be world
+  # writable except when the sticky bit set.
+  #
+  # WARNING: Only the owner of the removing directory tree, or Unix super
+  # user (root) should invoke this method.  Otherwise this method does not
+  # work.
+  #
+  # For details of this security vulnerability, see Perl's case:
+  #
+  # * https://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2005-0448
+  # * https://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0452
+  #
+  # For fileutils.rb, this vulnerability is reported in [ruby-dev:26100].
+  #
+  def remove_entry_secure(path, force = false)
+    unless fu_have_symlink?
+      remove_entry path, force
+      return
+    end
+    fullpath = File.expand_path(path)
+    st = File.lstat(fullpath)
+    unless st.directory?
+      File.unlink fullpath
+      return
+    end
+    # is a directory.
+    parent_st = File.stat(File.dirname(fullpath))
+    unless parent_st.world_writable?
+      remove_entry path, force
+      return
+    end
+    unless parent_st.sticky?
+      raise ArgumentError, "parent directory is world writable, Bundler::FileUtils#remove_entry_secure does not work; abort: #{path.inspect} (parent directory mode #{'%o' % parent_st.mode})"
+    end
+
+    # freeze tree root
+    euid = Process.euid
+    dot_file = fullpath + "/."
+    begin
+      File.open(dot_file) {|f|
+        unless fu_stat_identical_entry?(st, f.stat)
+          # symlink (TOC-to-TOU attack?)
+          File.unlink fullpath
+          return
+        end
+        f.chown euid, -1
+        f.chmod 0700
+      }
+    rescue Errno::EISDIR # JRuby in non-native mode can't open files as dirs
+      File.lstat(dot_file).tap {|fstat|
+        unless fu_stat_identical_entry?(st, fstat)
+          # symlink (TOC-to-TOU attack?)
+          File.unlink fullpath
+          return
+        end
+        File.chown euid, -1, dot_file
+        File.chmod 0700, dot_file
+      }
+    end
+
+    unless fu_stat_identical_entry?(st, File.lstat(fullpath))
+      # TOC-to-TOU attack?
+      File.unlink fullpath
+      return
+    end
+
+    # ---- tree root is frozen ----
+    root = Entry_.new(path)
+    root.preorder_traverse do |ent|
+      if ent.directory?
+        ent.chown euid, -1
+        ent.chmod 0700
+      end
+    end
+    root.postorder_traverse do |ent|
+      begin
+        ent.remove
+      rescue
+        raise unless force
+      end
+    end
+  rescue
+    raise unless force
+  end
+  module_function :remove_entry_secure
+
+  def fu_have_symlink?   #:nodoc:
+    File.symlink nil, nil
+  rescue NotImplementedError
+    return false
+  rescue TypeError
+    return true
+  end
+  private_module_function :fu_have_symlink?
+
+  def fu_stat_identical_entry?(a, b)   #:nodoc:
+    a.dev == b.dev and a.ino == b.ino
+  end
+  private_module_function :fu_stat_identical_entry?
+
+  #
+  # This method removes a file system entry +path+.
+  # +path+ might be a regular file, a directory, or something.
+  # If +path+ is a directory, remove it recursively.
+  #
+  # See also remove_entry_secure.
+  #
+  def remove_entry(path, force = false)
+    Entry_.new(path).postorder_traverse do |ent|
+      begin
+        ent.remove
+      rescue
+        raise unless force
+      end
+    end
+  rescue
+    raise unless force
+  end
+  module_function :remove_entry
+
+  #
+  # Removes a file +path+.
+  # This method ignores StandardError if +force+ is true.
+  #
+  def remove_file(path, force = false)
+    Entry_.new(path).remove_file
+  rescue
+    raise unless force
+  end
+  module_function :remove_file
+
+  #
+  # Removes a directory +dir+ and its contents recursively.
+  # This method ignores StandardError if +force+ is true.
+  #
+  def remove_dir(path, force = false)
+    remove_entry path, force   # FIXME?? check if it is a directory
+  end
+  module_function :remove_dir
+
+  #
+  # Returns true if the contents of a file +a+ and a file +b+ are identical.
+  #
+  #   Bundler::FileUtils.compare_file('somefile', 'somefile')       #=> true
+  #   Bundler::FileUtils.compare_file('/dev/null', '/dev/urandom')  #=> false
+  #
+  def compare_file(a, b)
+    return false unless File.size(a) == File.size(b)
+    File.open(a, 'rb') {|fa|
+      File.open(b, 'rb') {|fb|
+        return compare_stream(fa, fb)
+      }
+    }
+  end
+  module_function :compare_file
+
+  alias identical? compare_file
+  alias cmp compare_file
+  module_function :identical?
+  module_function :cmp
+
+  #
+  # Returns true if the contents of a stream +a+ and +b+ are identical.
+  #
+  def compare_stream(a, b)
+    bsize = fu_stream_blksize(a, b)
+
+    if RUBY_VERSION > "2.4"
+      sa = String.new(capacity: bsize)
+      sb = String.new(capacity: bsize)
+    else
+      sa = String.new
+      sb = String.new
+    end
+
+    begin
+      a.read(bsize, sa)
+      b.read(bsize, sb)
+      return true if sa.empty? && sb.empty?
+    end while sa == sb
+    false
+  end
+  module_function :compare_stream
+
+  #
+  # If +src+ is not same as +dest+, copies it and changes the permission
+  # mode to +mode+.  If +dest+ is a directory, destination is +dest+/+src+.
+  # This method removes destination before copy.
+  #
+  #   Bundler::FileUtils.install 'ruby', '/usr/local/bin/ruby', mode: 0755, verbose: true
+  #   Bundler::FileUtils.install 'lib.rb', '/usr/local/lib/ruby/site_ruby', verbose: true
+  #
+  def install(src, dest, mode: nil, owner: nil, group: nil, preserve: nil,
+              noop: nil, verbose: nil)
+    if verbose
+      msg = +"install -c"
+      msg << ' -p' if preserve
+      msg << ' -m ' << mode_to_s(mode) if mode
+      msg << " -o #{owner}" if owner
+      msg << " -g #{group}" if group
+      msg << ' ' << [src,dest].flatten.join(' ')
+      fu_output_message msg
+    end
+    return if noop
+    uid = fu_get_uid(owner)
+    gid = fu_get_gid(group)
+    fu_each_src_dest(src, dest) do |s, d|
+      st = File.stat(s)
+      unless File.exist?(d) and compare_file(s, d)
+        remove_file d, true
+        copy_file s, d
+        File.utime st.atime, st.mtime, d if preserve
+        File.chmod fu_mode(mode, st), d if mode
+        File.chown uid, gid, d if uid or gid
+      end
+    end
+  end
+  module_function :install
+
+  def user_mask(target)  #:nodoc:
+    target.each_char.inject(0) do |mask, chr|
+      case chr
+      when "u"
+        mask | 04700
+      when "g"
+        mask | 02070
+      when "o"
+        mask | 01007
+      when "a"
+        mask | 07777
+      else
+        raise ArgumentError, "invalid `who' symbol in file mode: #{chr}"
+      end
+    end
+  end
+  private_module_function :user_mask
+
+  def apply_mask(mode, user_mask, op, mode_mask)   #:nodoc:
+    case op
+    when '='
+      (mode & ~user_mask) | (user_mask & mode_mask)
+    when '+'
+      mode | (user_mask & mode_mask)
+    when '-'
+      mode & ~(user_mask & mode_mask)
+    end
+  end
+  private_module_function :apply_mask
+
+  def symbolic_modes_to_i(mode_sym, path)  #:nodoc:
+    mode = if File::Stat === path
+             path.mode
+           else
+             File.stat(path).mode
+           end
+    mode_sym.split(/,/).inject(mode & 07777) do |current_mode, clause|
+      target, *actions = clause.split(/([=+-])/)
+      raise ArgumentError, "invalid file mode: #{mode_sym}" if actions.empty?
+      target = 'a' if target.empty?
+      user_mask = user_mask(target)
+      actions.each_slice(2) do |op, perm|
+        need_apply = op == '='
+        mode_mask = (perm || '').each_char.inject(0) do |mask, chr|
+          case chr
+          when "r"
+            mask | 0444
+          when "w"
+            mask | 0222
+          when "x"
+            mask | 0111
+          when "X"
+            if FileTest.directory? path
+              mask | 0111
+            else
+              mask
+            end
+          when "s"
+            mask | 06000
+          when "t"
+            mask | 01000
+          when "u", "g", "o"
+            if mask.nonzero?
+              current_mode = apply_mask(current_mode, user_mask, op, mask)
+            end
+            need_apply = false
+            copy_mask = user_mask(chr)
+            (current_mode & copy_mask) / (copy_mask & 0111) * (user_mask & 0111)
+          else
+            raise ArgumentError, "invalid `perm' symbol in file mode: #{chr}"
+          end
+        end
+
+        if mode_mask.nonzero? || need_apply
+          current_mode = apply_mask(current_mode, user_mask, op, mode_mask)
+        end
+      end
+      current_mode
+    end
+  end
+  private_module_function :symbolic_modes_to_i
+
+  def fu_mode(mode, path)  #:nodoc:
+    mode.is_a?(String) ? symbolic_modes_to_i(mode, path) : mode
+  end
+  private_module_function :fu_mode
+
+  def mode_to_s(mode)  #:nodoc:
+    mode.is_a?(String) ? mode : "%o" % mode
+  end
+  private_module_function :mode_to_s
+
+  #
+  # Changes permission bits on the named files (in +list+) to the bit pattern
+  # represented by +mode+.
+  #
+  # +mode+ is the symbolic and absolute mode can be used.
+  #
+  # Absolute mode is
+  #   Bundler::FileUtils.chmod 0755, 'somecommand'
+  #   Bundler::FileUtils.chmod 0644, %w(my.rb your.rb his.rb her.rb)
+  #   Bundler::FileUtils.chmod 0755, '/usr/bin/ruby', verbose: true
+  #
+  # Symbolic mode is
+  #   Bundler::FileUtils.chmod "u=wrx,go=rx", 'somecommand'
+  #   Bundler::FileUtils.chmod "u=wr,go=rr", %w(my.rb your.rb his.rb her.rb)
+  #   Bundler::FileUtils.chmod "u=wrx,go=rx", '/usr/bin/ruby', verbose: true
+  #
+  # "a" :: is user, group, other mask.
+  # "u" :: is user's mask.
+  # "g" :: is group's mask.
+  # "o" :: is other's mask.
+  # "w" :: is write permission.
+  # "r" :: is read permission.
+  # "x" :: is execute permission.
+  # "X" ::
+  #   is execute permission for directories only, must be used in conjunction with "+"
+  # "s" :: is uid, gid.
+  # "t" :: is sticky bit.
+  # "+" :: is added to a class given the specified mode.
+  # "-" :: Is removed from a given class given mode.
+  # "=" :: Is the exact nature of the class will be given a specified mode.
+
+  def chmod(mode, list, noop: nil, verbose: nil)
+    list = fu_list(list)
+    fu_output_message sprintf('chmod %s %s', mode_to_s(mode), list.join(' ')) if verbose
+    return if noop
+    list.each do |path|
+      Entry_.new(path).chmod(fu_mode(mode, path))
+    end
+  end
+  module_function :chmod
+
+  #
+  # Changes permission bits on the named files (in +list+)
+  # to the bit pattern represented by +mode+.
+  #
+  #   Bundler::FileUtils.chmod_R 0700, "/tmp/app.#{$$}"
+  #   Bundler::FileUtils.chmod_R "u=wrx", "/tmp/app.#{$$}"
+  #
+  def chmod_R(mode, list, noop: nil, verbose: nil, force: nil)
+    list = fu_list(list)
+    fu_output_message sprintf('chmod -R%s %s %s',
+                              (force ? 'f' : ''),
+                              mode_to_s(mode), list.join(' ')) if verbose
+    return if noop
+    list.each do |root|
+      Entry_.new(root).traverse do |ent|
+        begin
+          ent.chmod(fu_mode(mode, ent.path))
+        rescue
+          raise unless force
+        end
+      end
+    end
+  end
+  module_function :chmod_R
+
+  #
+  # Changes owner and group on the named files (in +list+)
+  # to the user +user+ and the group +group+.  +user+ and +group+
+  # may be an ID (Integer/String) or a name (String).
+  # If +user+ or +group+ is nil, this method does not change
+  # the attribute.
+  #
+  #   Bundler::FileUtils.chown 'root', 'staff', '/usr/local/bin/ruby'
+  #   Bundler::FileUtils.chown nil, 'bin', Dir.glob('/usr/bin/*'), verbose: true
+  #
+  def chown(user, group, list, noop: nil, verbose: nil)
+    list = fu_list(list)
+    fu_output_message sprintf('chown %s %s',
+                              (group ? "#{user}:#{group}" : user || ':'),
+                              list.join(' ')) if verbose
+    return if noop
+    uid = fu_get_uid(user)
+    gid = fu_get_gid(group)
+    list.each do |path|
+      Entry_.new(path).chown uid, gid
+    end
+  end
+  module_function :chown
+
+  #
+  # Changes owner and group on the named files (in +list+)
+  # to the user +user+ and the group +group+ recursively.
+  # +user+ and +group+ may be an ID (Integer/String) or
+  # a name (String).  If +user+ or +group+ is nil, this
+  # method does not change the attribute.
+  #
+  #   Bundler::FileUtils.chown_R 'www', 'www', '/var/www/htdocs'
+  #   Bundler::FileUtils.chown_R 'cvs', 'cvs', '/var/cvs', verbose: true
+  #
+  def chown_R(user, group, list, noop: nil, verbose: nil, force: nil)
+    list = fu_list(list)
+    fu_output_message sprintf('chown -R%s %s %s',
+                              (force ? 'f' : ''),
+                              (group ? "#{user}:#{group}" : user || ':'),
+                              list.join(' ')) if verbose
+    return if noop
+    uid = fu_get_uid(user)
+    gid = fu_get_gid(group)
+    list.each do |root|
+      Entry_.new(root).traverse do |ent|
+        begin
+          ent.chown uid, gid
+        rescue
+          raise unless force
+        end
+      end
+    end
+  end
+  module_function :chown_R
+
+  def fu_get_uid(user)   #:nodoc:
+    return nil unless user
+    case user
+    when Integer
+      user
+    when /\A\d+\z/
+      user.to_i
+    else
+      require 'etc'
+      Etc.getpwnam(user) ? Etc.getpwnam(user).uid : nil
+    end
+  end
+  private_module_function :fu_get_uid
+
+  def fu_get_gid(group)   #:nodoc:
+    return nil unless group
+    case group
+    when Integer
+      group
+    when /\A\d+\z/
+      group.to_i
+    else
+      require 'etc'
+      Etc.getgrnam(group) ? Etc.getgrnam(group).gid : nil
+    end
+  end
+  private_module_function :fu_get_gid
+
+  #
+  # Updates modification time (mtime) and access time (atime) of file(s) in
+  # +list+.  Files are created if they don't exist.
+  #
+  #   Bundler::FileUtils.touch 'timestamp'
+  #   Bundler::FileUtils.touch Dir.glob('*.c');  system 'make'
+  #
+  def touch(list, noop: nil, verbose: nil, mtime: nil, nocreate: nil)
+    list = fu_list(list)
+    t = mtime
+    if verbose
+      fu_output_message "touch #{nocreate ? '-c ' : ''}#{t ? t.strftime('-t %Y%m%d%H%M.%S ') : ''}#{list.join ' '}"
+    end
+    return if noop
+    list.each do |path|
+      created = nocreate
+      begin
+        File.utime(t, t, path)
+      rescue Errno::ENOENT
+        raise if created
+        File.open(path, 'a') {
+          ;
+        }
+        created = true
+        retry if t
+      end
+    end
+  end
+  module_function :touch
+
+  private
+
+  module StreamUtils_
+    private
+
+    case (defined?(::RbConfig) ? ::RbConfig::CONFIG['host_os'] : ::RUBY_PLATFORM)
+    when /mswin|mingw/
+      def fu_windows?; true end
+    else
+      def fu_windows?; false end
+    end
+
+    def fu_copy_stream0(src, dest, blksize = nil)   #:nodoc:
+      IO.copy_stream(src, dest)
+    end
+
+    def fu_stream_blksize(*streams)
+      streams.each do |s|
+        next unless s.respond_to?(:stat)
+        size = fu_blksize(s.stat)
+        return size if size
+      end
+      fu_default_blksize()
+    end
+
+    def fu_blksize(st)
+      s = st.blksize
+      return nil unless s
+      return nil if s == 0
+      s
+    end
+
+    def fu_default_blksize
+      1024
+    end
+  end
+
+  include StreamUtils_
+  extend StreamUtils_
+
+  class Entry_   #:nodoc: internal use only
+    include StreamUtils_
+
+    def initialize(a, b = nil, deref = false)
+      @prefix = @rel = @path = nil
+      if b
+        @prefix = a
+        @rel = b
+      else
+        @path = a
+      end
+      @deref = deref
+      @stat = nil
+      @lstat = nil
+    end
+
+    def inspect
+      "\#<#{self.class} #{path()}>"
+    end
+
+    def path
+      if @path
+        File.path(@path)
+      else
+        join(@prefix, @rel)
+      end
+    end
+
+    def prefix
+      @prefix || @path
+    end
+
+    def rel
+      @rel
+    end
+
+    def dereference?
+      @deref
+    end
+
+    def exist?
+      begin
+        lstat
+        true
+      rescue Errno::ENOENT
+        false
+      end
+    end
+
+    def file?
+      s = lstat!
+      s and s.file?
+    end
+
+    def directory?
+      s = lstat!
+      s and s.directory?
+    end
+
+    def symlink?
+      s = lstat!
+      s and s.symlink?
+    end
+
+    def chardev?
+      s = lstat!
+      s and s.chardev?
+    end
+
+    def blockdev?
+      s = lstat!
+      s and s.blockdev?
+    end
+
+    def socket?
+      s = lstat!
+      s and s.socket?
+    end
+
+    def pipe?
+      s = lstat!
+      s and s.pipe?
+    end
+
+    S_IF_DOOR = 0xD000
+
+    def door?
+      s = lstat!
+      s and (s.mode & 0xF000 == S_IF_DOOR)
+    end
+
+    def entries
+      opts = {}
+      opts[:encoding] = ::Encoding::UTF_8 if fu_windows?
+
+      files = if Dir.respond_to?(:children)
+        Dir.children(path, **opts)
+      else
+        Dir.entries(path(), **opts)
+           .reject {|n| n == '.' or n == '..' }
+      end
+
+      untaint = RUBY_VERSION < '2.7'
+      files.map {|n| Entry_.new(prefix(), join(rel(), untaint ? n.untaint : n)) }
+    end
+
+    def stat
+      return @stat if @stat
+      if lstat() and lstat().symlink?
+        @stat = File.stat(path())
+      else
+        @stat = lstat()
+      end
+      @stat
+    end
+
+    def stat!
+      return @stat if @stat
+      if lstat! and lstat!.symlink?
+        @stat = File.stat(path())
+      else
+        @stat = lstat!
+      end
+      @stat
+    rescue SystemCallError
+      nil
+    end
+
+    def lstat
+      if dereference?
+        @lstat ||= File.stat(path())
+      else
+        @lstat ||= File.lstat(path())
+      end
+    end
+
+    def lstat!
+      lstat()
+    rescue SystemCallError
+      nil
+    end
+
+    def chmod(mode)
+      if symlink?
+        File.lchmod mode, path() if have_lchmod?
+      else
+        File.chmod mode, path()
+      end
+    end
+
+    def chown(uid, gid)
+      if symlink?
+        File.lchown uid, gid, path() if have_lchown?
+      else
+        File.chown uid, gid, path()
+      end
+    end
+
+    def link(dest)
+      case
+      when directory?
+        if !File.exist?(dest) and descendant_directory?(dest, path)
+          raise ArgumentError, "cannot link directory %s to itself %s" % [path, dest]
+        end
+        begin
+          Dir.mkdir dest
+        rescue
+          raise unless File.directory?(dest)
+        end
+      else
+        File.link path(), dest
+      end
+    end
+
+    def copy(dest)
+      lstat
+      case
+      when file?
+        copy_file dest
+      when directory?
+        if !File.exist?(dest) and descendant_directory?(dest, path)
+          raise ArgumentError, "cannot copy directory %s to itself %s" % [path, dest]
+        end
+        begin
+          Dir.mkdir dest
+        rescue
+          raise unless File.directory?(dest)
+        end
+      when symlink?
+        File.symlink File.readlink(path()), dest
+      when chardev?, blockdev?
+        raise "cannot handle device file"
+      when socket?
+        begin
+          require 'socket'
+        rescue LoadError
+          raise "cannot handle socket"
+        else
+          raise "cannot handle socket" unless defined?(UNIXServer)
+        end
+        UNIXServer.new(dest).close
+        File.chmod lstat().mode, dest
+      when pipe?
+        raise "cannot handle FIFO" unless File.respond_to?(:mkfifo)
+        File.mkfifo dest, lstat().mode
+      when door?
+        raise "cannot handle door: #{path()}"
+      else
+        raise "unknown file type: #{path()}"
+      end
+    end
+
+    def copy_file(dest)
+      File.open(path()) do |s|
+        File.open(dest, 'wb', s.stat.mode) do |f|
+          IO.copy_stream(s, f)
+        end
+      end
+    end
+
+    def copy_metadata(path)
+      st = lstat()
+      if !st.symlink?
+        File.utime st.atime, st.mtime, path
+      end
+      mode = st.mode
+      begin
+        if st.symlink?
+          begin
+            File.lchown st.uid, st.gid, path
+          rescue NotImplementedError
+          end
+        else
+          File.chown st.uid, st.gid, path
+        end
+      rescue Errno::EPERM, Errno::EACCES
+        # clear setuid/setgid
+        mode &= 01777
+      end
+      if st.symlink?
+        begin
+          File.lchmod mode, path
+        rescue NotImplementedError
+        end
+      else
+        File.chmod mode, path
+      end
+    end
+
+    def remove
+      if directory?
+        remove_dir1
+      else
+        remove_file
+      end
+    end
+
+    def remove_dir1
+      platform_support {
+        Dir.rmdir path().chomp(?/)
+      }
+    end
+
+    def remove_file
+      platform_support {
+        File.unlink path
+      }
+    end
+
+    def platform_support
+      return yield unless fu_windows?
+      first_time_p = true
+      begin
+        yield
+      rescue Errno::ENOENT
+        raise
+      rescue => err
+        if first_time_p
+          first_time_p = false
+          begin
+            File.chmod 0700, path()   # Windows does not have symlink
+            retry
+          rescue SystemCallError
+          end
+        end
+        raise err
+      end
+    end
+
+    def preorder_traverse
+      stack = [self]
+      while ent = stack.pop
+        yield ent
+        stack.concat ent.entries.reverse if ent.directory?
+      end
+    end
+
+    alias traverse preorder_traverse
+
+    def postorder_traverse
+      if directory?
+        entries().each do |ent|
+          ent.postorder_traverse do |e|
+            yield e
+          end
+        end
+      end
+    ensure
+      yield self
+    end
+
+    def wrap_traverse(pre, post)
+      pre.call self
+      if directory?
+        entries.each do |ent|
+          ent.wrap_traverse pre, post
+        end
+      end
+      post.call self
+    end
+
+    private
+
+    @@fileutils_rb_have_lchmod = nil
+
+    def have_lchmod?
+      # This is not MT-safe, but it does not matter.
+      if @@fileutils_rb_have_lchmod == nil
+        @@fileutils_rb_have_lchmod = check_have_lchmod?
+      end
+      @@fileutils_rb_have_lchmod
+    end
+
+    def check_have_lchmod?
+      return false unless File.respond_to?(:lchmod)
+      File.lchmod 0
+      return true
+    rescue NotImplementedError
+      return false
+    end
+
+    @@fileutils_rb_have_lchown = nil
+
+    def have_lchown?
+      # This is not MT-safe, but it does not matter.
+      if @@fileutils_rb_have_lchown == nil
+        @@fileutils_rb_have_lchown = check_have_lchown?
+      end
+      @@fileutils_rb_have_lchown
+    end
+
+    def check_have_lchown?
+      return false unless File.respond_to?(:lchown)
+      File.lchown nil, nil
+      return true
+    rescue NotImplementedError
+      return false
+    end
+
+    def join(dir, base)
+      return File.path(dir) if not base or base == '.'
+      return File.path(base) if not dir or dir == '.'
+      File.join(dir, base)
+    end
+
+    if File::ALT_SEPARATOR
+      DIRECTORY_TERM = "(?=[/#{Regexp.quote(File::ALT_SEPARATOR)}]|\\z)"
+    else
+      DIRECTORY_TERM = "(?=/|\\z)"
+    end
+
+    def descendant_directory?(descendant, ascendant)
+      if File::FNM_SYSCASE.nonzero?
+        File.expand_path(File.dirname(descendant)).casecmp(File.expand_path(ascendant)) == 0
+      else
+        File.expand_path(File.dirname(descendant)) == File.expand_path(ascendant)
+      end
+    end
+  end   # class Entry_
+
+  def fu_list(arg)   #:nodoc:
+    [arg].flatten.map {|path| File.path(path) }
+  end
+  private_module_function :fu_list
+
+  def fu_each_src_dest(src, dest)   #:nodoc:
+    fu_each_src_dest0(src, dest) do |s, d|
+      raise ArgumentError, "same file: #{s} and #{d}" if fu_same?(s, d)
+      yield s, d
+    end
+  end
+  private_module_function :fu_each_src_dest
+
+  def fu_each_src_dest0(src, dest)   #:nodoc:
+    if tmp = Array.try_convert(src)
+      tmp.each do |s|
+        s = File.path(s)
+        yield s, File.join(dest, File.basename(s))
+      end
+    else
+      src = File.path(src)
+      if File.directory?(dest)
+        yield src, File.join(dest, File.basename(src))
+      else
+        yield src, File.path(dest)
+      end
+    end
+  end
+  private_module_function :fu_each_src_dest0
+
+  def fu_same?(a, b)   #:nodoc:
+    File.identical?(a, b)
+  end
+  private_module_function :fu_same?
+
+  def fu_output_message(msg)   #:nodoc:
+    output = @fileutils_output if defined?(@fileutils_output)
+    output ||= $stderr
+    if defined?(@fileutils_label)
+      msg = @fileutils_label + msg
+    end
+    output.puts msg
+  end
+  private_module_function :fu_output_message
+
+  # This hash table holds command options.
+  OPT_TABLE = {}    #:nodoc: internal use only
+  (private_instance_methods & methods(false)).inject(OPT_TABLE) {|tbl, name|
+    (tbl[name.to_s] = instance_method(name).parameters).map! {|t, n| n if t == :key}.compact!
+    tbl
+  }
+
+  public
+
+  #
+  # Returns an Array of names of high-level methods that accept any keyword
+  # arguments.
+  #
+  #   p Bundler::FileUtils.commands  #=> ["chmod", "cp", "cp_r", "install", ...]
+  #
+  def self.commands
+    OPT_TABLE.keys
+  end
+
+  #
+  # Returns an Array of option names.
+  #
+  #   p Bundler::FileUtils.options  #=> ["noop", "force", "verbose", "preserve", "mode"]
+  #
+  def self.options
+    OPT_TABLE.values.flatten.uniq.map {|sym| sym.to_s }
+  end
+
+  #
+  # Returns true if the method +mid+ have an option +opt+.
+  #
+  #   p Bundler::FileUtils.have_option?(:cp, :noop)     #=> true
+  #   p Bundler::FileUtils.have_option?(:rm, :force)    #=> true
+  #   p Bundler::FileUtils.have_option?(:rm, :preserve) #=> false
+  #
+  def self.have_option?(mid, opt)
+    li = OPT_TABLE[mid.to_s] or raise ArgumentError, "no such method: #{mid}"
+    li.include?(opt)
+  end
+
+  #
+  # Returns an Array of option names of the method +mid+.
+  #
+  #   p Bundler::FileUtils.options_of(:rm)  #=> ["noop", "verbose", "force"]
+  #
+  def self.options_of(mid)
+    OPT_TABLE[mid.to_s].map {|sym| sym.to_s }
+  end
+
+  #
+  # Returns an Array of methods names which have the option +opt+.
+  #
+  #   p Bundler::FileUtils.collect_method(:preserve) #=> ["cp", "cp_r", "copy", "install"]
+  #
+  def self.collect_method(opt)
+    OPT_TABLE.keys.select {|m| OPT_TABLE[m].include?(opt) }
+  end
+
+  private
+
+  LOW_METHODS = singleton_methods(false) - collect_method(:noop).map(&:intern) # :nodoc:
+  module LowMethods # :nodoc: internal use only
+    private
+    def _do_nothing(*)end
+    ::Bundler::FileUtils::LOW_METHODS.map {|name| alias_method name, :_do_nothing}
+  end
+
+  METHODS = singleton_methods() - [:private_module_function,                  # :nodoc:
+      :commands, :options, :have_option?, :options_of, :collect_method]
+
+  #
+  # This module has all methods of Bundler::FileUtils module, but it outputs messages
+  # before acting.  This equates to passing the <tt>:verbose</tt> flag to
+  # methods in Bundler::FileUtils.
+  #
+  module Verbose
+    include Bundler::FileUtils
+    names = ::Bundler::FileUtils.collect_method(:verbose)
+    names.each do |name|
+      module_eval(<<-EOS, __FILE__, __LINE__ + 1)
+        def #{name}(*args, **options)
+          super(*args, **options, verbose: true)
+        end
+      EOS
+    end
+    private(*names)
+    extend self
+    class << self
+      public(*::Bundler::FileUtils::METHODS)
+    end
+  end
+
+  #
+  # This module has all methods of Bundler::FileUtils module, but never changes
+  # files/directories.  This equates to passing the <tt>:noop</tt> flag
+  # to methods in Bundler::FileUtils.
+  #
+  module NoWrite
+    include Bundler::FileUtils
+    include LowMethods
+    names = ::Bundler::FileUtils.collect_method(:noop)
+    names.each do |name|
+      module_eval(<<-EOS, __FILE__, __LINE__ + 1)
+        def #{name}(*args, **options)
+          super(*args, **options, noop: true)
+        end
+      EOS
+    end
+    private(*names)
+    extend self
+    class << self
+      public(*::Bundler::FileUtils::METHODS)
+    end
+  end
+
+  #
+  # This module has all methods of Bundler::FileUtils module, but never changes
+  # files/directories, with printing message before acting.
+  # This equates to passing the <tt>:noop</tt> and <tt>:verbose</tt> flag
+  # to methods in Bundler::FileUtils.
+  #
+  module DryRun
+    include Bundler::FileUtils
+    include LowMethods
+    names = ::Bundler::FileUtils.collect_method(:noop)
+    names.each do |name|
+      module_eval(<<-EOS, __FILE__, __LINE__ + 1)
+        def #{name}(*args, **options)
+          super(*args, **options, noop: true, verbose: true)
+        end
+      EOS
+    end
+    private(*names)
+    extend self
+    class << self
+      public(*::Bundler::FileUtils::METHODS)
+    end
+  end
+
+end
diff --git a/lib/bundler/vendor/molinillo/LICENSE b/lib/bundler/vendor/molinillo/LICENSE
new file mode 100644
index 0000000000..01feffa088
--- /dev/null
+++ b/lib/bundler/vendor/molinillo/LICENSE
@@ -0,0 +1,9 @@
+This project is licensed under the MIT license.
+
+Copyright (c) 2014 Samuel E. Giddins segiddins@segiddins.me
+
+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.
diff --git a/lib/bundler/vendor/molinillo/lib/molinillo.rb b/lib/bundler/vendor/molinillo/lib/molinillo.rb
new file mode 100644
index 0000000000..a52b96deaf
--- /dev/null
+++ b/lib/bundler/vendor/molinillo/lib/molinillo.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require_relative 'molinillo/gem_metadata'
+require_relative 'molinillo/errors'
+require_relative 'molinillo/resolver'
+require_relative 'molinillo/modules/ui'
+require_relative 'molinillo/modules/specification_provider'
+
+# Bundler::Molinillo is a generic dependency resolution algorithm.
+module Bundler::Molinillo
+end
diff --git a/lib/bundler/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb b/lib/bundler/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb
new file mode 100644
index 0000000000..bcacf35243
--- /dev/null
+++ b/lib/bundler/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb
@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Bundler::Molinillo
+  # @!visibility private
+  module Delegates
+    # Delegates all {Bundler::Molinillo::ResolutionState} methods to a `#state` property.
+    module ResolutionState
+      # (see Bundler::Molinillo::ResolutionState#name)
+      def name
+        current_state = state || Bundler::Molinillo::ResolutionState.empty
+        current_state.name
+      end
+
+      # (see Bundler::Molinillo::ResolutionState#requirements)
+      def requirements
+        current_state = state || Bundler::Molinillo::ResolutionState.empty
+        current_state.requirements
+      end
+
+      # (see Bundler::Molinillo::ResolutionState#activated)
+      def activated
+        current_state = state || Bundler::Molinillo::ResolutionState.empty
+        current_state.activated
+      end
+
+      # (see Bundler::Molinillo::ResolutionState#requirement)
+      def requirement
+        current_state = state || Bundler::Molinillo::ResolutionState.empty
+        current_state.requirement
+      end
+
+      # (see Bundler::Molinillo::ResolutionState#possibilities)
+      def possibilities
+        current_state = state || Bundler::Molinillo::ResolutionState.empty
+        current_state.possibilities
+      end
+
+      # (see Bundler::Molinillo::ResolutionState#depth)
+      def depth
+        current_state = state || Bundler::Molinillo::ResolutionState.empty
+        current_state.depth
+      end
+
+      # (see Bundler::Molinillo::ResolutionState#conflicts)
+      def conflicts
+        current_state = state || Bundler::Molinillo::ResolutionState.empty
+        current_state.conflicts
+      end
+
+      # (see Bundler::Molinillo::ResolutionState#unused_unwind_options)
+      def unused_unwind_options
+        current_state = state || Bundler::Molinillo::ResolutionState.empty
+        current_state.unused_unwind_options
+      end
+    end
+  end
+end
diff --git a/lib/bundler/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb b/lib/bundler/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb
new file mode 100644
index 0000000000..f8c695c1ed
--- /dev/null
+++ b/lib/bundler/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb
@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+module Bundler::Molinillo
+  module Delegates
+    # Delegates all {Bundler::Molinillo::SpecificationProvider} methods to a
+    # `#specification_provider` property.
+    module SpecificationProvider
+      # (see Bundler::Molinillo::SpecificationProvider#search_for)
+      def search_for(dependency)
+        with_no_such_dependency_error_handling do
+          specification_provider.search_for(dependency)
+        end
+      end
+
+      # (see Bundler::Molinillo::SpecificationProvider#dependencies_for)
+      def dependencies_for(specification)
+        with_no_such_dependency_error_handling do
+          specification_provider.dependencies_for(specification)
+        end
+      end
+
+      # (see Bundler::Molinillo::SpecificationProvider#requirement_satisfied_by?)
+      def requirement_satisfied_by?(requirement, activated, spec)
+        with_no_such_dependency_error_handling do
+          specification_provider.requirement_satisfied_by?(requirement, activated, spec)
+        end
+      end
+
+      # (see Bundler::Molinillo::SpecificationProvider#dependencies_equal?)
+      def dependencies_equal?(dependencies, other_dependencies)
+        with_no_such_dependency_error_handling do
+          specification_provider.dependencies_equal?(dependencies, other_dependencies)
+        end
+      end
+
+      # (see Bundler::Molinillo::SpecificationProvider#name_for)
+      def name_for(dependency)
+        with_no_such_dependency_error_handling do
+          specification_provider.name_for(dependency)
+        end
+      end
+
+      # (see Bundler::Molinillo::SpecificationProvider#name_for_explicit_dependency_source)
+      def name_for_explicit_dependency_source
+        with_no_such_dependency_error_handling do
+          specification_provider.name_for_explicit_dependency_source
+        end
+      end
+
+      # (see Bundler::Molinillo::SpecificationProvider#name_for_locking_dependency_source)
+      def name_for_locking_dependency_source
+        with_no_such_dependency_error_handling do
+          specification_provider.name_for_locking_dependency_source
+        end
+      end
+
+      # (see Bundler::Molinillo::SpecificationProvider#sort_dependencies)
+      def sort_dependencies(dependencies, activated, conflicts)
+        with_no_such_dependency_error_handling do
+          specification_provider.sort_dependencies(dependencies, activated, conflicts)
+        end
+      end
+
+      # (see Bundler::Molinillo::SpecificationProvider#allow_missing?)
+      def allow_missing?(dependency)
+        with_no_such_dependency_error_handling do
+          specification_provider.allow_missing?(dependency)
+        end
+      end
+
+      private
+
+      # Ensures any raised {NoSuchDependencyError} has its
+      # {NoSuchDependencyError#required_by} set.
+      # @yield
+      def with_no_such_dependency_error_handling
+        yield
+      rescue NoSuchDependencyError => error
+        if state
+          vertex = activated.vertex_named(name_for(error.dependency))
+          error.required_by += vertex.incoming_edges.map { |e| e.origin.name }
+          error.required_by << name_for_explicit_dependency_source unless vertex.explicit_requirements.empty?
+        end
+        raise
+      end
+    end
+  end
+end
diff --git a/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb b/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb
new file mode 100644
index 0000000000..10a25d2f08
--- /dev/null
+++ b/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb
@@ -0,0 +1,255 @@
+# frozen_string_literal: true
+
+require_relative '../../../../vendored_tsort'
+
+require_relative 'dependency_graph/log'
+require_relative 'dependency_graph/vertex'
+
+module Bundler::Molinillo
+  # A directed acyclic graph that is tuned to hold named dependencies
+  class DependencyGraph
+    include Enumerable
+
+    # Enumerates through the vertices of the graph.
+    # @return [Array<Vertex>] The graph's vertices.
+    def each
+      return vertices.values.each unless block_given?
+      vertices.values.each { |v| yield v }
+    end
+
+    include Bundler::TSort
+
+    # @!visibility private
+    alias tsort_each_node each
+
+    # @!visibility private
+    def tsort_each_child(vertex, &block)
+      vertex.successors.each(&block)
+    end
+
+    # Topologically sorts the given vertices.
+    # @param [Enumerable<Vertex>] vertices the vertices to be sorted, which must
+    #   all belong to the same graph.
+    # @return [Array<Vertex>] The sorted vertices.
+    def self.tsort(vertices)
+      TSort.tsort(
+        lambda { |b| vertices.each(&b) },
+        lambda { |v, &b| (v.successors & vertices).each(&b) }
+      )
+    end
+
+    # A directed edge of a {DependencyGraph}
+    # @attr [Vertex] origin The origin of the directed edge
+    # @attr [Vertex] destination The destination of the directed edge
+    # @attr [Object] requirement The requirement the directed edge represents
+    Edge = Struct.new(:origin, :destination, :requirement)
+
+    # @return [{String => Vertex}] the vertices of the dependency graph, keyed
+    #   by {Vertex#name}
+    attr_reader :vertices
+
+    # @return [Log] the op log for this graph
+    attr_reader :log
+
+    # Initializes an empty dependency graph
+    def initialize
+      @vertices = {}
+      @log = Log.new
+    end
+
+    # Tags the current state of the dependency as the given tag
+    # @param  [Object] tag an opaque tag for the current state of the graph
+    # @return [Void]
+    def tag(tag)
+      log.tag(self, tag)
+    end
+
+    # Rewinds the graph to the state tagged as `tag`
+    # @param  [Object] tag the tag to rewind to
+    # @return [Void]
+    def rewind_to(tag)
+      log.rewind_to(self, tag)
+    end
+
+    # Initializes a copy of a {DependencyGraph}, ensuring that all {#vertices}
+    # are properly copied.
+    # @param [DependencyGraph] other the graph to copy.
+    def initialize_copy(other)
+      super
+      @vertices = {}
+      @log = other.log.dup
+      traverse = lambda do |new_v, old_v|
+        return if new_v.outgoing_edges.size == old_v.outgoing_edges.size
+        old_v.outgoing_edges.each do |edge|
+          destination = add_vertex(edge.destination.name, edge.destination.payload)
+          add_edge_no_circular(new_v, destination, edge.requirement)
+          traverse.call(destination, edge.destination)
+        end
+      end
+      other.vertices.each do |name, vertex|
+        new_vertex = add_vertex(name, vertex.payload, vertex.root?)
+        new_vertex.explicit_requirements.replace(vertex.explicit_requirements)
+        traverse.call(new_vertex, vertex)
+      end
+    end
+
+    # @return [String] a string suitable for debugging
+    def inspect
+      "#{self.class}:#{vertices.values.inspect}"
+    end
+
+    # @param [Hash] options options for dot output.
+    # @return [String] Returns a dot format representation of the graph
+    def to_dot(options = {})
+      edge_label = options.delete(:edge_label)
+      raise ArgumentError, "Unknown options: #{options.keys}" unless options.empty?
+
+      dot_vertices = []
+      dot_edges = []
+      vertices.each do |n, v|
+        dot_vertices << "  #{n} [label=\"{#{n}|#{v.payload}}\"]"
+        v.outgoing_edges.each do |e|
+          label = edge_label ? edge_label.call(e) : e.requirement
+          dot_edges << "  #{e.origin.name} -> #{e.destination.name} [label=#{label.to_s.dump}]"
+        end
+      end
+
+      dot_vertices.uniq!
+      dot_vertices.sort!
+      dot_edges.uniq!
+      dot_edges.sort!
+
+      dot = dot_vertices.unshift('digraph G {').push('') + dot_edges.push('}')
+      dot.join("\n")
+    end
+
+    # @param [DependencyGraph] other
+    # @return [Boolean] whether the two dependency graphs are equal, determined
+    #   by a recursive traversal of each {#root_vertices} and its
+    #   {Vertex#successors}
+    def ==(other)
+      return false unless other
+      return true if equal?(other)
+      vertices.each do |name, vertex|
+        other_vertex = other.vertex_named(name)
+        return false unless other_vertex
+        return false unless vertex.payload == other_vertex.payload
+        return false unless other_vertex.successors.to_set == vertex.successors.to_set
+      end
+    end
+
+    # @param [String] name
+    # @param [Object] payload
+    # @param [Array<String>] parent_names
+    # @param [Object] requirement the requirement that is requiring the child
+    # @return [void]
+    def add_child_vertex(name, payload, parent_names, requirement)
+      root = !parent_names.delete(nil) { true }
+      vertex = add_vertex(name, payload, root)
+      vertex.explicit_requirements << requirement if root
+      parent_names.each do |parent_name|
+        parent_vertex = vertex_named(parent_name)
+        add_edge(parent_vertex, vertex, requirement)
+      end
+      vertex
+    end
+
+    # Adds a vertex with the given name, or updates the existing one.
+    # @param [String] name
+    # @param [Object] payload
+    # @return [Vertex] the vertex that was added to `self`
+    def add_vertex(name, payload, root = false)
+      log.add_vertex(self, name, payload, root)
+    end
+
+    # Detaches the {#vertex_named} `name` {Vertex} from the graph, recursively
+    # removing any non-root vertices that were orphaned in the process
+    # @param [String] name
+    # @return [Array<Vertex>] the vertices which have been detached
+    def detach_vertex_named(name)
+      log.detach_vertex_named(self, name)
+    end
+
+    # @param [String] name
+    # @return [Vertex,nil] the vertex with the given name
+    def vertex_named(name)
+      vertices[name]
+    end
+
+    # @param [String] name
+    # @return [Vertex,nil] the root vertex with the given name
+    def root_vertex_named(name)
+      vertex = vertex_named(name)
+      vertex if vertex && vertex.root?
+    end
+
+    # Adds a new {Edge} to the dependency graph
+    # @param [Vertex] origin
+    # @param [Vertex] destination
+    # @param [Object] requirement the requirement that this edge represents
+    # @return [Edge] the added edge
+    def add_edge(origin, destination, requirement)
+      if destination.path_to?(origin)
+        raise CircularDependencyError.new(path(destination, origin))
+      end
+      add_edge_no_circular(origin, destination, requirement)
+    end
+
+    # Deletes an {Edge} from the dependency graph
+    # @param [Edge] edge
+    # @return [Void]
+    def delete_edge(edge)
+      log.delete_edge(self, edge.origin.name, edge.destination.name, edge.requirement)
+    end
+
+    # Sets the payload of the vertex with the given name
+    # @param [String] name the name of the vertex
+    # @param [Object] payload the payload
+    # @return [Void]
+    def set_payload(name, payload)
+      log.set_payload(self, name, payload)
+    end
+
+    private
+
+    # Adds a new {Edge} to the dependency graph without checking for
+    # circularity.
+    # @param (see #add_edge)
+    # @return (see #add_edge)
+    def add_edge_no_circular(origin, destination, requirement)
+      log.add_edge_no_circular(self, origin.name, destination.name, requirement)
+    end
+
+    # Returns the path between two vertices
+    # @raise [ArgumentError] if there is no path between the vertices
+    # @param [Vertex] from
+    # @param [Vertex] to
+    # @return [Array<Vertex>] the shortest path from `from` to `to`
+    def path(from, to)
+      distances = Hash.new(vertices.size + 1)
+      distances[from.name] = 0
+      predecessors = {}
+      each do |vertex|
+        vertex.successors.each do |successor|
+          if distances[successor.name] > distances[vertex.name] + 1
+            distances[successor.name] = distances[vertex.name] + 1
+            predecessors[successor] = vertex
+          end
+        end
+      end
+
+      path = [to]
+      while before = predecessors[to]
+        path << before
+        to = before
+        break if to == from
+      end
+
+      unless path.last.equal?(from)
+        raise ArgumentError, "There is no path from #{from.name} to #{to.name}"
+      end
+
+      path.reverse
+    end
+  end
+end
diff --git a/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/action.rb b/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/action.rb
new file mode 100644
index 0000000000..c04c7eec9c
--- /dev/null
+++ b/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/action.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Bundler::Molinillo
+  class DependencyGraph
+    # An action that modifies a {DependencyGraph} that is reversible.
+    # @abstract
+    class Action
+      # rubocop:disable Lint/UnusedMethodArgument
+
+      # @return [Symbol] The name of the action.
+      def self.action_name
+        raise 'Abstract'
+      end
+
+      # Performs the action on the given graph.
+      # @param  [DependencyGraph] graph the graph to perform the action on.
+      # @return [Void]
+      def up(graph)
+        raise 'Abstract'
+      end
+
+      # Reverses the action on the given graph.
+      # @param  [DependencyGraph] graph the graph to reverse the action on.
+      # @return [Void]
+      def down(graph)
+        raise 'Abstract'
+      end
+
+      # @return [Action,Nil] The previous action
+      attr_accessor :previous
+
+      # @return [Action,Nil] The next action
+      attr_accessor :next
+    end
+  end
+end
diff --git a/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb b/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb
new file mode 100644
index 0000000000..946a08236e
--- /dev/null
+++ b/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb
@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require_relative 'action'
+module Bundler::Molinillo
+  class DependencyGraph
+    # @!visibility private
+    # (see DependencyGraph#add_edge_no_circular)
+    class AddEdgeNoCircular < Action
+      # @!group Action
+
+      # (see Action.action_name)
+      def self.action_name
+        :add_vertex
+      end
+
+      # (see Action#up)
+      def up(graph)
+        edge = make_edge(graph)
+        edge.origin.outgoing_edges << edge
+        edge.destination.incoming_edges << edge
+        edge
+      end
+
+      # (see Action#down)
+      def down(graph)
+        edge = make_edge(graph)
+        delete_first(edge.origin.outgoing_edges, edge)
+        delete_first(edge.destination.incoming_edges, edge)
+      end
+
+      # @!group AddEdgeNoCircular
+
+      # @return [String] the name of the origin of the edge
+      attr_reader :origin
+
+      # @return [String] the name of the destination of the edge
+      attr_reader :destination
+
+      # @return [Object] the requirement that the edge represents
+      attr_reader :requirement
+
+      # @param  [DependencyGraph] graph the graph to find vertices from
+      # @return [Edge] The edge this action adds
+      def make_edge(graph)
+        Edge.new(graph.vertex_named(origin), graph.vertex_named(destination), requirement)
+      end
+
+      # Initialize an action to add an edge to a dependency graph
+      # @param [String] origin the name of the origin of the edge
+      # @param [String] destination the name of the destination of the edge
+      # @param [Object] requirement the requirement that the edge represents
+      def initialize(origin, destination, requirement)
+        @origin = origin
+        @destination = destination
+        @requirement = requirement
+      end
+
+      private
+
+      def delete_first(array, item)
+        return unless index = array.index(item)
+        array.delete_at(index)
+      end
+    end
+  end
+end
diff --git a/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb b/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb
new file mode 100644
index 0000000000..483527daf8
--- /dev/null
+++ b/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb
@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require_relative 'action'
+module Bundler::Molinillo
+  class DependencyGraph
+    # @!visibility private
+    # (see DependencyGraph#add_vertex)
+    class AddVertex < Action # :nodoc:
+      # @!group Action
+
+      # (see Action.action_name)
+      def self.action_name
+        :add_vertex
+      end
+
+      # (see Action#up)
+      def up(graph)
+        if existing = graph.vertices[name]
+          @existing_payload = existing.payload
+          @existing_root = existing.root
+        end
+        vertex = existing || Vertex.new(name, payload)
+        graph.vertices[vertex.name] = vertex
+        vertex.payload ||= payload
+        vertex.root ||= root
+        vertex
+      end
+
+      # (see Action#down)
+      def down(graph)
+        if defined?(@existing_payload)
+          vertex = graph.vertices[name]
+          vertex.payload = @existing_payload
+          vertex.root = @existing_root
+        else
+          graph.vertices.delete(name)
+        end
+      end
+
+      # @!group AddVertex
+
+      # @return [String] the name of the vertex
+      attr_reader :name
+
+      # @return [Object] the payload for the vertex
+      attr_reader :payload
+
+      # @return [Boolean] whether the vertex is root or not
+      attr_reader :root
+
+      # Initialize an action to add a vertex to a dependency graph
+      # @param [String] name the name of the vertex
+      # @param [Object] payload the payload for the vertex
+      # @param [Boolean] root whether the vertex is root or not
+      def initialize(name, payload, root)
+        @name = name
+        @payload = payload
+        @root = root
+      end
+    end
+  end
+end
diff --git a/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb b/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb
new file mode 100644
index 0000000000..d81940585a
--- /dev/null
+++ b/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb
@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require_relative 'action'
+module Bundler::Molinillo
+  class DependencyGraph
+    # @!visibility private
+    # (see DependencyGraph#delete_edge)
+    class DeleteEdge < Action
+      # @!group Action
+
+      # (see Action.action_name)
+      def self.action_name
+        :delete_edge
+      end
+
+      # (see Action#up)
+      def up(graph)
+        edge = make_edge(graph)
+        edge.origin.outgoing_edges.delete(edge)
+        edge.destination.incoming_edges.delete(edge)
+      end
+
+      # (see Action#down)
+      def down(graph)
+        edge = make_edge(graph)
+        edge.origin.outgoing_edges << edge
+        edge.destination.incoming_edges << edge
+        edge
+      end
+
+      # @!group DeleteEdge
+
+      # @return [String] the name of the origin of the edge
+      attr_reader :origin_name
+
+      # @return [String] the name of the destination of the edge
+      attr_reader :destination_name
+
+      # @return [Object] the requirement that the edge represents
+      attr_reader :requirement
+
+      # @param  [DependencyGraph] graph the graph to find vertices from
+      # @return [Edge] The edge this action adds
+      def make_edge(graph)
+        Edge.new(
+          graph.vertex_named(origin_name),
+          graph.vertex_named(destination_name),
+          requirement
+        )
+      end
+
+      # Initialize an action to add an edge to a dependency graph
+      # @param [String] origin_name the name of the origin of the edge
+      # @param [String] destination_name the name of the destination of the edge
+      # @param [Object] requirement the requirement that the edge represents
+      def initialize(origin_name, destination_name, requirement)
+        @origin_name = origin_name
+        @destination_name = destination_name
+        @requirement = requirement
+      end
+    end
+  end
+end
diff --git a/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb b/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb
new file mode 100644
index 0000000000..36fce7c526
--- /dev/null
+++ b/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb
@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require_relative 'action'
+module Bundler::Molinillo
+  class DependencyGraph
+    # @!visibility private
+    # @see DependencyGraph#detach_vertex_named
+    class DetachVertexNamed < Action
+      # @!group Action
+
+      # (see Action#name)
+      def self.action_name
+        :add_vertex
+      end
+
+      # (see Action#up)
+      def up(graph)
+        return [] unless @vertex = graph.vertices.delete(name)
+
+        removed_vertices = [@vertex]
+        @vertex.outgoing_edges.each do |e|
+          v = e.destination
+          v.incoming_edges.delete(e)
+          if !v.root? && v.incoming_edges.empty?
+            removed_vertices.concat graph.detach_vertex_named(v.name)
+          end
+        end
+
+        @vertex.incoming_edges.each do |e|
+          v = e.origin
+          v.outgoing_edges.delete(e)
+        end
+
+        removed_vertices
+      end
+
+      # (see Action#down)
+      def down(graph)
+        return unless @vertex
+        graph.vertices[@vertex.name] = @vertex
+        @vertex.outgoing_edges.each do |e|
+          e.destination.incoming_edges << e
+        end
+        @vertex.incoming_edges.each do |e|
+          e.origin.outgoing_edges << e
+        end
+      end
+
+      # @!group DetachVertexNamed
+
+      # @return [String] the name of the vertex to detach
+      attr_reader :name
+
+      # Initialize an action to detach a vertex from a dependency graph
+      # @param [String] name the name of the vertex to detach
+      def initialize(name)
+        @name = name
+      end
+    end
+  end
+end
diff --git a/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/log.rb b/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/log.rb
new file mode 100644
index 0000000000..6f0de19886
--- /dev/null
+++ b/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/log.rb
@@ -0,0 +1,126 @@
+# frozen_string_literal: true
+
+require_relative 'add_edge_no_circular'
+require_relative 'add_vertex'
+require_relative 'delete_edge'
+require_relative 'detach_vertex_named'
+require_relative 'set_payload'
+require_relative 'tag'
+
+module Bundler::Molinillo
+  class DependencyGraph
+    # A log for dependency graph actions
+    class Log
+      # Initializes an empty log
+      def initialize
+        @current_action = @first_action = nil
+      end
+
+      # @!macro [new] action
+      #   {include:DependencyGraph#$0}
+      #   @param [Graph] graph the graph to perform the action on
+      #   @param (see DependencyGraph#$0)
+      #   @return (see DependencyGraph#$0)
+
+      # @macro action
+      def tag(graph, tag)
+        push_action(graph, Tag.new(tag))
+      end
+
+      # @macro action
+      def add_vertex(graph, name, payload, root)
+        push_action(graph, AddVertex.new(name, payload, root))
+      end
+
+      # @macro action
+      def detach_vertex_named(graph, name)
+        push_action(graph, DetachVertexNamed.new(name))
+      end
+
+      # @macro action
+      def add_edge_no_circular(graph, origin, destination, requirement)
+        push_action(graph, AddEdgeNoCircular.new(origin, destination, requirement))
+      end
+
+      # {include:DependencyGraph#delete_edge}
+      # @param [Graph] graph the graph to perform the action on
+      # @param [String] origin_name
+      # @param [String] destination_name
+      # @param [Object] requirement
+      # @return (see DependencyGraph#delete_edge)
+      def delete_edge(graph, origin_name, destination_name, requirement)
+        push_action(graph, DeleteEdge.new(origin_name, destination_name, requirement))
+      end
+
+      # @macro action
+      def set_payload(graph, name, payload)
+        push_action(graph, SetPayload.new(name, payload))
+      end
+
+      # Pops the most recent action from the log and undoes the action
+      # @param [DependencyGraph] graph
+      # @return [Action] the action that was popped off the log
+      def pop!(graph)
+        return unless action = @current_action
+        unless @current_action = action.previous
+          @first_action = nil
+        end
+        action.down(graph)
+        action
+      end
+
+      extend Enumerable
+
+      # @!visibility private
+      # Enumerates each action in the log
+      # @yield [Action]
+      def each
+        return enum_for unless block_given?
+        action = @first_action
+        loop do
+          break unless action
+          yield action
+          action = action.next
+        end
+        self
+      end
+
+      # @!visibility private
+      # Enumerates each action in the log in reverse order
+      # @yield [Action]
+      def reverse_each
+        return enum_for(:reverse_each) unless block_given?
+        action = @current_action
+        loop do
+          break unless action
+          yield action
+          action = action.previous
+        end
+        self
+      end
+
+      # @macro action
+      def rewind_to(graph, tag)
+        loop do
+          action = pop!(graph)
+          raise "No tag #{tag.inspect} found" unless action
+          break if action.class.action_name == :tag && action.tag == tag
+        end
+      end
+
+      private
+
+      # Adds the given action to the log, running the action
+      # @param [DependencyGraph] graph
+      # @param [Action] action
+      # @return The value returned by `action.up`
+      def push_action(graph, action)
+        action.previous = @current_action
+        @current_action.next = action if @current_action
+        @current_action = action
+        @first_action ||= action
+        action.up(graph)
+      end
+    end
+  end
+end
diff --git a/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb b/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb
new file mode 100644
index 0000000000..2e9b90e6cd
--- /dev/null
+++ b/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require_relative 'action'
+module Bundler::Molinillo
+  class DependencyGraph
+    # @!visibility private
+    # @see DependencyGraph#set_payload
+    class SetPayload < Action # :nodoc:
+      # @!group Action
+
+      # (see Action.action_name)
+      def self.action_name
+        :set_payload
+      end
+
+      # (see Action#up)
+      def up(graph)
+        vertex = graph.vertex_named(name)
+        @old_payload = vertex.payload
+        vertex.payload = payload
+      end
+
+      # (see Action#down)
+      def down(graph)
+        graph.vertex_named(name).payload = @old_payload
+      end
+
+      # @!group SetPayload
+
+      # @return [String] the name of the vertex
+      attr_reader :name
+
+      # @return [Object] the payload for the vertex
+      attr_reader :payload
+
+      # Initialize an action to add set the payload for a vertex in a dependency
+      # graph
+      # @param [String] name the name of the vertex
+      # @param [Object] payload the payload for the vertex
+      def initialize(name, payload)
+        @name = name
+        @payload = payload
+      end
+    end
+  end
+end
diff --git a/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb b/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb
new file mode 100644
index 0000000000..5b5da3e4f9
--- /dev/null
+++ b/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require_relative 'action'
+module Bundler::Molinillo
+  class DependencyGraph
+    # @!visibility private
+    # @see DependencyGraph#tag
+    class Tag < Action
+      # @!group Action
+
+      # (see Action.action_name)
+      def self.action_name
+        :tag
+      end
+
+      # (see Action#up)
+      def up(graph)
+      end
+
+      # (see Action#down)
+      def down(graph)
+      end
+
+      # @!group Tag
+
+      # @return [Object] An opaque tag
+      attr_reader :tag
+
+      # Initialize an action to tag a state of a dependency graph
+      # @param [Object] tag an opaque tag
+      def initialize(tag)
+        @tag = tag
+      end
+    end
+  end
+end
diff --git a/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb b/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb
new file mode 100644
index 0000000000..1185a8ab05
--- /dev/null
+++ b/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb
@@ -0,0 +1,164 @@
+# frozen_string_literal: true
+
+module Bundler::Molinillo
+  class DependencyGraph
+    # A vertex in a {DependencyGraph} that encapsulates a {#name} and a
+    # {#payload}
+    class Vertex
+      # @return [String] the name of the vertex
+      attr_accessor :name
+
+      # @return [Object] the payload the vertex holds
+      attr_accessor :payload
+
+      # @return [Array<Object>] the explicit requirements that required
+      #   this vertex
+      attr_reader :explicit_requirements
+
+      # @return [Boolean] whether the vertex is considered a root vertex
+      attr_accessor :root
+      alias root? root
+
+      # Initializes a vertex with the given name and payload.
+      # @param [String] name see {#name}
+      # @param [Object] payload see {#payload}
+      def initialize(name, payload)
+        @name = name.frozen? ? name : name.dup.freeze
+        @payload = payload
+        @explicit_requirements = []
+        @outgoing_edges = []
+        @incoming_edges = []
+      end
+
+      # @return [Array<Object>] all of the requirements that required
+      #   this vertex
+      def requirements
+        (incoming_edges.map(&:requirement) + explicit_requirements).uniq
+      end
+
+      # @return [Array<Edge>] the edges of {#graph} that have `self` as their
+      #   {Edge#origin}
+      attr_accessor :outgoing_edges
+
+      # @return [Array<Edge>] the edges of {#graph} that have `self` as their
+      #   {Edge#destination}
+      attr_accessor :incoming_edges
+
+      # @return [Array<Vertex>] the vertices of {#graph} that have an edge with
+      #   `self` as their {Edge#destination}
+      def predecessors
+        incoming_edges.map(&:origin)
+      end
+
+      # @return [Set<Vertex>] the vertices of {#graph} where `self` is a
+      #   {#descendent?}
+      def recursive_predecessors
+        _recursive_predecessors
+      end
+
+      # @param [Set<Vertex>] vertices the set to add the predecessors to
+      # @return [Set<Vertex>] the vertices of {#graph} where `self` is a
+      #   {#descendent?}
+      def _recursive_predecessors(vertices = new_vertex_set)
+        incoming_edges.each do |edge|
+          vertex = edge.origin
+          next unless vertices.add?(vertex)
+          vertex._recursive_predecessors(vertices)
+        end
+
+        vertices
+      end
+      protected :_recursive_predecessors
+
+      # @return [Array<Vertex>] the vertices of {#graph} that have an edge with
+      #   `self` as their {Edge#origin}
+      def successors
+        outgoing_edges.map(&:destination)
+      end
+
+      # @return [Set<Vertex>] the vertices of {#graph} where `self` is an
+      #   {#ancestor?}
+      def recursive_successors
+        _recursive_successors
+      end
+
+      # @param [Set<Vertex>] vertices the set to add the successors to
+      # @return [Set<Vertex>] the vertices of {#graph} where `self` is an
+      #   {#ancestor?}
+      def _recursive_successors(vertices = new_vertex_set)
+        outgoing_edges.each do |edge|
+          vertex = edge.destination
+          next unless vertices.add?(vertex)
+          vertex._recursive_successors(vertices)
+        end
+
+        vertices
+      end
+      protected :_recursive_successors
+
+      # @return [String] a string suitable for debugging
+      def inspect
+        "#{self.class}:#{name}(#{payload.inspect})"
+      end
+
+      # @return [Boolean] whether the two vertices are equal, determined
+      #   by a recursive traversal of each {Vertex#successors}
+      def ==(other)
+        return true if equal?(other)
+        shallow_eql?(other) &&
+          successors.to_set == other.successors.to_set
+      end
+
+      # @param  [Vertex] other the other vertex to compare to
+      # @return [Boolean] whether the two vertices are equal, determined
+      #   solely by {#name} and {#payload} equality
+      def shallow_eql?(other)
+        return true if equal?(other)
+        other &&
+          name == other.name &&
+          payload == other.payload
+      end
+
+      alias eql? ==
+
+      # @return [Fixnum] a hash for the vertex based upon its {#name}
+      def hash
+        name.hash
+      end
+
+      # Is there a path from `self` to `other` following edges in the
+      # dependency graph?
+      # @return whether there is a path following edges within this {#graph}
+      def path_to?(other)
+        _path_to?(other)
+      end
+
+      alias descendent? path_to?
+
+      # @param [Vertex] other the vertex to check if there's a path to
+      # @param [Set<Vertex>] visited the vertices of {#graph} that have been visited
+      # @return [Boolean] whether there is a path to `other` from `self`
+      def _path_to?(other, visited = new_vertex_set)
+        return false unless visited.add?(self)
+        return true if equal?(other)
+        successors.any? { |v| v._path_to?(other, visited) }
+      end
+      protected :_path_to?
+
+      # Is there a path from `other` to `self` following edges in the
+      # dependency graph?
+      # @return whether there is a path following edges within this {#graph}
+      def ancestor?(other)
+        other.path_to?(self)
+      end
+
+      alias is_reachable_from? ancestor?
+
+      def new_vertex_set
+        require 'set'
+        Set.new
+      end
+      private :new_vertex_set
+    end
+  end
+end
diff --git a/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb b/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb
new file mode 100644
index 0000000000..e210202b69
--- /dev/null
+++ b/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb
@@ -0,0 +1,143 @@
+# frozen_string_literal: true
+
+module Bundler::Molinillo
+  # An error that occurred during the resolution process
+  class ResolverError < StandardError; end
+
+  # An error caused by searching for a dependency that is completely unknown,
+  # i.e. has no versions available whatsoever.
+  class NoSuchDependencyError < ResolverError
+    # @return [Object] the dependency that could not be found
+    attr_accessor :dependency
+
+    # @return [Array<Object>] the specifications that depended upon {#dependency}
+    attr_accessor :required_by
+
+    # Initializes a new error with the given missing dependency.
+    # @param [Object] dependency @see {#dependency}
+    # @param [Array<Object>] required_by @see {#required_by}
+    def initialize(dependency, required_by = [])
+      @dependency = dependency
+      @required_by = required_by.uniq
+      super()
+    end
+
+    # The error message for the missing dependency, including the specifications
+    # that had this dependency.
+    def message
+      sources = required_by.map { |r| "`#{r}`" }.join(' and ')
+      message = "Unable to find a specification for `#{dependency}`"
+      message += " depended upon by #{sources}" unless sources.empty?
+      message
+    end
+  end
+
+  # An error caused by attempting to fulfil a dependency that was circular
+  #
+  # @note This exception will be thrown if and only if a {Vertex} is added to a
+  #   {DependencyGraph} that has a {DependencyGraph::Vertex#path_to?} an
+  #   existing {DependencyGraph::Vertex}
+  class CircularDependencyError < ResolverError
+    # [Set<Object>] the dependencies responsible for causing the error
+    attr_reader :dependencies
+
+    # Initializes a new error with the given circular vertices.
+    # @param [Array<DependencyGraph::Vertex>] vertices the vertices in the dependency
+    #   that caused the error
+    def initialize(vertices)
+      super "There is a circular dependency between #{vertices.map(&:name).join(' and ')}"
+      @dependencies = vertices.map { |vertex| vertex.payload.possibilities.last }.to_set
+    end
+  end
+
+  # An error caused by conflicts in version
+  class VersionConflict < ResolverError
+    # @return [{String => Resolution::Conflict}] the conflicts that caused
+    #   resolution to fail
+    attr_reader :conflicts
+
+    # @return [SpecificationProvider] the specification provider used during
+    #   resolution
+    attr_reader :specification_provider
+
+    # Initializes a new error with the given version conflicts.
+    # @param [{String => Resolution::Conflict}] conflicts see {#conflicts}
+    # @param [SpecificationProvider] specification_provider see {#specification_provider}
+    def initialize(conflicts, specification_provider)
+      pairs = []
+      conflicts.values.flat_map(&:requirements).each do |conflicting|
+        conflicting.each do |source, conflict_requirements|
+          conflict_requirements.each do |c|
+            pairs << [c, source]
+          end
+        end
+      end
+
+      super "Unable to satisfy the following requirements:\n\n" \
+        "#{pairs.map { |r, d| "- `#{r}` required by `#{d}`" }.join("\n")}"
+
+      @conflicts = conflicts
+      @specification_provider = specification_provider
+    end
+
+    require_relative 'delegates/specification_provider'
+    include Delegates::SpecificationProvider
+
+    # @return [String] An error message that includes requirement trees,
+    #   which is much more detailed & customizable than the default message
+    # @param [Hash] opts the options to create a message with.
+    # @option opts [String] :solver_name The user-facing name of the solver
+    # @option opts [String] :possibility_type The generic name of a possibility
+    # @option opts [Proc] :reduce_trees A proc that reduced the list of requirement trees
+    # @option opts [Proc] :printable_requirement A proc that pretty-prints requirements
+    # @option opts [Proc] :additional_message_for_conflict A proc that appends additional
+    #   messages for each conflict
+    # @option opts [Proc] :version_for_spec A proc that returns the version number for a
+    #   possibility
+    def message_with_trees(opts = {})
+      solver_name = opts.delete(:solver_name) { self.class.name.split('::').first }
+      possibility_type = opts.delete(:possibility_type) { 'possibility named' }
+      reduce_trees = opts.delete(:reduce_trees) { proc { |trees| trees.uniq.sort_by(&:to_s) } }
+      printable_requirement = opts.delete(:printable_requirement) { proc { |req| req.to_s } }
+      additional_message_for_conflict = opts.delete(:additional_message_for_conflict) { proc {} }
+      version_for_spec = opts.delete(:version_for_spec) { proc(&:to_s) }
+      incompatible_version_message_for_conflict = opts.delete(:incompatible_version_message_for_conflict) do
+        proc do |name, _conflict|
+          %(#{solver_name} could not find compatible versions for #{possibility_type} "#{name}":)
+        end
+      end
+
+      conflicts.sort.reduce(''.dup) do |o, (name, conflict)|
+        o << "\n" << incompatible_version_message_for_conflict.call(name, conflict) << "\n"
+        if conflict.locked_requirement
+          o << %(  In snapshot (#{name_for_locking_dependency_source}):\n)
+          o << %(    #{printable_requirement.call(conflict.locked_requirement)}\n)
+          o << %(\n)
+        end
+        o << %(  In #{name_for_explicit_dependency_source}:\n)
+        trees = reduce_trees.call(conflict.requirement_trees)
+
+        o << trees.map do |tree|
+          t = ''.dup
+          depth = 2
+          tree.each do |req|
+            t << '  ' * depth << printable_requirement.call(req)
+            unless tree.last == req
+              if spec = conflict.activated_by_name[name_for(req)]
+                t << %( was resolved to #{version_for_spec.call(spec)}, which)
+              end
+              t << %( depends on)
+            end
+            t << %(\n)
+            depth += 1
+          end
+          t
+        end.join("\n")
+
+        additional_message_for_conflict.call(o, name, conflict)
+
+        o
+      end.strip
+    end
+  end
+end
diff --git a/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb b/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb
new file mode 100644
index 0000000000..e13a781a50
--- /dev/null
+++ b/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module Bundler::Molinillo
+  # The version of Bundler::Molinillo.
+  VERSION = '0.7.0'.freeze
+end
diff --git a/lib/bundler/vendor/molinillo/lib/molinillo/modules/specification_provider.rb b/lib/bundler/vendor/molinillo/lib/molinillo/modules/specification_provider.rb
new file mode 100644
index 0000000000..eeae79af3c
--- /dev/null
+++ b/lib/bundler/vendor/molinillo/lib/molinillo/modules/specification_provider.rb
@@ -0,0 +1,112 @@
+# frozen_string_literal: true
+
+module Bundler::Molinillo
+  # Provides information about specifications and dependencies to the resolver,
+  # allowing the {Resolver} class to remain generic while still providing power
+  # and flexibility.
+  #
+  # This module contains the methods that users of Bundler::Molinillo must to implement,
+  # using knowledge of their own model classes.
+  module SpecificationProvider
+    # Search for the specifications that match the given dependency.
+    # The specifications in the returned array will be considered in reverse
+    # order, so the latest version ought to be last.
+    # @note This method should be 'pure', i.e. the return value should depend
+    #   only on the `dependency` parameter.
+    #
+    # @param [Object] dependency
+    # @return [Array<Object>] the specifications that satisfy the given
+    #   `dependency`.
+    def search_for(dependency)
+      []
+    end
+
+    # Returns the dependencies of `specification`.
+    # @note This method should be 'pure', i.e. the return value should depend
+    #   only on the `specification` parameter.
+    #
+    # @param [Object] specification
+    # @return [Array<Object>] the dependencies that are required by the given
+    #   `specification`.
+    def dependencies_for(specification)
+      []
+    end
+
+    # Determines whether the given `requirement` is satisfied by the given
+    # `spec`, in the context of the current `activated` dependency graph.
+    #
+    # @param [Object] requirement
+    # @param [DependencyGraph] activated the current dependency graph in the
+    #   resolution process.
+    # @param [Object] spec
+    # @return [Boolean] whether `requirement` is satisfied by `spec` in the
+    #   context of the current `activated` dependency graph.
+    def requirement_satisfied_by?(requirement, activated, spec)
+      true
+    end
+
+    # Determines whether two arrays of dependencies are equal, and thus can be
+    # grouped.
+    #
+    # @param [Array<Object>] dependencies
+    # @param [Array<Object>] other_dependencies
+    # @return [Boolean] whether `dependencies` and `other_dependencies` should
+    #   be considered equal.
+    def dependencies_equal?(dependencies, other_dependencies)
+      dependencies == other_dependencies
+    end
+
+    # Returns the name for the given `dependency`.
+    # @note This method should be 'pure', i.e. the return value should depend
+    #   only on the `dependency` parameter.
+    #
+    # @param [Object] dependency
+    # @return [String] the name for the given `dependency`.
+    def name_for(dependency)
+      dependency.to_s
+    end
+
+    # @return [String] the name of the source of explicit dependencies, i.e.
+    #   those passed to {Resolver#resolve} directly.
+    def name_for_explicit_dependency_source
+      'user-specified dependency'
+    end
+
+    # @return [String] the name of the source of 'locked' dependencies, i.e.
+    #   those passed to {Resolver#resolve} directly as the `base`
+    def name_for_locking_dependency_source
+      'Lockfile'
+    end
+
+    # Sort dependencies so that the ones that are easiest to resolve are first.
+    # Easiest to resolve is (usually) defined by:
+    #   1) Is this dependency already activated?
+    #   2) How relaxed are the requirements?
+    #   3) Are there any conflicts for this dependency?
+    #   4) How many possibilities are there to satisfy this dependency?
+    #
+    # @param [Array<Object>] dependencies
+    # @param [DependencyGraph] activated the current dependency graph in the
+    #   resolution process.
+    # @param [{String => Array<Conflict>}] conflicts
+    # @return [Array<Object>] a sorted copy of `dependencies`.
+    def sort_dependencies(dependencies, activated, conflicts)
+      dependencies.sort_by do |dependency|
+        name = name_for(dependency)
+        [
+          activated.vertex_named(name).payload ? 0 : 1,
+          conflicts[name] ? 0 : 1,
+        ]
+      end
+    end
+
+    # Returns whether this dependency, which has no possible matching
+    # specifications, can safely be ignored.
+    #
+    # @param [Object] dependency
+    # @return [Boolean] whether this dependency can safely be skipped.
+    def allow_missing?(dependency)
+      false
+    end
+  end
+end
diff --git a/lib/bundler/vendor/molinillo/lib/molinillo/modules/ui.rb b/lib/bundler/vendor/molinillo/lib/molinillo/modules/ui.rb
new file mode 100644
index 0000000000..a166bc6991
--- /dev/null
+++ b/lib/bundler/vendor/molinillo/lib/molinillo/modules/ui.rb
@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module Bundler::Molinillo
+  # Conveys information about the resolution process to a user.
+  module UI
+    # The {IO} object that should be used to print output. `STDOUT`, by default.
+    #
+    # @return [IO]
+    def output
+      STDOUT
+    end
+
+    # Called roughly every {#progress_rate}, this method should convey progress
+    # to the user.
+    #
+    # @return [void]
+    def indicate_progress
+      output.print '.' unless debug?
+    end
+
+    # How often progress should be conveyed to the user via
+    # {#indicate_progress}, in seconds. A third of a second, by default.
+    #
+    # @return [Float]
+    def progress_rate
+      0.33
+    end
+
+    # Called before resolution begins.
+    #
+    # @return [void]
+    def before_resolution
+      output.print 'Resolving dependencies...'
+    end
+
+    # Called after resolution ends (either successfully or with an error).
+    # By default, prints a newline.
+    #
+    # @return [void]
+    def after_resolution
+      output.puts
+    end
+
+    # Conveys debug information to the user.
+    #
+    # @param [Integer] depth the current depth of the resolution process.
+    # @return [void]
+    def debug(depth = 0)
+      if debug?
+        debug_info = yield
+        debug_info = debug_info.inspect unless debug_info.is_a?(String)
+        debug_info = debug_info.split("\n").map { |s| ":#{depth.to_s.rjust 4}: #{s}" }
+        output.puts debug_info
+      end
+    end
+
+    # Whether or not debug messages should be printed.
+    # By default, whether or not the `MOLINILLO_DEBUG` environment variable is
+    # set.
+    #
+    # @return [Boolean]
+    def debug?
+      return @debug_mode if defined?(@debug_mode)
+      @debug_mode = ENV['MOLINILLO_DEBUG']
+    end
+  end
+end
diff --git a/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb b/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb
new file mode 100644
index 0000000000..c689ca7635
--- /dev/null
+++ b/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb
@@ -0,0 +1,839 @@
+# frozen_string_literal: true
+
+module Bundler::Molinillo
+  class Resolver
+    # A specific resolution from a given {Resolver}
+    class Resolution
+      # A conflict that the resolution process encountered
+      # @attr [Object] requirement the requirement that immediately led to the conflict
+      # @attr [{String,Nil=>[Object]}] requirements the requirements that caused the conflict
+      # @attr [Object, nil] existing the existing spec that was in conflict with
+      #   the {#possibility}
+      # @attr [Object] possibility_set the set of specs that was unable to be
+      #   activated due to a conflict.
+      # @attr [Object] locked_requirement the relevant locking requirement.
+      # @attr [Array<Array<Object>>] requirement_trees the different requirement
+      #   trees that led to every requirement for the conflicting name.
+      # @attr [{String=>Object}] activated_by_name the already-activated specs.
+      # @attr [Object] underlying_error an error that has occurred during resolution, and
+      #    will be raised at the end of it if no resolution is found.
+      Conflict = Struct.new(
+        :requirement,
+        :requirements,
+        :existing,
+        :possibility_set,
+        :locked_requirement,
+        :requirement_trees,
+        :activated_by_name,
+        :underlying_error
+      )
+
+      class Conflict
+        # @return [Object] a spec that was unable to be activated due to a conflict
+        def possibility
+          possibility_set && possibility_set.latest_version
+        end
+      end
+
+      # A collection of possibility states that share the same dependencies
+      # @attr [Array] dependencies the dependencies for this set of possibilities
+      # @attr [Array] possibilities the possibilities
+      PossibilitySet = Struct.new(:dependencies, :possibilities)
+
+      class PossibilitySet
+        # String representation of the possibility set, for debugging
+        def to_s
+          "[#{possibilities.join(', ')}]"
+        end
+
+        # @return [Object] most up-to-date dependency in the possibility set
+        def latest_version
+          possibilities.last
+        end
+      end
+
+      # Details of the state to unwind to when a conflict occurs, and the cause of the unwind
+      # @attr [Integer] state_index the index of the state to unwind to
+      # @attr [Object] state_requirement the requirement of the state we're unwinding to
+      # @attr [Array] requirement_tree for the requirement we're relaxing
+      # @attr [Array] conflicting_requirements the requirements that combined to cause the conflict
+      # @attr [Array] requirement_trees for the conflict
+      # @attr [Array] requirements_unwound_to_instead array of unwind requirements that were chosen over this unwind
+      UnwindDetails = Struct.new(
+        :state_index,
+        :state_requirement,
+        :requirement_tree,
+        :conflicting_requirements,
+        :requirement_trees,
+        :requirements_unwound_to_instead
+      )
+
+      class UnwindDetails
+        include Comparable
+
+        # We compare UnwindDetails when choosing which state to unwind to. If
+        # two options have the same state_index we prefer the one most
+        # removed from a requirement that caused the conflict. Both options
+        # would unwind to the same state, but a `grandparent` option will
+        # filter out fewer of its possibilities after doing so - where a state
+        # is both a `parent` and a `grandparent` to requirements that have
+        # caused a conflict this is the correct behaviour.
+        # @param [UnwindDetail] other UnwindDetail to be compared
+        # @return [Integer] integer specifying ordering
+        def <=>(other)
+          if state_index > other.state_index
+            1
+          elsif state_index == other.state_index
+            reversed_requirement_tree_index <=> other.reversed_requirement_tree_index
+          else
+            -1
+          end
+        end
+
+        # @return [Integer] index of state requirement in reversed requirement tree
+        #    (the conflicting requirement itself will be at position 0)
+        def reversed_requirement_tree_index
+          @reversed_requirement_tree_index ||=
+            if state_requirement
+              requirement_tree.reverse.index(state_requirement)
+            else
+              999_999
+            end
+        end
+
+        # @return [Boolean] where the requirement of the state we're unwinding
+        #    to directly caused the conflict. Note: in this case, it is
+        #    impossible for the state we're unwinding to to be a parent of
+        #    any of the other conflicting requirements (or we would have
+        #    circularity)
+        def unwinding_to_primary_requirement?
+          requirement_tree.last == state_requirement
+        end
+
+        # @return [Array] array of sub-dependencies to avoid when choosing a
+        #    new possibility for the state we've unwound to. Only relevant for
+        #    non-primary unwinds
+        def sub_dependencies_to_avoid
+          @requirements_to_avoid ||=
+            requirement_trees.map do |tree|
+              index = tree.index(state_requirement)
+              tree[index + 1] if index
+            end.compact
+        end
+
+        # @return [Array] array of all the requirements that led to the need for
+        #    this unwind
+        def all_requirements
+          @all_requirements ||= requirement_trees.flatten(1)
+        end
+      end
+
+      # @return [SpecificationProvider] the provider that knows about
+      #   dependencies, requirements, specifications, versions, etc.
+      attr_reader :specification_provider
+
+      # @return [UI] the UI that knows how to communicate feedback about the
+      #   resolution process back to the user
+      attr_reader :resolver_ui
+
+      # @return [DependencyGraph] the base dependency graph to which
+      #   dependencies should be 'locked'
+      attr_reader :base
+
+      # @return [Array] the dependencies that were explicitly required
+      attr_reader :original_requested
+
+      # Initializes a new resolution.
+      # @param [SpecificationProvider] specification_provider
+      #   see {#specification_provider}
+      # @param [UI] resolver_ui see {#resolver_ui}
+      # @param [Array] requested see {#original_requested}
+      # @param [DependencyGraph] base see {#base}
+      def initialize(specification_provider, resolver_ui, requested, base)
+        @specification_provider = specification_provider
+        @resolver_ui = resolver_ui
+        @original_requested = requested
+        @base = base
+        @states = []
+        @iteration_counter = 0
+        @parents_of = Hash.new { |h, k| h[k] = [] }
+      end
+
+      # Resolves the {#original_requested} dependencies into a full dependency
+      #   graph
+      # @raise [ResolverError] if successful resolution is impossible
+      # @return [DependencyGraph] the dependency graph of successfully resolved
+      #   dependencies
+      def resolve
+        start_resolution
+
+        while state
+          break if !state.requirement && state.requirements.empty?
+          indicate_progress
+          if state.respond_to?(:pop_possibility_state) # DependencyState
+            debug(depth) { "Creating possibility state for #{requirement} (#{possibilities.count} remaining)" }
+            state.pop_possibility_state.tap do |s|
+              if s
+                states.push(s)
+                activated.tag(s)
+              end
+            end
+          end
+          process_topmost_state
+        end
+
+        resolve_activated_specs
+      ensure
+        end_resolution
+      end
+
+      # @return [Integer] the number of resolver iterations in between calls to
+      #   {#resolver_ui}'s {UI#indicate_progress} method
+      attr_accessor :iteration_rate
+      private :iteration_rate
+
+      # @return [Time] the time at which resolution began
+      attr_accessor :started_at
+      private :started_at
+
+      # @return [Array<ResolutionState>] the stack of states for the resolution
+      attr_accessor :states
+      private :states
+
+      private
+
+      # Sets up the resolution process
+      # @return [void]
+      def start_resolution
+        @started_at = Time.now
+
+        push_initial_state
+
+        debug { "Starting resolution (#{@started_at})\nUser-requested dependencies: #{original_requested}" }
+        resolver_ui.before_resolution
+      end
+
+      def resolve_activated_specs
+        activated.vertices.each do |_, vertex|
+          next unless vertex.payload
+
+          latest_version = vertex.payload.possibilities.reverse_each.find do |possibility|
+            vertex.requirements.all? { |req| requirement_satisfied_by?(req, activated, possibility) }
+          end
+
+          activated.set_payload(vertex.name, latest_version)
+        end
+        activated.freeze
+      end
+
+      # Ends the resolution process
+      # @return [void]
+      def end_resolution
+        resolver_ui.after_resolution
+        debug do
+          "Finished resolution (#{@iteration_counter} steps) " \
+          "(Took #{(ended_at = Time.now) - @started_at} seconds) (#{ended_at})"
+        end
+        debug { 'Unactivated: ' + Hash[activated.vertices.reject { |_n, v| v.payload }].keys.join(', ') } if state
+        debug { 'Activated: ' + Hash[activated.vertices.select { |_n, v| v.payload }].keys.join(', ') } if state
+      end
+
+      require_relative 'state'
+      require_relative 'modules/specification_provider'
+
+      require_relative 'delegates/resolution_state'
+      require_relative 'delegates/specification_provider'
+
+      include Bundler::Molinillo::Delegates::ResolutionState
+      include Bundler::Molinillo::Delegates::SpecificationProvider
+
+      # Processes the topmost available {RequirementState} on the stack
+      # @return [void]
+      def process_topmost_state
+        if possibility
+          attempt_to_activate
+        else
+          create_conflict
+          unwind_for_conflict
+        end
+      rescue CircularDependencyError => underlying_error
+        create_conflict(underlying_error)
+        unwind_for_conflict
+      end
+
+      # @return [Object] the current possibility that the resolution is trying
+      #   to activate
+      def possibility
+        possibilities.last
+      end
+
+      # @return [RequirementState] the current state the resolution is
+      #   operating upon
+      def state
+        states.last
+      end
+
+      # Creates and pushes the initial state for the resolution, based upon the
+      # {#requested} dependencies
+      # @return [void]
+      def push_initial_state
+        graph = DependencyGraph.new.tap do |dg|
+          original_requested.each do |requested|
+            vertex = dg.add_vertex(name_for(requested), nil, true)
+            vertex.explicit_requirements << requested
+          end
+          dg.tag(:initial_state)
+        end
+
+        push_state_for_requirements(original_requested, true, graph)
+      end
+
+      # Unwinds the states stack because a conflict has been encountered
+      # @return [void]
+      def unwind_for_conflict
+        details_for_unwind = build_details_for_unwind
+        unwind_options = unused_unwind_options
+        debug(depth) { "Unwinding for conflict: #{requirement} to #{details_for_unwind.state_index / 2}" }
+        conflicts.tap do |c|
+          sliced_states = states.slice!((details_for_unwind.state_index + 1)..-1)
+          raise_error_unless_state(c)
+          activated.rewind_to(sliced_states.first || :initial_state) if sliced_states
+          state.conflicts = c
+          state.unused_unwind_options = unwind_options
+          filter_possibilities_after_unwind(details_for_unwind)
+          index = states.size - 1
+          @parents_of.each { |_, a| a.reject! { |i| i >= index } }
+          state.unused_unwind_options.reject! { |uw| uw.state_index >= index }
+        end
+      end
+
+      # Raises a VersionConflict error, or any underlying error, if there is no
+      # current state
+      # @return [void]
+      def raise_error_unless_state(conflicts)
+        return if state
+
+        error = conflicts.values.map(&:underlying_error).compact.first
+        raise error || VersionConflict.new(conflicts, specification_provider)
+      end
+
+      # @return [UnwindDetails] Details of the nearest index to which we could unwind
+      def build_details_for_unwind
+        # Get the possible unwinds for the current conflict
+        current_conflict = conflicts[name]
+        binding_requirements = binding_requirements_for_conflict(current_conflict)
+        unwind_details = unwind_options_for_requirements(binding_requirements)
+
+        last_detail_for_current_unwind = unwind_details.sort.last
+        current_detail = last_detail_for_current_unwind
+
+        # Look for past conflicts that could be unwound to affect the
+        # requirement tree for the current conflict
+        all_reqs = last_detail_for_current_unwind.all_requirements
+        all_reqs_size = all_reqs.size
+        relevant_unused_unwinds = unused_unwind_options.select do |alternative|
+          diff_reqs = all_reqs - alternative.requirements_unwound_to_instead
+          next if diff_reqs.size == all_reqs_size
+          # Find the highest index unwind whilst looping through
+          current_detail = alternative if alternative > current_detail
+          alternative
+        end
+
+        # Add the current unwind options to the `unused_unwind_options` array.
+        # The "used" option will be filtered out during `unwind_for_conflict`.
+        state.unused_unwind_options += unwind_details.reject { |detail| detail.state_index == -1 }
+
+        # Update the requirements_unwound_to_instead on any relevant unused unwinds
+        relevant_unused_unwinds.each do |d|
+          (d.requirements_unwound_to_instead << current_detail.state_requirement).uniq!
+        end
+        unwind_details.each do |d|
+          (d.requirements_unwound_to_instead << current_detail.state_requirement).uniq!
+        end
+
+        current_detail
+      end
+
+      # @param [Array<Object>] binding_requirements array of requirements that combine to create a conflict
+      # @return [Array<UnwindDetails>] array of UnwindDetails that have a chance
+      #    of resolving the passed requirements
+      def unwind_options_for_requirements(binding_requirements)
+        unwind_details = []
+
+        trees = []
+        binding_requirements.reverse_each do |r|
+          partial_tree = [r]
+          trees << partial_tree
+          unwind_details << UnwindDetails.new(-1, nil, partial_tree, binding_requirements, trees, [])
+
+          # If this requirement has alternative possibilities, check if any would
+          # satisfy the other requirements that created this conflict
+          requirement_state = find_state_for(r)
+          if conflict_fixing_possibilities?(requirement_state, binding_requirements)
+            unwind_details << UnwindDetails.new(
+              states.index(requirement_state),
+              r,
+              partial_tree,
+              binding_requirements,
+              trees,
+              []
+            )
+          end
+
+          # Next, look at the parent of this requirement, and check if the requirement
+          # could have been avoided if an alternative PossibilitySet had been chosen
+          parent_r = parent_of(r)
+          next if parent_r.nil?
+          partial_tree.unshift(parent_r)
+          requirement_state = find_state_for(parent_r)
+          if requirement_state.possibilities.any? { |set| !set.dependencies.include?(r) }
+            unwind_details << UnwindDetails.new(
+              states.index(requirement_state),
+              parent_r,
+              partial_tree,
+              binding_requirements,
+              trees,
+              []
+            )
+          end
+
+          # Finally, look at the grandparent and up of this requirement, looking
+          # for any possibilities that wouldn't create their parent requirement
+          grandparent_r = parent_of(parent_r)
+          until grandparent_r.nil?
+            partial_tree.unshift(grandparent_r)
+            requirement_state = find_state_for(grandparent_r)
+            if requirement_state.possibilities.any? { |set| !set.dependencies.include?(parent_r) }
+              unwind_details << UnwindDetails.new(
+                states.index(requirement_state),
+                grandparent_r,
+                partial_tree,
+                binding_requirements,
+                trees,
+                []
+              )
+            end
+            parent_r = grandparent_r
+            grandparent_r = parent_of(parent_r)
+          end
+        end
+
+        unwind_details
+      end
+
+      # @param [DependencyState] state
+      # @param [Array] binding_requirements array of requirements
+      # @return [Boolean] whether or not the given state has any possibilities
+      #    that could satisfy the given requirements
+      def conflict_fixing_possibilities?(state, binding_requirements)
+        return false unless state
+
+        state.possibilities.any? do |possibility_set|
+          possibility_set.possibilities.any? do |poss|
+            possibility_satisfies_requirements?(poss, binding_requirements)
+          end
+        end
+      end
+
+      # Filter's a state's possibilities to remove any that would not fix the
+      # conflict we've just rewound from
+      # @param [UnwindDetails] unwind_details details of the conflict just
+      #   unwound from
+      # @return [void]
+      def filter_possibilities_after_unwind(unwind_details)
+        return unless state && !state.possibilities.empty?
+
+        if unwind_details.unwinding_to_primary_requirement?
+          filter_possibilities_for_primary_unwind(unwind_details)
+        else
+          filter_possibilities_for_parent_unwind(unwind_details)
+        end
+      end
+
+      # Filter's a state's possibilities to remove any that would not satisfy
+      # the requirements in the conflict we've just rewound from
+      # @param [UnwindDetails] unwind_details details of the conflict just unwound from
+      # @return [void]
+      def filter_possibilities_for_primary_unwind(unwind_details)
+        unwinds_to_state = unused_unwind_options.select { |uw| uw.state_index == unwind_details.state_index }
+        unwinds_to_state << unwind_details
+        unwind_requirement_sets = unwinds_to_state.map(&:conflicting_requirements)
+
+        state.possibilities.reject! do |possibility_set|
+          possibility_set.possibilities.none? do |poss|
+            unwind_requirement_sets.any? do |requirements|
+              possibility_satisfies_requirements?(poss, requirements)
+            end
+          end
+        end
+      end
+
+      # @param [Object] possibility a single possibility
+      # @param [Array] requirements an array of requirements
+      # @return [Boolean] whether the possibility satisfies all of the
+      #    given requirements
+      def possibility_satisfies_requirements?(possibility, requirements)
+        name = name_for(possibility)
+
+        activated.tag(:swap)
+        activated.set_payload(name, possibility) if activated.vertex_named(name)
+        satisfied = requirements.all? { |r| requirement_satisfied_by?(r, activated, possibility) }
+        activated.rewind_to(:swap)
+
+        satisfied
+      end
+
+      # Filter's a state's possibilities to remove any that would (eventually)
+      # create a requirement in the conflict we've just rewound from
+      # @param [UnwindDetails] unwind_details details of the conflict just unwound from
+      # @return [void]
+      def filter_possibilities_for_parent_unwind(unwind_details)
+        unwinds_to_state = unused_unwind_options.select { |uw| uw.state_index == unwind_details.state_index }
+        unwinds_to_state << unwind_details
+
+        primary_unwinds = unwinds_to_state.select(&:unwinding_to_primary_requirement?).uniq
+        parent_unwinds = unwinds_to_state.uniq - primary_unwinds
+
+        allowed_possibility_sets = primary_unwinds.flat_map do |unwind|
+          states[unwind.state_index].possibilities.select do |possibility_set|
+            possibility_set.possibilities.any? do |poss|
+              possibility_satisfies_requirements?(poss, unwind.conflicting_requirements)
+            end
+          end
+        end
+
+        requirements_to_avoid = parent_unwinds.flat_map(&:sub_dependencies_to_avoid)
+
+        state.possibilities.reject! do |possibility_set|
+          !allowed_possibility_sets.include?(possibility_set) &&
+            (requirements_to_avoid - possibility_set.dependencies).empty?
+        end
+      end
+
+      # @param [Conflict] conflict
+      # @return [Array] minimal array of requirements that would cause the passed
+      #    conflict to occur.
+      def binding_requirements_for_conflict(conflict)
+        return [conflict.requirement] if conflict.possibility.nil?
+
+        possible_binding_requirements = conflict.requirements.values.flatten(1).uniq
+
+        # When there's a `CircularDependency` error the conflicting requirement
+        # (the one causing the circular) won't be `conflict.requirement`
+        # (which won't be for the right state, because we won't have created it,
+        # because it's circular).
+        # We need to make sure we have that requirement in the conflict's list,
+        # otherwise we won't be able to unwind properly, so we just return all
+        # the requirements for the conflict.
+        return possible_binding_requirements if conflict.underlying_error
+
+        possibilities = search_for(conflict.requirement)
+
+        # If all the requirements together don't filter out all possibilities,
+        # then the only two requirements we need to consider are the initial one
+        # (where the dependency's version was first chosen) and the last
+        if binding_requirement_in_set?(nil, possible_binding_requirements, possibilities)
+          return [conflict.requirement, requirement_for_existing_name(name_for(conflict.requirement))].compact
+        end
+
+        # Loop through the possible binding requirements, removing each one
+        # that doesn't bind. Use a `reverse_each` as we want the earliest set of
+        # binding requirements, and don't use `reject!` as we wish to refine the
+        # array *on each iteration*.
+        binding_requirements = possible_binding_requirements.dup
+        possible_binding_requirements.reverse_each do |req|
+          next if req == conflict.requirement
+          unless binding_requirement_in_set?(req, binding_requirements, possibilities)
+            binding_requirements -= [req]
+          end
+        end
+
+        binding_requirements
+      end
+
+      # @param [Object] requirement we wish to check
+      # @param [Array] possible_binding_requirements array of requirements
+      # @param [Array] possibilities array of possibilities the requirements will be used to filter
+      # @return [Boolean] whether or not the given requirement is required to filter
+      #    out all elements of the array of possibilities.
+      def binding_requirement_in_set?(requirement, possible_binding_requirements, possibilities)
+        possibilities.any? do |poss|
+          possibility_satisfies_requirements?(poss, possible_binding_requirements - [requirement])
+        end
+      end
+
+      # @param [Object] requirement
+      # @return [Object] the requirement that led to `requirement` being added
+      #   to the list of requirements.
+      def parent_of(requirement)
+        return unless requirement
+        return unless index = @parents_of[requirement].last
+        return unless parent_state = @states[index]
+        parent_state.requirement
+      end
+
+      # @param [String] name
+      # @return [Object] the requirement that led to a version of a possibility
+      #   with the given name being activated.
+      def requirement_for_existing_name(name)
+        return nil unless vertex = activated.vertex_named(name)
+        return nil unless vertex.payload
+        states.find { |s| s.name == name }.requirement
+      end
+
+      # @param [Object] requirement
+      # @return [ResolutionState] the state whose `requirement` is the given
+      #   `requirement`.
+      def find_state_for(requirement)
+        return nil unless requirement
+        states.find { |i| requirement == i.requirement }
+      end
+
+      # @param [Object] underlying_error
+      # @return [Conflict] a {Conflict} that reflects the failure to activate
+      #   the {#possibility} in conjunction with the current {#state}
+      def create_conflict(underlying_error = nil)
+        vertex = activated.vertex_named(name)
+        locked_requirement = locked_requirement_named(name)
+
+        requirements = {}
+        unless vertex.explicit_requirements.empty?
+          requirements[name_for_explicit_dependency_source] = vertex.explicit_requirements
+        end
+        requirements[name_for_locking_dependency_source] = [locked_requirement] if locked_requirement
+        vertex.incoming_edges.each do |edge|
+          (requirements[edge.origin.payload.latest_version] ||= []).unshift(edge.requirement)
+        end
+
+        activated_by_name = {}
+        activated.each { |v| activated_by_name[v.name] = v.payload.latest_version if v.payload }
+        conflicts[name] = Conflict.new(
+          requirement,
+          requirements,
+          vertex.payload && vertex.payload.latest_version,
+          possibility,
+          locked_requirement,
+          requirement_trees,
+          activated_by_name,
+          underlying_error
+        )
+      end
+
+      # @return [Array<Array<Object>>] The different requirement
+      #   trees that led to every requirement for the current spec.
+      def requirement_trees
+        vertex = activated.vertex_named(name)
+        vertex.requirements.map { |r| requirement_tree_for(r) }
+      end
+
+      # @param [Object] requirement
+      # @return [Array<Object>] the list of requirements that led to
+      #   `requirement` being required.
+      def requirement_tree_for(requirement)
+        tree = []
+        while requirement
+          tree.unshift(requirement)
+          requirement = parent_of(requirement)
+        end
+        tree
+      end
+
+      # Indicates progress roughly once every second
+      # @return [void]
+      def indicate_progress
+        @iteration_counter += 1
+        @progress_rate ||= resolver_ui.progress_rate
+        if iteration_rate.nil?
+          if Time.now - started_at >= @progress_rate
+            self.iteration_rate = @iteration_counter
+          end
+        end
+
+        if iteration_rate && (@iteration_counter % iteration_rate) == 0
+          resolver_ui.indicate_progress
+        end
+      end
+
+      # Calls the {#resolver_ui}'s {UI#debug} method
+      # @param [Integer] depth the depth of the {#states} stack
+      # @param [Proc] block a block that yields a {#to_s}
+      # @return [void]
+      def debug(depth = 0, &block)
+        resolver_ui.debug(depth, &block)
+      end
+
+      # Attempts to activate the current {#possibility}
+      # @return [void]
+      def attempt_to_activate
+        debug(depth) { 'Attempting to activate ' + possibility.to_s }
+        existing_vertex = activated.vertex_named(name)
+        if existing_vertex.payload
+          debug(depth) { "Found existing spec (#{existing_vertex.payload})" }
+          attempt_to_filter_existing_spec(existing_vertex)
+        else
+          latest = possibility.latest_version
+          possibility.possibilities.select! do |possibility|
+            requirement_satisfied_by?(requirement, activated, possibility)
+          end
+          if possibility.latest_version.nil?
+            # ensure there's a possibility for better error messages
+            possibility.possibilities << latest if latest
+            create_conflict
+            unwind_for_conflict
+          else
+            activate_new_spec
+          end
+        end
+      end
+
+      # Attempts to update the existing vertex's `PossibilitySet` with a filtered version
+      # @return [void]
+      def attempt_to_filter_existing_spec(vertex)
+        filtered_set = filtered_possibility_set(vertex)
+        if !filtered_set.possibilities.empty?
+          activated.set_payload(name, filtered_set)
+          new_requirements = requirements.dup
+          push_state_for_requirements(new_requirements, false)
+        else
+          create_conflict
+          debug(depth) { "Unsatisfied by existing spec (#{vertex.payload})" }
+          unwind_for_conflict
+        end
+      end
+
+      # Generates a filtered version of the existing vertex's `PossibilitySet` using the
+      # current state's `requirement`
+      # @param [Object] vertex existing vertex
+      # @return [PossibilitySet] filtered possibility set
+      def filtered_possibility_set(vertex)
+        PossibilitySet.new(vertex.payload.dependencies, vertex.payload.possibilities & possibility.possibilities)
+      end
+
+      # @param [String] requirement_name the spec name to search for
+      # @return [Object] the locked spec named `requirement_name`, if one
+      #   is found on {#base}
+      def locked_requirement_named(requirement_name)
+        vertex = base.vertex_named(requirement_name)
+        vertex && vertex.payload
+      end
+
+      # Add the current {#possibility} to the dependency graph of the current
+      # {#state}
+      # @return [void]
+      def activate_new_spec
+        conflicts.delete(name)
+        debug(depth) { "Activated #{name} at #{possibility}" }
+        activated.set_payload(name, possibility)
+        require_nested_dependencies_for(possibility)
+      end
+
+      # Requires the dependencies that the recently activated spec has
+      # @param [Object] possibility_set the PossibilitySet that has just been
+      #   activated
+      # @return [void]
+      def require_nested_dependencies_for(possibility_set)
+        nested_dependencies = dependencies_for(possibility_set.latest_version)
+        debug(depth) { "Requiring nested dependencies (#{nested_dependencies.join(', ')})" }
+        nested_dependencies.each do |d|
+          activated.add_child_vertex(name_for(d), nil, [name_for(possibility_set.latest_version)], d)
+          parent_index = states.size - 1
+          parents = @parents_of[d]
+          parents << parent_index if parents.empty?
+        end
+
+        push_state_for_requirements(requirements + nested_dependencies, !nested_dependencies.empty?)
+      end
+
+      # Pushes a new {DependencyState} that encapsulates both existing and new
+      # requirements
+      # @param [Array] new_requirements
+      # @param [Boolean] requires_sort
+      # @param [Object] new_activated
+      # @return [void]
+      def push_state_for_requirements(new_requirements, requires_sort = true, new_activated = activated)
+        new_requirements = sort_dependencies(new_requirements.uniq, new_activated, conflicts) if requires_sort
+        new_requirement = nil
+        loop do
+          new_requirement = new_requirements.shift
+          break if new_requirement.nil? || states.none? { |s| s.requirement == new_requirement }
+        end
+        new_name = new_requirement ? name_for(new_requirement) : ''.freeze
+        possibilities = possibilities_for_requirement(new_requirement)
+        handle_missing_or_push_dependency_state DependencyState.new(
+          new_name, new_requirements, new_activated,
+          new_requirement, possibilities, depth, conflicts.dup, unused_unwind_options.dup
+        )
+      end
+
+      # Checks a proposed requirement with any existing locked requirement
+      # before generating an array of possibilities for it.
+      # @param [Object] requirement the proposed requirement
+      # @param [Object] activated
+      # @return [Array] possibilities
+      def possibilities_for_requirement(requirement, activated = self.activated)
+        return [] unless requirement
+        if locked_requirement_named(name_for(requirement))
+          return locked_requirement_possibility_set(requirement, activated)
+        end
+
+        group_possibilities(search_for(requirement))
+      end
+
+      # @param [Object] requirement the proposed requirement
+      # @param [Object] activated
+      # @return [Array] possibility set containing only the locked requirement, if any
+      def locked_requirement_possibility_set(requirement, activated = self.activated)
+        all_possibilities = search_for(requirement)
+        locked_requirement = locked_requirement_named(name_for(requirement))
+
+        # Longwinded way to build a possibilities array with either the locked
+        # requirement or nothing in it. Required, since the API for
+        # locked_requirement isn't guaranteed.
+        locked_possibilities = all_possibilities.select do |possibility|
+          requirement_satisfied_by?(locked_requirement, activated, possibility)
+        end
+
+        group_possibilities(locked_possibilities)
+      end
+
+      # Build an array of PossibilitySets, with each element representing a group of
+      # dependency versions that all have the same sub-dependency version constraints
+      # and are contiguous.
+      # @param [Array] possibilities an array of possibilities
+      # @return [Array<PossibilitySet>] an array of possibility sets
+      def group_possibilities(possibilities)
+        possibility_sets = []
+        current_possibility_set = nil
+
+        possibilities.reverse_each do |possibility|
+          dependencies = dependencies_for(possibility)
+          if current_possibility_set && dependencies_equal?(current_possibility_set.dependencies, dependencies)
+            current_possibility_set.possibilities.unshift(possibility)
+          else
+            possibility_sets.unshift(PossibilitySet.new(dependencies, [possibility]))
+            current_possibility_set = possibility_sets.first
+          end
+        end
+
+        possibility_sets
+      end
+
+      # Pushes a new {DependencyState}.
+      # If the {#specification_provider} says to
+      # {SpecificationProvider#allow_missing?} that particular requirement, and
+      # there are no possibilities for that requirement, then `state` is not
+      # pushed, and the vertex in {#activated} is removed, and we continue
+      # resolving the remaining requirements.
+      # @param [DependencyState] state
+      # @return [void]
+      def handle_missing_or_push_dependency_state(state)
+        if state.requirement && state.possibilities.empty? && allow_missing?(state.requirement)
+          state.activated.detach_vertex_named(state.name)
+          push_state_for_requirements(state.requirements.dup, false, state.activated)
+        else
+          states.push(state).tap { activated.tag(state) }
+        end
+      end
+    end
+  end
+end
diff --git a/lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb b/lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb
new file mode 100644
index 0000000000..95eaab5991
--- /dev/null
+++ b/lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require_relative 'dependency_graph'
+
+module Bundler::Molinillo
+  # This class encapsulates a dependency resolver.
+  # The resolver is responsible for determining which set of dependencies to
+  # activate, with feedback from the {#specification_provider}
+  #
+  #
+  class Resolver
+    require_relative 'resolution'
+
+    # @return [SpecificationProvider] the specification provider used
+    #   in the resolution process
+    attr_reader :specification_provider
+
+    # @return [UI] the UI module used to communicate back to the user
+    #   during the resolution process
+    attr_reader :resolver_ui
+
+    # Initializes a new resolver.
+    # @param  [SpecificationProvider] specification_provider
+    #   see {#specification_provider}
+    # @param  [UI] resolver_ui
+    #   see {#resolver_ui}
+    def initialize(specification_provider, resolver_ui)
+      @specification_provider = specification_provider
+      @resolver_ui = resolver_ui
+    end
+
+    # Resolves the requested dependencies into a {DependencyGraph},
+    # locking to the base dependency graph (if specified)
+    # @param [Array] requested an array of 'requested' dependencies that the
+    #   {#specification_provider} can understand
+    # @param [DependencyGraph,nil] base the base dependency graph to which
+    #   dependencies should be 'locked'
+    def resolve(requested, base = DependencyGraph.new)
+      Resolution.new(specification_provider,
+                     resolver_ui,
+                     requested,
+                     base).
+        resolve
+    end
+  end
+end
diff --git a/lib/bundler/vendor/molinillo/lib/molinillo/state.rb b/lib/bundler/vendor/molinillo/lib/molinillo/state.rb
new file mode 100644
index 0000000000..68fa1f54e3
--- /dev/null
+++ b/lib/bundler/vendor/molinillo/lib/molinillo/state.rb
@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module Bundler::Molinillo
+  # A state that a {Resolution} can be in
+  # @attr [String] name the name of the current requirement
+  # @attr [Array<Object>] requirements currently unsatisfied requirements
+  # @attr [DependencyGraph] activated the graph of activated dependencies
+  # @attr [Object] requirement the current requirement
+  # @attr [Object] possibilities the possibilities to satisfy the current requirement
+  # @attr [Integer] depth the depth of the resolution
+  # @attr [Hash] conflicts unresolved conflicts, indexed by dependency name
+  # @attr [Array<UnwindDetails>] unused_unwind_options unwinds for previous conflicts that weren't explored
+  ResolutionState = Struct.new(
+    :name,
+    :requirements,
+    :activated,
+    :requirement,
+    :possibilities,
+    :depth,
+    :conflicts,
+    :unused_unwind_options
+  )
+
+  class ResolutionState
+    # Returns an empty resolution state
+    # @return [ResolutionState] an empty state
+    def self.empty
+      new(nil, [], DependencyGraph.new, nil, nil, 0, {}, [])
+    end
+  end
+
+  # A state that encapsulates a set of {#requirements} with an {Array} of
+  # possibilities
+  class DependencyState < ResolutionState
+    # Removes a possibility from `self`
+    # @return [PossibilityState] a state with a single possibility,
+    #  the possibility that was removed from `self`
+    def pop_possibility_state
+      PossibilityState.new(
+        name,
+        requirements.dup,
+        activated,
+        requirement,
+        [possibilities.pop],
+        depth + 1,
+        conflicts.dup,
+        unused_unwind_options.dup
+      ).tap do |state|
+        state.activated.tag(state)
+      end
+    end
+  end
+
+  # A state that encapsulates a single possibility to fulfill the given
+  # {#requirement}
+  class PossibilityState < ResolutionState
+  end
+end
diff --git a/lib/bundler/vendor/net-http-persistent/README.rdoc b/lib/bundler/vendor/net-http-persistent/README.rdoc
new file mode 100644
index 0000000000..4f95ad33ba
--- /dev/null
+++ b/lib/bundler/vendor/net-http-persistent/README.rdoc
@@ -0,0 +1,82 @@
+= net-http-persistent
+
+home :: https://github.com/drbrain/net-http-persistent
+rdoc :: http://docs.seattlerb.org/net-http-persistent
+
+== DESCRIPTION:
+
+Manages persistent connections using Net::HTTP including a thread pool for
+connecting to multiple hosts.
+
+Using persistent HTTP connections can dramatically increase the speed of HTTP.
+Creating a new HTTP connection for every request involves an extra TCP
+round-trip and causes TCP congestion avoidance negotiation to start over.
+
+Net::HTTP supports persistent connections with some API methods but does not
+make setting up a single persistent connection or managing multiple
+connections easy.  Net::HTTP::Persistent wraps Net::HTTP and allows you to
+focus on how to make HTTP requests.
+
+== FEATURES/PROBLEMS:
+
+* Supports TLS with secure defaults
+* Thread-safe
+* Pure ruby
+
+== SYNOPSIS
+
+The following example will make two requests to the same server.  The
+connection is kept alive between requests:
+
+    require 'net/http/persistent'
+
+    uri = URI 'http://example.com/awesome/web/service'
+
+    http = Net::HTTP::Persistent.new name: 'my_app_name'
+
+    # perform a GET
+    response = http.request uri
+
+    # create a POST
+    post_uri = uri + 'create'
+    post = Net::HTTP::Post.new post_uri.path
+    post.set_form_data 'some' => 'cool data'
+
+    # perform the POST, the URI is always required
+    response = http.request post_uri, post
+
+    # if you are done making http requests, or won't make requests for several
+    # minutes
+    http.shutdown
+
+Please see the documentation on Net::HTTP::Persistent for more information,
+including SSL connection verification, header handling and tunable options.
+
+== INSTALL:
+
+  gem install net-http-persistent
+
+== LICENSE:
+
+(The MIT License)
+
+Copyright (c) Eric Hodel, Aaron Patterson
+
+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.
diff --git a/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb b/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb
new file mode 100644
index 0000000000..beff6d658b
--- /dev/null
+++ b/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb
@@ -0,0 +1,1073 @@
+require 'net/http'
+require_relative '../../../../uri/lib/uri'
+require 'cgi' # for escaping
+require_relative '../../../../connection_pool/lib/connection_pool'
+
+autoload :OpenSSL, 'openssl'
+
+##
+# Persistent connections for Net::HTTP
+#
+# Bundler::Persistent::Net::HTTP::Persistent maintains persistent connections across all the
+# servers you wish to talk to.  For each host:port you communicate with a
+# single persistent connection is created.
+#
+# Connections will be shared across threads through a connection pool to
+# increase reuse of connections.
+#
+# You can shut down any remaining HTTP connections when done by calling
+# #shutdown.
+#
+# Example:
+#
+#   require 'bundler/vendor/net-http-persistent/lib/net/http/persistent'
+#
+#   uri = Bundler::URI 'http://example.com/awesome/web/service'
+#
+#   http = Bundler::Persistent::Net::HTTP::Persistent.new
+#
+#   # perform a GET
+#   response = http.request uri
+#
+#   # or
+#
+#   get = Net::HTTP::Get.new uri.request_uri
+#   response = http.request get
+#
+#   # create a POST
+#   post_uri = uri + 'create'
+#   post = Net::HTTP::Post.new post_uri.path
+#   post.set_form_data 'some' => 'cool data'
+#
+#   # perform the POST, the Bundler::URI is always required
+#   response http.request post_uri, post
+#
+# Note that for GET, HEAD and other requests that do not have a body you want
+# to use Bundler::URI#request_uri not Bundler::URI#path.  The request_uri contains the query
+# params which are sent in the body for other requests.
+#
+# == TLS/SSL
+#
+# TLS connections are automatically created depending upon the scheme of the
+# Bundler::URI.  TLS connections are automatically verified against the default
+# certificate store for your computer.  You can override this by changing
+# verify_mode or by specifying an alternate cert_store.
+#
+# Here are the TLS settings, see the individual methods for documentation:
+#
+# #certificate        :: This client's certificate
+# #ca_file            :: The certificate-authorities
+# #ca_path            :: Directory with certificate-authorities
+# #cert_store         :: An SSL certificate store
+# #ciphers            :: List of SSl ciphers allowed
+# #private_key        :: The client's SSL private key
+# #reuse_ssl_sessions :: Reuse a previously opened SSL session for a new
+#                        connection
+# #ssl_timeout        :: Session lifetime
+# #ssl_version        :: Which specific SSL version to use
+# #verify_callback    :: For server certificate verification
+# #verify_depth       :: Depth of certificate verification
+# #verify_mode        :: How connections should be verified
+#
+# == Proxies
+#
+# A proxy can be set through #proxy= or at initialization time by providing a
+# second argument to ::new.  The proxy may be the Bundler::URI of the proxy server or
+# <code>:ENV</code> which will consult environment variables.
+#
+# See #proxy= and #proxy_from_env for details.
+#
+# == Headers
+#
+# Headers may be specified for use in every request.  #headers are appended to
+# any headers on the request.  #override_headers replace existing headers on
+# the request.
+#
+# The difference between the two can be seen in setting the User-Agent.  Using
+# <code>http.headers['User-Agent'] = 'MyUserAgent'</code> will send "Ruby,
+# MyUserAgent" while <code>http.override_headers['User-Agent'] =
+# 'MyUserAgent'</code> will send "MyUserAgent".
+#
+# == Tuning
+#
+# === Segregation
+#
+# Each Bundler::Persistent::Net::HTTP::Persistent instance has its own pool of connections.  There
+# is no sharing with other instances (as was true in earlier versions).
+#
+# === Idle Timeout
+#
+# If a connection hasn't been used for this number of seconds it will
+# automatically be reset upon the next use to avoid attempting to send to a
+# closed connection.  The default value is 5 seconds. nil means no timeout.
+# Set through #idle_timeout.
+#
+# Reducing this value may help avoid the "too many connection resets" error
+# when sending non-idempotent requests while increasing this value will cause
+# fewer round-trips.
+#
+# === Read Timeout
+#
+# The amount of time allowed between reading two chunks from the socket.  Set
+# through #read_timeout
+#
+# === Max Requests
+#
+# The number of requests that should be made before opening a new connection.
+# Typically many keep-alive capable servers tune this to 100 or less, so the
+# 101st request will fail with ECONNRESET. If unset (default), this value has
+# no effect, if set, connections will be reset on the request after
+# max_requests.
+#
+# === Open Timeout
+#
+# The amount of time to wait for a connection to be opened.  Set through
+# #open_timeout.
+#
+# === Socket Options
+#
+# Socket options may be set on newly-created connections.  See #socket_options
+# for details.
+#
+# === Connection Termination
+#
+# If you are done using the Bundler::Persistent::Net::HTTP::Persistent instance you may shut down
+# all the connections in the current thread with #shutdown.  This is not
+# recommended for normal use, it should only be used when it will be several
+# minutes before you make another HTTP request.
+#
+# If you are using multiple threads, call #shutdown in each thread when the
+# thread is done making requests.  If you don't call shutdown, that's OK.
+# Ruby will automatically garbage collect and shutdown your HTTP connections
+# when the thread terminates.
+
+class Bundler::Persistent::Net::HTTP::Persistent
+
+  ##
+  # The beginning of Time
+
+  EPOCH = Time.at 0 # :nodoc:
+
+  ##
+  # Is OpenSSL available?  This test works with autoload
+
+  HAVE_OPENSSL = defined? OpenSSL::SSL # :nodoc:
+
+  ##
+  # The default connection pool size is 1/4 the allowed open files
+  # (<code>ulimit -n</code>) or 256 if your OS does not support file handle
+  # limits (typically windows).
+
+  if Process.const_defined? :RLIMIT_NOFILE
+    open_file_limits = Process.getrlimit(Process::RLIMIT_NOFILE)
+
+    # Under JRuby on Windows Process responds to `getrlimit` but returns something that does not match docs
+    if open_file_limits.respond_to?(:first)
+      DEFAULT_POOL_SIZE = open_file_limits.first / 4
+    else
+      DEFAULT_POOL_SIZE = 256
+    end
+  else
+    DEFAULT_POOL_SIZE = 256
+  end
+
+  ##
+  # The version of Bundler::Persistent::Net::HTTP::Persistent you are using
+
+  VERSION = '4.0.0'
+
+  ##
+  # Error class for errors raised by Bundler::Persistent::Net::HTTP::Persistent.  Various
+  # SystemCallErrors are re-raised with a human-readable message under this
+  # class.
+
+  class Error < StandardError; end
+
+  ##
+  # Use this method to detect the idle timeout of the host at +uri+.  The
+  # value returned can be used to configure #idle_timeout.  +max+ controls the
+  # maximum idle timeout to detect.
+  #
+  # After
+  #
+  # Idle timeout detection is performed by creating a connection then
+  # performing a HEAD request in a loop until the connection terminates
+  # waiting one additional second per loop.
+  #
+  # NOTE:  This may not work on ruby > 1.9.
+
+  def self.detect_idle_timeout uri, max = 10
+    uri = Bundler::URI uri unless Bundler::URI::Generic === uri
+    uri += '/'
+
+    req = Net::HTTP::Head.new uri.request_uri
+
+    http = new 'net-http-persistent detect_idle_timeout'
+
+    http.connection_for uri do |connection|
+      sleep_time = 0
+
+      http = connection.http
+
+      loop do
+        response = http.request req
+
+        $stderr.puts "HEAD #{uri} => #{response.code}" if $DEBUG
+
+        unless Net::HTTPOK === response then
+          raise Error, "bad response code #{response.code} detecting idle timeout"
+        end
+
+        break if sleep_time >= max
+
+        sleep_time += 1
+
+        $stderr.puts "sleeping #{sleep_time}" if $DEBUG
+        sleep sleep_time
+      end
+    end
+  rescue
+    # ignore StandardErrors, we've probably found the idle timeout.
+  ensure
+    return sleep_time unless $!
+  end
+
+  ##
+  # This client's OpenSSL::X509::Certificate
+
+  attr_reader :certificate
+
+  ##
+  # For Net::HTTP parity
+
+  alias cert certificate
+
+  ##
+  # An SSL certificate authority.  Setting this will set verify_mode to
+  # VERIFY_PEER.
+
+  attr_reader :ca_file
+
+  ##
+  # A directory of SSL certificates to be used as certificate authorities.
+  # Setting this will set verify_mode to VERIFY_PEER.
+
+  attr_reader :ca_path
+
+  ##
+  # An SSL certificate store.  Setting this will override the default
+  # certificate store.  See verify_mode for more information.
+
+  attr_reader :cert_store
+
+  ##
+  # The ciphers allowed for SSL connections
+
+  attr_reader :ciphers
+
+  ##
+  # Sends debug_output to this IO via Net::HTTP#set_debug_output.
+  #
+  # Never use this method in production code, it causes a serious security
+  # hole.
+
+  attr_accessor :debug_output
+
+  ##
+  # Current connection generation
+
+  attr_reader :generation # :nodoc:
+
+  ##
+  # Headers that are added to every request using Net::HTTP#add_field
+
+  attr_reader :headers
+
+  ##
+  # Maps host:port to an HTTP version.  This allows us to enable version
+  # specific features.
+
+  attr_reader :http_versions
+
+  ##
+  # Maximum time an unused connection can remain idle before being
+  # automatically closed.
+
+  attr_accessor :idle_timeout
+
+  ##
+  # Maximum number of requests on a connection before it is considered expired
+  # and automatically closed.
+
+  attr_accessor :max_requests
+
+  ##
+  # Number of retries to perform if a request fails.
+  #
+  # See also #max_retries=, Net::HTTP#max_retries=.
+
+  attr_reader :max_retries
+
+  ##
+  # The value sent in the Keep-Alive header.  Defaults to 30.  Not needed for
+  # HTTP/1.1 servers.
+  #
+  # This may not work correctly for HTTP/1.0 servers
+  #
+  # This method may be removed in a future version as RFC 2616 does not
+  # require this header.
+
+  attr_accessor :keep_alive
+
+  ##
+  # The name for this collection of persistent connections.
+
+  attr_reader :name
+
+  ##
+  # Seconds to wait until a connection is opened.  See Net::HTTP#open_timeout
+
+  attr_accessor :open_timeout
+
+  ##
+  # Headers that are added to every request using Net::HTTP#[]=
+
+  attr_reader :override_headers
+
+  ##
+  # This client's SSL private key
+
+  attr_reader :private_key
+
+  ##
+  # For Net::HTTP parity
+
+  alias key private_key
+
+  ##
+  # The URL through which requests will be proxied
+
+  attr_reader :proxy_uri
+
+  ##
+  # List of host suffixes which will not be proxied
+
+  attr_reader :no_proxy
+
+  ##
+  # Test-only accessor for the connection pool
+
+  attr_reader :pool # :nodoc:
+
+  ##
+  # Seconds to wait until reading one block.  See Net::HTTP#read_timeout
+
+  attr_accessor :read_timeout
+
+  ##
+  # Seconds to wait until writing one block.  See Net::HTTP#write_timeout
+
+  attr_accessor :write_timeout
+
+  ##
+  # By default SSL sessions are reused to avoid extra SSL handshakes.  Set
+  # this to false if you have problems communicating with an HTTPS server
+  # like:
+  #
+  #   SSL_connect [...] read finished A: unexpected message (OpenSSL::SSL::SSLError)
+
+  attr_accessor :reuse_ssl_sessions
+
+  ##
+  # An array of options for Socket#setsockopt.
+  #
+  # By default the TCP_NODELAY option is set on sockets.
+  #
+  # To set additional options append them to this array:
+  #
+  #   http.socket_options << [Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, 1]
+
+  attr_reader :socket_options
+
+  ##
+  # Current SSL connection generation
+
+  attr_reader :ssl_generation # :nodoc:
+
+  ##
+  # SSL session lifetime
+
+  attr_reader :ssl_timeout
+
+  ##
+  # SSL version to use.
+  #
+  # By default, the version will be negotiated automatically between client
+  # and server.  Ruby 1.9 and newer only. Deprecated since Ruby 2.5.
+
+  attr_reader :ssl_version
+
+  ##
+  # Minimum SSL version to use, e.g. :TLS1_1
+  #
+  # By default, the version will be negotiated automatically between client
+  # and server.  Ruby 2.5 and newer only.
+
+  attr_reader :min_version
+
+  ##
+  # Maximum SSL version to use, e.g. :TLS1_2
+  #
+  # By default, the version will be negotiated automatically between client
+  # and server.  Ruby 2.5 and newer only.
+
+  attr_reader :max_version
+
+  ##
+  # Where this instance's last-use times live in the thread local variables
+
+  attr_reader :timeout_key # :nodoc:
+
+  ##
+  # SSL verification callback.  Used when ca_file or ca_path is set.
+
+  attr_reader :verify_callback
+
+  ##
+  # Sets the depth of SSL certificate verification
+
+  attr_reader :verify_depth
+
+  ##
+  # HTTPS verify mode.  Defaults to OpenSSL::SSL::VERIFY_PEER which verifies
+  # the server certificate.
+  #
+  # If no ca_file, ca_path or cert_store is set the default system certificate
+  # store is used.
+  #
+  # You can use +verify_mode+ to override any default values.
+
+  attr_reader :verify_mode
+
+  ##
+  # Creates a new Bundler::Persistent::Net::HTTP::Persistent.
+  #
+  # Set a +name+ for fun.  Your library name should be good enough, but this
+  # otherwise has no purpose.
+  #
+  # +proxy+ may be set to a Bundler::URI::HTTP or :ENV to pick up proxy options from
+  # the environment.  See proxy_from_env for details.
+  #
+  # In order to use a Bundler::URI for the proxy you may need to do some extra work
+  # beyond Bundler::URI parsing if the proxy requires a password:
+  #
+  #   proxy = Bundler::URI 'http://proxy.example'
+  #   proxy.user     = 'AzureDiamond'
+  #   proxy.password = 'hunter2'
+  #
+  # Set +pool_size+ to limit the maximum number of connections allowed.
+  # Defaults to 1/4 the number of allowed file handles or 256 if your OS does
+  # not support a limit on allowed file handles.  You can have no more than
+  # this many threads with active HTTP transactions.
+
+  def initialize name: nil, proxy: nil, pool_size: DEFAULT_POOL_SIZE
+    @name = name
+
+    @debug_output     = nil
+    @proxy_uri        = nil
+    @no_proxy         = []
+    @headers          = {}
+    @override_headers = {}
+    @http_versions    = {}
+    @keep_alive       = 30
+    @open_timeout     = nil
+    @read_timeout     = nil
+    @write_timeout    = nil
+    @idle_timeout     = 5
+    @max_requests     = nil
+    @max_retries      = 1
+    @socket_options   = []
+    @ssl_generation   = 0 # incremented when SSL session variables change
+
+    @socket_options << [Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1] if
+      Socket.const_defined? :TCP_NODELAY
+
+    @pool = Bundler::Persistent::Net::HTTP::Persistent::Pool.new size: pool_size do |http_args|
+      Bundler::Persistent::Net::HTTP::Persistent::Connection.new Net::HTTP, http_args, @ssl_generation
+    end
+
+    @certificate        = nil
+    @ca_file            = nil
+    @ca_path            = nil
+    @ciphers            = nil
+    @private_key        = nil
+    @ssl_timeout        = nil
+    @ssl_version        = nil
+    @min_version        = nil
+    @max_version        = nil
+    @verify_callback    = nil
+    @verify_depth       = nil
+    @verify_mode        = nil
+    @cert_store         = nil
+
+    @generation         = 0 # incremented when proxy Bundler::URI changes
+
+    if HAVE_OPENSSL then
+      @verify_mode        = OpenSSL::SSL::VERIFY_PEER
+      @reuse_ssl_sessions = OpenSSL::SSL.const_defined? :Session
+    end
+
+    self.proxy = proxy if proxy
+  end
+
+  ##
+  # Sets this client's OpenSSL::X509::Certificate
+
+  def certificate= certificate
+    @certificate = certificate
+
+    reconnect_ssl
+  end
+
+  # For Net::HTTP parity
+  alias cert= certificate=
+
+  ##
+  # Sets the SSL certificate authority file.
+
+  def ca_file= file
+    @ca_file = file
+
+    reconnect_ssl
+  end
+
+  ##
+  # Sets the SSL certificate authority path.
+
+  def ca_path= path
+    @ca_path = path
+
+    reconnect_ssl
+  end
+
+  ##
+  # Overrides the default SSL certificate store used for verifying
+  # connections.
+
+  def cert_store= store
+    @cert_store = store
+
+    reconnect_ssl
+  end
+
+  ##
+  # The ciphers allowed for SSL connections
+
+  def ciphers= ciphers
+    @ciphers = ciphers
+
+    reconnect_ssl
+  end
+
+  ##
+  # Creates a new connection for +uri+
+
+  def connection_for uri
+    use_ssl = uri.scheme.downcase == 'https'
+
+    net_http_args = [uri.hostname, uri.port]
+
+    # I'm unsure if uri.host or uri.hostname should be checked against
+    # the proxy bypass list.
+    if @proxy_uri and not proxy_bypass? uri.host, uri.port then
+      net_http_args.concat @proxy_args
+    else
+      net_http_args.concat [nil, nil, nil, nil]
+    end
+
+    connection = @pool.checkout net_http_args
+
+    http = connection.http
+
+    connection.ressl @ssl_generation if
+      connection.ssl_generation != @ssl_generation
+
+    if not http.started? then
+      ssl   http if use_ssl
+      start http
+    elsif expired? connection then
+      reset connection
+    end
+
+    http.keep_alive_timeout = @idle_timeout  if @idle_timeout
+    http.max_retries        = @max_retries   if http.respond_to?(:max_retries=)
+    http.read_timeout       = @read_timeout  if @read_timeout
+    http.write_timeout      = @write_timeout if
+      @write_timeout && http.respond_to?(:write_timeout=)
+
+    return yield connection
+  rescue Errno::ECONNREFUSED
+    address = http.proxy_address || http.address
+    port    = http.proxy_port    || http.port
+
+    raise Error, "connection refused: #{address}:#{port}"
+  rescue Errno::EHOSTDOWN
+    address = http.proxy_address || http.address
+    port    = http.proxy_port    || http.port
+
+    raise Error, "host down: #{address}:#{port}"
+  ensure
+    @pool.checkin net_http_args
+  end
+
+  ##
+  # CGI::escape wrapper
+
+  def escape str
+    CGI.escape str if str
+  end
+
+  ##
+  # CGI::unescape wrapper
+
+  def unescape str
+    CGI.unescape str if str
+  end
+
+
+  ##
+  # Returns true if the connection should be reset due to an idle timeout, or
+  # maximum request count, false otherwise.
+
+  def expired? connection
+    return true  if     @max_requests && connection.requests >= @max_requests
+    return false unless @idle_timeout
+    return true  if     @idle_timeout.zero?
+
+    Time.now - connection.last_use > @idle_timeout
+  end
+
+  ##
+  # Starts the Net::HTTP +connection+
+
+  def start http
+    http.set_debug_output @debug_output if @debug_output
+    http.open_timeout = @open_timeout if @open_timeout
+
+    http.start
+
+    socket = http.instance_variable_get :@socket
+
+    if socket then # for fakeweb
+      @socket_options.each do |option|
+        socket.io.setsockopt(*option)
+      end
+    end
+  end
+
+  ##
+  # Finishes the Net::HTTP +connection+
+
+  def finish connection
+    connection.finish
+
+    connection.http.instance_variable_set :@last_communicated, nil
+    connection.http.instance_variable_set :@ssl_session, nil unless
+      @reuse_ssl_sessions
+  end
+
+  ##
+  # Returns the HTTP protocol version for +uri+
+
+  def http_version uri
+    @http_versions["#{uri.hostname}:#{uri.port}"]
+  end
+
+  ##
+  # Adds "http://" to the String +uri+ if it is missing.
+
+  def normalize_uri uri
+    (uri =~ /^https?:/) ? uri : "http://#{uri}"
+  end
+
+  ##
+  # Set the maximum number of retries for a request.
+  #
+  # Defaults to one retry.
+  #
+  # Set this to 0 to disable retries.
+
+  def max_retries= retries
+    retries = retries.to_int
+
+    raise ArgumentError, "max_retries must be positive" if retries < 0
+
+    @max_retries = retries
+
+    reconnect
+  end
+
+  ##
+  # Sets this client's SSL private key
+
+  def private_key= key
+    @private_key = key
+
+    reconnect_ssl
+  end
+
+  # For Net::HTTP parity
+  alias key= private_key=
+
+  ##
+  # Sets the proxy server.  The +proxy+ may be the Bundler::URI of the proxy server,
+  # the symbol +:ENV+ which will read the proxy from the environment or nil to
+  # disable use of a proxy.  See #proxy_from_env for details on setting the
+  # proxy from the environment.
+  #
+  # If the proxy Bundler::URI is set after requests have been made, the next request
+  # will shut-down and re-open all connections.
+  #
+  # The +no_proxy+ query parameter can be used to specify hosts which shouldn't
+  # be reached via proxy; if set it should be a comma separated list of
+  # hostname suffixes, optionally with +:port+ appended, for example
+  # <tt>example.com,some.host:8080</tt>.
+
+  def proxy= proxy
+    @proxy_uri = case proxy
+                 when :ENV      then proxy_from_env
+                 when Bundler::URI::HTTP then proxy
+                 when nil       then # ignore
+                 else raise ArgumentError, 'proxy must be :ENV or a Bundler::URI::HTTP'
+                 end
+
+    @no_proxy.clear
+
+    if @proxy_uri then
+      @proxy_args = [
+        @proxy_uri.hostname,
+        @proxy_uri.port,
+        unescape(@proxy_uri.user),
+        unescape(@proxy_uri.password),
+      ]
+
+      @proxy_connection_id = [nil, *@proxy_args].join ':'
+
+      if @proxy_uri.query then
+        @no_proxy = CGI.parse(@proxy_uri.query)['no_proxy'].join(',').downcase.split(',').map { |x| x.strip }.reject { |x| x.empty? }
+      end
+    end
+
+    reconnect
+    reconnect_ssl
+  end
+
+  ##
+  # Creates a Bundler::URI for an HTTP proxy server from ENV variables.
+  #
+  # If +HTTP_PROXY+ is set a proxy will be returned.
+  #
+  # If +HTTP_PROXY_USER+ or +HTTP_PROXY_PASS+ are set the Bundler::URI is given the
+  # indicated user and password unless HTTP_PROXY contains either of these in
+  # the Bundler::URI.
+  #
+  # The +NO_PROXY+ ENV variable can be used to specify hosts which shouldn't
+  # be reached via proxy; if set it should be a comma separated list of
+  # hostname suffixes, optionally with +:port+ appended, for example
+  # <tt>example.com,some.host:8080</tt>. When set to <tt>*</tt> no proxy will
+  # be returned.
+  #
+  # For Windows users, lowercase ENV variables are preferred over uppercase ENV
+  # variables.
+
+  def proxy_from_env
+    env_proxy = ENV['http_proxy'] || ENV['HTTP_PROXY']
+
+    return nil if env_proxy.nil? or env_proxy.empty?
+
+    uri = Bundler::URI normalize_uri env_proxy
+
+    env_no_proxy = ENV['no_proxy'] || ENV['NO_PROXY']
+
+    # '*' is special case for always bypass
+    return nil if env_no_proxy == '*'
+
+    if env_no_proxy then
+      uri.query = "no_proxy=#{escape(env_no_proxy)}"
+    end
+
+    unless uri.user or uri.password then
+      uri.user     = escape ENV['http_proxy_user'] || ENV['HTTP_PROXY_USER']
+      uri.password = escape ENV['http_proxy_pass'] || ENV['HTTP_PROXY_PASS']
+    end
+
+    uri
+  end
+
+  ##
+  # Returns true when proxy should by bypassed for host.
+
+  def proxy_bypass? host, port
+    host = host.downcase
+    host_port = [host, port].join ':'
+
+    @no_proxy.each do |name|
+      return true if host[-name.length, name.length] == name or
+         host_port[-name.length, name.length] == name
+    end
+
+    false
+  end
+
+  ##
+  # Forces reconnection of all HTTP connections, including TLS/SSL
+  # connections.
+
+  def reconnect
+    @generation += 1
+  end
+
+  ##
+  # Forces reconnection of only TLS/SSL connections.
+
+  def reconnect_ssl
+    @ssl_generation += 1
+  end
+
+  ##
+  # Finishes then restarts the Net::HTTP +connection+
+
+  def reset connection
+    http = connection.http
+
+    finish connection
+
+    start http
+  rescue Errno::ECONNREFUSED
+    e = Error.new "connection refused: #{http.address}:#{http.port}"
+    e.set_backtrace $@
+    raise e
+  rescue Errno::EHOSTDOWN
+    e = Error.new "host down: #{http.address}:#{http.port}"
+    e.set_backtrace $@
+    raise e
+  end
+
+  ##
+  # Makes a request on +uri+.  If +req+ is nil a Net::HTTP::Get is performed
+  # against +uri+.
+  #
+  # If a block is passed #request behaves like Net::HTTP#request (the body of
+  # the response will not have been read).
+  #
+  # +req+ must be a Net::HTTPGenericRequest subclass (see Net::HTTP for a list).
+
+  def request uri, req = nil, &block
+    uri      = Bundler::URI uri
+    req      = request_setup req || uri
+    response = nil
+
+    connection_for uri do |connection|
+      http = connection.http
+
+      begin
+        connection.requests += 1
+
+        response = http.request req, &block
+
+        if req.connection_close? or
+          (response.http_version <= '1.0' and
+            not response.connection_keep_alive?) or
+            response.connection_close? then
+          finish connection
+        end
+      rescue Exception # make sure to close the connection when it was interrupted
+        finish connection
+
+        raise
+      ensure
+        connection.last_use = Time.now
+      end
+    end
+
+    @http_versions["#{uri.hostname}:#{uri.port}"] ||= response.http_version
+
+    response
+  end
+
+  ##
+  # Creates a GET request if +req_or_uri+ is a Bundler::URI and adds headers to the
+  # request.
+  #
+  # Returns the request.
+
+  def request_setup req_or_uri # :nodoc:
+    req = if req_or_uri.respond_to? 'request_uri' then
+            Net::HTTP::Get.new req_or_uri.request_uri
+          else
+            req_or_uri
+          end
+
+    @headers.each do |pair|
+      req.add_field(*pair)
+    end
+
+    @override_headers.each do |name, value|
+      req[name] = value
+    end
+
+    unless req['Connection'] then
+      req.add_field 'Connection', 'keep-alive'
+      req.add_field 'Keep-Alive', @keep_alive
+    end
+
+    req
+  end
+
+  ##
+  # Shuts down all connections
+  #
+  # *NOTE*: Calling shutdown for can be dangerous!
+  #
+  # If any thread is still using a connection it may cause an error!  Call
+  # #shutdown when you are completely done making requests!
+
+  def shutdown
+    @pool.shutdown { |http| http.finish }
+  end
+
+  ##
+  # Enables SSL on +connection+
+
+  def ssl connection
+    connection.use_ssl = true
+
+    connection.ciphers     = @ciphers     if @ciphers
+    connection.ssl_timeout = @ssl_timeout if @ssl_timeout
+    connection.ssl_version = @ssl_version if @ssl_version
+    connection.min_version = @min_version if @min_version
+    connection.max_version = @max_version if @max_version
+
+    connection.verify_depth = @verify_depth
+    connection.verify_mode  = @verify_mode
+
+    if OpenSSL::SSL::VERIFY_PEER == OpenSSL::SSL::VERIFY_NONE and
+       not Object.const_defined?(:I_KNOW_THAT_OPENSSL_VERIFY_PEER_EQUALS_VERIFY_NONE_IS_WRONG) then
+      warn <<-WARNING
+                             !!!SECURITY WARNING!!!
+
+The SSL HTTP connection to:
+
+  #{connection.address}:#{connection.port}
+
+                           !!!MAY NOT BE VERIFIED!!!
+
+On your platform your OpenSSL implementation is broken.
+
+There is no difference between the values of VERIFY_NONE and VERIFY_PEER.
+
+This means that attempting to verify the security of SSL connections may not
+work.  This exposes you to man-in-the-middle exploits, snooping on the
+contents of your connection and other dangers to the security of your data.
+
+To disable this warning define the following constant at top-level in your
+application:
+
+  I_KNOW_THAT_OPENSSL_VERIFY_PEER_EQUALS_VERIFY_NONE_IS_WRONG = nil
+
+      WARNING
+    end
+
+    connection.ca_file = @ca_file if @ca_file
+    connection.ca_path = @ca_path if @ca_path
+
+    if @ca_file or @ca_path then
+      connection.verify_mode = OpenSSL::SSL::VERIFY_PEER
+      connection.verify_callback = @verify_callback if @verify_callback
+    end
+
+    if @certificate and @private_key then
+      connection.cert = @certificate
+      connection.key  = @private_key
+    end
+
+    connection.cert_store = if @cert_store then
+                              @cert_store
+                            else
+                              store = OpenSSL::X509::Store.new
+                              store.set_default_paths
+                              store
+                            end
+  end
+
+  ##
+  # SSL session lifetime
+
+  def ssl_timeout= ssl_timeout
+    @ssl_timeout = ssl_timeout
+
+    reconnect_ssl
+  end
+
+  ##
+  # SSL version to use
+
+  def ssl_version= ssl_version
+    @ssl_version = ssl_version
+
+    reconnect_ssl
+  end
+
+  ##
+  # Minimum SSL version to use
+
+  def min_version= min_version
+    @min_version = min_version
+
+    reconnect_ssl
+  end
+
+  ##
+  # maximum SSL version to use
+
+  def max_version= max_version
+    @max_version = max_version
+
+    reconnect_ssl
+  end
+
+  ##
+  # Sets the depth of SSL certificate verification
+
+  def verify_depth= verify_depth
+    @verify_depth = verify_depth
+
+    reconnect_ssl
+  end
+
+  ##
+  # Sets the HTTPS verify mode.  Defaults to OpenSSL::SSL::VERIFY_PEER.
+  #
+  # Setting this to VERIFY_NONE is a VERY BAD IDEA and should NEVER be used.
+  # Securely transfer the correct certificate and update the default
+  # certificate store or set the ca file instead.
+
+  def verify_mode= verify_mode
+    @verify_mode = verify_mode
+
+    reconnect_ssl
+  end
+
+  ##
+  # SSL verification callback.
+
+  def verify_callback= callback
+    @verify_callback = callback
+
+    reconnect_ssl
+  end
+end
+
+require_relative 'persistent/connection'
+require_relative 'persistent/pool'
+
diff --git a/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/connection.rb b/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/connection.rb
new file mode 100644
index 0000000000..a57a5d1352
--- /dev/null
+++ b/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/connection.rb
@@ -0,0 +1,40 @@
+##
+# A Net::HTTP connection wrapper that holds extra information for managing the
+# connection's lifetime.
+
+class Bundler::Persistent::Net::HTTP::Persistent::Connection # :nodoc:
+
+  attr_accessor :http
+
+  attr_accessor :last_use
+
+  attr_accessor :requests
+
+  attr_accessor :ssl_generation
+
+  def initialize http_class, http_args, ssl_generation
+    @http           = http_class.new(*http_args)
+    @ssl_generation = ssl_generation
+
+    reset
+  end
+
+  def finish
+    @http.finish
+  rescue IOError
+  ensure
+    reset
+  end
+
+  def reset
+    @last_use = Bundler::Persistent::Net::HTTP::Persistent::EPOCH
+    @requests = 0
+  end
+
+  def ressl ssl_generation
+    @ssl_generation = ssl_generation
+
+    finish
+  end
+
+end
diff --git a/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/pool.rb b/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/pool.rb
new file mode 100644
index 0000000000..9dfa6ffdb1
--- /dev/null
+++ b/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/pool.rb
@@ -0,0 +1,53 @@
+class Bundler::Persistent::Net::HTTP::Persistent::Pool < Bundler::ConnectionPool # :nodoc:
+
+  attr_reader :available # :nodoc:
+  attr_reader :key # :nodoc:
+
+  def initialize(options = {}, &block)
+    super
+
+    @available = Bundler::Persistent::Net::HTTP::Persistent::TimedStackMulti.new(@size, &block)
+    @key = "current-#{@available.object_id}"
+  end
+
+  def checkin net_http_args
+    stack = Thread.current[@key][net_http_args] ||= []
+
+    raise Bundler::ConnectionPool::Error, 'no connections are checked out' if
+      stack.empty?
+
+    conn = stack.pop
+
+    if stack.empty?
+      @available.push conn, connection_args: net_http_args
+
+      Thread.current[@key].delete(net_http_args)
+      Thread.current[@key] = nil if Thread.current[@key].empty?
+    end
+
+    nil
+  end
+
+  def checkout net_http_args
+    stacks = Thread.current[@key] ||= {}
+    stack  = stacks[net_http_args] ||= []
+
+    if stack.empty? then
+      conn = @available.pop connection_args: net_http_args
+    else
+      conn = stack.last
+    end
+
+    stack.push conn
+
+    conn
+  end
+
+  def shutdown
+    Thread.current[@key] = nil
+    super
+  end
+end
+
+require_relative 'timed_stack_multi'
+
diff --git a/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/timed_stack_multi.rb b/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/timed_stack_multi.rb
new file mode 100644
index 0000000000..2da881c554
--- /dev/null
+++ b/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/timed_stack_multi.rb
@@ -0,0 +1,79 @@
+class Bundler::Persistent::Net::HTTP::Persistent::TimedStackMulti < Bundler::ConnectionPool::TimedStack # :nodoc:
+
+  ##
+  # Returns a new hash that has arrays for keys
+  #
+  # Using a class method to limit the bindings referenced by the hash's
+  # default_proc
+
+  def self.hash_of_arrays # :nodoc:
+    Hash.new { |h,k| h[k] = [] }
+  end
+
+  def initialize(size = 0, &block)
+    super
+
+    @enqueued = 0
+    @ques = self.class.hash_of_arrays
+    @lru = {}
+    @key = :"connection_args-#{object_id}"
+  end
+
+  def empty?
+    (@created - @enqueued) >= @max
+  end
+
+  def length
+    @max - @created + @enqueued
+  end
+
+  private
+
+  def connection_stored? options = {} # :nodoc:
+    !@ques[options[:connection_args]].empty?
+  end
+
+  def fetch_connection options = {} # :nodoc:
+    connection_args = options[:connection_args]
+
+    @enqueued -= 1
+    lru_update connection_args
+    @ques[connection_args].pop
+  end
+
+  def lru_update connection_args # :nodoc:
+    @lru.delete connection_args
+    @lru[connection_args] = true
+  end
+
+  def shutdown_connections # :nodoc:
+    @ques.each_key do |key|
+      super connection_args: key
+    end
+  end
+
+  def store_connection obj, options = {} # :nodoc:
+    @ques[options[:connection_args]].push obj
+    @enqueued += 1
+  end
+
+  def try_create options = {} # :nodoc:
+    connection_args = options[:connection_args]
+
+    if @created >= @max && @enqueued >= 1
+      oldest, = @lru.first
+      @lru.delete oldest
+      @ques[oldest].pop
+
+      @created -= 1
+    end
+
+    if @created < @max
+      @created += 1
+      lru_update connection_args
+      return @create_block.call(connection_args)
+    end
+  end
+
+end
+
diff --git a/lib/bundler/vendor/thor/LICENSE.md b/lib/bundler/vendor/thor/LICENSE.md
new file mode 100644
index 0000000000..ef80540b2a
--- /dev/null
+++ b/lib/bundler/vendor/thor/LICENSE.md
@@ -0,0 +1,20 @@
+Copyright (c) 2008 Yehuda Katz, Eric Hodel, et al.
+
+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.
diff --git a/lib/bundler/vendor/thor/lib/thor.rb b/lib/bundler/vendor/thor/lib/thor.rb
new file mode 100644
index 0000000000..0794dbb522
--- /dev/null
+++ b/lib/bundler/vendor/thor/lib/thor.rb
@@ -0,0 +1,516 @@
+require_relative "thor/base"
+
+class Bundler::Thor
+  $thor_runner ||= false
+  class << self
+    # Allows for custom "Command" package naming.
+    #
+    # === Parameters
+    # name<String>
+    # options<Hash>
+    #
+    def package_name(name, _ = {})
+      @package_name = name.nil? || name == "" ? nil : name
+    end
+
+    # Sets the default command when thor is executed without an explicit command to be called.
+    #
+    # ==== Parameters
+    # meth<Symbol>:: name of the default command
+    #
+    def default_command(meth = nil)
+      if meth
+        @default_command = meth == :none ? "help" : meth.to_s
+      else
+        @default_command ||= from_superclass(:default_command, "help")
+      end
+    end
+    alias_method :default_task, :default_command
+
+    # Registers another Bundler::Thor subclass as a command.
+    #
+    # ==== Parameters
+    # klass<Class>:: Bundler::Thor subclass to register
+    # command<String>:: Subcommand name to use
+    # usage<String>:: Short usage for the subcommand
+    # description<String>:: Description for the subcommand
+    def register(klass, subcommand_name, usage, description, options = {})
+      if klass <= Bundler::Thor::Group
+        desc usage, description, options
+        define_method(subcommand_name) { |*args| invoke(klass, args) }
+      else
+        desc usage, description, options
+        subcommand subcommand_name, klass
+      end
+    end
+
+    # Defines the usage and the description of the next command.
+    #
+    # ==== Parameters
+    # usage<String>
+    # description<String>
+    # options<String>
+    #
+    def desc(usage, description, options = {})
+      if options[:for]
+        command = find_and_refresh_command(options[:for])
+        command.usage = usage             if usage
+        command.description = description if description
+      else
+        @usage = usage
+        @desc = description
+        @hide = options[:hide] || false
+      end
+    end
+
+    # Defines the long description of the next command.
+    #
+    # ==== Parameters
+    # long description<String>
+    #
+    def long_desc(long_description, options = {})
+      if options[:for]
+        command = find_and_refresh_command(options[:for])
+        command.long_description = long_description if long_description
+      else
+        @long_desc = long_description
+      end
+    end
+
+    # Maps an input to a command. If you define:
+    #
+    #   map "-T" => "list"
+    #
+    # Running:
+    #
+    #   thor -T
+    #
+    # Will invoke the list command.
+    #
+    # ==== Parameters
+    # Hash[String|Array => Symbol]:: Maps the string or the strings in the array to the given command.
+    #
+    def map(mappings = nil, **kw)
+      @map ||= from_superclass(:map, {})
+
+      if mappings && !kw.empty?
+        mappings = kw.merge!(mappings)
+      else
+        mappings ||= kw
+      end
+      if mappings
+        mappings.each do |key, value|
+          if key.respond_to?(:each)
+            key.each { |subkey| @map[subkey] = value }
+          else
+            @map[key] = value
+          end
+        end
+      end
+
+      @map
+    end
+
+    # Declares the options for the next command to be declared.
+    #
+    # ==== Parameters
+    # Hash[Symbol => Object]:: The hash key is the name of the option and the value
+    # is the type of the option. Can be :string, :array, :hash, :boolean, :numeric
+    # or :required (string). If you give a value, the type of the value is used.
+    #
+    def method_options(options = nil)
+      @method_options ||= {}
+      build_options(options, @method_options) if options
+      @method_options
+    end
+
+    alias_method :options, :method_options
+
+    # Adds an option to the set of method options. If :for is given as option,
+    # it allows you to change the options from a previous defined command.
+    #
+    #   def previous_command
+    #     # magic
+    #   end
+    #
+    #   method_option :foo => :bar, :for => :previous_command
+    #
+    #   def next_command
+    #     # magic
+    #   end
+    #
+    # ==== Parameters
+    # name<Symbol>:: The name of the argument.
+    # options<Hash>:: Described below.
+    #
+    # ==== Options
+    # :desc     - Description for the argument.
+    # :required - If the argument is required or not.
+    # :default  - Default value for this argument. It cannot be required and have default values.
+    # :aliases  - Aliases for this option.
+    # :type     - The type of the argument, can be :string, :hash, :array, :numeric or :boolean.
+    # :banner   - String to show on usage notes.
+    # :hide     - If you want to hide this option from the help.
+    #
+    def method_option(name, options = {})
+      scope = if options[:for]
+        find_and_refresh_command(options[:for]).options
+      else
+        method_options
+      end
+
+      build_option(name, options, scope)
+    end
+    alias_method :option, :method_option
+
+    # Prints help information for the given command.
+    #
+    # ==== Parameters
+    # shell<Bundler::Thor::Shell>
+    # command_name<String>
+    #
+    def command_help(shell, command_name)
+      meth = normalize_command_name(command_name)
+      command = all_commands[meth]
+      handle_no_command_error(meth) unless command
+
+      shell.say "Usage:"
+      shell.say "  #{banner(command).split("\n").join("\n  ")}"
+      shell.say
+      class_options_help(shell, nil => command.options.values)
+      if command.long_description
+        shell.say "Description:"
+        shell.print_wrapped(command.long_description, :indent => 2)
+      else
+        shell.say command.description
+      end
+    end
+    alias_method :task_help, :command_help
+
+    # Prints help information for this class.
+    #
+    # ==== Parameters
+    # shell<Bundler::Thor::Shell>
+    #
+    def help(shell, subcommand = false)
+      list = printable_commands(true, subcommand)
+      Bundler::Thor::Util.thor_classes_in(self).each do |klass|
+        list += klass.printable_commands(false)
+      end
+      list.sort! { |a, b| a[0] <=> b[0] }
+
+      if defined?(@package_name) && @package_name
+        shell.say "#{@package_name} commands:"
+      else
+        shell.say "Commands:"
+      end
+
+      shell.print_table(list, :indent => 2, :truncate => true)
+      shell.say
+      class_options_help(shell)
+    end
+
+    # Returns commands ready to be printed.
+    def printable_commands(all = true, subcommand = false)
+      (all ? all_commands : commands).map do |_, command|
+        next if command.hidden?
+        item = []
+        item << banner(command, false, subcommand)
+        item << (command.description ? "# #{command.description.gsub(/\s+/m, ' ')}" : "")
+        item
+      end.compact
+    end
+    alias_method :printable_tasks, :printable_commands
+
+    def subcommands
+      @subcommands ||= from_superclass(:subcommands, [])
+    end
+    alias_method :subtasks, :subcommands
+
+    def subcommand_classes
+      @subcommand_classes ||= {}
+    end
+
+    def subcommand(subcommand, subcommand_class)
+      subcommands << subcommand.to_s
+      subcommand_class.subcommand_help subcommand
+      subcommand_classes[subcommand.to_s] = subcommand_class
+
+      define_method(subcommand) do |*args|
+        args, opts = Bundler::Thor::Arguments.split(args)
+        invoke_args = [args, opts, {:invoked_via_subcommand => true, :class_options => options}]
+        invoke_args.unshift "help" if opts.delete("--help") || opts.delete("-h")
+        invoke subcommand_class, *invoke_args
+      end
+      subcommand_class.commands.each do |_meth, command|
+        command.ancestor_name = subcommand
+      end
+    end
+    alias_method :subtask, :subcommand
+
+    # Extend check unknown options to accept a hash of conditions.
+    #
+    # === Parameters
+    # options<Hash>: A hash containing :only and/or :except keys
+    def check_unknown_options!(options = {})
+      @check_unknown_options ||= {}
+      options.each do |key, value|
+        if value
+          @check_unknown_options[key] = Array(value)
+        else
+          @check_unknown_options.delete(key)
+        end
+      end
+      @check_unknown_options
+    end
+
+    # Overwrite check_unknown_options? to take subcommands and options into account.
+    def check_unknown_options?(config) #:nodoc:
+      options = check_unknown_options
+      return false unless options
+
+      command = config[:current_command]
+      return true unless command
+
+      name = command.name
+
+      if subcommands.include?(name)
+        false
+      elsif options[:except]
+        !options[:except].include?(name.to_sym)
+      elsif options[:only]
+        options[:only].include?(name.to_sym)
+      else
+        true
+      end
+    end
+
+    # Stop parsing of options as soon as an unknown option or a regular
+    # argument is encountered.  All remaining arguments are passed to the command.
+    # This is useful if you have a command that can receive arbitrary additional
+    # options, and where those additional options should not be handled by
+    # Bundler::Thor.
+    #
+    # ==== Example
+    #
+    # To better understand how this is useful, let's consider a command that calls
+    # an external command.  A user may want to pass arbitrary options and
+    # arguments to that command.  The command itself also accepts some options,
+    # which should be handled by Bundler::Thor.
+    #
+    #   class_option "verbose",  :type => :boolean
+    #   stop_on_unknown_option! :exec
+    #   check_unknown_options!  :except => :exec
+    #
+    #   desc "exec", "Run a shell command"
+    #   def exec(*args)
+    #     puts "diagnostic output" if options[:verbose]
+    #     Kernel.exec(*args)
+    #   end
+    #
+    # Here +exec+ can be called with +--verbose+ to get diagnostic output,
+    # e.g.:
+    #
+    #   $ thor exec --verbose echo foo
+    #   diagnostic output
+    #   foo
+    #
+    # But if +--verbose+ is given after +echo+, it is passed to +echo+ instead:
+    #
+    #   $ thor exec echo --verbose foo
+    #   --verbose foo
+    #
+    # ==== Parameters
+    # Symbol ...:: A list of commands that should be affected.
+    def stop_on_unknown_option!(*command_names)
+      @stop_on_unknown_option = stop_on_unknown_option | command_names
+    end
+
+    def stop_on_unknown_option?(command) #:nodoc:
+      command && stop_on_unknown_option.include?(command.name.to_sym)
+    end
+
+    # Disable the check for required options for the given commands.
+    # This is useful if you have a command that does not need the required options
+    # to work, like help.
+    #
+    # ==== Parameters
+    # Symbol ...:: A list of commands that should be affected.
+    def disable_required_check!(*command_names)
+      @disable_required_check = disable_required_check | command_names
+    end
+
+    def disable_required_check?(command) #:nodoc:
+      command && disable_required_check.include?(command.name.to_sym)
+    end
+
+  protected
+
+    def stop_on_unknown_option #:nodoc:
+      @stop_on_unknown_option ||= []
+    end
+
+    # help command has the required check disabled by default.
+    def disable_required_check #:nodoc:
+      @disable_required_check ||= [:help]
+    end
+
+    # The method responsible for dispatching given the args.
+    def dispatch(meth, given_args, given_opts, config) #:nodoc: # rubocop:disable MethodLength
+      meth ||= retrieve_command_name(given_args)
+      command = all_commands[normalize_command_name(meth)]
+
+      if !command && config[:invoked_via_subcommand]
+        # We're a subcommand and our first argument didn't match any of our
+        # commands. So we put it back and call our default command.
+        given_args.unshift(meth)
+        command = all_commands[normalize_command_name(default_command)]
+      end
+
+      if command
+        args, opts = Bundler::Thor::Options.split(given_args)
+        if stop_on_unknown_option?(command) && !args.empty?
+          # given_args starts with a non-option, so we treat everything as
+          # ordinary arguments
+          args.concat opts
+          opts.clear
+        end
+      else
+        args = given_args
+        opts = nil
+        command = dynamic_command_class.new(meth)
+      end
+
+      opts = given_opts || opts || []
+      config[:current_command] = command
+      config[:command_options] = command.options
+
+      instance = new(args, opts, config)
+      yield instance if block_given?
+      args = instance.args
+      trailing = args[Range.new(arguments.size, -1)]
+      instance.invoke_command(command, trailing || [])
+    end
+
+    # The banner for this class. You can customize it if you are invoking the
+    # thor class by another ways which is not the Bundler::Thor::Runner. It receives
+    # the command that is going to be invoked and a boolean which indicates if
+    # the namespace should be displayed as arguments.
+    #
+    def banner(command, namespace = nil, subcommand = false)
+      command.formatted_usage(self, $thor_runner, subcommand).split("\n").map do |formatted_usage|
+        "#{basename} #{formatted_usage}"
+      end.join("\n")
+    end
+
+    def baseclass #:nodoc:
+      Bundler::Thor
+    end
+
+    def dynamic_command_class #:nodoc:
+      Bundler::Thor::DynamicCommand
+    end
+
+    def create_command(meth) #:nodoc:
+      @usage ||= nil
+      @desc ||= nil
+      @long_desc ||= nil
+      @hide ||= nil
+
+      if @usage && @desc
+        base_class = @hide ? Bundler::Thor::HiddenCommand : Bundler::Thor::Command
+        commands[meth] = base_class.new(meth, @desc, @long_desc, @usage, method_options)
+        @usage, @desc, @long_desc, @method_options, @hide = nil
+        true
+      elsif all_commands[meth] || meth == "method_missing"
+        true
+      else
+        puts "[WARNING] Attempted to create command #{meth.inspect} without usage or description. " \
+             "Call desc if you want this method to be available as command or declare it inside a " \
+             "no_commands{} block. Invoked from #{caller[1].inspect}."
+        false
+      end
+    end
+    alias_method :create_task, :create_command
+
+    def initialize_added #:nodoc:
+      class_options.merge!(method_options)
+      @method_options = nil
+    end
+
+    # Retrieve the command name from given args.
+    def retrieve_command_name(args) #:nodoc:
+      meth = args.first.to_s unless args.empty?
+      args.shift if meth && (map[meth] || meth !~ /^\-/)
+    end
+    alias_method :retrieve_task_name, :retrieve_command_name
+
+    # receives a (possibly nil) command name and returns a name that is in
+    # the commands hash. In addition to normalizing aliases, this logic
+    # will determine if a shortened command is an unambiguous substring of
+    # a command or alias.
+    #
+    # +normalize_command_name+ also converts names like +animal-prison+
+    # into +animal_prison+.
+    def normalize_command_name(meth) #:nodoc:
+      return default_command.to_s.tr("-", "_") unless meth
+
+      possibilities = find_command_possibilities(meth)
+      raise AmbiguousTaskError, "Ambiguous command #{meth} matches [#{possibilities.join(', ')}]" if possibilities.size > 1
+
+      if possibilities.empty?
+        meth ||= default_command
+      elsif map[meth]
+        meth = map[meth]
+      else
+        meth = possibilities.first
+      end
+
+      meth.to_s.tr("-", "_") # treat foo-bar as foo_bar
+    end
+    alias_method :normalize_task_name, :normalize_command_name
+
+    # this is the logic that takes the command name passed in by the user
+    # and determines whether it is an unambiguous substrings of a command or
+    # alias name.
+    def find_command_possibilities(meth)
+      len = meth.to_s.length
+      possibilities = all_commands.merge(map).keys.select { |n| meth == n[0, len] }.sort
+      unique_possibilities = possibilities.map { |k| map[k] || k }.uniq
+
+      if possibilities.include?(meth)
+        [meth]
+      elsif unique_possibilities.size == 1
+        unique_possibilities
+      else
+        possibilities
+      end
+    end
+    alias_method :find_task_possibilities, :find_command_possibilities
+
+    def subcommand_help(cmd)
+      desc "help [COMMAND]", "Describe subcommands or one specific subcommand"
+      class_eval "
+        def help(command = nil, subcommand = true); super; end
+"
+    end
+    alias_method :subtask_help, :subcommand_help
+  end
+
+  include Bundler::Thor::Base
+
+  map HELP_MAPPINGS => :help
+
+  desc "help [COMMAND]", "Describe available commands or one specific command"
+  def help(command = nil, subcommand = false)
+    if command
+      if self.class.subcommands.include? command
+        self.class.subcommand_classes[command].help(shell, true)
+      else
+        self.class.command_help(shell, command)
+      end
+    else
+      self.class.help(shell, subcommand)
+    end
+  end
+end
diff --git a/lib/bundler/vendor/thor/lib/thor/actions.rb b/lib/bundler/vendor/thor/lib/thor/actions.rb
new file mode 100644
index 0000000000..de9323b2db
--- /dev/null
+++ b/lib/bundler/vendor/thor/lib/thor/actions.rb
@@ -0,0 +1,336 @@
+require_relative "actions/create_file"
+require_relative "actions/create_link"
+require_relative "actions/directory"
+require_relative "actions/empty_directory"
+require_relative "actions/file_manipulation"
+require_relative "actions/inject_into_file"
+
+class Bundler::Thor
+  module Actions
+    attr_accessor :behavior
+
+    def self.included(base) #:nodoc:
+      super(base)
+      base.extend ClassMethods
+    end
+
+    module ClassMethods
+      # Hold source paths for one Bundler::Thor instance. source_paths_for_search is the
+      # method responsible to gather source_paths from this current class,
+      # inherited paths and the source root.
+      #
+      def source_paths
+        @_source_paths ||= []
+      end
+
+      # Stores and return the source root for this class
+      def source_root(path = nil)
+        @_source_root = path if path
+        @_source_root ||= nil
+      end
+
+      # Returns the source paths in the following order:
+      #
+      #   1) This class source paths
+      #   2) Source root
+      #   3) Parents source paths
+      #
+      def source_paths_for_search
+        paths = []
+        paths += source_paths
+        paths << source_root if source_root
+        paths += from_superclass(:source_paths, [])
+        paths
+      end
+
+      # Add runtime options that help actions execution.
+      #
+      def add_runtime_options!
+        class_option :force, :type => :boolean, :aliases => "-f", :group => :runtime,
+                             :desc => "Overwrite files that already exist"
+
+        class_option :pretend, :type => :boolean, :aliases => "-p", :group => :runtime,
+                               :desc => "Run but do not make any changes"
+
+        class_option :quiet, :type => :boolean, :aliases => "-q", :group => :runtime,
+                             :desc => "Suppress status output"
+
+        class_option :skip, :type => :boolean, :aliases => "-s", :group => :runtime,
+                            :desc => "Skip files that already exist"
+      end
+    end
+
+    # Extends initializer to add more configuration options.
+    #
+    # ==== Configuration
+    # behavior<Symbol>:: The actions default behavior. Can be :invoke or :revoke.
+    #                    It also accepts :force, :skip and :pretend to set the behavior
+    #                    and the respective option.
+    #
+    # destination_root<String>:: The root directory needed for some actions.
+    #
+    def initialize(args = [], options = {}, config = {})
+      self.behavior = case config[:behavior].to_s
+      when "force", "skip"
+        _cleanup_options_and_set(options, config[:behavior])
+        :invoke
+      when "revoke"
+        :revoke
+      else
+        :invoke
+      end
+
+      super
+      self.destination_root = config[:destination_root]
+    end
+
+    # Wraps an action object and call it accordingly to the thor class behavior.
+    #
+    def action(instance) #:nodoc:
+      if behavior == :revoke
+        instance.revoke!
+      else
+        instance.invoke!
+      end
+    end
+
+    # Returns the root for this thor class (also aliased as destination root).
+    #
+    def destination_root
+      @destination_stack.last
+    end
+
+    # Sets the root for this thor class. Relatives path are added to the
+    # directory where the script was invoked and expanded.
+    #
+    def destination_root=(root)
+      @destination_stack ||= []
+      @destination_stack[0] = File.expand_path(root || "")
+    end
+
+    # Returns the given path relative to the absolute root (ie, root where
+    # the script started).
+    #
+    def relative_to_original_destination_root(path, remove_dot = true)
+      root = @destination_stack[0]
+      if path.start_with?(root) && [File::SEPARATOR, File::ALT_SEPARATOR, nil, ''].include?(path[root.size..root.size])
+        path = path.dup
+        path[0...root.size] = '.'
+        remove_dot ? (path[2..-1] || "") : path
+      else
+        path
+      end
+    end
+
+    # Holds source paths in instance so they can be manipulated.
+    #
+    def source_paths
+      @source_paths ||= self.class.source_paths_for_search
+    end
+
+    # Receives a file or directory and search for it in the source paths.
+    #
+    def find_in_source_paths(file)
+      possible_files = [file, file + TEMPLATE_EXTNAME]
+      relative_root = relative_to_original_destination_root(destination_root, false)
+
+      source_paths.each do |source|
+        possible_files.each do |f|
+          source_file = File.expand_path(f, File.join(source, relative_root))
+          return source_file if File.exist?(source_file)
+        end
+      end
+
+      message = "Could not find #{file.inspect} in any of your source paths. ".dup
+
+      unless self.class.source_root
+        message << "Please invoke #{self.class.name}.source_root(PATH) with the PATH containing your templates. "
+      end
+
+      message << if source_paths.empty?
+                   "Currently you have no source paths."
+                 else
+                   "Your current source paths are: \n#{source_paths.join("\n")}"
+                 end
+
+      raise Error, message
+    end
+
+    # Do something in the root or on a provided subfolder. If a relative path
+    # is given it's referenced from the current root. The full path is yielded
+    # to the block you provide. The path is set back to the previous path when
+    # the method exits.
+    #
+    # ==== Parameters
+    # dir<String>:: the directory to move to.
+    # config<Hash>:: give :verbose => true to log and use padding.
+    #
+    def inside(dir = "", config = {}, &block)
+      verbose = config.fetch(:verbose, false)
+      pretend = options[:pretend]
+
+      say_status :inside, dir, verbose
+      shell.padding += 1 if verbose
+      @destination_stack.push File.expand_path(dir, destination_root)
+
+      # If the directory doesnt exist and we're not pretending
+      if !File.exist?(destination_root) && !pretend
+        require "fileutils"
+        FileUtils.mkdir_p(destination_root)
+      end
+
+      if pretend
+        # In pretend mode, just yield down to the block
+        block.arity == 1 ? yield(destination_root) : yield
+      else
+        require "fileutils"
+        FileUtils.cd(destination_root) { block.arity == 1 ? yield(destination_root) : yield }
+      end
+
+      @destination_stack.pop
+      shell.padding -= 1 if verbose
+    end
+
+    # Goes to the root and execute the given block.
+    #
+    def in_root
+      inside(@destination_stack.first) { yield }
+    end
+
+    # Loads an external file and execute it in the instance binding.
+    #
+    # ==== Parameters
+    # path<String>:: The path to the file to execute. Can be a web address or
+    #                a relative path from the source root.
+    #
+    # ==== Examples
+    #
+    #   apply "http://gist.github.com/103208"
+    #
+    #   apply "recipes/jquery.rb"
+    #
+    def apply(path, config = {})
+      verbose = config.fetch(:verbose, true)
+      is_uri  = path =~ %r{^https?\://}
+      path    = find_in_source_paths(path) unless is_uri
+
+      say_status :apply, path, verbose
+      shell.padding += 1 if verbose
+
+      contents = if is_uri
+        require "open-uri"
+        URI.open(path, "Accept" => "application/x-thor-template", &:read)
+      else
+        open(path, &:read)
+      end
+
+      instance_eval(contents, path)
+      shell.padding -= 1 if verbose
+    end
+
+    # Executes a command returning the contents of the command.
+    #
+    # ==== Parameters
+    # command<String>:: the command to be executed.
+    # config<Hash>:: give :verbose => false to not log the status, :capture => true to hide to output. Specify :with
+    #                to append an executable to command execution.
+    #
+    # ==== Example
+    #
+    #   inside('vendor') do
+    #     run('ln -s ~/edge rails')
+    #   end
+    #
+    def run(command, config = {})
+      return unless behavior == :invoke
+
+      destination = relative_to_original_destination_root(destination_root, false)
+      desc = "#{command} from #{destination.inspect}"
+
+      if config[:with]
+        desc = "#{File.basename(config[:with].to_s)} #{desc}"
+        command = "#{config[:with]} #{command}"
+      end
+
+      say_status :run, desc, config.fetch(:verbose, true)
+
+      return if options[:pretend]
+
+      env_splat = [config[:env]] if config[:env]
+
+      if config[:capture]
+        require "open3"
+        result, status = Open3.capture2e(*env_splat, command.to_s)
+        success = status.success?
+      else
+        result = system(*env_splat, command.to_s)
+        success = result
+      end
+
+      abort if !success && config.fetch(:abort_on_failure, self.class.exit_on_failure?)
+
+      result
+    end
+
+    # Executes a ruby script (taking into account WIN32 platform quirks).
+    #
+    # ==== Parameters
+    # command<String>:: the command to be executed.
+    # config<Hash>:: give :verbose => false to not log the status.
+    #
+    def run_ruby_script(command, config = {})
+      return unless behavior == :invoke
+      run command, config.merge(:with => Bundler::Thor::Util.ruby_command)
+    end
+
+    # Run a thor command. A hash of options can be given and it's converted to
+    # switches.
+    #
+    # ==== Parameters
+    # command<String>:: the command to be invoked
+    # args<Array>:: arguments to the command
+    # config<Hash>:: give :verbose => false to not log the status, :capture => true to hide to output.
+    #                Other options are given as parameter to Bundler::Thor.
+    #
+    #
+    # ==== Examples
+    #
+    #   thor :install, "http://gist.github.com/103208"
+    #   #=> thor install http://gist.github.com/103208
+    #
+    #   thor :list, :all => true, :substring => 'rails'
+    #   #=> thor list --all --substring=rails
+    #
+    def thor(command, *args)
+      config  = args.last.is_a?(Hash) ? args.pop : {}
+      verbose = config.key?(:verbose) ? config.delete(:verbose) : true
+      pretend = config.key?(:pretend) ? config.delete(:pretend) : false
+      capture = config.key?(:capture) ? config.delete(:capture) : false
+
+      args.unshift(command)
+      args.push Bundler::Thor::Options.to_switches(config)
+      command = args.join(" ").strip
+
+      run command, :with => :thor, :verbose => verbose, :pretend => pretend, :capture => capture
+    end
+
+  protected
+
+    # Allow current root to be shared between invocations.
+    #
+    def _shared_configuration #:nodoc:
+      super.merge!(:destination_root => destination_root)
+    end
+
+    def _cleanup_options_and_set(options, key) #:nodoc:
+      case options
+      when Array
+        %w(--force -f --skip -s).each { |i| options.delete(i) }
+        options << "--#{key}"
+      when Hash
+        [:force, :skip, "force", "skip"].each { |i| options.delete(i) }
+        options.merge!(key => true)
+      end
+    end
+  end
+end
diff --git a/lib/bundler/vendor/thor/lib/thor/actions/create_file.rb b/lib/bundler/vendor/thor/lib/thor/actions/create_file.rb
new file mode 100644
index 0000000000..330fc08cae
--- /dev/null
+++ b/lib/bundler/vendor/thor/lib/thor/actions/create_file.rb
@@ -0,0 +1,104 @@
+require_relative "empty_directory"
+
+class Bundler::Thor
+  module Actions
+    # Create a new file relative to the destination root with the given data,
+    # which is the return value of a block or a data string.
+    #
+    # ==== Parameters
+    # destination<String>:: the relative path to the destination root.
+    # data<String|NilClass>:: the data to append to the file.
+    # config<Hash>:: give :verbose => false to not log the status.
+    #
+    # ==== Examples
+    #
+    #   create_file "lib/fun_party.rb" do
+    #     hostname = ask("What is the virtual hostname I should use?")
+    #     "vhost.name = #{hostname}"
+    #   end
+    #
+    #   create_file "config/apache.conf", "your apache config"
+    #
+    def create_file(destination, *args, &block)
+      config = args.last.is_a?(Hash) ? args.pop : {}
+      data = args.first
+      action CreateFile.new(self, destination, block || data.to_s, config)
+    end
+    alias_method :add_file, :create_file
+
+    # CreateFile is a subset of Template, which instead of rendering a file with
+    # ERB, it gets the content from the user.
+    #
+    class CreateFile < EmptyDirectory #:nodoc:
+      attr_reader :data
+
+      def initialize(base, destination, data, config = {})
+        @data = data
+        super(base, destination, config)
+      end
+
+      # Checks if the content of the file at the destination is identical to the rendered result.
+      #
+      # ==== Returns
+      # Boolean:: true if it is identical, false otherwise.
+      #
+      def identical?
+        exists? && File.binread(destination) == render
+      end
+
+      # Holds the content to be added to the file.
+      #
+      def render
+        @render ||= if data.is_a?(Proc)
+          data.call
+        else
+          data
+        end
+      end
+
+      def invoke!
+        invoke_with_conflict_check do
+          require "fileutils"
+          FileUtils.mkdir_p(File.dirname(destination))
+          File.open(destination, "wb") { |f| f.write render }
+        end
+        given_destination
+      end
+
+    protected
+
+      # Now on conflict we check if the file is identical or not.
+      #
+      def on_conflict_behavior(&block)
+        if identical?
+          say_status :identical, :blue
+        else
+          options = base.options.merge(config)
+          force_or_skip_or_conflict(options[:force], options[:skip], &block)
+        end
+      end
+
+      # If force is true, run the action, otherwise check if it's not being
+      # skipped. If both are false, show the file_collision menu, if the menu
+      # returns true, force it, otherwise skip.
+      #
+      def force_or_skip_or_conflict(force, skip, &block)
+        if force
+          say_status :force, :yellow
+          yield unless pretend?
+        elsif skip
+          say_status :skip, :yellow
+        else
+          say_status :conflict, :red
+          force_or_skip_or_conflict(force_on_collision?, true, &block)
+        end
+      end
+
+      # Shows the file collision menu to the user and gets the result.
+      #
+      def force_on_collision?
+        base.shell.file_collision(destination) { render }
+      end
+    end
+  end
+end
diff --git a/lib/bundler/vendor/thor/lib/thor/actions/create_link.rb b/lib/bundler/vendor/thor/lib/thor/actions/create_link.rb
new file mode 100644
index 0000000000..fb76fcdbe9
--- /dev/null
+++ b/lib/bundler/vendor/thor/lib/thor/actions/create_link.rb
@@ -0,0 +1,61 @@
+require_relative "create_file"
+
+class Bundler::Thor
+  module Actions
+    # Create a new file relative to the destination root from the given source.
+    #
+    # ==== Parameters
+    # destination<String>:: the relative path to the destination root.
+    # source<String|NilClass>:: the relative path to the source root.
+    # config<Hash>:: give :verbose => false to not log the status.
+    #   :: give :symbolic => false for hard link.
+    #
+    # ==== Examples
+    #
+    #   create_link "config/apache.conf", "/etc/apache.conf"
+    #
+    def create_link(destination, *args)
+      config = args.last.is_a?(Hash) ? args.pop : {}
+      source = args.first
+      action CreateLink.new(self, destination, source, config)
+    end
+    alias_method :add_link, :create_link
+
+    # CreateLink is a subset of CreateFile, which instead of taking a block of
+    # data, just takes a source string from the user.
+    #
+    class CreateLink < CreateFile #:nodoc:
+      attr_reader :data
+
+      # Checks if the content of the file at the destination is identical to the rendered result.
+      #
+      # ==== Returns
+      # Boolean:: true if it is identical, false otherwise.
+      #
+      def identical?
+        source = File.expand_path(render, File.dirname(destination))
+        exists? && File.identical?(source, destination)
+      end
+
+      def invoke!
+        invoke_with_conflict_check do
+          require "fileutils"
+          FileUtils.mkdir_p(File.dirname(destination))
+          # Create a symlink by default
+          config[:symbolic] = true if config[:symbolic].nil?
+          File.unlink(destination) if exists?
+          if config[:symbolic]
+            File.symlink(render, destination)
+          else
+            File.link(render, destination)
+          end
+        end
+        given_destination
+      end
+
+      def exists?
+        super || File.symlink?(destination)
+      end
+    end
+  end
+end
diff --git a/lib/bundler/vendor/thor/lib/thor/actions/directory.rb b/lib/bundler/vendor/thor/lib/thor/actions/directory.rb
new file mode 100644
index 0000000000..d37327a139
--- /dev/null
+++ b/lib/bundler/vendor/thor/lib/thor/actions/directory.rb
@@ -0,0 +1,108 @@
+require_relative "empty_directory"
+
+class Bundler::Thor
+  module Actions
+    # Copies recursively the files from source directory to root directory.
+    # If any of the files finishes with .tt, it's considered to be a template
+    # and is placed in the destination without the extension .tt. If any
+    # empty directory is found, it's copied and all .empty_directory files are
+    # ignored. If any file name is wrapped within % signs, the text within
+    # the % signs will be executed as a method and replaced with the returned
+    # value. Let's suppose a doc directory with the following files:
+    #
+    #   doc/
+    #     components/.empty_directory
+    #     README
+    #     rdoc.rb.tt
+    #     %app_name%.rb
+    #
+    # When invoked as:
+    #
+    #   directory "doc"
+    #
+    # It will create a doc directory in the destination with the following
+    # files (assuming that the `app_name` method returns the value "blog"):
+    #
+    #   doc/
+    #     components/
+    #     README
+    #     rdoc.rb
+    #     blog.rb
+    #
+    # <b>Encoded path note:</b> Since Bundler::Thor internals use Object#respond_to? to check if it can
+    # expand %something%, this `something` should be a public method in the class calling
+    # #directory. If a method is private, Bundler::Thor stack raises PrivateMethodEncodedError.
+    #
+    # ==== Parameters
+    # source<String>:: the relative path to the source root.
+    # destination<String>:: the relative path to the destination root.
+    # config<Hash>:: give :verbose => false to not log the status.
+    #                If :recursive => false, does not look for paths recursively.
+    #                If :mode => :preserve, preserve the file mode from the source.
+    #                If :exclude_pattern => /regexp/, prevents copying files that match that regexp.
+    #
+    # ==== Examples
+    #
+    #   directory "doc"
+    #   directory "doc", "docs", :recursive => false
+    #
+    def directory(source, *args, &block)
+      config = args.last.is_a?(Hash) ? args.pop : {}
+      destination = args.first || source
+      action Directory.new(self, source, destination || source, config, &block)
+    end
+
+    class Directory < EmptyDirectory #:nodoc:
+      attr_reader :source
+
+      def initialize(base, source, destination = nil, config = {}, &block)
+        @source = File.expand_path(Dir[Util.escape_globs(base.find_in_source_paths(source.to_s))].first)
+        @block  = block
+        super(base, destination, {:recursive => true}.merge(config))
+      end
+
+      def invoke!
+        base.empty_directory given_destination, config
+        execute!
+      end
+
+      def revoke!
+        execute!
+      end
+
+    protected
+
+      def execute!
+        lookup = Util.escape_globs(source)
+        lookup = config[:recursive] ? File.join(lookup, "**") : lookup
+        lookup = file_level_lookup(lookup)
+
+        files(lookup).sort.each do |file_source|
+          next if File.directory?(file_source)
+          next if config[:exclude_pattern] && file_source.match(config[:exclude_pattern])
+          file_destination = File.join(given_destination, file_source.gsub(source, "."))
+          file_destination.gsub!("/./", "/")
+
+          case file_source
+          when /\.empty_directory$/
+            dirname = File.dirname(file_destination).gsub(%r{/\.$}, "")
+            next if dirname == given_destination
+            base.empty_directory(dirname, config)
+          when /#{TEMPLATE_EXTNAME}$/
+            base.template(file_source, file_destination[0..-4], config, &@block)
+          else
+            base.copy_file(file_source, file_destination, config, &@block)
+          end
+        end
+      end
+
+      def file_level_lookup(previous_lookup)
+        File.join(previous_lookup, "*")
+      end
+
+      def files(lookup)
+        Dir.glob(lookup, File::FNM_DOTMATCH)
+      end
+    end
+  end
+end
diff --git a/lib/bundler/vendor/thor/lib/thor/actions/empty_directory.rb b/lib/bundler/vendor/thor/lib/thor/actions/empty_directory.rb
new file mode 100644
index 0000000000..284d92c19a
--- /dev/null
+++ b/lib/bundler/vendor/thor/lib/thor/actions/empty_directory.rb
@@ -0,0 +1,143 @@
+class Bundler::Thor
+  module Actions
+    # Creates an empty directory.
+    #
+    # ==== Parameters
+    # destination<String>:: the relative path to the destination root.
+    # config<Hash>:: give :verbose => false to not log the status.
+    #
+    # ==== Examples
+    #
+    #   empty_directory "doc"
+    #
+    def empty_directory(destination, config = {})
+      action EmptyDirectory.new(self, destination, config)
+    end
+
+    # Class which holds create directory logic. This is the base class for
+    # other actions like create_file and directory.
+    #
+    # This implementation is based in Templater actions, created by Jonas Nicklas
+    # and Michael S. Klishin under MIT LICENSE.
+    #
+    class EmptyDirectory #:nodoc:
+      attr_reader :base, :destination, :given_destination, :relative_destination, :config
+
+      # Initializes given the source and destination.
+      #
+      # ==== Parameters
+      # base<Bundler::Thor::Base>:: A Bundler::Thor::Base instance
+      # source<String>:: Relative path to the source of this file
+      # destination<String>:: Relative path to the destination of this file
+      # config<Hash>:: give :verbose => false to not log the status.
+      #
+      def initialize(base, destination, config = {})
+        @base = base
+        @config = {:verbose => true}.merge(config)
+        self.destination = destination
+      end
+
+      # Checks if the destination file already exists.
+      #
+      # ==== Returns
+      # Boolean:: true if the file exists, false otherwise.
+      #
+      def exists?
+        ::File.exist?(destination)
+      end
+
+      def invoke!
+        invoke_with_conflict_check do
+          require "fileutils"
+          ::FileUtils.mkdir_p(destination)
+        end
+      end
+
+      def revoke!
+        say_status :remove, :red
+        require "fileutils"
+        ::FileUtils.rm_rf(destination) if !pretend? && exists?
+        given_destination
+      end
+
+    protected
+
+      # Shortcut for pretend.
+      #
+      def pretend?
+        base.options[:pretend]
+      end
+
+      # Sets the absolute destination value from a relative destination value.
+      # It also stores the given and relative destination. Let's suppose our
+      # script is being executed on "dest", it sets the destination root to
+      # "dest". The destination, given_destination and relative_destination
+      # are related in the following way:
+      #
+      #   inside "bar" do
+      #     empty_directory "baz"
+      #   end
+      #
+      #   destination          #=> dest/bar/baz
+      #   relative_destination #=> bar/baz
+      #   given_destination    #=> baz
+      #
+      def destination=(destination)
+        return unless destination
+        @given_destination = convert_encoded_instructions(destination.to_s)
+        @destination = ::File.expand_path(@given_destination, base.destination_root)
+        @relative_destination = base.relative_to_original_destination_root(@destination)
+      end
+
+      # Filenames in the encoded form are converted. If you have a file:
+      #
+      #   %file_name%.rb
+      #
+      # It calls #file_name from the base and replaces %-string with the
+      # return value (should be String) of #file_name:
+      #
+      #   user.rb
+      #
+      # The method referenced can be either public or private.
+      #
+      def convert_encoded_instructions(filename)
+        filename.gsub(/%(.*?)%/) do |initial_string|
+          method = $1.strip
+          base.respond_to?(method, true) ? base.send(method) : initial_string
+        end
+      end
+
+      # Receives a hash of options and just execute the block if some
+      # conditions are met.
+      #
+      def invoke_with_conflict_check(&block)
+        if exists?
+          on_conflict_behavior(&block)
+        else
+          yield unless pretend?
+          say_status :create, :green
+        end
+
+        destination
+      rescue Errno::EISDIR, Errno::EEXIST
+        on_file_clash_behavior
+      end
+
+      def on_file_clash_behavior
+        say_status :file_clash, :red
+      end
+
+      # What to do when the destination file already exists.
+      #
+      def on_conflict_behavior
+        say_status :exist, :blue
+      end
+
+      # Shortcut to say_status shell method.
+      #
+      def say_status(status, color)
+        base.shell.say_status status, relative_destination, color if config[:verbose]
+      end
+    end
+  end
+end
diff --git a/lib/bundler/vendor/thor/lib/thor/actions/file_manipulation.rb b/lib/bundler/vendor/thor/lib/thor/actions/file_manipulation.rb
new file mode 100644
index 0000000000..90a8d2e847
--- /dev/null
+++ b/lib/bundler/vendor/thor/lib/thor/actions/file_manipulation.rb
@@ -0,0 +1,375 @@
+require "erb"
+
+class Bundler::Thor
+  module Actions
+    # Copies the file from the relative source to the relative destination. If
+    # the destination is not given it's assumed to be equal to the source.
+    #
+    # ==== Parameters
+    # source<String>:: the relative path to the source root.
+    # destination<String>:: the relative path to the destination root.
+    # config<Hash>:: give :verbose => false to not log the status, and
+    #                :mode => :preserve, to preserve the file mode from the source.
+
+    #
+    # ==== Examples
+    #
+    #   copy_file "README", "doc/README"
+    #
+    #   copy_file "doc/README"
+    #
+    def copy_file(source, *args, &block)
+      config = args.last.is_a?(Hash) ? args.pop : {}
+      destination = args.first || source
+      source = File.expand_path(find_in_source_paths(source.to_s))
+
+      resulting_destination = create_file destination, nil, config do
+        content = File.binread(source)
+        content = yield(content) if block
+        content
+      end
+      if config[:mode] == :preserve
+        mode = File.stat(source).mode
+        chmod(resulting_destination, mode, config)
+      end
+    end
+
+    # Links the file from the relative source to the relative destination. If
+    # the destination is not given it's assumed to be equal to the source.
+    #
+    # ==== Parameters
+    # source<String>:: the relative path to the source root.
+    # destination<String>:: the relative path to the destination root.
+    # config<Hash>:: give :verbose => false to not log the status.
+    #
+    # ==== Examples
+    #
+    #   link_file "README", "doc/README"
+    #
+    #   link_file "doc/README"
+    #
+    def link_file(source, *args)
+      config = args.last.is_a?(Hash) ? args.pop : {}
+      destination = args.first || source
+      source = File.expand_path(find_in_source_paths(source.to_s))
+
+      create_link destination, source, config
+    end
+
+    # Gets the content at the given address and places it at the given relative
+    # destination. If a block is given instead of destination, the content of
+    # the url is yielded and used as location.
+    #
+    # +get+ relies on open-uri, so passing application user input would provide
+    # a command injection attack vector.
+    #
+    # ==== Parameters
+    # source<String>:: the address of the given content.
+    # destination<String>:: the relative path to the destination root.
+    # config<Hash>:: give :verbose => false to not log the status.
+    #
+    # ==== Examples
+    #
+    #   get "http://gist.github.com/103208", "doc/README"
+    #
+    #   get "http://gist.github.com/103208" do |content|
+    #     content.split("\n").first
+    #   end
+    #
+    def get(source, *args, &block)
+      config = args.last.is_a?(Hash) ? args.pop : {}
+      destination = args.first
+
+      render = if source =~ %r{^https?\://}
+        require "open-uri"
+        URI.send(:open, source) { |input| input.binmode.read }
+      else
+        source = File.expand_path(find_in_source_paths(source.to_s))
+        open(source) { |input| input.binmode.read }
+      end
+
+      destination ||= if block_given?
+        block.arity == 1 ? yield(render) : yield
+      else
+        File.basename(source)
+      end
+
+      create_file destination, render, config
+    end
+
+    # Gets an ERB template at the relative source, executes it and makes a copy
+    # at the relative destination. If the destination is not given it's assumed
+    # to be equal to the source removing .tt from the filename.
+    #
+    # ==== Parameters
+    # source<String>:: the relative path to the source root.
+    # destination<String>:: the relative path to the destination root.
+    # config<Hash>:: give :verbose => false to not log the status.
+    #
+    # ==== Examples
+    #
+    #   template "README", "doc/README"
+    #
+    #   template "doc/README"
+    #
+    def template(source, *args, &block)
+      config = args.last.is_a?(Hash) ? args.pop : {}
+      destination = args.first || source.sub(/#{TEMPLATE_EXTNAME}$/, "")
+
+      source  = File.expand_path(find_in_source_paths(source.to_s))
+      context = config.delete(:context) || instance_eval("binding")
+
+      create_file destination, nil, config do
+        match = ERB.version.match(/(\d+\.\d+\.\d+)/)
+        capturable_erb = if match && match[1] >= "2.2.0" # Ruby 2.6+
+          CapturableERB.new(::File.binread(source), :trim_mode => "-", :eoutvar => "@output_buffer")
+        else
+          CapturableERB.new(::File.binread(source), nil, "-", "@output_buffer")
+        end
+        content = capturable_erb.tap do |erb|
+          erb.filename = source
+        end.result(context)
+        content = yield(content) if block
+        content
+      end
+    end
+
+    # Changes the mode of the given file or directory.
+    #
+    # ==== Parameters
+    # mode<Integer>:: the file mode
+    # path<String>:: the name of the file to change mode
+    # config<Hash>:: give :verbose => false to not log the status.
+    #
+    # ==== Example
+    #
+    #   chmod "script/server", 0755
+    #
+    def chmod(path, mode, config = {})
+      return unless behavior == :invoke
+      path = File.expand_path(path, destination_root)
+      say_status :chmod, relative_to_original_destination_root(path), config.fetch(:verbose, true)
+      unless options[:pretend]
+        require "fileutils"
+        FileUtils.chmod_R(mode, path)
+      end
+    end
+
+    # Prepend text to a file. Since it depends on insert_into_file, it's reversible.
+    #
+    # ==== Parameters
+    # path<String>:: path of the file to be changed
+    # data<String>:: the data to prepend to the file, can be also given as a block.
+    # config<Hash>:: give :verbose => false to not log the status.
+    #
+    # ==== Example
+    #
+    #   prepend_to_file 'config/environments/test.rb', 'config.gem "rspec"'
+    #
+    #   prepend_to_file 'config/environments/test.rb' do
+    #     'config.gem "rspec"'
+    #   end
+    #
+    def prepend_to_file(path, *args, &block)
+      config = args.last.is_a?(Hash) ? args.pop : {}
+      config[:after] = /\A/
+      insert_into_file(path, *(args << config), &block)
+    end
+    alias_method :prepend_file, :prepend_to_file
+
+    # Append text to a file. Since it depends on insert_into_file, it's reversible.
+    #
+    # ==== Parameters
+    # path<String>:: path of the file to be changed
+    # data<String>:: the data to append to the file, can be also given as a block.
+    # config<Hash>:: give :verbose => false to not log the status.
+    #
+    # ==== Example
+    #
+    #   append_to_file 'config/environments/test.rb', 'config.gem "rspec"'
+    #
+    #   append_to_file 'config/environments/test.rb' do
+    #     'config.gem "rspec"'
+    #   end
+    #
+    def append_to_file(path, *args, &block)
+      config = args.last.is_a?(Hash) ? args.pop : {}
+      config[:before] = /\z/
+      insert_into_file(path, *(args << config), &block)
+    end
+    alias_method :append_file, :append_to_file
+
+    # Injects text right after the class definition. Since it depends on
+    # insert_into_file, it's reversible.
+    #
+    # ==== Parameters
+    # path<String>:: path of the file to be changed
+    # klass<String|Class>:: the class to be manipulated
+    # data<String>:: the data to append to the class, can be also given as a block.
+    # config<Hash>:: give :verbose => false to not log the status.
+    #
+    # ==== Examples
+    #
+    #   inject_into_class "app/controllers/application_controller.rb", ApplicationController, "  filter_parameter :password\n"
+    #
+    #   inject_into_class "app/controllers/application_controller.rb", ApplicationController do
+    #     "  filter_parameter :password\n"
+    #   end
+    #
+    def inject_into_class(path, klass, *args, &block)
+      config = args.last.is_a?(Hash) ? args.pop : {}
+      config[:after] = /class #{klass}\n|class #{klass} .*\n/
+      insert_into_file(path, *(args << config), &block)
+    end
+
+    # Injects text right after the module definition. Since it depends on
+    # insert_into_file, it's reversible.
+    #
+    # ==== Parameters
+    # path<String>:: path of the file to be changed
+    # module_name<String|Class>:: the module to be manipulated
+    # data<String>:: the data to append to the class, can be also given as a block.
+    # config<Hash>:: give :verbose => false to not log the status.
+    #
+    # ==== Examples
+    #
+    #   inject_into_module "app/helpers/application_helper.rb", ApplicationHelper, "  def help; 'help'; end\n"
+    #
+    #   inject_into_module "app/helpers/application_helper.rb", ApplicationHelper do
+    #     "  def help; 'help'; end\n"
+    #   end
+    #
+    def inject_into_module(path, module_name, *args, &block)
+      config = args.last.is_a?(Hash) ? args.pop : {}
+      config[:after] = /module #{module_name}\n|module #{module_name} .*\n/
+      insert_into_file(path, *(args << config), &block)
+    end
+
+    # Run a regular expression replacement on a file.
+    #
+    # ==== Parameters
+    # path<String>:: path of the file to be changed
+    # flag<Regexp|String>:: the regexp or string to be replaced
+    # replacement<String>:: the replacement, can be also given as a block
+    # config<Hash>:: give :verbose => false to not log the status, and
+    #                :force => true, to force the replacement regardless of runner behavior.
+    #
+    # ==== Example
+    #
+    #   gsub_file 'app/controllers/application_controller.rb', /#\s*(filter_parameter_logging :password)/, '\1'
+    #
+    #   gsub_file 'README', /rake/, :green do |match|
+    #     match << " no more. Use thor!"
+    #   end
+    #
+    def gsub_file(path, flag, *args, &block)
+      config = args.last.is_a?(Hash) ? args.pop : {}
+
+      return unless behavior == :invoke || config.fetch(:force, false)
+
+      path = File.expand_path(path, destination_root)
+      say_status :gsub, relative_to_original_destination_root(path), config.fetch(:verbose, true)
+
+      unless options[:pretend]
+        content = File.binread(path)
+        content.gsub!(flag, *args, &block)
+        File.open(path, "wb") { |file| file.write(content) }
+      end
+    end
+
+    # Uncomment all lines matching a given regex.  It will leave the space
+    # which existed before the comment hash in tact but will remove any spacing
+    # between the comment hash and the beginning of the line.
+    #
+    # ==== Parameters
+    # path<String>:: path of the file to be changed
+    # flag<Regexp|String>:: the regexp or string used to decide which lines to uncomment
+    # config<Hash>:: give :verbose => false to not log the status.
+    #
+    # ==== Example
+    #
+    #   uncomment_lines 'config/initializers/session_store.rb', /active_record/
+    #
+    def uncomment_lines(path, flag, *args)
+      flag = flag.respond_to?(:source) ? flag.source : flag
+
+      gsub_file(path, /^(\s*)#[[:blank:]]*(.*#{flag})/, '\1\2', *args)
+    end
+
+    # Comment all lines matching a given regex.  It will leave the space
+    # which existed before the beginning of the line in tact and will insert
+    # a single space after the comment hash.
+    #
+    # ==== Parameters
+    # path<String>:: path of the file to be changed
+    # flag<Regexp|String>:: the regexp or string used to decide which lines to comment
+    # config<Hash>:: give :verbose => false to not log the status.
+    #
+    # ==== Example
+    #
+    #   comment_lines 'config/initializers/session_store.rb', /cookie_store/
+    #
+    def comment_lines(path, flag, *args)
+      flag = flag.respond_to?(:source) ? flag.source : flag
+
+      gsub_file(path, /^(\s*)([^#\n]*#{flag})/, '\1# \2', *args)
+    end
+
+    # Removes a file at the given location.
+    #
+    # ==== Parameters
+    # path<String>:: path of the file to be changed
+    # config<Hash>:: give :verbose => false to not log the status.
+    #
+    # ==== Example
+    #
+    #   remove_file 'README'
+    #   remove_file 'app/controllers/application_controller.rb'
+    #
+    def remove_file(path, config = {})
+      return unless behavior == :invoke
+      path = File.expand_path(path, destination_root)
+
+      say_status :remove, relative_to_original_destination_root(path), config.fetch(:verbose, true)
+      if !options[:pretend] && File.exist?(path)
+        require "fileutils"
+        ::FileUtils.rm_rf(path)
+      end
+    end
+    alias_method :remove_dir, :remove_file
+
+    attr_accessor :output_buffer
+    private :output_buffer, :output_buffer=
+
+  private
+
+    def concat(string)
+      @output_buffer.concat(string)
+    end
+
+    def capture(*args)
+      with_output_buffer { yield(*args) }
+    end
+
+    def with_output_buffer(buf = "".dup) #:nodoc:
+      raise ArgumentError, "Buffer can not be a frozen object" if buf.frozen?
+      old_buffer = output_buffer
+      self.output_buffer = buf
+      yield
+      output_buffer
+    ensure
+      self.output_buffer = old_buffer
+    end
+
+    # Bundler::Thor::Actions#capture depends on what kind of buffer is used in ERB.
+    # Thus CapturableERB fixes ERB to use String buffer.
+    class CapturableERB < ERB
+      def set_eoutvar(compiler, eoutvar = "_erbout")
+        compiler.put_cmd = "#{eoutvar}.concat"
+        compiler.insert_cmd = "#{eoutvar}.concat"
+        compiler.pre_cmd = ["#{eoutvar} = ''.dup"]
+        compiler.post_cmd = [eoutvar]
+      end
+    end
+  end
+end
diff --git a/lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb b/lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb
new file mode 100644
index 0000000000..09ce0864f0
--- /dev/null
+++ b/lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb
@@ -0,0 +1,120 @@
+require_relative "empty_directory"
+
+class Bundler::Thor
+  module Actions
+    # Injects the given content into a file. Different from gsub_file, this
+    # method is reversible.
+    #
+    # ==== Parameters
+    # destination<String>:: Relative path to the destination root
+    # data<String>:: Data to add to the file. Can be given as a block.
+    # config<Hash>:: give :verbose => false to not log the status and the flag
+    #                for injection (:after or :before) or :force => true for
+    #                insert two or more times the same content.
+    #
+    # ==== Examples
+    #
+    #   insert_into_file "config/environment.rb", "config.gem :thor", :after => "Rails::Initializer.run do |config|\n"
+    #
+    #   insert_into_file "config/environment.rb", :after => "Rails::Initializer.run do |config|\n" do
+    #     gems = ask "Which gems would you like to add?"
+    #     gems.split(" ").map{ |gem| "  config.gem :#{gem}" }.join("\n")
+    #   end
+    #
+    WARNINGS = { unchanged_no_flag: 'File unchanged! The supplied flag value not found!' }
+
+    def insert_into_file(destination, *args, &block)
+      data = block_given? ? block : args.shift
+
+      config = args.shift || {}
+      config[:after] = /\z/ unless config.key?(:before) || config.key?(:after)
+
+      action InjectIntoFile.new(self, destination, data, config)
+    end
+    alias_method :inject_into_file, :insert_into_file
+
+    class InjectIntoFile < EmptyDirectory #:nodoc:
+      attr_reader :replacement, :flag, :behavior
+
+      def initialize(base, destination, data, config)
+        super(base, destination, {:verbose => true}.merge(config))
+
+        @behavior, @flag = if @config.key?(:after)
+          [:after, @config.delete(:after)]
+        else
+          [:before, @config.delete(:before)]
+        end
+
+        @replacement = data.is_a?(Proc) ? data.call : data
+        @flag = Regexp.escape(@flag) unless @flag.is_a?(Regexp)
+      end
+
+      def invoke!
+        content = if @behavior == :after
+          '\0' + replacement
+        else
+          replacement + '\0'
+        end
+
+        if exists?
+          if replace!(/#{flag}/, content, config[:force])
+            say_status(:invoke)
+          else
+            say_status(:unchanged, warning: WARNINGS[:unchanged_no_flag], color: :red)
+          end
+        else
+          unless pretend?
+            raise Bundler::Thor::Error, "The file #{ destination } does not appear to exist"
+          end
+        end
+      end
+
+      def revoke!
+        say_status :revoke
+
+        regexp = if @behavior == :after
+          content = '\1\2'
+          /(#{flag})(.*)(#{Regexp.escape(replacement)})/m
+        else
+          content = '\2\3'
+          /(#{Regexp.escape(replacement)})(.*)(#{flag})/m
+        end
+
+        replace!(regexp, content, true)
+      end
+
+    protected
+
+      def say_status(behavior, warning: nil, color: nil)
+        status = if behavior == :invoke
+          if flag == /\A/
+            :prepend
+          elsif flag == /\z/
+            :append
+          else
+            :insert
+          end
+        elsif warning
+          warning
+        else
+          :subtract
+        end
+
+        super(status, (color || config[:verbose]))
+      end
+
+      # Adds the content to the file.
+      #
+      def replace!(regexp, string, force)
+        return if pretend?
+        content = File.read(destination)
+        if force || !content.include?(replacement)
+          success = content.gsub!(regexp, string)
+
+          File.open(destination, "wb") { |file| file.write(content) }
+          success
+        end
+      end
+    end
+  end
+end
diff --git a/lib/bundler/vendor/thor/lib/thor/base.rb b/lib/bundler/vendor/thor/lib/thor/base.rb
new file mode 100644
index 0000000000..8487f9590a
--- /dev/null
+++ b/lib/bundler/vendor/thor/lib/thor/base.rb
@@ -0,0 +1,699 @@
+require_relative "command"
+require_relative "core_ext/hash_with_indifferent_access"
+require_relative "error"
+require_relative "invocation"
+require_relative "nested_context"
+require_relative "parser"
+require_relative "shell"
+require_relative "line_editor"
+require_relative "util"
+
+class Bundler::Thor
+  autoload :Actions,    File.expand_path("actions", __dir__)
+  autoload :RakeCompat, File.expand_path("rake_compat", __dir__)
+  autoload :Group,      File.expand_path("group", __dir__)
+
+  # Shortcuts for help.
+  HELP_MAPPINGS       = %w(-h -? --help -D)
+
+  # Bundler::Thor methods that should not be overwritten by the user.
+  THOR_RESERVED_WORDS = %w(invoke shell options behavior root destination_root relative_root
+                           action add_file create_file in_root inside run run_ruby_script)
+
+  TEMPLATE_EXTNAME = ".tt"
+
+  class << self
+    def deprecation_warning(message) #:nodoc:
+      unless ENV['THOR_SILENCE_DEPRECATION']
+        warn "Deprecation warning: #{message}\n" +
+          'You can silence deprecations warning by setting the environment variable THOR_SILENCE_DEPRECATION.'
+      end
+    end
+  end
+
+  module Base
+    attr_accessor :options, :parent_options, :args
+
+    # It receives arguments in an Array and two hashes, one for options and
+    # other for configuration.
+    #
+    # Notice that it does not check if all required arguments were supplied.
+    # It should be done by the parser.
+    #
+    # ==== Parameters
+    # args<Array[Object]>:: An array of objects. The objects are applied to their
+    #                       respective accessors declared with <tt>argument</tt>.
+    #
+    # options<Hash>:: An options hash that will be available as self.options.
+    #                 The hash given is converted to a hash with indifferent
+    #                 access, magic predicates (options.skip?) and then frozen.
+    #
+    # config<Hash>:: Configuration for this Bundler::Thor class.
+    #
+    def initialize(args = [], local_options = {}, config = {})
+      parse_options = self.class.class_options
+
+      # The start method splits inbound arguments at the first argument
+      # that looks like an option (starts with - or --). It then calls
+      # new, passing in the two halves of the arguments Array as the
+      # first two parameters.
+
+      command_options = config.delete(:command_options) # hook for start
+      parse_options = parse_options.merge(command_options) if command_options
+      if local_options.is_a?(Array)
+        array_options = local_options
+        hash_options = {}
+      else
+        # Handle the case where the class was explicitly instantiated
+        # with pre-parsed options.
+        array_options = []
+        hash_options = local_options
+      end
+
+      # Let Bundler::Thor::Options parse the options first, so it can remove
+      # declared options from the array. This will leave us with
+      # a list of arguments that weren't declared.
+      stop_on_unknown = self.class.stop_on_unknown_option? config[:current_command]
+      disable_required_check = self.class.disable_required_check? config[:current_command]
+      opts = Bundler::Thor::Options.new(parse_options, hash_options, stop_on_unknown, disable_required_check)
+      self.options = opts.parse(array_options)
+      self.options = config[:class_options].merge(options) if config[:class_options]
+
+      # If unknown options are disallowed, make sure that none of the
+      # remaining arguments looks like an option.
+      opts.check_unknown! if self.class.check_unknown_options?(config)
+
+      # Add the remaining arguments from the options parser to the
+      # arguments passed in to initialize. Then remove any positional
+      # arguments declared using #argument (this is primarily used
+      # by Bundler::Thor::Group). Tis will leave us with the remaining
+      # positional arguments.
+      to_parse  = args
+      to_parse += opts.remaining unless self.class.strict_args_position?(config)
+
+      thor_args = Bundler::Thor::Arguments.new(self.class.arguments)
+      thor_args.parse(to_parse).each { |k, v| __send__("#{k}=", v) }
+      @args = thor_args.remaining
+    end
+
+    class << self
+      def included(base) #:nodoc:
+        super(base)
+        base.extend ClassMethods
+        base.send :include, Invocation
+        base.send :include, Shell
+      end
+
+      # Returns the classes that inherits from Bundler::Thor or Bundler::Thor::Group.
+      #
+      # ==== Returns
+      # Array[Class]
+      #
+      def subclasses
+        @subclasses ||= []
+      end
+
+      # Returns the files where the subclasses are kept.
+      #
+      # ==== Returns
+      # Hash[path<String> => Class]
+      #
+      def subclass_files
+        @subclass_files ||= Hash.new { |h, k| h[k] = [] }
+      end
+
+      # Whenever a class inherits from Bundler::Thor or Bundler::Thor::Group, we should track the
+      # class and the file on Bundler::Thor::Base. This is the method responsible for it.
+      #
+      def register_klass_file(klass) #:nodoc:
+        file = caller[1].match(/(.*):\d+/)[1]
+        Bundler::Thor::Base.subclasses << klass unless Bundler::Thor::Base.subclasses.include?(klass)
+
+        file_subclasses = Bundler::Thor::Base.subclass_files[File.expand_path(file)]
+        file_subclasses << klass unless file_subclasses.include?(klass)
+      end
+    end
+
+    module ClassMethods
+      def attr_reader(*) #:nodoc:
+        no_commands { super }
+      end
+
+      def attr_writer(*) #:nodoc:
+        no_commands { super }
+      end
+
+      def attr_accessor(*) #:nodoc:
+        no_commands { super }
+      end
+
+      # If you want to raise an error for unknown options, call check_unknown_options!
+      # This is disabled by default to allow dynamic invocations.
+      def check_unknown_options!
+        @check_unknown_options = true
+      end
+
+      def check_unknown_options #:nodoc:
+        @check_unknown_options ||= from_superclass(:check_unknown_options, false)
+      end
+
+      def check_unknown_options?(config) #:nodoc:
+        !!check_unknown_options
+      end
+
+      # If you want to raise an error when the default value of an option does not match
+      # the type call check_default_type!
+      # This will be the default; for compatibility a deprecation warning is issued if necessary.
+      def check_default_type!
+        @check_default_type = true
+      end
+
+      # If you want to use defaults that don't match the type of an option,
+      # either specify `check_default_type: false` or call `allow_incompatible_default_type!`
+      def allow_incompatible_default_type!
+        @check_default_type = false
+      end
+
+      def check_default_type #:nodoc:
+        @check_default_type = from_superclass(:check_default_type, nil) unless defined?(@check_default_type)
+        @check_default_type
+      end
+
+      # If true, option parsing is suspended as soon as an unknown option or a
+      # regular argument is encountered.  All remaining arguments are passed to
+      # the command as regular arguments.
+      def stop_on_unknown_option?(command_name) #:nodoc:
+        false
+      end
+
+      # If true, option set will not suspend the execution of the command when
+      # a required option is not provided.
+      def disable_required_check?(command_name) #:nodoc:
+        false
+      end
+
+      # If you want only strict string args (useful when cascading thor classes),
+      # call strict_args_position! This is disabled by default to allow dynamic
+      # invocations.
+      def strict_args_position!
+        @strict_args_position = true
+      end
+
+      def strict_args_position #:nodoc:
+        @strict_args_position ||= from_superclass(:strict_args_position, false)
+      end
+
+      def strict_args_position?(config) #:nodoc:
+        !!strict_args_position
+      end
+
+      # Adds an argument to the class and creates an attr_accessor for it.
+      #
+      # Arguments are different from options in several aspects. The first one
+      # is how they are parsed from the command line, arguments are retrieved
+      # from position:
+      #
+      #   thor command NAME
+      #
+      # Instead of:
+      #
+      #   thor command --name=NAME
+      #
+      # Besides, arguments are used inside your code as an accessor (self.argument),
+      # while options are all kept in a hash (self.options).
+      #
+      # Finally, arguments cannot have type :default or :boolean but can be
+      # optional (supplying :optional => :true or :required => false), although
+      # you cannot have a required argument after a non-required argument. If you
+      # try it, an error is raised.
+      #
+      # ==== Parameters
+      # name<Symbol>:: The name of the argument.
+      # options<Hash>:: Described below.
+      #
+      # ==== Options
+      # :desc     - Description for the argument.
+      # :required - If the argument is required or not.
+      # :optional - If the argument is optional or not.
+      # :type     - The type of the argument, can be :string, :hash, :array, :numeric.
+      # :default  - Default value for this argument. It cannot be required and have default values.
+      # :banner   - String to show on usage notes.
+      #
+      # ==== Errors
+      # ArgumentError:: Raised if you supply a required argument after a non required one.
+      #
+      def argument(name, options = {})
+        is_thor_reserved_word?(name, :argument)
+        no_commands { attr_accessor name }
+
+        required = if options.key?(:optional)
+          !options[:optional]
+        elsif options.key?(:required)
+          options[:required]
+        else
+          options[:default].nil?
+        end
+
+        remove_argument name
+
+        if required
+          arguments.each do |argument|
+            next if argument.required?
+            raise ArgumentError, "You cannot have #{name.to_s.inspect} as required argument after " \
+                                "the non-required argument #{argument.human_name.inspect}."
+          end
+        end
+
+        options[:required] = required
+
+        arguments << Bundler::Thor::Argument.new(name, options)
+      end
+
+      # Returns this class arguments, looking up in the ancestors chain.
+      #
+      # ==== Returns
+      # Array[Bundler::Thor::Argument]
+      #
+      def arguments
+        @arguments ||= from_superclass(:arguments, [])
+      end
+
+      # Adds a bunch of options to the set of class options.
+      #
+      #   class_options :foo => false, :bar => :required, :baz => :string
+      #
+      # If you prefer more detailed declaration, check class_option.
+      #
+      # ==== Parameters
+      # Hash[Symbol => Object]
+      #
+      def class_options(options = nil)
+        @class_options ||= from_superclass(:class_options, {})
+        build_options(options, @class_options) if options
+        @class_options
+      end
+
+      # Adds an option to the set of class options
+      #
+      # ==== Parameters
+      # name<Symbol>:: The name of the argument.
+      # options<Hash>:: Described below.
+      #
+      # ==== Options
+      # :desc::     -- Description for the argument.
+      # :required:: -- If the argument is required or not.
+      # :default::  -- Default value for this argument.
+      # :group::    -- The group for this options. Use by class options to output options in different levels.
+      # :aliases::  -- Aliases for this option. <b>Note:</b> Bundler::Thor follows a convention of one-dash-one-letter options. Thus aliases like "-something" wouldn't be parsed; use either "\--something" or "-s" instead.
+      # :type::     -- The type of the argument, can be :string, :hash, :array, :numeric or :boolean.
+      # :banner::   -- String to show on usage notes.
+      # :hide::     -- If you want to hide this option from the help.
+      #
+      def class_option(name, options = {})
+        build_option(name, options, class_options)
+      end
+
+      # Removes a previous defined argument. If :undefine is given, undefine
+      # accessors as well.
+      #
+      # ==== Parameters
+      # names<Array>:: Arguments to be removed
+      #
+      # ==== Examples
+      #
+      #   remove_argument :foo
+      #   remove_argument :foo, :bar, :baz, :undefine => true
+      #
+      def remove_argument(*names)
+        options = names.last.is_a?(Hash) ? names.pop : {}
+
+        names.each do |name|
+          arguments.delete_if { |a| a.name == name.to_s }
+          undef_method name, "#{name}=" if options[:undefine]
+        end
+      end
+
+      # Removes a previous defined class option.
+      #
+      # ==== Parameters
+      # names<Array>:: Class options to be removed
+      #
+      # ==== Examples
+      #
+      #   remove_class_option :foo
+      #   remove_class_option :foo, :bar, :baz
+      #
+      def remove_class_option(*names)
+        names.each do |name|
+          class_options.delete(name)
+        end
+      end
+
+      # Defines the group. This is used when thor list is invoked so you can specify
+      # that only commands from a pre-defined group will be shown. Defaults to standard.
+      #
+      # ==== Parameters
+      # name<String|Symbol>
+      #
+      def group(name = nil)
+        if name
+          @group = name.to_s
+        else
+          @group ||= from_superclass(:group, "standard")
+        end
+      end
+
+      # Returns the commands for this Bundler::Thor class.
+      #
+      # ==== Returns
+      # Hash:: An ordered hash with commands names as keys and Bundler::Thor::Command
+      #        objects as values.
+      #
+      def commands
+        @commands ||= Hash.new
+      end
+      alias_method :tasks, :commands
+
+      # Returns the commands for this Bundler::Thor class and all subclasses.
+      #
+      # ==== Returns
+      # Hash:: An ordered hash with commands names as keys and Bundler::Thor::Command
+      #        objects as values.
+      #
+      def all_commands
+        @all_commands ||= from_superclass(:all_commands, Hash.new)
+        @all_commands.merge!(commands)
+      end
+      alias_method :all_tasks, :all_commands
+
+      # Removes a given command from this Bundler::Thor class. This is usually done if you
+      # are inheriting from another class and don't want it to be available
+      # anymore.
+      #
+      # By default it only remove the mapping to the command. But you can supply
+      # :undefine => true to undefine the method from the class as well.
+      #
+      # ==== Parameters
+      # name<Symbol|String>:: The name of the command to be removed
+      # options<Hash>:: You can give :undefine => true if you want commands the method
+      #                 to be undefined from the class as well.
+      #
+      def remove_command(*names)
+        options = names.last.is_a?(Hash) ? names.pop : {}
+
+        names.each do |name|
+          commands.delete(name.to_s)
+          all_commands.delete(name.to_s)
+          undef_method name if options[:undefine]
+        end
+      end
+      alias_method :remove_task, :remove_command
+
+      # All methods defined inside the given block are not added as commands.
+      #
+      # So you can do:
+      #
+      #   class MyScript < Bundler::Thor
+      #     no_commands do
+      #       def this_is_not_a_command
+      #       end
+      #     end
+      #   end
+      #
+      # You can also add the method and remove it from the command list:
+      #
+      #   class MyScript < Bundler::Thor
+      #     def this_is_not_a_command
+      #     end
+      #     remove_command :this_is_not_a_command
+      #   end
+      #
+      def no_commands(&block)
+        no_commands_context.enter(&block)
+      end
+
+      alias_method :no_tasks, :no_commands
+
+      def no_commands_context
+        @no_commands_context ||= NestedContext.new
+      end
+
+      def no_commands?
+        no_commands_context.entered?
+      end
+
+      # Sets the namespace for the Bundler::Thor or Bundler::Thor::Group class. By default the
+      # namespace is retrieved from the class name. If your Bundler::Thor class is named
+      # Scripts::MyScript, the help method, for example, will be called as:
+      #
+      #   thor scripts:my_script -h
+      #
+      # If you change the namespace:
+      #
+      #   namespace :my_scripts
+      #
+      # You change how your commands are invoked:
+      #
+      #   thor my_scripts -h
+      #
+      # Finally, if you change your namespace to default:
+      #
+      #   namespace :default
+      #
+      # Your commands can be invoked with a shortcut. Instead of:
+      #
+      #   thor :my_command
+      #
+      def namespace(name = nil)
+        if name
+          @namespace = name.to_s
+        else
+          @namespace ||= Bundler::Thor::Util.namespace_from_thor_class(self)
+        end
+      end
+
+      # Parses the command and options from the given args, instantiate the class
+      # and invoke the command. This method is used when the arguments must be parsed
+      # from an array. If you are inside Ruby and want to use a Bundler::Thor class, you
+      # can simply initialize it:
+      #
+      #   script = MyScript.new(args, options, config)
+      #   script.invoke(:command, first_arg, second_arg, third_arg)
+      #
+      def start(given_args = ARGV, config = {})
+        config[:shell] ||= Bundler::Thor::Base.shell.new
+        dispatch(nil, given_args.dup, nil, config)
+      rescue Bundler::Thor::Error => e
+        config[:debug] || ENV["THOR_DEBUG"] == "1" ? (raise e) : config[:shell].error(e.message)
+        exit(false) if exit_on_failure?
+      rescue Errno::EPIPE
+        # This happens if a thor command is piped to something like `head`,
+        # which closes the pipe when it's done reading. This will also
+        # mean that if the pipe is closed, further unnecessary
+        # computation will not occur.
+        exit(true)
+      end
+
+      # Allows to use private methods from parent in child classes as commands.
+      #
+      # ==== Parameters
+      #   names<Array>:: Method names to be used as commands
+      #
+      # ==== Examples
+      #
+      #   public_command :foo
+      #   public_command :foo, :bar, :baz
+      #
+      def public_command(*names)
+        names.each do |name|
+          class_eval "def #{name}(*); super end"
+        end
+      end
+      alias_method :public_task, :public_command
+
+      def handle_no_command_error(command, has_namespace = $thor_runner) #:nodoc:
+        raise UndefinedCommandError.new(command, all_commands.keys, (namespace if has_namespace))
+      end
+      alias_method :handle_no_task_error, :handle_no_command_error
+
+      def handle_argument_error(command, error, args, arity) #:nodoc:
+        name = [command.ancestor_name, command.name].compact.join(" ")
+        msg = "ERROR: \"#{basename} #{name}\" was called with ".dup
+        msg << "no arguments"               if     args.empty?
+        msg << "arguments " << args.inspect unless args.empty?
+        msg << "\nUsage: \"#{banner(command).split("\n").join("\"\n       \"")}\""
+        raise InvocationError, msg
+      end
+
+      # A flag that makes the process exit with status 1 if any error happens.
+      def exit_on_failure?
+        Bundler::Thor.deprecation_warning "Bundler::Thor exit with status 0 on errors. To keep this behavior, you must define `exit_on_failure?` in `#{self.name}`"
+        false
+      end
+
+    protected
+
+      # Prints the class options per group. If an option does not belong to
+      # any group, it's printed as Class option.
+      #
+      def class_options_help(shell, groups = {}) #:nodoc:
+        # Group options by group
+        class_options.each do |_, value|
+          groups[value.group] ||= []
+          groups[value.group] << value
+        end
+
+        # Deal with default group
+        global_options = groups.delete(nil) || []
+        print_options(shell, global_options)
+
+        # Print all others
+        groups.each do |group_name, options|
+          print_options(shell, options, group_name)
+        end
+      end
+
+      # Receives a set of options and print them.
+      def print_options(shell, options, group_name = nil)
+        return if options.empty?
+
+        list = []
+        padding = options.map { |o| o.aliases.size }.max.to_i * 4
+
+        options.each do |option|
+          next if option.hide
+          item = [option.usage(padding)]
+          item.push(option.description ? "# #{option.description}" : "")
+
+          list << item
+          list << ["", "# Default: #{option.default}"] if option.show_default?
+          list << ["", "# Possible values: #{option.enum.join(', ')}"] if option.enum
+        end
+
+        shell.say(group_name ? "#{group_name} options:" : "Options:")
+        shell.print_table(list, :indent => 2)
+        shell.say ""
+      end
+
+      # Raises an error if the word given is a Bundler::Thor reserved word.
+      def is_thor_reserved_word?(word, type) #:nodoc:
+        return false unless THOR_RESERVED_WORDS.include?(word.to_s)
+        raise "#{word.inspect} is a Bundler::Thor reserved word and cannot be defined as #{type}"
+      end
+
+      # Build an option and adds it to the given scope.
+      #
+      # ==== Parameters
+      # name<Symbol>:: The name of the argument.
+      # options<Hash>:: Described in both class_option and method_option.
+      # scope<Hash>:: Options hash that is being built up
+      def build_option(name, options, scope) #:nodoc:
+        scope[name] = Bundler::Thor::Option.new(name, {:check_default_type => check_default_type}.merge!(options))
+      end
+
+      # Receives a hash of options, parse them and add to the scope. This is a
+      # fast way to set a bunch of options:
+      #
+      #   build_options :foo => true, :bar => :required, :baz => :string
+      #
+      # ==== Parameters
+      # Hash[Symbol => Object]
+      def build_options(options, scope) #:nodoc:
+        options.each do |key, value|
+          scope[key] = Bundler::Thor::Option.parse(key, value)
+        end
+      end
+
+      # Finds a command with the given name. If the command belongs to the current
+      # class, just return it, otherwise dup it and add the fresh copy to the
+      # current command hash.
+      def find_and_refresh_command(name) #:nodoc:
+        if commands[name.to_s]
+          commands[name.to_s]
+        elsif command = all_commands[name.to_s] # rubocop:disable AssignmentInCondition
+          commands[name.to_s] = command.clone
+        else
+          raise ArgumentError, "You supplied :for => #{name.inspect}, but the command #{name.inspect} could not be found."
+        end
+      end
+      alias_method :find_and_refresh_task, :find_and_refresh_command
+
+      # Everytime someone inherits from a Bundler::Thor class, register the klass
+      # and file into baseclass.
+      def inherited(klass)
+        super(klass)
+        Bundler::Thor::Base.register_klass_file(klass)
+        klass.instance_variable_set(:@no_commands, 0)
+      end
+
+      # Fire this callback whenever a method is added. Added methods are
+      # tracked as commands by invoking the create_command method.
+      def method_added(meth)
+        super(meth)
+        meth = meth.to_s
+
+        if meth == "initialize"
+          initialize_added
+          return
+        end
+
+        # Return if it's not a public instance method
+        return unless public_method_defined?(meth.to_sym)
+
+        return if no_commands? || !create_command(meth)
+
+        is_thor_reserved_word?(meth, :command)
+        Bundler::Thor::Base.register_klass_file(self)
+      end
+
+      # Retrieves a value from superclass. If it reaches the baseclass,
+      # returns default.
+      def from_superclass(method, default = nil)
+        if self == baseclass || !superclass.respond_to?(method, true)
+          default
+        else
+          value = superclass.send(method)
+
+          # Ruby implements `dup` on Object, but raises a `TypeError`
+          # if the method is called on immediates. As a result, we
+          # don't have a good way to check whether dup will succeed
+          # without calling it and rescuing the TypeError.
+          begin
+            value.dup
+          rescue TypeError
+            value
+          end
+
+        end
+      end
+
+      #
+      # The basename of the program invoking the thor class.
+      #
+      def basename
+        File.basename($PROGRAM_NAME).split(" ").first
+      end
+
+      # SIGNATURE: Sets the baseclass. This is where the superclass lookup
+      # finishes.
+      def baseclass #:nodoc:
+      end
+
+      # SIGNATURE: Creates a new command if valid_command? is true. This method is
+      # called when a new method is added to the class.
+      def create_command(meth) #:nodoc:
+      end
+      alias_method :create_task, :create_command
+
+      # SIGNATURE: Defines behavior when the initialize method is added to the
+      # class.
+      def initialize_added #:nodoc:
+      end
+
+      # SIGNATURE: The hook invoked by start.
+      def dispatch(command, given_args, given_opts, config) #:nodoc:
+        raise NotImplementedError
+      end
+    end
+  end
+end
diff --git a/lib/bundler/vendor/thor/lib/thor/command.rb b/lib/bundler/vendor/thor/lib/thor/command.rb
new file mode 100644
index 0000000000..040c971c0c
--- /dev/null
+++ b/lib/bundler/vendor/thor/lib/thor/command.rb
@@ -0,0 +1,142 @@
+class Bundler::Thor
+  class Command < Struct.new(:name, :description, :long_description, :usage, :options, :ancestor_name)
+    FILE_REGEXP = /^#{Regexp.escape(File.dirname(__FILE__))}/
+
+    def initialize(name, description, long_description, usage, options = nil)
+      super(name.to_s, description, long_description, usage, options || {})
+    end
+
+    def initialize_copy(other) #:nodoc:
+      super(other)
+      self.options = other.options.dup if other.options
+    end
+
+    def hidden?
+      false
+    end
+
+    # By default, a command invokes a method in the thor class. You can change this
+    # implementation to create custom commands.
+    def run(instance, args = [])
+      arity = nil
+
+      if private_method?(instance)
+        instance.class.handle_no_command_error(name)
+      elsif public_method?(instance)
+        arity = instance.method(name).arity
+        instance.__send__(name, *args)
+      elsif local_method?(instance, :method_missing)
+        instance.__send__(:method_missing, name.to_sym, *args)
+      else
+        instance.class.handle_no_command_error(name)
+      end
+    rescue ArgumentError => e
+      handle_argument_error?(instance, e, caller) ? instance.class.handle_argument_error(self, e, args, arity) : (raise e)
+    rescue NoMethodError => e
+      handle_no_method_error?(instance, e, caller) ? instance.class.handle_no_command_error(name) : (raise e)
+    end
+
+    # Returns the formatted usage by injecting given required arguments
+    # and required options into the given usage.
+    def formatted_usage(klass, namespace = true, subcommand = false)
+      if ancestor_name
+        formatted = "#{ancestor_name} ".dup # add space
+      elsif namespace
+        namespace = klass.namespace
+        formatted = "#{namespace.gsub(/^(default)/, '')}:".dup
+      end
+      formatted ||= "#{klass.namespace.split(':').last} ".dup if subcommand
+
+      formatted ||= "".dup
+
+      Array(usage).map do |specific_usage|
+        formatted_specific_usage = formatted
+
+        formatted_specific_usage += required_arguments_for(klass, specific_usage)
+
+        # Add required options
+        formatted_specific_usage += " #{required_options}"
+
+        # Strip and go!
+        formatted_specific_usage.strip
+      end.join("\n")
+    end
+
+  protected
+
+    # Add usage with required arguments
+    def required_arguments_for(klass, usage)
+      if klass && !klass.arguments.empty?
+        usage.to_s.gsub(/^#{name}/) do |match|
+          match << " " << klass.arguments.map(&:usage).compact.join(" ")
+        end
+      else
+        usage.to_s
+      end
+    end
+
+    def not_debugging?(instance)
+      !(instance.class.respond_to?(:debugging) && instance.class.debugging)
+    end
+
+    def required_options
+      @required_options ||= options.map { |_, o| o.usage if o.required? }.compact.sort.join(" ")
+    end
+
+    # Given a target, checks if this class name is a public method.
+    def public_method?(instance) #:nodoc:
+      !(instance.public_methods & [name.to_s, name.to_sym]).empty?
+    end
+
+    def private_method?(instance)
+      !(instance.private_methods & [name.to_s, name.to_sym]).empty?
+    end
+
+    def local_method?(instance, name)
+      methods = instance.public_methods(false) + instance.private_methods(false) + instance.protected_methods(false)
+      !(methods & [name.to_s, name.to_sym]).empty?
+    end
+
+    def sans_backtrace(backtrace, caller) #:nodoc:
+      saned = backtrace.reject { |frame| frame =~ FILE_REGEXP || (frame =~ /\.java:/ && RUBY_PLATFORM =~ /java/) || (frame =~ %r{^kernel/} && RUBY_ENGINE =~ /rbx/) }
+      saned - caller
+    end
+
+    def handle_argument_error?(instance, error, caller)
+      not_debugging?(instance) && (error.message =~ /wrong number of arguments/ || error.message =~ /given \d*, expected \d*/) && begin
+        saned = sans_backtrace(error.backtrace, caller)
+        saned.empty? || saned.size == 1
+      end
+    end
+
+    def handle_no_method_error?(instance, error, caller)
+      not_debugging?(instance) &&
+        error.message =~ /^undefined method `#{name}' for #{Regexp.escape(instance.to_s)}$/
+    end
+  end
+  Task = Command
+
+  # A command that is hidden in help messages but still invocable.
+  class HiddenCommand < Command
+    def hidden?
+      true
+    end
+  end
+  HiddenTask = HiddenCommand
+
+  # A dynamic command that handles method missing scenarios.
+  class DynamicCommand < Command
+    def initialize(name, options = nil)
+      super(name.to_s, "A dynamically-generated command", name.to_s, name.to_s, options)
+    end
+
+    def run(instance, args = [])
+      if (instance.methods & [name.to_s, name.to_sym]).empty?
+        super
+      else
+        instance.class.handle_no_command_error(name)
+      end
+    end
+  end
+  DynamicTask = DynamicCommand
+end
diff --git a/lib/bundler/vendor/thor/lib/thor/core_ext/hash_with_indifferent_access.rb b/lib/bundler/vendor/thor/lib/thor/core_ext/hash_with_indifferent_access.rb
new file mode 100644
index 0000000000..c167aa33b8
--- /dev/null
+++ b/lib/bundler/vendor/thor/lib/thor/core_ext/hash_with_indifferent_access.rb
@@ -0,0 +1,97 @@
+class Bundler::Thor
+  module CoreExt #:nodoc:
+    # A hash with indifferent access and magic predicates.
+    #
+    #   hash = Bundler::Thor::CoreExt::HashWithIndifferentAccess.new 'foo' => 'bar', 'baz' => 'bee', 'force' => true
+    #
+    #   hash[:foo]  #=> 'bar'
+    #   hash['foo'] #=> 'bar'
+    #   hash.foo?   #=> true
+    #
+    class HashWithIndifferentAccess < ::Hash #:nodoc:
+      def initialize(hash = {})
+        super()
+        hash.each do |key, value|
+          self[convert_key(key)] = value
+        end
+      end
+
+      def [](key)
+        super(convert_key(key))
+      end
+
+      def []=(key, value)
+        super(convert_key(key), value)
+      end
+
+      def delete(key)
+        super(convert_key(key))
+      end
+
+      def fetch(key, *args)
+        super(convert_key(key), *args)
+      end
+
+      def key?(key)
+        super(convert_key(key))
+      end
+
+      def values_at(*indices)
+        indices.map { |key| self[convert_key(key)] }
+      end
+
+      def merge(other)
+        dup.merge!(other)
+      end
+
+      def merge!(other)
+        other.each do |key, value|
+          self[convert_key(key)] = value
+        end
+        self
+      end
+
+      def reverse_merge(other)
+        self.class.new(other).merge(self)
+      end
+
+      def reverse_merge!(other_hash)
+        replace(reverse_merge(other_hash))
+      end
+
+      def replace(other_hash)
+        super(other_hash)
+      end
+
+      # Convert to a Hash with String keys.
+      def to_hash
+        Hash.new(default).merge!(self)
+      end
+
+    protected
+
+      def convert_key(key)
+        key.is_a?(Symbol) ? key.to_s : key
+      end
+
+      # Magic predicates. For instance:
+      #
+      #   options.force?                  # => !!options['force']
+      #   options.shebang                 # => "/usr/lib/local/ruby"
+      #   options.test_framework?(:rspec) # => options[:test_framework] == :rspec
+      #
+      def method_missing(method, *args)
+        method = method.to_s
+        if method =~ /^(\w+)\?$/
+          if args.empty?
+            !!self[$1]
+          else
+            self[$1] == args.first
+          end
+        else
+          self[method]
+        end
+      end
+    end
+  end
+end
diff --git a/lib/bundler/vendor/thor/lib/thor/error.rb b/lib/bundler/vendor/thor/lib/thor/error.rb
new file mode 100644
index 0000000000..7d57129b83
--- /dev/null
+++ b/lib/bundler/vendor/thor/lib/thor/error.rb
@@ -0,0 +1,110 @@
+class Bundler::Thor
+  Correctable = if defined?(DidYouMean::SpellChecker) && defined?(DidYouMean::Correctable) # rubocop:disable Naming/ConstantName
+                  # In order to support versions of Ruby that don't have keyword
+                  # arguments, we need our own spell checker class that doesn't take key
+                  # words. Even though this code wouldn't be hit because of the check
+                  # above, it's still necessary because the interpreter would otherwise be
+                  # unable to parse the file.
+                  class NoKwargSpellChecker < DidYouMean::SpellChecker # :nodoc:
+                    def initialize(dictionary)
+                      @dictionary = dictionary
+                    end
+                  end
+
+                  DidYouMean::Correctable
+                end
+
+  # Bundler::Thor::Error is raised when it's caused by wrong usage of thor classes. Those
+  # errors have their backtrace suppressed and are nicely shown to the user.
+  #
+  # Errors that are caused by the developer, like declaring a method which
+  # overwrites a thor keyword, SHOULD NOT raise a Bundler::Thor::Error. This way, we
+  # ensure that developer errors are shown with full backtrace.
+  class Error < StandardError
+  end
+
+  # Raised when a command was not found.
+  class UndefinedCommandError < Error
+    class SpellChecker
+      attr_reader :error
+
+      def initialize(error)
+        @error = error
+      end
+
+      def corrections
+        @corrections ||= spell_checker.correct(error.command).map(&:inspect)
+      end
+
+      def spell_checker
+        NoKwargSpellChecker.new(error.all_commands)
+      end
+    end
+
+    attr_reader :command, :all_commands
+
+    def initialize(command, all_commands, namespace)
+      @command = command
+      @all_commands = all_commands
+
+      message = "Could not find command #{command.inspect}"
+      message = namespace ? "#{message} in #{namespace.inspect} namespace." : "#{message}."
+
+      super(message)
+    end
+
+    prepend Correctable if Correctable
+  end
+  UndefinedTaskError = UndefinedCommandError
+
+  class AmbiguousCommandError < Error
+  end
+  AmbiguousTaskError = AmbiguousCommandError
+
+  # Raised when a command was found, but not invoked properly.
+  class InvocationError < Error
+  end
+
+  class UnknownArgumentError < Error
+    class SpellChecker
+      attr_reader :error
+
+      def initialize(error)
+        @error = error
+      end
+
+      def corrections
+        @corrections ||=
+          error.unknown.flat_map { |unknown| spell_checker.correct(unknown) }.uniq.map(&:inspect)
+      end
+
+      def spell_checker
+        @spell_checker ||= NoKwargSpellChecker.new(error.switches)
+      end
+    end
+
+    attr_reader :switches, :unknown
+
+    def initialize(switches, unknown)
+      @switches = switches
+      @unknown = unknown
+
+      super("Unknown switches #{unknown.map(&:inspect).join(', ')}")
+    end
+
+    prepend Correctable if Correctable
+  end
+
+  class RequiredArgumentMissingError < InvocationError
+  end
+
+  class MalformattedArgumentError < InvocationError
+  end
+
+  if Correctable
+    DidYouMean::SPELL_CHECKERS.merge!(
+      'Bundler::Thor::UndefinedCommandError' => UndefinedCommandError::SpellChecker,
+      'Bundler::Thor::UnknownArgumentError' => UnknownArgumentError::SpellChecker
+    )
+  end
+end
diff --git a/lib/bundler/vendor/thor/lib/thor/group.rb b/lib/bundler/vendor/thor/lib/thor/group.rb
new file mode 100644
index 0000000000..7861d05345
--- /dev/null
+++ b/lib/bundler/vendor/thor/lib/thor/group.rb
@@ -0,0 +1,281 @@
+require_relative "base"
+
+# Bundler::Thor has a special class called Bundler::Thor::Group. The main difference to Bundler::Thor class
+# is that it invokes all commands at once. It also include some methods that allows
+# invocations to be done at the class method, which are not available to Bundler::Thor
+# commands.
+class Bundler::Thor::Group
+  class << self
+    # The description for this Bundler::Thor::Group. If none is provided, but a source root
+    # exists, tries to find the USAGE one folder above it, otherwise searches
+    # in the superclass.
+    #
+    # ==== Parameters
+    # description<String>:: The description for this Bundler::Thor::Group.
+    #
+    def desc(description = nil)
+      if description
+        @desc = description
+      else
+        @desc ||= from_superclass(:desc, nil)
+      end
+    end
+
+    # Prints help information.
+    #
+    # ==== Options
+    # short:: When true, shows only usage.
+    #
+    def help(shell)
+      shell.say "Usage:"
+      shell.say "  #{banner}\n"
+      shell.say
+      class_options_help(shell)
+      shell.say desc if desc
+    end
+
+    # Stores invocations for this class merging with superclass values.
+    #
+    def invocations #:nodoc:
+      @invocations ||= from_superclass(:invocations, {})
+    end
+
+    # Stores invocation blocks used on invoke_from_option.
+    #
+    def invocation_blocks #:nodoc:
+      @invocation_blocks ||= from_superclass(:invocation_blocks, {})
+    end
+
+    # Invoke the given namespace or class given. It adds an instance
+    # method that will invoke the klass and command. You can give a block to
+    # configure how it will be invoked.
+    #
+    # The namespace/class given will have its options showed on the help
+    # usage. Check invoke_from_option for more information.
+    #
+    def invoke(*names, &block)
+      options = names.last.is_a?(Hash) ? names.pop : {}
+      verbose = options.fetch(:verbose, true)
+
+      names.each do |name|
+        invocations[name] = false
+        invocation_blocks[name] = block if block_given?
+
+        class_eval <<-METHOD, __FILE__, __LINE__ + 1
+          def _invoke_#{name.to_s.gsub(/\W/, '_')}
+            klass, command = self.class.prepare_for_invocation(nil, #{name.inspect})
+
+            if klass
+              say_status :invoke, #{name.inspect}, #{verbose.inspect}
+              block = self.class.invocation_blocks[#{name.inspect}]
+              _invoke_for_class_method klass, command, &block
+            else
+              say_status :error, %(#{name.inspect} [not found]), :red
+            end
+          end
+        METHOD
+      end
+    end
+
+    # Invoke a thor class based on the value supplied by the user to the
+    # given option named "name". A class option must be created before this
+    # method is invoked for each name given.
+    #
+    # ==== Examples
+    #
+    #   class GemGenerator < Bundler::Thor::Group
+    #     class_option :test_framework, :type => :string
+    #     invoke_from_option :test_framework
+    #   end
+    #
+    # ==== Boolean options
+    #
+    # In some cases, you want to invoke a thor class if some option is true or
+    # false. This is automatically handled by invoke_from_option. Then the
+    # option name is used to invoke the generator.
+    #
+    # ==== Preparing for invocation
+    #
+    # In some cases you want to customize how a specified hook is going to be
+    # invoked. You can do that by overwriting the class method
+    # prepare_for_invocation. The class method must necessarily return a klass
+    # and an optional command.
+    #
+    # ==== Custom invocations
+    #
+    # You can also supply a block to customize how the option is going to be
+    # invoked. The block receives two parameters, an instance of the current
+    # class and the klass to be invoked.
+    #
+    def invoke_from_option(*names, &block)
+      options = names.last.is_a?(Hash) ? names.pop : {}
+      verbose = options.fetch(:verbose, :white)
+
+      names.each do |name|
+        unless class_options.key?(name)
+          raise ArgumentError, "You have to define the option #{name.inspect} " \
+                              "before setting invoke_from_option."
+        end
+
+        invocations[name] = true
+        invocation_blocks[name] = block if block_given?
+
+        class_eval <<-METHOD, __FILE__, __LINE__ + 1
+          def _invoke_from_option_#{name.to_s.gsub(/\W/, '_')}
+            return unless options[#{name.inspect}]
+
+            value = options[#{name.inspect}]
+            value = #{name.inspect} if TrueClass === value
+            klass, command = self.class.prepare_for_invocation(#{name.inspect}, value)
+
+            if klass
+              say_status :invoke, value, #{verbose.inspect}
+              block = self.class.invocation_blocks[#{name.inspect}]
+              _invoke_for_class_method klass, command, &block
+            else
+              say_status :error, %(\#{value} [not found]), :red
+            end
+          end
+        METHOD
+      end
+    end
+
+    # Remove a previously added invocation.
+    #
+    # ==== Examples
+    #
+    #   remove_invocation :test_framework
+    #
+    def remove_invocation(*names)
+      names.each do |name|
+        remove_command(name)
+        remove_class_option(name)
+        invocations.delete(name)
+        invocation_blocks.delete(name)
+      end
+    end
+
+    # Overwrite class options help to allow invoked generators options to be
+    # shown recursively when invoking a generator.
+    #
+    def class_options_help(shell, groups = {}) #:nodoc:
+      get_options_from_invocations(groups, class_options) do |klass|
+        klass.send(:get_options_from_invocations, groups, class_options)
+      end
+      super(shell, groups)
+    end
+
+    # Get invocations array and merge options from invocations. Those
+    # options are added to group_options hash. Options that already exists
+    # in base_options are not added twice.
+    #
+    def get_options_from_invocations(group_options, base_options) #:nodoc: # rubocop:disable MethodLength
+      invocations.each do |name, from_option|
+        value = if from_option
+          option = class_options[name]
+          option.type == :boolean ? name : option.default
+        else
+          name
+        end
+        next unless value
+
+        klass, _ = prepare_for_invocation(name, value)
+        next unless klass && klass.respond_to?(:class_options)
+
+        value = value.to_s
+        human_name = value.respond_to?(:classify) ? value.classify : value
+
+        group_options[human_name] ||= []
+        group_options[human_name] += klass.class_options.values.select do |class_option|
+          base_options[class_option.name.to_sym].nil? && class_option.group.nil? &&
+            !group_options.values.flatten.any? { |i| i.name == class_option.name }
+        end
+
+        yield klass if block_given?
+      end
+    end
+
+    # Returns commands ready to be printed.
+    def printable_commands(*)
+      item = []
+      item << banner
+      item << (desc ? "# #{desc.gsub(/\s+/m, ' ')}" : "")
+      [item]
+    end
+    alias_method :printable_tasks, :printable_commands
+
+    def handle_argument_error(command, error, _args, arity) #:nodoc:
+      msg = "#{basename} #{command.name} takes #{arity} argument".dup
+      msg << "s" if arity > 1
+      msg << ", but it should not."
+      raise error, msg
+    end
+
+  protected
+
+    # The method responsible for dispatching given the args.
+    def dispatch(command, given_args, given_opts, config) #:nodoc:
+      if Bundler::Thor::HELP_MAPPINGS.include?(given_args.first)
+        help(config[:shell])
+        return
+      end
+
+      args, opts = Bundler::Thor::Options.split(given_args)
+      opts = given_opts || opts
+
+      instance = new(args, opts, config)
+      yield instance if block_given?
+
+      if command
+        instance.invoke_command(all_commands[command])
+      else
+        instance.invoke_all
+      end
+    end
+
+    # The banner for this class. You can customize it if you are invoking the
+    # thor class by another ways which is not the Bundler::Thor::Runner.
+    def banner
+      "#{basename} #{self_command.formatted_usage(self, false)}"
+    end
+
+    # Represents the whole class as a command.
+    def self_command #:nodoc:
+      Bundler::Thor::DynamicCommand.new(namespace, class_options)
+    end
+    alias_method :self_task, :self_command
+
+    def baseclass #:nodoc:
+      Bundler::Thor::Group
+    end
+
+    def create_command(meth) #:nodoc:
+      commands[meth.to_s] = Bundler::Thor::Command.new(meth, nil, nil, nil, nil)
+      true
+    end
+    alias_method :create_task, :create_command
+  end
+
+  include Bundler::Thor::Base
+
+protected
+
+  # Shortcut to invoke with padding and block handling. Use internally by
+  # invoke and invoke_from_option class methods.
+  def _invoke_for_class_method(klass, command = nil, *args, &block) #:nodoc:
+    with_padding do
+      if block
+        case block.arity
+        when 3
+          yield(self, klass, command)
+        when 2
+          yield(self, klass)
+        when 1
+          instance_exec(klass, &block)
+        end
+      else
+        invoke klass, command, *args
+      end
+    end
+  end
+end
diff --git a/lib/bundler/vendor/thor/lib/thor/invocation.rb b/lib/bundler/vendor/thor/lib/thor/invocation.rb
new file mode 100644
index 0000000000..248a466f8e
--- /dev/null
+++ b/lib/bundler/vendor/thor/lib/thor/invocation.rb
@@ -0,0 +1,178 @@
+class Bundler::Thor
+  module Invocation
+    def self.included(base) #:nodoc:
+      super(base)
+      base.extend ClassMethods
+    end
+
+    module ClassMethods
+      # This method is responsible for receiving a name and find the proper
+      # class and command for it. The key is an optional parameter which is
+      # available only in class methods invocations (i.e. in Bundler::Thor::Group).
+      def prepare_for_invocation(key, name) #:nodoc:
+        case name
+        when Symbol, String
+          Bundler::Thor::Util.find_class_and_command_by_namespace(name.to_s, !key)
+        else
+          name
+        end
+      end
+    end
+
+    # Make initializer aware of invocations and the initialization args.
+    def initialize(args = [], options = {}, config = {}, &block) #:nodoc:
+      @_invocations = config[:invocations] || Hash.new { |h, k| h[k] = [] }
+      @_initializer = [args, options, config]
+      super
+    end
+
+    # Make the current command chain accessible with in a Bundler::Thor-(sub)command
+    def current_command_chain
+      @_invocations.values.flatten.map(&:to_sym)
+    end
+
+    # Receives a name and invokes it. The name can be a string (either "command" or
+    # "namespace:command"), a Bundler::Thor::Command, a Class or a Bundler::Thor instance. If the
+    # command cannot be guessed by name, it can also be supplied as second argument.
+    #
+    # You can also supply the arguments, options and configuration values for
+    # the command to be invoked, if none is given, the same values used to
+    # initialize the invoker are used to initialize the invoked.
+    #
+    # When no name is given, it will invoke the default command of the current class.
+    #
+    # ==== Examples
+    #
+    #   class A < Bundler::Thor
+    #     def foo
+    #       invoke :bar
+    #       invoke "b:hello", ["Erik"]
+    #     end
+    #
+    #     def bar
+    #       invoke "b:hello", ["Erik"]
+    #     end
+    #   end
+    #
+    #   class B < Bundler::Thor
+    #     def hello(name)
+    #       puts "hello #{name}"
+    #     end
+    #   end
+    #
+    # You can notice that the method "foo" above invokes two commands: "bar",
+    # which belongs to the same class and "hello" which belongs to the class B.
+    #
+    # By using an invocation system you ensure that a command is invoked only once.
+    # In the example above, invoking "foo" will invoke "b:hello" just once, even
+    # if it's invoked later by "bar" method.
+    #
+    # When class A invokes class B, all arguments used on A initialization are
+    # supplied to B. This allows lazy parse of options. Let's suppose you have
+    # some rspec commands:
+    #
+    #   class Rspec < Bundler::Thor::Group
+    #     class_option :mock_framework, :type => :string, :default => :rr
+    #
+    #     def invoke_mock_framework
+    #       invoke "rspec:#{options[:mock_framework]}"
+    #     end
+    #   end
+    #
+    # As you noticed, it invokes the given mock framework, which might have its
+    # own options:
+    #
+    #   class Rspec::RR < Bundler::Thor::Group
+    #     class_option :style, :type => :string, :default => :mock
+    #   end
+    #
+    # Since it's not rspec concern to parse mock framework options, when RR
+    # is invoked all options are parsed again, so RR can extract only the options
+    # that it's going to use.
+    #
+    # If you want Rspec::RR to be initialized with its own set of options, you
+    # have to do that explicitly:
+    #
+    #   invoke "rspec:rr", [], :style => :foo
+    #
+    # Besides giving an instance, you can also give a class to invoke:
+    #
+    #   invoke Rspec::RR, [], :style => :foo
+    #
+    def invoke(name = nil, *args)
+      if name.nil?
+        warn "[Bundler::Thor] Calling invoke() without argument is deprecated. Please use invoke_all instead.\n#{caller.join("\n")}"
+        return invoke_all
+      end
+
+      args.unshift(nil) if args.first.is_a?(Array) || args.first.nil?
+      command, args, opts, config = args
+
+      klass, command = _retrieve_class_and_command(name, command)
+      raise "Missing Bundler::Thor class for invoke #{name}" unless klass
+      raise "Expected Bundler::Thor class, got #{klass}" unless klass <= Bundler::Thor::Base
+
+      args, opts, config = _parse_initialization_options(args, opts, config)
+      klass.send(:dispatch, command, args, opts, config) do |instance|
+        instance.parent_options = options
+      end
+    end
+
+    # Invoke the given command if the given args.
+    def invoke_command(command, *args) #:nodoc:
+      current = @_invocations[self.class]
+
+      unless current.include?(command.name)
+        current << command.name
+        command.run(self, *args)
+      end
+    end
+    alias_method :invoke_task, :invoke_command
+
+    # Invoke all commands for the current instance.
+    def invoke_all #:nodoc:
+      self.class.all_commands.map { |_, command| invoke_command(command) }
+    end
+
+    # Invokes using shell padding.
+    def invoke_with_padding(*args)
+      with_padding { invoke(*args) }
+    end
+
+  protected
+
+    # Configuration values that are shared between invocations.
+    def _shared_configuration #:nodoc:
+      {:invocations => @_invocations}
+    end
+
+    # This method simply retrieves the class and command to be invoked.
+    # If the name is nil or the given name is a command in the current class,
+    # use the given name and return self as class. Otherwise, call
+    # prepare_for_invocation in the current class.
+    def _retrieve_class_and_command(name, sent_command = nil) #:nodoc:
+      if name.nil?
+        [self.class, nil]
+      elsif self.class.all_commands[name.to_s]
+        [self.class, name.to_s]
+      else
+        klass, command = self.class.prepare_for_invocation(nil, name)
+        [klass, command || sent_command]
+      end
+    end
+    alias_method :_retrieve_class_and_task, :_retrieve_class_and_command
+
+    # Initialize klass using values stored in the @_initializer.
+    def _parse_initialization_options(args, opts, config) #:nodoc:
+      stored_args, stored_opts, stored_config = @_initializer
+
+      args ||= stored_args.dup
+      opts ||= stored_opts.dup
+
+      config ||= {}
+      config = stored_config.merge(_shared_configuration).merge!(config)
+
+      [args, opts, config]
+    end
+  end
+end
diff --git a/lib/bundler/vendor/thor/lib/thor/line_editor.rb b/lib/bundler/vendor/thor/lib/thor/line_editor.rb
new file mode 100644
index 0000000000..5c0c336e7a
--- /dev/null
+++ b/lib/bundler/vendor/thor/lib/thor/line_editor.rb
@@ -0,0 +1,17 @@
+require_relative "line_editor/basic"
+require_relative "line_editor/readline"
+
+class Bundler::Thor
+  module LineEditor
+    def self.readline(prompt, options = {})
+      best_available.new(prompt, options).readline
+    end
+
+    def self.best_available
+      [
+        Bundler::Thor::LineEditor::Readline,
+        Bundler::Thor::LineEditor::Basic
+      ].detect(&:available?)
+    end
+  end
+end
diff --git a/lib/bundler/vendor/thor/lib/thor/line_editor/basic.rb b/lib/bundler/vendor/thor/lib/thor/line_editor/basic.rb
new file mode 100644
index 0000000000..fe3d7c998f
--- /dev/null
+++ b/lib/bundler/vendor/thor/lib/thor/line_editor/basic.rb
@@ -0,0 +1,37 @@
+class Bundler::Thor
+  module LineEditor
+    class Basic
+      attr_reader :prompt, :options
+
+      def self.available?
+        true
+      end
+
+      def initialize(prompt, options)
+        @prompt = prompt
+        @options = options
+      end
+
+      def readline
+        $stdout.print(prompt)
+        get_input
+      end
+
+    private
+
+      def get_input
+        if echo?
+          $stdin.gets
+        else
+          # Lazy-load io/console since it is gem-ified as of 2.3
+          require "io/console"
+          $stdin.noecho(&:gets)
+        end
+      end
+
+      def echo?
+        options.fetch(:echo, true)
+      end
+    end
+  end
+end
diff --git a/lib/bundler/vendor/thor/lib/thor/line_editor/readline.rb b/lib/bundler/vendor/thor/lib/thor/line_editor/readline.rb
new file mode 100644
index 0000000000..120eadd06a
--- /dev/null
+++ b/lib/bundler/vendor/thor/lib/thor/line_editor/readline.rb
@@ -0,0 +1,88 @@
+class Bundler::Thor
+  module LineEditor
+    class Readline < Basic
+      def self.available?
+        begin
+          require "readline"
+        rescue LoadError
+        end
+
+        Object.const_defined?(:Readline)
+      end
+
+      def readline
+        if echo?
+          ::Readline.completion_append_character = nil
+          # rb-readline does not allow Readline.completion_proc= to receive nil.
+          if complete = completion_proc
+            ::Readline.completion_proc = complete
+          end
+          ::Readline.readline(prompt, add_to_history?)
+        else
+          super
+        end
+      end
+
+    private
+
+      def add_to_history?
+        options.fetch(:add_to_history, true)
+      end
+
+      def completion_proc
+        if use_path_completion?
+          proc { |text| PathCompletion.new(text).matches }
+        elsif completion_options.any?
+          proc do |text|
+            completion_options.select { |option| option.start_with?(text) }
+          end
+        end
+      end
+
+      def completion_options
+        options.fetch(:limited_to, [])
+      end
+
+      def use_path_completion?
+        options.fetch(:path, false)
+      end
+
+      class PathCompletion
+        attr_reader :text
+        private :text
+
+        def initialize(text)
+          @text = text
+        end
+
+        def matches
+          relative_matches
+        end
+
+      private
+
+        def relative_matches
+          absolute_matches.map { |path| path.sub(base_path, "") }
+        end
+
+        def absolute_matches
+          Dir[glob_pattern].map do |path|
+            if File.directory?(path)
+              "#{path}/"
+            else
+              path
+            end
+          end
+        end
+
+        def glob_pattern
+          "#{base_path}#{text}*"
+        end
+
+        def base_path
+          "#{Dir.pwd}/"
+        end
+      end
+    end
+  end
+end
diff --git a/lib/bundler/vendor/thor/lib/thor/nested_context.rb b/lib/bundler/vendor/thor/lib/thor/nested_context.rb
new file mode 100644
index 0000000000..fd36b9d43f
--- /dev/null
+++ b/lib/bundler/vendor/thor/lib/thor/nested_context.rb
@@ -0,0 +1,29 @@
+class Bundler::Thor
+  class NestedContext
+    def initialize
+      @depth = 0
+    end
+
+    def enter
+      push
+
+      yield
+    ensure
+      pop
+    end
+
+    def entered?
+      @depth > 0
+    end
+
+    private
+
+    def push
+      @depth += 1
+    end
+
+    def pop
+      @depth -= 1
+    end
+  end
+end
diff --git a/lib/bundler/vendor/thor/lib/thor/parser.rb b/lib/bundler/vendor/thor/lib/thor/parser.rb
new file mode 100644
index 0000000000..45394732ca
--- /dev/null
+++ b/lib/bundler/vendor/thor/lib/thor/parser.rb
@@ -0,0 +1,4 @@
+require_relative "parser/argument"
+require_relative "parser/arguments"
+require_relative "parser/option"
+require_relative "parser/options"
diff --git a/lib/bundler/vendor/thor/lib/thor/parser/argument.rb b/lib/bundler/vendor/thor/lib/thor/parser/argument.rb
new file mode 100644
index 0000000000..dfe7398583
--- /dev/null
+++ b/lib/bundler/vendor/thor/lib/thor/parser/argument.rb
@@ -0,0 +1,70 @@
+class Bundler::Thor
+  class Argument #:nodoc:
+    VALID_TYPES = [:numeric, :hash, :array, :string]
+
+    attr_reader :name, :description, :enum, :required, :type, :default, :banner
+    alias_method :human_name, :name
+
+    def initialize(name, options = {})
+      class_name = self.class.name.split("::").last
+
+      type = options[:type]
+
+      raise ArgumentError, "#{class_name} name can't be nil."                         if name.nil?
+      raise ArgumentError, "Type :#{type} is not valid for #{class_name.downcase}s."  if type && !valid_type?(type)
+
+      @name        = name.to_s
+      @description = options[:desc]
+      @required    = options.key?(:required) ? options[:required] : true
+      @type        = (type || :string).to_sym
+      @default     = options[:default]
+      @banner      = options[:banner] || default_banner
+      @enum        = options[:enum]
+
+      validate! # Trigger specific validations
+    end
+
+    def usage
+      required? ? banner : "[#{banner}]"
+    end
+
+    def required?
+      required
+    end
+
+    def show_default?
+      case default
+      when Array, String, Hash
+        !default.empty?
+      else
+        default
+      end
+    end
+
+  protected
+
+    def validate!
+      raise ArgumentError, "An argument cannot be required and have default value." if required? && !default.nil?
+      raise ArgumentError, "An argument cannot have an enum other than an array." if @enum && !@enum.is_a?(Array)
+    end
+
+    def valid_type?(type)
+      self.class::VALID_TYPES.include?(type.to_sym)
+    end
+
+    def default_banner
+      case type
+      when :boolean
+        nil
+      when :string, :default
+        human_name.upcase
+      when :numeric
+        "N"
+      when :hash
+        "key:value"
+      when :array
+        "one two three"
+      end
+    end
+  end
+end
diff --git a/lib/bundler/vendor/thor/lib/thor/parser/arguments.rb b/lib/bundler/vendor/thor/lib/thor/parser/arguments.rb
new file mode 100644
index 0000000000..3a5d82cf29
--- /dev/null
+++ b/lib/bundler/vendor/thor/lib/thor/parser/arguments.rb
@@ -0,0 +1,179 @@
+class Bundler::Thor
+  class Arguments #:nodoc: # rubocop:disable ClassLength
+    NUMERIC = /[-+]?(\d*\.\d+|\d+)/
+
+    # Receives an array of args and returns two arrays, one with arguments
+    # and one with switches.
+    #
+    def self.split(args)
+      arguments = []
+
+      args.each do |item|
+        break if item.is_a?(String) && item =~ /^-/
+        arguments << item
+      end
+
+      [arguments, args[Range.new(arguments.size, -1)]]
+    end
+
+    def self.parse(*args)
+      to_parse = args.pop
+      new(*args).parse(to_parse)
+    end
+
+    # Takes an array of Bundler::Thor::Argument objects.
+    #
+    def initialize(arguments = [])
+      @assigns = {}
+      @non_assigned_required = []
+      @switches = arguments
+
+      arguments.each do |argument|
+        if !argument.default.nil?
+          begin
+            @assigns[argument.human_name] = argument.default.dup
+          rescue TypeError  # Compatibility shim for un-dup-able Fixnum in Ruby < 2.4
+            @assigns[argument.human_name] = argument.default
+          end
+        elsif argument.required?
+          @non_assigned_required << argument
+        end
+      end
+    end
+
+    def parse(args)
+      @pile = args.dup
+
+      @switches.each do |argument|
+        break unless peek
+        @non_assigned_required.delete(argument)
+        @assigns[argument.human_name] = send(:"parse_#{argument.type}", argument.human_name)
+      end
+
+      check_requirement!
+      @assigns
+    end
+
+    def remaining
+      @pile
+    end
+
+  private
+
+    def no_or_skip?(arg)
+      arg =~ /^--(no|skip)-([-\w]+)$/
+      $2
+    end
+
+    def last?
+      @pile.empty?
+    end
+
+    def peek
+      @pile.first
+    end
+
+    def shift
+      @pile.shift
+    end
+
+    def unshift(arg)
+      if arg.is_a?(Array)
+        @pile = arg + @pile
+      else
+        @pile.unshift(arg)
+      end
+    end
+
+    def current_is_value?
+      peek && peek.to_s !~ /^-{1,2}\S+/
+    end
+
+    # Runs through the argument array getting strings that contains ":" and
+    # mark it as a hash:
+    #
+    #   [ "name:string", "age:integer" ]
+    #
+    # Becomes:
+    #
+    #   { "name" => "string", "age" => "integer" }
+    #
+    def parse_hash(name)
+      return shift if peek.is_a?(Hash)
+      hash = {}
+
+      while current_is_value? && peek.include?(":")
+        key, value = shift.split(":", 2)
+        raise MalformattedArgumentError, "You can't specify '#{key}' more than once in option '#{name}'; got #{key}:#{hash[key]} and #{key}:#{value}" if hash.include? key
+        hash[key] = value
+      end
+      hash
+    end
+
+    # Runs through the argument array getting all strings until no string is
+    # found or a switch is found.
+    #
+    #   ["a", "b", "c"]
+    #
+    # And returns it as an array:
+    #
+    #   ["a", "b", "c"]
+    #
+    def parse_array(name)
+      return shift if peek.is_a?(Array)
+      array = []
+      array << shift while current_is_value?
+      array
+    end
+
+    # Check if the peek is numeric format and return a Float or Integer.
+    # Check if the peek is included in enum if enum is provided.
+    # Otherwise raises an error.
+    #
+    def parse_numeric(name)
+      return shift if peek.is_a?(Numeric)
+
+      unless peek =~ NUMERIC && $& == peek
+        raise MalformattedArgumentError, "Expected numeric value for '#{name}'; got #{peek.inspect}"
+      end
+
+      value = $&.index(".") ? shift.to_f : shift.to_i
+      if @switches.is_a?(Hash) && switch = @switches[name]
+        if switch.enum && !switch.enum.include?(value)
+          raise MalformattedArgumentError, "Expected '#{name}' to be one of #{switch.enum.join(', ')}; got #{value}"
+        end
+      end
+      value
+    end
+
+    # Parse string:
+    # for --string-arg, just return the current value in the pile
+    # for --no-string-arg, nil
+    # Check if the peek is included in enum if enum is provided. Otherwise raises an error.
+    #
+    def parse_string(name)
+      if no_or_skip?(name)
+        nil
+      else
+        value = shift
+        if @switches.is_a?(Hash) && switch = @switches[name]
+          if switch.enum && !switch.enum.include?(value)
+            raise MalformattedArgumentError, "Expected '#{name}' to be one of #{switch.enum.join(', ')}; got #{value}"
+          end
+        end
+        value
+      end
+    end
+
+    # Raises an error if @non_assigned_required array is not empty.
+    #
+    def check_requirement!
+      return if @non_assigned_required.empty?
+      names = @non_assigned_required.map do |o|
+        o.respond_to?(:switch_name) ? o.switch_name : o.human_name
+      end.join("', '")
+      class_name = self.class.name.split("::").last.downcase
+      raise RequiredArgumentMissingError, "No value provided for required #{class_name} '#{names}'"
+    end
+  end
+end
diff --git a/lib/bundler/vendor/thor/lib/thor/parser/option.rb b/lib/bundler/vendor/thor/lib/thor/parser/option.rb
new file mode 100644
index 0000000000..5a5af6f888
--- /dev/null
+++ b/lib/bundler/vendor/thor/lib/thor/parser/option.rb
@@ -0,0 +1,159 @@
+class Bundler::Thor
+  class Option < Argument #:nodoc:
+    attr_reader :aliases, :group, :lazy_default, :hide, :repeatable
+
+    VALID_TYPES = [:boolean, :numeric, :hash, :array, :string]
+
+    def initialize(name, options = {})
+      @check_default_type = options[:check_default_type]
+      options[:required] = false unless options.key?(:required)
+      @repeatable     = options.fetch(:repeatable, false)
+      super
+      @lazy_default   = options[:lazy_default]
+      @group          = options[:group].to_s.capitalize if options[:group]
+      @aliases        = Array(options[:aliases])
+      @hide           = options[:hide]
+    end
+
+    # This parse quick options given as method_options. It makes several
+    # assumptions, but you can be more specific using the option method.
+    #
+    #   parse :foo => "bar"
+    #   #=> Option foo with default value bar
+    #
+    #   parse [:foo, :baz] => "bar"
+    #   #=> Option foo with default value bar and alias :baz
+    #
+    #   parse :foo => :required
+    #   #=> Required option foo without default value
+    #
+    #   parse :foo => 2
+    #   #=> Option foo with default value 2 and type numeric
+    #
+    #   parse :foo => :numeric
+    #   #=> Option foo without default value and type numeric
+    #
+    #   parse :foo => true
+    #   #=> Option foo with default value true and type boolean
+    #
+    # The valid types are :boolean, :numeric, :hash, :array and :string. If none
+    # is given a default type is assumed. This default type accepts arguments as
+    # string (--foo=value) or booleans (just --foo).
+    #
+    # By default all options are optional, unless :required is given.
+    #
+    def self.parse(key, value)
+      if key.is_a?(Array)
+        name, *aliases = key
+      else
+        name = key
+        aliases = []
+      end
+
+      name    = name.to_s
+      default = value
+
+      type = case value
+      when Symbol
+        default = nil
+        if VALID_TYPES.include?(value)
+          value
+        elsif required = (value == :required) # rubocop:disable AssignmentInCondition
+          :string
+        end
+      when TrueClass, FalseClass
+        :boolean
+      when Numeric
+        :numeric
+      when Hash, Array, String
+        value.class.name.downcase.to_sym
+      end
+
+      new(name.to_s, :required => required, :type => type, :default => default, :aliases => aliases)
+    end
+
+    def switch_name
+      @switch_name ||= dasherized? ? name : dasherize(name)
+    end
+
+    def human_name
+      @human_name ||= dasherized? ? undasherize(name) : name
+    end
+
+    def usage(padding = 0)
+      sample = if banner && !banner.to_s.empty?
+        "#{switch_name}=#{banner}".dup
+      else
+        switch_name
+      end
+
+      sample = "[#{sample}]".dup unless required?
+
+      if boolean?
+        sample << ", [#{dasherize('no-' + human_name)}]" unless (name == "force") || name.start_with?("no-")
+      end
+
+      if aliases.empty?
+        (" " * padding) << sample
+      else
+        "#{aliases.join(', ')}, #{sample}"
+      end
+    end
+
+    VALID_TYPES.each do |type|
+      class_eval <<-RUBY, __FILE__, __LINE__ + 1
+        def #{type}?
+          self.type == #{type.inspect}
+        end
+      RUBY
+    end
+
+  protected
+
+    def validate!
+      raise ArgumentError, "An option cannot be boolean and required." if boolean? && required?
+      validate_default_type!
+    end
+
+    def validate_default_type!
+      default_type = case @default
+      when nil
+        return
+      when TrueClass, FalseClass
+        required? ? :string : :boolean
+      when Numeric
+        :numeric
+      when Symbol
+        :string
+      when Hash, Array, String
+        @default.class.name.downcase.to_sym
+      end
+
+      expected_type = (@repeatable && @type != :hash) ? :array : @type
+
+      if default_type != expected_type
+        err = "Expected #{expected_type} default value for '#{switch_name}'; got #{@default.inspect} (#{default_type})"
+
+        if @check_default_type
+          raise ArgumentError, err
+        elsif @check_default_type == nil
+          Bundler::Thor.deprecation_warning "#{err}.\n" +
+            'This will be rejected in the future unless you explicitly pass the options `check_default_type: false`' +
+            ' or call `allow_incompatible_default_type!` in your code'
+        end
+      end
+    end
+
+    def dasherized?
+      name.index("-") == 0
+    end
+
+    def undasherize(str)
+      str.sub(/^-{1,2}/, "")
+    end
+
+    def dasherize(str)
+      (str.length > 1 ? "--" : "-") + str.tr("_", "-")
+    end
+  end
+end
diff --git a/lib/bundler/vendor/thor/lib/thor/parser/options.rb b/lib/bundler/vendor/thor/lib/thor/parser/options.rb
new file mode 100644
index 0000000000..3a8927d09c
--- /dev/null
+++ b/lib/bundler/vendor/thor/lib/thor/parser/options.rb
@@ -0,0 +1,237 @@
+class Bundler::Thor
+  class Options < Arguments #:nodoc: # rubocop:disable ClassLength
+    LONG_RE     = /^(--\w+(?:-\w+)*)$/
+    SHORT_RE    = /^(-[a-z])$/i
+    EQ_RE       = /^(--\w+(?:-\w+)*|-[a-z])=(.*)$/i
+    SHORT_SQ_RE = /^-([a-z]{2,})$/i # Allow either -x -v or -xv style for single char args
+    SHORT_NUM   = /^(-[a-z])#{NUMERIC}$/i
+    OPTS_END    = "--".freeze
+
+    # Receives a hash and makes it switches.
+    def self.to_switches(options)
+      options.map do |key, value|
+        case value
+        when true
+          "--#{key}"
+        when Array
+          "--#{key} #{value.map(&:inspect).join(' ')}"
+        when Hash
+          "--#{key} #{value.map { |k, v| "#{k}:#{v}" }.join(' ')}"
+        when nil, false
+          nil
+        else
+          "--#{key} #{value.inspect}"
+        end
+      end.compact.join(" ")
+    end
+
+    # Takes a hash of Bundler::Thor::Option and a hash with defaults.
+    #
+    # If +stop_on_unknown+ is true, #parse will stop as soon as it encounters
+    # an unknown option or a regular argument.
+    def initialize(hash_options = {}, defaults = {}, stop_on_unknown = false, disable_required_check = false)
+      @stop_on_unknown = stop_on_unknown
+      @disable_required_check = disable_required_check
+      options = hash_options.values
+      super(options)
+
+      # Add defaults
+      defaults.each do |key, value|
+        @assigns[key.to_s] = value
+        @non_assigned_required.delete(hash_options[key])
+      end
+
+      @shorts = {}
+      @switches = {}
+      @extra = []
+      @stopped_parsing_after_extra_index = nil
+
+      options.each do |option|
+        @switches[option.switch_name] = option
+
+        option.aliases.each do |short|
+          name = short.to_s.sub(/^(?!\-)/, "-")
+          @shorts[name] ||= option.switch_name
+        end
+      end
+    end
+
+    def remaining
+      @extra
+    end
+
+    def peek
+      return super unless @parsing_options
+
+      result = super
+      if result == OPTS_END
+        shift
+        @parsing_options = false
+        @stopped_parsing_after_extra_index ||= @extra.size
+        super
+      else
+        result
+      end
+    end
+
+    def parse(args) # rubocop:disable MethodLength
+      @pile = args.dup
+      @parsing_options = true
+
+      while peek
+        if parsing_options?
+          match, is_switch = current_is_switch?
+          shifted = shift
+
+          if is_switch
+            case shifted
+            when SHORT_SQ_RE
+              unshift($1.split("").map { |f| "-#{f}" })
+              next
+            when EQ_RE, SHORT_NUM
+              unshift($2)
+              switch = $1
+            when LONG_RE, SHORT_RE
+              switch = $1
+            end
+
+            switch = normalize_switch(switch)
+            option = switch_option(switch)
+            result = parse_peek(switch, option)
+            assign_result!(option, result)
+          elsif @stop_on_unknown
+            @parsing_options = false
+            @extra << shifted
+            @stopped_parsing_after_extra_index ||= @extra.size
+            @extra << shift while peek
+            break
+          elsif match
+            @extra << shifted
+            @extra << shift while peek && peek !~ /^-/
+          else
+            @extra << shifted
+          end
+        else
+          @extra << shift
+        end
+      end
+
+      check_requirement! unless @disable_required_check
+
+      assigns = Bundler::Thor::CoreExt::HashWithIndifferentAccess.new(@assigns)
+      assigns.freeze
+      assigns
+    end
+
+    def check_unknown!
+      to_check = @stopped_parsing_after_extra_index ? @extra[0...@stopped_parsing_after_extra_index] : @extra
+
+      # an unknown option starts with - or -- and has no more --'s afterward.
+      unknown = to_check.select { |str| str =~ /^--?(?:(?!--).)*$/ }
+      raise UnknownArgumentError.new(@switches.keys, unknown) unless unknown.empty?
+    end
+
+  protected
+
+    def assign_result!(option, result)
+      if option.repeatable && option.type == :hash
+        (@assigns[option.human_name] ||= {}).merge!(result)
+      elsif option.repeatable
+        (@assigns[option.human_name] ||= []) << result
+      else
+        @assigns[option.human_name] = result
+      end
+    end
+
+    # Check if the current value in peek is a registered switch.
+    #
+    # Two booleans are returned.  The first is true if the current value
+    # starts with a hyphen; the second is true if it is a registered switch.
+    def current_is_switch?
+      case peek
+      when LONG_RE, SHORT_RE, EQ_RE, SHORT_NUM
+        [true, switch?($1)]
+      when SHORT_SQ_RE
+        [true, $1.split("").any? { |f| switch?("-#{f}") }]
+      else
+        [false, false]
+      end
+    end
+
+    def current_is_switch_formatted?
+      case peek
+      when LONG_RE, SHORT_RE, EQ_RE, SHORT_NUM, SHORT_SQ_RE
+        true
+      else
+        false
+      end
+    end
+
+    def current_is_value?
+      peek && (!parsing_options? || super)
+    end
+
+    def switch?(arg)
+      !switch_option(normalize_switch(arg)).nil?
+    end
+
+    def switch_option(arg)
+      if match = no_or_skip?(arg) # rubocop:disable AssignmentInCondition
+        @switches[arg] || @switches["--#{match}"]
+      else
+        @switches[arg]
+      end
+    end
+
+    # Check if the given argument is actually a shortcut.
+    #
+    def normalize_switch(arg)
+      (@shorts[arg] || arg).tr("_", "-")
+    end
+
+    def parsing_options?
+      peek
+      @parsing_options
+    end
+
+    # Parse boolean values which can be given as --foo=true, --foo or --no-foo.
+    #
+    def parse_boolean(switch)
+      if current_is_value?
+        if ["true", "TRUE", "t", "T", true].include?(peek)
+          shift
+          true
+        elsif ["false", "FALSE", "f", "F", false].include?(peek)
+          shift
+          false
+        else
+          @switches.key?(switch) || !no_or_skip?(switch)
+        end
+      else
+        @switches.key?(switch) || !no_or_skip?(switch)
+      end
+    end
+
+    # Parse the value at the peek analyzing if it requires an input or not.
+    #
+    def parse_peek(switch, option)
+      if parsing_options? && (current_is_switch_formatted? || last?)
+        if option.boolean?
+          # No problem for boolean types
+        elsif no_or_skip?(switch)
+          return nil # User set value to nil
+        elsif option.string? && !option.required?
+          # Return the default if there is one, else the human name
+          return option.lazy_default || option.default || option.human_name
+        elsif option.lazy_default
+          return option.lazy_default
+        else
+          raise MalformattedArgumentError, "No value provided for option '#{switch}'"
+        end
+      end
+
+      @non_assigned_required.delete(option)
+      send(:"parse_#{option.type}", switch)
+    end
+  end
+end
diff --git a/lib/bundler/vendor/thor/lib/thor/rake_compat.rb b/lib/bundler/vendor/thor/lib/thor/rake_compat.rb
new file mode 100644
index 0000000000..f8f86372cc
--- /dev/null
+++ b/lib/bundler/vendor/thor/lib/thor/rake_compat.rb
@@ -0,0 +1,72 @@
+require "rake"
+require "rake/dsl_definition"
+
+class Bundler::Thor
+  # Adds a compatibility layer to your Bundler::Thor classes which allows you to use
+  # rake package tasks. For example, to use rspec rake tasks, one can do:
+  #
+  #   require 'bundler/vendor/thor/lib/thor/rake_compat'
+  #   require 'rspec/core/rake_task'
+  #
+  #   class Default < Bundler::Thor
+  #     include Bundler::Thor::RakeCompat
+  #
+  #     RSpec::Core::RakeTask.new(:spec) do |t|
+  #       t.spec_opts = ['--options', './.rspec']
+  #       t.spec_files = FileList['spec/**/*_spec.rb']
+  #     end
+  #   end
+  #
+  module RakeCompat
+    include Rake::DSL if defined?(Rake::DSL)
+
+    def self.rake_classes
+      @rake_classes ||= []
+    end
+
+    def self.included(base)
+      super(base)
+      # Hack. Make rakefile point to invoker, so rdoc task is generated properly.
+      rakefile = File.basename(caller[0].match(/(.*):\d+/)[1])
+      Rake.application.instance_variable_set(:@rakefile, rakefile)
+      rake_classes << base
+    end
+  end
+end
+
+# override task on (main), for compatibility with Rake 0.9
+instance_eval do
+  alias rake_namespace namespace
+
+  def task(*)
+    task = super
+
+    if klass = Bundler::Thor::RakeCompat.rake_classes.last # rubocop:disable AssignmentInCondition
+      non_namespaced_name = task.name.split(":").last
+
+      description = non_namespaced_name
+      description << task.arg_names.map { |n| n.to_s.upcase }.join(" ")
+      description.strip!
+
+      klass.desc description, Rake.application.last_description || non_namespaced_name
+      Rake.application.last_description = nil
+      klass.send :define_method, non_namespaced_name do |*args|
+        Rake::Task[task.name.to_sym].invoke(*args)
+      end
+    end
+
+    task
+  end
+
+  def namespace(name)
+    if klass = Bundler::Thor::RakeCompat.rake_classes.last # rubocop:disable AssignmentInCondition
+      const_name = Bundler::Thor::Util.camel_case(name.to_s).to_sym
+      klass.const_set(const_name, Class.new(Bundler::Thor))
+      new_klass = klass.const_get(const_name)
+      Bundler::Thor::RakeCompat.rake_classes << new_klass
+    end
+
+    super
+    Bundler::Thor::RakeCompat.rake_classes.pop
+  end
+end
diff --git a/lib/bundler/vendor/thor/lib/thor/runner.rb b/lib/bundler/vendor/thor/lib/thor/runner.rb
new file mode 100644
index 0000000000..54c5525093
--- /dev/null
+++ b/lib/bundler/vendor/thor/lib/thor/runner.rb
@@ -0,0 +1,325 @@
+require_relative "../thor"
+require_relative "group"
+
+require "yaml"
+require "digest/md5"
+require "pathname"
+
+class Bundler::Thor::Runner < Bundler::Thor #:nodoc: # rubocop:disable ClassLength
+  autoload :OpenURI, "open-uri"
+
+  map "-T" => :list, "-i" => :install, "-u" => :update, "-v" => :version
+
+  def self.banner(command, all = false, subcommand = false)
+    "thor " + command.formatted_usage(self, all, subcommand)
+  end
+
+  def self.exit_on_failure?
+    true
+  end
+
+  # Override Bundler::Thor#help so it can give information about any class and any method.
+  #
+  def help(meth = nil)
+    if meth && !respond_to?(meth)
+      initialize_thorfiles(meth)
+      klass, command = Bundler::Thor::Util.find_class_and_command_by_namespace(meth)
+      self.class.handle_no_command_error(command, false) if klass.nil?
+      klass.start(["-h", command].compact, :shell => shell)
+    else
+      super
+    end
+  end
+
+  # If a command is not found on Bundler::Thor::Runner, method missing is invoked and
+  # Bundler::Thor::Runner is then responsible for finding the command in all classes.
+  #
+  def method_missing(meth, *args)
+    meth = meth.to_s
+    initialize_thorfiles(meth)
+    klass, command = Bundler::Thor::Util.find_class_and_command_by_namespace(meth)
+    self.class.handle_no_command_error(command, false) if klass.nil?
+    args.unshift(command) if command
+    klass.start(args, :shell => shell)
+  end
+
+  desc "install NAME", "Install an optionally named Bundler::Thor file into your system commands"
+  method_options :as => :string, :relative => :boolean, :force => :boolean
+  def install(name) # rubocop:disable MethodLength
+    initialize_thorfiles
+
+    # If a directory name is provided as the argument, look for a 'main.thor'
+    # command in said directory.
+    begin
+      if File.directory?(File.expand_path(name))
+        base = File.join(name, "main.thor")
+        package = :directory
+        contents = open(base, &:read)
+      else
+        base = name
+        package = :file
+        contents = open(name, &:read)
+      end
+    rescue OpenURI::HTTPError
+      raise Error, "Error opening URI '#{name}'"
+    rescue Errno::ENOENT
+      raise Error, "Error opening file '#{name}'"
+    end
+
+    say "Your Thorfile contains:"
+    say contents
+
+    unless options["force"]
+      return false if no?("Do you wish to continue [y/N]?")
+    end
+
+    as = options["as"] || begin
+      first_line = contents.split("\n")[0]
+      (match = first_line.match(/\s*#\s*module:\s*([^\n]*)/)) ? match[1].strip : nil
+    end
+
+    unless as
+      basename = File.basename(name)
+      as = ask("Please specify a name for #{name} in the system repository [#{basename}]:")
+      as = basename if as.empty?
+    end
+
+    location = if options[:relative] || name =~ %r{^https?://}
+      name
+    else
+      File.expand_path(name)
+    end
+
+    thor_yaml[as] = {
+      :filename   => Digest::MD5.hexdigest(name + as),
+      :location   => location,
+      :namespaces => Bundler::Thor::Util.namespaces_in_content(contents, base)
+    }
+
+    save_yaml(thor_yaml)
+    say "Storing thor file in your system repository"
+    destination = File.join(thor_root, thor_yaml[as][:filename])
+
+    if package == :file
+      File.open(destination, "w") { |f| f.puts contents }
+    else
+      require "fileutils"
+      FileUtils.cp_r(name, destination)
+    end
+
+    thor_yaml[as][:filename] # Indicate success
+  end
+
+  desc "version", "Show Bundler::Thor version"
+  def version
+    require_relative "version"
+    say "Bundler::Thor #{Bundler::Thor::VERSION}"
+  end
+
+  desc "uninstall NAME", "Uninstall a named Bundler::Thor module"
+  def uninstall(name)
+    raise Error, "Can't find module '#{name}'" unless thor_yaml[name]
+    say "Uninstalling #{name}."
+    require "fileutils"
+    FileUtils.rm_rf(File.join(thor_root, (thor_yaml[name][:filename]).to_s))
+
+    thor_yaml.delete(name)
+    save_yaml(thor_yaml)
+
+    puts "Done."
+  end
+
+  desc "update NAME", "Update a Bundler::Thor file from its original location"
+  def update(name)
+    raise Error, "Can't find module '#{name}'" if !thor_yaml[name] || !thor_yaml[name][:location]
+
+    say "Updating '#{name}' from #{thor_yaml[name][:location]}"
+
+    old_filename = thor_yaml[name][:filename]
+    self.options = options.merge("as" => name)
+
+    if File.directory? File.expand_path(name)
+      require "fileutils"
+      FileUtils.rm_rf(File.join(thor_root, old_filename))
+
+      thor_yaml.delete(old_filename)
+      save_yaml(thor_yaml)
+
+      filename = install(name)
+    else
+      filename = install(thor_yaml[name][:location])
+    end
+
+    File.delete(File.join(thor_root, old_filename)) unless filename == old_filename
+  end
+
+  desc "installed", "List the installed Bundler::Thor modules and commands"
+  method_options :internal => :boolean
+  def installed
+    initialize_thorfiles(nil, true)
+    display_klasses(true, options["internal"])
+  end
+
+  desc "list [SEARCH]", "List the available thor commands (--substring means .*SEARCH)"
+  method_options :substring => :boolean, :group => :string, :all => :boolean, :debug => :boolean
+  def list(search = "")
+    initialize_thorfiles
+
+    search = ".*#{search}" if options["substring"]
+    search = /^#{search}.*/i
+    group  = options[:group] || "standard"
+
+    klasses = Bundler::Thor::Base.subclasses.select do |k|
+      (options[:all] || k.group == group) && k.namespace =~ search
+    end
+
+    display_klasses(false, false, klasses)
+  end
+
+private
+
+  def thor_root
+    Bundler::Thor::Util.thor_root
+  end
+
+  def thor_yaml
+    @thor_yaml ||= begin
+      yaml_file = File.join(thor_root, "thor.yml")
+      yaml = YAML.load_file(yaml_file) if File.exist?(yaml_file)
+      yaml || {}
+    end
+  end
+
+  # Save the yaml file. If none exists in thor root, creates one.
+  #
+  def save_yaml(yaml)
+    yaml_file = File.join(thor_root, "thor.yml")
+
+    unless File.exist?(yaml_file)
+      require "fileutils"
+      FileUtils.mkdir_p(thor_root)
+      yaml_file = File.join(thor_root, "thor.yml")
+      FileUtils.touch(yaml_file)
+    end
+
+    File.open(yaml_file, "w") { |f| f.puts yaml.to_yaml }
+  end
+
+  # Load the Thorfiles. If relevant_to is supplied, looks for specific files
+  # in the thor_root instead of loading them all.
+  #
+  # By default, it also traverses the current path until find Bundler::Thor files, as
+  # described in thorfiles. This look up can be skipped by supplying
+  # skip_lookup true.
+  #
+  def initialize_thorfiles(relevant_to = nil, skip_lookup = false)
+    thorfiles(relevant_to, skip_lookup).each do |f|
+      Bundler::Thor::Util.load_thorfile(f, nil, options[:debug]) unless Bundler::Thor::Base.subclass_files.keys.include?(File.expand_path(f))
+    end
+  end
+
+  # Finds Thorfiles by traversing from your current directory down to the root
+  # directory of your system. If at any time we find a Bundler::Thor file, we stop.
+  #
+  # We also ensure that system-wide Thorfiles are loaded first, so local
+  # Thorfiles can override them.
+  #
+  # ==== Example
+  #
+  # If we start at /Users/wycats/dev/thor ...
+  #
+  # 1. /Users/wycats/dev/thor
+  # 2. /Users/wycats/dev
+  # 3. /Users/wycats <-- we find a Thorfile here, so we stop
+  #
+  # Suppose we start at c:\Documents and Settings\james\dev\thor ...
+  #
+  # 1. c:\Documents and Settings\james\dev\thor
+  # 2. c:\Documents and Settings\james\dev
+  # 3. c:\Documents and Settings\james
+  # 4. c:\Documents and Settings
+  # 5. c:\ <-- no Thorfiles found!
+  #
+  def thorfiles(relevant_to = nil, skip_lookup = false)
+    thorfiles = []
+
+    unless skip_lookup
+      Pathname.pwd.ascend do |path|
+        thorfiles = Bundler::Thor::Util.globs_for(path).map { |g| Dir[g] }.flatten
+        break unless thorfiles.empty?
+      end
+    end
+
+    files  = (relevant_to ? thorfiles_relevant_to(relevant_to) : Bundler::Thor::Util.thor_root_glob)
+    files += thorfiles
+    files -= ["#{thor_root}/thor.yml"]
+
+    files.map! do |file|
+      File.directory?(file) ? File.join(file, "main.thor") : file
+    end
+  end
+
+  # Load Thorfiles relevant to the given method. If you provide "foo:bar" it
+  # will load all thor files in the thor.yaml that has "foo" e "foo:bar"
+  # namespaces registered.
+  #
+  def thorfiles_relevant_to(meth)
+    lookup = [meth, meth.split(":")[0...-1].join(":")]
+
+    files = thor_yaml.select do |_, v|
+      v[:namespaces] && !(v[:namespaces] & lookup).empty?
+    end
+
+    files.map { |_, v| File.join(thor_root, (v[:filename]).to_s) }
+  end
+
+  # Display information about the given klasses. If with_module is given,
+  # it shows a table with information extracted from the yaml file.
+  #
+  def display_klasses(with_modules = false, show_internal = false, klasses = Bundler::Thor::Base.subclasses)
+    klasses -= [Bundler::Thor, Bundler::Thor::Runner, Bundler::Thor::Group] unless show_internal
+
+    raise Error, "No Bundler::Thor commands available" if klasses.empty?
+    show_modules if with_modules && !thor_yaml.empty?
+
+    list = Hash.new { |h, k| h[k] = [] }
+    groups = klasses.select { |k| k.ancestors.include?(Bundler::Thor::Group) }
+
+    # Get classes which inherit from Bundler::Thor
+    (klasses - groups).each { |k| list[k.namespace.split(":").first] += k.printable_commands(false) }
+
+    # Get classes which inherit from Bundler::Thor::Base
+    groups.map! { |k| k.printable_commands(false).first }
+    list["root"] = groups
+
+    # Order namespaces with default coming first
+    list = list.sort { |a, b| a[0].sub(/^default/, "") <=> b[0].sub(/^default/, "") }
+    list.each { |n, commands| display_commands(n, commands) unless commands.empty? }
+  end
+
+  def display_commands(namespace, list) #:nodoc:
+    list.sort! { |a, b| a[0] <=> b[0] }
+
+    say shell.set_color(namespace, :blue, true)
+    say "-" * namespace.size
+
+    print_table(list, :truncate => true)
+    say
+  end
+  alias_method :display_tasks, :display_commands
+
+  def show_modules #:nodoc:
+    info = []
+    labels = %w(Modules Namespaces)
+
+    info << labels
+    info << ["-" * labels[0].size, "-" * labels[1].size]
+
+    thor_yaml.each do |name, hash|
+      info << [name, hash[:namespaces].join(", ")]
+    end
+
+    print_table info
+    say ""
+  end
+end
diff --git a/lib/bundler/vendor/thor/lib/thor/shell.rb b/lib/bundler/vendor/thor/lib/thor/shell.rb
new file mode 100644
index 0000000000..e36fa472d6
--- /dev/null
+++ b/lib/bundler/vendor/thor/lib/thor/shell.rb
@@ -0,0 +1,81 @@
+require "rbconfig"
+
+class Bundler::Thor
+  module Base
+    class << self
+      attr_writer :shell
+
+      # Returns the shell used in all Bundler::Thor classes. If you are in a Unix platform
+      # it will use a colored log, otherwise it will use a basic one without color.
+      #
+      def shell
+        @shell ||= if ENV["THOR_SHELL"] && !ENV["THOR_SHELL"].empty?
+          Bundler::Thor::Shell.const_get(ENV["THOR_SHELL"])
+        elsif RbConfig::CONFIG["host_os"] =~ /mswin|mingw/ && !ENV["ANSICON"]
+          Bundler::Thor::Shell::Basic
+        else
+          Bundler::Thor::Shell::Color
+        end
+      end
+    end
+  end
+
+  module Shell
+    SHELL_DELEGATED_METHODS = [:ask, :error, :set_color, :yes?, :no?, :say, :say_status, :print_in_columns, :print_table, :print_wrapped, :file_collision, :terminal_width]
+    attr_writer :shell
+
+    autoload :Basic, File.expand_path("shell/basic", __dir__)
+    autoload :Color, File.expand_path("shell/color", __dir__)
+    autoload :HTML,  File.expand_path("shell/html", __dir__)
+
+    # Add shell to initialize config values.
+    #
+    # ==== Configuration
+    # shell<Object>:: An instance of the shell to be used.
+    #
+    # ==== Examples
+    #
+    #   class MyScript < Bundler::Thor
+    #     argument :first, :type => :numeric
+    #   end
+    #
+    #   MyScript.new [1.0], { :foo => :bar }, :shell => Bundler::Thor::Shell::Basic.new
+    #
+    def initialize(args = [], options = {}, config = {})
+      super
+      self.shell = config[:shell]
+      shell.base ||= self if shell.respond_to?(:base)
+    end
+
+    # Holds the shell for the given Bundler::Thor instance. If no shell is given,
+    # it gets a default shell from Bundler::Thor::Base.shell.
+    def shell
+      @shell ||= Bundler::Thor::Base.shell.new
+    end
+
+    # Common methods that are delegated to the shell.
+    SHELL_DELEGATED_METHODS.each do |method|
+      module_eval <<-METHOD, __FILE__, __LINE__ + 1
+        def #{method}(*args,&block)
+          shell.#{method}(*args,&block)
+        end
+      METHOD
+    end
+
+    # Yields the given block with padding.
+    def with_padding
+      shell.padding += 1
+      yield
+    ensure
+      shell.padding -= 1
+    end
+
+  protected
+
+    # Allow shell to be shared between invocations.
+    #
+    def _shared_configuration #:nodoc:
+      super.merge!(:shell => shell)
+    end
+  end
+end
diff --git a/lib/bundler/vendor/thor/lib/thor/shell/basic.rb b/lib/bundler/vendor/thor/lib/thor/shell/basic.rb
new file mode 100644
index 0000000000..2dddd4a53a
--- /dev/null
+++ b/lib/bundler/vendor/thor/lib/thor/shell/basic.rb
@@ -0,0 +1,494 @@
+class Bundler::Thor
+  module Shell
+    class Basic
+      DEFAULT_TERMINAL_WIDTH = 80
+
+      attr_accessor :base
+      attr_reader   :padding
+
+      # Initialize base, mute and padding to nil.
+      #
+      def initialize #:nodoc:
+        @base = nil
+        @mute = false
+        @padding = 0
+        @always_force = false
+      end
+
+      # Mute everything that's inside given block
+      #
+      def mute
+        @mute = true
+        yield
+      ensure
+        @mute = false
+      end
+
+      # Check if base is muted
+      #
+      def mute?
+        @mute
+      end
+
+      # Sets the output padding, not allowing less than zero values.
+      #
+      def padding=(value)
+        @padding = [0, value].max
+      end
+
+      # Sets the output padding while executing a block and resets it.
+      #
+      def indent(count = 1)
+        orig_padding = padding
+        self.padding = padding + count
+        yield
+        self.padding = orig_padding
+      end
+
+      # Asks something to the user and receives a response.
+      #
+      # If a default value is specified it will be presented to the user
+      # and allows them to select that value with an empty response. This
+      # option is ignored when limited answers are supplied.
+      #
+      # If asked to limit the correct responses, you can pass in an
+      # array of acceptable answers.  If one of those is not supplied,
+      # they will be shown a message stating that one of those answers
+      # must be given and re-asked the question.
+      #
+      # If asking for sensitive information, the :echo option can be set
+      # to false to mask user input from $stdin.
+      #
+      # If the required input is a path, then set the path option to
+      # true. This will enable tab completion for file paths relative
+      # to the current working directory on systems that support
+      # Readline.
+      #
+      # ==== Example
+      # ask("What is your name?")
+      #
+      # ask("What is the planet furthest from the sun?", :default => "Pluto")
+      #
+      # ask("What is your favorite Neopolitan flavor?", :limited_to => ["strawberry", "chocolate", "vanilla"])
+      #
+      # ask("What is your password?", :echo => false)
+      #
+      # ask("Where should the file be saved?", :path => true)
+      #
+      def ask(statement, *args)
+        options = args.last.is_a?(Hash) ? args.pop : {}
+        color = args.first
+
+        if options[:limited_to]
+          ask_filtered(statement, color, options)
+        else
+          ask_simply(statement, color, options)
+        end
+      end
+
+      # Say (print) something to the user. If the sentence ends with a whitespace
+      # or tab character, a new line is not appended (print + flush). Otherwise
+      # are passed straight to puts (behavior got from Highline).
+      #
+      # ==== Example
+      # say("I know you knew that.")
+      #
+      def say(message = "", color = nil, force_new_line = (message.to_s !~ /( |\t)\Z/))
+        return if quiet?
+
+        buffer = prepare_message(message, *color)
+        buffer << "\n" if force_new_line && !message.to_s.end_with?("\n")
+
+        stdout.print(buffer)
+        stdout.flush
+      end
+
+      # Say a status with the given color and appends the message. Since this
+      # method is used frequently by actions, it allows nil or false to be given
+      # in log_status, avoiding the message from being shown. If a Symbol is
+      # given in log_status, it's used as the color.
+      #
+      def say_status(status, message, log_status = true)
+        return if quiet? || log_status == false
+        spaces = "  " * (padding + 1)
+        color  = log_status.is_a?(Symbol) ? log_status : :green
+
+        status = status.to_s.rjust(12)
+        status = set_color status, color, true if color
+
+        buffer = "#{status}#{spaces}#{message}"
+        buffer = "#{buffer}\n" unless buffer.end_with?("\n")
+
+        stdout.print(buffer)
+        stdout.flush
+      end
+
+      # Make a question the to user and returns true if the user replies "y" or
+      # "yes".
+      #
+      def yes?(statement, color = nil)
+        !!(ask(statement, color, :add_to_history => false) =~ is?(:yes))
+      end
+
+      # Make a question the to user and returns true if the user replies "n" or
+      # "no".
+      #
+      def no?(statement, color = nil)
+        !!(ask(statement, color, :add_to_history => false) =~ is?(:no))
+      end
+
+      # Prints values in columns
+      #
+      # ==== Parameters
+      # Array[String, String, ...]
+      #
+      def print_in_columns(array)
+        return if array.empty?
+        colwidth = (array.map { |el| el.to_s.size }.max || 0) + 2
+        array.each_with_index do |value, index|
+          # Don't output trailing spaces when printing the last column
+          if ((((index + 1) % (terminal_width / colwidth))).zero? && !index.zero?) || index + 1 == array.length
+            stdout.puts value
+          else
+            stdout.printf("%-#{colwidth}s", value)
+          end
+        end
+      end
+
+      # Prints a table.
+      #
+      # ==== Parameters
+      # Array[Array[String, String, ...]]
+      #
+      # ==== Options
+      # indent<Integer>:: Indent the first column by indent value.
+      # colwidth<Integer>:: Force the first column to colwidth spaces wide.
+      #
+      def print_table(array, options = {}) # rubocop:disable MethodLength
+        return if array.empty?
+
+        formats = []
+        indent = options[:indent].to_i
+        colwidth = options[:colwidth]
+        options[:truncate] = terminal_width if options[:truncate] == true
+
+        formats << "%-#{colwidth + 2}s".dup if colwidth
+        start = colwidth ? 1 : 0
+
+        colcount = array.max { |a, b| a.size <=> b.size }.size
+
+        maximas = []
+
+        start.upto(colcount - 1) do |index|
+          maxima = array.map { |row| row[index] ? row[index].to_s.size : 0 }.max
+          maximas << maxima
+          formats << if index == colcount - 1
+                       # Don't output 2 trailing spaces when printing the last column
+                       "%-s".dup
+                     else
+                       "%-#{maxima + 2}s".dup
+                     end
+        end
+
+        formats[0] = formats[0].insert(0, " " * indent)
+        formats << "%s"
+
+        array.each do |row|
+          sentence = "".dup
+
+          row.each_with_index do |column, index|
+            maxima = maximas[index]
+
+            f = if column.is_a?(Numeric)
+              if index == row.size - 1
+                # Don't output 2 trailing spaces when printing the last column
+                "%#{maxima}s"
+              else
+                "%#{maxima}s  "
+              end
+            else
+              formats[index]
+            end
+            sentence << f % column.to_s
+          end
+
+          sentence = truncate(sentence, options[:truncate]) if options[:truncate]
+          stdout.puts sentence
+        end
+      end
+
+      # Prints a long string, word-wrapping the text to the current width of the
+      # terminal display. Ideal for printing heredocs.
+      #
+      # ==== Parameters
+      # String
+      #
+      # ==== Options
+      # indent<Integer>:: Indent each line of the printed paragraph by indent value.
+      #
+      def print_wrapped(message, options = {})
+        indent = options[:indent] || 0
+        width = terminal_width - indent
+        paras = message.split("\n\n")
+
+        paras.map! do |unwrapped|
+          words = unwrapped.split(" ")
+          counter = words.first.length
+          words.inject do |memo, word|
+            word = word.gsub(/\n\005/, "\n").gsub(/\005/, "\n")
+            counter = 0 if word.include? "\n"
+            if (counter + word.length + 1) < width
+              memo = "#{memo} #{word}"
+              counter += (word.length + 1)
+            else
+              memo = "#{memo}\n#{word}"
+              counter = word.length
+            end
+            memo
+          end
+        end.compact!
+
+        paras.each do |para|
+          para.split("\n").each do |line|
+            stdout.puts line.insert(0, " " * indent)
+          end
+          stdout.puts unless para == paras.last
+        end
+      end
+
+      # Deals with file collision and returns true if the file should be
+      # overwritten and false otherwise. If a block is given, it uses the block
+      # response as the content for the diff.
+      #
+      # ==== Parameters
+      # destination<String>:: the destination file to solve conflicts
+      # block<Proc>:: an optional block that returns the value to be used in diff and merge
+      #
+      def file_collision(destination)
+        return true if @always_force
+        options = block_given? ? "[Ynaqdhm]" : "[Ynaqh]"
+
+        loop do
+          answer = ask(
+            %[Overwrite #{destination}? (enter "h" for help) #{options}],
+            :add_to_history => false
+          )
+
+          case answer
+          when nil
+            say ""
+            return true
+          when is?(:yes), is?(:force), ""
+            return true
+          when is?(:no), is?(:skip)
+            return false
+          when is?(:always)
+            return @always_force = true
+          when is?(:quit)
+            say "Aborting..."
+            raise SystemExit
+          when is?(:diff)
+            show_diff(destination, yield) if block_given?
+            say "Retrying..."
+          when is?(:merge)
+            if block_given? && !merge_tool.empty?
+              merge(destination, yield)
+              return nil
+            end
+
+            say "Please specify merge tool to `THOR_MERGE` env."
+          else
+            say file_collision_help
+          end
+        end
+      end
+
+      # This code was copied from Rake, available under MIT-LICENSE
+      # Copyright (c) 2003, 2004 Jim Weirich
+      def terminal_width
+        result = if ENV["THOR_COLUMNS"]
+          ENV["THOR_COLUMNS"].to_i
+        else
+          unix? ? dynamic_width : DEFAULT_TERMINAL_WIDTH
+        end
+        result < 10 ? DEFAULT_TERMINAL_WIDTH : result
+      rescue
+        DEFAULT_TERMINAL_WIDTH
+      end
+
+      # Called if something goes wrong during the execution. This is used by Bundler::Thor
+      # internally and should not be used inside your scripts. If something went
+      # wrong, you can always raise an exception. If you raise a Bundler::Thor::Error, it
+      # will be rescued and wrapped in the method below.
+      #
+      def error(statement)
+        stderr.puts statement
+      end
+
+      # Apply color to the given string with optional bold. Disabled in the
+      # Bundler::Thor::Shell::Basic class.
+      #
+      def set_color(string, *) #:nodoc:
+        string
+      end
+
+    protected
+
+      def prepare_message(message, *color)
+        spaces = "  " * padding
+        spaces + set_color(message.to_s, *color)
+      end
+
+      def can_display_colors?
+        false
+      end
+
+      def lookup_color(color)
+        return color unless color.is_a?(Symbol)
+        self.class.const_get(color.to_s.upcase)
+      end
+
+      def stdout
+        $stdout
+      end
+
+      def stderr
+        $stderr
+      end
+
+      def is?(value) #:nodoc:
+        value = value.to_s
+
+        if value.size == 1
+          /\A#{value}\z/i
+        else
+          /\A(#{value}|#{value[0, 1]})\z/i
+        end
+      end
+
+      def file_collision_help #:nodoc:
+        <<-HELP
+        Y - yes, overwrite
+        n - no, do not overwrite
+        a - all, overwrite this and all others
+        q - quit, abort
+        d - diff, show the differences between the old and the new
+        h - help, show this help
+        m - merge, run merge tool
+        HELP
+      end
+
+      def show_diff(destination, content) #:nodoc:
+        diff_cmd = ENV["THOR_DIFF"] || ENV["RAILS_DIFF"] || "diff -u"
+
+        require "tempfile"
+        Tempfile.open(File.basename(destination), File.dirname(destination)) do |temp|
+          temp.write content
+          temp.rewind
+          system %(#{diff_cmd} "#{destination}" "#{temp.path}")
+        end
+      end
+
+      def quiet? #:nodoc:
+        mute? || (base && base.options[:quiet])
+      end
+
+      # Calculate the dynamic width of the terminal
+      def dynamic_width
+        @dynamic_width ||= (dynamic_width_stty.nonzero? || dynamic_width_tput)
+      end
+
+      def dynamic_width_stty
+        `stty size 2>/dev/null`.split[1].to_i
+      end
+
+      def dynamic_width_tput
+        `tput cols 2>/dev/null`.to_i
+      end
+
+      def unix?
+        RUBY_PLATFORM =~ /(aix|darwin|linux|(net|free|open)bsd|cygwin|solaris|irix|hpux)/i
+      end
+
+      def truncate(string, width)
+        as_unicode do
+          chars = string.chars.to_a
+          if chars.length <= width
+            chars.join
+          else
+            chars[0, width - 3].join + "..."
+          end
+        end
+      end
+
+      if "".respond_to?(:encode)
+        def as_unicode
+          yield
+        end
+      else
+        def as_unicode
+          old = $KCODE
+          $KCODE = "U"
+          yield
+        ensure
+          $KCODE = old
+        end
+      end
+
+      def ask_simply(statement, color, options)
+        default = options[:default]
+        message = [statement, ("(#{default})" if default), nil].uniq.join(" ")
+        message = prepare_message(message, *color)
+        result = Bundler::Thor::LineEditor.readline(message, options)
+
+        return unless result
+
+        result = result.strip
+
+        if default && result == ""
+          default
+        else
+          result
+        end
+      end
+
+      def ask_filtered(statement, color, options)
+        answer_set = options[:limited_to]
+        case_insensitive = options.fetch(:case_insensitive, false)
+        correct_answer = nil
+        until correct_answer
+          answers = answer_set.join(", ")
+          answer = ask_simply("#{statement} [#{answers}]", color, options)
+          correct_answer = answer_match(answer_set, answer, case_insensitive)
+          say("Your response must be one of: [#{answers}]. Please try again.") unless correct_answer
+        end
+        correct_answer
+      end
+
+      def answer_match(possibilities, answer, case_insensitive)
+        if case_insensitive
+          possibilities.detect{ |possibility| possibility.downcase == answer.downcase }
+        else
+          possibilities.detect{ |possibility| possibility == answer }
+        end
+      end
+
+      def merge(destination, content) #:nodoc:
+        require "tempfile"
+        Tempfile.open([File.basename(destination), File.extname(destination)], File.dirname(destination)) do |temp|
+          temp.write content
+          temp.rewind
+          system %(#{merge_tool} "#{temp.path}" "#{destination}")
+        end
+      end
+
+      def merge_tool #:nodoc:
+        @merge_tool ||= ENV["THOR_MERGE"] || git_merge_tool
+      end
+
+      def git_merge_tool #:nodoc:
+        `git config merge.tool`.rstrip rescue ""
+      end
+    end
+  end
+end
diff --git a/lib/bundler/vendor/thor/lib/thor/shell/color.rb b/lib/bundler/vendor/thor/lib/thor/shell/color.rb
new file mode 100644
index 0000000000..dc167ed3cc
--- /dev/null
+++ b/lib/bundler/vendor/thor/lib/thor/shell/color.rb
@@ -0,0 +1,157 @@
+require_relative "basic"
+
+class Bundler::Thor
+  module Shell
+    # Inherit from Bundler::Thor::Shell::Basic and add set_color behavior. Check
+    # Bundler::Thor::Shell::Basic to see all available methods.
+    #
+    class Color < Basic
+      # Embed in a String to clear all previous ANSI sequences.
+      CLEAR      = "\e[0m"
+      # The start of an ANSI bold sequence.
+      BOLD       = "\e[1m"
+
+      # Set the terminal's foreground ANSI color to black.
+      BLACK      = "\e[30m"
+      # Set the terminal's foreground ANSI color to red.
+      RED        = "\e[31m"
+      # Set the terminal's foreground ANSI color to green.
+      GREEN      = "\e[32m"
+      # Set the terminal's foreground ANSI color to yellow.
+      YELLOW     = "\e[33m"
+      # Set the terminal's foreground ANSI color to blue.
+      BLUE       = "\e[34m"
+      # Set the terminal's foreground ANSI color to magenta.
+      MAGENTA    = "\e[35m"
+      # Set the terminal's foreground ANSI color to cyan.
+      CYAN       = "\e[36m"
+      # Set the terminal's foreground ANSI color to white.
+      WHITE      = "\e[37m"
+
+      # Set the terminal's background ANSI color to black.
+      ON_BLACK   = "\e[40m"
+      # Set the terminal's background ANSI color to red.
+      ON_RED     = "\e[41m"
+      # Set the terminal's background ANSI color to green.
+      ON_GREEN   = "\e[42m"
+      # Set the terminal's background ANSI color to yellow.
+      ON_YELLOW  = "\e[43m"
+      # Set the terminal's background ANSI color to blue.
+      ON_BLUE    = "\e[44m"
+      # Set the terminal's background ANSI color to magenta.
+      ON_MAGENTA = "\e[45m"
+      # Set the terminal's background ANSI color to cyan.
+      ON_CYAN    = "\e[46m"
+      # Set the terminal's background ANSI color to white.
+      ON_WHITE   = "\e[47m"
+
+      # Set color by using a string or one of the defined constants. If a third
+      # option is set to true, it also adds bold to the string. This is based
+      # on Highline implementation and it automatically appends CLEAR to the end
+      # of the returned String.
+      #
+      # Pass foreground, background and bold options to this method as
+      # symbols.
+      #
+      # Example:
+      #
+      #   set_color "Hi!", :red, :on_white, :bold
+      #
+      # The available colors are:
+      #
+      #   :bold
+      #   :black
+      #   :red
+      #   :green
+      #   :yellow
+      #   :blue
+      #   :magenta
+      #   :cyan
+      #   :white
+      #   :on_black
+      #   :on_red
+      #   :on_green
+      #   :on_yellow
+      #   :on_blue
+      #   :on_magenta
+      #   :on_cyan
+      #   :on_white
+      def set_color(string, *colors)
+        if colors.compact.empty? || !can_display_colors?
+          string
+        elsif colors.all? { |color| color.is_a?(Symbol) || color.is_a?(String) }
+          ansi_colors = colors.map { |color| lookup_color(color) }
+          "#{ansi_colors.join}#{string}#{CLEAR}"
+        else
+          # The old API was `set_color(color, bold=boolean)`. We
+          # continue to support the old API because you should never
+          # break old APIs unnecessarily :P
+          foreground, bold = colors
+          foreground = self.class.const_get(foreground.to_s.upcase) if foreground.is_a?(Symbol)
+
+          bold       = bold ? BOLD : ""
+          "#{bold}#{foreground}#{string}#{CLEAR}"
+        end
+      end
+
+    protected
+
+      def can_display_colors?
+        are_colors_supported? && !are_colors_disabled?
+      end
+
+      def are_colors_supported?
+        stdout.tty? && ENV["TERM"] != "dumb"
+      end
+
+      def are_colors_disabled?
+        !ENV['NO_COLOR'].nil?
+      end
+
+      # Overwrite show_diff to show diff with colors if Diff::LCS is
+      # available.
+      #
+      def show_diff(destination, content) #:nodoc:
+        if diff_lcs_loaded? && ENV["THOR_DIFF"].nil? && ENV["RAILS_DIFF"].nil?
+          actual  = File.binread(destination).to_s.split("\n")
+          content = content.to_s.split("\n")
+
+          Diff::LCS.sdiff(actual, content).each do |diff|
+            output_diff_line(diff)
+          end
+        else
+          super
+        end
+      end
+
+      def output_diff_line(diff) #:nodoc:
+        case diff.action
+        when "-"
+          say "- #{diff.old_element.chomp}", :red, true
+        when "+"
+          say "+ #{diff.new_element.chomp}", :green, true
+        when "!"
+          say "- #{diff.old_element.chomp}", :red, true
+          say "+ #{diff.new_element.chomp}", :green, true
+        else
+          say "  #{diff.old_element.chomp}", nil, true
+        end
+      end
+
+      # Check if Diff::LCS is loaded. If it is, use it to create pretty output
+      # for diff.
+      #
+      def diff_lcs_loaded? #:nodoc:
+        return true if defined?(Diff::LCS)
+        return @diff_lcs_loaded unless @diff_lcs_loaded.nil?
+
+        @diff_lcs_loaded = begin
+          require "diff/lcs"
+          true
+        rescue LoadError
+          false
+        end
+      end
+    end
+  end
+end
diff --git a/lib/bundler/vendor/thor/lib/thor/shell/html.rb b/lib/bundler/vendor/thor/lib/thor/shell/html.rb
new file mode 100644
index 0000000000..77a6d13a23
--- /dev/null
+++ b/lib/bundler/vendor/thor/lib/thor/shell/html.rb
@@ -0,0 +1,126 @@
+require_relative "basic"
+
+class Bundler::Thor
+  module Shell
+    # Inherit from Bundler::Thor::Shell::Basic and add set_color behavior. Check
+    # Bundler::Thor::Shell::Basic to see all available methods.
+    #
+    class HTML < Basic
+      # The start of an HTML bold sequence.
+      BOLD       = "font-weight: bold"
+
+      # Set the terminal's foreground HTML color to black.
+      BLACK      = "color: black"
+      # Set the terminal's foreground HTML color to red.
+      RED        = "color: red"
+      # Set the terminal's foreground HTML color to green.
+      GREEN      = "color: green"
+      # Set the terminal's foreground HTML color to yellow.
+      YELLOW     = "color: yellow"
+      # Set the terminal's foreground HTML color to blue.
+      BLUE       = "color: blue"
+      # Set the terminal's foreground HTML color to magenta.
+      MAGENTA    = "color: magenta"
+      # Set the terminal's foreground HTML color to cyan.
+      CYAN       = "color: cyan"
+      # Set the terminal's foreground HTML color to white.
+      WHITE      = "color: white"
+
+      # Set the terminal's background HTML color to black.
+      ON_BLACK   = "background-color: black"
+      # Set the terminal's background HTML color to red.
+      ON_RED     = "background-color: red"
+      # Set the terminal's background HTML color to green.
+      ON_GREEN   = "background-color: green"
+      # Set the terminal's background HTML color to yellow.
+      ON_YELLOW  = "background-color: yellow"
+      # Set the terminal's background HTML color to blue.
+      ON_BLUE    = "background-color: blue"
+      # Set the terminal's background HTML color to magenta.
+      ON_MAGENTA = "background-color: magenta"
+      # Set the terminal's background HTML color to cyan.
+      ON_CYAN    = "background-color: cyan"
+      # Set the terminal's background HTML color to white.
+      ON_WHITE   = "background-color: white"
+
+      # Set color by using a string or one of the defined constants. If a third
+      # option is set to true, it also adds bold to the string. This is based
+      # on Highline implementation and it automatically appends CLEAR to the end
+      # of the returned String.
+      #
+      def set_color(string, *colors)
+        if colors.all? { |color| color.is_a?(Symbol) || color.is_a?(String) }
+          html_colors = colors.map { |color| lookup_color(color) }
+          "<span style=\"#{html_colors.join('; ')};\">#{Bundler::Thor::Util.escape_html(string)}</span>"
+        else
+          color, bold = colors
+          html_color = self.class.const_get(color.to_s.upcase) if color.is_a?(Symbol)
+          styles = [html_color]
+          styles << BOLD if bold
+          "<span style=\"#{styles.join('; ')};\">#{Bundler::Thor::Util.escape_html(string)}</span>"
+        end
+      end
+
+      # Ask something to the user and receives a response.
+      #
+      # ==== Example
+      # ask("What is your name?")
+      #
+      # TODO: Implement #ask for Bundler::Thor::Shell::HTML
+      def ask(statement, color = nil)
+        raise NotImplementedError, "Implement #ask for Bundler::Thor::Shell::HTML"
+      end
+
+    protected
+
+      def can_display_colors?
+        true
+      end
+
+      # Overwrite show_diff to show diff with colors if Diff::LCS is
+      # available.
+      #
+      def show_diff(destination, content) #:nodoc:
+        if diff_lcs_loaded? && ENV["THOR_DIFF"].nil? && ENV["RAILS_DIFF"].nil?
+          actual  = File.binread(destination).to_s.split("\n")
+          content = content.to_s.split("\n")
+
+          Diff::LCS.sdiff(actual, content).each do |diff|
+            output_diff_line(diff)
+          end
+        else
+          super
+        end
+      end
+
+      def output_diff_line(diff) #:nodoc:
+        case diff.action
+        when "-"
+          say "- #{diff.old_element.chomp}", :red, true
+        when "+"
+          say "+ #{diff.new_element.chomp}", :green, true
+        when "!"
+          say "- #{diff.old_element.chomp}", :red, true
+          say "+ #{diff.new_element.chomp}", :green, true
+        else
+          say "  #{diff.old_element.chomp}", nil, true
+        end
+      end
+
+      # Check if Diff::LCS is loaded. If it is, use it to create pretty output
+      # for diff.
+      #
+      def diff_lcs_loaded? #:nodoc:
+        return true if defined?(Diff::LCS)
+        return @diff_lcs_loaded unless @diff_lcs_loaded.nil?
+
+        @diff_lcs_loaded = begin
+          require "diff/lcs"
+          true
+        rescue LoadError
+          false
+        end
+      end
+    end
+  end
+end
diff --git a/lib/bundler/vendor/thor/lib/thor/util.rb b/lib/bundler/vendor/thor/lib/thor/util.rb
new file mode 100644
index 0000000000..ddf4d21b90
--- /dev/null
+++ b/lib/bundler/vendor/thor/lib/thor/util.rb
@@ -0,0 +1,284 @@
+require "rbconfig"
+
+class Bundler::Thor
+  module Sandbox #:nodoc:
+  end
+
+  # This module holds several utilities:
+  #
+  # 1) Methods to convert thor namespaces to constants and vice-versa.
+  #
+  #   Bundler::Thor::Util.namespace_from_thor_class(Foo::Bar::Baz) #=> "foo:bar:baz"
+  #
+  # 2) Loading thor files and sandboxing:
+  #
+  #   Bundler::Thor::Util.load_thorfile("~/.thor/foo")
+  #
+  module Util
+    class << self
+      # Receives a namespace and search for it in the Bundler::Thor::Base subclasses.
+      #
+      # ==== Parameters
+      # namespace<String>:: The namespace to search for.
+      #
+      def find_by_namespace(namespace)
+        namespace = "default#{namespace}" if namespace.empty? || namespace =~ /^:/
+        Bundler::Thor::Base.subclasses.detect { |klass| klass.namespace == namespace }
+      end
+
+      # Receives a constant and converts it to a Bundler::Thor namespace. Since Bundler::Thor
+      # commands can be added to a sandbox, this method is also responsible for
+      # removing the sandbox namespace.
+      #
+      # This method should not be used in general because it's used to deal with
+      # older versions of Bundler::Thor. On current versions, if you need to get the
+      # namespace from a class, just call namespace on it.
+      #
+      # ==== Parameters
+      # constant<Object>:: The constant to be converted to the thor path.
+      #
+      # ==== Returns
+      # String:: If we receive Foo::Bar::Baz it returns "foo:bar:baz"
+      #
+      def namespace_from_thor_class(constant)
+        constant = constant.to_s.gsub(/^Bundler::Thor::Sandbox::/, "")
+        constant = snake_case(constant).squeeze(":")
+        constant
+      end
+
+      # Given the contents, evaluate it inside the sandbox and returns the
+      # namespaces defined in the sandbox.
+      #
+      # ==== Parameters
+      # contents<String>
+      #
+      # ==== Returns
+      # Array[Object]
+      #
+      def namespaces_in_content(contents, file = __FILE__)
+        old_constants = Bundler::Thor::Base.subclasses.dup
+        Bundler::Thor::Base.subclasses.clear
+
+        load_thorfile(file, contents)
+
+        new_constants = Bundler::Thor::Base.subclasses.dup
+        Bundler::Thor::Base.subclasses.replace(old_constants)
+
+        new_constants.map!(&:namespace)
+        new_constants.compact!
+        new_constants
+      end
+
+      # Returns the thor classes declared inside the given class.
+      #
+      def thor_classes_in(klass)
+        stringfied_constants = klass.constants.map(&:to_s)
+        Bundler::Thor::Base.subclasses.select do |subclass|
+          next unless subclass.name
+          stringfied_constants.include?(subclass.name.gsub("#{klass.name}::", ""))
+        end
+      end
+
+      # Receives a string and convert it to snake case. SnakeCase returns snake_case.
+      #
+      # ==== Parameters
+      # String
+      #
+      # ==== Returns
+      # String
+      #
+      def snake_case(str)
+        return str.downcase if str =~ /^[A-Z_]+$/
+        str.gsub(/\B[A-Z]/, '_\&').squeeze("_") =~ /_*(.*)/
+        $+.downcase
+      end
+
+      # Receives a string and convert it to camel case. camel_case returns CamelCase.
+      #
+      # ==== Parameters
+      # String
+      #
+      # ==== Returns
+      # String
+      #
+      def camel_case(str)
+        return str if str !~ /_/ && str =~ /[A-Z]+.*/
+        str.split("_").map(&:capitalize).join
+      end
+
+      # Receives a namespace and tries to retrieve a Bundler::Thor or Bundler::Thor::Group class
+      # from it. It first searches for a class using the all the given namespace,
+      # if it's not found, removes the highest entry and searches for the class
+      # again. If found, returns the highest entry as the class name.
+      #
+      # ==== Examples
+      #
+      #   class Foo::Bar < Bundler::Thor
+      #     def baz
+      #     end
+      #   end
+      #
+      #   class Baz::Foo < Bundler::Thor::Group
+      #   end
+      #
+      #   Bundler::Thor::Util.namespace_to_thor_class("foo:bar")     #=> Foo::Bar, nil # will invoke default command
+      #   Bundler::Thor::Util.namespace_to_thor_class("baz:foo")     #=> Baz::Foo, nil
+      #   Bundler::Thor::Util.namespace_to_thor_class("foo:bar:baz") #=> Foo::Bar, "baz"
+      #
+      # ==== Parameters
+      # namespace<String>
+      #
+      def find_class_and_command_by_namespace(namespace, fallback = true)
+        if namespace.include?(":") # look for a namespaced command
+          pieces  = namespace.split(":")
+          command = pieces.pop
+          klass   = Bundler::Thor::Util.find_by_namespace(pieces.join(":"))
+        end
+        unless klass # look for a Bundler::Thor::Group with the right name
+          klass = Bundler::Thor::Util.find_by_namespace(namespace)
+          command = nil
+        end
+        if !klass && fallback # try a command in the default namespace
+          command = namespace
+          klass   = Bundler::Thor::Util.find_by_namespace("")
+        end
+        [klass, command]
+      end
+      alias_method :find_class_and_task_by_namespace, :find_class_and_command_by_namespace
+
+      # Receives a path and load the thor file in the path. The file is evaluated
+      # inside the sandbox to avoid namespacing conflicts.
+      #
+      def load_thorfile(path, content = nil, debug = false)
+        content ||= File.binread(path)
+
+        begin
+          Bundler::Thor::Sandbox.class_eval(content, path)
+        rescue StandardError => e
+          $stderr.puts("WARNING: unable to load thorfile #{path.inspect}: #{e.message}")
+          if debug
+            $stderr.puts(*e.backtrace)
+          else
+            $stderr.puts(e.backtrace.first)
+          end
+        end
+      end
+
+      def user_home
+        @@user_home ||= if ENV["HOME"]
+          ENV["HOME"]
+        elsif ENV["USERPROFILE"]
+          ENV["USERPROFILE"]
+        elsif ENV["HOMEDRIVE"] && ENV["HOMEPATH"]
+          File.join(ENV["HOMEDRIVE"], ENV["HOMEPATH"])
+        elsif ENV["APPDATA"]
+          ENV["APPDATA"]
+        else
+          begin
+            File.expand_path("~")
+          rescue
+            if File::ALT_SEPARATOR
+              "C:/"
+            else
+              "/"
+            end
+          end
+        end
+      end
+
+      # Returns the root where thor files are located, depending on the OS.
+      #
+      def thor_root
+        File.join(user_home, ".thor").tr('\\', "/")
+      end
+
+      # Returns the files in the thor root. On Windows thor_root will be something
+      # like this:
+      #
+      #   C:\Documents and Settings\james\.thor
+      #
+      # If we don't #gsub the \ character, Dir.glob will fail.
+      #
+      def thor_root_glob
+        files = Dir["#{escape_globs(thor_root)}/*"]
+
+        files.map! do |file|
+          File.directory?(file) ? File.join(file, "main.thor") : file
+        end
+      end
+
+      # Where to look for Bundler::Thor files.
+      #
+      def globs_for(path)
+        path = escape_globs(path)
+        ["#{path}/Thorfile", "#{path}/*.thor", "#{path}/tasks/*.thor", "#{path}/lib/tasks/*.thor"]
+      end
+
+      # Return the path to the ruby interpreter taking into account multiple
+      # installations and windows extensions.
+      #
+      def ruby_command
+        @ruby_command ||= begin
+          ruby_name = RbConfig::CONFIG["ruby_install_name"]
+          ruby = File.join(RbConfig::CONFIG["bindir"], ruby_name)
+          ruby << RbConfig::CONFIG["EXEEXT"]
+
+          # avoid using different name than ruby (on platforms supporting links)
+          if ruby_name != "ruby" && File.respond_to?(:readlink)
+            begin
+              alternate_ruby = File.join(RbConfig::CONFIG["bindir"], "ruby")
+              alternate_ruby << RbConfig::CONFIG["EXEEXT"]
+
+              # ruby is a symlink
+              if File.symlink? alternate_ruby
+                linked_ruby = File.readlink alternate_ruby
+
+                # symlink points to 'ruby_install_name'
+                ruby = alternate_ruby if linked_ruby == ruby_name || linked_ruby == ruby
+              end
+            rescue NotImplementedError # rubocop:disable HandleExceptions
+              # just ignore on windows
+            end
+          end
+
+          # escape string in case path to ruby executable contain spaces.
+          ruby.sub!(/.*\s.*/m, '"\&"')
+          ruby
+        end
+      end
+
+      # Returns a string that has had any glob characters escaped.
+      # The glob characters are `* ? { } [ ]`.
+      #
+      # ==== Examples
+      #
+      #   Bundler::Thor::Util.escape_globs('[apps]')   # => '\[apps\]'
+      #
+      # ==== Parameters
+      # String
+      #
+      # ==== Returns
+      # String
+      #
+      def escape_globs(path)
+        path.to_s.gsub(/[*?{}\[\]]/, '\\\\\\&')
+      end
+
+      # Returns a string that has had any HTML characters escaped.
+      #
+      # ==== Examples
+      #
+      #   Bundler::Thor::Util.escape_html('<div>')   # => "&lt;div&gt;"
+      #
+      # ==== Parameters
+      # String
+      #
+      # ==== Returns
+      # String
+      #
+      def escape_html(string)
+        CGI.escapeHTML(string)
+      end
+    end
+  end
+end
diff --git a/lib/bundler/vendor/thor/lib/thor/version.rb b/lib/bundler/vendor/thor/lib/thor/version.rb
new file mode 100644
index 0000000000..a3efa9f762
--- /dev/null
+++ b/lib/bundler/vendor/thor/lib/thor/version.rb
@@ -0,0 +1,3 @@
+class Bundler::Thor
+  VERSION = "1.1.0"
+end
diff --git a/lib/bundler/vendor/tmpdir/lib/tmpdir.rb b/lib/bundler/vendor/tmpdir/lib/tmpdir.rb
new file mode 100644
index 0000000000..70d43e0c6b
--- /dev/null
+++ b/lib/bundler/vendor/tmpdir/lib/tmpdir.rb
@@ -0,0 +1,154 @@
+# frozen_string_literal: true
+#
+# tmpdir - retrieve temporary directory path
+#
+# $Id$
+#
+
+require_relative '../../fileutils/lib/fileutils'
+begin
+  require 'etc.so'
+rescue LoadError # rescue LoadError for miniruby
+end
+
+class Bundler::Dir < Dir
+
+  @systmpdir ||= defined?(Etc.systmpdir) ? Etc.systmpdir : '/tmp'
+
+  ##
+  # Returns the operating system's temporary file path.
+
+  def self.tmpdir
+    tmp = nil
+    ['TMPDIR', 'TMP', 'TEMP', ['system temporary path', @systmpdir], ['/tmp']*2, ['.']*2].each do |name, dir = ENV[name]|
+      next if !dir
+      dir = File.expand_path(dir)
+      stat = File.stat(dir) rescue next
+      case
+      when !stat.directory?
+        warn "#{name} is not a directory: #{dir}"
+      when !stat.writable?
+        warn "#{name} is not writable: #{dir}"
+      when stat.world_writable? && !stat.sticky?
+        warn "#{name} is world-writable: #{dir}"
+      else
+        tmp = dir
+        break
+      end
+    end
+    raise ArgumentError, "could not find a temporary directory" unless tmp
+    tmp
+  end
+
+  # Bundler::Dir.mktmpdir creates a temporary directory.
+  #
+  # The directory is created with 0700 permission.
+  # Application should not change the permission to make the temporary directory accessible from other users.
+  #
+  # The prefix and suffix of the name of the directory is specified by
+  # the optional first argument, <i>prefix_suffix</i>.
+  # - If it is not specified or nil, "d" is used as the prefix and no suffix is used.
+  # - If it is a string, it is used as the prefix and no suffix is used.
+  # - If it is an array, first element is used as the prefix and second element is used as a suffix.
+  #
+  #  Bundler::Dir.mktmpdir {|dir| dir is ".../d..." }
+  #  Bundler::Dir.mktmpdir("foo") {|dir| dir is ".../foo..." }
+  #  Bundler::Dir.mktmpdir(["foo", "bar"]) {|dir| dir is ".../foo...bar" }
+  #
+  # The directory is created under Bundler::Dir.tmpdir or
+  # the optional second argument <i>tmpdir</i> if non-nil value is given.
+  #
+  #  Bundler::Dir.mktmpdir {|dir| dir is "#{Bundler::Dir.tmpdir}/d..." }
+  #  Bundler::Dir.mktmpdir(nil, "/var/tmp") {|dir| dir is "/var/tmp/d..." }
+  #
+  # If a block is given,
+  # it is yielded with the path of the directory.
+  # The directory and its contents are removed
+  # using Bundler::FileUtils.remove_entry before Bundler::Dir.mktmpdir returns.
+  # The value of the block is returned.
+  #
+  #  Bundler::Dir.mktmpdir {|dir|
+  #    # use the directory...
+  #    open("#{dir}/foo", "w") { ... }
+  #  }
+  #
+  # If a block is not given,
+  # The path of the directory is returned.
+  # In this case, Bundler::Dir.mktmpdir doesn't remove the directory.
+  #
+  #  dir = Bundler::Dir.mktmpdir
+  #  begin
+  #    # use the directory...
+  #    open("#{dir}/foo", "w") { ... }
+  #  ensure
+  #    # remove the directory.
+  #    Bundler::FileUtils.remove_entry dir
+  #  end
+  #
+  def self.mktmpdir(prefix_suffix=nil, *rest, **options)
+    base = nil
+    path = Tmpname.create(prefix_suffix || "d", *rest, **options) {|p, _, _, d|
+      base = d
+      mkdir(p, 0700)
+    }
+    if block_given?
+      begin
+        yield path.dup
+      ensure
+        unless base
+          stat = File.stat(File.dirname(path))
+          if stat.world_writable? and !stat.sticky?
+            raise ArgumentError, "parent directory is world writable but not sticky"
+          end
+        end
+        Bundler::FileUtils.remove_entry path
+      end
+    else
+      path
+    end
+  end
+
+  module Tmpname # :nodoc:
+    module_function
+
+    def tmpdir
+      Bundler::Dir.tmpdir
+    end
+
+    UNUSABLE_CHARS = "^,-.0-9A-Z_a-z~"
+
+    class << (RANDOM = Random.new)
+      MAX = 36**6 # < 0x100000000
+      def next
+        rand(MAX).to_s(36)
+      end
+    end
+    private_constant :RANDOM
+
+    def create(basename, tmpdir=nil, max_try: nil, **opts)
+      origdir = tmpdir
+      tmpdir ||= tmpdir()
+      n = nil
+      prefix, suffix = basename
+      prefix = (String.try_convert(prefix) or
+                raise ArgumentError, "unexpected prefix: #{prefix.inspect}")
+      prefix = prefix.delete(UNUSABLE_CHARS)
+      suffix &&= (String.try_convert(suffix) or
+                  raise ArgumentError, "unexpected suffix: #{suffix.inspect}")
+      suffix &&= suffix.delete(UNUSABLE_CHARS)
+      begin
+        t = Time.now.strftime("%Y%m%d")
+        path = "#{prefix}#{t}-#{$$}-#{RANDOM.next}"\
+               "#{n ? %[-#{n}] : ''}#{suffix||''}"
+        path = File.join(tmpdir, path)
+        yield(path, n, opts, origdir)
+      rescue Errno::EEXIST
+        n ||= 0
+        n += 1
+        retry if !max_try or n < max_try
+        raise "cannot generate temporary name using `#{basename}' under `#{tmpdir}'"
+      end
+      path
+    end
+  end
+end
diff --git a/lib/bundler/vendor/tsort/LICENSE.txt b/lib/bundler/vendor/tsort/LICENSE.txt
new file mode 100644
index 0000000000..a009caefea
--- /dev/null
+++ b/lib/bundler/vendor/tsort/LICENSE.txt
@@ -0,0 +1,22 @@
+Copyright (C) 1993-2013 Yukihiro Matsumoto. 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.
diff --git a/lib/bundler/vendor/tsort/lib/tsort.rb b/lib/bundler/vendor/tsort/lib/tsort.rb
new file mode 100644
index 0000000000..8454583295
--- /dev/null
+++ b/lib/bundler/vendor/tsort/lib/tsort.rb
@@ -0,0 +1,453 @@
+# frozen_string_literal: true
+
+#--
+# tsort.rb - provides a module for topological sorting and strongly connected components.
+#++
+#
+
+#
+# TSort implements topological sorting using Tarjan's algorithm for
+# strongly connected components.
+#
+# TSort is designed to be able to be used with any object which can be
+# interpreted as a directed graph.
+#
+# TSort requires two methods to interpret an object as a graph,
+# tsort_each_node and tsort_each_child.
+#
+# * tsort_each_node is used to iterate for all nodes over a graph.
+# * tsort_each_child is used to iterate for child nodes of a given node.
+#
+# The equality of nodes are defined by eql? and hash since
+# TSort uses Hash internally.
+#
+# == A Simple Example
+#
+# The following example demonstrates how to mix the TSort module into an
+# existing class (in this case, Hash). Here, we're treating each key in
+# the hash as a node in the graph, and so we simply alias the required
+# #tsort_each_node method to Hash's #each_key method. For each key in the
+# hash, the associated value is an array of the node's child nodes. This
+# choice in turn leads to our implementation of the required #tsort_each_child
+# method, which fetches the array of child nodes and then iterates over that
+# array using the user-supplied block.
+#
+#   require 'tsort'
+#
+#   class Hash
+#     include TSort
+#     alias tsort_each_node each_key
+#     def tsort_each_child(node, &block)
+#       fetch(node).each(&block)
+#     end
+#   end
+#
+#   {1=>[2, 3], 2=>[3], 3=>[], 4=>[]}.tsort
+#   #=> [3, 2, 1, 4]
+#
+#   {1=>[2], 2=>[3, 4], 3=>[2], 4=>[]}.strongly_connected_components
+#   #=> [[4], [2, 3], [1]]
+#
+# == A More Realistic Example
+#
+# A very simple `make' like tool can be implemented as follows:
+#
+#   require 'tsort'
+#
+#   class Make
+#     def initialize
+#       @dep = {}
+#       @dep.default = []
+#     end
+#
+#     def rule(outputs, inputs=[], &block)
+#       triple = [outputs, inputs, block]
+#       outputs.each {|f| @dep[f] = [triple]}
+#       @dep[triple] = inputs
+#     end
+#
+#     def build(target)
+#       each_strongly_connected_component_from(target) {|ns|
+#         if ns.length != 1
+#           fs = ns.delete_if {|n| Array === n}
+#           raise TSort::Cyclic.new("cyclic dependencies: #{fs.join ', '}")
+#         end
+#         n = ns.first
+#         if Array === n
+#           outputs, inputs, block = n
+#           inputs_time = inputs.map {|f| File.mtime f}.max
+#           begin
+#             outputs_time = outputs.map {|f| File.mtime f}.min
+#           rescue Errno::ENOENT
+#             outputs_time = nil
+#           end
+#           if outputs_time == nil ||
+#              inputs_time != nil && outputs_time <= inputs_time
+#             sleep 1 if inputs_time != nil && inputs_time.to_i == Time.now.to_i
+#             block.call
+#           end
+#         end
+#       }
+#     end
+#
+#     def tsort_each_child(node, &block)
+#       @dep[node].each(&block)
+#     end
+#     include TSort
+#   end
+#
+#   def command(arg)
+#     print arg, "\n"
+#     system arg
+#   end
+#
+#   m = Make.new
+#   m.rule(%w[t1]) { command 'date > t1' }
+#   m.rule(%w[t2]) { command 'date > t2' }
+#   m.rule(%w[t3]) { command 'date > t3' }
+#   m.rule(%w[t4], %w[t1 t3]) { command 'cat t1 t3 > t4' }
+#   m.rule(%w[t5], %w[t4 t2]) { command 'cat t4 t2 > t5' }
+#   m.build('t5')
+#
+# == Bugs
+#
+# * 'tsort.rb' is wrong name because this library uses
+#   Tarjan's algorithm for strongly connected components.
+#   Although 'strongly_connected_components.rb' is correct but too long.
+#
+# == References
+#
+# R. E. Tarjan, "Depth First Search and Linear Graph Algorithms",
+# <em>SIAM Journal on Computing</em>, Vol. 1, No. 2, pp. 146-160, June 1972.
+#
+module Bundler
+  module TSort
+    class Cyclic < StandardError
+    end
+
+    # Returns a topologically sorted array of nodes.
+    # The array is sorted from children to parents, i.e.
+    # the first element has no child and the last node has no parent.
+    #
+    # If there is a cycle, TSort::Cyclic is raised.
+    #
+    #   class G
+    #     include TSort
+    #     def initialize(g)
+    #       @g = g
+    #     end
+    #     def tsort_each_child(n, &b) @g[n].each(&b) end
+    #     def tsort_each_node(&b) @g.each_key(&b) end
+    #   end
+    #
+    #   graph = G.new({1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]})
+    #   p graph.tsort #=> [4, 2, 3, 1]
+    #
+    #   graph = G.new({1=>[2], 2=>[3, 4], 3=>[2], 4=>[]})
+    #   p graph.tsort # raises TSort::Cyclic
+    #
+    def tsort
+      each_node = method(:tsort_each_node)
+      each_child = method(:tsort_each_child)
+      TSort.tsort(each_node, each_child)
+    end
+
+    # Returns a topologically sorted array of nodes.
+    # The array is sorted from children to parents, i.e.
+    # the first element has no child and the last node has no parent.
+    #
+    # The graph is represented by _each_node_ and _each_child_.
+    # _each_node_ should have +call+ method which yields for each node in the graph.
+    # _each_child_ should have +call+ method which takes a node argument and yields for each child node.
+    #
+    # If there is a cycle, TSort::Cyclic is raised.
+    #
+    #   g = {1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]}
+    #   each_node = lambda {|&b| g.each_key(&b) }
+    #   each_child = lambda {|n, &b| g[n].each(&b) }
+    #   p TSort.tsort(each_node, each_child) #=> [4, 2, 3, 1]
+    #
+    #   g = {1=>[2], 2=>[3, 4], 3=>[2], 4=>[]}
+    #   each_node = lambda {|&b| g.each_key(&b) }
+    #   each_child = lambda {|n, &b| g[n].each(&b) }
+    #   p TSort.tsort(each_node, each_child) # raises TSort::Cyclic
+    #
+    def TSort.tsort(each_node, each_child)
+      TSort.tsort_each(each_node, each_child).to_a
+    end
+
+    # The iterator version of the #tsort method.
+    # <tt><em>obj</em>.tsort_each</tt> is similar to <tt><em>obj</em>.tsort.each</tt>, but
+    # modification of _obj_ during the iteration may lead to unexpected results.
+    #
+    # #tsort_each returns +nil+.
+    # If there is a cycle, TSort::Cyclic is raised.
+    #
+    #   class G
+    #     include TSort
+    #     def initialize(g)
+    #       @g = g
+    #     end
+    #     def tsort_each_child(n, &b) @g[n].each(&b) end
+    #     def tsort_each_node(&b) @g.each_key(&b) end
+    #   end
+    #
+    #   graph = G.new({1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]})
+    #   graph.tsort_each {|n| p n }
+    #   #=> 4
+    #   #   2
+    #   #   3
+    #   #   1
+    #
+    def tsort_each(&block) # :yields: node
+      each_node = method(:tsort_each_node)
+      each_child = method(:tsort_each_child)
+      TSort.tsort_each(each_node, each_child, &block)
+    end
+
+    # The iterator version of the TSort.tsort method.
+    #
+    # The graph is represented by _each_node_ and _each_child_.
+    # _each_node_ should have +call+ method which yields for each node in the graph.
+    # _each_child_ should have +call+ method which takes a node argument and yields for each child node.
+    #
+    #   g = {1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]}
+    #   each_node = lambda {|&b| g.each_key(&b) }
+    #   each_child = lambda {|n, &b| g[n].each(&b) }
+    #   TSort.tsort_each(each_node, each_child) {|n| p n }
+    #   #=> 4
+    #   #   2
+    #   #   3
+    #   #   1
+    #
+    def TSort.tsort_each(each_node, each_child) # :yields: node
+      return to_enum(__method__, each_node, each_child) unless block_given?
+
+      TSort.each_strongly_connected_component(each_node, each_child) {|component|
+        if component.size == 1
+          yield component.first
+        else
+          raise Cyclic.new("topological sort failed: #{component.inspect}")
+        end
+      }
+    end
+
+    # Returns strongly connected components as an array of arrays of nodes.
+    # The array is sorted from children to parents.
+    # Each elements of the array represents a strongly connected component.
+    #
+    #   class G
+    #     include TSort
+    #     def initialize(g)
+    #       @g = g
+    #     end
+    #     def tsort_each_child(n, &b) @g[n].each(&b) end
+    #     def tsort_each_node(&b) @g.each_key(&b) end
+    #   end
+    #
+    #   graph = G.new({1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]})
+    #   p graph.strongly_connected_components #=> [[4], [2], [3], [1]]
+    #
+    #   graph = G.new({1=>[2], 2=>[3, 4], 3=>[2], 4=>[]})
+    #   p graph.strongly_connected_components #=> [[4], [2, 3], [1]]
+    #
+    def strongly_connected_components
+      each_node = method(:tsort_each_node)
+      each_child = method(:tsort_each_child)
+      TSort.strongly_connected_components(each_node, each_child)
+    end
+
+    # Returns strongly connected components as an array of arrays of nodes.
+    # The array is sorted from children to parents.
+    # Each elements of the array represents a strongly connected component.
+    #
+    # The graph is represented by _each_node_ and _each_child_.
+    # _each_node_ should have +call+ method which yields for each node in the graph.
+    # _each_child_ should have +call+ method which takes a node argument and yields for each child node.
+    #
+    #   g = {1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]}
+    #   each_node = lambda {|&b| g.each_key(&b) }
+    #   each_child = lambda {|n, &b| g[n].each(&b) }
+    #   p TSort.strongly_connected_components(each_node, each_child)
+    #   #=> [[4], [2], [3], [1]]
+    #
+    #   g = {1=>[2], 2=>[3, 4], 3=>[2], 4=>[]}
+    #   each_node = lambda {|&b| g.each_key(&b) }
+    #   each_child = lambda {|n, &b| g[n].each(&b) }
+    #   p TSort.strongly_connected_components(each_node, each_child)
+    #   #=> [[4], [2, 3], [1]]
+    #
+    def TSort.strongly_connected_components(each_node, each_child)
+      TSort.each_strongly_connected_component(each_node, each_child).to_a
+    end
+
+    # The iterator version of the #strongly_connected_components method.
+    # <tt><em>obj</em>.each_strongly_connected_component</tt> is similar to
+    # <tt><em>obj</em>.strongly_connected_components.each</tt>, but
+    # modification of _obj_ during the iteration may lead to unexpected results.
+    #
+    # #each_strongly_connected_component returns +nil+.
+    #
+    #   class G
+    #     include TSort
+    #     def initialize(g)
+    #       @g = g
+    #     end
+    #     def tsort_each_child(n, &b) @g[n].each(&b) end
+    #     def tsort_each_node(&b) @g.each_key(&b) end
+    #   end
+    #
+    #   graph = G.new({1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]})
+    #   graph.each_strongly_connected_component {|scc| p scc }
+    #   #=> [4]
+    #   #   [2]
+    #   #   [3]
+    #   #   [1]
+    #
+    #   graph = G.new({1=>[2], 2=>[3, 4], 3=>[2], 4=>[]})
+    #   graph.each_strongly_connected_component {|scc| p scc }
+    #   #=> [4]
+    #   #   [2, 3]
+    #   #   [1]
+    #
+    def each_strongly_connected_component(&block) # :yields: nodes
+      each_node = method(:tsort_each_node)
+      each_child = method(:tsort_each_child)
+      TSort.each_strongly_connected_component(each_node, each_child, &block)
+    end
+
+    # The iterator version of the TSort.strongly_connected_components method.
+    #
+    # The graph is represented by _each_node_ and _each_child_.
+    # _each_node_ should have +call+ method which yields for each node in the graph.
+    # _each_child_ should have +call+ method which takes a node argument and yields for each child node.
+    #
+    #   g = {1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]}
+    #   each_node = lambda {|&b| g.each_key(&b) }
+    #   each_child = lambda {|n, &b| g[n].each(&b) }
+    #   TSort.each_strongly_connected_component(each_node, each_child) {|scc| p scc }
+    #   #=> [4]
+    #   #   [2]
+    #   #   [3]
+    #   #   [1]
+    #
+    #   g = {1=>[2], 2=>[3, 4], 3=>[2], 4=>[]}
+    #   each_node = lambda {|&b| g.each_key(&b) }
+    #   each_child = lambda {|n, &b| g[n].each(&b) }
+    #   TSort.each_strongly_connected_component(each_node, each_child) {|scc| p scc }
+    #   #=> [4]
+    #   #   [2, 3]
+    #   #   [1]
+    #
+    def TSort.each_strongly_connected_component(each_node, each_child) # :yields: nodes
+      return to_enum(__method__, each_node, each_child) unless block_given?
+
+      id_map = {}
+      stack = []
+      each_node.call {|node|
+        unless id_map.include? node
+          TSort.each_strongly_connected_component_from(node, each_child, id_map, stack) {|c|
+            yield c
+          }
+        end
+      }
+      nil
+    end
+
+    # Iterates over strongly connected component in the subgraph reachable from
+    # _node_.
+    #
+    # Return value is unspecified.
+    #
+    # #each_strongly_connected_component_from doesn't call #tsort_each_node.
+    #
+    #   class G
+    #     include TSort
+    #     def initialize(g)
+    #       @g = g
+    #     end
+    #     def tsort_each_child(n, &b) @g[n].each(&b) end
+    #     def tsort_each_node(&b) @g.each_key(&b) end
+    #   end
+    #
+    #   graph = G.new({1=>[2, 3], 2=>[4], 3=>[2, 4], 4=>[]})
+    #   graph.each_strongly_connected_component_from(2) {|scc| p scc }
+    #   #=> [4]
+    #   #   [2]
+    #
+    #   graph = G.new({1=>[2], 2=>[3, 4], 3=>[2], 4=>[]})
+    #   graph.each_strongly_connected_component_from(2) {|scc| p scc }
+    #   #=> [4]
+    #   #   [2, 3]
+    #
+    def each_strongly_connected_component_from(node, id_map={}, stack=[], &block) # :yields: nodes
+      TSort.each_strongly_connected_component_from(node, method(:tsort_each_child), id_map, stack, &block)
+    end
+
+    # Iterates over strongly connected components in a graph.
+    # The graph is represented by _node_ and _each_child_.
+    #
+    # _node_ is the first node.
+    # _each_child_ should have +call+ method which takes a node argument
+    # and yields for each child node.
+    #
+    # Return value is unspecified.
+    #
+    # #TSort.each_strongly_connected_component_from is a class method and
+    # it doesn't need a class to represent a graph which includes TSort.
+    #
+    #   graph = {1=>[2], 2=>[3, 4], 3=>[2], 4=>[]}
+    #   each_child = lambda {|n, &b| graph[n].each(&b) }
+    #   TSort.each_strongly_connected_component_from(1, each_child) {|scc|
+    #     p scc
+    #   }
+    #   #=> [4]
+    #   #   [2, 3]
+    #   #   [1]
+    #
+    def TSort.each_strongly_connected_component_from(node, each_child, id_map={}, stack=[]) # :yields: nodes
+      return to_enum(__method__, node, each_child, id_map, stack) unless block_given?
+
+      minimum_id = node_id = id_map[node] = id_map.size
+      stack_length = stack.length
+      stack << node
+
+      each_child.call(node) {|child|
+        if id_map.include? child
+          child_id = id_map[child]
+          minimum_id = child_id if child_id && child_id < minimum_id
+        else
+          sub_minimum_id =
+            TSort.each_strongly_connected_component_from(child, each_child, id_map, stack) {|c|
+              yield c
+            }
+          minimum_id = sub_minimum_id if sub_minimum_id < minimum_id
+        end
+      }
+
+      if node_id == minimum_id
+        component = stack.slice!(stack_length .. -1)
+        component.each {|n| id_map[n] = nil}
+        yield component
+      end
+
+      minimum_id
+    end
+
+    # Should be implemented by a extended class.
+    #
+    # #tsort_each_node is used to iterate for all nodes over a graph.
+    #
+    def tsort_each_node # :yields: node
+      raise NotImplementedError.new
+    end
+
+    # Should be implemented by a extended class.
+    #
+    # #tsort_each_child is used to iterate for child nodes of _node_.
+    #
+    def tsort_each_child(node) # :yields: child
+      raise NotImplementedError.new
+    end
+  end
+end
diff --git a/lib/bundler/vendor/uri/LICENSE.txt b/lib/bundler/vendor/uri/LICENSE.txt
new file mode 100644
index 0000000000..a009caefea
--- /dev/null
+++ b/lib/bundler/vendor/uri/LICENSE.txt
@@ -0,0 +1,22 @@
+Copyright (C) 1993-2013 Yukihiro Matsumoto. 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.
diff --git a/lib/bundler/vendor/uri/lib/uri.rb b/lib/bundler/vendor/uri/lib/uri.rb
new file mode 100644
index 0000000000..00c01bd07b
--- /dev/null
+++ b/lib/bundler/vendor/uri/lib/uri.rb
@@ -0,0 +1,104 @@
+# frozen_string_literal: false
+# Bundler::URI is a module providing classes to handle Uniform Resource Identifiers
+# (RFC2396[http://tools.ietf.org/html/rfc2396]).
+#
+# == Features
+#
+# * Uniform way of handling URIs.
+# * Flexibility to introduce custom Bundler::URI schemes.
+# * Flexibility to have an alternate Bundler::URI::Parser (or just different patterns
+#   and regexp's).
+#
+# == Basic example
+#
+#   require 'bundler/vendor/uri/lib/uri'
+#
+#   uri = Bundler::URI("http://foo.com/posts?id=30&limit=5#time=1305298413")
+#   #=> #<Bundler::URI::HTTP http://foo.com/posts?id=30&limit=5#time=1305298413>
+#
+#   uri.scheme    #=> "http"
+#   uri.host      #=> "foo.com"
+#   uri.path      #=> "/posts"
+#   uri.query     #=> "id=30&limit=5"
+#   uri.fragment  #=> "time=1305298413"
+#
+#   uri.to_s      #=> "http://foo.com/posts?id=30&limit=5#time=1305298413"
+#
+# == Adding custom URIs
+#
+#   module Bundler::URI
+#     class RSYNC < Generic
+#       DEFAULT_PORT = 873
+#     end
+#     @@schemes['RSYNC'] = RSYNC
+#   end
+#   #=> Bundler::URI::RSYNC
+#
+#   Bundler::URI.scheme_list
+#   #=> {"FILE"=>Bundler::URI::File, "FTP"=>Bundler::URI::FTP, "HTTP"=>Bundler::URI::HTTP,
+#   #    "HTTPS"=>Bundler::URI::HTTPS, "LDAP"=>Bundler::URI::LDAP, "LDAPS"=>Bundler::URI::LDAPS,
+#   #    "MAILTO"=>Bundler::URI::MailTo, "RSYNC"=>Bundler::URI::RSYNC}
+#
+#   uri = Bundler::URI("rsync://rsync.foo.com")
+#   #=> #<Bundler::URI::RSYNC rsync://rsync.foo.com>
+#
+# == RFC References
+#
+# A good place to view an RFC spec is http://www.ietf.org/rfc.html.
+#
+# Here is a list of all related RFC's:
+# - RFC822[http://tools.ietf.org/html/rfc822]
+# - RFC1738[http://tools.ietf.org/html/rfc1738]
+# - RFC2255[http://tools.ietf.org/html/rfc2255]
+# - RFC2368[http://tools.ietf.org/html/rfc2368]
+# - RFC2373[http://tools.ietf.org/html/rfc2373]
+# - RFC2396[http://tools.ietf.org/html/rfc2396]
+# - RFC2732[http://tools.ietf.org/html/rfc2732]
+# - RFC3986[http://tools.ietf.org/html/rfc3986]
+#
+# == Class tree
+#
+# - Bundler::URI::Generic (in uri/generic.rb)
+#   - Bundler::URI::File - (in uri/file.rb)
+#   - Bundler::URI::FTP - (in uri/ftp.rb)
+#   - Bundler::URI::HTTP - (in uri/http.rb)
+#     - Bundler::URI::HTTPS - (in uri/https.rb)
+#   - Bundler::URI::LDAP - (in uri/ldap.rb)
+#     - Bundler::URI::LDAPS - (in uri/ldaps.rb)
+#   - Bundler::URI::MailTo - (in uri/mailto.rb)
+# - Bundler::URI::Parser - (in uri/common.rb)
+# - Bundler::URI::REGEXP - (in uri/common.rb)
+#   - Bundler::URI::REGEXP::PATTERN - (in uri/common.rb)
+# - Bundler::URI::Util - (in uri/common.rb)
+# - Bundler::URI::Escape - (in uri/common.rb)
+# - Bundler::URI::Error - (in uri/common.rb)
+#   - Bundler::URI::InvalidURIError - (in uri/common.rb)
+#   - Bundler::URI::InvalidComponentError - (in uri/common.rb)
+#   - Bundler::URI::BadURIError - (in uri/common.rb)
+#
+# == Copyright Info
+#
+# Author:: Akira Yamada <akira@ruby-lang.org>
+# Documentation::
+#   Akira Yamada <akira@ruby-lang.org>
+#   Dmitry V. Sabanin <sdmitry@lrn.ru>
+#   Vincent Batts <vbatts@hashbangbash.com>
+# License::
+#  Copyright (c) 2001 akira yamada <akira@ruby-lang.org>
+#  You can redistribute it and/or modify it under the same term as Ruby.
+# Revision:: $Id$
+#
+
+module Bundler::URI
+end
+
+require_relative 'uri/version'
+require_relative 'uri/common'
+require_relative 'uri/generic'
+require_relative 'uri/file'
+require_relative 'uri/ftp'
+require_relative 'uri/http'
+require_relative 'uri/https'
+require_relative 'uri/ldap'
+require_relative 'uri/ldaps'
+require_relative 'uri/mailto'
diff --git a/lib/bundler/vendor/uri/lib/uri/common.rb b/lib/bundler/vendor/uri/lib/uri/common.rb
new file mode 100644
index 0000000000..cc1ab86c2f
--- /dev/null
+++ b/lib/bundler/vendor/uri/lib/uri/common.rb
@@ -0,0 +1,744 @@
+# frozen_string_literal: true
+#--
+# = uri/common.rb
+#
+# Author:: Akira Yamada <akira@ruby-lang.org>
+# Revision:: $Id$
+# License::
+#   You can redistribute it and/or modify it under the same term as Ruby.
+#
+# See Bundler::URI for general documentation
+#
+
+require_relative "rfc2396_parser"
+require_relative "rfc3986_parser"
+
+module Bundler::URI
+  REGEXP = RFC2396_REGEXP
+  Parser = RFC2396_Parser
+  RFC3986_PARSER = RFC3986_Parser.new
+
+  # Bundler::URI::Parser.new
+  DEFAULT_PARSER = Parser.new
+  DEFAULT_PARSER.pattern.each_pair do |sym, str|
+    unless REGEXP::PATTERN.const_defined?(sym)
+      REGEXP::PATTERN.const_set(sym, str)
+    end
+  end
+  DEFAULT_PARSER.regexp.each_pair do |sym, str|
+    const_set(sym, str)
+  end
+
+  module Util # :nodoc:
+    def make_components_hash(klass, array_hash)
+      tmp = {}
+      if array_hash.kind_of?(Array) &&
+          array_hash.size == klass.component.size - 1
+        klass.component[1..-1].each_index do |i|
+          begin
+            tmp[klass.component[i + 1]] = array_hash[i].clone
+          rescue TypeError
+            tmp[klass.component[i + 1]] = array_hash[i]
+          end
+        end
+
+      elsif array_hash.kind_of?(Hash)
+        array_hash.each do |key, value|
+          begin
+            tmp[key] = value.clone
+          rescue TypeError
+            tmp[key] = value
+          end
+        end
+      else
+        raise ArgumentError,
+          "expected Array of or Hash of components of #{klass} (#{klass.component[1..-1].join(', ')})"
+      end
+      tmp[:scheme] = klass.to_s.sub(/\A.*::/, '').downcase
+
+      return tmp
+    end
+    module_function :make_components_hash
+  end
+
+  # Module for escaping unsafe characters with codes.
+  module Escape
+    #
+    # == Synopsis
+    #
+    #   Bundler::URI.escape(str [, unsafe])
+    #
+    # == Args
+    #
+    # +str+::
+    #   String to replaces in.
+    # +unsafe+::
+    #   Regexp that matches all symbols that must be replaced with codes.
+    #   By default uses <tt>UNSAFE</tt>.
+    #   When this argument is a String, it represents a character set.
+    #
+    # == Description
+    #
+    # Escapes the string, replacing all unsafe characters with codes.
+    #
+    # This method is obsolete and should not be used. Instead, use
+    # CGI.escape, Bundler::URI.encode_www_form or Bundler::URI.encode_www_form_component
+    # depending on your specific use case.
+    #
+    # == Usage
+    #
+    #   require 'bundler/vendor/uri/lib/uri'
+    #
+    #   enc_uri = Bundler::URI.escape("http://example.com/?a=\11\15")
+    #   # => "http://example.com/?a=%09%0D"
+    #
+    #   Bundler::URI.unescape(enc_uri)
+    #   # => "http://example.com/?a=\t\r"
+    #
+    #   Bundler::URI.escape("@?@!", "!?")
+    #   # => "@%3F@%21"
+    #
+    def escape(*arg)
+      warn "Bundler::URI.escape is obsolete", uplevel: 1
+      DEFAULT_PARSER.escape(*arg)
+    end
+    alias encode escape
+    #
+    # == Synopsis
+    #
+    #   Bundler::URI.unescape(str)
+    #
+    # == Args
+    #
+    # +str+::
+    #   String to unescape.
+    #
+    # == Description
+    #
+    # This method is obsolete and should not be used. Instead, use
+    # CGI.unescape, Bundler::URI.decode_www_form or Bundler::URI.decode_www_form_component
+    # depending on your specific use case.
+    #
+    # == Usage
+    #
+    #   require 'bundler/vendor/uri/lib/uri'
+    #
+    #   enc_uri = Bundler::URI.escape("http://example.com/?a=\11\15")
+    #   # => "http://example.com/?a=%09%0D"
+    #
+    #   Bundler::URI.unescape(enc_uri)
+    #   # => "http://example.com/?a=\t\r"
+    #
+    def unescape(*arg)
+      warn "Bundler::URI.unescape is obsolete", uplevel: 1
+      DEFAULT_PARSER.unescape(*arg)
+    end
+    alias decode unescape
+  end # module Escape
+
+  extend Escape
+  include REGEXP
+
+  @@schemes = {}
+  # Returns a Hash of the defined schemes.
+  def self.scheme_list
+    @@schemes
+  end
+
+  #
+  # Base class for all Bundler::URI exceptions.
+  #
+  class Error < StandardError; end
+  #
+  # Not a Bundler::URI.
+  #
+  class InvalidURIError < Error; end
+  #
+  # Not a Bundler::URI component.
+  #
+  class InvalidComponentError < Error; end
+  #
+  # Bundler::URI is valid, bad usage is not.
+  #
+  class BadURIError < Error; end
+
+  #
+  # == Synopsis
+  #
+  #   Bundler::URI::split(uri)
+  #
+  # == Args
+  #
+  # +uri+::
+  #   String with Bundler::URI.
+  #
+  # == Description
+  #
+  # Splits the string on following parts and returns array with result:
+  #
+  # * Scheme
+  # * Userinfo
+  # * Host
+  # * Port
+  # * Registry
+  # * Path
+  # * Opaque
+  # * Query
+  # * Fragment
+  #
+  # == Usage
+  #
+  #   require 'bundler/vendor/uri/lib/uri'
+  #
+  #   Bundler::URI.split("http://www.ruby-lang.org/")
+  #   # => ["http", nil, "www.ruby-lang.org", nil, nil, "/", nil, nil, nil]
+  #
+  def self.split(uri)
+    RFC3986_PARSER.split(uri)
+  end
+
+  #
+  # == Synopsis
+  #
+  #   Bundler::URI::parse(uri_str)
+  #
+  # == Args
+  #
+  # +uri_str+::
+  #   String with Bundler::URI.
+  #
+  # == Description
+  #
+  # Creates one of the Bundler::URI's subclasses instance from the string.
+  #
+  # == Raises
+  #
+  # Bundler::URI::InvalidURIError::
+  #   Raised if Bundler::URI given is not a correct one.
+  #
+  # == Usage
+  #
+  #   require 'bundler/vendor/uri/lib/uri'
+  #
+  #   uri = Bundler::URI.parse("http://www.ruby-lang.org/")
+  #   # => #<Bundler::URI::HTTP http://www.ruby-lang.org/>
+  #   uri.scheme
+  #   # => "http"
+  #   uri.host
+  #   # => "www.ruby-lang.org"
+  #
+  # It's recommended to first ::escape the provided +uri_str+ if there are any
+  # invalid Bundler::URI characters.
+  #
+  def self.parse(uri)
+    RFC3986_PARSER.parse(uri)
+  end
+
+  #
+  # == Synopsis
+  #
+  #   Bundler::URI::join(str[, str, ...])
+  #
+  # == Args
+  #
+  # +str+::
+  #   String(s) to work with, will be converted to RFC3986 URIs before merging.
+  #
+  # == Description
+  #
+  # Joins URIs.
+  #
+  # == Usage
+  #
+  #   require 'bundler/vendor/uri/lib/uri'
+  #
+  #   Bundler::URI.join("http://example.com/","main.rbx")
+  #   # => #<Bundler::URI::HTTP http://example.com/main.rbx>
+  #
+  #   Bundler::URI.join('http://example.com', 'foo')
+  #   # => #<Bundler::URI::HTTP http://example.com/foo>
+  #
+  #   Bundler::URI.join('http://example.com', '/foo', '/bar')
+  #   # => #<Bundler::URI::HTTP http://example.com/bar>
+  #
+  #   Bundler::URI.join('http://example.com', '/foo', 'bar')
+  #   # => #<Bundler::URI::HTTP http://example.com/bar>
+  #
+  #   Bundler::URI.join('http://example.com', '/foo/', 'bar')
+  #   # => #<Bundler::URI::HTTP http://example.com/foo/bar>
+  #
+  def self.join(*str)
+    RFC3986_PARSER.join(*str)
+  end
+
+  #
+  # == Synopsis
+  #
+  #   Bundler::URI::extract(str[, schemes][,&blk])
+  #
+  # == Args
+  #
+  # +str+::
+  #   String to extract URIs from.
+  # +schemes+::
+  #   Limit Bundler::URI matching to specific schemes.
+  #
+  # == Description
+  #
+  # Extracts URIs from a string. If block given, iterates through all matched URIs.
+  # Returns nil if block given or array with matches.
+  #
+  # == Usage
+  #
+  #   require "bundler/vendor/uri/lib/uri"
+  #
+  #   Bundler::URI.extract("text here http://foo.example.org/bla and here mailto:test@example.com and here also.")
+  #   # => ["http://foo.example.com/bla", "mailto:test@example.com"]
+  #
+  def self.extract(str, schemes = nil, &block)
+    warn "Bundler::URI.extract is obsolete", uplevel: 1 if $VERBOSE
+    DEFAULT_PARSER.extract(str, schemes, &block)
+  end
+
+  #
+  # == Synopsis
+  #
+  #   Bundler::URI::regexp([match_schemes])
+  #
+  # == Args
+  #
+  # +match_schemes+::
+  #   Array of schemes. If given, resulting regexp matches to URIs
+  #   whose scheme is one of the match_schemes.
+  #
+  # == Description
+  #
+  # Returns a Regexp object which matches to Bundler::URI-like strings.
+  # The Regexp object returned by this method includes arbitrary
+  # number of capture group (parentheses).  Never rely on it's number.
+  #
+  # == Usage
+  #
+  #   require 'bundler/vendor/uri/lib/uri'
+  #
+  #   # extract first Bundler::URI from html_string
+  #   html_string.slice(Bundler::URI.regexp)
+  #
+  #   # remove ftp URIs
+  #   html_string.sub(Bundler::URI.regexp(['ftp']), '')
+  #
+  #   # You should not rely on the number of parentheses
+  #   html_string.scan(Bundler::URI.regexp) do |*matches|
+  #     p $&
+  #   end
+  #
+  def self.regexp(schemes = nil)
+    warn "Bundler::URI.regexp is obsolete", uplevel: 1 if $VERBOSE
+    DEFAULT_PARSER.make_regexp(schemes)
+  end
+
+  TBLENCWWWCOMP_ = {} # :nodoc:
+  256.times do |i|
+    TBLENCWWWCOMP_[-i.chr] = -('%%%02X' % i)
+  end
+  TBLENCWWWCOMP_[' '] = '+'
+  TBLENCWWWCOMP_.freeze
+  TBLDECWWWCOMP_ = {} # :nodoc:
+  256.times do |i|
+    h, l = i>>4, i&15
+    TBLDECWWWCOMP_[-('%%%X%X' % [h, l])] = -i.chr
+    TBLDECWWWCOMP_[-('%%%x%X' % [h, l])] = -i.chr
+    TBLDECWWWCOMP_[-('%%%X%x' % [h, l])] = -i.chr
+    TBLDECWWWCOMP_[-('%%%x%x' % [h, l])] = -i.chr
+  end
+  TBLDECWWWCOMP_['+'] = ' '
+  TBLDECWWWCOMP_.freeze
+
+  # Encodes given +str+ to URL-encoded form data.
+  #
+  # This method doesn't convert *, -, ., 0-9, A-Z, _, a-z, but does convert SP
+  # (ASCII space) to + and converts others to %XX.
+  #
+  # If +enc+ is given, convert +str+ to the encoding before percent encoding.
+  #
+  # This is an implementation of
+  # http://www.w3.org/TR/2013/CR-html5-20130806/forms.html#url-encoded-form-data.
+  #
+  # See Bundler::URI.decode_www_form_component, Bundler::URI.encode_www_form.
+  def self.encode_www_form_component(str, enc=nil)
+    str = str.to_s.dup
+    if str.encoding != Encoding::ASCII_8BIT
+      if enc && enc != Encoding::ASCII_8BIT
+        str.encode!(Encoding::UTF_8, invalid: :replace, undef: :replace)
+        str.encode!(enc, fallback: ->(x){"&##{x.ord};"})
+      end
+      str.force_encoding(Encoding::ASCII_8BIT)
+    end
+    str.gsub!(/[^*\-.0-9A-Z_a-z]/, TBLENCWWWCOMP_)
+    str.force_encoding(Encoding::US_ASCII)
+  end
+
+  # Decodes given +str+ of URL-encoded form data.
+  #
+  # This decodes + to SP.
+  #
+  # See Bundler::URI.encode_www_form_component, Bundler::URI.decode_www_form.
+  def self.decode_www_form_component(str, enc=Encoding::UTF_8)
+    raise ArgumentError, "invalid %-encoding (#{str})" if /%(?!\h\h)/ =~ str
+    str.b.gsub(/\+|%\h\h/, TBLDECWWWCOMP_).force_encoding(enc)
+  end
+
+  # Generates URL-encoded form data from given +enum+.
+  #
+  # This generates application/x-www-form-urlencoded data defined in HTML5
+  # from given an Enumerable object.
+  #
+  # This internally uses Bundler::URI.encode_www_form_component(str).
+  #
+  # This method doesn't convert the encoding of given items, so convert them
+  # before calling this method if you want to send data as other than original
+  # encoding or mixed encoding data. (Strings which are encoded in an HTML5
+  # ASCII incompatible encoding are converted to UTF-8.)
+  #
+  # This method doesn't handle files.  When you send a file, use
+  # multipart/form-data.
+  #
+  # This refers http://url.spec.whatwg.org/#concept-urlencoded-serializer
+  #
+  #    Bundler::URI.encode_www_form([["q", "ruby"], ["lang", "en"]])
+  #    #=> "q=ruby&lang=en"
+  #    Bundler::URI.encode_www_form("q" => "ruby", "lang" => "en")
+  #    #=> "q=ruby&lang=en"
+  #    Bundler::URI.encode_www_form("q" => ["ruby", "perl"], "lang" => "en")
+  #    #=> "q=ruby&q=perl&lang=en"
+  #    Bundler::URI.encode_www_form([["q", "ruby"], ["q", "perl"], ["lang", "en"]])
+  #    #=> "q=ruby&q=perl&lang=en"
+  #
+  # See Bundler::URI.encode_www_form_component, Bundler::URI.decode_www_form.
+  def self.encode_www_form(enum, enc=nil)
+    enum.map do |k,v|
+      if v.nil?
+        encode_www_form_component(k, enc)
+      elsif v.respond_to?(:to_ary)
+        v.to_ary.map do |w|
+          str = encode_www_form_component(k, enc)
+          unless w.nil?
+            str << '='
+            str << encode_www_form_component(w, enc)
+          end
+        end.join('&')
+      else
+        str = encode_www_form_component(k, enc)
+        str << '='
+        str << encode_www_form_component(v, enc)
+      end
+    end.join('&')
+  end
+
+  # Decodes URL-encoded form data from given +str+.
+  #
+  # This decodes application/x-www-form-urlencoded data
+  # and returns an array of key-value arrays.
+  #
+  # This refers http://url.spec.whatwg.org/#concept-urlencoded-parser,
+  # so this supports only &-separator, and doesn't support ;-separator.
+  #
+  #    ary = Bundler::URI.decode_www_form("a=1&a=2&b=3")
+  #    ary                   #=> [['a', '1'], ['a', '2'], ['b', '3']]
+  #    ary.assoc('a').last   #=> '1'
+  #    ary.assoc('b').last   #=> '3'
+  #    ary.rassoc('a').last  #=> '2'
+  #    Hash[ary]             #=> {"a"=>"2", "b"=>"3"}
+  #
+  # See Bundler::URI.decode_www_form_component, Bundler::URI.encode_www_form.
+  def self.decode_www_form(str, enc=Encoding::UTF_8, separator: '&', use__charset_: false, isindex: false)
+    raise ArgumentError, "the input of #{self.name}.#{__method__} must be ASCII only string" unless str.ascii_only?
+    ary = []
+    return ary if str.empty?
+    enc = Encoding.find(enc)
+    str.b.each_line(separator) do |string|
+      string.chomp!(separator)
+      key, sep, val = string.partition('=')
+      if isindex
+        if sep.empty?
+          val = key
+          key = +''
+        end
+        isindex = false
+      end
+
+      if use__charset_ and key == '_charset_' and e = get_encoding(val)
+        enc = e
+        use__charset_ = false
+      end
+
+      key.gsub!(/\+|%\h\h/, TBLDECWWWCOMP_)
+      if val
+        val.gsub!(/\+|%\h\h/, TBLDECWWWCOMP_)
+      else
+        val = +''
+      end
+
+      ary << [key, val]
+    end
+    ary.each do |k, v|
+      k.force_encoding(enc)
+      k.scrub!
+      v.force_encoding(enc)
+      v.scrub!
+    end
+    ary
+  end
+
+  private
+=begin command for WEB_ENCODINGS_
+  curl https://encoding.spec.whatwg.org/encodings.json|
+  ruby -rjson -e 'H={}
+  h={
+    "shift_jis"=>"Windows-31J",
+    "euc-jp"=>"cp51932",
+    "iso-2022-jp"=>"cp50221",
+    "x-mac-cyrillic"=>"macCyrillic",
+  }
+  JSON($<.read).map{|x|x["encodings"]}.flatten.each{|x|
+    Encoding.find(n=h.fetch(n=x["name"].downcase,n))rescue next
+    x["labels"].each{|y|H[y]=n}
+  }
+  puts "{"
+  H.each{|k,v|puts %[  #{k.dump}=>#{v.dump},]}
+  puts "}"
+'
+=end
+  WEB_ENCODINGS_ = {
+    "unicode-1-1-utf-8"=>"utf-8",
+    "utf-8"=>"utf-8",
+    "utf8"=>"utf-8",
+    "866"=>"ibm866",
+    "cp866"=>"ibm866",
+    "csibm866"=>"ibm866",
+    "ibm866"=>"ibm866",
+    "csisolatin2"=>"iso-8859-2",
+    "iso-8859-2"=>"iso-8859-2",
+    "iso-ir-101"=>"iso-8859-2",
+    "iso8859-2"=>"iso-8859-2",
+    "iso88592"=>"iso-8859-2",
+    "iso_8859-2"=>"iso-8859-2",
+    "iso_8859-2:1987"=>"iso-8859-2",
+    "l2"=>"iso-8859-2",
+    "latin2"=>"iso-8859-2",
+    "csisolatin3"=>"iso-8859-3",
+    "iso-8859-3"=>"iso-8859-3",
+    "iso-ir-109"=>"iso-8859-3",
+    "iso8859-3"=>"iso-8859-3",
+    "iso88593"=>"iso-8859-3",
+    "iso_8859-3"=>"iso-8859-3",
+    "iso_8859-3:1988"=>"iso-8859-3",
+    "l3"=>"iso-8859-3",
+    "latin3"=>"iso-8859-3",
+    "csisolatin4"=>"iso-8859-4",
+    "iso-8859-4"=>"iso-8859-4",
+    "iso-ir-110"=>"iso-8859-4",
+    "iso8859-4"=>"iso-8859-4",
+    "iso88594"=>"iso-8859-4",
+    "iso_8859-4"=>"iso-8859-4",
+    "iso_8859-4:1988"=>"iso-8859-4",
+    "l4"=>"iso-8859-4",
+    "latin4"=>"iso-8859-4",
+    "csisolatincyrillic"=>"iso-8859-5",
+    "cyrillic"=>"iso-8859-5",
+    "iso-8859-5"=>"iso-8859-5",
+    "iso-ir-144"=>"iso-8859-5",
+    "iso8859-5"=>"iso-8859-5",
+    "iso88595"=>"iso-8859-5",
+    "iso_8859-5"=>"iso-8859-5",
+    "iso_8859-5:1988"=>"iso-8859-5",
+    "arabic"=>"iso-8859-6",
+    "asmo-708"=>"iso-8859-6",
+    "csiso88596e"=>"iso-8859-6",
+    "csiso88596i"=>"iso-8859-6",
+    "csisolatinarabic"=>"iso-8859-6",
+    "ecma-114"=>"iso-8859-6",
+    "iso-8859-6"=>"iso-8859-6",
+    "iso-8859-6-e"=>"iso-8859-6",
+    "iso-8859-6-i"=>"iso-8859-6",
+    "iso-ir-127"=>"iso-8859-6",
+    "iso8859-6"=>"iso-8859-6",
+    "iso88596"=>"iso-8859-6",
+    "iso_8859-6"=>"iso-8859-6",
+    "iso_8859-6:1987"=>"iso-8859-6",
+    "csisolatingreek"=>"iso-8859-7",
+    "ecma-118"=>"iso-8859-7",
+    "elot_928"=>"iso-8859-7",
+    "greek"=>"iso-8859-7",
+    "greek8"=>"iso-8859-7",
+    "iso-8859-7"=>"iso-8859-7",
+    "iso-ir-126"=>"iso-8859-7",
+    "iso8859-7"=>"iso-8859-7",
+    "iso88597"=>"iso-8859-7",
+    "iso_8859-7"=>"iso-8859-7",
+    "iso_8859-7:1987"=>"iso-8859-7",
+    "sun_eu_greek"=>"iso-8859-7",
+    "csiso88598e"=>"iso-8859-8",
+    "csisolatinhebrew"=>"iso-8859-8",
+    "hebrew"=>"iso-8859-8",
+    "iso-8859-8"=>"iso-8859-8",
+    "iso-8859-8-e"=>"iso-8859-8",
+    "iso-ir-138"=>"iso-8859-8",
+    "iso8859-8"=>"iso-8859-8",
+    "iso88598"=>"iso-8859-8",
+    "iso_8859-8"=>"iso-8859-8",
+    "iso_8859-8:1988"=>"iso-8859-8",
+    "visual"=>"iso-8859-8",
+    "csisolatin6"=>"iso-8859-10",
+    "iso-8859-10"=>"iso-8859-10",
+    "iso-ir-157"=>"iso-8859-10",
+    "iso8859-10"=>"iso-8859-10",
+    "iso885910"=>"iso-8859-10",
+    "l6"=>"iso-8859-10",
+    "latin6"=>"iso-8859-10",
+    "iso-8859-13"=>"iso-8859-13",
+    "iso8859-13"=>"iso-8859-13",
+    "iso885913"=>"iso-8859-13",
+    "iso-8859-14"=>"iso-8859-14",
+    "iso8859-14"=>"iso-8859-14",
+    "iso885914"=>"iso-8859-14",
+    "csisolatin9"=>"iso-8859-15",
+    "iso-8859-15"=>"iso-8859-15",
+    "iso8859-15"=>"iso-8859-15",
+    "iso885915"=>"iso-8859-15",
+    "iso_8859-15"=>"iso-8859-15",
+    "l9"=>"iso-8859-15",
+    "iso-8859-16"=>"iso-8859-16",
+    "cskoi8r"=>"koi8-r",
+    "koi"=>"koi8-r",
+    "koi8"=>"koi8-r",
+    "koi8-r"=>"koi8-r",
+    "koi8_r"=>"koi8-r",
+    "koi8-ru"=>"koi8-u",
+    "koi8-u"=>"koi8-u",
+    "dos-874"=>"windows-874",
+    "iso-8859-11"=>"windows-874",
+    "iso8859-11"=>"windows-874",
+    "iso885911"=>"windows-874",
+    "tis-620"=>"windows-874",
+    "windows-874"=>"windows-874",
+    "cp1250"=>"windows-1250",
+    "windows-1250"=>"windows-1250",
+    "x-cp1250"=>"windows-1250",
+    "cp1251"=>"windows-1251",
+    "windows-1251"=>"windows-1251",
+    "x-cp1251"=>"windows-1251",
+    "ansi_x3.4-1968"=>"windows-1252",
+    "ascii"=>"windows-1252",
+    "cp1252"=>"windows-1252",
+    "cp819"=>"windows-1252",
+    "csisolatin1"=>"windows-1252",
+    "ibm819"=>"windows-1252",
+    "iso-8859-1"=>"windows-1252",
+    "iso-ir-100"=>"windows-1252",
+    "iso8859-1"=>"windows-1252",
+    "iso88591"=>"windows-1252",
+    "iso_8859-1"=>"windows-1252",
+    "iso_8859-1:1987"=>"windows-1252",
+    "l1"=>"windows-1252",
+    "latin1"=>"windows-1252",
+    "us-ascii"=>"windows-1252",
+    "windows-1252"=>"windows-1252",
+    "x-cp1252"=>"windows-1252",
+    "cp1253"=>"windows-1253",
+    "windows-1253"=>"windows-1253",
+    "x-cp1253"=>"windows-1253",
+    "cp1254"=>"windows-1254",
+    "csisolatin5"=>"windows-1254",
+    "iso-8859-9"=>"windows-1254",
+    "iso-ir-148"=>"windows-1254",
+    "iso8859-9"=>"windows-1254",
+    "iso88599"=>"windows-1254",
+    "iso_8859-9"=>"windows-1254",
+    "iso_8859-9:1989"=>"windows-1254",
+    "l5"=>"windows-1254",
+    "latin5"=>"windows-1254",
+    "windows-1254"=>"windows-1254",
+    "x-cp1254"=>"windows-1254",
+    "cp1255"=>"windows-1255",
+    "windows-1255"=>"windows-1255",
+    "x-cp1255"=>"windows-1255",
+    "cp1256"=>"windows-1256",
+    "windows-1256"=>"windows-1256",
+    "x-cp1256"=>"windows-1256",
+    "cp1257"=>"windows-1257",
+    "windows-1257"=>"windows-1257",
+    "x-cp1257"=>"windows-1257",
+    "cp1258"=>"windows-1258",
+    "windows-1258"=>"windows-1258",
+    "x-cp1258"=>"windows-1258",
+    "x-mac-cyrillic"=>"macCyrillic",
+    "x-mac-ukrainian"=>"macCyrillic",
+    "chinese"=>"gbk",
+    "csgb2312"=>"gbk",
+    "csiso58gb231280"=>"gbk",
+    "gb2312"=>"gbk",
+    "gb_2312"=>"gbk",
+    "gb_2312-80"=>"gbk",
+    "gbk"=>"gbk",
+    "iso-ir-58"=>"gbk",
+    "x-gbk"=>"gbk",
+    "gb18030"=>"gb18030",
+    "big5"=>"big5",
+    "big5-hkscs"=>"big5",
+    "cn-big5"=>"big5",
+    "csbig5"=>"big5",
+    "x-x-big5"=>"big5",
+    "cseucpkdfmtjapanese"=>"cp51932",
+    "euc-jp"=>"cp51932",
+    "x-euc-jp"=>"cp51932",
+    "csiso2022jp"=>"cp50221",
+    "iso-2022-jp"=>"cp50221",
+    "csshiftjis"=>"Windows-31J",
+    "ms932"=>"Windows-31J",
+    "ms_kanji"=>"Windows-31J",
+    "shift-jis"=>"Windows-31J",
+    "shift_jis"=>"Windows-31J",
+    "sjis"=>"Windows-31J",
+    "windows-31j"=>"Windows-31J",
+    "x-sjis"=>"Windows-31J",
+    "cseuckr"=>"euc-kr",
+    "csksc56011987"=>"euc-kr",
+    "euc-kr"=>"euc-kr",
+    "iso-ir-149"=>"euc-kr",
+    "korean"=>"euc-kr",
+    "ks_c_5601-1987"=>"euc-kr",
+    "ks_c_5601-1989"=>"euc-kr",
+    "ksc5601"=>"euc-kr",
+    "ksc_5601"=>"euc-kr",
+    "windows-949"=>"euc-kr",
+    "utf-16be"=>"utf-16be",
+    "utf-16"=>"utf-16le",
+    "utf-16le"=>"utf-16le",
+  } # :nodoc:
+
+  # :nodoc:
+  # return encoding or nil
+  # http://encoding.spec.whatwg.org/#concept-encoding-get
+  def self.get_encoding(label)
+    Encoding.find(WEB_ENCODINGS_[label.to_str.strip.downcase]) rescue nil
+  end
+end # module Bundler::URI
+
+module Bundler
+
+  #
+  # Returns +uri+ converted to an Bundler::URI object.
+  #
+  def URI(uri)
+    if uri.is_a?(Bundler::URI::Generic)
+      uri
+    elsif uri = String.try_convert(uri)
+      Bundler::URI.parse(uri)
+    else
+      raise ArgumentError,
+        "bad argument (expected Bundler::URI object or Bundler::URI string)"
+    end
+  end
+  module_function :URI
+end
diff --git a/lib/bundler/vendor/uri/lib/uri/file.rb b/lib/bundler/vendor/uri/lib/uri/file.rb
new file mode 100644
index 0000000000..df42f8bcdd
--- /dev/null
+++ b/lib/bundler/vendor/uri/lib/uri/file.rb
@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+
+require_relative 'generic'
+
+module Bundler::URI
+
+  #
+  # The "file" Bundler::URI is defined by RFC8089.
+  #
+  class File < Generic
+    # A Default port of nil for Bundler::URI::File.
+    DEFAULT_PORT = nil
+
+    #
+    # An Array of the available components for Bundler::URI::File.
+    #
+    COMPONENT = [
+      :scheme,
+      :host,
+      :path
+    ].freeze
+
+    #
+    # == Description
+    #
+    # Creates a new Bundler::URI::File object from components, with syntax checking.
+    #
+    # The components accepted are +host+ and +path+.
+    #
+    # The components should be provided either as an Array, or as a Hash
+    # with keys formed by preceding the component names with a colon.
+    #
+    # If an Array is used, the components must be passed in the
+    # order <code>[host, path]</code>.
+    #
+    # Examples:
+    #
+    #     require 'bundler/vendor/uri/lib/uri'
+    #
+    #     uri1 = Bundler::URI::File.build(['host.example.com', '/path/file.zip'])
+    #     uri1.to_s  # => "file://host.example.com/path/file.zip"
+    #
+    #     uri2 = Bundler::URI::File.build({:host => 'host.example.com',
+    #       :path => '/ruby/src'})
+    #     uri2.to_s  # => "file://host.example.com/ruby/src"
+    #
+    def self.build(args)
+      tmp = Util::make_components_hash(self, args)
+      super(tmp)
+    end
+
+    # Protected setter for the host component +v+.
+    #
+    # See also Bundler::URI::Generic.host=.
+    #
+    def set_host(v)
+      v = "" if v.nil? || v == "localhost"
+      @host = v
+    end
+
+    # do nothing
+    def set_port(v)
+    end
+
+    # raise InvalidURIError
+    def check_userinfo(user)
+      raise Bundler::URI::InvalidURIError, "can not set userinfo for file Bundler::URI"
+    end
+
+    # raise InvalidURIError
+    def check_user(user)
+      raise Bundler::URI::InvalidURIError, "can not set user for file Bundler::URI"
+    end
+
+    # raise InvalidURIError
+    def check_password(user)
+      raise Bundler::URI::InvalidURIError, "can not set password for file Bundler::URI"
+    end
+
+    # do nothing
+    def set_userinfo(v)
+    end
+
+    # do nothing
+    def set_user(v)
+    end
+
+    # do nothing
+    def set_password(v)
+    end
+  end
+
+  @@schemes['FILE'] = File
+end
diff --git a/lib/bundler/vendor/uri/lib/uri/ftp.rb b/lib/bundler/vendor/uri/lib/uri/ftp.rb
new file mode 100644
index 0000000000..ad39f57d7b
--- /dev/null
+++ b/lib/bundler/vendor/uri/lib/uri/ftp.rb
@@ -0,0 +1,267 @@
+# frozen_string_literal: false
+# = uri/ftp.rb
+#
+# Author:: Akira Yamada <akira@ruby-lang.org>
+# License:: You can redistribute it and/or modify it under the same term as Ruby.
+# Revision:: $Id$
+#
+# See Bundler::URI for general documentation
+#
+
+require_relative 'generic'
+
+module Bundler::URI
+
+  #
+  # FTP Bundler::URI syntax is defined by RFC1738 section 3.2.
+  #
+  # This class will be redesigned because of difference of implementations;
+  # the structure of its path. draft-hoffman-ftp-uri-04 is a draft but it
+  # is a good summary about the de facto spec.
+  # http://tools.ietf.org/html/draft-hoffman-ftp-uri-04
+  #
+  class FTP < Generic
+    # A Default port of 21 for Bundler::URI::FTP.
+    DEFAULT_PORT = 21
+
+    #
+    # An Array of the available components for Bundler::URI::FTP.
+    #
+    COMPONENT = [
+      :scheme,
+      :userinfo, :host, :port,
+      :path, :typecode
+    ].freeze
+
+    #
+    # Typecode is "a", "i", or "d".
+    #
+    # * "a" indicates a text file (the FTP command was ASCII)
+    # * "i" indicates a binary file (FTP command IMAGE)
+    # * "d" indicates the contents of a directory should be displayed
+    #
+    TYPECODE = ['a', 'i', 'd'].freeze
+
+    # Typecode prefix ";type=".
+    TYPECODE_PREFIX = ';type='.freeze
+
+    def self.new2(user, password, host, port, path,
+                  typecode = nil, arg_check = true) # :nodoc:
+      # Do not use this method!  Not tested.  [Bug #7301]
+      # This methods remains just for compatibility,
+      # Keep it undocumented until the active maintainer is assigned.
+      typecode = nil if typecode.size == 0
+      if typecode && !TYPECODE.include?(typecode)
+        raise ArgumentError,
+          "bad typecode is specified: #{typecode}"
+      end
+
+      # do escape
+
+      self.new('ftp',
+               [user, password],
+               host, port, nil,
+               typecode ? path + TYPECODE_PREFIX + typecode : path,
+               nil, nil, nil, arg_check)
+    end
+
+    #
+    # == Description
+    #
+    # Creates a new Bundler::URI::FTP object from components, with syntax checking.
+    #
+    # The components accepted are +userinfo+, +host+, +port+, +path+, and
+    # +typecode+.
+    #
+    # The components should be provided either as an Array, or as a Hash
+    # with keys formed by preceding the component names with a colon.
+    #
+    # If an Array is used, the components must be passed in the
+    # order <code>[userinfo, host, port, path, typecode]</code>.
+    #
+    # If the path supplied is absolute, it will be escaped in order to
+    # make it absolute in the Bundler::URI.
+    #
+    # Examples:
+    #
+    #     require 'bundler/vendor/uri/lib/uri'
+    #
+    #     uri1 = Bundler::URI::FTP.build(['user:password', 'ftp.example.com', nil,
+    #       '/path/file.zip', 'i'])
+    #     uri1.to_s  # => "ftp://user:password@ftp.example.com/%2Fpath/file.zip;type=i"
+    #
+    #     uri2 = Bundler::URI::FTP.build({:host => 'ftp.example.com',
+    #       :path => 'ruby/src'})
+    #     uri2.to_s  # => "ftp://ftp.example.com/ruby/src"
+    #
+    def self.build(args)
+
+      # Fix the incoming path to be generic URL syntax
+      # FTP path  ->  URL path
+      # foo/bar       /foo/bar
+      # /foo/bar      /%2Ffoo/bar
+      #
+      if args.kind_of?(Array)
+        args[3] = '/' + args[3].sub(/^\//, '%2F')
+      else
+        args[:path] = '/' + args[:path].sub(/^\//, '%2F')
+      end
+
+      tmp = Util::make_components_hash(self, args)
+
+      if tmp[:typecode]
+        if tmp[:typecode].size == 1
+          tmp[:typecode] = TYPECODE_PREFIX + tmp[:typecode]
+        end
+        tmp[:path] << tmp[:typecode]
+      end
+
+      return super(tmp)
+    end
+
+    #
+    # == Description
+    #
+    # Creates a new Bundler::URI::FTP object from generic URL components with no
+    # syntax checking.
+    #
+    # Unlike build(), this method does not escape the path component as
+    # required by RFC1738; instead it is treated as per RFC2396.
+    #
+    # Arguments are +scheme+, +userinfo+, +host+, +port+, +registry+, +path+,
+    # +opaque+, +query+, and +fragment+, in that order.
+    #
+    def initialize(scheme,
+                   userinfo, host, port, registry,
+                   path, opaque,
+                   query,
+                   fragment,
+                   parser = nil,
+                   arg_check = false)
+      raise InvalidURIError unless path
+      path = path.sub(/^\//,'')
+      path.sub!(/^%2F/,'/')
+      super(scheme, userinfo, host, port, registry, path, opaque,
+            query, fragment, parser, arg_check)
+      @typecode = nil
+      if tmp = @path.index(TYPECODE_PREFIX)
+        typecode = @path[tmp + TYPECODE_PREFIX.size..-1]
+        @path = @path[0..tmp - 1]
+
+        if arg_check
+          self.typecode = typecode
+        else
+          self.set_typecode(typecode)
+        end
+      end
+    end
+
+    # typecode accessor.
+    #
+    # See Bundler::URI::FTP::COMPONENT.
+    attr_reader :typecode
+
+    # Validates typecode +v+,
+    # returns +true+ or +false+.
+    #
+    def check_typecode(v)
+      if TYPECODE.include?(v)
+        return true
+      else
+        raise InvalidComponentError,
+          "bad typecode(expected #{TYPECODE.join(', ')}): #{v}"
+      end
+    end
+    private :check_typecode
+
+    # Private setter for the typecode +v+.
+    #
+    # See also Bundler::URI::FTP.typecode=.
+    #
+    def set_typecode(v)
+      @typecode = v
+    end
+    protected :set_typecode
+
+    #
+    # == Args
+    #
+    # +v+::
+    #    String
+    #
+    # == Description
+    #
+    # Public setter for the typecode +v+
+    # (with validation).
+    #
+    # See also Bundler::URI::FTP.check_typecode.
+    #
+    # == Usage
+    #
+    #   require 'bundler/vendor/uri/lib/uri'
+    #
+    #   uri = Bundler::URI.parse("ftp://john@ftp.example.com/my_file.img")
+    #   #=> #<Bundler::URI::FTP ftp://john@ftp.example.com/my_file.img>
+    #   uri.typecode = "i"
+    #   uri
+    #   #=> #<Bundler::URI::FTP ftp://john@ftp.example.com/my_file.img;type=i>
+    #
+    def typecode=(typecode)
+      check_typecode(typecode)
+      set_typecode(typecode)
+      typecode
+    end
+
+    def merge(oth) # :nodoc:
+      tmp = super(oth)
+      if self != tmp
+        tmp.set_typecode(oth.typecode)
+      end
+
+      return tmp
+    end
+
+    # Returns the path from an FTP Bundler::URI.
+    #
+    # RFC 1738 specifically states that the path for an FTP Bundler::URI does not
+    # include the / which separates the Bundler::URI path from the Bundler::URI host. Example:
+    #
+    # <code>ftp://ftp.example.com/pub/ruby</code>
+    #
+    # The above Bundler::URI indicates that the client should connect to
+    # ftp.example.com then cd to pub/ruby from the initial login directory.
+    #
+    # If you want to cd to an absolute directory, you must include an
+    # escaped / (%2F) in the path. Example:
+    #
+    # <code>ftp://ftp.example.com/%2Fpub/ruby</code>
+    #
+    # This method will then return "/pub/ruby".
+    #
+    def path
+      return @path.sub(/^\//,'').sub(/^%2F/,'/')
+    end
+
+    # Private setter for the path of the Bundler::URI::FTP.
+    def set_path(v)
+      super("/" + v.sub(/^\//, "%2F"))
+    end
+    protected :set_path
+
+    # Returns a String representation of the Bundler::URI::FTP.
+    def to_s
+      save_path = nil
+      if @typecode
+        save_path = @path
+        @path = @path + TYPECODE_PREFIX + @typecode
+      end
+      str = super
+      if @typecode
+        @path = save_path
+      end
+
+      return str
+    end
+  end
+  @@schemes['FTP'] = FTP
+end
diff --git a/lib/bundler/vendor/uri/lib/uri/generic.rb b/lib/bundler/vendor/uri/lib/uri/generic.rb
new file mode 100644
index 0000000000..56b09e1d7f
--- /dev/null
+++ b/lib/bundler/vendor/uri/lib/uri/generic.rb
@@ -0,0 +1,1568 @@
+# frozen_string_literal: true
+
+# = uri/generic.rb
+#
+# Author:: Akira Yamada <akira@ruby-lang.org>
+# License:: You can redistribute it and/or modify it under the same term as Ruby.
+# Revision:: $Id$
+#
+# See Bundler::URI for general documentation
+#
+
+require_relative 'common'
+autoload :IPSocket, 'socket'
+autoload :IPAddr, 'ipaddr'
+
+module Bundler::URI
+
+  #
+  # Base class for all Bundler::URI classes.
+  # Implements generic Bundler::URI syntax as per RFC 2396.
+  #
+  class Generic
+    include Bundler::URI
+
+    #
+    # A Default port of nil for Bundler::URI::Generic.
+    #
+    DEFAULT_PORT = nil
+
+    #
+    # Returns default port.
+    #
+    def self.default_port
+      self::DEFAULT_PORT
+    end
+
+    #
+    # Returns default port.
+    #
+    def default_port
+      self.class.default_port
+    end
+
+    #
+    # An Array of the available components for Bundler::URI::Generic.
+    #
+    COMPONENT = [
+      :scheme,
+      :userinfo, :host, :port, :registry,
+      :path, :opaque,
+      :query,
+      :fragment
+    ].freeze
+
+    #
+    # Components of the Bundler::URI in the order.
+    #
+    def self.component
+      self::COMPONENT
+    end
+
+    USE_REGISTRY = false # :nodoc:
+
+    def self.use_registry # :nodoc:
+      self::USE_REGISTRY
+    end
+
+    #
+    # == Synopsis
+    #
+    # See ::new.
+    #
+    # == Description
+    #
+    # At first, tries to create a new Bundler::URI::Generic instance using
+    # Bundler::URI::Generic::build. But, if exception Bundler::URI::InvalidComponentError is raised,
+    # then it does Bundler::URI::Escape.escape all Bundler::URI components and tries again.
+    #
+    def self.build2(args)
+      begin
+        return self.build(args)
+      rescue InvalidComponentError
+        if args.kind_of?(Array)
+          return self.build(args.collect{|x|
+            if x.is_a?(String)
+              DEFAULT_PARSER.escape(x)
+            else
+              x
+            end
+          })
+        elsif args.kind_of?(Hash)
+          tmp = {}
+          args.each do |key, value|
+            tmp[key] = if value
+                DEFAULT_PARSER.escape(value)
+              else
+                value
+              end
+          end
+          return self.build(tmp)
+        end
+      end
+    end
+
+    #
+    # == Synopsis
+    #
+    # See ::new.
+    #
+    # == Description
+    #
+    # Creates a new Bundler::URI::Generic instance from components of Bundler::URI::Generic
+    # with check.  Components are: scheme, userinfo, host, port, registry, path,
+    # opaque, query, and fragment. You can provide arguments either by an Array or a Hash.
+    # See ::new for hash keys to use or for order of array items.
+    #
+    def self.build(args)
+      if args.kind_of?(Array) &&
+          args.size == ::Bundler::URI::Generic::COMPONENT.size
+        tmp = args.dup
+      elsif args.kind_of?(Hash)
+        tmp = ::Bundler::URI::Generic::COMPONENT.collect do |c|
+          if args.include?(c)
+            args[c]
+          else
+            nil
+          end
+        end
+      else
+        component = self.class.component rescue ::Bundler::URI::Generic::COMPONENT
+        raise ArgumentError,
+        "expected Array of or Hash of components of #{self.class} (#{component.join(', ')})"
+      end
+
+      tmp << nil
+      tmp << true
+      return self.new(*tmp)
+    end
+
+    #
+    # == Args
+    #
+    # +scheme+::
+    #   Protocol scheme, i.e. 'http','ftp','mailto' and so on.
+    # +userinfo+::
+    #   User name and password, i.e. 'sdmitry:bla'.
+    # +host+::
+    #   Server host name.
+    # +port+::
+    #   Server port.
+    # +registry+::
+    #   Registry of naming authorities.
+    # +path+::
+    #   Path on server.
+    # +opaque+::
+    #   Opaque part.
+    # +query+::
+    #   Query data.
+    # +fragment+::
+    #   Part of the Bundler::URI after '#' character.
+    # +parser+::
+    #   Parser for internal use [Bundler::URI::DEFAULT_PARSER by default].
+    # +arg_check+::
+    #   Check arguments [false by default].
+    #
+    # == Description
+    #
+    # Creates a new Bundler::URI::Generic instance from ``generic'' components without check.
+    #
+    def initialize(scheme,
+                   userinfo, host, port, registry,
+                   path, opaque,
+                   query,
+                   fragment,
+                   parser = DEFAULT_PARSER,
+                   arg_check = false)
+      @scheme = nil
+      @user = nil
+      @password = nil
+      @host = nil
+      @port = nil
+      @path = nil
+      @query = nil
+      @opaque = nil
+      @fragment = nil
+      @parser = parser == DEFAULT_PARSER ? nil : parser
+
+      if arg_check
+        self.scheme = scheme
+        self.userinfo = userinfo
+        self.hostname = host
+        self.port = port
+        self.path = path
+        self.query = query
+        self.opaque = opaque
+        self.fragment = fragment
+      else
+        self.set_scheme(scheme)
+        self.set_userinfo(userinfo)
+        self.set_host(host)
+        self.set_port(port)
+        self.set_path(path)
+        self.query = query
+        self.set_opaque(opaque)
+        self.fragment=(fragment)
+      end
+      if registry
+        raise InvalidURIError,
+          "the scheme #{@scheme} does not accept registry part: #{registry} (or bad hostname?)"
+      end
+
+      @scheme&.freeze
+      self.set_path('') if !@path && !@opaque # (see RFC2396 Section 5.2)
+      self.set_port(self.default_port) if self.default_port && !@port
+    end
+
+    #
+    # Returns the scheme component of the Bundler::URI.
+    #
+    #   Bundler::URI("http://foo/bar/baz").scheme #=> "http"
+    #
+    attr_reader :scheme
+
+    # Returns the host component of the Bundler::URI.
+    #
+    #   Bundler::URI("http://foo/bar/baz").host #=> "foo"
+    #
+    # It returns nil if no host component exists.
+    #
+    #   Bundler::URI("mailto:foo@example.org").host #=> nil
+    #
+    # The component does not contain the port number.
+    #
+    #   Bundler::URI("http://foo:8080/bar/baz").host #=> "foo"
+    #
+    # Since IPv6 addresses are wrapped with brackets in URIs,
+    # this method returns IPv6 addresses wrapped with brackets.
+    # This form is not appropriate to pass to socket methods such as TCPSocket.open.
+    # If unwrapped host names are required, use the #hostname method.
+    #
+    #   Bundler::URI("http://[::1]/bar/baz").host     #=> "[::1]"
+    #   Bundler::URI("http://[::1]/bar/baz").hostname #=> "::1"
+    #
+    attr_reader :host
+
+    # Returns the port component of the Bundler::URI.
+    #
+    #   Bundler::URI("http://foo/bar/baz").port      #=> 80
+    #   Bundler::URI("http://foo:8080/bar/baz").port #=> 8080
+    #
+    attr_reader :port
+
+    def registry # :nodoc:
+      nil
+    end
+
+    # Returns the path component of the Bundler::URI.
+    #
+    #   Bundler::URI("http://foo/bar/baz").path #=> "/bar/baz"
+    #
+    attr_reader :path
+
+    # Returns the query component of the Bundler::URI.
+    #
+    #   Bundler::URI("http://foo/bar/baz?search=FooBar").query #=> "search=FooBar"
+    #
+    attr_reader :query
+
+    # Returns the opaque part of the Bundler::URI.
+    #
+    #   Bundler::URI("mailto:foo@example.org").opaque #=> "foo@example.org"
+    #   Bundler::URI("http://foo/bar/baz").opaque     #=> nil
+    #
+    # The portion of the path that does not make use of the slash '/'.
+    # The path typically refers to an absolute path or an opaque part.
+    # (See RFC2396 Section 3 and 5.2.)
+    #
+    attr_reader :opaque
+
+    # Returns the fragment component of the Bundler::URI.
+    #
+    #   Bundler::URI("http://foo/bar/baz?search=FooBar#ponies").fragment #=> "ponies"
+    #
+    attr_reader :fragment
+
+    # Returns the parser to be used.
+    #
+    # Unless a Bundler::URI::Parser is defined, DEFAULT_PARSER is used.
+    #
+    def parser
+      if !defined?(@parser) || !@parser
+        DEFAULT_PARSER
+      else
+        @parser || DEFAULT_PARSER
+      end
+    end
+
+    # Replaces self by other Bundler::URI object.
+    #
+    def replace!(oth)
+      if self.class != oth.class
+        raise ArgumentError, "expected #{self.class} object"
+      end
+
+      component.each do |c|
+        self.__send__("#{c}=", oth.__send__(c))
+      end
+    end
+    private :replace!
+
+    #
+    # Components of the Bundler::URI in the order.
+    #
+    def component
+      self.class.component
+    end
+
+    #
+    # Checks the scheme +v+ component against the Bundler::URI::Parser Regexp for :SCHEME.
+    #
+    def check_scheme(v)
+      if v && parser.regexp[:SCHEME] !~ v
+        raise InvalidComponentError,
+          "bad component(expected scheme component): #{v}"
+      end
+
+      return true
+    end
+    private :check_scheme
+
+    # Protected setter for the scheme component +v+.
+    #
+    # See also Bundler::URI::Generic.scheme=.
+    #
+    def set_scheme(v)
+      @scheme = v&.downcase
+    end
+    protected :set_scheme
+
+    #
+    # == Args
+    #
+    # +v+::
+    #    String
+    #
+    # == Description
+    #
+    # Public setter for the scheme component +v+
+    # (with validation).
+    #
+    # See also Bundler::URI::Generic.check_scheme.
+    #
+    # == Usage
+    #
+    #   require 'bundler/vendor/uri/lib/uri'
+    #
+    #   uri = Bundler::URI.parse("http://my.example.com")
+    #   uri.scheme = "https"
+    #   uri.to_s  #=> "https://my.example.com"
+    #
+    def scheme=(v)
+      check_scheme(v)
+      set_scheme(v)
+      v
+    end
+
+    #
+    # Checks the +user+ and +password+.
+    #
+    # If +password+ is not provided, then +user+ is
+    # split, using Bundler::URI::Generic.split_userinfo, to
+    # pull +user+ and +password.
+    #
+    # See also Bundler::URI::Generic.check_user, Bundler::URI::Generic.check_password.
+    #
+    def check_userinfo(user, password = nil)
+      if !password
+        user, password = split_userinfo(user)
+      end
+      check_user(user)
+      check_password(password, user)
+
+      return true
+    end
+    private :check_userinfo
+
+    #
+    # Checks the user +v+ component for RFC2396 compliance
+    # and against the Bundler::URI::Parser Regexp for :USERINFO.
+    #
+    # Can not have a registry or opaque component defined,
+    # with a user component defined.
+    #
+    def check_user(v)
+      if @opaque
+        raise InvalidURIError,
+          "can not set user with opaque"
+      end
+
+      return v unless v
+
+      if parser.regexp[:USERINFO] !~ v
+        raise InvalidComponentError,
+          "bad component(expected userinfo component or user component): #{v}"
+      end
+
+      return true
+    end
+    private :check_user
+
+    #
+    # Checks the password +v+ component for RFC2396 compliance
+    # and against the Bundler::URI::Parser Regexp for :USERINFO.
+    #
+    # Can not have a registry or opaque component defined,
+    # with a user component defined.
+    #
+    def check_password(v, user = @user)
+      if @opaque
+        raise InvalidURIError,
+          "can not set password with opaque"
+      end
+      return v unless v
+
+      if !user
+        raise InvalidURIError,
+          "password component depends user component"
+      end
+
+      if parser.regexp[:USERINFO] !~ v
+        raise InvalidComponentError,
+          "bad password component"
+      end
+
+      return true
+    end
+    private :check_password
+
+    #
+    # Sets userinfo, argument is string like 'name:pass'.
+    #
+    def userinfo=(userinfo)
+      if userinfo.nil?
+        return nil
+      end
+      check_userinfo(*userinfo)
+      set_userinfo(*userinfo)
+      # returns userinfo
+    end
+
+    #
+    # == Args
+    #
+    # +v+::
+    #    String
+    #
+    # == Description
+    #
+    # Public setter for the +user+ component
+    # (with validation).
+    #
+    # See also Bundler::URI::Generic.check_user.
+    #
+    # == Usage
+    #
+    #   require 'bundler/vendor/uri/lib/uri'
+    #
+    #   uri = Bundler::URI.parse("http://john:S3nsit1ve@my.example.com")
+    #   uri.user = "sam"
+    #   uri.to_s  #=> "http://sam:V3ry_S3nsit1ve@my.example.com"
+    #
+    def user=(user)
+      check_user(user)
+      set_user(user)
+      # returns user
+    end
+
+    #
+    # == Args
+    #
+    # +v+::
+    #    String
+    #
+    # == Description
+    #
+    # Public setter for the +password+ component
+    # (with validation).
+    #
+    # See also Bundler::URI::Generic.check_password.
+    #
+    # == Usage
+    #
+    #   require 'bundler/vendor/uri/lib/uri'
+    #
+    #   uri = Bundler::URI.parse("http://john:S3nsit1ve@my.example.com")
+    #   uri.password = "V3ry_S3nsit1ve"
+    #   uri.to_s  #=> "http://john:V3ry_S3nsit1ve@my.example.com"
+    #
+    def password=(password)
+      check_password(password)
+      set_password(password)
+      # returns password
+    end
+
+    # Protected setter for the +user+ component, and +password+ if available
+    # (with validation).
+    #
+    # See also Bundler::URI::Generic.userinfo=.
+    #
+    def set_userinfo(user, password = nil)
+      unless password
+        user, password = split_userinfo(user)
+      end
+      @user     = user
+      @password = password if password
+
+      [@user, @password]
+    end
+    protected :set_userinfo
+
+    # Protected setter for the user component +v+.
+    #
+    # See also Bundler::URI::Generic.user=.
+    #
+    def set_user(v)
+      set_userinfo(v, @password)
+      v
+    end
+    protected :set_user
+
+    # Protected setter for the password component +v+.
+    #
+    # See also Bundler::URI::Generic.password=.
+    #
+    def set_password(v)
+      @password = v
+      # returns v
+    end
+    protected :set_password
+
+    # Returns the userinfo +ui+ as <code>[user, password]</code>
+    # if properly formatted as 'user:password'.
+    def split_userinfo(ui)
+      return nil, nil unless ui
+      user, password = ui.split(':', 2)
+
+      return user, password
+    end
+    private :split_userinfo
+
+    # Escapes 'user:password' +v+ based on RFC 1738 section 3.1.
+    def escape_userpass(v)
+      parser.escape(v, /[@:\/]/o) # RFC 1738 section 3.1 #/
+    end
+    private :escape_userpass
+
+    # Returns the userinfo, either as 'user' or 'user:password'.
+    def userinfo
+      if @user.nil?
+        nil
+      elsif @password.nil?
+        @user
+      else
+        @user + ':' + @password
+      end
+    end
+
+    # Returns the user component.
+    def user
+      @user
+    end
+
+    # Returns the password component.
+    def password
+      @password
+    end
+
+    #
+    # Checks the host +v+ component for RFC2396 compliance
+    # and against the Bundler::URI::Parser Regexp for :HOST.
+    #
+    # Can not have a registry or opaque component defined,
+    # with a host component defined.
+    #
+    def check_host(v)
+      return v unless v
+
+      if @opaque
+        raise InvalidURIError,
+          "can not set host with registry or opaque"
+      elsif parser.regexp[:HOST] !~ v
+        raise InvalidComponentError,
+          "bad component(expected host component): #{v}"
+      end
+
+      return true
+    end
+    private :check_host
+
+    # Protected setter for the host component +v+.
+    #
+    # See also Bundler::URI::Generic.host=.
+    #
+    def set_host(v)
+      @host = v
+    end
+    protected :set_host
+
+    #
+    # == Args
+    #
+    # +v+::
+    #    String
+    #
+    # == Description
+    #
+    # Public setter for the host component +v+
+    # (with validation).
+    #
+    # See also Bundler::URI::Generic.check_host.
+    #
+    # == Usage
+    #
+    #   require 'bundler/vendor/uri/lib/uri'
+    #
+    #   uri = Bundler::URI.parse("http://my.example.com")
+    #   uri.host = "foo.com"
+    #   uri.to_s  #=> "http://foo.com"
+    #
+    def host=(v)
+      check_host(v)
+      set_host(v)
+      v
+    end
+
+    # Extract the host part of the Bundler::URI and unwrap brackets for IPv6 addresses.
+    #
+    # This method is the same as Bundler::URI::Generic#host except
+    # brackets for IPv6 (and future IP) addresses are removed.
+    #
+    #   uri = Bundler::URI("http://[::1]/bar")
+    #   uri.hostname      #=> "::1"
+    #   uri.host          #=> "[::1]"
+    #
+    def hostname
+      v = self.host
+      /\A\[(.*)\]\z/ =~ v ? $1 : v
+    end
+
+    # Sets the host part of the Bundler::URI as the argument with brackets for IPv6 addresses.
+    #
+    # This method is the same as Bundler::URI::Generic#host= except
+    # the argument can be a bare IPv6 address.
+    #
+    #   uri = Bundler::URI("http://foo/bar")
+    #   uri.hostname = "::1"
+    #   uri.to_s  #=> "http://[::1]/bar"
+    #
+    # If the argument seems to be an IPv6 address,
+    # it is wrapped with brackets.
+    #
+    def hostname=(v)
+      v = "[#{v}]" if /\A\[.*\]\z/ !~ v && /:/ =~ v
+      self.host = v
+    end
+
+    #
+    # Checks the port +v+ component for RFC2396 compliance
+    # and against the Bundler::URI::Parser Regexp for :PORT.
+    #
+    # Can not have a registry or opaque component defined,
+    # with a port component defined.
+    #
+    def check_port(v)
+      return v unless v
+
+      if @opaque
+        raise InvalidURIError,
+          "can not set port with registry or opaque"
+      elsif !v.kind_of?(Integer) && parser.regexp[:PORT] !~ v
+        raise InvalidComponentError,
+          "bad component(expected port component): #{v.inspect}"
+      end
+
+      return true
+    end
+    private :check_port
+
+    # Protected setter for the port component +v+.
+    #
+    # See also Bundler::URI::Generic.port=.
+    #
+    def set_port(v)
+      v = v.empty? ? nil : v.to_i unless !v || v.kind_of?(Integer)
+      @port = v
+    end
+    protected :set_port
+
+    #
+    # == Args
+    #
+    # +v+::
+    #    String
+    #
+    # == Description
+    #
+    # Public setter for the port component +v+
+    # (with validation).
+    #
+    # See also Bundler::URI::Generic.check_port.
+    #
+    # == Usage
+    #
+    #   require 'bundler/vendor/uri/lib/uri'
+    #
+    #   uri = Bundler::URI.parse("http://my.example.com")
+    #   uri.port = 8080
+    #   uri.to_s  #=> "http://my.example.com:8080"
+    #
+    def port=(v)
+      check_port(v)
+      set_port(v)
+      port
+    end
+
+    def check_registry(v) # :nodoc:
+      raise InvalidURIError, "can not set registry"
+    end
+    private :check_registry
+
+    def set_registry(v) #:nodoc:
+      raise InvalidURIError, "can not set registry"
+    end
+    protected :set_registry
+
+    def registry=(v)
+      raise InvalidURIError, "can not set registry"
+    end
+
+    #
+    # Checks the path +v+ component for RFC2396 compliance
+    # and against the Bundler::URI::Parser Regexp
+    # for :ABS_PATH and :REL_PATH.
+    #
+    # Can not have a opaque component defined,
+    # with a path component defined.
+    #
+    def check_path(v)
+      # raise if both hier and opaque are not nil, because:
+      # absoluteURI   = scheme ":" ( hier_part | opaque_part )
+      # hier_part     = ( net_path | abs_path ) [ "?" query ]
+      if v && @opaque
+        raise InvalidURIError,
+          "path conflicts with opaque"
+      end
+
+      # If scheme is ftp, path may be relative.
+      # See RFC 1738 section 3.2.2, and RFC 2396.
+      if @scheme && @scheme != "ftp"
+        if v && v != '' && parser.regexp[:ABS_PATH] !~ v
+          raise InvalidComponentError,
+            "bad component(expected absolute path component): #{v}"
+        end
+      else
+        if v && v != '' && parser.regexp[:ABS_PATH] !~ v &&
+           parser.regexp[:REL_PATH] !~ v
+          raise InvalidComponentError,
+            "bad component(expected relative path component): #{v}"
+        end
+      end
+
+      return true
+    end
+    private :check_path
+
+    # Protected setter for the path component +v+.
+    #
+    # See also Bundler::URI::Generic.path=.
+    #
+    def set_path(v)
+      @path = v
+    end
+    protected :set_path
+
+    #
+    # == Args
+    #
+    # +v+::
+    #    String
+    #
+    # == Description
+    #
+    # Public setter for the path component +v+
+    # (with validation).
+    #
+    # See also Bundler::URI::Generic.check_path.
+    #
+    # == Usage
+    #
+    #   require 'bundler/vendor/uri/lib/uri'
+    #
+    #   uri = Bundler::URI.parse("http://my.example.com/pub/files")
+    #   uri.path = "/faq/"
+    #   uri.to_s  #=> "http://my.example.com/faq/"
+    #
+    def path=(v)
+      check_path(v)
+      set_path(v)
+      v
+    end
+
+    #
+    # == Args
+    #
+    # +v+::
+    #    String
+    #
+    # == Description
+    #
+    # Public setter for the query component +v+.
+    #
+    # == Usage
+    #
+    #   require 'bundler/vendor/uri/lib/uri'
+    #
+    #   uri = Bundler::URI.parse("http://my.example.com/?id=25")
+    #   uri.query = "id=1"
+    #   uri.to_s  #=> "http://my.example.com/?id=1"
+    #
+    def query=(v)
+      return @query = nil unless v
+      raise InvalidURIError, "query conflicts with opaque" if @opaque
+
+      x = v.to_str
+      v = x.dup if x.equal? v
+      v.encode!(Encoding::UTF_8) rescue nil
+      v.delete!("\t\r\n")
+      v.force_encoding(Encoding::ASCII_8BIT)
+      raise InvalidURIError, "invalid percent escape: #{$1}" if /(%\H\H)/n.match(v)
+      v.gsub!(/(?!%\h\h|[!$-&(-;=?-_a-~])./n.freeze){'%%%02X' % $&.ord}
+      v.force_encoding(Encoding::US_ASCII)
+      @query = v
+    end
+
+    #
+    # Checks the opaque +v+ component for RFC2396 compliance and
+    # against the Bundler::URI::Parser Regexp for :OPAQUE.
+    #
+    # Can not have a host, port, user, or path component defined,
+    # with an opaque component defined.
+    #
+    def check_opaque(v)
+      return v unless v
+
+      # raise if both hier and opaque are not nil, because:
+      # absoluteURI   = scheme ":" ( hier_part | opaque_part )
+      # hier_part     = ( net_path | abs_path ) [ "?" query ]
+      if @host || @port || @user || @path  # userinfo = @user + ':' + @password
+        raise InvalidURIError,
+          "can not set opaque with host, port, userinfo or path"
+      elsif v && parser.regexp[:OPAQUE] !~ v
+        raise InvalidComponentError,
+          "bad component(expected opaque component): #{v}"
+      end
+
+      return true
+    end
+    private :check_opaque
+
+    # Protected setter for the opaque component +v+.
+    #
+    # See also Bundler::URI::Generic.opaque=.
+    #
+    def set_opaque(v)
+      @opaque = v
+    end
+    protected :set_opaque
+
+    #
+    # == Args
+    #
+    # +v+::
+    #    String
+    #
+    # == Description
+    #
+    # Public setter for the opaque component +v+
+    # (with validation).
+    #
+    # See also Bundler::URI::Generic.check_opaque.
+    #
+    def opaque=(v)
+      check_opaque(v)
+      set_opaque(v)
+      v
+    end
+
+    #
+    # Checks the fragment +v+ component against the Bundler::URI::Parser Regexp for :FRAGMENT.
+    #
+    #
+    # == Args
+    #
+    # +v+::
+    #    String
+    #
+    # == Description
+    #
+    # Public setter for the fragment component +v+
+    # (with validation).
+    #
+    # == Usage
+    #
+    #   require 'bundler/vendor/uri/lib/uri'
+    #
+    #   uri = Bundler::URI.parse("http://my.example.com/?id=25#time=1305212049")
+    #   uri.fragment = "time=1305212086"
+    #   uri.to_s  #=> "http://my.example.com/?id=25#time=1305212086"
+    #
+    def fragment=(v)
+      return @fragment = nil unless v
+
+      x = v.to_str
+      v = x.dup if x.equal? v
+      v.encode!(Encoding::UTF_8) rescue nil
+      v.delete!("\t\r\n")
+      v.force_encoding(Encoding::ASCII_8BIT)
+      v.gsub!(/(?!%\h\h|[!-~])./n){'%%%02X' % $&.ord}
+      v.force_encoding(Encoding::US_ASCII)
+      @fragment = v
+    end
+
+    #
+    # Returns true if Bundler::URI is hierarchical.
+    #
+    # == Description
+    #
+    # Bundler::URI has components listed in order of decreasing significance from left to right,
+    # see RFC3986 https://tools.ietf.org/html/rfc3986 1.2.3.
+    #
+    # == Usage
+    #
+    #   require 'bundler/vendor/uri/lib/uri'
+    #
+    #   uri = Bundler::URI.parse("http://my.example.com/")
+    #   uri.hierarchical?
+    #   #=> true
+    #   uri = Bundler::URI.parse("mailto:joe@example.com")
+    #   uri.hierarchical?
+    #   #=> false
+    #
+    def hierarchical?
+      if @path
+        true
+      else
+        false
+      end
+    end
+
+    #
+    # Returns true if Bundler::URI has a scheme (e.g. http:// or https://) specified.
+    #
+    def absolute?
+      if @scheme
+        true
+      else
+        false
+      end
+    end
+    alias absolute absolute?
+
+    #
+    # Returns true if Bundler::URI does not have a scheme (e.g. http:// or https://) specified.
+    #
+    def relative?
+      !absolute?
+    end
+
+    #
+    # Returns an Array of the path split on '/'.
+    #
+    def split_path(path)
+      path.split("/", -1)
+    end
+    private :split_path
+
+    #
+    # Merges a base path +base+, with relative path +rel+,
+    # returns a modified base path.
+    #
+    def merge_path(base, rel)
+
+      # RFC2396, Section 5.2, 5)
+      # RFC2396, Section 5.2, 6)
+      base_path = split_path(base)
+      rel_path  = split_path(rel)
+
+      # RFC2396, Section 5.2, 6), a)
+      base_path << '' if base_path.last == '..'
+      while i = base_path.index('..')
+        base_path.slice!(i - 1, 2)
+      end
+
+      if (first = rel_path.first) and first.empty?
+        base_path.clear
+        rel_path.shift
+      end
+
+      # RFC2396, Section 5.2, 6), c)
+      # RFC2396, Section 5.2, 6), d)
+      rel_path.push('') if rel_path.last == '.' || rel_path.last == '..'
+      rel_path.delete('.')
+
+      # RFC2396, Section 5.2, 6), e)
+      tmp = []
+      rel_path.each do |x|
+        if x == '..' &&
+            !(tmp.empty? || tmp.last == '..')
+          tmp.pop
+        else
+          tmp << x
+        end
+      end
+
+      add_trailer_slash = !tmp.empty?
+      if base_path.empty?
+        base_path = [''] # keep '/' for root directory
+      elsif add_trailer_slash
+        base_path.pop
+      end
+      while x = tmp.shift
+        if x == '..'
+          # RFC2396, Section 4
+          # a .. or . in an absolute path has no special meaning
+          base_path.pop if base_path.size > 1
+        else
+          # if x == '..'
+          #   valid absolute (but abnormal) path "/../..."
+          # else
+          #   valid absolute path
+          # end
+          base_path << x
+          tmp.each {|t| base_path << t}
+          add_trailer_slash = false
+          break
+        end
+      end
+      base_path.push('') if add_trailer_slash
+
+      return base_path.join('/')
+    end
+    private :merge_path
+
+    #
+    # == Args
+    #
+    # +oth+::
+    #    Bundler::URI or String
+    #
+    # == Description
+    #
+    # Destructive form of #merge.
+    #
+    # == Usage
+    #
+    #   require 'bundler/vendor/uri/lib/uri'
+    #
+    #   uri = Bundler::URI.parse("http://my.example.com")
+    #   uri.merge!("/main.rbx?page=1")
+    #   uri.to_s  # => "http://my.example.com/main.rbx?page=1"
+    #
+    def merge!(oth)
+      t = merge(oth)
+      if self == t
+        nil
+      else
+        replace!(t)
+        self
+      end
+    end
+
+    #
+    # == Args
+    #
+    # +oth+::
+    #    Bundler::URI or String
+    #
+    # == Description
+    #
+    # Merges two URIs.
+    #
+    # == Usage
+    #
+    #   require 'bundler/vendor/uri/lib/uri'
+    #
+    #   uri = Bundler::URI.parse("http://my.example.com")
+    #   uri.merge("/main.rbx?page=1")
+    #   # => "http://my.example.com/main.rbx?page=1"
+    #
+    def merge(oth)
+      rel = parser.send(:convert_to_uri, oth)
+
+      if rel.absolute?
+        #raise BadURIError, "both Bundler::URI are absolute" if absolute?
+        # hmm... should return oth for usability?
+        return rel
+      end
+
+      unless self.absolute?
+        raise BadURIError, "both Bundler::URI are relative"
+      end
+
+      base = self.dup
+
+      authority = rel.userinfo || rel.host || rel.port
+
+      # RFC2396, Section 5.2, 2)
+      if (rel.path.nil? || rel.path.empty?) && !authority && !rel.query
+        base.fragment=(rel.fragment) if rel.fragment
+        return base
+      end
+
+      base.query = nil
+      base.fragment=(nil)
+
+      # RFC2396, Section 5.2, 4)
+      if !authority
+        base.set_path(merge_path(base.path, rel.path)) if base.path && rel.path
+      else
+        # RFC2396, Section 5.2, 4)
+        base.set_path(rel.path) if rel.path
+      end
+
+      # RFC2396, Section 5.2, 7)
+      base.set_userinfo(rel.userinfo) if rel.userinfo
+      base.set_host(rel.host)         if rel.host
+      base.set_port(rel.port)         if rel.port
+      base.query = rel.query       if rel.query
+      base.fragment=(rel.fragment) if rel.fragment
+
+      return base
+    end # merge
+    alias + merge
+
+    # :stopdoc:
+    def route_from_path(src, dst)
+      case dst
+      when src
+        # RFC2396, Section 4.2
+        return ''
+      when %r{(?:\A|/)\.\.?(?:/|\z)}
+        # dst has abnormal absolute path,
+        # like "/./", "/../", "/x/../", ...
+        return dst.dup
+      end
+
+      src_path = src.scan(%r{[^/]*/})
+      dst_path = dst.scan(%r{[^/]*/?})
+
+      # discard same parts
+      while !dst_path.empty? && dst_path.first == src_path.first
+        src_path.shift
+        dst_path.shift
+      end
+
+      tmp = dst_path.join
+
+      # calculate
+      if src_path.empty?
+        if tmp.empty?
+          return './'
+        elsif dst_path.first.include?(':') # (see RFC2396 Section 5)
+          return './' + tmp
+        else
+          return tmp
+        end
+      end
+
+      return '../' * src_path.size + tmp
+    end
+    private :route_from_path
+    # :startdoc:
+
+    # :stopdoc:
+    def route_from0(oth)
+      oth = parser.send(:convert_to_uri, oth)
+      if self.relative?
+        raise BadURIError,
+          "relative Bundler::URI: #{self}"
+      end
+      if oth.relative?
+        raise BadURIError,
+          "relative Bundler::URI: #{oth}"
+      end
+
+      if self.scheme != oth.scheme
+        return self, self.dup
+      end
+      rel = Bundler::URI::Generic.new(nil, # it is relative Bundler::URI
+                             self.userinfo, self.host, self.port,
+                             nil, self.path, self.opaque,
+                             self.query, self.fragment, parser)
+
+      if rel.userinfo != oth.userinfo ||
+          rel.host.to_s.downcase != oth.host.to_s.downcase ||
+          rel.port != oth.port
+
+        if self.userinfo.nil? && self.host.nil?
+          return self, self.dup
+        end
+
+        rel.set_port(nil) if rel.port == oth.default_port
+        return rel, rel
+      end
+      rel.set_userinfo(nil)
+      rel.set_host(nil)
+      rel.set_port(nil)
+
+      if rel.path && rel.path == oth.path
+        rel.set_path('')
+        rel.query = nil if rel.query == oth.query
+        return rel, rel
+      elsif rel.opaque && rel.opaque == oth.opaque
+        rel.set_opaque('')
+        rel.query = nil if rel.query == oth.query
+        return rel, rel
+      end
+
+      # you can modify `rel', but can not `oth'.
+      return oth, rel
+    end
+    private :route_from0
+    # :startdoc:
+
+    #
+    # == Args
+    #
+    # +oth+::
+    #    Bundler::URI or String
+    #
+    # == Description
+    #
+    # Calculates relative path from oth to self.
+    #
+    # == Usage
+    #
+    #   require 'bundler/vendor/uri/lib/uri'
+    #
+    #   uri = Bundler::URI.parse('http://my.example.com/main.rbx?page=1')
+    #   uri.route_from('http://my.example.com')
+    #   #=> #<Bundler::URI::Generic /main.rbx?page=1>
+    #
+    def route_from(oth)
+      # you can modify `rel', but can not `oth'.
+      begin
+        oth, rel = route_from0(oth)
+      rescue
+        raise $!.class, $!.message
+      end
+      if oth == rel
+        return rel
+      end
+
+      rel.set_path(route_from_path(oth.path, self.path))
+      if rel.path == './' && self.query
+        # "./?foo" -> "?foo"
+        rel.set_path('')
+      end
+
+      return rel
+    end
+
+    alias - route_from
+
+    #
+    # == Args
+    #
+    # +oth+::
+    #    Bundler::URI or String
+    #
+    # == Description
+    #
+    # Calculates relative path to oth from self.
+    #
+    # == Usage
+    #
+    #   require 'bundler/vendor/uri/lib/uri'
+    #
+    #   uri = Bundler::URI.parse('http://my.example.com')
+    #   uri.route_to('http://my.example.com/main.rbx?page=1')
+    #   #=> #<Bundler::URI::Generic /main.rbx?page=1>
+    #
+    def route_to(oth)
+      parser.send(:convert_to_uri, oth).route_from(self)
+    end
+
+    #
+    # Returns normalized Bundler::URI.
+    #
+    #   require 'bundler/vendor/uri/lib/uri'
+    #
+    #   Bundler::URI("HTTP://my.EXAMPLE.com").normalize
+    #   #=> #<Bundler::URI::HTTP http://my.example.com/>
+    #
+    # Normalization here means:
+    #
+    # * scheme and host are converted to lowercase,
+    # * an empty path component is set to "/".
+    #
+    def normalize
+      uri = dup
+      uri.normalize!
+      uri
+    end
+
+    #
+    # Destructive version of #normalize.
+    #
+    def normalize!
+      if path&.empty?
+        set_path('/')
+      end
+      if scheme && scheme != scheme.downcase
+        set_scheme(self.scheme.downcase)
+      end
+      if host && host != host.downcase
+        set_host(self.host.downcase)
+      end
+    end
+
+    #
+    # Constructs String from Bundler::URI.
+    #
+    def to_s
+      str = ''.dup
+      if @scheme
+        str << @scheme
+        str << ':'
+      end
+
+      if @opaque
+        str << @opaque
+      else
+        if @host || %w[file postgres].include?(@scheme)
+          str << '//'
+        end
+        if self.userinfo
+          str << self.userinfo
+          str << '@'
+        end
+        if @host
+          str << @host
+        end
+        if @port && @port != self.default_port
+          str << ':'
+          str << @port.to_s
+        end
+        str << @path
+        if @query
+          str << '?'
+          str << @query
+        end
+      end
+      if @fragment
+        str << '#'
+        str << @fragment
+      end
+      str
+    end
+
+    #
+    # Compares two URIs.
+    #
+    def ==(oth)
+      if self.class == oth.class
+        self.normalize.component_ary == oth.normalize.component_ary
+      else
+        false
+      end
+    end
+
+    def hash
+      self.component_ary.hash
+    end
+
+    def eql?(oth)
+      self.class == oth.class &&
+      parser == oth.parser &&
+      self.component_ary.eql?(oth.component_ary)
+    end
+
+=begin
+
+--- Bundler::URI::Generic#===(oth)
+
+=end
+#    def ===(oth)
+#      raise NotImplementedError
+#    end
+
+=begin
+=end
+
+
+    # Returns an Array of the components defined from the COMPONENT Array.
+    def component_ary
+      component.collect do |x|
+        self.send(x)
+      end
+    end
+    protected :component_ary
+
+    # == Args
+    #
+    # +components+::
+    #    Multiple Symbol arguments defined in Bundler::URI::HTTP.
+    #
+    # == Description
+    #
+    # Selects specified components from Bundler::URI.
+    #
+    # == Usage
+    #
+    #   require 'bundler/vendor/uri/lib/uri'
+    #
+    #   uri = Bundler::URI.parse('http://myuser:mypass@my.example.com/test.rbx')
+    #   uri.select(:userinfo, :host, :path)
+    #   # => ["myuser:mypass", "my.example.com", "/test.rbx"]
+    #
+    def select(*components)
+      components.collect do |c|
+        if component.include?(c)
+          self.send(c)
+        else
+          raise ArgumentError,
+            "expected of components of #{self.class} (#{self.class.component.join(', ')})"
+        end
+      end
+    end
+
+    def inspect
+      "#<#{self.class} #{self}>"
+    end
+
+    #
+    # == Args
+    #
+    # +v+::
+    #    Bundler::URI or String
+    #
+    # == Description
+    #
+    # Attempts to parse other Bundler::URI +oth+,
+    # returns [parsed_oth, self].
+    #
+    # == Usage
+    #
+    #   require 'bundler/vendor/uri/lib/uri'
+    #
+    #   uri = Bundler::URI.parse("http://my.example.com")
+    #   uri.coerce("http://foo.com")
+    #   #=> [#<Bundler::URI::HTTP http://foo.com>, #<Bundler::URI::HTTP http://my.example.com>]
+    #
+    def coerce(oth)
+      case oth
+      when String
+        oth = parser.parse(oth)
+      else
+        super
+      end
+
+      return oth, self
+    end
+
+    # Returns a proxy Bundler::URI.
+    # The proxy Bundler::URI is obtained from environment variables such as http_proxy,
+    # ftp_proxy, no_proxy, etc.
+    # If there is no proper proxy, nil is returned.
+    #
+    # If the optional parameter +env+ is specified, it is used instead of ENV.
+    #
+    # Note that capitalized variables (HTTP_PROXY, FTP_PROXY, NO_PROXY, etc.)
+    # are examined, too.
+    #
+    # But http_proxy and HTTP_PROXY is treated specially under CGI environment.
+    # It's because HTTP_PROXY may be set by Proxy: header.
+    # So HTTP_PROXY is not used.
+    # http_proxy is not used too if the variable is case insensitive.
+    # CGI_HTTP_PROXY can be used instead.
+    def find_proxy(env=ENV)
+      raise BadURIError, "relative Bundler::URI: #{self}" if self.relative?
+      name = self.scheme.downcase + '_proxy'
+      proxy_uri = nil
+      if name == 'http_proxy' && env.include?('REQUEST_METHOD') # CGI?
+        # HTTP_PROXY conflicts with *_proxy for proxy settings and
+        # HTTP_* for header information in CGI.
+        # So it should be careful to use it.
+        pairs = env.reject {|k, v| /\Ahttp_proxy\z/i !~ k }
+        case pairs.length
+        when 0 # no proxy setting anyway.
+          proxy_uri = nil
+        when 1
+          k, _ = pairs.shift
+          if k == 'http_proxy' && env[k.upcase] == nil
+            # http_proxy is safe to use because ENV is case sensitive.
+            proxy_uri = env[name]
+          else
+            proxy_uri = nil
+          end
+        else # http_proxy is safe to use because ENV is case sensitive.
+          proxy_uri = env.to_hash[name]
+        end
+        if !proxy_uri
+          # Use CGI_HTTP_PROXY.  cf. libwww-perl.
+          proxy_uri = env["CGI_#{name.upcase}"]
+        end
+      elsif name == 'http_proxy'
+        unless proxy_uri = env[name]
+          if proxy_uri = env[name.upcase]
+            warn 'The environment variable HTTP_PROXY is discouraged.  Use http_proxy.', uplevel: 1
+          end
+        end
+      else
+        proxy_uri = env[name] || env[name.upcase]
+      end
+
+      if proxy_uri.nil? || proxy_uri.empty?
+        return nil
+      end
+
+      if self.hostname
+        begin
+          addr = IPSocket.getaddress(self.hostname)
+          return nil if /\A127\.|\A::1\z/ =~ addr
+        rescue SocketError
+        end
+      end
+
+      name = 'no_proxy'
+      if no_proxy = env[name] || env[name.upcase]
+        return nil unless Bundler::URI::Generic.use_proxy?(self.hostname, addr, self.port, no_proxy)
+      end
+      Bundler::URI.parse(proxy_uri)
+    end
+
+    def self.use_proxy?(hostname, addr, port, no_proxy) # :nodoc:
+      hostname = hostname.downcase
+      dothostname = ".#{hostname}"
+      no_proxy.scan(/([^:,\s]+)(?::(\d+))?/) {|p_host, p_port|
+        if !p_port || port == p_port.to_i
+          if p_host.start_with?('.')
+            return false if hostname.end_with?(p_host.downcase)
+          else
+            return false if dothostname.end_with?(".#{p_host.downcase}")
+          end
+          if addr
+            begin
+              return false if IPAddr.new(p_host).include?(addr)
+            rescue IPAddr::InvalidAddressError
+              next
+            end
+          end
+        end
+      }
+      true
+    end
+  end
+end
diff --git a/lib/bundler/vendor/uri/lib/uri/http.rb b/lib/bundler/vendor/uri/lib/uri/http.rb
new file mode 100644
index 0000000000..b6ca1c51de
--- /dev/null
+++ b/lib/bundler/vendor/uri/lib/uri/http.rb
@@ -0,0 +1,88 @@
+# frozen_string_literal: false
+# = uri/http.rb
+#
+# Author:: Akira Yamada <akira@ruby-lang.org>
+# License:: You can redistribute it and/or modify it under the same term as Ruby.
+# Revision:: $Id$
+#
+# See Bundler::URI for general documentation
+#
+
+require_relative 'generic'
+
+module Bundler::URI
+
+  #
+  # The syntax of HTTP URIs is defined in RFC1738 section 3.3.
+  #
+  # Note that the Ruby Bundler::URI library allows HTTP URLs containing usernames and
+  # passwords. This is not legal as per the RFC, but used to be
+  # supported in Internet Explorer 5 and 6, before the MS04-004 security
+  # update. See <URL:http://support.microsoft.com/kb/834489>.
+  #
+  class HTTP < Generic
+    # A Default port of 80 for Bundler::URI::HTTP.
+    DEFAULT_PORT = 80
+
+    # An Array of the available components for Bundler::URI::HTTP.
+    COMPONENT = %i[
+      scheme
+      userinfo host port
+      path
+      query
+      fragment
+    ].freeze
+
+    #
+    # == Description
+    #
+    # Creates a new Bundler::URI::HTTP object from components, with syntax checking.
+    #
+    # The components accepted are userinfo, host, port, path, query, and
+    # fragment.
+    #
+    # The components should be provided either as an Array, or as a Hash
+    # with keys formed by preceding the component names with a colon.
+    #
+    # If an Array is used, the components must be passed in the
+    # order <code>[userinfo, host, port, path, query, fragment]</code>.
+    #
+    # Example:
+    #
+    #     uri = Bundler::URI::HTTP.build(host: 'www.example.com', path: '/foo/bar')
+    #
+    #     uri = Bundler::URI::HTTP.build([nil, "www.example.com", nil, "/path",
+    #       "query", 'fragment'])
+    #
+    # Currently, if passed userinfo components this method generates
+    # invalid HTTP URIs as per RFC 1738.
+    #
+    def self.build(args)
+      tmp = Util.make_components_hash(self, args)
+      super(tmp)
+    end
+
+    #
+    # == Description
+    #
+    # Returns the full path for an HTTP request, as required by Net::HTTP::Get.
+    #
+    # If the Bundler::URI contains a query, the full path is Bundler::URI#path + '?' + Bundler::URI#query.
+    # Otherwise, the path is simply Bundler::URI#path.
+    #
+    # Example:
+    #
+    #     uri = Bundler::URI::HTTP.build(path: '/foo/bar', query: 'test=true')
+    #     uri.request_uri #  => "/foo/bar?test=true"
+    #
+    def request_uri
+      return unless @path
+
+      url = @query ? "#@path?#@query" : @path.dup
+      url.start_with?(?/.freeze) ? url : ?/ + url
+    end
+  end
+
+  @@schemes['HTTP'] = HTTP
+
+end
diff --git a/lib/bundler/vendor/uri/lib/uri/https.rb b/lib/bundler/vendor/uri/lib/uri/https.rb
new file mode 100644
index 0000000000..78dc6bf532
--- /dev/null
+++ b/lib/bundler/vendor/uri/lib/uri/https.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: false
+# = uri/https.rb
+#
+# Author:: Akira Yamada <akira@ruby-lang.org>
+# License:: You can redistribute it and/or modify it under the same term as Ruby.
+# Revision:: $Id$
+#
+# See Bundler::URI for general documentation
+#
+
+require_relative 'http'
+
+module Bundler::URI
+
+  # The default port for HTTPS URIs is 443, and the scheme is 'https:' rather
+  # than 'http:'. Other than that, HTTPS URIs are identical to HTTP URIs;
+  # see Bundler::URI::HTTP.
+  class HTTPS < HTTP
+    # A Default port of 443 for Bundler::URI::HTTPS
+    DEFAULT_PORT = 443
+  end
+  @@schemes['HTTPS'] = HTTPS
+end
diff --git a/lib/bundler/vendor/uri/lib/uri/ldap.rb b/lib/bundler/vendor/uri/lib/uri/ldap.rb
new file mode 100644
index 0000000000..b707bedb97
--- /dev/null
+++ b/lib/bundler/vendor/uri/lib/uri/ldap.rb
@@ -0,0 +1,261 @@
+# frozen_string_literal: false
+# = uri/ldap.rb
+#
+# Author::
+#  Takaaki Tateishi <ttate@jaist.ac.jp>
+#  Akira Yamada <akira@ruby-lang.org>
+# License::
+#   Bundler::URI::LDAP is copyrighted free software by Takaaki Tateishi and Akira Yamada.
+#   You can redistribute it and/or modify it under the same term as Ruby.
+# Revision:: $Id$
+#
+# See Bundler::URI for general documentation
+#
+
+require_relative 'generic'
+
+module Bundler::URI
+
+  #
+  # LDAP Bundler::URI SCHEMA (described in RFC2255).
+  #--
+  # ldap://<host>/<dn>[?<attrs>[?<scope>[?<filter>[?<extensions>]]]]
+  #++
+  class LDAP < Generic
+
+    # A Default port of 389 for Bundler::URI::LDAP.
+    DEFAULT_PORT = 389
+
+    # An Array of the available components for Bundler::URI::LDAP.
+    COMPONENT = [
+      :scheme,
+      :host, :port,
+      :dn,
+      :attributes,
+      :scope,
+      :filter,
+      :extensions,
+    ].freeze
+
+    # Scopes available for the starting point.
+    #
+    # * SCOPE_BASE - the Base DN
+    # * SCOPE_ONE  - one level under the Base DN, not including the base DN and
+    #   not including any entries under this
+    # * SCOPE_SUB  - subtrees, all entries at all levels
+    #
+    SCOPE = [
+      SCOPE_ONE = 'one',
+      SCOPE_SUB = 'sub',
+      SCOPE_BASE = 'base',
+    ].freeze
+
+    #
+    # == Description
+    #
+    # Creates a new Bundler::URI::LDAP object from components, with syntax checking.
+    #
+    # The components accepted are host, port, dn, attributes,
+    # scope, filter, and extensions.
+    #
+    # The components should be provided either as an Array, or as a Hash
+    # with keys formed by preceding the component names with a colon.
+    #
+    # If an Array is used, the components must be passed in the
+    # order <code>[host, port, dn, attributes, scope, filter, extensions]</code>.
+    #
+    # Example:
+    #
+    #     uri = Bundler::URI::LDAP.build({:host => 'ldap.example.com',
+    #       :dn => '/dc=example'})
+    #
+    #     uri = Bundler::URI::LDAP.build(["ldap.example.com", nil,
+    #       "/dc=example;dc=com", "query", nil, nil, nil])
+    #
+    def self.build(args)
+      tmp = Util::make_components_hash(self, args)
+
+      if tmp[:dn]
+        tmp[:path] = tmp[:dn]
+      end
+
+      query = []
+      [:extensions, :filter, :scope, :attributes].collect do |x|
+        next if !tmp[x] && query.size == 0
+        query.unshift(tmp[x])
+      end
+
+      tmp[:query] = query.join('?')
+
+      return super(tmp)
+    end
+
+    #
+    # == Description
+    #
+    # Creates a new Bundler::URI::LDAP object from generic Bundler::URI components as per
+    # RFC 2396. No LDAP-specific syntax checking is performed.
+    #
+    # Arguments are +scheme+, +userinfo+, +host+, +port+, +registry+, +path+,
+    # +opaque+, +query+, and +fragment+, in that order.
+    #
+    # Example:
+    #
+    #     uri = Bundler::URI::LDAP.new("ldap", nil, "ldap.example.com", nil, nil,
+    #       "/dc=example;dc=com", nil, "query", nil)
+    #
+    # See also Bundler::URI::Generic.new.
+    #
+    def initialize(*arg)
+      super(*arg)
+
+      if @fragment
+        raise InvalidURIError, 'bad LDAP URL'
+      end
+
+      parse_dn
+      parse_query
+    end
+
+    # Private method to cleanup +dn+ from using the +path+ component attribute.
+    def parse_dn
+      @dn = @path[1..-1]
+    end
+    private :parse_dn
+
+    # Private method to cleanup +attributes+, +scope+, +filter+, and +extensions+
+    # from using the +query+ component attribute.
+    def parse_query
+      @attributes = nil
+      @scope      = nil
+      @filter     = nil
+      @extensions = nil
+
+      if @query
+        attrs, scope, filter, extensions = @query.split('?')
+
+        @attributes = attrs if attrs && attrs.size > 0
+        @scope      = scope if scope && scope.size > 0
+        @filter     = filter if filter && filter.size > 0
+        @extensions = extensions if extensions && extensions.size > 0
+      end
+    end
+    private :parse_query
+
+    # Private method to assemble +query+ from +attributes+, +scope+, +filter+, and +extensions+.
+    def build_path_query
+      @path = '/' + @dn
+
+      query = []
+      [@extensions, @filter, @scope, @attributes].each do |x|
+        next if !x && query.size == 0
+        query.unshift(x)
+      end
+      @query = query.join('?')
+    end
+    private :build_path_query
+
+    # Returns dn.
+    def dn
+      @dn
+    end
+
+    # Private setter for dn +val+.
+    def set_dn(val)
+      @dn = val
+      build_path_query
+      @dn
+    end
+    protected :set_dn
+
+    # Setter for dn +val+.
+    def dn=(val)
+      set_dn(val)
+      val
+    end
+
+    # Returns attributes.
+    def attributes
+      @attributes
+    end
+
+    # Private setter for attributes +val+.
+    def set_attributes(val)
+      @attributes = val
+      build_path_query
+      @attributes
+    end
+    protected :set_attributes
+
+    # Setter for attributes +val+.
+    def attributes=(val)
+      set_attributes(val)
+      val
+    end
+
+    # Returns scope.
+    def scope
+      @scope
+    end
+
+    # Private setter for scope +val+.
+    def set_scope(val)
+      @scope = val
+      build_path_query
+      @scope
+    end
+    protected :set_scope
+
+    # Setter for scope +val+.
+    def scope=(val)
+      set_scope(val)
+      val
+    end
+
+    # Returns filter.
+    def filter
+      @filter
+    end
+
+    # Private setter for filter +val+.
+    def set_filter(val)
+      @filter = val
+      build_path_query
+      @filter
+    end
+    protected :set_filter
+
+    # Setter for filter +val+.
+    def filter=(val)
+      set_filter(val)
+      val
+    end
+
+    # Returns extensions.
+    def extensions
+      @extensions
+    end
+
+    # Private setter for extensions +val+.
+    def set_extensions(val)
+      @extensions = val
+      build_path_query
+      @extensions
+    end
+    protected :set_extensions
+
+    # Setter for extensions +val+.
+    def extensions=(val)
+      set_extensions(val)
+      val
+    end
+
+    # Checks if Bundler::URI has a path.
+    # For Bundler::URI::LDAP this will return +false+.
+    def hierarchical?
+      false
+    end
+  end
+
+  @@schemes['LDAP'] = LDAP
+end
diff --git a/lib/bundler/vendor/uri/lib/uri/ldaps.rb b/lib/bundler/vendor/uri/lib/uri/ldaps.rb
new file mode 100644
index 0000000000..0af35bb16b
--- /dev/null
+++ b/lib/bundler/vendor/uri/lib/uri/ldaps.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: false
+# = uri/ldap.rb
+#
+# License:: You can redistribute it and/or modify it under the same term as Ruby.
+#
+# See Bundler::URI for general documentation
+#
+
+require_relative 'ldap'
+
+module Bundler::URI
+
+  # The default port for LDAPS URIs is 636, and the scheme is 'ldaps:' rather
+  # than 'ldap:'. Other than that, LDAPS URIs are identical to LDAP URIs;
+  # see Bundler::URI::LDAP.
+  class LDAPS < LDAP
+    # A Default port of 636 for Bundler::URI::LDAPS
+    DEFAULT_PORT = 636
+  end
+  @@schemes['LDAPS'] = LDAPS
+end
diff --git a/lib/bundler/vendor/uri/lib/uri/mailto.rb b/lib/bundler/vendor/uri/lib/uri/mailto.rb
new file mode 100644
index 0000000000..5b2a4765c8
--- /dev/null
+++ b/lib/bundler/vendor/uri/lib/uri/mailto.rb
@@ -0,0 +1,294 @@
+# frozen_string_literal: false
+# = uri/mailto.rb
+#
+# Author:: Akira Yamada <akira@ruby-lang.org>
+# License:: You can redistribute it and/or modify it under the same term as Ruby.
+# Revision:: $Id$
+#
+# See Bundler::URI for general documentation
+#
+
+require_relative 'generic'
+
+module Bundler::URI
+
+  #
+  # RFC6068, the mailto URL scheme.
+  #
+  class MailTo < Generic
+    include REGEXP
+
+    # A Default port of nil for Bundler::URI::MailTo.
+    DEFAULT_PORT = nil
+
+    # An Array of the available components for Bundler::URI::MailTo.
+    COMPONENT = [ :scheme, :to, :headers ].freeze
+
+    # :stopdoc:
+    #  "hname" and "hvalue" are encodings of an RFC 822 header name and
+    #  value, respectively. As with "to", all URL reserved characters must
+    #  be encoded.
+    #
+    #  "#mailbox" is as specified in RFC 822 [RFC822]. This means that it
+    #  consists of zero or more comma-separated mail addresses, possibly
+    #  including "phrase" and "comment" components. Note that all URL
+    #  reserved characters in "to" must be encoded: in particular,
+    #  parentheses, commas, and the percent sign ("%"), which commonly occur
+    #  in the "mailbox" syntax.
+    #
+    #  Within mailto URLs, the characters "?", "=", "&" are reserved.
+
+    # ; RFC 6068
+    # hfields      = "?" hfield *( "&" hfield )
+    # hfield       = hfname "=" hfvalue
+    # hfname       = *qchar
+    # hfvalue      = *qchar
+    # qchar        = unreserved / pct-encoded / some-delims
+    # some-delims  = "!" / "$" / "'" / "(" / ")" / "*"
+    #              / "+" / "," / ";" / ":" / "@"
+    #
+    # ; RFC3986
+    # unreserved   = ALPHA / DIGIT / "-" / "." / "_" / "~"
+    # pct-encoded  = "%" HEXDIG HEXDIG
+    HEADER_REGEXP  = /\A(?<hfield>(?:%\h\h|[!$'-.0-;@-Z_a-z~])*=(?:%\h\h|[!$'-.0-;@-Z_a-z~])*)(?:&\g<hfield>)*\z/
+    # practical regexp for email address
+    # https://html.spec.whatwg.org/multipage/input.html#valid-e-mail-address
+    EMAIL_REGEXP = /\A[a-zA-Z0-9.!\#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*\z/
+    # :startdoc:
+
+    #
+    # == Description
+    #
+    # Creates a new Bundler::URI::MailTo object from components, with syntax checking.
+    #
+    # Components can be provided as an Array or Hash. If an Array is used,
+    # the components must be supplied as <code>[to, headers]</code>.
+    #
+    # If a Hash is used, the keys are the component names preceded by colons.
+    #
+    # The headers can be supplied as a pre-encoded string, such as
+    # <code>"subject=subscribe&cc=address"</code>, or as an Array of Arrays
+    # like <code>[['subject', 'subscribe'], ['cc', 'address']]</code>.
+    #
+    # Examples:
+    #
+    #    require 'bundler/vendor/uri/lib/uri'
+    #
+    #    m1 = Bundler::URI::MailTo.build(['joe@example.com', 'subject=Ruby'])
+    #    m1.to_s  # => "mailto:joe@example.com?subject=Ruby"
+    #
+    #    m2 = Bundler::URI::MailTo.build(['john@example.com', [['Subject', 'Ruby'], ['Cc', 'jack@example.com']]])
+    #    m2.to_s  # => "mailto:john@example.com?Subject=Ruby&Cc=jack@example.com"
+    #
+    #    m3 = Bundler::URI::MailTo.build({:to => 'listman@example.com', :headers => [['subject', 'subscribe']]})
+    #    m3.to_s  # => "mailto:listman@example.com?subject=subscribe"
+    #
+    def self.build(args)
+      tmp = Util.make_components_hash(self, args)
+
+      case tmp[:to]
+      when Array
+        tmp[:opaque] = tmp[:to].join(',')
+      when String
+        tmp[:opaque] = tmp[:to].dup
+      else
+        tmp[:opaque] = ''
+      end
+
+      if tmp[:headers]
+        query =
+          case tmp[:headers]
+          when Array
+            tmp[:headers].collect { |x|
+              if x.kind_of?(Array)
+                x[0] + '=' + x[1..-1].join
+              else
+                x.to_s
+              end
+            }.join('&')
+          when Hash
+            tmp[:headers].collect { |h,v|
+              h + '=' + v
+            }.join('&')
+          else
+            tmp[:headers].to_s
+          end
+        unless query.empty?
+          tmp[:opaque] << '?' << query
+        end
+      end
+
+      super(tmp)
+    end
+
+    #
+    # == Description
+    #
+    # Creates a new Bundler::URI::MailTo object from generic URL components with
+    # no syntax checking.
+    #
+    # This method is usually called from Bundler::URI::parse, which checks
+    # the validity of each component.
+    #
+    def initialize(*arg)
+      super(*arg)
+
+      @to = nil
+      @headers = []
+
+      # The RFC3986 parser does not normally populate opaque
+      @opaque = "?#{@query}" if @query && !@opaque
+
+      unless @opaque
+        raise InvalidComponentError,
+          "missing opaque part for mailto URL"
+      end
+      to, header = @opaque.split('?', 2)
+      # allow semicolon as a addr-spec separator
+      # http://support.microsoft.com/kb/820868
+      unless /\A(?:[^@,;]+@[^@,;]+(?:\z|[,;]))*\z/ =~ to
+        raise InvalidComponentError,
+          "unrecognised opaque part for mailtoURL: #{@opaque}"
+      end
+
+      if arg[10] # arg_check
+        self.to = to
+        self.headers = header
+      else
+        set_to(to)
+        set_headers(header)
+      end
+    end
+
+    # The primary e-mail address of the URL, as a String.
+    attr_reader :to
+
+    # E-mail headers set by the URL, as an Array of Arrays.
+    attr_reader :headers
+
+    # Checks the to +v+ component.
+    def check_to(v)
+      return true unless v
+      return true if v.size == 0
+
+      v.split(/[,;]/).each do |addr|
+        # check url safety as path-rootless
+        if /\A(?:%\h\h|[!$&-.0-;=@-Z_a-z~])*\z/ !~ addr
+          raise InvalidComponentError,
+            "an address in 'to' is invalid as Bundler::URI #{addr.dump}"
+        end
+
+        # check addr-spec
+        # don't s/\+/ /g
+        addr.gsub!(/%\h\h/, Bundler::URI::TBLDECWWWCOMP_)
+        if EMAIL_REGEXP !~ addr
+          raise InvalidComponentError,
+            "an address in 'to' is invalid as uri-escaped addr-spec #{addr.dump}"
+        end
+      end
+
+      true
+    end
+    private :check_to
+
+    # Private setter for to +v+.
+    def set_to(v)
+      @to = v
+    end
+    protected :set_to
+
+    # Setter for to +v+.
+    def to=(v)
+      check_to(v)
+      set_to(v)
+      v
+    end
+
+    # Checks the headers +v+ component against either
+    # * HEADER_REGEXP
+    def check_headers(v)
+      return true unless v
+      return true if v.size == 0
+      if HEADER_REGEXP !~ v
+        raise InvalidComponentError,
+          "bad component(expected opaque component): #{v}"
+      end
+
+      true
+    end
+    private :check_headers
+
+    # Private setter for headers +v+.
+    def set_headers(v)
+      @headers = []
+      if v
+        v.split('&').each do |x|
+          @headers << x.split(/=/, 2)
+        end
+      end
+    end
+    protected :set_headers
+
+    # Setter for headers +v+.
+    def headers=(v)
+      check_headers(v)
+      set_headers(v)
+      v
+    end
+
+    # Constructs String from Bundler::URI.
+    def to_s
+      @scheme + ':' +
+        if @to
+          @to
+        else
+          ''
+        end +
+        if @headers.size > 0
+          '?' + @headers.collect{|x| x.join('=')}.join('&')
+        else
+          ''
+        end +
+        if @fragment
+          '#' + @fragment
+        else
+          ''
+        end
+    end
+
+    # Returns the RFC822 e-mail text equivalent of the URL, as a String.
+    #
+    # Example:
+    #
+    #   require 'bundler/vendor/uri/lib/uri'
+    #
+    #   uri = Bundler::URI.parse("mailto:ruby-list@ruby-lang.org?Subject=subscribe&cc=myaddr")
+    #   uri.to_mailtext
+    #   # => "To: ruby-list@ruby-lang.org\nSubject: subscribe\nCc: myaddr\n\n\n"
+    #
+    def to_mailtext
+      to = Bundler::URI.decode_www_form_component(@to)
+      head = ''
+      body = ''
+      @headers.each do |x|
+        case x[0]
+        when 'body'
+          body = Bundler::URI.decode_www_form_component(x[1])
+        when 'to'
+          to << ', ' + Bundler::URI.decode_www_form_component(x[1])
+        else
+          head << Bundler::URI.decode_www_form_component(x[0]).capitalize + ': ' +
+            Bundler::URI.decode_www_form_component(x[1])  + "\n"
+        end
+      end
+
+      "To: #{to}
+#{head}
+#{body}
+"
+    end
+    alias to_rfc822text to_mailtext
+  end
+
+  @@schemes['MAILTO'] = MailTo
+end
diff --git a/lib/bundler/vendor/uri/lib/uri/rfc2396_parser.rb b/lib/bundler/vendor/uri/lib/uri/rfc2396_parser.rb
new file mode 100644
index 0000000000..7634e16958
--- /dev/null
+++ b/lib/bundler/vendor/uri/lib/uri/rfc2396_parser.rb
@@ -0,0 +1,546 @@
+# frozen_string_literal: false
+#--
+# = uri/common.rb
+#
+# Author:: Akira Yamada <akira@ruby-lang.org>
+# Revision:: $Id$
+# License::
+#   You can redistribute it and/or modify it under the same term as Ruby.
+#
+# See Bundler::URI for general documentation
+#
+
+module Bundler::URI
+  #
+  # Includes Bundler::URI::REGEXP::PATTERN
+  #
+  module RFC2396_REGEXP
+    #
+    # Patterns used to parse Bundler::URI's
+    #
+    module PATTERN
+      # :stopdoc:
+
+      # RFC 2396 (Bundler::URI Generic Syntax)
+      # RFC 2732 (IPv6 Literal Addresses in URL's)
+      # RFC 2373 (IPv6 Addressing Architecture)
+
+      # alpha         = lowalpha | upalpha
+      ALPHA = "a-zA-Z"
+      # alphanum      = alpha | digit
+      ALNUM = "#{ALPHA}\\d"
+
+      # hex           = digit | "A" | "B" | "C" | "D" | "E" | "F" |
+      #                         "a" | "b" | "c" | "d" | "e" | "f"
+      HEX     = "a-fA-F\\d"
+      # escaped       = "%" hex hex
+      ESCAPED = "%[#{HEX}]{2}"
+      # mark          = "-" | "_" | "." | "!" | "~" | "*" | "'" |
+      #                 "(" | ")"
+      # unreserved    = alphanum | mark
+      UNRESERVED = "\\-_.!~*'()#{ALNUM}"
+      # reserved      = ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" |
+      #                 "$" | ","
+      # reserved      = ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" |
+      #                 "$" | "," | "[" | "]" (RFC 2732)
+      RESERVED = ";/?:@&=+$,\\[\\]"
+
+      # domainlabel   = alphanum | alphanum *( alphanum | "-" ) alphanum
+      DOMLABEL = "(?:[#{ALNUM}](?:[-#{ALNUM}]*[#{ALNUM}])?)"
+      # toplabel      = alpha | alpha *( alphanum | "-" ) alphanum
+      TOPLABEL = "(?:[#{ALPHA}](?:[-#{ALNUM}]*[#{ALNUM}])?)"
+      # hostname      = *( domainlabel "." ) toplabel [ "." ]
+      HOSTNAME = "(?:#{DOMLABEL}\\.)*#{TOPLABEL}\\.?"
+
+      # :startdoc:
+    end # PATTERN
+
+    # :startdoc:
+  end # REGEXP
+
+  # Class that parses String's into Bundler::URI's.
+  #
+  # It contains a Hash set of patterns and Regexp's that match and validate.
+  #
+  class RFC2396_Parser
+    include RFC2396_REGEXP
+
+    #
+    # == Synopsis
+    #
+    #   Bundler::URI::Parser.new([opts])
+    #
+    # == Args
+    #
+    # The constructor accepts a hash as options for parser.
+    # Keys of options are pattern names of Bundler::URI components
+    # and values of options are pattern strings.
+    # The constructor generates set of regexps for parsing URIs.
+    #
+    # You can use the following keys:
+    #
+    #   * :ESCAPED (Bundler::URI::PATTERN::ESCAPED in default)
+    #   * :UNRESERVED (Bundler::URI::PATTERN::UNRESERVED in default)
+    #   * :DOMLABEL (Bundler::URI::PATTERN::DOMLABEL in default)
+    #   * :TOPLABEL (Bundler::URI::PATTERN::TOPLABEL in default)
+    #   * :HOSTNAME (Bundler::URI::PATTERN::HOSTNAME in default)
+    #
+    # == Examples
+    #
+    #   p = Bundler::URI::Parser.new(:ESCAPED => "(?:%[a-fA-F0-9]{2}|%u[a-fA-F0-9]{4})")
+    #   u = p.parse("http://example.jp/%uABCD") #=> #<Bundler::URI::HTTP http://example.jp/%uABCD>
+    #   Bundler::URI.parse(u.to_s) #=> raises Bundler::URI::InvalidURIError
+    #
+    #   s = "http://example.com/ABCD"
+    #   u1 = p.parse(s) #=> #<Bundler::URI::HTTP http://example.com/ABCD>
+    #   u2 = Bundler::URI.parse(s) #=> #<Bundler::URI::HTTP http://example.com/ABCD>
+    #   u1 == u2 #=> true
+    #   u1.eql?(u2) #=> false
+    #
+    def initialize(opts = {})
+      @pattern = initialize_pattern(opts)
+      @pattern.each_value(&:freeze)
+      @pattern.freeze
+
+      @regexp = initialize_regexp(@pattern)
+      @regexp.each_value(&:freeze)
+      @regexp.freeze
+    end
+
+    # The Hash of patterns.
+    #
+    # See also Bundler::URI::Parser.initialize_pattern.
+    attr_reader :pattern
+
+    # The Hash of Regexp.
+    #
+    # See also Bundler::URI::Parser.initialize_regexp.
+    attr_reader :regexp
+
+    # Returns a split Bundler::URI against regexp[:ABS_URI].
+    def split(uri)
+      case uri
+      when ''
+        # null uri
+
+      when @regexp[:ABS_URI]
+        scheme, opaque, userinfo, host, port,
+          registry, path, query, fragment = $~[1..-1]
+
+        # Bundler::URI-reference = [ absoluteURI | relativeURI ] [ "#" fragment ]
+
+        # absoluteURI   = scheme ":" ( hier_part | opaque_part )
+        # hier_part     = ( net_path | abs_path ) [ "?" query ]
+        # opaque_part   = uric_no_slash *uric
+
+        # abs_path      = "/"  path_segments
+        # net_path      = "//" authority [ abs_path ]
+
+        # authority     = server | reg_name
+        # server        = [ [ userinfo "@" ] hostport ]
+
+        if !scheme
+          raise InvalidURIError,
+            "bad Bundler::URI(absolute but no scheme): #{uri}"
+        end
+        if !opaque && (!path && (!host && !registry))
+          raise InvalidURIError,
+            "bad Bundler::URI(absolute but no path): #{uri}"
+        end
+
+      when @regexp[:REL_URI]
+        scheme = nil
+        opaque = nil
+
+        userinfo, host, port, registry,
+          rel_segment, abs_path, query, fragment = $~[1..-1]
+        if rel_segment && abs_path
+          path = rel_segment + abs_path
+        elsif rel_segment
+          path = rel_segment
+        elsif abs_path
+          path = abs_path
+        end
+
+        # Bundler::URI-reference = [ absoluteURI | relativeURI ] [ "#" fragment ]
+
+        # relativeURI   = ( net_path | abs_path | rel_path ) [ "?" query ]
+
+        # net_path      = "//" authority [ abs_path ]
+        # abs_path      = "/"  path_segments
+        # rel_path      = rel_segment [ abs_path ]
+
+        # authority     = server | reg_name
+        # server        = [ [ userinfo "@" ] hostport ]
+
+      else
+        raise InvalidURIError, "bad Bundler::URI(is not Bundler::URI?): #{uri}"
+      end
+
+      path = '' if !path && !opaque # (see RFC2396 Section 5.2)
+      ret = [
+        scheme,
+        userinfo, host, port,         # X
+        registry,                     # X
+        path,                         # Y
+        opaque,                       # Y
+        query,
+        fragment
+      ]
+      return ret
+    end
+
+    #
+    # == Args
+    #
+    # +uri+::
+    #    String
+    #
+    # == Description
+    #
+    # Parses +uri+ and constructs either matching Bundler::URI scheme object
+    # (File, FTP, HTTP, HTTPS, LDAP, LDAPS, or MailTo) or Bundler::URI::Generic.
+    #
+    # == Usage
+    #
+    #   p = Bundler::URI::Parser.new
+    #   p.parse("ldap://ldap.example.com/dc=example?user=john")
+    #   #=> #<Bundler::URI::LDAP ldap://ldap.example.com/dc=example?user=john>
+    #
+    def parse(uri)
+      scheme, userinfo, host, port,
+        registry, path, opaque, query, fragment = self.split(uri)
+
+      if scheme && Bundler::URI.scheme_list.include?(scheme.upcase)
+        Bundler::URI.scheme_list[scheme.upcase].new(scheme, userinfo, host, port,
+                                           registry, path, opaque, query,
+                                           fragment, self)
+      else
+        Generic.new(scheme, userinfo, host, port,
+                    registry, path, opaque, query,
+                    fragment, self)
+      end
+    end
+
+
+    #
+    # == Args
+    #
+    # +uris+::
+    #    an Array of Strings
+    #
+    # == Description
+    #
+    # Attempts to parse and merge a set of URIs.
+    #
+    def join(*uris)
+      uris[0] = convert_to_uri(uris[0])
+      uris.inject :merge
+    end
+
+    #
+    # :call-seq:
+    #   extract( str )
+    #   extract( str, schemes )
+    #   extract( str, schemes ) {|item| block }
+    #
+    # == Args
+    #
+    # +str+::
+    #    String to search
+    # +schemes+::
+    #    Patterns to apply to +str+
+    #
+    # == Description
+    #
+    # Attempts to parse and merge a set of URIs.
+    # If no +block+ given, then returns the result,
+    # else it calls +block+ for each element in result.
+    #
+    # See also Bundler::URI::Parser.make_regexp.
+    #
+    def extract(str, schemes = nil)
+      if block_given?
+        str.scan(make_regexp(schemes)) { yield $& }
+        nil
+      else
+        result = []
+        str.scan(make_regexp(schemes)) { result.push $& }
+        result
+      end
+    end
+
+    # Returns Regexp that is default self.regexp[:ABS_URI_REF],
+    # unless +schemes+ is provided. Then it is a Regexp.union with self.pattern[:X_ABS_URI].
+    def make_regexp(schemes = nil)
+      unless schemes
+        @regexp[:ABS_URI_REF]
+      else
+        /(?=#{Regexp.union(*schemes)}:)#{@pattern[:X_ABS_URI]}/x
+      end
+    end
+
+    #
+    # :call-seq:
+    #   escape( str )
+    #   escape( str, unsafe )
+    #
+    # == Args
+    #
+    # +str+::
+    #    String to make safe
+    # +unsafe+::
+    #    Regexp to apply. Defaults to self.regexp[:UNSAFE]
+    #
+    # == Description
+    #
+    # Constructs a safe String from +str+, removing unsafe characters,
+    # replacing them with codes.
+    #
+    def escape(str, unsafe = @regexp[:UNSAFE])
+      unless unsafe.kind_of?(Regexp)
+        # perhaps unsafe is String object
+        unsafe = Regexp.new("[#{Regexp.quote(unsafe)}]", false)
+      end
+      str.gsub(unsafe) do
+        us = $&
+        tmp = ''
+        us.each_byte do |uc|
+          tmp << sprintf('%%%02X', uc)
+        end
+        tmp
+      end.force_encoding(Encoding::US_ASCII)
+    end
+
+    #
+    # :call-seq:
+    #   unescape( str )
+    #   unescape( str, escaped )
+    #
+    # == Args
+    #
+    # +str+::
+    #    String to remove escapes from
+    # +escaped+::
+    #    Regexp to apply. Defaults to self.regexp[:ESCAPED]
+    #
+    # == Description
+    #
+    # Removes escapes from +str+.
+    #
+    def unescape(str, escaped = @regexp[:ESCAPED])
+      enc = str.encoding
+      enc = Encoding::UTF_8 if enc == Encoding::US_ASCII
+      str.gsub(escaped) { [$&[1, 2]].pack('H2').force_encoding(enc) }
+    end
+
+    @@to_s = Kernel.instance_method(:to_s)
+    def inspect
+      @@to_s.bind_call(self)
+    end
+
+    private
+
+    # Constructs the default Hash of patterns.
+    def initialize_pattern(opts = {})
+      ret = {}
+      ret[:ESCAPED] = escaped = (opts.delete(:ESCAPED) || PATTERN::ESCAPED)
+      ret[:UNRESERVED] = unreserved = opts.delete(:UNRESERVED) || PATTERN::UNRESERVED
+      ret[:RESERVED] = reserved = opts.delete(:RESERVED) || PATTERN::RESERVED
+      ret[:DOMLABEL] = opts.delete(:DOMLABEL) || PATTERN::DOMLABEL
+      ret[:TOPLABEL] = opts.delete(:TOPLABEL) || PATTERN::TOPLABEL
+      ret[:HOSTNAME] = hostname = opts.delete(:HOSTNAME)
+
+      # RFC 2396 (Bundler::URI Generic Syntax)
+      # RFC 2732 (IPv6 Literal Addresses in URL's)
+      # RFC 2373 (IPv6 Addressing Architecture)
+
+      # uric          = reserved | unreserved | escaped
+      ret[:URIC] = uric = "(?:[#{unreserved}#{reserved}]|#{escaped})"
+      # uric_no_slash = unreserved | escaped | ";" | "?" | ":" | "@" |
+      #                 "&" | "=" | "+" | "$" | ","
+      ret[:URIC_NO_SLASH] = uric_no_slash = "(?:[#{unreserved};?:@&=+$,]|#{escaped})"
+      # query         = *uric
+      ret[:QUERY] = query = "#{uric}*"
+      # fragment      = *uric
+      ret[:FRAGMENT] = fragment = "#{uric}*"
+
+      # hostname      = *( domainlabel "." ) toplabel [ "." ]
+      # reg-name      = *( unreserved / pct-encoded / sub-delims ) # RFC3986
+      unless hostname
+        ret[:HOSTNAME] = hostname = "(?:[a-zA-Z0-9\\-.]|%\\h\\h)+"
+      end
+
+      # RFC 2373, APPENDIX B:
+      # IPv6address = hexpart [ ":" IPv4address ]
+      # IPv4address   = 1*3DIGIT "." 1*3DIGIT "." 1*3DIGIT "." 1*3DIGIT
+      # hexpart = hexseq | hexseq "::" [ hexseq ] | "::" [ hexseq ]
+      # hexseq  = hex4 *( ":" hex4)
+      # hex4    = 1*4HEXDIG
+      #
+      # XXX: This definition has a flaw. "::" + IPv4address must be
+      # allowed too.  Here is a replacement.
+      #
+      # IPv4address = 1*3DIGIT "." 1*3DIGIT "." 1*3DIGIT "." 1*3DIGIT
+      ret[:IPV4ADDR] = ipv4addr = "\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}"
+      # hex4     = 1*4HEXDIG
+      hex4 = "[#{PATTERN::HEX}]{1,4}"
+      # lastpart = hex4 | IPv4address
+      lastpart = "(?:#{hex4}|#{ipv4addr})"
+      # hexseq1  = *( hex4 ":" ) hex4
+      hexseq1 = "(?:#{hex4}:)*#{hex4}"
+      # hexseq2  = *( hex4 ":" ) lastpart
+      hexseq2 = "(?:#{hex4}:)*#{lastpart}"
+      # IPv6address = hexseq2 | [ hexseq1 ] "::" [ hexseq2 ]
+      ret[:IPV6ADDR] = ipv6addr = "(?:#{hexseq2}|(?:#{hexseq1})?::(?:#{hexseq2})?)"
+
+      # IPv6prefix  = ( hexseq1 | [ hexseq1 ] "::" [ hexseq1 ] ) "/" 1*2DIGIT
+      # unused
+
+      # ipv6reference = "[" IPv6address "]" (RFC 2732)
+      ret[:IPV6REF] = ipv6ref = "\\[#{ipv6addr}\\]"
+
+      # host          = hostname | IPv4address
+      # host          = hostname | IPv4address | IPv6reference (RFC 2732)
+      ret[:HOST] = host = "(?:#{hostname}|#{ipv4addr}|#{ipv6ref})"
+      # port          = *digit
+      ret[:PORT] = port = '\d*'
+      # hostport      = host [ ":" port ]
+      ret[:HOSTPORT] = hostport = "#{host}(?::#{port})?"
+
+      # userinfo      = *( unreserved | escaped |
+      #                    ";" | ":" | "&" | "=" | "+" | "$" | "," )
+      ret[:USERINFO] = userinfo = "(?:[#{unreserved};:&=+$,]|#{escaped})*"
+
+      # pchar         = unreserved | escaped |
+      #                 ":" | "@" | "&" | "=" | "+" | "$" | ","
+      pchar = "(?:[#{unreserved}:@&=+$,]|#{escaped})"
+      # param         = *pchar
+      param = "#{pchar}*"
+      # segment       = *pchar *( ";" param )
+      segment = "#{pchar}*(?:;#{param})*"
+      # path_segments = segment *( "/" segment )
+      ret[:PATH_SEGMENTS] = path_segments = "#{segment}(?:/#{segment})*"
+
+      # server        = [ [ userinfo "@" ] hostport ]
+      server = "(?:#{userinfo}@)?#{hostport}"
+      # reg_name      = 1*( unreserved | escaped | "$" | "," |
+      #                     ";" | ":" | "@" | "&" | "=" | "+" )
+      ret[:REG_NAME] = reg_name = "(?:[#{unreserved}$,;:@&=+]|#{escaped})+"
+      # authority     = server | reg_name
+      authority = "(?:#{server}|#{reg_name})"
+
+      # rel_segment   = 1*( unreserved | escaped |
+      #                     ";" | "@" | "&" | "=" | "+" | "$" | "," )
+      ret[:REL_SEGMENT] = rel_segment = "(?:[#{unreserved};@&=+$,]|#{escaped})+"
+
+      # scheme        = alpha *( alpha | digit | "+" | "-" | "." )
+      ret[:SCHEME] = scheme = "[#{PATTERN::ALPHA}][\\-+.#{PATTERN::ALPHA}\\d]*"
+
+      # abs_path      = "/"  path_segments
+      ret[:ABS_PATH] = abs_path = "/#{path_segments}"
+      # rel_path      = rel_segment [ abs_path ]
+      ret[:REL_PATH] = rel_path = "#{rel_segment}(?:#{abs_path})?"
+      # net_path      = "//" authority [ abs_path ]
+      ret[:NET_PATH] = net_path = "//#{authority}(?:#{abs_path})?"
+
+      # hier_part     = ( net_path | abs_path ) [ "?" query ]
+      ret[:HIER_PART] = hier_part = "(?:#{net_path}|#{abs_path})(?:\\?(?:#{query}))?"
+      # opaque_part   = uric_no_slash *uric
+      ret[:OPAQUE_PART] = opaque_part = "#{uric_no_slash}#{uric}*"
+
+      # absoluteURI   = scheme ":" ( hier_part | opaque_part )
+      ret[:ABS_URI] = abs_uri = "#{scheme}:(?:#{hier_part}|#{opaque_part})"
+      # relativeURI   = ( net_path | abs_path | rel_path ) [ "?" query ]
+      ret[:REL_URI] = rel_uri = "(?:#{net_path}|#{abs_path}|#{rel_path})(?:\\?#{query})?"
+
+      # Bundler::URI-reference = [ absoluteURI | relativeURI ] [ "#" fragment ]
+      ret[:URI_REF] = "(?:#{abs_uri}|#{rel_uri})?(?:##{fragment})?"
+
+      ret[:X_ABS_URI] = "
+        (#{scheme}):                           (?# 1: scheme)
+        (?:
+           (#{opaque_part})                    (?# 2: opaque)
+        |
+           (?:(?:
+             //(?:
+                 (?:(?:(#{userinfo})@)?        (?# 3: userinfo)
+                   (?:(#{host})(?::(\\d*))?))? (?# 4: host, 5: port)
+               |
+                 (#{reg_name})                 (?# 6: registry)
+               )
+             |
+             (?!//))                           (?# XXX: '//' is the mark for hostport)
+             (#{abs_path})?                    (?# 7: path)
+           )(?:\\?(#{query}))?                 (?# 8: query)
+        )
+        (?:\\#(#{fragment}))?                  (?# 9: fragment)
+      "
+
+      ret[:X_REL_URI] = "
+        (?:
+          (?:
+            //
+            (?:
+              (?:(#{userinfo})@)?       (?# 1: userinfo)
+                (#{host})?(?::(\\d*))?  (?# 2: host, 3: port)
+            |
+              (#{reg_name})             (?# 4: registry)
+            )
+          )
+        |
+          (#{rel_segment})              (?# 5: rel_segment)
+        )?
+        (#{abs_path})?                  (?# 6: abs_path)
+        (?:\\?(#{query}))?              (?# 7: query)
+        (?:\\#(#{fragment}))?           (?# 8: fragment)
+      "
+
+      ret
+    end
+
+    # Constructs the default Hash of Regexp's.
+    def initialize_regexp(pattern)
+      ret = {}
+
+      # for Bundler::URI::split
+      ret[:ABS_URI] = Regexp.new('\A\s*+' + pattern[:X_ABS_URI] + '\s*\z', Regexp::EXTENDED)
+      ret[:REL_URI] = Regexp.new('\A\s*+' + pattern[:X_REL_URI] + '\s*\z', Regexp::EXTENDED)
+
+      # for Bundler::URI::extract
+      ret[:URI_REF]     = Regexp.new(pattern[:URI_REF])
+      ret[:ABS_URI_REF] = Regexp.new(pattern[:X_ABS_URI], Regexp::EXTENDED)
+      ret[:REL_URI_REF] = Regexp.new(pattern[:X_REL_URI], Regexp::EXTENDED)
+
+      # for Bundler::URI::escape/unescape
+      ret[:ESCAPED] = Regexp.new(pattern[:ESCAPED])
+      ret[:UNSAFE]  = Regexp.new("[^#{pattern[:UNRESERVED]}#{pattern[:RESERVED]}]")
+
+      # for Generic#initialize
+      ret[:SCHEME]   = Regexp.new("\\A#{pattern[:SCHEME]}\\z")
+      ret[:USERINFO] = Regexp.new("\\A#{pattern[:USERINFO]}\\z")
+      ret[:HOST]     = Regexp.new("\\A#{pattern[:HOST]}\\z")
+      ret[:PORT]     = Regexp.new("\\A#{pattern[:PORT]}\\z")
+      ret[:OPAQUE]   = Regexp.new("\\A#{pattern[:OPAQUE_PART]}\\z")
+      ret[:REGISTRY] = Regexp.new("\\A#{pattern[:REG_NAME]}\\z")
+      ret[:ABS_PATH] = Regexp.new("\\A#{pattern[:ABS_PATH]}\\z")
+      ret[:REL_PATH] = Regexp.new("\\A#{pattern[:REL_PATH]}\\z")
+      ret[:QUERY]    = Regexp.new("\\A#{pattern[:QUERY]}\\z")
+      ret[:FRAGMENT] = Regexp.new("\\A#{pattern[:FRAGMENT]}\\z")
+
+      ret
+    end
+
+    def convert_to_uri(uri)
+      if uri.is_a?(Bundler::URI::Generic)
+        uri
+      elsif uri = String.try_convert(uri)
+        parse(uri)
+      else
+        raise ArgumentError,
+          "bad argument (expected Bundler::URI object or Bundler::URI string)"
+      end
+    end
+
+  end # class Parser
+end # module Bundler::URI
diff --git a/lib/bundler/vendor/uri/lib/uri/rfc3986_parser.rb b/lib/bundler/vendor/uri/lib/uri/rfc3986_parser.rb
new file mode 100644
index 0000000000..3d0c7b91f0
--- /dev/null
+++ b/lib/bundler/vendor/uri/lib/uri/rfc3986_parser.rb
@@ -0,0 +1,125 @@
+# frozen_string_literal: false
+module Bundler::URI
+  class RFC3986_Parser # :nodoc:
+    # Bundler::URI defined in RFC3986
+    # this regexp is modified not to host is not empty string
+    RFC3986_URI = /\A(?<Bundler::URI>(?<scheme>[A-Za-z][+\-.0-9A-Za-z]*+):(?<hier-part>\/\/(?<authority>(?:(?<userinfo>(?:%\h\h|[!$&-.0-;=A-Z_a-z~])*+)@)?(?<host>(?<IP-literal>\[(?:(?<IPv6address>(?:\h{1,4}:){6}(?<ls32>\h{1,4}:\h{1,4}|(?<IPv4address>(?<dec-octet>[1-9]\d|1\d{2}|2[0-4]\d|25[0-5]|\d)\.\g<dec-octet>\.\g<dec-octet>\.\g<dec-octet>))|::(?:\h{1,4}:){5}\g<ls32>|\h{1,4}?::(?:\h{1,4}:){4}\g<ls32>|(?:(?:\h{1,4}:)?\h{1,4})?::(?:\h{1,4}:){3}\g<ls32>|(?:(?:\h{1,4}:){,2}\h{1,4})?::(?:\h{1,4}:){2}\g<ls32>|(?:(?:\h{1,4}:){,3}\h{1,4})?::\h{1,4}:\g<ls32>|(?:(?:\h{1,4}:){,4}\h{1,4})?::\g<ls32>|(?:(?:\h{1,4}:){,5}\h{1,4})?::\h{1,4}|(?:(?:\h{1,4}:){,6}\h{1,4})?::)|(?<IPvFuture>v\h++\.[!$&-.0-;=A-Z_a-z~]++))\])|\g<IPv4address>|(?<reg-name>(?:%\h\h|[!$&-.0-9;=A-Z_a-z~])++))?(?::(?<port>\d*+))?)(?<path-abempty>(?:\/(?<segment>(?:%\h\h|[!$&-.0-;=@-Z_a-z~])*+))*+)|(?<path-absolute>\/(?:(?<segment-nz>(?:%\h\h|[!$&-.0-;=@-Z_a-z~])++)(?:\/\g<segment>)*+)?)|(?<path-rootless>\g<segment-nz>(?:\/\g<segment>)*+)|(?<path-empty>))(?:\?(?<query>[^#]*+))?(?:\#(?<fragment>(?:%\h\h|[!$&-.0-;=@-Z_a-z~\/?])*+))?)\z/
+    RFC3986_relative_ref = /\A(?<relative-ref>(?<relative-part>\/\/(?<authority>(?:(?<userinfo>(?:%\h\h|[!$&-.0-;=A-Z_a-z~])*+)@)?(?<host>(?<IP-literal>\[(?:(?<IPv6address>(?:\h{1,4}:){6}(?<ls32>\h{1,4}:\h{1,4}|(?<IPv4address>(?<dec-octet>[1-9]\d|1\d{2}|2[0-4]\d|25[0-5]|\d)\.\g<dec-octet>\.\g<dec-octet>\.\g<dec-octet>))|::(?:\h{1,4}:){5}\g<ls32>|\h{1,4}?::(?:\h{1,4}:){4}\g<ls32>|(?:(?:\h{1,4}:){,1}\h{1,4})?::(?:\h{1,4}:){3}\g<ls32>|(?:(?:\h{1,4}:){,2}\h{1,4})?::(?:\h{1,4}:){2}\g<ls32>|(?:(?:\h{1,4}:){,3}\h{1,4})?::\h{1,4}:\g<ls32>|(?:(?:\h{1,4}:){,4}\h{1,4})?::\g<ls32>|(?:(?:\h{1,4}:){,5}\h{1,4})?::\h{1,4}|(?:(?:\h{1,4}:){,6}\h{1,4})?::)|(?<IPvFuture>v\h++\.[!$&-.0-;=A-Z_a-z~]++))\])|\g<IPv4address>|(?<reg-name>(?:%\h\h|[!$&-.0-9;=A-Z_a-z~])++))?(?::(?<port>\d*+))?)(?<path-abempty>(?:\/(?<segment>(?:%\h\h|[!$&-.0-;=@-Z_a-z~])*+))*+)|(?<path-absolute>\/(?:(?<segment-nz>(?:%\h\h|[!$&-.0-;=@-Z_a-z~])++)(?:\/\g<segment>)*+)?)|(?<path-noscheme>(?<segment-nz-nc>(?:%\h\h|[!$&-.0-9;=@-Z_a-z~])++)(?:\/\g<segment>)*+)|(?<path-empty>))(?:\?(?<query>[^#]*+))?(?:\#(?<fragment>(?:%\h\h|[!$&-.0-;=@-Z_a-z~\/?])*+))?)\z/
+    attr_reader :regexp
+
+    def initialize
+      @regexp = default_regexp.each_value(&:freeze).freeze
+    end
+
+    def split(uri) #:nodoc:
+      begin
+        uri = uri.to_str
+      rescue NoMethodError
+        raise InvalidURIError, "bad Bundler::URI(is not Bundler::URI?): #{uri.inspect}"
+      end
+      uri.ascii_only? or
+        raise InvalidURIError, "Bundler::URI must be ascii only #{uri.dump}"
+      if m = RFC3986_URI.match(uri)
+        query = m["query".freeze]
+        scheme = m["scheme".freeze]
+        opaque = m["path-rootless".freeze]
+        if opaque
+          opaque << "?#{query}" if query
+          [ scheme,
+            nil, # userinfo
+            nil, # host
+            nil, # port
+            nil, # registry
+            nil, # path
+            opaque,
+            nil, # query
+            m["fragment".freeze]
+          ]
+        else # normal
+          [ scheme,
+            m["userinfo".freeze],
+            m["host".freeze],
+            m["port".freeze],
+            nil, # registry
+            (m["path-abempty".freeze] ||
+             m["path-absolute".freeze] ||
+             m["path-empty".freeze]),
+            nil, # opaque
+            query,
+            m["fragment".freeze]
+          ]
+        end
+      elsif m = RFC3986_relative_ref.match(uri)
+        [ nil, # scheme
+          m["userinfo".freeze],
+          m["host".freeze],
+          m["port".freeze],
+          nil, # registry,
+          (m["path-abempty".freeze] ||
+           m["path-absolute".freeze] ||
+           m["path-noscheme".freeze] ||
+           m["path-empty".freeze]),
+          nil, # opaque
+          m["query".freeze],
+          m["fragment".freeze]
+        ]
+      else
+        raise InvalidURIError, "bad Bundler::URI(is not Bundler::URI?): #{uri.inspect}"
+      end
+    end
+
+    def parse(uri) # :nodoc:
+      scheme, userinfo, host, port,
+        registry, path, opaque, query, fragment = self.split(uri)
+      scheme_list = Bundler::URI.scheme_list
+      if scheme && scheme_list.include?(uc = scheme.upcase)
+        scheme_list[uc].new(scheme, userinfo, host, port,
+                            registry, path, opaque, query,
+                            fragment, self)
+      else
+        Generic.new(scheme, userinfo, host, port,
+                    registry, path, opaque, query,
+                    fragment, self)
+      end
+    end
+
+
+    def join(*uris) # :nodoc:
+      uris[0] = convert_to_uri(uris[0])
+      uris.inject :merge
+    end
+
+    @@to_s = Kernel.instance_method(:to_s)
+    def inspect
+      @@to_s.bind_call(self)
+    end
+
+    private
+
+    def default_regexp # :nodoc:
+      {
+        SCHEME: /\A[A-Za-z][A-Za-z0-9+\-.]*\z/,
+        USERINFO: /\A(?:%\h\h|[!$&-.0-;=A-Z_a-z~])*\z/,
+        HOST: /\A(?:(?<IP-literal>\[(?:(?<IPv6address>(?:\h{1,4}:){6}(?<ls32>\h{1,4}:\h{1,4}|(?<IPv4address>(?<dec-octet>[1-9]\d|1\d{2}|2[0-4]\d|25[0-5]|\d)\.\g<dec-octet>\.\g<dec-octet>\.\g<dec-octet>))|::(?:\h{1,4}:){5}\g<ls32>|\h{,4}::(?:\h{1,4}:){4}\g<ls32>|(?:(?:\h{1,4}:)?\h{1,4})?::(?:\h{1,4}:){3}\g<ls32>|(?:(?:\h{1,4}:){,2}\h{1,4})?::(?:\h{1,4}:){2}\g<ls32>|(?:(?:\h{1,4}:){,3}\h{1,4})?::\h{1,4}:\g<ls32>|(?:(?:\h{1,4}:){,4}\h{1,4})?::\g<ls32>|(?:(?:\h{1,4}:){,5}\h{1,4})?::\h{1,4}|(?:(?:\h{1,4}:){,6}\h{1,4})?::)|(?<IPvFuture>v\h+\.[!$&-.0-;=A-Z_a-z~]+))\])|\g<IPv4address>|(?<reg-name>(?:%\h\h|[!$&-.0-9;=A-Z_a-z~])*))\z/,
+        ABS_PATH: /\A\/(?:%\h\h|[!$&-.0-;=@-Z_a-z~])*(?:\/(?:%\h\h|[!$&-.0-;=@-Z_a-z~])*)*\z/,
+        REL_PATH: /\A(?:%\h\h|[!$&-.0-;=@-Z_a-z~])+(?:\/(?:%\h\h|[!$&-.0-;=@-Z_a-z~])*)*\z/,
+        QUERY: /\A(?:%\h\h|[!$&-.0-;=@-Z_a-z~\/?])*\z/,
+        FRAGMENT: /\A(?:%\h\h|[!$&-.0-;=@-Z_a-z~\/?])*\z/,
+        OPAQUE: /\A(?:[^\/].*)?\z/,
+        PORT: /\A[\x09\x0a\x0c\x0d ]*+\d*[\x09\x0a\x0c\x0d ]*\z/,
+      }
+    end
+
+    def convert_to_uri(uri)
+      if uri.is_a?(Bundler::URI::Generic)
+        uri
+      elsif uri = String.try_convert(uri)
+        parse(uri)
+      else
+        raise ArgumentError,
+          "bad argument (expected Bundler::URI object or Bundler::URI string)"
+      end
+    end
+
+  end # class Parser
+end # module Bundler::URI
diff --git a/lib/bundler/vendor/uri/lib/uri/version.rb b/lib/bundler/vendor/uri/lib/uri/version.rb
new file mode 100644
index 0000000000..02079b26d4
--- /dev/null
+++ b/lib/bundler/vendor/uri/lib/uri/version.rb
@@ -0,0 +1,6 @@
+module Bundler::URI
+  # :stopdoc:
+  VERSION_CODE = '00100003'.freeze
+  VERSION = VERSION_CODE.scan(/../).collect{|n| n.to_i}.join('.').freeze
+  # :startdoc:
+end
diff --git a/lib/bundler/vendored_fileutils.rb b/lib/bundler/vendored_fileutils.rb
new file mode 100644
index 0000000000..1be1138ce2
--- /dev/null
+++ b/lib/bundler/vendored_fileutils.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+module Bundler; end
+require_relative "vendor/fileutils/lib/fileutils"
diff --git a/lib/bundler/vendored_molinillo.rb b/lib/bundler/vendored_molinillo.rb
new file mode 100644
index 0000000000..d1976f5cb4
--- /dev/null
+++ b/lib/bundler/vendored_molinillo.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+module Bundler; end
+require_relative "vendor/molinillo/lib/molinillo"
diff --git a/lib/bundler/vendored_persistent.rb b/lib/bundler/vendored_persistent.rb
new file mode 100644
index 0000000000..dc9573e025
--- /dev/null
+++ b/lib/bundler/vendored_persistent.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Bundler
+  module Persistent
+    module Net
+      module HTTP
+      end
+    end
+  end
+end
+require_relative "vendor/net-http-persistent/lib/net/http/persistent"
+
+module Bundler
+  class PersistentHTTP < Persistent::Net::HTTP::Persistent
+    def connection_for(uri)
+      super(uri) do |connection|
+        result = yield connection
+        warn_old_tls_version_rubygems_connection(uri, connection)
+        result
+      end
+    end
+
+    def warn_old_tls_version_rubygems_connection(uri, connection)
+      return unless connection.http.use_ssl?
+      return unless (uri.host || "").end_with?("rubygems.org")
+
+      socket = connection.instance_variable_get(:@socket)
+      return unless socket
+      socket_io = socket.io
+      return unless socket_io.respond_to?(:ssl_version)
+      ssl_version = socket_io.ssl_version
+
+      case ssl_version
+      when /TLSv([\d\.]+)/
+        version = Gem::Version.new($1)
+        if version < Gem::Version.new("1.2")
+          Bundler.ui.warn \
+            "Warning: Your Ruby version is compiled against a copy of OpenSSL that is very old. " \
+            "Starting in January 2018, RubyGems.org will refuse connection requests from these " \
+            "very old versions of OpenSSL. If you will need to continue installing gems after " \
+            "January 2018, please follow this guide to upgrade: http://ruby.to/tls-outdated.",
+            :wrap => true
+        end
+      end
+    end
+  end
+end
diff --git a/lib/bundler/vendored_thor.rb b/lib/bundler/vendored_thor.rb
new file mode 100644
index 0000000000..0666cfc9b9
--- /dev/null
+++ b/lib/bundler/vendored_thor.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Bundler
+  def self.require_thor_actions
+    require_relative "vendor/thor/lib/thor/actions"
+  end
+end
+require_relative "vendor/thor/lib/thor"
diff --git a/lib/bundler/vendored_tmpdir.rb b/lib/bundler/vendored_tmpdir.rb
new file mode 100644
index 0000000000..43b4fa75fe
--- /dev/null
+++ b/lib/bundler/vendored_tmpdir.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+module Bundler; end
+require_relative "vendor/tmpdir/lib/tmpdir"
diff --git a/lib/bundler/vendored_tsort.rb b/lib/bundler/vendored_tsort.rb
new file mode 100644
index 0000000000..38aed0b5de
--- /dev/null
+++ b/lib/bundler/vendored_tsort.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+module Bundler; end
+require_relative "vendor/tsort/lib/tsort"
diff --git a/lib/bundler/vendored_uri.rb b/lib/bundler/vendored_uri.rb
new file mode 100644
index 0000000000..905e8158e8
--- /dev/null
+++ b/lib/bundler/vendored_uri.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+module Bundler; end
+require_relative "vendor/uri/lib/uri"
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
new file mode 100644
index 0000000000..863eeaae5f
--- /dev/null
+++ b/lib/bundler/version.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: false
+
+module Bundler
+  VERSION = "2.2.33".freeze
+
+  def self.bundler_major_version
+    @bundler_major_version ||= VERSION.split(".").first.to_i
+  end
+end
diff --git a/lib/bundler/version_ranges.rb b/lib/bundler/version_ranges.rb
new file mode 100644
index 0000000000..12a956d6a0
--- /dev/null
+++ b/lib/bundler/version_ranges.rb
@@ -0,0 +1,122 @@
+# frozen_string_literal: true
+
+module Bundler
+  module VersionRanges
+    NEq = Struct.new(:version)
+    ReqR = Struct.new(:left, :right)
+    class ReqR
+      Endpoint = Struct.new(:version, :inclusive) do
+        def <=>(other)
+          if version.equal?(INFINITY)
+            return 0 if other.version.equal?(INFINITY)
+            return 1
+          elsif other.version.equal?(INFINITY)
+            return -1
+          end
+
+          comp = version <=> other.version
+          return comp unless comp.zero?
+
+          if inclusive && !other.inclusive
+            1
+          elsif !inclusive && other.inclusive
+            -1
+          else
+            0
+          end
+        end
+      end
+
+      def to_s
+        "#{left.inclusive ? "[" : "("}#{left.version}, #{right.version}#{right.inclusive ? "]" : ")"}"
+      end
+      INFINITY = begin
+        inf = Object.new
+        def inf.to_s
+          "∞"
+        end
+        def inf.<=>(other)
+          return 0 if other.equal?(self)
+          1
+        end
+        inf.freeze
+      end
+      ZERO = Gem::Version.new("0.a")
+
+      def cover?(v)
+        return false if left.inclusive && left.version > v
+        return false if !left.inclusive && left.version >= v
+
+        if right.version != INFINITY
+          return false if right.inclusive && right.version < v
+          return false if !right.inclusive && right.version <= v
+        end
+
+        true
+      end
+
+      def empty?
+        left.version == right.version && !(left.inclusive && right.inclusive)
+      end
+
+      def single?
+        left.version == right.version
+      end
+
+      def <=>(other)
+        return -1 if other.equal?(INFINITY)
+
+        comp = left <=> other.left
+        return comp unless comp.zero?
+
+        right <=> other.right
+      end
+
+      UNIVERSAL = ReqR.new(ReqR::Endpoint.new(Gem::Version.new("0.a"), true), ReqR::Endpoint.new(ReqR::INFINITY, false)).freeze
+    end
+
+    def self.for_many(requirements)
+      requirements = requirements.map(&:requirements).flatten(1).map {|r| r.join(" ") }
+      requirements << ">= 0.a" if requirements.empty?
+      requirement = Gem::Requirement.new(requirements)
+      self.for(requirement)
+    end
+
+    def self.for(requirement)
+      ranges = requirement.requirements.map do |op, v|
+        case op
+        when "=" then ReqR.new(ReqR::Endpoint.new(v, true), ReqR::Endpoint.new(v, true))
+        when "!=" then NEq.new(v)
+        when ">=" then ReqR.new(ReqR::Endpoint.new(v, true), ReqR::Endpoint.new(ReqR::INFINITY, false))
+        when ">" then ReqR.new(ReqR::Endpoint.new(v, false), ReqR::Endpoint.new(ReqR::INFINITY, false))
+        when "<" then ReqR.new(ReqR::Endpoint.new(ReqR::ZERO, true), ReqR::Endpoint.new(v, false))
+        when "<=" then ReqR.new(ReqR::Endpoint.new(ReqR::ZERO, true), ReqR::Endpoint.new(v, true))
+        when "~>" then ReqR.new(ReqR::Endpoint.new(v, true), ReqR::Endpoint.new(v.bump, false))
+        else raise "unknown version op #{op} in requirement #{requirement}"
+        end
+      end.uniq
+      ranges, neqs = ranges.partition {|r| !r.is_a?(NEq) }
+
+      [ranges.sort, neqs.map(&:version)]
+    end
+
+    def self.empty?(ranges, neqs)
+      !ranges.reduce(ReqR::UNIVERSAL) do |last_range, curr_range|
+        next false unless last_range
+        next false if curr_range.single? && neqs.include?(curr_range.left.version)
+        next curr_range if last_range.right.version == ReqR::INFINITY
+        case last_range.right.version <=> curr_range.left.version
+        # higher
+        when 1 then next ReqR.new(curr_range.left, last_range.right)
+        # equal
+        when 0
+          if last_range.right.inclusive && curr_range.left.inclusive && !neqs.include?(curr_range.left.version)
+            ReqR.new(curr_range.left, [curr_range.right, last_range.right].max)
+          end
+        # lower
+        when -1 then next false
+        end
+      end
+    end
+  end
+end
diff --git a/lib/bundler/vlad.rb b/lib/bundler/vlad.rb
new file mode 100644
index 0000000000..538e8c3e74
--- /dev/null
+++ b/lib/bundler/vlad.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require_relative "shared_helpers"
+Bundler::SharedHelpers.major_deprecation 2,
+  "The Bundler task for Vlad"
+
+# Vlad task for Bundler.
+#
+# Add "require 'bundler/vlad'" in your Vlad deploy.rb, and
+# include the vlad:bundle:install task in your vlad:deploy task.
+require_relative "deployment"
+
+include Rake::DSL if defined? Rake::DSL
+
+namespace :vlad do
+  Bundler::Deployment.define_task(Rake::RemoteTask, :remote_task, :roles => :app)
+end
diff --git a/lib/bundler/worker.rb b/lib/bundler/worker.rb
new file mode 100644
index 0000000000..5e4ee21c51
--- /dev/null
+++ b/lib/bundler/worker.rb
@@ -0,0 +1,119 @@
+# frozen_string_literal: true
+
+module Bundler
+  class Worker
+    POISON = Object.new
+
+    class WrappedException < StandardError
+      attr_reader :exception
+      def initialize(exn)
+        @exception = exn
+      end
+    end
+
+    # @return [String] the name of the worker
+    attr_reader :name
+
+    # Creates a worker pool of specified size
+    #
+    # @param size [Integer] Size of pool
+    # @param name [String] name the name of the worker
+    # @param func [Proc] job to run in inside the worker pool
+    def initialize(size, name, func)
+      @name = name
+      @request_queue = Thread::Queue.new
+      @response_queue = Thread::Queue.new
+      @func = func
+      @size = size
+      @threads = nil
+      @previous_interrupt_handler = nil
+    end
+
+    # Enqueue a request to be executed in the worker pool
+    #
+    # @param obj [String] mostly it is name of spec that should be downloaded
+    def enq(obj)
+      create_threads unless @threads
+      @request_queue.enq obj
+    end
+
+    # Retrieves results of job function being executed in worker pool
+    def deq
+      result = @response_queue.deq
+      raise result.exception if result.is_a?(WrappedException)
+      result
+    end
+
+    def stop
+      stop_threads
+    end
+
+    private
+
+    def process_queue(i)
+      loop do
+        obj = @request_queue.deq
+        break if obj.equal? POISON
+        @response_queue.enq apply_func(obj, i)
+      end
+    end
+
+    def apply_func(obj, i)
+      @func.call(obj, i)
+    rescue Exception => e # rubocop:disable Lint/RescueException
+      WrappedException.new(e)
+    end
+
+    # Stop the worker threads by sending a poison object down the request queue
+    # so as worker threads after retrieving it, shut themselves down
+    def stop_threads
+      return unless @threads
+
+      @threads.each { @request_queue.enq POISON }
+      @threads.each(&:join)
+
+      remove_interrupt_handler
+
+      @threads = nil
+    end
+
+    def abort_threads
+      Bundler.ui.debug("\n#{caller.join("\n")}")
+      @threads.each(&:exit)
+      exit 1
+    end
+
+    def create_threads
+      creation_errors = []
+
+      @threads = Array.new(@size) do |i|
+        begin
+          Thread.start { process_queue(i) }.tap do |thread|
+            thread.name = "#{name} Worker ##{i}" if thread.respond_to?(:name=)
+          end
+        rescue ThreadError => e
+          creation_errors << e
+          nil
+        end
+      end.compact
+
+      add_interrupt_handler unless @threads.empty?
+
+      return if creation_errors.empty?
+
+      message = "Failed to create threads for the #{name} worker: #{creation_errors.map(&:to_s).uniq.join(", ")}"
+      raise ThreadCreationError, message if @threads.empty?
+      Bundler.ui.info message
+    end
+
+    def add_interrupt_handler
+      @previous_interrupt_handler = trap("INT") { abort_threads }
+    end
+
+    def remove_interrupt_handler
+      return unless @previous_interrupt_handler
+
+      trap "INT", @previous_interrupt_handler
+    end
+  end
+end
diff --git a/lib/bundler/yaml_serializer.rb b/lib/bundler/yaml_serializer.rb
new file mode 100644
index 0000000000..d5ecbd4aef
--- /dev/null
+++ b/lib/bundler/yaml_serializer.rb
@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+module Bundler
+  # A stub yaml serializer that can handle only hashes and strings (as of now).
+  module YAMLSerializer
+    module_function
+
+    def dump(hash)
+      yaml = String.new("---")
+      yaml << dump_hash(hash)
+    end
+
+    def dump_hash(hash)
+      yaml = String.new("\n")
+      hash.each do |k, v|
+        yaml << k << ":"
+        if v.is_a?(Hash)
+          yaml << dump_hash(v).gsub(/^(?!$)/, "  ") # indent all non-empty lines
+        elsif v.is_a?(Array) # Expected to be array of strings
+          yaml << "\n- " << v.map {|s| s.to_s.gsub(/\s+/, " ").inspect }.join("\n- ") << "\n"
+        else
+          yaml << " " << v.to_s.gsub(/\s+/, " ").inspect << "\n"
+        end
+      end
+      yaml
+    end
+
+    ARRAY_REGEX = /
+      ^
+      (?:[ ]*-[ ]) # '- ' before array items
+      (['"]?) # optional opening quote
+      (.*) # value
+      \1 # matching closing quote
+      $
+    /xo.freeze
+
+    HASH_REGEX = /
+      ^
+      ([ ]*) # indentations
+      (.+) # key
+      (?::(?=(?:\s|$))) # :  (without the lookahead the #key includes this when : is present in value)
+      [ ]?
+      (['"]?) # optional opening quote
+      (.*) # value
+      \3 # matching closing quote
+      $
+    /xo.freeze
+
+    def load(str)
+      res = {}
+      stack = [res]
+      last_hash = nil
+      last_empty_key = nil
+      str.split(/\r?\n/).each do |line|
+        if match = HASH_REGEX.match(line)
+          indent, key, quote, val = match.captures
+          key = convert_to_backward_compatible_key(key)
+          depth = indent.scan(/  /).length
+          if quote.empty? && val.empty?
+            new_hash = {}
+            stack[depth][key] = new_hash
+            stack[depth + 1] = new_hash
+            last_empty_key = key
+            last_hash = stack[depth]
+          else
+            stack[depth][key] = val
+          end
+        elsif match = ARRAY_REGEX.match(line)
+          _, val = match.captures
+          last_hash[last_empty_key] = [] unless last_hash[last_empty_key].is_a?(Array)
+
+          last_hash[last_empty_key].push(val)
+        end
+      end
+      res
+    end
+
+    # for settings' keys
+    def convert_to_backward_compatible_key(key)
+      key = "#{key}/" if key =~ /https?:/i && key !~ %r{/\Z}
+      key = key.gsub(".", "__") if key.include?(".")
+      key
+    end
+
+    class << self
+      private :dump_hash, :convert_to_backward_compatible_key
+    end
+  end
+end
diff --git a/lib/cgi.rb b/lib/cgi.rb
index 167b76cef7..6feeaf4624 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 # cgi.rb - cgi support library
 #
@@ -253,7 +253,7 @@
 #           end
 #         end +
 #         cgi.pre do
-#           CGI::escapeHTML(
+#           CGI.escapeHTML(
 #             "params: #{cgi.params.inspect}\n" +
 #             "cookies: #{cgi.cookies.inspect}\n" +
 #             ENV.collect do |key, value|
@@ -288,6 +288,7 @@
 #
 
 class CGI
+  VERSION = "0.2.2"
 end
 
 require 'cgi/core'
diff --git a/lib/cgi/cgi.gemspec b/lib/cgi/cgi.gemspec
new file mode 100644
index 0000000000..1a883934e5
--- /dev/null
+++ b/lib/cgi/cgi.gemspec
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+name = File.basename(__FILE__, ".gemspec")
+version = ["lib", Array.new(name.count("-")+1, "..").join("/")].find do |dir|
+  break File.foreach(File.join(__dir__, dir, "#{name.tr('-', '/')}.rb")) do |line|
+    /^\s*VERSION\s*=\s*"(.*)"/ =~ line and break $1
+  end rescue nil
+end
+
+Gem::Specification.new do |spec|
+  spec.name          = name
+  spec.version       = version
+  spec.authors       = ["Yukihiro Matsumoto"]
+  spec.email         = ["matz@ruby-lang.org"]
+
+  spec.summary       = %q{Support for the Common Gateway Interface protocol.}
+  spec.description   = %q{Support for the Common Gateway Interface protocol.}
+  spec.homepage      = "https://github.com/ruby/cgi"
+  spec.licenses      = ["Ruby", "BSD-2-Clause"]
+  spec.required_ruby_version = ">= 2.5.0"
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z 2>/dev/null`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+end
diff --git a/lib/cgi/cookie.rb b/lib/cgi/cookie.rb
index ffd88b8edb..1a9c1a82c1 100644
--- a/lib/cgi/cookie.rb
+++ b/lib/cgi/cookie.rb
@@ -1,5 +1,5 @@
-# frozen_string_literal: false
-require 'cgi/util'
+# frozen_string_literal: true
+require_relative 'util'
 class CGI
   # Class representing an HTTP cookie.
   #
@@ -40,6 +40,10 @@ class CGI
   class Cookie < Array
     @@accept_charset="UTF-8" unless defined?(@@accept_charset)
 
+    TOKEN_RE = %r"\A[[!-~]&&[^()<>@,;:\\\"/?=\[\]{}]]+\z"
+    PATH_VALUE_RE = %r"\A[[ -~]&&[^;]]*\z"
+    DOMAIN_VALUE_RE = %r"\A(?<label>(?!-)[-A-Za-z0-9]+(?<!-))(?:\.\g<label>)*\z"
+
     # Create a new CGI::Cookie object.
     #
     # :call-seq:
@@ -57,7 +61,7 @@ class CGI
     #
     #   name:: the name of the cookie.  Required.
     #   value:: the cookie's value or list of values.
-    #   path:: the path for which this cookie applies.  Defaults to the
+    #   path:: the path for which this cookie applies.  Defaults to
     #          the value of the +SCRIPT_NAME+ environment variable.
     #   domain:: the domain for which this cookie applies.
     #   expires:: the time at which this cookie expires, as a +Time+ object.
@@ -72,9 +76,8 @@ class CGI
       @domain = nil
       @expires = nil
       if name.kind_of?(String)
-        @name = name
-        %r|^(.*/)|.match(ENV["SCRIPT_NAME"])
-        @path = ($1 or "")
+        self.name = name
+        self.path = (%r|\A(.*/)| =~ ENV["SCRIPT_NAME"] ? $1 : "")
         @secure = false
         @httponly = false
         return super(value)
@@ -85,16 +88,11 @@ class CGI
         raise ArgumentError, "`name' required"
       end
 
-      @name = options["name"]
+      self.name = options["name"]
       value = Array(options["value"])
       # simple support for IE
-      if options["path"]
-        @path = options["path"]
-      else
-        %r|^(.*/)|.match(ENV["SCRIPT_NAME"])
-        @path = ($1 or "")
-      end
-      @domain = options["domain"]
+      self.path = options["path"] || (%r|\A(.*/)| =~ ENV["SCRIPT_NAME"] ? $1 : "")
+      self.domain = options["domain"]
       @expires = options["expires"]
       @secure = options["secure"] == true
       @httponly = options["httponly"] == true
@@ -103,11 +101,35 @@ class CGI
     end
 
     # Name of this cookie, as a +String+
-    attr_accessor :name
+    attr_reader :name
+    # Set name of this cookie
+    def name=(str)
+      if str and !TOKEN_RE.match?(str)
+        raise ArgumentError, "invalid name: #{str.dump}"
+      end
+      @name = str
+    end
+
     # Path for which this cookie applies, as a +String+
-    attr_accessor :path
+    attr_reader :path
+    # Set path for which this cookie applies
+    def path=(str)
+      if str and !PATH_VALUE_RE.match?(str)
+        raise ArgumentError, "invalid path: #{str.dump}"
+      end
+      @path = str
+    end
+
     # Domain for which this cookie applies, as a +String+
-    attr_accessor :domain
+    attr_reader :domain
+    # Set domain for which this cookie applies
+    def domain=(str)
+      if str and ((str = str.b).bytesize > 255 or !DOMAIN_VALUE_RE.match?(str))
+        raise ArgumentError, "invalid domain: #{str.dump}"
+      end
+      @domain = str
+    end
+
     # Time at which this cookie expires, as a +Time+
     attr_accessor :expires
     # True if this cookie is secure; false otherwise
@@ -143,10 +165,10 @@ class CGI
     # Convert the Cookie to its string representation.
     def to_s
       val = collect{|v| CGI.escape(v) }.join("&")
-      buf = "#{@name}=#{val}"
+      buf = "#{@name}=#{val}".dup
       buf << "; domain=#{@domain}" if @domain
       buf << "; path=#{@path}"     if @path
-      buf << "; expires=#{CGI::rfc1123_date(@expires)}" if @expires
+      buf << "; expires=#{CGI.rfc1123_date(@expires)}" if @expires
       buf << "; secure"            if @secure
       buf << "; HttpOnly"          if @httponly
       buf
@@ -162,10 +184,9 @@ class CGI
       cookies = Hash.new([])
       return cookies unless raw_cookie
 
-      raw_cookie.split(/[;,]\s?/).each do |pairs|
+      raw_cookie.split(/;\s?/).each do |pairs|
         name, values = pairs.split('=',2)
         next unless name and values
-        name = CGI.unescape(name)
         values ||= ""
         values = values.split('&').collect{|v| CGI.unescape(v,@@accept_charset) }
         if cookies.has_key?(name)
diff --git a/lib/cgi/core.rb b/lib/cgi/core.rb
index 1a741dcd76..62e606837a 100644
--- a/lib/cgi/core.rb
+++ b/lib/cgi/core.rb
@@ -1,9 +1,16 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #--
 # Methods for generating HTML, parsing CGI-related parameters, and
 # generating HTTP responses.
 #++
 class CGI
+  unless const_defined?(:Util)
+    module Util
+      @@accept_charset = "UTF-8" # :nodoc:
+    end
+    include Util
+    extend Util
+  end
 
   $CGI_ENV = ENV    # for FCGI support
 
@@ -146,7 +153,7 @@ class CGI
   #               "language"   => "ja",
   #               "expires"    => Time.now + 30,
   #               "cookie"     => [cookie1, cookie2],
-  #               "my_header1" => "my_value"
+  #               "my_header1" => "my_value",
   #               "my_header2" => "my_value")
   #
   # This method does not perform charset conversion.
@@ -181,24 +188,35 @@ class CGI
   # Using #header with the HTML5 tag maker will create a <header> element.
   alias :header :http_header
 
+  def _no_crlf_check(str)
+    if str
+      str = str.to_s
+      raise "A HTTP status or header field must not include CR and LF" if str =~ /[\r\n]/
+      str
+    else
+      nil
+    end
+  end
+  private :_no_crlf_check
+
   def _header_for_string(content_type) #:nodoc:
-    buf = ''
+    buf = ''.dup
     if nph?()
-      buf << "#{$CGI_ENV['SERVER_PROTOCOL'] || 'HTTP/1.0'} 200 OK#{EOL}"
+      buf << "#{_no_crlf_check($CGI_ENV['SERVER_PROTOCOL']) || 'HTTP/1.0'} 200 OK#{EOL}"
       buf << "Date: #{CGI.rfc1123_date(Time.now)}#{EOL}"
-      buf << "Server: #{$CGI_ENV['SERVER_SOFTWARE']}#{EOL}"
+      buf << "Server: #{_no_crlf_check($CGI_ENV['SERVER_SOFTWARE'])}#{EOL}"
       buf << "Connection: close#{EOL}"
     end
-    buf << "Content-Type: #{content_type}#{EOL}"
+    buf << "Content-Type: #{_no_crlf_check(content_type)}#{EOL}"
     if @output_cookies
-      @output_cookies.each {|cookie| buf << "Set-Cookie: #{cookie}#{EOL}" }
+      @output_cookies.each {|cookie| buf << "Set-Cookie: #{_no_crlf_check(cookie)}#{EOL}" }
     end
     return buf
   end # _header_for_string
   private :_header_for_string
 
   def _header_for_hash(options)  #:nodoc:
-    buf = ''
+    buf = ''.dup
     ## add charset to option['type']
     options['type'] ||= 'text/html'
     charset = options.delete('charset')
@@ -206,9 +224,9 @@ class CGI
     ## NPH
     options.delete('nph') if defined?(MOD_RUBY)
     if options.delete('nph') || nph?()
-      protocol = $CGI_ENV['SERVER_PROTOCOL'] || 'HTTP/1.0'
+      protocol = _no_crlf_check($CGI_ENV['SERVER_PROTOCOL']) || 'HTTP/1.0'
       status = options.delete('status')
-      status = HTTP_STATUS[status] || status || '200 OK'
+      status = HTTP_STATUS[status] || _no_crlf_check(status) || '200 OK'
       buf << "#{protocol} #{status}#{EOL}"
       buf << "Date: #{CGI.rfc1123_date(Time.now)}#{EOL}"
       options['server'] ||= $CGI_ENV['SERVER_SOFTWARE'] || ''
@@ -216,51 +234,51 @@ class CGI
     end
     ## common headers
     status = options.delete('status')
-    buf << "Status: #{HTTP_STATUS[status] || status}#{EOL}" if status
+    buf << "Status: #{HTTP_STATUS[status] || _no_crlf_check(status)}#{EOL}" if status
     server = options.delete('server')
-    buf << "Server: #{server}#{EOL}" if server
+    buf << "Server: #{_no_crlf_check(server)}#{EOL}" if server
     connection = options.delete('connection')
-    buf << "Connection: #{connection}#{EOL}" if connection
+    buf << "Connection: #{_no_crlf_check(connection)}#{EOL}" if connection
     type = options.delete('type')
-    buf << "Content-Type: #{type}#{EOL}" #if type
+    buf << "Content-Type: #{_no_crlf_check(type)}#{EOL}" #if type
     length = options.delete('length')
-    buf << "Content-Length: #{length}#{EOL}" if length
+    buf << "Content-Length: #{_no_crlf_check(length)}#{EOL}" if length
     language = options.delete('language')
-    buf << "Content-Language: #{language}#{EOL}" if language
+    buf << "Content-Language: #{_no_crlf_check(language)}#{EOL}" if language
     expires = options.delete('expires')
     buf << "Expires: #{CGI.rfc1123_date(expires)}#{EOL}" if expires
     ## cookie
     if cookie = options.delete('cookie')
       case cookie
       when String, Cookie
-        buf << "Set-Cookie: #{cookie}#{EOL}"
+        buf << "Set-Cookie: #{_no_crlf_check(cookie)}#{EOL}"
       when Array
         arr = cookie
-        arr.each {|c| buf << "Set-Cookie: #{c}#{EOL}" }
+        arr.each {|c| buf << "Set-Cookie: #{_no_crlf_check(c)}#{EOL}" }
       when Hash
         hash = cookie
-        hash.each_value {|c| buf << "Set-Cookie: #{c}#{EOL}" }
+        hash.each_value {|c| buf << "Set-Cookie: #{_no_crlf_check(c)}#{EOL}" }
       end
     end
     if @output_cookies
-      @output_cookies.each {|c| buf << "Set-Cookie: #{c}#{EOL}" }
+      @output_cookies.each {|c| buf << "Set-Cookie: #{_no_crlf_check(c)}#{EOL}" }
     end
     ## other headers
     options.each do |key, value|
-      buf << "#{key}: #{value}#{EOL}"
+      buf << "#{_no_crlf_check(key)}: #{_no_crlf_check(value)}#{EOL}"
     end
     return buf
   end # _header_for_hash
   private :_header_for_hash
 
   def nph?  #:nodoc:
-    return /IIS\/(\d+)/.match($CGI_ENV['SERVER_SOFTWARE']) && $1.to_i < 5
+    return /IIS\/(\d+)/ =~ $CGI_ENV['SERVER_SOFTWARE'] && $1.to_i < 5
   end
 
   def _header_for_modruby(buf)  #:nodoc:
     request = Apache::request
     buf.scan(/([^:]+): (.+)#{EOL}/o) do |name, value|
-      warn sprintf("name:%s value:%s\n", name, value) if $DEBUG
+      $stderr.printf("name:%s value:%s\n", name, value) if $DEBUG
       case name
       when 'Set-Cookie'
         request.headers_out.add(name, value)
@@ -368,14 +386,14 @@ class CGI
 
   # Parse an HTTP query string into a hash of key=>value pairs.
   #
-  #   params = CGI::parse("query_string")
+  #   params = CGI.parse("query_string")
   #     # {"name1" => ["value1", "value2", ...],
   #     #  "name2" => ["value1", "value2", ...], ... }
   #
-  def CGI::parse(query)
+  def self.parse(query)
     params = {}
     query.split(/[&;]/).each do |pairs|
-      key, value = pairs.split('=',2).collect{|v| CGI::unescape(v) }
+      key, value = pairs.split('=',2).collect{|v| CGI.unescape(v) }
 
       next unless key
 
@@ -414,7 +432,7 @@ class CGI
   module QueryExtension
 
     %w[ CONTENT_LENGTH SERVER_PORT ].each do |env|
-      define_method(env.sub(/^HTTP_/, '').downcase) do
+      define_method(env.delete_prefix('HTTP_').downcase) do
         (val = env_table[env]) && Integer(val)
       end
     end
@@ -427,7 +445,7 @@ class CGI
         HTTP_ACCEPT HTTP_ACCEPT_CHARSET HTTP_ACCEPT_ENCODING
         HTTP_ACCEPT_LANGUAGE HTTP_CACHE_CONTROL HTTP_FROM HTTP_HOST
         HTTP_NEGOTIATE HTTP_PRAGMA HTTP_REFERER HTTP_USER_AGENT ].each do |env|
-      define_method(env.sub(/^HTTP_/, '').downcase) do
+      define_method(env.delete_prefix('HTTP_').downcase) do
         env_table[env]
       end
     end
@@ -480,7 +498,7 @@ class CGI
       @files = {}
       boundary_rexp = /--#{Regexp.quote(boundary)}(#{EOL}|--)/
       boundary_size = "#{EOL}--#{boundary}#{EOL}".bytesize
-      buf = ''
+      buf = ''.dup
       bufsize = 10 * 1024
       max_count = MAX_MULTIPART_COUNT
       n = 0
@@ -535,13 +553,13 @@ class CGI
         body.rewind
         ## original filename
         /Content-Disposition:.* filename=(?:"(.*?)"|([^;\r\n]*))/i.match(head)
-        filename = $1 || $2 || ''
+        filename = $1 || $2 || ''.dup
         filename = CGI.unescape(filename) if unescape_filename?()
-        body.instance_variable_set(:@original_filename, filename.taint)
+        body.instance_variable_set(:@original_filename, filename)
         ## content type
         /Content-Type: (.*)/i.match(head)
-        (content_type = $1 || '').chomp!
-        body.instance_variable_set(:@content_type, content_type.taint)
+        (content_type = $1 || ''.dup).chomp!
+        body.instance_variable_set(:@content_type, content_type)
         ## query parameter name
         /Content-Disposition:.* name=(?:"(.*?)"|([^;\r\n]*))/i.match(head)
         name = $1 || $2 || ''
@@ -589,7 +607,7 @@ class CGI
       else
         begin
           require 'stringio'
-          body = StringIO.new("".force_encoding(Encoding::ASCII_8BIT))
+          body = StringIO.new("".b)
         rescue LoadError
           require 'tempfile'
           body = Tempfile.new('CGI', encoding: Encoding::ASCII_8BIT)
@@ -600,6 +618,7 @@ class CGI
     end
     def unescape_filename?  #:nodoc:
       user_agent = $CGI_ENV['HTTP_USER_AGENT']
+      return false unless user_agent
       return /Mac/i.match(user_agent) && /Mozilla/i.match(user_agent) && !/MSIE/i.match(user_agent)
     end
 
@@ -641,7 +660,7 @@ class CGI
     # Reads query parameters in the @params field, and cookies into @cookies.
     def initialize_query()
       if ("POST" == env_table['REQUEST_METHOD']) and
-        %r|\Amultipart/form-data.*boundary=\"?([^\";,]+)\"?|.match(env_table['CONTENT_TYPE'])
+        %r|\Amultipart/form-data.*boundary=\"?([^\";,]+)\"?| =~ env_table['CONTENT_TYPE']
         current_max_multipart_length = @max_multipart_length.respond_to?(:call) ? @max_multipart_length.call : @max_multipart_length
         raise StandardError.new("too large multipart data.") if env_table['CONTENT_LENGTH'].to_i > current_max_multipart_length
         boundary = $1.dup
@@ -649,7 +668,7 @@ class CGI
         @params = read_multipart(boundary, Integer(env_table['CONTENT_LENGTH']))
       else
         @multipart = false
-        @params = CGI::parse(
+        @params = CGI.parse(
                     case env_table['REQUEST_METHOD']
                     when "GET", "HEAD"
                       if defined?(MOD_RUBY)
@@ -679,7 +698,7 @@ class CGI
         end
       end
 
-      @cookies = CGI::Cookie::parse((env_table['HTTP_COOKIE'] or env_table['COOKIE']))
+      @cookies = CGI::Cookie.parse((env_table['HTTP_COOKIE'] or env_table['COOKIE']))
     end
     private :initialize_query
 
@@ -700,7 +719,7 @@ class CGI
         if value
           return value
         elsif defined? StringIO
-          StringIO.new("".force_encoding(Encoding::ASCII_8BIT))
+          StringIO.new("".b)
         else
           Tempfile.new("CGI",encoding: Encoding::ASCII_8BIT)
         end
@@ -734,7 +753,7 @@ class CGI
   #
   #   CGI.accept_charset = "EUC-JP"
   #
-  @@accept_charset="UTF-8"
+  @@accept_charset="UTF-8" if false # needed for rdoc?
 
   # Return the accept character set for all new CGI instances.
   def self.accept_charset
@@ -855,24 +874,24 @@ class CGI
 
     case @options[:tag_maker]
     when "html3"
-      require 'cgi/html'
+      require_relative 'html'
       extend Html3
       extend HtmlExtension
     when "html4"
-      require 'cgi/html'
+      require_relative 'html'
       extend Html4
       extend HtmlExtension
     when "html4Tr"
-      require 'cgi/html'
+      require_relative 'html'
       extend Html4Tr
       extend HtmlExtension
     when "html4Fr"
-      require 'cgi/html'
+      require_relative 'html'
       extend Html4Tr
       extend Html4Fr
       extend HtmlExtension
     when "html5"
-      require 'cgi/html'
+      require_relative 'html'
       extend Html5
       extend HtmlExtension
     end
diff --git a/lib/cgi/html.rb b/lib/cgi/html.rb
index 4b9e577b32..1543943320 100644
--- a/lib/cgi/html.rb
+++ b/lib/cgi/html.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 class CGI
   # Base module for HTML-generation mixins.
   #
@@ -26,14 +26,14 @@ class CGI
     #   - O EMPTY
     def nOE_element(element, attributes = {})
       attributes={attributes=>nil} if attributes.kind_of?(String)
-      s = "<#{element.upcase}"
+      s = "<#{element.upcase}".dup
       attributes.each do|name, value|
         next unless value
         s << " "
-        s << CGI::escapeHTML(name.to_s)
+        s << CGI.escapeHTML(name.to_s)
         if value != true
           s << '="'
-          s << CGI::escapeHTML(value.to_s)
+          s << CGI.escapeHTML(value.to_s)
           s << '"'
         end
       end
@@ -408,7 +408,7 @@ class CGI
       end
       pretty = attributes.delete("PRETTY")
       pretty = "  " if true == pretty
-      buf = ""
+      buf = "".dup
 
       if attributes.has_key?("DOCTYPE")
         if attributes["DOCTYPE"]
@@ -423,7 +423,7 @@ class CGI
       buf << super(attributes)
 
       if pretty
-        CGI::pretty(buf, pretty)
+        CGI.pretty(buf, pretty)
       else
         buf
       end
diff --git a/lib/cgi/session.rb b/lib/cgi/session.rb
index d44a5f84b0..29e7b3ece3 100644
--- a/lib/cgi/session.rb
+++ b/lib/cgi/session.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 # cgi/session.rb - session support for cgi scripts
 #
@@ -403,11 +403,11 @@ class CGI
             for line in f
               line.chomp!
               k, v = line.split('=',2)
-              @hash[CGI::unescape(k)] = Marshal.restore(CGI::unescape(v))
+              @hash[CGI.unescape(k)] = Marshal.restore(CGI.unescape(v))
             end
           ensure
-            f.close unless f.nil?
-            lockf.close if lockf
+            f&.close
+            lockf&.close
           end
         end
         @hash
@@ -421,13 +421,13 @@ class CGI
           lockf.flock File::LOCK_EX
           f = File.open(@path+".new", File::CREAT|File::TRUNC|File::WRONLY, 0600)
           for k,v in @hash
-            f.printf "%s=%s\n", CGI::escape(k), CGI::escape(String(Marshal.dump(v)))
+            f.printf "%s=%s\n", CGI.escape(k), CGI.escape(String(Marshal.dump(v)))
           end
           f.close
           File.rename @path+".new", @path
         ensure
-          f.close if f and !f.closed?
-          lockf.close if lockf
+          f&.close
+          lockf&.close
         end
       end
 
diff --git a/lib/cgi/session/pstore.rb b/lib/cgi/session/pstore.rb
index 2dfb72bdce..cc3006400f 100644
--- a/lib/cgi/session/pstore.rb
+++ b/lib/cgi/session/pstore.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 # cgi/session/pstore.rb - persistent storage of marshalled session data
 #
@@ -10,7 +10,7 @@
 # persistent of session data on top of the pstore library.  See
 # cgi/session.rb for more details on session storage managers.
 
-require 'cgi/session'
+require_relative '../session'
 require 'pstore'
 
 class CGI
@@ -50,7 +50,6 @@ class CGI
         require 'digest/md5'
         md5 = Digest::MD5.hexdigest(id)[0,16]
         path = dir+"/"+prefix+md5
-        path.untaint
         if File::exist?(path)
           @hash = nil
         else
diff --git a/lib/cgi/util.rb b/lib/cgi/util.rb
index 66fa54d8e9..aab8b000cb 100644
--- a/lib/cgi/util.rb
+++ b/lib/cgi/util.rb
@@ -1,19 +1,23 @@
-# frozen_string_literal: false
-class CGI; module Util; end; extend Util; end
+# frozen_string_literal: true
+class CGI
+  module Util; end
+  include Util
+  extend Util
+end
 module CGI::Util
   @@accept_charset="UTF-8" unless defined?(@@accept_charset)
   # URL-encode a string.
-  #   url_encoded_string = CGI::escape("'Stop!' said Fred")
+  #   url_encoded_string = CGI.escape("'Stop!' said Fred")
   #      # => "%27Stop%21%27+said+Fred"
   def escape(string)
     encoding = string.encoding
-    string.b.gsub(/([^ a-zA-Z0-9_.-]+)/) do |m|
+    string.b.gsub(/([^ a-zA-Z0-9_.\-~]+)/) do |m|
       '%' + m.unpack('H2' * m.bytesize).join('%').upcase
     end.tr(' ', '+').force_encoding(encoding)
   end
 
   # URL-decode a string with encoding(optional).
-  #   string = CGI::unescape("%27Stop%21%27+said+Fred")
+  #   string = CGI.unescape("%27Stop%21%27+said+Fred")
   #      # => "'Stop!' said Fred"
   def unescape(string,encoding=@@accept_charset)
     str=string.tr('+', ' ').b.gsub(/((?:%[0-9a-fA-F]{2})+)/) do |m|
@@ -32,7 +36,7 @@ module CGI::Util
   }
 
   # Escape special characters in HTML, namely '&\"<>
-  #   CGI::escapeHTML('Usage: foo "bar" <baz>')
+  #   CGI.escapeHTML('Usage: foo "bar" <baz>')
   #      # => "Usage: foo &quot;bar&quot; &lt;baz&gt;"
   def escapeHTML(string)
     enc = string.encoding
@@ -56,7 +60,7 @@ module CGI::Util
   end
 
   # Unescape a string that has been HTML-escaped
-  #   CGI::unescapeHTML("Usage: foo &quot;bar&quot; &lt;baz&gt;")
+  #   CGI.unescapeHTML("Usage: foo &quot;bar&quot; &lt;baz&gt;")
   #      # => "Usage: foo \"bar\" <baz>"
   def unescapeHTML(string)
     enc = string.encoding
@@ -114,10 +118,10 @@ module CGI::Util
     end
   end
 
-  # Synonym for CGI::escapeHTML(str)
+  # Synonym for CGI.escapeHTML(str)
   alias escape_html escapeHTML
 
-  # Synonym for CGI::unescapeHTML(str)
+  # Synonym for CGI.unescapeHTML(str)
   alias unescape_html unescapeHTML
 
   # Escape only the tags of certain HTML elements in +string+.
@@ -128,30 +132,30 @@ module CGI::Util
   # The attribute list of the open tag will also be escaped (for
   # instance, the double-quotes surrounding attribute values).
   #
-  #   print CGI::escapeElement('<BR><A HREF="url"></A>', "A", "IMG")
+  #   print CGI.escapeElement('<BR><A HREF="url"></A>', "A", "IMG")
   #     # "<BR>&lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt"
   #
-  #   print CGI::escapeElement('<BR><A HREF="url"></A>', ["A", "IMG"])
+  #   print CGI.escapeElement('<BR><A HREF="url"></A>', ["A", "IMG"])
   #     # "<BR>&lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt"
   def escapeElement(string, *elements)
     elements = elements[0] if elements[0].kind_of?(Array)
     unless elements.empty?
       string.gsub(/<\/?(?:#{elements.join("|")})(?!\w)(?:.|\n)*?>/i) do
-        CGI::escapeHTML($&)
+        CGI.escapeHTML($&)
       end
     else
       string
     end
   end
 
-  # Undo escaping such as that done by CGI::escapeElement()
+  # Undo escaping such as that done by CGI.escapeElement()
   #
-  #   print CGI::unescapeElement(
-  #           CGI::escapeHTML('<BR><A HREF="url"></A>'), "A", "IMG")
+  #   print CGI.unescapeElement(
+  #           CGI.escapeHTML('<BR><A HREF="url"></A>'), "A", "IMG")
   #     # "&lt;BR&gt;<A HREF="url"></A>"
   #
-  #   print CGI::unescapeElement(
-  #           CGI::escapeHTML('<BR><A HREF="url"></A>'), ["A", "IMG"])
+  #   print CGI.unescapeElement(
+  #           CGI.escapeHTML('<BR><A HREF="url"></A>'), ["A", "IMG"])
   #     # "&lt;BR&gt;<A HREF="url"></A>"
   def unescapeElement(string, *elements)
     elements = elements[0] if elements[0].kind_of?(Array)
@@ -164,10 +168,10 @@ module CGI::Util
     end
   end
 
-  # Synonym for CGI::escapeElement(str)
+  # Synonym for CGI.escapeElement(str)
   alias escape_element escapeElement
 
-  # Synonym for CGI::unescapeElement(str)
+  # Synonym for CGI.unescapeElement(str)
   alias unescape_element unescapeElement
 
   # Abbreviated day-of-week names specified by RFC 822
@@ -178,7 +182,7 @@ module CGI::Util
 
   # Format a +Time+ object as a String using the format specified by RFC 1123.
   #
-  #   CGI::rfc1123_date(Time.now)
+  #   CGI.rfc1123_date(Time.now)
   #     # Sat, 01 Jan 2000 00:00:00 GMT
   def rfc1123_date(time)
     t = time.clone.gmtime
@@ -192,13 +196,13 @@ module CGI::Util
   # +string+ is the HTML string to indent.  +shift+ is the indentation
   # unit to use; it defaults to two spaces.
   #
-  #   print CGI::pretty("<HTML><BODY></BODY></HTML>")
+  #   print CGI.pretty("<HTML><BODY></BODY></HTML>")
   #     # <HTML>
   #     #   <BODY>
   #     #   </BODY>
   #     # </HTML>
   #
-  #   print CGI::pretty("<HTML><BODY></BODY></HTML>", "\t")
+  #   print CGI.pretty("<HTML><BODY></BODY></HTML>", "\t")
   #     # <HTML>
   #     #         <BODY>
   #     #         </BODY>
diff --git a/lib/cmath.rb b/lib/cmath.rb
deleted file mode 100644
index 41ab06e77c..0000000000
--- a/lib/cmath.rb
+++ /dev/null
@@ -1,435 +0,0 @@
-# frozen_string_literal: false
-##
-# = Trigonometric and transcendental functions for complex numbers.
-#
-# CMath is a library that provides trigonometric and transcendental
-# functions for complex numbers. The functions in this module accept
-# integers, floating-point numbers or complex numbers as arguments.
-#
-# Note that the selection of functions is similar, but not identical,
-# to that in module math. The reason for having two modules is that
-# some users aren't interested in complex numbers, and perhaps don't
-# even know what they are. They would rather have Math.sqrt(-1) raise
-# an exception than return a complex number.
-#
-# For more information you can see Complex class.
-#
-# == Usage
-#
-# To start using this library, simply require cmath library:
-#
-#   require "cmath"
-
-module CMath
-
-  include Math
-
-  # Backup of Math is needed because mathn.rb replaces Math with CMath.
-  RealMath = Math # :nodoc:
-  private_constant :RealMath
-
-  %w[
-    exp
-    log
-    log2
-    log10
-    sqrt
-    cbrt
-    sin
-    cos
-    tan
-    sinh
-    cosh
-    tanh
-    asin
-    acos
-    atan
-    atan2
-    asinh
-    acosh
-    atanh
-  ].each do |meth|
-    define_method(meth + '!') do |*args, &block|
-      warn("CMath##{meth}! is deprecated; use CMath##{meth} or Math##{meth}") if $VERBOSE
-      RealMath.send(meth, *args, &block)
-    end
-  end
-
-  ##
-  # Math::E raised to the +z+ power
-  #
-  #   CMath.exp(1.i * Math::PI) #=> (-1.0+1.2246467991473532e-16i)
-  def exp(z)
-    begin
-      if z.real?
-        RealMath.exp(z)
-      else
-        ere = RealMath.exp(z.real)
-        Complex(ere * RealMath.cos(z.imag),
-                ere * RealMath.sin(z.imag))
-      end
-    rescue NoMethodError
-      handle_no_method_error
-    end
-  end
-
-  ##
-  # Returns the natural logarithm of Complex. If a second argument is given,
-  # it will be the base of logarithm.
-  #
-  #   CMath.log(1 + 4i)     #=> (1.416606672028108+1.3258176636680326i)
-  #   CMath.log(1 + 4i, 10) #=> (0.6152244606891369+0.5757952953408879i)
-  def log(z, b=::Math::E)
-    begin
-      if z.real? && z >= 0 && b >= 0
-        RealMath.log(z, b)
-      else
-        Complex(RealMath.log(z.abs), z.arg) / log(b)
-      end
-    rescue NoMethodError
-      handle_no_method_error
-    end
-  end
-
-  ##
-  # Returns the base 2 logarithm of +z+
-  #
-  #   CMath.log2(-1) => (0.0+4.532360141827194i)
-  def log2(z)
-    begin
-      if z.real? and z >= 0
-        RealMath.log2(z)
-      else
-        log(z) / RealMath.log(2)
-      end
-    rescue NoMethodError
-      handle_no_method_error
-    end
-  end
-
-  ##
-  # Returns the base 10 logarithm of +z+
-  #
-  #   CMath.log10(-1) #=> (0.0+1.3643763538418412i)
-  def log10(z)
-    begin
-      if z.real? and z >= 0
-        RealMath.log10(z)
-      else
-        log(z) / RealMath.log(10)
-      end
-    rescue NoMethodError
-      handle_no_method_error
-    end
-  end
-
-  ##
-  # Returns the non-negative square root of Complex.
-  #
-  #   CMath.sqrt(-1 + 0i) #=> 0.0+1.0i
-  def sqrt(z)
-    begin
-      if z.real?
-        if z < 0
-          Complex(0, RealMath.sqrt(-z))
-        else
-          RealMath.sqrt(z)
-        end
-      else
-        if z.imag < 0 ||
-            (z.imag == 0 && z.imag.to_s[0] == '-')
-          sqrt(z.conjugate).conjugate
-        else
-          r = z.abs
-          x = z.real
-          Complex(RealMath.sqrt((r + x) / 2.0), RealMath.sqrt((r - x) / 2.0))
-        end
-      end
-    rescue NoMethodError
-      handle_no_method_error
-    end
-  end
-
-  ##
-  # Returns the principal value of the cube root of +z+
-  #
-  #   CMath.cbrt(1 + 4i) #=> (1.449461632813119+0.6858152562177092i)
-  def cbrt(z)
-    z ** (1.0/3)
-  end
-
-  ##
-  # Returns the sine of +z+, where +z+ is given in radians
-  #
-  #   CMath.sin(1 + 1i) #=> (1.2984575814159773+0.6349639147847361i)
-  def sin(z)
-    begin
-      if z.real?
-        RealMath.sin(z)
-      else
-        Complex(RealMath.sin(z.real) * RealMath.cosh(z.imag),
-                RealMath.cos(z.real) * RealMath.sinh(z.imag))
-      end
-    rescue NoMethodError
-      handle_no_method_error
-    end
-  end
-
-  ##
-  # Returns the cosine of +z+, where +z+ is given in radians
-  #
-  #   CMath.cos(1 + 1i) #=> (0.8337300251311491-0.9888977057628651i)
-  def cos(z)
-    begin
-      if z.real?
-        RealMath.cos(z)
-      else
-        Complex(RealMath.cos(z.real) * RealMath.cosh(z.imag),
-                -RealMath.sin(z.real) * RealMath.sinh(z.imag))
-      end
-    rescue NoMethodError
-      handle_no_method_error
-    end
-  end
-
-  ##
-  # Returns the tangent of +z+, where +z+ is given in radians
-  #
-  #   CMath.tan(1 + 1i) #=> (0.27175258531951174+1.0839233273386943i)
-  def tan(z)
-    begin
-      if z.real?
-        RealMath.tan(z)
-      else
-        sin(z) / cos(z)
-      end
-    rescue NoMethodError
-      handle_no_method_error
-    end
-  end
-
-  ##
-  # Returns the hyperbolic sine of +z+, where +z+ is given in radians
-  #
-  #   CMath.sinh(1 + 1i) #=> (0.6349639147847361+1.2984575814159773i)
-  def sinh(z)
-    begin
-      if z.real?
-        RealMath.sinh(z)
-      else
-        Complex(RealMath.sinh(z.real) * RealMath.cos(z.imag),
-                RealMath.cosh(z.real) * RealMath.sin(z.imag))
-      end
-    rescue NoMethodError
-      handle_no_method_error
-    end
-  end
-
-  ##
-  # Returns the hyperbolic cosine of +z+, where +z+ is given in radians
-  #
-  #   CMath.cosh(1 + 1i) #=> (0.8337300251311491+0.9888977057628651i)
-  def cosh(z)
-    begin
-      if z.real?
-        RealMath.cosh(z)
-      else
-        Complex(RealMath.cosh(z.real) * RealMath.cos(z.imag),
-                RealMath.sinh(z.real) * RealMath.sin(z.imag))
-      end
-    rescue NoMethodError
-      handle_no_method_error
-    end
-  end
-
-  ##
-  # Returns the hyperbolic tangent of +z+, where +z+ is given in radians
-  #
-  #   CMath.tanh(1 + 1i) #=> (1.0839233273386943+0.27175258531951174i)
-  def tanh(z)
-    begin
-      if z.real?
-        RealMath.tanh(z)
-      else
-        sinh(z) / cosh(z)
-      end
-    rescue NoMethodError
-      handle_no_method_error
-    end
-  end
-
-  ##
-  # Returns the arc sine of +z+
-  #
-  #   CMath.asin(1 + 1i) #=> (0.6662394324925153+1.0612750619050355i)
-  def asin(z)
-    begin
-      if z.real? and z >= -1 and z <= 1
-        RealMath.asin(z)
-      else
-        (-1.0).i * log(1.0.i * z + sqrt(1.0 - z * z))
-      end
-    rescue NoMethodError
-      handle_no_method_error
-    end
-  end
-
-  ##
-  # Returns the arc cosine of +z+
-  #
-  #   CMath.acos(1 + 1i) #=> (0.9045568943023813-1.0612750619050357i)
-  def acos(z)
-    begin
-      if z.real? and z >= -1 and z <= 1
-        RealMath.acos(z)
-      else
-        (-1.0).i * log(z + 1.0.i * sqrt(1.0 - z * z))
-      end
-    rescue NoMethodError
-      handle_no_method_error
-    end
-  end
-
-  ##
-  # Returns the arc tangent of +z+
-  #
-  #   CMath.atan(1 + 1i) #=> (1.0172219678978514+0.4023594781085251i)
-  def atan(z)
-    begin
-      if z.real?
-        RealMath.atan(z)
-      else
-        1.0.i * log((1.0.i + z) / (1.0.i - z)) / 2.0
-      end
-    rescue NoMethodError
-      handle_no_method_error
-    end
-  end
-
-  ##
-  # returns the arc tangent of +y+ divided by +x+ using the signs of +y+ and
-  # +x+ to determine the quadrant
-  #
-  #   CMath.atan2(1 + 1i, 0) #=> (1.5707963267948966+0.0i)
-  def atan2(y,x)
-    begin
-      if y.real? and x.real?
-        RealMath.atan2(y,x)
-      else
-        (-1.0).i * log((x + 1.0.i * y) / sqrt(x * x + y * y))
-      end
-    rescue NoMethodError
-      handle_no_method_error
-    end
-  end
-
-  ##
-  # returns the inverse hyperbolic sine of +z+
-  #
-  #   CMath.asinh(1 + 1i) #=> (1.0612750619050357+0.6662394324925153i)
-  def asinh(z)
-    begin
-      if z.real?
-        RealMath.asinh(z)
-      else
-        log(z + sqrt(1.0 + z * z))
-      end
-    rescue NoMethodError
-      handle_no_method_error
-    end
-  end
-
-  ##
-  # returns the inverse hyperbolic cosine of +z+
-  #
-  #   CMath.acosh(1 + 1i) #=> (1.0612750619050357+0.9045568943023813i)
-  def acosh(z)
-    begin
-      if z.real? and z >= 1
-        RealMath.acosh(z)
-      else
-        log(z + sqrt(z * z - 1.0))
-      end
-    rescue NoMethodError
-      handle_no_method_error
-    end
-  end
-
-  ##
-  # returns the inverse hyperbolic tangent of +z+
-  #
-  #   CMath.atanh(1 + 1i) #=> (0.4023594781085251+1.0172219678978514i)
-  def atanh(z)
-    begin
-      if z.real? and z >= -1 and z <= 1
-        RealMath.atanh(z)
-      else
-        log((1.0 + z) / (1.0 - z)) / 2.0
-      end
-    rescue NoMethodError
-      handle_no_method_error
-    end
-  end
-
-  module_function :exp!
-  module_function :exp
-  module_function :log!
-  module_function :log
-  module_function :log2!
-  module_function :log2
-  module_function :log10!
-  module_function :log10
-  module_function :sqrt!
-  module_function :sqrt
-  module_function :cbrt!
-  module_function :cbrt
-
-  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
-
-  module_function :frexp
-  module_function :ldexp
-  module_function :hypot
-  module_function :erf
-  module_function :erfc
-  module_function :gamma
-  module_function :lgamma
-
-  private
-  def handle_no_method_error # :nodoc:
-    if $!.name == :real?
-      raise TypeError, "Numeric Number required"
-    else
-      raise
-    end
-  end
-  module_function :handle_no_method_error
-
-end
diff --git a/lib/csv.rb b/lib/csv.rb
index 509e9780fa..056cfa2051 100644
--- a/lib/csv.rb
+++ b/lib/csv.rb
@@ -2,9 +2,7 @@
 # frozen_string_literal: true
 # = 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.
+# Created by James Edward Gray II on 2005-10-31.
 #
 # See CSV for documentation.
 #
@@ -12,18 +10,18 @@
 #
 # 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
+# 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
+# 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
+# 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.
 #
@@ -31,20 +29,20 @@
 # the original library as of Ruby 1.9. If you are migrating code from 1.8 or
 # earlier, you may have to change your code to comply with the new interface.
 #
-# == What's Different From the Old CSV?
+# == What's the 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
+# === \CSV Parsing
 #
-# * This parser is m17n aware.  See CSV for full details.
+# * This parser is m17n aware. See CSV for full details.
 # * 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
+# * 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
+# * The old library returned empty lines as <tt>[nil]</tt>. This library calls
 #   them <tt>[]</tt>.
 # * This library has a much faster parser.
 #
@@ -58,9 +56,9 @@
 # * 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 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.
+#   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].
@@ -72,16 +70,16 @@
 # == 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
+# {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
+# What you don't want to do is to 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.
+# the file to be sure a field is invalid. This consumes 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
+# always be superior in every way. For example, parsing non-quoted fields is as
 # easy as:
 #
 #   data.split(",")
@@ -96,1859 +94,2385 @@ require "English"
 require "date"
 require "stringio"
 
+require_relative "csv/fields_converter"
+require_relative "csv/match_p"
+require_relative "csv/parser"
+require_relative "csv/row"
+require_relative "csv/table"
+require_relative "csv/writer"
+
+using CSV::MatchP if CSV.const_defined?(:MatchP)
+
+# == \CSV
+# \CSV (comma-separated variables) data is a text representation of a table:
+# - A _row_ _separator_ delimits table rows.
+#   A common row separator is the newline character <tt>"\n"</tt>.
+# - A _column_ _separator_ delimits fields in a row.
+#   A common column separator is the comma character <tt>","</tt>.
 #
-# 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.
+# This \CSV \String, with row separator <tt>"\n"</tt>
+# and column separator <tt>","</tt>,
+# has three rows and two columns:
+#   "foo,0\nbar,1\nbaz,2\n"
 #
-# == Reading
+# Despite the name \CSV, a \CSV representation can use different separators.
 #
-# === From a File
+# For more about tables, see the Wikipedia article
+# "{Table (information)}[https://en.wikipedia.org/wiki/Table_(information)]",
+# especially its section
+# "{Simple table}[https://en.wikipedia.org/wiki/Table_(information)#Simple_table]"
 #
-# ==== A Line at a Time
+# == \Class \CSV
 #
-#   CSV.foreach("path/to/file.csv") do |row|
-#     # use row here...
+# Class \CSV provides methods for:
+# - Parsing \CSV data from a \String object, a \File (via its file path), or an \IO object.
+# - Generating \CSV data to a \String object.
+#
+# To make \CSV available:
+#   require 'csv'
+#
+# All examples here assume that this has been done.
+#
+# == Keeping It Simple
+#
+# A \CSV object has dozens of instance methods that offer fine-grained control
+# of parsing and generating \CSV data.
+# For many needs, though, simpler approaches will do.
+#
+# This section summarizes the singleton methods in \CSV
+# that allow you to parse and generate without explicitly
+# creating \CSV objects.
+# For details, follow the links.
+#
+# === Simple Parsing
+#
+# Parsing methods commonly return either of:
+# - An \Array of Arrays of Strings:
+#   - The outer \Array is the entire "table".
+#   - Each inner \Array is a row.
+#   - Each \String is a field.
+# - A CSV::Table object.  For details, see
+#   {\CSV with Headers}[#class-CSV-label-CSV+with+Headers].
+#
+# ==== Parsing a \String
+#
+# The input to be parsed can be a string:
+#   string = "foo,0\nbar,1\nbaz,2\n"
+#
+# \Method CSV.parse returns the entire \CSV data:
+#   CSV.parse(string) # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
+#
+# \Method CSV.parse_line returns only the first row:
+#   CSV.parse_line(string) # => ["foo", "0"]
+#
+# \CSV extends class \String with instance method String#parse_csv,
+# which also returns only the first row:
+#   string.parse_csv # => ["foo", "0"]
+#
+# ==== Parsing Via a \File Path
+#
+# The input to be parsed can be in a file:
+#   string = "foo,0\nbar,1\nbaz,2\n"
+#   path = 't.csv'
+#   File.write(path, string)
+#
+# \Method CSV.read returns the entire \CSV data:
+#  CSV.read(path) # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
+#
+# \Method CSV.foreach iterates, passing each row to the given block:
+#  CSV.foreach(path) do |row|
+#    p row
+#  end
+# Output:
+#   ["foo", "0"]
+#   ["bar", "1"]
+#   ["baz", "2"]
+#
+# \Method CSV.table returns the entire \CSV data as a CSV::Table object:
+#   CSV.table(path) # => #<CSV::Table mode:col_or_row row_count:3>
+#
+# ==== Parsing from an Open \IO Stream
+#
+# The input to be parsed can be in an open \IO stream:
+#
+# \Method CSV.read returns the entire \CSV data:
+#   File.open(path) do |file|
+#     CSV.read(file)
+#   end # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
+#
+# As does method CSV.parse:
+#   File.open(path) do |file|
+#     CSV.parse(file)
+#   end # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
+#
+# \Method CSV.parse_line returns only the first row:
+#   File.open(path) do |file|
+#    CSV.parse_line(file)
+#   end # => ["foo", "0"]
+#
+# \Method CSV.foreach iterates, passing each row to the given block:
+#   File.open(path) do |file|
+#     CSV.foreach(file) do |row|
+#       p row
+#     end
 #   end
+# Output:
+#   ["foo", "0"]
+#   ["bar", "1"]
+#   ["baz", "2"]
 #
-# ==== All at Once
+# \Method CSV.table returns the entire \CSV data as a CSV::Table object:
+#   File.open(path) do |file|
+#     CSV.table(file)
+#   end # => #<CSV::Table mode:col_or_row row_count:3>
 #
-#   arr_of_arrs = CSV.read("path/to/file.csv")
+# === Simple Generating
 #
-# === From a String
+# \Method CSV.generate returns a \String;
+# this example uses method CSV#<< to append the rows
+# that are to be generated:
+#   output_string = CSV.generate do |csv|
+#     csv << ['foo', 0]
+#     csv << ['bar', 1]
+#     csv << ['baz', 2]
+#   end
+#   output_string # => "foo,0\nbar,1\nbaz,2\n"
+#
+# \Method CSV.generate_line returns a \String containing the single row
+# constructed from an \Array:
+#   CSV.generate_line(['foo', '0']) # => "foo,0\n"
+#
+# \CSV extends class \Array with instance method <tt>Array#to_csv</tt>,
+# which forms an \Array into a \String:
+#   ['foo', '0'].to_csv # => "foo,0\n"
 #
-# ==== A Line at a Time
+# === "Filtering" \CSV
 #
-#   CSV.parse("CSV,data,String") do |row|
-#     # use row here...
+# \Method CSV.filter provides a Unix-style filter for \CSV data.
+# The input data is processed to form the output data:
+#   in_string = "foo,0\nbar,1\nbaz,2\n"
+#   out_string = ''
+#   CSV.filter(in_string, out_string) do |row|
+#     row[0] = row[0].upcase
+#     row[1] *= 4
 #   end
+#   out_string # => "FOO,0000\nBAR,1111\nBAZ,2222\n"
+#
+# == \CSV Objects
+#
+# There are three ways to create a \CSV object:
+# - \Method CSV.new returns a new \CSV object.
+# - \Method CSV.instance returns a new or cached \CSV object.
+# - \Method \CSV() also returns a new or cached \CSV object.
+#
+# === Instance Methods
+#
+# \CSV has three groups of instance methods:
+# - Its own internally defined instance methods.
+# - Methods included by module Enumerable.
+# - Methods delegated to class IO. See below.
+#
+# ==== Delegated Methods
+#
+# For convenience, a CSV object will delegate to many methods in class IO.
+# (A few have wrapper "guard code" in \CSV.) You may call:
+# * IO#binmode
+# * #binmode?
+# * IO#close
+# * IO#close_read
+# * IO#close_write
+# * IO#closed?
+# * #eof
+# * #eof?
+# * IO#external_encoding
+# * IO#fcntl
+# * IO#fileno
+# * #flock
+# * IO#flush
+# * IO#fsync
+# * IO#internal_encoding
+# * #ioctl
+# * IO#isatty
+# * #path
+# * IO#pid
+# * IO#pos
+# * IO#pos=
+# * IO#reopen
+# * #rewind
+# * IO#seek
+# * #stat
+# * IO#string
+# * IO#sync
+# * IO#sync=
+# * IO#tell
+# * #to_i
+# * #to_io
+# * IO#truncate
+# * IO#tty?
+#
+# === Options
+#
+# The default values for options are:
+#   DEFAULT_OPTIONS = {
+#     # For both parsing and generating.
+#     col_sep:            ",",
+#     row_sep:            :auto,
+#     quote_char:         '"',
+#     # For parsing.
+#     field_size_limit:   nil,
+#     converters:         nil,
+#     unconverted_fields: nil,
+#     headers:            false,
+#     return_headers:     false,
+#     header_converters:  nil,
+#     skip_blanks:        false,
+#     skip_lines:         nil,
+#     liberal_parsing:    false,
+#     nil_value:          nil,
+#     empty_value:        "",
+#     # For generating.
+#     write_headers:      nil,
+#     quote_empty:        true,
+#     force_quotes:       false,
+#     write_converters:   nil,
+#     write_nil_value:    nil,
+#     write_empty_value:  "",
+#     strip:              false,
+#   }
+#
+# ==== Options for Parsing
+#
+# Options for parsing, described in detail below, include:
+# - +row_sep+: Specifies the row separator; used to delimit rows.
+# - +col_sep+: Specifies the column separator; used to delimit fields.
+# - +quote_char+: Specifies the quote character; used to quote fields.
+# - +field_size_limit+: Specifies the maximum field size allowed.
+# - +converters+: Specifies the field converters to be used.
+# - +unconverted_fields+: Specifies whether unconverted fields are to be available.
+# - +headers+: Specifies whether data contains headers,
+#   or specifies the headers themselves.
+# - +return_headers+: Specifies whether headers are to be returned.
+# - +header_converters+: Specifies the header converters to be used.
+# - +skip_blanks+: Specifies whether blanks lines are to be ignored.
+# - +skip_lines+: Specifies how comments lines are to be recognized.
+# - +strip+: Specifies whether leading and trailing whitespace are
+#   to be stripped from fields..
+# - +liberal_parsing+: Specifies whether \CSV should attempt to parse
+#   non-compliant data.
+# - +nil_value+: Specifies the object that is to be substituted for each null (no-text) field.
+# - +empty_value+: Specifies the object that is to be substituted for each empty field.
+#
+# :include: ../doc/csv/options/common/row_sep.rdoc
+#
+# :include: ../doc/csv/options/common/col_sep.rdoc
+#
+# :include: ../doc/csv/options/common/quote_char.rdoc
+#
+# :include: ../doc/csv/options/parsing/field_size_limit.rdoc
+#
+# :include: ../doc/csv/options/parsing/converters.rdoc
+#
+# :include: ../doc/csv/options/parsing/unconverted_fields.rdoc
+#
+# :include: ../doc/csv/options/parsing/headers.rdoc
+#
+# :include: ../doc/csv/options/parsing/return_headers.rdoc
+#
+# :include: ../doc/csv/options/parsing/header_converters.rdoc
+#
+# :include: ../doc/csv/options/parsing/skip_blanks.rdoc
 #
-# ==== All at Once
+# :include: ../doc/csv/options/parsing/skip_lines.rdoc
 #
-#   arr_of_arrs = CSV.parse("CSV,data,String")
+# :include: ../doc/csv/options/parsing/strip.rdoc
 #
-# == Writing
+# :include: ../doc/csv/options/parsing/liberal_parsing.rdoc
 #
-# === To a File
+# :include: ../doc/csv/options/parsing/nil_value.rdoc
 #
-#   CSV.open("path/to/file.csv", "wb") do |csv|
-#     csv << ["row", "of", "CSV", "data"]
-#     csv << ["another", "row"]
-#     # ...
+# :include: ../doc/csv/options/parsing/empty_value.rdoc
+#
+# ==== Options for Generating
+#
+# Options for generating, described in detail below, include:
+# - +row_sep+: Specifies the row separator; used to delimit rows.
+# - +col_sep+: Specifies the column separator; used to delimit fields.
+# - +quote_char+: Specifies the quote character; used to quote fields.
+# - +write_headers+: Specifies whether headers are to be written.
+# - +force_quotes+: Specifies whether each output field is to be quoted.
+# - +quote_empty+: Specifies whether each empty output field is to be quoted.
+# - +write_converters+: Specifies the field converters to be used in writing.
+# - +write_nil_value+: Specifies the object that is to be substituted for each +nil+-valued field.
+# - +write_empty_value+: Specifies the object that is to be substituted for each empty field.
+#
+# :include: ../doc/csv/options/common/row_sep.rdoc
+#
+# :include: ../doc/csv/options/common/col_sep.rdoc
+#
+# :include: ../doc/csv/options/common/quote_char.rdoc
+#
+# :include: ../doc/csv/options/generating/write_headers.rdoc
+#
+# :include: ../doc/csv/options/generating/force_quotes.rdoc
+#
+# :include: ../doc/csv/options/generating/quote_empty.rdoc
+#
+# :include: ../doc/csv/options/generating/write_converters.rdoc
+#
+# :include: ../doc/csv/options/generating/write_nil_value.rdoc
+#
+# :include: ../doc/csv/options/generating/write_empty_value.rdoc
+#
+# === \CSV with Headers
+#
+# CSV allows to specify column names of CSV file, whether they are in data, or
+# provided separately. If headers are specified, reading methods return an instance
+# of CSV::Table, consisting of CSV::Row.
+#
+#   # Headers are part of data
+#   data = CSV.parse(<<~ROWS, headers: true)
+#     Name,Department,Salary
+#     Bob,Engineering,1000
+#     Jane,Sales,2000
+#     John,Management,5000
+#   ROWS
+#
+#   data.class      #=> CSV::Table
+#   data.first      #=> #<CSV::Row "Name":"Bob" "Department":"Engineering" "Salary":"1000">
+#   data.first.to_h #=> {"Name"=>"Bob", "Department"=>"Engineering", "Salary"=>"1000"}
+#
+#   # Headers provided by developer
+#   data = CSV.parse('Bob,Engineering,1000', headers: %i[name department salary])
+#   data.first      #=> #<CSV::Row name:"Bob" department:"Engineering" salary:"1000">
+#
+# === \Converters
+#
+# By default, each value (field or header) parsed by \CSV is formed into a \String.
+# You can use a _field_ _converter_ or  _header_ _converter_
+# to intercept and modify the parsed values:
+# - See {Field Converters}[#class-CSV-label-Field+Converters].
+# - See {Header Converters}[#class-CSV-label-Header+Converters].
+#
+# Also by default, each value to be written during generation is written 'as-is'.
+# You can use a _write_ _converter_ to modify values before writing.
+# - See {Write Converters}[#class-CSV-label-Write+Converters].
+#
+# ==== Specifying \Converters
+#
+# You can specify converters for parsing or generating in the +options+
+# argument to various \CSV methods:
+# - Option +converters+ for converting parsed field values.
+# - Option +header_converters+ for converting parsed header values.
+# - Option +write_converters+ for converting values to be written (generated).
+#
+# There are three forms for specifying converters:
+# - A converter proc: executable code to be used for conversion.
+# - A converter name: the name of a stored converter.
+# - A converter list: an array of converter procs, converter names, and converter lists.
+#
+# ===== Converter Procs
+#
+# This converter proc, +strip_converter+, accepts a value +field+
+# and returns <tt>field.strip</tt>:
+#   strip_converter = proc {|field| field.strip }
+# In this call to <tt>CSV.parse</tt>,
+# the keyword argument <tt>converters: string_converter</tt>
+# specifies that:
+# - \Proc +string_converter+ is to be called for each parsed field.
+# - The converter's return value is to replace the +field+ value.
+# Example:
+#   string = " foo , 0 \n bar , 1 \n baz , 2 \n"
+#   array = CSV.parse(string, converters: strip_converter)
+#   array # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
+#
+# A converter proc can receive a second argument, +field_info+,
+# that contains details about the field.
+# This modified +strip_converter+ displays its arguments:
+#   strip_converter = proc do |field, field_info|
+#     p [field, field_info]
+#     field.strip
 #   end
+#   string = " foo , 0 \n bar , 1 \n baz , 2 \n"
+#   array = CSV.parse(string, converters: strip_converter)
+#   array # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
+# Output:
+#  [" foo ", #<struct CSV::FieldInfo index=0, line=1, header=nil>]
+#  [" 0 ", #<struct CSV::FieldInfo index=1, line=1, header=nil>]
+#  [" bar ", #<struct CSV::FieldInfo index=0, line=2, header=nil>]
+#  [" 1 ", #<struct CSV::FieldInfo index=1, line=2, header=nil>]
+#  [" baz ", #<struct CSV::FieldInfo index=0, line=3, header=nil>]
+#  [" 2 ", #<struct CSV::FieldInfo index=1, line=3, header=nil>]
+# Each CSV::Info object shows:
+# - The 0-based field index.
+# - The 1-based line index.
+# - The field header, if any.
+#
+# ===== Stored \Converters
+#
+# A converter may be given a name and stored in a structure where
+# the parsing methods can find it by name.
+#
+# The storage structure for field converters is the \Hash CSV::Converters.
+# It has several built-in converter procs:
+# - <tt>:integer</tt>: converts each \String-embedded integer into a true \Integer.
+# - <tt>:float</tt>: converts each \String-embedded float into a true \Float.
+# - <tt>:date</tt>: converts each \String-embedded date into a true \Date.
+# - <tt>:date_time</tt>: converts each \String-embedded date-time into a true \DateTime
+# .
+# This example creates a converter proc, then stores it:
+#   strip_converter = proc {|field| field.strip }
+#   CSV::Converters[:strip] = strip_converter
+# Then the parsing method call can refer to the converter
+# by its name, <tt>:strip</tt>:
+#   string = " foo , 0 \n bar , 1 \n baz , 2 \n"
+#   array = CSV.parse(string, converters: :strip)
+#   array # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
+#
+# The storage structure for header converters is the \Hash CSV::HeaderConverters,
+# which works in the same way.
+# It also has built-in converter procs:
+# - <tt>:downcase</tt>: Downcases each header.
+# - <tt>:symbol</tt>: Converts each header to a \Symbol.
+#
+# There is no such storage structure for write headers.
+#
+# ===== Converter Lists
+#
+# A _converter_ _list_ is an \Array that may include any assortment of:
+# - Converter procs.
+# - Names of stored converters.
+# - Nested converter lists.
+#
+# Examples:
+#   numeric_converters = [:integer, :float]
+#   date_converters = [:date, :date_time]
+#   [numeric_converters, strip_converter]
+#   [strip_converter, date_converters, :float]
+#
+# Like a converter proc, a converter list may be named and stored in either
+# \CSV::Converters or CSV::HeaderConverters:
+#   CSV::Converters[:custom] = [strip_converter, date_converters, :float]
+#   CSV::HeaderConverters[:custom] = [:downcase, :symbol]
+#
+# There are two built-in converter lists:
+#   CSV::Converters[:numeric] # => [:integer, :float]
+#   CSV::Converters[:all] # => [:date_time, :numeric]
 #
-# === To a String
+# ==== Field \Converters
 #
-#   csv_string = CSV.generate do |csv|
-#     csv << ["row", "of", "CSV", "data"]
-#     csv << ["another", "row"]
-#     # ...
+# With no conversion, all parsed fields in all rows become Strings:
+#   string = "foo,0\nbar,1\nbaz,2\n"
+#   ary = CSV.parse(string)
+#   ary # => # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
+#
+# When you specify a field converter, each parsed field is passed to the converter;
+# its return value becomes the stored value for the field.
+# A converter might, for example, convert an integer embedded in a \String
+# into a true \Integer.
+# (In fact, that's what built-in field converter +:integer+ does.)
+#
+# There are three ways to use field \converters.
+#
+# - Using option {converters}[#class-CSV-label-Option+converters] with a parsing method:
+#     ary = CSV.parse(string, converters: :integer)
+#     ary # => [0, 1, 2] # => [["foo", 0], ["bar", 1], ["baz", 2]]
+# - Using option {converters}[#class-CSV-label-Option+converters] with a new \CSV instance:
+#     csv = CSV.new(string, converters: :integer)
+#     # Field converters in effect:
+#     csv.converters # => [:integer]
+#     csv.read # => [["foo", 0], ["bar", 1], ["baz", 2]]
+# - Using method #convert to add a field converter to a \CSV instance:
+#     csv = CSV.new(string)
+#     # Add a converter.
+#     csv.convert(:integer)
+#     csv.converters # => [:integer]
+#     csv.read # => [["foo", 0], ["bar", 1], ["baz", 2]]
+#
+# Installing a field converter does not affect already-read rows:
+#   csv = CSV.new(string)
+#   csv.shift # => ["foo", "0"]
+#   # Add a converter.
+#   csv.convert(:integer)
+#   csv.converters # => [:integer]
+#   csv.read # => [["bar", 1], ["baz", 2]]
+#
+# There are additional built-in \converters, and custom \converters are also supported.
+#
+# ===== Built-In Field \Converters
+#
+# The built-in field converters are in \Hash CSV::Converters:
+# - Each key is a field converter name.
+# - Each value is one of:
+#   - A \Proc field converter.
+#   - An \Array of field converter names.
+#
+# Display:
+#   CSV::Converters.each_pair do |name, value|
+#     if value.kind_of?(Proc)
+#       p [name, value.class]
+#     else
+#       p [name, value]
+#     end
 #   end
+# Output:
+#   [:integer, Proc]
+#   [:float, Proc]
+#   [:numeric, [:integer, :float]]
+#   [:date, Proc]
+#   [:date_time, Proc]
+#   [:all, [:date_time, :numeric]]
+#
+# Each of these converters transcodes values to UTF-8 before attempting conversion.
+# If a value cannot be transcoded to UTF-8 the conversion will
+# fail and the value will remain unconverted.
+#
+# Converter +:integer+ converts each field that Integer() accepts:
+#   data = '0,1,2,x'
+#   # Without the converter
+#   csv = CSV.parse_line(data)
+#   csv # => ["0", "1", "2", "x"]
+#   # With the converter
+#   csv = CSV.parse_line(data, converters: :integer)
+#   csv # => [0, 1, 2, "x"]
+#
+# Converter +:float+ converts each field that Float() accepts:
+#   data = '1.0,3.14159,x'
+#   # Without the converter
+#   csv = CSV.parse_line(data)
+#   csv # => ["1.0", "3.14159", "x"]
+#   # With the converter
+#   csv = CSV.parse_line(data, converters: :float)
+#   csv # => [1.0, 3.14159, "x"]
 #
-# == Convert a Single Line
+# Converter +:numeric+ converts with both +:integer+ and +:float+..
 #
-#   csv_string = ["CSV", "data"].to_csv   # to CSV
-#   csv_array  = "CSV,String".parse_csv   # from CSV
+# Converter +:date+ converts each field that Date::parse accepts:
+#   data = '2001-02-03,x'
+#   # Without the converter
+#   csv = CSV.parse_line(data)
+#   csv # => ["2001-02-03", "x"]
+#   # With the converter
+#   csv = CSV.parse_line(data, converters: :date)
+#   csv # => [#<Date: 2001-02-03 ((2451944j,0s,0n),+0s,2299161j)>, "x"]
 #
-# == Shortcut Interface
+# Converter +:date_time+ converts each field that DateTime::parse accepts:
+#   data = '2020-05-07T14:59:00-05:00,x'
+#   # Without the converter
+#   csv = CSV.parse_line(data)
+#   csv # => ["2020-05-07T14:59:00-05:00", "x"]
+#   # With the converter
+#   csv = CSV.parse_line(data, converters: :date_time)
+#   csv # => [#<DateTime: 2020-05-07T14:59:00-05:00 ((2458977j,71940s,0n),-18000s,2299161j)>, "x"]
 #
-#   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
-#   CSV($stdin)     { |csv_in|  csv_in.each { |row| p row } }  # from $stdin
+# Converter +:numeric+ converts with both +:date_time+ and +:numeric+..
 #
-# == Advanced Usage
+# As seen above, method #convert adds \converters to a \CSV instance,
+# and method #converters returns an \Array of the \converters in effect:
+#   csv = CSV.new('0,1,2')
+#   csv.converters # => []
+#   csv.convert(:integer)
+#   csv.converters # => [:integer]
+#   csv.convert(:date)
+#   csv.converters # => [:integer, :date]
 #
-# === Wrap an IO Object
+# ===== Custom Field \Converters
 #
-#   csv = CSV.new(io, options)
-#   # ... read (with gets() or each()) from and write (with <<) to csv here ...
+# You can define a custom field converter:
+#   strip_converter = proc {|field| field.strip }
+#   string = " foo , 0 \n bar , 1 \n baz , 2 \n"
+#   array = CSV.parse(string, converters: strip_converter)
+#   array # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
+# You can register the converter in \Converters \Hash,
+# which allows you to refer to it by name:
+#   CSV::Converters[:strip] = strip_converter
+#   string = " foo , 0 \n bar , 1 \n baz , 2 \n"
+#   array = CSV.parse(string, converters: :strip)
+#   array # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
 #
-# == CSV and Character Encodings (M17n or Multilingualization)
+# ==== Header \Converters
+#
+# Header converters operate only on headers (and not on other rows).
+#
+# There are three ways to use header \converters;
+# these examples use built-in header converter +:dowhcase+,
+# which downcases each parsed header.
+#
+# - Option +header_converters+ with a singleton parsing method:
+#     string = "Name,Count\nFoo,0\n,Bar,1\nBaz,2"
+#     tbl = CSV.parse(string, headers: true, header_converters: :downcase)
+#     tbl.class # => CSV::Table
+#     tbl.headers # => ["name", "count"]
+#
+# - Option +header_converters+ with a new \CSV instance:
+#     csv = CSV.new(string, header_converters: :downcase)
+#     # Header converters in effect:
+#     csv.header_converters # => [:downcase]
+#     tbl = CSV.parse(string, headers: true)
+#     tbl.headers # => ["Name", "Count"]
+#
+# - Method #header_convert adds a header converter to a \CSV instance:
+#     csv = CSV.new(string)
+#     # Add a header converter.
+#     csv.header_convert(:downcase)
+#     csv.header_converters # => [:downcase]
+#     tbl = CSV.parse(string, headers: true)
+#     tbl.headers # => ["Name", "Count"]
+#
+# ===== Built-In Header \Converters
+#
+# The built-in header \converters are in \Hash CSV::HeaderConverters.
+# The keys there are the names of the \converters:
+#   CSV::HeaderConverters.keys # => [:downcase, :symbol]
+#
+# Converter +:downcase+ converts each header by downcasing it:
+#   string = "Name,Count\nFoo,0\n,Bar,1\nBaz,2"
+#   tbl = CSV.parse(string, headers: true, header_converters: :downcase)
+#   tbl.class # => CSV::Table
+#   tbl.headers # => ["name", "count"]
+#
+# Converter +:symbol+ converts each header by making it into a \Symbol:
+#   string = "Name,Count\nFoo,0\n,Bar,1\nBaz,2"
+#   tbl = CSV.parse(string, headers: true, header_converters: :symbol)
+#   tbl.headers # => [:name, :count]
+# Details:
+# - Strips leading and trailing whitespace.
+# - Downcases the header.
+# - Replaces embedded spaces with underscores.
+# - Removes non-word characters.
+# - Makes the string into a \Symbol.
+#
+# ===== Custom Header \Converters
+#
+# You can define a custom header converter:
+#   upcase_converter = proc {|header| header.upcase }
+#   string = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
+#   table = CSV.parse(string, headers: true, header_converters: upcase_converter)
+#   table # => #<CSV::Table mode:col_or_row row_count:4>
+#   table.headers # => ["NAME", "VALUE"]
+# You can register the converter in \HeaderConverters \Hash,
+# which allows you to refer to it by name:
+#   CSV::HeaderConverters[:upcase] = upcase_converter
+#   table = CSV.parse(string, headers: true, header_converters: :upcase)
+#   table # => #<CSV::Table mode:col_or_row row_count:4>
+#   table.headers # => ["NAME", "VALUE"]
+#
+# ===== Write \Converters
+#
+# When you specify a write converter for generating \CSV,
+# each field to be written is passed to the converter;
+# its return value becomes the new value for the field.
+# A converter might, for example, strip whitespace from a field.
+#
+# Using no write converter (all fields unmodified):
+#   output_string = CSV.generate do |csv|
+#     csv << [' foo ', 0]
+#     csv << [' bar ', 1]
+#     csv << [' baz ', 2]
+#   end
+#   output_string # => " foo ,0\n bar ,1\n baz ,2\n"
+# Using option +write_converters+ with two custom write converters:
+#   strip_converter = proc {|field| field.respond_to?(:strip) ? field.strip : field }
+#   upcase_converter = proc {|field| field.respond_to?(:upcase) ? field.upcase : field }
+#   write_converters = [strip_converter, upcase_converter]
+#   output_string = CSV.generate(write_converters: write_converters) do |csv|
+#     csv << [' foo ', 0]
+#     csv << [' bar ', 1]
+#     csv << [' baz ', 2]
+#   end
+#   output_string # => "FOO,0\nBAR,1\nBAZ,2\n"
+#
+# === Character Encodings (M17n or Multilingualization)
 #
 # This new CSV parser is m17n savvy.  The parser works in the Encoding of the IO
-# or String object being read from or written to.  Your data is never transcoded
+# or String object being read from or written to. Your data is never transcoded
 # (unless you ask Ruby to transcode it for you) and will literally be parsed in
-# the Encoding it is in.  Thus CSV will return Arrays or Rows of Strings in the
-# Encoding of your data.  This is accomplished by transcoding the parser itself
+# the Encoding it is in. Thus CSV will return Arrays or Rows of Strings in the
+# Encoding of your data. This is accomplished by transcoding the parser itself
 # into your Encoding.
 #
 # Some transcoding must take place, of course, to accomplish this multiencoding
-# support.  For example, <tt>:col_sep</tt>, <tt>:row_sep</tt>, and
+# support. For example, <tt>:col_sep</tt>, <tt>:row_sep</tt>, and
 # <tt>:quote_char</tt> must be transcoded to match your data.  Hopefully this
 # makes the entire process feel transparent, since CSV's defaults should just
-# magically work for your data.  However, you can set these values manually in
+# magically work for your data. However, you can set these values manually in
 # the target Encoding to avoid the translation.
 #
 # It's also important to note that while all of CSV's core parser is now
-# Encoding agnostic, some features are not.  For example, the built-in
+# Encoding agnostic, some features are not. For example, the built-in
 # converters will try to transcode data to UTF-8 before making conversions.
 # Again, you can provide custom converters that are aware of your Encodings to
-# avoid this translation.  It's just too hard for me to support native
+# avoid this translation. It's just too hard for me to support native
 # conversions in all of Ruby's Encodings.
 #
-# Anyway, the practical side of this is simple:  make sure IO and String objects
+# Anyway, the practical side of this is simple: make sure IO and String objects
 # passed into CSV have the proper Encoding set and everything should just work.
 # CSV methods that allow you to open IO objects (CSV::foreach(), CSV::open(),
 # CSV::read(), and CSV::readlines()) do allow you to specify the Encoding.
 #
 # One minor exception comes when generating CSV into a String with an Encoding
-# that is not ASCII compatible.  There's no existing data for CSV to use to
+# that is not ASCII compatible. There's no existing data for CSV to use to
 # prepare itself and thus you will probably need to manually specify the desired
-# Encoding for most of those cases.  It will try to guess using the fields in a
+# Encoding for most of those cases. It will try to guess using the fields in a
 # row of output though, when using CSV::generate_line() or Array#to_csv().
 #
 # I try to point out any other Encoding issues in the documentation of methods
 # as they come up.
 #
 # This has been tested to the best of my ability with all non-"dummy" Encodings
-# Ruby ships with.  However, it is brave new code and may have some bugs.
+# Ruby ships with. However, it is brave new code and may have some bugs.
 # Please feel free to {report}[mailto:james@grayproductions.net] any issues you
 # find with it.
 #
 class CSV
-  # The version of the installed library.
-  VERSION = "2.4.8"
+
+  # The error thrown when the parser encounters illegal CSV formatting.
+  class MalformedCSVError < RuntimeError
+    attr_reader :line_number
+    alias_method :lineno, :line_number
+    def initialize(message, line_number)
+      @line_number = line_number
+      super("#{message} in line #{line_number}.")
+    end
+  end
 
   #
-  # 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.
+  # 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.
   #
-  # All rows returned by CSV will be constructed from this class, if header row
-  # processing is activated.
+  # <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.
   #
-  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
-      headers.each { |h| h.freeze if h.is_a? String }
-
-      # handle extra headers or fields
-      @row = if headers.size >= fields.size
-        headers.zip(fields)
-      else
-        fields.zip(headers).map { |pair| pair.reverse! }
-      end
-    end
-
-    # Internal data format used to compare equality.
-    attr_reader :row
-    protected   :row
-
-    ### Array Delegation ###
+  FieldInfo = Struct.new(:index, :line, :header)
 
-    extend Forwardable
-    def_delegators :@row, :empty?, :length, :size
+  # 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} |
+            # ISO-8601
+            \d{4}-\d{2}-\d{2}
+              (?:T\d{2}:\d{2}(?::\d{2}(?:\.\d+)?(?:[+-]\d{2}(?::\d{2})|Z)?)?)?
+        )\z /x
 
-    # Returns +true+ if this is a header row.
-    def header_row?
-      @header_row
-    end
+  # The encoding used by all converters.
+  ConverterEncoding = Encoding.find("UTF-8")
 
-    # Returns +true+ if this is a field row.
-    def field_row?
-      not header_row?
-    end
+  # A \Hash containing the names and \Procs for the built-in field converters.
+  # See {Built-In Field Converters}[#class-CSV-label-Built-In+Field+Converters].
+  #
+  # This \Hash is intentionally left unfrozen, and may be extended with
+  # custom field converters.
+  # See {Custom Field Converters}[#class-CSV-label-Custom+Field+Converters].
+  Converters  = {
+    integer:   lambda { |f|
+      Integer(f.encode(ConverterEncoding)) rescue f
+    },
+    float:     lambda { |f|
+      Float(f.encode(ConverterEncoding)) rescue f
+    },
+    numeric:   [:integer, :float],
+    date:      lambda { |f|
+      begin
+        e = f.encode(ConverterEncoding)
+        e.match?(DateMatcher) ? Date.parse(e) : f
+      rescue  # encoding conversion or date parse errors
+        f
+      end
+    },
+    date_time: lambda { |f|
+      begin
+        e = f.encode(ConverterEncoding)
+        e.match?(DateTimeMatcher) ? DateTime.parse(e) : f
+      rescue  # encoding conversion or date parse errors
+        f
+      end
+    },
+    all:       [:date_time, :numeric],
+  }
 
-    # Returns the headers of this row.
-    def headers
-      @row.map { |pair| pair.first }
-    end
+  # A \Hash containing the names and \Procs for the built-in header converters.
+  # See {Built-In Header Converters}[#class-CSV-label-Built-In+Header+Converters].
+  #
+  # This \Hash is intentionally left unfrozen, and may be extended with
+  # custom field converters.
+  # See {Custom Header Converters}[#class-CSV-label-Custom+Header+Converters].
+  HeaderConverters = {
+    downcase: lambda { |h| h.encode(ConverterEncoding).downcase },
+    symbol:   lambda { |h|
+      h.encode(ConverterEncoding).downcase.gsub(/[^\s\w]+/, "").strip.
+                                           gsub(/\s+/, "_").to_sym
+    }
+  }
+  # Default values for method options.
+  DEFAULT_OPTIONS = {
+    # For both parsing and generating.
+    col_sep:            ",",
+    row_sep:            :auto,
+    quote_char:         '"',
+    # For parsing.
+    field_size_limit:   nil,
+    converters:         nil,
+    unconverted_fields: nil,
+    headers:            false,
+    return_headers:     false,
+    header_converters:  nil,
+    skip_blanks:        false,
+    skip_lines:         nil,
+    liberal_parsing:    false,
+    nil_value:          nil,
+    empty_value:        "",
+    # For generating.
+    write_headers:      nil,
+    quote_empty:        true,
+    force_quotes:       false,
+    write_converters:   nil,
+    write_nil_value:    nil,
+    write_empty_value:  "",
+    strip:              false,
+  }.freeze
 
-    #
+  class << self
     # :call-seq:
-    #   field( header )
-    #   field( header, offset )
-    #   field( index )
-    #
-    # This method will return the field value by +header+ or +index+.  If a field
-    # is not found, +nil+ is returned.
-    #
-    # When provided, +offset+ ensures that a header match occurs 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) || header_or_index.is_a?(Range)) ? :[] : :assoc
-      pair   = @row[minimum_index..-1].send(finder, header_or_index)
-
-      # return the field if we have a pair
-      if pair.nil?
-        nil
+    #   instance(string, **options)
+    #   instance(io = $stdout, **options)
+    #   instance(string, **options) {|csv| ... }
+    #   instance(io = $stdout, **options) {|csv| ... }
+    #
+    # Creates or retrieves cached \CSV objects.
+    # For arguments and options, see CSV.new.
+    #
+    # ---
+    #
+    # With no block given, returns a \CSV object.
+    #
+    # The first call to +instance+ creates and caches a \CSV object:
+    #   s0 = 's0'
+    #   csv0 = CSV.instance(s0)
+    #   csv0.class # => CSV
+    #
+    # Subsequent calls to +instance+ with that _same_ +string+ or +io+
+    # retrieve that same cached object:
+    #   csv1 = CSV.instance(s0)
+    #   csv1.class # => CSV
+    #   csv1.equal?(csv0) # => true # Same CSV object
+    #
+    # A subsequent call to +instance+ with a _different_ +string+ or +io+
+    # creates and caches a _different_ \CSV object.
+    #   s1 = 's1'
+    #   csv2 = CSV.instance(s1)
+    #   csv2.equal?(csv0) # => false # Different CSV object
+    #
+    # All the cached objects remains available:
+    #   csv3 = CSV.instance(s0)
+    #   csv3.equal?(csv0) # true # Same CSV object
+    #   csv4 = CSV.instance(s1)
+    #   csv4.equal?(csv2) # true # Same CSV object
+    #
+    # ---
+    #
+    # When a block is given, calls the block with the created or retrieved
+    # \CSV object; returns the block's return value:
+    #   CSV.instance(s0) {|csv| :foo } # => :foo
+    def instance(data = $stdout, **options)
+      # 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))
+
+      if block_given?
+        yield instance  # run block, if given, returning result
       else
-        header_or_index.is_a?(Range) ? pair.map(&:last) : pair.last
+        instance        # or return the instance
       end
     end
-    alias_method :[], :field
 
-    #
     # :call-seq:
-    #   fetch( header )
-    #   fetch( header ) { |row| ... }
-    #   fetch( header, default )
-    #
-    # This method will fetch the field value by +header+. It has the same
-    # behavior as Hash#fetch: if there is a field with the given +header+, its
-    # value is returned. Otherwise, if a block is given, it is yielded the
-    # +header+ and its result is returned; if a +default+ is given as the
-    # second argument, it is returned; otherwise a KeyError is raised.
-    #
-    def fetch(header, *varargs)
-      raise ArgumentError, "Too many arguments" if varargs.length > 1
-      pair = @row.assoc(header)
-      if pair
-        pair.last
-      else
-        if block_given?
-          yield header
-        elsif varargs.empty?
-          raise KeyError, "key not found: #{header}"
+    #   filter(**options) {|row| ... }
+    #   filter(in_string, **options) {|row| ... }
+    #   filter(in_io, **options) {|row| ... }
+    #   filter(in_string, out_string, **options) {|row| ... }
+    #   filter(in_string, out_io, **options) {|row| ... }
+    #   filter(in_io, out_string, **options) {|row| ... }
+    #   filter(in_io, out_io, **options) {|row| ... }
+    #
+    # Reads \CSV input and writes \CSV output.
+    #
+    # For each input row:
+    # - Forms the data into:
+    #   - A CSV::Row object, if headers are in use.
+    #   - An \Array of Arrays, otherwise.
+    # - Calls the block with that object.
+    # - Appends the block's return value to the output.
+    #
+    # Arguments:
+    # * \CSV source:
+    #   * Argument +in_string+, if given, should be a \String object;
+    #     it will be put into a new StringIO object positioned at the beginning.
+    #   * Argument +in_io+, if given, should be an IO object that is
+    #     open for reading; on return, the IO object will be closed.
+    #   * If neither  +in_string+ nor +in_io+ is given,
+    #     the input stream defaults to {ARGF}[https://ruby-doc.org/core/ARGF.html].
+    # * \CSV output:
+    #   * Argument +out_string+, if given, should be a \String object;
+    #     it will be put into a new StringIO object positioned at the beginning.
+    #   * Argument +out_io+, if given, should be an IO object that is
+    #     ppen for writing; on return, the IO object will be closed.
+    #   * If neither +out_string+ nor +out_io+ is given,
+    #     the output stream defaults to <tt>$stdout</tt>.
+    # * Argument +options+ should be keyword arguments.
+    #   - Each argument name that is prefixed with +in_+ or +input_+
+    #     is stripped of its prefix and is treated as an option
+    #     for parsing the input.
+    #     Option +input_row_sep+ defaults to <tt>$INPUT_RECORD_SEPARATOR</tt>.
+    #   - Each argument name that is prefixed with +out_+ or +output_+
+    #     is stripped of its prefix and is treated as an option
+    #     for generating the output.
+    #     Option +output_row_sep+ defaults to <tt>$INPUT_RECORD_SEPARATOR</tt>.
+    #   - Each argument not prefixed as above is treated as an option
+    #     both for parsing the input and for generating the output.
+    #   - See {Options for Parsing}[#class-CSV-label-Options+for+Parsing]
+    #     and {Options for Generating}[#class-CSV-label-Options+for+Generating].
+    #
+    # Example:
+    #   in_string = "foo,0\nbar,1\nbaz,2\n"
+    #   out_string = ''
+    #   CSV.filter(in_string, out_string) do |row|
+    #     row[0] = row[0].upcase
+    #     row[1] *= 4
+    #   end
+    #   out_string # => "FOO,0000\nBAR,1111\nBAZ,2222\n"
+    def filter(input=nil, output=nil, **options)
+      # parse options for input, output, or both
+      in_options, out_options = Hash.new, {row_sep: $INPUT_RECORD_SEPARATOR}
+      options.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
-          varargs.first
+          in_options[key]  = value
+          out_options[key] = value
+        end
+      end
+
+      # build input and output wrappers
+      input  = new(input  || ARGF, **in_options)
+      output = new(output || $stdout, **out_options)
+
+      # process headers
+      need_manual_header_output =
+        (in_options[:headers] and
+         out_options[:headers] == true and
+         out_options[:write_headers])
+      if need_manual_header_output
+        first_row = input.shift
+        if first_row
+          if first_row.is_a?(Row)
+            headers = first_row.headers
+            yield headers
+            output << headers
+          end
+          yield first_row
+          output << first_row
         end
       end
-    end
 
-    # Returns +true+ if there is a field with the given +header+.
-    def has_key?(header)
-      !!@row.assoc(header)
+      # read, yield, write
+      input.each do |row|
+        yield row
+        output << row
+      end
     end
-    alias_method :include?, :has_key?
-    alias_method :key?,     :has_key?
-    alias_method :member?,  :has_key?
 
     #
     # :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
+    #   foreach(path, mode='r', **options) {|row| ... )
+    #   foreach(io, mode='r', **options {|row| ... )
+    #   foreach(path, mode='r', headers: ..., **options) {|row| ... )
+    #   foreach(io, mode='r', headers: ..., **options {|row| ... )
+    #   foreach(path, mode='r', **options) -> new_enumerator
+    #   foreach(io, mode='r', **options -> new_enumerator
+    #
+    # Calls the block with each row read from source +path+ or +io+.
+    #
+    # * Argument +path+, if given, must be the path to a file.
+    # :include: ../doc/csv/arguments/io.rdoc
+    # * Argument +mode+, if given, must be a \File mode
+    #   See {Open Mode}[IO.html#method-c-new-label-Open+Mode].
+    # * Arguments <tt>**options</tt> must be keyword options.
+    #   See {Options for Parsing}[#class-CSV-label-Options+for+Parsing].
+    # * This method optionally accepts an additional <tt>:encoding</tt> option
+    #   that you can use to specify the Encoding of the data read from +path+ or +io+.
+    #   You must provide this unless your data is in the encoding
+    #   given by <tt>Encoding::default_external</tt>.
+    #   Parsing will use this to determine how to parse the data.
+    #   You may provide a second Encoding to
+    #   have the data transcoded as it is read. For example,
+    #     encoding: 'UTF-32BE:UTF-8'
+    #   would read +UTF-32BE+ data from the file
+    #   but transcode it to +UTF-8+ before parsing.
+    #
+    # ====== Without Option +headers+
+    #
+    # Without option +headers+, returns each row as an \Array object.
+    #
+    # These examples assume prior execution of:
+    #   string = "foo,0\nbar,1\nbaz,2\n"
+    #   path = 't.csv'
+    #   File.write(path, string)
+    #
+    # Read rows from a file at +path+:
+    #   CSV.foreach(path) {|row| p row }
+    # Output:
+    #   ["foo", "0"]
+    #   ["bar", "1"]
+    #   ["baz", "2"]
+    #
+    # Read rows from an \IO object:
+    #   File.open(path) do |file|
+    #     CSV.foreach(file) {|row| p row }
+    #   end
+    #
+    # Output:
+    #   ["foo", "0"]
+    #   ["bar", "1"]
+    #   ["baz", "2"]
+    #
+    # Returns a new \Enumerator if no block given:
+    #   CSV.foreach(path) # => #<Enumerator: CSV:foreach("t.csv", "r")>
+    #   CSV.foreach(File.open(path)) # => #<Enumerator: CSV:foreach(#<File:t.csv>, "r")>
+    #
+    # Issues a warning if an encoding is unsupported:
+    #   CSV.foreach(File.open(path), encoding: 'foo:bar') {|row| }
+    # Output:
+    #   warning: Unsupported encoding foo ignored
+    #   warning: Unsupported encoding bar ignored
+    #
+    # ====== With Option +headers+
+    #
+    # With {option +headers+}[#class-CSV-label-Option+headers],
+    # returns each row as a CSV::Row object.
+    #
+    # These examples assume prior execution of:
+    #   string = "Name,Count\nfoo,0\nbar,1\nbaz,2\n"
+    #   path = 't.csv'
+    #   File.write(path, string)
+    #
+    # Read rows from a file at +path+:
+    #   CSV.foreach(path, headers: true) {|row| p row }
+    #
+    # Output:
+    #   #<CSV::Row "Name":"foo" "Count":"0">
+    #   #<CSV::Row "Name":"bar" "Count":"1">
+    #   #<CSV::Row "Name":"baz" "Count":"2">
+    #
+    # Read rows from an \IO object:
+    #   File.open(path) do |file|
+    #     CSV.foreach(file, headers: true) {|row| p row }
+    #   end
+    #
+    # Output:
+    #   #<CSV::Row "Name":"foo" "Count":"0">
+    #   #<CSV::Row "Name":"bar" "Count":"1">
+    #   #<CSV::Row "Name":"baz" "Count":"2">
+    #
+    # ---
+    #
+    # Raises an exception if +path+ is a \String, but not the path to a readable file:
+    #   # Raises Errno::ENOENT (No such file or directory @ rb_sysopen - nosuch.csv):
+    #   CSV.foreach('nosuch.csv') {|row| }
+    #
+    # Raises an exception if +io+ is an \IO object, but not open for reading:
+    #   io = File.open(path, 'w') {|row| }
+    #   # Raises TypeError (no implicit conversion of nil into String):
+    #   CSV.foreach(io) {|row| }
+    #
+    # Raises an exception if +mode+ is invalid:
+    #   # Raises ArgumentError (invalid access mode nosuch):
+    #   CSV.foreach(path, 'nosuch') {|row| }
+    #
+    def foreach(path, mode="r", **options, &block)
+      return to_enum(__method__, path, mode, **options) unless block_given?
+      open(path, mode, **options) do |csv|
+        csv.each(&block)
       end
     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]
+    #   generate(csv_string, **options) {|csv| ... }
+    #   generate(**options) {|csv| ... }
+    #
+    # * Argument +csv_string+, if given, must be a \String object;
+    #   defaults to a new empty \String.
+    # * Arguments +options+, if given, should be generating options.
+    #   See {Options for Generating}[#class-CSV-label-Options+for+Generating].
+    #
+    # ---
+    #
+    # Creates a new \CSV object via <tt>CSV.new(csv_string, **options)</tt>;
+    # calls the block with the \CSV object, which the block may modify;
+    # returns the \String generated from the \CSV object.
+    #
+    # Note that a passed \String *is* modified by this method.
+    # Pass <tt>csv_string</tt>.dup if the \String must be preserved.
+    #
+    # This method has one additional option: <tt>:encoding</tt>,
+    # which sets the base Encoding for the output if no no +str+ is specified.
+    # CSV needs this hint if you plan to output non-ASCII compatible data.
+    #
+    # ---
+    #
+    # Add lines:
+    #   input_string = "foo,0\nbar,1\nbaz,2\n"
+    #   output_string = CSV.generate(input_string) do |csv|
+    #     csv << ['bat', 3]
+    #     csv << ['bam', 4]
+    #   end
+    #   output_string # => "foo,0\nbar,1\nbaz,2\nbat,3\nbam,4\n"
+    #   input_string # => "foo,0\nbar,1\nbaz,2\nbat,3\nbam,4\n"
+    #   output_string.equal?(input_string) # => true # Same string, modified
+    #
+    # Add lines into new string, preserving old string:
+    #   input_string = "foo,0\nbar,1\nbaz,2\n"
+    #   output_string = CSV.generate(input_string.dup) do |csv|
+    #     csv << ['bat', 3]
+    #     csv << ['bam', 4]
+    #   end
+    #   output_string # => "foo,0\nbar,1\nbaz,2\nbat,3\nbam,4\n"
+    #   input_string # => "foo,0\nbar,1\nbaz,2\n"
+    #   output_string.equal?(input_string) # => false # Different strings
+    #
+    # Create lines from nothing:
+    #   output_string = CSV.generate do |csv|
+    #     csv << ['foo', 0]
+    #     csv << ['bar', 1]
+    #     csv << ['baz', 2]
+    #   end
+    #   output_string # => "foo,0\nbar,1\nbaz,2\n"
+    #
+    # ---
+    #
+    # Raises an exception if +csv_string+ is not a \String object:
+    #   # Raises TypeError (no implicit conversion of Integer into String)
+    #   CSV.generate(0)
+    #
+    def generate(str=nil, **options)
+      encoding = options[:encoding]
+      # add a default empty String, if none was given
+      if str
+        str = StringIO.new(str)
+        str.seek(0, IO::SEEK_END)
+        str.set_encoding(encoding) if encoding
+      else
+        str = +""
+        str.force_encoding(encoding) if encoding
       end
-
-      self  # for chaining
+      csv = new(str, **options) # wrap
+      yield csv         # yield for appending
+      csv.string        # return final String
     end
 
+    # :call-seq:
+    #   CSV.generate_line(ary)
+    #   CSV.generate_line(ary, **options)
     #
-    # A shortcut for appending multiple fields.  Equivalent to:
+    # Returns the \String created by generating \CSV from +ary+
+    # using the specified +options+.
     #
-    #   args.each { |arg| csv_row << arg }
+    # Argument +ary+ must be an \Array.
     #
-    # This method returns the row for chaining.
+    # Special options:
+    # * Option <tt>:row_sep</tt> defaults to <tt>$INPUT_RECORD_SEPARATOR</tt>
+    #   (<tt>$/</tt>).:
+    #     $INPUT_RECORD_SEPARATOR # => "\n"
+    # * This method accepts an additional option, <tt>:encoding</tt>, which sets the base
+    #   Encoding for the output. This method will try to guess your Encoding from
+    #   the first non-+nil+ field in +row+, if possible, but you may need to use
+    #   this parameter as a backup plan.
     #
-    def push(*args)
-      args.each { |arg| self << arg }
-
-      self  # for chaining
-    end
-
+    # For other +options+,
+    # see {Options for Generating}[#class-CSV-label-Options+for+Generating].
     #
-    # :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)
-      elsif i = index(header_or_index, minimum_index)  # by header
-        @row.delete_at(i)
-      else
-        [ ]
-      end
-    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.
+    # Returns the \String generated from an \Array:
+    #   CSV.generate_line(['foo', '0']) # => "foo,0\n"
     #
-    # This method returns the row for chaining.
+    # ---
     #
-    def delete_if(&block)
-      @row.delete_if(&block)
-
-      self  # for chaining
-    end
-
+    # Raises an exception if +ary+ is not an \Array:
+    #   # Raises NoMethodError (undefined method `find' for :foo:Symbol)
+    #   CSV.generate_line(:foo)
     #
-    # 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))]
-          end
+    def generate_line(row, **options)
+      options = {row_sep: $INPUT_RECORD_SEPARATOR}.merge(options)
+      str = +""
+      if options[:encoding]
+        str.force_encoding(options[:encoding])
+      else
+        fallback_encoding = nil
+        output_encoding = nil
+        row.each do |field|
+          next unless field.is_a?(String)
+          fallback_encoding ||= field.encoding
+          next if field.ascii_only?
+          output_encoding = field.encoding
+          break
+        end
+        output_encoding ||= fallback_encoding
+        if output_encoding
+          str.force_encoding(output_encoding)
         end
       end
+      (new(str, **options) << row).string
     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
+    #   open(file_path, mode = "rb", **options ) -> new_csv
+    #   open(io, mode = "rb", **options ) -> new_csv
+    #   open(file_path, mode = "rb", **options ) { |csv| ... } -> object
+    #   open(io, mode = "rb", **options ) { |csv| ... } -> object
+    #
+    # possible options elements:
+    #   hash form:
+    #     :invalid => nil      # raise error on invalid byte sequence (default)
+    #     :invalid => :replace # replace invalid byte sequence
+    #     :undef => :replace   # replace undefined conversion
+    #     :replace => string   # replacement string ("?" or "\uFFFD" if not specified)
+    #
+    # * Argument +path+, if given, must be the path to a file.
+    # :include: ../doc/csv/arguments/io.rdoc
+    # * Argument +mode+, if given, must be a \File mode
+    #   See {Open Mode}[IO.html#method-c-new-label-Open+Mode].
+    # * Arguments <tt>**options</tt> must be keyword options.
+    #   See {Options for Generating}[#class-CSV-label-Options+for+Generating].
+    # * This method optionally accepts an additional <tt>:encoding</tt> option
+    #   that you can use to specify the Encoding of the data read from +path+ or +io+.
+    #   You must provide this unless your data is in the encoding
+    #   given by <tt>Encoding::default_external</tt>.
+    #   Parsing will use this to determine how to parse the data.
+    #   You may provide a second Encoding to
+    #   have the data transcoded as it is read. For example,
+    #     encoding: 'UTF-32BE:UTF-8'
+    #   would read +UTF-32BE+ data from the file
+    #   but transcode it to +UTF-8+ before parsing.
+    #
+    # ---
+    #
+    # These examples assume prior execution of:
+    #   string = "foo,0\nbar,1\nbaz,2\n"
+    #   path = 't.csv'
+    #   File.write(path, string)
+    #
+    # ---
+    #
+    # With no block given, returns a new \CSV object.
+    #
+    # Create a \CSV object using a file path:
+    #   csv = CSV.open(path)
+    #   csv # => #<CSV io_type:File io_path:"t.csv" encoding:UTF-8 lineno:0 col_sep:"," row_sep:"\n" quote_char:"\"">
+    #
+    # Create a \CSV object using an open \File:
+    #   csv = CSV.open(File.open(path))
+    #   csv # => #<CSV io_type:File io_path:"t.csv" encoding:UTF-8 lineno:0 col_sep:"," row_sep:"\n" quote_char:"\"">
+    #
+    # ---
+    #
+    # With a block given, calls the block with the created \CSV object;
+    # returns the block's return value:
+    #
+    # Using a file path:
+    #   csv = CSV.open(path) {|csv| p csv}
+    #   csv # => #<CSV io_type:File io_path:"t.csv" encoding:UTF-8 lineno:0 col_sep:"," row_sep:"\n" quote_char:"\"">
+    # Output:
+    #   #<CSV io_type:File io_path:"t.csv" encoding:UTF-8 lineno:0 col_sep:"," row_sep:"\n" quote_char:"\"">
+    #
+    # Using an open \File:
+    #   csv = CSV.open(File.open(path)) {|csv| p csv}
+    #   csv # => #<CSV io_type:File io_path:"t.csv" encoding:UTF-8 lineno:0 col_sep:"," row_sep:"\n" quote_char:"\"">
+    # Output:
+    #   #<CSV io_type:File io_path:"t.csv" encoding:UTF-8 lineno:0 col_sep:"," row_sep:"\n" quote_char:"\"">
+    #
+    # ---
+    #
+    # Raises an exception if the argument is not a \String object or \IO object:
+    #   # Raises TypeError (no implicit conversion of Symbol into String)
+    #   CSV.open(:foo)
+    def open(filename, mode="r", **options)
+      # wrap a File opened with the remaining +args+ with no newline
+      # decorator
+      file_opts = {universal_newline: false}.merge(options)
+      options.delete(:invalid)
+      options.delete(:undef)
+      options.delete(:replace)
 
-    # Returns +true+ if +name+ is a header for this row, and +false+ otherwise.
-    def header?(name)
-      headers.include? name
-    end
-    alias_method :include?, :header?
+      begin
+        f = File.open(filename, mode, **file_opts)
+      rescue ArgumentError => e
+        raise unless /needs binmode/.match?(e.message) and mode == "r"
+        mode = "rb"
+        file_opts = {encoding: Encoding.default_external}.merge(file_opts)
+        retry
+      end
+      begin
+        csv = new(f, **options)
+      rescue Exception
+        f.close
+        raise
+      end
 
-    #
-    # Returns +true+ if +data+ matches a field in this row, and +false+
-    # otherwise.
-    #
-    def field?(data)
-      fields.include? data
+      # handle blocks like Ruby's open(), not like the CSV library
+      if block_given?
+        begin
+          yield csv
+        ensure
+          csv.close
+        end
+      else
+        csv
+      end
     end
 
-    include Enumerable
-
     #
-    # Yields each pair of the row as header and field tuples (much like
-    # iterating over a Hash).
+    # :call-seq:
+    #   parse(string) -> array_of_arrays
+    #   parse(io) -> array_of_arrays
+    #   parse(string, headers: ..., **options) -> csv_table
+    #   parse(io, headers: ..., **options) -> csv_table
+    #   parse(string, **options) {|row| ... }
+    #   parse(io, **options) {|row| ... }
     #
-    # Support for Enumerable.
+    # Parses +string+ or +io+ using the specified +options+.
     #
-    # This method returns the row for chaining.
+    # - Argument +string+ should be a \String object;
+    #   it will be put into a new StringIO object positioned at the beginning.
+    # :include: ../doc/csv/arguments/io.rdoc
+    # - Argument +options+: see {Options for Parsing}[#class-CSV-label-Options+for+Parsing]
     #
-    def each(&block)
-      @row.each(&block)
-
-      self  # for chaining
-    end
-
+    # ====== Without Option +headers+
     #
-    # Returns +true+ if this row contains the same headers and fields in the
-    # same order as +other+.
+    # Without {option +headers+}[#class-CSV-label-Option+headers] case.
     #
-    def ==(other)
-      return @row == other.row if other.is_a? CSV::Row
-      @row == other
-    end
-
+    # These examples assume prior execution of:
+    #   string = "foo,0\nbar,1\nbaz,2\n"
+    #   path = 't.csv'
+    #   File.write(path, string)
     #
-    # Collapses the row into a simple Hash.  Be warned 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
-
+    # With no block given, returns an \Array of Arrays formed from the source.
     #
-    # Returns the row as a CSV String.  Headers are not used.  Equivalent to:
+    # Parse a \String:
+    #   a_of_a = CSV.parse(string)
+    #   a_of_a # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
     #
-    #   csv_row.fields.to_csv( options )
+    # Parse an open \File:
+    #   a_of_a = File.open(path) do |file|
+    #     CSV.parse(file)
+    #   end
+    #   a_of_a # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
     #
-    def to_csv(options = Hash.new)
-      fields.to_csv(options)
-    end
-    alias_method :to_s, :to_csv
-
-    # A summary of fields, by header, in an ASCII compatible String.
-    def inspect
-      str = ["#<", self.class.to_s]
-      each do |header, field|
-        str << " " << (header.is_a?(Symbol) ? header.to_s : header.inspect) <<
-               ":" << field.inspect
-      end
-      str << ">"
-      begin
-        str.join('')
-      rescue  # any encoding error
-        str.map do |s|
-          e = Encoding::Converter.asciicompat_encoding(s.encoding)
-          e ? s.encode(e) : s.force_encoding("ASCII-8BIT")
-        end.join('')
-      end
-    end
-  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.
+    # With a block given, calls the block with each parsed row:
     #
-    # A CSV::Table object supports the following Array methods through
-    # delegation:
+    # Parse a \String:
+    #   CSV.parse(string) {|row| p row }
     #
-    # * empty?()
-    # * length()
-    # * size()
+    # Output:
+    #   ["foo", "0"]
+    #   ["bar", "1"]
+    #   ["baz", "2"]
     #
-    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 ###
-
-    extend Forwardable
-    def_delegators :@table, :empty?, :length, :size
-
+    # Parse an open \File:
+    #   File.open(path) do |file|
+    #     CSV.parse(file) {|row| p row }
+    #   end
     #
-    # 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.
+    # Output:
+    #   ["foo", "0"]
+    #   ["bar", "1"]
+    #   ["baz", "2"]
     #
-    # This method returns the duplicate table for chaining.  Don't chain
-    # destructive methods (like []=()) this way though, since you are working
-    # with a duplicate.
+    # ====== With Option +headers+
     #
-    def by_col
-      self.class.new(@table.dup).by_col!
-    end
-
+    # With {option +headers+}[#class-CSV-label-Option+headers] case.
     #
-    # 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.
+    # These examples assume prior execution of:
+    #   string = "Name,Count\nfoo,0\nbar,1\nbaz,2\n"
+    #   path = 't.csv'
+    #   File.write(path, string)
     #
-    # This method returns the table and is safe to chain.
+    # ---
     #
-    def by_col!
-      @mode = :col
-
-      self
-    end
-
+    # With no block given, returns a CSV::Table object formed from the source.
     #
-    # 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.
+    # Parse a \String:
+    #   csv_table = CSV.parse(string, headers: ['Name', 'Count'])
+    #   csv_table # => #<CSV::Table mode:col_or_row row_count:5>
     #
-    # This method returns the duplicate table for chaining.  Don't chain
-    # destructive methods (like []=()) this way though, since you are working
-    # with a duplicate.
+    # Parse an open \File:
+    #   csv_table = File.open(path) do |file|
+    #     CSV.parse(file, headers: ['Name', 'Count'])
+    #   end
+    #   csv_table # => #<CSV::Table mode:col_or_row row_count:4>
     #
-    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.
+    # With a block given, calls the block with each parsed row,
+    # which has been formed into a CSV::Row object:
     #
-    # This method returns the table and is safe to chain.
+    # Parse a \String:
+    #   CSV.parse(string, headers: ['Name', 'Count']) {|row| p row }
     #
-    def by_col_or_row!
-      @mode = :col_or_row
-
-      self
-    end
-
+    # Output:
+    #   # <CSV::Row "Name":"foo" "Count":"0">
+    #   # <CSV::Row "Name":"bar" "Count":"1">
+    #   # <CSV::Row "Name":"baz" "Count":"2">
     #
-    # 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
-
+    # Parse an open \File:
+    #   File.open(path) do |file|
+    #     CSV.parse(file, headers: ['Name', 'Count']) {|row| p 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.
+    # Output:
+    #   # <CSV::Row "Name":"foo" "Count":"0">
+    #   # <CSV::Row "Name":"bar" "Count":"1">
+    #   # <CSV::Row "Name":"baz" "Count":"2">
     #
-    # This method returns the table and is safe to chain.
+    # ---
     #
-    def by_row!
-      @mode = :row
+    # Raises an exception if the argument is not a \String object or \IO object:
+    #   # Raises NoMethodError (undefined method `close' for :foo:Symbol)
+    #   CSV.parse(:foo)
+    def parse(str, **options, &block)
+      csv = new(str, **options)
 
-      self
-    end
+      return csv.each(&block) if block_given?
 
-    #
-    # 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
-      else
-        @table.first.headers
+      # slurp contents, if no block is given
+      begin
+        csv.read
+      ensure
+        csv.close
       end
     end
 
+    # :call-seq:
+    #   CSV.parse_line(string) -> new_array or nil
+    #   CSV.parse_line(io) -> new_array or nil
+    #   CSV.parse_line(string, **options) -> new_array or nil
+    #   CSV.parse_line(io, **options) -> new_array or nil
+    #   CSV.parse_line(string, headers: true, **options) -> csv_row or nil
+    #   CSV.parse_line(io, headers: true, **options) -> csv_row or nil
     #
-    # 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!().
+    # Returns the data created by parsing the first line of +string+ or +io+
+    # using the specified +options+.
     #
-    # Columns are returned as an Array of values.  Altering that Array has no
-    # effect on the table.
+    # - Argument +string+ should be a \String object;
+    #   it will be put into a new StringIO object positioned at the beginning.
+    # :include: ../doc/csv/arguments/io.rdoc
+    # - Argument +options+: see {Options for Parsing}[#class-CSV-label-Options+for+Parsing]
     #
-    def [](index_or_header)
-      if @mode == :row or  # by index
-         (@mode == :col_or_row and (index_or_header.is_a?(Integer) or index_or_header.is_a?(Range)))
-        @table[index_or_header]
-      else                 # by header
-        @table.map { |row| row[index_or_header] }
-      end
-    end
-
+    # ====== Without Option +headers+
     #
-    # 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!().
+    # Without option +headers+, returns the first row as a new \Array.
     #
-    # Rows may be set to an Array of values (which will inherit the table's
-    # headers()) or a CSV::Row.
+    # These examples assume prior execution of:
+    #   string = "foo,0\nbar,1\nbaz,2\n"
+    #   path = 't.csv'
+    #   File.write(path, string)
     #
-    # 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+.
+    # Parse the first line from a \String object:
+    #   CSV.parse_line(string) # => ["foo", "0"]
     #
-    # Assigning to an existing column or row clobbers the data.  Assigning to
-    # new columns creates them at the right end of the table.
+    # Parse the first line from a File object:
+    #   File.open(path) do |file|
+    #     CSV.parse_line(file) # => ["foo", "0"]
+    #   end # => ["foo", "0"]
     #
-    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
-        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]
-            end
-          end
-        else                  # repeated value
-          @table.each do |row|
-            if row.header_row?
-              row[index_or_header] = index_or_header
-            else
-              row[index_or_header] = value
-            end
-          end
-        end
-      end
-    end
-
+    # Returns +nil+ if the argument is an empty \String:
+    #   CSV.parse_line('') # => nil
     #
-    # 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
-
+    # ====== With Option +headers+
     #
-    # 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.
+    # With {option +headers+}[#class-CSV-label-Option+headers],
+    # returns the first row as a CSV::Row object.
     #
-    # This method returns the table for chaining.
+    # These examples assume prior execution of:
+    #   string = "Name,Count\nfoo,0\nbar,1\nbaz,2\n"
+    #   path = 't.csv'
+    #   File.write(path, string)
     #
-    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
-
+    # Parse the first line from a \String object:
+    #   CSV.parse_line(string, headers: true) # => #<CSV::Row "Name":"foo" "Count":"0">
     #
-    # A shortcut for appending multiple rows.  Equivalent to:
+    # Parse the first line from a File object:
+    #   File.open(path) do |file|
+    #     CSV.parse_line(file, headers: true)
+    #   end # => #<CSV::Row "Name":"foo" "Count":"0">
     #
-    #   rows.each { |row| self << row }
+    # ---
     #
-    # This method returns the table for chaining.
+    # Raises an exception if the argument is +nil+:
+    #   # Raises ArgumentError (Cannot parse nil as CSV):
+    #   CSV.parse_line(nil)
     #
-    def push(*rows)
-      rows.each { |row| self << row }
-
-      self  # for chaining
+    def parse_line(line, **options)
+      new(line, **options).each.first
     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
-
+    # :call-seq:
+    #   read(source, **options) -> array_of_arrays
+    #   read(source, headers: true, **options) -> csv_table
     #
-    # 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, iteration will +yield+ two element
-    # tuples containing the column name and an Array of values for that column.
+    # Opens the given +source+ with the given +options+ (see CSV.open),
+    # reads the source (see CSV#read), and returns the result,
+    # which will be either an \Array of Arrays or a CSV::Table.
     #
-    # This method returns the table for chaining.
+    # Without headers:
+    #   string = "foo,0\nbar,1\nbaz,2\n"
+    #   path = 't.csv'
+    #   File.write(path, string)
+    #   CSV.read(path) # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
     #
-    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]]]
-        end
-        to_delete.map { |header| delete(header) }
-      end
-
-      self  # for chaining
+    # With headers:
+    #   string = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
+    #   path = 't.csv'
+    #   File.write(path, string)
+    #   CSV.read(path, headers: true) # => #<CSV::Table mode:col_or_row row_count:4>
+    def read(path, **options)
+      open(path, **options) { |csv| csv.read }
     end
 
-    include Enumerable
-
-    #
-    # In the default mixed mode or row mode, iteration is the standard row major
-    # walking of rows.  In column mode, iteration will +yield+ two element
-    # tuples containing the column name and an Array of values for that column.
-    #
-    # This method returns the table for chaining.
+    # :call-seq:
+    #   CSV.readlines(source, **options)
     #
-    def each(&block)
-      if @mode == :col
-        headers.each { |header| block[[header, self[header]]] }
-      else
-        @table.each(&block)
-      end
-
-      self  # for chaining
+    # Alias for CSV.read.
+    def readlines(path, **options)
+      read(path, **options)
     end
 
-    # Returns +true+ if all rows of this table ==() +other+'s rows.
-    def ==(other)
-      @table == other.table
+    # :call-seq:
+    #   CSV.table(source, **options)
+    #
+    # Calls CSV.read with +source+, +options+, and certain default options:
+    # - +headers+: +true+
+    # - +converbers+: +:numeric+
+    # - +header_converters+: +:symbol+
+    #
+    # Returns a CSV::Table object.
+    #
+    # Example:
+    #   string = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
+    #   path = 't.csv'
+    #   File.write(path, string)
+    #   CSV.table(path) # => #<CSV::Table mode:col_or_row row_count:4>
+    def table(path, **options)
+      default_options = {
+        headers:           true,
+        converters:        :numeric,
+        header_converters: :symbol,
+      }
+      options = default_options.merge(options)
+      read(path, **options)
     end
+  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
-        else
-          array + [row.fields]
-        end
-      end
+  # :call-seq:
+  #   CSV.new(string)
+  #   CSV.new(io)
+  #   CSV.new(string, **options)
+  #   CSV.new(io, **options)
+  #
+  # Returns the new \CSV object created using +string+ or +io+
+  # and the specified +options+.
+  #
+  # - Argument +string+ should be a \String object;
+  #   it will be put into a new StringIO object positioned at the beginning.
+  # :include: ../doc/csv/arguments/io.rdoc
+  # - Argument +options+: See:
+  #   * {Options for Parsing}[#class-CSV-label-Options+for+Parsing]
+  #   * {Options for Generating}[#class-CSV-label-Options+for+Generating]
+  #   For performance reasons, the options cannot be overridden
+  #   in a \CSV object, so those specified here will endure.
+  #
+  # In addition to the \CSV instance methods, several \IO methods are delegated.
+  # See {Delegated Methods}[#class-CSV-label-Delegated+Methods].
+  #
+  # ---
+  #
+  # Create a \CSV object from a \String object:
+  #   csv = CSV.new('foo,0')
+  #   csv # => #<CSV io_type:StringIO encoding:UTF-8 lineno:0 col_sep:"," row_sep:"\n" quote_char:"\"">
+  #
+  # Create a \CSV object from a \File object:
+  #   File.write('t.csv', 'foo,0')
+  #   csv = CSV.new(File.open('t.csv'))
+  #   csv # => #<CSV io_type:File io_path:"t.csv" encoding:UTF-8 lineno:0 col_sep:"," row_sep:"\n" quote_char:"\"">
+  #
+  # ---
+  #
+  # Raises an exception if the argument is +nil+:
+  #   # Raises ArgumentError (Cannot parse nil as CSV):
+  #   CSV.new(nil)
+  #
+  def initialize(data,
+                 col_sep: ",",
+                 row_sep: :auto,
+                 quote_char: '"',
+                 field_size_limit: nil,
+                 converters: nil,
+                 unconverted_fields: nil,
+                 headers: false,
+                 return_headers: false,
+                 write_headers: nil,
+                 header_converters: nil,
+                 skip_blanks: false,
+                 force_quotes: false,
+                 skip_lines: nil,
+                 liberal_parsing: false,
+                 internal_encoding: nil,
+                 external_encoding: nil,
+                 encoding: nil,
+                 nil_value: nil,
+                 empty_value: "",
+                 quote_empty: true,
+                 write_converters: nil,
+                 write_nil_value: nil,
+                 write_empty_value: "",
+                 strip: false)
+    raise ArgumentError.new("Cannot parse nil as CSV") if data.nil?
+
+    if data.is_a?(String)
+      @io = StringIO.new(data)
+      @io.set_encoding(encoding || data.encoding)
+    else
+      @io = data
     end
+    @encoding = determine_encoding(encoding, internal_encoding)
 
-    #
-    # Returns the table as a complete CSV String.  Headers will be listed first,
-    # then all of the field rows.
-    #
-    # This method assumes you want the Table.headers(), unless you explicitly
-    # pass <tt>:write_headers => false</tt>.
-    #
-    def to_csv(options = Hash.new)
-      wh = options.fetch(:write_headers, true)
-      @table.inject(wh ? [headers.to_csv(options)] : [ ]) do |rows, row|
-        if row.header_row?
-          rows
-        else
-          rows + [row.fields.to_csv(options)]
-        end
-      end.join('')
-    end
-    alias_method :to_s, :to_csv
+    @base_fields_converter_options = {
+      nil_value: nil_value,
+      empty_value: empty_value,
+    }
+    @write_fields_converter_options = {
+      nil_value: write_nil_value,
+      empty_value: write_empty_value,
+    }
+    @initial_converters = converters
+    @initial_header_converters = header_converters
+    @initial_write_converters = write_converters
+
+    @parser_options = {
+      column_separator: col_sep,
+      row_separator: row_sep,
+      quote_character: quote_char,
+      field_size_limit: field_size_limit,
+      unconverted_fields: unconverted_fields,
+      headers: headers,
+      return_headers: return_headers,
+      skip_blanks: skip_blanks,
+      skip_lines: skip_lines,
+      liberal_parsing: liberal_parsing,
+      encoding: @encoding,
+      nil_value: nil_value,
+      empty_value: empty_value,
+      strip: strip,
+    }
+    @parser = nil
+    @parser_enumerator = nil
+    @eof_error = nil
+
+    @writer_options = {
+      encoding: @encoding,
+      force_encoding: (not encoding.nil?),
+      force_quotes: force_quotes,
+      headers: headers,
+      write_headers: write_headers,
+      column_separator: col_sep,
+      row_separator: row_sep,
+      quote_character: quote_char,
+      quote_empty: quote_empty,
+    }
 
-    # Shows the mode and size of this table in a US-ASCII String.
-    def inspect
-      "#<#{self.class} mode:#{@mode} row_count:#{to_a.size}>".encode("US-ASCII")
-    end
+    @writer = nil
+    writer if @writer_options[:write_headers]
   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.
+  # :call-seq:
+  #   csv.col_sep -> string
   #
-  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
-
-  # The encoding used by all converters.
-  ConverterEncoding = Encoding.find("UTF-8")
+  # Returns the encoded column separator; used for parsing and writing;
+  # see {Option +col_sep+}[#class-CSV-label-Option+col_sep]:
+  #   CSV.new('').col_sep # => ","
+  def col_sep
+    parser.column_separator
+  end
 
+  # :call-seq:
+  #   csv.row_sep -> string
   #
-  # 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>.
-  #
-  # All built-in converters transcode field data to UTF-8 before attempting a
-  # conversion.  If your data cannot be transcoded to UTF-8 the conversion will
-  # fail and the field will remain unchanged.
-  #
-  # 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.encode(ConverterEncoding)) rescue f
-    },
-    float:     lambda { |f|
-      Float(f.encode(ConverterEncoding)) rescue f
-    },
-    numeric:   [:integer, :float],
-    date:      lambda { |f|
-      begin
-        e = f.encode(ConverterEncoding)
-        e =~ DateMatcher ? Date.parse(e) : f
-      rescue  # encoding conversion or date parse errors
-        f
-      end
-    },
-    date_time: lambda { |f|
-      begin
-        e = f.encode(ConverterEncoding)
-        e =~ DateTimeMatcher ? DateTime.parse(e) : f
-      rescue  # encoding conversion or date parse errors
-        f
-      end
-    },
-    all:       [:date_time, :numeric],
-  }
+  # Returns the encoded row separator; used for parsing and writing;
+  # see {Option +row_sep+}[#class-CSV-label-Option+row_sep]:
+  #   CSV.new('').row_sep # => "\n"
+  def row_sep
+    parser.row_separator
+  end
 
+  # :call-seq:
+  #   csv.quote_char -> character
   #
-  # 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>::    Leading/trailing spaces are dropped, string is
-  #                              downcased, remaining spaces are replaced with
-  #                              underscores, non-word characters are dropped,
-  #                              and finally to_sym() is called.
-  #
-  # All built-in header converters transcode header data to UTF-8 before
-  # attempting a conversion.  If your data cannot be transcoded to UTF-8 the
-  # conversion will fail and the header will remain unchanged.
-  #
-  # 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.
-  #
-  HeaderConverters = {
-    downcase: lambda { |h| h.encode(ConverterEncoding).downcase },
-    symbol:   lambda { |h|
-      h.encode(ConverterEncoding).downcase.strip.gsub(/\s+/, "_").
-                                                 gsub(/\W+/, "").to_sym
-    }
-  }
+  # Returns the encoded quote character; used for parsing and writing;
+  # see {Option +quote_char+}[#class-CSV-label-Option+quote_char]:
+  #   CSV.new('').quote_char # => "\""
+  def quote_char
+    parser.quote_character
+  end
 
+  # :call-seq:
+  #   csv.field_size_limit -> integer or nil
   #
-  # 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>:field_size_limit</tt></b>::   +nil+
-  # <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+
-  # <b><tt>:skip_lines</tt></b>::         +nil+
-  # <b><tt>:liberal_parsing</tt></b>::    +false+
-  #
-  DEFAULT_OPTIONS = {
-    col_sep:            ",",
-    row_sep:            :auto,
-    quote_char:         '"',
-    field_size_limit:   nil,
-    converters:         nil,
-    unconverted_fields: nil,
-    headers:            false,
-    return_headers:     false,
-    header_converters:  nil,
-    skip_blanks:        false,
-    force_quotes:       false,
-    skip_lines:         nil,
-    liberal_parsing:    false,
-  }.freeze
+  # Returns the limit for field size; used for parsing;
+  # see {Option +field_size_limit+}[#class-CSV-label-Option+field_size_limit]:
+  #   CSV.new('').field_size_limit # => nil
+  def field_size_limit
+    parser.field_size_limit
+  end
 
+  # :call-seq:
+  #   csv.skip_lines -> regexp or nil
   #
-  # 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))
-
-    if block_given?
-      yield instance  # run block, if given, returning result
-    else
-      instance        # or return the instance
-    end
+  # Returns the \Regexp used to identify comment lines; used for parsing;
+  # see {Option +skip_lines+}[#class-CSV-label-Option+skip_lines]:
+  #   CSV.new('').skip_lines # => nil
+  def skip_lines
+    parser.skip_lines
   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
-        end
-      end
-    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
+  #   csv.converters -> array
+  #
+  # Returns an \Array containing field converters;
+  # see {Field Converters}[#class-CSV-label-Field+Converters]:
+  #   csv = CSV.new('')
+  #   csv.converters # => []
+  #   csv.convert(:integer)
+  #   csv.converters # => [:integer]
+  #   csv.convert(proc {|x| x.to_s })
+  #   csv.converters
+  def converters
+    parser_fields_converter.map do |converter|
+      name = Converters.rassoc(converter)
+      name ? name.first : converter
     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.  This method
-  # also understands an additional <tt>:encoding</tt> parameter that you can use
-  # to specify the Encoding of the data in the file to be read. You must provide
-  # this unless your data is in Encoding::default_external().  CSV will use this
-  # to determine how to parse the data.  You may provide a second Encoding to
-  # have the data transcoded as it is read.  For example,
-  # <tt>encoding: "UTF-32BE:UTF-8"</tt> would read UTF-32BE data from the file
-  # but transcode it to UTF-8 before CSV parses it.
-  #
-  def self.foreach(path, options = Hash.new, &block)
-    return to_enum(__method__, path, options) unless block
-    open(path, options) do |csv|
-      csv.each(&block)
-    end
+  # :call-seq:
+  #   csv.unconverted_fields? -> object
+  #
+  # Returns the value that determines whether unconverted fields are to be
+  # available; used for parsing;
+  # see {Option +unconverted_fields+}[#class-CSV-label-Option+unconverted_fields]:
+  #   CSV.new('').unconverted_fields? # => nil
+  def unconverted_fields?
+    parser.unconverted_fields?
   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* modified by this method.  Call dup() before
-  # passing if you need a new String.
-  #
-  # The +options+ parameter can be anything CSV::new() understands.  This method
-  # understands an additional <tt>:encoding</tt> parameter when not passed a
-  # String to set the base Encoding for the output.  CSV needs this hint if you
-  # plan to output non-ASCII compatible data.
-  #
-  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)
+  #   csv.headers -> object
+  #
+  # Returns the value that determines whether headers are used; used for parsing;
+  # see {Option +headers+}[#class-CSV-label-Option+headers]:
+  #   CSV.new('').headers # => nil
+  def headers
+    if @writer
+      @writer.headers
     else
-      encoding = args[-1][:encoding] if args.last.is_a?(Hash)
-      str      = String.new
-      str.force_encoding(encoding) if encoding
-      args.unshift(str)
+      parsed_headers = parser.headers
+      return parsed_headers if parsed_headers
+      raw_headers = @parser_options[:headers]
+      raw_headers = nil if raw_headers == false
+      raw_headers
     end
-    csv = new(*args)  # wrap
-    yield csv         # yield for appending
-    csv.string        # return final String
   end
 
+  # :call-seq:
+  #   csv.return_headers? -> true or false
   #
-  # This method is a shortcut for converting a single row (Array) into a CSV
-  # String.
-  #
-  # The +options+ parameter can be anything CSV::new() understands.  This method
-  # understands an additional <tt>:encoding</tt> parameter to set the base
-  # Encoding for the output.  This method will try to guess your Encoding from
-  # the first non-+nil+ field in +row+, if possible, but you may need to use
-  # this parameter as a backup plan.
-  #
-  # 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)
-    encoding = options.delete(:encoding)
-    str      = String.new
-    if encoding
-      str.force_encoding(encoding)
-    elsif field = row.find { |f| not f.nil? }
-      str.force_encoding(String(field).encoding)
-    end
-    (new(str, options) << row).string
+  # Returns the value that determines whether headers are to be returned; used for parsing;
+  # see {Option +return_headers+}[#class-CSV-label-Option+return_headers]:
+  #   CSV.new('').return_headers? # => false
+  def return_headers?
+    parser.return_headers?
   end
 
-  #
   # :call-seq:
-  #   open( filename, mode = "rb", options = Hash.new ) { |faster_csv| ... }
-  #   open( filename, options = Hash.new ) { |faster_csv| ... }
-  #   open( filename, mode = "rb", options = Hash.new )
-  #   open( filename, 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 must pass a +filename+ and may optionally add a +mode+ for Ruby's
-  # open().  You may also pass an optional Hash containing any +options+
-  # CSV::new() understands as the final argument.
-  #
-  # 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.)
-  #
-  # You must provide a +mode+ with an embedded Encoding designator unless your
-  # data is in Encoding::default_external().  CSV will check the Encoding of the
-  # underlying IO object (set by the +mode+ you pass) to determine how to parse
-  # the data.   You may provide a second Encoding to have the data transcoded as
-  # it is read just as you can with a normal call to IO::open().  For example,
-  # <tt>"rb:UTF-32BE:UTF-8"</tt> would read UTF-32BE data from the file but
-  # transcode it to UTF-8 before CSV parses it.
-  #
-  # An opened CSV object will delegate to many IO methods for convenience.  You
-  # may call:
-  #
-  # * binmode()
-  # * binmode?()
-  # * close()
-  # * close_read()
-  # * close_write()
-  # * closed?()
-  # * eof()
-  # * eof?()
-  # * external_encoding()
-  # * fcntl()
-  # * fileno()
-  # * flock()
-  # * flush()
-  # * fsync()
-  # * internal_encoding()
-  # * ioctl()
-  # * isatty()
-  # * path()
-  # * pid()
-  # * pos()
-  # * pos=()
-  # * reopen()
-  # * seek()
-  # * stat()
-  # * sync()
-  # * sync=()
-  # * tell()
-  # * to_i()
-  # * to_io()
-  # * truncate()
-  # * 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+ with no newline
-    # decorator
-    file_opts = {universal_newline: false}.merge(options)
-    begin
-      f = File.open(*args, file_opts)
-    rescue ArgumentError => e
-      raise unless /needs binmode/ =~ e.message and args.size == 1
-      args << "rb"
-      file_opts = {encoding: Encoding.default_external}.merge(file_opts)
-      retry
-    end
-    begin
-      csv = new(f, options)
-    rescue Exception
-      f.close
-      raise
-    end
-
-    # handle blocks like Ruby's open(), not like the CSV library
-    if block_given?
-      begin
-        yield csv
-      ensure
-        csv.close
-      end
-    else
-      csv
-    end
+  #   csv.write_headers? -> true or false
+  #
+  # Returns the value that determines whether headers are to be written; used for generating;
+  # see {Option +write_headers+}[#class-CSV-label-Option+write_headers]:
+  #   CSV.new('').write_headers? # => nil
+  def write_headers?
+    @writer_options[:write_headers]
   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.
+  #   csv.header_converters -> array
   #
-  def self.parse(*args, &block)
-    csv = new(*args)
-    if block.nil?  # slurp contents, if no block is given
-      begin
-        csv.read
-      ensure
-        csv.close
-      end
-    else           # or pass each row to a provided block
-      csv.each(&block)
+  # Returns an \Array containing header converters; used for parsing;
+  # see {Header Converters}[#class-CSV-label-Header+Converters]:
+  #   CSV.new('').header_converters # => []
+  def header_converters
+    header_fields_converter.map do |converter|
+      name = HeaderConverters.rassoc(converter)
+      name ? name.first : converter
     end
   end
 
+  # :call-seq:
+  #   csv.skip_blanks? -> true or false
   #
-  # This method is a shortcut for converting a single line of a CSV String into
-  # an Array.  Note that if +line+ contains multiple rows, anything beyond the
-  # first row is ignored.
-  #
-  # The +options+ parameter can be anything 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.  This method also understands
-  # an additional <tt>:encoding</tt> parameter that you can use to specify the
-  # Encoding of the data in the file to be read. You must provide this unless
-  # your data is in Encoding::default_external().  CSV will use this to determine
-  # how to parse the data.  You may provide a second Encoding to have the data
-  # transcoded as it is read.  For example,
-  # <tt>encoding: "UTF-32BE:UTF-8"</tt> would read UTF-32BE data from the file
-  # but transcode it to UTF-8 before CSV parses it.
-  #
-  def self.read(path, *options)
-    open(path, *options) { |csv| csv.read }
+  # Returns the value that determines whether blank lines are to be ignored; used for parsing;
+  # see {Option +skip_blanks+}[#class-CSV-label-Option+skip_blanks]:
+  #   CSV.new('').skip_blanks? # => false
+  def skip_blanks?
+    parser.skip_blanks?
   end
 
-  # Alias for CSV::read().
-  def self.readlines(*args)
-    read(*args)
+  # :call-seq:
+  #   csv.force_quotes? -> true or false
+  #
+  # Returns the value that determines whether all output fields are to be quoted;
+  # used for generating;
+  # see {Option +force_quotes+}[#class-CSV-label-Option+force_quotes]:
+  #   CSV.new('').force_quotes? # => false
+  def force_quotes?
+    @writer_options[:force_quotes]
   end
 
+  # :call-seq:
+  #   csv.liberal_parsing? -> true or false
   #
-  # 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) )
+  # Returns the value that determines whether illegal input is to be handled; used for parsing;
+  # see {Option +liberal_parsing+}[#class-CSV-label-Option+liberal_parsing]:
+  #   CSV.new('').liberal_parsing? # => false
+  def liberal_parsing?
+    parser.liberal_parsing?
   end
 
+  # :call-seq:
+  #   csv.encoding -> endcoding
   #
-  # 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 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.
-  #                                       This String will be transcoded into
-  #                                       the data's Encoding before parsing.
-  # <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.  Also
-  #                                       note that IO objects should be opened
-  #                                       in binary mode on Windows if this
-  #                                       feature will be used as the
-  #                                       line-ending translation can cause
-  #                                       problems with resetting the document
-  #                                       position to where it was before the
-  #                                       read ahead. This String will be
-  #                                       transcoded into the data's Encoding
-  #                                       before parsing.
-  # <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 of this character to be an
-  #                                       escaped quote. This String will be
-  #                                       transcoded into the data's Encoding
-  #                                       before parsing.
-  # <b><tt>:field_size_limit</tt></b>::   This is a maximum size CSV will read
-  #                                       ahead looking for the closing quote
-  #                                       for a field.  (In truth, it reads to
-  #                                       the first line ending beyond this
-  #                                       size.)  If a quote cannot be found
-  #                                       within the limit CSV will raise a
-  #                                       MalformedCSVError, assuming the data
-  #                                       is faulty.  You can use this limit to
-  #                                       prevent what are effectively DoS
-  #                                       attacks on the parser.  However, this
-  #                                       limit can cause a legitimate parse to
-  #                                       fail and thus is set to +nil+, or off,
-  #                                       by default.
-  # <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.  All
-  #                                       built-in converters try to transcode
-  #                                       fields to UTF-8 before converting.
-  #                                       The conversion will fail if the data
-  #                                       cannot be transcoded, leaving the
-  #                                       field unchanged.
-  # <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()
-  #                                       with the same <tt>:col_sep</tt>,
-  #                                       <tt>:row_sep</tt>, and
-  #                                       <tt>:quote_char</tt> as this instance
-  #                                       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>:write_headers</tt></b>::      When +true+ and <tt>:headers</tt> is
-  #                                       set, a header row will be added to the
-  #                                       output.
-  # <b><tt>:header_converters</tt></b>::  Identical in functionality to
-  #                                       <tt>:converters</tt> save that the
-  #                                       conversions are only made to header
-  #                                       rows.  All built-in converters try to
-  #                                       transcode headers to UTF-8 before
-  #                                       converting.  The conversion will fail
-  #                                       if the data cannot be transcoded,
-  #                                       leaving the header unchanged.
-  # <b><tt>:skip_blanks</tt></b>::        When set to a +true+ value, CSV will
-  #                                       skip over any empty rows. Note that
-  #                                       this setting will not skip rows that
-  #                                       contain column separators, even if
-  #                                       the rows contain no actual data. If
-  #                                       you want to skip rows that contain
-  #                                       separators but no content, consider
-  #                                       using <tt>:skip_lines</tt>, or
-  #                                       inspecting fields.compact.empty? on
-  #                                       each row.
-  # <b><tt>:force_quotes</tt></b>::       When set to a +true+ value, CSV will
-  #                                       quote all CSV fields it creates.
-  # <b><tt>:skip_lines</tt></b>::         When set to an object responding to
-  #                                       <tt>match</tt>, every line matching
-  #                                       it is considered a comment and ignored
-  #                                       during parsing. When set to a String,
-  #                                       it is first converted to a Regexp.
-  #                                       When set to +nil+ no line is considered
-  #                                       a comment. If the passed object does
-  #                                       not respond to <tt>match</tt>,
-  #                                       <tt>ArgumentError</tt> is thrown.
-  # <b><tt>:liberal_parsing</tt></b>::    When set to a +true+ value, CSV will
-  #                                       attempt to parse input not conformant
-  #                                       with RFC 4180, such as double quotes
-  #                                       in unquoted fields.
-  #
-  # See CSV::DEFAULT_OPTIONS for the default settings.
-  #
-  # Options cannot be overridden in the instance methods for performance reasons,
-  # so be sure to set what you want here.
-  #
-  def initialize(data, options = Hash.new)
-    if data.nil?
-      raise ArgumentError.new("Cannot parse nil as CSV")
-    end
-
-    # build the options for this read/write
-    options = DEFAULT_OPTIONS.merge(options)
+  # Returns the encoding used for parsing and generating;
+  # see {Character Encodings (M17n or Multilingualization)}[#class-CSV-label-Character+Encodings+-28M17n+or+Multilingualization-29]:
+  #   CSV.new('').encoding # => #<Encoding:UTF-8>
+  attr_reader :encoding
 
-    # create the IO object we will read from
-    @io       = data.is_a?(String) ? StringIO.new(data) : data
-    # honor the IO encoding if we can, otherwise default to ASCII-8BIT
-    @encoding = raw_encoding(nil) ||
-                ( if encoding = options.delete(:internal_encoding)
-                    case encoding
-                    when Encoding; encoding
-                    else Encoding.find(encoding)
-                    end
-                  end ) ||
-                ( case encoding = options.delete(:encoding)
-                  when Encoding; encoding
-                  when /\A[^:]+/; Encoding.find($&)
-                  end ) ||
-                Encoding.default_internal || Encoding.default_external
-    #
-    # prepare for building safe regular expressions in the target encoding,
-    # if we can transcode the needed characters
-    #
-    @re_esc   =   "\\".encode(@encoding).freeze rescue ""
-    @re_chars =   /#{%"[-\\]\\[\\.^$?*+{}()|# \r\n\t\f\v]".encode(@encoding)}/
-
-    init_separators(options)
-    init_parsers(options)
-    init_converters(options)
-    init_headers(options)
-    init_comments(options)
-
-    @force_encoding = !!(encoding || options.delete(:encoding))
-    options.delete(:internal_encoding)
-    options.delete(:external_encoding)
-    unless options.empty?
-      raise ArgumentError, "Unknown options:  #{options.keys.join(', ')}."
+  # :call-seq:
+  #   csv.line_no -> integer
+  #
+  # Returns the count of the rows parsed or generated.
+  #
+  # Parsing:
+  #   string = "foo,0\nbar,1\nbaz,2\n"
+  #   path = 't.csv'
+  #   File.write(path, string)
+  #   CSV.open(path) do |csv|
+  #     csv.each do |row|
+  #       p [csv.lineno, row]
+  #     end
+  #   end
+  # Output:
+  #   [1, ["foo", "0"]]
+  #   [2, ["bar", "1"]]
+  #   [3, ["baz", "2"]]
+  #
+  # Generating:
+  #   CSV.generate do |csv|
+  #     p csv.lineno; csv << ['foo', 0]
+  #     p csv.lineno; csv << ['bar', 1]
+  #     p csv.lineno; csv << ['baz', 2]
+  #   end
+  # Output:
+  #   0
+  #   1
+  #   2
+  def lineno
+    if @writer
+      @writer.lineno
+    else
+      parser.lineno
     end
-
-    # track our own lineno since IO gets confused about line-ends is CSV fields
-    @lineno = 0
   end
 
-  #
-  # The encoded <tt>:col_sep</tt> used in parsing and writing.  See CSV::new
-  # for details.
-  #
-  attr_reader :col_sep
-  #
-  # The encoded <tt>:row_sep</tt> used in parsing and writing.  See CSV::new
-  # for details.
-  #
-  attr_reader :row_sep
-  #
-  # The encoded <tt>:quote_char</tt> used in parsing and writing.  See CSV::new
-  # for details.
-  #
-  attr_reader :quote_char
-  # The limit for field size, if any.  See CSV::new for details.
-  attr_reader :field_size_limit
+  # :call-seq:
+  #   csv.line -> array
+  #
+  # Returns the line most recently read:
+  #   string = "foo,0\nbar,1\nbaz,2\n"
+  #   path = 't.csv'
+  #   File.write(path, string)
+  #   CSV.open(path) do |csv|
+  #     csv.each do |row|
+  #       p [csv.lineno, csv.line]
+  #     end
+  #   end
+  # Output:
+  #   [1, "foo,0\n"]
+  #   [2, "bar,1\n"]
+  #   [3, "baz,2\n"]
+  def line
+    parser.line
+  end
 
-  # The regex marking a line as a comment. See CSV::new for details
-  attr_reader :skip_lines
+  ### IO and StringIO Delegation ###
 
-  #
-  # Returns the current list of converters in effect.  See CSV::new for details.
-  # Built-in converters will be returned by name, while others will be returned
-  # as is.
-  #
-  def converters
-    @converters.map do |converter|
-      name = Converters.rassoc(converter)
-      name ? name.first : converter
+  extend Forwardable
+  def_delegators :@io, :binmode, :close, :close_read, :close_write,
+                       :closed?, :external_encoding, :fcntl,
+                       :fileno, :flush, :fsync, :internal_encoding,
+                       :isatty, :pid, :pos, :pos=, :reopen,
+                       :seek, :string, :sync, :sync=, :tell,
+                       :truncate, :tty?
+
+  def binmode?
+    if @io.respond_to?(:binmode?)
+      @io.binmode?
+    else
+      false
     end
   end
-  #
-  # Returns +true+ if unconverted_fields() to parsed results.  See CSV::new
-  # for details.
-  #
-  def unconverted_fields?() @unconverted_fields end
-  #
-  # Returns +nil+ if headers will not be used, +true+ if they will but have not
-  # yet been read, or the actual headers after they have been read.  See
-  # CSV::new for details.
-  #
-  def headers
-    @headers || true if @use_headers
+
+  def flock(*args)
+    raise NotImplementedError unless @io.respond_to?(:flock)
+    @io.flock(*args)
   end
-  #
-  # Returns +true+ if headers will be returned as a row of results.
-  # See CSV::new for details.
-  #
-  def return_headers?()     @return_headers     end
-  # Returns +true+ if headers are written in output. See CSV::new for details.
-  def write_headers?()      @write_headers      end
-  #
-  # Returns the current list of converters in effect for headers.  See CSV::new
-  # for details.  Built-in converters will be returned by name, while others
-  # will be returned as is.
-  #
-  def header_converters
-    @header_converters.map do |converter|
-      name = HeaderConverters.rassoc(converter)
-      name ? name.first : converter
-    end
+
+  def ioctl(*args)
+    raise NotImplementedError unless @io.respond_to?(:ioctl)
+    @io.ioctl(*args)
   end
-  #
-  # Returns +true+ blank lines are skipped by the parser. See CSV::new
-  # for details.
-  #
-  def skip_blanks?()        @skip_blanks        end
-  # Returns +true+ if all output fields are quoted. See CSV::new for details.
-  def force_quotes?()       @force_quotes       end
-  # Returns +true+ if illegal input is handled. See CSV::new for details.
-  def liberal_parsing?()    @liberal_parsing    end
 
-  #
-  # The Encoding CSV is parsing or writing in.  This will be the Encoding you
-  # receive parsed data in and/or the Encoding data will be written in.
-  #
-  attr_reader :encoding
+  def path
+    @io.path if @io.respond_to?(:path)
+  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
+  def stat(*args)
+    raise NotImplementedError unless @io.respond_to?(:stat)
+    @io.stat(*args)
+  end
 
-  ### IO and StringIO Delegation ###
+  def to_i
+    raise NotImplementedError unless @io.respond_to?(:to_i)
+    @io.to_i
+  end
 
-  extend Forwardable
-  def_delegators :@io, :binmode, :binmode?, :close, :close_read, :close_write,
-                       :closed?, :eof, :eof?, :external_encoding, :fcntl,
-                       :fileno, :flock, :flush, :fsync, :internal_encoding,
-                       :ioctl, :isatty, :path, :pid, :pos, :pos=, :reopen,
-                       :seek, :stat, :string, :sync, :sync=, :tell, :to_i,
-                       :to_io, :truncate, :tty?
+  def to_io
+    @io.respond_to?(:to_io) ? @io.to_io : @io
+  end
+
+  def eof?
+    return false if @eof_error
+    begin
+      parser_enumerator.peek
+      false
+    rescue MalformedCSVError => error
+      @eof_error = error
+      false
+    rescue StopIteration
+      true
+    end
+  end
+  alias_method :eof, :eof?
 
   # Rewinds the underlying IO object and resets CSV's lineno() counter.
   def rewind
-    @headers = nil
-    @lineno  = 0
-
+    @parser = nil
+    @parser_enumerator = nil
+    @eof_error = nil
+    @writer.rewind if @writer
     @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.
-  #
+  # :call-seq:
+  #   csv << row -> self
+  #
+  # Appends a row to +self+.
+  #
+  # - Argument +row+ must be an \Array object or a CSV::Row object.
+  # - The output stream must be open for writing.
+  #
+  # ---
+  #
+  # Append Arrays:
+  #   CSV.generate do |csv|
+  #     csv << ['foo', 0]
+  #     csv << ['bar', 1]
+  #     csv << ['baz', 2]
+  #   end # => "foo,0\nbar,1\nbaz,2\n"
+  #
+  # Append CSV::Rows:
+  #   headers = []
+  #   CSV.generate do |csv|
+  #     csv << CSV::Row.new(headers, ['foo', 0])
+  #     csv << CSV::Row.new(headers, ['bar', 1])
+  #     csv << CSV::Row.new(headers, ['baz', 2])
+  #   end # => "foo,0\nbar,1\nbaz,2\n"
+  #
+  # Headers in CSV::Row objects are not appended:
+  #   headers = ['Name', 'Count']
+  #   CSV.generate do |csv|
+  #     csv << CSV::Row.new(headers, ['foo', 0])
+  #     csv << CSV::Row.new(headers, ['bar', 1])
+  #     csv << CSV::Row.new(headers, ['baz', 2])
+  #   end # => "foo,0\nbar,1\nbaz,2\n"
+  #
+  # ---
+  #
+  # Raises an exception if +row+ is not an \Array or \CSV::Row:
+  #   CSV.generate do |csv|
+  #     # Raises NoMethodError (undefined method `collect' for :foo:Symbol)
+  #     csv << :foo
+  #   end
+  #
+  # Raises an exception if the output stream is not opened for writing:
+  #   path = 't.csv'
+  #   File.write(path, '')
+  #   File.open(path) do |file|
+  #     CSV.open(file) do |csv|
+  #       # Raises IOError (not opened for writing)
+  #       csv << ['foo', 0]
+  #     end
+  #   end
   def <<(row)
-    # make sure headers have been assigned
-    if header_row? and [Array, String].include? @use_headers.class
-      parse_headers  # won't read data for Array or String
-      self << @headers if @write_headers
-    end
-
-    # 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
-          end
-
-    @headers =  row if header_row?
-    @lineno  += 1
-
-    output = row.map(&@quote).join(@col_sep) + @row_sep  # quote and separate
-    if @io.is_a?(StringIO)             and
-       output.encoding != (encoding = raw_encoding)
-      if @force_encoding
-        output = output.encode(encoding)
-      elsif (compatible_encoding = Encoding.compatible?(@io.string, output))
-        @io.set_encoding(compatible_encoding)
-        @io.seek(0, IO::SEEK_END)
-      end
-    end
-    @io << output
-
-    self  # for chaining
+    writer << row
+    self
   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 CSV::FieldInfo Struct,
-  # containing details about the field.  Again, the block should return a
-  # converted field or the field itself.
-  #
+  #   convert(converter_name) -> array_of_procs
+  #   convert {|field, field_info| ... } -> array_of_procs
+  #
+  # - With no block, installs a field converter (a \Proc).
+  # - With a block, defines and installs a custom field converter.
+  # - Returns the \Array of installed field converters.
+  #
+  # - Argument +converter_name+, if given, should be the name
+  #   of an existing field converter.
+  #
+  # See {Field Converters}[#class-CSV-label-Field+Converters].
+  # ---
+  #
+  # With no block, installs a field converter:
+  #   csv = CSV.new('')
+  #   csv.convert(:integer)
+  #   csv.convert(:float)
+  #   csv.convert(:date)
+  #   csv.converters # => [:integer, :float, :date]
+  #
+  # ---
+  #
+  # The block, if given, is called for each field:
+  # - Argument +field+ is the field value.
+  # - Argument +field_info+ is a CSV::FieldInfo object
+  #   containing details about the field.
+  #
+  # The examples here assume the prior execution of:
+  #   string = "foo,0\nbar,1\nbaz,2\n"
+  #   path = 't.csv'
+  #   File.write(path, string)
+  #
+  # Example giving a block:
+  #   csv = CSV.open(path)
+  #   csv.convert {|field, field_info| p [field, field_info]; field.upcase }
+  #   csv.read # => [["FOO", "0"], ["BAR", "1"], ["BAZ", "2"]]
+  #
+  # Output:
+  #   ["foo", #<struct CSV::FieldInfo index=0, line=1, header=nil>]
+  #   ["0", #<struct CSV::FieldInfo index=1, line=1, header=nil>]
+  #   ["bar", #<struct CSV::FieldInfo index=0, line=2, header=nil>]
+  #   ["1", #<struct CSV::FieldInfo index=1, line=2, header=nil>]
+  #   ["baz", #<struct CSV::FieldInfo index=0, line=3, header=nil>]
+  #   ["2", #<struct CSV::FieldInfo index=1, line=3, header=nil>]
+  #
+  # The block need not return a \String object:
+  #   csv = CSV.open(path)
+  #   csv.convert {|field, field_info| field.to_sym }
+  #   csv.read # => [[:foo, :"0"], [:bar, :"1"], [:baz, :"2"]]
+  #
+  # If +converter_name+ is given, the block is not called:
+  #   csv = CSV.open(path)
+  #   csv.convert(:integer) {|field, field_info| fail 'Cannot happen' }
+  #   csv.read # => [["foo", 0], ["bar", 1], ["baz", 2]]
+  #
+  # ---
+  #
+  # Raises a parse-time exception if +converter_name+ is not the name of a built-in
+  # field converter:
+  #   csv = CSV.open(path)
+  #   csv.convert(:nosuch) => [nil]
+  #   # Raises NoMethodError (undefined method `arity' for nil:NilClass)
+  #   csv.read
   def convert(name = nil, &converter)
-    add_converter(:converters, self.class::Converters, name, &converter)
+    parser_fields_converter.add_converter(name, &converter)
   end
 
-  #
   # :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.
-  #
+  #   header_convert(converter_name) -> array_of_procs
+  #   header_convert {|header, field_info| ... } -> array_of_procs
+  #
+  # - With no block, installs a header converter (a \Proc).
+  # - With a block, defines and installs a custom header converter.
+  # - Returns the \Array of installed header converters.
+  #
+  # - Argument +converter_name+, if given, should be the name
+  #   of an existing header converter.
+  #
+  # See {Header Converters}[#class-CSV-label-Header+Converters].
+  # ---
+  #
+  # With no block, installs a header converter:
+  #   csv = CSV.new('')
+  #   csv.header_convert(:symbol)
+  #   csv.header_convert(:downcase)
+  #   csv.header_converters # => [:symbol, :downcase]
+  #
+  # ---
+  #
+  # The block, if given, is called for each header:
+  # - Argument +header+ is the header value.
+  # - Argument +field_info+ is a CSV::FieldInfo object
+  #   containing details about the header.
+  #
+  # The examples here assume the prior execution of:
+  #   string = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
+  #   path = 't.csv'
+  #   File.write(path, string)
+  #
+  # Example giving a block:
+  #   csv = CSV.open(path, headers: true)
+  #   csv.header_convert {|header, field_info| p [header, field_info]; header.upcase }
+  #   table = csv.read
+  #   table # => #<CSV::Table mode:col_or_row row_count:4>
+  #   table.headers # => ["NAME", "VALUE"]
+  #
+  # Output:
+  #   ["Name", #<struct CSV::FieldInfo index=0, line=1, header=nil>]
+  #   ["Value", #<struct CSV::FieldInfo index=1, line=1, header=nil>]
+
+  # The block need not return a \String object:
+  #   csv = CSV.open(path, headers: true)
+  #   csv.header_convert {|header, field_info| header.to_sym }
+  #   table = csv.read
+  #   table.headers # => [:Name, :Value]
+  #
+  # If +converter_name+ is given, the block is not called:
+  #   csv = CSV.open(path, headers: true)
+  #   csv.header_convert(:downcase) {|header, field_info| fail 'Cannot happen' }
+  #   table = csv.read
+  #   table.headers # => ["name", "value"]
+  # ---
+  #
+  # Raises a parse-time exception if +converter_name+ is not the name of a built-in
+  # field converter:
+  #   csv = CSV.open(path, headers: true)
+  #   csv.header_convert(:nosuch)
+  #   # Raises NoMethodError (undefined method `arity' for nil:NilClass)
+  #   csv.read
   def header_convert(name = nil, &converter)
-    add_converter( :header_converters,
-                   self.class::HeaderConverters,
-                   name,
-                   &converter )
+    header_fields_converter.add_converter(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
-    if block_given?
-      while row = shift
-        yield row
-      end
-    else
-      to_enum
-    end
+  # :call-seq:
+  #   csv.each -> enumerator
+  #   csv.each {|row| ...}
+  #
+  # Calls the block with each successive row.
+  # The data source must be opened for reading.
+  #
+  # Without headers:
+  #   string = "foo,0\nbar,1\nbaz,2\n"
+  #   csv = CSV.new(string)
+  #   csv.each do |row|
+  #     p row
+  #   end
+  # Output:
+  #   ["foo", "0"]
+  #   ["bar", "1"]
+  #   ["baz", "2"]
+  #
+  # With headers:
+  #   string = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
+  #   csv = CSV.new(string, headers: true)
+  #   csv.each do |row|
+  #     p row
+  #   end
+  # Output:
+  #   <CSV::Row "Name":"foo" "Value":"0">
+  #   <CSV::Row "Name":"bar" "Value":"1">
+  #   <CSV::Row "Name":"baz" "Value":"2">
+  #
+  # ---
+  #
+  # Raises an exception if the source is not opened for reading:
+  #   string = "foo,0\nbar,1\nbaz,2\n"
+  #   csv = CSV.new(string)
+  #   csv.close
+  #   # Raises IOError (not opened for reading)
+  #   csv.each do |row|
+  #     p row
+  #   end
+  def each(&block)
+    parser_enumerator.each(&block)
   end
 
-  #
-  # Slurps the remaining rows and returns an Array of Arrays.
-  #
-  # The data source must be open for reading.
-  #
+  # :call-seq:
+  #   csv.read -> array or csv_table
+  #
+  # Forms the remaining rows from +self+ into:
+  # - A CSV::Table object, if headers are in use.
+  # - An \Array of Arrays, otherwise.
+  #
+  # The data source must be opened for reading.
+  #
+  # Without headers:
+  #   string = "foo,0\nbar,1\nbaz,2\n"
+  #   path = 't.csv'
+  #   File.write(path, string)
+  #   csv = CSV.open(path)
+  #   csv.read # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
+  #
+  # With headers:
+  #   string = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
+  #   path = 't.csv'
+  #   File.write(path, string)
+  #   csv = CSV.open(path, headers: true)
+  #   csv.read # => #<CSV::Table mode:col_or_row row_count:4>
+  #
+  # ---
+  #
+  # Raises an exception if the source is not opened for reading:
+  #   string = "foo,0\nbar,1\nbaz,2\n"
+  #   csv = CSV.new(string)
+  #   csv.close
+  #   # Raises IOError (not opened for reading)
+  #   csv.read
   def read
     rows = to_a
-    if @use_headers
-      Table.new(rows)
+    if parser.use_headers?
+      Table.new(rows, headers: parser.headers)
     else
       rows
     end
   end
   alias_method :readlines, :read
 
-  # Returns +true+ if the next row read will be a header row.
+  # :call-seq:
+  #   csv.header_row? -> true or false
+  #
+  # Returns +true+ if the next row to be read is a header row\;
+  # +false+ otherwise.
+  #
+  # Without headers:
+  #   string = "foo,0\nbar,1\nbaz,2\n"
+  #   csv = CSV.new(string)
+  #   csv.header_row? # => false
+  #
+  # With headers:
+  #   string = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
+  #   csv = CSV.new(string, headers: true)
+  #   csv.header_row? # => true
+  #   csv.shift # => #<CSV::Row "Name":"foo" "Value":"0">
+  #   csv.header_row? # => false
+  #
+  # ---
+  #
+  # Raises an exception if the source is not opened for reading:
+  #   string = "foo,0\nbar,1\nbaz,2\n"
+  #   csv = CSV.new(string)
+  #   csv.close
+  #   # Raises IOError (not opened for reading)
+  #   csv.header_row?
   def header_row?
-    @use_headers and @headers.nil?
+    parser.header_row?
   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.
-  #
+  # :call-seq:
+  #   csv.shift -> array, csv_row, or nil
+  #
+  # Returns the next row of data as:
+  # - An \Array if no headers are used.
+  # - A CSV::Row object if headers are used.
+  #
+  # The data source must be opened for reading.
+  #
+  # Without headers:
+  #   string = "foo,0\nbar,1\nbaz,2\n"
+  #   csv = CSV.new(string)
+  #   csv.shift # => ["foo", "0"]
+  #   csv.shift # => ["bar", "1"]
+  #   csv.shift # => ["baz", "2"]
+  #   csv.shift # => nil
+  #
+  # With headers:
+  #   string = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
+  #   csv = CSV.new(string, headers: true)
+  #   csv.shift # => #<CSV::Row "Name":"foo" "Value":"0">
+  #   csv.shift # => #<CSV::Row "Name":"bar" "Value":"1">
+  #   csv.shift # => #<CSV::Row "Name":"baz" "Value":"2">
+  #   csv.shift # => nil
+  #
+  # ---
+  #
+  # Raises an exception if the source is not opened for reading:
+  #   string = "foo,0\nbar,1\nbaz,2\n"
+  #   csv = CSV.new(string)
+  #   csv.close
+  #   # Raises IOError (not opened for reading)
+  #   csv.shift
   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
-      end
+    if @eof_error
+      eof_error, @eof_error = @eof_error, nil
+      raise eof_error
     end
-
-    #
-    # 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
-    #
-    in_extended_col = false
-    csv             = Array.new
-
-    loop do
-      # add another read to the line
-      unless parse = @io.gets(@row_sep)
-        return nil
-      end
-
-      parse.sub!(@parsers[:line_end], "")
-
-      if csv.empty?
-        #
-        # 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
-            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
-        end
-      end
-
-      next if @skip_lines and @skip_lines.match parse
-
-      parts =  parse.split(@col_sep, -1)
-      if parts.empty?
-        if in_extended_col
-          csv[-1] << @col_sep   # will be replaced with a @row_sep after the parts.each loop
-        else
-          csv << nil
-        end
-      end
-
-      # This loop is the hot path of csv parsing. Some things may be non-dry
-      # for a reason. Make sure to benchmark when refactoring.
-      parts.each do |part|
-        if in_extended_col
-          # If we are continuing a previous column
-          if part[-1] == @quote_char && part.count(@quote_char) % 2 != 0
-            # extended column ends
-            csv.last << part[0..-2]
-            if csv.last =~ @parsers[:stray_quote]
-              raise MalformedCSVError,
-                    "Missing or stray quote in line #{lineno + 1}"
-            end
-            csv.last.gsub!(@quote_char * 2, @quote_char)
-            in_extended_col = false
-          else
-            csv.last << part
-            csv.last << @col_sep
-          end
-        elsif part[0] == @quote_char
-          # If we are starting a new quoted column
-          if part.count(@quote_char) % 2 != 0
-            # start an extended column
-            csv             << part[1..-1]
-            csv.last        << @col_sep
-            in_extended_col =  true
-          elsif part[-1] == @quote_char
-            # regular quoted column
-            csv << part[1..-2]
-            if csv.last =~ @parsers[:stray_quote]
-              raise MalformedCSVError,
-                    "Missing or stray quote in line #{lineno + 1}"
-            end
-            csv.last.gsub!(@quote_char * 2, @quote_char)
-          elsif @liberal_parsing
-            csv << part
-          else
-            raise MalformedCSVError,
-                  "Missing or stray quote in line #{lineno + 1}"
-          end
-        elsif part =~ @parsers[:quote_or_nl]
-          # Unquoted field with bad characters.
-          if part =~ @parsers[:nl_or_lf]
-            raise MalformedCSVError, "Unquoted fields do not allow " +
-                                     "\\r or \\n (line #{lineno + 1})."
-          else
-            if @liberal_parsing
-              csv << part
-            else
-              raise MalformedCSVError, "Illegal quoting in line #{lineno + 1}."
-            end
-          end
-        else
-          # Regular ole unquoted field.
-          csv << (part.empty? ? nil : part)
-        end
-      end
-
-      # Replace tacked on @col_sep with @row_sep if we are still in an extended
-      # column.
-      csv[-1][-1] = @row_sep if in_extended_col
-
-      if in_extended_col
-        # if we're at eof?(), a quoted field wasn't closed...
-        if @io.eof?
-          raise MalformedCSVError,
-                "Unclosed quoted field on line #{lineno + 1}."
-        elsif @field_size_limit and csv.last.size >= @field_size_limit
-          raise MalformedCSVError, "Field size exceeded on line #{lineno + 1}."
-        end
-        # otherwise, we need to loop and pull some more data to complete the row
-      else
-        @lineno += 1
-
-        # save fields unconverted fields, if needed...
-        unconverted = csv.dup if @unconverted_fields
-
-        # 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
-
-        # inject unconverted fields and accessor, if requested...
-        if @unconverted_fields and not csv.respond_to? :unconverted_fields
-          add_unconverted_fields(csv, unconverted)
-        end
-
-        # return the results
-        break csv
-      end
+    begin
+      parser_enumerator.next
+    rescue StopIteration
+      nil
     end
   end
   alias_method :gets,     :shift
   alias_method :readline, :shift
 
+  # :call-seq:
+  #   csv.inspect -> string
   #
-  # Returns a simplified description of the key CSV attributes in an
-  # ASCII compatible String.
-  #
+  # Returns a \String showing certain properties of +self+:
+  #   string = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
+  #   csv = CSV.new(string, headers: true)
+  #   s = csv.inspect
+  #   s # => "#<CSV io_type:StringIO encoding:UTF-8 lineno:0 col_sep:\",\" row_sep:\"\\n\" quote_char:\"\\\"\" headers:true>"
   def inspect
-    str = ["<#", self.class.to_s, " io_type:"]
+    str = ["#<", self.class.to_s, " io_type:"]
     # show type of wrapped IO
     if    @io == $stdout then str << "$stdout"
     elsif @io == $stdin  then str << "$stdin"
@@ -1962,15 +2486,18 @@ class CSV
     # show encoding
     str << " encoding:" << @encoding.name
     # show other attributes
-    %w[ lineno     col_sep     row_sep
-        quote_char skip_blanks liberal_parsing ].each do |attr_name|
-      if a = instance_variable_get("@#{attr_name}")
+    ["lineno", "col_sep", "row_sep", "quote_char"].each do |attr_name|
+      if a = __send__(attr_name)
         str << " " << attr_name << ":" << a.inspect
       end
     end
-    if @use_headers
-      str << " headers:" << headers.inspect
+    ["skip_blanks", "liberal_parsing"].each do |attr_name|
+      if a = __send__("#{attr_name}?")
+        str << " " << attr_name << ":" << a.inspect
+      end
     end
+    _headers = headers
+    str << " headers:" << _headers.inspect if _headers
     str << ">"
     begin
       str.join('')
@@ -1984,347 +2511,126 @@ class CSV
 
   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).to_s.encode(@encoding)
-    @row_sep    = options.delete(:row_sep)  # encode after resolving :auto
-    @quote_char = options.delete(:quote_char).to_s.encode(@encoding)
+  def determine_encoding(encoding, internal_encoding)
+    # honor the IO encoding if we can, otherwise default to ASCII-8BIT
+    io_encoding = raw_encoding
+    return io_encoding if io_encoding
+
+    return Encoding.find(internal_encoding) if internal_encoding
 
-    if @quote_char.length != 1
-      raise ArgumentError, ":quote_char has to be a single character String"
+    if encoding
+      encoding, = encoding.split(":", 2) if encoding.is_a?(String)
+      return Encoding.find(encoding)
     end
 
-    #
-    # automatically discover row separator when requested
-    # (not fully encoding safe)
-    #
-    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
-          #
-          # remember where we were (pos() will raise an exception if @io is pipe
-          # or not opened for reading)
-          #
-          saved_pos = @io.pos
-          while @row_sep == :auto
-            #
-            # if we run out of data, it's probably a single line
-            # (ensure will set default value)
-            #
-            break unless sample = @io.gets(nil, 1024)
-            # extend sample if we're unsure of the line ending
-            if sample.end_with? encode_str("\r")
-              sample << (@io.gets(nil, 1) || "")
-            end
-
-            # try to find a standard separator
-            if sample =~ encode_re("\r\n?|\n")
-              @row_sep = $&
-              break
-            end
-          end
+    Encoding.default_internal || Encoding.default_external
+  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
-          @io.read(saved_pos) if saved_pos.nonzero?
-        rescue IOError         # not opened for reading
-          # do nothing:  ensure will set default
-        rescue NoMethodError   # Zlib::GzipWriter doesn't have some IO methods
-          # do nothing:  ensure will set default
-        rescue SystemCallError # pipe
-          # do nothing:  ensure will set default
-        ensure
-          #
-          # set default if we failed to detect
-          # (stream not opened for reading, a pipe, or a single line of data)
-          #
-          @row_sep = $INPUT_RECORD_SEPARATOR if @row_sep == :auto
-        end
-      end
-    end
-    @row_sep = @row_sep.to_s.encode(@encoding)
-
-    # establish quoting rules
-    @force_quotes   = options.delete(:force_quotes)
-    do_quote        = lambda do |field|
-      field         = String(field)
-      encoded_quote = @quote_char.encode(field.encoding)
-      encoded_quote                                +
-      field.gsub(encoded_quote, encoded_quote * 2) +
-      encoded_quote
-    end
-    quotable_chars = encode_str("\r\n", @col_sep, @quote_char)
-    @quote         = if @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(quotable_chars).nonzero?
-            do_quote.call(field)
-          else
-            field  # unquoted field
-          end
-        end
+  def normalize_converters(converters)
+    converters ||= []
+    unless converters.is_a?(Array)
+      converters = [converters]
+    end
+    converters.collect do |converter|
+      case converter
+      when Proc # custom code block
+        [nil, converter]
+      else # by name
+        [converter, nil]
       end
     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)
-    @field_size_limit = options.delete(:field_size_limit)
-    @liberal_parsing  = options.delete(:liberal_parsing)
-
-    # prebuild Regexps for faster parsing
-    esc_row_sep = escape_re(@row_sep)
-    esc_quote   = escape_re(@quote_char)
-    @parsers = {
-      # for detecting parse errors
-      quote_or_nl:    encode_re("[", esc_quote, "\r\n]"),
-      nl_or_lf:       encode_re("[\r\n]"),
-      stray_quote:    encode_re( "[^", esc_quote, "]", esc_quote,
-                                 "[^", esc_quote, "]" ),
-      # safer than chomp!()
-      line_end:       encode_re(esc_row_sep, "\\z"),
-      # illegal unquoted characters
-      return_newline: encode_str("\r\n")
-    }
-  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 activated for
-  # <tt>:converters</tt> calls, if requested.
+  # 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 init_converters(options, field_name = :converters)
-    if field_name == :converters
-      @unconverted_fields = options.delete(:unconverted_fields)
+  def convert_fields(fields, headers = false)
+    if headers
+      header_fields_converter.convert(fields, nil, 0)
+    else
+      parser_fields_converter.convert(fields, @headers, lineno)
     end
+  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
+  #
+  # Returns the encoding of the internal IO object.
+  #
+  def raw_encoding
+    if @io.respond_to? :internal_encoding
+      @io.internal_encoding || @io.external_encoding
+    elsif @io.respond_to? :encoding
+      @io.encoding
+    else
+      nil
     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)
-    @write_headers  = options.delete(:write_headers)
-
-    # headers must be delayed until shift(), in case they need a row of content
-    @headers = nil
-
-    init_converters(options, :header_converters)
+  def parser_fields_converter
+    @parser_fields_converter ||= build_parser_fields_converter
   end
 
-  # Stores the pattern of comments to skip from the provided options.
-  #
-  # The pattern must respond to +.match+, else ArgumentError is raised.
-  # Strings are converted to a Regexp.
-  #
-  # See also CSV.new
-  def init_comments(options)
-    @skip_lines = options.delete(:skip_lines)
-    @skip_lines = Regexp.new(@skip_lines) if @skip_lines.is_a? String
-    if @skip_lines and not @skip_lines.respond_to?(:match)
-      raise ArgumentError, ":skip_lines has to respond to matches"
-    end
+  def build_parser_fields_converter
+    specific_options = {
+      builtin_converters: Converters,
+    }
+    options = @base_fields_converter_options.merge(specific_options)
+    build_fields_converter(@initial_converters, options)
   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
-    end
+
+  def header_fields_converter
+    @header_fields_converter ||= build_header_fields_converter
   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.map.with_index do |field, index|
-      converters.each do |converter|
-        break if field.nil?
-        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-circuit pipeline for speed
-      end
-      field  # final state of each field, converted or original
-    end
+  def build_header_fields_converter
+    specific_options = {
+      builtin_converters: HeaderConverters,
+      accept_nil: true,
+    }
+    options = @base_fields_converter_options.merge(specific_options)
+    build_fields_converter(@initial_header_converters, options)
   end
 
-  #
-  # This method 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
-                 # Array of headers
-                 when Array then @use_headers
-                 # CSV header String
-                 when String
-                   self.class.parse_line( @use_headers,
-                                          col_sep:    @col_sep,
-                                          row_sep:    @row_sep,
-                                          quote_char: @quote_char )
-                 # first row is headers
-                 else            row
-                 end
-
-      # prepare converted and unconverted copies
-      row      = @headers                       if row.nil?
-      @headers = convert_fields(@headers, true)
-      @headers.each { |h| h.freeze if h.is_a? String }
-
-      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
-      end
-    end
+  def writer_fields_converter
+    @writer_fields_converter ||= build_writer_fields_converter
+  end
 
-    self.class::Row.new(@headers, convert_fields(row))  # field row
+  def build_writer_fields_converter
+    build_fields_converter(@initial_write_converters,
+                           @write_fields_converter_options)
   end
 
-  #
-  # This method injects an instance variable <tt>unconverted_fields</tt> into
-  # +row+ and an accessor method for +row+ 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 build_fields_converter(initial_converters, options)
+    fields_converter = FieldsConverter.new(options)
+    normalize_converters(initial_converters).each do |name, converter|
+      fields_converter.add_converter(name, &converter)
     end
-    row.instance_eval { @unconverted_fields = fields }
-    row
+    fields_converter
   end
 
-  #
-  # This method is an encoding safe version of Regexp::escape().  It will escape
-  # any characters that would change the meaning of a regular expression in the
-  # encoding of +str+.  Regular expression characters that cannot be transcoded
-  # to the target encoding will be skipped and no escaping will be performed if
-  # a backslash cannot be transcoded.
-  #
-  def escape_re(str)
-    str.gsub(@re_chars) {|c| @re_esc + c}
+  def parser
+    @parser ||= Parser.new(@io, parser_options)
   end
 
-  #
-  # Builds a regular expression in <tt>@encoding</tt>.  All +chunks+ will be
-  # transcoded to that encoding.
-  #
-  def encode_re(*chunks)
-    Regexp.new(encode_str(*chunks))
+  def parser_options
+    @parser_options.merge(header_fields_converter: header_fields_converter,
+                          fields_converter: parser_fields_converter)
   end
 
-  #
-  # Builds a String in <tt>@encoding</tt>.  All +chunks+ will be transcoded to
-  # that encoding.
-  #
-  def encode_str(*chunks)
-    chunks.map { |chunk| chunk.encode(@encoding.name) }.join('')
+  def parser_enumerator
+    @parser_enumerator ||= parser.parse
   end
 
-  private
+  def writer
+    @writer ||= Writer.new(@io, writer_options)
+  end
 
-  #
-  # Returns the encoding of the internal IO object or the +default+ if the
-  # encoding cannot be determined.
-  #
-  def raw_encoding(default = Encoding::ASCII_8BIT)
-    if @io.respond_to? :internal_encoding
-      @io.internal_encoding || @io.external_encoding
-    elsif @io.is_a? StringIO
-      @io.string.encoding
-    elsif @io.respond_to? :encoding
-      @io.encoding
-    else
-      default
-    end
+  def writer_options
+    @writer_options.merge(header_fields_converter: header_fields_converter,
+                          fields_converter: writer_fields_converter)
   end
 end
 
@@ -2348,22 +2654,6 @@ def CSV(*args, &block)
   CSV.instance(*args, &block)
 end
 
-class Array # :nodoc:
-  # Equivalent to CSV::generate_line(self, options)
-  #
-  #   ["CSV", "data"].to_csv
-  #     #=> "CSV,data\n"
-  def to_csv(options = Hash.new)
-    CSV.generate_line(self, options)
-  end
-end
-
-class String # :nodoc:
-  # Equivalent to CSV::parse_line(self, options)
-  #
-  #   "CSV,data".parse_csv
-  #     #=> ["CSV", "data"]
-  def parse_csv(options = Hash.new)
-    CSV.parse_line(self, options)
-  end
-end
+require_relative "csv/version"
+require_relative "csv/core_ext/array"
+require_relative "csv/core_ext/string"
diff --git a/lib/csv/core_ext/array.rb b/lib/csv/core_ext/array.rb
new file mode 100644
index 0000000000..8beb06b082
--- /dev/null
+++ b/lib/csv/core_ext/array.rb
@@ -0,0 +1,9 @@
+class Array # :nodoc:
+  # Equivalent to CSV::generate_line(self, options)
+  #
+  #   ["CSV", "data"].to_csv
+  #     #=> "CSV,data\n"
+  def to_csv(**options)
+    CSV.generate_line(self, **options)
+  end
+end
diff --git a/lib/csv/core_ext/string.rb b/lib/csv/core_ext/string.rb
new file mode 100644
index 0000000000..9b1d31c2a4
--- /dev/null
+++ b/lib/csv/core_ext/string.rb
@@ -0,0 +1,9 @@
+class String # :nodoc:
+  # Equivalent to CSV::parse_line(self, options)
+  #
+  #   "CSV,data".parse_csv
+  #     #=> ["CSV", "data"]
+  def parse_csv(**options)
+    CSV.parse_line(self, **options)
+  end
+end
diff --git a/lib/csv/csv.gemspec b/lib/csv/csv.gemspec
new file mode 100644
index 0000000000..d0284728f7
--- /dev/null
+++ b/lib/csv/csv.gemspec
@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+begin
+  require_relative "lib/csv/version"
+rescue LoadError
+  # for Ruby core repository
+  require_relative "version"
+end
+
+Gem::Specification.new do |spec|
+  spec.name          = "csv"
+  spec.version       = CSV::VERSION
+  spec.authors       = ["James Edward Gray II", "Kouhei Sutou"]
+  spec.email         = [nil, "kou@cozmixng.org"]
+
+  spec.summary       = "CSV Reading and Writing"
+  spec.description   = "The CSV library 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."
+  spec.homepage      = "https://github.com/ruby/csv"
+  spec.licenses      = ["Ruby", "BSD-2-Clause"]
+
+  lib_path = "lib"
+  spec.require_paths = [lib_path]
+  files = []
+  lib_dir = File.join(__dir__, lib_path)
+  if File.exist?(lib_dir)
+    Dir.chdir(lib_dir) do
+      Dir.glob("**/*.rb").each do |file|
+        files << "lib/#{file}"
+      end
+    end
+  end
+  doc_dir = File.join(__dir__, "doc")
+  if File.exist?(doc_dir)
+    Dir.chdir(doc_dir) do
+      Dir.glob("**/*.rdoc").each do |rdoc_file|
+        files << "doc/#{rdoc_file}"
+      end
+    end
+  end
+  spec.files = files
+  spec.rdoc_options.concat(["--main", "README.md"])
+  rdoc_files = [
+    "LICENSE.txt",
+    "NEWS.md",
+    "README.md",
+  ]
+  recipes_dir = File.join(doc_dir, "csv", "recipes")
+  if File.exist?(recipes_dir)
+    Dir.chdir(recipes_dir) do
+      Dir.glob("**/*.rdoc").each do |recipe_file|
+        rdoc_files << "doc/csv/recipes/#{recipe_file}"
+      end
+    end
+  end
+  spec.extra_rdoc_files = rdoc_files
+
+  spec.required_ruby_version = ">= 2.5.0"
+
+  # spec.add_dependency "stringio", ">= 0.1.3"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "benchmark_driver"
+  spec.add_development_dependency "simplecov"
+end
diff --git a/lib/csv/delete_suffix.rb b/lib/csv/delete_suffix.rb
new file mode 100644
index 0000000000..d457718997
--- /dev/null
+++ b/lib/csv/delete_suffix.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+# This provides String#delete_suffix? for Ruby 2.4.
+unless String.method_defined?(:delete_suffix)
+  class CSV
+    module DeleteSuffix
+      refine String do
+        def delete_suffix(suffix)
+          if end_with?(suffix)
+            self[0...-suffix.size]
+          else
+            self
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/csv/fields_converter.rb b/lib/csv/fields_converter.rb
new file mode 100644
index 0000000000..178ffb37bc
--- /dev/null
+++ b/lib/csv/fields_converter.rb
@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+class CSV
+  # Note: Don't use this class directly. This is an internal class.
+  class FieldsConverter
+    include Enumerable
+    #
+    # A CSV::FieldsConverter is a data structure for storing the
+    # fields converter properties to be passed as a parameter
+    # when parsing a new file (e.g. CSV::Parser.new(@io, parser_options))
+    #
+
+    def initialize(options={})
+      @converters = []
+      @nil_value = options[:nil_value]
+      @empty_value = options[:empty_value]
+      @empty_value_is_empty_string = (@empty_value == "")
+      @accept_nil = options[:accept_nil]
+      @builtin_converters = options[:builtin_converters]
+      @need_static_convert = need_static_convert?
+    end
+
+    def add_converter(name=nil, &converter)
+      if name.nil?  # custom converter
+        @converters << converter
+      else          # named converter
+        combo = @builtin_converters[name]
+        case combo
+        when Array  # combo converter
+          combo.each do |sub_name|
+            add_converter(sub_name)
+          end
+        else        # individual named converter
+          @converters << combo
+        end
+      end
+    end
+
+    def each(&block)
+      @converters.each(&block)
+    end
+
+    def empty?
+      @converters.empty?
+    end
+
+    def convert(fields, headers, lineno)
+      return fields unless need_convert?
+
+      fields.collect.with_index do |field, index|
+        if field.nil?
+          field = @nil_value
+        elsif field.is_a?(String) and field.empty?
+          field = @empty_value unless @empty_value_is_empty_string
+        end
+        @converters.each do |converter|
+          break if field.nil? and @accept_nil
+          if converter.arity == 1  # straight field converter
+            field = converter[field]
+          else                     # FieldInfo converter
+            if headers
+              header = headers[index]
+            else
+              header = nil
+            end
+            field = converter[field, FieldInfo.new(index, lineno, header)]
+          end
+          break unless field.is_a?(String)  # short-circuit pipeline for speed
+        end
+        field  # final state of each field, converted or original
+      end
+    end
+
+    private
+    def need_static_convert?
+      not (@nil_value.nil? and @empty_value_is_empty_string)
+    end
+
+    def need_convert?
+      @need_static_convert or
+        (not @converters.empty?)
+    end
+  end
+end
diff --git a/lib/csv/match_p.rb b/lib/csv/match_p.rb
new file mode 100644
index 0000000000..775559a3eb
--- /dev/null
+++ b/lib/csv/match_p.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+# This provides String#match? and Regexp#match? for Ruby 2.3.
+unless String.method_defined?(:match?)
+  class CSV
+    module MatchP
+      refine String do
+        def match?(pattern)
+          self =~ pattern
+        end
+      end
+
+      refine Regexp do
+        def match?(string)
+          self =~ string
+        end
+      end
+    end
+  end
+end
diff --git a/lib/csv/parser.rb b/lib/csv/parser.rb
new file mode 100644
index 0000000000..2fb3b0a46e
--- /dev/null
+++ b/lib/csv/parser.rb
@@ -0,0 +1,1142 @@
+# frozen_string_literal: true
+
+require "strscan"
+
+require_relative "delete_suffix"
+require_relative "match_p"
+require_relative "row"
+require_relative "table"
+
+using CSV::DeleteSuffix if CSV.const_defined?(:DeleteSuffix)
+using CSV::MatchP if CSV.const_defined?(:MatchP)
+
+class CSV
+  # Note: Don't use this class directly. This is an internal class.
+  class Parser
+    #
+    # A CSV::Parser is m17n aware. The parser works in the Encoding of the IO
+    # or String object being read from or written to. Your data is never transcoded
+    # (unless you ask Ruby to transcode it for you) and will literally be parsed in
+    # the Encoding it is in. Thus CSV will return Arrays or Rows of Strings in the
+    # Encoding of your data. This is accomplished by transcoding the parser itself
+    # into your Encoding.
+    #
+
+    # Raised when encoding is invalid.
+    class InvalidEncoding < StandardError
+    end
+
+    #
+    # CSV::Scanner receives a CSV output, scans it and return the content.
+    # It also controls the life cycle of the object with its methods +keep_start+,
+    # +keep_end+, +keep_back+, +keep_drop+.
+    #
+    # Uses StringScanner (the official strscan gem). Strscan provides lexical
+    # scanning operations on a String. We inherit its object and take advantage
+    # on the methods. For more information, please visit:
+    # https://ruby-doc.org/stdlib-2.6.1/libdoc/strscan/rdoc/StringScanner.html
+    #
+    class Scanner < StringScanner
+      alias_method :scan_all, :scan
+
+      def initialize(*args)
+        super
+        @keeps = []
+      end
+
+      def each_line(row_separator)
+        position = pos
+        rest.each_line(row_separator) do |line|
+          position += line.bytesize
+          self.pos = position
+          yield(line)
+        end
+      end
+
+      def keep_start
+        @keeps.push(pos)
+      end
+
+      def keep_end
+        start = @keeps.pop
+        string.byteslice(start, pos - start)
+      end
+
+      def keep_back
+        self.pos = @keeps.pop
+      end
+
+      def keep_drop
+        @keeps.pop
+      end
+    end
+
+    #
+    # CSV::InputsScanner receives IO inputs, encoding and the chunk_size.
+    # It also controls the life cycle of the object with its methods +keep_start+,
+    # +keep_end+, +keep_back+, +keep_drop+.
+    #
+    # CSV::InputsScanner.scan() tries to match with pattern at the current position.
+    # If there's a match, the scanner advances the “scan pointer” and returns the matched string.
+    # Otherwise, the scanner returns nil.
+    #
+    # CSV::InputsScanner.rest() returns the “rest” of the string (i.e. everything after the scan pointer).
+    # If there is no more data (eos? = true), it returns "".
+    #
+    class InputsScanner
+      def initialize(inputs, encoding, chunk_size: 8192)
+        @inputs = inputs.dup
+        @encoding = encoding
+        @chunk_size = chunk_size
+        @last_scanner = @inputs.empty?
+        @keeps = []
+        read_chunk
+      end
+
+      def each_line(row_separator)
+        buffer = nil
+        input = @scanner.rest
+        position = @scanner.pos
+        offset = 0
+        n_row_separator_chars = row_separator.size
+        while true
+          input.each_line(row_separator) do |line|
+            @scanner.pos += line.bytesize
+            if buffer
+              if n_row_separator_chars == 2 and
+                buffer.end_with?(row_separator[0]) and
+                line.start_with?(row_separator[1])
+                buffer << line[0]
+                line = line[1..-1]
+                position += buffer.bytesize + offset
+                @scanner.pos = position
+                offset = 0
+                yield(buffer)
+                buffer = nil
+                next if line.empty?
+              else
+                buffer << line
+                line = buffer
+                buffer = nil
+              end
+            end
+            if line.end_with?(row_separator)
+              position += line.bytesize + offset
+              @scanner.pos = position
+              offset = 0
+              yield(line)
+            else
+              buffer = line
+            end
+          end
+          break unless read_chunk
+          input = @scanner.rest
+          position = @scanner.pos
+          offset = -buffer.bytesize if buffer
+        end
+        yield(buffer) if buffer
+      end
+
+      def scan(pattern)
+        value = @scanner.scan(pattern)
+        return value if @last_scanner
+
+        if value
+          read_chunk if @scanner.eos?
+          return value
+        else
+          nil
+        end
+      end
+
+      def scan_all(pattern)
+        value = @scanner.scan(pattern)
+        return value if @last_scanner
+
+        return nil if value.nil?
+        while @scanner.eos? and read_chunk and (sub_value = @scanner.scan(pattern))
+          value << sub_value
+        end
+        value
+      end
+
+      def eos?
+        @scanner.eos?
+      end
+
+      def keep_start
+        @keeps.push([@scanner.pos, nil])
+      end
+
+      def keep_end
+        start, buffer = @keeps.pop
+        keep = @scanner.string.byteslice(start, @scanner.pos - start)
+        if buffer
+          buffer << keep
+          keep = buffer
+        end
+        keep
+      end
+
+      def keep_back
+        start, buffer = @keeps.pop
+        if buffer
+          string = @scanner.string
+          keep = string.byteslice(start, string.bytesize - start)
+          if keep and not keep.empty?
+            @inputs.unshift(StringIO.new(keep))
+            @last_scanner = false
+          end
+          @scanner = StringScanner.new(buffer)
+        else
+          @scanner.pos = start
+        end
+        read_chunk if @scanner.eos?
+      end
+
+      def keep_drop
+        @keeps.pop
+      end
+
+      def rest
+        @scanner.rest
+      end
+
+      private
+      def read_chunk
+        return false if @last_scanner
+
+        unless @keeps.empty?
+          keep = @keeps.last
+          keep_start = keep[0]
+          string = @scanner.string
+          keep_data = string.byteslice(keep_start, @scanner.pos - keep_start)
+          if keep_data
+            keep_buffer = keep[1]
+            if keep_buffer
+              keep_buffer << keep_data
+            else
+              keep[1] = keep_data.dup
+            end
+          end
+          keep[0] = 0
+        end
+
+        input = @inputs.first
+        case input
+        when StringIO
+          string = input.read
+          raise InvalidEncoding unless string.valid_encoding?
+          @scanner = StringScanner.new(string)
+          @inputs.shift
+          @last_scanner = @inputs.empty?
+          true
+        else
+          chunk = input.gets(nil, @chunk_size)
+          if chunk
+            raise InvalidEncoding unless chunk.valid_encoding?
+            @scanner = StringScanner.new(chunk)
+            if input.respond_to?(:eof?) and input.eof?
+              @inputs.shift
+              @last_scanner = @inputs.empty?
+            end
+            true
+          else
+            @scanner = StringScanner.new("".encode(@encoding))
+            @inputs.shift
+            @last_scanner = @inputs.empty?
+            if @last_scanner
+              false
+            else
+              read_chunk
+            end
+          end
+        end
+      end
+    end
+
+    def initialize(input, options)
+      @input = input
+      @options = options
+      @samples = []
+
+      prepare
+    end
+
+    def column_separator
+      @column_separator
+    end
+
+    def row_separator
+      @row_separator
+    end
+
+    def quote_character
+      @quote_character
+    end
+
+    def field_size_limit
+      @field_size_limit
+    end
+
+    def skip_lines
+      @skip_lines
+    end
+
+    def unconverted_fields?
+      @unconverted_fields
+    end
+
+    def headers
+      @headers
+    end
+
+    def header_row?
+      @use_headers and @headers.nil?
+    end
+
+    def return_headers?
+      @return_headers
+    end
+
+    def skip_blanks?
+      @skip_blanks
+    end
+
+    def liberal_parsing?
+      @liberal_parsing
+    end
+
+    def lineno
+      @lineno
+    end
+
+    def line
+      last_line
+    end
+
+    def parse(&block)
+      return to_enum(__method__) unless block_given?
+
+      if @return_headers and @headers and @raw_headers
+        headers = Row.new(@headers, @raw_headers, true)
+        if @unconverted_fields
+          headers = add_unconverted_fields(headers, [])
+        end
+        yield headers
+      end
+
+      begin
+        @scanner ||= build_scanner
+        if quote_character.nil?
+          parse_no_quote(&block)
+        elsif @need_robust_parsing
+          parse_quotable_robust(&block)
+        else
+          parse_quotable_loose(&block)
+        end
+      rescue InvalidEncoding
+        if @scanner
+          ignore_broken_line
+          lineno = @lineno
+        else
+          lineno = @lineno + 1
+        end
+        message = "Invalid byte sequence in #{@encoding}"
+        raise MalformedCSVError.new(message, lineno)
+      end
+    end
+
+    def use_headers?
+      @use_headers
+    end
+
+    private
+    # A set of tasks to prepare the file in order to parse it
+    def prepare
+      prepare_variable
+      prepare_quote_character
+      prepare_backslash
+      prepare_skip_lines
+      prepare_strip
+      prepare_separators
+      prepare_quoted
+      prepare_unquoted
+      prepare_line
+      prepare_header
+      prepare_parser
+    end
+
+    def prepare_variable
+      @need_robust_parsing = false
+      @encoding = @options[:encoding]
+      liberal_parsing = @options[:liberal_parsing]
+      if liberal_parsing
+        @liberal_parsing = true
+        if liberal_parsing.is_a?(Hash)
+          @double_quote_outside_quote =
+            liberal_parsing[:double_quote_outside_quote]
+          @backslash_quote = liberal_parsing[:backslash_quote]
+        else
+          @double_quote_outside_quote = false
+          @backslash_quote = false
+        end
+        @need_robust_parsing = true
+      else
+        @liberal_parsing = false
+        @backslash_quote = false
+      end
+      @unconverted_fields = @options[:unconverted_fields]
+      @field_size_limit = @options[:field_size_limit]
+      @skip_blanks = @options[:skip_blanks]
+      @fields_converter = @options[:fields_converter]
+      @header_fields_converter = @options[:header_fields_converter]
+    end
+
+    def prepare_quote_character
+      @quote_character = @options[:quote_character]
+      if @quote_character.nil?
+        @escaped_quote_character = nil
+        @escaped_quote = nil
+      else
+        @quote_character = @quote_character.to_s.encode(@encoding)
+        if @quote_character.length != 1
+          message = ":quote_char has to be nil or a single character String"
+          raise ArgumentError, message
+        end
+        @double_quote_character = @quote_character * 2
+        @escaped_quote_character = Regexp.escape(@quote_character)
+        @escaped_quote = Regexp.new(@escaped_quote_character)
+      end
+    end
+
+    def prepare_backslash
+      return unless @backslash_quote
+
+      @backslash_character = "\\".encode(@encoding)
+
+      @escaped_backslash_character = Regexp.escape(@backslash_character)
+      @escaped_backslash = Regexp.new(@escaped_backslash_character)
+      if @quote_character.nil?
+        @backslash_quote_character = nil
+      else
+        @backslash_quote_character =
+          @backslash_character + @escaped_quote_character
+      end
+    end
+
+    def prepare_skip_lines
+      skip_lines = @options[:skip_lines]
+      case skip_lines
+      when String
+        @skip_lines = skip_lines.encode(@encoding)
+      when Regexp, nil
+        @skip_lines = skip_lines
+      else
+        unless skip_lines.respond_to?(:match)
+          message =
+            ":skip_lines has to respond to \#match: #{skip_lines.inspect}"
+          raise ArgumentError, message
+        end
+        @skip_lines = skip_lines
+      end
+    end
+
+    def prepare_strip
+      @strip = @options[:strip]
+      @escaped_strip = nil
+      @strip_value = nil
+      @rstrip_value = nil
+      if @strip.is_a?(String)
+        case @strip.length
+        when 0
+          raise ArgumentError, ":strip must not be an empty String"
+        when 1
+          # ok
+        else
+          raise ArgumentError, ":strip doesn't support 2 or more characters yet"
+        end
+        @strip = @strip.encode(@encoding)
+        @escaped_strip = Regexp.escape(@strip)
+        if @quote_character
+          @strip_value = Regexp.new(@escaped_strip +
+                                    "+".encode(@encoding))
+          @rstrip_value = Regexp.new(@escaped_strip +
+                                     "+\\z".encode(@encoding))
+        end
+        @need_robust_parsing = true
+      elsif @strip
+        strip_values = " \t\f\v"
+        @escaped_strip = strip_values.encode(@encoding)
+        if @quote_character
+          @strip_value = Regexp.new("[#{strip_values}]+".encode(@encoding))
+          @rstrip_value = Regexp.new("[#{strip_values}]+\\z".encode(@encoding))
+        end
+        @need_robust_parsing = true
+      end
+    end
+
+    begin
+      StringScanner.new("x").scan("x")
+    rescue TypeError
+      @@string_scanner_scan_accept_string = false
+    else
+      @@string_scanner_scan_accept_string = true
+    end
+
+    def prepare_separators
+      column_separator = @options[:column_separator]
+      @column_separator = column_separator.to_s.encode(@encoding)
+      if @column_separator.size < 1
+        message = ":col_sep must be 1 or more characters: "
+        message += column_separator.inspect
+        raise ArgumentError, message
+      end
+      @row_separator =
+        resolve_row_separator(@options[:row_separator]).encode(@encoding)
+
+      @escaped_column_separator = Regexp.escape(@column_separator)
+      @escaped_first_column_separator = Regexp.escape(@column_separator[0])
+      if @column_separator.size > 1
+        @column_end = Regexp.new(@escaped_column_separator)
+        @column_ends = @column_separator.each_char.collect do |char|
+          Regexp.new(Regexp.escape(char))
+        end
+        @first_column_separators = Regexp.new(@escaped_first_column_separator +
+                                              "+".encode(@encoding))
+      else
+        if @@string_scanner_scan_accept_string
+          @column_end = @column_separator
+        else
+          @column_end = Regexp.new(@escaped_column_separator)
+        end
+        @column_ends = nil
+        @first_column_separators = nil
+      end
+
+      escaped_row_separator = Regexp.escape(@row_separator)
+      @row_end = Regexp.new(escaped_row_separator)
+      if @row_separator.size > 1
+        @row_ends = @row_separator.each_char.collect do |char|
+          Regexp.new(Regexp.escape(char))
+        end
+      else
+        @row_ends = nil
+      end
+
+      @cr = "\r".encode(@encoding)
+      @lf = "\n".encode(@encoding)
+      @cr_or_lf = Regexp.new("[\r\n]".encode(@encoding))
+      @not_line_end = Regexp.new("[^\r\n]+".encode(@encoding))
+    end
+
+    def prepare_quoted
+      if @quote_character
+        @quotes = Regexp.new(@escaped_quote_character +
+                             "+".encode(@encoding))
+        no_quoted_values = @escaped_quote_character.dup
+        if @backslash_quote
+          no_quoted_values << @escaped_backslash_character
+        end
+        @quoted_value = Regexp.new("[^".encode(@encoding) +
+                                   no_quoted_values +
+                                   "]+".encode(@encoding))
+      end
+      if @escaped_strip
+        @split_column_separator = Regexp.new(@escaped_strip +
+                                             "*".encode(@encoding) +
+                                             @escaped_column_separator +
+                                             @escaped_strip +
+                                             "*".encode(@encoding))
+      else
+        if @column_separator == " ".encode(@encoding)
+          @split_column_separator = Regexp.new(@escaped_column_separator)
+        else
+          @split_column_separator = @column_separator
+        end
+      end
+    end
+
+    def prepare_unquoted
+      return if @quote_character.nil?
+
+      no_unquoted_values = "\r\n".encode(@encoding)
+      no_unquoted_values << @escaped_first_column_separator
+      unless @liberal_parsing
+        no_unquoted_values << @escaped_quote_character
+      end
+      @unquoted_value = Regexp.new("[^".encode(@encoding) +
+                                   no_unquoted_values +
+                                   "]+".encode(@encoding))
+    end
+
+    def resolve_row_separator(separator)
+      if separator == :auto
+        cr = "\r".encode(@encoding)
+        lf = "\n".encode(@encoding)
+        if @input.is_a?(StringIO)
+          pos = @input.pos
+          separator = detect_row_separator(@input.read, cr, lf)
+          @input.seek(pos)
+        elsif @input.respond_to?(:gets)
+          if @input.is_a?(File)
+            chunk_size = 32 * 1024
+          else
+            chunk_size = 1024
+          end
+          begin
+            while separator == :auto
+              #
+              # if we run out of data, it's probably a single line
+              # (ensure will set default value)
+              #
+              break unless sample = @input.gets(nil, chunk_size)
+
+              # extend sample if we're unsure of the line ending
+              if sample.end_with?(cr)
+                sample << (@input.gets(nil, 1) || "")
+              end
+
+              @samples << sample
+
+              separator = detect_row_separator(sample, cr, lf)
+            end
+          rescue IOError
+            # do nothing:  ensure will set default
+          end
+        end
+        separator = $INPUT_RECORD_SEPARATOR if separator == :auto
+      end
+      separator.to_s.encode(@encoding)
+    end
+
+    def detect_row_separator(sample, cr, lf)
+      lf_index = sample.index(lf)
+      if lf_index
+        cr_index = sample[0, lf_index].index(cr)
+      else
+        cr_index = sample.index(cr)
+      end
+      if cr_index and lf_index
+        if cr_index + 1 == lf_index
+          cr + lf
+        elsif cr_index < lf_index
+          cr
+        else
+          lf
+        end
+      elsif cr_index
+        cr
+      elsif lf_index
+        lf
+      else
+        :auto
+      end
+    end
+
+    def prepare_line
+      @lineno = 0
+      @last_line = nil
+      @scanner = nil
+    end
+
+    def last_line
+      if @scanner
+        @last_line ||= @scanner.keep_end
+      else
+        @last_line
+      end
+    end
+
+    def prepare_header
+      @return_headers = @options[:return_headers]
+
+      headers = @options[:headers]
+      case headers
+      when Array
+        @raw_headers = headers
+        @use_headers = true
+      when String
+        @raw_headers = parse_headers(headers)
+        @use_headers = true
+      when nil, false
+        @raw_headers = nil
+        @use_headers = false
+      else
+        @raw_headers = nil
+        @use_headers = true
+      end
+      if @raw_headers
+        @headers = adjust_headers(@raw_headers)
+      else
+        @headers = nil
+      end
+    end
+
+    def parse_headers(row)
+      CSV.parse_line(row,
+                     col_sep:    @column_separator,
+                     row_sep:    @row_separator,
+                     quote_char: @quote_character)
+    end
+
+    def adjust_headers(headers)
+      adjusted_headers = @header_fields_converter.convert(headers, nil, @lineno)
+      adjusted_headers.each {|h| h.freeze if h.is_a? String}
+      adjusted_headers
+    end
+
+    def prepare_parser
+      @may_quoted = may_quoted?
+    end
+
+    def may_quoted?
+      return false if @quote_character.nil?
+
+      if @input.is_a?(StringIO)
+        pos = @input.pos
+        sample = @input.read
+        @input.seek(pos)
+      else
+        return false if @samples.empty?
+        sample = @samples.first
+      end
+      sample[0, 128].index(@quote_character)
+    end
+
+    SCANNER_TEST = (ENV["CSV_PARSER_SCANNER_TEST"] == "yes")
+    if SCANNER_TEST
+      class UnoptimizedStringIO
+        def initialize(string)
+          @io = StringIO.new(string, "rb:#{string.encoding}")
+        end
+
+        def gets(*args)
+          @io.gets(*args)
+        end
+
+        def each_line(*args, &block)
+          @io.each_line(*args, &block)
+        end
+
+        def eof?
+          @io.eof?
+        end
+      end
+
+      def build_scanner
+        inputs = @samples.collect do |sample|
+          UnoptimizedStringIO.new(sample)
+        end
+        if @input.is_a?(StringIO)
+          inputs << UnoptimizedStringIO.new(@input.read)
+        else
+          inputs << @input
+        end
+        chunk_size = ENV["CSV_PARSER_SCANNER_TEST_CHUNK_SIZE"] || "1"
+        InputsScanner.new(inputs,
+                          @encoding,
+                          chunk_size: Integer(chunk_size, 10))
+      end
+    else
+      def build_scanner
+        string = nil
+        if @samples.empty? and @input.is_a?(StringIO)
+          string = @input.read
+        elsif @samples.size == 1 and @input.respond_to?(:eof?) and @input.eof?
+          string = @samples[0]
+        end
+        if string
+          unless string.valid_encoding?
+            index = string.lines(@row_separator).index do |line|
+              !line.valid_encoding?
+            end
+            if index
+              message = "Invalid byte sequence in #{@encoding}"
+              raise MalformedCSVError.new(message, @lineno + index + 1)
+            end
+          end
+          Scanner.new(string)
+        else
+          inputs = @samples.collect do |sample|
+            StringIO.new(sample)
+          end
+          inputs << @input
+          InputsScanner.new(inputs, @encoding)
+        end
+      end
+    end
+
+    def skip_needless_lines
+      return unless @skip_lines
+
+      until @scanner.eos?
+        @scanner.keep_start
+        line = @scanner.scan_all(@not_line_end) || "".encode(@encoding)
+        line << @row_separator if parse_row_end
+        if skip_line?(line)
+          @lineno += 1
+          @scanner.keep_drop
+        else
+          @scanner.keep_back
+          return
+        end
+      end
+    end
+
+    def skip_line?(line)
+      line = line.delete_suffix(@row_separator)
+      case @skip_lines
+      when String
+        line.include?(@skip_lines)
+      when Regexp
+        @skip_lines.match?(line)
+      else
+        @skip_lines.match(line)
+      end
+    end
+
+    def parse_no_quote(&block)
+      @scanner.each_line(@row_separator) do |line|
+        next if @skip_lines and skip_line?(line)
+        original_line = line
+        line = line.delete_suffix(@row_separator)
+
+        if line.empty?
+          next if @skip_blanks
+          row = []
+        else
+          line = strip_value(line)
+          row = line.split(@split_column_separator, -1)
+          n_columns = row.size
+          i = 0
+          while i < n_columns
+            row[i] = nil if row[i].empty?
+            i += 1
+          end
+        end
+        @last_line = original_line
+        emit_row(row, &block)
+      end
+    end
+
+    def parse_quotable_loose(&block)
+      @scanner.keep_start
+      @scanner.each_line(@row_separator) do |line|
+        if @skip_lines and skip_line?(line)
+          @scanner.keep_drop
+          @scanner.keep_start
+          next
+        end
+        original_line = line
+        line = line.delete_suffix(@row_separator)
+
+        if line.empty?
+          if @skip_blanks
+            @scanner.keep_drop
+            @scanner.keep_start
+            next
+          end
+          row = []
+        elsif line.include?(@cr) or line.include?(@lf)
+          @scanner.keep_back
+          @need_robust_parsing = true
+          return parse_quotable_robust(&block)
+        else
+          row = line.split(@split_column_separator, -1)
+          n_columns = row.size
+          i = 0
+          while i < n_columns
+            column = row[i]
+            if column.empty?
+              row[i] = nil
+            else
+              n_quotes = column.count(@quote_character)
+              if n_quotes.zero?
+                # no quote
+              elsif n_quotes == 2 and
+                   column.start_with?(@quote_character) and
+                   column.end_with?(@quote_character)
+                row[i] = column[1..-2]
+              else
+                @scanner.keep_back
+                @need_robust_parsing = true
+                return parse_quotable_robust(&block)
+              end
+            end
+            i += 1
+          end
+        end
+        @scanner.keep_drop
+        @scanner.keep_start
+        @last_line = original_line
+        emit_row(row, &block)
+      end
+      @scanner.keep_drop
+    end
+
+    def parse_quotable_robust(&block)
+      row = []
+      skip_needless_lines
+      start_row
+      while true
+        @quoted_column_value = false
+        @unquoted_column_value = false
+        @scanner.scan_all(@strip_value) if @strip_value
+        value = parse_column_value
+        if value
+          @scanner.scan_all(@strip_value) if @strip_value
+          if @field_size_limit and value.size >= @field_size_limit
+            ignore_broken_line
+            raise MalformedCSVError.new("Field size exceeded", @lineno)
+          end
+        end
+        if parse_column_end
+          row << value
+        elsif parse_row_end
+          if row.empty? and value.nil?
+            emit_row([], &block) unless @skip_blanks
+          else
+            row << value
+            emit_row(row, &block)
+            row = []
+          end
+          skip_needless_lines
+          start_row
+        elsif @scanner.eos?
+          break if row.empty? and value.nil?
+          row << value
+          emit_row(row, &block)
+          break
+        else
+          if @quoted_column_value
+            ignore_broken_line
+            message = "Any value after quoted field isn't allowed"
+            raise MalformedCSVError.new(message, @lineno)
+          elsif @unquoted_column_value and
+                (new_line = @scanner.scan(@cr_or_lf))
+            ignore_broken_line
+            message = "Unquoted fields do not allow new line " +
+                      "<#{new_line.inspect}>"
+            raise MalformedCSVError.new(message, @lineno)
+          elsif @scanner.rest.start_with?(@quote_character)
+            ignore_broken_line
+            message = "Illegal quoting"
+            raise MalformedCSVError.new(message, @lineno)
+          elsif (new_line = @scanner.scan(@cr_or_lf))
+            ignore_broken_line
+            message = "New line must be <#{@row_separator.inspect}> " +
+                      "not <#{new_line.inspect}>"
+            raise MalformedCSVError.new(message, @lineno)
+          else
+            ignore_broken_line
+            raise MalformedCSVError.new("TODO: Meaningful message",
+                                        @lineno)
+          end
+        end
+      end
+    end
+
+    def parse_column_value
+      if @liberal_parsing
+        quoted_value = parse_quoted_column_value
+        if quoted_value
+          @scanner.scan_all(@strip_value) if @strip_value
+          unquoted_value = parse_unquoted_column_value
+          if unquoted_value
+            if @double_quote_outside_quote
+              unquoted_value = unquoted_value.gsub(@quote_character * 2,
+                                                   @quote_character)
+              if quoted_value.empty? # %Q{""...} case
+                return @quote_character + unquoted_value
+              end
+            end
+            @quote_character + quoted_value + @quote_character + unquoted_value
+          else
+            quoted_value
+          end
+        else
+          parse_unquoted_column_value
+        end
+      elsif @may_quoted
+        parse_quoted_column_value ||
+          parse_unquoted_column_value
+      else
+        parse_unquoted_column_value ||
+          parse_quoted_column_value
+      end
+    end
+
+    def parse_unquoted_column_value
+      value = @scanner.scan_all(@unquoted_value)
+      return nil unless value
+
+      @unquoted_column_value = true
+      if @first_column_separators
+        while true
+          @scanner.keep_start
+          is_column_end = @column_ends.all? do |column_end|
+            @scanner.scan(column_end)
+          end
+          @scanner.keep_back
+          break if is_column_end
+          sub_separator = @scanner.scan_all(@first_column_separators)
+          break if sub_separator.nil?
+          value << sub_separator
+          sub_value = @scanner.scan_all(@unquoted_value)
+          break if sub_value.nil?
+          value << sub_value
+        end
+      end
+      value.gsub!(@backslash_quote_character, @quote_character) if @backslash_quote
+      if @rstrip_value
+        value.gsub!(@rstrip_value, "")
+      end
+      value
+    end
+
+    def parse_quoted_column_value
+      quotes = @scanner.scan_all(@quotes)
+      return nil unless quotes
+
+      @quoted_column_value = true
+      n_quotes = quotes.size
+      if (n_quotes % 2).zero?
+        quotes[0, (n_quotes - 2) / 2]
+      else
+        value = quotes[0, (n_quotes - 1) / 2]
+        while true
+          quoted_value = @scanner.scan_all(@quoted_value)
+          value << quoted_value if quoted_value
+          if @backslash_quote
+            if @scanner.scan(@escaped_backslash)
+              if @scanner.scan(@escaped_quote)
+                value << @quote_character
+              else
+                value << @backslash_character
+              end
+              next
+            end
+          end
+
+          quotes = @scanner.scan_all(@quotes)
+          unless quotes
+            ignore_broken_line
+            message = "Unclosed quoted field"
+            raise MalformedCSVError.new(message, @lineno)
+          end
+          n_quotes = quotes.size
+          if n_quotes == 1
+            break
+          elsif (n_quotes % 2) == 1
+            value << quotes[0, (n_quotes - 1) / 2]
+            break
+          else
+            value << quotes[0, n_quotes / 2]
+          end
+        end
+        value
+      end
+    end
+
+    def parse_column_end
+      return true if @scanner.scan(@column_end)
+      return false unless @column_ends
+
+      @scanner.keep_start
+      if @column_ends.all? {|column_end| @scanner.scan(column_end)}
+        @scanner.keep_drop
+        true
+      else
+        @scanner.keep_back
+        false
+      end
+    end
+
+    def parse_row_end
+      return true if @scanner.scan(@row_end)
+      return false unless @row_ends
+      @scanner.keep_start
+      if @row_ends.all? {|row_end| @scanner.scan(row_end)}
+        @scanner.keep_drop
+        true
+      else
+        @scanner.keep_back
+        false
+      end
+    end
+
+    def strip_value(value)
+      return value unless @strip
+      return nil if value.nil?
+
+      case @strip
+      when String
+        size = value.size
+        while value.start_with?(@strip)
+          size -= 1
+          value = value[1, size]
+        end
+        while value.end_with?(@strip)
+          size -= 1
+          value = value[0, size]
+        end
+      else
+        value.strip!
+      end
+      value
+    end
+
+    def ignore_broken_line
+      @scanner.scan_all(@not_line_end)
+      @scanner.scan_all(@cr_or_lf)
+      @lineno += 1
+    end
+
+    def start_row
+      if @last_line
+        @last_line = nil
+      else
+        @scanner.keep_drop
+      end
+      @scanner.keep_start
+    end
+
+    def emit_row(row, &block)
+      @lineno += 1
+
+      raw_row = row
+      if @use_headers
+        if @headers.nil?
+          @headers = adjust_headers(row)
+          return unless @return_headers
+          row = Row.new(@headers, row, true)
+        else
+          row = Row.new(@headers,
+                        @fields_converter.convert(raw_row, @headers, @lineno))
+        end
+      else
+        # convert fields, if needed...
+        row = @fields_converter.convert(raw_row, nil, @lineno)
+      end
+
+      # inject unconverted fields and accessor, if requested...
+      if @unconverted_fields and not row.respond_to?(:unconverted_fields)
+        add_unconverted_fields(row, raw_row)
+      end
+
+      yield(row)
+    end
+
+    # This method injects an instance variable <tt>unconverted_fields</tt> into
+    # +row+ and an accessor method for +row+ called unconverted_fields().  The
+    # variable is set to the contents of +fields+.
+    def add_unconverted_fields(row, fields)
+      class << row
+        attr_reader :unconverted_fields
+      end
+      row.instance_variable_set(:@unconverted_fields, fields)
+      row
+    end
+  end
+end
diff --git a/lib/csv/row.rb b/lib/csv/row.rb
new file mode 100644
index 0000000000..0f465ea2a3
--- /dev/null
+++ b/lib/csv/row.rb
@@ -0,0 +1,624 @@
+# frozen_string_literal: true
+
+require "forwardable"
+
+class CSV
+  #
+  # 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
+    #
+    # Constructs 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 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
+      headers.each { |h| h.freeze if h.is_a? String }
+
+      # handle extra headers or fields
+      @row = if headers.size >= fields.size
+        headers.zip(fields)
+      else
+        fields.zip(headers).each(&:reverse!)
+      end
+    end
+
+    # Internal data format used to compare equality.
+    attr_reader :row
+    protected   :row
+
+    ### Array Delegation ###
+
+    extend Forwardable
+    def_delegators :@row, :empty?, :length, :size
+
+    def initialize_copy(other)
+      super_return_value = super
+      @row = @row.collect(&:dup)
+      super_return_value
+    end
+
+    # :call-seq:
+    #   row.header_row? -> true or false
+    #
+    # Returns +true+ if this is a header row, +false+ otherwise.
+    def header_row?
+      @header_row
+    end
+
+    # :call-seq:
+    #   row.field_row? -> true or false
+    #
+    # Returns +true+ if this is a field row, +false+ otherwise.
+    def field_row?
+      not header_row?
+    end
+
+    # :call-seq:
+    #    row.headers
+    #
+    # Returns the headers for this row:
+    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
+    #   table = CSV.parse(source, headers: true)
+    #   row = table.first
+    #   row.headers # => ["Name", "Value"]
+    def headers
+      @row.map(&:first)
+    end
+
+    # :call-seq:
+    #   field(index)
+    #   field(header)
+    #   field(header, offset)
+    #
+    # Returns the field value for the given +index+ or +header+.
+    #
+    # ---
+    #
+    # Fetch field value by \Integer index:
+    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
+    #   table = CSV.parse(source, headers: true)
+    #   row = table[0]
+    #   row.field(0) # => "foo"
+    #   row.field(1) # => "bar"
+    #
+    # Counts backward from the last column if +index+ is negative:
+    #   row.field(-1) # => "0"
+    #   row.field(-2) # => "foo"
+    #
+    # Returns +nil+ if +index+ is out of range:
+    #   row.field(2) # => nil
+    #   row.field(-3) # => nil
+    #
+    # ---
+    #
+    # Fetch field value by header (first found):
+    #   source = "Name,Name,Name\nFoo,Bar,Baz\n"
+    #   table = CSV.parse(source, headers: true)
+    #   row = table[0]
+    #   row.field('Name') # => "Foo"
+    #
+    # Fetch field value by header, ignoring +offset+ leading fields:
+    #   source = "Name,Name,Name\nFoo,Bar,Baz\n"
+    #   table = CSV.parse(source, headers: true)
+    #   row = table[0]
+    #   row.field('Name', 2) # => "Baz"
+    #
+    # Returns +nil+ if the header does not exist.
+    def field(header_or_index, minimum_index = 0)
+      # locate the pair
+      finder = (header_or_index.is_a?(Integer) || header_or_index.is_a?(Range)) ? :[] : :assoc
+      pair   = @row[minimum_index..-1].public_send(finder, header_or_index)
+
+      # return the field if we have a pair
+      if pair.nil?
+        nil
+      else
+        header_or_index.is_a?(Range) ? pair.map(&:last) : pair.last
+      end
+    end
+    alias_method :[], :field
+
+    #
+    # :call-seq:
+    #   fetch(header)
+    #   fetch(header, default)
+    #   fetch(header) {|row| ... }
+    #
+    # Returns the field value as specified by +header+.
+    #
+    # ---
+    #
+    # With the single argument +header+, returns the field value
+    # for that header (first found):
+    #   source = "Name,Name,Name\nFoo,Bar,Baz\n"
+    #   table = CSV.parse(source, headers: true)
+    #   row = table[0]
+    #   row.fetch('Name') # => "Foo"
+    #
+    # Raises exception +KeyError+ if the header does not exist.
+    #
+    # ---
+    #
+    # With arguments +header+ and +default+ given,
+    # returns the field value for the header (first found)
+    # if the header exists, otherwise returns +default+:
+    #   source = "Name,Name,Name\nFoo,Bar,Baz\n"
+    #   table = CSV.parse(source, headers: true)
+    #   row = table[0]
+    #   row.fetch('Name', '') # => "Foo"
+    #   row.fetch(:nosuch, '') # => ""
+    #
+    # ---
+    #
+    # With argument +header+ and a block given,
+    # returns the field value for the header (first found)
+    # if the header exists; otherwise calls the block
+    # and returns its return value:
+    #   source = "Name,Name,Name\nFoo,Bar,Baz\n"
+    #   table = CSV.parse(source, headers: true)
+    #   row = table[0]
+    #   row.fetch('Name') {|header| fail 'Cannot happen' } # => "Foo"
+    #   row.fetch(:nosuch) {|header| "Header '#{header} not found'" } # => "Header 'nosuch not found'"
+    def fetch(header, *varargs)
+      raise ArgumentError, "Too many arguments" if varargs.length > 1
+      pair = @row.assoc(header)
+      if pair
+        pair.last
+      else
+        if block_given?
+          yield header
+        elsif varargs.empty?
+          raise KeyError, "key not found: #{header}"
+        else
+          varargs.first
+        end
+      end
+    end
+
+    # :call-seq:
+    #   row.has_key?(header)
+    #
+    # Returns +true+ if there is a field with the given +header+,
+    # +false+ otherwise.
+    def has_key?(header)
+      !!@row.assoc(header)
+    end
+    alias_method :include?, :has_key?
+    alias_method :key?,     :has_key?
+    alias_method :member?,  :has_key?
+    alias_method :header?,  :has_key?
+
+    #
+    # :call-seq:
+    #   row[index] = value -> value
+    #   row[header, offset] = value -> value
+    #   row[header] = value -> value
+    #
+    # Assigns the field value for the given +index+ or +header+;
+    # returns +value+.
+    #
+    # ---
+    #
+    # Assign field value by \Integer index:
+    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
+    #   table = CSV.parse(source, headers: true)
+    #   row = table[0]
+    #   row[0] = 'Bat'
+    #   row[1] = 3
+    #   row # => #<CSV::Row "Name":"Bat" "Value":3>
+    #
+    # Counts backward from the last column if +index+ is negative:
+    #   row[-1] = 4
+    #   row[-2] = 'Bam'
+    #   row # => #<CSV::Row "Name":"Bam" "Value":4>
+    #
+    # Extends the row with <tt>nil:nil</tt> if positive +index+ is not in the row:
+    #   row[4] = 5
+    #   row # => #<CSV::Row "Name":"bad" "Value":4 nil:nil nil:nil nil:5>
+    #
+    # Raises IndexError if negative +index+ is too small (too far from zero).
+    #
+    # ---
+    #
+    # Assign field value by header (first found):
+    #   source = "Name,Name,Name\nFoo,Bar,Baz\n"
+    #   table = CSV.parse(source, headers: true)
+    #   row = table[0]
+    #   row['Name'] = 'Bat'
+    #   row # => #<CSV::Row "Name":"Bat" "Name":"Bar" "Name":"Baz">
+    #
+    # Assign field value by header, ignoring +offset+ leading fields:
+    #   source = "Name,Name,Name\nFoo,Bar,Baz\n"
+    #   table = CSV.parse(source, headers: true)
+    #   row = table[0]
+    #   row['Name', 2] = 4
+    #   row # => #<CSV::Row "Name":"Foo" "Name":"Bar" "Name":4>
+    #
+    # Append new field by (new) header:
+    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
+    #   table = CSV.parse(source, headers: true)
+    #   row = table[0]
+    #   row['New'] = 6
+    #   row# => #<CSV::Row "Name":"foo" "Value":"0" "New":6>
+    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
+      end
+    end
+
+    #
+    # :call-seq:
+    #   row << [header, value] -> self
+    #   row << hash -> self
+    #   row << value -> self
+    #
+    # Adds a field to +self+; returns +self+:
+    #
+    # If the argument is a 2-element \Array <tt>[header, value]</tt>,
+    # a field is added with the given +header+ and +value+:
+    #   source = "Name,Name,Name\nFoo,Bar,Baz\n"
+    #   table = CSV.parse(source, headers: true)
+    #   row = table[0]
+    #   row << ['NAME', 'Bat']
+    #   row # => #<CSV::Row "Name":"Foo" "Name":"Bar" "Name":"Baz" "NAME":"Bat">
+    #
+    # If the argument is a \Hash, each <tt>key-value</tt> pair is added
+    # as a field with header +key+ and value +value+.
+    #   source = "Name,Name,Name\nFoo,Bar,Baz\n"
+    #   table = CSV.parse(source, headers: true)
+    #   row = table[0]
+    #   row << {NAME: 'Bat', name: 'Bam'}
+    #   row # => #<CSV::Row "Name":"Foo" "Name":"Bar" "Name":"Baz" NAME:"Bat" name:"Bam">
+    #
+    # Otherwise, the given +value+ is added as a field with no header.
+    #   source = "Name,Name,Name\nFoo,Bar,Baz\n"
+    #   table = CSV.parse(source, headers: true)
+    #   row = table[0]
+    #   row << 'Bag'
+    #   row # => #<CSV::Row "Name":"Foo" "Name":"Bar" "Name":"Baz" nil:"Bag">
+    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
+
+    # :call-seq:
+    #   row.push(*values) ->self
+    #
+    # Appends each of the given +values+ to +self+ as a field; returns +self+:
+    #   source = "Name,Name,Name\nFoo,Bar,Baz\n"
+    #   table = CSV.parse(source, headers: true)
+    #   row = table[0]
+    #   row.push('Bat', 'Bam')
+    #   row # => #<CSV::Row "Name":"Foo" "Name":"Bar" "Name":"Baz" nil:"Bat" nil:"Bam">
+    def push(*args)
+      args.each { |arg| self << arg }
+
+      self  # for chaining
+    end
+
+    #
+    # :call-seq:
+    #   delete(index) -> [header, value] or nil
+    #   delete(header) -> [header, value] or empty_array
+    #   delete(header, offset) -> [header, value] or empty_array
+    #
+    # Removes a specified field from +self+; returns the 2-element \Array
+    # <tt>[header, value]</tt> if the field exists.
+    #
+    # If an \Integer argument +index+ is given,
+    # removes and returns the field at offset +index+,
+    # or returns +nil+ if the field does not exist:
+    #   source = "Name,Name,Name\nFoo,Bar,Baz\n"
+    #   table = CSV.parse(source, headers: true)
+    #   row = table[0]
+    #   row.delete(1) # => ["Name", "Bar"]
+    #   row.delete(50) # => nil
+    #
+    # Otherwise, if the single argument +header+ is given,
+    # removes and returns the first-found field with the given header,
+    # of returns a new empty \Array if the field does not exist:
+    #   source = "Name,Name,Name\nFoo,Bar,Baz\n"
+    #   table = CSV.parse(source, headers: true)
+    #   row = table[0]
+    #   row.delete('Name') # => ["Name", "Foo"]
+    #   row.delete('NAME') # => []
+    #
+    # If argument +header+ and \Integer argument +offset+ are given,
+    # removes and returns the first-found field with the given header
+    # whose +index+ is at least as large as +offset+:
+    #   source = "Name,Name,Name\nFoo,Bar,Baz\n"
+    #   table = CSV.parse(source, headers: true)
+    #   row = table[0]
+    #   row.delete('Name', 1) # => ["Name", "Bar"]
+    #   row.delete('NAME', 1) # => []
+    def delete(header_or_index, minimum_index = 0)
+      if header_or_index.is_a? Integer                 # by index
+        @row.delete_at(header_or_index)
+      elsif i = index(header_or_index, minimum_index)  # by header
+        @row.delete_at(i)
+      else
+        [ ]
+      end
+    end
+
+    # :call-seq:
+    #   row.delete_if {|header, value| ... } -> self
+    #
+    # Removes fields from +self+ as selected by the block; returns +self+.
+    #
+    # Removes each field for which the block returns a truthy value:
+    #   source = "Name,Name,Name\nFoo,Bar,Baz\n"
+    #   table = CSV.parse(source, headers: true)
+    #   row = table[0]
+    #   row.delete_if {|header, value| value.start_with?('B') } # => true
+    #   row # => #<CSV::Row "Name":"Foo">
+    #   row.delete_if {|header, value| header.start_with?('B') } # => false
+    #
+    # If no block is given, returns a new Enumerator:
+    #   row.delete_if # => #<Enumerator: #<CSV::Row "Name":"Foo">:delete_if>
+    def delete_if(&block)
+      return enum_for(__method__) { size } unless block_given?
+
+      @row.delete_if(&block)
+
+      self  # for chaining
+    end
+
+    # :call-seq:
+    #   self.fields(*specifiers)
+    #
+    # Returns field values per the given +specifiers+, which may be any mixture of:
+    # - \Integer index.
+    # - \Range of \Integer indexes.
+    # - 2-element \Array containing a header and offset.
+    # - Header.
+    # - \Range of headers.
+    #
+    # For +specifier+ in one of the first four cases above,
+    # returns the result of <tt>self.field(specifier)</tt>;  see #field.
+    #
+    # Although there may be any number of +specifiers+,
+    # the examples here will illustrate one at a time.
+    #
+    # When the specifier is an \Integer +index+,
+    # returns <tt>self.field(index)</tt>L
+    #   source = "Name,Name,Name\nFoo,Bar,Baz\n"
+    #   table = CSV.parse(source, headers: true)
+    #   row = table[0]
+    #   row.fields(1) # => ["Bar"]
+    #
+    # When the specifier is a \Range of \Integers +range+,
+    # returns <tt>self.field(range)</tt>:
+    #   row.fields(1..2) # => ["Bar", "Baz"]
+    #
+    # When the specifier is a 2-element \Array +array+,
+    # returns <tt>self.field(array)</tt>L
+    #   row.fields('Name', 1) # => ["Foo", "Bar"]
+    #
+    # When the specifier is a header +header+,
+    # returns <tt>self.field(header)</tt>L
+    #   row.fields('Name') # => ["Foo"]
+    #
+    # When the specifier is a \Range of headers +range+,
+    # forms a new \Range +new_range+ from the indexes of
+    # <tt>range.start</tt> and <tt>range.end</tt>,
+    # and returns <tt>self.field(new_range)</tt>:
+    #   source = "Name,NAME,name\nFoo,Bar,Baz\n"
+    #   table = CSV.parse(source, headers: true)
+    #   row = table[0]
+    #   row.fields('Name'..'NAME') # => ["Foo", "Bar"]
+    #
+    # Returns all fields if no argument given:
+    #   row.fields # => ["Foo", "Bar", "Baz"]
+    def fields(*headers_and_or_indices)
+      if headers_and_or_indices.empty?  # return all fields--no arguments
+        @row.map(&:last)
+      else                              # or work like values_at()
+        all = []
+        headers_and_or_indices.each do |h_or_i|
+          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)
+            all.concat(fields.values_at(new_range))
+          else
+            all << field(*Array(h_or_i))
+          end
+        end
+        return all
+      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 +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). This method returns the row for chaining.
+    #
+    # If no block is given, an Enumerator is returned.
+    #
+    # Support for Enumerable.
+    #
+    def each(&block)
+      return enum_for(__method__) { size } unless block_given?
+
+      @row.each(&block)
+
+      self  # for chaining
+    end
+
+    alias_method :each_pair, :each
+
+    #
+    # Returns +true+ if this row contains the same headers and fields in the
+    # same order as +other+.
+    #
+    def ==(other)
+      return @row == other.row if other.is_a? CSV::Row
+      @row == other
+    end
+
+    # :call-seq:
+    #   row.to_h -> hash
+    #
+    # Returns the new \Hash formed by adding each header-value pair in +self+
+    # as a key-value pair in the \Hash.
+    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
+    #   table = CSV.parse(source, headers: true)
+    #   row = table[0]
+    #   row.to_h # => {"Name"=>"foo", "Value"=>"0"}
+    #
+    # Header order is preserved, but repeated headers are ignored:
+    #   source = "Name,Name,Name\nFoo,Bar,Baz\n"
+    #   table = CSV.parse(source, headers: true)
+    #   row = table[0]
+    #   row.to_h # => {"Name"=>"Foo"}
+    def to_h
+      hash = {}
+      each do |key, _value|
+        hash[key] = self[key] unless hash.key?(key)
+      end
+      hash
+    end
+    alias_method :to_hash, :to_h
+
+    alias_method :to_ary, :to_a
+
+    # :call-seq:
+    #   row.to_csv -> csv_string
+    #
+    # Returns the row as a \CSV String. Headers are not included:
+    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
+    #   table = CSV.parse(source, headers: true)
+    #   row = table[0]
+    #   row.to_csv # => "foo,0\n"
+    def to_csv(**options)
+      fields.to_csv(**options)
+    end
+    alias_method :to_s, :to_csv
+
+    # :call-seq:
+    #   row.dig(index_or_header, *identifiers) -> object
+    #
+    # Finds and returns the object in nested object that is specified
+    # by +index_or_header+ and +specifiers+.
+    #
+    # The nested objects may be instances of various classes.
+    # See {Dig Methods}[https://docs.ruby-lang.org/en/master/doc/dig_methods_rdoc.html].
+    #
+    # Examples:
+    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
+    #   table = CSV.parse(source, headers: true)
+    #   row = table[0]
+    #   row.dig(1) # => "0"
+    #   row.dig('Value') # => "0"
+    #   row.dig(5) # => nil
+    def dig(index_or_header, *indexes)
+      value = field(index_or_header)
+      if value.nil?
+        nil
+      elsif indexes.empty?
+        value
+      else
+        unless value.respond_to?(:dig)
+          raise TypeError, "#{value.class} does not have \#dig method"
+        end
+        value.dig(*indexes)
+      end
+    end
+
+    # :call-seq:
+    #   row.inspect -> string
+    #
+    # Returns an ASCII-compatible \String showing:
+    # - Class \CSV::Row.
+    # - Header-value pairs.
+    # Example:
+    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
+    #   table = CSV.parse(source, headers: true)
+    #   row = table[0]
+    #   row.inspect # => "#<CSV::Row \"Name\":\"foo\" \"Value\":\"0\">"
+    def inspect
+      str = ["#<", self.class.to_s]
+      each do |header, field|
+        str << " " << (header.is_a?(Symbol) ? header.to_s : header.inspect) <<
+               ":" << field.inspect
+      end
+      str << ">"
+      begin
+        str.join('')
+      rescue  # any encoding error
+        str.map do |s|
+          e = Encoding::Converter.asciicompat_encoding(s.encoding)
+          e ? s.encode(e) : s.force_encoding("ASCII-8BIT")
+        end.join('')
+      end
+    end
+  end
+end
diff --git a/lib/csv/table.rb b/lib/csv/table.rb
new file mode 100644
index 0000000000..1ce0dd6daf
--- /dev/null
+++ b/lib/csv/table.rb
@@ -0,0 +1,621 @@
+# frozen_string_literal: true
+
+require "forwardable"
+
+class CSV
+  #
+  # 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
+    #
+    # Constructs 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.
+    #
+    # The optional +headers+ parameter can be set to Array of headers.
+    # If headers aren't set, headers are fetched from CSV::Row objects.
+    # Otherwise, headers() method will return headers being set in
+    # headers argument.
+    #
+    # A CSV::Table object supports the following Array methods through
+    # delegation:
+    #
+    # * empty?()
+    # * length()
+    # * size()
+    #
+    def initialize(array_of_rows, headers: nil)
+      @table = array_of_rows
+      @headers = headers
+      unless @headers
+        if @table.empty?
+          @headers = []
+        else
+          @headers = @table.first.headers
+        end
+      end
+
+      @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 ###
+
+    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). The headers Array passed to CSV::Table.new is returned for
+    # empty tables.
+    #
+    def headers
+      if @table.empty?
+        @headers.dup
+      else
+        @table.first.headers
+      end
+    end
+
+    # :call-seq:
+    #   table[n] -> row
+    #   table[range] -> array_of_rows
+    #   table[header] -> array_of_fields
+    #
+    # Returns data from the table;  does not modify the table.
+    #
+    # ---
+    #
+    # The expression <tt>table[n]</tt>, where +n+ is a non-negative \Integer,
+    # returns the +n+th row of the table, if that row exists,
+    # and if the access mode is <tt>:row</tt> or <tt>:col_or_row</tt>:
+    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
+    #   table = CSV.parse(source, headers: true)
+    #   table.by_row! # => #<CSV::Table mode:row row_count:4>
+    #   table[1] # => #<CSV::Row "Name":"bar" "Value":"1">
+    #   table.by_col_or_row! # => #<CSV::Table mode:col_or_row row_count:4>
+    #   table[1] # => #<CSV::Row "Name":"bar" "Value":"1">
+    #
+    # Counts backward from the last row if +n+ is negative:
+    #   table[-1] # => #<CSV::Row "Name":"baz" "Value":"2">
+    #
+    # Returns +nil+ if +n+ is too large or too small:
+    #   table[4] # => nil
+    #   table[-4] => nil
+    #
+    # Raises an exception if the access mode is <tt>:row</tt>
+    # and +n+ is not an
+    # {Integer-convertible object}[https://docs.ruby-lang.org/en/master/implicit_conversion_rdoc.html#label-Integer-Convertible+Objects].
+    #   table.by_row! # => #<CSV::Table mode:row row_count:4>
+    #   # Raises TypeError (no implicit conversion of String into Integer):
+    #   table['Name']
+    #
+    # ---
+    #
+    # The expression <tt>table[range]</tt>, where +range+ is a Range object,
+    # returns rows from the table, beginning at row <tt>range.first</tt>,
+    # if those rows exist, and if the access mode is <tt>:row</tt> or <tt>:col_or_row</tt>:
+    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
+    #   table = CSV.parse(source, headers: true)
+    #   table.by_row! # => #<CSV::Table mode:row row_count:4>
+    #   rows = table[1..2] # => #<CSV::Row "Name":"bar" "Value":"1">
+    #   rows # => [#<CSV::Row "Name":"bar" "Value":"1">, #<CSV::Row "Name":"baz" "Value":"2">]
+    #   table.by_col_or_row! # => #<CSV::Table mode:col_or_row row_count:4>
+    #   rows = table[1..2] # => #<CSV::Row "Name":"bar" "Value":"1">
+    #   rows # => [#<CSV::Row "Name":"bar" "Value":"1">, #<CSV::Row "Name":"baz" "Value":"2">]
+    #
+    # If there are too few rows, returns all from <tt>range.first</tt> to the end:
+    #   rows = table[1..50] # => #<CSV::Row "Name":"bar" "Value":"1">
+    #   rows # => [#<CSV::Row "Name":"bar" "Value":"1">, #<CSV::Row "Name":"baz" "Value":"2">]
+    #
+    # Special case:  if <tt>range.start == table.size</tt>, returns an empty \Array:
+    #   table[table.size..50] # => []
+    #
+    # If <tt>range.end</tt> is negative, calculates the ending index from the end:
+    #   rows = table[0..-1]
+    #   rows # => [#<CSV::Row "Name":"foo" "Value":"0">, #<CSV::Row "Name":"bar" "Value":"1">, #<CSV::Row "Name":"baz" "Value":"2">]
+    #
+    # If <tt>range.start</tt> is negative, calculates the starting index from the end:
+    #   rows = table[-1..2]
+    #   rows # => [#<CSV::Row "Name":"baz" "Value":"2">]
+    #
+    # If <tt>range.start</tt> is larger than <tt>table.size</tt>, returns +nil+:
+    #   table[4..4] # => nil
+    #
+    # ---
+    #
+    # The expression <tt>table[header]</tt>, where +header+ is a \String,
+    # returns column values (\Array of \Strings) if the column exists
+    # and if the access mode is <tt>:col</tt> or <tt>:col_or_row</tt>:
+    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
+    #   table = CSV.parse(source, headers: true)
+    #   table.by_col! # => #<CSV::Table mode:col row_count:4>
+    #   table['Name'] # => ["foo", "bar", "baz"]
+    #   table.by_col_or_row! # => #<CSV::Table mode:col_or_row row_count:4>
+    #   col = table['Name']
+    #   col # => ["foo", "bar", "baz"]
+    #
+    # Modifying the returned column values does not modify the table:
+    #   col[0] = 'bat'
+    #   col # => ["bat", "bar", "baz"]
+    #   table['Name'] # => ["foo", "bar", "baz"]
+    #
+    # Returns an \Array of +nil+ values if there is no such column:
+    #   table['Nosuch'] # => [nil, nil, nil]
+    def [](index_or_header)
+      if @mode == :row or  # by index
+         (@mode == :col_or_row and (index_or_header.is_a?(Integer) or index_or_header.is_a?(Range)))
+        @table[index_or_header]
+      else                 # by header
+        @table.map { |row| row[index_or_header] }
+      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
+        end
+      else                 # set column
+        unless index_or_header.is_a? Integer
+          index = @headers.index(index_or_header) || @headers.size
+          @headers[index] = index_or_header
+        end
+        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]
+            end
+          end
+        else                  # repeated value
+          @table.each do |row|
+            if row.header_row?
+              row[index_or_header] = index_or_header
+            else
+              row[index_or_header] = value
+            end
+          end
+        end
+      end
+    end
+
+    # :call-seq:
+    #   table.values_at(*indexes) -> array_of_rows
+    #   table.values_at(*headers) -> array_of_columns_data
+    #
+    # If the access mode is <tt>:row</tt> or <tt>:col_or_row</tt>,
+    # and each argument is either an \Integer or a \Range,
+    # returns rows.
+    # Otherwise, returns columns data.
+    #
+    # In either case, the returned values are in the order
+    # specified by the arguments.  Arguments may be repeated.
+    #
+    # ---
+    #
+    # Returns rows as an \Array of \CSV::Row objects.
+    #
+    # No argument:
+    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
+    #   table = CSV.parse(source, headers: true)
+    #   table.values_at # => []
+    #
+    # One index:
+    #   values = table.values_at(0)
+    #   values # => [#<CSV::Row "Name":"foo" "Value":"0">]
+    #
+    # Two indexes:
+    #   values = table.values_at(2, 0)
+    #   values # => [#<CSV::Row "Name":"baz" "Value":"2">, #<CSV::Row "Name":"foo" "Value":"0">]
+    #
+    # One \Range:
+    #   values = table.values_at(1..2)
+    #   values # => [#<CSV::Row "Name":"bar" "Value":"1">, #<CSV::Row "Name":"baz" "Value":"2">]
+    #
+    # \Ranges and indexes:
+    #   values = table.values_at(0..1, 1..2, 0, 2)
+    #   pp values
+    # Output:
+    #   [#<CSV::Row "Name":"foo" "Value":"0">,
+    #    #<CSV::Row "Name":"bar" "Value":"1">,
+    #    #<CSV::Row "Name":"bar" "Value":"1">,
+    #    #<CSV::Row "Name":"baz" "Value":"2">,
+    #    #<CSV::Row "Name":"foo" "Value":"0">,
+    #    #<CSV::Row "Name":"baz" "Value":"2">]
+    #
+    # ---
+    #
+    # Returns columns data as row Arrays,
+    # each consisting of the specified columns data for that row:
+    #   values = table.values_at('Name')
+    #   values # => [["foo"], ["bar"], ["baz"]]
+    #   values = table.values_at('Value', 'Name')
+    #   values # => [["0", "foo"], ["1", "bar"], ["2", "baz"]]
+    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
+
+    # :call-seq:
+    #   table << row_or_array -> self
+    #
+    # If +row_or_array+ is a \CSV::Row object,
+    # it is appended to the table:
+    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
+    #   table = CSV.parse(source, headers: true)
+    #   table << CSV::Row.new(table.headers, ['bat', 3])
+    #   table[3] # => #<CSV::Row "Name":"bat" "Value":3>
+    #
+    # If +row_or_array+ is an \Array, it is used to create a new
+    # \CSV::Row object which is then appended to the table:
+    #   table << ['bam', 4]
+    #   table[4] # => #<CSV::Row "Name":"bam" "Value":4>
+    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
+
+    #
+    # :call-seq:
+    #   table.push(*rows_or_arrays) -> self
+    #
+    # A shortcut for appending multiple rows. Equivalent to:
+    #   rows.each {|row| self << row }
+    #
+    # Each argument may be either a \CSV::Row object or an \Array:
+    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
+    #   table = CSV.parse(source, headers: true)
+    #   rows = [
+    #     CSV::Row.new(table.headers, ['bat', 3]),
+    #     ['bam', 4]
+    #   ]
+    #   table.push(*rows)
+    #   table[3..4] # => [#<CSV::Row "Name":"bat" "Value":3>, #<CSV::Row "Name":"bam" "Value":4>]
+    def push(*rows)
+      rows.each { |row| self << row }
+
+      self # for chaining
+    end
+
+    # :call-seq:
+    #   table.delete(*indexes) -> deleted_values
+    #   table.delete(*headers) -> deleted_values
+    #
+    # If the access mode is <tt>:row</tt> or <tt>:col_or_row</tt>,
+    # and each argument is either an \Integer or a \Range,
+    # returns deleted rows.
+    # Otherwise, returns deleted columns data.
+    #
+    # In either case, the returned values are in the order
+    # specified by the arguments.  Arguments may be repeated.
+    #
+    # ---
+    #
+    # Returns rows as an \Array of \CSV::Row objects.
+    #
+    # One index:
+    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
+    #   table = CSV.parse(source, headers: true)
+    #   deleted_values = table.delete(0)
+    #   deleted_values # => [#<CSV::Row "Name":"foo" "Value":"0">]
+    #
+    # Two indexes:
+    #   table = CSV.parse(source, headers: true)
+    #   deleted_values = table.delete(2, 0)
+    #   deleted_values # => [#<CSV::Row "Name":"baz" "Value":"2">, #<CSV::Row "Name":"foo" "Value":"0">]
+    #
+    # ---
+    #
+    # Returns columns data as column Arrays.
+    #
+    # One header:
+    #   table = CSV.parse(source, headers: true)
+    #   deleted_values = table.delete('Name')
+    #   deleted_values # => ["foo", "bar", "baz"]
+    #
+    # Two headers:
+    #   table = CSV.parse(source, headers: true)
+    #   deleted_values = table.delete('Value', 'Name')
+    #   deleted_values # => [["0", "1", "2"], ["foo", "bar", "baz"]]
+    def delete(*indexes_or_headers)
+      if indexes_or_headers.empty?
+        raise ArgumentError, "wrong number of arguments (given 0, expected 1+)"
+      end
+      deleted_values = indexes_or_headers.map do |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
+          if index_or_header.is_a? Integer
+            @headers.delete_at(index_or_header)
+          else
+            @headers.delete(index_or_header)
+          end
+          @table.map { |row| row.delete(index_or_header).last }
+        end
+      end
+      if indexes_or_headers.size == 1
+        deleted_values[0]
+      else
+        deleted_values
+      end
+    end
+
+    # Removes rows or columns for which the block returns a truthy value;
+    # returns +self+.
+    #
+    # Removes rows when the access mode is <tt>:row</tt> or <tt>:col_or_row</tt>;
+    # calls the block with each \CSV::Row object:
+    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
+    #   table = CSV.parse(source, headers: true)
+    #   table.by_row! # => #<CSV::Table mode:row row_count:4>
+    #   table.size # => 3
+    #   table.delete_if {|row| row['Name'].start_with?('b') }
+    #   table.size # => 1
+    #
+    # Removes columns when the access mode is <tt>:col</tt>;
+    # calls the block with each column as a 2-element array
+    # containing the header and an \Array of column fields:
+    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
+    #   table = CSV.parse(source, headers: true)
+    #   table.by_col! # => #<CSV::Table mode:col row_count:4>
+    #   table.headers.size # => 2
+    #   table.delete_if {|column_data| column_data[1].include?('2') }
+    #   table.headers.size # => 1
+    #
+    # Returns a new \Enumerator if no block is given:
+    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
+    #   table = CSV.parse(source, headers: true)
+    #   table.delete_if # => #<Enumerator: #<CSV::Table mode:col_or_row row_count:4>:delete_if>
+    def delete_if(&block)
+      return enum_for(__method__) { @mode == :row or @mode == :col_or_row ? size : headers.size } unless block_given?
+
+      if @mode == :row or @mode == :col_or_row  # by index
+        @table.delete_if(&block)
+      else                                      # by header
+        deleted = []
+        headers.each do |header|
+          deleted << delete(header) if yield([header, self[header]])
+        end
+      end
+
+      self # for chaining
+    end
+
+    include Enumerable
+
+    # Calls the block with each row or column; returns +self+.
+    #
+    # When the access mode is <tt>:row</tt> or <tt>:col_or_row</tt>,
+    # calls the block with each \CSV::Row object:
+    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
+    #   table = CSV.parse(source, headers: true)
+    #   table.by_row! # => #<CSV::Table mode:row row_count:4>
+    #   table.each {|row| p row }
+    # Output:
+    #   #<CSV::Row "Name":"foo" "Value":"0">
+    #   #<CSV::Row "Name":"bar" "Value":"1">
+    #   #<CSV::Row "Name":"baz" "Value":"2">
+    #
+    # When the access mode is <tt>:col</tt>,
+    # calls the block with each column as a 2-element array
+    # containing the header and an \Array of column fields:
+    #   table.by_col! # => #<CSV::Table mode:col row_count:4>
+    #   table.each {|column_data| p column_data }
+    # Output:
+    #   ["Name", ["foo", "bar", "baz"]]
+    #   ["Value", ["0", "1", "2"]]
+    #
+    # Returns a new \Enumerator if no block is given:
+    #   table.each # => #<Enumerator: #<CSV::Table mode:col row_count:4>:each>
+    def each(&block)
+      return enum_for(__method__) { @mode == :col ? headers.size : size } unless block_given?
+
+      if @mode == :col
+        headers.each { |header| yield([header, self[header]]) }
+      else
+        @table.each(&block)
+      end
+
+      self # for chaining
+    end
+
+    # Returns +true+ if all each row of +self+ <tt>==</tt>
+    # the corresponding row of +other_table+, otherwise, +false+.
+    #
+    # The access mode does no affect the result.
+    #
+    # Equal tables:
+    #   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
+    #   table = CSV.parse(source, headers: true)
+    #   other_table = CSV.parse(source, headers: true)
+    #   table == other_table # => true
+    #
+    # Different row count:
+    #   other_table.delete(2)
+    #   table == other_table # => false
+    #
+    # Different last row:
+    #   other_table << ['bat', 3]
+    #   table == other_table # => false
+    def ==(other)
+      return @table == other.table if other.is_a? CSV::Table
+      @table == other
+    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
+      array = [headers]
+      @table.each do |row|
+        array.push(row.fields) unless row.header_row?
+      end
+
+      array
+    end
+
+    #
+    # Returns the table as a complete CSV String. Headers will be listed first,
+    # then all of the field rows.
+    #
+    # This method assumes you want the Table.headers(), unless you explicitly
+    # pass <tt>:write_headers => false</tt>.
+    #
+    def to_csv(write_headers: true, **options)
+      array = write_headers ? [headers.to_csv(**options)] : []
+      @table.each do |row|
+        array.push(row.fields.to_csv(**options)) unless row.header_row?
+      end
+
+      array.join("")
+    end
+    alias_method :to_s, :to_csv
+
+    #
+    # Extracts the nested value specified by the sequence of +index+ or +header+ objects by calling dig at each step,
+    # returning nil if any intermediate step is nil.
+    #
+    def dig(index_or_header, *index_or_headers)
+      value = self[index_or_header]
+      if value.nil?
+        nil
+      elsif index_or_headers.empty?
+        value
+      else
+        unless value.respond_to?(:dig)
+          raise TypeError, "#{value.class} does not have \#dig method"
+        end
+        value.dig(*index_or_headers)
+      end
+    end
+
+    # Shows the mode and size of this table in a US-ASCII String.
+    def inspect
+      "#<#{self.class} mode:#{@mode} row_count:#{to_a.size}>".encode("US-ASCII")
+    end
+  end
+end
diff --git a/lib/csv/version.rb b/lib/csv/version.rb
new file mode 100644
index 0000000000..51dc8433f3
--- /dev/null
+++ b/lib/csv/version.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+class CSV
+  # The version of the installed library.
+  VERSION = "3.1.9"
+end
diff --git a/lib/csv/writer.rb b/lib/csv/writer.rb
new file mode 100644
index 0000000000..d49115fccf
--- /dev/null
+++ b/lib/csv/writer.rb
@@ -0,0 +1,209 @@
+# frozen_string_literal: true
+
+require_relative "match_p"
+require_relative "row"
+
+using CSV::MatchP if CSV.const_defined?(:MatchP)
+
+class CSV
+  # Note: Don't use this class directly. This is an internal class.
+  class Writer
+    #
+    # A CSV::Writer receives an output, prepares the header, format and output.
+    # It allows us to write new rows in the object and rewind it.
+    #
+    attr_reader :lineno
+    attr_reader :headers
+
+    def initialize(output, options)
+      @output = output
+      @options = options
+      @lineno = 0
+      @fields_converter = nil
+      prepare
+      if @options[:write_headers] and @headers
+        self << @headers
+      end
+      @fields_converter = @options[:fields_converter]
+    end
+
+    #
+    # Adds a new row
+    #
+    def <<(row)
+      case row
+      when Row
+        row = row.fields
+      when Hash
+        row = @headers.collect {|header| row[header]}
+      end
+
+      @headers ||= row if @use_headers
+      @lineno += 1
+
+      row = @fields_converter.convert(row, nil, lineno) if @fields_converter
+
+      i = -1
+      converted_row = row.collect do |field|
+        i += 1
+        quote(field, i)
+      end
+      line = converted_row.join(@column_separator) + @row_separator
+      if @output_encoding
+        line = line.encode(@output_encoding)
+      end
+      @output << line
+
+      self
+    end
+
+    #
+    # Winds back to the beginning
+    #
+    def rewind
+      @lineno = 0
+      @headers = nil if @options[:headers].nil?
+    end
+
+    private
+    def prepare
+      @encoding = @options[:encoding]
+
+      prepare_header
+      prepare_format
+      prepare_output
+    end
+
+    def prepare_header
+      headers = @options[:headers]
+      case headers
+      when Array
+        @headers = headers
+        @use_headers = true
+      when String
+        @headers = CSV.parse_line(headers,
+                                  col_sep: @options[:column_separator],
+                                  row_sep: @options[:row_separator],
+                                  quote_char: @options[:quote_character])
+        @use_headers = true
+      when true
+        @headers = nil
+        @use_headers = true
+      else
+        @headers = nil
+        @use_headers = false
+      end
+      return unless @headers
+
+      converter = @options[:header_fields_converter]
+      @headers = converter.convert(@headers, nil, 0)
+      @headers.each do |header|
+        header.freeze if header.is_a?(String)
+      end
+    end
+
+    def prepare_force_quotes_fields(force_quotes)
+      @force_quotes_fields = {}
+      force_quotes.each do |name_or_index|
+        case name_or_index
+        when Integer
+          index = name_or_index
+          @force_quotes_fields[index] = true
+        when String, Symbol
+          name = name_or_index.to_s
+          if @headers.nil?
+            message = ":headers is required when you use field name " +
+                      "in :force_quotes: " +
+                      "#{name_or_index.inspect}: #{force_quotes.inspect}"
+            raise ArgumentError, message
+          end
+          index = @headers.index(name)
+          next if index.nil?
+          @force_quotes_fields[index] = true
+        else
+          message = ":force_quotes element must be " +
+                    "field index or field name: " +
+                    "#{name_or_index.inspect}: #{force_quotes.inspect}"
+          raise ArgumentError, message
+        end
+      end
+    end
+
+    def prepare_format
+      @column_separator = @options[:column_separator].to_s.encode(@encoding)
+      row_separator = @options[:row_separator]
+      if row_separator == :auto
+        @row_separator = $INPUT_RECORD_SEPARATOR.encode(@encoding)
+      else
+        @row_separator = row_separator.to_s.encode(@encoding)
+      end
+      @quote_character = @options[:quote_character]
+      force_quotes = @options[:force_quotes]
+      if force_quotes.is_a?(Array)
+        prepare_force_quotes_fields(force_quotes)
+        @force_quotes = false
+      elsif force_quotes
+        @force_quotes_fields = nil
+        @force_quotes = true
+      else
+        @force_quotes_fields = nil
+        @force_quotes = false
+      end
+      unless @force_quotes
+        @quotable_pattern =
+          Regexp.new("[\r\n".encode(@encoding) +
+                     Regexp.escape(@column_separator) +
+                     Regexp.escape(@quote_character.encode(@encoding)) +
+                     "]".encode(@encoding))
+      end
+      @quote_empty = @options.fetch(:quote_empty, true)
+    end
+
+    def prepare_output
+      @output_encoding = nil
+      return unless @output.is_a?(StringIO)
+
+      output_encoding = @output.internal_encoding || @output.external_encoding
+      if @encoding != output_encoding
+        if @options[:force_encoding]
+          @output_encoding = output_encoding
+        else
+          compatible_encoding = Encoding.compatible?(@encoding, output_encoding)
+          if compatible_encoding
+            @output.set_encoding(compatible_encoding)
+            @output.seek(0, IO::SEEK_END)
+          end
+        end
+      end
+    end
+
+    def quote_field(field)
+      field = String(field)
+      encoded_quote_character = @quote_character.encode(field.encoding)
+      encoded_quote_character +
+        field.gsub(encoded_quote_character,
+                   encoded_quote_character * 2) +
+        encoded_quote_character
+    end
+
+    def quote(field, i)
+      if @force_quotes
+        quote_field(field)
+      elsif @force_quotes_fields and @force_quotes_fields[i]
+        quote_field(field)
+      else
+        if field.nil?  # represent +nil+ fields as empty unquoted fields
+          ""
+        else
+          field = String(field)  # Stringify fields
+          # represent empty fields as empty quoted fields
+          if (@quote_empty and field.empty?) or (field.valid_encoding? and @quotable_pattern.match?(field))
+            quote_field(field)
+          else
+            field  # unquoted field
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/debug.gemspec b/lib/debug.gemspec
new file mode 100644
index 0000000000..0c414d4827
--- /dev/null
+++ b/lib/debug.gemspec
@@ -0,0 +1,22 @@
+Gem::Specification.new do |spec|
+  spec.name          = "debug"
+  spec.version       = "0.2.1"
+  spec.authors       = ["Yukihiro Matsumoto"]
+  spec.email         = ["matz@ruby-lang.org"]
+
+  spec.summary       = %q{Debugging functionality for Ruby}
+  spec.description   = %q{Debugging functionality for Ruby}
+  spec.homepage      = "https://github.com/ruby/debug"
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.licenses      = ["Ruby", "BSD-2-Clause"]
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir        = "exe"
+  spec.executables   = []
+  spec.require_paths = ["lib"]
+end
diff --git a/lib/debug.rb b/lib/debug.rb
index 5d754d8ebb..bf63ccf34d 100644
--- a/lib/debug.rb
+++ b/lib/debug.rb
@@ -1,10 +1,8 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 # Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
 # Copyright (C) 2000  Information-technology Promotion Agency, Japan
 # Copyright (C) 2000-2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
-require 'continuation'
-
 if $SAFE > 0
   STDERR.print "-r debug.rb is not available in safe mode\n"
   exit 1
@@ -182,7 +180,10 @@ SCRIPT_LINES__ = {} unless defined? SCRIPT_LINES__ # :nodoc:
 # Debug is not available in safe mode.
 
 class DEBUGGER__
-  MUTEX = Mutex.new # :nodoc:
+  MUTEX = Thread::Mutex.new # :nodoc:
+  CONTINUATIONS_SUPPORTED = RUBY_ENGINE == 'ruby'
+
+  require 'continuation' if CONTINUATIONS_SUPPORTED
 
   class Context # :nodoc:
     DEBUG_LAST_CMD = []
@@ -380,8 +381,10 @@ class DEBUGGER__
 
     def debug_command(file, line, id, binding)
       MUTEX.lock
-      unless defined?($debugger_restart) and $debugger_restart
-        callcc{|c| $debugger_restart = c}
+      if CONTINUATIONS_SUPPORTED
+        unless defined?($debugger_restart) and $debugger_restart
+          callcc{|c| $debugger_restart = c}
+        end
       end
       set_last_thread(Thread.current)
       frame_pos = 0
@@ -432,7 +435,7 @@ class DEBUGGER__
             pos = $2
             if $1
               klass = debug_silent_eval($1, binding)
-              file = $1
+              file = File.expand_path($1)
             end
             if pos =~ /^\d+$/
               pname = pos
@@ -653,7 +656,11 @@ class DEBUGGER__
             stdout.printf "%s\n", debug_eval($', binding).inspect
 
           when /^\s*r(?:estart)?$/
-            $debugger_restart.call
+            if CONTINUATIONS_SUPPORTED
+              $debugger_restart.call
+            else
+              stdout.print "Restart requires continuations.\n"
+            end
 
           when /^\s*h(?:elp)?$/
             debug_print_help()
@@ -1017,8 +1024,8 @@ EOHELP
     #
     #   (rdb:1) DEBUGGER__.thread_list_all
     #   +1 #<Thread:0x007fb2320c03f0 run> debug_me.rb.rb:3
-    #    2 #<Thread:0x007fb23218a538@debug_me.rb.rb:3 sleep>
-    #    3 #<Thread:0x007fb23218b0f0@debug_me.rb.rb:3 sleep>
+    #    2 #<Thread:0x007fb23218a538 debug_me.rb.rb:3 sleep>
+    #    3 #<Thread:0x007fb23218b0f0 debug_me.rb.rb:3 sleep>
     #   [1, 2, 3]
     #
     # Your current thread is indicated by a <b>+</b>
@@ -1027,8 +1034,8 @@ EOHELP
     #
     #   (rdb:1) th l
     #    +1 #<Thread:0x007f99328c0410 run>  debug_me.rb:3
-    #     2 #<Thread:0x007f9932938230@debug_me.rb:3 sleep> debug_me.rb:3
-    #     3 #<Thread:0x007f9932938e10@debug_me.rb:3 sleep> debug_me.rb:3
+    #     2 #<Thread:0x007f9932938230 debug_me.rb:3 sleep> debug_me.rb:3
+    #     3 #<Thread:0x007f9932938e10 debug_me.rb:3 sleep> debug_me.rb:3
     #
     # See DEBUGGER__ for more usage.
 
@@ -1102,9 +1109,11 @@ EOHELP
 
   stdout.printf "Debug.rb\n"
   stdout.printf "Emacs support available.\n\n"
-  RubyVM::InstructionSequence.compile_option = {
-    trace_instruction: true
-  }
+  if defined?(RubyVM::InstructionSequence)
+    RubyVM::InstructionSequence.compile_option = {
+      trace_instruction: true
+    }
+  end
   set_trace_func proc { |event, file, line, id, binding, klass, *rest|
     DEBUGGER__.context.trace_func event, file, line, id, binding, klass
   }
diff --git a/lib/delegate.rb b/lib/delegate.rb
index 4ce3c53cc9..a5ae605e9e 100644
--- a/lib/delegate.rb
+++ b/lib/delegate.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 # = delegate -- Support for the Delegation Pattern
 #
 # Documentation by James Edward Gray II and Gavin Sinclair
@@ -21,6 +21,8 @@
 # SimpleDelegator's implementation serves as a nice example of the use of
 # Delegator:
 #
+#   require 'delegate'
+#
 #   class SimpleDelegator < Delegator
 #     def __getobj__
 #       @delegate_sd_obj # return object we are delegating to, required
@@ -37,14 +39,16 @@
 # Be advised, RDoc will not detect delegated methods.
 #
 class Delegator < BasicObject
+  VERSION = "0.2.0"
+
   kernel = ::Kernel.dup
   kernel.class_eval do
     alias __raise__ raise
-    [:to_s,:inspect,:=~,:!~,:===,:<=>,:eql?,:hash].each do |m|
+    [:to_s, :inspect, :=~, :!~, :===, :<=>, :hash].each do |m|
       undef_method m
     end
     private_instance_methods.each do |m|
-      if /\Ablock_given\?\z|iterator\?\z|\A__.*__\z/ =~ m
+      if /\Ablock_given\?\z|\Aiterator\?\z|\A__.*__\z/ =~ m
         next
       end
       undef_method m
@@ -60,8 +64,8 @@ class Delegator < BasicObject
 
   ##
   # :method: raise
-  # Use __raise__ if your Delegator does not have a object to delegate the
-  # raise method call.
+  # Use #__raise__ if your Delegator does not have a object to delegate the
+  # #raise method call.
   #
 
   #
@@ -75,14 +79,14 @@ class Delegator < BasicObject
   #
   # Handles the magic of delegation through \_\_getobj\_\_.
   #
-  def method_missing(m, *args, &block)
+  ruby2_keywords def method_missing(m, *args, &block)
     r = true
     target = self.__getobj__ {r = false}
 
-    if r && target.respond_to?(m)
+    if r && target_respond_to?(target, m, false)
       target.__send__(m, *args, &block)
-    elsif ::Kernel.respond_to?(m, true)
-      ::Kernel.instance_method(m).bind(self).(*args, &block)
+    elsif ::Kernel.method_defined?(m) || ::Kernel.private_method_defined?(m)
+      ::Kernel.instance_method(m).bind_call(self, *args, &block)
     else
       super(m, *args, &block)
     end
@@ -95,14 +99,31 @@ class Delegator < BasicObject
   def respond_to_missing?(m, include_private)
     r = true
     target = self.__getobj__ {r = false}
-    r &&= target.respond_to?(m, include_private)
-    if r && include_private && !target.respond_to?(m, false)
-      warn "#{caller(3)[0]}: delegator does not forward private method \##{m}"
+    r &&= target_respond_to?(target, m, include_private)
+    if r && include_private && !target_respond_to?(target, m, false)
+      warn "delegator does not forward private method \##{m}", uplevel: 3
       return false
     end
     r
   end
 
+  KERNEL_RESPOND_TO = ::Kernel.instance_method(:respond_to?)
+  private_constant :KERNEL_RESPOND_TO
+
+  # Handle BasicObject instances
+  private def target_respond_to?(target, m, include_private)
+    case target
+    when Object
+      target.respond_to?(m, include_private)
+    else
+      if KERNEL_RESPOND_TO.bind_call(target, :respond_to?)
+        target.respond_to?(m, include_private)
+      else
+        KERNEL_RESPOND_TO.bind_call(target, m, include_private)
+      end
+    end
+  end
+
   #
   # Returns the methods available to this delegate object as the union
   # of this object's and \_\_getobj\_\_ methods.
@@ -146,6 +167,14 @@ class Delegator < BasicObject
   end
 
   #
+  # Returns true if two objects are considered of equal value.
+  #
+  def eql?(obj)
+    return true if obj.equal?(self)
+    obj.eql?(__getobj__)
+  end
+
+  #
   # Delegates ! to the \_\_getobj\_\_
   #
   def !
@@ -175,7 +204,7 @@ class Delegator < BasicObject
     ivars = instance_variables.reject {|var| /\A@delegate_/ =~ var}
     [
       :__v2__,
-      ivars, ivars.map{|var| instance_variable_get(var)},
+      ivars, ivars.map {|var| instance_variable_get(var)},
       __getobj__
     ]
   end
@@ -186,15 +215,15 @@ class Delegator < BasicObject
   def marshal_load(data)
     version, vars, values, obj = data
     if version == :__v2__
-      vars.each_with_index{|var, i| instance_variable_set(var, values[i])}
+      vars.each_with_index {|var, i| instance_variable_set(var, values[i])}
       __setobj__(obj)
     else
       __setobj__(data)
     end
   end
 
-  def initialize_clone(obj) # :nodoc:
-    self.__setobj__(obj.__getobj__.clone)
+  def initialize_clone(obj, freeze: nil) # :nodoc:
+    self.__setobj__(obj.__getobj__.clone(freeze: freeze))
   end
   def initialize_dup(obj) # :nodoc:
     self.__setobj__(obj.__getobj__.dup)
@@ -202,39 +231,16 @@ class Delegator < BasicObject
   private :initialize_clone, :initialize_dup
 
   ##
-  # :method: trust
-  # Trust both the object returned by \_\_getobj\_\_ and self.
-  #
-
-  ##
-  # :method: untrust
-  # Untrust both the object returned by \_\_getobj\_\_ and self.
-  #
-
-  ##
-  # :method: taint
-  # Taint both the object returned by \_\_getobj\_\_ and self.
-  #
-
-  ##
-  # :method: untaint
-  # Untaint both the object returned by \_\_getobj\_\_ and self.
-  #
-
-  ##
   # :method: freeze
   # Freeze both the object returned by \_\_getobj\_\_ and self.
   #
-
-  [:trust, :untrust, :taint, :untaint, :freeze].each do |method|
-    define_method method do
-      __getobj__.send(method)
-      super()
-    end
+  def freeze
+    __getobj__.freeze
+    super()
   end
 
   @delegator_api = self.public_instance_methods
-  def self.public_api   # :nodoc:
+  def self.public_api # :nodoc:
     @delegator_api
   end
 end
@@ -251,6 +257,8 @@ end
 #     end
 #   end
 #
+#   require 'delegate'
+#
 #   class UserDecorator < SimpleDelegator
 #     def birth_year
 #       born_on.year
@@ -305,7 +313,7 @@ end
 #    Non-Nil:  7
 #     Unique:  6
 #
-class SimpleDelegator<Delegator
+class SimpleDelegator < Delegator
   # Returns the current object method calls are being delegated to.
   def __getobj__
     unless defined?(@delegate_sd_obj)
@@ -339,7 +347,7 @@ def Delegator.delegating_block(mid) # :nodoc:
   lambda do |*args, &block|
     target = self.__getobj__
     target.__send__(mid, *args, &block)
-  end
+  end.ruby2_keywords
 end
 
 #
@@ -352,6 +360,14 @@ end
 #     end
 #   end
 #
+# or:
+#
+#   MyClass = DelegateClass(ClassToDelegateTo) do    # Step 1
+#     def initialize
+#       super(obj_of_ClassToDelegateTo)              # Step 2
+#     end
+#   end
+#
 # Here's a sample of use from Tempfile which is really a File object with a
 # few special rules about storage location and when the File should be
 # deleted.  That makes for an almost textbook perfect example of how to use
@@ -375,13 +391,15 @@ end
 #     # ...
 #   end
 #
-def DelegateClass(superclass)
+def DelegateClass(superclass, &block)
   klass = Class.new(Delegator)
-  methods = superclass.instance_methods
-  methods -= ::Delegator.public_api
-  methods -= [:to_s,:inspect,:=~,:!~,:===]
+  ignores = [*::Delegator.public_api, :to_s, :inspect, :=~, :!~, :===]
+  protected_instance_methods = superclass.protected_instance_methods
+  protected_instance_methods -= ignores
+  public_instance_methods = superclass.public_instance_methods
+  public_instance_methods -= ignores
   klass.module_eval do
-    def __getobj__  # :nodoc:
+    def __getobj__ # :nodoc:
       unless defined?(@delegate_dc_obj)
         return yield if block_given?
         __raise__ ::ArgumentError, "not delegated"
@@ -392,15 +410,35 @@ def DelegateClass(superclass)
       __raise__ ::ArgumentError, "cannot delegate to self" if self.equal?(obj)
       @delegate_dc_obj = obj
     end
-    methods.each do |method|
+    protected_instance_methods.each do |method|
+      define_method(method, Delegator.delegating_block(method))
+      protected method
+    end
+    public_instance_methods.each do |method|
       define_method(method, Delegator.delegating_block(method))
     end
   end
   klass.define_singleton_method :public_instance_methods do |all=true|
-    super(all) - superclass.protected_instance_methods
+    super(all) | superclass.public_instance_methods
   end
   klass.define_singleton_method :protected_instance_methods do |all=true|
     super(all) | superclass.protected_instance_methods
   end
+  klass.define_singleton_method :instance_methods do |all=true|
+    super(all) | superclass.instance_methods
+  end
+  klass.define_singleton_method :public_instance_method do |name|
+    super(name)
+  rescue NameError
+    raise unless self.public_instance_methods.include?(name)
+    superclass.public_instance_method(name)
+  end
+  klass.define_singleton_method :instance_method do |name|
+    super(name)
+  rescue NameError
+    raise unless self.instance_methods.include?(name)
+    superclass.instance_method(name)
+  end
+  klass.module_eval(&block) if block
   return klass
 end
diff --git a/lib/delegate/delegate.gemspec b/lib/delegate/delegate.gemspec
new file mode 100644
index 0000000000..05d9ced175
--- /dev/null
+++ b/lib/delegate/delegate.gemspec
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+name = File.basename(__FILE__, ".gemspec")
+version = ["lib", Array.new(name.count("-")+1, "..").join("/")].find do |dir|
+  break File.foreach(File.join(__dir__, dir, "#{name.tr('-', '/')}.rb")) do |line|
+    /^\s*VERSION\s*=\s*"(.*)"/ =~ line and break $1
+  end rescue nil
+end
+
+Gem::Specification.new do |spec|
+  spec.name          = name
+  spec.version       = version
+  spec.authors       = ["Yukihiro Matsumoto"]
+  spec.email         = ["matz@ruby-lang.org"]
+
+  spec.summary       = %q{Provides three abilities to delegate method calls to an object.}
+  spec.description   = %q{Provides three abilities to delegate method calls to an object.}
+  spec.homepage      = "https://github.com/ruby/delegate"
+  spec.licenses      = ["Ruby", "BSD-2-Clause"]
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z 2>/dev/null`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+  spec.required_ruby_version = '>= 2.7'
+end
diff --git a/lib/did_you_mean.rb b/lib/did_you_mean.rb
new file mode 100644
index 0000000000..ab7e6b01a8
--- /dev/null
+++ b/lib/did_you_mean.rb
@@ -0,0 +1,112 @@
+require_relative "did_you_mean/version"
+require_relative "did_you_mean/core_ext/name_error"
+
+require_relative "did_you_mean/spell_checker"
+require_relative 'did_you_mean/spell_checkers/name_error_checkers'
+require_relative 'did_you_mean/spell_checkers/method_name_checker'
+require_relative 'did_you_mean/spell_checkers/key_error_checker'
+require_relative 'did_you_mean/spell_checkers/null_checker'
+require_relative 'did_you_mean/spell_checkers/require_path_checker'
+require_relative 'did_you_mean/formatters/plain_formatter'
+require_relative 'did_you_mean/tree_spell_checker'
+
+# The +DidYouMean+ gem adds functionality to suggest possible method/class
+# names upon errors such as +NameError+ and +NoMethodError+. In Ruby 2.3 or
+# later, it is automatically activated during startup.
+#
+# @example
+#
+#   methosd
+#   # => NameError: undefined local variable or method `methosd' for main:Object
+#   #   Did you mean?  methods
+#   #                  method
+#
+#   OBject
+#   # => NameError: uninitialized constant OBject
+#   #    Did you mean?  Object
+#
+#   @full_name = "Yuki Nishijima"
+#   first_name, last_name = full_name.split(" ")
+#   # => NameError: undefined local variable or method `full_name' for main:Object
+#   #    Did you mean?  @full_name
+#
+#   @@full_name = "Yuki Nishijima"
+#   @@full_anme
+#   # => NameError: uninitialized class variable @@full_anme in Object
+#   #    Did you mean?  @@full_name
+#
+#   full_name = "Yuki Nishijima"
+#   full_name.starts_with?("Y")
+#   # => NoMethodError: undefined method `starts_with?' for "Yuki Nishijima":String
+#   #    Did you mean?  start_with?
+#
+#   hash = {foo: 1, bar: 2, baz: 3}
+#   hash.fetch(:fooo)
+#   # => KeyError: key not found: :fooo
+#   #    Did you mean?  :foo
+#
+#
+# == Disabling +did_you_mean+
+#
+# Occasionally, you may want to disable the +did_you_mean+ gem for e.g.
+# debugging issues in the error object itself. You can disable it entirely by
+# specifying +--disable-did_you_mean+ option to the +ruby+ command:
+#
+#   $ ruby --disable-did_you_mean -e "1.zeor?"
+#   -e:1:in `<main>': undefined method `zeor?' for 1:Integer (NameError)
+#
+# When you do not have direct access to the +ruby+ command (e.g.
+# +rails console+, +irb+), you could applyoptions using the +RUBYOPT+
+# environment variable:
+#
+#   $ RUBYOPT='--disable-did_you_mean' irb
+#   irb:0> 1.zeor?
+#   # => NoMethodError (undefined method `zeor?' for 1:Integer)
+#
+#
+# == Getting the original error message
+#
+# Sometimes, you do not want to disable the gem entirely, but need to get the
+# original error message without suggestions (e.g. testing). In this case, you
+# could use the +#original_message+ method on the error object:
+#
+#   no_method_error = begin
+#                       1.zeor?
+#                     rescue NoMethodError => error
+#                       error
+#                     end
+#
+#   no_method_error.message
+#   # => NoMethodError (undefined method `zeor?' for 1:Integer)
+#   #    Did you mean?  zero?
+#
+#   no_method_error.original_message
+#   # => NoMethodError (undefined method `zeor?' for 1:Integer)
+#
+module DidYouMean
+  # Map of error types and spell checker objects.
+  SPELL_CHECKERS = Hash.new(NullChecker)
+
+  # Adds +DidYouMean+ functionality to an error using a given spell checker
+  def self.correct_error(error_class, spell_checker)
+    SPELL_CHECKERS[error_class.name] = spell_checker
+    error_class.prepend(Correctable) unless error_class < Correctable
+  end
+
+  correct_error NameError, NameErrorCheckers
+  correct_error KeyError, KeyErrorChecker
+  correct_error NoMethodError, MethodNameChecker
+  correct_error LoadError, RequirePathChecker if RUBY_VERSION >= '2.8.0'
+
+  # Returns the currently set formatter. By default, it is set to +DidYouMean::Formatter+.
+  def self.formatter
+    @@formatter
+  end
+
+  # Updates the primary formatter used to format the suggestions.
+  def self.formatter=(formatter)
+    @@formatter = formatter
+  end
+
+  self.formatter = PlainFormatter.new
+end
diff --git a/lib/did_you_mean/core_ext/name_error.rb b/lib/did_you_mean/core_ext/name_error.rb
new file mode 100644
index 0000000000..77dcd520c0
--- /dev/null
+++ b/lib/did_you_mean/core_ext/name_error.rb
@@ -0,0 +1,25 @@
+module DidYouMean
+  module Correctable
+    def original_message
+      method(:to_s).super_method.call
+    end
+
+    def to_s
+      msg = super.dup
+      suggestion = DidYouMean.formatter.message_for(corrections)
+
+      msg << suggestion if !msg.end_with?(suggestion)
+      msg
+    rescue
+      super
+    end
+
+    def corrections
+      @corrections ||= spell_checker.corrections
+    end
+
+    def spell_checker
+      SPELL_CHECKERS[self.class.to_s].new(self)
+    end
+  end
+end
diff --git a/lib/did_you_mean/did_you_mean.gemspec b/lib/did_you_mean/did_you_mean.gemspec
new file mode 100644
index 0000000000..8fe5723129
--- /dev/null
+++ b/lib/did_you_mean/did_you_mean.gemspec
@@ -0,0 +1,27 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+begin
+  require_relative "lib/did_you_mean/version"
+rescue LoadError # Fallback to load version file in ruby core repository
+  require_relative "version"
+end
+
+Gem::Specification.new do |spec|
+  spec.name          = "did_you_mean"
+  spec.version       = DidYouMean::VERSION
+  spec.authors       = ["Yuki Nishijima"]
+  spec.email         = ["mail@yukinishijima.net"]
+  spec.summary       = '"Did you mean?" experience in Ruby'
+  spec.description   = 'The gem that has been saving people from typos since 2014.'
+  spec.homepage      = "https://github.com/ruby/did_you_mean"
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files`.split($/).reject{|path| path.start_with?('evaluation/') }
+  spec.test_files    = spec.files.grep(%r{^(test)/})
+  spec.require_paths = ["lib"]
+
+  spec.required_ruby_version = '>= 2.5.0'
+
+  spec.add_development_dependency "rake"
+end
diff --git a/lib/did_you_mean/experimental.rb b/lib/did_you_mean/experimental.rb
new file mode 100644
index 0000000000..f8e37e4532
--- /dev/null
+++ b/lib/did_you_mean/experimental.rb
@@ -0,0 +1,2 @@
+warn "Experimental features in the did_you_mean gem has been removed " \
+     "and `require \"did_you_mean/experimental\"' has no effect."
diff --git a/lib/did_you_mean/formatters/plain_formatter.rb b/lib/did_you_mean/formatters/plain_formatter.rb
new file mode 100644
index 0000000000..e2d995f587
--- /dev/null
+++ b/lib/did_you_mean/formatters/plain_formatter.rb
@@ -0,0 +1,33 @@
+# frozen-string-literal: true
+
+module DidYouMean
+  # The +DidYouMean::PlainFormatter+ is the basic, default formatter for the
+  # gem. The formatter responds to the +message_for+ method and it returns a
+  # human readable string.
+  class PlainFormatter
+
+    # Returns a human readable string that contains +corrections+. This
+    # formatter is designed to be less verbose to not take too much screen
+    # space while being helpful enough to the user.
+    #
+    # @example
+    #
+    #   formatter = DidYouMean::PlainFormatter.new
+    #
+    #   # displays suggestions in two lines with the leading empty line
+    #   puts formatter.message_for(["methods", "method"])
+    #
+    #   Did you mean?  methods
+    #                   method
+    #   # => nil
+    #
+    #   # displays an empty line
+    #   puts formatter.message_for([])
+    #
+    #   # => nil
+    #
+    def message_for(corrections)
+      corrections.empty? ? "" : "\nDid you mean?  #{corrections.join("\n               ")}"
+    end
+  end
+end
diff --git a/lib/did_you_mean/formatters/verbose_formatter.rb b/lib/did_you_mean/formatters/verbose_formatter.rb
new file mode 100644
index 0000000000..b8fe214d57
--- /dev/null
+++ b/lib/did_you_mean/formatters/verbose_formatter.rb
@@ -0,0 +1,49 @@
+# frozen-string-literal: true
+
+module DidYouMean
+  # The +DidYouMean::VerboseFormatter+ uses extra empty lines to make the
+  # suggestion stand out more in the error message.
+  #
+  # In order to activate the verbose formatter,
+  #
+  # @example
+  #
+  #   OBject
+  #   # => NameError: uninitialized constant OBject
+  #   #    Did you mean?  Object
+  #
+  #   require 'did_you_mean/verbose'
+  #
+  #   OBject
+  #   # => NameError: uninitialized constant OBject
+  #   #
+  #   #        Did you mean? Object
+  #   #
+  #
+  class VerboseFormatter
+
+    # Returns a human readable string that contains +corrections+. This
+    # formatter is designed to be less verbose to not take too much screen
+    # space while being helpful enough to the user.
+    #
+    # @example
+    #
+    #   formatter = DidYouMean::PlainFormatter.new
+    #
+    #   puts formatter.message_for(["methods", "method"])
+    #
+    #
+    #       Did you mean? methods
+    #                     method
+    #
+    #   # => nil
+    #
+    def message_for(corrections)
+      return "" if corrections.empty?
+
+      output = "\n\n    Did you mean? ".dup
+      output << corrections.join("\n                  ")
+      output << "\n "
+    end
+  end
+end
diff --git a/lib/did_you_mean/jaro_winkler.rb b/lib/did_you_mean/jaro_winkler.rb
new file mode 100644
index 0000000000..56db130af4
--- /dev/null
+++ b/lib/did_you_mean/jaro_winkler.rb
@@ -0,0 +1,87 @@
+module DidYouMean
+  module Jaro
+    module_function
+
+    def distance(str1, str2)
+      str1, str2 = str2, str1 if str1.length > str2.length
+      length1, length2 = str1.length, str2.length
+
+      m          = 0.0
+      t          = 0.0
+      range      = (length2 / 2).floor - 1
+      range      = 0 if range < 0
+      flags1     = 0
+      flags2     = 0
+
+      # Avoid duplicating enumerable objects
+      str1_codepoints = str1.codepoints
+      str2_codepoints = str2.codepoints
+
+      i = 0
+      while i < length1
+        last = i + range
+        j    = (i >= range) ? i - range : 0
+
+        while j <= last
+          if flags2[j] == 0 && str1_codepoints[i] == str2_codepoints[j]
+            flags2 |= (1 << j)
+            flags1 |= (1 << i)
+            m += 1
+            break
+          end
+
+          j += 1
+        end
+
+        i += 1
+      end
+
+      k = i = 0
+      while i < length1
+        if flags1[i] != 0
+          j = index = k
+
+          k = while j < length2
+            index = j
+            break(j + 1) if flags2[j] != 0
+
+            j += 1
+          end
+
+          t += 1 if str1_codepoints[i] != str2_codepoints[index]
+        end
+
+        i += 1
+      end
+      t = (t / 2).floor
+
+      m == 0 ? 0 : (m / length1 + m / length2 + (m - t) / m) / 3
+    end
+  end
+
+  module JaroWinkler
+    WEIGHT    = 0.1
+    THRESHOLD = 0.7
+
+    module_function
+
+    def distance(str1, str2)
+      jaro_distance = Jaro.distance(str1, str2)
+
+      if jaro_distance > THRESHOLD
+        codepoints2  = str2.codepoints
+        prefix_bonus = 0
+
+        i = 0
+        str1.each_codepoint do |char1|
+          char1 == codepoints2[i] && i < 4 ? prefix_bonus += 1 : break
+          i += 1
+        end
+
+        jaro_distance + (prefix_bonus * WEIGHT * (1 - jaro_distance))
+      else
+        jaro_distance
+      end
+    end
+  end
+end
diff --git a/lib/did_you_mean/levenshtein.rb b/lib/did_you_mean/levenshtein.rb
new file mode 100644
index 0000000000..098053470f
--- /dev/null
+++ b/lib/did_you_mean/levenshtein.rb
@@ -0,0 +1,57 @@
+module DidYouMean
+  module Levenshtein # :nodoc:
+    # This code is based directly on the Text gem implementation
+    # Copyright (c) 2006-2013 Paul Battley, Michael Neumann, Tim Fletcher.
+    #
+    # Returns a value representing the "cost" of transforming str1 into str2
+    def distance(str1, str2)
+      n = str1.length
+      m = str2.length
+      return m if n.zero?
+      return n if m.zero?
+
+      d = (0..m).to_a
+      x = nil
+
+      # to avoid duplicating an enumerable object, create it outside of the loop
+      str2_codepoints = str2.codepoints
+
+      str1.each_codepoint.with_index(1) do |char1, i|
+        j = 0
+        while j < m
+          cost = (char1 == str2_codepoints[j]) ? 0 : 1
+          x = min3(
+            d[j+1] + 1, # insertion
+            i + 1,      # deletion
+            d[j] + cost # substitution
+          )
+          d[j] = i
+          i = x
+
+          j += 1
+        end
+        d[m] = x
+      end
+
+      x
+    end
+    module_function :distance
+
+    private
+
+    # detects the minimum value out of three arguments. This method is
+    # faster than `[a, b, c].min` and puts less GC pressure.
+    # See https://github.com/ruby/did_you_mean/pull/1 for a performance
+    # benchmark.
+    def min3(a, b, c)
+      if a < b && a < c
+        a
+      elsif b < c
+        b
+      else
+        c
+      end
+    end
+    module_function :min3
+  end
+end
diff --git a/lib/did_you_mean/spell_checker.rb b/lib/did_you_mean/spell_checker.rb
new file mode 100644
index 0000000000..e5106abba2
--- /dev/null
+++ b/lib/did_you_mean/spell_checker.rb
@@ -0,0 +1,46 @@
+# frozen-string-literal: true
+
+require_relative "levenshtein"
+require_relative "jaro_winkler"
+
+module DidYouMean
+  class SpellChecker
+    def initialize(dictionary:)
+      @dictionary = dictionary
+    end
+
+    def correct(input)
+      input     = normalize(input)
+      threshold = input.length > 3 ? 0.834 : 0.77
+
+      words = @dictionary.select { |word| JaroWinkler.distance(normalize(word), input) >= threshold }
+      words.reject! { |word| input == word.to_s }
+      words.sort_by! { |word| JaroWinkler.distance(word.to_s, input) }
+      words.reverse!
+
+      # Correct mistypes
+      threshold   = (input.length * 0.25).ceil
+      corrections = words.select { |c| Levenshtein.distance(normalize(c), input) <= threshold }
+
+      # Correct misspells
+      if corrections.empty?
+        corrections = words.select do |word|
+          word   = normalize(word)
+          length = input.length < word.length ? input.length : word.length
+
+          Levenshtein.distance(word, input) < length
+        end.first(1)
+      end
+
+      corrections
+    end
+
+    private
+
+    def normalize(str_or_symbol) #:nodoc:
+      str = str_or_symbol.to_s.downcase
+      str.tr!("@", "")
+      str
+    end
+  end
+end
diff --git a/lib/did_you_mean/spell_checkers/key_error_checker.rb b/lib/did_you_mean/spell_checkers/key_error_checker.rb
new file mode 100644
index 0000000000..be4bea7789
--- /dev/null
+++ b/lib/did_you_mean/spell_checkers/key_error_checker.rb
@@ -0,0 +1,20 @@
+require_relative "../spell_checker"
+
+module DidYouMean
+  class KeyErrorChecker
+    def initialize(key_error)
+      @key = key_error.key
+      @keys = key_error.receiver.keys
+    end
+
+    def corrections
+      @corrections ||= exact_matches.empty? ? SpellChecker.new(dictionary: @keys).correct(@key).map(&:inspect) : exact_matches
+    end
+
+    private
+
+    def exact_matches
+      @exact_matches ||= @keys.select { |word| @key == word.to_s }.map(&:inspect)
+    end
+  end
+end
diff --git a/lib/did_you_mean/spell_checkers/method_name_checker.rb b/lib/did_you_mean/spell_checkers/method_name_checker.rb
new file mode 100644
index 0000000000..0483127d6f
--- /dev/null
+++ b/lib/did_you_mean/spell_checkers/method_name_checker.rb
@@ -0,0 +1,69 @@
+require_relative "../spell_checker"
+
+module DidYouMean
+  class MethodNameChecker
+    attr_reader :method_name, :receiver
+
+    NAMES_TO_EXCLUDE = { NilClass => nil.methods }
+    NAMES_TO_EXCLUDE.default = []
+
+    # +MethodNameChecker::RB_RESERVED_WORDS+ is the list of reserved words in
+    # Ruby that take an argument. Unlike
+    # +VariableNameChecker::RB_RESERVED_WORDS+, these reserved words require
+    # an argument, and a +NoMethodError+ is raised due to the presence of the
+    # argument.
+    #
+    # The +MethodNameChecker+ will use this list to suggest a reversed word if
+    # a +NoMethodError+ is raised and found closest matches.
+    #
+    # Also see +VariableNameChecker::RB_RESERVED_WORDS+.
+    RB_RESERVED_WORDS = %i(
+      alias
+      case
+      def
+      defined?
+      elsif
+      end
+      ensure
+      for
+      rescue
+      super
+      undef
+      unless
+      until
+      when
+      while
+      yield
+    )
+
+    def initialize(exception)
+      @method_name  = exception.name
+      @receiver     = exception.receiver
+      @private_call = exception.respond_to?(:private_call?) ? exception.private_call? : false
+    end
+
+    def corrections
+      @corrections ||= begin
+                         dictionary = method_names
+                         dictionary = RB_RESERVED_WORDS + dictionary if @private_call
+
+                         SpellChecker.new(dictionary: dictionary).correct(method_name) - names_to_exclude
+                       end
+    end
+
+    def method_names
+      if Object === receiver
+        method_names = receiver.methods + receiver.singleton_methods
+        method_names += receiver.private_methods if @private_call
+        method_names.uniq!
+        method_names
+      else
+        []
+      end
+    end
+
+    def names_to_exclude
+      Object === receiver ? NAMES_TO_EXCLUDE[receiver.class] : []
+    end
+  end
+end
diff --git a/lib/did_you_mean/spell_checkers/name_error_checkers.rb b/lib/did_you_mean/spell_checkers/name_error_checkers.rb
new file mode 100644
index 0000000000..6e2aaa4cb1
--- /dev/null
+++ b/lib/did_you_mean/spell_checkers/name_error_checkers.rb
@@ -0,0 +1,20 @@
+require_relative 'name_error_checkers/class_name_checker'
+require_relative 'name_error_checkers/variable_name_checker'
+
+module DidYouMean
+  class << (NameErrorCheckers = Object.new)
+    def new(exception)
+      case exception.original_message
+      when /uninitialized constant/
+        ClassNameChecker
+      when /undefined local variable or method/,
+           /undefined method/,
+           /uninitialized class variable/,
+           /no member '.*' in struct/
+        VariableNameChecker
+      else
+        NullChecker
+      end.new(exception)
+    end
+  end
+end
diff --git a/lib/did_you_mean/spell_checkers/name_error_checkers/class_name_checker.rb b/lib/did_you_mean/spell_checkers/name_error_checkers/class_name_checker.rb
new file mode 100644
index 0000000000..924265b929
--- /dev/null
+++ b/lib/did_you_mean/spell_checkers/name_error_checkers/class_name_checker.rb
@@ -0,0 +1,49 @@
+# frozen-string-literal: true
+
+require_relative "../../spell_checker"
+
+module DidYouMean
+  class ClassNameChecker
+    attr_reader :class_name
+
+    def initialize(exception)
+      @class_name, @receiver, @original_message = exception.name, exception.receiver, exception.original_message
+    end
+
+    def corrections
+      @corrections ||= SpellChecker.new(dictionary: class_names)
+                         .correct(class_name)
+                         .map(&:full_name)
+                         .reject {|qualified_name| @original_message.include?(qualified_name) }
+    end
+
+    def class_names
+      scopes.flat_map do |scope|
+        scope.constants.map do |c|
+          ClassName.new(c, scope == Object ? "" : "#{scope}::")
+        end
+      end
+    end
+
+    def scopes
+      @scopes ||= @receiver.to_s.split("::").inject([Object]) do |_scopes, scope|
+        _scopes << _scopes.last.const_get(scope)
+      end.uniq
+    end
+
+    class ClassName < String
+      attr :namespace
+
+      def initialize(name, namespace = '')
+        super(name.to_s)
+        @namespace = namespace
+      end
+
+      def full_name
+        self.class.new("#{namespace}#{self}")
+      end
+    end
+
+    private_constant :ClassName
+  end
+end
diff --git a/lib/did_you_mean/spell_checkers/name_error_checkers/variable_name_checker.rb b/lib/did_you_mean/spell_checkers/name_error_checkers/variable_name_checker.rb
new file mode 100644
index 0000000000..3e51b4fa3a
--- /dev/null
+++ b/lib/did_you_mean/spell_checkers/name_error_checkers/variable_name_checker.rb
@@ -0,0 +1,82 @@
+# frozen-string-literal: true
+
+require_relative "../../spell_checker"
+
+module DidYouMean
+  class VariableNameChecker
+    attr_reader :name, :method_names, :lvar_names, :ivar_names, :cvar_names
+
+    NAMES_TO_EXCLUDE = { 'foo' => [:fork, :for] }
+    NAMES_TO_EXCLUDE.default = []
+
+    # +VariableNameChecker::RB_RESERVED_WORDS+ is the list of all reserved
+    # words in Ruby. They could be declared like methods are, and a typo would
+    # cause Ruby to raise a +NameError+ because of the way they are declared.
+    #
+    # The +:VariableNameChecker+ will use this list to suggest a reversed word
+    # if a +NameError+ is raised and found closest matches, excluding:
+    #
+    #   * +do+
+    #   * +if+
+    #   * +in+
+    #   * +or+
+    #
+    # Also see +MethodNameChecker::RB_RESERVED_WORDS+.
+    RB_RESERVED_WORDS = %i(
+      BEGIN
+      END
+      alias
+      and
+      begin
+      break
+      case
+      class
+      def
+      defined?
+      else
+      elsif
+      end
+      ensure
+      false
+      for
+      module
+      next
+      nil
+      not
+      redo
+      rescue
+      retry
+      return
+      self
+      super
+      then
+      true
+      undef
+      unless
+      until
+      when
+      while
+      yield
+      __LINE__
+      __FILE__
+      __ENCODING__
+    )
+
+    def initialize(exception)
+      @name       = exception.name.to_s.tr("@", "")
+      @lvar_names = exception.respond_to?(:local_variables) ? exception.local_variables : []
+      receiver    = exception.receiver
+
+      @method_names = receiver.methods + receiver.private_methods
+      @ivar_names   = receiver.instance_variables
+      @cvar_names   = receiver.class.class_variables
+      @cvar_names  += receiver.class_variables if receiver.kind_of?(Module)
+    end
+
+    def corrections
+      @corrections ||= SpellChecker
+                     .new(dictionary: (RB_RESERVED_WORDS + lvar_names + method_names + ivar_names + cvar_names))
+                     .correct(name) - NAMES_TO_EXCLUDE[@name]
+    end
+  end
+end
diff --git a/lib/did_you_mean/spell_checkers/null_checker.rb b/lib/did_you_mean/spell_checkers/null_checker.rb
new file mode 100644
index 0000000000..1306f69d4a
--- /dev/null
+++ b/lib/did_you_mean/spell_checkers/null_checker.rb
@@ -0,0 +1,6 @@
+module DidYouMean
+  class NullChecker
+    def initialize(*);  end
+    def corrections; [] end
+  end
+end
diff --git a/lib/did_you_mean/spell_checkers/require_path_checker.rb b/lib/did_you_mean/spell_checkers/require_path_checker.rb
new file mode 100644
index 0000000000..aaf877b412
--- /dev/null
+++ b/lib/did_you_mean/spell_checkers/require_path_checker.rb
@@ -0,0 +1,35 @@
+# frozen-string-literal: true
+
+require_relative "../spell_checker"
+require_relative "../tree_spell_checker"
+
+module DidYouMean
+  class RequirePathChecker
+    attr_reader :path
+
+    INITIAL_LOAD_PATH = $LOAD_PATH.dup.freeze
+    ENV_SPECIFIC_EXT  = ".#{RbConfig::CONFIG["DLEXT"]}"
+
+    private_constant :INITIAL_LOAD_PATH, :ENV_SPECIFIC_EXT
+
+    def self.requireables
+      @requireables ||= INITIAL_LOAD_PATH
+                          .flat_map {|path| Dir.glob("**/???*{.rb,#{ENV_SPECIFIC_EXT}}", base: path) }
+                          .map {|path| path.chomp!(".rb") || path.chomp!(ENV_SPECIFIC_EXT) }
+    end
+
+    def initialize(exception)
+      @path = exception.path
+    end
+
+    def corrections
+      @corrections ||= begin
+                         threshold     = path.size * 2
+                         dictionary    = self.class.requireables.reject {|str| str.size >= threshold }
+                         spell_checker = path.include?("/") ? TreeSpellChecker : SpellChecker
+
+                         spell_checker.new(dictionary: dictionary).correct(path).uniq
+                       end
+    end
+  end
+end
diff --git a/lib/did_you_mean/tree_spell_checker.rb b/lib/did_you_mean/tree_spell_checker.rb
new file mode 100644
index 0000000000..799f07fcf0
--- /dev/null
+++ b/lib/did_you_mean/tree_spell_checker.rb
@@ -0,0 +1,109 @@
+# frozen_string_literal: true
+
+module DidYouMean
+  # spell checker for a dictionary that has a tree
+  # structure, see doc/tree_spell_checker_api.md
+  class TreeSpellChecker
+    attr_reader :dictionary, :separator, :augment
+
+    def initialize(dictionary:, separator: '/', augment: nil)
+      @dictionary = dictionary
+      @separator = separator
+      @augment = augment
+    end
+
+    def correct(input)
+      plausibles = plausible_dimensions(input)
+      return fall_back_to_normal_spell_check(input) if plausibles.empty?
+
+      suggestions = find_suggestions(input, plausibles)
+      return fall_back_to_normal_spell_check(input) if suggestions.empty?
+
+      suggestions
+    end
+
+    def dictionary_without_leaves
+      @dictionary_without_leaves ||= dictionary.map { |word| word.split(separator)[0..-2] }.uniq
+    end
+
+    def tree_depth
+      @tree_depth ||= dictionary_without_leaves.max { |a, b| a.size <=> b.size }.size
+    end
+
+    def dimensions
+      @dimensions ||= tree_depth.times.map do |index|
+                        dictionary_without_leaves.map { |element| element[index] }.compact.uniq
+                      end
+    end
+
+    def find_leaves(path)
+      path_with_separator = "#{path}#{separator}"
+
+      dictionary
+        .select {|str| str.include?(path_with_separator) }
+        .map {|str| str.gsub(path_with_separator, '') }
+    end
+
+    def plausible_dimensions(input)
+      input.split(separator)[0..-2]
+        .map
+        .with_index { |element, index| correct_element(dimensions[index], element) if dimensions[index] }
+        .compact
+    end
+
+    def possible_paths(states)
+      states.map { |state| state.join(separator) }
+    end
+
+    private
+
+    def find_suggestions(input, plausibles)
+      states = plausibles[0].product(*plausibles[1..-1])
+      paths  = possible_paths(states)
+      leaf   = input.split(separator).last
+
+      find_ideas(paths, leaf)
+    end
+
+    def fall_back_to_normal_spell_check(input)
+      return [] unless augment
+
+      ::DidYouMean::SpellChecker.new(dictionary: dictionary).correct(input)
+    end
+
+    def find_ideas(paths, leaf)
+      paths.flat_map do |path|
+        names = find_leaves(path)
+        ideas = correct_element(names, leaf)
+
+        ideas_to_paths(ideas, leaf, names, path)
+      end.compact
+    end
+
+    def ideas_to_paths(ideas, leaf, names, path)
+      if ideas.empty?
+        nil
+      elsif names.include?(leaf)
+        ["#{path}#{separator}#{leaf}"]
+      else
+        ideas.map {|str| "#{path}#{separator}#{str}" }
+      end
+    end
+
+    def correct_element(names, element)
+      return names if names.size == 1
+
+      str = normalize(element)
+
+      return [str] if names.include?(str)
+
+      ::DidYouMean::SpellChecker.new(dictionary: names).correct(str)
+    end
+
+    def normalize(str)
+      str.downcase!
+      str.tr!('@', ' ') if str.include?('@')
+      str
+    end
+  end
+end
diff --git a/lib/did_you_mean/verbose.rb b/lib/did_you_mean/verbose.rb
new file mode 100644
index 0000000000..4e86f167ea
--- /dev/null
+++ b/lib/did_you_mean/verbose.rb
@@ -0,0 +1,4 @@
+require_relative '../did_you_mean'
+require_relative 'formatters/verbose_formatter'
+
+DidYouMean.formatter = DidYouMean::VerboseFormatter.new
diff --git a/lib/did_you_mean/version.rb b/lib/did_you_mean/version.rb
new file mode 100644
index 0000000000..9a53a3185a
--- /dev/null
+++ b/lib/did_you_mean/version.rb
@@ -0,0 +1,3 @@
+module DidYouMean
+  VERSION = "1.5.0"
+end
diff --git a/lib/drb/acl.rb b/lib/drb/acl.rb
index 520b7df71d..b004656f09 100644
--- a/lib/drb/acl.rb
+++ b/lib/drb/acl.rb
@@ -49,6 +49,9 @@ class ACL
     # +str+ may be "*" or "all" to match any address, an IP address string
     # to match a specific address, an IP address mask per IPAddr, or one
     # containing "*" to match part of an IPv4 address.
+    #
+    # IPAddr::InvalidPrefixError may be raised when an IP network
+    # address with an invalid netmask/prefix is given.
 
     def initialize(str)
       if str == '*' or str == 'all'
@@ -58,6 +61,10 @@ class ACL
       else
         begin
           @pat = [:ip, IPAddr.new(str)]
+        rescue IPAddr::InvalidPrefixError
+          # In this case, `str` shouldn't be a host name pattern
+          # because it contains a slash.
+          raise
         rescue ArgumentError
           @pat = [:name, dot_pat(str)]
         end
@@ -82,8 +89,7 @@ class ACL
     # Creates a Regexp to match an address.
 
     def dot_pat(str)
-      exp = "^" + dot_pat_str(str) + "$"
-      Regexp.new(exp)
+      /\A#{dot_pat_str(str)}\z/
     end
 
     public
diff --git a/lib/drb/drb.gemspec b/lib/drb/drb.gemspec
new file mode 100644
index 0000000000..6b31e896c3
--- /dev/null
+++ b/lib/drb/drb.gemspec
@@ -0,0 +1,30 @@
+begin
+  require_relative "lib/drb/version"
+rescue LoadError # Fallback to load version file in ruby core repository
+  require_relative "version"
+end
+
+Gem::Specification.new do |spec|
+  spec.name          = "drb"
+  spec.version       = DRb::VERSION
+  spec.authors       = ["Masatoshi SEKI"]
+  spec.email         = ["seki@ruby-lang.org"]
+
+  spec.summary       = %q{Distributed object system for Ruby}
+  spec.description   = %q{Distributed object system for Ruby}
+  spec.homepage      = "https://github.com/ruby/drb"
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.licenses      = ["Ruby", "BSD-2-Clause"]
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+end
diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb
index f00e72c457..3e23213911 100644
--- a/lib/drb/drb.rb
+++ b/lib/drb/drb.rb
@@ -47,9 +47,9 @@
 #   Translation of presentation on Ruby by Masatoshi Seki.
 
 require 'socket'
-require 'thread'
 require 'io/wait'
-require 'drb/eq'
+require 'monitor'
+require_relative 'eq'
 
 #
 # == Overview
@@ -160,8 +160,6 @@ require 'drb/eq'
 #   # The object that handles requests on the server
 #   FRONT_OBJECT=TimeServer.new
 #
-#   $SAFE = 1   # disable eval() and friends
-#
 #   DRb.start_service(URI, FRONT_OBJECT)
 #   # Wait for the drb server thread to finish before exiting.
 #   DRb.thread.join
@@ -235,7 +233,7 @@ require 'drb/eq'
 #       def get_logger(name)
 #           if !@loggers.has_key? name
 #               # make the filename safe, then declare it to be so
-#               fname = name.gsub(/[.\/\\\:]/, "_").untaint
+#               fname = name.gsub(/[.\/\\\:]/, "_")
 #               @loggers[name] = Logger.new(name, @basedir + "/" + fname)
 #           end
 #           return @loggers[name]
@@ -245,8 +243,6 @@ require 'drb/eq'
 #
 #   FRONT_OBJECT=LoggerFactory.new("/tmp/dlog")
 #
-#   $SAFE = 1   # disable eval() and friends
-#
 #   DRb.start_service(URI, FRONT_OBJECT)
 #   DRb.thread.join
 #
@@ -286,10 +282,7 @@ require 'drb/eq'
 #    ro.instance_eval("`rm -rf *`")
 #
 # The dangers posed by instance_eval and friends are such that a
-# DRbServer should generally be run with $SAFE set to at least
-# level 1.  This will disable eval() and related calls on strings
-# passed across the wire.  The sample usage code given above follows
-# this practice.
+# DRbServer should only be used when clients are trusted.
 #
 # A DRbServer can be configured with an access control list to
 # selectively allow or deny access from specified IP addresses.  The
@@ -361,7 +354,7 @@ module DRb
   # drb remains valid only while that object instance remains alive
   # within the server runtime.
   #
-  # For alternative mechanisms, see DRb::TimerIdConv in rdb/timeridconv.rb
+  # For alternative mechanisms, see DRb::TimerIdConv in drb/timeridconv.rb
   # and DRbNameIdConv in sample/name.rb in the full drb distribution.
   class DRbIdConv
 
@@ -378,7 +371,12 @@ module DRb
     # This implementation returns the object's __id__ in the local
     # object space.
     def to_id(obj)
-      obj.nil? ? nil : obj.__id__
+      case obj
+      when Object
+        obj.nil? ? nil : obj.__id__
+      when BasicObject
+        obj.__id__
+      end
     end
   end
 
@@ -561,7 +559,14 @@ module DRb
     end
 
     def dump(obj, error=false)  # :nodoc:
-      obj = make_proxy(obj, error) if obj.kind_of? DRbUndumped
+      case obj
+      when DRbUndumped
+        obj = make_proxy(obj, error)
+      when Object
+        # nothing
+      else
+        obj = make_proxy(obj, error)
+      end
       begin
         str = Marshal::dump(obj)
       rescue
@@ -589,16 +594,9 @@ module DRb
       raise(DRbConnError, 'premature marshal format(can\'t read)') if str.size < sz
       DRb.mutex.synchronize do
         begin
-          save = Thread.current[:drb_untaint]
-          Thread.current[:drb_untaint] = []
           Marshal::load(str)
         rescue NameError, ArgumentError
           DRbUnknown.new($!, str)
-        ensure
-          Thread.current[:drb_untaint].each do |x|
-            x.untaint
-          end
-          Thread.current[:drb_untaint] = save
         end
       end
     end
@@ -801,7 +799,7 @@ module DRb
     module_function :uri_option
 
     def auto_load(uri)  # :nodoc:
-      if uri =~ /^drb([a-z0-9]+):/
+      if /\Adrb([a-z0-9]+):/ =~ uri
         require("drb/#{$1}") rescue nil
       end
     end
@@ -817,13 +815,13 @@ module DRb
     # :stopdoc:
     private
     def self.parse_uri(uri)
-      if uri =~ /^druby:\/\/(.*?):(\d+)(\?(.*))?$/
+      if /\Adruby:\/\/(.*?):(\d+)(\?(.*))?\z/ =~ uri
         host = $1
         port = $2.to_i
         option = $4
         [host, port, option]
       else
-        raise(DRbBadScheme, uri) unless uri =~ /^druby:/
+        raise(DRbBadScheme, uri) unless uri.start_with?('druby:')
         raise(DRbBadURI, 'can\'t parse uri:' + uri)
       end
     end
@@ -838,8 +836,6 @@ module DRb
     # URI protocols.
     def self.open(uri, config)
       host, port, = parse_uri(uri)
-      host.untaint
-      port.untaint
       soc = TCPSocket.open(host, port)
       self.new(uri, soc, config)
     end
@@ -848,7 +844,11 @@ module DRb
     def self.getservername
       host = Socket::gethostname
       begin
-        Socket::gethostbyname(host)[0]
+        Socket::getaddrinfo(host, nil,
+                                  Socket::AF_UNSPEC,
+                                  Socket::SOCK_STREAM,
+                                  0,
+                                  Socket::AI_PASSIVE)[0][3]
       rescue
         'localhost'
       end
@@ -950,6 +950,7 @@ module DRb
     # returned by #open or by #accept, then it closes this particular
     # client-server session.
     def close
+      shutdown
       if @socket
         @socket.close
         @socket = nil
@@ -958,14 +959,8 @@ module DRb
     end
 
     def close_shutdown_pipe
-      if @shutdown_pipe_r && !@shutdown_pipe_r.closed?
-        @shutdown_pipe_r.close
-        @shutdown_pipe_r = nil
-      end
-      if @shutdown_pipe_w && !@shutdown_pipe_w.closed?
-        @shutdown_pipe_w.close
-        @shutdown_pipe_w = nil
-      end
+      @shutdown_pipe_w.close
+      @shutdown_pipe_r.close
     end
     private :close_shutdown_pipe
 
@@ -998,7 +993,7 @@ module DRb
 
     # Graceful shutdown
     def shutdown
-      @shutdown_pipe_w.close if @shutdown_pipe_w && !@shutdown_pipe_w.closed?
+      @shutdown_pipe_w.close
     end
 
     # Check to see if this connection is alive.
@@ -1013,6 +1008,8 @@ module DRb
 
     def set_sockopt(soc) # :nodoc:
       soc.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+    rescue IOError, Errno::ECONNRESET, Errno::EINVAL
+      # closed/shutdown socket, ignore error
     end
   end
 
@@ -1055,9 +1052,6 @@ module DRb
 
       if DRb.here?(uri)
         obj = DRb.to_obj(ref)
-        if ((! obj.tainted?) && Thread.current[:drb_untaint])
-          Thread.current[:drb_untaint].push(obj)
-        end
         return obj
       end
 
@@ -1094,7 +1088,14 @@ module DRb
     def initialize(obj, uri=nil)
       @uri = nil
       @ref = nil
-      if obj.nil?
+      case obj
+      when Object
+        is_nil = obj.nil?
+      when BasicObject
+        is_nil = false
+      end
+
+      if is_nil
         return if uri.nil?
         @uri, option = DRbProtocol.uri_option(uri, DRb.config)
         @ref = DRbURIOption.new(option) unless option.nil?
@@ -1130,7 +1131,7 @@ module DRb
     end
 
     # Routes method calls to the referenced remote object.
-    def method_missing(msg_id, *a, &b)
+    ruby2_keywords def method_missing(msg_id, *a, &b)
       if DRb.here?(@uri)
         obj = DRb.to_obj(@ref)
         DRb.current_server.check_insecure_method(obj, msg_id)
@@ -1173,7 +1174,7 @@ module DRb
       bt = []
       result.backtrace.each do |x|
         break if /`__send__'$/ =~ x
-        if /^\(druby:\/\// =~ x
+        if /\A\(druby:\/\// =~ x
           bt.push(x)
         else
           bt.push(prefix + x)
@@ -1194,6 +1195,54 @@ module DRb
     end
   end
 
+  class ThreadObject
+    include MonitorMixin
+
+    def initialize(&blk)
+      super()
+      @wait_ev = new_cond
+      @req_ev = new_cond
+      @res_ev = new_cond
+      @status = :wait
+      @req = nil
+      @res = nil
+      @thread = Thread.new(self, &blk)
+    end
+
+    def alive?
+      @thread.alive?
+    end
+
+    def kill
+      @thread.kill
+      @thread.join
+    end
+
+    def method_missing(msg, *arg, &blk)
+      synchronize do
+        @wait_ev.wait_until { @status == :wait }
+        @req = [msg] + arg
+        @status = :req
+        @req_ev.broadcast
+        @res_ev.wait_until { @status == :res }
+        value = @res
+        @req = @res = nil
+        @status = :wait
+        @wait_ev.broadcast
+        return value
+      end
+    end
+
+    def _execute()
+      synchronize do
+        @req_ev.wait_until { @status == :req }
+        @res = yield(@req)
+        @status = :res
+        @res_ev.signal
+      end
+    end
+  end
+
   # Class handling the connection between a DRbObject and the
   # server the real object lives on.
   #
@@ -1205,26 +1254,50 @@ module DRb
   # not normally need to deal with it directly.
   class DRbConn
     POOL_SIZE = 16  # :nodoc:
-    @mutex = Mutex.new
-    @pool = []
 
-    def self.open(remote_uri)  # :nodoc:
-      begin
-        conn = nil
-
-        @mutex.synchronize do
-          #FIXME
-          new_pool = []
-          @pool.each do |c|
-            if conn.nil? and c.uri == remote_uri
-              conn = c if c.alive?
+    def self.make_pool
+      ThreadObject.new do |queue|
+        pool = []
+        while true
+          queue._execute do |message|
+            case(message[0])
+            when :take then
+              remote_uri = message[1]
+              conn = nil
+              new_pool = []
+              pool.each do |c|
+                if conn.nil? and c.uri == remote_uri
+                  conn = c if c.alive?
+                else
+                  new_pool.push c
+                end
+              end
+              pool = new_pool
+              conn
+            when :store then
+              conn = message[1]
+              pool.unshift(conn)
+              pool.pop.close while pool.size > POOL_SIZE
+              conn
             else
-              new_pool.push c
+              nil
             end
           end
-          @pool = new_pool
         end
+      end
+    end
+    @pool_proxy = nil
 
+    def self.stop_pool
+      @pool_proxy&.kill
+      @pool_proxy = nil
+    end
+
+    def self.open(remote_uri)  # :nodoc:
+      begin
+        @pool_proxy = make_pool unless @pool_proxy&.alive?
+
+        conn = @pool_proxy.take(remote_uri)
         conn = self.new(remote_uri) unless conn
         succ, result = yield(conn)
         return succ, result
@@ -1232,10 +1305,7 @@ module DRb
       ensure
         if conn
           if succ
-            @mutex.synchronize do
-              @pool.unshift(conn)
-              @pool.pop.close while @pool.size > POOL_SIZE
-            end
+            @pool_proxy.store(conn)
           else
             conn.close
           end
@@ -1281,9 +1351,8 @@ module DRb
     @@idconv = DRbIdConv.new
     @@secondary_server = nil
     @@argc_limit = 256
-    @@load_limit = 256 * 102400
+    @@load_limit = 0xffffffff
     @@verbose = false
-    @@safe_level = 0
 
     # Set the default value for the :argc_limit option.
     #
@@ -1313,13 +1382,6 @@ module DRb
       @@idconv = idconv
     end
 
-    # Set the default safe level to +level+.  The default safe level is 0
-    #
-    # See #new for more information.
-    def self.default_safe_level(level)
-      @@safe_level = level
-    end
-
     # Set the default value of the :verbose option.
     #
     # See #new().  The initial default value is false.
@@ -1339,7 +1401,6 @@ module DRb
         :tcp_acl => @@acl,
         :load_limit => @@load_limit,
         :argc_limit => @@argc_limit,
-        :safe_level => @@safe_level
       }
       default_config.update(hash)
     end
@@ -1373,10 +1434,6 @@ module DRb
     # :argc_limit :: the maximum number of arguments to a remote
     #                method accepted by the server.  Defaults to
     #                256.
-    # :safe_level :: The safe level of the DRbServer.  The attribute
-    #                sets $SAFE for methods performed in the main_loop.
-    #                Defaults to 0.
-    #
     # The default values of these options can be modified on
     # a class-wide basis by the class methods #default_argc_limit,
     # #default_load_limit, #default_acl, #default_id_conv,
@@ -1408,7 +1465,6 @@ module DRb
 
       @front = front
       @idconv = @config[:idconv]
-      @safe_level = @config[:safe_level]
 
       @grp = ThreadGroup.new
       @thread = run
@@ -1435,12 +1491,6 @@ module DRb
     # The configuration of this DRbServer
     attr_reader :config
 
-    # The safe level for this server.  This is a number corresponding to
-    # $SAFE.
-    #
-    # The default safe_level is 0
-    attr_reader :safe_level
-
     # Set whether to operate in verbose mode.
     #
     # In verbose mode, failed calls are logged to stdout.
@@ -1467,12 +1517,7 @@ module DRb
       if  Thread.current['DRb'] && Thread.current['DRb']['server'] == self
         Thread.current['DRb']['stop_service'] = true
       else
-        if @protocol.respond_to? :shutdown
-          @protocol.shutdown
-        else
-          [@thread, *@grp.list].each {|thread| thread.kill} # xxx: Thread#kill
-        end
-        @thread.join
+        shutdown
       end
     end
 
@@ -1491,6 +1536,18 @@ module DRb
 
     private
 
+    def shutdown
+      current = Thread.current
+      if @protocol.respond_to? :shutdown
+        @protocol.shutdown
+      else
+        [@thread, *@grp.list].each { |thread|
+          thread.kill unless thread == current # xxx: Thread#kill
+        }
+      end
+      @thread.join unless @thread == current
+    end
+
     ##
     # Starts the DRb main loop in a new thread.
 
@@ -1520,9 +1577,9 @@ module DRb
     # Coerce an object to a string, providing our own representation if
     # to_s is not defined for the object.
     def any_to_s(obj)
-      obj.to_s + ":#{obj.class}"
+      "#{obj}:#{obj.class}"
     rescue
-      sprintf("#<%s:0x%lx>", obj.class, obj.__id__)
+      Kernel.instance_method(:to_s).bind_call(obj)
     end
 
     # Check that a method is callable via dRuby.
@@ -1538,14 +1595,27 @@ 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)
-        desc = any_to_s(obj)
-        raise NoMethodError, "private method `#{msg_id}' called for #{desc}"
-      elsif obj.protected_methods.include?(msg_id)
-        desc = any_to_s(obj)
-        raise NoMethodError, "protected method `#{msg_id}' called for #{desc}"
+      case obj
+      when Object
+        if obj.private_methods.include?(msg_id)
+          desc = any_to_s(obj)
+          raise NoMethodError, "private method `#{msg_id}' called for #{desc}"
+        elsif obj.protected_methods.include?(msg_id)
+          desc = any_to_s(obj)
+          raise NoMethodError, "protected method `#{msg_id}' called for #{desc}"
+        else
+          true
+        end
       else
-        true
+        if Kernel.instance_method(:private_methods).bind(obj).call.include?(msg_id)
+          desc = any_to_s(obj)
+          raise NoMethodError, "private method `#{msg_id}' called for #{desc}"
+        elsif Kernel.instance_method(:protected_methods).bind(obj).call.include?(msg_id)
+          desc = any_to_s(obj)
+          raise NoMethodError, "protected method `#{msg_id}' called for #{desc}"
+        else
+          true
+        end
       end
     end
     public :check_insecure_method
@@ -1553,7 +1623,6 @@ module DRb
     class InvokeMethod  # :nodoc:
       def initialize(drb_server, client)
         @drb_server = drb_server
-        @safe_level = drb_server.safe_level
         @client = client
       end
 
@@ -1562,34 +1631,22 @@ module DRb
         @succ = false
         setup_message
 
-        if $SAFE < @safe_level
-          info = Thread.current['DRb']
-          if @block
-            @result = Thread.new {
-              Thread.current['DRb'] = info
-              $SAFE = @safe_level
-              perform_with_block
-            }.value
-          else
-            @result = Thread.new {
-              Thread.current['DRb'] = info
-              $SAFE = @safe_level
-              perform_without_block
-            }.value
-          end
+        if @block
+          @result = perform_with_block
         else
-          if @block
-            @result = perform_with_block
-          else
-            @result = perform_without_block
-          end
+          @result = perform_without_block
         end
         @succ = true
-        if @msg_id == :to_ary && @result.class == Array
-          @result = DRbArray.new(@result)
+        case @result
+        when Array
+          if @msg_id == :to_ary
+            @result = DRbArray.new(@result)
+          end
         end
         return @succ, @result
-      rescue StandardError, ScriptError, Interrupt
+      rescue NoMemoryError, SystemExit, SystemStackError, SecurityError
+        raise
+      rescue Exception
         @result = $!
         return @succ, @result
       end
@@ -1627,7 +1684,7 @@ module DRb
 
     end
 
-    require 'drb/invokemethod'
+    require_relative 'invokemethod'
     class InvokeMethod
       include InvokeMethod18Mixin
     end
@@ -1667,13 +1724,16 @@ module DRb
             invoke_method = InvokeMethod.new(self, client)
             succ, result = invoke_method.perform
             error_print(result) if !succ && verbose
-            client.send_reply(succ, result)
+            unless DRbConnError === result && result.message == 'connection closed'
+              client.send_reply(succ, result)
+            end
           rescue Exception => e
             error_print(e) if verbose
           ensure
             client.close unless succ
             if Thread.current['DRb']['stop_service']
-              Thread.new { stop_service }
+              shutdown
+              break
             end
             break unless succ
           end
@@ -1824,7 +1884,7 @@ module DRb
   end
   module_function :install_acl
 
-  @mutex = Mutex.new
+  @mutex = Thread::Mutex.new
   def mutex # :nodoc:
     @mutex
   end
@@ -1854,6 +1914,11 @@ module DRb
   # Removes +server+ from the list of registered servers.
   def remove_server(server)
     @server.delete(server.uri)
+    mutex.synchronize do
+      if @primary_server == server
+        @primary_server = nil
+      end
+    end
   end
   module_function :remove_server
 
diff --git a/lib/drb/extserv.rb b/lib/drb/extserv.rb
index 1cb1be4709..a93d5d1576 100644
--- a/lib/drb/extserv.rb
+++ b/lib/drb/extserv.rb
@@ -4,7 +4,7 @@
         Copyright (c) 2000,2002 Masatoshi SEKI
 =end
 
-require 'drb/drb'
+require_relative 'drb'
 require 'monitor'
 
 module DRb
diff --git a/lib/drb/extservm.rb b/lib/drb/extservm.rb
index e2637aa62c..040e4e3e08 100644
--- a/lib/drb/extservm.rb
+++ b/lib/drb/extservm.rb
@@ -4,8 +4,7 @@
         Copyright (c) 2000 Masatoshi SEKI
 =end
 
-require 'drb/drb'
-require 'thread'
+require_relative 'drb'
 require 'monitor'
 
 module DRb
@@ -28,7 +27,7 @@ module DRb
       @cond = new_cond
       @servers = {}
       @waiting = []
-      @queue = Queue.new
+      @queue = Thread::Queue.new
       @thread = invoke_thread
       @uri = nil
     end
@@ -38,7 +37,7 @@ module DRb
       synchronize do
         while true
           server = @servers[name]
-          return server if server&.alive?
+          return server if server && server.alive? # server may be `false'
           invoke_service(name)
           @cond.wait
         end
@@ -62,8 +61,7 @@ module DRb
     private
     def invoke_thread
       Thread.new do
-        while true
-          name = @queue.pop
+        while name = @queue.pop
           invoke_service_command(name, @@command[name])
         end
       end
diff --git a/lib/drb/gw.rb b/lib/drb/gw.rb
index d000507644..65a525476e 100644
--- a/lib/drb/gw.rb
+++ b/lib/drb/gw.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require 'drb/drb'
+require_relative 'drb'
 require 'monitor'
 
 module DRb
diff --git a/lib/drb/observer.rb b/lib/drb/observer.rb
index 3ee15331a1..0fb7301edf 100644
--- a/lib/drb/observer.rb
+++ b/lib/drb/observer.rb
@@ -13,7 +13,7 @@ module DRb
         if defined? @observer_peers
           @observer_peers.each do |observer, method|
             begin
-              observer.send(method, *arg)
+              observer.__send__(method, *arg)
             rescue
               delete_observer(observer)
             end
diff --git a/lib/drb/ssl.rb b/lib/drb/ssl.rb
index 8d2724e736..54ab1ef395 100644
--- a/lib/drb/ssl.rb
+++ b/lib/drb/ssl.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 require 'socket'
 require 'openssl'
-require 'drb/drb'
+require_relative 'drb'
 require 'singleton'
 
 module DRb
@@ -162,7 +162,7 @@ module DRb
           return
         end
 
-        rsa = OpenSSL::PKey::RSA.new(1024){|p, n|
+        rsa = OpenSSL::PKey::RSA.new(2048){|p, n|
           next unless self[:verbose]
           case p
           when 0; $stderr.putc "."  # BN_generate_prime
@@ -196,7 +196,7 @@ module DRb
         if comment = self[:SSLCertComment]
           cert.add_extension(ef.create_extension("nsComment", comment))
         end
-        cert.sign(rsa, OpenSSL::Digest::SHA1.new)
+        cert.sign(rsa, "SHA256")
 
         @cert = cert
         @pkey = rsa
@@ -226,13 +226,13 @@ module DRb
     #
     # Raises DRbBadScheme or DRbBadURI if +uri+ is not matching or malformed
     def self.parse_uri(uri) # :nodoc:
-      if uri =~ /^drbssl:\/\/(.*?):(\d+)(\?(.*))?$/
+      if /\Adrbssl:\/\/(.*?):(\d+)(\?(.*))?\z/ =~ uri
         host = $1
         port = $2.to_i
         option = $4
         [host, port, option]
       else
-        raise(DRbBadScheme, uri) unless uri =~ /^drbssl:/
+        raise(DRbBadScheme, uri) unless uri.start_with?('drbssl:')
         raise(DRbBadURI, 'can\'t parse uri:' + uri)
       end
     end
@@ -248,8 +248,6 @@ module DRb
     # configuration.  Either a Hash or DRb::DRbSSLSocket::SSLConfig
     def self.open(uri, config)
       host, port, = parse_uri(uri)
-      host.untaint
-      port.untaint
       soc = TCPSocket.open(host, port)
       ssl_conf = SSLConfig::new(config)
       ssl_conf.setup_ssl_context
@@ -336,7 +334,7 @@ module DRb
       end
       self.class.new(uri, ssl, @config, true)
       rescue OpenSSL::SSL::SSLError
-        warn("#{__FILE__}:#{__LINE__}: warning: #{$!.message} (#{$!.class})") if @config[:verbose]
+        warn("#{$!.message} (#{$!.class})", uplevel: 0) if @config[:verbose]
         retry
       end
     end
diff --git a/lib/drb/timeridconv.rb b/lib/drb/timeridconv.rb
index 9ac7e1e69c..3ead98a7f2 100644
--- a/lib/drb/timeridconv.rb
+++ b/lib/drb/timeridconv.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require 'drb/drb'
+require_relative 'drb'
 require 'monitor'
 
 module DRb
diff --git a/lib/drb/unix.rb b/lib/drb/unix.rb
index adacf6df5b..1629ad3bcd 100644
--- a/lib/drb/unix.rb
+++ b/lib/drb/unix.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: false
 require 'socket'
-require 'drb/drb'
+require_relative 'drb'
 require 'tmpdir'
 
 raise(LoadError, "UNIXServer is required") unless defined?(UNIXServer)
@@ -15,19 +15,18 @@ module DRb
   class DRbUNIXSocket < DRbTCPSocket
     # :stopdoc:
     def self.parse_uri(uri)
-      if /^drbunix:(.*?)(\?(.*))?$/ =~ uri
+      if /\Adrbunix:(.*?)(\?(.*))?\z/ =~ uri
         filename = $1
         option = $3
         [filename, option]
       else
-        raise(DRbBadScheme, uri) unless uri =~ /^drbunix:/
+        raise(DRbBadScheme, uri) unless uri.start_with?('drbunix:')
         raise(DRbBadURI, 'can\'t parse uri:' + uri)
       end
     end
 
     def self.open(uri, config)
       filename, = parse_uri(uri)
-      filename.untaint
       soc = UNIXSocket.open(filename)
       self.new(uri, soc, config)
     end
@@ -95,6 +94,7 @@ module DRb
     public
     def close
       return unless @socket
+      shutdown # DRbProtocol#shutdown
       path = @socket.path if @server_mode
       @socket.close
       File.unlink(path) if @server_mode
diff --git a/lib/drb/version.rb b/lib/drb/version.rb
new file mode 100644
index 0000000000..e1f33cc65e
--- /dev/null
+++ b/lib/drb/version.rb
@@ -0,0 +1,3 @@
+module DRb
+  VERSION = "2.0.5"
+end
diff --git a/lib/drb/weakidconv.rb b/lib/drb/weakidconv.rb
new file mode 100644
index 0000000000..ecf0bf515f
--- /dev/null
+++ b/lib/drb/weakidconv.rb
@@ -0,0 +1,59 @@
+# frozen_string_literal: false
+require_relative 'drb'
+require 'monitor'
+
+module DRb
+
+  # To use WeakIdConv:
+  #
+  #  DRb.start_service(nil, nil, {:idconv => DRb::WeakIdConv.new})
+
+  class WeakIdConv < DRbIdConv
+    class WeakSet
+      include MonitorMixin
+      def initialize
+        super()
+        @immutable = {}
+        @map = ObjectSpace::WeakMap.new
+      end
+
+      def add(obj)
+        synchronize do
+          begin
+            @map[obj] = self
+          rescue ArgumentError
+            @immutable[obj.__id__] = obj
+          end
+          return obj.__id__
+        end
+      end
+
+      def fetch(ref)
+        synchronize do
+          @immutable.fetch(ref) {
+            @map.each { |key, _|
+              return key if key.__id__ == ref
+            }
+            raise RangeError.new("invalid reference")
+          }
+        end
+      end
+    end
+
+    def initialize()
+      super()
+      @weak_set = WeakSet.new
+    end
+
+    def to_obj(ref) # :nodoc:
+      return super if ref.nil?
+      @weak_set.fetch(ref)
+    end
+
+    def to_id(obj) # :nodoc:
+      return @weak_set.add(obj)
+    end
+  end
+end
+
+# DRb.install_id_conv(WeakIdConv.new)
diff --git a/lib/e2mmap.rb b/lib/e2mmap.rb
deleted file mode 100644
index a9990b5ec5..0000000000
--- a/lib/e2mmap.rb
+++ /dev/null
@@ -1,173 +0,0 @@
-# frozen_string_literal: false
-#
-#--
-#   e2mmap.rb - for Ruby 1.1
-#       $Release Version: 2.0$
-#       $Revision: 1.10 $
-#       by Keiju ISHITSUKA
-#
-#++
-#
-# Helper module for easily defining exceptions with predefined messages.
-#
-# == Usage
-#
-# 1.
-#   class Foo
-#     extend Exception2MessageMapper
-#     def_e2message ExistingExceptionClass, "message..."
-#     def_exception :NewExceptionClass, "message..."[, superclass]
-#     ...
-#   end
-#
-# 2.
-#   module Error
-#     extend Exception2MessageMapper
-#     def_e2message ExistingExceptionClass, "message..."
-#     def_exception :NewExceptionClass, "message..."[, superclass]
-#     ...
-#   end
-#   class Foo
-#     include Error
-#     ...
-#   end
-#
-#   foo = Foo.new
-#   foo.Fail ....
-#
-# 3.
-#   module Error
-#     extend Exception2MessageMapper
-#     def_e2message ExistingExceptionClass, "message..."
-#     def_exception :NewExceptionClass, "message..."[, superclass]
-#     ...
-#   end
-#   class Foo
-#     extend Exception2MessageMapper
-#     include Error
-#     ...
-#   end
-#
-#   Foo.Fail NewExceptionClass, arg...
-#   Foo.Fail ExistingExceptionClass, arg...
-#
-#
-module Exception2MessageMapper
-
-  E2MM = Exception2MessageMapper # :nodoc:
-
-  def E2MM.extend_object(cl)
-    super
-    cl.bind(self) unless cl < E2MM
-  end
-
-  def bind(cl)
-    self.module_eval %[
-      def Raise(err = nil, *rest)
-        Exception2MessageMapper.Raise(self.class, err, *rest)
-      end
-      alias Fail Raise
-
-      def self.included(mod)
-        mod.extend Exception2MessageMapper
-      end
-    ]
-  end
-
-  # Fail(err, *rest)
-  #     err:    exception
-  #     rest:   message arguments
-  #
-  def Raise(err = nil, *rest)
-    E2MM.Raise(self, err, *rest)
-  end
-  alias Fail Raise
-  alias fail Raise
-
-  # def_e2message(c, m)
-  #         c:  exception
-  #         m:  message_form
-  #     define exception c with message m.
-  #
-  def def_e2message(c, m)
-    E2MM.def_e2message(self, c, m)
-  end
-
-  # def_exception(n, m, s)
-  #         n:  exception_name
-  #         m:  message_form
-  #         s:  superclass(default: StandardError)
-  #     define exception named ``c'' with message m.
-  #
-  def def_exception(n, m, s = StandardError)
-    E2MM.def_exception(self, n, m, s)
-  end
-
-  #
-  # Private definitions.
-  #
-  # {[class, exp] => message, ...}
-  @MessageMap = {}
-
-  # E2MM.def_e2message(k, e, m)
-  #         k:  class to define exception under.
-  #         e:  exception
-  #         m:  message_form
-  #     define exception c with message m.
-  #
-  def E2MM.def_e2message(k, c, m)
-    E2MM.instance_eval{@MessageMap[[k, c]] = m}
-    c
-  end
-
-  # E2MM.def_exception(k, n, m, s)
-  #         k:  class to define exception under.
-  #         n:  exception_name
-  #         m:  message_form
-  #         s:  superclass(default: StandardError)
-  #     define exception named ``c'' with message m.
-  #
-  def E2MM.def_exception(k, n, m, s = StandardError)
-    n = n.id2name if n.kind_of?(Fixnum)
-    e = Class.new(s)
-    E2MM.instance_eval{@MessageMap[[k, e]] = m}
-    k.const_set(n, e)
-  end
-
-  # Fail(klass, err, *rest)
-  #     klass:  class to define exception under.
-  #     err:    exception
-  #     rest:   message arguments
-  #
-  def E2MM.Raise(klass = E2MM, err = nil, *rest)
-    if form = e2mm_message(klass, err)
-      b = $@.nil? ? caller(1) : $@
-      b.shift if b[0] =~ /^#{Regexp.quote(__FILE__)}:/
-      raise err, sprintf(form, *rest), b
-    else
-      E2MM.Fail E2MM, ErrNotRegisteredException, err.inspect
-    end
-  end
-  class << E2MM
-    alias Fail Raise
-  end
-
-  def E2MM.e2mm_message(klass, exp)
-    for c in klass.ancestors
-      if mes = @MessageMap[[c,exp]]
-        m = klass.instance_eval('"' + mes + '"')
-        return m
-      end
-    end
-    nil
-  end
-  class << self
-    alias message e2mm_message
-  end
-
-  E2MM.def_exception(E2MM,
-                     :ErrNotRegisteredException,
-                     "not registered exception(%s)")
-end
-
-
diff --git a/lib/erb.gemspec b/lib/erb.gemspec
new file mode 100644
index 0000000000..1cace278c1
--- /dev/null
+++ b/lib/erb.gemspec
@@ -0,0 +1,24 @@
+Gem::Specification.new do |spec|
+  spec.name          = "erb"
+  spec.version       = "2.2.0"
+  spec.authors       = ["Masatoshi SEKI"]
+  spec.email         = ["seki@ruby-lang.org"]
+
+  spec.summary       = %q{An easy to use but powerful templating system for Ruby.}
+  spec.description   = %q{An easy to use but powerful templating system for Ruby.}
+  spec.homepage      = "https://github.com/ruby/erb"
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.licenses      = ["Ruby", "BSD-2-Clause"]
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+
+  spec.files         = Dir.chdir(File.expand_path("..", __FILE__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir        = "libexec"
+  spec.executables   = ["erb"]
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency "cgi"
+end
diff --git a/lib/erb.rb b/lib/erb.rb
index af5a4bac9c..d2ea64ab60 100644
--- a/lib/erb.rb
+++ b/lib/erb.rb
@@ -1,5 +1,5 @@
 # -*- coding: us-ascii -*-
-# frozen_string_literal: false
+# frozen_string_literal: true
 # = ERB -- Ruby Templating
 #
 # Author:: Masatoshi SEKI
@@ -57,7 +57,6 @@ require "cgi/util"
 #
 # There are several settings you can change when you use ERB:
 # * the nature of the tags that are recognized;
-# * the value of <tt>$SAFE</tt> under which the template is run;
 # * the binding used to resolve local variables in the template.
 #
 # See the ERB.new and ERB#result methods for more detail.
@@ -115,7 +114,7 @@ require "cgi/util"
 #     James Edward Gray II
 #   }.gsub(/^  /, '')
 #
-#   message = ERB.new(template, 0, "%<>")
+#   message = ERB.new(template, trim_mode: "%<>")
 #
 #   # Set up template data.
 #   to = "Community Spokesman <spokesman@ruby_community.org>"
@@ -248,22 +247,20 @@ require "cgi/util"
 #
 # == Notes
 #
-# There are a variety of templating solutions available in various Ruby projects:
-# * ERB's big brother, eRuby, works the same but is written in C for speed;
-# * Amrita (smart at producing HTML/XML);
-# * cs/Template (written in C for speed);
-# * RDoc, distributed with Ruby, uses its own template engine, which can be reused elsewhere;
-# * and others; search {RubyGems.org}[https://rubygems.org/] or
-#   {The Ruby Toolbox}[https://www.ruby-toolbox.com/].
+# There are a variety of templating solutions available in various Ruby projects.
+# For example, RDoc, distributed with Ruby, uses its own template engine, which
+# can be reused elsewhere.
 #
-# Rails, the web application framework, uses ERB to create views.
+# Other popular engines could be found in the corresponding
+# {Category}[https://www.ruby-toolbox.com/categories/template_engines] of
+# The Ruby Toolbox.
 #
 class ERB
   Revision = '$Date::                           $' # :nodoc: #'
 
   # Returns revision information for the erb.rb module.
   def self.version
-    "erb.rb [2.1.0 #{ERB::Revision.split[1]}]"
+    "erb.rb [2.2.0 #{ERB::Revision.split[1]}]"
   end
 end
 
@@ -280,9 +277,9 @@ class ERB
   # ERB#src:
   #
   #   compiler = ERB::Compiler.new('<>')
-  #   compiler.pre_cmd    = ["_erbout=String.new"]
-  #   compiler.put_cmd    = "_erbout.concat"
-  #   compiler.insert_cmd = "_erbout.concat"
+  #   compiler.pre_cmd    = ["_erbout=+''"]
+  #   compiler.put_cmd    = "_erbout.<<"
+  #   compiler.insert_cmd = "_erbout.<<"
   #   compiler.post_cmd   = ["_erbout"]
   #
   #   code, enc = compiler.compile("Got <%= obj %>!\n")
@@ -291,7 +288,7 @@ class ERB
   # <i>Generates</i>:
   #
   #   #coding:UTF-8
-  #   _erbout=String.new; _erbout.concat "Got "; _erbout.concat(( obj ).to_s); _erbout.concat "!\n"; _erbout
+  #   _erbout=+''; _erbout.<< "Got ".freeze; _erbout.<<(( obj ).to_s); _erbout.<< "!\n".freeze; _erbout
   #
   # By default the output is sent to the print method.  For example:
   #
@@ -302,7 +299,7 @@ class ERB
   # <i>Generates</i>:
   #
   #   #coding:UTF-8
-  #   print "Got "; print(( obj ).to_s); print "!\n"
+  #   print "Got ".freeze; print(( obj ).to_s); print "!\n".freeze
   #
   # == Evaluation
   #
@@ -347,16 +344,15 @@ class ERB
       end
       attr_reader :value
       alias :to_s :value
-
-      def empty?
-        @value.empty?
-      end
     end
 
     class Scanner # :nodoc:
       @scanner_map = {}
-      def self.regist_scanner(klass, trim_mode, percent)
-        @scanner_map[[trim_mode, percent]] = klass
+      class << self
+        def register_scanner(klass, trim_mode, percent)
+          @scanner_map[[trim_mode, percent]] = klass
+        end
+        alias :regist_scanner :register_scanner
       end
 
       def self.default_scanner=(klass)
@@ -368,11 +364,13 @@ class ERB
         klass.new(src, trim_mode, percent)
       end
 
+      DEFAULT_STAGS = %w(<%% <%= <%# <%).freeze
+      DEFAULT_ETAGS = %w(%%> %>).freeze
       def initialize(src, trim_mode, percent)
         @src = src
         @stag = nil
-        @stags = %w(<%% <%= <%# <%).freeze
-        @etags = %w(%%> %>).freeze
+        @stags = DEFAULT_STAGS
+        @etags = DEFAULT_ETAGS
       end
       attr_accessor :stag
       attr_reader :stags, :etags
@@ -386,20 +384,19 @@ class ERB
         @trim_mode = trim_mode
         @percent = percent
         if @trim_mode == '>'
-          @scan_reg  = /(.*?)(%>\n|#{(stags + etags).join('|')}|\n|\z)/m
+          @scan_reg  = /(.*?)(%>\r?\n|#{(stags + etags).join('|')}|\n|\z)/m
           @scan_line = self.method(:trim_line1)
         elsif @trim_mode == '<>'
-          @scan_reg  = /(.*?)(%>\n|#{(stags + etags).join('|')}|\n|\z)/m
+          @scan_reg  = /(.*?)(%>\r?\n|#{(stags + etags).join('|')}|\n|\z)/m
           @scan_line = self.method(:trim_line2)
         elsif @trim_mode == '-'
-          @scan_reg  = /(.*?)(^[ \t]*<%\-|<%\-|-%>\n|-%>|#{(stags + etags).join('|')}|\z)/m
+          @scan_reg  = /(.*?)(^[ \t]*<%\-|<%\-|-%>\r?\n|-%>|#{(stags + etags).join('|')}|\z)/m
           @scan_line = self.method(:explicit_trim_line)
         else
           @scan_reg  = /(.*?)(#{(stags + etags).join('|')}|\n|\z)/m
           @scan_line = self.method(:scan_line)
         end
       end
-      attr_accessor :stag
 
       def scan(&block)
         @stag = nil
@@ -439,7 +436,7 @@ class ERB
         line.scan(@scan_reg) do |tokens|
           tokens.each do |token|
             next if token.empty?
-            if token == "%>\n"
+            if token == "%>\n" || token == "%>\r\n"
               yield('%>')
               yield(:cr)
             else
@@ -455,7 +452,7 @@ class ERB
           tokens.each do |token|
             next if token.empty?
             head = token unless head
-            if token == "%>\n"
+            if token == "%>\n" || token == "%>\r\n"
               yield('%>')
               if is_erb_stag?(head)
                 yield(:cr)
@@ -477,7 +474,7 @@ class ERB
             next if token.empty?
             if @stag.nil? && /[ \t]*<%-/ =~ token
               yield('<%')
-            elsif @stag && token == "-%>\n"
+            elsif @stag && (token == "-%>\n" || token == "-%>\r\n")
               yield('%>')
               yield(:cr)
             elsif @stag && token == '-%>'
@@ -497,25 +494,14 @@ class ERB
 
     Scanner.default_scanner = TrimScanner
 
-    class SimpleScanner < Scanner # :nodoc:
-      def scan
-        @src.scan(/(.*?)(#{(stags + etags).join('|')}|\n|\z)/m) do |tokens|
-          tokens.each do |token|
-            next if token.empty?
-            yield(token)
-          end
-        end
-      end
-    end
-
-    Scanner.regist_scanner(SimpleScanner, nil, false)
-
     begin
       require 'strscan'
-      class SimpleScanner2 < Scanner # :nodoc:
+    rescue LoadError
+    else
+      class SimpleScanner < Scanner # :nodoc:
         def scan
-          stag_reg = /(.*?)(#{stags.join('|')}|\z)/m
-          etag_reg = /(.*?)(#{etags.join('|')}|\z)/m
+          stag_reg = (stags == DEFAULT_STAGS) ? /(.*?)(<%[%=#]?|\z)/m : /(.*?)(#{stags.join('|')}|\z)/m
+          etag_reg = (etags == DEFAULT_ETAGS) ? /(.*?)(%%?>|\z)/m : /(.*?)(#{etags.join('|')}|\z)/m
           scanner = StringScanner.new(@src)
           while ! scanner.eos?
             scanner.scan(@stag ? etag_reg : stag_reg)
@@ -524,7 +510,7 @@ class ERB
           end
         end
       end
-      Scanner.regist_scanner(SimpleScanner2, nil, false)
+      Scanner.register_scanner(SimpleScanner, nil, false)
 
       class ExplicitScanner < Scanner # :nodoc:
         def scan
@@ -540,23 +526,21 @@ class ERB
               yield('<%')
             elsif elem == '-%>'
               yield('%>')
-              yield(:cr) if scanner.scan(/(\n|\z)/)
+              yield(:cr) if scanner.scan(/(\r?\n|\z)/)
             else
               yield(elem)
             end
           end
         end
       end
-      Scanner.regist_scanner(ExplicitScanner, '-', false)
-
-    rescue LoadError
+      Scanner.register_scanner(ExplicitScanner, '-', false)
     end
 
     class Buffer # :nodoc:
       def initialize(compiler, enc=nil, frozen=nil)
         @compiler = compiler
         @line = []
-        @script = ''
+        @script = +''
         @script << "#coding:#{enc}\n" if enc
         @script << "#frozen-string-literal:#{frozen}\n" unless frozen.nil?
         @compiler.pre_cmd.each do |x|
@@ -585,17 +569,8 @@ class ERB
       end
     end
 
-    def content_dump(s) # :nodoc:
-      n = s.count("\n")
-      if n > 0
-        s.dump + "\n" * n
-      else
-        s.dump
-      end
-    end
-
     def add_put_cmd(out, content)
-      out.push("#{@put_cmd} #{content_dump(content)}")
+      out.push("#{@put_cmd} #{content.dump}.freeze#{"\n" * content.count("\n")}")
     end
 
     def add_insert_cmd(out, content)
@@ -611,7 +586,7 @@ class ERB
       magic_comment = detect_magic_comment(s, enc)
       out = Buffer.new(self, *magic_comment)
 
-      self.content = ''
+      self.content = +''
       scanner = make_scanner(s)
       scanner.scan do |token|
         next if token.nil?
@@ -631,7 +606,7 @@ class ERB
       case stag
       when PercentLine
         add_put_cmd(out, content) if content.size > 0
-        self.content = ''
+        self.content = +''
         out.push(stag.to_s)
         out.cr
       when :cr
@@ -639,11 +614,11 @@ class ERB
       when '<%', '<%=', '<%#'
         scanner.stag = stag
         add_put_cmd(out, content) if content.size > 0
-        self.content = ''
+        self.content = +''
       when "\n"
         content << "\n"
         add_put_cmd(out, content)
-        self.content = ''
+        self.content = +''
       when '<%%'
         content << '<%'
       else
@@ -656,7 +631,7 @@ class ERB
       when '%>'
         compile_content(scanner.stag, out)
         scanner.stag = nil
-        self.content = ''
+        self.content = +''
       when '%%>'
         content << '%>'
       else
@@ -677,7 +652,7 @@ class ERB
       when '<%='
         add_insert_cmd(out, content)
       when '<%#'
-        # out.push("# #{content_dump(content)}")
+        # commented out
       end
     end
 
@@ -687,9 +662,13 @@ class ERB
         return [false, '>']
       when 2
         return [false, '<>']
-      when 0
+      when 0, nil
         return [false, nil]
       when String
+        unless mode.match?(/\A(%|-|>|<>){1,2}\z/)
+          warn_invalid_trim_mode(mode, uplevel: 5)
+        end
+
         perc = mode.include?('%')
         if mode.include?('-')
           return [perc, '-']
@@ -701,6 +680,7 @@ class ERB
           [perc, nil]
         end
       else
+        warn_invalid_trim_mode(mode, uplevel: 5)
         return [false, nil]
       end
     end
@@ -752,6 +732,10 @@ class ERB
       end
       return enc, frozen
     end
+
+    def warn_invalid_trim_mode(mode, uplevel:)
+      warn "Invalid ERB trim mode: #{mode.inspect} (trim_mode: nil, 0, 1, 2, or String composed of '%' and/or '-', '>', '<>')", uplevel: uplevel + 1
+    end
   end
 end
 
@@ -762,9 +746,7 @@ class ERB
   # Constructs a new ERB object with the template specified in _str_.
   #
   # An ERB object works by building a chunk of Ruby code that will output
-  # the completed template when run. If _safe_level_ is set to a non-nil value,
-  # ERB code will be run in a separate thread with <b>$SAFE</b> set to the
-  # provided level.
+  # the completed template when run.
   #
   # If _trim_mode_ is passed a String containing one or more of the following
   # modifiers, ERB will adjust its code generation as listed:
@@ -799,11 +781,11 @@ class ERB
   #    def build
   #      b = binding
   #      # create and run templates, filling member data variables
-  #      ERB.new(<<-'END_PRODUCT'.gsub(/^\s+/, ""), 0, "", "@product").result b
+  #      ERB.new(<<-'END_PRODUCT'.gsub(/^\s+/, ""), trim_mode: "", eoutvar: "@product").result b
   #        <%= PRODUCT[:name] %>
   #        <%= PRODUCT[:desc] %>
   #      END_PRODUCT
-  #      ERB.new(<<-'END_PRICE'.gsub(/^\s+/, ""), 0, "", "@price").result b
+  #      ERB.new(<<-'END_PRICE'.gsub(/^\s+/, ""), trim_mode: "", eoutvar: "@price").result b
   #        <%= PRODUCT[:name] %> -- <%= PRODUCT[:cost] %>
   #        <%= PRODUCT[:desc] %>
   #      END_PRICE
@@ -824,14 +806,31 @@ class ERB
   #  Chicken Fried Steak -- 9.95
   #  A well messages pattie, breaded and fried.
   #
-  def initialize(str, safe_level=nil, trim_mode=nil, eoutvar='_erbout')
-    @safe_level = safe_level
+  def initialize(str, safe_level=NOT_GIVEN, legacy_trim_mode=NOT_GIVEN, legacy_eoutvar=NOT_GIVEN, trim_mode: nil, eoutvar: '_erbout')
+    # Complex initializer for $SAFE deprecation at [Feature #14256]. Use keyword arguments to pass trim_mode or eoutvar.
+    if safe_level != NOT_GIVEN
+      warn 'Passing safe_level with the 2nd argument of ERB.new is deprecated. Do not use it, and specify other arguments as keyword arguments.', uplevel: 1 if $VERBOSE || !ZERO_SAFE_LEVELS.include?(safe_level)
+    end
+    if legacy_trim_mode != NOT_GIVEN
+      warn 'Passing trim_mode with the 3rd argument of ERB.new is deprecated. Use keyword argument like ERB.new(str, trim_mode: ...) instead.', uplevel: 1 if $VERBOSE
+      trim_mode = legacy_trim_mode
+    end
+    if legacy_eoutvar != NOT_GIVEN
+      warn 'Passing eoutvar with the 4th argument of ERB.new is deprecated. Use keyword argument like ERB.new(str, eoutvar: ...) instead.', uplevel: 1 if $VERBOSE
+      eoutvar = legacy_eoutvar
+    end
+
     compiler = make_compiler(trim_mode)
     set_eoutvar(compiler, eoutvar)
     @src, @encoding, @frozen_string = *compiler.compile(str)
     @filename = nil
     @lineno = 0
+    @_init = self.class.singleton_class
   end
+  NOT_GIVEN = Object.new
+  private_constant :NOT_GIVEN
+  ZERO_SAFE_LEVELS = [0, nil]
+  private_constant :ZERO_SAFE_LEVELS
 
   ##
   # Creates a new compiler for ERB.  See ERB::Compiler.new for details
@@ -854,6 +853,21 @@ class ERB
   # is run
   attr_accessor :lineno
 
+  #
+  # Sets optional filename and line number that will be used in ERB code
+  # evaluation and error reporting. See also #filename= and #lineno=
+  #
+  #   erb = ERB.new('<%= some_x %>')
+  #   erb.render
+  #   # undefined local variable or method `some_x'
+  #   #   from (erb):1
+  #
+  #   erb.location = ['file.erb', 3]
+  #   # All subsequent error reporting would use new location
+  #   erb.render
+  #   # undefined local variable or method `some_x'
+  #   #   from file.erb:4
+  #
   def location=((filename, lineno))
     @filename = filename
     @lineno = lineno if lineno
@@ -865,10 +879,10 @@ class ERB
   # requires the setup of an ERB _compiler_ object.
   #
   def set_eoutvar(compiler, eoutvar = '_erbout')
-    compiler.put_cmd = "#{eoutvar}.concat"
-    compiler.insert_cmd = "#{eoutvar}.concat"
-    compiler.pre_cmd = ["#{eoutvar} = String.new"]
-    compiler.post_cmd = ["#{eoutvar}.force_encoding(__ENCODING__)"]
+    compiler.put_cmd = "#{eoutvar}.<<"
+    compiler.insert_cmd = "#{eoutvar}.<<"
+    compiler.pre_cmd = ["#{eoutvar} = +''"]
+    compiler.post_cmd = [eoutvar]
   end
 
   # Generate results and print them. (see ERB#result)
@@ -885,22 +899,35 @@ class ERB
   # code evaluation.
   #
   def result(b=new_toplevel)
-    if @safe_level
-      proc {
-        $SAFE = @safe_level
-        eval(@src, b, (@filename || '(erb)'), @lineno)
-      }.call
-    else
-      eval(@src, b, (@filename || '(erb)'), @lineno)
+    unless @_init.equal?(self.class.singleton_class)
+      raise ArgumentError, "not initialized"
     end
+    eval(@src, b, (@filename || '(erb)'), @lineno)
+  end
+
+  # Render a template on a new toplevel binding with local variables specified
+  # by a Hash object.
+  def result_with_hash(hash)
+    b = new_toplevel(hash.keys)
+    hash.each_pair do |key, value|
+      b.local_variable_set(key, value)
+    end
+    result(b)
   end
 
   ##
   # Returns a new binding each time *near* TOPLEVEL_BINDING for runs that do
   # not specify a binding.
 
-  def new_toplevel
-    TOPLEVEL_BINDING.dup
+  def new_toplevel(vars = nil)
+    b = TOPLEVEL_BINDING
+    if vars
+      vars = vars.select {|v| b.local_variable_defined?(v)}
+      unless vars.empty?
+        return b.eval("tap {|;#{vars.join(',')}| break binding}")
+      end
+    end
+    b.dup
   end
   private :new_toplevel
 
@@ -992,8 +1019,8 @@ class ERB
     #   Programming%20Ruby%3A%20%20The%20Pragmatic%20Programmer%27s%20Guide
     #
     def url_encode(s)
-      s.to_s.b.gsub(/[^a-zA-Z0-9_\-.]/n) { |m|
-        sprintf("%%%02X", m.unpack("C")[0])
+      s.to_s.b.gsub(/[^a-zA-Z0-9_\-.~]/n) { |m|
+        sprintf("%%%02X", m.unpack1("C"))
       }
     end
     alias u url_encode
diff --git a/lib/fileutils.gemspec b/lib/fileutils.gemspec
new file mode 100644
index 0000000000..53c32e7e3e
--- /dev/null
+++ b/lib/fileutils.gemspec
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+source_version = ["", "lib/"].find do |dir|
+  begin
+    break File.open(File.join(__dir__, "#{dir}fileutils.rb")) {|f|
+      f.gets("\n  VERSION = ")
+      f.gets[/\s*"(.+)"/, 1]
+    }
+  rescue Errno::ENOENT
+  end
+end
+
+Gem::Specification.new do |s|
+  s.name = "fileutils"
+  s.version = source_version
+  s.summary = "Several file utility methods for copying, moving, removing, etc."
+  s.description = "Several file utility methods for copying, moving, removing, etc."
+
+  s.require_path = %w{lib}
+  s.files = ["LICENSE.txt", "README.md", "Rakefile", "fileutils.gemspec", "lib/fileutils.rb"]
+  s.required_ruby_version = ">= 2.3.0"
+
+  s.authors = ["Minero Aoki"]
+  s.email = [nil]
+  s.homepage = "https://github.com/ruby/fileutils"
+  s.licenses = ["Ruby", "BSD-2-Clause"]
+
+  s.metadata = {
+    "source_code_uri" => "https://github.com/ruby/fileutils"
+  }
+end
diff --git a/lib/fileutils.rb b/lib/fileutils.rb
index de8474f2d0..a2ad0c003e 100644
--- a/lib/fileutils.rb
+++ b/lib/fileutils.rb
@@ -1,4 +1,11 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
+
+begin
+  require 'rbconfig'
+rescue LoadError
+  # for make mjit-headers
+end
+
 #
 # = fileutils.rb
 #
@@ -15,48 +22,58 @@
 #
 #   require 'fileutils'
 #
-#   FileUtils.cd(dir, options)
-#   FileUtils.cd(dir, options) {|dir| .... }
+#   FileUtils.cd(dir, **options)
+#   FileUtils.cd(dir, **options) {|dir| block }
 #   FileUtils.pwd()
-#   FileUtils.mkdir(dir, options)
-#   FileUtils.mkdir(list, options)
-#   FileUtils.mkdir_p(dir, options)
-#   FileUtils.mkdir_p(list, options)
-#   FileUtils.rmdir(dir, options)
-#   FileUtils.rmdir(list, options)
-#   FileUtils.ln(old, new, options)
-#   FileUtils.ln(list, destdir, options)
-#   FileUtils.ln_s(old, new, options)
-#   FileUtils.ln_s(list, destdir, options)
-#   FileUtils.ln_sf(src, dest, options)
-#   FileUtils.cp(src, dest, options)
-#   FileUtils.cp(list, dir, options)
-#   FileUtils.cp_r(src, dest, options)
-#   FileUtils.cp_r(list, dir, options)
-#   FileUtils.mv(src, dest, options)
-#   FileUtils.mv(list, dir, options)
-#   FileUtils.rm(list, options)
-#   FileUtils.rm_r(list, options)
-#   FileUtils.rm_rf(list, options)
-#   FileUtils.install(src, dest, mode = <src's>, options)
-#   FileUtils.chmod(mode, list, options)
-#   FileUtils.chmod_R(mode, list, options)
-#   FileUtils.chown(user, group, list, options)
-#   FileUtils.chown_R(user, group, list, options)
-#   FileUtils.touch(list, options)
+#   FileUtils.mkdir(dir, **options)
+#   FileUtils.mkdir(list, **options)
+#   FileUtils.mkdir_p(dir, **options)
+#   FileUtils.mkdir_p(list, **options)
+#   FileUtils.rmdir(dir, **options)
+#   FileUtils.rmdir(list, **options)
+#   FileUtils.ln(target, link, **options)
+#   FileUtils.ln(targets, dir, **options)
+#   FileUtils.ln_s(target, link, **options)
+#   FileUtils.ln_s(targets, dir, **options)
+#   FileUtils.ln_sf(target, link, **options)
+#   FileUtils.cp(src, dest, **options)
+#   FileUtils.cp(list, dir, **options)
+#   FileUtils.cp_r(src, dest, **options)
+#   FileUtils.cp_r(list, dir, **options)
+#   FileUtils.mv(src, dest, **options)
+#   FileUtils.mv(list, dir, **options)
+#   FileUtils.rm(list, **options)
+#   FileUtils.rm_r(list, **options)
+#   FileUtils.rm_rf(list, **options)
+#   FileUtils.install(src, dest, **options)
+#   FileUtils.chmod(mode, list, **options)
+#   FileUtils.chmod_R(mode, list, **options)
+#   FileUtils.chown(user, group, list, **options)
+#   FileUtils.chown_R(user, group, list, **options)
+#   FileUtils.touch(list, **options)
+#
+# Possible <tt>options</tt> are:
 #
-# The <tt>options</tt> parameter is a hash of options, taken from the list
-# <tt>:force</tt>, <tt>:noop</tt>, <tt>:preserve</tt>, and <tt>:verbose</tt>.
-# <tt>:noop</tt> means that no changes are made.  The other two are obvious.
-# Each method documents the options that it honours.
+# <tt>:force</tt> :: forced operation (rewrite files if exist, remove
+#                    directories if not empty, etc.);
+# <tt>:verbose</tt> :: print command to be run, in bash syntax, before
+#                      performing it;
+# <tt>:preserve</tt> :: preserve object's group, user and modification
+#                       time on copying;
+# <tt>:noop</tt> :: no changes are made (usable in combination with
+#                   <tt>:verbose</tt> which will print the command to run)
+#
+# Each method documents the options that it honours. See also ::commands,
+# ::options and ::options_of methods to introspect which command have which
+# options.
 #
 # All methods that have the concept of a "source" file or directory can take
 # either one file or a list of files in that argument.  See the method
 # documentation for examples.
 #
-# There are some `low level' methods, which do not accept any option:
+# There are some `low level' methods, which do not accept keyword arguments:
 #
-#   FileUtils.copy_entry(src, dest, preserve = false, dereference = false)
+#   FileUtils.copy_entry(src, dest, preserve = false, dereference_root = false, remove_destination = false)
 #   FileUtils.copy_file(src, dest, preserve = false, dereference = true)
 #   FileUtils.copy_stream(srcstream, deststream)
 #   FileUtils.remove_entry(path, force = false)
@@ -84,8 +101,8 @@
 # files/directories.  This equates to passing the <tt>:noop</tt> and
 # <tt>:verbose</tt> flags to methods in FileUtils.
 #
-
 module FileUtils
+  VERSION = "1.5.0"
 
   def self.private_module_function(name)   #:nodoc:
     module_function name
@@ -106,19 +123,22 @@ module FileUtils
   #
   # Changes the current directory to the directory +dir+.
   #
-  # If this method is called with block, resumes to the old
-  # working directory after the block execution finished.
+  # If this method is called with block, resumes to the previous
+  # working directory after the block execution has finished.
   #
-  #   FileUtils.cd('/', :verbose => true)   # chdir and report it
+  #   FileUtils.cd('/')  # change directory
   #
-  #   FileUtils.cd('/') do  # chdir
-  #     [...]               # do something
+  #   FileUtils.cd('/', verbose: true)   # change directory and report it
+  #
+  #   FileUtils.cd('/') do  # change directory
+  #     # ...               # do something
   #   end                   # return to original directory
   #
   def cd(dir, verbose: nil, &block) # :yield: dir
     fu_output_message "cd #{dir}" if verbose
-    Dir.chdir(dir, &block)
+    result = Dir.chdir(dir, &block)
     fu_output_message 'cd -' if verbose and block
+    result
   end
   module_function :cd
 
@@ -144,7 +164,7 @@ module FileUtils
   end
   module_function :uptodate?
 
-  def remove_trailing_slash(dir)
+  def remove_trailing_slash(dir)   #:nodoc:
     dir == '/' ? dir : dir.chomp(?/)
   end
   private_module_function :remove_trailing_slash
@@ -153,9 +173,9 @@ module FileUtils
   # Creates one or more directories.
   #
   #   FileUtils.mkdir 'test'
-  #   FileUtils.mkdir %w( tmp data )
-  #   FileUtils.mkdir 'notexist', :noop => true  # Does not really create.
-  #   FileUtils.mkdir 'tmp', :mode => 0700
+  #   FileUtils.mkdir %w(tmp data)
+  #   FileUtils.mkdir 'notexist', noop: true  # Does not really create.
+  #   FileUtils.mkdir 'tmp', mode: 0700
   #
   def mkdir(list, mode: nil, noop: nil, verbose: nil)
     list = fu_list(list)
@@ -174,11 +194,12 @@ module FileUtils
   #
   #   FileUtils.mkdir_p '/usr/local/lib/ruby'
   #
-  # causes to make following directories, if it does not exist.
-  #     * /usr
-  #     * /usr/local
-  #     * /usr/local/lib
-  #     * /usr/local/lib/ruby
+  # causes to make following directories, if they do not exist.
+  #
+  # * /usr
+  # * /usr/local
+  # * /usr/local/lib
+  # * /usr/local/lib/ruby
   #
   # You can pass several directories at a time in a list.
   #
@@ -187,7 +208,9 @@ module FileUtils
     fu_output_message "mkdir -p #{mode ? ('-m %03o ' % mode) : ''}#{list.join ' '}" if verbose
     return *list if noop
 
-    list.map {|path| remove_trailing_slash(path)}.each do |path|
+    list.each do |item|
+      path = remove_trailing_slash(item)
+
       # optimize for the most common case
       begin
         fu_mkdir path, mode
@@ -200,7 +223,9 @@ module FileUtils
       until path == stack.last   # dirname("/")=="/", dirname("C:/")=="C:/"
         stack.push path
         path = File.dirname(path)
+        break if File.directory?(path)
       end
+      stack.pop if path == stack.last   # root directory should exist
       stack.reverse_each do |dir|
         begin
           fu_mkdir dir, mode
@@ -236,45 +261,46 @@ module FileUtils
   #   FileUtils.rmdir 'somedir'
   #   FileUtils.rmdir %w(somedir anydir otherdir)
   #   # Does not really remove directory; outputs message.
-  #   FileUtils.rmdir 'somedir', :verbose => true, :noop => true
+  #   FileUtils.rmdir 'somedir', verbose: true, noop: true
   #
   def rmdir(list, parents: nil, noop: nil, verbose: nil)
     list = fu_list(list)
     fu_output_message "rmdir #{parents ? '-p ' : ''}#{list.join ' '}" if verbose
     return if noop
     list.each do |dir|
-      begin
-        Dir.rmdir(dir = remove_trailing_slash(dir))
-        if parents
+      Dir.rmdir(dir = remove_trailing_slash(dir))
+      if parents
+        begin
           until (parent = File.dirname(dir)) == '.' or parent == dir
             dir = parent
             Dir.rmdir(dir)
           end
+        rescue Errno::ENOTEMPTY, Errno::EEXIST, Errno::ENOENT
         end
-      rescue Errno::ENOTEMPTY, Errno::EEXIST, Errno::ENOENT
       end
     end
   end
   module_function :rmdir
 
   #
-  # <b><tt>ln(old, new, **options)</tt></b>
+  # :call-seq:
+  #   FileUtils.ln(target, link, force: nil, noop: nil, verbose: nil)
+  #   FileUtils.ln(target,  dir, force: nil, noop: nil, verbose: nil)
+  #   FileUtils.ln(targets, dir, force: nil, noop: nil, verbose: nil)
   #
-  # Creates a hard link +new+ which points to +old+.
-  # If +new+ already exists and it is a directory, creates a link +new/old+.
-  # If +new+ already exists and it is not a directory, raises Errno::EEXIST.
-  # But if :force option is set, overwrite +new+.
+  # In the first form, creates a hard link +link+ which points to +target+.
+  # If +link+ already exists, raises Errno::EEXIST.
+  # But if the +force+ option is set, overwrites +link+.
   #
-  #   FileUtils.ln 'gcc', 'cc', :verbose => true
+  #   FileUtils.ln 'gcc', 'cc', verbose: true
   #   FileUtils.ln '/usr/bin/emacs21', '/usr/bin/emacs'
   #
-  # <b><tt>ln(list, destdir, **options)</tt></b>
-  #
-  # Creates several hard links in a directory, with each one pointing to the
-  # item in +list+.  If +destdir+ is not a directory, raises Errno::ENOTDIR.
+  # In the second form, creates a link +dir/target+ pointing to +target+.
+  # In the third form, creates several hard links in the directory +dir+,
+  # pointing to each item in +targets+.
+  # If +dir+ is not a directory, raises Errno::ENOTDIR.
   #
-  #   include FileUtils
-  #   cd '/sbin'
+  #   FileUtils.cd '/sbin'
   #   FileUtils.ln %w(cp mv mkdir), '/bin'   # Now /sbin/cp and /bin/cp are linked.
   #
   def ln(src, dest, force: nil, noop: nil, verbose: nil)
@@ -291,24 +317,57 @@ module FileUtils
   module_function :link
 
   #
-  # <b><tt>ln_s(old, new, **options)</tt></b>
+  # Hard link +src+ to +dest+. If +src+ is a directory, this method links
+  # all its contents recursively. If +dest+ is a directory, links
+  # +src+ to +dest/src+.
   #
-  # Creates a symbolic link +new+ which points to +old+.  If +new+ already
-  # exists and it is a directory, creates a symbolic link +new/old+.  If +new+
-  # already exists and it is not a directory, raises Errno::EEXIST.  But if
-  # :force option is set, overwrite +new+.
+  # +src+ can be a list of files.
   #
-  #   FileUtils.ln_s '/usr/bin/ruby', '/usr/local/bin/ruby'
-  #   FileUtils.ln_s 'verylongsourcefilename.c', 'c', :force => true
+  # If +dereference_root+ is true, this method dereference tree root.
   #
-  # <b><tt>ln_s(list, destdir, **options)</tt></b>
+  # If +remove_destination+ is true, this method removes each destination file before copy.
+  #
+  #   FileUtils.rm_r site_ruby + '/mylib', force: true
+  #   FileUtils.cp_lr 'lib/', site_ruby + '/mylib'
   #
-  # Creates several symbolic links in a directory, with each one pointing to the
-  # item in +list+.  If +destdir+ is not a directory, raises Errno::ENOTDIR.
+  #   # Examples of linking several files to target directory.
+  #   FileUtils.cp_lr %w(mail.rb field.rb debug/), site_ruby + '/tmail'
+  #   FileUtils.cp_lr Dir.glob('*.rb'), '/home/aamine/lib/ruby', noop: true, verbose: true
   #
-  # If +destdir+ is not a directory, raises Errno::ENOTDIR.
+  #   # If you want to link all contents of a directory instead of the
+  #   # directory itself, c.f. src/x -> dest/x, src/y -> dest/y,
+  #   # use the following code.
+  #   FileUtils.cp_lr 'src/.', 'dest'  # cp_lr('src', 'dest') makes dest/src, but this doesn't.
   #
-  #   FileUtils.ln_s Dir.glob('bin/*.rb'), '/home/aamine/bin'
+  def cp_lr(src, dest, noop: nil, verbose: nil,
+            dereference_root: true, remove_destination: false)
+    fu_output_message "cp -lr#{remove_destination ? ' --remove-destination' : ''} #{[src,dest].flatten.join ' '}" if verbose
+    return if noop
+    fu_each_src_dest(src, dest) do |s, d|
+      link_entry s, d, dereference_root, remove_destination
+    end
+  end
+  module_function :cp_lr
+
+  #
+  # :call-seq:
+  #   FileUtils.ln_s(target, link, force: nil, noop: nil, verbose: nil)
+  #   FileUtils.ln_s(target,  dir, force: nil, noop: nil, verbose: nil)
+  #   FileUtils.ln_s(targets, dir, force: nil, noop: nil, verbose: nil)
+  #
+  # In the first form, creates a symbolic link +link+ which points to +target+.
+  # If +link+ already exists, raises Errno::EEXIST.
+  # But if the <tt>force</tt> option is set, overwrites +link+.
+  #
+  #   FileUtils.ln_s '/usr/bin/ruby', '/usr/local/bin/ruby'
+  #   FileUtils.ln_s 'verylongsourcefilename.c', 'c', force: true
+  #
+  # In the second form, creates a link +dir/target+ pointing to +target+.
+  # In the third form, creates several symbolic links in the directory +dir+,
+  # pointing to each item in +targets+.
+  # If +dir+ is not a directory, raises Errno::ENOTDIR.
+  #
+  #   FileUtils.ln_s Dir.glob('/bin/*.rb'), '/home/foo/bin'
   #
   def ln_s(src, dest, force: nil, noop: nil, verbose: nil)
     fu_output_message "ln -s#{force ? 'f' : ''} #{[src,dest].flatten.join ' '}" if verbose
@@ -324,8 +383,12 @@ module FileUtils
   module_function :symlink
 
   #
+  # :call-seq:
+  #   FileUtils.ln_sf(*args)
+  #
   # Same as
-  #   #ln_s(src, dest, :force => true)
+  #
+  #   FileUtils.ln_s(*args, force: true)
   #
   def ln_sf(src, dest, noop: nil, verbose: nil)
     ln_s src, dest, force: true, noop: noop, verbose: verbose
@@ -333,6 +396,26 @@ module FileUtils
   module_function :ln_sf
 
   #
+  # Hard links a file system entry +src+ to +dest+.
+  # If +src+ is a directory, this method links its contents recursively.
+  #
+  # Both of +src+ and +dest+ must be a path name.
+  # +src+ must exist, +dest+ must not exist.
+  #
+  # If +dereference_root+ is true, this method dereferences the tree root.
+  #
+  # If +remove_destination+ is true, this method removes each destination file before copy.
+  #
+  def link_entry(src, dest, dereference_root = false, remove_destination = false)
+    Entry_.new(src, nil, dereference_root).traverse do |ent|
+      destent = Entry_.new(dest, ent.rel, false)
+      File.unlink destent.path if remove_destination && File.file?(destent.path)
+      ent.link destent.path
+    end
+  end
+  module_function :link_entry
+
+  #
   # Copies a file content +src+ to +dest+.  If +dest+ is a directory,
   # copies +src+ to +dest/src+.
   #
@@ -340,7 +423,7 @@ module FileUtils
   #
   #   FileUtils.cp 'eval.c', 'eval.c.org'
   #   FileUtils.cp %w(cgi.rb complex.rb date.rb), '/usr/lib/ruby/1.6'
-  #   FileUtils.cp %w(cgi.rb complex.rb date.rb), '/usr/lib/ruby/1.6', :verbose => true
+  #   FileUtils.cp %w(cgi.rb complex.rb date.rb), '/usr/lib/ruby/1.6', verbose: true
   #   FileUtils.cp 'symlink', 'dest'   # copy content, "dest" is not a symlink
   #
   def cp(src, dest, preserve: nil, noop: nil, verbose: nil)
@@ -362,13 +445,17 @@ module FileUtils
   #
   # +src+ can be a list of files.
   #
+  # If +dereference_root+ is true, this method dereference tree root.
+  #
+  # If +remove_destination+ is true, this method removes each destination file before copy.
+  #
   #   # Installing Ruby library "mylib" under the site_ruby
-  #   FileUtils.rm_r site_ruby + '/mylib', :force
+  #   FileUtils.rm_r site_ruby + '/mylib', force: true
   #   FileUtils.cp_r 'lib/', site_ruby + '/mylib'
   #
   #   # Examples of copying several files to target directory.
   #   FileUtils.cp_r %w(mail.rb field.rb debug/), site_ruby + '/tmail'
-  #   FileUtils.cp_r Dir.glob('*.rb'), '/home/aamine/lib/ruby', :noop => true, :verbose => true
+  #   FileUtils.cp_r Dir.glob('*.rb'), '/home/foo/lib/ruby', noop: true, verbose: true
   #
   #   # If you want to copy all contents of a directory instead of the
   #   # directory itself, c.f. src/x -> dest/x, src/y -> dest/y,
@@ -403,9 +490,13 @@ module FileUtils
   # If +remove_destination+ is true, this method removes each destination file before copy.
   #
   def copy_entry(src, dest, preserve = false, dereference_root = false, remove_destination = false)
-    Entry_.new(src, nil, dereference_root).wrap_traverse(proc do |ent|
+    if dereference_root
+      src = File.realpath(src)
+    end
+
+    Entry_.new(src, nil, false).wrap_traverse(proc do |ent|
       destent = Entry_.new(dest, ent.rel, false)
-      File.unlink destent.path if remove_destination && File.file?(destent.path)
+      File.unlink destent.path if remove_destination && (File.file?(destent.path) || File.symlink?(destent.path))
       ent.copy destent.path
     end, proc do |ent|
       destent = Entry_.new(dest, ent.rel, false)
@@ -440,10 +531,10 @@ module FileUtils
   # disk partition, the file is copied then the original file is removed.
   #
   #   FileUtils.mv 'badname.rb', 'goodname.rb'
-  #   FileUtils.mv 'stuff.rb', '/notexist/lib/ruby', :force => true  # no error
+  #   FileUtils.mv 'stuff.rb', '/notexist/lib/ruby', force: true  # no error
   #
-  #   FileUtils.mv %w(junk.txt dust.txt), '/home/aamine/.trash/'
-  #   FileUtils.mv Dir.glob('test*.rb'), 'test', :noop => true, :verbose => true
+  #   FileUtils.mv %w(junk.txt dust.txt), '/home/foo/.trash/'
+  #   FileUtils.mv Dir.glob('test*.rb'), 'test', noop: true, verbose: true
   #
   def mv(src, dest, force: nil, noop: nil, verbose: nil, secure: nil)
     fu_output_message "mv#{force ? ' -f' : ''} #{[src,dest].flatten.join ' '}" if verbose
@@ -454,13 +545,12 @@ module FileUtils
         if destent.exist?
           if destent.directory?
             raise Errno::EEXIST, d
-          else
-            destent.remove_file if rename_cannot_overwrite_file?
           end
         end
         begin
           File.rename s, d
-        rescue Errno::EXDEV
+        rescue Errno::EXDEV,
+               Errno::EPERM # move from unencrypted to encrypted dir (ext4)
           copy_entry s, d, true
           if secure
             remove_entry_secure s, force
@@ -478,18 +568,13 @@ module FileUtils
   alias move mv
   module_function :move
 
-  def rename_cannot_overwrite_file?   #:nodoc:
-    /emx/ =~ RUBY_PLATFORM
-  end
-  private_module_function :rename_cannot_overwrite_file?
-
   #
   # Remove file(s) specified in +list+.  This method cannot remove directories.
   # All StandardErrors are ignored when the :force option is set.
   #
   #   FileUtils.rm %w( junk.txt dust.txt )
   #   FileUtils.rm Dir.glob('*.so')
-  #   FileUtils.rm 'NotExistFile', :force => true   # never raises exception
+  #   FileUtils.rm 'NotExistFile', force: true   # never raises exception
   #
   def rm(list, force: nil, noop: nil, verbose: nil)
     list = fu_list(list)
@@ -508,7 +593,7 @@ module FileUtils
   #
   # Equivalent to
   #
-  #   #rm(list, :force => true)
+  #   FileUtils.rm(list, force: true)
   #
   def rm_f(list, noop: nil, verbose: nil)
     rm list, force: true, noop: noop, verbose: verbose
@@ -524,18 +609,18 @@ module FileUtils
   # StandardError when :force option is set.
   #
   #   FileUtils.rm_r Dir.glob('/tmp/*')
-  #   FileUtils.rm_r '/', :force => true          #  :-)
+  #   FileUtils.rm_r 'some_dir', force: true
   #
   # WARNING: This method causes local vulnerability
   # if one of parent directories or removing directory tree are world
   # writable (including /tmp, whose permission is 1777), and the current
   # process has strong privilege such as Unix super user (root), and the
   # system has symbolic link.  For secure removing, read the documentation
-  # of #remove_entry_secure carefully, and set :secure option to true.
-  # Default is :secure=>false.
+  # of remove_entry_secure carefully, and set :secure option to true.
+  # Default is <tt>secure: false</tt>.
   #
-  # NOTE: This method calls #remove_entry_secure if :secure option is set.
-  # See also #remove_entry_secure.
+  # NOTE: This method calls remove_entry_secure if :secure option is set.
+  # See also remove_entry_secure.
   #
   def rm_r(list, force: nil, noop: nil, verbose: nil, secure: nil)
     list = fu_list(list)
@@ -554,10 +639,10 @@ module FileUtils
   #
   # Equivalent to
   #
-  #   #rm_r(list, :force => true)
+  #   FileUtils.rm_r(list, force: true)
   #
   # WARNING: This method causes local vulnerability.
-  # Read the documentation of #rm_r first.
+  # Read the documentation of rm_r first.
   #
   def rm_rf(list, noop: nil, verbose: nil, secure: nil)
     rm_r list, force: true, noop: noop, verbose: verbose, secure: secure
@@ -571,12 +656,12 @@ module FileUtils
   # This method removes a file system entry +path+.  +path+ shall be a
   # regular file, a directory, or something.  If +path+ is a directory,
   # remove it recursively.  This method is required to avoid TOCTTOU
-  # (time-of-check-to-time-of-use) local security vulnerability of #rm_r.
+  # (time-of-check-to-time-of-use) local security vulnerability of rm_r.
   # #rm_r causes security hole when:
   #
-  #   * Parent directory is world writable (including /tmp).
-  #   * Removing directory tree includes world writable directory.
-  #   * The system has symbolic link.
+  # * Parent directory is world writable (including /tmp).
+  # * Removing directory tree includes world writable directory.
+  # * The system has symbolic link.
   #
   # To avoid this security hole, this method applies special preprocess.
   # If +path+ is a directory, this method chown(2) and chmod(2) all
@@ -594,8 +679,8 @@ module FileUtils
   #
   # For details of this security vulnerability, see Perl's case:
   #
-  #   http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2005-0448
-  #   http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0452
+  # * https://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2005-0448
+  # * https://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0452
   #
   # For fileutils.rb, this vulnerability is reported in [ruby-dev:26100].
   #
@@ -619,22 +704,38 @@ module FileUtils
     unless parent_st.sticky?
       raise ArgumentError, "parent directory is world writable, FileUtils#remove_entry_secure does not work; abort: #{path.inspect} (parent directory mode #{'%o' % parent_st.mode})"
     end
+
     # freeze tree root
     euid = Process.euid
-    File.open(fullpath + '/.') {|f|
-      unless fu_stat_identical_entry?(st, f.stat)
-        # symlink (TOC-to-TOU attack?)
-        File.unlink fullpath
-        return
-      end
-      f.chown euid, -1
-      f.chmod 0700
-      unless fu_stat_identical_entry?(st, File.lstat(fullpath))
-        # TOC-to-TOU attack?
-        File.unlink fullpath
-        return
-      end
-    }
+    dot_file = fullpath + "/."
+    begin
+      File.open(dot_file) {|f|
+        unless fu_stat_identical_entry?(st, f.stat)
+          # symlink (TOC-to-TOU attack?)
+          File.unlink fullpath
+          return
+        end
+        f.chown euid, -1
+        f.chmod 0700
+      }
+    rescue Errno::EISDIR # JRuby in non-native mode can't open files as dirs
+      File.lstat(dot_file).tap {|fstat|
+        unless fu_stat_identical_entry?(st, fstat)
+          # symlink (TOC-to-TOU attack?)
+          File.unlink fullpath
+          return
+        end
+        File.chown euid, -1, dot_file
+        File.chmod 0700, dot_file
+      }
+    end
+
+    unless fu_stat_identical_entry?(st, File.lstat(fullpath))
+      # TOC-to-TOU attack?
+      File.unlink fullpath
+      return
+    end
+
     # ---- tree root is frozen ----
     root = Entry_.new(path)
     root.preorder_traverse do |ent|
@@ -674,7 +775,7 @@ module FileUtils
   # +path+ might be a regular file, a directory, or something.
   # If +path+ is a directory, remove it recursively.
   #
-  # See also #remove_entry_secure.
+  # See also remove_entry_secure.
   #
   def remove_entry(path, force = false)
     Entry_.new(path).postorder_traverse do |ent|
@@ -710,10 +811,10 @@ module FileUtils
   module_function :remove_dir
 
   #
-  # Returns true if the contents of a file A and a file B are identical.
+  # Returns true if the contents of a file +a+ and a file +b+ are identical.
   #
-  #   FileUtils.compare_file('somefile', 'somefile')  #=> true
-  #   FileUtils.compare_file('/bin/cp', '/bin/mv')    #=> maybe false
+  #   FileUtils.compare_file('somefile', 'somefile')       #=> true
+  #   FileUtils.compare_file('/dev/null', '/dev/urandom')  #=> false
   #
   def compare_file(a, b)
     return false unless File.size(a) == File.size(b)
@@ -735,8 +836,15 @@ module FileUtils
   #
   def compare_stream(a, b)
     bsize = fu_stream_blksize(a, b)
-    sa = ""
-    sb = ""
+
+    if RUBY_VERSION > "2.4"
+      sa = String.new(capacity: bsize)
+      sb = String.new(capacity: bsize)
+    else
+      sa = String.new
+      sb = String.new
+    end
+
     begin
       a.read(bsize, sa)
       b.read(bsize, sb)
@@ -751,19 +859,31 @@ module FileUtils
   # mode to +mode+.  If +dest+ is a directory, destination is +dest+/+src+.
   # This method removes destination before copy.
   #
-  #   FileUtils.install 'ruby', '/usr/local/bin/ruby', :mode => 0755, :verbose => true
-  #   FileUtils.install 'lib.rb', '/usr/local/lib/ruby/site_ruby', :verbose => true
+  #   FileUtils.install 'ruby', '/usr/local/bin/ruby', mode: 0755, verbose: true
+  #   FileUtils.install 'lib.rb', '/usr/local/lib/ruby/site_ruby', verbose: true
   #
-  def install(src, dest, mode: nil, preserve: nil, noop: nil, verbose: nil)
-    fu_output_message "install -c#{preserve && ' -p'}#{mode ? (' -m 0%o' % mode) : ''} #{[src,dest].flatten.join ' '}" if verbose
+  def install(src, dest, mode: nil, owner: nil, group: nil, preserve: nil,
+              noop: nil, verbose: nil)
+    if verbose
+      msg = +"install -c"
+      msg << ' -p' if preserve
+      msg << ' -m ' << mode_to_s(mode) if mode
+      msg << " -o #{owner}" if owner
+      msg << " -g #{group}" if group
+      msg << ' ' << [src,dest].flatten.join(' ')
+      fu_output_message msg
+    end
     return if noop
+    uid = fu_get_uid(owner)
+    gid = fu_get_gid(group)
     fu_each_src_dest(src, dest) do |s, d|
       st = File.stat(s)
       unless File.exist?(d) and compare_file(s, d)
         remove_file d, true
         copy_file s, d
         File.utime st.atime, st.mtime, d if preserve
-        File.chmod mode, d if mode
+        File.chmod fu_mode(mode, st), d if mode
+        File.chown uid, gid, d if uid or gid
       end
     end
   end
@@ -787,7 +907,7 @@ module FileUtils
   end
   private_module_function :user_mask
 
-  def apply_mask(mode, user_mask, op, mode_mask)
+  def apply_mask(mode, user_mask, op, mode_mask)   #:nodoc:
     case op
     when '='
       (mode & ~user_mask) | (user_mask & mode_mask)
@@ -800,7 +920,9 @@ module FileUtils
   private_module_function :apply_mask
 
   def symbolic_modes_to_i(mode_sym, path)  #:nodoc:
-    mode_sym.split(/,/).inject(File.stat(path).mode & 07777) do |current_mode, clause|
+    path = File.stat(path) unless File::Stat === path
+    mode = path.mode
+    mode_sym.split(/,/).inject(mode & 07777) do |current_mode, clause|
       target, *actions = clause.split(/([=+-])/)
       raise ArgumentError, "invalid file mode: #{mode_sym}" if actions.empty?
       target = 'a' if target.empty?
@@ -816,7 +938,7 @@ module FileUtils
           when "x"
             mask | 0111
           when "X"
-            if FileTest.directory? path
+            if path.directory?
               mask | 0111
             else
               mask
@@ -865,12 +987,12 @@ module FileUtils
   # Absolute mode is
   #   FileUtils.chmod 0755, 'somecommand'
   #   FileUtils.chmod 0644, %w(my.rb your.rb his.rb her.rb)
-  #   FileUtils.chmod 0755, '/usr/bin/ruby', :verbose => true
+  #   FileUtils.chmod 0755, '/usr/bin/ruby', verbose: true
   #
   # Symbolic mode is
   #   FileUtils.chmod "u=wrx,go=rx", 'somecommand'
   #   FileUtils.chmod "u=wr,go=rr", %w(my.rb your.rb his.rb her.rb)
-  #   FileUtils.chmod "u=wrx,go=rx", '/usr/bin/ruby', :verbose => true
+  #   FileUtils.chmod "u=wrx,go=rx", '/usr/bin/ruby', verbose: true
   #
   # "a" :: is user, group, other mask.
   # "u" :: is user's mask.
@@ -930,7 +1052,7 @@ module FileUtils
   # the attribute.
   #
   #   FileUtils.chown 'root', 'staff', '/usr/local/bin/ruby'
-  #   FileUtils.chown nil, 'bin', Dir.glob('/usr/bin/*'), :verbose => true
+  #   FileUtils.chown nil, 'bin', Dir.glob('/usr/bin/*'), verbose: true
   #
   def chown(user, group, list, noop: nil, verbose: nil)
     list = fu_list(list)
@@ -954,7 +1076,7 @@ module FileUtils
   # method does not change the attribute.
   #
   #   FileUtils.chown_R 'www', 'www', '/var/www/htdocs'
-  #   FileUtils.chown_R 'cvs', 'cvs', '/var/cvs', :verbose => true
+  #   FileUtils.chown_R 'cvs', 'cvs', '/var/cvs', verbose: true
   #
   def chown_R(user, group, list, noop: nil, verbose: nil, force: nil)
     list = fu_list(list)
@@ -977,11 +1099,6 @@ module FileUtils
   end
   module_function :chown_R
 
-  begin
-    require 'etc'
-  rescue LoadError # rescue LoadError for miniruby
-  end
-
   def fu_get_uid(user)   #:nodoc:
     return nil unless user
     case user
@@ -990,6 +1107,7 @@ module FileUtils
     when /\A\d+\z/
       user.to_i
     else
+      require 'etc'
       Etc.getpwnam(user) ? Etc.getpwnam(user).uid : nil
     end
   end
@@ -1003,6 +1121,7 @@ module FileUtils
     when /\A\d+\z/
       group.to_i
     else
+      require 'etc'
       Etc.getgrnam(group) ? Etc.getgrnam(group).gid : nil
     end
   end
@@ -1043,8 +1162,11 @@ module FileUtils
   module StreamUtils_
     private
 
-    def fu_windows?
-      /mswin|mingw|bccwin|emx/ =~ RUBY_PLATFORM
+    case (defined?(::RbConfig) ? ::RbConfig::CONFIG['host_os'] : ::RUBY_PLATFORM)
+    when /mswin|mingw/
+      def fu_windows?; true end
+    else
+      def fu_windows?; false end
     end
 
     def fu_copy_stream0(src, dest, blksize = nil)   #:nodoc:
@@ -1168,10 +1290,17 @@ module FileUtils
 
     def entries
       opts = {}
-      opts[:encoding] = ::Encoding::UTF_8 if fu_windows?
-      Dir.entries(path(), opts)\
-          .reject {|n| n == '.' or n == '..' }\
-          .map {|n| Entry_.new(prefix(), join(rel(), n.untaint)) }
+      opts[:encoding] = fu_windows? ? ::Encoding::UTF_8 : path.encoding
+
+      files = if Dir.respond_to?(:children)
+        Dir.children(path, **opts)
+      else
+        Dir.entries(path(), **opts)
+           .reject {|n| n == '.' or n == '..' }
+      end
+
+      untaint = RUBY_VERSION < '2.7'
+      files.map {|n| Entry_.new(prefix(), join(rel(), untaint ? n.untaint : n)) }
     end
 
     def stat
@@ -1216,6 +1345,7 @@ module FileUtils
       else
         File.chmod mode, path()
       end
+    rescue Errno::EOPNOTSUPP
     end
 
     def chown(uid, gid)
@@ -1226,7 +1356,24 @@ module FileUtils
       end
     end
 
+    def link(dest)
+      case
+      when directory?
+        if !File.exist?(dest) and descendant_directory?(dest, path)
+          raise ArgumentError, "cannot link directory %s to itself %s" % [path, dest]
+        end
+        begin
+          Dir.mkdir dest
+        rescue
+          raise unless File.directory?(dest)
+        end
+      else
+        File.link path(), dest
+      end
+    end
+
     def copy(dest)
+      lstat
       case
       when file?
         copy_file dest
@@ -1241,18 +1388,21 @@ module FileUtils
         end
       when symlink?
         File.symlink File.readlink(path()), dest
-      when chardev?
-        raise "cannot handle device file" unless File.respond_to?(:mknod)
-        mknod dest, ?c, 0666, lstat().rdev
-      when blockdev?
-        raise "cannot handle device file" unless File.respond_to?(:mknod)
-        mknod dest, ?b, 0666, lstat().rdev
+      when chardev?, blockdev?
+        raise "cannot handle device file"
       when socket?
-        raise "cannot handle socket" unless File.respond_to?(:mknod)
-        mknod dest, nil, lstat().mode, 0
+        begin
+          require 'socket'
+        rescue LoadError
+          raise "cannot handle socket"
+        else
+          raise "cannot handle socket" unless defined?(UNIXServer)
+        end
+        UNIXServer.new(dest).close
+        File.chmod lstat().mode, dest
       when pipe?
         raise "cannot handle FIFO" unless File.respond_to?(:mkfifo)
-        mkfifo dest, 0666
+        File.mkfifo dest, lstat().mode
       when door?
         raise "cannot handle door: #{path()}"
       else
@@ -1273,6 +1423,7 @@ module FileUtils
       if !st.symlink?
         File.utime st.atime, st.mtime, path
       end
+      mode = st.mode
       begin
         if st.symlink?
           begin
@@ -1282,25 +1433,17 @@ module FileUtils
         else
           File.chown st.uid, st.gid, path
         end
-      rescue Errno::EPERM
+      rescue Errno::EPERM, Errno::EACCES
         # clear setuid/setgid
-        if st.symlink?
-          begin
-            File.lchmod st.mode & 01777, path
-          rescue NotImplementedError
-          end
-        else
-          File.chmod st.mode & 01777, path
+        mode &= 01777
+      end
+      if st.symlink?
+        begin
+          File.lchmod mode, path
+        rescue NotImplementedError, Errno::EOPNOTSUPP
         end
       else
-        if st.symlink?
-          begin
-            File.lchmod st.mode, path
-          rescue NotImplementedError
-          end
-        else
-          File.chmod st.mode, path
-        end
+        File.chmod mode, path
       end
     end
 
@@ -1378,14 +1521,14 @@ module FileUtils
 
     private
 
-    $fileutils_rb_have_lchmod = nil
+    @@fileutils_rb_have_lchmod = nil
 
     def have_lchmod?
       # This is not MT-safe, but it does not matter.
-      if $fileutils_rb_have_lchmod == nil
-        $fileutils_rb_have_lchmod = check_have_lchmod?
+      if @@fileutils_rb_have_lchmod == nil
+        @@fileutils_rb_have_lchmod = check_have_lchmod?
       end
-      $fileutils_rb_have_lchmod
+      @@fileutils_rb_have_lchmod
     end
 
     def check_have_lchmod?
@@ -1396,14 +1539,14 @@ module FileUtils
       return false
     end
 
-    $fileutils_rb_have_lchown = nil
+    @@fileutils_rb_have_lchown = nil
 
     def have_lchown?
       # This is not MT-safe, but it does not matter.
-      if $fileutils_rb_have_lchown == nil
-        $fileutils_rb_have_lchown = check_have_lchown?
+      if @@fileutils_rb_have_lchown == nil
+        @@fileutils_rb_have_lchown = check_have_lchown?
       end
-      $fileutils_rb_have_lchown
+      @@fileutils_rb_have_lchown
     end
 
     def check_have_lchown?
@@ -1417,18 +1560,29 @@ module FileUtils
     def join(dir, base)
       return File.path(dir) if not base or base == '.'
       return File.path(base) if not dir or dir == '.'
-      File.join(dir, base)
+      begin
+        File.join(dir, base)
+      rescue EncodingError
+        if fu_windows?
+          File.join(dir.encode(::Encoding::UTF_8), base.encode(::Encoding::UTF_8))
+        else
+          raise
+        end
+      end
     end
 
     if File::ALT_SEPARATOR
-      DIRECTORY_TERM = "(?=[/#{Regexp.quote(File::ALT_SEPARATOR)}]|\\z)".freeze
+      DIRECTORY_TERM = "(?=[/#{Regexp.quote(File::ALT_SEPARATOR)}]|\\z)"
     else
-      DIRECTORY_TERM = "(?=/|\\z)".freeze
+      DIRECTORY_TERM = "(?=/|\\z)"
     end
-    SYSCASE = File::FNM_SYSCASE.nonzero? ? "-i" : ""
 
     def descendant_directory?(descendant, ascendant)
-      /\A(?#{SYSCASE}:#{Regexp.quote(ascendant)})#{DIRECTORY_TERM}/ =~ File.dirname(descendant)
+      if File::FNM_SYSCASE.nonzero?
+        File.expand_path(File.dirname(descendant)).casecmp(File.expand_path(ascendant)) == 0
+      else
+        File.expand_path(File.dirname(descendant)) == File.expand_path(ascendant)
+      end
     end
   end   # class Entry_
 
@@ -1467,13 +1621,13 @@ module FileUtils
   end
   private_module_function :fu_same?
 
-  @fileutils_output = $stderr
-  @fileutils_label  = ''
-
   def fu_output_message(msg)   #:nodoc:
-    @fileutils_output ||= $stderr
-    @fileutils_label  ||= ''
-    @fileutils_output.puts @fileutils_label + msg
+    output = @fileutils_output if defined?(@fileutils_output)
+    output ||= $stdout
+    if defined?(@fileutils_label)
+      msg = @fileutils_label + msg
+    end
+    output.puts msg
   end
   private_module_function :fu_output_message
 
@@ -1484,8 +1638,11 @@ module FileUtils
     tbl
   }
 
+  public
+
   #
-  # Returns an Array of method names which have any options.
+  # Returns an Array of names of high-level methods that accept any keyword
+  # arguments.
   #
   #   p FileUtils.commands  #=> ["chmod", "cp", "cp_r", "install", ...]
   #
@@ -1524,7 +1681,7 @@ module FileUtils
   end
 
   #
-  # Returns an Array of method names which have the option +opt+.
+  # Returns an Array of methods names which have the option +opt+.
   #
   #   p FileUtils.collect_method(:preserve) #=> ["cp", "cp_r", "copy", "install"]
   #
@@ -1532,14 +1689,16 @@ module FileUtils
     OPT_TABLE.keys.select {|m| OPT_TABLE[m].include?(opt) }
   end
 
-  LOW_METHODS = singleton_methods(false) - collect_method(:noop).map(&:intern)
-  module LowMethods
+  private
+
+  LOW_METHODS = singleton_methods(false) - collect_method(:noop).map(&:intern) # :nodoc:
+  module LowMethods # :nodoc: internal use only
     private
     def _do_nothing(*)end
     ::FileUtils::LOW_METHODS.map {|name| alias_method name, :_do_nothing}
   end
 
-  METHODS = singleton_methods() - [:private_module_function,
+  METHODS = singleton_methods() - [:private_module_function,                  # :nodoc:
       :commands, :options, :have_option?, :options_of, :collect_method]
 
   #
@@ -1549,8 +1708,6 @@ module FileUtils
   #
   module Verbose
     include FileUtils
-    @fileutils_output  = $stderr
-    @fileutils_label   = ''
     names = ::FileUtils.collect_method(:verbose)
     names.each do |name|
       module_eval(<<-EOS, __FILE__, __LINE__ + 1)
@@ -1574,8 +1731,6 @@ module FileUtils
   module NoWrite
     include FileUtils
     include LowMethods
-    @fileutils_output  = $stderr
-    @fileutils_label   = ''
     names = ::FileUtils.collect_method(:noop)
     names.each do |name|
       module_eval(<<-EOS, __FILE__, __LINE__ + 1)
@@ -1600,8 +1755,6 @@ module FileUtils
   module DryRun
     include FileUtils
     include LowMethods
-    @fileutils_output  = $stderr
-    @fileutils_label   = ''
     names = ::FileUtils.collect_method(:noop)
     names.each do |name|
       module_eval(<<-EOS, __FILE__, __LINE__ + 1)
diff --git a/lib/find.gemspec b/lib/find.gemspec
new file mode 100644
index 0000000000..fff0f706cd
--- /dev/null
+++ b/lib/find.gemspec
@@ -0,0 +1,24 @@
+Gem::Specification.new do |spec|
+  spec.name          = "find"
+  spec.version       = "0.1.0"
+  spec.authors       = ['Kazuki Tsujimoto']
+  spec.email         = ['kazuki@callcc.net']
+
+  spec.summary       = %q{This module supports top-down traversal of a set of file paths.}
+  spec.description   = %q{This module supports top-down traversal of a set of file paths.}
+  spec.homepage      = "https://github.com/ruby/find"
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.licenses      = ["Ruby", "BSD-2-Clause"]
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+end
diff --git a/lib/find.rb b/lib/find.rb
index 093f8557c3..3f54cf6b93 100644
--- a/lib/find.rb
+++ b/lib/find.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 # find.rb: the Find module for processing all files under a given directory.
 #
@@ -15,7 +15,7 @@
 #
 #   Find.find(ENV["HOME"]) do |path|
 #     if FileTest.directory?(path)
-#       if File.basename(path)[0] == ?.
+#       if File.basename(path).start_with?('.')
 #         Find.prune       # Don't look any further into this directory.
 #       else
 #         next
@@ -46,7 +46,7 @@ module Find
       ps = [path]
       while file = ps.shift
         catch(:prune) do
-          yield file.dup.taint
+          yield file.dup
           begin
             s = File.lstat(file)
           rescue Errno::ENOENT, Errno::EACCES, Errno::ENOTDIR, Errno::ELOOP, Errno::ENAMETOOLONG
@@ -55,16 +55,15 @@ module Find
           end
           if s.directory? then
             begin
-              fs = Dir.entries(file, encoding: enc)
+              fs = Dir.children(file, encoding: enc)
             rescue Errno::ENOENT, Errno::EACCES, Errno::ENOTDIR, Errno::ELOOP, Errno::ENAMETOOLONG
               raise unless ignore_error
               next
             end
             fs.sort!
             fs.reverse_each {|f|
-              next if f == "." or f == ".."
               f = File.join(file, f)
-              ps.unshift f.untaint
+              ps.unshift f
             }
           end
         end
diff --git a/lib/forwardable.rb b/lib/forwardable.rb
index aa45d41a31..fb24b8c3e6 100644
--- a/lib/forwardable.rb
+++ b/lib/forwardable.rb
@@ -57,10 +57,9 @@
 #
 # == Another example
 #
-# We want to rely on what has come before obviously, but with delegation we can
-# take just the methods we need and even rename them as appropriate.  In many
-# cases this is preferable to inheritance, which gives us the entire old
-# interface, even if much of it isn't needed.
+# You could use Forwardable as an alternative to inheritance, when you don't want
+# to inherit all methods from the superclass. For instance, here is how you might
+# add a range of +Array+ instance methods to a new class +Queue+:
 #
 #   class Queue
 #     extend Forwardable
@@ -110,8 +109,11 @@
 # +delegate.rb+.
 #
 module Forwardable
+  require 'forwardable/impl'
+
   # Version of +forwardable.rb+
-  FORWARDABLE_VERSION = "1.1.0"
+  VERSION = "1.3.2"
+  FORWARDABLE_VERSION = VERSION
 
   @debug = nil
   class << self
@@ -120,7 +122,8 @@ module Forwardable
   end
 
   # Takes a hash as its argument.  The key is a symbol or an array of
-  # symbols.  These symbols correspond to method names.  The value is
+  # symbols.  These symbols correspond to method names, instance variable
+  # names, or constant names (see def_delegator).  The value is
   # the accessor to which the methods will be delegated.
   #
   # :call-seq:
@@ -128,12 +131,13 @@ module Forwardable
   #    delegate [method, method, ...] => accessor
   #
   def instance_delegate(hash)
-    hash.each{ |methods, accessor|
-      methods = [methods] unless methods.respond_to?(:each)
-      methods.each{ |method|
-        def_instance_delegator(accessor, method)
-      }
-    }
+    hash.each do |methods, accessor|
+      unless defined?(methods.each)
+        def_instance_delegator(accessor, methods)
+      else
+        methods.each {|method| def_instance_delegator(accessor, method)}
+      end
+    end
   end
 
   #
@@ -148,18 +152,21 @@ module Forwardable
   #   def_delegator :@records, :map
   #
   def def_instance_delegators(accessor, *methods)
-    methods.delete("__send__")
-    methods.delete("__id__")
-    for method in methods
+    methods.each do |method|
+      next if /\A__(?:send|id)__\z/ =~ method
       def_instance_delegator(accessor, method)
     end
   end
 
   # Define +method+ as delegator instance method with an optional
   # alias name +ali+. Method calls to +ali+ will be delegated to
-  # +accessor.method+.
+  # +accessor.method+.  +accessor+ should be a method name, instance
+  # variable name, or constant name.  Use the full path to the
+  # constant if providing the constant name.
+  # Returns the name of the method defined.
   #
   #   class MyQueue
+  #     CONST = 1
   #     extend Forwardable
   #     attr_reader :queue
   #     def initialize
@@ -167,18 +174,23 @@ module Forwardable
   #     end
   #
   #     def_delegator :@queue, :push, :mypush
+  #     def_delegator 'MyQueue::CONST', :to_i
   #   end
   #
   #   q = MyQueue.new
   #   q.mypush 42
   #   q.queue    #=> [42]
   #   q.push 23  #=> NoMethodError
+  #   q.to_i     #=> 1
   #
   def def_instance_delegator(accessor, method, ali = method)
     gen = Forwardable._delegator_method(self, accessor, method, ali)
 
     # If it's not a class or module, it's an instance
-    (Module === self ? self : singleton_class).module_eval(&gen)
+    mod = Module === self ? self : singleton_class
+    ret = mod.module_eval(&gen)
+    mod.__send__(:ruby2_keywords, ali) if RUBY_VERSION >= '2.7'
+    ret
   end
 
   alias delegate instance_delegate
@@ -195,34 +207,33 @@ module Forwardable
       accessor = "#{accessor}()"
     end
 
-    unless begin
-             iseq = RubyVM::InstructionSequence
-                    .compile("().#{method}", nil, nil, 0, false)
-           rescue SyntaxError
-           else
-             iseq.to_a.dig(-1, 1, 1, :mid) == method.to_sym
-           end
-      method_call = "__send__(:#{method}, *args, &block)"
-    else
-      method_call = "#{method}(*args, &block)"
+    method_call = ".__send__(:#{method}, *args, &block)"
+    if _valid_method?(method)
+      loc, = caller_locations(2,1)
+      pre = "_ ="
+      mesg = "#{Module === obj ? obj : obj.class}\##{ali} at #{loc.path}:#{loc.lineno} forwarding to private method "
+      method_call = "#{<<-"begin;"}\n#{<<-"end;".chomp}"
+        begin;
+          unless defined? _.#{method}
+            ::Kernel.warn #{mesg.dump}"\#{_.class}"'##{method}', uplevel: 1
+            _#{method_call}
+          else
+            _.#{method}(*args, &block)
+          end
+        end;
     end
 
-    line_no = __LINE__+1; str = "#{<<-"begin;"}\n#{<<-"end;"}"
+    _compile_method("#{<<-"begin;"}\n#{<<-"end;"}", __FILE__, __LINE__+1)
     begin;
       proc do
         def #{ali}(*args, &block)
+          #{pre}
           begin
             #{accessor}
-          end.#{method_call}
+          end#{method_call}
         end
       end
     end;
-
-    RubyVM::InstructionSequence
-      .compile(str, __FILE__, __FILE__, line_no,
-               trace_instruction: false,
-               tailcall_optimization: true)
-      .eval
   end
 end
 
@@ -260,12 +271,13 @@ module SingleForwardable
   #    delegate [method, method, ...] => accessor
   #
   def single_delegate(hash)
-    hash.each{ |methods, accessor|
-      methods = [methods] unless methods.respond_to?(:each)
-      methods.each{ |method|
-        def_single_delegator(accessor, method)
-      }
-    }
+    hash.each do |methods, accessor|
+      unless defined?(methods.each)
+        def_single_delegator(accessor, methods)
+      else
+        methods.each {|method| def_single_delegator(accessor, method)}
+      end
+    end
   end
 
   #
@@ -280,9 +292,8 @@ module SingleForwardable
   #   def_delegator :@records, :map
   #
   def def_single_delegators(accessor, *methods)
-    methods.delete("__send__")
-    methods.delete("__id__")
-    for method in methods
+    methods.each do |method|
+      next if /\A__(?:send|id)__\z/ =~ method
       def_single_delegator(accessor, method)
     end
   end
@@ -293,10 +304,13 @@ module SingleForwardable
   # Defines a method _method_ which delegates to _accessor_ (i.e. it calls
   # the method of the same name in _accessor_).  If _new_name_ is
   # provided, it is used as the name for the delegate method.
+  # Returns the name of the method defined.
   def def_single_delegator(accessor, method, ali = method)
     gen = Forwardable._delegator_method(self, accessor, method, ali)
 
-    instance_eval(&gen)
+    ret = instance_eval(&gen)
+    singleton_class.__send__(:ruby2_keywords, ali) if RUBY_VERSION >= '2.7'
+    ret
   end
 
   alias delegate single_delegate
diff --git a/lib/forwardable/forwardable.gemspec b/lib/forwardable/forwardable.gemspec
new file mode 100644
index 0000000000..523b8eec6f
--- /dev/null
+++ b/lib/forwardable/forwardable.gemspec
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+name = File.basename(__FILE__, ".gemspec")
+version = ["lib", Array.new(name.count("-")+1, "..").join("/")].find do |dir|
+  break File.foreach(File.join(__dir__, dir, "#{name.tr('-', '/')}.rb")) do |line|
+    /^\s*VERSION\s*=\s*"(.*)"/ =~ line and break $1
+  end rescue nil
+end
+
+Gem::Specification.new do |spec|
+  spec.name          = name
+  spec.version       = version
+  spec.authors       = ["Keiju ISHITSUKA"]
+  spec.email         = ["keiju@ruby-lang.org"]
+
+  spec.summary       = %q{Provides delegation of specified methods to a designated object.}
+  spec.description   = %q{Provides delegation of specified methods to a designated object.}
+  spec.homepage      = "https://github.com/ruby/forwardable"
+  spec.licenses      = ["Ruby", "BSD-2-Clause"]
+
+  spec.required_ruby_version = '>= 2.4.0'
+  spec.files         = ["forwardable.gemspec", "lib/forwardable.rb", "lib/forwardable/impl.rb"]
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+end
diff --git a/lib/forwardable/impl.rb b/lib/forwardable/impl.rb
new file mode 100644
index 0000000000..58a9dfb69c
--- /dev/null
+++ b/lib/forwardable/impl.rb
@@ -0,0 +1,16 @@
+# :stopdoc:
+module Forwardable
+  def self._valid_method?(method)
+    catch {|tag|
+      eval("BEGIN{throw tag}; ().#{method}", binding, __FILE__, __LINE__)
+    }
+  rescue SyntaxError
+    false
+  else
+    true
+  end
+
+  def self._compile_method(src, file, line)
+    eval(src, nil, file, line)
+  end
+end
diff --git a/lib/getoptlong.rb b/lib/getoptlong.rb
index 8aa91b82e0..53b80ff16c 100644
--- a/lib/getoptlong.rb
+++ b/lib/getoptlong.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 # GetoptLong for Ruby
 #
@@ -85,6 +85,9 @@
 #     hello -n 6 --name -- /tmp
 #
 class GetoptLong
+  # Version.
+  VERSION = "0.1.1"
+
   #
   # Orderings.
   #
@@ -153,7 +156,7 @@ class GetoptLong
     #
     # Whether error messages are output to $stderr.
     #
-    @quiet = FALSE
+    @quiet = false
 
     #
     # Status code.
@@ -310,7 +313,7 @@ class GetoptLong
         #
         next if i == argument_flag
         begin
-          if !i.is_a?(String) || i !~ /^-([^-]|-.+)$/
+          if !i.is_a?(String) || i !~ /\A-([^-]|-.+)\z/
             raise ArgumentError, "an invalid option `#{i}'"
           end
           if (@canonical_names.include?(i))
@@ -447,7 +450,7 @@ class GetoptLong
       terminate
       return nil
     elsif @ordering == PERMUTE
-      while 0 < ARGV.length && ARGV[0] !~ /^-./
+      while 0 < ARGV.length && ARGV[0] !~ /\A-./
         @non_option_arguments.push(ARGV.shift)
       end
       if ARGV.length == 0
@@ -456,7 +459,7 @@ class GetoptLong
       end
       argument = ARGV.shift
     elsif @ordering == REQUIRE_ORDER
-      if (ARGV[0] !~ /^-./)
+      if (ARGV[0] !~ /\A-./)
         terminate
         return nil
       end
@@ -477,7 +480,7 @@ class GetoptLong
     #
     # Check for long and short options.
     #
-    if argument =~ /^(--[^=]+)/ && @rest_singles.length == 0
+    if argument =~ /\A(--[^=]+)/ && @rest_singles.length == 0
       #
       # This is a long style option, which start with `--'.
       #
@@ -507,7 +510,7 @@ class GetoptLong
       # Check an argument to the option.
       #
       if @argument_flags[option_name] == REQUIRED_ARGUMENT
-        if argument =~ /=(.*)$/
+        if argument =~ /=(.*)/m
           option_argument = $1
         elsif 0 < ARGV.length
           option_argument = ARGV.shift
@@ -516,19 +519,19 @@ class GetoptLong
                     "option `#{argument}' requires an argument")
         end
       elsif @argument_flags[option_name] == OPTIONAL_ARGUMENT
-        if argument =~ /=(.*)$/
+        if argument =~ /=(.*)/m
           option_argument = $1
-        elsif 0 < ARGV.length && ARGV[0] !~ /^-./
+        elsif 0 < ARGV.length && ARGV[0] !~ /\A-./
           option_argument = ARGV.shift
         else
           option_argument = ''
         end
-      elsif argument =~ /=(.*)$/
+      elsif argument =~ /=(.*)/m
         set_error(NeedlessArgument,
                   "option `#{option_name}' doesn't allow an argument")
       end
 
-    elsif argument =~ /^(-(.))(.*)/
+    elsif argument =~ /\A(-(.))(.*)/m
       #
       # This is a short style option, which start with `-' (not `--').
       # Short options may be catenated (e.g. `-l -g' is equivalent to
@@ -555,7 +558,7 @@ class GetoptLong
           if 0 < @rest_singles.length
             option_argument = @rest_singles
             @rest_singles = ''
-          elsif 0 < ARGV.length && ARGV[0] !~ /^-./
+          elsif 0 < ARGV.length && ARGV[0] !~ /\A-./
             option_argument = ARGV.shift
           else
             option_argument = ''
diff --git a/lib/getoptlong/getoptlong.gemspec b/lib/getoptlong/getoptlong.gemspec
new file mode 100644
index 0000000000..9ebe3aed7e
--- /dev/null
+++ b/lib/getoptlong/getoptlong.gemspec
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+name = File.basename(__FILE__, ".gemspec")
+version = ["lib", Array.new(name.count("-")+1, "..").join("/")].find do |dir|
+  break File.foreach(File.join(__dir__, dir, "#{name.tr('-', '/')}.rb")) do |line|
+    /^\s*VERSION\s*=\s*"(.*)"/ =~ line and break $1
+  end rescue nil
+end
+
+Gem::Specification.new do |spec|
+  spec.name          = name
+  spec.version       = version
+  spec.authors       = ["Yukihiro Matsumoto"]
+  spec.email         = ["matz@ruby-lang.org"]
+
+  spec.summary       = %q{GetoptLong for Ruby}
+  spec.description   = spec.summary
+  spec.homepage      = "https://github.com/ruby/getoptlong"
+  spec.licenses      = ["Ruby", "BSD-2-Clause"]
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z 2>/dev/null`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+end
diff --git a/lib/ipaddr.gemspec b/lib/ipaddr.gemspec
new file mode 100644
index 0000000000..5187f3be11
--- /dev/null
+++ b/lib/ipaddr.gemspec
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+# coding: utf-8
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+Gem::Specification.new do |spec|
+  spec.name          = "ipaddr"
+  spec.version       = "1.2.2"
+  spec.authors       = ["Akinori MUSHA", "Hajimu UMEMOTO"]
+  spec.email         = ["knu@idaemons.org", "ume@mahoroba.org"]
+
+  spec.summary       = %q{A class to manipulate an IP address in ruby}
+  spec.description   = <<-'DESCRIPTION'
+IPAddr provides a set of methods to manipulate an IP address.
+Both IPv4 and IPv6 are supported.
+  DESCRIPTION
+  spec.homepage      = "https://github.com/ruby/ipaddr"
+  spec.licenses      = ["Ruby", "BSD-2-Clause"]
+
+  spec.files         = ["LICENSE.txt", "README.md", "ipaddr.gemspec", "lib/ipaddr.rb"]
+  spec.require_paths = ["lib"]
+
+  spec.required_ruby_version = ">= 2.3"
+end
diff --git a/lib/ipaddr.rb b/lib/ipaddr.rb
index 458be58577..7fff54b9d0 100644
--- a/lib/ipaddr.rb
+++ b/lib/ipaddr.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 # ipaddr.rb - A class to manipulate an IP address
 #
@@ -103,13 +103,13 @@ class IPAddr
 
   # Creates a new ipaddr containing the given network byte ordered
   # string form of an IP address.
-  def IPAddr::new_ntoh(addr)
-    return IPAddr.new(IPAddr::ntop(addr))
+  def self.new_ntoh(addr)
+    return new(ntop(addr))
   end
 
   # Convert a network byte ordered string form of an IP address into
   # human readable form.
-  def IPAddr::ntop(addr)
+  def self.ntop(addr)
     case addr.size
     when 4
       s = addr.unpack('C4').join('.')
@@ -149,7 +149,10 @@ class IPAddr
   # Returns true if two ipaddrs are equal.
   def ==(other)
     other = coerce_other(other)
-    return @family == other.family && @addr == other.to_i
+  rescue
+    false
+  else
+    @family == other.family && @addr == other.to_i
   end
 
   # Returns a new ipaddr built by masking IP address with the given
@@ -256,6 +259,50 @@ class IPAddr
     return @family == Socket::AF_INET6
   end
 
+  # Returns true if the ipaddr is a loopback address.
+  def loopback?
+    case @family
+    when Socket::AF_INET
+      @addr & 0xff000000 == 0x7f000000
+    when Socket::AF_INET6
+      @addr == 1
+    else
+      raise AddressFamilyError, "unsupported address family"
+    end
+  end
+
+  # Returns true if the ipaddr is a private address.  IPv4 addresses
+  # in 10.0.0.0/8, 172.16.0.0/12 and 192.168.0.0/16 as defined in RFC
+  # 1918 and IPv6 Unique Local Addresses in fc00::/7 as defined in RFC
+  # 4193 are considered private.
+  def private?
+    case @family
+    when Socket::AF_INET
+      @addr & 0xff000000 == 0x0a000000 ||    # 10.0.0.0/8
+        @addr & 0xfff00000 == 0xac100000 ||  # 172.16.0.0/12
+        @addr & 0xffff0000 == 0xc0a80000     # 192.168.0.0/16
+    when Socket::AF_INET6
+      @addr & 0xfe00_0000_0000_0000_0000_0000_0000_0000 == 0xfc00_0000_0000_0000_0000_0000_0000_0000
+    else
+      raise AddressFamilyError, "unsupported address family"
+    end
+  end
+
+  # Returns true if the ipaddr is a link-local address.  IPv4
+  # addresses in 169.254.0.0/16 reserved by RFC 3927 and Link-Local
+  # IPv6 Unicast Addresses in fe80::/10 reserved by RFC 4291 are
+  # considered link-local.
+  def link_local?
+    case @family
+    when Socket::AF_INET
+      @addr & 0xffff0000 == 0xa9fe0000 # 169.254.0.0/16
+    when Socket::AF_INET6
+      @addr & 0xffc0_0000_0000_0000_0000_0000_0000_0000 == 0xfe80_0000_0000_0000_0000_0000_0000_0000
+    else
+      raise AddressFamilyError, "unsupported address family"
+    end
+  end
+
   # Returns true if the ipaddr is an IPv4-mapped IPv6 address.
   def ipv4_mapped?
     return ipv6? && (@addr >> 32) == 0xffff
@@ -263,6 +310,11 @@ class IPAddr
 
   # Returns true if the ipaddr is an IPv4-compatible IPv6 address.
   def ipv4_compat?
+    warn "IPAddr\##{__callee__} is obsolete", uplevel: 1 if $VERBOSE
+    _ipv4_compat?
+  end
+
+  def _ipv4_compat?
     if !ipv6? || (@addr >> 32) != 0
       return false
     end
@@ -270,6 +322,8 @@ class IPAddr
     return a != 0 && a != 1
   end
 
+  private :_ipv4_compat?
+
   # Returns a new ipaddr built by converting the native IPv4 address
   # into an IPv4-mapped IPv6 address.
   def ipv4_mapped
@@ -282,6 +336,7 @@ class IPAddr
   # Returns a new ipaddr built by converting the native IPv4 address
   # into an IPv4-compatible IPv6 address.
   def ipv4_compat
+    warn "IPAddr\##{__callee__} is obsolete", uplevel: 1 if $VERBOSE
     if !ipv4?
       raise InvalidAddressError, "not an IPv4 address"
     end
@@ -292,7 +347,7 @@ class IPAddr
   # native IPv4 address.  If the IP address is not an IPv4-mapped or
   # IPv4-compatible IPv6 address, returns self.
   def native
-    if !ipv4_mapped? && !ipv4_compat?
+    if !ipv4_mapped? && !_ipv4_compat?
       return self
     end
     return self.clone.set(@addr & IN4MASK, Socket::AF_INET)
@@ -335,10 +390,10 @@ class IPAddr
   # Compares the ipaddr with another.
   def <=>(other)
     other = coerce_other(other)
-
-    return nil if other.family != @family
-
-    return @addr <=> other.to_i
+  rescue
+    nil
+  else
+    @addr <=> other.to_i if other.family == @family
   end
   include Comparable
 
@@ -368,6 +423,35 @@ class IPAddr
     return clone.set(begin_addr, @family)..clone.set(end_addr, @family)
   end
 
+  # Returns the prefix length in bits for the ipaddr.
+  def prefix
+    case @family
+    when Socket::AF_INET
+      n = IN4MASK ^ @mask_addr
+      i = 32
+    when Socket::AF_INET6
+      n = IN6MASK ^ @mask_addr
+      i = 128
+    else
+      raise AddressFamilyError, "unsupported address family"
+    end
+    while n.positive?
+      n >>= 1
+      i -= 1
+    end
+    i
+  end
+
+  # Sets the prefix length in bits
+  def prefix=(prefix)
+    case prefix
+    when Integer
+      mask!(prefix)
+    else
+      raise InvalidPrefixError, "prefix must be an integer"
+    end
+  end
+
   # Returns a string containing a human-readable representation of the
   # ipaddr. ("#<IPAddr: family:address/mask>")
   def inspect
@@ -410,7 +494,8 @@ class IPAddr
 
   # Set current netmask to given mask.
   def mask!(mask)
-    if mask.kind_of?(String)
+    case mask
+    when String
       if mask =~ /\A\d+\z/
         prefixlen = mask.to_i
       else
@@ -419,6 +504,10 @@ class IPAddr
           raise InvalidPrefixError, "address family is not same"
         end
         @mask_addr = m.to_i
+        n = @mask_addr ^ m.instance_variable_get(:@mask_addr)
+        unless ((n + 1) & n).zero?
+          raise InvalidPrefixError, "invalid mask #{mask}"
+        end
         @addr &= @mask_addr
         return self
       end
@@ -505,6 +594,8 @@ class IPAddr
     else
       @mask_addr = (@family == Socket::AF_INET) ? IN4MASK : IN6MASK
     end
+  rescue InvalidAddressError => e
+    raise e.class, "#{e.message}: #{addr}"
   end
 
   def coerce_other(other)
diff --git a/lib/irb.rb b/lib/irb.rb
index 92b79b3301..93c4d25c92 100644
--- a/lib/irb.rb
+++ b/lib/irb.rb
@@ -9,15 +9,20 @@
 #
 #
 #
-require "e2mmap"
+require "ripper"
+require "reline"
 
-require "irb/init"
-require "irb/context"
-require "irb/extend-command"
+require_relative "irb/init"
+require_relative "irb/context"
+require_relative "irb/extend-command"
 
-require "irb/ruby-lex"
-require "irb/input-method"
-require "irb/locale"
+require_relative "irb/ruby-lex"
+require_relative "irb/input-method"
+require_relative "irb/locale"
+require_relative "irb/color"
+
+require_relative "irb/version"
+require_relative "irb/easter-egg"
 
 # IRB stands for "interactive Ruby" and is a tool to interactively execute Ruby
 # expressions read from the standard input.
@@ -41,14 +46,13 @@ require "irb/locale"
 #     irb(main):006:1> end
 #     #=> nil
 #
-# The Readline extension module can be used with irb. Use of Readline is
-# default if it's installed.
+# The singleline editor module or multiline editor module can be used with irb.
+# Use of multiline editor is default if it's installed.
 #
 # == Command line options
 #
 #   Usage:  irb.rb [options] [programfile] [arguments]
 #     -f                Suppress read of ~/.irbrc
-#     -m                Bc mode (load mathn, fraction or matrix are available)
 #     -d                Set $DEBUG to true (same as `ruby -d')
 #     -r load-module    Same as `ruby -r'
 #     -I path           Specify $LOAD_PATH directory
@@ -56,24 +60,36 @@ require "irb/locale"
 #     -E enc            Same as `ruby -E`
 #     -w                Same as `ruby -w`
 #     -W[level=2]       Same as `ruby -W`
-#     --inspect         Use `inspect' for output (default except for bc mode)
+#     --context-mode n  Set n[0-4] to method to create Binding Object,
+#                       when new workspace was created
+#     --echo            Show result(default)
+#     --noecho          Don't show result
+#     --inspect         Use `inspect' for output
 #     --noinspect       Don't use inspect for output
-#     --readline        Use Readline extension module
-#     --noreadline      Don't use Readline extension module
-#     --prompt prompt-mode
-#     --prompt-mode prompt-mode
+#     --multiline       Use multiline editor module
+#     --nomultiline     Don't use multiline editor module
+#     --singleline      Use singleline editor module
+#     --nosingleline    Don't use singleline editor module
+#     --colorize        Use colorization
+#     --nocolorize      Don't use colorization
+#     --prompt prompt-mode/--prompt-mode prompt-mode
 #                       Switch prompt mode. Pre-defined prompt modes are
 #                       `default', `simple', `xmp' and `inf-ruby'
 #     --inf-ruby-mode   Use prompt appropriate for inf-ruby-mode on emacs.
-#                       Suppresses --readline.
-#     --simple-prompt   Simple prompt mode
+#                       Suppresses --multiline and --singleline.
+#     --sample-book-mode/--simple-prompt
+#                       Simple prompt mode
 #     --noprompt        No prompt mode
+#     --single-irb      Share self with sub-irb.
 #     --tracer          Display trace for each execution of commands.
 #     --back-trace-limit n
 #                       Display backtrace top n and tail n. The default
 #                       value is 16.
-#     --irb_debug n     Set internal debug level to n (not for popular use)
-#     -v, --version     Print the version of irb
+#     --verbose         Show details
+#     --noverbose       Don't show details
+#     -v, --version	    Print the version of irb
+#     -h, --help        Print help
+#     --                Separate options of irb from the list of command-line args
 #
 # == Configuration
 #
@@ -90,24 +106,24 @@ require "irb/locale"
 # as follows in an +irb+ session:
 #
 #     IRB.conf[:IRB_NAME]="irb"
-#     IRB.conf[:MATH_MODE]=false
 #     IRB.conf[:INSPECT_MODE]=nil
 #     IRB.conf[:IRB_RC] = nil
 #     IRB.conf[:BACK_TRACE_LIMIT]=16
 #     IRB.conf[:USE_LOADER] = false
-#     IRB.conf[:USE_READLINE] = nil
+#     IRB.conf[:USE_MULTILINE] = nil
+#     IRB.conf[:USE_SINGLELINE] = nil
+#     IRB.conf[:USE_COLORIZE] = true
 #     IRB.conf[:USE_TRACER] = false
 #     IRB.conf[:IGNORE_SIGINT] = true
 #     IRB.conf[:IGNORE_EOF] = false
 #     IRB.conf[:PROMPT_MODE] = :DEFAULT
 #     IRB.conf[:PROMPT] = {...}
-#     IRB.conf[:DEBUG_LEVEL]=0
 #
 # === Auto indentation
 #
-# To enable auto-indent mode in irb, add the following to your +.irbrc+:
+# To disable auto-indent mode in irb, add the following to your +.irbrc+:
 #
-#     IRB.conf[:AUTO_INDENT] = true
+#     IRB.conf[:AUTO_INDENT] = false
 #
 # === Autocompletion
 #
@@ -117,16 +133,23 @@ require "irb/locale"
 #
 # === History
 #
-# By default, irb disables history and will not store any commands you used.
-#
-# If you want to enable history, add the following to your +.irbrc+:
+# By default, irb will store the last 1000 commands you used in
+# <code>IRB.conf[:HISTORY_FILE]</code> (<code>~/.irb_history</code> by default).
 #
-#     IRB.conf[:SAVE_HISTORY] = 1000
+# If you want to disable history, add the following to your +.irbrc+:
 #
-# This will now store the last 1000 commands in <code>~/.irb_history</code>.
+#     IRB.conf[:SAVE_HISTORY] = nil
 #
 # See IRB::Context#save_history= for more information.
 #
+# The history of _results_ of commands evaluated is not stored by default,
+# but can be turned on to be stored with this +.irbrc+ setting:
+#
+#     IRB.conf[:EVAL_HISTORY] = <number>
+#
+# See IRB::Context#eval_history= and History class. The history of command
+# results is not permanently saved in any file.
+#
 # == Customizing the IRB Prompt
 #
 # In order to customize the prompt, you can change the following Hash:
@@ -136,7 +159,7 @@ require "irb/locale"
 # This example can be used in your +.irbrc+
 #
 #     IRB.conf[:PROMPT][:MY_PROMPT] = { # name of prompt mode
-#       :AUTO_INDENT => true,           # enables auto-indent mode
+#       :AUTO_INDENT => false,          # disables auto-indent mode
 #       :PROMPT_I =>  ">> ",		# simple prompt
 #       :PROMPT_S => nil,		# prompt for continuated strings
 #       :PROMPT_C => nil,		# prompt for continuated statement
@@ -165,6 +188,7 @@ require "irb/locale"
 #
 #     IRB.conf[:PROMPT_MODE][:DEFAULT] = {
 #       :PROMPT_I => "%N(%m):%03n:%i> ",
+#       :PROMPT_N => "%N(%m):%03n:%i> ",
 #       :PROMPT_S => "%N(%m):%03n:%i%l ",
 #       :PROMPT_C => "%N(%m):%03n:%i* ",
 #       :RETURN => "%s\n" # used to printf
@@ -257,7 +281,7 @@ require "irb/locale"
 # On the other hand, each conf in IRB@Command+line+options is used to
 # individually configure IRB.irb.
 #
-# If a proc is set for IRB.conf[:IRB_RC], its will be invoked after execution
+# If a proc is set for <code>IRB.conf[:IRB_RC]</code>, its will be invoked after execution
 # of that proc with the context of the current session as its argument. Each
 # session can be configured using this mechanism.
 #
@@ -268,7 +292,9 @@ require "irb/locale"
 # <code>_</code>::
 #   The value command executed, as a local variable
 # <code>__</code>::
-#   The history of evaluated commands
+#   The history of evaluated commands. Available only if
+#   <code>IRB.conf[:EVAL_HISTORY]</code> is not +nil+ (which is the default).
+#   See also IRB::Context#eval_history= and IRB::History.
 # <code>__[line_no]</code>::
 #   Returns the evaluation value at the given line number, +line_no+.
 #   If +line_no+ is a negative, the return value +line_no+ many lines before
@@ -304,7 +330,7 @@ require "irb/locale"
 #   # check if Foo#foo is available
 #   irb(main):005:0> Foo.instance_methods #=> [:foo, ...]
 #
-#   # change the active sesssion
+#   # change the active session
 #   irb(main):006:0> fg 2
 #   # define Foo#bar in the context of Foo
 #   irb.2(Foo):005:0> def bar
@@ -356,9 +382,7 @@ module IRB
   def IRB.version
     if v = @CONF[:VERSION] then return v end
 
-    require "irb/version"
-    rv = @RELEASE_VERSION.sub(/\.0/, "")
-    @CONF[:VERSION] = format("irb %s(%s)", rv, @LAST_UPDATE_DATE)
+    @CONF[:VERSION] = format("irb %s (%s)", @RELEASE_VERSION, @LAST_UPDATE_DATE)
   end
 
   # The current IRB::Context of the session, see IRB.conf
@@ -382,24 +406,10 @@ module IRB
     else
       irb = Irb.new
     end
-
-    @CONF[:IRB_RC].call(irb.context) if @CONF[:IRB_RC]
-    @CONF[:MAIN_CONTEXT] = irb.context
-
-    trap("SIGINT") do
-      irb.signal_handle
-    end
-
-    begin
-      catch(:IRB_EXIT) do
-        irb.eval_input
-      end
-    ensure
-      irb_at_exit
-    end
+    irb.run(@CONF)
   end
 
-  # Calls each event hook of IRB.conf[:AT_EXIT] when the current session quits.
+  # Calls each event hook of <code>IRB.conf[:AT_EXIT]</code> when the current session quits.
   def IRB.irb_at_exit
     @CONF[:AT_EXIT].each{|hook| hook.call}
   end
@@ -421,15 +431,61 @@ module IRB
   end
 
   class Irb
+    ASSIGNMENT_NODE_TYPES = [
+      # Local, instance, global, class, constant, instance, and index assignment:
+      #   "foo = bar",
+      #   "@foo = bar",
+      #   "$foo = bar",
+      #   "@@foo = bar",
+      #   "::Foo = bar",
+      #   "a::Foo = bar",
+      #   "Foo = bar"
+      #   "foo.bar = 1"
+      #   "foo[1] = bar"
+      :assign,
+
+      # Operation assignment:
+      #   "foo += bar"
+      #   "foo -= bar"
+      #   "foo ||= bar"
+      #   "foo &&= bar"
+      :opassign,
+
+      # Multiple assignment:
+      #   "foo, bar = 1, 2
+      :massign,
+    ]
+    # Note: instance and index assignment expressions could also be written like:
+    # "foo.bar=(1)" and "foo.[]=(1, bar)", when expressed that way, the former
+    # be parsed as :assign and echo will be suppressed, but the latter is
+    # parsed as a :method_add_arg and the output won't be suppressed
+
     # Creates a new irb session
-    def initialize(workspace = nil, input_method = nil, output_method = nil)
-      @context = Context.new(self, workspace, input_method, output_method)
+    def initialize(workspace = nil, input_method = nil)
+      @context = Context.new(self, workspace, input_method)
       @context.main.extend ExtendCommandBundle
       @signal_status = :IN_IRB
-
       @scanner = RubyLex.new
-      @scanner.exception_on_syntax_error = false
     end
+
+    def run(conf = IRB.conf)
+      conf[:IRB_RC].call(context) if conf[:IRB_RC]
+      conf[:MAIN_CONTEXT] = context
+
+      prev_trap = trap("SIGINT") do
+        signal_handle
+      end
+
+      begin
+        catch(:IRB_EXIT) do
+          eval_input
+        end
+      ensure
+        trap("SIGINT", prev_trap)
+        conf[:AT_EXIT].each{|hook| hook.call}
+      end
+    end
+
     # Returns the current context of this irb session
     attr_reader :context
     # The lexer used by this irb session
@@ -437,6 +493,8 @@ module IRB
 
     # Evaluates input for this session.
     def eval_input
+      exc = nil
+
       @scanner.set_prompt do
         |ltype, indent, continue, line_no|
         if ltype
@@ -454,14 +512,16 @@ module IRB
         else
           @context.io.prompt = p = ""
         end
-        if @context.auto_indent_mode
+        if @context.auto_indent_mode and !@context.io.respond_to?(:auto_indent)
           unless ltype
-            ind = prompt(@context.prompt_i, ltype, indent, line_no)[/.*\z/].size +
+            prompt_i = @context.prompt_i.nil? ? "" : @context.prompt_i
+            ind = prompt(prompt_i, ltype, indent, line_no)[/.*\z/].size +
               indent * 2 - p.size
             ind += 2 if continue
             @context.io.prompt = p + " " * ind if ind > 0
           end
         end
+        @context.io.prompt
       end
 
       @scanner.set_input(@context.io) do
@@ -475,65 +535,133 @@ module IRB
                 printf "Use \"exit\" to leave %s\n", @context.ap_name
               end
             else
-              print "\n"
+              print "\n" if @context.prompting?
             end
           end
           l
         end
       end
 
+      @scanner.set_auto_indent(@context) if @context.auto_indent_mode
+
       @scanner.each_top_level_statement do |line, line_no|
         signal_status(:IN_EVAL) do
           begin
-            line.untaint
-            @context.evaluate(line, line_no)
-            output_value if @context.echo?
-            exc = nil
-          rescue Interrupt => exc
-          rescue SystemExit, SignalException
-            raise
-          rescue Exception => exc
-          end
-          if exc
-            print exc.class, ": ", exc, "\n"
-            if exc.backtrace && exc.backtrace[0] =~ /irb(2)?(\/.*|-.*|\.rb)?:/ && exc.class.to_s !~ /^IRB/ &&
-                !(SyntaxError === exc)
-              irb_bug = true
-            else
-              irb_bug = false
+            line.untaint if RUBY_VERSION < '2.7'
+            if IRB.conf[:MEASURE] && IRB.conf[:MEASURE_CALLBACKS].empty?
+              IRB.set_measure_callback
             end
-
-            messages = []
-            lasts = []
-            levels = 0
-            if exc.backtrace
-              for m in exc.backtrace
-                m = @context.workspace.filter_backtrace(m) unless irb_bug
-                if m
-                  if messages.size < @context.back_trace_limit
-                    messages.push "\tfrom "+m
-                  else
-                    lasts.push "\tfrom "+m
-                    if lasts.size > @context.back_trace_limit
-                      lasts.shift
-                      levels += 1
-                    end
+            if IRB.conf[:MEASURE] && !IRB.conf[:MEASURE_CALLBACKS].empty?
+              result = nil
+              last_proc = proc{ result = @context.evaluate(line, line_no, exception: exc) }
+              IRB.conf[:MEASURE_CALLBACKS].inject(last_proc) { |chain, item|
+                _name, callback, arg = item
+                proc {
+                  callback.(@context, line, line_no, arg, exception: exc) do
+                    chain.call
                   end
+                }
+              }.call
+              @context.set_last_value(result)
+            else
+              @context.evaluate(line, line_no, exception: exc)
+            end
+            if @context.echo?
+              if assignment_expression?(line)
+                if @context.echo_on_assignment?
+                  output_value(@context.echo_on_assignment? == :truncate)
                 end
+              else
+                output_value
               end
             end
-            print messages.join("\n"), "\n"
-            unless lasts.empty?
-              printf "... %d levels...\n", levels if levels > 0
-              print lasts.join("\n"), "\n"
-            end
-            print "Maybe IRB bug!\n" if irb_bug
+          rescue Interrupt => exc
+          rescue SystemExit, SignalException
+            raise
+          rescue Exception => exc
+          else
+            exc = nil
+            next
           end
-          if $SAFE > 2
-            abort "Error: irb does not work for $SAFE level higher than 2"
+          handle_exception(exc)
+          @context.workspace.local_variable_set(:_, exc)
+          exc = nil
+        end
+      end
+    end
+
+    def convert_invalid_byte_sequence(str)
+      str = str.force_encoding(Encoding::ASCII_8BIT)
+      conv = Encoding::Converter.new(Encoding::ASCII_8BIT, Encoding::UTF_8)
+      dst = String.new
+      begin
+        ret = conv.primitive_convert(str, dst)
+        case ret
+        when :invalid_byte_sequence
+          conv.insert_output(conf.primitive_errinfo[3].dump[1..-2])
+          redo
+        when :undefined_conversion
+          c = conv.primitive_errinfo[3].dup.force_encoding(conv.primitive_errinfo[1])
+          conv.insert_output(c.dump[1..-2])
+          redo
+        when :incomplete_input
+          conv.insert_output(conv.primitive_errinfo[3].dump[1..-2])
+        when :finished
+        end
+        break
+      end while nil
+      dst
+    end
+
+    def handle_exception(exc)
+      if exc.backtrace && exc.backtrace[0] =~ /\/irb(2)?(\/.*|-.*|\.rb)?:/ && exc.class.to_s !~ /^IRB/ &&
+         !(SyntaxError === exc) && !(EncodingError === exc)
+        # The backtrace of invalid encoding hash (ex. {"\xAE": 1}) raises EncodingError without lineno.
+        irb_bug = true
+      else
+        irb_bug = false
+      end
+
+      if exc.backtrace
+        order = nil
+        if '2.5.0' == RUBY_VERSION
+          # Exception#full_message doesn't have keyword arguments.
+          message = exc.full_message # the same of (highlight: true, order: bottom)
+          order = :bottom
+        elsif '2.5.1' <= RUBY_VERSION && RUBY_VERSION < '3.0.0'
+          if STDOUT.tty?
+            message = exc.full_message(order: :bottom)
+            order = :bottom
+          else
+            message = exc.full_message(order: :top)
+            order = :top
           end
+        else # '3.0.0' <= RUBY_VERSION
+          message = exc.full_message(order: :top)
+          order = :top
         end
+        message = convert_invalid_byte_sequence(message)
+        message = message.gsub(/((?:^\t.+$\n)+)/)  { |m|
+          case order
+          when :top
+            lines = m.split("\n")
+          when :bottom
+            lines = m.split("\n").reverse
+          end
+          unless irb_bug
+            lines = lines.map { |l| @context.workspace.filter_backtrace(l) }.compact
+            if lines.size > @context.back_trace_limit
+              omit = lines.size - @context.back_trace_limit
+              lines = lines[0..(@context.back_trace_limit - 1)]
+              lines << "\t... %d levels..." % omit
+            end
+          end
+          lines = lines.reverse if order == :bottom
+          lines.map{ |l| l + "\n" }.join
+        }
+        puts message
       end
+      print "Maybe IRB bug!\n" if irb_bug
     end
 
     # Evaluates the given block using the given +path+ as the Context#irb_path
@@ -639,10 +767,18 @@ module IRB
         when "l"
           ltype
         when "i"
-          if $1
-            format("%" + $1 + "d", indent)
+          if indent < 0
+            if $1
+              "-".rjust($1.to_i)
+            else
+              "-"
+            end
           else
-            indent.to_s
+            if $1
+              format("%" + $1 + "d", indent)
+            else
+              indent.to_s
+            end
           end
         when "n"
           if $1
@@ -657,8 +793,37 @@ module IRB
       p
     end
 
-    def output_value # :nodoc:
-      printf @context.return_format, @context.inspect_last_value
+    def output_value(omit = false) # :nodoc:
+      str = @context.inspect_last_value
+      multiline_p = str.include?("\n")
+      if omit
+        winwidth = @context.io.winsize.last
+        if multiline_p
+          first_line = str.split("\n").first
+          result = @context.newline_before_multiline_output? ? (@context.return_format % first_line) : first_line
+          output_width = Reline::Unicode.calculate_width(result, true)
+          diff_size = output_width - Reline::Unicode.calculate_width(first_line, true)
+          if diff_size.positive? and output_width > winwidth
+            lines, _ = Reline::Unicode.split_by_width(first_line, winwidth - diff_size - 3)
+            str = "%s...\e[0m" % lines.first
+            multiline_p = false
+          else
+            str = str.gsub(/(\A.*?\n).*/m, "\\1...")
+          end
+        else
+          output_width = Reline::Unicode.calculate_width(@context.return_format % str, true)
+          diff_size = output_width - Reline::Unicode.calculate_width(str, true)
+          if diff_size.positive? and output_width > winwidth
+            lines, _ = Reline::Unicode.split_by_width(str, winwidth - diff_size - 3)
+            str = "%s...\e[0m" % lines.first
+          end
+        end
+      end
+      if multiline_p && @context.newline_before_multiline_output?
+        printf @context.return_format, "\n#{str}"
+      else
+        printf @context.return_format, str
+      end
     end
 
     # Outputs the local variables to this current session, including
@@ -677,6 +842,26 @@ module IRB
       end
       format("#<%s: %s>", self.class, ary.join(", "))
     end
+
+    def assignment_expression?(line)
+      # Try to parse the line and check if the last of possibly multiple
+      # expressions is an assignment type.
+
+      # If the expression is invalid, Ripper.sexp should return nil which will
+      # result in false being returned. Any valid expression should return an
+      # s-expression where the second selement of the top level array is an
+      # array of parsed expressions. The first element of each expression is the
+      # expression's type.
+      verbose, $VERBOSE = $VERBOSE, nil
+      result = ASSIGNMENT_NODE_TYPES.include?(Ripper.sexp(line)&.dig(1,-1,0))
+      $VERBOSE = verbose
+      result
+    end
+
+    ATTR_TTY = "\e[%sm"
+    def ATTR_TTY.[](*a) self % a.join(";"); end
+    ATTR_PLAIN = ""
+    def ATTR_PLAIN.[](*) self; end
   end
 
   def @CONF.inspect
@@ -701,3 +886,71 @@ module IRB
     array.join("\n")
   end
 end
+
+class Binding
+  # Opens an IRB session where +binding.irb+ is called which allows for
+  # interactive debugging. You can call any methods or variables available in
+  # the current scope, and mutate state if you need to.
+  #
+  #
+  # Given a Ruby file called +potato.rb+ containing the following code:
+  #
+  #     class Potato
+  #       def initialize
+  #         @cooked = false
+  #         binding.irb
+  #         puts "Cooked potato: #{@cooked}"
+  #       end
+  #     end
+  #
+  #     Potato.new
+  #
+  # Running <code>ruby potato.rb</code> will open an IRB session where
+  # +binding.irb+ is called, and you will see the following:
+  #
+  #     $ ruby potato.rb
+  #
+  #     From: potato.rb @ line 4 :
+  #
+  #         1: class Potato
+  #         2:   def initialize
+  #         3:     @cooked = false
+  #      => 4:     binding.irb
+  #         5:     puts "Cooked potato: #{@cooked}"
+  #         6:   end
+  #         7: end
+  #         8:
+  #         9: Potato.new
+  #
+  #     irb(#<Potato:0x00007feea1916670>):001:0>
+  #
+  # You can type any valid Ruby code and it will be evaluated in the current
+  # context. This allows you to debug without having to run your code repeatedly:
+  #
+  #     irb(#<Potato:0x00007feea1916670>):001:0> @cooked
+  #     => false
+  #     irb(#<Potato:0x00007feea1916670>):002:0> self.class
+  #     => Potato
+  #     irb(#<Potato:0x00007feea1916670>):003:0> caller.first
+  #     => ".../2.5.1/lib/ruby/2.5.0/irb/workspace.rb:85:in `eval'"
+  #     irb(#<Potato:0x00007feea1916670>):004:0> @cooked = true
+  #     => true
+  #
+  # You can exit the IRB session with the +exit+ command. Note that exiting will
+  # resume execution where +binding.irb+ had paused it, as you can see from the
+  # output printed to standard output in this example:
+  #
+  #     irb(#<Potato:0x00007feea1916670>):005:0> exit
+  #     Cooked potato: true
+  #
+  #
+  # See IRB@IRB+Usage for more information.
+  def irb
+    IRB.setup(source_location[0], argv: [])
+    workspace = IRB::WorkSpace.new(self)
+    STDOUT.print(workspace.code_around_binding)
+    binding_irb = IRB::Irb.new(workspace)
+    binding_irb.context.irb_path = File.expand_path(source_location[0])
+    binding_irb.run(IRB.conf)
+  end
+end
diff --git a/lib/irb/.document b/lib/irb/.document
new file mode 100644
index 0000000000..3b0d6fa4ed
--- /dev/null
+++ b/lib/irb/.document
@@ -0,0 +1 @@
+**/*.rb
diff --git a/lib/irb/cmd/chws.rb b/lib/irb/cmd/chws.rb
index 606e0c52a9..e9f257791c 100644
--- a/lib/irb/cmd/chws.rb
+++ b/lib/irb/cmd/chws.rb
@@ -10,20 +10,20 @@
 #
 #
 
-require "irb/cmd/nop.rb"
-require "irb/ext/change-ws.rb"
+require_relative "nop"
+require_relative "../ext/change-ws"
 
 # :stopdoc:
 module IRB
   module ExtendCommand
 
-    class CurrentWorkingWorkspace<Nop
+    class CurrentWorkingWorkspace < Nop
       def execute(*obj)
         irb_context.main
       end
     end
 
-    class ChangeWorkspace<Nop
+    class ChangeWorkspace < Nop
       def execute(*obj)
         irb_context.change_workspace(*obj)
         irb_context.main
diff --git a/lib/irb/cmd/fork.rb b/lib/irb/cmd/fork.rb
index 552c3962f6..7566d10be0 100644
--- a/lib/irb/cmd/fork.rb
+++ b/lib/irb/cmd/fork.rb
@@ -14,14 +14,14 @@
 # :stopdoc:
 module IRB
   module ExtendCommand
-    class Fork<Nop
+    class Fork < Nop
       def execute
-        pid = send ExtendCommand.irb_original_method_name("fork")
+        pid = __send__ ExtendCommand.irb_original_method_name("fork")
         unless pid
           class << self
             alias_method :exit, ExtendCommand.irb_original_method_name('exit')
           end
-          if iterator?
+          if block_given?
             begin
               yield
             ensure
@@ -35,5 +35,3 @@ module IRB
   end
 end
 # :startdoc:
-
-
diff --git a/lib/irb/cmd/help.rb b/lib/irb/cmd/help.rb
index 7a09c396e1..0629479e92 100644
--- a/lib/irb/cmd/help.rb
+++ b/lib/irb/cmd/help.rb
@@ -9,17 +9,18 @@
 #
 #
 
-require 'rdoc/ri/driver'
-
-require "irb/cmd/nop.rb"
+require_relative "nop"
 
 # :stopdoc:
 module IRB
   module ExtendCommand
-    class Help<Nop
-      begin
-        Ri = RDoc::RI::Driver.new
-      rescue SystemExit
+    class Help < Nop
+      def execute(*names)
+        require 'rdoc/ri/driver'
+        IRB::ExtendCommand::Help.const_set(:Ri, RDoc::RI::Driver.new)
+      rescue LoadError, SystemExit
+        IRB::ExtendCommand::Help.remove_method(:execute)
+        # raise NoMethodError in ensure
       else
         def execute(*names)
           if names.empty?
@@ -35,6 +36,9 @@ module IRB
           end
           nil
         end
+        nil
+      ensure
+        execute(*names)
       end
     end
   end
diff --git a/lib/irb/cmd/info.rb b/lib/irb/cmd/info.rb
new file mode 100644
index 0000000000..d122c88b77
--- /dev/null
+++ b/lib/irb/cmd/info.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: false
+
+require_relative "nop"
+
+# :stopdoc:
+module IRB
+  module ExtendCommand
+    class Info < Nop
+      def execute
+        Class.new {
+          def inspect
+            str  = "Ruby version: #{RUBY_VERSION}\n"
+            str += "IRB version: #{IRB.version}\n"
+            str += "InputMethod: #{IRB.CurrentContext.io.inspect}\n"
+            str += ".irbrc path: #{IRB.rc_file}\n" if File.exist?(IRB.rc_file)
+            str += "RUBY_PLATFORM: #{RUBY_PLATFORM}\n"
+            str
+          end
+          alias_method :to_s, :inspect
+        }.new
+      end
+    end
+  end
+end
+# :startdoc:
diff --git a/lib/irb/cmd/load.rb b/lib/irb/cmd/load.rb
index e3b84dad79..b6769a4124 100644
--- a/lib/irb/cmd/load.rb
+++ b/lib/irb/cmd/load.rb
@@ -10,13 +10,13 @@
 #
 #
 
-require "irb/cmd/nop.rb"
-require "irb/ext/loader"
+require_relative "nop"
+require_relative "../ext/loader"
 
 # :stopdoc:
 module IRB
   module ExtendCommand
-    class Load<Nop
+    class Load < Nop
       include IrbLoader
 
       def execute(file_name, priv = nil)
@@ -24,7 +24,7 @@ module IRB
       end
     end
 
-    class Require<Nop
+    class Require < Nop
       include IrbLoader
 
       def execute(file_name)
@@ -55,7 +55,7 @@ module IRB
       end
     end
 
-    class Source<Nop
+    class Source < Nop
       include IrbLoader
       def execute(file_name)
         source_file(file_name)
diff --git a/lib/irb/cmd/ls.rb b/lib/irb/cmd/ls.rb
new file mode 100644
index 0000000000..f163f4f9e6
--- /dev/null
+++ b/lib/irb/cmd/ls.rb
@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+require "reline"
+require_relative "nop"
+require_relative "../color"
+
+# :stopdoc:
+module IRB
+  module ExtendCommand
+    class Ls < Nop
+      def execute(*arg, grep: nil)
+        o = Output.new(grep: grep)
+
+        obj    = arg.empty? ? irb_context.workspace.main : arg.first
+        locals = arg.empty? ? irb_context.workspace.binding.local_variables : []
+        klass  = (obj.class == Class || obj.class == Module ? obj : obj.class)
+
+        o.dump("constants", obj.constants) if obj.respond_to?(:constants)
+        o.dump("#{klass}.methods", obj.singleton_methods(false))
+        o.dump("#{klass}#methods", klass.public_instance_methods(false))
+        o.dump("instance variables", obj.instance_variables)
+        o.dump("class variables", klass.class_variables)
+        o.dump("locals", locals)
+      end
+
+      class Output
+        MARGIN = "  "
+
+        def initialize(grep: nil)
+          @grep = grep
+          @line_width = screen_width - MARGIN.length # right padding
+        end
+
+        def dump(name, strs)
+          strs = strs.grep(@grep) if @grep
+          strs = strs.sort
+          return if strs.empty?
+
+          # Attempt a single line
+          print "#{Color.colorize(name, [:BOLD, :BLUE])}: "
+          if fits_on_line?(strs, cols: strs.size, offset: "#{name}: ".length)
+            puts strs.join(MARGIN)
+            return
+          end
+          puts
+
+          # Dump with the largest # of columns that fits on a line
+          cols = strs.size
+          until fits_on_line?(strs, cols: cols, offset: MARGIN.length) || cols == 1
+            cols -= 1
+          end
+          widths = col_widths(strs, cols: cols)
+          strs.each_slice(cols) do |ss|
+            puts ss.map.with_index { |s, i| "#{MARGIN}%-#{widths[i]}s" % s }.join
+          end
+        end
+
+        private
+
+        def fits_on_line?(strs, cols:, offset: 0)
+          width = col_widths(strs, cols: cols).sum + MARGIN.length * (cols - 1)
+          width <= @line_width - offset
+        end
+
+        def col_widths(strs, cols:)
+          cols.times.map do |col|
+            (col...strs.size).step(cols).map do |i|
+              strs[i].length
+            end.max
+          end
+        end
+
+        def screen_width
+          Reline.get_screen_size.last
+        rescue Errno::EINVAL # in `winsize': Invalid argument - <STDIN>
+          80
+        end
+      end
+      private_constant :Output
+    end
+  end
+end
+# :startdoc:
diff --git a/lib/irb/cmd/measure.rb b/lib/irb/cmd/measure.rb
new file mode 100644
index 0000000000..58eaec2ded
--- /dev/null
+++ b/lib/irb/cmd/measure.rb
@@ -0,0 +1,40 @@
+require_relative "nop"
+
+# :stopdoc:
+module IRB
+  module ExtendCommand
+    class Measure < Nop
+      def initialize(*args)
+        super(*args)
+      end
+
+      def execute(type = nil, arg = nil, &block)
+        case type
+        when :off
+          IRB.conf[:MEASURE] = nil
+          IRB.unset_measure_callback(arg)
+        when :list
+          IRB.conf[:MEASURE_CALLBACKS].each do |type_name, _, arg_val|
+            puts "- #{type_name}" + (arg_val ? "(#{arg_val.inspect})" : '')
+          end
+        when :on
+          IRB.conf[:MEASURE] = true
+          added = IRB.set_measure_callback(type, arg)
+          puts "#{added[0]} is added." if added
+        else
+          if block_given?
+            IRB.conf[:MEASURE] = true
+            added = IRB.set_measure_callback(&block)
+            puts "#{added[0]} is added." if added
+          else
+            IRB.conf[:MEASURE] = true
+            added = IRB.set_measure_callback(type, arg)
+            puts "#{added[0]} is added." if added
+          end
+        end
+        nil
+      end
+    end
+  end
+end
+# :startdoc:
diff --git a/lib/irb/cmd/nop.rb b/lib/irb/cmd/nop.rb
index 9cf4337c28..d6f7a611a6 100644
--- a/lib/irb/cmd/nop.rb
+++ b/lib/irb/cmd/nop.rb
@@ -14,10 +14,16 @@ module IRB
   module ExtendCommand
     class Nop
 
-
-      def self.execute(conf, *opts)
-        command = new(conf)
-        command.execute(*opts)
+      if RUBY_ENGINE == "ruby" && RUBY_VERSION >= "2.7.0"
+        def self.execute(conf, *opts, **kwargs, &block)
+          command = new(conf)
+          command.execute(*opts, **kwargs, &block)
+        end
+      else
+        def self.execute(conf, *opts, &block)
+          command = new(conf)
+          command.execute(*opts, &block)
+        end
       end
 
       def initialize(conf)
diff --git a/lib/irb/cmd/pushws.rb b/lib/irb/cmd/pushws.rb
index aa14430ce4..612157d8a0 100644
--- a/lib/irb/cmd/pushws.rb
+++ b/lib/irb/cmd/pushws.rb
@@ -10,26 +10,26 @@
 #
 #
 
-require "irb/cmd/nop.rb"
-require "irb/ext/workspaces.rb"
+require_relative "nop"
+require_relative "../ext/workspaces"
 
 # :stopdoc:
 module IRB
   module ExtendCommand
-    class Workspaces<Nop
+    class Workspaces < Nop
       def execute(*obj)
         irb_context.workspaces.collect{|ws| ws.main}
       end
     end
 
-    class PushWorkspace<Workspaces
+    class PushWorkspace < Workspaces
       def execute(*obj)
         irb_context.push_workspace(*obj)
         super
       end
     end
 
-    class PopWorkspace<Workspaces
+    class PopWorkspace < Workspaces
       def execute(*obj)
         irb_context.pop_workspace(*obj)
         super
@@ -38,4 +38,3 @@ module IRB
   end
 end
 # :startdoc:
-
diff --git a/lib/irb/cmd/show_source.rb b/lib/irb/cmd/show_source.rb
new file mode 100644
index 0000000000..0bd40b7d4e
--- /dev/null
+++ b/lib/irb/cmd/show_source.rb
@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+require_relative "nop"
+require_relative "../color"
+require_relative "../ruby-lex"
+
+# :stopdoc:
+module IRB
+  module ExtendCommand
+    class ShowSource < Nop
+      def execute(str = nil)
+        unless str.is_a?(String)
+          puts "Error: Expected a string but got #{str.inspect}"
+          return
+        end
+        source = find_source(str)
+        if source && File.exist?(source.file)
+          show_source(source)
+        else
+          puts "Error: Couldn't locate a definition for #{str}"
+        end
+        nil
+      end
+
+      private
+
+      # @param [IRB::ExtendCommand::ShowSource::Source] source
+      def show_source(source)
+        puts
+        puts "#{bold("From")}: #{source.file}:#{source.first_line}"
+        puts
+        code = IRB::Color.colorize_code(File.read(source.file))
+        puts code.lines[(source.first_line - 1)...source.last_line].join
+        puts
+      end
+
+      def find_source(str)
+        case str
+        when /\A[A-Z]\w*(::[A-Z]\w*)*\z/ # Const::Name
+          eval(str, irb_context.workspace.binding) # trigger autoload
+          base = irb_context.workspace.binding.receiver.yield_self { |r| r.is_a?(Module) ? r : Object }
+          file, line = base.const_source_location(str) if base.respond_to?(:const_source_location) # Ruby 2.7+
+        when /\A(?<owner>[A-Z]\w*(::[A-Z]\w*)*)#(?<method>[^ :.]+)\z/ # Class#method
+          owner = eval(Regexp.last_match[:owner], irb_context.workspace.binding)
+          method = Regexp.last_match[:method]
+          if owner.respond_to?(:instance_method) && owner.instance_methods.include?(method.to_sym)
+            file, line = owner.instance_method(method).source_location
+          end
+        when /\A((?<receiver>.+)(\.|::))?(?<method>[^ :.]+)\z/ # method, receiver.method, receiver::method
+          receiver = eval(Regexp.last_match[:receiver] || 'self', irb_context.workspace.binding)
+          method = Regexp.last_match[:method]
+          file, line = receiver.method(method).source_location if receiver.respond_to?(method)
+        end
+        if file && line
+          Source.new(file: file, first_line: line, last_line: find_end(file, line))
+        end
+      end
+
+      def find_end(file, first_line)
+        return first_line unless File.exist?(file)
+        lex = RubyLex.new
+        code = +""
+        File.read(file).lines[(first_line - 1)..-1].each_with_index do |line, i|
+          _ltype, _indent, continue, code_block_open = lex.check_state(code << line)
+          if !continue && !code_block_open
+            return first_line + i
+          end
+        end
+        first_line
+      end
+
+      def bold(str)
+        Color.colorize(str, [:BOLD])
+      end
+
+      Source = Struct.new(
+        :file,       # @param [String] - file name
+        :first_line, # @param [String] - first line
+        :last_line,  # @param [String] - last line
+        keyword_init: true,
+      )
+      private_constant :Source
+    end
+  end
+end
+# :startdoc:
diff --git a/lib/irb/cmd/subirb.rb b/lib/irb/cmd/subirb.rb
index f29548b88f..1e18607d1a 100644
--- a/lib/irb/cmd/subirb.rb
+++ b/lib/irb/cmd/subirb.rb
@@ -9,31 +9,31 @@
 #
 #
 
-require "irb/cmd/nop.rb"
-require "irb/ext/multi-irb"
+require_relative "nop"
+require_relative "../ext/multi-irb"
 
 # :stopdoc:
 module IRB
   module ExtendCommand
-    class IrbCommand<Nop
+    class IrbCommand < Nop
       def execute(*obj)
         IRB.irb(nil, *obj)
       end
     end
 
-    class Jobs<Nop
+    class Jobs < Nop
       def execute
         IRB.JobManager
       end
     end
 
-    class Foreground<Nop
+    class Foreground < Nop
       def execute(key)
         IRB.JobManager.switch(key)
       end
     end
 
-    class Kill<Nop
+    class Kill < Nop
       def execute(*keys)
         IRB.JobManager.kill(*keys)
       end
diff --git a/lib/irb/cmd/whereami.rb b/lib/irb/cmd/whereami.rb
new file mode 100644
index 0000000000..b3def11b93
--- /dev/null
+++ b/lib/irb/cmd/whereami.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require_relative "nop"
+
+# :stopdoc:
+module IRB
+  module ExtendCommand
+    class Whereami < Nop
+      def execute(*)
+        code = irb_context.workspace.code_around_binding
+        if code
+          puts code
+        else
+          puts "The current context doesn't have code."
+        end
+      end
+    end
+  end
+end
+# :startdoc:
diff --git a/lib/irb/color.rb b/lib/irb/color.rb
new file mode 100644
index 0000000000..cfbb3cc668
--- /dev/null
+++ b/lib/irb/color.rb
@@ -0,0 +1,251 @@
+# frozen_string_literal: true
+require 'reline'
+require 'ripper'
+require 'irb/ruby-lex'
+
+module IRB # :nodoc:
+  module Color
+    CLEAR     = 0
+    BOLD      = 1
+    UNDERLINE = 4
+    REVERSE   = 7
+    RED       = 31
+    GREEN     = 32
+    YELLOW    = 33
+    BLUE      = 34
+    MAGENTA   = 35
+    CYAN      = 36
+
+    TOKEN_KEYWORDS = {
+      on_kw: ['nil', 'self', 'true', 'false', '__FILE__', '__LINE__', '__ENCODING__'],
+      on_const: ['ENV'],
+    }
+    private_constant :TOKEN_KEYWORDS
+
+    # A constant of all-bit 1 to match any Ripper's state in #dispatch_seq
+    ALL = -1
+    private_constant :ALL
+
+    begin
+      # Following pry's colors where possible, but sometimes having a compromise like making
+      # backtick and regexp as red (string's color, because they're sharing tokens).
+      TOKEN_SEQ_EXPRS = {
+        on_CHAR:            [[BLUE, BOLD],            ALL],
+        on_backtick:        [[RED, BOLD],             ALL],
+        on_comment:         [[BLUE, BOLD],            ALL],
+        on_const:           [[BLUE, BOLD, UNDERLINE], ALL],
+        on_embexpr_beg:     [[RED],                   ALL],
+        on_embexpr_end:     [[RED],                   ALL],
+        on_embvar:          [[RED],                   ALL],
+        on_float:           [[MAGENTA, BOLD],         ALL],
+        on_gvar:            [[GREEN, BOLD],           ALL],
+        on_heredoc_beg:     [[RED],                   ALL],
+        on_heredoc_end:     [[RED],                   ALL],
+        on_ident:           [[BLUE, BOLD],            Ripper::EXPR_ENDFN],
+        on_imaginary:       [[BLUE, BOLD],            ALL],
+        on_int:             [[BLUE, BOLD],            ALL],
+        on_kw:              [[GREEN],                 ALL],
+        on_label:           [[MAGENTA],               ALL],
+        on_label_end:       [[RED, BOLD],             ALL],
+        on_qsymbols_beg:    [[RED, BOLD],             ALL],
+        on_qwords_beg:      [[RED, BOLD],             ALL],
+        on_rational:        [[BLUE, BOLD],            ALL],
+        on_regexp_beg:      [[RED, BOLD],             ALL],
+        on_regexp_end:      [[RED, BOLD],             ALL],
+        on_symbeg:          [[YELLOW],                ALL],
+        on_symbols_beg:     [[RED, BOLD],             ALL],
+        on_tstring_beg:     [[RED, BOLD],             ALL],
+        on_tstring_content: [[RED],                   ALL],
+        on_tstring_end:     [[RED, BOLD],             ALL],
+        on_words_beg:       [[RED, BOLD],             ALL],
+        on_parse_error:     [[RED, REVERSE],          ALL],
+        compile_error:      [[RED, REVERSE],          ALL],
+        on_assign_error:    [[RED, REVERSE],          ALL],
+        on_alias_error:     [[RED, REVERSE],          ALL],
+        on_class_name_error:[[RED, REVERSE],          ALL],
+        on_param_error:     [[RED, REVERSE],          ALL],
+        on___end__:         [[GREEN],                 ALL],
+      }
+    rescue NameError
+      # Give up highlighting Ripper-incompatible older Ruby
+      TOKEN_SEQ_EXPRS = {}
+    end
+    private_constant :TOKEN_SEQ_EXPRS
+
+    ERROR_TOKENS = TOKEN_SEQ_EXPRS.keys.select { |k| k.to_s.end_with?('error') }
+    private_constant :ERROR_TOKENS
+
+    class << self
+      def colorable?
+        $stdout.tty? && supported? && (/mswin|mingw/ =~ RUBY_PLATFORM || (ENV.key?('TERM') && ENV['TERM'] != 'dumb'))
+      end
+
+      def inspect_colorable?(obj, seen: {}.compare_by_identity)
+        case obj
+        when String, Symbol, Regexp, Integer, Float, FalseClass, TrueClass, NilClass
+          true
+        when Hash
+          without_circular_ref(obj, seen: seen) do
+            obj.all? { |k, v| inspect_colorable?(k, seen: seen) && inspect_colorable?(v, seen: seen) }
+          end
+        when Array
+          without_circular_ref(obj, seen: seen) do
+            obj.all? { |o| inspect_colorable?(o, seen: seen) }
+          end
+        when Range
+          inspect_colorable?(obj.begin, seen: seen) && inspect_colorable?(obj.end, seen: seen)
+        when Module
+          !obj.name.nil?
+        else
+          false
+        end
+      end
+
+      def clear
+        return '' unless colorable?
+        "\e[#{CLEAR}m"
+      end
+
+      def colorize(text, seq)
+        return text unless colorable?
+        seq = seq.map { |s| "\e[#{const_get(s)}m" }.join('')
+        "#{seq}#{text}#{clear}"
+      end
+
+      # If `complete` is false (code is incomplete), this does not warn compile_error.
+      # This option is needed to avoid warning a user when the compile_error is happening
+      # because the input is not wrong but just incomplete.
+      def colorize_code(code, complete: true, ignore_error: false)
+        return code unless colorable?
+
+        symbol_state = SymbolState.new
+        colored = +''
+        length = 0
+        end_seen = false
+
+        scan(code, allow_last_error: !complete) do |token, str, expr|
+          # IRB::ColorPrinter skips colorizing fragments with any invalid token
+          if ignore_error && ERROR_TOKENS.include?(token)
+            return Reline::Unicode.escape_for_print(code)
+          end
+
+          in_symbol = symbol_state.scan_token(token)
+          str.each_line do |line|
+            line = Reline::Unicode.escape_for_print(line)
+            if seq = dispatch_seq(token, expr, line, in_symbol: in_symbol)
+              colored << seq.map { |s| "\e[#{s}m" }.join('')
+              colored << line.sub(/\Z/, clear)
+            else
+              colored << line
+            end
+          end
+          length += str.bytesize
+          end_seen = true if token == :on___end__
+        end
+
+        # give up colorizing incomplete Ripper tokens
+        unless end_seen or length == code.bytesize
+          return Reline::Unicode.escape_for_print(code)
+        end
+
+        colored
+      end
+
+      private
+
+      def without_circular_ref(obj, seen:, &block)
+        return false if seen.key?(obj)
+        seen[obj] = true
+        block.call
+      ensure
+        seen.delete(obj)
+      end
+
+      def supported?
+        return @supported if defined?(@supported)
+        @supported = Ripper::Lexer::Elem.method_defined?(:state)
+      end
+
+      def scan(code, allow_last_error:)
+        pos = [1, 0]
+
+        verbose, $VERBOSE = $VERBOSE, nil
+        RubyLex.compile_with_errors_suppressed(code) do |inner_code, line_no|
+          lexer = Ripper::Lexer.new(inner_code, '(ripper)', line_no)
+          if lexer.respond_to?(:scan) # Ruby 2.7+
+            lexer.scan.each do |elem|
+              str = elem.tok
+              next if allow_last_error and /meets end of file|unexpected end-of-input/ =~ elem.message
+              next if ([elem.pos[0], elem.pos[1] + str.bytesize] <=> pos) <= 0
+
+              str.each_line do |line|
+                if line.end_with?("\n")
+                  pos[0] += 1
+                  pos[1] = 0
+                else
+                  pos[1] += line.bytesize
+                end
+              end
+
+              yield(elem.event, str, elem.state)
+            end
+          else
+            lexer.parse.each do |elem|
+              yield(elem.event, elem.tok, elem.state)
+            end
+          end
+        end
+      ensure
+        $VERBOSE = verbose
+      end
+
+      def dispatch_seq(token, expr, str, in_symbol:)
+        if ERROR_TOKENS.include?(token)
+          TOKEN_SEQ_EXPRS[token][0]
+        elsif in_symbol
+          [YELLOW]
+        elsif TOKEN_KEYWORDS.fetch(token, []).include?(str)
+          [CYAN, BOLD]
+        elsif (seq, exprs = TOKEN_SEQ_EXPRS[token]; (expr & (exprs || 0)) != 0)
+          seq
+        else
+          nil
+        end
+      end
+    end
+
+    # A class to manage a state to know whether the current token is for Symbol or not.
+    class SymbolState
+      def initialize
+        # Push `true` to detect Symbol. `false` to increase the nest level for non-Symbol.
+        @stack = []
+      end
+
+      # Return true if the token is a part of Symbol.
+      def scan_token(token)
+        prev_state = @stack.last
+        case token
+        when :on_symbeg, :on_symbols_beg, :on_qsymbols_beg
+          @stack << true
+        when :on_ident, :on_op, :on_const, :on_ivar, :on_cvar, :on_gvar, :on_kw
+          if @stack.last # Pop only when it's Symbol
+            @stack.pop
+            return prev_state
+          end
+        when :on_tstring_beg
+          @stack << false
+        when :on_embexpr_beg
+          @stack << false
+          return prev_state
+        when :on_tstring_end # :on_tstring_end may close Symbol
+          @stack.pop
+          return prev_state
+        when :on_embexpr_end
+          @stack.pop
+        end
+        @stack.last
+      end
+    end
+    private_constant :SymbolState
+  end
+end
diff --git a/lib/irb/color_printer.rb b/lib/irb/color_printer.rb
new file mode 100644
index 0000000000..30c6825750
--- /dev/null
+++ b/lib/irb/color_printer.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+require 'pp'
+require 'irb/color'
+
+module IRB
+  class ColorPrinter < ::PP
+    class << self
+      def pp(obj, out = $>, width = screen_width)
+        q = ColorPrinter.new(out, width)
+        q.guard_inspect_key {q.pp obj}
+        q.flush
+        out << "\n"
+      end
+
+      private
+
+      def screen_width
+        Reline.get_screen_size.last
+      rescue Errno::EINVAL # in `winsize': Invalid argument - <STDIN>
+        79
+      end
+    end
+
+    def pp(obj)
+      if obj.is_a?(String)
+        # Avoid calling Ruby 2.4+ String#pretty_print that splits a string by "\n"
+        text(obj.inspect)
+      else
+        super
+      end
+    end
+
+    def text(str, width = nil)
+      unless str.is_a?(String)
+        str = str.inspect
+      end
+      width ||= str.length
+
+      case str
+      when /\A#</, '=', '>'
+        super(Color.colorize(str, [:GREEN]), width)
+      else
+        super(Color.colorize_code(str, ignore_error: true), width)
+      end
+    end
+  end
+end
diff --git a/lib/irb/completion.rb b/lib/irb/completion.rb
index e7499a8e2b..d1bb82122e 100644
--- a/lib/irb/completion.rb
+++ b/lib/irb/completion.rb
@@ -1,13 +1,13 @@
 # frozen_string_literal: false
 #
-#   irb/completor.rb -
+#   irb/completion.rb -
 #   	$Release Version: 0.9$
 #   	$Revision$
 #   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
 #       From Original Idea of shugo@ruby-lang.org
 #
 
-require "readline"
+require_relative 'ruby-lex'
 
 module IRB
   module InputCompletor # :nodoc:
@@ -16,11 +16,12 @@ module IRB
     # Set of reserved words used by Ruby, you should not use these for
     # constants or variables
     ReservedWords = %w[
+      __ENCODING__ __LINE__ __FILE__
       BEGIN END
       alias and
       begin break
       case class
-      def defined do
+      def defined? do
       else elsif end ensure
       false for
       if in
@@ -35,118 +36,235 @@ module IRB
       yield
     ]
 
-    CompletionProc = proc { |input|
-      bind = IRB.conf[:MAIN_CONTEXT].workspace.binding
+    BASIC_WORD_BREAK_CHARACTERS = " \t\n`><=;|&{("
 
+    def self.retrieve_files_to_require_from_load_path
+      @@files_from_load_path ||= $LOAD_PATH.flat_map { |path|
+        begin
+          Dir.glob("**/*.{rb,#{RbConfig::CONFIG['DLEXT']}}", base: path)
+        rescue Errno::ENOENT
+          []
+        end
+      }.uniq.map { |path|
+        path.sub(/\.(rb|#{RbConfig::CONFIG['DLEXT']})\z/, '')
+      }
+    end
+
+    def self.retrieve_files_to_require_relative_from_current_dir
+      @@files_from_current_dir ||= Dir.glob("**/*.{rb,#{RbConfig::CONFIG['DLEXT']}}", base: '.').map { |path|
+        path.sub(/\.(rb|#{RbConfig::CONFIG['DLEXT']})\z/, '')
+      }
+    end
+
+    CompletionRequireProc = lambda { |target, preposing = nil, postposing = nil|
+      if target =~ /\A(['"])([^'"]+)\Z/
+        quote = $1
+        actual_target = $2
+      else
+        return nil # It's not String literal
+      end
+      tokens = RubyLex.ripper_lex_without_warning(preposing.gsub(/\s*\z/, ''))
+      tok = nil
+      tokens.reverse_each do |t|
+        unless [:on_lparen, :on_sp, :on_ignored_sp, :on_nl, :on_ignored_nl, :on_comment].include?(t.event)
+          tok = t
+          break
+        end
+      end
+      result = []
+      if tok && tok.event == :on_ident && tok.state == Ripper::EXPR_CMDARG
+        case tok.tok
+        when 'require'
+          result = retrieve_files_to_require_from_load_path.select { |path|
+            path.start_with?(actual_target)
+          }.map { |path|
+            quote + path
+          }
+        when 'require_relative'
+          result = retrieve_files_to_require_relative_from_current_dir.select { |path|
+            path.start_with?(actual_target)
+          }.map { |path|
+            quote + path
+          }
+        end
+      end
+      result
+    }
+
+    CompletionProc = lambda { |target, preposing = nil, postposing = nil|
+      if preposing && postposing
+        result = CompletionRequireProc.(target, preposing, postposing)
+        unless result
+          result = retrieve_completion_data(target).compact.map{ |i| i.encode(Encoding.default_external) }
+        end
+        result
+      else
+        retrieve_completion_data(target).compact.map{ |i| i.encode(Encoding.default_external) }
+      end
+    }
+
+    def self.retrieve_completion_data(input, bind: IRB.conf[:MAIN_CONTEXT].workspace.binding, doc_namespace: false)
       case input
       when /^((["'`]).*\2)\.([^.]*)$/
         # String
         receiver = $1
-        message = Regexp.quote($3)
+        message = $3
 
         candidates = String.instance_methods.collect{|m| m.to_s}
-        select_message(receiver, message, candidates)
+        if doc_namespace
+          "String.#{message}"
+        else
+          select_message(receiver, message, candidates)
+        end
 
       when /^(\/[^\/]*\/)\.([^.]*)$/
         # Regexp
         receiver = $1
-        message = Regexp.quote($2)
+        message = $2
 
         candidates = Regexp.instance_methods.collect{|m| m.to_s}
-        select_message(receiver, message, candidates)
+        if doc_namespace
+          "Regexp.#{message}"
+        else
+          select_message(receiver, message, candidates)
+        end
 
       when /^([^\]]*\])\.([^.]*)$/
         # Array
         receiver = $1
-        message = Regexp.quote($2)
+        message = $2
 
         candidates = Array.instance_methods.collect{|m| m.to_s}
-        select_message(receiver, message, candidates)
+        if doc_namespace
+          "Array.#{message}"
+        else
+          select_message(receiver, message, candidates)
+        end
 
       when /^([^\}]*\})\.([^.]*)$/
         # Proc or Hash
         receiver = $1
-        message = Regexp.quote($2)
+        message = $2
 
-        candidates = Proc.instance_methods.collect{|m| m.to_s}
-        candidates |= Hash.instance_methods.collect{|m| m.to_s}
-        select_message(receiver, message, candidates)
+        proc_candidates = Proc.instance_methods.collect{|m| m.to_s}
+        hash_candidates = Hash.instance_methods.collect{|m| m.to_s}
+        if doc_namespace
+          ["Proc.#{message}", "Hash.#{message}"]
+        else
+          select_message(receiver, message, proc_candidates | hash_candidates)
+        end
 
       when /^(:[^:.]*)$/
         # Symbol
-        if Symbol.respond_to?(:all_symbols)
-          sym = $1
-          candidates = Symbol.all_symbols.collect{|s| ":" + s.id2name}
-          candidates.grep(/^#{Regexp.quote(sym)}/)
-        else
-          []
+        return nil if doc_namespace
+        sym = $1
+        candidates = Symbol.all_symbols.collect do |s|
+          ":" + s.id2name.encode(Encoding.default_external)
+        rescue Encoding::UndefinedConversionError
+          # ignore
         end
+        candidates.grep(/^#{Regexp.quote(sym)}/)
 
       when /^::([A-Z][^:\.\(]*)$/
         # Absolute Constant or class methods
         receiver = $1
         candidates = Object.constants.collect{|m| m.to_s}
-        candidates.grep(/^#{receiver}/).collect{|e| "::" + e}
+        if doc_namespace
+          candidates.find { |i| i == receiver }
+        else
+          candidates.grep(/^#{receiver}/).collect{|e| "::" + e}
+        end
 
       when /^([A-Z].*)::([^:.]*)$/
         # Constant or class methods
         receiver = $1
-        message = Regexp.quote($2)
+        message = $2
         begin
           candidates = eval("#{receiver}.constants.collect{|m| m.to_s}", bind)
           candidates |= eval("#{receiver}.methods.collect{|m| m.to_s}", bind)
         rescue Exception
           candidates = []
         end
-        select_message(receiver, message, candidates, "::")
+        if doc_namespace
+          "#{receiver}::#{message}"
+        else
+          select_message(receiver, message, candidates, "::")
+        end
 
       when /^(:[^:.]+)(\.|::)([^.]*)$/
         # Symbol
         receiver = $1
         sep = $2
-        message = Regexp.quote($3)
+        message = $3
 
         candidates = Symbol.instance_methods.collect{|m| m.to_s}
-        select_message(receiver, message, candidates, sep)
+        if doc_namespace
+          "Symbol.#{message}"
+        else
+          select_message(receiver, message, candidates, sep)
+        end
 
-      when /^(-?(0[dbo])?[0-9_]+(\.[0-9_]+)?([eE]-?[0-9]+)?)(\.|::)([^.]*)$/
+      when /^(?<num>-?(?:0[dbo])?[0-9_]+(?:\.[0-9_]+)?(?:(?:[eE][+-]?[0-9]+)?i?|r)?)(?<sep>\.|::)(?<mes>[^.]*)$/
         # Numeric
-        receiver = $1
-        sep = $5
-        message = Regexp.quote($6)
+        receiver = $~[:num]
+        sep = $~[:sep]
+        message = $~[:mes]
 
         begin
-          candidates = eval(receiver, bind).methods.collect{|m| m.to_s}
+          instance = eval(receiver, bind)
+          if doc_namespace
+            "#{instance.class.name}.#{message}"
+          else
+            candidates = instance.methods.collect{|m| m.to_s}
+            select_message(receiver, message, candidates, sep)
+          end
         rescue Exception
-          candidates = []
+          if doc_namespace
+            nil
+          else
+            candidates = []
+          end
         end
-        select_message(receiver, message, candidates, sep)
 
       when /^(-?0x[0-9a-fA-F_]+)(\.|::)([^.]*)$/
         # Numeric(0xFFFF)
         receiver = $1
         sep = $2
-        message = Regexp.quote($3)
+        message = $3
 
         begin
-          candidates = eval(receiver, bind).methods.collect{|m| m.to_s}
+          instance = eval(receiver, bind)
+          if doc_namespace
+            "#{instance.class.name}.#{message}"
+          else
+            candidates = instance.methods.collect{|m| m.to_s}
+            select_message(receiver, message, candidates, sep)
+          end
         rescue Exception
-          candidates = []
+          if doc_namespace
+            nil
+          else
+            candidates = []
+          end
         end
-        select_message(receiver, message, candidates, sep)
 
       when /^(\$[^.]*)$/
         # global var
-        regmessage = Regexp.new(Regexp.quote($1))
-        candidates = global_variables.collect{|m| m.to_s}.grep(regmessage)
+        gvar = $1
+        all_gvars = global_variables.collect{|m| m.to_s}
+        if doc_namespace
+          all_gvars.find{ |i| i == gvar }
+        else
+          all_gvars.grep(Regexp.new(Regexp.quote(gvar)))
+        end
 
       when /^([^."].*)(\.|::)([^.]*)$/
         # variable.func or func.func
         receiver = $1
         sep = $2
-        message = Regexp.quote($3)
+        message = $3
 
-        gv = eval("global_variables", bind).collect{|m| m.to_s}
+        gv = eval("global_variables", bind).collect{|m| m.to_s}.push("true", "false", "nil")
         lv = eval("local_variables", bind).collect{|m| m.to_s}
         iv = eval("instance_variables", bind).collect{|m| m.to_s}
         cv = eval("self.class.constants", bind).collect{|m| m.to_s}
@@ -169,38 +287,76 @@ module IRB
         else
           # func1.func2
           candidates = []
+          to_ignore = ignored_modules
           ObjectSpace.each_object(Module){|m|
-            begin
-              name = m.name
-            rescue Exception
-              name = ""
-            end
-            begin
-              next if name != "IRB::Context" and
-                /^(IRB|SLex|RubyLex|RubyToken)/ =~ name
-            rescue Exception
-              next
-            end
+            next if (to_ignore.include?(m) rescue true)
             candidates.concat m.instance_methods(false).collect{|x| x.to_s}
           }
           candidates.sort!
           candidates.uniq!
         end
-        select_message(receiver, message, candidates, sep)
+        if doc_namespace
+          "#{rec.class.name}#{sep}#{candidates.find{ |i| i == message }}"
+        else
+          select_message(receiver, message, candidates, sep)
+        end
 
       when /^\.([^.]*)$/
         # unknown(maybe String)
 
         receiver = ""
-        message = Regexp.quote($1)
+        message = $1
 
         candidates = String.instance_methods(true).collect{|m| m.to_s}
-        select_message(receiver, message, candidates)
+        if doc_namespace
+          "String.#{candidates.find{ |i| i == message }}"
+        else
+          select_message(receiver, message, candidates)
+        end
 
       else
         candidates = eval("methods | private_methods | local_variables | instance_variables | self.class.constants", bind).collect{|m| m.to_s}
+        candidates |= ReservedWords
+
+        if doc_namespace
+          candidates.find{ |i| i == input }
+        else
+          candidates.grep(/^#{Regexp.quote(input)}/)
+        end
+      end
+    end
 
-        (candidates|ReservedWords).grep(/^#{Regexp.quote(input)}/)
+    PerfectMatchedProc = ->(matched, bind: IRB.conf[:MAIN_CONTEXT].workspace.binding) {
+      begin
+        require 'rdoc'
+      rescue LoadError
+        return
+      end
+
+      RDocRIDriver ||= RDoc::RI::Driver.new
+
+      if matched =~ /\A(?:::)?RubyVM/ and not ENV['RUBY_YES_I_AM_NOT_A_NORMAL_USER']
+        IRB.__send__(:easter_egg)
+        return
+      end
+
+      namespace = retrieve_completion_data(matched, bind: bind, doc_namespace: true)
+      return unless namespace
+
+      if namespace.is_a?(Array)
+        out = RDoc::Markup::Document.new
+        namespace.each do |m|
+          begin
+            RDocRIDriver.add_method(out, m)
+          rescue RDoc::RI::Driver::NotFoundError
+          end
+        end
+        RDocRIDriver.display(out)
+      else
+        begin
+          RDocRIDriver.display_names([namespace])
+        rescue RDoc::RI::Driver::NotFoundError
+        end
       end
     }
 
@@ -208,7 +364,7 @@ module IRB
     Operators = %w[% & * ** + - / < << <= <=> == === =~ > >= >> [] []= ^ ! != !~]
 
     def self.select_message(receiver, message, candidates, sep = ".")
-      candidates.grep(/^#{message}/).collect do |e|
+      candidates.grep(/^#{Regexp.quote(message)}/).collect do |e|
         case e
         when /^[a-zA-Z_]/
           receiver + sep + e
@@ -218,11 +374,30 @@ module IRB
         end
       end
     end
-  end
-end
 
-if Readline.respond_to?("basic_word_break_characters=")
-  Readline.basic_word_break_characters= " \t\n`><=;|&{("
+    def self.ignored_modules
+      # We could cache the result, but this is very fast already.
+      # By using this approach, we avoid Module#name calls, which are
+      # relatively slow when there are a lot of anonymous modules defined.
+      s = {}
+
+      scanner = lambda do |m|
+        next if s.include?(m) # IRB::ExtendCommandBundle::EXCB recurses.
+        s[m] = true
+        m.constants(false).each do |c|
+          value = m.const_get(c)
+          scanner.call(value) if value.is_a?(Module)
+        end
+      end
+
+      %i(IRB RubyLex).each do |sym|
+        next unless Object.const_defined?(sym)
+        scanner.call(Object.const_get(sym))
+      end
+
+      s.delete(IRB::Context) if defined?(IRB::Context)
+
+      s
+    end
+  end
 end
-Readline.completion_append_character = nil
-Readline.completion_proc = IRB::InputCompletor::CompletionProc
diff --git a/lib/irb/context.rb b/lib/irb/context.rb
index 4cf6128930..0d358de6ff 100644
--- a/lib/irb/context.rb
+++ b/lib/irb/context.rb
@@ -9,8 +9,10 @@
 #
 #
 #
-require "irb/workspace"
-require "irb/inspector"
+require_relative "workspace"
+require_relative "inspector"
+require_relative "input-method"
+require_relative "output-method"
 
 module IRB
   # A class that wraps the current state of the irb session, including the
@@ -20,10 +22,10 @@ module IRB
     #
     # The optional +input_method+ argument:
     #
-    # +nil+::     uses stdin or Readline
+    # +nil+::     uses stdin or Reidline or Readline
     # +String+::  uses a File
     # +other+::   uses this as InputMethod
-    def initialize(irb, workspace = nil, input_method = nil, output_method = nil)
+    def initialize(irb, workspace = nil, input_method = nil)
       @irb = irb
       if workspace
         @workspace = workspace
@@ -37,12 +39,25 @@ module IRB
       @rc = IRB.conf[:RC]
       @load_modules = IRB.conf[:LOAD_MODULES]
 
-      @use_readline = IRB.conf[:USE_READLINE]
+      if IRB.conf.has_key?(:USE_SINGLELINE)
+        @use_singleline = IRB.conf[:USE_SINGLELINE]
+      elsif IRB.conf.has_key?(:USE_READLINE) # backward compatibility
+        @use_singleline = IRB.conf[:USE_READLINE]
+      else
+        @use_singleline = nil
+      end
+      if IRB.conf.has_key?(:USE_MULTILINE)
+        @use_multiline = IRB.conf[:USE_MULTILINE]
+      elsif IRB.conf.has_key?(:USE_REIDLINE) # backward compatibility
+        @use_multiline = IRB.conf[:USE_REIDLINE]
+      else
+        @use_multiline = nil
+      end
+      @use_colorize = IRB.conf[:USE_COLORIZE]
       @verbose = IRB.conf[:VERBOSE]
       @io = nil
 
       self.inspect_mode = IRB.conf[:INSPECT_MODE]
-      self.math_mode = IRB.conf[:MATH_MODE] if IRB.conf[:MATH_MODE]
       self.use_tracer = IRB.conf[:USE_TRACER] if IRB.conf[:USE_TRACER]
       self.use_loader = IRB.conf[:USE_LOADER] if IRB.conf[:USE_LOADER]
       self.eval_history = IRB.conf[:EVAL_HISTORY] if IRB.conf[:EVAL_HISTORY]
@@ -63,23 +78,42 @@ module IRB
 
       case input_method
       when nil
-        case use_readline?
+        @io = nil
+        case use_multiline?
         when nil
-          if (defined?(ReadlineInputMethod) && STDIN.tty? &&
-              IRB.conf[:PROMPT_MODE] != :INF_RUBY)
-            @io = ReadlineInputMethod.new
+          if STDIN.tty? && IRB.conf[:PROMPT_MODE] != :INF_RUBY && !use_singleline?
+            # Both of multiline mode and singleline mode aren't specified.
+            @io = ReidlineInputMethod.new
           else
-            @io = StdioInputMethod.new
+            @io = nil
           end
         when false
-          @io = StdioInputMethod.new
+          @io = nil
         when true
-          if defined?(ReadlineInputMethod)
-            @io = ReadlineInputMethod.new
+          @io = ReidlineInputMethod.new
+        end
+        unless @io
+          case use_singleline?
+          when nil
+            if (defined?(ReadlineInputMethod) && STDIN.tty? &&
+                IRB.conf[:PROMPT_MODE] != :INF_RUBY)
+              @io = ReadlineInputMethod.new
+            else
+              @io = nil
+            end
+          when false
+            @io = nil
+          when true
+            if defined?(ReadlineInputMethod)
+              @io = ReadlineInputMethod.new
+            else
+              @io = nil
+            end
           else
-            @io = StdioInputMethod.new
+            @io = nil
           end
         end
+        @io = StdioInputMethod.new unless @io
 
       when String
         @io = FileInputMethod.new(input_method)
@@ -90,17 +124,20 @@ module IRB
       end
       self.save_history = IRB.conf[:SAVE_HISTORY] if IRB.conf[:SAVE_HISTORY]
 
-      if output_method
-        @output_method = output_method
-      else
-        @output_method = StdioOutputMethod.new
-      end
-
       @echo = IRB.conf[:ECHO]
       if @echo.nil?
         @echo = true
       end
-      self.debug_level = IRB.conf[:DEBUG_LEVEL]
+
+      @echo_on_assignment = IRB.conf[:ECHO_ON_ASSIGNMENT]
+      if @echo_on_assignment.nil?
+        @echo_on_assignment = :truncate
+      end
+
+      @newline_before_multiline_output = IRB.conf[:NEWLINE_BEFORE_MULTILINE_OUTPUT]
+      if @newline_before_multiline_output.nil?
+        @newline_before_multiline_output = true
+      end
     end
 
     # The top-level workspace, see WorkSpace#main
@@ -116,9 +153,9 @@ module IRB
     attr_reader :thread
     # The current input method
     #
-    # Can be either StdioInputMethod, ReadlineInputMethod, FileInputMethod or
-    # other specified when the context is created. See ::new for more
-    # information on +input_method+.
+    # Can be either StdioInputMethod, ReadlineInputMethod,
+    # ReidlineInputMethod, FileInputMethod or other specified when the
+    # context is created. See ::new for more # information on +input_method+.
     attr_accessor :io
 
     # Current irb session
@@ -136,12 +173,18 @@ module IRB
     # +input_method+ passed to Context.new
     attr_accessor :irb_path
 
-    # Whether +Readline+ is enabled or not.
+    # Whether multiline editor mode is enabled or not.
     #
-    # A copy of the default <code>IRB.conf[:USE_READLINE]</code>
+    # A copy of the default <code>IRB.conf[:USE_MULTILINE]</code>
+    attr_reader :use_multiline
+    # Whether singleline editor mode is enabled or not.
     #
-    # See #use_readline= for more information.
-    attr_reader :use_readline
+    # A copy of the default <code>IRB.conf[:USE_SINGLELINE]</code>
+    attr_reader :use_singleline
+    # Whether colorization is enabled or not.
+    #
+    # A copy of the default <code>IRB.conf[:USE_COLORIZE]</code>
+    attr_reader :use_colorize
     # A copy of the default <code>IRB.conf[:INSPECT_MODE]</code>
     attr_reader :inspect_mode
 
@@ -164,17 +207,17 @@ module IRB
     # Can be either the default <code>IRB.conf[:AUTO_INDENT]</code>, or the
     # mode set by #prompt_mode=
     #
-    # To enable auto-indentation in irb:
+    # To disable auto-indentation in irb:
     #
-    #     IRB.conf[:AUTO_INDENT] = true
+    #     IRB.conf[:AUTO_INDENT] = false
     #
     # or
     #
-    #     irb_context.auto_indent_mode = true
+    #     irb_context.auto_indent_mode = false
     #
     # or
     #
-    #     IRB.CurrentContext.auto_indent_mode = true
+    #     IRB.CurrentContext.auto_indent_mode = false
     #
     # See IRB@Configuration for more information.
     attr_accessor :auto_indent_mode
@@ -197,7 +240,7 @@ module IRB
     attr_accessor :ignore_eof
     # Whether to echo the return value to output or not.
     #
-    # Uses IRB.conf[:ECHO] if available, or defaults to +true+.
+    # Uses <code>IRB.conf[:ECHO]</code> if available, or defaults to +true+.
     #
     #     puts "hello"
     #     # hello
@@ -206,14 +249,44 @@ module IRB
     #     puts "omg"
     #     # omg
     attr_accessor :echo
+    # Whether to echo for assignment expressions
+    #
+    # If set to +false+, the value of assignment will not be shown.
+    #
+    # If set to +true+, the value of assignment will be shown.
+    #
+    # If set to +:truncate+, the value of assignment will be shown and truncated.
+    #
+    # It defaults to +:truncate+.
+    #
+    #     a = "omg"
+    #     #=> omg
+    #     a = "omg" * 10
+    #     #=> omgomgomgomgomgomgomg...
+    #     IRB.CurrentContext.echo_on_assignment = false
+    #     a = "omg"
+    #     IRB.CurrentContext.echo_on_assignment = true
+    #     a = "omg"
+    #     #=> omgomgomgomgomgomgomgomgomgomg
+    attr_accessor :echo_on_assignment
+    # Whether a newline is put before multiline output.
+    #
+    # Uses <code>IRB.conf[:NEWLINE_BEFORE_MULTILINE_OUTPUT]</code> if available,
+    # or defaults to +true+.
+    #
+    #     "abc\ndef"
+    #     #=>
+    #     abc
+    #     def
+    #     IRB.CurrentContext.newline_before_multiline_output = false
+    #     "abc\ndef"
+    #     #=> abc
+    #     def
+    attr_accessor :newline_before_multiline_output
     # Whether verbose messages are displayed or not.
     #
     # A copy of the default <code>IRB.conf[:VERBOSE]</code>
     attr_accessor :verbose
-    # The debug level of irb
-    #
-    # See #debug_level= for more information.
-    attr_reader :debug_level
 
     # The limit of backtrace lines displayed as top +n+ and tail +n+.
     #
@@ -224,18 +297,34 @@ module IRB
     # See IRB@Command+line+options for more command line options.
     attr_accessor :back_trace_limit
 
-    # Alias for #use_readline
-    alias use_readline? use_readline
+    # Alias for #use_multiline
+    alias use_multiline? use_multiline
+    # Alias for #use_singleline
+    alias use_singleline? use_singleline
+    # backward compatibility
+    alias use_reidline use_multiline
+    # backward compatibility
+    alias use_reidline? use_multiline
+    # backward compatibility
+    alias use_readline use_singleline
+    # backward compatibility
+    alias use_readline? use_singleline
+    # Alias for #use_colorize
+    alias use_colorize? use_colorize
     # Alias for #rc
     alias rc? rc
     alias ignore_sigint? ignore_sigint
     alias ignore_eof? ignore_eof
     alias echo? echo
+    alias echo_on_assignment? echo_on_assignment
+    alias newline_before_multiline_output? newline_before_multiline_output
 
     # Returns whether messages are displayed or not.
     def verbose?
       if @verbose.nil?
-        if defined?(ReadlineInputMethod) && @io.kind_of?(ReadlineInputMethod)
+        if @io.kind_of?(ReidlineInputMethod)
+          false
+        elsif defined?(ReadlineInputMethod) && @io.kind_of?(ReadlineInputMethod)
           false
         elsif !STDIN.tty? or @io.kind_of?(FileInputMethod)
           true
@@ -248,9 +337,11 @@ module IRB
     end
 
     # Whether #verbose? is +true+, and +input_method+ is either
-    # StdioInputMethod or ReadlineInputMethod, see #io for more information.
+    # StdioInputMethod or ReidlineInputMethod or ReadlineInputMethod, see #io
+    # for more information.
     def prompting?
       verbose? || (STDIN.tty? && @io.kind_of?(StdioInputMethod) ||
+                   @io.kind_of?(ReidlineInputMethod) ||
                    (defined?(ReadlineInputMethod) && @io.kind_of?(ReadlineInputMethod)))
     end
 
@@ -261,7 +352,7 @@ module IRB
     # to #last_value.
     def set_last_value(value)
       @last_value = value
-      @workspace.evaluate self, "_ = IRB.CurrentContext.last_value"
+      @workspace.local_variable_set :_, value
     end
 
     # Sets the +mode+ of the prompt in this context.
@@ -349,34 +440,13 @@ module IRB
       @inspect_mode
     end
 
-    # Obsolete method.
-    #
-    # Can be set using the +--noreadline+ and +--readline+ command line
-    # options.
-    #
-    # See IRB@Command+line+options for more command line options.
-    def use_readline=(opt)
-      print "This method is obsolete."
-      print "Do nothing."
-    end
-
-    # Sets the debug level of irb
-    #
-    # Can also be set using the +--irb_debug+ command line option.
-    #
-    # See IRB@Command+line+options for more command line options.
-    def debug_level=(value)
-      @debug_level = value
-      RubyLex.debug_level = value
-    end
-
-    # Whether or not debug mode is enabled, see #debug_level=.
-    def debug?
-      @debug_level > 0
-    end
-
-    def evaluate(line, line_no) # :nodoc:
+    def evaluate(line, line_no, exception: nil) # :nodoc:
       @line_no = line_no
+      if exception
+        line_no -= 1
+        line = "begin ::Kernel.raise _; rescue _.class\n#{line}\n""end"
+        @workspace.local_variable_set(:_, exception)
+      end
       set_last_value(@workspace.evaluate(self, line, irb_path, line_no))
     end
 
diff --git a/lib/irb/easter-egg.rb b/lib/irb/easter-egg.rb
new file mode 100644
index 0000000000..3e79692de9
--- /dev/null
+++ b/lib/irb/easter-egg.rb
@@ -0,0 +1,138 @@
+require "reline"
+
+module IRB
+  class << self
+    class Vec
+      def initialize(x, y, z)
+        @x, @y, @z = x, y, z
+      end
+
+      attr_reader :x, :y, :z
+
+      def sub(other)
+        Vec.new(@x - other.x, @y - other.y, @z - other.z)
+      end
+
+      def dot(other)
+        @x*other.x + @y*other.y + @z*other.z
+      end
+
+      def cross(other)
+        ox, oy, oz = other.x, other.y, other.z
+        Vec.new(@y*oz-@z*oy, @z*ox-@x*oz, @x*oy-@y*ox)
+      end
+
+      def normalize
+        r = Math.sqrt(self.dot(self))
+        Vec.new(@x / r, @y / r, @z / r)
+      end
+    end
+
+    class Canvas
+      def initialize((h, w))
+        @data = (0..h-2).map { [0] * w }
+        @scale = [w / 2.0, h-2].min
+        @center = Complex(w / 2, h-2)
+      end
+
+      def line((x1, y1), (x2, y2))
+        p1 = Complex(x1, y1) / 2 * @scale + @center
+        p2 = Complex(x2, y2) / 2 * @scale + @center
+        line0(p1, p2)
+      end
+
+      private def line0(p1, p2)
+        mid = (p1 + p2) / 2
+        if (p1 - p2).abs < 1
+          x, y = mid.rect
+          @data[y / 2][x] |= (y % 2 > 1 ? 2 : 1)
+        else
+          line0(p1, mid)
+          line0(p2, mid)
+        end
+      end
+
+      def draw
+        @data.each {|row| row.fill(0) }
+        yield
+        @data.map {|row| row.map {|n| " ',;"[n] }.join }.join("\n")
+      end
+    end
+
+    class RubyModel
+      def initialize
+        @faces = init_ruby_model
+      end
+
+      def init_ruby_model
+        cap_vertices    = (0..5).map {|i| Vec.new(*Complex.polar(1,  i        * Math::PI / 3).rect, 1) }
+        middle_vertices = (0..5).map {|i| Vec.new(*Complex.polar(2, (i + 0.5) * Math::PI / 3).rect, 0) }
+        bottom_vertex   = Vec.new(0, 0, -2)
+
+        faces = [cap_vertices]
+        6.times do |j|
+          i = j-1
+          faces << [cap_vertices[i], middle_vertices[i], cap_vertices[j]]
+          faces << [cap_vertices[j], middle_vertices[i], middle_vertices[j]]
+          faces << [middle_vertices[i], bottom_vertex, middle_vertices[j]]
+        end
+
+        faces
+      end
+
+      def render_frame(i)
+        angle = i / 10.0
+        dir = Vec.new(*Complex.polar(1, angle).rect, Math.sin(angle)).normalize
+        dir2 = Vec.new(*Complex.polar(1, angle - Math::PI/2).rect, 0)
+        up = dir.cross(dir2)
+        nm = dir.cross(up)
+        @faces.each do |vertices|
+          v0, v1, v2, = vertices
+          if v1.sub(v0).cross(v2.sub(v0)).dot(dir) > 0
+            points = vertices.map {|p| [nm.dot(p), up.dot(p)] }
+            (points + [points[0]]).each_cons(2) do |p1, p2|
+              yield p1, p2
+            end
+          end
+        end
+      end
+    end
+
+    private def easter_egg(type = nil)
+      type ||= [:logo, :dancing].sample
+      case type
+      when :logo
+        File.open(File.join(__dir__, 'ruby_logo.aa')) do |f|
+          require "rdoc"
+          RDoc::RI::Driver.new.page do |io|
+            IO.copy_stream(f, io)
+          end
+        end
+      when :dancing
+        begin
+          canvas = Canvas.new(Reline.get_screen_size)
+          Reline::IOGate.set_winch_handler do
+            canvas = Canvas.new(Reline.get_screen_size)
+          end
+          ruby_model = RubyModel.new
+          print "\e[?1049h"
+          0.step do |i| # TODO (0..).each needs Ruby 2.6 or later
+            buff = canvas.draw do
+              ruby_model.render_frame(i) do |p1, p2|
+                canvas.line(p1, p2)
+              end
+            end
+            buff[0, 20] = "\e[0mPress Ctrl+C to stop\e[31m\e[1m"
+            print "\e[H" + buff
+            sleep 0.05
+          end
+        rescue Interrupt
+        ensure
+          print "\e[0m\e[?1049l"
+        end
+      end
+    end
+  end
+end
+
+IRB.__send__(:easter_egg, ARGV[0]&.to_sym) if $0 == __FILE__
diff --git a/lib/irb/ext/change-ws.rb b/lib/irb/ext/change-ws.rb
index 94bfe62bc0..4c57e44eab 100644
--- a/lib/irb/ext/change-ws.rb
+++ b/lib/irb/ext/change-ws.rb
@@ -43,4 +43,3 @@ module IRB # :nodoc:
     end
   end
 end
-
diff --git a/lib/irb/ext/history.rb b/lib/irb/ext/history.rb
index 62363b13f4..fc304c6f6c 100644
--- a/lib/irb/ext/history.rb
+++ b/lib/irb/ext/history.rb
@@ -22,7 +22,7 @@ module IRB # :nodoc:
     def set_last_value(value)
       _set_last_value(value)
 
-      if @eval_history
+      if defined?(@eval_history) && @eval_history
         @eval_history_values.push @line_no, @last_value
         @workspace.evaluate self, "__ = IRB.CurrentContext.instance_eval{@eval_history_values}"
       end
@@ -30,9 +30,13 @@ module IRB # :nodoc:
       @last_value
     end
 
-    # The command result history limit.
+    remove_method :eval_history= if method_defined?(:eval_history=)
+    # The command result history limit. This method is not available until
+    # #eval_history= was called with non-nil value (directly or via
+    # setting <code>IRB.conf[:EVAL_HISTORY]</code> in <code>.irbrc</code>).
     attr_reader :eval_history
-    # Sets command result history limit.
+    # Sets command result history limit. Default value is set from
+    # <code>IRB.conf[:EVAL_HISTORY]</code>.
     #
     # +no+ is an Integer or +nil+.
     #
@@ -41,6 +45,9 @@ module IRB # :nodoc:
     # If +no+ is 0, the number of history items is unlimited.
     #
     # If +no+ is +nil+, execution result history isn't used (default).
+    #
+    # History values are available via <code>__</code> variable, see
+    # IRB::History.
     def eval_history=(no)
       if no
         if defined?(@eval_history) && @eval_history
@@ -58,20 +65,51 @@ module IRB # :nodoc:
     end
   end
 
-  class History # :nodoc:
-
-    def initialize(size = 16)
+  # Represents history of results of previously evaluated commands.
+  #
+  # Available via <code>__</code> variable, only if <code>IRB.conf[:EVAL_HISTORY]</code>
+  # or <code>IRB::CurrentContext().eval_history</code> is non-nil integer value
+  # (by default it is +nil+).
+  #
+  # Example (in `irb`):
+  #
+  #    # Initialize history
+  #    IRB::CurrentContext().eval_history = 10
+  #    # => 10
+  #
+  #    # Perform some commands...
+  #    1 + 2
+  #    # => 3
+  #    puts 'x'
+  #    # x
+  #    # => nil
+  #    raise RuntimeError
+  #    # ...error raised
+  #
+  #    # Inspect history (format is "<item number> <evaluated value>":
+  #    __
+  #    # => 1 10
+  #    # 2 3
+  #    # 3 nil
+  #
+  #    __[1]
+  #    # => 10
+  #
+  class History
+
+    def initialize(size = 16)  # :nodoc:
       @size = size
       @contents = []
     end
 
-    def size(size)
+    def size(size) # :nodoc:
       if size != 0 && size < @size
         @contents = @contents[@size - size .. @size]
       end
       @size = size
     end
 
+    # Get one item of the content (both positive and negative indexes work).
     def [](idx)
       begin
         if idx >= 0
@@ -84,14 +122,14 @@ module IRB # :nodoc:
       end
     end
 
-    def push(no, val)
+    def push(no, val)  # :nodoc:
       @contents.push [no, val]
       @contents.shift if @size != 0 && @contents.size > @size
     end
 
     alias real_inspect inspect
 
-    def inspect
+    def inspect  # :nodoc:
       if @contents.empty?
         return real_inspect
       end
@@ -115,5 +153,3 @@ module IRB # :nodoc:
     end
   end
 end
-
-
diff --git a/lib/irb/ext/loader.rb b/lib/irb/ext/loader.rb
index 840226db30..af028996e7 100644
--- a/lib/irb/ext/loader.rb
+++ b/lib/irb/ext/loader.rb
@@ -31,8 +31,31 @@ module IRB # :nodoc:
       load_file(path, priv)
     end
 
+    if File.respond_to?(:absolute_path?)
+      def absolute_path?(path)
+        File.absolute_path?(path)
+      end
+    else
+      separator =
+        if File::ALT_SEPARATOR
+          "[#{Regexp.quote(File::SEPARATOR + File::ALT_SEPARATOR)}]"
+        else
+          File::SEPARATOR
+        end
+      ABSOLUTE_PATH_PATTERN = # :nodoc:
+        case Dir.pwd
+        when /\A\w:/, /\A#{separator}{2}/
+          /\A(?:\w:|#{separator})#{separator}/
+        else
+          /\A#{separator}/
+        end
+      def absolute_path?(path)
+        ABSOLUTE_PATH_PATTERN =~ path
+      end
+    end
+
     def search_file_from_ruby_path(fn) # :nodoc:
-      if /^#{Regexp.quote(File::Separator)}/ =~ fn
+      if absolute_path?(fn)
         return fn if File.exist?(fn)
         return nil
       end
@@ -50,16 +73,18 @@ module IRB # :nodoc:
     # See Irb#suspend_input_method for more information.
     def source_file(path)
       irb.suspend_name(path, File.basename(path)) do
-        irb.suspend_input_method(FileInputMethod.new(path)) do
-          |back_io|
-          irb.signal_status(:IN_LOAD) do
-            if back_io.kind_of?(FileInputMethod)
-              irb.eval_input
-            else
-              begin
+        FileInputMethod.open(path) do |io|
+          irb.suspend_input_method(io) do
+            |back_io|
+            irb.signal_status(:IN_LOAD) do
+              if back_io.kind_of?(FileInputMethod)
                 irb.eval_input
-              rescue LoadAbort
-                print "load abort!!\n"
+              else
+                begin
+                  irb.eval_input
+                rescue LoadAbort
+                  print "load abort!!\n"
+                end
               end
             end
           end
@@ -79,16 +104,18 @@ module IRB # :nodoc:
           ws = WorkSpace.new
         end
         irb.suspend_workspace(ws) do
-          irb.suspend_input_method(FileInputMethod.new(path)) do
-            |back_io|
-            irb.signal_status(:IN_LOAD) do
-              if back_io.kind_of?(FileInputMethod)
-                irb.eval_input
-              else
-                begin
+          FileInputMethod.open(path) do |io|
+            irb.suspend_input_method(io) do
+              |back_io|
+              irb.signal_status(:IN_LOAD) do
+                if back_io.kind_of?(FileInputMethod)
                   irb.eval_input
-                rescue LoadAbort
-                  print "load abort!!\n"
+                else
+                  begin
+                    irb.eval_input
+                  rescue LoadAbort
+                    print "load abort!!\n"
+                  end
                 end
               end
             end
@@ -126,4 +153,3 @@ module IRB # :nodoc:
     end
   end
 end
-
diff --git a/lib/irb/ext/math-mode.rb b/lib/irb/ext/math-mode.rb
deleted file mode 100644
index e409dbdc6a..0000000000
--- a/lib/irb/ext/math-mode.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-# frozen_string_literal: false
-#
-#   math-mode.rb -
-#   	$Release Version: 0.9.6$
-#   	$Revision$
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
-#
-# --
-#
-#
-#
-require "mathn"
-
-module IRB
-  class Context
-    # Returns whether bc mode is enabled.
-    #
-    # See #math_mode=
-    attr_reader :math_mode
-    # Alias for #math_mode
-    alias math? math_mode
-
-    # Sets bc mode, which loads +lib/mathn.rb+ so fractions or matrix are
-    # available.
-    #
-    # Also available as the +-m+ command line option.
-    #
-    # See IRB@Command+line+options and the unix manpage <code>bc(1)</code> for
-    # more information.
-    def math_mode=(opt)
-      if @math_mode == true && !opt
-        IRB.fail CantReturnToNormalMode
-        return
-      end
-
-      @math_mode = opt
-      if math_mode
-        main.extend Math
-        print "start math mode\n" if verbose?
-      end
-    end
-
-    def inspect?
-      @inspect_mode.nil? && !@math_mode or @inspect_mode
-    end
-  end
-end
-
diff --git a/lib/irb/ext/multi-irb.rb b/lib/irb/ext/multi-irb.rb
index 982a319611..74de1ecde5 100644
--- a/lib/irb/ext/multi-irb.rb
+++ b/lib/irb/ext/multi-irb.rb
@@ -9,8 +9,7 @@
 #
 #
 #
-IRB.fail CantShiftToMultiIrbMode unless defined?(Thread)
-require "thread"
+fail CantShiftToMultiIrbMode unless defined?(Thread)
 
 module IRB
   class JobManager
@@ -68,8 +67,8 @@ module IRB
     # exception is raised.
     def switch(key)
       th, irb = search(key)
-      IRB.fail IrbAlreadyDead unless th.alive?
-      IRB.fail IrbSwitchedToCurrentThread if th == Thread.current
+      fail IrbAlreadyDead unless th.alive?
+      fail IrbSwitchedToCurrentThread if th == Thread.current
       @current_job = irb
       th.run
       Thread.stop
@@ -85,7 +84,7 @@ module IRB
     def kill(*keys)
       for key in keys
         th, _ = search(key)
-        IRB.fail IrbAlreadyDead unless th.alive?
+        fail IrbAlreadyDead unless th.alive?
         th.exit
       end
     end
@@ -115,7 +114,7 @@ module IRB
             else
               @jobs.find{|k, v| v.context.main.equal?(key)}
             end
-      IRB.fail NoSuchJob, key if job.nil?
+      fail NoSuchJob, key if job.nil?
       job
     end
 
@@ -123,7 +122,7 @@ module IRB
     def delete(key)
       case key
       when Integer
-        IRB.fail NoSuchJob, key unless @jobs[key]
+        fail NoSuchJob, key unless @jobs[key]
         @jobs[key] = nil
       else
         catch(:EXISTS) do
@@ -136,7 +135,7 @@ module IRB
               throw :EXISTS
             end
           end
-          IRB.fail NoSuchJob, key
+          fail NoSuchJob, key
         end
       end
       until assoc = @jobs.pop; end unless @jobs.empty?
diff --git a/lib/irb/ext/save-history.rb b/lib/irb/ext/save-history.rb
index ab64cf543d..7acaebe36a 100644
--- a/lib/irb/ext/save-history.rb
+++ b/lib/irb/ext/save-history.rb
@@ -9,8 +9,6 @@
 #
 #
 
-require "readline"
-
 module IRB
   module HistorySavingAbility # :nodoc:
   end
@@ -27,7 +25,7 @@ module IRB
       IRB.conf[:SAVE_HISTORY]
     end
 
-    remove_method :save_history= if respond_to?(:save_history=)
+    remove_method(:save_history=) if method_defined?(:save_history=)
     # Sets <code>IRB.conf[:SAVE_HISTORY]</code> to the given +val+ and calls
     # #init_save_history with this context.
     #
@@ -58,8 +56,6 @@ module IRB
   end
 
   module HistorySavingAbility # :nodoc:
-    include Readline
-
     def HistorySavingAbility.extended(obj)
       IRB.conf[:AT_EXIT].push proc{obj.save_history}
       obj.load_history
@@ -67,19 +63,33 @@ module IRB
     end
 
     def load_history
+      return unless self.class.const_defined?(:HISTORY)
+      history = self.class::HISTORY
       if history_file = IRB.conf[:HISTORY_FILE]
         history_file = File.expand_path(history_file)
       end
       history_file = IRB.rc_file("_history") unless history_file
       if File.exist?(history_file)
-        open(history_file) do |f|
-          f.each {|l| HISTORY << l.chomp}
+        open(history_file, "r:#{IRB.conf[:LC_MESSAGES].encoding}") do |f|
+          f.each { |l|
+            l = l.chomp
+            if self.class == ReidlineInputMethod and history.last&.end_with?("\\")
+              history.last.delete_suffix!("\\")
+              history.last << "\n" << l
+            else
+              history << l
+            end
+          }
         end
+        @loaded_history_lines = history.size
+        @loaded_history_mtime = File.mtime(history_file)
       end
     end
 
     def save_history
-      if num = IRB.conf[:SAVE_HISTORY] and (num = num.to_i) > 0
+      return unless self.class.const_defined?(:HISTORY)
+      history = self.class::HISTORY
+      if num = IRB.conf[:SAVE_HISTORY] and (num = num.to_i) != 0
         if history_file = IRB.conf[:HISTORY_FILE]
           history_file = File.expand_path(history_file)
         end
@@ -91,13 +101,28 @@ module IRB
             File.chmod(0600, history_file)
           end
         rescue Errno::ENOENT
+        rescue Errno::EPERM
+          return
         rescue
           raise
         end
 
-        open(history_file, 'w', 0600 ) do |f|
-          hist = HISTORY.to_a
-          f.puts(hist[-num..-1] || hist)
+        if File.exist?(history_file) && @loaded_history_mtime &&
+           File.mtime(history_file) != @loaded_history_mtime
+          history = history[@loaded_history_lines..-1]
+          append_history = true
+        end
+
+        open(history_file, "#{append_history ? 'a' : 'w'}:#{IRB.conf[:LC_MESSAGES].encoding}", 0600) do |f|
+          hist = history.map{ |l| l.split("\n").join("\\\n") }
+          unless append_history
+            begin
+              hist = hist.last(num) if hist.size > num and num > 0
+            rescue RangeError # bignum too big to convert into `long'
+              # Do nothing because the bignum should be treated as inifinity
+            end
+          end
+          f.puts(hist)
         end
       end
     end
diff --git a/lib/irb/ext/tracer.rb b/lib/irb/ext/tracer.rb
index 200f77e341..67ac4bb965 100644
--- a/lib/irb/ext/tracer.rb
+++ b/lib/irb/ext/tracer.rb
@@ -9,7 +9,20 @@
 #
 #
 #
-require "tracer"
+begin
+  require "tracer"
+rescue LoadError
+  $stderr.puts "Tracer extension of IRB is enabled but tracer gem doesn't found."
+  module IRB
+    TracerLoadError = true
+    class Context
+      def use_tracer=(opt)
+        # do nothing
+      end
+    end
+  end
+  return # This is about to disable loading below
+end
 
 module IRB
 
@@ -69,4 +82,3 @@ module IRB
 
   IRB.initialize_tracer
 end
-
diff --git a/lib/irb/ext/use-loader.rb b/lib/irb/ext/use-loader.rb
index 571dd25d17..1897bc89e0 100644
--- a/lib/irb/ext/use-loader.rb
+++ b/lib/irb/ext/use-loader.rb
@@ -10,8 +10,8 @@
 #
 #
 
-require "irb/cmd/load"
-require "irb/ext/loader"
+require_relative "../cmd/load"
+require_relative "loader"
 
 class Object
   alias __original__load__IRB_use_loader__ load
@@ -20,10 +20,12 @@ end
 
 module IRB
   module ExtendCommandBundle
+    remove_method :irb_load if method_defined?(:irb_load)
     # Loads the given file similarly to Kernel#load, see IrbLoader#irb_load
     def irb_load(*opts, &b)
       ExtendCommand::Load.execute(irb_context, *opts, &b)
     end
+    remove_method :irb_require if method_defined?(:irb_require)
     # Loads the given file similarly to Kernel#require
     def irb_require(*opts, &b)
       ExtendCommand::Require.execute(irb_context, *opts, &b)
@@ -44,7 +46,8 @@ module IRB
 
     alias use_loader? use_loader
 
-    # Sets IRB.conf[:USE_LOADER]
+    remove_method :use_loader= if method_defined?(:use_loader=)
+    # Sets <code>IRB.conf[:USE_LOADER]</code>
     #
     # See #use_loader for more information.
     def use_loader=(opt)
@@ -70,5 +73,3 @@ module IRB
     end
   end
 end
-
-
diff --git a/lib/irb/ext/workspaces.rb b/lib/irb/ext/workspaces.rb
index 5bd72c194f..730b58e64d 100644
--- a/lib/irb/ext/workspaces.rb
+++ b/lib/irb/ext/workspaces.rb
@@ -64,4 +64,3 @@ module IRB # :nodoc:
     end
   end
 end
-
diff --git a/lib/irb/extend-command.rb b/lib/irb/extend-command.rb
index 6f15e6403a..339e9e6084 100644
--- a/lib/irb/extend-command.rb
+++ b/lib/irb/extend-command.rb
@@ -32,7 +32,7 @@ module IRB # :nodoc:
 
     # Displays current configuration.
     #
-    # Modifing the configuration is achieved by sending a message to IRB.conf.
+    # Modifying the configuration is achieved by sending a message to IRB.conf.
     def irb_context
       IRB.CurrentContext
     end
@@ -46,58 +46,104 @@ module IRB # :nodoc:
     ]
 
     @EXTEND_COMMANDS = [
-      [:irb_current_working_workspace, :CurrentWorkingWorkspace, "irb/cmd/chws",
-       [:irb_print_working_workspace, OVERRIDE_ALL],
-       [:irb_cwws, OVERRIDE_ALL],
-       [:irb_pwws, OVERRIDE_ALL],
-       [:cwws, NO_OVERRIDE],
-       [:pwws, NO_OVERRIDE],
-       [:irb_current_working_binding, OVERRIDE_ALL],
-       [:irb_print_working_binding, OVERRIDE_ALL],
-       [:irb_cwb, OVERRIDE_ALL],
-       [:irb_pwb, OVERRIDE_ALL],
-    ],
-    [:irb_change_workspace, :ChangeWorkspace, "irb/cmd/chws",
-     [:irb_chws, OVERRIDE_ALL],
-     [:irb_cws, OVERRIDE_ALL],
-     [:chws, NO_OVERRIDE],
-     [:cws, NO_OVERRIDE],
-     [:irb_change_binding, OVERRIDE_ALL],
-     [:irb_cb, OVERRIDE_ALL],
-     [:cb, NO_OVERRIDE]],
-
-    [:irb_workspaces, :Workspaces, "irb/cmd/pushws",
-     [:workspaces, NO_OVERRIDE],
-     [:irb_bindings, OVERRIDE_ALL],
-     [:bindings, NO_OVERRIDE]],
-    [:irb_push_workspace, :PushWorkspace, "irb/cmd/pushws",
-     [:irb_pushws, OVERRIDE_ALL],
-     [:pushws, NO_OVERRIDE],
-     [:irb_push_binding, OVERRIDE_ALL],
-     [:irb_pushb, OVERRIDE_ALL],
-     [:pushb, NO_OVERRIDE]],
-    [:irb_pop_workspace, :PopWorkspace, "irb/cmd/pushws",
-     [:irb_popws, OVERRIDE_ALL],
-     [:popws, NO_OVERRIDE],
-     [:irb_pop_binding, OVERRIDE_ALL],
-     [:irb_popb, OVERRIDE_ALL],
-     [:popb, NO_OVERRIDE]],
-
-    [:irb_load, :Load, "irb/cmd/load"],
-    [:irb_require, :Require, "irb/cmd/load"],
-    [:irb_source, :Source, "irb/cmd/load",
-     [:source, NO_OVERRIDE]],
-
-    [:irb, :IrbCommand, "irb/cmd/subirb"],
-    [:irb_jobs, :Jobs, "irb/cmd/subirb",
-     [:jobs, NO_OVERRIDE]],
-    [:irb_fg, :Foreground, "irb/cmd/subirb",
-     [:fg, NO_OVERRIDE]],
-    [:irb_kill, :Kill, "irb/cmd/subirb",
-     [:kill, OVERRIDE_PRIVATE_ONLY]],
-
-    [:irb_help, :Help, "irb/cmd/help",
-     [:help, NO_OVERRIDE]],
+      [
+        :irb_current_working_workspace, :CurrentWorkingWorkspace, "irb/cmd/chws",
+        [:irb_print_working_workspace, OVERRIDE_ALL],
+        [:irb_cwws, OVERRIDE_ALL],
+        [:irb_pwws, OVERRIDE_ALL],
+        [:cwws, NO_OVERRIDE],
+        [:pwws, NO_OVERRIDE],
+        [:irb_current_working_binding, OVERRIDE_ALL],
+        [:irb_print_working_binding, OVERRIDE_ALL],
+        [:irb_cwb, OVERRIDE_ALL],
+        [:irb_pwb, OVERRIDE_ALL],
+      ],
+      [
+        :irb_change_workspace, :ChangeWorkspace, "irb/cmd/chws",
+        [:irb_chws, OVERRIDE_ALL],
+        [:irb_cws, OVERRIDE_ALL],
+        [:chws, NO_OVERRIDE],
+        [:cws, NO_OVERRIDE],
+        [:irb_change_binding, OVERRIDE_ALL],
+        [:irb_cb, OVERRIDE_ALL],
+        [:cb, NO_OVERRIDE],
+      ],
+
+      [
+        :irb_workspaces, :Workspaces, "irb/cmd/pushws",
+        [:workspaces, NO_OVERRIDE],
+        [:irb_bindings, OVERRIDE_ALL],
+        [:bindings, NO_OVERRIDE],
+      ],
+      [
+        :irb_push_workspace, :PushWorkspace, "irb/cmd/pushws",
+        [:irb_pushws, OVERRIDE_ALL],
+        [:pushws, NO_OVERRIDE],
+        [:irb_push_binding, OVERRIDE_ALL],
+        [:irb_pushb, OVERRIDE_ALL],
+        [:pushb, NO_OVERRIDE],
+      ],
+      [
+        :irb_pop_workspace, :PopWorkspace, "irb/cmd/pushws",
+        [:irb_popws, OVERRIDE_ALL],
+        [:popws, NO_OVERRIDE],
+        [:irb_pop_binding, OVERRIDE_ALL],
+        [:irb_popb, OVERRIDE_ALL],
+        [:popb, NO_OVERRIDE],
+      ],
+
+      [
+        :irb_load, :Load, "irb/cmd/load"],
+      [
+        :irb_require, :Require, "irb/cmd/load"],
+      [
+        :irb_source, :Source, "irb/cmd/load",
+        [:source, NO_OVERRIDE],
+      ],
+
+      [
+        :irb, :IrbCommand, "irb/cmd/subirb"],
+      [
+        :irb_jobs, :Jobs, "irb/cmd/subirb",
+        [:jobs, NO_OVERRIDE],
+      ],
+      [
+        :irb_fg, :Foreground, "irb/cmd/subirb",
+        [:fg, NO_OVERRIDE],
+      ],
+      [
+        :irb_kill, :Kill, "irb/cmd/subirb",
+        [:kill, OVERRIDE_PRIVATE_ONLY],
+      ],
+
+      [
+        :irb_help, :Help, "irb/cmd/help",
+        [:help, NO_OVERRIDE],
+      ],
+
+      [
+        :irb_info, :Info, "irb/cmd/info"
+      ],
+
+      [
+        :irb_ls, :Ls, "irb/cmd/ls",
+        [:ls, NO_OVERRIDE],
+      ],
+
+      [
+        :irb_measure, :Measure, "irb/cmd/measure",
+        [:measure, NO_OVERRIDE],
+      ],
+
+      [
+        :irb_show_source, :ShowSource, "irb/cmd/show_source",
+        [:show_source, NO_OVERRIDE],
+      ],
+
+      [
+        :irb_whereami, :Whereami, "irb/cmd/whereami",
+        [:whereami, NO_OVERRIDE],
+      ],
 
     ]
 
@@ -138,20 +184,24 @@ module IRB # :nodoc:
       end
 
       if load_file
+        kwargs = ", **kwargs" if RUBY_ENGINE == "ruby" && RUBY_VERSION >= "2.7.0"
         line = __LINE__; eval %[
-          def #{cmd_name}(*opts, &b)
+          def #{cmd_name}(*opts#{kwargs}, &b)
             require "#{load_file}"
             arity = ExtendCommand::#{cmd_class}.instance_method(:execute).arity
             args = (1..(arity < 0 ? ~arity : arity)).map {|i| "arg" + i.to_s }
-            args << "*opts" if arity < 0
+            args << "*opts#{kwargs}" if arity < 0
             args << "&block"
             args = args.join(", ")
             line = __LINE__; eval %[
-              def #{cmd_name}(\#{args})
-            ExtendCommand::#{cmd_class}.execute(irb_context, \#{args})
+              unless singleton_class.class_variable_defined?(:@@#{cmd_name}_)
+                singleton_class.class_variable_set(:@@#{cmd_name}_, true)
+                def self.#{cmd_name}_(\#{args})
+                  ExtendCommand::#{cmd_class}.execute(irb_context, \#{args})
+                end
               end
             ], nil, __FILE__, line
-            send :#{cmd_name}, *opts, &b
+            __send__ :#{cmd_name}_, *opts#{kwargs}, &b
           end
         ], nil, __FILE__, line
       else
@@ -214,7 +264,6 @@ module IRB # :nodoc:
     @EXTEND_COMMANDS = [
       [:eval_history=, "irb/ext/history.rb"],
       [:use_tracer=, "irb/ext/tracer.rb"],
-      [:math_mode=, "irb/ext/math-mode.rb"],
       [:use_loader=, "irb/ext/use-loader.rb"],
       [:save_history=, "irb/ext/save-history.rb"],
     ]
@@ -223,7 +272,6 @@ module IRB # :nodoc:
     #
     # Context#eval_history=::   +irb/ext/history.rb+
     # Context#use_tracer=::     +irb/ext/tracer.rb+
-    # Context#math_mode=::      +irb/ext/math-mode.rb+
     # Context#use_loader=::     +irb/ext/use-loader.rb+
     # Context#save_history=::   +irb/ext/save-history.rb+
     def self.install_extend_commands
@@ -241,7 +289,7 @@ module IRB # :nodoc:
         def #{cmd_name}(*opts, &b)
           Context.module_eval {remove_method(:#{cmd_name})}
           require "#{load_file}"
-          send :#{cmd_name}, *opts, &b
+          __send__ :#{cmd_name}, *opts, &b
         end
         for ali in aliases
           alias_method ali, cmd_name
@@ -264,8 +312,8 @@ module IRB # :nodoc:
       module_eval %[
         alias_method alias_name, base_method
         def #{base_method}(*opts)
-          send :#{extend_method}, *opts
-          send :#{alias_name}, *opts
+          __send__ :#{extend_method}, *opts
+          __send__ :#{alias_name}, *opts
         end
       ]
     end
@@ -280,8 +328,8 @@ module IRB # :nodoc:
       module_eval %[
         alias_method alias_name, base_method
         def #{base_method}(*opts)
-          send :#{alias_name}, *opts
-          send :#{extend_method}, *opts
+          __send__ :#{alias_name}, *opts
+          __send__ :#{extend_method}, *opts
         end
       ]
     end
@@ -306,4 +354,3 @@ module IRB # :nodoc:
     end
   end
 end
-
diff --git a/lib/irb/frame.rb b/lib/irb/frame.rb
index 6073809249..de54a98f1b 100644
--- a/lib/irb/frame.rb
+++ b/lib/irb/frame.rb
@@ -10,13 +10,18 @@
 #
 #
 
-require "e2mmap"
-
 module IRB
   class Frame
-    extend Exception2MessageMapper
-    def_exception :FrameOverflow, "frame overflow"
-    def_exception :FrameUnderflow, "frame underflow"
+    class FrameOverflow < StandardError
+      def initialize
+        super("frame overflow")
+      end
+    end
+    class FrameUnderflow < StandardError
+      def initialize
+        super("frame underflow")
+      end
+    end
 
     # Default number of stack frames
     INIT_STACK_TIMES = 3
@@ -44,7 +49,7 @@ module IRB
     # Raises FrameUnderflow if there are no frames in the given stack range.
     def top(n = 0)
       bind = @frames[-(n + CALL_STACK_OFFSET)]
-      Fail FrameUnderflow unless bind
+      fail FrameUnderflow unless bind
       bind
     end
 
@@ -54,7 +59,7 @@ module IRB
     # Raises FrameOverflow if there are no frames in the given stack range.
     def bottom(n = 0)
       bind = @frames[n]
-      Fail FrameOverflow unless bind
+      fail FrameOverflow unless bind
       bind
     end
 
diff --git a/lib/irb/help.rb b/lib/irb/help.rb
index a4264ab4ab..3eeaf841b0 100644
--- a/lib/irb/help.rb
+++ b/lib/irb/help.rb
@@ -10,7 +10,7 @@
 #
 #
 
-require 'irb/magic-file'
+require_relative 'magic-file'
 
 module IRB
   # Outputs the irb help message, see IRB@Command+line+options.
@@ -34,4 +34,3 @@ module IRB
     }
   end
 end
-
diff --git a/lib/irb/init.rb b/lib/irb/init.rb
index 1184db15ea..78ef2fa3c1 100644
--- a/lib/irb/init.rb
+++ b/lib/irb/init.rb
@@ -13,15 +13,15 @@
 module IRB # :nodoc:
 
   # initialize config
-  def IRB.setup(ap_path)
+  def IRB.setup(ap_path, argv: ::ARGV)
     IRB.init_config(ap_path)
     IRB.init_error
-    IRB.parse_opts
+    IRB.parse_opts(argv: argv)
     IRB.run_config
     IRB.load_modules
 
     unless @CONF[:PROMPT][@CONF[:PROMPT_MODE]]
-      IRB.fail(UndefinedPromptMode, @CONF[:PROMPT_MODE])
+      fail UndefinedPromptMode, @CONF[:PROMPT_MODE]
     end
   end
 
@@ -43,18 +43,19 @@ module IRB # :nodoc:
     @CONF[:LOAD_MODULES] = []
     @CONF[:IRB_RC] = nil
 
-    @CONF[:MATH_MODE] = false
-    @CONF[:USE_READLINE] = false unless defined?(ReadlineInputMethod)
+    @CONF[:USE_SINGLELINE] = false unless defined?(ReadlineInputMethod)
+    @CONF[:USE_COLORIZE] = true
     @CONF[:INSPECT_MODE] = true
     @CONF[:USE_TRACER] = false
     @CONF[:USE_LOADER] = false
     @CONF[:IGNORE_SIGINT] = true
     @CONF[:IGNORE_EOF] = false
     @CONF[:ECHO] = nil
+    @CONF[:ECHO_ON_ASSIGNMENT] = nil
     @CONF[:VERBOSE] = nil
 
     @CONF[:EVAL_HISTORY] = nil
-    @CONF[:SAVE_HISTORY] = nil
+    @CONF[:SAVE_HISTORY] = 1000
 
     @CONF[:BACK_TRACE_LIMIT] = 16
 
@@ -83,7 +84,7 @@ module IRB # :nodoc:
       :SIMPLE => {
         :PROMPT_I => ">> ",
         :PROMPT_N => ">> ",
-        :PROMPT_S => nil,
+        :PROMPT_S => "%l> ",
         :PROMPT_C => "?> ",
         :RETURN => "=> %s\n"
       },
@@ -105,16 +106,89 @@ module IRB # :nodoc:
     }
 
     @CONF[:PROMPT_MODE] = (STDIN.tty? ? :DEFAULT : :NULL)
-    @CONF[:AUTO_INDENT] = false
+    @CONF[:AUTO_INDENT] = true
 
-    @CONF[:CONTEXT_MODE] = 3 # use binding in function on TOPLEVEL_BINDING
+    @CONF[:CONTEXT_MODE] = 4 # use a copy of TOPLEVEL_BINDING
     @CONF[:SINGLE_IRB] = false
 
+    @CONF[:MEASURE] = false
+    @CONF[:MEASURE_PROC] = {}
+    @CONF[:MEASURE_PROC][:TIME] = proc { |context, code, line_no, &block|
+      time = Time.now
+      result = block.()
+      now = Time.now
+      puts 'processing time: %fs' % (now - time) if IRB.conf[:MEASURE]
+      result
+    }
+    @CONF[:MEASURE_PROC][:STACKPROF] = proc { |context, code, line_no, arg, &block|
+      success = false
+      begin
+        require 'stackprof'
+        success = true
+      rescue LoadError
+        puts 'Please run "gem install stackprof" before measuring by StackProf.'
+      end
+      if success
+        result = nil
+        stackprof_result = StackProf.run(mode: arg ? arg : :cpu) do
+          result = block.()
+        end
+        StackProf::Report.new(stackprof_result).print_text if IRB.conf[:MEASURE]
+        result
+      else
+        block.()
+      end
+    }
+    @CONF[:MEASURE_CALLBACKS] = []
+
     @CONF[:LC_MESSAGES] = Locale.new
 
     @CONF[:AT_EXIT] = []
+  end
+
+  def IRB.set_measure_callback(type = nil, arg = nil, &block)
+    added = nil
+    if type
+      type_sym = type.upcase.to_sym
+      if IRB.conf[:MEASURE_PROC][type_sym]
+        added = [type_sym, IRB.conf[:MEASURE_PROC][type_sym], arg]
+      end
+    elsif IRB.conf[:MEASURE_PROC][:CUSTOM]
+      added = [:CUSTOM, IRB.conf[:MEASURE_PROC][:CUSTOM], arg]
+    elsif block_given?
+      added = [:BLOCK, block, arg]
+      found = IRB.conf[:MEASURE_CALLBACKS].find{ |m| m[0] == added[0] && m[2] == added[2] }
+      if found
+        found[1] = block
+        return added
+      else
+        IRB.conf[:MEASURE_CALLBACKS] << added
+        return added
+      end
+    else
+      added = [:TIME, IRB.conf[:MEASURE_PROC][:TIME], arg]
+    end
+    if added
+      found = IRB.conf[:MEASURE_CALLBACKS].find{ |m| m[0] == added[0] && m[2] == added[2] }
+      if found
+        # already added
+        nil
+      else
+        IRB.conf[:MEASURE_CALLBACKS] << added if added
+        added
+      end
+    else
+      nil
+    end
+  end
 
-    @CONF[:DEBUG_LEVEL] = 0
+  def IRB.unset_measure_callback(type = nil)
+    if type.nil?
+      IRB.conf[:MEASURE_CALLBACKS].clear
+    else
+      type_sym = type.upcase.to_sym
+      IRB.conf[:MEASURE_CALLBACKS].reject!{ |t, | t == type_sym }
+    end
   end
 
   def IRB.init_error
@@ -122,62 +196,74 @@ module IRB # :nodoc:
   end
 
   # option analyzing
-  def IRB.parse_opts
+  def IRB.parse_opts(argv: ::ARGV)
     load_path = []
-    while opt = ARGV.shift
+    while opt = argv.shift
       case opt
       when "-f"
         @CONF[:RC] = false
-      when "-m"
-        @CONF[:MATH_MODE] = true
       when "-d"
         $DEBUG = true
         $VERBOSE = true
       when "-w"
-        $VERBOSE = true
+        Warning[:deprecated] = $VERBOSE = true
       when /^-W(.+)?/
-        opt = $1 || ARGV.shift
+        opt = $1 || argv.shift
         case opt
         when "0"
           $VERBOSE = nil
         when "1"
           $VERBOSE = false
         else
-          $VERBOSE = true
+          Warning[:deprecated] = $VERBOSE = true
         end
       when /^-r(.+)?/
-        opt = $1 || ARGV.shift
+        opt = $1 || argv.shift
         @CONF[:LOAD_MODULES].push opt if opt
       when /^-I(.+)?/
-        opt = $1 || ARGV.shift
+        opt = $1 || argv.shift
         load_path.concat(opt.split(File::PATH_SEPARATOR)) if opt
       when '-U'
         set_encoding("UTF-8", "UTF-8")
       when /^-E(.+)?/, /^--encoding(?:=(.+))?/
-        opt = $1 || ARGV.shift
+        opt = $1 || argv.shift
         set_encoding(*opt.split(':', 2))
       when "--inspect"
-        if /^-/ !~ ARGV.first
-          @CONF[:INSPECT_MODE] = ARGV.shift
+        if /^-/ !~ argv.first
+          @CONF[:INSPECT_MODE] = argv.shift
         else
           @CONF[:INSPECT_MODE] = true
         end
       when "--noinspect"
         @CONF[:INSPECT_MODE] = false
-      when "--readline"
-        @CONF[:USE_READLINE] = true
-      when "--noreadline"
-        @CONF[:USE_READLINE] = false
+      when "--singleline", "--readline", "--legacy"
+        @CONF[:USE_SINGLELINE] = true
+      when "--nosingleline", "--noreadline"
+        @CONF[:USE_SINGLELINE] = false
+      when "--multiline", "--reidline"
+        @CONF[:USE_MULTILINE] = true
+      when "--nomultiline", "--noreidline"
+        @CONF[:USE_MULTILINE] = false
       when "--echo"
         @CONF[:ECHO] = true
       when "--noecho"
         @CONF[:ECHO] = false
+      when "--echo-on-assignment"
+        @CONF[:ECHO_ON_ASSIGNMENT] = true
+      when "--noecho-on-assignment"
+        @CONF[:ECHO_ON_ASSIGNMENT] = false
+      when "--truncate-echo-on-assignment"
+        @CONF[:ECHO_ON_ASSIGNMENT] = :truncate
       when "--verbose"
         @CONF[:VERBOSE] = true
       when "--noverbose"
         @CONF[:VERBOSE] = false
+      when "--colorize"
+        @CONF[:USE_COLORIZE] = true
+      when "--nocolorize"
+        @CONF[:USE_COLORIZE] = false
       when /^--prompt-mode(?:=(.+))?/, /^--prompt(?:=(.+))?/
-        opt = $1 || ARGV.shift
+        opt = $1 || argv.shift
         prompt_mode = opt.upcase.tr("-", "_").intern
         @CONF[:PROMPT_MODE] = prompt_mode
       when "--noprompt"
@@ -189,28 +275,26 @@ module IRB # :nodoc:
       when "--tracer"
         @CONF[:USE_TRACER] = true
       when /^--back-trace-limit(?:=(.+))?/
-        @CONF[:BACK_TRACE_LIMIT] = ($1 || ARGV.shift).to_i
+        @CONF[:BACK_TRACE_LIMIT] = ($1 || argv.shift).to_i
       when /^--context-mode(?:=(.+))?/
-        @CONF[:CONTEXT_MODE] = ($1 || ARGV.shift).to_i
+        @CONF[:CONTEXT_MODE] = ($1 || argv.shift).to_i
       when "--single-irb"
         @CONF[:SINGLE_IRB] = true
-      when /^--irb_debug(?:=(.+))?/
-        @CONF[:DEBUG_LEVEL] = ($1 || ARGV.shift).to_i
       when "-v", "--version"
         print IRB.version, "\n"
         exit 0
       when "-h", "--help"
-        require "irb/help"
+        require_relative "help"
         IRB.print_usage
         exit 0
       when "--"
-        if opt = ARGV.shift
+        if opt = argv.shift
           @CONF[:SCRIPT] = opt
           $0 = opt
         end
         break
       when /^-/
-        IRB.fail UnrecognizedSwitch, opt
+        fail UnrecognizedSwitch, opt
       else
         @CONF[:SCRIPT] = opt
         $0 = opt
@@ -255,7 +339,7 @@ module IRB # :nodoc:
     when String
       return rc_file
     else
-      IRB.fail IllegalRCNameGenerator
+      fail IllegalRCNameGenerator
     end
   end
 
@@ -264,14 +348,23 @@ module IRB # :nodoc:
     if irbrc = ENV["IRBRC"]
       yield proc{|rc| rc == "rc" ? irbrc : irbrc+rc}
     end
+    if xdg_config_home = ENV["XDG_CONFIG_HOME"]
+      irb_home = File.join(xdg_config_home, "irb")
+      unless File.exist? irb_home
+        require 'fileutils'
+        FileUtils.mkdir_p irb_home
+      end
+      yield proc{|rc| irb_home + "/irb#{rc}"}
+    end
     if home = ENV["HOME"]
       yield proc{|rc| home+"/.irb#{rc}"}
     end
-    home = Dir.pwd
-    yield proc{|rc| home+"/.irb#{rc}"}
-    yield proc{|rc| home+"/irb#{rc.sub(/\A_?/, '.')}"}
-    yield proc{|rc| home+"/_irb#{rc}"}
-    yield proc{|rc| home+"/$irb#{rc}"}
+    current_dir = Dir.pwd
+    yield proc{|rc| current_dir+"/.config/irb/irb#{rc}"}
+    yield proc{|rc| current_dir+"/.irb#{rc}"}
+    yield proc{|rc| current_dir+"/irb#{rc.sub(/\A_?/, '.')}"}
+    yield proc{|rc| current_dir+"/_irb#{rc}"}
+    yield proc{|rc| current_dir+"/$irb#{rc}"}
   end
 
   # loading modules
@@ -280,7 +373,7 @@ module IRB # :nodoc:
       begin
         require m
       rescue LoadError => err
-        warn err.backtrace[0] << ":#{err.class}: #{err}"
+        warn "#{err.class}: #{err}", uplevel: 0
       end
     end
   end
@@ -289,15 +382,18 @@ module IRB # :nodoc:
   DefaultEncodings = Struct.new(:external, :internal)
   class << IRB
     private
-    def set_encoding(extern, intern = nil)
+    def set_encoding(extern, intern = nil, override: true)
       verbose, $VERBOSE = $VERBOSE, nil
       Encoding.default_external = extern unless extern.nil? || extern.empty?
       Encoding.default_internal = intern unless intern.nil? || intern.empty?
-      @CONF[:ENCODINGS] = IRB::DefaultEncodings.new(extern, intern)
       [$stdin, $stdout, $stderr].each do |io|
         io.set_encoding(extern, intern)
       end
-      @CONF[:LC_MESSAGES].instance_variable_set(:@encoding, extern)
+      if override
+        @CONF[:LC_MESSAGES].instance_variable_set(:@override_encoding, extern)
+      else
+        @CONF[:LC_MESSAGES].instance_variable_set(:@encoding, extern)
+      end
     ensure
       $VERBOSE = verbose
     end
diff --git a/lib/irb/input-method.rb b/lib/irb/input-method.rb
index f7b1aac3bf..1854567a2d 100644
--- a/lib/irb/input-method.rb
+++ b/lib/irb/input-method.rb
@@ -9,8 +9,11 @@
 #
 #
 #
-require 'irb/src_encoding'
-require 'irb/magic-file'
+require_relative 'src_encoding'
+require_relative 'magic-file'
+require_relative 'completion'
+require 'io/console'
+require 'reline'
 
 module IRB
   STDIN_FILE_NAME = "(line)" # :nodoc:
@@ -30,10 +33,18 @@ module IRB
     #
     # See IO#gets for more information.
     def gets
-      IRB.fail NotImplementedError, "gets"
+      fail NotImplementedError, "gets"
     end
     public :gets
 
+    def winsize
+      if instance_variable_defined?(:@stdout)
+        @stdout.winsize
+      else
+        [24, 80]
+      end
+    end
+
     # Whether this input method is still readable when there is no more data to
     # read.
     #
@@ -41,6 +52,11 @@ module IRB
     def readable_after_eof?
       false
     end
+
+    # For debug message
+    def inspect
+      'Abstract InputMethod'
+    end
   end
 
   class StdioInputMethod < InputMethod
@@ -67,7 +83,15 @@ module IRB
     #
     # See IO#eof? for more information.
     def eof?
-      @stdin.eof?
+      rs, = IO.select([@stdin], [], [], 0.00001)
+      if rs and rs[0]
+        c = @stdin.getc
+        result = c.nil? ? true : false
+        @stdin.ungetc(c) unless c.nil?
+        result
+      else # buffer is empty
+        false
+      end
     end
 
     # Whether this input method is still readable when there is no more data to
@@ -91,14 +115,31 @@ module IRB
     def encoding
       @stdin.external_encoding
     end
+
+    # For debug message
+    def inspect
+      'StdioInputMethod'
+    end
   end
 
   # Use a File for IO with irb, see InputMethod
   class FileInputMethod < InputMethod
+    class << self
+      def open(file, &block)
+        begin
+          io = new(file)
+          block.call(io)
+        ensure
+          io&.close
+        end
+      end
+    end
+
     # Creates a new input method object
     def initialize(file)
       super
       @io = IRB::MagicFile.open(file)
+      @external_encoding = @io.external_encoding
     end
     # The file name of this input method, usually given during initialization.
     attr_reader :file_name
@@ -108,7 +149,7 @@ module IRB
     #
     # See IO#eof? for more information.
     def eof?
-      @io.eof?
+      @io.closed? || @io.eof?
     end
 
     # Reads the next line from this input method.
@@ -116,22 +157,39 @@ module IRB
     # See IO#gets for more information.
     def gets
       print @prompt
-      l = @io.gets
-      l
+      @io.gets
     end
 
     # The external encoding for standard input.
     def encoding
-      @io.external_encoding
+      @external_encoding
+    end
+
+    # For debug message
+    def inspect
+      'FileInputMethod'
+    end
+
+    def close
+      @io.close
     end
   end
 
   begin
-    require "readline"
     class ReadlineInputMethod < InputMethod
-      include Readline
+      def self.initialize_readline
+        require "readline"
+      rescue LoadError
+      else
+        include ::Readline
+      end
+
       # Creates a new input method object using Readline
       def initialize
+        self.class.initialize_readline
+        if Readline.respond_to?(:encoding_system_needs)
+          IRB.__send__(:set_encoding, Readline.encoding_system_needs.name, override: false)
+        end
         super
 
         @line_no = 0
@@ -140,6 +198,12 @@ module IRB
 
         @stdin = IO.open(STDIN.to_i, :external_encoding => IRB.conf[:LC_MESSAGES].encoding, :internal_encoding => "-")
         @stdout = IO.open(STDOUT.to_i, 'w', :external_encoding => IRB.conf[:LC_MESSAGES].encoding, :internal_encoding => "-")
+
+        if Readline.respond_to?("basic_word_break_characters=")
+          Readline.basic_word_break_characters = IRB::InputCompletor::BASIC_WORD_BREAK_CHARACTERS
+        end
+        Readline.completion_append_character = nil
+        Readline.completion_proc = IRB::InputCompletor::CompletionProc
       end
 
       # Reads the next line from this input method.
@@ -186,7 +250,122 @@ module IRB
       def encoding
         @stdin.external_encoding
       end
+
+      # For debug message
+      def inspect
+        readline_impl = (defined?(Reline) && Readline == Reline) ? 'Reline' : 'ext/readline'
+        str = "ReadlineInputMethod with #{readline_impl} #{Readline::VERSION}"
+        inputrc_path = File.expand_path(ENV['INPUTRC'] || '~/.inputrc')
+        str += " and #{inputrc_path}" if File.exist?(inputrc_path)
+        str
+      end
+    end
+  end
+
+  class ReidlineInputMethod < InputMethod
+    include Reline
+    # Creates a new input method object using Readline
+    def initialize
+      IRB.__send__(:set_encoding, Reline.encoding_system_needs.name, override: false)
+      super
+
+      @line_no = 0
+      @line = []
+      @eof = false
+
+      @stdin = ::IO.open(STDIN.to_i, :external_encoding => IRB.conf[:LC_MESSAGES].encoding, :internal_encoding => "-")
+      @stdout = ::IO.open(STDOUT.to_i, 'w', :external_encoding => IRB.conf[:LC_MESSAGES].encoding, :internal_encoding => "-")
+
+      if Reline.respond_to?("basic_word_break_characters=")
+        Reline.basic_word_break_characters = IRB::InputCompletor::BASIC_WORD_BREAK_CHARACTERS
+      end
+      Reline.completion_append_character = nil
+      Reline.completer_quote_characters = ''
+      Reline.completion_proc = IRB::InputCompletor::CompletionProc
+      Reline.output_modifier_proc =
+        if IRB.conf[:USE_COLORIZE]
+          proc do |output, complete: |
+            next unless IRB::Color.colorable?
+            IRB::Color.colorize_code(output, complete: complete)
+          end
+        else
+          proc do |output|
+            Reline::Unicode.escape_for_print(output)
+          end
+        end
+      Reline.dig_perfect_match_proc = IRB::InputCompletor::PerfectMatchedProc
+    end
+
+    def check_termination(&block)
+      @check_termination_proc = block
+    end
+
+    def dynamic_prompt(&block)
+      @prompt_proc = block
+    end
+
+    def auto_indent(&block)
+      @auto_indent_proc = block
+    end
+
+    # Reads the next line from this input method.
+    #
+    # See IO#gets for more information.
+    def gets
+      Reline.input = @stdin
+      Reline.output = @stdout
+      Reline.prompt_proc = @prompt_proc
+      Reline.auto_indent_proc = @auto_indent_proc if @auto_indent_proc
+      if l = readmultiline(@prompt, false, &@check_termination_proc)
+        HISTORY.push(l) if !l.empty?
+        @line[@line_no += 1] = l + "\n"
+      else
+        @eof = true
+        l
+      end
+    end
+
+    # Whether the end of this input method has been reached, returns +true+
+    # if there is no more data to read.
+    #
+    # See IO#eof? for more information.
+    def eof?
+      @eof
+    end
+
+    # Whether this input method is still readable when there is no more data to
+    # read.
+    #
+    # See IO#eof for more information.
+    def readable_after_eof?
+      true
+    end
+
+    # Returns the current line number for #io.
+    #
+    # #line counts the number of times #gets is called.
+    #
+    # See IO#lineno for more information.
+    def line(line_no)
+      @line[line_no]
+    end
+
+    # The external encoding for standard input.
+    def encoding
+      @stdin.external_encoding
+    end
+
+    # For debug message
+    def inspect
+      config = Reline::Config.new
+      str = "ReidlineInputMethod with Reline #{Reline::VERSION}"
+      if config.respond_to?(:inputrc_path)
+        inputrc_path = File.expand_path(config.inputrc_path)
+      else
+        inputrc_path = File.expand_path(ENV['INPUTRC'] || '~/.inputrc')
+      end
+      str += " and #{inputrc_path}" if File.exist?(inputrc_path)
+      str
     end
-  rescue LoadError
   end
 end
diff --git a/lib/irb/inspector.rb b/lib/irb/inspector.rb
index f6f76712b8..c2f3b605db 100644
--- a/lib/irb/inspector.rb
+++ b/lib/irb/inspector.rb
@@ -100,18 +100,27 @@ module IRB # :nodoc:
     # Proc to call when the input is evaluated and output in irb.
     def inspect_value(v)
       @inspect.call(v)
+    rescue
+      puts "(Object doesn't support #inspect)"
+      ''
     end
   end
 
   Inspector.def_inspector([false, :to_s, :raw]){|v| v.to_s}
-  Inspector.def_inspector([true, :p, :inspect]){|v|
-    begin
-      v.inspect
-    rescue NoMethodError
-      puts "(Object doesn't support #inspect)"
+  Inspector.def_inspector([:p, :inspect]){|v|
+    result = v.inspect
+    if IRB.conf[:MAIN_CONTEXT]&.use_colorize? && Color.inspect_colorable?(v)
+      result = Color.colorize_code(result)
+    end
+    result
+  }
+  Inspector.def_inspector([true, :pp, :pretty_inspect], proc{require "irb/color_printer"}){|v|
+    if IRB.conf[:MAIN_CONTEXT]&.use_colorize?
+      IRB::ColorPrinter.pp(v, '').chomp
+    else
+      v.pretty_inspect.chomp
     end
   }
-  Inspector.def_inspector([:pp, :pretty_inspect], proc{require "pp"}){|v| v.pretty_inspect.chomp}
   Inspector.def_inspector([:yaml, :YAML], proc{require "yaml"}){|v|
     begin
       YAML.dump(v)
@@ -125,8 +134,3 @@ module IRB # :nodoc:
     Marshal.dump(v)
   }
 end
-
-
-
-
-
diff --git a/lib/irb/irb.gemspec b/lib/irb/irb.gemspec
new file mode 100644
index 0000000000..38fee9d9fb
--- /dev/null
+++ b/lib/irb/irb.gemspec
@@ -0,0 +1,42 @@
+begin
+  require_relative "lib/irb/version"
+rescue LoadError
+  # for Ruby core repository
+  require_relative "version"
+end
+
+Gem::Specification.new do |spec|
+  spec.name          = "irb"
+  spec.version       = IRB::VERSION
+  spec.authors       = ["Keiju ISHITSUKA"]
+  spec.email         = ["keiju@ruby-lang.org"]
+
+  spec.summary       = %q{Interactive Ruby command-line tool for REPL (Read Eval Print Loop).}
+  spec.description   = %q{Interactive Ruby command-line tool for REPL (Read Eval Print Loop).}
+  spec.homepage      = "https://github.com/ruby/irb"
+  spec.licenses      = ["Ruby", "BSD-2-Clause"]
+
+  spec.files         = [
+    ".document",
+    "Gemfile",
+    "LICENSE.txt",
+    "README.md",
+    "Rakefile",
+    "bin/console",
+    "bin/setup",
+    "doc/irb/irb-tools.rd.ja",
+    "doc/irb/irb.rd.ja",
+    "exe/irb",
+    "irb.gemspec",
+    "man/irb.1",
+  ] + Dir.glob("lib/**/*")
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5")
+
+  spec.add_dependency "reline", ">= 0.1.5"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+end
diff --git a/lib/irb/lc/.document b/lib/irb/lc/.document
deleted file mode 100644
index 524bb9430b..0000000000
--- a/lib/irb/lc/.document
+++ /dev/null
@@ -1,4 +0,0 @@
-# hide help-message files which contain usage information
-error.rb
-ja/encoding_aliases.rb
-ja/error.rb
diff --git a/lib/irb/lc/error.rb b/lib/irb/lc/error.rb
index 6623f82d84..798994e92c 100644
--- a/lib/irb/lc/error.rb
+++ b/lib/irb/lc/error.rb
@@ -9,24 +9,63 @@
 #
 #
 #
-require "e2mmap"
 
 # :stopdoc:
 module IRB
-
-  # exceptions
-  extend Exception2MessageMapper
-  def_exception :UnrecognizedSwitch, "Unrecognized switch: %s"
-  def_exception :NotImplementedError, "Need to define `%s'"
-  def_exception :CantReturnToNormalMode, "Can't return to normal mode."
-  def_exception :IllegalParameter, "Invalid parameter(%s)."
-  def_exception :IrbAlreadyDead, "Irb is already dead."
-  def_exception :IrbSwitchedToCurrentThread, "Switched to current thread."
-  def_exception :NoSuchJob, "No such job(%s)."
-  def_exception :CantShiftToMultiIrbMode, "Can't shift to multi irb mode."
-  def_exception :CantChangeBinding, "Can't change binding to (%s)."
-  def_exception :UndefinedPromptMode, "Undefined prompt mode(%s)."
-  def_exception :IllegalRCGenerator, 'Define illegal RC_NAME_GENERATOR.'
-
+  class UnrecognizedSwitch < StandardError
+    def initialize(val)
+      super("Unrecognized switch: #{val}")
+    end
+  end
+  class NotImplementedError < StandardError
+    def initialize(val)
+      super("Need to define `#{val}'")
+    end
+  end
+  class CantReturnToNormalMode < StandardError
+    def initialize
+      super("Can't return to normal mode.")
+    end
+  end
+  class IllegalParameter < StandardError
+    def initialize(val)
+      super("Invalid parameter(#{val}).")
+    end
+  end
+  class IrbAlreadyDead < StandardError
+    def initialize
+      super("Irb is already dead.")
+    end
+  end
+  class IrbSwitchedToCurrentThread < StandardError
+    def initialize
+      super("Switched to current thread.")
+    end
+  end
+  class NoSuchJob < StandardError
+    def initialize(val)
+      super("No such job(#{val}).")
+    end
+  end
+  class CantShiftToMultiIrbMode < StandardError
+    def initialize
+      super("Can't shift to multi irb mode.")
+    end
+  end
+  class CantChangeBinding < StandardError
+    def initialize(val)
+      super("Can't change binding to (#{val}).")
+    end
+  end
+  class UndefinedPromptMode < StandardError
+    def initialize(val)
+      super("Undefined prompt mode(#{val}).")
+    end
+  end
+  class IllegalRCGenerator < StandardError
+    def initialize
+      super("Define illegal RC_NAME_GENERATOR.")
+    end
+  end
 end
 # :startdoc:
diff --git a/lib/irb/lc/help-message b/lib/irb/lc/help-message
index 5853693eb0..9c3ea859ad 100644
--- a/lib/irb/lc/help-message
+++ b/lib/irb/lc/help-message
@@ -10,8 +10,7 @@
 #
 #
 Usage:  irb.rb [options] [programfile] [arguments]
-  -f		    Suppress read of ~/.irbrc
-  -m		    Bc mode (load mathn, fraction or matrix are available)
+  -f                Suppress read of ~/.irbrc
   -d                Set $DEBUG to true (same as `ruby -d')
   -r load-module    Same as `ruby -r'
   -I path           Specify $LOAD_PATH directory
@@ -19,28 +18,31 @@ Usage:  irb.rb [options] [programfile] [arguments]
   -E enc            Same as `ruby -E`
   -w                Same as `ruby -w`
   -W[level=2]       Same as `ruby -W`
-  --context-mode n  Set n[0-3] to method to create Binding Object,
+  --context-mode n  Set n[0-4] to method to create Binding Object,
                     when new workspace was created
   --echo            Show result(default)
   --noecho          Don't show result
-  --inspect	    Use `inspect' for output (default except for bc mode)
-  --noinspect	    Don't use inspect for output
-  --readline        Use Readline extension module
-  --noreadline	    Don't use Readline extension module
+  --inspect         Use `inspect' for output
+  --noinspect       Don't use inspect for output
+  --multiline       Use multiline editor module
+  --nomultiline     Don't use multiline editor module
+  --singleline      Use singleline editor module
+  --nosingleline    Don't use singleline editor module
+  --colorize        Use colorization
+  --nocolorize      Don't use colorization
   --prompt prompt-mode/--prompt-mode prompt-mode
-		    Switch prompt mode. Pre-defined prompt modes are
-		    `default', `simple', `xmp' and `inf-ruby'
+                    Switch prompt mode. Pre-defined prompt modes are
+                    `default', `simple', `xmp' and `inf-ruby'
   --inf-ruby-mode   Use prompt appropriate for inf-ruby-mode on emacs.
-		    Suppresses --readline.
+                    Suppresses --multiline and --singleline.
   --sample-book-mode/--simple-prompt
                     Simple prompt mode
   --noprompt        No prompt mode
   --single-irb      Share self with sub-irb.
   --tracer          Display trace for each execution of commands.
   --back-trace-limit n
-		    Display backtrace top n and tail n. The default
-		    value is 16.
-  --irb_debug n	    Set internal debug level to n (not for popular use)
+                    Display backtrace top n and tail n. The default
+                    value is 16.
   --verbose         Show details
   --noverbose       Don't show details
   -v, --version	    Print the version of irb
diff --git a/lib/irb/lc/ja/error.rb b/lib/irb/lc/ja/error.rb
index 919363154c..31ebb3b5f0 100644
--- a/lib/irb/lc/ja/error.rb
+++ b/lib/irb/lc/ja/error.rb
@@ -9,23 +9,64 @@
 #
 #
 #
-require "e2mmap"
 
 # :stopdoc:
 module IRB
-  # exceptions
-  extend Exception2MessageMapper
-  def_exception :UnrecognizedSwitch, 'スイッチ(%s)が分りません'
-  def_exception :NotImplementedError, '`%s\'の定義が必要です'
-  def_exception :CantReturnToNormalMode, 'Normalモードに戻れません.'
-  def_exception :IllegalParameter, 'パラメータ(%s)が間違っています.'
-  def_exception :IrbAlreadyDead, 'Irbは既に死んでいます.'
-  def_exception :IrbSwitchedToCurrentThread, 'カレントスレッドに切り替わりました.'
-  def_exception :NoSuchJob, 'そのようなジョブ(%s)はありません.'
-  def_exception :CantShiftToMultiIrbMode, 'multi-irb modeに移れません.'
-  def_exception :CantChangeBinding, 'バインディング(%s)に変更できません.'
-  def_exception :UndefinedPromptMode, 'プロンプトモード(%s)は定義されていません.'
-  def_exception :IllegalRCNameGenerator, 'RC_NAME_GENERATORが正しく定義されていません.'
+  class UnrecognizedSwitch < StandardError
+    def initialize(val)
+      super("スイッチ(#{val})が分りません")
+    end
+  end
+  class NotImplementedError < StandardError
+    def initialize(val)
+      super("`#{val}'の定義が必要です")
+    end
+  end
+  class CantReturnToNormalMode < StandardError
+    def initialize
+      super("Normalモードに戻れません.")
+    end
+  end
+  class IllegalParameter < StandardError
+    def initialize(val)
+      super("パラメータ(#{val})が間違っています.")
+    end
+  end
+  class IrbAlreadyDead < StandardError
+    def initialize
+      super("Irbは既に死んでいます.")
+    end
+  end
+  class IrbSwitchedToCurrentThread < StandardError
+    def initialize
+      super("カレントスレッドに切り替わりました.")
+    end
+  end
+  class NoSuchJob < StandardError
+    def initialize(val)
+      super("そのようなジョブ(#{val})はありません.")
+    end
+  end
+  class CantShiftToMultiIrbMode < StandardError
+    def initialize
+      super("multi-irb modeに移れません.")
+    end
+  end
+  class CantChangeBinding < StandardError
+    def initialize(val)
+      super("バインディング(#{val})に変更できません.")
+    end
+  end
+  class UndefinedPromptMode < StandardError
+    def initialize(val)
+      super("プロンプトモード(#{val})は定義されていません.")
+    end
+  end
+  class IllegalRCGenerator < StandardError
+    def initialize
+      super("RC_NAME_GENERATORが正しく定義されていません.")
+    end
+  end
 end
 # :startdoc:
 # vim:fileencoding=utf-8
diff --git a/lib/irb/lc/ja/help-message b/lib/irb/lc/ja/help-message
index 288eb5245c..9794a8e24e 100644
--- a/lib/irb/lc/ja/help-message
+++ b/lib/irb/lc/ja/help-message
@@ -10,7 +10,6 @@
 #
 Usage:  irb.rb [options] [programfile] [arguments]
   -f		    ~/.irbrc を読み込まない.
-  -m		    bcモード(分数, 行列の計算ができる)
   -d                $DEBUG をtrueにする(ruby -d と同じ)
   -r load-module    ruby -r と同じ.
   -I path           $LOAD_PATH に path を追加する.
@@ -22,16 +21,21 @@ Usage:  irb.rb [options] [programfile] [arguments]
 		    オブジェクトの作成方法を 0 から 3 のいずれかに設定する.
   --echo	    実行結果を表示する(デフォルト).
   --noecho	    実行結果を表示しない.
-  --inspect	    結果出力にinspectを用いる(bcモード以外はデフォルト).
+  --inspect	    結果出力にinspectを用いる.
   --noinspect	    結果出力にinspectを用いない.
-  --readline	    readlineライブラリを利用する.
-  --noreadline	    readlineライブラリを利用しない.
+  --multiline       マルチラインエディタを利用する.
+  --nomultiline     マルチラインエディタを利用しない.
+  --singleline      シングルラインエディタを利用する.
+  --nosingleline    シングルラインエディタを利用しない.
+  --colorize	    色付けを利用する.
+  --nocolorize	    色付けを利用しない.
   --prompt prompt-mode/--prompt-mode prompt-mode
 		    プロンプトモードを切替えます. 現在定義されているプ
 		    ロンプトモードは, default, simple, xmp, inf-rubyが
 		    用意されています.
   --inf-ruby-mode   emacsのinf-ruby-mode用のプロンプト表示を行なう. 特
-		    に指定がない限り, readlineライブラリは使わなくなる.
+                    に指定がない限り, シングルラインエディタとマルチラ
+                    インエディタは使わなくなる.
   --sample-book-mode/--simple-prompt
 		    非常にシンプルなプロンプトを用いるモードです.
   --noprompt	    プロンプト表示を行なわない.
@@ -42,8 +46,6 @@ Usage:  irb.rb [options] [programfile] [arguments]
 		    バックトレース表示をバックトレースの頭から n, 後ろ
 		    からnだけ行なう. デフォルトは16
 
-  --irb_debug n	    irbのデバッグレベルをnに設定する(非推奨).
-
   --verbose	    詳細なメッセージを出力する.
   --noverbose	    詳細なメッセージを出力しない(デフォルト).
   -v, --version	    irbのバージョンを表示する.
diff --git a/lib/irb/locale.rb b/lib/irb/locale.rb
index df540c8cbb..bb44b41002 100644
--- a/lib/irb/locale.rb
+++ b/lib/irb/locale.rb
@@ -21,8 +21,10 @@ module IRB # :nodoc:
     LOCALE_DIR = "/lc/"
 
     @@legacy_encoding_alias_map = {}.freeze
+    @@loaded = []
 
     def initialize(locale = nil)
+      @override_encoding = nil
       @lang = @territory = @encoding_name = @modifier = nil
       @locale = locale || ENV["IRB_LANG"] || ENV["LC_MESSAGES"] || ENV["LC_ALL"] || ENV["LANG"] || "C"
       if m = LOCALE_NAME_RE.match(@locale)
@@ -31,7 +33,7 @@ module IRB # :nodoc:
         if @encoding_name
           begin load 'irb/encoding_aliases.rb'; rescue LoadError; end
           if @encoding = @@legacy_encoding_alias_map[@encoding_name]
-            warn "%s is obsolete. use %s" % ["#{@lang}_#{@territory}.#{@encoding_name}", "#{@lang}_#{@territory}.#{@encoding.name}"]
+            warn(("%s is obsolete. use %s" % ["#{@lang}_#{@territory}.#{@encoding_name}", "#{@lang}_#{@territory}.#{@encoding.name}"]), uplevel: 1)
           end
           @encoding = Encoding.find(@encoding_name) rescue nil
         end
@@ -39,12 +41,16 @@ module IRB # :nodoc:
       @encoding ||= (Encoding.find('locale') rescue Encoding::ASCII_8BIT)
     end
 
-    attr_reader :lang, :territory, :encoding, :modifier
+    attr_reader :lang, :territory, :modifier
+
+    def encoding
+      @override_encoding || @encoding
+    end
 
     def String(mes)
       mes = super(mes)
-      if @encoding
-        mes.encode(@encoding, undef: :replace)
+      if encoding
+        mes.encode(encoding, undef: :replace)
       else
         mes
       end
@@ -107,7 +113,10 @@ module IRB # :nodoc:
     def load(file, priv=nil)
       found = find(file)
       if found
-        return real_load(found, priv)
+        unless @@loaded.include?(found)
+          @@loaded << found # cache
+          return real_load(found, priv)
+        end
       else
         raise LoadError, "No such file to load -- #{file}"
       end
diff --git a/lib/irb/magic-file.rb b/lib/irb/magic-file.rb
index 2dee684657..34e06d64b3 100644
--- a/lib/irb/magic-file.rb
+++ b/lib/irb/magic-file.rb
@@ -10,7 +10,7 @@ module IRB
       line = io.gets if line[0,2] == "#!"
       encoding = detect_encoding(line)
       internal_encoding = encoding
-      encoding ||= default_src_encoding
+      encoding ||= IRB.default_src_encoding
       io.rewind
       io.set_encoding(encoding, internal_encoding)
 
diff --git a/lib/irb/notifier.rb b/lib/irb/notifier.rb
index 9d8de82e69..d0e413dd68 100644
--- a/lib/irb/notifier.rb
+++ b/lib/irb/notifier.rb
@@ -10,17 +10,21 @@
 #
 #
 
-require "e2mmap"
-require "irb/output-method"
+require_relative "output-method"
 
 module IRB
   # An output formatter used internally by the lexer.
   module Notifier
-    extend Exception2MessageMapper
-    def_exception :ErrUndefinedNotifier,
-      "undefined notifier level: %d is specified"
-    def_exception :ErrUnrecognizedLevel,
-      "unrecognized notifier level: %s is specified"
+    class ErrUndefinedNotifier < StandardError
+      def initialize(val)
+        super("undefined notifier level: #{val} is specified")
+      end
+    end
+    class ErrUnrecognizedLevel < StandardError
+      def initialize(val)
+        super("unrecognized notifier level: #{val} is specified")
+      end
+    end
 
     # Define a new Notifier output source, returning a new CompositeNotifier
     # with the given +prefix+ and +output_method+.
@@ -113,7 +117,7 @@ module IRB
     # create a new composite notifier. Using the first composite notifier
     # object you create, sibling notifiers can be initialized with
     # #def_notifier.
-    class CompositeNotifier<AbstractNotifier
+    class CompositeNotifier < AbstractNotifier
       # Create a new composite notifier object with the given +prefix+, and
       # +base_notifier+ to use for output.
       def initialize(prefix, base_notifier)
@@ -162,10 +166,10 @@ module IRB
           @level_notifier = value
         when Integer
           l = @notifiers[value]
-          Notifier.Raise ErrUndefinedNotifier, value unless l
+          raise ErrUndefinedNotifier, value unless l
           @level_notifier = l
         else
-          Notifier.Raise ErrUnrecognizedLevel, value unless l
+          raise ErrUnrecognizedLevel, value unless l
         end
       end
 
@@ -174,7 +178,7 @@ module IRB
 
     # A leveled notifier is comparable to the composite group from
     # CompositeNotifier#notifiers.
-    class LeveledNotifier<AbstractNotifier
+    class LeveledNotifier < AbstractNotifier
       include Comparable
 
       # Create a new leveled notifier with the given +base+, and +prefix+ to
@@ -212,7 +216,7 @@ module IRB
     #
     # This notifier is used as the +zero+ index, or level +0+, for
     # CompositeNotifier#notifiers, and will not output messages of any sort.
-    class NoMsgNotifier<LeveledNotifier
+    class NoMsgNotifier < LeveledNotifier
       # Creates a new notifier that should not be used to output messages.
       def initialize
         @base_notifier = nil
diff --git a/lib/irb/output-method.rb b/lib/irb/output-method.rb
index 7d64851698..3fda708cb0 100644
--- a/lib/irb/output-method.rb
+++ b/lib/irb/output-method.rb
@@ -10,21 +10,21 @@
 #
 #
 
-require "e2mmap"
-
 module IRB
   # An abstract output class for IO in irb. This is mainly used internally by
   # IRB::Notifier. You can define your own output method to use with Irb.new,
   # or Context.new
   class OutputMethod
-    extend Exception2MessageMapper
-    def_exception :NotImplementedError, "Need to define `%s'"
-
+    class NotImplementedError < StandardError
+      def initialize(val)
+        super("Need to define `#{val}'")
+      end
+    end
 
     # Open this method to implement your own output method, raises a
     # NotImplementedError if you don't define #print in your own class.
     def print(*opts)
-      OutputMethod.Raise NotImplementedError, "print"
+      raise NotImplementedError, "print"
     end
 
     # Prints the given +opts+, with a newline delimiter.
@@ -82,7 +82,7 @@ module IRB
   end
 
   # A standard output printer
-  class StdioOutputMethod<OutputMethod
+  class StdioOutputMethod < OutputMethod
     # Prints the given +opts+ to standard output, see IO#print for more
     # information.
     def print(*opts)
diff --git a/lib/irb/ruby-lex.rb b/lib/irb/ruby-lex.rb
index 879c45c565..82df06da2b 100644
--- a/lib/irb/ruby-lex.rb
+++ b/lib/irb/ruby-lex.rb
@@ -10,74 +10,98 @@
 #
 #
 
-require "e2mmap"
-require "irb/slex"
-require "irb/ruby-token"
+require "ripper"
+require "jruby" if RUBY_ENGINE == "jruby"
 
 # :stopdoc:
 class RubyLex
 
-  extend Exception2MessageMapper
-  def_exception(:AlreadyDefinedToken, "Already defined token(%s)")
-  def_exception(:TkReading2TokenNoKey, "key nothing(key='%s')")
-  def_exception(:TkSymbol2TokenNoKey, "key nothing(key='%s')")
-  def_exception(:TkReading2TokenDuplicateError,
-                "key duplicate(token_n='%s', key='%s')")
-  def_exception(:SyntaxError, "%s")
-
-  def_exception(:TerminateLineInput, "Terminate Line Input")
-
-  include RubyToken
-
-  class << self
-    attr_accessor :debug_level
-    def debug?
-      @debug_level > 0
+  class TerminateLineInput < StandardError
+    def initialize
+      super("Terminate Line Input")
     end
   end
-  @debug_level = 0
 
   def initialize
-    lex_init
-    set_input(STDIN)
-
-    @seek = 0
     @exp_line_no = @line_no = 1
-    @base_char_no = 0
-    @char_no = 0
-    @rests = []
-    @readed = []
-    @here_readed = []
-
     @indent = 0
-    @indent_stack = []
-    @lex_state = EXPR_BEG
-    @space_seen = false
-    @here_header = false
-    @post_symbeg = false
-
     @continue = false
     @line = ""
-
-    @skip_space = false
-    @readed_auto_clean_up = false
-    @exception_on_syntax_error = true
-
     @prompt = nil
   end
 
-  attr_accessor :skip_space
-  attr_accessor :readed_auto_clean_up
-  attr_accessor :exception_on_syntax_error
-
-  attr_reader :seek
-  attr_reader :char_no
-  attr_reader :line_no
-  attr_reader :indent
+  def self.compile_with_errors_suppressed(code)
+    line_no = 1
+    begin
+      result = yield code, line_no
+    rescue ArgumentError
+      code = ";\n#{code}"
+      line_no = 0
+      result = yield code, line_no
+    end
+    result
+  end
 
   # io functions
   def set_input(io, p = nil, &block)
     @io = io
+    if @io.respond_to?(:check_termination)
+      @io.check_termination do |code|
+        if Reline::IOGate.in_pasting?
+          lex = RubyLex.new
+          rest = lex.check_termination_in_prev_line(code)
+          if rest
+            Reline.delete_text
+            rest.bytes.reverse_each do |c|
+              Reline.ungetc(c)
+            end
+            true
+          else
+            false
+          end
+        else
+          code.gsub!(/\s*\z/, '').concat("\n")
+          ltype, indent, continue, code_block_open = check_state(code)
+          if ltype or indent > 0 or continue or code_block_open
+            false
+          else
+            true
+          end
+        end
+      end
+    end
+    if @io.respond_to?(:dynamic_prompt)
+      @io.dynamic_prompt do |lines|
+        lines << '' if lines.empty?
+        result = []
+        tokens = self.class.ripper_lex_without_warning(lines.map{ |l| l + "\n" }.join)
+        code = String.new
+        partial_tokens = []
+        unprocessed_tokens = []
+        line_num_offset = 0
+        tokens.each do |t|
+          partial_tokens << t
+          unprocessed_tokens << t
+          if t[2].include?("\n")
+            t_str = t[2]
+            t_str.each_line("\n") do |s|
+              code << s << "\n"
+              ltype, indent, continue, code_block_open = check_state(code, partial_tokens)
+              result << @prompt.call(ltype, indent, continue || code_block_open, @line_no + line_num_offset)
+              line_num_offset += 1
+            end
+            unprocessed_tokens = []
+          else
+            code << t[2]
+          end
+        end
+        unless unprocessed_tokens.empty?
+          ltype, indent, continue, code_block_open = check_state(code, unprocessed_tokens)
+          result << @prompt.call(ltype, indent, continue || code_block_open, @line_no + line_num_offset)
+        end
+        result
+      end
+    end
     if p.respond_to?(:call)
       @input = p
     elsif block_given?
@@ -87,119 +111,105 @@ class RubyLex
     end
   end
 
-  def get_readed
-    if idx = @readed.rindex("\n")
-      @base_char_no = @readed.size - (idx + 1)
-    else
-      @base_char_no += @readed.size
-    end
-
-    readed = @readed.join("")
-    @readed = []
-    readed
-  end
-
-  def getc
-    while @rests.empty?
-      @rests.push nil unless buf_input
-    end
-    c = @rests.shift
-    if @here_header
-      @here_readed.push c
-    else
-      @readed.push c
-    end
-    @seek += 1
-    if c == "\n"
-      @line_no += 1
-      @char_no = 0
+  def set_prompt(p = nil, &block)
+    p = block if block_given?
+    if p.respond_to?(:call)
+      @prompt = p
     else
-      @char_no += 1
-    end
-    c
-  end
-
-  def gets
-    l = ""
-    while c = getc
-      l.concat(c)
-      break if c == "\n"
+      @prompt = Proc.new{print p}
     end
-    return nil if l == "" and c.nil?
-    l
   end
 
-  def eof?
-    @io.eof?
-  end
-
-  def getc_of_rests
-    if @rests.empty?
-      nil
-    else
-      getc
-    end
-  end
+  ERROR_TOKENS = [
+    :on_parse_error,
+    :compile_error,
+    :on_assign_error,
+    :on_alias_error,
+    :on_class_name_error,
+    :on_param_error
+  ]
 
-  def ungetc(c = nil)
-    if @here_readed.empty?
-      c2 = @readed.pop
-    else
-      c2 = @here_readed.pop
-    end
-    c = c2 unless c
-    @rests.unshift c #c =
-    @seek -= 1
-    if c == "\n"
-      @line_no -= 1
-      if idx = @readed.rindex("\n")
-        @char_no = idx + 1
+  def self.ripper_lex_without_warning(code)
+    verbose, $VERBOSE = $VERBOSE, nil
+    tokens = nil
+    compile_with_errors_suppressed(code) do |inner_code, line_no|
+      lexer = Ripper::Lexer.new(inner_code, '-', line_no)
+      if lexer.respond_to?(:scan) # Ruby 2.7+
+        tokens = []
+        pos_to_index = {}
+        lexer.scan.each do |t|
+          if pos_to_index.has_key?(t[0])
+            index = pos_to_index[t[0]]
+            found_tk = tokens[index]
+            if ERROR_TOKENS.include?(found_tk[1]) && !ERROR_TOKENS.include?(t[1])
+              tokens[index] = t
+            end
+          else
+            pos_to_index[t[0]] = tokens.size
+            tokens << t
+          end
+        end
       else
-        @char_no = @base_char_no + @readed.size
+        tokens = lexer.parse
       end
-    else
-      @char_no -= 1
     end
+    tokens
+  ensure
+    $VERBOSE = verbose
   end
 
-  def peek_equal?(str)
-    chrs = str.split(//)
-    until @rests.size >= chrs.size
-      return false unless buf_input
-    end
-    @rests[0, chrs.size] == chrs
-  end
-
-  def peek_match?(regexp)
-    while @rests.empty?
-      return false unless buf_input
+  def find_prev_spaces(line_index)
+    return 0 if @tokens.size == 0
+    md = @tokens[0][2].match(/(\A +)/)
+    prev_spaces = md.nil? ? 0 : md[1].count(' ')
+    line_count = 0
+    @tokens.each_with_index do |t, i|
+      if t[2].include?("\n")
+        line_count += t[2].count("\n")
+        if line_count >= line_index
+          return prev_spaces
+        end
+        if (@tokens.size - 1) > i
+          md = @tokens[i + 1][2].match(/(\A +)/)
+          prev_spaces = md.nil? ? 0 : md[1].count(' ')
+        end
+      end
     end
-    regexp =~ @rests.join("")
+    prev_spaces
   end
 
-  def peek(i = 0)
-    while @rests.size <= i
-      return nil unless buf_input
+  def set_auto_indent(context)
+    if @io.respond_to?(:auto_indent) and context.auto_indent_mode
+      @io.auto_indent do |lines, line_index, byte_pointer, is_newline|
+        if is_newline
+          @tokens = self.class.ripper_lex_without_warning(lines[0..line_index].join("\n"))
+          prev_spaces = find_prev_spaces(line_index)
+          depth_difference = check_newline_depth_difference
+          depth_difference = 0 if depth_difference < 0
+          prev_spaces + depth_difference * 2
+        else
+          code = line_index.zero? ? '' : lines[0..(line_index - 1)].map{ |l| l + "\n" }.join
+          last_line = lines[line_index]&.byteslice(0, byte_pointer)
+          code += last_line if last_line
+          @tokens = self.class.ripper_lex_without_warning(code)
+          corresponding_token_depth = check_corresponding_token_depth
+          if corresponding_token_depth
+            corresponding_token_depth
+          else
+            nil
+          end
+        end
+      end
     end
-    @rests[i]
   end
 
-  def buf_input
-    prompt
-    line = @input.call
-    return nil unless line
-    @rests.concat line.chars.to_a
-    true
-  end
-  private :buf_input
-
-  def set_prompt(p = nil, &block)
-    p = block if block_given?
-    if p.respond_to?(:call)
-      @prompt = p
-    else
-      @prompt = Proc.new{print p}
-    end
+  def check_state(code, tokens = nil)
+    tokens = self.class.ripper_lex_without_warning(code) unless tokens
+    ltype = process_literal_type(tokens)
+    indent = process_nesting_level(tokens)
+    continue = process_continue(tokens)
+    code_block_open = check_code_block(code, tokens)
+    [ltype, indent, continue, code_block_open]
   end
 
   def prompt
@@ -210,20 +220,11 @@ class RubyLex
 
   def initialize_input
     @ltype = nil
-    @quoted = nil
     @indent = 0
-    @indent_stack = []
-    @lex_state = EXPR_BEG
-    @space_seen = false
-    @here_header = false
-
     @continue = false
-    @post_symbeg = false
-
-    prompt
-
     @line = ""
     @exp_line_no = @line_no
+    @code_block_open = false
   end
 
   def each_top_level_statement
@@ -231,13 +232,17 @@ class RubyLex
     catch(:TERM_INPUT) do
       loop do
         begin
-          @continue = false
           prompt
           unless l = lex
             throw :TERM_INPUT if @line == ''
           else
+            @line_no += l.count("\n")
+            if l == "\n"
+              @exp_line_no += 1
+              next
+            end
             @line.concat l
-            if @ltype or @continue or @indent > 0
+            if @code_block_open or @ltype or @continue or @indent > 0
               next
             end
           end
@@ -245,927 +250,553 @@ class RubyLex
             @line.force_encoding(@io.encoding)
             yield @line, @exp_line_no
           end
-          break unless l
+          raise TerminateLineInput if @io.eof?
           @line = ''
           @exp_line_no = @line_no
 
           @indent = 0
-          @indent_stack = []
-          prompt
         rescue TerminateLineInput
           initialize_input
           prompt
-          get_readed
         end
       end
     end
   end
 
   def lex
-    until (((tk = token).kind_of?(TkNL) || tk.kind_of?(TkEND_OF_SCRIPT)) &&
-        !@continue or
-        tk.nil?)
-    end
-    line = get_readed
-    if line == "" and tk.kind_of?(TkEND_OF_SCRIPT) || tk.nil?
-      nil
-    else
-      line
-    end
+    line = @input.call
+    if @io.respond_to?(:check_termination)
+      return line # multiline
+    end
+    code = @line + (line.nil? ? '' : line)
+    code.gsub!(/\s*\z/, '').concat("\n")
+    @tokens = self.class.ripper_lex_without_warning(code)
+    @continue = process_continue
+    @code_block_open = check_code_block(code)
+    @indent = process_nesting_level
+    @ltype = process_literal_type
+    line
   end
 
-  def token
-    @prev_seek = @seek
-    @prev_line_no = @line_no
-    @prev_char_no = @char_no
-    begin
-      begin
-        tk = @OP.match(self)
-        @space_seen = tk.kind_of?(TkSPACE)
-        @lex_state = EXPR_END if @post_symbeg && tk.kind_of?(TkOp)
-        @post_symbeg = tk.kind_of?(TkSYMBEG)
-      rescue SyntaxError
-        raise if @exception_on_syntax_error
-        tk = TkError.new(@seek, @line_no, @char_no)
-      end
-    end while @skip_space and tk.kind_of?(TkSPACE)
-    if @readed_auto_clean_up
-      get_readed
-    end
-    tk
+  def process_continue(tokens = @tokens)
+    # last token is always newline
+    if tokens.size >= 2 and tokens[-2][1] == :on_regexp_end
+      # end of regexp literal
+      return false
+    elsif tokens.size >= 2 and tokens[-2][1] == :on_semicolon
+      return false
+    elsif tokens.size >= 2 and tokens[-2][1] == :on_kw and ['begin', 'else', 'ensure'].include?(tokens[-2][2])
+      return false
+    elsif !tokens.empty? and tokens.last[2] == "\\\n"
+      return true
+    elsif tokens.size >= 1 and tokens[-1][1] == :on_heredoc_end # "EOH\n"
+      return false
+    elsif tokens.size >= 2 and defined?(Ripper::EXPR_BEG) and tokens[-2][3].anybits?(Ripper::EXPR_BEG | Ripper::EXPR_FNAME) and tokens[-2][2] !~ /\A\.\.\.?\z/
+      # end of literal except for regexp
+      # endless range at end of line is not a continue
+      return true
+    end
+    false
   end
 
-  ENINDENT_CLAUSE = [
-    "case", "class", "def", "do", "for", "if",
-    "module", "unless", "until", "while", "begin"
-  ]
-  DEINDENT_CLAUSE = ["end"
-  ]
-
-  PERCENT_LTYPE = {
-    "q" => "\'",
-    "Q" => "\"",
-    "x" => "\`",
-    "r" => "/",
-    "w" => "]",
-    "W" => "]",
-    "i" => "]",
-    "I" => "]",
-    "s" => ":"
-  }
-
-  PERCENT_PAREN = {
-    "{" => "}",
-    "[" => "]",
-    "<" => ">",
-    "(" => ")"
-  }
-
-  Ltype2Token = {
-    "\'" => TkSTRING,
-    "\"" => TkSTRING,
-    "\`" => TkXSTRING,
-    "/" => TkREGEXP,
-    "]" => TkDSTRING,
-    ":" => TkSYMBOL
-  }
-  DLtype2Token = {
-    "\"" => TkDSTRING,
-    "\`" => TkDXSTRING,
-    "/" => TkDREGEXP,
-  }
-
-  def lex_init()
-    @OP = IRB::SLex.new
-    @OP.def_rules("\0", "\004", "\032") do |op, io|
-      Token(TkEND_OF_SCRIPT)
-    end
-
-    @OP.def_rules(" ", "\t", "\f", "\r", "\13") do |op, io|
-      @space_seen = true
-      while getc =~ /[ \t\f\r\13]/; end
-      ungetc
-      Token(TkSPACE)
-    end
-
-    @OP.def_rule("#") do |op, io|
-      identify_comment
+  def check_code_block(code, tokens = @tokens)
+    return true if tokens.empty?
+    if tokens.last[1] == :on_heredoc_beg
+      return true
     end
 
-    @OP.def_rule("=begin",
-                 proc{|op, io| @prev_char_no == 0 && peek(0) =~ /\s/}) do
-      |op, io|
-      @ltype = "="
-      until getc == "\n"; end
-      until peek_equal?("=end") && peek(4) =~ /\s/
-        until getc == "\n"; end
-      end
-      gets
-      @ltype = nil
-      Token(TkRD_COMMENT)
-    end
-
-    @OP.def_rule("\n") do |op, io|
-      print "\\n\n" if RubyLex.debug?
-      case @lex_state
-      when EXPR_BEG, EXPR_FNAME, EXPR_DOT
-        @continue = true
-      else
-        @continue = false
-        @lex_state = EXPR_BEG
-        until (@indent_stack.empty? ||
-            [TkLPAREN, TkLBRACK, TkLBRACE,
-             TkfLPAREN, TkfLBRACK, TkfLBRACE].include?(@indent_stack.last))
-          @indent_stack.pop
+    begin # check if parser error are available
+      verbose, $VERBOSE = $VERBOSE, nil
+      case RUBY_ENGINE
+      when 'ruby'
+        self.class.compile_with_errors_suppressed(code) do |inner_code, line_no|
+          RubyVM::InstructionSequence.compile(inner_code, nil, nil, line_no)
         end
-      end
-      @here_header = false
-      @here_readed = []
-      Token(TkNL)
-    end
-
-    @OP.def_rules("*", "**",
-                  "=", "==", "===",
-                  "=~", "<=>",
-                  "<", "<=",
-                  ">", ">=", ">>",
-                  "!", "!=", "!~") do
-      |op, io|
-      case @lex_state
-      when EXPR_FNAME, EXPR_DOT
-        @lex_state = EXPR_ARG
+      when 'jruby'
+        JRuby.compile_ir(code)
       else
-        @lex_state = EXPR_BEG
-      end
-      Token(op)
-    end
-
-    @OP.def_rules("<<") do
-      |op, io|
-      tk = nil
-      if @lex_state != EXPR_END && @lex_state != EXPR_CLASS &&
-          (@lex_state != EXPR_ARG || @space_seen)
-        c = peek(0)
-        if /\S/ =~ c && (/["'`]/ =~ c || /\w/ =~ c || c == "-" || c == "~")
-          tk = identify_here_document
+        catch(:valid) do
+          eval("BEGIN { throw :valid, true }\n#{code}")
+          false
         end
       end
-      unless tk
-        tk = Token(op)
-        case @lex_state
-        when EXPR_FNAME, EXPR_DOT
-          @lex_state = EXPR_ARG
-        else
-          @lex_state = EXPR_BEG
-        end
+    rescue EncodingError
+      # This is for a hash with invalid encoding symbol, {"\xAE": 1}
+    rescue SyntaxError => e
+      case e.message
+      when /unterminated (?:string|regexp) meets end of file/
+        # "unterminated regexp meets end of file"
+        #
+        #   example:
+        #     /
+        #
+        # "unterminated string meets end of file"
+        #
+        #   example:
+        #     '
+        return true
+      when /syntax error, unexpected end-of-input/
+        # "syntax error, unexpected end-of-input, expecting keyword_end"
+        #
+        #   example:
+        #     if ture
+        #       hoge
+        #       if false
+        #         fuga
+        #       end
+        return true
+      when /syntax error, unexpected keyword_end/
+        # "syntax error, unexpected keyword_end"
+        #
+        #   example:
+        #     if (
+        #     end
+        #
+        #   example:
+        #     end
+        return false
+      when /syntax error, unexpected '\.'/
+        # "syntax error, unexpected '.'"
+        #
+        #   example:
+        #     .
+        return false
+      when /unexpected tREGEXP_BEG/
+        # "syntax error, unexpected tREGEXP_BEG, expecting keyword_do or '{' or '('"
+        #
+        #   example:
+        #     method / f /
+        return false
       end
-      tk
-    end
-
-    @OP.def_rules("'", '"') do
-      |op, io|
-      identify_string(op)
+    ensure
+      $VERBOSE = verbose
     end
 
-    @OP.def_rules("`") do
-      |op, io|
-      if @lex_state == EXPR_FNAME
-        @lex_state = EXPR_END
-        Token(op)
-      else
-        identify_string(op)
+    if defined?(Ripper::EXPR_BEG)
+      last_lex_state = tokens.last[3]
+      if last_lex_state.allbits?(Ripper::EXPR_BEG)
+        return false
+      elsif last_lex_state.allbits?(Ripper::EXPR_DOT)
+        return true
+      elsif last_lex_state.allbits?(Ripper::EXPR_CLASS)
+        return true
+      elsif last_lex_state.allbits?(Ripper::EXPR_FNAME)
+        return true
+      elsif last_lex_state.allbits?(Ripper::EXPR_VALUE)
+        return true
+      elsif last_lex_state.allbits?(Ripper::EXPR_ARG)
+        return false
       end
     end
 
-    @OP.def_rules('?') do
-      |op, io|
-      if @lex_state == EXPR_END
-        @lex_state = EXPR_BEG
-        Token(TkQUESTION)
+    false
+  end
+
+  def process_nesting_level(tokens = @tokens)
+    indent = 0
+    in_oneliner_def = nil
+    tokens.each_with_index { |t, index|
+      # detecting one-liner method definition
+      if in_oneliner_def.nil?
+        if t[3].allbits?(Ripper::EXPR_ENDFN)
+          in_oneliner_def = :ENDFN
+        end
       else
-        ch = getc
-        if @lex_state == EXPR_ARG && ch =~ /\s/
-          ungetc
-          @lex_state = EXPR_BEG;
-          Token(TkQUESTION)
+        if t[3].allbits?(Ripper::EXPR_ENDFN)
+          # continuing
+        elsif t[3].allbits?(Ripper::EXPR_BEG)
+          if t[2] == '='
+            in_oneliner_def = :BODY
+          end
         else
-          if (ch == '\\')
-            read_escape
+          if in_oneliner_def == :BODY
+            # one-liner method definition
+            indent -= 1
           end
-          @lex_state = EXPR_END
-          Token(TkINTEGER)
+          in_oneliner_def = nil
         end
       end
-    end
 
-    @OP.def_rules("&", "&&", "|", "||") do
-      |op, io|
-      @lex_state = EXPR_BEG
-      Token(op)
-    end
-
-    @OP.def_rules("+=", "-=", "*=", "**=",
-                  "&=", "|=", "^=", "<<=", ">>=", "||=", "&&=") do
-      |op, io|
-      @lex_state = EXPR_BEG
-      op =~ /^(.*)=$/
-      Token(TkOPASGN, $1)
-    end
-
-    @OP.def_rule("+@", proc{|op, io| @lex_state == EXPR_FNAME}) do
-      |op, io|
-      @lex_state = EXPR_ARG
-      Token(op)
-    end
-
-    @OP.def_rule("-@", proc{|op, io| @lex_state == EXPR_FNAME}) do
-      |op, io|
-      @lex_state = EXPR_ARG
-      Token(op)
-    end
-
-    @OP.def_rules("+", "-") do
-      |op, io|
-      catch(:RET) do
-        if @lex_state == EXPR_ARG
-          if @space_seen and peek(0) =~ /[0-9]/
-            throw :RET, identify_number
-          else
-            @lex_state = EXPR_BEG
-          end
-        elsif @lex_state != EXPR_END and peek(0) =~ /[0-9]/
-          throw :RET, identify_number
-        else
-          @lex_state = EXPR_BEG
+      case t[1]
+      when :on_lbracket, :on_lbrace, :on_lparen, :on_tlambeg
+        indent += 1
+      when :on_rbracket, :on_rbrace, :on_rparen
+        indent -= 1
+      when :on_kw
+        next if index > 0 and tokens[index - 1][3].allbits?(Ripper::EXPR_FNAME)
+        case t[2]
+        when 'do'
+          syntax_of_do = take_corresponding_syntax_to_kw_do(tokens, index)
+          indent += 1 if syntax_of_do == :method_calling
+        when 'def', 'case', 'for', 'begin', 'class', 'module'
+          indent += 1
+        when 'if', 'unless', 'while', 'until'
+          # postfix if/unless/while/until must be Ripper::EXPR_LABEL
+          indent += 1 unless t[3].allbits?(Ripper::EXPR_LABEL)
+        when 'end'
+          indent -= 1
         end
-        Token(op)
-      end
-    end
-
-    @OP.def_rule(".") do
-      |op, io|
-      @lex_state = EXPR_BEG
-      if peek(0) =~ /[0-9]/
-        ungetc
-        identify_number
-      else
-        # for "obj.if" etc.
-        @lex_state = EXPR_DOT
-        Token(TkDOT)
       end
-    end
-
-    @OP.def_rules("..", "...") do
-      |op, io|
-      @lex_state = EXPR_BEG
-      Token(op)
-    end
-
-    lex_int2
+      # percent literals are not indented
+    }
+    indent
   end
 
-  def lex_int2
-    @OP.def_rules("]", "}", ")") do
-      |op, io|
-      @lex_state = EXPR_END
-      @indent -= 1
-      @indent_stack.pop
-      Token(op)
-    end
-
-    @OP.def_rule(":") do
-      |op, io|
-      if @lex_state == EXPR_END || peek(0) =~ /\s/
-        @lex_state = EXPR_BEG
-        Token(TkCOLON)
-      else
-        @lex_state = EXPR_FNAME
-        Token(TkSYMBEG)
-      end
-    end
-
-    @OP.def_rule("::") do
-       |op, io|
-      if @lex_state == EXPR_BEG or @lex_state == EXPR_ARG && @space_seen
-        @lex_state = EXPR_BEG
-        Token(TkCOLON3)
-      else
-        @lex_state = EXPR_DOT
-        Token(TkCOLON2)
-      end
-    end
-
-    @OP.def_rule("/") do
-      |op, io|
-      if @lex_state == EXPR_BEG || @lex_state == EXPR_MID
-        identify_string(op)
-      elsif peek(0) == '='
-        getc
-        @lex_state = EXPR_BEG
-        Token(TkOPASGN, "/") #/)
-      elsif @lex_state == EXPR_ARG and @space_seen and peek(0) !~ /\s/
-        identify_string(op)
-      else
-        @lex_state = EXPR_BEG
-        Token("/") #/)
-      end
-    end
-
-    @OP.def_rules("^") do
-      |op, io|
-      @lex_state = EXPR_BEG
-      Token("^")
-    end
-
-    @OP.def_rules(",") do
-      |op, io|
-      @lex_state = EXPR_BEG
-      Token(op)
-    end
-
-    @OP.def_rules(";") do
-      |op, io|
-      @lex_state = EXPR_BEG
-      until (@indent_stack.empty? ||
-          [TkLPAREN, TkLBRACK, TkLBRACE,
-           TkfLPAREN, TkfLBRACK, TkfLBRACE].include?(@indent_stack.last))
-        @indent_stack.pop
-      end
-      Token(op)
-    end
-
-    @OP.def_rule("~") do
-      |op, io|
-      @lex_state = EXPR_BEG
-      Token("~")
-    end
-
-    @OP.def_rule("~@", proc{|op, io| @lex_state == EXPR_FNAME}) do
-      |op, io|
-      @lex_state = EXPR_BEG
-      Token("~")
-    end
-
-    @OP.def_rule("(") do
-      |op, io|
-      @indent += 1
-      if @lex_state == EXPR_BEG || @lex_state == EXPR_MID
-        @lex_state = EXPR_BEG
-        tk_c = TkfLPAREN
-      else
-        @lex_state = EXPR_BEG
-        tk_c = TkLPAREN
-      end
-      @indent_stack.push tk_c
-      Token(tk_c)
-    end
-
-    @OP.def_rule("[]", proc{|op, io| @lex_state == EXPR_FNAME}) do
-      |op, io|
-      @lex_state = EXPR_ARG
-      Token("[]")
-    end
-
-    @OP.def_rule("[]=", proc{|op, io| @lex_state == EXPR_FNAME}) do
-      |op, io|
-      @lex_state = EXPR_ARG
-      Token("[]=")
-    end
-
-    @OP.def_rule("[") do
-      |op, io|
-      @indent += 1
-      if @lex_state == EXPR_FNAME
-        tk_c = TkfLBRACK
-      else
-        if @lex_state == EXPR_BEG || @lex_state == EXPR_MID
-          tk_c = TkLBRACK
-        elsif @lex_state == EXPR_ARG && @space_seen
-          tk_c = TkLBRACK
-        else
-          tk_c = TkfLBRACK
+  def is_method_calling?(tokens, index)
+    tk = tokens[index]
+    if tk[3].anybits?(Ripper::EXPR_CMDARG) and tk[1] == :on_ident
+      # The target method call to pass the block with "do".
+      return true
+    elsif tk[3].anybits?(Ripper::EXPR_ARG) and tk[1] == :on_ident
+      non_sp_index = tokens[0..(index - 1)].rindex{ |t| t[1] != :on_sp }
+      if non_sp_index
+        prev_tk = tokens[non_sp_index]
+        if prev_tk[3].anybits?(Ripper::EXPR_DOT) and prev_tk[1] == :on_period
+          # The target method call with receiver to pass the block with "do".
+          return true
         end
-        @lex_state = EXPR_BEG
-      end
-      @indent_stack.push tk_c
-      Token(tk_c)
-    end
-
-    @OP.def_rule("{") do
-      |op, io|
-      @indent += 1
-      if @lex_state != EXPR_END && @lex_state != EXPR_ARG
-        tk_c = TkLBRACE
-      else
-        tk_c = TkfLBRACE
       end
-      @lex_state = EXPR_BEG
-      @indent_stack.push tk_c
-      Token(tk_c)
     end
-
-    @OP.def_rule('\\') do
-      |op, io|
-      if getc == "\n"
-        @space_seen = true
-        @continue = true
-        Token(TkSPACE)
-      else
-        read_escape
-        Token("\\")
-      end
-    end
-
-    @OP.def_rule('%') do
-      |op, io|
-      if @lex_state == EXPR_BEG || @lex_state == EXPR_MID
-        identify_quotation
-      elsif peek(0) == '='
-        getc
-        Token(TkOPASGN, :%)
-      elsif @lex_state == EXPR_ARG and @space_seen and peek(0) !~ /\s/
-        identify_quotation
-      else
-        @lex_state = EXPR_BEG
-        Token("%") #))
-      end
-    end
-
-    @OP.def_rule('$') do
-      |op, io|
-      identify_gvar
-    end
-
-    @OP.def_rule('@') do
-      |op, io|
-      if peek(0) =~ /[\w@]/
-        ungetc
-        identify_identifier
-      else
-        Token("@")
-      end
-    end
-
-    @OP.def_rule("") do
-      |op, io|
-      printf "MATCH: start %s: %s\n", op, io.inspect if RubyLex.debug?
-      if peek(0) =~ /[0-9]/
-        t = identify_number
-      elsif peek(0) =~ /[^\x00-\/:-@\[-^`{-\x7F]/
-        t = identify_identifier
-      end
-      printf "MATCH: end %s: %s\n", op, io.inspect if RubyLex.debug?
-      t
-    end
-
-    p @OP if RubyLex.debug?
+    false
   end
 
-  def identify_gvar
-    @lex_state = EXPR_END
-
-    case ch = getc
-    when /[~_*$?!@\/\\;,=:<>".]/   #"
-      Token(TkGVAR, "$" + ch)
-    when "-"
-      Token(TkGVAR, "$-" + getc)
-    when "&", "`", "'", "+"
-      Token(TkBACK_REF, "$"+ch)
-    when /[1-9]/
-      while getc =~ /[0-9]/; end
-      ungetc
-      Token(TkNTH_REF)
-    when /\w/
-      ungetc
-      ungetc
-      identify_identifier
-    else
-      ungetc
-      Token("$")
-    end
+  def take_corresponding_syntax_to_kw_do(tokens, index)
+    syntax_of_do = nil
+    # Finding a syntax correnponding to "do".
+    index.downto(0) do |i|
+      tk = tokens[i]
+      # In "continue", the token isn't the corresponding syntax to "do".
+      non_sp_index = tokens[0..(i - 1)].rindex{ |t| t[1] != :on_sp }
+      first_in_fomula = false
+      if non_sp_index.nil?
+        first_in_fomula = true
+      elsif [:on_ignored_nl, :on_nl, :on_comment].include?(tokens[non_sp_index][1])
+        first_in_fomula = true
+      end
+      if is_method_calling?(tokens, i)
+        syntax_of_do = :method_calling
+        break if first_in_fomula
+      elsif tk[1] == :on_kw && %w{while until for}.include?(tk[2])
+        # A loop syntax in front of "do" found.
+        #
+        #   while cond do # also "until" or "for"
+        #   end
+        #
+        # This "do" doesn't increment indent because the loop syntax already
+        # incremented.
+        syntax_of_do = :loop_syntax
+        break if first_in_fomula
+      end
+    end
+    syntax_of_do
   end
 
-  def identify_identifier
-    token = ""
-    if peek(0) =~ /[$@]/
-      token.concat(c = getc)
-      if c == "@" and peek(0) == "@"
-        token.concat getc
-      end
-    end
-
-    while (ch = getc) =~ /[^\x00-\/:-@\[-^`{-\x7F]/
-      print ":", ch, ":" if RubyLex.debug?
-      token.concat ch
-    end
-    ungetc
-
-    if (ch == "!" || ch == "?") && token[0,1] =~ /\w/ && peek(0) != "="
-      token.concat getc
-    end
-
-    # almost fix token
-
-    case token
-    when /^\$/
-      return Token(TkGVAR, token)
-    when /^\@\@/
-      @lex_state = EXPR_END
-      # p Token(TkCVAR, token)
-      return Token(TkCVAR, token)
-    when /^\@/
-      @lex_state = EXPR_END
-      return Token(TkIVAR, token)
-    end
-
-    if @lex_state != EXPR_DOT
-      print token, "\n" if RubyLex.debug?
-
-      token_c, *trans = TkReading2Token[token]
-      if token_c
-        # reserved word?
+  def is_the_in_correspond_to_a_for(tokens, index)
+    syntax_of_in = nil
+    # Finding a syntax correnponding to "do".
+    index.downto(0) do |i|
+      tk = tokens[i]
+      # In "continue", the token isn't the corresponding syntax to "do".
+      non_sp_index = tokens[0..(i - 1)].rindex{ |t| t[1] != :on_sp }
+      first_in_fomula = false
+      if non_sp_index.nil?
+        first_in_fomula = true
+      elsif [:on_ignored_nl, :on_nl, :on_comment].include?(tokens[non_sp_index][1])
+        first_in_fomula = true
+      end
+      if tk[1] == :on_kw && tk[2] == 'for'
+        # A loop syntax in front of "do" found.
+        #
+        #   while cond do # also "until" or "for"
+        #   end
+        #
+        # This "do" doesn't increment indent because the loop syntax already
+        # incremented.
+        syntax_of_in = :for
+      end
+      break if first_in_fomula
+    end
+    syntax_of_in
+  end
 
-        if (@lex_state != EXPR_BEG &&
-            @lex_state != EXPR_FNAME &&
-            trans[1])
-          # modifiers
-          token_c = TkSymbol2Token[trans[1]]
-          @lex_state = trans[0]
+  def check_newline_depth_difference
+    depth_difference = 0
+    open_brace_on_line = 0
+    in_oneliner_def = nil
+    @tokens.each_with_index do |t, index|
+      # detecting one-liner method definition
+      if in_oneliner_def.nil?
+        if t[3].allbits?(Ripper::EXPR_ENDFN)
+          in_oneliner_def = :ENDFN
+        end
+      else
+        if t[3].allbits?(Ripper::EXPR_ENDFN)
+          # continuing
+        elsif t[3].allbits?(Ripper::EXPR_BEG)
+          if t[2] == '='
+            in_oneliner_def = :BODY
+          end
         else
-          if @lex_state != EXPR_FNAME
-            if ENINDENT_CLAUSE.include?(token)
-              # check for ``class = val'' etc.
-              valid = true
-              case token
-              when "class"
-                valid = false unless peek_match?(/^\s*(<<|\w|::)/)
-              when "def"
-                valid = false if peek_match?(/^\s*(([+\-\/*&\|^]|<<|>>|\|\||\&\&)=|\&\&|\|\|)/)
-              when "do"
-                valid = false if peek_match?(/^\s*([+\-\/*]?=|\*|<|>|\&)/)
-              when *ENINDENT_CLAUSE
-                valid = false if peek_match?(/^\s*([+\-\/*]?=|\*|<|>|\&|\|)/)
-              else
-                # no nothing
-              end
-              if valid
-                if token == "do"
-                  if ![TkFOR, TkWHILE, TkUNTIL].include?(@indent_stack.last)
-                    @indent += 1
-                    @indent_stack.push token_c
-                  end
-                else
-                  @indent += 1
-                  @indent_stack.push token_c
-                end
-              end
-
-            elsif DEINDENT_CLAUSE.include?(token)
-              @indent -= 1
-              @indent_stack.pop
-            end
-            @lex_state = trans[0]
-          else
-            @lex_state = EXPR_END
+          if in_oneliner_def == :BODY
+            # one-liner method definition
+            depth_difference -= 1
           end
+          in_oneliner_def = nil
         end
-        return Token(token_c, token)
-      end
-    end
-
-    if @lex_state == EXPR_FNAME
-      @lex_state = EXPR_END
-      if peek(0) == '='
-        token.concat getc
-      end
-    elsif @lex_state == EXPR_BEG || @lex_state == EXPR_DOT
-      @lex_state = EXPR_ARG
-    else
-      @lex_state = EXPR_END
-    end
-
-    if token[0, 1] =~ /[A-Z]/
-      return Token(TkCONSTANT, token)
-    elsif token[token.size - 1, 1] =~ /[!?]/
-      return Token(TkFID, token)
-    else
-      return Token(TkIDENTIFIER, token)
-    end
-  end
-
-  def identify_here_document
-    ch = getc
-    if ch == "-" || ch == "~"
-      ch = getc
-      indent = true
-    end
-    if /['"`]/ =~ ch
-      lt = ch
-      quoted = ""
-      while (c = getc) && c != lt
-        quoted.concat c
-      end
-    else
-      lt = '"'
-      quoted = ch.dup
-      while (c = getc) && c =~ /\w/
-        quoted.concat c
-      end
-      ungetc
-    end
-
-    ltback, @ltype = @ltype, lt
-    reserve = []
-    while ch = getc
-      reserve.push ch
-      if ch == "\\"
-        reserve.push ch = getc
-      elsif ch == "\n"
-        break
       end
-    end
-
-    @here_header = false
 
-    line = ""
-    while ch = getc
-      if ch == "\n"
-        if line == quoted
-          break
+      case t[1]
+      when :on_ignored_nl, :on_nl, :on_comment
+        if index != (@tokens.size - 1) and in_oneliner_def != :BODY
+          depth_difference = 0
+          open_brace_on_line = 0
         end
-        line = ""
-      else
-        line.concat ch unless indent && line == "" && /\s/ =~ ch
-        if @ltype != "'" && ch == "#" && peek(0) == "{"
-          identify_string_dvar
+        next
+      when :on_sp
+        next
+      end
+      case t[1]
+      when :on_lbracket, :on_lbrace, :on_lparen, :on_tlambeg
+        depth_difference += 1
+        open_brace_on_line += 1
+      when :on_rbracket, :on_rbrace, :on_rparen
+        depth_difference -= 1 if open_brace_on_line > 0
+      when :on_kw
+        next if index > 0 and @tokens[index - 1][3].allbits?(Ripper::EXPR_FNAME)
+        case t[2]
+        when 'do'
+          syntax_of_do = take_corresponding_syntax_to_kw_do(@tokens, index)
+          depth_difference += 1 if syntax_of_do == :method_calling
+        when 'def', 'case', 'for', 'begin', 'class', 'module'
+          depth_difference += 1
+        when 'if', 'unless', 'while', 'until', 'rescue'
+          # postfix if/unless/while/until/rescue must be Ripper::EXPR_LABEL
+          unless t[3].allbits?(Ripper::EXPR_LABEL)
+            depth_difference += 1
+          end
+        when 'else', 'elsif', 'ensure', 'when'
+          depth_difference += 1
+        when 'in'
+          unless is_the_in_correspond_to_a_for(@tokens, index)
+            depth_difference += 1
+          end
+        when 'end'
+          depth_difference -= 1
         end
       end
     end
-
-    @here_header = true
-    @here_readed.concat reserve
-    while ch = reserve.pop
-      ungetc ch
-    end
-
-    @ltype = ltback
-    @lex_state = EXPR_END
-    Token(Ltype2Token[lt])
-  end
-
-  def identify_quotation
-    ch = getc
-    if lt = PERCENT_LTYPE[ch]
-      ch = getc
-    elsif ch =~ /\W/
-      lt = "\""
-    else
-      RubyLex.fail SyntaxError, "unknown type of %string"
-    end
-    @quoted = ch unless @quoted = PERCENT_PAREN[ch]
-    identify_string(lt, @quoted)
+    depth_difference
   end
 
-  def identify_number
-    @lex_state = EXPR_END
-
-    if peek(0) == "0" && peek(1) !~ /[.eE]/
-      getc
-      case peek(0)
-      when /[xX]/
-        ch = getc
-        match = /[0-9a-fA-F_]/
-      when /[bB]/
-        ch = getc
-        match = /[01_]/
-      when /[oO]/
-        ch = getc
-        match = /[0-7_]/
-      when /[dD]/
-        ch = getc
-        match = /[0-9_]/
-      when /[0-7]/
-        match = /[0-7_]/
-      when /[89]/
-        RubyLex.fail SyntaxError, "Invalid octal digit"
+  def check_corresponding_token_depth
+    corresponding_token_depth = nil
+    is_first_spaces_of_line = true
+    is_first_printable_of_line = true
+    spaces_of_nest = []
+    spaces_at_line_head = 0
+    open_brace_on_line = 0
+    in_oneliner_def = nil
+    @tokens.each_with_index do |t, index|
+      # detecting one-liner method definition
+      if in_oneliner_def.nil?
+        if t[3].allbits?(Ripper::EXPR_ENDFN)
+          in_oneliner_def = :ENDFN
+        end
       else
-        return Token(TkINTEGER)
-      end
-
-      len0 = true
-      non_digit = false
-      while ch = getc
-        if match =~ ch
-          if ch == "_"
-            if non_digit
-              RubyLex.fail SyntaxError, "trailing `#{ch}' in number"
-            else
-              non_digit = ch
-            end
-          else
-            non_digit = false
-            len0 = false
+        if t[3].allbits?(Ripper::EXPR_ENDFN)
+          # continuing
+        elsif t[3].allbits?(Ripper::EXPR_BEG)
+          if t[2] == '='
+            in_oneliner_def = :BODY
           end
         else
-          ungetc
-          if len0
-            RubyLex.fail SyntaxError, "numeric literal without digits"
-          end
-          if non_digit
-            RubyLex.fail SyntaxError, "trailing `#{non_digit}' in number"
+          if in_oneliner_def == :BODY
+            # one-liner method definition
+            if is_first_printable_of_line
+              corresponding_token_depth = spaces_of_nest.pop
+            else
+              spaces_of_nest.pop
+              corresponding_token_depth = nil
+            end
           end
-          break
+          in_oneliner_def = nil
         end
       end
-      return Token(TkINTEGER)
-    end
 
-    type = TkINTEGER
-    allow_point = true
-    allow_e = true
-    non_digit = false
-    while ch = getc
-      case ch
-      when /[0-9]/
-        non_digit = false
-      when "_"
-        non_digit = ch
-      when allow_point && "."
-        if non_digit
-          RubyLex.fail SyntaxError, "trailing `#{non_digit}' in number"
-        end
-        type = TkFLOAT
-        if peek(0) !~ /[0-9]/
-          type = TkINTEGER
-          ungetc
-          break
-        end
-        allow_point = false
-      when allow_e && "e", allow_e && "E"
-        if non_digit
-          RubyLex.fail SyntaxError, "trailing `#{non_digit}' in number"
-        end
-        type = TkFLOAT
-        if peek(0) =~ /[+-]/
-          getc
+      case t[1]
+      when :on_ignored_nl, :on_nl, :on_comment
+        if in_oneliner_def != :BODY
+          corresponding_token_depth = nil
+          spaces_at_line_head = 0
+          is_first_spaces_of_line = true
+          is_first_printable_of_line = true
+          open_brace_on_line = 0
         end
-        allow_e = false
-        allow_point = false
-        non_digit = ch
-      else
-        if non_digit
-          RubyLex.fail SyntaxError, "trailing `#{non_digit}' in number"
+        next
+      when :on_sp
+        spaces_at_line_head = t[2].count(' ') if is_first_spaces_of_line
+        is_first_spaces_of_line = false
+        next
+      end
+      case t[1]
+      when :on_lbracket, :on_lbrace, :on_lparen, :on_tlambeg
+        spaces_of_nest.push(spaces_at_line_head + open_brace_on_line * 2)
+        open_brace_on_line += 1
+      when :on_rbracket, :on_rbrace, :on_rparen
+        if is_first_printable_of_line
+          corresponding_token_depth = spaces_of_nest.pop
+        else
+          spaces_of_nest.pop
+          corresponding_token_depth = nil
         end
-        ungetc
-        break
-      end
-    end
-    Token(type)
-  end
-
-  def identify_string(ltype, quoted = ltype)
-    @ltype = ltype
-    @quoted = quoted
-    subtype = nil
-    begin
-      nest = 0
-      while ch = getc
-        if @quoted == ch and nest == 0
-          break
-        elsif @ltype != "'" && ch == "#" && peek(0) == "{"
-          identify_string_dvar
-        elsif @ltype != "'" && @ltype != "]" && @ltype != ":" and ch == "#"
-          subtype = true
-        elsif ch == '\\' and @ltype == "'" #'
-          case ch = getc
-          when "\\", "\n", "'"
-          else
-            ungetc
+        open_brace_on_line -= 1
+      when :on_kw
+        next if index > 0 and @tokens[index - 1][3].allbits?(Ripper::EXPR_FNAME)
+        case t[2]
+        when 'do'
+          syntax_of_do = take_corresponding_syntax_to_kw_do(@tokens, index)
+          if syntax_of_do == :method_calling
+            spaces_of_nest.push(spaces_at_line_head)
           end
-        elsif ch == '\\' #'
-          read_escape
-        end
-        if PERCENT_PAREN.values.include?(@quoted)
-          if PERCENT_PAREN[ch] == @quoted
-            nest += 1
-          elsif ch == @quoted
-            nest -= 1
+        when 'def', 'case', 'for', 'begin', 'class', 'module'
+          spaces_of_nest.push(spaces_at_line_head)
+        when 'rescue'
+          unless t[3].allbits?(Ripper::EXPR_LABEL)
+            corresponding_token_depth = spaces_of_nest.last
+          end
+        when 'if', 'unless', 'while', 'until'
+          # postfix if/unless/while/until must be Ripper::EXPR_LABEL
+          unless t[3].allbits?(Ripper::EXPR_LABEL)
+            spaces_of_nest.push(spaces_at_line_head)
+          end
+        when 'else', 'elsif', 'ensure', 'when', 'in'
+          corresponding_token_depth = spaces_of_nest.last
+        when 'end'
+          if is_first_printable_of_line
+            corresponding_token_depth = spaces_of_nest.pop
+          else
+            spaces_of_nest.pop
+            corresponding_token_depth = nil
           end
         end
       end
-      if @ltype == "/"
-        while /[imxoesun]/ =~ peek(0)
-          getc
-        end
-      end
-      if subtype
-        Token(DLtype2Token[ltype])
-      else
-        Token(Ltype2Token[ltype])
-      end
-    ensure
-      @ltype = nil
-      @quoted = nil
-      @lex_state = EXPR_END
+      is_first_spaces_of_line = false
+      is_first_printable_of_line = false
     end
+    corresponding_token_depth
   end
 
-  def identify_string_dvar
-    begin
-      getc
-
-      reserve_continue = @continue
-      reserve_ltype = @ltype
-      reserve_indent = @indent
-      reserve_indent_stack = @indent_stack
-      reserve_state = @lex_state
-      reserve_quoted = @quoted
-
-      @ltype = nil
-      @quoted = nil
-      @indent = 0
-      @indent_stack = []
-      @lex_state = EXPR_BEG
-
-      loop do
-        @continue = false
-        prompt
-        tk = token
-        if @ltype or @continue or @indent >= 0
-          next
+  def check_string_literal(tokens)
+    i = 0
+    start_token = []
+    end_type = []
+    while i < tokens.size
+      t = tokens[i]
+      case t[1]
+      when :on_tstring_beg
+        start_token << t
+        end_type << [:on_tstring_end, :on_label_end]
+      when :on_regexp_beg
+        start_token << t
+        end_type << :on_regexp_end
+      when :on_symbeg
+        acceptable_single_tokens = %i{on_ident on_const on_op on_cvar on_ivar on_gvar on_kw}
+        if (i + 1) < tokens.size and acceptable_single_tokens.all?{ |st| tokens[i + 1][1] != st }
+          start_token << t
+          end_type << :on_tstring_end
         end
-        break if tk.kind_of?(TkRBRACE)
-      end
-    ensure
-      @continue = reserve_continue
-      @ltype = reserve_ltype
-      @indent = reserve_indent
-      @indent_stack = reserve_indent_stack
-      @lex_state = reserve_state
-      @quoted = reserve_quoted
-    end
+      when :on_backtick
+        start_token << t
+        end_type << :on_tstring_end
+      when :on_qwords_beg, :on_words_beg, :on_qsymbols_beg, :on_symbols_beg
+        start_token << t
+        end_type << :on_tstring_end
+      when :on_heredoc_beg
+        start_token << t
+        end_type << :on_heredoc_end
+      when *end_type.last
+        start_token.pop
+        end_type.pop
+      end
+      i += 1
+    end
+    start_token.last.nil? ? '' : start_token.last
   end
 
-  def identify_comment
-    @ltype = "#"
-
-    while ch = getc
-      if ch == "\n"
-        @ltype = nil
-        ungetc
-        break
+  def process_literal_type(tokens = @tokens)
+    start_token = check_string_literal(tokens)
+    case start_token[1]
+    when :on_tstring_beg
+      case start_token[2]
+      when ?"      then ?"
+      when /^%.$/  then ?"
+      when /^%Q.$/ then ?"
+      when ?'      then ?'
+      when /^%q.$/ then ?'
+      end
+    when :on_regexp_beg   then ?/
+    when :on_symbeg       then ?:
+    when :on_backtick     then ?`
+    when :on_qwords_beg   then ?]
+    when :on_words_beg    then ?]
+    when :on_qsymbols_beg then ?]
+    when :on_symbols_beg  then ?]
+    when :on_heredoc_beg
+      start_token[2] =~ /<<[-~]?(['"`])[_a-zA-Z0-9]+\1/
+      case $1
+      when ?" then ?"
+      when ?' then ?'
+      when ?` then ?`
+      else         ?"
       end
+    else
+      nil
     end
-    return Token(TkCOMMENT)
   end
 
-  def read_escape
-    case ch = getc
-    when "\n", "\r", "\f"
-    when "\\", "n", "t", "r", "f", "v", "a", "e", "b", "s" #"
-    when /[0-7]/
-      ungetc ch
-      3.times do
-        case ch = getc
-        when /[0-7]/
-        when nil
-          break
-        else
-          ungetc
-          break
+  def check_termination_in_prev_line(code)
+    tokens = self.class.ripper_lex_without_warning(code)
+    past_first_newline = false
+    index = tokens.rindex do |t|
+      # traverse first token before last line
+      if past_first_newline
+        if t.tok.include?("\n")
+          true
         end
+      elsif t.tok.include?("\n")
+        past_first_newline = true
+        false
+      else
+        false
       end
-
-    when "x"
-      2.times do
-        case ch = getc
-        when /[0-9a-fA-F]/
-        when nil
-          break
-        else
-          ungetc
+    end
+    if index
+      first_token = nil
+      last_line_tokens = tokens[(index + 1)..(tokens.size - 1)]
+      last_line_tokens.each do |t|
+        unless [:on_sp, :on_ignored_sp, :on_comment].include?(t.event)
+          first_token = t
           break
         end
       end
-
-    when "M"
-      if (ch = getc) != '-'
-        ungetc
+      if first_token.nil?
+        return false
+      elsif first_token && first_token.state == Ripper::EXPR_DOT
+        return false
       else
-        if (ch = getc) == "\\" #"
-          read_escape
+        tokens_without_last_line = tokens[0..index]
+        ltype = process_literal_type(tokens_without_last_line)
+        indent = process_nesting_level(tokens_without_last_line)
+        continue = process_continue(tokens_without_last_line)
+        code_block_open = check_code_block(tokens_without_last_line.map(&:tok).join(''), tokens_without_last_line)
+        if ltype or indent > 0 or continue or code_block_open
+          return false
+        else
+          return last_line_tokens.map(&:tok).join('')
         end
       end
-
-    when "C", "c" #, "^"
-      if ch == "C" and (ch = getc) != "-"
-        ungetc
-      elsif (ch = getc) == "\\" #"
-        read_escape
-      end
-    else
-      # other characters
     end
+    false
   end
 end
 # :startdoc:
diff --git a/lib/irb/ruby-token.rb b/lib/irb/ruby-token.rb
deleted file mode 100644
index af53d3c93b..0000000000
--- a/lib/irb/ruby-token.rb
+++ /dev/null
@@ -1,267 +0,0 @@
-# frozen_string_literal: false
-#
-#   irb/ruby-token.rb - ruby tokens
-#   	$Release Version: 0.9.6$
-#   	$Revision$
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
-#
-# --
-#
-#
-#
-# :stopdoc:
-module RubyToken
-  EXPR_BEG = :EXPR_BEG
-  EXPR_MID = :EXPR_MID
-  EXPR_END = :EXPR_END
-  EXPR_ARG = :EXPR_ARG
-  EXPR_FNAME = :EXPR_FNAME
-  EXPR_DOT = :EXPR_DOT
-  EXPR_CLASS = :EXPR_CLASS
-
-  class Token
-    def initialize(seek, line_no, char_no)
-      @seek = seek
-      @line_no = line_no
-      @char_no = char_no
-    end
-    attr_reader :seek, :line_no, :char_no
-  end
-
-  class TkNode < Token
-    def initialize(seek, line_no, char_no)
-      super
-    end
-    attr_reader :node
-  end
-
-  class TkId < Token
-    def initialize(seek, line_no, char_no, name)
-      super(seek, line_no, char_no)
-      @name = name
-    end
-    attr_reader :name
-  end
-
-  class TkVal < Token
-    def initialize(seek, line_no, char_no, value = nil)
-      super(seek, line_no, char_no)
-      @value = value
-    end
-    attr_reader :value
-  end
-
-  class TkOp < Token
-    attr_accessor :name
-  end
-
-  class TkOPASGN < TkOp
-    def initialize(seek, line_no, char_no, op)
-      super(seek, line_no, char_no)
-      op = TkReading2Token[op][0] unless op.kind_of?(Symbol)
-      @op = op
-    end
-    attr_reader :op
-  end
-
-  class TkUnknownChar < Token
-    def initialize(seek, line_no, char_no, id)
-      super(seek, line_no, char_no)
-      @name = name
-    end
-    attr_reader :name
-  end
-
-  class TkError < Token
-  end
-
-  def Token(token, value = nil)
-    case token
-    when String
-      if (tk = TkReading2Token[token]).nil?
-        IRB.fail TkReading2TokenNoKey, token
-      end
-      tk = Token(tk[0], value)
-      if tk.kind_of?(TkOp)
-        tk.name = token
-      end
-      return tk
-    when Symbol
-      if (tk = TkSymbol2Token[token]).nil?
-        IRB.fail TkSymbol2TokenNoKey, token
-      end
-      return Token(tk[0], value)
-    else
-      if (token.ancestors & [TkId, TkVal, TkOPASGN, TkUnknownChar]).empty?
-        token.new(@prev_seek, @prev_line_no, @prev_char_no)
-      else
-        token.new(@prev_seek, @prev_line_no, @prev_char_no, value)
-      end
-    end
-  end
-
-  TokenDefinitions = [
-    [:TkCLASS,      TkId,  "class",  EXPR_CLASS],
-    [:TkMODULE,     TkId,  "module", EXPR_BEG],
-    [:TkDEF,	    TkId,  "def",    EXPR_FNAME],
-    [:TkUNDEF,      TkId,  "undef",  EXPR_FNAME],
-    [:TkBEGIN,      TkId,  "begin",  EXPR_BEG],
-    [:TkRESCUE,     TkId,  "rescue", EXPR_MID],
-    [:TkENSURE,     TkId,  "ensure", EXPR_BEG],
-    [:TkEND,	    TkId,  "end",    EXPR_END],
-    [:TkIF,         TkId,  "if",     EXPR_BEG, :TkIF_MOD],
-    [:TkUNLESS,     TkId,  "unless", EXPR_BEG, :TkUNLESS_MOD],
-    [:TkTHEN,	    TkId,  "then",   EXPR_BEG],
-    [:TkELSIF,      TkId,  "elsif",  EXPR_BEG],
-    [:TkELSE,	    TkId,  "else",   EXPR_BEG],
-    [:TkCASE,	    TkId,  "case",   EXPR_BEG],
-    [:TkWHEN,	    TkId,  "when",   EXPR_BEG],
-    [:TkWHILE,      TkId,  "while",  EXPR_BEG, :TkWHILE_MOD],
-    [:TkUNTIL,      TkId,  "until",  EXPR_BEG, :TkUNTIL_MOD],
-    [:TkFOR,	    TkId,  "for",    EXPR_BEG],
-    [:TkBREAK,      TkId,  "break",  EXPR_END],
-    [:TkNEXT,	    TkId,  "next",   EXPR_END],
-    [:TkREDO,	    TkId,  "redo",   EXPR_END],
-    [:TkRETRY,      TkId,  "retry",  EXPR_END],
-    [:TkIN,	    TkId,  "in",     EXPR_BEG],
-    [:TkDO,	    TkId,  "do",     EXPR_BEG],
-    [:TkRETURN,     TkId,  "return", EXPR_MID],
-    [:TkYIELD,      TkId,  "yield",  EXPR_END],
-    [:TkSUPER,      TkId,  "super",  EXPR_END],
-    [:TkSELF,	    TkId,  "self",   EXPR_END],
-    [:TkNIL, 	    TkId,  "nil",    EXPR_END],
-    [:TkTRUE,	    TkId,  "true",   EXPR_END],
-    [:TkFALSE,      TkId,  "false",  EXPR_END],
-    [:TkAND,	    TkId,  "and",    EXPR_BEG],
-    [:TkOR, 	    TkId,  "or",     EXPR_BEG],
-    [:TkNOT,	    TkId,  "not",    EXPR_BEG],
-    [:TkIF_MOD,     TkId],
-    [:TkUNLESS_MOD, TkId],
-    [:TkWHILE_MOD,  TkId],
-    [:TkUNTIL_MOD,  TkId],
-    [:TkALIAS,      TkId,  "alias",    EXPR_FNAME],
-    [:TkDEFINED,    TkId,  "defined?", EXPR_END],
-    [:TklBEGIN,     TkId,  "BEGIN",    EXPR_END],
-    [:TklEND,	    TkId,  "END",      EXPR_END],
-    [:Tk__LINE__,   TkId,  "__LINE__", EXPR_END],
-    [:Tk__FILE__,   TkId,  "__FILE__", EXPR_END],
-
-    [:TkIDENTIFIER, TkId],
-    [:TkFID,	    TkId],
-    [:TkGVAR,	    TkId],
-    [:TkCVAR,	    TkId],
-    [:TkIVAR,	    TkId],
-    [:TkCONSTANT,   TkId],
-
-    [:TkINTEGER,    TkVal],
-    [:TkFLOAT,      TkVal],
-    [:TkSTRING,     TkVal],
-    [:TkXSTRING,    TkVal],
-    [:TkREGEXP,     TkVal],
-    [:TkSYMBOL,     TkVal],
-
-    [:TkDSTRING,    TkNode],
-    [:TkDXSTRING,   TkNode],
-    [:TkDREGEXP,    TkNode],
-    [:TkNTH_REF,    TkNode],
-    [:TkBACK_REF,   TkNode],
-
-    [:TkUPLUS,      TkOp,   "+@"],
-    [:TkUMINUS,     TkOp,   "-@"],
-    [:TkPOW,	    TkOp,   "**"],
-    [:TkCMP,	    TkOp,   "<=>"],
-    [:TkEQ,	    TkOp,   "=="],
-    [:TkEQQ,	    TkOp,   "==="],
-    [:TkNEQ,	    TkOp,   "!="],
-    [:TkGEQ,	    TkOp,   ">="],
-    [:TkLEQ,	    TkOp,   "<="],
-    [:TkANDOP,      TkOp,   "&&"],
-    [:TkOROP,	    TkOp,   "||"],
-    [:TkMATCH,      TkOp,   "=~"],
-    [:TkNMATCH,     TkOp,   "!~"],
-    [:TkDOT2,	    TkOp,   ".."],
-    [:TkDOT3,	    TkOp,   "..."],
-    [:TkAREF,	    TkOp,   "[]"],
-    [:TkASET,	    TkOp,   "[]="],
-    [:TkLSHFT,      TkOp,   "<<"],
-    [:TkRSHFT,      TkOp,   ">>"],
-    [:TkCOLON2,     TkOp],
-    [:TkCOLON3,     TkOp],
-    [:TkASSOC,      TkOp,   "=>"],
-    [:TkQUESTION,   TkOp,   "?"],	 #?
-    [:TkCOLON,      TkOp,   ":"],        #:
-
-    [:TkfLPAREN],         # func( #
-    [:TkfLBRACK],         # func[ #
-    [:TkfLBRACE],         # func{ #
-    [:TkSTAR],            # *arg
-    [:TkAMPER],           # &arg #
-    [:TkSYMBEG],          # :SYMBOL
-
-    [:TkGT,	    TkOp,   ">"],
-    [:TkLT,	    TkOp,   "<"],
-    [:TkPLUS,	    TkOp,   "+"],
-    [:TkMINUS,      TkOp,   "-"],
-    [:TkMULT,	    TkOp,   "*"],
-    [:TkDIV,	    TkOp,   "/"],
-    [:TkMOD,	    TkOp,   "%"],
-    [:TkBITOR,      TkOp,   "|"],
-    [:TkBITXOR,     TkOp,   "^"],
-    [:TkBITAND,     TkOp,   "&"],
-    [:TkBITNOT,     TkOp,   "~"],
-    [:TkNOTOP,      TkOp,   "!"],
-
-    [:TkBACKQUOTE,  TkOp,   "`"],
-
-    [:TkASSIGN,     Token,  "="],
-    [:TkDOT,	    Token,  "."],
-    [:TkLPAREN,     Token,  "("],  #(exp)
-    [:TkLBRACK,     Token,  "["],  #[arry]
-    [:TkLBRACE,     Token,  "{"],  #{hash}
-    [:TkRPAREN,     Token,  ")"],
-    [:TkRBRACK,     Token,  "]"],
-    [:TkRBRACE,     Token,  "}"],
-    [:TkCOMMA,      Token,  ","],
-    [:TkSEMICOLON,  Token,  ";"],
-
-    [:TkCOMMENT],
-    [:TkRD_COMMENT],
-    [:TkSPACE],
-    [:TkNL],
-    [:TkEND_OF_SCRIPT],
-
-    [:TkBACKSLASH,  TkUnknownChar,  "\\"],
-    [:TkAT,	    TkUnknownChar,  "@"],
-    [:TkDOLLAR,     TkUnknownChar,  "$"],
-  ]
-
-  # {reading => token_class}
-  # {reading => [token_class, *opt]}
-  TkReading2Token = {}
-  TkSymbol2Token = {}
-
-  def RubyToken.def_token(token_n, super_token = Token, reading = nil, *opts)
-    token_n = token_n.id2name if token_n.kind_of?(Symbol)
-    if RubyToken.const_defined?(token_n)
-      IRB.fail AlreadyDefinedToken, token_n
-    end
-    token_c = eval("class #{token_n} < #{super_token}; end; #{token_n}")
-
-    if reading
-      if TkReading2Token[reading]
-        IRB.fail TkReading2TokenDuplicateError, token_n, reading
-      end
-      if opts.empty?
-        TkReading2Token[reading] = [token_c]
-      else
-        TkReading2Token[reading] = [token_c].concat(opts)
-      end
-    end
-    TkSymbol2Token[token_n.intern] = token_c
-  end
-
-  for defs in TokenDefinitions
-    def_token(*defs)
-  end
-end
-# :startdoc:
diff --git a/lib/irb/ruby_logo.aa b/lib/irb/ruby_logo.aa
new file mode 100644
index 0000000000..a34a3e2f28
--- /dev/null
+++ b/lib/irb/ruby_logo.aa
@@ -0,0 +1,37 @@
+
+                                             -+smJYYN?mm-
+                                   HB"BBYT            TQg  NggT
+                              9Q+g       Nm,T      8g          NJW
+                          YS+              N2NJ"Sg               N?
+                       BQg                  #(  gT Nggggk          J
+                     5j                     NJ    NJ            NNge
+                  #Q                        #JJ     NgT            N(
+                @j                          bj         mT           J
+              Bj                           @/d           NJ         (
+            #q                            #((              NgT     #J
+           5d                            #(t                  mT   $d
+         #q                             @(@J                    NJB;
+        @(                             5d ? HHH H HQmgggggggmN    qD
+       5d                            #uN  2QdH                   E O
+      5                             5JSd  Nd  NJH               @d j
+     Fd                           @J4d     s     NQH           #d  (
+    #(                          #o6d       Nd       NgH       #d  #d
+    4                         B&Od          v          NgT   #d   F
+   #(                       9JGd            NH            NgUd    F
+   #d                    #GJQ                d             NP     $
+   #J                 #U+#Q                  N            Q #     j
+  j /W             BQ+ BQ                     d             NJ   NJ
+  - NjJH      HBIjTQggPJQgW                   N        W     k   #J
+ #J  b  HYWgggN       j s    Nag               d     NN      b   #d
+ #J  5-              D   s         Ngg         N    d        Nd  F
+ Fd BKH2            #+    s             NNgg    J Q           J  ]
+ F H @  J           N      y                   K(d            P  I
+ F4  E  N?         #d       y                #Q   NJ          E  j
+ F   W   Nd        q         m             Bg       NxW       N(H-
+ F   d    b       @           m          Hd            gW      vKJ
+ NJ  d     K      d            s      Bg                 aT    FDd
+  b #       d    N              m  BQ                      mV  N>
+   e5       Nd  #d              NggggggQWH HHHH              NJ -
+    m7       NW H            N                        HSVO1z=?11-
+      NgTH    bB        kH   WBHWWHBHWmQgg&gggggNNN
+           NNggggggNN
diff --git a/lib/irb/slex.rb b/lib/irb/slex.rb
deleted file mode 100644
index 68174771a7..0000000000
--- a/lib/irb/slex.rb
+++ /dev/null
@@ -1,282 +0,0 @@
-# frozen_string_literal: false
-#
-#   irb/slex.rb - simple lex analyzer
-#   	$Release Version: 0.9.6$
-#   	$Revision$
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
-#
-# --
-#
-#
-#
-
-require "e2mmap"
-require "irb/notifier"
-
-# :stopdoc:
-module IRB
-  class SLex
-
-    extend Exception2MessageMapper
-    def_exception :ErrNodeNothing, "node nothing"
-    def_exception :ErrNodeAlreadyExists, "node already exists"
-
-    DOUT = Notifier::def_notifier("SLex::")
-    D_WARN = DOUT::def_notifier(1, "Warn: ")
-    D_DEBUG = DOUT::def_notifier(2, "Debug: ")
-    D_DETAIL = DOUT::def_notifier(4, "Detail: ")
-
-    DOUT.level = Notifier::D_NOMSG
-
-    def initialize
-      @head = Node.new("")
-    end
-
-    def def_rule(token, preproc = nil, postproc = nil, &block)
-      D_DETAIL.pp token
-
-      postproc = block if block_given?
-      create(token, preproc, postproc)
-    end
-
-    def def_rules(*tokens, &block)
-      if block_given?
-        p = block
-      end
-      for token in tokens
-        def_rule(token, nil, p)
-      end
-    end
-
-    def preproc(token, proc)
-      node = search(token)
-      node.preproc=proc
-    end
-
-    #$BMW%A%'%C%/(B?
-    def postproc(token)
-      node = search(token, proc)
-      node.postproc=proc
-    end
-
-    def search(token)
-      @head.search(token.split(//))
-    end
-
-    def create(token, preproc = nil, postproc = nil)
-      @head.create_subnode(token.split(//), preproc, postproc)
-    end
-
-    def match(token)
-      case token
-      when Array
-      when String
-        return match(token.split(//))
-      else
-        return @head.match_io(token)
-      end
-      ret = @head.match(token)
-      D_DETAIL.exec_if{D_DETAIL.printf "match end: %s:%s\n", ret, token.inspect}
-      ret
-    end
-
-    def inspect
-      format("<SLex: @head = %s>", @head.inspect)
-    end
-
-    #----------------------------------------------------------------------
-    #
-    #   class Node -
-    #
-    #----------------------------------------------------------------------
-    class Node
-      # if postproc is nil, this node is an abstract node.
-      # if postproc is non-nil, this node is a real node.
-      def initialize(preproc = nil, postproc = nil)
-        @Tree = {}
-        @preproc = preproc
-        @postproc = postproc
-      end
-
-      attr_accessor :preproc
-      attr_accessor :postproc
-
-      def search(chrs, opt = nil)
-        return self if chrs.empty?
-        ch = chrs.shift
-        if node = @Tree[ch]
-          node.search(chrs, opt)
-        else
-          if opt
-            chrs.unshift ch
-            self.create_subnode(chrs)
-          else
-            SLex.fail ErrNodeNothing
-          end
-        end
-      end
-
-      def create_subnode(chrs, preproc = nil, postproc = nil)
-        if chrs.empty?
-          if @postproc
-            D_DETAIL.pp node
-            SLex.fail ErrNodeAlreadyExists
-          else
-            D_DEBUG.puts "change abstract node to real node."
-            @preproc = preproc
-            @postproc = postproc
-          end
-          return self
-        end
-
-        ch = chrs.shift
-        if node = @Tree[ch]
-          if chrs.empty?
-            if node.postproc
-              DebugLogger.pp node
-              DebugLogger.pp self
-              DebugLogger.pp ch
-              DebugLogger.pp chrs
-              SLex.fail ErrNodeAlreadyExists
-            else
-              D_WARN.puts "change abstract node to real node"
-              node.preproc = preproc
-              node.postproc = postproc
-            end
-          else
-            node.create_subnode(chrs, preproc, postproc)
-          end
-        else
-          if chrs.empty?
-            node = Node.new(preproc, postproc)
-          else
-            node = Node.new
-            node.create_subnode(chrs, preproc, postproc)
-          end
-          @Tree[ch] = node
-        end
-        node
-      end
-
-      #
-      # chrs: String
-      #       character array
-      #       io must have getc()/ungetc(); and ungetc() must be
-      #       able to be called arbitrary number of times.
-      #
-      def match(chrs, op = "")
-        D_DETAIL.print "match>: ", chrs, "op:", op, "\n"
-        if chrs.empty?
-          if @preproc.nil? || @preproc.call(op, chrs)
-            DOUT.printf(D_DETAIL, "op1: %s\n", op)
-            @postproc.call(op, chrs)
-          else
-            nil
-          end
-        else
-          ch = chrs.shift
-          if node = @Tree[ch]
-            if ret = node.match(chrs, op+ch)
-              return ret
-            else
-              chrs.unshift ch
-              if @postproc and @preproc.nil? || @preproc.call(op, chrs)
-                DOUT.printf(D_DETAIL, "op2: %s\n", op.inspect)
-                ret = @postproc.call(op, chrs)
-                return ret
-              else
-                return nil
-              end
-            end
-          else
-            chrs.unshift ch
-            if @postproc and @preproc.nil? || @preproc.call(op, chrs)
-              DOUT.printf(D_DETAIL, "op3: %s\n", op)
-              @postproc.call(op, chrs)
-              return ""
-            else
-              return nil
-            end
-          end
-        end
-      end
-
-      def match_io(io, op = "")
-        if op == ""
-          ch = io.getc
-          if ch == nil
-            return nil
-          end
-        else
-          ch = io.getc_of_rests
-        end
-        if ch.nil?
-          if @preproc.nil? || @preproc.call(op, io)
-            D_DETAIL.printf("op1: %s\n", op)
-            @postproc.call(op, io)
-          else
-            nil
-          end
-        else
-          if node = @Tree[ch]
-            if ret = node.match_io(io, op+ch)
-              ret
-            else
-              io.ungetc ch
-              if @postproc and @preproc.nil? || @preproc.call(op, io)
-                DOUT.exec_if{D_DETAIL.printf "op2: %s\n", op.inspect}
-                @postproc.call(op, io)
-              else
-                nil
-              end
-            end
-          else
-            io.ungetc ch
-            if @postproc and @preproc.nil? || @preproc.call(op, io)
-              D_DETAIL.printf("op3: %s\n", op)
-              @postproc.call(op, io)
-            else
-              nil
-            end
-          end
-        end
-      end
-    end
-  end
-end
-# :startdoc:
-
-if $0 == __FILE__
-  case $1
-  when "1"
-    tr = SLex.new
-    print "0: ", tr.inspect, "\n"
-    tr.def_rule("=") {print "=\n"}
-    print "1: ", tr.inspect, "\n"
-    tr.def_rule("==") {print "==\n"}
-    print "2: ", tr.inspect, "\n"
-
-    print "case 1:\n"
-    print tr.match("="), "\n"
-    print "case 2:\n"
-    print tr.match("=="), "\n"
-    print "case 3:\n"
-    print tr.match("=>"), "\n"
-
-  when "2"
-    tr = SLex.new
-    print "0: ", tr.inspect, "\n"
-    tr.def_rule("=") {print "=\n"}
-    print "1: ", tr.inspect, "\n"
-    tr.def_rule("==", proc{false}) {print "==\n"}
-    print "2: ", tr.inspect, "\n"
-
-    print "case 1:\n"
-    print tr.match("="), "\n"
-    print "case 2:\n"
-    print tr.match("=="), "\n"
-    print "case 3:\n"
-    print tr.match("=>"), "\n"
-  end
-  exit
-end
diff --git a/lib/irb/src_encoding.rb b/lib/irb/src_encoding.rb
index 32f997fc7c..99aea2b43e 100644
--- a/lib/irb/src_encoding.rb
+++ b/lib/irb/src_encoding.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: false
 # DO NOT WRITE ANY MAGIC COMMENT HERE.
-def default_src_encoding
-  return __ENCODING__
+module IRB
+  def self.default_src_encoding
+    return __ENCODING__
+  end
 end
diff --git a/lib/irb/version.rb b/lib/irb/version.rb
index 094cb33c05..0014bdda74 100644
--- a/lib/irb/version.rb
+++ b/lib/irb/version.rb
@@ -11,6 +11,7 @@
 #
 
 module IRB # :nodoc:
-  @RELEASE_VERSION = "0.9.6"
-  @LAST_UPDATE_DATE = "09/06/30"
+  VERSION = "1.3.5"
+  @RELEASE_VERSION = VERSION
+  @LAST_UPDATE_DATE = "2021-04-03"
 end
diff --git a/lib/irb/workspace.rb b/lib/irb/workspace.rb
index ac3e369430..78d434d106 100644
--- a/lib/irb/workspace.rb
+++ b/lib/irb/workspace.rb
@@ -9,6 +9,9 @@
 #
 #
 #
+
+require "delegate"
+
 module IRB # :nodoc:
   class WorkSpace
     # Creates a new workspace.
@@ -39,9 +42,7 @@ EOF
 
         when 2	# binding in loaded file(thread use)
           unless defined? BINDING_QUEUE
-            require "thread"
-
-            IRB.const_set(:BINDING_QUEUE, SizedQueue.new(1))
+            IRB.const_set(:BINDING_QUEUE, Thread::SizedQueue.new(1))
             Thread.abort_on_exception = true
             Thread.start do
               eval "require \"irb/ws-for-case-2\"", TOPLEVEL_BINDING, __FILE__, __LINE__
@@ -50,18 +51,24 @@ EOF
           end
           @binding = BINDING_QUEUE.pop
 
-        when 3	# binding in function on TOPLEVEL_BINDING(default)
-          @binding = eval("def irb_binding; private; binding; end; irb_binding",
+        when 3	# binding in function on TOPLEVEL_BINDING
+          @binding = eval("self.class.remove_method(:irb_binding) if defined?(irb_binding); private; def irb_binding; binding; end; irb_binding",
                           TOPLEVEL_BINDING,
                           __FILE__,
                           __LINE__ - 3)
+        when 4  # binding is a copy of TOPLEVEL_BINDING (default)
+          @binding = TOPLEVEL_BINDING.dup
         end
       end
+
       if main.empty?
         @main = eval("self", @binding)
       else
         @main = main[0]
-        IRB.conf[:__MAIN__] = @main
+      end
+      IRB.conf[:__MAIN__] = @main
+
+      unless main.empty?
         case @main
         when Module
           @binding = eval("IRB.conf[:__MAIN__].module_eval('binding', __FILE__, __LINE__)", @binding, __FILE__, __LINE__)
@@ -69,11 +76,33 @@ EOF
           begin
             @binding = eval("IRB.conf[:__MAIN__].instance_eval('binding', __FILE__, __LINE__)", @binding, __FILE__, __LINE__)
           rescue TypeError
-            IRB.fail CantChangeBinding, @main.inspect
+            fail CantChangeBinding, @main.inspect
+          end
+        end
+      end
+
+      case @main
+      when Object
+        use_delegator = @main.frozen?
+      else
+        use_delegator = true
+      end
+
+      if use_delegator
+        @main = SimpleDelegator.new(@main)
+        IRB.conf[:__MAIN__] = @main
+        @main.singleton_class.class_eval do
+          private
+          define_method(:exit) do |*a, &b|
+            # Do nothing, will be overridden
           end
+          define_method(:binding, Kernel.instance_method(:binding))
+          define_method(:local_variables, Kernel.instance_method(:local_variables))
         end
+        @binding = eval("IRB.conf[:__MAIN__].instance_eval('binding', __FILE__, __LINE__)", @binding, *@binding.source_location)
       end
-      eval("_=nil", @binding)
+
+      @binding.local_variable_set(:_, nil)
     end
 
     # The Binding of this workspace
@@ -87,28 +116,68 @@ EOF
       eval(statements, @binding, file, line)
     end
 
+    def local_variable_set(name, value)
+      @binding.local_variable_set(name, value)
+    end
+
+    def local_variable_get(name)
+      @binding.local_variable_get(name)
+    end
+
     # error message manipulator
     def filter_backtrace(bt)
+      return nil if bt =~ /\/irb\/.*\.rb/
+      return nil if bt =~ /\/irb\.rb/
+      return nil if bt =~ /tool\/lib\/.*\.rb|runner\.rb/ # for tests in Ruby repository
       case IRB.conf[:CONTEXT_MODE]
-      when 0
-        return nil if bt =~ /\(irb_local_binding\)/
       when 1
-        if(bt =~ %r!/tmp/irb-binding! or
-            bt =~ %r!irb/.*\.rb! or
-            bt =~ /irb\.rb/)
-          return nil
-        end
-      when 2
-        return nil if bt =~ /irb\/.*\.rb/
-        return nil if bt =~ /irb\.rb/
+        return nil if bt =~ %r!/tmp/irb-binding!
       when 3
-        return nil if bt =~ /irb\/.*\.rb/
-        return nil if bt =~ /irb\.rb/
         bt = bt.sub(/:\s*in `irb_binding'/, '')
       end
       bt
     end
 
+    def code_around_binding
+      if @binding.respond_to?(:source_location)
+        file, pos = @binding.source_location
+      else
+        file, pos = @binding.eval('[__FILE__, __LINE__]')
+      end
+
+      if defined?(::SCRIPT_LINES__[file]) && lines = ::SCRIPT_LINES__[file]
+        code = ::SCRIPT_LINES__[file].join('')
+      else
+        begin
+          code = File.read(file)
+        rescue SystemCallError
+          return
+        end
+      end
+
+      # NOT using #use_colorize? of IRB.conf[:MAIN_CONTEXT] because this method may be called before IRB::Irb#run
+      use_colorize = IRB.conf.fetch(:USE_COLORIZE, true)
+      if use_colorize
+        lines = Color.colorize_code(code).lines
+      else
+        lines = code.lines
+      end
+      pos -= 1
+
+      start_pos = [pos - 5, 0].max
+      end_pos   = [pos + 5, lines.size - 1].min
+
+      if use_colorize
+        fmt = " %2s #{Color.colorize("%#{end_pos.to_s.length}d", [:BLUE, :BOLD])}: %s"
+      else
+        fmt = " %2s %#{end_pos.to_s.length}d: %s"
+      end
+      body = (start_pos..end_pos).map do |current_pos|
+        sprintf(fmt, pos == current_pos ? '=>' : '', current_pos + 1, lines[current_pos])
+      end.join("")
+      "\nFrom: #{file} @ line #{pos + 1} :\n\n#{body}#{Color.clear if use_colorize}\n"
+    end
+
     def IRB.delete_caller
     end
   end
diff --git a/lib/irb/xmp.rb b/lib/irb/xmp.rb
index 3234cff7f3..88cbd88525 100644
--- a/lib/irb/xmp.rb
+++ b/lib/irb/xmp.rb
@@ -10,8 +10,8 @@
 #
 #
 
-require "irb"
-require "irb/frame"
+require_relative "../irb"
+require_relative "frame"
 
 # An example printer for irb.
 #
diff --git a/lib/logger.rb b/lib/logger.rb
index 8551abc7ac..5e88574aa5 100644
--- a/lib/logger.rb
+++ b/lib/logger.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 # logger.rb - simple logging utility
 # Copyright (C) 2000-2003, 2005, 2008, 2011  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 #
@@ -12,6 +12,12 @@
 
 require 'monitor'
 
+require_relative 'logger/version'
+require_relative 'logger/formatter'
+require_relative 'logger/log_device'
+require_relative 'logger/severity'
+require_relative 'logger/errors'
+
 # == Description
 #
 # The Logger class provides a simple but sophisticated logging utility that
@@ -109,7 +115,7 @@ require 'monitor'
 # 3. Create a logger for the specified file.
 #
 #      file = File.open('foo.log', File::WRONLY | File::APPEND)
-#      # To create new (and to remove old) logfile, add File::CREAT like:
+#      # To create new logfile, add File::CREAT like:
 #      # file = File.open('foo.log', File::WRONLY | File::APPEND | File::CREAT)
 #      logger = Logger.new(file)
 #
@@ -224,7 +230,6 @@ require 'monitor'
 #   })
 #
 class Logger
-  VERSION = "1.2.7"
   _, name, rev = %w$Id$
   if name
     name = name.chomp(",v")
@@ -232,29 +237,8 @@ class Logger
     name = File.basename(__FILE__)
   end
   rev ||= "v#{VERSION}"
-  ProgName = "#{name}/#{rev}".freeze
-
-  class Error < RuntimeError # :nodoc:
-  end
-  # not used after 1.2.7. just for compat.
-  class ShiftingError < Error # :nodoc:
-  end
+  ProgName = "#{name}/#{rev}"
 
-  # Logging severity.
-  module Severity
-    # Low-level information, mostly for developers.
-    DEBUG = 0
-    # Generic (useful) information about system operation.
-    INFO = 1
-    # A warning.
-    WARN = 2
-    # A handleable error condition.
-    ERROR = 3
-    # An unhandleable error that results in a program crash.
-    FATAL = 4
-    # An unknown message that should always be logged.
-    UNKNOWN = 5
-  end
   include Severity
 
   # Logging severity threshold (e.g. <tt>Logger::INFO</tt>).
@@ -268,17 +252,17 @@ class Logger
       @level = severity
     else
       case severity.to_s.downcase
-      when 'debug'.freeze
+      when 'debug'
         @level = DEBUG
-      when 'info'.freeze
+      when 'info'
         @level = INFO
-      when 'warn'.freeze
+      when 'warn'
         @level = WARN
-      when 'error'.freeze
+      when 'error'
         @level = ERROR
-      when 'fatal'.freeze
+      when 'fatal'
         @level = FATAL
-      when 'unknown'.freeze
+      when 'unknown'
         @level = UNKNOWN
       else
         raise ArgumentError, "invalid log level: #{severity}"
@@ -320,27 +304,42 @@ class Logger
 
   # Returns +true+ iff the current severity level allows for the printing of
   # +DEBUG+ messages.
-  def debug?; @level <= DEBUG; end
+  def debug?; level <= DEBUG; end
+
+  # Sets the severity to DEBUG.
+  def debug!; self.level = DEBUG; end
 
   # Returns +true+ iff the current severity level allows for the printing of
   # +INFO+ messages.
-  def info?; @level <= INFO; end
+  def info?; level <= INFO; end
+
+  # Sets the severity to INFO.
+  def info!; self.level = INFO; end
 
   # Returns +true+ iff the current severity level allows for the printing of
   # +WARN+ messages.
-  def warn?; @level <= WARN; end
+  def warn?; level <= WARN; end
+
+  # Sets the severity to WARN.
+  def warn!; self.level = WARN; end
 
   # Returns +true+ iff the current severity level allows for the printing of
   # +ERROR+ messages.
-  def error?; @level <= ERROR; end
+  def error?; level <= ERROR; end
+
+  # Sets the severity to ERROR.
+  def error!; self.level = ERROR; end
 
   # Returns +true+ iff the current severity level allows for the printing of
   # +FATAL+ messages.
-  def fatal?; @level <= FATAL; end
+  def fatal?; level <= FATAL; end
+
+  # Sets the severity to FATAL.
+  def fatal!; self.level = FATAL; end
 
   #
   # :call-seq:
-  #   Logger.new(logdev, shift_age = 7, shift_size = 1048576)
+  #   Logger.new(logdev, shift_age = 0, shift_size = 1048576)
   #   Logger.new(logdev, shift_age = 'weekly')
   #   Logger.new(logdev, level: :info)
   #   Logger.new(logdev, progname: 'progname')
@@ -350,14 +349,16 @@ class Logger
   # === Args
   #
   # +logdev+::
-  #   The log device.  This is a filename (String) or IO object (typically
-  #   +STDOUT+, +STDERR+, or an open file).
+  #   The log device.  This is a filename (String), IO object (typically
+  #   +STDOUT+, +STDERR+, or an open file), +nil+ (it writes nothing) or
+  #   +File::NULL+ (same as +nil+).
   # +shift_age+::
   #   Number of old log files to keep, *or* frequency of rotation (+daily+,
-  #   +weekly+ or +monthly+). Default value is 0.
+  #   +weekly+ or +monthly+). Default value is 0, which disables log file
+  #   rotation.
   # +shift_size+::
-  #   Maximum logfile size (only applies when +shift_age+ is a number). Default
-  #   value is 1MiB.
+  #   Maximum logfile size in bytes (only applies when +shift_age+ is a positive
+  #   Integer). Defaults to +1048576+ (1MB).
   # +level+::
   #   Logging severity threshold. Default values is Logger::DEBUG.
   # +progname+::
@@ -366,6 +367,8 @@ class Logger
   #   Logging formatter. Default values is an instance of Logger::Formatter.
   # +datetime_format+::
   #   Date and time format. Default value is '%Y-%m-%d %H:%M:%S'.
+  # +binmode+::
+  #   Use binary mode on the log device. Default value is false.
   # +shift_period_suffix+::
   #   The log file suffix format for +daily+, +weekly+ or +monthly+ rotation.
   #   Default is '%Y%m%d'.
@@ -376,17 +379,18 @@ class Logger
   #
   def initialize(logdev, shift_age = 0, shift_size = 1048576, level: DEBUG,
                  progname: nil, formatter: nil, datetime_format: nil,
-                 shift_period_suffix: '%Y%m%d')
+                 binmode: false, shift_period_suffix: '%Y%m%d')
     self.level = level
     self.progname = progname
     @default_formatter = Formatter.new
     self.datetime_format = datetime_format
     self.formatter = formatter
     @logdev = nil
-    if logdev
-      @logdev = LogDevice.new(logdev, :shift_age => shift_age,
-        :shift_size => shift_size,
-        :shift_period_suffix => shift_period_suffix)
+    if logdev && logdev != File::NULL
+      @logdev = LogDevice.new(logdev, shift_age: shift_age,
+        shift_size: shift_size,
+        shift_period_suffix: shift_period_suffix,
+        binmode: binmode)
     end
   end
 
@@ -407,7 +411,7 @@ class Logger
   # Reopen a log device.
   #
   def reopen(logdev = nil)
-    @logdev.reopen(logdev)
+    @logdev&.reopen(logdev)
     self
   end
 
@@ -454,10 +458,12 @@ class Logger
   #
   def add(severity, message = nil, progname = nil)
     severity ||= UNKNOWN
-    if @logdev.nil? or severity < @level
+    if @logdev.nil? or severity < level
       return true
     end
-    progname ||= @progname
+    if progname.nil?
+      progname = @progname
+    end
     if message.nil?
       if block_given?
         message = yield
@@ -477,9 +483,7 @@ class Logger
   # device exists, return +nil+.
   #
   def <<(msg)
-    unless @logdev.nil?
-      @logdev.write(msg)
-    end
+    @logdev&.write(msg)
   end
 
   #
@@ -566,13 +570,13 @@ class Logger
   # Close the logging device.
   #
   def close
-    @logdev.close if @logdev
+    @logdev&.close
   end
 
 private
 
   # Severity label for logging (max 5 chars).
-  SEV_LABEL = %w(DEBUG INFO WARN ERROR FATAL ANY).each(&:freeze).freeze
+  SEV_LABEL = %w(DEBUG INFO WARN ERROR FATAL ANY).freeze
 
   def format_severity(severity)
     SEV_LABEL[severity] || 'ANY'
@@ -581,269 +585,4 @@ private
   def format_message(severity, datetime, progname, msg)
     (@formatter || @default_formatter).call(severity, datetime, progname, msg)
   end
-
-
-  # Default formatter for log messages.
-  class Formatter
-    Format = "%s, [%s#%d] %5s -- %s: %s\n".freeze
-
-    attr_accessor :datetime_format
-
-    def initialize
-      @datetime_format = nil
-    end
-
-    def call(severity, time, progname, msg)
-      Format % [severity[0..0], format_datetime(time), $$, severity, progname,
-        msg2str(msg)]
-    end
-
-  private
-
-    def format_datetime(time)
-      time.strftime(@datetime_format || "%Y-%m-%dT%H:%M:%S.%6N ".freeze)
-    end
-
-    def msg2str(msg)
-      case msg
-      when ::String
-        msg
-      when ::Exception
-        "#{ msg.message } (#{ msg.class })\n" <<
-          (msg.backtrace || []).join("\n")
-      else
-        msg.inspect
-      end
-    end
-  end
-
-  module Period
-    module_function
-
-    SiD = 24 * 60 * 60
-
-    def next_rotate_time(now, shift_age)
-      case shift_age
-      when 'daily'
-        t = Time.mktime(now.year, now.month, now.mday) + SiD
-      when 'weekly'
-        t = Time.mktime(now.year, now.month, now.mday) + SiD * (7 - now.wday)
-      when 'monthly'
-        t = Time.mktime(now.year, now.month, 1) + SiD * 31
-        return Time.mktime(t.year, t.month, 1) if t.mday > 1
-      else
-        return now
-      end
-      if t.hour.nonzero? or t.min.nonzero? or t.sec.nonzero?
-        hour = t.hour
-        t = Time.mktime(t.year, t.month, t.mday)
-        t += SiD if hour > 12
-      end
-      t
-    end
-
-    def previous_period_end(now, shift_age)
-      case shift_age
-      when 'daily'
-        t = Time.mktime(now.year, now.month, now.mday) - SiD / 2
-      when 'weekly'
-        t = Time.mktime(now.year, now.month, now.mday) - (SiD * now.wday + SiD / 2)
-      when 'monthly'
-        t = Time.mktime(now.year, now.month, 1) - SiD / 2
-      else
-        return now
-      end
-      Time.mktime(t.year, t.month, t.mday, 23, 59, 59)
-    end
-  end
-
-  # Device used for logging messages.
-  class LogDevice
-    include Period
-
-    attr_reader :dev
-    attr_reader :filename
-    include MonitorMixin
-
-    def initialize(log = nil, shift_age: nil, shift_size: nil, shift_period_suffix: nil)
-      @dev = @filename = @shift_age = @shift_size = @shift_period_suffix = nil
-      mon_initialize
-      set_dev(log)
-      if @filename
-        @shift_age = shift_age || 7
-        @shift_size = shift_size || 1048576
-        @shift_period_suffix = shift_period_suffix || '%Y%m%d'
-        @next_rotate_time = next_rotate_time(Time.now, @shift_age) unless @shift_age.is_a?(Integer)
-      end
-    end
-
-    def write(message)
-      begin
-        synchronize do
-          if @shift_age and @dev.respond_to?(:stat)
-            begin
-              check_shift_log
-            rescue
-              warn("log shifting failed. #{$!}")
-            end
-          end
-          begin
-            @dev.write(message)
-          rescue
-            warn("log writing failed. #{$!}")
-          end
-        end
-      rescue Exception => ignored
-        warn("log writing failed. #{ignored}")
-      end
-    end
-
-    def close
-      begin
-        synchronize do
-          @dev.close rescue nil
-        end
-      rescue Exception
-        @dev.close rescue nil
-      end
-    end
-
-    def reopen(log = nil)
-      # reopen the same filename if no argument, do nothing for IO
-      log ||= @filename if @filename
-      if log
-        synchronize do
-          if @filename and @dev
-            @dev.close rescue nil # close only file opened by Logger
-            @filename = nil
-          end
-          set_dev(log)
-        end
-      end
-      self
-    end
-
-  private
-
-    def set_dev(log)
-      if log.respond_to?(:write) and log.respond_to?(:close)
-        @dev = log
-      else
-        @dev = open_logfile(log)
-        @dev.sync = true
-        @filename = log
-      end
-    end
-
-    def open_logfile(filename)
-      begin
-        open(filename, (File::WRONLY | File::APPEND))
-      rescue Errno::ENOENT
-        create_logfile(filename)
-      end
-    end
-
-    def create_logfile(filename)
-      begin
-        logdev = open(filename, (File::WRONLY | File::APPEND | File::CREAT | File::EXCL))
-        logdev.flock(File::LOCK_EX)
-        logdev.sync = true
-        add_log_header(logdev)
-        logdev.flock(File::LOCK_UN)
-      rescue Errno::EEXIST
-        # file is created by another process
-        logdev = open_logfile(filename)
-        logdev.sync = true
-      end
-      logdev
-    end
-
-    def add_log_header(file)
-      file.write(
-        "# Logfile created on %s by %s\n" % [Time.now.to_s, Logger::ProgName]
-      ) if file.size == 0
-    end
-
-    def check_shift_log
-      if @shift_age.is_a?(Integer)
-        # Note: always returns false if '0'.
-        if @filename && (@shift_age > 0) && (@dev.stat.size > @shift_size)
-          lock_shift_log { shift_log_age }
-        end
-      else
-        now = Time.now
-        if now >= @next_rotate_time
-          @next_rotate_time = next_rotate_time(now, @shift_age)
-          lock_shift_log { shift_log_period(previous_period_end(now, @shift_age)) }
-        end
-      end
-    end
-
-    if /mswin|mingw/ =~ RUBY_PLATFORM
-      def lock_shift_log
-        yield
-      end
-    else
-      def lock_shift_log
-        retry_limit = 8
-        retry_sleep = 0.1
-        begin
-          File.open(@filename, File::WRONLY | File::APPEND) do |lock|
-            lock.flock(File::LOCK_EX) # inter-process locking. will be unlocked at closing file
-            if File.identical?(@filename, lock) and File.identical?(lock, @dev)
-              yield # log shifting
-            else
-              # log shifted by another process (i-node before locking and i-node after locking are different)
-              @dev.close rescue nil
-              @dev = open_logfile(@filename)
-              @dev.sync = true
-            end
-          end
-        rescue Errno::ENOENT
-          # @filename file would not exist right after #rename and before #create_logfile
-          if retry_limit <= 0
-            warn("log rotation inter-process lock failed. #{$!}")
-          else
-            sleep retry_sleep
-            retry_limit -= 1
-            retry_sleep *= 2
-            retry
-          end
-        end
-      rescue
-        warn("log rotation inter-process lock failed. #{$!}")
-      end
-    end
-
-    def shift_log_age
-      (@shift_age-3).downto(0) do |i|
-        if FileTest.exist?("#{@filename}.#{i}")
-          File.rename("#{@filename}.#{i}", "#{@filename}.#{i+1}")
-        end
-      end
-      @dev.close rescue nil
-      File.rename("#{@filename}", "#{@filename}.0")
-      @dev = create_logfile(@filename)
-      return true
-    end
-
-    def shift_log_period(period_end)
-      suffix = period_end.strftime(@shift_period_suffix)
-      age_file = "#{@filename}.#{suffix}"
-      if FileTest.exist?(age_file)
-        # try to avoid filename crash caused by Timestamp change.
-        idx = 0
-        # .99 can be overridden; avoid too much file search with 'loop do'
-        while idx < 100
-          idx += 1
-          age_file = "#{@filename}.#{suffix}.#{idx}"
-          break unless FileTest.exist?(age_file)
-        end
-      end
-      @dev.close rescue nil
-      File.rename("#{@filename}", age_file)
-      @dev = create_logfile(@filename)
-      return true
-    end
-  end
 end
diff --git a/lib/logger/errors.rb b/lib/logger/errors.rb
new file mode 100644
index 0000000000..e8925e14ac
--- /dev/null
+++ b/lib/logger/errors.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+# not used after 1.2.7. just for compat.
+class Logger
+  class Error < RuntimeError # :nodoc:
+  end
+  class ShiftingError < Error # :nodoc:
+  end
+end
diff --git a/lib/logger/formatter.rb b/lib/logger/formatter.rb
new file mode 100644
index 0000000000..6a135b6fab
--- /dev/null
+++ b/lib/logger/formatter.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+class Logger
+  # Default formatter for log messages.
+  class Formatter
+    Format = "%s, [%s#%d] %5s -- %s: %s\n"
+
+    attr_accessor :datetime_format
+
+    def initialize
+      @datetime_format = nil
+    end
+
+    def call(severity, time, progname, msg)
+      Format % [severity[0..0], format_datetime(time), Process.pid, severity, progname,
+        msg2str(msg)]
+    end
+
+  private
+
+    def format_datetime(time)
+      time.strftime(@datetime_format || "%Y-%m-%dT%H:%M:%S.%6N ")
+    end
+
+    def msg2str(msg)
+      case msg
+      when ::String
+        msg
+      when ::Exception
+        "#{ msg.message } (#{ msg.class })\n#{ msg.backtrace.join("\n") if msg.backtrace }"
+      else
+        msg.inspect
+      end
+    end
+  end
+end
diff --git a/lib/logger/log_device.rb b/lib/logger/log_device.rb
new file mode 100644
index 0000000000..96d77b7b6a
--- /dev/null
+++ b/lib/logger/log_device.rb
@@ -0,0 +1,205 @@
+# frozen_string_literal: true
+
+require_relative 'period'
+
+class Logger
+  # Device used for logging messages.
+  class LogDevice
+    include Period
+
+    attr_reader :dev
+    attr_reader :filename
+    include MonitorMixin
+
+    def initialize(log = nil, shift_age: nil, shift_size: nil, shift_period_suffix: nil, binmode: false)
+      @dev = @filename = @shift_age = @shift_size = @shift_period_suffix = nil
+      @binmode = binmode
+      mon_initialize
+      set_dev(log)
+      if @filename
+        @shift_age = shift_age || 7
+        @shift_size = shift_size || 1048576
+        @shift_period_suffix = shift_period_suffix || '%Y%m%d'
+
+        unless @shift_age.is_a?(Integer)
+          base_time = @dev.respond_to?(:stat) ? @dev.stat.mtime : Time.now
+          @next_rotate_time = next_rotate_time(base_time, @shift_age)
+        end
+      end
+    end
+
+    def write(message)
+      begin
+        synchronize do
+          if @shift_age and @dev.respond_to?(:stat)
+            begin
+              check_shift_log
+            rescue
+              warn("log shifting failed. #{$!}")
+            end
+          end
+          begin
+            @dev.write(message)
+          rescue
+            warn("log writing failed. #{$!}")
+          end
+        end
+      rescue Exception => ignored
+        warn("log writing failed. #{ignored}")
+      end
+    end
+
+    def close
+      begin
+        synchronize do
+          @dev.close rescue nil
+        end
+      rescue Exception
+        @dev.close rescue nil
+      end
+    end
+
+    def reopen(log = nil)
+      # reopen the same filename if no argument, do nothing for IO
+      log ||= @filename if @filename
+      if log
+        synchronize do
+          if @filename and @dev
+            @dev.close rescue nil # close only file opened by Logger
+            @filename = nil
+          end
+          set_dev(log)
+        end
+      end
+      self
+    end
+
+  private
+
+    def set_dev(log)
+      if log.respond_to?(:write) and log.respond_to?(:close)
+        @dev = log
+        if log.respond_to?(:path)
+          @filename = log.path
+        end
+      else
+        @dev = open_logfile(log)
+        @dev.sync = true
+        @dev.binmode if @binmode
+        @filename = log
+      end
+    end
+
+    def open_logfile(filename)
+      begin
+        File.open(filename, (File::WRONLY | File::APPEND))
+      rescue Errno::ENOENT
+        create_logfile(filename)
+      end
+    end
+
+    def create_logfile(filename)
+      begin
+        logdev = File.open(filename, (File::WRONLY | File::APPEND | File::CREAT | File::EXCL))
+        logdev.flock(File::LOCK_EX)
+        logdev.sync = true
+        logdev.binmode if @binmode
+        add_log_header(logdev)
+        logdev.flock(File::LOCK_UN)
+      rescue Errno::EEXIST
+        # file is created by another process
+        logdev = open_logfile(filename)
+        logdev.sync = true
+      end
+      logdev
+    end
+
+    def add_log_header(file)
+      file.write(
+        "# Logfile created on %s by %s\n" % [Time.now.to_s, Logger::ProgName]
+      ) if file.size == 0
+    end
+
+    def check_shift_log
+      if @shift_age.is_a?(Integer)
+        # Note: always returns false if '0'.
+        if @filename && (@shift_age > 0) && (@dev.stat.size > @shift_size)
+          lock_shift_log { shift_log_age }
+        end
+      else
+        now = Time.now
+        if now >= @next_rotate_time
+          @next_rotate_time = next_rotate_time(now, @shift_age)
+          lock_shift_log { shift_log_period(previous_period_end(now, @shift_age)) }
+        end
+      end
+    end
+
+    if /mswin|mingw|cygwin/ =~ RUBY_PLATFORM
+      def lock_shift_log
+        yield
+      end
+    else
+      def lock_shift_log
+        retry_limit = 8
+        retry_sleep = 0.1
+        begin
+          File.open(@filename, File::WRONLY | File::APPEND) do |lock|
+            lock.flock(File::LOCK_EX) # inter-process locking. will be unlocked at closing file
+            if File.identical?(@filename, lock) and File.identical?(lock, @dev)
+              yield # log shifting
+            else
+              # log shifted by another process (i-node before locking and i-node after locking are different)
+              @dev.close rescue nil
+              @dev = open_logfile(@filename)
+              @dev.sync = true
+            end
+          end
+        rescue Errno::ENOENT
+          # @filename file would not exist right after #rename and before #create_logfile
+          if retry_limit <= 0
+            warn("log rotation inter-process lock failed. #{$!}")
+          else
+            sleep retry_sleep
+            retry_limit -= 1
+            retry_sleep *= 2
+            retry
+          end
+        end
+      rescue
+        warn("log rotation inter-process lock failed. #{$!}")
+      end
+    end
+
+    def shift_log_age
+      (@shift_age-3).downto(0) do |i|
+        if FileTest.exist?("#{@filename}.#{i}")
+          File.rename("#{@filename}.#{i}", "#{@filename}.#{i+1}")
+        end
+      end
+      @dev.close rescue nil
+      File.rename("#{@filename}", "#{@filename}.0")
+      @dev = create_logfile(@filename)
+      return true
+    end
+
+    def shift_log_period(period_end)
+      suffix = period_end.strftime(@shift_period_suffix)
+      age_file = "#{@filename}.#{suffix}"
+      if FileTest.exist?(age_file)
+        # try to avoid filename crash caused by Timestamp change.
+        idx = 0
+        # .99 can be overridden; avoid too much file search with 'loop do'
+        while idx < 100
+          idx += 1
+          age_file = "#{@filename}.#{suffix}.#{idx}"
+          break unless FileTest.exist?(age_file)
+        end
+      end
+      @dev.close rescue nil
+      File.rename("#{@filename}", age_file)
+      @dev = create_logfile(@filename)
+      return true
+    end
+  end
+end
diff --git a/lib/logger/logger.gemspec b/lib/logger/logger.gemspec
new file mode 100644
index 0000000000..cd6d97de3d
--- /dev/null
+++ b/lib/logger/logger.gemspec
@@ -0,0 +1,29 @@
+begin
+  require_relative "lib/logger/version"
+rescue LoadError # Fallback to load version file in ruby core repository
+  require_relative "version"
+end
+
+Gem::Specification.new do |spec|
+  spec.name          = "logger"
+  spec.version       = Logger::VERSION
+  spec.authors       = ["Naotoshi Seo", "SHIBATA Hiroshi"]
+  spec.email         = ["sonots@gmail.com", "hsbt@ruby-lang.org"]
+
+  spec.summary       = %q{Provides a simple logging utility for outputting messages.}
+  spec.description   = %q{Provides a simple logging utility for outputting messages.}
+  spec.homepage      = "https://github.com/ruby/logger"
+  spec.licenses      = ["Ruby", "BSD-2-Clause"]
+
+  spec.files         = Dir.glob("lib/**/*.rb") + ["logger.gemspec"]
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.required_ruby_version = ">= 2.3.0"
+
+  spec.add_development_dependency "bundler", ">= 0"
+  spec.add_development_dependency "rake", ">= 12.3.3"
+  spec.add_development_dependency "test-unit"
+  spec.add_development_dependency "rdoc"
+end
diff --git a/lib/logger/period.rb b/lib/logger/period.rb
new file mode 100644
index 0000000000..0a291dbbbe
--- /dev/null
+++ b/lib/logger/period.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+class Logger
+  module Period
+    module_function
+
+    SiD = 24 * 60 * 60
+
+    def next_rotate_time(now, shift_age)
+      case shift_age
+      when 'daily'
+        t = Time.mktime(now.year, now.month, now.mday) + SiD
+      when 'weekly'
+        t = Time.mktime(now.year, now.month, now.mday) + SiD * (7 - now.wday)
+      when 'monthly'
+        t = Time.mktime(now.year, now.month, 1) + SiD * 32
+        return Time.mktime(t.year, t.month, 1)
+      when 'now', 'everytime'
+        return now
+      else
+        raise ArgumentError, "invalid :shift_age #{shift_age.inspect}, should be daily, weekly, monthly, or everytime"
+      end
+      if t.hour.nonzero? or t.min.nonzero? or t.sec.nonzero?
+        hour = t.hour
+        t = Time.mktime(t.year, t.month, t.mday)
+        t += SiD if hour > 12
+      end
+      t
+    end
+
+    def previous_period_end(now, shift_age)
+      case shift_age
+      when 'daily'
+        t = Time.mktime(now.year, now.month, now.mday) - SiD / 2
+      when 'weekly'
+        t = Time.mktime(now.year, now.month, now.mday) - (SiD * now.wday + SiD / 2)
+      when 'monthly'
+        t = Time.mktime(now.year, now.month, 1) - SiD / 2
+      when 'now', 'everytime'
+        return now
+      else
+        raise ArgumentError, "invalid :shift_age #{shift_age.inspect}, should be daily, weekly, monthly, or everytime"
+      end
+      Time.mktime(t.year, t.month, t.mday, 23, 59, 59)
+    end
+  end
+end
diff --git a/lib/logger/severity.rb b/lib/logger/severity.rb
new file mode 100644
index 0000000000..b38afb7d22
--- /dev/null
+++ b/lib/logger/severity.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class Logger
+  # Logging severity.
+  module Severity
+    # Low-level information, mostly for developers.
+    DEBUG = 0
+    # Generic (useful) information about system operation.
+    INFO = 1
+    # A warning.
+    WARN = 2
+    # A handleable error condition.
+    ERROR = 3
+    # An unhandleable error that results in a program crash.
+    FATAL = 4
+    # An unknown message that should always be logged.
+    UNKNOWN = 5
+  end
+end
diff --git a/lib/logger/version.rb b/lib/logger/version.rb
new file mode 100644
index 0000000000..e0f71830d2
--- /dev/null
+++ b/lib/logger/version.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class Logger
+  VERSION = "1.4.3"
+end
diff --git a/lib/mathn.rb b/lib/mathn.rb
deleted file mode 100644
index d6f2da0210..0000000000
--- a/lib/mathn.rb
+++ /dev/null
@@ -1,177 +0,0 @@
-# frozen_string_literal: false
-#--
-# $Release Version: 0.5 $
-# $Revision: 1.1.1.1.4.1 $
-
-##
-# = mathn
-#
-# mathn serves to make mathematical operations more precise in Ruby
-# and to integrate other mathematical standard libraries.
-#
-# Without mathn:
-#
-#   3 / 2 => 1 # Integer
-#
-# With mathn:
-#
-#   3 / 2 => 3/2 # Rational
-#
-# mathn keeps value in exact terms.
-#
-# Without mathn:
-#
-#   20 / 9 * 3 * 14 / 7 * 3 / 2 # => 18
-#
-# With mathn:
-#
-#   20 / 9 * 3 * 14 / 7 * 3 / 2 # => 20
-#
-#
-# When you require 'mathn', the libraries for Prime, CMath, Matrix and Vector
-# are also loaded.
-#
-# == Copyright
-#
-# Author: Keiju ISHITSUKA (SHL Japan Inc.)
-#--
-# class Numeric follows to make this documentation findable in a reasonable
-# location
-
-warn('lib/mathn.rb is deprecated') if $VERBOSE
-
-class Numeric; end
-
-require "cmath.rb"
-require "matrix.rb"
-require "prime.rb"
-
-require "mathn/rational"
-require "mathn/complex"
-
-unless defined?(Math.exp!)
-  Object.instance_eval{remove_const :Math}
-  Math = CMath # :nodoc:
-end
-
-##
-# When mathn is required, Integer's division is enhanced to
-# return more precise values from mathematical expressions.
-#
-#   2/3*3  # => 0
-#   require 'mathn'
-#   2/3*3  # => 2
-#
-#   (2**72) / ((2**70) * 3)  # => 4/3
-
-class Integer
-  remove_method :/
-
-  ##
-  # +/+ defines the Rational division for Bignum.
-  #
-  #   (2**72) / ((2**70) * 3)  # => 4/3
-
-  alias / quo
-end
-
-##
-# When mathn is required, the Math module changes as follows:
-#
-# Standard Math module behaviour:
-#   Math.sqrt(4/9)     # => 0.0
-#   Math.sqrt(4.0/9.0) # => 0.666666666666667
-#   Math.sqrt(- 4/9)   # => Errno::EDOM: Numerical argument out of domain - sqrt
-#
-# After require 'mathn', this is changed to:
-#
-#   require 'mathn'
-#   Math.sqrt(4/9)      # => 2/3
-#   Math.sqrt(4.0/9.0)  # => 0.666666666666667
-#   Math.sqrt(- 4/9)    # => Complex(0, 2/3)
-
-module Math
-  remove_method(:sqrt)
-
-  ##
-  # Computes the square root of +a+.  It makes use of Complex and
-  # Rational to have no rounding errors if possible.
-  #
-  #   Math.sqrt(4/9)      # => 2/3
-  #   Math.sqrt(- 4/9)    # => Complex(0, 2/3)
-  #   Math.sqrt(4.0/9.0)  # => 0.666666666666667
-
-  def sqrt(a)
-    if a.kind_of?(Complex)
-      abs = sqrt(a.real*a.real + a.imag*a.imag)
-      x = sqrt((a.real + abs)/Rational(2))
-      y = sqrt((-a.real + abs)/Rational(2))
-      if a.imag >= 0
-        Complex(x, y)
-      else
-        Complex(x, -y)
-      end
-    elsif a.respond_to?(:nan?) and a.nan?
-      a
-    elsif a >= 0
-      rsqrt(a)
-    else
-      Complex(0,rsqrt(-a))
-    end
-  end
-
-  ##
-  # Compute square root of a non negative number. This method is
-  # internally used by +Math.sqrt+.
-
-  def rsqrt(a)
-    if a.kind_of?(Float)
-      sqrt!(a)
-    elsif a.kind_of?(Rational)
-      rsqrt(a.numerator)/rsqrt(a.denominator)
-    else
-      src = a
-      max = 2 ** 32
-      byte_a = [src & 0xffffffff]
-      # ruby's bug
-      while (src >= max) and (src >>= 32)
-        byte_a.unshift src & 0xffffffff
-      end
-
-      answer = 0
-      main = 0
-      side = 0
-      for elm in byte_a
-        main = (main << 32) + elm
-        side <<= 16
-        if answer != 0
-          if main * 4  < side * side
-            applo = main.div(side)
-          else
-            applo = ((sqrt!(side * side + 4 * main) - side)/2.0).to_i + 1
-          end
-        else
-          applo = sqrt!(main).to_i + 1
-        end
-
-        while (x = (side + applo) * applo) > main
-          applo -= 1
-        end
-        main -= x
-        answer = (answer << 16) + applo
-        side += applo * 2
-      end
-      if main == 0
-        answer
-      else
-        sqrt!(a)
-      end
-    end
-  end
-
-  class << self
-    remove_method(:sqrt)
-  end
-  module_function :sqrt
-  module_function :rsqrt
-end
diff --git a/lib/matrix.rb b/lib/matrix.rb
index fe61b6d120..32f1e233ce 100644
--- a/lib/matrix.rb
+++ b/lib/matrix.rb
@@ -12,126 +12,51 @@
 # Original Documentation:: Gavin Sinclair (sourced from <i>Ruby in a Nutshell</i> (Matsumoto, O'Reilly))
 ##
 
-require "e2mmap.rb"
+require_relative "matrix/version"
 
 module ExceptionForMatrix # :nodoc:
-  extend Exception2MessageMapper
-  def_e2message(TypeError, "wrong argument type %s (expected %s)")
-  def_e2message(ArgumentError, "Wrong # of arguments(%d for %d)")
-
-  def_exception("ErrDimensionMismatch", "\#{self.name} dimension mismatch")
-  def_exception("ErrNotRegular", "Not Regular Matrix")
-  def_exception("ErrOperationNotDefined", "Operation(%s) can\\'t be defined: %s op %s")
-  def_exception("ErrOperationNotImplemented", "Sorry, Operation(%s) not implemented: %s op %s")
+  class ErrDimensionMismatch < StandardError
+    def initialize(val = nil)
+      if val
+        super(val)
+      else
+        super("Dimension mismatch")
+      end
+    end
+  end
+
+  class ErrNotRegular < StandardError
+    def initialize(val = nil)
+      if val
+        super(val)
+      else
+        super("Not Regular Matrix")
+      end
+    end
+  end
+
+  class ErrOperationNotDefined < StandardError
+    def initialize(vals)
+      if vals.is_a?(Array)
+        super("Operation(#{vals[0]}) can't be defined: #{vals[1]} op #{vals[2]}")
+      else
+        super(vals)
+      end
+    end
+  end
+
+  class ErrOperationNotImplemented < StandardError
+    def initialize(vals)
+      super("Sorry, Operation(#{vals[0]}) not implemented: #{vals[1]} op #{vals[2]}")
+    end
+  end
 end
 
 #
 # The +Matrix+ class represents a mathematical matrix. It provides methods for creating
 # matrices, operating on them arithmetically and algebraically,
-# and determining their mathematical properties (trace, rank, inverse, determinant).
-#
-# == Method Catalogue
-#
-# To create a matrix:
-# * Matrix[*rows]
-# * Matrix.[](*rows)
-# * Matrix.rows(rows, copy = true)
-# * Matrix.columns(columns)
-# * Matrix.build(row_count, column_count, &block)
-# * Matrix.diagonal(*values)
-# * Matrix.scalar(n, value)
-# * Matrix.identity(n)
-# * Matrix.unit(n)
-# * Matrix.I(n)
-# * Matrix.zero(n)
-# * Matrix.row_vector(row)
-# * Matrix.column_vector(column)
-# * Matrix.empty(row_count, column_count)
-# * Matrix.hstack(*matrices)
-# * Matrix.vstack(*matrices)
-#
-# To access Matrix elements/columns/rows/submatrices/properties:
-# * #[](i, j)
-# * #row_count (row_size)
-# * #column_count (column_size)
-# * #row(i)
-# * #column(j)
-# * #collect
-# * #map
-# * #each
-# * #each_with_index
-# * #find_index
-# * #minor(*param)
-# * #first_minor(row, column)
-# * #cofactor(row, column)
-# * #adjugate
-# * #laplace_expansion(row_or_column: num)
-# * #cofactor_expansion(row_or_column: num)
-#
-# Properties of a matrix:
-# * #diagonal?
-# * #empty?
-# * #hermitian?
-# * #lower_triangular?
-# * #normal?
-# * #orthogonal?
-# * #permutation?
-# * #real?
-# * #regular?
-# * #singular?
-# * #square?
-# * #symmetric?
-# * #unitary?
-# * #upper_triangular?
-# * #zero?
-#
-# Matrix arithmetic:
-# * #*(m)
-# * #+(m)
-# * #-(m)
-# * #/(m)
-# * #inverse
-# * #inv
-# * #**
-# * #+@
-# * #-@
-#
-# Matrix functions:
-# * #determinant
-# * #det
-# * #hstack(*matrices)
-# * #rank
-# * #round
-# * #trace
-# * #tr
-# * #transpose
-# * #t
-# * #vstack(*matrices)
-#
-# Matrix decompositions:
-# * #eigen
-# * #eigensystem
-# * #lup
-# * #lup_decomposition
-#
-# Complex arithmetic:
-# * conj
-# * conjugate
-# * imag
-# * imaginary
-# * real
-# * rect
-# * rectangular
-#
-# Conversion to other data types:
-# * #coerce(other)
-# * #row_vectors
-# * #column_vectors
-# * #to_a
-#
-# String representations:
-# * #to_s
-# * #inspect
+# and determining their mathematical properties such as trace, rank, inverse, determinant,
+# or eigensystem.
 #
 class Matrix
   include Enumerable
@@ -147,8 +72,8 @@ class Matrix
   #
   # Creates a matrix where each argument is a row.
   #   Matrix[ [25, 93], [-1, 66] ]
-  #      =>  25 93
-  #          -1 66
+  #   #   =>  25 93
+  #   #       -1 66
   #
   def Matrix.[](*rows)
     rows(rows, false)
@@ -159,8 +84,8 @@ class Matrix
   # of the matrix.  If the optional argument +copy+ is false, use the given
   # arrays as the internal structure of the matrix without copying.
   #   Matrix.rows([[25, 93], [-1, 66]])
-  #      =>  25 93
-  #          -1 66
+  #   #   =>  25 93
+  #   #       -1 66
   #
   def Matrix.rows(rows, copy = true)
     rows = convert_to_array(rows, copy)
@@ -177,8 +102,8 @@ class Matrix
   #
   # Creates a matrix using +columns+ as an array of column vectors.
   #   Matrix.columns([[25, 93], [-1, 66]])
-  #      =>  25 -1
-  #          93 66
+  #   #   =>  25 -1
+  #   #       93 66
   #
   def Matrix.columns(columns)
     rows(columns, false).transpose
@@ -191,9 +116,9 @@ class Matrix
   # Returns an enumerator if no block is given.
   #
   #   m = Matrix.build(2, 4) {|row, col| col - row }
-  #     => Matrix[[0, 1, 2, 3], [-1, 0, 1, 2]]
+  #   #  => Matrix[[0, 1, 2, 3], [-1, 0, 1, 2]]
   #   m = Matrix.build(3) { rand }
-  #     => a 3x3 matrix with random elements
+  #   #  => a 3x3 matrix with random elements
   #
   def Matrix.build(row_count, column_count = row_count)
     row_count = CoercionHelper.coerce_to_int(row_count)
@@ -211,9 +136,9 @@ class Matrix
   #
   # Creates a matrix where the diagonal elements are composed of +values+.
   #   Matrix.diagonal(9, 5, -3)
-  #     =>  9  0  0
-  #         0  5  0
-  #         0  0 -3
+  #   #  =>  9  0  0
+  #   #      0  5  0
+  #   #      0  0 -3
   #
   def Matrix.diagonal(*values)
     size = values.size
@@ -230,8 +155,8 @@ class Matrix
   # Creates an +n+ by +n+ diagonal matrix where each diagonal element is
   # +value+.
   #   Matrix.scalar(2, 5)
-  #     => 5 0
-  #        0 5
+  #   #  => 5 0
+  #   #     0 5
   #
   def Matrix.scalar(n, value)
     diagonal(*Array.new(n, value))
@@ -240,22 +165,22 @@ class Matrix
   #
   # Creates an +n+ by +n+ identity matrix.
   #   Matrix.identity(2)
-  #     => 1 0
-  #        0 1
+  #   #  => 1 0
+  #   #     0 1
   #
   def Matrix.identity(n)
     scalar(n, 1)
   end
   class << Matrix
-    alias unit identity
-    alias I identity
+    alias_method :unit, :identity
+    alias_method :I, :identity
   end
 
   #
   # Creates a zero matrix.
   #   Matrix.zero(2)
-  #     => 0 0
-  #        0 0
+  #   #  => 0 0
+  #   #     0 0
   #
   def Matrix.zero(row_count, column_count = row_count)
     rows = Array.new(row_count){Array.new(column_count, 0)}
@@ -266,7 +191,7 @@ class Matrix
   # Creates a single-row matrix where the values of that row are as given in
   # +row+.
   #   Matrix.row_vector([4,5,6])
-  #     => 4 5 6
+  #   #  => 4 5 6
   #
   def Matrix.row_vector(row)
     row = convert_to_array(row)
@@ -277,9 +202,9 @@ class Matrix
   # Creates a single-column matrix where the values of that column are as given
   # in +column+.
   #   Matrix.column_vector([4,5,6])
-  #     => 4
-  #        5
-  #        6
+  #   #  => 4
+  #   #     5
+  #   #     6
   #
   def Matrix.column_vector(column)
     column = convert_to_array(column)
@@ -292,12 +217,12 @@ class Matrix
   #
   #   m = Matrix.empty(2, 0)
   #   m == Matrix[ [], [] ]
-  #     => true
+  #   #  => true
   #   n = Matrix.empty(0, 3)
   #   n == Matrix.columns([ [], [], [] ])
-  #     => true
+  #   #  => true
   #   m * n
-  #     => Matrix[[0, 0, 0], [0, 0, 0]]
+  #   #  => Matrix[[0, 0, 0], [0, 0, 0]]
   #
   def Matrix.empty(row_count = 0, column_count = 0)
     raise ArgumentError, "One size must be 0" if column_count != 0 && row_count != 0
@@ -314,10 +239,10 @@ class Matrix
   #   Matrix.vstack(x, y) # => Matrix[[1, 2], [3, 4], [5, 6], [7, 8]]
   #
   def Matrix.vstack(x, *matrices)
-    raise TypeError, "Expected a Matrix, got a #{x.class}" unless x.is_a?(Matrix)
+    x = CoercionHelper.coerce_to_matrix(x)
     result = x.send(:rows).map(&:dup)
     matrices.each do |m|
-      raise TypeError, "Expected a Matrix, got a #{m.class}" unless m.is_a?(Matrix)
+      m = CoercionHelper.coerce_to_matrix(m)
       if m.column_count != x.column_count
         raise ErrDimensionMismatch, "The given matrices must have #{x.column_count} columns, but one has #{m.column_count}"
       end
@@ -335,11 +260,11 @@ class Matrix
   #   Matrix.hstack(x, y) # => Matrix[[1, 2, 5, 6], [3, 4, 7, 8]]
   #
   def Matrix.hstack(x, *matrices)
-    raise TypeError, "Expected a Matrix, got a #{x.class}" unless x.is_a?(Matrix)
+    x = CoercionHelper.coerce_to_matrix(x)
     result = x.send(:rows).map(&:dup)
     total_column_count = x.column_count
     matrices.each do |m|
-      raise TypeError, "Expected a Matrix, got a #{m.class}" unless m.is_a?(Matrix)
+      m = CoercionHelper.coerce_to_matrix(m)
       if m.row_count != x.row_count
         raise ErrDimensionMismatch, "The given matrices must have #{x.row_count} rows, but one has #{m.row_count}"
       end
@@ -351,8 +276,48 @@ class Matrix
     new result, total_column_count
   end
 
+  # :call-seq:
+  #   Matrix.combine(*matrices) { |*elements| ... }
   #
-  # Matrix.new is private; use Matrix.rows, columns, [], etc... to create.
+  # Create a matrix by combining matrices entrywise, using the given block
+  #
+  #   x = Matrix[[6, 6], [4, 4]]
+  #   y = Matrix[[1, 2], [3, 4]]
+  #   Matrix.combine(x, y) {|a, b| a - b} # => Matrix[[5, 4], [1, 0]]
+  #
+  def Matrix.combine(*matrices)
+    return to_enum(__method__, *matrices) unless block_given?
+
+    return Matrix.empty if matrices.empty?
+    matrices.map!(&CoercionHelper.method(:coerce_to_matrix))
+    x = matrices.first
+    matrices.each do |m|
+      raise ErrDimensionMismatch unless x.row_count == m.row_count && x.column_count == m.column_count
+    end
+
+    rows = Array.new(x.row_count) do |i|
+      Array.new(x.column_count) do |j|
+        yield matrices.map{|m| m[i,j]}
+      end
+    end
+    new rows, x.column_count
+  end
+
+  # :call-seq:
+  #   combine(*other_matrices) { |*elements| ... }
+  #
+  # Creates new matrix by combining with <i>other_matrices</i> entrywise,
+  # using the given block.
+  #
+  #   x = Matrix[[6, 6], [4, 4]]
+  #   y = Matrix[[1, 2], [3, 4]]
+  #   x.combine(y) {|a, b| a - b} # => Matrix[[5, 4], [1, 0]]
+  def combine(*matrices, &block)
+    Matrix.combine(self, *matrices, &block)
+  end
+
+  #
+  # Matrix.new is private; use ::rows, ::columns, ::[], etc... to create.
   #
   def initialize(rows, column_count = rows[0].size)
     # No checking is done at this point. rows must be an Array of Arrays.
@@ -362,10 +327,9 @@ class Matrix
     @column_count = column_count
   end
 
-  def new_matrix(rows, column_count = rows[0].size) # :nodoc:
+  private def new_matrix(rows, column_count = rows[0].size) # :nodoc:
     self.class.send(:new, rows, column_count) # bypass privacy of Matrix.new
   end
-  private :new_matrix
 
   #
   # Returns element (+i+,+j+) of the matrix.  That is: row +i+, column +j+.
@@ -376,12 +340,107 @@ class Matrix
   alias element []
   alias component []
 
+  #
+  # :call-seq:
+  #   matrix[range, range] = matrix/element
+  #   matrix[range, integer] = vector/column_matrix/element
+  #   matrix[integer, range] = vector/row_matrix/element
+  #   matrix[integer, integer] = element
+  #
+  # Set element or elements of matrix.
   def []=(i, j, v)
-    @rows[i][j] = v
+    raise FrozenError, "can't modify frozen Matrix" if frozen?
+    rows = check_range(i, :row) or row = check_int(i, :row)
+    columns = check_range(j, :column) or column = check_int(j, :column)
+    if rows && columns
+      set_row_and_col_range(rows, columns, v)
+    elsif rows
+      set_row_range(rows, column, v)
+    elsif columns
+      set_col_range(row, columns, v)
+    else
+      set_value(row, column, v)
+    end
   end
   alias set_element []=
   alias set_component []=
-  private :[]=, :set_element, :set_component
+  private :set_element, :set_component
+
+  # Returns range or nil
+  private def check_range(val, direction)
+    return unless val.is_a?(Range)
+    count = direction == :row ? row_count : column_count
+    CoercionHelper.check_range(val, count, direction)
+  end
+
+  private def check_int(val, direction)
+    count = direction == :row ? row_count : column_count
+    CoercionHelper.check_int(val, count, direction)
+  end
+
+  private def set_value(row, col, value)
+    raise ErrDimensionMismatch, "Expected a a value, got a #{value.class}" if value.respond_to?(:to_matrix)
+
+    @rows[row][col] = value
+  end
+
+  private def set_row_and_col_range(row_range, col_range, value)
+    if value.is_a?(Matrix)
+      if row_range.size != value.row_count || col_range.size != value.column_count
+        raise ErrDimensionMismatch, [
+          'Expected a Matrix of dimensions',
+          "#{row_range.size}x#{col_range.size}",
+          'got',
+          "#{value.row_count}x#{value.column_count}",
+        ].join(' ')
+      end
+      source = value.instance_variable_get :@rows
+      row_range.each_with_index do |row, i|
+        @rows[row][col_range] = source[i]
+      end
+    elsif value.is_a?(Vector)
+      raise ErrDimensionMismatch, 'Expected a Matrix or a value, got a Vector'
+    else
+      value_to_set = Array.new(col_range.size, value)
+      row_range.each do |i|
+        @rows[i][col_range] = value_to_set
+      end
+    end
+  end
+
+  private def set_row_range(row_range, col, value)
+    if value.is_a?(Vector)
+      raise ErrDimensionMismatch unless row_range.size == value.size
+      set_column_vector(row_range, col, value)
+    elsif value.is_a?(Matrix)
+      raise ErrDimensionMismatch unless value.column_count == 1
+      value = value.column(0)
+      raise ErrDimensionMismatch unless row_range.size == value.size
+      set_column_vector(row_range, col, value)
+    else
+      @rows[row_range].each{|e| e[col] = value }
+    end
+  end
+
+  private def set_column_vector(row_range, col, value)
+    value.each_with_index do |e, index|
+      r = row_range.begin + index
+      @rows[r][col] = e
+    end
+  end
+
+  private def set_col_range(row, col_range, value)
+    value = if value.is_a?(Vector)
+      value.to_a
+    elsif value.is_a?(Matrix)
+      raise ErrDimensionMismatch unless value.row_count == 1
+      value.row(0).to_a
+    else
+      Array.new(col_range.size, value)
+    end
+    raise ErrDimensionMismatch unless col_range.size == value.size
+    @rows[row][col_range] = value
+  end
 
   #
   # Returns the number of rows.
@@ -434,16 +493,49 @@ class Matrix
   #
   # Returns a matrix that is the result of iteration of the given block over all
   # elements of the matrix.
+  # Elements can be restricted by passing an argument:
+  # * :all (default): yields all elements
+  # * :diagonal: yields only elements on the diagonal
+  # * :off_diagonal: yields all elements except on the diagonal
+  # * :lower: yields only elements on or below the diagonal
+  # * :strict_lower: yields only elements below the diagonal
+  # * :strict_upper: yields only elements above the diagonal
+  # * :upper: yields only elements on or above the diagonal
   #   Matrix[ [1,2], [3,4] ].collect { |e| e**2 }
-  #     => 1  4
-  #        9 16
+  #   #  => 1  4
+  #   #     9 16
   #
-  def collect(&block) # :yield: e
-    return to_enum(:collect) unless block_given?
-    rows = @rows.collect{|row| row.collect(&block)}
-    new_matrix rows, column_count
+  def collect(which = :all, &block) # :yield: e
+    return to_enum(:collect, which) unless block_given?
+    dup.collect!(which, &block)
+  end
+  alias_method :map, :collect
+
+  #
+  # Invokes the given block for each element of matrix, replacing the element with the value
+  # returned by the block.
+  # Elements can be restricted by passing an argument:
+  # * :all (default): yields all elements
+  # * :diagonal: yields only elements on the diagonal
+  # * :off_diagonal: yields all elements except on the diagonal
+  # * :lower: yields only elements on or below the diagonal
+  # * :strict_lower: yields only elements below the diagonal
+  # * :strict_upper: yields only elements above the diagonal
+  # * :upper: yields only elements on or above the diagonal
+  #
+  def collect!(which = :all)
+    return to_enum(:collect!, which) unless block_given?
+    raise FrozenError, "can't modify frozen Matrix" if frozen?
+    each_with_index(which){ |e, row_index, col_index| @rows[row_index][col_index] = yield e }
+  end
+
+  alias map! collect!
+
+  def freeze
+    @rows.each(&:freeze).freeze
+
+    super
   end
-  alias map collect
 
   #
   # Yields all elements of the matrix, starting with those of the first row,
@@ -457,16 +549,15 @@ class Matrix
   # * :strict_upper: yields only elements above the diagonal
   # * :upper: yields only elements on or above the diagonal
   #
-  #   Matrix[ [1,2], [3,4] ].each { |e| puts e }
-  #     # => prints the numbers 1 to 4
-  #   Matrix[ [1,2], [3,4] ].each(:strict_lower).to_a # => [3]
+  #     Matrix[ [1,2], [3,4] ].each { |e| puts e }
+  #       # => prints the numbers 1 to 4
+  #     Matrix[ [1,2], [3,4] ].each(:strict_lower).to_a # => [3]
   #
-  def each(which = :all) # :yield: e
+  def each(which = :all, &block) # :yield: e
     return to_enum :each, which unless block_given?
     last = column_count - 1
     case which
     when :all
-      block = Proc.new
       @rows.each do |row|
         row.each(&block)
       end
@@ -609,8 +700,8 @@ class Matrix
   # *  row_range, col_range
   #
   #   Matrix.diagonal(9, 5, -3).minor(0..1, 0..2)
-  #     => 9 0 0
-  #        0 5 0
+  #   #  => 9 0 0
+  #   #     0 5 0
   #
   # Like Array#[], negative indices count backward from the end of the
   # row or column (-1 is the last element). Returns nil if the starting
@@ -653,9 +744,9 @@ class Matrix
   # Returns the submatrix obtained by deleting the specified row and column.
   #
   #   Matrix.diagonal(9, 5, -3, 4).first_minor(1, 2)
-  #     => 9 0 0
-  #        0 0 0
-  #        0 0 4
+  #   #  => 9 0 0
+  #   #     0 0 0
+  #   #     0 0 4
   #
   def first_minor(row, column)
     raise RuntimeError, "first_minor of empty matrix is not defined" if empty?
@@ -682,11 +773,11 @@ class Matrix
   # the first minor by (-1)**(row + column).
   #
   #   Matrix.diagonal(9, 5, -3, 4).cofactor(1, 1)
-  #     => -108
+  #   #  => -108
   #
   def cofactor(row, column)
     raise RuntimeError, "cofactor of empty matrix is not defined" if empty?
-    Matrix.Raise ErrDimensionMismatch unless square?
+    raise ErrDimensionMismatch unless square?
 
     det_of_minor = first_minor(row, column).determinant
     det_of_minor * (-1) ** (row + column)
@@ -696,11 +787,11 @@ class Matrix
   # Returns the adjugate of the matrix.
   #
   #   Matrix[ [7,6],[3,9] ].adjugate
-  #     => 9 -6
-  #        -3 7
+  #   #  => 9 -6
+  #   #     -3 7
   #
   def adjugate
-    Matrix.Raise ErrDimensionMismatch unless square?
+    raise ErrDimensionMismatch unless square?
     Matrix.build(row_count, column_count) do |row, column|
       cofactor(column, row)
     end
@@ -710,10 +801,10 @@ class Matrix
   # Returns the Laplace expansion along given row or column.
   #
   #    Matrix[[7,6], [3,9]].laplace_expansion(column: 1)
-  #     => 45
+  #    # => 45
   #
   #    Matrix[[Vector[1, 0], Vector[0, 1]], [2, 3]].laplace_expansion(row: 0)
-  #     => Vector[3, -2]
+  #    # => Vector[3, -2]
   #
   #
   def laplace_expansion(row: nil, column: nil)
@@ -723,7 +814,7 @@ class Matrix
       raise ArgumentError, "exactly one the row or column arguments must be specified"
     end
 
-    Matrix.Raise ErrDimensionMismatch unless square?
+    raise ErrDimensionMismatch unless square?
     raise RuntimeError, "laplace_expansion of empty matrix is not defined" if empty?
 
     unless 0 <= num && num < row_count
@@ -746,7 +837,7 @@ class Matrix
   # Raises an error if matrix is not square.
   #
   def diagonal?
-    Matrix.Raise ErrDimensionMismatch unless square?
+    raise ErrDimensionMismatch unless square?
     each(:off_diagonal).all?(&:zero?)
   end
 
@@ -763,7 +854,7 @@ class Matrix
   # Raises an error if matrix is not square.
   #
   def hermitian?
-    Matrix.Raise ErrDimensionMismatch unless square?
+    raise ErrDimensionMismatch unless square?
     each_with_index(:upper).all? do |e, row, col|
       e == rows[col][row].conj
     end
@@ -781,7 +872,7 @@ class Matrix
   # Raises an error if matrix is not square.
   #
   def normal?
-    Matrix.Raise ErrDimensionMismatch unless square?
+    raise ErrDimensionMismatch unless square?
     rows.each_with_index do |row_i, i|
       rows.each_with_index do |row_j, j|
         s = 0
@@ -799,12 +890,13 @@ class Matrix
   # Raises an error if matrix is not square.
   #
   def orthogonal?
-    Matrix.Raise ErrDimensionMismatch unless square?
-    rows.each_with_index do |row, i|
-      column_count.times do |j|
+    raise ErrDimensionMismatch unless square?
+
+    rows.each_with_index do |row_i, i|
+      rows.each_with_index do |row_j, j|
         s = 0
         row_count.times do |k|
-          s += row[k] * rows[k][j]
+          s += row_i[k] * row_j[k]
         end
         return false unless s == (i == j ? 1 : 0)
       end
@@ -817,7 +909,7 @@ class Matrix
   # Raises an error if matrix is not square.
   #
   def permutation?
-    Matrix.Raise ErrDimensionMismatch unless square?
+    raise ErrDimensionMismatch unless square?
     cols = Array.new(column_count)
     rows.each_with_index do |row, i|
       found = false
@@ -867,7 +959,7 @@ class Matrix
   # Raises an error if matrix is not square.
   #
   def symmetric?
-    Matrix.Raise ErrDimensionMismatch unless square?
+    raise ErrDimensionMismatch unless square?
     each_with_index(:strict_upper) do |e, row, col|
       return false if e != rows[col][row]
     end
@@ -875,16 +967,29 @@ class Matrix
   end
 
   #
+  # Returns +true+ if this is an antisymmetric matrix.
+  # Raises an error if matrix is not square.
+  #
+  def antisymmetric?
+    raise ErrDimensionMismatch unless square?
+    each_with_index(:upper) do |e, row, col|
+      return false unless e == -rows[col][row]
+    end
+    true
+  end
+  alias_method :skew_symmetric?, :antisymmetric?
+
+  #
   # Returns +true+ if this is a unitary matrix
   # Raises an error if matrix is not square.
   #
   def unitary?
-    Matrix.Raise ErrDimensionMismatch unless square?
-    rows.each_with_index do |row, i|
-      column_count.times do |j|
+    raise ErrDimensionMismatch unless square?
+    rows.each_with_index do |row_i, i|
+      rows.each_with_index do |row_j, j|
         s = 0
         row_count.times do |k|
-          s += row[k].conj * rows[k][j]
+          s += row_i[k].conj * row_j[k]
         end
         return false unless s == (i == j ? 1 : 0)
       end
@@ -926,12 +1031,11 @@ class Matrix
   end
 
   #
-  # Returns a clone of the matrix, so that the contents of each do not reference
-  # identical objects.
-  # There should be no good reason to do this since Matrices are immutable.
+  # Called for dup & clone.
   #
-  def clone
-    new_matrix @rows.map(&:dup), column_count
+  private def initialize_copy(m)
+    super
+    @rows = @rows.map(&:dup) unless frozen?
   end
 
   #
@@ -948,31 +1052,33 @@ class Matrix
   #
   # Matrix multiplication.
   #   Matrix[[2,4], [6,8]] * Matrix.identity(2)
-  #     => 2 4
-  #        6 8
+  #   #  => 2 4
+  #   #     6 8
   #
   def *(m) # m is matrix or vector or number
     case(m)
     when Numeric
-      rows = @rows.collect {|row|
+      new_rows = @rows.collect {|row|
         row.collect {|e| e * m }
       }
-      return new_matrix rows, column_count
+      return new_matrix new_rows, column_count
     when Vector
       m = self.class.column_vector(m)
       r = self * m
       return r.column(0)
     when Matrix
-      Matrix.Raise ErrDimensionMismatch if column_count != m.row_count
-
-      rows = Array.new(row_count) {|i|
-        Array.new(m.column_count) {|j|
-          (0 ... column_count).inject(0) do |vij, k|
-            vij + self[i, k] * m[k, j]
+      raise ErrDimensionMismatch if column_count != m.row_count
+      m_rows = m.rows
+      new_rows = rows.map do |row_i|
+        Array.new(m.column_count) do |j|
+          vij = 0
+          column_count.times do |k|
+            vij += row_i[k] * m_rows[k][j]
           end
-        }
-      }
-      return new_matrix rows, m.column_count
+          vij
+        end
+      end
+      return new_matrix new_rows, m.column_count
     else
       return apply_through_coercion(m, __method__)
     end
@@ -981,13 +1087,13 @@ class Matrix
   #
   # Matrix addition.
   #   Matrix.scalar(2,5) + Matrix[[1,0], [-4,7]]
-  #     =>  6  0
-  #        -4 12
+  #   #  =>  6  0
+  #   #     -4 12
   #
   def +(m)
     case m
     when Numeric
-      Matrix.Raise ErrOperationNotDefined, "+", self.class, m.class
+      raise ErrOperationNotDefined, ["+", self.class, m.class]
     when Vector
       m = self.class.column_vector(m)
     when Matrix
@@ -995,7 +1101,7 @@ class Matrix
       return apply_through_coercion(m, __method__)
     end
 
-    Matrix.Raise ErrDimensionMismatch unless row_count == m.row_count && column_count == m.column_count
+    raise ErrDimensionMismatch unless row_count == m.row_count && column_count == m.column_count
 
     rows = Array.new(row_count) {|i|
       Array.new(column_count) {|j|
@@ -1008,13 +1114,13 @@ class Matrix
   #
   # Matrix subtraction.
   #   Matrix[[1,5], [4,2]] - Matrix[[9,3], [-4,1]]
-  #     => -8  2
-  #         8  1
+  #   #  => -8  2
+  #   #      8  1
   #
   def -(m)
     case m
     when Numeric
-      Matrix.Raise ErrOperationNotDefined, "-", self.class, m.class
+      raise ErrOperationNotDefined, ["-", self.class, m.class]
     when Vector
       m = self.class.column_vector(m)
     when Matrix
@@ -1022,7 +1128,7 @@ class Matrix
       return apply_through_coercion(m, __method__)
     end
 
-    Matrix.Raise ErrDimensionMismatch unless row_count == m.row_count && column_count == m.column_count
+    raise ErrDimensionMismatch unless row_count == m.row_count && column_count == m.column_count
 
     rows = Array.new(row_count) {|i|
       Array.new(column_count) {|j|
@@ -1035,8 +1141,8 @@ class Matrix
   #
   # Matrix division (multiplication by the inverse).
   #   Matrix[[7,6], [3,9]] / Matrix[[2,9], [3,1]]
-  #     => -7  1
-  #        -3 -6
+  #   #  => -7  1
+  #   #     -3 -6
   #
   def /(other)
     case other
@@ -1053,18 +1159,29 @@ class Matrix
   end
 
   #
+  # Hadamard product
+  #    Matrix[[1,2], [3,4]].hadamard_product(Matrix[[1,2], [3,2]])
+  #    #  => 1  4
+  #    #     9  8
+  #
+  def hadamard_product(m)
+    combine(m){|a, b| a * b}
+  end
+  alias_method :entrywise_product, :hadamard_product
+
+  #
   # Returns the inverse of the matrix.
   #   Matrix[[-1, -1], [0, -1]].inverse
-  #     => -1  1
-  #         0 -1
+  #   #  => -1  1
+  #   #      0 -1
   #
   def inverse
-    Matrix.Raise ErrDimensionMismatch unless square?
+    raise ErrDimensionMismatch unless square?
     self.class.I(row_count).send(:inverse_from, self)
   end
-  alias inv inverse
+  alias_method :inv, :inverse
 
-  def inverse_from(src) # :nodoc:
+  private def inverse_from(src) # :nodoc:
     last = row_count - 1
     a = src.to_a
 
@@ -1078,7 +1195,7 @@ class Matrix
           akk = v
         end
       end
-      Matrix.Raise ErrNotRegular if akk == 0
+      raise ErrNotRegular if akk == 0
       if i != k
         a[i], a[k] = a[k], a[i]
         @rows[i], @rows[k] = @rows[k], @rows[i]
@@ -1107,7 +1224,6 @@ class Matrix
     end
     self
   end
-  private :inverse_from
 
   #
   # Matrix exponentiation.
@@ -1115,29 +1231,52 @@ class Matrix
   # Non integer exponents will be handled by diagonalizing the matrix.
   #
   #   Matrix[[7,6], [3,9]] ** 2
-  #     => 67 96
-  #        48 99
+  #   #  => 67 96
+  #   #     48 99
   #
-  def ** (other)
-    case other
+  def **(exp)
+    case exp
     when Integer
-      x = self
-      if other <= 0
-        x = self.inverse
-        return self.class.identity(self.column_count) if other == 0
-        other = -other
-      end
-      z = nil
-      loop do
-        z = z ? z * x : x if other[0] == 1
-        return z if (other >>= 1).zero?
-        x *= x
+      case
+      when exp == 0
+        _make_sure_it_is_invertible = inverse
+        self.class.identity(column_count)
+      when exp < 0
+        inverse.power_int(-exp)
+      else
+        power_int(exp)
       end
     when Numeric
       v, d, v_inv = eigensystem
-      v * self.class.diagonal(*d.each(:diagonal).map{|e| e ** other}) * v_inv
+      v * self.class.diagonal(*d.each(:diagonal).map{|e| e ** exp}) * v_inv
+    else
+      raise ErrOperationNotDefined, ["**", self.class, exp.class]
+    end
+  end
+
+  protected def power_int(exp)
+    # assumes `exp` is an Integer > 0
+    #
+    # Previous algorithm:
+    #   build M**2, M**4 = (M**2)**2, M**8, ... and multiplying those you need
+    #   e.g. M**0b1011 = M**11 = M * M**2 * M**8
+    #                              ^  ^
+    #   (highlighted the 2 out of 5 multiplications involving `M * x`)
+    #
+    # Current algorithm has same number of multiplications but with lower exponents:
+    #    M**11 = M * (M * M**4)**2
+    #              ^    ^  ^
+    #   (highlighted the 3 out of 5 multiplications involving `M * x`)
+    #
+    # This should be faster for all (non nil-potent) matrices.
+    case
+    when exp == 1
+      self
+    when exp.odd?
+      self * power_int(exp - 1)
     else
-      Matrix.Raise ErrOperationNotDefined, "**", self.class, other.class
+      sqrt = power_int(exp / 2)
+      sqrt * sqrt
     end
   end
 
@@ -1145,10 +1284,22 @@ class Matrix
     self
   end
 
+  # Unary matrix negation.
+  #
+  #   -Matrix[[1,5], [4,2]]
+  #   # => -1 -5
+  #   #    -4 -2
   def -@
     collect {|e| -e }
   end
 
+  #
+  # Returns the absolute value elementwise
+  #
+  def abs
+    collect(&:abs)
+  end
+
   #--
   # MATRIX FUNCTIONS -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
   #++
@@ -1161,10 +1312,10 @@ class Matrix
   # Consider using exact types like Rational or BigDecimal instead.
   #
   #   Matrix[[7,6], [3,9]].determinant
-  #     => 45
+  #   #  => 45
   #
   def determinant
-    Matrix.Raise ErrDimensionMismatch unless square?
+    raise ErrDimensionMismatch unless square?
     m = @rows
     case row_count
       # Up to 4x4, give result using Laplacian expansion by minors.
@@ -1214,7 +1365,7 @@ class Matrix
   # with smaller bignums (if any), while a matrix of Float will usually have
   # intermediate results with better precision.
   #
-  def determinant_bareiss
+  private def determinant_bareiss
     size = row_count
     last = size - 1
     a = to_a
@@ -1240,16 +1391,15 @@ class Matrix
     end
     sign * pivot
   end
-  private :determinant_bareiss
 
   #
   # deprecated; use Matrix#determinant
   #
   def determinant_e
-    warn "#{caller(1)[0]}: warning: Matrix#determinant_e is deprecated; use #determinant"
+    warn "Matrix#determinant_e is deprecated; use #determinant", uplevel: 1
     determinant
   end
-  alias det_e determinant_e
+  alias_method :det_e, :determinant_e
 
   #
   # Returns a new matrix resulting by stacking horizontally
@@ -1270,7 +1420,7 @@ class Matrix
   # Consider using exact types like Rational or BigDecimal instead.
   #
   #   Matrix[[7,6], [3,9]].rank
-  #     => 2
+  #   #  => 2
   #
   def rank
     # We currently use Bareiss' multistep integer-preserving gaussian elimination
@@ -1304,7 +1454,7 @@ class Matrix
   # deprecated; use Matrix#rank
   #
   def rank_e
-    warn "#{caller(1)[0]}: warning: Matrix#rank_e is deprecated; use #rank"
+    warn "Matrix#rank_e is deprecated; use #rank", uplevel: 1
     rank
   end
 
@@ -1318,31 +1468,31 @@ class Matrix
   #
   # Returns the trace (sum of diagonal elements) of the matrix.
   #   Matrix[[7,6], [3,9]].trace
-  #     => 16
+  #   #  => 16
   #
   def trace
-    Matrix.Raise ErrDimensionMismatch unless square?
+    raise ErrDimensionMismatch unless square?
     (0...column_count).inject(0) do |tr, i|
       tr + @rows[i][i]
     end
   end
-  alias tr trace
+  alias_method :tr, :trace
 
   #
   # Returns the transpose of the matrix.
   #   Matrix[[1,2], [3,4], [5,6]]
-  #     => 1 2
-  #        3 4
-  #        5 6
+  #   #  => 1 2
+  #   #     3 4
+  #   #     5 6
   #   Matrix[[1,2], [3,4], [5,6]].transpose
-  #     => 1 3 5
-  #        2 4 6
+  #   #  => 1 3 5
+  #   #     2 4 6
   #
   def transpose
     return self.class.empty(column_count, 0) if row_count.zero?
     new_matrix @rows.transpose, row_count
   end
-  alias t transpose
+  alias_method :t, :transpose
 
   #
   # Returns a new matrix resulting by stacking vertically
@@ -1371,7 +1521,7 @@ class Matrix
   def eigensystem
     EigenvalueDecomposition.new(self)
   end
-  alias eigen eigensystem
+  alias_method :eigen, :eigensystem
 
   #
   # Returns the LUP decomposition of the matrix; see +LUPDecomposition+.
@@ -1386,7 +1536,7 @@ class Matrix
   def lup
     LUPDecomposition.new(self)
   end
-  alias lup_decomposition lup
+  alias_method :lup_decomposition, :lup
 
   #--
   # COMPLEX ARITHMETIC -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -1395,39 +1545,50 @@ class Matrix
   #
   # Returns the conjugate of the matrix.
   #   Matrix[[Complex(1,2), Complex(0,1), 0], [1, 2, 3]]
-  #     => 1+2i   i  0
-  #           1   2  3
+  #   #  => 1+2i   i  0
+  #   #        1   2  3
   #   Matrix[[Complex(1,2), Complex(0,1), 0], [1, 2, 3]].conjugate
-  #     => 1-2i  -i  0
-  #           1   2  3
+  #   #  => 1-2i  -i  0
+  #   #        1   2  3
   #
   def conjugate
     collect(&:conjugate)
   end
-  alias conj conjugate
+  alias_method :conj, :conjugate
+
+  #
+  # Returns the adjoint of the matrix.
+  #
+  #   Matrix[ [i,1],[2,-i] ].adjoint
+  #   #  => -i 2
+  #   #      1 i
+  #
+  def adjoint
+    conjugate.transpose
+  end
 
   #
   # Returns the imaginary part of the matrix.
   #   Matrix[[Complex(1,2), Complex(0,1), 0], [1, 2, 3]]
-  #     => 1+2i  i  0
-  #           1  2  3
+  #   #  => 1+2i  i  0
+  #   #        1  2  3
   #   Matrix[[Complex(1,2), Complex(0,1), 0], [1, 2, 3]].imaginary
-  #     =>   2i  i  0
-  #           0  0  0
+  #   #  =>   2i  i  0
+  #   #        0  0  0
   #
   def imaginary
     collect(&:imaginary)
   end
-  alias imag imaginary
+  alias_method :imag, :imaginary
 
   #
   # Returns the real part of the matrix.
   #   Matrix[[Complex(1,2), Complex(0,1), 0], [1, 2, 3]]
-  #     => 1+2i  i  0
-  #           1  2  3
+  #   #  => 1+2i  i  0
+  #   #        1  2  3
   #   Matrix[[Complex(1,2), Complex(0,1), 0], [1, 2, 3]].real
-  #     =>    1  0  0
-  #           1  2  3
+  #   #  =>    1  0  0
+  #   #        1  2  3
   #
   def real
     collect(&:real)
@@ -1437,12 +1598,12 @@ class Matrix
   # Returns an array containing matrices corresponding to the real and imaginary
   # parts of the matrix
   #
-  # m.rect == [m.real, m.imag]  # ==> true for all matrices m
+  #   m.rect == [m.real, m.imag]  # ==> true for all matrices m
   #
   def rect
     [real, imag]
   end
-  alias rectangular rect
+  alias_method :rectangular, :rect
 
   #--
   # CONVERTING -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
@@ -1483,24 +1644,40 @@ class Matrix
   end
 
   #
+  # Explicit conversion to a Matrix. Returns self
+  #
+  def to_matrix
+    self
+  end
+
+  #
   # Returns an array of arrays that describe the rows of the matrix.
   #
   def to_a
     @rows.collect(&:dup)
   end
 
+  # Deprecated.
+  #
+  # Use <code>map(&:to_f)</code>
   def elements_to_f
-    warn "#{caller(1)[0]}: warning: Matrix#elements_to_f is deprecated, use map(&:to_f)"
+    warn "Matrix#elements_to_f is deprecated, use map(&:to_f)", uplevel: 1
     map(&:to_f)
   end
 
+  # Deprecated.
+  #
+  # Use <code>map(&:to_i)</code>
   def elements_to_i
-    warn "#{caller(1)[0]}: warning: Matrix#elements_to_i is deprecated, use map(&:to_i)"
+    warn "Matrix#elements_to_i is deprecated, use map(&:to_i)", uplevel: 1
     map(&:to_i)
   end
 
+  # Deprecated.
+  #
+  # Use <code>map(&:to_r)</code>
   def elements_to_r
-    warn "#{caller(1)[0]}: warning: Matrix#elements_to_r is deprecated, use map(&:to_r)"
+    warn "Matrix#elements_to_r is deprecated, use map(&:to_r)", uplevel: 1
     map(&:to_r)
   end
 
@@ -1539,7 +1716,7 @@ class Matrix
     # Converts the obj to an Array. If copy is set to true
     # a copy of obj will be made if necessary.
     #
-    def convert_to_array(obj, copy = false) # :nodoc:
+    private def convert_to_array(obj, copy = false) # :nodoc:
       case obj
       when Array
         copy ? obj.dup : obj
@@ -1555,7 +1732,6 @@ class Matrix
         converted
       end
     end
-    private :convert_to_array
   end
 
   extend ConversionHelper
@@ -1565,14 +1741,13 @@ class Matrix
     # Applies the operator +oper+ with argument +obj+
     # through coercion of +obj+
     #
-    def apply_through_coercion(obj, oper)
+    private def apply_through_coercion(obj, oper)
       coercion = obj.coerce(self)
       raise TypeError unless coercion.is_a?(Array) && coercion.length == 2
       coercion[0].public_send(oper, coercion[1])
     rescue
       raise TypeError, "#{obj.inspect} can't be coerced into #{self.class}"
     end
-    private :apply_through_coercion
 
     #
     # Helper method to coerce a value into a specific class.
@@ -1582,7 +1757,7 @@ class Matrix
     #
     def self.coerce_to(obj, cls, meth) # :nodoc:
       return obj if obj.kind_of?(cls)
-
+      raise TypeError, "Expected a #{cls} but got a #{obj.class}" unless obj.respond_to? meth
       begin
         ret = obj.__send__(meth)
       rescue Exception => e
@@ -1596,6 +1771,30 @@ class Matrix
     def self.coerce_to_int(obj)
       coerce_to(obj, Integer, :to_int)
     end
+
+    def self.coerce_to_matrix(obj)
+      coerce_to(obj, Matrix, :to_matrix)
+    end
+
+    # Returns `nil` for non Ranges
+    # Checks range validity, return canonical range with 0 <= begin <= end < count
+    def self.check_range(val, count, kind)
+      canonical = (val.begin + (val.begin < 0 ? count : 0))..
+                  (val.end ? val.end + (val.end < 0 ? count : 0) - (val.exclude_end? ? 1 : 0)
+                           : count - 1)
+      unless 0 <= canonical.begin && canonical.begin <= canonical.end && canonical.end < count
+        raise IndexError, "given range #{val} is outside of #{kind} dimensions: 0...#{count}"
+      end
+      canonical
+    end
+
+    def self.check_int(val, count, kind)
+      val = CoercionHelper.coerce_to_int(val)
+      if val >= count || val < -count
+        raise IndexError, "given #{kind} #{val} is outside of #{-count}...#{count}"
+      end
+      val
+    end
   end
 
   include CoercionHelper
@@ -1616,7 +1815,7 @@ class Matrix
       when Numeric
         Scalar.new(@value + other)
       when Vector, Matrix
-        Scalar.Raise ErrOperationNotDefined, "+", @value.class, other.class
+        raise ErrOperationNotDefined, ["+", @value.class, other.class]
       else
         apply_through_coercion(other, __method__)
       end
@@ -1627,7 +1826,7 @@ class Matrix
       when Numeric
         Scalar.new(@value - other)
       when Vector, Matrix
-        Scalar.Raise ErrOperationNotDefined, "-", @value.class, other.class
+        raise ErrOperationNotDefined, ["-", @value.class, other.class]
       else
         apply_through_coercion(other, __method__)
       end
@@ -1644,12 +1843,12 @@ class Matrix
       end
     end
 
-    def / (other)
+    def /(other)
       case other
       when Numeric
         Scalar.new(@value / other)
       when Vector
-        Scalar.Raise ErrOperationNotDefined, "/", @value.class, other.class
+        raise ErrOperationNotDefined, ["/", @value.class, other.class]
       when Matrix
         self * other.inverse
       else
@@ -1657,15 +1856,15 @@ class Matrix
       end
     end
 
-    def ** (other)
+    def **(other)
       case other
       when Numeric
         Scalar.new(@value ** other)
       when Vector
-        Scalar.Raise ErrOperationNotDefined, "**", @value.class, other.class
+        raise ErrOperationNotDefined, ["**", @value.class, other.class]
       when Matrix
         #other.powered_by(self)
-        Scalar.Raise ErrOperationNotImplemented, "**", @value.class, other.class
+        raise ErrOperationNotImplemented, ["**", @value.class, other.class]
       else
         apply_through_coercion(other, __method__)
       end
@@ -1685,10 +1884,14 @@ end
 # * Vector.[](*array)
 # * Vector.elements(array, copy = true)
 # * Vector.basis(size: n, index: k)
+# * Vector.zero(n)
 #
 # To access elements:
 # * #[](i)
 #
+# To set elements:
+# * #[]=(i, v)
+#
 # To enumerate the elements:
 # * #each2(v)
 # * #collect2(v)
@@ -1697,6 +1900,7 @@ end
 # * #angle_with(v)
 # * Vector.independent?(*vs)
 # * #independent?(*vs)
+# * #zero?
 #
 # Vector arithmetic:
 # * #*(x) "is matrix or number"
@@ -1707,11 +1911,13 @@ end
 # * #-@
 #
 # Vector functions:
-# * #inner_product(v), dot(v)
-# * #cross_product(v), cross(v)
+# * #inner_product(v), #dot(v)
+# * #cross_product(v), #cross(v)
 # * #collect
+# * #collect!
 # * #magnitude
 # * #map
+# * #map!
 # * #map2(v)
 # * #norm
 # * #normalize
@@ -1769,6 +1975,17 @@ class Vector
   end
 
   #
+  # Return a zero vector.
+  #
+  #    Vector.zero(3) # => Vector[0, 0, 0]
+  #
+  def Vector.zero(size)
+    raise ArgumentError, "invalid size (#{size} for 0..)" if size < 0
+    array = Array.new(size, 0)
+    new convert_to_array(array, false)
+  end
+
+  #
   # Vector.new is private; use Vector[] or Vector.elements to create.
   #
   def initialize(array)
@@ -1779,7 +1996,11 @@ class Vector
   # ACCESSING
 
   #
-  # Returns element number +i+ (starting at zero) of the vector.
+  # :call-seq:
+  #   vector[range]
+  #   vector[integer]
+  #
+  # Returns element or elements of the vector.
   #
   def [](i)
     @elements[i]
@@ -1787,12 +2008,44 @@ class Vector
   alias element []
   alias component []
 
+  #
+  # :call-seq:
+  #   vector[range] = new_vector
+  #   vector[range] = row_matrix
+  #   vector[range] = new_element
+  #   vector[integer] = new_element
+  #
+  # Set element or elements of vector.
+  #
   def []=(i, v)
-    @elements[i]= v
+    raise FrozenError, "can't modify frozen Vector" if frozen?
+    if i.is_a?(Range)
+      range = Matrix::CoercionHelper.check_range(i, size, :vector)
+      set_range(range, v)
+    else
+      index = Matrix::CoercionHelper.check_int(i, size, :index)
+      set_value(index, v)
+    end
   end
   alias set_element []=
   alias set_component []=
-  private :[]=, :set_element, :set_component
+  private :set_element, :set_component
+
+  private def set_value(index, value)
+    @elements[index] = value
+  end
+
+  private def set_range(range, value)
+    if value.is_a?(Vector)
+      raise ArgumentError, "vector to be set has wrong size" unless range.size == value.size
+      @elements[range] = value.elements
+    elsif value.is_a?(Matrix)
+      raise ErrDimensionMismatch unless value.row_count == 1
+      @elements[range] = value.row(0).elements
+    else
+      @elements[range] = Array.new(range.size, value)
+    end
+  end
 
   # Returns a vector with entries rounded to the given precision
   # (see Float#round)
@@ -1826,7 +2079,7 @@ class Vector
   #
   def each2(v) # :yield: e1, e2
     raise TypeError, "Integer is not like Vector" if v.kind_of?(Integer)
-    Vector.Raise ErrDimensionMismatch if size != v.size
+    raise ErrDimensionMismatch if size != v.size
     return to_enum(:each2, v) unless block_given?
     size.times do |i|
       yield @elements[i], v[i]
@@ -1840,7 +2093,7 @@ class Vector
   #
   def collect2(v) # :yield: e1, e2
     raise TypeError, "Integer is not like Vector" if v.kind_of?(Integer)
-    Vector.Raise ErrDimensionMismatch if size != v.size
+    raise ErrDimensionMismatch if size != v.size
     return to_enum(:collect2, v) unless block_given?
     Array.new(size) do |i|
       yield @elements[i], v[i]
@@ -1855,15 +2108,15 @@ class Vector
   # Returns +true+ iff all of vectors are linearly independent.
   #
   #   Vector.independent?(Vector[1,0], Vector[0,1])
-  #     => true
+  #   #  => true
   #
   #   Vector.independent?(Vector[1,2], Vector[2,4])
-  #     => false
+  #   #  => false
   #
   def Vector.independent?(*vs)
     vs.each do |v|
       raise TypeError, "expected Vector, got #{v.class}" unless v.is_a?(Vector)
-      Vector.Raise ErrDimensionMismatch unless v.size == vs.first.size
+      raise ErrDimensionMismatch unless v.size == vs.first.size
     end
     return false if vs.count > vs.first.size
     Matrix[*vs].rank.eql?(vs.count)
@@ -1873,15 +2126,39 @@ class Vector
   # Returns +true+ iff all of vectors are linearly independent.
   #
   #   Vector[1,0].independent?(Vector[0,1])
-  #     => true
+  #   # => true
   #
   #   Vector[1,2].independent?(Vector[2,4])
-  #     => false
+  #   # => false
   #
   def independent?(*vs)
     self.class.independent?(self, *vs)
   end
 
+  #
+  # Returns +true+ iff all elements are zero.
+  #
+  def zero?
+    all?(&:zero?)
+  end
+
+  #
+  # Makes the matrix frozen and Ractor-shareable
+  #
+  def freeze
+    @elements.freeze
+    super
+  end
+
+  #
+  # Called for dup & clone.
+  #
+  private def initialize_copy(v)
+    super
+    @elements = @elements.dup unless frozen?
+  end
+
+
   #--
   # COMPARING -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
   #++
@@ -1900,13 +2177,6 @@ class Vector
   end
 
   #
-  # Returns a copy of the vector.
-  #
-  def clone
-    self.class.elements(@elements)
-  end
-
-  #
   # Returns a hash-code for the vector.
   #
   def hash
@@ -1928,7 +2198,7 @@ class Vector
     when Matrix
       Matrix.column_vector(self) * x
     when Vector
-      Vector.Raise ErrOperationNotDefined, "*", self.class, x.class
+      raise ErrOperationNotDefined, ["*", self.class, x.class]
     else
       apply_through_coercion(x, __method__)
     end
@@ -1940,7 +2210,7 @@ class Vector
   def +(v)
     case v
     when Vector
-      Vector.Raise ErrDimensionMismatch if size != v.size
+      raise ErrDimensionMismatch if size != v.size
       els = collect2(v) {|v1, v2|
         v1 + v2
       }
@@ -1958,7 +2228,7 @@ class Vector
   def -(v)
     case v
     when Vector
-      Vector.Raise ErrDimensionMismatch if size != v.size
+      raise ErrDimensionMismatch if size != v.size
       els = collect2(v) {|v1, v2|
         v1 - v2
       }
@@ -1979,7 +2249,7 @@ class Vector
       els = @elements.collect{|e| e / x}
       self.class.elements(els, false)
     when Matrix, Vector
-      Vector.Raise ErrOperationNotDefined, "/", self.class, x.class
+      raise ErrOperationNotDefined, ["/", self.class, x.class]
     else
       apply_through_coercion(x, __method__)
     end
@@ -1999,10 +2269,10 @@ class Vector
 
   #
   # Returns the inner product of this vector with the other.
-  #   Vector[4,7].inner_product Vector[10,1]  => 47
+  #   Vector[4,7].inner_product Vector[10,1] # => 47
   #
   def inner_product(v)
-    Vector.Raise ErrDimensionMismatch if size != v.size
+    raise ErrDimensionMismatch if size != v.size
 
     p = 0
     each2(v) {|v1, v2|
@@ -2014,7 +2284,7 @@ class Vector
 
   #
   # Returns the cross product of this vector with the others.
-  #   Vector[1, 0, 0].cross_product Vector[0, 1, 0]   => Vector[0, 0, 1]
+  #   Vector[1, 0, 0].cross_product Vector[0, 1, 0]  # => Vector[0, 0, 1]
   #
   # It is generalized to other dimensions to return a vector perpendicular
   # to the arguments.
@@ -2029,7 +2299,7 @@ class Vector
     raise ArgumentError, "wrong number of arguments (#{vs.size} for #{size - 2})" unless vs.size == size - 2
     vs.each do |v|
       raise TypeError, "expected Vector, got #{v.class}" unless v.is_a? Vector
-      Vector.Raise ErrDimensionMismatch unless v.size == size
+      raise ErrDimensionMismatch unless v.size == size
     end
     case size
     when 2
@@ -2054,17 +2324,28 @@ class Vector
     els = @elements.collect(&block)
     self.class.elements(els, false)
   end
-  alias map collect
+  alias_method :map, :collect
+
+  #
+  # Like Array#collect!
+  #
+  def collect!(&block)
+    return to_enum(:collect!) unless block_given?
+    raise FrozenError, "can't modify frozen Vector" if frozen?
+    @elements.collect!(&block)
+    self
+  end
+  alias map! collect!
 
   #
   # Returns the modulus (Pythagorean distance) of the vector.
-  #   Vector[5,8,2].r => 9.643650761
+  #   Vector[5,8,2].r # => 9.643650761
   #
   def magnitude
     Math.sqrt(@elements.inject(0) {|v, e| v + e.abs2})
   end
-  alias r magnitude
-  alias norm magnitude
+  alias_method :r, :magnitude
+  alias_method :norm, :magnitude
 
   #
   # Like Vector#collect2, but returns a Vector instead of an Array.
@@ -2081,7 +2362,7 @@ class Vector
   # Returns a new vector with the same direction but with norm 1.
   #   v = Vector[5,8,2].normalize
   #   # => Vector[0.5184758473652127, 0.8295613557843402, 0.20739033894608505]
-  #   v.norm => 1.0
+  #   v.norm # => 1.0
   #
   def normalize
     n = magnitude
@@ -2090,17 +2371,21 @@ class Vector
   end
 
   #
-  # Returns an angle with another vector. Result is within the [0...Math::PI].
+  # Returns an angle with another vector. Result is within the [0..Math::PI].
   #   Vector[1,0].angle_with(Vector[0,1])
   #   # => Math::PI / 2
   #
   def angle_with(v)
     raise TypeError, "Expected a Vector, got a #{v.class}" unless v.is_a?(Vector)
-    Vector.Raise ErrDimensionMismatch if size != v.size
+    raise ErrDimensionMismatch if size != v.size
     prod = magnitude * v.magnitude
     raise ZeroVectorError, "Can't get angle of zero vector" if prod == 0
-
-    Math.acos( inner_product(v) / prod )
+    dot = inner_product(v)
+    if dot.abs >= prod
+      dot.positive? ? 0 : Math::PI
+    else
+      Math.acos(dot / prod)
+    end
   end
 
   #--
@@ -2121,18 +2406,25 @@ class Vector
     @elements.dup
   end
 
+  #
+  # Return a single-column matrix from this vector
+  #
+  def to_matrix
+    Matrix.column_vector(self)
+  end
+
   def elements_to_f
-    warn "#{caller(1)[0]}: warning: Vector#elements_to_f is deprecated"
+    warn "Vector#elements_to_f is deprecated", uplevel: 1
     map(&:to_f)
   end
 
   def elements_to_i
-    warn "#{caller(1)[0]}: warning: Vector#elements_to_i is deprecated"
+    warn "Vector#elements_to_i is deprecated", uplevel: 1
     map(&:to_i)
   end
 
   def elements_to_r
-    warn "#{caller(1)[0]}: warning: Vector#elements_to_r is deprecated"
+    warn "Vector#elements_to_r is deprecated", uplevel: 1
     map(&:to_r)
   end
 
diff --git a/lib/matrix/eigenvalue_decomposition.rb b/lib/matrix/eigenvalue_decomposition.rb
index 919db9e83d..bf6637635a 100644
--- a/lib/matrix/eigenvalue_decomposition.rb
+++ b/lib/matrix/eigenvalue_decomposition.rb
@@ -43,7 +43,7 @@ class Matrix
     def eigenvector_matrix
       Matrix.send(:new, build_eigenvectors.transpose)
     end
-    alias v eigenvector_matrix
+    alias_method :v, :eigenvector_matrix
 
     # Returns the inverse of the eigenvector matrix +V+
     #
@@ -52,7 +52,7 @@ class Matrix
       r = r.transpose.inverse unless @symmetric
       r
     end
-    alias v_inv eigenvector_matrix_inv
+    alias_method :v_inv, :eigenvector_matrix_inv
 
     # Returns the eigenvalues in an array
     #
@@ -73,7 +73,7 @@ class Matrix
     def eigenvalue_matrix
       Matrix.diagonal(*eigenvalues)
     end
-    alias d eigenvalue_matrix
+    alias_method :d, :eigenvalue_matrix
 
     # Returns [eigenvector_matrix, eigenvalue_matrix, eigenvector_matrix_inv]
     #
@@ -82,8 +82,8 @@ class Matrix
     end
     alias_method :to_a, :to_ary
 
-  private
-    def build_eigenvectors
+
+    private def build_eigenvectors
       # JAMA stores complex eigenvectors in a strange way
       # See http://web.archive.org/web/20111016032731/http://cio.nist.gov/esd/emaildir/lists/jama/msg01021.html
       @e.each_with_index.map do |imag, i|
@@ -96,9 +96,10 @@ class Matrix
         end
       end
     end
+
     # Complex scalar division.
 
-    def cdiv(xr, xi, yr, yi)
+    private def cdiv(xr, xi, yr, yi)
       if (yr.abs > yi.abs)
         r = yi/yr
         d = yr + r*yi
@@ -113,7 +114,7 @@ class Matrix
 
     # Symmetric Householder reduction to tridiagonal form.
 
-    def tridiagonalize
+    private def tridiagonalize
 
       #  This is derived from the Algol procedures tred2 by
       #  Bowdler, Martin, Reinsch, and Wilkinson, Handbook for
@@ -231,7 +232,7 @@ class Matrix
 
     # Symmetric tridiagonal QL algorithm.
 
-    def diagonalize
+    private def diagonalize
       #  This is derived from the Algol procedures tql2, by
       #  Bowdler, Martin, Reinsch, and Wilkinson, Handbook for
       #  Auto. Comp., Vol.ii-Linear Algebra, and the corresponding
@@ -350,7 +351,7 @@ class Matrix
 
     # Nonsymmetric reduction to Hessenberg form.
 
-    def reduce_to_hessenberg
+    private def reduce_to_hessenberg
       #  This is derived from the Algol procedures orthes and ortran,
       #  by Martin and Wilkinson, Handbook for Auto. Comp.,
       #  Vol.ii-Linear Algebra, and the corresponding
@@ -440,11 +441,9 @@ class Matrix
       end
     end
 
-
-
     # Nonsymmetric reduction from Hessenberg to real Schur form.
 
-    def hessenberg_to_real_schur
+    private def hessenberg_to_real_schur
 
       #  This is derived from the Algol procedure hqr2,
       #  by Martin and Wilkinson, Handbook for Auto. Comp.,
diff --git a/lib/matrix/lup_decomposition.rb b/lib/matrix/lup_decomposition.rb
index 9c1998fd36..e37def75f6 100644
--- a/lib/matrix/lup_decomposition.rb
+++ b/lib/matrix/lup_decomposition.rb
@@ -64,7 +64,7 @@ class Matrix
 
     # Returns +true+ if +U+, and hence +A+, is singular.
 
-    def singular? ()
+    def singular?
       @column_count.times do |j|
         if (@lu[j][j] == 0)
           return true
@@ -78,7 +78,7 @@ class Matrix
 
     def det
       if (@row_count != @column_count)
-        Matrix.Raise Matrix::ErrDimensionMismatch
+        raise Matrix::ErrDimensionMismatch
       end
       d = @pivot_sign
       @column_count.times do |j|
@@ -94,11 +94,11 @@ class Matrix
 
     def solve b
       if (singular?)
-        Matrix.Raise Matrix::ErrNotRegular, "Matrix is singular."
+        raise Matrix::ErrNotRegular, "Matrix is singular."
       end
       if b.is_a? Matrix
         if (b.row_count != @row_count)
-          Matrix.Raise Matrix::ErrDimensionMismatch
+          raise Matrix::ErrDimensionMismatch
         end
 
         # Copy right hand side with pivoting
@@ -128,7 +128,7 @@ class Matrix
       else # same algorithm, specialized for simpler case of a vector
         b = convert_to_array(b)
         if (b.size != @row_count)
-          Matrix.Raise Matrix::ErrDimensionMismatch
+          raise Matrix::ErrDimensionMismatch
         end
 
         # Copy right hand side with pivoting
diff --git a/lib/matrix/matrix.gemspec b/lib/matrix/matrix.gemspec
new file mode 100644
index 0000000000..d2ff9ce7c6
--- /dev/null
+++ b/lib/matrix/matrix.gemspec
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+begin
+  require_relative "lib/matrix/version"
+rescue LoadError
+  # for Ruby core repository
+  require_relative "version"
+end
+
+Gem::Specification.new do |spec|
+  spec.name          = "matrix"
+  spec.version       = Matrix::VERSION
+  spec.authors       = ["Marc-Andre Lafortune"]
+  spec.email         = ["ruby-core@marc-andre.ca"]
+
+  spec.summary       = %q{An implementation of Matrix and Vector classes.}
+  spec.description   = %q{An implementation of Matrix and Vector classes.}
+  spec.homepage      = "https://github.com/ruby/matrix"
+  spec.licenses      = ["Ruby", "BSD-2-Clause"]
+  spec.required_ruby_version = ">= 2.5.0"
+
+  spec.files         = [".gitignore", "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "bin/console", "bin/setup", "lib/matrix.rb", "lib/matrix/eigenvalue_decomposition.rb", "lib/matrix/lup_decomposition.rb", "lib/matrix/version.rb", "matrix.gemspec"]
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+end
diff --git a/lib/matrix/version.rb b/lib/matrix/version.rb
new file mode 100644
index 0000000000..4a8bc36aaa
--- /dev/null
+++ b/lib/matrix/version.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class Matrix
+  VERSION = "0.3.1"
+end
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 53aea8cecd..66f2960cb8 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -7,8 +7,9 @@ require 'rbconfig'
 require 'fileutils'
 require 'shellwords'
 
-# :stopdoc:
 class String
+  # :stopdoc:
+
   # Wraps a string in escaped quotes if it contains whitespace.
   def quote
     /\s/ =~ self ? "\"#{self}\"" : "#{self}"
@@ -31,15 +32,20 @@ class String
   def sans_arguments
     self[/\A[^()]+/]
   end
+
+  # :startdoc:
 end
 
 class Array
+  # :stopdoc:
+
   # Wraps all strings in escaped quotes if they contain whitespace.
   def quote
     map {|s| s.quote}
   end
+
+  # :startdoc:
 end
-# :startdoc:
 
 ##
 # mkmf.rb is used by Ruby C extensions to generate a Makefile which will
@@ -129,7 +135,6 @@ module MakeMakefile
   $vendorarchdir = CONFIG["vendorarchdir"]
 
   $mswin = /mswin/ =~ RUBY_PLATFORM
-  $bccwin = /bccwin/ =~ RUBY_PLATFORM
   $mingw = /mingw/ =~ RUBY_PLATFORM
   $cygwin = /cygwin/ =~ RUBY_PLATFORM
   $netbsd = /netbsd/ =~ RUBY_PLATFORM
@@ -176,7 +181,7 @@ module MakeMakefile
   ]
 
   def install_dirs(target_prefix = nil)
-    if $extout
+    if $extout and $extmk
       dirs = [
         ['BINDIR',        '$(extout)/bin'],
         ['RUBYCOMMONDIR', '$(extout)/common'],
@@ -202,8 +207,8 @@ module MakeMakefile
         ['RUBYCOMMONDIR', '$(vendordir)$(target_prefix)'],
         ['RUBYLIBDIR',    '$(vendorlibdir)$(target_prefix)'],
         ['RUBYARCHDIR',   '$(vendorarchdir)$(target_prefix)'],
-        ['HDRDIR',        '$(rubyhdrdir)/ruby$(target_prefix)'],
-        ['ARCHHDRDIR',    '$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'],
+        ['HDRDIR',        '$(vendorhdrdir)$(target_prefix)'],
+        ['ARCHHDRDIR',    '$(vendorarchhdrdir)$(target_prefix)'],
       ]
     else
       dirs = [
@@ -211,8 +216,8 @@ module MakeMakefile
         ['RUBYCOMMONDIR', '$(sitedir)$(target_prefix)'],
         ['RUBYLIBDIR',    '$(sitelibdir)$(target_prefix)'],
         ['RUBYARCHDIR',   '$(sitearchdir)$(target_prefix)'],
-        ['HDRDIR',        '$(rubyhdrdir)/ruby$(target_prefix)'],
-        ['ARCHHDRDIR',    '$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'],
+        ['HDRDIR',        '$(sitehdrdir)$(target_prefix)'],
+        ['ARCHHDRDIR',    '$(sitearchhdrdir)$(target_prefix)'],
       ]
     end
     dirs << ['target_prefix', (target_prefix ? "/#{target_prefix}" : "")]
@@ -242,7 +247,12 @@ module MakeMakefile
     $topdir ||= RbConfig::CONFIG["topdir"]
     $arch_hdrdir = "$(extout)/include/$(arch)"
   else
-    abort "mkmf.rb can't find header files for ruby at #{$hdrdir}/ruby.h"
+    abort <<MESSAGE
+mkmf.rb can't find header files for ruby at #{$hdrdir}/ruby.h
+
+You might have to install separate package for the ruby development
+environment, ruby-dev or ruby-devel for example.
+MESSAGE
   end
 
   CONFTEST = "conftest".freeze
@@ -250,6 +260,7 @@ module MakeMakefile
 
   OUTFLAG = CONFIG['OUTFLAG']
   COUTFLAG = CONFIG['COUTFLAG']
+  CSRCFLAG = CONFIG['CSRCFLAG']
   CPPOUTFILE = config_string('CPPOUTFILE') {|str| str.sub(/\bconftest\b/, CONFTEST)}
 
   def rm_f(*files)
@@ -423,6 +434,10 @@ EOM
 EOM
   end
 
+  def conftest_source
+    CONFTEST_C
+  end
+
   def create_tmpsrc(src)
     src = "#{COMMON_HEADERS}\n#{src}"
     src = yield(src) if block_given?
@@ -431,7 +446,7 @@ EOM
     src.sub!(/[^\n]\z/, "\\&\n")
     count = 0
     begin
-      open(CONFTEST_C, "wb") do |cfile|
+      open(conftest_source, "wb") do |cfile|
         cfile.print src
       end
     rescue Errno::EACCES
@@ -463,14 +478,13 @@ MSG
       xsystem(command, *opts)
     ensure
       log_src(src)
-      MakeMakefile.rm_rf "#{CONFTEST}.dSYM"
     end
   end
 
-  def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH)
+  def link_config(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH)
     librubyarg = $extmk ? $LIBRUBYARG_STATIC : "$(LIBRUBYARG)"
     conf = RbConfig::CONFIG.merge('hdrdir' => $hdrdir.quote,
-                                  'src' => "#{CONFTEST_C}",
+                                  'src' => "#{conftest_source}",
                                   'arch_hdrdir' => $arch_hdrdir.quote,
                                   'top_srcdir' => $top_srcdir.quote,
                                   'INCFLAGS' => "#$INCFLAGS",
@@ -481,21 +495,29 @@ MSG
                                   'LOCAL_LIBS' => "#$LOCAL_LIBS #$libs",
                                   'LIBS' => "#{librubyarg} #{opt} #$LIBS")
     conf['LIBPATH'] = libpathflag(libpath.map {|s| RbConfig::expand(s.dup, conf)})
+    conf
+  end
+
+  def link_command(ldflags, *opts)
+    conf = link_config(ldflags, *opts)
     RbConfig::expand(TRY_LINK.dup, conf)
   end
 
-  def cc_command(opt="")
+  def cc_config(opt="")
     conf = RbConfig::CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote,
                                   'arch_hdrdir' => $arch_hdrdir.quote,
                                   'top_srcdir' => $top_srcdir.quote)
+    conf
+  end
+
+  def cc_command(opt="")
+    conf = cc_config(opt)
     RbConfig::expand("$(CC) #$INCFLAGS #$CPPFLAGS #$CFLAGS #$ARCH_FLAG #{opt} -c #{CONFTEST_C}",
                      conf)
   end
 
   def cpp_command(outfile, opt="")
-    conf = RbConfig::CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote,
-                                  'arch_hdrdir' => $arch_hdrdir.quote,
-                                  'top_srcdir' => $top_srcdir.quote)
+    conf = cc_config(opt)
     if $universal and (arch_flag = conf['ARCH_FLAG']) and !arch_flag.empty?
       conf['ARCH_FLAG'] = arch_flag.gsub(/(?:\G|\s)-arch\s+\S+/, '')
     end
@@ -526,6 +548,7 @@ MSG
   end
 
   def try_link0(src, opt="", *opts, &b) # :nodoc:
+    exe = CONFTEST+$EXEEXT
     cmd = link_command("", opt)
     if $universal
       require 'tmpdir'
@@ -539,7 +562,10 @@ MSG
       end
     else
       try_do(src, cmd, *opts, &b)
-    end and File.executable?(CONFTEST+$EXEEXT)
+    end and File.executable?(exe) or return nil
+    exe
+  ensure
+    MakeMakefile.rm_rf(*Dir["#{CONFTEST}*"]-[exe])
   end
 
   # Returns whether or not the +src+ can be compiled as a C source and linked
@@ -553,9 +579,9 @@ MSG
   # [+src+] a String which contains a C source
   # [+opt+] a String which contains linker options
   def try_link(src, opt="", *opts, &b)
-    try_link0(src, opt, *opts, &b)
-  ensure
-    MakeMakefile.rm_f "#{CONFTEST}*", "c0x32*"
+    exe = try_link0(src, opt, *opts, &b) or return false
+    MakeMakefile.rm_f exe
+    true
   end
 
   # Returns whether or not the +src+ can be compiled as a C source.  +opt+ is
@@ -654,7 +680,8 @@ MSG
   end
 
   def try_ldflags(flags, opts = {})
-    try_link(MAIN_DOES_NOTHING, flags, {:werror => true}.update(opts))
+    opts = {:werror => true}.update(opts) if $mswin
+    try_link(MAIN_DOES_NOTHING, flags, opts)
   end
 
   def append_ldflags(flags, *opts)
@@ -729,7 +756,7 @@ int main() {printf("%"PRI_CONFTEST_PREFIX"#{neg ? 'd' : 'u'}\\n", conftest_const
           end
         end
       ensure
-        MakeMakefile.rm_f "#{CONFTEST}*"
+        MakeMakefile.rm_f "#{CONFTEST}#{$EXEEXT}"
       end
     end
     nil
@@ -757,7 +784,7 @@ int main() {printf("%"PRI_CONFTEST_PREFIX"#{neg ? 'd' : 'u'}\\n", conftest_const
     if opt and !opt.empty?
       [[:to_str], [:join, " "], [:to_s]].each do |meth, *args|
         if opt.respond_to?(meth)
-          break opt = opt.send(meth, *args)
+          break opt = opt.__send__(meth, *args)
         end
       end
       opt = "#{opt} #{libs}"
@@ -942,10 +969,10 @@ SRC
     a = r = nil
     Logging::postpone do
       r = yield
-      a = (fmt ? "#{fmt % r}" : r ? "yes" : "no") << "\n"
-      "#{f}#{m}-------------------- #{a}\n"
+      a = (fmt ? "#{fmt % r}" : r ? "yes" : "no")
+      "#{f}#{m}-------------------- #{a}\n\n"
     end
-    message(a)
+    message "%s\n", a
     Logging::message "--------------------\n\n"
     r
   end
@@ -955,7 +982,7 @@ SRC
       if noun
         [[:to_str], [:join, ","], [:to_s]].each do |meth, *args|
           if noun.respond_to?(meth)
-            break noun = noun.send(meth, *args)
+            break noun = noun.__send__(meth, *args)
           end
         end
         unless noun.empty?
@@ -992,6 +1019,7 @@ SRC
   # <code>--with-FOOlib</code> configuration option.
   #
   def have_library(lib, func = nil, headers = nil, opt = "", &b)
+    dir_config(lib)
     lib = with_config(lib+'lib', lib)
     checking_for checking_message(func && func.funcall_style, LIBARG%lib, opt) do
       if COMMON_LIBS.include?(lib)
@@ -1017,6 +1045,7 @@ SRC
   # library paths searched and linked against.
   #
   def find_library(lib, func, *paths, &b)
+    dir_config(lib)
     lib = with_config(lib+'lib', lib)
     paths = paths.collect {|path| path.split(File::PATH_SEPARATOR)}.flatten
     checking_for checking_message(func && func.funcall_style, LIBARG%lib) do
@@ -1090,6 +1119,7 @@ SRC
   # +HAVE_FOO_H+ preprocessor macro would be passed to the compiler.
   #
   def have_header(header, preheaders = nil, opt = "", &b)
+    dir_config(header[/.*?(?=\/)|.*?(?=\.)/])
     checking_for header do
       if try_header(cpp_include(preheaders)+cpp_include(header), opt, &b)
         $defs.push(format("-DHAVE_%s", header.tr_cpp))
@@ -1371,7 +1401,7 @@ SRC
   # _convertible_ means actually the same type, or typedef'd from the same
   # type.
   #
-  # If the +type+ is a integer type and the _convertible_ type is found,
+  # If the +type+ is an integer type and the _convertible_ type is found,
   # the following macros are passed as preprocessor constants to the compiler
   # using the +type+ name, in uppercase.
   #
@@ -1733,6 +1763,10 @@ SRC
   # application.
   #
   def dir_config(target, idefault=nil, ldefault=nil)
+    if conf = $config_dirs[target]
+      return conf
+    end
+
     if dir = with_config(target + "-dir", (idefault unless ldefault))
       defaults = Array === dir ? dir : dir.split(File::PATH_SEPARATOR)
       idefault = ldefault = nil
@@ -1763,7 +1797,7 @@ SRC
     end
     $LIBPATH = ldirs | $LIBPATH
 
-    [idir, ldir]
+    $config_dirs[target] = [idir, ldir]
   end
 
   # Returns compile/link information about an installed library in a
@@ -1779,7 +1813,7 @@ SRC
   #
   # Where {option} is, for instance, <code>--cflags</code>.
   #
-  # The values obtained are appended to +$CFLAGS+, +$LDFLAGS+ and
+  # The values obtained are appended to +$INCFLAGS+, +$CFLAGS+, +$LDFLAGS+ and
   # +$libs+.
   #
   # If an <code>option</code> argument is given, the config command is
@@ -1835,9 +1869,9 @@ SRC
 
       $LDFLAGS = [orig_ldflags, ldflags].join(' ')
       Logging::message "package configuration for %s\n", pkg
-      Logging::message "cflags: %s\nldflags: %s\nlibs: %s\n\n",
-                       cflags, ldflags, libs
-      [cflags, ldflags, libs]
+      Logging::message "incflags: %s\ncflags: %s\nldflags: %s\nlibs: %s\n\n",
+                       incflags, cflags, ldflags, libs
+      [[incflags, cflags].join(' '), ldflags, libs]
     else
       Logging::message "package configuration for %s is not found\n", pkg
       nil
@@ -1908,7 +1942,7 @@ NULLCMD = #{CONFIG['NULLCMD']}
 srcdir = #{srcdir.gsub(/\$\((srcdir)\)|\$\{(srcdir)\}/) {mkintpath(CONFIG[$1||$2]).unspace}}
 topdir = #{mkintpath(topdir = $extmk ? CONFIG["topdir"] : $topdir).unspace}
 hdrdir = #{(hdrdir = CONFIG["hdrdir"]) == topdir ? "$(topdir)" : mkintpath(hdrdir).unspace}
-arch_hdrdir = #{$arch_hdrdir.quote}
+arch_hdrdir = #{mkintpath($arch_hdrdir).unspace}
 PATH_SEPARATOR = #{CONFIG['PATH_SEPARATOR']}
 VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
 }
@@ -1936,10 +1970,11 @@ VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
     else
       sep = ""
     end
-    possible_command = (proc {|s| s if /top_srcdir/ !~ s} unless $extmk)
+    possible_command = (proc {|s| s if /top_srcdir|tooldir/ !~ s} unless $extmk)
     extconf_h = $extconf_h ? "-DRUBY_EXTCONF_H=\\\"$(RUBY_EXTCONF_H)\\\" " : $defs.join(" ") << " "
     headers = %w[
       $(hdrdir)/ruby.h
+      $(hdrdir)/ruby/backward.h
       $(hdrdir)/ruby/ruby.h
       $(hdrdir)/ruby/defines.h
       $(hdrdir)/ruby/missing.h
@@ -1947,6 +1982,7 @@ VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
       $(hdrdir)/ruby/st.h
       $(hdrdir)/ruby/subst.h
     ]
+    headers += $headers
     if RULE_SUBST
       headers.each {|h| h.sub!(/.*/, &RULE_SUBST.method(:%))}
     end
@@ -1954,6 +1990,7 @@ VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
     headers << '$(RUBY_EXTCONF_H)' if $extconf_h
     mk << %{
 
+CC_WRAPPER = #{CONFIG['CC_WRAPPER']}
 CC = #{CONFIG['CC']}
 CXX = #{CONFIG['CXX']}
 LIBRUBY = #{CONFIG['LIBRUBY']}
@@ -1963,6 +2000,7 @@ LIBRUBYARG_STATIC = #$LIBRUBYARG_STATIC
 empty =
 OUTFLAG = #{OUTFLAG}$(empty)
 COUTFLAG = #{COUTFLAG}$(empty)
+CSRCFLAG = #{CSRCFLAG}$(empty)
 
 RUBY_EXTCONF_H = #{$extconf_h}
 cflags   = #{CONFIG['cflags']}
@@ -1970,6 +2008,7 @@ cxxflags = #{CONFIG['cxxflags']}
 optflags = #{CONFIG['optflags']}
 debugflags = #{CONFIG['debugflags']}
 warnflags = #{$warnflags}
+cppflags = #{CONFIG['cppflags']}
 CCDLFLAGS = #{$static ? '' : CONFIG['CCDLFLAGS']}
 CFLAGS   = $(CCDLFLAGS) #$CFLAGS $(ARCH_FLAG)
 INCFLAGS = -I. #$INCFLAGS
@@ -1995,6 +2034,11 @@ sitearch = #{CONFIG['sitearch']}
 ruby_version = #{RbConfig::CONFIG['ruby_version']}
 ruby = #{$ruby.sub(%r[\A#{Regexp.quote(RbConfig::CONFIG['bindir'])}(?=/|\z)]) {'$(bindir)'}}
 RUBY = $(ruby#{sep})
+BUILTRUBY = #{if defined?($builtruby) && $builtruby
+    $builtruby
+  else
+    File.join('$(bindir)', CONFIG["RUBY_INSTALL_NAME"] + CONFIG['EXEEXT'])
+  end}
 ruby_headers = #{headers.join(' ')}
 
 RM = #{config_string('RM', &possible_command) || '$(RUBY) -run -e rm -- -f'}
@@ -2011,28 +2055,21 @@ TOUCH = exit >
 
 preload = #{defined?($preload) && $preload ? $preload.join(' ') : ''}
 }
-    if $nmake == ?b
-      mk.each do |x|
-        x.gsub!(/^(MAKEDIRS|INSTALL_(?:PROG|DATA))+\s*=.*\n/) do
-          "!ifndef " + $1 + "\n" +
-          $& +
-          "!endif\n"
-        end
-      end
-    end
     mk
   end
 
   def timestamp_file(name, target_prefix = nil)
-    if target_prefix
-      pat = []
-      install_dirs.each do |n, d|
-        pat << n if /\$\(target_prefix\)\z/ =~ d
-      end
-      name = name.gsub(/\$\((#{pat.join("|")})\)/) {$&+target_prefix}
-    end
+    pat = {}
+    name = '$(RUBYARCHDIR)' if name == '$(TARGET_SO_DIR)'
+    install_dirs.each do |n, d|
+      pat[n] = $` if /\$\(target_prefix\)\z/ =~ d
+    end
+    name = name.gsub(/\$\((#{pat.keys.join("|")})\)/) {pat[$1]+target_prefix}
+    name.sub!(/(\$\((?:site)?arch\))\/*/, '')
+    arch = $1 || ''
+    name.chomp!('/')
     name = name.gsub(/(\$[({]|[})])|(\/+)|[^-.\w]+/) {$1 ? "" : $2 ? ".-." : "_"}
-    "$(TIMESTAMP_DIR)/.#{name}.time"
+    File.join("$(TIMESTAMP_DIR)", arch, "#{name.sub(/\A(?=.)/, '.')}.time")
   end
   # :startdoc:
 
@@ -2102,7 +2139,6 @@ RULES
       line.gsub!(/\.o\b/, ".#{$OBJEXT}")
       line.gsub!(/\{\$\(VPATH\)\}/, "") unless $nmake
       line.gsub!(/\$\((?:hdr|top)dir\)\/config.h/, $config_h)
-      line.gsub!(%r"\$\(hdrdir\)/(?!ruby(?![^:;/\s]))(?=[-\w]+\.h)", '\&ruby/')
       if $nmake && /\A\s*\$\(RM|COPY\)/ =~ line
         line.gsub!(%r"[-\w\./]{2,}"){$&.tr("/", "\\")}
         line.gsub!(/(\$\((?!RM|COPY)[^:)]+)(?=\))/, '\1:/=\\')
@@ -2124,7 +2160,10 @@ RULES
     unless suffixes.empty?
       depout.unshift(".SUFFIXES: ." + suffixes.uniq.join(" .") + "\n\n")
     end
-    depout.unshift("$(OBJS): $(RUBY_EXTCONF_H)\n\n") if $extconf_h
+    if $extconf_h
+      depout.unshift("$(OBJS): $(RUBY_EXTCONF_H)\n\n")
+      depout.unshift("$(OBJS): $(hdrdir)/ruby/win32.h\n\n") if $mswin or $mingw
+    end
     depout.flatten!
     depout
   end
@@ -2188,7 +2227,7 @@ RULES
     message "creating Makefile\n"
     MakeMakefile.rm_f "#{CONFTEST}*"
     if CONFIG["DLEXT"] == $OBJEXT
-      for lib in libs = $libs.split
+      for lib in libs = $libs.split(' ')
         lib.sub!(/-l(.*)/, %%"lib\\1.#{$LIBEXT}"%)
       end
       $defs.push(format("-DEXTLIB='%s'", libs.join(",")))
@@ -2248,7 +2287,7 @@ RULES
     origdef ||= ''
 
     if $extout and $INSTALLFILES
-      $cleanfiles.concat($INSTALLFILES.collect {|files, dir|File.join(dir, files.sub(/\A\.\//, ''))})
+      $cleanfiles.concat($INSTALLFILES.collect {|files, dir|File.join(dir, files.delete_prefix('./'))})
       $distcleandirs.concat($INSTALLFILES.collect {|files, dir| dir})
     end
 
@@ -2264,11 +2303,8 @@ RULES
 
     dllib = target ? "$(TARGET).#{CONFIG['DLEXT']}" : ""
     staticlib = target ? "$(TARGET).#$LIBEXT" : ""
-    mfile = open("Makefile", "wb")
     conf = configuration(srcprefix)
-    conf = yield(conf) if block_given?
-    mfile.puts(conf)
-    mfile.print "
+    conf << "\
 libpath = #{($DEFLIBPATH|$LIBPATH).join(" ")}
 LIBPATH = #{libpath}
 DEFFILE = #{deffile}
@@ -2286,6 +2322,7 @@ ORIG_SRCS = #{orig_srcs.collect(&File.method(:basename)).join(' ')}
 SRCS = $(ORIG_SRCS) #{(srcs - orig_srcs).collect(&File.method(:basename)).join(' ')}
 OBJS = #{$objs.join(" ")}
 HDRS = #{hdrs.map{|h| '$(srcdir)/' + File.basename(h)}.join(' ')}
+LOCAL_HDRS = #{$headers.join(' ')}
 TARGET = #{target}
 TARGET_NAME = #{target && target[/\A\w+/]}
 TARGET_ENTRY = #{EXPORT_PREFIX || ''}Init_$(TARGET_NAME)
@@ -2293,21 +2330,28 @@ DLLIB = #{dllib}
 EXTSTATIC = #{$static || ""}
 STATIC_LIB = #{staticlib unless $static.nil?}
 #{!$extout && defined?($installed_list) ? "INSTALLED_LIST = #{$installed_list}\n" : ""}
-TIMESTAMP_DIR = #{$extout ? '$(extout)/.timestamp' : '.'}
+TIMESTAMP_DIR = #{$extout && $extmk ? '$(extout)/.timestamp' : '.'}
 " #"
     # TODO: fixme
-    install_dirs.each {|d| mfile.print("%-14s= %s\n" % d) if /^[[:upper:]]/ =~ d[0]}
-    n = ($extout ? '$(RUBYARCHDIR)/' : '') + '$(TARGET)'
-    mfile.print "
-TARGET_SO     = #{($extout ? '$(RUBYARCHDIR)/' : '')}$(DLLIB)
-CLEANLIBS     = #{n}.#{CONFIG['DLEXT']} #{config_string('cleanlibs') {|t| t.gsub(/\$\*/) {n}}}
+    install_dirs.each {|d| conf << ("%-14s= %s\n" % d) if /^[[:upper:]]/ =~ d[0]}
+    sodir = $extout ? '$(TARGET_SO_DIR)' : '$(RUBYARCHDIR)'
+    n = '$(TARGET_SO_DIR)$(TARGET)'
+    conf << "\
+TARGET_SO_DIR =#{$extout ? " $(RUBYARCHDIR)/" : ''}
+TARGET_SO     = $(TARGET_SO_DIR)$(DLLIB)
+CLEANLIBS     = #{'$(TARGET_SO) ' if target}#{config_string('cleanlibs') {|t| t.gsub(/\$\*/) {n}}}
 CLEANOBJS     = *.#{$OBJEXT} #{config_string('cleanobjs') {|t| t.gsub(/\$\*/, "$(TARGET)#{deffile ? '-$(arch)': ''}")} if target} *.bak
+" #"
 
+    conf = yield(conf) if block_given?
+    mfile = open("Makefile", "wb")
+    mfile.puts(conf)
+    mfile.print "
 all:    #{$extout ? "install" : target ? "$(DLLIB)" : "Makefile"}
-static: #{$extmk && !$static ? "all" : "$(STATIC_LIB)#{!$extmk ? " install-rb" : ""}"}
+static: #{$extmk && !$static ? "all" : "$(STATIC_LIB)#{$extout ? " install-rb" : ""}"}
 .PHONY: all install static install-so install-rb
 .PHONY: clean clean-so clean-static clean-rb
-"
+" #"
     mfile.print CLEANINGS
     fsep = config_string('BUILD_FILE_SEPARATOR') {|s| s unless s == "/"}
     if fsep
@@ -2325,11 +2369,11 @@ static: #{$extmk && !$static ? "all" : "$(STATIC_LIB)#{!$extmk ? " install-rb" :
     end
     dirs = []
     mfile.print "install: install-so install-rb\n\n"
-    sodir = (dir = "$(RUBYARCHDIR)").dup
+    dir = sodir.dup
     mfile.print("install-so: ")
     if target
       f = "$(DLLIB)"
-      dest = "#{dir}/#{f}"
+      dest = "$(TARGET_SO)"
       stamp = timestamp_file(dir, target_prefix)
       if $extout
         mfile.puts dest
@@ -2415,7 +2459,6 @@ site-install-rb: install-rb
 
     return unless target
 
-    mfile.puts SRC_EXT.collect {|e| ".path.#{e} = $(VPATH)"} if $nmake == ?b
     mfile.print ".SUFFIXES: .#{(SRC_EXT + [$OBJEXT, $ASMEXT]).compact.join(' .')}\n"
     mfile.print "\n"
 
@@ -2441,11 +2484,10 @@ site-install-rb: install-rb
       end
     end
 
-    mfile.print "$(RUBYARCHDIR)/" if $extout
-    mfile.print "$(DLLIB): "
+    mfile.print "$(TARGET_SO): "
     mfile.print "$(DEFFILE) " if makedef
     mfile.print "$(OBJS) Makefile"
-    mfile.print " #{timestamp_file('$(RUBYARCHDIR)', target_prefix)}" if $extout
+    mfile.print " #{timestamp_file(sodir, target_prefix)}" if $extout
     mfile.print "\n"
     mfile.print "\t$(ECHO) linking shared-object #{target_prefix.sub(/\A\/(.*)/, '\1/')}$(DLLIB)\n"
     mfile.print "\t-$(Q)$(RM) $(@#{sep})\n"
@@ -2489,6 +2531,8 @@ site-install-rb: install-rb
     $enable_shared = config['ENABLE_SHARED'] == 'yes'
     $defs = []
     $extconf_h = nil
+    $config_dirs = {}
+
     if $warnflags = CONFIG['warnflags'] and CONFIG['GCC'] == 'yes'
       # turn warnings into errors only for bundled extensions.
       config['warnflags'] = $warnflags.gsub(/(\A|\s)-Werror[-=]/, '\1-W')
@@ -2501,6 +2545,9 @@ site-install-rb: install-rb
       end
       $warnflags = config['warnflags'] unless $extmk
     end
+    if (w = rbconfig['CC_WRAPPER']) and !w.empty? and !File.executable?(w)
+      rbconfig['CC_WRAPPER'] = config['CC_WRAPPER'] = ''
+    end
     $CFLAGS = with_config("cflags", arg_config("CFLAGS", config["CFLAGS"])).dup
     $CXXFLAGS = (with_config("cxxflags", arg_config("CXXFLAGS", config["CXXFLAGS"]))||'').dup
     $ARCH_FLAG = with_config("arch_flag", arg_config("ARCH_FLAG", config["ARCH_FLAG"])).dup
@@ -2510,6 +2557,7 @@ site-install-rb: install-rb
     $INCFLAGS << " -I$(hdrdir)/ruby/backward" unless $extmk
     $INCFLAGS << " -I$(hdrdir) -I$(srcdir)"
     $DLDFLAGS = with_config("dldflags", arg_config("DLDFLAGS", config["DLDFLAGS"])).dup
+    config_string("ADDITIONAL_DLDFLAGS") {|flags| $DLDFLAGS << " " << flags} unless $extmk
     $LIBEXT = config['LIBEXT'].dup
     $OBJEXT = config["OBJEXT"].dup
     $EXEEXT = config["EXEEXT"].dup
@@ -2527,6 +2575,7 @@ site-install-rb: install-rb
 
     $objs = nil
     $srcs = nil
+    $headers = []
     $libs = ""
     if $enable_shared or RbConfig.expand(config["LIBRUBY"].dup) != RbConfig.expand(config["LIBRUBY_A"].dup)
       $LIBRUBYARG = config['LIBRUBYARG']
@@ -2543,6 +2592,7 @@ site-install-rb: install-rb
     $extout_prefix ||= nil
 
     $arg_config.clear
+    $config_dirs.clear
     dir_config("opt")
   end
 
@@ -2578,7 +2628,8 @@ MESSAGE
       src = src.sub(/\{/) do
         $& +
           "\n  if (argc > 1000000) {\n" +
-          refs.map {|n|"    printf(\"%p\", &#{n});\n"}.join("") +
+          refs.map {|n|"    int (* volatile #{n}p)(void)=(int (*)(void))&#{n};\n"}.join("") +
+          refs.map {|n|"    printf(\"%d\", (*#{n}p)());\n"}.join("") +
           "  }\n"
       end
     end
@@ -2652,12 +2703,12 @@ MESSAGE
   ##
   # Command which will compile C files in the generated Makefile
 
-  COMPILE_C = config_string('COMPILE_C') || '$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<'
+  COMPILE_C = config_string('COMPILE_C') || '$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<'
 
   ##
   # Command which will compile C++ files in the generated Makefile
 
-  COMPILE_CXX = config_string('COMPILE_CXX') || '$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<'
+  COMPILE_CXX = config_string('COMPILE_CXX') || '$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<'
 
   ##
   # Command which will translate C files to assembler sources in the generated Makefile
@@ -2702,7 +2753,7 @@ MESSAGE
   ##
   # A C main function which does no work
 
-  MAIN_DOES_NOTHING = config_string('MAIN_DOES_NOTHING') || "int main(int argc, char **argv)\n{\n  return 0;\n}"
+  MAIN_DOES_NOTHING = config_string('MAIN_DOES_NOTHING') || "int main(int argc, char **argv)\n{\n  return !!argv[argc];\n}"
   UNIVERSAL_INTS = config_string('UNIVERSAL_INTS') {|s| Shellwords.shellwords(s)} ||
     %w[int short long long\ long]
 
@@ -2730,9 +2781,59 @@ distclean: clean distclean-so distclean-static distclean-rb-default distclean-rb
 
 realclean: distclean
 "
+
+  @lang = Hash.new(self)
+
+  def self.[](name)
+    @lang.fetch(name)
+  end
+
+  def self.[]=(name, mod)
+    @lang[name] = mod
+  end
+
+  self["C++"] = Module.new do
+    include MakeMakefile
+    extend self
+
+    CONFTEST_CXX = "#{CONFTEST}.#{config_string('CXX_EXT') || CXX_EXT[0]}"
+
+    TRY_LINK_CXX = config_string('TRY_LINK_CXX') ||
+                   ((cmd = TRY_LINK.gsub(/\$\(C(?:C|(FLAGS))\)/, '$(CXX\1)')) != TRY_LINK && cmd) ||
+                   "$(CXX) #{OUTFLAG}#{CONFTEST}#{$EXEEXT} $(INCFLAGS) $(CPPFLAGS) " \
+                   "$(CXXFLAGS) $(src) $(LIBPATH) $(LDFLAGS) $(ARCH_FLAG) $(LOCAL_LIBS) $(LIBS)"
+
+    def have_devel?
+      unless defined? @have_devel
+        @have_devel = true
+        @have_devel = try_link(MAIN_DOES_NOTHING)
+      end
+      @have_devel
+    end
+
+    def conftest_source
+      CONFTEST_CXX
+    end
+
+    def cc_command(opt="")
+      conf = cc_config(opt)
+      RbConfig::expand("$(CXX) #$INCFLAGS #$CPPFLAGS #$CXXFLAGS #$ARCH_FLAG #{opt} -c #{CONFTEST_CXX}",
+                       conf)
+    end
+
+    def link_command(ldflags, *opts)
+      conf = link_config(ldflags, *opts)
+      RbConfig::expand(TRY_LINK_CXX.dup, conf)
+    end
+  end
 end
 
-include MakeMakefile
+# MakeMakefile::Global = #
+m = Module.new {
+  include(MakeMakefile)
+  private(*MakeMakefile.public_instance_methods(false))
+}
+include m
 
 if not $extmk and /\A(extconf|makefile).rb\z/ =~ File.basename($0)
   END {mkmf_failed($0)}
diff --git a/lib/monitor.rb b/lib/monitor.rb
deleted file mode 100644
index 73741f8ddb..0000000000
--- a/lib/monitor.rb
+++ /dev/null
@@ -1,303 +0,0 @@
-# frozen_string_literal: false
-# = monitor.rb
-#
-# Copyright (C) 2001  Shugo Maeda <shugo@ruby-lang.org>
-#
-# This library is distributed under the terms of the Ruby license.
-# You can freely distribute/modify this library.
-#
-
-require 'thread'
-
-#
-# In concurrent programming, a monitor is an object or module intended to be
-# used safely by more than one thread.  The defining characteristic of a
-# monitor is that its methods are executed with mutual exclusion.  That is, at
-# each point in time, at most one thread may be executing any of its methods.
-# This mutual exclusion greatly simplifies reasoning about the implementation
-# of monitors compared to reasoning about parallel code that updates a data
-# structure.
-#
-# You can read more about the general principles on the Wikipedia page for
-# Monitors[http://en.wikipedia.org/wiki/Monitor_%28synchronization%29]
-#
-# == Examples
-#
-# === Simple object.extend
-#
-#   require 'monitor.rb'
-#
-#   buf = []
-#   buf.extend(MonitorMixin)
-#   empty_cond = buf.new_cond
-#
-#   # consumer
-#   Thread.start do
-#     loop do
-#       buf.synchronize do
-#         empty_cond.wait_while { buf.empty? }
-#         print buf.shift
-#       end
-#     end
-#   end
-#
-#   # producer
-#   while line = ARGF.gets
-#     buf.synchronize do
-#       buf.push(line)
-#       empty_cond.signal
-#     end
-#   end
-#
-# The consumer thread waits for the producer thread to push a line to buf
-# while <tt>buf.empty?</tt>.  The producer thread (main thread) reads a
-# line from ARGF and pushes it into buf then calls <tt>empty_cond.signal</tt>
-# to notify the consumer thread of new data.
-#
-# === Simple Class include
-#
-#   require 'monitor'
-#
-#   class SynchronizedArray < Array
-#
-#     include MonitorMixin
-#
-#     def initialize(*args)
-#       super(*args)
-#     end
-#
-#     alias :old_shift :shift
-#     alias :old_unshift :unshift
-#
-#     def shift(n=1)
-#       self.synchronize do
-#         self.old_shift(n)
-#       end
-#     end
-#
-#     def unshift(item)
-#       self.synchronize do
-#         self.old_unshift(item)
-#       end
-#     end
-#
-#     # other methods ...
-#   end
-#
-# +SynchronizedArray+ implements an Array with synchronized access to items.
-# This Class is implemented as subclass of Array which includes the
-# MonitorMixin module.
-#
-module MonitorMixin
-  #
-  # FIXME: This isn't documented in Nutshell.
-  #
-  # Since MonitorMixin.new_cond returns a ConditionVariable, and the example
-  # above calls while_wait and signal, this class should be documented.
-  #
-  class ConditionVariable
-    class Timeout < Exception; end
-
-    #
-    # Releases the lock held in the associated monitor and waits; reacquires the lock on wakeup.
-    #
-    # If +timeout+ is given, this method returns after +timeout+ seconds passed,
-    # even if no other thread doesn't signal.
-    #
-    def wait(timeout = nil)
-      @monitor.__send__(:mon_check_owner)
-      count = @monitor.__send__(:mon_exit_for_cond)
-      begin
-        @cond.wait(@monitor.instance_variable_get(:@mon_mutex), timeout)
-        return true
-      ensure
-        @monitor.__send__(:mon_enter_for_cond, count)
-      end
-    end
-
-    #
-    # Calls wait repeatedly while the given block yields a truthy value.
-    #
-    def wait_while
-      while yield
-        wait
-      end
-    end
-
-    #
-    # Calls wait repeatedly until the given block yields a truthy value.
-    #
-    def wait_until
-      until yield
-        wait
-      end
-    end
-
-    #
-    # Wakes up the first thread in line waiting for this lock.
-    #
-    def signal
-      @monitor.__send__(:mon_check_owner)
-      @cond.signal
-    end
-
-    #
-    # Wakes up all threads waiting for this lock.
-    #
-    def broadcast
-      @monitor.__send__(:mon_check_owner)
-      @cond.broadcast
-    end
-
-    private
-
-    def initialize(monitor)
-      @monitor = monitor
-      @cond = ::ConditionVariable.new
-    end
-  end
-
-  def self.extend_object(obj)
-    super(obj)
-    obj.__send__(:mon_initialize)
-  end
-
-  #
-  # Attempts to enter exclusive section.  Returns +false+ if lock fails.
-  #
-  def mon_try_enter
-    if @mon_owner != Thread.current
-      unless @mon_mutex.try_lock
-        return false
-      end
-      @mon_owner = Thread.current
-      @mon_count = 0
-    end
-    @mon_count += 1
-    return true
-  end
-  # For backward compatibility
-  alias try_mon_enter mon_try_enter
-
-  #
-  # Enters exclusive section.
-  #
-  def mon_enter
-    if @mon_owner != Thread.current
-      @mon_mutex.lock
-      @mon_owner = Thread.current
-      @mon_count = 0
-    end
-    @mon_count += 1
-  end
-
-  #
-  # Leaves exclusive section.
-  #
-  def mon_exit
-    mon_check_owner
-    @mon_count -=1
-    if @mon_count == 0
-      @mon_owner = nil
-      @mon_mutex.unlock
-    end
-  end
-
-  #
-  # Enters exclusive section and executes the block.  Leaves the exclusive
-  # section automatically when the block exits.  See example under
-  # +MonitorMixin+.
-  #
-  def mon_synchronize
-    mon_enter
-    begin
-      yield
-    ensure
-      mon_exit
-    end
-  end
-  alias synchronize mon_synchronize
-
-  #
-  # Creates a new MonitorMixin::ConditionVariable associated with the
-  # receiver.
-  #
-  def new_cond
-    return ConditionVariable.new(self)
-  end
-
-  private
-
-  # Use <tt>extend MonitorMixin</tt> or <tt>include MonitorMixin</tt> instead
-  # of this constructor.  Have look at the examples above to understand how to
-  # use this module.
-  def initialize(*args)
-    super
-    mon_initialize
-  end
-
-  # Initializes the MonitorMixin after being included in a class or when an
-  # object has been extended with the MonitorMixin
-  def mon_initialize
-    @mon_owner = nil
-    @mon_count = 0
-    @mon_mutex = Mutex.new
-  end
-
-  def mon_check_owner
-    if @mon_owner != Thread.current
-      raise ThreadError, "current thread not owner"
-    end
-  end
-
-  def mon_enter_for_cond(count)
-    @mon_owner = Thread.current
-    @mon_count = count
-  end
-
-  def mon_exit_for_cond
-    count = @mon_count
-    @mon_owner = nil
-    @mon_count = 0
-    return count
-  end
-end
-
-# Use the Monitor class when you want to have a lock object for blocks with
-# mutual exclusion.
-#
-#   require 'monitor'
-#
-#   lock = Monitor.new
-#   lock.synchronize do
-#     # exclusive access
-#   end
-#
-class Monitor
-  include MonitorMixin
-  alias try_enter try_mon_enter
-  alias enter mon_enter
-  alias exit mon_exit
-end
-
-
-# Documentation comments:
-#  - All documentation comes from Nutshell.
-#  - MonitorMixin.new_cond appears in the example, but is not documented in
-#    Nutshell.
-#  - All the internals (internal modules Accessible and Initializable, class
-#    ConditionVariable) appear in RDoc.  It might be good to hide them, by
-#    making them private, or marking them :nodoc:, etc.
-#  - RDoc doesn't recognise aliases, so we have mon_synchronize documented, but
-#    not synchronize.
-#  - mon_owner is in Nutshell, but appears as an accessor in a separate module
-#    here, so is hard/impossible to RDoc.  Some other useful accessors
-#    (mon_count and some queue stuff) are also in this module, and don't appear
-#    directly in the RDoc output.
-#  - in short, it may be worth changing the code layout in this file to make the
-#    documentation easier
-
-# Local variables:
-# mode: Ruby
-# tab-width: 8
-# End:
diff --git a/lib/mutex_m.gemspec b/lib/mutex_m.gemspec
new file mode 100644
index 0000000000..f614dcd9a0
--- /dev/null
+++ b/lib/mutex_m.gemspec
@@ -0,0 +1,27 @@
+begin
+  require_relative "lib/mutex_m"
+rescue LoadError
+  # for Ruby core repository
+  require_relative "mutex_m"
+end
+
+Gem::Specification.new do |spec|
+  spec.name          = "mutex_m"
+  spec.version       = Mutex_m::VERSION
+  spec.authors       = ["Keiju ISHITSUKA"]
+  spec.email         = ["keiju@ruby-lang.org"]
+
+  spec.summary       = %q{Mixin to extend objects to be handled like a Mutex.}
+  spec.description   = %q{Mixin to extend objects to be handled like a Mutex.}
+  spec.homepage      = "https://github.com/ruby/mutex_m"
+  spec.licenses      = ["Ruby", "BSD-2-Clause"]
+
+  spec.files         = ["Gemfile", "LICENSE.txt", "README.md", "Rakefile", "lib/mutex_m.rb", "mutex_m.gemspec"]
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "test-unit"
+end
diff --git a/lib/mutex_m.rb b/lib/mutex_m.rb
index 627355151e..18b6256595 100644
--- a/lib/mutex_m.rb
+++ b/lib/mutex_m.rb
@@ -10,9 +10,6 @@
 #
 # --
 
-
-require 'thread'
-
 # = mutex_m.rb
 #
 # When 'mutex_m' is required, any object that extends or includes Mutex_m will
@@ -28,16 +25,23 @@ require 'thread'
 #   obj.extend Mutex_m
 #
 # Or mixin Mutex_m into your module to your class inherit Mutex instance
-# methods.
+# methods --- remember to call super() in your class initialize method.
 #
 #   class Foo
 #     include Mutex_m
+#     def initialize
+#       # ...
+#       super()
+#     end
 #     # ...
 #   end
 #   obj = Foo.new
 #   # this obj can be handled like Mutex
 #
 module Mutex_m
+
+  VERSION = "0.1.1"
+
   def Mutex_m.define_aliases(cl) # :nodoc:
     cl.module_eval %q{
       alias locked? mu_locked?
@@ -102,11 +106,12 @@ module Mutex_m
   private
 
   def mu_initialize # :nodoc:
-    @_mutex = Mutex.new
+    @_mutex = Thread::Mutex.new
   end
 
   def initialize(*args) # :nodoc:
     mu_initialize
     super
   end
+  ruby2_keywords(:initialize) if respond_to?(:ruby2_keywords, true)
 end
diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb
index cfd8cf7945..2161d30d7c 100644
--- a/lib/net/ftp.rb
+++ b/lib/net/ftp.rb
@@ -19,6 +19,10 @@ require "socket"
 require "monitor"
 require "net/protocol"
 require "time"
+begin
+  require "openssl"
+rescue LoadError
+end
 
 module Net
 
@@ -73,10 +77,15 @@ module Net
   # - #rename
   # - #delete
   #
-  class FTP
+  class FTP < Protocol
     include MonitorMixin
+    if defined?(OpenSSL::SSL)
+      include OpenSSL
+      include SSL
+    end
 
     # :stopdoc:
+    VERSION = "0.1.2"
     FTP_PORT = 21
     CRLF = "\r\n"
     DEFAULT_BLOCKSIZE = BufferedIO::BUFSIZE
@@ -89,6 +98,10 @@ module Net
     # When +true+, the connection is in passive mode.  Default: +true+.
     attr_accessor :passive
 
+    # When +true+, use the IP address in PASV responses.  Otherwise, it uses
+    # the same IP address for the control connection.  Default: +false+.
+    attr_accessor :use_pasv_ip
+
     # When +true+, all traffic to and from the server is written
     # to +$stdout+.  Default: +false+.
     attr_accessor :debug_mode
@@ -103,6 +116,13 @@ module Net
     # Net::OpenTimeout exception. The default value is +nil+.
     attr_accessor :open_timeout
 
+    # Number of seconds to wait for the TLS handshake. Any number
+    # may be used, including Floats for fractional seconds. If the FTP
+    # object cannot complete the TLS handshake in this many seconds, it
+    # raises a Net::OpenTimeout exception. The default value is +nil+.
+    # If +ssl_handshake_timeout+ is +nil+, +open_timeout+ is used instead.
+    attr_accessor :ssl_handshake_timeout
+
     # Number of seconds to wait for one block to be read (via one read(2)
     # call). Any number may be used, including Floats for fractional
     # seconds. If the FTP object cannot read data in this many seconds,
@@ -143,38 +163,121 @@ module Net
     # If a block is given, it is passed the +FTP+ object, which will be closed
     # when the block finishes, or when an exception is raised.
     #
-    def FTP.open(host, user = nil, passwd = nil, acct = nil)
+    def FTP.open(host, *args)
       if block_given?
-        ftp = new(host, user, passwd, acct)
+        ftp = new(host, *args)
         begin
           yield ftp
         ensure
           ftp.close
         end
       else
-        new(host, user, passwd, acct)
+        new(host, *args)
       end
     end
 
+    # :call-seq:
+    #    Net::FTP.new(host = nil, options = {})
     #
     # Creates and returns a new +FTP+ object. If a +host+ is given, a connection
-    # is made. Additionally, if the +user+ is given, the given user name,
-    # password, and (optionally) account are used to log in.  See #login.
-    #
-    def initialize(host = nil, user = nil, passwd = nil, acct = nil)
+    # is made.
+    #
+    # +options+ is an option hash, each key of which is a symbol.
+    #
+    # The available options are:
+    #
+    # port::      Port number (default value is 21)
+    # ssl::       If +options+[:ssl] is true, then an attempt will be made
+    #             to use SSL (now TLS) to connect to the server.  For this
+    #             to work OpenSSL [OSSL] and the Ruby OpenSSL [RSSL]
+    #             extensions need to be installed.  If +options+[:ssl] is a
+    #             hash, it's passed to OpenSSL::SSL::SSLContext#set_params
+    #             as parameters.
+    # private_data_connection::  If true, TLS is used for data connections.
+    #                            Default: +true+ when +options+[:ssl] is true.
+    # username::  Username for login.  If +options+[:username] is the string
+    #             "anonymous" and the +options+[:password] is +nil+,
+    #             "anonymous@" is used as a password.
+    # password::  Password for login.
+    # account::   Account information for ACCT.
+    # passive::   When +true+, the connection is in passive mode. Default:
+    #             +true+.
+    # open_timeout::  Number of seconds to wait for the connection to open.
+    #                 See Net::FTP#open_timeout for details.  Default: +nil+.
+    # read_timeout::  Number of seconds to wait for one block to be read.
+    #                 See Net::FTP#read_timeout for details.  Default: +60+.
+    # ssl_handshake_timeout::  Number of seconds to wait for the TLS
+    #                          handshake.
+    #                          See Net::FTP#ssl_handshake_timeout for
+    #                          details.  Default: +nil+.
+    # use_pasv_ip::  When +true+, use the IP address in PASV responses.
+    #                Otherwise, it uses the same IP address for the control
+    #                connection.  Default: +false+.
+    # debug_mode::  When +true+, all traffic to and from the server is
+    #               written to +$stdout+.  Default: +false+.
+    #
+    def initialize(host = nil, user_or_options = {}, passwd = nil, acct = nil)
       super()
+      begin
+        options = user_or_options.to_hash
+      rescue NoMethodError
+        # for backward compatibility
+        options = {}
+        options[:username] = user_or_options
+        options[:password] = passwd
+        options[:account] = acct
+      end
+      @host = nil
+      if options[:ssl]
+        unless defined?(OpenSSL::SSL)
+          raise "SSL extension not installed"
+        end
+        ssl_params = options[:ssl] == true ? {} : options[:ssl]
+        @ssl_context = SSLContext.new
+        @ssl_context.set_params(ssl_params)
+        if defined?(VerifyCallbackProc)
+          @ssl_context.verify_callback = VerifyCallbackProc
+        end
+        @ssl_context.session_cache_mode =
+          OpenSSL::SSL::SSLContext::SESSION_CACHE_CLIENT |
+          OpenSSL::SSL::SSLContext::SESSION_CACHE_NO_INTERNAL_STORE
+        @ssl_context.session_new_cb = proc {|sock, sess| @ssl_session = sess }
+        @ssl_session = nil
+        if options[:private_data_connection].nil?
+          @private_data_connection = true
+        else
+          @private_data_connection = options[:private_data_connection]
+        end
+      else
+        @ssl_context = nil
+        if options[:private_data_connection]
+          raise ArgumentError,
+            "private_data_connection can be set to true only when ssl is enabled"
+        end
+        @private_data_connection = false
+      end
       @binary = true
-      @passive = @@default_passive
-      @debug_mode = false
+      if options[:passive].nil?
+        @passive = @@default_passive
+      else
+        @passive = options[:passive]
+      end
+      if options[:debug_mode].nil?
+        @debug_mode = false
+      else
+        @debug_mode = options[:debug_mode]
+      end
       @resume = false
-      @sock = NullSocket.new
+      @bare_sock = @sock = NullSocket.new
       @logged_in = false
-      @open_timeout = nil
-      @read_timeout = 60
+      @open_timeout = options[:open_timeout]
+      @ssl_handshake_timeout = options[:ssl_handshake_timeout]
+      @read_timeout = options[:read_timeout] || 60
+      @use_pasv_ip = options[:use_pasv_ip] || false
       if host
-        connect(host)
-        if user
-          login(user, passwd, acct)
+        connect(host, options[:port] || FTP_PORT)
+        if options[:username]
+          login(options[:username], options[:password], options[:account])
         end
       end
     end
@@ -220,35 +323,54 @@ module Net
 
     # Obsolete
     def return_code # :nodoc:
-      $stderr.puts("warning: Net::FTP#return_code is obsolete and do nothing")
+      warn("Net::FTP#return_code is obsolete and do nothing", uplevel: 1)
       return "\n"
     end
 
     # Obsolete
     def return_code=(s) # :nodoc:
-      $stderr.puts("warning: Net::FTP#return_code= is obsolete and do nothing")
+      warn("Net::FTP#return_code= is obsolete and do nothing", uplevel: 1)
     end
 
     # Constructs a socket with +host+ and +port+.
     #
     # If SOCKSSocket is defined and the environment (ENV) defines
-    # SOCKS_SERVER, then a SOCKSSocket is returned, else a TCPSocket is
+    # SOCKS_SERVER, then a SOCKSSocket is returned, else a Socket is
     # returned.
     def open_socket(host, port) # :nodoc:
-      return Timeout.timeout(@open_timeout, Net::OpenTimeout) {
-        if defined? SOCKSSocket and ENV["SOCKS_SERVER"]
-          @passive = true
-          sock = SOCKSSocket.open(host, port)
-        else
-          sock = TCPSocket.open(host, port)
+      if defined? SOCKSSocket and ENV["SOCKS_SERVER"]
+        @passive = true
+        Timeout.timeout(@open_timeout, OpenTimeout) do
+          SOCKSSocket.open(host, port)
         end
-        io = BufferedSocket.new(sock)
-        io.read_timeout = @read_timeout
-        io
-      }
+      else
+        begin
+          Socket.tcp host, port, nil, nil, connect_timeout: @open_timeout
+        rescue Errno::ETIMEDOUT #raise Net:OpenTimeout instead for compatibility with previous versions
+          raise Net::OpenTimeout, "Timeout to open TCP connection to "\
+          "#{host}:#{port} (exceeds #{@open_timeout} seconds)"
+        end
+      end
     end
     private :open_socket
 
+    def start_tls_session(sock)
+      ssl_sock = SSLSocket.new(sock, @ssl_context)
+      ssl_sock.sync_close = true
+      ssl_sock.hostname = @host if ssl_sock.respond_to? :hostname=
+      if @ssl_session &&
+          Process.clock_gettime(Process::CLOCK_REALTIME) < @ssl_session.time.to_f + @ssl_session.timeout
+        # ProFTPD returns 425 for data connections if session is not reused.
+        ssl_sock.session = @ssl_session
+      end
+      ssl_socket_connect(ssl_sock, @ssl_handshake_timeout || @open_timeout)
+      if @ssl_context.verify_mode != VERIFY_NONE
+        ssl_sock.post_connection_check(@host)
+      end
+      return ssl_sock
+    end
+    private :start_tls_session
+
     #
     # Establishes an FTP connection to host, optionally overriding the default
     # port. If the environment variable +SOCKS_SERVER+ is set, sets up the
@@ -260,8 +382,24 @@ module Net
         print "connect: ", host, ", ", port, "\n"
       end
       synchronize do
-        @sock = open_socket(host, port)
+        @host = host
+        @bare_sock = open_socket(host, port)
+        @sock = BufferedSocket.new(@bare_sock, read_timeout: @read_timeout)
         voidresp
+        if @ssl_context
+          begin
+            voidcmd("AUTH TLS")
+            ssl_sock = start_tls_session(@bare_sock)
+            @sock = BufferedSSLSocket.new(ssl_sock, read_timeout: @read_timeout)
+            if @private_data_connection
+              voidcmd("PBSZ 0")
+              voidcmd("PROT P")
+            end
+          rescue OpenSSL::SSL::SSLError, OpenTimeout
+            @sock.close
+            raise
+          end
+        end
       end
     end
 
@@ -295,6 +433,9 @@ module Net
       if @debug_mode
         print "put: ", sanitize(line), "\n"
       end
+      if /[\r\n]/ =~ line
+        raise ArgumentError, "A line must not contain CR or LF"
+      end
       line = line + CRLF
       @sock.write(line)
     end
@@ -380,10 +521,10 @@ module Net
 
     # Constructs and send the appropriate PORT (or EPRT) command
     def sendport(host, port) # :nodoc:
-      af = (@sock.peeraddr)[0]
-      if af == "AF_INET"
+      remote_address = @bare_sock.remote_address
+      if remote_address.ipv4?
         cmd = "PORT " + (host.split(".") + port.divmod(256)).join(",")
-      elsif af == "AF_INET6"
+      elsif remote_address.ipv6?
         cmd = sprintf("EPRT |2|%s|%d|", host, port)
       else
         raise FTPProtoError, host
@@ -394,13 +535,13 @@ module Net
 
     # Constructs a TCPServer socket
     def makeport # :nodoc:
-      TCPServer.open(@sock.addr[3], 0)
+      Addrinfo.tcp(@bare_sock.local_address.ip_address, 0).listen
     end
     private :makeport
 
     # sends the appropriate command to enable a passive connection
     def makepasv # :nodoc:
-      if @sock.peeraddr[0] == "AF_INET"
+      if @bare_sock.remote_address.ipv4?
         host, port = parse227(sendcmd("PASV"))
       else
         host, port = parse229(sendcmd("EPSV"))
@@ -414,23 +555,28 @@ module Net
     def transfercmd(cmd, rest_offset = nil) # :nodoc:
       if @passive
         host, port = makepasv
-        conn = open_socket(host, port)
-        if @resume and rest_offset
-          resp = sendcmd("REST " + rest_offset.to_s)
-          if !resp.start_with?("3")
+        begin
+          conn = open_socket(host, port)
+          if @resume and rest_offset
+            resp = sendcmd("REST " + rest_offset.to_s)
+            if !resp.start_with?("3")
+              raise FTPReplyError, resp
+            end
+          end
+          resp = sendcmd(cmd)
+          # skip 2XX for some ftp servers
+          resp = getresp if resp.start_with?("2")
+          if !resp.start_with?("1")
             raise FTPReplyError, resp
           end
-        end
-        resp = sendcmd(cmd)
-        # skip 2XX for some ftp servers
-        resp = getresp if resp.start_with?("2")
-        if !resp.start_with?("1")
-          raise FTPReplyError, resp
+        ensure
+          conn.close if conn && $!
         end
       else
         sock = makeport
         begin
-          sendport(sock.addr[3], sock.addr[1])
+          addr = sock.local_address
+          sendport(addr.ip_address, addr.ip_port)
           if @resume and rest_offset
             resp = sendcmd("REST " + rest_offset.to_s)
             if !resp.start_with?("3")
@@ -443,15 +589,19 @@ module Net
           if !resp.start_with?("1")
             raise FTPReplyError, resp
           end
-          conn = BufferedSocket.new(sock.accept)
-          conn.read_timeout = @read_timeout
+          conn, = sock.accept
           sock.shutdown(Socket::SHUT_WR) rescue nil
           sock.read rescue nil
         ensure
           sock.close
         end
       end
-      return conn
+      if @private_data_connection
+        return BufferedSSLSocket.new(start_tls_session(conn),
+                                     read_timeout: @read_timeout)
+      else
+        return BufferedSocket.new(conn, read_timeout: @read_timeout)
+      end
     end
     private :transfercmd
 
@@ -499,14 +649,12 @@ module Net
         with_binary(true) do
           begin
             conn = transfercmd(cmd, rest_offset)
-            loop do
-              data = conn.read(blocksize)
-              break if data == nil
+            while data = conn.read(blocksize)
               yield(data)
             end
-            conn.shutdown(Socket::SHUT_WR)
+            conn.shutdown(Socket::SHUT_WR) rescue nil
             conn.read_timeout = 1
-            conn.read
+            conn.read rescue nil
           ensure
             conn.close if conn
           end
@@ -526,14 +674,12 @@ module Net
         with_binary(false) do
           begin
             conn = transfercmd(cmd)
-            loop do
-              line = conn.gets
-              break if line == nil
+            while line = conn.gets
               yield(line.sub(/\r?\n\z/, ""), !line.match(/\n\z/).nil?)
             end
-            conn.shutdown(Socket::SHUT_WR)
+            conn.shutdown(Socket::SHUT_WR) rescue nil
             conn.read_timeout = 1
-            conn.read
+            conn.read rescue nil
           ensure
             conn.close if conn
           end
@@ -554,14 +700,18 @@ module Net
       end
       synchronize do
         with_binary(true) do
-          conn = transfercmd(cmd)
-          loop do
-            buf = file.read(blocksize)
-            break if buf == nil
-            conn.write(buf)
-            yield(buf) if block_given?
+          begin
+            conn = transfercmd(cmd)
+            while buf = file.read(blocksize)
+              conn.write(buf)
+              yield(buf) if block_given?
+            end
+            conn.shutdown(Socket::SHUT_WR) rescue nil
+            conn.read_timeout = 1
+            conn.read rescue nil
+          ensure
+            conn.close if conn
           end
-          conn.close
           voidresp
         end
       end
@@ -583,17 +733,21 @@ module Net
     def storlines(cmd, file) # :yield: line
       synchronize do
         with_binary(false) do
-          conn = transfercmd(cmd)
-          loop do
-            buf = file.gets
-            break if buf == nil
-            if buf[-2, 2] != CRLF
-              buf = buf.chomp + CRLF
+          begin
+            conn = transfercmd(cmd)
+            while buf = file.gets
+              if buf[-2, 2] != CRLF
+                buf = buf.chomp + CRLF
+              end
+              conn.write(buf)
+              yield(buf) if block_given?
             end
-            conn.write(buf)
-            yield(buf) if block_given?
+            conn.shutdown(Socket::SHUT_WR) rescue nil
+            conn.read_timeout = 1
+            conn.read rescue nil
+          ensure
+            conn.close if conn
           end
-          conn.close
           voidresp
         end
       end
@@ -619,10 +773,10 @@ module Net
       if localfile
         if @resume
           rest_offset = File.size?(localfile)
-          f = open(localfile, "a")
+          f = File.open(localfile, "a")
         else
           rest_offset = nil
-          f = open(localfile, "w")
+          f = File.open(localfile, "w")
         end
       elsif !block_given?
         result = String.new
@@ -652,7 +806,7 @@ module Net
       f = nil
       result = nil
       if localfile
-        f = open(localfile, "w")
+        f = File.open(localfile, "w")
       elsif !block_given?
         result = String.new
       end
@@ -698,7 +852,7 @@ module Net
       else
         rest_offset = nil
       end
-      f = open(localfile)
+      f = File.open(localfile)
       begin
         f.binmode
         if rest_offset
@@ -717,7 +871,7 @@ module Net
     # passing in the transmitted data one line at a time.
     #
     def puttextfile(localfile, remotefile = File.basename(localfile), &block) # :yield: line
-      f = open(localfile)
+      f = File.open(localfile)
       begin
         storlines("STOR #{remotefile}", f, &block)
       ensure
@@ -908,11 +1062,12 @@ module Net
     TIME_PARSER = ->(value, local = false) {
       unless /\A(?<year>\d{4})(?<month>\d{2})(?<day>\d{2})
             (?<hour>\d{2})(?<min>\d{2})(?<sec>\d{2})
-            (\.(?<fractions>\d+))?/x =~ value
+            (?:\.(?<fractions>\d{1,17}))?/x =~ value
+        value = value[0, 97] + "..." if value.size > 100
         raise FTPProtoError, "invalid time-val: #{value}"
       end
-      usec = fractions.to_i * 10 ** (6 - fractions.to_s.size)
-      Time.send(local ? :local : :utc, year, month, day, hour, min, sec, usec)
+      usec = ".#{fractions}".to_r * 1_000_000 if fractions
+      Time.public_send(local ? :local : :utc, year, month, day, hour, min, sec, usec)
     }
     FACT_PARSERS = Hash.new(CASE_DEPENDENT_PARSER)
     FACT_PARSERS["size"] = DECIMAL_PARSER
@@ -1105,10 +1260,16 @@ module Net
     #
     # Returns the status (STAT command).
     #
-    def status
-      line = "STAT" + CRLF
-      print "put: STAT\n" if @debug_mode
-      @sock.send(line, Socket::MSG_OOB)
+    # pathname:: when stat is invoked with pathname as a parameter it acts like
+    #            list but a lot faster and over the same tcp session.
+    #
+    def status(pathname = nil)
+      line = pathname ? "STAT #{pathname}" : "STAT"
+      if /[\r\n]/ =~ line
+        raise ArgumentError, "A line must not contain CR or LF"
+      end
+      print "put: #{line}\n" if @debug_mode
+      @sock.send(line + CRLF, Socket::MSG_OOB)
       return getresp
     end
 
@@ -1161,6 +1322,41 @@ module Net
     end
 
     #
+    # Issues a FEAT command
+    #
+    # Returns an array of supported optional features
+    #
+    def features
+      resp = sendcmd("FEAT")
+      if !resp.start_with?("211")
+        raise FTPReplyError, resp
+      end
+
+      feats = []
+      resp.split("\n").each do |line|
+        next if !line.start_with?(' ') # skip status lines
+
+        feats << line.strip
+      end
+
+      return feats
+    end
+
+    #
+    # Issues an OPTS command
+    # - name Should be the name of the option to set
+    # - params is any optional parameters to supply with the option
+    #
+    # example: option('UTF8', 'ON') => 'OPTS UTF8 ON'
+    #
+    def option(name, params = nil)
+      cmd = "OPTS #{name}"
+      cmd += " #{params}" if params
+
+      voidcmd(cmd)
+    end
+
+    #
     # Closes the connection.  Further operations are impossible until you open
     # a new connection with #connect.
     #
@@ -1178,7 +1374,7 @@ module Net
     end
 
     #
-    # Returns +true+ iff the connection is closed.
+    # Returns +true+ if and only if the connection is closed.
     #
     def closed?
       @sock == nil or @sock.closed?
@@ -1192,8 +1388,13 @@ module Net
       if !resp.start_with?("227")
         raise FTPReplyError, resp
       end
-      if m = /\((?<host>\d+(,\d+){3}),(?<port>\d+,\d+)\)/.match(resp)
-        return parse_pasv_ipv4_host(m["host"]), parse_pasv_port(m["port"])
+      if m = /\((?<host>\d+(?:,\d+){3}),(?<port>\d+,\d+)\)/.match(resp)
+        if @use_pasv_ip
+          host = parse_pasv_ipv4_host(m["host"])
+        else
+          host = @bare_sock.remote_address.ip_address
+        end
+        return host, parse_pasv_port(m["port"])
       else
         raise FTPProtoError, resp
       end
@@ -1208,9 +1409,9 @@ module Net
       if !resp.start_with?("228")
         raise FTPReplyError, resp
       end
-      if m = /\(4,4,(?<host>\d+(,\d+){3}),2,(?<port>\d+,\d+)\)/.match(resp)
+      if m = /\(4,4,(?<host>\d+(?:,\d+){3}),2,(?<port>\d+,\d+)\)/.match(resp)
         return parse_pasv_ipv4_host(m["host"]), parse_pasv_port(m["port"])
-      elsif m = /\(6,16,(?<host>\d+(,(\d+)){15}),2,(?<port>\d+,\d+)\)/.match(resp)
+      elsif m = /\(6,16,(?<host>\d+(?:,\d+){15}),2,(?<port>\d+,\d+)\)/.match(resp)
         return parse_pasv_ipv6_host(m["host"]), parse_pasv_port(m["port"])
       else
         raise FTPProtoError, resp
@@ -1246,7 +1447,7 @@ module Net
         raise FTPReplyError, resp
       end
       if m = /\((?<d>[!-~])\k<d>\k<d>(?<port>\d+)\k<d>\)/.match(resp)
-        return @sock.peeraddr[3], m["port"].to_i
+        return @bare_sock.remote_address.ip_address, m["port"].to_i
       else
         raise FTPProtoError, resp
       end
@@ -1283,7 +1484,7 @@ module Net
     end
 
     class BufferedSocket < BufferedIO
-      [:addr, :peeraddr, :send, :shutdown].each do |method|
+      [:local_address, :remote_address, :addr, :peeraddr, :send, :shutdown].each do |method|
         define_method(method) { |*args|
           @io.__send__(method, *args)
         }
@@ -1294,7 +1495,7 @@ module Net
           s = super(len, String.new, true)
           return s.empty? ? nil : s
         else
-          result = ""
+          result = String.new
           while s = super(DEFAULT_BLOCKSIZE, String.new, true)
             break if s.empty?
             result << s
@@ -1316,6 +1517,37 @@ module Net
         return line
       end
     end
+
+    if defined?(OpenSSL::SSL::SSLSocket)
+      class BufferedSSLSocket <  BufferedSocket
+        def initialize(*args, **options)
+          super
+          @is_shutdown = false
+        end
+
+        def shutdown(*args)
+          # SSL_shutdown() will be called from SSLSocket#close, and
+          # SSL_shutdown() will send the "close notify" alert to the peer,
+          # so shutdown(2) should not be called.
+          @is_shutdown = true
+        end
+
+        def send(mesg, flags, dest = nil)
+          # Ignore flags and dest.
+          @io.write(mesg)
+        end
+
+        private
+
+        def rbuf_fill
+          if @is_shutdown
+            raise EOFError, "shutdown has been called"
+          else
+            super
+          end
+        end
+      end
+    end
     # :startdoc:
   end
 end
diff --git a/lib/net/http.rb b/lib/net/http.rb
index 873d731a3a..34fc635a4d 100644
--- a/lib/net/http.rb
+++ b/lib/net/http.rb
@@ -22,9 +22,9 @@
 
 require 'net/protocol'
 require 'uri'
+autoload :OpenSSL, 'openssl'
 
 module Net   #:nodoc:
-  autoload :OpenSSL, 'openssl'
 
   # :stopdoc:
   class HTTPBadResponse < StandardError; end
@@ -35,7 +35,7 @@ module Net   #:nodoc:
   #
   # Net::HTTP provides a rich library which can be used to build HTTP
   # user-agents.  For more details about HTTP see
-  # [RFC2616](http://www.ietf.org/rfc/rfc2616.txt)
+  # [RFC2616](http://www.ietf.org/rfc/rfc2616.txt).
   #
   # Net::HTTP is designed to work closely with URI.  URI::HTTP#host,
   # URI::HTTP#port and URI::HTTP#request_uri are designed to work with
@@ -87,7 +87,7 @@ module Net   #:nodoc:
   #
   # == How to use Net::HTTP
   #
-  # The following example code can be used as the basis of a HTTP user-agent
+  # The following example code can be used as the basis of an HTTP user-agent
   # which can perform a variety of request types using persistent
   # connections.
   #
@@ -104,14 +104,13 @@ module Net   #:nodoc:
   # open for multiple requests in the block if the server indicates it
   # supports persistent connections.
   #
+  # If you wish to re-use a connection across multiple HTTP requests without
+  # automatically closing it you can use ::new and then call #start and
+  # #finish manually.
+  #
   # The request types Net::HTTP supports are listed below in the section "HTTP
   # Request Classes".
   #
-  # If you wish to re-use a connection across multiple HTTP requests without
-  # automatically closing it you can use ::new instead of ::start.  #request
-  # will automatically open a connection to the server if one is not currently
-  # open.  You can manually close the connection with #finish.
-  #
   # For all the Net::HTTP request objects and shortcut request methods you may
   # supply either a String for the request path or a URI from which Net::HTTP
   # will extract the request path.
@@ -170,7 +169,7 @@ module Net   #:nodoc:
   # === POST
   #
   # A POST can be made using the Net::HTTP::Post request class.  This example
-  # creates a urlencoded POST body:
+  # creates a URL encoded POST body:
   #
   #   uri = URI('http://www.example.com/todo.cgi')
   #   req = Net::HTTP::Post.new(uri)
@@ -187,13 +186,10 @@ module Net   #:nodoc:
   #     res.value
   #   end
   #
-  # At this time Net::HTTP does not support multipart/form-data.  To send
-  # multipart/form-data use Net::HTTPRequest#body= and
-  # Net::HTTPRequest#content_type=:
+  # To send multipart/form-data use Net::HTTPHeader#set_form:
   #
   #   req = Net::HTTP::Post.new(uri)
-  #   req.body = multipart_data
-  #   req.content_type = 'multipart/form-data'
+  #   req.set_form([['upload', File.open('foo.bar')]], 'multipart/form-data')
   #
   # Other requests that can contain a body such as PUT can be created in the
   # same way using the corresponding request class (Net::HTTP::Put).
@@ -222,7 +218,7 @@ module Net   #:nodoc:
   # === Basic Authentication
   #
   # Basic authentication is performed according to
-  # [RFC2617](http://www.ietf.org/rfc/rfc2617.txt)
+  # [RFC2617](http://www.ietf.org/rfc/rfc2617.txt).
   #
   #   uri = URI('http://example.com/index.html?key=value')
   #
@@ -266,7 +262,7 @@ module Net   #:nodoc:
   #   end
   #
   # Or if you simply want to make a GET request, you may pass in an URI
-  # object that has a HTTPS URL. Net::HTTP automatically turn on TLS
+  # object that has an HTTPS URL. Net::HTTP automatically turns on TLS
   # verification if the URI object has a 'https' URI scheme.
   #
   #   uri = URI('https://example.com/')
@@ -392,6 +388,7 @@ module Net   #:nodoc:
   class HTTP < Protocol
 
     # :stopdoc:
+    VERSION = "0.1.1"
     Revision = %q$Revision$.split[1]
     HTTPVersion = '1.1'
     begin
@@ -431,7 +428,7 @@ module Net   #:nodoc:
     #
     # Gets the body text from the target and outputs it to $stdout.  The
     # target can either be specified as
-    # (+uri+), or as (+host+, +path+, +port+ = 80); so:
+    # (+uri+, +headers+), or as (+host+, +path+, +port+ = 80); so:
     #
     #    Net::HTTP.get_print URI('http://www.example.com/index.html')
     #
@@ -439,8 +436,12 @@ module Net   #:nodoc:
     #
     #    Net::HTTP.get_print 'www.example.com', '/index.html'
     #
-    def HTTP.get_print(uri_or_host, path = nil, port = nil)
-      get_response(uri_or_host, path, port) {|res|
+    # you can also specify request headers:
+    #
+    #    Net::HTTP.get_print URI('http://www.example.com/index.html'), { 'Accept' => 'text/html' }
+    #
+    def HTTP.get_print(uri_or_host, path_or_headers = nil, port = nil)
+      get_response(uri_or_host, path_or_headers, port) {|res|
         res.read_body do |chunk|
           $stdout.print chunk
         end
@@ -450,7 +451,7 @@ module Net   #:nodoc:
 
     # Sends a GET request to the target and returns the HTTP response
     # as a string.  The target can either be specified as
-    # (+uri+), or as (+host+, +path+, +port+ = 80); so:
+    # (+uri+, +headers+), or as (+host+, +path+, +port+ = 80); so:
     #
     #    print Net::HTTP.get(URI('http://www.example.com/index.html'))
     #
@@ -458,13 +459,17 @@ module Net   #:nodoc:
     #
     #    print Net::HTTP.get('www.example.com', '/index.html')
     #
-    def HTTP.get(uri_or_host, path = nil, port = nil)
-      get_response(uri_or_host, path, port).body
+    # you can also specify request headers:
+    #
+    #    Net::HTTP.get(URI('http://www.example.com/index.html'), { 'Accept' => 'text/html' })
+    #
+    def HTTP.get(uri_or_host, path_or_headers = nil, port = nil)
+      get_response(uri_or_host, path_or_headers, port).body
     end
 
     # Sends a GET request to the target and returns the HTTP response
     # as a Net::HTTPResponse object.  The target can either be specified as
-    # (+uri+), or as (+host+, +path+, +port+ = 80); so:
+    # (+uri+, +headers+), or as (+host+, +path+, +port+ = 80); so:
     #
     #    res = Net::HTTP.get_response(URI('http://www.example.com/index.html'))
     #    print res.body
@@ -474,21 +479,45 @@ module Net   #:nodoc:
     #    res = Net::HTTP.get_response('www.example.com', '/index.html')
     #    print res.body
     #
-    def HTTP.get_response(uri_or_host, path = nil, port = nil, &block)
-      if path
+    # you can also specify request headers:
+    #
+    #    Net::HTTP.get_response(URI('http://www.example.com/index.html'), { 'Accept' => 'text/html' })
+    #
+    def HTTP.get_response(uri_or_host, path_or_headers = nil, port = nil, &block)
+      if path_or_headers && !path_or_headers.is_a?(Hash)
         host = uri_or_host
+        path = path_or_headers
         new(host, port || HTTP.default_port).start {|http|
           return http.request_get(path, &block)
         }
       else
         uri = uri_or_host
+        headers = path_or_headers
         start(uri.hostname, uri.port,
               :use_ssl => uri.scheme == 'https') {|http|
-          return http.request_get(uri, &block)
+          return http.request_get(uri, headers, &block)
         }
       end
     end
 
+    # Posts data to the specified URI object.
+    #
+    # Example:
+    #
+    #   require 'net/http'
+    #   require 'uri'
+    #
+    #   Net::HTTP.post URI('http://www.example.com/api/search'),
+    #                  { "q" => "ruby", "max" => "50" }.to_json,
+    #                  "Content-Type" => "application/json"
+    #
+    def HTTP.post(url, data, header = nil)
+      start(url.hostname, url.port,
+            :use_ssl => url.scheme == 'https' ) {|http|
+        http.post(url, data, header)
+      }
+    end
+
     # Posts HTML form data to the specified URI object.
     # The form data must be provided as a Hash mapping from String to String.
     # Example:
@@ -542,7 +571,7 @@ module Net   #:nodoc:
 
     # :call-seq:
     #   HTTP.start(address, port, p_addr, p_port, p_user, p_pass, &block)
-    #   HTTP.start(address, port=nil, p_addr=nil, p_port=nil, p_user=nil, p_pass=nil, opt, &block)
+    #   HTTP.start(address, port=nil, p_addr=:ENV, p_port=nil, p_user=nil, p_pass=nil, opt, &block)
     #
     # Creates a new Net::HTTP object, then additionally opens the TCP
     # connection and HTTP session.
@@ -557,8 +586,8 @@ module Net   #:nodoc:
     # _opt_     :: optional hash
     #
     # _opt_ sets following values by its accessor.
-    # The keys are ca_file, ca_path, cert, cert_store, ciphers,
-    # close_on_empty_response, key, open_timeout, read_timeout, ssl_timeout,
+    # The keys are ipaddr, ca_file, ca_path, cert, cert_store, ciphers, keep_alive_timeout,
+    # close_on_empty_response, key, open_timeout, read_timeout, write_timeout, ssl_timeout,
     # ssl_version, use_ssl, verify_callback, verify_depth and verify_mode.
     # If you set :use_ssl as true, you can use https and default value of
     # verify_mode is set as OpenSSL::SSL::VERIFY_PEER.
@@ -573,8 +602,10 @@ module Net   #:nodoc:
     def HTTP.start(address, *arg, &block) # :yield: +http+
       arg.pop if opt = Hash.try_convert(arg[-1])
       port, p_addr, p_port, p_user, p_pass = *arg
+      p_addr = :ENV if arg.size < 2
       port = https_default_port if !port && opt && opt[:use_ssl]
       http = new(address, port, p_addr, p_port, p_user, p_pass)
+      http.ipaddr = opt[:ipaddr] if opt && opt[:ipaddr]
 
       if opt
         if opt[:use_ssl]
@@ -608,12 +639,13 @@ module Net   #:nodoc:
     # detection from the environment.  To disable proxy detection set +p_addr+
     # to nil.
     #
-    # If you are connecting to a custom proxy, +p_addr+ the DNS name or IP
-    # address of the proxy host, +p_port+ the port to use to access the proxy,
-    # and +p_user+ and +p_pass+ the username and password if authorization is
-    # required to use the proxy.
+    # If you are connecting to a custom proxy, +p_addr+ specifies the DNS name
+    # or IP address of the proxy host, +p_port+ the port to use to access the
+    # proxy, +p_user+ and +p_pass+ the username and password if authorization
+    # is required to use the proxy, and p_no_proxy hosts which do not
+    # use the proxy.
     #
-    def HTTP.new(address, port = nil, p_addr = :ENV, p_port = nil, p_user = nil, p_pass = nil)
+    def HTTP.new(address, port = nil, p_addr = :ENV, p_port = nil, p_user = nil, p_pass = nil, p_no_proxy = nil)
       http = super address, port
 
       if proxy_class? then # from Net::HTTP::Proxy()
@@ -625,6 +657,10 @@ module Net   #:nodoc:
       elsif p_addr == :ENV then
         http.proxy_from_env = true
       else
+        if p_addr && p_no_proxy && !URI::Generic.use_proxy?(p_addr, p_addr, p_port, p_no_proxy)
+          p_addr = nil
+          p_port = nil
+        end
         http.proxy_address = p_addr
         http.proxy_port    = p_port || default_port
         http.proxy_user    = p_user
@@ -640,6 +676,7 @@ module Net   #:nodoc:
     def initialize(address, port = nil)
       @address = address
       @port    = (port || HTTP.default_port)
+      @ipaddr = nil
       @local_host = nil
       @local_port = nil
       @curr_http_version = HTTPVersion
@@ -650,7 +687,9 @@ module Net   #:nodoc:
       @started = false
       @open_timeout = 60
       @read_timeout = 60
+      @write_timeout = 60
       @continue_timeout = nil
+      @max_retries = 1
       @debug_output = nil
 
       @proxy_from_env = false
@@ -683,7 +722,7 @@ module Net   #:nodoc:
     #   http.start { .... }
     #
     def set_debug_output(output)
-      warn 'Net::HTTP#set_debug_output called after HTTP started' if started?
+      warn 'Net::HTTP#set_debug_output called after HTTP started', uplevel: 1 if started?
       @debug_output = output
     end
 
@@ -705,6 +744,17 @@ module Net   #:nodoc:
     attr_writer :proxy_user
     attr_writer :proxy_pass
 
+    # The IP address to connect to/used to connect to
+    def ipaddr
+      started? ?  @socket.io.peeraddr[3] : @ipaddr
+    end
+
+    # Set the IP address to connect to
+    def ipaddr=(addr)
+      raise IOError, "ipaddr value changed, but session already started" if started?
+      @ipaddr = addr
+    end
+
     # Number of seconds to wait for the connection to open. Any number
     # may be used, including Floats for fractional seconds. If the HTTP
     # object cannot open a connection in this many seconds, it raises a
@@ -717,12 +767,41 @@ module Net   #:nodoc:
     # it raises a Net::ReadTimeout exception. The default value is 60 seconds.
     attr_reader :read_timeout
 
+    # Number of seconds to wait for one block to be written (via one write(2)
+    # call). Any number may be used, including Floats for fractional
+    # seconds. If the HTTP object cannot write data in this many seconds,
+    # it raises a Net::WriteTimeout exception. The default value is 60 seconds.
+    # Net::WriteTimeout is not raised on Windows.
+    attr_reader :write_timeout
+
+    # Maximum number of times to retry an idempotent request in case of
+    # Net::ReadTimeout, IOError, EOFError, Errno::ECONNRESET,
+    # Errno::ECONNABORTED, Errno::EPIPE, OpenSSL::SSL::SSLError,
+    # Timeout::Error.
+    # Should be a non-negative integer number. Zero means no retries.
+    # The default value is 1.
+    def max_retries=(retries)
+      retries = retries.to_int
+      if retries < 0
+        raise ArgumentError, 'max_retries should be non-negative integer number'
+      end
+      @max_retries = retries
+    end
+
+    attr_reader :max_retries
+
     # Setter for the read_timeout attribute.
     def read_timeout=(sec)
       @socket.read_timeout = sec if @socket
       @read_timeout = sec
     end
 
+    # Setter for the write_timeout attribute.
+    def write_timeout=(sec)
+      @socket.write_timeout = sec if @socket
+      @write_timeout = sec
+    end
+
     # Seconds to wait for 100 Continue response. If the HTTP object does not
     # receive a response in this many seconds it sends the request body. The
     # default value is +nil+.
@@ -772,12 +851,16 @@ module Net   #:nodoc:
       :@cert,
       :@cert_store,
       :@ciphers,
+      :@extra_chain_cert,
       :@key,
       :@ssl_timeout,
       :@ssl_version,
+      :@min_version,
+      :@max_version,
       :@verify_callback,
       :@verify_depth,
       :@verify_mode,
+      :@verify_hostname,
     ]
     SSL_ATTRIBUTES = [
       :ca_file,
@@ -785,12 +868,16 @@ module Net   #:nodoc:
       :cert,
       :cert_store,
       :ciphers,
+      :extra_chain_cert,
       :key,
       :ssl_timeout,
       :ssl_version,
+      :min_version,
+      :max_version,
       :verify_callback,
       :verify_depth,
       :verify_mode,
+      :verify_hostname,
     ]
 
     # Sets path of a CA certification file in PEM format.
@@ -812,6 +899,10 @@ module Net   #:nodoc:
     # Sets the available ciphers.  See OpenSSL::SSL::SSLContext#ciphers=
     attr_accessor :ciphers
 
+    # Sets the extra X509 certificates to be added to the certificate chain.
+    # See OpenSSL::SSL::SSLContext#extra_chain_cert=
+    attr_accessor :extra_chain_cert
+
     # Sets an OpenSSL::PKey::RSA or OpenSSL::PKey::DSA object.
     # (This method is appeared in Michal Rokos's OpenSSL extension.)
     attr_accessor :key
@@ -822,6 +913,12 @@ module Net   #:nodoc:
     # Sets the SSL version.  See OpenSSL::SSL::SSLContext#ssl_version=
     attr_accessor :ssl_version
 
+    # Sets the minimum SSL version.  See OpenSSL::SSL::SSLContext#min_version=
+    attr_accessor :min_version
+
+    # Sets the maximum SSL version.  See OpenSSL::SSL::SSLContext#max_version=
+    attr_accessor :max_version
+
     # Sets the verify callback for the server certification verification.
     attr_accessor :verify_callback
 
@@ -834,6 +931,10 @@ module Net   #:nodoc:
     # OpenSSL::SSL::VERIFY_NONE or OpenSSL::SSL::VERIFY_PEER are acceptable.
     attr_accessor :verify_mode
 
+    # Sets to check the server certificate is valid for the hostname.
+    # See OpenSSL::SSL::SSLContext#verify_hostname=
+    attr_accessor :verify_hostname
+
     # Returns the X.509 certificates the server presented.
     def peer_cert
       if not use_ssl? or not @socket
@@ -873,89 +974,84 @@ module Net   #:nodoc:
 
     def connect
       if proxy? then
-        conn_address = proxy_address
-        conn_port    = proxy_port
+        conn_addr = proxy_address
+        conn_port = proxy_port
       else
-        conn_address = address
-        conn_port    = port
+        conn_addr = conn_address
+        conn_port = port
       end
 
-      D "opening connection to #{conn_address}:#{conn_port}..."
+      D "opening connection to #{conn_addr}:#{conn_port}..."
       s = Timeout.timeout(@open_timeout, Net::OpenTimeout) {
         begin
-          TCPSocket.open(conn_address, conn_port, @local_host, @local_port)
+          TCPSocket.open(conn_addr, conn_port, @local_host, @local_port)
         rescue => e
           raise e, "Failed to open TCP connection to " +
-            "#{conn_address}:#{conn_port} (#{e.message})"
+            "#{conn_addr}:#{conn_port} (#{e.message})"
         end
       }
       s.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
       D "opened"
       if use_ssl?
+        if proxy?
+          plain_sock = BufferedIO.new(s, read_timeout: @read_timeout,
+                                      write_timeout: @write_timeout,
+                                      continue_timeout: @continue_timeout,
+                                      debug_output: @debug_output)
+          buf = "CONNECT #{conn_address}:#{@port} HTTP/#{HTTPVersion}\r\n"
+          buf << "Host: #{@address}:#{@port}\r\n"
+          if proxy_user
+            credential = ["#{proxy_user}:#{proxy_pass}"].pack('m0')
+            buf << "Proxy-Authorization: Basic #{credential}\r\n"
+          end
+          buf << "\r\n"
+          plain_sock.write(buf)
+          HTTPResponse.read_new(plain_sock).value
+          # assuming nothing left in buffers after successful CONNECT response
+        end
+
         ssl_parameters = Hash.new
         iv_list = instance_variables
         SSL_IVNAMES.each_with_index do |ivname, i|
-          if iv_list.include?(ivname) and
+          if iv_list.include?(ivname)
             value = instance_variable_get(ivname)
-            ssl_parameters[SSL_ATTRIBUTES[i]] = value if value
+            unless value.nil?
+              ssl_parameters[SSL_ATTRIBUTES[i]] = value
+            end
           end
         end
         @ssl_context = OpenSSL::SSL::SSLContext.new
         @ssl_context.set_params(ssl_parameters)
-        D "starting SSL for #{conn_address}:#{conn_port}..."
+        @ssl_context.session_cache_mode =
+          OpenSSL::SSL::SSLContext::SESSION_CACHE_CLIENT |
+          OpenSSL::SSL::SSLContext::SESSION_CACHE_NO_INTERNAL_STORE
+        @ssl_context.session_new_cb = proc {|sock, sess| @ssl_session = sess }
+        D "starting SSL for #{conn_addr}:#{conn_port}..."
         s = OpenSSL::SSL::SSLSocket.new(s, @ssl_context)
         s.sync_close = true
-        D "SSL established"
-      end
-      @socket = BufferedIO.new(s)
-      @socket.read_timeout = @read_timeout
-      @socket.continue_timeout = @continue_timeout
-      @socket.debug_output = @debug_output
-      if use_ssl?
-        begin
-          if proxy?
-            buf = "CONNECT #{@address}:#{@port} HTTP/#{HTTPVersion}\r\n"
-            buf << "Host: #{@address}:#{@port}\r\n"
-            if proxy_user
-              credential = ["#{proxy_user}:#{proxy_pass}"].pack('m0')
-              buf << "Proxy-Authorization: Basic #{credential}\r\n"
-            end
-            buf << "\r\n"
-            @socket.write(buf)
-            HTTPResponse.read_new(@socket).value
-          end
-          # Server Name Indication (SNI) RFC 3546
-          s.hostname = @address if s.respond_to? :hostname=
-          if @ssl_session and
-             Process.clock_gettime(Process::CLOCK_REALTIME) < @ssl_session.time.to_f + @ssl_session.timeout
-            s.session = @ssl_session if @ssl_session
-          end
-          if timeout = @open_timeout
-            while true
-              raise Net::OpenTimeout if timeout <= 0
-              start = Process.clock_gettime Process::CLOCK_MONOTONIC
-              # to_io is required because SSLSocket doesn't have wait_readable yet
-              case s.connect_nonblock(exception: false)
-              when :wait_readable; s.to_io.wait_readable(timeout)
-              when :wait_writable; s.to_io.wait_writable(timeout)
-              else; break
-              end
-              timeout -= Process.clock_gettime(Process::CLOCK_MONOTONIC) - start
-            end
-          else
-            s.connect
-          end
-          if @ssl_context.verify_mode != OpenSSL::SSL::VERIFY_NONE
-            s.post_connection_check(@address)
-          end
-          @ssl_session = s.session
-        rescue => exception
-          D "Conn close because of connect error #{exception}"
-          @socket.close if @socket and not @socket.closed?
-          raise exception
+        # Server Name Indication (SNI) RFC 3546
+        s.hostname = @address if s.respond_to? :hostname=
+        if @ssl_session and
+           Process.clock_gettime(Process::CLOCK_REALTIME) < @ssl_session.time.to_f + @ssl_session.timeout
+          s.session = @ssl_session
+        end
+        ssl_socket_connect(s, @open_timeout)
+        if (@ssl_context.verify_mode != OpenSSL::SSL::VERIFY_NONE) && @ssl_context.verify_hostname
+          s.post_connection_check(@address)
         end
+        D "SSL established, protocol: #{s.ssl_version}, cipher: #{s.cipher[0]}"
       end
+      @socket = BufferedIO.new(s, read_timeout: @read_timeout,
+                               write_timeout: @write_timeout,
+                               continue_timeout: @continue_timeout,
+                               debug_output: @debug_output)
       on_connect
+    rescue => exception
+      if s
+        D "Conn close because of connect error #{exception}"
+        s.close
+      end
+      raise
     end
     private :connect
 
@@ -972,7 +1068,7 @@ module Net   #:nodoc:
 
     def do_finish
       @started = false
-      @socket.close if @socket and not @socket.closed?
+      @socket.close if @socket
       @socket = nil
     end
     private :do_finish
@@ -1039,11 +1135,7 @@ module Net   #:nodoc:
 
     # True if requests for this connection will be proxied
     def proxy?
-      !!if @proxy_from_env then
-        proxy_uri
-      else
-        @proxy_address
-      end
+      !!(@proxy_from_env ? proxy_uri : @proxy_address)
     end
 
     # True if the proxy for this connection is determined from the environment
@@ -1053,9 +1145,11 @@ module Net   #:nodoc:
 
     # The proxy URI determined from the environment for this connection.
     def proxy_uri # :nodoc:
+      return if @proxy_uri == false
       @proxy_uri ||= URI::HTTP.new(
         "http".freeze, nil, address, port, nil, nil, nil, nil, nil
-      ).find_proxy
+      ).find_proxy || false
+      @proxy_uri || nil
     end
 
     # The address of the proxy server, if one is configured.
@@ -1076,14 +1170,29 @@ module Net   #:nodoc:
       end
     end
 
-    # The proxy username, if one is configured
+    # [Bug #12921]
+    if /linux|freebsd|darwin/ =~ RUBY_PLATFORM
+      ENVIRONMENT_VARIABLE_IS_MULTIUSER_SAFE = true
+    else
+      ENVIRONMENT_VARIABLE_IS_MULTIUSER_SAFE = false
+    end
+
+    # The username of the proxy server, if one is configured.
     def proxy_user
-      @proxy_user
+      if ENVIRONMENT_VARIABLE_IS_MULTIUSER_SAFE && @proxy_from_env
+        proxy_uri&.user
+      else
+        @proxy_user
+      end
     end
 
-    # The proxy password, if one is configured
+    # The password of the proxy server, if one is configured.
     def proxy_pass
-      @proxy_pass
+      if ENVIRONMENT_VARIABLE_IS_MULTIUSER_SAFE && @proxy_from_env
+        proxy_uri&.password
+      else
+        @proxy_pass
+      end
     end
 
     alias proxyaddr proxy_address   #:nodoc: obsolete
@@ -1094,7 +1203,7 @@ module Net   #:nodoc:
     # without proxy, obsolete
 
     def conn_address # :nodoc:
-      address()
+      @ipaddr || address()
     end
 
     def conn_port # :nodoc:
@@ -1437,11 +1546,17 @@ module Net   #:nodoc:
       begin
         begin_transport req
         res = catch(:response) {
-          req.exec @socket, @curr_http_version, edit_path(req.path)
+          begin
+            req.exec @socket, @curr_http_version, edit_path(req.path)
+          rescue Errno::EPIPE
+            # Failure when writing full request, but we can probably
+            # still read the received response.
+          end
+
           begin
             res = HTTPResponse.read_new(@socket)
             res.decode_content = req.decode_content
-          end while res.kind_of?(HTTPContinue)
+          end while res.kind_of?(HTTPInformation)
 
           res.uri = req.uri
 
@@ -1453,18 +1568,18 @@ module Net   #:nodoc:
       rescue Net::OpenTimeout
         raise
       rescue Net::ReadTimeout, IOError, EOFError,
-             Errno::ECONNRESET, Errno::ECONNABORTED, Errno::EPIPE,
+             Errno::ECONNRESET, Errno::ECONNABORTED, Errno::EPIPE, Errno::ETIMEDOUT,
              # avoid a dependency on OpenSSL
              defined?(OpenSSL::SSL) ? OpenSSL::SSL::SSLError : IOError,
              Timeout::Error => exception
-        if count == 0 && IDEMPOTENT_METHODS_.include?(req.method)
+        if count < max_retries && IDEMPOTENT_METHODS_.include?(req.method)
           count += 1
-          @socket.close if @socket and not @socket.closed?
+          @socket.close if @socket
           D "Conn close because of error #{exception}, and retry"
           retry
         end
         D "Conn close because of error #{exception}"
-        @socket.close if @socket and not @socket.closed?
+        @socket.close if @socket
         raise
       end
 
@@ -1472,7 +1587,7 @@ module Net   #:nodoc:
       res
     rescue => exception
       D "Conn close because of error #{exception}"
-      @socket.close if @socket and not @socket.closed?
+      @socket.close if @socket
       raise exception
     end
 
@@ -1560,11 +1675,10 @@ module Net   #:nodoc:
     private
 
     def addr_port
-      if use_ssl?
-        address() + (port == HTTP.https_default_port ? '' : ":#{port()}")
-      else
-        address() + (port == HTTP.http_default_port ? '' : ":#{port()}")
-      end
+      addr = address
+      addr = "[#{addr}]" if addr.include?(":")
+      default_port = use_ssl? ? HTTP.https_default_port : HTTP.http_default_port
+      default_port == port ? addr : "#{addr}:#{port}"
     end
 
     def D(msg)
@@ -1576,17 +1690,17 @@ module Net   #:nodoc:
 
 end
 
-require 'net/http/exceptions'
+require_relative 'http/exceptions'
 
-require 'net/http/header'
+require_relative 'http/header'
 
-require 'net/http/generic_request'
-require 'net/http/request'
-require 'net/http/requests'
+require_relative 'http/generic_request'
+require_relative 'http/request'
+require_relative 'http/requests'
 
-require 'net/http/response'
-require 'net/http/responses'
+require_relative 'http/response'
+require_relative 'http/responses'
 
-require 'net/http/proxy_delta'
+require_relative 'http/proxy_delta'
 
-require 'net/http/backward'
+require_relative 'http/backward'
diff --git a/lib/net/http/exceptions.rb b/lib/net/http/exceptions.rb
index 0d34526616..da5f7a70fc 100644
--- a/lib/net/http/exceptions.rb
+++ b/lib/net/http/exceptions.rb
@@ -20,7 +20,14 @@ class Net::HTTPServerException < Net::ProtoServerError
   # We cannot use the name "HTTPServerError", it is the name of the response.
   include Net::HTTPExceptions
 end
+
+# for compatibility
+Net::HTTPClientException = Net::HTTPServerException
+
 class Net::HTTPFatalError < Net::ProtoFatalError
   include Net::HTTPExceptions
 end
 
+module Net
+  deprecate_constant(:HTTPServerException)
+end
diff --git a/lib/net/http/generic_request.rb b/lib/net/http/generic_request.rb
index 19602da27c..003f59d0ac 100644
--- a/lib/net/http/generic_request.rb
+++ b/lib/net/http/generic_request.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: false
-# HTTPGenericRequest is the parent of the HTTPRequest class.
-# Do not use this directly; use a subclass of HTTPRequest.
+# HTTPGenericRequest is the parent of the Net::HTTPRequest class.
+# Do not use this directly; use a subclass of Net::HTTPRequest.
 #
-# Mixes in the HTTPHeader module to provide easier access to HTTP headers.
+# Mixes in the Net::HTTPHeader module to provide easier access to HTTP headers.
 #
 class Net::HTTPGenericRequest
 
@@ -14,6 +14,8 @@ class Net::HTTPGenericRequest
     @response_has_body = resbody
 
     if URI === uri_or_path then
+      raise ArgumentError, "not an HTTP URI" unless URI::HTTP === uri_or_path
+      raise ArgumentError, "no host component for URI" unless uri_or_path.hostname
       @uri = uri_or_path.dup
       host = @uri.hostname.dup
       host << ":".freeze << @uri.port.to_s if @uri.port != @uri.default_port
@@ -82,7 +84,7 @@ class Net::HTTPGenericRequest
   end
 
   def body_exist?
-    warn "Net::HTTPRequest#body_exist? is obsolete; use response_body_permitted?" if $VERBOSE
+    warn "Net::HTTPRequest#body_exist? is obsolete; use response_body_permitted?", uplevel: 1 if $VERBOSE
     response_body_permitted?
   end
 
@@ -168,9 +170,8 @@ class Net::HTTPGenericRequest
 
     def write(buf)
       # avoid memcpy() of buf, buf can huge and eat memory bandwidth
-      @sock.write("#{buf.bytesize.to_s(16)}\r\n")
-      rv = @sock.write(buf)
-      @sock.write("\r\n")
+      rv = buf.bytesize
+      @sock.write("#{rv.to_s(16)}\r\n", buf, "\r\n")
       rv
     end
 
@@ -299,7 +300,7 @@ class Net::HTTPGenericRequest
 
   def supply_default_content_type
     return if content_type()
-    warn 'net/http: warning: Content-Type did not set; using application/x-www-form-urlencoded' if $VERBOSE
+    warn 'net/http: Content-Type did not set; using application/x-www-form-urlencoded', uplevel: 1 if $VERBOSE
     set_content_type 'application/x-www-form-urlencoded'
   end
 
@@ -321,7 +322,12 @@ class Net::HTTPGenericRequest
   end
 
   def write_header(sock, ver, path)
-    buf = "#{@method} #{path} HTTP/#{ver}\r\n"
+    reqline = "#{@method} #{path} HTTP/#{ver}"
+    if /[\r\n]/ =~ reqline
+      raise ArgumentError, "A Request-Line must not contain CR or LF"
+    end
+    buf = ""
+    buf << reqline << "\r\n"
     each_capitalized do |k,v|
       buf << "#{k}: #{v}\r\n"
     end
diff --git a/lib/net/http/header.rb b/lib/net/http/header.rb
index 9a6a360fe2..495425d148 100644
--- a/lib/net/http/header.rb
+++ b/lib/net/http/header.rb
@@ -9,16 +9,28 @@
 # convenient formats.
 #
 module Net::HTTPHeader
+  MAX_KEY_LENGTH = 1024
+  MAX_FIELD_LENGTH = 65536
 
   def initialize_http_header(initheader)
     @header = {}
     return unless initheader
     initheader.each do |key, value|
-      warn "net/http: warning: duplicated HTTP header: #{key}" if key?(key) and $VERBOSE
+      warn "net/http: duplicated HTTP header: #{key}", uplevel: 3 if key?(key) and $VERBOSE
       if value.nil?
-        warn "net/http: warning: nil HTTP header: #{key}" if $VERBOSE
+        warn "net/http: nil HTTP header: #{key}", uplevel: 3 if $VERBOSE
       else
-        @header[key.downcase] = [value.strip]
+        value = value.strip # raise error for invalid byte sequences
+        if key.to_s.bytesize > MAX_KEY_LENGTH
+          raise ArgumentError, "too long (#{key.bytesize} bytes) header: #{key[0, 30].inspect}..."
+        end
+        if value.to_s.bytesize > MAX_FIELD_LENGTH
+          raise ArgumentError, "header #{key} has too long field vallue: #{value.bytesize}"
+        end
+        if value.count("\r\n") > 0
+          raise ArgumentError, "header #{key} has field value #{value.inspect}, this cannot include CR/LF"
+        end
+        @header[key.downcase.to_s] = [value]
       end
     end
   end
@@ -32,17 +44,17 @@ module Net::HTTPHeader
   # Returns the header field corresponding to the case-insensitive key.
   # For example, a key of "Content-Type" might return "text/html"
   def [](key)
-    a = @header[key.downcase] or return nil
+    a = @header[key.downcase.to_s] or return nil
     a.join(', ')
   end
 
   # Sets the header field corresponding to the case-insensitive key.
   def []=(key, val)
     unless val
-      @header.delete key.downcase
+      @header.delete key.downcase.to_s
       return val
     end
-    @header[key.downcase] = [val]
+    set_field(key, val)
   end
 
   # [Ruby 1.8.3]
@@ -61,10 +73,39 @@ module Net::HTTPHeader
   #   p request.get_fields('X-My-Header')   #=> ["a", "b", "c"]
   #
   def add_field(key, val)
-    if @header.key?(key.downcase)
-      @header[key.downcase].push val
+    stringified_downcased_key = key.downcase.to_s
+    if @header.key?(stringified_downcased_key)
+      append_field_value(@header[stringified_downcased_key], val)
+    else
+      set_field(key, val)
+    end
+  end
+
+  private def set_field(key, val)
+    case val
+    when Enumerable
+      ary = []
+      append_field_value(ary, val)
+      @header[key.downcase.to_s] = ary
+    else
+      val = val.to_s # for compatibility use to_s instead of to_str
+      if val.b.count("\r\n") > 0
+        raise ArgumentError, 'header field value cannot include CR/LF'
+      end
+      @header[key.downcase.to_s] = [val]
+    end
+  end
+
+  private def append_field_value(ary, val)
+    case val
+    when Enumerable
+      val.each{|x| append_field_value(ary, x)}
     else
-      @header[key.downcase] = [val]
+      val = val.to_s
+      if /[\r\n]/n.match?(val.b)
+        raise ArgumentError, 'header field value cannot include CR/LF'
+      end
+      ary.push val
     end
   end
 
@@ -80,8 +121,9 @@ module Net::HTTPHeader
   #     #=> "session=al98axx; expires=Fri, 31-Dec-1999 23:58:23, query=rubyscript; expires=Fri, 31-Dec-1999 23:58:23"
   #
   def get_fields(key)
-    return nil unless @header[key.downcase]
-    @header[key.downcase].dup
+    stringified_downcased_key = key.downcase.to_s
+    return nil unless @header[stringified_downcased_key]
+    @header[stringified_downcased_key].dup
   end
 
   # Returns the header field corresponding to the case-insensitive key.
@@ -89,7 +131,7 @@ module Net::HTTPHeader
   # raises an IndexError if there's no header field named +key+
   # See Hash#fetch
   def fetch(key, *args, &block)   #:yield: +key+
-    a = @header.fetch(key.downcase, *args, &block)
+    a = @header.fetch(key.downcase.to_s, *args, &block)
     a.kind_of?(Array) ? a.join(', ') : a
   end
 
@@ -150,12 +192,12 @@ module Net::HTTPHeader
 
   # Removes a header field, specified by case-insensitive key.
   def delete(key)
-    @header.delete(key.downcase)
+    @header.delete(key.downcase.to_s)
   end
 
   # true if +key+ header exists.
   def key?(key)
-    @header.key?(key.downcase)
+    @header.key?(key.downcase.to_s)
   end
 
   # Returns a Hash consisting of header names and array of values.
@@ -289,7 +331,7 @@ module Net::HTTPHeader
   end
 
   # Returns "true" if the "transfer-encoding" header is present and
-  # set to "chunked".  This is an HTTP/1.1 feature, allowing the
+  # set to "chunked".  This is an HTTP/1.1 feature, allowing
   # the content to be sent in "chunks" without at the outset
   # stating the entire content length.
   def chunked?
@@ -388,31 +430,51 @@ module Net::HTTPHeader
 
   alias form_data= set_form_data
 
-  # Set a HTML form data set.
-  # +params+ is the form data set; it is an Array of Arrays or a Hash
-  # +enctype is the type to encode the form data set.
-  # It is application/x-www-form-urlencoded or multipart/form-data.
-  # +formopt+ is an optional hash to specify the detail.
-  #
-  # boundary:: the boundary of the multipart message
-  # charset::  the charset of the message. All names and the values of
-  #            non-file fields are encoded as the charset.
+  # Set an HTML form data set.
+  # +params+ :: The form data to set, which should be an enumerable.
+  #             See below for more details.
+  # +enctype+ :: The content type to use to encode the form submission,
+  #              which should be application/x-www-form-urlencoded or
+  #              multipart/form-data.
+  # +formopt+ :: An options hash, supporting the following options:
+  #              :boundary :: The boundary of the multipart message. If
+  #                           not given, a random boundary will be used.
+  #              :charset :: The charset of the form submission. All
+  #                          field names and values of non-file fields
+  #                          should be encoded with this charset.
   #
-  # Each item of params is an array and contains following items:
-  # +name+::  the name of the field
-  # +value+:: the value of the field, it should be a String or a File
-  # +opt+::   an optional hash to specify additional information
+  # Each item of params should respond to +each+ and yield 2-3 arguments,
+  # or an array of 2-3 elements. The arguments yielded should be:
+  #  * The name of the field.
+  #  * The value of the field, it should be a String or a File or IO-like.
+  #  * An options hash, supporting the following options, only
+  #    used for file uploads:
+  #    :filename :: The name of the file to use.
+  #    :content_type :: The content type of the uploaded file.
   #
   # Each item is a file field or a normal field.
-  # If +value+ is a File object or the +opt+ have a filename key,
+  # If +value+ is a File object or the +opt+ hash has a :filename key,
   # the item is treated as a file field.
   #
-  # If Transfer-Encoding is set as chunked, this send the request in
+  # If Transfer-Encoding is set as chunked, this sends the request using
   # chunked encoding. Because chunked encoding is HTTP/1.1 feature,
-  # you must confirm the server to support HTTP/1.1 before sending it.
+  # you should confirm that the server supports HTTP/1.1 before using
+  # chunked encoding.
   #
   # Example:
-  #    http.set_form([["q", "ruby"], ["lang", "en"]])
+  #    req.set_form([["q", "ruby"], ["lang", "en"]])
+  #
+  #    req.set_form({"f"=>File.open('/path/to/filename')},
+  #                 "multipart/form-data",
+  #                 charset: "UTF-8",
+  #    )
+  #
+  #    req.set_form([["f",
+  #                   File.open('/path/to/filename.bar'),
+  #                   {filename: "other-filename.foo"}
+  #                 ]],
+  #                 "multipart/form-data",
+  #    )
   #
   # See also RFC 2388, RFC 2616, HTML 4.01, and HTML5
   #
diff --git a/lib/net/http/net-http.gemspec b/lib/net/http/net-http.gemspec
new file mode 100644
index 0000000000..f5ef4045e8
--- /dev/null
+++ b/lib/net/http/net-http.gemspec
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+name = File.basename(__FILE__, ".gemspec")
+version = ["lib", Array.new(name.count("-")+1, "..").join("/")].find do |dir|
+  break File.foreach(File.join(__dir__, dir, "#{name.tr('-', '/')}.rb")) do |line|
+    /^\s*VERSION\s*=\s*"(.*)"/ =~ line and break $1
+  end rescue nil
+end
+
+Gem::Specification.new do |spec|
+  spec.name          = name
+  spec.version       = version
+  spec.authors       = ["NARUSE, Yui"]
+  spec.email         = ["naruse@airemix.jp"]
+
+  spec.summary       = %q{HTTP client api for Ruby.}
+  spec.description   = %q{HTTP client api for Ruby.}
+  spec.homepage      = "https://github.com/ruby/net-http"
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.6.0")
+  spec.licenses      = ["Ruby", "BSD-2-Clause"]
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z 2>/dev/null`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency "net-protocol"
+  spec.add_dependency "uri"
+end
diff --git a/lib/net/http/response.rb b/lib/net/http/response.rb
index 349812834f..08eaeb2cac 100644
--- a/lib/net/http/response.rb
+++ b/lib/net/http/response.rb
@@ -8,11 +8,13 @@
 # header values both via hash-like methods and via individual readers.
 #
 # Note that each possible HTTP response code defines its own
-# HTTPResponse subclass.  These are listed below.
+# HTTPResponse subclass. All classes are defined under the Net module.
+# Indentation indicates inheritance.  For a list of the classes see Net::HTTP.
 #
-# All classes are defined under the Net module. Indentation indicates
-# inheritance.  For a list of the classes see Net::HTTP.
+# Correspondence <code>HTTP code => class</code> is stored in CODE_TO_OBJ
+# constant:
 #
+#    Net::HTTPResponse::CODE_TO_OBJ['404'] #=> Net::HTTPNotFound
 #
 class Net::HTTPResponse
   class << self
@@ -117,7 +119,9 @@ class Net::HTTPResponse
   end
 
   def error!   #:nodoc:
-    raise error_type().new(@code + ' ' + @message.dump, self)
+    message = @code
+    message += ' ' + @message.dump if @message
+    raise error_type().new(message, self)
   end
 
   def error_type   #:nodoc:
@@ -138,17 +142,17 @@ class Net::HTTPResponse
   #
 
   def response   #:nodoc:
-    warn "#{caller(1)[0]}: warning: Net::HTTPResponse#response is obsolete" if $VERBOSE
+    warn "Net::HTTPResponse#response is obsolete", uplevel: 1 if $VERBOSE
     self
   end
 
   def header   #:nodoc:
-    warn "#{caller(1)[0]}: warning: Net::HTTPResponse#header is obsolete" if $VERBOSE
+    warn "Net::HTTPResponse#header is obsolete", uplevel: 1 if $VERBOSE
     self
   end
 
   def read_header   #:nodoc:
-    warn "#{caller(1)[0]}: warning: Net::HTTPResponse#read_header is obsolete" if $VERBOSE
+    warn "Net::HTTPResponse#read_header is obsolete", uplevel: 1 if $VERBOSE
     self
   end
 
@@ -172,6 +176,10 @@ class Net::HTTPResponse
   # If a block is given, the body is passed to the block, and
   # the body is provided in fragments, as it is read in from the socket.
   #
+  # If +dest+ argument is given, response is read into that variable,
+  # with <code>dest#<<</code> method (it could be String or IO, or any
+  # other object responding to <code><<</code>).
+  #
   # Calling this method a second or subsequent time for the same
   # HTTPResponse object will return the value already read.
   #
@@ -240,10 +248,10 @@ class Net::HTTPResponse
   ##
   # Checks for a supported Content-Encoding header and yields an Inflate
   # wrapper for this response's socket when zlib is present.  If the
-  # Content-Encoding is unsupported or zlib is missing the plain socket is
+  # Content-Encoding is not supported or zlib is missing, the plain socket is
   # yielded.
   #
-  # If a Content-Range header is present a plain socket is yielded as the
+  # If a Content-Range header is present, a plain socket is yielded as the
   # bytes in the range may not be a complete deflate block.
 
   def inflater # :nodoc:
@@ -260,12 +268,13 @@ class Net::HTTPResponse
 
       begin
         yield inflate_body_io
+        success = true
       ensure
-        orig_err = $!
         begin
           inflate_body_io.finish
         rescue => err
-          raise orig_err || err
+          # Ignore #finish's error if there is an exception from yield
+          raise err if success
         end
       end
     when 'none', 'identity' then
@@ -378,6 +387,7 @@ class Net::HTTPResponse
       end
       block = proc do |compressed_chunk|
         @inflate.inflate(compressed_chunk) do |chunk|
+          compressed_chunk.clear
           dest << chunk
         end
       end
diff --git a/lib/net/http/responses.rb b/lib/net/http/responses.rb
index 8e75f75d4f..50352032df 100644
--- a/lib/net/http/responses.rb
+++ b/lib/net/http/responses.rb
@@ -1,5 +1,6 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 # :stopdoc:
+# https://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
 class Net::HTTPUnknownResponse < Net::HTTPResponse
   HAS_BODY = true
   EXCEPTION_TYPE = Net::HTTPError
@@ -18,7 +19,7 @@ class Net::HTTPRedirection < Net::HTTPResponse           # 3xx
 end
 class Net::HTTPClientError < Net::HTTPResponse           # 4xx
   HAS_BODY = true
-  EXCEPTION_TYPE = Net::HTTPServerException   # for backward compatibility
+  EXCEPTION_TYPE = Net::HTTPClientException   # for backward compatibility
 end
 class Net::HTTPServerError < Net::HTTPResponse           # 5xx
   HAS_BODY = true
@@ -31,7 +32,12 @@ end
 class Net::HTTPSwitchProtocol < Net::HTTPInformation     # 101
   HAS_BODY = false
 end
-# 102 - RFC 2518; removed in RFC 4918
+class Net::HTTPProcessing < Net::HTTPInformation         # 102
+  HAS_BODY = false
+end
+class Net::HTTPEarlyHints < Net::HTTPInformation         # 103 - RFC 8297
+  HAS_BODY = false
+end
 
 class Net::HTTPOK < Net::HTTPSuccess                            # 200
   HAS_BODY = true
@@ -57,7 +63,9 @@ end
 class Net::HTTPMultiStatus < Net::HTTPSuccess                   # 207 - RFC 4918
   HAS_BODY = true
 end
-# 208 Already Reported - RFC 5842; experimental
+class Net::HTTPAlreadyReported < Net::HTTPSuccess               # 208 - RFC 5842
+  HAS_BODY = true
+end
 class Net::HTTPIMUsed < Net::HTTPSuccess                        # 226 - RFC 3229
   HAS_BODY = true
 end
@@ -114,9 +122,10 @@ end
 class Net::HTTPProxyAuthenticationRequired < Net::HTTPClientError   # 407
   HAS_BODY = true
 end
-class Net::HTTPRequestTimeOut < Net::HTTPClientError                # 408
+class Net::HTTPRequestTimeout < Net::HTTPClientError                # 408
   HAS_BODY = true
 end
+Net::HTTPRequestTimeOut = Net::HTTPRequestTimeout
 class Net::HTTPConflict < Net::HTTPClientError                      # 409
   HAS_BODY = true
 end
@@ -129,24 +138,30 @@ end
 class Net::HTTPPreconditionFailed < Net::HTTPClientError            # 412
   HAS_BODY = true
 end
-class Net::HTTPRequestEntityTooLarge < Net::HTTPClientError         # 413
+class Net::HTTPPayloadTooLarge < Net::HTTPClientError               # 413
   HAS_BODY = true
 end
-class Net::HTTPRequestURITooLong < Net::HTTPClientError             # 414
+Net::HTTPRequestEntityTooLarge = Net::HTTPPayloadTooLarge
+class Net::HTTPURITooLong < Net::HTTPClientError                    # 414
   HAS_BODY = true
 end
+Net::HTTPRequestURITooLong = Net::HTTPURITooLong
 Net::HTTPRequestURITooLarge = Net::HTTPRequestURITooLong
 class Net::HTTPUnsupportedMediaType < Net::HTTPClientError          # 415
   HAS_BODY = true
 end
-class Net::HTTPRequestedRangeNotSatisfiable < Net::HTTPClientError  # 416
+class Net::HTTPRangeNotSatisfiable < Net::HTTPClientError           # 416
   HAS_BODY = true
 end
+Net::HTTPRequestedRangeNotSatisfiable = Net::HTTPRangeNotSatisfiable
 class Net::HTTPExpectationFailed < Net::HTTPClientError             # 417
   HAS_BODY = true
 end
 # 418 I'm a teapot - RFC 2324; a joke RFC
 # 420 Enhance Your Calm - Twitter
+class Net::HTTPMisdirectedRequest < Net::HTTPClientError            # 421 - RFC 7540
+  HAS_BODY = true
+end
 class Net::HTTPUnprocessableEntity < Net::HTTPClientError           # 422 - RFC 4918
   HAS_BODY = true
 end
@@ -169,7 +184,7 @@ end
 class Net::HTTPRequestHeaderFieldsTooLarge < Net::HTTPClientError   # 431 - RFC 6585
   HAS_BODY = true
 end
-class Net::HTTPUnavailableForLegalReasons < Net::HTTPClientError    # 451
+class Net::HTTPUnavailableForLegalReasons < Net::HTTPClientError    # 451 - RFC 7725
   HAS_BODY = true
 end
 # 444 No Response - Nginx
@@ -189,19 +204,26 @@ end
 class Net::HTTPServiceUnavailable < Net::HTTPServerError            # 503
   HAS_BODY = true
 end
-class Net::HTTPGatewayTimeOut < Net::HTTPServerError                # 504
+class Net::HTTPGatewayTimeout < Net::HTTPServerError                # 504
   HAS_BODY = true
 end
+Net::HTTPGatewayTimeOut = Net::HTTPGatewayTimeout
 class Net::HTTPVersionNotSupported < Net::HTTPServerError           # 505
   HAS_BODY = true
 end
-# 506 Variant Also Negotiates - RFC 2295; experimental
+class Net::HTTPVariantAlsoNegotiates < Net::HTTPServerError         # 506
+  HAS_BODY = true
+end
 class Net::HTTPInsufficientStorage < Net::HTTPServerError           # 507 - RFC 4918
   HAS_BODY = true
 end
-# 508 Loop Detected - RFC 5842; experimental
+class Net::HTTPLoopDetected < Net::HTTPServerError                  # 508 - RFC 5842
+  HAS_BODY = true
+end
 # 509 Bandwidth Limit Exceeded - Apache bw/limited extension
-# 510 Not Extended - RFC 2774; experimental
+class Net::HTTPNotExtended < Net::HTTPServerError                   # 510 - RFC 2774
+  HAS_BODY = true
+end
 class Net::HTTPNetworkAuthenticationRequired < Net::HTTPServerError # 511 - RFC 6585
   HAS_BODY = true
 end
@@ -217,6 +239,8 @@ class Net::HTTPResponse
   CODE_TO_OBJ = {
     '100' => Net::HTTPContinue,
     '101' => Net::HTTPSwitchProtocol,
+    '102' => Net::HTTPProcessing,
+    '103' => Net::HTTPEarlyHints,
 
     '200' => Net::HTTPOK,
     '201' => Net::HTTPCreated,
@@ -226,6 +250,7 @@ class Net::HTTPResponse
     '205' => Net::HTTPResetContent,
     '206' => Net::HTTPPartialContent,
     '207' => Net::HTTPMultiStatus,
+    '208' => Net::HTTPAlreadyReported,
     '226' => Net::HTTPIMUsed,
 
     '300' => Net::HTTPMultipleChoices,
@@ -245,16 +270,17 @@ class Net::HTTPResponse
     '405' => Net::HTTPMethodNotAllowed,
     '406' => Net::HTTPNotAcceptable,
     '407' => Net::HTTPProxyAuthenticationRequired,
-    '408' => Net::HTTPRequestTimeOut,
+    '408' => Net::HTTPRequestTimeout,
     '409' => Net::HTTPConflict,
     '410' => Net::HTTPGone,
     '411' => Net::HTTPLengthRequired,
     '412' => Net::HTTPPreconditionFailed,
-    '413' => Net::HTTPRequestEntityTooLarge,
-    '414' => Net::HTTPRequestURITooLong,
+    '413' => Net::HTTPPayloadTooLarge,
+    '414' => Net::HTTPURITooLong,
     '415' => Net::HTTPUnsupportedMediaType,
-    '416' => Net::HTTPRequestedRangeNotSatisfiable,
+    '416' => Net::HTTPRangeNotSatisfiable,
     '417' => Net::HTTPExpectationFailed,
+    '421' => Net::HTTPMisdirectedRequest,
     '422' => Net::HTTPUnprocessableEntity,
     '423' => Net::HTTPLocked,
     '424' => Net::HTTPFailedDependency,
@@ -262,17 +288,20 @@ class Net::HTTPResponse
     '428' => Net::HTTPPreconditionRequired,
     '429' => Net::HTTPTooManyRequests,
     '431' => Net::HTTPRequestHeaderFieldsTooLarge,
+    '451' => Net::HTTPUnavailableForLegalReasons,
 
     '500' => Net::HTTPInternalServerError,
     '501' => Net::HTTPNotImplemented,
     '502' => Net::HTTPBadGateway,
     '503' => Net::HTTPServiceUnavailable,
-    '504' => Net::HTTPGatewayTimeOut,
+    '504' => Net::HTTPGatewayTimeout,
     '505' => Net::HTTPVersionNotSupported,
+    '506' => Net::HTTPVariantAlsoNegotiates,
     '507' => Net::HTTPInsufficientStorage,
+    '508' => Net::HTTPLoopDetected,
+    '510' => Net::HTTPNotExtended,
     '511' => Net::HTTPNetworkAuthenticationRequired,
   }
 end
 
 # :startdoc:
-
diff --git a/lib/net/http/status.rb b/lib/net/http/status.rb
new file mode 100644
index 0000000000..8db3f7d9e3
--- /dev/null
+++ b/lib/net/http/status.rb
@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+require_relative '../http'
+
+if $0 == __FILE__
+  require 'open-uri'
+  IO.foreach(__FILE__) do |line|
+    puts line
+    break if line.start_with?('end')
+  end
+  puts
+  puts "Net::HTTP::STATUS_CODES = {"
+  url = "https://www.iana.org/assignments/http-status-codes/http-status-codes-1.csv"
+  URI(url).read.each_line do |line|
+    code, mes, = line.split(',')
+    next if ['(Unused)', 'Unassigned', 'Description'].include?(mes)
+    puts "  #{code} => '#{mes}',"
+  end
+  puts "}"
+end
+
+Net::HTTP::STATUS_CODES = {
+  100 => 'Continue',
+  101 => 'Switching Protocols',
+  102 => 'Processing',
+  103 => 'Early Hints',
+  200 => 'OK',
+  201 => 'Created',
+  202 => 'Accepted',
+  203 => 'Non-Authoritative Information',
+  204 => 'No Content',
+  205 => 'Reset Content',
+  206 => 'Partial Content',
+  207 => 'Multi-Status',
+  208 => 'Already Reported',
+  226 => 'IM Used',
+  300 => 'Multiple Choices',
+  301 => 'Moved Permanently',
+  302 => 'Found',
+  303 => 'See Other',
+  304 => 'Not Modified',
+  305 => 'Use Proxy',
+  307 => 'Temporary Redirect',
+  308 => 'Permanent Redirect',
+  400 => 'Bad Request',
+  401 => 'Unauthorized',
+  402 => 'Payment Required',
+  403 => 'Forbidden',
+  404 => 'Not Found',
+  405 => 'Method Not Allowed',
+  406 => 'Not Acceptable',
+  407 => 'Proxy Authentication Required',
+  408 => 'Request Timeout',
+  409 => 'Conflict',
+  410 => 'Gone',
+  411 => 'Length Required',
+  412 => 'Precondition Failed',
+  413 => 'Payload Too Large',
+  414 => 'URI Too Long',
+  415 => 'Unsupported Media Type',
+  416 => 'Range Not Satisfiable',
+  417 => 'Expectation Failed',
+  421 => 'Misdirected Request',
+  422 => 'Unprocessable Entity',
+  423 => 'Locked',
+  424 => 'Failed Dependency',
+  426 => 'Upgrade Required',
+  428 => 'Precondition Required',
+  429 => 'Too Many Requests',
+  431 => 'Request Header Fields Too Large',
+  451 => 'Unavailable For Legal Reasons',
+  500 => 'Internal Server Error',
+  501 => 'Not Implemented',
+  502 => 'Bad Gateway',
+  503 => 'Service Unavailable',
+  504 => 'Gateway Timeout',
+  505 => 'HTTP Version Not Supported',
+  506 => 'Variant Also Negotiates',
+  507 => 'Insufficient Storage',
+  508 => 'Loop Detected',
+  510 => 'Not Extended',
+  511 => 'Network Authentication Required',
+}
diff --git a/lib/net/https.rb b/lib/net/https.rb
index 58cb6ddf19..d46721c82a 100644
--- a/lib/net/https.rb
+++ b/lib/net/https.rb
@@ -19,5 +19,5 @@
 
 =end
 
-require 'net/http'
+require_relative 'http'
 require 'openssl'
diff --git a/lib/net/imap.rb b/lib/net/imap.rb
index 9895ed68ce..d45304f289 100644
--- a/lib/net/imap.rb
+++ b/lib/net/imap.rb
@@ -18,6 +18,7 @@ require "socket"
 require "monitor"
 require "digest/md5"
 require "strscan"
+require 'net/protocol'
 begin
   require "openssl"
 rescue LoadError
@@ -199,7 +200,9 @@ module Net
   #    Goldsmith, D. and Davis, M., "UTF-7: A Mail-Safe Transformation Format of
   #    Unicode", RFC 2152, May 1997.
   #
-  class IMAP
+  class IMAP < Protocol
+    VERSION = "0.1.1"
+
     include MonitorMixin
     if defined?(OpenSSL::SSL)
       include OpenSSL
@@ -221,6 +224,11 @@ module Net
     # Returns all response handlers.
     attr_reader :response_handlers
 
+    # Seconds to wait until a connection is opened.
+    # If the IMAP object cannot open a connection within this time,
+    # it raises a Net::OpenTimeout exception. The default value is 30 seconds.
+    attr_reader :open_timeout
+
     # The thread to receive exceptions.
     attr_accessor :client_thread
 
@@ -314,6 +322,7 @@ module Net
 
     # Disconnects from the server.
     def disconnect
+      return if disconnected?
       begin
         begin
           # try to call SSL::SSLSocket#io.
@@ -329,9 +338,7 @@ module Net
       end
       @receiver_thread.join
       synchronize do
-        unless @sock.closed?
-          @sock.close
-        end
+        @sock.close
       end
       raise e if e
     end
@@ -809,13 +816,13 @@ module Net
     #   #=> "12-Oct-2000 22:40:59 +0900"
     #   p data.attr["UID"]
     #   #=> 98
-    def fetch(set, attr)
-      return fetch_internal("FETCH", set, attr)
+    def fetch(set, attr, mod = nil)
+      return fetch_internal("FETCH", set, attr, mod)
     end
 
     # Similar to #fetch(), but +set+ contains unique identifiers.
-    def uid_fetch(set, attr)
-      return fetch_internal("UID FETCH", set, attr)
+    def uid_fetch(set, attr, mod = nil)
+      return fetch_internal("UID FETCH", set, attr, mod)
     end
 
     # Sends a STORE command to alter data associated with messages
@@ -898,8 +905,9 @@ module Net
     #     end
     #   }
     #
-    def add_response_handler(handler = Proc.new)
-      @response_handlers.push(handler)
+    def add_response_handler(handler = nil, &block)
+      raise ArgumentError, "two Procs are passed" if handler && block
+      @response_handlers.push(block || handler)
     end
 
     # Removes the response handler.
@@ -954,12 +962,12 @@ module Net
         put_string("#{tag} IDLE#{CRLF}")
 
         begin
-          add_response_handler(response_handler)
+          add_response_handler(&response_handler)
           @idle_done_cond = new_cond
           @idle_done_cond.wait(timeout)
           @idle_done_cond = nil
           if @receiver_thread_terminating
-            raise Net::IMAP::Error, "connection closed"
+            raise @exception || Net::IMAP::Error.new("connection closed")
           end
         ensure
           unless @receiver_thread_terminating
@@ -994,7 +1002,7 @@ module Net
     def self.decode_utf7(s)
       return s.gsub(/&([^-]+)?-/n) {
         if $1
-          ($1.tr(",", "/") + "===").unpack("m")[0].encode(Encoding::UTF_8, Encoding::UTF_16BE)
+          ($1.tr(",", "/") + "===").unpack1("m").encode(Encoding::UTF_8, Encoding::UTF_16BE)
         else
           "&"
         end
@@ -1050,6 +1058,7 @@ module Net
     #         be installed.
     #         If options[:ssl] is a hash, it's passed to
     #         OpenSSL::SSL::SSLContext#set_params as parameters.
+    # open_timeout:: Seconds to wait until a connection is opened
     #
     # The most common errors are:
     #
@@ -1078,8 +1087,9 @@ module Net
       @port = options[:port] || (options[:ssl] ? SSL_PORT : PORT)
       @tag_prefix = "RUBY"
       @tagno = 0
+      @open_timeout = options[:open_timeout] || 30
       @parser = ResponseParser.new
-      @sock = TCPSocket.open(@host, @port)
+      @sock = tcp_socket(@host, @port)
       begin
         if options[:ssl]
           start_tls_session(options[:ssl])
@@ -1091,7 +1101,9 @@ module Net
         @tagged_responses = {}
         @response_handlers = []
         @tagged_response_arrival = new_cond
+        @continued_command_tag = nil
         @continuation_request_arrival = new_cond
+        @continuation_request_exception = nil
         @idle_done_cond = nil
         @logout_command_tag = nil
         @debug_output_bol = true
@@ -1119,6 +1131,15 @@ module Net
       end
     end
 
+    def tcp_socket(host, port)
+      s = Socket.tcp(host, port, :connect_timeout => @open_timeout)
+      s.setsockopt(:SOL_SOCKET, :SO_KEEPALIVE, true)
+      s
+    rescue Errno::ETIMEDOUT
+      raise Net::OpenTimeout, "Timeout to open TCP connection to " +
+        "#{host}:#{port} (exceeds #{@open_timeout} seconds)"
+    end
+
     def receive_responses
       connection_closed = false
       until connection_closed
@@ -1146,8 +1167,13 @@ module Net
             when TaggedResponse
               @tagged_responses[resp.tag] = resp
               @tagged_response_arrival.broadcast
-              if resp.tag == @logout_command_tag
+              case resp.tag
+              when @logout_command_tag
                 return
+              when @continued_command_tag
+                @continuation_request_exception =
+                  RESPONSE_ERRORS[resp.name].new(resp)
+                @continuation_request_arrival.signal
               end
             when UntaggedResponse
               record_response(resp.name, resp.data)
@@ -1192,12 +1218,14 @@ module Net
       end
       resp = @tagged_responses.delete(tag)
       case resp.name
+      when /\A(?:OK)\z/ni
+        return resp
       when /\A(?:NO)\z/ni
         raise NoResponseError, resp
       when /\A(?:BAD)\z/ni
         raise BadResponseError, resp
       else
-        return resp
+        raise UnknownResponseError, resp
       end
     end
 
@@ -1237,14 +1265,14 @@ module Net
         put_string(tag + " " + cmd)
         args.each do |i|
           put_string(" ")
-          send_data(i)
+          send_data(i, tag)
         end
         put_string(CRLF)
         if cmd == "LOGOUT"
           @logout_command_tag = tag
         end
         if block
-          add_response_handler(block)
+          add_response_handler(&block)
         end
         begin
           return get_tagged_response(tag, cmd)
@@ -1283,8 +1311,12 @@ module Net
       when Integer
         NumValidator.ensure_number(data)
       when Array
-        data.each do |i|
-          validate_data(i)
+        if data[0] == 'CHANGEDSINCE'
+          NumValidator.ensure_mod_sequence_value(data[1])
+        else
+          data.each do |i|
+            validate_data(i)
+          end
         end
       when Time
       when Symbol
@@ -1293,32 +1325,32 @@ module Net
       end
     end
 
-    def send_data(data)
+    def send_data(data, tag = nil)
       case data
       when nil
         put_string("NIL")
       when String
-        send_string_data(data)
+        send_string_data(data, tag)
       when Integer
         send_number_data(data)
       when Array
-        send_list_data(data)
+        send_list_data(data, tag)
       when Time
         send_time_data(data)
       when Symbol
         send_symbol_data(data)
       else
-        data.send_data(self)
+        data.send_data(self, tag)
       end
     end
 
-    def send_string_data(str)
+    def send_string_data(str, tag = nil)
       case str
       when ""
         put_string('""')
       when /[\x80-\xff\r\n]/n
         # literal
-        send_literal(str)
+        send_literal(str, tag)
       when /[(){ \x00-\x1f\x7f%*"\\]/n
         # quoted string
         send_quoted_string(str)
@@ -1331,18 +1363,28 @@ module Net
       put_string('"' + str.gsub(/["\\]/n, "\\\\\\&") + '"')
     end
 
-    def send_literal(str)
-      put_string("{" + str.bytesize.to_s + "}" + CRLF)
-      @continuation_request_arrival.wait
-      raise @exception if @exception
-      put_string(str)
+    def send_literal(str, tag = nil)
+      synchronize do
+        put_string("{" + str.bytesize.to_s + "}" + CRLF)
+        @continued_command_tag = tag
+        @continuation_request_exception = nil
+        begin
+          @continuation_request_arrival.wait
+          e = @continuation_request_exception || @exception
+          raise e if e
+          put_string(str)
+        ensure
+          @continued_command_tag = nil
+          @continuation_request_exception = nil
+        end
+      end
     end
 
     def send_number_data(num)
       put_string(num.to_s)
     end
 
-    def send_list_data(list)
+    def send_list_data(list, tag = nil)
       put_string("(")
       first = true
       list.each do |i|
@@ -1351,7 +1393,7 @@ module Net
         else
           put_string(" ")
         end
-        send_data(i)
+        send_data(i, tag)
       end
       put_string(")")
     end
@@ -1386,7 +1428,7 @@ module Net
       end
     end
 
-    def fetch_internal(cmd, set, attr)
+    def fetch_internal(cmd, set, attr, mod = nil)
       case attr
       when String then
         attr = RawData.new(attr)
@@ -1398,7 +1440,11 @@ module Net
 
       synchronize do
         @responses.delete("FETCH")
-        send_command(cmd, MessageSet.new(set), attr)
+        if mod
+          send_command(cmd, MessageSet.new(set), attr, mod)
+        else
+          send_command(cmd, MessageSet.new(set), attr)
+        end
         return @responses.delete("FETCH")
       end
     end
@@ -1489,15 +1535,16 @@ module Net
       end
       @sock = SSLSocket.new(@sock, context)
       @sock.sync_close = true
-      @sock.connect
+      @sock.hostname = @host if @sock.respond_to? :hostname=
+      ssl_socket_connect(@sock, @open_timeout)
       if context.verify_mode != VERIFY_NONE
         @sock.post_connection_check(@host)
       end
     end
 
     class RawData # :nodoc:
-      def send_data(imap)
-        imap.send(:put_string, @data)
+      def send_data(imap, tag)
+        imap.__send__(:put_string, @data)
       end
 
       def validate
@@ -1511,8 +1558,8 @@ module Net
     end
 
     class Atom # :nodoc:
-      def send_data(imap)
-        imap.send(:put_string, @data)
+      def send_data(imap, tag)
+        imap.__send__(:put_string, @data)
       end
 
       def validate
@@ -1526,8 +1573,8 @@ module Net
     end
 
     class QuotedString # :nodoc:
-      def send_data(imap)
-        imap.send(:send_quoted_string, @data)
+      def send_data(imap, tag)
+        imap.__send__(:send_quoted_string, @data)
       end
 
       def validate
@@ -1541,8 +1588,8 @@ module Net
     end
 
     class Literal # :nodoc:
-      def send_data(imap)
-        imap.send(:send_literal, @data)
+      def send_data(imap, tag)
+        imap.__send__(:send_literal, @data, tag)
       end
 
       def validate
@@ -1556,8 +1603,8 @@ module Net
     end
 
     class MessageSet # :nodoc:
-      def send_data(imap)
-        imap.send(:put_string, format_internal(@data))
+      def send_data(imap, tag)
+        imap.__send__(:put_string, format_internal(@data))
       end
 
       def validate
@@ -1632,6 +1679,15 @@ module Net
           num != 0 && valid_number?(num)
         end
 
+        # Check is passed argument valid 'mod_sequence_value' in RFC 4551 terminology
+        def valid_mod_sequence_value?(num)
+          # mod-sequence-value  = 1*DIGIT
+          #                        ; Positive unsigned 64-bit integer
+          #                        ; (mod-sequence)
+          #                        ; (1 <= n < 18,446,744,073,709,551,615)
+          num >= 1 && num < 18446744073709551615
+        end
+
         # Ensure argument is 'number' or raise DataFormatError
         def ensure_number(num)
           return if valid_number?(num)
@@ -1647,6 +1703,14 @@ module Net
           msg = "nz_number must be non-zero unsigned 32-bit integer: #{num}"
           raise DataFormatError, msg
         end
+
+        # Ensure argument is 'mod_sequence_value' or raise DataFormatError
+        def ensure_mod_sequence_value(num)
+          return if valid_mod_sequence_value?(num)
+
+          msg = "mod_sequence_value must be unsigned 64-bit integer: #{num}"
+          raise DataFormatError, msg
+        end
       end
     end
 
@@ -1976,8 +2040,7 @@ module Net
       # generate a warning message to +stderr+, then return
       # the value of +subtype+.
       def media_subtype
-        $stderr.printf("warning: media_subtype is obsolete.\n")
-        $stderr.printf("         use subtype instead.\n")
+        warn("media_subtype is obsolete, use subtype instead.\n", uplevel: 1)
         return subtype
       end
     end
@@ -2004,8 +2067,7 @@ module Net
       # generate a warning message to +stderr+, then return
       # the value of +subtype+.
       def media_subtype
-        $stderr.printf("warning: media_subtype is obsolete.\n")
-        $stderr.printf("         use subtype instead.\n")
+        warn("media_subtype is obsolete, use subtype instead.\n", uplevel: 1)
         return subtype
       end
     end
@@ -2034,8 +2096,7 @@ module Net
       # generate a warning message to +stderr+, then return
       # the value of +subtype+.
       def media_subtype
-        $stderr.printf("warning: media_subtype is obsolete.\n")
-        $stderr.printf("         use subtype instead.\n")
+        warn("media_subtype is obsolete, use subtype instead.\n", uplevel: 1)
         return subtype
       end
     end
@@ -2095,8 +2156,7 @@ module Net
       # generate a warning message to +stderr+, then return
       # the value of +subtype+.
       def media_subtype
-        $stderr.printf("warning: media_subtype is obsolete.\n")
-        $stderr.printf("         use subtype instead.\n")
+        warn("media_subtype is obsolete, use subtype instead.\n", uplevel: 1)
         return subtype
       end
     end
@@ -2201,6 +2261,10 @@ module Net
         else
           result = response_tagged
         end
+        while lookahead.symbol == T_SPACE
+          # Ignore trailing space for Microsoft Exchange Server
+          shift_token
+        end
         match(T_CRLF)
         match(T_EOF)
         return result
@@ -2208,8 +2272,13 @@ module Net
 
       def continue_req
         match(T_PLUS)
-        match(T_SPACE)
-        return ContinuationRequest.new(resp_text, @str)
+        token = lookahead
+        if token.symbol == T_SPACE
+          shift_token
+          return ContinuationRequest.new(resp_text, @str)
+        else
+          return ContinuationRequest.new(ResponseText.new(nil, ""), @str)
+        end
       end
 
       def response_untagged
@@ -2308,6 +2377,8 @@ module Net
             name, val = body_data
           when /\A(?:UID)\z/ni
             name, val = uid_data
+          when /\A(?:MODSEQ)\z/ni
+            name, val = modseq_data
           else
             parse_error("unknown attribute `%s' for {%d}", token.value, n)
           end
@@ -2797,6 +2868,16 @@ module Net
         return name, number
       end
 
+      def modseq_data
+        token = match(T_ATOM)
+        name = token.value.upcase
+        match(T_SPACE)
+        match(T_LPAR)
+        modseq = number
+        match(T_RPAR)
+        return name, modseq
+      end
+
       def text_response
         token = match(T_ATOM)
         name = token.value.upcase
@@ -3162,7 +3243,7 @@ module Net
             if atom
               atom
             else
-              symbol = flag.capitalize.untaint.intern
+              symbol = flag.capitalize.intern
               @flag_symbols[symbol] = true
               if @flag_symbols.length > IMAP.max_flag_count
                 raise FlagCountError, "number of flag symbols exceeded"
@@ -3640,6 +3721,14 @@ module Net
     class ByeResponseError < ResponseError
     end
 
+    # Error raised upon an unknown response from the server.
+    class UnknownResponseError < ResponseError
+    end
+
+    RESPONSE_ERRORS = Hash.new(ResponseError)
+    RESPONSE_ERRORS["NO"] = NoResponseError
+    RESPONSE_ERRORS["BAD"] = BadResponseError
+
     # Error raised when too many flags are interned to symbols.
     class FlagCountError < Error
     end
diff --git a/lib/net/net-ftp.gemspec b/lib/net/net-ftp.gemspec
new file mode 100644
index 0000000000..f5eb098135
--- /dev/null
+++ b/lib/net/net-ftp.gemspec
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+name = File.basename(__FILE__, ".gemspec")
+version = ["lib", Array.new(name.count("-"), "..").join("/")].find do |dir|
+  break File.foreach(File.join(__dir__, dir, "#{name.tr('-', '/')}.rb")) do |line|
+    /^\s*VERSION\s*=\s*"(.*)"/ =~ line and break $1
+  end rescue nil
+end
+
+Gem::Specification.new do |spec|
+  spec.name          = name
+  spec.version       = version
+  spec.authors       = ["Shugo Maeda"]
+  spec.email         = ["shugo@ruby-lang.org"]
+
+  spec.summary       = %q{Support for the File Transfer Protocol.}
+  spec.description   = %q{Support for the File Transfer Protocol.}
+  spec.homepage      = "https://github.com/ruby/net-ftp"
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.licenses      = ["Ruby", "BSD-2-Clause"]
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z 2>/dev/null`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency "net-protocol"
+  spec.add_dependency "time"
+end
diff --git a/lib/net/net-imap.gemspec b/lib/net/net-imap.gemspec
new file mode 100644
index 0000000000..d7c341cd92
--- /dev/null
+++ b/lib/net/net-imap.gemspec
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+name = File.basename(__FILE__, ".gemspec")
+version = ["lib", Array.new(name.count("-"), "..").join("/")].find do |dir|
+  break File.foreach(File.join(__dir__, dir, "#{name.tr('-', '/')}.rb")) do |line|
+    /^\s*VERSION\s*=\s*"(.*)"/ =~ line and break $1
+  end rescue nil
+end
+
+Gem::Specification.new do |spec|
+  spec.name          = name
+  spec.version       = version
+  spec.authors       = ["Shugo Maeda"]
+  spec.email         = ["shugo@ruby-lang.org"]
+
+  spec.summary       = %q{Ruby client api for Internet Message Access Protocol}
+  spec.description   = %q{Ruby client api for Internet Message Access Protocol}
+  spec.homepage      = "https://github.com/ruby/net-imap"
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
+  spec.licenses       = ["Ruby", "BSD-2-Clause"]
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z 2>/dev/null`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency "net-protocol"
+  spec.add_dependency "digest"
+  spec.add_dependency "strscan"
+end
diff --git a/lib/net/net-pop.gemspec b/lib/net/net-pop.gemspec
new file mode 100644
index 0000000000..2a89f6086d
--- /dev/null
+++ b/lib/net/net-pop.gemspec
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+name = File.basename(__FILE__, ".gemspec")
+version = ["lib", Array.new(name.count("-"), "..").join("/")].find do |dir|
+  break File.foreach(File.join(__dir__, dir, "#{name.tr('-', '/')}.rb")) do |line|
+    /^\s*VERSION\s*=\s*"(.*)"/ =~ line and break $1
+  end rescue nil
+end
+
+Gem::Specification.new do |spec|
+  spec.name          = name
+  spec.version       = version
+  spec.authors       = ["Yukihiro Matsumoto"]
+  spec.email         = ["matz@ruby-lang.org"]
+
+  spec.summary       = %q{Ruby client library for POP3.}
+  spec.description   = %q{Ruby client library for POP3.}
+  spec.homepage      = "https://github.com/ruby/net-pop"
+  spec.licenses       = ["Ruby", "BSD-2-Clause"]
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z 2>/dev/null`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency "net-protocol"
+  spec.add_dependency "digest"
+  spec.add_dependency "timeout"
+end
diff --git a/lib/net/net-protocol.gemspec b/lib/net/net-protocol.gemspec
new file mode 100644
index 0000000000..767a7d48e2
--- /dev/null
+++ b/lib/net/net-protocol.gemspec
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+name = File.basename(__FILE__, ".gemspec")
+version = ["lib", Array.new(name.count("-"), "..").join("/")].find do |dir|
+  break File.foreach(File.join(__dir__, dir, "#{name.tr('-', '/')}.rb")) do |line|
+    /^\s*VERSION\s*=\s*"(.*)"/ =~ line and break $1
+  end rescue nil
+end
+
+Gem::Specification.new do |spec|
+  spec.name          = name
+  spec.version       = version
+  spec.authors = ["Yukihiro Matsumoto"]
+  spec.email = ["matz@ruby-lang.org"]
+
+  spec.summary       = %q{The abstruct interface for net-* client.}
+  spec.description   = %q{The abstruct interface for net-* client.}
+  spec.homepage      = "https://github.com/ruby/net-protocol"
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.licenses      = ["Ruby", "BSD-2-Clause"]
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z 2>/dev/null`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency "timeout"
+  spec.add_dependency "io-wait"
+end
diff --git a/lib/net/net-smtp.gemspec b/lib/net/net-smtp.gemspec
new file mode 100644
index 0000000000..bd0a2dd84c
--- /dev/null
+++ b/lib/net/net-smtp.gemspec
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+name = File.basename(__FILE__, ".gemspec")
+version = ["lib", Array.new(name.count("-"), "..").join("/")].find do |dir|
+  break File.foreach(File.join(__dir__, dir, "#{name.tr('-', '/')}.rb")) do |line|
+    /^\s*VERSION\s*=\s*"(.*)"/ =~ line and break $1
+  end rescue nil
+end
+
+Gem::Specification.new do |spec|
+  spec.name          = name
+  spec.version       = version
+  spec.authors       = ["Yukihiro Matsumoto"]
+  spec.email         = ["matz@ruby-lang.org"]
+
+  spec.summary       = %q{Simple Mail Transfer Protocol client library for Ruby.}
+  spec.description   = %q{Simple Mail Transfer Protocol client library for Ruby.}
+  spec.homepage      = "https://github.com/ruby/net-smtp"
+  spec.licenses      = ["Ruby", "BSD-2-Clause"]
+  spec.required_ruby_version = ">= 2.5.0"
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z 2>/dev/null`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency "net-protocol"
+  spec.add_dependency "digest"
+  spec.add_dependency "timeout"
+end
diff --git a/lib/net/pop.rb b/lib/net/pop.rb
index 00209fec46..8e75846820 100644
--- a/lib/net/pop.rb
+++ b/lib/net/pop.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 # = net/pop.rb
 #
 # Copyright (c) 1999-2007 Yukihiro Matsumoto.
@@ -14,7 +14,7 @@
 # Ruby Distribute License.
 #
 # NOTE: You can find Japanese version of this document at:
-# http://www.ruby-lang.org/ja/man/html/net_pop.html
+# http://docs.ruby-lang.org/ja/latest/library/net=2fpop.html
 #
 #   $Id$
 #
@@ -168,8 +168,8 @@ module Net
   #     require 'net/pop'
   #
   #     # Use APOP authentication if $isapop == true
-  #     pop = Net::POP3.APOP($is_apop).new('apop.example.com', 110)
-  #     pop.start(YourAccount', 'YourPassword') do |pop|
+  #     pop = Net::POP3.APOP($isapop).new('apop.example.com', 110)
+  #     pop.start('YourAccount', 'YourPassword') do |pop|
   #       # Rest of the code is the same.
   #     end
   #
@@ -194,9 +194,8 @@ module Net
   # String. Normally the unique-id is a hash of the message.
   #
   class POP3 < Protocol
-
-    # svn revision of this library
-    Revision = %q$Revision$.split[1]
+    # version of this library
+    VERSION = "0.1.1"
 
     #
     # Class Parameters
@@ -467,7 +466,7 @@ module Net
 
     # Provide human-readable stringification of class state.
     def inspect
-      "#<#{self.class} #{@address}:#{@port} open=#{@started}>"
+      +"#<#{self.class} #{@address}:#{@port} open=#{@started}>"
     end
 
     # *WARNING*: This method causes a serious security hole.
@@ -549,16 +548,17 @@ module Net
         context = OpenSSL::SSL::SSLContext.new
         context.set_params(@ssl_params)
         s = OpenSSL::SSL::SSLSocket.new(s, context)
+        s.hostname = @address
         s.sync_close = true
-        s.connect
+        ssl_socket_connect(s, @open_timeout)
         if context.verify_mode != OpenSSL::SSL::VERIFY_NONE
           s.post_connection_check(@address)
         end
       end
-      @socket = InternetMessageIO.new(s)
+      @socket = InternetMessageIO.new(s,
+                                      read_timeout: @read_timeout,
+                                      debug_output: @debug_output)
       logging "POP session started: #{@address}:#{@port} (#{@apop ? 'APOP' : 'POP'})"
-      @socket.read_timeout = @read_timeout
-      @socket.debug_output = @debug_output
       on_connect
       @command = POP3Command.new(@socket)
       if apop?
@@ -570,7 +570,7 @@ module Net
     ensure
       # Authentication failed, clean up connection.
       unless @started
-        s.close if s and not s.closed?
+        s.close if s
         @socket = nil
         @command = nil
       end
@@ -601,7 +601,7 @@ module Net
     ensure
       @started = false
       @command = nil
-      @socket.close if @socket and not @socket.closed?
+      @socket.close if @socket
       @socket = nil
     end
     private :do_finish
@@ -758,7 +758,7 @@ module Net
 
     # Provide human-readable stringification of class state.
     def inspect
-      "#<#{self.class} #{@number}#{@deleted ? ' deleted' : ''}>"
+      +"#<#{self.class} #{@number}#{@deleted ? ' deleted' : ''}>"
     end
 
     #
@@ -771,7 +771,7 @@ module Net
     # === Example without block
     #
     #     POP3.start('pop.example.com', 110,
-    #                'YourAccount, 'YourPassword') do |pop|
+    #                'YourAccount', 'YourPassword') do |pop|
     #       n = 1
     #       pop.mails.each do |popmail|
     #         File.open("inbox/#{n}", 'w') do |f|
@@ -785,7 +785,7 @@ module Net
     # === Example with block
     #
     #     POP3.start('pop.example.com', 110,
-    #                'YourAccount, 'YourPassword') do |pop|
+    #                'YourAccount', 'YourPassword') do |pop|
     #       n = 1
     #       pop.mails.each do |popmail|
     #         File.open("inbox/#{n}", 'w') do |f|
@@ -799,7 +799,7 @@ module Net
     #
     # This method raises a POPError if an error occurs.
     #
-    def pop( dest = '', &block ) # :yield: message_chunk
+    def pop( dest = +'', &block ) # :yield: message_chunk
       if block_given?
         @command.retr(@number, &block)
         nil
@@ -819,7 +819,7 @@ module Net
     # The optional +dest+ argument is obsolete.
     #
     # This method raises a POPError if an error occurs.
-    def top(lines, dest = '')
+    def top(lines, dest = +'')
       @command.top(@number, lines) do |chunk|
         dest << chunk
       end
@@ -831,7 +831,7 @@ module Net
     # The optional +dest+ argument is obsolete.
     #
     # This method raises a POPError if an error occurs.
-    def header(dest = '')
+    def header(dest = +'')
       top(0, dest)
     end
 
@@ -844,7 +844,7 @@ module Net
     # === Example
     #
     #     POP3.start('pop.example.com', 110,
-    #                'YourAccount, 'YourPassword') do |pop|
+    #                'YourAccount', 'YourPassword') do |pop|
     #       n = 1
     #       pop.mails.each do |popmail|
     #         File.open("inbox/#{n}", 'w') do |f|
@@ -898,7 +898,7 @@ module Net
     attr_reader :socket
 
     def inspect
-      "#<#{self.class} socket=#{@socket}>"
+      +"#<#{self.class} socket=#{@socket}>"
     end
 
     def auth(account, password)
@@ -969,7 +969,7 @@ module Net
           getok('UIDL')
           table = {}
           @socket.each_list_item do |line|
-            num, uid = line.split
+            num, uid = line.split(' ')
             table[num.to_i] = uid
           end
           return table
diff --git a/lib/net/protocol.rb b/lib/net/protocol.rb
index b53370931a..edf2ed5a00 100644
--- a/lib/net/protocol.rb
+++ b/lib/net/protocol.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 # = net/protocol.rb
 #
@@ -26,6 +26,8 @@ require 'io/wait'
 module Net # :nodoc:
 
   class Protocol   #:nodoc: internal use only
+    VERSION = "0.1.1"
+
     private
     def Protocol.protocol_param(name, val)
       module_eval(<<-End, __FILE__, __LINE__ + 1)
@@ -34,6 +36,24 @@ module Net # :nodoc:
         end
       End
     end
+
+    def ssl_socket_connect(s, timeout)
+      if timeout
+        while true
+          raise Net::OpenTimeout if timeout <= 0
+          start = Process.clock_gettime Process::CLOCK_MONOTONIC
+          # to_io is required because SSLSocket doesn't have wait_readable yet
+          case s.connect_nonblock(exception: false)
+          when :wait_readable; s.to_io.wait_readable(timeout)
+          when :wait_writable; s.to_io.wait_writable(timeout)
+          else; break
+          end
+          timeout -= Process.clock_gettime(Process::CLOCK_MONOTONIC) - start
+        end
+      else
+        s.connect
+      end
+    end
   end
 
 
@@ -57,20 +77,54 @@ module Net # :nodoc:
   # ReadTimeout, a subclass of Timeout::Error, is raised if a chunk of the
   # response cannot be read within the read_timeout.
 
-  class ReadTimeout            < Timeout::Error; end
+  class ReadTimeout < Timeout::Error
+    def initialize(io = nil)
+      @io = io
+    end
+    attr_reader :io
+
+    def message
+      msg = super
+      if @io
+        msg = "#{msg} with #{@io.inspect}"
+      end
+      msg
+    end
+  end
+
+  ##
+  # WriteTimeout, a subclass of Timeout::Error, is raised if a chunk of the
+  # response cannot be written within the write_timeout.  Not raised on Windows.
+
+  class WriteTimeout < Timeout::Error
+    def initialize(io = nil)
+      @io = io
+    end
+    attr_reader :io
+
+    def message
+      msg = super
+      if @io
+        msg = "#{msg} with #{@io.inspect}"
+      end
+      msg
+    end
+  end
 
 
   class BufferedIO   #:nodoc: internal use only
-    def initialize(io)
+    def initialize(io, read_timeout: 60, write_timeout: 60, continue_timeout: nil, debug_output: nil)
       @io = io
-      @read_timeout = 60
-      @continue_timeout = nil
-      @debug_output = nil
-      @rbuf = ''
+      @read_timeout = read_timeout
+      @write_timeout = write_timeout
+      @continue_timeout = continue_timeout
+      @debug_output = debug_output
+      @rbuf = ''.b
     end
 
     attr_reader :io
     attr_accessor :read_timeout
+    attr_accessor :write_timeout
     attr_accessor :continue_timeout
     attr_accessor :debug_output
 
@@ -96,17 +150,19 @@ module Net # :nodoc:
 
     public
 
-    def read(len, dest = '', ignore_eof = false)
+    def read(len, dest = ''.b, ignore_eof = false)
       LOG "reading #{len} bytes..."
       read_bytes = 0
       begin
         while read_bytes + @rbuf.size < len
-          dest << (s = rbuf_consume(@rbuf.size))
+          s = rbuf_consume(@rbuf.size)
           read_bytes += s.size
+          dest << s
           rbuf_fill
         end
-        dest << (s = rbuf_consume(len - read_bytes))
+        s = rbuf_consume(len - read_bytes)
         read_bytes += s.size
+        dest << s
       rescue EOFError
         raise unless ignore_eof
       end
@@ -114,13 +170,14 @@ module Net # :nodoc:
       dest
     end
 
-    def read_all(dest = '')
+    def read_all(dest = ''.b)
       LOG 'reading all...'
       read_bytes = 0
       begin
         while true
-          dest << (s = rbuf_consume(@rbuf.size))
+          s = rbuf_consume(@rbuf.size)
           read_bytes += s.size
+          dest << s
           rbuf_fill
         end
       rescue EOFError
@@ -151,25 +208,33 @@ module Net # :nodoc:
     BUFSIZE = 1024 * 16
 
     def rbuf_fill
-      case rv = @io.read_nonblock(BUFSIZE, exception: false)
+      tmp = @rbuf.empty? ? @rbuf : nil
+      case rv = @io.read_nonblock(BUFSIZE, tmp, exception: false)
       when String
-        return @rbuf << rv
+        return if rv.equal?(tmp)
+        @rbuf << rv
+        rv.clear
+        return
       when :wait_readable
-        @io.to_io.wait_readable(@read_timeout) or raise Net::ReadTimeout
+        (io = @io.to_io).wait_readable(@read_timeout) or raise Net::ReadTimeout.new(io)
         # continue looping
       when :wait_writable
         # OpenSSL::Buffering#read_nonblock may fail with IO::WaitWritable.
         # http://www.openssl.org/support/faq.html#PROG10
-        @io.to_io.wait_writable(@read_timeout) or raise Net::ReadTimeout
+        (io = @io.to_io).wait_writable(@read_timeout) or raise Net::ReadTimeout.new(io)
         # continue looping
       when nil
-        # callers do not care about backtrace, so avoid allocating for it
-        raise EOFError, 'end of file reached', []
+        raise EOFError, 'end of file reached'
       end while true
     end
 
     def rbuf_consume(len)
-      s = @rbuf.slice!(0, len)
+      if len == @rbuf.size
+        s = @rbuf
+        @rbuf = ''.b
+      else
+        s = @rbuf.slice!(0, len)
+      end
       @debug_output << %Q[-> #{s.dump}\n] if @debug_output
       s
     end
@@ -180,9 +245,9 @@ module Net # :nodoc:
 
     public
 
-    def write(str)
+    def write(*strs)
       writing {
-        write0 str
+        write0(*strs)
       }
     end
 
@@ -206,11 +271,34 @@ module Net # :nodoc:
       bytes
     end
 
-    def write0(str)
-      @debug_output << str.dump if @debug_output
-      len = @io.write(str)
-      @written_bytes += len
-      len
+    def write0(*strs)
+      @debug_output << strs.map(&:dump).join if @debug_output
+      orig_written_bytes = @written_bytes
+      strs.each_with_index do |str, i|
+        need_retry = true
+        case len = @io.write_nonblock(str, exception: false)
+        when Integer
+          @written_bytes += len
+          len -= str.bytesize
+          if len == 0
+            if strs.size == i+1
+              return @written_bytes - orig_written_bytes
+            else
+              need_retry = false
+              # next string
+            end
+          elsif len < 0
+            str = str.byteslice(len, -len)
+          else # len > 0
+            need_retry = false
+            # next string
+          end
+          # continue looping
+        when :wait_writable
+          (io = @io.to_io).wait_writable(@write_timeout) or raise Net::WriteTimeout.new(io)
+          # continue looping
+        end while need_retry
+      end
     end
 
     #
@@ -236,7 +324,7 @@ module Net # :nodoc:
 
 
   class InternetMessageIO < BufferedIO   #:nodoc: internal use only
-    def initialize(io)
+    def initialize(*, **)
       super
       @wbuf = nil
     end
@@ -251,7 +339,7 @@ module Net # :nodoc:
       read_bytes = 0
       while (line = readuntil("\r\n")) != ".\r\n"
         read_bytes += line.size
-        yield line.sub(/\A\./, '')
+        yield line.delete_prefix('.')
       end
       LOG_on()
       LOG "read message (#{read_bytes} bytes)"
@@ -313,7 +401,7 @@ module Net # :nodoc:
     end
 
     def using_each_crlf_line
-      @wbuf = ''
+      @wbuf = ''.b
       yield
       if not @wbuf.empty?   # unterminated last line
         write0 dot_stuff(@wbuf.chomp) + "\r\n"
diff --git a/lib/net/smtp.rb b/lib/net/smtp.rb
index 50cd742495..a97c0c3395 100644
--- a/lib/net/smtp.rb
+++ b/lib/net/smtp.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 # = net/smtp.rb
 #
 # Copyright (c) 1999-2007 Yukihiro Matsumoto.
@@ -38,7 +38,7 @@ module Net
     include SMTPError
   end
 
-  # Represents SMTP error code 420 or 450, a temporary error.
+  # Represents SMTP error code 4xx, a temporary error.
   class SMTPServerBusy < ProtoServerError
     include SMTPError
   end
@@ -146,8 +146,8 @@ module Net
   # The SMTP server will judge whether it should send or reject
   # the SMTP session by inspecting the HELO domain.
   #
-  #     Net::SMTP.start('your.smtp.server', 25,
-  #                     'mail.from.domain') { |smtp| ... }
+  #     Net::SMTP.start('your.smtp.server', 25
+  #                     helo: 'mail.from.domain') { |smtp| ... }
   #
   # === SMTP Authentication
   #
@@ -157,17 +157,18 @@ module Net
   # SMTP.start/SMTP#start.
   #
   #     # PLAIN
-  #     Net::SMTP.start('your.smtp.server', 25, 'mail.from.domain',
-  #                     'Your Account', 'Your Password', :plain)
+  #     Net::SMTP.start('your.smtp.server', 25
+  #                     user: 'Your Account', secret: 'Your Password', authtype: :plain)
   #     # LOGIN
-  #     Net::SMTP.start('your.smtp.server', 25, 'mail.from.domain',
-  #                     'Your Account', 'Your Password', :login)
+  #     Net::SMTP.start('your.smtp.server', 25
+  #                     user: 'Your Account', secret: 'Your Password', authtype: :login)
   #
   #     # CRAM MD5
-  #     Net::SMTP.start('your.smtp.server', 25, 'mail.from.domain',
-  #                     'Your Account', 'Your Password', :cram_md5)
+  #     Net::SMTP.start('your.smtp.server', 25
+  #                     user: 'Your Account', secret: 'Your Password', authtype: :cram_md5)
   #
-  class SMTP
+  class SMTP < Protocol
+    VERSION = "0.2.1"
 
     Revision = %q$Revision$.split[1]
 
@@ -190,8 +191,13 @@ module Net
       alias default_ssl_port default_tls_port
     end
 
-    def SMTP.default_ssl_context
-      OpenSSL::SSL::SSLContext.new
+    def SMTP.default_ssl_context(verify_peer=true)
+      context = OpenSSL::SSL::SSLContext.new
+      context.verify_mode = verify_peer ? OpenSSL::SSL::VERIFY_PEER : OpenSSL::SSL::VERIFY_NONE
+      store = OpenSSL::X509::Store.new
+      store.set_default_paths
+      context.cert_store = store
+      context
     end
 
     #
@@ -217,8 +223,9 @@ module Net
       @error_occurred = false
       @debug_output = nil
       @tls = false
-      @starttls = false
-      @ssl_context = nil
+      @starttls = :auto
+      @ssl_context_tls = nil
+      @ssl_context_starttls = nil
     end
 
     # Provide human-readable stringification of class state.
@@ -293,11 +300,11 @@ module Net
     # Enables SMTP/TLS (SMTPS: SMTP over direct TLS connection) for
     # this object.  Must be called before the connection is established
     # to have any effect.  +context+ is a OpenSSL::SSL::SSLContext object.
-    def enable_tls(context = SMTP.default_ssl_context)
+    def enable_tls(context = nil)
       raise 'openssl library not installed' unless defined?(OpenSSL)
-      raise ArgumentError, "SMTPS and STARTTLS is exclusive" if @starttls
+      raise ArgumentError, "SMTPS and STARTTLS is exclusive" if @starttls == :always
       @tls = true
-      @ssl_context = context
+      @ssl_context_tls = context
     end
 
     alias enable_ssl enable_tls
@@ -306,7 +313,7 @@ module Net
     # connection is established to have any effect.
     def disable_tls
       @tls = false
-      @ssl_context = nil
+      @ssl_context_tls = nil
     end
 
     alias disable_ssl disable_tls
@@ -330,27 +337,27 @@ module Net
 
     # Enables SMTP/TLS (STARTTLS) for this object.
     # +context+ is a OpenSSL::SSL::SSLContext object.
-    def enable_starttls(context = SMTP.default_ssl_context)
+    def enable_starttls(context = nil)
       raise 'openssl library not installed' unless defined?(OpenSSL)
       raise ArgumentError, "SMTPS and STARTTLS is exclusive" if @tls
       @starttls = :always
-      @ssl_context = context
+      @ssl_context_starttls = context
     end
 
     # Enables SMTP/TLS (STARTTLS) for this object if server accepts.
     # +context+ is a OpenSSL::SSL::SSLContext object.
-    def enable_starttls_auto(context = SMTP.default_ssl_context)
+    def enable_starttls_auto(context = nil)
       raise 'openssl library not installed' unless defined?(OpenSSL)
       raise ArgumentError, "SMTPS and STARTTLS is exclusive" if @tls
       @starttls = :auto
-      @ssl_context = context
+      @ssl_context_starttls = context
     end
 
     # Disables SMTP/TLS (STARTTLS) for this object.  Must be called
     # before the connection is established to have any effect.
     def disable_starttls
       @starttls = false
-      @ssl_context = nil
+      @ssl_context_starttls = nil
     end
 
     # The address of the SMTP server to connect to.
@@ -401,11 +408,15 @@ module Net
     #
 
     #
+    # :call-seq:
+    #  start(address, port = nil, helo: 'localhost', user: nil, secret: nil, authtype: nil, tls_verify: true, tls_hostname: nil) { |smtp| ... }
+    #  start(address, port = nil, helo = 'localhost', user = nil, secret = nil, authtype = nil) { |smtp| ... }
+    #
     # Creates a new Net::SMTP object and connects to the server.
     #
     # This method is equivalent to:
     #
-    #   Net::SMTP.new(address, port).start(helo_domain, account, password, authtype)
+    #   Net::SMTP.new(address, port).start(helo: helo_domain, user: account, secret: password, authtype: authtype, tls_verify: flag, tls_hostname: hostname)
     #
     # === Example
     #
@@ -435,6 +446,9 @@ module Net
     # or other authentication token; and +authtype+ is the authentication
     # type, one of :plain, :login, or :cram_md5.  See the discussion of
     # SMTP Authentication in the overview notes.
+    # If +tls_verify+ is true, verify the server's certificate. The default is true.
+    # If the hostname in the server certificate is different from +address+,
+    # it can be specified with +tls_hostname+.
     #
     # === Errors
     #
@@ -449,10 +463,16 @@ module Net
     # * Net::ReadTimeout
     # * IOError
     #
-    def SMTP.start(address, port = nil, helo = 'localhost',
-                   user = nil, secret = nil, authtype = nil,
-                   &block)   # :yield: smtp
-      new(address, port).start(helo, user, secret, authtype, &block)
+    def SMTP.start(address, port = nil, *args, helo: nil,
+                   user: nil, secret: nil, password: nil, authtype: nil,
+                   tls_verify: true, tls_hostname: nil,
+                   &block)
+      raise ArgumentError, "wrong number of arguments (given #{args.size + 2}, expected 1..6)" if args.size > 4
+      helo ||= args[0] || 'localhost'
+      user ||= args[1]
+      secret ||= password || args[2]
+      authtype ||= args[3]
+      new(address, port).start(helo: helo, user: user, secret: secret, authtype: authtype, tls_verify: tls_verify, tls_hostname: tls_hostname, &block)
     end
 
     # +true+ if the SMTP session has been started.
@@ -461,6 +481,10 @@ module Net
     end
 
     #
+    # :call-seq:
+    #  start(helo: 'localhost', user: nil, secret: nil, authtype: nil, tls_verify: true, tls_hostname: nil) { |smtp| ... }
+    #  start(helo = 'localhost', user = nil, secret = nil, authtype = nil) { |smtp| ... }
+    #
     # Opens a TCP connection and starts the SMTP session.
     #
     # === Parameters
@@ -473,6 +497,9 @@ module Net
     # the type of authentication to attempt; it must be one of
     # :login, :plain, and :cram_md5.  See the notes on SMTP Authentication
     # in the overview.
+    # If +tls_verify+ is true, verify the server's certificate. The default is true.
+    # If the hostname in the server certificate is different from +address+,
+    # it can be specified with +tls_hostname+.
     #
     # === Block Usage
     #
@@ -487,7 +514,7 @@ module Net
     #
     #     require 'net/smtp'
     #     smtp = Net::SMTP.new('smtp.mail.server', 25)
-    #     smtp.start(helo_domain, account, password, authtype) do |smtp|
+    #     smtp.start(helo: helo_domain, user: account, secret: password, authtype: authtype) do |smtp|
     #       smtp.send_message msgstr, 'from@example.com', ['dest@example.com']
     #     end
     #
@@ -511,8 +538,20 @@ module Net
     # * Net::ReadTimeout
     # * IOError
     #
-    def start(helo = 'localhost',
-              user = nil, secret = nil, authtype = nil)   # :yield: smtp
+    def start(*args, helo: nil,
+              user: nil, secret: nil, password: nil, authtype: nil, tls_verify: true, tls_hostname: nil)
+      raise ArgumentError, "wrong number of arguments (given #{args.size}, expected 0..4)" if args.size > 4
+      helo ||= args[0] || 'localhost'
+      user ||= args[1]
+      secret ||= password || args[2]
+      authtype ||= args[3]
+      if @tls && @ssl_context_tls.nil?
+        @ssl_context_tls = SMTP.default_ssl_context(tls_verify)
+      end
+      if @starttls && @ssl_context_starttls.nil?
+        @ssl_context_starttls = SMTP.default_ssl_context(tls_verify)
+      end
+      @tls_hostname = tls_hostname
       if block_given?
         begin
           do_start helo, user, secret, authtype
@@ -549,16 +588,16 @@ module Net
         tcp_socket(@address, @port)
       end
       logging "Connection opened: #{@address}:#{@port}"
-      @socket = new_internet_message_io(tls? ? tlsconnect(s) : s)
+      @socket = new_internet_message_io(tls? ? tlsconnect(s, @ssl_context_tls) : s)
       check_response critical { recv_response() }
       do_helo helo_domain
-      if starttls_always? or (capable_starttls? and starttls_auto?)
+      if ! tls? and (starttls_always? or (capable_starttls? and starttls_auto?))
         unless capable_starttls?
           raise SMTPUnsupportedCommand,
               "STARTTLS is not supported on this server"
         end
         starttls
-        @socket = new_internet_message_io(tlsconnect(s))
+        @socket = new_internet_message_io(tlsconnect(s, @ssl_context_starttls))
         # helo response may be different after STARTTLS
         do_helo helo_domain
       end
@@ -567,7 +606,7 @@ module Net
     ensure
       unless @started
         # authentication failed, cancel connection.
-        s.close if s and not s.closed?
+        s.close if s
         @socket = nil
       end
     end
@@ -576,14 +615,15 @@ module Net
       OpenSSL::SSL::SSLSocket.new socket, context
     end
 
-    def tlsconnect(s)
+    def tlsconnect(s, context)
       verified = false
-      s = ssl_socket(s, @ssl_context)
+      s = ssl_socket(s, context)
       logging "TLS connection started"
       s.sync_close = true
-      s.connect
-      if @ssl_context.verify_mode != OpenSSL::SSL::VERIFY_NONE
-        s.post_connection_check(@address)
+      s.hostname = @tls_hostname || @address if s.respond_to? :hostname=
+      ssl_socket_connect(s, @open_timeout)
+      if context.verify_mode && context.verify_mode != OpenSSL::SSL::VERIFY_NONE
+        s.post_connection_check(@tls_hostname || @address)
       end
       verified = true
       s
@@ -592,10 +632,8 @@ module Net
     end
 
     def new_internet_message_io(s)
-      io = InternetMessageIO.new(s)
-      io.read_timeout = @read_timeout
-      io.debug_output = @debug_output
-      io
+      InternetMessageIO.new(s, read_timeout: @read_timeout,
+                            debug_output: @debug_output)
     end
 
     def do_helo(helo_domain)
@@ -615,7 +653,7 @@ module Net
     ensure
       @started = false
       @error_occurred = false
-      @socket.close if @socket and not @socket.closed?
+      @socket.close if @socket
       @socket = nil
     end
 
@@ -727,7 +765,7 @@ module Net
     def authenticate(user, secret, authtype = DEFAULT_AUTH_TYPE)
       check_auth_method authtype
       check_auth_args user, secret
-      send auth_method(authtype), user, secret
+      public_send auth_method(authtype), user, secret
     end
 
     def auth_plain(user, secret)
@@ -833,9 +871,6 @@ module Net
     end
 
     def mailfrom(from_addr)
-      if $SAFE > 0
-        raise SecurityError, 'tainted from_addr' if from_addr.tainted?
-      end
       getok("MAIL FROM:<#{from_addr}>")
     end
 
@@ -861,9 +896,6 @@ module Net
     end
 
     def rcptto(to_addr)
-      if $SAFE > 0
-        raise SecurityError, 'tainted to_addr' if to_addr.tainted?
-      end
       getok("RCPT TO:<#{to_addr}>")
     end
 
@@ -947,7 +979,7 @@ module Net
     end
 
     def recv_response
-      buf = ''
+      buf = ''.dup
       while true
         line = @socket.readline
         buf << line << "\n"
@@ -1037,9 +1069,9 @@ module Net
       end
 
       # Creates a CRAM-MD5 challenge. You can view more information on CRAM-MD5
-      # on Wikipedia: http://en.wikipedia.org/wiki/CRAM-MD5
+      # on Wikipedia: https://en.wikipedia.org/wiki/CRAM-MD5
       def cram_md5_challenge
-        @string.split(/ /)[1].unpack('m')[0]
+        @string.split(/ /)[1].unpack1('m')
       end
 
       # Returns a hash of the human readable reply text in the response if it
@@ -1050,7 +1082,7 @@ module Net
         return {} unless @string[3, 1] == '-'
         h = {}
         @string.lines.drop(1).each do |line|
-          k, *v = line[4..-1].chomp.split
+          k, *v = line[4..-1].split(' ')
           h[k] = v
         end
         h
diff --git a/lib/observer.rb b/lib/observer.rb
index fa7446f384..ef70e39dd8 100644
--- a/lib/observer.rb
+++ b/lib/observer.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 # Implementation of the _Observer_ object-oriented design pattern.  The
 # following documentation is copied, with modifications, from "Programming
@@ -111,10 +111,35 @@
 #   Current price: 112
 #   Current price: 79
 #   --- Sun Jun 09 00:10:25 CDT 2002: Price below 80: 79
+#
+# === Usage with procs
+#
+# The +#notify_observers+ method can also be used with +proc+s by using
+# the +:call+ as +func+ parameter.
+#
+# The following example illustrates the use of a lambda:
+#
+#   require 'observer'
+#
+#   class Ticker
+#     include Observable
+#
+#     def run
+#       # logic to retrieve the price (here 77.0)
+#       changed
+#       notify_observers(77.0)
+#     end
+#   end
+#
+#   ticker = Ticker.new
+#   warner = ->(price) { puts "New price received: #{price}" }
+#   ticker.add_observer(warner, :call)
+#   ticker.run
 module Observable
+  VERSION = "0.1.1"
 
   #
-  # Add +observer+ as an observer on this object. so that it will receive
+  # Add +observer+ as an observer on this object. So that it will receive
   # notifications.
   #
   # +observer+:: the object that will be notified of changes.
@@ -194,7 +219,7 @@ module Observable
     if defined? @observer_state and @observer_state
       if defined? @observer_peers
         @observer_peers.each do |k, v|
-          k.send v, *arg
+          k.__send__(v, *arg)
         end
       end
       @observer_state = false
diff --git a/lib/observer/observer.gemspec b/lib/observer/observer.gemspec
new file mode 100644
index 0000000000..46538e881a
--- /dev/null
+++ b/lib/observer/observer.gemspec
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+name = File.basename(__FILE__, ".gemspec")
+version = ["lib", Array.new(name.count("-")+1, "..").join("/")].find do |dir|
+  break File.foreach(File.join(__dir__, dir, "#{name.tr('-', '/')}.rb")) do |line|
+    /^\s*VERSION\s*=\s*"(.*)"/ =~ line and break $1
+  end rescue nil
+end
+
+Gem::Specification.new do |spec|
+  spec.name          = name
+  spec.version       = version
+  spec.authors       = ["Yukihiro Matsumoto"]
+  spec.email         = ["matz@ruby-lang.org"]
+
+  spec.summary       = %q{Implementation of the Observer object-oriented design pattern.}
+  spec.description   = spec.summary
+  spec.homepage      = "https://github.com/ruby/observer"
+  spec.licenses      = ["Ruby", "BSD-2-Clause"]
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z 2>/dev/null`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+end
diff --git a/lib/open-uri.gemspec b/lib/open-uri.gemspec
new file mode 100644
index 0000000000..853049f7ec
--- /dev/null
+++ b/lib/open-uri.gemspec
@@ -0,0 +1,26 @@
+Gem::Specification.new do |spec|
+  spec.name          = "open-uri"
+  spec.version       = "0.1.0"
+  spec.authors       = ["Tanaka Akira"]
+  spec.email         = ["akr@fsij.org"]
+
+  spec.summary       = %q{An easy-to-use wrapper for Net::HTTP, Net::HTTPS and Net::FTP.}
+  spec.description   = %q{An easy-to-use wrapper for Net::HTTP, Net::HTTPS and Net::FTP.}
+  spec.homepage      = "https://github.com/ruby/open-uri"
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.licenses      = ["Ruby", "BSD-2-Clause"]
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency "uri"
+  spec.add_dependency "stringio"
+  spec.add_dependency "time"
+end
diff --git a/lib/open-uri.rb b/lib/open-uri.rb

path: root/spec/bundler/install/gemfile/git_spec.rb

# frozen_string_literal: true

RSpec.describe "bundle install with git sources" do
  describe "when floating on master" do
    before :each do
      build_git "foo" do |s|
        s.executables = "foobar"
      end

      install_gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        git "#{lib_path("foo-1.0")}" do
          gem 'foo'
        end
      G
    end

    it "fetches gems" do
      expect(the_bundle).to include_gems("foo 1.0")

      run <<-RUBY
        require 'foo'
        puts "WIN" unless defined?(FOO_PREV_REF)
      RUBY

      expect(out).to eq("WIN")
    end

    it "caches the git repo", :bundler => "< 3" do
      expect(Dir["#{default_bundle_path}/cache/bundler/git/foo-1.0-*"]).to have_attributes :size => 1
    end

    it "caches the git repo globally and properly uses the cached repo on the next invocation" do
      simulate_new_machine
      bundle "config set global_gem_cache true"
      bundle :install
      expect(Dir["#{home}/.bundle/cache/git/foo-1.0-*"]).to have_attributes :size => 1

      bundle "install --verbose"
      expect(err).to be_empty
      expect(out).to include("Using foo 1.0 from #{lib_path("foo")}")
    end

    it "caches the evaluated gemspec" do
      git = update_git "foo" do |s|
        s.executables = ["foobar"] # we added this the first time, so keep it now
        s.files = ["bin/foobar"] # updating git nukes the files list
        foospec = s.to_ruby.gsub(/s\.files.*/, 's.files = `git ls-files -z`.split("\x0")')
        s.write "foo.gemspec", foospec
      end

      bundle "update foo"

      sha = git.ref_for("master", 11)
      spec_file = default_bundle_path.join("bundler/gems/foo-1.0-#{sha}/foo.gemspec").to_s
      ruby_code = Gem::Specification.load(spec_file).to_ruby
      file_code = File.read(spec_file)
      expect(file_code).to eq(ruby_code)
    end

    it "does not update the git source implicitly" do
      update_git "foo"

      install_gemfile bundled_app2("Gemfile"), <<-G, :dir => bundled_app2
        source "#{file_uri_for(gem_repo1)}"
        git "#{lib_path("foo-1.0")}" do
          gem 'foo'
        end
      G

      run <<-RUBY
        require 'foo'
        puts "fail" if defined?(FOO_PREV_REF)
      RUBY

      expect(out).to be_empty
    end

    it "sets up git gem executables on the path" do
      bundle "exec foobar"
      expect(out).to eq("1.0")
    end

    it "complains if pinned specs don't exist in the git repo" do
      build_git "foo"

      install_gemfile <<-G, :raise_on_error => false
        source "#{file_uri_for(gem_repo1)}"
        gem "foo", "1.1", :git => "#{lib_path("foo-1.0")}"
      G

      expect(err).to include("The source contains the following versions of 'foo': 1.0")
    end

    it "complains with version and platform if pinned specs don't exist in the git repo" do
      simulate_platform "java"

      build_git "only_java" do |s|
        s.platform = "java"
      end

      install_gemfile <<-G, :raise_on_error => false
        source "#{file_uri_for(gem_repo1)}"
        platforms :jruby do
          gem "only_java", "1.2", :git => "#{lib_path("only_java-1.0-java")}"
        end
      G

      expect(err).to include("The source contains the following versions of 'only_java': 1.0 java")
    end

    it "complains with multiple versions and platforms if pinned specs don't exist in the git repo" do
      simulate_platform "java"

      build_git "only_java", "1.0" do |s|
        s.platform = "java"
      end

      build_git "only_java", "1.1" do |s|
        s.platform = "java"
        s.write "only_java1-0.gemspec", File.read("#{lib_path("only_java-1.0-java")}/only_java.gemspec")
      end

      install_gemfile <<-G, :raise_on_error => false
        source "#{file_uri_for(gem_repo1)}"
        platforms :jruby do
          gem "only_java", "1.2", :git => "#{lib_path("only_java-1.1-java")}"
        end
      G

      expect(err).to include("The source contains the following versions of 'only_java': 1.0 java, 1.1 java")
    end

    it "still works after moving the application directory" do
      bundle "config set --local path vendor/bundle"
      bundle "install"

      FileUtils.mv bundled_app, tmp("bundled_app.bck")

      expect(the_bundle).to include_gems "foo 1.0", :dir => tmp("bundled_app.bck")
    end

    it "can still install after moving the application directory" do
      bundle "config set --local path vendor/bundle"
      bundle "install"

      FileUtils.mv bundled_app, tmp("bundled_app.bck")

      update_git "foo", "1.1", :path => lib_path("foo-1.0")

      gemfile tmp("bundled_app.bck/Gemfile"), <<-G
        source "#{file_uri_for(gem_repo1)}"
        git "#{lib_path("foo-1.0")}" do
          gem 'foo'
        end

        gem "rack", "1.0"
      G

      bundle "update foo", :dir => tmp("bundled_app.bck")

      expect(the_bundle).to include_gems "foo 1.1", "rack 1.0", :dir => tmp("bundled_app.bck")
    end
  end

  describe "with an empty git block" do
    before do
      build_git "foo"
      gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        gem "rack"

        git "#{lib_path("foo-1.0")}" do
          # this page left intentionally blank
        end
      G
    end

    it "does not explode" do
      bundle "install"
      expect(the_bundle).to include_gems "rack 1.0"
    end
  end

  describe "when specifying a revision" do
    before(:each) do
      build_git "foo"
      @revision = revision_for(lib_path("foo-1.0"))
      update_git "foo"
    end

    it "works" do
      install_gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        git "#{lib_path("foo-1.0")}", :ref => "#{@revision}" do
          gem "foo"
        end
      G

      run <<-RUBY
        require 'foo'
        puts "WIN" unless defined?(FOO_PREV_REF)
      RUBY

      expect(out).to eq("WIN")
    end

    it "works when the revision is a symbol" do
      install_gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        git "#{lib_path("foo-1.0")}", :ref => #{@revision.to_sym.inspect} do
          gem "foo"
        end
      G
      expect(err).to be_empty

      run <<-RUBY
        require 'foo'
        puts "WIN" unless defined?(FOO_PREV_REF)
      RUBY

      expect(out).to eq("WIN")
    end

    it "works when the revision is a non-head ref" do
      # want to ensure we don't fallback to master
      update_git "foo", :path => lib_path("foo-1.0") do |s|
        s.write("lib/foo.rb", "raise 'FAIL'")
      end

      sys_exec("git update-ref -m \"Bundler Spec!\" refs/bundler/1 master~1", :dir => lib_path("foo-1.0"))

      # want to ensure we don't fallback to HEAD
      update_git "foo", :path => lib_path("foo-1.0"), :branch => "rando" do |s|
        s.write("lib/foo.rb", "raise 'FAIL_FROM_RANDO'")
      end

      install_gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        git "#{lib_path("foo-1.0")}", :ref => "refs/bundler/1" do
          gem "foo"
        end
      G
      expect(err).to be_empty

      run <<-RUBY
        require 'foo'
        puts "WIN" if defined?(FOO)
      RUBY

      expect(out).to eq("WIN")
    end

    it "works when the revision is a non-head ref and it was previously downloaded" do
      install_gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        git "#{lib_path("foo-1.0")}" do
          gem "foo"
        end
      G

      # want to ensure we don't fallback to master
      update_git "foo", :path => lib_path("foo-1.0") do |s|
        s.write("lib/foo.rb", "raise 'FAIL'")
      end

      sys_exec("git update-ref -m \"Bundler Spec!\" refs/bundler/1 master~1", :dir => lib_path("foo-1.0"))

      # want to ensure we don't fallback to HEAD
      update_git "foo", :path => lib_path("foo-1.0"), :branch => "rando" do |s|
        s.write("lib/foo.rb", "raise 'FAIL_FROM_RANDO'")
      end

      install_gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        git "#{lib_path("foo-1.0")}", :ref => "refs/bundler/1" do
          gem "foo"
        end
      G
      expect(err).to be_empty

      run <<-RUBY
        require 'foo'
        puts "WIN" if defined?(FOO)
      RUBY

      expect(out).to eq("WIN")
    end

    it "does not download random non-head refs" do
      sys_exec("git update-ref -m \"Bundler Spec!\" refs/bundler/1 master~1", :dir => lib_path("foo-1.0"))

      bundle "config set global_gem_cache true"

      install_gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        git "#{lib_path("foo-1.0")}" do
          gem "foo"
        end
      G

      # ensure we also git fetch after cloning
      bundle :update, :all => true

      sys_exec("git ls-remote .", :dir => Dir[home(".bundle/cache/git/foo-*")].first)

      expect(out).not_to include("refs/bundler/1")
    end
  end

  describe "when specifying a branch" do
    let(:branch) { "branch" }
    let(:repo) { build_git("foo").path }

    it "works" do
      update_git("foo", :path => repo, :branch => branch)

      install_gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        git "#{repo}", :branch => #{branch.dump} do
          gem "foo"
        end
      G

      expect(the_bundle).to include_gems("foo 1.0")
    end

    context "when the branch starts with a `#`" do
      let(:branch) { "#149/redirect-url-fragment" }
      it "works" do
        skip "git does not accept this" if Gem.win_platform?

        update_git("foo", :path => repo, :branch => branch)

        install_gemfile <<-G
          source "#{file_uri_for(gem_repo1)}"
          git "#{repo}", :branch => #{branch.dump} do
            gem "foo"
          end
        G

        expect(the_bundle).to include_gems("foo 1.0")
      end
    end

    context "when the branch includes quotes" do
      let(:branch) { %('") }
      it "works" do
        skip "git does not accept this" if Gem.win_platform?

        update_git("foo", :path => repo, :branch => branch)

        install_gemfile <<-G
          source "#{file_uri_for(gem_repo1)}"
          git "#{repo}", :branch => #{branch.dump} do
            gem "foo"
          end
        G

        expect(the_bundle).to include_gems("foo 1.0")
      end
    end
  end

  describe "when specifying a tag" do
    let(:tag) { "tag" }
    let(:repo) { build_git("foo").path }

    it "works" do
      update_git("foo", :path => repo, :tag => tag)

      install_gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        git "#{repo}", :tag => #{tag.dump} do
          gem "foo"
        end
      G

      expect(the_bundle).to include_gems("foo 1.0")
    end

    context "when the tag starts with a `#`" do
      let(:tag) { "#149/redirect-url-fragment" }
      it "works" do
        skip "git does not accept this" if Gem.win_platform?

        update_git("foo", :path => repo, :tag => tag)

        install_gemfile <<-G
         source "#{file_uri_for(gem_repo1)}"
          git "#{repo}", :tag => #{tag.dump} do
            gem "foo"
          end
        G

        expect(the_bundle).to include_gems("foo 1.0")
      end
    end

    context "when the tag includes quotes" do
      let(:tag) { %('") }
      it "works" do
        skip "git does not accept this" if Gem.win_platform?

        update_git("foo", :path => repo, :tag => tag)

        install_gemfile <<-G
          source "#{file_uri_for(gem_repo1)}"
          git "#{repo}", :tag => #{tag.dump} do
            gem "foo"
          end
        G

        expect(the_bundle).to include_gems("foo 1.0")
      end
    end
  end

  describe "when specifying local override" do
    it "uses the local repository instead of checking a new one out" do
      # We don't generate it because we actually don't need it
      # build_git "rack", "0.8"

      build_git "rack", "0.8", :path => lib_path("local-rack") do |s|
        s.write "lib/rack.rb", "puts :LOCAL"
      end

      gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        gem "rack", :git => "#{lib_path("rack-0.8")}", :branch => "master"
      G

      bundle %(config set local.rack #{lib_path("local-rack")})
      bundle :install

      run "require 'rack'"
      expect(out).to eq("LOCAL")
    end

    it "chooses the local repository on runtime" do
      build_git "rack", "0.8"

      FileUtils.cp_r("#{lib_path("rack-0.8")}/.", lib_path("local-rack"))

      update_git "rack", "0.8", :path => lib_path("local-rack") do |s|
        s.write "lib/rack.rb", "puts :LOCAL"
      end

      install_gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        gem "rack", :git => "#{lib_path("rack-0.8")}", :branch => "master"
      G

      bundle %(config set local.rack #{lib_path("local-rack")})
      run "require 'rack'"
      expect(out).to eq("LOCAL")
    end

    it "unlocks the source when the dependencies have changed while switching to the local" do
      build_git "rack", "0.8"

      FileUtils.cp_r("#{lib_path("rack-0.8")}/.", lib_path("local-rack"))

      update_git "rack", "0.8", :path => lib_path("local-rack") do |s|
        s.write "rack.gemspec", build_spec("rack", "0.8") { runtime "rspec", "> 0" }.first.to_ruby
        s.write "lib/rack.rb", "puts :LOCAL"
      end

      install_gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        gem "rack", :git => "#{lib_path("rack-0.8")}", :branch => "master"
      G

      bundle %(config set local.rack #{lib_path("local-rack")})
      bundle :install
      run "require 'rack'"
      expect(out).to eq("LOCAL")
    end

    it "updates specs on runtime" do
      system_gems "nokogiri-1.4.2"

      build_git "rack", "0.8"

      install_gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        gem "rack", :git => "#{lib_path("rack-0.8")}", :branch => "master"
      G

      lockfile0 = File.read(bundled_app_lock)

      FileUtils.cp_r("#{lib_path("rack-0.8")}/.", lib_path("local-rack"))
      update_git "rack", "0.8", :path => lib_path("local-rack") do |s|
        s.add_dependency "nokogiri", "1.4.2"
      end

      bundle %(config set local.rack #{lib_path("local-rack")})
      run "require 'rack'"

      lockfile1 = File.read(bundled_app_lock)
      expect(lockfile1).not_to eq(lockfile0)
    end

    it "updates ref on install" do
      build_git "rack", "0.8"

      install_gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        gem "rack", :git => "#{lib_path("rack-0.8")}", :branch => "master"
      G

      lockfile0 = File.read(bundled_app_lock)

      FileUtils.cp_r("#{lib_path("rack-0.8")}/.", lib_path("local-rack"))
      update_git "rack", "0.8", :path => lib_path("local-rack")

      bundle %(config set local.rack #{lib_path("local-rack")})
      bundle :install

      lockfile1 = File.read(bundled_app_lock)
      expect(lockfile1).not_to eq(lockfile0)
    end

    it "explodes and gives correct solution if given path does not exist on install" do
      build_git "rack", "0.8"

      install_gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        gem "rack", :git => "#{lib_path("rack-0.8")}", :branch => "master"
      G

      bundle %(config set local.rack #{lib_path("local-rack")})
      bundle :install, :raise_on_error => false
      expect(err).to match(/Cannot use local override for rack-0.8 because #{Regexp.escape(lib_path('local-rack').to_s)} does not exist/)

      solution = "config unset local.rack"
      expect(err).to match(/Run `bundle #{solution}` to remove the local override/)

      bundle solution
      bundle :install

      expect(err).to be_empty
    end

    it "explodes and gives correct solution if branch is not given on install" do
      build_git "rack", "0.8"
      FileUtils.cp_r("#{lib_path("rack-0.8")}/.", lib_path("local-rack"))

      install_gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        gem "rack", :git => "#{lib_path("rack-0.8")}"
      G

      bundle %(config set local.rack #{lib_path("local-rack")})
      bundle :install, :raise_on_error => false
      expect(err).to match(/Cannot use local override for rack-0.8 at #{Regexp.escape(lib_path('local-rack').to_s)} because :branch is not specified in Gemfile/)

      solution = "config unset local.rack"
      expect(err).to match(/Specify a branch or run `bundle #{solution}` to remove the local override/)

      bundle solution
      bundle :install

      expect(err).to be_empty
    end

    it "does not explode if disable_local_branch_check is given" do
      build_git "rack", "0.8"
      FileUtils.cp_r("#{lib_path("rack-0.8")}/.", lib_path("local-rack"))

      install_gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        gem "rack", :git => "#{lib_path("rack-0.8")}"
      G

      bundle %(config set local.rack #{lib_path("local-rack")})
      bundle %(config set disable_local_branch_check true)
      bundle :install
      expect(out).to match(/Bundle complete!/)
    end

    it "explodes on different branches on install" do
      build_git "rack", "0.8"

      FileUtils.cp_r("#{lib_path("rack-0.8")}/.", lib_path("local-rack"))

      update_git "rack", "0.8", :path => lib_path("local-rack"), :branch => "another" do |s|
        s.write "lib/rack.rb", "puts :LOCAL"
      end

      install_gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        gem "rack", :git => "#{lib_path("rack-0.8")}", :branch => "master"
      G

      bundle %(config set local.rack #{lib_path("local-rack")})
      bundle :install, :raise_on_error => false
      expect(err).to match(/is using branch another but Gemfile specifies master/)
    end

    it "explodes on invalid revision on install" do
      build_git "rack", "0.8"

      build_git "rack", "0.8", :path => lib_path("local-rack") do |s|
        s.write "lib/rack.rb", "puts :LOCAL"
      end

      install_gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        gem "rack", :git => "#{lib_path("rack-0.8")}", :branch => "master"
      G

      bundle %(config set local.rack #{lib_path("local-rack")})
      bundle :install, :raise_on_error => false
      expect(err).to match(/The Gemfile lock is pointing to revision \w+/)
    end

    it "does not explode on invalid revision on install" do
      build_git "rack", "0.8"

      build_git "rack", "0.8", :path => lib_path("local-rack") do |s|
        s.write "lib/rack.rb", "puts :LOCAL"
      end

      install_gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        gem "rack", :git => "#{lib_path("rack-0.8")}", :branch => "master"
      G

      bundle %(config set local.rack #{lib_path("local-rack")})
      bundle %(config set disable_local_revision_check true)
      bundle :install
      expect(out).to match(/Bundle complete!/)
    end
  end

  describe "specified inline" do
    # TODO: Figure out how to write this test so that it is not flaky depending
    #       on the current network situation.
    # it "supports private git URLs" do
    #   gemfile <<-G
    #     gem "thingy", :git => "git@notthere.fallingsnow.net:somebody/thingy.git"
    #   G
    #
    #   bundle :install
    #
    #   # p out
    #   # p err
    #   puts err unless err.empty? # This spec fails randomly every so often
    #   err.should include("notthere.fallingsnow.net")
    #   err.should include("ssh")
    # end

    it "installs from git even if a newer gem is available elsewhere" do
      build_git "rack", "0.8"

      install_gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        gem "rack", :git => "#{lib_path("rack-0.8")}"
      G

      expect(the_bundle).to include_gems "rack 0.8"
    end

    it "installs dependencies from git even if a newer gem is available elsewhere" do
      system_gems "rack-1.0.0"

      build_lib "rack", "1.0", :path => lib_path("nested/bar") do |s|
        s.write "lib/rack.rb", "puts 'WIN OVERRIDE'"
      end

      build_git "foo", :path => lib_path("nested") do |s|
        s.add_dependency "rack", "= 1.0"
      end

      install_gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        gem "foo", :git => "#{lib_path("nested")}"
      G

      run "require 'rack'"
      expect(out).to eq("WIN OVERRIDE")
    end

    it "correctly unlocks when changing to a git source" do
      install_gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        gem "rack", "0.9.1"
      G

      build_git "rack", :path => lib_path("rack")

      install_gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        gem "rack", "1.0.0", :git => "#{lib_path("rack")}"
      G

      expect(the_bundle).to include_gems "rack 1.0.0"
    end

    it "correctly unlocks when changing to a git source without versions" do
      install_gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        gem "rack"
      G

      build_git "rack", "1.2", :path => lib_path("rack")

      install_gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        gem "rack", :git => "#{lib_path("rack")}"
      G

      expect(the_bundle).to include_gems "rack 1.2"
    end
  end

  describe "block syntax" do
    it "pulls all gems from a git block" do
      build_lib "omg", :path => lib_path("hi2u/omg")
      build_lib "hi2u", :path => lib_path("hi2u")

      install_gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        path "#{lib_path("hi2u")}" do
          gem "omg"
          gem "hi2u"
        end
      G

      expect(the_bundle).to include_gems "omg 1.0", "hi2u 1.0"
    end
  end

  it "uses a ref if specified" do
    build_git "foo"
    @revision = revision_for(lib_path("foo-1.0"))
    update_git "foo"

    install_gemfile <<-G
      source "#{file_uri_for(gem_repo1)}"
      gem "foo", :git => "#{lib_path("foo-1.0")}", :ref => "#{@revision}"
    G

    run <<-RUBY
      require 'foo'
      puts "WIN" unless defined?(FOO_PREV_REF)
    RUBY

    expect(out).to eq("WIN")
  end

  it "correctly handles cases with invalid gemspecs" do
    build_git "foo" do |s|
      s.summary = nil
    end

    install_gemfile <<-G
      source "#{file_uri_for(gem_repo1)}"
      gem "foo", :git => "#{lib_path("foo-1.0")}"
      gem "rails", "2.3.2"
    G

    expect(the_bundle).to include_gems "foo 1.0"
    expect(the_bundle).to include_gems "rails 2.3.2"
  end

  it "runs the gemspec in the context of its parent directory" do
    build_lib "bar", :path => lib_path("foo/bar"), :gemspec => false do |s|
      s.write lib_path("foo/bar/lib/version.rb"), %(BAR_VERSION = '1.0')
      s.write "bar.gemspec", <<-G
        $:.unshift Dir.pwd
        require 'lib/version'
        Gem::Specification.new do |s|
          s.name        = 'bar'
          s.author      = 'no one'
          s.version     = BAR_VERSION
          s.summary     = 'Bar'
          s.files       = Dir["lib/**/*.rb"]
        end
      G
    end

    build_git "foo", :path => lib_path("foo") do |s|
      s.write "bin/foo", ""
    end

    install_gemfile <<-G
      source "#{file_uri_for(gem_repo1)}"
      gem "bar", :git => "#{lib_path("foo")}"
      gem "rails", "2.3.2"
    G

    expect(the_bundle).to include_gems "bar 1.0"
    expect(the_bundle).to include_gems "rails 2.3.2"
  end

  it "installs from git even if a rubygems gem is present" do
    build_gem "foo", "1.0", :path => lib_path("fake_foo"), :to_system => true do |s|
      s.write "lib/foo.rb", "raise 'FAIL'"
    end

    build_git "foo", "1.0"

    install_gemfile <<-G
      source "#{file_uri_for(gem_repo1)}"
      gem "foo", "1.0", :git => "#{lib_path("foo-1.0")}"
    G

    expect(the_bundle).to include_gems "foo 1.0"
  end

  it "fakes the gem out if there is no gemspec" do
    build_git "foo", :gemspec => false

    install_gemfile <<-G
      source "#{file_uri_for(gem_repo1)}"
      gem "foo", "1.0", :git => "#{lib_path("foo-1.0")}"
      gem "rails", "2.3.2"
    G

    expect(the_bundle).to include_gems("foo 1.0")
    expect(the_bundle).to include_gems("rails 2.3.2")
  end

  it "catches git errors and spits out useful output" do
    gemfile <<-G
      source "#{file_uri_for(gem_repo1)}"
      gem "foo", "1.0", :git => "omgomg"
    G

    bundle :install, :raise_on_error => false

    expect(err).to include("Git error:")
    expect(err).to include("fatal")
    expect(err).to include("omgomg")
  end

  it "works when the gem path has spaces in it" do
    build_git "foo", :path => lib_path("foo space-1.0")

    install_gemfile <<-G
      source "#{file_uri_for(gem_repo1)}"
      gem "foo", :git => "#{lib_path("foo space-1.0")}"
    G

    expect(the_bundle).to include_gems "foo 1.0"
  end

  it "handles repos that have been force-pushed" do
    build_git "forced", "1.0"

    install_gemfile <<-G
      source "#{file_uri_for(gem_repo1)}"
      git "#{lib_path("forced-1.0")}" do
        gem 'forced'
      end
    G
    expect(the_bundle).to include_gems "forced 1.0"

    update_git "forced" do |s|
      s.write "lib/forced.rb", "FORCED = '1.1'"
    end

    bundle "update", :all => true
    expect(the_bundle).to include_gems "forced 1.1"

    sys_exec("git reset --hard HEAD^", :dir => lib_path("forced-1.0"))

    bundle "update", :all => true
    expect(the_bundle).to include_gems "forced 1.0"
  end

  it "ignores submodules if :submodule is not passed" do
    build_git "submodule", "1.0"
    build_git "has_submodule", "1.0" do |s|
      s.add_dependency "submodule"
    end
    sys_exec "git submodule add #{lib_path("submodule-1.0")} submodule-1.0", :dir => lib_path("has_submodule-1.0")
    sys_exec "git commit -m \"submodulator\"", :dir => lib_path("has_submodule-1.0")

    install_gemfile <<-G, :raise_on_error => false
      source "#{file_uri_for(gem_repo1)}"
      git "#{lib_path("has_submodule-1.0")}" do
        gem "has_submodule"
      end
    G
    expect(err).to match(/could not find gem 'submodule/i)

    expect(the_bundle).not_to include_gems "has_submodule 1.0"
  end

  it "handles repos with submodules" do
    build_git "submodule", "1.0"
    build_git "has_submodule", "1.0" do |s|
      s.add_dependency "submodule"
    end
    sys_exec "git submodule add #{lib_path("submodule-1.0")} submodule-1.0", :dir => lib_path("has_submodule-1.0")
    sys_exec "git commit -m \"submodulator\"", :dir => lib_path("has_submodule-1.0")

    install_gemfile <<-G
      source "#{file_uri_for(gem_repo1)}"
      git "#{lib_path("has_submodule-1.0")}", :submodules => true do
        gem "has_submodule"
      end
    G

    expect(the_bundle).to include_gems "has_submodule 1.0"
  end

  it "does not warn when deiniting submodules" do
    build_git "submodule", "1.0"
    build_git "has_submodule", "1.0"

    sys_exec "git submodule add #{lib_path("submodule-1.0")} submodule-1.0", :dir => lib_path("has_submodule-1.0")
    sys_exec "git commit -m \"submodulator\"", :dir => lib_path("has_submodule-1.0")

    install_gemfile <<-G
      source "#{file_uri_for(gem_repo1)}"
      git "#{lib_path("has_submodule-1.0")}" do
        gem "has_submodule"
      end
    G
    expect(err).to be_empty

    expect(the_bundle).to include_gems "has_submodule 1.0"
    expect(the_bundle).to_not include_gems "submodule 1.0"
  end

  it "handles implicit updates when modifying the source info" do
    git = build_git "foo"

    install_gemfile <<-G
      source "#{file_uri_for(gem_repo1)}"
      git "#{lib_path("foo-1.0")}" do
        gem "foo"
      end
    G

    update_git "foo"
    update_git "foo"

    install_gemfile <<-G
      source "#{file_uri_for(gem_repo1)}"
      git "#{lib_path("foo-1.0")}", :ref => "#{git.ref_for("HEAD^")}" do
        gem "foo"
      end
    G

    run <<-RUBY
      require 'foo'
      puts "WIN" if FOO_PREV_REF == '#{git.ref_for("HEAD^^")}'
    RUBY

    expect(out).to eq("WIN")
  end

  it "does not to a remote fetch if the revision is cached locally" do
    build_git "foo"

    install_gemfile <<-G
      source "#{file_uri_for(gem_repo1)}"
      gem "foo", :git => "#{lib_path("foo-1.0")}"
    G

    FileUtils.rm_rf(lib_path("foo-1.0"))

    bundle "install"
    expect(out).not_to match(/updating/i)
  end

  it "doesn't blow up if bundle install is run twice in a row" do
    build_git "foo"

    gemfile <<-G
      source "#{file_uri_for(gem_repo1)}"
      gem "foo", :git => "#{lib_path("foo-1.0")}"
    G

    bundle "install"
    bundle "install"
  end

  it "prints a friendly error if a file blocks the git repo" do
    build_git "foo"

    FileUtils.mkdir_p(default_bundle_path)
    FileUtils.touch(default_bundle_path("bundler"))

    install_gemfile <<-G, :raise_on_error => false
      source "#{file_uri_for(gem_repo1)}"
      gem "foo", :git => "#{lib_path("foo-1.0")}"
    G

    expect(exitstatus).to_not eq(0)
    expect(err).to include("Bundler could not install a gem because it " \
                           "needs to create a directory, but a file exists " \
                           "- #{default_bundle_path("bundler")}")
  end

  it "does not duplicate git gem sources" do
    build_lib "foo", :path => lib_path("nested/foo")
    build_lib "bar", :path => lib_path("nested/bar")

    build_git "foo", :path => lib_path("nested")
    build_git "bar", :path => lib_path("nested")

    install_gemfile <<-G
      source "#{file_uri_for(gem_repo1)}"
      gem "foo", :git => "#{lib_path("nested")}"
      gem "bar", :git => "#{lib_path("nested")}"
    G

    expect(File.read(bundled_app_lock).scan("GIT").size).to eq(1)
  end

  describe "switching sources" do
    it "doesn't explode when switching Path to Git sources" do
      build_gem "foo", "1.0", :to_system => true do |s|
        s.write "lib/foo.rb", "raise 'fail'"
      end
      build_lib "foo", "1.0", :path => lib_path("bar/foo")
      build_git "bar", "1.0", :path => lib_path("bar") do |s|
        s.add_dependency "foo"
      end

      install_gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        gem "bar", :path => "#{lib_path("bar")}"
      G

      install_gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        gem "bar", :git => "#{lib_path("bar")}"
      G

      expect(the_bundle).to include_gems "foo 1.0", "bar 1.0"
    end

    it "doesn't explode when switching Gem to Git source" do
      install_gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        gem "rack-obama"
        gem "rack", "1.0.0"
      G

      build_git "rack", "1.0" do |s|
        s.write "lib/new_file.rb", "puts 'USING GIT'"
      end

      install_gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        gem "rack-obama"
        gem "rack", "1.0.0", :git => "#{lib_path("rack-1.0")}"
      G

      run "require 'new_file'"
      expect(out).to eq("USING GIT")
    end
  end

  describe "bundle install after the remote has been updated" do
    it "installs" do
      build_git "valim"

      install_gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        gem "valim", :git => "#{file_uri_for(lib_path("valim-1.0"))}"
      G

      old_revision = revision_for(lib_path("valim-1.0"))
      update_git "valim"
      new_revision = revision_for(lib_path("valim-1.0"))

      old_lockfile = File.read(bundled_app_lock)
      lockfile(bundled_app_lock, old_lockfile.gsub(/revision: #{old_revision}/, "revision: #{new_revision}"))

      bundle "install"

      run <<-R
        require "valim"
        puts VALIM_PREV_REF
      R

      expect(out).to eq(old_revision)
    end

    it "gives a helpful error message when the remote ref no longer exists" do
      build_git "foo"
      revision = revision_for(lib_path("foo-1.0"))

      install_gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        gem "foo", :git => "#{file_uri_for(lib_path("foo-1.0"))}", :ref => "#{revision}"
      G
      expect(out).to_not match(/Revision.*does not exist/)

      install_gemfile <<-G, :raise_on_error => false
        source "#{file_uri_for(gem_repo1)}"
        gem "foo", :git => "#{file_uri_for(lib_path("foo-1.0"))}", :ref => "deadbeef"
      G
      expect(err).to include("Revision deadbeef does not exist in the repository")
    end
  end

  describe "bundle install with deployment mode configured and git sources" do
    it "works" do
      build_git "valim", :path => lib_path("valim")

      install_gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        gem "valim", "= 1.0", :git => "#{lib_path("valim")}"
      G

      simulate_new_machine

      bundle "config set --local deployment true"
      bundle :install
    end
  end

  describe "gem install hooks" do
    it "runs pre-install hooks" do
      build_git "foo"
      gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        gem "foo", :git => "#{lib_path("foo-1.0")}"
      G

      File.open(lib_path("install_hooks.rb"), "w") do |h|
        h.write <<-H
          Gem.pre_install_hooks << lambda do |inst|
            STDERR.puts "Ran pre-install hook: \#{inst.spec.full_name}"
          end
        H
      end

      bundle :install,
        :requires => [lib_path("install_hooks.rb")]
      expect(err_without_deprecations).to eq("Ran pre-install hook: foo-1.0")
    end

    it "runs post-install hooks" do
      build_git "foo"
      gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        gem "foo", :git => "#{lib_path("foo-1.0")}"
      G

      File.open(lib_path("install_hooks.rb"), "w") do |h|
        h.write <<-H
          Gem.post_install_hooks << lambda do |inst|
            STDERR.puts "Ran post-install hook: \#{inst.spec.full_name}"
          end
        H
      end

      bundle :install,
        :requires => [lib_path("install_hooks.rb")]
      expect(err_without_deprecations).to eq("Ran post-install hook: foo-1.0")
    end

    it "complains if the install hook fails" do
      build_git "foo"
      gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        gem "foo", :git => "#{lib_path("foo-1.0")}"
      G

      File.open(lib_path("install_hooks.rb"), "w") do |h|
        h.write <<-H
          Gem.pre_install_hooks << lambda do |inst|
            false
          end
        H
      end

      bundle :install, :requires => [lib_path("install_hooks.rb")], :raise_on_error => false
      expect(err).to include("failed for foo-1.0")
    end
  end

  context "with an extension" do
    it "installs the extension" do
      build_git "foo" do |s|
        s.add_dependency "rake"
        s.extensions << "Rakefile"
        s.write "Rakefile", <<-RUBY
          task :default do
            path = File.expand_path("../lib", __FILE__)
            FileUtils.mkdir_p(path)
            File.open("\#{path}/foo.rb", "w") do |f|
              f.puts "FOO = 'YES'"
            end
          end
        RUBY
      end

      install_gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        gem "foo", :git => "#{lib_path("foo-1.0")}"
      G

      run <<-R
        require 'foo'
        puts FOO
      R
      expect(out).to eq("YES")

      run <<-R
        puts $:.grep(/ext/)
      R
      expect(out).to include(Pathname.glob(default_bundle_path("bundler/gems/extensions/**/foo-1.0-*")).first.to_s)
    end

    it "does not use old extension after ref changes", :ruby_repo do
      git_reader = build_git "foo", :no_default => true do |s|
        s.extensions = ["ext/extconf.rb"]
        s.write "ext/extconf.rb", <<-RUBY
          require "mkmf"
          create_makefile("foo")
        RUBY
        s.write "ext/foo.c", "void Init_foo() {}"
      end

      2.times do |i|
        File.open(git_reader.path.join("ext/foo.c"), "w") do |file|
          file.write <<-C
            #include "ruby.h"
            VALUE foo() { return INT2FIX(#{i}); }
            void Init_foo() { rb_define_global_function("foo", &foo, 0); }
          C
        end
        sys_exec("git commit -m \"commit for iteration #{i}\" ext/foo.c", :dir => git_reader.path)

        git_commit_sha = git_reader.ref_for("HEAD")

        install_gemfile <<-G
          source "#{file_uri_for(gem_repo1)}"
          gem "foo", :git => "#{lib_path("foo-1.0")}", :ref => "#{git_commit_sha}"
        G

        run <<-R
          require 'foo'
          puts foo
        R

        expect(out).to eq(i.to_s)
      end
    end

    it "does not prompt to gem install if extension fails" do
      build_git "foo" do |s|
        s.add_dependency "rake"
        s.extensions << "Rakefile"
        s.write "Rakefile", <<-RUBY
          task :default do
            raise
          end
        RUBY
      end

      install_gemfile <<-G, :raise_on_error => false
        source "#{file_uri_for(gem_repo1)}"
        gem "foo", :git => "#{lib_path("foo-1.0")}"
      G

      expect(err).to end_with(<<-M.strip)
An error occurred while installing foo (1.0), and Bundler cannot continue.

In Gemfile:
  foo
      M
      expect(out).not_to include("gem install foo")
    end

    it "does not reinstall the extension" do
      build_git "foo" do |s|
        s.add_dependency "rake"
        s.extensions << "Rakefile"
        s.write "Rakefile", <<-RUBY
          task :default do
            path = File.expand_path("../lib", __FILE__)
            FileUtils.mkdir_p(path)
            cur_time = Time.now.to_f.to_s
            File.open("\#{path}/foo.rb", "w") do |f|
              f.puts "FOO = \#{cur_time}"
            end
          end
        RUBY
      end

      install_gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        gem "foo", :git => "#{lib_path("foo-1.0")}"
      G

      run <<-R
        require 'foo'
        puts FOO
      R

      installed_time = out
      expect(installed_time).to match(/\A\d+\.\d+\z/)

      install_gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        gem "foo", :git => "#{lib_path("foo-1.0")}"
      G

      run <<-R
        require 'foo'
        puts FOO
      R
      expect(out).to eq(installed_time)
    end

    it "does not reinstall the extension when changing another gem" do
      build_git "foo" do |s|
        s.add_dependency "rake"
        s.extensions << "Rakefile"
        s.write "Rakefile", <<-RUBY
          task :default do
            path = File.expand_path("../lib", __FILE__)
            FileUtils.mkdir_p(path)
            cur_time = Time.now.to_f.to_s
            File.open("\#{path}/foo.rb", "w") do |f|
              f.puts "FOO = \#{cur_time}"
            end
          end
        RUBY
      end

      install_gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        gem "rack", "0.9.1"
        gem "foo", :git => "#{lib_path("foo-1.0")}"
      G

      run <<-R
        require 'foo'
        puts FOO
      R

      installed_time = out
      expect(installed_time).to match(/\A\d+\.\d+\z/)

      install_gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        gem "rack", "1.0.0"
        gem "foo", :git => "#{lib_path("foo-1.0")}"
      G

      run <<-R
        require 'foo'
        puts FOO
      R
      expect(out).to eq(installed_time)
    end

    it "does reinstall the extension when changing refs" do
      build_git "foo" do |s|
        s.add_dependency "rake"
        s.extensions << "Rakefile"
        s.write "Rakefile", <<-RUBY
          task :default do
            path = File.expand_path("../lib", __FILE__)
            FileUtils.mkdir_p(path)
            cur_time = Time.now.to_f.to_s
            File.open("\#{path}/foo.rb", "w") do |f|
              f.puts "FOO = \#{cur_time}"
            end
          end
        RUBY
      end

      install_gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        gem "foo", :git => "#{lib_path("foo-1.0")}"
      G

      run <<-R
        require 'foo'
        puts FOO
      R

      installed_time = out

      update_git("foo", :branch => "branch2")

      expect(installed_time).to match(/\A\d+\.\d+\z/)

      install_gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        gem "foo", :git => "#{lib_path("foo-1.0")}", :branch => "branch2"
      G

      run <<-R
        require 'foo'
        puts FOO
      R
      expect(out).not_to eq(installed_time)

      installed_time = out

      update_git("foo")
      bundle "update foo"

      run <<-R
        require 'foo'
        puts FOO
      R
      expect(out).not_to eq(installed_time)
    end
  end

  it "ignores git environment variables" do
    build_git "xxxxxx" do |s|
      s.executables = "xxxxxxbar"
    end

    Bundler::SharedHelpers.with_clean_git_env do
      ENV["GIT_DIR"]       = "bar"
      ENV["GIT_WORK_TREE"] = "bar"

      install_gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        git "#{lib_path("xxxxxx-1.0")}" do
          gem 'xxxxxx'
        end
      G

      expect(ENV["GIT_DIR"]).to eq("bar")
      expect(ENV["GIT_WORK_TREE"]).to eq("bar")
    end
  end

  describe "without git installed" do
    it "prints a better error message" do
      build_git "foo"

      install_gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        git "#{lib_path("foo-1.0")}" do
          gem 'foo'
        end
      G

      with_path_as("") do
        bundle "update", :all => true, :raise_on_error => false
      end
      expect(err).
        to include("You need to install git to be able to use gems from git repositories. For help installing git, please refer to GitHub's tutorial at https://help.github.com/articles/set-up-git")
    end

    it "installs a packaged git gem successfully" do
      build_git "foo"

      install_gemfile <<-G
        source "#{file_uri_for(gem_repo1)}"
        git "#{lib_path("foo-1.0")}" do
          gem 'foo'
        end
      G
      bundle "config set cache_all true"
      bundle :cache
      simulate_new_machine

      bundle "install", :env => { "PATH" => "" }
      expect(out).to_not include("You need to install git to be able to use gems from git repositories.")
    end
  end

  describe "when the git source is overridden with a local git repo" do
    before do
      bundle "config set --global local.foo #{lib_path("foo")}"
    end

    describe "and git output is colorized" do
      before do
        File.open("#{ENV["HOME"]}/.gitconfig", "w") do |f|
          f.write("[color]\n\tui = always\n")
        end
      end

      it "installs successfully" do
        build_git "foo", "1.0", :path => lib_path("foo")

        gemfile <<-G
          source "#{file_uri_for(gem_repo1)}"
          gem "foo", :git => "#{lib_path("foo")}", :branch => "master"
        G

        bundle :install
        expect(the_bundle).to include_gems "foo 1.0"
      end
    end
  end

  context "git sources that include credentials" do
    context "that are username and password" do
      let(:credentials) { "user1:password1" }

      it "does not display the password" do
        install_gemfile <<-G, :raise_on_error => false
          source "#{file_uri_for(gem_repo1)}"
          git "https://#{credentials}@github.com/company/private-repo" do
            gem "foo"
          end
        G

        expect(last_command.stdboth).to_not include("password1")
        expect(out).to include("Fetching https://user1@github.com/company/private-repo")
      end
    end

    context "that is an oauth token" do
      let(:credentials) { "oauth_token" }

      it "displays the oauth scheme but not the oauth token" do
        install_gemfile <<-G, :raise_on_error => false
          source "#{file_uri_for(gem_repo1)}"
          git "https://#{credentials}:x-oauth-basic@github.com/company/private-repo" do
            gem "foo"
          end
        G

        expect(last_command.stdboth).to_not include("oauth_token")
        expect(out).to include("Fetching https://x-oauth-basic@github.com/company/private-repo")
      end
    end
  end
end